From c475c637aba78366763cb122673ff836dd9e7e85 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 19 Feb 2000 18:00:00 +0100
Subject: [PATCH 001/307] Version 0.01 (Initial revision).

---
 Makefile      |  37 +++
 README        | 122 +++++++++
 TODO          |  13 +
 channels.conf | 109 ++++++++
 config.c      | 333 ++++++++++++++++++++++
 config.h      | 163 +++++++++++
 dvbapi.c      | 166 +++++++++++
 dvbapi.h      |  65 +++++
 interface.c   | 298 ++++++++++++++++++++
 interface.h   |  41 +++
 keys-pc.conf  | Bin 0 -> 225 bytes
 keys.conf     |  19 ++
 menu.c        | 745 ++++++++++++++++++++++++++++++++++++++++++++++++++
 menu.h        |  21 ++
 osd.c         | 196 +++++++++++++
 osd.h         |  68 +++++
 osm.c         | 119 ++++++++
 remote.c      | 257 +++++++++++++++++
 remote.h      |  43 +++
 timers.conf   |   9 +
 tools.c       | 124 +++++++++
 tools.h       |  54 ++++
 22 files changed, 3002 insertions(+)
 create mode 100644 Makefile
 create mode 100644 README
 create mode 100644 TODO
 create mode 100644 channels.conf
 create mode 100644 config.c
 create mode 100644 config.h
 create mode 100644 dvbapi.c
 create mode 100644 dvbapi.h
 create mode 100644 interface.c
 create mode 100644 interface.h
 create mode 100644 keys-pc.conf
 create mode 100644 keys.conf
 create mode 100644 menu.c
 create mode 100644 menu.h
 create mode 100644 osd.c
 create mode 100644 osd.h
 create mode 100644 osm.c
 create mode 100644 remote.c
 create mode 100644 remote.h
 create mode 100644 timers.conf
 create mode 100644 tools.c
 create mode 100644 tools.h

diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..6696dff11
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+#
+# Makefile for the On Screen Menu of the Video Disk Recorder
+#
+# See the main source file 'osm.c' for copyright information and
+# how to reach the author.
+#
+# $Id: Makefile 1.1 2000/02/19 13:36:48 kls Exp $
+
+OBJS = config.o dvbapi.o interface.o menu.o osd.o remote.o tools.o osm.o
+
+ifdef DEBUG_REMOTE
+DEFINES += -DDEBUG_REMOTE
+endif
+
+ifdef DEBUG_OSD
+DEFINES += -DDEBUG_OSD
+endif
+
+%.o: %.c
+	g++ -g -O2 -Wall -c $(DEFINES) $<
+
+all: osm
+
+config.o   : config.c config.h dvbapi.h interface.h tools.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h
+interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
+menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h tools.h
+osd.o      : osd.c config.h interface.h osd.h tools.h
+osm.o      : osm.c config.h dvbapi.h interface.h menu.h osd.h tools.h
+remote.o   : remote.c remote.h tools.h
+tools.o    : tools.c tools.h
+
+osm: $(OBJS)
+	g++ -g -O2 $(OBJS) -lncurses -o osm
+
+clean:
+	-rm $(OBJS) osm
diff --git a/README b/README
new file mode 100644
index 000000000..e4fa836ec
--- /dev/null
+++ b/README
@@ -0,0 +1,122 @@
+On Screen Menu for the Video Disk Recorder
+------------------------------------------
+
+These files contain the source code of an on screen
+menu for a video disk recorder based on the DVB driver
+of the LinuxTV project (http://linuxtv.org).
+For details about the "Video Disk Recorder" project please
+refer to http://www.cadsoft.de/people/kls/vdr.
+
+The author can be contacted at kls@cadsoft.de.
+
+Yet another "set-top-box"?
+--------------------------
+
+The "set-top-boxes" available from commercial companies all have
+one major drawback: they are not "open". This project's goal is
+to build an "open" digital satellite receiver and timer controlled
+video disk recorder, based upon open standards and freely available
+driver software (of course, the hardware still has to be bought).
+
+The on screen menu system is simple, but shall provide all the
+possibilites necessary to perform timer controlled recording,
+file management and, maybe, even "on disk editing". The menus
+of commercial set-top-boxes usually are a lot more fancy than
+the ones in this system, but here we have the full source code
+and can modify the menus in whatever way desired.
+
+Compiling and running the program:
+----------------------------------
+
+Make sure the files from this package are located in a
+directory that is "parallel" to the DVB directory of the
+driver source for the Siemens DVB-S PCI card (refer to
+http://linuxtv.org/dvb/siemens_dvb.html for more information
+about that driver). For example, if the DVB driver was
+extracted into the directory /home/kls/vdr/DVB, then this
+package should be extracted into /home/kls/vdr/OSM.
+
+After extracting the package, change into the OSM directory
+and type 'make'. This should produce an executable file
+named 'osm', which can be run after the DVB driver has been
+installed.
+
+There are two macros you can use to customize the 'osm' program
+at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call
+will use the PC's keyboard as input device instead of the "Remote
+Control Unit" (see http://www.cadsoft.de/people/kls/vdr/remote.htm).
+Adding "DEBUG_OSD=1" will use the PC screen (or current window)
+to display texts instead of the DVB card's on-screen display
+interface. These modes are useful when testing new menus if you
+only have a remote connection to the VDR (which, in my case, is
+located in the living room and has neither a monitor nor a keyboard).
+
+Configuration files:
+--------------------
+
+There are three configuration files that hold information about
+channels, remote control keys and timers. These files are currrently
+assumed to be located in the directory from which the 'osm' program
+was started (this will become configurable later). The configuration
+files can be edited with any text editor, or will be written by the
+'osm' program if any changes are made inside the on-screen menus.
+The meaning of the data entries may still vary in future releases,
+so for the moment please look at the source code (config.c) to see
+the meaning of the various fields.
+
+There is no way of adding or deleting channels or timers yet, this
+will be implemented later.
+
+Learning the remote control keys:
+---------------------------------
+
+The remote control configuration file 'keys.conf' that comes with
+this package contains the codes for the "d-box" remote control unit.
+If you want to use a different remote control unit, simply delete
+the file 'keys.conf' and restart the 'osm' program. The program will
+then start a key learning session in which it first attempts to determine
+the basic data tranfer mode and timing of your remote control unit,
+and then will ask you to press one key after the other so that it can
+learn the various key codes. You will at least need to provide an "Up"
+and a "Down" key, so that you can switch channels. The rest os the key
+definitions is optional, but the more keys you define, the more you
+will be able to navigate through the menus.
+
+If the program has been built with "DEBUG_REMOTE=1", it will use the
+key configuration file 'keys-pc.conf', so that you won't loose data
+when switching between normal and debug mode.
+
+Navigating through the On Screen Menus:
+---------------------------------------
+
+The "Main" menu can be called up with the "Menu" key of your remote
+control unit. The "Up" and "Down" keys are used to select a specific
+item. The "Left" and "Right" keys can be used to change options, and
+the numeric keys allow direct input of numeric data. The "Ok" key
+confirms any changes (or switches to a channel in the "Channels" menu).
+The "Back" key goes back one level in the menu structure, discarding
+any changes that might have been made in the current menu.
+
+In the "Channels" menu, the current channel can be edited by pressing
+the "Right" key.
+
+In the "Timers" menu, the current timer can be enabled or disabled with
+the "Right" or "Left" key, respectively (enabled timers are marked with ">").
+"Ok" here opens the "Edit timer" menu.
+
+Textual options, like channel names or recording file names, can be edited
+by pressing the "Right" button (which puts brackets around the current
+character as in "[R]TL"), selecting the desired character position with
+"Left" and "Right", and changing the character with the "Up" and "Down"
+keys. "Ok" then confirms the changes.
+
+At any point in the menu system, pressing the "Menu" key again will
+immediately leave the menu system.
+
+What do you think?
+------------------
+
+So, what do you think about this project? Does it make sense? Were you
+able to use it? Do you have suggestions on how to improve it?
+Please send email to kls@cadsoft.de if you'd like to comment on this.
+
diff --git a/TODO b/TODO
new file mode 100644
index 000000000..32793469c
--- /dev/null
+++ b/TODO
@@ -0,0 +1,13 @@
+TODO list for the Video Disk Recorder project
+---------------------------------------------
+
+* Implement a way to add and delete channels and timers.
+* Implement recording to disk and playback from disk.
+* Implement disk file management (delete old/viewed files to make
+  room for new recordings if necessary).
+* Make it work with two DVB-S PCI cards to allow simultaneous
+  recording of one programme, while replaying another programme
+  (or maybe the same one, but time delayed).
+* Implement "on-disk editing" to allow "cutting out" of certain
+  scenes in order to archive them (or, reversely, cut out
+  commercial breaks).
diff --git a/channels.conf b/channels.conf
new file mode 100644
index 000000000..9daca0aff
--- /dev/null
+++ b/channels.conf
@@ -0,0 +1,109 @@
+RTL:12188:h:1:27500:163:104
+Sat.1:12552:v:1:22000:163:104
+Pro 7:12480:v:1:27500:255:256
+RTL2:12188:h:1:27500:166:128
+ARD:11837:h:1:27500:101:102
+BR3:11837:h:1:27500:201:202
+Hessen 3:11837:h:1:27500:301:302
+N3:11837:h:1:27500:401:402
+SR3:11837:h:1:27500:501:502
+WDR:11837:h:1:27500:601:602
+BR alpha:11837:h:1:27500:701:702
+SWR BW:11837:h:1:27500:801:802
+Phoenix:11837:h:1:27500:901:902
+ZDF:11954:h:1:27500:110:120
+3sat:11954:h:1:27500:210:220
+Kinderkanal:11954:h:1:27500:310:320
+arte:11954:h:1:27500:360:370
+phoenix:11954:h:1:27500:410:420
+ORF Sat:11954:h:1:27500:506:507
+ZDF Infobox:11954:h:1:27500:610:620
+CNN:12168:v:1:27500:165:100
+Super RTL:12188:h:1:27500:165:120
+VOX:12188:h:1:27500:167:136
+DW TV:12363:v:1:27500:305:306
+Kabel 1:12480:v:1:27500:511:512
+TM3:12480:v:1:27500:767:768
+DSF:12480:v:1:27500:1023:1024
+HOT:12480:v:1:27500:1279:1280
+BloombergTV:12552:v:1:22000:162:99
+Sky News:12552:v:1:22000:305:306
+KinderNet:12574:h:1:22000:163:92
+Alice:12610:v:1:22000:162:96
+n-tv:12670:v:1:22000:162:96
+Grand Tour.:12670:v:1:22000:289:290
+TW1:12692:h:1:22000:166:167
+Eins Extra:12722:h:1:22000:101:102
+Eins Festival:12722:h:1:22000:201:202
+Eins MuXx:12722:h:1:22000:301:302
+MDR:12722:h:1:22000:401:402
+ORB:12722:h:1:22000:501:502
+B1:12722:h:1:22000:601:602
+ARD Online-Kanal:12722:h:1:22000:8191:701
+Premiere World Promo:11798:h:1:27500:255:256
+TV Niepokalanow:11876:h:1:27500:305:321
+test card:11876:h:1:27500:306:322
+Mosaico:11934:v:1:27500:165:100
+Andalucia TV:11934:v:1:27500:166:104
+TVC Internacional:11934:v:1:27500:167:108
+Nasza TV:11992:h:1:27500:165:98
+WishLine test:12012:v:1:27500:163:90
+Pro 7 Austria:12051:v:1:27500:161:84
+Kabel 1 Schweiz:12051:v:1:27500:162:163
+Kabel 1 Austria:12051:v:1:27500:166:167
+Pro 7 Schweiz:12051:v:1:27500:289:290
+Kiosque:12129:v:1:27500:160:80
+KTO:12129:v:1:27500:170:120
+TCM:12168:v:1:27500:160:80
+Cartoon Network France & Spain:12168:v:1:27500:161:84
+TVBS Europe:12168:v:1:27500:162:88
+TVBS Europe:12168:v:1:27500:162:89
+Travel:12168:v:1:27500:163:92
+TCM Espania:12168:v:1:27500:164:96
+MTV Spain:12168:v:1:27500:167:112
+TCM France:12168:v:1:27500:169:64
+RTL2 CH:12188:h:1:27500:164:112
+La Cinquieme:12207:v:1:27500:160:80
+ARTE:12207:v:1:27500:165:100
+Post Filial TV:12226:h:1:27500:255:256
+Canal Canaris:12246:v:1:27500:160:80
+Canal Canaris:12246:v:1:27500:160:81
+Canal Canaris:12246:v:1:27500:160:82
+Canal Canaris:12246:v:1:27500:160:83
+AB Sat Passion promo:12266:h:1:27500:160:80
+AB Channel 1:12266:h:1:27500:161:84
+Taquilla 0:12285:v:1:27500:165:100
+CSAT:12324:v:1:27500:160:80
+Mosaique:12324:v:1:27500:162:88
+Mosaique 2:12324:v:1:27500:163:92
+Mosaique 3:12324:v:1:27500:164:96
+Le Sesame C+:12324:v:1:27500:165:1965
+FEED:12344:h:1:27500:163:92
+RTM 1:12363:v:1:27500:162:96
+ESC 1:12363:v:1:27500:163:104
+TV5 Europe:12363:v:1:27500:164:112
+TV7 Tunisia:12363:v:1:27500:166:128
+ARTE:12363:v:1:27500:167:137
+RAI Uno:12363:v:1:27500:289:290
+RTP International:12363:v:1:27500:300:301
+Fashion TV:12402:v:1:27500:163:92
+VideoService:12422:h:1:27500:255:256
+Beta Research promo:12422:h:1:27500:1023:1024
+Canal Canarias:12441:v:1:27500:160:80
+TVC International:12441:v:1:27500:512:660
+Fitur:12441:v:1:27500:514:662
+Astra Info 1:12552:v:1:22000:164:112
+Astra Info 2:12552:v:1:22000:165:120
+Astra Vision 1:12552:v:1:22000:168:144
+Astra Vision 1:12552:v:1:22000:168:145
+Astra Vision 1:12552:v:1:22000:168:146
+Astra Vision 1:12552:v:1:22000:168:147
+Astra Vision 1:12552:v:1:22000:168:148
+Astra Vision 1:12552:v:1:22000:168:149
+Astra Vision 1:12552:v:1:22000:168:150
+RTL Tele Letzebuerg:12552:v:1:22000:168:144
+Astra Mosaic:12552:v:1:22000:175:176
+MHP test:12604:h:1:22000:5632:8191
+Bloomberg TV Spain:12610:v:1:22000:45:49
+Video Italia:12610:v:1:22000:121:122
+AC 3 promo:12670:v:1:22000:308:256
diff --git a/config.c b/config.c
new file mode 100644
index 000000000..50315691e
--- /dev/null
+++ b/config.c
@@ -0,0 +1,333 @@
+/*
+ * config.c: Configuration file handling
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: config.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "config.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <time.h>
+#include "dvbapi.h"
+#include "interface.h"
+
+// -- cKeys ------------------------------------------------------------------
+
+tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
+                    { kUp,    "Up",    0 },
+                    { kDown,  "Down",  0 },
+                    { kMenu,  "Menu",  0 },
+                    { kOk,    "Ok",    0 },
+                    { kBack,  "Back",  0 },
+                    { kLeft,  "Left",  0 },
+                    { kRight, "Right", 0 },
+                    { k0,     "0",     0 },
+                    { k1,     "1",     0 },
+                    { k2,     "2",     0 },
+                    { k3,     "3",     0 },
+                    { k4,     "4",     0 },
+                    { k5,     "5",     0 },
+                    { k6,     "6",     0 },
+                    { k7,     "7",     0 },
+                    { k8,     "8",     0 },
+                    { k9,     "9",     0 },
+                    { kNone,  "",      0 },
+                  };
+
+cKeys::cKeys(void)
+{
+  fileName = NULL;
+  code = 0;
+  address = 0;
+  keys = keyTable;
+}
+
+void cKeys::Clear(void)
+{
+  for (tKey *k = keys; k->type != kNone; k++)
+      k->code = 0;
+}
+
+bool cKeys::Load(char *FileName)
+{
+  isyslog(LOG_INFO, "loading %s", FileName);
+  bool result = false;
+  if (FileName)
+     fileName = strdup(FileName);
+  if (fileName) {
+     FILE *f = fopen(fileName, "r");
+     if (f) {
+        int line = 0;
+        char buffer[MaxBuffer];
+        result = true;
+        while (fgets(buffer, sizeof(buffer), f) > 0) {
+              line++;
+              char *Name = buffer;
+              char *p = strpbrk(Name, " \t");
+              if (p) {
+                 *p = 0; // terminates 'Name'
+                 while (*++p && isspace(*p))
+                       ;
+                 if (*p) {
+                    if (strcasecmp(Name, "Code") == 0)
+                       code = *p;
+                    else if (strcasecmp(Name, "Address") == 0)
+                       address = strtol(p, NULL, 16);
+                    else {
+                       for (tKey *k = keys; k->type != kNone; k++) {
+                           if (strcasecmp(Name, k->name) == 0) {
+                              k->code = strtol(p, NULL, 16);
+                              Name = NULL; // to indicate that we found it
+                              break;
+                              }
+                           }
+                        if (Name) {
+                           fprintf(stderr, "unknown key in %s, line %d\n", fileName, line);
+                           result = false;
+                           break;
+                           }
+                        }
+                    }
+                 continue;
+                 }
+              fprintf(stderr, "error in %s, line %d\n", fileName, line);
+              result = false;
+              break;
+              }
+        fclose(f);
+        }
+     else
+        fprintf(stderr, "can't open '%s'\n", fileName);
+     }
+  else
+     fprintf(stderr, "no key configuration file name supplied!\n");
+  return result;
+}
+
+bool cKeys::Save(void)
+{
+  //TODO make backup copies???
+  bool result = true;
+  FILE *f = fopen(fileName, "w");
+  if (f) {
+     if (fprintf(f, "Code\t%c\nAddress\t%04X\n", code, address) > 0) {
+        for (tKey *k = keys; k->type != kNone; k++) {
+            if (fprintf(f, "%s\t%08X\n", k->name, k->code) <= 0) {
+               result = false;
+               break;
+               }
+            }
+         }
+     else
+        result = false;
+     fclose(f);
+     }
+  else
+     result = false;
+  return result;
+}
+
+eKeys cKeys::Get(unsigned int Code)
+{
+  if (Code != 0) {
+     tKey *k;
+     for (k = keys; k->type != kNone; k++) {
+         if (k->code == Code)
+            break;
+         }
+     return k->type;
+     }
+  return kNone;
+}
+
+void cKeys::Set(eKeys Key, unsigned int Code)
+{
+  for (tKey *k = keys; k->type != kNone; k++) {
+      if (k->type == Key) {
+         k->code = Code;
+         break;
+         }
+      }
+}
+
+// -- cChannel ---------------------------------------------------------------
+
+cChannel::cChannel(void)
+{
+  *name = 0;
+}
+
+bool cChannel::Parse(char *s)
+{
+  char *buffer = NULL;
+  if (7 == sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid)) {
+     strncpy(name, buffer, MaxChannelName - 1);
+     name[strlen(buffer)] = 0;
+     delete buffer;
+     return true;
+     }
+  return false;
+}
+
+bool cChannel::Save(FILE *f)
+{
+  return fprintf(f, "%s:%d:%c:%d:%d:%d:%d\n", name, frequency, polarization, diseqc, srate, vpid, apid) > 0;
+}
+
+bool cChannel::Switch(void)
+{
+  if (!ChannelLocked) {
+     isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
+     CurrentChannel = Index();
+     Interface.DisplayChannel(CurrentChannel + 1, name);
+     for (int i = 3; --i;) {
+         if (DvbSetChannel(frequency, polarization, diseqc, srate, vpid, apid))
+            return true;
+         esyslog(LOG_ERR, "retrying");
+         }
+     }
+  Interface.Info("Channel locked (recording)!");
+  return false;
+}
+
+bool cChannel::SwitchTo(int i)
+{
+  cChannel *channel = Channels.Get(i);
+  return channel && channel->Switch();
+}
+
+// -- cTimer -----------------------------------------------------------------
+
+cTimer::cTimer(void)
+{
+  *file = 0;
+}
+
+int cTimer::TimeToInt(int t)
+{
+  return (t / 100 * 60 + t % 100) * 60;
+}
+
+int cTimer::ParseDay(char *s)
+{
+  char *tail;
+  int d = strtol(s, &tail, 10);
+  if (tail && *tail) {
+     d = 0;
+     if (tail == s) {
+        if (strlen(s) == 7) {
+           for (char *p = s + 6; p >= s; p--) {
+                 d <<= 1;
+                 d |= (*p != '-');
+                 }
+           d |= 0x80000000;
+           }
+        }
+     }
+  else if (d < 1 || d > 31)
+     d = 0;
+  return d;
+}
+
+char *cTimer::PrintDay(int d)
+{
+  static char buffer[8];
+  if ((d & 0x80000000) != 0) {
+     char *b = buffer;
+     char *w = "MTWTFSS";
+     *b = 0;
+     while (*w) {
+           *b++ = (d & 1) ? *w : '-';
+           d >>= 1;
+           w++;
+           }
+     }
+  else
+     sprintf(buffer, "%d", d);
+  return buffer;
+}
+
+bool cTimer::Parse(char *s)
+{
+  char *buffer1 = NULL;
+  char *buffer2 = NULL;
+  if (9 == sscanf(s, "%d:%d:%a[^:]:%d:%d:%c:%d:%d:%as", &active, &channel, &buffer1, &start, &stop, &quality, &priority, &lifetime, &buffer2)) {
+     day = ParseDay(buffer1);
+     strncpy(file, buffer2, MaxFileName - 1);
+     file[strlen(buffer2)] = 0;
+     delete buffer1;
+     delete buffer2;
+     return day != 0;
+     }
+  return false;
+}
+
+bool cTimer::Save(FILE *f)
+{
+  return fprintf(f, "%d:%d:%s:%d:%d:%c:%d:%d:%s\n", active, channel, PrintDay(day), start, stop, quality, priority, lifetime, file) > 0;
+}
+
+bool cTimer::Matches(void)
+{
+  if (active) {
+     time_t t = time(NULL);
+     struct tm *now = localtime(&t);
+     int weekday = now->tm_wday == 0 ? 6 : now->tm_wday - 1; // we start with monday==0!
+     int current = (now->tm_hour * 60 + now->tm_min) * 60 + now->tm_sec;
+     int begin = TimeToInt(start);
+     int end   = TimeToInt(stop);
+     bool twoDays = (end < begin);
+
+     bool todayMatches = false, yesterdayMatches = false;
+     if ((day & 0x80000000) != 0) {
+        if ((day & (1 << weekday)) != 0)
+           todayMatches = true;
+        else if (twoDays) {
+           int yesterday = weekday == 0 ? 6 : weekday - 1;
+           if ((day & (1 << yesterday)) != 0)
+              yesterdayMatches = true;
+           }
+        }
+     else if (day == now->tm_mday)
+        todayMatches = true;
+     else if (twoDays) {
+        t -= 86400;
+        now = localtime(&t);
+        if (day == now->tm_mday)
+           yesterdayMatches = true;
+        }
+     return (todayMatches && current >= begin && (current <= end || twoDays))
+            || (twoDays && yesterdayMatches && current <= end);
+     }
+  return false;
+}
+
+cTimer *cTimer::GetMatch(void)
+{
+  cTimer *t = (cTimer *)Timers.First();
+  while (t) {
+        if (t->Matches())
+           return t;
+        t = (cTimer *)t->Next();
+        }
+  return NULL;
+}
+
+// -- cKeys ------------------------------------------------------------------
+
+cKeys Keys;
+
+// -- cChannels --------------------------------------------------------------
+
+int CurrentChannel = 0;
+bool ChannelLocked = false;
+
+cChannels Channels;
+
+// -- cTimers ----------------------------------------------------------------
+
+cTimers Timers;
+
diff --git a/config.h b/config.h
new file mode 100644
index 000000000..3abb7a1ac
--- /dev/null
+++ b/config.h
@@ -0,0 +1,163 @@
+/*
+ * config.h: Configuration file handling
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: config.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <stdio.h>
+#include <string.h>
+#include "tools.h"
+
+#define MaxBuffer 1000
+
+enum eKeys { // "Up" and "Down" must be the first two keys!
+             kUp,
+             kDown,
+             kMenu,
+             kOk,
+             kBack,
+             kLeft,
+             kRight,
+             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+             kNone
+           };
+
+struct tKey {
+  eKeys type;
+  char *name;
+  unsigned int code;
+  };
+
+class cKeys {
+private:
+  char *fileName;
+public:
+  unsigned char code;
+  unsigned short address;
+  tKey *keys;
+  cKeys(void);
+  void Clear(void);
+  bool Load(char *FileName = NULL);
+  bool Save(void);
+  eKeys Get(unsigned int Code);
+  void Set(eKeys Key, unsigned int Code);
+  };
+
+class cChannel : public cListObject {
+public:
+  enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
+  char name[MaxChannelName];
+  int frequency; // MHz
+  char polarization;
+  int diseqc;
+  int srate;
+  int vpid;
+  int apid;
+  cChannel(void);
+  bool Parse(char *s);
+  bool Save(FILE *f);
+  bool Switch(void);
+  static bool SwitchTo(int i);
+  };
+
+class cTimer : public cListObject {
+public:
+  enum { MaxFileName = 256 };
+  int active;
+  int channel;
+  int day;
+  int start;
+  int stop;
+//TODO VPS???
+  char quality;
+  int priority;
+  int lifetime;
+  char file[MaxFileName];
+  cTimer(void);
+  bool Parse(char *s);
+  bool Save(FILE *f);
+  bool Matches(void);
+  static cTimer *GetMatch(void);
+  static int TimeToInt(int t);
+  static int ParseDay(char *s);
+  static char *PrintDay(int d);
+  };
+
+template<class T> class cConfig : public cList<T> {
+private:
+  char *fileName;
+  void Clear(void)
+  {
+    delete fileName;
+    cList<T>::Clear();
+  }
+public:
+  bool Load(char *FileName)
+  {
+    isyslog(LOG_INFO, "loading %s", FileName);
+    bool result = true;
+    Clear();
+    fileName = strdup(FileName);
+    FILE *f = fopen(fileName, "r");
+    if (f) {
+       int line = 0;
+       char buffer[MaxBuffer];
+       while (fgets(buffer, sizeof(buffer), f) > 0) {
+             line++;
+             T *l = new T;
+             if (l->Parse(buffer))
+                Add(l);
+             else {
+                fprintf(stderr, "error in %s, line %d\n", fileName, line);
+                delete l;
+                result = false;
+                break;
+                }
+             }
+       fclose(f);
+       }
+    else {
+       fprintf(stderr, "can't open '%s'\n", fileName);
+       result = false;
+       }
+    return result;
+  }
+  bool Save(void)
+  {
+  //TODO make backup copies???
+    bool result = true;
+    T *l = (T *)First();
+    FILE *f = fopen(fileName, "w");
+    if (f) {
+       while (l) {
+             if (!l->Save(f)) {
+                result = false;
+                break;
+                }
+             l = (T *)l->Next();
+             }
+       fclose(f);
+       }
+    else
+       result = false;
+    return result;
+  }
+  };
+
+class cChannels : public cConfig<cChannel> {};
+class cTimers : public cConfig<cTimer> {};
+
+extern int CurrentChannel;
+extern bool ChannelLocked;
+
+extern cChannels Channels;
+extern cTimers Timers;
+extern cKeys Keys;
+
+#endif //__CONFIG_H
diff --git a/dvbapi.c b/dvbapi.c
new file mode 100644
index 000000000..5597fbd50
--- /dev/null
+++ b/dvbapi.c
@@ -0,0 +1,166 @@
+/*
+ * dvbapi.c: Interface to the DVB driver
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbapi.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+
+#include "dvbapi.h"
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include "../DVB/driver/dvb.h"
+#include "interface.h"
+#include "tools.h"
+
+#define VIDEODEVICE "/dev/video"
+
+const char *DvbQuality = "LMH"; // Low, Medium, High
+
+bool DvbSetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid)
+{
+  int v = open(VIDEODEVICE, O_RDWR);
+  
+  if (v >= 0) {
+     struct frontend front;
+     ioctl(v, VIDIOCGFRONTEND, &front);
+     unsigned int freq = FrequencyMHz;
+     front.ttk = (freq < 11800UL) ? 0 : 1;
+     if (freq < 11800UL)
+        freq -=  9750UL;
+     else
+        freq -= 10600UL;
+     front.freq      = freq * 1000000UL;
+     front.diseqc    = Diseqc;
+     front.srate     = Srate * 1000;
+     front.volt      = (Polarization == 'v') ? 0 : 1;
+     front.video_pid = Vpid;
+     front.audio_pid = Apid;
+     front.AFC       = 1;
+     ioctl(v, VIDIOCSFRONTEND, &front);
+     close(v);
+     if (front.sync & 0x1F == 0x1F)
+        return true;
+     esyslog(LOG_ERR, "channel not sync'ed (front.sync=%X)!", front.sync);
+     }
+  else
+     Interface.Error("can't open VIDEODEVICE");//XXX
+  return false;
+}
+
+// -- cDvbRecorder -----------------------------------------------------------
+
+cDvbRecorder::cDvbRecorder(void)
+{
+}
+
+cDvbRecorder::~cDvbRecorder()
+{
+  Stop();
+}
+
+bool cDvbRecorder::Record(const char *FileName, char Quality)
+{
+  isyslog(LOG_INFO, "record %s (%c)", FileName, Quality);
+  return true;
+  // TODO
+  return false;
+}
+
+bool cDvbRecorder::Play(const char *FileName, int Frame)
+{
+  isyslog(LOG_INFO, "play %s (%d)", FileName, Frame);
+  // TODO
+  return false;
+}
+
+bool cDvbRecorder::FastForward(void)
+{
+  isyslog(LOG_INFO, "fast forward");
+  // TODO
+  return false;
+}
+
+bool cDvbRecorder::FastRewind(void)
+{
+  isyslog(LOG_INFO, "fast rewind");
+  // TODO
+  return false;
+}
+
+bool cDvbRecorder::Pause(void)
+{
+  isyslog(LOG_INFO, "pause");
+  // TODO
+  return false;
+}
+
+void cDvbRecorder::Stop(void)
+{
+  isyslog(LOG_INFO, "stop");
+  // TODO
+}
+
+int cDvbRecorder::Frame(void)
+{
+  isyslog(LOG_INFO, "frame");
+  // TODO
+  return 0;
+}
+
+// ---------------------------------------------------------------------------
+
+static void DvbOsdCmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, void *data = NULL)
+{
+  int v = open(VIDEODEVICE, O_RDWR);
+
+  if (v >= 0) {
+     struct drawcmd dc;
+     dc.cmd   = cmd;
+     dc.color = color;
+     dc.x0    = x0;
+     dc.y0    = y0;
+     dc.x1    = x1;
+     dc.y1    = y1;
+     dc.data  = data;
+     ioctl(v, VIDIOCSOSDCOMMAND, &dc);
+     close(v);
+     }
+  else
+     Interface.Error("can't open VIDEODEVICE");//XXX
+}
+
+void DvbOsdOpen(int x, int y, int w, int h)
+{
+  DvbOsdCmd(OSD_Open, 1, x, y, x + w - 1, y + h - 1);
+  DvbOsdCmd(OSD_SetColor, 0,   0,   0,   0, 127); // background 50% gray
+  DvbOsdCmd(OSD_SetColor, 1, 255, 255, 255, 255); // text white
+}
+
+void DvbOsdClose(void)
+{
+  DvbOsdCmd(OSD_Close);
+}
+
+void DvbOsdClear(void)
+{
+  DvbOsdCmd(OSD_Clear);
+}
+
+void DvbOsdClrEol(int x, int y)
+{
+  DvbOsdCmd(OSD_FillBlock, 0, x, y * DvbOsdLineHeight, x + 490, (y + 1) * DvbOsdLineHeight);//XXX
+}
+
+void DvbOsdText(int x, int y, char *s)
+{
+  DvbOsdCmd(OSD_Text, 1, x, y, 1, 0, s);
+}
diff --git a/dvbapi.h b/dvbapi.h
new file mode 100644
index 000000000..6a8f0400e
--- /dev/null
+++ b/dvbapi.h
@@ -0,0 +1,65 @@
+/*
+ * dvbapi.h: Interface to the DVB driver
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbapi.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef __DVBAPI_H
+#define __DVBAPI_H
+
+const int DvbOsdCharWidth  = 12; //XXX
+const int DvbOsdLineHeight = 25;
+
+extern const char *DvbQuality; // Low, Medium, High
+
+bool DvbSetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid);
+
+class cDvbRecorder {
+public:
+  cDvbRecorder(void);
+  ~cDvbRecorder();
+  bool Record(const char *FileName, char Quality);
+       // Starts recording the current channel into the given file, with the
+       // given quality level. Any existing file will be overwritten.
+       // Returns true if recording was started successfully.
+       // If there is already a recording session active, false will be
+       // returned.
+  bool Play(const char *FileName, int Frame = 0);
+       // Starts playback of the given file, at the optional Frame (default
+       // is the beginning of the file). If Frame is beyond the last recorded
+       // frame in the file, or if it is negative, playback will be positioned
+       // to the last frame in the file and will do an implicit Pause() there.
+       // If there is already a playback session active, it will be stopped
+       // and the new file or frame (which may be in the same file) will
+       // be played back.
+  bool FastForward(void);
+       // Runs the current playback session forward at a higher speed.
+       // TODO allow different fast forward speeds???
+  bool FastRewind(void);
+       // Runs the current playback session backwards forward at a higher speed.
+       // TODO allow different fast rewind speeds???
+  bool Pause(void);
+       // Pauses the current recording or playback session, or resumes a paused
+       // session.
+       // Returns true if there is actually a recording or playback session
+       // active that was paused/resumed.
+  void Stop(void);
+       // Stops the current recording or playback session.
+  int  Frame(void);
+       // Returns the number of the current frame in the current recording or
+       // playback session, which can be used to start playback at a given position.
+       // The number returned is the actual number of frames counted from the
+       // beginning of the current file.
+       // The very first frame has the number 1.
+  };
+
+void DvbOsdOpen(int x, int y, int w, int h);
+void DvbOsdClose(void);
+void DvbOsdClear(void);
+void DvbOsdClrEol(int x, int y);
+void DvbOsdText(int x, int y, char *s);
+
+#endif //__DVBAPI_H
diff --git a/interface.c b/interface.c
new file mode 100644
index 000000000..58c28f1f9
--- /dev/null
+++ b/interface.c
@@ -0,0 +1,298 @@
+/*
+ * interface.c: Abstract user interface layer
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: interface.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "interface.h"
+#include <ncurses.h>
+#include <unistd.h>
+#include "dvbapi.h"
+#include "remote.h"
+
+#ifndef DEBUG_REMOTE
+cRcIo RcIo("/dev/ttyS1");//XXX
+#endif
+
+WINDOW *window;
+
+cInterface Interface;
+
+cInterface::cInterface(void)
+{
+  open = 0;
+  cols[0] = 0;
+#ifdef DEBUG_OSD
+  initscr();
+  keypad(stdscr, TRUE);
+  nonl();
+  cbreak();
+  noecho();
+  leaveok(stdscr, TRUE);
+  window = stdscr;
+#else
+#endif
+}
+
+void cInterface::Init(void)
+{
+#ifndef DEBUG_REMOTE
+  RcIo.SetCode(Keys.code, Keys.address);
+#endif
+}
+
+void cInterface::Open(void)
+{
+  if (!open++) {
+#ifdef DEBUG_OSD
+#else
+//TODO
+     DvbOsdOpen(100, 100, 500, 400);
+#endif
+     }
+}
+
+void cInterface::Close(void)
+{
+  if (!--open) {
+#ifdef DEBUG_OSD
+#else
+//TODO
+     DvbOsdClose();
+#endif
+     }
+}
+
+unsigned int cInterface::GetCh(void)
+{
+#ifdef DEBUG_REMOTE
+  return getch();
+#else
+#ifdef DEBUG_OSD
+  wrefresh(window);//XXX
+#endif
+  unsigned int Command;
+  return RcIo.GetCommand(&Command) ? Command : 0;
+#endif
+}
+
+eKeys cInterface::GetKey(void)
+{
+  return Keys.Get(GetCh());
+}
+
+void cInterface::Clear(void)
+{
+  if (open) {
+#ifdef DEBUG_OSD
+     wclear(window);
+#else
+//TODO
+     DvbOsdClear();
+#endif
+     }
+}
+
+void cInterface::SetCols(int *c)
+{
+  for (int i = 0; i < MaxCols; i++) {
+      cols[i] = *c++;
+      if (cols[i] == 0)
+         break;
+      }
+}
+
+void cInterface::Write(int x, int y, char *s)
+{
+  if (open) {
+#ifdef DEBUG_OSD
+     wmove(window, y, x); // ncurses wants 'y' before 'x'!
+     waddstr(window, s);
+#else
+     DvbOsdText(x * DvbOsdCharWidth, y * DvbOsdLineHeight, s);
+#endif
+     }
+}
+
+void cInterface::WriteText(int x, int y, char *s, bool Current)
+{
+  if (open) {
+#ifdef DEBUG_OSD
+     wmove(window, y, x); // ncurses wants 'y' before 'x'!
+     wclrtoeol(window);//XXX
+#else
+//TODO
+     DvbOsdClrEol(x * DvbOsdCharWidth, y);//XXX
+#endif
+     Write(x, y, Current ? "*" : " ");
+     x++;
+     int col = 0;
+     for (;;) {
+         char *t = strchr(s, '\t');
+         char *p = s;
+         char buf[1000];
+         if (t && col < MaxCols && cols[col] > 0) {
+            unsigned int n = t - s;
+            if (n >= sizeof(buf))
+               n = sizeof(buf) - 1;
+            strncpy(buf, s, n);
+            buf[n] = 0;
+            p = buf;
+            s = t + 1;
+            }
+         Write(x, y, p);
+         if (p == s)
+            break;
+         x += cols[col++];
+         }
+     }
+}
+
+void cInterface::Info(char *s)
+{
+  Open();
+  isyslog(LOG_ERR, s);
+  WriteText(0, 11, s);//TODO
+#ifdef DEBUG_OSD
+  wrefresh(window);//XXX
+#endif
+  sleep(1);
+  WriteText(0, 11, "");//TODO
+#ifdef DEBUG_OSD
+  wrefresh(window);//XXX
+#endif
+  Close();
+}
+
+void cInterface::Error(char *s)
+{
+  Open();
+  esyslog(LOG_ERR, s);
+  WriteText(0, 12, s);//TODO
+#ifdef DEBUG_OSD
+  wrefresh(window);//XXX
+#endif
+  sleep(1);
+  WriteText(0, 12, "");//TODO
+#ifdef DEBUG_OSD
+  wrefresh(window);//XXX
+#endif
+  Close();
+}
+
+void cInterface::QueryKeys(void)
+{
+  Keys.Clear();
+  WriteText(1, 1, "Learning Remote Control Keys");
+  WriteText(1, 3, "Phase 1: Detecting RC code type");
+  WriteText(1, 5, "Press any key on the RC unit");
+#ifndef DEBUG_REMOTE
+  unsigned char Code = 0;
+  unsigned short Address;
+#endif
+  for (;;) {
+#ifdef DEBUG_REMOTE
+      if (GetCh())
+         break;
+#else
+      //TODO on screen display...
+      if (RcIo.DetectCode(&Code, &Address)) {
+         Keys.code = Code;
+         Keys.address = Address;
+         WriteText(1, 5, "RC code detected!");
+         WriteText(1, 6, "Do not press any key...");
+         RcIo.Flush(3);
+         WriteText(1, 5, "");
+         WriteText(1, 6, "");
+         break;
+         }
+#endif
+      }
+  WriteText(1, 3, "Phase 2: Learning specific key codes");
+  tKey *k = Keys.keys;
+  while (k->type != kNone) {
+        char *Prompt;
+        asprintf(&Prompt, "Press key for '%s'", k->name);
+        WriteText(1, 5, Prompt);
+        delete Prompt;
+        for (;;) {
+            unsigned int ch = GetCh();
+            if (ch != 0) {
+               switch (Keys.Get(ch)) {
+                 case kUp:   if (k > Keys.keys) {
+                                k--;
+                                break;
+                                }
+                 case kDown: if (k > Keys.keys + 1) {
+                                WriteText(1, 5, "Press 'Up' to confirm");
+                                WriteText(1, 6, "Press 'Down' to continue");
+                                WriteText(1, 7, "");
+                                WriteText(1, 8, "");
+                                for (;;) {
+                                    eKeys key = GetKey();
+                                    if (key == kUp) {
+                                       Clear();
+                                       return;
+                                       }
+                                    else if (key == kDown) {
+                                       WriteText(1, 6, "");
+                                       break;
+                                       }
+                                    }
+                                break;
+                                }
+                 case kNone: k->code = ch;
+                             k++;
+                             break;
+                 default:    break;
+                 }
+               break;
+               }
+            }
+        if (k > Keys.keys)
+           WriteText(1, 7, "(press 'Up' to go back)");
+        else
+           WriteText(1, 7, "");
+        if (k > Keys.keys + 1)
+           WriteText(1, 8, "(press 'Down' to end key definition)");
+        else
+           WriteText(1, 8, "");
+        }
+}
+
+void cInterface::LearnKeys(void)
+{
+  isyslog(LOG_INFO, "learning keys");
+  for (;;) {
+      Clear();
+      QueryKeys();
+      Clear();
+      WriteText(1, 1, "Learning Remote Control Keys");
+      WriteText(1, 3, "Phase 3: Saving key codes");
+      WriteText(1, 5, "Press 'Up' to save, 'Down' to cancel");
+      for (;;) {
+          eKeys key = GetKey();
+          if (key == kUp) {
+             Keys.Save();
+             Clear();
+             return;
+             }
+          else if (key == kDown) {
+             Keys.Load();
+             Clear();
+             return;
+             }
+          }
+      }
+}
+
+void cInterface::DisplayChannel(int Number, char *Name)
+{
+//TODO
+#ifndef DEBUG_REMOTE
+  RcIo.Number(Number);
+#endif
+}
diff --git a/interface.h b/interface.h
new file mode 100644
index 000000000..e387ab91f
--- /dev/null
+++ b/interface.h
@@ -0,0 +1,41 @@
+/*
+ * interface.h: Abstract user interface layer
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: interface.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef __INTERFACE_H
+#define __INTERFACE_H
+
+#include "config.h"
+
+class cInterface {
+public:
+  enum { MaxCols = 5 };
+private:
+  int open;
+  int cols[MaxCols];
+  unsigned int GetCh(void);
+  void QueryKeys(void);
+  void Write(int x, int y, char *s);
+public:
+  cInterface(void);
+  void Init(void);
+  void Open(void);
+  void Close(void);
+  eKeys GetKey(void);
+  void Clear(void);
+  void SetCols(int *c);
+  void WriteText(int x, int y, char *s, bool Current = false);
+  void Info(char *s);
+  void Error(char *s);
+  void LearnKeys(void);
+  void DisplayChannel(int Number, char *Name);
+  };
+
+extern cInterface Interface;
+
+#endif //__INTERFACE_H
diff --git a/keys-pc.conf b/keys-pc.conf
new file mode 100644
index 0000000000000000000000000000000000000000..c57613f03256f252e5e7ccac9e89c4954e3a3d15
GIT binary patch
literal 225
zcmX}jNeY8N5QSm4zSC6Cx{PtD2!R|Rq&ouv4Gwtygy>6c>iePUIK-4^IK()nY0Bk0
zIKO{elo-^*+Oss;)GsWL?zLH@Ms>OFr6iz9x0!bqr|13gPY2n*j6jhJn$$3)fh8>*
Q>EKC^Kn4_Kfs!oo0V-T99smFU

literal 0
HcmV?d00001

diff --git a/keys.conf b/keys.conf
new file mode 100644
index 000000000..f56222c34
--- /dev/null
+++ b/keys.conf
@@ -0,0 +1,19 @@
+Code	B
+Address	0000
+Up	000047E2
+Down	000007E2
+Menu	000011E2
+Ok	000079E2
+Back	00001AE2
+Left	000005E2
+Right	000045E2
+0	00007FE2
+1	00003FE2
+2	00005FE2
+3	00001FE2
+4	00006FE2
+5	00002FE2
+6	00004FE2
+7	00000FE2
+8	000077E2
+9	000037E2
diff --git a/menu.c b/menu.c
new file mode 100644
index 000000000..4f525ff7c
--- /dev/null
+++ b/menu.c
@@ -0,0 +1,745 @@
+/*
+ * menu.c: The actual menu implementations
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: menu.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "menu.h"
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include "config.h"
+#include "dvbapi.h"
+
+const char *FileNameChars = "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789/-.# ";//TODO more?
+
+// --- cMenuEditItem ---------------------------------------------------------
+
+class cMenuEditItem : public cOsdItem {
+private:
+  const char *name;
+  const char *value;
+public:
+  cMenuEditItem(const char *Name);
+  ~cMenuEditItem();
+  void SetValue(const char *Value);
+  };
+
+cMenuEditItem::cMenuEditItem(const char *Name)
+{
+  name = strdup(Name);
+  value = NULL;
+}
+
+cMenuEditItem::~cMenuEditItem()
+{
+  delete name;
+  delete value;
+}
+
+void cMenuEditItem::SetValue(const char *Value)
+{
+  delete value;
+  value = strdup(Value);
+  char *buffer = NULL;
+  asprintf(&buffer, "%s:\t%s", name, value);
+  SetText(buffer, false);
+  Display();
+}
+
+// --- cMenuEditIntItem ------------------------------------------------------
+
+class cMenuEditIntItem : public cMenuEditItem {
+protected:
+  int *value;
+  int min, max;
+  virtual void Set(void);
+public:
+  cMenuEditIntItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  min = Min;
+  max = Max;
+  Set();
+}
+
+void cMenuEditIntItem::Set(void)
+{
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%d", *value);
+  SetValue(buf);
+}
+
+eOSStatus cMenuEditIntItem::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cMenuEditItem::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     int newValue;
+     if (k0 <= Key && Key <= k9) {
+        if (fresh) {
+           *value = 0;
+           fresh = false;
+           }
+        newValue = *value  * 10 + (Key - k0);
+        }
+     else if (Key == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        newValue = *value - 1;
+        fresh = true;
+        }
+     else if (Key == kRight) {
+        newValue = *value + 1;
+        fresh = true;
+        }
+     else
+        return status;
+     if ((!fresh || min <= newValue) && newValue <= max) {
+        *value = newValue;
+        Set();
+        }
+     status = osContinue;
+     }
+  return status;
+}
+
+// --- cMenuEditBoolItem -----------------------------------------------------
+
+class cMenuEditBoolItem : public cMenuEditIntItem {
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditBoolItem(const char *Name, int *Value);
+  };
+
+cMenuEditBoolItem::cMenuEditBoolItem(const char *Name, int *Value)
+:cMenuEditIntItem(Name, Value, 0, 1)
+{
+  Set();
+}
+
+void cMenuEditBoolItem::Set(void)
+{
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%s", *value ? "yes" : "no");
+  SetValue(buf);
+}
+
+// --- cMenuEditChanItem -----------------------------------------------------
+
+class cMenuEditChanItem : public cMenuEditIntItem {
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditChanItem(const char *Name, int *Value);
+  };
+
+cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
+:cMenuEditIntItem(Name, Value, 1, Channels.Count())
+{
+  Set();
+}
+
+void cMenuEditChanItem::Set(void)
+{
+  char buf[255];
+  cChannel *channel = Channels.Get(*value - 1);
+  if (channel)
+     snprintf(buf, sizeof(buf), "%d %s", *value, channel->name);
+  else
+     *buf = 0;
+  SetValue(buf);
+}
+
+// --- cMenuEditDayItem ------------------------------------------------------
+
+class cMenuEditDayItem : public cMenuEditIntItem {
+protected:
+  static int days[];
+  int d;
+  virtual void Set(void);
+public:
+  cMenuEditDayItem(const char *Name, int *Value);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+int cMenuEditDayItem::days[] ={ cTimer::ParseDay("M------"),
+                                cTimer::ParseDay("-T-----"),
+                                cTimer::ParseDay("--W----"),
+                                cTimer::ParseDay("---T---"),
+                                cTimer::ParseDay("----F--"),
+                                cTimer::ParseDay("-----S-"),
+                                cTimer::ParseDay("------S"),
+                                cTimer::ParseDay("MTWTF--"),
+                                cTimer::ParseDay("MTWTFS-"),
+                                cTimer::ParseDay("MTWTFSS"),
+                                cTimer::ParseDay("-----SS"),
+                                0 };
+
+cMenuEditDayItem::cMenuEditDayItem(const char *Name, int *Value)
+:cMenuEditIntItem(Name, Value, -INT_MAX, 31)
+{
+  d = -1;
+  if (*value < 0) {
+     int n = 0;
+     while (days[n]) {
+           if (days[n] == *value) {
+              d = n;
+              break;
+              }
+           n++;
+           }
+     }
+  Set();
+}
+
+void cMenuEditDayItem::Set(void)
+{
+  SetValue(cTimer::PrintDay(*value));
+}
+
+eOSStatus cMenuEditDayItem::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kLeft:  if (d > 0)
+                    *value = days[--d];
+                 else if (d == 0) {
+                    *value = 31;
+                    d = -1;
+                    }
+                 else if (*value == 1) {
+                    d = sizeof(days) / sizeof(int) - 2;
+                    *value = days[d];
+                    }
+                 else
+                    return cMenuEditIntItem::ProcessKey(Key);
+                 Set();
+                 break;
+    case kRight: if (d >= 0) {
+                    *value = days[++d];
+                    if (*value == 0) {
+                       *value = 1;
+                       d = -1;
+                       }
+                    }
+                 else if (*value == 31) {
+                    d = 0;
+                    *value = days[d];
+                    }
+                 else
+                    return cMenuEditIntItem::ProcessKey(Key);
+                 Set();
+                 break;
+    default : return cMenuEditIntItem::ProcessKey(Key);
+    }
+  return osContinue;
+}
+
+// --- cMenuEditTimeItem -----------------------------------------------------
+
+class cMenuEditTimeItem : public cMenuEditItem {
+protected:
+  int *value;
+  int hh, mm;
+  int pos;
+  virtual void Set(void);
+public:
+  cMenuEditTimeItem(const char *Name, int *Value);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuEditTimeItem::cMenuEditTimeItem(const char *Name, int *Value)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  hh = *value / 100;
+  mm = *value % 100;
+  pos = 0;
+  Set();
+}
+
+void cMenuEditTimeItem::Set(void)
+{
+  char buf[10];
+  snprintf(buf, sizeof(buf), "%02d:%02d", hh, mm);
+  SetValue(buf);
+}
+
+eOSStatus cMenuEditTimeItem::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cMenuEditItem::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     if (k0 <= Key && Key <= k9) {
+        if (fresh || pos > 3) {
+           pos = 0;
+           fresh = false;
+           }
+        int n = Key - k0;
+        switch (pos) {
+          case 0: if (n <= 2) {
+                     hh = n * 10;
+                     mm = 0;
+                     pos++;
+                     }
+                  break;
+          case 1: if (hh + n <= 23) {
+                     hh += n;
+                     pos++;
+                     }
+                  break;
+          case 2: if (n <= 5) {
+                     mm += n * 10;
+                     pos++;
+                     }
+                  break;
+          case 3: if (mm + n <= 59) {
+                     mm += n;
+                     pos++;
+                     }
+                  break;
+          }
+        }
+     else if (Key == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (--mm < 0) {
+           mm = 59;
+           if (--hh < 0)
+              hh = 23;
+           }
+        fresh = true;
+        }
+     else if (Key == kRight) {
+        if (++mm > 59) {
+           mm = 0;
+           if (++hh > 23)
+              hh = 0;
+           }
+        fresh = true;
+        }
+     else
+        return status;
+     *value = hh * 100 + mm;
+     Set();
+     status = osContinue;
+     }
+  return status;
+}
+
+// --- cMenuEditChrItem ------------------------------------------------------
+
+class cMenuEditChrItem : public cMenuEditItem {
+private:
+  char *value;
+  const char *allowed;
+  const char *current;
+  virtual void Set(void);
+public:
+  cMenuEditChrItem(const char *Name, char *Value, const char *Allowed);
+  ~cMenuEditChrItem();
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Allowed)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  allowed = strdup(Allowed);
+  current = strchr(allowed, *Value);
+  if (!current)
+     current = allowed;
+  Set();
+}
+
+cMenuEditChrItem::~cMenuEditChrItem()
+{
+  delete allowed;
+}
+
+void cMenuEditChrItem::Set(void)
+{
+  char buf[2];
+  snprintf(buf, sizeof(buf), "%c", *value);
+  SetValue(buf);
+}
+
+eOSStatus cMenuEditChrItem::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cMenuEditItem::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     if (Key == kLeft) {
+        if (current > allowed)
+           current--;
+        }
+     else if (Key == kRight) {
+        if (*(current + 1))
+           current++;
+        }
+     else
+        return status;
+     *value = *current;
+     Set();
+     status = osContinue;
+     }
+  return status;
+}
+
+// --- cMenuEditStrItem ------------------------------------------------------
+
+class cMenuEditStrItem : public cMenuEditItem {
+private:
+  char *value;
+  int length;
+  const char *allowed;
+  int pos;
+  virtual void Set(void);
+  char Inc(char c, bool Up);
+public:
+  cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
+  ~cMenuEditStrItem();
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  length = Length;
+  allowed = strdup(Allowed);
+  pos = -1;
+  Set();
+}
+
+cMenuEditStrItem::~cMenuEditStrItem()
+{
+  delete allowed;
+}
+
+void cMenuEditStrItem::Set(void)
+{
+  char buf[1000];
+  if (pos >= 0) {
+     strncpy(buf, value, pos);
+     char *s = value[pos] != ' ' ? value + pos + 1 : "";
+     snprintf(buf + pos, sizeof(buf) - pos - 2, "[%c]%s", *(value + pos), s);
+     SetValue(buf);
+     }
+  else
+     SetValue(value);
+}
+
+char cMenuEditStrItem::Inc(char c, bool Up)
+{
+  const char *p = strchr(allowed, c);
+  if (!p)
+     p = allowed;
+  if (Up) {
+     if (!*++p)
+        p = allowed;
+     }
+  else if (--p < allowed)
+     p = allowed + strlen(allowed) - 1;
+  return *p;
+}
+
+eOSStatus cMenuEditStrItem::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kLeft:  if (pos > 0) {
+                    if (value[pos] == ' ')
+                       value[pos] = 0;
+                    pos--;
+                    }
+                 break;
+    case kRight: if (pos < length && value[pos] != ' ') {
+                    if (++pos >= int(strlen(value))) {
+                       value[pos] = ' ';
+                       value[pos + 1] = 0;
+                       }
+                    }
+                 break;
+    case kUp:
+    case kDown:  if (pos >= 0)
+                    value[pos] = Inc(value[pos], Key == kUp);
+                 else
+                    return cMenuEditItem::ProcessKey(Key);
+                 break;
+    case kOk:    if (pos >= 0) {
+                    if (value[pos] == ' ')
+                       value[pos] = 0;
+                    pos = -1;
+                    break;
+                    }
+                 // run into default
+    default:     return cMenuEditItem::ProcessKey(Key);
+    }
+  Set();
+  return osContinue;
+}
+
+// --- cMenuEditChannel ------------------------------------------------------
+
+class cMenuEditChannel : public cOsdMenu {
+private:
+  cChannel *channel;
+  cChannel data;
+public:
+  cMenuEditChannel(int Index);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuEditChannel::cMenuEditChannel(int Index)
+:cOsdMenu("Edit channel", 14)
+{
+  channel = Channels.Get(Index);
+  if (channel) {
+     data = *channel;
+     Add(new cMenuEditStrItem("Name",          data.name, sizeof(data.name), FileNameChars));
+     Add(new cMenuEditIntItem("Frequency",    &data.frequency, 10000, 13000)); //TODO exact limits???
+     Add(new cMenuEditChrItem("Polarization", &data.polarization, "hv"));
+     Add(new cMenuEditIntItem("Diseqc",       &data.diseqc, 0, 10)); //TODO exact limits???
+     Add(new cMenuEditIntItem("Srate",        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
+     Add(new cMenuEditIntItem("Vpid",         &data.vpid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem("Apid",         &data.apid, 0, 10000)); //TODO exact limits???
+     }
+}
+
+eOSStatus cMenuEditChannel::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cOsdMenu::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     if (Key == kOk) {
+        if (channel)
+           *channel = data;
+        Channels.Save();
+        status = osBack;
+        }
+     }
+  return status;
+}
+
+// --- cMenuChannelItem ------------------------------------------------------
+
+class cMenuChannelItem : public cOsdItem {
+private:
+  int index;
+  cChannel *channel;
+public:
+  cMenuChannelItem(int Index, cChannel *Channel);
+  virtual void Set(void);
+  };
+
+cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
+{
+  index = Index;
+  channel = Channel;
+  Set();
+}
+
+void cMenuChannelItem::Set(void)
+{
+  char *buffer = NULL;
+  asprintf(&buffer, "%d\t%s", index + 1, channel->name); // user visible channel numbers start with '1'
+  SetText(buffer, false);
+}
+
+// --- cMenuChannels ---------------------------------------------------------
+
+class cMenuChannels : public cOsdMenu {
+public:
+  cMenuChannels(void);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuChannels::cMenuChannels(void)
+:cOsdMenu("Channels", 4)
+{
+  //TODO
+  int i = 0;
+  cChannel *channel;
+
+  while ((channel = Channels.Get(i)) != NULL) {
+        Add(new cMenuChannelItem(i, channel), i == CurrentChannel);
+        i++;
+        }
+}
+
+eOSStatus cMenuChannels::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cOsdMenu::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     switch (Key) {
+       //TODO need to block this if we are already editing a channel!
+       case kRight: return AddSubMenu(new cMenuEditChannel(Current()));
+       case kOk:    {
+                      cChannel *ch = Channels.Get(Current());
+                      if (ch)
+                         ch->Switch();
+                      return osEnd;
+                    }
+       default: break;
+       }
+     }
+  return status;
+}
+
+// --- cMenuEditTimer --------------------------------------------------------
+
+class cMenuEditTimer : public cOsdMenu {
+private:
+  cTimer *timer;
+  cTimer data;
+public:
+  cMenuEditTimer(int Index);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuEditTimer::cMenuEditTimer(int Index)
+:cOsdMenu("Edit timer", 10)
+{
+  timer = Timers.Get(Index);
+  if (timer) {
+     data = *timer;
+     Add(new cMenuEditBoolItem("Active",       &data.active));
+     Add(new cMenuEditChanItem("Channel",      &data.channel)); 
+     Add(new cMenuEditDayItem( "Day",          &data.day)); 
+     Add(new cMenuEditTimeItem("Start",        &data.start)); 
+     Add(new cMenuEditTimeItem("Stop",         &data.stop)); 
+//TODO VPS???
+     Add(new cMenuEditChrItem( "Quality",      &data.quality, DvbQuality));
+     Add(new cMenuEditIntItem( "Priority",     &data.priority, 0, 99));
+     Add(new cMenuEditIntItem( "Lifetime",     &data.lifetime, 0, 99));
+     Add(new cMenuEditStrItem( "File",          data.file, sizeof(data.file), FileNameChars));
+     }
+}
+
+eOSStatus cMenuEditTimer::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cOsdMenu::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     if (Key == kOk) {
+        if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
+           *timer = data;
+           Timers.Save();
+           isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+           }
+        status = osBack;
+        }
+     }
+  return status;
+}
+
+// --- cMenuTimerItem --------------------------------------------------------
+
+class cMenuTimerItem : public cOsdItem {
+private:
+  int index;
+  cTimer *timer;
+public:
+  cMenuTimerItem(int Index, cTimer *Timer);
+  virtual void Set(void);
+  };
+
+cMenuTimerItem::cMenuTimerItem(int Index, cTimer *Timer)
+{
+  index = Index;
+  timer = Timer;
+  Set();
+}
+
+void cMenuTimerItem::Set(void)
+{
+  char *buffer = NULL;
+  asprintf(&buffer, "%d\t%c\t%d\t%s\t%02d:%02d\t%02d:%02d", index + 1,
+                    timer->active ? '>' : ' ', 
+                    timer->channel, 
+                    timer->PrintDay(timer->day), 
+                    timer->start / 100,
+                    timer->start % 100,
+                    timer->stop / 100,
+                    timer->stop % 100); // user visible timer numbers start with '1'
+  SetText(buffer, false);
+}
+
+// --- cMenuTimer ------------------------------------------------------------
+
+class cMenuTimer : public cOsdMenu {
+public:
+  cMenuTimer(void);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+cMenuTimer::cMenuTimer(void)
+:cOsdMenu("Timer", 3, 2, 4, 10, 6)
+{
+  int i = 0;
+  cTimer *timer;
+
+  while ((timer = Timers.Get(i)) != NULL) {
+        Add(new cMenuTimerItem(i, timer));
+        i++;
+        }
+}
+
+eOSStatus cMenuTimer::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cOsdMenu::ProcessKey(Key);
+
+  if (status == osUnknown) {
+     switch (Key) {
+       //TODO need to block this if we are already editing a channel!
+       case kOk: return AddSubMenu(new cMenuEditTimer(Current()));
+       //TODO new timer
+       //TODO delete timer
+       case kLeft:
+       case kRight: 
+            {
+              cTimer *timer = Timers.Get(Current());
+              if (timer) {
+                 timer->active = (Key == kRight);
+                 isyslog(LOG_INFO, "timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
+                 RefreshCurrent();
+                 DisplayCurrent(true);
+                 Timers.Save();
+                 }
+            }
+       default: break;
+       }
+     }
+  return status;
+}
+
+// --- cMenuMain -------------------------------------------------------------
+
+cMenuMain::cMenuMain(void)
+:cOsdMenu("Main")
+{
+  //TODO
+  Add(new cOsdItem("Channels",   osChannels));
+  Add(new cOsdItem("Timer",      osTimer));
+  Add(new cOsdItem("Recordings", osRecordings));
+}
+
+eOSStatus cMenuMain::ProcessKey(eKeys Key)
+{
+  eOSStatus status = cOsdMenu::ProcessKey(Key);
+
+  switch (status) {
+    case osChannels: return AddSubMenu(new cMenuChannels);
+    case osTimer:    return AddSubMenu(new cMenuTimer);
+    //TODO Replay
+    default: break;
+    }
+  return status;
+}
+
diff --git a/menu.h b/menu.h
new file mode 100644
index 000000000..849d8ee3d
--- /dev/null
+++ b/menu.h
@@ -0,0 +1,21 @@
+/*
+ * menu.h: The actual menu implementations
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: menu.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef _MENU_H
+#define _MENU_H
+
+#include "osd.h"
+
+class cMenuMain : public cOsdMenu {
+public:
+  cMenuMain(void);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+  
+#endif //_MENU_H
diff --git a/osd.c b/osd.c
new file mode 100644
index 000000000..d7ab69935
--- /dev/null
+++ b/osd.c
@@ -0,0 +1,196 @@
+/*
+ * osd.c: Abstract On Screen Display layer
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: osd.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "osd.h"
+#include <assert.h>
+#include <string.h>
+
+// --- cOsdItem --------------------------------------------------------------
+
+cOsdItem::cOsdItem(eOSStatus Status)
+{
+  text = NULL;
+  offset = -1;
+  status = Status;
+  fresh = false;
+}
+
+cOsdItem::cOsdItem(char *Text, eOSStatus Status)
+{
+  text = NULL;
+  offset = -1;
+  status = Status;
+  fresh = false;
+  SetText(Text);
+}
+
+cOsdItem::~cOsdItem()
+{
+  delete text;
+}
+
+void cOsdItem::SetText(char *Text, bool Copy)
+{
+  delete text;
+  text = Copy ? strdup(Text) : Text;
+}
+
+void cOsdItem::Display(int Offset, bool Current)
+{
+  fresh |= Offset >= 0;
+  Current |= Offset < 0;
+  if (Offset >= 0)
+     offset = Offset;
+  //TODO current if Offset == -1 ???
+  if (offset >= 0)
+     Interface.WriteText(0, offset + 2, text, Current);
+}
+
+eOSStatus cOsdItem::ProcessKey(eKeys Key)
+{
+  return Key == kOk ? status : osUnknown;
+}
+
+// --- cOsdMenu --------------------------------------------------------------
+
+cOsdMenu::cOsdMenu(char *Title, int c0, int c1, int c2, int c3, int c4)
+{
+  title = strdup(Title);
+  cols[0] = c0;
+  cols[1] = c1;
+  cols[2] = c2;
+  cols[3] = c3;
+  cols[4] = c4;
+  first = count = 0;
+  current = -1;
+  subMenu = NULL;
+  Interface.Open();
+}
+
+cOsdMenu::~cOsdMenu()
+{
+  delete title;
+  delete subMenu;
+  Interface.Clear();
+  Interface.Close();
+}
+
+void cOsdMenu::Add(cOsdItem *Item, bool Current)
+{
+  cList<cOsdItem>::Add(Item);
+  count++;
+  if (Current && current < 0)
+     current = Item->Index();
+}
+
+void cOsdMenu::Display(void)
+{
+  Interface.Clear();
+  Interface.SetCols(cols);
+  Interface.WriteText(0, 0, title);
+  if (current < 0 && count)
+     current = 0; // just for safety - there HAS to be a current item!
+  int n = 0;
+  if (current - first >= MAXOSDITEMS) {
+     first = current - MAXOSDITEMS / 2;
+     if (first + MAXOSDITEMS > count)
+        first = count - MAXOSDITEMS;
+     if (first < 0)
+        first = 0;
+     }
+  for (int i = first; i < count; i++) {
+      cOsdItem *item = Get(i);
+      if (item)
+         item->Display(i - first, i == current);
+      if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
+         break;
+      }
+}
+
+void cOsdMenu::RefreshCurrent(void)
+{
+  cOsdItem *item = Get(current);
+  if (item)
+     item->Set();
+}
+
+void cOsdMenu::DisplayCurrent(bool Current)
+{
+  cOsdItem *item = Get(current);
+  if (item)
+     item->Display(current - first, Current);
+}
+
+void cOsdMenu::CursorUp(void)
+{
+  if (current > 0) {
+     DisplayCurrent(false);
+     if (--current < first) {
+        first -= MAXOSDITEMS;
+        if (first < 0)
+           first = 0;
+        Display();
+        }
+     else
+        DisplayCurrent(true);
+     }
+}
+
+void cOsdMenu::CursorDown(void)
+{
+  if (current < count - 1) {
+     DisplayCurrent(false);
+     if (++current >= first + MAXOSDITEMS) {
+        first += MAXOSDITEMS;
+        if (first > count - MAXOSDITEMS)
+           first = count - MAXOSDITEMS;
+        Display();
+        }
+     else
+        DisplayCurrent(true);
+     }
+}
+
+eOSStatus cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
+{
+  delete subMenu;
+  subMenu = SubMenu;
+  subMenu->Display();
+  return osContinue; // convenience return value (see cMenuMain)
+}
+
+eOSStatus cOsdMenu::ProcessKey(eKeys Key)
+{
+  if (subMenu) {
+     eOSStatus status = subMenu->ProcessKey(Key);
+     if (status == osBack) {
+        delete subMenu;
+        subMenu = NULL;
+        RefreshCurrent();
+        Display();
+        status = osContinue;
+        }
+     return status;
+     }
+
+  cOsdItem *item = Get(current);
+  if (item) {
+     eOSStatus status = item->ProcessKey(Key);
+     if (status != osUnknown)
+        return status;
+     }
+  switch (Key) {
+    case kUp:   CursorUp();   break;
+    case kDown: CursorDown(); break;
+    case kBack: return osBack;
+    default: return osUnknown;
+    }
+  return osContinue;
+}
+
diff --git a/osd.h b/osd.h
new file mode 100644
index 000000000..392f1a752
--- /dev/null
+++ b/osd.h
@@ -0,0 +1,68 @@
+/*
+ * osd.h: Abstract On Screen Display layer
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: osd.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef __OSD_H
+#define __OSD_H
+
+#include "config.h"
+#include "interface.h"
+#include "tools.h"
+
+#define MAXOSDITEMS 9
+
+enum eOSStatus { osUnknown,
+                 osContinue,
+                 osProcessed,
+                 osChannels,
+                 osTimer,
+                 osRecordings,
+                 osBack,
+                 osEnd,
+               };
+
+class cOsdItem : public cListObject {
+private:
+  char *text;
+  int offset;
+  eOSStatus status;
+protected:
+  bool fresh;
+public:
+  cOsdItem(eOSStatus Status = osUnknown);
+  cOsdItem(char *Text, eOSStatus Status = osUnknown);
+  virtual ~cOsdItem();
+  void SetText(char *Text, bool Copy = true);
+  char *Text(void) { return text; }
+  void Display(int Offset = -1, bool Current = false);
+  virtual void Set(void) {}
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+class cOsdMenu : public cList<cOsdItem> {
+private:
+  char *title;
+  int cols[cInterface::MaxCols];
+  int first, current, count;
+  cOsdMenu *subMenu;
+protected:
+  void RefreshCurrent(void);
+  void DisplayCurrent(bool Current);
+  void CursorUp(void);
+  void CursorDown(void);
+  eOSStatus AddSubMenu(cOsdMenu *SubMenu);
+public:
+  cOsdMenu(char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
+  virtual ~cOsdMenu();
+  int Current(void) { return current; }
+  void Add(cOsdItem *Item, bool Current = false);
+  void Display(void);
+  virtual eOSStatus ProcessKey(eKeys Key);
+  };
+
+#endif //__OSD_H
diff --git a/osm.c b/osm.c
new file mode 100644
index 000000000..cc017451a
--- /dev/null
+++ b/osm.c
@@ -0,0 +1,119 @@
+/*
+ * osm.c: On Screen Menu for the Video Disk Recorder
+ *
+ * Copyright (C) 2000 Klaus Schmidinger
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ * 
+ * The author can be reached at kls@cadsoft.de
+ *
+ * The project's page is at http://www.cadsoft.de/people/kls/vdr
+ *
+ * $Id: osm.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "config.h"
+#include "dvbapi.h"
+#include "interface.h"
+#include "menu.h"
+#include "tools.h"
+
+#ifdef DEBUG_REMOTE
+#define KEYS_CONF "keys-pc.conf"
+#else
+#define KEYS_CONF "keys.conf"
+#endif
+
+int main(int argc, char *argv[])
+{
+  openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+  isyslog(LOG_INFO, "started");
+
+  Channels.Load("channels.conf");
+  Timers.Load("timers.conf");
+  if (!Keys.Load(KEYS_CONF))
+     Interface.LearnKeys();
+  Interface.Init();
+
+  cChannel::SwitchTo(CurrentChannel);
+
+  cMenuMain *Menu = NULL;
+  cTimer *Timer = NULL;
+  cDvbRecorder *Recorder = NULL;
+
+  for (;;) {
+      //TODO check for free disk space and delete files if necessary/possible
+      //     in case there is an ongoing recording
+      if (!Timer && (Timer = cTimer::GetMatch()) != NULL) {
+         // switch to channel:
+         isyslog(LOG_INFO, "timer %d start", Timer->Index() + 1);
+         delete Menu;
+         Menu = NULL;
+         cChannel::SwitchTo(Timer->channel - 1);
+         ChannelLocked = true;
+         // start recording:
+         delete Recorder;
+         Recorder = new cDvbRecorder;
+         //TODO special filename handling!!!
+         if (!Recorder->Record(Timer->file, Timer->quality)) {
+            delete Recorder;
+            Recorder = NULL;
+            }
+         }
+      if (Timer) {
+         if (!Timer->Matches()) {
+            // stop recording:
+            if (Recorder)
+               Recorder->Stop();
+            // end timer:
+            ChannelLocked = false;
+            isyslog(LOG_INFO, "timer %d stop", Timer->Index() + 1);
+            Timer = NULL;
+            //TODO switch back to the previous channel???
+            //TODO clear single event timer???
+            }
+         }
+      eKeys key = Interface.GetKey();
+      if (Menu) {
+         switch (Menu->ProcessKey(key)) {
+           default: if (key != kMenu)
+                       break;
+           case osBack:
+           case osEnd: delete Menu;
+                       Menu = NULL;
+                       break;
+           }
+         }
+      else {
+         switch (key) {
+           case kMenu: Menu = new cMenuMain;
+                       Menu->Display();
+                       break;
+           case kUp:
+           case kDown: {
+                         int n = CurrentChannel + (key == kUp ? 1 : -1);
+                         cChannel *channel = Channels.Get(n);
+                         if (channel)
+                            channel->Switch();
+                       }
+                       break;
+           default:    break;
+           }
+         }
+      }
+  closelog();
+  return 1;
+}
diff --git a/remote.c b/remote.c
new file mode 100644
index 000000000..c2fb36f61
--- /dev/null
+++ b/remote.c
@@ -0,0 +1,257 @@
+/*
+ * remote.c: Interface to the Remote Control Unit
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: remote.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "remote.h"
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <termios.h>
+#include <unistd.h>
+#include "tools.h"
+
+cRcIo::cRcIo(char *DeviceName)
+{
+  dp = 0;
+  mode = modeB;
+  code = 0;
+  address = 0xFFFF;
+  t = 0;
+  firstTime = lastTime = 0;
+  minDelta = 0;
+  lastCommand = 0;
+  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
+     struct termios t;
+     if (tcgetattr(f, &t) == 0) {
+        cfsetspeed(&t, B9600);
+        cfmakeraw(&t);
+        if (tcsetattr(f, TCSAFLUSH, &t) == 0)
+           return;
+        }
+     close(f);
+     }
+  f = -1;
+}
+
+cRcIo::~cRcIo()
+{
+  if (f >= 0)
+     close(f);
+}
+
+int cRcIo::ReceiveByte(bool Wait)
+{
+  // Returns the byte if one was received within 1 second, -1 otherwise
+  if (f >= 0) {
+     fd_set set;
+     struct timeval timeout;
+     timeout.tv_sec = Wait ? 1 : 0;
+     timeout.tv_usec = Wait ? 0 : 10000;
+     FD_ZERO(&set);
+     FD_SET(f, &set);
+     if (select(FD_SETSIZE, &set, NULL, NULL, &timeout)  > 0) {
+        if (FD_ISSET(f, &set)) {
+           unsigned char b;
+           if (read(f, &b, 1) == 1)
+              return b;
+           }
+        }
+     }
+  return -1;
+}
+
+bool cRcIo::SendByteHandshake(unsigned char c)
+{
+  if (f >= 0 && write(f, &c, 1) == 1) {
+     for (int reply = ReceiveByte(); reply >= 0;) {
+         if (reply == c)
+            return true;
+         else if (reply == 'X') {
+            // skip any incoming RC code - it will come again
+            for (int i = 6; i--;) {
+                if (ReceiveByte(false) < 0)
+                   return false;
+                }
+            }
+         else
+            return false;
+         }
+     }
+  return false;
+}
+
+bool cRcIo::SendByte(unsigned char c)
+{
+  for (int retry = 5; retry--;) {
+      if (SendByteHandshake(c))
+         return true;
+      }
+  return false;
+}
+
+void cRcIo::Flush(int WaitSeconds)
+{
+  time_t t0 = time(NULL);
+
+  for (;;) {
+      while (ReceiveByte(false) >= 0)
+            t0 = time(NULL);
+      if (time(NULL) - t0 >= WaitSeconds)
+         break;
+      }
+}
+
+bool cRcIo::SetCode(unsigned char Code, unsigned short Address)
+{
+  code = Code;
+  address = Address;
+  minDelta = 200;
+  return SendCommand(code);
+}
+
+bool cRcIo::SetMode(unsigned char Mode)
+{
+  mode = Mode;
+  return SendCommand(mode);
+}
+
+bool cRcIo::GetCommand(unsigned int *Command, unsigned short *Address)
+{
+#pragma pack(1)
+  union {
+    struct {
+      unsigned short address;
+      unsigned int command;
+      } data;
+    unsigned char raw[6];
+    } buffer;
+#pragma pack()
+    
+  Flush();
+  if (Command && ReceiveByte() == 'X') {
+     for (int i = 0; i < 6; i++) {
+         int b = ReceiveByte(false);
+         if (b >= 0)
+            buffer.raw[i] = b;
+         else
+            return false;
+         }
+     if (Address)
+        *Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
+     else if (address != ntohs(buffer.data.address))
+        return false;
+     *Command = ntohl(buffer.data.command);
+     if (code == 'B' && address == 0x0000 && *Command == 0x00004000)
+        // Well, well, if it isn't the "d-box"...
+        // This remote control sends the above command before and after
+        // each keypress - let's just drop this:
+        return false;
+     if (*Command == lastCommand) {
+        // let's have a timeout to avoid getting overrun by commands
+        int now = time_ms();
+        int delta = now - lastTime;
+        if (delta < minDelta)
+           minDelta = delta; // dynamically adjust to the smallest delta
+        lastTime = now;
+        if (delta < minDelta * 1.3) { // if commands come in rapidly...
+           if (now - firstTime < 250)
+              return false; // ...repeat function kicks in after 250ms
+           return true;
+           }
+        }
+     lastTime = firstTime = time_ms();
+     lastCommand = *Command;
+     return true;
+     }
+  if (time(NULL) - t > 60) {
+     SendCommand(code); // in case the PIC listens to the wrong code
+     t = time(NULL);
+     }
+  return false;
+}
+
+bool cRcIo::SendCommand(unsigned char Cmd)
+{ 
+  return SendByte(Cmd | 0x80);
+}
+
+bool cRcIo::Digit(int n, int v)
+{ 
+  return SendByte(((n & 0x03) << 5) | (v & 0x0F) | (((dp >> n) & 0x01) << 4));
+}
+
+bool cRcIo::Number(int n, bool Hex)
+{
+  if (!Hex) {
+     char buf[8];
+     sprintf(buf, "%4d", n & 0xFFFF);
+     n = 0;
+     for (char *d = buf; *d; d++) {
+         if (*d == ' ')
+            *d = 0xF;
+         n = (n << 4) | ((*d - '0') & 0x0F);
+         }
+     }
+  for (int i = 0; i < 4; i++) {
+      if (!Digit(i, n))
+         return false;
+      n >>= 4;
+      }
+  return SendCommand(mode);
+}
+
+bool cRcIo::String(char *s)
+{
+  char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
+  int n = 0;
+
+  for (int i = 0; *s && i < 4; s++, i++) {
+      n <<= 4;
+      for (char *c = chars; *c; c++) {
+          if (*c == *s) {
+             n |= c - chars;
+             break;
+             }
+          }
+      }
+  return Number(n, mode == modeH);
+}
+
+bool cRcIo::DetectCode(unsigned char *Code, unsigned short *Address)
+{
+  // Caller should initialize 'Code' to 0 and call DetectCode()
+  // until it returns true. Whenever DetectCode() returns false
+  // and 'Code' is not 0, the caller can use 'Code' to display
+  // a message like "Trying code '%c'". If false is returned and
+  // 'Code' is 0, all possible codes have been tried and the caller
+  // can either stop calling DetectCode() (and give some error
+  // message), or start all over again.
+  if (*Code < 'A' || *Code > 'D') {
+     *Code = 'A';
+     return false;
+     }
+  if (*Code <= 'D') {
+     SetMode(modeH);
+     char buf[5];
+     sprintf(buf, "C0D%c", *Code);
+     String(buf);
+     SetCode(*Code, 0);
+     unsigned int Command;
+     if (GetCommand(&Command, Address))
+        return true;
+     if (*Code < 'D') {
+        (*Code)++;
+        return false;
+        }
+     }
+  *Code = 0;
+  return false;
+}
+
diff --git a/remote.h b/remote.h
new file mode 100644
index 000000000..682792912
--- /dev/null
+++ b/remote.h
@@ -0,0 +1,43 @@
+/*
+ * remote.h: Interface to the Remote Control Unit
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: remote.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef __REMOTE_H
+#define __REMOTE_H
+
+#include <stdio.h>
+#include <time.h>
+
+class cRcIo {
+private:
+  int f;
+  unsigned char dp, code, mode;
+  unsigned short address;
+  time_t t;
+  int firstTime, lastTime, minDelta;
+  unsigned int lastCommand;
+  bool SendCommand(unsigned char Cmd);
+  int ReceiveByte(bool Wait = true);
+  bool SendByteHandshake(unsigned char c);
+  bool SendByte(unsigned char c);
+public:
+  enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  cRcIo(char *DeviceName);
+  ~cRcIo();
+  void Flush(int WaitSeconds = 0);
+  bool SetCode(unsigned char Code, unsigned short Address);
+  bool SetMode(unsigned char Mode);
+  bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
+  bool Digit(int n, int v);
+  bool Number(int n, bool Hex = false);
+  void Points(unsigned char Dp) { dp = Dp; }
+  bool String(char *s);
+  bool DetectCode(unsigned char *Code, unsigned short *Address);
+  };
+
+#endif //__REMOTE_H
diff --git a/timers.conf b/timers.conf
new file mode 100644
index 000000000..ac002a996
--- /dev/null
+++ b/timers.conf
@@ -0,0 +1,9 @@
+1:2:-----S-:2210:2320:H:99:99:Wochenshow
+1:3:M------:2125:2205:H:99:99:Neues
+1:15:MTWTF--:1828:1901:M:10:5:nano
+1:2:-----S-:1737:1827:H:99:99:kls/StarTrek/DS9
+1:3:M------:2110:2230:H:99:99:SevenDays
+1:3:---T---:2215:2300:H:99:99:SwItch
+0:1:1:0:0:H:99:99:#
+0:1:1:0:0:H:99:99:#
+0:1:1:0:0:L:0:5:#
diff --git a/tools.c b/tools.c
new file mode 100644
index 000000000..e0eeaefda
--- /dev/null
+++ b/tools.c
@@ -0,0 +1,124 @@
+/*
+ * tools.c: Various tools
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: tools.c 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#include "tools.h"
+#include <stdlib.h>
+#include <sys/time.h>
+
+int time_ms(void)
+{
+  struct timeval t;
+  if (gettimeofday(&t, NULL) == 0)
+     return t.tv_sec * 1000 + t.tv_usec / 1000;
+  return 0;
+}
+
+// --- cListObject -----------------------------------------------------------
+
+cListObject::cListObject(void)
+{
+  prev = next = NULL;
+}
+
+cListObject::~cListObject()
+{
+}
+
+void cListObject::Append(cListObject *Object)
+{
+  next = Object;
+  Object->prev = this;
+}
+
+void cListObject::Unlink(void)
+{
+  if (next)
+     next->prev = prev;
+  if (prev)
+     prev->next = next;
+}
+
+int cListObject::Index(void)
+{
+  cListObject *p = prev;
+  int i = 0;
+
+  while (p) {
+        i++;
+        p = p->prev;
+        }
+  return i;
+}
+
+// --- cListBase -------------------------------------------------------------
+
+cListBase::cListBase(void)
+{ 
+  objects = lastObject = NULL;
+}
+
+cListBase::~cListBase()
+{
+  Clear();
+  while (objects) {
+        cListObject *object = objects->Next();
+        delete objects;
+        objects = object;
+        }
+}
+
+void cListBase::Add(cListObject *Object) 
+{ 
+  if (lastObject)
+     lastObject->Append(Object);
+  else
+     objects = Object;
+  lastObject = Object;
+}
+
+void cListBase::Del(cListObject *Object)
+{
+  if (Object == objects)
+     objects = Object->Next();
+  if (Object == lastObject)
+     lastObject = Object->Prev();
+  Object->Unlink();
+  delete Object;
+}
+
+void cListBase::Clear(void)
+{
+  while (objects) {
+        cListObject *object = objects->Next();
+        delete objects;
+        objects = object;
+        }
+  objects = lastObject = NULL;
+}
+
+cListObject *cListBase::Get(int Index)
+{
+  cListObject *object = objects;
+  while (object && Index-- > 0)
+        object = object->Next();
+  return object;
+}
+
+int cListBase::Count(void)
+{
+  int n = 0;
+  cListObject *object = objects;
+
+  while (object) {
+        n++;
+        object = object->Next();
+        }
+  return n;
+}
+
diff --git a/tools.h b/tools.h
new file mode 100644
index 000000000..43f852542
--- /dev/null
+++ b/tools.h
@@ -0,0 +1,54 @@
+/*
+ * tools.h: Various tools
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: tools.h 1.1 2000/02/19 13:36:48 kls Exp $
+ */
+
+#ifndef __TOOLS_H
+#define __TOOLS_H
+
+#include <syslog.h>
+
+//TODO
+#define dsyslog syslog
+#define esyslog syslog
+#define isyslog syslog
+
+class cListObject {
+private:
+  cListObject *prev, *next;
+public:
+  cListObject(void);
+  virtual ~cListObject();
+  void Append(cListObject *Object);
+  void Unlink(void);
+  int Index(void);
+  cListObject *Prev(void) { return prev; }
+  cListObject *Next(void) { return next; }
+  };
+
+class cListBase {
+protected:
+  cListObject *objects, *lastObject;
+  cListBase(void);
+public:
+  virtual ~cListBase();
+  void Add(cListObject *Object);
+  void Del(cListObject *Object);
+  void Clear(void);
+  cListObject *Get(int Index);
+  int Count(void);
+  };
+
+template<class T> class cList : public cListBase {
+public:
+  T *Get(int Index) { return (T *)cListBase::Get(Index); }
+  T *First(void) { return (T *)objects; }
+  };
+
+int time_ms(void);
+
+#endif //__TOOLS_H

From 6feebe674c09b65e43012bf439c201cfb65aa82c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 11 Mar 2000 18:00:00 +0100
Subject: [PATCH 002/307] Version 0.02 - Fixed compilation with only
 DEBUG_REMOTE=1. - Menus now use colors. - Support for "Red", "Green",
 "Yellow", "Blue" buttons. - Channels and Timers can now be added, deleted and
 moved. - Basic record/play file handling support (no actual record/playback
 yet).

---
 HISTORY       |  12 ++
 Makefile      |  11 +-
 README        |  36 +++-
 TODO          |   5 +-
 channels.conf |   2 +-
 config.c      | 118 +++++++++----
 config.h      |  16 +-
 dvbapi.c      | 168 ++++++++++++++++---
 dvbapi.h      |  70 ++++++--
 interface.c   | 202 ++++++++++++----------
 interface.h   |  20 ++-
 keys-pc.conf  | Bin 225 -> 283 bytes
 keys.conf     |   4 +
 menu.c        | 454 ++++++++++++++++++++++++++++++++++++++++----------
 menu.h        |   4 +-
 osd.c         | 131 ++++++++++-----
 osd.h         |  42 +++--
 osm.c         |  57 ++++---
 recording.c   | 238 ++++++++++++++++++++++++++
 recording.h   |  56 +++++++
 timers.conf   |  11 +-
 tools.c       |  71 +++++++-
 tools.h       |  16 +-
 23 files changed, 1378 insertions(+), 366 deletions(-)
 create mode 100644 HISTORY
 create mode 100644 recording.c
 create mode 100644 recording.h

diff --git a/HISTORY b/HISTORY
new file mode 100644
index 000000000..f7eeb65ef
--- /dev/null
+++ b/HISTORY
@@ -0,0 +1,12 @@
+Video Disk Recorder OSM Revision History
+----------------------------------------
+
+2000-02-19: Version 0.01 (Initial revision).
+
+2000-03-11: Version 0.02
+
+- Fixed compilation with only DEBUG_REMOTE=1.
+- Menus now use colors.
+- Support for "Red", "Green", "Yellow", "Blue" buttons.
+- Channels and Timers can now be added, deleted and moved.
+- Basic record/play file handling support (no actual record/playback yet).
diff --git a/Makefile b/Makefile
index 6696dff11..b5153cfc8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@
 # See the main source file 'osm.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.1 2000/02/19 13:36:48 kls Exp $
+# $Id: Makefile 1.2 2000/03/05 13:51:57 kls Exp $
 
-OBJS = config.o dvbapi.o interface.o menu.o osd.o remote.o tools.o osm.o
+OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o osm.o
 
 ifdef DEBUG_REMOTE
 DEFINES += -DDEBUG_REMOTE
@@ -24,9 +24,10 @@ all: osm
 config.o   : config.c config.h dvbapi.h interface.h tools.h
 dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h
 interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
-menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h tools.h
-osd.o      : osd.c config.h interface.h osd.h tools.h
-osm.o      : osm.c config.h dvbapi.h interface.h menu.h osd.h tools.h
+menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
+osd.o      : osd.c config.h dvbapi.h interface.h osd.h tools.h
+osm.o      : osm.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
+recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h
 remote.o   : remote.c remote.h tools.h
 tools.o    : tools.c tools.h
 
diff --git a/README b/README
index e4fa836ec..5c6928cb4 100644
--- a/README
+++ b/README
@@ -36,10 +36,34 @@ about that driver). For example, if the DVB driver was
 extracted into the directory /home/kls/vdr/DVB, then this
 package should be extracted into /home/kls/vdr/OSM.
 
+In order for the menu colors to work correctly you may want
+to replace the function RGB2YUV() in DVB/driver/dvb.c with
+
+static u32 RGB2YUV(u16 R, u16 G, u16 B)
+{
+        u16 y, u, v;
+        u16 Y, Cr, Cb;
+
+        y = R * 77 + G * 150 + B * 29;  // Luma=0.299R+0.587G+0.114B 0..65535
+        u = 2048+B * 8 -(y>>5);    // Cr 0..4095
+        v = 2048+R * 8 -(y>>5);    // Cb 0..4095
+
+        Y = y >> 8;
+        Cb= u >> 4;
+        Cr= v >> 4;
+
+        return Cr|(Cb<<16)|(Y<<8);
+}
+
+(this may no longer be necessary with driver versions after 0.03c).
+
 After extracting the package, change into the OSM directory
 and type 'make'. This should produce an executable file
 named 'osm', which can be run after the DVB driver has been
-installed.
+installed. There may be several warnings about "implicit declaration
+of function `int asprintf(...)'" during the compilation, which I was
+unable to avoid (anybody know how to avoid them?). Just ignore them,
+the program will work, anyway.
 
 There are two macros you can use to customize the 'osm' program
 at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call
@@ -75,10 +99,10 @@ this package contains the codes for the "d-box" remote control unit.
 If you want to use a different remote control unit, simply delete
 the file 'keys.conf' and restart the 'osm' program. The program will
 then start a key learning session in which it first attempts to determine
-the basic data tranfer mode and timing of your remote control unit,
+the basic data transfer mode and timing of your remote control unit,
 and then will ask you to press one key after the other so that it can
 learn the various key codes. You will at least need to provide an "Up"
-and a "Down" key, so that you can switch channels. The rest os the key
+and a "Down" key, so that you can switch channels. The rest of the key
 definitions is optional, but the more keys you define, the more you
 will be able to navigate through the menus.
 
@@ -97,9 +121,6 @@ confirms any changes (or switches to a channel in the "Channels" menu).
 The "Back" key goes back one level in the menu structure, discarding
 any changes that might have been made in the current menu.
 
-In the "Channels" menu, the current channel can be edited by pressing
-the "Right" key.
-
 In the "Timers" menu, the current timer can be enabled or disabled with
 the "Right" or "Left" key, respectively (enabled timers are marked with ">").
 "Ok" here opens the "Edit timer" menu.
@@ -110,6 +131,9 @@ character as in "[R]TL"), selecting the desired character position with
 "Left" and "Right", and changing the character with the "Up" and "Down"
 keys. "Ok" then confirms the changes.
 
+The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
+in the various menus and are listed at the bottom of the on-screen-display.
+
 At any point in the menu system, pressing the "Menu" key again will
 immediately leave the menu system.
 
diff --git a/TODO b/TODO
index 32793469c..35e3aa306 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,12 @@
 TODO list for the Video Disk Recorder project
 ---------------------------------------------
 
-* Implement a way to add and delete channels and timers.
 * Implement recording to disk and playback from disk.
-* Implement disk file management (delete old/viewed files to make
-  room for new recordings if necessary).
 * Make it work with two DVB-S PCI cards to allow simultaneous
   recording of one programme, while replaying another programme
   (or maybe the same one, but time delayed).
+  Maybe we can do this with only a single card, if the card
+  driver/firmware allows simultaneuos record/playback?
 * Implement "on-disk editing" to allow "cutting out" of certain
   scenes in order to archive them (or, reversely, cut out
   commercial breaks).
diff --git a/channels.conf b/channels.conf
index 9daca0aff..1b5796363 100644
--- a/channels.conf
+++ b/channels.conf
@@ -42,7 +42,7 @@ B1:12722:h:1:22000:601:602
 ARD Online-Kanal:12722:h:1:22000:8191:701
 Premiere World Promo:11798:h:1:27500:255:256
 TV Niepokalanow:11876:h:1:27500:305:321
-test card:11876:h:1:27500:306:322
+test card:11798:h:1:27500:511:512
 Mosaico:11934:v:1:27500:165:100
 Andalucia TV:11934:v:1:27500:166:104
 TVC Internacional:11934:v:1:27500:167:108
diff --git a/config.c b/config.c
index 50315691e..af97a5cb4 100644
--- a/config.c
+++ b/config.c
@@ -4,37 +4,40 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: config.c 1.2 2000/03/05 16:14:27 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
-#include <time.h>
 #include "dvbapi.h"
 #include "interface.h"
 
 // -- cKeys ------------------------------------------------------------------
 
 tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
-                    { kUp,    "Up",    0 },
-                    { kDown,  "Down",  0 },
-                    { kMenu,  "Menu",  0 },
-                    { kOk,    "Ok",    0 },
-                    { kBack,  "Back",  0 },
-                    { kLeft,  "Left",  0 },
-                    { kRight, "Right", 0 },
-                    { k0,     "0",     0 },
-                    { k1,     "1",     0 },
-                    { k2,     "2",     0 },
-                    { k3,     "3",     0 },
-                    { k4,     "4",     0 },
-                    { k5,     "5",     0 },
-                    { k6,     "6",     0 },
-                    { k7,     "7",     0 },
-                    { k8,     "8",     0 },
-                    { k9,     "9",     0 },
-                    { kNone,  "",      0 },
+                    { kUp,     "Up",     0 },
+                    { kDown,   "Down",   0 },
+                    { kMenu,   "Menu",   0 },
+                    { kOk,     "Ok",     0 },
+                    { kBack,   "Back",   0 },
+                    { kLeft,   "Left",   0 },
+                    { kRight,  "Right",  0 },
+                    { k0,      "0",      0 },
+                    { k1,      "1",      0 },
+                    { k2,      "2",      0 },
+                    { k3,      "3",      0 },
+                    { k4,      "4",      0 },
+                    { k5,      "5",      0 },
+                    { k6,      "6",      0 },
+                    { k7,      "7",      0 },
+                    { k8,      "8",      0 },
+                    { k9,      "9",      0 },
+                    { kRed,    "Red",    0 },
+                    { kGreen,  "Green",  0 },
+                    { kYellow, "Yellow", 0 },
+                    { kBlue,   "Blue",   0 },
+                    { kNone,   "",       0 },
                   };
 
 cKeys::cKeys(void)
@@ -160,6 +163,17 @@ cChannel::cChannel(void)
   *name = 0;
 }
 
+cChannel::cChannel(const cChannel *Channel)
+{
+  strcpy(name,   Channel ? Channel->name         : "Pro7");
+  frequency    = Channel ? Channel->frequency    : 12480;
+  polarization = Channel ? Channel->polarization : 'v';
+  diseqc       = Channel ? Channel->diseqc       : 1;
+  srate        = Channel ? Channel->srate        : 27500;
+  vpid         = Channel ? Channel->vpid         : 255;
+  apid         = Channel ? Channel->apid         : 256;
+}
+
 bool cChannel::Parse(char *s)
 {
   char *buffer = NULL;
@@ -203,6 +217,17 @@ bool cChannel::SwitchTo(int i)
 
 cTimer::cTimer(void)
 {
+  startTime = stopTime = 0;
+  recording = false;
+  active = 1;
+  channel = CurrentChannel + 1;
+  day = 1; //XXX today!
+  start = 0; //XXX now!
+  stop = 0; //XXX now + 2h!
+//TODO VPS???
+  quality = 'H';
+  priority = 99;
+  lifetime = 99;
   *file = 0;
 }
 
@@ -211,6 +236,13 @@ int cTimer::TimeToInt(int t)
   return (t / 100 * 60 + t % 100) * 60;
 }
 
+time_t cTimer::Day(time_t t)
+{
+  struct tm d = *localtime(&t);
+  d.tm_hour = d.tm_min = d.tm_sec = 0;
+  return mktime(&d);
+}
+
 int cTimer::ParseDay(char *s)
 {
   char *tail;
@@ -270,13 +302,17 @@ bool cTimer::Save(FILE *f)
   return fprintf(f, "%d:%d:%s:%d:%d:%c:%d:%d:%s\n", active, channel, PrintDay(day), start, stop, quality, priority, lifetime, file) > 0;
 }
 
+bool cTimer::IsSingleEvent(void)
+{
+  return (day & 0x80000000) == 0;
+}
+
 bool cTimer::Matches(void)
 {
   if (active) {
      time_t t = time(NULL);
-     struct tm *now = localtime(&t);
-     int weekday = now->tm_wday == 0 ? 6 : now->tm_wday - 1; // we start with monday==0!
-     int current = (now->tm_hour * 60 + now->tm_min) * 60 + now->tm_sec;
+     struct tm now = *localtime(&t);
+     int weekday = now.tm_wday == 0 ? 6 : now.tm_wday - 1; // we start with monday==0!
      int begin = TimeToInt(start);
      int end   = TimeToInt(stop);
      bool twoDays = (end < begin);
@@ -291,20 +327,44 @@ bool cTimer::Matches(void)
               yesterdayMatches = true;
            }
         }
-     else if (day == now->tm_mday)
+     else if (day == now.tm_mday)
         todayMatches = true;
      else if (twoDays) {
-        t -= 86400;
-        now = localtime(&t);
-        if (day == now->tm_mday)
+        time_t ty = t - SECSINDAY;
+        if (day == localtime(&ty)->tm_mday)
            yesterdayMatches = true;
         }
-     return (todayMatches && current >= begin && (current <= end || twoDays))
-            || (twoDays && yesterdayMatches && current <= end);
+     if (todayMatches || (twoDays && yesterdayMatches)) {
+        startTime = Day(t - (yesterdayMatches ? SECSINDAY : 0)) + begin;
+        stopTime  = startTime + (twoDays ? SECSINDAY - begin + end : end - begin);
+        }
+     else
+        startTime = stopTime = 0;
+     return startTime <= t && t <= stopTime;
      }
   return false;
 }
 
+time_t cTimer::StartTime(void)
+{ 
+  if (!startTime)
+     Matches();
+  return startTime;
+}
+
+time_t cTimer::StopTime(void)
+{ 
+  if (!stopTime)
+     Matches();
+  return stopTime;
+}
+
+void cTimer::SetRecording(bool Recording)
+{
+  recording = Recording;
+  isyslog(LOG_INFO, "timer %d %s", Index() + 1, recording ? "start" : "stop");
+}
+
 cTimer *cTimer::GetMatch(void)
 {
   cTimer *t = (cTimer *)Timers.First();
diff --git a/config.h b/config.h
index 3abb7a1ac..51fd22e01 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: config.h 1.2 2000/03/05 14:58:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 #include "tools.h"
 
 #define MaxBuffer 1000
@@ -25,6 +26,10 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kLeft,
              kRight,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+             kRed,
+             kGreen,
+             kYellow,
+             kBlue,
              kNone
            };
 
@@ -60,6 +65,7 @@ class cChannel : public cListObject {
   int vpid;
   int apid;
   cChannel(void);
+  cChannel(const cChannel *Channel);
   bool Parse(char *s);
   bool Save(FILE *f);
   bool Switch(void);
@@ -67,8 +73,11 @@ class cChannel : public cListObject {
   };
 
 class cTimer : public cListObject {
+private:
+  time_t startTime, stopTime;
 public:
   enum { MaxFileName = 256 };
+  bool recording;
   int active;
   int channel;
   int day;
@@ -82,9 +91,14 @@ class cTimer : public cListObject {
   cTimer(void);
   bool Parse(char *s);
   bool Save(FILE *f);
+  bool IsSingleEvent(void);
   bool Matches(void);
+  time_t StartTime(void);
+  time_t StopTime(void);
+  void SetRecording(bool Recording);
   static cTimer *GetMatch(void);
   static int TimeToInt(int t);
+  static time_t Day(time_t t);
   static int ParseDay(char *s);
   static char *PrintDay(int d);
   };
diff --git a/dvbapi.c b/dvbapi.c
index 5597fbd50..484a22e56 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,20 +4,14 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: dvbapi.c 1.2 2000/03/11 10:39:09 kls Exp $
  */
 
-// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
-typedef unsigned int u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
-
 #include "dvbapi.h"
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include "../DVB/driver/dvb.h"
 #include "interface.h"
 #include "tools.h"
 
@@ -60,6 +54,7 @@ bool DvbSetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, i
 
 cDvbRecorder::cDvbRecorder(void)
 {
+  recording = false;
 }
 
 cDvbRecorder::~cDvbRecorder()
@@ -67,18 +62,41 @@ cDvbRecorder::~cDvbRecorder()
   Stop();
 }
 
+bool cDvbRecorder::Recording(void)
+{
+  return recording;
+}
+
 bool cDvbRecorder::Record(const char *FileName, char Quality)
 {
   isyslog(LOG_INFO, "record %s (%c)", FileName, Quality);
-  return true;
+  if (MakeDirs(FileName)) {
+     FILE *f = fopen(FileName, "a");
+     if (f) {
+        fprintf(f, "%s, %c\n", FileName, Quality);
+        fclose(f);
+        recording = true;
+        // TODO
+        Interface.Error("Recording not yet implemented!");
+        return true;
+        }
+     else {
+        Interface.Error("Can't write to file!");
+        return false;
+        }
+     }
   // TODO
   return false;
 }
 
 bool cDvbRecorder::Play(const char *FileName, int Frame)
 {
-  isyslog(LOG_INFO, "play %s (%d)", FileName, Frame);
-  // TODO
+  if (!recording) {
+     isyslog(LOG_INFO, "play %s (%d)", FileName, Frame);
+     // TODO
+     Interface.Error("Playback not yet implemented!");
+     return true;
+     }
   return false;
 }
 
@@ -106,6 +124,7 @@ bool cDvbRecorder::Pause(void)
 void cDvbRecorder::Stop(void)
 {
   isyslog(LOG_INFO, "stop");
+  recording = false;
   // TODO
 }
 
@@ -116,9 +135,57 @@ int cDvbRecorder::Frame(void)
   return 0;
 }
 
-// ---------------------------------------------------------------------------
+// --- cDvbOsd ---------------------------------------------------------------
 
-static void DvbOsdCmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, void *data = NULL)
+cDvbOsd::cDvbOsd(void)
+{
+  cols = rows = 0;
+#ifdef DEBUG_OSD
+  memset(&colorPairs, 0, sizeof(colorPairs));
+  initscr();
+  start_color();
+  keypad(stdscr, TRUE);
+  nonl();
+  cbreak();
+  noecho();
+  timeout(1000);
+  leaveok(stdscr, TRUE);
+  window = stdscr;
+#endif
+#ifdef DEBUG_REMOTE
+  initscr();
+  keypad(stdscr, TRUE);
+  nonl();
+  cbreak();
+  noecho();
+  timeout(1000);
+#endif
+}
+
+cDvbOsd::~cDvbOsd()
+{
+  Close();
+}
+
+#ifdef DEBUG_OSD
+void cDvbOsd::SetColor(eDvbColor colorFg, eDvbColor colorBg)
+{
+  int color = (colorBg << 16) | colorFg | 0x80000000;
+  for (int i = 0; i < MaxColorPairs; i++) {
+      if (!colorPairs[i]) {
+         colorPairs[i] = color;
+         init_pair(i + 1, colorFg, colorBg);
+         wattrset(window, COLOR_PAIR(i + 1));
+         break;
+         }
+      else if (color == colorPairs[i]) {
+         wattrset(window, COLOR_PAIR(i + 1));
+         break;
+         }
+      }
+}
+#else
+void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
   int v = open(VIDEODEVICE, O_RDWR);
 
@@ -130,37 +197,88 @@ static void DvbOsdCmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, in
      dc.y0    = y0;
      dc.x1    = x1;
      dc.y1    = y1;
-     dc.data  = data;
+     dc.data  = (void *)data;
      ioctl(v, VIDIOCSOSDCOMMAND, &dc);
      close(v);
      }
   else
      Interface.Error("can't open VIDEODEVICE");//XXX
 }
+#endif
+
+void cDvbOsd::Open(int w, int h)
+{
+  cols = w;
+  rows = h;
+#ifdef DEBUG_OSD
+  //XXX size...
+  #define B2C(b) (((b) * 1000) / 255)
+  #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
+#else
+  w *= charWidth;
+  h *= lineHeight;
+  int x = (720 - w) / 2; //TODO PAL vs. NTSC???
+  int y = (576 - h) / 2;
+  Cmd(OSD_Open, 4, x, y, x + w - 1, y + h - 1);
+  #define SETCOLOR(n, r, g, b, o) Cmd(OSD_SetColor, n, r, g, b, o)
+#endif
+  SETCOLOR(clrBackground, 0x00, 0x00, 0x00, 127); // background 50% gray
+  SETCOLOR(clrBlack,      0x00, 0x00, 0x00, 255);
+  SETCOLOR(clrRed,        0xFC, 0x14, 0x14, 255);
+  SETCOLOR(clrGreen,      0x24, 0xFC, 0x24, 255);
+  SETCOLOR(clrYellow,     0xFC, 0xC0, 0x24, 255);
+  SETCOLOR(clrBlue,       0x00, 0x00, 0xFC, 255);
+  SETCOLOR(clrCyan,       0x00, 0xFC, 0xFC, 255);
+  SETCOLOR(clrMagenta,    0xB0, 0x00, 0xFC, 255);
+  SETCOLOR(clrWhite,      0xFC, 0xFC, 0xFC, 255);
+}
 
-void DvbOsdOpen(int x, int y, int w, int h)
+void cDvbOsd::Close(void)
 {
-  DvbOsdCmd(OSD_Open, 1, x, y, x + w - 1, y + h - 1);
-  DvbOsdCmd(OSD_SetColor, 0,   0,   0,   0, 127); // background 50% gray
-  DvbOsdCmd(OSD_SetColor, 1, 255, 255, 255, 255); // text white
+#ifndef DEBUG_OSD
+  Cmd(OSD_Close);
+#endif
 }
 
-void DvbOsdClose(void)
+void cDvbOsd::Clear(void)
 {
-  DvbOsdCmd(OSD_Close);
+#ifdef DEBUG_OSD
+  SetColor(clrBackground, clrBackground);
+  Fill(0, 0, cols, rows, clrBackground);
+#else
+  Cmd(OSD_Clear);
+#endif
 }
 
-void DvbOsdClear(void)
+void cDvbOsd::Fill(int x, int y, int w, int h, eDvbColor color)
 {
-  DvbOsdCmd(OSD_Clear);
+  if (x < 0) x = cols + x;
+  if (y < 0) y = rows + y;
+#ifdef DEBUG_OSD
+  SetColor(color, color);
+  for (int r = 0; r < h; r++) {
+      wmove(window, y + r, x); // ncurses wants 'y' before 'x'!
+      whline(window, ' ', w);
+      }
+#else
+  Cmd(OSD_FillBlock, color, x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1);
+#endif
 }
 
-void DvbOsdClrEol(int x, int y)
+void cDvbOsd::ClrEol(int x, int y, eDvbColor color)
 {
-  DvbOsdCmd(OSD_FillBlock, 0, x, y * DvbOsdLineHeight, x + 490, (y + 1) * DvbOsdLineHeight);//XXX
+  Fill(x, y, cols - x, 1, color);
 }
 
-void DvbOsdText(int x, int y, char *s)
+void cDvbOsd::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
 {
-  DvbOsdCmd(OSD_Text, 1, x, y, 1, 0, s);
+  if (x < 0) x = cols + x;
+  if (y < 0) y = rows + y;
+#ifdef DEBUG_OSD
+  SetColor(colorFg, colorBg);
+  wmove(window, y, x); // ncurses wants 'y' before 'x'!
+  waddstr(window, s);
+#else
+  Cmd(OSD_Text, (int(colorBg) << 16) | colorFg, x * charWidth, y * lineHeight, 1, 0, s);
+#endif
 }
diff --git a/dvbapi.h b/dvbapi.h
index 6a8f0400e..2e8406ee8 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,23 +4,51 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: dvbapi.h 1.2 2000/03/06 19:47:20 kls Exp $
  */
 
 #ifndef __DVBAPI_H
 #define __DVBAPI_H
 
-const int DvbOsdCharWidth  = 12; //XXX
-const int DvbOsdLineHeight = 25;
+// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
 
+#if defined(DEBUG_OSD) || defined(DEBUG_REMOTE)
+#include <ncurses.h>
+#endif
+#include "../DVB/driver/dvb.h"
+
+enum eDvbColor { clrBackground,
+#ifndef DEBUG_OSD
+                 clrOBSOLETE, //FIXME apparently color '1' can't be used as FgColor with e.g. clrRed as BgColor???
+                 clrBlack,
+#else
+                 clrBlack = clrBackground,
+#endif
+                 clrRed,
+                 clrGreen,
+                 clrYellow,
+                 clrBlue,
+                 clrMagenta,
+                 clrCyan,
+                 clrWhite,
+               };
+                  
 extern const char *DvbQuality; // Low, Medium, High
 
 bool DvbSetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid);
 
 class cDvbRecorder {
+private:
+  bool recording;
 public:
   cDvbRecorder(void);
   ~cDvbRecorder();
+  bool Recording(void);
+       // Returns true if this recorder is currently recording, false if it
+       // is playing back or does nothing.
   bool Record(const char *FileName, char Quality);
        // Starts recording the current channel into the given file, with the
        // given quality level. Any existing file will be overwritten.
@@ -30,8 +58,9 @@ class cDvbRecorder {
   bool Play(const char *FileName, int Frame = 0);
        // Starts playback of the given file, at the optional Frame (default
        // is the beginning of the file). If Frame is beyond the last recorded
-       // frame in the file, or if it is negative, playback will be positioned
-       // to the last frame in the file and will do an implicit Pause() there.
+       // frame in the file (or if it is negative), playback will be positioned
+       // to the last frame in the file (or the frame with the absolute value of
+       // Frame) and will do an implicit Pause() there.
        // If there is already a playback session active, it will be stopped
        // and the new file or frame (which may be in the same file) will
        // be played back.
@@ -56,10 +85,29 @@ class cDvbRecorder {
        // The very first frame has the number 1.
   };
 
-void DvbOsdOpen(int x, int y, int w, int h);
-void DvbOsdClose(void);
-void DvbOsdClear(void);
-void DvbOsdClrEol(int x, int y);
-void DvbOsdText(int x, int y, char *s);
-
+class cDvbOsd {
+private:
+  enum { charWidth  = 12, // average character width
+         lineHeight = 27  // smallest text height
+       };
+#ifdef DEBUG_OSD
+  WINDOW *window;
+  enum { MaxColorPairs = 16 };
+  int colorPairs[MaxColorPairs];
+  void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
+#else
+  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
+#endif
+  int cols, rows;
+public:
+  cDvbOsd(void);
+  ~cDvbOsd();
+  void Open(int w, int h);
+  void Close(void);
+  void Clear(void);
+  void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
+  void ClrEol(int x, int y, eDvbColor color = clrBackground);
+  void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
+  };
+  
 #endif //__DVBAPI_H
diff --git a/interface.c b/interface.c
index 58c28f1f9..6a4b2a4e2 100644
--- a/interface.c
+++ b/interface.c
@@ -4,20 +4,21 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: interface.c 1.2 2000/03/06 19:45:03 kls Exp $
  */
 
 #include "interface.h"
-#include <ncurses.h>
 #include <unistd.h>
-#include "dvbapi.h"
 #include "remote.h"
 
+#define MenuLines   15
+#define MenuColumns 40
+
 #ifndef DEBUG_REMOTE
 cRcIo RcIo("/dev/ttyS1");//XXX
 #endif
 
-WINDOW *window;
+cDvbOsd DvbOsd; //XXX member of cInterface???
 
 cInterface Interface;
 
@@ -25,16 +26,6 @@ cInterface::cInterface(void)
 {
   open = 0;
   cols[0] = 0;
-#ifdef DEBUG_OSD
-  initscr();
-  keypad(stdscr, TRUE);
-  nonl();
-  cbreak();
-  noecho();
-  leaveok(stdscr, TRUE);
-  window = stdscr;
-#else
-#endif
 }
 
 void cInterface::Init(void)
@@ -46,24 +37,14 @@ void cInterface::Init(void)
 
 void cInterface::Open(void)
 {
-  if (!open++) {
-#ifdef DEBUG_OSD
-#else
-//TODO
-     DvbOsdOpen(100, 100, 500, 400);
-#endif
-     }
+  if (!open++)
+     DvbOsd.Open(MenuColumns, MenuLines);
 }
 
 void cInterface::Close(void)
 {
-  if (!--open) {
-#ifdef DEBUG_OSD
-#else
-//TODO
-     DvbOsdClose();
-#endif
-     }
+  if (!--open)
+     DvbOsd.Close();
 }
 
 unsigned int cInterface::GetCh(void)
@@ -71,9 +52,9 @@ unsigned int cInterface::GetCh(void)
 #ifdef DEBUG_REMOTE
   return getch();
 #else
-#ifdef DEBUG_OSD
-  wrefresh(window);//XXX
-#endif
+//XXX #ifdef DEBUG_OSD
+//XXX   wrefresh(window);//XXX
+//XXX #endif
   unsigned int Command;
   return RcIo.GetCommand(&Command) ? Command : 0;
 #endif
@@ -84,16 +65,28 @@ eKeys cInterface::GetKey(void)
   return Keys.Get(GetCh());
 }
 
+eKeys cInterface::Wait(int Seconds)
+{
+  int t0 = time_ms();
+
+  while (time_ms() - t0 < Seconds * 1000) {
+        eKeys Key = GetKey();
+        if (Key != kNone)
+           return Key;
+        }
+  return kNone;
+}
+
 void cInterface::Clear(void)
 {
-  if (open) {
-#ifdef DEBUG_OSD
-     wclear(window);
-#else
-//TODO
-     DvbOsdClear();
-#endif
-     }
+  if (open)
+     DvbOsd.Clear();
+}
+
+void cInterface::ClearEol(int x, int y, eDvbColor Color)
+{
+  if (open)
+     DvbOsd.ClrEol(x, y, Color);
 }
 
 void cInterface::SetCols(int *c)
@@ -105,34 +98,22 @@ void cInterface::SetCols(int *c)
       }
 }
 
-void cInterface::Write(int x, int y, char *s)
+void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
-  if (open) {
-#ifdef DEBUG_OSD
-     wmove(window, y, x); // ncurses wants 'y' before 'x'!
-     waddstr(window, s);
-#else
-     DvbOsdText(x * DvbOsdCharWidth, y * DvbOsdLineHeight, s);
-#endif
-     }
+  if (open)
+     DvbOsd.Text(x, y, s, FgColor, BgColor);
 }
 
-void cInterface::WriteText(int x, int y, char *s, bool Current)
+void cInterface::WriteText(int x, int y, const char *s, bool Current)
 {
   if (open) {
-#ifdef DEBUG_OSD
-     wmove(window, y, x); // ncurses wants 'y' before 'x'!
-     wclrtoeol(window);//XXX
-#else
-//TODO
-     DvbOsdClrEol(x * DvbOsdCharWidth, y);//XXX
-#endif
-     Write(x, y, Current ? "*" : " ");
-     x++;
+     eDvbColor FgColor = Current ? clrBlack : clrWhite;
+     eDvbColor BgColor = Current ? clrCyan : clrBackground;
+     ClearEol(x, y, BgColor);
      int col = 0;
      for (;;) {
-         char *t = strchr(s, '\t');
-         char *p = s;
+         const char *t = strchr(s, '\t');
+         const char *p = s;
          char buf[1000];
          if (t && col < MaxCols && cols[col] > 0) {
             unsigned int n = t - s;
@@ -143,7 +124,7 @@ void cInterface::WriteText(int x, int y, char *s, bool Current)
             p = buf;
             s = t + 1;
             }
-         Write(x, y, p);
+         Write(x, y, p, FgColor, BgColor);
          if (p == s)
             break;
          x += cols[col++];
@@ -151,38 +132,74 @@ void cInterface::WriteText(int x, int y, char *s, bool Current)
      }
 }
 
-void cInterface::Info(char *s)
+void cInterface::Title(const char *s)
+{
+  int x = (MenuColumns - strlen(s)) / 2;
+  if (x < 0)
+     x = 0;
+  ClearEol(0, 0, clrCyan);
+  Write(x, 0, s, clrBlack, clrCyan);
+}
+
+void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
+{
+  ClearEol(0, -3, s ? BgColor : clrBackground);
+  if (s)
+     Write(0, -3, s, FgColor, BgColor);
+}
+
+void cInterface::Info(const char *s)
 {
   Open();
-  isyslog(LOG_ERR, s);
-  WriteText(0, 11, s);//TODO
-#ifdef DEBUG_OSD
-  wrefresh(window);//XXX
-#endif
-  sleep(1);
-  WriteText(0, 11, "");//TODO
-#ifdef DEBUG_OSD
-  wrefresh(window);//XXX
-#endif
+  isyslog(LOG_INFO, s);
+  Status(s, clrWhite, clrGreen);
+  Wait();
+  Status(NULL);
   Close();
 }
 
-void cInterface::Error(char *s)
+void cInterface::Error(const char *s)
 {
   Open();
   esyslog(LOG_ERR, s);
-  WriteText(0, 12, s);//TODO
-#ifdef DEBUG_OSD
-  wrefresh(window);//XXX
-#endif
-  sleep(1);
-  WriteText(0, 12, "");//TODO
-#ifdef DEBUG_OSD
-  wrefresh(window);//XXX
-#endif
+  Status(s, clrWhite, clrRed);
+  Wait();
+  Status(NULL);
   Close();
 }
 
+bool cInterface::Confirm(const char *s)
+{
+  Open();
+  isyslog(LOG_INFO, "confirm: %s", s);
+  Status(s, clrBlack, clrGreen);
+  bool result = Wait(10) == kOk;
+  Status(NULL);
+  Close();
+  isyslog(LOG_INFO, "%sconfirmed", result ? "" : "not ");
+  return result;
+}
+
+void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor)
+{
+  if (open && Text) {
+     const int w = MenuColumns / 4;
+     int l = (w - strlen(Text)) / 2;
+     if (l < 0)
+        l = 0;
+     DvbOsd.Fill(Index * w, -1, w, 1, BgColor);
+     DvbOsd.Text(Index * w + l, -1, Text, FgColor, BgColor);
+     }
+}
+
+void cInterface::Help(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  HelpButton(0, Red,    clrBlack, clrRed);
+  HelpButton(1, Green,  clrBlack, clrGreen);
+  HelpButton(2, Yellow, clrBlack, clrYellow);
+  HelpButton(3, Blue,   clrWhite, clrBlue);
+}
+
 void cInterface::QueryKeys(void)
 {
   Keys.Clear();
@@ -205,8 +222,8 @@ void cInterface::QueryKeys(void)
          WriteText(1, 5, "RC code detected!");
          WriteText(1, 6, "Do not press any key...");
          RcIo.Flush(3);
-         WriteText(1, 5, "");
-         WriteText(1, 6, "");
+         ClearEol(0, 5);
+         ClearEol(0, 6);
          break;
          }
 #endif
@@ -229,8 +246,8 @@ void cInterface::QueryKeys(void)
                  case kDown: if (k > Keys.keys + 1) {
                                 WriteText(1, 5, "Press 'Up' to confirm");
                                 WriteText(1, 6, "Press 'Down' to continue");
-                                WriteText(1, 7, "");
-                                WriteText(1, 8, "");
+                                ClearEol(0, 7);
+                                ClearEol(0, 8);
                                 for (;;) {
                                     eKeys key = GetKey();
                                     if (key == kUp) {
@@ -238,7 +255,7 @@ void cInterface::QueryKeys(void)
                                        return;
                                        }
                                     else if (key == kDown) {
-                                       WriteText(1, 6, "");
+                                       ClearEol(0, 6);
                                        break;
                                        }
                                     }
@@ -255,17 +272,18 @@ void cInterface::QueryKeys(void)
         if (k > Keys.keys)
            WriteText(1, 7, "(press 'Up' to go back)");
         else
-           WriteText(1, 7, "");
+           ClearEol(0, 7);
         if (k > Keys.keys + 1)
            WriteText(1, 8, "(press 'Down' to end key definition)");
         else
-           WriteText(1, 8, "");
+           ClearEol(0, 8);
         }
 }
 
 void cInterface::LearnKeys(void)
 {
   isyslog(LOG_INFO, "learning keys");
+  Open();
   for (;;) {
       Clear();
       QueryKeys();
@@ -277,19 +295,19 @@ void cInterface::LearnKeys(void)
           eKeys key = GetKey();
           if (key == kUp) {
              Keys.Save();
-             Clear();
+             Close();
              return;
              }
           else if (key == kDown) {
              Keys.Load();
-             Clear();
+             Close();
              return;
              }
           }
       }
 }
 
-void cInterface::DisplayChannel(int Number, char *Name)
+void cInterface::DisplayChannel(int Number, const char *Name)
 {
 //TODO
 #ifndef DEBUG_REMOTE
diff --git a/interface.h b/interface.h
index e387ab91f..9322cf39d 100644
--- a/interface.h
+++ b/interface.h
@@ -4,13 +4,14 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: interface.h 1.2 2000/02/27 14:54:02 kls Exp $
  */
 
 #ifndef __INTERFACE_H
 #define __INTERFACE_H
 
 #include "config.h"
+#include "dvbapi.h"
 
 class cInterface {
 public:
@@ -20,7 +21,8 @@ class cInterface {
   int cols[MaxCols];
   unsigned int GetCh(void);
   void QueryKeys(void);
-  void Write(int x, int y, char *s);
+  void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
+  eKeys Wait(int Seconds = 1);
 public:
   cInterface(void);
   void Init(void);
@@ -28,12 +30,18 @@ class cInterface {
   void Close(void);
   eKeys GetKey(void);
   void Clear(void);
+  void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void SetCols(int *c);
-  void WriteText(int x, int y, char *s, bool Current = false);
-  void Info(char *s);
-  void Error(char *s);
+  void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
+  void WriteText(int x, int y, const char *s, bool Current = false);
+  void Title(const char *s);
+  void Status(const char *s, eDvbColor FgColor = clrBlack, eDvbColor BgColor = clrCyan);
+  void Info(const char *s);
+  void Error(const char *s);
+  bool Confirm(const char *s);
+  void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
-  void DisplayChannel(int Number, char *Name);
+  void DisplayChannel(int Number, const char *Name);
   };
 
 extern cInterface Interface;
diff --git a/keys-pc.conf b/keys-pc.conf
index c57613f03256f252e5e7ccac9e89c4954e3a3d15..cfbe4587144cd511eac35a937b408cb2fc648c1a 100644
GIT binary patch
delta 65
zcmaFJIGbt0L#v?F6ix#WFf_2_axY3v&4Y0rxgt|@a`MYzd?zlaoYGVn&zTDVVfqlt

delta 6
NcmbQu^pJ7FLjVan0`UL<

diff --git a/keys.conf b/keys.conf
index f56222c34..0e3c07bc7 100644
--- a/keys.conf
+++ b/keys.conf
@@ -17,3 +17,7 @@ Right	000045E2
 7	00000FE2
 8	000077E2
 9	000037E2
+Red	000025E2
+Green	00002AE2
+Yellow	00005AE2
+Blue	00000000
diff --git a/menu.c b/menu.c
index 4f525ff7c..45f25a46a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: menu.c 1.2 2000/03/05 15:37:31 kls Exp $
  */
 
 #include "menu.h"
@@ -13,8 +13,9 @@
 #include <string.h>
 #include "config.h"
 #include "dvbapi.h"
+#include "recording.h"
 
-const char *FileNameChars = "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789/-.# ";//TODO more?
+const char *FileNameChars = "aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.# ";
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -59,7 +60,7 @@ class cMenuEditIntItem : public cMenuEditItem {
   virtual void Set(void);
 public:
   cMenuEditIntItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max)
@@ -78,11 +79,11 @@ void cMenuEditIntItem::Set(void)
   SetValue(buf);
 }
 
-eOSStatus cMenuEditIntItem::ProcessKey(eKeys Key)
+eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
 {
-  eOSStatus status = cMenuEditItem::ProcessKey(Key);
+  eOSState state = cMenuEditItem::ProcessKey(Key);
 
-  if (status == osUnknown) {
+  if (state == osUnknown) {
      int newValue;
      if (k0 <= Key && Key <= k9) {
         if (fresh) {
@@ -100,14 +101,14 @@ eOSStatus cMenuEditIntItem::ProcessKey(eKeys Key)
         fresh = true;
         }
      else
-        return status;
+        return state;
      if ((!fresh || min <= newValue) && newValue <= max) {
         *value = newValue;
         Set();
         }
-     status = osContinue;
+     state = osContinue;
      }
-  return status;
+  return state;
 }
 
 // --- cMenuEditBoolItem -----------------------------------------------------
@@ -167,7 +168,7 @@ class cMenuEditDayItem : public cMenuEditIntItem {
   virtual void Set(void);
 public:
   cMenuEditDayItem(const char *Name, int *Value);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 int cMenuEditDayItem::days[] ={ cTimer::ParseDay("M------"),
@@ -205,7 +206,7 @@ void cMenuEditDayItem::Set(void)
   SetValue(cTimer::PrintDay(*value));
 }
 
-eOSStatus cMenuEditDayItem::ProcessKey(eKeys Key)
+eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
     case kLeft:  if (d > 0)
@@ -252,7 +253,7 @@ class cMenuEditTimeItem : public cMenuEditItem {
   virtual void Set(void);
 public:
   cMenuEditTimeItem(const char *Name, int *Value);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditTimeItem::cMenuEditTimeItem(const char *Name, int *Value)
@@ -272,11 +273,11 @@ void cMenuEditTimeItem::Set(void)
   SetValue(buf);
 }
 
-eOSStatus cMenuEditTimeItem::ProcessKey(eKeys Key)
+eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
 {
-  eOSStatus status = cMenuEditItem::ProcessKey(Key);
+  eOSState state = cMenuEditItem::ProcessKey(Key);
 
-  if (status == osUnknown) {
+  if (state == osUnknown) {
      if (k0 <= Key && Key <= k9) {
         if (fresh || pos > 3) {
            pos = 0;
@@ -324,12 +325,12 @@ eOSStatus cMenuEditTimeItem::ProcessKey(eKeys Key)
         fresh = true;
         }
      else
-        return status;
+        return state;
      *value = hh * 100 + mm;
      Set();
-     status = osContinue;
+     state = osContinue;
      }
-  return status;
+  return state;
 }
 
 // --- cMenuEditChrItem ------------------------------------------------------
@@ -343,7 +344,7 @@ class cMenuEditChrItem : public cMenuEditItem {
 public:
   cMenuEditChrItem(const char *Name, char *Value, const char *Allowed);
   ~cMenuEditChrItem();
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Allowed)
@@ -369,11 +370,11 @@ void cMenuEditChrItem::Set(void)
   SetValue(buf);
 }
 
-eOSStatus cMenuEditChrItem::ProcessKey(eKeys Key)
+eOSState cMenuEditChrItem::ProcessKey(eKeys Key)
 {
-  eOSStatus status = cMenuEditItem::ProcessKey(Key);
+  eOSState state = cMenuEditItem::ProcessKey(Key);
 
-  if (status == osUnknown) {
+  if (state == osUnknown) {
      if (Key == kLeft) {
         if (current > allowed)
            current--;
@@ -383,12 +384,12 @@ eOSStatus cMenuEditChrItem::ProcessKey(eKeys Key)
            current++;
         }
      else
-        return status;
+        return state;
      *value = *current;
      Set();
-     status = osContinue;
+     state = osContinue;
      }
-  return status;
+  return state;
 }
 
 // --- cMenuEditStrItem ------------------------------------------------------
@@ -404,7 +405,7 @@ class cMenuEditStrItem : public cMenuEditItem {
 public:
   cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
   ~cMenuEditStrItem();
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed)
@@ -449,7 +450,7 @@ char cMenuEditStrItem::Inc(char c, bool Up)
   return *p;
 }
 
-eOSStatus cMenuEditStrItem::ProcessKey(eKeys Key)
+eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
     case kLeft:  if (pos > 0) {
@@ -492,11 +493,11 @@ class cMenuEditChannel : public cOsdMenu {
   cChannel data;
 public:
   cMenuEditChannel(int Index);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditChannel::cMenuEditChannel(int Index)
-:cOsdMenu("Edit channel", 14)
+:cOsdMenu("Edit Channel", 14)
 {
   channel = Channels.Get(Index);
   if (channel) {
@@ -511,19 +512,19 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      }
 }
 
-eOSStatus cMenuEditChannel::ProcessKey(eKeys Key)
+eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 {
-  eOSStatus status = cOsdMenu::ProcessKey(Key);
+  eOSState state = cOsdMenu::ProcessKey(Key);
 
-  if (status == osUnknown) {
+  if (state == osUnknown) {
      if (Key == kOk) {
         if (channel)
            *channel = data;
         Channels.Save();
-        status = osBack;
+        state = osBack;
         }
      }
-  return status;
+  return state;
 }
 
 // --- cMenuChannelItem ------------------------------------------------------
@@ -535,6 +536,7 @@ class cMenuChannelItem : public cOsdItem {
 public:
   cMenuChannelItem(int Index, cChannel *Channel);
   virtual void Set(void);
+  void SetIndex(int Index);
   };
 
 cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
@@ -551,12 +553,24 @@ void cMenuChannelItem::Set(void)
   SetText(buffer, false);
 }
 
+void cMenuChannelItem::SetIndex(int Index)
+{
+  index = Index;
+  Set();
+}
+
 // --- cMenuChannels ---------------------------------------------------------
 
 class cMenuChannels : public cOsdMenu {
+protected:
+  eOSState Switch(void);
+  eOSState Edit(void);
+  eOSState New(void);
+  eOSState Del(void);
+  virtual void Move(int From, int To);
 public:
   cMenuChannels(void);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuChannels::cMenuChannels(void)
@@ -570,26 +584,124 @@ cMenuChannels::cMenuChannels(void)
         Add(new cMenuChannelItem(i, channel), i == CurrentChannel);
         i++;
         }
+  SetHelp("Edit", "New", "Delete", "Mark");
+}
+
+eOSState cMenuChannels::Switch(void)
+{
+  cChannel *ch = Channels.Get(Current());
+  if (ch)
+     ch->Switch();
+  return osEnd;
+}
+
+eOSState cMenuChannels::Edit(void)
+{
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
+  isyslog(LOG_INFO, "editing timer %d", Current() + 1);
+  return AddSubMenu(new cMenuEditChannel(Current()));
+}
+
+eOSState cMenuChannels::New(void)
+{
+  if (HasSubMenu())
+     return osContinue;
+  cChannel *channel = new cChannel(Channels.Get(Current()));
+  Channels.Add(channel);
+  Add(new cMenuChannelItem(channel->Index()/*XXX*/, channel), true);
+  Channels.Save();
+  isyslog(LOG_INFO, "channel %d added", channel->Index() + 1);
+  return AddSubMenu(new cMenuEditChannel(Current()));
 }
 
-eOSStatus cMenuChannels::ProcessKey(eKeys Key)
+eOSState cMenuChannels::Del(void)
 {
-  eOSStatus status = cOsdMenu::ProcessKey(Key);
+  if (Count() > 0) {
+     int Index = Current();
+     // Check if there is a timer using this channel:
+     for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
+         if (ti->channel == Index + 1) {
+            Interface.Error("Channel is being used by a timer!");
+            return osContinue;
+            }
+         }
+     if (Interface.Confirm("Delete Channel?")) {
+        // Move and renumber the channels:
+        Channels.Del(Channels.Get(Index));
+        cOsdMenu::Del(Index);
+        int i = 0;
+        for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
+            ci->SetIndex(i++);
+        Channels.Save();
+        isyslog(LOG_INFO, "channel %d deleted", Index + 1);
+        // Fix the timers:
+        bool TimersModified = false;
+        Index++; // user visible channel numbers start with '1'
+        for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
+            int OldChannel = ti->channel;
+            if (ti->channel > Index)
+               ti->channel--;
+            if (ti->channel != OldChannel) {
+               TimersModified = true;
+               isyslog(LOG_INFO, "timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
+               }
+            }
+        if (TimersModified)
+           Timers.Save();
+        Display();
+        }
+     }
+  return osContinue;
+}
 
-  if (status == osUnknown) {
+void cMenuChannels::Move(int From, int To)
+{
+  // Move and renumber the channels:
+  Channels.Move(From, To);
+  cOsdMenu::Move(From, To);
+  int i = 0;
+  for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
+      ci->SetIndex(i++);
+  Channels.Save();
+  isyslog(LOG_INFO, "channel %d moved to %d", From + 1, To + 1);
+  // Fix the timers:
+  bool TimersModified = false;
+  From++; // user visible channel numbers start with '1'
+  To++;
+  for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
+      int OldChannel = ti->channel;
+      if (ti->channel == From)
+         ti->channel = To;
+      else if (ti->channel > From && ti->channel <= To)
+         ti->channel--;
+      else if (ti->channel < From && ti->channel >= To)
+         ti->channel++;
+      if (ti->channel != OldChannel) {
+         TimersModified = true;
+         isyslog(LOG_INFO, "timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
+         }
+      }
+  if (TimersModified)
+     Timers.Save();
+  Display();
+}
+
+eOSState cMenuChannels::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
      switch (Key) {
-       //TODO need to block this if we are already editing a channel!
-       case kRight: return AddSubMenu(new cMenuEditChannel(Current()));
-       case kOk:    {
-                      cChannel *ch = Channels.Get(Current());
-                      if (ch)
-                         ch->Switch();
-                      return osEnd;
-                    }
+       case kOk:     return Switch();
+       case kRed:    return Edit();
+       case kGreen:  return New();
+       case kYellow: return Del();
+       case kBlue:   Mark(); break;
        default: break;
        }
      }
-  return status;
+  return state;
 }
 
 // --- cMenuEditTimer --------------------------------------------------------
@@ -600,11 +712,11 @@ class cMenuEditTimer : public cOsdMenu {
   cTimer data;
 public:
   cMenuEditTimer(int Index);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditTimer::cMenuEditTimer(int Index)
-:cOsdMenu("Edit timer", 10)
+:cOsdMenu("Edit Timer", 10)
 {
   timer = Timers.Get(Index);
   if (timer) {
@@ -622,21 +734,23 @@ cMenuEditTimer::cMenuEditTimer(int Index)
      }
 }
 
-eOSStatus cMenuEditTimer::ProcessKey(eKeys Key)
+eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 {
-  eOSStatus status = cOsdMenu::ProcessKey(Key);
+  eOSState state = cOsdMenu::ProcessKey(Key);
 
-  if (status == osUnknown) {
+  if (state == osUnknown) {
      if (Key == kOk) {
+        if (!*data.file)
+           strcpy(data.file, "unnamed");
         if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
            *timer = data;
            Timers.Save();
            isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
            }
-        status = osBack;
+        state = osBack;
         }
      }
-  return status;
+  return state;
 }
 
 // --- cMenuTimerItem --------------------------------------------------------
@@ -660,27 +774,34 @@ cMenuTimerItem::cMenuTimerItem(int Index, cTimer *Timer)
 void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
-  asprintf(&buffer, "%d\t%c\t%d\t%s\t%02d:%02d\t%02d:%02d", index + 1,
+  asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
                     timer->active ? '>' : ' ', 
                     timer->channel, 
                     timer->PrintDay(timer->day), 
                     timer->start / 100,
                     timer->start % 100,
                     timer->stop / 100,
-                    timer->stop % 100); // user visible timer numbers start with '1'
+                    timer->stop % 100,
+                    timer->file);
   SetText(buffer, false);
 }
 
-// --- cMenuTimer ------------------------------------------------------------
+// --- cMenuTimers -----------------------------------------------------------
 
-class cMenuTimer : public cOsdMenu {
+class cMenuTimers : public cOsdMenu {
+private:
+  eOSState Activate(bool On);
+  eOSState Edit(void);
+  eOSState New(void);
+  eOSState Del(void);
+  virtual void Move(int From, int To);
 public:
-  cMenuTimer(void);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  cMenuTimers(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuTimer::cMenuTimer(void)
-:cOsdMenu("Timer", 3, 2, 4, 10, 6)
+cMenuTimers::cMenuTimers(void)
+:cOsdMenu("Timer", 2, 4, 10, 6, 6)
 {
   int i = 0;
   cTimer *timer;
@@ -689,34 +810,190 @@ cMenuTimer::cMenuTimer(void)
         Add(new cMenuTimerItem(i, timer));
         i++;
         }
+  SetHelp("Edit", "New", "Delete", "Mark");
+}
+
+eOSState cMenuTimers::Activate(bool On)
+{
+  cTimer *timer = Timers.Get(Current());
+  if (timer && timer->active != On) {
+     timer->active = On;
+     RefreshCurrent();
+     DisplayCurrent(true);
+     isyslog(LOG_INFO, "timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
+     Timers.Save();
+     }
+  return osContinue;
+}
+
+eOSState cMenuTimers::Edit(void)
+{
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
+  isyslog(LOG_INFO, "editing timer %d", Current() + 1);
+  return AddSubMenu(new cMenuEditTimer(Current()));
+}
+
+eOSState cMenuTimers::New(void)
+{
+  if (HasSubMenu())
+     return osContinue;
+  cTimer *timer = new cTimer;
+  Timers.Add(timer);
+  Add(new cMenuTimerItem(timer->Index()/*XXX*/, timer), true);
+  Timers.Save();
+  isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+  return AddSubMenu(new cMenuEditTimer(Current()));
+}
+
+eOSState cMenuTimers::Del(void)
+{
+  // Check if this timer is active:
+  int Index = Current();
+  cTimer *ti = Timers.Get(Index);
+  if (ti) {
+     if (!ti->recording) {
+        if (Interface.Confirm("Delete Timer?")) {
+           Timers.Del(Timers.Get(Index));
+           cOsdMenu::Del(Index);
+           Timers.Save();
+           Display();
+           isyslog(LOG_INFO, "timer %d deleted", Index + 1);
+           }
+        }
+     else
+        Interface.Error("Timer is recording!");
+     }
+  return osContinue;
 }
 
-eOSStatus cMenuTimer::ProcessKey(eKeys Key)
+void cMenuTimers::Move(int From, int To)
 {
-  eOSStatus status = cOsdMenu::ProcessKey(Key);
+  Timers.Move(From, To);
+  cOsdMenu::Move(From, To);
+  Timers.Save();
+  Display();
+  isyslog(LOG_INFO, "timer %d moved to %d", From + 1, To + 1);
+}
 
-  if (status == osUnknown) {
+eOSState cMenuTimers::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
      switch (Key) {
-       //TODO need to block this if we are already editing a channel!
-       case kOk: return AddSubMenu(new cMenuEditTimer(Current()));
-       //TODO new timer
-       //TODO delete timer
        case kLeft:
-       case kRight: 
-            {
-              cTimer *timer = Timers.Get(Current());
-              if (timer) {
-                 timer->active = (Key == kRight);
-                 isyslog(LOG_INFO, "timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
-                 RefreshCurrent();
-                 DisplayCurrent(true);
-                 Timers.Save();
-                 }
-            }
+       case kRight:  return Activate(Key == kRight);
+       case kOk:
+       case kRed:    return Edit();
+       case kGreen:  return New();
+       case kYellow: return Del();
+       case kBlue:   Mark(); break;
        default: break;
        }
      }
-  return status;
+  return state;
+}
+
+// --- cMenuRecordingItem ----------------------------------------------------
+
+class cMenuRecordingItem : public cOsdItem {
+public:
+  cRecording *recording;
+  cMenuRecordingItem(cRecording *Recording);
+  virtual void Set(void);
+  };
+
+cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording)
+{
+  recording = Recording;
+  Set();
+}
+
+void cMenuRecordingItem::Set(void)
+{
+  char *buffer = NULL;
+  struct tm *t = localtime(&recording->start);
+  asprintf(&buffer, "%02d.%02d.%04d\t%02d:%02d\t%s",
+                    t->tm_mday,
+                    t->tm_mon + 1,
+                    t->tm_year + 1900,
+                    t->tm_hour,
+                    t->tm_min,
+                    recording->name);
+  SetText(buffer, false);
+}
+
+// --- cMenuRecordings -------------------------------------------------------
+
+class cMenuRecordings : public cOsdMenu {
+private:
+  cRecordings Recordings;
+  eOSState Play(void);
+  eOSState Del(void);
+public:
+  cMenuRecordings(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuRecordings::cMenuRecordings(void)
+:cOsdMenu("Recordings", 11, 6)
+{
+  if (Recordings.Load()) {
+     cRecording *recording = Recordings.First();
+     while (recording) {
+           Add(new cMenuRecordingItem(recording));
+           recording = Recordings.Next(recording);
+           }
+     }
+  SetHelp("Play", NULL/*XXX"Resume"*/, "Delete");
+}
+
+eOSState cMenuRecordings::Play(void)
+{
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri) {
+//XXX what if this recording's file is currently in use???
+     if (ri->recording->Play())
+        return osEnd;
+     }
+  return osContinue;
+}
+
+eOSState cMenuRecordings::Del(void)
+{
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri) {
+//XXX what if this recording's file is currently in use???
+//XXX     if (!ti->recording) {
+        if (Interface.Confirm("Delete Recording?")) {
+           if (ri->recording->Delete()) {
+              cOsdMenu::Del(Current());
+              Display();
+              }
+           else
+              Interface.Error("Error while deleting recording!");
+           }
+//XXX        }
+//XXX     else
+//XXX        Interface.Error("Timer is recording!");
+     }
+  return osContinue;
+}
+
+eOSState cMenuRecordings::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:
+       case kRed:    return Play();
+       case kYellow: return Del();
+       default: break;
+       }
+     }
+  return state;
 }
 
 // --- cMenuMain -------------------------------------------------------------
@@ -724,22 +1001,21 @@ eOSStatus cMenuTimer::ProcessKey(eKeys Key)
 cMenuMain::cMenuMain(void)
 :cOsdMenu("Main")
 {
-  //TODO
   Add(new cOsdItem("Channels",   osChannels));
   Add(new cOsdItem("Timer",      osTimer));
   Add(new cOsdItem("Recordings", osRecordings));
 }
 
-eOSStatus cMenuMain::ProcessKey(eKeys Key)
+eOSState cMenuMain::ProcessKey(eKeys Key)
 {
-  eOSStatus status = cOsdMenu::ProcessKey(Key);
+  eOSState state = cOsdMenu::ProcessKey(Key);
 
-  switch (status) {
-    case osChannels: return AddSubMenu(new cMenuChannels);
-    case osTimer:    return AddSubMenu(new cMenuTimer);
-    //TODO Replay
+  switch (state) {
+    case osChannels:   return AddSubMenu(new cMenuChannels);
+    case osTimer:      return AddSubMenu(new cMenuTimers);
+    case osRecordings: return AddSubMenu(new cMenuRecordings);
     default: break;
     }
-  return status;
+  return state;
 }
 
diff --git a/menu.h b/menu.h
index 849d8ee3d..813beecdd 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: menu.h 1.2 2000/03/05 10:57:27 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -15,7 +15,7 @@
 class cMenuMain : public cOsdMenu {
 public:
   cMenuMain(void);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
   
 #endif //_MENU_H
diff --git a/osd.c b/osd.c
index d7ab69935..673d075c0 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: osd.c 1.2 2000/02/27 17:23:07 kls Exp $
  */
 
 #include "osd.h"
@@ -13,19 +13,19 @@
 
 // --- cOsdItem --------------------------------------------------------------
 
-cOsdItem::cOsdItem(eOSStatus Status)
+cOsdItem::cOsdItem(eOSState State)
 {
   text = NULL;
   offset = -1;
-  status = Status;
+  state = State;
   fresh = false;
 }
 
-cOsdItem::cOsdItem(char *Text, eOSStatus Status)
+cOsdItem::cOsdItem(char *Text, eOSState State)
 {
   text = NULL;
   offset = -1;
-  status = Status;
+  state = State;
   fresh = false;
   SetText(Text);
 }
@@ -52,24 +52,27 @@ void cOsdItem::Display(int Offset, bool Current)
      Interface.WriteText(0, offset + 2, text, Current);
 }
 
-eOSStatus cOsdItem::ProcessKey(eKeys Key)
+eOSState cOsdItem::ProcessKey(eKeys Key)
 {
-  return Key == kOk ? status : osUnknown;
+  return Key == kOk ? state : osUnknown;
 }
 
 // --- cOsdMenu --------------------------------------------------------------
 
 cOsdMenu::cOsdMenu(char *Title, int c0, int c1, int c2, int c3, int c4)
 {
+  visible = false;
   title = strdup(Title);
   cols[0] = c0;
   cols[1] = c1;
   cols[2] = c2;
   cols[3] = c3;
   cols[4] = c4;
-  first = count = 0;
-  current = -1;
+  first = 0;
+  current = marked = -1;
   subMenu = NULL;
+  helpRed = helpGreen = helpYellow = helpBlue = NULL;
+  status = NULL;
   Interface.Open();
 }
 
@@ -77,40 +80,72 @@ cOsdMenu::~cOsdMenu()
 {
   delete title;
   delete subMenu;
+  delete status;
   Interface.Clear();
   Interface.Close();
 }
 
+void cOsdMenu::SetStatus(const char *s)
+{
+  delete status;
+  status = s ? strdup(s) : NULL;
+  if (visible)
+     Interface.Status(status);
+}
+
+void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  // strings are NOT copied - must be constants!!!
+  helpRed    = Red;
+  helpGreen  = Green;
+  helpYellow = Yellow;
+  helpBlue   = Blue;
+}
+
+void cOsdMenu::Del(int Index)
+{
+  cList<cOsdItem>::Del(Get(Index));
+  if (current == Count())
+     current--;
+  if (Index == first && first > 0)
+     first--;
+}
+
 void cOsdMenu::Add(cOsdItem *Item, bool Current)
 {
   cList<cOsdItem>::Add(Item);
-  count++;
-  if (Current && current < 0)
+  if (Current)
      current = Item->Index();
 }
 
 void cOsdMenu::Display(void)
 {
+  visible = true;
   Interface.Clear();
   Interface.SetCols(cols);
-  Interface.WriteText(0, 0, title);
-  if (current < 0 && count)
-     current = 0; // just for safety - there HAS to be a current item!
-  int n = 0;
-  if (current - first >= MAXOSDITEMS) {
-     first = current - MAXOSDITEMS / 2;
-     if (first + MAXOSDITEMS > count)
-        first = count - MAXOSDITEMS;
-     if (first < 0)
-        first = 0;
+  Interface.Title(title);
+  Interface.Help(helpRed, helpGreen, helpYellow, helpBlue);
+  int count = Count();
+  if (count > 0) {
+     if (current < 0)
+        current = 0; // just for safety - there HAS to be a current item!
+     int n = 0;
+     if (current - first >= MAXOSDITEMS) {
+        first = current - MAXOSDITEMS / 2;
+        if (first + MAXOSDITEMS > count)
+           first = count - MAXOSDITEMS;
+        if (first < 0)
+           first = 0;
+        }
+     for (int i = first; i < count; i++) {
+         cOsdItem *item = Get(i);
+         if (item)
+            item->Display(i - first, i == current);
+         if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
+            break;
+         }
      }
-  for (int i = first; i < count; i++) {
-      cOsdItem *item = Get(i);
-      if (item)
-         item->Display(i - first, i == current);
-      if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
-         break;
-      }
+  Interface.Status(status);
 }
 
 void cOsdMenu::RefreshCurrent(void)
@@ -144,6 +179,7 @@ void cOsdMenu::CursorUp(void)
 
 void cOsdMenu::CursorDown(void)
 {
+  int count = Count();
   if (current < count - 1) {
      DisplayCurrent(false);
      if (++current >= first + MAXOSDITEMS) {
@@ -157,7 +193,15 @@ void cOsdMenu::CursorDown(void)
      }
 }
 
-eOSStatus cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
+void cOsdMenu::Mark(void)
+{
+  if (Count() && marked < 0) {
+     marked = current;
+     SetStatus("Up/Dn for new location - OK to move");
+     }
+}
+
+eOSState cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
 {
   delete subMenu;
   subMenu = SubMenu;
@@ -165,31 +209,40 @@ eOSStatus cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
   return osContinue; // convenience return value (see cMenuMain)
 }
 
-eOSStatus cOsdMenu::ProcessKey(eKeys Key)
+eOSState cOsdMenu::ProcessKey(eKeys Key)
 {
   if (subMenu) {
-     eOSStatus status = subMenu->ProcessKey(Key);
-     if (status == osBack) {
+     eOSState state = subMenu->ProcessKey(Key);
+     if (state == osBack) {
         delete subMenu;
         subMenu = NULL;
         RefreshCurrent();
         Display();
-        status = osContinue;
+        state = osContinue;
         }
-     return status;
+     return state;
      }
 
   cOsdItem *item = Get(current);
-  if (item) {
-     eOSStatus status = item->ProcessKey(Key);
-     if (status != osUnknown)
-        return status;
+  if (marked < 0 && item) {
+     eOSState state = item->ProcessKey(Key);
+     if (state != osUnknown)
+        return state;
      }
   switch (Key) {
     case kUp:   CursorUp();   break;
     case kDown: CursorDown(); break;
     case kBack: return osBack;
-    default: return osUnknown;
+    case kOk:   if (marked >= 0) {
+                   SetStatus(NULL);
+                   if (marked != current)
+                      Move(marked, current);
+                   marked = -1;
+                   break;
+                   }
+                // else run into default
+    default: if (marked < 0)
+                return osUnknown;
     }
   return osContinue;
 }
diff --git a/osd.h b/osd.h
index 392f1a752..5ec13349f 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: osd.h 1.2 2000/03/05 11:33:11 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -16,53 +16,61 @@
 
 #define MAXOSDITEMS 9
 
-enum eOSStatus { osUnknown,
-                 osContinue,
-                 osProcessed,
-                 osChannels,
-                 osTimer,
-                 osRecordings,
-                 osBack,
-                 osEnd,
-               };
+enum eOSState { osUnknown,
+                osContinue,
+                osProcessed,
+                osChannels,
+                osTimer,
+                osRecordings,
+                osBack,
+                osEnd,
+              };
 
 class cOsdItem : public cListObject {
 private:
   char *text;
   int offset;
-  eOSStatus status;
+  eOSState state;
 protected:
   bool fresh;
 public:
-  cOsdItem(eOSStatus Status = osUnknown);
-  cOsdItem(char *Text, eOSStatus Status = osUnknown);
+  cOsdItem(eOSState State = osUnknown);
+  cOsdItem(char *Text, eOSState State = osUnknown);
   virtual ~cOsdItem();
   void SetText(char *Text, bool Copy = true);
   char *Text(void) { return text; }
   void Display(int Offset = -1, bool Current = false);
   virtual void Set(void) {}
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 class cOsdMenu : public cList<cOsdItem> {
 private:
   char *title;
   int cols[cInterface::MaxCols];
-  int first, current, count;
+  int first, current, marked;
   cOsdMenu *subMenu;
+  const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
+  const char *status;
 protected:
+  bool visible;
   void RefreshCurrent(void);
   void DisplayCurrent(bool Current);
   void CursorUp(void);
   void CursorDown(void);
-  eOSStatus AddSubMenu(cOsdMenu *SubMenu);
+  void Mark(void);
+  eOSState AddSubMenu(cOsdMenu *SubMenu);
+  bool HasSubMenu(void) { return subMenu; }
+  void SetStatus(const char *s);
+  void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
+  virtual void Del(int Index);
 public:
   cOsdMenu(char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
   int Current(void) { return current; }
   void Add(cOsdItem *Item, bool Current = false);
   void Display(void);
-  virtual eOSStatus ProcessKey(eKeys Key);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 #endif //__OSD_H
diff --git a/osm.c b/osm.c
index cc017451a..7031d6893 100644
--- a/osm.c
+++ b/osm.c
@@ -22,13 +22,13 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: osm.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: osm.c 1.2 2000/03/05 17:18:15 kls Exp $
  */
 
 #include "config.h"
-#include "dvbapi.h"
 #include "interface.h"
 #include "menu.h"
+#include "recording.h"
 #include "tools.h"
 
 #ifdef DEBUG_REMOTE
@@ -52,39 +52,39 @@ int main(int argc, char *argv[])
 
   cMenuMain *Menu = NULL;
   cTimer *Timer = NULL;
-  cDvbRecorder *Recorder = NULL;
+  cRecording *Recording = NULL;
 
   for (;;) {
-      //TODO check for free disk space and delete files if necessary/possible
-      //     in case there is an ongoing recording
-      if (!Timer && (Timer = cTimer::GetMatch()) != NULL) {
+      AssertFreeDiskSpace();
+      if (!Recording && !Timer && (Timer = cTimer::GetMatch()) != NULL) {
+         DELETENULL(Menu);
+         // make sure the timer won't be deleted:
+         Timer->SetRecording(true);
          // switch to channel:
-         isyslog(LOG_INFO, "timer %d start", Timer->Index() + 1);
-         delete Menu;
-         Menu = NULL;
          cChannel::SwitchTo(Timer->channel - 1);
          ChannelLocked = true;
          // start recording:
-         delete Recorder;
-         Recorder = new cDvbRecorder;
-         //TODO special filename handling!!!
-         if (!Recorder->Record(Timer->file, Timer->quality)) {
-            delete Recorder;
-            Recorder = NULL;
-            }
+         Recording = new cRecording(Timer);
+         if (!Recording->Record())
+            DELETENULL(Recording);
          }
-      if (Timer) {
-         if (!Timer->Matches()) {
-            // stop recording:
-            if (Recorder)
-               Recorder->Stop();
-            // end timer:
-            ChannelLocked = false;
-            isyslog(LOG_INFO, "timer %d stop", Timer->Index() + 1);
-            Timer = NULL;
-            //TODO switch back to the previous channel???
-            //TODO clear single event timer???
+      if (Timer && !Timer->Matches()) {
+         // stop recording:
+         if (Recording) {
+            Recording->Stop();
+            DELETENULL(Recording);
+            }
+         // release channel and timer:
+         ChannelLocked = false;
+         Timer->SetRecording(false);
+         // clear single event timer:
+         if (Timer->IsSingleEvent()) {
+            DELETENULL(Menu); // must make sure no menu uses it
+            isyslog(LOG_INFO, "deleting timer %d", Timer->Index() + 1);
+            Timers.Del(Timer);
+            Timers.Save();
             }
+         Timer = NULL;
          }
       eKeys key = Interface.GetKey();
       if (Menu) {
@@ -92,8 +92,7 @@ int main(int argc, char *argv[])
            default: if (key != kMenu)
                        break;
            case osBack:
-           case osEnd: delete Menu;
-                       Menu = NULL;
+           case osEnd: DELETENULL(Menu);
                        break;
            }
          }
diff --git a/recording.c b/recording.c
new file mode 100644
index 000000000..afc2d8b3e
--- /dev/null
+++ b/recording.c
@@ -0,0 +1,238 @@
+/*
+ * recording.h: Recording file handling
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: recording.c 1.1 2000/03/05 17:16:22 kls Exp $
+ */
+
+#include "recording.h"
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "interface.h"
+#include "tools.h"
+
+#define RECEXT       ".rec"
+#define DELEXT       ".del"
+#define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%c.%02d.%02d" RECEXT
+#define NAMEFORMAT   "%s/%s/" DATAFORMAT
+
+#define FINDCMD      "find %s -type f -name '%s'"
+
+#define DFCMD        "df -m %s"
+#define MINDISKSPACE 1024 // MB
+
+const char *BaseDir = "/video";//XXX
+
+cDvbRecorder *Recorder = NULL;
+
+static bool LowDiskSpace(void)
+{
+  //TODO Find a simpler way to determine the amount of free disk space!
+  bool result = true;
+  char *cmd = NULL;
+  asprintf(&cmd, DFCMD, BaseDir);
+  FILE *p = popen(cmd, "r");
+  if (p) {
+     char *s;
+     while ((s = readline(p)) != NULL) {
+           if (*s == '/') {
+              int available;
+              sscanf(s, "%*s %*d %*d %d", &available);
+              result = available < MINDISKSPACE;
+              break;
+              }
+           }
+     pclose(p);
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: can't open pipe for cmd '%s'", cmd);
+  delete cmd;
+  return result;
+}
+
+void AssertFreeDiskSpace(void)
+{
+  // With every call to this function we try to actually remove
+  // a file, or mark a file for removal ("delete" it), so that
+  // it will get removed during the next call.
+  if (Recorder && Recorder->Recording() && LowDiskSpace()) {
+     // Remove the oldest file that has been "deleted":
+     cRecordings Recordings;
+     if (Recordings.Load(true)) {
+        cRecording *r = Recordings.First();
+        cRecording *r0 = r;
+        while (r) {
+              if (r->start < r0->start)
+                 r0 = r;
+              r = Recordings.Next(r);
+              }
+        if (r0 && r0->Remove())
+           return;
+        }
+     // No "deleted" files to remove, so let's see if we can delete a recording:
+     if (Recordings.Load(false)) {
+        cRecording *r = Recordings.First();
+        cRecording *r0 = NULL;
+        while (r) {
+              if ((time(NULL) - r->start) / SECSINDAY > r->lifetime) {
+                 if (r0) {
+                    if (r->priority < r0->priority)
+                       r0 = r;
+                    }
+                 else
+                    r0 = r;
+                 }
+              r = Recordings.Next(r);
+              }
+        if (r0 && r0->Delete())
+           return;
+        }
+     // Unable to free disk space, but there's nothing we can do about that...
+     //TODO maybe a log entry - but make sure it doesn't come too often
+     }
+}
+
+// --- cRecording ------------------------------------------------------------
+
+cRecording::cRecording(const char *Name, time_t Start, char Quality, int Priority, int LifeTime)
+{
+  fileName = NULL;
+  name = strdup(Name);
+  start = Start;
+  quality = Quality;
+  priority = Priority;
+  lifetime = LifeTime;
+}
+
+cRecording::cRecording(cTimer *Timer)
+{
+  fileName = NULL;
+  name = strdup(Timer->file);
+  start = Timer->StartTime();
+  quality = Timer->quality;
+  priority = Timer->priority;
+  lifetime = Timer->lifetime;
+}
+
+cRecording::cRecording(const char *FileName)
+{
+  fileName = strdup(FileName);
+  FileName += strlen(BaseDir) + 1;
+  char *p = strrchr(FileName, '/');
+
+  name = NULL;
+  if (p) {
+     time_t now = time(NULL);
+     struct tm t = *localtime(&now); // this initializes the time zone in 't'
+     if (8 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &quality, &priority, &lifetime)) {
+        t.tm_year -= 1900;
+        t.tm_mon--;
+        t.tm_sec = 0;
+        start = mktime(&t);
+        name = new char[p - FileName + 1];
+        strncpy(name, FileName, p - FileName);
+        name[p - FileName] = 0;
+        }
+     }
+}
+
+cRecording::~cRecording()
+{
+  delete fileName;
+  delete name;
+}
+
+const char *cRecording::FileName(void)
+{
+  if (!fileName) {
+     struct tm *t = localtime(&start);
+     asprintf(&fileName, NAMEFORMAT, BaseDir, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, quality, priority, lifetime);
+     }
+  return fileName;
+}
+
+bool cRecording::Delete(void)
+{
+  bool result = true;
+  char *NewName = strdup(FileName());
+  char *ext = strrchr(NewName, '.');
+  if (strcmp(ext, RECEXT) == 0) {
+     strncpy(ext, DELEXT, strlen(ext));
+     isyslog(LOG_INFO, "deleting recording %s", FileName());
+     if (rename(FileName(), NewName) == -1) {
+        esyslog(LOG_ERR, "ERROR: %s", strerror(errno));
+        result = false;
+        }
+     }
+  delete NewName;
+  return result;
+}
+
+bool cRecording::Remove(void)
+{
+  bool result = true;
+  isyslog(LOG_INFO, "removing recording %s", FileName());
+  if (remove(FileName()) == -1) {
+     esyslog(LOG_ERR, "ERROR: %s", strerror(errno));
+     result = false;
+     }
+  return result;
+}
+
+bool cRecording::AssertRecorder(void)
+{
+  if (!Recorder || !Recorder->Recording()) {
+     if (!Recorder)
+        Recorder = new cDvbRecorder;
+     return true;
+     }
+  Interface.Error("Recorder is in use!");
+  return false;
+}
+
+bool cRecording::Record(void)
+{
+  return AssertRecorder() && Recorder->Record(FileName(), quality);
+}
+
+bool cRecording::Play(void)
+{
+  return AssertRecorder() && Recorder->Play(FileName());
+}
+
+void cRecording::Stop(void)
+{
+  if (Recorder)
+     Recorder->Stop();
+}
+
+// --- cRecordings -----------------------------------------------------------
+
+bool cRecordings::Load(bool Deleted)
+{
+  Clear();
+  bool result = false;
+  char *cmd = NULL;
+  asprintf(&cmd, FINDCMD, BaseDir, Deleted ? "*" DELEXT : "*" RECEXT);
+  FILE *p = popen(cmd, "r");
+  if (p) {
+     char *s;
+     while ((s = readline(p)) != NULL) {
+           cRecording *r = new cRecording(s);
+           if (r->name)
+              Add(r);
+           else
+              delete r;
+           }
+     pclose(p);
+     result = Count() > 0;
+     }
+  else
+     Interface.Error("Error while opening pipe!");
+  delete cmd;
+  return result;
+}
+
diff --git a/recording.h b/recording.h
new file mode 100644
index 000000000..5b093a043
--- /dev/null
+++ b/recording.h
@@ -0,0 +1,56 @@
+/*
+ * recording.h: Recording file handling
+ *
+ * See the main source file 'osm.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: recording.h 1.1 2000/03/05 15:57:27 kls Exp $
+ */
+
+#ifndef __RECORDING_H
+#define __RECORDING_H
+
+#include <time.h>
+#include "config.h"
+#include "dvbapi.h"
+#include "tools.h"
+
+extern cDvbRecorder *Recorder;
+
+void AssertFreeDiskSpace(void);
+
+class cRecording : public cListObject {
+private:
+  bool AssertRecorder(void);
+public:
+  char *name;
+  char *fileName;
+  time_t start;
+  char quality;
+  int priority;
+  int lifetime;
+  cRecording(const char *Name, time_t Start, char Quality, int Priority, int LifeTime);
+  cRecording(cTimer *Timer);
+  cRecording(const char *FileName);
+  ~cRecording();
+  const char *FileName(void);
+  bool Delete(void);
+       // Changes the file name so that it will no longer be visible in the OSM
+       // Returns false in case of error
+  bool Remove(void);
+       // Actually removes the file from the disk
+       // Returns false in case of error
+  bool Record(void);
+       // Starts recording of the file
+  bool Play(void);
+       // Starts playback of the file
+  void Stop(void);
+       // Stops recording or playback of the file
+  };
+
+class cRecordings : public cList<cRecording> {
+public:
+  bool Load(bool Deleted = false);
+  };
+
+#endif //__RECORDING_H
diff --git a/timers.conf b/timers.conf
index ac002a996..de4df9dac 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,9 +1,6 @@
-1:2:-----S-:2210:2320:H:99:99:Wochenshow
-1:3:M------:2125:2205:H:99:99:Neues
+1:2:-----S-:2205:2320:H:99:99:Wochenshow
+0:15:M------:2125:2205:H:99:99:Neues
 1:15:MTWTF--:1828:1901:M:10:5:nano
-1:2:-----S-:1737:1827:H:99:99:kls/StarTrek/DS9
 1:3:M------:2110:2230:H:99:99:SevenDays
-1:3:---T---:2215:2300:H:99:99:SwItch
-0:1:1:0:0:H:99:99:#
-0:1:1:0:0:H:99:99:#
-0:1:1:0:0:L:0:5:#
+1:3:---T---:2215:2300:H:99:99:Switch
+1:14:------S:2210:2255:H:99:99:Olli
diff --git a/tools.c b/tools.c
index e0eeaefda..5a21a9307 100644
--- a/tools.c
+++ b/tools.c
@@ -4,13 +4,30 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: tools.c 1.2 2000/03/05 14:33:58 kls Exp $
  */
 
 #include "tools.h"
+#include <errno.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 
+#define MaxBuffer 1000
+
+char *readline(FILE *f)
+{
+  static char buffer[MaxBuffer];
+  if (fgets(buffer, sizeof(buffer), f) > 0) {
+     int l = strlen(buffer) - 1;
+     if (l >= 0 && buffer[l] == '\n')
+        buffer[l] = 0;
+     return buffer;
+     }
+  return NULL;
+}
+
 int time_ms(void)
 {
   struct timeval t;
@@ -19,6 +36,30 @@ int time_ms(void)
   return 0;
 }
 
+bool MakeDirs(const char *FileName)
+{
+  bool result = true;
+  char *s = strdup(FileName);
+  char *p = s;
+  if (*p == '/')
+     p++;
+  while ((p = strchr(p, '/')) != NULL) {
+        *p = 0;
+        struct stat fs;
+        if (stat(s, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
+           isyslog(LOG_INFO, "creating directory %s", s);
+           if (mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {
+              esyslog(LOG_ERR, "ERROR while creating directory %s: %s", s, strerror(errno));
+              result = false;
+              break;
+              }
+           }
+        *p++ = '/';
+        }
+  delete s;
+  return result;
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
@@ -42,6 +83,7 @@ void cListObject::Unlink(void)
      next->prev = prev;
   if (prev)
      prev->next = next;
+  next = prev = NULL;
 }
 
 int cListObject::Index(void)
@@ -92,6 +134,33 @@ void cListBase::Del(cListObject *Object)
   delete Object;
 }
 
+void cListBase::Move(int From, int To)
+{
+  Move(Get(From), Get(To));
+}
+
+void cListBase::Move(cListObject *From, cListObject *To)
+{
+  if (From && To) {
+     if (From->Index() < To->Index())
+        To = To->Next();
+     if (From == objects)
+        objects = From->Next();
+     if (From == lastObject)
+        lastObject = From->Prev();
+     From->Unlink();
+     if (To) {
+        if (To->Prev())
+           To->Prev()->Append(From);
+        From->Append(To);
+        }
+     else
+        lastObject->Append(From);
+     if (!From->Prev())
+        objects = From;
+     }
+}
+
 void cListBase::Clear(void)
 {
   while (objects) {
diff --git a/tools.h b/tools.h
index 43f852542..9f87bbde1 100644
--- a/tools.h
+++ b/tools.h
@@ -4,12 +4,13 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: tools.h 1.2 2000/03/05 16:14:05 kls Exp $
  */
 
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
+#include <stdio.h>
 #include <syslog.h>
 
 //TODO
@@ -17,6 +18,14 @@
 #define esyslog syslog
 #define isyslog syslog
 
+#define SECSINDAY  86400
+
+#define DELETENULL(p) (delete (p), p = NULL)
+
+char *readline(FILE *f);
+int time_ms(void);
+bool MakeDirs(const char *FileName);
+
 class cListObject {
 private:
   cListObject *prev, *next;
@@ -38,6 +47,8 @@ class cListBase {
   virtual ~cListBase();
   void Add(cListObject *Object);
   void Del(cListObject *Object);
+  void Move(int From, int To);
+  void Move(cListObject *From, cListObject *To);
   void Clear(void);
   cListObject *Get(int Index);
   int Count(void);
@@ -47,8 +58,7 @@ template<class T> class cList : public cListBase {
 public:
   T *Get(int Index) { return (T *)cListBase::Get(Index); }
   T *First(void) { return (T *)objects; }
+  T *Next(T *object) { return (T *)object->Next(); }
   };
 
-int time_ms(void);
-
 #endif //__TOOLS_H

From 37250a0568d5b1d689d5c59f983e9be228ed49c2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 15 Apr 2000 18:00:00 +0200
Subject: [PATCH 003/307] Version 0.03 - Actual record/replay now works. -
 Dropped the idea of different "recording qualities" (a 36GB harddisk is  
 able to store some 18 hours in full quality, so we don't really need that). -
 Termination signals are now caught and the program cleans up before exiting.
 - Support for CICAM.

---
 BUGS          |   23 +
 HISTORY       |    8 +
 MANUAL        |   39 ++
 README        |   72 ++-
 TODO          |    6 +-
 channels.conf |  218 ++++----
 config.c      |   95 ++--
 config.h      |   21 +-
 dvbapi.c      | 1394 +++++++++++++++++++++++++++++++++++++++++++++----
 dvbapi.h      |  121 +++--
 interface.c   |   25 +-
 interface.h   |    3 +-
 keys-pc.conf  |  Bin 283 -> 425 bytes
 keys.conf     |   23 -
 menu.c        |   29 +-
 osm.c         |  150 +++---
 recording.c   |  110 ++--
 recording.h   |    9 +-
 remote.c      |    9 +-
 timers.conf   |   15 +-
 tools.c       |   91 +++-
 tools.h       |   24 +-
 22 files changed, 1931 insertions(+), 554 deletions(-)
 create mode 100644 BUGS
 create mode 100644 MANUAL
 delete mode 100644 keys.conf

diff --git a/BUGS b/BUGS
new file mode 100644
index 000000000..bcb37728a
--- /dev/null
+++ b/BUGS
@@ -0,0 +1,23 @@
+Video Disk Recorder - Known Bugs
+--------------------------------
+
+* Sometimes picture and sound drift apart.
+  Presumably this is a problem in the card driver or firmware?
+
+* When the on-screen display is activated during recording,
+  the video data stream gets corrupted, which results in a
+  distorted picture when replaying such a recording.
+  I assume this is a problem in the driver of firmware.
+  There is no such problem in replay mode.
+
+* After a replay session the screen may go blank.
+  Haven't figured out yet how to ensure that it switches back to
+  the current channel.
+
+* Every now and then the on-screen display shows nothing but
+  "noise". If that occurs, I have to stop the 'osm' program
+  and do a 'make reload' for the card driver. After that it
+  works fine again.
+  Presumably this is a problem in the card driver or firmware?
+  Or could it be a problem with the hardware?
+  Does anybody else observe this?
diff --git a/HISTORY b/HISTORY
index f7eeb65ef..c013340dd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,3 +10,11 @@ Video Disk Recorder OSM Revision History
 - Support for "Red", "Green", "Yellow", "Blue" buttons.
 - Channels and Timers can now be added, deleted and moved.
 - Basic record/play file handling support (no actual record/playback yet).
+
+2000-04-15: Version 0.03
+
+- Actual record/replay now works.
+- Dropped the idea of different "recording qualities" (a 36GB harddisk is
+  able to store some 18 hours in full quality, so we don't really need that).
+- Termination signals are now caught and the program cleans up before exiting.
+- Support for CICAM.
diff --git a/MANUAL b/MANUAL
new file mode 100644
index 000000000..9e5036c10
--- /dev/null
+++ b/MANUAL
@@ -0,0 +1,39 @@
+Video Disk Recorder User's Manual
+---------------------------------
+
+* Selecting a Channel
+
+  You can select a channel either by pressing the "Up" or "Down" key (while
+  no On Screen Menu is displayed), or browsing through the channel list in
+  the menu and pressing "Ok" on the desired channel.
+
+* Instant Recording
+
+  You can start recording the current channel by pressing the "Record"
+  button. This will create a timer event named "instant" that start
+  at the current time and records for two hours.
+  If you want to modify the recording time you need to edit the timer.
+  Stop instant recording by disabling or deleting the timer.
+
+* Replaying a Recording
+
+  All recordings are listed in the "Recordings" menu. Browse through the
+  list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
+  to start playback.
+
+* Replay Control
+
+  - "Begin"   Positions to beginning of the recording and starts playback
+              from there.
+  - "Pause"   Halts playback at the current frame. Press again to continue
+              playback.
+  - "Stop"    Stops playback and stores the current position, so that
+              playback can be resumed later at that point.
+  - "Search"  Runs playback forward or backward at a higher speed. Press
+              again to resume normal speed.
+  - "Skip"    Skips about 60 seconds forward or backward.
+
+* Programming the Timer
+
+  Use the "Timer" menu to maintain your list of timer controlled recordings.
+
diff --git a/README b/README
index 5c6928cb4..e2b27a4ff 100644
--- a/README
+++ b/README
@@ -36,34 +36,13 @@ about that driver). For example, if the DVB driver was
 extracted into the directory /home/kls/vdr/DVB, then this
 package should be extracted into /home/kls/vdr/OSM.
 
-In order for the menu colors to work correctly you may want
-to replace the function RGB2YUV() in DVB/driver/dvb.c with
-
-static u32 RGB2YUV(u16 R, u16 G, u16 B)
-{
-        u16 y, u, v;
-        u16 Y, Cr, Cb;
-
-        y = R * 77 + G * 150 + B * 29;  // Luma=0.299R+0.587G+0.114B 0..65535
-        u = 2048+B * 8 -(y>>5);    // Cr 0..4095
-        v = 2048+R * 8 -(y>>5);    // Cb 0..4095
-
-        Y = y >> 8;
-        Cb= u >> 4;
-        Cr= v >> 4;
-
-        return Cr|(Cb<<16)|(Y<<8);
-}
-
-(this may no longer be necessary with driver versions after 0.03c).
+This program requires the card driver version 0.04 or higher
+to work properly.
 
 After extracting the package, change into the OSM directory
 and type 'make'. This should produce an executable file
 named 'osm', which can be run after the DVB driver has been
-installed. There may be several warnings about "implicit declaration
-of function `int asprintf(...)'" during the compilation, which I was
-unable to avoid (anybody know how to avoid them?). Just ignore them,
-the program will work, anyway.
+installed.
 
 There are two macros you can use to customize the 'osm' program
 at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call
@@ -88,28 +67,43 @@ The meaning of the data entries may still vary in future releases,
 so for the moment please look at the source code (config.c) to see
 the meaning of the various fields.
 
-There is no way of adding or deleting channels or timers yet, this
-will be implemented later.
-
 Learning the remote control keys:
 ---------------------------------
 
-The remote control configuration file 'keys.conf' that comes with
-this package contains the codes for the "d-box" remote control unit.
-If you want to use a different remote control unit, simply delete
-the file 'keys.conf' and restart the 'osm' program. The program will
-then start a key learning session in which it first attempts to determine
-the basic data transfer mode and timing of your remote control unit,
-and then will ask you to press one key after the other so that it can
-learn the various key codes. You will at least need to provide an "Up"
-and a "Down" key, so that you can switch channels. The rest of the key
-definitions is optional, but the more keys you define, the more you
-will be able to navigate through the menus.
-
+There is no default 'keys.conf' file, so if you compile the program
+without 'DEBUG_REMOTE=1' you will have to go through a "teach-in"
+session that allows the program to learn your remote control codes.
+It will first attempt to determine the basic data transfer mode and
+timing of your remote control unit, and then will ask you to press one
+key after the other so that it can learn the various key codes. You will
+at least need to provide an "Up" and a "Down" key, so that you can switch
+channels. The rest of the key definitions is optional, but the more keys
+you define, the more you will be able to navigate through the menus and
+control recording/replaying.
 If the program has been built with "DEBUG_REMOTE=1", it will use the
 key configuration file 'keys-pc.conf', so that you won't loose data
 when switching between normal and debug mode.
 
+The default PC key assignments are:
+             
+  Up, Down, Left, Right     Crsr keys in numeric block
+  Menu                      '5' in numeric block
+  Ok                        Enter
+  Back                      Backspace
+  0..9                      '0'..'9' in top row
+  Red, Green, Yellow, Blue  'F1'..'F4'
+  Record                    'r'
+  Pause                     'p'
+  Stop                      's'
+  Begin                     'B'
+  SearchForward             'f'
+  SearchBack                'b'
+  SkipForward               'PgDn' in numeric block
+  SkipBack                  'PgUp' in numeric block
+
+If you prefer different key assignments, simply delete the file
+'keys-pc.conf' and restart 'osm' to get into learning mode.
+
 Navigating through the On Screen Menus:
 ---------------------------------------
 
diff --git a/TODO b/TODO
index 35e3aa306..8154c01d8 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
 TODO list for the Video Disk Recorder project
 ---------------------------------------------
 
-* Implement recording to disk and playback from disk.
+* Channel select via numeric keys.
 * Make it work with two DVB-S PCI cards to allow simultaneous
   recording of one programme, while replaying another programme
   (or maybe the same one, but time delayed).
@@ -10,3 +10,7 @@ TODO list for the Video Disk Recorder project
 * Implement "on-disk editing" to allow "cutting out" of certain
   scenes in order to archive them (or, reversely, cut out
   commercial breaks).
+* Implement on-screen display of replay progress (progress bar
+  and/or time index).
+* Implement channel scanning.
+* Better support for encrypted channels.
diff --git a/channels.conf b/channels.conf
index 1b5796363..c0e191aca 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,109 +1,109 @@
-RTL:12188:h:1:27500:163:104
-Sat.1:12552:v:1:22000:163:104
-Pro 7:12480:v:1:27500:255:256
-RTL2:12188:h:1:27500:166:128
-ARD:11837:h:1:27500:101:102
-BR3:11837:h:1:27500:201:202
-Hessen 3:11837:h:1:27500:301:302
-N3:11837:h:1:27500:401:402
-SR3:11837:h:1:27500:501:502
-WDR:11837:h:1:27500:601:602
-BR alpha:11837:h:1:27500:701:702
-SWR BW:11837:h:1:27500:801:802
-Phoenix:11837:h:1:27500:901:902
-ZDF:11954:h:1:27500:110:120
-3sat:11954:h:1:27500:210:220
-Kinderkanal:11954:h:1:27500:310:320
-arte:11954:h:1:27500:360:370
-phoenix:11954:h:1:27500:410:420
-ORF Sat:11954:h:1:27500:506:507
-ZDF Infobox:11954:h:1:27500:610:620
-CNN:12168:v:1:27500:165:100
-Super RTL:12188:h:1:27500:165:120
-VOX:12188:h:1:27500:167:136
-DW TV:12363:v:1:27500:305:306
-Kabel 1:12480:v:1:27500:511:512
-TM3:12480:v:1:27500:767:768
-DSF:12480:v:1:27500:1023:1024
-HOT:12480:v:1:27500:1279:1280
-BloombergTV:12552:v:1:22000:162:99
-Sky News:12552:v:1:22000:305:306
-KinderNet:12574:h:1:22000:163:92
-Alice:12610:v:1:22000:162:96
-n-tv:12670:v:1:22000:162:96
-Grand Tour.:12670:v:1:22000:289:290
-TW1:12692:h:1:22000:166:167
-Eins Extra:12722:h:1:22000:101:102
-Eins Festival:12722:h:1:22000:201:202
-Eins MuXx:12722:h:1:22000:301:302
-MDR:12722:h:1:22000:401:402
-ORB:12722:h:1:22000:501:502
-B1:12722:h:1:22000:601:602
-ARD Online-Kanal:12722:h:1:22000:8191:701
-Premiere World Promo:11798:h:1:27500:255:256
-TV Niepokalanow:11876:h:1:27500:305:321
-test card:11798:h:1:27500:511:512
-Mosaico:11934:v:1:27500:165:100
-Andalucia TV:11934:v:1:27500:166:104
-TVC Internacional:11934:v:1:27500:167:108
-Nasza TV:11992:h:1:27500:165:98
-WishLine test:12012:v:1:27500:163:90
-Pro 7 Austria:12051:v:1:27500:161:84
-Kabel 1 Schweiz:12051:v:1:27500:162:163
-Kabel 1 Austria:12051:v:1:27500:166:167
-Pro 7 Schweiz:12051:v:1:27500:289:290
-Kiosque:12129:v:1:27500:160:80
-KTO:12129:v:1:27500:170:120
-TCM:12168:v:1:27500:160:80
-Cartoon Network France & Spain:12168:v:1:27500:161:84
-TVBS Europe:12168:v:1:27500:162:88
-TVBS Europe:12168:v:1:27500:162:89
-Travel:12168:v:1:27500:163:92
-TCM Espania:12168:v:1:27500:164:96
-MTV Spain:12168:v:1:27500:167:112
-TCM France:12168:v:1:27500:169:64
-RTL2 CH:12188:h:1:27500:164:112
-La Cinquieme:12207:v:1:27500:160:80
-ARTE:12207:v:1:27500:165:100
-Post Filial TV:12226:h:1:27500:255:256
-Canal Canaris:12246:v:1:27500:160:80
-Canal Canaris:12246:v:1:27500:160:81
-Canal Canaris:12246:v:1:27500:160:82
-Canal Canaris:12246:v:1:27500:160:83
-AB Sat Passion promo:12266:h:1:27500:160:80
-AB Channel 1:12266:h:1:27500:161:84
-Taquilla 0:12285:v:1:27500:165:100
-CSAT:12324:v:1:27500:160:80
-Mosaique:12324:v:1:27500:162:88
-Mosaique 2:12324:v:1:27500:163:92
-Mosaique 3:12324:v:1:27500:164:96
-Le Sesame C+:12324:v:1:27500:165:1965
-FEED:12344:h:1:27500:163:92
-RTM 1:12363:v:1:27500:162:96
-ESC 1:12363:v:1:27500:163:104
-TV5 Europe:12363:v:1:27500:164:112
-TV7 Tunisia:12363:v:1:27500:166:128
-ARTE:12363:v:1:27500:167:137
-RAI Uno:12363:v:1:27500:289:290
-RTP International:12363:v:1:27500:300:301
-Fashion TV:12402:v:1:27500:163:92
-VideoService:12422:h:1:27500:255:256
-Beta Research promo:12422:h:1:27500:1023:1024
-Canal Canarias:12441:v:1:27500:160:80
-TVC International:12441:v:1:27500:512:660
-Fitur:12441:v:1:27500:514:662
-Astra Info 1:12552:v:1:22000:164:112
-Astra Info 2:12552:v:1:22000:165:120
-Astra Vision 1:12552:v:1:22000:168:144
-Astra Vision 1:12552:v:1:22000:168:145
-Astra Vision 1:12552:v:1:22000:168:146
-Astra Vision 1:12552:v:1:22000:168:147
-Astra Vision 1:12552:v:1:22000:168:148
-Astra Vision 1:12552:v:1:22000:168:149
-Astra Vision 1:12552:v:1:22000:168:150
-RTL Tele Letzebuerg:12552:v:1:22000:168:144
-Astra Mosaic:12552:v:1:22000:175:176
-MHP test:12604:h:1:22000:5632:8191
-Bloomberg TV Spain:12610:v:1:22000:45:49
-Video Italia:12610:v:1:22000:121:122
-AC 3 promo:12670:v:1:22000:308:256
+RTL:12188:h:1:27500:163:104:0:0
+Sat.1:12552:v:1:22000:163:104:0:0
+Pro 7:12480:v:1:27500:255:256:0:0
+RTL2:12188:h:1:27500:166:128:0:0
+ARD:11837:h:1:27500:101:102:0:0
+BR3:11837:h:1:27500:201:202:0:0
+Hessen 3:11837:h:1:27500:301:302:0:0
+N3:11837:h:1:27500:401:402:0:0
+SR3:11837:h:1:27500:501:502:0:0
+WDR:11837:h:1:27500:601:602:0:0
+BR alpha:11837:h:1:27500:701:702:0:0
+SWR BW:11837:h:1:27500:801:802:0:0
+Phoenix:11837:h:1:27500:901:902:0:0
+ZDF:11954:h:1:27500:110:120:0:0
+3sat:11954:h:1:27500:210:220:0:0
+Kinderkanal:11954:h:1:27500:310:320:0:0
+arte:11954:h:1:27500:360:370:0:0
+phoenix:11954:h:1:27500:410:420:0:0
+ORF Sat:11954:h:1:27500:506:507:0:0
+ZDF Infobox:11954:h:1:27500:610:620:0:0
+CNN:12168:v:1:27500:165:100:0:0
+Super RTL:12188:h:1:27500:165:120:0:0
+VOX:12188:h:1:27500:167:136:0:0
+DW TV:12363:v:1:27500:305:306:0:0
+Kabel 1:12480:v:1:27500:511:512:0:0
+TM3:12480:v:1:27500:767:768:0:0
+DSF:12480:v:1:27500:1023:1024:0:0
+HOT:12480:v:1:27500:1279:1280:0:0
+BloombergTV:12552:v:1:22000:162:99:0:0
+Sky News:12552:v:1:22000:305:306:0:0
+KinderNet:12574:h:1:22000:163:92:0:0
+Alice:12610:v:1:22000:162:96:0:0
+n-tv:12670:v:1:22000:162:96:0:0
+Grand Tour.:12670:v:1:22000:289:290:0:0
+TW1:12692:h:1:22000:166:167:0:0
+Eins Extra:12722:h:1:22000:101:102:0:0
+Eins Festival:12722:h:1:22000:201:202:0:0
+Eins MuXx:12722:h:1:22000:301:302:0:0
+MDR:12722:h:1:22000:401:402:0:0
+ORB:12722:h:1:22000:501:502:0:0
+B1:12722:h:1:22000:601:602:0:0
+ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
+Premiere World Promo:11798:h:1:27500:255:256:0:0
+TV Niepokalanow:11876:h:1:27500:305:321:0:0
+Premiere:11798:h:1:27500:1023:1024:1:10
+Mosaico:11934:v:1:27500:165:100:0:0
+Andalucia TV:11934:v:1:27500:166:104:0:0
+TVC Internacional:11934:v:1:27500:167:108:0:0
+Nasza TV:11992:h:1:27500:165:98:0:0
+WishLine test:12012:v:1:27500:163:90:0:0
+Pro 7 Austria:12051:v:1:27500:161:84:0:0
+Kabel 1 Schweiz:12051:v:1:27500:162:163:0:0
+Kabel 1 Austria:12051:v:1:27500:166:167:0:0
+Pro 7 Schweiz:12051:v:1:27500:289:290:0:0
+Kiosque:12129:v:1:27500:160:80:0:0
+KTO:12129:v:1:27500:170:120:0:0
+TCM:12168:v:1:27500:160:80:0:0
+Cartoon Network France & Spain:12168:v:1:27500:161:84:0:0
+TVBS Europe:12168:v:1:27500:162:88:0:0
+TVBS Europe:12168:v:1:27500:162:89:0:0
+Travel:12168:v:1:27500:163:92:0:0
+TCM Espania:12168:v:1:27500:164:96:0:0
+MTV Spain:12168:v:1:27500:167:112:0:0
+TCM France:12168:v:1:27500:169:64:0:0
+RTL2 CH:12188:h:1:27500:164:112:0:0
+La Cinquieme:12207:v:1:27500:160:80:0:0
+ARTE:12207:v:1:27500:165:100:0:0
+Post Filial TV:12226:h:1:27500:255:256:0:0
+Canal Canaris:12246:v:1:27500:160:80:0:0
+Canal Canaris:12246:v:1:27500:160:81:0:0
+Canal Canaris:12246:v:1:27500:160:82:0:0
+Canal Canaris:12246:v:1:27500:160:83:0:0
+AB Sat Passion promo:12266:h:1:27500:160:80:0:0
+AB Channel 1:12266:h:1:27500:161:84:0:0
+Taquilla 0:12285:v:1:27500:165:100:0:0
+CSAT:12324:v:1:27500:160:80:0:0
+Mosaique:12324:v:1:27500:162:88:0:0
+Mosaique 2:12324:v:1:27500:163:92:0:0
+Mosaique 3:12324:v:1:27500:164:96:0:0
+Le Sesame C+:12324:v:1:27500:165:1965:0:0
+FEED:12344:h:1:27500:163:92:0:0
+RTM 1:12363:v:1:27500:162:96:0:0
+ESC 1:12363:v:1:27500:163:104:0:0
+TV5 Europe:12363:v:1:27500:164:112:0:0
+TV7 Tunisia:12363:v:1:27500:166:128:0:0
+ARTE:12363:v:1:27500:167:137:0:0
+RAI Uno:12363:v:1:27500:289:290:0:0
+RTP International:12363:v:1:27500:300:301:0:0
+Fashion TV:12402:v:1:27500:163:92:0:0
+VideoService:12422:h:1:27500:255:256:0:0
+Beta Research promo:12422:h:1:27500:1023:1024:0:0
+Canal Canarias:12441:v:1:27500:160:80:0:0
+TVC International:12441:v:1:27500:512:660:0:0
+Fitur:12441:v:1:27500:514:662:0:0
+Astra Info 1:12552:v:1:22000:164:112:0:0
+Astra Info 2:12552:v:1:22000:165:120:0:0
+Astra Vision 1:12552:v:1:22000:168:144:0:0
+Astra Vision 1:12552:v:1:22000:168:145:0:0
+Astra Vision 1:12552:v:1:22000:168:146:0:0
+Astra Vision 1:12552:v:1:22000:168:147:0:0
+Astra Vision 1:12552:v:1:22000:168:148:0:0
+Astra Vision 1:12552:v:1:22000:168:149:0:0
+Astra Vision 1:12552:v:1:22000:168:150:0:0
+RTL Tele Letzebuerg:12552:v:1:22000:168:144:0:0
+Astra Mosaic:12552:v:1:22000:175:176:0:0
+MHP test:12604:h:1:22000:5632:8191:0:0
+Bloomberg TV Spain:12610:v:1:22000:45:49:0:0
+Video Italia:12610:v:1:22000:121:122:0:0
+AC 3 promo:12670:v:1:22000:308:256:0:0
diff --git a/config.c b/config.c
index af97a5cb4..c29fea8b7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.2 2000/03/05 16:14:27 kls Exp $
+ * $Id: config.c 1.3 2000/04/15 12:48:00 kls Exp $
  */
 
 #include "config.h"
@@ -16,28 +16,36 @@
 // -- cKeys ------------------------------------------------------------------
 
 tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
-                    { kUp,     "Up",     0 },
-                    { kDown,   "Down",   0 },
-                    { kMenu,   "Menu",   0 },
-                    { kOk,     "Ok",     0 },
-                    { kBack,   "Back",   0 },
-                    { kLeft,   "Left",   0 },
-                    { kRight,  "Right",  0 },
-                    { k0,      "0",      0 },
-                    { k1,      "1",      0 },
-                    { k2,      "2",      0 },
-                    { k3,      "3",      0 },
-                    { k4,      "4",      0 },
-                    { k5,      "5",      0 },
-                    { k6,      "6",      0 },
-                    { k7,      "7",      0 },
-                    { k8,      "8",      0 },
-                    { k9,      "9",      0 },
-                    { kRed,    "Red",    0 },
-                    { kGreen,  "Green",  0 },
-                    { kYellow, "Yellow", 0 },
-                    { kBlue,   "Blue",   0 },
-                    { kNone,   "",       0 },
+                    { kUp,            "Up",            0 },
+                    { kDown,          "Down",          0 },
+                    { kMenu,          "Menu",          0 },
+                    { kOk,            "Ok",            0 },
+                    { kBack,          "Back",          0 },
+                    { kLeft,          "Left",          0 },
+                    { kRight,         "Right",         0 },
+                    { k0,             "0",             0 },
+                    { k1,             "1",             0 },
+                    { k2,             "2",             0 },
+                    { k3,             "3",             0 },
+                    { k4,             "4",             0 },
+                    { k5,             "5",             0 },
+                    { k6,             "6",             0 },
+                    { k7,             "7",             0 },
+                    { k8,             "8",             0 },
+                    { k9,             "9",             0 },
+                    { kRed,           "Red",           0 },
+                    { kGreen,         "Green",         0 },
+                    { kYellow,        "Yellow",        0 },
+                    { kBlue,          "Blue",          0 },
+                    { kRecord,        "Record",        0 },
+                    { kPause,         "Pause",         0 },
+                    { kStop,          "Stop",          0 },
+                    { kBegin,         "Begin",         0 },
+                    { kSearchForward, "SearchForward", 0 },
+                    { kSearchBack,    "SearchBack",    0 },
+                    { kSkipForward,   "SkipForward",   0 },
+                    { kSkipBack,      "SkipBack",      0 },
+                    { kNone,          "",              0 },
                   };
 
 cKeys::cKeys(void)
@@ -88,7 +96,7 @@ bool cKeys::Load(char *FileName)
                               }
                            }
                         if (Name) {
-                           fprintf(stderr, "unknown key in %s, line %d\n", fileName, line);
+                           esyslog(LOG_ERR, "unknown key in %s, line %d\n", fileName, line);
                            result = false;
                            break;
                            }
@@ -96,17 +104,17 @@ bool cKeys::Load(char *FileName)
                     }
                  continue;
                  }
-              fprintf(stderr, "error in %s, line %d\n", fileName, line);
+              esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
               result = false;
               break;
               }
         fclose(f);
         }
      else
-        fprintf(stderr, "can't open '%s'\n", fileName);
+        esyslog(LOG_ERR, "can't open '%s'\n", fileName);
      }
   else
-     fprintf(stderr, "no key configuration file name supplied!\n");
+     esyslog(LOG_ERR, "no key configuration file name supplied!\n");
   return result;
 }
 
@@ -172,12 +180,14 @@ cChannel::cChannel(const cChannel *Channel)
   srate        = Channel ? Channel->srate        : 27500;
   vpid         = Channel ? Channel->vpid         : 255;
   apid         = Channel ? Channel->apid         : 256;
+  ca           = Channel ? Channel->ca           : 0;
+  pnr          = Channel ? Channel->pnr          : 0;
 }
 
 bool cChannel::Parse(char *s)
 {
   char *buffer = NULL;
-  if (7 == sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid)) {
+  if (9 == sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr)) {
      strncpy(name, buffer, MaxChannelName - 1);
      name[strlen(buffer)] = 0;
      delete buffer;
@@ -188,20 +198,21 @@ bool cChannel::Parse(char *s)
 
 bool cChannel::Save(FILE *f)
 {
-  return fprintf(f, "%s:%d:%c:%d:%d:%d:%d\n", name, frequency, polarization, diseqc, srate, vpid, apid) > 0;
+  return fprintf(f, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", name, frequency, polarization, diseqc, srate, vpid, apid, ca, pnr) > 0;
 }
 
 bool cChannel::Switch(void)
 {
-  if (!ChannelLocked) {
+  if (!DvbApi.Recording()) {
      isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
      CurrentChannel = Index();
      Interface.DisplayChannel(CurrentChannel + 1, name);
      for (int i = 3; --i;) {
-         if (DvbSetChannel(frequency, polarization, diseqc, srate, vpid, apid))
+         if (DvbApi.SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
          esyslog(LOG_ERR, "retrying");
          }
+     return false;
      }
   Interface.Info("Channel locked (recording)!");
   return false;
@@ -215,20 +226,23 @@ bool cChannel::SwitchTo(int i)
 
 // -- cTimer -----------------------------------------------------------------
 
-cTimer::cTimer(void)
+cTimer::cTimer(bool Instant)
 {
   startTime = stopTime = 0;
   recording = false;
-  active = 1;
+  active = Instant;
   channel = CurrentChannel + 1;
-  day = 1; //XXX today!
-  start = 0; //XXX now!
-  stop = 0; //XXX now + 2h!
+  time_t t = time(NULL);
+  struct tm *now = localtime(&t);
+  day = now->tm_mday;
+  start = now->tm_hour * 100 + now->tm_min;
+  stop = start + 200; // "instant recording" records 2 hours by default
+  if (stop >= 2400)
+     stop -= 2400;
 //TODO VPS???
-  quality = 'H';
   priority = 99;
   lifetime = 99;
-  *file = 0;
+  strcpy(file, Instant ? "instant" : "");
 }
 
 int cTimer::TimeToInt(int t)
@@ -286,7 +300,7 @@ bool cTimer::Parse(char *s)
 {
   char *buffer1 = NULL;
   char *buffer2 = NULL;
-  if (9 == sscanf(s, "%d:%d:%a[^:]:%d:%d:%c:%d:%d:%as", &active, &channel, &buffer1, &start, &stop, &quality, &priority, &lifetime, &buffer2)) {
+  if (8 == sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%as", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2)) {
      day = ParseDay(buffer1);
      strncpy(file, buffer2, MaxFileName - 1);
      file[strlen(buffer2)] = 0;
@@ -299,7 +313,7 @@ bool cTimer::Parse(char *s)
 
 bool cTimer::Save(FILE *f)
 {
-  return fprintf(f, "%d:%d:%s:%d:%d:%c:%d:%d:%s\n", active, channel, PrintDay(day), start, stop, quality, priority, lifetime, file) > 0;
+  return fprintf(f, "%d:%d:%s:%d:%d:%d:%d:%s\n", active, channel, PrintDay(day), start, stop, priority, lifetime, file) > 0;
 }
 
 bool cTimer::IsSingleEvent(void)
@@ -383,7 +397,6 @@ cKeys Keys;
 // -- cChannels --------------------------------------------------------------
 
 int CurrentChannel = 0;
-bool ChannelLocked = false;
 
 cChannels Channels;
 
diff --git a/config.h b/config.h
index 51fd22e01..6184f5628 100644
--- a/config.h
+++ b/config.h
@@ -4,12 +4,13 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.2 2000/03/05 14:58:23 kls Exp $
+ * $Id: config.h 1.3 2000/04/15 12:44:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -30,6 +31,14 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kGreen,
              kYellow,
              kBlue,
+             kRecord,
+             kPause,
+             kStop,
+             kBegin,
+             kSearchForward,
+             kSearchBack,
+             kSkipForward,
+             kSkipBack,
              kNone
            };
 
@@ -64,6 +73,8 @@ class cChannel : public cListObject {
   int srate;
   int vpid;
   int apid;
+  int ca;
+  int pnr;
   cChannel(void);
   cChannel(const cChannel *Channel);
   bool Parse(char *s);
@@ -84,11 +95,10 @@ class cTimer : public cListObject {
   int start;
   int stop;
 //TODO VPS???
-  char quality;
   int priority;
   int lifetime;
   char file[MaxFileName];
-  cTimer(void);
+  cTimer(bool Instant = false);
   bool Parse(char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void);
@@ -128,7 +138,7 @@ template<class T> class cConfig : public cList<T> {
              if (l->Parse(buffer))
                 Add(l);
              else {
-                fprintf(stderr, "error in %s, line %d\n", fileName, line);
+                esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
                 delete l;
                 result = false;
                 break;
@@ -137,7 +147,7 @@ template<class T> class cConfig : public cList<T> {
        fclose(f);
        }
     else {
-       fprintf(stderr, "can't open '%s'\n", fileName);
+       esyslog(LOG_ERR, "can't open '%s'\n", fileName);
        result = false;
        }
     return result;
@@ -168,7 +178,6 @@ class cChannels : public cConfig<cChannel> {};
 class cTimers : public cConfig<cTimer> {};
 
 extern int CurrentChannel;
-extern bool ChannelLocked;
 
 extern cChannels Channels;
 extern cTimers Timers;
diff --git a/dvbapi.c b/dvbapi.c
index 484a22e56..ef2f80862 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,171 +4,1024 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.2 2000/03/11 10:39:09 kls Exp $
+ * $Id: dvbapi.c 1.3 2000/04/15 14:45:04 kls Exp $
  */
 
 #include "dvbapi.h"
+#include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include "interface.h"
 #include "tools.h"
 
 #define VIDEODEVICE "/dev/video"
 
-const char *DvbQuality = "LMH"; // Low, Medium, High
+// The size of the array used to buffer video data:
+#define VIDEOBUFSIZE (1024*1024)
 
-bool DvbSetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid)
+// The minimum amount of video data necessary to identify frames
+// (must be smaller than VIDEOBUFSIZE!):
+#define MINVIDEODATA (20*1024) // just a safe guess (max. size of any AV_PES block, plus some safety)
+
+// The maximum time the buffer is allowed to write data to disk when recording:
+#define MAXRECORDWRITETIME 50 // ms
+
+#define AV_PES_HEADER_LEN 8
+
+// AV_PES block types:
+#define AV_PES_VIDEO 1
+#define AV_PES_AUDIO 2
+
+// Picture types:
+#define NO_PICTURE 0
+#define I_FRAME    1
+#define P_FRAME    2
+#define B_FRAME    3
+
+#define FRAMESPERSEC 25
+
+// The maximum file size is limited by the range that can be covered
+// with 'int'. 4GB might be possible (if the range is considered
+// 'unsigned'), 2GB should be possible (even if the range is considered
+// 'signed'), so let's use 1GB for absolute safety (the actual file size
+// may be slightly higher because we stop recording only before the next
+// 'I' frame, to have a complete Group Of Pictures):
+#define MAXVIDEOFILESIZE (1024*1024*1024)
+#define MAXFILESPERRECORDING 255
+
+#define INDEXFILESUFFIX     "/index.vdr"
+#define RESUMEFILESUFFIX    "/resume.vdr"
+#define RECORDFILESUFFIX    "/%03d.vdr"
+#define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
+#define MAXPROCESSTIMEOUT   3 // seconds
+
+// The number of frames to back up when resuming an interrupted replay session:
+#define RESUMEBACKUP (10 * FRAMESPERSEC)
+
+typedef unsigned char uchar;
+
+// --- cIndexFile ------------------------------------------------------------
+
+class cIndexFile {
+private:
+  struct tIndex { int offset; uchar type; uchar number; short reserved; };
+  int f;
+  char *fileName, *pFileExt;
+  int last, resume;
+  tIndex *index;
+public:
+  cIndexFile(const char *FileName, bool Record = false);
+  ~cIndexFile();
+  void Write(uchar PictureType, uchar FileNumber, int FileOffset);
+  bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL);
+  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length = NULL);
+  int Get(uchar FileNumber, int FileOffset);
+  int Last(void) { return last; }
+  int GetResume(void) { return resume; }
+  bool StoreResume(int Index);
+  static char *Str(int Index);
+  };
+
+cIndexFile::cIndexFile(const char *FileName, bool Record)
 {
-  int v = open(VIDEODEVICE, O_RDWR);
-  
-  if (v >= 0) {
-     struct frontend front;
-     ioctl(v, VIDIOCGFRONTEND, &front);
-     unsigned int freq = FrequencyMHz;
-     front.ttk = (freq < 11800UL) ? 0 : 1;
-     if (freq < 11800UL)
-        freq -=  9750UL;
+  f = -1;
+  fileName = pFileExt = NULL;
+  last = resume = -1;
+  index = NULL;
+  if (FileName) {
+     fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + strlen(RESUMEFILESUFFIX) + 1];
+     if (fileName) {                        // no max() function at hand...
+        strcpy(fileName, FileName);
+        pFileExt = fileName + strlen(fileName);
+        strcpy(pFileExt, INDEXFILESUFFIX);
+        int delta = 0;
+        if (access(fileName, R_OK) == 0) {
+           struct stat buf;
+           if (stat(fileName, &buf) == 0) {
+              delta = buf.st_size % sizeof(tIndex);
+              if (delta) {
+                 delta = sizeof(tIndex) - delta;
+                 esyslog(LOG_ERR, "ERROR: invalid file size (%d) in '%s'", buf.st_size, fileName);
+                 }
+              last = (buf.st_size + delta) / sizeof(tIndex) - 1;
+              if (!Record && last >= 0) {
+                 index = new tIndex[last + 1];
+                 int fi = open(fileName, O_RDONLY);
+                 if (fi >= 0) {
+                    if ((int)read(fi, index, buf.st_size) != buf.st_size) {
+                       esyslog(LOG_ERR, "ERROR: can't read from file '%s'", fileName);
+                       delete index;
+                       index = NULL;
+                       }
+                    close(fi);
+                    }
+                 else
+                    LOG_ERROR_STR(fileName);
+                 }
+              }
+           else
+              LOG_ERROR;
+           }
+        if (Record) {
+           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) >= 0) {
+              if (delta) {
+                 esyslog(LOG_ERR, "ERROR: padding index file with %d '0' bytes", delta);
+                 while (delta--)
+                       writechar(f, 0);
+                 }
+              }
+           else
+              LOG_ERROR_STR(fileName);
+           delete fileName;
+           fileName = pFileExt = NULL;
+           }
+        else {
+           strcpy(pFileExt, RESUMEFILESUFFIX);
+           int resumeFile = open(fileName, O_RDONLY);
+           if (resumeFile >= 0) {
+              if (read(resumeFile, &resume, sizeof(resume)) != sizeof(resume)) {
+                 resume = -1;
+                 LOG_ERROR_STR(fileName);
+                 }
+              close(resumeFile);
+              }
+           else if (errno != ENOENT)
+              LOG_ERROR_STR(fileName);
+           }
+        }
      else
-        freq -= 10600UL;
-     front.freq      = freq * 1000000UL;
-     front.diseqc    = Diseqc;
-     front.srate     = Srate * 1000;
-     front.volt      = (Polarization == 'v') ? 0 : 1;
-     front.video_pid = Vpid;
-     front.audio_pid = Apid;
-     front.AFC       = 1;
-     ioctl(v, VIDIOCSFRONTEND, &front);
-     close(v);
-     if (front.sync & 0x1F == 0x1F)
+        esyslog(LOG_ERR, "ERROR: can't copy file name '%s'", FileName);
+     }
+}
+
+cIndexFile::~cIndexFile()
+{
+  if (f >= 0)
+     close(f);
+  delete fileName;
+}
+
+void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
+{
+  if (f >= 0) {
+     tIndex i = { FileOffset, PictureType, FileNumber, 0 };
+     if (write(f, &i, sizeof(i)) != sizeof(i)) {
+        esyslog(LOG_ERR, "ERROR: can't write to index file");
+        close(f);
+        f = -1;
+        return;
+        }
+     last++;
+     }
+}
+
+bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType)
+{
+  if (index) {
+     if (Index >= 0 && Index <= last) {
+        *FileNumber = index[Index].number;
+        *FileOffset = index[Index].offset;
+        if (PictureType)
+           *PictureType = index[Index].type;
         return true;
-     esyslog(LOG_ERR, "channel not sync'ed (front.sync=%X)!", front.sync);
+        }
      }
-  else
-     Interface.Error("can't open VIDEODEVICE");//XXX
   return false;
 }
 
-// -- cDvbRecorder -----------------------------------------------------------
+int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length)
+{
+  if (index) {
+     int d = Forward ? 1 : -1;
+     for (;;) {
+         Index += d;
+         if (Index >= 0 && Index <= last) {
+            if (index[Index].type == I_FRAME) {
+               *FileNumber = index[Index].number;
+               *FileOffset = index[Index].offset;
+               if (Length) {
+                  // all recordings end with a non-I_FRAME, so the following should be safe:
+                  int fn = index[Index + 1].number;
+                  int fo = index[Index + 1].offset;
+                  if (fn == *FileNumber)
+                     *Length = fo - *FileOffset;
+                  else {
+                     esyslog(LOG_ERR, "ERROR: 'I' frame at end of file #%d", *FileNumber);
+                     *Length = -1;
+                     }
+                  }
+               return Index;
+               }
+            }
+         else
+            break;
+         }
+     }
+  return -1;
+}
+
+int cIndexFile::Get(uchar FileNumber, int FileOffset)
+{
+  if (index) {
+     //TODO implement binary search!
+     int i;
+     for (i = 0; i < last; i++) {
+         if (index[i].number > FileNumber || (index[i].number == FileNumber) && index[i].offset >= FileOffset)
+            break;
+         }
+     return i;
+     }
+  return -1;
+}
 
-cDvbRecorder::cDvbRecorder(void)
+bool cIndexFile::StoreResume(int Index)
 {
-  recording = false;
+  if (fileName) {
+     int resumeFile = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+     if (resumeFile >= 0) {
+        if (write(resumeFile, &Index, sizeof(Index)) != sizeof(Index))
+           LOG_ERROR_STR(fileName);
+        close(resumeFile);
+        return true;
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR_STR(fileName);
+     }
+  return false;
 }
 
-cDvbRecorder::~cDvbRecorder()
+char *cIndexFile::Str(int Index)
 {
-  Stop();
+  static char buffer[16];
+  int f = (Index % FRAMESPERSEC) + 1;
+  int s = (Index / FRAMESPERSEC);
+  int m = s / 60 % 60; 
+  int h = s / 3600; 
+  s %= 60;
+  snprintf(buffer, sizeof(buffer), "%d:%02d:%02d.%02d", h, m, s, f);
+  return buffer;
 }
 
-bool cDvbRecorder::Recording(void)
+// --- cRingBuffer -----------------------------------------------------------
+
+/* cRingBuffer reads data from an input file, stores it in a buffer and writes
+   it to an output file upon request. The Read() and Write() functions should
+   be called only when the associated file is ready to provide or receive data
+   (use the 'select()' function to determine that), and the files should be
+   opened in non-blocking mode.
+   The '...Limit' parameters define safety limits. If they are exceeded a log entry
+   will be made.
+*/
+
+class cRingBuffer {
+private:
+  uchar *buffer;
+  int size, head, tail, freeLimit, availLimit;
+  int countLimit, countOverflow;
+  int minFree;
+  bool eof;
+  int *inFile, *outFile;
+protected:
+  int Free(void) { return ((tail >= head) ? size + head - tail : head - tail) - 1; }
+  int Available(void) { return (tail >= head) ? tail - head : size - head + tail; }
+  int Readable(void) { return (tail >= head) ? size - tail - (head ? 0 : 1) : head - tail - 1; } // keep a 1 byte gap!
+  int Writeable(void) { return (tail > head) ? tail - head : size - head; }
+  int Byte(int Offset);
+  bool WaitForOutFile(int Timeout);
+public:
+  cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit = 0, int AvailLimit = 0);
+  virtual ~cRingBuffer();
+  virtual int Read(int Max = -1);
+  virtual int Write(int Max = -1);
+  bool EndOfFile(void) { return eof; }
+  bool Empty(void) { return Available() == 0; }
+  void Clear(void) { head = tail = 0; }
+  void Skip(int n);
+  };
+
+cRingBuffer::cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit, int AvailLimit)
 {
-  return recording;
+  inFile = InFile;
+  outFile = OutFile;
+  size = Size;
+  Clear();
+  freeLimit = FreeLimit;
+  availLimit = AvailLimit;
+  eof = false;
+  countLimit = countOverflow = 0;
+  minFree = size - 1;
+  buffer = new uchar[size];
+  if (!buffer)
+     esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", size);
 }
 
-bool cDvbRecorder::Record(const char *FileName, char Quality)
+cRingBuffer::~cRingBuffer()
 {
-  isyslog(LOG_INFO, "record %s (%c)", FileName, Quality);
-  if (MakeDirs(FileName)) {
-     FILE *f = fopen(FileName, "a");
-     if (f) {
-        fprintf(f, "%s, %c\n", FileName, Quality);
-        fclose(f);
-        recording = true;
-        // TODO
-        Interface.Error("Recording not yet implemented!");
+  dsyslog(LOG_INFO, "buffer stats: %d free, %d overflows, limit exceeded %d times", minFree, countOverflow, countLimit);
+  delete buffer;
+}
+
+int cRingBuffer::Byte(int Offset)
+{
+  if (buffer && Offset < Available()) {
+     Offset += head;
+     if (Offset >= size)
+        Offset -= size;
+     return buffer[Offset];
+     }
+  return -1;
+}
+
+void cRingBuffer::Skip(int n)
+{
+  if (head < tail) {
+     head += n;
+     if (head > tail)
+        head = tail;
+     }
+  else if (head > tail) {
+     head += n;
+     if (head >= size)
+        head -= size;
+     if (head > tail)
+        head = tail;
+     }
+}
+
+bool cRingBuffer::WaitForOutFile(int Timeout)
+{
+  fd_set set;
+  FD_ZERO(&set);
+  FD_SET(*outFile, &set);
+  struct timeval timeout;
+  timeout.tv_sec = 0;
+  timeout.tv_usec = Timeout;
+  if (select(FD_SETSIZE, NULL, &set, NULL, &timeout) > 0) {
+     if (FD_ISSET(*outFile, &set))
         return true;
+     }
+  esyslog(LOG_ERR, "ERROR: timeout in WaitForOutFile(%d)", Timeout);  
+  return false;
+}
+
+int cRingBuffer::Read(int Max)
+{
+  if (buffer) {
+     eof = false;
+     int free = Free();
+     if (free < minFree)
+        minFree = free;
+     if (freeLimit) {
+        if (free == 0) {
+           esyslog(LOG_ERR, "ERROR: buffer overflow (size=%d)", size);
+           countOverflow++;
+           }
+        else if (free < freeLimit) {
+           dsyslog(LOG_INFO, "free buffer space dipped into limit (%d < %d)", free, freeLimit);
+           countLimit++;
+           }
+        }
+     if (free == 0)
+        return 0; // the buffer is full
+     int readin = 0;
+     for (int i = 0; i < 2; i++) {
+         // If we read in exactly as many bytes as are immediately
+         // "readable" we have to do it again, because that means we
+         // were at the very end of the physical buffer and possibly only
+         // read in very few bytes.
+         int immediate = Readable();
+         int n = immediate;
+         if (Max > 0 && n > Max)
+            n = Max;
+         if (n > 0) {
+            int r = read(*inFile, buffer + tail, n);
+            if (r > 0) {
+               readin += r;
+               tail += r;
+               if (tail > size)
+                  esyslog(LOG_ERR, "ERROR: ooops: buffer tail (%d) exceeds size (%d)", tail, size);
+               if (tail >= size)
+                  tail = 0;
+               }
+            else if (r < 0 && errno != EAGAIN) {
+               LOG_ERROR;
+               return -1;
+               }
+            else
+               eof = true;
+            if (r == immediate && Max != immediate && tail == 0)
+               Max -= immediate;
+            else
+               break;
+            }
+         }
+     return readin;
+     }
+  return -1;
+}
+
+int cRingBuffer::Write(int Max)
+{
+  if (buffer) {
+     int avail = Available();
+     if (availLimit) {
+        //XXX stats???
+        if (avail == 0)
+           //XXX esyslog(LOG_ERR, "ERROR: buffer empty!");
+        {//XXX
+           esyslog(LOG_ERR, "ERROR: buffer empty! %d", Max);
+           return Max > 0 ? Max : 0;
+           }//XXX
+        else if (avail < availLimit)
+;//XXX           dsyslog(LOG_INFO, "available buffer data dipped into limit (%d < %d)", avail, availLimit);
+        }
+     if (avail == 0)
+        return 0; // the buffer is empty
+     int n = Writeable();
+     if (Max > 0 && n > Max)
+        n = Max;
+     int w = write(*outFile, buffer + head, n);
+     if (w > 0) {
+        head += w;
+        if (head > size)
+           esyslog(LOG_ERR, "ERROR: ooops: buffer head (%d) exceeds size (%d)", head, size);
+        if (head >= size)
+           head = 0;
+        }
+     else if (w < 0) {
+        if (errno != EAGAIN)
+           LOG_ERROR;
+        else
+           w = 0;
+        }
+     return w;
+     }
+  return -1;
+}
+
+// --- cFileBuffer -----------------------------------------------------------
+
+class cFileBuffer : public cRingBuffer {
+protected:
+  cIndexFile *index;
+  uchar fileNumber;
+  char *fileName, *pFileNumber;
+  bool stop;
+  int GetAvPesLength(void)
+  { 
+    if (Byte(0) == 'A' && Byte(1) == 'V' && Byte(4) == 'U')
+       return (Byte(6) << 8) + Byte(7) + AV_PES_HEADER_LEN;
+    return 0;
+  }
+  int GetAvPesType(void) { return Byte(2); }
+  int GetAvPesTag(void) { return Byte(3); }
+  int FindAvPesBlock(void);
+  int GetPictureType(int Offset) { return (Byte(Offset + 5) >> 3) & 0x07; }
+  int FindPictureStartCode(int Length);
+public:
+  cFileBuffer(int *InFile, int *OutFile, const char *FileName, bool Recording, int Size, int FreeLimit = 0, int AvailLimit = 0);
+  virtual ~cFileBuffer();
+  void Stop(void) { stop = true; }
+  };
+
+cFileBuffer::cFileBuffer(int *InFile, int *OutFile, const char *FileName, bool Recording, int Size, int FreeLimit = 0, int AvailLimit = 0)
+:cRingBuffer(InFile, OutFile, Size, FreeLimit, AvailLimit)
+{
+  index = NULL;
+  fileNumber = 0;
+  stop = false;
+  // Prepare the file name:
+  fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
+  if (!fileName) {
+     esyslog(LOG_ERR, "ERROR: can't copy file name '%s'", fileName);
+     return;
+     }
+  strcpy(fileName, FileName);
+  pFileNumber = fileName + strlen(fileName);
+  // Create the index file:
+  index = new cIndexFile(FileName, Recording);
+  if (!index)
+     esyslog(LOG_ERR, "ERROR: can't allocate index");
+     // let's continue without index, so we'll at least have the recording
+}
+
+cFileBuffer::~cFileBuffer()
+{
+  delete index;
+  delete fileName;
+}
+
+int cFileBuffer::FindAvPesBlock(void)
+{
+  int Skipped = 0;
+
+  while (Available() > MINVIDEODATA) {
+        if (GetAvPesLength())
+           return Skipped;
+        Skip(1);
+        Skipped++;
         }
-     else {
-        Interface.Error("Can't write to file!");
+  return -1;
+}
+
+int cFileBuffer::FindPictureStartCode(int Length)
+{
+  for (int i = AV_PES_HEADER_LEN; i < Length; i++) {
+      if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1 && Byte(i + 3) == 0)
+         return i;
+      }
+  return -1;
+}
+
+// --- cRecordBuffer ---------------------------------------------------------
+
+class cRecordBuffer : public cFileBuffer {
+private:
+  uchar pictureType;
+  int fileSize;
+  int recordFile;
+  uchar tagAudio, tagVideo;
+  bool ok, synced;
+  int Synchronize(void);
+  bool NextFile(void);
+  virtual int Write(int Max = -1);
+public:
+  cRecordBuffer(int *InFile, const char *FileName);
+  virtual ~cRecordBuffer();
+  int WriteWithTimeout(void);
+  };
+
+cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
+:cFileBuffer(InFile, &recordFile, FileName, true, VIDEOBUFSIZE, VIDEOBUFSIZE / 10, 0)
+{
+  pictureType = NO_PICTURE;
+  fileSize = 0;
+  recordFile = -1;
+  tagAudio = tagVideo = 0;
+  ok = synced = false;
+  if (!fileName)
+     return;//XXX find a better way???
+  // Find the highest existing file suffix:
+  for (;;) {
+      sprintf(pFileNumber, RECORDFILESUFFIX, ++fileNumber);
+      if (access(fileName, F_OK) < 0) {
+         if (errno == ENOENT)
+            break; // found a non existing file suffix
+         LOG_ERROR;
+         return;
+         }
+      }
+  ok = true;
+  //XXX hack to make the video device go into 'recording' mode:
+  char dummy;
+  read(*InFile, &dummy, sizeof(dummy));
+}
+
+cRecordBuffer::~cRecordBuffer()
+{
+  if (recordFile >= 0)
+     close(recordFile);
+}
+
+int cRecordBuffer::Synchronize(void)
+{
+  int Length = 0;
+  int Skipped = 0;
+  int s;
+
+  while ((s = FindAvPesBlock()) >= 0) {
+        pictureType = NO_PICTURE;
+        Skipped += s;
+        Length = GetAvPesLength();
+        if (Length <= MINVIDEODATA) {
+           switch (GetAvPesType()) {
+             case AV_PES_VIDEO:
+                     {
+                       int PictureOffset = FindPictureStartCode(Length);
+                       if (PictureOffset >= 0) {
+                          pictureType = GetPictureType(PictureOffset);
+                          if (pictureType < I_FRAME || pictureType > B_FRAME)
+                             esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pictureType);
+                          }
+                     }
+                     if (!synced) {
+                        tagVideo = GetAvPesTag();
+                        if (pictureType == I_FRAME) {
+                           synced = true;
+                           Skipped = 0;
+                           }
+                        else {
+                           Skip(Length - 1);
+                           Length = 0;
+                           }
+                        }
+                     else {
+                        if (++tagVideo != GetAvPesTag()) {
+                           esyslog(LOG_ERR, "ERROR: missed video data block #%d (next block is #%d)", tagVideo, GetAvPesTag());
+                           tagVideo = GetAvPesTag();
+                           }
+                        }
+                     break;
+             case AV_PES_AUDIO:
+                     if (!synced) {
+                        tagAudio = GetAvPesTag();
+                        Skip(Length - 1);
+                        Length = 0;
+                        }
+                     else {
+                        //XXX might get fooled the first time!!!
+                        if (++tagAudio != GetAvPesTag()) {
+                           esyslog(LOG_ERR, "ERROR: missed audio data block #%d (next block is #%d)", tagAudio, GetAvPesTag());
+                           tagAudio = GetAvPesTag();
+                           }
+                        }
+                     break;
+             default: // unknown data
+                      Length = 0; // don't skip entire block - maybe we're just not in sync with AV_PES yet
+                      if (synced)
+                         esyslog(LOG_ERR, "ERROR: unknown data type '%d'", GetAvPesType());
+             }
+           if (Length > 0)
+              break;
+           }
+        else if (synced) {
+           esyslog(LOG_ERR, "ERROR: block length too big (%d)", Length);
+           Length = 0;
+           }
+        Skip(1);
+        Skipped++;
+        }
+  if (synced && Skipped)
+     esyslog(LOG_ERR, "ERROR: skipped %d bytes", Skipped);
+  return Length;
+}
+
+bool cRecordBuffer::NextFile(void)
+{
+  if (recordFile >= 0 && fileSize > MAXVIDEOFILESIZE && pictureType == I_FRAME) {
+     if (close(recordFile) < 0)
+        LOG_ERROR;
+        // don't return 'false', maybe we can still record into the next file
+     recordFile = -1;
+     fileNumber++;
+     if (fileNumber == 0)
+        esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+     fileSize = 0;
+     }
+  if (recordFile < 0) {
+     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
+     dsyslog(LOG_INFO, "recording to '%s'", fileName);
+     recordFile = open(fileName, O_RDWR | O_CREAT | O_NONBLOCK, S_IRUSR | S_IWUSR);
+     if (recordFile < 0) {
+        LOG_ERROR;
         return false;
         }
      }
-  // TODO
-  return false;
+  return true;
 }
 
-bool cDvbRecorder::Play(const char *FileName, int Frame)
+int cRecordBuffer::Write(int Max)
 {
-  if (!recording) {
-     isyslog(LOG_INFO, "play %s (%d)", FileName, Frame);
-     // TODO
-     Interface.Error("Playback not yet implemented!");
-     return true;
+  // This function ignores the incoming 'Max'!
+  // It tries to write out exactly *one* block of AV_PES data.
+  if (!ok)
+     return -1;
+  int n = Synchronize();
+  if (n) {
+     if (stop && pictureType == I_FRAME) {
+        ok = false;
+        return -1; // finish the recording before the next 'I' frame       
+        }
+     if (NextFile()) {
+        if (index && pictureType != NO_PICTURE)
+           index->Write(pictureType, fileNumber, fileSize);
+        int written = 0;
+        for (;;) {
+            int w = cFileBuffer::Write(n);
+            if (w >= 0) {
+               fileSize += w;
+               written += w;
+               n -= w;
+               if (n == 0)
+                  return written;
+               }
+            else
+               return w;
+            }
+        }
+     return -1;
      }
-  return false;
+  return 0;
 }
 
-bool cDvbRecorder::FastForward(void)
+int cRecordBuffer::WriteWithTimeout(void)
 {
-  isyslog(LOG_INFO, "fast forward");
-  // TODO
-  return false;
+  int w, written = 0;
+  int t0 = time_ms();
+  while ((w = Write()) > 0 && time_ms() - t0 < MAXRECORDWRITETIME)
+        written += w;
+  return w < 0 ? w : written;
+}
+
+// --- cReplayBuffer ---------------------------------------------------------
+
+enum eReplayMode { rmPlay, rmFastForward, rmFastRewind };
+
+class cReplayBuffer : public cFileBuffer {
+private:
+  int fileOffset;
+  int replayFile;
+  eReplayMode mode;
+  bool skipAudio;
+  int lastIndex;
+  void SkipAudioBlocks(void);
+  bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
+  void Close(void);
+public:
+  cReplayBuffer(int *OutFile, const char *FileName);
+  virtual ~cReplayBuffer();  
+  virtual int Read(int Max = -1);
+  virtual int Write(int Max = -1);
+  void SetMode(eReplayMode Mode);
+  int Resume(void);
+  bool Save(void);
+  void SkipSeconds(int Seconds);
+  };
+
+cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
+:cFileBuffer(&replayFile, OutFile, FileName, false, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+{
+  fileOffset = 0;
+  replayFile = -1;
+  mode = rmPlay;
+  skipAudio = false;
+  lastIndex = -1;
+  if (!fileName)
+     return;//XXX find a better way???
+  // All recordings start with '1':
+  fileNumber = 1; //TODO what if it doesn't start with '1'???
+  //XXX hack to make the video device go into 'replaying' mode:
+  char dummy;
+  write(*OutFile, &dummy, sizeof(dummy));
+}
+
+cReplayBuffer::~cReplayBuffer()
+{
+  Close();
 }
 
-bool cDvbRecorder::FastRewind(void)
+void cReplayBuffer::Close(void)
 {
-  isyslog(LOG_INFO, "fast rewind");
-  // TODO
+  if (replayFile >= 0) {
+     if (close(replayFile) < 0)
+        LOG_ERROR;
+     replayFile = -1;
+     fileOffset = 0;
+     }
+}
+
+void cReplayBuffer::SetMode(eReplayMode Mode)
+{
+  mode = Mode;
+  skipAudio = Mode != rmPlay;
+  if (mode != rmPlay)
+     Clear();
+}
+
+int cReplayBuffer::Resume(void)
+{
+  if (index) {
+     int Index = index->GetResume();
+     if (Index >= 0) {
+        uchar FileNumber;
+        int FileOffset;
+        if (index->Get(Index, &FileNumber, &FileOffset) && NextFile(FileNumber, FileOffset))
+           return Index;
+        }
+     }
+  return -1;
+}
+
+bool cReplayBuffer::Save(void)
+{
+  if (index) {
+     int Index = index->Get(fileNumber, fileOffset);
+     if (Index >= 0) {
+        Index -= RESUMEBACKUP;
+        if (Index > 0) {
+           uchar FileNumber;
+           int FileOffset;
+           Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset);
+           }
+        else
+           Index = 0;
+        if (Index >= 0)
+           return index->StoreResume(Index);
+        }
+     }
   return false;
 }
 
-bool cDvbRecorder::Pause(void)
+void cReplayBuffer::SkipSeconds(int Seconds)
+{
+  if (index && Seconds) {
+     int Index = index->Get(fileNumber, fileOffset);
+     if (Index >= 0) {
+        if (Seconds < 0) {
+           int sec = index->Last() / FRAMESPERSEC;
+           if (Seconds < -sec)
+              Seconds = - sec;
+           }
+        Index += Seconds * FRAMESPERSEC;
+        if (Index < 0)
+           Index = 1;
+        uchar FileNumber;
+        int FileOffset;
+        if (index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) >= 0)
+           NextFile(FileNumber, FileOffset);
+        }
+     }
+}
+
+void cReplayBuffer::SkipAudioBlocks(void)
 {
-  isyslog(LOG_INFO, "pause");
-  // TODO
+  int Length;
+
+  while ((Length = GetAvPesLength()) > 0) {
+        if (GetAvPesType() == AV_PES_AUDIO)
+           Skip(Length);
+        else
+           break;
+        }
+}
+
+bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
+{
+  if (FileNumber > 0) {
+     Clear();
+     if (FileNumber != fileNumber) {
+        Close();
+        fileNumber = FileNumber;
+        }
+     }
+  if (replayFile >= 0 && EndOfFile()) {
+     Close();
+     fileNumber++;
+     if (fileNumber == 0)
+        esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+     }
+  if (replayFile < 0) {
+     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
+     if (access(fileName, R_OK) == 0) {
+        dsyslog(LOG_INFO, "playing '%s'", fileName);
+        replayFile = open(fileName, O_RDONLY | O_NONBLOCK);
+        if (replayFile < 0) {
+           LOG_ERROR;
+           return false;
+           }
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR;
+     }
+  if (replayFile >= 0) {
+     if (FileOffset >= 0) {
+        if ((fileOffset = lseek(replayFile, FileOffset, SEEK_SET)) != FileOffset)
+           LOG_ERROR;
+           // don't return 'false', maybe we can still replay the file
+        }
+     return true;
+     }
   return false;
 }
 
-void cDvbRecorder::Stop(void)
+int cReplayBuffer::Read(int Max = -1)
 {
-  isyslog(LOG_INFO, "stop");
-  recording = false;
-  // TODO
+  if (stop)
+     return -1;
+  if (mode != rmPlay) {
+     if (index) {
+        if (Available())
+           return 0; // write out the entire block
+        int Index = (lastIndex >= 0) ? lastIndex : index->Get(fileNumber, fileOffset);
+        if (Index >= 0) {
+           uchar FileNumber;
+           int FileOffset, Length;
+           Index = index->GetNextIFrame(Index, mode == rmFastForward, &FileNumber, &FileOffset, &Length);
+           if (Index >= 0) {
+              if (!NextFile(FileNumber, FileOffset))
+                 return -1;
+              Max = Length;
+              }
+           lastIndex = Index;
+           }
+        if (Index < 0) {
+           // This results in normal replay after a fast rewind.
+           // After a fast forward it will stop.
+           // TODO Could we cause it to pause at the last frame?
+           SetMode(rmPlay);
+           return 0;
+           }
+        }
+     }
+  else
+     lastIndex = -1;
+  //XXX timeout as in recording???
+  if (NextFile()) {
+     int readin = 0;
+     do {
+        // If Max is > 0 here we need to make sure we read in the entire block!
+        int r = cFileBuffer::Read(Max);
+        if (r >= 0)
+           readin += r;
+        else
+           return -1;
+        } while (readin < Max && Free() > 0);
+     return readin;
+     }
+  if (Available() > 0)
+     return 0;
+  return -1;
 }
 
-int cDvbRecorder::Frame(void)
+int cReplayBuffer::Write(int Max)
 {
-  isyslog(LOG_INFO, "frame");
-  // TODO
-  return 0;
+  int Written = 0;
+
+  do {
+     if (skipAudio) {
+        SkipAudioBlocks();
+        Max = GetAvPesLength();
+        }
+     while (Max) {
+           int w = cFileBuffer::Write(Max);
+           if (w >= 0) {
+              fileOffset += w;
+              Written += w;
+              if (Max < 0)
+                 break;
+              Max -= w;
+              }
+           else
+              return w;
+               //XXX??? Why does the buffer get empty here???
+           if (Empty() || !WaitForOutFile(1000000))
+              return Written;
+           }
+     } while (skipAudio && Available());
+  return Written;
 }
 
-// --- cDvbOsd ---------------------------------------------------------------
+// --- cDvbApi ---------------------------------------------------------------
 
-cDvbOsd::cDvbOsd(void)
+cDvbApi::cDvbApi(void)
 {
+  isMainProcess = true;
+  pidRecord = pidReplay = 0;
+  fromRecord = toRecord = -1;
+  fromReplay = toReplay = -1;
+  videoDev = open(VIDEODEVICE, O_RDWR | O_NONBLOCK);
+  if (videoDev < 0)
+     LOG_ERROR;
   cols = rows = 0;
-#ifdef DEBUG_OSD
-  memset(&colorPairs, 0, sizeof(colorPairs));
+#if defined(DEBUG_OSD) || defined(DEBUG_REMOTE)
   initscr();
-  start_color();
   keypad(stdscr, TRUE);
   nonl();
   cbreak();
   noecho();
   timeout(1000);
+#endif
+#if defined(DEBUG_OSD)
+  memset(&colorPairs, 0, sizeof(colorPairs));
+  start_color();
   leaveok(stdscr, TRUE);
   window = stdscr;
 #endif
-#ifdef DEBUG_REMOTE
-  initscr();
-  keypad(stdscr, TRUE);
-  nonl();
-  cbreak();
-  noecho();
-  timeout(1000);
-#endif
 }
 
-cDvbOsd::~cDvbOsd()
+cDvbApi::~cDvbApi()
 {
-  Close();
+  if (isMainProcess) {
+     if (videoDev >= 0) {
+        Close();
+        StopReplay();
+        StopRecord();
+        close(videoDev);
+        }
+#if defined(DEBUG_REMOTE) || defined(DEBUG_OSD)
+     endwin();
+#endif
+     }
 }
 
 #ifdef DEBUG_OSD
-void cDvbOsd::SetColor(eDvbColor colorFg, eDvbColor colorBg)
+void cDvbApi::SetColor(eDvbColor colorFg, eDvbColor colorBg)
 {
   int color = (colorBg << 16) | colorFg | 0x80000000;
   for (int i = 0; i < MaxColorPairs; i++) {
@@ -185,11 +1038,9 @@ void cDvbOsd::SetColor(eDvbColor colorFg, eDvbColor colorBg)
       }
 }
 #else
-void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
+void cDvbApi::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
-  int v = open(VIDEODEVICE, O_RDWR);
-
-  if (v >= 0) {
+  if (videoDev >= 0) {
      struct drawcmd dc;
      dc.cmd   = cmd;
      dc.color = color;
@@ -198,15 +1049,12 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      dc.x1    = x1;
      dc.y1    = y1;
      dc.data  = (void *)data;
-     ioctl(v, VIDIOCSOSDCOMMAND, &dc);
-     close(v);
+     ioctl(videoDev, VIDIOCSOSDCOMMAND, &dc);
      }
-  else
-     Interface.Error("can't open VIDEODEVICE");//XXX
 }
 #endif
 
-void cDvbOsd::Open(int w, int h)
+void cDvbApi::Open(int w, int h)
 {
   cols = w;
   rows = h;
@@ -233,14 +1081,14 @@ void cDvbOsd::Open(int w, int h)
   SETCOLOR(clrWhite,      0xFC, 0xFC, 0xFC, 255);
 }
 
-void cDvbOsd::Close(void)
+void cDvbApi::Close(void)
 {
 #ifndef DEBUG_OSD
   Cmd(OSD_Close);
 #endif
 }
 
-void cDvbOsd::Clear(void)
+void cDvbApi::Clear(void)
 {
 #ifdef DEBUG_OSD
   SetColor(clrBackground, clrBackground);
@@ -250,7 +1098,7 @@ void cDvbOsd::Clear(void)
 #endif
 }
 
-void cDvbOsd::Fill(int x, int y, int w, int h, eDvbColor color)
+void cDvbApi::Fill(int x, int y, int w, int h, eDvbColor color)
 {
   if (x < 0) x = cols + x;
   if (y < 0) y = rows + y;
@@ -265,12 +1113,12 @@ void cDvbOsd::Fill(int x, int y, int w, int h, eDvbColor color)
 #endif
 }
 
-void cDvbOsd::ClrEol(int x, int y, eDvbColor color)
+void cDvbApi::ClrEol(int x, int y, eDvbColor color)
 {
   Fill(x, y, cols - x, 1, color);
 }
 
-void cDvbOsd::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
+void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
 {
   if (x < 0) x = cols + x;
   if (y < 0) y = rows + y;
@@ -282,3 +1130,343 @@ void cDvbOsd::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor col
   Cmd(OSD_Text, (int(colorBg) << 16) | colorFg, x * charWidth, y * lineHeight, 1, 0, s);
 #endif
 }
+
+bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr)
+{
+  if (videoDev >= 0) {
+     struct frontend front;
+     ioctl(videoDev, VIDIOCGFRONTEND, &front);
+     unsigned int freq = FrequencyMHz;
+     front.ttk = (freq < 11800UL) ? 0 : 1;
+     if (freq < 11800UL)
+        freq -=  9750UL;
+     else
+        freq -= 10600UL;
+     front.channel_flags = Ca ? DVB_CHANNEL_CA : DVB_CHANNEL_FTA;
+     front.pnr       = Pnr;
+     front.freq      = freq * 1000000UL;
+     front.diseqc    = Diseqc;
+     front.srate     = Srate * 1000;
+     front.volt      = (Polarization == 'v') ? 0 : 1;
+     front.video_pid = Vpid;
+     front.audio_pid = Apid;
+     front.fec       = 8;
+     front.AFC       = 1;
+     ioctl(videoDev, VIDIOCSFRONTEND, &front);
+     if (front.sync & 0x1F == 0x1F)
+        return true;
+     esyslog(LOG_ERR, "ERROR: channel not sync'ed (front.sync=%X)!", front.sync);
+     }
+  return false;
+}
+
+void cDvbApi::KillProcess(pid_t pid)
+{
+  pid_t Pid2Wait4 = pid;
+  for (time_t t0 = time(NULL); time(NULL) - t0 < MAXPROCESSTIMEOUT; ) {
+      int status;
+      pid_t pid = waitpid(Pid2Wait4, &status, WNOHANG);
+      if (pid < 0) {
+         if (errno != ECHILD)
+            LOG_ERROR;
+         return;
+         }
+      if (pid == Pid2Wait4)
+         return;
+      }
+  esyslog(LOG_ERR, "ERROR: process %d won't end (waited %d seconds) - terminating it...", Pid2Wait4, MAXPROCESSTIMEOUT);
+  if (kill(Pid2Wait4, SIGTERM) < 0) {
+     esyslog(LOG_ERR, "ERROR: process %d won't terminate (%s) - killing it...", Pid2Wait4, strerror(errno));
+     if (kill(Pid2Wait4, SIGKILL) < 0)
+        esyslog(LOG_ERR, "ERROR: process %d won't die (%s) - giving up", Pid2Wait4, strerror(errno));
+     }
+}
+
+bool cDvbApi::Recording(void)
+{
+  return pidRecord;
+}
+
+bool cDvbApi::Replaying(void)
+{
+  return pidReplay;
+}
+
+bool cDvbApi::StartRecord(const char *FileName)
+{
+  if (Recording()) {
+     esyslog(LOG_ERR, "ERROR: StartRecord() called while recording - ignored!");
+     return false;
+     }
+  if (videoDev >= 0) {
+
+     // Check FileName:
+
+     if (!FileName) {
+        esyslog(LOG_ERR, "ERROR: StartRecord: file name is (null)");
+        return false;
+        }
+     isyslog(LOG_INFO, "record %s", FileName);
+
+     // Create directories if necessary:
+
+     if (!MakeDirs(FileName, true))
+        return false;
+
+     // Open pipes for recording process:
+
+     int fromRecordPipe[2], toRecordPipe[2];
+
+     if (pipe(fromRecordPipe) != 0) {
+        LOG_ERROR;
+        return false;
+        }
+     if (pipe(toRecordPipe) != 0) {
+        LOG_ERROR;
+        return false;
+        }
+
+     // Create recording process:
+
+     pidRecord = fork();
+     if (pidRecord < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     if (pidRecord == 0) {
+
+        // This is the actual recording process
+
+        dsyslog(LOG_INFO, "start recording process (pid=%d)", getpid());
+        isMainProcess = false;
+        int fromMain = toRecordPipe[0];
+        int toMain = fromRecordPipe[1];
+        cRecordBuffer *Buffer = new cRecordBuffer(&videoDev, FileName);
+        if (Buffer) {
+           for (;;) {
+               fd_set set;
+               FD_ZERO(&set);
+               FD_SET(videoDev, &set);
+               FD_SET(fromMain, &set);
+               struct timeval timeout;
+               timeout.tv_sec = 1;
+               timeout.tv_usec = 0;
+               if (select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0) {
+                  if (FD_ISSET(videoDev, &set)) {
+                     if (Buffer->Read() < 0)
+                        break;
+                     }
+                  if (FD_ISSET(fromMain, &set)) {
+                     switch (readchar(fromMain)) {
+                       case dvbStop:     Buffer->Stop(); break;
+                                         break;
+                       }
+                     }
+                  }
+               else
+                  esyslog(LOG_ERR, "ERROR: video data stream broken");
+               if (Buffer->WriteWithTimeout() < 0)
+                  break;
+               }
+           delete Buffer;
+           }
+        else
+           esyslog(LOG_ERR, "ERROR: can't allocate recording buffer");
+        close(fromMain);
+        close(toMain);
+        dsyslog(LOG_INFO, "end recording process");
+        exit(0);
+        }
+
+     // Establish communication with the recording process:
+
+     fromRecord = fromRecordPipe[0];
+     toRecord = toRecordPipe[1];
+     return true;
+     }
+  return false;
+}
+
+void cDvbApi::StopRecord(void)
+{
+  if (pidRecord) {
+     writechar(toRecord, dvbStop);
+     close(toRecord);
+     close(fromRecord);
+     toRecord = fromRecord = -1;
+     KillProcess(pidRecord);
+     pidRecord = 0;
+     SetReplayMode(VID_PLAY_RESET); //XXX
+     }
+}
+
+void cDvbApi::SetReplayMode(int Mode)
+{
+  if (videoDev >= 0) {
+     struct video_play_mode pmode;
+     pmode.mode = Mode;
+     ioctl(videoDev, VIDIOCSPLAYMODE, &pmode);
+     }
+}
+
+bool cDvbApi::StartReplay(const char *FileName)
+{
+  if (Recording()) {
+     esyslog(LOG_ERR, "ERROR: StartReplay() called while recording - ignored!");
+     return false;
+     }
+  StopReplay();
+  if (videoDev >= 0) {
+
+     // Check FileName:
+
+     if (!FileName) {
+        esyslog(LOG_ERR, "ERROR: StartReplay: file name is (null)");
+        return false;
+        }
+     isyslog(LOG_INFO, "replay %s", FileName);
+
+     // Open pipes for replay process:
+
+     int fromReplayPipe[2], toReplayPipe[2];
+
+     if (pipe(fromReplayPipe) != 0) {
+        LOG_ERROR;
+        return false;
+        }
+     if (pipe(toReplayPipe) != 0) {
+        LOG_ERROR;
+        return false;
+        }
+
+     // Create replay process:
+
+     pidReplay = fork();
+     if (pidReplay < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     if (pidReplay == 0) {
+
+        // This is the actual replaying process
+
+        dsyslog(LOG_INFO, "start replaying process (pid=%d)", getpid());
+        isMainProcess = false;
+        int fromMain = toReplayPipe[0];
+        int toMain = fromReplayPipe[1];
+        cReplayBuffer *Buffer = new cReplayBuffer(&videoDev, FileName);
+        if (Buffer) {
+           bool Paused = false;
+           bool FastForward = false;
+           bool FastRewind = false;
+           int ResumeIndex = Buffer->Resume();
+           if (ResumeIndex >= 0)
+              isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, cIndexFile::Str(ResumeIndex));
+           for (;;) {
+               if (Buffer->Read() < 0)
+                  break;
+               fd_set setIn, setOut;
+               FD_ZERO(&setIn);
+               FD_ZERO(&setOut);
+               FD_SET(fromMain, &setIn);
+               FD_SET(videoDev, &setOut);
+               struct timeval timeout;
+               timeout.tv_sec = 1;
+               timeout.tv_usec = 0;
+               if (select(FD_SETSIZE, &setIn, &setOut, NULL, &timeout) > 0) {
+                  if (FD_ISSET(videoDev, &setOut)) {
+                     if (Buffer->Write() < 0)
+                        break;
+                     }
+                  if (FD_ISSET(fromMain, &setIn)) {
+                     switch (readchar(fromMain)) {
+                       case dvbStop:        Buffer->Stop(); break;
+                       case dvbPauseReplay: SetReplayMode(Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
+                                            Paused = !Paused;
+                                            FastForward = FastRewind = false;
+                                            Buffer->SetMode(rmPlay);
+                                            break;
+                       case dvbFastForward: SetReplayMode(VID_PLAY_NORMAL);
+                                            FastForward = !FastForward;
+                                            FastRewind = Paused = false;
+                                            Buffer->SetMode(FastForward ? rmFastForward : rmPlay);
+                                            break;
+                       case dvbFastRewind:  SetReplayMode(VID_PLAY_NORMAL);
+                                            FastRewind = !FastRewind;
+                                            FastForward = Paused = false;
+                                            Buffer->SetMode(FastRewind ? rmFastRewind : rmPlay);
+                                            break;
+                       case dvbSkip:        {
+                                              int Seconds;
+                                              if (readint(fromMain, Seconds)) {
+                                                 SetReplayMode(VID_PLAY_NORMAL);
+                                                 FastForward = FastRewind = Paused = false;
+                                                 Buffer->SetMode(rmPlay);
+                                                 Buffer->SkipSeconds(Seconds);
+                                                 }
+                                            }
+                                            break;
+                       }
+                     }
+                  }
+               }
+           Buffer->Save();
+           delete Buffer;
+           }
+        else
+           esyslog(LOG_ERR, "ERROR: can't allocate replaying buffer");
+        close(fromMain);
+        close(toMain);
+        SetReplayMode(VID_PLAY_RESET); //XXX
+        dsyslog(LOG_INFO, "end replaying process");
+        exit(0);
+        }
+
+     // Establish communication with the replay process:
+
+     fromReplay = fromReplayPipe[0];
+     toReplay = toReplayPipe[1];
+     return true;
+     }
+  return false;
+}
+
+void cDvbApi::StopReplay(void)
+{
+  if (pidReplay) {
+     writechar(toReplay, dvbStop);
+     close(toReplay);
+     close(fromReplay);
+     toReplay = fromReplay = -1;
+     KillProcess(pidReplay);
+     pidReplay = 0;
+     SetReplayMode(VID_PLAY_RESET); //XXX
+     }
+}
+
+void cDvbApi::PauseReplay(void)
+{
+  if (pidReplay)
+     writechar(toReplay, dvbPauseReplay);
+}
+
+void cDvbApi::FastForward(void)
+{
+  if (pidReplay)
+     writechar(toReplay, dvbFastForward);
+}
+
+void cDvbApi::FastRewind(void)
+{
+  if (pidReplay)
+     writechar(toReplay, dvbFastRewind);
+}
+
+void cDvbApi::Skip(int Seconds)
+{
+  if (pidReplay) {
+     writechar(toReplay, dvbSkip);
+     writeint(toReplay, Seconds);
+     }
+}
+
diff --git a/dvbapi.h b/dvbapi.h
index 2e8406ee8..3c447cf1f 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,20 +4,21 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.2 2000/03/06 19:47:20 kls Exp $
+ * $Id: dvbapi.h 1.3 2000/04/15 13:36:10 kls Exp $
  */
 
 #ifndef __DVBAPI_H
 #define __DVBAPI_H
 
 // FIXME: these should be defined in ../DVB/driver/dvb.h!!!
-typedef unsigned int u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
+typedef unsigned int __u32;
+typedef unsigned short __u16;
+typedef unsigned char __u8;
 
 #if defined(DEBUG_OSD) || defined(DEBUG_REMOTE)
 #include <ncurses.h>
 #endif
+#include <stdio.h>
 #include "../DVB/driver/dvb.h"
 
 enum eDvbColor { clrBackground,
@@ -36,56 +37,15 @@ enum eDvbColor { clrBackground,
                  clrWhite,
                };
                   
-extern const char *DvbQuality; // Low, Medium, High
-
-bool DvbSetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid);
-
-class cDvbRecorder {
+class cDvbApi {
 private:
-  bool recording;
+  int videoDev;
 public:
-  cDvbRecorder(void);
-  ~cDvbRecorder();
-  bool Recording(void);
-       // Returns true if this recorder is currently recording, false if it
-       // is playing back or does nothing.
-  bool Record(const char *FileName, char Quality);
-       // Starts recording the current channel into the given file, with the
-       // given quality level. Any existing file will be overwritten.
-       // Returns true if recording was started successfully.
-       // If there is already a recording session active, false will be
-       // returned.
-  bool Play(const char *FileName, int Frame = 0);
-       // Starts playback of the given file, at the optional Frame (default
-       // is the beginning of the file). If Frame is beyond the last recorded
-       // frame in the file (or if it is negative), playback will be positioned
-       // to the last frame in the file (or the frame with the absolute value of
-       // Frame) and will do an implicit Pause() there.
-       // If there is already a playback session active, it will be stopped
-       // and the new file or frame (which may be in the same file) will
-       // be played back.
-  bool FastForward(void);
-       // Runs the current playback session forward at a higher speed.
-       // TODO allow different fast forward speeds???
-  bool FastRewind(void);
-       // Runs the current playback session backwards forward at a higher speed.
-       // TODO allow different fast rewind speeds???
-  bool Pause(void);
-       // Pauses the current recording or playback session, or resumes a paused
-       // session.
-       // Returns true if there is actually a recording or playback session
-       // active that was paused/resumed.
-  void Stop(void);
-       // Stops the current recording or playback session.
-  int  Frame(void);
-       // Returns the number of the current frame in the current recording or
-       // playback session, which can be used to start playback at a given position.
-       // The number returned is the actual number of frames counted from the
-       // beginning of the current file.
-       // The very first frame has the number 1.
-  };
+  cDvbApi(void);
+  ~cDvbApi();
+
+  // On Screen Display facilities
 
-class cDvbOsd {
 private:
   enum { charWidth  = 12, // average character width
          lineHeight = 27  // smallest text height
@@ -95,19 +55,70 @@ class cDvbOsd {
   enum { MaxColorPairs = 16 };
   int colorPairs[MaxColorPairs];
   void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
-#else
-  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
 #endif
   int cols, rows;
+  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
 public:
-  cDvbOsd(void);
-  ~cDvbOsd();
   void Open(int w, int h);
   void Close(void);
   void Clear(void);
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
+
+  // Channel facilities
+
+  bool SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr);
+
+  // Record/Replay facilities
+
+private:
+  enum { dvbStop = 1, // let's not have 0 as a command
+         dvbPauseReplay,
+         dvbFastForward,
+         dvbFastRewind,
+         dvbSkip,
+       };
+  bool isMainProcess;
+  pid_t pidRecord, pidReplay;
+  int fromRecord, toRecord;
+  int fromReplay, toReplay;
+  void SetReplayMode(int Mode);
+  void KillProcess(pid_t pid);
+public:
+  bool Recording(void);
+       // Returns true if we are currently recording.
+  bool Replaying(void);
+       // Returns true if we are currently replaying.
+  bool StartRecord(const char *FileName);
+       // Starts recording the current channel into the given file.
+       // In order to be able to record longer movies,
+       // a numerical suffix will be appended to the file name. The inital
+       // value of that suffix will be larger than any existing file under
+       // the given name, thus allowing an interrupted recording to continue
+       // gracefully.
+       // Returns true if recording was started successfully.
+       // If there is already a recording session active, false will be
+       // returned.
+  void StopRecord(void);
+       // Stops the current recording session (if any).
+  bool StartReplay(const char *FileName);
+       // Starts replaying the given file.
+       // If there is already a replay session active, it will be stopped
+       // and the new file will be played back.
+  void StopReplay(void);
+       // Stops the current replay session (if any).
+  void PauseReplay(void);
+       // Pauses the current replay session, or resumes a paused session.
+  void FastForward(void);
+       // Runs the current replay session forward at a higher speed.
+  void FastRewind(void);
+       // Runs the current replay session backwards at a higher speed.
+  void Skip(int Seconds);
+       // Skips the given number of seconds in the current replay session.
+       // The sign of 'Seconds' determines the direction in which to skip.
+       // Use a very large negative value to go all the way back to the
+       // beginning of the recording.
   };
   
 #endif //__DVBAPI_H
diff --git a/interface.c b/interface.c
index 6a4b2a4e2..a54651357 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.2 2000/03/06 19:45:03 kls Exp $
+ * $Id: interface.c 1.3 2000/04/15 17:38:11 kls Exp $
  */
 
 #include "interface.h"
@@ -15,10 +15,10 @@
 #define MenuColumns 40
 
 #ifndef DEBUG_REMOTE
-cRcIo RcIo("/dev/ttyS1");//XXX
+cRcIo RcIo("/dev/ttyS1");
 #endif
 
-cDvbOsd DvbOsd; //XXX member of cInterface???
+cDvbApi DvbApi; //XXX member of cInterface???
 
 cInterface Interface;
 
@@ -38,19 +38,22 @@ void cInterface::Init(void)
 void cInterface::Open(void)
 {
   if (!open++)
-     DvbOsd.Open(MenuColumns, MenuLines);
+     DvbApi.Open(MenuColumns, MenuLines);
 }
 
 void cInterface::Close(void)
 {
+  if (open == 1)
+     Clear();
   if (!--open)
-     DvbOsd.Close();
+     DvbApi.Close();
 }
 
 unsigned int cInterface::GetCh(void)
 {
 #ifdef DEBUG_REMOTE
-  return getch();
+  int c = getch();
+  return (c > 0) ? c : 0;
 #else
 //XXX #ifdef DEBUG_OSD
 //XXX   wrefresh(window);//XXX
@@ -80,13 +83,13 @@ eKeys cInterface::Wait(int Seconds)
 void cInterface::Clear(void)
 {
   if (open)
-     DvbOsd.Clear();
+     DvbApi.Clear();
 }
 
 void cInterface::ClearEol(int x, int y, eDvbColor Color)
 {
   if (open)
-     DvbOsd.ClrEol(x, y, Color);
+     DvbApi.ClrEol(x, y, Color);
 }
 
 void cInterface::SetCols(int *c)
@@ -101,7 +104,7 @@ void cInterface::SetCols(int *c)
 void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
   if (open)
-     DvbOsd.Text(x, y, s, FgColor, BgColor);
+     DvbApi.Text(x, y, s, FgColor, BgColor);
 }
 
 void cInterface::WriteText(int x, int y, const char *s, bool Current)
@@ -187,8 +190,8 @@ void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvb
      int l = (w - strlen(Text)) / 2;
      if (l < 0)
         l = 0;
-     DvbOsd.Fill(Index * w, -1, w, 1, BgColor);
-     DvbOsd.Text(Index * w + l, -1, Text, FgColor, BgColor);
+     DvbApi.Fill(Index * w, -1, w, 1, BgColor);
+     DvbApi.Text(Index * w + l, -1, Text, FgColor, BgColor);
      }
 }
 
diff --git a/interface.h b/interface.h
index 9322cf39d..1e5329d5d 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.2 2000/02/27 14:54:02 kls Exp $
+ * $Id: interface.h 1.3 2000/03/19 14:03:28 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -45,5 +45,6 @@ class cInterface {
   };
 
 extern cInterface Interface;
+extern cDvbApi DvbApi; //XXX member of cInterface???
 
 #endif //__INTERFACE_H
diff --git a/keys-pc.conf b/keys-pc.conf
index cfbe4587144cd511eac35a937b408cb2fc648c1a..744609d5c09e0c95ec545e912d01d81de7cd64ab 100644
GIT binary patch
delta 156
zcmbQuw32y(C6k%aMC%9jL8;04MJb#HU|?><6_8k3oC@O_a0Qp-7r=PNTu!O!nR!sI
yi4j+DYGP4xhFgA7c_Q2hGc%~LQ(|&9RH+$IX?A7-ib6wEupoZ{LY<+hF&6+hj49#(

delta 12
TcmZ3<Jez5PC6j^KMC%6t86^ZK

diff --git a/keys.conf b/keys.conf
deleted file mode 100644
index 0e3c07bc7..000000000
--- a/keys.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-Code	B
-Address	0000
-Up	000047E2
-Down	000007E2
-Menu	000011E2
-Ok	000079E2
-Back	00001AE2
-Left	000005E2
-Right	000045E2
-0	00007FE2
-1	00003FE2
-2	00005FE2
-3	00001FE2
-4	00006FE2
-5	00002FE2
-6	00004FE2
-7	00000FE2
-8	000077E2
-9	000037E2
-Red	000025E2
-Green	00002AE2
-Yellow	00005AE2
-Blue	00000000
diff --git a/menu.c b/menu.c
index 45f25a46a..92c0bd3e1 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.2 2000/03/05 15:37:31 kls Exp $
+ * $Id: menu.c 1.3 2000/04/15 15:07:36 kls Exp $
  */
 
 #include "menu.h"
@@ -502,13 +502,15 @@ cMenuEditChannel::cMenuEditChannel(int Index)
   channel = Channels.Get(Index);
   if (channel) {
      data = *channel;
-     Add(new cMenuEditStrItem("Name",          data.name, sizeof(data.name), FileNameChars));
-     Add(new cMenuEditIntItem("Frequency",    &data.frequency, 10000, 13000)); //TODO exact limits???
-     Add(new cMenuEditChrItem("Polarization", &data.polarization, "hv"));
-     Add(new cMenuEditIntItem("Diseqc",       &data.diseqc, 0, 10)); //TODO exact limits???
-     Add(new cMenuEditIntItem("Srate",        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
-     Add(new cMenuEditIntItem("Vpid",         &data.vpid, 0, 10000)); //TODO exact limits???
-     Add(new cMenuEditIntItem("Apid",         &data.apid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditStrItem( "Name",          data.name, sizeof(data.name), FileNameChars));
+     Add(new cMenuEditIntItem( "Frequency",    &data.frequency, 10000, 13000)); //TODO exact limits???
+     Add(new cMenuEditChrItem( "Polarization", &data.polarization, "hv"));
+     Add(new cMenuEditIntItem( "Diseqc",       &data.diseqc, 0, 10)); //TODO exact limits???
+     Add(new cMenuEditIntItem( "Srate",        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
+     Add(new cMenuEditIntItem( "Vpid",         &data.vpid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( "Apid",         &data.apid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditBoolItem("CA",           &data.ca));
+     Add(new cMenuEditIntItem( "Pnr",          &data.pnr, 0, 10000)); //TODO exact limits???
      }
 }
 
@@ -599,7 +601,7 @@ eOSState cMenuChannels::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog(LOG_INFO, "editing timer %d", Current() + 1);
+  isyslog(LOG_INFO, "editing channel %d", Current() + 1);
   return AddSubMenu(new cMenuEditChannel(Current()));
 }
 
@@ -711,23 +713,24 @@ class cMenuEditTimer : public cOsdMenu {
   cTimer *timer;
   cTimer data;
 public:
-  cMenuEditTimer(int Index);
+  cMenuEditTimer(int Index, bool New = false);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuEditTimer::cMenuEditTimer(int Index)
+cMenuEditTimer::cMenuEditTimer(int Index, bool New)
 :cOsdMenu("Edit Timer", 10)
 {
   timer = Timers.Get(Index);
   if (timer) {
      data = *timer;
+     if (New)
+        data.active = 1;
      Add(new cMenuEditBoolItem("Active",       &data.active));
      Add(new cMenuEditChanItem("Channel",      &data.channel)); 
      Add(new cMenuEditDayItem( "Day",          &data.day)); 
      Add(new cMenuEditTimeItem("Start",        &data.start)); 
      Add(new cMenuEditTimeItem("Stop",         &data.stop)); 
 //TODO VPS???
-     Add(new cMenuEditChrItem( "Quality",      &data.quality, DvbQuality));
      Add(new cMenuEditIntItem( "Priority",     &data.priority, 0, 99));
      Add(new cMenuEditIntItem( "Lifetime",     &data.lifetime, 0, 99));
      Add(new cMenuEditStrItem( "File",          data.file, sizeof(data.file), FileNameChars));
@@ -843,7 +846,7 @@ eOSState cMenuTimers::New(void)
   Add(new cMenuTimerItem(timer->Index()/*XXX*/, timer), true);
   Timers.Save();
   isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
-  return AddSubMenu(new cMenuEditTimer(Current()));
+  return AddSubMenu(new cMenuEditTimer(Current(), true));
 }
 
 eOSState cMenuTimers::Del(void)
diff --git a/osm.c b/osm.c
index 7031d6893..70305ce88 100644
--- a/osm.c
+++ b/osm.c
@@ -22,9 +22,10 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: osm.c 1.2 2000/03/05 17:18:15 kls Exp $
+ * $Id: osm.c 1.3 2000/04/15 14:04:21 kls Exp $
  */
 
+#include <signal.h>
 #include "config.h"
 #include "interface.h"
 #include "menu.h"
@@ -37,6 +38,13 @@
 #define KEYS_CONF "keys.conf"
 #endif
 
+static int Interrupted = 0;
+
+void SignalHandler(int signum)
+{
+  Interrupted = signum;
+}
+
 int main(int argc, char *argv[])
 {
   openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
@@ -50,69 +58,93 @@ int main(int argc, char *argv[])
 
   cChannel::SwitchTo(CurrentChannel);
 
+  if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
+  if (signal(SIGINT,  SignalHandler) == SIG_IGN) signal(SIGINT,  SIG_IGN);
+  if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
+
   cMenuMain *Menu = NULL;
   cTimer *Timer = NULL;
   cRecording *Recording = NULL;
 
-  for (;;) {
-      AssertFreeDiskSpace();
-      if (!Recording && !Timer && (Timer = cTimer::GetMatch()) != NULL) {
-         DELETENULL(Menu);
-         // make sure the timer won't be deleted:
-         Timer->SetRecording(true);
-         // switch to channel:
-         cChannel::SwitchTo(Timer->channel - 1);
-         ChannelLocked = true;
-         // start recording:
-         Recording = new cRecording(Timer);
-         if (!Recording->Record())
-            DELETENULL(Recording);
-         }
-      if (Timer && !Timer->Matches()) {
-         // stop recording:
-         if (Recording) {
-            Recording->Stop();
-            DELETENULL(Recording);
-            }
-         // release channel and timer:
-         ChannelLocked = false;
-         Timer->SetRecording(false);
-         // clear single event timer:
-         if (Timer->IsSingleEvent()) {
-            DELETENULL(Menu); // must make sure no menu uses it
-            isyslog(LOG_INFO, "deleting timer %d", Timer->Index() + 1);
-            Timers.Del(Timer);
-            Timers.Save();
-            }
-         Timer = NULL;
-         }
-      eKeys key = Interface.GetKey();
-      if (Menu) {
-         switch (Menu->ProcessKey(key)) {
-           default: if (key != kMenu)
-                       break;
-           case osBack:
-           case osEnd: DELETENULL(Menu);
-                       break;
+  while (!Interrupted) {
+        AssertFreeDiskSpace();
+        if (!Recording && !Timer && (Timer = cTimer::GetMatch()) != NULL) {
+           DELETENULL(Menu);
+           // make sure the timer won't be deleted:
+           Timer->SetRecording(true);
+           // switch to channel:
+           cChannel::SwitchTo(Timer->channel - 1);
+           // start recording:
+           Recording = new cRecording(Timer);
+           if (!Recording->Record())
+              DELETENULL(Recording);
+           }
+        if (Timer && !Timer->Matches()) {
+           // stop recording:
+           if (Recording) {
+              Recording->Stop();
+              DELETENULL(Recording);
+              }
+           // release timer:
+           Timer->SetRecording(false);
+           // clear single event timer:
+           if (Timer->IsSingleEvent()) {
+              DELETENULL(Menu); // must make sure no menu uses it
+              isyslog(LOG_INFO, "deleting timer %d", Timer->Index() + 1);
+              Timers.Del(Timer);
+              Timers.Save();
+              }
+           Timer = NULL;
+           }
+        eKeys key = Interface.GetKey();
+        if (Menu) {
+           switch (Menu->ProcessKey(key)) {
+             default: if (key != kMenu)
+                         break;
+             case osBack:
+             case osEnd: DELETENULL(Menu);
+                         break;
+             }
            }
-         }
-      else {
-         switch (key) {
-           case kMenu: Menu = new cMenuMain;
-                       Menu->Display();
-                       break;
-           case kUp:
-           case kDown: {
-                         int n = CurrentChannel + (key == kUp ? 1 : -1);
-                         cChannel *channel = Channels.Get(n);
-                         if (channel)
-                            channel->Switch();
-                       }
-                       break;
-           default:    break;
+        else {
+           switch (key) {
+             // Record/Replay Control:
+             case kBegin:         DvbApi.Skip(-INT_MAX); break;
+             case kRecord:        if (!DvbApi.Recording()) {
+                                     cTimer *timer = new cTimer(true);
+                                     Timers.Add(timer);
+                                     Timers.Save();
+                                     }
+                                  else
+                                     Interface.Error("Already recording!");
+                                  break;
+             case kPause:         DvbApi.PauseReplay(); break;
+             case kStop:          DvbApi.StopReplay(); break;
+             case kSearchBack:    DvbApi.FastRewind(); break;
+             case kSearchForward: DvbApi.FastForward(); break;
+             case kSkipBack:      DvbApi.Skip(-60); break;
+             case kSkipForward:   DvbApi.Skip(60); break;
+             // Menu Control:
+             case kMenu: Menu = new cMenuMain;
+                         Menu->Display();
+                         break;
+             case kUp:
+             case kDown: {
+                           int n = CurrentChannel + (key == kUp ? 1 : -1);
+                           cChannel *channel = Channels.Get(n);
+                           if (channel)
+                              channel->Switch();
+                         }
+                         break;
+             default:    break;
+             }
            }
-         }
-      }
+        }
+  isyslog(LOG_INFO, "caught signal %d", Interrupted);
+  DvbApi.StopRecord();
+  DvbApi.StopReplay();
+  //TODO kill any remaining sub-processes!
+  isyslog(LOG_INFO, "exiting", Interrupted);
   closelog();
-  return 1;
+  return 0;
 }
diff --git a/recording.c b/recording.c
index afc2d8b3e..15c716300 100644
--- a/recording.c
+++ b/recording.c
@@ -4,9 +4,10 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.1 2000/03/05 17:16:22 kls Exp $
+ * $Id: recording.c 1.2 2000/04/15 13:29:02 kls Exp $
  */
 
+#define _GNU_SOURCE
 #include "recording.h"
 #include <errno.h>
 #include <stdio.h>
@@ -16,17 +17,17 @@
 
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
-#define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%c.%02d.%02d" RECEXT
+#define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
 
-#define FINDCMD      "find %s -type f -name '%s'"
+#define FINDCMD      "find %s -type d -name '%s'"
 
 #define DFCMD        "df -m %s"
 #define MINDISKSPACE 1024 // MB
 
-const char *BaseDir = "/video";//XXX
+#define DISKCHECKDELTA 300 // seconds between checks for free disk space
 
-cDvbRecorder *Recorder = NULL;
+const char *BaseDir = "/video";
 
 static bool LowDiskSpace(void)
 {
@@ -58,51 +59,54 @@ void AssertFreeDiskSpace(void)
   // With every call to this function we try to actually remove
   // a file, or mark a file for removal ("delete" it), so that
   // it will get removed during the next call.
-  if (Recorder && Recorder->Recording() && LowDiskSpace()) {
-     // Remove the oldest file that has been "deleted":
-     cRecordings Recordings;
-     if (Recordings.Load(true)) {
-        cRecording *r = Recordings.First();
-        cRecording *r0 = r;
-        while (r) {
-              if (r->start < r0->start)
-                 r0 = r;
-              r = Recordings.Next(r);
-              }
-        if (r0 && r0->Remove())
-           return;
-        }
-     // No "deleted" files to remove, so let's see if we can delete a recording:
-     if (Recordings.Load(false)) {
-        cRecording *r = Recordings.First();
-        cRecording *r0 = NULL;
-        while (r) {
-              if ((time(NULL) - r->start) / SECSINDAY > r->lifetime) {
-                 if (r0) {
-                    if (r->priority < r0->priority)
+  static time_t LastFreeDiskCheck = 0;
+  if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA) {
+     LastFreeDiskCheck = time(NULL);
+     if (DvbApi.Recording() && LowDiskSpace()) {
+        // Remove the oldest file that has been "deleted":
+        cRecordings Recordings;
+        if (Recordings.Load(true)) {
+           cRecording *r = Recordings.First();
+           cRecording *r0 = r;
+           while (r) {
+                 if (r->start < r0->start)
+                    r0 = r;
+                 r = Recordings.Next(r);
+                 }
+           if (r0 && r0->Remove())
+              return;
+           }
+        // No "deleted" files to remove, so let's see if we can delete a recording:
+        if (Recordings.Load(false)) {
+           cRecording *r = Recordings.First();
+           cRecording *r0 = NULL;
+           while (r) {
+                 if ((time(NULL) - r->start) / SECSINDAY > r->lifetime) {
+                    if (r0) {
+                       if (r->priority < r0->priority)
+                          r0 = r;
+                       }
+                    else
                        r0 = r;
                     }
-                 else
-                    r0 = r;
+                 r = Recordings.Next(r);
                  }
-              r = Recordings.Next(r);
-              }
-        if (r0 && r0->Delete())
-           return;
+           if (r0 && r0->Delete())
+              return;
+           }
+        // Unable to free disk space, but there's nothing we can do about that...
+        esyslog(LOG_ERR, "low disk space, but no recordings to delete");
         }
-     // Unable to free disk space, but there's nothing we can do about that...
-     //TODO maybe a log entry - but make sure it doesn't come too often
      }
 }
 
 // --- cRecording ------------------------------------------------------------
 
-cRecording::cRecording(const char *Name, time_t Start, char Quality, int Priority, int LifeTime)
+cRecording::cRecording(const char *Name, time_t Start, int Priority, int LifeTime)
 {
   fileName = NULL;
   name = strdup(Name);
   start = Start;
-  quality = Quality;
   priority = Priority;
   lifetime = LifeTime;
 }
@@ -112,7 +116,6 @@ cRecording::cRecording(cTimer *Timer)
   fileName = NULL;
   name = strdup(Timer->file);
   start = Timer->StartTime();
-  quality = Timer->quality;
   priority = Timer->priority;
   lifetime = Timer->lifetime;
 }
@@ -127,7 +130,7 @@ cRecording::cRecording(const char *FileName)
   if (p) {
      time_t now = time(NULL);
      struct tm t = *localtime(&now); // this initializes the time zone in 't'
-     if (8 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &quality, &priority, &lifetime)) {
+     if (7 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
         t.tm_year -= 1900;
         t.tm_mon--;
         t.tm_sec = 0;
@@ -149,7 +152,7 @@ const char *cRecording::FileName(void)
 {
   if (!fileName) {
      struct tm *t = localtime(&start);
-     asprintf(&fileName, NAMEFORMAT, BaseDir, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, quality, priority, lifetime);
+     asprintf(&fileName, NAMEFORMAT, BaseDir, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
      }
   return fileName;
 }
@@ -163,7 +166,7 @@ bool cRecording::Delete(void)
      strncpy(ext, DELEXT, strlen(ext));
      isyslog(LOG_INFO, "deleting recording %s", FileName());
      if (rename(FileName(), NewName) == -1) {
-        esyslog(LOG_ERR, "ERROR: %s", strerror(errno));
+        esyslog(LOG_ERR, "ERROR: %s: %s", FileName(), strerror(errno));
         result = false;
         }
      }
@@ -173,40 +176,23 @@ bool cRecording::Delete(void)
 
 bool cRecording::Remove(void)
 {
-  bool result = true;
   isyslog(LOG_INFO, "removing recording %s", FileName());
-  if (remove(FileName()) == -1) {
-     esyslog(LOG_ERR, "ERROR: %s", strerror(errno));
-     result = false;
-     }
-  return result;
-}
-
-bool cRecording::AssertRecorder(void)
-{
-  if (!Recorder || !Recorder->Recording()) {
-     if (!Recorder)
-        Recorder = new cDvbRecorder;
-     return true;
-     }
-  Interface.Error("Recorder is in use!");
-  return false;
+  return RemoveFileOrDir(FileName());
 }
 
 bool cRecording::Record(void)
 {
-  return AssertRecorder() && Recorder->Record(FileName(), quality);
+  return DvbApi.StartRecord(FileName());
 }
 
 bool cRecording::Play(void)
 {
-  return AssertRecorder() && Recorder->Play(FileName());
+  return DvbApi.StartReplay(FileName());
 }
 
 void cRecording::Stop(void)
 {
-  if (Recorder)
-     Recorder->Stop();
+  DvbApi.StopRecord();
 }
 
 // --- cRecordings -----------------------------------------------------------
diff --git a/recording.h b/recording.h
index 5b093a043..5a5e8de48 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.1 2000/03/05 15:57:27 kls Exp $
+ * $Id: recording.h 1.2 2000/04/14 15:12:42 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -15,21 +15,16 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-extern cDvbRecorder *Recorder;
-
 void AssertFreeDiskSpace(void);
 
 class cRecording : public cListObject {
-private:
-  bool AssertRecorder(void);
 public:
   char *name;
   char *fileName;
   time_t start;
-  char quality;
   int priority;
   int lifetime;
-  cRecording(const char *Name, time_t Start, char Quality, int Priority, int LifeTime);
+  cRecording(const char *Name, time_t Start, int Priority, int LifeTime);
   cRecording(cTimer *Timer);
   cRecording(const char *FileName);
   ~cRecording();
diff --git a/remote.c b/remote.c
index c2fb36f61..bf5b41f84 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: remote.c 1.2 2000/04/15 16:00:51 kls Exp $
  */
 
 #include "remote.h"
@@ -221,7 +221,7 @@ bool cRcIo::String(char *s)
              }
           }
       }
-  return Number(n, mode == modeH);
+  return Number(n, true);
 }
 
 bool cRcIo::DetectCode(unsigned char *Code, unsigned short *Address)
@@ -244,8 +244,11 @@ bool cRcIo::DetectCode(unsigned char *Code, unsigned short *Address)
      String(buf);
      SetCode(*Code, 0);
      unsigned int Command;
-     if (GetCommand(&Command, Address))
+     if (GetCommand(&Command, Address)) {
+        SetMode(modeB);
+        String("----");
         return true;
+        }
      if (*Code < 'D') {
         (*Code)++;
         return false;
diff --git a/timers.conf b/timers.conf
index de4df9dac..1996be4be 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,6 +1,9 @@
-1:2:-----S-:2205:2320:H:99:99:Wochenshow
-0:15:M------:2125:2205:H:99:99:Neues
-1:15:MTWTF--:1828:1901:M:10:5:nano
-1:3:M------:2110:2230:H:99:99:SevenDays
-1:3:---T---:2215:2300:H:99:99:Switch
-1:14:------S:2210:2255:H:99:99:Olli
+1:15:MTWTF--:1828:1901:10:5:nano
+1:3:M------:2110:2230:99:10:SevenDays
+1:10:-T-----:2058:2150:99:10:Quarks
+1:3:---T---:2158:2300:99:10:Switch
+1:2:----F--:2110:2155:99:10:Anke
+1:1:----F--:2210:2325:99:10:7Tage7Koepfe
+1:15:-----S-:1358:1435:99:7:Neues
+1:1:-----S-:1445:1600:99:10:Hammerman
+1:2:-----S-:2205:2320:99:10:Wochenshow
diff --git a/tools.c b/tools.c
index 5a21a9307..e356e0fdb 100644
--- a/tools.c
+++ b/tools.c
@@ -4,18 +4,46 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.2 2000/03/05 14:33:58 kls Exp $
+ * $Id: tools.c 1.3 2000/04/15 15:10:05 kls Exp $
  */
 
+#define _GNU_SOURCE
 #include "tools.h"
+#include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 #define MaxBuffer 1000
 
+int SysLogLevel = 3;
+
+void writechar(int filedes, char c)
+{
+  write(filedes, &c, sizeof(c));
+}
+
+void writeint(int filedes, int n)
+{
+  write(filedes, &n, sizeof(n));
+}
+
+char readchar(int filedes)
+{
+  char c;
+  read(filedes, &c, 1);
+  return c;
+}
+
+bool readint(int filedes, int &n)
+{
+  //XXX timeout!!
+  return read(filedes, &n, sizeof(n));
+}
+
 char *readline(FILE *f)
 {
   static char buffer[MaxBuffer];
@@ -30,36 +58,83 @@ char *readline(FILE *f)
 
 int time_ms(void)
 {
+  static time_t t0 = 0;
   struct timeval t;
-  if (gettimeofday(&t, NULL) == 0)
-     return t.tv_sec * 1000 + t.tv_usec / 1000;
+  if (gettimeofday(&t, NULL) == 0) {
+     if (t0 == 0)
+        t0 = t.tv_sec; // this avoids an overflow (we only work with deltas)
+     return (t.tv_sec - t0) * 1000 + t.tv_usec / 1000;
+     }
   return 0;
 }
 
-bool MakeDirs(const char *FileName)
+void delay_ms(int ms)
+{
+  int t0 = time_ms();
+  while (time_ms() - t0 < ms)
+        ;
+}
+
+bool MakeDirs(const char *FileName, bool IsDirectory)
 {
   bool result = true;
   char *s = strdup(FileName);
   char *p = s;
   if (*p == '/')
      p++;
-  while ((p = strchr(p, '/')) != NULL) {
-        *p = 0;
+  while ((p = strchr(p, '/')) != NULL || IsDirectory) {
+        if (p)
+           *p = 0;
         struct stat fs;
         if (stat(s, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
            isyslog(LOG_INFO, "creating directory %s", s);
            if (mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {
-              esyslog(LOG_ERR, "ERROR while creating directory %s: %s", s, strerror(errno));
+              esyslog(LOG_ERR, "ERROR: %s: %s", s, strerror(errno));
               result = false;
               break;
               }
            }
-        *p++ = '/';
+        if (p)
+           *p++ = '/';
+        else
+           break;
         }
   delete s;
   return result;
 }
 
+bool RemoveFileOrDir(const char *FileName)
+{
+  struct stat st;
+  if (stat(FileName, &st) == 0) {
+     if (S_ISDIR(st.st_mode)) {
+        DIR *d = opendir(FileName);
+        if (d) {
+           struct dirent *e;
+           while ((e = readdir(d)) != NULL) {
+                 if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+                    char *buffer;
+                    asprintf(&buffer, "%s/%s", FileName, e->d_name);
+                    if (remove(buffer) < 0)
+                       esyslog(LOG_ERR, "ERROR: %s: %s", buffer, strerror(errno));
+                    delete buffer;
+                    }
+                 }
+           closedir(d);
+           }
+        else {
+           esyslog(LOG_ERR, "ERROR: %s: %s", FileName, strerror(errno));
+           return false;
+           }
+        }
+     if (remove(FileName) == 0)
+        return true;
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: %s: %s", FileName, strerror(errno));
+  return false;
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
diff --git a/tools.h b/tools.h
index 9f87bbde1..48665a84f 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'osm.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.2 2000/03/05 16:14:05 kls Exp $
+ * $Id: tools.h 1.3 2000/04/15 15:09:47 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -13,18 +13,28 @@
 #include <stdio.h>
 #include <syslog.h>
 
-//TODO
-#define dsyslog syslog
-#define esyslog syslog
-#define isyslog syslog
+extern int SysLogLevel;
+
+#define esyslog if (SysLogLevel > 0) syslog
+#define isyslog if (SysLogLevel > 1) syslog
+#define dsyslog if (SysLogLevel > 2) syslog
+
+#define LOG_ERROR         esyslog(LOG_ERR, "ERROR (%s,%d): %s", __FILE__, __LINE__, strerror(errno))
+#define LOG_ERROR_STR(s)  esyslog(LOG_ERR, "ERROR: %s: %s", s, strerror(errno));
 
 #define SECSINDAY  86400
 
 #define DELETENULL(p) (delete (p), p = NULL)
 
+void writechar(int filedes, char c);
+void writeint(int filedes, int n);
+char readchar(int filedes);
+bool readint(int filedes, int &n);
 char *readline(FILE *f);
 int time_ms(void);
-bool MakeDirs(const char *FileName);
+void delay_ms(int ms);
+bool MakeDirs(const char *FileName, bool IsDirectory = false);
+bool RemoveFileOrDir(const char *FileName);
 
 class cListObject {
 private:
@@ -47,7 +57,7 @@ class cListBase {
   virtual ~cListBase();
   void Add(cListObject *Object);
   void Del(cListObject *Object);
-  void Move(int From, int To);
+  virtual void Move(int From, int To);
   void Move(cListObject *From, cListObject *To);
   void Clear(void);
   cListObject *Get(int Index);

From 85b8e41e8bb16e4e66561768026456ec5f0ee276 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 24 Apr 2000 18:00:00 +0200
Subject: [PATCH 004/307] Version 0.04 - Changed name from 'osm' to 'vdr' to
 avoid mixups with the 'oms' program that   appears to be in use with DVD
 replay. - Implemented a channel display in the top menu line. - Implemented
 replay progress display (press "Ok" when replaying to bring it up). -
 Implemented direct channel selecting by pressing the numeric keys. - Added
 several 'const' keywords to please stricter compilers. - The repeat function
 for the remote control no longer adapts dynamically   to the timing of the
 RCU (this sometimes caused the repeat function to   kick in too early). -
 Channel selection is now blocked when recording or replaying. - Improved
 process handling.

---
 BUGS        |   7 --
 HISTORY     |  18 ++++-
 INSTALL     |  96 ++++++++++++++++++++++++++
 MANUAL      |  53 +++++++++++++--
 Makefile    |  16 ++---
 README      | 112 ++-----------------------------
 TODO        |   3 -
 config.c    |   5 +-
 config.h    |   4 +-
 dvbapi.c    | 171 +++++++++++++++++++++++++++++++++++------------
 dvbapi.h    |  21 ++++--
 interface.c |  60 +++++++++++------
 interface.h |  15 +++--
 menu.c      |  52 +++++++++++----
 menu.h      |  13 +++-
 osd.c       |   6 +-
 osd.h       |  10 +--
 osm.c       | 150 -----------------------------------------
 recording.c |  40 ++++++-----
 recording.h |  21 +++---
 remote.c    |  47 +++++++------
 remote.h    |   7 +-
 timers.conf |   4 +-
 tools.c     |  60 +++++++++++++++--
 tools.h     |  12 +++-
 vdr.c       | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 26 files changed, 748 insertions(+), 444 deletions(-)
 create mode 100644 INSTALL
 delete mode 100644 osm.c
 create mode 100644 vdr.c

diff --git a/BUGS b/BUGS
index bcb37728a..66755f9f7 100644
--- a/BUGS
+++ b/BUGS
@@ -14,10 +14,3 @@ Video Disk Recorder - Known Bugs
   Haven't figured out yet how to ensure that it switches back to
   the current channel.
 
-* Every now and then the on-screen display shows nothing but
-  "noise". If that occurs, I have to stop the 'osm' program
-  and do a 'make reload' for the card driver. After that it
-  works fine again.
-  Presumably this is a problem in the card driver or firmware?
-  Or could it be a problem with the hardware?
-  Does anybody else observe this?
diff --git a/HISTORY b/HISTORY
index c013340dd..95cd350b2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,5 @@
-Video Disk Recorder OSM Revision History
-----------------------------------------
+Video Disk Recorder Revision History
+------------------------------------
 
 2000-02-19: Version 0.01 (Initial revision).
 
@@ -18,3 +18,17 @@ Video Disk Recorder OSM Revision History
   able to store some 18 hours in full quality, so we don't really need that).
 - Termination signals are now caught and the program cleans up before exiting.
 - Support for CICAM.
+
+2000-04-24: Version 0.04
+
+- Changed name from 'osm' to 'vdr' to avoid mixups with the 'oms' program that
+  appears to be in use with DVD replay.
+- Implemented a channel display in the top menu line.
+- Implemented replay progress display (press "Ok" when replaying to bring it up).
+- Implemented direct channel selecting by pressing the numeric keys.
+- Added several 'const' keywords to please stricter compilers.
+- The repeat function for the remote control no longer adapts dynamically
+  to the timing of the RCU (this sometimes caused the repeat function to
+  kick in too early).
+- Channel selection is now blocked when recording or replaying.
+- Improved process handling.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 000000000..d7acfb6d9
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,96 @@
+Installation of the Video Disk Recorder
+---------------------------------------
+
+Compiling and running the program:
+----------------------------------
+
+Make sure the files from this package are located in a
+directory that is "parallel" to the DVB directory of the
+driver source for the Siemens DVB-S PCI card (refer to
+http://linuxtv.org/dvb/siemens_dvb.html for more information
+about that driver). For example, if the DVB driver was 
+extracted into the directory /home/kls/vdr/DVB, then this
+package should be extracted into /home/kls/vdr/VDR.
+
+This program requires the card driver version 0.04 or higher
+to work properly.
+
+After extracting the package, change into the VDR directory
+and type 'make'. This should produce an executable file
+named 'vdr', which can be run after the DVB driver has been
+installed.
+
+There are two macros you can use to customize the 'vdr' program
+at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call 
+will use the PC's keyboard as input device instead of the "Remote
+Control Unit" (see http://www.cadsoft.de/people/kls/vdr/remote.htm).
+Adding "DEBUG_OSD=1" will use the PC screen (or current window)
+to display texts instead of the DVB card's on-screen display
+interface. These modes are useful when testing new menus if you
+only have a remote connection to the VDR (which, in my case, is
+located in the living room and has neither a monitor nor a keyboard).
+
+The video data directory:
+-------------------------
+
+All recordings are written into directories below "/video". Please
+make sure this directory exists, and that the user who runs the 'vdr'
+program has read and write access to that directory.
+If you prefer a different location for your video files, you can change
+the value of 'BaseDir' in recording.c.
+
+Note that the file system need not be 64-bit proof, since the 'vdr'
+program splits video files into chunks of about 1GB. You should use
+a disk with several gigabytes of free space. One GB can store roughly
+half an hour of video data.
+
+Configuration files:
+--------------------
+
+There are three configuration files that hold information about
+channels, remote control keys and timers. These files are currrently
+assumed to be located in the directory from which the 'vdr' program
+was started (this will become configurable later). The configuration
+files can be edited with any text editor, or will be written by the
+'vdr' program if any changes are made inside the on-screen menus.
+The meaning of the data entries may still vary in future releases,
+so for the moment please look at the source code (config.c) to see
+the meaning of the various fields.
+
+Learning the remote control keys:
+---------------------------------
+
+There is no default 'keys.conf' file, so if you compile the program
+without 'DEBUG_REMOTE=1' you will have to go through a "teach-in"
+session that allows the program to learn your remote control codes.
+It will first attempt to determine the basic data transfer mode and
+timing of your remote control unit, and then will ask you to press one
+key after the other so that it can learn the various key codes. You will
+at least need to provide an "Up" and a "Down" key, so that you can switch
+channels. The rest of the key definitions is optional, but the more keys
+you define, the more you will be able to navigate through the menus and
+control recording/replaying.
+If the program has been built with "DEBUG_REMOTE=1", it will use the
+key configuration file 'keys-pc.conf', so that you won't loose data
+when switching between normal and debug mode.
+
+The default PC key assignments are:
+
+  Up, Down, Left, Right     Crsr keys in numeric block
+  Menu                      '5' in numeric block
+  Ok                        Enter
+  Back                      Backspace
+  0..9                      '0'..'9' in top row
+  Red, Green, Yellow, Blue  'F1'..'F4'
+  Record                    'r'
+  Pause                     'p'
+  Stop                      's'
+  Begin                     'B'
+  SearchForward             'f'
+  SearchBack                'b'
+  SkipForward               'PgDn' in numeric block
+  SkipBack                  'PgUp' in numeric block
+
+If you prefer different key assignments, simply delete the file
+'keys-pc.conf' and restart 'vdr' to get into learning mode.
+
diff --git a/MANUAL b/MANUAL
index 9e5036c10..36a62987a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,16 +1,55 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
+* Navigating through the On Screen Menus
+
+  The "Main" menu can be called up with the "Menu" key of your remote
+  control unit. The "Up" and "Down" keys are used to select a specific
+  item. The "Left" and "Right" keys can be used to change options, and
+  the numeric keys allow direct input of numeric data. The "Ok" key
+  confirms any changes (or switches to a channel in the "Channels" menu).
+  The "Back" key goes back one level in the menu structure, discarding
+  any changes that might have been made in the current menu.
+  
+  In the "Timers" menu, the current timer can be enabled or disabled with
+  the "Right" or "Left" key, respectively (enabled timers are marked with ">").
+  "Ok" here opens the "Edit timer" menu.
+  
+  Textual options, like channel names or recording file names, can be edited
+  by pressing the "Right" button (which puts brackets around the current
+  character as in "[R]TL"), selecting the desired character position with
+  "Left" and "Right", and changing the character with the "Up" and "Down"
+  keys. "Ok" then confirms the changes.
+  
+  The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
+  in the various menus and are listed at the bottom of the on-screen-display.
+  
+  At any point in the menu system, pressing the "Menu" key again will
+  immediately leave the menu system.
+
 * Selecting a Channel
 
-  You can select a channel either by pressing the "Up" or "Down" key (while
-  no On Screen Menu is displayed), or browsing through the channel list in
-  the menu and pressing "Ok" on the desired channel.
+  There are three ways to select a channel:
+
+  1. With no On Screen Menu displayed press the "Up" or "Down" key to switch
+     to the next higher or lower channel.
+  2. Press the "Menu" button to bring up the On Screen Menu, select "Channels"
+     and browse through the list with the "Up" and "Down" key; to switch to the
+     selected channel press "Ok".
+  2. Directly type in the channel number with the numeric keys ('0'..'9');
+     if no key is pressed for about half a second, the digits collected so
+     far will define the channel number.
+
+  After switching to a different channel the channel number and name, as well
+  as the current time are displayed at the top of the screen. This line
+  automatically goes away after about two seconds, or if any key is pressed.
+  To bring up the channel display without switching channels you can press
+  the "Ok" button.
 
 * Instant Recording
 
   You can start recording the current channel by pressing the "Record"
-  button. This will create a timer event named "instant" that start
+  button. This will create a timer event named "instant" that starts
   at the current time and records for two hours.
   If you want to modify the recording time you need to edit the timer.
   Stop instant recording by disabling or deleting the timer.
@@ -23,6 +62,8 @@ Video Disk Recorder User's Manual
 
 * Replay Control
 
+  The following keys have the listed meaning in Replay mode:
+
   - "Begin"   Positions to beginning of the recording and starts playback
               from there.
   - "Pause"   Halts playback at the current frame. Press again to continue
@@ -32,6 +73,10 @@ Video Disk Recorder User's Manual
   - "Search"  Runs playback forward or backward at a higher speed. Press
               again to resume normal speed.
   - "Skip"    Skips about 60 seconds forward or backward.
+  - "Ok"      Brings up the replay progress display, which shows the date,
+              time and title of the recording, a progress bar and the
+              current and total time of the recording.
+              Press "Ok" again to turn off the progress display.
 
 * Programming the Timer
 
diff --git a/Makefile b/Makefile
index b5153cfc8..0ed17ca76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 #
 # Makefile for the On Screen Menu of the Video Disk Recorder
 #
-# See the main source file 'osm.c' for copyright information and
+# See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.2 2000/03/05 13:51:57 kls Exp $
+# $Id: Makefile 1.3 2000/04/24 09:44:10 kls Exp $
 
-OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o osm.o
+OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o vdr.o
 
 ifdef DEBUG_REMOTE
 DEFINES += -DDEBUG_REMOTE
@@ -19,20 +19,20 @@ endif
 %.o: %.c
 	g++ -g -O2 -Wall -c $(DEFINES) $<
 
-all: osm
+all: vdr
 
 config.o   : config.c config.h dvbapi.h interface.h tools.h
 dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h
 interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
 menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
 osd.o      : osd.c config.h dvbapi.h interface.h osd.h tools.h
-osm.o      : osm.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
+vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
 recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h
 remote.o   : remote.c remote.h tools.h
 tools.o    : tools.c tools.h
 
-osm: $(OBJS)
-	g++ -g -O2 $(OBJS) -lncurses -o osm
+vdr: $(OBJS)
+	g++ -g -O2 $(OBJS) -lncurses -o vdr
 
 clean:
-	-rm $(OBJS) osm
+	-rm $(OBJS) vdr
diff --git a/README b/README
index e2b27a4ff..cfc10a765 100644
--- a/README
+++ b/README
@@ -7,6 +7,12 @@ of the LinuxTV project (http://linuxtv.org).
 For details about the "Video Disk Recorder" project please
 refer to http://www.cadsoft.de/people/kls/vdr.
 
+There is also a remote control unit described on those
+Web pages, which can be used within this program.
+
+Please see the INSTALL file for details on how to install
+this program on your computer.
+
 The author can be contacted at kls@cadsoft.de.
 
 Yet another "set-top-box"?
@@ -25,112 +31,6 @@ of commercial set-top-boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
 
-Compiling and running the program:
-----------------------------------
-
-Make sure the files from this package are located in a
-directory that is "parallel" to the DVB directory of the
-driver source for the Siemens DVB-S PCI card (refer to
-http://linuxtv.org/dvb/siemens_dvb.html for more information
-about that driver). For example, if the DVB driver was
-extracted into the directory /home/kls/vdr/DVB, then this
-package should be extracted into /home/kls/vdr/OSM.
-
-This program requires the card driver version 0.04 or higher
-to work properly.
-
-After extracting the package, change into the OSM directory
-and type 'make'. This should produce an executable file
-named 'osm', which can be run after the DVB driver has been
-installed.
-
-There are two macros you can use to customize the 'osm' program
-at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call
-will use the PC's keyboard as input device instead of the "Remote
-Control Unit" (see http://www.cadsoft.de/people/kls/vdr/remote.htm).
-Adding "DEBUG_OSD=1" will use the PC screen (or current window)
-to display texts instead of the DVB card's on-screen display
-interface. These modes are useful when testing new menus if you
-only have a remote connection to the VDR (which, in my case, is
-located in the living room and has neither a monitor nor a keyboard).
-
-Configuration files:
---------------------
-
-There are three configuration files that hold information about
-channels, remote control keys and timers. These files are currrently
-assumed to be located in the directory from which the 'osm' program
-was started (this will become configurable later). The configuration
-files can be edited with any text editor, or will be written by the
-'osm' program if any changes are made inside the on-screen menus.
-The meaning of the data entries may still vary in future releases,
-so for the moment please look at the source code (config.c) to see
-the meaning of the various fields.
-
-Learning the remote control keys:
----------------------------------
-
-There is no default 'keys.conf' file, so if you compile the program
-without 'DEBUG_REMOTE=1' you will have to go through a "teach-in"
-session that allows the program to learn your remote control codes.
-It will first attempt to determine the basic data transfer mode and
-timing of your remote control unit, and then will ask you to press one
-key after the other so that it can learn the various key codes. You will
-at least need to provide an "Up" and a "Down" key, so that you can switch
-channels. The rest of the key definitions is optional, but the more keys
-you define, the more you will be able to navigate through the menus and
-control recording/replaying.
-If the program has been built with "DEBUG_REMOTE=1", it will use the
-key configuration file 'keys-pc.conf', so that you won't loose data
-when switching between normal and debug mode.
-
-The default PC key assignments are:
-             
-  Up, Down, Left, Right     Crsr keys in numeric block
-  Menu                      '5' in numeric block
-  Ok                        Enter
-  Back                      Backspace
-  0..9                      '0'..'9' in top row
-  Red, Green, Yellow, Blue  'F1'..'F4'
-  Record                    'r'
-  Pause                     'p'
-  Stop                      's'
-  Begin                     'B'
-  SearchForward             'f'
-  SearchBack                'b'
-  SkipForward               'PgDn' in numeric block
-  SkipBack                  'PgUp' in numeric block
-
-If you prefer different key assignments, simply delete the file
-'keys-pc.conf' and restart 'osm' to get into learning mode.
-
-Navigating through the On Screen Menus:
----------------------------------------
-
-The "Main" menu can be called up with the "Menu" key of your remote
-control unit. The "Up" and "Down" keys are used to select a specific
-item. The "Left" and "Right" keys can be used to change options, and
-the numeric keys allow direct input of numeric data. The "Ok" key
-confirms any changes (or switches to a channel in the "Channels" menu).
-The "Back" key goes back one level in the menu structure, discarding
-any changes that might have been made in the current menu.
-
-In the "Timers" menu, the current timer can be enabled or disabled with
-the "Right" or "Left" key, respectively (enabled timers are marked with ">").
-"Ok" here opens the "Edit timer" menu.
-
-Textual options, like channel names or recording file names, can be edited
-by pressing the "Right" button (which puts brackets around the current
-character as in "[R]TL"), selecting the desired character position with
-"Left" and "Right", and changing the character with the "Up" and "Down"
-keys. "Ok" then confirms the changes.
-
-The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
-in the various menus and are listed at the bottom of the on-screen-display.
-
-At any point in the menu system, pressing the "Menu" key again will
-immediately leave the menu system.
-
 What do you think?
 ------------------
 
diff --git a/TODO b/TODO
index 8154c01d8..8f5d2f3d9 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 TODO list for the Video Disk Recorder project
 ---------------------------------------------
 
-* Channel select via numeric keys.
 * Make it work with two DVB-S PCI cards to allow simultaneous
   recording of one programme, while replaying another programme
   (or maybe the same one, but time delayed).
@@ -10,7 +9,5 @@ TODO list for the Video Disk Recorder project
 * Implement "on-disk editing" to allow "cutting out" of certain
   scenes in order to archive them (or, reversely, cut out
   commercial breaks).
-* Implement on-screen display of replay progress (progress bar
-  and/or time index).
 * Implement channel scanning.
 * Better support for encrypted channels.
diff --git a/config.c b/config.c
index c29fea8b7..0a39cc503 100644
--- a/config.c
+++ b/config.c
@@ -1,10 +1,10 @@
 /*
  * config.c: Configuration file handling
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.3 2000/04/15 12:48:00 kls Exp $
+ * $Id: config.c 1.5 2000/04/24 09:44:15 kls Exp $
  */
 
 #include "config.h"
@@ -206,7 +206,6 @@ bool cChannel::Switch(void)
   if (!DvbApi.Recording()) {
      isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
      CurrentChannel = Index();
-     Interface.DisplayChannel(CurrentChannel + 1, name);
      for (int i = 3; --i;) {
          if (DvbApi.SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
diff --git a/config.h b/config.h
index 6184f5628..42af0f858 100644
--- a/config.h
+++ b/config.h
@@ -1,10 +1,10 @@
 /*
  * config.h: Configuration file handling
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.3 2000/04/15 12:44:23 kls Exp $
+ * $Id: config.h 1.4 2000/04/24 09:44:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
diff --git a/dvbapi.c b/dvbapi.c
index ef2f80862..719437d4c 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -1,21 +1,19 @@
 /*
  * dvbapi.c: Interface to the DVB driver
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.3 2000/04/15 14:45:04 kls Exp $
+ * $Id: dvbapi.c 1.8 2000/04/24 15:30:35 kls Exp $
  */
 
 #include "dvbapi.h"
 #include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include "interface.h"
 #include "tools.h"
@@ -59,7 +57,6 @@
 #define RESUMEFILESUFFIX    "/resume.vdr"
 #define RECORDFILESUFFIX    "/%03d.vdr"
 #define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
-#define MAXPROCESSTIMEOUT   3 // seconds
 
 // The number of frames to back up when resuming an interrupted replay session:
 #define RESUMEBACKUP (10 * FRAMESPERSEC)
@@ -85,7 +82,7 @@ class cIndexFile {
   int Last(void) { return last; }
   int GetResume(void) { return resume; }
   bool StoreResume(int Index);
-  static char *Str(int Index);
+  static char *Str(int Index, bool WithFrame = false);
   };
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
@@ -256,7 +253,7 @@ bool cIndexFile::StoreResume(int Index)
   return false;
 }
 
-char *cIndexFile::Str(int Index)
+char *cIndexFile::Str(int Index, bool WithFrame)
 {
   static char buffer[16];
   int f = (Index % FRAMESPERSEC) + 1;
@@ -264,7 +261,7 @@ char *cIndexFile::Str(int Index)
   int m = s / 60 % 60; 
   int h = s / 3600; 
   s %= 60;
-  snprintf(buffer, sizeof(buffer), "%d:%02d:%02d.%02d", h, m, s, f);
+  snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
   return buffer;
 }
 
@@ -554,7 +551,7 @@ class cRecordBuffer : public cFileBuffer {
 public:
   cRecordBuffer(int *InFile, const char *FileName);
   virtual ~cRecordBuffer();
-  int WriteWithTimeout(void);
+  int WriteWithTimeout(bool EndIfEmpty = false);
   };
 
 cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
@@ -720,13 +717,13 @@ int cRecordBuffer::Write(int Max)
   return 0;
 }
 
-int cRecordBuffer::WriteWithTimeout(void)
+int cRecordBuffer::WriteWithTimeout(bool EndIfEmpty)
 {
   int w, written = 0;
   int t0 = time_ms();
   while ((w = Write()) > 0 && time_ms() - t0 < MAXRECORDWRITETIME)
         written += w;
-  return w < 0 ? w : written;
+  return w < 0 ? w : (written == 0 && EndIfEmpty ? -1 : written);
 }
 
 // --- cReplayBuffer ---------------------------------------------------------
@@ -752,6 +749,7 @@ class cReplayBuffer : public cFileBuffer {
   int Resume(void);
   bool Save(void);
   void SkipSeconds(int Seconds);
+  void GetIndex(int &Current, int &Total);
   };
 
 cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
@@ -840,7 +838,7 @@ void cReplayBuffer::SkipSeconds(int Seconds)
            }
         Index += Seconds * FRAMESPERSEC;
         if (Index < 0)
-           Index = 1;
+           Index = 1; // not '0', to allow GetNextIFrame() below to work!
         uchar FileNumber;
         int FileOffset;
         if (index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) >= 0)
@@ -849,6 +847,16 @@ void cReplayBuffer::SkipSeconds(int Seconds)
      }
 }
 
+void cReplayBuffer::GetIndex(int &Current, int &Total)
+{
+  if (index) {
+     Current = index->Get(fileNumber, fileOffset);
+     Total = index->Last();
+     }
+  else
+     Current = Total = -1;
+}
+
 void cReplayBuffer::SkipAudioBlocks(void)
 {
   int Length;
@@ -1001,8 +1009,10 @@ cDvbApi::cDvbApi(void)
   memset(&colorPairs, 0, sizeof(colorPairs));
   start_color();
   leaveok(stdscr, TRUE);
-  window = stdscr;
+  window = NULL;
 #endif
+  lastProgress = -1;
+  replayTitle = NULL;
 }
 
 cDvbApi::~cDvbApi()
@@ -1018,6 +1028,7 @@ cDvbApi::~cDvbApi()
      endwin();
 #endif
      }
+  delete replayTitle;
 }
 
 #ifdef DEBUG_OSD
@@ -1056,17 +1067,21 @@ void cDvbApi::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
 
 void cDvbApi::Open(int w, int h)
 {
+  int d = (h < 0) ? MenuLines + h : 0;
+  h = abs(h);
   cols = w;
   rows = h;
 #ifdef DEBUG_OSD
-  //XXX size...
+  window = subwin(stdscr, h, w, d, 0);
+  syncok(window, TRUE);
   #define B2C(b) (((b) * 1000) / 255)
   #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
 #else
   w *= charWidth;
   h *= lineHeight;
-  int x = (720 - w) / 2; //TODO PAL vs. NTSC???
-  int y = (576 - h) / 2;
+  d *= lineHeight;
+  int x = (720 - MenuColumns * charWidth) / 2; //TODO PAL vs. NTSC???
+  int y = (576 - MenuLines * lineHeight) / 2 + d;
   Cmd(OSD_Open, 4, x, y, x + w - 1, y + h - 1);
   #define SETCOLOR(n, r, g, b, o) Cmd(OSD_SetColor, n, r, g, b, o)
 #endif
@@ -1079,6 +1094,8 @@ void cDvbApi::Open(int w, int h)
   SETCOLOR(clrCyan,       0x00, 0xFC, 0xFC, 255);
   SETCOLOR(clrMagenta,    0xB0, 0x00, 0xFC, 255);
   SETCOLOR(clrWhite,      0xFC, 0xFC, 0xFC, 255);
+
+  lastProgress = -1;
 }
 
 void cDvbApi::Close(void)
@@ -1086,6 +1103,7 @@ void cDvbApi::Close(void)
 #ifndef DEBUG_OSD
   Cmd(OSD_Close);
 #endif
+  lastProgress = -1;
 }
 
 void cDvbApi::Clear(void)
@@ -1108,6 +1126,7 @@ void cDvbApi::Fill(int x, int y, int w, int h, eDvbColor color)
       wmove(window, y + r, x); // ncurses wants 'y' before 'x'!
       whline(window, ' ', w);
       }
+  wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
 #else
   Cmd(OSD_FillBlock, color, x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1);
 #endif
@@ -1131,6 +1150,52 @@ void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor col
 #endif
 }
 
+bool cDvbApi::ShowProgress(bool Initial)
+{
+  int Current, Total;
+
+  if (GetIndex(&Current, &Total)) {
+     if (Initial) {
+        if (replayTitle)
+           Text(0, 0, replayTitle);
+        Text(-7, 2, cIndexFile::Str(Total));
+        }
+#ifdef DEBUG_OSD
+     int p = cols * Current / Total;
+     Fill(0, 1, p, 1, clrGreen);
+     Fill(p, 1, cols - p, 1, clrWhite);
+#else
+     int w = cols * charWidth;
+     int p = w * Current / Total;
+     if (p != lastProgress) {
+        int y1 = 1 * lineHeight;
+        int y2 = 2 * lineHeight - 1;
+        int x1, x2;
+        eDvbColor color;
+        if (lastProgress < p) {
+           x1 = lastProgress + 1;
+           x2 = p;
+           if (p >= w)
+              p = w - 1;
+           color = clrGreen;
+           }
+        else {
+           x1 = p + 1;
+           x2 = lastProgress;
+           color = clrWhite;
+           }
+        if (lastProgress < 0)
+           Cmd(OSD_FillBlock, clrWhite, 0, y1, w - 1, y2);
+        Cmd(OSD_FillBlock, color, x1, y1, x2, y2);
+        lastProgress = p;
+        }
+#endif
+     Text(0, 2, cIndexFile::Str(Current));
+     return true;
+     }
+  return false;
+}
+
 bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr)
 {
   if (videoDev >= 0) {
@@ -1160,35 +1225,17 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
   return false;
 }
 
-void cDvbApi::KillProcess(pid_t pid)
-{
-  pid_t Pid2Wait4 = pid;
-  for (time_t t0 = time(NULL); time(NULL) - t0 < MAXPROCESSTIMEOUT; ) {
-      int status;
-      pid_t pid = waitpid(Pid2Wait4, &status, WNOHANG);
-      if (pid < 0) {
-         if (errno != ECHILD)
-            LOG_ERROR;
-         return;
-         }
-      if (pid == Pid2Wait4)
-         return;
-      }
-  esyslog(LOG_ERR, "ERROR: process %d won't end (waited %d seconds) - terminating it...", Pid2Wait4, MAXPROCESSTIMEOUT);
-  if (kill(Pid2Wait4, SIGTERM) < 0) {
-     esyslog(LOG_ERR, "ERROR: process %d won't terminate (%s) - killing it...", Pid2Wait4, strerror(errno));
-     if (kill(Pid2Wait4, SIGKILL) < 0)
-        esyslog(LOG_ERR, "ERROR: process %d won't die (%s) - giving up", Pid2Wait4, strerror(errno));
-     }
-}
-
 bool cDvbApi::Recording(void)
 {
+  if (pidRecord && !CheckProcess(pidRecord))
+     pidRecord = 0;
   return pidRecord;
 }
 
 bool cDvbApi::Replaying(void)
 {
+  if (pidReplay && !CheckProcess(pidReplay))
+     pidReplay = 0;
   return pidReplay;
 }
 
@@ -1239,6 +1286,7 @@ bool cDvbApi::StartRecord(const char *FileName)
 
         dsyslog(LOG_INFO, "start recording process (pid=%d)", getpid());
         isMainProcess = false;
+        bool DataStreamBroken = false;
         int fromMain = toRecordPipe[0];
         int toMain = fromRecordPipe[1];
         cRecordBuffer *Buffer = new cRecordBuffer(&videoDev, FileName);
@@ -1251,21 +1299,26 @@ bool cDvbApi::StartRecord(const char *FileName)
                struct timeval timeout;
                timeout.tv_sec = 1;
                timeout.tv_usec = 0;
+               bool ForceEnd = false;
                if (select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0) {
                   if (FD_ISSET(videoDev, &set)) {
                      if (Buffer->Read() < 0)
                         break;
+                     DataStreamBroken = false;
                      }
                   if (FD_ISSET(fromMain, &set)) {
                      switch (readchar(fromMain)) {
-                       case dvbStop:     Buffer->Stop(); break;
-                                         break;
+                       case dvbStop: Buffer->Stop();
+                                     ForceEnd = DataStreamBroken;
+                                     break;
                        }
                      }
                   }
-               else
+               else {
+                  DataStreamBroken = true;
                   esyslog(LOG_ERR, "ERROR: video data stream broken");
-               if (Buffer->WriteWithTimeout() < 0)
+                  }
+               if (Buffer->WriteWithTimeout(ForceEnd) < 0)
                   break;
                }
            delete Buffer;
@@ -1309,7 +1362,7 @@ void cDvbApi::SetReplayMode(int Mode)
      }
 }
 
-bool cDvbApi::StartReplay(const char *FileName)
+bool cDvbApi::StartReplay(const char *FileName, const char *Title)
 {
   if (Recording()) {
      esyslog(LOG_ERR, "ERROR: StartReplay() called while recording - ignored!");
@@ -1318,6 +1371,13 @@ bool cDvbApi::StartReplay(const char *FileName)
   StopReplay();
   if (videoDev >= 0) {
 
+     lastProgress = -1;
+     delete replayTitle;
+     if (Title) {
+        if ((replayTitle = strdup(Title)) == NULL)
+           esyslog(LOG_ERR, "ERROR: StartReplay: can't copy title '%s'", Title);
+        }
+
      // Check FileName:
 
      if (!FileName) {
@@ -1361,7 +1421,7 @@ bool cDvbApi::StartReplay(const char *FileName)
            bool FastRewind = false;
            int ResumeIndex = Buffer->Resume();
            if (ResumeIndex >= 0)
-              isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, cIndexFile::Str(ResumeIndex));
+              isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, cIndexFile::Str(ResumeIndex, true));
            for (;;) {
                if (Buffer->Read() < 0)
                   break;
@@ -1405,6 +1465,12 @@ bool cDvbApi::StartReplay(const char *FileName)
                                                  Buffer->SkipSeconds(Seconds);
                                                  }
                                             }
+                       case dvbGetIndex:    {
+                                              int Current, Total;
+                                              Buffer->GetIndex(Current, Total);
+                                              writeint(toMain, Current);
+                                              writeint(toMain, Total);
+                                            }
                                             break;
                        }
                      }
@@ -1470,3 +1536,20 @@ void cDvbApi::Skip(int Seconds)
      }
 }
 
+bool cDvbApi::GetIndex(int *Current, int *Total)
+{
+  if (pidReplay) {
+     int total;
+     purge(fromReplay);
+     writechar(toReplay, dvbGetIndex);
+     if (readint(fromReplay, *Current) && readint(fromReplay, total)) {
+        if (Total)
+           *Total = total;
+        }
+     else
+        *Current = -1;
+     return *Current >= 0;
+     }
+  return false;
+}
+
diff --git a/dvbapi.h b/dvbapi.h
index 3c447cf1f..91e554e98 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -1,10 +1,10 @@
 /*
  * dvbapi.h: Interface to the DVB driver
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.3 2000/04/15 13:36:10 kls Exp $
+ * $Id: dvbapi.h 1.8 2000/04/24 15:31:07 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -21,6 +21,9 @@ typedef unsigned char __u8;
 #include <stdio.h>
 #include "../DVB/driver/dvb.h"
 
+#define MenuLines   15
+#define MenuColumns 40
+
 enum eDvbColor { clrBackground,
 #ifndef DEBUG_OSD
                  clrOBSOLETE, //FIXME apparently color '1' can't be used as FgColor with e.g. clrRed as BgColor???
@@ -66,6 +69,14 @@ class cDvbApi {
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
 
+  // Progress Display facilities
+
+private:
+  int lastProgress;
+  char *replayTitle;
+public:
+  bool ShowProgress(bool Initial = false);
+
   // Channel facilities
 
   bool SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr);
@@ -78,13 +89,13 @@ class cDvbApi {
          dvbFastForward,
          dvbFastRewind,
          dvbSkip,
+         dvbGetIndex,
        };
   bool isMainProcess;
   pid_t pidRecord, pidReplay;
   int fromRecord, toRecord;
   int fromReplay, toReplay;
   void SetReplayMode(int Mode);
-  void KillProcess(pid_t pid);
 public:
   bool Recording(void);
        // Returns true if we are currently recording.
@@ -102,10 +113,11 @@ class cDvbApi {
        // returned.
   void StopRecord(void);
        // Stops the current recording session (if any).
-  bool StartReplay(const char *FileName);
+  bool StartReplay(const char *FileName, const char *Title = NULL);
        // Starts replaying the given file.
        // If there is already a replay session active, it will be stopped
        // and the new file will be played back.
+       // If provided Title will be used in the progress display.
   void StopReplay(void);
        // Stops the current replay session (if any).
   void PauseReplay(void);
@@ -119,6 +131,7 @@ class cDvbApi {
        // The sign of 'Seconds' determines the direction in which to skip.
        // Use a very large negative value to go all the way back to the
        // beginning of the recording.
+  bool GetIndex(int *Current, int *Total = NULL);
   };
   
 #endif //__DVBAPI_H
diff --git a/interface.c b/interface.c
index a54651357..446f9c434 100644
--- a/interface.c
+++ b/interface.c
@@ -1,19 +1,16 @@
 /*
  * interface.c: Abstract user interface layer
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.3 2000/04/15 17:38:11 kls Exp $
+ * $Id: interface.c 1.6 2000/04/24 09:44:23 kls Exp $
  */
 
 #include "interface.h"
 #include <unistd.h>
 #include "remote.h"
 
-#define MenuLines   15
-#define MenuColumns 40
-
 #ifndef DEBUG_REMOTE
 cRcIo RcIo("/dev/ttyS1");
 #endif
@@ -26,6 +23,7 @@ cInterface::cInterface(void)
 {
   open = 0;
   cols[0] = 0;
+  keyFromWait = kNone;
 }
 
 void cInterface::Init(void)
@@ -35,10 +33,10 @@ void cInterface::Init(void)
 #endif
 }
 
-void cInterface::Open(void)
+void cInterface::Open(int NumCols, int NumLines)
 {
   if (!open++)
-     DvbApi.Open(MenuColumns, MenuLines);
+     DvbApi.Open(NumCols, NumLines);
 }
 
 void cInterface::Close(void)
@@ -49,35 +47,45 @@ void cInterface::Close(void)
      DvbApi.Close();
 }
 
-unsigned int cInterface::GetCh(void)
+unsigned int cInterface::GetCh(bool Wait)
 {
 #ifdef DEBUG_REMOTE
+  timeout(Wait ? 1000 :10);
   int c = getch();
   return (c > 0) ? c : 0;
 #else
-//XXX #ifdef DEBUG_OSD
-//XXX   wrefresh(window);//XXX
-//XXX #endif
-  unsigned int Command;
-  return RcIo.GetCommand(&Command) ? Command : 0;
+#ifdef DEBUG_OSD
+  timeout(0);
+  getch(); // just to make 'ncurses' display the window:
+#endif
+  if (Wait || RcIo.InputAvailable()) {
+     unsigned int Command;
+     return RcIo.GetCommand(&Command, NULL) ? Command : 0;
+     }
+  return 0;
 #endif
 }
 
-eKeys cInterface::GetKey(void)
+eKeys cInterface::GetKey(bool Wait)
 {
-  return Keys.Get(GetCh());
+  eKeys Key = keyFromWait != kNone ? keyFromWait : Keys.Get(GetCh(Wait));
+  keyFromWait = kNone;
+  return Key;
 }
 
-eKeys cInterface::Wait(int Seconds)
+eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
   int t0 = time_ms();
+  eKeys Key = kNone;
 
   while (time_ms() - t0 < Seconds * 1000) {
-        eKeys Key = GetKey();
+        Key = GetKey();
         if (Key != kNone)
-           return Key;
+           break;
         }
-  return kNone;
+  if (KeepChar)
+     keyFromWait = Key;
+  return Key;
 }
 
 void cInterface::Clear(void)
@@ -312,8 +320,20 @@ void cInterface::LearnKeys(void)
 
 void cInterface::DisplayChannel(int Number, const char *Name)
 {
-//TODO
 #ifndef DEBUG_REMOTE
   RcIo.Number(Number);
 #endif
+  if (Name) {
+     Open(MenuColumns, 1);
+     char buffer[MenuColumns + 1];
+     snprintf(buffer, sizeof(buffer), "%d  %s", Number, Name ? Name : "");
+     Write(0, 0, buffer);
+     time_t t = time(NULL);
+     struct tm *now = localtime(&t);
+     snprintf(buffer, sizeof(buffer), "%02d:%02d", now->tm_hour, now->tm_min);
+     Write(-5, 0, buffer);
+     if (Wait(2, true) == kOk)
+        GetKey();
+     Close();
+     }
 }
diff --git a/interface.h b/interface.h
index 1e5329d5d..eb4e76bcd 100644
--- a/interface.h
+++ b/interface.h
@@ -1,10 +1,10 @@
 /*
  * interface.h: Abstract user interface layer
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.3 2000/03/19 14:03:28 kls Exp $
+ * $Id: interface.h 1.7 2000/04/24 09:44:25 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -19,16 +19,17 @@ class cInterface {
 private:
   int open;
   int cols[MaxCols];
-  unsigned int GetCh(void);
+  eKeys keyFromWait;
+  unsigned int GetCh(bool Wait = true);
   void QueryKeys(void);
   void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
-  eKeys Wait(int Seconds = 1);
+  eKeys Wait(int Seconds = 1, bool KeepChar = false);
 public:
   cInterface(void);
   void Init(void);
-  void Open(void);
+  void Open(int NumCols = MenuColumns, int NumLines = MenuLines);
   void Close(void);
-  eKeys GetKey(void);
+  eKeys GetKey(bool Wait = true);
   void Clear(void);
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void SetCols(int *c);
@@ -41,7 +42,7 @@ class cInterface {
   bool Confirm(const char *s);
   void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
-  void DisplayChannel(int Number, const char *Name);
+  void DisplayChannel(int Number, const char *Name = NULL);
   };
 
 extern cInterface Interface;
diff --git a/menu.c b/menu.c
index 92c0bd3e1..2a4cfa9fc 100644
--- a/menu.c
+++ b/menu.c
@@ -1,10 +1,10 @@
 /*
  * menu.c: The actual menu implementations
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.3 2000/04/15 15:07:36 kls Exp $
+ * $Id: menu.c 1.8 2000/04/24 15:32:11 kls Exp $
  */
 
 #include "menu.h"
@@ -428,7 +428,7 @@ void cMenuEditStrItem::Set(void)
   char buf[1000];
   if (pos >= 0) {
      strncpy(buf, value, pos);
-     char *s = value[pos] != ' ' ? value + pos + 1 : "";
+     const char *s = value[pos] != ' ' ? value + pos + 1 : "";
      snprintf(buf + pos, sizeof(buf) - pos - 2, "[%c]%s", *(value + pos), s);
      SetValue(buf);
      }
@@ -915,16 +915,7 @@ cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording)
 
 void cMenuRecordingItem::Set(void)
 {
-  char *buffer = NULL;
-  struct tm *t = localtime(&recording->start);
-  asprintf(&buffer, "%02d.%02d.%04d\t%02d:%02d\t%s",
-                    t->tm_mday,
-                    t->tm_mon + 1,
-                    t->tm_year + 1900,
-                    t->tm_hour,
-                    t->tm_min,
-                    recording->name);
-  SetText(buffer, false);
+  SetText(recording->Title('\t'));
 }
 
 // --- cMenuRecordings -------------------------------------------------------
@@ -957,7 +948,7 @@ eOSState cMenuRecordings::Play(void)
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri) {
 //XXX what if this recording's file is currently in use???
-     if (ri->recording->Play())
+     if (DvbApi.StartReplay(ri->recording->FileName(), ri->recording->Title()))
         return osEnd;
      }
   return osContinue;
@@ -1022,3 +1013,36 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cReplayDisplay --------------------------------------------------------
+
+cReplayDisplay::cReplayDisplay(void)
+{
+  Interface.Open(MenuColumns, -3);
+  shown = DvbApi.ShowProgress(true);
+}
+
+cReplayDisplay::~cReplayDisplay()
+{
+  Interface.Close();
+}
+
+eKeys cReplayDisplay::ProcessKey(eKeys Key)
+{
+  if (!DvbApi.Replaying())
+     return kOk; // will turn off replay display
+  shown = DvbApi.ShowProgress(!shown);
+  switch (Key) {
+    case kBegin:
+    case kPause:
+    case kStop:
+    case kSearchBack:
+    case kSearchForward:
+    case kSkipBack:
+    case kSkipForward:   break; // will be done in main loop
+    case kMenu:          break; // allow direct switching to menu
+    case kOk:            break; // switches off replay display
+    default:             Key = kNone; // ignore anything not explicitly known here
+    }
+  return Key;
+}
+
diff --git a/menu.h b/menu.h
index 813beecdd..f66579962 100644
--- a/menu.h
+++ b/menu.h
@@ -1,10 +1,10 @@
 /*
  * menu.h: The actual menu implementations
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.2 2000/03/05 10:57:27 kls Exp $
+ * $Id: menu.h 1.5 2000/04/24 15:31:53 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -18,4 +18,13 @@ class cMenuMain : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
   
+class cReplayDisplay {
+private:
+  bool shown;
+public:
+  cReplayDisplay(void);
+  ~cReplayDisplay();
+  eKeys ProcessKey(eKeys Key);
+  };
+
 #endif //_MENU_H
diff --git a/osd.c b/osd.c
index 673d075c0..ee9ba287d 100644
--- a/osd.c
+++ b/osd.c
@@ -1,10 +1,10 @@
 /*
  * osd.c: Abstract On Screen Display layer
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.2 2000/02/27 17:23:07 kls Exp $
+ * $Id: osd.c 1.4 2000/04/24 09:44:31 kls Exp $
  */
 
 #include "osd.h"
@@ -35,7 +35,7 @@ cOsdItem::~cOsdItem()
   delete text;
 }
 
-void cOsdItem::SetText(char *Text, bool Copy)
+void cOsdItem::SetText(const char *Text, bool Copy)
 {
   delete text;
   text = Copy ? strdup(Text) : Text;
diff --git a/osd.h b/osd.h
index 5ec13349f..99821b876 100644
--- a/osd.h
+++ b/osd.h
@@ -1,10 +1,10 @@
 /*
  * osd.h: Abstract On Screen Display layer
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.2 2000/03/05 11:33:11 kls Exp $
+ * $Id: osd.h 1.4 2000/04/24 09:44:32 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -28,7 +28,7 @@ enum eOSState { osUnknown,
 
 class cOsdItem : public cListObject {
 private:
-  char *text;
+  const char *text;
   int offset;
   eOSState state;
 protected:
@@ -37,8 +37,8 @@ class cOsdItem : public cListObject {
   cOsdItem(eOSState State = osUnknown);
   cOsdItem(char *Text, eOSState State = osUnknown);
   virtual ~cOsdItem();
-  void SetText(char *Text, bool Copy = true);
-  char *Text(void) { return text; }
+  void SetText(const char *Text, bool Copy = true);
+  const char *Text(void) { return text; }
   void Display(int Offset = -1, bool Current = false);
   virtual void Set(void) {}
   virtual eOSState ProcessKey(eKeys Key);
diff --git a/osm.c b/osm.c
deleted file mode 100644
index 70305ce88..000000000
--- a/osm.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * osm.c: On Screen Menu for the Video Disk Recorder
- *
- * Copyright (C) 2000 Klaus Schmidinger
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- * 
- * The author can be reached at kls@cadsoft.de
- *
- * The project's page is at http://www.cadsoft.de/people/kls/vdr
- *
- * $Id: osm.c 1.3 2000/04/15 14:04:21 kls Exp $
- */
-
-#include <signal.h>
-#include "config.h"
-#include "interface.h"
-#include "menu.h"
-#include "recording.h"
-#include "tools.h"
-
-#ifdef DEBUG_REMOTE
-#define KEYS_CONF "keys-pc.conf"
-#else
-#define KEYS_CONF "keys.conf"
-#endif
-
-static int Interrupted = 0;
-
-void SignalHandler(int signum)
-{
-  Interrupted = signum;
-}
-
-int main(int argc, char *argv[])
-{
-  openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
-  isyslog(LOG_INFO, "started");
-
-  Channels.Load("channels.conf");
-  Timers.Load("timers.conf");
-  if (!Keys.Load(KEYS_CONF))
-     Interface.LearnKeys();
-  Interface.Init();
-
-  cChannel::SwitchTo(CurrentChannel);
-
-  if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
-  if (signal(SIGINT,  SignalHandler) == SIG_IGN) signal(SIGINT,  SIG_IGN);
-  if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
-
-  cMenuMain *Menu = NULL;
-  cTimer *Timer = NULL;
-  cRecording *Recording = NULL;
-
-  while (!Interrupted) {
-        AssertFreeDiskSpace();
-        if (!Recording && !Timer && (Timer = cTimer::GetMatch()) != NULL) {
-           DELETENULL(Menu);
-           // make sure the timer won't be deleted:
-           Timer->SetRecording(true);
-           // switch to channel:
-           cChannel::SwitchTo(Timer->channel - 1);
-           // start recording:
-           Recording = new cRecording(Timer);
-           if (!Recording->Record())
-              DELETENULL(Recording);
-           }
-        if (Timer && !Timer->Matches()) {
-           // stop recording:
-           if (Recording) {
-              Recording->Stop();
-              DELETENULL(Recording);
-              }
-           // release timer:
-           Timer->SetRecording(false);
-           // clear single event timer:
-           if (Timer->IsSingleEvent()) {
-              DELETENULL(Menu); // must make sure no menu uses it
-              isyslog(LOG_INFO, "deleting timer %d", Timer->Index() + 1);
-              Timers.Del(Timer);
-              Timers.Save();
-              }
-           Timer = NULL;
-           }
-        eKeys key = Interface.GetKey();
-        if (Menu) {
-           switch (Menu->ProcessKey(key)) {
-             default: if (key != kMenu)
-                         break;
-             case osBack:
-             case osEnd: DELETENULL(Menu);
-                         break;
-             }
-           }
-        else {
-           switch (key) {
-             // Record/Replay Control:
-             case kBegin:         DvbApi.Skip(-INT_MAX); break;
-             case kRecord:        if (!DvbApi.Recording()) {
-                                     cTimer *timer = new cTimer(true);
-                                     Timers.Add(timer);
-                                     Timers.Save();
-                                     }
-                                  else
-                                     Interface.Error("Already recording!");
-                                  break;
-             case kPause:         DvbApi.PauseReplay(); break;
-             case kStop:          DvbApi.StopReplay(); break;
-             case kSearchBack:    DvbApi.FastRewind(); break;
-             case kSearchForward: DvbApi.FastForward(); break;
-             case kSkipBack:      DvbApi.Skip(-60); break;
-             case kSkipForward:   DvbApi.Skip(60); break;
-             // Menu Control:
-             case kMenu: Menu = new cMenuMain;
-                         Menu->Display();
-                         break;
-             case kUp:
-             case kDown: {
-                           int n = CurrentChannel + (key == kUp ? 1 : -1);
-                           cChannel *channel = Channels.Get(n);
-                           if (channel)
-                              channel->Switch();
-                         }
-                         break;
-             default:    break;
-             }
-           }
-        }
-  isyslog(LOG_INFO, "caught signal %d", Interrupted);
-  DvbApi.StopRecord();
-  DvbApi.StopReplay();
-  //TODO kill any remaining sub-processes!
-  isyslog(LOG_INFO, "exiting", Interrupted);
-  closelog();
-  return 0;
-}
diff --git a/recording.c b/recording.c
index 15c716300..46fe53f44 100644
--- a/recording.c
+++ b/recording.c
@@ -1,10 +1,10 @@
 /*
  * recording.h: Recording file handling
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.2 2000/04/15 13:29:02 kls Exp $
+ * $Id: recording.c 1.6 2000/04/24 09:45:13 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -104,6 +104,7 @@ void AssertFreeDiskSpace(void)
 
 cRecording::cRecording(const char *Name, time_t Start, int Priority, int LifeTime)
 {
+  titleBuffer = NULL;
   fileName = NULL;
   name = strdup(Name);
   start = Start;
@@ -113,6 +114,7 @@ cRecording::cRecording(const char *Name, time_t Start, int Priority, int LifeTim
 
 cRecording::cRecording(cTimer *Timer)
 {
+  titleBuffer = NULL;
   fileName = NULL;
   name = strdup(Timer->file);
   start = Timer->StartTime();
@@ -122,6 +124,7 @@ cRecording::cRecording(cTimer *Timer)
 
 cRecording::cRecording(const char *FileName)
 {
+  titleBuffer = NULL;
   fileName = strdup(FileName);
   FileName += strlen(BaseDir) + 1;
   char *p = strrchr(FileName, '/');
@@ -144,6 +147,7 @@ cRecording::cRecording(const char *FileName)
 
 cRecording::~cRecording()
 {
+  delete titleBuffer;
   delete fileName;
   delete name;
 }
@@ -157,6 +161,23 @@ const char *cRecording::FileName(void)
   return fileName;
 }
 
+const char *cRecording::Title(char Delimiter)
+{
+  delete titleBuffer;
+  titleBuffer = NULL;
+  struct tm *t = localtime(&start);
+  asprintf(&titleBuffer, "%02d.%02d.%04d%c%02d:%02d%c%s",
+                         t->tm_mday,
+                         t->tm_mon + 1,
+                         t->tm_year + 1900,
+                         Delimiter,
+                         t->tm_hour,
+                         t->tm_min,
+                         Delimiter,
+                         name);
+  return titleBuffer;
+}
+
 bool cRecording::Delete(void)
 {
   bool result = true;
@@ -180,21 +201,6 @@ bool cRecording::Remove(void)
   return RemoveFileOrDir(FileName());
 }
 
-bool cRecording::Record(void)
-{
-  return DvbApi.StartRecord(FileName());
-}
-
-bool cRecording::Play(void)
-{
-  return DvbApi.StartReplay(FileName());
-}
-
-void cRecording::Stop(void)
-{
-  DvbApi.StopRecord();
-}
-
 // --- cRecordings -----------------------------------------------------------
 
 bool cRecordings::Load(bool Deleted)
diff --git a/recording.h b/recording.h
index 5a5e8de48..eeea5609f 100644
--- a/recording.h
+++ b/recording.h
@@ -1,10 +1,10 @@
 /*
  * recording.h: Recording file handling
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.2 2000/04/14 15:12:42 kls Exp $
+ * $Id: recording.h 1.6 2000/04/24 09:45:49 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -12,15 +12,17 @@
 
 #include <time.h>
 #include "config.h"
-#include "dvbapi.h"
 #include "tools.h"
 
 void AssertFreeDiskSpace(void);
 
 class cRecording : public cListObject {
-public:
-  char *name;
+  friend class cRecordings;
+private:
+  char *titleBuffer;
   char *fileName;
+  char *name;
+public:
   time_t start;
   int priority;
   int lifetime;
@@ -29,18 +31,13 @@ class cRecording : public cListObject {
   cRecording(const char *FileName);
   ~cRecording();
   const char *FileName(void);
+  const char *Title(char Delimiter = ' ');
   bool Delete(void);
-       // Changes the file name so that it will no longer be visible in the OSM
+       // Changes the file name so that it will no longer be visible in the "Recordings" menu
        // Returns false in case of error
   bool Remove(void);
        // Actually removes the file from the disk
        // Returns false in case of error
-  bool Record(void);
-       // Starts recording of the file
-  bool Play(void);
-       // Starts playback of the file
-  void Stop(void);
-       // Stops recording or playback of the file
   };
 
 class cRecordings : public cList<cRecording> {
diff --git a/remote.c b/remote.c
index bf5b41f84..2ba5b22b4 100644
--- a/remote.c
+++ b/remote.c
@@ -1,10 +1,10 @@
 /*
  * remote.c: Interface to the Remote Control Unit
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.2 2000/04/15 16:00:51 kls Exp $
+ * $Id: remote.c 1.6 2000/04/24 09:45:56 kls Exp $
  */
 
 #include "remote.h"
@@ -17,6 +17,9 @@
 #include <unistd.h>
 #include "tools.h"
 
+#define REPEATLIMIT 100 // ms
+#define REPEATDELAY 250 // ms
+
 cRcIo::cRcIo(char *DeviceName)
 {
   dp = 0;
@@ -25,7 +28,6 @@ cRcIo::cRcIo(char *DeviceName)
   address = 0xFFFF;
   t = 0;
   firstTime = lastTime = 0;
-  minDelta = 0;
   lastCommand = 0;
   if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
      struct termios t;
@@ -35,8 +37,11 @@ cRcIo::cRcIo(char *DeviceName)
         if (tcsetattr(f, TCSAFLUSH, &t) == 0)
            return;
         }
+     LOG_ERROR_STR(DeviceName);
      close(f);
      }
+  else
+     LOG_ERROR_STR(DeviceName);
   f = -1;
 }
 
@@ -46,9 +51,8 @@ cRcIo::~cRcIo()
      close(f);
 }
 
-int cRcIo::ReceiveByte(bool Wait)
+bool cRcIo::InputAvailable(bool Wait)
 {
-  // Returns the byte if one was received within 1 second, -1 otherwise
   if (f >= 0) {
      fd_set set;
      struct timeval timeout;
@@ -56,13 +60,19 @@ int cRcIo::ReceiveByte(bool Wait)
      timeout.tv_usec = Wait ? 0 : 10000;
      FD_ZERO(&set);
      FD_SET(f, &set);
-     if (select(FD_SETSIZE, &set, NULL, NULL, &timeout)  > 0) {
-        if (FD_ISSET(f, &set)) {
-           unsigned char b;
-           if (read(f, &b, 1) == 1)
-              return b;
-           }
-        }
+     if (select(FD_SETSIZE, &set, NULL, NULL, &timeout)  > 0)
+        return FD_ISSET(f, &set);
+     }
+  return false;
+}
+
+int cRcIo::ReceiveByte(bool Wait)
+{
+  // Returns the byte if one was received within a timeout, -1 otherwise
+  if (InputAvailable(Wait)) {
+     unsigned char b;
+     if (read(f, &b, 1) == 1)
+        return b;
      }
   return -1;
 }
@@ -112,7 +122,6 @@ bool cRcIo::SetCode(unsigned char Code, unsigned short Address)
 {
   code = Code;
   address = Address;
-  minDelta = 200;
   return SendCommand(code);
 }
 
@@ -157,12 +166,10 @@ bool cRcIo::GetCommand(unsigned int *Command, unsigned short *Address)
         // let's have a timeout to avoid getting overrun by commands
         int now = time_ms();
         int delta = now - lastTime;
-        if (delta < minDelta)
-           minDelta = delta; // dynamically adjust to the smallest delta
         lastTime = now;
-        if (delta < minDelta * 1.3) { // if commands come in rapidly...
-           if (now - firstTime < 250)
-              return false; // ...repeat function kicks in after 250ms
+        if (delta < REPEATLIMIT) { // if commands come in rapidly...
+           if (now - firstTime < REPEATDELAY)
+              return false; // ...repeat function kicks in after a short delay
            return true;
            }
         }
@@ -209,12 +216,12 @@ bool cRcIo::Number(int n, bool Hex)
 
 bool cRcIo::String(char *s)
 {
-  char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
+  const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
   int n = 0;
 
   for (int i = 0; *s && i < 4; s++, i++) {
       n <<= 4;
-      for (char *c = chars; *c; c++) {
+      for (const char *c = chars; *c; c++) {
           if (*c == *s) {
              n |= c - chars;
              break;
diff --git a/remote.h b/remote.h
index 682792912..73e50eb78 100644
--- a/remote.h
+++ b/remote.h
@@ -1,10 +1,10 @@
 /*
  * remote.h: Interface to the Remote Control Unit
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.1 2000/02/19 13:36:48 kls Exp $
+ * $Id: remote.h 1.4 2000/04/24 09:46:00 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -19,7 +19,7 @@ class cRcIo {
   unsigned char dp, code, mode;
   unsigned short address;
   time_t t;
-  int firstTime, lastTime, minDelta;
+  int firstTime, lastTime;
   unsigned int lastCommand;
   bool SendCommand(unsigned char Cmd);
   int ReceiveByte(bool Wait = true);
@@ -29,6 +29,7 @@ class cRcIo {
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
   cRcIo(char *DeviceName);
   ~cRcIo();
+  bool InputAvailable(bool Wait = false);
   void Flush(int WaitSeconds = 0);
   bool SetCode(unsigned char Code, unsigned short Address);
   bool SetMode(unsigned char Mode);
diff --git a/timers.conf b/timers.conf
index 1996be4be..6fff8d88b 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,5 +1,5 @@
-1:15:MTWTF--:1828:1901:10:5:nano
-1:3:M------:2110:2230:99:10:SevenDays
+0:15:MTWTF--:1828:1901:10:5:nano
+0:3:M------:2110:2230:99:10:SevenDays
 1:10:-T-----:2058:2150:99:10:Quarks
 1:3:---T---:2158:2300:99:10:Switch
 1:2:----F--:2110:2155:99:10:Anke
diff --git a/tools.c b/tools.c
index e356e0fdb..eb0a14a4f 100644
--- a/tools.c
+++ b/tools.c
@@ -1,16 +1,17 @@
 /*
  * tools.c: Various tools
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.3 2000/04/15 15:10:05 kls Exp $
+ * $Id: tools.c 1.7 2000/04/24 15:01:35 kls Exp $
  */
 
 #define _GNU_SOURCE
 #include "tools.h"
 #include <dirent.h>
 #include <errno.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -21,6 +22,17 @@
 
 int SysLogLevel = 3;
 
+bool DataAvailable(int filedes)
+{
+  fd_set set;
+  FD_ZERO(&set);
+  FD_SET(filedes, &set);
+  struct timeval timeout;
+  timeout.tv_sec = 0;
+  timeout.tv_usec = 10000;
+  return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(filedes, &set);
+}
+
 void writechar(int filedes, char c)
 {
   write(filedes, &c, sizeof(c));
@@ -40,8 +52,13 @@ char readchar(int filedes)
 
 bool readint(int filedes, int &n)
 {
-  //XXX timeout!!
-  return read(filedes, &n, sizeof(n));
+  return DataAvailable(filedes) && read(filedes, &n, sizeof(n)) == sizeof(n);
+}
+
+void purge(int filedes)
+{
+  while (DataAvailable(filedes))
+        readchar(filedes);
 }
 
 char *readline(FILE *f)
@@ -135,6 +152,41 @@ bool RemoveFileOrDir(const char *FileName)
   return false;
 }
 
+bool CheckProcess(pid_t pid)
+{
+  pid_t Pid2Check = pid;
+  int status;
+  pid = waitpid(Pid2Check, &status, WNOHANG);
+  if (pid < 0) {
+     if (errno != ECHILD)
+        LOG_ERROR;
+     return false;
+     }
+  return true;
+}
+
+void KillProcess(pid_t pid, int Timeout)
+{
+  pid_t Pid2Wait4 = pid;
+  for (time_t t0 = time(NULL); time(NULL) - t0 < Timeout; ) {
+      int status;
+      pid_t pid = waitpid(Pid2Wait4, &status, WNOHANG);
+      if (pid < 0) {
+         if (errno != ECHILD)
+            LOG_ERROR;
+         return;
+         }
+      if (pid == Pid2Wait4)
+         return;
+      }
+  esyslog(LOG_ERR, "ERROR: process %d won't end (waited %d seconds) - terminating it...", Pid2Wait4, Timeout);
+  if (kill(Pid2Wait4, SIGTERM) < 0) {
+     esyslog(LOG_ERR, "ERROR: process %d won't terminate (%s) - killing it...", Pid2Wait4, strerror(errno));
+     if (kill(Pid2Wait4, SIGKILL) < 0)
+        esyslog(LOG_ERR, "ERROR: process %d won't die (%s) - giving up", Pid2Wait4, strerror(errno));
+     }
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
diff --git a/tools.h b/tools.h
index 48665a84f..57b2065db 100644
--- a/tools.h
+++ b/tools.h
@@ -1,17 +1,20 @@
 /*
  * tools.h: Various tools
  *
- * See the main source file 'osm.c' for copyright information and
+ * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.3 2000/04/15 15:09:47 kls Exp $
+ * $Id: tools.h 1.7 2000/04/24 15:01:49 kls Exp $
  */
 
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
+#include <errno.h>
 #include <stdio.h>
 #include <syslog.h>
+#include <sys/wait.h>
+#include <sys/types.h>
 
 extern int SysLogLevel;
 
@@ -23,18 +26,23 @@ extern int SysLogLevel;
 #define LOG_ERROR_STR(s)  esyslog(LOG_ERR, "ERROR: %s: %s", s, strerror(errno));
 
 #define SECSINDAY  86400
+#define MAXPROCESSTIMEOUT   3 // seconds
 
 #define DELETENULL(p) (delete (p), p = NULL)
 
+bool DataAvailable(int filedes);
 void writechar(int filedes, char c);
 void writeint(int filedes, int n);
 char readchar(int filedes);
 bool readint(int filedes, int &n);
+void purge(int filedes);
 char *readline(FILE *f);
 int time_ms(void);
 void delay_ms(int ms);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName);
+bool CheckProcess(pid_t pid);
+void KillProcess(pid_t pid, int Timeout = MAXPROCESSTIMEOUT);
 
 class cListObject {
 private:
diff --git a/vdr.c b/vdr.c
new file mode 100644
index 000000000..cbc095049
--- /dev/null
+++ b/vdr.c
@@ -0,0 +1,189 @@
+/*
+ * vdr.c: Video Disk Recorder main program
+ *
+ * Copyright (C) 2000 Klaus Schmidinger
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ * 
+ * The author can be reached at kls@cadsoft.de
+ *
+ * The project's page is at http://www.cadsoft.de/people/kls/vdr
+ *
+ * $Id: vdr.c 1.12 2000/04/24 13:36:39 kls Exp $
+ */
+
+#include <signal.h>
+#include "config.h"
+#include "interface.h"
+#include "menu.h"
+#include "recording.h"
+#include "tools.h"
+
+#ifdef DEBUG_REMOTE
+#define KEYS_CONF "keys-pc.conf"
+#else
+#define KEYS_CONF "keys.conf"
+#endif
+
+#define DIRECTCHANNELTIMEOUT 500 //ms
+
+static int Interrupted = 0;
+
+void SignalHandler(int signum)
+{
+  Interrupted = signum;
+}
+
+int main(int argc, char *argv[])
+{
+  openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+  isyslog(LOG_INFO, "started");
+
+  Channels.Load("channels.conf");
+  Timers.Load("timers.conf");
+  if (!Keys.Load(KEYS_CONF))
+     Interface.LearnKeys();
+  Interface.Init();
+
+  cChannel::SwitchTo(CurrentChannel);
+
+  if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
+  if (signal(SIGINT,  SignalHandler) == SIG_IGN) signal(SIGINT,  SIG_IGN);
+  if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
+
+  cMenuMain *Menu = NULL;
+  cReplayDisplay *ReplayDisplay = NULL;
+  cTimer *Timer = NULL;
+  int dcTime = 0, dcNumber = 0;
+  int LastChannel = -1;
+
+  while (!Interrupted) {
+        // Channel display:
+        if (CurrentChannel != LastChannel) {
+           if (!Menu && !ReplayDisplay) {
+              cChannel *channel = Channels.Get(CurrentChannel);
+              if (channel)
+                 Interface.DisplayChannel(CurrentChannel + 1, channel->name);
+              }
+           LastChannel = CurrentChannel;
+           }
+        // Direct Channel Select (action):
+        if (dcNumber) {
+           Interface.DisplayChannel(dcNumber);
+           if (time_ms() - dcTime > DIRECTCHANNELTIMEOUT) {
+              cChannel::SwitchTo(dcNumber - 1);
+              dcNumber = 0;
+              LastChannel = -1; // in case an invalid channel number was entered!
+              }
+           }
+        // Timer Processing:
+        else {
+           AssertFreeDiskSpace();
+           if (!Timer && (Timer = cTimer::GetMatch()) != NULL) {
+              DELETENULL(Menu);
+              DELETENULL(ReplayDisplay);
+              // make sure the timer won't be deleted:
+              Timer->SetRecording(true);
+              // switch to channel:
+              cChannel::SwitchTo(Timer->channel - 1);
+              // start recording:
+              cRecording Recording(Timer);
+              DvbApi.StartRecord(Recording.FileName());
+              }
+           if (Timer && !Timer->Matches()) {
+              // stop recording:
+              DvbApi.StopRecord();
+              // release timer:
+              Timer->SetRecording(false);
+              // clear single event timer:
+              if (Timer->IsSingleEvent()) {
+                 DELETENULL(Menu); // must make sure no menu uses it
+                 isyslog(LOG_INFO, "deleting timer %d", Timer->Index() + 1);
+                 Timers.Del(Timer);
+                 Timers.Save();
+                 }
+              Timer = NULL;
+              }
+           }
+        // User Input:
+        eKeys key = Interface.GetKey(!ReplayDisplay);
+        if (Menu) {
+           switch (Menu->ProcessKey(key)) {
+             default: if (key != kMenu)
+                         break;
+             case osBack:
+             case osEnd: DELETENULL(Menu);
+                         break;
+             }
+           }
+        else if (!ReplayDisplay || (key = ReplayDisplay->ProcessKey(key)) != kNone) {
+           switch (key) {
+             // Direct Channel Select (input):
+             case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
+             {
+               if (!(DvbApi.Recording() || DvbApi.Replaying())) {
+                  dcNumber = dcNumber * 10 + key - k0;
+                  dcTime = time_ms();
+                  }
+             }
+             // Record/Replay Control:
+             case kBegin:         DvbApi.Skip(-INT_MAX); break;
+             case kRecord:        if (!(DvbApi.Recording() || DvbApi.Replaying())) {
+                                     cTimer *timer = new cTimer(true);
+                                     Timers.Add(timer);
+                                     Timers.Save();
+                                     }
+                                  break;
+             case kPause:         DvbApi.PauseReplay(); break;
+             case kStop:          DELETENULL(ReplayDisplay);
+                                  DvbApi.StopReplay();
+                                  break;
+             case kSearchBack:    DvbApi.FastRewind(); break;
+             case kSearchForward: DvbApi.FastForward(); break;
+             case kSkipBack:      DvbApi.Skip(-60); break;
+             case kSkipForward:   DvbApi.Skip(60); break;
+             // Menu Control:
+             case kMenu: DELETENULL(ReplayDisplay);
+                         Menu = new cMenuMain;
+                         Menu->Display();
+                         break;
+             // Up/Down Channel Select:
+             case kUp:
+             case kDown: if (!(DvbApi.Recording() || DvbApi.Replaying())) {
+                            int n = CurrentChannel + (key == kUp ? 1 : -1);
+                            cChannel *channel = Channels.Get(n);
+                            if (channel)
+                               channel->Switch();
+                            }
+                         break;
+             // Viewing Control:
+             case kOk:   if (ReplayDisplay)
+                            DELETENULL(ReplayDisplay);
+                         else if (DvbApi.Replaying())
+                            ReplayDisplay = new cReplayDisplay;
+                         else
+                            LastChannel = -1; break; // forces channel display
+             default:    break;
+             }
+           }
+        }
+  isyslog(LOG_INFO, "caught signal %d", Interrupted);
+  DvbApi.StopRecord();
+  DvbApi.StopReplay();
+  isyslog(LOG_INFO, "exiting");
+  closelog();
+  return 0;
+}

From 9599a8fd8a6724e55ec4ad2ba2c975c0850073d9 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 27 May 2000 18:00:00 +0200
Subject: [PATCH 005/307] Version 0.05 - Support for more than one DVB card. -
 Simultaneous record and replay (with two DVB cards). - Instant recordings no
 longer get the name "instant". They now get the name   of the channel, with a
 prepended '@' character. - Timers that are not given an explicit Name now use
 the channel name with   a prepended '@' character. - If an instant recording
 is currently active, the Main menu now contains   an option to stop that
 recording. - Timers are now only processed when the Menu is not active. So
 after editing   a timer the effect will take place only after the menu has
 been closed.   In order to avoid missing a timer event by inadvertently
 leaving the menu   open, the menu will be closed automatically after about
 two minutes of   inactivity. - If a recording is currently being replayed,
 the Main menu now contains an   option to stop replaying. - Displaying the
 recording DVB interface status in the decimal points of the   RCU display. -
 Reduced the number of remote control keys. Modified the key assignments for  
 the PC keyboard to better resemble the "up-down-left-right-ok" layout on  
 menu controlling remote control units.

---
 BUGS          |   6 +-
 HISTORY       |  23 +++++
 INSTALL       |  26 +++---
 MANUAL        |  65 ++++++++++----
 TODO          |   7 +-
 channels.conf |  14 ++-
 config.c      |  42 ++++-----
 config.h      |  18 ++--
 dvbapi.c      | 193 +++++++++++++++++++++++++++++++++-------
 dvbapi.h      |  28 ++++--
 interface.c   |  33 ++++---
 interface.h   |   5 +-
 keys-pc.conf  | Bin 425 -> 283 bytes
 menu.c        | 238 +++++++++++++++++++++++++++++++++++++++++++-------
 menu.h        |  50 +++++++++--
 osd.h         |  20 ++++-
 recording.c   |   6 +-
 remote.c      |  13 ++-
 remote.h      |   7 +-
 timers.conf   |  11 +--
 vdr.c         | 135 ++++++++++++----------------
 21 files changed, 678 insertions(+), 262 deletions(-)

diff --git a/BUGS b/BUGS
index 66755f9f7..d9e2687bc 100644
--- a/BUGS
+++ b/BUGS
@@ -1,7 +1,7 @@
 Video Disk Recorder - Known Bugs
 --------------------------------
 
-* Sometimes picture and sound drift apart.
+* Sometimes the picture "jumps" as if a frame is skipped.
   Presumably this is a problem in the card driver or firmware?
 
 * When the on-screen display is activated during recording,
@@ -10,7 +10,3 @@ Video Disk Recorder - Known Bugs
   I assume this is a problem in the driver of firmware.
   There is no such problem in replay mode.
 
-* After a replay session the screen may go blank.
-  Haven't figured out yet how to ensure that it switches back to
-  the current channel.
-
diff --git a/HISTORY b/HISTORY
index 95cd350b2..9767c3fe7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -32,3 +32,26 @@ Video Disk Recorder Revision History
   kick in too early).
 - Channel selection is now blocked when recording or replaying.
 - Improved process handling.
+
+2000-05-27: Version 0.05
+
+- Support for more than one DVB card.
+- Simultaneous record and replay (with two DVB cards).
+- Instant recordings no longer get the name "instant". They now get the name
+  of the channel, with a prepended '@' character.
+- Timers that are not given an explicit Name now use the channel name with
+  a prepended '@' character.
+- If an instant recording is currently active, the Main menu now contains
+  an option to stop that recording.
+- Timers are now only processed when the Menu is not active. So after editing
+  a timer the effect will take place only after the menu has been closed.
+  In order to avoid missing a timer event by inadvertently leaving the menu
+  open, the menu will be closed automatically after about two minutes of
+  inactivity.
+- If a recording is currently being replayed, the Main menu now contains an
+  option to stop replaying.
+- Displaying the recording DVB interface status in the decimal points of the
+  RCU display.
+- Reduced the number of remote control keys. Modified the key assignments for
+  the PC keyboard to better resemble the "up-down-left-right-ok" layout on
+  menu controlling remote control units.
diff --git a/INSTALL b/INSTALL
index d7acfb6d9..bc619d7ca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,7 +12,7 @@ about that driver). For example, if the DVB driver was
 extracted into the directory /home/kls/vdr/DVB, then this
 package should be extracted into /home/kls/vdr/VDR.
 
-This program requires the card driver version 0.04 or higher
+This program requires the card driver version 0.05 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
@@ -30,6 +30,10 @@ interface. These modes are useful when testing new menus if you
 only have a remote connection to the VDR (which, in my case, is
 located in the living room and has neither a monitor nor a keyboard).
 
+When running, the 'vdr' program writes status information into the
+system log file (/var/log/messages). You may want to watch these
+messages (tail -f /var/log/mesages) to see if there are any problems.
+
 The video data directory:
 -------------------------
 
@@ -69,7 +73,9 @@ key after the other so that it can learn the various key codes. You will
 at least need to provide an "Up" and a "Down" key, so that you can switch
 channels. The rest of the key definitions is optional, but the more keys
 you define, the more you will be able to navigate through the menus and
-control recording/replaying.
+control recording/replaying. The program uses only a very small number
+of keys which have multiple meanings in the various modes (see MANUAL
+for a detailed description).
 If the program has been built with "DEBUG_REMOTE=1", it will use the
 key configuration file 'keys-pc.conf', so that you won't loose data
 when switching between normal and debug mode.
@@ -77,19 +83,11 @@ when switching between normal and debug mode.
 The default PC key assignments are:
 
   Up, Down, Left, Right     Crsr keys in numeric block
-  Menu                      '5' in numeric block
-  Ok                        Enter
-  Back                      Backspace
-  0..9                      '0'..'9' in top row
+  Menu                      'Home' in numeric block
+  Ok                        '5' in numeric block
+  Back                      'End' in numeric block
   Red, Green, Yellow, Blue  'F1'..'F4'
-  Record                    'r'
-  Pause                     'p'
-  Stop                      's'
-  Begin                     'B'
-  SearchForward             'f'
-  SearchBack                'b'
-  SkipForward               'PgDn' in numeric block
-  SkipBack                  'PgUp' in numeric block
+  0..9                      '0'..'9' in top row
 
 If you prefer different key assignments, simply delete the file
 'keys-pc.conf' and restart 'vdr' to get into learning mode.
diff --git a/MANUAL b/MANUAL
index 36a62987a..cea39466e 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,6 +1,28 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
+* Remote Control Keys
+
+  The following remote control keys are used to control the VDR
+  operation. To keep the number of different keys as small as
+  possible, several keys have different meanings in the various
+  modes:
+
+  Key     Normal      Main       Channels   Timer      Edit/New      Recordings  Replay
+
+  Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Begin
+  Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
+  Left    -           -          -          Disable    Decrement     -           Search back
+  Right   -           -          -          Enable     Increment     -           Search forward
+  Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
+  Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
+  Back    -           Menu off   Main menu  Main menu  Discard       Main menu   -
+  Red     -           Record     Edit       Edit       -             Play        -
+  Green   -           -          New        New        -             -           Skip -60s
+  Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
+  Blue    -           -          Mark       Mark       -             -           Stop
+  0..9    Ch select   -          -          -          Numeric inp.  -           -
+
 * Navigating through the On Screen Menus
 
   The "Main" menu can be called up with the "Menu" key of your remote
@@ -22,10 +44,10 @@ Video Disk Recorder User's Manual
   keys. "Ok" then confirms the changes.
   
   The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
-  in the various menus and are listed at the bottom of the on-screen-display.
+  in various menus and are listed at the bottom of the on-screen-display.
   
   At any point in the menu system, pressing the "Menu" key again will
-  immediately leave the menu system.
+  immediately leave the menu system (discarding any pending changes).
 
 * Selecting a Channel
 
@@ -48,35 +70,40 @@ Video Disk Recorder User's Manual
 
 * Instant Recording
 
-  You can start recording the current channel by pressing the "Record"
-  button. This will create a timer event named "instant" that starts
-  at the current time and records for two hours.
+  You can start recording the current channel by pressing the "Red" button
+  in the Main menu. This will create a timer event named "@channelname" that
+  starts at the current time and records for two hours.
   If you want to modify the recording time you need to edit the timer.
-  Stop instant recording by disabling or deleting the timer.
+  Stop instant recording by pressing the "Menu" button and selecting
+  "Stop Recording", or by disabling the timer.
 
 * Replaying a Recording
 
   All recordings are listed in the "Recordings" menu. Browse through the
   list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
   to start playback.
+  Playback can be stopped via the Main menu by selecting "Stop replaying",
+  or by pressing the "Blue" button outside the menu.
 
 * Replay Control
 
   The following keys have the listed meaning in Replay mode:
 
-  - "Begin"   Positions to beginning of the recording and starts playback
-              from there.
-  - "Pause"   Halts playback at the current frame. Press again to continue
-              playback.
-  - "Stop"    Stops playback and stores the current position, so that
-              playback can be resumed later at that point.
-  - "Search"  Runs playback forward or backward at a higher speed. Press
-              again to resume normal speed.
-  - "Skip"    Skips about 60 seconds forward or backward.
-  - "Ok"      Brings up the replay progress display, which shows the date,
-              time and title of the recording, a progress bar and the
-              current and total time of the recording.
-              Press "Ok" again to turn off the progress display.
+  - Up      Positions to beginning of the recording and starts playback
+            from there.
+  - Down    Halts playback at the current position. Press again to continue
+            playback.
+  - Blue    Stops playback and stores the current position, so that
+            playback can be resumed later at that point.
+  - Left
+    Right   Runs playback forward or backward at a higher speed. Press
+            again to resume normal speed.
+  - Green
+    Yellow  Skips about 60 seconds back or forward.
+  - Ok      Brings up the replay progress display, which shows the date,
+            time and title of the recording, a progress bar and the
+            current and total time of the recording.
+            Press "Ok" again to turn off the progress display.
 
 * Programming the Timer
 
diff --git a/TODO b/TODO
index 8f5d2f3d9..64b31b23b 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,8 @@
 TODO list for the Video Disk Recorder project
 ---------------------------------------------
 
-* Make it work with two DVB-S PCI cards to allow simultaneous
-  recording of one programme, while replaying another programme
-  (or maybe the same one, but time delayed).
-  Maybe we can do this with only a single card, if the card
-  driver/firmware allows simultaneuos record/playback?
+* Implement simultaneous record/replay with a single DVB card once
+  the card driver/firmware allows this.
 * Implement "on-disk editing" to allow "cutting out" of certain
   scenes in order to archive them (or, reversely, cut out
   commercial breaks).
diff --git a/channels.conf b/channels.conf
index c0e191aca..5edd778ef 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,14 +1,14 @@
 RTL:12188:h:1:27500:163:104:0:0
 Sat.1:12552:v:1:22000:163:104:0:0
-Pro 7:12480:v:1:27500:255:256:0:0
+Pro-7:12480:v:1:27500:255:256:0:0
 RTL2:12188:h:1:27500:166:128:0:0
 ARD:11837:h:1:27500:101:102:0:0
 BR3:11837:h:1:27500:201:202:0:0
-Hessen 3:11837:h:1:27500:301:302:0:0
+Hessen-3:11837:h:1:27500:301:302:0:0
 N3:11837:h:1:27500:401:402:0:0
 SR3:11837:h:1:27500:501:502:0:0
 WDR:11837:h:1:27500:601:602:0:0
-BR alpha:11837:h:1:27500:701:702:0:0
+BR-alpha:11837:h:1:27500:701:702:0:0
 SWR BW:11837:h:1:27500:801:802:0:0
 Phoenix:11837:h:1:27500:901:902:0:0
 ZDF:11954:h:1:27500:110:120:0:0
@@ -41,8 +41,14 @@ ORB:12722:h:1:22000:501:502:0:0
 B1:12722:h:1:22000:601:602:0:0
 ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
 Premiere World Promo:11798:h:1:27500:255:256:0:0
+Premiere:11798:h:1:27500:511:512:1:10
+Star Kino:11798:h:1:27500:767:768:1:9
+Cine Action:11798:h:1:27500:1023:1024:1:20
+Cine Comedy:11798:h:1:27500:1279:1280:1:29
+Sci Fantasy:11798:h:1:27500:1535:1536:1:41
+Romantic Movies:11798:h:1:27500:1791:1792:1:11
+Studio Universal:11798:h:1:27500:2047:2048:1:21
 TV Niepokalanow:11876:h:1:27500:305:321:0:0
-Premiere:11798:h:1:27500:1023:1024:1:10
 Mosaico:11934:v:1:27500:165:100:0:0
 Andalucia TV:11934:v:1:27500:166:104:0:0
 TVC Internacional:11934:v:1:27500:167:108:0:0
diff --git a/config.c b/config.c
index 0a39cc503..7e02c9169 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.5 2000/04/24 09:44:15 kls Exp $
+ * $Id: config.c 1.7 2000/05/27 14:44:15 kls Exp $
  */
 
 #include "config.h"
@@ -23,6 +23,10 @@ tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kBack,          "Back",          0 },
                     { kLeft,          "Left",          0 },
                     { kRight,         "Right",         0 },
+                    { kRed,           "Red",           0 },
+                    { kGreen,         "Green",         0 },
+                    { kYellow,        "Yellow",        0 },
+                    { kBlue,          "Blue",          0 },
                     { k0,             "0",             0 },
                     { k1,             "1",             0 },
                     { k2,             "2",             0 },
@@ -33,18 +37,6 @@ tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { k7,             "7",             0 },
                     { k8,             "8",             0 },
                     { k9,             "9",             0 },
-                    { kRed,           "Red",           0 },
-                    { kGreen,         "Green",         0 },
-                    { kYellow,        "Yellow",        0 },
-                    { kBlue,          "Blue",          0 },
-                    { kRecord,        "Record",        0 },
-                    { kPause,         "Pause",         0 },
-                    { kStop,          "Stop",          0 },
-                    { kBegin,         "Begin",         0 },
-                    { kSearchForward, "SearchForward", 0 },
-                    { kSearchBack,    "SearchBack",    0 },
-                    { kSkipForward,   "SkipForward",   0 },
-                    { kSkipBack,      "SkipBack",      0 },
                     { kNone,          "",              0 },
                   };
 
@@ -201,13 +193,15 @@ bool cChannel::Save(FILE *f)
   return fprintf(f, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", name, frequency, polarization, diseqc, srate, vpid, apid, ca, pnr) > 0;
 }
 
-bool cChannel::Switch(void)
+bool cChannel::Switch(cDvbApi *DvbApi)
 {
-  if (!DvbApi.Recording()) {
+  if (!DvbApi)
+     DvbApi = cDvbApi::PrimaryDvbApi;
+  if (!DvbApi->Recording()) {
      isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
      CurrentChannel = Index();
      for (int i = 3; --i;) {
-         if (DvbApi.SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
+         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
          esyslog(LOG_ERR, "retrying");
          }
@@ -217,10 +211,16 @@ bool cChannel::Switch(void)
   return false;
 }
 
-bool cChannel::SwitchTo(int i)
+bool cChannel::SwitchTo(int i, cDvbApi *DvbApi)
+{
+  cChannel *channel = Channels.Get(i);
+  return channel && channel->Switch(DvbApi);
+}
+
+const char *cChannel::GetChannelName(int i)
 {
   cChannel *channel = Channels.Get(i);
-  return channel && channel->Switch();
+  return channel ? channel->name : NULL;
 }
 
 // -- cTimer -----------------------------------------------------------------
@@ -241,7 +241,9 @@ cTimer::cTimer(bool Instant)
 //TODO VPS???
   priority = 99;
   lifetime = 99;
-  strcpy(file, Instant ? "instant" : "");
+  *file = 0;
+  if (Instant)
+     snprintf(file, sizeof(file), "@%s", cChannel::GetChannelName(CurrentChannel));
 }
 
 int cTimer::TimeToInt(int t)
@@ -382,7 +384,7 @@ cTimer *cTimer::GetMatch(void)
 {
   cTimer *t = (cTimer *)Timers.First();
   while (t) {
-        if (t->Matches())
+        if (!t->recording && t->Matches())
            return t;
         t = (cTimer *)t->Next();
         }
diff --git a/config.h b/config.h
index 42af0f858..1e22b8883 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.4 2000/04/24 09:44:17 kls Exp $
+ * $Id: config.h 1.6 2000/05/27 14:43:46 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include "dvbapi.h"
 #include "tools.h"
 
 #define MaxBuffer 1000
@@ -26,19 +27,11 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kBack,
              kLeft,
              kRight,
-             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
              kRed,
              kGreen,
              kYellow,
              kBlue,
-             kRecord,
-             kPause,
-             kStop,
-             kBegin,
-             kSearchForward,
-             kSearchBack,
-             kSkipForward,
-             kSkipBack,
+             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
              kNone
            };
 
@@ -79,8 +72,9 @@ class cChannel : public cListObject {
   cChannel(const cChannel *Channel);
   bool Parse(char *s);
   bool Save(FILE *f);
-  bool Switch(void);
-  static bool SwitchTo(int i);
+  bool Switch(cDvbApi *DvbApi = NULL);
+  static bool SwitchTo(int i, cDvbApi *DvbApi = NULL);
+  static const char *GetChannelName(int i);
   };
 
 class cTimer : public cListObject {
diff --git a/dvbapi.c b/dvbapi.c
index 719437d4c..e652d9971 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.8 2000/04/24 15:30:35 kls Exp $
+ * $Id: dvbapi.c 1.10 2000/05/27 14:07:17 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -70,8 +70,9 @@ class cIndexFile {
   struct tIndex { int offset; uchar type; uchar number; short reserved; };
   int f;
   char *fileName, *pFileExt;
-  int last, resume;
+  int size, last, resume;
   tIndex *index;
+  bool CatchUp(void);
 public:
   cIndexFile(const char *FileName, bool Record = false);
   ~cIndexFile();
@@ -89,6 +90,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
 {
   f = -1;
   fileName = pFileExt = NULL;
+  size = 0;
   last = resume = -1;
   index = NULL;
   if (FileName) {
@@ -108,18 +110,25 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
                  }
               last = (buf.st_size + delta) / sizeof(tIndex) - 1;
               if (!Record && last >= 0) {
-                 index = new tIndex[last + 1];
-                 int fi = open(fileName, O_RDONLY);
-                 if (fi >= 0) {
-                    if ((int)read(fi, index, buf.st_size) != buf.st_size) {
-                       esyslog(LOG_ERR, "ERROR: can't read from file '%s'", fileName);
-                       delete index;
-                       index = NULL;
+                 size = last + 1;
+                 index = new tIndex[size];
+                 if (index) {
+                    f = open(fileName, O_RDONLY);
+                    if (f >= 0) {
+                       if ((int)read(f, index, buf.st_size) != buf.st_size) {
+                          esyslog(LOG_ERR, "ERROR: can't read from file '%s'", fileName);
+                          delete index;
+                          index = NULL;
+                          close(f);
+                          f = -1;
+                          }
+                       // we don't close f here, see CatchUp()!
                        }
-                    close(fi);
+                    else
+                       LOG_ERROR_STR(fileName);
                     }
                  else
-                    LOG_ERROR_STR(fileName);
+                    esyslog(LOG_ERR, "ERROR: can't allocate %d bytes for index '%s'", size * sizeof(tIndex), fileName);
                  }
               }
            else
@@ -164,6 +173,46 @@ cIndexFile::~cIndexFile()
   delete fileName;
 }
 
+bool cIndexFile::CatchUp(void)
+{
+  if (index && f >= 0) {
+     struct stat buf;
+     if (fstat(f, &buf) == 0) {
+        int newLast = buf.st_size / sizeof(tIndex) - 1;
+        if (newLast > last) {
+           if (size <= newLast) {
+              size *= 2;
+              if (size <= newLast)
+                 size = newLast + 1;
+              }
+           index = (tIndex *)realloc(index, size * sizeof(tIndex));
+           if (index) {
+              int offset = (last + 1) * sizeof(tIndex);
+              int delta = (newLast - last) * sizeof(tIndex);
+              if (lseek(f, offset, SEEK_SET) == offset) {
+                 if (read(f, &index[last + 1], delta) != delta) {
+                    esyslog(LOG_ERR, "ERROR: can't read from index");
+                    delete index;
+                    index = NULL;
+                    close(f);
+                    f = -1;
+                    }
+                 last = newLast;
+                 return true;
+                 }
+              else
+                 LOG_ERROR;
+              }
+           else
+              esyslog(LOG_ERR, "ERROR: can't realloc() index");
+           }
+        }
+     else
+        LOG_ERROR;
+     }
+  return false;
+}
+
 void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 {
   if (f >= 0) {
@@ -181,6 +230,7 @@ void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType)
 {
   if (index) {
+     CatchUp();
      if (Index >= 0 && Index <= last) {
         *FileNumber = index[Index].number;
         *FileOffset = index[Index].offset;
@@ -195,10 +245,12 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
 int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length)
 {
   if (index) {
+     if (Forward)
+        CatchUp();
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
-         if (Index >= 0 && Index <= last) {
+         if (Index >= 0 && Index <= last - 100) { // '- 100': need to stay off the end!
             if (index[Index].type == I_FRAME) {
                *FileNumber = index[Index].number;
                *FileOffset = index[Index].offset;
@@ -226,6 +278,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
 int cIndexFile::Get(uchar FileNumber, int FileOffset)
 {
   if (index) {
+     CatchUp();
      //TODO implement binary search!
      int i;
      for (i = 0; i < last; i++) {
@@ -842,6 +895,7 @@ void cReplayBuffer::SkipSeconds(int Seconds)
         uchar FileNumber;
         int FileOffset;
         if (index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) >= 0)
+        if ((Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset)) >= 0)
            NextFile(FileNumber, FileOffset);
         }
      }
@@ -987,13 +1041,16 @@ int cReplayBuffer::Write(int Max)
 
 // --- cDvbApi ---------------------------------------------------------------
 
-cDvbApi::cDvbApi(void)
+int cDvbApi::NumDvbApis = 0;
+cDvbApi *cDvbApi::dvbApi[MAXDVBAPI] = { NULL };
+cDvbApi *cDvbApi::PrimaryDvbApi = NULL;
+
+cDvbApi::cDvbApi(const char *FileName)
 {
-  isMainProcess = true;
   pidRecord = pidReplay = 0;
   fromRecord = toRecord = -1;
   fromReplay = toReplay = -1;
-  videoDev = open(VIDEODEVICE, O_RDWR | O_NONBLOCK);
+  videoDev = open(FileName, O_RDWR | O_NONBLOCK);
   if (videoDev < 0)
      LOG_ERROR;
   cols = rows = 0;
@@ -1011,26 +1068,90 @@ cDvbApi::cDvbApi(void)
   leaveok(stdscr, TRUE);
   window = NULL;
 #endif
-  lastProgress = -1;
+  lastProgress = lastTotal = -1;
   replayTitle = NULL;
 }
 
 cDvbApi::~cDvbApi()
 {
-  if (isMainProcess) {
-     if (videoDev >= 0) {
-        Close();
-        StopReplay();
-        StopRecord();
-        close(videoDev);
-        }
+  if (videoDev >= 0) {
+     Close();
+     StopReplay();
+     StopRecord();
+     close(videoDev);
+     }
 #if defined(DEBUG_REMOTE) || defined(DEBUG_OSD)
-     endwin();
+  endwin();
 #endif
-     }
   delete replayTitle;
 }
 
+cDvbApi *cDvbApi::GetDvbApi(int Ca)
+{
+  Ca--;
+  for (int i = MAXDVBAPI; --i >= 0; ) {
+      if (dvbApi[i]) {
+         if ((i == Ca || Ca < 0) && !dvbApi[i]->Recording())
+            return dvbApi[i];
+         }
+      }
+  return NULL;
+}
+
+int cDvbApi::Index(void)
+{
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (dvbApi[i] == this)
+         return i;
+      }
+  return -1;
+}
+
+bool cDvbApi::Init(void)
+{
+  char fileName[strlen(VIDEODEVICE) + 10];
+  int i;
+
+  NumDvbApis = 0;
+  for (i = 0; i < MAXDVBAPI; i++) {
+      sprintf(fileName, "%s%d", VIDEODEVICE, i);
+      if (access(fileName, F_OK | R_OK | W_OK) == 0) {
+         dsyslog(LOG_INFO, "probing %s", fileName);
+         int f = open(fileName, O_RDWR);
+         if (f >= 0) {
+            close(f);
+            dvbApi[i] = new cDvbApi(fileName);
+            NumDvbApis++;
+            }
+         else {
+            if (errno != ENODEV)
+               LOG_ERROR_STR(fileName);
+            break;
+            }
+         }
+      else {
+         if (errno != ENOENT)
+            LOG_ERROR_STR(fileName);
+         break;
+         }
+      }
+  PrimaryDvbApi = dvbApi[0];
+  if (NumDvbApis > 0)
+     isyslog(LOG_INFO, "found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
+  else
+     esyslog(LOG_ERR, "ERROR: no video device found, giving up!");
+  return NumDvbApis > 0;
+}
+
+void cDvbApi::Cleanup(void)
+{
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      delete dvbApi[i];
+      dvbApi[i] = NULL;
+      }
+  PrimaryDvbApi = NULL;
+}
+
 #ifdef DEBUG_OSD
 void cDvbApi::SetColor(eDvbColor colorFg, eDvbColor colorBg)
 {
@@ -1095,15 +1216,17 @@ void cDvbApi::Open(int w, int h)
   SETCOLOR(clrMagenta,    0xB0, 0x00, 0xFC, 255);
   SETCOLOR(clrWhite,      0xFC, 0xFC, 0xFC, 255);
 
-  lastProgress = -1;
+  lastProgress = lastTotal = -1;
 }
 
 void cDvbApi::Close(void)
 {
-#ifndef DEBUG_OSD
+#ifdef DEBUG_OSD
+  delwin(window);
+#else
   Cmd(OSD_Close);
 #endif
-  lastProgress = -1;
+  lastProgress = lastTotal = -1;
 }
 
 void cDvbApi::Clear(void)
@@ -1158,8 +1281,9 @@ bool cDvbApi::ShowProgress(bool Initial)
      if (Initial) {
         if (replayTitle)
            Text(0, 0, replayTitle);
-        Text(-7, 2, cIndexFile::Str(Total));
         }
+     if (Total != lastTotal)
+        Text(-7, 2, cIndexFile::Str(Total));
 #ifdef DEBUG_OSD
      int p = cols * Current / Total;
      Fill(0, 1, p, 1, clrGreen);
@@ -1191,6 +1315,7 @@ bool cDvbApi::ShowProgress(bool Initial)
         }
 #endif
      Text(0, 2, cIndexFile::Str(Current));
+     lastTotal = Total;
      return true;
      }
   return false;
@@ -1247,6 +1372,8 @@ bool cDvbApi::StartRecord(const char *FileName)
      }
   if (videoDev >= 0) {
 
+     StopReplay(); // TODO: remove this if the driver is able to do record and replay at the same time
+
      // Check FileName:
 
      if (!FileName) {
@@ -1285,7 +1412,6 @@ bool cDvbApi::StartRecord(const char *FileName)
         // This is the actual recording process
 
         dsyslog(LOG_INFO, "start recording process (pid=%d)", getpid());
-        isMainProcess = false;
         bool DataStreamBroken = false;
         int fromMain = toRecordPipe[0];
         int toMain = fromRecordPipe[1];
@@ -1371,7 +1497,7 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
   StopReplay();
   if (videoDev >= 0) {
 
-     lastProgress = -1;
+     lastProgress = lastTotal = -1;
      delete replayTitle;
      if (Title) {
         if ((replayTitle = strdup(Title)) == NULL)
@@ -1411,7 +1537,6 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
         // This is the actual replaying process
 
         dsyslog(LOG_INFO, "start replaying process (pid=%d)", getpid());
-        isMainProcess = false;
         int fromMain = toReplayPipe[0];
         int toMain = fromReplayPipe[1];
         cReplayBuffer *Buffer = new cReplayBuffer(&videoDev, FileName);
@@ -1440,7 +1565,8 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
                      }
                   if (FD_ISSET(fromMain, &setIn)) {
                      switch (readchar(fromMain)) {
-                       case dvbStop:        Buffer->Stop(); break;
+                       case dvbStop:        SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            Buffer->Stop(); break;
                        case dvbPauseReplay: SetReplayMode(Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
                                             Paused = !Paused;
                                             FastForward = FastRewind = false;
@@ -1459,6 +1585,7 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
                        case dvbSkip:        {
                                               int Seconds;
                                               if (readint(fromMain, Seconds)) {
+                                                 SetReplayMode(VID_PLAY_CLEAR_BUFFER);
                                                  SetReplayMode(VID_PLAY_NORMAL);
                                                  FastForward = FastRewind = Paused = false;
                                                  Buffer->SetMode(rmPlay);
diff --git a/dvbapi.h b/dvbapi.h
index 91e554e98..e0c74b075 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.8 2000/04/24 15:31:07 kls Exp $
+ * $Id: dvbapi.h 1.10 2000/05/20 14:50:43 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -43,10 +43,29 @@ enum eDvbColor { clrBackground,
 class cDvbApi {
 private:
   int videoDev;
+  cDvbApi(const char *FileName);
 public:
-  cDvbApi(void);
   ~cDvbApi();
 
+#define MAXDVBAPI 2
+  static int NumDvbApis;
+private:
+  static cDvbApi *dvbApi[MAXDVBAPI];
+public:
+  static cDvbApi *PrimaryDvbApi;
+  static cDvbApi *GetDvbApi(int Ca = 0);
+         // Selects a free DVB device, starting with the highest device number.
+         // If Ca is nor 0, the device with the given number will be returned
+         // if it is not currently recording.
+  int Index(void);
+         // Returns the index of this DvbApi.
+  static bool Init(void);
+         // Initializes the DVB API and probes for existing DVB devices.
+         // Must be called before accessing any DVB functions.
+  static void Cleanup(void);
+         // Closes down all DVB devices.
+         // Must be called at the end of the program.
+
   // On Screen Display facilities
 
 private:
@@ -72,7 +91,7 @@ class cDvbApi {
   // Progress Display facilities
 
 private:
-  int lastProgress;
+  int lastProgress, lastTotal;
   char *replayTitle;
 public:
   bool ShowProgress(bool Initial = false);
@@ -91,7 +110,6 @@ class cDvbApi {
          dvbSkip,
          dvbGetIndex,
        };
-  bool isMainProcess;
   pid_t pidRecord, pidReplay;
   int fromRecord, toRecord;
   int fromReplay, toReplay;
@@ -133,5 +151,5 @@ class cDvbApi {
        // beginning of the recording.
   bool GetIndex(int *Current, int *Total = NULL);
   };
-  
+
 #endif //__DVBAPI_H
diff --git a/interface.c b/interface.c
index 446f9c434..82f955dc7 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.6 2000/04/24 09:44:23 kls Exp $
+ * $Id: interface.c 1.9 2000/05/07 09:28:39 kls Exp $
  */
 
 #include "interface.h"
@@ -15,8 +15,6 @@
 cRcIo RcIo("/dev/ttyS1");
 #endif
 
-cDvbApi DvbApi; //XXX member of cInterface???
-
 cInterface Interface;
 
 cInterface::cInterface(void)
@@ -36,7 +34,7 @@ void cInterface::Init(void)
 void cInterface::Open(int NumCols, int NumLines)
 {
   if (!open++)
-     DvbApi.Open(NumCols, NumLines);
+     cDvbApi::PrimaryDvbApi->Open(NumCols, NumLines);
 }
 
 void cInterface::Close(void)
@@ -44,7 +42,7 @@ void cInterface::Close(void)
   if (open == 1)
      Clear();
   if (!--open)
-     DvbApi.Close();
+     cDvbApi::PrimaryDvbApi->Close();
 }
 
 unsigned int cInterface::GetCh(bool Wait)
@@ -91,13 +89,13 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
 void cInterface::Clear(void)
 {
   if (open)
-     DvbApi.Clear();
+     cDvbApi::PrimaryDvbApi->Clear();
 }
 
 void cInterface::ClearEol(int x, int y, eDvbColor Color)
 {
   if (open)
-     DvbApi.ClrEol(x, y, Color);
+     cDvbApi::PrimaryDvbApi->ClrEol(x, y, Color);
 }
 
 void cInterface::SetCols(int *c)
@@ -112,7 +110,7 @@ void cInterface::SetCols(int *c)
 void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
   if (open)
-     DvbApi.Text(x, y, s, FgColor, BgColor);
+     cDvbApi::PrimaryDvbApi->Text(x, y, s, FgColor, BgColor);
 }
 
 void cInterface::WriteText(int x, int y, const char *s, bool Current)
@@ -198,8 +196,8 @@ void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvb
      int l = (w - strlen(Text)) / 2;
      if (l < 0)
         l = 0;
-     DvbApi.Fill(Index * w, -1, w, 1, BgColor);
-     DvbApi.Text(Index * w + l, -1, Text, FgColor, BgColor);
+     cDvbApi::PrimaryDvbApi->Fill(Index * w, -1, w, 1, BgColor);
+     cDvbApi::PrimaryDvbApi->Text(Index * w + l, -1, Text, FgColor, BgColor);
      }
 }
 
@@ -323,7 +321,7 @@ void cInterface::DisplayChannel(int Number, const char *Name)
 #ifndef DEBUG_REMOTE
   RcIo.Number(Number);
 #endif
-  if (Name) {
+  if (Name && !Recording()) {
      Open(MenuColumns, 1);
      char buffer[MenuColumns + 1];
      snprintf(buffer, sizeof(buffer), "%d  %s", Number, Name ? Name : "");
@@ -337,3 +335,16 @@ void cInterface::DisplayChannel(int Number, const char *Name)
      Close();
      }
 }
+
+void cInterface::DisplayRecording(int Index, bool On)
+{
+#ifndef DEBUG_REMOTE
+  RcIo.SetPoints(1 << Index, On);
+#endif
+}
+
+bool cInterface::Recording(void)
+{
+  // This is located here because the Interface has to do with the "PrimaryDvbApi" anyway
+  return cDvbApi::PrimaryDvbApi->Recording();
+}
diff --git a/interface.h b/interface.h
index eb4e76bcd..2a1c1560f 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.7 2000/04/24 09:44:25 kls Exp $
+ * $Id: interface.h 1.9 2000/05/06 15:39:23 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -43,9 +43,10 @@ class cInterface {
   void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
   void DisplayChannel(int Number, const char *Name = NULL);
+  void DisplayRecording(int Index, bool On);
+  bool Recording(void);
   };
 
 extern cInterface Interface;
-extern cDvbApi DvbApi; //XXX member of cInterface???
 
 #endif //__INTERFACE_H
diff --git a/keys-pc.conf b/keys-pc.conf
index 744609d5c09e0c95ec545e912d01d81de7cd64ab..cb0192be3fcc6e296bcd6efd69c099dfd7fdf664 100644
GIT binary patch
delta 70
zcmZ3<Jez5PrKN!xmwz^=0SFkH8F4u!Cc}9aTt2C3B~Up76Rx1l^b9!Hbm9Z+iN$#U
DRJjrJ

literal 425
zcmY+AL2tq^425^){Te4}5_+T{xNKsg+F{44HBeCzlv4HYQ>}5)a>@5>KTCew(D3R5
zo2H4}_bZwneja~6DKglF@h(c^i|<2HPUCo+nP`Wis*_UW@yX|>xH6pD%XN_!lw5|O
z1QoQPh7mN#1T$Dc3n%E{1wGb+Yvh7CPTb5wQI11oUe4Lzm%A>E(k@VR1B=>D&N{?o
zCa>{b4Si~pCzQ{Saw2a~@TE<gDbpyqiuH9L;#e&!oJ-|*Ry3tp-rC2%L1pLSdrVn_
E7ckLY>Hq)$

diff --git a/menu.c b/menu.c
index 2a4cfa9fc..aab5fd121 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.8 2000/04/24 15:32:11 kls Exp $
+ * $Id: menu.c 1.16 2000/05/27 16:13:39 kls Exp $
  */
 
 #include "menu.h"
@@ -12,9 +12,10 @@
 #include <stdio.h>
 #include <string.h>
 #include "config.h"
-#include "dvbapi.h"
 #include "recording.h"
 
+#define MENUTIMEOUT 120 // seconds
+
 const char *FileNameChars = "aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.# ";
 
 // --- cMenuEditItem ---------------------------------------------------------
@@ -509,7 +510,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditIntItem( "Srate",        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
      Add(new cMenuEditIntItem( "Vpid",         &data.vpid, 0, 10000)); //TODO exact limits???
      Add(new cMenuEditIntItem( "Apid",         &data.apid, 0, 10000)); //TODO exact limits???
-     Add(new cMenuEditBoolItem("CA",           &data.ca));
+     Add(new cMenuEditIntItem( "CA",           &data.ca, 0, cDvbApi::NumDvbApis));
      Add(new cMenuEditIntItem( "Pnr",          &data.pnr, 0, 10000)); //TODO exact limits???
      }
 }
@@ -744,7 +745,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      if (Key == kOk) {
         if (!*data.file)
-           strcpy(data.file, "unnamed");
+           strcpy(data.file, cChannel::GetChannelName(data.channel - 1));
         if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
            *timer = data;
            Timers.Save();
@@ -947,9 +948,8 @@ eOSState cMenuRecordings::Play(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri) {
-//XXX what if this recording's file is currently in use???
-     if (DvbApi.StartReplay(ri->recording->FileName(), ri->recording->Title()))
-        return osEnd;
+     cReplayControl::SetRecording(ri->recording->FileName(), ri->recording->Title());
+     return osReplay;
      }
   return osContinue;
 }
@@ -992,12 +992,26 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
 
 // --- cMenuMain -------------------------------------------------------------
 
-cMenuMain::cMenuMain(void)
+#define STOP_RECORDING "Stop recording "
+
+cMenuMain::cMenuMain(bool Replaying)
 :cOsdMenu("Main")
 {
   Add(new cOsdItem("Channels",   osChannels));
   Add(new cOsdItem("Timer",      osTimer));
   Add(new cOsdItem("Recordings", osRecordings));
+  if (Replaying)
+     Add(new cOsdItem("Stop replaying", osStopReplay));
+  const char *s = NULL;
+  while ((s = cRecordControls::GetInstantId(s)) != NULL) {
+        char *buffer = NULL;
+        asprintf(&buffer, "%s%s", STOP_RECORDING, s);
+        Add(new cOsdItem(buffer, osStopRecord));
+        delete buffer;
+        }
+  SetHelp("Record");
+  Display();
+  lastActivity = time(NULL);
 }
 
 eOSState cMenuMain::ProcessKey(eKeys Key)
@@ -1008,41 +1022,205 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osChannels:   return AddSubMenu(new cMenuChannels);
     case osTimer:      return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
-    default: break;
+    case osStopRecord: if (Interface.Confirm("Stop Recording?")) {
+                          cOsdItem *item = Get(Current());
+                          if (item) {
+                             cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
+                             return osEnd;
+                             }
+                          }
+    default: switch (Key) {
+               case kMenu: state = osEnd;    break;
+               case kRed:  if (!HasSubMenu())
+                              state = osRecord;
+                           break;
+               default:    break;
+               }
     }
+  if (Key != kNone)
+     lastActivity = time(NULL);
+  else if (time(NULL) - lastActivity > MENUTIMEOUT)
+     state = osEnd;
   return state;
 }
 
-// --- cReplayDisplay --------------------------------------------------------
+// --- cRecordControl --------------------------------------------------------
+
+cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
+{
+  instantId = NULL;
+  dvbApi = DvbApi;
+  if (!dvbApi) dvbApi = cDvbApi::PrimaryDvbApi;//XXX
+  timer = Timer;
+  if (!timer) {
+     timer = new cTimer(true);
+     Timers.Add(timer);
+     Timers.Save();
+     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s on %d" : "%s", cChannel::GetChannelName(timer->channel - 1), dvbApi->Index() + 1);
+     }
+  timer->SetRecording(true);
+  cChannel::SwitchTo(timer->channel - 1, dvbApi);
+  cRecording Recording(timer);
+  dvbApi->StartRecord(Recording.FileName());
+  Interface.DisplayRecording(dvbApi->Index(), true);
+}
+
+cRecordControl::~cRecordControl()
+{
+  Stop(true);
+  delete instantId;
+  Interface.DisplayRecording(dvbApi->Index(), false);
+}
+
+void cRecordControl::Stop(bool KeepInstant)
+{
+  if (timer) {
+     dvbApi->StopRecord();
+     timer->SetRecording(false);
+     if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && !timer->Matches())) {
+        // checking timer->Matches() to make sure we don't delete the timer
+        // if the program was cancelled before the timer's stop time!
+        isyslog(LOG_INFO, "deleting timer %d", timer->Index() + 1);
+        Timers.Del(timer);
+        Timers.Save();
+        }
+     timer = NULL;
+     }
+}
+
+bool cRecordControl::Process(void)
+{
+  if (!timer || !timer->Matches())
+     return false;
+  AssertFreeDiskSpace();
+  return true;
+}
+
+// --- cRecordControls -------------------------------------------------------
+
+cRecordControl *cRecordControls::RecordControls[MAXDVBAPI] = { NULL };
+
+bool cRecordControls::Start(cTimer *Timer)
+{
+  int ch = Timer ? Timer->channel - 1 : CurrentChannel;
+  cChannel *channel = Channels.Get(ch);
+
+  if (channel) {
+     cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca);
+     if (dvbApi) {
+        for (int i = 0; i < MAXDVBAPI; i++) {
+            if (!RecordControls[i]) {
+               RecordControls[i] = new cRecordControl(dvbApi, Timer);
+               return true;
+               }
+            }
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch);
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: channel %d not defined!", ch + 1);
+  return false;
+}
+
+void cRecordControls::Stop(const char *InstantId)
+{
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (RecordControls[i]) {
+         const char *id = RecordControls[i]->InstantId();
+         if (id && strcmp(id, InstantId) == 0)
+            RecordControls[i]->Stop();
+         }
+      }
+}
 
-cReplayDisplay::cReplayDisplay(void)
+const char *cRecordControls::GetInstantId(const char *LastInstantId)
 {
-  Interface.Open(MenuColumns, -3);
-  shown = DvbApi.ShowProgress(true);
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (RecordControls[i]) {
+         if (!LastInstantId && RecordControls[i]->InstantId())
+            return RecordControls[i]->InstantId();
+         if (LastInstantId && LastInstantId == RecordControls[i]->InstantId())
+            LastInstantId = NULL;
+         }
+      }
+  return NULL;
 }
 
-cReplayDisplay::~cReplayDisplay()
+void cRecordControls::Process(void)
 {
-  Interface.Close();
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (RecordControls[i]) {
+         if (!RecordControls[i]->Process())
+            DELETENULL(RecordControls[i]);
+         }
+      }
 }
 
-eKeys cReplayDisplay::ProcessKey(eKeys Key)
+// --- cReplayControl --------------------------------------------------------
+
+char *cReplayControl::fileName = NULL;
+char *cReplayControl::title = NULL;
+
+cReplayControl::cReplayControl(void)
 {
-  if (!DvbApi.Replaying())
-     return kOk; // will turn off replay display
-  shown = DvbApi.ShowProgress(!shown);
+  dvbApi = cDvbApi::PrimaryDvbApi;//XXX
+  visible = shown = false;
+  if (fileName)
+     dvbApi->StartReplay(fileName, title);
+}
+
+cReplayControl::~cReplayControl()
+{
+  Hide();
+  dvbApi->StopReplay();
+}
+
+void cReplayControl::SetRecording(const char *FileName, const char *Title)
+{
+  delete fileName;
+  delete title;
+  fileName = FileName ? strdup(FileName) : NULL;
+  title = Title ? strdup(Title) : NULL;
+}
+
+void cReplayControl::Show(void)
+{
+  if (!visible) {
+     Interface.Open(MenuColumns, -3);
+     needsFastResponse = visible = true;
+     shown = dvbApi->ShowProgress(true);
+     }
+}
+
+void cReplayControl::Hide(void)
+{
+  if (visible) {
+     Interface.Close();
+     needsFastResponse = visible = false;
+     }
+}
+
+eOSState cReplayControl::ProcessKey(eKeys Key)
+{
+  if (!dvbApi->Replaying())
+     return osEnd;
+  if (visible)
+     shown = dvbApi->ShowProgress(!shown) || shown;
   switch (Key) {
-    case kBegin:
-    case kPause:
-    case kStop:
-    case kSearchBack:
-    case kSearchForward:
-    case kSkipBack:
-    case kSkipForward:   break; // will be done in main loop
-    case kMenu:          break; // allow direct switching to menu
-    case kOk:            break; // switches off replay display
-    default:             Key = kNone; // ignore anything not explicitly known here
+    case kUp:      dvbApi->Skip(-INT_MAX); break;
+    case kDown:    dvbApi->PauseReplay(); break;
+    case kBlue:    Hide();
+                   dvbApi->StopReplay();
+                   return osEnd;
+    case kLeft:    dvbApi->FastRewind(); break;
+    case kRight:   dvbApi->FastForward(); break;
+    case kGreen:   dvbApi->Skip(-60); break;
+    case kYellow:  dvbApi->Skip(60); break;
+    case kMenu:    Hide(); return osMenu; // allow direct switching to menu
+    case kOk:      visible ? Hide() : Show(); break;
+    default:       return osUnknown;
     }
-  return Key;
+  return osContinue;
 }
 
diff --git a/menu.h b/menu.h
index f66579962..6ba080cb2 100644
--- a/menu.h
+++ b/menu.h
@@ -4,27 +4,63 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.5 2000/04/24 15:31:53 kls Exp $
+ * $Id: menu.h 1.9 2000/05/01 15:16:23 kls Exp $
  */
 
 #ifndef _MENU_H
 #define _MENU_H
 
+#define _GNU_SOURCE
+
+#include "dvbapi.h"
 #include "osd.h"
 
 class cMenuMain : public cOsdMenu {
+private:
+  time_t lastActivity;
 public:
-  cMenuMain(void);
+  cMenuMain(bool Replaying);
   virtual eOSState ProcessKey(eKeys Key);
   };
   
-class cReplayDisplay {
+class cRecordControl {
+private:
+  cDvbApi *dvbApi;
+  cTimer *timer;
+  char *instantId;
+public:
+  cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
+  virtual ~cRecordControl();
+  bool Process(void);
+  void Stop(bool KeepInstant = false);
+  bool IsInstant(void) { return instantId; }
+  const char *InstantId(void) { return instantId; }
+  };
+
+class cRecordControls {
 private:
-  bool shown;
+  static cRecordControl *RecordControls[MAXDVBAPI];
 public:
-  cReplayDisplay(void);
-  ~cReplayDisplay();
-  eKeys ProcessKey(eKeys Key);
+  static bool Start(cTimer *Timer = NULL);
+  static void Stop(const char *InstantId);
+  static const char *GetInstantId(const char *LastInstantId);
+  static void Process(void);
+  };
+
+class cReplayControl : public cOsdBase {
+private:
+  cDvbApi *dvbApi;
+  bool visible, shown;
+  void Show(void);
+  void Hide(void);
+  static char *fileName;
+  static char *title;
+public:
+  cReplayControl(void);
+  virtual ~cReplayControl();
+  virtual eOSState ProcessKey(eKeys Key);
+  bool Visible(void) { return visible; }
+  static void SetRecording(const char *FileName, const char *Title);
   };
 
 #endif //_MENU_H
diff --git a/osd.h b/osd.h
index 99821b876..1d4f4cf0b 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.4 2000/04/24 09:44:32 kls Exp $
+ * $Id: osd.h 1.9 2000/05/27 15:35:41 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -17,11 +17,15 @@
 #define MAXOSDITEMS 9
 
 enum eOSState { osUnknown,
+                osMenu,
                 osContinue,
-                osProcessed,
                 osChannels,
                 osTimer,
                 osRecordings,
+                osRecord,
+                osReplay,
+                osStopRecord,
+                osStopReplay,
                 osBack,
                 osEnd,
               };
@@ -44,7 +48,17 @@ class cOsdItem : public cListObject {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-class cOsdMenu : public cList<cOsdItem> {
+class cOsdBase {
+protected:
+  bool needsFastResponse;
+public:
+  cOsdBase(bool FastResponse = false) { needsFastResponse = FastResponse; }
+  virtual ~cOsdBase() {}
+  virtual eOSState ProcessKey(eKeys Key) = 0;
+  bool NeedsFastResponse(void) { return needsFastResponse; }
+  };
+
+class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
 private:
   char *title;
   int cols[cInterface::MaxCols];
diff --git a/recording.c b/recording.c
index 46fe53f44..2eba90b41 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.6 2000/04/24 09:45:13 kls Exp $
+ * $Id: recording.c 1.8 2000/05/13 16:16:56 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -61,8 +61,7 @@ void AssertFreeDiskSpace(void)
   // it will get removed during the next call.
   static time_t LastFreeDiskCheck = 0;
   if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA) {
-     LastFreeDiskCheck = time(NULL);
-     if (DvbApi.Recording() && LowDiskSpace()) {
+     if (LowDiskSpace()) {
         // Remove the oldest file that has been "deleted":
         cRecordings Recordings;
         if (Recordings.Load(true)) {
@@ -97,6 +96,7 @@ void AssertFreeDiskSpace(void)
         // Unable to free disk space, but there's nothing we can do about that...
         esyslog(LOG_ERR, "low disk space, but no recordings to delete");
         }
+     LastFreeDiskCheck = time(NULL);
      }
 }
 
diff --git a/remote.c b/remote.c
index 2ba5b22b4..eb495e15e 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.6 2000/04/24 09:45:56 kls Exp $
+ * $Id: remote.c 1.7 2000/05/07 09:28:18 kls Exp $
  */
 
 #include "remote.h"
@@ -29,6 +29,7 @@ cRcIo::cRcIo(char *DeviceName)
   t = 0;
   firstTime = lastTime = 0;
   lastCommand = 0;
+  lastNumber = 0;
   if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
      struct termios t;
      if (tcgetattr(f, &t) == 0) {
@@ -206,6 +207,7 @@ bool cRcIo::Number(int n, bool Hex)
          n = (n << 4) | ((*d - '0') & 0x0F);
          }
      }
+  lastNumber = n;
   for (int i = 0; i < 4; i++) {
       if (!Digit(i, n))
          return false;
@@ -231,6 +233,15 @@ bool cRcIo::String(char *s)
   return Number(n, true);
 }
 
+void cRcIo::SetPoints(unsigned char Dp, bool On)
+{ 
+  if (On)
+     dp |= Dp;
+  else
+     dp &= ~Dp;
+  Number(lastNumber, true);
+}
+
 bool cRcIo::DetectCode(unsigned char *Code, unsigned short *Address)
 {
   // Caller should initialize 'Code' to 0 and call DetectCode()
diff --git a/remote.h b/remote.h
index 73e50eb78..1d0a1cce0 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.4 2000/04/24 09:46:00 kls Exp $
+ * $Id: remote.h 1.5 2000/05/07 09:27:54 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -21,10 +21,12 @@ class cRcIo {
   time_t t;
   int firstTime, lastTime;
   unsigned int lastCommand;
+  int lastNumber;
   bool SendCommand(unsigned char Cmd);
   int ReceiveByte(bool Wait = true);
   bool SendByteHandshake(unsigned char c);
   bool SendByte(unsigned char c);
+  bool Digit(int n, int v);
 public:
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
   cRcIo(char *DeviceName);
@@ -34,9 +36,8 @@ class cRcIo {
   bool SetCode(unsigned char Code, unsigned short Address);
   bool SetMode(unsigned char Mode);
   bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
-  bool Digit(int n, int v);
   bool Number(int n, bool Hex = false);
-  void Points(unsigned char Dp) { dp = Dp; }
+  void SetPoints(unsigned char Dp, bool On);
   bool String(char *s);
   bool DetectCode(unsigned char *Code, unsigned short *Address);
   };
diff --git a/timers.conf b/timers.conf
index 6fff8d88b..1f9fae0be 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,9 +1,10 @@
-0:15:MTWTF--:1828:1901:10:5:nano
-0:3:M------:2110:2230:99:10:SevenDays
-1:10:-T-----:2058:2150:99:10:Quarks
+1:15:MTWTF--:1828:1901:10:5:nano
+1:3:M------:2110:2230:99:10:SevenDays
+1:10:-T-----:2058:2202:99:10:Quarks
 1:3:---T---:2158:2300:99:10:Switch
-1:2:----F--:2110:2155:99:10:Anke
 1:1:----F--:2210:2325:99:10:7Tage7Koepfe
 1:15:-----S-:1358:1435:99:7:Neues
 1:1:-----S-:1445:1600:99:10:Hammerman
-1:2:-----S-:2205:2320:99:10:Wochenshow
+1:2:-----S-:2150:2320:99:10:Wochenshow
+1:14:------S:2155:2245:99:10:AprilHailer
+1:2:--W----:2110:2325:99:99:BulleVonToelz
diff --git a/vdr.c b/vdr.c
index cbc095049..bcda47114 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,11 +22,12 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.12 2000/04/24 13:36:39 kls Exp $
+ * $Id: vdr.c 1.19 2000/05/27 15:38:35 kls Exp $
  */
 
 #include <signal.h>
 #include "config.h"
+#include "dvbapi.h"
 #include "interface.h"
 #include "menu.h"
 #include "recording.h"
@@ -52,6 +53,9 @@ int main(int argc, char *argv[])
   openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
   isyslog(LOG_INFO, "started");
 
+  if (!cDvbApi::Init())
+     return 1;
+
   Channels.Load("channels.conf");
   Timers.Load("timers.conf");
   if (!Keys.Load(KEYS_CONF))
@@ -65,15 +69,14 @@ int main(int argc, char *argv[])
   if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
 
   cMenuMain *Menu = NULL;
-  cReplayDisplay *ReplayDisplay = NULL;
-  cTimer *Timer = NULL;
+  cReplayControl *ReplayControl = NULL;
   int dcTime = 0, dcNumber = 0;
   int LastChannel = -1;
 
   while (!Interrupted) {
         // Channel display:
         if (CurrentChannel != LastChannel) {
-           if (!Menu && !ReplayDisplay) {
+           if (!Menu) {
               cChannel *channel = Channels.Get(CurrentChannel);
               if (channel)
                  Interface.DisplayChannel(CurrentChannel + 1, channel->name);
@@ -81,108 +84,80 @@ int main(int argc, char *argv[])
            LastChannel = CurrentChannel;
            }
         // Direct Channel Select (action):
-        if (dcNumber) {
-           Interface.DisplayChannel(dcNumber);
-           if (time_ms() - dcTime > DIRECTCHANNELTIMEOUT) {
-              cChannel::SwitchTo(dcNumber - 1);
-              dcNumber = 0;
-              LastChannel = -1; // in case an invalid channel number was entered!
-              }
+        if (dcNumber && time_ms() - dcTime > DIRECTCHANNELTIMEOUT) {
+           cChannel::SwitchTo(dcNumber - 1);
+           dcNumber = 0;
+           LastChannel = -1; // in case an invalid channel number was entered!
            }
-        // Timer Processing:
-        else {
-           AssertFreeDiskSpace();
-           if (!Timer && (Timer = cTimer::GetMatch()) != NULL) {
-              DELETENULL(Menu);
-              DELETENULL(ReplayDisplay);
-              // make sure the timer won't be deleted:
-              Timer->SetRecording(true);
-              // switch to channel:
-              cChannel::SwitchTo(Timer->channel - 1);
-              // start recording:
-              cRecording Recording(Timer);
-              DvbApi.StartRecord(Recording.FileName());
-              }
-           if (Timer && !Timer->Matches()) {
-              // stop recording:
-              DvbApi.StopRecord();
-              // release timer:
-              Timer->SetRecording(false);
-              // clear single event timer:
-              if (Timer->IsSingleEvent()) {
-                 DELETENULL(Menu); // must make sure no menu uses it
-                 isyslog(LOG_INFO, "deleting timer %d", Timer->Index() + 1);
-                 Timers.Del(Timer);
-                 Timers.Save();
+        // Timers and Recordings:
+        if (!Menu) {
+           cTimer *Timer = cTimer::GetMatch();
+           if (Timer) {
+              if (!cRecordControls::Start(Timer)) {
+                 //TODO need to do something to prevent the timer from hitting over and over again...
                  }
-              Timer = NULL;
               }
+           cRecordControls::Process();
            }
         // User Input:
-        eKeys key = Interface.GetKey(!ReplayDisplay);
-        if (Menu) {
-           switch (Menu->ProcessKey(key)) {
-             default: if (key != kMenu)
-                         break;
+        cOsdBase **Interact = Menu ? (cOsdBase **)&Menu : (cOsdBase **)&ReplayControl;
+        eKeys key = Interface.GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
+        if (*Interact) {
+           switch ((*Interact)->ProcessKey(key)) {
+             case osMenu:   DELETENULL(Menu);
+                            Menu = new cMenuMain(ReplayControl);
+                            break;
+             case osRecord: DELETENULL(Menu);
+                            if (!cRecordControls::Start())
+                               Interface.Error("No free DVB device to record!");
+                            break;
+             case osReplay: DELETENULL(Menu);
+                            DELETENULL(ReplayControl);
+                            ReplayControl = new cReplayControl;
+                            break;
+             case osStopReplay:
+                            DELETENULL(*Interact);
+                            DELETENULL(ReplayControl);
+                            break;
              case osBack:
-             case osEnd: DELETENULL(Menu);
-                         break;
+             case osEnd:    DELETENULL(*Interact);
+                            break;
+             default:       ;
              }
            }
-        else if (!ReplayDisplay || (key = ReplayDisplay->ProcessKey(key)) != kNone) {
+        else {
            switch (key) {
              // Direct Channel Select (input):
              case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
-             {
-               if (!(DvbApi.Recording() || DvbApi.Replaying())) {
-                  dcNumber = dcNumber * 10 + key - k0;
-                  dcTime = time_ms();
+                  {
+                    if (!Interface.Recording()) {
+                       dcNumber = dcNumber * 10 + key - k0;
+                       dcTime = time_ms();
+                       Interface.DisplayChannel(dcNumber);
+                       }
                   }
-             }
-             // Record/Replay Control:
-             case kBegin:         DvbApi.Skip(-INT_MAX); break;
-             case kRecord:        if (!(DvbApi.Recording() || DvbApi.Replaying())) {
-                                     cTimer *timer = new cTimer(true);
-                                     Timers.Add(timer);
-                                     Timers.Save();
-                                     }
-                                  break;
-             case kPause:         DvbApi.PauseReplay(); break;
-             case kStop:          DELETENULL(ReplayDisplay);
-                                  DvbApi.StopReplay();
-                                  break;
-             case kSearchBack:    DvbApi.FastRewind(); break;
-             case kSearchForward: DvbApi.FastForward(); break;
-             case kSkipBack:      DvbApi.Skip(-60); break;
-             case kSkipForward:   DvbApi.Skip(60); break;
-             // Menu Control:
-             case kMenu: DELETENULL(ReplayDisplay);
-                         Menu = new cMenuMain;
-                         Menu->Display();
-                         break;
+                  break;
              // Up/Down Channel Select:
              case kUp:
-             case kDown: if (!(DvbApi.Recording() || DvbApi.Replaying())) {
+             case kDown: if (!Interface.Recording()) {
                             int n = CurrentChannel + (key == kUp ? 1 : -1);
                             cChannel *channel = Channels.Get(n);
                             if (channel)
                                channel->Switch();
                             }
                          break;
+             // Menu Control:
+             case kMenu: Menu = new cMenuMain(ReplayControl); break;
              // Viewing Control:
-             case kOk:   if (ReplayDisplay)
-                            DELETENULL(ReplayDisplay);
-                         else if (DvbApi.Replaying())
-                            ReplayDisplay = new cReplayDisplay;
-                         else
-                            LastChannel = -1; break; // forces channel display
+             case kOk:   LastChannel = -1; break; // forces channel display
              default:    break;
              }
            }
         }
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
-  DvbApi.StopRecord();
-  DvbApi.StopReplay();
+  delete Menu;
+  delete ReplayControl;
+  cDvbApi::Cleanup();
   isyslog(LOG_INFO, "exiting");
   closelog();
   return 0;

From 3b78ec8374aac8daa560fa0cd06260fca6eb1500 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 15 Jul 2000 18:00:00 +0200
Subject: [PATCH 006/307] Version 0.06 - Added support for LIRC remote control
 (thanks to Carsten Koch!).   There are now three different remote control
 modes: KBD (PC-Keyboard), RCU   and LIRC. See the INSTALL file for
 information on how to enable either of   these modes. The default mode is now
 KBD, not RCU as before (to make it   work immediately even if there is no
 actual remote control).

---
 CONTRIBUTORS  |   5 +
 HISTORY       |   9 ++
 INSTALL       |  30 ++++--
 Makefile      |   8 +-
 channels.conf |   6 +-
 config.c      |  13 ++-
 config.h      |   3 +-
 dvbapi.c      |   6 +-
 dvbapi.h      |   4 +-
 interface.c   |  28 ++----
 remote.c      | 250 +++++++++++++++++++++++++++++++++++++++-----------
 remote.h      |  85 +++++++++++++----
 timers.conf   |  14 +--
 tools.c       |  21 +++--
 tools.h       |   4 +-
 vdr.c         |   6 +-
 16 files changed, 360 insertions(+), 132 deletions(-)
 create mode 100644 CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 000000000..fbf6e8676
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1,5 @@
+Thanks go to the following people for patches and contributions:
+
+Carsten Koch <Carsten.Koch@icem.de>
+ for adding LIRC support
+
diff --git a/HISTORY b/HISTORY
index 9767c3fe7..40150c684 100644
--- a/HISTORY
+++ b/HISTORY
@@ -55,3 +55,12 @@ Video Disk Recorder Revision History
 - Reduced the number of remote control keys. Modified the key assignments for
   the PC keyboard to better resemble the "up-down-left-right-ok" layout on
   menu controlling remote control units.
+
+2000-07-15: Version 0.06
+
+- Added support for LIRC remote control (thanks to Carsten Koch!).
+  There are now three different remote control modes: KBD (PC-Keyboard), RCU
+  and LIRC. See the INSTALL file for information on how to enable either of
+  these modes. The default mode is now KBD, not RCU as before (to make it
+  work immediately even if there is no actual remote control).
+
diff --git a/INSTALL b/INSTALL
index bc619d7ca..1a6442d9f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,10 +20,16 @@ and type 'make'. This should produce an executable file
 named 'vdr', which can be run after the DVB driver has been
 installed.
 
-There are two macros you can use to customize the 'vdr' program
-at compile time. Adding "DEBUG_REMOTE=1" to the 'make' call 
-will use the PC's keyboard as input device instead of the "Remote
-Control Unit" (see http://www.cadsoft.de/people/kls/vdr/remote.htm).
+The 'vdr' program can be controlled via the PC keyboard or
+an infrared remote control unit. Define the REMOTE macro to one of the
+following values 'make' call to activate the respective control mode:
+
+  REMOTE=KBD    control via the PC keyboard (default)
+  REMOTE=RCU    control via the "Remote Control Unit" receiver
+                (see http://www.cadsoft.de/people/kls/vdr/remote.htm)
+  REMOTE=LIRC   control via the "Linux Infrared Remote Control"
+                (see http://fsinfo.cs.uni-sb.de/~columbus/lirc)
+
 Adding "DEBUG_OSD=1" will use the PC screen (or current window)
 to display texts instead of the DVB card's on-screen display
 interface. These modes are useful when testing new menus if you
@@ -65,7 +71,7 @@ Learning the remote control keys:
 ---------------------------------
 
 There is no default 'keys.conf' file, so if you compile the program
-without 'DEBUG_REMOTE=1' you will have to go through a "teach-in"
+with 'REMOTE=RCU' you will have to go through a "teach-in"
 session that allows the program to learn your remote control codes.
 It will first attempt to determine the basic data transfer mode and
 timing of your remote control unit, and then will ask you to press one
@@ -76,9 +82,9 @@ you define, the more you will be able to navigate through the menus and
 control recording/replaying. The program uses only a very small number
 of keys which have multiple meanings in the various modes (see MANUAL
 for a detailed description).
-If the program has been built with "DEBUG_REMOTE=1", it will use the
+If the program has been built with "REMOTE=KBD", it will use the
 key configuration file 'keys-pc.conf', so that you won't loose data
-when switching between normal and debug mode.
+when switching between remote control and keyboard mode.
 
 The default PC key assignments are:
 
@@ -89,6 +95,12 @@ The default PC key assignments are:
   Red, Green, Yellow, Blue  'F1'..'F4'
   0..9                      '0'..'9' in top row
 
-If you prefer different key assignments, simply delete the file
-'keys-pc.conf' and restart 'vdr' to get into learning mode.
+If you prefer different key assignments, or if the default doesn't work for
+your keyboard, simply delete the file 'keys-pc.conf' and restart 'vdr' to get
+into learning mode.
+
+If the program has been compiled with 'REMOTE=LIRC', no 'keys.conf' file
+will be used. Instead, the key names as listed in the source file 'config.c'
+must be used when setting up LIRC. See http://www2.arnes.si/~mthale1 for
+more about LIRC.
 
diff --git a/Makefile b/Makefile
index 0ed17ca76..cfa7ef7f5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,16 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.3 2000/04/24 09:44:10 kls Exp $
+# $Id: Makefile 1.4 2000/06/24 15:09:30 kls Exp $
 
 OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o vdr.o
 
-ifdef DEBUG_REMOTE
-DEFINES += -DDEBUG_REMOTE
+ifndef REMOTE
+REMOTE = KBD
 endif
 
+DEFINES += -DREMOTE_$(REMOTE)
+
 ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 endif
diff --git a/channels.conf b/channels.conf
index 5edd778ef..d59b83bb5 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,5 +1,5 @@
 RTL:12188:h:1:27500:163:104:0:0
-Sat.1:12552:v:1:22000:163:104:0:0
+Sat.1:12480:v:1:27500:1791:1792:0:0
 Pro-7:12480:v:1:27500:255:256:0:0
 RTL2:12188:h:1:27500:166:128:0:0
 ARD:11837:h:1:27500:101:102:0:0
@@ -41,8 +41,8 @@ ORB:12722:h:1:22000:501:502:0:0
 B1:12722:h:1:22000:601:602:0:0
 ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
 Premiere World Promo:11798:h:1:27500:255:256:0:0
-Premiere:11798:h:1:27500:511:512:1:10
-Star Kino:11798:h:1:27500:767:768:1:9
+Premiere:11798:h:1:27500:511:512:2:10
+Star Kino:11798:h:1:27500:767:768:2:9
 Cine Action:11798:h:1:27500:1023:1024:1:20
 Cine Comedy:11798:h:1:27500:1279:1280:1:29
 Sci Fantasy:11798:h:1:27500:1535:1536:1:41
diff --git a/config.c b/config.c
index 7e02c9169..ca43ff07f 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.7 2000/05/27 14:44:15 kls Exp $
+ * $Id: config.c 1.8 2000/06/24 13:43:14 kls Exp $
  */
 
 #include "config.h"
@@ -146,6 +146,17 @@ eKeys cKeys::Get(unsigned int Code)
   return kNone;
 }
 
+unsigned int cKeys::Encode(const char *Command)
+{  
+  if (Command != NULL) {
+     const tKey *k = keys;
+     while ((k->type != kNone) && strncmp(k->name, Command, strlen(k->name)) != 0) //XXX why 'strncmp()'???
+           k++;
+     return k->code;
+     }
+  return 0;
+}
+
 void cKeys::Set(eKeys Key, unsigned int Code)
 {
   for (tKey *k = keys; k->type != kNone; k++) {
diff --git a/config.h b/config.h
index 1e22b8883..22099b900 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.6 2000/05/27 14:43:46 kls Exp $
+ * $Id: config.h 1.7 2000/06/24 13:42:32 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -52,6 +52,7 @@ class cKeys {
   void Clear(void);
   bool Load(char *FileName = NULL);
   bool Save(void);
+  unsigned int Encode(const char *Command);
   eKeys Get(unsigned int Code);
   void Set(eKeys Key, unsigned int Code);
   };
diff --git a/dvbapi.c b/dvbapi.c
index e652d9971..58b2d74f1 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.10 2000/05/27 14:07:17 kls Exp $
+ * $Id: dvbapi.c 1.11 2000/06/24 14:03:19 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -1054,7 +1054,7 @@ cDvbApi::cDvbApi(const char *FileName)
   if (videoDev < 0)
      LOG_ERROR;
   cols = rows = 0;
-#if defined(DEBUG_OSD) || defined(DEBUG_REMOTE)
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   initscr();
   keypad(stdscr, TRUE);
   nonl();
@@ -1080,7 +1080,7 @@ cDvbApi::~cDvbApi()
      StopRecord();
      close(videoDev);
      }
-#if defined(DEBUG_REMOTE) || defined(DEBUG_OSD)
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   endwin();
 #endif
   delete replayTitle;
diff --git a/dvbapi.h b/dvbapi.h
index e0c74b075..a43ba0ee7 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.10 2000/05/20 14:50:43 kls Exp $
+ * $Id: dvbapi.h 1.11 2000/06/24 14:03:57 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -15,7 +15,7 @@ typedef unsigned int __u32;
 typedef unsigned short __u16;
 typedef unsigned char __u8;
 
-#if defined(DEBUG_OSD) || defined(DEBUG_REMOTE)
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
 #include <ncurses.h>
 #endif
 #include <stdio.h>
diff --git a/interface.c b/interface.c
index 82f955dc7..244488aa7 100644
--- a/interface.c
+++ b/interface.c
@@ -4,15 +4,19 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.9 2000/05/07 09:28:39 kls Exp $
+ * $Id: interface.c 1.10 2000/07/15 12:39:20 kls Exp $
  */
 
 #include "interface.h"
 #include <unistd.h>
 #include "remote.h"
 
-#ifndef DEBUG_REMOTE
-cRcIo RcIo("/dev/ttyS1");
+#if defined(REMOTE_RCU)
+cRcIoRCU RcIo("/dev/ttyS1");
+#elif defined(REMOTE_LIRC)
+cRcIoLIRC RcIo("/dev/lircd");
+#else
+cRcIoKBD RcIo;
 #endif
 
 cInterface Interface;
@@ -26,9 +30,7 @@ cInterface::cInterface(void)
 
 void cInterface::Init(void)
 {
-#ifndef DEBUG_REMOTE
   RcIo.SetCode(Keys.code, Keys.address);
-#endif
 }
 
 void cInterface::Open(int NumCols, int NumLines)
@@ -47,21 +49,15 @@ void cInterface::Close(void)
 
 unsigned int cInterface::GetCh(bool Wait)
 {
-#ifdef DEBUG_REMOTE
-  timeout(Wait ? 1000 :10);
-  int c = getch();
-  return (c > 0) ? c : 0;
-#else
 #ifdef DEBUG_OSD
   timeout(0);
   getch(); // just to make 'ncurses' display the window:
 #endif
-  if (Wait || RcIo.InputAvailable()) {
+  if (RcIo.InputAvailable(Wait)) {
      unsigned int Command;
      return RcIo.GetCommand(&Command, NULL) ? Command : 0;
      }
   return 0;
-#endif
 }
 
 eKeys cInterface::GetKey(bool Wait)
@@ -215,12 +211,12 @@ void cInterface::QueryKeys(void)
   WriteText(1, 1, "Learning Remote Control Keys");
   WriteText(1, 3, "Phase 1: Detecting RC code type");
   WriteText(1, 5, "Press any key on the RC unit");
-#ifndef DEBUG_REMOTE
+#ifndef REMOTE_KBD
   unsigned char Code = 0;
   unsigned short Address;
 #endif
   for (;;) {
-#ifdef DEBUG_REMOTE
+#ifdef REMOTE_KBD
       if (GetCh())
          break;
 #else
@@ -318,9 +314,7 @@ void cInterface::LearnKeys(void)
 
 void cInterface::DisplayChannel(int Number, const char *Name)
 {
-#ifndef DEBUG_REMOTE
   RcIo.Number(Number);
-#endif
   if (Name && !Recording()) {
      Open(MenuColumns, 1);
      char buffer[MenuColumns + 1];
@@ -338,9 +332,7 @@ void cInterface::DisplayChannel(int Number, const char *Name)
 
 void cInterface::DisplayRecording(int Index, bool On)
 {
-#ifndef DEBUG_REMOTE
   RcIo.SetPoints(1 << Index, On);
-#endif
 }
 
 bool cInterface::Recording(void)
diff --git a/remote.c b/remote.c
index eb495e15e..e3786c5c4 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,9 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.7 2000/05/07 09:28:18 kls Exp $
+ * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
+ *
+ * $Id: remote.c 1.9 2000/07/15 12:19:50 kls Exp $
  */
 
 #include "remote.h"
@@ -15,20 +17,82 @@
 #include <sys/time.h>
 #include <termios.h>
 #include <unistd.h>
+
+#if defined REMOTE_LIRC
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#endif
+
+#include "config.h"
 #include "tools.h"
 
 #define REPEATLIMIT 100 // ms
 #define REPEATDELAY 250 // ms
 
-cRcIo::cRcIo(char *DeviceName)
+// --- cRcIoBase -------------------------------------------------------------
+
+cRcIoBase::cRcIoBase(void)
+{
+  t = 0;
+  firstTime = lastTime = 0;
+  lastCommand = 0;
+}
+
+cRcIoBase::~cRcIoBase()
+{
+}
+
+// --- cRcIoKBD --------------------------------------------------------------
+
+#if defined REMOTE_KBD
+
+cRcIoKBD::cRcIoKBD(void)
+{
+}
+
+cRcIoKBD::~cRcIoKBD()
+{
+}
+
+void cRcIoKBD::Flush(int WaitSeconds)
+{
+  time_t t0 = time(NULL);
+
+  timeout(10);
+  for (;;) {
+      while (getch() > 0)
+            t0 = time(NULL);
+      if (time(NULL) - t0 >= WaitSeconds)
+         break;
+      }
+}
+
+bool cRcIoKBD::InputAvailable(bool Wait)
+{
+  timeout(Wait ? 1000 : 10);
+  return true;//XXX
+}
+
+bool cRcIoKBD::GetCommand(unsigned int *Command, unsigned short *)
+{
+  if (Command) {
+     *Command = getch();
+     return *Command > 0;
+     }
+  return false;
+}
+
+// --- cRcIoRCU --------------------------------------------------------------
+
+#elif defined REMOTE_RCU
+
+cRcIoRCU::cRcIoRCU(char *DeviceName)
 {
   dp = 0;
   mode = modeB;
   code = 0;
   address = 0xFFFF;
-  t = 0;
-  firstTime = lastTime = 0;
-  lastCommand = 0;
   lastNumber = 0;
   if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
      struct termios t;
@@ -46,59 +110,50 @@ cRcIo::cRcIo(char *DeviceName)
   f = -1;
 }
 
-cRcIo::~cRcIo()
+cRcIoRCU::~cRcIoRCU()
 {
   if (f >= 0)
      close(f);
 }
 
-bool cRcIo::InputAvailable(bool Wait)
-{
-  if (f >= 0) {
-     fd_set set;
-     struct timeval timeout;
-     timeout.tv_sec = Wait ? 1 : 0;
-     timeout.tv_usec = Wait ? 0 : 10000;
-     FD_ZERO(&set);
-     FD_SET(f, &set);
-     if (select(FD_SETSIZE, &set, NULL, NULL, &timeout)  > 0)
-        return FD_ISSET(f, &set);
-     }
-  return false;
-}
-
-int cRcIo::ReceiveByte(bool Wait)
+int cRcIoRCU::ReceiveByte(bool Wait)
 {
   // Returns the byte if one was received within a timeout, -1 otherwise
   if (InputAvailable(Wait)) {
      unsigned char b;
      if (read(f, &b, 1) == 1)
         return b;
+     else
+        LOG_ERROR;
      }
   return -1;
 }
 
-bool cRcIo::SendByteHandshake(unsigned char c)
+bool cRcIoRCU::SendByteHandshake(unsigned char c)
 {
-  if (f >= 0 && write(f, &c, 1) == 1) {
-     for (int reply = ReceiveByte(); reply >= 0;) {
-         if (reply == c)
-            return true;
-         else if (reply == 'X') {
-            // skip any incoming RC code - it will come again
-            for (int i = 6; i--;) {
-                if (ReceiveByte(false) < 0)
-                   return false;
-                }
+  if (f >= 0) {
+     int w = write(f, &c, 1);
+     if (w == 1) {
+        for (int reply = ReceiveByte(); reply >= 0;) {
+            if (reply == c)
+               return true;
+            else if (reply == 'X') {
+               // skip any incoming RC code - it will come again
+               for (int i = 6; i--;) {
+                   if (ReceiveByte(false) < 0)
+                      return false;
+                   }
+               }
+            else
+               return false;
             }
-         else
-            return false;
-         }
+        }
+     LOG_ERROR;
      }
   return false;
 }
 
-bool cRcIo::SendByte(unsigned char c)
+bool cRcIoRCU::SendByte(unsigned char c)
 {
   for (int retry = 5; retry--;) {
       if (SendByteHandshake(c))
@@ -107,7 +162,20 @@ bool cRcIo::SendByte(unsigned char c)
   return false;
 }
 
-void cRcIo::Flush(int WaitSeconds)
+bool cRcIoRCU::SetCode(unsigned char Code, unsigned short Address)
+{
+  code = Code;
+  address = Address;
+  return SendCommand(code);
+}
+
+bool cRcIoRCU::SetMode(unsigned char Mode)
+{
+  mode = Mode;
+  return SendCommand(mode);
+}
+
+void cRcIoRCU::Flush(int WaitSeconds)
 {
   time_t t0 = time(NULL);
 
@@ -119,20 +187,12 @@ void cRcIo::Flush(int WaitSeconds)
       }
 }
 
-bool cRcIo::SetCode(unsigned char Code, unsigned short Address)
+bool cRcIoRCU::InputAvailable(bool Wait)
 {
-  code = Code;
-  address = Address;
-  return SendCommand(code);
+  return DataAvailable(f, Wait);
 }
 
-bool cRcIo::SetMode(unsigned char Mode)
-{
-  mode = Mode;
-  return SendCommand(mode);
-}
-
-bool cRcIo::GetCommand(unsigned int *Command, unsigned short *Address)
+bool cRcIoRCU::GetCommand(unsigned int *Command, unsigned short *Address)
 {
 #pragma pack(1)
   union {
@@ -185,17 +245,17 @@ bool cRcIo::GetCommand(unsigned int *Command, unsigned short *Address)
   return false;
 }
 
-bool cRcIo::SendCommand(unsigned char Cmd)
+bool cRcIoRCU::SendCommand(unsigned char Cmd)
 { 
   return SendByte(Cmd | 0x80);
 }
 
-bool cRcIo::Digit(int n, int v)
+bool cRcIoRCU::Digit(int n, int v)
 { 
   return SendByte(((n & 0x03) << 5) | (v & 0x0F) | (((dp >> n) & 0x01) << 4));
 }
 
-bool cRcIo::Number(int n, bool Hex)
+bool cRcIoRCU::Number(int n, bool Hex)
 {
   if (!Hex) {
      char buf[8];
@@ -216,7 +276,7 @@ bool cRcIo::Number(int n, bool Hex)
   return SendCommand(mode);
 }
 
-bool cRcIo::String(char *s)
+bool cRcIoRCU::String(char *s)
 {
   const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
   int n = 0;
@@ -233,7 +293,7 @@ bool cRcIo::String(char *s)
   return Number(n, true);
 }
 
-void cRcIo::SetPoints(unsigned char Dp, bool On)
+void cRcIoRCU::SetPoints(unsigned char Dp, bool On)
 { 
   if (On)
      dp |= Dp;
@@ -242,7 +302,7 @@ void cRcIo::SetPoints(unsigned char Dp, bool On)
   Number(lastNumber, true);
 }
 
-bool cRcIo::DetectCode(unsigned char *Code, unsigned short *Address)
+bool cRcIoRCU::DetectCode(unsigned char *Code, unsigned short *Address)
 {
   // Caller should initialize 'Code' to 0 and call DetectCode()
   // until it returns true. Whenever DetectCode() returns false
@@ -276,3 +336,83 @@ bool cRcIo::DetectCode(unsigned char *Code, unsigned short *Address)
   return false;
 }
 
+// --- cRcIoLIRC -------------------------------------------------------------
+
+#elif defined REMOTE_LIRC
+
+cRcIoLIRC::cRcIoLIRC(char *DeviceName)
+{
+  struct sockaddr_un addr;
+  addr.sun_family = AF_UNIX;
+  strcpy(addr.sun_path, DeviceName);
+  f = socket(AF_UNIX, SOCK_STREAM, 0);
+  if (f >= 0) {
+     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0)
+        return;
+     LOG_ERROR_STR(DeviceName);
+     close(f);
+     }
+  else
+     LOG_ERROR_STR(DeviceName);
+  f = -1;
+}
+
+cRcIoLIRC::~cRcIoLIRC()
+{
+  if (f >= 0)
+     close(f);
+}
+
+const char *cRcIoLIRC::ReceiveString(void)
+{
+  while (InputAvailable(true)) {
+        if (read(f, buf, sizeof(buf)) > 21) {
+           const int repeat = 10 * (buf[17] - '0') + (buf[18] - '0');
+           const int now = time_ms();
+           if (repeat == 0) {
+              firstTime = lastTime = now;
+              return buf + 20;
+              }
+           else if ((now > firstTime + REPEATDELAY) && (now > lastTime + REPEATLIMIT)) {
+              lastTime = now;
+              return buf + 20;
+              }
+           }
+        }
+  return NULL;
+}
+
+void cRcIoLIRC::Flush(int WaitSeconds)
+{
+  time_t t0 = time(NULL);
+
+  for (;;) {
+      while (InputAvailable(false)) {
+            read(f, buf, sizeof(buf));
+            t0 = time(NULL);
+            }
+      if (time(NULL) - t0 >= WaitSeconds)
+         break;
+      }
+}
+
+bool cRcIoLIRC::InputAvailable(bool Wait)
+{
+  return DataAvailable(f, Wait);
+}
+
+bool cRcIoLIRC::GetCommand(unsigned int *Command, unsigned short *)
+{
+  Flush();
+  if (Command) {
+     const char *cmd = ReceiveString();
+     if (cmd) {
+        *Command = Keys.Encode(cmd);
+        return true;
+        }
+     }
+  return false;
+}
+
+#endif
+
diff --git a/remote.h b/remote.h
index 1d0a1cce0..38961b9ca 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.5 2000/05/07 09:27:54 kls Exp $
+ * $Id: remote.h 1.6 2000/06/24 15:52:56 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -13,14 +13,44 @@
 #include <stdio.h>
 #include <time.h>
 
-class cRcIo {
+class cRcIoBase {
+protected:
+  time_t t;
+  int firstTime, lastTime;
+  unsigned int lastCommand;
+  cRcIoBase(void);
+  virtual ~cRcIoBase();
+public:
+  enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  virtual bool SetCode(unsigned char Code, unsigned short Address) { return true; }
+  virtual bool SetMode(unsigned char Mode) { return true; }
+  virtual bool Number(int n, bool Hex = false) { return true; }
+  virtual void SetPoints(unsigned char Dp, bool On) {}
+  virtual bool String(char *s) { return true; }
+  virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
+  virtual void Flush(int WaitSeconds = 0) {}
+  virtual bool InputAvailable(bool Wait = false) = 0;
+  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL) = 0;
+  };
+
+#if defined REMOTE_KBD
+
+class cRcIoKBD : public cRcIoBase {
+public:
+  cRcIoKBD(void);
+  virtual ~cRcIoKBD();
+  virtual void Flush(int WaitSeconds = 0);
+  virtual bool InputAvailable(bool Wait = false);
+  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
+  };
+
+#elif defined REMOTE_RCU
+
+class cRcIoRCU : public cRcIoBase {
 private:
   int f;
   unsigned char dp, code, mode;
   unsigned short address;
-  time_t t;
-  int firstTime, lastTime;
-  unsigned int lastCommand;
   int lastNumber;
   bool SendCommand(unsigned char Cmd);
   int ReceiveByte(bool Wait = true);
@@ -28,18 +58,39 @@ class cRcIo {
   bool SendByte(unsigned char c);
   bool Digit(int n, int v);
 public:
-  enum { modeH = 'h', modeB = 'b', modeS = 's' };
-  cRcIo(char *DeviceName);
-  ~cRcIo();
-  bool InputAvailable(bool Wait = false);
-  void Flush(int WaitSeconds = 0);
-  bool SetCode(unsigned char Code, unsigned short Address);
-  bool SetMode(unsigned char Mode);
-  bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
-  bool Number(int n, bool Hex = false);
-  void SetPoints(unsigned char Dp, bool On);
-  bool String(char *s);
-  bool DetectCode(unsigned char *Code, unsigned short *Address);
+  cRcIoRCU(char *DeviceName);
+  virtual ~cRcIoRCU();
+  virtual bool SetCode(unsigned char Code, unsigned short Address);
+  virtual bool SetMode(unsigned char Mode);
+  virtual bool Number(int n, bool Hex = false);
+  virtual void SetPoints(unsigned char Dp, bool On);
+  virtual bool String(char *s);
+  virtual bool DetectCode(unsigned char *Code, unsigned short *Address);
+  virtual void Flush(int WaitSeconds = 0);
+  virtual bool InputAvailable(bool Wait = false);
+  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
+  };
+
+#elif defined REMOTE_LIRC
+
+class cRcIoLIRC : public cRcIoBase {
+private:
+  enum { LIRC_BUFFER_SIZE = 128 };
+  int f;
+  char buf[LIRC_BUFFER_SIZE];
+  const char *ReceiveString(void);
+public:
+  cRcIoLIRC(char *DeviceName);
+  virtual ~cRcIoLIRC();
+  virtual void Flush(int WaitSeconds = 0);
+  virtual bool InputAvailable(bool Wait = false);
+  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
   };
 
+#else
+
+#error Please define a remote control mode!
+
+#endif
+
 #endif //__REMOTE_H
diff --git a/timers.conf b/timers.conf
index 1f9fae0be..a5dcb9a03 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,10 +1,10 @@
 1:15:MTWTF--:1828:1901:10:5:nano
-1:3:M------:2110:2230:99:10:SevenDays
 1:10:-T-----:2058:2202:99:10:Quarks
-1:3:---T---:2158:2300:99:10:Switch
-1:1:----F--:2210:2325:99:10:7Tage7Koepfe
+1:5:-T-----:2100:2205:99:10:RudisSuchmaschine
+0:3:---T---:2211:2300:99:10:Switch
 1:15:-----S-:1358:1435:99:7:Neues
-1:1:-----S-:1445:1600:99:10:Hammerman
-1:2:-----S-:2150:2320:99:10:Wochenshow
-1:14:------S:2155:2245:99:10:AprilHailer
-1:2:--W----:2110:2325:99:99:BulleVonToelz
+1:1:-----S-:1445:1600:99:30:Hammerman
+1:2:-----S-:2200:2350:99:30:Wochenshow
+1:11:------S:2058:2120:99:10:Centauri
+1:14:20:1920:2035:99:30:SamtUndSeide
+1:10:---T---:2158:2250:99:99:DiePlaneten
diff --git a/tools.c b/tools.c
index eb0a14a4f..c0eb2ec57 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.7 2000/04/24 15:01:35 kls Exp $
+ * $Id: tools.c 1.8 2000/06/24 15:26:15 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -22,15 +22,18 @@
 
 int SysLogLevel = 3;
 
-bool DataAvailable(int filedes)
+bool DataAvailable(int filedes, bool wait)
 {
-  fd_set set;
-  FD_ZERO(&set);
-  FD_SET(filedes, &set);
-  struct timeval timeout;
-  timeout.tv_sec = 0;
-  timeout.tv_usec = 10000;
-  return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(filedes, &set);
+  if (filedes >= 0) {
+     fd_set set;
+     FD_ZERO(&set);
+     FD_SET(filedes, &set);
+     struct timeval timeout;
+     timeout.tv_sec = wait ? 1 : 0;
+     timeout.tv_usec = wait ? 0 : 10000;
+     return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(filedes, &set);
+     }
+  return false;
 }
 
 void writechar(int filedes, char c)
diff --git a/tools.h b/tools.h
index 57b2065db..db55983fc 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.7 2000/04/24 15:01:49 kls Exp $
+ * $Id: tools.h 1.8 2000/06/24 15:25:00 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -30,7 +30,7 @@ extern int SysLogLevel;
 
 #define DELETENULL(p) (delete (p), p = NULL)
 
-bool DataAvailable(int filedes);
+bool DataAvailable(int filedes, bool wait = false);
 void writechar(int filedes, char c);
 void writeint(int filedes, int n);
 char readchar(int filedes);
diff --git a/vdr.c b/vdr.c
index bcda47114..4c1dce0ac 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.19 2000/05/27 15:38:35 kls Exp $
+ * $Id: vdr.c 1.20 2000/07/15 11:45:05 kls Exp $
  */
 
 #include <signal.h>
@@ -33,7 +33,7 @@
 #include "recording.h"
 #include "tools.h"
 
-#ifdef DEBUG_REMOTE
+#ifdef REMOTE_KBD
 #define KEYS_CONF "keys-pc.conf"
 #else
 #define KEYS_CONF "keys.conf"
@@ -58,8 +58,10 @@ int main(int argc, char *argv[])
 
   Channels.Load("channels.conf");
   Timers.Load("timers.conf");
+#ifndef REMOTE_LIRC
   if (!Keys.Load(KEYS_CONF))
      Interface.LearnKeys();
+#endif
   Interface.Init();
 
   cChannel::SwitchTo(CurrentChannel);

From 1d22145c423f2524c7766b4ae30ee2c26174113d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Tue, 25 Jul 2000 18:00:00 +0200
Subject: [PATCH 007/307] Version 0.6 - Added support for LIRC remote control
 (thanks to Carsten Koch!).   There are now three different remote control
 modes: KBD (PC-Keyboard), RCU   and LIRC. See the INSTALL file for
 information on how to enable either of   these modes. The default mode is now
 KBD, not RCU as before (to make it   work immediately even if there is no
 actual remote control). - Fixed small bug in dvbapi.c that was causing some
 channels (many on hotbird)   not to be correctly tuned (thanks to Plamen
 Ganev!). - Now clearing the replay buffer in search forward/back, which
 results in   faster reaction. - The 'Recordings' menu is now listed
 alphabetically (thanks to Carsten Koch!). - The new 'epg2timers' tool (thanks
 to Carsten Koch!) can be used to convert   an EPG "merkliste" page
 (http://www.tvtv.de) to vdr timer entries. - The new 'xtvrc2vdr' tool (thanks
 to Plamen Ganev!) can be used to convert   'xtvrc' channel files into 'vdr'
 format. - When more than one timer matches at the same time, the first one in
 the list   with the highest 'Priority' is selected. - The MANUAL section on
 "Programming the Timer" has been filled in. - The year in the "Recordings"
 menu as well as in the progress display during   replay has been reduced to 2
 digits to allow more space for the recording's   title. In the internal file
 structure the year is still stored with 4 digits,   so there will be no
 problem at the next turn of the century ;-) - Channel names and timer
 filenames can now contain blanks. To avoid problems   with file names that
 contain blanks, all blanks in recording file names are   converted to
 underscores. - The polarization can now be given in uppercase or lowercase
 characters in   channels.conf. - Fixed buffer initialization to work with DVB
 driver version 0.6. - Implemented the "Simple Video Disk Recorder Protocol"
 (SVDRP) to control   the VDR over a network connection. - Implemented command
 line option handling. - The program can now run in full background mode by
 using the --daemon option. - Added a "summary" field to the timers (thanks to
 Carsten Koch!).   This field can contain a descriptive text of the programme
 and will be   displayed when the "Blue" key is pressed on a recording that
 was created by   this timer. If the text contains the special character '|',
 a newline will   be inserted at that place.  When pressing "Ok" on a timer
 that contains a   summary field, the summary will be displayed. To edit such
 a timer the "Red"   key must be pressed. Timers without a summary still go
 into Edit mode when   pressing "Ok".  The summary field can only be filled in
 directly by editing   the 'timers.conf' file with a text editor, or by
 defining/modifying the timer   via the SVDRP interface.

---
 BUGS                            |    6 -
 CONTRIBUTORS                    |    6 +
 HISTORY                         |   39 +-
 INSTALL                         |   11 +
 MANUAL                          |   47 +-
 Makefile                        |    9 +-
 TODO                            |    1 +
 Tools/epg2timers/epg2timers.cxx |  242 ++++++
 Tools/xtvrc2vdr/Makefile        |   16 +
 Tools/xtvrc2vdr/hotbird.conf    |  191 +++++
 Tools/xtvrc2vdr/xtvrc.hotbird   | 1337 +++++++++++++++++++++++++++++++
 Tools/xtvrc2vdr/xtvrc2vdr.c     |  146 ++++
 channels.conf                   |    5 +-
 config.c                        |  101 ++-
 config.h                        |   29 +-
 dvbapi.c                        |   25 +-
 menu.c                          |   92 ++-
 recording.c                     |   81 +-
 recording.h                     |    6 +-
 remote.c                        |   12 +-
 remote.h                        |    6 +-
 svdrp.c                         |  620 ++++++++++++++
 svdrp.h                         |   52 ++
 timers.conf                     |   19 +-
 tools.c                         |   52 +-
 tools.h                         |    6 +-
 vdr.c                           |   84 +-
 27 files changed, 3138 insertions(+), 103 deletions(-)
 create mode 100644 Tools/epg2timers/epg2timers.cxx
 create mode 100644 Tools/xtvrc2vdr/Makefile
 create mode 100644 Tools/xtvrc2vdr/hotbird.conf
 create mode 100644 Tools/xtvrc2vdr/xtvrc.hotbird
 create mode 100644 Tools/xtvrc2vdr/xtvrc2vdr.c
 create mode 100644 svdrp.c
 create mode 100644 svdrp.h

diff --git a/BUGS b/BUGS
index d9e2687bc..cd96197d8 100644
--- a/BUGS
+++ b/BUGS
@@ -4,9 +4,3 @@ Video Disk Recorder - Known Bugs
 * Sometimes the picture "jumps" as if a frame is skipped.
   Presumably this is a problem in the card driver or firmware?
 
-* When the on-screen display is activated during recording,
-  the video data stream gets corrupted, which results in a
-  distorted picture when replaying such a recording.
-  I assume this is a problem in the driver of firmware.
-  There is no such problem in replay mode.
-
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fbf6e8676..0e2794f08 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2,4 +2,10 @@ Thanks go to the following people for patches and contributions:
 
 Carsten Koch <Carsten.Koch@icem.de>
  for adding LIRC support
+ for making the 'Recordings' menu be listed alphabetically
+ for implementing the 'Summary' feature
+ for adding the 'epg2timers' tool (see Tools/epg2timers)
 
+Plamen Ganev <pganev@com-it.net>
+ for fixing the frequency offset for Hotbird channels
+ for adding the 'xtvrc2vdr' tool (see Tools/xtvrc2vdr)
diff --git a/HISTORY b/HISTORY
index 40150c684..765f4d1a3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -56,11 +56,46 @@ Video Disk Recorder Revision History
   the PC keyboard to better resemble the "up-down-left-right-ok" layout on
   menu controlling remote control units.
 
-2000-07-15: Version 0.06
+2000-07-25: Version 0.6
 
 - Added support for LIRC remote control (thanks to Carsten Koch!).
   There are now three different remote control modes: KBD (PC-Keyboard), RCU
   and LIRC. See the INSTALL file for information on how to enable either of
   these modes. The default mode is now KBD, not RCU as before (to make it
   work immediately even if there is no actual remote control).
-
+- Fixed small bug in dvbapi.c that was causing some channels (many on hotbird)
+  not to be correctly tuned (thanks to Plamen Ganev!).
+- Now clearing the replay buffer in search forward/back, which results in
+  faster reaction.
+- The 'Recordings' menu is now listed alphabetically (thanks to Carsten Koch!).
+- The new 'epg2timers' tool (thanks to Carsten Koch!) can be used to convert
+  an EPG "merkliste" page (http://www.tvtv.de) to vdr timer entries.
+- The new 'xtvrc2vdr' tool (thanks to Plamen Ganev!) can be used to convert
+  'xtvrc' channel files into 'vdr' format.
+- When more than one timer matches at the same time, the first one in the list
+  with the highest 'Priority' is selected.
+- The MANUAL section on "Programming the Timer" has been filled in.
+- The year in the "Recordings" menu as well as in the progress display during
+  replay has been reduced to 2 digits to allow more space for the recording's
+  title. In the internal file structure the year is still stored with 4 digits,
+  so there will be no problem at the next turn of the century ;-)
+- Channel names and timer filenames can now contain blanks. To avoid problems
+  with file names that contain blanks, all blanks in recording file names are
+  converted to underscores.
+- The polarization can now be given in uppercase or lowercase characters in
+  channels.conf.
+- Fixed buffer initialization to work with DVB driver version 0.6.
+- Implemented the "Simple Video Disk Recorder Protocol" (SVDRP) to control
+  the VDR over a network connection.
+- Implemented command line option handling.
+- The program can now run in full background mode by using the --daemon option.
+- Added a "summary" field to the timers (thanks to Carsten Koch!).
+  This field can contain a descriptive text of the programme and will be
+  displayed when the "Blue" key is pressed on a recording that was created by
+  this timer. If the text contains the special character '|', a newline will
+  be inserted at that place.  When pressing "Ok" on a timer that contains a
+  summary field, the summary will be displayed. To edit such a timer the "Red"
+  key must be pressed. Timers without a summary still go into Edit mode when
+  pressing "Ok".  The summary field can only be filled in directly by editing
+  the 'timers.conf' file with a text editor, or by defining/modifying the timer
+  via the SVDRP interface.
diff --git a/INSTALL b/INSTALL
index 1a6442d9f..3261ef007 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,6 +40,17 @@ When running, the 'vdr' program writes status information into the
 system log file (/var/log/messages). You may want to watch these
 messages (tail -f /var/log/mesages) to see if there are any problems.
 
+The program can be controlled via a network connection to its SVDRP
+port ("Simple Video Disk Recorder Protocol"). By default, it listens
+on port 2001 (use the --port=PORT option to change this). For details
+about the SVDRP syntax see the source file 'svdrp.c'.
+
+If the program shall run as a daemon, use the --daemon option. This
+will completely detach it from the terminal and will continue as a
+background process.
+
+Use "vdr --help" for a list of available command line options.
+
 The video data directory:
 -------------------------
 
diff --git a/MANUAL b/MANUAL
index cea39466e..c9b71a377 100644
--- a/MANUAL
+++ b/MANUAL
@@ -41,7 +41,11 @@ Video Disk Recorder User's Manual
   by pressing the "Right" button (which puts brackets around the current
   character as in "[R]TL"), selecting the desired character position with
   "Left" and "Right", and changing the character with the "Up" and "Down"
-  keys. "Ok" then confirms the changes.
+  keys. "Ok" then confirms the changes. The special character '^' can be used
+  to "cut off" a string at this position. When this character is visible in the
+  brackets (as in abc[^]), the next press to the "Left" or "Ok" button will
+  actually cut off the string. Using "Up" and/or "Down" brings back the
+  original rest of the string (unless you have pressed "Left" or "Ok").
   
   The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
   in various menus and are listed at the bottom of the on-screen-display.
@@ -108,4 +112,43 @@ Video Disk Recorder User's Manual
 * Programming the Timer
 
   Use the "Timer" menu to maintain your list of timer controlled recordings.
-
+  The parameters in the "Edit Timer" menu have the following meanings:
+
+  Active:    Defines whether the timer will be processed (set it to 'no' to
+             temporarily desable a timer).
+  Channel:   The channel to be recorded (as defined in the "Channels" list).
+             Any changes made in the "Channels" list (like renaming or
+             reordering channels) will be automatically reflected in the
+             timers settings.
+  Day:       The day on which this timer shall start. This can be either a
+             "day of month" (1..31), which allows programming a "single shot"
+             timer that hits once and is deleted after it ends. Single shot
+             timers can be programmed up to one month into the future.
+             Another option here are "repeating timers" which are defined
+             by listing the days of the week on which they shall record.
+             For example, a timer that shall record every monday and wednesday
+             would have a Day setting of "M-W----".
+  Start:     The start time of the timer in hh:mm as 24 hour ("military") time.
+  Stop:      The stop time of the timer.
+  Priority:  The Priority (0..99) is used to decide which timer shall be
+             started in case there are two or more timers with the exact same
+             start time. The first timer in the list with the highest Priority
+             will be used. This value is also stored with the recording and is
+             later used to decide which recording to remove from disk in order
+             to free space for a new recording. If the disk is full and a new
+             recording needs more space, an existing recording with the lowest
+             Priority (and which has exceeded its guaranteed Lifetime) will be
+             removed.
+  Lifetime:  The number of days (0..99) a recording made through this timer is
+             guaranteed to remain on disk before it is automatically removed
+             to free up space for a new recording. Note that setting this
+             parameter to very high values for all recordings may soon fill up
+             the entire disk and cause new recordings to fail due to low disk
+             space.
+  File:      The name under which a recording created through this timer will
+             be stored on disk (the actual name will also contain the date and
+             time, so it is possible to have a "repeating timer" store all its
+             recordings under the same name; they will be distinguishable by
+             their date and time).
+             If this field is left blank, the channel name will be used to form
+             the name of the recording.
diff --git a/Makefile b/Makefile
index cfa7ef7f5..8fb678bcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 #
-# Makefile for the On Screen Menu of the Video Disk Recorder
+# Makefile for the Video Disk Recorder
 #
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.4 2000/06/24 15:09:30 kls Exp $
+# $Id: Makefile 1.5 2000/07/23 11:57:14 kls Exp $
 
-OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o tools.o vdr.o
+OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o
 
 ifndef REMOTE
 REMOTE = KBD
@@ -28,9 +28,10 @@ dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h
 interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
 menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
 osd.o      : osd.c config.h dvbapi.h interface.h osd.h tools.h
-vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
+vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h
 recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h
 remote.o   : remote.c remote.h tools.h
+svdrp.o    : svdrp.c svdrp.h config.h interface.h tools.h
 tools.o    : tools.c tools.h
 
 vdr: $(OBJS)
diff --git a/TODO b/TODO
index 64b31b23b..09e9a10bc 100644
--- a/TODO
+++ b/TODO
@@ -8,3 +8,4 @@ TODO list for the Video Disk Recorder project
   commercial breaks).
 * Implement channel scanning.
 * Better support for encrypted channels.
+* Implement remaining commands in SVDRP.
diff --git a/Tools/epg2timers/epg2timers.cxx b/Tools/epg2timers/epg2timers.cxx
new file mode 100644
index 000000000..4a8f33336
--- /dev/null
+++ b/Tools/epg2timers/epg2timers.cxx
@@ -0,0 +1,242 @@
+/*
+ * epg2timers.cxx: Convert an EPG "merkliste" page (http://www.tvtv.de) to a timers.conf 
+ *                 file for Klaus Schmidinger's vdr (http://www.cadsoft.de/people/kls/vdr).
+ *
+ * Copyright (C) 2000 Carsten Koch
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ * 
+ * The author can be reached at Carsten.Koch@icem.de
+ */
+ 
+ 
+#include <stdio.h>
+#include <string.h>
+
+
+static const char date_line[]       = "\t<td align=center valign=middle colspan=3><span id=fb-b10>";
+static const char start_time_line[] = " \t\t<td bgcolor=\"#7f98bf\" align=center><span id=\"fb-w14\"><nobr>&nbsp;";
+static const char stop_time_line[]  = "\t\t\t<tr><td bgcolor=\"#002b64\" align=center><span id=\"fn-w9\">bis ";
+static const char channel_line[]    = "\t\t\t<tr><td bgcolor=\"#002b64\" align=center><span id=\"fb-w9\">";
+static const char title_line[]      = "\t\t\t\t<td bgcolor=\"#002b64\" align=left width=100%><span id=\"fb-w10\">";
+static const char summary_line[]    = "\t\t\t<table border=0 cellpadding=10 cellspacing=0 bgcolor=\"white\" width=100%>";
+static const char * const channel_names[] =
+{"RTL", "SAT1", "PRO7", "RTL2", "ARD", "BR3", "HR3", "NDR", "SWF", "WDR", "BR Alpha", "SWR BW", "Phoenix",
+ "ZDF", "3sat", "Kinderkanal", "ARTE", "phoenix", "ORF Sat", "ZDF.info", "CNN", "Super RTL", "VOX", "DW TV",
+ "Kabel1", "TM3", "DSF", "HOT", "BloombergTV", "Sky News", "KinderNet", "Alice", "n-tv", "Grand Tour.", "TW1",
+ "Eins Extra", "Eins Festival", "Eins MuXx", "MDR", "ORB", "B1", "ARD Online-Kanal", "Premiere World Promo",
+ "Premiere", "Star Kino", "Cine Action", "Cine Comedy", "Sci Fantasy", "Romantic Movies", "Studio Universal",
+ "TV Niepokalanow", "Mosaico", "Andalucia TV", "TVC Internacional", "Nasza TV", "WishLine test", "Pro 7 Austria", 
+ "Kabel 1 Schweiz", "Kabel 1 Austria", "Pro 7 Schweiz", "Kiosque", "KTO", "TCM", "Cartoon Network France & Spain", 
+ "TVBS Europe", "TVBS Europe", "Travel", "TCM Espania", "MTV Spain", "TCM France", "RTL2 CH",
+ "La Cinquieme", "ARTE", "Post Filial TV", "Canal Canaris", "Canal Canaris", "Canal Canaris", "Canal Canaris",
+ "AB Sat Passion promo", "AB Channel 1", "Taquilla 0", "CSAT", "Mosaique", "Mosaique 2", "Mosaique 3", "Le Sesame C+", 
+ "FEED", "RTM 1", "ESC 1", "TV5 Europe", "TV7 Tunisia", "ARTE", "RAI Uno", "RTP International",
+ "Fashion TV", "VideoService", "Beta Research promo", "Canal Canarias", "TVC International", "Fitur", "Astra Info 1", 
+ "Astra Info 2", "Astra Vision 1", "Astra Vision 1", "Astra Vision 1", "Astra Vision 1", "Astra Vision 1", 
+ "Astra Vision 1", "Astra Vision 1", "RTL Tele Letzebuerg", "Astra Mosaic", "MHP test", "Bloomberg TV Spain", 
+ "Video Italia", "AC 3 promo", ""
+};
+static const int month_lengths[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+
+static const int max_channel =  sizeof(channel_names)/sizeof(char *);
+static const int max_title = 50;                // maximum length of title file name generated
+static const int max_line = 1024;               // line buffer (not used when parsing summary text)
+static const int max_summary = 5000;            // Summary can be up to 5000 bytes long
+static const int stop_time_safety_margin = 10;  // add 10 minutes to stop time in case start was delayed
+
+
+
+char map_special_char(const char * const word)
+      
+{
+   if (strcmp(word, "auml") == 0)
+      return '�';
+   else if (strcmp(word, "ouml") == 0)
+      return '�';
+   else if (strcmp(word, "uuml") == 0)
+      return '�';
+   else if (strcmp(word, "Auml") == 0)
+      return '�';
+   else if (strcmp(word, "Ouml") == 0)
+      return '�';
+   else if (strcmp(word, "Uuml") == 0)
+      return '�';
+   else if (strcmp(word, "szlig") == 0)
+      return '�';
+   return ' ';
+}
+
+
+
+
+
+void read_file_name(const char * const line, char * const file_name)
+      
+{
+   int line_index = sizeof(title_line) - 1;
+   int title_index = 0;
+   char ch = line[line_index++];
+   do
+   {
+      if (ch == '&')
+      {
+         char word[10];
+         int i = 0;
+         while ((line[line_index + i] != ';') && (i < 9))
+            word[i++] = line[line_index + i];
+         word[i] = 0;
+         ch = map_special_char(word);
+         line_index += i;
+      }
+      switch (ch)
+      {
+         case '�': file_name[title_index++] = 'a'; file_name[title_index++] = 'e'; break;
+         case '�': file_name[title_index++] = 'o'; file_name[title_index++] = 'e'; break;
+         case '�': file_name[title_index++] = 'u'; file_name[title_index++] = 'e'; break;
+         case '�': file_name[title_index++] = 'A'; file_name[title_index++] = 'e'; break;
+         case '�': file_name[title_index++] = 'O'; file_name[title_index++] = 'e'; break;
+         case '�': file_name[title_index++] = 'U'; file_name[title_index++] = 'e'; break;
+         case '�': file_name[title_index++] = 's'; file_name[title_index++] = 's'; break;
+         default:
+            if (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) || ((ch >= '0') && (ch <= '9')))
+               file_name[title_index++] = ch;
+      }
+      ch = int(line[line_index++]);
+   } while ((title_index < max_title-1) && (ch != '<') && (ch != 0) && (line_index < max_line-1));
+   file_name[title_index] = 0;
+}
+
+
+
+void read_summary(char * const summary)
+      
+{
+   int summary_index = 0;
+   int ch;
+   bool need_space = false;
+   bool done = false;
+   do
+   {
+      ch = getchar();
+      switch (ch)
+      {
+         case '&':
+         {
+            char word[10];
+            int i = 0;
+            ch = getchar();
+            while ((ch != ';') && (ch != EOF) && (i < 9)) 
+            {
+               word[i++] = ch;
+               ch = getchar();
+            }
+            word[i] = 0;
+            if (need_space) {summary[summary_index++] = ' '; need_space = false;}
+            summary[summary_index++] = map_special_char(word);
+         }
+         break;
+         case '<':
+         {
+            char word[6];
+            int word_index = 0;
+            do
+            {
+               ch = getchar();
+               word[word_index++] = ch;
+            } while ((word_index < 6) && (ch != '>') && (ch != EOF));
+            while ((ch != '>') && (ch != EOF)) ch = getchar();
+            if (strncmp("/table", word, 6) == 0)
+               done = true;
+         }
+         break;
+         default:
+         {
+            if (ch <= ' ')
+            {
+               if (summary_index > 0) need_space = true;
+            }
+            else
+            {
+               if (need_space) {summary[summary_index++] = ' '; need_space = false;}
+               summary[summary_index++] = ch;
+            }
+         }
+      }
+   } while ((summary_index < max_summary - 2) && (!done) && (ch != EOF));
+   summary[summary_index] = 0;
+}
+
+
+
+
+main()
+
+{
+   int channel    =  0;
+   int day        = -1;
+   int next_day   = -1;
+   int start_time = -1;
+   int stop_time  = -1;
+   char summary[max_summary] = {0};
+   char file_name[max_title] = {0};
+
+   while (!feof(stdin))
+   {
+      char line[max_line];
+      fgets(line, max_line-1, stdin);
+      if (strncmp(line, date_line, sizeof(date_line)-1) == 0)
+      {
+         const int month = (line[sizeof(date_line) + 6]- '0') * 10 + line[sizeof(date_line) + 7]-'0';
+         day = (line[sizeof(date_line) + 3]- '0') * 10 + line[sizeof(date_line) + 4]-'0';
+         next_day = day == month_lengths[month]? 1 : day + 1;
+      }
+      else if (strncmp(line, start_time_line, sizeof(start_time_line)-1) == 0)
+      {
+         start_time = (line[sizeof(start_time_line) - 1] - '0') * 1000 +
+                      (line[sizeof(start_time_line)    ] - '0') * 100 +
+                      (line[sizeof(start_time_line) + 2] - '0') * 10 +
+                      (line[sizeof(start_time_line) + 3] - '0');
+      }
+      else if (strncmp(line, stop_time_line, sizeof(stop_time_line)-1) == 0)
+      {
+         stop_time = ((line[sizeof(stop_time_line) - 1] - '0') * 1000 +
+                      (line[sizeof(stop_time_line)    ] - '0') * 100 +
+                      (line[sizeof(stop_time_line) + 2] - '0') * 10 +
+                      (line[sizeof(stop_time_line) + 3] - '0') + stop_time_safety_margin) % 2400;
+         if ((day < 0) || (start_time < 0) || (file_name[0] == 0) || (channel == max_channel))
+            fprintf(stderr, "Input data error.\n");
+         else
+            printf("1:%03d:%02d:%04d:%04d:2:7:%s:%s\n", channel+1, start_time < 600? next_day : day, start_time, stop_time, file_name, summary);
+         start_time = -1; stop_time = -1; file_name[0] = 0; summary[0] = 0; channel = max_channel;
+      }
+      else if (strncmp(line, title_line, sizeof(title_line)-1) == 0)
+         read_file_name(line, file_name);
+      else if (strncmp(line, channel_line, sizeof(channel_line)-1) == 0)
+      {
+         int i = sizeof(channel_line);
+         while ((i < max_line-1) && (line[i] != '<')) i++;
+         line[i] = 0; // end of string
+         for (channel = 0; (channel < max_channel) && 
+                           (strcmp(line + sizeof(channel_line) - 1, channel_names[channel]) != 0);
+              channel++);
+         if (channel == max_channel)
+            fprintf(stderr, "Error - channel '%s' not recognized.\n", line + sizeof(channel_line) - 1);
+      }
+      else if (strncmp(line, summary_line, sizeof(summary_line)-1) == 0)
+         read_summary(summary);
+   }
+}
diff --git a/Tools/xtvrc2vdr/Makefile b/Tools/xtvrc2vdr/Makefile
new file mode 100644
index 000000000..be5054152
--- /dev/null
+++ b/Tools/xtvrc2vdr/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for xtvrc2vdr utility
+#
+
+OBJS = xtvrc2vdr.o
+
+%.o: %.c
+	gcc -g -O2 -Wall -c $(DEFINES) $<
+
+all: xtvrc2vdr
+
+xtvrc2vdr: $(OBJS)
+	gcc -g -O2 $(OBJS) -o xtvrc2vdr
+
+clean:
+	-rm -f $(OBJS) xtvrc2vdr
diff --git a/Tools/xtvrc2vdr/hotbird.conf b/Tools/xtvrc2vdr/hotbird.conf
new file mode 100644
index 000000000..3431d5c4d
--- /dev/null
+++ b/Tools/xtvrc2vdr/hotbird.conf
@@ -0,0 +1,191 @@
+TV Polonia:10719:v:1:27500:163:92:0:0
+Credit Agricole:10834:v:1:27500:5321:5333:0:0
+La Chaine Parlementaire:10873:v:1:27500:1020:1030:0:0
+TMT:10892:v:1:27500:163:92:0:0
+Multivision Accueil:10911:v:1:27500:320:330:0:0
+RTL:11054:v:1:27500:160:80:0:0
+VOX:11054:v:1:27500:500:501:0:0
+Sat 1 A:11054:v:1:27500:511:512:0:0
+RTL II Austria:11054:v:1:27500:520:521:0:0
+NBC Europe:11054:v:1:27500:550:551:0:0
+ZDF:11054:v:1:27500:570:571:0:0
+K-T9:11054:v:1:27500:580:581:0:0
+Sat 1 Schweiz:11604:v:1:27500:101:102:0:0
+MKT9:11623:v:1:27500:222:242:0:0
+Olisat TV Promo:11623:v:1:27500:226:246:0:0
+Bloomberg TV Germany:11642:v:1:27500:1460:1420:0:0
+Bloomberg TV UK:11642:v:1:27500:1560:1520:0:0
+SAT 7:11642:v:1:27500:1660:1620:0:0
+Multivision 1:11662:v:1:27500:120:130:0:0
+Dubai EDT9:11746:v:1:27500:4130:4131:0:0
+Dubai Sport Channel:11746:v:1:27500:4386:4387:0:0
+Dubai Business Channel:11746:v:1:27500:4642:4643:0:0
+Dubai EDT9:11746:v:1:27500:4898:4899:0:0
+RAI Uno:11766:v:1:27500:160:80:0:0
+RAI Due:11766:v:1:27500:161:84:0:0
+RAI Tre:11766:v:1:27500:162:88:0:0
+RAI Mosaico:11766:v:1:27500:518:8191:0:0
+RAI SportSat:11804:v:1:27500:512:650:0:0
+RAI Nettuno Sat 2:11804:v:1:27500:513:651:0:0
+RAI Educational:11804:v:1:27500:514:652:0:0
+TelePace :11804:v:1:27500:515:653:0:0
+RAI News24:11804:v:1:27500:516:654:0:0
+Camera dei Deputati:11804:v:1:27500:517:655:0:0
+SAT 2000:11804:v:1:27500:518:656:0:0
+RAI NettunoSat 1:11804:v:1:27500:519:657:0:0
+ERT Sat:11823:v:1:27500:521:740:0:0
+INT9:11843:v:1:27500:2324:2325:0:0
+TVL:11843:v:1:27500:2441:2442:0:0
+Team TV :11881:v:1:27500:2305:2306:0:0
+Ante Prima:11881:v:1:27500:2435:2436:0:0
+SNAI:11881:v:1:27500:2561:2562:0:0
+Italia 1 :11919:v:1:27500:512:650:0:0
+Canale 5:11919:v:1:27500:513:660:0:0
+Rete 4 :11919:v:1:27500:514:670:0:0
+ART Europe:12015:v:1:27500:164:96:0:0
+ESC 2:12015:v:1:27500:166:104:0:0
+ART Iqra:12015:v:1:27500:168:112:0:0
+Vetrina D+:12034:v:1:27500:166:105:0:0
+D+ Info:12073:v:1:27500:160:80:0:0
+Palco Promo:12073:v:1:27500:161:84:0:0
+Vacaciones T9:12092:v:1:27500:4112:4113:0:0
+TvL - TV Locale:12092:v:1:27500:4160:4161:0:0
+Satisfaction T9:12092:v:1:27500:4192:4193:0:0
+TVE Internacional:12092:v:1:27500:4208:4209:0:0
+TVG - TV de Galicia :12092:v:1:27500:4224:4225:0:0
+La Cadena Del Milagro:12092:v:1:27500:4368:4369:0:0
+Fiesta:12092:v:1:27500:4432:4433:0:0
+Visions Europe:12092:v:1:27500:4416:4417:0:0
+SateliTV/TV Sex Channel:12092:v:1:27500:4480:4481:0:0
+Krisma:12111:v:1:27500:200:201:0:0
+NT9:12111:v:1:27500:210:211:0:0
+Armenia TV 1:12111:v:1:27500:240:241:0:0
+SMAU Channel :12111:v:1:27500:260:261:0:0
+JSC - Al Jazeera Satellite Ch :12111:v:1:27500:270:271:0:0
+Il Tirreno Sat:12111:v:1:27500:280:301:0:0
+Coming Soon T9:12111:v:1:27500:310:311:0:0
+Alice:12149:v:1:27500:160:161:0:0
+Nuvolari Promo:12149:v:1:27500:176:177:0:0
+CCTV 4:12169:v:1:27500:516:690:0:0
+Kanali Vuolis:12169:v:1:27500:517:700:0:0
+Nova Promo:12169:v:1:27500:521:740:0:0
+ERT Sat :12188:v:1:27500:514:652:0:0
+Kanali Voulis:12188:v:1:27500:515:653:0:0
+OTE Promo:12188:v:1:27500:517:655:0:0
+TV 5 Europe:12245:v:1:27500:121:131:0:0
+Fashion T9:12245:v:1:27500:123:133:0:0
+TV Ajara:12245:v:1:27500:127:137:0:0
+Telekom T9:12265:v:1:27500:1460:1420:0:0
+SLO-TV1:12303:v:1:27500:200:201:0:0
+Polonia 1:12303:v:1:27500:205:206:0:0
+Super 1:12303:v:1:27500:207:208:0:0
+Sicilia Internacional:12303:v:1:27500:210:211:0:0
+SicilSat:12303:v:1:27500:225:226:0:0
+TBNE Italy:12303:v:1:27500:230:231:0:0
+Countdown T9:12303:v:1:27500:235:236:0:0
+Napoli International:12303:v:1:27500:240:241:0:0
+Magic T9:12303:v:1:27500:245:246:0:0
+TEST:12341:v:1:27500:165:108:0:0
+Colour Bars:12380:v:1:27500:3022:3032:0:0
+Tele 24 :12380:v:1:27500:3023:3033:0:0
+Abu Dhabi TV :12380:v:1:27500:3024:3034:0:0
+LCA:12380:v:1:27500:3025:3035:0:0
+RTV Montenegro:12380:v:1:27500:3026:3036:0:0
+SRG SSR Sat Access :12399:v:1:27500:165:98:0:0
+Jam-e-Jam Network 1 (IRIB 1):12437:v:1:27500:160:80:0:0
+Jam-e-Jam Network 2 (IRIB 2):12437:v:1:27500:161:82:0:0
+Sahar University Network:12437:v:1:27500:162:84:0:0
+Maharishi Open University:12476:v:1:27500:42:43:0:0
+Europe by Satellite:12476:v:1:27500:101:201:0:0
+Pink Backup:12476:v:1:27500:308:256:0:0
+Mizik Tropical:12476:v:1:27500:435:436:0:0
+TLI info card:12476:v:1:27500:771:768:0:0
+Liberty T9:12476:v:1:27500:941:942:0:0
+HRT TV 1:12520:v:1:27500:100:101:0:0
+HRT National:12520:v:1:27500:107:108:0:0
+BVN TV:12520:v:1:27500:210:211:0:0
+Sicilia International:12520:v:1:27500:501:502:0:0
+Sardegna Uno:12520:v:1:27500:503:504:0:0
+TGRT:12520:v:1:27500:505:506:0:0
+Euro Mediterraneo:12520:v:1:27500:510:511:0:0
+WWWTravel T9:12540:v:1:27500:1180:1183:0:0
+WWWTravel T9:12540:v:1:27500:1180:1184:0:0
+WWWTravel T9:12540:v:1:27500:1180:1185:0:0
+Bulgaria T9:12540:v:1:27500:4612:4613:0:0
+MC Sat Monte Carlo:12540:v:1:27500:5126:5122:0:0
+MBC:12597:v:1:27500:160:80:0:0
+SIMA-YEH-MOGHAVEMENT:12597:v:1:27500:161:84:0:0
+NITV (National Iran TV ):12597:v:1:27500:163:92:0:0
+BET International:12597:v:1:27500:167:108:0:0
+JSTV 2 Info Card:12597:v:1:27500:2011:2012:0:0
+EuroNews:12597:v:1:27500:2221:2231:0:0
+EuroNews:12597:v:1:27500:2221:2232:0:0
+EuroNews:12597:v:1:27500:2221:2233:0:0
+EuroNews:12597:v:1:27500:2221:2234:0:0
+EuroNews:12597:v:1:27500:2221:2235:0:0
+EuroNews:12597:v:1:27500:2221:2236:0:0
+EuroNews:12597:v:1:27500:2221:2237:0:0
+Canal Agro Rual:12597:v:1:27500:2321:2331:0:0
+MMO9:12616:v:1:27500:2561:2562:0:0
+Dubai Sport Channel:12654:v:1:27500:1060:1020:0:0
+Sharjah TV :12654:v:1:27500:1160:1120:0:0
+Qatar T9:12654:v:1:27500:1260:1220:0:0
+Saudi Channel 1 :12654:v:1:27500:1360:1320:0:0
+Kuwait Space Channel :12654:v:1:27500:1460:1420:0:0
+Libya T9:12654:v:1:27500:1560:1520:0:0
+Sudan T9:12654:v:1:27500:1660:1620:0:0
+Oman T9:12654:v:1:27500:1760:1720:0:0
+Jordan Satellite Channel:12654:v:1:27500:1860:1820:0:0
+Iraq Satellite Channel:12654:v:1:27500:1960:1920:0:0
+Thai TV 5 Global Network :12673:v:1:27500:200:201:0:0
+DigItaly:12673:v:1:27500:220:221:0:0
+Studio Europa:12673:v:1:27500:230:231:0:0
+Game Network:12673:v:1:27500:291:292:0:0
+Video Italia :12673:v:1:27500:340:341:0:0
+Telemarket:12673:v:1:27500:350:351:0:0
+Evision:12673:v:1:27500:360:361:0:0
+AB Passion:12692:v:1:27500:160:80:0:0
+Onyx T9:12692:v:1:27500:161:84:0:0
+EWTN:10723:v:1:29900:1001:1201:0:0
+Test (Newslynx):10723:v:1:29900:1002:1202:0:0
+MTA International:10723:v:1:29900:1004:1204:0:0
+J TV Test:10992:v:1:27500:2436:2437:0:0
+Bloomberg UK Test Card:11242:v:1:27500:162:88:0:0
+Channel SUN Test (KBT):11604:v:1:27500:111:112:0:0
+Racing Channel Test:11623:v:1:27500:223:243:0:0
+Test Card (pgm 4):11623:v:1:27500:224:244:0:0
+Olisat TLC test card:11623:v:1:27500:225:245:0:0
+Channel SUN Test (KBT):11623:v:1:27500:229:249:0:0
+Rai way 3 test card:11766:v:1:27500:164:96:0:0
+Rai way 1 test card:11766:v:1:27500:515:653:0:0
+Rai way 2 test card:11766:v:1:27500:516:654:0:0
+Test (Local Satellite):12092:v:1:27500:4176:4177:0:0
+Retelsat Test:12092:v:1:27500:4464:4465:0:0
+AIT Test Card:12111:v:1:27500:220:221:0:0
+Fucino Test Card:12111:v:1:27500:230:231:0:0
+Espresso(Antenna Hungaria Test Card):12149:v:1:27500:36:37:0:0
+Antenna Hungaria Test Card:12149:v:1:27500:96:97:0:0
+Antenna Hungaria Test Card:12149:v:1:27500:112:113:0:0
+Leonardo (Antenna Hungaria Test):12149:v:1:27500:128:129:0:0
+Test (Sahar):12437:v:1:27500:163:86:0:0
+Test 1:12437:v:1:27500:164:88:0:0
+Test 2:12437:v:1:27500:165:90:0:0
+CNES-Toulouse test:12558:v:1:27500:6143:6142:0:0
+Test Card:12597:v:1:27500:161:84:0:0
+FEED:11242:v:1:27500:167:108:0:0
+Feed :11623:v:1:27500:221:241:0:0
+Quantum 24 :10913:v:1:3998:1160:1120:0:0
+Quantum 24:10913:v:1:3998:1160:1220:0:0
+VIVA Polska:11131:v:1:4340:98:99:0:0
+Deutsche Welle T9:11196:v:1:9096:101:102:0:0
+Canal 24 Horas :11205:v:1:4000:4130:4131:0:0
+TV 5 Asie :11338:v:1:5632:512:640:0:0
+RAI4IFA:11548:v:1:4398:512:650:0:0
+Pro TV International:12201:v:1:5632:1160:1120:0:0
+TVN Polnoc:12211:v:1:5632:4194:4195:0:0
+WorldNet Europe:12484:v:1:8298:4260:4220:0:0
+WorldNet Europe:12484:v:1:8298:4360:4320:0:0
+WorldNet Europe:12484:v:1:8298:4460:4420:0:0
+WorldNet Europe:12484:v:1:8298:4560:4520:0:0
+TVN Polnoc:12573:v:1:5632:4194:4195:0:0
+APTN:12582:v:1:5632:308:256:0:0
diff --git a/Tools/xtvrc2vdr/xtvrc.hotbird b/Tools/xtvrc2vdr/xtvrc.hotbird
new file mode 100644
index 000000000..c809eeef5
--- /dev/null
+++ b/Tools/xtvrc2vdr/xtvrc.hotbird
@@ -0,0 +1,1337 @@
+*
+Channel: TV Polonia
+Frequency: 10719
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 163 92 0 10
+
+*
+Channel: Credit Agricole
+Frequency: 10834
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 5321 5333 0 10
+
+*
+Channel: La Chaine Parlementaire
+Frequency: 10873
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 1020 1030 0 10
+
+*
+Channel: TMT
+Frequency: 10892
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 163 92 0 10
+
+*
+Channel: Multivision Accueil
+Frequency: 10911
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 320 330 0 10
+
+*
+Channel: RTL
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 160 80 0 10
+
+*
+Channel: VOX
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 500 501 0 10
+
+*
+Channel: Sat 1 A
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 511 512 0 10
+
+*
+Channel: RTL II Austria
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 520 521 0 10
+
+*
+Channel: NBC Europe
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 550 551 0 10
+
+*
+Channel: ZDF
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 570 571 0 10
+
+*
+Channel: K-T9
+Frequency: 11054
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 580 581 0 10
+
+*
+Channel: Sat 1 Schweiz
+Frequency: 11604
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 101 102 0 10
+
+*
+Channel: MKT9
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 222 242 0 10
+
+*
+Channel: Olisat TV Promo
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 226 246 0 10
+
+*
+Channel: Bloomberg TV Germany
+Frequency: 11642
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1460 1420 0 10
+
+*
+Channel: Bloomberg TV UK
+Frequency: 11642
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1560 1520 0 10
+
+*
+Channel: SAT 7
+Frequency: 11642
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1660 1620 0 10
+
+*
+Channel: Multivision 1
+Frequency: 11662
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 120 130 0 10
+
+*
+Channel: Dubai EDT9
+Frequency: 11746
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4130 4131 0 10
+
+*
+Channel: Dubai Sport Channel
+Frequency: 11746
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4386 4387 0 10
+
+*
+Channel: Dubai Business Channel
+Frequency: 11746
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4642 4643 0 10
+
+*
+Channel: Dubai EDT9
+Frequency: 11746
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4898 4899 0 10
+
+*
+Channel: RAI Uno
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 160 80 0 10
+
+*
+Channel: RAI Due
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 161 84 0 10
+
+*
+Channel: RAI Tre
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 162 88 0 10
+
+*
+Channel: RAI Mosaico
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 518 8191 0 10
+
+*
+Channel: RAI SportSat
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 512 650 0 10
+
+*
+Channel: RAI Nettuno Sat 2
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 513 651 0 10
+
+*
+Channel: RAI Educational
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 514 652 0 10
+
+*
+Channel: TelePace 
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 515 653 0 10
+
+*
+Channel: RAI News24
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 516 654 0 10
+
+*
+Channel: Camera dei Deputati
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 517 655 0 10
+
+*
+Channel: SAT 2000
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 518 656 0 10
+
+*
+Channel: RAI NettunoSat 1
+Frequency: 11804
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 519 657 0 10
+
+*
+Channel: ERT Sat
+Frequency: 11823
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 521 740 0 10
+
+*
+Channel: INT9
+Frequency: 11843
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2324 2325 0 10
+
+*
+Channel: TVL
+Frequency: 11843
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2441 2442 0 10
+
+*
+Channel: Team TV 
+Frequency: 11881
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2305 2306 0 10
+
+*
+Channel: Ante Prima
+Frequency: 11881
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2435 2436 0 10
+
+*
+Channel: SNAI
+Frequency: 11881
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2561 2562 0 10
+
+*
+Channel: Italia 1 
+Frequency: 11919
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 512 650 0 10
+
+*
+Channel: Canale 5
+Frequency: 11919
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 513 660 0 10
+
+*
+Channel: Rete 4 
+Frequency: 11919
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 514 670 0 10
+
+*
+Channel: ART Europe
+Frequency: 12015
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 164 96 0 10
+
+*
+Channel: ESC 2
+Frequency: 12015
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 166 104 0 10
+
+*
+Channel: ART Iqra
+Frequency: 12015
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 168 112 0 10
+
+*
+Channel: Vetrina D+
+Frequency: 12034
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 166 105 0 10
+
+*
+Channel: D+ Info
+Frequency: 12073
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 160 80 0 10
+
+*
+Channel: Palco Promo
+Frequency: 12073
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 161 84 0 10
+
+*
+Channel: Vacaciones T9
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4112 4113 0 10
+
+*
+Channel: TvL - TV Locale
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4160 4161 0 10
+
+*
+Channel: Satisfaction T9
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4192 4193 0 10
+
+*
+Channel: TVE Internacional
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4208 4209 0 10
+
+*
+Channel: TVG - TV de Galicia 
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4224 4225 0 10
+
+*
+Channel: La Cadena Del Milagro
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4368 4369 0 10
+
+*
+Channel: Fiesta
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4432 4433 0 10
+
+*
+Channel: Visions Europe
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4416 4417 0 10
+
+*
+Channel: SateliTV/TV Sex Channel
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4480 4481 0 10
+
+*
+Channel: Krisma
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 200 201 0 10
+
+*
+Channel: NT9
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 210 211 0 10
+
+*
+Channel: Armenia TV 1
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 240 241 0 10
+
+*
+Channel: SMAU Channel 
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 260 261 0 10
+
+*
+Channel: JSC - Al Jazeera Satellite Ch 
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 270 271 0 10
+
+*
+Channel: Il Tirreno Sat
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 280 301 0 10
+
+*
+Channel: Coming Soon T9
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 310 311 0 10
+
+*
+Channel: Alice
+Frequency: 12149
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 160 161 0 10
+
+*
+Channel: Nuvolari Promo
+Frequency: 12149
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 176 177 0 10
+
+*
+Channel: CCTV 4
+Frequency: 12169
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 516 690 0 10
+
+*
+Channel: Kanali Vuolis
+Frequency: 12169
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 517 700 0 10
+
+*
+Channel: Nova Promo
+Frequency: 12169
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 521 740 0 10
+
+*
+Channel: ERT Sat 
+Frequency: 12188
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 514 652 0 10
+
+*
+Channel: Kanali Voulis
+Frequency: 12188
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 515 653 0 10
+
+*
+Channel: OTE Promo
+Frequency: 12188
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 517 655 0 10
+
+*
+Channel: TV 5 Europe
+Frequency: 12245
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 121 131 0 10
+
+*
+Channel: Fashion T9
+Frequency: 12245
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 123 133 0 10
+
+*
+Channel: TV Ajara
+Frequency: 12245
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 127 137 0 10
+
+*
+Channel: Telekom T9
+Frequency: 12265
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 1460 1420 0 10
+
+*
+Channel: SLO-TV1
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 200 201 0 10
+
+*
+Channel: Polonia 1
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 205 206 0 10
+
+*
+Channel: Super 1
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 207 208 0 10
+
+*
+Channel: Sicilia Internacional
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 210 211 0 10
+
+*
+Channel: SicilSat
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 225 226 0 10
+
+*
+Channel: TBNE Italy
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 230 231 0 10
+
+*
+Channel: Countdown T9
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 235 236 0 10
+
+*
+Channel: Napoli International
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 240 241 0 10
+
+*
+Channel: Magic T9
+Frequency: 12303
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 245 246 0 10
+
+*
+Channel: TEST
+Frequency: 12341
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 165 108 0 10
+
+*
+Channel: Colour Bars
+Frequency: 12380
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 3022 3032 0 10
+
+*
+Channel: Tele 24 
+Frequency: 12380
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 3023 3033 0 10
+
+*
+Channel: Abu Dhabi TV 
+Frequency: 12380
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 3024 3034 0 10
+
+*
+Channel: LCA
+Frequency: 12380
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 3025 3035 0 10
+
+*
+Channel: RTV Montenegro
+Frequency: 12380
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 3026 3036 0 10
+
+*
+Channel: SRG SSR Sat Access 
+Frequency: 12399
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 165 98 0 10
+
+*
+Channel: Jam-e-Jam Network 1 (IRIB 1)
+Frequency: 12437
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 160 80 0 10
+
+*
+Channel: Jam-e-Jam Network 2 (IRIB 2)
+Frequency: 12437
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 161 82 0 10
+
+*
+Channel: Sahar University Network
+Frequency: 12437
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 162 84 0 10
+
+*
+Channel: Maharishi Open University
+Frequency: 12476
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 42 43 0 10
+
+*
+Channel: Europe by Satellite
+Frequency: 12476
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 101 201 0 10
+
+*
+Channel: Pink Backup
+Frequency: 12476
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 308 256 0 10
+
+*
+Channel: Mizik Tropical
+Frequency: 12476
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 435 436 0 10
+
+*
+Channel: TLI info card
+Frequency: 12476
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 771 768 0 10
+
+*
+Channel: Liberty T9
+Frequency: 12476
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 941 942 0 10
+
+*
+Channel: HRT TV 1
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 100 101 0 10
+
+*
+Channel: HRT National
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 107 108 0 10
+
+*
+Channel: BVN TV
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 210 211 0 10
+
+*
+Channel: Sicilia International
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 501 502 0 10
+
+*
+Channel: Sardegna Uno
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 503 504 0 10
+
+*
+Channel: TGRT
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 505 506 0 10
+
+*
+Channel: Euro Mediterraneo
+Frequency: 12520
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 510 511 0 10
+
+*
+Channel: WWWTravel T9
+Frequency: 12540
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1180 1183 0 10
+
+*
+Channel: WWWTravel T9
+Frequency: 12540
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1180 1184 0 10
+
+*
+Channel: WWWTravel T9
+Frequency: 12540
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1180 1185 0 10
+
+*
+Channel: Bulgaria T9
+Frequency: 12540
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4612 4613 0 10
+
+*
+Channel: MC Sat Monte Carlo
+Frequency: 12540
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 5126 5122 0 10
+
+*
+Channel: MBC
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 160 80 0 10
+
+*
+Channel: SIMA-YEH-MOGHAVEMENT
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 161 84 0 10
+
+*
+Channel: NITV (National Iran TV )
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 163 92 0 10
+
+*
+Channel: BET International
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 167 108 0 10
+
+*
+Channel: JSTV 2 Info Card
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2011 2012 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2231 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2232 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2233 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2234 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2235 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2236 0 10
+
+*
+Channel: EuroNews
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2221 2237 0 10
+
+*
+Channel: Canal Agro Rual
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2321 2331 0 10
+
+*
+Channel: MMO9
+Frequency: 12616
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 2561 2562 0 10
+
+*
+Channel: Dubai Sport Channel
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1060 1020 0 10
+
+*
+Channel: Sharjah TV 
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1160 1120 0 10
+
+*
+Channel: Qatar T9
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1260 1220 0 10
+
+*
+Channel: Saudi Channel 1 
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1360 1320 0 10
+
+*
+Channel: Kuwait Space Channel 
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1460 1420 0 10
+
+*
+Channel: Libya T9
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1560 1520 0 10
+
+*
+Channel: Sudan T9
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1660 1620 0 10
+
+*
+Channel: Oman T9
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1760 1720 0 10
+
+*
+Channel: Jordan Satellite Channel
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1860 1820 0 10
+
+*
+Channel: Iraq Satellite Channel
+Frequency: 12654
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 1960 1920 0 10
+
+*
+Channel: Thai TV 5 Global Network 
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 200 201 0 10
+
+*
+Channel: DigItaly
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 220 221 0 10
+
+*
+Channel: Studio Europa
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 230 231 0 10
+
+*
+Channel: Game Network
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 291 292 0 10
+
+*
+Channel: Video Italia 
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 340 341 0 10
+
+*
+Channel: Telemarket
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 350 351 0 10
+
+*
+Channel: Evision
+Frequency: 12673
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 360 361 0 10
+
+*
+Channel: AB Passion
+Frequency: 12692
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 160 80 0 10
+
+*
+Channel: Onyx T9
+Frequency: 12692
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 161 84 0 10
+
+*
+Channel: EWTN
+Frequency: 10723
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 29900 2 1001 1201 0 10
+
+*
+Channel: Test (Newslynx)
+Frequency: 10723
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 29900 2 1002 1202 0 10
+
+*
+Channel: MTA International
+Frequency: 10723
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 29900 2 1004 1204 0 10
+
+*
+Channel: J TV Test
+Frequency: 10992
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 2436 2437 0 10
+
+*
+Channel: Bloomberg UK Test Card
+Frequency: 11242
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 162 88 0 10
+
+*
+Channel: Channel SUN Test (KBT)
+Frequency: 11604
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 4 111 112 0 10
+
+*
+Channel: Racing Channel Test
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 223 243 0 10
+
+*
+Channel: Test Card (pgm 4)
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 224 244 0 10
+
+*
+Channel: Olisat TLC test card
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 225 245 0 10
+
+*
+Channel: Channel SUN Test (KBT)
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 229 249 0 10
+
+*
+Channel: Rai way 3 test card
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 164 96 0 10
+
+*
+Channel: Rai way 1 test card
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 515 653 0 10
+
+*
+Channel: Rai way 2 test card
+Frequency: 11766
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 1 516 654 0 10
+
+*
+Channel: Test (Local Satellite)
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4176 4177 0 10
+
+*
+Channel: Retelsat Test
+Frequency: 12092
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 4464 4465 0 10
+
+*
+Channel: AIT Test Card
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 220 221 0 10
+
+*
+Channel: Fucino Test Card
+Frequency: 12111
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 230 231 0 10
+
+*
+Channel: Espresso(Antenna Hungaria Test Card)
+Frequency: 12149
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 36 37 0 10
+
+*
+Channel: Antenna Hungaria Test Card
+Frequency: 12149
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 96 97 0 10
+
+*
+Channel: Antenna Hungaria Test Card
+Frequency: 12149
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 112 113 0 10
+
+*
+Channel: Leonardo (Antenna Hungaria Test)
+Frequency: 12149
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 128 129 0 10
+
+*
+Channel: Test (Sahar)
+Frequency: 12437
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 163 86 0 10
+
+*
+Channel: Test 1
+Frequency: 12437
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 164 88 0 10
+
+*
+Channel: Test 2
+Frequency: 12437
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 27500 2 165 90 0 10
+
+*
+Channel: CNES-Toulouse test
+Frequency: 12558
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 6143 6142 0 10
+
+*
+Channel: Test Card
+Frequency: 12597
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 161 84 0 10
+
+*
+Channel: FEED
+Frequency: 11242
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 167 108 0 10
+
+*
+Channel: Feed 
+Frequency: 11623
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 27500 2 221 241 0 10
+
+*
+Channel: Quantum 24 
+Frequency: 10913
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 3998 0 1160 1120 0 10
+
+*
+Channel: Quantum 24
+Frequency: 10913
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 3998 0 1160 1220 0 10
+
+*
+Channel: VIVA Polska
+Frequency: 11131
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 4340 2 98 99 0 10
+
+*
+Channel: Deutsche Welle T9
+Frequency: 11196
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 9096 0 101 102 0 10
+
+*
+Channel: Canal 24 Horas 
+Frequency: 11205
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 4000 2 4130 4131 0 10
+
+*
+Channel: TV 5 Asie 
+Frequency: 11338
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 5632 2 512 640 0 10
+
+*
+Channel: RAI4IFA
+Frequency: 11548
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 4398 6 512 650 0 10
+
+*
+Channel: Pro TV International
+Frequency: 12201
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 5632 6 1160 1120 0 10
+
+*
+Channel: TVN Polnoc
+Frequency: 12211
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 5632 2 4194 4195 0 10
+
+*
+Channel: WorldNet Europe
+Frequency: 12484
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 8298 2 4260 4220 0 10
+
+*
+Channel: WorldNet Europe
+Frequency: 12484
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 8298 2 4360 4320 0 10
+
+*
+Channel: WorldNet Europe
+Frequency: 12484
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 8298 2 4460 4420 0 10
+
+*
+Channel: WorldNet Europe
+Frequency: 12484
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 9 8298 2 4560 4520 0 10
+
+*
+Channel: TVN Polnoc
+Frequency: 12573
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 5632 2 4194 4195 0 10
+
+*
+Channel: APTN
+Frequency: 12582
+CBHC: 255 0 0 255
+NI: -1 0
+SAT: 10 5632 2 308 256 0 10
+
diff --git a/Tools/xtvrc2vdr/xtvrc2vdr.c b/Tools/xtvrc2vdr/xtvrc2vdr.c
new file mode 100644
index 000000000..772db66a9
--- /dev/null
+++ b/Tools/xtvrc2vdr/xtvrc2vdr.c
@@ -0,0 +1,146 @@
+/*
+ *  * xtvrc2vdr.c: Converts 'xtvrc' files to 'vdr' channel format
+ *  *
+ *  * Copyright (C) 2000 Plamen Ganev
+ *  * 
+ *  * This program is free software; you can redistribute it and/or
+ *  * modify it under the terms of the GNU General Public License
+ *  * as published by the Free Software Foundation; either version 2
+ *  * of the License, or (at your option) any later version.
+ *  * 
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  * 
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program; if not, write to the Free Software
+ *  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *  * 
+ *  * The author can be reached at pganev@comm.it
+ *  *
+ *  */
+
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define MAX_LINE_LEN 1024
+#define MAX_NAME 100
+#define TOKS ": \n\r"
+#define NAMETOKS ":\n\r"
+
+typedef struct {
+   char Name[MAX_NAME+1];
+   int freq;
+   int color, hue, bright, saturation ;
+   int nitv, input ;
+   int pol, srate, fec, vpid, apid, lnbnum, type;
+} CHANNEL_DATA ;
+
+void strlwr( char *s ){
+   while ( s && *s ){
+     *s = tolower(*s);
+     s++;
+   }
+}
+
+int ReadChannel( FILE *f, CHANNEL_DATA *channel ) {
+   static char s[MAX_LINE_LEN+1];
+   char *p;
+
+   memset( channel, sizeof( CHANNEL_DATA ), 0 ) ;
+   
+   while ((p=fgets( s, MAX_LINE_LEN, f ))!=NULL){
+//    printf("%s", s ) ;
+    if (s[0] == '*')
+       break ;
+   }
+   
+   if ( !p ) { /* EOF? */
+//      printf("EOF\n");
+     return 0 ;
+   }
+     
+   while (fgets( s, MAX_LINE_LEN, f )){
+      if ( s[0] == '\n' )
+	return  channel->freq ? 1 : 0;
+      p = strtok( s, TOKS ) ;
+      if ( !p ) {
+	return 0;
+      }
+      strlwr( p ) ;
+      if ( !strcmp( p, "channel" )){
+	 p=strtok( NULL, NAMETOKS );
+	 while ( p && *p==' ')
+	   p++;
+	 strcpy( channel->Name, p );
+//	 printf("%d ", channel->freq ) ;
+      } else if ( !strcmp( p, "frequency")) {
+	 channel->freq = atoi( p=strtok( NULL, TOKS ));
+//	 printf("%d ", channel->freq ) ;
+      } else if ( !strcmp( p, "cbhc")) {
+	 channel->color = atoi(p=strtok(NULL,TOKS));
+	 channel->hue = atoi(p=strtok(NULL,TOKS));
+	 channel->bright = atoi(p=strtok(NULL,TOKS));
+	 channel->saturation = atoi(p=strtok(NULL,TOKS));
+      } else if ( !strcmp( p, "ni")) {
+	 channel->nitv = atoi(p=strtok(NULL,TOKS));
+	 channel->input = atoi(p=strtok(NULL,TOKS));
+      } else if ( !strcmp( p, "sat")) {
+	 channel->pol = atoi(p=strtok(NULL,TOKS));
+	 channel->srate = atoi(p=strtok(NULL,TOKS));
+	 channel->fec = atoi(p=strtok(NULL,TOKS));
+	 channel->vpid = atoi(p=strtok(NULL,TOKS));
+	 channel->apid = atoi(p=strtok(NULL,TOKS));
+	 channel->lnbnum = atoi(p=strtok(NULL,TOKS));
+	 channel->type = atoi(p=strtok(NULL,TOKS));
+      } else
+	printf("Unknown token %s\n", p ) ;
+   }
+   return 1 ;
+}
+
+int main ( int argc, char *argv[] ){
+   FILE *f, *fo ;
+   int cnt = 0;
+   CHANNEL_DATA channel ;
+   
+   if ( argc != 3 ){
+      printf("USAGE: %s <xtvrc file> <vdr file>\n\n", argv[0] ) ;
+      return 0;
+   }
+   
+   if ( !(f=fopen(argv[1], "rt"))){
+      printf("Can't open %s for reading\n\n", argv[1]);
+      return 0;
+   }
+   
+   if ( !(fo=fopen(argv[2], "wt"))){
+      printf("Can't open %s for writing\n\n", argv[2]);
+      return 0;
+   }
+   
+   while ( ReadChannel( f, &channel ) ) {
+      cnt++;
+      fprintf(fo, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n",
+	     channel.Name ,
+	     channel.freq ,
+	     channel.pol ? 'v' : 'h' ,
+	     1, //channel.lnbnum ,
+	     channel.srate ,
+	     channel.vpid ,
+	     channel.apid ,
+	     0, //channel.type ,
+	     0 ); //channel.fec ) ;
+   }
+	  
+   printf( "%d channels read.\n\n", cnt ) ;
+   
+   fclose(f);
+   fclose(fo);
+   return 1;
+}
diff --git a/channels.conf b/channels.conf
index d59b83bb5..870a6d67d 100644
--- a/channels.conf
+++ b/channels.conf
@@ -31,12 +31,12 @@ Sky News:12552:v:1:22000:305:306:0:0
 KinderNet:12574:h:1:22000:163:92:0:0
 Alice:12610:v:1:22000:162:96:0:0
 n-tv:12670:v:1:22000:162:96:0:0
-Grand Tour.:12670:v:1:22000:289:290:0:0
+Grand Tourisme:12670:v:1:22000:289:290:0:0
 TW1:12692:h:1:22000:166:167:0:0
 Eins Extra:12722:h:1:22000:101:102:0:0
 Eins Festival:12722:h:1:22000:201:202:0:0
 Eins MuXx:12722:h:1:22000:301:302:0:0
-MDR:12722:h:1:22000:401:402:0:0
+MDR:12110:h:1:27500:401:402:0:0
 ORB:12722:h:1:22000:501:502:0:0
 B1:12722:h:1:22000:601:602:0:0
 ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
@@ -113,3 +113,4 @@ MHP test:12604:h:1:22000:5632:8191:0:0
 Bloomberg TV Spain:12610:v:1:22000:45:49:0:0
 Video Italia:12610:v:1:22000:121:122:0:0
 AC 3 promo:12670:v:1:22000:308:256:0:0
+Rtlneu:12188:h:1:27500:163:104:0:0
diff --git a/config.c b/config.c
index ca43ff07f..6b5e04936 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.8 2000/06/24 13:43:14 kls Exp $
+ * $Id: config.c 1.15 2000/07/25 16:21:20 kls Exp $
  */
 
 #include "config.h"
@@ -54,7 +54,13 @@ void cKeys::Clear(void)
       k->code = 0;
 }
 
-bool cKeys::Load(char *FileName)
+void cKeys::SetDummyValues(void)
+{
+  for (tKey *k = keys; k->type != kNone; k++)
+      k->code = k->type + 1; // '+1' to avoid 0
+}
+
+bool cKeys::Load(const char *FileName)
 {
   isyslog(LOG_INFO, "loading %s", FileName);
   bool result = false;
@@ -150,7 +156,7 @@ unsigned int cKeys::Encode(const char *Command)
 {  
   if (Command != NULL) {
      const tKey *k = keys;
-     while ((k->type != kNone) && strncmp(k->name, Command, strlen(k->name)) != 0) //XXX why 'strncmp()'???
+     while ((k->type != kNone) && strcmp(k->name, Command) != 0)
            k++;
      return k->code;
      }
@@ -169,6 +175,8 @@ void cKeys::Set(eKeys Key, unsigned int Code)
 
 // -- cChannel ---------------------------------------------------------------
 
+char *cChannel::buffer = NULL;
+
 cChannel::cChannel(void)
 {
   *name = 0;
@@ -187,7 +195,18 @@ cChannel::cChannel(const cChannel *Channel)
   pnr          = Channel ? Channel->pnr          : 0;
 }
 
-bool cChannel::Parse(char *s)
+const char *cChannel::ToText(cChannel *Channel)
+{
+  asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", Channel->name, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->ca, Channel->pnr);
+  return buffer;
+}
+
+const char *cChannel::ToText(void)
+{
+  return ToText(this);
+}
+
+bool cChannel::Parse(const char *s)
 {
   char *buffer = NULL;
   if (9 == sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr)) {
@@ -201,7 +220,7 @@ bool cChannel::Parse(char *s)
 
 bool cChannel::Save(FILE *f)
 {
-  return fprintf(f, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", name, frequency, polarization, diseqc, srate, vpid, apid, ca, pnr) > 0;
+  return fprintf(f, ToText()) > 0;
 }
 
 bool cChannel::Switch(cDvbApi *DvbApi)
@@ -211,7 +230,7 @@ bool cChannel::Switch(cDvbApi *DvbApi)
   if (!DvbApi->Recording()) {
      isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
      CurrentChannel = Index();
-     for (int i = 3; --i;) {
+     for (int i = 3; i--;) {
          if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
          esyslog(LOG_ERR, "retrying");
@@ -236,6 +255,8 @@ const char *cChannel::GetChannelName(int i)
 
 // -- cTimer -----------------------------------------------------------------
 
+char *cTimer::buffer = NULL;
+
 cTimer::cTimer(bool Instant)
 {
   startTime = stopTime = 0;
@@ -253,10 +274,35 @@ cTimer::cTimer(bool Instant)
   priority = 99;
   lifetime = 99;
   *file = 0;
+  summary = NULL;
   if (Instant)
      snprintf(file, sizeof(file), "@%s", cChannel::GetChannelName(CurrentChannel));
 }
 
+cTimer::~cTimer()
+{
+  delete summary;
+}
+
+cTimer& cTimer::operator= (const cTimer &Timer)
+{
+  memcpy(this, &Timer, sizeof(*this));
+  if (summary)
+     summary = strdup(summary);
+  return *this;
+}
+
+const char *cTimer::ToText(cTimer *Timer)
+{
+  asprintf(&buffer, "%d:%d:%s:%d:%d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
+  return buffer;
+}
+
+const char *cTimer::ToText(void)
+{
+  return ToText(this);
+}
+
 int cTimer::TimeToInt(int t)
 {
   return (t / 100 * 60 + t % 100) * 60;
@@ -269,7 +315,7 @@ time_t cTimer::Day(time_t t)
   return mktime(&d);
 }
 
-int cTimer::ParseDay(char *s)
+int cTimer::ParseDay(const char *s)
 {
   char *tail;
   int d = strtol(s, &tail, 10);
@@ -277,7 +323,7 @@ int cTimer::ParseDay(char *s)
      d = 0;
      if (tail == s) {
         if (strlen(s) == 7) {
-           for (char *p = s + 6; p >= s; p--) {
+           for (const char *p = s + 6; p >= s; p--) {
                  d <<= 1;
                  d |= (*p != '-');
                  }
@@ -290,7 +336,7 @@ int cTimer::ParseDay(char *s)
   return d;
 }
 
-char *cTimer::PrintDay(int d)
+const char *cTimer::PrintDay(int d)
 {
   static char buffer[8];
   if ((d & 0x80000000) != 0) {
@@ -308,14 +354,20 @@ char *cTimer::PrintDay(int d)
   return buffer;
 }
 
-bool cTimer::Parse(char *s)
+bool cTimer::Parse(const char *s)
 {
   char *buffer1 = NULL;
   char *buffer2 = NULL;
-  if (8 == sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%as", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2)) {
+  delete summary;
+  summary = NULL;
+  if (8 <= sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
+     //TODO add more plausibility checks
      day = ParseDay(buffer1);
-     strncpy(file, buffer2, MaxFileName - 1);
-     file[strlen(buffer2)] = 0;
+     int l = strlen(buffer2);
+     if (l >= MaxFileName)
+        l = MaxFileName - 1;
+     strncpy(file, buffer2, l);
+     file[l] = 0;
      delete buffer1;
      delete buffer2;
      return day != 0;
@@ -325,7 +377,7 @@ bool cTimer::Parse(char *s)
 
 bool cTimer::Save(FILE *f)
 {
-  return fprintf(f, "%d:%d:%s:%d:%d:%d:%d:%s\n", active, channel, PrintDay(day), start, stop, priority, lifetime, file) > 0;
+  return fprintf(f, ToText()) > 0;
 }
 
 bool cTimer::IsSingleEvent(void)
@@ -333,10 +385,11 @@ bool cTimer::IsSingleEvent(void)
   return (day & 0x80000000) == 0;
 }
 
-bool cTimer::Matches(void)
+bool cTimer::Matches(time_t t)
 {
   if (active) {
-     time_t t = time(NULL);
+     if (t == 0)
+        t = time(NULL);
      struct tm now = *localtime(&t);
      int weekday = now.tm_wday == 0 ? 6 : now.tm_wday - 1; // we start with monday==0!
      int begin = TimeToInt(start);
@@ -393,13 +446,17 @@ void cTimer::SetRecording(bool Recording)
 
 cTimer *cTimer::GetMatch(void)
 {
-  cTimer *t = (cTimer *)Timers.First();
-  while (t) {
-        if (!t->recording && t->Matches())
-           return t;
-        t = (cTimer *)t->Next();
+  time_t t = time(NULL); // all timers must be checked against the exact same time to correctly handle Priority!
+  cTimer *t0 = NULL;
+  cTimer *ti = (cTimer *)Timers.First();
+  while (ti) {
+        if (!ti->recording && ti->Matches(t)) {
+           if (!t0 || ti->priority > t0->priority)
+              t0 = ti;
+           }
+        ti = (cTimer *)ti->Next();
         }
-  return NULL;
+  return t0;
 }
 
 // -- cKeys ------------------------------------------------------------------
diff --git a/config.h b/config.h
index 22099b900..be1c7ec70 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.7 2000/06/24 13:42:32 kls Exp $
+ * $Id: config.h 1.11 2000/07/23 17:17:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define MaxBuffer 1000
+#define MaxBuffer 10000
 
 enum eKeys { // "Up" and "Down" must be the first two keys!
              kUp,
@@ -50,7 +50,8 @@ class cKeys {
   tKey *keys;
   cKeys(void);
   void Clear(void);
-  bool Load(char *FileName = NULL);
+  void SetDummyValues(void);
+  bool Load(const char *FileName = NULL);
   bool Save(void);
   unsigned int Encode(const char *Command);
   eKeys Get(unsigned int Code);
@@ -58,6 +59,9 @@ class cKeys {
   };
 
 class cChannel : public cListObject {
+private:
+  static char *buffer;
+  static const char *ToText(cChannel *Channel);
 public:
   enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
   char name[MaxChannelName];
@@ -71,7 +75,8 @@ class cChannel : public cListObject {
   int pnr;
   cChannel(void);
   cChannel(const cChannel *Channel);
-  bool Parse(char *s);
+  const char *ToText(void);
+  bool Parse(const char *s);
   bool Save(FILE *f);
   bool Switch(cDvbApi *DvbApi = NULL);
   static bool SwitchTo(int i, cDvbApi *DvbApi = NULL);
@@ -81,6 +86,8 @@ class cChannel : public cListObject {
 class cTimer : public cListObject {
 private:
   time_t startTime, stopTime;
+  static char *buffer;
+  static const char *ToText(cTimer *Timer);
 public:
   enum { MaxFileName = 256 };
   bool recording;
@@ -93,19 +100,23 @@ class cTimer : public cListObject {
   int priority;
   int lifetime;
   char file[MaxFileName];
+  char *summary;
   cTimer(bool Instant = false);
-  bool Parse(char *s);
+  ~cTimer();
+  cTimer& operator= (const cTimer &Timer);
+  const char *ToText(void);
+  bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void);
-  bool Matches(void);
+  bool Matches(time_t t = 0);
   time_t StartTime(void);
   time_t StopTime(void);
   void SetRecording(bool Recording);
   static cTimer *GetMatch(void);
   static int TimeToInt(int t);
   static time_t Day(time_t t);
-  static int ParseDay(char *s);
-  static char *PrintDay(int d);
+  static int ParseDay(const char *s);
+  static const char *PrintDay(int d);
   };
 
 template<class T> class cConfig : public cList<T> {
@@ -117,7 +128,7 @@ template<class T> class cConfig : public cList<T> {
     cList<T>::Clear();
   }
 public:
-  bool Load(char *FileName)
+  bool Load(const char *FileName)
   {
     isyslog(LOG_INFO, "loading %s", FileName);
     bool result = true;
diff --git a/dvbapi.c b/dvbapi.c
index 58b2d74f1..a9673a7ac 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.11 2000/06/24 14:03:19 kls Exp $
+ * $Id: dvbapi.c 1.15 2000/07/21 13:18:02 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -818,8 +818,8 @@ cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
   // All recordings start with '1':
   fileNumber = 1; //TODO what if it doesn't start with '1'???
   //XXX hack to make the video device go into 'replaying' mode:
-  char dummy;
-  write(*OutFile, &dummy, sizeof(dummy));
+  char *dummy = "AV"; // must be "AV" to make the driver go into AV_PES mode!
+  write(*OutFile, dummy, strlen(dummy));
 }
 
 cReplayBuffer::~cReplayBuffer()
@@ -1327,8 +1327,8 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
      struct frontend front;
      ioctl(videoDev, VIDIOCGFRONTEND, &front);
      unsigned int freq = FrequencyMHz;
-     front.ttk = (freq < 11800UL) ? 0 : 1;
-     if (freq < 11800UL)
+     front.ttk = (freq < 11700UL) ? 0 : 1;
+     if (freq < 11700UL)
         freq -=  9750UL;
      else
         freq -= 10600UL;
@@ -1337,7 +1337,7 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
      front.freq      = freq * 1000000UL;
      front.diseqc    = Diseqc;
      front.srate     = Srate * 1000;
-     front.volt      = (Polarization == 'v') ? 0 : 1;
+     front.volt      = (Polarization == 'v' || Polarization == 'V') ? 0 : 1;
      front.video_pid = Vpid;
      front.audio_pid = Apid;
      front.fec       = 8;
@@ -1569,17 +1569,25 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
                                             Buffer->Stop(); break;
                        case dvbPauseReplay: SetReplayMode(Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
                                             Paused = !Paused;
+                                            if (FastForward || FastRewind) {
+                                               SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                               Buffer->Clear();
+                                               }
                                             FastForward = FastRewind = false;
                                             Buffer->SetMode(rmPlay);
                                             break;
-                       case dvbFastForward: SetReplayMode(VID_PLAY_NORMAL);
+                       case dvbFastForward: SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            SetReplayMode(VID_PLAY_NORMAL);
                                             FastForward = !FastForward;
                                             FastRewind = Paused = false;
+                                            Buffer->Clear();
                                             Buffer->SetMode(FastForward ? rmFastForward : rmPlay);
                                             break;
-                       case dvbFastRewind:  SetReplayMode(VID_PLAY_NORMAL);
+                       case dvbFastRewind:  SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            SetReplayMode(VID_PLAY_NORMAL);
                                             FastRewind = !FastRewind;
                                             FastForward = Paused = false;
+                                            Buffer->Clear();
                                             Buffer->SetMode(FastRewind ? rmFastRewind : rmPlay);
                                             break;
                        case dvbSkip:        {
@@ -1592,6 +1600,7 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
                                                  Buffer->SkipSeconds(Seconds);
                                                  }
                                             }
+                                            break;
                        case dvbGetIndex:    {
                                               int Current, Total;
                                               Buffer->GetIndex(Current, Total);
diff --git a/menu.c b/menu.c
index aab5fd121..17a9b0b5c 100644
--- a/menu.c
+++ b/menu.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.16 2000/05/27 16:13:39 kls Exp $
+ * $Id: menu.c 1.20 2000/07/24 16:25:53 kls Exp $
  */
 
 #include "menu.h"
+#include <ctype.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
@@ -16,7 +17,7 @@
 
 #define MENUTIMEOUT 120 // seconds
 
-const char *FileNameChars = "aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.# ";
+const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#^";
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -429,7 +430,7 @@ void cMenuEditStrItem::Set(void)
   char buf[1000];
   if (pos >= 0) {
      strncpy(buf, value, pos);
-     const char *s = value[pos] != ' ' ? value + pos + 1 : "";
+     const char *s = value[pos] != '^' ? value + pos + 1 : "";
      snprintf(buf + pos, sizeof(buf) - pos - 2, "[%c]%s", *(value + pos), s);
      SetValue(buf);
      }
@@ -455,12 +456,12 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
     case kLeft:  if (pos > 0) {
-                    if (value[pos] == ' ')
+                    if (value[pos] == '^')
                        value[pos] = 0;
                     pos--;
                     }
                  break;
-    case kRight: if (pos < length && value[pos] != ' ') {
+    case kRight: if (pos < length && value[pos] != '^' && (pos < int(strlen(value) - 1) || value[pos] != ' ')) {
                     if (++pos >= int(strlen(value))) {
                        value[pos] = ' ';
                        value[pos + 1] = 0;
@@ -474,7 +475,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     return cMenuEditItem::ProcessKey(Key);
                  break;
     case kOk:    if (pos >= 0) {
-                    if (value[pos] == ' ')
+                    if (value[pos] == '^')
                        value[pos] = 0;
                     pos = -1;
                     break;
@@ -707,6 +708,51 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuSummary --------------------------------------------------------
+
+class cMenuSummary : public cOsdMenu {
+public:
+  cMenuSummary(const char *Text);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuSummary::cMenuSummary(const char *Text)
+:cOsdMenu("Summary")
+{
+  while (*Text) {
+        char line[MenuColumns + 1];
+        char *p = line;
+        const char *b = NULL;
+        *p++ = ' ';
+        while (*Text && p - line < MenuColumns - 2) {
+              if (isspace(*Text))
+                 b = Text; // remember the blank
+              if (*Text == '\n')
+                 break;
+              *p++ = *Text++;
+              }
+        if (*Text) {
+           if (b && Text - b > 0) {
+              p -= Text - b;
+              Text = b + 1;
+              }
+           else
+              Text++;
+           }
+        *p = 0;
+        Add(new cOsdItem(line, osBack));
+        }
+}
+
+eOSState cMenuSummary::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown)
+     state = osContinue;
+  return state;
+}
+
 // --- cMenuEditTimer --------------------------------------------------------
 
 class cMenuEditTimer : public cOsdMenu {
@@ -799,6 +845,7 @@ class cMenuTimers : public cOsdMenu {
   eOSState New(void);
   eOSState Del(void);
   virtual void Move(int From, int To);
+  eOSState Summary(void);
 public:
   cMenuTimers(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -880,6 +927,16 @@ void cMenuTimers::Move(int From, int To)
   isyslog(LOG_INFO, "timer %d moved to %d", From + 1, To + 1);
 }
 
+eOSState cMenuTimers::Summary(void)
+{
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
+  cTimer *ti = Timers.Get(Current());
+  if (ti && ti->summary && *ti->summary)
+     return AddSubMenu(new cMenuSummary(ti->summary));
+  return Edit(); // convenience for people not using the Summary feature ;-)
+}
+
 eOSState cMenuTimers::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
@@ -888,7 +945,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
      switch (Key) {
        case kLeft:
        case kRight:  return Activate(Key == kRight);
-       case kOk:
+       case kOk:     return Summary();
        case kRed:    return Edit();
        case kGreen:  return New();
        case kYellow: return Del();
@@ -926,13 +983,14 @@ class cMenuRecordings : public cOsdMenu {
   cRecordings Recordings;
   eOSState Play(void);
   eOSState Del(void);
+  eOSState Summary(void);
 public:
   cMenuRecordings(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuRecordings::cMenuRecordings(void)
-:cOsdMenu("Recordings", 11, 6)
+:cOsdMenu("Recordings", 9, 6)
 {
   if (Recordings.Load()) {
      cRecording *recording = Recordings.First();
@@ -941,7 +999,7 @@ cMenuRecordings::cMenuRecordings(void)
            recording = Recordings.Next(recording);
            }
      }
-  SetHelp("Play", NULL/*XXX"Resume"*/, "Delete");
+  SetHelp("Play", NULL/*XXX"Resume"*/, "Delete", "Summary");
 }
 
 eOSState cMenuRecordings::Play(void)
@@ -975,6 +1033,16 @@ eOSState cMenuRecordings::Del(void)
   return osContinue;
 }
 
+eOSState cMenuRecordings::Summary(void)
+{
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri && ri->recording->Summary() && *ri->recording->Summary())
+     return AddSubMenu(new cMenuSummary(ri->recording->Summary()));
+  return osContinue;
+}
+
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
@@ -984,6 +1052,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kOk:
        case kRed:    return Play();
        case kYellow: return Del();
+       case kBlue:   return Summary();
        default: break;
        }
      }
@@ -1061,7 +1130,8 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
   timer->SetRecording(true);
   cChannel::SwitchTo(timer->channel - 1, dvbApi);
   cRecording Recording(timer);
-  dvbApi->StartRecord(Recording.FileName());
+  if (dvbApi->StartRecord(Recording.FileName()))
+     Recording.WriteSummary();
   Interface.DisplayRecording(dvbApi->Index(), true);
 }
 
@@ -1116,7 +1186,7 @@ bool cRecordControls::Start(cTimer *Timer)
             }
         }
      else
-        esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch);
+        esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch + 1);
      }
   else
      esyslog(LOG_ERR, "ERROR: channel %d not defined!", ch + 1);
diff --git a/recording.c b/recording.c
index 2eba90b41..e37ccd85e 100644
--- a/recording.c
+++ b/recording.c
@@ -4,14 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.8 2000/05/13 16:16:56 kls Exp $
+ * $Id: recording.c 1.12 2000/07/24 16:31:07 kls Exp $
  */
 
 #define _GNU_SOURCE
 #include "recording.h"
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include "interface.h"
 #include "tools.h"
 
@@ -20,7 +22,9 @@
 #define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
 
-#define FINDCMD      "find %s -type d -name '%s'"
+#define SUMMARYFILESUFFIX "/summary.vdr"
+
+#define FINDCMD      "find %s -type d -name '%s' | sort -df"
 
 #define DFCMD        "df -m %s"
 #define MINDISKSPACE 1024 // MB
@@ -102,21 +106,14 @@ void AssertFreeDiskSpace(void)
 
 // --- cRecording ------------------------------------------------------------
 
-cRecording::cRecording(const char *Name, time_t Start, int Priority, int LifeTime)
-{
-  titleBuffer = NULL;
-  fileName = NULL;
-  name = strdup(Name);
-  start = Start;
-  priority = Priority;
-  lifetime = LifeTime;
-}
-
 cRecording::cRecording(cTimer *Timer)
 {
   titleBuffer = NULL;
   fileName = NULL;
   name = strdup(Timer->file);
+  summary = Timer->summary ? strdup(Timer->summary) : NULL;
+  if (summary)
+     strreplace(summary, '|', '\n');
   start = Timer->StartTime();
   priority = Timer->priority;
   lifetime = Timer->lifetime;
@@ -130,6 +127,7 @@ cRecording::cRecording(const char *FileName)
   char *p = strrchr(FileName, '/');
 
   name = NULL;
+  summary = NULL;
   if (p) {
      time_t now = time(NULL);
      struct tm t = *localtime(&now); // this initializes the time zone in 't'
@@ -141,7 +139,41 @@ cRecording::cRecording(const char *FileName)
         name = new char[p - FileName + 1];
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
+        strreplace(name, '_', ' ');
         }
+     // read an optional summary file:
+     char *SummaryFileName = NULL;
+     asprintf(&SummaryFileName, "%s%s", fileName, SUMMARYFILESUFFIX);
+     int f = open(SummaryFileName, O_RDONLY);
+     if (f >= 0) {
+        struct stat buf;
+        if (fstat(f, &buf) == 0) {
+           int size = buf.st_size;
+           summary = new char[size + 1]; // +1 for terminating 0
+           if (summary) {
+              int rbytes = read(f, summary, size);
+              if (rbytes >= 0) {
+                 summary[rbytes] = 0;
+                 if (rbytes != size)
+                    esyslog(LOG_ERR, "%s: expected %d bytes but read %d", SummaryFileName, size, rbytes);
+                 }
+              else {
+                 LOG_ERROR_STR(SummaryFileName);
+                 delete summary;
+                 summary = NULL;
+                 }
+              
+              }
+           else
+              esyslog(LOG_ERR, "can't allocate %d byte of memory for summary file '%s'", size + 1, SummaryFileName);
+           close(f);
+           }
+        else
+           LOG_ERROR_STR(SummaryFileName);
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR_STR(SummaryFileName);
+     delete SummaryFileName;
      }
 }
 
@@ -150,6 +182,7 @@ cRecording::~cRecording()
   delete titleBuffer;
   delete fileName;
   delete name;
+  delete summary;
 }
 
 const char *cRecording::FileName(void)
@@ -157,6 +190,8 @@ const char *cRecording::FileName(void)
   if (!fileName) {
      struct tm *t = localtime(&start);
      asprintf(&fileName, NAMEFORMAT, BaseDir, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
+     if (fileName)
+        strreplace(fileName, ' ', '_');
      }
   return fileName;
 }
@@ -166,10 +201,10 @@ const char *cRecording::Title(char Delimiter)
   delete titleBuffer;
   titleBuffer = NULL;
   struct tm *t = localtime(&start);
-  asprintf(&titleBuffer, "%02d.%02d.%04d%c%02d:%02d%c%s",
+  asprintf(&titleBuffer, "%02d.%02d.%02d%c%02d:%02d%c%s",
                          t->tm_mday,
                          t->tm_mon + 1,
-                         t->tm_year + 1900,
+                         t->tm_year % 100,
                          Delimiter,
                          t->tm_hour,
                          t->tm_min,
@@ -178,6 +213,24 @@ const char *cRecording::Title(char Delimiter)
   return titleBuffer;
 }
 
+bool cRecording::WriteSummary(void)
+{
+  if (summary) {
+     char *SummaryFileName = NULL;
+     asprintf(&SummaryFileName, "%s%s", fileName, SUMMARYFILESUFFIX);
+     FILE *f = fopen(SummaryFileName, "w");
+     if (f) {
+        if (fputs(summary, f) < 0)
+           LOG_ERROR_STR(SummaryFileName);
+        fclose(f);
+        }
+     else
+        LOG_ERROR_STR(SummaryFileName);
+     delete SummaryFileName;
+     }
+  return true;
+}
+
 bool cRecording::Delete(void)
 {
   bool result = true;
diff --git a/recording.h b/recording.h
index eeea5609f..e501af822 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.6 2000/04/24 09:45:49 kls Exp $
+ * $Id: recording.h 1.7 2000/07/23 19:06:14 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -22,16 +22,18 @@ class cRecording : public cListObject {
   char *titleBuffer;
   char *fileName;
   char *name;
+  char *summary;
 public:
   time_t start;
   int priority;
   int lifetime;
-  cRecording(const char *Name, time_t Start, int Priority, int LifeTime);
   cRecording(cTimer *Timer);
   cRecording(const char *FileName);
   ~cRecording();
   const char *FileName(void);
   const char *Title(char Delimiter = ' ');
+  const char *Summary(void) { return summary; }
+  bool WriteSummary(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
        // Returns false in case of error
diff --git a/remote.c b/remote.c
index e3786c5c4..931cfd33c 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.9 2000/07/15 12:19:50 kls Exp $
+ * $Id: remote.c 1.10 2000/07/15 16:34:35 kls Exp $
  */
 
 #include "remote.h"
@@ -365,17 +365,20 @@ cRcIoLIRC::~cRcIoLIRC()
 
 const char *cRcIoLIRC::ReceiveString(void)
 {
+  char buf[LIRC_BUFFER_SIZE];
+
   while (InputAvailable(true)) {
         if (read(f, buf, sizeof(buf)) > 21) {
-           const int repeat = 10 * (buf[17] - '0') + (buf[18] - '0');
            const int now = time_ms();
+           int repeat;
+           sscanf(buf, "%*s %x %7s", &repeat, keyName); // '7' in '%7s' is LIRC_KEY_BUF-1!
            if (repeat == 0) {
               firstTime = lastTime = now;
-              return buf + 20;
+              return keyName;
               }
            else if ((now > firstTime + REPEATDELAY) && (now > lastTime + REPEATLIMIT)) {
               lastTime = now;
-              return buf + 20;
+              return keyName;
               }
            }
         }
@@ -384,6 +387,7 @@ const char *cRcIoLIRC::ReceiveString(void)
 
 void cRcIoLIRC::Flush(int WaitSeconds)
 {
+  char buf[LIRC_BUFFER_SIZE];
   time_t t0 = time(NULL);
 
   for (;;) {
diff --git a/remote.h b/remote.h
index 38961b9ca..7b94ac782 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.6 2000/06/24 15:52:56 kls Exp $
+ * $Id: remote.h 1.7 2000/07/15 16:32:43 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -75,9 +75,9 @@ class cRcIoRCU : public cRcIoBase {
 
 class cRcIoLIRC : public cRcIoBase {
 private:
-  enum { LIRC_BUFFER_SIZE = 128 };
+  enum { LIRC_KEY_BUF = 8, LIRC_BUFFER_SIZE = 128 };
   int f;
-  char buf[LIRC_BUFFER_SIZE];
+  char keyName[LIRC_KEY_BUF];
   const char *ReceiveString(void);
 public:
   cRcIoLIRC(char *DeviceName);
diff --git a/svdrp.c b/svdrp.c
new file mode 100644
index 000000000..6873d166e
--- /dev/null
+++ b/svdrp.c
@@ -0,0 +1,620 @@
+/*
+ * svdrp.c: Simple Video Disk Recorder Protocol
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * The "Simple Video Disk Recorder Protocol" (SVDRP) was inspired
+ * by the "Simple Mail Transfer Protocol" (SMTP) and is fully ASCII
+ * text based. Therefore you can simply 'telnet' to your VDR port
+ * and interact with the Video Disk Recorder - or write a full featured
+ * graphical interface that sits on top of an SVDRP connection.
+ *
+ * $Id: svdrp.c 1.2 2000/07/24 16:43:51 kls Exp $
+ */
+
+#define _GNU_SOURCE
+
+#include "svdrp.h"
+#include <arpa/inet.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include "config.h"
+#include "interface.h"
+#include "tools.h"
+
+// --- cSocket ---------------------------------------------------------------
+
+cSocket::cSocket(int Port, int Queue)
+{
+  port = Port;
+  sock = -1;
+}
+
+cSocket::~cSocket()
+{
+  Close();
+}
+
+void cSocket::Close(void)
+{
+  if (sock >= 0) {
+     close(sock);
+     sock = -1;
+     }
+}
+
+bool cSocket::Open(void)
+{
+  if (sock < 0) {
+     // create socket:
+     sock = socket(PF_INET, SOCK_STREAM, 0);
+     if (sock < 0) {
+        LOG_ERROR;
+        port = 0;
+        return false;
+        }
+     struct sockaddr_in name;
+     name.sin_family = AF_INET;
+     name.sin_port = htons(port);
+     name.sin_addr.s_addr = htonl(INADDR_ANY);
+     if (bind(sock, (struct sockaddr *)&name, sizeof(name)) < 0) {
+        LOG_ERROR;
+        Close();
+        return false;
+        }
+     // make it non-blocking:
+     int oldflags = fcntl(sock, F_GETFL, 0);
+     if (oldflags < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     oldflags |= O_NONBLOCK;
+     if (fcntl(sock, F_SETFL, oldflags) < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     // listen to the socket:
+     if (listen(sock, queue) < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     }
+  return true;
+}
+
+int cSocket::Accept(void)
+{
+  if (Open()) {
+     struct sockaddr_in clientname;
+     uint size = sizeof(clientname);
+     int newsock = accept(sock, (struct sockaddr *)&clientname, &size);
+     if (newsock > 0)
+        isyslog(LOG_INFO, "connect from %s, port %hd", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port));
+     else if (errno != EINTR)
+        LOG_ERROR;
+     return newsock;
+     }
+  return -1;
+}
+
+// --- cSVDRP ----------------------------------------------------------------
+
+#define MAXCMDBUFFER 10000
+#define MAXHELPTOPIC 10
+
+const char *HelpPages[] = {
+  "CHAN [ + | - | <number> | <name> ]\n"
+  "    Switch channel up, down or to the given channel number or name.\n"
+  "    Without option (or after successfully switching to the channel)\n"
+  "    it returns the current channel number and name.",
+  "DELC <number>\n"
+  "    Delete channel.",
+  "DELT <number>\n"
+  "    Delete timer.",
+  "HELP [ <topic> ]\n"
+  "    The HELP command gives help info.",
+  "LSTC [ <number> | <name> ]\n"
+  "    List channels. Without option, all channels are listed. Otherwise\n"
+  "    only the given channel is listed. If a name is given, all channels\n"
+  "    containing the given string as part of their name are listed.",
+  "LSTT [ <number> ]\n"
+  "    List timers. Without option, all timers are listed. Otherwise\n"
+  "    only the given timer is listed.",
+  "MODC <number> <settings>\n"
+  "    Modify a channel. Settings must be in the same format as returned\n"
+  "    by the LSTC command.",
+  "MODT <number> on | off | <settings>\n"
+  "    Modify a timer. Settings must be in the same format as returned\n"
+  "    by the LSTT command. The special keywords 'on' and 'off' can be\n"
+  "    used to easily activate or deactivate a timer.",
+  "MOVC <number> <to>\n"
+  "    Move a channel to a new position.",
+  "MOVT <number> <to>\n"
+  "    Move a timer to a new position.",
+  "NEWC <settings>\n"
+  "    Create a new channel. Settings must be in the same format as returned\n"
+  "    by the LSTC command.",
+  "NEWT <settings>\n"
+  "    Create a new timer. Settings must be in the same format as returned\n"
+  "    by the LSTT command.",
+  "QUIT\n"
+  "    Exit vdr (SVDRP).\n"
+  "    You can also hit Ctrl-D to exit.",
+  NULL
+  };
+
+/* SVDRP Reply Codes:
+
+ 214 Help message
+ 220 VDR service ready
+ 221 VDR service closing transmission channel
+ 250 Requested VDR action okay, completed
+ 451 Requested action aborted: local error in processing
+ 500 Syntax error, command unrecognized
+ 501 Syntax error in parameters or arguments
+ 502 Command not implemented
+ 504 Command parameter not implemented
+ 550 Requested action not taken
+ 554 Transaction failed
+
+*/
+
+const char *GetHelpTopic(const char *HelpPage)
+{
+  static char topic[MAXHELPTOPIC];
+  const char *q = HelpPage;
+  while (*q) {
+        if (isspace(*q)) {
+           uint n = q - HelpPage;
+           if (n >= sizeof(topic))
+              n = sizeof(topic) - 1;
+           strncpy(topic, HelpPage, n);
+           topic[n] = 0;
+           return topic;
+           }
+        q++;
+        }
+  return NULL;
+}
+
+const char *GetHelpPage(const char *Cmd)
+{
+  const char **p = HelpPages;
+  while (*p) {
+        const char *t = GetHelpTopic(*p);
+        if (strcasecmp(Cmd, t) == 0)
+           return *p;
+        p++;
+        }
+  return NULL;
+}
+
+cSVDRP::cSVDRP(int Port)
+:socket(Port)
+{
+  filedes = -1;
+  isyslog(LOG_INFO, "SVDRP listening on port %d", Port);
+}
+
+cSVDRP::~cSVDRP()
+{
+  Close();
+}
+
+void cSVDRP::Close(void)
+{
+  if (filedes >= 0) {
+     //TODO how can we get the *full* hostname?
+     char buffer[MAXCMDBUFFER];
+     gethostname(buffer, sizeof(buffer));
+     Reply(221, "%s closing connection", buffer);
+     isyslog(LOG_INFO, "closing connection"); //TODO store IP#???
+     close(filedes);
+     filedes = -1;
+     }
+}
+
+bool cSVDRP::Send(const char *s, int length)
+{
+  if (length < 0)
+     length = strlen(s);
+  int wbytes = write(filedes, s, length);
+  if (wbytes == length)
+     return true;
+  if (wbytes < 0)
+     LOG_ERROR;
+  else //XXX while...???
+     esyslog(LOG_ERR, "Wrote %d bytes to client while expecting %d\n", wbytes, length);
+  return false;
+}
+
+void cSVDRP::Reply(int Code, const char *fmt, ...)
+{
+  if (filedes >= 0) {
+     if (Code != 0) {
+        va_list ap;
+        va_start(ap, fmt);
+        char *buffer;
+        vasprintf(&buffer, fmt, ap);
+        char *nl = strchr(buffer, '\n');
+        if (Code > 0 && nl && *(nl + 1)) // trailing newlines don't count!
+           Code = -Code;
+        char number[16];
+        sprintf(number, "%03d%c", abs(Code), Code < 0 ? '-' : ' ');
+        const char *s = buffer;
+        while (s && *s) {
+              const char *n = strchr(s, '\n');
+              if (!(Send(number) && Send(s, n ? n - s : -1) && Send("\r\n"))) {
+                 Close();
+                 break;
+                 }
+              s = n ? n + 1 : NULL;
+              }
+        delete buffer;
+        va_end(ap);
+        }
+     else {
+        Reply(451, "Zero return code - looks like a programming error!");
+        esyslog(LOG_ERR, "SVDRP: zero return code!");
+        }
+     }
+}
+
+void cSVDRP::CmdChan(const char *Option)
+{
+  if (*Option) {
+     int n = -1;
+     if (isnumber(Option)) {
+        int o = strtol(Option, NULL, 10) - 1;
+        if (o >= 0 && o < Channels.Count())
+           n = o;
+        }
+     else if (strcmp(Option, "-") == 0) {
+        n = CurrentChannel;
+        if (CurrentChannel > 0)
+           n--;
+        }
+     else if (strcmp(Option, "+") == 0) {
+        n = CurrentChannel;
+        if (CurrentChannel < Channels.Count() - 1)
+           n++;
+        }
+     else {
+        int i = 0;
+        cChannel *channel;
+        while ((channel = Channels.Get(i)) != NULL) {
+              if (strcasecmp(channel->name, Option) == 0) {
+                 n = i;
+                 break;
+                 }
+              i++;
+              }
+        }
+     if (n < 0) {
+        Reply(501, "Undefined channel \"%s\"", Option);
+        return;
+        }
+     if (Interface.Recording()) {
+        Reply(550, "Can't switch channel, interface is recording");
+        return;
+        }
+     cChannel *channel = Channels.Get(n);
+     if (channel) {
+        if (!channel->Switch()) {
+           Reply(554, "Error switching to channel \"%d\"", channel->Index() + 1);
+           return;
+           }
+        }
+     else {
+        Reply(550, "Unable to find channel \"%s\"", Option);
+        return;
+        }
+     }
+  cChannel *channel = Channels.Get(CurrentChannel);
+  if (channel)
+     Reply(250, "%d %s", CurrentChannel + 1, channel->name);
+  else
+     Reply(550, "Unable to find channel \"%d\"", CurrentChannel);
+}
+
+void cSVDRP::CmdDelc(const char *Option)
+{
+  //TODO combine this with menu action (timers must be updated)
+  Reply(502, "DELC not yet implemented");
+}
+
+void cSVDRP::CmdDelt(const char *Option)
+{
+  if (*Option) {
+     if (isnumber(Option)) {
+        cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
+        if (timer) {
+           if (!timer->recording) {
+              Timers.Del(timer);
+              Timers.Save();
+              isyslog(LOG_INFO, "timer %s deleted", Option);
+              Reply(250, "Timer \"%s\" deleted", Option);
+              }
+           else
+              Reply(550, "Timer \"%s\" is recording", Option);
+           }
+        else
+           Reply(501, "Timer \"%s\" not defined", Option);
+        }
+     else
+        Reply(501, "Error in timer number \"%s\"", Option);
+     }
+  else
+     Reply(501, "Missing timer number");
+}
+
+void cSVDRP::CmdHelp(const char *Option)
+{
+  if (*Option) {
+     const char *hp = GetHelpPage(Option);
+     if (hp)
+        Reply(214, hp);
+     else {
+        Reply(504, "HELP topic \"%s\" unknown", Option);
+        return;
+        }
+     }
+  else {
+     Reply(-214, "This is VDR version 0.6"); //XXX dynamically insert version number
+     Reply(-214, "Topics:");
+     const char **hp = HelpPages;
+     while (*hp) {
+           //TODO multi-column???
+           const char *topic = GetHelpTopic(*hp);
+           if (topic)
+              Reply(-214, "    %s", topic);
+           hp++;
+           }
+     Reply(-214, "To report bugs in the implementation send email to");
+     Reply(-214, "    vdr-bugs@cadsoft.de");
+     }
+  Reply(214, "End of HELP info");
+}
+
+void cSVDRP::CmdLstc(const char *Option)
+{
+  if (*Option) {
+     if (isnumber(Option)) {
+        cChannel *channel = Channels.Get(strtol(Option, NULL, 10) - 1);
+        if (channel)
+           Reply(250, "%d %s", channel->Index() + 1, channel->ToText());
+        else
+           Reply(501, "Channel \"%s\" not defined", Option);
+        }
+     else {
+        int i = 0;
+        cChannel *next = NULL;
+        while (i < Channels.Count()) {
+              cChannel *channel = Channels.Get(i);
+              if (channel) {
+                 if (strcasestr(channel->name, Option)) {
+                    if (next)
+                       Reply(-250, "%d %s", next->Index() + 1, next->ToText());
+                    next = channel;
+                    }
+                 }
+              else {
+                 Reply(501, "Channel \"%d\" not found", i + 1);
+                 return;
+                 }
+              i++;
+              }
+        if (next)
+           Reply(250, "%d %s", next->Index() + 1, next->ToText());
+        }
+     }
+  else {
+     for (int i = 0; i < Channels.Count(); i++) {
+         cChannel *channel = Channels.Get(i);
+        if (channel)
+           Reply(i < Channels.Count() - 1 ? -250 : 250, "%d %s", channel->Index() + 1, channel->ToText());
+        else
+           Reply(501, "Channel \"%d\" not found", i + 1);
+         }
+     }
+}
+
+void cSVDRP::CmdLstt(const char *Option)
+{
+  if (*Option) {
+     if (isnumber(Option)) {
+        cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
+        if (timer)
+           Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+        else
+           Reply(501, "Timer \"%s\" not defined", Option);
+        }
+     else
+        Reply(501, "Error in timer number \"%s\"", Option);
+     }
+  else {
+     for (int i = 0; i < Timers.Count(); i++) {
+         cTimer *timer = Timers.Get(i);
+        if (timer)
+           Reply(i < Timers.Count() - 1 ? -250 : 250, "%d %s", timer->Index() + 1, timer->ToText());
+        else
+           Reply(501, "Timer \"%d\" not found", i + 1);
+         }
+     }
+}
+
+void cSVDRP::CmdModc(const char *Option)
+{
+  if (*Option) {
+     char *tail;
+     int n = strtol(Option, &tail, 10);
+     if (tail && tail != Option) {
+        tail = skipspace(tail);
+        cChannel *channel = Channels.Get(n - 1);
+        if (channel) {
+           cChannel c = *channel;
+           if (!c.Parse(tail)) {
+              Reply(501, "Error in channel settings");
+              return;
+              }
+           *channel = c;
+           Channels.Save();
+           isyslog(LOG_INFO, "channel %d modified", channel->Index() + 1);
+           Reply(250, "%d %s", channel->Index() + 1, channel->ToText());
+           }
+        else
+           Reply(501, "Channel \"%d\" not defined", n);
+        }
+     else
+        Reply(501, "Error in channel number");
+     }
+  else
+     Reply(501, "Missing channel settings");
+}
+
+void cSVDRP::CmdModt(const char *Option)
+{
+  if (*Option) {
+     char *tail;
+     int n = strtol(Option, &tail, 10);
+     if (tail && tail != Option) {
+        tail = skipspace(tail);
+        cTimer *timer = Timers.Get(n - 1);
+        if (timer) {
+           cTimer t = *timer;
+           if (strcasecmp(tail, "ON") == 0)
+              t.active = 1;
+           else if (strcasecmp(tail, "OFF") == 0)
+              t.active = 0;
+           else if (!t.Parse(tail)) {
+              Reply(501, "Error in timer settings");
+              return;
+              }
+           *timer = t;
+           Timers.Save();
+           isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+           Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+           }
+        else
+           Reply(501, "Timer \"%d\" not defined", n);
+        }
+     else
+        Reply(501, "Error in timer number");
+     }
+  else
+     Reply(501, "Missing timer settings");
+}
+
+void cSVDRP::CmdMovc(const char *Option)
+{
+  //TODO combine this with menu action (timers must be updated)
+  Reply(502, "MOVC not yet implemented");
+}
+
+void cSVDRP::CmdMovt(const char *Option)
+{
+  //TODO combine this with menu action
+  Reply(502, "MOVT not yet implemented");
+}
+
+void cSVDRP::CmdNewc(const char *Option)
+{
+  if (*Option) {
+     cChannel *channel = new cChannel;
+     if (channel->Parse(Option)) {
+        Channels.Add(channel);
+        Channels.Save();
+        isyslog(LOG_INFO, "channel %d added", channel->Index() + 1);
+        Reply(250, "%d %s", channel->Index() + 1, channel->ToText());
+        }
+     else
+        Reply(501, "Error in channel settings");
+     }
+  else
+     Reply(501, "Missing channel settings");
+}
+
+void cSVDRP::CmdNewt(const char *Option)
+{
+  if (*Option) {
+     cTimer *timer = new cTimer;
+     if (timer->Parse(Option)) {
+        Timers.Add(timer);
+        Timers.Save();
+        isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+        Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+        }
+     else
+        Reply(501, "Error in timer settings");
+     }
+  else
+     Reply(501, "Missing timer settings");
+}
+
+#define CMD(c) (strcasecmp(Cmd, c) == 0)
+
+void cSVDRP::Execute(char *Cmd)
+{
+  // skip leading whitespace:
+  Cmd = skipspace(Cmd);
+  // find the end of the command word:
+  char *s = Cmd;
+  while (*s && !isspace(*s))
+        s++;
+  *s++ = 0;
+  if      (CMD("CHAN"))  CmdChan(s);
+  else if (CMD("DELC"))  CmdDelc(s);
+  else if (CMD("DELT"))  CmdDelt(s);
+  else if (CMD("HELP"))  CmdHelp(s);
+  else if (CMD("LSTC"))  CmdLstc(s);
+  else if (CMD("LSTT"))  CmdLstt(s);
+  else if (CMD("MODC"))  CmdModc(s);
+  else if (CMD("MODT"))  CmdModt(s);
+  else if (CMD("MOVC"))  CmdMovc(s);
+  else if (CMD("MOVT"))  CmdMovt(s);
+  else if (CMD("NEWC"))  CmdNewc(s);
+  else if (CMD("NEWT"))  CmdNewt(s);
+  else if (CMD("QUIT")
+       ||  CMD("\x04"))  Close();
+  else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
+}
+
+void cSVDRP::Process(void)
+{
+  bool SendGreeting = filedes < 0;
+
+  if (filedes >= 0 || (filedes = socket.Accept()) >= 0) {
+     char buffer[MAXCMDBUFFER];
+     if (SendGreeting) {
+        //TODO how can we get the *full* hostname?
+        gethostname(buffer, sizeof(buffer));
+        time_t now = time(NULL);
+        Reply(220, "%s SVDRP VideoDiskRecorder 0.6; %s", buffer, ctime(&now));//XXX dynamically insert version number
+        }
+     int rbytes = readstring(filedes, buffer, sizeof(buffer) - 1);
+     if (rbytes > 0) {
+        //XXX overflow check???
+        // strip trailing whitespace:
+        while (rbytes > 0 && strchr(" \t\r\n", buffer[rbytes - 1]))
+              buffer[--rbytes] = 0;
+        // make sure the string is terminated:
+        buffer[rbytes] = 0;
+        // showtime!
+        Execute(buffer);
+        }
+     else if (rbytes < 0)
+        Close();
+     }
+}
+
+//TODO timeout???
+//TODO more than one connection???
diff --git a/svdrp.h b/svdrp.h
new file mode 100644
index 000000000..c63854240
--- /dev/null
+++ b/svdrp.h
@@ -0,0 +1,52 @@
+/*
+ * svdrp.h: Simple Video Disk Recorder Protocol
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: svdrp.h 1.1 2000/07/23 14:49:30 kls Exp $
+ */
+
+#ifndef __SVDRP_H
+#define __SVDRP_H
+
+class cSocket {
+private:
+  int port;
+  int sock;
+  int queue;
+  void Close(void);
+public:
+  cSocket(int Port, int Queue = 1);
+  ~cSocket();
+  bool Open(void);
+  int Accept(void);
+  };
+
+class cSVDRP {
+private:
+  cSocket socket;
+  int filedes;
+  void Close(void);
+  bool Send(const char *s, int length = -1);
+  void Reply(int Code, const char *fmt, ...);
+  void CmdChan(const char *Option);
+  void CmdDelc(const char *Option);
+  void CmdDelt(const char *Option);
+  void CmdHelp(const char *Option);
+  void CmdLstc(const char *Option);
+  void CmdLstt(const char *Option);
+  void CmdModc(const char *Option);
+  void CmdModt(const char *Option);
+  void CmdMovc(const char *Option);
+  void CmdMovt(const char *Option);
+  void CmdNewc(const char *Option);
+  void CmdNewt(const char *Option);
+  void Execute(char *Cmd);
+public:
+  cSVDRP(int Port);
+  ~cSVDRP();
+  void Process(void);
+  };
+
+#endif //__SVDRP_H
diff --git a/timers.conf b/timers.conf
index a5dcb9a03..659faaaff 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,10 +1,9 @@
-1:15:MTWTF--:1828:1901:10:5:nano
-1:10:-T-----:2058:2202:99:10:Quarks
-1:5:-T-----:2100:2205:99:10:RudisSuchmaschine
-0:3:---T---:2211:2300:99:10:Switch
-1:15:-----S-:1358:1435:99:7:Neues
-1:1:-----S-:1445:1600:99:30:Hammerman
-1:2:-----S-:2200:2350:99:30:Wochenshow
-1:11:------S:2058:2120:99:10:Centauri
-1:14:20:1920:2035:99:30:SamtUndSeide
-1:10:---T---:2158:2250:99:99:DiePlaneten
+1:10:-T-----:2058:2202:99:10:Quarks:
+1:5:-T-----:2100:2205:99:10:RudisSuchmaschine:
+1:10:---T---:2158:2250:99:99:DiePlaneten:
+1:3:---T---:2211:2300:99:10:Switch:
+1:15:-----S-:1358:1435:99:7:Neues:
+1:1:-----S-:1445:1600:99:30:Hammerman:
+0:2:-----S-:2200:2350:99:30:Wochenshow:
+1:11:------S:2058:2120:99:10:Centauri:
+0:15:MTWTF--:1828:1901:10:5:nano:
diff --git a/tools.c b/tools.c
index c0eb2ec57..998d91b3a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.8 2000/06/24 15:26:15 kls Exp $
+ * $Id: tools.c 1.10 2000/07/23 13:16:54 kls Exp $
  */
 
 #define _GNU_SOURCE
 #include "tools.h"
+#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <signal.h>
@@ -58,6 +59,26 @@ bool readint(int filedes, int &n)
   return DataAvailable(filedes) && read(filedes, &n, sizeof(n)) == sizeof(n);
 }
 
+int readstring(int filedes, char *buffer, int size, bool wait = false)
+{
+  int rbytes = 0;
+
+  while (DataAvailable(filedes, wait)) {
+        int n = read(filedes, buffer + rbytes, size - rbytes);
+        if (n == 0)
+           break; // EOF
+        if (n < 0) {
+           LOG_ERROR;
+           break;
+           }
+        rbytes += n;
+        if (rbytes == size)
+           break;
+        wait = false;
+        }
+  return rbytes;
+}
+
 void purge(int filedes)
 {
   while (DataAvailable(filedes))
@@ -76,6 +97,25 @@ char *readline(FILE *f)
   return NULL;
 }
 
+char *strreplace(char *s, char c1, char c2)
+{
+  char *p = s;
+
+  while (*p) {
+        if (*p == c1)
+           *p = c2;
+        p++;
+        }
+  return s;
+}
+
+char *skipspace(char *s)
+{
+  while (*s && isspace(*s))
+        s++;
+  return s;
+}
+
 int time_ms(void)
 {
   static time_t t0 = 0;
@@ -95,6 +135,16 @@ void delay_ms(int ms)
         ;
 }
 
+bool isnumber(const char *s)
+{
+  while (*s) {
+        if (!isdigit(*s))
+           return false;
+        s++;
+        }
+  return true;
+}
+
 bool MakeDirs(const char *FileName, bool IsDirectory)
 {
   bool result = true;
diff --git a/tools.h b/tools.h
index db55983fc..ecf42be62 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.8 2000/06/24 15:25:00 kls Exp $
+ * $Id: tools.h 1.10 2000/07/23 13:16:37 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -35,10 +35,14 @@ void writechar(int filedes, char c);
 void writeint(int filedes, int n);
 char readchar(int filedes);
 bool readint(int filedes, int &n);
+int readstring(int filedes, char *buffer, int size, bool wait = false);
 void purge(int filedes);
 char *readline(FILE *f);
+char *strreplace(char *s, char c1, char c2);
+char *skipspace(char *s);
 int time_ms(void);
 void delay_ms(int ms);
+bool isnumber(const char *s);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName);
 bool CheckProcess(pid_t pid);
diff --git a/vdr.c b/vdr.c
index 4c1dce0ac..626e6dc04 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,15 +22,19 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.20 2000/07/15 11:45:05 kls Exp $
+ * $Id: vdr.c 1.23 2000/07/23 15:36:43 kls Exp $
  */
 
+#include <getopt.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include "config.h"
 #include "dvbapi.h"
 #include "interface.h"
 #include "menu.h"
 #include "recording.h"
+#include "svdrp.h"
 #include "tools.h"
 
 #ifdef REMOTE_KBD
@@ -50,15 +54,83 @@ void SignalHandler(int signum)
 
 int main(int argc, char *argv[])
 {
+  // Command line options:
+
+#define DEFAULTSVDRPPORT 2001
+
+  int SVDRPport = DEFAULTSVDRPPORT;
+  bool DaemonMode = false;
+
+  static struct option long_options[] = {
+      { "daemon", no_argument,       NULL, 'd' },
+      { "help",   no_argument,       NULL, 'h' },
+      { "port",   required_argument, NULL, 'p' },
+      { 0 }
+    };
+  
+  int c;
+  int option_index = 0;
+  while ((c = getopt_long(argc, argv, "dhp:", long_options, &option_index)) != -1) {
+        switch (c) {
+          case 'd': DaemonMode = true; break;
+          case 'h': printf("Usage: vdr [OPTION]\n\n"
+                           "  -h,      --help        display this help and exit\n"
+                           "  -d,      --daemon      run in daemon mode\n"
+                           "  -p PORT, --port=PORT   use PORT for SVDRP ('0' turns off SVDRP)\n"
+                           "\n"
+                           "Report bugs to <vdr-bugs@cadsoft.de>\n"
+                           );
+                    return 0;
+                    break;
+          case 'p': if (isnumber(optarg))
+                       SVDRPport = strtol(optarg, NULL, 10);
+                    else {
+                       fprintf(stderr, "vdr: invalid port number: %s\n", optarg);
+                       return 1;
+                       }
+                    break;
+          default:  abort();
+          }
+        }
+
+  // Log file:
+  
   openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+
+  // Daemon mode:
+
+  if (DaemonMode) {
+#ifndef DEBUG_OSD
+     pid_t pid = fork();
+     if (pid < 0) {
+        fprintf(stderr, "%s\n", strerror(errno));
+        esyslog(LOG_ERR, strerror(errno));
+        return 1;
+        }
+     if (pid != 0)
+        return 0; // initial program immediately returns
+     fclose(stdin);
+     fclose(stdout);
+     fclose(stderr);
+#else
+     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD on!\n");
+     abort();
+#endif
+     }
   isyslog(LOG_INFO, "started");
 
+  // DVB interfaces:
+
   if (!cDvbApi::Init())
      return 1;
 
+  // Configuration data:
+
   Channels.Load("channels.conf");
   Timers.Load("timers.conf");
-#ifndef REMOTE_LIRC
+#ifdef REMOTE_LIRC
+  Keys.SetDummyValues();
+#else
   if (!Keys.Load(KEYS_CONF))
      Interface.LearnKeys();
 #endif
@@ -66,10 +138,15 @@ int main(int argc, char *argv[])
 
   cChannel::SwitchTo(CurrentChannel);
 
+  // Signal handlers:
+
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
   if (signal(SIGINT,  SignalHandler) == SIG_IGN) signal(SIGINT,  SIG_IGN);
   if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
 
+  // Main program loop:
+
+  cSVDRP *SVDRP = SVDRPport ? new cSVDRP(SVDRPport) : NULL;
   cMenuMain *Menu = NULL;
   cReplayControl *ReplayControl = NULL;
   int dcTime = 0, dcNumber = 0;
@@ -155,10 +232,13 @@ int main(int argc, char *argv[])
              default:    break;
              }
            }
+        if (SVDRP)
+           SVDRP->Process();//TODO lock menu vs. SVDRP?
         }
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
   delete Menu;
   delete ReplayControl;
+  delete SVDRP;
   cDvbApi::Cleanup();
   isyslog(LOG_INFO, "exiting");
   closelog();

From 9b405778674d5325b225b32ab694d9216b099527 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Aug 2000 18:00:00 +0200
Subject: [PATCH 008/307] Version 0.61 - When scrolling through a list it now
 moves a full page up or down when the   cursor reaches the top or bottom of
 the menu (thanks to Heino Goldenstein!). - Added missing '#include
 <sys/stat.h>' to recording.c. - The video directory can now be defined with
 the command line option -v. - There can now be more than one video directory
 (in case you have several   disks). - Fixed learning key codes for PC
 keyboard. - New command line option '-l' to set the log level. - Times in
 timers.conf are now always printed with 4 digits (leading '0'). - Slow
 forward/back mode (thanks to Guido Fiala!). - The "Up" key in replay mode no
 longer restarts replay at the very beginning,   but rather resumes normal
 replay mode after a "pause", "forward" or "backward"   operation. Use the
 "Skip -60s" function repeatedly to go back to the beginning   of the
 recording. - Improved reaction on user input in fast/slow forward/back modes.
 - No more upper limit for the value of 'Pnr'. - Checking if the video card is
 really a DVB card. - New SVDRP command UPDT to update an existing timer (or
 add a new one if it   doesn't yet exist). - New version of the 'epg2timers'
 tool (with a modified channel list). - Bugfix in closing window in DEBUG_OSD
 mode.

---
 CONTRIBUTORS                    |   7 +
 HISTORY                         |  24 +++
 INSTALL                         |  40 ++++-
 MANUAL                          |  11 +-
 Makefile                        |  11 +-
 Tools/epg2timers/epg2timers.cxx |  56 +++++--
 channels.conf                   |   1 -
 config.c                        |  15 +-
 config.h                        |  10 +-
 dvbapi.c                        | 256 +++++++++++++++++++-------------
 dvbapi.h                        |  19 ++-
 menu.c                          |  16 +-
 osd.c                           |  22 ++-
 recording.c                     |  49 ++----
 recording.h                     |   2 +-
 remote.c                        |   8 +-
 svdrp.c                         |  53 ++++++-
 svdrp.h                         |   3 +-
 timers.conf                     |  12 +-
 tools.c                         |  77 +++++++++-
 tools.h                         |   6 +-
 vdr.c                           |  59 ++++++--
 videodir.c                      | 182 +++++++++++++++++++++++
 videodir.h                      |  21 +++
 24 files changed, 727 insertions(+), 233 deletions(-)
 create mode 100644 videodir.c
 create mode 100644 videodir.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0e2794f08..74390cf90 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -5,7 +5,14 @@ Carsten Koch <Carsten.Koch@icem.de>
  for making the 'Recordings' menu be listed alphabetically
  for implementing the 'Summary' feature
  for adding the 'epg2timers' tool (see Tools/epg2timers)
+ for his idea of using multiple disks (and for testing this feature)
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
  for adding the 'xtvrc2vdr' tool (see Tools/xtvrc2vdr)
+
+Heino Goldenstein <heino.goldenstein@microplex.de>
+ for modifying scrolling through lists to make it page up and down
+
+Guido Fiala <gfiala@s.netic.de>
+ for implementing slow forward/back
diff --git a/HISTORY b/HISTORY
index 765f4d1a3..04cc2d59c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -99,3 +99,27 @@ Video Disk Recorder Revision History
   pressing "Ok".  The summary field can only be filled in directly by editing
   the 'timers.conf' file with a text editor, or by defining/modifying the timer
   via the SVDRP interface.
+
+2000-08-06: Version 0.61
+
+- When scrolling through a list it now moves a full page up or down when the
+  cursor reaches the top or bottom of the menu (thanks to Heino Goldenstein!).
+- Added missing '#include <sys/stat.h>' to recording.c.
+- The video directory can now be defined with the command line option -v.
+- There can now be more than one video directory (in case you have several
+  disks).
+- Fixed learning key codes for PC keyboard.
+- New command line option '-l' to set the log level.
+- Times in timers.conf are now always printed with 4 digits (leading '0').
+- Slow forward/back mode (thanks to Guido Fiala!).
+- The "Up" key in replay mode no longer restarts replay at the very beginning,
+  but rather resumes normal replay mode after a "pause", "forward" or "backward"
+  operation. Use the "Skip -60s" function repeatedly to go back to the beginning
+  of the recording.
+- Improved reaction on user input in fast/slow forward/back modes.
+- No more upper limit for the value of 'Pnr'.
+- Checking if the video card is really a DVB card.
+- New SVDRP command UPDT to update an existing timer (or add a new one if it
+  doesn't yet exist).
+- New version of the 'epg2timers' tool (with a modified channel list).
+- Bugfix in closing window in DEBUG_OSD mode.
diff --git a/INSTALL b/INSTALL
index 3261ef007..938487c31 100644
--- a/INSTALL
+++ b/INSTALL
@@ -49,6 +49,9 @@ If the program shall run as a daemon, use the --daemon option. This
 will completely detach it from the terminal and will continue as a
 background process.
 
+Command line options:
+---------------------
+
 Use "vdr --help" for a list of available command line options.
 
 The video data directory:
@@ -57,14 +60,41 @@ The video data directory:
 All recordings are written into directories below "/video". Please
 make sure this directory exists, and that the user who runs the 'vdr'
 program has read and write access to that directory.
-If you prefer a different location for your video files, you can change
-the value of 'BaseDir' in recording.c.
+If you prefer a different location for your video files, you can use
+the '-v' option to change that.
 
 Note that the file system need not be 64-bit proof, since the 'vdr'
 program splits video files into chunks of about 1GB. You should use
 a disk with several gigabytes of free space. One GB can store roughly
 half an hour of video data.
 
+If you have more than one disk and don't want to combine them to form
+one large logical volume, you can set up several video directories as
+mount points for these disks. All of these directories must have the
+same basic name and must end with a numeric part, which starts at 0 for
+the main directory and has increasing values for the rest of the
+directories. For example
+
+   /video0
+   /video1
+   /video2
+
+would be a setup with three directories. You can use more than one
+numeric digit, and the directories need not be directly under '/':
+
+   /mnt/MyVideos/vdr.00
+   /mnt/MyVideos/vdr.01
+   /mnt/MyVideos/vdr.02
+   ...
+   /mnt/MyVideos/vdr.11
+
+would set up twelve disks (wow, what a machine that would be!).
+
+To use such a multi directory setup, you need to add the '-v' option
+with the name of the basic directory when running 'vdr':
+
+   vdr -v /video0
+
 Configuration files:
 --------------------
 
@@ -78,6 +108,12 @@ The meaning of the data entries may still vary in future releases,
 so for the moment please look at the source code (config.c) to see
 the meaning of the various fields.
 
+The files that come with this package contain the author's selections,
+so please make sure you adapt these to your personal taste. Also make sure
+that the channels defined in 'channels.conf' are correct before attempting
+to record anything. Channel parameters may vary and not all of the channels
+listed in the default 'channels.conf' file have been verified by the author.
+
 Learning the remote control keys:
 ---------------------------------
 
diff --git a/MANUAL b/MANUAL
index c9b71a377..b05c35088 100644
--- a/MANUAL
+++ b/MANUAL
@@ -10,7 +10,7 @@ Video Disk Recorder User's Manual
 
   Key     Normal      Main       Channels   Timer      Edit/New      Recordings  Replay
 
-  Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Begin
+  Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
   Left    -           -          -          Disable    Decrement     -           Search back
   Right   -           -          -          Enable     Increment     -           Search forward
@@ -93,15 +93,16 @@ Video Disk Recorder User's Manual
 
   The following keys have the listed meaning in Replay mode:
 
-  - Up      Positions to beginning of the recording and starts playback
-            from there.
+  - Up      Resumes normal replay from any "pause", "forward" or "backward"
+            mode.
   - Down    Halts playback at the current position. Press again to continue
             playback.
   - Blue    Stops playback and stores the current position, so that
             playback can be resumed later at that point.
   - Left
-    Right   Runs playback forward or backward at a higher speed. Press
-            again to resume normal speed.
+    Right   Runs playback forward or backward at a higher speed; press
+            again to resume normal speed. If in Pause mode, runs forward or
+            backward at a slower speed; press again to return to pause mode.
   - Green
     Yellow  Skips about 60 seconds back or forward.
   - Ok      Brings up the replay progress display, which shows the date,
diff --git a/Makefile b/Makefile
index 8fb678bcd..f71236b78 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.5 2000/07/23 11:57:14 kls Exp $
+# $Id: Makefile 1.6 2000/07/28 14:37:44 kls Exp $
 
-OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o
+OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o videodir.o
 
 ifndef REMOTE
 REMOTE = KBD
@@ -24,15 +24,16 @@ endif
 all: vdr
 
 config.o   : config.c config.h dvbapi.h interface.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h videodir.h
 interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
 menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
 osd.o      : osd.c config.h dvbapi.h interface.h osd.h tools.h
-vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h
-recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h
+vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
+recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h videodir.h
 remote.o   : remote.c remote.h tools.h
 svdrp.o    : svdrp.c svdrp.h config.h interface.h tools.h
 tools.o    : tools.c tools.h
+videodir.o : videodir.c tools.h videodir.h
 
 vdr: $(OBJS)
 	g++ -g -O2 $(OBJS) -lncurses -o vdr
diff --git a/Tools/epg2timers/epg2timers.cxx b/Tools/epg2timers/epg2timers.cxx
index 4a8f33336..07e8182d7 100644
--- a/Tools/epg2timers/epg2timers.cxx
+++ b/Tools/epg2timers/epg2timers.cxx
@@ -34,21 +34,46 @@ static const char channel_line[]    = "\t\t\t<tr><td bgcolor=\"#002b64\" align=c
 static const char title_line[]      = "\t\t\t\t<td bgcolor=\"#002b64\" align=left width=100%><span id=\"fb-w10\">";
 static const char summary_line[]    = "\t\t\t<table border=0 cellpadding=10 cellspacing=0 bgcolor=\"white\" width=100%>";
 static const char * const channel_names[] =
-{"RTL", "SAT1", "PRO7", "RTL2", "ARD", "BR3", "HR3", "NDR", "SWF", "WDR", "BR Alpha", "SWR BW", "Phoenix",
- "ZDF", "3sat", "Kinderkanal", "ARTE", "phoenix", "ORF Sat", "ZDF.info", "CNN", "Super RTL", "VOX", "DW TV",
- "Kabel1", "TM3", "DSF", "HOT", "BloombergTV", "Sky News", "KinderNet", "Alice", "n-tv", "Grand Tour.", "TW1",
- "Eins Extra", "Eins Festival", "Eins MuXx", "MDR", "ORB", "B1", "ARD Online-Kanal", "Premiere World Promo",
- "Premiere", "Star Kino", "Cine Action", "Cine Comedy", "Sci Fantasy", "Romantic Movies", "Studio Universal",
- "TV Niepokalanow", "Mosaico", "Andalucia TV", "TVC Internacional", "Nasza TV", "WishLine test", "Pro 7 Austria", 
- "Kabel 1 Schweiz", "Kabel 1 Austria", "Pro 7 Schweiz", "Kiosque", "KTO", "TCM", "Cartoon Network France & Spain", 
- "TVBS Europe", "TVBS Europe", "Travel", "TCM Espania", "MTV Spain", "TCM France", "RTL2 CH",
- "La Cinquieme", "ARTE", "Post Filial TV", "Canal Canaris", "Canal Canaris", "Canal Canaris", "Canal Canaris",
- "AB Sat Passion promo", "AB Channel 1", "Taquilla 0", "CSAT", "Mosaique", "Mosaique 2", "Mosaique 3", "Le Sesame C+", 
- "FEED", "RTM 1", "ESC 1", "TV5 Europe", "TV7 Tunisia", "ARTE", "RAI Uno", "RTP International",
- "Fashion TV", "VideoService", "Beta Research promo", "Canal Canarias", "TVC International", "Fitur", "Astra Info 1", 
- "Astra Info 2", "Astra Vision 1", "Astra Vision 1", "Astra Vision 1", "Astra Vision 1", "Astra Vision 1", 
- "Astra Vision 1", "Astra Vision 1", "RTL Tele Letzebuerg", "Astra Mosaic", "MHP test", "Bloomberg TV Spain", 
- "Video Italia", "AC 3 promo", ""
+{
+"3sat",
+"ARTE",
+"*B1 Berlin",
+"BR3",
+"Bloomberg TV",
+"BR Alpha",
+"CNN",
+"ARD",
+"*DW-tv",
+"Eins Extra",
+"Eins Festival",
+"Eins MuXx",
+"euroNEWS",
+"HR3",
+"Kabel1",
+"Kinderkanal",
+"MDR",
+"MTV",
+"NDR",
+"NTV",
+"ORB",
+"*ORF1",
+"Phoenix",
+"PRO7",
+"RTL",
+"RTL2",
+"SAT1",
+"skynews",
+"SWF",
+"Super RTL",
+"TM3",
+"TW1",
+"VOX",
+"WDR",
+"Theaterkanal",
+"ZDF",
+"ZDF.doku",
+"ZDF.info", 
+""
 };
 static const int month_lengths[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
@@ -240,3 +265,4 @@ main()
          read_summary(summary);
    }
 }
+
diff --git a/channels.conf b/channels.conf
index 870a6d67d..eefaf52da 100644
--- a/channels.conf
+++ b/channels.conf
@@ -113,4 +113,3 @@ MHP test:12604:h:1:22000:5632:8191:0:0
 Bloomberg TV Spain:12610:v:1:22000:45:49:0:0
 Video Italia:12610:v:1:22000:121:122:0:0
 AC 3 promo:12670:v:1:22000:308:256:0:0
-Rtlneu:12188:h:1:27500:163:104:0:0
diff --git a/config.c b/config.c
index 6b5e04936..c144d6c02 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.15 2000/07/25 16:21:20 kls Exp $
+ * $Id: config.c 1.17 2000/08/06 12:27:38 kls Exp $
  */
 
 #include "config.h"
@@ -294,7 +294,7 @@ cTimer& cTimer::operator= (const cTimer &Timer)
 
 const char *cTimer::ToText(cTimer *Timer)
 {
-  asprintf(&buffer, "%d:%d:%s:%d:%d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
+  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
   return buffer;
 }
 
@@ -473,3 +473,14 @@ cChannels Channels;
 
 cTimers Timers;
 
+cTimer *cTimers::GetTimer(cTimer *Timer)
+{
+  cTimer *ti = (cTimer *)First();
+  while (ti) {
+        if (ti->channel == Timer->channel && ti->day == Timer->day && ti->start == Timer->start && ti->stop == Timer->stop)
+           return ti;
+        ti = (cTimer *)ti->Next();
+        }
+  return NULL;
+}
+
diff --git a/config.h b/config.h
index be1c7ec70..1b21d3417 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.11 2000/07/23 17:17:10 kls Exp $
+ * $Id: config.h 1.14 2000/08/06 12:22:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,6 +17,8 @@
 #include "dvbapi.h"
 #include "tools.h"
 
+#define VDRVERSION "0.61"
+
 #define MaxBuffer 10000
 
 enum eKeys { // "Up" and "Down" must be the first two keys!
@@ -181,7 +183,11 @@ template<class T> class cConfig : public cList<T> {
   };
 
 class cChannels : public cConfig<cChannel> {};
-class cTimers : public cConfig<cTimer> {};
+
+class cTimers : public cConfig<cTimer> {
+public:
+  cTimer *GetTimer(cTimer *Timer);
+  };
 
 extern int CurrentChannel;
 
diff --git a/dvbapi.c b/dvbapi.c
index a9673a7ac..0562a4f58 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.15 2000/07/21 13:18:02 kls Exp $
+ * $Id: dvbapi.c 1.22 2000/08/06 14:06:14 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include "interface.h"
 #include "tools.h"
+#include "videodir.h"
 
 #define VIDEODEVICE "/dev/video"
 
@@ -50,9 +51,12 @@
 // 'signed'), so let's use 1GB for absolute safety (the actual file size
 // may be slightly higher because we stop recording only before the next
 // 'I' frame, to have a complete Group Of Pictures):
-#define MAXVIDEOFILESIZE (1024*1024*1024)
+#define MAXVIDEOFILESIZE (1024*1024*1024) // Byte
 #define MAXFILESPERRECORDING 255
 
+#define MINFREEDISKSPACE    (512) // MB
+#define DISKCHECKINTERVAL   100 // seconds
+
 #define INDEXFILESUFFIX     "/index.vdr"
 #define RESUMEFILESUFFIX    "/resume.vdr"
 #define RECORDFILESUFFIX    "/%03d.vdr"
@@ -341,9 +345,8 @@ class cRingBuffer {
   int Free(void) { return ((tail >= head) ? size + head - tail : head - tail) - 1; }
   int Available(void) { return (tail >= head) ? tail - head : size - head + tail; }
   int Readable(void) { return (tail >= head) ? size - tail - (head ? 0 : 1) : head - tail - 1; } // keep a 1 byte gap!
-  int Writeable(void) { return (tail > head) ? tail - head : size - head; }
+  int Writeable(void) { return (tail >= head) ? tail - head : size - head; }
   int Byte(int Offset);
-  bool WaitForOutFile(int Timeout);
 public:
   cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit = 0, int AvailLimit = 0);
   virtual ~cRingBuffer();
@@ -404,22 +407,6 @@ void cRingBuffer::Skip(int n)
      }
 }
 
-bool cRingBuffer::WaitForOutFile(int Timeout)
-{
-  fd_set set;
-  FD_ZERO(&set);
-  FD_SET(*outFile, &set);
-  struct timeval timeout;
-  timeout.tv_sec = 0;
-  timeout.tv_usec = Timeout;
-  if (select(FD_SETSIZE, NULL, &set, NULL, &timeout) > 0) {
-     if (FD_ISSET(*outFile, &set))
-        return true;
-     }
-  esyslog(LOG_ERR, "ERROR: timeout in WaitForOutFile(%d)", Timeout);  
-  return false;
-}
-
 int cRingBuffer::Read(int Max)
 {
   if (buffer) {
@@ -598,6 +585,8 @@ class cRecordBuffer : public cFileBuffer {
   int recordFile;
   uchar tagAudio, tagVideo;
   bool ok, synced;
+  time_t lastDiskSpaceCheck;
+  bool RunningLowOnDiskSpace(void);
   int Synchronize(void);
   bool NextFile(void);
   virtual int Write(int Max = -1);
@@ -615,6 +604,7 @@ cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
   recordFile = -1;
   tagAudio = tagVideo = 0;
   ok = synced = false;
+  lastDiskSpaceCheck = time(NULL);
   if (!fileName)
      return;//XXX find a better way???
   // Find the highest existing file suffix:
@@ -636,7 +626,20 @@ cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
 cRecordBuffer::~cRecordBuffer()
 {
   if (recordFile >= 0)
-     close(recordFile);
+     CloseVideoFile(recordFile);
+}
+
+bool cRecordBuffer::RunningLowOnDiskSpace(void)
+{
+  if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
+     uint Free = FreeDiskSpaceMB(fileName);
+     lastDiskSpaceCheck = time(NULL);
+     if (Free < MINFREEDISKSPACE) {
+        dsyslog(LOG_INFO, "low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
+        return true;
+        }
+     }
+  return false;
 }
 
 int cRecordBuffer::Synchronize(void)
@@ -714,20 +717,22 @@ int cRecordBuffer::Synchronize(void)
 
 bool cRecordBuffer::NextFile(void)
 {
-  if (recordFile >= 0 && fileSize > MAXVIDEOFILESIZE && pictureType == I_FRAME) {
-     if (close(recordFile) < 0)
-        LOG_ERROR;
-        // don't return 'false', maybe we can still record into the next file
-     recordFile = -1;
-     fileNumber++;
-     if (fileNumber == 0)
-        esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
-     fileSize = 0;
+  if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
+     if (fileSize > MAXVIDEOFILESIZE || RunningLowOnDiskSpace()) {
+        if (CloseVideoFile(recordFile) < 0)
+           LOG_ERROR;
+           // don't return 'false', maybe we can still record into the next file
+        recordFile = -1;
+        fileNumber++;
+        if (fileNumber == 0)
+           esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+        fileSize = 0;
+        }
      }
   if (recordFile < 0) {
      sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
      dsyslog(LOG_INFO, "recording to '%s'", fileName);
-     recordFile = open(fileName, O_RDWR | O_CREAT | O_NONBLOCK, S_IRUSR | S_IWUSR);
+     recordFile = OpenVideoFile(fileName, O_RDWR | O_CREAT | O_NONBLOCK);
      if (recordFile < 0) {
         LOG_ERROR;
         return false;
@@ -781,7 +786,7 @@ int cRecordBuffer::WriteWithTimeout(bool EndIfEmpty)
 
 // --- cReplayBuffer ---------------------------------------------------------
 
-enum eReplayMode { rmPlay, rmFastForward, rmFastRewind };
+enum eReplayMode { rmPlay, rmFastForward, rmFastRewind, rmSlowRewind };
 
 class cReplayBuffer : public cFileBuffer {
 private:
@@ -790,6 +795,7 @@ class cReplayBuffer : public cFileBuffer {
   eReplayMode mode;
   bool skipAudio;
   int lastIndex;
+  int brakeCounter;
   void SkipAudioBlocks(void);
   bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
   void Close(void);
@@ -811,6 +817,7 @@ cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
   fileOffset = 0;
   replayFile = -1;
   mode = rmPlay;
+  brakeCounter = 0;
   skipAudio = false;
   lastIndex = -1;
   if (!fileName)
@@ -841,6 +848,7 @@ void cReplayBuffer::SetMode(eReplayMode Mode)
 {
   mode = Mode;
   skipAudio = Mode != rmPlay;
+  brakeCounter = 0;
   if (mode != rmPlay)
      Clear();
 }
@@ -974,6 +982,10 @@ int cReplayBuffer::Read(int Max = -1)
         if (Index >= 0) {
            uchar FileNumber;
            int FileOffset, Length;
+           if (mode == rmSlowRewind && (brakeCounter++ % 24) != 0) {
+              // show every I_FRAME 24 times in rmSlowRewind mode to achieve roughly the same speed as in slow forward mode
+              Index = index->GetNextIFrame(Index, true, &FileNumber, &FileOffset, &Length); // jump ahead one frame
+              }
            Index = index->GetNextIFrame(Index, mode == rmFastForward, &FileNumber, &FileOffset, &Length);
            if (Index >= 0) {
               if (!NextFile(FileNumber, FileOffset))
@@ -1014,28 +1026,27 @@ int cReplayBuffer::Read(int Max = -1)
 int cReplayBuffer::Write(int Max)
 {
   int Written = 0;
-
-  do {
-     if (skipAudio) {
-        SkipAudioBlocks();
-        Max = GetAvPesLength();
-        }
-     while (Max) {
-           int w = cFileBuffer::Write(Max);
-           if (w >= 0) {
-              fileOffset += w;
-              Written += w;
-              if (Max < 0)
-                 break;
-              Max -= w;
-              }
-           else
-              return w;
-               //XXX??? Why does the buffer get empty here???
-           if (Empty() || !WaitForOutFile(1000000))
-              return Written;
+  int Av = Available();
+  if (skipAudio) {
+     SkipAudioBlocks();
+     Max = GetAvPesLength();
+     fileOffset += Av - Available();
+     }
+  if (Max) {
+     int w;
+     do {
+        w = cFileBuffer::Write(Max);
+        if (w >= 0) {
+           fileOffset += w;
+           Written += w;
+           if (Max < 0)
+              break;
+           Max -= w;
            }
-     } while (skipAudio && Available());
+        else
+           return w;
+        } while (Max > 0); // we MUST write this entire AV_PES block
+     }
   return Written;
 }
 
@@ -1076,7 +1087,7 @@ cDvbApi::~cDvbApi()
 {
   if (videoDev >= 0) {
      Close();
-     StopReplay();
+     Stop();
      StopRecord();
      close(videoDev);
      }
@@ -1119,9 +1130,13 @@ bool cDvbApi::Init(void)
          dsyslog(LOG_INFO, "probing %s", fileName);
          int f = open(fileName, O_RDWR);
          if (f >= 0) {
+            struct video_capability cap;
+            int r = ioctl(f, VIDIOCGCAP, &cap);
             close(f);
-            dvbApi[i] = new cDvbApi(fileName);
-            NumDvbApis++;
+            if (r == 0 && (cap.type & VID_TYPE_DVB)) {
+               dvbApi[i] = new cDvbApi(fileName);
+               NumDvbApis++;
+               }
             }
          else {
             if (errno != ENODEV)
@@ -1136,10 +1151,12 @@ bool cDvbApi::Init(void)
          }
       }
   PrimaryDvbApi = dvbApi[0];
-  if (NumDvbApis > 0)
+  if (NumDvbApis > 0) {
      isyslog(LOG_INFO, "found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
-  else
+     } // need braces because of isyslog-macro
+  else {
      esyslog(LOG_ERR, "ERROR: no video device found, giving up!");
+     }
   return NumDvbApis > 0;
 }
 
@@ -1222,7 +1239,10 @@ void cDvbApi::Open(int w, int h)
 void cDvbApi::Close(void)
 {
 #ifdef DEBUG_OSD
-  delwin(window);
+  if (window) {
+     delwin(window);
+     window = 0;
+     }
 #else
   Cmd(OSD_Close);
 #endif
@@ -1372,7 +1392,7 @@ bool cDvbApi::StartRecord(const char *FileName)
      }
   if (videoDev >= 0) {
 
-     StopReplay(); // TODO: remove this if the driver is able to do record and replay at the same time
+     Stop(); // TODO: remove this if the driver is able to do record and replay at the same time
 
      // Check FileName:
 
@@ -1494,7 +1514,7 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
      esyslog(LOG_ERR, "ERROR: StartReplay() called while recording - ignored!");
      return false;
      }
-  StopReplay();
+  Stop();
   if (videoDev >= 0) {
 
      lastProgress = lastTotal = -1;
@@ -1565,49 +1585,69 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
                      }
                   if (FD_ISSET(fromMain, &setIn)) {
                      switch (readchar(fromMain)) {
-                       case dvbStop:        SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                            Buffer->Stop(); break;
-                       case dvbPauseReplay: SetReplayMode(Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
-                                            Paused = !Paused;
-                                            if (FastForward || FastRewind) {
-                                               SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                               Buffer->Clear();
-                                               }
-                                            FastForward = FastRewind = false;
+                       case dvbStop:     SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                         Buffer->Stop();
+                                         break;
+                       case dvbPause:    SetReplayMode(Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
+                                         Paused = !Paused;
+                                         if (FastForward || FastRewind) {
+                                            SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            Buffer->Clear();
+                                            }
+                                         FastForward = FastRewind = false;
+                                         Buffer->SetMode(rmPlay);
+                                         break;
+                       case dvbPlay:     if (FastForward || FastRewind || Paused) {
+                                            SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            SetReplayMode(VID_PLAY_NORMAL);
+                                            FastForward = FastRewind = Paused = false;
                                             Buffer->SetMode(rmPlay);
-                                            break;
-                       case dvbFastForward: SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            }
+                                         break;
+                       case dvbForward:  SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                         Buffer->Clear();
+                                         FastForward = !FastForward;
+                                         FastRewind = false;
+                                         if (Paused) {
+                                            Buffer->SetMode(rmPlay);
+                                            SetReplayMode(FastForward ? VID_PLAY_SLOW_MOTION : VID_PLAY_PAUSE);
+                                            }
+                                         else {
                                             SetReplayMode(VID_PLAY_NORMAL);
-                                            FastForward = !FastForward;
-                                            FastRewind = Paused = false;
-                                            Buffer->Clear();
                                             Buffer->SetMode(FastForward ? rmFastForward : rmPlay);
-                                            break;
-                       case dvbFastRewind:  SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                            }
+                                         break;
+                       case dvbBackward: SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                         Buffer->Clear();
+                                         FastRewind = !FastRewind;
+                                         FastForward = false;
+                                         if (Paused) {
+                                            Buffer->SetMode(FastRewind ? rmSlowRewind : rmPlay);
+                                            SetReplayMode(FastRewind ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
+                                            }
+                                         else {
                                             SetReplayMode(VID_PLAY_NORMAL);
-                                            FastRewind = !FastRewind;
-                                            FastForward = Paused = false;
-                                            Buffer->Clear();
                                             Buffer->SetMode(FastRewind ? rmFastRewind : rmPlay);
-                                            break;
-                       case dvbSkip:        {
-                                              int Seconds;
-                                              if (readint(fromMain, Seconds)) {
-                                                 SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                                 SetReplayMode(VID_PLAY_NORMAL);
-                                                 FastForward = FastRewind = Paused = false;
-                                                 Buffer->SetMode(rmPlay);
-                                                 Buffer->SkipSeconds(Seconds);
-                                                 }
-                                            }
-                                            break;
-                       case dvbGetIndex:    {
-                                              int Current, Total;
-                                              Buffer->GetIndex(Current, Total);
-                                              writeint(toMain, Current);
-                                              writeint(toMain, Total);
                                             }
-                                            break;
+                                         break;
+                       case dvbSkip:     {
+                                           int Seconds;
+                                           if (readint(fromMain, Seconds)) {
+                                              SetReplayMode(VID_PLAY_CLEAR_BUFFER);
+                                              SetReplayMode(VID_PLAY_NORMAL);
+                                              FastForward = FastRewind = Paused = false;
+                                              Buffer->SetMode(rmPlay);
+                                              Buffer->SkipSeconds(Seconds);
+                                              }
+                                         }
+                                         break;
+                       case dvbGetIndex: {
+                                           int Current, Total;
+                                           Buffer->GetIndex(Current, Total);
+                                           writeint(toMain, Current);
+                                           writeint(toMain, Total);
+                                         }
+                                         break;
                        }
                      }
                   }
@@ -1633,7 +1673,7 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
   return false;
 }
 
-void cDvbApi::StopReplay(void)
+void cDvbApi::Stop(void)
 {
   if (pidReplay) {
      writechar(toReplay, dvbStop);
@@ -1646,22 +1686,28 @@ void cDvbApi::StopReplay(void)
      }
 }
 
-void cDvbApi::PauseReplay(void)
+void cDvbApi::Pause(void)
+{
+  if (pidReplay)
+     writechar(toReplay, dvbPause);
+}
+
+void cDvbApi::Play(void)
 {
   if (pidReplay)
-     writechar(toReplay, dvbPauseReplay);
+     writechar(toReplay, dvbPlay);
 }
 
-void cDvbApi::FastForward(void)
+void cDvbApi::Forward(void)
 {
   if (pidReplay)
-     writechar(toReplay, dvbFastForward);
+     writechar(toReplay, dvbForward);
 }
 
-void cDvbApi::FastRewind(void)
+void cDvbApi::Backward(void)
 {
   if (pidReplay)
-     writechar(toReplay, dvbFastRewind);
+     writechar(toReplay, dvbBackward);
 }
 
 void cDvbApi::Skip(int Seconds)
diff --git a/dvbapi.h b/dvbapi.h
index a43ba0ee7..25452cfa7 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.11 2000/06/24 14:03:57 kls Exp $
+ * $Id: dvbapi.h 1.12 2000/07/30 15:01:01 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -104,9 +104,10 @@ class cDvbApi {
 
 private:
   enum { dvbStop = 1, // let's not have 0 as a command
-         dvbPauseReplay,
-         dvbFastForward,
-         dvbFastRewind,
+         dvbPause,
+         dvbPlay,
+         dvbForward,
+         dvbBackward,
          dvbSkip,
          dvbGetIndex,
        };
@@ -136,13 +137,15 @@ class cDvbApi {
        // If there is already a replay session active, it will be stopped
        // and the new file will be played back.
        // If provided Title will be used in the progress display.
-  void StopReplay(void);
+  void Stop(void);
        // Stops the current replay session (if any).
-  void PauseReplay(void);
+  void Pause(void);
        // Pauses the current replay session, or resumes a paused session.
-  void FastForward(void);
+  void Play(void);
+       // Resumes normal replay mode.
+  void Forward(void);
        // Runs the current replay session forward at a higher speed.
-  void FastRewind(void);
+  void Backward(void);
        // Runs the current replay session backwards at a higher speed.
   void Skip(int Seconds);
        // Skips the given number of seconds in the current replay session.
diff --git a/menu.c b/menu.c
index 17a9b0b5c..15c8379a0 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.20 2000/07/24 16:25:53 kls Exp $
+ * $Id: menu.c 1.22 2000/08/06 07:02:52 kls Exp $
  */
 
 #include "menu.h"
@@ -512,7 +512,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditIntItem( "Vpid",         &data.vpid, 0, 10000)); //TODO exact limits???
      Add(new cMenuEditIntItem( "Apid",         &data.apid, 0, 10000)); //TODO exact limits???
      Add(new cMenuEditIntItem( "CA",           &data.ca, 0, cDvbApi::NumDvbApis));
-     Add(new cMenuEditIntItem( "Pnr",          &data.pnr, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( "Pnr",          &data.pnr, 0));
      }
 }
 
@@ -1243,7 +1243,7 @@ cReplayControl::cReplayControl(void)
 cReplayControl::~cReplayControl()
 {
   Hide();
-  dvbApi->StopReplay();
+  dvbApi->Stop();
 }
 
 void cReplayControl::SetRecording(const char *FileName, const char *Title)
@@ -1278,13 +1278,13 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
   if (visible)
      shown = dvbApi->ShowProgress(!shown) || shown;
   switch (Key) {
-    case kUp:      dvbApi->Skip(-INT_MAX); break;
-    case kDown:    dvbApi->PauseReplay(); break;
+    case kUp:      dvbApi->Play(); break;
+    case kDown:    dvbApi->Pause(); break;
     case kBlue:    Hide();
-                   dvbApi->StopReplay();
+                   dvbApi->Stop();
                    return osEnd;
-    case kLeft:    dvbApi->FastRewind(); break;
-    case kRight:   dvbApi->FastForward(); break;
+    case kLeft:    dvbApi->Backward(); break;
+    case kRight:   dvbApi->Forward(); break;
     case kGreen:   dvbApi->Skip(-60); break;
     case kYellow:  dvbApi->Skip(60); break;
     case kMenu:    Hide(); return osMenu; // allow direct switching to menu
diff --git a/osd.c b/osd.c
index ee9ba287d..3c323738b 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.4 2000/04/24 09:44:31 kls Exp $
+ * $Id: osd.c 1.5 2000/07/26 17:35:09 kls Exp $
  */
 
 #include "osd.h"
@@ -166,14 +166,20 @@ void cOsdMenu::CursorUp(void)
 {
   if (current > 0) {
      DisplayCurrent(false);
-     if (--current < first) {
+     if (current == first) {
         first -= MAXOSDITEMS;
         if (first < 0)
            first = 0;
+        if (current - MAXOSDITEMS > 0)
+           current -= MAXOSDITEMS;
+        else
+           current--;
         Display();
         }
-     else
+     else {
+        current--;
         DisplayCurrent(true);
+        }
      }
 }
 
@@ -182,14 +188,20 @@ void cOsdMenu::CursorDown(void)
   int count = Count();
   if (current < count - 1) {
      DisplayCurrent(false);
-     if (++current >= first + MAXOSDITEMS) {
+     if (current == first + MAXOSDITEMS - 1) {
         first += MAXOSDITEMS;
         if (first > count - MAXOSDITEMS)
            first = count - MAXOSDITEMS;
+        if (current + MAXOSDITEMS < count)
+           current += MAXOSDITEMS;
+        else
+           current++;
         Display();
         }
-     else
+     else {
+        current++;
         DisplayCurrent(true);
+        }
      }
 }
 
diff --git a/recording.c b/recording.c
index e37ccd85e..9f3b38858 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.12 2000/07/24 16:31:07 kls Exp $
+ * $Id: recording.c 1.15 2000/07/29 14:08:17 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -13,9 +13,11 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include "interface.h"
 #include "tools.h"
+#include "videodir.h"
 
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
@@ -24,40 +26,12 @@
 
 #define SUMMARYFILESUFFIX "/summary.vdr"
 
-#define FINDCMD      "find %s -type d -name '%s' | sort -df"
+#define FINDCMD      "find %s -follow -type d -name '%s' 2> /dev/null | sort -df"
 
-#define DFCMD        "df -m %s"
 #define MINDISKSPACE 1024 // MB
 
 #define DISKCHECKDELTA 300 // seconds between checks for free disk space
 
-const char *BaseDir = "/video";
-
-static bool LowDiskSpace(void)
-{
-  //TODO Find a simpler way to determine the amount of free disk space!
-  bool result = true;
-  char *cmd = NULL;
-  asprintf(&cmd, DFCMD, BaseDir);
-  FILE *p = popen(cmd, "r");
-  if (p) {
-     char *s;
-     while ((s = readline(p)) != NULL) {
-           if (*s == '/') {
-              int available;
-              sscanf(s, "%*s %*d %*d %d", &available);
-              result = available < MINDISKSPACE;
-              break;
-              }
-           }
-     pclose(p);
-     }
-  else
-     esyslog(LOG_ERR, "ERROR: can't open pipe for cmd '%s'", cmd);
-  delete cmd;
-  return result;
-}
-
 void AssertFreeDiskSpace(void)
 {
   // With every call to this function we try to actually remove
@@ -65,7 +39,7 @@ void AssertFreeDiskSpace(void)
   // it will get removed during the next call.
   static time_t LastFreeDiskCheck = 0;
   if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA) {
-     if (LowDiskSpace()) {
+     if (!VideoFileSpaceAvailable(MINDISKSPACE)) {
         // Remove the oldest file that has been "deleted":
         cRecordings Recordings;
         if (Recordings.Load(true)) {
@@ -123,7 +97,7 @@ cRecording::cRecording(const char *FileName)
 {
   titleBuffer = NULL;
   fileName = strdup(FileName);
-  FileName += strlen(BaseDir) + 1;
+  FileName += strlen(VideoDirectory) + 1;
   char *p = strrchr(FileName, '/');
 
   name = NULL;
@@ -189,7 +163,7 @@ const char *cRecording::FileName(void)
 {
   if (!fileName) {
      struct tm *t = localtime(&start);
-     asprintf(&fileName, NAMEFORMAT, BaseDir, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
+     asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
      if (fileName)
         strreplace(fileName, ' ', '_');
      }
@@ -239,10 +213,7 @@ bool cRecording::Delete(void)
   if (strcmp(ext, RECEXT) == 0) {
      strncpy(ext, DELEXT, strlen(ext));
      isyslog(LOG_INFO, "deleting recording %s", FileName());
-     if (rename(FileName(), NewName) == -1) {
-        esyslog(LOG_ERR, "ERROR: %s: %s", FileName(), strerror(errno));
-        result = false;
-        }
+     result = RenameVideoFile(FileName(), NewName);
      }
   delete NewName;
   return result;
@@ -251,7 +222,7 @@ bool cRecording::Delete(void)
 bool cRecording::Remove(void)
 {
   isyslog(LOG_INFO, "removing recording %s", FileName());
-  return RemoveFileOrDir(FileName());
+  return RemoveVideoFile(FileName());
 }
 
 // --- cRecordings -----------------------------------------------------------
@@ -261,7 +232,7 @@ bool cRecordings::Load(bool Deleted)
   Clear();
   bool result = false;
   char *cmd = NULL;
-  asprintf(&cmd, FINDCMD, BaseDir, Deleted ? "*" DELEXT : "*" RECEXT);
+  asprintf(&cmd, FINDCMD, VideoDirectory, Deleted ? "*" DELEXT : "*" RECEXT);
   FILE *p = popen(cmd, "r");
   if (p) {
      char *s;
diff --git a/recording.h b/recording.h
index e501af822..dc3b3d748 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.7 2000/07/23 19:06:14 kls Exp $
+ * $Id: recording.h 1.9 2000/07/28 13:53:54 kls Exp $
  */
 
 #ifndef __RECORDING_H
diff --git a/remote.c b/remote.c
index 931cfd33c..0476962cc 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.10 2000/07/15 16:34:35 kls Exp $
+ * $Id: remote.c 1.11 2000/07/29 16:23:47 kls Exp $
  */
 
 #include "remote.h"
@@ -71,7 +71,11 @@ void cRcIoKBD::Flush(int WaitSeconds)
 bool cRcIoKBD::InputAvailable(bool Wait)
 {
   timeout(Wait ? 1000 : 10);
-  return true;//XXX
+  int ch = getch();
+  if (ch == ERR)
+     return false;
+  ungetch(ch);
+  return true;
 }
 
 bool cRcIoKBD::GetCommand(unsigned int *Command, unsigned short *)
diff --git a/svdrp.c b/svdrp.c
index 6873d166e..9fef18484 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.2 2000/07/24 16:43:51 kls Exp $
+ * $Id: svdrp.c 1.4 2000/08/06 12:52:04 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -145,7 +145,12 @@ const char *HelpPages[] = {
   "    by the LSTC command.",
   "NEWT <settings>\n"
   "    Create a new timer. Settings must be in the same format as returned\n"
-  "    by the LSTT command.",
+  "    by the LSTT command. It is an error if a timer with the same channel,\n"
+  "    day, start and stop time already exists.",
+  "UPDT <settings>\n"
+  "    Updates a timer. Settings must be in the same format as returned\n"
+  "    by the LSTT command. If a timer with the same channel, day, start\n"
+  "    and stop time does not yet exists, it will be created.",
   "QUIT\n"
   "    Exit vdr (SVDRP).\n"
   "    You can also hit Ctrl-D to exit.",
@@ -369,7 +374,7 @@ void cSVDRP::CmdHelp(const char *Option)
         }
      }
   else {
-     Reply(-214, "This is VDR version 0.6"); //XXX dynamically insert version number
+     Reply(-214, "This is VDR version %s", VDRVERSION);
      Reply(-214, "Topics:");
      const char **hp = HelpPages;
      while (*hp) {
@@ -548,13 +553,48 @@ void cSVDRP::CmdNewt(const char *Option)
   if (*Option) {
      cTimer *timer = new cTimer;
      if (timer->Parse(Option)) {
-        Timers.Add(timer);
+        cTimer *t = Timers.GetTimer(timer);
+        if (!t) {
+           Timers.Add(timer);
+           Timers.Save();
+           isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+           Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+           return;
+           }
+        else
+           Reply(550, "Timer already defined: %d %s", t->Index() + 1, t->ToText());
+        }
+     else
+        Reply(501, "Error in timer settings");
+     delete timer;
+     }
+  else
+     Reply(501, "Missing timer settings");
+}
+
+void cSVDRP::CmdUpdt(const char *Option)
+{
+  if (*Option) {
+     cTimer *timer = new cTimer;
+     if (timer->Parse(Option)) {
+        cTimer *t = Timers.GetTimer(timer);
+        if (t) {
+           t->Parse(Option);
+           delete timer;
+           timer = t;
+           isyslog(LOG_INFO, "timer %d updated", timer->Index() + 1);
+           }
+        else {
+           Timers.Add(timer);
+           isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+           }
         Timers.Save();
-        isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
         Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+        return;
         }
      else
         Reply(501, "Error in timer settings");
+     delete timer;
      }
   else
      Reply(501, "Missing timer settings");
@@ -583,6 +623,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("MOVT"))  CmdMovt(s);
   else if (CMD("NEWC"))  CmdNewc(s);
   else if (CMD("NEWT"))  CmdNewt(s);
+  else if (CMD("UPDT"))  CmdUpdt(s);
   else if (CMD("QUIT")
        ||  CMD("\x04"))  Close();
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
@@ -598,7 +639,7 @@ void cSVDRP::Process(void)
         //TODO how can we get the *full* hostname?
         gethostname(buffer, sizeof(buffer));
         time_t now = time(NULL);
-        Reply(220, "%s SVDRP VideoDiskRecorder 0.6; %s", buffer, ctime(&now));//XXX dynamically insert version number
+        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", VDRVERSION, buffer, ctime(&now));
         }
      int rbytes = readstring(filedes, buffer, sizeof(buffer) - 1);
      if (rbytes > 0) {
diff --git a/svdrp.h b/svdrp.h
index c63854240..3c1cafa8f 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.1 2000/07/23 14:49:30 kls Exp $
+ * $Id: svdrp.h 1.2 2000/08/06 12:45:28 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -42,6 +42,7 @@ class cSVDRP {
   void CmdMovt(const char *Option);
   void CmdNewc(const char *Option);
   void CmdNewt(const char *Option);
+  void CmdUpdt(const char *Option);
   void Execute(char *Cmd);
 public:
   cSVDRP(int Port);
diff --git a/timers.conf b/timers.conf
index 659faaaff..47b40674a 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,9 +1,13 @@
-1:10:-T-----:2058:2202:99:10:Quarks:
-1:5:-T-----:2100:2205:99:10:RudisSuchmaschine:
+0:10:-T-----:2058:2202:99:10:Quarks:
+0:5:-T-----:2100:2205:99:10:RudisSuchmaschine:
 1:10:---T---:2158:2250:99:99:DiePlaneten:
-1:3:---T---:2211:2300:99:10:Switch:
+0:3:---T---:2211:2300:99:10:Switch:
 1:15:-----S-:1358:1435:99:7:Neues:
-1:1:-----S-:1445:1600:99:30:Hammerman:
+1:1:-----S-:1445:1610:99:30:Hammerman:
 0:2:-----S-:2200:2350:99:30:Wochenshow:
 1:11:------S:2058:2120:99:10:Centauri:
 0:15:MTWTF--:1828:1901:10:5:nano:
+1:1:-TWTF--:0858:0940:99:99:Ellen:
+1:2:----F--:2140:2225:10:10:WWW:
+1:11:-----S-:2158:2235:99:99:Computer:
+1:23:-----S-:2200:0020:99:99:BBC special:
diff --git a/tools.c b/tools.c
index 998d91b3a..0dca69ee3 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.10 2000/07/23 13:16:54 kls Exp $
+ * $Id: tools.c 1.13 2000/07/29 18:41:45 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -145,6 +145,51 @@ bool isnumber(const char *s)
   return true;
 }
 
+#define DFCMD  "df -m %s"
+
+uint FreeDiskSpaceMB(const char *Directory)
+{
+  //TODO Find a simpler way to determine the amount of free disk space!
+  uint Free = 0;
+  char *cmd = NULL;
+  asprintf(&cmd, DFCMD, Directory);
+  FILE *p = popen(cmd, "r");
+  if (p) {
+     char *s;
+     while ((s = readline(p)) != NULL) {
+           if (*s == '/') {
+              uint available;
+              sscanf(s, "%*s %*d %*d %u", &available);
+              Free = available;
+              break;
+              }
+           }
+     pclose(p);
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: can't open pipe for cmd '%s'", cmd);
+  delete cmd;
+  return Free;
+}
+
+bool DirectoryOk(const char *DirName, bool LogErrors)
+{
+  struct stat ds;
+  if (stat(DirName, &ds) == 0) {
+     if (S_ISDIR(ds.st_mode)) {
+        if (access(DirName, R_OK | W_OK | X_OK) == 0)
+           return true;
+        else if (LogErrors)
+           esyslog(LOG_ERR, "ERROR: can't access %s", DirName);
+        }
+     else if (LogErrors)
+        esyslog(LOG_ERR, "ERROR: %s is not a directory", DirName);
+     }
+  else if (LogErrors)
+     LOG_ERROR_STR(DirName);
+  return false;
+}
+
 bool MakeDirs(const char *FileName, bool IsDirectory)
 {
   bool result = true;
@@ -157,7 +202,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory)
            *p = 0;
         struct stat fs;
         if (stat(s, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
-           isyslog(LOG_INFO, "creating directory %s", s);
+           dsyslog(LOG_INFO, "creating directory %s", s);
            if (mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {
               esyslog(LOG_ERR, "ERROR: %s: %s", s, strerror(errno));
               result = false;
@@ -173,7 +218,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory)
   return result;
 }
 
-bool RemoveFileOrDir(const char *FileName)
+bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
 {
   struct stat st;
   if (stat(FileName, &st) == 0) {
@@ -185,23 +230,43 @@ bool RemoveFileOrDir(const char *FileName)
                  if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
                     char *buffer;
                     asprintf(&buffer, "%s/%s", FileName, e->d_name);
+                    if (FollowSymlinks) {
+                       int size = strlen(buffer) * 2; // should be large enough
+                       char *l = new char[size];
+                       int n = readlink(buffer, l, size);
+                       if (n < 0) {
+                          if (errno != EINVAL)
+                             LOG_ERROR_STR(buffer);
+                          }
+                       else if (n < size) {
+                          l[n] = 0;
+                          dsyslog(LOG_INFO, "removing %s", l);
+                          if (remove(l) < 0)
+                             LOG_ERROR_STR(l);
+                          }
+                       else
+                          esyslog(LOG_ERR, "ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
+                       delete l;
+                       }
+                    dsyslog(LOG_INFO, "removing %s", buffer);
                     if (remove(buffer) < 0)
-                       esyslog(LOG_ERR, "ERROR: %s: %s", buffer, strerror(errno));
+                       LOG_ERROR_STR(buffer);
                     delete buffer;
                     }
                  }
            closedir(d);
            }
         else {
-           esyslog(LOG_ERR, "ERROR: %s: %s", FileName, strerror(errno));
+           LOG_ERROR_STR(FileName);
            return false;
            }
         }
+     dsyslog(LOG_INFO, "removing %s", FileName);
      if (remove(FileName) == 0)
         return true;
      }
   else
-     esyslog(LOG_ERR, "ERROR: %s: %s", FileName, strerror(errno));
+     LOG_ERROR_STR(FileName);
   return false;
 }
 
diff --git a/tools.h b/tools.h
index ecf42be62..563f3d065 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.10 2000/07/23 13:16:37 kls Exp $
+ * $Id: tools.h 1.12 2000/07/29 10:56:00 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -43,8 +43,10 @@ char *skipspace(char *s);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
+uint FreeDiskSpaceMB(const char *Directory);
+bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
-bool RemoveFileOrDir(const char *FileName);
+bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool CheckProcess(pid_t pid);
 void KillProcess(pid_t pid, int Timeout = MAXPROCESSTIMEOUT);
 
diff --git a/vdr.c b/vdr.c
index 626e6dc04..69eceedb2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.23 2000/07/23 15:36:43 kls Exp $
+ * $Id: vdr.c 1.27 2000/07/29 19:01:57 kls Exp $
  */
 
 #include <getopt.h>
@@ -36,6 +36,7 @@
 #include "recording.h"
 #include "svdrp.h"
 #include "tools.h"
+#include "videodir.h"
 
 #ifdef REMOTE_KBD
 #define KEYS_CONF "keys-pc.conf"
@@ -64,38 +65,67 @@ int main(int argc, char *argv[])
   static struct option long_options[] = {
       { "daemon", no_argument,       NULL, 'd' },
       { "help",   no_argument,       NULL, 'h' },
+      { "log",    required_argument, NULL, 'l' },
       { "port",   required_argument, NULL, 'p' },
+      { "video",  required_argument, NULL, 'v' },
       { 0 }
     };
   
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "dhp:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "dhl:p:v:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'd': DaemonMode = true; break;
           case 'h': printf("Usage: vdr [OPTION]\n\n"
-                           "  -h,      --help        display this help and exit\n"
-                           "  -d,      --daemon      run in daemon mode\n"
-                           "  -p PORT, --port=PORT   use PORT for SVDRP ('0' turns off SVDRP)\n"
+                           "  -h,       --help        display this help and exit\n"
+                           "  -d,       --daemon      run in daemon mode\n"
+                           "  -l LEVEL, --log=LEVEL   set log level (default: 3)\n"
+                           "                          0 = no logging, 1 = errors only,\n"
+                           "                          2 = errors and info, 3 = errors, info and debug\n"
+                           "  -p PORT,  --port=PORT   use PORT for SVDRP (default: %d)\n"
+                           "                          0 turns off SVDRP\n"
+                           "  -v DIR,   --video=DIR   use DIR as video directory (default is %s)\n"
                            "\n"
-                           "Report bugs to <vdr-bugs@cadsoft.de>\n"
+                           "Report bugs to <vdr-bugs@cadsoft.de>\n",
+                           DEFAULTSVDRPPORT,
+                           VideoDirectory
                            );
                     return 0;
                     break;
+          case 'l': if (isnumber(optarg)) {
+                       int l = atoi(optarg);
+                       if (0 <= l && l <= 3) {
+                          SysLogLevel = l;
+                          break;
+                          }
+                       }
+                    fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
+                    abort();
+                    break;
           case 'p': if (isnumber(optarg))
-                       SVDRPport = strtol(optarg, NULL, 10);
+                       SVDRPport = atoi(optarg);
                     else {
                        fprintf(stderr, "vdr: invalid port number: %s\n", optarg);
-                       return 1;
+                       abort();
                        }
                     break;
+          case 'v': VideoDirectory = optarg;
+                    break;
           default:  abort();
           }
         }
 
   // Log file:
   
-  openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+  if (SysLogLevel > 0)
+     openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+
+  // Check the video directory:
+
+  if (!DirectoryOk(VideoDirectory, true)) {
+     fprintf(stderr, "vdr: can't access video directory %s\n", VideoDirectory);
+     abort();
+     }
 
   // Daemon mode:
 
@@ -104,8 +134,8 @@ int main(int argc, char *argv[])
      pid_t pid = fork();
      if (pid < 0) {
         fprintf(stderr, "%s\n", strerror(errno));
-        esyslog(LOG_ERR, strerror(errno));
-        return 1;
+        esyslog(LOG_ERR, "ERROR: %s", strerror(errno));
+        abort();
         }
      if (pid != 0)
         return 0; // initial program immediately returns
@@ -117,12 +147,12 @@ int main(int argc, char *argv[])
      abort();
 #endif
      }
-  isyslog(LOG_INFO, "started");
+  isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
 
   // DVB interfaces:
 
   if (!cDvbApi::Init())
-     return 1;
+     abort();
 
   // Configuration data:
 
@@ -241,6 +271,7 @@ int main(int argc, char *argv[])
   delete SVDRP;
   cDvbApi::Cleanup();
   isyslog(LOG_INFO, "exiting");
-  closelog();
+  if (SysLogLevel > 0)
+     closelog();
   return 0;
 }
diff --git a/videodir.c b/videodir.c
new file mode 100644
index 000000000..7bd6299a6
--- /dev/null
+++ b/videodir.c
@@ -0,0 +1,182 @@
+/*
+ * videodir.c: Functions to maintain a distributed video directory
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: videodir.c 1.1 2000/07/29 15:21:42 kls Exp $
+ */
+
+#include "videodir.h"
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include "tools.h"
+
+const char *VideoDirectory = "/video";
+
+class cVideoDirectory {
+private:
+  char *name, *stored, *adjusted;
+  int length, number, digits;
+public:
+  cVideoDirectory(void);
+  ~cVideoDirectory();
+  uint FreeMB(void);
+  const char *Name(void) { return name; }
+  const char *Stored(void) { return stored; }
+  int Length(void) { return length; }
+  bool IsDistributed(void) { return name != NULL; }
+  bool Next(void);
+  void Store(void);
+  const char *Adjust(const char *FileName);
+  };
+
+cVideoDirectory::cVideoDirectory(void)
+{
+  length = strlen(VideoDirectory);
+  name = (VideoDirectory[length - 1] == '0') ? strdup(VideoDirectory) : NULL;
+  stored = adjusted = NULL;
+  number = -1;
+  digits = 0;
+}
+
+cVideoDirectory::~cVideoDirectory()
+{
+  delete name;
+  delete stored;
+  delete adjusted;
+}
+
+uint cVideoDirectory::FreeMB(void)
+{
+  return FreeDiskSpaceMB(name ? name : VideoDirectory);
+}
+
+bool cVideoDirectory::Next(void)
+{
+  if (name) {
+     if (number < 0) {
+        int l = length;
+        while (l-- > 0 && isdigit(name[l]))
+              ;
+        l++;
+        digits = length - l;
+        int n = atoi(&name[l]);
+        if (n == 0)
+           number = n;
+        else
+           return false; // base video directory must end with zero
+        }
+     if (++number > 0) {
+        char buf[16];
+        if (sprintf(buf, "%0*d", digits, number) == digits) {
+           strcpy(&name[length - digits], buf);
+           return DirectoryOk(name);
+           }
+        }
+     }
+  return false;
+}
+
+void cVideoDirectory::Store(void)
+{
+  if (name) {
+     delete stored;
+     stored = strdup(name);
+     }
+}
+
+const char *cVideoDirectory::Adjust(const char *FileName)
+{
+  if (stored) {
+     delete adjusted;
+     adjusted = strdup(FileName);
+     return strncpy(adjusted, stored, length);
+     }
+  return NULL;
+}
+
+int OpenVideoFile(const char *FileName, int Flags)
+{
+  const char *ActualFileName = FileName;
+
+  // Incoming name must be in base video directory:
+  if (strstr(FileName, VideoDirectory) != FileName) {
+     esyslog(LOG_ERR, "ERROR: %s not in %s", FileName, VideoDirectory);
+     errno = ENOENT; // must set 'errno' - any ideas for a better value?
+     return -1;
+     }
+  // Are we going to create a new file?
+  if ((Flags & O_CREAT) != 0) {
+     cVideoDirectory Dir;
+     if (Dir.IsDistributed()) {
+        // Find the directory with the most free space:
+        uint MaxFree = Dir.FreeMB();
+        while (Dir.Next()) {
+              uint Free = FreeDiskSpaceMB(Dir.Name());
+              if (Free > MaxFree) {
+                 Dir.Store();
+                 MaxFree = Free;
+                 }
+              }
+        if (Dir.Stored()) {
+           ActualFileName = Dir.Adjust(FileName);
+           if (!MakeDirs(ActualFileName, false))
+              return -1; // errno has been set by MakeDirs()
+           if (symlink(ActualFileName, FileName) < 0) {
+              LOG_ERROR_STR(FileName);
+              return -1;
+              }
+           ActualFileName = strdup(ActualFileName); // must survive Dir!
+           }
+        }
+     }
+  int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR);
+  if (ActualFileName != FileName)
+     delete ActualFileName;
+  return Result;
+}
+
+int CloseVideoFile(int FileHandle)
+{
+  // just in case we ever decide to do something special when closing the file!
+  return close(FileHandle);
+}
+
+bool RenameVideoFile(const char *OldName, const char *NewName)
+{
+  // Only the base video directory entry will be renamed, leaving the
+  // possible symlinks untouched. Going through all the symlinks and disks
+  // would be unnecessary work - maybe later...
+  if (rename(OldName, NewName) == -1) {
+     LOG_ERROR_STR(OldName);
+     return false;
+     }
+  return true;
+}
+
+bool RemoveVideoFile(const char *FileName)
+{
+  return RemoveFileOrDir(FileName, true);
+}
+
+bool VideoFileSpaceAvailable(unsigned int SizeMB)
+{
+  cVideoDirectory Dir;
+  if (Dir.IsDistributed()) {
+     if (Dir.FreeMB() >= SizeMB * 2) // base directory needs additional space
+        return true;
+     while (Dir.Next()) {
+           if (Dir.FreeMB() >= SizeMB)
+              return true;
+           }
+     return false;
+     }
+  return Dir.FreeMB() >= SizeMB;
+}
diff --git a/videodir.h b/videodir.h
new file mode 100644
index 000000000..7ce15314d
--- /dev/null
+++ b/videodir.h
@@ -0,0 +1,21 @@
+/*
+ * videodir.h: Functions to maintain a distributed video directory
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: videodir.h 1.1 2000/07/29 14:08:27 kls Exp $
+ */
+
+#ifndef __VIDEODIR_H
+#define __VIDEODIR_H
+
+extern const char *VideoDirectory;
+
+int OpenVideoFile(const char *FileName, int Flags);
+int CloseVideoFile(int FileHandle);
+bool RenameVideoFile(const char *OldName, const char *NewName);
+bool RemoveVideoFile(const char *FileName);
+bool VideoFileSpaceAvailable(unsigned int SizeMB);
+
+#endif //__VIDEODIR_H

From 48fea259ae5ed3ac19bcc4152341252b9df39128 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Sep 2000 18:00:00 +0200
Subject: [PATCH 009/307] Version 0.62 - The Makefile now defines DVBDIR to
 easily point to where the DVB driver   source is located. - When switching
 channels the current/next information is now displayed if   available (thanks
 to Robert Schneider). Since there is now more information   to read when
 switching channels, the timeout for displaying it has been   increased from 2
 to 5 seconds (remember that this info can always be recalled   by pressing
 the "Ok" button).   For this feature to work it is necessary that the 'Pnr'
 parameter in the   channel setup ('channels.conf') is set to the proper
 value. This has been   done for some of the channels in the default
 'channels.conf'. Some other   parameters in the default 'channels.conf' have
 also been updated, so please   make sure your timers still use the correct
 channels!

---
 CONTRIBUTORS  |   3 +
 HISTORY       |  15 ++
 INSTALL       |   3 +
 Makefile      |  14 +-
 channels.conf |  79 ++++----
 config.c      |   9 +-
 config.h      |   4 +-
 dvbapi.h      |   4 +-
 eit.c         | 530 ++++++++++++++++++++++++++++++++++++++++++++++++++
 eit.h         |  92 +++++++++
 interface.c   |  23 ++-
 svdrp.c       |   4 +-
 timers.conf   |  16 +-
 13 files changed, 733 insertions(+), 63 deletions(-)
 create mode 100644 eit.c
 create mode 100644 eit.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 74390cf90..07f9d16df 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -16,3 +16,6 @@ Heino Goldenstein <heino.goldenstein@microplex.de>
 
 Guido Fiala <gfiala@s.netic.de>
  for implementing slow forward/back
+
+Robert Schneider <Robert.Schneider@lotus.com>
+ for implementing EIT support for displaying the current/next info
diff --git a/HISTORY b/HISTORY
index 04cc2d59c..f5c3cb93b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -123,3 +123,18 @@ Video Disk Recorder Revision History
   doesn't yet exist).
 - New version of the 'epg2timers' tool (with a modified channel list).
 - Bugfix in closing window in DEBUG_OSD mode.
+
+2000-09-03: Version 0.62
+
+- The Makefile now defines DVBDIR to easily point to where the DVB driver
+  source is located.
+- When switching channels the current/next information is now displayed if
+  available (thanks to Robert Schneider). Since there is now more information
+  to read when switching channels, the timeout for displaying it has been
+  increased from 2 to 5 seconds (remember that this info can always be recalled
+  by pressing the "Ok" button).
+  For this feature to work it is necessary that the 'Pnr' parameter in the
+  channel setup ('channels.conf') is set to the proper value. This has been
+  done for some of the channels in the default 'channels.conf'. Some other
+  parameters in the default 'channels.conf' have also been updated, so please
+  make sure your timers still use the correct channels!
diff --git a/INSTALL b/INSTALL
index 938487c31..1ebffa1b3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,6 +11,9 @@ http://linuxtv.org/dvb/siemens_dvb.html for more information
 about that driver). For example, if the DVB driver was 
 extracted into the directory /home/kls/vdr/DVB, then this
 package should be extracted into /home/kls/vdr/VDR.
+If you have the DVB driver source in a different location
+you will have to change the definition of DVBDIR in the
+Makefile.
 
 This program requires the card driver version 0.05 or higher
 to work properly.
diff --git a/Makefile b/Makefile
index f71236b78..9868ddb89 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,12 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.6 2000/07/28 14:37:44 kls Exp $
+# $Id: Makefile 1.7 2000/09/03 09:26:24 kls Exp $
 
-OBJS = config.o dvbapi.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o videodir.o
+DVBDIR   = ../DVB
+
+INCLUDES = -I$(DVBDIR)/driver
+OBJS = config.o dvbapi.o eit.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o videodir.o
 
 ifndef REMOTE
 REMOTE = KBD
@@ -19,13 +22,14 @@ DEFINES += -DDEBUG_OSD
 endif
 
 %.o: %.c
-	g++ -g -O2 -Wall -c $(DEFINES) $<
+	g++ -g -O2 -Wall -c $(DEFINES) $(INCLUDES) $<
 
 all: vdr
 
-config.o   : config.c config.h dvbapi.h interface.h tools.h
+config.o   : config.c config.h dvbapi.h eit.h interface.h tools.h
 dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h videodir.h
-interface.o: interface.c config.h dvbapi.h interface.h remote.h tools.h
+eit.o      : eit.c eit.h
+interface.o: interface.c config.h dvbapi.h eit.h interface.h remote.h tools.h
 menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
 osd.o      : osd.c config.h dvbapi.h interface.h osd.h tools.h
 vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
diff --git a/channels.conf b/channels.conf
index eefaf52da..6e6d0168d 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,53 +1,56 @@
-RTL:12188:h:1:27500:163:104:0:0
-Sat.1:12480:v:1:27500:1791:1792:0:0
-Pro-7:12480:v:1:27500:255:256:0:0
-RTL2:12188:h:1:27500:166:128:0:0
-ARD:11837:h:1:27500:101:102:0:0
-BR3:11837:h:1:27500:201:202:0:0
-Hessen-3:11837:h:1:27500:301:302:0:0
-N3:11837:h:1:27500:401:402:0:0
-SR3:11837:h:1:27500:501:502:0:0
-WDR:11837:h:1:27500:601:602:0:0
-BR-alpha:11837:h:1:27500:701:702:0:0
-SWR BW:11837:h:1:27500:801:802:0:0
-Phoenix:11837:h:1:27500:901:902:0:0
-ZDF:11954:h:1:27500:110:120:0:0
-3sat:11954:h:1:27500:210:220:0:0
-Kinderkanal:11954:h:1:27500:310:320:0:0
-arte:11954:h:1:27500:360:370:0:0
-phoenix:11954:h:1:27500:410:420:0:0
-ORF Sat:11954:h:1:27500:506:507:0:0
-ZDF Infobox:11954:h:1:27500:610:620:0:0
+RTL:12188:h:1:27500:163:104:0:12003
+Sat.1:12480:v:1:27500:1791:1792:0:46
+Pro-7:12480:v:1:27500:255:256:0:898
+RTL2:12188:h:1:27500:166:128:0:12020
+ARD:11837:h:1:27500:101:102:0:28106
+BR3:11837:h:1:27500:201:202:0:28107
+Hessen-3:11837:h:1:27500:301:302:0:28108
+N3:12110:h:1:27500:2401:2402:0:28224
+SR3:11837:h:1:27500:501:502:0:28110
+WDR:11837:h:1:27500:601:602:0:28111
+BR-alpha:11837:h:1:27500:701:702:0:28112
+SWR BW:11837:h:1:27500:801:802:0:28110
+Phoenix:11837:h:1:27500:901:902:0:28114
+ZDF:11954:h:1:27500:110:120:0:28006
+3sat:11954:h:1:27500:210:220:0:28007
+KiKa:11954:h:1:27500:310:320:0:28008
+arte:11836:h:1:27500:401:402:0:28109
+Eurosport:11954:h:1:27500:410:420:0:28009
+ORF Sat:11954:h:1:27500:506:507:0:28010
+ZDF.info:11954:h:1:27500:610:620:0:28011
 CNN:12168:v:1:27500:165:100:0:0
-Super RTL:12188:h:1:27500:165:120:0:0
-VOX:12188:h:1:27500:167:136:0:0
-DW TV:12363:v:1:27500:305:306:0:0
-Kabel 1:12480:v:1:27500:511:512:0:0
+Super RTL:12188:h:1:27500:165:120:0:12040
+VOX:12188:h:1:27500:167:136:0:12060
+DW TV:12363:v:1:27500:305:306:0:8905
+Kabel 1:12480:v:1:27500:511:512:0:899
 TM3:12480:v:1:27500:767:768:0:0
 DSF:12480:v:1:27500:1023:1024:0:0
 HOT:12480:v:1:27500:1279:1280:0:0
 BloombergTV:12552:v:1:22000:162:99:0:0
-Sky News:12552:v:1:22000:305:306:0:0
+Sky News:12552:v:1:22000:305:306:0:3995
 KinderNet:12574:h:1:22000:163:92:0:0
 Alice:12610:v:1:22000:162:96:0:0
 n-tv:12670:v:1:22000:162:96:0:0
 Grand Tourisme:12670:v:1:22000:289:290:0:0
-TW1:12692:h:1:22000:166:167:0:0
-Eins Extra:12722:h:1:22000:101:102:0:0
-Eins Festival:12722:h:1:22000:201:202:0:0
-Eins MuXx:12722:h:1:22000:301:302:0:0
-MDR:12110:h:1:27500:401:402:0:0
-ORB:12722:h:1:22000:501:502:0:0
-B1:12722:h:1:22000:601:602:0:0
+TW1:12692:h:1:22000:166:167:0:13013
+Eurosport:11954:h:1:27500:410:420:0:28009
+EinsExtra:12110:H:1:27500:101:102:0:28201
+EinsFestival:12110:H:1:27500:201:202:0:28202
+EinsMuXx:12110:H:1:27500:301:302:0:28203
+ZDF Theaterkanal:11954:H:1:27500:1110:1120:0:28016
+ZDF.doku:11954:H:1:27500:660:670:0:28014
+MDR:12110:h:1:27500:401:402:0:28204
+ORB:12110:h:1:27500:501:502:0:28205
+B1:12110:h:1:27500:601:602:0:28206
 ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
 Premiere World Promo:11798:h:1:27500:255:256:0:0
 Premiere:11798:h:1:27500:511:512:2:10
 Star Kino:11798:h:1:27500:767:768:2:9
-Cine Action:11798:h:1:27500:1023:1024:1:20
-Cine Comedy:11798:h:1:27500:1279:1280:1:29
-Sci Fantasy:11798:h:1:27500:1535:1536:1:41
-Romantic Movies:11798:h:1:27500:1791:1792:1:11
-Studio Universal:11798:h:1:27500:2047:2048:1:21
+Cine Action:11798:h:1:27500:1023:1024:2:20
+Cine Comedy:11798:h:1:27500:1279:1280:2:29
+Sci Fantasy:11798:h:1:27500:1535:1536:2:41
+Romantic Movies:11798:h:1:27500:1791:1792:2:11
+Studio Universal:11798:h:1:27500:2047:2048:2:21
 TV Niepokalanow:11876:h:1:27500:305:321:0:0
 Mosaico:11934:v:1:27500:165:100:0:0
 Andalucia TV:11934:v:1:27500:166:104:0:0
@@ -110,6 +113,6 @@ Astra Vision 1:12552:v:1:22000:168:150:0:0
 RTL Tele Letzebuerg:12552:v:1:22000:168:144:0:0
 Astra Mosaic:12552:v:1:22000:175:176:0:0
 MHP test:12604:h:1:22000:5632:8191:0:0
-Bloomberg TV Spain:12610:v:1:22000:45:49:0:0
+Bloomberg TV Germany:12552:v:1:22000:162:99:0:12160
 Video Italia:12610:v:1:22000:121:122:0:0
 AC 3 promo:12670:v:1:22000:308:256:0:0
diff --git a/config.c b/config.c
index c144d6c02..af5be871f 100644
--- a/config.c
+++ b/config.c
@@ -4,15 +4,18 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.17 2000/08/06 12:27:38 kls Exp $
+ * $Id: config.c 1.18 2000/09/03 09:20:22 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include "dvbapi.h"
+#include "eit.h"
 #include "interface.h"
 
+extern cEIT EIT;
+
 // -- cKeys ------------------------------------------------------------------
 
 tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
@@ -231,8 +234,10 @@ bool cChannel::Switch(cDvbApi *DvbApi)
      isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
      CurrentChannel = Index();
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
+         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr)) {
+            EIT.SetProgramNumber(pnr);
             return true;
+            }
          esyslog(LOG_ERR, "retrying");
          }
      return false;
diff --git a/config.h b/config.h
index 1b21d3417..15e905011 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.14 2000/08/06 12:22:52 kls Exp $
+ * $Id: config.h 1.15 2000/09/03 09:37:30 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define VDRVERSION "0.61"
+#define VDRVERSION "0.62"
 
 #define MaxBuffer 10000
 
diff --git a/dvbapi.h b/dvbapi.h
index 25452cfa7..9f9543020 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.12 2000/07/30 15:01:01 kls Exp $
+ * $Id: dvbapi.h 1.13 2000/09/03 09:25:53 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -19,7 +19,7 @@ typedef unsigned char __u8;
 #include <ncurses.h>
 #endif
 #include <stdio.h>
-#include "../DVB/driver/dvb.h"
+#include <dvb.h>
 
 #define MenuLines   15
 #define MenuColumns 40
diff --git a/eit.c b/eit.c
new file mode 100644
index 000000000..c4c12003c
--- /dev/null
+++ b/eit.c
@@ -0,0 +1,530 @@
+/***************************************************************************
+                          eit.c  -  description
+                             -------------------
+    begin                : Fri Aug 25 2000
+    copyright            : (C) 2000 by Robert Schneider
+    email                : Robert.Schneider@web.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ * $Id: eit.c 1.1 2000/09/03 10:22:25 kls Exp $
+ ***************************************************************************/
+
+#include "eit.h"
+#include <iostream.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <time.h>
+#include <sys/poll.h>
+#include <sys/ioctl.h>
+#include <dvb_comcode.h>
+#include "tools.h"
+
+typedef struct {
+	u_char	table_id 						: 8;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char	section_syntax_indicator	: 1;
+	u_char										: 3;
+	u_char	section_length_hi 			: 4;
+#else
+	u_char	section_length_hi 			: 4;
+	u_char										: 3;
+	u_char	section_syntax_indicator	: 1;
+#endif
+
+	u_char	section_length_lo 			: 8;
+
+	u_char	service_id_hi					: 8;
+	u_char	service_id_lo					: 8;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char										: 2;
+	u_char	version_number 				: 5;
+	u_char	current_next_indicator		: 1;
+#else
+	u_char	current_next_indicator		: 1;
+	u_char	version_number 				: 5;
+	u_char										: 2;
+#endif
+
+	u_char	section_number 				: 8;
+	u_char	last_section_number			: 8;
+	u_char	transport_stream_id_hi		: 8;
+	u_char	transport_stream_id_lo		: 8;
+	u_char	original_network_id_hi		: 8;
+	u_char	original_network_id_lo		: 8;
+	u_char	segment_last_section_number	: 8;
+	u_char	segment_last_table_id		: 8;
+} eit_t;
+
+#define EIT_SIZE 14
+
+struct eit_loop_struct1 {
+	u_char	event_id_hi 					: 8;
+	u_char	event_id_lo 					: 8;
+
+	u_char	date_hi							: 8;
+	u_char	date_lo							: 8;
+	u_char	time_hour						: 4;
+	u_char	time_hour_ten					: 4;
+	u_char	time_minute 					: 4;
+	u_char	time_minute_ten				: 4;
+	u_char	time_second 					: 4;
+	u_char	time_second_ten				: 4;
+
+	u_char	dur_hour_ten					: 4;
+	u_char	dur_hour 						: 4;
+	u_char	dur_minute_ten 				: 4;
+	u_char	dur_minute						: 4;
+	u_char	dur_second_ten 				: 4;
+	u_char	dur_second						: 4;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char	running_status 				: 3;
+	u_char	free_ca_mode					: 1;
+	u_char	descriptors_loop_length_hi : 4;
+#else
+	u_char	descriptors_loop_length_hi : 4;
+	u_char	free_ca_mode					: 1;
+	u_char	running_status 				: 3;
+#endif
+
+	u_char	descriptors_loop_length_lo : 8;
+};
+
+#define EIT_SHORT_EVENT_DESCRIPTOR 0x4d
+#define EIT_SHORT_EVENT_DESCRIPTOR_SIZE 6
+
+struct eit_short_event_descriptor_struct {
+	u_char	descriptor_tag 				: 8;
+	u_char	descriptor_length 			: 8;
+
+	u_char	language_code_1				: 8;
+	u_char	language_code_2				: 8;
+	u_char	language_code_3				: 8;
+
+	u_char	event_name_length 			: 8;
+};
+
+#define EIT_EXTENDED_EVENT_DESCRIPOR 0x4e
+
+#define EIT_DESCRIPTOR_SIZE
+
+typedef struct eit_event_struct {
+	u_char	event_id_hi						: 8;
+	u_char	event_id_lo						: 8;
+
+	u_char	start_time_1					: 8;
+	u_char	start_time_2					: 8;
+	u_char	start_time_3					: 8;
+	u_char	start_time_4					: 8;
+	u_char	start_time_5					: 8;
+
+	u_char	duration_1						: 8;
+	u_char	duration_2						: 8;
+	u_char	duration_3						: 8;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char	running_status 				: 3;
+	u_char	free_CA_mode					: 1;
+	u_char	descriptors_loop_length_hi : 4;
+#else
+	u_char	descriptors_loop_length_hi : 4;
+	u_char	free_CA_mode					: 1;
+	u_char	running_status 				: 3;
+#endif
+
+	u_char	descriptors_loop_length_lo : 8;
+
+} eit_event_t;
+#define EIT_LOOP_SIZE 12
+
+
+typedef struct tot_t {
+	u_char	table_id 						: 8;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char	section_syntax_indicator	: 1;
+	u_char										: 3;
+	u_char	section_length_hi 			: 4;
+#else
+	u_char	section_length_hi 			: 4;
+	u_char										: 3;
+	u_char	section_syntax_indicator	: 1;
+#endif
+
+	u_char	date_hi							: 8;
+	u_char	date_lo							: 8;
+	u_char	time_hour						: 4;
+	u_char	time_hour_ten					: 4;
+	u_char	time_minute						: 4;
+	u_char	time_minute_ten				: 4;
+	u_char	time_second						: 4;
+	u_char	time_second_ten				: 4;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char										: 4;
+	u_char	descriptor_loop_length_hi 	: 4;
+#else
+	u_char	descriptor_loop_length_hi 	: 4;
+	u_char										: 4;
+#endif
+
+	u_char	descriptor_loop_length_lo 	: 8;	
+} tot_t;
+
+typedef struct local_time_offset {
+
+	u_char	descriptor_tag 				: 8;
+	u_char	descriptor_length 			: 8;
+
+	u_char	language_code_1				: 8;
+	u_char	language_code_2				: 8;
+	u_char	language_code_3				: 8;
+
+	u_char										: 8;
+	
+	u_char	offset_hour						: 4;
+	u_char	offset_hour_ten				: 4;
+	u_char	offset_minute					: 4;
+	u_char	offset_minute_ten				: 4;
+
+	u_char	change_date_hi					: 8;
+	u_char	change_date_lo					: 8;
+	u_char	change_time_hour				: 4;
+	u_char	change_time_hour_ten			: 4;
+	u_char	change_time_minute			: 4;
+	u_char	change_time_minute_ten		: 4;
+	u_char	change_time_second			: 4;
+	u_char	change_time_second_ten		: 4;
+
+	u_char	next_offset_hour				: 4;
+	u_char	next_offset_hour_ten			: 4;
+	u_char	next_offset_minute			: 4;
+	u_char	next_offset_minute_ten		: 4;
+} local_time_offset;
+
+cEIT::cEIT()
+{
+	cszBitFilter = "/dev/vbi";
+	if((fsvbi = open(cszBitFilter, O_RDWR))<0)
+	{
+		fsvbi = 0;
+		esyslog(LOG_ERR, "Failed to open DVB bitfilter device: %s", cszBitFilter);
+		return;
+	}
+}
+
+cEIT::~cEIT()
+{
+	if (fsvbi != 0)
+		close(fsvbi);
+	fsvbi = 0;
+}
+
+/** Set the bitfilter in vbi device to return
+correct tables */
+int cEIT::SetBitFilter(unsigned short pid, unsigned short section, unsigned short mode)
+{
+	struct bitfilter filt = {
+		pid,
+		{ section, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+		  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
+		  mode,0,
+		  FILTER_MEM,
+		  {},
+		};
+
+	if (ioctl(fsvbi, VIDIOCSBITFILTER, &filt) < 0)
+		return 0xffff;
+	return 0;
+}
+/**  */
+int cEIT::GetSection(unsigned char *buf, ushort PID, unsigned char sec)
+{
+	int seclen=0;
+	unsigned short handle, pid;
+	unsigned char section, sectionnum=0xff, maxsec=0;
+	struct pollfd pfd;
+		
+	if ((handle = SetBitFilter(PID, (sec<<8)|0x00ff, SECTION_CONTINUOS))==0xffff)
+		return -1;
+		
+	seclen=0;
+	pfd.fd=fsvbi;
+	pfd.events=POLLIN;
+	if (poll(&pfd, 1, 20000)==0)
+	{
+		//cerr << "Timeout\n";
+		return -1;
+	}
+	
+	read(fsvbi, buf, 8);
+	seclen=(buf[6]<<8)|buf[7];
+	pid=(buf[4]<<8)|buf[5];
+	
+	read(fsvbi, buf, seclen);
+	section=buf[0];
+	sectionnum=buf[6];
+	maxsec=buf[7];
+	
+	//cerr << "secnum: " << HEX(2) << (int)sectionnum
+	//     << ", secmax: " << HEX(2) << (int) msecnum << "\n";
+	
+	CloseFilter(handle);
+	
+	return seclen;
+}
+
+/**  */
+int cEIT::CloseFilter(unsigned short handle)
+{
+	if (ioctl(fsvbi, VIDIOCSSHUTDOWNFILTER, &handle)<0)
+		return -1;
+	return 0;
+}
+
+/**  */
+char * cEIT::mjd2string(unsigned short mjd)
+{
+	int y, m, d, k;
+	static char buf[20];
+	
+	y = (int) ((mjd - 15078.2) / 365.25);
+	m = (int) ((mjd - 14956.1 - (int)(y * 365.25)) / 30.6001);
+	d = (int) (mjd - 14956 - (int)(y * 365.25) - (int)(m * 30.6001));
+	k = (m == 14 || m == 15) ? 1 : 0;
+	y = y + k;
+	m = m - 1 - k * 12;
+	sprintf(buf, "%d.%d.%4d", d, m, y + 1900);
+
+	return(buf);
+}
+
+/**  */
+int cEIT::GetEIT()
+{
+	unsigned char buf[1024];
+	eit_t *eit;
+	struct eit_loop_struct1 *eitloop;
+	struct eit_short_event_descriptor_struct *eitevt;
+	int seclen;
+	unsigned short handle, pid;
+	struct pollfd pfd;
+	eit_event * pevt = (eit_event *)0;
+	time_t tstart;
+	
+	if ((handle = SetBitFilter(0x12, (0x4e << 8) | 0x00ff, SECTION_CONTINUOS))==0xffff)
+	{
+		return -1;
+	}
+/*	
+	pid_t process = fork();
+	if (process < 0)
+	{
+		cerr << "GetEIT -1" << endl;
+		return -1;
+	}
+	
+	if (process != 0)
+	{
+		cerr << "GetEIT 0" << endl;
+		return 0;
+	}
+*/	
+	int nReceivedEITs = 0;
+	tstart = time(NULL);
+	while ((!evtRunning.bIsValid || !evtNext.bIsValid) && nReceivedEITs < 20 && difftime(time(NULL), tstart) < 4)
+	{
+		pfd.fd=fsvbi;
+		pfd.events=POLLIN;
+		if (poll(&pfd, 1, 5000)==0)
+		{
+			//cerr << "Timeout\n";
+			CloseFilter(handle);
+			return -1;
+		}
+	
+		read(fsvbi, buf, 8);
+		seclen=(buf[6]<<8)|buf[7];
+		pid=(buf[4]<<8)|buf[5];
+	
+		read(fsvbi, buf, seclen);
+	
+		if (seclen < (int)(sizeof(eit_t)
+							  + sizeof(struct eit_loop_struct1)
+							  + sizeof(struct eit_short_event_descriptor_struct)))
+			continue;
+	
+		eit = (eit_t *)buf;
+		eitloop = (struct eit_loop_struct1 *)&eit[1];
+		eitevt = (struct eit_short_event_descriptor_struct *)&eitloop[1];
+	
+		if (eitevt->descriptor_tag != EIT_SHORT_EVENT_DESCRIPTOR)
+		{
+			// printf("Tag = '%c'\n", eitevt->descriptor_tag);
+			continue;
+		}
+	
+		if (((eit->service_id_hi << 8) | eit->service_id_lo) != uProgramNumber)
+		{
+			// printf("Wrong program %04x need %04x\n", (eit->service_id_hi << 8) | eit->service_id_lo, uProgramNumber);
+			continue;
+		}
+		
+		nReceivedEITs++;
+	
+		pevt = (eit_event *)0;
+		if (eitloop->running_status == 4 | eitloop->running_status == 3)
+			pevt = (eit_event *)&evtRunning;
+		else if (eitloop->running_status == 1 || eitloop->running_status == 2 || eitloop->running_status == 0)
+			pevt = (eit_event *)&evtNext;
+
+		if (pevt)
+		{
+			unsigned char *p = (unsigned char *)&eitevt[1];
+			strdvbcpy((unsigned char *)pevt->szTitle, p, eitevt->event_name_length);
+			pevt->szSubTitle[0] = 0;
+			strdvbcpy((unsigned char *)pevt->szSubTitle, &p[eitevt->event_name_length+1], (int)p[eitevt->event_name_length]);
+			strcpy(pevt->szDate, mjd2string((eitloop->date_hi << 8) + eitloop->date_lo));
+			int hr = eitloop->time_hour + (eitloop->time_hour_ten * 10);
+			hr += 2;
+			if (hr >=24)
+			{
+				hr -= 24;
+				// need to switch date one day ahead here
+			}
+			sprintf(pevt->szTime, "%d:%c%c", hr,
+														eitloop->time_minute_ten + '0',
+														eitloop->time_minute + '0');
+			pevt->bIsValid = true;
+		}
+	}
+
+	CloseFilter(handle);	
+
+	return 1;
+}
+
+/**  */
+int cEIT::SetProgramNumber(unsigned short pnr)
+{
+	if (pnr == 0)
+	{
+		evtRunning.bIsValid = false;
+		evtNext.bIsValid = false;
+		return -1;
+	}
+
+	if (pnr != uProgramNumber)
+	{
+		evtRunning.bIsValid = false;
+		evtNext.bIsValid = false;
+		uProgramNumber = pnr;
+		return GetEIT();
+	}
+	return (IsValid() ? 1 : -1);
+}
+
+/** retrieves the string for the running title */
+char * cEIT::GetRunningTitle()
+{
+	if (evtRunning.bIsValid)
+		return evtRunning.szTitle;
+	else
+		return "---";
+}
+/** Retrieves the string for the running subtitle */
+char * cEIT::GetRunningSubtitle()
+{
+	if (evtRunning.bIsValid)
+		return evtRunning.szSubTitle;
+	else
+		return "---";
+}
+/** Retrieves the string representing the
+date of the current event
+ */
+char * cEIT::GetRunningDate()
+{
+	if (evtRunning.bIsValid)
+		return evtRunning.szDate;
+	else
+		return "---";
+}
+/** Retrieves the string representing the
+time of the current event */
+char * cEIT::GetRunningTime()
+{
+	if (evtRunning.bIsValid)
+		return evtRunning.szTime;
+	else
+		return "---";
+}
+/** retrieves the string for the running title */
+char * cEIT::GetNextTitle()
+{
+	if (evtNext.bIsValid)
+		return evtNext.szTitle;
+	else
+		return "---";
+}
+/** Retrieves the string for the running subtitle */
+char * cEIT::GetNextSubtitle()
+{
+	if (evtNext.bIsValid)
+		return evtNext.szSubTitle;
+	else
+		return "---";
+}
+/** Retrieves the string representing the
+date of the current event
+ */
+char * cEIT::GetNextDate()
+{
+	if (evtNext.bIsValid)
+		return evtNext.szDate;
+	else
+		return "---";
+}
+/** Retrieves the string representing the
+time of the current event */
+char * cEIT::GetNextTime()
+{
+	if (evtNext.bIsValid)
+		return evtNext.szTime;
+	else
+		return "---";
+}
+
+/**  */
+bool cEIT::IsValid()
+{
+	return (evtRunning.bIsValid && evtNext.bIsValid);
+}
+
+/**  */
+int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
+{
+	int a;
+	for (a = 0; a < max; a++)
+	{
+		if (*src == 0)
+			break;
+		
+		if ((*src >= ' ' && *src <= '~') || (*src >= 0xa0 && *src <= 0xff))
+			*dst++ = *src++;
+		else
+			src++;
+	}
+	*dst = 0;
+	return a;
+}
diff --git a/eit.h b/eit.h
new file mode 100644
index 000000000..28329f427
--- /dev/null
+++ b/eit.h
@@ -0,0 +1,92 @@
+/***************************************************************************
+                          eit.h  -  description
+                             -------------------
+    begin                : Fri Aug 25 2000
+    copyright            : (C) 2000 by Robert Schneider
+    email                : Robert.Schneider@web.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ * $Id: eit.h 1.1 2000/09/03 10:23:24 kls Exp $
+ ***************************************************************************/
+
+#ifndef __EIT_H
+#define __EIT_H
+
+#include <dvb_v4l.h>
+
+typedef struct eit_event {
+
+	bool	bIsValid;
+	char	szTitle[512];
+	char	szSubTitle[512];
+	char	szDate[12];
+	char	szTime[12];
+
+}eit_event;
+
+/**
+  *@author Robert Schneider
+  */
+
+class cEIT {
+public: 
+	cEIT();
+	~cEIT();
+  /**  */
+  int GetEIT();
+  /**  */
+  int SetProgramNumber(unsigned short pnr);
+  /** Retrieves the string representing the time of the current event */
+  char * GetRunningTime();
+  /** Retrieves the string representing the date of the current event */
+  char * GetRunningDate();
+  /** Retrieves the string for the running subtitle */
+  char * GetRunningSubtitle();
+  /** retrieves the string for the running title */
+  char * GetRunningTitle();
+  /** Retrieves the string representing the time of the next event */
+  char * GetNextTime();
+  /** Retrieves the string representing the date of the next event */
+  char * GetNextDate();
+  /** Retrieves the string for the next subtitle */
+  char * GetNextSubtitle();
+  /** retrieves the string for the next title */
+  char * GetNextTitle();
+  /**  */
+  bool IsValid();
+
+protected: // Protected attributes
+  /** Device name of VBI device */
+  const char * cszBitFilter;
+protected: // Protected attributes
+  /** handle to VBI device (usually /dev/vbi) */
+  int fsvbi;
+  /** Describes the event next on */
+  eit_event evtNext;
+  /** Describes the running event */
+  eit_event evtRunning;
+protected: // Protected methods
+  /** Set the bitfilter in vbi device to return
+correct tables */
+  int SetBitFilter(unsigned short pid, unsigned short section, unsigned short mode);
+  /**  */
+  int GetSection(unsigned char *buf, ushort PID, unsigned char sec);
+  /**  */
+  int CloseFilter(unsigned short handle);
+  /**  */
+  char * mjd2string(unsigned short mjd);
+  /**  */
+  int strdvbcpy(unsigned char *dst, unsigned char *src, int max);
+public: // Public attributes
+  /**  */
+  unsigned short uProgramNumber;
+};
+
+#endif
diff --git a/interface.c b/interface.c
index 244488aa7..2ae49c330 100644
--- a/interface.c
+++ b/interface.c
@@ -4,13 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.10 2000/07/15 12:39:20 kls Exp $
+ * $Id: interface.c 1.11 2000/09/03 10:17:21 kls Exp $
  */
 
 #include "interface.h"
 #include <unistd.h>
+#include "eit.h"
 #include "remote.h"
 
+cEIT EIT;
+
 #if defined(REMOTE_RCU)
 cRcIoRCU RcIo("/dev/ttyS1");
 #elif defined(REMOTE_LIRC)
@@ -316,7 +319,7 @@ void cInterface::DisplayChannel(int Number, const char *Name)
 {
   RcIo.Number(Number);
   if (Name && !Recording()) {
-     Open(MenuColumns, 1);
+     Open(MenuColumns, EIT.IsValid() ? 5 : 1);
      char buffer[MenuColumns + 1];
      snprintf(buffer, sizeof(buffer), "%d  %s", Number, Name ? Name : "");
      Write(0, 0, buffer);
@@ -324,7 +327,21 @@ void cInterface::DisplayChannel(int Number, const char *Name)
      struct tm *now = localtime(&t);
      snprintf(buffer, sizeof(buffer), "%02d:%02d", now->tm_hour, now->tm_min);
      Write(-5, 0, buffer);
-     if (Wait(2, true) == kOk)
+     if (EIT.IsValid()) { 
+        const int t = 7;
+        int w = MenuColumns - t;
+        Write(0, 1, EIT.GetRunningTime(), clrYellow, clrBackground); 
+        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetRunningTitle()); 
+        Write(t, 1, buffer, clrCyan, clrBackground); 
+        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetRunningSubtitle()); 
+        Write(t, 2, buffer, clrCyan, clrBackground); 
+        Write(0, 3, EIT.GetNextTime(), clrYellow, clrBackground); 
+        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetNextTitle()); 
+        Write(t, 3, buffer, clrCyan, clrBackground); 
+        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetNextSubtitle()); 
+        Write(t, 4, buffer, clrCyan, clrBackground); 
+        }
+     if (Wait(5, true) == kOk)
         GetKey();
      Close();
      }
diff --git a/svdrp.c b/svdrp.c
index 9fef18484..01e9fb7bf 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.4 2000/08/06 12:52:04 kls Exp $
+ * $Id: svdrp.c 1.5 2000/08/26 12:51:51 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -639,7 +639,7 @@ void cSVDRP::Process(void)
         //TODO how can we get the *full* hostname?
         gethostname(buffer, sizeof(buffer));
         time_t now = time(NULL);
-        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", VDRVERSION, buffer, ctime(&now));
+        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, ctime(&now));
         }
      int rbytes = readstring(filedes, buffer, sizeof(buffer) - 1);
      if (rbytes > 0) {
diff --git a/timers.conf b/timers.conf
index 47b40674a..733fb9c28 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,13 +1,11 @@
-0:10:-T-----:2058:2202:99:10:Quarks:
-0:5:-T-----:2100:2205:99:10:RudisSuchmaschine:
-1:10:---T---:2158:2250:99:99:DiePlaneten:
+1:10:-T-----:2058:2202:99:10:Quarks:
+1:26:-T-----:2203:0015:99:99:UFO:
 0:3:---T---:2211:2300:99:10:Switch:
+1:2:----F--:2140:2225:10:10:WWW:
 1:15:-----S-:1358:1435:99:7:Neues:
 1:1:-----S-:1445:1610:99:30:Hammerman:
-0:2:-----S-:2200:2350:99:30:Wochenshow:
+0:11:-----S-:2158:2235:99:99:Computer:
+1:2:-----S-:2213:2320:99:30:Wochenshow:
 1:11:------S:2058:2120:99:10:Centauri:
-0:15:MTWTF--:1828:1901:10:5:nano:
-1:1:-TWTF--:0858:0940:99:99:Ellen:
-1:2:----F--:2140:2225:10:10:WWW:
-1:11:-----S-:2158:2235:99:99:Computer:
-1:23:-----S-:2200:0020:99:99:BBC special:
+1:15:MTWTF--:1828:1901:10:5:nano:
+1:1:-TWTF--:0855:0945:99:99:Ellen:

From 76c331181a23f97d5e3f2b55c4741ef4e521242d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 10 Sep 2000 18:00:00 +0200
Subject: [PATCH 010/307] Version 0.63 - The new "Setup" menu allows the user
 to configure several parameters to his/her   personal taste (see MANUAL for
 details). - Workaround for a driver timing problem in cDvbApi::Cmd(), which
 sometimes caused   the OSD to no longer be displayed (thanks to Niels de
 Carpentier). - Added the '-m486' option to the compiler call. - If a channel
 name contains a colon (':') it is now replaced with a '|' in   channels.conf.
 - Not everybody appears to like the "page scrolling" mechanism introduced by 
  Heino Goldenstein in version 0.61, so this is now configurable via the
 "Setup"   menu. - The new 'dvbrc2vdr' tool (thanks to Plamen Ganev!) can be
 used to convert   'dvbrc' channel files into 'vdr' format. - Channels can now
 be "grouped" (thanks to Plamen Ganev!). See MANUAL for details.   There is
 currently no mechanism to define and maintain "Channel groups" via   the
 menu, so you'll have to insert "Channel group" control lines into your  
 'channels.conf' file manually (for example with a text editor). - Started a
 new file named FORMATS with a description of the various file   formats used
 by VDR. - The "Primary DVB interface" can now be chosen via the "Setup" menu.
 - Display of the "current/next" information when switching channels can now  
 be disabled via the "Setup" menu. - The "current/next" display now only shows
 those lines that actually contain   information. - When directly selecting a
 channel by entering the channel number, the digits   entered so far together
 with the name of that channel are displayed on the   OSD (suggested by Martin
 Hammerschmid).

---
 CONTRIBUTORS                  |   8 +
 FORMATS                       |  35 ++
 HISTORY                       |  30 ++
 MANUAL                        |  45 +-
 Makefile                      |   4 +-
 Tools/dvbrc2vdr/Makefile      |  16 +
 Tools/dvbrc2vdr/channels.conf | 282 +++++++++++
 Tools/dvbrc2vdr/dvbrc.hotbird |  63 +++
 Tools/dvbrc2vdr/dvbrc2vdr.c   | 183 +++++++
 Tools/dvbrc2vdr/hotbird2      | 878 ++++++++++++++++++++++++++++++++++
 Tools/dvbrc2vdr/test.conf     | 799 +++++++++++++++++++++++++++++++
 channels.conf                 |   2 +-
 config.c                      | 232 +++++++--
 config.h                      |  52 +-
 dvbapi.c                      |  30 +-
 dvbapi.h                      |  10 +-
 interface.c                   |  73 ++-
 interface.h                   |   6 +-
 menu.c                        | 149 +++++-
 menu.h                        |  13 +-
 osd.c                         |  98 ++--
 osd.h                         |  11 +-
 setup.conf                    |   4 +
 svdrp.c                       |  57 +--
 timers.conf                   |  11 +-
 tools.c                       |  12 +-
 tools.h                       |   3 +-
 vdr.c                         |  59 +--
 28 files changed, 2962 insertions(+), 203 deletions(-)
 create mode 100644 FORMATS
 create mode 100644 Tools/dvbrc2vdr/Makefile
 create mode 100644 Tools/dvbrc2vdr/channels.conf
 create mode 100644 Tools/dvbrc2vdr/dvbrc.hotbird
 create mode 100644 Tools/dvbrc2vdr/dvbrc2vdr.c
 create mode 100644 Tools/dvbrc2vdr/hotbird2
 create mode 100644 Tools/dvbrc2vdr/test.conf
 create mode 100644 setup.conf

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 07f9d16df..9f6aa1b55 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -10,6 +10,8 @@ Carsten Koch <Carsten.Koch@icem.de>
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
  for adding the 'xtvrc2vdr' tool (see Tools/xtvrc2vdr)
+ for adding the 'dvbrc2vdr' tool (see Tools/dvbrc2vdr)
+ for implementing "channel grouping"
 
 Heino Goldenstein <heino.goldenstein@microplex.de>
  for modifying scrolling through lists to make it page up and down
@@ -19,3 +21,9 @@ Guido Fiala <gfiala@s.netic.de>
 
 Robert Schneider <Robert.Schneider@lotus.com>
  for implementing EIT support for displaying the current/next info
+
+Niels de Carpentier <niels@casema.net>
+ for adding a workaround for a driver timing problem in cDvbApi::Cmd()
+
+Martin Hammerschmid <martin@hammerschmid.com>
+ for suggesting to display the direct channel select input on the OSD
diff --git a/FORMATS b/FORMATS
new file mode 100644
index 000000000..776fb4fc2
--- /dev/null
+++ b/FORMATS
@@ -0,0 +1,35 @@
+Video Disk Recorder File Formats
+--------------------------------
+
+* channels.conf
+
+  This file contains the channel setup.
+  It consists of two types of lines: "group delimiters" and "channel
+  definitions".
+
+  A "group delimiter" is a line starting with a ':' as the very first
+  character, followed by arbitrary text.
+  Example: ":First group"
+
+  A "channel definition" is a line with channel data, where the fields
+  are separated by ':' characters:
+  Example: "RTL:12188:h:1:27500:163:104:0:12003"
+
+  The fields in a channel definition have the following meaning (from left
+  to right):
+
+  - Name: the channel's name (if the name originally contains a ':' character
+    it has to be replaced by '|')
+  - Frequency in MHz (as an integer)
+  - Polarization (one of 'h', 'H', 'v', 'V')
+  - Diseqc number
+  - Symbol rate
+  - Video PID
+  - Audio PID
+  - Conditional Access (0 = Free To Air, 1 = can be decrypted by the first
+    DVB card, 2 = can be decrypted by the second DVB card)
+  - Program Number
+
+* timers.conf
+
+  TODO
diff --git a/HISTORY b/HISTORY
index f5c3cb93b..dafab3b7c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -138,3 +138,33 @@ Video Disk Recorder Revision History
   done for some of the channels in the default 'channels.conf'. Some other
   parameters in the default 'channels.conf' have also been updated, so please
   make sure your timers still use the correct channels!
+
+2000-09-10: Version 0.63
+
+- The new "Setup" menu allows the user to configure several parameters to his/her
+  personal taste (see MANUAL for details).
+- Workaround for a driver timing problem in cDvbApi::Cmd(), which sometimes caused
+  the OSD to no longer be displayed (thanks to Niels de Carpentier).
+- Added the '-m486' option to the compiler call.
+- If a channel name contains a colon (':') it is now replaced with a '|' in
+  channels.conf.
+- Not everybody appears to like the "page scrolling" mechanism introduced by
+  Heino Goldenstein in version 0.61, so this is now configurable via the "Setup"
+  menu.
+- The new 'dvbrc2vdr' tool (thanks to Plamen Ganev!) can be used to convert
+  'dvbrc' channel files into 'vdr' format.
+- Channels can now be "grouped" (thanks to Plamen Ganev!). See MANUAL for details.
+  There is currently no mechanism to define and maintain "Channel groups" via
+  the menu, so you'll have to insert "Channel group" control lines into your
+  'channels.conf' file manually (for example with a text editor).
+- Started a new file named FORMATS with a description of the various file
+  formats used by VDR.
+- The "Primary DVB interface" can now be chosen via the "Setup" menu.
+- Display of the "current/next" information when switching channels can now
+  be disabled via the "Setup" menu.
+- The "current/next" display now only shows those lines that actually contain
+  information.
+- When directly selecting a channel by entering the channel number, the digits
+  entered so far together with the name of that channel are displayed on the
+  OSD (suggested by Martin Hammerschmid).
+  
diff --git a/MANUAL b/MANUAL
index b05c35088..91c9bffd3 100644
--- a/MANUAL
+++ b/MANUAL
@@ -12,8 +12,8 @@ Video Disk Recorder User's Manual
 
   Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
-  Left    -           -          -          Disable    Decrement     -           Search back
-  Right   -           -          -          Enable     Increment     -           Search forward
+  Left    Prev group  -          -          Disable    Decrement     -           Search back
+  Right   Next group  -          -          Enable     Increment     -           Search forward
   Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
   Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
   Back    -           Menu off   Main menu  Main menu  Discard       Main menu   -
@@ -72,6 +72,18 @@ Video Disk Recorder User's Manual
   To bring up the channel display without switching channels you can press
   the "Ok" button.
 
+* Switching through channel groups
+
+  If the 'channels.conf' file contains "group separators" you can switch
+  through these groups by pressing the "Left" and "Right" key while no
+  menu is being displayed. The channel display will show the name of the
+  group, and if you press the "Ok" button while the group name is being
+  displayed, you will switch to the first channel of that group.
+
+  Channel groups can be whatever you decide them to be. You can either
+  group your channels by "Bouquet", by language, genre or whatever your
+  preferences may be.
+
 * Instant Recording
 
   You can start recording the current channel by pressing the "Red" button
@@ -153,3 +165,32 @@ Video Disk Recorder User's Manual
              their date and time).
              If this field is left blank, the channel name will be used to form
              the name of the recording.
+
+* Parameters in the "Setup" menu
+
+  Select "Setup" from the main menu to enter the setup menu. From there you can
+  modify the following system parameters (note that "boolean" values will be
+  displayed as "no" and "yes" in the "Setup" menu, while in the setup file they
+  are stored as '0' and '1', respectively):
+
+  PrimaryDVB = 1         Defines the primary DVB interface (i.e. the one that
+                         will display the menus and will react on input through
+                         the remote control). Valid values range from '1' to the
+                         number of installed DVB cards. If more than one DVB card
+                         is installed and a recording is to be started, the
+                         program will try to use a free DVB card that is different
+                         from the primary DVB interface, so that the viewer will
+                         be disturbed as little as possible.
+
+  ShowInfoOnChSwitch = 1 Turns the display of the current/next information on
+                         or off when switching the channel. The information is
+                         always displayed when pressing the "Ok" button in
+                         normal viewing mode.
+
+  MenuScrollPage = 1     0 = when pressing the "Down" ("Up") key while the cursor
+                             is on the last (first) line of a list page, the
+                             list is advanced by a full page and the cursor will
+                             be at the top (bottom) of that page
+                         1 = dto., but the cursor remains at the bottom (top) of
+                             the page (this mode allows for faster scrolling
+                             through long lists).
diff --git a/Makefile b/Makefile
index 9868ddb89..2f00459b5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.7 2000/09/03 09:26:24 kls Exp $
+# $Id: Makefile 1.9 2000/09/10 08:55:45 kls Exp $
 
 DVBDIR   = ../DVB
 
@@ -22,7 +22,7 @@ DEFINES += -DDEBUG_OSD
 endif
 
 %.o: %.c
-	g++ -g -O2 -Wall -c $(DEFINES) $(INCLUDES) $<
+	g++ -g -O2 -Wall -m486 -c $(DEFINES) $(INCLUDES) $<
 
 all: vdr
 
diff --git a/Tools/dvbrc2vdr/Makefile b/Tools/dvbrc2vdr/Makefile
new file mode 100644
index 000000000..196f50bef
--- /dev/null
+++ b/Tools/dvbrc2vdr/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for dvbrc2vdr utility
+#
+
+OBJS = dvbrc2vdr.o
+
+%.o: %.c
+	gcc -g -O2 -Wall -c $(DEFINES) $<
+
+all: dvbrc2vdr
+
+dvbrc2vdr: $(OBJS)
+	gcc -g -O2 $(OBJS) -o dvbrc2vdr
+
+clean:
+	-rm -f $(OBJS) dvbrc2vdr
diff --git a/Tools/dvbrc2vdr/channels.conf b/Tools/dvbrc2vdr/channels.conf
new file mode 100644
index 000000000..d26699c1d
--- /dev/null
+++ b/Tools/dvbrc2vdr/channels.conf
@@ -0,0 +1,282 @@
+RAI Uno:11766:v:1:27500:160:80:0:0
+RAI Due:11766:v:1:27500:161:84:0:0
+RAI Tre:11766:v:1:27500:162:88:0:0
+Rete 4:11919:v:1:27500:514:670:0:0
+Canale 5:11919:v:1:27500:513:660:0:0
+Italia 1 :11919:v:1:27500:512:650:0:0
+Video Italia:12610:v:0:22000:121:122:0:0
+Grand Tour.:12670:v:0:22000:289:290:0:0
+AB Sat Passion promo:12266:h:0:27500:160:80:0:0
+Nuvolari Promo:12149:v:1:27500:176:177:0:0
+DigItaly:12673:v:1:27500:220:221:0:0
+NBC Europe:11054:h:1:27500:550:551:0:0
+Bloomberg TV UK:11642:h:1:27500:1560:1520:0:0
+Game Network:12673:v:1:27500:291:292:0:0
+Bulgaria TV:12540:h:1:27500:4612:4613:0:0
+Video Italia :12673:v:1:27500:340:341:0:0
+Racing Channel Test:11623:v:1:27500:223:243:0:0
+Fashion TV:12402:v:0:27500:163:92:0:0
+Palco Promo:12073:v:1:27500:161:84:0:0
+Coming Soon TV:12111:v:1:27500:310:311:0:0
+Alice:12149:v:1:27500:160:161:0:0
+RAI Mosaico:11766:v:1:27500:518:8191:0:0
+RAI SportSat:11804:v:1:27500:512:650:0:0
+Satisfaction TV:12092:h:1:27500:4192:4193:0:0
+RAI Nettuno Sat 2:11804:v:1:27500:513:651:0:0
+RAI Educational:11804:v:1:27500:514:652:0:0
+TelePace :11804:v:1:27500:515:653:0:0
+RAI News24:11804:v:1:27500:516:654:0:0
+AB Channel 1:12266:h:0:27500:161:84:0:0
+Studio Europa:12673:v:1:27500:230:231:0:0
+AB Passion:12692:h:1:27500:160:80:0:0
+Camera dei Deputati:11804:v:1:27500:517:655:0:0
+SAT 2000:11804:v:1:27500:518:656:0:0
+RAI NettunoSat 1:11804:v:1:27500:519:657:0:0
+Ante Prima:11881:v:1:27500:2435:2436:0:0
+Vetrina D+:12034:v:1:27500:166:105:0:0
+D+ Info:12073:v:1:27500:160:80:0:0
+SNAI:11881:v:1:27500:2561:2562:0:0
+RTL:12188:h:0:27500:163:104:0:0
+Sat.1:12480:v:0:27500:1791:1792:0:0
+Pro-7:12480:v:0:27500:255:256:0:0
+RTL2:12188:h:0:27500:166:128:0:0
+VOX:12188:h:0:27500:167:136:0:0
+ARD:11837:h:0:27500:101:102:0:0
+BR3:11837:h:0:27500:201:202:0:0
+INTV:11843:v:1:27500:2324:2325:0:0
+MC Sat Monte Carlo:12540:h:1:27500:5126:5122:0:0
+Hessen-3:11837:h:0:27500:301:302:0:0
+N3:11837:h:0:27500:401:402:0:0
+SR3:11837:h:0:27500:501:502:0:0
+WDR:11837:h:0:27500:601:602:0:0
+BR-alpha:11837:h:0:27500:701:702:0:0
+SWR BW:11837:h:0:27500:801:802:0:0
+Phoenix:11837:h:0:27500:901:902:0:0
+ZDF:11954:h:0:27500:110:120:0:0
+Test 3sat:11954:h:0:27500:210:220:0:0
+Kinderkanal:11954:h:0:27500:310:320:0:0
+arte:11954:h:0:27500:360:370:0:0
+Eurosport:11954:h:0:27500:410:420:0:0
+ZDF Infobox:11954:h:0:27500:610:620:0:0
+CNN:12168:v:0:27500:165:100:0:0
+Super RTL:12188:h:0:27500:165:120:0:0
+VOX:12188:h:0:27500:167:136:0:0
+ORF Sat:11954:h:0:27500:506:507:0:0
+DW TV:12363:v:0:27500:305:306:0:0
+Kabel 1:12480:v:0:27500:511:512:0:0
+TM3:12480:v:0:27500:767:768:0:0
+DSF:12480:v:0:27500:1023:1024:0:0
+HOT:12480:v:0:27500:1279:1280:0:0
+BloombergTV:12552:v:0:22000:162:99:0:0
+Sky News:12552:v:0:22000:305:306:0:0
+KinderNet:12574:h:0:22000:163:92:0:0
+Alice:12610:v:0:22000:162:96:0:0
+n-tv:12670:v:0:22000:162:96:0:0
+RAI Uno:12363:v:0:27500:289:290:0:0
+TW1:12692:h:0:22000:166:167:0:0
+Eins Extra:12722:h:0:22000:101:102:0:0
+Eins Festival:12722:h:0:22000:201:202:0:0
+Eins MuXx:12722:h:0:22000:301:302:0:0
+MDR:12722:h:0:22000:401:402:0:0
+ORB:12722:h:0:22000:501:502:0:0
+B1:12722:h:0:22000:601:602:0:0
+ARD Online-Kanal:12722:h:0:22000:8191:701:0:0
+Premiere World Promo:11798:h:0:27500:255:256:0:0
+Premiere:11798:h:0:27500:511:512:1:10
+Star Kino:11798:h:0:27500:767:768:1:9
+Cine Action:11798:h:0:27500:1023:1024:1:20
+Cine Comedy:11798:h:0:27500:1279:1280:1:29
+Sci Fantasy:11798:h:0:27500:1535:1536:1:41
+Romantic Movies:11798:h:0:27500:1791:1792:1:11
+Studio Universal:11798:h:0:27500:2047:2048:1:21
+TV Niepokalanow:11876:h:0:27500:305:321:0:0
+Mosaico:11934:v:0:27500:165:100:0:0
+Andalucia TV:11934:v:0:27500:166:104:0:0
+TVC Internacional:11934:v:0:27500:167:108:0:0
+Nasza TV:11992:h:0:27500:165:98:0:0
+WishLine test:12012:v:0:27500:163:92:0:0
+Pro 7 Austria:12051:v:0:27500:161:84:0:0
+Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0
+Kabel 1 Austria:12051:v:0:27500:166:167:0:0
+Pro 7 Schweiz:12051:v:0:27500:289:290:0:0
+Kiosque:12129:v:0:27500:160:80:0:0
+KTO:12129:v:0:27500:170:120:0:0
+TCM:12168:v:0:27500:160:80:0:0
+Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0
+TVBS Europe:12168:v:0:27500:162:88:0:0
+TVBS Europe:12168:v:0:27500:162:89:0:0
+Travel:12168:v:0:27500:163:92:0:0
+TCM Espania:12168:v:0:27500:164:96:0:0
+MTV Spain:12168:v:0:27500:167:112:0:0
+TCM France:12168:v:0:27500:169:64:0:0
+RTL2 CH:12188:h:0:27500:164:112:0:0
+La Cinquieme:12207:v:0:27500:160:80:0:0
+ARTE:12207:v:0:27500:165:100:0:0
+Post Filial TV:12226:h:0:27500:255:256:0:0
+Canal Canaris:12246:v:0:27500:160:80:0:0
+Canal Canaris:12246:v:0:27500:160:81:0:0
+Canal Canaris:12246:v:0:27500:160:82:0:0
+Canal Canaris:12246:v:0:27500:160:83:0:0
+Taquilla 0:12285:v:0:27500:165:100:0:0
+CSAT:12324:v:0:27500:160:80:0:0
+Mosaique:12324:v:0:27500:162:88:0:0
+Mosaique 2:12324:v:0:27500:163:92:0:0
+Mosaique 3:12324:v:0:27500:164:96:0:0
+Le Sesame C+:12324:v:0:27500:165:1965:0:0
+FEED:12344:h:0:27500:163:92:0:0
+RTM 1:12363:v:0:27500:162:96:0:0
+ESC 1:12363:v:0:27500:163:104:0:0
+TV5 Europe:12363:v:0:27500:164:112:0:0
+TV7 Tunisia:12363:v:0:27500:166:128:0:0
+ARTE:12363:v:0:27500:167:137:0:0
+RTP International:12363:v:0:27500:300:301:0:0
+VideoService:12422:h:0:27500:255:256:0:0
+Beta Research promo:12422:h:0:27500:1023:1024:0:0
+Canal Canarias:12441:v:0:27500:160:80:0:0
+TVC International:12441:v:0:27500:512:660:0:0
+Fitur:12441:v:0:27500:514:662:0:0
+Astra Info 1:12552:v:0:22000:164:112:0:0
+Astra Info 2:12552:v:0:22000:165:120:0:0
+Astra Vision 1:12552:v:0:22000:168:144:0:0
+Astra Vision 1:12552:v:0:22000:168:145:0:0
+Astra Vision 1:12552:v:0:22000:168:146:0:0
+Astra Vision 1:12552:v:0:22000:168:147:0:0
+Astra Vision 1:12552:v:0:22000:168:148:0:0
+Astra Vision 1:12552:v:0:22000:168:149:0:0
+Astra Vision 1:12552:v:0:22000:168:150:0:0
+RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0
+Astra Mosaic:12552:v:0:22000:175:176:0:0
+MHP test:12604:h:0:22000:5632:8191:0:0
+Bloomberg TV Spain:12610:v:0:22000:45:49:0:0
+AC 3 promo:12670:v:0:22000:308:256:0:0
+TV Polonia:10719:v:1:27500:163:92:0:0
+Credit Agricole:10834:v:1:27500:5321:5333:0:0
+La Chaine Parlementaire:10873:v:1:27500:1020:1030:0:0
+TMT:10892:v:1:27500:163:92:0:0
+Multivision Accueil:10911:v:1:27500:320:330:0:0
+RTL:11054:h:1:27500:160:80:0:0
+VOX:11054:h:1:27500:500:501:0:0
+Sat 1 A:11054:h:1:27500:511:512:0:0
+RTL II Austria:11054:h:1:27500:520:521:0:0
+ZDF:11054:h:1:27500:570:571:0:0
+K-TV:11054:h:1:27500:580:581:0:0
+Sat 1 Schweiz:11604:v:1:27500:101:102:0:0
+MKTV:11623:v:1:27500:222:242:0:0
+Olisat TV Promo:11623:v:1:27500:226:246:0:0
+Bloomberg TV Germany:11642:v:1:27500:1460:1420:0:0
+Bloomberg TV UK:11642:v:1:27500:1560:1520:0:0
+SAT 7:11642:v:1:27500:1660:1620:0:0
+Multivision 1:11662:v:1:27500:120:130:0:0
+Dubai EDTV:11746:v:1:27500:4130:4131:0:0
+Dubai Sport Channel:11746:v:1:27500:4386:4387:0:0
+Dubai Business Channel:11746:v:1:27500:4642:4643:0:0
+Dubai EDTV:11746:v:1:27500:4898:4899:0:0
+ERT Sat:11823:v:1:27500:521:740:0:0
+TVL:11843:v:1:27500:2441:2442:0:0
+Team TV :11881:v:1:27500:2305:2306:0:0
+ART Europe:12015:v:1:27500:164:96:0:0
+ESC 2:12015:v:1:27500:166:104:0:0
+ART Iqra:12015:v:1:27500:168:112:0:0
+Vacaciones TV:12092:v:1:27500:4112:4113:0:0
+TvL - TV Locale:12092:v:1:27500:4160:4161:0:0
+TVE Internacional:12092:v:1:27500:4208:4209:0:0
+TVG - TV de Galicia :12092:v:1:27500:4224:4225:0:0
+La Cadena Del Milagro:12092:v:1:27500:4368:4369:0:0
+Fiesta:12092:v:1:27500:4432:4433:0:0
+Visions Europe:12092:v:1:27500:4416:4417:0:0
+SateliTV/TV Sex Channel:12092:v:1:27500:4480:4481:0:0
+Krisma:12111:v:1:27500:200:201:0:0
+NTV:12111:v:1:27500:210:211:0:0
+Armenia TV 1:12111:v:1:27500:240:241:0:0
+SMAU Channel :12111:v:1:27500:260:261:0:0
+JSC - Al Jazeera Satellite Ch :12111:v:1:27500:270:271:0:0
+Il Tirreno Sat:12111:v:1:27500:280:301:0:0
+CCTV 4:12169:h:1:27500:516:690:0:0
+Kanali Vuolis:12169:v:1:27500:517:700:0:0
+Nova Promo:12169:v:1:27500:521:740:0:0
+ERT Sat :12188:v:1:27500:514:652:0:0
+Kanali Voulis:12188:v:1:27500:515:653:0:0
+OTE Promo:12188:v:1:27500:517:655:0:0
+TV 5 Europe:12245:v:1:27500:121:131:0:0
+Fashion TV:12245:h:1:27500:123:133:0:0
+TV Ajara:12245:v:1:27500:127:137:0:0
+Telekom TV:12265:v:1:27500:1460:1420:0:0
+SLO-TV1:12303:v:1:27500:200:201:0:0
+Polonia 1:12303:v:1:27500:205:206:0:0
+Super 1:12303:v:1:27500:207:208:0:0
+Sicilia Internacional:12303:v:1:27500:210:211:0:0
+SicilSat:12303:v:1:27500:225:226:0:0
+TBNE Italy:12303:v:1:27500:230:231:0:0
+Countdown TV:12303:v:1:27500:235:236:0:0
+Napoli International:12303:v:1:27500:240:241:0:0
+Magic TV:12303:v:1:27500:245:246:0:0
+TEST:12341:v:1:27500:165:108:0:0
+Colour Bars:12380:v:1:27500:3022:3032:0:0
+Tele 24 :12380:v:1:27500:3023:3033:0:0
+Abu Dhabi TV :12380:v:1:27500:3024:3034:0:0
+LCA:12380:v:1:27500:3025:3035:0:0
+RTV Montenegro:12380:v:1:27500:3026:3036:0:0
+SRG SSR Sat Access :12399:v:1:27500:165:98:0:0
+Jam-e-Jam Network 1 (IRIB 1):12437:v:1:27500:160:80:0:0
+Jam-e-Jam Network 2 (IRIB 2):12437:v:1:27500:161:82:0:0
+Sahar University Network:12437:v:1:27500:162:84:0:0
+Maharishi Open University:12476:v:1:27500:42:43:0:0
+Europe by Satellite:12476:h:1:27500:101:201:0:0
+Pink Backup:12476:v:1:27500:308:256:0:0
+Mizik Tropical:12476:h:1:27500:435:436:0:0
+TLI info card:12476:h:1:27500:771:768:0:0
+Liberty TV:12476:h:1:27500:941:942:0:0
+HRT TV 1:12520:v:1:27500:100:101:0:0
+HRT National:12520:v:1:27500:107:108:0:0
+BVN TV:12520:v:1:27500:210:211:0:0
+Sicilia International:12520:v:1:27500:501:502:0:0
+Sardegna Uno:12520:v:1:27500:503:504:0:0
+TGRT:12520:v:1:27500:505:506:0:0
+Euro Mediterraneo:12520:v:1:27500:510:511:0:0
+WWWTravel TV:12540:v:1:27500:1180:1183:0:0
+WWWTravel TV:12540:v:1:27500:1180:1184:0:0
+WWWTravel TV:12540:v:1:27500:1180:1185:0:0
+MBC:12597:v:1:27500:160:80:0:0
+SIMA-YEH-MOGHAVEMENT:12597:v:1:27500:161:84:0:0
+NITV (National Iran TV ):12597:v:1:27500:163:92:0:0
+BET International:12597:v:1:27500:167:108:0:0
+JSTV 2 Info Card:12597:v:1:27500:2011:2012:0:0
+EuroNews French:12597:v:1:27500:2221:2231:0:0
+EuroNews English:12597:v:1:27500:2221:2232:0:0
+EuroNews German:12597:v:1:27500:2221:2233:0:0
+EuroNews Italian:12597:v:1:27500:2221:2234:0:0
+EuroNews Spanish:12597:v:1:27500:2221:2235:0:0
+EuroNews Portuguese:12597:v:1:27500:2221:2236:0:0
+EuroNews English:12597:v:1:27500:2221:2237:0:0
+Canal Agro Rual:12597:v:1:27500:2321:2331:0:0
+MMO9:12616:v:1:27500:2561:2562:0:0
+Dubai Sport Channel:12654:v:1:27500:1060:1020:0:0
+Sharjah TV :12654:v:1:27500:1160:1120:0:0
+Qatar TV:12654:v:1:27500:1260:1220:0:0
+Saudi Channel 1 :12654:v:1:27500:1360:1320:0:0
+Kuwait Space Channel :12654:v:1:27500:1460:1420:0:0
+Libya TV:12654:v:1:27500:1560:1520:0:0
+Sudan TV:12654:v:1:27500:1660:1620:0:0
+Oman TV:12654:v:1:27500:1760:1720:0:0
+Jordan Satellite Channel:12654:v:1:27500:1860:1820:0:0
+Iraq Satellite Channel:12654:v:1:27500:1960:1920:0:0
+Thai TV 5 Global Network :12673:v:1:27500:200:201:0:0
+Telemarket:12673:v:1:27500:350:351:0:0
+Evision:12673:v:1:27500:360:361:0:0
+Onyx TV:12692:v:1:27500:161:84:0:0
+EWTN:10723:v:1:29900:1001:1201:0:0
+Test (Newslynx):10723:v:1:29900:1002:1202:0:0
+MTA International:10723:v:1:29900:1004:1204:0:0
+J TV Test:10992:v:1:27500:2436:2437:0:0
+Bloomberg UK Test Card:11242:v:1:27500:162:88:0:0
+Channel SUN TV:11604:h:1:27500:111:112:0:0
+Olisat TLC test card:11623:v:1:27500:225:245:0:0
+Channel SUN Test (KBT):11623:v:1:27500:229:249:0:0
+Rai way 3 test card:11766:v:1:27500:164:96:0:0
+Rai way 1 test card:11766:v:1:27500:515:653:0:0
+Rai way 2 test card:11766:v:1:27500:516:654:0:0
+Test (Local Satellite):12092:v:1:27500:4176:4177:0:0
+Retelsat Test:12092:v:1:27500:4464:4465:0:0
+AIT Test Card:12111:v:1:27500:220:221:0:0
+Fucino Test Card:12111:v:1:27500:230:231:0:0
+PGM1:12230:v:1:13396:1160:1121:0:0
diff --git a/Tools/dvbrc2vdr/dvbrc.hotbird b/Tools/dvbrc2vdr/dvbrc.hotbird
new file mode 100644
index 000000000..8717fdbcc
--- /dev/null
+++ b/Tools/dvbrc2vdr/dvbrc.hotbird
@@ -0,0 +1,63 @@
+LNB ID 1 TYPE 1  LOF1 9750000 LOF2 10600000 SLOF 11800000 DISEQCNR 1
+  SAT ID 1 NAME "Hotbird" LNBID 1 FMIN 12015000 FMAX 12100000
+    TRANSPONDER ID 119c8 SATID 0001 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 0 NAME "T+ BIANCO" SATID ffffff TPID 119c8 SID 2b5d TYPE 1 VPID a0 APID 50 APID 51 TTPID 2c PCRPID a0
+      CHANNEL ID 1 NAME "T+ NERO" SATID ffffff TPID 119c8 SID 2b5f TYPE 1 VPID a1 APID 54 APID 55 TTPID 2d PCRPID a1
+      CHANNEL ID 2 NAME "T+ GRIGIO" SATID ffffff TPID 119c8 SID 2b61 TYPE 1 VPID a2 APID 58 APID 59 PCRPID a2
+      CHANNEL ID 3 NAME "R4" SATID ffffff TPID 119c8 SID 18 TYPE 1 VPID a3 PCRPID a3
+      CHANNEL ID 4 NAME "16:9 TELE+" SATID ffffff TPID 119c8 SID 2b63 TYPE 1 VPID a4 APID 60 APID 61 PCRPID a4
+      CHANNEL ID 5 NAME "VETRINA D+" SATID ffffff TPID 119c8 SID 2b65 TYPE 1 PCRPID a5
+      CHANNEL ID 6 NAME "R/RAGAZZI RAISAT" SATID ffffff TPID 119c8 SID 2b67 TYPE 1 PCRPID a6
+    TRANSPONDER ID 11a90 SATID 0001 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 7 NAME "PALCO" SATID ffffff TPID 11a90 SID 2bc1 TYPE 1 PCRPID af
+      CHANNEL ID 8 NAME "INFO" SATID ffffff TPID 11a90 SID 2bc3 TYPE 1 VPID a1 PCRPID af
+      CHANNEL ID 9 NAME "P1" SATID ffffff TPID 11a90 SID 2bc5 TYPE 1 VPID a2 APID 58 APID 59 PCRPID af
+      CHANNEL ID a NAME "P2" SATID ffffff TPID 11a90 SID 2bc7 TYPE 1 VPID a3 APID 5c APID 5d PCRPID af
+      CHANNEL ID b NAME "P3" SATID ffffff TPID 11a90 SID 2bc9 TYPE 1 VPID a4 APID 60 APID 61 PCRPID af
+      CHANNEL ID c NAME "P4" SATID ffffff TPID 11a90 SID 2bcb TYPE 1 VPID a5 APID 64 APID 65 PCRPID af
+      CHANNEL ID d NAME "P5" SATID ffffff TPID 11a90 SID 2bcd TYPE 1 VPID a6 APID 68 APID 69 PCRPID af
+      CHANNEL ID e NAME "P6" SATID ffffff TPID 11a90 SID 2bcf TYPE 1 VPID a7 APID 6c APID 6d PCRPID af
+    TRANSPONDER ID 11964 SATID 0001 TYPE 1 FREQ 12015000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID f NAME "ART VARIETY" SATID ffffff TPID 11964 SID 19a TYPE 1 VPID a0 PCRPID a0
+      CHANNEL ID 10 NAME "ART CHILDREN" SATID ffffff TPID 11964 SID 1a4 TYPE 1 VPID a1 PCRPID a1
+      CHANNEL ID 11 NAME "ART MOVIES" SATID ffffff TPID 11964 SID 1ae TYPE 1 VPID a2 PCRPID a2
+      CHANNEL ID 12 NAME "ART MUSIC" SATID ffffff TPID 11964 SID 1b8 TYPE 1 VPID a3 PCRPID a3
+      CHANNEL ID 13 NAME "ART EUROPE" SATID ffffff TPID 11964 SID 1c2 TYPE 0 VPID a4 PCRPID a4
+      CHANNEL ID 14 NAME "LBC EUROPE" SATID ffffff TPID 11964 SID 1cc TYPE 1 VPID a5 PCRPID a5
+      CHANNEL ID 15 NAME "EGYPT SAT. CH. 2" SATID ffffff TPID 11964 SID 1d6 TYPE 1 VPID a6 PCRPID a6
+      CHANNEL ID 16 NAME "ART SPORT" SATID ffffff TPID 11964 SID 1d8 TYPE 1 VPID a7 PCRPID a7
+      CHANNEL ID 17 NAME "IQRA" SATID ffffff TPID 11964 SID 1da TYPE 1 VPID a8 PCRPID a8
+    TRANSPONDER ID 11a2c SATID 0001 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
+      CHANNEL ID ffffffff NAME "CNN" SATID ffffff TPID 11a2c SID 2ced TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "BBC" SATID ffffff TPID 11a2c SID 2cef TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "BLOOMBERG" SATID ffffff TPID 11a2c SID 2cf1 TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "CNBC" SATID ffffff TPID 11a2c SID 2cf3 TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "SKYNews" SATID ffffff TPID 11a2c SID 2cf5 TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "TST2" SATID ffffff TPID 11a2c SID 2cf7 TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "TV5" SATID ffffff TPID 11a2c SID 2cf9 TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "EPG" SATID ffffff TPID 11a2c SID 2cfb TYPE 1 PCRPID af
+      CHANNEL ID ffffffff NAME "CNN" SATID ffffff TPID 11a2c SID 2cfd TYPE 1 VPID a0 APID 50 PCRPID af
+      CHANNEL ID ffffffff NAME "CNBC" SATID ffffff TPID 11a2c SID 2cff TYPE 1 VPID a3 APID 5c PCRPID af
+      CHANNEL ID ffffffff NAME "TV5" SATID ffffff TPID 11a2c SID 2d01 TYPE 1 VPID a6 APID 68 PCRPID af
+      CHANNEL ID ffffffff NAME "BBC WORLD" SATID ffffff TPID 11a2c SID 2d03 TYPE 1 VPID a1 APID 54 PCRPID af
+      CHANNEL ID ffffffff SATID ffffff TPID 11a2c SID 2d4b TYPE 0 PCRPID 1ffe
+      CHANNEL ID ffffffff SATID ffffff TPID 11a2c SID 26fc TYPE 0 PCRPID 1ffe
+      CHANNEL ID ffffffff SATID ffffff TPID 11a2c SID 26fd TYPE 0 PCRPID 1ffe
+    TRANSPONDER ID 11af4 SATID 0001 TYPE 1 FREQ 12091901 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 27 NAME "Bolsa" SATID ffffff TPID 11af4 SID 222e TYPE 0
+      CHANNEL ID 28 NAME "Testw" SATID ffffff TPID 11af4 SID 222f TYPE 0
+      CHANNEL ID 29 NAME "SIRE" SATID ffffff TPID 11af4 SID 2230 TYPE 0 PCRPID 102
+      CHANNEL ID 2a NAME "Telesierra" SATID ffffff TPID 11af4 SID 2200 TYPE 0 VPID 1040 APID 1041 PCRPID 1040
+      CHANNEL ID 2b NAME "vtv" SATID ffffff TPID 11af4 SID 21fd TYPE 0 VPID 1010 APID 1012 APID 1011 APID 1013 PCRPID 1010
+      CHANNEL ID 2c NAME "Satisfaction" SATID ffffff TPID 11af4 SID 2202 TYPE 0 VPID 1060 APID 1061 PCRPID 1060
+      CHANNEL ID 2d NAME "C. Milagro" SATID ffffff TPID 11af4 SID 2207 TYPE 0 VPID 1110 APID 1111 PCRPID 1110
+      CHANNEL ID 2e NAME "Fiesta" SATID ffffff TPID 11af4 SID 2210 TYPE 0 VPID 1150 APID 1151 APID 1152 PCRPID 1150
+      CHANNEL ID 2f NAME "TVE Internacional" SATID ffffff TPID 11af4 SID 2203 TYPE 0 VPID 1070 APID 1071 PCRPID 1070
+      CHANNEL ID 30 NAME "TV Galicia" SATID ffffff TPID 11af4 SID 2204 TYPE 0 APID 1090 PCRPID 1090
+      CHANNEL ID 31 NAME "Radio Gallega" SATID ffffff TPID 11af4 SID 2205 TYPE 0 APID 1090 PCRPID 1090
+      CHANNEL ID 32 NAME "Retelsat" SATID ffffff TPID 11af4 SID 2212 TYPE 1 VPID 1170 APID 1171 PCRPID 1170
+      CHANNEL ID 33 NAME "Musicam 1" SATID ffffff TPID 11af4 SID 2209 TYPE 1 APID 1136 PCRPID 1136
+      CHANNEL ID 34 NAME "Musicam 2" SATID ffffff TPID 11af4 SID 220a TYPE 1 APID 1131 PCRPID 1131
+      CHANNEL ID 35 NAME "Musicam 3" SATID ffffff TPID 11af4 SID 220b TYPE 1 APID 1136 PCRPID 1136
+      CHANNEL ID 36 NAME "Musicam 4" SATID ffffff TPID 11af4 SID 220c TYPE 1 APID 1136 PCRPID 1136
+      CHANNEL ID 37 NAME "Musicam 5" SATID ffffff TPID 11af4 SID 220d TYPE 1 APID 1136 PCRPID 1136
diff --git a/Tools/dvbrc2vdr/dvbrc2vdr.c b/Tools/dvbrc2vdr/dvbrc2vdr.c
new file mode 100644
index 000000000..243ddc02d
--- /dev/null
+++ b/Tools/dvbrc2vdr/dvbrc2vdr.c
@@ -0,0 +1,183 @@
+/*
+ *  * dvbrc2vdr.c: Converts 'xtvrc' files to 'vdr' channel format
+ *  *
+ *  * Copyright (C) 2000 Plamen Ganev
+ *  * 
+ *  * This program is free software; you can redistribute it and/or
+ *  * modify it under the terms of the GNU General Public License
+ *  * as published by the Free Software Foundation; either version 2
+ *  * of the License, or (at your option) any later version.
+ *  * 
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  * 
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program; if not, write to the Free Software
+ *  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *  * 
+ *  * The author can be reached at pganev@comm.it
+ *  *
+ *  */
+
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define MAX_LINE_LEN 1024
+#define MAX_NAME 100
+#define TOKS ": \n\r"
+#define NAMETOKS ":\n\r"
+
+typedef struct {
+   char Name[MAX_NAME+1];
+   int freq;
+   int color, hue, bright, saturation ;
+   int nitv, input ;
+   int pol, srate, fec, vpid, apid, lnbnum, type;
+   int sid, pcrpid ;
+} CHANNEL_DATA ;
+
+void strupr( char *s ){
+   while ( s && *s ){
+     *s = toupper(*s);
+     s++;
+   }
+}
+
+/* Warning: This function uses the last strtol string! */
+int GetTpInfo( CHANNEL_DATA *channel )
+{
+   // s is: ID x SATID x TYPE x FREQ x POL H/V SRATE x FEC x
+   char *p ;
+   
+   p = strtok( NULL, TOKS ) ;  /* Skip ID */
+   p = strtok( NULL, TOKS ) ;  /* Skip x  */
+   p = strtok( NULL, TOKS ) ;  /* Skip SatId */
+   p = strtok( NULL, TOKS ) ;  /* Skip x */
+   p = strtok( NULL, TOKS ) ;  /* Skip Type */
+   p = strtok( NULL, TOKS ) ;  /* Skip x */
+   p = strtok( NULL, TOKS ) ;  /* Skip Freq */
+   p = strtok( NULL, TOKS ) ;  /* Get Freq */
+   channel->freq = atol( p ) / 1000 ; 
+   p = strtok( NULL, TOKS ) ;  /* Skip Pol */
+   p = strtok( NULL, TOKS ) ;  /* Get H/V */
+   channel->pol = (*p=='V') ? 1 : 0 ;
+   p = strtok( NULL, TOKS ) ;  /* Skip SRATE */
+   p = strtok( NULL, TOKS ) ;  /* Get srate */
+   channel->srate = atol(p) / 1000 ; /* Convert SRATE */
+   return 0;
+}
+
+/* Warning: This function uses the last strtol string! */
+int GetChInfo( CHANNEL_DATA *channel )
+{
+   /* s is: ID x NAME "name" SATID x TPID x SID x TYPE x VPID x APID x  */
+   char *p, *q ;
+
+   p = strtok( NULL, TOKS ) ;
+   while ( p ) {
+      if ( !strcmp( p, "ID" )) {
+	 p = strtok( NULL, TOKS ) ;
+      } else if ( !strcmp( p, "NAME")) {
+	 while ( *p++ );     /* Jump to end of "NAME" */
+	 p++ ;               /* One More */
+	 while ( *p == '"' ) p++ ;  /* Skip the " */
+	 q = channel->Name ;
+	 while ( *p != '"' ) 
+	   if ( *p == ':' )
+	     *q++ = '|', p++ ;
+	   else
+   	     *q++ = *p++ ;     /* Copy the name */
+	 *q = 0 ;
+	 p++ ;
+	 p = strtok( p, TOKS ) ;
+	 channel->apid = 8190;
+	 channel->vpid = 8190;
+	 channel->pcrpid = 0 ;
+	 channel->sid = 0;
+      } else if ( !strcmp( p, "VPID")) {
+	 p = strtok( NULL, TOKS ) ;
+	 channel->vpid = strtol( p, NULL, 16 ) ;
+	 p = strtok( NULL, TOKS ) ;
+      } else if ( !strcmp( p, "APID")) {
+	 p = strtok( NULL, TOKS ) ;
+	 channel->apid = strtol( p, NULL, 16 ) ;
+	 p = strtok( NULL, TOKS ) ;
+      } else if ( !strcmp( p, "SID")) {
+	 p = strtok( NULL, TOKS ) ;
+	 channel->sid = strtol( p, NULL, 16 ) ;
+	 p = strtok( NULL, TOKS ) ;
+      } else if ( !strcmp( p, "PCRPID")) {
+	 p = strtok( NULL, TOKS ) ;
+	 channel->pcrpid = strtol( p, NULL, 16 ) ;
+	 p = strtok( NULL, TOKS ) ;
+      } else {
+	 p = strtok( NULL, TOKS ) ;
+      }
+    }
+   return 1;
+}
+
+int ReadChannel( FILE *f, CHANNEL_DATA *channel ) {
+   static char s[MAX_LINE_LEN+1];
+   char *p;
+
+   while (fgets( s, MAX_LINE_LEN, f )){
+      p = strtok( s, TOKS ) ;
+      strupr( p ) ;
+      
+      if ( !strcmp( p, "TRANSPONDER" )){
+	 GetTpInfo( channel ) ;
+      } else if ( !strcmp( p, "CHANNEL" ) ) {
+	 GetChInfo( channel ) ;
+	 return 1 ;
+      }
+   }
+   return 0 ;
+}
+
+int main ( int argc, char *argv[] ){
+   FILE *f, *fo ;
+   int cnt = 0;
+   CHANNEL_DATA channel ;
+   
+   if ( argc != 3 ){
+      printf("USAGE: %s <dvbrc file> <vdr file>\n\n", argv[0] ) ;
+      return 0;
+   }
+   
+   if ( !(f=fopen(argv[1], "rt"))){
+      printf("Can't open %s for reading\n\n", argv[1]);
+      return 0;
+   }
+   
+   if ( !(fo=fopen(argv[2], "wt"))){
+      printf("Can't open %s for writing\n\n", argv[2]);
+      return 0;
+   }
+   
+   while ( ReadChannel( f, &channel ) ) {
+      cnt++;
+      fprintf(fo, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n",
+	     channel.Name ,
+	     channel.freq ,
+	     channel.pol ? 'v' : 'h' ,
+	     1, //channel.lnbnum ,
+	     channel.srate ,
+	     channel.vpid ,
+	     channel.apid ,
+	     0, //channel.type ,
+	     channel.sid ) ;
+   }
+	  
+   printf( "%d channels read.\n\n", cnt ) ;
+   
+   fclose(f);
+   fclose(fo);
+   return 1;
+}
diff --git a/Tools/dvbrc2vdr/hotbird2 b/Tools/dvbrc2vdr/hotbird2
new file mode 100644
index 000000000..39c7b8779
--- /dev/null
+++ b/Tools/dvbrc2vdr/hotbird2
@@ -0,0 +1,878 @@
+LNB ID 0 TYPE 1  LOF1 9750000 LOF2 10600000 SLOF 11800000 DISEQCNR 0
+  SAT ID 0 NAME "HotBird" LNBID 0 FMIN 10700000 FMAX 12800000
+    TRANSPONDER ID 2af8 SATID 0000 TYPE 1 FREQ 10719000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 0 NAME "DISCOVERY" SATID ffffff TPID 2af8 SID 1132 TYPE 1 PCRPID a1
+      CHANNEL ID 1 NAME "RTL7" SATID ffffff TPID 2af8 SID 1133 TYPE 1 PCRPID a2
+      CHANNEL ID 2 NAME "TV POLONIA" SATID ffffff TPID 2af8 SID 1134 TYPE 1 PCRPID a3
+      CHANNEL ID 3 NAME "EUROSPORT" SATID ffffff TPID 2af8 SID 1135 TYPE 1 PCRPID a4
+      CHANNEL ID 4 NAME "PLANETE" SATID ffffff TPID 2af8 SID 1136 TYPE 1 PCRPID a5
+      CHANNEL ID 5 NAME "SEASONS" SATID ffffff TPID 2af8 SID 1137 TYPE 1 PCRPID a6
+      CHANNEL ID 6 NAME "VIVA Polska" SATID ffffff TPID 2af8 SID 1138 TYPE 1 PCRPID a7
+      CHANNEL ID 7 NAME "MULTIMUSIC 4" SATID ffffff TPID 2af8 SID 1158 TYPE 1 APID 79 APID 7a APID 7b PCRPID 79
+      CHANNEL ID 8 NAME "EPG" SATID ffffff TPID 2af8 SID 1162 TYPE 1 PCRPID a1
+      CHANNEL ID 9 NAME "CYFRA+ GRY" SATID ffffff TPID 2af8 SID 116c TYPE 1
+    TRANSPONDER ID 0101 SATID 0000 TYPE 1 FREQ 10722000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 2bc0 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
+      CHANNEL ID a NAME "Guide LC" SATID ffffff TPID 2bc0 SID 7d0 TYPE 0 APID 1f5e PCRPID 1f5e
+      CHANNEL ID b NAME "Cinestar 1" SATID ffffff TPID 2bc0 SID 4b1 TYPE 1 VPID 78 APID 82 PCRPID 78
+      CHANNEL ID c NAME "Cinestar 2" SATID ffffff TPID 2bc0 SID 4b2 TYPE 1 VPID dc APID e6 PCRPID dc
+      CHANNEL ID d NAME "Cinetoile" SATID ffffff TPID 2bc0 SID 4b3 TYPE 1 VPID 140 APID 14a PCRPID 140
+      CHANNEL ID e NAME "Shopping Avenue" SATID ffffff TPID 2bc0 SID 4b4 TYPE 1 VPID 1a4 APID 1ae PCRPID 1a4
+      CHANNEL ID f NAME "S�rie Club " SATID ffffff TPID 2bc0 SID 4b5 TYPE 1 VPID 208 APID 212 PCRPID 208
+      CHANNEL ID 10 NAME "FUN TV" SATID ffffff TPID 2bc0 SID 4b6 TYPE 1 VPID 26c APID 276 PCRPID 26c
+      CHANNEL ID 11 NAME "Teva" SATID ffffff TPID 2bc0 SID 4b7 TYPE 1 VPID 2d0 APID 2da PCRPID 2d0
+      CHANNEL ID 12 NAME "M6 Music" SATID ffffff TPID 2bc0 SID 4b8 TYPE 1 VPID 334 APID 33e PCRPID 334
+      CHANNEL ID 13 NAME "Club T�l�achat" SATID ffffff TPID 2bc0 SID 4b9 TYPE 1 VPID 398 APID 3a2 PCRPID 398
+    TRANSPONDER ID 0103 SATID 0000 TYPE 1 FREQ 10775000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 2c88 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 14 NAME "INFOSPORT" SATID ffffff TPID 2c88 SID 579 TYPE 1 VPID 78 APID 82 PCRPID 78
+      CHANNEL ID 15 NAME "R�gions" SATID ffffff TPID 2c88 SID 57a TYPE 1 VPID dc APID e6 PCRPID dc
+      CHANNEL ID 16 NAME "Mezzo" SATID ffffff TPID 2c88 SID 57b TYPE 1 VPID 140 APID 14a PCRPID 140
+      CHANNEL ID 17 NAME "01 01 15 97" SATID ffffff TPID 2c88 SID 5cb TYPE 0
+      CHANNEL ID 18 NAME "01 01 17 97" SATID ffffff TPID 2c88 SID 5cd TYPE 0
+      CHANNEL ID 19 NAME "01 02 17 97" SATID ffffff TPID 2c88 SID 5ce TYPE 0
+      CHANNEL ID 1a NAME "01 02 15 97" SATID ffffff TPID 2c88 SID 5d0 TYPE 0
+      CHANNEL ID 1b NAME "01 02 15 96" SATID ffffff TPID 2c88 SID 5d1 TYPE 0
+      CHANNEL ID 1c NAME "01 03 17 10" SATID ffffff TPID 2c88 SID 5d2 TYPE 0
+      CHANNEL ID 1d NAME "01 03 15 10" SATID ffffff TPID 2c88 SID 5d3 TYPE 0
+      CHANNEL ID 1e NAME "Festival" SATID ffffff TPID 2c88 SID 57c TYPE 1 VPID 1a4 APID 1ae PCRPID 1a4
+      CHANNEL ID 1f NAME "HISTOIRE " SATID ffffff TPID 2c88 SID 57d TYPE 1 VPID 208 APID 212 PCRPID 208
+      CHANNEL ID 20 NAME "T�l�toon" SATID ffffff TPID 2c88 SID 57e TYPE 1 VPID 26c APID 276 PCRPID 26c
+      CHANNEL ID 21 NAME "Odyss�e " SATID ffffff TPID 2c88 SID 57f TYPE 1 VPID 2d0 APID 2da PCRPID 2d0
+      CHANNEL ID 22 NAME "France Musiques" SATID ffffff TPID 2c88 SID 58a TYPE 0 APID 33e PCRPID 33e
+      CHANNEL ID 23 NAME "Hector" SATID ffffff TPID 2c88 SID 58b TYPE 0 APID 33f PCRPID 33f
+      CHANNEL ID 24 NAME "FIP" SATID ffffff TPID 2c88 SID 58c TYPE 0 APID 340 PCRPID 340
+      CHANNEL ID 25 NAME "France Inter" SATID ffffff TPID 2c88 SID 58d TYPE 0 APID 341 PCRPID 341
+      CHANNEL ID 26 NAME "France Info" SATID ffffff TPID 2c88 SID 58e TYPE 0 APID 342 PCRPID 342
+      CHANNEL ID 27 NAME "Elisa" SATID ffffff TPID 2c88 SID 58f TYPE 0 APID 343 PCRPID 343
+      CHANNEL ID 28 NAME "France Culture" SATID ffffff TPID 2c88 SID 590 TYPE 0 APID 344 PCRPID 344
+      CHANNEL ID 29 NAME "Radio Bleue" SATID ffffff TPID 2c88 SID 591 TYPE 0 APID 345 PCRPID 345
+      CHANNEL ID 2a NAME "Le Mouv" SATID ffffff TPID 2c88 SID 592 TYPE 0 APID 346 PCRPID 346
+      CHANNEL ID 2b NAME "TV5" SATID ffffff TPID 2c88 SID 581 TYPE 1 VPID 398 APID 3a2 PCRPID 398
+    TRANSPONDER ID 2d50 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 2c NAME "CENTRONICS" SATID ffffff TPID 2d50 SID 7d0 TYPE 0
+      CHANNEL ID 2d NAME "FRANCE 2 " SATID ffffff TPID 2d50 SID 450 TYPE 1 VPID 140 PCRPID 140
+      CHANNEL ID 2e NAME "FRANCE 3" SATID ffffff TPID 2d50 SID 452 TYPE 1 VPID 208 PCRPID 208
+      CHANNEL ID 2f NAME "Cr�dit Agricole" SATID ffffff TPID 2d50 SID 14b5 TYPE 0 APID 14d5 PCRPID 14c9
+      CHANNEL ID 30 NAME "tps foot" SATID ffffff TPID 2d50 SID 1450 TYPE 0 APID 146e PCRPID 146e
+      CHANNEL ID 31 NAME "LCI" SATID ffffff TPID 2d50 SID 44d TYPE 1 VPID 78 APID 82 PCRPID 78
+      CHANNEL ID 32 NAME "EUROSPORT" SATID ffffff TPID 2d50 SID 44e TYPE 1 VPID dc APID e6 PCRPID dc
+      CHANNEL ID 33 NAME "FRANCE 2" SATID ffffff TPID 2d50 SID 44f TYPE 1 VPID 140 PCRPID 140
+      CHANNEL ID 34 NAME "FRANCE 3" SATID ffffff TPID 2d50 SID 451 TYPE 1 VPID 208 PCRPID 208
+      CHANNEL ID 35 NAME "I TELEVISION" SATID ffffff TPID 2d50 SID 454 TYPE 1 VPID 334 APID 33e PCRPID 334
+      CHANNEL ID 36 NAME "TV Mail alphatest" SATID ffffff TPID 2d50 SID 1645 TYPE 0
+      CHANNEL ID 37 NAME "CHAINE FI" SATID ffffff TPID 2d50 SID 14b4 TYPE 0 APID 14d2 APID 14d3 PCRPID 14d2
+      CHANNEL ID 38 NAME "caisse d'�pargne" SATID ffffff TPID 2d50 SID 14b7 TYPE 0
+      CHANNEL ID 39 NAME "TV Mail" SATID ffffff TPID 2d50 SID 1644 TYPE 0
+    TRANSPONDER ID 2e7c SATID 0000 TYPE 1 FREQ 10892000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 3a NAME "CANAL+" SATID ffffff TPID 2e7c SID 12c1 TYPE 1 PCRPID a0
+      CHANNEL ID 3b NAME "CANAL+ �ӣTY" SATID ffffff TPID 2e7c SID 12c2 TYPE 1 PCRPID a1
+      CHANNEL ID 3c NAME "TMT" SATID ffffff TPID 2e7c SID 12c4 TYPE 1 PCRPID a3
+      CHANNEL ID 3d NAME "ALE KINO!" SATID ffffff TPID 2e7c SID 12c5 TYPE 1 PCRPID a4
+      CHANNEL ID 3e NAME "MINIMAX" SATID ffffff TPID 2e7c SID 12c6 TYPE 1 PCRPID a5
+      CHANNEL ID 3f NAME "TVP 1" SATID ffffff TPID 2e7c SID 12c7 TYPE 1 PCRPID a6
+      CHANNEL ID 40 NAME "TVP 2" SATID ffffff TPID 2e7c SID 12c8 TYPE 1 PCRPID a7
+      CHANNEL ID 41 NAME "CANAL+ NIEBIESKI" SATID ffffff TPID 2e7c SID 12c9 TYPE 1 PCRPID a8
+      CHANNEL ID 42 NAME "EPG" SATID ffffff TPID 2e7c SID 12f2 TYPE 1 TTPID 1f4 PCRPID a0
+    TRANSPONDER ID 2ee0 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 43 NAME "Multivision" SATID ffffff TPID 2ee0 SID 643 TYPE 0 VPID 140 PCRPID 140
+      CHANNEL ID 44 NAME "Grand Classique" SATID ffffff TPID 2ee0 SID 672 TYPE 1 APID 33e PCRPID 33e
+      CHANNEL ID 45 NAME "Symphonies" SATID ffffff TPID 2ee0 SID 673 TYPE 1 APID 33f PCRPID 33f
+      CHANNEL ID 46 NAME "Baroque" SATID ffffff TPID 2ee0 SID 674 TYPE 1 APID 340 PCRPID 340
+      CHANNEL ID 47 NAME "Op�ra" SATID ffffff TPID 2ee0 SID 675 TYPE 1 APID 341 PCRPID 341
+      CHANNEL ID 48 NAME "Contemporain" SATID ffffff TPID 2ee0 SID 676 TYPE 1 APID 342 PCRPID 342
+      CHANNEL ID 49 NAME "Relaxation" SATID ffffff TPID 2ee0 SID 677 TYPE 1 APID 343 PCRPID 343
+      CHANNEL ID 4a NAME "Blues" SATID ffffff TPID 2ee0 SID 678 TYPE 1 APID 344 PCRPID 344
+      CHANNEL ID 4b NAME "Jazz" SATID ffffff TPID 2ee0 SID 679 TYPE 1 APID 345 PCRPID 345
+      CHANNEL ID 4c NAME "Big Band" SATID ffffff TPID 2ee0 SID 67a TYPE 1 APID 346 PCRPID 346
+      CHANNEL ID 4d NAME "Jazz Moderne" SATID ffffff TPID 2ee0 SID 67b TYPE 1 APID 347 PCRPID 347
+      CHANNEL ID 4e NAME "Les Tubes Fran�ais" SATID ffffff TPID 2ee0 SID 67c TYPE 1 APID 348 PCRPID 348
+      CHANNEL ID 4f NAME "RFO SAT" SATID ffffff TPID 2ee0 SID 641 TYPE 0 VPID 78 APID 82 PCRPID 78
+      CHANNEL ID 50 NAME "Appli D1 LC" SATID ffffff TPID 2ee0 SID 690 TYPE 0
+      CHANNEL ID 51 NAME "Cinefaz" SATID ffffff TPID 2ee0 SID 642 TYPE 1 VPID dc APID e6 PCRPID dc
+      CHANNEL ID 52 NAME "TurboPC" SATID ffffff TPID 2ee0 SID af1 TYPE 0
+      CHANNEL ID 53 NAME "MTV2" SATID ffffff TPID 2ee0 SID 647 TYPE 1 VPID 2d0 APID 2da PCRPID 2d0
+      CHANNEL ID 54 NAME "Rire et chansons" SATID ffffff TPID 2ee0 SID 65e TYPE 0 APID 3a2 PCRPID 3a2
+      CHANNEL ID 55 NAME "Radio J" SATID ffffff TPID 2ee0 SID 65f TYPE 1 APID 3a3 PCRPID 3a3
+      CHANNEL ID 56 NAME "Mosqueteiros" SATID ffffff TPID 2ee0 SID 660 TYPE 0 APID 3a4 PCRPID 3a4
+      CHANNEL ID 57 NAME "Abysse" SATID ffffff TPID 2ee0 SID 661 TYPE 1 APID 3a5 PCRPID 3a5
+      CHANNEL ID 58 NAME "RMC" SATID ffffff TPID 2ee0 SID 663 TYPE 1 APID 3a7 PCRPID 3a7
+      CHANNEL ID 59 NAME "Radio Junior" SATID ffffff TPID 2ee0 SID 664 TYPE 0 APID 3a8 PCRPID 3a8
+      CHANNEL ID 5a NAME "NETRADIO" SATID ffffff TPID 2ee0 SID 665 TYPE 0 APID 3a9 PCRPID 3a9
+      CHANNEL ID 5b NAME "Nostalgie" SATID ffffff TPID 2ee0 SID 666 TYPE 0 APID 3aa PCRPID 3aa
+      CHANNEL ID 5c NAME "Skyrock" SATID ffffff TPID 2ee0 SID 667 TYPE 1 APID 3ab PCRPID 3ab
+      CHANNEL ID 5d NAME "Radio Coutoisie" SATID ffffff TPID 2ee0 SID 668 TYPE 0 APID 3ac PCRPID 3ac
+      CHANNEL ID 5e NAME "La Voix des Pays" SATID ffffff TPID 2ee0 SID 669 TYPE 0 APID 3ad PCRPID 3ad
+      CHANNEL ID 5f NAME "INFO EXPRESS" SATID ffffff TPID 2ee0 SID 157c TYPE 0 APID 159a PCRPID 159a
+      CHANNEL ID 60 NAME "METEO" SATID ffffff TPID 2ee0 SID 16a8 TYPE 0 APID 16c6 PCRPID 16c6
+      CHANNEL ID 61 NAME "X X L" SATID ffffff TPID 2ee0 SID 1518 TYPE 1
+      CHANNEL ID 62 NAME "Multivision Cin�ma" SATID ffffff TPID 2ee0 SID 1c20 TYPE 0
+      CHANNEL ID 63 NAME "Multivision Sport" SATID ffffff TPID 2ee0 SID 1c84 TYPE 0 TTPID 18fb
+      CHANNEL ID 64 NAME "Multivision Spectacle" SATID ffffff TPID 2ee0 SID 1ce8 TYPE 0
+    TRANSPONDER ID 2f44 SATID 0000 TYPE 1 FREQ 12673000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 65 NAME "Test OTV8" SATID ffffff TPID 2f44 SID 1d67 TYPE 1 PCRPID e80
+      CHANNEL ID 66 NAME "Test OTV9" SATID ffffff TPID 2f44 SID 1d68 TYPE 1 PCRPID e80
+      CHANNEL ID 67 NAME "Test OTV10" SATID ffffff TPID 2f44 SID 1d69 TYPE 1 PCRPID e80
+      CHANNEL ID 68 NAME "Test OTV11" SATID ffffff TPID 2f44 SID 1d6a TYPE 1 VPID 201 PCRPID 1ffe
+      CHANNEL ID 69 NAME "Test31" SATID ffffff TPID 2f44 SID 1d4d TYPE 1 VPID 200 APID 28a PCRPID 1ffe
+      CHANNEL ID 6a NAME "CNN" SATID ffffff TPID 2f44 SID 1d4e TYPE 1 VPID 201 APID 294 PCRPID 1ffe
+      CHANNEL ID 6b NAME "Q24" SATID ffffff TPID 2f44 SID 1d4f TYPE 0 VPID 202 APID 29e APID 29f APID 2a9 APID 2b3 PCRPID 1ffe
+      CHANNEL ID 6c NAME "Test34" SATID ffffff TPID 2f44 SID 1d50 TYPE 1 VPID 203 APID 2a8 PCRPID 1ffe
+      CHANNEL ID 6d NAME "Test35" SATID ffffff TPID 2f44 SID 1d51 TYPE 1 VPID 204 APID 2b2 PCRPID 1ffe
+      CHANNEL ID 6e NAME "Test OTV1" SATID ffffff TPID 2f44 SID 1d60 TYPE 1 PCRPID e80
+      CHANNEL ID 6f NAME "Test OTV2" SATID ffffff TPID 2f44 SID 1d61 TYPE 1 PCRPID e80
+      CHANNEL ID 70 NAME "Test OTV3" SATID ffffff TPID 2f44 SID 1d62 TYPE 1 PCRPID e80
+      CHANNEL ID 71 NAME "Test OTV4" SATID ffffff TPID 2f44 SID 1d63 TYPE 1 PCRPID e80
+      CHANNEL ID 72 NAME "Test OTV5" SATID ffffff TPID 2f44 SID 1d64 TYPE 1 PCRPID e80
+      CHANNEL ID 73 NAME "Test OTV6" SATID ffffff TPID 2f44 SID 1d65 TYPE 1 PCRPID e80
+      CHANNEL ID 74 NAME "Test OTV7" SATID ffffff TPID 2f44 SID 1d66 TYPE 1 PCRPID e80
+      CHANNEL ID 75 SATID ffffff TPID 2f44 SID 1d74 TYPE 0
+      CHANNEL ID 76 SATID ffffff TPID 2f44 SID 1d75 TYPE 0
+    TRANSPONDER ID 0109 SATID 0000 TYPE 1 FREQ 11033000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 010a SATID 0000 TYPE 1 FREQ 11054000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 3264 SATID 0000 TYPE 1 FREQ 11095910 POL H SRATE 27500000 FEC 8
+      CHANNEL ID ffffffff NAME "Telekom TV" SATID ffffff TPID 3264 SID e7f TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "FantasticOverOpal" SATID ffffff TPID 3264 SID e80 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "Gilat" SATID ffffff TPID 3264 SID e81 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "Siemens TV" SATID ffffff TPID 3264 SID e84 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "S-TV" SATID ffffff TPID 3264 SID e85 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "Optibase Encoder" SATID ffffff TPID 3264 SID e86 TYPE 0 VPID 20 PCRPID 20
+    TRANSPONDER ID 010c SATID 0000 TYPE 1 FREQ 11130000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 010d SATID 0000 TYPE 1 FREQ 11131000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 010e SATID 0000 TYPE 1 FREQ 11196000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 010f SATID 0000 TYPE 1 FREQ 11205000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 0110 SATID 0000 TYPE 1 FREQ 11242000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 012c SATID 0000 TYPE 1 FREQ 11095910 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 7d NAME "FantasticOverOpal" SATID ffffff TPID 12c SID e76 TYPE 0 PCRPID 201
+    TRANSPONDER ID 004d SATID 0000 TYPE 1 FREQ 11303750 POL H SRATE 27500000 FEC 8
+      CHANNEL ID ffffffff NAME "Deutsche Bank / T1" SATID ffffff TPID 4d SID 1 TYPE 1 VPID 488 PCRPID 488
+      CHANNEL ID 7f NAME "Animal Planet" SATID ffffff TPID 4d SID a TYPE 1 VPID 488 PCRPID 488
+      CHANNEL ID 80 NAME "Discovery E Europe-English" SATID ffffff TPID 4d SID 14 TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID ffffffff NAME "Wuerth KG / T21" SATID ffffff TPID 4d SID 15 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 82 NAME "Discovery Italy" SATID ffffff TPID 4d SID 1e TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID ffffffff NAME "BTI / T31" SATID ffffff TPID 4d SID 1f TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 84 NAME "Discovery Russia" SATID ffffff TPID 4d SID 28 TYPE 1 VPID 5b4 PCRPID 5b4
+      CHANNEL ID ffffffff NAME "K-TV (MetroMux) / T41" SATID ffffff TPID 4d SID 29 TYPE 1 VPID 7a8 PCRPID 7a8
+      CHANNEL ID 86 NAME "Animal Planet EE" SATID ffffff TPID 4d SID 32 TYPE 1 VPID 618 PCRPID 618
+      CHANNEL ID 87 NAME "Animal Planet - Russian" SATID ffffff TPID 4d SID 33 TYPE 1 VPID 618 PCRPID 618
+      CHANNEL ID 88 NAME "Discovery Netherlands" SATID ffffff TPID 4d SID 3c TYPE 1 VPID 67c PCRPID 67c
+      CHANNEL ID ffffffff NAME "Q English" SATID ffffff TPID 4d SID 46 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 8a NAME "Travel and Adventure" SATID ffffff TPID 4d SID 50 TYPE 1 VPID 744 PCRPID 744
+      CHANNEL ID 8b NAME "Travel and Adventure- Russian" SATID ffffff TPID 4d SID 51 TYPE 1 VPID 744 PCRPID 744
+      CHANNEL ID 8c NAME "New DCP" SATID ffffff TPID 4d SID 12c TYPE 1 APID 4c4 PCRPID 4c4
+      CHANNEL ID 8d NAME "CCP" SATID ffffff TPID 4d SID 12d TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID ffffffff NAME "Deutsche Bank / T2" SATID ffffff TPID 4d SID 2 TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID 93 NAME "Channel Three" SATID ffffff TPID 4d SID 3 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 94 NAME "Channel Four" SATID ffffff TPID 4d SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 95 NAME "Channel Five" SATID ffffff TPID 4d SID 5 TYPE 0 VPID 618 PCRPID 618
+      CHANNEL ID 96 NAME "Channel 6 = Sat 7 Arabic" SATID ffffff TPID 4d SID 6 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 97 NAME "Channel Seven" SATID ffffff TPID 4d SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 98 NAME "Q German" SATID ffffff TPID 4d SID 47 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 99 NAME "Q French" SATID ffffff TPID 4d SID 48 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 9a NAME "Q Dutch" SATID ffffff TPID 4d SID 49 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 1b8 NAME "DTAG / T11" SATID ffffff TPID 4d SID b TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1b9 NAME "DTAG 50 / T12" SATID ffffff TPID 4d SID c TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1ba NAME "Telekom TV" SATID ffffff TPID 4d SID d TYPE 1 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 1bb NAME "Gerling / T26" SATID ffffff TPID 4d SID 1a TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bc NAME "Hornbach-D / T36" SATID ffffff TPID 4d SID 24 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bd NAME "Hornbach-NL / T38" SATID ffffff TPID 4d SID 26 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1be NAME "Hornbach-CZ / T39" SATID ffffff TPID 4d SID 27 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bf NAME "Testkanal" SATID ffffff TPID 4d SID 63 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 1c0 NAME "KENCAST" SATID ffffff TPID 4d SID 6f TYPE 0 PCRPID 42e
+    TRANSPONDER ID 0113 SATID 0000 TYPE 1 FREQ 11338000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 0114 SATID 0000 TYPE 1 FREQ 11371000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 0115 SATID 0000 TYPE 1 FREQ 11457000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 0116 SATID 0000 TYPE 1 FREQ 11464000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 3c8c SATID 0000 TYPE 1 FREQ 11604100 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 8e NAME "SAT.1 CH" SATID ffffff TPID 3c8c SID 259 TYPE 0 VPID 65 APID 66 TTPID 69 PCRPID 69
+      CHANNEL ID 8f NAME "KBT Channel SUN" SATID ffffff TPID 3c8c SID 25b TYPE 0 VPID 6f APID 70 PCRPID 6f
+      CHANNEL ID 90 NAME "big FM" SATID ffffff TPID 3c8c SID 25c TYPE 0 APID 71 PCRPID 71
+      CHANNEL ID 91 NAME "Event" SATID ffffff TPID 3c8c SID 25a TYPE 0 VPID a0 APID a1 PCRPID a0
+    TRANSPONDER ID 0118 SATID 0000 TYPE 1 FREQ 11623000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 004d SATID 0000 TYPE 1 FREQ 11642500 POL H SRATE 27500000 FEC 8
+      CHANNEL ID ffffffff NAME "Deutsche Bank / T1" SATID ffffff TPID 4d SID 1 TYPE 1 VPID 488 PCRPID 488
+      CHANNEL ID 7f NAME "Animal Planet" SATID ffffff TPID 4d SID a TYPE 1 VPID 488 PCRPID 488
+      CHANNEL ID 80 NAME "Discovery E Europe-English" SATID ffffff TPID 4d SID 14 TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID ffffffff NAME "Wuerth KG / T21" SATID ffffff TPID 4d SID 15 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 82 NAME "Discovery Italy" SATID ffffff TPID 4d SID 1e TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID ffffffff NAME "BTI / T31" SATID ffffff TPID 4d SID 1f TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 84 NAME "Discovery Russia" SATID ffffff TPID 4d SID 28 TYPE 1 VPID 5b4 PCRPID 5b4
+      CHANNEL ID ffffffff NAME "K-TV (MetroMux) / T41" SATID ffffff TPID 4d SID 29 TYPE 1 VPID 7a8 PCRPID 7a8
+      CHANNEL ID 86 NAME "Animal Planet EE" SATID ffffff TPID 4d SID 32 TYPE 1 VPID 618 PCRPID 618
+      CHANNEL ID 87 NAME "Animal Planet - Russian" SATID ffffff TPID 4d SID 33 TYPE 1 VPID 618 PCRPID 618
+      CHANNEL ID 88 NAME "Discovery Netherlands" SATID ffffff TPID 4d SID 3c TYPE 1 VPID 67c PCRPID 67c
+      CHANNEL ID ffffffff NAME "Q English" SATID ffffff TPID 4d SID 46 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 8a NAME "Travel and Adventure" SATID ffffff TPID 4d SID 50 TYPE 1 VPID 744 PCRPID 744
+      CHANNEL ID 8b NAME "Travel and Adventure- Russian" SATID ffffff TPID 4d SID 51 TYPE 1 VPID 744 PCRPID 744
+      CHANNEL ID 8c NAME "New DCP" SATID ffffff TPID 4d SID 12c TYPE 1 APID 4c4 PCRPID 4c4
+      CHANNEL ID 8d NAME "CCP" SATID ffffff TPID 4d SID 12d TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID ffffffff NAME "Deutsche Bank / T2" SATID ffffff TPID 4d SID 2 TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID 93 NAME "Channel Three" SATID ffffff TPID 4d SID 3 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 94 NAME "Channel Four" SATID ffffff TPID 4d SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 95 NAME "Channel Five" SATID ffffff TPID 4d SID 5 TYPE 0 VPID 618 PCRPID 618
+      CHANNEL ID 96 NAME "Channel 6 = Sat 7 Arabic" SATID ffffff TPID 4d SID 6 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 97 NAME "Channel Seven" SATID ffffff TPID 4d SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 98 NAME "Q German" SATID ffffff TPID 4d SID 47 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 99 NAME "Q French" SATID ffffff TPID 4d SID 48 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 9a NAME "Q Dutch" SATID ffffff TPID 4d SID 49 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 1b8 NAME "DTAG / T11" SATID ffffff TPID 4d SID b TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1b9 NAME "DTAG 50 / T12" SATID ffffff TPID 4d SID c TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1ba NAME "Telekom TV" SATID ffffff TPID 4d SID d TYPE 1 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 1bb NAME "Gerling / T26" SATID ffffff TPID 4d SID 1a TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bc NAME "Hornbach-D / T36" SATID ffffff TPID 4d SID 24 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bd NAME "Hornbach-NL / T38" SATID ffffff TPID 4d SID 26 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1be NAME "Hornbach-CZ / T39" SATID ffffff TPID 4d SID 27 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bf NAME "Testkanal" SATID ffffff TPID 4d SID 63 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 1c0 NAME "KENCAST" SATID ffffff TPID 4d SID 6f TYPE 0 PCRPID 42e
+    TRANSPONDER ID 011a SATID 0000 TYPE 1 FREQ 11662000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 3e1c SATID 0000 TYPE 1 FREQ 11681001 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 9b NAME "AB 1" SATID ffffff TPID 3e1c SID c9 TYPE 1 VPID a0 APID 50 TTPID 20 PCRPID a0
+      CHANNEL ID 9c NAME "AB MOTEURS" SATID ffffff TPID 3e1c SID ca TYPE 1 VPID a1 APID 54 TTPID 23 PCRPID a1
+      CHANNEL ID 9d NAME "ANIMAUX" SATID ffffff TPID 3e1c SID cb TYPE 1 VPID a2 APID 58 TTPID 26 PCRPID a2
+      CHANNEL ID 9e NAME "CHASSE ET PECHE" SATID ffffff TPID 3e1c SID cc TYPE 1 VPID a3 APID 5c TTPID 29 PCRPID a3
+      CHANNEL ID 9f NAME "XXL" SATID ffffff TPID 3e1c SID cd TYPE 1 VPID a4 APID 60 TTPID 2c PCRPID a4
+      CHANNEL ID a0 NAME "MUSIQUE CLASSIQUE" SATID ffffff TPID 3e1c SID ce TYPE 1 VPID a5 APID 64 TTPID 2f PCRPID a5
+      CHANNEL ID a1 NAME "ESCALES" SATID ffffff TPID 3e1c SID cf TYPE 1 VPID a6 APID 68 TTPID 32 PCRPID a6
+      CHANNEL ID a2 NAME "FIT/cha�ne HISTOIRE" SATID ffffff TPID 3e1c SID d0 TYPE 1 VPID a7 APID 6c TTPID 35 PCRPID a7
+      CHANNEL ID a3 NAME "RFM TV" SATID ffffff TPID 3e1c SID d1 TYPE 1 VPID a8 APID 70 TTPID 38 PCRPID a8
+    TRANSPONDER ID 13ec SATID 0000 TYPE 1 FREQ 11744599 POL H SRATE 27500000 FEC 8
+      CHANNEL ID a4 NAME "EDTV DRAMA" SATID ffffff TPID 13ec SID 2520 TYPE 0 VPID 1322 PCRPID 1322
+      CHANNEL ID a5 NAME "EDTV RADIO 02" SATID ffffff TPID 13ec SID 2534 TYPE 0 VPID 1322 PCRPID 1322
+      CHANNEL ID a6 NAME "EDTV RADIO 01" SATID ffffff TPID 13ec SID 2533 TYPE 0 VPID 1322 PCRPID 1322
+      CHANNEL ID a7 NAME "EDTV SPORT" SATID ffffff TPID 13ec SID 251e TYPE 0 VPID 1322 PCRPID 1322
+      CHANNEL ID a8 NAME "EDTV BUSINESS" SATID ffffff TPID 13ec SID 251f TYPE 0 VPID 1322 PCRPID 1322
+    TRANSPONDER ID 1450 SATID 0000 TYPE 1 FREQ 11765841 POL V SRATE 27500000 FEC 8
+      CHANNEL ID a9 NAME "RAI1" SATID ffffff TPID 1450 SID d49 TYPE 0 VPID a0 PCRPID 1ffe
+      CHANNEL ID aa NAME "RAI2" SATID ffffff TPID 1450 SID d4a TYPE 0 VPID a1 PCRPID 1ffe
+      CHANNEL ID ab NAME "RAI3" SATID ffffff TPID 1450 SID d4b TYPE 0 VPID a2 PCRPID 1ffe
+      CHANNEL ID ac NAME "Rai Way TEST1" SATID ffffff TPID 1450 SID d4c TYPE 0 VPID 203 PCRPID 1ffe
+      CHANNEL ID ad NAME "Rai Way TEST2" SATID ffffff TPID 1450 SID d4d TYPE 0 VPID 204 PCRPID 1ffe
+      CHANNEL ID ae NAME "Rai Way TEST3" SATID ffffff TPID 1450 SID d4e TYPE 0 VPID a4 PCRPID 1ffe
+      CHANNEL ID af NAME "RAIMOSAICO" SATID ffffff TPID 1450 SID d4f TYPE 0 VPID 206 PCRPID 1ffe
+      CHANNEL ID b0 SATID ffffff TPID 1450 SID da2 TYPE 0
+    TRANSPONDER ID 1518 SATID 0000 TYPE 1 FREQ 11765841 POL V SRATE 27500000 FEC 8
+      CHANNEL ID b1 NAME "RAINews24" SATID ffffff TPID 1518 SID ce5 TYPE 0 VPID 204 PCRPID 1ffe
+      CHANNEL ID b2 NAME "CAMERA DEPUTATI" SATID ffffff TPID 1518 SID ce6 TYPE 0 VPID 205 PCRPID 1ffe
+      CHANNEL ID b3 NAME "TELEPACE" SATID ffffff TPID 1518 SID ce8 TYPE 0 VPID 203 PCRPID 1ffe
+      CHANNEL ID b4 NAME "RAISPORTSAT" SATID ffffff TPID 1518 SID ce9 TYPE 0 VPID 200 PCRPID 1ffe
+      CHANNEL ID b5 NAME "RAINettunoSAT2" SATID ffffff TPID 1518 SID cea TYPE 0 VPID 201 PCRPID 1ffe
+      CHANNEL ID b6 NAME "RAIeducational" SATID ffffff TPID 1518 SID ceb TYPE 0 VPID 202 PCRPID 1ffe
+      CHANNEL ID b7 NAME "RAINettunoSAT1" SATID ffffff TPID 1518 SID cec TYPE 0 VPID 207 PCRPID 1ffe
+      CHANNEL ID b8 NAME "SAT2000" SATID ffffff TPID 1518 SID ced TYPE 0 VPID 206 PCRPID 1ffe
+      CHANNEL ID b9 NAME "RADIOUNO" SATID ffffff TPID 1518 SID cef TYPE 0 APID 29e PCRPID 1ffe
+      CHANNEL ID ba NAME "RADIODUE" SATID ffffff TPID 1518 SID cf0 TYPE 0 APID 29f PCRPID 1ffe
+      CHANNEL ID bb NAME "RADIOTRE" SATID ffffff TPID 1518 SID cf1 TYPE 0 APID 2a0 PCRPID 1ffe
+      CHANNEL ID bc NAME "FDleggera" SATID ffffff TPID 1518 SID cf2 TYPE 0 APID 2a1 PCRPID 1ffe
+      CHANNEL ID bd NAME "FDauditorium" SATID ffffff TPID 1518 SID cf3 TYPE 0 APID 299 PCRPID 1ffe
+      CHANNEL ID be NAME "BLUSAT 2000" SATID ffffff TPID 1518 SID cf4 TYPE 0 APID 2a5 PCRPID 1ffe
+      CHANNEL ID bf NAME "GR PARLAMENTO" SATID ffffff TPID 1518 SID cf5 TYPE 0 APID 298 PCRPID 1ffe
+      CHANNEL ID c0 NAME "ISORADIO" SATID ffffff TPID 1518 SID cf6 TYPE 0 APID 295 PCRPID 1ffe
+    TRANSPONDER ID 157c SATID 0000 TYPE 1 FREQ 11823000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID c1 NAME "R1" SATID ffffff TPID 157c SID 12d TYPE 1 VPID 200 APID 28a PCRPID 1ffe
+      CHANNEL ID c2 NAME "R2" SATID ffffff TPID 157c SID 12e TYPE 1 VPID 201 APID 294 APID 295 PCRPID 1ffe
+      CHANNEL ID c3 NAME "R3" SATID ffffff TPID 157c SID 12f TYPE 1 VPID 202 APID 29e TTPID 242 PCRPID 1ffe
+      CHANNEL ID c4 NAME "R4" SATID ffffff TPID 157c SID 130 TYPE 1 VPID 203 APID 2a8 TTPID 243 PCRPID 1ffe
+      CHANNEL ID c5 NAME "R5" SATID ffffff TPID 157c SID 132 TYPE 1 VPID 124a APID 2bc TTPID 245 PCRPID 1ffe
+      CHANNEL ID c6 NAME "R6" SATID ffffff TPID 157c SID 133 TYPE 1 VPID 206 APID 2c6 PCRPID 1ffe
+      CHANNEL ID c7 NAME "R7" SATID ffffff TPID 157c SID 134 TYPE 1 VPID 207 APID 2d0 PCRPID 1ffe
+      CHANNEL ID c8 NAME "Love Radio" SATID ffffff TPID 157c SID 135 TYPE 1 APID 2c7 PCRPID 1ffe
+      CHANNEL ID c9 NAME "Greek Church" SATID ffffff TPID 157c SID 136 TYPE 1 APID 29f PCRPID 1ffe
+      CHANNEL ID ca NAME "Skai Radio" SATID ffffff TPID 157c SID 137 TYPE 1 APID 2e5 PCRPID 1ffe
+      CHANNEL ID cb NAME "MelodiRadio" SATID ffffff TPID 157c SID 138 TYPE 1 APID 2bd PCRPID 1ffe
+      CHANNEL ID cc NAME "ERA 3" SATID ffffff TPID 157c SID 139 TYPE 1 APID 28b PCRPID 1ffe
+      CHANNEL ID cd NAME "RR1" SATID ffffff TPID 157c SID 13a TYPE 1 APID 2a9 PCRPID 1ffe
+      CHANNEL ID ce NAME "RR2" SATID ffffff TPID 157c SID 13b TYPE 1 APID 2d1 PCRPID 1ffe
+      CHANNEL ID cf NAME "NOVA CINE" SATID ffffff TPID 157c SID 13c TYPE 1 VPID 209 APID 2e4 PCRPID 1ffe
+      CHANNEL ID d0 NAME "FILM NET" SATID ffffff TPID 157c SID 13d TYPE 1 VPID 200 APID 28a PCRPID 1ffe
+      CHANNEL ID d1 NAME "SSportK-T.V" SATID ffffff TPID 157c SID 13e TYPE 1 VPID 201 APID 294 APID 295 PCRPID 1ffe
+      CHANNEL ID d2 NAME "MEGA" SATID ffffff TPID 157c SID 13f TYPE 1 VPID 202 APID 29e TTPID 242 PCRPID 1ffe
+      CHANNEL ID d3 NAME "ANT-1" SATID ffffff TPID 157c SID 140 TYPE 1 VPID 203 APID 2a8 TTPID 243 PCRPID 1ffe
+      CHANNEL ID d4 NAME "STAR" SATID ffffff TPID 157c SID 141 TYPE 1 VPID 205 APID 2bc TTPID 245 PCRPID 1ffe
+      CHANNEL ID d5 NAME "Alter 5" SATID ffffff TPID 157c SID 142 TYPE 1 VPID 206 APID 2c6 PCRPID 1ffe
+      CHANNEL ID d6 NAME "NEW Tempo" SATID ffffff TPID 157c SID 143 TYPE 1 VPID 207 APID 2d0 PCRPID 1ffe
+      CHANNEL ID d7 NAME "Super Sport2" SATID ffffff TPID 157c SID 144 TYPE 1 VPID 204 APID 2b2 APID 2b3 PCRPID 1ffe
+    TRANSPONDER ID 15e0 SATID 0000 TYPE 1 FREQ 11843000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID d8 SATID ffffff TPID 15e0 SID fffe TYPE 0
+      CHANNEL ID d9 NAME "INTV" SATID ffffff TPID 15e0 SID db0 TYPE 1 VPID 914 PCRPID 900
+      CHANNEL ID da NAME "UNIV" SATID ffffff TPID 15e0 SID db3 TYPE 1 VPID 901 PCRPID 900
+      CHANNEL ID db NAME "CULT" SATID ffffff TPID 15e0 SID db6 TYPE 1 VPID 903 PCRPID 900
+      CHANNEL ID dc NAME "ERSP" SATID ffffff TPID 15e0 SID db9 TYPE 1 VPID 905 PCRPID 900
+      CHANNEL ID dd NAME "SINT" SATID ffffff TPID 15e0 SID dbb TYPE 1
+      CHANNEL ID de NAME "CART" SATID ffffff TPID 15e0 SID dbc TYPE 1 VPID 981 PCRPID 980
+      CHANNEL ID df NAME "SINT" SATID ffffff TPID 15e0 SID dbf TYPE 1
+      CHANNEL ID e0 NAME "DISC" SATID ffffff TPID 15e0 SID dc2 TYPE 1 VPID 985 PCRPID 980
+      CHANNEL ID e1 NAME "SINT" SATID ffffff TPID 15e0 SID dc5 TYPE 1
+      CHANNEL ID e2 NAME "TVL" SATID ffffff TPID 15e0 SID dc8 TYPE 1 VPID 989 PCRPID 980
+      CHANNEL ID e3 NAME "SINT" SATID ffffff TPID 15e0 SID dca TYPE 1
+      CHANNEL ID e4 NAME "ROCK" SATID ffffff TPID 15e0 SID dde TYPE 1 APID 910 PCRPID 900
+      CHANNEL ID e5 NAME "RDS" SATID ffffff TPID 15e0 SID de1 TYPE 1 APID 911 PCRPID 900
+      CHANNEL ID e6 NAME "RTL" SATID ffffff TPID 15e0 SID de4 TYPE 1 APID 912 PCRPID 900
+      CHANNEL ID e7 NAME "101" SATID ffffff TPID 15e0 SID de7 TYPE 1 APID 913 PCRPID 900
+      CHANNEL ID e8 NAME "RVOY" SATID ffffff TPID 15e0 SID dea TYPE 1 APID 90b PCRPID 900
+      CHANNEL ID e9 NAME "RKFM" SATID ffffff TPID 15e0 SID deb TYPE 1 APID 90d PCRPID 900
+      CHANNEL ID ea NAME "GLOB" SATID ffffff TPID 15e0 SID dec TYPE 1 APID 90c PCRPID 900
+      CHANNEL ID eb NAME "ANT1" SATID ffffff TPID 15e0 SID ded TYPE 1 APID 90e PCRPID 900
+      CHANNEL ID ec NAME "RRAD" SATID ffffff TPID 15e0 SID dee TYPE 1 APID 90f PCRPID 900
+      CHANNEL ID ed NAME "MC01" SATID ffffff TPID 15e0 SID df0 TYPE 1 APID 908 PCRPID 908
+      CHANNEL ID ee NAME "MC02" SATID ffffff TPID 15e0 SID df3 TYPE 1 APID 909 PCRPID 909
+      CHANNEL ID ef NAME "MC03" SATID ffffff TPID 15e0 SID df6 TYPE 1 APID 90a PCRPID 90a
+    TRANSPONDER ID 1644 SATID 0000 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
+      CHANNEL ID f0 NAME "P7" SATID ffffff TPID 1644 SID 2c25 TYPE 1 VPID a0 APID 50 APID 51 PCRPID af
+      CHANNEL ID f1 NAME "P8" SATID ffffff TPID 1644 SID 2c27 TYPE 1 VPID a1 APID 54 APID 55 PCRPID af
+      CHANNEL ID f2 NAME "P9" SATID ffffff TPID 1644 SID 2c29 TYPE 1 VPID a2 APID 58 APID 59 PCRPID af
+      CHANNEL ID f3 NAME "+GIOCHI" SATID ffffff TPID 1644 SID 2c2e TYPE 1 PCRPID af
+      CHANNEL ID f4 NAME "MM01" SATID ffffff TPID 1644 SID 2c2f TYPE 1 APID 259 PCRPID b0
+      CHANNEL ID f5 NAME "MM02" SATID ffffff TPID 1644 SID 2c30 TYPE 0 APID 25a PCRPID b0
+      CHANNEL ID f6 NAME "MM03" SATID ffffff TPID 1644 SID 2c31 TYPE 0 APID 25b PCRPID b0
+      CHANNEL ID f7 NAME "MM04" SATID ffffff TPID 1644 SID 2c32 TYPE 0 APID 25c PCRPID b0
+      CHANNEL ID f8 NAME "MM05" SATID ffffff TPID 1644 SID 2c33 TYPE 0 APID 25d PCRPID b0
+      CHANNEL ID f9 NAME "MM06" SATID ffffff TPID 1644 SID 2c34 TYPE 0 APID 25e PCRPID b0
+      CHANNEL ID fa NAME "MM07" SATID ffffff TPID 1644 SID 2c35 TYPE 0 APID 25f PCRPID b0
+      CHANNEL ID fb NAME "MM08" SATID ffffff TPID 1644 SID 2c36 TYPE 0 APID 260 PCRPID b0
+      CHANNEL ID fc NAME "MM09" SATID ffffff TPID 1644 SID 2c37 TYPE 0 APID 261 PCRPID b0
+      CHANNEL ID fd NAME "MM10" SATID ffffff TPID 1644 SID 2c38 TYPE 0 APID 262 PCRPID b0
+      CHANNEL ID fe NAME "MM11" SATID ffffff TPID 1644 SID 2c39 TYPE 1 APID 263 PCRPID b0
+      CHANNEL ID ff NAME "MM12" SATID ffffff TPID 1644 SID 2c3a TYPE 0 APID 264 PCRPID b0
+      CHANNEL ID 100 NAME "MM13" SATID ffffff TPID 1644 SID 2c3b TYPE 0 APID 265 PCRPID b0
+      CHANNEL ID 101 NAME "MM14" SATID ffffff TPID 1644 SID 2c3c TYPE 0 APID 266 PCRPID b0
+      CHANNEL ID 102 NAME "MM15" SATID ffffff TPID 1644 SID 2c3d TYPE 0 APID 267 PCRPID b0
+      CHANNEL ID 103 NAME "MM16" SATID ffffff TPID 1644 SID 2c3e TYPE 0 APID 268 PCRPID b0
+      CHANNEL ID 104 NAME "MM17" SATID ffffff TPID 1644 SID 2c3f TYPE 0 APID 269 PCRPID b0
+      CHANNEL ID 105 NAME "MM18" SATID ffffff TPID 1644 SID 2c40 TYPE 0 APID 26a PCRPID b0
+      CHANNEL ID 106 NAME "MM19" SATID ffffff TPID 1644 SID 2c41 TYPE 0 APID 26b PCRPID b0
+      CHANNEL ID 107 NAME "MM20" SATID ffffff TPID 1644 SID 2c42 TYPE 0 APID 26c PCRPID b0
+      CHANNEL ID 108 NAME "MM21" SATID ffffff TPID 1644 SID 2c43 TYPE 1 APID 26d PCRPID b0
+      CHANNEL ID 109 NAME "MM22" SATID ffffff TPID 1644 SID 2c44 TYPE 0 APID 26e PCRPID b0
+      CHANNEL ID 10a NAME "MM23" SATID ffffff TPID 1644 SID 2c45 TYPE 0 APID 26f PCRPID b0
+      CHANNEL ID 10b NAME "MM24" SATID ffffff TPID 1644 SID 2c46 TYPE 0 APID 270 PCRPID b0
+      CHANNEL ID 10c NAME "MM25" SATID ffffff TPID 1644 SID 2c47 TYPE 0 APID 271 PCRPID b0
+      CHANNEL ID 10d NAME "MM26" SATID ffffff TPID 1644 SID 2c48 TYPE 0 APID 272 PCRPID b0
+      CHANNEL ID 10e NAME "MM27" SATID ffffff TPID 1644 SID 2c49 TYPE 0 APID 273 PCRPID b0
+      CHANNEL ID 10f NAME "MM28" SATID ffffff TPID 1644 SID 2c4a TYPE 0 APID 274 PCRPID b0
+      CHANNEL ID 110 NAME "MM29" SATID ffffff TPID 1644 SID 2c4b TYPE 0 APID 275 PCRPID b0
+      CHANNEL ID 111 NAME "MM30" SATID ffffff TPID 1644 SID 2c4c TYPE 0 APID 276 PCRPID b0
+      CHANNEL ID 112 NAME "RCAP" SATID ffffff TPID 1644 SID 2c4d TYPE 1 APID 277 PCRPID b0
+      CHANNEL ID 113 NAME "R105" SATID ffffff TPID 1644 SID 2c4e TYPE 0 APID 278 PCRPID b0
+      CHANNEL ID 114 NAME "RDJ" SATID ffffff TPID 1644 SID 2c4f TYPE 0 APID 279 PCRPID b0
+      CHANNEL ID 115 NAME "RITA" SATID ffffff TPID 1644 SID 2c50 TYPE 0 APID 27a PCRPID b0
+      CHANNEL ID 116 NAME "RMC" SATID ffffff TPID 1644 SID 2c51 TYPE 0 APID 27b PCRPID b0
+      CHANNEL ID 117 NAME "R101" SATID ffffff TPID 1644 SID 2c52 TYPE 0 APID 27c PCRPID b0
+      CHANNEL ID 118 NAME "RRAD" SATID ffffff TPID 1644 SID 2c53 TYPE 0 APID 27d PCRPID b0
+      CHANNEL ID 119 NAME "RR" SATID ffffff TPID 1644 SID 2c54 TYPE 0 APID 27e PCRPID b0
+      CHANNEL ID 11a SATID ffffff TPID 1644 SID 2c61 TYPE 0 APID 259 APID 25a APID 25b APID 25c APID 25d APID 25e APID 25f APID 260 APID 261 APID 262 PCRPID b0
+      CHANNEL ID 11b SATID ffffff TPID 1644 SID 2c62 TYPE 0 APID 263 APID 264 APID 265 APID 266 APID 267 APID 268 APID 269 APID 26a APID 26b APID 26c PCRPID b0
+      CHANNEL ID 11c SATID ffffff TPID 1644 SID 2c63 TYPE 0 APID 26d APID 26e APID 26f APID 270 APID 271 APID 272 APID 273 APID 274 APID 275 APID 276 PCRPID b0
+      CHANNEL ID 11d SATID ffffff TPID 1644 SID 2c64 TYPE 0 APID 277 APID 278 APID 279 APID 27a APID 27b APID 27c APID 27d APID 27e PCRPID b0
+      CHANNEL ID 11e NAME "MULTIMUSICA" SATID ffffff TPID 1644 SID 2c58 TYPE 1 PCRPID b0
+      CHANNEL ID 11f NAME "RADIO" SATID ffffff TPID 1644 SID 2c59 TYPE 1 PCRPID b0
+      CHANNEL ID 120 NAME "MULTIMUSIC 1" SATID ffffff TPID 1644 SID 2c65 TYPE 1 APID 262 APID 259 APID 25a APID 25b APID 25c APID 25d APID 25e APID 25f APID 260 APID 261 PCRPID b0
+      CHANNEL ID 121 NAME "MULTIMUSIC 2" SATID ffffff TPID 1644 SID 2c66 TYPE 1 APID 265 APID 266 APID 267 APID 263 APID 264 APID 268 APID 269 APID 26a APID 26b APID 26c PCRPID b0
+    TRANSPONDER ID 16a8 SATID 0000 TYPE 1 FREQ 12713000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 122 SATID ffffff TPID 16a8 SID fffe TYPE 0
+      CHANNEL ID 123 NAME "TEAM" SATID ffffff TPID 16a8 SID e1a TYPE 1 VPID 901 PCRPID 900
+      CHANNEL ID 124 NAME "SINT" SATID ffffff TPID 16a8 SID e1d TYPE 1
+      CHANNEL ID 125 NAME "VIAG" SATID ffffff TPID 16a8 SID e20 TYPE 1 VPID 904 PCRPID 900
+      CHANNEL ID 126 NAME "SINT" SATID ffffff TPID 16a8 SID e23 TYPE 1
+      CHANNEL ID 127 NAME "EURO" SATID ffffff TPID 16a8 SID e26 TYPE 1 VPID 907 PCRPID 900
+      CHANNEL ID 128 NAME "SINT" SATID ffffff TPID 16a8 SID e27 TYPE 1
+      CHANNEL ID 129 NAME "CNN" SATID ffffff TPID 16a8 SID e29 TYPE 1 VPID 981 PCRPID 980
+      CHANNEL ID 12a NAME "ante prima" SATID ffffff TPID 16a8 SID e2c TYPE 1 VPID 983 PCRPID 980
+      CHANNEL ID 12b NAME "SNAI" SATID ffffff TPID 16a8 SID e2e TYPE 1 VPID a01 PCRPID a00
+      CHANNEL ID 12c NAME "MPPV" SATID ffffff TPID 16a8 SID e30 TYPE 1 VPID a03 PCRPID a00
+      CHANNEL ID 12d NAME "MC04" SATID ffffff TPID 16a8 SID e34 TYPE 1 APID a80 PCRPID a80
+      CHANNEL ID 12e NAME "MC05" SATID ffffff TPID 16a8 SID e35 TYPE 1 APID a81 PCRPID a81
+      CHANNEL ID 12f NAME "MC06" SATID ffffff TPID 16a8 SID e36 TYPE 1 APID a82 PCRPID a82
+      CHANNEL ID 130 NAME "MC07" SATID ffffff TPID 16a8 SID e39 TYPE 1 APID a83 PCRPID a83
+      CHANNEL ID 131 NAME "MC08" SATID ffffff TPID 16a8 SID e3c TYPE 1 APID a84 PCRPID a84
+      CHANNEL ID 132 NAME "MC09" SATID ffffff TPID 16a8 SID e3f TYPE 1 APID a85 PCRPID a85
+      CHANNEL ID 133 NAME "MC10" SATID ffffff TPID 16a8 SID e42 TYPE 1 APID a86 PCRPID a86
+      CHANNEL ID 134 NAME "MC11" SATID ffffff TPID 16a8 SID e45 TYPE 1 APID a87 PCRPID a87
+      CHANNEL ID 135 NAME "MC12" SATID ffffff TPID 16a8 SID e48 TYPE 1 APID a88 PCRPID a88
+      CHANNEL ID 136 NAME "MC13" SATID ffffff TPID 16a8 SID e4b TYPE 1 APID a89 PCRPID a89
+      CHANNEL ID 137 NAME "MC14" SATID ffffff TPID 16a8 SID e4e TYPE 1 APID a8a PCRPID a8a
+      CHANNEL ID 138 NAME "MC15" SATID ffffff TPID 16a8 SID e51 TYPE 1 APID a8b PCRPID a8b
+      CHANNEL ID 139 NAME "MC16" SATID ffffff TPID 16a8 SID e54 TYPE 1 APID a8c PCRPID a8c
+      CHANNEL ID 13a NAME "MC17" SATID ffffff TPID 16a8 SID e57 TYPE 1 APID a8d PCRPID a8d
+      CHANNEL ID 13b NAME "MC18" SATID ffffff TPID 16a8 SID e5a TYPE 1 APID a8e PCRPID a8e
+    TRANSPONDER ID 170c SATID 0000 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 13c NAME "MOSAICO D+" SATID ffffff TPID 170c SID 2c89 TYPE 1 VPID a1 APID 55 APID 51 APID 50 APID 54 PCRPID af
+      CHANNEL ID 13d NAME " MILAN CH." SATID ffffff TPID 170c SID 2c8b TYPE 1 VPID a2 APID 58 APID 59 PCRPID af
+      CHANNEL ID 13e NAME " INTER CH." SATID ffffff TPID 170c SID 2c8d TYPE 1 VPID a3 APID 5c APID 5d PCRPID af
+      CHANNEL ID 13f NAME "TST3" SATID ffffff TPID 170c SID 2c8f TYPE 1 PCRPID af
+    TRANSPONDER ID 1770 SATID 0000 TYPE 1 FREQ 11919280 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 140 NAME " I1" SATID ffffff TPID 1770 SID 1 TYPE 1 VPID 200 APID 28a TTPID 240 PCRPID 1ffe
+      CHANNEL ID 141 NAME " C5" SATID ffffff TPID 1770 SID 2 TYPE 1 VPID 201 APID 294 TTPID 241 PCRPID 1ffe
+      CHANNEL ID 142 NAME " R4" SATID ffffff TPID 1770 SID 3 TYPE 1 VPID 202 APID 29e TTPID 242 PCRPID 1ffe
+      CHANNEL ID 143 NAME "Test" SATID ffffff TPID 1770 SID 4 TYPE 1 VPID 203 APID 2a8 TTPID 243 PCRPID 1ffe
+    TRANSPONDER ID 003d SATID 0000 TYPE 1 FREQ 11938000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 144 NAME "NTV" SATID ffffff TPID 3d SID 1bc1 TYPE 1 VPID a4 APID 58 APID 59 PCRPID a4
+      CHANNEL ID 145 NAME "NTV-PLUS" SATID ffffff TPID 3d SID 1bc2 TYPE 1 VPID a5 APID 5a APID 5b PCRPID a5
+      CHANNEL ID 146 NAME "NTV Int.-HTB" SATID ffffff TPID 3d SID 1bbd TYPE 1 VPID a0 APID 50 PCRPID a0
+      CHANNEL ID 147 NAME "NTV Int.-Nashe Kino" SATID ffffff TPID 3d SID 1bbe TYPE 1 VPID a1 APID 52 PCRPID a1
+      CHANNEL ID 148 NAME "NTV Int.-Detsk. Mir" SATID ffffff TPID 3d SID 1bbf TYPE 1 VPID a2 APID 54 PCRPID a2
+    TRANSPONDER ID 1838 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 149 NAME "DISNEY CHANNEL" SATID ffffff TPID 1838 SID 2a95 TYPE 1 PCRPID a0
+      CHANNEL ID 14a NAME "DISCOVERY" SATID ffffff TPID 1838 SID 2a97 TYPE 1 VPID a1 PCRPID a1
+      CHANNEL ID 14b NAME "EUSP" SATID ffffff TPID 1838 SID 2a99 TYPE 1 VPID a2 APID 58 APID 59 PCRPID a2
+      CHANNEL ID 14c NAME "HAPPY CHANNEL" SATID ffffff TPID 1838 SID 2a9b TYPE 1 PCRPID a3
+      CHANNEL ID 14d NAME "MATCH MUSIC" SATID ffffff TPID 1838 SID 2a9d TYPE 1 PCRPID a4
+      CHANNEL ID 14e NAME "MTV" SATID ffffff TPID 1838 SID 2a9f TYPE 1 PCRPID a5
+      CHANNEL ID 14f NAME "R/CINEMA RAISAT" SATID ffffff TPID 1838 SID 2aa1 TYPE 1 PCRPID a6
+    TRANSPONDER ID 189c SATID 0000 TYPE 1 FREQ 12713000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 150 SATID ffffff TPID 189c SID fffe TYPE 0
+      CHANNEL ID 151 NAME "cine stream" SATID ffffff TPID 189c SID 1e18 TYPE 1 VPID 200 APID 28a PCRPID 1ffe
+      CHANNEL ID 152 NAME "cine movie" SATID ffffff TPID 189c SID 1e1b TYPE 1 VPID 202 APID 29e PCRPID 1ffe
+    TRANSPONDER ID 1900 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 153 NAME "CLASSICA" SATID ffffff TPID 1900 SID 2af9 TYPE 1 PCRPID a0
+      CHANNEL ID 154 NAME "R/GAM ROS RAISAT" SATID ffffff TPID 1900 SID 2afb TYPE 1 PCRPID a1
+      CHANNEL ID 155 NAME "R/ALBUM RAISAT" SATID ffffff TPID 1900 SID 2afd TYPE 1 PCRPID a2
+      CHANNEL ID 156 NAME "HALLMARK" SATID ffffff TPID 1900 SID 2aff TYPE 1 VPID a3 PCRPID a3
+      CHANNEL ID 157 NAME "R/ART RAISAT" SATID ffffff TPID 1900 SID 2b01 TYPE 1 PCRPID a4
+      CHANNEL ID 158 NAME "TST1" SATID ffffff TPID 1900 SID 2b03 TYPE 1 PCRPID a5
+      CHANNEL ID 159 NAME "TMC" SATID ffffff TPID 1900 SID 2b05 TYPE 1 VPID a6 PCRPID a6
+      CHANNEL ID 15a NAME "TMC2" SATID ffffff TPID 1900 SID 2b07 TYPE 1 VPID a7 PCRPID a7
+    TRANSPONDER ID 1964 SATID 0000 TYPE 1 FREQ 12015000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 15b NAME "ART VARIETY" SATID ffffff TPID 1964 SID 19a TYPE 1 VPID a0 PCRPID a0
+      CHANNEL ID 15c NAME "ART CHILDREN" SATID ffffff TPID 1964 SID 1a4 TYPE 1 VPID a1 PCRPID a1
+      CHANNEL ID 15d NAME "ART MOVIES" SATID ffffff TPID 1964 SID 1ae TYPE 1 VPID a2 PCRPID a2
+      CHANNEL ID 15e NAME "ART MUSIC" SATID ffffff TPID 1964 SID 1b8 TYPE 1 VPID a3 PCRPID a3
+      CHANNEL ID 15f NAME "ART EUROPE" SATID ffffff TPID 1964 SID 1c2 TYPE 0 VPID a4 PCRPID a4
+      CHANNEL ID 160 NAME "LBC EUROPE" SATID ffffff TPID 1964 SID 1cc TYPE 1 VPID a5 PCRPID a5
+      CHANNEL ID 161 NAME "EGYPT SAT. CH. 2" SATID ffffff TPID 1964 SID 1d6 TYPE 1 VPID a6 PCRPID a6
+      CHANNEL ID 162 NAME "ART SPORT" SATID ffffff TPID 1964 SID 1d8 TYPE 1 VPID a7 PCRPID a7
+      CHANNEL ID 163 NAME "IQRA" SATID ffffff TPID 1964 SID 1da TYPE 1 VPID a8 PCRPID a8
+    TRANSPONDER ID 19c8 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 164 NAME "T+ BIANCO" SATID ffffff TPID 19c8 SID 2b5d TYPE 1 VPID a0 APID 50 APID 51 TTPID 2c PCRPID a0
+      CHANNEL ID 165 NAME "T+ NERO" SATID ffffff TPID 19c8 SID 2b5f TYPE 1 VPID a1 APID 54 APID 55 TTPID 2d PCRPID a1
+      CHANNEL ID 166 NAME "T+ GRIGIO" SATID ffffff TPID 19c8 SID 2b61 TYPE 1 VPID a2 APID 58 APID 59 PCRPID a2
+      CHANNEL ID 167 NAME "R4" SATID ffffff TPID 19c8 SID 18 TYPE 1 VPID a3 PCRPID a3
+      CHANNEL ID 168 NAME "16:9 TELE+" SATID ffffff TPID 19c8 SID 2b63 TYPE 1 VPID a4 APID 60 APID 61 PCRPID a4
+      CHANNEL ID 169 NAME "VETRINA D+" SATID ffffff TPID 19c8 SID 2b65 TYPE 1 PCRPID a5
+      CHANNEL ID 16a NAME "R/RAGAZZI RAISAT" SATID ffffff TPID 19c8 SID 2b67 TYPE 1 PCRPID a6
+    TRANSPONDER ID 1a2c SATID 0000 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 16b NAME "CNN" SATID ffffff TPID 1a2c SID 2ced TYPE 1 PCRPID af
+      CHANNEL ID 16c NAME "BBC" SATID ffffff TPID 1a2c SID 2cef TYPE 1 PCRPID af
+      CHANNEL ID 16d NAME "BLOOMBERG" SATID ffffff TPID 1a2c SID 2cf1 TYPE 1 PCRPID af
+      CHANNEL ID 16e NAME "CNBC" SATID ffffff TPID 1a2c SID 2cf3 TYPE 1 PCRPID af
+      CHANNEL ID 16f NAME "SKYNews" SATID ffffff TPID 1a2c SID 2cf5 TYPE 1 PCRPID af
+      CHANNEL ID 170 NAME "TST2" SATID ffffff TPID 1a2c SID 2cf7 TYPE 1 PCRPID af
+      CHANNEL ID 171 NAME "TV5" SATID ffffff TPID 1a2c SID 2cf9 TYPE 1 PCRPID af
+      CHANNEL ID 172 NAME "EPG" SATID ffffff TPID 1a2c SID 2cfb TYPE 1 PCRPID af
+      CHANNEL ID 173 NAME "CNN" SATID ffffff TPID 1a2c SID 2cfd TYPE 1 VPID a0 APID 50 PCRPID af
+      CHANNEL ID 174 NAME "CNBC" SATID ffffff TPID 1a2c SID 2cff TYPE 1 VPID a3 APID 5c PCRPID af
+      CHANNEL ID 175 NAME "TV5" SATID ffffff TPID 1a2c SID 2d01 TYPE 1 VPID a6 APID 68 PCRPID af
+      CHANNEL ID 176 NAME "BBC WORLD" SATID ffffff TPID 1a2c SID 2d03 TYPE 1 VPID a1 APID 54 PCRPID af
+      CHANNEL ID 177 SATID ffffff TPID 1a2c SID 2d4b TYPE 0 PCRPID 1ffe
+      CHANNEL ID 178 SATID ffffff TPID 1a2c SID 26fc TYPE 0 PCRPID 1ffe
+      CHANNEL ID 179 SATID ffffff TPID 1a2c SID 26fd TYPE 0 PCRPID 1ffe
+    TRANSPONDER ID 3264 SATID 0000 TYPE 1 FREQ 11095910 POL V SRATE 27500000 FEC 8
+      CHANNEL ID ffffffff NAME "Telekom TV" SATID ffffff TPID 3264 SID e7f TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "FantasticOverOpal" SATID ffffff TPID 3264 SID e80 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "Gilat" SATID ffffff TPID 3264 SID e81 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "Siemens TV" SATID ffffff TPID 3264 SID e84 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "S-TV" SATID ffffff TPID 3264 SID e85 TYPE 0 VPID 20 PCRPID 20
+      CHANNEL ID ffffffff NAME "Optibase Encoder" SATID ffffff TPID 3264 SID e86 TYPE 0 VPID 20 PCRPID 20
+    TRANSPONDER ID 1af4 SATID 0000 TYPE 1 FREQ 12091901 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 17a NAME "Bolsa" SATID ffffff TPID 1af4 SID 222e TYPE 0
+      CHANNEL ID 17b NAME "Testw" SATID ffffff TPID 1af4 SID 222f TYPE 0
+      CHANNEL ID 17c NAME "SIRE" SATID ffffff TPID 1af4 SID 2230 TYPE 0 PCRPID 102
+      CHANNEL ID 17d NAME "Telesierra" SATID ffffff TPID 1af4 SID 2200 TYPE 0 VPID 1040 APID 1041 PCRPID 1040
+      CHANNEL ID 17e NAME "vtv" SATID ffffff TPID 1af4 SID 21fd TYPE 0 VPID 1010 APID 1012 APID 1011 APID 1013 PCRPID 1010
+      CHANNEL ID 17f NAME "Satisfaction" SATID ffffff TPID 1af4 SID 2202 TYPE 0 VPID 1060 APID 1061 PCRPID 1060
+      CHANNEL ID 180 NAME "C. Milagro" SATID ffffff TPID 1af4 SID 2207 TYPE 0 VPID 1110 APID 1111 PCRPID 1110
+      CHANNEL ID 181 NAME "Fiesta" SATID ffffff TPID 1af4 SID 2210 TYPE 0 VPID 1150 APID 1151 APID 1152 PCRPID 1150
+      CHANNEL ID 182 NAME "TVE Internacional" SATID ffffff TPID 1af4 SID 2203 TYPE 0 VPID 1070 APID 1071 PCRPID 1070
+      CHANNEL ID 183 NAME "TV Galicia" SATID ffffff TPID 1af4 SID 2204 TYPE 0 APID 1090 PCRPID 1090
+      CHANNEL ID 184 NAME "Radio Gallega" SATID ffffff TPID 1af4 SID 2205 TYPE 0 APID 1090 PCRPID 1090
+      CHANNEL ID 185 NAME "Retelsat" SATID ffffff TPID 1af4 SID 2212 TYPE 1 VPID 1170 APID 1171 PCRPID 1170
+      CHANNEL ID 186 NAME "Musicam 1" SATID ffffff TPID 1af4 SID 2209 TYPE 1 APID 1136 PCRPID 1136
+      CHANNEL ID 187 NAME "Musicam 2" SATID ffffff TPID 1af4 SID 220a TYPE 1 APID 1133 PCRPID 1133
+      CHANNEL ID 188 NAME "Musicam 3" SATID ffffff TPID 1af4 SID 220b TYPE 1 APID 1136 PCRPID 1136
+      CHANNEL ID 189 NAME "Musicam 4" SATID ffffff TPID 1af4 SID 220c TYPE 1 APID 1132 PCRPID 1132
+      CHANNEL ID 18a NAME "Musicam 5" SATID ffffff TPID 1af4 SID 220d TYPE 1 APID 1136 PCRPID 1136
+    TRANSPONDER ID 1b58 SATID 0000 TYPE 1 FREQ 12673000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 18b NAME "HBCH FUCINO" SATID ffffff TPID 1b58 SID 2bd TYPE 0 VPID c8 APID c9 PCRPID c8
+      CHANNEL ID 18c NAME "NTVi" SATID ffffff TPID 1b58 SID 2be TYPE 0 VPID d2 APID d3 APID d4 PCRPID d2
+      CHANNEL ID 18d NAME "Test Telespazio" SATID ffffff TPID 1b58 SID 2bf TYPE 0 VPID dc APID dd PCRPID dc
+      CHANNEL ID 18e NAME "Test Telespazio" SATID ffffff TPID 1b58 SID 2c0 TYPE 0 VPID e6 APID e7 PCRPID e6
+      CHANNEL ID 18f NAME "ARMENIA TV" SATID ffffff TPID 1b58 SID 2c1 TYPE 0 VPID f0 APID f1 APID f2 PCRPID f0
+      CHANNEL ID 190 NAME "MEDNET" SATID ffffff TPID 1b58 SID 2c3 TYPE 0 VPID 104 APID 105 PCRPID 104
+      CHANNEL ID 191 NAME "AL JAZEERA" SATID ffffff TPID 1b58 SID 2c4 TYPE 0 VPID 10e APID 10f PCRPID 10e
+      CHANNEL ID 192 NAME "TIRRENO SAT" SATID ffffff TPID 1b58 SID 2c5 TYPE 0 VPID 118 APID 12d TTPID 139 PCRPID 118
+      CHANNEL ID 193 NAME "RADIO ROCK" SATID ffffff TPID 1b58 SID 2c7 TYPE 0 APID d4 PCRPID d2
+      CHANNEL ID 194 NAME "RADIO ARMENIA" SATID ffffff TPID 1b58 SID 2c8 TYPE 0 APID f2 PCRPID f0
+      CHANNEL ID 195 NAME "Coming Soon TV" SATID ffffff TPID 1b58 SID 2cd TYPE 0 APID 28 PCRPID 28
+    TRANSPONDER ID 1c20 SATID 0000 TYPE 1 FREQ 12149000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 196 NAME "AH-EDP1" SATID ffffff TPID 1c20 SID 1c21 TYPE 0 VPID 60 APID 61 PCRPID 60
+      CHANNEL ID 197 NAME "AH-EDP2" SATID ffffff TPID 1c20 SID 1c22 TYPE 0 VPID 70 APID 71 PCRPID 70
+      CHANNEL ID 198 NAME "AH-EDP3" SATID ffffff TPID 1c20 SID 1c23 TYPE 0 VPID 24 APID 25 PCRPID 24
+      CHANNEL ID 199 NAME "AH-EMP4-DATA" SATID ffffff TPID 1c20 SID 1c24 TYPE 0 PCRPID 92
+      CHANNEL ID 19a NAME "Alice" SATID ffffff TPID 1c20 SID 1c34 TYPE 0 VPID a0 APID a1 PCRPID a0
+      CHANNEL ID 19b NAME "Nuvolari" SATID ffffff TPID 1c20 SID 1c35 TYPE 0 VPID b0 APID b1 PCRPID b0
+      CHANNEL ID 19c NAME "Leonardo" SATID ffffff TPID 1c20 SID 1c36 TYPE 0 VPID 80 APID 81 PCRPID 80
+    TRANSPONDER ID 1c84 SATID 0000 TYPE 1 FREQ 12169000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 19d NAME "Discovery" SATID ffffff TPID 1c84 SID 15f TYPE 1 VPID 200 PCRPID 1ffe
+      CHANNEL ID 19e NAME "R9" SATID ffffff TPID 1c84 SID 160 TYPE 1 VPID 201 PCRPID 1ffe
+      CHANNEL ID 19f NAME "BBC World" SATID ffffff TPID 1c84 SID 161 TYPE 1 VPID 202 PCRPID 1ffe
+      CHANNEL ID 1a0 NAME "CNN" SATID ffffff TPID 1c84 SID 162 TYPE 1 VPID 203 PCRPID 1ffe
+      CHANNEL ID 1a1 NAME "CCTV" SATID ffffff TPID 1c84 SID 163 TYPE 0 VPID 204 PCRPID 1ffe
+      CHANNEL ID 1a2 NAME "R10" SATID ffffff TPID 1c84 SID 165 TYPE 1 VPID 206 PCRPID 1ffe
+      CHANNEL ID 1a3 NAME "R8" SATID ffffff TPID 1c84 SID 166 TYPE 1 VPID 207 PCRPID 1ffe
+      CHANNEL ID 1a4 NAME "FILM SAT" SATID ffffff TPID 1c84 SID 167 TYPE 1 VPID 208 PCRPID 1ffe
+      CHANNEL ID 1a5 NAME "Cartoon" SATID ffffff TPID 1c84 SID 168 TYPE 1 VPID 203 PCRPID 1ffe
+      CHANNEL ID 1a6 NAME "Promo" SATID ffffff TPID 1c84 SID 169 TYPE 0 VPID 209 PCRPID 1ffe
+      CHANNEL ID 1a7 NAME "Tempo" SATID ffffff TPID 1c84 SID 16a TYPE 1 VPID 5a0 APID 28b PCRPID f80
+      CHANNEL ID 1a8 NAME "Tempo" SATID ffffff TPID 1c84 SID 16b TYPE 1 APID 295 PCRPID f80
+      CHANNEL ID 1a9 NAME "Tempo" SATID ffffff TPID 1c84 SID 16c TYPE 1 APID 29f PCRPID f80
+      CHANNEL ID 1aa NAME "Tempo" SATID ffffff TPID 1c84 SID 16d TYPE 1 APID 2a9 PCRPID f80
+      CHANNEL ID 1ab NAME "Tempo" SATID ffffff TPID 1c84 SID 16e TYPE 1 APID 2b3 PCRPID f80
+      CHANNEL ID 1ac NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 16f TYPE 1 PCRPID 1080
+      CHANNEL ID 1ad NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 171 TYPE 1 PCRPID 1080
+      CHANNEL ID 1ae NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 172 TYPE 1 PCRPID 1080
+      CHANNEL ID 1af NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 173 TYPE 1 VPID 42b PCRPID 1080
+      CHANNEL ID 1b0 NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 174 TYPE 1 PCRPID 1080
+      CHANNEL ID 1b1 NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 175 TYPE 1 PCRPID 1080
+      CHANNEL ID 1b2 NAME "NOVA Cinema" SATID ffffff TPID 1c84 SID 176 TYPE 1 PCRPID 1080
+      CHANNEL ID 1b3 NAME "NET" SATID ffffff TPID 1c84 SID 178 TYPE 1 VPID 201 PCRPID 1ffe
+      CHANNEL ID 1b4 NAME "MAD T.V" SATID ffffff TPID 1c84 SID 179 TYPE 1 VPID 206 PCRPID 1ffe
+      CHANNEL ID 1b5 NAME "ET-1" SATID ffffff TPID 1c84 SID 17a TYPE 1 VPID 207 PCRPID 1ffe
+      CHANNEL ID 1b6 SATID ffffff TPID 1c84 SID 17b TYPE 0 PCRPID 1000
+      CHANNEL ID 1b7 NAME "�����" SATID ffffff TPID 1c84 SID 180 TYPE 0 VPID 205 PCRPID 1ffe
+    TRANSPONDER ID 0131 SATID 0000 TYPE 1 FREQ 12188000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 0132 SATID 0000 TYPE 1 FREQ 12203000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 0133 SATID 0000 TYPE 1 FREQ 12211000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 004d SATID 0000 TYPE 1 FREQ 12264500 POL V SRATE 27500000 FEC 8
+      CHANNEL ID ffffffff NAME "Deutsche Bank / T1" SATID ffffff TPID 4d SID 1 TYPE 1 VPID 488 PCRPID 488
+      CHANNEL ID 7f NAME "Animal Planet" SATID ffffff TPID 4d SID a TYPE 1 VPID 488 PCRPID 488
+      CHANNEL ID 80 NAME "Discovery E Europe-English" SATID ffffff TPID 4d SID 14 TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID ffffffff NAME "Wuerth KG / T21" SATID ffffff TPID 4d SID 15 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 82 NAME "Discovery Italy" SATID ffffff TPID 4d SID 1e TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID ffffffff NAME "BTI / T31" SATID ffffff TPID 4d SID 1f TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 84 NAME "Discovery Russia" SATID ffffff TPID 4d SID 28 TYPE 1 VPID 5b4 PCRPID 5b4
+      CHANNEL ID ffffffff NAME "K-TV (MetroMux) / T41" SATID ffffff TPID 4d SID 29 TYPE 1 VPID 7a8 PCRPID 7a8
+      CHANNEL ID 86 NAME "Animal Planet EE" SATID ffffff TPID 4d SID 32 TYPE 1 VPID 618 PCRPID 618
+      CHANNEL ID 87 NAME "Animal Planet - Russian" SATID ffffff TPID 4d SID 33 TYPE 1 VPID 618 PCRPID 618
+      CHANNEL ID 88 NAME "Discovery Netherlands" SATID ffffff TPID 4d SID 3c TYPE 1 VPID 67c PCRPID 67c
+      CHANNEL ID ffffffff NAME "Q English" SATID ffffff TPID 4d SID 46 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 8a NAME "Travel and Adventure" SATID ffffff TPID 4d SID 50 TYPE 1 VPID 744 PCRPID 744
+      CHANNEL ID 8b NAME "Travel and Adventure- Russian" SATID ffffff TPID 4d SID 51 TYPE 1 VPID 744 PCRPID 744
+      CHANNEL ID 8c NAME "New DCP" SATID ffffff TPID 4d SID 12c TYPE 1 APID 4c4 PCRPID 4c4
+      CHANNEL ID 8d NAME "CCP" SATID ffffff TPID 4d SID 12d TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID ffffffff NAME "Deutsche Bank / T2" SATID ffffff TPID 4d SID 2 TYPE 1 VPID 4ec PCRPID 4ec
+      CHANNEL ID 93 NAME "Channel Three" SATID ffffff TPID 4d SID 3 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 94 NAME "Channel Four" SATID ffffff TPID 4d SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 95 NAME "Channel Five" SATID ffffff TPID 4d SID 5 TYPE 0 VPID 618 PCRPID 618
+      CHANNEL ID 96 NAME "Channel 6 = Sat 7 Arabic" SATID ffffff TPID 4d SID 6 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 97 NAME "Channel Seven" SATID ffffff TPID 4d SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 98 NAME "Q German" SATID ffffff TPID 4d SID 47 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 99 NAME "Q French" SATID ffffff TPID 4d SID 48 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 9a NAME "Q Dutch" SATID ffffff TPID 4d SID 49 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 1b8 NAME "DTAG / T11" SATID ffffff TPID 4d SID b TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1b9 NAME "DTAG 50 / T12" SATID ffffff TPID 4d SID c TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1ba NAME "Telekom TV" SATID ffffff TPID 4d SID d TYPE 1 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 1bb NAME "Gerling / T26" SATID ffffff TPID 4d SID 1a TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bc NAME "Hornbach-D / T36" SATID ffffff TPID 4d SID 24 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bd NAME "Hornbach-NL / T38" SATID ffffff TPID 4d SID 26 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1be NAME "Hornbach-CZ / T39" SATID ffffff TPID 4d SID 27 TYPE 1 VPID 550 PCRPID 550
+      CHANNEL ID 1bf NAME "Testkanal" SATID ffffff TPID 4d SID 63 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 1c0 NAME "KENCAST" SATID ffffff TPID 4d SID 6f TYPE 0 PCRPID 42e
+    TRANSPONDER ID 1f40 SATID 0000 TYPE 1 FREQ 12302880 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 1c1 NAME "SLO-TV1" SATID ffffff TPID 1f40 SID c81 TYPE 1 VPID c8 PCRPID c8
+      CHANNEL ID 1c2 NAME "SLO-TV2" SATID ffffff TPID 1f40 SID c82 TYPE 1 VPID cb PCRPID cb
+      CHANNEL ID 1c3 NAME "POLONIA 1" SATID ffffff TPID 1f40 SID c83 TYPE 0 VPID cd PCRPID cd
+      CHANNEL ID 1c4 NAME "SLO-RA1-INF" SATID ffffff TPID 1f40 SID c84 TYPE 0 APID fa PCRPID fa
+      CHANNEL ID 1c5 NAME "SLO-RA2" SATID ffffff TPID 1f40 SID c85 TYPE 0 APID fb PCRPID fb
+      CHANNEL ID 1c6 NAME "SLO-RA3" SATID ffffff TPID 1f40 SID c86 TYPE 0 APID fc PCRPID fc
+      CHANNEL ID 1c7 NAME "SUPER 1" SATID ffffff TPID 1f40 SID c87 TYPE 0 VPID cf PCRPID cf
+      CHANNEL ID 1c8 NAME "NAPOLI INT." SATID ffffff TPID 1f40 SID c8a TYPE 0 VPID f0 PCRPID f0
+      CHANNEL ID 1c9 NAME "MAGIC" SATID ffffff TPID 1f40 SID c8b TYPE 0 VPID f5 PCRPID f5
+      CHANNEL ID 1ca NAME "COUNTDOWN" SATID ffffff TPID 1f40 SID c8c TYPE 0 VPID eb PCRPID eb
+      CHANNEL ID 1cb NAME "TBNE" SATID ffffff TPID 1f40 SID c8d TYPE 0 VPID e6 PCRPID e6
+      CHANNEL ID 1cc NAME "SICILSAT" SATID ffffff TPID 1f40 SID c8e TYPE 0 VPID e1 PCRPID e1
+    TRANSPONDER ID 1fa4 SATID 0000 TYPE 1 FREQ 10892000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 1cd NAME "TVP1" SATID ffffff TPID 1fa4 SID 1 TYPE 1 VPID 101 APID 102 APID 17df TTPID 103 PCRPID 101
+      CHANNEL ID 1ce NAME "TVP2" SATID ffffff TPID 1fa4 SID 2 TYPE 1 VPID 141 APID 142 PCRPID 141
+      CHANNEL ID 1cf NAME "POLSAT1" SATID ffffff TPID 1fa4 SID 3 TYPE 1
+      CHANNEL ID 1d0 NAME "TV4" SATID ffffff TPID 1fa4 SID 4 TYPE 1 VPID 101 APID 102 APID 17df TTPID 103 PCRPID 101
+      CHANNEL ID 1d1 NAME "POLSAT2" SATID ffffff TPID 1fa4 SID 5 TYPE 1 VPID 141 APID 142 PCRPID 141
+      CHANNEL ID 1d2 NAME "WOT" SATID ffffff TPID 1fa4 SID 6 TYPE 1
+      CHANNEL ID 1d3 NAME "DISCOVERY" SATID ffffff TPID 1fa4 SID f TYPE 1 VPID 101 APID 102 APID 17df TTPID 103 PCRPID 101
+      CHANNEL ID 1d4 NAME "ANIMAL PLANET" SATID ffffff TPID 1fa4 SID 10 TYPE 1 VPID 141 APID 142 PCRPID 141
+      CHANNEL ID 1d5 NAME "EpgOpenTV" SATID ffffff TPID 1fa4 SID e66 TYPE 0
+    TRANSPONDER ID 2008 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 1d6 NAME "P10" SATID ffffff TPID 2008 SID 2d51 TYPE 1 VPID a0 APID 50 APID 51 PCRPID b0
+      CHANNEL ID 1d7 NAME "P11" SATID ffffff TPID 2008 SID 2d53 TYPE 1 VPID a1 APID 54 APID 55 PCRPID b0
+      CHANNEL ID 1d8 NAME "P12" SATID ffffff TPID 2008 SID 2d55 TYPE 1 VPID a2 APID 58 APID 59 PCRPID b0
+      CHANNEL ID 1d9 NAME "P13" SATID ffffff TPID 2008 SID 2d57 TYPE 1 VPID a3 APID 5c APID 5d PCRPID b0
+      CHANNEL ID 1da NAME "P14" SATID ffffff TPID 2008 SID 2d59 TYPE 1 VPID a4 APID 60 APID 61 PCRPID b0
+      CHANNEL ID 1db NAME "P15" SATID ffffff TPID 2008 SID 2d5b TYPE 1 VPID a5 APID 64 APID 65 PCRPID b0
+      CHANNEL ID 1dc NAME "P16" SATID ffffff TPID 2008 SID 2d5d TYPE 1 VPID a6 APID 68 APID 69 PCRPID b0
+      CHANNEL ID 1dd NAME "PREMIUM" SATID ffffff TPID 2008 SID 2d5f TYPE 1 PCRPID af
+      CHANNEL ID 1de NAME "+F1" SATID ffffff TPID 2008 SID 2d61 TYPE 1 VPID a0 APID 51 APID 298 PCRPID b0
+      CHANNEL ID 1df NAME "+F1" SATID ffffff TPID 2008 SID 2d63 TYPE 1 VPID a1 APID 29a APID 55 PCRPID b0
+      CHANNEL ID 1e0 NAME "+F1" SATID ffffff TPID 2008 SID 2d65 TYPE 1 VPID a2 APID 59 APID 29b PCRPID b0
+      CHANNEL ID 1e1 NAME "+F1" SATID ffffff TPID 2008 SID 2d67 TYPE 1 VPID a3 APID 5d APID 2a2 PCRPID b0
+      CHANNEL ID 1e2 NAME "+F1" SATID ffffff TPID 2008 SID 2d69 TYPE 1 VPID a4 APID 61 APID 60 PCRPID b0
+      CHANNEL ID 1e3 NAME "+F1" SATID ffffff TPID 2008 SID 2d6b TYPE 1 VPID a5 APID 65 APID 2a4 PCRPID b0
+      CHANNEL ID 1e4 NAME "+F1" SATID ffffff TPID 2008 SID 2d6d TYPE 1 VPID a6 APID 69 APID 29a PCRPID b0
+      CHANNEL ID 1e5 NAME "RMC" SATID ffffff TPID 2008 SID 2d6f TYPE 1 PCRPID b8
+      CHANNEL ID 1e6 NAME "R101" SATID ffffff TPID 2008 SID 2d70 TYPE 1 PCRPID b8
+      CHANNEL ID 1e7 NAME "RRAD" SATID ffffff TPID 2008 SID 2d71 TYPE 1 PCRPID b8
+    TRANSPONDER ID 206c SATID 0000 TYPE 1 FREQ 10892000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 1e8 NAME "ON" SATID ffffff TPID 206c SID 7 TYPE 1 VPID 161 APID 162 PCRPID 161
+      CHANNEL ID 1e9 NAME "DLA-CIEBIE" SATID ffffff TPID 206c SID 8 TYPE 1 VPID 211 APID 212 PCRPID 211
+      CHANNEL ID 1ea NAME "KOMEDIA" SATID ffffff TPID 206c SID 9 TYPE 1 VPID 161 APID 162 PCRPID 161
+      CHANNEL ID 1eb NAME "SMYK" SATID ffffff TPID 206c SID a TYPE 1 VPID 211 APID 212 PCRPID 211
+      CHANNEL ID 1ec NAME "RELAKS" SATID ffffff TPID 206c SID b TYPE 1 VPID 161 APID 162 PCRPID 161
+      CHANNEL ID 1ed NAME "INFO" SATID ffffff TPID 206c SID c TYPE 1 VPID 211 APID 212 PCRPID 211
+      CHANNEL ID 1ee NAME "POLSAT SPORT" SATID ffffff TPID 206c SID d TYPE 1 VPID 161 APID 162 PCRPID 161
+    TRANSPONDER ID 20d0 SATID 0000 TYPE 1 FREQ 12379000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 1ef NAME "Paris Premi�re" SATID ffffff TPID 20d0 SID bb9 TYPE 1 VPID bcd APID bd7 PCRPID bcd
+      CHANNEL ID 1f0 NAME "OCC HB3" SATID ffffff TPID 20d0 SID bba TYPE 0 VPID bce APID bd8 PCRPID bce
+      CHANNEL ID 1f1 NAME "TELE 24  Switzerland" SATID ffffff TPID 20d0 SID bbb TYPE 0 VPID bcf APID bd9 PCRPID bcf
+      CHANNEL ID 1f2 NAME "AIR MEDIA" SATID ffffff TPID 20d0 SID c0f TYPE 0 APID dd1 PCRPID dd1
+      CHANNEL ID 1f3 NAME "Abu Dhabi TV" SATID ffffff TPID 20d0 SID bbc TYPE 0 VPID bd0 APID bda PCRPID bd0
+      CHANNEL ID 1f4 NAME "EMIRAT FM 1" SATID ffffff TPID 20d0 SID c0b TYPE 0 APID dcd PCRPID dcd
+      CHANNEL ID 1f5 NAME "EMIRAT FM2" SATID ffffff TPID 20d0 SID c0c TYPE 0 APID dce PCRPID dce
+      CHANNEL ID 1f6 NAME "Radio Italia " SATID ffffff TPID 20d0 SID c09 TYPE 0 APID dcb PCRPID dcb
+      CHANNEL ID 1f7 NAME "EQUIDIA INTER." SATID ffffff TPID 20d0 SID beb TYPE 1 VPID cf9 APID d03 APID d0d APID d17 PCRPID cf9
+      CHANNEL ID 1f8 NAME "RTV MONTENEGRO" SATID ffffff TPID 20d0 SID bbe TYPE 0 VPID bd2 APID bdc PCRPID bd2
+      CHANNEL ID 1f9 NAME "Radio Montenegro" SATID ffffff TPID 20d0 SID c10 TYPE 0 APID dd2 PCRPID dd2
+      CHANNEL ID 1fa NAME "SERTE TEST" SATID ffffff TPID 20d0 SID bbd TYPE 0 VPID bd1 PCRPID bd1
+      CHANNEL ID 1fb NAME "GAME 1" SATID ffffff TPID 20d0 SID bbf TYPE 1 VPID bd3 APID bdd PCRPID bd3
+    TRANSPONDER ID 0055 SATID 0000 TYPE 1 FREQ 12398781 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 1fc NAME "SF 2" SATID ffffff TPID 55 SID 38b TYPE 1 VPID a3 APID 5c APID 5d TTPID 29 PCRPID a3
+      CHANNEL ID 1fd NAME "SRG SSR Sat Access" SATID ffffff TPID 55 SID 38e TYPE 0 VPID a5 APID 62 APID 63 TTPID 2f PCRPID a5
+      CHANNEL ID 1fe NAME "SF 1" SATID ffffff TPID 55 SID 385 TYPE 1 VPID a0 APID 50 APID 51 TTPID 20 PCRPID a0
+      CHANNEL ID 1ff NAME "TSR 1" SATID ffffff TPID 55 SID 386 TYPE 1 VPID a1 APID 54 APID 55 TTPID 23 PCRPID a1
+      CHANNEL ID 200 NAME "TSI 1" SATID ffffff TPID 55 SID 387 TYPE 1 VPID a2 APID 58 APID 59 TTPID 26 PCRPID a2
+      CHANNEL ID 201 NAME "TSR 2" SATID ffffff TPID 55 SID 38c TYPE 1 VPID a4 APID 60 APID 61 TTPID 2c PCRPID a4
+      CHANNEL ID 202 NAME "TSI 2" SATID ffffff TPID 55 SID 38d TYPE 1 VPID a6 APID 64 APID 65 TTPID 32 PCRPID a6
+      CHANNEL ID 203 NAME "OPTION MUSIQUE" SATID ffffff TPID 55 SID 3bd TYPE 0 APID cc PCRPID cc
+      CHANNEL ID 204 NAME "ESPACE 2" SATID ffffff TPID 55 SID 3be TYPE 0 APID cd PCRPID cd
+      CHANNEL ID 205 NAME "SRI-F-I" SATID ffffff TPID 55 SID 3b7 TYPE 0 APID c7 PCRPID c7
+      CHANNEL ID 206 NAME "SRI-EUROPA" SATID ffffff TPID 55 SID 3b9 TYPE 0 VPID 230 APID c8 PCRPID c8
+    TRANSPONDER ID 2198 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 207 NAME "POLO" SATID ffffff TPID 2198 SID 2db5 TYPE 1 VPID a0 APID 50 PCRPID a0
+      CHANNEL ID 208 NAME "PLANETE" SATID ffffff TPID 2198 SID 2db7 TYPE 1 VPID a1 APID 54 PCRPID a1
+      CHANNEL ID 209 NAME "JIMMY" SATID ffffff TPID 2198 SID 2db9 TYPE 1 VPID a2 APID 58 PCRPID a2
+      CHANNEL ID 20a NAME "INN" SATID ffffff TPID 2198 SID 2dbb TYPE 1 VPID a3 APID 5c PCRPID a3
+      CHANNEL ID 20b NAME "CIN1" SATID ffffff TPID 2198 SID 2dbd TYPE 1 VPID a4 APID 60 PCRPID a4
+      CHANNEL ID 20c NAME "CIN2" SATID ffffff TPID 2198 SID 2dbf TYPE 1 VPID a5 APID 64 PCRPID a5
+      CHANNEL ID 20d NAME "CINC" SATID ffffff TPID 2198 SID 2dc1 TYPE 1 VPID a6 APID 68 PCRPID a6
+      CHANNEL ID 20e NAME "SEASONS" SATID ffffff TPID 2198 SID 2dc3 TYPE 1 VPID a7 APID 6c PCRPID a7
+      CHANNEL ID 20f NAME "WISHLINE" SATID ffffff TPID 2198 SID 2dc5 TYPE 1 VPID a8 APID 55 APID 5d APID 59 PCRPID a8
+      CHANNEL ID 210 NAME "MARCOPOLO" SATID ffffff TPID 2198 SID 2dc7 TYPE 1 VPID a0 APID 50 APID 51 PCRPID a0
+    TRANSPONDER ID 0049 SATID 0000 TYPE 1 FREQ 12436999 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 211 NAME "JAAM-E-JAM 1" SATID ffffff TPID 49 SID 1 TYPE 0 VPID a0 APID 50 APID 51 PCRPID a0
+      CHANNEL ID 212 NAME "JAAM-E-JAM 2" SATID ffffff TPID 49 SID 2 TYPE 0 VPID a1 APID 52 APID 53 TTPID 21 PCRPID a1
+      CHANNEL ID 213 NAME "SAHAR" SATID ffffff TPID 49 SID 3 TYPE 0 VPID a2 APID 54 APID 55 PCRPID a2
+      CHANNEL ID 214 NAME "TEST(SAHAR)" SATID ffffff TPID 49 SID 4 TYPE 0 VPID a3 APID 56 APID 57 PCRPID a3
+      CHANNEL ID 215 NAME "IRINN" SATID ffffff TPID 49 SID 5 TYPE 0 VPID a4 APID 58 APID 59 PCRPID a4
+      CHANNEL ID 216 NAME "TEST 2" SATID ffffff TPID 49 SID 6 TYPE 0 VPID a5 APID 5a PCRPID a5
+      CHANNEL ID 217 NAME "IRIB1 RADIO" SATID ffffff TPID 49 SID 7 TYPE 0 APID 51 PCRPID a0
+      CHANNEL ID 218 NAME "IRIB ARABIC /International 1 Radio" SATID ffffff TPID 49 SID 8 TYPE 0 APID 53 PCRPID a1
+    TRANSPONDER ID 013d SATID 0000 TYPE 1 FREQ 12460000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 013e SATID 0000 TYPE 1 FREQ 12484000 POL V SRATE 27500000 FEC 8
+    TRANSPONDER ID 22c4 SATID 0000 TYPE 1 FREQ 12475499 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 219 NAME "INT1 FAMILY RADIO" SATID ffffff TPID 22c4 SID 2977 TYPE 0 APID 3c1 PCRPID 3c1
+      CHANNEL ID 21a NAME "RADIO 74" SATID ffffff TPID 22c4 SID 2974 TYPE 0 APID 399 PCRPID 399
+      CHANNEL ID 21b NAME "R 74 INT." SATID ffffff TPID 22c4 SID 2975 TYPE 0 APID 3a3 PCRPID 3a3
+      CHANNEL ID 21c NAME "FAMILY Radio" SATID ffffff TPID 22c4 SID 2976 TYPE 0 APID 3b7 PCRPID 3b7
+      CHANNEL ID 21d NAME "Temp" SATID ffffff TPID 22c4 SID 296f TYPE 0 VPID 303 PCRPID 300
+      CHANNEL ID 21e NAME "SPREE Radio" SATID ffffff TPID 22c4 SID 299c TYPE 0 APID 1f5 PCRPID 1f5
+      CHANNEL ID 21f NAME " RVI  ( VRT ) " SATID ffffff TPID 22c4 SID 2972 TYPE 0 APID 385 PCRPID 385
+      CHANNEL ID 220 NAME "EbS" SATID ffffff TPID 22c4 SID 2969 TYPE 0 VPID 65 APID c9 APID ca APID cb APID cc APID cd APID ce APID cf APID d0 APID d1 APID d2 APID d3 APID d4 APID d5 APID d6 APID d7 APID d8 TTPID 12d PCRPID 65
+      CHANNEL ID 221 NAME "MOU.2" SATID ffffff TPID 22c4 SID 296a TYPE 0 VPID 2a PCRPID 2a
+      CHANNEL ID 222 NAME "MIZIK TROPICAL" SATID ffffff TPID 22c4 SID 296e TYPE 0 VPID 1b3 APID 1b4 PCRPID 1b3
+      CHANNEL ID 223 NAME "MIZIK TROPICAL Radio" SATID ffffff TPID 22c4 SID 2970 TYPE 0 APID 321 PCRPID 321
+      CHANNEL ID 224 NAME "Framboise Nord (CH)" SATID ffffff TPID 22c4 SID 2978 TYPE 0 APID 3cb PCRPID 3cb
+      CHANNEL ID 225 NAME "Framboise Sud (CH)" SATID ffffff TPID 22c4 SID 2979 TYPE 0 APID 3d5 PCRPID 3d5
+      CHANNEL ID 226 NAME "PINK PLUS" SATID ffffff TPID 22c4 SID 296d TYPE 1 VPID 134 APID 100 APID 101 PCRPID 24
+      CHANNEL ID 227 NAME "LIBERTYTV.COM" SATID ffffff TPID 22c4 SID 296b TYPE 0 VPID 3ad APID 3ae PCRPID 3ad
+      CHANNEL ID 228 NAME "KURDSAT" SATID ffffff TPID 22c4 SID 297a TYPE 0 VPID 258 APID 259 PCRPID 1ffe
+      CHANNEL ID 229 NAME "test2" SATID ffffff TPID 22c4 SID 297c TYPE 0 VPID bb8 APID bb9 TTPID bba PCRPID bb8
+    TRANSPONDER ID 2328 SATID 0000 TYPE 1 FREQ 12519840 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 22a NAME "HRT-TV1" SATID ffffff TPID 2328 SID 206d TYPE 1 VPID 64 APID 65 TTPID 66 PCRPID 64
+      CHANNEL ID 22b NAME "HRT-TV2" SATID ffffff TPID 2328 SID 206e TYPE 1 VPID 67 APID 68 TTPID 66 PCRPID 67
+      CHANNEL ID 22c NAME "HRT-TV3" SATID ffffff TPID 2328 SID 206f TYPE 1 VPID 69 APID 6a TTPID 66 PCRPID 69
+      CHANNEL ID 22d NAME "HRT-HR1" SATID ffffff TPID 2328 SID 2071 TYPE 0 APID 96 PCRPID 96
+      CHANNEL ID 22e NAME "HRT-HR2" SATID ffffff TPID 2328 SID 2072 TYPE 0 APID 97 PCRPID 97
+      CHANNEL ID 22f NAME "HRT-HR3" SATID ffffff TPID 2328 SID 2073 TYPE 0 APID 98 PCRPID 98
+      CHANNEL ID 230 NAME "SICILIA INTERNATIONAL" SATID ffffff TPID 2328 SID 2075 TYPE 0 VPID 1f5 PCRPID 1f5
+      CHANNEL ID 231 NAME "HRT-NATIONAL" SATID ffffff TPID 2328 SID 2070 TYPE 1 VPID 6b APID 6c TTPID 66 PCRPID 6b
+      CHANNEL ID 232 NAME "HRT-TEST" SATID ffffff TPID 2328 SID 2074 TYPE 1 VPID 6d APID 6e TTPID 66 PCRPID 6d
+      CHANNEL ID 233 NAME "SARDEGNA UNO" SATID ffffff TPID 2328 SID 2076 TYPE 0 VPID 1f7 PCRPID 1f7
+      CHANNEL ID 234 NAME "R-HRVATSKA" SATID ffffff TPID 2328 SID 2077 TYPE 0 APID 99 PCRPID 99
+      CHANNEL ID 235 NAME "EuroMed" SATID ffffff TPID 2328 SID 2078 TYPE 0 VPID 1fe PCRPID 1fe
+      CHANNEL ID 236 NAME "TGRT" SATID ffffff TPID 2328 SID 2079 TYPE 0 VPID 1f9 PCRPID 1f9
+      CHANNEL ID 237 NAME "HR-TEST" SATID ffffff TPID 2328 SID 207a TYPE 0 APID 9a PCRPID 9a
+      CHANNEL ID 238 NAME "MINI-BVN" SATID ffffff TPID 2328 SID 207b TYPE 0 VPID d2 PCRPID d6
+    TRANSPONDER ID 238c SATID 0000 TYPE 1 FREQ 12713000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 239 NAME "SIMS 91 LARIO" SATID ffffff TPID 238c SID 2262 TYPE 0
+      CHANNEL ID 23a NAME "SKYPLEX TXP91" SATID ffffff TPID 238c SID 2261 TYPE 0
+      CHANNEL ID 23b NAME "Skygate 18" SATID ffffff TPID 238c SID 2 TYPE 0
+      CHANNEL ID 23c NAME "MA12_2905" SATID ffffff TPID 238c SID 226a TYPE 0 PCRPID 1113
+      CHANNEL ID 23d NAME "ES13_1107" SATID ffffff TPID 238c SID 226b TYPE 0 PCRPID 1114
+      CHANNEL ID 23e NAME "ASTONv0107" SATID ffffff TPID 238c SID 226f TYPE 0 PCRPID 1112
+      CHANNEL ID 23f NAME "sisal" SATID ffffff TPID 238c SID 1 TYPE 1 VPID 1104 PCRPID 1104
+      CHANNEL ID 240 NAME "service" SATID ffffff TPID 238c SID 3 TYPE 1 VPID 1104 PCRPID 1104
+      CHANNEL ID 241 NAME "Skyplex 19" SATID ffffff TPID 238c SID 231f TYPE 0
+      CHANNEL ID 242 NAME "Network" SATID ffffff TPID 238c SID 2320 TYPE 0
+      CHANNEL ID 243 NAME "www.travel" SATID ffffff TPID 238c SID 2321 TYPE 0 VPID 49c APID 49f APID 4a0 TTPID 49d PCRPID 49c
+      CHANNEL ID 244 NAME "MagicStar" SATID ffffff TPID 238c SID 2322 TYPE 0 APID 4a4 PCRPID 4a4
+      CHANNEL ID 245 NAME "Skygate 8" SATID ffffff TPID 238c SID 22de TYPE 0
+      CHANNEL ID 246 NAME "UDLR" SATID ffffff TPID 238c SID 22df TYPE 0 APID 19fd
+      CHANNEL ID 247 NAME "UDLR UDcast" SATID ffffff TPID 238c SID 22e0 TYPE 0
+      CHANNEL ID 248 NAME "Skygate 17" SATID ffffff TPID 238c SID 2264 TYPE 0
+      CHANNEL ID 249 NAME "Netshow" SATID ffffff TPID 238c SID 226d TYPE 0
+      CHANNEL ID 24a NAME "MEDIOLANUM" SATID ffffff TPID 238c SID 226e TYPE 0 VPID 1006 PCRPID 1006
+      CHANNEL ID 24b NAME "Skygate 10" SATID ffffff TPID 238c SID 22c5 TYPE 0
+      CHANNEL ID 24c NAME "HitCast Data 1" SATID ffffff TPID 238c SID 22c6 TYPE 0
+      CHANNEL ID 24d NAME "HitCast S.Amer." SATID ffffff TPID 238c SID 22c7 TYPE 0
+      CHANNEL ID 24e NAME "Skygate 1" SATID ffffff TPID 238c SID 22ac TYPE 0
+      CHANNEL ID 24f NAME "MonteCarloSat" SATID ffffff TPID 238c SID 22ad TYPE 0 VPID 1407 APID 1402 PCRPID 1407
+      CHANNEL ID 250 NAME "Bulgaria Radio" SATID ffffff TPID 238c SID 227c TYPE 0 APID 1207
+      CHANNEL ID 251 NAME "skygate 600" SATID ffffff TPID 238c SID 227a TYPE 0
+    TRANSPONDER ID 23f0 SATID 0000 TYPE 1 FREQ 12558201 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 252 NAME "SKYPLEX TXP92" SATID ffffff TPID 23f0 SID 238d TYPE 0
+      CHANNEL ID 253 SATID ffffff TPID 23f0 SID 2491 TYPE 0
+      CHANNEL ID 254 SATID ffffff TPID 23f0 SID 2492 TYPE 0 VPID b09 APID b02 TTPID b0a PCRPID b09
+      CHANNEL ID 255 SATID ffffff TPID 23f0 SID 2493 TYPE 0 VPID b09 TTPID b0a PCRPID b0d
+      CHANNEL ID 256 SATID ffffff TPID 23f0 SID 2494 TYPE 0 VPID b09 TTPID b0a PCRPID b04
+      CHANNEL ID 257 NAME "SKY_4" SATID ffffff TPID 23f0 SID 2487 TYPE 0
+      CHANNEL ID 258 NAME "ESP Int'l" SATID ffffff TPID 23f0 SID 2488 TYPE 1 VPID a0f APID a02 APID a03 TTPID a10 PCRPID a0f
+      CHANNEL ID 259 NAME "ESP Romanian" SATID ffffff TPID 23f0 SID 2489 TYPE 1 APID a09 PCRPID a2c
+      CHANNEL ID 25a NAME "ESP Dutch" SATID ffffff TPID 23f0 SID 248a TYPE 1 VPID a0f APID a04 TTPID a10 PCRPID a2c
+      CHANNEL ID 25b NAME "ESP PolisI" SATID ffffff TPID 23f0 SID 248b TYPE 1 APID a05 PCRPID a2c
+      CHANNEL ID 25c SATID ffffff TPID 23f0 SID 248c TYPE 0 VPID a0f APID a06 TTPID a10 PCRPID a2c
+      CHANNEL ID 25d SATID ffffff TPID 23f0 SID 248d TYPE 0 VPID a0f APID a04 TTPID a10 PCRPID a2c
+      CHANNEL ID 25e SATID ffffff TPID 23f0 SID 248e TYPE 0 VPID a0f APID a08 TTPID a10 PCRPID a2c
+      CHANNEL ID 25f SATID ffffff TPID 23f0 SID 248f TYPE 0 APID a02 APID a03 APID a04 APID a05 PCRPID a0f
+      CHANNEL ID 260 SATID ffffff TPID 23f0 SID 2423 TYPE 0
+    TRANSPONDER ID 0143 SATID 0000 TYPE 1 FREQ 12573000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 0144 SATID 0000 TYPE 1 FREQ 12590000 POL H SRATE 27500000 FEC 8
+    TRANSPONDER ID 24b8 SATID 0000 TYPE 1 FREQ 12596560 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 261 NAME "JSTV 1" SATID ffffff TPID 24b8 SID 2015 TYPE 0 VPID 7d0 APID 7d2 APID 7d3 APID 7d2 PCRPID 7d0
+      CHANNEL ID 262 NAME "JSTV 2" SATID ffffff TPID 24b8 SID 2016 TYPE 0 VPID 7db APID 7dc APID 7dd APID 7dd PCRPID 7db
+      CHANNEL ID 263 NAME "MBC" SATID ffffff TPID 24b8 SID 2009 TYPE 0 VPID a0 APID 50 APID 51 TTPID 20 PCRPID a0
+      CHANNEL ID 264 NAME "Service 2" SATID ffffff TPID 24b8 SID 200a TYPE 0 VPID a1 APID 54 PCRPID a1
+      CHANNEL ID 265 NAME "NITV" SATID ffffff TPID 24b8 SID 200c TYPE 0 VPID a3 APID 5c PCRPID a3
+      CHANNEL ID 266 NAME "SIMAYE AZADI" SATID ffffff TPID 24b8 SID 200f TYPE 0 VPID a6 APID 6a PCRPID a6
+      CHANNEL ID 267 NAME "BET" SATID ffffff TPID 24b8 SID 2010 TYPE 0 VPID a7 APID 6c APID 6d PCRPID a7
+      CHANNEL ID 268 NAME "CNNI" SATID ffffff TPID 24b8 SID 2011 TYPE 1 VPID a8 APID 70 APID 71 TTPID 38 PCRPID a8
+      CHANNEL ID 269 NAME "EuroNews" SATID ffffff TPID 24b8 SID 2013 TYPE 0 VPID 8ad APID 8b7 APID 8b8 APID 8b9 APID 8ba APID 8bb APID 8bc APID 8bd APID 8be TTPID 300 PCRPID 8ad
+      CHANNEL ID 26a NAME "Canal Rural" SATID ffffff TPID 24b8 SID 2014 TYPE 0 VPID 911 APID 91b APID 91c PCRPID 911
+      CHANNEL ID 26b NAME "MediaHW" SATID ffffff TPID 24b8 SID 2063 TYPE 0 PCRPID fa0
+    TRANSPONDER ID 251c SATID 0000 TYPE 1 FREQ 12615000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 26c SATID ffffff TPID 251c SID fffe TYPE 0
+      CHANNEL ID 26d NAME "MMOV" SATID ffffff TPID 251c SID f46 TYPE 1 VPID a10 PCRPID a00
+      CHANNEL ID 26e NAME "MMOV" SATID ffffff TPID 251c SID f49 TYPE 1 VPID a12 PCRPID a01
+      CHANNEL ID 26f NAME "MMOV" SATID ffffff TPID 251c SID f4d TYPE 1 VPID a14 PCRPID a02
+      CHANNEL ID 270 NAME "MMOV" SATID ffffff TPID 251c SID f4e TYPE 1 VPID a16 PCRPID a03
+      CHANNEL ID 271 NAME "MMOV" SATID ffffff TPID 251c SID f4f TYPE 1 VPID a18 PCRPID a04
+      CHANNEL ID 272 NAME "MMOV" SATID ffffff TPID 251c SID f50 TYPE 1 VPID a1a PCRPID a05
+      CHANNEL ID 273 NAME "SC 1" SATID ffffff TPID 251c SID f51 TYPE 1 VPID a07 PCRPID a06
+      CHANNEL ID 274 NAME "SC 2" SATID ffffff TPID 251c SID f54 TYPE 1 VPID a0a PCRPID a06
+      CHANNEL ID 275 NAME "SC 3" SATID ffffff TPID 251c SID f57 TYPE 1 VPID a0d PCRPID a06
+      CHANNEL ID 276 NAME "MC20" SATID ffffff TPID 251c SID f5f TYPE 1 APID 900 PCRPID 900
+      CHANNEL ID 277 NAME "MC21" SATID ffffff TPID 251c SID f62 TYPE 1 APID 901 PCRPID 901
+      CHANNEL ID 278 NAME "MC22" SATID ffffff TPID 251c SID f65 TYPE 1 APID 902 PCRPID 902
+      CHANNEL ID 279 NAME "MC23" SATID ffffff TPID 251c SID f68 TYPE 1 APID 903 PCRPID 903
+      CHANNEL ID 27a NAME "MC24" SATID ffffff TPID 251c SID f6b TYPE 1 APID 904 PCRPID 904
+      CHANNEL ID 27b NAME "MC25" SATID ffffff TPID 251c SID f6e TYPE 1 APID 905 PCRPID 905
+      CHANNEL ID 27c NAME "MC26" SATID ffffff TPID 251c SID f71 TYPE 1 APID 906 PCRPID 906
+      CHANNEL ID 27d NAME "MC27" SATID ffffff TPID 251c SID f74 TYPE 1 APID 907 PCRPID 907
+      CHANNEL ID 27e NAME "MC28" SATID ffffff TPID 251c SID f77 TYPE 1 APID 908 PCRPID 908
+      CHANNEL ID 27f NAME "MC29" SATID ffffff TPID 251c SID f7a TYPE 1 APID 909 PCRPID 909
+      CHANNEL ID 280 NAME "MC30" SATID ffffff TPID 251c SID f7d TYPE 1 APID 90a PCRPID 90a
+      CHANNEL ID 281 NAME "MC31" SATID ffffff TPID 251c SID f80 TYPE 1 APID 90b PCRPID 90b
+      CHANNEL ID 282 NAME "MC32" SATID ffffff TPID 251c SID f83 TYPE 1 APID 90c PCRPID 90c
+      CHANNEL ID 283 NAME "MC33" SATID ffffff TPID 251c SID f86 TYPE 1 APID 90d PCRPID 90d
+      CHANNEL ID 284 NAME "MC34" SATID ffffff TPID 251c SID f89 TYPE 1 APID 90e PCRPID 90e
+      CHANNEL ID 285 NAME "MC35" SATID ffffff TPID 251c SID f8c TYPE 1 APID 90f PCRPID 90f
+      CHANNEL ID 286 NAME "MC36" SATID ffffff TPID 251c SID f8f TYPE 1 APID 910 PCRPID 910
+      CHANNEL ID 287 NAME "MC37" SATID ffffff TPID 251c SID f92 TYPE 1 APID 911 PCRPID 911
+      CHANNEL ID 288 NAME "MC38" SATID ffffff TPID 251c SID f95 TYPE 1 APID 912 PCRPID 912
+      CHANNEL ID 289 NAME "MC39" SATID ffffff TPID 251c SID f98 TYPE 1 APID 913 PCRPID 913
+    TRANSPONDER ID 2580 SATID 0000 TYPE 1 FREQ 12635000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 28a SATID ffffff TPID 2580 SID fffe TYPE 0
+      CHANNEL ID 28b NAME "SC 4" SATID ffffff TPID 2580 SID fa1 TYPE 1 VPID a90 PCRPID a83
+      CHANNEL ID 28c NAME "SC 5" SATID ffffff TPID 2580 SID fa2 TYPE 1 VPID a88 PCRPID a83
+      CHANNEL ID 28d NAME "SC 6" SATID ffffff TPID 2580 SID fa3 TYPE 1 VPID a8d PCRPID a83
+      CHANNEL ID 28e NAME "MMOV" SATID ffffff TPID 2580 SID fa7 TYPE 1 VPID a84 PCRPID a80
+      CHANNEL ID 28f NAME "MMOV" SATID ffffff TPID 2580 SID faa TYPE 1 VPID a86 PCRPID a81
+      CHANNEL ID 290 NAME "MMOV" SATID ffffff TPID 2580 SID fb0 TYPE 1 VPID a93 PCRPID a82
+      CHANNEL ID 291 NAME "MMOV" SATID ffffff TPID 2580 SID fb3 TYPE 1 VPID a95 PCRPID a8b
+      CHANNEL ID 292 NAME "MMOV" SATID ffffff TPID 2580 SID fb6 TYPE 1 VPID a97 PCRPID a8c
+      CHANNEL ID 293 NAME "MMOV" SATID ffffff TPID 2580 SID fb9 TYPE 1 VPID b03 PCRPID b00
+      CHANNEL ID 294 NAME "MMOV" SATID ffffff TPID 2580 SID fbc TYPE 1 VPID b05 PCRPID b01
+    TRANSPONDER ID 25e4 SATID 0000 TYPE 1 FREQ 12654000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 295 NAME "Sharjah        Arabsat Bouquet" SATID ffffff TPID 25e4 SID 1 TYPE 0 VPID 488 PCRPID 488
+      CHANNEL ID 296 NAME "Qatar          Arabsat Bouquet" SATID ffffff TPID 25e4 SID 2 TYPE 0 VPID 4ec PCRPID 4ec
+      CHANNEL ID 297 NAME "Saudi 1        Arabsat Bouquet" SATID ffffff TPID 25e4 SID 3 TYPE 0 VPID 550 PCRPID 550
+      CHANNEL ID 298 NAME "Kuwait         Arabsat Bouquet" SATID ffffff TPID 25e4 SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
+      CHANNEL ID 299 NAME "Libya          Arabsat Bouquet" SATID ffffff TPID 25e4 SID 5 TYPE 0 VPID 618 PCRPID 618
+      CHANNEL ID 29a NAME "Sudan          Arabsat Bouquet" SATID ffffff TPID 25e4 SID 6 TYPE 0 VPID 67c PCRPID 67c
+      CHANNEL ID 29b NAME "Oman           Arabsat Bouquet" SATID ffffff TPID 25e4 SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
+      CHANNEL ID 29c NAME "Jordan         Arabsat Bouquet" SATID ffffff TPID 25e4 SID 8 TYPE 0 VPID 744 PCRPID 744
+      CHANNEL ID 29d NAME "IRAQ TV" SATID ffffff TPID 25e4 SID 9 TYPE 0 VPID 7a8 PCRPID 7a8
+      CHANNEL ID 29e NAME "Dubai Sport" SATID ffffff TPID 25e4 SID a TYPE 0 VPID 424 PCRPID 424
+      CHANNEL ID 29f NAME "Qatar A2       Arabsat Bouquet" SATID ffffff TPID 25e4 SID c TYPE 0 APID 4c5 PCRPID 4c5
+      CHANNEL ID 2a0 NAME "Saudi1 A2      Arabsat Bouquet" SATID ffffff TPID 25e4 SID d TYPE 0 APID 529 PCRPID 529
+      CHANNEL ID 2a1 NAME "Kuwait A2      Arabsat Bouquet" SATID ffffff TPID 25e4 SID e TYPE 0 APID 58d PCRPID 58d
+      CHANNEL ID 2a2 NAME "Jordan A2      Arabsat Bouquet" SATID ffffff TPID 25e4 SID 12 TYPE 0 APID 71d PCRPID 71d
+      CHANNEL ID 2a3 NAME "Radio dubai sport" SATID ffffff TPID 25e4 SID 13 TYPE 0 APID 3fd PCRPID 3fd
+    TRANSPONDER ID 2648 SATID 0000 TYPE 1 FREQ 12673000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 2a4 NAME "Digitaly" SATID ffffff TPID 2648 SID 106b TYPE 0 VPID dc APID dd APID de PCRPID dc
+      CHANNEL ID 2a5 NAME "Telemarket" SATID ffffff TPID 2648 SID 1073 TYPE 0 VPID 15e APID 15f PCRPID 15e
+      CHANNEL ID 2a6 NAME "Internet data 1" SATID ffffff TPID 2648 SID 1074 TYPE 0 TTPID 11f
+      CHANNEL ID 2a7 NAME "eVision" SATID ffffff TPID 2648 SID 1076 TYPE 0 VPID 168 APID 169 APID 16a APID 1be6 PCRPID 168
+      CHANNEL ID 2a8 NAME "ANNI 60" SATID ffffff TPID 2648 SID 1086 TYPE 0 APID fa PCRPID fa
+      CHANNEL ID 2a9 NAME "R. Reporter" SATID ffffff TPID 2648 SID 1087 TYPE 0 APID fb PCRPID fb
+      CHANNEL ID 2aa NAME "Radio Italia S.M.I." SATID ffffff TPID 2648 SID 1088 TYPE 0 APID fc PCRPID fc
+      CHANNEL ID 2ab NAME "R. Tour" SATID ffffff TPID 2648 SID 1089 TYPE 0 APID fd PCRPID fd
+      CHANNEL ID 2ac NAME "R.Rinascente" SATID ffffff TPID 2648 SID 108a TYPE 0 APID fe PCRPID fe
+      CHANNEL ID 2ad NAME "R. Cooky" SATID ffffff TPID 2648 SID 108b TYPE 0 APID ff PCRPID ff
+      CHANNEL ID 2ae NAME "RadioBaby" SATID ffffff TPID 2648 SID 108c TYPE 0 APID 100 PCRPID 100
+      CHANNEL ID 2af NAME "McDonalds" SATID ffffff TPID 2648 SID 108d TYPE 0 APID 101 PCRPID 101
+      CHANNEL ID 2b0 NAME "TRBuonconsiglio" SATID ffffff TPID 2648 SID 108e TYPE 0 APID 191 PCRPID 191
+      CHANNEL ID 2b1 NAME "R-Radio" SATID ffffff TPID 2648 SID 108f TYPE 0 APID 192 PCRPID 192
+      CHANNEL ID 2b2 NAME "R. Donna" SATID ffffff TPID 2648 SID 1090 TYPE 0 APID 193 PCRPID 193
+      CHANNEL ID 2b3 NAME "R. Reporter 2" SATID ffffff TPID 2648 SID 1091 TYPE 0 APID 194 PCRPID 194
+      CHANNEL ID 2b4 NAME "R. West" SATID ffffff TPID 2648 SID 1092 TYPE 0 APID 195 PCRPID 195
+      CHANNEL ID 2b5 NAME "Melodia Russia" SATID ffffff TPID 2648 SID 1093 TYPE 0 VPID 19f6 APID 196 PCRPID 196
+      CHANNEL ID 2b6 NAME "Padre Pio" SATID ffffff TPID 2648 SID 1094 TYPE 0 APID 197 PCRPID 197
+      CHANNEL ID 2b7 NAME "Thai TV5" SATID ffffff TPID 2648 SID 1069 TYPE 0 VPID c8 APID c9 APID ca PCRPID c8
+      CHANNEL ID 2b8 NAME "Studio Europa" SATID ffffff TPID 2648 SID 106c TYPE 0 VPID e6 APID e7 PCRPID e6
+      CHANNEL ID 2b9 NAME "Video  Italia" SATID ffffff TPID 2648 SID 1072 TYPE 0 VPID 154 APID 155 APID 156 PCRPID 154
+    TRANSPONDER ID 26ac SATID 0000 TYPE 1 FREQ 12692000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 2ba NAME "PASSIONS" SATID ffffff TPID 26ac SID 1f5 TYPE 0 VPID a0 PCRPID a0
+      CHANNEL ID 2bb NAME "ONYX" SATID ffffff TPID 26ac SID 1f6 TYPE 0 VPID a1 PCRPID a1
+      CHANNEL ID 2bc NAME "MANGAS" SATID ffffff TPID 26ac SID 1f7 TYPE 1 VPID a2 APID 58 TTPID 26 PCRPID a2
+      CHANNEL ID 2bd NAME "ENCYCLOPEDIA" SATID ffffff TPID 26ac SID 1f8 TYPE 1 VPID a3 APID 5c TTPID 29 PCRPID a3
+      CHANNEL ID 2be NAME "POLAR" SATID ffffff TPID 26ac SID 1f9 TYPE 1 VPID a4 APID 60 TTPID 2c PCRPID a4
+      CHANNEL ID 2bf NAME "CINE PALACE" SATID ffffff TPID 26ac SID 1fa TYPE 1 VPID a5 APID 64 TTPID 2f PCRPID a5
+      CHANNEL ID 2c0 NAME "ROMANCE" SATID ffffff TPID 26ac SID 1fb TYPE 1 VPID a6 APID 68 TTPID 32 PCRPID a6
+      CHANNEL ID 2c1 NAME "RIRE" SATID ffffff TPID 26ac SID 1fc TYPE 1 VPID a7 APID 6c TTPID 35 PCRPID a7
+      CHANNEL ID 2c2 NAME "ACTION" SATID ffffff TPID 26ac SID 1fd TYPE 1 VPID a8 APID 70 TTPID 38 PCRPID a8
+      CHANNEL ID 2c3 NAME "ABsat test RADIO" SATID ffffff TPID 26ac SID 1fe TYPE 1 APID 65 PCRPID a5
+    TRANSPONDER ID 2710 SATID 0000 TYPE 1 FREQ 12713000 POL V SRATE 27500000 FEC 8
+      CHANNEL ID 2c4 SATID ffffff TPID 2710 SID fffe TYPE 0
+      CHANNEL ID 2c5 NAME "MMOV" SATID ffffff TPID 2710 SID 10d0 TYPE 1 VPID a03 PCRPID a00
+      CHANNEL ID 2c6 NAME "MMOV" SATID ffffff TPID 2710 SID 10d3 TYPE 1 VPID a05 PCRPID a01
+      CHANNEL ID 2c7 NAME "MMOV" SATID ffffff TPID 2710 SID 10d6 TYPE 1 VPID a07 PCRPID a02
+      CHANNEL ID 2c8 NAME "MMOV" SATID ffffff TPID 2710 SID 10d9 TYPE 1 VPID 904 PCRPID 900
+      CHANNEL ID 2c9 NAME "MMOV" SATID ffffff TPID 2710 SID 10dc TYPE 1 VPID 90a PCRPID 901
+      CHANNEL ID 2ca NAME "MMOV" SATID ffffff TPID 2710 SID 10e4 TYPE 1 VPID 906 PCRPID 902
+      CHANNEL ID 2cb NAME "MMOV" SATID ffffff TPID 2710 SID 10e7 TYPE 1 VPID 908 PCRPID 903
+    TRANSPONDER ID 2774 SATID 0000 TYPE 1 FREQ 12713000 POL H SRATE 27500000 FEC 8
+      CHANNEL ID 2cc SATID ffffff TPID 2774 SID fffe TYPE 0
+      CHANNEL ID 2cd NAME "SINT" SATID ffffff TPID 2774 SID 2262 TYPE 1
+      CHANNEL ID 2ce NAME "info" SATID ffffff TPID 2774 SID 2264 TYPE 1 VPID 205 PCRPID 1ffe
+      CHANNEL ID 2cf NAME "SINT" SATID ffffff TPID 2774 SID 2266 TYPE 1
+      CHANNEL ID 2d0 NAME "CFN" SATID ffffff TPID 2774 SID 2269 TYPE 1 VPID 20b PCRPID 1ffe
+      CHANNEL ID 2d1 NAME "SINT" SATID ffffff TPID 2774 SID 226c TYPE 1
+      CHANNEL ID 2d2 NAME "duel" SATID ffffff TPID 2774 SID 226f TYPE 1 VPID 206 PCRPID 1ffe
+      CHANNEL ID 2d3 NAME "comedy" SATID ffffff TPID 2774 SID 2272 TYPE 1 VPID 203 PCRPID 1ffe
+      CHANNEL ID 2d4 NAME "fox kids" SATID ffffff TPID 2774 SID 2275 TYPE 1 VPID 201 PCRPID 1ffe
diff --git a/Tools/dvbrc2vdr/test.conf b/Tools/dvbrc2vdr/test.conf
new file mode 100644
index 000000000..31dddb777
--- /dev/null
+++ b/Tools/dvbrc2vdr/test.conf
@@ -0,0 +1,799 @@
+DISCOVERY:10719:v:1:27500:8190:8190:0:4402
+RTL7:10719:v:1:27500:8190:8190:0:4403
+TV POLONIA:10719:v:1:27500:8190:8190:0:4404
+EUROSPORT:10719:v:1:27500:8190:8190:0:4405
+PLANETE:10719:v:1:27500:8190:8190:0:4406
+SEASONS:10719:v:1:27500:8190:8190:0:4407
+VIVA Polska:10719:v:1:27500:8190:8190:0:4408
+MULTIMUSIC 4:10719:v:1:27500:8190:123:0:4440
+EPG:10719:v:1:27500:8190:8190:0:4450
+CYFRA+ GRY:10719:v:1:27500:8190:8190:0:4460
+Guide LC:0:v:1:27500:8190:8030:0:2000
+Cinestar 1:0:v:1:27500:120:130:0:1201
+Cinestar 2:0:v:1:27500:220:230:0:1202
+Cinetoile:0:v:1:27500:320:330:0:1203
+Shopping Avenue:0:v:1:27500:420:430:0:1204
+S�rie Club :0:v:1:27500:520:530:0:1205
+FUN TV:0:v:1:27500:620:630:0:1206
+Teva:0:v:1:27500:720:730:0:1207
+M6 Music:0:v:1:27500:820:830:0:1208
+Club T�l�achat:0:v:1:27500:920:930:0:1209
+INFOSPORT:0:v:1:27500:120:130:0:1401
+R�gions:0:v:1:27500:220:230:0:1402
+Mezzo:0:v:1:27500:320:330:0:1403
+01 01 15 97:0:v:1:27500:8190:8190:0:1483
+01 01 17 97:0:v:1:27500:8190:8190:0:1485
+01 02 17 97:0:v:1:27500:8190:8190:0:1486
+01 02 15 97:0:v:1:27500:8190:8190:0:1488
+01 02 15 96:0:v:1:27500:8190:8190:0:1489
+01 03 17 10:0:v:1:27500:8190:8190:0:1490
+01 03 15 10:0:v:1:27500:8190:8190:0:1491
+Festival:0:v:1:27500:420:430:0:1404
+HISTOIRE :0:v:1:27500:520:530:0:1405
+T�l�toon:0:v:1:27500:620:630:0:1406
+Odyss�e :0:v:1:27500:720:730:0:1407
+France Musiques:0:v:1:27500:8190:830:0:1418
+Hector:0:v:1:27500:8190:831:0:1419
+FIP:0:v:1:27500:8190:832:0:1420
+France Inter:0:v:1:27500:8190:833:0:1421
+France Info:0:v:1:27500:8190:834:0:1422
+Elisa:0:v:1:27500:8190:835:0:1423
+France Culture:0:v:1:27500:8190:836:0:1424
+Radio Bleue:0:v:1:27500:8190:837:0:1425
+Le Mouv:0:v:1:27500:8190:838:0:1426
+TV5:0:v:1:27500:920:930:0:1409
+CENTRONICS:0:v:1:27500:8190:8190:0:2000
+FRANCE 2 :0:v:1:27500:320:8190:0:1104
+FRANCE 3:0:v:1:27500:520:8190:0:1106
+Cr�dit Agricole:0:v:1:27500:8190:5333:0:5301
+tps foot:0:v:1:27500:8190:5230:0:5200
+LCI:0:v:1:27500:120:130:0:1101
+EUROSPORT:0:v:1:27500:220:230:0:1102
+FRANCE 2:0:v:1:27500:320:8190:0:1103
+FRANCE 3:0:v:1:27500:520:8190:0:1105
+I TELEVISION:0:v:1:27500:820:830:0:1108
+TV Mail alphatest:0:v:1:27500:8190:8190:0:5701
+CHAINE FI:0:v:1:27500:8190:5331:0:5300
+caisse d'�pargne:0:v:1:27500:8190:8190:0:5303
+TV Mail:0:v:1:27500:8190:8190:0:5700
+CANAL+:10892:h:1:27500:8190:8190:0:4801
+CANAL+ �ӣTY:10892:h:1:27500:8190:8190:0:4802
+TMT:10892:h:1:27500:8190:8190:0:4804
+ALE KINO!:10892:h:1:27500:8190:8190:0:4805
+MINIMAX:10892:h:1:27500:8190:8190:0:4806
+TVP 1:10892:h:1:27500:8190:8190:0:4807
+TVP 2:10892:h:1:27500:8190:8190:0:4808
+CANAL+ NIEBIESKI:10892:h:1:27500:8190:8190:0:4809
+EPG:10892:h:1:27500:8190:8190:0:4850
+Multivision:0:v:1:27500:320:8190:0:1603
+Grand Classique:0:v:1:27500:8190:830:0:1650
+Symphonies:0:v:1:27500:8190:831:0:1651
+Baroque:0:v:1:27500:8190:832:0:1652
+Op�ra:0:v:1:27500:8190:833:0:1653
+Contemporain:0:v:1:27500:8190:834:0:1654
+Relaxation:0:v:1:27500:8190:835:0:1655
+Blues:0:v:1:27500:8190:836:0:1656
+Jazz:0:v:1:27500:8190:837:0:1657
+Big Band:0:v:1:27500:8190:838:0:1658
+Jazz Moderne:0:v:1:27500:8190:839:0:1659
+Les Tubes Fran�ais:0:v:1:27500:8190:840:0:1660
+RFO SAT:0:v:1:27500:120:130:0:1601
+Appli D1 LC:0:v:1:27500:8190:8190:0:1680
+Cinefaz:0:v:1:27500:220:230:0:1602
+TurboPC:0:v:1:27500:8190:8190:0:2801
+MTV2:0:v:1:27500:720:730:0:1607
+Rire et chansons:0:v:1:27500:8190:930:0:1630
+Radio J:0:v:1:27500:8190:931:0:1631
+Mosqueteiros:0:v:1:27500:8190:932:0:1632
+Abysse:0:v:1:27500:8190:933:0:1633
+RMC:0:v:1:27500:8190:935:0:1635
+Radio Junior:0:v:1:27500:8190:936:0:1636
+NETRADIO:0:v:1:27500:8190:937:0:1637
+Nostalgie:0:v:1:27500:8190:938:0:1638
+Skyrock:0:v:1:27500:8190:939:0:1639
+Radio Coutoisie:0:v:1:27500:8190:940:0:1640
+La Voix des Pays:0:v:1:27500:8190:941:0:1641
+INFO EXPRESS:0:v:1:27500:8190:5530:0:5500
+METEO:0:v:1:27500:8190:5830:0:5800
+X X L:0:v:1:27500:8190:8190:0:5400
+Multivision Cin�ma:0:v:1:27500:8190:8190:0:7200
+Multivision Sport:0:v:1:27500:8190:8190:0:7300
+Multivision Spectacle:0:v:1:27500:8190:8190:0:7400
+Test OTV8:12673:h:1:27500:8190:8190:0:7527
+Test OTV9:12673:h:1:27500:8190:8190:0:7528
+Test OTV10:12673:h:1:27500:8190:8190:0:7529
+Test OTV11:12673:h:1:27500:513:8190:0:7530
+Test31:12673:h:1:27500:512:650:0:7501
+CNN:12673:h:1:27500:513:660:0:7502
+Q24:12673:h:1:27500:514:691:0:7503
+Test34:12673:h:1:27500:515:680:0:7504
+Test35:12673:h:1:27500:516:690:0:7505
+Test OTV1:12673:h:1:27500:8190:8190:0:7520
+Test OTV2:12673:h:1:27500:8190:8190:0:7521
+Test OTV3:12673:h:1:27500:8190:8190:0:7522
+Test OTV4:12673:h:1:27500:8190:8190:0:7523
+Test OTV5:12673:h:1:27500:8190:8190:0:7524
+Test OTV6:12673:h:1:27500:8190:8190:0:7525
+Test OTV7:12673:h:1:27500:8190:8190:0:7526
+Test OTV7:12673:h:1:27500:8190:8190:0:7540
+Test OTV7:12673:h:1:27500:8190:8190:0:7541
+Telekom TV:11095:h:1:27500:32:8190:0:3711
+FantasticOverOpal:11095:h:1:27500:32:8190:0:3712
+Gilat:11095:h:1:27500:32:8190:0:3713
+Siemens TV:11095:h:1:27500:32:8190:0:3716
+S-TV:11095:h:1:27500:32:8190:0:3717
+Optibase Encoder:11095:h:1:27500:32:8190:0:3718
+FantasticOverOpal:11095:h:1:27500:8190:8190:0:3702
+Deutsche Bank / T1:11303:h:1:27500:1160:8190:0:1
+Animal Planet:11303:h:1:27500:1160:8190:0:10
+Discovery E Europe-English:11303:h:1:27500:1260:8190:0:20
+Wuerth KG / T21:11303:h:1:27500:1360:8190:0:21
+Discovery Italy:11303:h:1:27500:1360:8190:0:30
+BTI / T31:11303:h:1:27500:1360:8190:0:31
+Discovery Russia:11303:h:1:27500:1460:8190:0:40
+K-TV (MetroMux) / T41:11303:h:1:27500:1960:8190:0:41
+Animal Planet EE:11303:h:1:27500:1560:8190:0:50
+Animal Planet - Russian:11303:h:1:27500:1560:8190:0:51
+Discovery Netherlands:11303:h:1:27500:1660:8190:0:60
+Q English:11303:h:1:27500:1760:8190:0:70
+Travel and Adventure:11303:h:1:27500:1860:8190:0:80
+Travel and Adventure- Russian:11303:h:1:27500:1860:8190:0:81
+New DCP:11303:h:1:27500:8190:1220:0:300
+CCP:11303:h:1:27500:1260:8190:0:301
+Deutsche Bank / T2:11303:h:1:27500:1260:8190:0:2
+Channel Three:11303:h:1:27500:1360:8190:0:3
+Channel Four:11303:h:1:27500:1460:8190:0:4
+Channel Five:11303:h:1:27500:1560:8190:0:5
+Channel 6 = Sat 7 Arabic:11303:h:1:27500:1660:8190:0:6
+Channel Seven:11303:h:1:27500:1760:8190:0:7
+Q German:11303:h:1:27500:1760:8190:0:71
+Q French:11303:h:1:27500:1760:8190:0:72
+Q Dutch:11303:h:1:27500:1760:8190:0:73
+DTAG / T11:11303:h:1:27500:1360:8190:0:11
+DTAG 50 / T12:11303:h:1:27500:1360:8190:0:12
+Telekom TV:11303:h:1:27500:1460:8190:0:13
+Gerling / T26:11303:h:1:27500:1360:8190:0:26
+Hornbach-D / T36:11303:h:1:27500:1360:8190:0:36
+Hornbach-NL / T38:11303:h:1:27500:1360:8190:0:38
+Hornbach-CZ / T39:11303:h:1:27500:1360:8190:0:39
+Testkanal:11303:h:1:27500:1660:8190:0:99
+KENCAST:11303:h:1:27500:8190:8190:0:111
+SAT.1 CH:11604:h:1:27500:101:102:0:601
+KBT Channel SUN:11604:h:1:27500:111:112:0:603
+big FM:11604:h:1:27500:8190:113:0:604
+Event:11604:h:1:27500:160:161:0:602
+Deutsche Bank / T1:11642:h:1:27500:1160:8190:0:1
+Animal Planet:11642:h:1:27500:1160:8190:0:10
+Discovery E Europe-English:11642:h:1:27500:1260:8190:0:20
+Wuerth KG / T21:11642:h:1:27500:1360:8190:0:21
+Discovery Italy:11642:h:1:27500:1360:8190:0:30
+BTI / T31:11642:h:1:27500:1360:8190:0:31
+Discovery Russia:11642:h:1:27500:1460:8190:0:40
+K-TV (MetroMux) / T41:11642:h:1:27500:1960:8190:0:41
+Animal Planet EE:11642:h:1:27500:1560:8190:0:50
+Animal Planet - Russian:11642:h:1:27500:1560:8190:0:51
+Discovery Netherlands:11642:h:1:27500:1660:8190:0:60
+Q English:11642:h:1:27500:1760:8190:0:70
+Travel and Adventure:11642:h:1:27500:1860:8190:0:80
+Travel and Adventure- Russian:11642:h:1:27500:1860:8190:0:81
+New DCP:11642:h:1:27500:8190:1220:0:300
+CCP:11642:h:1:27500:1260:8190:0:301
+Deutsche Bank / T2:11642:h:1:27500:1260:8190:0:2
+Channel Three:11642:h:1:27500:1360:8190:0:3
+Channel Four:11642:h:1:27500:1460:8190:0:4
+Channel Five:11642:h:1:27500:1560:8190:0:5
+Channel 6 = Sat 7 Arabic:11642:h:1:27500:1660:8190:0:6
+Channel Seven:11642:h:1:27500:1760:8190:0:7
+Q German:11642:h:1:27500:1760:8190:0:71
+Q French:11642:h:1:27500:1760:8190:0:72
+Q Dutch:11642:h:1:27500:1760:8190:0:73
+DTAG / T11:11642:h:1:27500:1360:8190:0:11
+DTAG 50 / T12:11642:h:1:27500:1360:8190:0:12
+Telekom TV:11642:h:1:27500:1460:8190:0:13
+Gerling / T26:11642:h:1:27500:1360:8190:0:26
+Hornbach-D / T36:11642:h:1:27500:1360:8190:0:36
+Hornbach-NL / T38:11642:h:1:27500:1360:8190:0:38
+Hornbach-CZ / T39:11642:h:1:27500:1360:8190:0:39
+Testkanal:11642:h:1:27500:1660:8190:0:99
+KENCAST:11642:h:1:27500:8190:8190:0:111
+AB 1:11681:h:1:27500:160:80:0:201
+AB MOTEURS:11681:h:1:27500:161:84:0:202
+ANIMAUX:11681:h:1:27500:162:88:0:203
+CHASSE ET PECHE:11681:h:1:27500:163:92:0:204
+XXL:11681:h:1:27500:164:96:0:205
+MUSIQUE CLASSIQUE:11681:h:1:27500:165:100:0:206
+ESCALES:11681:h:1:27500:166:104:0:207
+FIT/cha�ne HISTOIRE:11681:h:1:27500:167:108:0:208
+RFM TV:11681:h:1:27500:168:112:0:209
+EDTV DRAMA:11744:h:1:27500:4898:8190:0:9504
+EDTV RADIO 02:11744:h:1:27500:4898:8190:0:9524
+EDTV RADIO 01:11744:h:1:27500:4898:8190:0:9523
+EDTV SPORT:11744:h:1:27500:4898:8190:0:9502
+EDTV BUSINESS:11744:h:1:27500:4898:8190:0:9503
+RAI1:11765:v:1:27500:160:8190:0:3401
+RAI2:11765:v:1:27500:161:8190:0:3402
+RAI3:11765:v:1:27500:162:8190:0:3403
+Rai Way TEST1:11765:v:1:27500:515:8190:0:3404
+Rai Way TEST2:11765:v:1:27500:516:8190:0:3405
+Rai Way TEST3:11765:v:1:27500:164:8190:0:3406
+RAIMOSAICO:11765:v:1:27500:518:8190:0:3407
+RAIMOSAICO:11765:v:1:27500:518:8190:0:3490
+RAINews24:11765:v:1:27500:516:8190:0:3301
+CAMERA DEPUTATI:11765:v:1:27500:517:8190:0:3302
+TELEPACE:11765:v:1:27500:515:8190:0:3304
+RAISPORTSAT:11765:v:1:27500:512:8190:0:3305
+RAINettunoSAT2:11765:v:1:27500:513:8190:0:3306
+RAIeducational:11765:v:1:27500:514:8190:0:3307
+RAINettunoSAT1:11765:v:1:27500:519:8190:0:3308
+SAT2000:11765:v:1:27500:518:8190:0:3309
+RADIOUNO:11765:v:1:27500:8190:670:0:3311
+RADIODUE:11765:v:1:27500:8190:671:0:3312
+RADIOTRE:11765:v:1:27500:8190:672:0:3313
+FDleggera:11765:v:1:27500:8190:673:0:3314
+FDauditorium:11765:v:1:27500:8190:665:0:3315
+BLUSAT 2000:11765:v:1:27500:8190:677:0:3316
+GR PARLAMENTO:11765:v:1:27500:8190:664:0:3317
+ISORADIO:11765:v:1:27500:8190:661:0:3318
+R1:11823:h:1:27500:512:650:0:301
+R2:11823:h:1:27500:513:661:0:302
+R3:11823:h:1:27500:514:670:0:303
+R4:11823:h:1:27500:515:680:0:304
+R5:11823:h:1:27500:4682:700:0:306
+R6:11823:h:1:27500:518:710:0:307
+R7:11823:h:1:27500:519:720:0:308
+Love Radio:11823:h:1:27500:8190:711:0:309
+Greek Church:11823:h:1:27500:8190:671:0:310
+Skai Radio:11823:h:1:27500:8190:741:0:311
+MelodiRadio:11823:h:1:27500:8190:701:0:312
+ERA 3:11823:h:1:27500:8190:651:0:313
+RR1:11823:h:1:27500:8190:681:0:314
+RR2:11823:h:1:27500:8190:721:0:315
+NOVA CINE:11823:h:1:27500:521:740:0:316
+FILM NET:11823:h:1:27500:512:650:0:317
+SSportK-T.V:11823:h:1:27500:513:661:0:318
+MEGA:11823:h:1:27500:514:670:0:319
+ANT-1:11823:h:1:27500:515:680:0:320
+STAR:11823:h:1:27500:517:700:0:321
+Alter 5:11823:h:1:27500:518:710:0:322
+NEW Tempo:11823:h:1:27500:519:720:0:323
+Super Sport2:11823:h:1:27500:516:691:0:324
+Super Sport2:11843:v:1:27500:516:691:0:65534
+INTV:11843:v:1:27500:2324:8190:0:3504
+UNIV:11843:v:1:27500:2305:8190:0:3507
+CULT:11843:v:1:27500:2307:8190:0:3510
+ERSP:11843:v:1:27500:2309:8190:0:3513
+SINT:11843:v:1:27500:8190:8190:0:3515
+CART:11843:v:1:27500:2433:8190:0:3516
+SINT:11843:v:1:27500:8190:8190:0:3519
+DISC:11843:v:1:27500:2437:8190:0:3522
+SINT:11843:v:1:27500:8190:8190:0:3525
+TVL:11843:v:1:27500:2441:8190:0:3528
+SINT:11843:v:1:27500:8190:8190:0:3530
+ROCK:11843:v:1:27500:8190:2320:0:3550
+RDS:11843:v:1:27500:8190:2321:0:3553
+RTL:11843:v:1:27500:8190:2322:0:3556
+101:11843:v:1:27500:8190:2323:0:3559
+RVOY:11843:v:1:27500:8190:2315:0:3562
+RKFM:11843:v:1:27500:8190:2317:0:3563
+GLOB:11843:v:1:27500:8190:2316:0:3564
+ANT1:11843:v:1:27500:8190:2318:0:3565
+RRAD:11843:v:1:27500:8190:2319:0:3566
+MC01:11843:v:1:27500:8190:2312:0:3568
+MC02:11843:v:1:27500:8190:2313:0:3571
+MC03:11843:v:1:27500:8190:2314:0:3574
+P7:12341:h:1:27500:160:81:0:11301
+P8:12341:h:1:27500:161:85:0:11303
+P9:12341:h:1:27500:162:89:0:11305
++GIOCHI:12341:h:1:27500:8190:8190:0:11310
+MM01:12341:h:1:27500:8190:601:0:11311
+MM02:12341:h:1:27500:8190:602:0:11312
+MM03:12341:h:1:27500:8190:603:0:11313
+MM04:12341:h:1:27500:8190:604:0:11314
+MM05:12341:h:1:27500:8190:605:0:11315
+MM06:12341:h:1:27500:8190:606:0:11316
+MM07:12341:h:1:27500:8190:607:0:11317
+MM08:12341:h:1:27500:8190:608:0:11318
+MM09:12341:h:1:27500:8190:609:0:11319
+MM10:12341:h:1:27500:8190:610:0:11320
+MM11:12341:h:1:27500:8190:611:0:11321
+MM12:12341:h:1:27500:8190:612:0:11322
+MM13:12341:h:1:27500:8190:613:0:11323
+MM14:12341:h:1:27500:8190:614:0:11324
+MM15:12341:h:1:27500:8190:615:0:11325
+MM16:12341:h:1:27500:8190:616:0:11326
+MM17:12341:h:1:27500:8190:617:0:11327
+MM18:12341:h:1:27500:8190:618:0:11328
+MM19:12341:h:1:27500:8190:619:0:11329
+MM20:12341:h:1:27500:8190:620:0:11330
+MM21:12341:h:1:27500:8190:621:0:11331
+MM22:12341:h:1:27500:8190:622:0:11332
+MM23:12341:h:1:27500:8190:623:0:11333
+MM24:12341:h:1:27500:8190:624:0:11334
+MM25:12341:h:1:27500:8190:625:0:11335
+MM26:12341:h:1:27500:8190:626:0:11336
+MM27:12341:h:1:27500:8190:627:0:11337
+MM28:12341:h:1:27500:8190:628:0:11338
+MM29:12341:h:1:27500:8190:629:0:11339
+MM30:12341:h:1:27500:8190:630:0:11340
+RCAP:12341:h:1:27500:8190:631:0:11341
+R105:12341:h:1:27500:8190:632:0:11342
+RDJ:12341:h:1:27500:8190:633:0:11343
+RITA:12341:h:1:27500:8190:634:0:11344
+RMC:12341:h:1:27500:8190:635:0:11345
+R101:12341:h:1:27500:8190:636:0:11346
+RRAD:12341:h:1:27500:8190:637:0:11347
+RR:12341:h:1:27500:8190:638:0:11348
+RR:12341:h:1:27500:8190:610:0:11361
+RR:12341:h:1:27500:8190:620:0:11362
+RR:12341:h:1:27500:8190:630:0:11363
+RR:12341:h:1:27500:8190:638:0:11364
+MULTIMUSICA:12341:h:1:27500:8190:8190:0:11352
+RADIO:12341:h:1:27500:8190:8190:0:11353
+MULTIMUSIC 1:12341:h:1:27500:8190:609:0:11365
+MULTIMUSIC 2:12341:h:1:27500:8190:620:0:11366
+MULTIMUSIC 2:12713:v:1:27500:8190:620:0:65534
+TEAM:12713:v:1:27500:2305:8190:0:3610
+SINT:12713:v:1:27500:8190:8190:0:3613
+VIAG:12713:v:1:27500:2308:8190:0:3616
+SINT:12713:v:1:27500:8190:8190:0:3619
+EURO:12713:v:1:27500:2311:8190:0:3622
+SINT:12713:v:1:27500:8190:8190:0:3623
+CNN:12713:v:1:27500:2433:8190:0:3625
+ante prima:12713:v:1:27500:2435:8190:0:3628
+SNAI:12713:v:1:27500:2561:8190:0:3630
+MPPV:12713:v:1:27500:2563:8190:0:3632
+MC04:12713:v:1:27500:8190:2688:0:3636
+MC05:12713:v:1:27500:8190:2689:0:3637
+MC06:12713:v:1:27500:8190:2690:0:3638
+MC07:12713:v:1:27500:8190:2691:0:3641
+MC08:12713:v:1:27500:8190:2692:0:3644
+MC09:12713:v:1:27500:8190:2693:0:3647
+MC10:12713:v:1:27500:8190:2694:0:3650
+MC11:12713:v:1:27500:8190:2695:0:3653
+MC12:12713:v:1:27500:8190:2696:0:3656
+MC13:12713:v:1:27500:8190:2697:0:3659
+MC14:12713:v:1:27500:8190:2698:0:3662
+MC15:12713:v:1:27500:8190:2699:0:3665
+MC16:12713:v:1:27500:8190:2700:0:3668
+MC17:12713:v:1:27500:8190:2701:0:3671
+MC18:12713:v:1:27500:8190:2702:0:3674
+MOSAICO D+:12341:h:1:27500:161:84:0:11401
+ MILAN CH.:12341:h:1:27500:162:89:0:11403
+ INTER CH.:12341:h:1:27500:163:93:0:11405
+TST3:12341:h:1:27500:8190:8190:0:11407
+ I1:11919:v:1:27500:512:650:0:1
+ C5:11919:v:1:27500:513:660:0:2
+ R4:11919:v:1:27500:514:670:0:3
+Test:11919:v:1:27500:515:680:0:4
+NTV:11938:h:1:27500:164:89:0:7105
+NTV-PLUS:11938:h:1:27500:165:91:0:7106
+NTV Int.-HTB:11938:h:1:27500:160:80:0:7101
+NTV Int.-Nashe Kino:11938:h:1:27500:161:82:0:7102
+NTV Int.-Detsk. Mir:11938:h:1:27500:162:84:0:7103
+DISNEY CHANNEL:12341:v:1:27500:8190:8190:0:10901
+DISCOVERY:12341:v:1:27500:161:8190:0:10903
+EUSP:12341:v:1:27500:162:89:0:10905
+HAPPY CHANNEL:12341:v:1:27500:8190:8190:0:10907
+MATCH MUSIC:12341:v:1:27500:8190:8190:0:10909
+MTV:12341:v:1:27500:8190:8190:0:10911
+R/CINEMA RAISAT:12341:v:1:27500:8190:8190:0:10913
+R/CINEMA RAISAT:12713:h:1:27500:8190:8190:0:65534
+cine stream:12713:h:1:27500:512:650:0:7704
+cine movie:12713:h:1:27500:514:670:0:7707
+CLASSICA:12341:v:1:27500:8190:8190:0:11001
+R/GAM ROS RAISAT:12341:v:1:27500:8190:8190:0:11003
+R/ALBUM RAISAT:12341:v:1:27500:8190:8190:0:11005
+HALLMARK:12341:v:1:27500:163:8190:0:11007
+R/ART RAISAT:12341:v:1:27500:8190:8190:0:11009
+TST1:12341:v:1:27500:8190:8190:0:11011
+TMC:12341:v:1:27500:166:8190:0:11013
+TMC2:12341:v:1:27500:167:8190:0:11015
+ART VARIETY:12015:h:1:27500:160:8190:0:410
+ART CHILDREN:12015:h:1:27500:161:8190:0:420
+ART MOVIES:12015:h:1:27500:162:8190:0:430
+ART MUSIC:12015:h:1:27500:163:8190:0:440
+ART EUROPE:12015:h:1:27500:164:8190:0:450
+LBC EUROPE:12015:h:1:27500:165:8190:0:460
+EGYPT SAT. CH. 2:12015:h:1:27500:166:8190:0:470
+ART SPORT:12015:h:1:27500:167:8190:0:472
+IQRA:12015:h:1:27500:168:8190:0:474
+T+ BIANCO:12341:v:1:27500:160:81:0:11101
+T+ NERO:12341:v:1:27500:161:85:0:11103
+T+ GRIGIO:12341:v:1:27500:162:89:0:11105
+R4:12341:v:1:27500:163:8190:0:24
+16|9 TELE+:12341:v:1:27500:164:97:0:11107
+VETRINA D+:12341:v:1:27500:8190:8190:0:11109
+R/RAGAZZI RAISAT:12341:v:1:27500:8190:8190:0:11111
+CNN:12341:h:1:27500:8190:8190:0:11501
+BBC:12341:h:1:27500:8190:8190:0:11503
+BLOOMBERG:12341:h:1:27500:8190:8190:0:11505
+CNBC:12341:h:1:27500:8190:8190:0:11507
+SKYNews:12341:h:1:27500:8190:8190:0:11509
+TST2:12341:h:1:27500:8190:8190:0:11511
+TV5:12341:h:1:27500:8190:8190:0:11513
+EPG:12341:h:1:27500:8190:8190:0:11515
+CNN:12341:h:1:27500:160:80:0:11517
+CNBC:12341:h:1:27500:163:92:0:11519
+TV5:12341:h:1:27500:166:104:0:11521
+BBC WORLD:12341:h:1:27500:161:84:0:11523
+BBC WORLD:12341:h:1:27500:161:84:0:11595
+BBC WORLD:12341:h:1:27500:161:84:0:9980
+BBC WORLD:12341:h:1:27500:161:84:0:9981
+Telekom TV:11095:v:1:27500:32:8190:0:3711
+FantasticOverOpal:11095:v:1:27500:32:8190:0:3712
+Gilat:11095:v:1:27500:32:8190:0:3713
+Siemens TV:11095:v:1:27500:32:8190:0:3716
+S-TV:11095:v:1:27500:32:8190:0:3717
+Optibase Encoder:11095:v:1:27500:32:8190:0:3718
+Bolsa:12091:h:1:27500:8190:8190:0:8750
+Testw:12091:h:1:27500:8190:8190:0:8751
+SIRE:12091:h:1:27500:8190:8190:0:8752
+Telesierra:12091:h:1:27500:4160:4161:0:8704
+vtv:12091:h:1:27500:4112:4115:0:8701
+Satisfaction:12091:h:1:27500:4192:4193:0:8706
+C. Milagro:12091:h:1:27500:4368:4369:0:8711
+Fiesta:12091:h:1:27500:4432:4434:0:8720
+TVE Internacional:12091:h:1:27500:4208:4209:0:8707
+TV Galicia:12091:h:1:27500:8190:4240:0:8708
+Radio Gallega:12091:h:1:27500:8190:4240:0:8709
+Retelsat:12091:h:1:27500:4464:4465:0:8722
+Musicam 1:12091:h:1:27500:8190:4406:0:8713
+Musicam 2:12091:h:1:27500:8190:4403:0:8714
+Musicam 3:12091:h:1:27500:8190:4406:0:8715
+Musicam 4:12091:h:1:27500:8190:4402:0:8716
+Musicam 5:12091:h:1:27500:8190:4406:0:8717
+HBCH FUCINO:12673:v:1:27500:200:201:0:701
+NTVi:12673:v:1:27500:210:212:0:702
+Test Telespazio:12673:v:1:27500:220:221:0:703
+Test Telespazio:12673:v:1:27500:230:231:0:704
+ARMENIA TV:12673:v:1:27500:240:242:0:705
+MEDNET:12673:v:1:27500:260:261:0:707
+AL JAZEERA:12673:v:1:27500:270:271:0:708
+TIRRENO SAT:12673:v:1:27500:280:301:0:709
+RADIO ROCK:12673:v:1:27500:8190:212:0:711
+RADIO ARMENIA:12673:v:1:27500:8190:242:0:712
+Coming Soon TV:12673:v:1:27500:8190:40:0:717
+AH-EDP1:12149:v:1:27500:96:97:0:7201
+AH-EDP2:12149:v:1:27500:112:113:0:7202
+AH-EDP3:12149:v:1:27500:36:37:0:7203
+AH-EMP4-DATA:12149:v:1:27500:8190:8190:0:7204
+Alice:12149:v:1:27500:160:161:0:7220
+Nuvolari:12149:v:1:27500:176:177:0:7221
+Leonardo:12149:v:1:27500:128:129:0:7222
+Discovery:12169:h:1:27500:512:8190:0:351
+R9:12169:h:1:27500:513:8190:0:352
+BBC World:12169:h:1:27500:514:8190:0:353
+CNN:12169:h:1:27500:515:8190:0:354
+CCTV:12169:h:1:27500:516:8190:0:355
+R10:12169:h:1:27500:518:8190:0:357
+R8:12169:h:1:27500:519:8190:0:358
+FILM SAT:12169:h:1:27500:520:8190:0:359
+Cartoon:12169:h:1:27500:515:8190:0:360
+Promo:12169:h:1:27500:521:8190:0:361
+Tempo:12169:h:1:27500:1440:651:0:362
+Tempo:12169:h:1:27500:8190:661:0:363
+Tempo:12169:h:1:27500:8190:671:0:364
+Tempo:12169:h:1:27500:8190:681:0:365
+Tempo:12169:h:1:27500:8190:691:0:366
+NOVA INFO:12169:h:1:27500:8190:8190:0:367
+NOVA INFO:12169:h:1:27500:8190:8190:0:369
+NOVA INFO:12169:h:1:27500:8190:8190:0:370
+NOVA INFO:12169:h:1:27500:1067:8190:0:371
+NOVA INFO:12169:h:1:27500:8190:8190:0:372
+NOVA INFO:12169:h:1:27500:8190:8190:0:373
+NOVA Cinema:12169:h:1:27500:8190:8190:0:374
+NET:12169:h:1:27500:513:8190:0:376
+MAD T.V:12169:h:1:27500:518:8190:0:377
+ET-1:12169:h:1:27500:519:8190:0:378
+ET-1:12169:h:1:27500:519:8190:0:379
+�����:12169:h:1:27500:517:8190:0:384
+Deutsche Bank / T1:12264:v:1:27500:1160:8190:0:1
+Animal Planet:12264:v:1:27500:1160:8190:0:10
+Discovery E Europe-English:12264:v:1:27500:1260:8190:0:20
+Wuerth KG / T21:12264:v:1:27500:1360:8190:0:21
+Discovery Italy:12264:v:1:27500:1360:8190:0:30
+BTI / T31:12264:v:1:27500:1360:8190:0:31
+Discovery Russia:12264:v:1:27500:1460:8190:0:40
+K-TV (MetroMux) / T41:12264:v:1:27500:1960:8190:0:41
+Animal Planet EE:12264:v:1:27500:1560:8190:0:50
+Animal Planet - Russian:12264:v:1:27500:1560:8190:0:51
+Discovery Netherlands:12264:v:1:27500:1660:8190:0:60
+Q English:12264:v:1:27500:1760:8190:0:70
+Travel and Adventure:12264:v:1:27500:1860:8190:0:80
+Travel and Adventure- Russian:12264:v:1:27500:1860:8190:0:81
+New DCP:12264:v:1:27500:8190:1220:0:300
+CCP:12264:v:1:27500:1260:8190:0:301
+Deutsche Bank / T2:12264:v:1:27500:1260:8190:0:2
+Channel Three:12264:v:1:27500:1360:8190:0:3
+Channel Four:12264:v:1:27500:1460:8190:0:4
+Channel Five:12264:v:1:27500:1560:8190:0:5
+Channel 6 = Sat 7 Arabic:12264:v:1:27500:1660:8190:0:6
+Channel Seven:12264:v:1:27500:1760:8190:0:7
+Q German:12264:v:1:27500:1760:8190:0:71
+Q French:12264:v:1:27500:1760:8190:0:72
+Q Dutch:12264:v:1:27500:1760:8190:0:73
+DTAG / T11:12264:v:1:27500:1360:8190:0:11
+DTAG 50 / T12:12264:v:1:27500:1360:8190:0:12
+Telekom TV:12264:v:1:27500:1460:8190:0:13
+Gerling / T26:12264:v:1:27500:1360:8190:0:26
+Hornbach-D / T36:12264:v:1:27500:1360:8190:0:36
+Hornbach-NL / T38:12264:v:1:27500:1360:8190:0:38
+Hornbach-CZ / T39:12264:v:1:27500:1360:8190:0:39
+Testkanal:12264:v:1:27500:1660:8190:0:99
+KENCAST:12264:v:1:27500:8190:8190:0:111
+SLO-TV1:12302:v:1:27500:200:8190:0:3201
+SLO-TV2:12302:v:1:27500:203:8190:0:3202
+POLONIA 1:12302:v:1:27500:205:8190:0:3203
+SLO-RA1-INF:12302:v:1:27500:8190:250:0:3204
+SLO-RA2:12302:v:1:27500:8190:251:0:3205
+SLO-RA3:12302:v:1:27500:8190:252:0:3206
+SUPER 1:12302:v:1:27500:207:8190:0:3207
+NAPOLI INT.:12302:v:1:27500:240:8190:0:3210
+MAGIC:12302:v:1:27500:245:8190:0:3211
+COUNTDOWN:12302:v:1:27500:235:8190:0:3212
+TBNE:12302:v:1:27500:230:8190:0:3213
+SICILSAT:12302:v:1:27500:225:8190:0:3214
+TVP1:10892:h:1:27500:257:6111:0:1
+TVP2:10892:h:1:27500:321:322:0:2
+POLSAT1:10892:h:1:27500:8190:8190:0:3
+TV4:10892:h:1:27500:257:6111:0:4
+POLSAT2:10892:h:1:27500:321:322:0:5
+WOT:10892:h:1:27500:8190:8190:0:6
+DISCOVERY:10892:h:1:27500:257:6111:0:15
+ANIMAL PLANET:10892:h:1:27500:321:322:0:16
+EpgOpenTV:10892:h:1:27500:8190:8190:0:3686
+P10:12341:v:1:27500:160:81:0:11601
+P11:12341:v:1:27500:161:85:0:11603
+P12:12341:v:1:27500:162:89:0:11605
+P13:12341:v:1:27500:163:93:0:11607
+P14:12341:v:1:27500:164:97:0:11609
+P15:12341:v:1:27500:165:101:0:11611
+P16:12341:v:1:27500:166:105:0:11613
+PREMIUM:12341:v:1:27500:8190:8190:0:11615
++F1:12341:v:1:27500:160:664:0:11617
++F1:12341:v:1:27500:161:85:0:11619
++F1:12341:v:1:27500:162:667:0:11621
++F1:12341:v:1:27500:163:674:0:11623
++F1:12341:v:1:27500:164:96:0:11625
++F1:12341:v:1:27500:165:676:0:11627
++F1:12341:v:1:27500:166:666:0:11629
+RMC:12341:v:1:27500:8190:8190:0:11631
+R101:12341:v:1:27500:8190:8190:0:11632
+RRAD:12341:v:1:27500:8190:8190:0:11633
+ON:10892:h:1:27500:353:354:0:7
+DLA-CIEBIE:10892:h:1:27500:529:530:0:8
+KOMEDIA:10892:h:1:27500:353:354:0:9
+SMYK:10892:h:1:27500:529:530:0:10
+RELAKS:10892:h:1:27500:353:354:0:11
+INFO:10892:h:1:27500:529:530:0:12
+POLSAT SPORT:10892:h:1:27500:353:354:0:13
+Paris Premi�re:12379:v:1:27500:3021:3031:0:3001
+OCC HB3:12379:v:1:27500:3022:3032:0:3002
+TELE 24  Switzerland:12379:v:1:27500:3023:3033:0:3003
+AIR MEDIA:12379:v:1:27500:8190:3537:0:3087
+Abu Dhabi TV:12379:v:1:27500:3024:3034:0:3004
+EMIRAT FM 1:12379:v:1:27500:8190:3533:0:3083
+EMIRAT FM2:12379:v:1:27500:8190:3534:0:3084
+Radio Italia :12379:v:1:27500:8190:3531:0:3081
+EQUIDIA INTER.:12379:v:1:27500:3321:3351:0:3051
+RTV MONTENEGRO:12379:v:1:27500:3026:3036:0:3006
+Radio Montenegro:12379:v:1:27500:8190:3538:0:3088
+SERTE TEST:12379:v:1:27500:3025:8190:0:3005
+GAME 1:12379:v:1:27500:3027:3037:0:3007
+SF 2:12398:h:1:27500:163:93:0:907
+SRG SSR Sat Access:12398:h:1:27500:165:99:0:910
+SF 1:12398:h:1:27500:160:81:0:901
+TSR 1:12398:h:1:27500:161:85:0:902
+TSI 1:12398:h:1:27500:162:89:0:903
+TSR 2:12398:h:1:27500:164:97:0:908
+TSI 2:12398:h:1:27500:166:101:0:909
+OPTION MUSIQUE:12398:h:1:27500:8190:204:0:957
+ESPACE 2:12398:h:1:27500:8190:205:0:958
+SRI-F-I:12398:h:1:27500:8190:199:0:951
+SRI-EUROPA:12398:h:1:27500:560:200:0:953
+POLO:12341:v:1:27500:160:80:0:11701
+PLANETE:12341:v:1:27500:161:84:0:11703
+JIMMY:12341:v:1:27500:162:88:0:11705
+INN:12341:v:1:27500:163:92:0:11707
+CIN1:12341:v:1:27500:164:96:0:11709
+CIN2:12341:v:1:27500:165:100:0:11711
+CINC:12341:v:1:27500:166:104:0:11713
+SEASONS:12341:v:1:27500:167:108:0:11715
+WISHLINE:12341:v:1:27500:168:89:0:11717
+MARCOPOLO:12341:v:1:27500:160:81:0:11719
+JAAM-E-JAM 1:12436:h:1:27500:160:81:0:1
+JAAM-E-JAM 2:12436:h:1:27500:161:83:0:2
+SAHAR:12436:h:1:27500:162:85:0:3
+TEST(SAHAR):12436:h:1:27500:163:87:0:4
+IRINN:12436:h:1:27500:164:89:0:5
+TEST 2:12436:h:1:27500:165:90:0:6
+IRIB1 RADIO:12436:h:1:27500:8190:81:0:7
+IRIB ARABIC /International 1 Radio:12436:h:1:27500:8190:83:0:8
+INT1 FAMILY RADIO:12475:h:1:27500:8190:961:0:10615
+RADIO 74:12475:h:1:27500:8190:921:0:10612
+R 74 INT.:12475:h:1:27500:8190:931:0:10613
+FAMILY Radio:12475:h:1:27500:8190:951:0:10614
+Temp:12475:h:1:27500:771:8190:0:10607
+SPREE Radio:12475:h:1:27500:8190:501:0:10652
+ RVI  ( VRT ) :12475:h:1:27500:8190:901:0:10610
+EbS:12475:h:1:27500:101:216:0:10601
+MOU.2:12475:h:1:27500:42:8190:0:10602
+MIZIK TROPICAL:12475:h:1:27500:435:436:0:10606
+MIZIK TROPICAL Radio:12475:h:1:27500:8190:801:0:10608
+Framboise Nord (CH):12475:h:1:27500:8190:971:0:10616
+Framboise Sud (CH):12475:h:1:27500:8190:981:0:10617
+PINK PLUS:12475:h:1:27500:308:257:0:10605
+LIBERTYTV.COM:12475:h:1:27500:941:942:0:10603
+KURDSAT:12475:h:1:27500:600:601:0:10618
+test2:12475:h:1:27500:3000:3001:0:10620
+HRT-TV1:12519:v:1:27500:100:101:0:8301
+HRT-TV2:12519:v:1:27500:103:104:0:8302
+HRT-TV3:12519:v:1:27500:105:106:0:8303
+HRT-HR1:12519:v:1:27500:8190:150:0:8305
+HRT-HR2:12519:v:1:27500:8190:151:0:8306
+HRT-HR3:12519:v:1:27500:8190:152:0:8307
+SICILIA INTERNATIONAL:12519:v:1:27500:501:8190:0:8309
+HRT-NATIONAL:12519:v:1:27500:107:108:0:8304
+HRT-TEST:12519:v:1:27500:109:110:0:8308
+SARDEGNA UNO:12519:v:1:27500:503:8190:0:8310
+R-HRVATSKA:12519:v:1:27500:8190:153:0:8311
+EuroMed:12519:v:1:27500:510:8190:0:8312
+TGRT:12519:v:1:27500:505:8190:0:8313
+HR-TEST:12519:v:1:27500:8190:154:0:8314
+MINI-BVN:12519:v:1:27500:210:8190:0:8315
+SIMS 91 LARIO:12713:h:1:27500:8190:8190:0:8802
+SKYPLEX TXP91:12713:h:1:27500:8190:8190:0:8801
+Skygate 18:12713:h:1:27500:8190:8190:0:2
+MA12_2905:12713:h:1:27500:8190:8190:0:8810
+ES13_1107:12713:h:1:27500:8190:8190:0:8811
+ASTONv0107:12713:h:1:27500:8190:8190:0:8815
+sisal:12713:h:1:27500:4356:8190:0:1
+service:12713:h:1:27500:4356:8190:0:3
+Skyplex 19:12713:h:1:27500:8190:8190:0:8991
+Network:12713:h:1:27500:8190:8190:0:8992
+www.travel:12713:h:1:27500:1180:1184:0:8993
+MagicStar:12713:h:1:27500:8190:1188:0:8994
+Skygate 8:12713:h:1:27500:8190:8190:0:8926
+UDLR:12713:h:1:27500:8190:6653:0:8927
+UDLR UDcast:12713:h:1:27500:8190:8190:0:8928
+Skygate 17:12713:h:1:27500:8190:8190:0:8804
+Netshow:12713:h:1:27500:8190:8190:0:8813
+MEDIOLANUM:12713:h:1:27500:4102:8190:0:8814
+Skygate 10:12713:h:1:27500:8190:8190:0:8901
+HitCast Data 1:12713:h:1:27500:8190:8190:0:8902
+HitCast S.Amer.:12713:h:1:27500:8190:8190:0:8903
+Skygate 1:12713:h:1:27500:8190:8190:0:8876
+MonteCarloSat:12713:h:1:27500:5127:5122:0:8877
+Bulgaria Radio:12713:h:1:27500:8190:4615:0:8828
+skygate 600:12713:h:1:27500:8190:8190:0:8826
+SKYPLEX TXP92:12558:v:1:27500:8190:8190:0:9101
+SKYPLEX TXP92:12558:v:1:27500:8190:8190:0:9361
+SKYPLEX TXP92:12558:v:1:27500:2825:2818:0:9362
+SKYPLEX TXP92:12558:v:1:27500:2825:2818:0:9363
+SKYPLEX TXP92:12558:v:1:27500:2825:2818:0:9364
+SKY_4:12558:v:1:27500:8190:8190:0:9351
+ESP Int'l:12558:v:1:27500:2575:2563:0:9352
+ESP Romanian:12558:v:1:27500:8190:2569:0:9353
+ESP Dutch:12558:v:1:27500:2575:2564:0:9354
+ESP PolisI:12558:v:1:27500:8190:2565:0:9355
+ESP PolisI:12558:v:1:27500:2575:2566:0:9356
+ESP PolisI:12558:v:1:27500:2575:2564:0:9357
+ESP PolisI:12558:v:1:27500:2575:2568:0:9358
+ESP PolisI:12558:v:1:27500:2575:2565:0:9359
+ESP PolisI:12558:v:1:27500:2575:2565:0:9251
+JSTV 1:12596:v:1:27500:2000:2002:0:8213
+JSTV 2:12596:v:1:27500:2011:2013:0:8214
+MBC:12596:v:1:27500:160:81:0:8201
+Service 2:12596:v:1:27500:161:84:0:8202
+NITV:12596:v:1:27500:163:92:0:8204
+SIMAYE AZADI:12596:v:1:27500:166:106:0:8207
+BET:12596:v:1:27500:167:109:0:8208
+CNNI:12596:v:1:27500:168:113:0:8209
+EuroNews:12596:v:1:27500:2221:2238:0:8211
+Canal Rural:12596:v:1:27500:2321:2332:0:8212
+MediaHW:12596:v:1:27500:8190:8190:0:8291
+MediaHW:12615:h:1:27500:8190:8190:0:65534
+MMOV:12615:h:1:27500:2576:8190:0:3910
+MMOV:12615:h:1:27500:2578:8190:0:3913
+MMOV:12615:h:1:27500:2580:8190:0:3917
+MMOV:12615:h:1:27500:2582:8190:0:3918
+MMOV:12615:h:1:27500:2584:8190:0:3919
+MMOV:12615:h:1:27500:2586:8190:0:3920
+SC 1:12615:h:1:27500:2567:8190:0:3921
+SC 2:12615:h:1:27500:2570:8190:0:3924
+SC 3:12615:h:1:27500:2573:8190:0:3927
+MC20:12615:h:1:27500:8190:2304:0:3935
+MC21:12615:h:1:27500:8190:2305:0:3938
+MC22:12615:h:1:27500:8190:2306:0:3941
+MC23:12615:h:1:27500:8190:2307:0:3944
+MC24:12615:h:1:27500:8190:2308:0:3947
+MC25:12615:h:1:27500:8190:2309:0:3950
+MC26:12615:h:1:27500:8190:2310:0:3953
+MC27:12615:h:1:27500:8190:2311:0:3956
+MC28:12615:h:1:27500:8190:2312:0:3959
+MC29:12615:h:1:27500:8190:2313:0:3962
+MC30:12615:h:1:27500:8190:2314:0:3965
+MC31:12615:h:1:27500:8190:2315:0:3968
+MC32:12615:h:1:27500:8190:2316:0:3971
+MC33:12615:h:1:27500:8190:2317:0:3974
+MC34:12615:h:1:27500:8190:2318:0:3977
+MC35:12615:h:1:27500:8190:2319:0:3980
+MC36:12615:h:1:27500:8190:2320:0:3983
+MC37:12615:h:1:27500:8190:2321:0:3986
+MC38:12615:h:1:27500:8190:2322:0:3989
+MC39:12615:h:1:27500:8190:2323:0:3992
+MC39:12635:v:1:27500:8190:2323:0:65534
+SC 4:12635:v:1:27500:2704:8190:0:4001
+SC 5:12635:v:1:27500:2696:8190:0:4002
+SC 6:12635:v:1:27500:2701:8190:0:4003
+MMOV:12635:v:1:27500:2692:8190:0:4007
+MMOV:12635:v:1:27500:2694:8190:0:4010
+MMOV:12635:v:1:27500:2707:8190:0:4016
+MMOV:12635:v:1:27500:2709:8190:0:4019
+MMOV:12635:v:1:27500:2711:8190:0:4022
+MMOV:12635:v:1:27500:2819:8190:0:4025
+MMOV:12635:v:1:27500:2821:8190:0:4028
+Sharjah        Arabsat Bouquet:12654:h:1:27500:1160:8190:0:1
+Qatar          Arabsat Bouquet:12654:h:1:27500:1260:8190:0:2
+Saudi 1        Arabsat Bouquet:12654:h:1:27500:1360:8190:0:3
+Kuwait         Arabsat Bouquet:12654:h:1:27500:1460:8190:0:4
+Libya          Arabsat Bouquet:12654:h:1:27500:1560:8190:0:5
+Sudan          Arabsat Bouquet:12654:h:1:27500:1660:8190:0:6
+Oman           Arabsat Bouquet:12654:h:1:27500:1760:8190:0:7
+Jordan         Arabsat Bouquet:12654:h:1:27500:1860:8190:0:8
+IRAQ TV:12654:h:1:27500:1960:8190:0:9
+Dubai Sport:12654:h:1:27500:1060:8190:0:10
+Qatar A2       Arabsat Bouquet:12654:h:1:27500:8190:1221:0:12
+Saudi1 A2      Arabsat Bouquet:12654:h:1:27500:8190:1321:0:13
+Kuwait A2      Arabsat Bouquet:12654:h:1:27500:8190:1421:0:14
+Jordan A2      Arabsat Bouquet:12654:h:1:27500:8190:1821:0:18
+Radio dubai sport:12654:h:1:27500:8190:1021:0:19
+Digitaly:12673:v:1:27500:220:222:0:4203
+Telemarket:12673:v:1:27500:350:351:0:4211
+Internet data 1:12673:v:1:27500:8190:8190:0:4212
+eVision:12673:v:1:27500:360:7142:0:4214
+ANNI 60:12673:v:1:27500:8190:250:0:4230
+R. Reporter:12673:v:1:27500:8190:251:0:4231
+Radio Italia S.M.I.:12673:v:1:27500:8190:252:0:4232
+R. Tour:12673:v:1:27500:8190:253:0:4233
+R.Rinascente:12673:v:1:27500:8190:254:0:4234
+R. Cooky:12673:v:1:27500:8190:255:0:4235
+RadioBaby:12673:v:1:27500:8190:256:0:4236
+McDonalds:12673:v:1:27500:8190:257:0:4237
+TRBuonconsiglio:12673:v:1:27500:8190:401:0:4238
+R-Radio:12673:v:1:27500:8190:402:0:4239
+R. Donna:12673:v:1:27500:8190:403:0:4240
+R. Reporter 2:12673:v:1:27500:8190:404:0:4241
+R. West:12673:v:1:27500:8190:405:0:4242
+Melodia Russia:12673:v:1:27500:6646:406:0:4243
+Padre Pio:12673:v:1:27500:8190:407:0:4244
+Thai TV5:12673:v:1:27500:200:202:0:4201
+Studio Europa:12673:v:1:27500:230:231:0:4204
+Video  Italia:12673:v:1:27500:340:342:0:4210
+PASSIONS:12692:h:1:27500:160:8190:0:501
+ONYX:12692:h:1:27500:161:8190:0:502
+MANGAS:12692:h:1:27500:162:88:0:503
+ENCYCLOPEDIA:12692:h:1:27500:163:92:0:504
+POLAR:12692:h:1:27500:164:96:0:505
+CINE PALACE:12692:h:1:27500:165:100:0:506
+ROMANCE:12692:h:1:27500:166:104:0:507
+RIRE:12692:h:1:27500:167:108:0:508
+ACTION:12692:h:1:27500:168:112:0:509
+ABsat test RADIO:12692:h:1:27500:8190:101:0:510
+ABsat test RADIO:12713:v:1:27500:8190:101:0:65534
+MMOV:12713:v:1:27500:2563:8190:0:4304
+MMOV:12713:v:1:27500:2565:8190:0:4307
+MMOV:12713:v:1:27500:2567:8190:0:4310
+MMOV:12713:v:1:27500:2308:8190:0:4313
+MMOV:12713:v:1:27500:2314:8190:0:4316
+MMOV:12713:v:1:27500:2310:8190:0:4324
+MMOV:12713:v:1:27500:2312:8190:0:4327
+MMOV:12713:h:1:27500:2312:8190:0:65534
+SINT:12713:h:1:27500:8190:8190:0:8802
+info:12713:h:1:27500:517:8190:0:8804
+SINT:12713:h:1:27500:8190:8190:0:8806
+CFN:12713:h:1:27500:523:8190:0:8809
+SINT:12713:h:1:27500:8190:8190:0:8812
+duel:12713:h:1:27500:518:8190:0:8815
+comedy:12713:h:1:27500:515:8190:0:8818
+fox kids:12713:h:1:27500:513:8190:0:8821
diff --git a/channels.conf b/channels.conf
index 6e6d0168d..4a6cb0b34 100644
--- a/channels.conf
+++ b/channels.conf
@@ -9,7 +9,7 @@ N3:12110:h:1:27500:2401:2402:0:28224
 SR3:11837:h:1:27500:501:502:0:28110
 WDR:11837:h:1:27500:601:602:0:28111
 BR-alpha:11837:h:1:27500:701:702:0:28112
-SWR BW:11837:h:1:27500:801:802:0:28110
+SWR BW:11837:h:1:27500:801:802:0:28113
 Phoenix:11837:h:1:27500:901:902:0:28114
 ZDF:11954:h:1:27500:110:120:0:28006
 3sat:11954:h:1:27500:210:220:0:28007
diff --git a/config.c b/config.c
index af5be871f..0a965ee54 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.18 2000/09/03 09:20:22 kls Exp $
+ * $Id: config.c 1.22 2000/09/10 15:07:15 kls Exp $
  */
 
 #include "config.h"
@@ -196,11 +196,22 @@ cChannel::cChannel(const cChannel *Channel)
   apid         = Channel ? Channel->apid         : 256;
   ca           = Channel ? Channel->ca           : 0;
   pnr          = Channel ? Channel->pnr          : 0;
+  groupSep     = Channel ? Channel->groupSep     : false;
 }
 
 const char *cChannel::ToText(cChannel *Channel)
 {
-  asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", Channel->name, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->ca, Channel->pnr);
+  char buf[MaxChannelName * 2];
+  char *s = Channel->name;
+  if (strchr(s, ':')) {
+     s = strcpy(buf, s);
+     strreplace(s, ':', '|');
+     }
+  delete buffer;
+  if (Channel->groupSep)
+     asprintf(&buffer, ":%s\n", s);
+  else
+     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->ca, Channel->pnr);
   return buffer;
 }
 
@@ -212,13 +223,27 @@ const char *cChannel::ToText(void)
 bool cChannel::Parse(const char *s)
 {
   char *buffer = NULL;
-  if (9 == sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr)) {
-     strncpy(name, buffer, MaxChannelName - 1);
-     name[strlen(buffer)] = 0;
-     delete buffer;
-     return true;
+  if (*s == ':') {
+     if (*++s) {
+        strn0cpy(name, s, MaxChannelName);
+        name[strlen(name) - 1] = 0; // strip the '\n'
+        groupSep = true;
+        }
+     else
+        return false;
      }
-  return false;
+  else {
+     groupSep = false;
+     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr);
+     if (fields == 9) {
+        strn0cpy(name, buffer, MaxChannelName);
+        delete buffer;
+        }
+     else
+        return false;
+     }
+  strreplace(name, '|', ':');
+  return true;
 }
 
 bool cChannel::Save(FILE *f)
@@ -230,9 +255,9 @@ bool cChannel::Switch(cDvbApi *DvbApi)
 {
   if (!DvbApi)
      DvbApi = cDvbApi::PrimaryDvbApi;
-  if (!DvbApi->Recording()) {
-     isyslog(LOG_INFO, "switching to channel %d", Index() + 1);
-     CurrentChannel = Index();
+  if (!DvbApi->Recording() && !groupSep) {
+     isyslog(LOG_INFO, "switching to channel %d", number);
+     CurrentChannel = number;
      for (int i = 3; i--;) {
          if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr)) {
             EIT.SetProgramNumber(pnr);
@@ -242,22 +267,10 @@ bool cChannel::Switch(cDvbApi *DvbApi)
          }
      return false;
      }
-  Interface.Info("Channel locked (recording)!");
+  Interface.Info(DvbApi->Recording() ? "Channel locked (recording)!" : name);
   return false;
 }
 
-bool cChannel::SwitchTo(int i, cDvbApi *DvbApi)
-{
-  cChannel *channel = Channels.Get(i);
-  return channel && channel->Switch(DvbApi);
-}
-
-const char *cChannel::GetChannelName(int i)
-{
-  cChannel *channel = Channels.Get(i);
-  return channel ? channel->name : NULL;
-}
-
 // -- cTimer -----------------------------------------------------------------
 
 char *cTimer::buffer = NULL;
@@ -267,7 +280,8 @@ cTimer::cTimer(bool Instant)
   startTime = stopTime = 0;
   recording = false;
   active = Instant;
-  channel = CurrentChannel + 1;
+  cChannel *ch = Channels.GetByNumber(CurrentChannel);
+  channel = ch ? ch->number : 0;
   time_t t = time(NULL);
   struct tm *now = localtime(&t);
   day = now->tm_mday;
@@ -280,8 +294,8 @@ cTimer::cTimer(bool Instant)
   lifetime = 99;
   *file = 0;
   summary = NULL;
-  if (Instant)
-     snprintf(file, sizeof(file), "@%s", cChannel::GetChannelName(CurrentChannel));
+  if (Instant && ch)
+     snprintf(file, sizeof(file), "@%s", ch->name);
 }
 
 cTimer::~cTimer()
@@ -299,6 +313,7 @@ cTimer& cTimer::operator= (const cTimer &Timer)
 
 const char *cTimer::ToText(cTimer *Timer)
 {
+  delete buffer;
   asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
   return buffer;
 }
@@ -368,11 +383,7 @@ bool cTimer::Parse(const char *s)
   if (8 <= sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
      //TODO add more plausibility checks
      day = ParseDay(buffer1);
-     int l = strlen(buffer2);
-     if (l >= MaxFileName)
-        l = MaxFileName - 1;
-     strncpy(file, buffer2, l);
-     file[l] = 0;
+     strn0cpy(file, buffer2, MaxFileName);
      delete buffer1;
      delete buffer2;
      return day != 0;
@@ -470,10 +481,87 @@ cKeys Keys;
 
 // -- cChannels --------------------------------------------------------------
 
-int CurrentChannel = 0;
+int CurrentChannel = 1;
+int CurrentGroup = -1;
 
 cChannels Channels;
 
+bool cChannels::Load(const char *FileName)
+{
+  if (cConfig<cChannel>::Load(FileName)) {
+     ReNumber();
+     return true;
+     }
+  return false;
+}
+
+int cChannels::GetNextGroup(int Idx)
+{
+  cChannel *channel = Get(++Idx);
+  while (channel && !channel->groupSep)
+        channel = Get(++Idx);
+  return channel ? Idx : -1;
+}
+
+int cChannels::GetPrevGroup(int Idx)
+{
+  cChannel *channel = Get(--Idx);
+  while (channel && !channel->groupSep)
+        channel = Get(--Idx);
+  return channel ? Idx : -1;
+}
+
+int cChannels::GetNextNormal(int Idx)
+{
+  cChannel *channel = Get(++Idx);
+  while (channel && channel->groupSep)
+        channel = Get(++Idx);
+  return channel ? Idx : -1;
+}
+
+void cChannels::ReNumber( void )
+{
+  int Number = 0;
+  cChannel *ch = (cChannel *)First();
+  while (ch) {
+        if (!ch->groupSep)
+           ch->number = ++Number;
+        ch = (cChannel *)ch->Next();
+        }
+  maxNumber = Number;
+}
+
+cChannel *cChannels::GetByNumber(int Number)
+{
+  cChannel *channel = (cChannel *)First();
+  while (channel) {
+        if (channel->number == Number)
+           return channel;
+        channel = (cChannel *)channel->Next();
+        }
+  return NULL;
+}
+
+bool cChannels::SwitchTo(int Number, cDvbApi *DvbApi)
+{
+  cChannel *channel = GetByNumber(Number);
+  return channel && channel->Switch(DvbApi);
+}
+
+const char *cChannels::GetChannelNameByNumber(int Number)
+{
+  cChannel *channel = GetByNumber(Number);
+  return channel ? channel->name : NULL;
+}
+
+eKeys cChannels::ShowChannel(int Number, bool Switched, bool Group)
+{
+  cChannel *channel = Group ? Get(Number) : GetByNumber(Number);
+  if (channel)
+     return Interface.DisplayChannel(channel->number, channel->name, !Switched || Setup.ShowInfoOnChSwitch);
+  return kNone;
+}
+
 // -- cTimers ----------------------------------------------------------------
 
 cTimers Timers;
@@ -489,3 +577,81 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
   return NULL;
 }
 
+// -- cSetup -----------------------------------------------------------------
+
+cSetup Setup;
+
+char *cSetup::fileName = NULL;
+
+cSetup::cSetup(void)
+{
+  PrimaryDVB = 1;
+  ShowInfoOnChSwitch = 1;
+  MenuScrollPage = 1;
+}
+
+bool cSetup::Parse(char *s)
+{
+  const char *Delimiters = " \t\n=";
+  char *Name  = strtok(s, Delimiters);
+  char *Value = strtok(NULL, Delimiters);
+  if (Name && Value) {
+     if      (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
+     else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
+     else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
+     else
+        return false;
+     return true;
+     }
+  return false;
+}
+
+bool cSetup::Load(const char *FileName)
+{
+  isyslog(LOG_INFO, "loading %s", FileName);
+  delete fileName;
+  fileName = strdup(FileName);
+  FILE *f = fopen(fileName, "r");
+  if (f) {
+     int line = 0;
+     char buffer[MaxBuffer];
+     bool result = true;
+     while (fgets(buffer, sizeof(buffer), f) > 0) {
+           line++;
+           if (*buffer != '#' && !Parse(buffer)) {
+              esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+              result = false;
+              break;
+              }
+           }
+     fclose(f);
+     return result;
+     }
+  else
+     LOG_ERROR_STR(FileName);
+  return false;
+}
+
+bool cSetup::Save(const char *FileName)
+{
+  if (!FileName)
+     FileName = fileName;
+  if (FileName) {
+     FILE *f = fopen(FileName, "w");
+     if (f) {
+        fprintf(f, "# VDR Setup\n");
+        fprintf(f, "PrimaryDVB         = %d\n", PrimaryDVB);
+        fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
+        fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
+        fclose(f);
+        isyslog(LOG_INFO, "saved setup to %s", FileName);
+        return true;
+        }
+     else
+        LOG_ERROR_STR(FileName);
+     }
+  else
+     esyslog(LOG_ERR, "attempt to save setup without file name");
+  return false;
+}
+
diff --git a/config.h b/config.h
index 15e905011..30dd9bac2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.15 2000/09/03 09:37:30 kls Exp $
+ * $Id: config.h 1.19 2000/09/10 15:05:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define VDRVERSION "0.62"
+#define VDRVERSION "0.63"
 
 #define MaxBuffer 10000
 
@@ -75,14 +75,14 @@ class cChannel : public cListObject {
   int apid;
   int ca;
   int pnr;
+  int number;    // Sequence number assigned on load
+  bool groupSep;
   cChannel(void);
   cChannel(const cChannel *Channel);
   const char *ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
   bool Switch(cDvbApi *DvbApi = NULL);
-  static bool SwitchTo(int i, cDvbApi *DvbApi = NULL);
-  static const char *GetChannelName(int i);
   };
 
 class cTimer : public cListObject {
@@ -130,7 +130,7 @@ template<class T> class cConfig : public cList<T> {
     cList<T>::Clear();
   }
 public:
-  bool Load(const char *FileName)
+  virtual bool Load(const char *FileName)
   {
     isyslog(LOG_INFO, "loading %s", FileName);
     bool result = true;
@@ -155,7 +155,7 @@ template<class T> class cConfig : public cList<T> {
        fclose(f);
        }
     else {
-       esyslog(LOG_ERR, "can't open '%s'\n", fileName);
+       LOG_ERROR_STR(fileName);
        result = false;
        }
     return result;
@@ -176,23 +176,57 @@ template<class T> class cConfig : public cList<T> {
              }
        fclose(f);
        }
-    else
+    else {
+       LOG_ERROR_STR(fileName);
        result = false;
+       }
     return result;
   }
   };
 
-class cChannels : public cConfig<cChannel> {};
-
+class cChannels : public cConfig<cChannel> {
+protected:
+  int maxNumber;
+public:
+  cChannels(void) { maxNumber = 0; }
+  virtual bool Load(const char *FileName);
+  int GetNextGroup(int Idx);   // Get next channel group
+  int GetPrevGroup(int Idx);   // Get previous channel group
+  int GetNextNormal(int Idx);  // Get next normal channel (not group)
+  void ReNumber(void);         // Recalculate 'number' based on channel type
+  cChannel *GetByNumber(int Number);
+  const char *GetChannelNameByNumber(int Number);
+  bool SwitchTo(int Number, cDvbApi *DvbApi = NULL);
+  int MaxNumber(void) { return maxNumber; }
+  eKeys ShowChannel(int Number, bool Switched, bool Group = false);
+  };
+ 
 class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
   };
 
 extern int CurrentChannel;
+extern int CurrentGroup;
 
 extern cChannels Channels;
 extern cTimers Timers;
 extern cKeys Keys;
 
+class cSetup {
+private:
+  static char *fileName;
+  bool Parse(char *s);
+public:
+  // Also adjust cMenuSetup (menu.c) when adding parameters here!
+  int PrimaryDVB;
+  int ShowInfoOnChSwitch;
+  int MenuScrollPage;
+  cSetup(void);
+  bool Load(const char *FileName);
+  bool Save(const char *FileName = NULL);
+  };
+
+extern cSetup Setup;
+
 #endif //__CONFIG_H
diff --git a/dvbapi.c b/dvbapi.c
index 0562a4f58..9f9cbab42 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.22 2000/08/06 14:06:14 kls Exp $
+ * $Id: dvbapi.c 1.24 2000/09/10 10:25:09 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -1097,16 +1097,34 @@ cDvbApi::~cDvbApi()
   delete replayTitle;
 }
 
+bool cDvbApi::SetPrimaryDvbApi(int n)
+{
+  n--;
+  if (0 <= n && n < NumDvbApis && dvbApi[n]) {
+     isyslog(LOG_INFO, "setting primary DVB to %d", n + 1);
+     PrimaryDvbApi = dvbApi[n];
+     return true;
+     }
+  esyslog(LOG_ERR, "invalid DVB interface: %d", n + 1);
+  return false;
+}
+
 cDvbApi *cDvbApi::GetDvbApi(int Ca)
 {
+  cDvbApi *d = NULL;
   Ca--;
   for (int i = MAXDVBAPI; --i >= 0; ) {
-      if (dvbApi[i]) {
-         if ((i == Ca || Ca < 0) && !dvbApi[i]->Recording())
+      if (dvbApi[i] && !dvbApi[i]->Recording()) {
+         if (i == Ca)
             return dvbApi[i];
+         if (Ca < 0) {
+            d = dvbApi[i];
+            if (d != PrimaryDvbApi)
+               break;
+            }
          }
       }
-  return NULL;
+  return d;
 }
 
 int cDvbApi::Index(void)
@@ -1199,6 +1217,10 @@ void cDvbApi::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      dc.y1    = y1;
      dc.data  = (void *)data;
      ioctl(videoDev, VIDIOCSOSDCOMMAND, &dc);
+     usleep(10); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
+                 // XXX and sometimes the OSD was no longer displayed).
+                 // XXX Increase the value if the problem still persists on your particular system.
+                 // TODO Check if this is still necessary with driver versions after 0.6.
      }
 }
 #endif
diff --git a/dvbapi.h b/dvbapi.h
index 9f9543020..a43e7075c 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.13 2000/09/03 09:25:53 kls Exp $
+ * $Id: dvbapi.h 1.14 2000/09/10 10:03:29 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -53,9 +53,13 @@ class cDvbApi {
   static cDvbApi *dvbApi[MAXDVBAPI];
 public:
   static cDvbApi *PrimaryDvbApi;
+  static bool SetPrimaryDvbApi(int n);
+         // Sets the primary DVB device to 'n' (which must be in the range
+         // 1...NumDvbApis) and returns true if this was possible.
   static cDvbApi *GetDvbApi(int Ca = 0);
-         // Selects a free DVB device, starting with the highest device number.
-         // If Ca is nor 0, the device with the given number will be returned
+         // Selects a free DVB device, starting with the highest device number
+         // (but avoiding, if possible, the PrimaryDvbApi).
+         // If Ca is not 0, the device with the given number will be returned
          // if it is not currently recording.
   int Index(void);
          // Returns the index of this DvbApi.
diff --git a/interface.c b/interface.c
index 2ae49c330..5633f864e 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.11 2000/09/03 10:17:21 kls Exp $
+ * $Id: interface.c 1.15 2000/09/10 16:04:14 kls Exp $
  */
 
 #include "interface.h"
@@ -72,10 +72,10 @@ eKeys cInterface::GetKey(bool Wait)
 
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
-  int t0 = time_ms();
+  int t0 = time_ms() + Seconds * 1000;
   eKeys Key = kNone;
 
-  while (time_ms() - t0 < Seconds * 1000) {
+  while (time_ms() < t0) {
         Key = GetKey();
         if (Key != kNone)
            break;
@@ -112,11 +112,9 @@ void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor
      cDvbApi::PrimaryDvbApi->Text(x, y, s, FgColor, BgColor);
 }
 
-void cInterface::WriteText(int x, int y, const char *s, bool Current)
+void cInterface::WriteText(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
   if (open) {
-     eDvbColor FgColor = Current ? clrBlack : clrWhite;
-     eDvbColor BgColor = Current ? clrCyan : clrBackground;
      ClearEol(x, y, BgColor);
      int col = 0;
      for (;;) {
@@ -315,36 +313,61 @@ void cInterface::LearnKeys(void)
       }
 }
 
-void cInterface::DisplayChannel(int Number, const char *Name)
+eKeys cInterface::DisplayChannel(int Number, const char *Name, bool WithInfo)
 {
-  RcIo.Number(Number);
+  // Number = 0 is used for channel group display and no EIT
+  if (Number)
+     RcIo.Number(Number);
   if (Name && !Recording()) {
-     Open(MenuColumns, EIT.IsValid() ? 5 : 1);
-     char buffer[MenuColumns + 1];
-     snprintf(buffer, sizeof(buffer), "%d  %s", Number, Name ? Name : "");
+     char *RunningTitle = "", *RunningSubtitle = "", *NextTitle = "", *NextSubtitle = "";
+     int Lines = 0;
+     if (Number && WithInfo && EIT.IsValid()) {
+        if (*(RunningTitle    = EIT.GetRunningTitle()))    Lines++;
+        if (*(RunningSubtitle = EIT.GetRunningSubtitle())) Lines++;
+        if (*(NextTitle       = EIT.GetNextTitle()))       Lines++;
+        if (*(NextSubtitle    = EIT.GetNextSubtitle()))    Lines++;
+        }
+     Open(MenuColumns, Lines + 1);
+     int BufSize = MenuColumns + 1;
+     char buffer[BufSize];
+     if (Number)
+        snprintf(buffer, BufSize, "%d  %s", Number, Name ? Name : "");
+     else
+        snprintf(buffer, BufSize, "%s", Name ? Name : "");
      Write(0, 0, buffer);
      time_t t = time(NULL);
      struct tm *now = localtime(&t);
-     snprintf(buffer, sizeof(buffer), "%02d:%02d", now->tm_hour, now->tm_min);
+     snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
      Write(-5, 0, buffer);
-     if (EIT.IsValid()) { 
-        const int t = 7;
+     if (Lines > 0) {
+        const int t = 6;
         int w = MenuColumns - t;
-        Write(0, 1, EIT.GetRunningTime(), clrYellow, clrBackground); 
-        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetRunningTitle()); 
-        Write(t, 1, buffer, clrCyan, clrBackground); 
-        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetRunningSubtitle()); 
-        Write(t, 2, buffer, clrCyan, clrBackground); 
-        Write(0, 3, EIT.GetNextTime(), clrYellow, clrBackground); 
-        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetNextTitle()); 
-        Write(t, 3, buffer, clrCyan, clrBackground); 
-        snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetNextSubtitle()); 
-        Write(t, 4, buffer, clrCyan, clrBackground); 
+        int l = 1;
+        if (*RunningTitle) {
+           Write(0, l, EIT.GetRunningTime(), clrYellow, clrBackground);
+           snprintf(buffer, BufSize, "%.*s", w, RunningTitle);    Write(t, l, buffer, clrCyan, clrBackground);
+           l++;
+           }
+        if (*RunningSubtitle) {
+           snprintf(buffer, BufSize, "%.*s", w, RunningSubtitle); Write(t, l, buffer, clrCyan, clrBackground);
+           l++;
+           }
+        if (*NextTitle) {
+           Write(0, l, EIT.GetNextTime(), clrYellow, clrBackground);
+           snprintf(buffer, BufSize, "%.*s", w, NextTitle);       Write(t, l, buffer, clrCyan, clrBackground);
+           l++;
+           }
+        if (*NextSubtitle) {
+           snprintf(buffer, BufSize, "%.*s", w, NextSubtitle);    Write(t, l, buffer, clrCyan, clrBackground);
+           }
         }
-     if (Wait(5, true) == kOk)
+     eKeys Key = Wait(5, true);
+     if (Key == kOk)
         GetKey();
      Close();
+     return Key;
      }
+  return kNone;
 }
 
 void cInterface::DisplayRecording(int Index, bool On)
diff --git a/interface.h b/interface.h
index 2a1c1560f..4503dc65c 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.9 2000/05/06 15:39:23 kls Exp $
+ * $Id: interface.h 1.11 2000/09/10 10:35:46 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -34,7 +34,7 @@ class cInterface {
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void SetCols(int *c);
   void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  void WriteText(int x, int y, const char *s, bool Current = false);
+  void WriteText(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBlack);
   void Title(const char *s);
   void Status(const char *s, eDvbColor FgColor = clrBlack, eDvbColor BgColor = clrCyan);
   void Info(const char *s);
@@ -42,7 +42,7 @@ class cInterface {
   bool Confirm(const char *s);
   void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
-  void DisplayChannel(int Number, const char *Name = NULL);
+  eKeys DisplayChannel(int Number, const char *Name = NULL, bool WithInfo = false);
   void DisplayRecording(int Index, bool On);
   bool Recording(void);
   };
diff --git a/menu.c b/menu.c
index 15c8379a0..ad803cf42 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.22 2000/08/06 07:02:52 kls Exp $
+ * $Id: menu.c 1.26 2000/09/10 15:06:15 kls Exp $
  */
 
 #include "menu.h"
@@ -145,7 +145,7 @@ class cMenuEditChanItem : public cMenuEditIntItem {
   };
 
 cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
-:cMenuEditIntItem(Name, Value, 1, Channels.Count())
+:cMenuEditIntItem(Name, Value, 1, Channels.MaxNumber())
 {
   Set();
 }
@@ -153,7 +153,7 @@ cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
 void cMenuEditChanItem::Set(void)
 {
   char buf[255];
-  cChannel *channel = Channels.Get(*value - 1);
+  cChannel *channel = Channels.GetByNumber(*value);
   if (channel)
      snprintf(buf, sizeof(buf), "%d %s", *value, channel->name);
   else
@@ -547,13 +547,18 @@ cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
 {
   index = Index;
   channel = Channel;
+  if (channel->groupSep)
+     SetColor(clrWhite, clrBlue);
   Set();
 }
 
 void cMenuChannelItem::Set(void)
 {
   char *buffer = NULL;
-  asprintf(&buffer, "%d\t%s", index + 1, channel->name); // user visible channel numbers start with '1'
+  if (!channel->groupSep)
+     asprintf(&buffer, "%d\t%s", channel->number, channel->name );
+  else
+     asprintf(&buffer, "\t%s", channel->name); 
   SetText(buffer, false);
 }
 
@@ -583,9 +588,10 @@ cMenuChannels::cMenuChannels(void)
   //TODO
   int i = 0;
   cChannel *channel;
+  int curr = ((channel = Channels.GetByNumber(CurrentChannel)) != NULL) ? channel->Index() : -1;
 
   while ((channel = Channels.Get(i)) != NULL) {
-        Add(new cMenuChannelItem(i, channel), i == CurrentChannel);
+        Add(new cMenuChannelItem(i, channel), i == curr);
         i++;
         }
   SetHelp("Edit", "New", "Delete", "Mark");
@@ -613,9 +619,10 @@ eOSState cMenuChannels::New(void)
      return osContinue;
   cChannel *channel = new cChannel(Channels.Get(Current()));
   Channels.Add(channel);
+  Channels.ReNumber();
   Add(new cMenuChannelItem(channel->Index()/*XXX*/, channel), true);
   Channels.Save();
-  isyslog(LOG_INFO, "channel %d added", channel->Index() + 1);
+  isyslog(LOG_INFO, "channel %d added", channel->number);
   return AddSubMenu(new cMenuEditChannel(Current()));
 }
 
@@ -623,28 +630,30 @@ eOSState cMenuChannels::Del(void)
 {
   if (Count() > 0) {
      int Index = Current();
+     cChannel *channel = Channels.Get(Index);
+     int DeletedChannel = channel->number;
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
-         if (ti->channel == Index + 1) {
+         if (ti->channel == DeletedChannel) {
             Interface.Error("Channel is being used by a timer!");
             return osContinue;
             }
          }
      if (Interface.Confirm("Delete Channel?")) {
         // Move and renumber the channels:
-        Channels.Del(Channels.Get(Index));
+        Channels.Del(channel);
+        Channels.ReNumber();
         cOsdMenu::Del(Index);
         int i = 0;
         for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
             ci->SetIndex(i++);
         Channels.Save();
-        isyslog(LOG_INFO, "channel %d deleted", Index + 1);
+        isyslog(LOG_INFO, "channel %d deleted", DeletedChannel);
         // Fix the timers:
         bool TimersModified = false;
-        Index++; // user visible channel numbers start with '1'
         for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
             int OldChannel = ti->channel;
-            if (ti->channel > Index)
+            if (ti->channel > DeletedChannel)
                ti->channel--;
             if (ti->channel != OldChannel) {
                TimersModified = true;
@@ -661,25 +670,28 @@ eOSState cMenuChannels::Del(void)
 
 void cMenuChannels::Move(int From, int To)
 {
+  int FromNumber = Channels.Get(From)->number;
+  int ToNumber = Channels.Get(To)->number;
   // Move and renumber the channels:
   Channels.Move(From, To);
+  Channels.ReNumber();
   cOsdMenu::Move(From, To);
   int i = 0;
   for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
       ci->SetIndex(i++);
   Channels.Save();
-  isyslog(LOG_INFO, "channel %d moved to %d", From + 1, To + 1);
+  isyslog(LOG_INFO, "channel %d moved to %d", FromNumber, ToNumber);
   // Fix the timers:
   bool TimersModified = false;
   From++; // user visible channel numbers start with '1'
   To++;
   for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
       int OldChannel = ti->channel;
-      if (ti->channel == From)
-         ti->channel = To;
-      else if (ti->channel > From && ti->channel <= To)
+      if (ti->channel == FromNumber)
+         ti->channel = ToNumber;
+      else if (ti->channel > FromNumber && ti->channel <= ToNumber)
          ti->channel--;
-      else if (ti->channel < From && ti->channel >= To)
+      else if (ti->channel < FromNumber && ti->channel >= ToNumber)
          ti->channel++;
       if (ti->channel != OldChannel) {
          TimersModified = true;
@@ -791,7 +803,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      if (Key == kOk) {
         if (!*data.file)
-           strcpy(data.file, cChannel::GetChannelName(data.channel - 1));
+           strcpy(data.file, Channels.GetChannelNameByNumber(data.channel));
         if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
            *timer = data;
            Timers.Save();
@@ -1059,6 +1071,41 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuSetup ------------------------------------------------------------
+
+class cMenuSetup : public cOsdMenu {
+private:
+  cSetup data;
+public:
+  cMenuSetup(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuSetup::cMenuSetup(void)
+:cOsdMenu("Setup", 20)
+{
+  data = Setup;
+  Add(new cMenuEditIntItem( "PrimaryDVB",         &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
+  Add(new cMenuEditBoolItem("ShowInfoOnChSwitch", &data.ShowInfoOnChSwitch));
+  Add(new cMenuEditBoolItem("MenuScrollPage",     &data.MenuScrollPage));
+}
+
+eOSState cMenuSetup::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
+                 Setup = data;
+                 Setup.Save();
+                 break;
+       default: break;
+       }
+     }
+  return state;
+}
+
 // --- cMenuMain -------------------------------------------------------------
 
 #define STOP_RECORDING "Stop recording "
@@ -1069,6 +1116,7 @@ cMenuMain::cMenuMain(bool Replaying)
   Add(new cOsdItem("Channels",   osChannels));
   Add(new cOsdItem("Timer",      osTimer));
   Add(new cOsdItem("Recordings", osRecordings));
+  Add(new cOsdItem("Setup",      osSetup));
   if (Replaying)
      Add(new cOsdItem("Stop replaying", osStopReplay));
   const char *s = NULL;
@@ -1091,6 +1139,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osChannels:   return AddSubMenu(new cMenuChannels);
     case osTimer:      return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
+    case osSetup:      return AddSubMenu(new cMenuSetup);
     case osStopRecord: if (Interface.Confirm("Stop Recording?")) {
                           cOsdItem *item = Get(Current());
                           if (item) {
@@ -1113,6 +1162,60 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cDirectChannelSelect --------------------------------------------------
+
+#define DIRECTCHANNELTIMEOUT 500 //ms
+
+cDirectChannelSelect::cDirectChannelSelect(eKeys FirstKey)
+:cOsdBase(true)
+{
+  oldNumber = CurrentChannel;
+  number = 0;
+  lastTime = time_ms();
+  Interface.Open(MenuColumns, 1);
+  ProcessKey(FirstKey);
+}
+
+cDirectChannelSelect::~cDirectChannelSelect()
+{
+  if (number < 0)
+     Interface.DisplayChannel(oldNumber);
+  Interface.Close();
+}
+
+eOSState cDirectChannelSelect::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
+         if (number >= 0) {
+            number = number * 10 + Key - k0;
+            cChannel *channel = Channels.GetByNumber(number);
+            char *Name = channel ? channel->name : "*** Invalid Channel ***";
+            int BufSize = MenuColumns + 1;
+            char buffer[BufSize];
+            snprintf(buffer, BufSize, "%d  %s", number, Name);
+            Interface.DisplayChannel(number);
+            Interface.Clear();
+            Interface.Write(0, 0, buffer);
+            lastTime = time_ms();
+            if (!channel) {
+               number = -1;
+               lastTime += 1000;
+               }
+            }
+         break;
+    case kNone:
+         if (time_ms() - lastTime > DIRECTCHANNELTIMEOUT) {
+            if (number > 0 && !Channels.SwitchTo(number))
+               number = -1;
+            }
+         else
+            break;
+    default: return osEnd;
+    };
+  return osContinue;
+}
+
 // --- cRecordControl --------------------------------------------------------
 
 cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
@@ -1125,10 +1228,10 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
      timer = new cTimer(true);
      Timers.Add(timer);
      Timers.Save();
-     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s on %d" : "%s", cChannel::GetChannelName(timer->channel - 1), dvbApi->Index() + 1);
+     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s on %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->Index() + 1);
      }
   timer->SetRecording(true);
-  cChannel::SwitchTo(timer->channel - 1, dvbApi);
+  Channels.SwitchTo(timer->channel, dvbApi);
   cRecording Recording(timer);
   if (dvbApi->StartRecord(Recording.FileName()))
      Recording.WriteSummary();
@@ -1172,8 +1275,8 @@ cRecordControl *cRecordControls::RecordControls[MAXDVBAPI] = { NULL };
 
 bool cRecordControls::Start(cTimer *Timer)
 {
-  int ch = Timer ? Timer->channel - 1 : CurrentChannel;
-  cChannel *channel = Channels.Get(ch);
+  int ch = Timer ? Timer->channel : CurrentChannel;
+  cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
      cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca);
@@ -1186,10 +1289,10 @@ bool cRecordControls::Start(cTimer *Timer)
             }
         }
      else
-        esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch + 1);
+        esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch);
      }
   else
-     esyslog(LOG_ERR, "ERROR: channel %d not defined!", ch + 1);
+     esyslog(LOG_ERR, "ERROR: channel %d not defined!", ch);
   return false;
 }
 
diff --git a/menu.h b/menu.h
index 6ba080cb2..8b4f82efe 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.9 2000/05/01 15:16:23 kls Exp $
+ * $Id: menu.h 1.10 2000/09/10 14:42:20 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -23,6 +23,17 @@ class cMenuMain : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
   
+class cDirectChannelSelect : public cOsdBase {
+private:
+  int oldNumber;
+  int number;
+  int lastTime;
+public:
+  cDirectChannelSelect(eKeys FirstKey);
+  virtual ~cDirectChannelSelect();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cRecordControl {
 private:
   cDvbApi *dvbApi;
diff --git a/osd.c b/osd.c
index 3c323738b..e1c99b44b 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.5 2000/07/26 17:35:09 kls Exp $
+ * $Id: osd.c 1.7 2000/09/10 08:24:50 kls Exp $
  */
 
 #include "osd.h"
@@ -19,6 +19,9 @@ cOsdItem::cOsdItem(eOSState State)
   offset = -1;
   state = State;
   fresh = false;
+  userColor = false;
+  fgColor = clrWhite;
+  bgColor = clrBackground;
 }
 
 cOsdItem::cOsdItem(char *Text, eOSState State)
@@ -27,6 +30,9 @@ cOsdItem::cOsdItem(char *Text, eOSState State)
   offset = -1;
   state = State;
   fresh = false;
+  userColor = false;
+  fgColor = clrWhite;
+  bgColor = clrBackground;
   SetText(Text);
 }
 
@@ -41,15 +47,24 @@ void cOsdItem::SetText(const char *Text, bool Copy)
   text = Copy ? strdup(Text) : Text;
 }
 
-void cOsdItem::Display(int Offset, bool Current)
+void cOsdItem::SetColor(eDvbColor FgColor, eDvbColor BgColor)
 {
+  userColor = true;
+  fgColor = FgColor; 
+  bgColor = BgColor; 
+}
+
+void cOsdItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
+{
+  if (Offset < 0) {
+     FgColor = clrBlack;
+     BgColor = clrCyan;
+     }
   fresh |= Offset >= 0;
-  Current |= Offset < 0;
   if (Offset >= 0)
      offset = Offset;
-  //TODO current if Offset == -1 ???
   if (offset >= 0)
-     Interface.WriteText(0, offset + 2, text, Current);
+     Interface.WriteText(0, offset + 2, text, userColor ? fgColor : FgColor, userColor ? bgColor : BgColor);
 }
 
 eOSState cOsdItem::ProcessKey(eKeys Key)
@@ -100,6 +115,10 @@ void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, c
   helpGreen  = Green;
   helpYellow = Yellow;
   helpBlue   = Blue;
+  if (visible)
+     Display();
+     //XXX Interface.Help(helpRed, helpGreen, helpYellow, helpBlue);
+     //XXX must clear unused button areas!
 }
 
 void cOsdMenu::Del(int Index)
@@ -140,7 +159,7 @@ void cOsdMenu::Display(void)
      for (int i = first; i < count; i++) {
          cOsdItem *item = Get(i);
          if (item)
-            item->Display(i - first, i == current);
+            item->Display(i - first, i == current ? clrBlack : clrWhite, i == current ? clrCyan : clrBackground);
          if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
             break;
          }
@@ -159,49 +178,62 @@ void cOsdMenu::DisplayCurrent(bool Current)
 {
   cOsdItem *item = Get(current);
   if (item)
-     item->Display(current - first, Current);
+     item->Display(current - first, Current ? clrBlack : clrWhite, Current ? clrCyan : clrBackground);
+}
+
+bool cOsdMenu::SpecialItem(int idx)
+{
+  cOsdItem *item = Get(idx);
+  return item && item->HasUserColor();
 }
 
 void cOsdMenu::CursorUp(void)
 {
   if (current > 0) {
-     DisplayCurrent(false);
-     if (current == first) {
-        first -= MAXOSDITEMS;
-        if (first < 0)
-           first = 0;
-        if (current - MAXOSDITEMS > 0)
-           current -= MAXOSDITEMS;
-        else
-           current--;
+     int tmpCurrent = current;
+     while (--tmpCurrent >= 0 && SpecialItem(tmpCurrent));
+     if (tmpCurrent < 0)
+        return;
+     if (tmpCurrent >= first)
+        DisplayCurrent(false);
+     current = tmpCurrent;
+     if (current < first) {
+        first = first > MAXOSDITEMS - 1 ? first - (MAXOSDITEMS - 1) : 0;
+        if (Setup.MenuScrollPage)
+           current = SpecialItem(first) ? first + 1 : first;
         Display();
         }
-     else {
-        current--;
+     else
         DisplayCurrent(true);
-        }
      }
 }
 
 void cOsdMenu::CursorDown(void)
 {
-  int count = Count();
-  if (current < count - 1) {
-     DisplayCurrent(false);
-     if (current == first + MAXOSDITEMS - 1) {
-        first += MAXOSDITEMS;
-        if (first > count - MAXOSDITEMS)
-           first = count - MAXOSDITEMS;
-        if (current + MAXOSDITEMS < count)
-           current += MAXOSDITEMS;
-        else
-           current++;
+  int last = Count() - 1;
+  int lastOnScreen = first + MAXOSDITEMS - 1;
+
+  if (current < last) {
+     int tmpCurrent = current;
+     while (++tmpCurrent <= last && SpecialItem(tmpCurrent));
+     if (tmpCurrent > last)
+        return;
+     if (tmpCurrent <= lastOnScreen)
+        DisplayCurrent(false);
+     current = tmpCurrent;
+     if (current > lastOnScreen) {
+        first += MAXOSDITEMS - 1;
+        lastOnScreen = first + MAXOSDITEMS - 1;
+        if (lastOnScreen > last) {
+           first = last - (MAXOSDITEMS - 1);
+           lastOnScreen = last;
+           }
+        if (Setup.MenuScrollPage)
+           current = SpecialItem(lastOnScreen) ? lastOnScreen - 1 : lastOnScreen;
         Display();
         }
-     else {
-        current++;
+     else
         DisplayCurrent(true);
-        }
      }
 }
 
diff --git a/osd.h b/osd.h
index 1d4f4cf0b..876c87cfc 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.9 2000/05/27 15:35:41 kls Exp $
+ * $Id: osd.h 1.11 2000/09/10 09:50:38 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -22,10 +22,12 @@ enum eOSState { osUnknown,
                 osChannels,
                 osTimer,
                 osRecordings,
+                osSetup,
                 osRecord,
                 osReplay,
                 osStopRecord,
                 osStopReplay,
+                osSwitchDvb,
                 osBack,
                 osEnd,
               };
@@ -37,13 +39,17 @@ class cOsdItem : public cListObject {
   eOSState state;
 protected:
   bool fresh;
+  bool userColor;
+  eDvbColor fgColor, bgColor; 
 public:
   cOsdItem(eOSState State = osUnknown);
   cOsdItem(char *Text, eOSState State = osUnknown);
   virtual ~cOsdItem();
+  bool HasUserColor(void) { return userColor; }
   void SetText(const char *Text, bool Copy = true);
+  void SetColor(eDvbColor FgColor, eDvbColor BgColor = clrBackground);
   const char *Text(void) { return text; }
-  void Display(int Offset = -1, bool Current = false);
+  void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   virtual void Set(void) {}
   virtual eOSState ProcessKey(eKeys Key);
   };
@@ -68,6 +74,7 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   const char *status;
 protected:
   bool visible;
+  bool SpecialItem(int idx);
   void RefreshCurrent(void);
   void DisplayCurrent(bool Current);
   void CursorUp(void);
diff --git a/setup.conf b/setup.conf
new file mode 100644
index 000000000..e80c2e0c2
--- /dev/null
+++ b/setup.conf
@@ -0,0 +1,4 @@
+# VDR Setup
+PrimaryDVB         = 1
+ShowInfoOnChSwitch = 1
+MenuScrollPage     = 1
diff --git a/svdrp.c b/svdrp.c
index 01e9fb7bf..2af3ee537 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.5 2000/08/26 12:51:51 kls Exp $
+ * $Id: svdrp.c 1.6 2000/09/09 10:51:21 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -279,24 +279,24 @@ void cSVDRP::CmdChan(const char *Option)
   if (*Option) {
      int n = -1;
      if (isnumber(Option)) {
-        int o = strtol(Option, NULL, 10) - 1;
-        if (o >= 0 && o < Channels.Count())
+        int o = strtol(Option, NULL, 10);
+        if (o >= 1 && o <= Channels.MaxNumber())
            n = o;
         }
      else if (strcmp(Option, "-") == 0) {
         n = CurrentChannel;
-        if (CurrentChannel > 0)
+        if (CurrentChannel > 1)
            n--;
         }
      else if (strcmp(Option, "+") == 0) {
         n = CurrentChannel;
-        if (CurrentChannel < Channels.Count() - 1)
+        if (CurrentChannel < Channels.MaxNumber())
            n++;
         }
      else {
-        int i = 0;
+        int i = 1;
         cChannel *channel;
-        while ((channel = Channels.Get(i)) != NULL) {
+        while ((channel = Channels.GetByNumber(i)) != NULL) {
               if (strcasecmp(channel->name, Option) == 0) {
                  n = i;
                  break;
@@ -312,10 +312,10 @@ void cSVDRP::CmdChan(const char *Option)
         Reply(550, "Can't switch channel, interface is recording");
         return;
         }
-     cChannel *channel = Channels.Get(n);
+     cChannel *channel = Channels.GetByNumber(n);
      if (channel) {
         if (!channel->Switch()) {
-           Reply(554, "Error switching to channel \"%d\"", channel->Index() + 1);
+           Reply(554, "Error switching to channel \"%d\"", channel->number);
            return;
            }
         }
@@ -324,9 +324,9 @@ void cSVDRP::CmdChan(const char *Option)
         return;
         }
      }
-  cChannel *channel = Channels.Get(CurrentChannel);
+  cChannel *channel = Channels.GetByNumber(CurrentChannel);
   if (channel)
-     Reply(250, "%d %s", CurrentChannel + 1, channel->name);
+     Reply(250, "%d %s", CurrentChannel, channel->name);
   else
      Reply(550, "Unable to find channel \"%d\"", CurrentChannel);
 }
@@ -394,41 +394,41 @@ void cSVDRP::CmdLstc(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cChannel *channel = Channels.Get(strtol(Option, NULL, 10) - 1);
+        cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
         if (channel)
-           Reply(250, "%d %s", channel->Index() + 1, channel->ToText());
+           Reply(250, "%d %s", channel->number, channel->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
      else {
-        int i = 0;
+        int i = 1;
         cChannel *next = NULL;
-        while (i < Channels.Count()) {
-              cChannel *channel = Channels.Get(i);
+        while (i <= Channels.MaxNumber()) {
+              cChannel *channel = Channels.GetByNumber(i);
               if (channel) {
                  if (strcasestr(channel->name, Option)) {
                     if (next)
-                       Reply(-250, "%d %s", next->Index() + 1, next->ToText());
+                       Reply(-250, "%d %s", next->number, next->ToText());
                     next = channel;
                     }
                  }
               else {
-                 Reply(501, "Channel \"%d\" not found", i + 1);
+                 Reply(501, "Channel \"%d\" not found", i);
                  return;
                  }
               i++;
               }
         if (next)
-           Reply(250, "%d %s", next->Index() + 1, next->ToText());
+           Reply(250, "%d %s", next->number, next->ToText());
         }
      }
   else {
-     for (int i = 0; i < Channels.Count(); i++) {
-         cChannel *channel = Channels.Get(i);
+     for (int i = 1; i <= Channels.MaxNumber(); i++) {
+         cChannel *channel = Channels.GetByNumber(i);
         if (channel)
-           Reply(i < Channels.Count() - 1 ? -250 : 250, "%d %s", channel->Index() + 1, channel->ToText());
+           Reply(i < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->number, channel->ToText());
         else
-           Reply(501, "Channel \"%d\" not found", i + 1);
+           Reply(501, "Channel \"%d\" not found", i);
          }
      }
 }
@@ -464,7 +464,7 @@ void cSVDRP::CmdModc(const char *Option)
      int n = strtol(Option, &tail, 10);
      if (tail && tail != Option) {
         tail = skipspace(tail);
-        cChannel *channel = Channels.Get(n - 1);
+        cChannel *channel = Channels.GetByNumber(n);
         if (channel) {
            cChannel c = *channel;
            if (!c.Parse(tail)) {
@@ -473,8 +473,8 @@ void cSVDRP::CmdModc(const char *Option)
               }
            *channel = c;
            Channels.Save();
-           isyslog(LOG_INFO, "channel %d modified", channel->Index() + 1);
-           Reply(250, "%d %s", channel->Index() + 1, channel->ToText());
+           isyslog(LOG_INFO, "channel %d modified", channel->number);
+           Reply(250, "%d %s", channel->number, channel->ToText());
            }
         else
            Reply(501, "Channel \"%d\" not defined", n);
@@ -537,9 +537,10 @@ void cSVDRP::CmdNewc(const char *Option)
      cChannel *channel = new cChannel;
      if (channel->Parse(Option)) {
         Channels.Add(channel);
+        Channels.ReNumber();
         Channels.Save();
-        isyslog(LOG_INFO, "channel %d added", channel->Index() + 1);
-        Reply(250, "%d %s", channel->Index() + 1, channel->ToText());
+        isyslog(LOG_INFO, "channel %d added", channel->number);
+        Reply(250, "%d %s", channel->number, channel->ToText());
         }
      else
         Reply(501, "Error in channel settings");
diff --git a/timers.conf b/timers.conf
index 733fb9c28..9031d35db 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,11 +1,12 @@
+1:15:M------:2128:2205:99:7:Neues:
+1:3:-T-----:2013:2125:99:99:SevenDays
 1:10:-T-----:2058:2202:99:10:Quarks:
-1:26:-T-----:2203:0015:99:99:UFO:
+1:26:-T-----:2255:0005:99:99:UFO:
 0:3:---T---:2211:2300:99:10:Switch:
 1:2:----F--:2140:2225:10:10:WWW:
-1:15:-----S-:1358:1435:99:7:Neues:
-1:1:-----S-:1445:1610:99:30:Hammerman:
-0:11:-----S-:2158:2235:99:99:Computer:
+1:11:-----S-:2158:2235:99:99:Computer:
 1:2:-----S-:2213:2320:99:30:Wochenshow:
 1:11:------S:2058:2120:99:10:Centauri:
 1:15:MTWTF--:1828:1901:10:5:nano:
-1:1:-TWTF--:0855:0945:99:99:Ellen:
+1:1:-TWTF--:0955:1040:99:99:Ellen:
+1:1:MTWTF--:1553:1710:99:99:Hammerman:
diff --git a/tools.c b/tools.c
index 0dca69ee3..e081ee793 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.13 2000/07/29 18:41:45 kls Exp $
+ * $Id: tools.c 1.14 2000/09/09 12:53:34 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -97,6 +97,14 @@ char *readline(FILE *f)
   return NULL;
 }
 
+char *strn0cpy(char *dest, const char *src, size_t n)
+{
+  char *s = dest;
+  for ( ; --n && (*dest = *src) != 0; dest++, src++) ;
+  *dest = 0;
+  return s;
+}
+
 char *strreplace(char *s, char c1, char c2)
 {
   char *p = s;
@@ -418,6 +426,8 @@ void cListBase::Clear(void)
 
 cListObject *cListBase::Get(int Index)
 {
+  if (Index < 0)
+     return NULL;
   cListObject *object = objects;
   while (object && Index-- > 0)
         object = object->Next();
diff --git a/tools.h b/tools.h
index 563f3d065..1ef955c55 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.12 2000/07/29 10:56:00 kls Exp $
+ * $Id: tools.h 1.13 2000/09/09 12:53:10 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -38,6 +38,7 @@ bool readint(int filedes, int &n);
 int readstring(int filedes, char *buffer, int size, bool wait = false);
 void purge(int filedes);
 char *readline(FILE *f);
+char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
 char *skipspace(char *s);
 int time_ms(void);
diff --git a/vdr.c b/vdr.c
index 69eceedb2..4932bf23c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.27 2000/07/29 19:01:57 kls Exp $
+ * $Id: vdr.c 1.30 2000/09/10 14:33:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -44,8 +44,6 @@
 #define KEYS_CONF "keys.conf"
 #endif
 
-#define DIRECTCHANNELTIMEOUT 500 //ms
-
 static int Interrupted = 0;
 
 void SignalHandler(int signum)
@@ -156,6 +154,7 @@ int main(int argc, char *argv[])
 
   // Configuration data:
 
+  Setup.Load("setup.conf");
   Channels.Load("channels.conf");
   Timers.Load("timers.conf");
 #ifdef REMOTE_LIRC
@@ -166,7 +165,9 @@ int main(int argc, char *argv[])
 #endif
   Interface.Init();
 
-  cChannel::SwitchTo(CurrentChannel);
+  cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
+
+  Channels.SwitchTo(CurrentChannel);
 
   // Signal handlers:
 
@@ -177,27 +178,17 @@ int main(int argc, char *argv[])
   // Main program loop:
 
   cSVDRP *SVDRP = SVDRPport ? new cSVDRP(SVDRPport) : NULL;
-  cMenuMain *Menu = NULL;
+  cOsdBase *Menu = NULL;
   cReplayControl *ReplayControl = NULL;
-  int dcTime = 0, dcNumber = 0;
   int LastChannel = -1;
 
   while (!Interrupted) {
         // Channel display:
         if (CurrentChannel != LastChannel) {
-           if (!Menu) {
-              cChannel *channel = Channels.Get(CurrentChannel);
-              if (channel)
-                 Interface.DisplayChannel(CurrentChannel + 1, channel->name);
-              }
+           if (!Menu)
+              Channels.ShowChannel(CurrentChannel, LastChannel > 0);
            LastChannel = CurrentChannel;
            }
-        // Direct Channel Select (action):
-        if (dcNumber && time_ms() - dcTime > DIRECTCHANNELTIMEOUT) {
-           cChannel::SwitchTo(dcNumber - 1);
-           dcNumber = 0;
-           LastChannel = -1; // in case an invalid channel number was entered!
-           }
         // Timers and Recordings:
         if (!Menu) {
            cTimer *Timer = cTimer::GetMatch();
@@ -209,7 +200,7 @@ int main(int argc, char *argv[])
            cRecordControls::Process();
            }
         // User Input:
-        cOsdBase **Interact = Menu ? (cOsdBase **)&Menu : (cOsdBase **)&ReplayControl;
+        cOsdBase **Interact = Menu ? &Menu : (cOsdBase **)&ReplayControl;
         eKeys key = Interface.GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
         if (*Interact) {
            switch ((*Interact)->ProcessKey(key)) {
@@ -228,6 +219,11 @@ int main(int argc, char *argv[])
                             DELETENULL(*Interact);
                             DELETENULL(ReplayControl);
                             break;
+             case osSwitchDvb:
+                            DELETENULL(*Interact);
+                            Interface.Info("Switching primary DVB...");
+                            cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
+                            break;
              case osBack:
              case osEnd:    DELETENULL(*Interact);
                             break;
@@ -236,21 +232,30 @@ int main(int argc, char *argv[])
            }
         else {
            switch (key) {
-             // Direct Channel Select (input):
+             // Direct Channel Select:
              case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
-                  {
-                    if (!Interface.Recording()) {
-                       dcNumber = dcNumber * 10 + key - k0;
-                       dcTime = time_ms();
-                       Interface.DisplayChannel(dcNumber);
-                       }
-                  }
+                  if (!Interface.Recording())
+                     Menu = new cDirectChannelSelect(key);
                   break;
+             // Left/Right rotates trough channel groups:
+             case kLeft:
+             case kRight: if (!Interface.Recording()) {
+                             int SaveGroup = CurrentGroup;
+                             if (key == kRight)
+                                CurrentGroup = Channels.GetNextGroup(CurrentGroup) ; 
+                             else
+                                CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
+                             if (CurrentGroup < 0)
+                                CurrentGroup = SaveGroup;
+                             if (Channels.ShowChannel(CurrentGroup, false, true) == kOk)
+                                Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(CurrentGroup))->number);
+                             }
+                          break;
              // Up/Down Channel Select:
              case kUp:
              case kDown: if (!Interface.Recording()) {
                             int n = CurrentChannel + (key == kUp ? 1 : -1);
-                            cChannel *channel = Channels.Get(n);
+                            cChannel *channel = Channels.GetByNumber(n);
                             if (channel)
                                channel->Switch();
                             }

From 7e4b4d290570aee1d24241b0e0ac10e7c8148a36 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Wed, 20 Sep 2000 18:00:00 +0200
Subject: [PATCH 011/307] Version 0.64 - NOTE: If you are using DVB driver
 version 0.7 you need to load the dvb.o   module with option outstream=0, so
 your insmod statement should read   'insmod dvb.o outstream=0'. This is
 currently necessary because 'vdr'   still works with AV_PES data. - Video
 files now have the 'group read' bit set. - Fixed handling errors in
 'readstring()'. - Handling SIGPIPE and re-establishing handler after
 intercepting a signal. - The configuration files are now by default read from
 the video directory.   This can be changed by using the new '-c' option. Make
 sure you copy your   current '*.conf' files to your video directory ('/video'
 by default), or   use "-c ." to get the old behaviour of loading the
 configuration files   from the current directory. - Waiting for input is now
 handled by a common function, which improves   response time on user actions.
 As a consequence the EIT data may sometimes   not be displayed, but this will
 change later when cEIT runs as a separate   thread. - The new SVDRP command
 'HITK' (thanks to Guido Fiala!) can be used to 'hit'   a remote control key. 
 Establish an SVDRP connection and enter HITK without   a parameter for a list
 of all valid key names. - The new SVDRP command 'GRAB' (thanks to Guido
 Fiala!) can be used to grab   the current frame and save it to a file. - The
 new SVDRP commands 'OVL*' can be used to control video overlays (thanks   to
 Guido Fiala!). This is mainly for use in the 'kvdr' tool (see the 'kvdr'  
 page at http://www.s.netic.de/gfiala). - If the name of the video directory
 used with the '-v' option had trailing   slashes, the recording file names
 have been damaged. Trailing slashes are   now silently removed. - Fixed a
 buffer overflow in EIT parsing. - Added a security warning regarding SVDRP to
 the INSTALL file. - Fixed 'confirm' dialog. - The daemon mode (option '-d')
 now no longer works with REMOTE=KBD (there   is no stdin in daemon mode, so
 KBD makes no sense - plus it sometimes   crashed).

---
 CONTRIBUTORS |   3 +
 HISTORY      |  37 ++++++-
 INSTALL      |  32 ++++--
 Makefile     |  24 ++---
 TODO         |   1 -
 config.c     |  18 +++-
 config.h     |   5 +-
 dvbapi.c     | 268 ++++++++++++++++++++++++++++++++++++++++++++++--
 dvbapi.h     |  27 ++++-
 eit.c        |  19 ++--
 interface.c  |  35 ++++---
 interface.h  |   8 +-
 menu.c       |   4 +-
 remote.c     |  60 +++++------
 remote.h     |  17 ++--
 svdrp.c      | 280 ++++++++++++++++++++++++++++++++++++++++++++-------
 svdrp.h      |  41 +++++---
 timers.conf  |  12 ++-
 tools.c      | 157 ++++++++++++++++++++++-------
 tools.h      |  26 ++++-
 vdr.c        |  44 ++++----
 videodir.c   |   4 +-
 22 files changed, 890 insertions(+), 232 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9f6aa1b55..03fd4bc0f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -18,6 +18,9 @@ Heino Goldenstein <heino.goldenstein@microplex.de>
 
 Guido Fiala <gfiala@s.netic.de>
  for implementing slow forward/back
+ for implementing the SVDRP command 'HITK'
+ for implementing image grabbing
+ for implementing overlay capabilities (see his 'kvdr' tool at http://www.s.netic.de/gfiala)
 
 Robert Schneider <Robert.Schneider@lotus.com>
  for implementing EIT support for displaying the current/next info
diff --git a/HISTORY b/HISTORY
index dafab3b7c..f8a10078a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -167,4 +167,39 @@ Video Disk Recorder Revision History
 - When directly selecting a channel by entering the channel number, the digits
   entered so far together with the name of that channel are displayed on the
   OSD (suggested by Martin Hammerschmid).
-  
+
+2000-09-20: Version 0.64
+
+- NOTE: If you are using DVB driver version 0.7 you need to load the dvb.o
+  module with option outstream=0, so your insmod statement should read
+  'insmod dvb.o outstream=0'. This is currently necessary because 'vdr'
+  still works with AV_PES data.
+- Video files now have the 'group read' bit set.
+- Fixed handling errors in 'readstring()'.
+- Handling SIGPIPE and re-establishing handler after intercepting a signal.
+- The configuration files are now by default read from the video directory.
+  This can be changed by using the new '-c' option. Make sure you copy your
+  current '*.conf' files to your video directory ('/video' by default), or
+  use "-c ." to get the old behaviour of loading the configuration files
+  from the current directory.
+- Waiting for input is now handled by a common function, which improves
+  response time on user actions. As a consequence the EIT data may sometimes
+  not be displayed, but this will change later when cEIT runs as a separate
+  thread.
+- The new SVDRP command 'HITK' (thanks to Guido Fiala!) can be used to 'hit'
+  a remote control key.  Establish an SVDRP connection and enter HITK without
+  a parameter for a list of all valid key names.
+- The new SVDRP command 'GRAB' (thanks to Guido Fiala!) can be used to grab
+  the current frame and save it to a file.
+- The new SVDRP commands 'OVL*' can be used to control video overlays (thanks
+  to Guido Fiala!). This is mainly for use in the 'kvdr' tool (see the 'kvdr'
+  page at http://www.s.netic.de/gfiala).
+- If the name of the video directory used with the '-v' option had trailing
+  slashes, the recording file names have been damaged. Trailing slashes are
+  now silently removed.
+- Fixed a buffer overflow in EIT parsing.
+- Added a security warning regarding SVDRP to the INSTALL file.
+- Fixed 'confirm' dialog.
+- The daemon mode (option '-d') now no longer works with REMOTE=KBD (there
+  is no stdin in daemon mode, so KBD makes no sense - plus it sometimes
+  crashed).
diff --git a/INSTALL b/INSTALL
index 1ebffa1b3..7b953be5d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,11 @@ you will have to change the definition of DVBDIR in the
 Makefile.
 
 This program requires the card driver version 0.05 or higher
-to work properly.
+to work properly. If you are using driver version 0.7 you need
+to load the dvb.o module with option outstream=0, so your insmod
+statement should read 'insmod dvb.o outstream=0'. This is currently
+necessary because 'vdr' works with AV_PES data and will change
+once it has been modified to work directly with MPEG2.
 
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
@@ -48,6 +52,11 @@ port ("Simple Video Disk Recorder Protocol"). By default, it listens
 on port 2001 (use the --port=PORT option to change this). For details
 about the SVDRP syntax see the source file 'svdrp.c'.
 
+WARNING: DUE TO THE OPEN SVDRP PORT THIS PROGRAM MAY CONSTITUTE A
+=======  POTENTIAL SECURITY HAZARD! IF YOU ARE NOT RUNNING VDR IN
+         A CONTROLLED ENVIRONMENT, YOU MAY WANT TO DISABLE SVDRP
+         BY USING '--port=0'!
+
 If the program shall run as a daemon, use the --daemon option. This
 will completely detach it from the terminal and will continue as a
 background process.
@@ -64,7 +73,9 @@ All recordings are written into directories below "/video". Please
 make sure this directory exists, and that the user who runs the 'vdr'
 program has read and write access to that directory.
 If you prefer a different location for your video files, you can use
-the '-v' option to change that.
+the '-v' option to change that. Please make sure that the directory
+name you use with '-v' is a clean and absolute path name (no '..' or
+multiple slashes).
 
 Note that the file system need not be 64-bit proof, since the 'vdr'
 program splits video files into chunks of about 1GB. You should use
@@ -102,14 +113,15 @@ Configuration files:
 --------------------
 
 There are three configuration files that hold information about
-channels, remote control keys and timers. These files are currrently
-assumed to be located in the directory from which the 'vdr' program
-was started (this will become configurable later). The configuration
-files can be edited with any text editor, or will be written by the
-'vdr' program if any changes are made inside the on-screen menus.
-The meaning of the data entries may still vary in future releases,
-so for the moment please look at the source code (config.c) to see
-the meaning of the various fields.
+channels, remote control keys and timers. By default these files are
+assumed to be located in the video directory, but a different directory
+can be used with the '-c' option.
+
+The configuration files can be edited with any text editor, or will be written
+by the 'vdr' program if any changes are made inside the on-screen menus.
+The meaning of the data entries may still vary in future releases, so for the
+moment please look at the source code (config.c) to see the meaning of the
+various fields.
 
 The files that come with this package contain the author's selections,
 so please make sure you adapt these to your personal taste. Also make sure
diff --git a/Makefile b/Makefile
index 2f00459b5..fef7a6f12 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.9 2000/09/10 08:55:45 kls Exp $
+# $Id: Makefile 1.11 2000/09/20 17:01:57 kls Exp $
 
 DVBDIR   = ../DVB
 
@@ -26,21 +26,21 @@ endif
 
 all: vdr
 
-config.o   : config.c config.h dvbapi.h eit.h interface.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h tools.h videodir.h
-eit.o      : eit.c eit.h
-interface.o: interface.c config.h dvbapi.h eit.h interface.h remote.h tools.h
-menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h tools.h
-osd.o      : osd.c config.h dvbapi.h interface.h osd.h tools.h
-vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
-recording.o: recording.c config.h dvbapi.h interface.h recording.h tools.h videodir.h
-remote.o   : remote.c remote.h tools.h
-svdrp.o    : svdrp.c svdrp.h config.h interface.h tools.h
+config.o   : config.c config.h dvbapi.h eit.h interface.h svdrp.h tools.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h svdrp.h tools.h videodir.h
+eit.o      : eit.c eit.h tools.h
+interface.o: interface.c config.h dvbapi.h eit.h interface.h remote.h svdrp.h tools.h
+menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h
+osd.o      : osd.c config.h dvbapi.h interface.h osd.h svdrp.h tools.h
+recording.o: recording.c config.h dvbapi.h interface.h recording.h svdrp.h tools.h videodir.h
+remote.o   : remote.c config.h dvbapi.h remote.h tools.h
+svdrp.o    : svdrp.c config.h dvbapi.h interface.h svdrp.h tools.h
 tools.o    : tools.c tools.h
+vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
 
 vdr: $(OBJS)
-	g++ -g -O2 $(OBJS) -lncurses -o vdr
+	g++ -g -O2 $(OBJS) -lncurses -ljpeg -o vdr
 
 clean:
 	-rm $(OBJS) vdr
diff --git a/TODO b/TODO
index 09e9a10bc..f2fb5ead2 100644
--- a/TODO
+++ b/TODO
@@ -7,5 +7,4 @@ TODO list for the Video Disk Recorder project
   scenes in order to archive them (or, reversely, cut out
   commercial breaks).
 * Implement channel scanning.
-* Better support for encrypted channels.
 * Implement remaining commands in SVDRP.
diff --git a/config.c b/config.c
index 0a965ee54..e161efd76 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.22 2000/09/10 15:07:15 kls Exp $
+ * $Id: config.c 1.23 2000/09/17 09:11:59 kls Exp $
  */
 
 #include "config.h"
@@ -155,14 +155,22 @@ eKeys cKeys::Get(unsigned int Code)
   return kNone;
 }
 
-unsigned int cKeys::Encode(const char *Command)
+eKeys cKeys::Translate(const char *Command)
 {  
-  if (Command != NULL) {
+  if (Command) {
      const tKey *k = keys;
-     while ((k->type != kNone) && strcmp(k->name, Command) != 0)
+     while ((k->type != kNone) && strcasecmp(k->name, Command) != 0)
            k++;
-     return k->code;
+     return k->type;
      }
+  return kNone;
+}
+
+unsigned int cKeys::Encode(const char *Command)
+{  
+  eKeys k = Translate(Command);
+  if (k != kNone)
+     return keys[k].code;
   return 0;
 }
 
diff --git a/config.h b/config.h
index 30dd9bac2..418fa6303 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.19 2000/09/10 15:05:08 kls Exp $
+ * $Id: config.h 1.21 2000/09/17 09:08:13 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define VDRVERSION "0.63"
+#define VDRVERSION "0.64"
 
 #define MaxBuffer 10000
 
@@ -55,6 +55,7 @@ class cKeys {
   void SetDummyValues(void);
   bool Load(const char *FileName = NULL);
   bool Save(void);
+  eKeys Translate(const char *Command);
   unsigned int Encode(const char *Command);
   eKeys Get(unsigned int Code);
   void Set(eKeys Key, unsigned int Code);
diff --git a/dvbapi.c b/dvbapi.c
index 9f9cbab42..1468de60e 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,14 +4,18 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.24 2000/09/10 10:25:09 kls Exp $
+ * $Id: dvbapi.c 1.27 2000/09/17 12:45:55 kls Exp $
  */
 
 #include "dvbapi.h"
 #include <errno.h>
 #include <fcntl.h>
+extern "C" {
+#include <jpeglib.h>
+}
 #include <stdlib.h>
 #include <sys/ioctl.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -139,7 +143,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
               LOG_ERROR;
            }
         if (Record) {
-           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) >= 0) {
+           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP)) >= 0) {
               if (delta) {
                  esyslog(LOG_ERR, "ERROR: padding index file with %d '0' bytes", delta);
                  while (delta--)
@@ -297,7 +301,7 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
 bool cIndexFile::StoreResume(int Index)
 {
   if (fileName) {
-     int resumeFile = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+     int resumeFile = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
      if (resumeFile >= 0) {
         if (write(resumeFile, &Index, sizeof(Index)) != sizeof(Index))
            LOG_ERROR_STR(fileName);
@@ -315,8 +319,8 @@ char *cIndexFile::Str(int Index, bool WithFrame)
   static char buffer[16];
   int f = (Index % FRAMESPERSEC) + 1;
   int s = (Index / FRAMESPERSEC);
-  int m = s / 60 % 60; 
-  int h = s / 3600; 
+  int m = s / 60 % 60;
+  int h = s / 3600;
   s %= 60;
   snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
   return buffer;
@@ -511,7 +515,7 @@ class cFileBuffer : public cRingBuffer {
   char *fileName, *pFileNumber;
   bool stop;
   int GetAvPesLength(void)
-  { 
+  {
     if (Byte(0) == 'A' && Byte(1) == 'V' && Byte(4) == 'U')
        return (Byte(6) << 8) + Byte(7) + AV_PES_HEADER_LEN;
     return 0;
@@ -751,7 +755,7 @@ int cRecordBuffer::Write(int Max)
   if (n) {
      if (stop && pictureType == I_FRAME) {
         ok = false;
-        return -1; // finish the recording before the next 'I' frame       
+        return -1; // finish the recording before the next 'I' frame
         }
      if (NextFile()) {
         if (index && pictureType != NO_PICTURE)
@@ -801,7 +805,7 @@ class cReplayBuffer : public cFileBuffer {
   void Close(void);
 public:
   cReplayBuffer(int *OutFile, const char *FileName);
-  virtual ~cReplayBuffer();  
+  virtual ~cReplayBuffer();
   virtual int Read(int Max = -1);
   virtual int Write(int Max = -1);
   void SetMode(eReplayMode Mode);
@@ -1065,9 +1069,14 @@ cDvbApi::cDvbApi(const char *FileName)
   if (videoDev < 0)
      LOG_ERROR;
   cols = rows = 0;
+
+  ovlGeoSet = ovlStat = ovlFbSet = false;
+  ovlBrightness = ovlColour = ovlHue = ovlContrast = 32768;
+  ovlClipCount = 0;
+
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   initscr();
-  keypad(stdscr, TRUE);
+  keypad(stdscr, true);
   nonl();
   cbreak();
   noecho();
@@ -1076,7 +1085,7 @@ cDvbApi::cDvbApi(const char *FileName)
 #if defined(DEBUG_OSD)
   memset(&colorPairs, 0, sizeof(colorPairs));
   start_color();
-  leaveok(stdscr, TRUE);
+  leaveok(stdscr, true);
   window = NULL;
 #endif
   lastProgress = lastTotal = -1;
@@ -1089,6 +1098,7 @@ cDvbApi::~cDvbApi()
      Close();
      Stop();
      StopRecord();
+     OvlO(false); //Overlay off!
      close(videoDev);
      }
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
@@ -1187,6 +1197,242 @@ void cDvbApi::Cleanup(void)
   PrimaryDvbApi = NULL;
 }
 
+bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
+{
+  int result = 0;
+  // just do this once?
+  struct video_mbuf mbuf;
+  result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
+  int msize = mbuf.size;
+  // gf: this needs to be a protected member of cDvbApi! //XXX kls: WHY???
+  unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
+  if (!mem || mem == (unsigned char *)-1)
+     return false;
+  // set up the size and RGB
+  struct video_capability vc;
+  result |= ioctl(videoDev, VIDIOCGCAP, &vc);
+  struct video_mmap vm;
+  vm.frame = 0;
+  if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
+      (SizeY > 0) && (SizeY <= vc.maxheight)) {
+     vm.width = SizeX;
+     vm.height = SizeY;
+     }
+  else {
+     vm.width = vc.maxwidth;
+     vm.height = vc.maxheight;
+     }
+  vm.format = VIDEO_PALETTE_RGB24;
+  // this needs to be done every time:
+  result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
+  result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
+  // make RGB out of BGR:
+  int memsize = vm.width * vm.height;
+  unsigned char *mem1 = mem;
+  for (int i = 0; i < memsize; i++) {
+      unsigned char tmp = mem1[2];
+      mem1[2] = mem1[0];
+      mem1[0] = tmp;
+      mem1 += 3;
+      }
+
+  if (Quality < 0)
+     Quality = 255; //XXX is this 'best'???
+
+  isyslog(LOG_INFO, "grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+  FILE *f = fopen(FileName, "wb");
+  if (f) {
+     if (Jpeg) {
+        // write JPEG file:
+        struct jpeg_compress_struct cinfo;
+        struct jpeg_error_mgr jerr;
+        cinfo.err = jpeg_std_error(&jerr);
+        jpeg_create_compress(&cinfo);
+        jpeg_stdio_dest(&cinfo, f);
+        cinfo.image_width = vm.width;
+        cinfo.image_height = vm.height;
+        cinfo.input_components = 3;
+        cinfo.in_color_space = JCS_RGB;
+
+        jpeg_set_defaults(&cinfo);
+        jpeg_set_quality(&cinfo, Quality, true);
+        jpeg_start_compress(&cinfo, true);
+
+        int rs = vm.width * 3;
+        JSAMPROW rp[vm.height];
+        for (int k = 0; k < vm.height; k++)
+            rp[k] = &mem[rs * k];
+        jpeg_write_scanlines(&cinfo, rp, vm.height);
+        jpeg_finish_compress(&cinfo);
+        jpeg_destroy_compress(&cinfo);
+        }
+     else {
+        // write PNM file:
+        if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
+            fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
+           LOG_ERROR_STR(FileName);
+           result |= 1;
+           }
+        }
+     fclose(f);
+     }
+  else {
+     LOG_ERROR_STR(FileName);
+     result |= 1;
+     }
+
+  if (ovlStat && ovlGeoSet) {
+     // switch the Overlay on again (gf: why have i to do anything again?)
+     OvlG(ovlSizeX, ovlSizeY, ovlPosX, ovlPosY);
+     }
+  if (ovlFbSet)
+     OvlP(ovlBrightness, ovlColour, ovlHue, ovlContrast);
+
+  munmap(mem, msize);
+  return result == 0;
+}
+
+bool cDvbApi::OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette)
+{
+  int result = 0;
+  // get the actual X-Server settings???
+  // plausibility-check problem: can't be verified w/o X-server!!!
+  if (SizeX <= 0 || SizeY <= 0 || FbAddr == 0 || Bpp / 8 > 4 ||
+      Bpp / 8 <= 0 || Palette <= 0 || Palette > 13 || ovlClipCount < 0 ||
+      SizeX > 4096 || SizeY > 4096) {
+     ovlFbSet = ovlGeoSet = false;
+     OvlO(false);
+     return false;
+     }
+  else {
+    dsyslog(LOG_INFO, "OvlF: %d %d %x %d %d", SizeX, SizeY, FbAddr, Bpp, Palette);
+    // this is the problematic part!
+    struct video_buffer vb;
+    result |= ioctl(videoDev, VIDIOCGFBUF, &vb);
+    vb.base = (void*)FbAddr;
+    vb.depth = Bpp;
+    vb.height = SizeY;
+    vb.width = SizeX;
+    vb.bytesperline = ((vb.depth + 1) / 8) * vb.width;
+    //now the real thing: setting the framebuffer
+    result |= ioctl(videoDev, VIDIOCSFBUF, &vb);
+    if (result) {
+       ovlFbSet = ovlGeoSet = false;
+       ovlClipCount = 0;
+       OvlO(false);
+       return false;
+       }
+    else {
+       ovlFbSizeX = SizeX;
+       ovlFbSizeY = SizeY;
+       ovlBpp = Bpp;
+       ovlPalette = Palette;
+       ovlFbSet = true;
+       return true;
+      }
+    }
+}
+
+bool cDvbApi::OvlG(int SizeX, int SizeY, int PosX, int PosY)
+{
+  int result = 0;
+  // get the actual X-Server settings???
+  struct video_capability vc;
+  result |= ioctl(videoDev, VIDIOCGCAP, &vc);
+  if (!ovlFbSet)
+     return false;
+  if (SizeX < vc.minwidth || SizeY < vc.minheight ||
+      SizeX > vc.maxwidth || SizeY>vc.maxheight
+//      || PosX > FbSizeX || PosY > FbSizeY
+//         PosX < -SizeX || PosY < -SizeY ||
+     ) {
+     ovlGeoSet = false;
+     OvlO(false);
+     return false;
+     }
+  else {
+     struct video_window vw;
+     result |= ioctl(videoDev, VIDIOCGWIN,  &vw);
+     vw.x = PosX;
+     vw.y = PosY;
+     vw.width = SizeX;
+     vw.height = SizeY;
+     vw.chromakey = ovlPalette;
+     vw.flags = VIDEO_WINDOW_CHROMAKEY; // VIDEO_WINDOW_INTERLACE; //VIDEO_CLIP_BITMAP;
+     vw.clips = ovlClipRects;
+     vw.clipcount = ovlClipCount;
+     result |= ioctl(videoDev, VIDIOCSWIN, &vw);
+     if (result) {
+        ovlGeoSet = false;
+        ovlClipCount = 0;
+        return false;
+        }
+     else {
+        ovlSizeX = SizeX;
+        ovlSizeY = SizeY;
+        ovlPosX = PosX;
+        ovlPosY = PosY;
+        ovlGeoSet = true;
+        ovlStat = true;
+        return true;
+        }
+     }
+}
+
+bool cDvbApi::OvlC(int ClipCount, CRect *cr)
+{
+  if (ovlGeoSet && ovlFbSet) {
+     for (int i = 0; i < ClipCount; i++) {
+         ovlClipRects[i].x = cr[i].x;
+         ovlClipRects[i].y = cr[i].y;
+         ovlClipRects[i].width = cr[i].width;
+         ovlClipRects[i].height = cr[i].height;
+         ovlClipRects[i].next = &(ovlClipRects[i + 1]);
+         }
+     ovlClipCount = ClipCount;
+     //use it:
+     return OvlG(ovlSizeX, ovlSizeY, ovlPosX, ovlPosY);
+     }
+  return false;
+}
+
+bool cDvbApi::OvlP(__u16 Brightness, __u16 Colour, __u16 Hue, __u16 Contrast)
+{
+  int result = 0;
+  ovlBrightness = Brightness;
+  ovlColour = Colour;
+  ovlHue = Hue;
+  ovlContrast = Contrast;
+  struct video_picture vp;
+  if (!ovlFbSet)
+     return false;
+  result |= ioctl(videoDev, VIDIOCGPICT, &vp);
+  vp.brightness = Brightness;
+  vp.colour = Colour;
+  vp.hue = Hue;
+  vp.contrast = Contrast;
+  vp.depth = ovlBpp;
+  vp.palette = ovlPalette; // gf: is this always ok? VIDEO_PALETTE_RGB565;
+  result |= ioctl(videoDev, VIDIOCSPICT, &vp);
+  return result == 0;
+}
+
+bool cDvbApi::OvlO(bool Value)
+{
+  int result = 0;
+  if (!ovlGeoSet && Value)
+     return false;
+  int one = 1;
+  int zero = 0;
+  result |= ioctl(videoDev, VIDIOCCAPTURE, Value ? &one : &zero);
+  ovlStat = Value;
+  if (result) {
+     ovlStat = false;
+     return false;
+     }
+  return true;
+}
+
 #ifdef DEBUG_OSD
 void cDvbApi::SetColor(eDvbColor colorFg, eDvbColor colorBg)
 {
@@ -1233,7 +1479,7 @@ void cDvbApi::Open(int w, int h)
   rows = h;
 #ifdef DEBUG_OSD
   window = subwin(stdscr, h, w, d, 0);
-  syncok(window, TRUE);
+  syncok(window, true);
   #define B2C(b) (((b) * 1000) / 255)
   #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
 #else
diff --git a/dvbapi.h b/dvbapi.h
index a43e7075c..08ba4bfc6 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.14 2000/09/10 10:03:29 kls Exp $
+ * $Id: dvbapi.h 1.16 2000/09/17 12:15:05 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -21,6 +21,12 @@ typedef unsigned char __u8;
 #include <stdio.h>
 #include <dvb.h>
 
+// Overlay facilities
+#define MAXCLIPRECTS 100
+typedef struct CRect {
+  signed short x, y, width, height;
+  };
+
 #define MenuLines   15
 #define MenuColumns 40
 
@@ -70,6 +76,25 @@ class cDvbApi {
          // Closes down all DVB devices.
          // Must be called at the end of the program.
 
+  // Image Grab facilities
+
+  bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+
+  // Overlay facilities
+
+private:
+  bool ovlStat, ovlGeoSet, ovlFbSet;
+  int ovlSizeX, ovlSizeY, ovlPosX, ovlPosY, ovlBpp, ovlPalette, ovlClips, ovlClipCount;
+  int ovlFbSizeX, ovlFbSizeY;
+  __u16 ovlBrightness, ovlColour, ovlHue, ovlContrast;
+  struct video_clip ovlClipRects[MAXCLIPRECTS];
+public:
+  bool OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette);
+  bool OvlG(int SizeX, int SizeY, int PosX, int PosY);
+  bool OvlC(int ClipCount, CRect *Cr);
+  bool OvlP(__u16 Brightness, __u16 Color, __u16 Hue, __u16 Contrast);
+  bool OvlO(bool Value);
+
   // On Screen Display facilities
 
 private:
diff --git a/eit.c b/eit.c
index c4c12003c..d62c90252 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.1 2000/09/03 10:22:25 kls Exp $
+ * $Id: eit.c 1.3 2000/09/17 15:23:05 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
-#include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <dvb_comcode.h>
 #include "tools.h"
@@ -253,15 +252,12 @@ int cEIT::GetSection(unsigned char *buf, ushort PID, unsigned char sec)
 	int seclen=0;
 	unsigned short handle, pid;
 	unsigned char section, sectionnum=0xff, maxsec=0;
-	struct pollfd pfd;
 		
 	if ((handle = SetBitFilter(PID, (sec<<8)|0x00ff, SECTION_CONTINUOS))==0xffff)
 		return -1;
 		
 	seclen=0;
-	pfd.fd=fsvbi;
-	pfd.events=POLLIN;
-	if (poll(&pfd, 1, 20000)==0)
+	if (!cFile::AnyFileReady(fsvbi, 20000))
 	{
 		//cerr << "Timeout\n";
 		return -1;
@@ -312,13 +308,12 @@ char * cEIT::mjd2string(unsigned short mjd)
 /**  */
 int cEIT::GetEIT()
 {
-	unsigned char buf[1024];
+	unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
 	eit_t *eit;
 	struct eit_loop_struct1 *eitloop;
 	struct eit_short_event_descriptor_struct *eitevt;
-	int seclen;
+	unsigned int seclen;
 	unsigned short handle, pid;
-	struct pollfd pfd;
 	eit_event * pevt = (eit_event *)0;
 	time_t tstart;
 	
@@ -344,9 +339,7 @@ int cEIT::GetEIT()
 	tstart = time(NULL);
 	while ((!evtRunning.bIsValid || !evtNext.bIsValid) && nReceivedEITs < 20 && difftime(time(NULL), tstart) < 4)
 	{
-		pfd.fd=fsvbi;
-		pfd.events=POLLIN;
-		if (poll(&pfd, 1, 5000)==0)
+	        if (!cFile::AnyFileReady(fsvbi, 5000))
 		{
 			//cerr << "Timeout\n";
 			CloseFilter(handle);
@@ -357,6 +350,8 @@ int cEIT::GetEIT()
 		seclen=(buf[6]<<8)|buf[7];
 		pid=(buf[4]<<8)|buf[5];
 	
+                if (seclen >= sizeof(buf))
+                   seclen = sizeof(buf) - 1;
 		read(fsvbi, buf, seclen);
 	
 		if (seclen < (int)(sizeof(eit_t)
diff --git a/interface.c b/interface.c
index 5633f864e..3d01238b8 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.15 2000/09/10 16:04:14 kls Exp $
+ * $Id: interface.c 1.19 2000/09/19 17:41:23 kls Exp $
  */
 
 #include "interface.h"
@@ -29,11 +29,19 @@ cInterface::cInterface(void)
   open = 0;
   cols[0] = 0;
   keyFromWait = kNone;
+  SVDRP = NULL;
 }
 
-void cInterface::Init(void)
+void cInterface::Init(int SVDRPport)
 {
   RcIo.SetCode(Keys.code, Keys.address);
+  if (SVDRPport)
+     SVDRP = new cSVDRP(SVDRPport);
+}
+
+void cInterface::Cleanup(void)
+{
+  delete SVDRP;
 }
 
 void cInterface::Open(int NumCols, int NumLines)
@@ -52,10 +60,6 @@ void cInterface::Close(void)
 
 unsigned int cInterface::GetCh(bool Wait)
 {
-#ifdef DEBUG_OSD
-  timeout(0);
-  getch(); // just to make 'ncurses' display the window:
-#endif
   if (RcIo.InputAvailable(Wait)) {
      unsigned int Command;
      return RcIo.GetCommand(&Command, NULL) ? Command : 0;
@@ -65,21 +69,24 @@ unsigned int cInterface::GetCh(bool Wait)
 
 eKeys cInterface::GetKey(bool Wait)
 {
+  if (SVDRP)
+     SVDRP->Process();
   eKeys Key = keyFromWait != kNone ? keyFromWait : Keys.Get(GetCh(Wait));
   keyFromWait = kNone;
   return Key;
 }
 
+void cInterface::PutKey(eKeys Key)
+{
+  keyFromWait = Key;
+}
+
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
-  int t0 = time_ms() + Seconds * 1000;
   eKeys Key = kNone;
-
-  while (time_ms() < t0) {
-        Key = GetKey();
-        if (Key != kNone)
-           break;
-        }
+  RcIo.Flush(500);
+  if (cFile::AnyFileReady(-1, Seconds * 1000))
+     Key = GetKey();
   if (KeepChar)
      keyFromWait = Key;
   return Key;
@@ -227,7 +234,7 @@ void cInterface::QueryKeys(void)
          Keys.address = Address;
          WriteText(1, 5, "RC code detected!");
          WriteText(1, 6, "Do not press any key...");
-         RcIo.Flush(3);
+         RcIo.Flush(3000);
          ClearEol(0, 5);
          ClearEol(0, 6);
          break;
diff --git a/interface.h b/interface.h
index 4503dc65c..8f7f1b8d7 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.11 2000/09/10 10:35:46 kls Exp $
+ * $Id: interface.h 1.13 2000/09/18 22:29:31 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -12,6 +12,7 @@
 
 #include "config.h"
 #include "dvbapi.h"
+#include "svdrp.h"
 
 class cInterface {
 public:
@@ -20,16 +21,19 @@ class cInterface {
   int open;
   int cols[MaxCols];
   eKeys keyFromWait;
+  cSVDRP *SVDRP;
   unsigned int GetCh(bool Wait = true);
   void QueryKeys(void);
   void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
   eKeys Wait(int Seconds = 1, bool KeepChar = false);
 public:
   cInterface(void);
-  void Init(void);
+  void Init(int SVDRPport = 0);
+  void Cleanup(void);
   void Open(int NumCols = MenuColumns, int NumLines = MenuLines);
   void Close(void);
   eKeys GetKey(bool Wait = true);
+  void PutKey(eKeys Key);
   void Clear(void);
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void SetCols(int *c);
diff --git a/menu.c b/menu.c
index ad803cf42..114ea7ef7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.26 2000/09/10 15:06:15 kls Exp $
+ * $Id: menu.c 1.27 2000/09/11 21:13:46 kls Exp $
  */
 
 #include "menu.h"
@@ -1190,7 +1190,7 @@ eOSState cDirectChannelSelect::ProcessKey(eKeys Key)
          if (number >= 0) {
             number = number * 10 + Key - k0;
             cChannel *channel = Channels.GetByNumber(number);
-            char *Name = channel ? channel->name : "*** Invalid Channel ***";
+            const char *Name = channel ? channel->name : "*** Invalid Channel ***";
             int BufSize = MenuColumns + 1;
             char buffer[BufSize];
             snprintf(buffer, BufSize, "%d  %s", number, Name);
diff --git a/remote.c b/remote.c
index 0476962cc..46565a804 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.11 2000/07/29 16:23:47 kls Exp $
+ * $Id: remote.c 1.13 2000/09/19 17:40:52 kls Exp $
  */
 
 #include "remote.h"
@@ -49,33 +49,29 @@ cRcIoBase::~cRcIoBase()
 
 cRcIoKBD::cRcIoKBD(void)
 {
+  f.Open(0); // stdin
 }
 
 cRcIoKBD::~cRcIoKBD()
 {
 }
 
-void cRcIoKBD::Flush(int WaitSeconds)
+void cRcIoKBD::Flush(int WaitMs)
 {
-  time_t t0 = time(NULL);
+  int t0 = time_ms();
 
   timeout(10);
   for (;;) {
       while (getch() > 0)
-            t0 = time(NULL);
-      if (time(NULL) - t0 >= WaitSeconds)
+            t0 = time_ms();
+      if (time_ms() - t0 >= WaitMs)
          break;
       }
 }
 
 bool cRcIoKBD::InputAvailable(bool Wait)
 {
-  timeout(Wait ? 1000 : 10);
-  int ch = getch();
-  if (ch == ERR)
-     return false;
-  ungetch(ch);
-  return true;
+  return f.Ready(Wait);
 }
 
 bool cRcIoKBD::GetCommand(unsigned int *Command, unsigned short *)
@@ -98,7 +94,7 @@ cRcIoRCU::cRcIoRCU(char *DeviceName)
   code = 0;
   address = 0xFFFF;
   lastNumber = 0;
-  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
+  if (f.Open(DeviceName, O_RDWR | O_NONBLOCK)) {
      struct termios t;
      if (tcgetattr(f, &t) == 0) {
         cfsetspeed(&t, B9600);
@@ -107,17 +103,14 @@ cRcIoRCU::cRcIoRCU(char *DeviceName)
            return;
         }
      LOG_ERROR_STR(DeviceName);
-     close(f);
+     f.Close();
      }
   else
      LOG_ERROR_STR(DeviceName);
-  f = -1;
 }
 
 cRcIoRCU::~cRcIoRCU()
 {
-  if (f >= 0)
-     close(f);
 }
 
 int cRcIoRCU::ReceiveByte(bool Wait)
@@ -135,7 +128,7 @@ int cRcIoRCU::ReceiveByte(bool Wait)
 
 bool cRcIoRCU::SendByteHandshake(unsigned char c)
 {
-  if (f >= 0) {
+  if (f.IsOpen()) {
      int w = write(f, &c, 1);
      if (w == 1) {
         for (int reply = ReceiveByte(); reply >= 0;) {
@@ -179,21 +172,21 @@ bool cRcIoRCU::SetMode(unsigned char Mode)
   return SendCommand(mode);
 }
 
-void cRcIoRCU::Flush(int WaitSeconds)
+void cRcIoRCU::Flush(int WaitMs)
 {
-  time_t t0 = time(NULL);
+  int t0 = time_ms();
 
   for (;;) {
       while (ReceiveByte(false) >= 0)
-            t0 = time(NULL);
-      if (time(NULL) - t0 >= WaitSeconds)
+            t0 = time_ms();
+      if (time_ms() - t0 >= WaitMs)
          break;
       }
 }
 
 bool cRcIoRCU::InputAvailable(bool Wait)
 {
-  return DataAvailable(f, Wait);
+  return f.Ready(Wait);
 }
 
 bool cRcIoRCU::GetCommand(unsigned int *Command, unsigned short *Address)
@@ -349,22 +342,21 @@ cRcIoLIRC::cRcIoLIRC(char *DeviceName)
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
   strcpy(addr.sun_path, DeviceName);
-  f = socket(AF_UNIX, SOCK_STREAM, 0);
-  if (f >= 0) {
-     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0)
+  int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+  if (sock >= 0) {
+     if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
+        f.Open(sock);
         return;
+        }
      LOG_ERROR_STR(DeviceName);
-     close(f);
+     close(sock);
      }
   else
      LOG_ERROR_STR(DeviceName);
-  f = -1;
 }
 
 cRcIoLIRC::~cRcIoLIRC()
 {
-  if (f >= 0)
-     close(f);
 }
 
 const char *cRcIoLIRC::ReceiveString(void)
@@ -389,24 +381,24 @@ const char *cRcIoLIRC::ReceiveString(void)
   return NULL;
 }
 
-void cRcIoLIRC::Flush(int WaitSeconds)
+void cRcIoLIRC::Flush(int WaitMs)
 {
   char buf[LIRC_BUFFER_SIZE];
-  time_t t0 = time(NULL);
+  int t0 = time_ms();
 
   for (;;) {
       while (InputAvailable(false)) {
             read(f, buf, sizeof(buf));
-            t0 = time(NULL);
+            t0 = time_ms();
             }
-      if (time(NULL) - t0 >= WaitSeconds)
+      if (time_ms() - t0 >= WaitMs)
          break;
       }
 }
 
 bool cRcIoLIRC::InputAvailable(bool Wait)
 {
-  return DataAvailable(f, Wait);
+  return f.Ready(Wait);
 }
 
 bool cRcIoLIRC::GetCommand(unsigned int *Command, unsigned short *)
diff --git a/remote.h b/remote.h
index 7b94ac782..03f915550 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.7 2000/07/15 16:32:43 kls Exp $
+ * $Id: remote.h 1.9 2000/09/19 17:39:36 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <time.h>
+#include "tools.h"
 
 class cRcIoBase {
 protected:
@@ -28,7 +29,7 @@ class cRcIoBase {
   virtual void SetPoints(unsigned char Dp, bool On) {}
   virtual bool String(char *s) { return true; }
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
-  virtual void Flush(int WaitSeconds = 0) {}
+  virtual void Flush(int WaitMs = 0) {}
   virtual bool InputAvailable(bool Wait = false) = 0;
   virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL) = 0;
   };
@@ -36,10 +37,12 @@ class cRcIoBase {
 #if defined REMOTE_KBD
 
 class cRcIoKBD : public cRcIoBase {
+private:
+  cFile f;
 public:
   cRcIoKBD(void);
   virtual ~cRcIoKBD();
-  virtual void Flush(int WaitSeconds = 0);
+  virtual void Flush(int WaitMs = 0);
   virtual bool InputAvailable(bool Wait = false);
   virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
   };
@@ -48,7 +51,7 @@ class cRcIoKBD : public cRcIoBase {
 
 class cRcIoRCU : public cRcIoBase {
 private:
-  int f;
+  cFile f;
   unsigned char dp, code, mode;
   unsigned short address;
   int lastNumber;
@@ -66,7 +69,7 @@ class cRcIoRCU : public cRcIoBase {
   virtual void SetPoints(unsigned char Dp, bool On);
   virtual bool String(char *s);
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address);
-  virtual void Flush(int WaitSeconds = 0);
+  virtual void Flush(int WaitMs = 0);
   virtual bool InputAvailable(bool Wait = false);
   virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
   };
@@ -76,13 +79,13 @@ class cRcIoRCU : public cRcIoBase {
 class cRcIoLIRC : public cRcIoBase {
 private:
   enum { LIRC_KEY_BUF = 8, LIRC_BUFFER_SIZE = 128 };
-  int f;
+  cFile f;
   char keyName[LIRC_KEY_BUF];
   const char *ReceiveString(void);
 public:
   cRcIoLIRC(char *DeviceName);
   virtual ~cRcIoLIRC();
-  virtual void Flush(int WaitSeconds = 0);
+  virtual void Flush(int WaitMs = 0);
   virtual bool InputAvailable(bool Wait = false);
   virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
   };
diff --git a/svdrp.c b/svdrp.c
index 2af3ee537..c9ea7c387 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.6 2000/09/09 10:51:21 kls Exp $
+ * $Id: svdrp.c 1.10 2000/09/17 13:39:37 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -120,8 +120,15 @@ const char *HelpPages[] = {
   "    Delete channel.",
   "DELT <number>\n"
   "    Delete timer.",
+  "GRAB <filename> [ jpeg | pnm [ <quality> [ <sizex> <sizey> ] ] ]\n"
+  "    Grab the current frame and save it to the given file. Images can\n"
+  "    be stored as JPEG (default) or PNM, at the given quality (default\n"
+  "    is 'maximum', only applies to JPEG) and size (default is full screen).",
   "HELP [ <topic> ]\n"
   "    The HELP command gives help info.",
+  "HITK [ <key> ]\n"
+  "    Hit the given remote control key. Without option a list of all\n"
+  "    valid key names is given.",
   "LSTC [ <number> | <name> ]\n"
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
@@ -147,6 +154,16 @@ const char *HelpPages[] = {
   "    Create a new timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. It is an error if a timer with the same channel,\n"
   "    day, start and stop time already exists.",
+  "OVLF <sizex> <sizey> <fbaddr> <bpp> <palette>\n"
+  "    Set the size, address depth and palette of the overlay.",
+  "OVLG <sizex> <sizey> <posx> <posy>\n"
+  "    Set the size and position of the overlay.",
+  "OVLC <clipcount> <base16-CRect-array>\n"
+  "    Set the overlay clipping rectangles.",
+  "OVLP <brightness> <colour> <hue> <contrast>\n"
+  "    Set the picture parameters for the overlay.",
+  "OVLO 0 | 1\n"
+  "    Switch the overlay on or off.",
   "UPDT <settings>\n"
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
@@ -206,7 +223,6 @@ const char *GetHelpPage(const char *Cmd)
 cSVDRP::cSVDRP(int Port)
 :socket(Port)
 {
-  filedes = -1;
   isyslog(LOG_INFO, "SVDRP listening on port %d", Port);
 }
 
@@ -217,14 +233,13 @@ cSVDRP::~cSVDRP()
 
 void cSVDRP::Close(void)
 {
-  if (filedes >= 0) {
+  if (file.IsOpen()) {
      //TODO how can we get the *full* hostname?
      char buffer[MAXCMDBUFFER];
      gethostname(buffer, sizeof(buffer));
      Reply(221, "%s closing connection", buffer);
      isyslog(LOG_INFO, "closing connection"); //TODO store IP#???
-     close(filedes);
-     filedes = -1;
+     file.Close();
      }
 }
 
@@ -232,11 +247,14 @@ bool cSVDRP::Send(const char *s, int length)
 {
   if (length < 0)
      length = strlen(s);
-  int wbytes = write(filedes, s, length);
+  int wbytes = write(file, s, length);
   if (wbytes == length)
      return true;
-  if (wbytes < 0)
+  if (wbytes < 0) {
      LOG_ERROR;
+     file.Close();
+     cDvbApi::PrimaryDvbApi->OvlO(false);
+     }
   else //XXX while...???
      esyslog(LOG_ERR, "Wrote %d bytes to client while expecting %d\n", wbytes, length);
   return false;
@@ -244,7 +262,7 @@ bool cSVDRP::Send(const char *s, int length)
 
 void cSVDRP::Reply(int Code, const char *fmt, ...)
 {
-  if (filedes >= 0) {
+  if (file.IsOpen()) {
      if (Code != 0) {
         va_list ap;
         va_start(ap, fmt);
@@ -274,7 +292,7 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
      }
 }
 
-void cSVDRP::CmdChan(const char *Option)
+void cSVDRP::CmdCHAN(const char *Option)
 {
   if (*Option) {
      int n = -1;
@@ -331,13 +349,13 @@ void cSVDRP::CmdChan(const char *Option)
      Reply(550, "Unable to find channel \"%d\"", CurrentChannel);
 }
 
-void cSVDRP::CmdDelc(const char *Option)
+void cSVDRP::CmdDELC(const char *Option)
 {
   //TODO combine this with menu action (timers must be updated)
   Reply(502, "DELC not yet implemented");
 }
 
-void cSVDRP::CmdDelt(const char *Option)
+void cSVDRP::CmdDELT(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
@@ -362,7 +380,68 @@ void cSVDRP::CmdDelt(const char *Option)
      Reply(501, "Missing timer number");
 }
 
-void cSVDRP::CmdHelp(const char *Option)
+void cSVDRP::CmdGRAB(const char *Option)
+{
+  char *FileName = NULL;
+  bool Jpeg = true;
+  int Quality = -1, SizeX = -1, SizeY = -1;
+  if (*Option) {
+     char buf[strlen(Option) + 1];
+     char *p = strcpy(buf, Option);
+     const char *delim = " \t";
+     FileName = strtok(p, delim);
+     if ((p = strtok(NULL, delim)) != NULL) {
+        if (strcasecmp(p, "JPEG") == 0)
+           Jpeg = true;
+        else if (strcasecmp(p, "PNM") == 0)
+           Jpeg = false;
+        else {
+           Reply(501, "Unknown image type \"%s\"", p);
+           return;
+           }
+        }
+     if ((p = strtok(NULL, delim)) != NULL) {
+        if (isnumber(p))
+           Quality = atoi(p);
+        else {
+           Reply(501, "Illegal quality \"%s\"", p);
+           return;
+           }
+        }
+     if ((p = strtok(NULL, delim)) != NULL) {
+        if (isnumber(p))
+           SizeX = atoi(p);
+        else {
+           Reply(501, "Illegal sizex \"%s\"", p);
+           return;
+           }
+        if ((p = strtok(NULL, delim)) != NULL) {
+           if (isnumber(p))
+              SizeY = atoi(p);
+           else {
+              Reply(501, "Illegal sizey \"%s\"", p);
+              return;
+              }
+           }
+        else {
+           Reply(501, "Missing sizey");
+           return;
+           }
+        }
+     if ((p = strtok(NULL, delim)) != NULL) {
+        Reply(501, "Unexpected parameter \"%s\"", p);
+        return;
+        }
+     if (cDvbApi::PrimaryDvbApi->GrabImage(FileName, Jpeg, Quality, SizeX, SizeY))
+        Reply(250, "Grabbed image %s", Option);
+     else
+        Reply(451, "Grab image failed");
+     }
+  else
+     Reply(501, "Missing filename");
+}
+
+void cSVDRP::CmdHELP(const char *Option)
 {
   if (*Option) {
      const char *hp = GetHelpPage(Option);
@@ -390,7 +469,27 @@ void cSVDRP::CmdHelp(const char *Option)
   Reply(214, "End of HELP info");
 }
 
-void cSVDRP::CmdLstc(const char *Option)
+void cSVDRP::CmdHITK(const char *Option)
+{
+  if (*Option) {
+     eKeys k = Keys.Translate(Option);
+     if (k != kNone) {
+        Interface.PutKey(k);
+        Reply(250, "Key \"%s\" accepted", Option);
+        }
+     else
+        Reply(504, "Unknown key: \"%s\"", Option);
+     }
+  else {
+     Reply(-214, "Valid <key> names for the HITK command:");
+     for (int i = 0; i < kNone; i++) {
+         Reply(-214, "    %s", Keys.keys[i].name);
+         }
+     Reply(214, "End of key list");
+     }
+}
+
+void cSVDRP::CmdLSTC(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
@@ -433,7 +532,7 @@ void cSVDRP::CmdLstc(const char *Option)
      }
 }
 
-void cSVDRP::CmdLstt(const char *Option)
+void cSVDRP::CmdLSTT(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
@@ -457,7 +556,7 @@ void cSVDRP::CmdLstt(const char *Option)
      }
 }
 
-void cSVDRP::CmdModc(const char *Option)
+void cSVDRP::CmdMODC(const char *Option)
 {
   if (*Option) {
      char *tail;
@@ -486,7 +585,7 @@ void cSVDRP::CmdModc(const char *Option)
      Reply(501, "Missing channel settings");
 }
 
-void cSVDRP::CmdModt(const char *Option)
+void cSVDRP::CmdMODT(const char *Option)
 {
   if (*Option) {
      char *tail;
@@ -519,19 +618,19 @@ void cSVDRP::CmdModt(const char *Option)
      Reply(501, "Missing timer settings");
 }
 
-void cSVDRP::CmdMovc(const char *Option)
+void cSVDRP::CmdMOVC(const char *Option)
 {
   //TODO combine this with menu action (timers must be updated)
   Reply(502, "MOVC not yet implemented");
 }
 
-void cSVDRP::CmdMovt(const char *Option)
+void cSVDRP::CmdMOVT(const char *Option)
 {
   //TODO combine this with menu action
   Reply(502, "MOVT not yet implemented");
 }
 
-void cSVDRP::CmdNewc(const char *Option)
+void cSVDRP::CmdNEWC(const char *Option)
 {
   if (*Option) {
      cChannel *channel = new cChannel;
@@ -549,7 +648,7 @@ void cSVDRP::CmdNewc(const char *Option)
      Reply(501, "Missing channel settings");
 }
 
-void cSVDRP::CmdNewt(const char *Option)
+void cSVDRP::CmdNEWT(const char *Option)
 {
   if (*Option) {
      cTimer *timer = new cTimer;
@@ -573,7 +672,107 @@ void cSVDRP::CmdNewt(const char *Option)
      Reply(501, "Missing timer settings");
 }
 
-void cSVDRP::CmdUpdt(const char *Option)
+void cSVDRP::CmdOVLF(const char *Option)
+{
+  if (*Option) {
+     int SizeX = 0, SizeY = 0, Bpp = 0, Palette = 0, FbAddr = 0;
+     if (5 == sscanf(Option, "%d %d %x %d %d", &SizeX, &SizeY, &FbAddr, &Bpp, &Palette)) {
+        //somehow_set_overlay_geometry;
+        if (cDvbApi::PrimaryDvbApi->OvlF(SizeX, SizeY, FbAddr, Bpp, Palette))
+           Reply(250, "Overlay framebuffer set");      
+        else
+           Reply(451, "Illegal overlay framebuffer settings");
+        }
+     else
+        Reply(501, "Could not parse overlay framebuffer settings");
+     }
+  else
+     Reply(501, "Missing overlay framebuffer settings");
+}
+
+void cSVDRP::CmdOVLG(const char *Option)
+{
+  if (*Option) {
+     int SizeX = 0, SizeY = 0, PosX = 0, PosY = 0;
+     if (4 == sscanf(Option, "%d %d %d %d", &SizeX, &SizeY, &PosX, &PosY)) {
+        //somehow_set_overlay_geometry;
+        if (cDvbApi::PrimaryDvbApi->OvlG(SizeX, SizeY, PosX, PosY))
+           Reply(250, "Overlay geometry set"); 
+        else
+           Reply(451, "Illegal overlay geometry settings");
+        }
+     else
+        Reply(501, "Could not parse overlay geometry settings");
+     }
+  else
+     Reply(501, "Missing overlay geometry settings");
+}
+
+void cSVDRP::CmdOVLC(const char *Option)
+{
+  if (*Option) {
+     int ClipCount = 0;
+     unsigned char s[2 * MAXCLIPRECTS * sizeof(CRect) + 2];
+     if (2 == sscanf(Option, "%d %s", &ClipCount, s)) {
+        // Base16-decoding of CRect-array:
+        unsigned char *p = (unsigned char*)ovlClipRects;
+        int i = 0, size = sizeof(CRect)*ClipCount;
+        for (int j = 0; i < size; i++) {
+            p[i]  = (s[j++] - 65);
+            p[i] += (s[j++] - 65) << 4;
+            }
+        if (((unsigned)ClipCount == (i / sizeof(CRect))) && (ClipCount >= 0)) {
+           // apply it:
+           if (cDvbApi::PrimaryDvbApi->OvlC(ClipCount, ovlClipRects))
+              Reply(250, "Overlay-Clipping set");
+           else
+              Reply(451, "Illegal overlay clipping settings");
+           return;
+           }
+        }
+     Reply(501, "Error parsing Overlay-Clipping settings");
+     }
+  else
+     Reply(501, "Missing Clipping settings");
+}
+
+void cSVDRP::CmdOVLP(const char *Option)
+{
+  if (*Option) {
+     int Brightness = 0, Colour = 0, Hue = 0, Contrast = 0;
+     if (4 == sscanf(Option, "%d %d %d %d", &Brightness, &Colour, &Hue, &Contrast)) {
+        //somehow_set_overlay_picture_settings;
+        if (cDvbApi::PrimaryDvbApi->OvlP(Brightness, Colour, Hue, Contrast))
+           Reply(250, "Overlay picture settings set"); 
+        else
+           Reply(451, "Illegal overlay picture settings");
+        }
+     else
+        Reply(501, "Could not parse overlay picture settings");
+     }
+  else
+     Reply(501, "Missing overlay picture settings");
+}
+
+void cSVDRP::CmdOVLO(const char *Option)
+{
+  if (*Option) {
+     int Value;
+     if (1 == sscanf(Option, "%d", &Value)) {
+        //somehow_set_overlay_picture_settings;
+        if (cDvbApi::PrimaryDvbApi->OvlO(Value))
+           Reply(250, "Overlay capture set");  
+        else
+           Reply(451, "Error setting overlay capture");
+        }
+     else
+        Reply(501, "Could not parse status");
+     }
+  else
+     Reply(501, "Missing overlay capture status");
+}
+
+void cSVDRP::CmdUPDT(const char *Option)
 {
   if (*Option) {
      cTimer *timer = new cTimer;
@@ -612,19 +811,26 @@ void cSVDRP::Execute(char *Cmd)
   while (*s && !isspace(*s))
         s++;
   *s++ = 0;
-  if      (CMD("CHAN"))  CmdChan(s);
-  else if (CMD("DELC"))  CmdDelc(s);
-  else if (CMD("DELT"))  CmdDelt(s);
-  else if (CMD("HELP"))  CmdHelp(s);
-  else if (CMD("LSTC"))  CmdLstc(s);
-  else if (CMD("LSTT"))  CmdLstt(s);
-  else if (CMD("MODC"))  CmdModc(s);
-  else if (CMD("MODT"))  CmdModt(s);
-  else if (CMD("MOVC"))  CmdMovc(s);
-  else if (CMD("MOVT"))  CmdMovt(s);
-  else if (CMD("NEWC"))  CmdNewc(s);
-  else if (CMD("NEWT"))  CmdNewt(s);
-  else if (CMD("UPDT"))  CmdUpdt(s);
+  if      (CMD("CHAN"))  CmdCHAN(s);
+  else if (CMD("DELC"))  CmdDELC(s);
+  else if (CMD("DELT"))  CmdDELT(s);
+  else if (CMD("GRAB"))  CmdGRAB(s);
+  else if (CMD("HELP"))  CmdHELP(s);
+  else if (CMD("HITK"))  CmdHITK(s);
+  else if (CMD("LSTC"))  CmdLSTC(s);
+  else if (CMD("LSTT"))  CmdLSTT(s);
+  else if (CMD("MODC"))  CmdMODC(s);
+  else if (CMD("MODT"))  CmdMODT(s);
+  else if (CMD("MOVC"))  CmdMOVC(s);
+  else if (CMD("MOVT"))  CmdMOVT(s);
+  else if (CMD("NEWC"))  CmdNEWC(s);
+  else if (CMD("NEWT"))  CmdNEWT(s);
+  else if (CMD("OVLF"))  CmdOVLF(s);
+  else if (CMD("OVLG"))  CmdOVLG(s);
+  else if (CMD("OVLC"))  CmdOVLC(s);
+  else if (CMD("OVLP"))  CmdOVLP(s);
+  else if (CMD("OVLO"))  CmdOVLO(s);
+  else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("QUIT")
        ||  CMD("\x04"))  Close();
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
@@ -632,9 +838,9 @@ void cSVDRP::Execute(char *Cmd)
 
 void cSVDRP::Process(void)
 {
-  bool SendGreeting = filedes < 0;
+  bool SendGreeting = !file.IsOpen();
 
-  if (filedes >= 0 || (filedes = socket.Accept()) >= 0) {
+  if (file.IsOpen() || file.Open(socket.Accept())) {
      char buffer[MAXCMDBUFFER];
      if (SendGreeting) {
         //TODO how can we get the *full* hostname?
@@ -642,7 +848,7 @@ void cSVDRP::Process(void)
         time_t now = time(NULL);
         Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, ctime(&now));
         }
-     int rbytes = readstring(filedes, buffer, sizeof(buffer) - 1);
+     int rbytes = file.ReadString(buffer, sizeof(buffer) - 1);
      if (rbytes > 0) {
         //XXX overflow check???
         // strip trailing whitespace:
diff --git a/svdrp.h b/svdrp.h
index 3c1cafa8f..12eb11e3e 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,12 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.2 2000/08/06 12:45:28 kls Exp $
+ * $Id: svdrp.h 1.6 2000/09/17 13:22:04 kls Exp $
  */
 
 #ifndef __SVDRP_H
 #define __SVDRP_H
 
+#include "dvbapi.h"
+#include "tools.h"
+
 class cSocket {
 private:
   int port;
@@ -26,23 +29,31 @@ class cSocket {
 class cSVDRP {
 private:
   cSocket socket;
-  int filedes;
+  cFile file;
+  CRect ovlClipRects[MAXCLIPRECTS];
   void Close(void);
   bool Send(const char *s, int length = -1);
   void Reply(int Code, const char *fmt, ...);
-  void CmdChan(const char *Option);
-  void CmdDelc(const char *Option);
-  void CmdDelt(const char *Option);
-  void CmdHelp(const char *Option);
-  void CmdLstc(const char *Option);
-  void CmdLstt(const char *Option);
-  void CmdModc(const char *Option);
-  void CmdModt(const char *Option);
-  void CmdMovc(const char *Option);
-  void CmdMovt(const char *Option);
-  void CmdNewc(const char *Option);
-  void CmdNewt(const char *Option);
-  void CmdUpdt(const char *Option);
+  void CmdCHAN(const char *Option);
+  void CmdDELC(const char *Option);
+  void CmdDELT(const char *Option);
+  void CmdGRAB(const char *Option);
+  void CmdHELP(const char *Option);
+  void CmdHITK(const char *Option);
+  void CmdLSTC(const char *Option);
+  void CmdLSTT(const char *Option);
+  void CmdMODC(const char *Option);
+  void CmdMODT(const char *Option);
+  void CmdMOVC(const char *Option);
+  void CmdMOVT(const char *Option);
+  void CmdNEWC(const char *Option);
+  void CmdNEWT(const char *Option);
+  void CmdOVLF(const char *Option);
+  void CmdOVLG(const char *Option);
+  void CmdOVLC(const char *Option);
+  void CmdOVLP(const char *Option);
+  void CmdOVLO(const char *Option);
+  void CmdUPDT(const char *Option);
   void Execute(char *Cmd);
 public:
   cSVDRP(int Port);
diff --git a/timers.conf b/timers.conf
index 9031d35db..a625527fc 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,12 +1,14 @@
 1:15:M------:2128:2205:99:7:Neues:
-1:3:-T-----:2013:2125:99:99:SevenDays
-1:10:-T-----:2058:2202:99:10:Quarks:
-1:26:-T-----:2255:0005:99:99:UFO:
-0:3:---T---:2211:2300:99:10:Switch:
+1:3:-T-----:2013:2125:99:99:SevenDays:
+0:10:-T-----:2058:2202:99:10:Quarks:
+1:26:-T-----:2255:0015:99:99:UFO:
+1:3:---T---:2215:2315:99:10:IngoAppelt:
 1:2:----F--:2140:2225:10:10:WWW:
+1:1:----F--:2212:2325:99:99:7Tage7Koepfe:
 1:11:-----S-:2158:2235:99:99:Computer:
 1:2:-----S-:2213:2320:99:30:Wochenshow:
-1:11:------S:2058:2120:99:10:Centauri:
+1:11:------S:2013:2035:99:10:Centauri:
+1:14:------S:2158:2235:99:14:MaxUndLisa:
 1:15:MTWTF--:1828:1901:10:5:nano:
 1:1:-TWTF--:0955:1040:99:99:Ellen:
 1:1:MTWTF--:1553:1710:99:99:Hammerman:
diff --git a/tools.c b/tools.c
index e081ee793..79d2ee6ca 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.14 2000/09/09 12:53:34 kls Exp $
+ * $Id: tools.c 1.19 2000/09/19 17:55:09 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -12,31 +12,20 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
+#if defined(DEBUG_OSD)
+#include <ncurses.h>
+#endif
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #define MaxBuffer 1000
 
 int SysLogLevel = 3;
 
-bool DataAvailable(int filedes, bool wait)
-{
-  if (filedes >= 0) {
-     fd_set set;
-     FD_ZERO(&set);
-     FD_SET(filedes, &set);
-     struct timeval timeout;
-     timeout.tv_sec = wait ? 1 : 0;
-     timeout.tv_usec = wait ? 0 : 10000;
-     return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(filedes, &set);
-     }
-  return false;
-}
-
 void writechar(int filedes, char c)
 {
   write(filedes, &c, sizeof(c));
@@ -56,32 +45,12 @@ char readchar(int filedes)
 
 bool readint(int filedes, int &n)
 {
-  return DataAvailable(filedes) && read(filedes, &n, sizeof(n)) == sizeof(n);
-}
-
-int readstring(int filedes, char *buffer, int size, bool wait = false)
-{
-  int rbytes = 0;
-
-  while (DataAvailable(filedes, wait)) {
-        int n = read(filedes, buffer + rbytes, size - rbytes);
-        if (n == 0)
-           break; // EOF
-        if (n < 0) {
-           LOG_ERROR;
-           break;
-           }
-        rbytes += n;
-        if (rbytes == size)
-           break;
-        wait = false;
-        }
-  return rbytes;
+  return cFile::AnyFileReady(filedes, 0) && read(filedes, &n, sizeof(n)) == sizeof(n);
 }
 
 void purge(int filedes)
 {
-  while (DataAvailable(filedes))
+  while (cFile::AnyFileReady(filedes, 0))
         readchar(filedes);
 }
 
@@ -153,6 +122,14 @@ bool isnumber(const char *s)
   return true;
 }
 
+const char *AddDirectory(const char *DirName, const char *FileName)
+{
+  static char *buf = NULL;
+  delete buf;
+  asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
+  return buf;
+}
+
 #define DFCMD  "df -m %s"
 
 uint FreeDiskSpaceMB(const char *Directory)
@@ -313,6 +290,110 @@ void KillProcess(pid_t pid, int Timeout)
      }
 }
 
+// --- cFile -----------------------------------------------------------------
+
+bool cFile::files[FD_SETSIZE] = { false };
+int cFile::maxFiles = 0;
+
+cFile::cFile(void)
+{
+  f = -1;
+}
+
+cFile::~cFile()
+{
+  Close();
+}
+
+bool cFile::Open(const char *FileName, int Flags, mode_t Mode)
+{
+  if (!IsOpen())
+     return Open(open(FileName, Flags, Mode));
+  esyslog(LOG_ERR, "ERROR: attempt to re-open %s", FileName);
+  return false;
+}
+
+bool cFile::Open(int FileDes)
+{
+  if (FileDes >= 0) {
+     if (!IsOpen()) {
+        f = FileDes;
+        if (f >= 0) {
+           if (f < FD_SETSIZE) {
+              if (f >= maxFiles)
+                 maxFiles = f + 1;
+              if (!files[f])
+                 files[f] = true;
+              else
+                 esyslog(LOG_ERR, "ERROR: file descriptor %d already in files[]", f);
+              return true;
+              }
+           else
+              esyslog(LOG_ERR, "ERROR: file descriptor %d is larger than FD_SETSIZE (%d)", f, FD_SETSIZE);
+           }
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: attempt to re-open file descriptor %d", FileDes);
+     }
+  return false;
+}
+
+void cFile::Close(void)
+{
+  if (f >= 0) {
+     close(f);
+     files[f] = false;
+     f = -1;
+     }
+}
+
+int cFile::ReadString(char *Buffer, int Size)
+{
+  int rbytes = 0;
+  bool wait = true;
+
+  while (Ready(wait)) {
+        int n = read(f, Buffer + rbytes, 1);
+        if (n == 0)
+           break; // EOF
+        if (n < 0) {
+           LOG_ERROR;
+           return -1;
+           }
+        rbytes += n;
+        if (rbytes == Size || Buffer[rbytes - 1] == '\n')
+           break;
+        wait = false;
+        }
+  return rbytes;
+}
+
+bool cFile::Ready(bool Wait)
+{
+  return f >= 0 && AnyFileReady(f, Wait ? 1000 : 0);
+}
+
+bool cFile::AnyFileReady(int FileDes, int TimeoutMs)
+{
+#ifdef DEBUG_OSD
+  refresh();
+#endif
+  fd_set set;
+  FD_ZERO(&set);
+  for (int i = 0; i < maxFiles; i++) {
+      if (files[i])
+         FD_SET(i, &set);
+      }
+  if (0 <= FileDes && FileDes < FD_SETSIZE && !files[FileDes])
+     FD_SET(FileDes, &set); // in case we come in with an arbitrary descriptor
+  if (TimeoutMs == 0)
+     TimeoutMs = 10; // load gets too heavy with 0
+  struct timeval timeout;
+  timeout.tv_sec  = TimeoutMs / 1000;
+  timeout.tv_usec = (TimeoutMs % 1000) * 1000;
+  return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && (FileDes < 0 || FD_ISSET(FileDes, &set));
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
diff --git a/tools.h b/tools.h
index 1ef955c55..5c749a7c2 100644
--- a/tools.h
+++ b/tools.h
@@ -4,16 +4,17 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.13 2000/09/09 12:53:10 kls Exp $
+ * $Id: tools.h 1.15 2000/09/17 07:58:19 kls Exp $
  */
 
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <syslog.h>
-#include <sys/wait.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 
 extern int SysLogLevel;
@@ -30,12 +31,10 @@ extern int SysLogLevel;
 
 #define DELETENULL(p) (delete (p), p = NULL)
 
-bool DataAvailable(int filedes, bool wait = false);
 void writechar(int filedes, char c);
 void writeint(int filedes, int n);
 char readchar(int filedes);
 bool readint(int filedes, int &n);
-int readstring(int filedes, char *buffer, int size, bool wait = false);
 void purge(int filedes);
 char *readline(FILE *f);
 char *strn0cpy(char *dest, const char *src, size_t n);
@@ -44,6 +43,7 @@ char *skipspace(char *s);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
+const char *AddDirectory(const char *DirName, const char *FileName);
 uint FreeDiskSpaceMB(const char *Directory);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
@@ -51,6 +51,24 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool CheckProcess(pid_t pid);
 void KillProcess(pid_t pid, int Timeout = MAXPROCESSTIMEOUT);
 
+class cFile {
+private:
+  static bool files[];
+  static int maxFiles;
+  int f;
+public:
+  cFile(void);
+  ~cFile();
+  operator int () { return f; }
+  bool Open(const char *FileName, int Flags, mode_t Mode = S_IRUSR | S_IWUSR | S_IRGRP);
+  bool Open(int FileDes);
+  void Close(void);
+  bool IsOpen(void) { return f >= 0; }
+  int ReadString(char *Buffer, int Size);
+  bool Ready(bool Wait = true);
+  static bool AnyFileReady(int FileDes = -1, int TimeoutMs = 1000);
+  };
+
 class cListObject {
 private:
   cListObject *prev, *next;
diff --git a/vdr.c b/vdr.c
index 4932bf23c..91643c2f3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.30 2000/09/10 14:33:09 kls Exp $
+ * $Id: vdr.c 1.35 2000/09/20 16:45:01 kls Exp $
  */
 
 #include <getopt.h>
@@ -34,7 +34,6 @@
 #include "interface.h"
 #include "menu.h"
 #include "recording.h"
-#include "svdrp.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -46,9 +45,11 @@
 
 static int Interrupted = 0;
 
-void SignalHandler(int signum)
+static void SignalHandler(int signum)
 {
-  Interrupted = signum;
+  if (signum != SIGPIPE)
+     Interrupted = signum;
+  signal(signum, SignalHandler);
 }
 
 int main(int argc, char *argv[])
@@ -58,9 +59,11 @@ int main(int argc, char *argv[])
 #define DEFAULTSVDRPPORT 2001
 
   int SVDRPport = DEFAULTSVDRPPORT;
+  const char *ConfigDirectory = NULL;
   bool DaemonMode = false;
 
   static struct option long_options[] = {
+      { "config", required_argument, NULL, 'c' },
       { "daemon", no_argument,       NULL, 'd' },
       { "help",   no_argument,       NULL, 'h' },
       { "log",    required_argument, NULL, 'l' },
@@ -71,10 +74,14 @@ int main(int argc, char *argv[])
   
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "dhl:p:v:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "c:dhl:p:v:", long_options, &option_index)) != -1) {
         switch (c) {
+          case 'c': ConfigDirectory = optarg;
+                    break;
           case 'd': DaemonMode = true; break;
-          case 'h': printf("Usage: vdr [OPTION]\n\n"
+          case 'h': printf("Usage: vdr [OPTION]\n\n"           // for easier orientation, this is column 80|
+                           "  -c DIR,   --config=DIR  read config files from DIR (default is to read them\n"
+                           "                          from the video directory)\n"
                            "  -h,       --help        display this help and exit\n"
                            "  -d,       --daemon      run in daemon mode\n"
                            "  -l LEVEL, --log=LEVEL   set log level (default: 3)\n"
@@ -108,6 +115,8 @@ int main(int argc, char *argv[])
                        }
                     break;
           case 'v': VideoDirectory = optarg;
+                    while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
+                          optarg[strlen(optarg) - 1] = 0;
                     break;
           default:  abort();
           }
@@ -128,7 +137,7 @@ int main(int argc, char *argv[])
   // Daemon mode:
 
   if (DaemonMode) {
-#ifndef DEBUG_OSD
+#if !defined(DEBUG_OSD) && !defined(REMOTE_KBD)
      pid_t pid = fork();
      if (pid < 0) {
         fprintf(stderr, "%s\n", strerror(errno));
@@ -141,7 +150,7 @@ int main(int argc, char *argv[])
      fclose(stdout);
      fclose(stderr);
 #else
-     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD on!\n");
+     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD or REMOTE_KBD on!\n");
      abort();
 #endif
      }
@@ -154,16 +163,19 @@ int main(int argc, char *argv[])
 
   // Configuration data:
 
-  Setup.Load("setup.conf");
-  Channels.Load("channels.conf");
-  Timers.Load("timers.conf");
+  if (!ConfigDirectory)
+     ConfigDirectory = VideoDirectory;
+
+  Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
+  Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
+  Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
 #ifdef REMOTE_LIRC
   Keys.SetDummyValues();
 #else
-  if (!Keys.Load(KEYS_CONF))
+  if (!Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF)))
      Interface.LearnKeys();
 #endif
-  Interface.Init();
+  Interface.Init(SVDRPport);
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
@@ -174,10 +186,10 @@ int main(int argc, char *argv[])
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
   if (signal(SIGINT,  SignalHandler) == SIG_IGN) signal(SIGINT,  SIG_IGN);
   if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
+  if (signal(SIGPIPE, SignalHandler) == SIG_IGN) signal(SIGPIPE, SIG_IGN);
 
   // Main program loop:
 
-  cSVDRP *SVDRP = SVDRPport ? new cSVDRP(SVDRPport) : NULL;
   cOsdBase *Menu = NULL;
   cReplayControl *ReplayControl = NULL;
   int LastChannel = -1;
@@ -267,13 +279,11 @@ int main(int argc, char *argv[])
              default:    break;
              }
            }
-        if (SVDRP)
-           SVDRP->Process();//TODO lock menu vs. SVDRP?
         }
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
   delete Menu;
   delete ReplayControl;
-  delete SVDRP;
+  Interface.Cleanup();
   cDvbApi::Cleanup();
   isyslog(LOG_INFO, "exiting");
   if (SysLogLevel > 0)
diff --git a/videodir.c b/videodir.c
index 7bd6299a6..91d362dbf 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.1 2000/07/29 15:21:42 kls Exp $
+ * $Id: videodir.c 1.2 2000/09/15 13:23:47 kls Exp $
  */
 
 #include "videodir.h"
@@ -137,7 +137,7 @@ int OpenVideoFile(const char *FileName, int Flags)
            }
         }
      }
-  int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR);
+  int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR | S_IRGRP);
   if (ActualFileName != FileName)
      delete ActualFileName;
   return Result;

From ef8fe3f04c30caedeb17b11ac275581539f039c7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Tue, 3 Oct 2000 18:00:00 +0200
Subject: [PATCH 012/307] Version 0.65 - Modified LIRC interface to better
 handle repeat function. - Faster OSD by first writing into a bitmap and then
 sending the entire bitmap   to the DVB driver at once (requires the patch
 'dvb.c.071.diff' to be applied   against the version 0.71 DVB driver file
 'dvb.c'). - When switching channels the channel is now immediately displayed,
 and the   current/next information is shown as soon as it becomes available.
 - No longer displaying the year in the 'Recordings' menu to saves space for
 the   title. - The 'Recordings' menu now displays a '*' to indicate new
 recordings. - Added the description of the timers.conf file to the FORMATS
 file (thanks to   Bastian Guse). - Displaying as much as possible of the
 current/next info (dropping characters   that would display only partially).
 - In normal viewing mode the '0' key now toggles between the current and the 
  previous channel.

---
 CONTRIBUTORS   |    4 +
 FORMATS        |   24 +-
 HISTORY        |   18 +
 INSTALL        |   19 +-
 MANUAL         |    9 +-
 Makefile       |   55 +-
 config.h       |    4 +-
 dvb.c.071.diff |  100 +
 dvbapi.c       |  146 +-
 dvbapi.h       |   32 +-
 dvbosd.c       |  177 ++
 dvbosd.h       |   74 +
 eit.c          |    6 +-
 font.c         |   41 +
 font.h         |   40 +
 fontosd.c      | 6722 ++++++++++++++++++++++++++++++++++++++++++++++++
 genfontfile.c  |  378 +++
 interface.c    |   38 +-
 menu.c         |    8 +-
 recording.c    |   17 +-
 recording.h    |    4 +-
 remote.c       |   50 +-
 remote.h       |    5 +-
 timers.conf    |   16 +-
 tools.c        |    3 +-
 tools.h        |    3 +-
 vdr.c          |   11 +-
 27 files changed, 7840 insertions(+), 164 deletions(-)
 create mode 100644 dvb.c.071.diff
 create mode 100644 dvbosd.c
 create mode 100644 dvbosd.h
 create mode 100644 font.c
 create mode 100644 font.h
 create mode 100644 fontosd.c
 create mode 100644 genfontfile.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 03fd4bc0f..2eefd64be 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -6,6 +6,7 @@ Carsten Koch <Carsten.Koch@icem.de>
  for implementing the 'Summary' feature
  for adding the 'epg2timers' tool (see Tools/epg2timers)
  for his idea of using multiple disks (and for testing this feature)
+ for implementing the 'new recording' indicator
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -30,3 +31,6 @@ Niels de Carpentier <niels@casema.net>
 
 Martin Hammerschmid <martin@hammerschmid.com>
  for suggesting to display the direct channel select input on the OSD
+
+Bastian Guse <bastian@nocopy.de>
+ for writing the FORMATS entry for timers.conf
diff --git a/FORMATS b/FORMATS
index 776fb4fc2..eb9de0f5c 100644
--- a/FORMATS
+++ b/FORMATS
@@ -32,4 +32,26 @@ Video Disk Recorder File Formats
 
 * timers.conf
 
-  TODO
+  This file contains the timer setup.
+
+  The fields in a timer definition have the following meaning (from left
+  to right):
+
+  - Timer active (0 = inaactive, 1 = active)
+  - Program number of the channel to record
+  - Day of recording, either one or more of
+      M------ = Monday
+      -T----- = Tuesday
+      --W---- = Wednesday
+      ---T--- = Thrusday
+      ----F-- = Friday
+      -----S- = Saturday
+      ------S = Sunday
+    (any combination is possible, for example MTWTF--) or the "day of month" (1..31)
+  - Star time (first two digits for the hour, second two digits for the minutes)
+  - End time (first two digits for the hour, second two digits for the minutes)
+  - Priority (from 00 to 99, 00 = lowest prioity, 99 = highest priority)
+  - Guaranteed lifetime of recording (in days)
+  - Name of timer (will be used to name the recording)
+  - Summary
+
diff --git a/HISTORY b/HISTORY
index f8a10078a..481e83ede 100644
--- a/HISTORY
+++ b/HISTORY
@@ -203,3 +203,21 @@ Video Disk Recorder Revision History
 - The daemon mode (option '-d') now no longer works with REMOTE=KBD (there
   is no stdin in daemon mode, so KBD makes no sense - plus it sometimes
   crashed).
+
+2000-10-03: Version 0.65
+
+- Modified LIRC interface to better handle repeat function.
+- Faster OSD by first writing into a bitmap and then sending the entire bitmap
+  to the DVB driver at once (requires the patch 'dvb.c.071.diff' to be applied
+  against the version 0.71 DVB driver file 'dvb.c').
+- When switching channels the channel is now immediately displayed, and the
+  current/next information is shown as soon as it becomes available.
+- No longer displaying the year in the 'Recordings' menu to saves space for the
+  title.
+- The 'Recordings' menu now displays a '*' to indicate new recordings.
+- Added the description of the timers.conf file to the FORMATS file (thanks to
+  Bastian Guse).
+- Displaying as much as possible of the current/next info (dropping characters
+  that would display only partially).
+- In normal viewing mode the '0' key now toggles between the current and the
+  previous channel.
diff --git a/INSTALL b/INSTALL
index 7b953be5d..7def1687e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,18 +15,22 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile.
 
-This program requires the card driver version 0.05 or higher
-to work properly. If you are using driver version 0.7 you need
-to load the dvb.o module with option outstream=0, so your insmod
-statement should read 'insmod dvb.o outstream=0'. This is currently
-necessary because 'vdr' works with AV_PES data and will change
-once it has been modified to work directly with MPEG2.
+This program requires the card driver version 0.71 or higher
+to work properly. Currently you need to load the dvb.o module with
+option outstream=0, so your insmod statement should read
+'insmod dvb.o outstream=0'. This is necessary because 'vdr' works
+with AV_PES data and will change once it has been modified to work
+directly with MPEG2. You also need to apply the patch 'dvb.c.071.diff'
+for the On Screen Display to work properly.
 
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
 named 'vdr', which can be run after the DVB driver has been
 installed.
 
+IMPORTANT: See "Configuration files" below for information on how
+=========  to set up the configuration files at the proper location!
+
 The 'vdr' program can be controlled via the PC keyboard or
 an infrared remote control unit. Define the REMOTE macro to one of the
 following values 'make' call to activate the respective control mode:
@@ -115,7 +119,8 @@ Configuration files:
 There are three configuration files that hold information about
 channels, remote control keys and timers. By default these files are
 assumed to be located in the video directory, but a different directory
-can be used with the '-c' option.
+can be used with the '-c' option. For starters just copy all *.conf files from
+the VDR directory into your video directory.
 
 The configuration files can be edited with any text editor, or will be written
 by the 'vdr' program if any changes are made inside the on-screen menus.
diff --git a/MANUAL b/MANUAL
index 91c9bffd3..24ee3ff5a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -66,9 +66,12 @@ Video Disk Recorder User's Manual
      if no key is pressed for about half a second, the digits collected so
      far will define the channel number.
 
+  Pressing the '0' key toggles between the current and the previous channel.
+
   After switching to a different channel the channel number and name, as well
-  as the current time are displayed at the top of the screen. This line
-  automatically goes away after about two seconds, or if any key is pressed.
+  as the current time are displayed at the top of the screen. If available, the
+  'current/next' information will be displayed below this line. This display
+  automatically goes away after about five seconds, or if any key is pressed.
   To bring up the channel display without switching channels you can press
   the "Ok" button.
 
@@ -97,7 +100,7 @@ Video Disk Recorder User's Manual
 
   All recordings are listed in the "Recordings" menu. Browse through the
   list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
-  to start playback.
+  to start playback. New recordings are marked with an '*'.
   Playback can be stopped via the Main menu by selecting "Stop replaying",
   or by pressing the "Blue" button outside the menu.
 
diff --git a/Makefile b/Makefile
index fef7a6f12..15757744b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.11 2000/09/20 17:01:57 kls Exp $
+# $Id: Makefile 1.12 2000/10/01 14:27:12 kls Exp $
 
 DVBDIR   = ../DVB
 
 INCLUDES = -I$(DVBDIR)/driver
-OBJS = config.o dvbapi.o eit.o interface.o menu.o osd.o recording.o remote.o svdrp.o tools.o vdr.o videodir.o
+OBJS = config.o dvbapi.o dvbosd.o eit.o font.o interface.o menu.o osd.o\
+       recording.o remote.o svdrp.o tools.o vdr.o videodir.o
+
+OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 
 ifndef REMOTE
 REMOTE = KBD
@@ -21,26 +24,52 @@ ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 endif
 
+all: vdr
+font: genfontfile fontosd.c
+	@echo "font file created."
+
+# Implicit rules:
+
 %.o: %.c
 	g++ -g -O2 -Wall -m486 -c $(DEFINES) $(INCLUDES) $<
 
-all: vdr
+# Dependencies:
 
-config.o   : config.c config.h dvbapi.h eit.h interface.h svdrp.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h interface.h svdrp.h tools.h videodir.h
+config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h svdrp.h tools.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h videodir.h
+dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
 eit.o      : eit.c eit.h tools.h
-interface.o: interface.c config.h dvbapi.h eit.h interface.h remote.h svdrp.h tools.h
-menu.o     : menu.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h
-osd.o      : osd.c config.h dvbapi.h interface.h osd.h svdrp.h tools.h
-recording.o: recording.c config.h dvbapi.h interface.h recording.h svdrp.h tools.h videodir.h
-remote.o   : remote.c config.h dvbapi.h remote.h tools.h
-svdrp.o    : svdrp.c config.h dvbapi.h interface.h svdrp.h tools.h
+font.o     : font.c font.h fontosd.c tools.h
+interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h tools.h
+menu.o     : menu.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h
+osd.o      : osd.c config.h dvbapi.h dvbosd.h font.h interface.h osd.h svdrp.h tools.h
+recording.o: recording.c config.h dvbapi.h dvbosd.h font.h interface.h recording.h svdrp.h tools.h videodir.h
+remote.o   : remote.c config.h dvbapi.h dvbosd.h font.h remote.h tools.h
+svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h
 tools.o    : tools.c tools.h
-vdr.o      : vdr.c config.h dvbapi.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
+vdr.o      : vdr.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
 
+# The main program:
+
 vdr: $(OBJS)
 	g++ -g -O2 $(OBJS) -lncurses -ljpeg -o vdr
 
+# The font file:
+
+fontosd.c:
+	genfontfile "cFont::tPixelData FontOsd" $(OSDFONT) > $@
+
+# The font file generator:
+
+genfontfile.o: genfontfile.c
+	gcc -O2 -c $<
+genfontfile: genfontfile.o
+	gcc -o $@ -L/usr/X11R6/lib $< -lX11
+
+# Housekeeping:
+
 clean:
-	-rm $(OBJS) vdr
+	-rm -f $(OBJS) vdr genfontfile genfontfile.o
+CLEAN: clean
+	-rm -f fontosd.c
diff --git a/config.h b/config.h
index 418fa6303..224a7b3bc 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.21 2000/09/17 09:08:13 kls Exp $
+ * $Id: config.h 1.22 2000/10/01 14:14:18 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define VDRVERSION "0.64"
+#define VDRVERSION "0.65"
 
 #define MaxBuffer 10000
 
diff --git a/dvb.c.071.diff b/dvb.c.071.diff
new file mode 100644
index 000000000..647b0de1b
--- /dev/null
+++ b/dvb.c.071.diff
@@ -0,0 +1,100 @@
+--- dvb.c.001	Sun Sep 17 22:02:37 2000
++++ dvb.c	Tue Oct  3 12:11:46 2000
+@@ -1143,6 +1143,8 @@
+ {
+         int bpp;
+         int i;
++        int d, delta; //XXX kls: additional variables for data compression
++        u8 c;         //XXX kls: additional variables for data compression
+         DECLARE_WAITQUEUE(wait, current);
+         
+         if (dvb->bmp_state==BMP_LOADING) {
+@@ -1160,27 +1162,38 @@
+         if (dvb->bmp_state==BMP_LOADING)
+                 return -1;
+         dvb->bmp_state=BMP_LOADING;
+-        if (format==BITMAP8) bpp=8;
+-        else if (format==BITMAP4) bpp=4;
+-        else if (format==BITMAP2) bpp=2;
+-        else if (format==BITMAP1) bpp=1;
++        if      (format==BITMAP8) { bpp=8; delta = 1; } //XXX kls: initialize 'delta', too
++        else if (format==BITMAP4) { bpp=4; delta = 2; }
++        else if (format==BITMAP2) { bpp=2; delta = 4; }
++        else if (format==BITMAP1) { bpp=1; delta = 8; }
+         else {
+           dvb->bmp_state=BMP_NONE;
+           return -1;
+         }
+-        dvb->bmplen= (dx*dy*bpp)/8;
++        dvb->bmplen= ((dx*dy*bpp+7)&~7)/8; //XXX kls: need to round up to include partial bytes
+         dvb->bmpp=0;
+         if (dvb->bmplen>32768) {
+                 dvb->bmp_state=BMP_NONE;
+                 return -1;
+         }
+         for (i=0; i<dy; i++) {
+-                if (copy_from_user(dvb->bmpbuf+1024+i*dx, data+i*inc, (dx*bpp)/8)) {
++                if (copy_from_user(dvb->bmpbuf+1024+i*dx, data+i*inc, dx)) { //XXX kls: incoming data is "1 byte per pixel"
+                         dvb->bmp_state=BMP_NONE;
+                         return -1;
+                 }
+                 
+         }
++        // XXX kls: Incoming data is always "one byte per pixel", so we need to compress
++        // the data in case we have a lower resolution than 8 bpp:
++        if (format != BITMAP8) {
++                for (i=0; i<dx*dy/delta; i++) {
++                        c = ((u8 *)dvb->bmpbuf)[1024+i*delta+delta-1];
++                        for (d=delta-2; d>=0; d--) {
++                                c |= (((u8 *)dvb->bmpbuf)[1024+i*delta+d] << ((delta-d-1)*bpp));
++                        ((u8 *)dvb->bmpbuf)[1024+i] = c;
++                        }
++                }
++        }
+         dvb->bmplen+=1024;
+         return outcom(dvb, COMTYPE_OSD, LoadBmp, 3, format, dx, dy);
+ } 
+@@ -1256,24 +1269,25 @@
+         int i;
+ 
+         w=x1-x0+1; h=y1-y0+1;
+-        if (inc>0)
+-                w=inc;
+-        if (w>720 || h>576) 
++        if (inc<=0)
++                inc=w; //XXX kls: see dvb_4l.h: "inc<=0 uses blockwidth as linewidth"
++        if (w<=0 || w>720 || h<=0 || h>576) //XXX kls: checking lower bounds, too
+                 return -1;
+-        bpp=8;     //dvb->osdbpp[dvb->osdwin];
+-        bpl=w*bpp/8;
++        bpp=dvb->osdbpp[dvb->osdwin]+1; //XXX kls: 'bpp' needs to be taken from the window
++        bpl=((w*bpp+7)&~7)/8; //XXX kls: need to round up to include partial bytes
+         size=h*bpl;
+-        lpb=(64*1024)/bpl;
++        lpb=(32*1024)/bpl; //XXX kls: apparently 32K is the maximum possible value
+         bnum=size/(lpb*bpl);
+         brest=size-bnum*lpb*bpl;
+ 
+         for (i=0; i<bnum; i++) {
+-                LoadBitmap(dvb, BITMAP8, w, lpb, inc, data);
++                LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, lpb, inc, data); //XXX kls: need to take the format from the actual window
+                 BlitBitmap(dvb, dvb->osdwin, x0, y0+i*lpb, 1);
+-                data+=bpl;
++                data+=lpb*inc; //XXX kls: incrementing must be done in "one byte per pixel"
++                ddelay(2); //XXX kls: without this the block is sometimes not fully displayed - firmware bug?
+         }
+         if (brest) {
+-                LoadBitmap(dvb, BITMAP8, w, brest/bpl, inc, data);
++                LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, brest/bpl, inc, data); //XXX kls: need to take the format from the actual window
+                 BlitBitmap(dvb, dvb->osdwin, x0, y0+bnum*lpb, 1);
+         }
+         ReleaseBitmap(dvb);
+@@ -6141,7 +6155,7 @@
+         init_waitqueue_head(&dvb->bmpq);
+         spin_lock_init (&(dvb->bmplock));
+         dvb->bmpp=dvb->bmplen=0;
+-        dvb->bmpbuf=vmalloc(32768+1024);
++        dvb->bmpbuf=vmalloc(8*32768+1024); //XXX kls: '8*' to be prepared for the maximum possible incoming data at 1 bpp
+ 
+         init_waitqueue_head(&dvb->debiq);
+         dvb->debilock=SPIN_LOCK_UNLOCKED;
diff --git a/dvbapi.c b/dvbapi.c
index 1468de60e..04873fcc0 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.27 2000/09/17 12:45:55 kls Exp $
+ * $Id: dvbapi.c 1.30 2000/10/03 13:26:16 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -19,6 +19,7 @@ extern "C" {
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
+#include "dvbapi.h"
 #include "interface.h"
 #include "tools.h"
 #include "videodir.h"
@@ -71,6 +72,56 @@ extern "C" {
 
 typedef unsigned char uchar;
 
+// --- cResumeFile ------------------------------------------------------------
+
+cResumeFile::cResumeFile(const char *FileName)
+{
+  fileName = new char[strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1];
+  if (fileName) {
+     strcpy(fileName, FileName);
+     strcat(fileName, RESUMEFILESUFFIX);
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: can't allocate memory for resume file name");
+}
+
+cResumeFile::~cResumeFile()
+{
+  delete fileName;
+}
+
+int cResumeFile::Read(void)
+{
+  int resume = -1;
+  if (fileName) {
+     int f = open(fileName, O_RDONLY);
+     if (f >= 0) {
+        if (read(f, &resume, sizeof(resume)) != sizeof(resume)) {
+           resume = -1;
+           LOG_ERROR_STR(fileName);
+           }
+        close(f);
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR_STR(fileName);
+     }
+  return resume;
+}
+
+bool cResumeFile::Save(int Index)
+{
+  if (fileName) {
+     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
+     if (f >= 0) {
+        if (write(f, &Index, sizeof(Index)) != sizeof(Index))
+           LOG_ERROR_STR(fileName);
+        close(f);
+        return true;
+        }
+     }
+  return false;
+}
+
 // --- cIndexFile ------------------------------------------------------------
 
 class cIndexFile {
@@ -78,8 +129,9 @@ class cIndexFile {
   struct tIndex { int offset; uchar type; uchar number; short reserved; };
   int f;
   char *fileName, *pFileExt;
-  int size, last, resume;
+  int size, last;
   tIndex *index;
+  cResumeFile resumeFile;
   bool CatchUp(void);
 public:
   cIndexFile(const char *FileName, bool Record = false);
@@ -89,21 +141,22 @@ class cIndexFile {
   int GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length = NULL);
   int Get(uchar FileNumber, int FileOffset);
   int Last(void) { return last; }
-  int GetResume(void) { return resume; }
-  bool StoreResume(int Index);
+  int GetResume(void) { return resumeFile.Read(); }
+  bool StoreResume(int Index) { return resumeFile.Save(Index); }
   static char *Str(int Index, bool WithFrame = false);
   };
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
+:resumeFile(FileName)
 {
   f = -1;
   fileName = pFileExt = NULL;
   size = 0;
-  last = resume = -1;
+  last = -1;
   index = NULL;
   if (FileName) {
-     fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + strlen(RESUMEFILESUFFIX) + 1];
-     if (fileName) {                        // no max() function at hand...
+     fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + 1];
+     if (fileName) {
         strcpy(fileName, FileName);
         pFileExt = fileName + strlen(fileName);
         strcpy(pFileExt, INDEXFILESUFFIX);
@@ -155,19 +208,6 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
            delete fileName;
            fileName = pFileExt = NULL;
            }
-        else {
-           strcpy(pFileExt, RESUMEFILESUFFIX);
-           int resumeFile = open(fileName, O_RDONLY);
-           if (resumeFile >= 0) {
-              if (read(resumeFile, &resume, sizeof(resume)) != sizeof(resume)) {
-                 resume = -1;
-                 LOG_ERROR_STR(fileName);
-                 }
-              close(resumeFile);
-              }
-           else if (errno != ENOENT)
-              LOG_ERROR_STR(fileName);
-           }
         }
      else
         esyslog(LOG_ERR, "ERROR: can't copy file name '%s'", FileName);
@@ -298,22 +338,6 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
   return -1;
 }
 
-bool cIndexFile::StoreResume(int Index)
-{
-  if (fileName) {
-     int resumeFile = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
-     if (resumeFile >= 0) {
-        if (write(resumeFile, &Index, sizeof(Index)) != sizeof(Index))
-           LOG_ERROR_STR(fileName);
-        close(resumeFile);
-        return true;
-        }
-     else if (errno != ENOENT)
-        LOG_ERROR_STR(fileName);
-     }
-  return false;
-}
-
 char *cIndexFile::Str(int Index, bool WithFrame)
 {
   static char buffer[16];
@@ -1087,6 +1111,8 @@ cDvbApi::cDvbApi(const char *FileName)
   start_color();
   leaveok(stdscr, true);
   window = NULL;
+#else
+  osd = NULL;
 #endif
   lastProgress = lastTotal = -1;
   replayTitle = NULL;
@@ -1488,18 +1514,19 @@ void cDvbApi::Open(int w, int h)
   d *= lineHeight;
   int x = (720 - MenuColumns * charWidth) / 2; //TODO PAL vs. NTSC???
   int y = (576 - MenuLines * lineHeight) / 2 + d;
-  Cmd(OSD_Open, 4, x, y, x + w - 1, y + h - 1);
+  osd = new cDvbOsd(videoDev, x, y, x + w - 1, y + h - 1, 4);
   #define SETCOLOR(n, r, g, b, o) Cmd(OSD_SetColor, n, r, g, b, o)
+  SETCOLOR(clrTransparent, 0x00, 0x00, 0x00,   0);
 #endif
-  SETCOLOR(clrBackground, 0x00, 0x00, 0x00, 127); // background 50% gray
-  SETCOLOR(clrBlack,      0x00, 0x00, 0x00, 255);
-  SETCOLOR(clrRed,        0xFC, 0x14, 0x14, 255);
-  SETCOLOR(clrGreen,      0x24, 0xFC, 0x24, 255);
-  SETCOLOR(clrYellow,     0xFC, 0xC0, 0x24, 255);
-  SETCOLOR(clrBlue,       0x00, 0x00, 0xFC, 255);
-  SETCOLOR(clrCyan,       0x00, 0xFC, 0xFC, 255);
-  SETCOLOR(clrMagenta,    0xB0, 0x00, 0xFC, 255);
-  SETCOLOR(clrWhite,      0xFC, 0xFC, 0xFC, 255);
+  SETCOLOR(clrBackground,  0x00, 0x00, 0x00, 127); // background 50% gray
+  SETCOLOR(clrBlack,       0x00, 0x00, 0x00, 255);
+  SETCOLOR(clrRed,         0xFC, 0x14, 0x14, 255);
+  SETCOLOR(clrGreen,       0x24, 0xFC, 0x24, 255);
+  SETCOLOR(clrYellow,      0xFC, 0xC0, 0x24, 255);
+  SETCOLOR(clrBlue,        0x00, 0x00, 0xFC, 255);
+  SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
+  SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
+  SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
 
   lastProgress = lastTotal = -1;
 }
@@ -1512,7 +1539,8 @@ void cDvbApi::Close(void)
      window = 0;
      }
 #else
-  Cmd(OSD_Close);
+  delete osd;
+  osd = NULL;
 #endif
   lastProgress = lastTotal = -1;
 }
@@ -1523,7 +1551,7 @@ void cDvbApi::Clear(void)
   SetColor(clrBackground, clrBackground);
   Fill(0, 0, cols, rows, clrBackground);
 #else
-  Cmd(OSD_Clear);
+  osd->Clear();
 #endif
 }
 
@@ -1539,7 +1567,7 @@ void cDvbApi::Fill(int x, int y, int w, int h, eDvbColor color)
       }
   wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
 #else
-  Cmd(OSD_FillBlock, color, x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1);
+  osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
 #endif
 }
 
@@ -1555,9 +1583,17 @@ void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor col
 #ifdef DEBUG_OSD
   SetColor(colorFg, colorBg);
   wmove(window, y, x); // ncurses wants 'y' before 'x'!
-  waddstr(window, s);
+  waddnstr(window, s, cols - x);
 #else
-  Cmd(OSD_Text, (int(colorBg) << 16) | colorFg, x * charWidth, y * lineHeight, 1, 0, s);
+  osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
+#endif
+}
+
+void cDvbApi::Flush(void)
+{
+#ifndef DEBUG_OSD
+  if (osd)
+     osd->Flush();
 #endif
 }
 
@@ -1567,11 +1603,13 @@ bool cDvbApi::ShowProgress(bool Initial)
 
   if (GetIndex(&Current, &Total)) {
      if (Initial) {
+        Clear();
         if (replayTitle)
            Text(0, 0, replayTitle);
         }
      if (Total != lastTotal)
         Text(-7, 2, cIndexFile::Str(Total));
+     Flush();
 #ifdef DEBUG_OSD
      int p = cols * Current / Total;
      Fill(0, 1, p, 1, clrGreen);
@@ -1597,12 +1635,14 @@ bool cDvbApi::ShowProgress(bool Initial)
            color = clrWhite;
            }
         if (lastProgress < 0)
-           Cmd(OSD_FillBlock, clrWhite, 0, y1, w - 1, y2);
-        Cmd(OSD_FillBlock, color, x1, y1, x2, y2);
+           osd->Fill(0, y1, w - 1, y2, clrWhite);
+        osd->Fill(x1, y1, x2, y2, color);
         lastProgress = p;
         }
+     Flush();
 #endif
      Text(0, 2, cIndexFile::Str(Current));
+     Flush();
      lastTotal = Total;
      return true;
      }
diff --git a/dvbapi.h b/dvbapi.h
index 08ba4bfc6..b35f3fb80 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.16 2000/09/17 12:15:05 kls Exp $
+ * $Id: dvbapi.h 1.18 2000/10/03 11:26:10 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -20,6 +20,7 @@ typedef unsigned char __u8;
 #endif
 #include <stdio.h>
 #include <dvb.h>
+#include "dvbosd.h"
 
 // Overlay facilities
 #define MAXCLIPRECTS 100
@@ -30,22 +31,16 @@ typedef struct CRect {
 #define MenuLines   15
 #define MenuColumns 40
 
-enum eDvbColor { clrBackground,
-#ifndef DEBUG_OSD
-                 clrOBSOLETE, //FIXME apparently color '1' can't be used as FgColor with e.g. clrRed as BgColor???
-                 clrBlack,
-#else
-                 clrBlack = clrBackground,
-#endif
-                 clrRed,
-                 clrGreen,
-                 clrYellow,
-                 clrBlue,
-                 clrMagenta,
-                 clrCyan,
-                 clrWhite,
-               };
-                  
+class cResumeFile {
+private:
+  char *fileName;
+public:
+  cResumeFile(const char *FileName);
+  ~cResumeFile();
+  int Read(void);
+  bool Save(int Index);
+  };
+
 class cDvbApi {
 private:
   int videoDev;
@@ -106,6 +101,8 @@ class cDvbApi {
   enum { MaxColorPairs = 16 };
   int colorPairs[MaxColorPairs];
   void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
+#else
+  cDvbOsd *osd;
 #endif
   int cols, rows;
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
@@ -116,6 +113,7 @@ class cDvbApi {
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
+  void Flush(void);
 
   // Progress Display facilities
 
diff --git a/dvbosd.c b/dvbosd.c
new file mode 100644
index 000000000..1e2c354ea
--- /dev/null
+++ b/dvbosd.c
@@ -0,0 +1,177 @@
+/*
+ * dvbosd.c: Interface to the DVB On Screen Display
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbosd.c 1.2 2000/10/03 13:34:13 kls Exp $
+ */
+
+#include "dvbosd.h"
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/unistd.h>
+#include "tools.h"
+
+// --- cBitmap ---------------------------------------------------------------
+
+cBitmap::cBitmap(int Width, int Height)
+{
+  width = Width;
+  height = Height;
+  bitmap = NULL;
+  font = NULL;
+  if (width > 0 && height > 0) {
+     bitmap = new char[width * height];
+     if (bitmap) {
+        Clean();
+        memset(bitmap, clrTransparent, width * height);
+        SetFont(fontOsd);
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: can't allocate bitmap!");
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: illegal bitmap parameters (%d, %d)!", width, height);
+}
+
+cBitmap::~cBitmap()
+{
+  delete font;
+  delete bitmap;
+}
+
+void cBitmap::SetFont(eDvbFont Font)
+{
+  delete font;
+  font = new cFont(Font);
+}
+
+bool cBitmap::Dirty(void)
+{
+  return dirtyX2 >= 0;
+}
+
+void cBitmap::Clean(void)
+{
+  dirtyX1 = width;
+  dirtyY1 = height;
+  dirtyX2 = -1;
+  dirtyY2 = -1;
+}
+
+void cBitmap::SetPixel(int x, int y, eDvbColor Color)
+{
+  if (bitmap) {
+     if (0 <= x && x < width && 0 <= y && y < height) {
+        if (bitmap[width * y + x] != Color) {
+           bitmap[width * y + x] = Color;
+           if (dirtyX1 > x)  dirtyX1 = x;
+           if (dirtyY1 > y)  dirtyY1 = y;
+           if (dirtyX2 < x)  dirtyX2 = x;
+           if (dirtyY2 < y)  dirtyY2 = y;
+           }
+        }
+     }
+}
+
+void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
+{
+  if (bitmap) {
+     int h = font->Height(s);
+     while (s && *s) {
+           const cFont::tCharData *CharData = font->CharData(*s++);
+           if (int(x + CharData->width) > width)
+              break;
+           for (int row = 0; row < h; row++) {
+               cFont::tPixelData PixelData = CharData->lines[row];
+               for (int col = CharData->width; col-- > 0; ) {
+                   SetPixel(x + col, y + row, (PixelData & 1) ? ColorFg : ColorBg);
+                   PixelData >>= 1;
+                   }
+               }
+           x += CharData->width;
+           }
+     }
+}
+
+void cBitmap::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+{
+  if (bitmap) {
+     for (int y = y1; y <= y2; y++)
+         for (int x = x1; x <= x2; x++)
+             SetPixel(x, y, Color);
+     }
+}
+
+void cBitmap::Clear(void)
+{
+  Fill(0, 0, width - 1, height - 1, clrBackground);
+}
+
+// --- cDvbOsd ---------------------------------------------------------------
+
+cDvbOsd::cDvbOsd(int VideoDev, int x1, int y1, int x2, int y2, int Bpp)
+:cBitmap(x2 - x1 + 1, y2 - y1 + 1)
+{
+  videoDev = VideoDev;
+  if (videoDev >= 0)
+     Cmd(OSD_Open, Bpp, x1, y1, x2, y2);
+  else
+     esyslog(LOG_ERR, "ERROR: illegal video device handle (%d)!", videoDev);
+}
+
+cDvbOsd::~cDvbOsd()
+{
+  if (videoDev >= 0)
+     Cmd(OSD_Close);
+}
+
+void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
+{
+  if (videoDev >= 0) {
+     struct drawcmd dc;
+     dc.cmd   = cmd;
+     dc.color = color;
+     dc.x0    = x0;
+     dc.y0    = y0;
+     dc.x1    = x1;
+     dc.y1    = y1;
+     dc.data  = (void *)data;
+     ioctl(videoDev, VIDIOCSOSDCOMMAND, &dc);
+     usleep(10); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
+                 // XXX and sometimes the OSD was no longer displayed).
+                 // XXX Increase the value if the problem still persists on your particular system.
+                 // TODO Check if this is still necessary with driver versions after 0.7.
+     }
+}
+
+void cDvbOsd::Flush(void)
+{
+  if (Dirty()) {
+     //XXX Workaround: apparently the bitmap sent to the driver always has to be a multiple
+     //XXX of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
+     //TODO Fix driver (should be able to handle any size bitmaps!)
+     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && ((dirtyX2 - dirtyX1) & 7) != 7) {
+           if (dirtyX2 < width - 1)
+              dirtyX2++;
+           else if (dirtyX1 > 0)
+              dirtyX1--;
+           }
+     while ((dirtyY1 > 0 || dirtyY2 < height - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
+           if (dirtyY2 < height - 1)
+              dirtyY2++;
+           else if (dirtyY1 > 0)
+              dirtyY1--;
+           }
+     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
+           if (dirtyX2 < width - 1)
+              dirtyX2++;
+           else if (dirtyX1 > 0)
+              dirtyX1--;
+           }
+     Cmd(OSD_SetBlock, width, dirtyX1, dirtyY1, dirtyX2, dirtyY2, &bitmap[dirtyY1 * width + dirtyX1]);
+     Clean();
+     }
+}
+
diff --git a/dvbosd.h b/dvbosd.h
new file mode 100644
index 000000000..f7a536350
--- /dev/null
+++ b/dvbosd.h
@@ -0,0 +1,74 @@
+/*
+ * dvbosd.h: Interface to the DVB On Screen Display
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbosd.h 1.1 2000/10/01 15:00:00 kls Exp $
+ */
+
+#ifndef __DVBOSD_H
+#define __DVBOSD_H
+
+// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
+typedef unsigned int __u32;
+typedef unsigned short __u16;
+typedef unsigned char __u8;
+
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
+#include <ncurses.h>
+#endif
+#include <stdio.h>
+#include <dvb.h>
+#include "font.h"
+
+enum eDvbColor { 
+#ifndef DEBUG_OSD
+  clrTransparent,
+#endif
+  clrBackground,
+#ifdef DEBUG_OSD
+  clrTransparent = clrBackground,
+  clrBlack = clrBackground,
+#else
+  clrBlack,
+#endif
+  clrRed,
+  clrGreen,
+  clrYellow,
+  clrBlue,
+  clrMagenta,
+  clrCyan,
+  clrWhite,
+  };
+
+class cBitmap {
+private:
+  cFont *font;
+protected:
+  int width, height;
+  char *bitmap;
+  int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
+  void Clean(void);
+public:
+  cBitmap(int Width, int Height);
+  virtual ~cBitmap();
+  void SetFont(eDvbFont Font);
+  bool Dirty(void);
+  void SetPixel(int x, int y, eDvbColor Color);
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void Clear(void);
+  };
+
+class cDvbOsd : public cBitmap {
+private:
+  int videoDev;
+  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
+public:
+  cDvbOsd(int VideoDev, int x1, int y1, int x2, int y2, int Bpp);
+  ~cDvbOsd();
+  void Flush(void);
+  };
+
+#endif //__DVBOSD_H
diff --git a/eit.c b/eit.c
index d62c90252..44c873b17 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.3 2000/09/17 15:23:05 kls Exp $
+ * $Id: eit.c 1.4 2000/10/01 14:09:05 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -424,9 +424,8 @@ int cEIT::SetProgramNumber(unsigned short pnr)
 		evtRunning.bIsValid = false;
 		evtNext.bIsValid = false;
 		uProgramNumber = pnr;
-		return GetEIT();
 	}
-	return (IsValid() ? 1 : -1);
+	return 1;
 }
 
 /** retrieves the string for the running title */
@@ -503,6 +502,7 @@ char * cEIT::GetNextTime()
 /**  */
 bool cEIT::IsValid()
 {
+	GetEIT();
 	return (evtRunning.bIsValid && evtNext.bIsValid);
 }
 
diff --git a/font.c b/font.c
new file mode 100644
index 000000000..3ef40835b
--- /dev/null
+++ b/font.c
@@ -0,0 +1,41 @@
+/*
+ * font.c: Font handling for the DVB On Screen Display
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: font.c 1.1 2000/10/01 15:01:49 kls Exp $
+ */
+
+#include "font.h"
+#include "tools.h"
+
+#include "fontosd.c"
+
+cFont::cFont(eDvbFont Font)//XXX
+{
+  switch (Font) {
+    default:
+    case fontOsd: for (int i = 0; i < NUMCHARS; i++)
+                      data[i] = (tCharData *)&FontOsd[i < 32 ? 0 : i - 32];
+                  break;
+    // TODO others...
+    }
+}
+
+int cFont::Width(const char *s)
+{
+  int w = 0;
+  while (s && *s)
+        w += Width(*s++);
+  return w;
+}
+
+int cFont::Height(const char *s)
+{
+  int h = 0;
+  if (s && *s)
+     h = Height(*s); // all characters have the same height!
+  return h;
+}
+
diff --git a/font.h b/font.h
new file mode 100644
index 000000000..f31c6b599
--- /dev/null
+++ b/font.h
@@ -0,0 +1,40 @@
+/*
+ * font.h: Font handling for the DVB On Screen Display
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: font.h 1.1 2000/10/01 15:00:35 kls Exp $
+ */
+
+#ifndef __FONT_H
+#define __FONT_H
+
+enum eDvbFont {
+  fontOsd,
+/* TODO as soon as we have the font files...
+  fontTtxSmall,
+  fontTtxLarge,
+*/
+  };
+
+class cFont {
+public:
+  enum { NUMCHARS = 256 };
+  typedef unsigned long tPixelData;
+  struct tCharData {
+    tPixelData width, height;
+    tPixelData lines[1];
+    };
+private:
+  const tCharData *data[NUMCHARS];
+public:
+  cFont(eDvbFont Font);
+  int Width(unsigned char c) { return data[c]->width; }
+  int Width(const char *s);
+  int Height(unsigned char c) { return data[c]->height; }
+  int Height(const char *s);
+  const tCharData *CharData(unsigned char c) { return data[c]; }
+  };
+
+#endif //__FONT_H
diff --git a/fontosd.c b/fontosd.c
new file mode 100644
index 000000000..17d1be5a9
--- /dev/null
+++ b/fontosd.c
@@ -0,0 +1,6722 @@
+cFont::tPixelData FontOsd[][29] = {
+  {             // 32
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 33
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000044,  // ..*...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000118,  // .....*...**..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00000310,  // ....**...*...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000230,  // ....*...**...
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000620,  // ...**...*....
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000460,  // ...*...**....
+     0x00000C60,  // ..**...**....
+     0x00000C40,  // ..**...*.....
+     0x00000C40,  // ..**...*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 36
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000FF0,  // ..********...
+     0x00000CB8,  // ..**..*.***..
+     0x00001998,  // .**..**..**..
+     0x00001998,  // .**..**..**..
+     0x00001980,  // .**..**......
+     0x00001980,  // .**..**......
+     0x00000F80,  // ..*****......
+     0x000007E0,  // ...******....
+     0x000003F8,  // ....*******..
+     0x0000019C,  // .....**..***.
+     0x0000018C,  // .....**...**.
+     0x0000198C,  // .**..**...**.
+     0x0000198C,  // .**..**...**.
+     0x0000199C,  // .**..**..***.
+     0x00001D38,  // .***.*..***..
+     0x00000FF0,  // ..********...
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00038040,  // ...***........*.....
+     0x000FE0C0,  // .*******.....**.....
+     0x001C7180,  // ***...***...**......
+     0x00183100,  // **.....**...*.......
+     0x00183300,  // **.....**..**.......
+     0x001C7200,  // ***...***..*........
+     0x000FE600,  // .*******..**........
+     0x0007C400,  // ..*****...*.........
+     0x00000C78,  // .........**...****..
+     0x000018FC,  // ........**...******.
+     0x000019CC,  // ........**..***..**.
+     0x00003186,  // .......**...**....**
+     0x00002186,  // .......*....**....**
+     0x00006186,  // ......**....**....**
+     0x0000C0FC,  // .....**......******.
+     0x0000C078,  // .....**.......****..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 38
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000DC0,  // ....**.***.....
+     0x00000F80,  // ....*****......
+     0x00000F00,  // ....****.......
+     0x00001F98,  // ...******..**..
+     0x00003198,  // ..**...**..**..
+     0x000060D8,  // .**.....**.**..
+     0x00006070,  // .**......***...
+     0x00006070,  // .**......***...
+     0x00007078,  // .***.....****..
+     0x00003FDC,  // ..********.***.
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000004,  // ...*.
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 40
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000020,  // ...*....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000020,  // ...*....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000010,  // ....*...
+     0x00000018,  // ....**..
+     0x00000008,  // .....*..
+     0x00000008,  // .....*..
+  },
+  {             // 41
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000080,  // .*......
+     0x00000040,  // ..*.....
+     0x00000060,  // ..**....
+     0x00000020,  // ...*....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000020,  // ...*....
+     0x00000060,  // ..**....
+     0x00000040,  // ..*.....
+     0x00000080,  // .*......
+  },
+  {             // 42
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000020,  // ....*....
+     0x000001AC,  // .**.*.**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x00000088,  // ..*...*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 44
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 45
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 46
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     6, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000004,  // .....*.
+     0x00000004,  // .....*.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000008,  // ....*..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000010,  // ...*...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000020,  // ..*....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000040,  // .*.....
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x00000080,  // *......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000003C0,  // ....****.....
+     0x00000FC0,  // ..******.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C1C,  // ..**.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000038,  // ........***..
+     0x000000F0,  // ......****...
+     0x000003C0,  // ....****.....
+     0x00000700,  // ...***.......
+     0x00000E00,  // ..***........
+     0x00000C00,  // ..**.........
+     0x00001800,  // .**..........
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007E0,  // ...******....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x000001E0,  // .....****....
+     0x000001F8,  // .....******..
+     0x00000018,  // .........**..
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000070,  // .......***...
+     0x000000F0,  // ......****...
+     0x000000F0,  // ......****...
+     0x000001B0,  // .....**.**...
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000430,  // ...*....**...
+     0x00000C30,  // ..**....**...
+     0x00001830,  // .**.....**...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FE0,  // ..*******....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x0000181C,  // .**......***.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C18,  // .***.....**..
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E18,  // ..***....**..
+     0x00000C1C,  // ..**.....***.
+     0x00001C00,  // .***.........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000008,  // ..........*..
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000700,  // ...***.......
+     0x00000600,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x000007E0,  // ...******....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C3C,  // .***....****.
+     0x00000FFC,  // ..**********.
+     0x000003EC,  // ....*****.**.
+     0x0000000C,  // ..........**.
+     0x0000001C,  // .........***.
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 60
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000004,  // ...........*.
+     0x0000001C,  // .........***.
+     0x00000078,  // .......****..
+     0x000003C0,  // ....****.....
+     0x00000F00,  // ..****.......
+     0x00001C00,  // .***.........
+     0x00001E00,  // .****........
+     0x000003C0,  // ....****.....
+     0x000000F0,  // ......****...
+     0x0000001C,  // .........***.
+     0x00000004,  // ...........*.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 61
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 62
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001000,  // .*...........
+     0x00001C00,  // .***.........
+     0x00000780,  // ...****......
+     0x000001E0,  // .....****....
+     0x0000007C,  // .......*****.
+     0x0000000C,  // ..........**.
+     0x0000003C,  // ........****.
+     0x000000F0,  // ......****...
+     0x00000780,  // ...****......
+     0x00001E00,  // .****........
+     0x00001000,  // .*...........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00007E00,  // .........******........
+     0x0003FFC0,  // ......************.....
+     0x000781E0,  // .....****......****....
+     0x000E0070,  // ....***..........***...
+     0x001C0038,  // ...***............***..
+     0x00383D18,  // ..***.....****.*...**..
+     0x0030FF9C,  // ..**....*********..***.
+     0x0031C38C,  // ..**...***....***...**.
+     0x0061830C,  // .**....**.....**....**.
+     0x0063030C,  // .**...**......**....**.
+     0x0063030C,  // .**...**......**....**.
+     0x00630618,  // .**...**.....**....**..
+     0x00630618,  // .**...**.....**....**..
+     0x00738E30,  // .***..***...***...**...
+     0x0031FFE0,  // ..**...************....
+     0x0038E3C0,  // ..***...***...****.....
+     0x001C0000,  // ...***.................
+     0x000F0000,  // ....****...............
+     0x0007FF00,  // .....***********.......
+     0x0000FE00,  // ........*******........
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 65
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x00007030,  // ...***......**...
+     0x00007FF0,  // ...***********...
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 68
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FF80,  // ..*********......
+     0x0000FFE0,  // ..***********....
+     0x0000C0E0,  // ..**......***....
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C0E0,  // ..**......***....
+     0x0000FFE0,  // ..***********....
+     0x0000FF80,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 69
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C030,  // ..***........**...
+     0x00018018,  // ..**..........**..
+     0x00038000,  // .***..............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x000303F8,  // .**......*******..
+     0x000303F8,  // .**......*******..
+     0x00030018,  // .**...........**..
+     0x00038018,  // .***..........**..
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E078,  // ...***......****..
+     0x00007FD8,  // ....*********.**..
+     0x00001F88,  // ......******...*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 72
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000FFF8,  // ..*************..
+     0x0000FFF8,  // ..*************..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 73
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00001818,  // **......**..
+     0x00001818,  // **......**..
+     0x00001C38,  // ***....***..
+     0x00000FF0,  // .********...
+     0x000007E0,  // ..******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 75
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000300E,  // ..**........***
+     0x0000301C,  // ..**.......***.
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003780,  // ..**.****......
+     0x00003F80,  // ..*******......
+     0x00003DC0,  // ..****.***.....
+     0x000038E0,  // ..***...***....
+     0x00003060,  // ..**.....**....
+     0x00003030,  // ..**......**...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300E,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 77
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00038038,  // ..***.........***..
+     0x00038038,  // ..***.........***..
+     0x0003C038,  // ..****........***..
+     0x0003C078,  // ..****.......****..
+     0x0003C078,  // ..****.......****..
+     0x00036058,  // ..**.**......*.**..
+     0x000360D8,  // ..**.**.....**.**..
+     0x000360D8,  // ..**.**.....**.**..
+     0x00033098,  // ..**..**....*..**..
+     0x00033198,  // ..**..**...**..**..
+     0x00033198,  // ..**..**...**..**..
+     0x00031918,  // ..**...**..*...**..
+     0x00031B18,  // ..**...**.**...**..
+     0x00031B18,  // ..**...**.**...**..
+     0x00030F18,  // ..**....****...**..
+     0x00030E18,  // ..**....***....**..
+     0x00030E18,  // ..**....***....**..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 78
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 79
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000301C,  // ..**.......***.
+     0x00003FF8,  // ..***********..
+     0x00003FE0,  // ..*********....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018098,  // ..**.......*..**..
+     0x0001C1F8,  // ..***.....******..
+     0x0000E0F0,  // ...***.....****...
+     0x00007FF0,  // ....***********...
+     0x00001F9C,  // ......******..***.
+     0x00000008,  // ...............*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFC0,  // ..**********.....
+     0x0000FFF0,  // ..************...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C030,  // ..**........**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 83
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00003018,  // ..**.......**..
+     0x00003008,  // ..**........*..
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FF0,  // ....********...
+     0x000000F8,  // ........*****..
+     0x0000001C,  // ...........***.
+     0x0000000C,  // ............**.
+     0x0000600C,  // .**.........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 86
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000301C,  // ..**.......***.
+     0x00003818,  // ..***......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C30,  // ...***....**...
+     0x00000C30,  // ....**....**...
+     0x00000C70,  // ....**...***...
+     0x00000E60,  // ....***..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x000007C0,  // .....*****.....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     22, 27,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x0030180C,  // .**.......**.......**.
+     0x0030380C,  // .**......***.......**.
+     0x00303C1C,  // .**......****.....***.
+     0x00383C1C,  // .***.....****.....***.
+     0x00183C18,  // ..**.....****.....**..
+     0x00186618,  // ..**....**..**....**..
+     0x00186618,  // ..**....**..**....**..
+     0x001C6638,  // ..***...**..**...***..
+     0x000CC630,  // ...**..**...**...**...
+     0x000CC330,  // ...**..**....**..**...
+     0x000CC330,  // ...**..**....**..**...
+     0x000EC370,  // ...***.**....**.***...
+     0x000781E0,  // ....****......****....
+     0x000781E0,  // ....****......****....
+     0x000781E0,  // ....****......****....
+     0x000781C0,  // ....****......***.....
+     0x000300C0,  // .....**........**.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000700C,  // .***........**.
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C70,  // ....**...***...
+     0x00000660,  // .....**..**....
+     0x000007C0,  // .....*****.....
+     0x000003C0,  // ......****.....
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000006C0,  // .....**.**.....
+     0x00000E60,  // ....***..**....
+     0x00001C70,  // ...***...***...
+     0x00001838,  // ...**.....***..
+     0x00003818,  // ..***......**..
+     0x0000701C,  // .***.......***.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700E,  // .***........***
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C30,  // ....**....**...
+     0x00000E60,  // ....***..**....
+     0x00000760,  // .....***.**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x0000001C,  // ..........***.
+     0x00000018,  // ..........**..
+     0x00000038,  // .........***..
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001C00,  // ..***.........
+     0x00003800,  // .***..........
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 91
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+  },
+  {             // 92
+     6, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000080,  // *......
+     0x000000C0,  // **.....
+     0x00000040,  // .*.....
+     0x00000040,  // .*.....
+     0x00000060,  // .**....
+     0x00000020,  // ..*....
+     0x00000020,  // ..*....
+     0x00000020,  // ..*....
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x0000000C,  // ....**.
+     0x00000004,  // .....*.
+     0x00000004,  // .....*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 93
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+  },
+  {             // 94
+     11, 27,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001A0,  // ...**.*....
+     0x000001B0,  // ...**.**...
+     0x00000110,  // ...*...*...
+     0x00000318,  // ..**...**..
+     0x00000218,  // ..*....**..
+     0x00000608,  // .**.....*..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 95
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000000,  // .............
+  },
+  {             // 96
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 97
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 98
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 99
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 100
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 101
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 102
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001E,  // ..****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x000007F8,  // ...********..
+     0x000003D8,  // ....****.**..
+     0x00000018,  // .........**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x000007C0,  // ...*****.....
+  },
+  {             // 104
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000DF0,  // ..**.*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 106
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+  },
+  {             // 107
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C18,  // .**.....**..
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000CC0,  // .**..**.....
+     0x00000FC0,  // .******.....
+     0x00000FC0,  // .******.....
+     0x00000E60,  // .***..**....
+     0x00000C70,  // .**...***...
+     0x00000C30,  // .**....**...
+     0x00000C18,  // .**.....**..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 108
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 109
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00037CF8,  // ..**.*****..*****..
+     0x0003FFFC,  // ..****************.
+     0x0003870C,  // ..***....***....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 110
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 111
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 112
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000019E0,  // .**..****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 113
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007D8,  // ...*****.**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+  },
+  {             // 114
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x0000007C,  // ..*****.
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 115
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x000007F8,  // ..********..
+     0x00000C18,  // .**.....**..
+     0x00000C00,  // .**.........
+     0x00000E00,  // .***........
+     0x000007E0,  // ..******....
+     0x000001F8,  // ....******..
+     0x0000001C,  // ........***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 116
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 118
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0C,  // ***......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000E18,  // .***....**..
+     0x00000638,  // ..**...***..
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 119
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0003060C,  // **.....**.....**.
+     0x0001870C,  // .**....***....**.
+     0x00018F1C,  // .**...****...***.
+     0x00018F18,  // .**...****...**..
+     0x00018D98,  // .**...**.**..**..
+     0x0000C998,  // ..**..*..**..**..
+     0x0000D9B0,  // ..**.**..**.**...
+     0x0000D9B0,  // ..**.**..**.**...
+     0x000058F0,  // ...*.**...****...
+     0x000070F0,  // ...***....****...
+     0x000070E0,  // ...***....***....
+     0x000070E0,  // ...***....***....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 120
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C1C,  // .**.....***.
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000003E0,  // ...*****....
+     0x00000370,  // ...**.***...
+     0x00000630,  // ..**...**...
+     0x00000E18,  // .***....**..
+     0x00000C1C,  // .**.....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
+  },
+  {             // 122
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 123
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ....**..
+     0x00000038,  // ...***..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000070,  // ..***...
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000038,  // ...***..
+     0x00000018,  // ....**..
+  },
+  {             // 124
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+  },
+  {             // 125
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000C0,  // .**.....
+     0x000000E0,  // .***....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000038,  // ...***..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
+  },
+  {             // 126
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000700,  // ...***.......
+     0x00000F8C,  // ..*****...**.
+     0x000008FC,  // ..*...******.
+     0x00000038,  // ........***..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 127
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 161
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+  },
+  {             // 162
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000003F0,  // ....******...
+     0x00000FF8,  // ..*********..
+     0x00000E58,  // ..***..*.**..
+     0x00001C4C,  // .***...*..**.
+     0x00001840,  // .**....*.....
+     0x00001840,  // .**....*.....
+     0x00001880,  // .**...*......
+     0x00001880,  // .**...*......
+     0x0000188C,  // .**...*...**.
+     0x00000C9C,  // ..**..*..***.
+     0x00000EB8,  // ..***.*.***..
+     0x000007F0,  // ...*******...
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 163
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000E00,  // ..***........
+     0x00001FC0,  // .*******.....
+     0x00001F40,  // .*****.*.....
+     0x00000700,  // ...***.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000600,  // ...**........
+     0x00000C00,  // ..**.........
+     0x00001FFC,  // .***********.
+     0x00001FF8,  // .**********..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 164
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000408,  // ...*......*..
+     0x00000FD8,  // ..******.**..
+     0x00000FF8,  // ..*********..
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x00000FD8,  // ..******.**..
+     0x00000408,  // ...*......*..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 165
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00000C18,  // ..**.....**..
+     0x00000C30,  // ..**....**...
+     0x00000620,  // ...**...*....
+     0x00000260,  // ....*..**....
+     0x000003C0,  // ....****.....
+     0x00001DF8,  // .***.******..
+     0x00001FF8,  // .**********..
+     0x00000180,  // .....**......
+     0x00001FF8,  // .**********..
+     0x00001FF8,  // .**********..
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 166
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+  },
+  {             // 167
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E00,  // ..***........
+     0x00000780,  // ...****......
+     0x00000DE0,  // ..**.****....
+     0x000018F0,  // .**...****...
+     0x00001838,  // .**.....***..
+     0x0000181C,  // .**......***.
+     0x00001C0C,  // .***......**.
+     0x00000E0C,  // ..***.....**.
+     0x00000798,  // ...****..**..
+     0x000001F0,  // .....*****...
+     0x000000E0,  // ......***....
+     0x00000070,  // .......***...
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000E30,  // ..***...**...
+     0x000007E0,  // ...******....
+     0x000003C0,  // ....****.....
+  },
+  {             // 168
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 169
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F078,  // ...****.....****..
+     0x0001C718,  // ..***...***...**..
+     0x00038F8C,  // .***...*****...**.
+     0x000318CC,  // .**...**...**..**.
+     0x00063046,  // **...**.....*...**
+     0x00063006,  // **...**.........**
+     0x00063006,  // **...**.........**
+     0x00063006,  // **...**.........**
+     0x00063066,  // **...**.....**..**
+     0x000318C6,  // .**...**...**...**
+     0x00031FCC,  // .**...*******..**.
+     0x0001879C,  // ..**....****..***.
+     0x0000E078,  // ...***......****..
+     0x00007FF0,  // ....***********...
+     0x00001F80,  // ......******......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 170
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x00000018,  // .....**..
+     0x00000078,  // ...****..
+     0x00000198,  // .**..**..
+     0x00000198,  // .**..**..
+     0x000001FC,  // .*******.
+     0x000000EC,  // ..***.**.
+     0x000001F8,  // .******..
+     0x000001F8,  // .******..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 171
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000110,  // .....*...*...
+     0x00000310,  // ....**...*...
+     0x00000670,  // ...**..***...
+     0x00000C40,  // ..**...*.....
+     0x00000C60,  // ..**...**....
+     0x00000730,  // ...***..**...
+     0x00000310,  // ....**...*...
+     0x00000110,  // .....*...*...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 172
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 173
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000F8,  // .*****..
+     0x000000F8,  // .*****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 174
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F078,  // ...****.....****..
+     0x0001FF98,  // ..**********..**..
+     0x0003BFCC,  // .***.********..**.
+     0x0003306C,  // .**..**.....**.**.
+     0x00063066,  // **...**.....**..**
+     0x00063066,  // **...**.....**..**
+     0x00063FC6,  // **...********...**
+     0x00063FE6,  // **...*********..**
+     0x00063066,  // **...**.....**..**
+     0x0003306E,  // .**..**.....**.***
+     0x0003306C,  // .**..**.....**.**.
+     0x0001F07C,  // ..*****.....*****.
+     0x0000E078,  // ...***......****..
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 175
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 176
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x000007E0,  // ....******....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000007E0,  // ....******....
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 177
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 178
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FE,  // .*******
+     0x00000086,  // .*....**
+     0x00000006,  // ......**
+     0x0000000C,  // .....**.
+     0x00000030,  // ...**...
+     0x000000E0,  // .***....
+     0x00000080,  // .*......
+     0x000000FE,  // .*******
+     0x0000007E,  // ..******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FC,  // .******.
+     0x0000008C,  // .*...**.
+     0x0000000C,  // .....**.
+     0x00000038,  // ...***..
+     0x0000000C,  // .....**.
+     0x00000006,  // ......**
+     0x00000186,  // **....**
+     0x000000FC,  // .******.
+     0x00000078,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x00000038,  // ...***..
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 181
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x00001FDE,  // .*******.****
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 182
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001FE,  // ....********
+     0x000003FE,  // ...*********
+     0x000007EC,  // ..******.**.
+     0x000007EC,  // ..******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x000007EC,  // ..******.**.
+     0x000007EC,  // ..******.**.
+     0x000001EC,  // ....****.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x00000000,  // ............
+  },
+  {             // 183
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000010,  // ....*...
+     0x00000038,  // ...***..
+     0x0000003C,  // ...****.
+     0x000000FC,  // .******.
+     0x00000038,  // ...***..
+  },
+  {             // 185
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000010,  // ....*...
+     0x00000070,  // ..***...
+     0x000000F0,  // .****...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 186
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x0000007C,  // ..*****.
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x0000007C,  // ..*****.
+     0x00000038,  // ...***..
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 187
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000840,  // ..*....*.....
+     0x00000C60,  // ..**...**....
+     0x00000730,  // ...***..**...
+     0x00000310,  // ....**...*...
+     0x00000330,  // ....**..**...
+     0x00000E60,  // ..***..**....
+     0x00000C40,  // ..**...*.....
+     0x00000840,  // ..*....*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 188
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00030060,  // ...**.........**....
+     0x00070040,  // ..***.........*.....
+     0x000F0080,  // .****........*......
+     0x00030180,  // ...**.......**......
+     0x00030300,  // ...**......**.......
+     0x00030200,  // ...**......*........
+     0x00030618,  // ...**.....**....**..
+     0x00030C18,  // ...**....**.....**..
+     0x00030C38,  // ...**....**....***..
+     0x00001878,  // ........**....****..
+     0x000030D8,  // .......**....**.**..
+     0x00007098,  // ......***....*..**..
+     0x000061FE,  // ......**....********
+     0x0000C1FE,  // .....**.....********
+     0x0001C018,  // ....***.........**..
+     0x00018008,  // ....**...........*..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 189
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00030040,  // ...**.........*.....
+     0x00070080,  // ..***........*......
+     0x000F0180,  // .****.......**......
+     0x00030100,  // ...**.......*.......
+     0x00030300,  // ...**......**.......
+     0x00030600,  // ...**.....**........
+     0x00030C78,  // ...**....**...****..
+     0x00030CFC,  // ...**....**..******.
+     0x00031886,  // ...**...**...*....**
+     0x00003086,  // .......**....*....**
+     0x0000300C,  // .......**........**.
+     0x00006018,  // ......**........**..
+     0x0000C060,  // .....**.......**....
+     0x0000C080,  // .....**......*......
+     0x000181FE,  // ....**......********
+     0x0003007E,  // ...**.........******
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 190
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00078020,  // ..****.........*....
+     0x000FC060,  // .******.......**....
+     0x0008C0C0,  // .*...**......**.....
+     0x0000C080,  // .....**......*......
+     0x00038180,  // ...***......**......
+     0x0000C300,  // .....**....**.......
+     0x00006218,  // ......**...*....**..
+     0x00186418,  // **....**..*.....**..
+     0x000FCC38,  // .******..**....***..
+     0x00078878,  // ..****...*....****..
+     0x000010D8,  // ........*....**.**..
+     0x00003098,  // .......**....*..**..
+     0x000021FE,  // .......*....********
+     0x000041FE,  // ......*.....********
+     0x00008018,  // .....*..........**..
+     0x00008008,  // .....*...........*..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 191
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001C38,  // ..***....***..
+     0x00000FF0,  // ...********...
+     0x000007C0,  // ....*****.....
+  },
+  {             // 192
+     15, 27,
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000100,  // .......*.......
+     0x00000080,  // ........*......
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 27,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000006C0,  // .....**.**.....
+     0x00000460,  // .....*...**....
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 27,
+     0x00000000,  // ...............
+     0x00000720,  // .....***..*....
+     0x00000FE0,  // ....*******....
+     0x00000040,  // .........*.....
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 27,
+     0x00000000,  // ...............
+     0x000006E0,  // .....**.***....
+     0x000006E0,  // .....**.***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 27,
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x00000240,  // ......*..*.....
+     0x00000380,  // ......***......
+     0x00000180,  // .......**......
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x0001FFF8,  // .......**************..
+     0x0001FFF8,  // .......**************..
+     0x00031800,  // ......**...**..........
+     0x00031800,  // ......**...**..........
+     0x00061800,  // .....**....**..........
+     0x00061800,  // .....**....**..........
+     0x000E1800,  // ....***....**..........
+     0x000C1FF8,  // ....**.....**********..
+     0x000C1FF8,  // ....**.....**********..
+     0x00181800,  // ...**......**..........
+     0x001FF800,  // ...**********..........
+     0x003FF800,  // ..***********..........
+     0x00301800,  // ..**.......**..........
+     0x00301800,  // ..**.......**..........
+     0x00701800,  // .***.......**..........
+     0x00601FFC,  // .**........***********.
+     0x00E01FFC,  // ***........***********.
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 199
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006030,  // ...**.......**...
+     0x000078F0,  // ...****...****...
+     0x00001FE0,  // .....********....
+     0x00000200,  // ........*........
+     0x00000700,  // .......***.......
+     0x00000380,  // ........***......
+     0x00000F80,  // ......*****......
+     0x00000700,  // .......***.......
+  },
+  {             // 200
+     15, 27,
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000080,  // ........*......
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 27,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x00000640,  // .....**..*.....
+     0x00000460,  // .....*...**....
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 27,
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     6, 27,
+     0x00000070,  // ***...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 27,
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 27,
+     0x00000030,  // ..**...
+     0x00000078,  // .****..
+     0x0000004C,  // .*..**.
+     0x000000C4,  // **...*.
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 207
+     6, 27,
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FF80,  // ..*********......
+     0x0000FFE0,  // ..***********....
+     0x0000C0F0,  // ..**......****...
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0003FC18,  // ********.....**..
+     0x0003FC18,  // ********.....**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C0E0,  // ..**......***....
+     0x0000FFE0,  // ..***********....
+     0x0000FF80,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 209
+     17, 27,
+     0x00000000,  // .................
+     0x00000EC0,  // ......***.**.....
+     0x00001FC0,  // .....*******.....
+     0x00000180,  // .........**......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 210
+     18, 27,
+     0x00001800,  // ......**..........
+     0x00000C00,  // .......**.........
+     0x00000600,  // ........**........
+     0x00000200,  // .........*........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 211
+     18, 27,
+     0x00000180,  // ..........**......
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000400,  // ........*.........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 212
+     18, 27,
+     0x00000600,  // ........**........
+     0x00000F00,  // .......****.......
+     0x00000900,  // .......*..*.......
+     0x00001080,  // ......*....*......
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 213
+     18, 27,
+     0x00000000,  // ..................
+     0x00001CC0,  // ......***..**.....
+     0x00001F80,  // ......******......
+     0x00000180,  // ..........**......
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 214
+     18, 27,
+     0x00000000,  // ..................
+     0x00001980,  // ......**..**......
+     0x00001980,  // ......**..**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 215
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000408,  // ...*......*..
+     0x00000E18,  // ..***....**..
+     0x00000730,  // ...***..**...
+     0x000003E0,  // ....*****....
+     0x000001C0,  // .....***.....
+     0x000001E0,  // .....****....
+     0x00000370,  // ....**.***...
+     0x00000638,  // ...**...***..
+     0x00000418,  // ...*.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 216
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F8C,  // ......******...**.
+     0x00007FE8,  // ....**********.*..
+     0x0000E070,  // ...***......***...
+     0x0001C038,  // ..***........***..
+     0x00018058,  // ..**........*.**..
+     0x0003809C,  // .***.......*..***.
+     0x0003018C,  // .**.......**...**.
+     0x0003030C,  // .**......**....**.
+     0x0003060C,  // .**.....**.....**.
+     0x00030C0C,  // .**....**......**.
+     0x0003180C,  // .**...**.......**.
+     0x0003300C,  // .**..**........**.
+     0x0001E018,  // ..****........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x0003FFE0,  // .*************....
+     0x00023F80,  // .*...*******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 217
+     17, 27,
+     0x00001C00,  // .....***.........
+     0x00000C00,  // ......**.........
+     0x00000600,  // .......**........
+     0x00000300,  // ........**.......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 218
+     17, 27,
+     0x00000180,  // .........**......
+     0x00000300,  // ........**.......
+     0x00000200,  // ........*........
+     0x00000400,  // .......*.........
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 219
+     17, 27,
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 220
+     17, 27,
+     0x00000000,  // .................
+     0x00001D80,  // .....***.**......
+     0x00001D80,  // .....***.**......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 221
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700E,  // .***........***
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C30,  // ....**....**...
+     0x00000E60,  // ....***..**....
+     0x00000760,  // .....***.**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003038,  // ..**......***..
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x000007F0,  // ....*******...
+     0x00000E38,  // ...***...***..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C38,  // ...**....***..
+     0x00000CE0,  // ...**..***....
+     0x00000CF0,  // ...**..****...
+     0x00000C18,  // ...**.....**..
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C18,  // ...**.....**..
+     0x00000CF8,  // ...**..*****..
+     0x00000CE0,  // ...**..***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 224
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 225
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 226
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 227
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 228
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000760,  // ...***.**....
+     0x00000760,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x000001C0,  // .....***.....
+     0x00000240,  // ....*..*.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 230
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0001F3F0,  // ....*****..******...
+     0x0007FFF8,  // ..****************..
+     0x00060E1C,  // ..**.....***....***.
+     0x00040C0C,  // ..*......**......**.
+     0x00001C0C,  // ........***......**.
+     0x0003FFFC,  // ...****************.
+     0x0007EFFC,  // ..******.**********.
+     0x000E0C00,  // .***.....**.........
+     0x000C0C0C,  // .**......**......**.
+     0x000C1E1C,  // .**.....****....***.
+     0x000FF7F8,  // .********.********..
+     0x0007C3F0,  // ..*****....******...
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 231
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x00000738,  // ..***..***..
+     0x000003F0,  // ...******...
+     0x00000080,  // .....*......
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000003E0,  // ...*****....
+     0x000000C0,  // .....**.....
+  },
+  {             // 232
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 233
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // .......***...
+     0x000000E0,  // ......***....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 234
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000160,  // .....*.**....
+     0x00000320,  // ....**..*....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 235
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000370,  // ....**.***...
+     0x00000370,  // ....**.***...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 236
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000070,  // ***...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 237
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 238
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // ..***.
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 239
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 240
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000420,  // ...*....*....
+     0x000007C0,  // ...*****.....
+     0x00000780,  // ...****......
+     0x000004C0,  // ...*..**.....
+     0x000000E0,  // ......***....
+     0x000003F0,  // ....******...
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 241
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 242
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 243
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 244
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 245
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 246
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000760,  // ...***.**....
+     0x00000760,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 247
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 248
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C8,  // ....*****..*..
+     0x00001FF0,  // ..*********...
+     0x00001830,  // ..**.....**...
+     0x00003078,  // .**.....****..
+     0x00003098,  // .**....*..**..
+     0x00003198,  // .**...**..**..
+     0x00003318,  // .**..**...**..
+     0x00003618,  // .**.**....**..
+     0x00003438,  // .**.*....***..
+     0x00001870,  // ..**....***...
+     0x00001FE0,  // ..********....
+     0x000027C0,  // .*..*****.....
+     0x00002000,  // .*............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 249
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000700,  // ...***.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 250
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // ......***....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 251
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 252
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000006E0,  // ...**.***....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 253
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
+  },
+  {             // 254
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000019E0,  // .**..****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 255
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000370,  // ...**.***...
+     0x00000370,  // ...**.***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
+  },
+  };
diff --git a/genfontfile.c b/genfontfile.c
new file mode 100644
index 000000000..a98f80124
--- /dev/null
+++ b/genfontfile.c
@@ -0,0 +1,378 @@
+/* Copyright (c) Mark J. Kilgard, 1997. */
+
+/* This program is freely distributable without licensing fees  and is
+   provided without guarantee or warrantee expressed or  implied. This
+   program is -not- in the public domain. */
+
+/* X compile line: cc -o gentexfont gentexfont.c -lX11 */
+
+/* 2000-10-01: Stripped down the original code to get a simple bitmap C-code generator  */
+/*             for use with the VDR project (see http://www.cadsoft.de/people/kls/vdr)  */
+/*             Renamed the file 'genfontfile.c' since it no longer generates 'tex' data */
+/*             Klaus Schmidinger (kls@cadsoft.de)                                       */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <math.h>
+
+typedef struct {
+  unsigned short c;       /* Potentially support 16-bit glyphs. */
+  unsigned char width;
+  unsigned char height;
+  signed char xoffset;
+  signed char yoffset;
+  signed char advance;
+  char dummy;           /* Space holder for alignment reasons. */
+  short x;
+  short y;
+} TexGlyphInfo;
+
+typedef struct {
+  short width;
+  short height;
+  short xoffset;
+  short yoffset;
+  short advance;
+  unsigned char *bitmap;
+} PerGlyphInfo, *PerGlyphInfoPtr;
+
+typedef struct {
+  int min_char;
+  int max_char;
+  int max_ascent;
+  int max_descent;
+  PerGlyphInfo glyph[1];
+} FontInfo, *FontInfoPtr;
+
+Display *dpy;
+FontInfoPtr fontinfo;
+
+/* #define REPORT_GLYPHS */
+#ifdef REPORT_GLYPHS
+#define DEBUG_GLYPH4(msg,a,b,c,d) printf(msg,a,b,c,d)
+#define DEBUG_GLYPH(msg) printf(msg)
+#else
+#define DEBUG_GLYPH4(msg,a,b,c,d) { /* nothing */ }
+#define DEBUG_GLYPH(msg) { /* nothing */ }
+#endif
+
+#define MAX_GLYPHS_PER_GRAB 512  /* this is big enough for 2^9 glyph
+                                    character sets */
+
+FontInfoPtr
+SuckGlyphsFromServer(Display * dpy, Font font)
+{
+  Pixmap offscreen;
+  XFontStruct *fontinfo;
+  XImage *image;
+  GC xgc;
+  XGCValues values;
+  int numchars;
+  int width, height, pixwidth;
+  int i, j;
+  XCharStruct *charinfo;
+  XChar2b character;
+  unsigned char *bitmapData;
+  int x, y;
+  int spanLength;
+  int charWidth, charHeight, maxSpanLength;
+  int grabList[MAX_GLYPHS_PER_GRAB];
+  int glyphsPerGrab = MAX_GLYPHS_PER_GRAB;
+  int numToGrab, thisglyph;
+  FontInfoPtr myfontinfo;
+
+  fontinfo = XQueryFont(dpy, font);
+  if (!fontinfo)
+    return NULL;
+
+  numchars = fontinfo->max_char_or_byte2 - fontinfo->min_char_or_byte2 + 1;
+  if (numchars < 1)
+    return NULL;
+
+  myfontinfo = (FontInfoPtr) malloc(sizeof(FontInfo) + (numchars - 1) * sizeof(PerGlyphInfo));
+  if (!myfontinfo)
+    return NULL;
+
+  myfontinfo->min_char = fontinfo->min_char_or_byte2;
+  myfontinfo->max_char = fontinfo->max_char_or_byte2;
+  myfontinfo->max_ascent = fontinfo->max_bounds.ascent;
+  myfontinfo->max_descent = fontinfo->max_bounds.descent;
+
+  width = fontinfo->max_bounds.rbearing - fontinfo->min_bounds.lbearing;
+  height = fontinfo->max_bounds.ascent + fontinfo->max_bounds.descent;
+
+  maxSpanLength = (width + 7) / 8;
+  /* Be careful determining the width of the pixmap; the X protocol allows
+     pixmaps of width 2^16-1 (unsigned short size) but drawing coordinates
+     max out at 2^15-1 (signed short size).  If the width is too large, we
+     need to limit the glyphs per grab.  */
+  if ((glyphsPerGrab * 8 * maxSpanLength) >= (1 << 15)) {
+    glyphsPerGrab = (1 << 15) / (8 * maxSpanLength);
+  }
+  pixwidth = glyphsPerGrab * 8 * maxSpanLength;
+  offscreen = XCreatePixmap(dpy, RootWindow(dpy, DefaultScreen(dpy)),
+    pixwidth, height, 1);
+
+  values.font = font;
+  values.background = 0;
+  values.foreground = 0;
+  xgc = XCreateGC(dpy, offscreen, GCFont | GCBackground | GCForeground, &values);
+
+  XFillRectangle(dpy, offscreen, xgc, 0, 0, 8 * maxSpanLength * glyphsPerGrab, height);
+  XSetForeground(dpy, xgc, 1);
+
+  numToGrab = 0;
+  if (fontinfo->per_char == NULL) {
+    charinfo = &(fontinfo->min_bounds);
+    charWidth = charinfo->rbearing - charinfo->lbearing;
+    charHeight = charinfo->ascent + charinfo->descent;
+    spanLength = (charWidth + 7) / 8;
+  }
+  for (i = 0; i < numchars; i++) {
+    if (fontinfo->per_char != NULL) {
+      charinfo = &(fontinfo->per_char[i]);
+      charWidth = charinfo->rbearing - charinfo->lbearing;
+      charHeight = charinfo->ascent + charinfo->descent;
+      if (charWidth == 0 || charHeight == 0) {
+        /* Still must move raster pos even if empty character */
+        myfontinfo->glyph[i].width = 0;
+        myfontinfo->glyph[i].height = 0;
+        myfontinfo->glyph[i].xoffset = 0;
+        myfontinfo->glyph[i].yoffset = 0;
+        myfontinfo->glyph[i].advance = charinfo->width;
+        myfontinfo->glyph[i].bitmap = NULL;
+        goto PossiblyDoGrab;
+      }
+    }
+    grabList[numToGrab] = i;
+
+    /* XXX is this right for large fonts? */
+    character.byte2 = (i + fontinfo->min_char_or_byte2) & 255;
+    character.byte1 = (i + fontinfo->min_char_or_byte2) >> 8;
+
+    /* XXX we could use XDrawImageString16 which would also paint the backing 
+
+       rectangle but X server bugs in some scalable font rasterizers makes it 
+
+       more effective to do XFillRectangles to clear the pixmap and
+       XDrawImage16 for the text.  */
+    XDrawString16(dpy, offscreen, xgc,
+      -charinfo->lbearing + 8 * maxSpanLength * numToGrab,
+      charinfo->ascent, &character, 1);
+
+    numToGrab++;
+
+  PossiblyDoGrab:
+
+    if (numToGrab >= glyphsPerGrab || i == numchars - 1) {
+      image = XGetImage(dpy, offscreen,
+        0, 0, pixwidth, height, 1, XYPixmap);
+      for (j = 0; j < numToGrab; j++) {
+        thisglyph = grabList[j];
+        if (fontinfo->per_char != NULL) {
+          charinfo = &(fontinfo->per_char[thisglyph]);
+          charWidth = charinfo->rbearing - charinfo->lbearing;
+          charHeight = charinfo->ascent + charinfo->descent;
+          spanLength = (charWidth + 7) / 8;
+        }
+        bitmapData = calloc(height * spanLength, sizeof(char));
+        if (!bitmapData)
+          goto FreeFontAndReturn;
+        DEBUG_GLYPH4("index %d, glyph %d (%d by %d)\n",
+          j, thisglyph + fontinfo->min_char_or_byte2, charWidth, charHeight);
+        for (y = 0; y < charHeight; y++) {
+          for (x = 0; x < charWidth; x++) {
+            /* XXX The algorithm used to suck across the font ensures that
+               each glyph begins on a byte boundary.  In theory this would
+               make it convienent to copy the glyph into a byte oriented
+               bitmap.  We actually use the XGetPixel function to extract
+               each pixel from the image which is not that efficient.  We
+               could either do tighter packing in the pixmap or more
+               efficient extraction from the image.  Oh well.  */
+            if (XGetPixel(image, j * maxSpanLength * 8 + x, charHeight - 1 - y)) {
+              DEBUG_GLYPH("x");
+              bitmapData[y * spanLength + x / 8] |= (1 << (x & 7));
+            } else {
+              DEBUG_GLYPH(" ");
+            }
+          }
+          DEBUG_GLYPH("\n");
+        }
+        myfontinfo->glyph[thisglyph].width = charWidth;
+        myfontinfo->glyph[thisglyph].height = charHeight;
+        myfontinfo->glyph[thisglyph].xoffset = charinfo->lbearing;
+        myfontinfo->glyph[thisglyph].yoffset = -charinfo->descent;
+        myfontinfo->glyph[thisglyph].advance = charinfo->width;
+        myfontinfo->glyph[thisglyph].bitmap = bitmapData;
+      }
+      XDestroyImage(image);
+      numToGrab = 0;
+      /* do we need to clear the offscreen pixmap to get more? */
+      if (i < numchars - 1) {
+        XSetForeground(dpy, xgc, 0);
+        XFillRectangle(dpy, offscreen, xgc, 0, 0, 8 * maxSpanLength * glyphsPerGrab, height);
+        XSetForeground(dpy, xgc, 1);
+      }
+    }
+  }
+  XFreeGC(dpy, xgc);
+  XFreePixmap(dpy, offscreen);
+  return myfontinfo;
+
+FreeFontAndReturn:
+  XDestroyImage(image);
+  XFreeGC(dpy, xgc);
+  XFreePixmap(dpy, offscreen);
+  for (j = i - 1; j >= 0; j--) {
+    if (myfontinfo->glyph[j].bitmap)
+      free(myfontinfo->glyph[j].bitmap);
+  }
+  free(myfontinfo);
+  return NULL;
+}
+
+void
+printGlyph(FontInfoPtr font, int c)
+{
+  PerGlyphInfoPtr glyph;
+  unsigned char *bitmapData;
+  int width, height, spanLength;
+  int x, y, l;
+  char buf[1000], *b;
+
+  if (c < font->min_char || c > font->max_char) {
+    fprintf(stderr, "out of range glyph\n");
+    exit(1);
+  }
+  glyph = &font->glyph[c - font->min_char];
+  bitmapData = glyph->bitmap;
+    width = glyph->width;
+    spanLength = (width + 7) / 8;
+    height = glyph->height;
+
+    printf("  {             // %d\n", c);
+    printf("     %d, %d,\n", glyph->advance, font->max_ascent + font->max_descent);
+    for (y = 0; y < font->max_ascent - glyph->yoffset - height; y++) {
+        printf("     0x%08X,  // ", 0);
+        for (x = 0; x < glyph->xoffset + width || x < glyph->advance; x++)
+            putchar('.');
+        putchar('\n');
+        }
+    for (y = height; y-- > 0;) {
+        l = 0;
+        b = buf;
+        for (x = 0; x < glyph->xoffset; x++)
+            *b++ = '.';
+        if (bitmapData) {
+           for (x = 0; x < width; x++) {
+               if (bitmapData[y * spanLength + x / 8] & (1 << (x & 7))) {
+                  *b++ = '*';
+                  l |= 1;
+                  }
+               else
+                  *b++ = '.';
+               l <<= 1;
+               }
+           for (x = 0; x < glyph->advance - width - glyph->xoffset; x++) {
+               *b++ = '.';
+               l <<= 1;
+               }
+           }
+        *b = 0;
+        printf("     0x%08X,  // %s\n", l, buf);
+        }
+    for (y = 0; y < font->max_descent + glyph->yoffset; y++) {
+        printf("     0x%08X,  // ", 0);
+        for (x = 0; x < glyph->xoffset + width || x < glyph->advance; x++)
+            putchar('.');
+        putchar('\n');
+        }
+    printf("  },\n");
+}
+
+void
+getMetric(FontInfoPtr font, int c, TexGlyphInfo * tgi)
+{
+  PerGlyphInfoPtr glyph;
+  unsigned char *bitmapData;
+
+  tgi->c = c;
+  if (c < font->min_char || c > font->max_char) {
+    tgi->width = 0;
+    tgi->height = 0;
+    tgi->xoffset = 0;
+    tgi->yoffset = 0;
+    tgi->dummy = 0;
+    tgi->advance = 0;
+    return;
+  }
+  glyph = &font->glyph[c - font->min_char];
+  bitmapData = glyph->bitmap;
+  if (bitmapData) {
+    tgi->width = glyph->width;
+    tgi->height = glyph->height;
+    tgi->xoffset = glyph->xoffset;
+    tgi->yoffset = glyph->yoffset;
+  } else {
+    tgi->width = 0;
+    tgi->height = 0;
+    tgi->xoffset = 0;
+    tgi->yoffset = 0;
+  }
+  tgi->dummy = 0;
+  tgi->advance = glyph->advance;
+}
+
+int
+main(int argc, char *argv[])
+{
+  int c;
+  TexGlyphInfo tgi;
+  int usageError = 0;
+  char *varname, *fontname;
+  XFontStruct *xfont;
+  int i;
+
+  if (argc == 3) {
+     varname  = argv[1];
+     fontname = argv[2];
+     }
+  else
+     usageError = 1;
+
+  if (usageError) {
+    fprintf(stderr, "\n");
+    fprintf(stderr, "usage: genfontfile variable_name X_font_name\n");
+    fprintf(stderr, "\n");
+    exit(1);
+  }
+
+  dpy = XOpenDisplay(NULL);
+  if (!dpy) {
+    fprintf(stderr, "could not open display\n");
+    exit(1);
+  }
+  /* find an OpenGL-capable RGB visual with depth buffer */
+  xfont = XLoadQueryFont(dpy, fontname);
+  if (!xfont) {
+    fprintf(stderr, "could not get load X font: %s\n", fontname);
+    exit(1);
+  }
+  fontinfo = SuckGlyphsFromServer(dpy, xfont->fid);
+  if (!fontinfo) {
+    fprintf(stderr, "could not get font glyphs\n");
+    exit(1);
+  }
+
+  printf("%s[][%d] = {\n", varname, fontinfo->max_ascent + fontinfo->max_descent + 2);
+  for (c = 32; c < 256; c++) {
+      getMetric(fontinfo, c, &tgi);
+      printGlyph(fontinfo, c);
+      }
+  printf("  };\n");
+  return 0;
+}
diff --git a/interface.c b/interface.c
index 3d01238b8..a0fca0ea0 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.19 2000/09/19 17:41:23 kls Exp $
+ * $Id: interface.c 1.21 2000/10/03 13:28:02 kls Exp $
  */
 
 #include "interface.h"
@@ -69,6 +69,8 @@ unsigned int cInterface::GetCh(bool Wait)
 
 eKeys cInterface::GetKey(bool Wait)
 {
+  if (open)
+     cDvbApi::PrimaryDvbApi->Flush();
   if (SVDRP)
      SVDRP->Process();
   eKeys Key = keyFromWait != kNone ? keyFromWait : Keys.Get(GetCh(Wait));
@@ -84,6 +86,8 @@ void cInterface::PutKey(eKeys Key)
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
   eKeys Key = kNone;
+  if (open)
+     cDvbApi::PrimaryDvbApi->Flush();
   RcIo.Flush(500);
   if (cFile::AnyFileReady(-1, Seconds * 1000))
      Key = GetKey();
@@ -326,15 +330,8 @@ eKeys cInterface::DisplayChannel(int Number, const char *Name, bool WithInfo)
   if (Number)
      RcIo.Number(Number);
   if (Name && !Recording()) {
-     char *RunningTitle = "", *RunningSubtitle = "", *NextTitle = "", *NextSubtitle = "";
-     int Lines = 0;
-     if (Number && WithInfo && EIT.IsValid()) {
-        if (*(RunningTitle    = EIT.GetRunningTitle()))    Lines++;
-        if (*(RunningSubtitle = EIT.GetRunningSubtitle())) Lines++;
-        if (*(NextTitle       = EIT.GetNextTitle()))       Lines++;
-        if (*(NextSubtitle    = EIT.GetNextSubtitle()))    Lines++;
-        }
-     Open(MenuColumns, Lines + 1);
+     Open(MenuColumns, 5);
+     cDvbApi::PrimaryDvbApi->Fill(0, 0, MenuColumns, 1, clrBackground);
      int BufSize = MenuColumns + 1;
      char buffer[BufSize];
      if (Number)
@@ -346,27 +343,38 @@ eKeys cInterface::DisplayChannel(int Number, const char *Name, bool WithInfo)
      struct tm *now = localtime(&t);
      snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
      Write(-5, 0, buffer);
+     cDvbApi::PrimaryDvbApi->Flush();
+
+     char *RunningTitle = "", *RunningSubtitle = "", *NextTitle = "", *NextSubtitle = "";
+     int Lines = 0;
+     if (Number && WithInfo && EIT.IsValid()) {
+        if (*(RunningTitle    = EIT.GetRunningTitle()))    Lines++;
+        if (*(RunningSubtitle = EIT.GetRunningSubtitle())) Lines++;
+        if (*(NextTitle       = EIT.GetNextTitle()))       Lines++;
+        if (*(NextSubtitle    = EIT.GetNextSubtitle()))    Lines++;
+        }
      if (Lines > 0) {
         const int t = 6;
-        int w = MenuColumns - t;
         int l = 1;
+        cDvbApi::PrimaryDvbApi->Fill(0, 1, MenuColumns, Lines, clrBackground);
         if (*RunningTitle) {
            Write(0, l, EIT.GetRunningTime(), clrYellow, clrBackground);
-           snprintf(buffer, BufSize, "%.*s", w, RunningTitle);    Write(t, l, buffer, clrCyan, clrBackground);
+           Write(t, l, RunningTitle, clrCyan, clrBackground);
            l++;
            }
         if (*RunningSubtitle) {
-           snprintf(buffer, BufSize, "%.*s", w, RunningSubtitle); Write(t, l, buffer, clrCyan, clrBackground);
+           Write(t, l, RunningSubtitle, clrCyan, clrBackground);
            l++;
            }
         if (*NextTitle) {
            Write(0, l, EIT.GetNextTime(), clrYellow, clrBackground);
-           snprintf(buffer, BufSize, "%.*s", w, NextTitle);       Write(t, l, buffer, clrCyan, clrBackground);
+           Write(t, l, NextTitle, clrCyan, clrBackground);
            l++;
            }
         if (*NextSubtitle) {
-           snprintf(buffer, BufSize, "%.*s", w, NextSubtitle);    Write(t, l, buffer, clrCyan, clrBackground);
+           Write(t, l, NextSubtitle, clrCyan, clrBackground);
            }
+        cDvbApi::PrimaryDvbApi->Flush();
         }
      eKeys Key = Wait(5, true);
      if (Key == kOk)
diff --git a/menu.c b/menu.c
index 114ea7ef7..1f5fd8885 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.27 2000/09/11 21:13:46 kls Exp $
+ * $Id: menu.c 1.30 2000/10/03 14:06:44 kls Exp $
  */
 
 #include "menu.h"
@@ -985,7 +985,7 @@ cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording)
 
 void cMenuRecordingItem::Set(void)
 {
-  SetText(recording->Title('\t'));
+  SetText(recording->Title('\t', true));
 }
 
 // --- cMenuRecordings -------------------------------------------------------
@@ -1002,7 +1002,7 @@ class cMenuRecordings : public cOsdMenu {
   };
 
 cMenuRecordings::cMenuRecordings(void)
-:cOsdMenu("Recordings", 9, 6)
+:cOsdMenu("Recordings", 6, 6)
 {
   if (Recordings.Load()) {
      cRecording *recording = Recordings.First();
@@ -1186,7 +1186,7 @@ cDirectChannelSelect::~cDirectChannelSelect()
 eOSState cDirectChannelSelect::ProcessKey(eKeys Key)
 {
   switch (Key) {
-    case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
+    case k0 ... k9:
          if (number >= 0) {
             number = number * 10 + Key - k0;
             cChannel *channel = Channels.GetByNumber(number);
diff --git a/recording.c b/recording.c
index 9f3b38858..60ea4a1c0 100644
--- a/recording.c
+++ b/recording.c
@@ -1,10 +1,10 @@
 /*
- * recording.h: Recording file handling
+ * recording.c: Recording file handling
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.15 2000/07/29 14:08:17 kls Exp $
+ * $Id: recording.c 1.18 2000/10/03 12:39:28 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "dvbapi.h"
 #include "interface.h"
 #include "tools.h"
 #include "videodir.h"
@@ -170,18 +171,24 @@ const char *cRecording::FileName(void)
   return fileName;
 }
 
-const char *cRecording::Title(char Delimiter)
+const char *cRecording::Title(char Delimiter, bool NewIndicator)
 {
+  char New = ' ';
+  if (NewIndicator) {
+     cResumeFile ResumeFile(FileName());
+     if (ResumeFile.Read() <= 0)
+        New = '*';
+     }
   delete titleBuffer;
   titleBuffer = NULL;
   struct tm *t = localtime(&start);
-  asprintf(&titleBuffer, "%02d.%02d.%02d%c%02d:%02d%c%s",
+  asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s",
                          t->tm_mday,
                          t->tm_mon + 1,
-                         t->tm_year % 100,
                          Delimiter,
                          t->tm_hour,
                          t->tm_min,
+                         New,
                          Delimiter,
                          name);
   return titleBuffer;
diff --git a/recording.h b/recording.h
index dc3b3d748..7511c6591 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.9 2000/07/28 13:53:54 kls Exp $
+ * $Id: recording.h 1.10 2000/10/03 12:27:49 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -31,7 +31,7 @@ class cRecording : public cListObject {
   cRecording(const char *FileName);
   ~cRecording();
   const char *FileName(void);
-  const char *Title(char Delimiter = ' ');
+  const char *Title(char Delimiter = ' ', bool NewIndicator = false);
   const char *Summary(void) { return summary; }
   bool WriteSummary(void);
   bool Delete(void);
diff --git a/remote.c b/remote.c
index 46565a804..1bf810854 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.13 2000/09/19 17:40:52 kls Exp $
+ * $Id: remote.c 1.15 2000/10/03 10:49:58 kls Exp $
  */
 
 #include "remote.h"
@@ -339,6 +339,7 @@ bool cRcIoRCU::DetectCode(unsigned char *Code, unsigned short *Address)
 
 cRcIoLIRC::cRcIoLIRC(char *DeviceName)
 {
+  repeat = 1;
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
   strcpy(addr.sun_path, DeviceName);
@@ -361,23 +362,27 @@ cRcIoLIRC::~cRcIoLIRC()
 
 const char *cRcIoLIRC::ReceiveString(void)
 {
-  char buf[LIRC_BUFFER_SIZE];
+  int oldrepeat = 1;
 
-  while (InputAvailable(true)) {
-        if (read(f, buf, sizeof(buf)) > 21) {
-           const int now = time_ms();
-           int repeat;
-           sscanf(buf, "%*s %x %7s", &repeat, keyName); // '7' in '%7s' is LIRC_KEY_BUF-1!
-           if (repeat == 0) {
-              firstTime = lastTime = now;
-              return keyName;
-              }
-           else if ((now > firstTime + REPEATDELAY) && (now > lastTime + REPEATLIMIT)) {
-              lastTime = now;
-              return keyName;
-              }
-           }
+  if (repeat != 0) {
+     Flush();
+     if (repeat != 0) {
+        oldrepeat = repeat;
+        Flush(REPEATLIMIT);
         }
+     }
+
+  if (repeat == 0) {
+     firstTime = time_ms();
+     repeat = 1;
+     return keyName;
+     }
+
+  if ((repeat > 1) && (repeat != oldrepeat) && (time_ms() > firstTime + REPEATDELAY)) {
+     repeat = 1;
+     return keyName;
+     }
+
   return NULL;
 }
 
@@ -386,14 +391,10 @@ void cRcIoLIRC::Flush(int WaitMs)
   char buf[LIRC_BUFFER_SIZE];
   int t0 = time_ms();
 
-  for (;;) {
-      while (InputAvailable(false)) {
-            read(f, buf, sizeof(buf));
-            t0 = time_ms();
-            }
-      if (time_ms() - t0 >= WaitMs)
-         break;
-      }
+  do {
+     if (InputAvailable(false) && (read(f, buf, sizeof(buf)) > 21))
+        sscanf(buf, "%*x %x %7s", &repeat, keyName); // '7' in '%7s' is LIRC_KEY_BUF-1!
+     } while ((repeat != 0) && (time_ms() < t0 + WaitMs));
 }
 
 bool cRcIoLIRC::InputAvailable(bool Wait)
@@ -403,7 +404,6 @@ bool cRcIoLIRC::InputAvailable(bool Wait)
 
 bool cRcIoLIRC::GetCommand(unsigned int *Command, unsigned short *)
 {
-  Flush();
   if (Command) {
      const char *cmd = ReceiveString();
      if (cmd) {
diff --git a/remote.h b/remote.h
index 03f915550..75dc4ac1b 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.9 2000/09/19 17:39:36 kls Exp $
+ * $Id: remote.h 1.10 2000/10/03 10:45:35 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -29,7 +29,7 @@ class cRcIoBase {
   virtual void SetPoints(unsigned char Dp, bool On) {}
   virtual bool String(char *s) { return true; }
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
-  virtual void Flush(int WaitMs = 0) {}
+  virtual void Flush(int WaitMs = 0) = 0;
   virtual bool InputAvailable(bool Wait = false) = 0;
   virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL) = 0;
   };
@@ -81,6 +81,7 @@ class cRcIoLIRC : public cRcIoBase {
   enum { LIRC_KEY_BUF = 8, LIRC_BUFFER_SIZE = 128 };
   cFile f;
   char keyName[LIRC_KEY_BUF];
+  int repeat;
   const char *ReceiveString(void);
 public:
   cRcIoLIRC(char *DeviceName);
diff --git a/timers.conf b/timers.conf
index a625527fc..2a58454b6 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,14 +1,16 @@
 1:15:M------:2128:2205:99:7:Neues:
 1:3:-T-----:2013:2125:99:99:SevenDays:
-0:10:-T-----:2058:2202:99:10:Quarks:
-1:26:-T-----:2255:0015:99:99:UFO:
-1:3:---T---:2215:2315:99:10:IngoAppelt:
+1:10:-T-----:2058:2202:99:10:Quarks:
+1:26:-T-----:2235:2345:99:99:UFO:
+1:2:--W----:2110:2325:99:99:BulleVonToelz:
+1:3:---T---:2210:2315:99:10:IngoAppelt:
 1:2:----F--:2140:2225:10:10:WWW:
 1:1:----F--:2212:2325:99:99:7Tage7Koepfe:
-1:11:-----S-:2158:2235:99:99:Computer:
-1:2:-----S-:2213:2320:99:30:Wochenshow:
+1:11:-----S-:2058:2135:99:99:Computer:
+1:2:-----S-:2211:2340:99:30:Wochenshow:
 1:11:------S:2013:2035:99:10:Centauri:
 1:14:------S:2158:2235:99:14:MaxUndLisa:
-1:15:MTWTF--:1828:1901:10:5:nano:
+0:15:MTWTF--:1828:1901:10:5:nano:
 1:1:-TWTF--:0955:1040:99:99:Ellen:
-1:1:MTWTF--:1553:1710:99:99:Hammerman:
+0:1:MTWTF--:1553:1710:99:99:Hammerman:
+1:1:4:0755:0910:99:99:Hammerman:
diff --git a/tools.c b/tools.c
index 79d2ee6ca..5bb56e6df 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.19 2000/09/19 17:55:09 kls Exp $
+ * $Id: tools.c 1.20 2000/09/29 16:19:28 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -17,7 +17,6 @@
 #endif
 #include <signal.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/tools.h b/tools.h
index 5c749a7c2..441f5715a 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.15 2000/09/17 07:58:19 kls Exp $
+ * $Id: tools.h 1.16 2000/09/29 16:19:31 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/vdr.c b/vdr.c
index 91643c2f3..042b03ce7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.35 2000/09/20 16:45:01 kls Exp $
+ * $Id: vdr.c 1.36 2000/10/03 13:52:26 kls Exp $
  */
 
 #include <getopt.h>
@@ -193,12 +193,14 @@ int main(int argc, char *argv[])
   cOsdBase *Menu = NULL;
   cReplayControl *ReplayControl = NULL;
   int LastChannel = -1;
+  int PreviousChannel = CurrentChannel;
 
   while (!Interrupted) {
         // Channel display:
         if (CurrentChannel != LastChannel) {
            if (!Menu)
               Channels.ShowChannel(CurrentChannel, LastChannel > 0);
+           PreviousChannel = LastChannel;
            LastChannel = CurrentChannel;
            }
         // Timers and Recordings:
@@ -244,8 +246,13 @@ int main(int argc, char *argv[])
            }
         else {
            switch (key) {
+             // Toggle channels:
+             case k0:
+                  if (PreviousChannel != CurrentChannel)
+                     Channels.SwitchTo(PreviousChannel);
+                  break;
              // Direct Channel Select:
-             case k0: case k1: case k2: case k3: case k4: case k5: case k6: case k7: case k8: case k9:
+             case k1 ... k9:
                   if (!Interface.Recording())
                      Menu = new cDirectChannelSelect(key);
                   break;

From a379eb714f7f5ef9a12efbe7588bb3509faba056 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Oct 2000 18:00:00 +0200
Subject: [PATCH 013/307] Version 0.66 - Remote control data is now received in
 a separate thread, which makes things   a lot smoother. - Repeat and release
 of remote control keys is now explicitly distinguished. - In replay mode the
 search forward/back and skip functions now have two modes:   Pressing the key
 shortly and releasing it starts the function, and pressing it   again stops
 it. Pressing and holding down the key starts the function and   releasing the
 key stops it. - The '@' character that marks an "instant recording" can now
 be turned off   in the "Setup" menu (thanks to Matthias Schniedermeyer). -
 Pressing the "Back" button while replaying now stops replaying and brings up 
  the "Recordings" menu (suggested by Carsten Koch). This can be used to
 easily   delete a recording after watching it, or to switch to a different
 recording. - The "Recordings" menu now places the cursor on the last replayed
 recording, if   that file still exists. - The "Blue" button in the "Main"
 menu can now be used to "Resume" a previously   stopped replay session
 (suggested by Martin Hammerschmid). - The low and high LNB frequencies can
 now be changed in the "Setup" menu.

---
 CONTRIBUTORS |   5 +
 FORMATS      |   8 ++
 HISTORY      |  22 +++-
 MANUAL       |  29 ++++-
 Makefile     |  11 +-
 config.c     |  17 ++-
 config.h     |  17 ++-
 dvbapi.c     |   8 +-
 dvbosd.c     |   8 +-
 interface.c  |  82 ++++++++------
 interface.h  |  15 +--
 menu.c       | 105 ++++++++++-------
 menu.h       |  16 ++-
 osd.c        |  26 +++--
 recording.c  |   4 +-
 remote.c     | 309 ++++++++++++++++++++++++++++++++-------------------
 remote.h     |  44 ++++----
 setup.conf   |   3 +
 svdrp.c      |   6 +-
 thread.c     | 105 +++++++++++++++++
 thread.h     |  57 ++++++++++
 timers.conf  |  10 +-
 tools.c      |  18 ++-
 tools.h      |   3 +-
 vdr.c        |  36 ++++--
 25 files changed, 682 insertions(+), 282 deletions(-)
 create mode 100644 thread.c
 create mode 100644 thread.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2eefd64be..91c9540ec 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -7,6 +7,7 @@ Carsten Koch <Carsten.Koch@icem.de>
  for adding the 'epg2timers' tool (see Tools/epg2timers)
  for his idea of using multiple disks (and for testing this feature)
  for implementing the 'new recording' indicator
+ for suggesting that the "Back" button in replay mode should bring up the "Recordings" menu
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -31,6 +32,10 @@ Niels de Carpentier <niels@casema.net>
 
 Martin Hammerschmid <martin@hammerschmid.com>
  for suggesting to display the direct channel select input on the OSD
+ for suggesting to use the "Blue" button in the main menu to resume replay
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
+
+Matthias Schniedermeyer <ms@citd.de>
+ for implementing the 'MarkInstantRecord' setup option.
diff --git a/FORMATS b/FORMATS
index eb9de0f5c..331fe3d55 100644
--- a/FORMATS
+++ b/FORMATS
@@ -55,3 +55,11 @@ Video Disk Recorder File Formats
   - Name of timer (will be used to name the recording)
   - Summary
 
+* setup.conf
+
+  This file contains the basic configuration options for VDR.
+
+  Each line contains one option in the format "Name = Value".
+
+  See the MANUAL file for a description of the available options.
+
diff --git a/HISTORY b/HISTORY
index 481e83ede..717102a6f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -212,7 +212,7 @@ Video Disk Recorder Revision History
   against the version 0.71 DVB driver file 'dvb.c').
 - When switching channels the channel is now immediately displayed, and the
   current/next information is shown as soon as it becomes available.
-- No longer displaying the year in the 'Recordings' menu to saves space for the
+- No longer displaying the year in the 'Recordings' menu to save space for the
   title.
 - The 'Recordings' menu now displays a '*' to indicate new recordings.
 - Added the description of the timers.conf file to the FORMATS file (thanks to
@@ -221,3 +221,23 @@ Video Disk Recorder Revision History
   that would display only partially).
 - In normal viewing mode the '0' key now toggles between the current and the
   previous channel.
+
+2000-10-08: Version 0.66
+
+- Remote control data is now received in a separate thread, which makes things
+  a lot smoother.
+- Repeat and release of remote control keys is now explicitly distinguished.
+- In replay mode the search forward/back and skip functions now have two modes:
+  Pressing the key shortly and releasing it starts the function, and pressing it
+  again stops it. Pressing and holding down the key starts the function and
+  releasing the key stops it.
+- The '@' character that marks an "instant recording" can now be turned off
+  in the "Setup" menu (thanks to Matthias Schniedermeyer).
+- Pressing the "Back" button while replaying now stops replaying and brings up
+  the "Recordings" menu (suggested by Carsten Koch). This can be used to easily
+  delete a recording after watching it, or to switch to a different recording.
+- The "Recordings" menu now places the cursor on the last replayed recording, if
+  that file still exists.
+- The "Blue" button in the "Main" menu can now be used to "Resume" a previously
+  stopped replay session (suggested by Martin Hammerschmid).
+- The low and high LNB frequencies can now be changed in the "Setup" menu.
diff --git a/MANUAL b/MANUAL
index 24ee3ff5a..9b864e367 100644
--- a/MANUAL
+++ b/MANUAL
@@ -16,11 +16,11 @@ Video Disk Recorder User's Manual
   Right   Next group  -          -          Enable     Increment     -           Search forward
   Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
   Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
-  Back    -           Menu off   Main menu  Main menu  Discard       Main menu   -
+  Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
   Red     -           Record     Edit       Edit       -             Play        -
   Green   -           -          New        New        -             -           Skip -60s
   Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
-  Blue    -           -          Mark       Mark       -             -           Stop
+  Blue    -           Resume     Mark       Mark       -             -           Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           -
 
 * Navigating through the On Screen Menus
@@ -90,7 +90,7 @@ Video Disk Recorder User's Manual
 * Instant Recording
 
   You can start recording the current channel by pressing the "Red" button
-  in the Main menu. This will create a timer event named "@channelname" that
+  in the "Main" menu. This will create a timer event named "@channelname" that
   starts at the current time and records for two hours.
   If you want to modify the recording time you need to edit the timer.
   Stop instant recording by pressing the "Menu" button and selecting
@@ -101,8 +101,10 @@ Video Disk Recorder User's Manual
   All recordings are listed in the "Recordings" menu. Browse through the
   list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
   to start playback. New recordings are marked with an '*'.
-  Playback can be stopped via the Main menu by selecting "Stop replaying",
+  Playback can be stopped via the "Main" menu by selecting "Stop replaying",
   or by pressing the "Blue" button outside the menu.
+  A previously stopped playback session can be resumed by pressing the "Blue"
+  button in the "Main" menu.
 
 * Replay Control
 
@@ -118,12 +120,19 @@ Video Disk Recorder User's Manual
     Right   Runs playback forward or backward at a higher speed; press
             again to resume normal speed. If in Pause mode, runs forward or
             backward at a slower speed; press again to return to pause mode.
+            Pressing and holding down the button performs the function until
+            the button is released again.
   - Green
     Yellow  Skips about 60 seconds back or forward.
+            Pressing and holding down the button performs the function until
+            the button is released again.
   - Ok      Brings up the replay progress display, which shows the date,
             time and title of the recording, a progress bar and the
             current and total time of the recording.
             Press "Ok" again to turn off the progress display.
+  - Back    Stops replaying and brings up the "Recordings" menu. This can be
+            used to easily delete a recording after watching it, or to switch
+            to a different recording.
 
 * Programming the Timer
 
@@ -171,7 +180,7 @@ Video Disk Recorder User's Manual
 
 * Parameters in the "Setup" menu
 
-  Select "Setup" from the main menu to enter the setup menu. From there you can
+  Select "Setup" from the "Main" menu to enter the setup menu. From there you can
   modify the following system parameters (note that "boolean" values will be
   displayed as "no" and "yes" in the "Setup" menu, while in the setup file they
   are stored as '0' and '1', respectively):
@@ -197,3 +206,13 @@ Video Disk Recorder User's Manual
                          1 = dto., but the cursor remains at the bottom (top) of
                              the page (this mode allows for faster scrolling
                              through long lists).
+
+  MarkInstantRecord = 1  Defines whether an "instant recording" (started by
+                         pressing the "Red" button in the "Main" menu) will be
+                         marked with a '@' character to make it distinguishable
+                         from timer recordings in the "Recordings" menu.
+                         0 = instant recordings will not be marked
+                         1 = instant recordings will be marked.
+
+  LnbFrequLo = 9750      The low and high LNB frequencies (in MHz)
+  LnbFrequHi = 10600
diff --git a/Makefile b/Makefile
index 15757744b..8b32be2d8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,13 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.12 2000/10/01 14:27:12 kls Exp $
+# $Id: Makefile 1.13 2000/10/07 16:24:08 kls Exp $
 
 DVBDIR   = ../DVB
 
 INCLUDES = -I$(DVBDIR)/driver
 OBJS = config.o dvbapi.o dvbosd.o eit.o font.o interface.o menu.o osd.o\
-       recording.o remote.o svdrp.o tools.o vdr.o videodir.o
+       recording.o remote.o svdrp.o thread.o tools.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 
@@ -40,12 +40,13 @@ dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tool
 dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
 eit.o      : eit.c eit.h tools.h
 font.o     : font.c font.h fontosd.c tools.h
-interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h tools.h
+interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
 menu.o     : menu.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h
 osd.o      : osd.c config.h dvbapi.h dvbosd.h font.h interface.h osd.h svdrp.h tools.h
 recording.o: recording.c config.h dvbapi.h dvbosd.h font.h interface.h recording.h svdrp.h tools.h videodir.h
-remote.o   : remote.c config.h dvbapi.h dvbosd.h font.h remote.h tools.h
+remote.o   : remote.c config.h dvbapi.h dvbosd.h font.h remote.h thread.h tools.h
 svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h
+thread.o   : thread.c thread.h
 tools.o    : tools.c tools.h
 vdr.o      : vdr.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
@@ -53,7 +54,7 @@ videodir.o : videodir.c tools.h videodir.h
 # The main program:
 
 vdr: $(OBJS)
-	g++ -g -O2 $(OBJS) -lncurses -ljpeg -o vdr
+	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread -o vdr
 
 # The font file:
 
diff --git a/config.c b/config.c
index e161efd76..1714651fa 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.23 2000/09/17 09:11:59 kls Exp $
+ * $Id: config.c 1.26 2000/10/08 16:10:40 kls Exp $
  */
 
 #include "config.h"
@@ -275,7 +275,7 @@ bool cChannel::Switch(cDvbApi *DvbApi)
          }
      return false;
      }
-  Interface.Info(DvbApi->Recording() ? "Channel locked (recording)!" : name);
+  Interface->Info(DvbApi->Recording() ? "Channel locked (recording)!" : name);
   return false;
 }
 
@@ -303,7 +303,7 @@ cTimer::cTimer(bool Instant)
   *file = 0;
   summary = NULL;
   if (Instant && ch)
-     snprintf(file, sizeof(file), "@%s", ch->name);
+     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", ch->name);
 }
 
 cTimer::~cTimer()
@@ -566,7 +566,7 @@ eKeys cChannels::ShowChannel(int Number, bool Switched, bool Group)
 {
   cChannel *channel = Group ? Get(Number) : GetByNumber(Number);
   if (channel)
-     return Interface.DisplayChannel(channel->number, channel->name, !Switched || Setup.ShowInfoOnChSwitch);
+     return Interface->DisplayChannel(channel->number, channel->name, !Switched || Setup.ShowInfoOnChSwitch);
   return kNone;
 }
 
@@ -596,6 +596,9 @@ cSetup::cSetup(void)
   PrimaryDVB = 1;
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
+  MarkInstantRecord = 1;
+  LnbFrequLo =  9750;
+  LnbFrequHi = 10600;
 }
 
 bool cSetup::Parse(char *s)
@@ -607,6 +610,9 @@ bool cSetup::Parse(char *s)
      if      (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
      else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
      else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
+     else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
+     else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
+     else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
      else
         return false;
      return true;
@@ -651,6 +657,9 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "PrimaryDVB         = %d\n", PrimaryDVB);
         fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
         fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
+        fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
+        fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
+        fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
         fclose(f);
         isyslog(LOG_INFO, "saved setup to %s", FileName);
         return true;
diff --git a/config.h b/config.h
index 224a7b3bc..56f361822 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.22 2000/10/01 14:14:18 kls Exp $
+ * $Id: config.h 1.27 2000/10/08 16:33:48 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define VDRVERSION "0.65"
+#define VDRVERSION "0.66"
 
 #define MaxBuffer 10000
 
@@ -34,9 +34,17 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kYellow,
              kBlue,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
-             kNone
+             kNone,
+             // The following flags are OR'd with the above codes:
+             k_Repeat  = 0x8000,
+             k_Release = 0x4000,
+             k_Flags   = k_Repeat | k_Release,
            };
 
+#define RAWKEY(k)    ((k) & ~k_Flags)
+#define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
+#define NORMALKEY(k) ((k) & ~k_Repeat)
+
 struct tKey {
   eKeys type;
   char *name;
@@ -223,6 +231,9 @@ class cSetup {
   int PrimaryDVB;
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
+  int MarkInstantRecord;
+  int LnbFrequLo;
+  int LnbFrequHi;
   cSetup(void);
   bool Load(const char *FileName);
   bool Save(const char *FileName = NULL);
diff --git a/dvbapi.c b/dvbapi.c
index 04873fcc0..e5c692cbd 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.30 2000/10/03 13:26:16 kls Exp $
+ * $Id: dvbapi.c 1.31 2000/10/08 16:14:45 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -19,7 +19,7 @@ extern "C" {
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include "dvbapi.h"
+#include "config.h"
 #include "interface.h"
 #include "tools.h"
 #include "videodir.h"
@@ -1657,9 +1657,9 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
      unsigned int freq = FrequencyMHz;
      front.ttk = (freq < 11700UL) ? 0 : 1;
      if (freq < 11700UL)
-        freq -=  9750UL;
+        freq -= Setup.LnbFrequLo;
      else
-        freq -= 10600UL;
+        freq -= Setup.LnbFrequHi;
      front.channel_flags = Ca ? DVB_CHANNEL_CA : DVB_CHANNEL_FTA;
      front.pnr       = Pnr;
      front.freq      = freq * 1000000UL;
diff --git a/dvbosd.c b/dvbosd.c
index 1e2c354ea..97c793228 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.2 2000/10/03 13:34:13 kls Exp $
+ * $Id: dvbosd.c 1.3 2000/10/07 14:42:48 kls Exp $
  */
 
 #include "dvbosd.h"
+#include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
@@ -138,11 +139,16 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      dc.x1    = x1;
      dc.y1    = y1;
      dc.data  = (void *)data;
+     // must block all signals, otherwise the command might not be fully executed
+     sigset_t set, oldset;
+     sigfillset(&set);
+     sigprocmask(SIG_BLOCK, &set, &oldset);
      ioctl(videoDev, VIDIOCSOSDCOMMAND, &dc);
      usleep(10); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
                  // XXX and sometimes the OSD was no longer displayed).
                  // XXX Increase the value if the problem still persists on your particular system.
                  // TODO Check if this is still necessary with driver versions after 0.7.
+     sigprocmask(SIG_SETMASK, &oldset, NULL);
      }
 }
 
diff --git a/interface.c b/interface.c
index a0fca0ea0..5940195f9 100644
--- a/interface.c
+++ b/interface.c
@@ -4,43 +4,39 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.21 2000/10/03 13:28:02 kls Exp $
+ * $Id: interface.c 1.25 2000/10/08 16:34:17 kls Exp $
  */
 
 #include "interface.h"
 #include <unistd.h>
 #include "eit.h"
-#include "remote.h"
 
 cEIT EIT;
 
-#if defined(REMOTE_RCU)
-cRcIoRCU RcIo("/dev/ttyS1");
-#elif defined(REMOTE_LIRC)
-cRcIoLIRC RcIo("/dev/lircd");
-#else
-cRcIoKBD RcIo;
-#endif
-
-cInterface Interface;
+cInterface *Interface = NULL;
 
-cInterface::cInterface(void)
+cInterface::cInterface(int SVDRPport)
 {
   open = 0;
   cols[0] = 0;
   keyFromWait = kNone;
+  rcIo = NULL;
   SVDRP = NULL;
-}
-
-void cInterface::Init(int SVDRPport)
-{
-  RcIo.SetCode(Keys.code, Keys.address);
+#if defined(REMOTE_RCU)
+  rcIo = new cRcIoRCU("/dev/ttyS1");
+#elif defined(REMOTE_LIRC)
+  rcIo = new cRcIoLIRC("/dev/lircd");
+#else
+  rcIo = new cRcIoKBD;
+#endif
+  rcIo->SetCode(Keys.code, Keys.address);
   if (SVDRPport)
      SVDRP = new cSVDRP(SVDRPport);
 }
 
-void cInterface::Cleanup(void)
+cInterface::~cInterface()
 {
+  delete rcIo;
   delete SVDRP;
 }
 
@@ -58,22 +54,29 @@ void cInterface::Close(void)
      cDvbApi::PrimaryDvbApi->Close();
 }
 
-unsigned int cInterface::GetCh(bool Wait)
+unsigned int cInterface::GetCh(bool Wait, bool *Repeat, bool *Release)
 {
-  if (RcIo.InputAvailable(Wait)) {
-     unsigned int Command;
-     return RcIo.GetCommand(&Command, NULL) ? Command : 0;
-     }
-  return 0;
+  if (open)
+     cDvbApi::PrimaryDvbApi->Flush();
+  if (!rcIo->InputAvailable())
+     cFile::AnyFileReady(-1, Wait ? 1000 : 0);
+  unsigned int Command;
+  return rcIo->GetCommand(&Command, Repeat, Release) ? Command : 0;
 }
 
 eKeys cInterface::GetKey(bool Wait)
 {
-  if (open)
-     cDvbApi::PrimaryDvbApi->Flush();
   if (SVDRP)
      SVDRP->Process();
-  eKeys Key = keyFromWait != kNone ? keyFromWait : Keys.Get(GetCh(Wait));
+  eKeys Key = keyFromWait;
+  if (Key == kNone) {
+     bool Repeat = false, Release = false;
+     Key = Keys.Get(GetCh(Wait, &Repeat, &Release));
+     if (Repeat)
+        Key = eKeys(Key | k_Repeat);
+     if (Release)
+        Key = eKeys(Key | k_Release);
+     }
   keyFromWait = kNone;
   return Key;
 }
@@ -85,13 +88,16 @@ void cInterface::PutKey(eKeys Key)
 
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
-  eKeys Key = kNone;
   if (open)
      cDvbApi::PrimaryDvbApi->Flush();
-  RcIo.Flush(500);
-  if (cFile::AnyFileReady(-1, Seconds * 1000))
-     Key = GetKey();
-  if (KeepChar)
+  eKeys Key = kNone;
+  time_t timeout = time(NULL) + Seconds;
+  for (;;) {
+      Key = GetKey();
+      if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout)
+         break;
+      }
+  if (KeepChar && ISRAWKEY(Key))
      keyFromWait = Key;
   return Key;
 }
@@ -220,9 +226,11 @@ void cInterface::Help(const char *Red, const char *Green, const char *Yellow, co
 void cInterface::QueryKeys(void)
 {
   Keys.Clear();
+  Clear();
   WriteText(1, 1, "Learning Remote Control Keys");
   WriteText(1, 3, "Phase 1: Detecting RC code type");
   WriteText(1, 5, "Press any key on the RC unit");
+  cDvbApi::PrimaryDvbApi->Flush();
 #ifndef REMOTE_KBD
   unsigned char Code = 0;
   unsigned short Address;
@@ -233,14 +241,16 @@ void cInterface::QueryKeys(void)
          break;
 #else
       //TODO on screen display...
-      if (RcIo.DetectCode(&Code, &Address)) {
+      if (rcIo->DetectCode(&Code, &Address)) {
          Keys.code = Code;
          Keys.address = Address;
          WriteText(1, 5, "RC code detected!");
          WriteText(1, 6, "Do not press any key...");
-         RcIo.Flush(3000);
+         cDvbApi::PrimaryDvbApi->Flush();
+         rcIo->Flush(3000);
          ClearEol(0, 5);
          ClearEol(0, 6);
+         cDvbApi::PrimaryDvbApi->Flush();
          break;
          }
 #endif
@@ -328,7 +338,7 @@ eKeys cInterface::DisplayChannel(int Number, const char *Name, bool WithInfo)
 {
   // Number = 0 is used for channel group display and no EIT
   if (Number)
-     RcIo.Number(Number);
+     rcIo->Number(Number);
   if (Name && !Recording()) {
      Open(MenuColumns, 5);
      cDvbApi::PrimaryDvbApi->Fill(0, 0, MenuColumns, 1, clrBackground);
@@ -387,7 +397,7 @@ eKeys cInterface::DisplayChannel(int Number, const char *Name, bool WithInfo)
 
 void cInterface::DisplayRecording(int Index, bool On)
 {
-  RcIo.SetPoints(1 << Index, On);
+  rcIo->SetPoints(1 << Index, On);
 }
 
 bool cInterface::Recording(void)
diff --git a/interface.h b/interface.h
index 8f7f1b8d7..8d0f8f685 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.13 2000/09/18 22:29:31 kls Exp $
+ * $Id: interface.h 1.16 2000/10/08 12:15:49 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -12,6 +12,7 @@
 
 #include "config.h"
 #include "dvbapi.h"
+#include "remote.h"
 #include "svdrp.h"
 
 class cInterface {
@@ -22,14 +23,14 @@ class cInterface {
   int cols[MaxCols];
   eKeys keyFromWait;
   cSVDRP *SVDRP;
-  unsigned int GetCh(bool Wait = true);
+  cRcIoBase *rcIo;
+  unsigned int GetCh(bool Wait = true, bool *Repeat = NULL, bool *Release = NULL);
   void QueryKeys(void);
   void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
   eKeys Wait(int Seconds = 1, bool KeepChar = false);
 public:
-  cInterface(void);
-  void Init(int SVDRPport = 0);
-  void Cleanup(void);
+  cInterface(int SVDRPport = 0);
+  ~cInterface();
   void Open(int NumCols = MenuColumns, int NumLines = MenuLines);
   void Close(void);
   eKeys GetKey(bool Wait = true);
@@ -38,7 +39,7 @@ class cInterface {
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void SetCols(int *c);
   void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  void WriteText(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBlack);
+  void WriteText(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   void Title(const char *s);
   void Status(const char *s, eDvbColor FgColor = clrBlack, eDvbColor BgColor = clrCyan);
   void Info(const char *s);
@@ -51,6 +52,6 @@ class cInterface {
   bool Recording(void);
   };
 
-extern cInterface Interface;
+extern cInterface *Interface;
 
 #endif //__INTERFACE_H
diff --git a/menu.c b/menu.c
index 1f5fd8885..39689c9c7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.30 2000/10/03 14:06:44 kls Exp $
+ * $Id: menu.c 1.36 2000/10/08 16:11:22 kls Exp $
  */
 
 #include "menu.h"
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "config.h"
-#include "recording.h"
 
 #define MENUTIMEOUT 120 // seconds
 
@@ -94,11 +93,11 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
            }
         newValue = *value  * 10 + (Key - k0);
         }
-     else if (Key == kLeft) { // TODO might want to increase the delta if repeated quickly?
+     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
         newValue = *value - 1;
         fresh = true;
         }
-     else if (Key == kRight) {
+     else if (NORMALKEY(Key) == kRight) {
         newValue = *value + 1;
         fresh = true;
         }
@@ -211,6 +210,7 @@ void cMenuEditDayItem::Set(void)
 eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
+    case kLeft|k_Repeat:
     case kLeft:  if (d > 0)
                     *value = days[--d];
                  else if (d == 0) {
@@ -225,6 +225,7 @@ eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
                     return cMenuEditIntItem::ProcessKey(Key);
                  Set();
                  break;
+    case kRight|k_Repeat:
     case kRight: if (d >= 0) {
                     *value = days[++d];
                     if (*value == 0) {
@@ -310,7 +311,7 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
                   break;
           }
         }
-     else if (Key == kLeft) { // TODO might want to increase the delta if repeated quickly?
+     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
         if (--mm < 0) {
            mm = 59;
            if (--hh < 0)
@@ -318,7 +319,7 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
            }
         fresh = true;
         }
-     else if (Key == kRight) {
+     else if (NORMALKEY(Key) == kRight) {
         if (++mm > 59) {
            mm = 0;
            if (++hh > 23)
@@ -377,11 +378,11 @@ eOSState cMenuEditChrItem::ProcessKey(eKeys Key)
   eOSState state = cMenuEditItem::ProcessKey(Key);
 
   if (state == osUnknown) {
-     if (Key == kLeft) {
+     if (NORMALKEY(Key) == kLeft) {
         if (current > allowed)
            current--;
         }
-     else if (Key == kRight) {
+     else if (NORMALKEY(Key) == kRight) {
         if (*(current + 1))
            current++;
         }
@@ -455,12 +456,14 @@ char cMenuEditStrItem::Inc(char c, bool Up)
 eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
+    case kLeft|k_Repeat:
     case kLeft:  if (pos > 0) {
                     if (value[pos] == '^')
                        value[pos] = 0;
                     pos--;
                     }
                  break;
+    case kRight|k_Repeat:
     case kRight: if (pos < length && value[pos] != '^' && (pos < int(strlen(value) - 1) || value[pos] != ' ')) {
                     if (++pos >= int(strlen(value))) {
                        value[pos] = ' ';
@@ -468,9 +471,11 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        }
                     }
                  break;
+    case kUp|k_Repeat:
     case kUp:
+    case kDown|k_Repeat:
     case kDown:  if (pos >= 0)
-                    value[pos] = Inc(value[pos], Key == kUp);
+                    value[pos] = Inc(value[pos], NORMALKEY(Key) == kUp);
                  else
                     return cMenuEditItem::ProcessKey(Key);
                  break;
@@ -635,11 +640,11 @@ eOSState cMenuChannels::Del(void)
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
          if (ti->channel == DeletedChannel) {
-            Interface.Error("Channel is being used by a timer!");
+            Interface->Error("Channel is being used by a timer!");
             return osContinue;
             }
          }
-     if (Interface.Confirm("Delete Channel?")) {
+     if (Interface->Confirm("Delete Channel?")) {
         // Move and renumber the channels:
         Channels.Del(channel);
         Channels.ReNumber();
@@ -916,7 +921,7 @@ eOSState cMenuTimers::Del(void)
   cTimer *ti = Timers.Get(Index);
   if (ti) {
      if (!ti->recording) {
-        if (Interface.Confirm("Delete Timer?")) {
+        if (Interface->Confirm("Delete Timer?")) {
            Timers.Del(Timers.Get(Index));
            cOsdMenu::Del(Index);
            Timers.Save();
@@ -925,7 +930,7 @@ eOSState cMenuTimers::Del(void)
            }
         }
      else
-        Interface.Error("Timer is recording!");
+        Interface->Error("Timer is recording!");
      }
   return osContinue;
 }
@@ -990,28 +995,19 @@ void cMenuRecordingItem::Set(void)
 
 // --- cMenuRecordings -------------------------------------------------------
 
-class cMenuRecordings : public cOsdMenu {
-private:
-  cRecordings Recordings;
-  eOSState Play(void);
-  eOSState Del(void);
-  eOSState Summary(void);
-public:
-  cMenuRecordings(void);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
 cMenuRecordings::cMenuRecordings(void)
 :cOsdMenu("Recordings", 6, 6)
 {
   if (Recordings.Load()) {
+     const char *lastReplayed = cReplayControl::LastReplayed();
      cRecording *recording = Recordings.First();
      while (recording) {
-           Add(new cMenuRecordingItem(recording));
+           Add(new cMenuRecordingItem(recording), lastReplayed && strcmp(lastReplayed, recording->FileName()) == 0);
            recording = Recordings.Next(recording);
            }
      }
-  SetHelp("Play", NULL/*XXX"Resume"*/, "Delete", "Summary");
+  SetHelp("Play", NULL, "Delete", "Summary");
+  Display();
 }
 
 eOSState cMenuRecordings::Play(void)
@@ -1030,17 +1026,18 @@ eOSState cMenuRecordings::Del(void)
   if (ri) {
 //XXX what if this recording's file is currently in use???
 //XXX     if (!ti->recording) {
-        if (Interface.Confirm("Delete Recording?")) {
+        if (Interface->Confirm("Delete Recording?")) {
            if (ri->recording->Delete()) {
+              cReplayControl::ClearLastReplayed(ri->recording->FileName());
               cOsdMenu::Del(Current());
               Display();
               }
            else
-              Interface.Error("Error while deleting recording!");
+              Interface->Error("Error while deleting recording!");
            }
 //XXX        }
 //XXX     else
-//XXX        Interface.Error("Timer is recording!");
+//XXX        Interface->Error("Timer is recording!");
      }
   return osContinue;
 }
@@ -1065,6 +1062,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kRed:    return Play();
        case kYellow: return Del();
        case kBlue:   return Summary();
+       case kMenu:   return osEnd;
        default: break;
        }
      }
@@ -1088,6 +1086,9 @@ cMenuSetup::cMenuSetup(void)
   Add(new cMenuEditIntItem( "PrimaryDVB",         &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
   Add(new cMenuEditBoolItem("ShowInfoOnChSwitch", &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem("MenuScrollPage",     &data.MenuScrollPage));
+  Add(new cMenuEditBoolItem("MarkInstantRecord",  &data.MarkInstantRecord));
+  Add(new cMenuEditIntItem( "LnbFrequLo",         &data.LnbFrequLo));
+  Add(new cMenuEditIntItem( "LnbFrequHi",         &data.LnbFrequHi));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1126,7 +1127,7 @@ cMenuMain::cMenuMain(bool Replaying)
         Add(new cOsdItem(buffer, osStopRecord));
         delete buffer;
         }
-  SetHelp("Record");
+  SetHelp("Record", NULL, NULL, cReplayControl::LastReplayed() ? "Resume" : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -1140,7 +1141,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osTimer:      return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
     case osSetup:      return AddSubMenu(new cMenuSetup);
-    case osStopRecord: if (Interface.Confirm("Stop Recording?")) {
+    case osStopRecord: if (Interface->Confirm("Stop Recording?")) {
                           cOsdItem *item = Get(Current());
                           if (item) {
                              cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
@@ -1152,6 +1153,9 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                case kRed:  if (!HasSubMenu())
                               state = osRecord;
                            break;
+               case kBlue: if (!HasSubMenu())
+                              state = osReplay;
+                           break;
                default:    break;
                }
     }
@@ -1172,15 +1176,15 @@ cDirectChannelSelect::cDirectChannelSelect(eKeys FirstKey)
   oldNumber = CurrentChannel;
   number = 0;
   lastTime = time_ms();
-  Interface.Open(MenuColumns, 1);
+  Interface->Open(MenuColumns, 1);
   ProcessKey(FirstKey);
 }
 
 cDirectChannelSelect::~cDirectChannelSelect()
 {
   if (number < 0)
-     Interface.DisplayChannel(oldNumber);
-  Interface.Close();
+     Interface->DisplayChannel(oldNumber);
+  Interface->Close();
 }
 
 eOSState cDirectChannelSelect::ProcessKey(eKeys Key)
@@ -1194,9 +1198,9 @@ eOSState cDirectChannelSelect::ProcessKey(eKeys Key)
             int BufSize = MenuColumns + 1;
             char buffer[BufSize];
             snprintf(buffer, BufSize, "%d  %s", number, Name);
-            Interface.DisplayChannel(number);
-            Interface.Clear();
-            Interface.Write(0, 0, buffer);
+            Interface->DisplayChannel(number);
+            Interface->Clear();
+            Interface->Write(0, 0, buffer);
             lastTime = time_ms();
             if (!channel) {
                number = -1;
@@ -1235,14 +1239,14 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
   cRecording Recording(timer);
   if (dvbApi->StartRecord(Recording.FileName()))
      Recording.WriteSummary();
-  Interface.DisplayRecording(dvbApi->Index(), true);
+  Interface->DisplayRecording(dvbApi->Index(), true);
 }
 
 cRecordControl::~cRecordControl()
 {
   Stop(true);
   delete instantId;
-  Interface.DisplayRecording(dvbApi->Index(), false);
+  Interface->DisplayRecording(dvbApi->Index(), false);
 }
 
 void cRecordControl::Stop(bool KeepInstant)
@@ -1357,10 +1361,23 @@ void cReplayControl::SetRecording(const char *FileName, const char *Title)
   title = Title ? strdup(Title) : NULL;
 }
 
+const char *cReplayControl::LastReplayed(void)
+{
+  return fileName;
+}
+
+void cReplayControl::ClearLastReplayed(const char *FileName)
+{
+  if (fileName && FileName && strcmp(fileName, FileName) == 0) {
+     delete fileName;
+     fileName = NULL;
+     }
+}
+
 void cReplayControl::Show(void)
 {
   if (!visible) {
-     Interface.Open(MenuColumns, -3);
+     Interface->Open(MenuColumns, -3);
      needsFastResponse = visible = true;
      shown = dvbApi->ShowProgress(true);
      }
@@ -1369,7 +1386,7 @@ void cReplayControl::Show(void)
 void cReplayControl::Hide(void)
 {
   if (visible) {
-     Interface.Close();
+     Interface->Close();
      needsFastResponse = visible = false;
      }
 }
@@ -1388,10 +1405,16 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                    return osEnd;
     case kLeft:    dvbApi->Backward(); break;
     case kRight:   dvbApi->Forward(); break;
+    case kLeft|k_Release:
+    case kRight|k_Release:
+                   dvbApi->Play(); break;
+    case kGreen|k_Repeat:
     case kGreen:   dvbApi->Skip(-60); break;
+    case kYellow|k_Repeat:
     case kYellow:  dvbApi->Skip(60); break;
     case kMenu:    Hide(); return osMenu; // allow direct switching to menu
     case kOk:      visible ? Hide() : Show(); break;
+    case kBack:    return osRecordings;
     default:       return osUnknown;
     }
   return osContinue;
diff --git a/menu.h b/menu.h
index 8b4f82efe..c36427f12 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.10 2000/09/10 14:42:20 kls Exp $
+ * $Id: menu.h 1.12 2000/10/08 15:21:52 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -14,6 +14,7 @@
 
 #include "dvbapi.h"
 #include "osd.h"
+#include "recording.h"
 
 class cMenuMain : public cOsdMenu {
 private:
@@ -34,6 +35,17 @@ class cDirectChannelSelect : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuRecordings : public cOsdMenu {
+private:
+  cRecordings Recordings;
+  eOSState Play(void);
+  eOSState Del(void);
+  eOSState Summary(void);
+public:
+  cMenuRecordings(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cRecordControl {
 private:
   cDvbApi *dvbApi;
@@ -72,6 +84,8 @@ class cReplayControl : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
+  static const char *LastReplayed(void);
+  static void ClearLastReplayed(const char *FileName);
   };
 
 #endif //_MENU_H
diff --git a/osd.c b/osd.c
index e1c99b44b..75d9eadeb 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.7 2000/09/10 08:24:50 kls Exp $
+ * $Id: osd.c 1.9 2000/10/08 12:20:34 kls Exp $
  */
 
 #include "osd.h"
@@ -64,7 +64,7 @@ void cOsdItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
   if (Offset >= 0)
      offset = Offset;
   if (offset >= 0)
-     Interface.WriteText(0, offset + 2, text, userColor ? fgColor : FgColor, userColor ? bgColor : BgColor);
+     Interface->WriteText(0, offset + 2, text, userColor ? fgColor : FgColor, userColor ? bgColor : BgColor);
 }
 
 eOSState cOsdItem::ProcessKey(eKeys Key)
@@ -88,7 +88,7 @@ cOsdMenu::cOsdMenu(char *Title, int c0, int c1, int c2, int c3, int c4)
   subMenu = NULL;
   helpRed = helpGreen = helpYellow = helpBlue = NULL;
   status = NULL;
-  Interface.Open();
+  Interface->Open();
 }
 
 cOsdMenu::~cOsdMenu()
@@ -96,8 +96,8 @@ cOsdMenu::~cOsdMenu()
   delete title;
   delete subMenu;
   delete status;
-  Interface.Clear();
-  Interface.Close();
+  Interface->Clear();
+  Interface->Close();
 }
 
 void cOsdMenu::SetStatus(const char *s)
@@ -105,7 +105,7 @@ void cOsdMenu::SetStatus(const char *s)
   delete status;
   status = s ? strdup(s) : NULL;
   if (visible)
-     Interface.Status(status);
+     Interface->Status(status);
 }
 
 void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
@@ -117,7 +117,7 @@ void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, c
   helpBlue   = Blue;
   if (visible)
      Display();
-     //XXX Interface.Help(helpRed, helpGreen, helpYellow, helpBlue);
+     //XXX Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
      //XXX must clear unused button areas!
 }
 
@@ -140,10 +140,10 @@ void cOsdMenu::Add(cOsdItem *Item, bool Current)
 void cOsdMenu::Display(void)
 {
   visible = true;
-  Interface.Clear();
-  Interface.SetCols(cols);
-  Interface.Title(title);
-  Interface.Help(helpRed, helpGreen, helpYellow, helpBlue);
+  Interface->Clear();
+  Interface->SetCols(cols);
+  Interface->Title(title);
+  Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
   int count = Count();
   if (count > 0) {
      if (current < 0)
@@ -164,7 +164,7 @@ void cOsdMenu::Display(void)
             break;
          }
      }
-  Interface.Status(status);
+  Interface->Status(status);
 }
 
 void cOsdMenu::RefreshCurrent(void)
@@ -274,7 +274,9 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
         return state;
      }
   switch (Key) {
+    case kUp|k_Repeat:
     case kUp:   CursorUp();   break;
+    case kDown|k_Repeat:
     case kDown: CursorDown(); break;
     case kBack: return osBack;
     case kOk:   if (marked >= 0) {
diff --git a/recording.c b/recording.c
index 60ea4a1c0..f9ab01621 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.18 2000/10/03 12:39:28 kls Exp $
+ * $Id: recording.c 1.19 2000/10/08 12:20:53 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -254,7 +254,7 @@ bool cRecordings::Load(bool Deleted)
      result = Count() > 0;
      }
   else
-     Interface.Error("Error while opening pipe!");
+     Interface->Error("Error while opening pipe!");
   delete cmd;
   return result;
 }
diff --git a/remote.c b/remote.c
index 1bf810854..f60d7685c 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.15 2000/10/03 10:49:58 kls Exp $
+ * $Id: remote.c 1.18 2000/10/08 16:49:41 kls Exp $
  */
 
 #include "remote.h"
@@ -27,16 +27,11 @@
 #include "config.h"
 #include "tools.h"
 
-#define REPEATLIMIT 100 // ms
-#define REPEATDELAY 250 // ms
-
 // --- cRcIoBase -------------------------------------------------------------
 
 cRcIoBase::cRcIoBase(void)
 {
   t = 0;
-  firstTime = lastTime = 0;
-  lastCommand = 0;
 }
 
 cRcIoBase::~cRcIoBase()
@@ -69,12 +64,12 @@ void cRcIoKBD::Flush(int WaitMs)
       }
 }
 
-bool cRcIoKBD::InputAvailable(bool Wait)
+bool cRcIoKBD::InputAvailable(void)
 {
-  return f.Ready(Wait);
+  return f.Ready(false);
 }
 
-bool cRcIoKBD::GetCommand(unsigned int *Command, unsigned short *)
+bool cRcIoKBD::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
 {
   if (Command) {
      *Command = getch();
@@ -87,36 +82,122 @@ bool cRcIoKBD::GetCommand(unsigned int *Command, unsigned short *)
 
 #elif defined REMOTE_RCU
 
+#define REPEATLIMIT  20 // ms
+#define REPEATDELAY 350 // ms
+
 cRcIoRCU::cRcIoRCU(char *DeviceName)
 {
   dp = 0;
   mode = modeB;
   code = 0;
   address = 0xFFFF;
+  receivedAddress = 0;
+  receivedCommand = 0;
+  receivedData = receivedRepeat = receivedRelease = false;
   lastNumber = 0;
-  if (f.Open(DeviceName, O_RDWR | O_NONBLOCK)) {
+  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
      struct termios t;
      if (tcgetattr(f, &t) == 0) {
         cfsetspeed(&t, B9600);
         cfmakeraw(&t);
-        if (tcsetattr(f, TCSAFLUSH, &t) == 0)
+        if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
+           Start();
            return;
+           }
         }
      LOG_ERROR_STR(DeviceName);
-     f.Close();
+     close(f);
      }
   else
      LOG_ERROR_STR(DeviceName);
+  f = -1;
 }
 
 cRcIoRCU::~cRcIoRCU()
 {
+  Stop();
 }
 
-int cRcIoRCU::ReceiveByte(bool Wait)
+void cRcIoRCU::Action(void)
+{
+#pragma pack(1)
+  union {
+    struct {
+      unsigned short address;
+      unsigned int command;
+      } data;
+    unsigned char raw[6];
+    } buffer;
+#pragma pack()
+
+  dsyslog(LOG_INFO, "RCU remote control thread started (pid=%d)", getpid());
+
+  int FirstTime = 0;
+  unsigned int LastCommand = 0;
+
+  for (; f >= 0;) {
+
+      LOCK_THREAD;
+
+      if (ReceiveByte(REPEATLIMIT) == 'X') {
+         for (int i = 0; i < 6; i++) {
+             int b = ReceiveByte();
+             if (b >= 0) {
+                buffer.raw[i] = b;
+                if (i == 5) {
+                   unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
+                   unsigned int   Command = ntohl(buffer.data.command);
+                   if (code == 'B' && address == 0x0000 && Command == 0x00004000)
+                      // Well, well, if it isn't the "d-box"...
+                      // This remote control sends the above command before and after
+                      // each keypress - let's just drop this:
+                      break;
+                   if (!receivedData) { // only accept new data the previous data has been fetched
+                      int Now = time_ms();
+                      if (Command != LastCommand) {
+                         receivedAddress = Address;
+                         receivedCommand = Command;
+                         receivedData = true;
+                         receivedRepeat = receivedRelease = false;
+                         FirstTime = Now;
+                         }
+                      else {
+                         if (Now - FirstTime < REPEATDELAY)
+                            break; // repeat function kicks in after a short delay
+                         receivedData = receivedRepeat = true;
+                         }
+                      LastCommand = Command;
+                      WakeUp();
+                      }
+                   }
+                }
+             else
+                break;
+             }
+         }
+      else if (receivedData) { // the last data before releasing the key hasn't been fetched yet
+         if (receivedRepeat) { // it was a repeat, so let's make it a release
+            receivedRepeat = false;
+            receivedRelease = true;
+            LastCommand = 0;
+            WakeUp();
+            }
+         }
+      else if (receivedRepeat) { // all data has already been fetched, but the last one was a repeat, so let's generate a release
+         receivedData = receivedRelease = true;
+         receivedRepeat = false;
+         LastCommand = 0;
+         WakeUp();
+         }
+      else
+         LastCommand = 0;
+      }
+}
+
+int cRcIoRCU::ReceiveByte(int TimeoutMs)
 {
   // Returns the byte if one was received within a timeout, -1 otherwise
-  if (InputAvailable(Wait)) {
+  if (cFile::FileReady(f, TimeoutMs)) {
      unsigned char b;
      if (read(f, &b, 1) == 1)
         return b;
@@ -128,16 +209,16 @@ int cRcIoRCU::ReceiveByte(bool Wait)
 
 bool cRcIoRCU::SendByteHandshake(unsigned char c)
 {
-  if (f.IsOpen()) {
+  if (f >= 0) {
      int w = write(f, &c, 1);
      if (w == 1) {
-        for (int reply = ReceiveByte(); reply >= 0;) {
+        for (int reply = ReceiveByte(REPEATLIMIT); reply >= 0;) {
             if (reply == c)
                return true;
             else if (reply == 'X') {
                // skip any incoming RC code - it will come again
                for (int i = 6; i--;) {
-                   if (ReceiveByte(false) < 0)
+                   if (ReceiveByte() < 0)
                       return false;
                    }
                }
@@ -152,6 +233,8 @@ bool cRcIoRCU::SendByteHandshake(unsigned char c)
 
 bool cRcIoRCU::SendByte(unsigned char c)
 {
+  LOCK_THREAD;
+
   for (int retry = 5; retry--;) {
       if (SendByteHandshake(c))
          return true;
@@ -174,66 +257,34 @@ bool cRcIoRCU::SetMode(unsigned char Mode)
 
 void cRcIoRCU::Flush(int WaitMs)
 {
-  int t0 = time_ms();
+  LOCK_THREAD;
 
+  int t0 = time_ms();
   for (;;) {
-      while (ReceiveByte(false) >= 0)
+      while (ReceiveByte() >= 0)
             t0 = time_ms();
       if (time_ms() - t0 >= WaitMs)
          break;
       }
+  receivedData = receivedRepeat = false;
 }
 
-bool cRcIoRCU::InputAvailable(bool Wait)
+bool cRcIoRCU::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
 {
-  return f.Ready(Wait);
-}
-
-bool cRcIoRCU::GetCommand(unsigned int *Command, unsigned short *Address)
-{
-#pragma pack(1)
-  union {
-    struct {
-      unsigned short address;
-      unsigned int command;
-      } data;
-    unsigned char raw[6];
-    } buffer;
-#pragma pack()
-    
-  Flush();
-  if (Command && ReceiveByte() == 'X') {
-     for (int i = 0; i < 6; i++) {
-         int b = ReceiveByte(false);
-         if (b >= 0)
-            buffer.raw[i] = b;
-         else
-            return false;
-         }
-     if (Address)
-        *Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
-     else if (address != ntohs(buffer.data.address))
-        return false;
-     *Command = ntohl(buffer.data.command);
-     if (code == 'B' && address == 0x0000 && *Command == 0x00004000)
-        // Well, well, if it isn't the "d-box"...
-        // This remote control sends the above command before and after
-        // each keypress - let's just drop this:
-        return false;
-     if (*Command == lastCommand) {
-        // let's have a timeout to avoid getting overrun by commands
-        int now = time_ms();
-        int delta = now - lastTime;
-        lastTime = now;
-        if (delta < REPEATLIMIT) { // if commands come in rapidly...
-           if (now - firstTime < REPEATDELAY)
-              return false; // ...repeat function kicks in after a short delay
-           return true;
-           }
+  if (receivedData) { // first we check the boolean flag without a lock, to avoid delays
+
+     LOCK_THREAD;
+
+     if (receivedData) { // need to check again, since the status might have changed while waiting for the lock
+        if (Command)
+           *Command = receivedCommand;
+        if (Repeat)
+           *Repeat = receivedRepeat;
+        if (Release)
+           *Release = receivedRelease;
+        receivedData = false;
+        return true;
         }
-     lastTime = firstTime = time_ms();
-     lastCommand = *Command;
-     return true;
      }
   if (time(NULL) - t > 60) {
      SendCommand(code); // in case the PIC listens to the wrong code
@@ -254,6 +305,8 @@ bool cRcIoRCU::Digit(int n, int v)
 
 bool cRcIoRCU::Number(int n, bool Hex)
 {
+  LOCK_THREAD;
+
   if (!Hex) {
      char buf[8];
      sprintf(buf, "%4d", n & 0xFFFF);
@@ -275,6 +328,8 @@ bool cRcIoRCU::Number(int n, bool Hex)
 
 bool cRcIoRCU::String(char *s)
 {
+  LOCK_THREAD;
+
   const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
   int n = 0;
 
@@ -318,8 +373,11 @@ bool cRcIoRCU::DetectCode(unsigned char *Code, unsigned short *Address)
      sprintf(buf, "C0D%c", *Code);
      String(buf);
      SetCode(*Code, 0);
-     unsigned int Command;
-     if (GetCommand(&Command, Address)) {
+     delay_ms(REPEATDELAY);
+     receivedData = receivedRepeat = 0;
+     delay_ms(REPEATDELAY);
+     if (GetCommand()) {
+        *Address = receivedAddress;
         SetMode(modeB);
         String("----");
         return true;
@@ -337,77 +395,94 @@ bool cRcIoRCU::DetectCode(unsigned char *Code, unsigned short *Address)
 
 #elif defined REMOTE_LIRC
 
+#define REPEATLIMIT  20 // ms
+#define REPEATDELAY 350 // ms
+
 cRcIoLIRC::cRcIoLIRC(char *DeviceName)
 {
-  repeat = 1;
+  *keyName = 0;
+  receivedData = receivedRepeat = false;
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
   strcpy(addr.sun_path, DeviceName);
-  int sock = socket(AF_UNIX, SOCK_STREAM, 0);
-  if (sock >= 0) {
-     if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
-        f.Open(sock);
+  if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
+     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
+        Start();
         return;
         }
      LOG_ERROR_STR(DeviceName);
-     close(sock);
+     close(f);
      }
   else
      LOG_ERROR_STR(DeviceName);
+  f = -1;
 }
 
 cRcIoLIRC::~cRcIoLIRC()
 {
+  Stop();
 }
 
-const char *cRcIoLIRC::ReceiveString(void)
+void cRcIoLIRC::Action(void)
 {
-  int oldrepeat = 1;
-
-  if (repeat != 0) {
-     Flush();
-     if (repeat != 0) {
-        oldrepeat = repeat;
-        Flush(REPEATLIMIT);
-        }
-     }
-
-  if (repeat == 0) {
-     firstTime = time_ms();
-     repeat = 1;
-     return keyName;
-     }
-
-  if ((repeat > 1) && (repeat != oldrepeat) && (time_ms() > firstTime + REPEATDELAY)) {
-     repeat = 1;
-     return keyName;
-     }
+  dsyslog(LOG_INFO, "LIRC remote control thread started (pid=%d)", getpid());
 
-  return NULL;
-}
-
-void cRcIoLIRC::Flush(int WaitMs)
-{
+  int FirstTime = 0;
   char buf[LIRC_BUFFER_SIZE];
-  int t0 = time_ms();
-
-  do {
-     if (InputAvailable(false) && (read(f, buf, sizeof(buf)) > 21))
-        sscanf(buf, "%*x %x %7s", &repeat, keyName); // '7' in '%7s' is LIRC_KEY_BUF-1!
-     } while ((repeat != 0) && (time_ms() < t0 + WaitMs));
-}
-
-bool cRcIoLIRC::InputAvailable(bool Wait)
-{
-  return f.Ready(Wait);
+  char LastKeyName[LIRC_KEY_BUF];
+
+  for (; f >= 0;) {
+
+      LOCK_THREAD;
+
+      if (cFile::FileReady(f, REPEATLIMIT) && read(f, buf, sizeof(buf)) > 21) {
+         if (!receivedData) { // only accept new data the previous data has been fetched
+            int count;
+            sscanf(buf, "%*x %x %7s", &count, LastKeyName); // '7' in '%7s' is LIRC_KEY_BUF-1!
+            int Now = time_ms();
+            if (count == 0) {
+               strcpy(keyName, LastKeyName);
+               receivedData = true;
+               receivedRepeat = receivedRelease = false;
+               FirstTime = Now;
+               }
+            else {
+               if (Now - FirstTime < REPEATDELAY)
+                  continue; // repeat function kicks in after a short delay
+               receivedData = receivedRepeat = true;
+               }
+            WakeUp();
+            }
+         }
+      else if (receivedData) { // the last data before releasing the key hasn't been fetched yet
+         if (receivedRepeat) { // it was a repeat, so let's make it a release
+            receivedRepeat = false;
+            receivedRelease = true;
+            WakeUp();
+            }
+         }
+      else if (receivedRepeat) { // all data has already been fetched, but the last one was a repeat, so let's generate a release
+         receivedData = receivedRelease = true;
+         receivedRepeat = false;
+         WakeUp();
+         }
+      }
 }
 
-bool cRcIoLIRC::GetCommand(unsigned int *Command, unsigned short *)
+bool cRcIoLIRC::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
 {
-  if (Command) {
-     const char *cmd = ReceiveString();
-     if (cmd) {
-        *Command = Keys.Encode(cmd);
+  if (receivedData) { // first we check the boolean flag without a lock, to avoid delays
+
+     LOCK_THREAD;
+
+     if (receivedData) { // need to check again, since the status might have changed while waiting for the lock
+        if (Command)
+           *Command = Keys.Encode(keyName);
+        if (Repeat)
+           *Repeat = receivedRepeat;
+        if (Release)
+           *Release = receivedRelease;
+        receivedData = false;
         return true;
         }
      }
diff --git a/remote.h b/remote.h
index 75dc4ac1b..0ea4442ae 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.10 2000/10/03 10:45:35 kls Exp $
+ * $Id: remote.h 1.13 2000/10/08 12:11:34 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -12,26 +12,25 @@
 
 #include <stdio.h>
 #include <time.h>
+#include "thread.h"
 #include "tools.h"
 
 class cRcIoBase {
 protected:
   time_t t;
-  int firstTime, lastTime;
-  unsigned int lastCommand;
   cRcIoBase(void);
-  virtual ~cRcIoBase();
 public:
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  virtual ~cRcIoBase();
   virtual bool SetCode(unsigned char Code, unsigned short Address) { return true; }
   virtual bool SetMode(unsigned char Mode) { return true; }
   virtual bool Number(int n, bool Hex = false) { return true; }
   virtual void SetPoints(unsigned char Dp, bool On) {}
   virtual bool String(char *s) { return true; }
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
-  virtual void Flush(int WaitMs = 0) = 0;
-  virtual bool InputAvailable(bool Wait = false) = 0;
-  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL) = 0;
+  virtual void Flush(int WaitMs = 0) {}
+  virtual bool InputAvailable(void) = 0;
+  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL) = 0;
   };
 
 #if defined REMOTE_KBD
@@ -43,23 +42,27 @@ class cRcIoKBD : public cRcIoBase {
   cRcIoKBD(void);
   virtual ~cRcIoKBD();
   virtual void Flush(int WaitMs = 0);
-  virtual bool InputAvailable(bool Wait = false);
-  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
+  virtual bool InputAvailable(void);
+  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
   };
 
 #elif defined REMOTE_RCU
 
-class cRcIoRCU : public cRcIoBase {
+class cRcIoRCU : public cRcIoBase, private cThread {
 private:
-  cFile f;
+  int f;
   unsigned char dp, code, mode;
   unsigned short address;
+  unsigned short receivedAddress;
+  unsigned int receivedCommand;
+  bool receivedData, receivedRepeat, receivedRelease;
   int lastNumber;
   bool SendCommand(unsigned char Cmd);
-  int ReceiveByte(bool Wait = true);
+  int ReceiveByte(int TimeoutMs = 0);
   bool SendByteHandshake(unsigned char c);
   bool SendByte(unsigned char c);
   bool Digit(int n, int v);
+  virtual void Action(void);
 public:
   cRcIoRCU(char *DeviceName);
   virtual ~cRcIoRCU();
@@ -70,25 +73,24 @@ class cRcIoRCU : public cRcIoBase {
   virtual bool String(char *s);
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address);
   virtual void Flush(int WaitMs = 0);
-  virtual bool InputAvailable(bool Wait = false);
-  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
+  virtual bool InputAvailable(void) { return receivedData; }
+  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
   };
 
 #elif defined REMOTE_LIRC
 
-class cRcIoLIRC : public cRcIoBase {
+class cRcIoLIRC : public cRcIoBase, private cThread {
 private:
   enum { LIRC_KEY_BUF = 8, LIRC_BUFFER_SIZE = 128 };
-  cFile f;
+  int f;
   char keyName[LIRC_KEY_BUF];
-  int repeat;
-  const char *ReceiveString(void);
+  bool receivedData, receivedRepeat, receivedRelease;
+  virtual void Action(void);
 public:
   cRcIoLIRC(char *DeviceName);
   virtual ~cRcIoLIRC();
-  virtual void Flush(int WaitMs = 0);
-  virtual bool InputAvailable(bool Wait = false);
-  virtual bool GetCommand(unsigned int *Command, unsigned short *Address = NULL);
+  virtual bool InputAvailable(void) { return receivedData; }
+  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
   };
 
 #else
diff --git a/setup.conf b/setup.conf
index e80c2e0c2..e7ec26747 100644
--- a/setup.conf
+++ b/setup.conf
@@ -2,3 +2,6 @@
 PrimaryDVB         = 1
 ShowInfoOnChSwitch = 1
 MenuScrollPage     = 1
+MarkInstantRecord  = 1
+LnbFrequLo         = 9750
+LnbFrequHi         = 10600
diff --git a/svdrp.c b/svdrp.c
index c9ea7c387..cf91cafb2 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.10 2000/09/17 13:39:37 kls Exp $
+ * $Id: svdrp.c 1.11 2000/10/08 12:21:14 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -326,7 +326,7 @@ void cSVDRP::CmdCHAN(const char *Option)
         Reply(501, "Undefined channel \"%s\"", Option);
         return;
         }
-     if (Interface.Recording()) {
+     if (Interface->Recording()) {
         Reply(550, "Can't switch channel, interface is recording");
         return;
         }
@@ -474,7 +474,7 @@ void cSVDRP::CmdHITK(const char *Option)
   if (*Option) {
      eKeys k = Keys.Translate(Option);
      if (k != kNone) {
-        Interface.PutKey(k);
+        Interface->PutKey(k);
         Reply(250, "Key \"%s\" accepted", Option);
         }
      else
diff --git a/thread.c b/thread.c
new file mode 100644
index 000000000..7304e682a
--- /dev/null
+++ b/thread.c
@@ -0,0 +1,105 @@
+/*
+ * thread.c: A simple thread base class
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: thread.c 1.2 2000/10/08 16:45:50 kls Exp $
+ */
+
+#include "thread.h"
+#include <signal.h>
+#include <unistd.h>
+
+// --- cThread ---------------------------------------------------------------
+
+// The signal handler is necessary to be able to use SIGIO to wake up any
+// pending 'select()' call.
+
+bool cThread::signalHandlerInstalled = false;
+
+cThread::cThread(void)
+{
+  if (!signalHandlerInstalled) {
+     signal(SIGIO, SignalHandler);
+     signalHandlerInstalled = true;
+     }
+  pthread_mutex_init(&mutex, NULL);
+  running = false;
+  parentPid = lockingPid = 0;
+  locked = 0;
+}
+
+cThread::~cThread()
+{
+  pthread_mutex_destroy(&mutex);
+}
+
+void cThread::SignalHandler(int signum)
+{
+  signal(signum, SignalHandler);
+}
+
+void *cThread::StartThread(cThread *Thread)
+{
+  Thread->Action();
+  return NULL;
+}
+
+bool cThread::Start(void)
+{
+  if (!running) {
+     running = true;
+     parentPid = getpid();
+     pthread_create(&thread, NULL, &StartThread, (void *)this);
+     }
+  return true; //XXX return value of pthread_create()???
+}
+
+void cThread::Stop(void)
+{
+  pthread_cancel(thread);
+}
+
+bool cThread::Lock(void)
+{
+  if (!lockingPid || lockingPid != getpid()) {
+     pthread_mutex_lock(&mutex);
+     lockingPid = getpid();
+     }
+  locked++;
+  return true;
+}
+
+void cThread::Unlock(void)
+{
+  if (!--locked) {
+     lockingPid = 0;
+     pthread_mutex_unlock(&mutex);
+     }
+}
+
+void cThread::WakeUp(void)
+{
+  kill(parentPid, SIGIO); // makes any waiting 'select()' call return immediately
+}
+
+// --- cThreadLock -----------------------------------------------------------
+
+cThreadLock::cThreadLock(cThread *Thread)
+{
+  thread = Thread;
+  locked = Thread->Lock();
+}
+
+cThreadLock::~cThreadLock()
+{
+  if (locked)
+     thread->Unlock();
+}
+
+bool cThreadLock::Locked(void)
+{
+  return locked;
+}
+
diff --git a/thread.h b/thread.h
new file mode 100644
index 000000000..86b9e922c
--- /dev/null
+++ b/thread.h
@@ -0,0 +1,57 @@
+/*
+ * thread.h: A simple thread base class
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: thread.h 1.1 2000/10/08 08:36:21 kls Exp $
+ */
+
+#ifndef __THREAD_H
+#define __THREAD_H
+
+#include <pthread.h>
+#include <sys/types.h>
+
+class cThread {
+  friend class cThreadLock;
+private:
+  pthread_t thread;
+  pthread_mutex_t mutex;
+  pid_t parentPid, lockingPid;
+  int locked;
+  bool running;
+  static bool signalHandlerInstalled;
+  static void SignalHandler(int signum);
+  static void *StartThread(cThread *Thread);
+  bool Lock(void);
+  void Unlock(void);
+protected:
+  void WakeUp(void);
+  virtual void Action(void) = 0;
+  void Stop(void);
+public:
+  cThread(void);
+  virtual ~cThread();
+  bool Start(void);
+  };
+
+// cThreadLock can be used to easily set a lock in a thread and make absolutely
+// sure that it will be unlocked when the block will be left. Several locks can
+// be stacked, so a function that makes many calls to another function which uses
+// cThreadLock may itself use a cThreadLock to make one longer lock instead of many
+// short ones.
+
+class cThreadLock {
+private:
+  cThread *thread;
+  bool locked;
+public:
+  cThreadLock(cThread *Thread);
+  ~cThreadLock();
+  bool Locked(void);
+  };
+
+#define LOCK_THREAD cThreadLock ThreadLock(this)
+
+#endif //__THREAD_H
diff --git a/timers.conf b/timers.conf
index 2a58454b6..fc0e12a60 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,16 +1,16 @@
 1:15:M------:2128:2205:99:7:Neues:
 1:3:-T-----:2013:2125:99:99:SevenDays:
 1:10:-T-----:2058:2202:99:10:Quarks:
-1:26:-T-----:2235:2345:99:99:UFO:
+1:26:-T-----:2320:0040:99:99:UFO:
+1:14:--W----:1920:2020:99:99:Rettungsflieger:
 1:2:--W----:2110:2325:99:99:BulleVonToelz:
 1:3:---T---:2210:2315:99:10:IngoAppelt:
-1:2:----F--:2140:2225:10:10:WWW:
+0:2:----F--:2140:2225:10:10:WWW:
 1:1:----F--:2212:2325:99:99:7Tage7Koepfe:
 1:11:-----S-:2058:2135:99:99:Computer:
 1:2:-----S-:2211:2340:99:30:Wochenshow:
 1:11:------S:2013:2035:99:10:Centauri:
 1:14:------S:2158:2235:99:14:MaxUndLisa:
-0:15:MTWTF--:1828:1901:10:5:nano:
+1:15:MTWTF--:1828:1901:10:5:nano:
 1:1:-TWTF--:0955:1040:99:99:Ellen:
-0:1:MTWTF--:1553:1710:99:99:Hammerman:
-1:1:4:0755:0910:99:99:Hammerman:
+1:1:MTWTF--:1553:1710:99:99:Hammerman:
diff --git a/tools.c b/tools.c
index 5bb56e6df..fc15a9853 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.20 2000/09/29 16:19:28 kls Exp $
+ * $Id: tools.c 1.21 2000/10/07 18:02:24 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -393,6 +393,22 @@ bool cFile::AnyFileReady(int FileDes, int TimeoutMs)
   return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && (FileDes < 0 || FD_ISSET(FileDes, &set));
 }
 
+bool cFile::FileReady(int FileDes, int TimeoutMs)
+{
+#ifdef DEBUG_OSD
+  refresh();
+#endif
+  fd_set set;
+  struct timeval timeout;
+  FD_ZERO(&set);
+  FD_SET(FileDes, &set);
+  if (TimeoutMs < 100)
+     TimeoutMs = 100;
+  timeout.tv_sec  = 0;
+  timeout.tv_usec = TimeoutMs * 1000;
+  return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
diff --git a/tools.h b/tools.h
index 441f5715a..17b643ffb 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.16 2000/09/29 16:19:31 kls Exp $
+ * $Id: tools.h 1.17 2000/10/07 18:00:21 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -68,6 +68,7 @@ class cFile {
   int ReadString(char *Buffer, int Size);
   bool Ready(bool Wait = true);
   static bool AnyFileReady(int FileDes = -1, int TimeoutMs = 1000);
+  static bool FileReady(int FileDes, int TimeoutMs = 1000);
   };
 
 class cListObject {
diff --git a/vdr.c b/vdr.c
index 042b03ce7..c8cabb0b5 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.36 2000/10/03 13:52:26 kls Exp $
+ * $Id: vdr.c 1.39 2000/10/08 14:49:25 kls Exp $
  */
 
 #include <getopt.h>
@@ -161,6 +161,10 @@ int main(int argc, char *argv[])
   if (!cDvbApi::Init())
      abort();
 
+  // User interface:
+
+  Interface = new cInterface(SVDRPport);
+
   // Configuration data:
 
   if (!ConfigDirectory)
@@ -173,9 +177,8 @@ int main(int argc, char *argv[])
   Keys.SetDummyValues();
 #else
   if (!Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF)))
-     Interface.LearnKeys();
+     Interface->LearnKeys();
 #endif
-  Interface.Init(SVDRPport);
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
@@ -215,7 +218,7 @@ int main(int argc, char *argv[])
            }
         // User Input:
         cOsdBase **Interact = Menu ? &Menu : (cOsdBase **)&ReplayControl;
-        eKeys key = Interface.GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
+        eKeys key = Interface->GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
         if (*Interact) {
            switch ((*Interact)->ProcessKey(key)) {
              case osMenu:   DELETENULL(Menu);
@@ -223,7 +226,12 @@ int main(int argc, char *argv[])
                             break;
              case osRecord: DELETENULL(Menu);
                             if (!cRecordControls::Start())
-                               Interface.Error("No free DVB device to record!");
+                               Interface->Error("No free DVB device to record!");
+                            break;
+             case osRecordings:
+                            DELETENULL(Menu);
+                            DELETENULL(ReplayControl);
+                            Menu = new cMenuRecordings;
                             break;
              case osReplay: DELETENULL(Menu);
                             DELETENULL(ReplayControl);
@@ -235,7 +243,7 @@ int main(int argc, char *argv[])
                             break;
              case osSwitchDvb:
                             DELETENULL(*Interact);
-                            Interface.Info("Switching primary DVB...");
+                            Interface->Info("Switching primary DVB...");
                             cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
                             break;
              case osBack:
@@ -253,14 +261,16 @@ int main(int argc, char *argv[])
                   break;
              // Direct Channel Select:
              case k1 ... k9:
-                  if (!Interface.Recording())
+                  if (!Interface->Recording())
                      Menu = new cDirectChannelSelect(key);
                   break;
              // Left/Right rotates trough channel groups:
+             case kLeft|k_Repeat:
              case kLeft:
-             case kRight: if (!Interface.Recording()) {
+             case kRight|k_Repeat:
+             case kRight: if (!Interface->Recording()) {
                              int SaveGroup = CurrentGroup;
-                             if (key == kRight)
+                             if (NORMALKEY(key) == kRight)
                                 CurrentGroup = Channels.GetNextGroup(CurrentGroup) ; 
                              else
                                 CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
@@ -271,9 +281,11 @@ int main(int argc, char *argv[])
                              }
                           break;
              // Up/Down Channel Select:
+             case kUp|k_Repeat:
              case kUp:
-             case kDown: if (!Interface.Recording()) {
-                            int n = CurrentChannel + (key == kUp ? 1 : -1);
+             case kDown|k_Repeat:
+             case kDown: if (!Interface->Recording()) {
+                            int n = CurrentChannel + (NORMALKEY(key) == kUp ? 1 : -1);
                             cChannel *channel = Channels.GetByNumber(n);
                             if (channel)
                                channel->Switch();
@@ -290,7 +302,7 @@ int main(int argc, char *argv[])
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
   delete Menu;
   delete ReplayControl;
-  Interface.Cleanup();
+  delete Interface;
   cDvbApi::Cleanup();
   isyslog(LOG_INFO, "exiting");
   if (SysLogLevel > 0)

From a69b3211dc4f9b34eef440067d5ba304fbfbad94 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Wed, 1 Nov 2000 18:00:00 +0100
Subject: [PATCH 014/307] Version 0.67 - The EIT information is now gathered in
 a separate thread. - The sytem time can now be synchronized to the time
 broadcast in the DVB data   stream. This can be enabled in the "Setup" menu
 by setting "SetSystemTime" to   1.  Note that this works only if VDR is
 running under a user id that has   permisson to set the system time. - The
 new item "Schedule" in the "Main" menu opens VDR's EPG (thanks to Robert  
 Schneider). See the MANUAL file for a detailed description. - The new setup
 parameters MarginStart and MarginStop define how long (in   minutes) before
 the official start time of a broadcast VDR shall begin   recording, and how
 long after the official end time it shall stop recording.   These are used
 when a recording is programmed from the "Schedules" menu. - The delay value
 in the dvb.c.071.diff patch to the driver has been increased   to '3',
 because on some systems the OSD was not displayed correctly. If you   are
 running an already patched version 0.71 driver and encounter problems   with
 the OSD, please make sure the parameter in the ddelay call is '3', not   '2'.
 - Fixed initializing the RCU remote control code (didn't work after switching
   on the system). - Problematic characters in recording names (which can come
 from timers that   are programmed via the "Schedules" menu) are now replaced
 by suitable   substitutes.

---
 BUGS           |    2 +
 CONTRIBUTORS   |    1 +
 HISTORY        |   24 +
 MANUAL         |   59 +-
 Makefile       |   20 +-
 channels.conf  |    3 +
 config.c       |  100 +++-
 config.h       |   10 +-
 dvb.c.071.diff |    2 +-
 dvbapi.c       |   67 ++-
 dvbapi.h       |   16 +-
 dvbosd.c       |    7 +-
 dvbosd.h       |    3 +-
 eit.c          | 1443 ++++++++++++++++++++++++++++++++++++------------
 eit.h          |  173 +++---
 interface.c    |  157 +++---
 interface.h    |   10 +-
 menu.c         |  567 +++++++++++++++++--
 menu.h         |   16 +-
 osd.c          |   15 +-
 osd.h          |   16 +-
 recording.c    |    9 +-
 setup.conf     |    7 -
 thread.c       |   19 +-
 thread.h       |    5 +-
 timers.conf    |   13 +-
 tools.c        |   15 +-
 tools.h        |   19 +-
 vdr.c          |   24 +-
 29 files changed, 2182 insertions(+), 640 deletions(-)
 delete mode 100644 setup.conf

diff --git a/BUGS b/BUGS
index cd96197d8..d24d37072 100644
--- a/BUGS
+++ b/BUGS
@@ -4,3 +4,5 @@ Video Disk Recorder - Known Bugs
 * Sometimes the picture "jumps" as if a frame is skipped.
   Presumably this is a problem in the card driver or firmware?
 
+* The first picture captured with the GRAB command in SVDRP
+  is empty. Also, these pictures appear to be too dark.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 91c9540ec..db47d8b9e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -26,6 +26,7 @@ Guido Fiala <gfiala@s.netic.de>
 
 Robert Schneider <Robert.Schneider@lotus.com>
  for implementing EIT support for displaying the current/next info
+ for extending EIT support to implement a complete EPG
 
 Niels de Carpentier <niels@casema.net>
  for adding a workaround for a driver timing problem in cDvbApi::Cmd()
diff --git a/HISTORY b/HISTORY
index 717102a6f..189fd7b32 100644
--- a/HISTORY
+++ b/HISTORY
@@ -241,3 +241,27 @@ Video Disk Recorder Revision History
 - The "Blue" button in the "Main" menu can now be used to "Resume" a previously
   stopped replay session (suggested by Martin Hammerschmid).
 - The low and high LNB frequencies can now be changed in the "Setup" menu.
+
+2000-11-01: Version 0.67
+
+- The EIT information is now gathered in a separate thread.
+- The sytem time can now be synchronized to the time broadcast in the DVB data
+  stream. This can be enabled in the "Setup" menu by setting "SetSystemTime" to
+  1.  Note that this works only if VDR is running under a user id that has
+  permisson to set the system time.
+- The new item "Schedule" in the "Main" menu opens VDR's EPG (thanks to Robert
+  Schneider). See the MANUAL file for a detailed description.
+- The new setup parameters MarginStart and MarginStop define how long (in
+  minutes) before the official start time of a broadcast VDR shall begin
+  recording, and how long after the official end time it shall stop recording.
+  These are used when a recording is programmed from the "Schedules" menu.
+- The delay value in the dvb.c.071.diff patch to the driver has been increased
+  to '3', because on some systems the OSD was not displayed correctly. If you
+  are running an already patched version 0.71 driver and encounter problems
+  with the OSD, please make sure the parameter in the ddelay call is '3', not
+  '2'.
+- Fixed initializing the RCU remote control code (didn't work after switching
+  on the system).
+- Problematic characters in recording names (which can come from timers that
+  are programmed via the "Schedules" menu) are now replaced by suitable
+  substitutes.
diff --git a/MANUAL b/MANUAL
index 9b864e367..ffcc10b86 100644
--- a/MANUAL
+++ b/MANUAL
@@ -53,20 +53,60 @@ Video Disk Recorder User's Manual
   At any point in the menu system, pressing the "Menu" key again will
   immediately leave the menu system (discarding any pending changes).
 
+* The "Schedule" Menu
+
+  The "Schedule" menu implements VDR's "Electronic Program Guide" (EPG).
+
+  Select "Schedule" from the "Main" menu and you get a list of all upcoming
+  broadcasts on the current channel.
+
+  "Up" and "Down" can be used to scroll through this list, and pressing "Ok"
+  displays detailed information about the selected programme. Pressing "Ok"
+  again (or pressing "Back") gets you back into the "Schedule" menu.
+
+  From the "Schedule" menu, the "Green" button opens the "What's on now?"
+  menu, which displays all programmes that are currently running on all
+  channels that broadcast their programme information on the current
+  transponder, or from channels that have been current lately (VDR stores
+  all information it gathers in an internal list). The more channels you
+  have been switching through lately, the longer this list will be.
+  The "Yellow" button opens the "What's on next?" menu, which lists all
+  programmes that will start next on all channels.
+
+  Inside the "What's on now/next?" menus the "Green" button toggles between
+  the "Now" and "Next" display, and the "Yellow" button gets you back to the
+  "Schedule" menu of the current channel.
+
+  The "Red" button allows you to instantly program a timer to record the
+  selected programme. You will get into the "Edit Timer" menu in which
+  everything has already been filled in, and you can make any modifications
+  you may want to apply. Note that the Start and Stop time are offset by the
+  MarginStart and MarginStop parameters (see Setup) in order to make sure the
+  entire programme is recorded in case it doesn't exactly adhere to its
+  published start/stop times. Of course, no guarantee can be given that the
+  default margin values will be sufficient, so in case this recording is
+  really important you may want to add an extra margin ;-)
+
+  The "Blue" button can be pressed to switch to the channel with the selected
+  programme.
+
 * Selecting a Channel
 
-  There are three ways to select a channel:
+  There are four ways to select a channel:
 
   1. With no On Screen Menu displayed press the "Up" or "Down" key to switch
      to the next higher or lower channel.
   2. Press the "Menu" button to bring up the On Screen Menu, select "Channels"
      and browse through the list with the "Up" and "Down" key; to switch to the
      selected channel press "Ok".
-  2. Directly type in the channel number with the numeric keys ('0'..'9');
+  3. Directly type in the channel number with the numeric keys ('0'..'9');
      if no key is pressed for about half a second, the digits collected so
      far will define the channel number.
+  4. From the "Now", "Next" and "Event" menus (accessible through the "Schedule"
+     menu) by pressing the "Blue" button.
 
-  Pressing the '0' key toggles between the current and the previous channel.
+  Pressing the '0' key in normal viewing mode toggles between the current and
+  the previous channel.
 
   After switching to a different channel the channel number and name, as well
   as the current time are displayed at the top of the screen. If available, the
@@ -178,6 +218,9 @@ Video Disk Recorder User's Manual
              If this field is left blank, the channel name will be used to form
              the name of the recording.
 
+  A timer can also be programmed by pressing the "Red" button on the "Schedule",
+  "Now", "Next" or "Event" menus.
+
 * Parameters in the "Setup" menu
 
   Select "Setup" from the "Main" menu to enter the setup menu. From there you can
@@ -216,3 +259,13 @@ Video Disk Recorder User's Manual
 
   LnbFrequLo = 9750      The low and high LNB frequencies (in MHz)
   LnbFrequHi = 10600
+
+  SetSystemTime = 0      Defines whether the system time will be set according to
+                         the time received from the DVB data stream.
+                         0 = system time will not be set
+                         1 = system time wil be set
+                         Note that this works only if VDR is running under a user
+                         id that has permisson to set the system time.
+  MarginStart = 2        Defines how many minutes before the official start time
+  MarginStop = 10        of a broadcast VDR shall start recording, and how long
+                         after the official end time it shall stop recording.
diff --git a/Makefile b/Makefile
index 8b32be2d8..9db79f395 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.13 2000/10/07 16:24:08 kls Exp $
+# $Id: Makefile 1.14 2000/10/28 16:24:16 kls Exp $
 
 DVBDIR   = ../DVB
 
@@ -35,20 +35,20 @@ font: genfontfile fontosd.c
 
 # Dependencies:
 
-config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h svdrp.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h videodir.h
+config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h videodir.h
 dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
-eit.o      : eit.c eit.h tools.h
+eit.o      : eit.c eit.h thread.h tools.h
 font.o     : font.c font.h fontosd.c tools.h
 interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
-menu.o     : menu.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h
-osd.o      : osd.c config.h dvbapi.h dvbosd.h font.h interface.h osd.h svdrp.h tools.h
-recording.o: recording.c config.h dvbapi.h dvbosd.h font.h interface.h recording.h svdrp.h tools.h videodir.h
-remote.o   : remote.c config.h dvbapi.h dvbosd.h font.h remote.h thread.h tools.h
-svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h font.h interface.h svdrp.h tools.h
+menu.o     : menu.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
+osd.o      : osd.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h osd.h remote.h svdrp.h thread.h tools.h
+recording.o: recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
+remote.o   : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
+svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
 thread.o   : thread.c thread.h
 tools.o    : tools.c tools.h
-vdr.o      : vdr.c config.h dvbapi.h dvbosd.h font.h interface.h menu.h osd.h recording.h svdrp.h tools.h videodir.h
+vdr.o      : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
 
 # The main program:
diff --git a/channels.conf b/channels.conf
index 4a6cb0b34..c61669cab 100644
--- a/channels.conf
+++ b/channels.conf
@@ -6,6 +6,7 @@ ARD:11837:h:1:27500:101:102:0:28106
 BR3:11837:h:1:27500:201:202:0:28107
 Hessen-3:11837:h:1:27500:301:302:0:28108
 N3:12110:h:1:27500:2401:2402:0:28224
+:Group 1
 SR3:11837:h:1:27500:501:502:0:28110
 WDR:11837:h:1:27500:601:602:0:28111
 BR-alpha:11837:h:1:27500:701:702:0:28112
@@ -15,9 +16,11 @@ ZDF:11954:h:1:27500:110:120:0:28006
 3sat:11954:h:1:27500:210:220:0:28007
 KiKa:11954:h:1:27500:310:320:0:28008
 arte:11836:h:1:27500:401:402:0:28109
+:Group 2
 Eurosport:11954:h:1:27500:410:420:0:28009
 ORF Sat:11954:h:1:27500:506:507:0:28010
 ZDF.info:11954:h:1:27500:610:620:0:28011
+:Group 3
 CNN:12168:v:1:27500:165:100:0:0
 Super RTL:12188:h:1:27500:165:120:0:12040
 VOX:12188:h:1:27500:167:136:0:12060
diff --git a/config.c b/config.c
index 1714651fa..5b485f663 100644
--- a/config.c
+++ b/config.c
@@ -4,18 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.26 2000/10/08 16:10:40 kls Exp $
+ * $Id: config.c 1.29 2000/11/01 18:22:43 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include "dvbapi.h"
-#include "eit.h"
 #include "interface.h"
 
-extern cEIT EIT;
-
 // -- cKeys ------------------------------------------------------------------
 
 tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
@@ -267,15 +264,14 @@ bool cChannel::Switch(cDvbApi *DvbApi)
      isyslog(LOG_INFO, "switching to channel %d", number);
      CurrentChannel = number;
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr)) {
-            EIT.SetProgramNumber(pnr);
+         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
-            }
          esyslog(LOG_ERR, "retrying");
          }
      return false;
      }
-  Interface->Info(DvbApi->Recording() ? "Channel locked (recording)!" : name);
+  if (DvbApi->Recording())
+     Interface->Info("Channel locked (recording)!");
   return false;
 }
 
@@ -306,6 +302,47 @@ cTimer::cTimer(bool Instant)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", ch->name);
 }
 
+cTimer::cTimer(const cEventInfo *EventInfo)
+{
+  startTime = stopTime = 0;
+  recording = false;
+  active = true;
+  cChannel *ch = Channels.GetByServiceID(EventInfo->GetServiceID());
+  channel = ch ? ch->number : 0;
+  time_t tstart = EventInfo->GetTime();
+  time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
+  tstart -= Setup.MarginStart * 60;
+  struct tm *time = localtime(&tstart);
+  day = time->tm_mday;
+  start = time->tm_hour * 100 + time->tm_min;
+  time = localtime(&tstop);
+  stop = time->tm_hour * 100 + time->tm_min;
+  if (stop >= 2400)
+     stop -= 2400;
+  priority = 99;
+  lifetime = 99;
+  *file = 0;
+  const char *Title = EventInfo->GetTitle();
+  if (!isempty(Title))
+     strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
+  summary = NULL;
+  const char *Subtitle = EventInfo->GetSubtitle();
+  if (isempty(Subtitle))
+     Subtitle = "";
+  const char *Summary = EventInfo->GetExtendedDescription();
+  if (isempty(Summary))
+     Summary = "";
+  if (*Subtitle || *Summary) {
+     asprintf(&summary, "%s%s%s", Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
+     char *p = summary;
+     while (*p) {
+           if (*p == '\n')
+              *p = '|';
+           p++;
+           }
+     }
+}
+
 cTimer::~cTimer()
 {
   delete summary;
@@ -388,14 +425,33 @@ bool cTimer::Parse(const char *s)
   char *buffer2 = NULL;
   delete summary;
   summary = NULL;
+  //XXX Apparently sscanf() doesn't work correctly if the last %a argument
+  //XXX results in an empty string (this firt occured when the EIT gathering
+  //XXX was put into a separate thread - don't know why this happens...
+  //XXX As a cure we copy the original string and add a blank.
+  //XXX If anybody can shed some light on why sscanf() failes here, I'd love
+  //XXX to hear about that!
+  char *s2 = NULL;
+  int l2 = strlen(s);
+  if (s[l2 - 2] == ':') { // note that 's' has a trailing '\n'
+     s2 = (char *)malloc(l2 + 2);
+     strcat(strn0cpy(s2, s, l2), " \n");
+     s = s2;
+     }
   if (8 <= sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
+     if (summary && !*skipspace(summary)) {
+        delete summary;
+        summary = NULL;
+        }
      //TODO add more plausibility checks
      day = ParseDay(buffer1);
      strn0cpy(file, buffer2, MaxFileName);
      delete buffer1;
      delete buffer2;
+     delete s2;
      return day != 0;
      }
+  delete s2;
   return false;
 }
 
@@ -550,6 +606,17 @@ cChannel *cChannels::GetByNumber(int Number)
   return NULL;
 }
 
+cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
+{
+  cChannel *channel = (cChannel *)First();
+  while (channel) {
+        if (channel->pnr == ServiceId)
+           return channel;
+        channel = (cChannel *)channel->Next();
+        }
+  return NULL;
+}
+
 bool cChannels::SwitchTo(int Number, cDvbApi *DvbApi)
 {
   cChannel *channel = GetByNumber(Number);
@@ -562,14 +629,6 @@ const char *cChannels::GetChannelNameByNumber(int Number)
   return channel ? channel->name : NULL;
 }
 
-eKeys cChannels::ShowChannel(int Number, bool Switched, bool Group)
-{
-  cChannel *channel = Group ? Get(Number) : GetByNumber(Number);
-  if (channel)
-     return Interface->DisplayChannel(channel->number, channel->name, !Switched || Setup.ShowInfoOnChSwitch);
-  return kNone;
-}
-
 // -- cTimers ----------------------------------------------------------------
 
 cTimers Timers;
@@ -599,6 +658,9 @@ cSetup::cSetup(void)
   MarkInstantRecord = 1;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
+  SetSystemTime = 0;
+  MarginStart = 2;
+  MarginStop = 10;
 }
 
 bool cSetup::Parse(char *s)
@@ -613,6 +675,9 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
      else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
      else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
+     else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
+     else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
+     else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
      else
         return false;
      return true;
@@ -660,6 +725,9 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
         fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
+        fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
+        fprintf(f, "MarginStart        = %d\n", MarginStart);
+        fprintf(f, "MarginStop         = %d\n", MarginStop);
         fclose(f);
         isyslog(LOG_INFO, "saved setup to %s", FileName);
         return true;
diff --git a/config.h b/config.h
index 56f361822..f9bd579e7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.27 2000/10/08 16:33:48 kls Exp $
+ * $Id: config.h 1.29 2000/11/01 13:42:29 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -15,9 +15,10 @@
 #include <string.h>
 #include <time.h>
 #include "dvbapi.h"
+#include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.66"
+#define VDRVERSION "0.67"
 
 #define MaxBuffer 10000
 
@@ -113,6 +114,7 @@ class cTimer : public cListObject {
   char file[MaxFileName];
   char *summary;
   cTimer(bool Instant = false);
+  cTimer(const cEventInfo *EventInfo);
   ~cTimer();
   cTimer& operator= (const cTimer &Timer);
   const char *ToText(void);
@@ -204,10 +206,10 @@ class cChannels : public cConfig<cChannel> {
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number);
+  cChannel *GetByServiceID(unsigned short ServiceId);
   const char *GetChannelNameByNumber(int Number);
   bool SwitchTo(int Number, cDvbApi *DvbApi = NULL);
   int MaxNumber(void) { return maxNumber; }
-  eKeys ShowChannel(int Number, bool Switched, bool Group = false);
   };
  
 class cTimers : public cConfig<cTimer> {
@@ -234,6 +236,8 @@ class cSetup {
   int MarkInstantRecord;
   int LnbFrequLo;
   int LnbFrequHi;
+  int SetSystemTime;
+  int MarginStart, MarginStop;
   cSetup(void);
   bool Load(const char *FileName);
   bool Save(const char *FileName = NULL);
diff --git a/dvb.c.071.diff b/dvb.c.071.diff
index 647b0de1b..ac7ba3a4a 100644
--- a/dvb.c.071.diff
+++ b/dvb.c.071.diff
@@ -81,7 +81,7 @@
                  BlitBitmap(dvb, dvb->osdwin, x0, y0+i*lpb, 1);
 -                data+=bpl;
 +                data+=lpb*inc; //XXX kls: incrementing must be done in "one byte per pixel"
-+                ddelay(2); //XXX kls: without this the block is sometimes not fully displayed - firmware bug?
++                ddelay(3); //XXX kls: without this the block is sometimes not fully displayed - firmware bug?
          }
          if (brest) {
 -                LoadBitmap(dvb, BITMAP8, w, brest/bpl, inc, data);
diff --git a/dvbapi.c b/dvbapi.c
index e5c692cbd..cc246d2f0 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.31 2000/10/08 16:14:45 kls Exp $
+ * $Id: dvbapi.c 1.34 2000/11/01 09:19:27 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -25,6 +25,7 @@ extern "C" {
 #include "videodir.h"
 
 #define VIDEODEVICE "/dev/video"
+#define VBIDEVICE   "/dev/vbi"
 
 // The size of the array used to buffer video data:
 #define VIDEOBUFSIZE (1024*1024)
@@ -1084,14 +1085,27 @@ int cDvbApi::NumDvbApis = 0;
 cDvbApi *cDvbApi::dvbApi[MAXDVBAPI] = { NULL };
 cDvbApi *cDvbApi::PrimaryDvbApi = NULL;
 
-cDvbApi::cDvbApi(const char *FileName)
+cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
 {
+  siProcessor = NULL;
   pidRecord = pidReplay = 0;
   fromRecord = toRecord = -1;
   fromReplay = toReplay = -1;
-  videoDev = open(FileName, O_RDWR | O_NONBLOCK);
-  if (videoDev < 0)
-     LOG_ERROR;
+  videoDev = open(VideoFileName, O_RDWR | O_NONBLOCK);
+  if (videoDev >= 0) {
+     siProcessor = new cSIProcessor(VbiFileName);
+     if (!NumDvbApis) // only the first one shall set the system time
+        siProcessor->SetUseTSTime(Setup.SetSystemTime);
+     siProcessor->AddFilter(0x14, 0x70);  // TDT
+     siProcessor->AddFilter(0x14, 0x73);  // TOT
+     siProcessor->AddFilter(0x12, 0x4e);  // event info, actual TS, present/following
+     siProcessor->AddFilter(0x12, 0x4f);  // event info, other TS, present/following
+     siProcessor->AddFilter(0x12, 0x50);  // event info, actual TS, schedule
+     siProcessor->AddFilter(0x12, 0x60);  // event info, other TS, schedule
+     siProcessor->Start();
+     }
+  else
+     LOG_ERROR_STR(VideoFileName);
   cols = rows = 0;
 
   ovlGeoSet = ovlStat = ovlFbSet = false;
@@ -1104,7 +1118,7 @@ cDvbApi::cDvbApi(const char *FileName)
   nonl();
   cbreak();
   noecho();
-  timeout(1000);
+  timeout(10);
 #endif
 #if defined(DEBUG_OSD)
   memset(&colorPairs, 0, sizeof(colorPairs));
@@ -1121,6 +1135,7 @@ cDvbApi::cDvbApi(const char *FileName)
 cDvbApi::~cDvbApi()
 {
   if (videoDev >= 0) {
+     delete siProcessor;
      Close();
      Stop();
      StopRecord();
@@ -1174,11 +1189,9 @@ int cDvbApi::Index(void)
 
 bool cDvbApi::Init(void)
 {
-  char fileName[strlen(VIDEODEVICE) + 10];
-  int i;
-
   NumDvbApis = 0;
-  for (i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      char fileName[strlen(VIDEODEVICE) + 10];
       sprintf(fileName, "%s%d", VIDEODEVICE, i);
       if (access(fileName, F_OK | R_OK | W_OK) == 0) {
          dsyslog(LOG_INFO, "probing %s", fileName);
@@ -1188,7 +1201,9 @@ bool cDvbApi::Init(void)
             int r = ioctl(f, VIDIOCGCAP, &cap);
             close(f);
             if (r == 0 && (cap.type & VID_TYPE_DVB)) {
-               dvbApi[i] = new cDvbApi(fileName);
+               char vbiFileName[strlen(VBIDEVICE) + 10];
+               sprintf(vbiFileName, "%s%d", VBIDEVICE, i);
+               dvbApi[i] = new cDvbApi(fileName, vbiFileName);
                NumDvbApis++;
                }
             }
@@ -1223,6 +1238,13 @@ void cDvbApi::Cleanup(void)
   PrimaryDvbApi = NULL;
 }
 
+const cSchedules *cDvbApi::Schedules(cThreadLock *ThreadLock) const
+{
+  if (siProcessor && ThreadLock->Lock(siProcessor))
+     return siProcessor->Schedules();
+  return NULL;
+}
+
 bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
   int result = 0;
@@ -1576,6 +1598,24 @@ void cDvbApi::ClrEol(int x, int y, eDvbColor color)
   Fill(x, y, cols - x, 1, color);
 }
 
+int cDvbApi::CellWidth(void)
+{
+#ifdef DEBUG_OSD
+  return 1;
+#else
+  return charWidth;
+#endif
+}
+
+int cDvbApi::Width(unsigned char c)
+{
+#ifdef DEBUG_OSD
+  return 1;
+#else
+  return osd->Width(c);
+#endif
+}
+
 void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
 {
   if (x < 0) x = cols + x;
@@ -1671,8 +1711,11 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
      front.fec       = 8;
      front.AFC       = 1;
      ioctl(videoDev, VIDIOCSFRONTEND, &front);
-     if (front.sync & 0x1F == 0x1F)
+     if (front.sync & 0x1F == 0x1F) {
+        if (siProcessor)
+           siProcessor->SetCurrentServiceID(Pnr);
         return true;
+        }
      esyslog(LOG_ERR, "ERROR: channel not sync'ed (front.sync=%X)!", front.sync);
      }
   return false;
diff --git a/dvbapi.h b/dvbapi.h
index b35f3fb80..16a2b7a71 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.18 2000/10/03 11:26:10 kls Exp $
+ * $Id: dvbapi.h 1.20 2000/11/01 09:18:50 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -21,6 +21,7 @@ typedef unsigned char __u8;
 #include <stdio.h>
 #include <dvb.h>
 #include "dvbosd.h"
+#include "eit.h"
 
 // Overlay facilities
 #define MAXCLIPRECTS 100
@@ -44,7 +45,8 @@ class cResumeFile {
 class cDvbApi {
 private:
   int videoDev;
-  cDvbApi(const char *FileName);
+  cSIProcessor *siProcessor;
+  cDvbApi(const char *VideoFileName, const char *VbiFileName);
 public:
   ~cDvbApi();
 
@@ -71,6 +73,14 @@ class cDvbApi {
          // Closes down all DVB devices.
          // Must be called at the end of the program.
 
+  // EIT facilities
+
+  const cSchedules *Schedules(cThreadLock *ThreadLock) const;
+         // Caller must provide a cThreadLock which has to survive the entire
+         // time the returned cSchedules is accessed. Once the cSchedules is no
+         // longer used, the cThreadLock must be destroyed.
+  void SetUseTSTime(bool On) { if (siProcessor) siProcessor->SetUseTSTime(On); }
+
   // Image Grab facilities
 
   bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
@@ -112,6 +122,8 @@ class cDvbApi {
   void Clear(void);
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
+  int CellWidth(void);
+  int Width(unsigned char c);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
   void Flush(void);
 
diff --git a/dvbosd.c b/dvbosd.c
index 97c793228..c0150e269 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.3 2000/10/07 14:42:48 kls Exp $
+ * $Id: dvbosd.c 1.4 2000/11/01 09:13:32 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -76,6 +76,11 @@ void cBitmap::SetPixel(int x, int y, eDvbColor Color)
      }
 }
 
+int cBitmap::Width(unsigned char c)
+{
+  return font ? font->Width(c) : -1;
+}
+
 void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
 {
   if (bitmap) {
diff --git a/dvbosd.h b/dvbosd.h
index f7a536350..149dc6cb1 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.1 2000/10/01 15:00:00 kls Exp $
+ * $Id: dvbosd.h 1.2 2000/11/01 09:13:44 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -56,6 +56,7 @@ class cBitmap {
   void SetFont(eDvbFont Font);
   bool Dirty(void);
   void SetPixel(int x, int y, eDvbColor Color);
+  int Width(unsigned char c);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void Clear(void);
diff --git a/eit.c b/eit.c
index 44c873b17..65856e6c3 100644
--- a/eit.c
+++ b/eit.c
@@ -13,20 +13,606 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.4 2000/10/01 14:09:05 kls Exp $
+ * $Id: eit.c 1.7 2000/11/02 17:06:19 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
+#include <ctype.h>
+#include <dvb_comcode.h>
+#include <dvb_v4l.h>
+#include <fcntl.h>
+#include <fstream.h>
+#include <iomanip.h>
 #include <iostream.h>
+#include <minmax.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
-#include <dvb_comcode.h>
-#include "tools.h"
+#include <sys/poll.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+
+// --- cMJD ------------------------------------------------------------------
+
+class cMJD {
+public: 
+	cMJD();
+	cMJD(u_char date_hi, u_char date_lo);
+	cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese);
+  	~cMJD();
+  /**  */
+  void ConvertToTime();
+  /**  */
+  bool SetSystemTime();
+  /**  */
+  time_t GetTime_t();
+protected: // Protected attributes
+  /**  */
+  time_t mjdtime;
+protected: // Protected attributes
+  /**  */
+  u_char time_second;
+protected: // Protected attributes
+  /**  */
+  u_char time_minute;
+protected: // Protected attributes
+  /**  */
+  u_char time_hour;
+protected: // Protected attributes
+  /**  */
+  u_short mjd;
+};
+
+cMJD::cMJD()
+{
+}
+
+cMJD::cMJD(u_char date_hi, u_char date_lo)
+{
+	mjd = date_hi << 8 | date_lo;
+	time_hour = time_minute = time_second = 0;
+	ConvertToTime();
+}
+
+cMJD::cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese)
+{
+	mjd = date_hi << 8 | date_lo;
+	time_hour = timehr;
+	time_minute = timemi;
+	time_second = timese;
+	ConvertToTime();	
+}
+
+cMJD::~cMJD()
+{
+}
+
+/**  */
+void cMJD::ConvertToTime()
+{
+	struct tm t;
+	
+	t.tm_sec = time_second;
+	t.tm_min = time_minute;
+	t.tm_hour = time_hour;
+	int k;
+	
+	t.tm_year = (int) ((mjd - 15078.2) / 365.25);
+	t.tm_mon = (int) ((mjd - 14956.1 - (int)(t.tm_year * 365.25)) / 30.6001);
+	t.tm_mday = (int) (mjd - 14956 - (int)(t.tm_year * 365.25) - (int)(t.tm_mon * 30.6001));
+	k = (t.tm_mon == 14 || t.tm_mon == 15) ? 1 : 0;
+	t.tm_year = t.tm_year + k;
+	t.tm_mon = t.tm_mon - 1 - k * 12;
+	t.tm_mon--;
+
+	t.tm_isdst = -1;
+	t.tm_gmtoff = 0;
+	
+	mjdtime = timegm(&t);
+	
+	//isyslog(LOG_INFO, "Time parsed = %s\n", ctime(&mjdtime));
+}
+
+/**  */
+bool cMJD::SetSystemTime()
+{
+	struct tm *ptm;
+	time_t loctim;
+	
+	ptm = localtime(&mjdtime);
+	loctim = time(NULL);
+
+	if (abs(mjdtime - loctim) > 2)
+	{
+		isyslog(LOG_INFO, "System Time = %s (%ld)\n", ctime(&loctim), loctim);
+		isyslog(LOG_INFO, "Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
+		if (stime(&mjdtime) < 0)
+         esyslog(LOG_ERR, "ERROR while setting system time: %s", strerror(errno));
+		return true;
+	}
+	
+	return false;
+}
+/**  */
+time_t cMJD::GetTime_t()
+{
+	return mjdtime;
+}
+
+// --- cTDT ------------------------------------------------------------------
 
 typedef struct {
+	u_char	table_id							: 8;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	u_char	section_syntax_indicator	: 1;
+	u_char										: 3;
+	u_char	section_length_hi				: 4;
+#else
+	u_char	section_length_hi				: 4;
+	u_char										: 3;
+	u_char	section_syntax_indicator	: 1;
+#endif
+
+	u_char	section_length_lo				: 8;
+
+
+	u_char	utc_date_hi						: 8;
+	u_char	utc_date_lo						: 8;
+	u_char	utc_hour							: 4;
+	u_char	utc_hour_ten					: 4;
+	u_char	utc_min							: 4;
+	u_char	utc_min_ten						: 4;
+	u_char	utc_sec							: 4;
+	u_char	utc_sec_ten						: 4;
+} tdt_t;
+
+class cTDT {
+public: 
+	cTDT(tdt_t *ptdt);
+	~cTDT();
+  /**  */
+  bool SetSystemTime();
+protected: // Protected attributes
+  /**  */
+  tdt_t tdt;
+  /**  */
+  cMJD * mjd;
+};
+
+cTDT::cTDT(tdt_t *ptdt)
+{
+	tdt = *ptdt;
+	mjd = new cMJD(tdt.utc_date_hi, tdt.utc_date_lo,
+						tdt.utc_hour_ten * 10 + tdt.utc_hour,
+						tdt.utc_min_ten * 10 + tdt.utc_min,
+						tdt.utc_sec_ten * 10 + tdt.utc_sec);
+}
+
+cTDT::~cTDT()
+{
+}
+/**  */
+bool cTDT::SetSystemTime()
+{
+	return mjd->SetSystemTime();
+}
+
+// --- cEventInfo ------------------------------------------------------------
+
+cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
+{
+	pTitle = NULL;
+	pSubtitle = NULL;
+	pExtendedDescription = NULL;
+	bIsPresent = bIsFollowing = false;
+	lDuration = 0;
+	tTime = 0;
+	uEventID = eventid;
+	uServiceID = serviceid;
+	cExtendedDescriptorNumber = 0;
+   nChannelNumber = 0;
+}
+
+cEventInfo::~cEventInfo()
+{
+   delete pTitle;
+   delete pSubtitle;
+   delete pExtendedDescription;
+}
+
+/**  */
+const char * cEventInfo::GetTitle() const
+{
+	return pTitle;
+}
+/**  */
+const char * cEventInfo::GetSubtitle() const
+{
+	return pSubtitle;
+}
+/**  */
+const char * cEventInfo::GetExtendedDescription() const
+{
+	return pExtendedDescription;
+}
+/**  */
+bool cEventInfo::IsPresent() const
+{
+	return bIsPresent;
+}
+/**  */
+void cEventInfo::SetPresent(bool pres)
+{
+	bIsPresent = pres;
+}
+/**  */
+bool cEventInfo::IsFollowing() const
+{
+	return bIsFollowing;
+}
+/**  */
+void cEventInfo::SetFollowing(bool foll)
+{
+	bIsFollowing = foll;
+}
+/**  */
+const char * cEventInfo::GetDate() const
+{
+	static char szDate[25];
+
+	strftime(szDate, sizeof(szDate), "%d.%m.%Y", localtime(&tTime));
+
+	return szDate;
+}
+/**  */
+const char * cEventInfo::GetTimeString() const
+{
+	static char szTime[25];
+	
+	strftime(szTime, sizeof(szTime), "%R", localtime(&tTime));
+	
+	return szTime;
+}
+/**  */
+const char * cEventInfo::GetEndTimeString() const
+{
+	static char szEndTime[25];
+   time_t tEndTime = tTime + lDuration;
+	
+	strftime(szEndTime, sizeof(szEndTime), "%R", localtime(&tEndTime));
+	
+	return szEndTime;
+}
+/**  */
+time_t cEventInfo::GetTime() const
+{
+	return tTime;
+}
+/**  */
+long cEventInfo::GetDuration() const
+{
+	return lDuration;
+}
+/**  */
+unsigned short cEventInfo::GetEventID() const
+{
+	return uEventID;
+}
+/**  */
+bool cEventInfo::SetTitle(char *string)
+{
+	if (string == NULL)
+		return false;
+	
+	pTitle = strdup(string);
+	if (pTitle == NULL)
+		return false;
+		
+	return true;
+}
+/**  */
+bool cEventInfo::SetSubtitle(char *string)
+{
+	if (string == NULL)
+		return false;
+	
+	pSubtitle = strdup(string);
+	if (pSubtitle == NULL)
+		return false;
+		
+	return true;
+}
+/**  */
+bool cEventInfo::AddExtendedDescription(char *string)
+{
+	int size = 0;
+	bool first = true;
+	char *p;
+	
+	if (string == NULL)
+		return false;
+	
+	if (pExtendedDescription)
+	{
+		first = false;
+		size += strlen(pExtendedDescription);
+	}
+
+	size += (strlen(string) + 1);
+
+	p = (char *)realloc(pExtendedDescription, size);
+	if (p == NULL)
+		return false;
+	
+	if (first)
+		*p = 0;
+	
+	strcat(p, string);
+	
+	pExtendedDescription = p;
+
+	return true;
+}
+/**  */
+void cEventInfo::SetTime(time_t t)
+{
+	tTime = t;
+}
+/**  */
+void cEventInfo::SetDuration(long l)
+{
+	lDuration = l;
+}
+/**  */
+void cEventInfo::SetEventID(unsigned short evid)
+{
+	uEventID = evid;
+}
+/**  */
+void cEventInfo::SetServiceID(unsigned short servid)
+{
+	uServiceID = servid;
+}
+/**  */
+u_char cEventInfo::GetExtendedDescriptorNumber() const
+{
+	return cExtendedDescriptorNumber;
+}
+/**  */
+void cEventInfo::IncreaseExtendedDescriptorNumber()
+{
+	cExtendedDescriptorNumber++;
+}
+
+/**  */
+unsigned short cEventInfo::GetServiceID() const
+{
+   return uServiceID;
+}
+
+// --- cSchedule -------------------------------------------------------------
+
+cSchedule::cSchedule(unsigned short servid)
+{
+	pPresent = pFollowing = NULL;
+	uServiceID = servid;
+}
+
+
+cSchedule::~cSchedule()
+{
+}
+/**  */
+const cEventInfo * cSchedule::GetPresentEvent() const
+{
+   // checking temporal sanity of present event (kls 2000-11-01)
+   time_t now = time(NULL);
+   if (pPresent && !(pPresent->GetTime() <= now && now <= pPresent->GetTime() + pPresent->GetDuration()))
+   {
+	   cEventInfo *pe = Events.First();
+	   while (pe != NULL)
+	   {
+		   if (pe->GetTime() <= now && now <= pe->GetTime() + pe->GetDuration())
+            return pe;
+         pe = Events.Next(pe);
+	   }
+   }
+	return pPresent;
+}
+/**  */
+const cEventInfo * cSchedule::GetFollowingEvent() const
+{
+   // checking temporal sanity of following event (kls 2000-11-01)
+   time_t now = time(NULL);
+   const cEventInfo *pr = GetPresentEvent(); // must have it verified!
+   if (pFollowing && !(pr && pr->GetTime() + pr->GetDuration() <= pFollowing->GetTime()))
+   {
+      int minDt = INT_MAX;
+      cEventInfo *pe = Events.First(), *pf = NULL;
+      while (pe != NULL)
+      {
+	      int dt = pe->GetTime() - now;
+	      if (dt > 0 && dt < minDt)
+         {
+            minDt = dt;
+            pf = pe;
+         }
+	      pe = Events.Next(pe);
+      }
+      return pf;
+   }
+	return pFollowing;
+}
+/**  */
+void cSchedule::SetServiceID(unsigned short servid)
+{
+	uServiceID = servid;
+}
+/**  */
+unsigned short cSchedule::GetServiceID() const
+{
+	return uServiceID;
+}
+/**  */
+const cEventInfo * cSchedule::GetEvent(unsigned short uEventID) const
+{
+	cEventInfo *pe = Events.First();
+	while (pe != NULL)
+	{
+		if (pe->GetEventID() == uEventID)
+			return pe;
+			
+		pe = Events.Next(pe);
+	}
+	
+	return NULL;
+}
+/**  */
+const cEventInfo * cSchedule::GetEvent(time_t tTime) const
+{
+	cEventInfo *pe = Events.First();
+	while (pe != NULL)
+	{
+		if (pe->GetTime() == tTime)
+			return pe;
+			
+		pe = Events.Next(pe);
+	}
+	
+	return NULL;
+}
+/**  */
+bool cSchedule::SetPresentEvent(cEventInfo *pEvent)
+{
+	if (pPresent != NULL)
+		pPresent->SetPresent(false);
+	pPresent = pEvent;
+	pPresent->SetPresent(true);
+	
+	return true;
+}
+
+/**  */
+bool cSchedule::SetFollowingEvent(cEventInfo *pEvent)
+{
+	if (pFollowing != NULL)
+		pFollowing->SetFollowing(false);
+	pFollowing = pEvent;
+	pFollowing->SetFollowing(true);
+	
+	return true;
+}
+
+/**  */
+void cSchedule::Cleanup()
+{
+	Cleanup(time(NULL));
+}
+
+/**  */
+void cSchedule::Cleanup(time_t tTime)
+{
+	cEventInfo *pEvent;
+	for (int a = 0; true ; a++)
+	{
+		pEvent = Events.Get(a);
+		if (pEvent == NULL)
+			break;
+		if (pEvent->GetTime() + pEvent->GetDuration() < tTime)
+		{
+			Events.Del(pEvent);
+			a--;
+		}
+	}
+}
+
+// --- cSchedules ------------------------------------------------------------
+
+cSchedules::cSchedules()
+{
+	pCurrentSchedule = NULL;
+	uCurrentServiceID = 0;
+}
+
+cSchedules::~cSchedules()
+{
+}
+/**  */
+bool cSchedules::SetCurrentServiceID(unsigned short servid)
+{
+	pCurrentSchedule = GetSchedule(servid);
+	if (pCurrentSchedule == NULL)
+	{
+		Add(new cSchedule(servid));
+		pCurrentSchedule = GetSchedule(servid);
+		if (pCurrentSchedule == NULL)
+			return false;
+	}
+	
+	uCurrentServiceID = servid;
+	
+	return true;
+}
+/**  */
+const cSchedule * cSchedules::GetSchedule() const
+{
+	return pCurrentSchedule;
+}
+/**  */
+const cSchedule * cSchedules::GetSchedule(unsigned short servid) const
+{
+	cSchedule *p;
+	
+	p = First();
+	while (p != NULL)
+	{
+		if (p->GetServiceID() == servid)
+			return p;
+		p = Next(p);
+	}
+	
+	return NULL;
+}
+
+/**  */
+void cSchedules::Cleanup()
+{
+	cSchedule *p;
+	
+	p = First();
+	while (p != NULL)
+	{
+		p->Cleanup(time(NULL));
+		p = Next(p);
+	}
+}
+
+// --- cEIT ------------------------------------------------------------------
+
+#define DEC(N) dec << setw(N) << setfill(int('0'))
+#define HEX(N) hex << setw(N) << setfill(int('0'))
+
+#define EIT_STUFFING_DESCRIPTOR						0x42
+#define EIT_LINKAGE_DESCRIPTOR						0x4a
+#define EIT_SHORT_EVENT_DESCRIPTOR 					0x4d
+#define EIT_EXTENDED_EVENT_DESCRIPTOR 				0x4e
+#define EIT_TIME_SHIFTED_EVENT_DESCRIPTOR			0x4f
+#define EIT_COMPONENT_DESCRIPTOR						0x50
+#define EIT_CA_IDENTIFIER_DESCRIPTOR				0x53
+#define EIT_CONTENT_DESCRIPTOR						0x54
+#define EIT_PARENTAL_RATING_DESCRIPTOR				0x55
+#define EIT_TELEPHONE_DESCRIPTOR						0x57
+#define EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR	0x5e
+#define EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR	0x5f
+#define EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR	0x61
+#define EIT_DATA_BROADCAST_DESCRIPTOR				0x64
+#define EIT_PDC_DESCRIPTOR								0x69
+
+typedef struct eit_struct {
 	u_char	table_id 						: 8;
 
 #if BYTE_ORDER == BIG_ENDIAN
@@ -64,9 +650,7 @@ typedef struct {
 	u_char	segment_last_table_id		: 8;
 } eit_t;
 
-#define EIT_SIZE 14
-
-struct eit_loop_struct1 {
+typedef struct eit_loop_struct {
 	u_char	event_id_hi 					: 8;
 	u_char	event_id_lo 					: 8;
 
@@ -79,12 +663,12 @@ struct eit_loop_struct1 {
 	u_char	time_second 					: 4;
 	u_char	time_second_ten				: 4;
 
-	u_char	dur_hour_ten					: 4;
 	u_char	dur_hour 						: 4;
-	u_char	dur_minute_ten 				: 4;
+	u_char	dur_hour_ten					: 4;
 	u_char	dur_minute						: 4;
-	u_char	dur_second_ten 				: 4;
+	u_char	dur_minute_ten 				: 4;
 	u_char	dur_second						: 4;
+	u_char	dur_second_ten 				: 4;
 
 #if BYTE_ORDER == BIG_ENDIAN
 	u_char	running_status 				: 3;
@@ -97,12 +681,9 @@ struct eit_loop_struct1 {
 #endif
 
 	u_char	descriptors_loop_length_lo : 8;
-};
+} eit_loop_t;
 
-#define EIT_SHORT_EVENT_DESCRIPTOR 0x4d
-#define EIT_SHORT_EVENT_DESCRIPTOR_SIZE 6
-
-struct eit_short_event_descriptor_struct {
+typedef struct eit_short_event_struct {
 	u_char	descriptor_tag 				: 8;
 	u_char	descriptor_length 			: 8;
 
@@ -111,415 +692,583 @@ struct eit_short_event_descriptor_struct {
 	u_char	language_code_3				: 8;
 
 	u_char	event_name_length 			: 8;
-};
-
-#define EIT_EXTENDED_EVENT_DESCRIPOR 0x4e
-
-#define EIT_DESCRIPTOR_SIZE
-
-typedef struct eit_event_struct {
-	u_char	event_id_hi						: 8;
-	u_char	event_id_lo						: 8;
-
-	u_char	start_time_1					: 8;
-	u_char	start_time_2					: 8;
-	u_char	start_time_3					: 8;
-	u_char	start_time_4					: 8;
-	u_char	start_time_5					: 8;
-
-	u_char	duration_1						: 8;
-	u_char	duration_2						: 8;
-	u_char	duration_3						: 8;
-
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	running_status 				: 3;
-	u_char	free_CA_mode					: 1;
-	u_char	descriptors_loop_length_hi : 4;
-#else
-	u_char	descriptors_loop_length_hi : 4;
-	u_char	free_CA_mode					: 1;
-	u_char	running_status 				: 3;
-#endif
-
-	u_char	descriptors_loop_length_lo : 8;
-
-} eit_event_t;
-#define EIT_LOOP_SIZE 12
-
-
-typedef struct tot_t {
-	u_char	table_id 						: 8;
-
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	section_syntax_indicator	: 1;
-	u_char										: 3;
-	u_char	section_length_hi 			: 4;
-#else
-	u_char	section_length_hi 			: 4;
-	u_char										: 3;
-	u_char	section_syntax_indicator	: 1;
-#endif
-
-	u_char	date_hi							: 8;
-	u_char	date_lo							: 8;
-	u_char	time_hour						: 4;
-	u_char	time_hour_ten					: 4;
-	u_char	time_minute						: 4;
-	u_char	time_minute_ten				: 4;
-	u_char	time_second						: 4;
-	u_char	time_second_ten				: 4;
-
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char										: 4;
-	u_char	descriptor_loop_length_hi 	: 4;
-#else
-	u_char	descriptor_loop_length_hi 	: 4;
-	u_char										: 4;
-#endif
-
-	u_char	descriptor_loop_length_lo 	: 8;	
-} tot_t;
-
-typedef struct local_time_offset {
+} eit_short_event_t;
 
+typedef struct eit_extended_event_struct {
 	u_char	descriptor_tag 				: 8;
 	u_char	descriptor_length 			: 8;
 
+	u_char	last_descriptor_number		: 4;
+	u_char	descriptor_number				: 4;
+
 	u_char	language_code_1				: 8;
 	u_char	language_code_2				: 8;
 	u_char	language_code_3				: 8;
 
-	u_char										: 8;
-	
-	u_char	offset_hour						: 4;
-	u_char	offset_hour_ten				: 4;
-	u_char	offset_minute					: 4;
-	u_char	offset_minute_ten				: 4;
+	u_char	length_of_items 				: 8;
+} eit_extended_event_t;
+
+typedef struct eit_content_descriptor {
+	u_char	descriptor_tag					: 8;
+	u_char	descriptor_length				: 8;
+} eit_content_descriptor_t;
 
-	u_char	change_date_hi					: 8;
-	u_char	change_date_lo					: 8;
-	u_char	change_time_hour				: 4;
-	u_char	change_time_hour_ten			: 4;
-	u_char	change_time_minute			: 4;
-	u_char	change_time_minute_ten		: 4;
-	u_char	change_time_second			: 4;
-	u_char	change_time_second_ten		: 4;
+typedef struct eit_content_loop {
+	u_char	content_nibble_level_2		: 4;
+	u_char 	content_nibble_level_1		: 4;
+	u_char	user_nibble_2					: 4;
+	u_char	user_nibble_1					: 4;
+} eit_content_loop_t;
 
-	u_char	next_offset_hour				: 4;
-	u_char	next_offset_hour_ten			: 4;
-	u_char	next_offset_minute			: 4;
-	u_char	next_offset_minute_ten		: 4;
-} local_time_offset;
+class cEIT {
+private:
+   cSchedules *schedules;
+public: 
+	cEIT(void *buf, int length, cSchedules *Schedules);
+	~cEIT();
+  /**  */
+  int ProcessEIT();
 
-cEIT::cEIT()
+protected: // Protected methods
+  /**  */
+  int strdvbcpy(unsigned char *dst, unsigned char *src, int max);
+  /** returns true if this EIT covers a
+present/following information, false if it's
+schedule information */
+  bool IsPresentFollowing();
+  /**  */
+  bool WriteShortEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf);
+  /**  */
+  bool WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf);
+protected: // Protected attributes
+  int buflen;
+protected: // Protected attributes
+  /**  */
+  u_char buffer[4097];
+  /** Table ID of this EIT struct */
+  u_char tid;
+  /** EITs service id (program number) */
+  u_short pid;
+};
+
+cEIT::cEIT(void * buf, int length, cSchedules *Schedules)
 {
-	cszBitFilter = "/dev/vbi";
-	if((fsvbi = open(cszBitFilter, O_RDWR))<0)
-	{
-		fsvbi = 0;
-		esyslog(LOG_ERR, "Failed to open DVB bitfilter device: %s", cszBitFilter);
-		return;
-	}
+	buflen = min((unsigned int)length, sizeof(buffer));
+	memset(buffer, 0, sizeof(buffer));
+	memcpy(buffer, buf, buflen);
+	tid = buffer[0];
+   schedules = Schedules;
 }
 
 cEIT::~cEIT()
 {
-	if (fsvbi != 0)
-		close(fsvbi);
-	fsvbi = 0;
 }
 
-/** Set the bitfilter in vbi device to return
-correct tables */
-int cEIT::SetBitFilter(unsigned short pid, unsigned short section, unsigned short mode)
-{
-	struct bitfilter filt = {
-		pid,
-		{ section, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-		  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
-		  mode,0,
-		  FILTER_MEM,
-		  {},
-		};
-
-	if (ioctl(fsvbi, VIDIOCSBITFILTER, &filt) < 0)
-		return 0xffff;
-	return 0;
-}
 /**  */
-int cEIT::GetSection(unsigned char *buf, ushort PID, unsigned char sec)
+int cEIT::ProcessEIT()
 {
-	int seclen=0;
-	unsigned short handle, pid;
-	unsigned char section, sectionnum=0xff, maxsec=0;
-		
-	if ((handle = SetBitFilter(PID, (sec<<8)|0x00ff, SECTION_CONTINUOS))==0xffff)
-		return -1;
+	int bufact = 0;
+	eit_t *eit;
+	eit_loop_t *eitloop;
+	u_char tmp[256];
+
+	if (bufact + (int)sizeof(eit_t) > buflen)
+		return 0;
+	eit = (eit_t *)buffer;
+	bufact += sizeof(eit_t);	
+
+	unsigned int service = (eit->service_id_hi << 8) | eit->service_id_lo;
+
+	while(bufact + (int)sizeof(eit_loop_t) <= buflen)
+	{	
+		eitloop = (eit_loop_t *)&buffer[bufact];
+		bufact += sizeof(eit_loop_t);
+
+		int descdatalen = (eitloop->descriptors_loop_length_hi << 8) + eitloop->descriptors_loop_length_lo;
+		int descdataact = 0;
+
+		while (descdataact < descdatalen && bufact < buflen)
+		{
+			switch (buffer[bufact])
+			{
+				eit_content_descriptor_t *cont;
+				eit_content_loop_t *contloop;
+
+				case EIT_STUFFING_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_STUFFING_DESCRIPTOR");
+					break;
+	
+				case EIT_LINKAGE_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_LINKAGE_DESCRIPTOR");
+					break;
+	
+				case EIT_SHORT_EVENT_DESCRIPTOR:
+					WriteShortEventDescriptor(service, eitloop, &buffer[bufact]);
+					break;
 		
-	seclen=0;
-	if (!cFile::AnyFileReady(fsvbi, 20000))
-	{
-		//cerr << "Timeout\n";
-		return -1;
-	}
+				case EIT_EXTENDED_EVENT_DESCRIPTOR:
+					WriteExtEventDescriptor(service, eitloop, &buffer[bufact]);
+					break;
+
+				case EIT_TIME_SHIFTED_EVENT_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_TIME_SHIFTED_EVENT_DESCRIPTOR");
+					break;
 	
-	read(fsvbi, buf, 8);
-	seclen=(buf[6]<<8)|buf[7];
-	pid=(buf[4]<<8)|buf[5];
+				case EIT_COMPONENT_DESCRIPTOR	:
+					strdvbcpy(tmp, &buffer[bufact + 8], buffer[bufact + 1] - 6);
+					//dsyslog(LOG_INFO, "Found EIT_COMPONENT_DESCRIPTOR %c%c%c 0x%02x/0x%02x/0x%02x '%s'\n", buffer[bufact + 5], buffer[bufact + 6], buffer[bufact + 7], buffer[2], buffer[3], buffer[4], tmp);
+					break;
 	
-	read(fsvbi, buf, seclen);
-	section=buf[0];
-	sectionnum=buf[6];
-	maxsec=buf[7];
+				case EIT_CA_IDENTIFIER_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_CA_IDENTIFIER_DESCRIPTOR");
+					break;
 	
-	//cerr << "secnum: " << HEX(2) << (int)sectionnum
-	//     << ", secmax: " << HEX(2) << (int) msecnum << "\n";
+				case EIT_CONTENT_DESCRIPTOR	:
+					cont = (eit_content_descriptor_t *)buffer;
+					contloop = (eit_content_loop_t *)&buffer[sizeof(eit_content_descriptor_t)];
+					//dsyslog(LOG_INFO, "Found EIT_CONTENT_DESCRIPTOR 0x%02x/0x%02x\n", contloop->content_nibble_level_1, contloop->content_nibble_level_2);
+					break;
 	
-	CloseFilter(handle);
+				case EIT_PARENTAL_RATING_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_PARENTAL_RATING_DESCRIPTOR");
+					break;
 	
-	return seclen;
-}
+				case EIT_TELEPHONE_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_TELEPHONE_DESCRIPTOR");
+					break;
+	
+				case EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR");
+					break;
+	
+				case EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR");
+					break;
+	
+				case EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR");
+					break;
+	
+				case EIT_DATA_BROADCAST_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_DATA_BROADCAST_DESCRIPTOR");
+					break;
+	
+				case EIT_PDC_DESCRIPTOR	:
+					//dsyslog(LOG_INFO, "Found EIT_PDC_DESCRIPTOR");
+					break;
+			
+				default:
+					//dsyslog(LOG_INFO, "Found unhandled descriptor 0x%02x with length of %04d\n", (int)buffer[bufact], (int)buffer[bufact + 1]);
+					break;
+			}
+			descdataact += (buffer[bufact + 1] + 2);
+			bufact += (buffer[bufact + 1] + 2);
+		}
+	}
 
-/**  */
-int cEIT::CloseFilter(unsigned short handle)
-{
-	if (ioctl(fsvbi, VIDIOCSSHUTDOWNFILTER, &handle)<0)
-		return -1;
 	return 0;
 }
 
 /**  */
-char * cEIT::mjd2string(unsigned short mjd)
+int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
 {
-	int y, m, d, k;
-	static char buf[20];
+	int a = 0;
 	
-	y = (int) ((mjd - 15078.2) / 365.25);
-	m = (int) ((mjd - 14956.1 - (int)(y * 365.25)) / 30.6001);
-	d = (int) (mjd - 14956 - (int)(y * 365.25) - (int)(m * 30.6001));
-	k = (m == 14 || m == 15) ? 1 : 0;
-	y = y + k;
-	m = m - 1 - k * 12;
-	sprintf(buf, "%d.%d.%4d", d, m, y + 1900);
+	if (*src == 0x05 || (*src >= 0x20 && *src <= 0xff))
+	{
+		for (a = 0; a < max; a++)
+		{
+			if (*src == 0)
+				break;
+		
+			if ((*src >= ' ' && *src <= '~') || (*src >= 0xa0 && *src <= 0xff))
+				*dst++ = *src++;
+			else
+			{
+				// if ((*src > '~' && *src < 0xa0) || *src == 0xff)
+				// cerr << "found special character 0x" << HEX(2) << (int)*src << endl;
+				src++;
+			}
+		}
+		*dst = 0;
+	}
+	else
+	{
+		const char *ret;
+
+		switch (*src)
+		{
+			case 0x01: ret = "Coding according to character table 1"; break;
+			case 0x02: ret = "Coding according to character table 2"; break;
+			case 0x03: ret = "Coding according to character table 3"; break;
+			case 0x04: ret = "Coding according to character table 4"; break;
+			case 0x10: ret = "Coding according to ISO/IEC 8859"; break;
+			case 0x11: ret = "Coding according to ISO/IEC 10646"; break;
+			case 0x12: ret = "Coding according to KSC 5601"; break;
+			default: ret = "Unknown coding"; break;
+		}
+		strncpy((char *)dst, ret, max);
+	}
+	return a;
+}
+
+/** returns true if this EIT covers a
+present/following information, false if it's
+schedule information */
+bool cEIT::IsPresentFollowing()
+{
+	if (tid == 0x4e || tid == 0x4f)
+		return true;
 
-	return(buf);
+	return false;
 }
 
 /**  */
-int cEIT::GetEIT()
+bool cEIT::WriteShortEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf)
 {
-	unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
-	eit_t *eit;
-	struct eit_loop_struct1 *eitloop;
-	struct eit_short_event_descriptor_struct *eitevt;
-	unsigned int seclen;
-	unsigned short handle, pid;
-	eit_event * pevt = (eit_event *)0;
-	time_t tstart;
+	u_char tmp[256];
+	eit_short_event_t *evt = (eit_short_event_t *)buf;
+	unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
+	cEventInfo *pEvent;
+
+	//isyslog(LOG_INFO, "Found Short Event Descriptor");
 	
-	if ((handle = SetBitFilter(0x12, (0x4e << 8) | 0x00ff, SECTION_CONTINUOS))==0xffff)
+	cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
+	if (pSchedule == NULL)
 	{
-		return -1;
+		schedules->Add(new cSchedule(service));
+		pSchedule = (cSchedule *)schedules->GetSchedule(service);
+		if (pSchedule == NULL)
+			return false;
 	}
-/*	
-	pid_t process = fork();
-	if (process < 0)
+
+   /* cSchedule::GetPresentEvent() and cSchedule::GetFollowingEvent() verify
+      the temporal sanity of these events, so calling them here appears to
+      be a bad idea... (kls 2000-11-01)
+	//
+	// if we are working on a present/following info, let's see whether
+	// we already have present/following info for this service and if yes
+	// check whether it's the same eventid, if yes, just return, nothing
+	// left to do.
+	//
+	if (IsPresentFollowing())
 	{
-		cerr << "GetEIT -1" << endl;
-		return -1;
+		if (eitloop->running_status == 4 || eitloop->running_status == 3)
+			pEvent = (cEventInfo *)pSchedule->GetPresentEvent();
+		else
+			pEvent = (cEventInfo *)pSchedule->GetFollowingEvent();
+
+		if (pEvent != NULL)
+			if (pEvent->GetEventID() == eventid)
+				return true;
 	}
-	
-	if (process != 0)
+   */
+
+	//
+	// let's see whether we have that eventid already
+	// in case not, we have to create a new cEventInfo for it
+	//
+	pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
+	if (pEvent == NULL)
 	{
-		cerr << "GetEIT 0" << endl;
-		return 0;
+		pSchedule->Events.Add(new cEventInfo(service, eventid));
+		pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
+		if (pEvent == NULL)
+			return false;
+		
+		strdvbcpy(tmp, &buf[sizeof(eit_short_event_t)], evt->event_name_length);
+		pEvent->SetTitle((char *)tmp);
+		strdvbcpy(tmp, &buf[sizeof(eit_short_event_t) + evt->event_name_length + 1],
+					 (int)buf[sizeof(eit_short_event_t) + evt->event_name_length]);
+		pEvent->SetSubtitle((char *)tmp);
+		cMJD mjd(eitloop->date_hi, eitloop->date_lo,
+					eitloop->time_hour_ten * 10 + eitloop->time_hour,
+					eitloop->time_minute_ten * 10 + eitloop->time_minute,
+					eitloop->time_second_ten * 10 + eitloop->time_second);
+		pEvent->SetTime(mjd.GetTime_t());
+		pEvent->SetDuration((long)((long)((eitloop->dur_hour_ten * 10 + eitloop->dur_hour) * 60l * 60l) +
+											(long)((eitloop->dur_minute_ten * 10 + eitloop->dur_minute) * 60l) +
+											(long)(eitloop->dur_second_ten * 10 + eitloop->dur_second)));
 	}
-*/	
-	int nReceivedEITs = 0;
-	tstart = time(NULL);
-	while ((!evtRunning.bIsValid || !evtNext.bIsValid) && nReceivedEITs < 20 && difftime(time(NULL), tstart) < 4)
+	
+	if (IsPresentFollowing())
 	{
-	        if (!cFile::AnyFileReady(fsvbi, 5000))
-		{
-			//cerr << "Timeout\n";
-			CloseFilter(handle);
-			return -1;
-		}
+		if (eitloop->running_status == 4 || eitloop->running_status == 3)
+			pSchedule->SetPresentEvent(pEvent);
+		else if (eitloop->running_status == 1 || eitloop->running_status == 2 || eitloop->running_status == 0)
+			pSchedule->SetFollowingEvent(pEvent);
+	}
+
+	return true;
+}
+
+/**  */
+bool cEIT::WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf)
+{
+	u_char tmp[256];
+	eit_extended_event_t *evt = (eit_extended_event_t *)buf;
+	int bufact, buflen;
+	unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
+	cEventInfo *pEvent;
 	
-		read(fsvbi, buf, 8);
-		seclen=(buf[6]<<8)|buf[7];
-		pid=(buf[4]<<8)|buf[5];
+	//isyslog(LOG_INFO, "Found Extended Event Descriptor");
 	
-                if (seclen >= sizeof(buf))
-                   seclen = sizeof(buf) - 1;
-		read(fsvbi, buf, seclen);
+	cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
+	if (pSchedule == NULL)
+	{
+		schedules->Add(new cSchedule(service));
+		pSchedule = (cSchedule *)schedules->GetSchedule(service);
+		if (pSchedule == NULL)
+			return false;
+	}
+
+	pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
+	if (pEvent == NULL)
+		return false;
 	
-		if (seclen < (int)(sizeof(eit_t)
-							  + sizeof(struct eit_loop_struct1)
-							  + sizeof(struct eit_short_event_descriptor_struct)))
-			continue;
+	if (evt->descriptor_number != pEvent->GetExtendedDescriptorNumber())
+		return false;
 	
-		eit = (eit_t *)buf;
-		eitloop = (struct eit_loop_struct1 *)&eit[1];
-		eitevt = (struct eit_short_event_descriptor_struct *)&eitloop[1];
+	bufact = sizeof(eit_extended_event_t);
+	buflen = buf[1] + 2;
 	
-		if (eitevt->descriptor_tag != EIT_SHORT_EVENT_DESCRIPTOR)
+	if (evt->length_of_items > 0)
+	{
+		while (bufact - sizeof(eit_extended_event_t) < evt->length_of_items)
 		{
-			// printf("Tag = '%c'\n", eitevt->descriptor_tag);
-			continue;
+			strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
+			// could use value in tmp now to do something,
+			// haven't seen any items as of yet transmitted from satellite
+			bufact += (buf[bufact] + 1);
 		}
+	}
 	
-		if (((eit->service_id_hi << 8) | eit->service_id_lo) != uProgramNumber)
-		{
-			// printf("Wrong program %04x need %04x\n", (eit->service_id_hi << 8) | eit->service_id_lo, uProgramNumber);
-			continue;
-		}
-		
-		nReceivedEITs++;
+	strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
+	if (pEvent->AddExtendedDescription((char *)tmp))
+	{
+		pEvent->IncreaseExtendedDescriptorNumber();
+		return true;
+	}
 	
-		pevt = (eit_event *)0;
-		if (eitloop->running_status == 4 | eitloop->running_status == 3)
-			pevt = (eit_event *)&evtRunning;
-		else if (eitloop->running_status == 1 || eitloop->running_status == 2 || eitloop->running_status == 0)
-			pevt = (eit_event *)&evtNext;
+	return false;
+}
+
+// --- cSIProcessor ----------------------------------------------------------
+
+#define MAX_FILTERS 20
+
+/**  */
+cSIProcessor::cSIProcessor(const char *FileName)
+{
+	useTStime = false;
+   filters = NULL;
+   schedules = NULL;
+   if ((fsvbi = open(FileName, O_RDONLY)) >= 0)
+   {
+      schedules = new cSchedules;
+	   filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
+   }
+   else
+      LOG_ERROR_STR(FileName);
+}
+
+cSIProcessor::~cSIProcessor()
+{
+   if (fsvbi >= 0)
+   {
+      Stop();
+   	ShutDownFilters();
+      delete filters;
+      delete schedules;
+      close(fsvbi);
+   }
+}
+
+/** use the vbi device to parse all relevant SI
+information and let the classes corresponding
+to the tables write their information to the disk */
+void cSIProcessor::Action()
+{
+   if (fsvbi < 0) {
+      esyslog(LOG_ERR, "cSIProcessor::Action() called without open file - returning");
+      return;
+      }
+
+   dsyslog(LOG_INFO, "EIT processing thread started (pid=%d)", getpid());
+	
+   unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
+	unsigned int seclen;
+	unsigned int pid;
+   time_t lastCleanup = time(NULL);
+	struct pollfd pfd;
+	
+	while(true)
+	{
+      time_t now = time(NULL);
+      struct tm *ptm = localtime(&now);
+      if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
+      {
+         LOCK_THREAD;
 
-		if (pevt)
+         isyslog(LOG_INFO, "Now cleaning up things");
+         schedules->Cleanup();
+         lastCleanup = now;
+      }
+
+		/* wait data become ready from the bitfilter */
+		pfd.fd = fsvbi;
+		pfd.events = POLLIN;
+		if(poll(&pfd, 1, 1000) != 0) /* timeout is 5 secs */
 		{
-			unsigned char *p = (unsigned char *)&eitevt[1];
-			strdvbcpy((unsigned char *)pevt->szTitle, p, eitevt->event_name_length);
-			pevt->szSubTitle[0] = 0;
-			strdvbcpy((unsigned char *)pevt->szSubTitle, &p[eitevt->event_name_length+1], (int)p[eitevt->event_name_length]);
-			strcpy(pevt->szDate, mjd2string((eitloop->date_hi << 8) + eitloop->date_lo));
-			int hr = eitloop->time_hour + (eitloop->time_hour_ten * 10);
-			hr += 2;
-			if (hr >=24)
+			// fprintf(stderr, "<data>\n");
+			/* read section */
+			read(fsvbi, buf, 8);
+			seclen = (buf[6] << 8) | buf[7];
+			pid = (buf[4] << 8) | buf[5];
+			read(fsvbi, buf, seclen);
+
+			//dsyslog(LOG_INFO, "Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
+
+			switch (pid)
 			{
-				hr -= 24;
-				// need to switch date one day ahead here
+				case 0x14:
+					if (buf[0] == 0x70)
+					{
+						if (useTStime)
+                  {
+                     cTDT ctdt((tdt_t *)buf);
+							ctdt.SetSystemTime();
+                  }
+					}
+                  /*XXX this comes pretty often:
+					else
+						dsyslog(LOG_INFO, "Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
+                  XXX*/
+					break;
+				
+				case 0x12:
+					if (buf[0] != 0x72)
+					{
+                  LOCK_THREAD;
+
+	               cEIT ceit(buf, seclen, schedules);
+						ceit.ProcessEIT();
+					}
+					else
+						dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
+					break;
+				
+				default:
+					break;
 			}
-			sprintf(pevt->szTime, "%d:%c%c", hr,
-														eitloop->time_minute_ten + '0',
-														eitloop->time_minute + '0');
-			pevt->bIsValid = true;
 		}
-	}
-
-	CloseFilter(handle);	
+		else
+		{
+         LOCK_THREAD;
 
-	return 1;
+         //XXX this comes pretty often
+			//isyslog(LOG_INFO, "Received timeout from poll, refreshing filters\n");
+			RefreshFilters();
+		}
+//		WakeUp();
+	}
 }
 
-/**  */
-int cEIT::SetProgramNumber(unsigned short pnr)
+/** Add a filter with packet identifier pid and
+table identifer tid */
+bool cSIProcessor::AddFilter(u_char pid, u_char tid)
 {
-	if (pnr == 0)
-	{
-		evtRunning.bIsValid = false;
-		evtNext.bIsValid = false;
-		return -1;
-	}
+   if (fsvbi < 0)
+      return false;
+
+	int section = ((int)tid << 8) | 0x00ff;
+	
+	struct bitfilter filt = {
+		pid,
+		{ section, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+		  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
+		  SECTION_CONTINUOS, 0,
+		  FILTER_MEM,
+		  {},
+		};
 
-	if (pnr != uProgramNumber)
+	if (ioctl(fsvbi, VIDIOCSBITFILTER, &filt) < 0)
+		return false;
+		
+	for (int a = 0; a < MAX_FILTERS; a++)
 	{
-		evtRunning.bIsValid = false;
-		evtNext.bIsValid = false;
-		uProgramNumber = pnr;
+		if (filters[a].inuse == false)
+		{
+			filters[a].pid = pid;
+			filters[a].tid = tid;
+			filters[a].handle = filt.handle;
+			filters[a].inuse = true;
+			// dsyslog(LOG_INFO, "  Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+			return true;
+		}
 	}
-	return 1;
+	
+	return false;
 }
 
-/** retrieves the string for the running title */
-char * cEIT::GetRunningTitle()
-{
-	if (evtRunning.bIsValid)
-		return evtRunning.szTitle;
-	else
-		return "---";
-}
-/** Retrieves the string for the running subtitle */
-char * cEIT::GetRunningSubtitle()
-{
-	if (evtRunning.bIsValid)
-		return evtRunning.szSubTitle;
-	else
-		return "---";
-}
-/** Retrieves the string representing the
-date of the current event
- */
-char * cEIT::GetRunningDate()
+/** set whether local systems time should be
+set by the received TDT or TOT packets */
+bool cSIProcessor::SetUseTSTime(bool use)
 {
-	if (evtRunning.bIsValid)
-		return evtRunning.szDate;
-	else
-		return "---";
-}
-/** Retrieves the string representing the
-time of the current event */
-char * cEIT::GetRunningTime()
-{
-	if (evtRunning.bIsValid)
-		return evtRunning.szTime;
-	else
-		return "---";
-}
-/** retrieves the string for the running title */
-char * cEIT::GetNextTitle()
-{
-	if (evtNext.bIsValid)
-		return evtNext.szTitle;
-	else
-		return "---";
+	useTStime = use;
+	return useTStime;
 }
-/** Retrieves the string for the running subtitle */
-char * cEIT::GetNextSubtitle()
-{
-	if (evtNext.bIsValid)
-		return evtNext.szSubTitle;
-	else
-		return "---";
-}
-/** Retrieves the string representing the
-date of the current event
- */
-char * cEIT::GetNextDate()
-{
-	if (evtNext.bIsValid)
-		return evtNext.szDate;
-	else
-		return "---";
-}
-/** Retrieves the string representing the
-time of the current event */
-char * cEIT::GetNextTime()
+
+/**  */
+bool cSIProcessor::ShutDownFilters()
 {
-	if (evtNext.bIsValid)
-		return evtNext.szTime;
-	else
-		return "---";
+   if (fsvbi < 0)
+      return false;
+
+	bool ret = true;
+	
+	for (int a = 0; a < MAX_FILTERS; a++)
+	{
+		if (filters[a].inuse == true)
+		{
+			if (ioctl(fsvbi, VIDIOCSSHUTDOWNFILTER, &filters[a].handle) < 0)
+				ret = false;
+
+			// dsyslog(LOG_INFO, "Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+			
+			filters[a].inuse = false;
+		}
+	}
+
+	return ret;
 }
 
-/**  */
-bool cEIT::IsValid()
+/** */
+bool cSIProcessor::SetCurrentServiceID(unsigned short servid)
 {
-	GetEIT();
-	return (evtRunning.bIsValid && evtNext.bIsValid);
+  LOCK_THREAD;
+  return schedules ? schedules->SetCurrentServiceID(servid) : false;
 }
 
 /**  */
-int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
+bool cSIProcessor::RefreshFilters()
 {
-	int a;
-	for (a = 0; a < max; a++)
+   if (fsvbi < 0)
+      return false;
+
+	bool ret = true;
+	
+	ret = ShutDownFilters();
+	
+	for (int a = 0; a < MAX_FILTERS; a++)
 	{
-		if (*src == 0)
-			break;
-		
-		if ((*src >= ' ' && *src <= '~') || (*src >= 0xa0 && *src <= 0xff))
-			*dst++ = *src++;
-		else
-			src++;
+		if (filters[a].inuse == false && filters[a].pid != 0 && filters[a].tid != 0)
+		{
+			if (!AddFilter(filters[a].pid, filters[a].tid))
+				ret = false;
+		}
 	}
-	*dst = 0;
-	return a;
+
+	return ret;
 }
+
diff --git a/eit.h b/eit.h
index 28329f427..fec498baf 100644
--- a/eit.h
+++ b/eit.h
@@ -13,80 +13,127 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.1 2000/09/03 10:23:24 kls Exp $
+ * $Id: eit.h 1.2 2000/10/29 10:21:56 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
 #define __EIT_H
 
-#include <dvb_v4l.h>
+#include "thread.h"
+#include "tools.h"
 
-typedef struct eit_event {
+class cEventInfo : public cListObject {
+  friend class cSchedule;
+  friend class cEIT;
+private:
+  unsigned short uServiceID;        // Service ID of program for that event
+  bool bIsFollowing;                // true if this is the next event on this channel
+  bool bIsPresent;                  // true if this is the present event running
+  char *pExtendedDescription;       // Extended description of this event
+  char *pSubtitle;                  // Subtitle of event
+  char *pTitle;                     // Title of event
+  unsigned short uEventID;          // Event ID of this event
+  long lDuration;                   // duration of event in seconds
+  time_t tTime;                     // Start time
+  u_char cExtendedDescriptorNumber; // current extended descriptor number that has to be inserted
+  int nChannelNumber;               // the actual channel number from VDR's channel list (used in cMenuSchedule for sorting by channel number)
+protected:
+  void SetFollowing(bool foll);
+  void SetPresent(bool pres);
+  bool SetTitle(char *string);
+  void SetServiceID(unsigned short servid);
+  void SetEventID(unsigned short evid);
+  void SetDuration(long l);
+  void SetTime(time_t t);
+  bool AddExtendedDescription(char *string);
+  bool SetSubtitle(char *string);
+  void IncreaseExtendedDescriptorNumber(void);
+  cEventInfo(unsigned short serviceid, unsigned short eventid);
+public: 
+  ~cEventInfo();
+  const char *GetTimeString(void) const;
+  const char *GetEndTimeString(void) const;
+  const char *GetDate(void) const;
+  bool IsFollowing(void) const;
+  bool IsPresent(void) const;
+  const char *GetExtendedDescription(void) const;
+  const char *GetSubtitle(void) const;
+  const char *GetTitle(void) const;
+  unsigned short GetEventID(void) const;
+  long GetDuration(void) const;
+  time_t GetTime(void) const;
+  u_char GetExtendedDescriptorNumber(void) const;
+  unsigned short GetServiceID(void) const;
+  int GetChannelNumber(void) const { return nChannelNumber; }
+  void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
+  };
+
+class cSchedule : public cListObject  {
+  friend class cSchedules;
+  friend class cEIT;
+private:
+  cEventInfo *pPresent;
+  cEventInfo *pFollowing;
+  unsigned short uServiceID;
+  cList<cEventInfo> Events;
+protected:
+  void SetServiceID(unsigned short servid);
+  bool SetFollowingEvent(cEventInfo *pEvent);
+  bool SetPresentEvent(cEventInfo *pEvent);
+  void Cleanup(time_t tTime);
+  void Cleanup(void);
+  cSchedule(unsigned short servid = 0);
+public: 
+  ~cSchedule();
+  const cEventInfo *GetPresentEvent(void) const;
+  const cEventInfo *GetFollowingEvent(void) const;
+  unsigned short GetServiceID(void) const;
+  const cEventInfo *GetEvent(unsigned short uEventID) const;
+  const cEventInfo *GetEvent(time_t tTime) const;
+  const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
+  int NumEvents(void) const { return Events.Count(); }
+  };
 
-	bool	bIsValid;
-	char	szTitle[512];
-	char	szSubTitle[512];
-	char	szDate[12];
-	char	szTime[12];
+class cSchedules : public cList<cSchedule> {
+  friend class cSIProcessor;
+private:
+  const cSchedule *pCurrentSchedule;
+  unsigned short uCurrentServiceID;
+protected:
+  bool SetCurrentServiceID(unsigned short servid);
+  void Cleanup();
+public: 
+  cSchedules(void);
+  ~cSchedules();
+  const cSchedule *GetSchedule(unsigned short servid) const;
+  const cSchedule *GetSchedule(void) const;
+};
 
-}eit_event;
+typedef struct sip_filter {
 
-/**
-  *@author Robert Schneider
-  */
+  u_char pid;
+  u_char tid;
+  int handle;
+  bool inuse;
 
-class cEIT {
-public: 
-	cEIT();
-	~cEIT();
-  /**  */
-  int GetEIT();
-  /**  */
-  int SetProgramNumber(unsigned short pnr);
-  /** Retrieves the string representing the time of the current event */
-  char * GetRunningTime();
-  /** Retrieves the string representing the date of the current event */
-  char * GetRunningDate();
-  /** Retrieves the string for the running subtitle */
-  char * GetRunningSubtitle();
-  /** retrieves the string for the running title */
-  char * GetRunningTitle();
-  /** Retrieves the string representing the time of the next event */
-  char * GetNextTime();
-  /** Retrieves the string representing the date of the next event */
-  char * GetNextDate();
-  /** Retrieves the string for the next subtitle */
-  char * GetNextSubtitle();
-  /** retrieves the string for the next title */
-  char * GetNextTitle();
-  /**  */
-  bool IsValid();
+}SIP_FILTER;
 
-protected: // Protected attributes
-  /** Device name of VBI device */
-  const char * cszBitFilter;
-protected: // Protected attributes
-  /** handle to VBI device (usually /dev/vbi) */
+class cSIProcessor : public cThread {
+private:
+  cSchedules *schedules;
+  bool useTStime;
+  SIP_FILTER *filters;
   int fsvbi;
-  /** Describes the event next on */
-  eit_event evtNext;
-  /** Describes the running event */
-  eit_event evtRunning;
-protected: // Protected methods
-  /** Set the bitfilter in vbi device to return
-correct tables */
-  int SetBitFilter(unsigned short pid, unsigned short section, unsigned short mode);
-  /**  */
-  int GetSection(unsigned char *buf, ushort PID, unsigned char sec);
-  /**  */
-  int CloseFilter(unsigned short handle);
-  /**  */
-  char * mjd2string(unsigned short mjd);
-  /**  */
-  int strdvbcpy(unsigned char *dst, unsigned char *src, int max);
-public: // Public attributes
-  /**  */
-  unsigned short uProgramNumber;
-};
+  bool RefreshFilters(void);
+  void Action(void);
+public: 
+  cSIProcessor(const char *FileName);
+  ~cSIProcessor();
+  bool SetUseTSTime(bool use);
+  bool AddFilter(u_char pid, u_char tid);
+  bool ShutDownFilters(void);
+  bool SetCurrentServiceID(unsigned short servid);
+  const cSchedules *Schedules(void) { return schedules; }
+  };
 
 #endif
diff --git a/interface.c b/interface.c
index 5940195f9..810270fed 100644
--- a/interface.c
+++ b/interface.c
@@ -4,14 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.25 2000/10/08 16:34:17 kls Exp $
+ * $Id: interface.c 1.28 2000/11/01 15:27:52 kls Exp $
  */
 
 #include "interface.h"
+#include <ctype.h>
 #include <unistd.h>
-#include "eit.h"
-
-cEIT EIT;
 
 cInterface *Interface = NULL;
 
@@ -19,6 +17,7 @@ cInterface::cInterface(int SVDRPport)
 {
   open = 0;
   cols[0] = 0;
+  width = height = 0;
   keyFromWait = kNone;
   rcIo = NULL;
   SVDRP = NULL;
@@ -43,15 +42,17 @@ cInterface::~cInterface()
 void cInterface::Open(int NumCols, int NumLines)
 {
   if (!open++)
-     cDvbApi::PrimaryDvbApi->Open(NumCols, NumLines);
+     cDvbApi::PrimaryDvbApi->Open(width = NumCols, height = NumLines);
 }
 
 void cInterface::Close(void)
 {
   if (open == 1)
      Clear();
-  if (!--open)
+  if (!--open) {
      cDvbApi::PrimaryDvbApi->Close();
+     width = height = 0;
+     }
 }
 
 unsigned int cInterface::GetCh(bool Wait, bool *Repeat, bool *Release)
@@ -114,6 +115,18 @@ void cInterface::ClearEol(int x, int y, eDvbColor Color)
      cDvbApi::PrimaryDvbApi->ClrEol(x, y, Color);
 }
 
+void cInterface::Fill(int x, int y, int w, int h, eDvbColor Color)
+{
+  if (open)
+     cDvbApi::PrimaryDvbApi->Fill(x, y, w, h, Color);
+}
+
+void cInterface::Flush(void)
+{
+  if (open)
+     cDvbApi::PrimaryDvbApi->Flush();
+}
+
 void cInterface::SetCols(int *c)
 {
   for (int i = 0; i < MaxCols; i++) {
@@ -123,6 +136,74 @@ void cInterface::SetCols(int *c)
       }
 }
 
+char *cInterface::WrapText(const char *Text, int Width, int *Height)
+{
+  // Wraps the Text to make it fit into the area defined by the given Width
+  // (which is given in character cells).
+  // The actual number of lines resulting from this operation is returned in
+  // Height.
+  // The returned string is newly created on the heap and the caller
+  // is responsible for deleting it once it is no longer used.
+  // Wrapping is done by inserting the necessary number of newline
+  // characters into the string.
+
+  int Lines = 1;
+  char *t = strdup(Text);
+  char *Blank = NULL;
+  char *Delim = NULL;
+  int w = 0;
+
+  Width *= cDvbApi::PrimaryDvbApi->CellWidth();
+
+  while (*t && t[strlen(t) - 1] == '\n')
+        t[strlen(t) - 1] = 0; // skips trailing newlines
+
+  for (char *p = t; *p; ) {
+      if (*p == '\n') {
+         Lines++;
+         w = 0;
+         Blank = Delim = NULL;
+         p++;
+         continue;
+         }
+      else if (isspace(*p))
+         Blank = p;
+      int cw = cDvbApi::PrimaryDvbApi->Width(*p);
+      if (w + cw > Width) {
+         if (Blank) {
+            *Blank = '\n';
+            p = Blank;
+            continue;
+            }
+         else {
+            // Here's the ugly part, where we don't have any whitespace to
+            // punch in a newline, so we need to make room for it:
+            if (Delim)
+               p = Delim + 1; // let's fall back to the most recent delimiter
+            char *s = new char[strlen(t) + 2]; // The additional '\n' plus the terminating '\0'
+            int l = p - t;
+            strncpy(s, t, l);
+            s[l] = '\n';
+            strcpy(s + l + 1, p);
+            delete t;
+            t = s;
+            p = t + l;
+            continue;
+            }
+         }
+      else
+         w += cw;
+      if (strchr("-.,:;!?_", *p)) {
+         Delim = p;
+         Blank = NULL;
+         }
+      p++;
+      }
+
+  *Height = Lines;
+  return t;
+}
+
 void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
   if (open)
@@ -157,7 +238,7 @@ void cInterface::WriteText(int x, int y, const char *s, eDvbColor FgColor, eDvbC
 
 void cInterface::Title(const char *s)
 {
-  int x = (MenuColumns - strlen(s)) / 2;
+  int x = (Width() - strlen(s)) / 2;
   if (x < 0)
      x = 0;
   ClearEol(0, 0, clrCyan);
@@ -206,7 +287,7 @@ bool cInterface::Confirm(const char *s)
 void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor)
 {
   if (open && Text) {
-     const int w = MenuColumns / 4;
+     const int w = Width() / 4;
      int l = (w - strlen(Text)) / 2;
      if (l < 0)
         l = 0;
@@ -334,65 +415,9 @@ void cInterface::LearnKeys(void)
       }
 }
 
-eKeys cInterface::DisplayChannel(int Number, const char *Name, bool WithInfo)
+void cInterface::DisplayChannelNumber(int Number)
 {
-  // Number = 0 is used for channel group display and no EIT
-  if (Number)
-     rcIo->Number(Number);
-  if (Name && !Recording()) {
-     Open(MenuColumns, 5);
-     cDvbApi::PrimaryDvbApi->Fill(0, 0, MenuColumns, 1, clrBackground);
-     int BufSize = MenuColumns + 1;
-     char buffer[BufSize];
-     if (Number)
-        snprintf(buffer, BufSize, "%d  %s", Number, Name ? Name : "");
-     else
-        snprintf(buffer, BufSize, "%s", Name ? Name : "");
-     Write(0, 0, buffer);
-     time_t t = time(NULL);
-     struct tm *now = localtime(&t);
-     snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
-     Write(-5, 0, buffer);
-     cDvbApi::PrimaryDvbApi->Flush();
-
-     char *RunningTitle = "", *RunningSubtitle = "", *NextTitle = "", *NextSubtitle = "";
-     int Lines = 0;
-     if (Number && WithInfo && EIT.IsValid()) {
-        if (*(RunningTitle    = EIT.GetRunningTitle()))    Lines++;
-        if (*(RunningSubtitle = EIT.GetRunningSubtitle())) Lines++;
-        if (*(NextTitle       = EIT.GetNextTitle()))       Lines++;
-        if (*(NextSubtitle    = EIT.GetNextSubtitle()))    Lines++;
-        }
-     if (Lines > 0) {
-        const int t = 6;
-        int l = 1;
-        cDvbApi::PrimaryDvbApi->Fill(0, 1, MenuColumns, Lines, clrBackground);
-        if (*RunningTitle) {
-           Write(0, l, EIT.GetRunningTime(), clrYellow, clrBackground);
-           Write(t, l, RunningTitle, clrCyan, clrBackground);
-           l++;
-           }
-        if (*RunningSubtitle) {
-           Write(t, l, RunningSubtitle, clrCyan, clrBackground);
-           l++;
-           }
-        if (*NextTitle) {
-           Write(0, l, EIT.GetNextTime(), clrYellow, clrBackground);
-           Write(t, l, NextTitle, clrCyan, clrBackground);
-           l++;
-           }
-        if (*NextSubtitle) {
-           Write(t, l, NextSubtitle, clrCyan, clrBackground);
-           }
-        cDvbApi::PrimaryDvbApi->Flush();
-        }
-     eKeys Key = Wait(5, true);
-     if (Key == kOk)
-        GetKey();
-     Close();
-     return Key;
-     }
-  return kNone;
+  rcIo->Number(Number);
 }
 
 void cInterface::DisplayRecording(int Index, bool On)
diff --git a/interface.h b/interface.h
index 8d0f8f685..5dd8ee3ad 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.16 2000/10/08 12:15:49 kls Exp $
+ * $Id: interface.h 1.19 2000/11/01 15:27:23 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -19,6 +19,7 @@ class cInterface {
 public:
   enum { MaxCols = 5 };
 private:
+  int width, height;
   int open;
   int cols[MaxCols];
   eKeys keyFromWait;
@@ -33,11 +34,16 @@ class cInterface {
   ~cInterface();
   void Open(int NumCols = MenuColumns, int NumLines = MenuLines);
   void Close(void);
+  int Width(void) { return width; }
+  int Height(void) { return height; }
   eKeys GetKey(bool Wait = true);
   void PutKey(eKeys Key);
   void Clear(void);
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
+  void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
+  void Flush(void);
   void SetCols(int *c);
+  char *WrapText(const char *Text, int Width, int *Height);
   void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   void WriteText(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   void Title(const char *s);
@@ -47,7 +53,7 @@ class cInterface {
   bool Confirm(const char *s);
   void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
-  eKeys DisplayChannel(int Number, const char *Name = NULL, bool WithInfo = false);
+  void DisplayChannelNumber(int Number);
   void DisplayRecording(int Index, bool On);
   bool Recording(void);
   };
diff --git a/menu.c b/menu.c
index 39689c9c7..c3611ccd3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,15 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.36 2000/10/08 16:11:22 kls Exp $
+ * $Id: menu.c 1.40 2000/11/01 16:14:48 kls Exp $
  */
 
 #include "menu.h"
-#include <ctype.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "config.h"
+#include "eit.h"
 
 #define MENUTIMEOUT 120 // seconds
 
@@ -725,7 +726,107 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuSummary --------------------------------------------------------
+// --- cMenuTextItem ---------------------------------------------------------
+
+class cMenuTextItem : public cOsdItem {
+private:
+  char *text;
+  int x, y, w, h, lines, offset;
+  eDvbColor fgColor, bgColor;
+public:
+  cMenuTextItem(const char *Text, int X, int Y, int W, int H = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
+  ~cMenuTextItem();
+  int Height(void) { return h; }
+  void Clear(void);
+  virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
+  bool CanScrollUp(void) { return offset > 0; }
+  bool CanScrollDown(void) { return h + offset < lines; }
+  void ScrollUp(void);
+  void ScrollDown(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbColor FgColor, eDvbColor BgColor)
+{
+  x = X;
+  y = Y;
+  w = W;
+  h = H;
+  fgColor = FgColor;
+  bgColor = BgColor;
+  offset = 0;
+  text = Interface->WrapText(Text, w - 1, &lines);
+  if (h < 0)
+     h = lines;
+}
+
+cMenuTextItem::~cMenuTextItem()
+{
+  delete text;
+}
+
+void cMenuTextItem::Clear(void)
+{
+  Interface->Fill(x, y, w, h, bgColor);
+}
+
+void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
+{
+  int l = 0;
+  char *t = text;
+  while (*t) {
+        char *n = strchr(t, '\n');
+        if (l >= offset) {
+           if (n)
+              *n = 0;
+           Interface->Write(x, y + l - offset, t, fgColor, bgColor);
+           if (n)
+              *n = '\n';
+           else
+              break;
+           }
+        if (!n)
+           break;
+        t = n + 1;
+        if (++l >= h + offset)
+           break;
+        }
+  // scroll indicators use inverted color scheme!
+  if (CanScrollUp())   Interface->Write(x + w - 1, y,         "^", bgColor, fgColor);
+  if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
+}
+
+void cMenuTextItem::ScrollUp(void)
+{
+  if (CanScrollUp()) {
+     Clear();
+     offset--;
+     Display();
+     }
+}
+
+void cMenuTextItem::ScrollDown(void)
+{
+  if (CanScrollDown()) {
+     Clear();
+     offset++;
+     Display();
+     }
+}
+
+eOSState cMenuTextItem::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kUp|k_Repeat:
+    case kUp:            ScrollUp();   break;
+    case kDown|k_Repeat:
+    case kDown:          ScrollDown(); break;
+    default:             return osUnknown;
+    }
+  return osContinue;
+}
+
+// --- cMenuSummary ----------------------------------------------------------
 
 class cMenuSummary : public cOsdMenu {
 public:
@@ -736,29 +837,7 @@ class cMenuSummary : public cOsdMenu {
 cMenuSummary::cMenuSummary(const char *Text)
 :cOsdMenu("Summary")
 {
-  while (*Text) {
-        char line[MenuColumns + 1];
-        char *p = line;
-        const char *b = NULL;
-        *p++ = ' ';
-        while (*Text && p - line < MenuColumns - 2) {
-              if (isspace(*Text))
-                 b = Text; // remember the blank
-              if (*Text == '\n')
-                 break;
-              *p++ = *Text++;
-              }
-        if (*Text) {
-           if (b && Text - b > 0) {
-              p -= Text - b;
-              Text = b + 1;
-              }
-           else
-              Text++;
-           }
-        *p = 0;
-        Add(new cOsdItem(line, osBack));
-        }
+  Add(new cMenuTextItem(Text, 1, 2, MenuColumns - 2, MAXOSDITEMS));
 }
 
 eOSState cMenuSummary::ProcessKey(eKeys Key)
@@ -973,6 +1052,278 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEvent ------------------------------------------------------------
+
+class cMenuEvent : public cOsdMenu {
+private:
+  const cEventInfo *eventInfo;
+public:
+  cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch = false);
+  cMenuEvent(bool Now);
+  virtual eOSState ProcessKey(eKeys Key);
+};
+
+cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
+:cOsdMenu("Event")
+{
+  eventInfo = EventInfo;
+  if (eventInfo) {
+     cChannel *channel = Channels.GetByServiceID(eventInfo->GetServiceID());
+     if (channel) {
+        const char *p;
+        char *buffer;
+        asprintf(&buffer, "%-17.*s %.*s  %s - %s", 17, channel->name, 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
+        SetTitle(buffer, false);
+        int Line = 2;
+        cMenuTextItem *item;
+        if (!isempty(p = eventInfo->GetTitle())) {
+           Add(item = new cMenuTextItem(p, 1, Line, MenuColumns - 2, -1, clrCyan));
+           Line += item->Height() + 1;
+           }
+        if (!isempty(p = eventInfo->GetSubtitle())) {
+           Add(item = new cMenuTextItem(p, 1, Line, MenuColumns - 2, -1, clrYellow));
+           Line += item->Height() + 1;
+           }
+        if (!isempty(p = eventInfo->GetExtendedDescription()))
+           Add(new cMenuTextItem(p, 1, Line, MenuColumns - 2, Height() - Line - 2, clrCyan), true);
+        SetHelp("Record", NULL, NULL, CanSwitch ? "Switch" : NULL);
+        }
+     }
+}
+
+eOSState cMenuEvent::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:     return osBack;
+       default: break;
+       }
+     }
+  return state;
+}
+
+// --- cMenuWhatsOnItem ------------------------------------------------------
+
+class cMenuWhatsOnItem : public cOsdItem {
+public:
+  const cEventInfo *eventInfo;
+  cMenuWhatsOnItem(const cEventInfo *EventInfo);
+};
+
+cMenuWhatsOnItem::cMenuWhatsOnItem(const cEventInfo *EventInfo)
+{
+  eventInfo = EventInfo;
+  char *buffer = NULL;
+  cChannel *channel = Channels.GetByNumber(eventInfo->GetChannelNumber());
+  asprintf(&buffer, "%d\t%.*s\t%.*s\t%s", eventInfo->GetChannelNumber(), 6, channel ? channel->name : "???", 5, eventInfo->GetTimeString(), eventInfo->GetTitle());
+  SetText(buffer, false);
+}
+
+// --- cMenuWhatsOn ----------------------------------------------------------
+
+class cMenuWhatsOn : public cOsdMenu {
+private:
+  eOSState Record(void);
+  eOSState Switch(void);
+public:
+  cMenuWhatsOn(const cSchedules *Schedules, bool Now);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+static int CompareEventChannel(const void *p1, const void *p2)
+{
+  return (int)( (*(const cEventInfo **)p1)->GetChannelNumber() - (*(const cEventInfo **)p2)->GetChannelNumber());
+}
+
+cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now)
+:cOsdMenu(Now ? "What's on now?" : "What's on next?", 4, 7, 6)
+{
+  const cSchedule *Schedule = Schedules->First();
+  const cEventInfo **pArray = NULL;
+  int num = 0;
+
+  while (Schedule) {
+        pArray = (const cEventInfo **)realloc(pArray, (num + 1) * sizeof(cEventInfo *));
+
+        pArray[num] = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
+        if (pArray[num]) {
+           cChannel *channel = Channels.GetByServiceID(pArray[num]->GetServiceID());
+           if (channel) {
+              pArray[num]->SetChannelNumber(channel->number);
+              num++;
+              }
+           }
+        Schedule = (const cSchedule *)Schedules->Next(Schedule);
+        }
+
+  qsort(pArray, num, sizeof(cEventInfo *), CompareEventChannel);
+
+  for (int a = 0; a < num; a++)
+      Add(new cMenuWhatsOnItem(pArray[a]));
+
+  delete pArray;
+  SetHelp("Record", Now ? "Next" : "Now", "Schedule", "Switch");
+}
+
+eOSState cMenuWhatsOn::Switch(void)
+{
+  cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
+  if (item) {
+     cChannel *channel = Channels.GetByServiceID(item->eventInfo->GetServiceID());
+     if (channel && channel->Switch())
+        return osEnd;
+     }
+  Interface->Error("Can't switch channel!");
+  return osContinue;
+}
+
+eOSState cMenuWhatsOn::Record(void)
+{
+  cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
+  if (item) {      
+     cTimer *timer = new cTimer(item->eventInfo);
+     Timers.Add(timer);
+     Timers.Save();
+     isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+     return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
+     }
+  return osContinue;
+}
+
+eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kRed:    return Record();
+       case kYellow: return osBack;
+       case kBlue:   return Switch();
+       case kOk:     if (Count())
+                        return AddSubMenu(new cMenuEvent(((cMenuWhatsOnItem *)Get(Current()))->eventInfo, true));
+                     break;
+       default:      break;
+       }
+     }
+  return state;
+}
+
+// --- cMenuScheduleItem -----------------------------------------------------
+
+class cMenuScheduleItem : public cOsdItem {
+public:
+  const cEventInfo *eventInfo;
+  cMenuScheduleItem(const cEventInfo *EventInfo);
+};
+
+cMenuScheduleItem::cMenuScheduleItem(const cEventInfo *EventInfo)
+{
+  eventInfo = EventInfo;
+  char *buffer = NULL;
+  asprintf(&buffer, "%.*s\t%.*s\t%s", 5, eventInfo->GetDate(), 5, eventInfo->GetTimeString(), eventInfo->GetTitle());
+  SetText(buffer, false);
+}
+
+// --- cMenuSchedule ---------------------------------------------------------
+
+class cMenuSchedule : public cOsdMenu {
+private:
+  cThreadLock threadLock;
+  const cSchedules *schedules;
+  bool now, next;
+  eOSState Record(void);
+  void PrepareSchedule(void);
+  void PrepareWhatsOnNext(bool On);
+public:
+  cMenuSchedule(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuSchedule::cMenuSchedule(void)
+:cOsdMenu("Schedule", 6, 6)
+{
+  now = next = false;
+  cChannel *channel = Channels.GetByNumber(CurrentChannel);
+  if (channel) {
+     char *buffer = NULL;
+     asprintf(&buffer, "Schedule - %s", channel->name);
+     SetTitle(buffer, false);
+     }
+  PrepareSchedule();
+  SetHelp("Record", "Now", "Next");
+}
+
+static int CompareEventTime(const void *p1, const void *p2)
+{
+  return (int)((*(cEventInfo **)p1)->GetTime() - (*(cEventInfo **)p2)->GetTime());
+}
+
+void cMenuSchedule::PrepareSchedule(void)
+{
+  schedules = cDvbApi::PrimaryDvbApi->Schedules(&threadLock);
+  if (schedules) {
+     const cSchedule *Schedule = schedules->GetSchedule();
+     int num = Schedule->NumEvents();
+     const cEventInfo **pArray = (const cEventInfo **)malloc(num * sizeof(cEventInfo *));
+     if (pArray) {
+        time_t now = time(NULL);
+        int numreal = 0;
+        for (int a = 0; a < num; a++) {
+            const cEventInfo *EventInfo = Schedule->GetEventNumber(a);
+            if (EventInfo->GetTime() + EventInfo->GetDuration() > now)
+               pArray[numreal++] = EventInfo;
+            }
+
+        qsort(pArray, numreal, sizeof(cEventInfo *), CompareEventTime);
+
+        for (int a = 0; a < numreal; a++)
+            Add(new cMenuScheduleItem(pArray[a]));
+        delete pArray;
+        }
+     }
+}
+
+eOSState cMenuSchedule::Record(void)
+{
+  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
+  if (item) {      
+     cTimer *timer = new cTimer(item->eventInfo);
+     Timers.Add(timer);
+     Timers.Save();
+     isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+     return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
+     }
+  return osContinue;
+}
+
+eOSState cMenuSchedule::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kRed:    return Record();
+       case kGreen:  if (!now && !next) {
+                        now = true;
+                        return AddSubMenu(new cMenuWhatsOn(schedules, true));
+                        }
+                     now = !now;
+                     next = !next;
+                     return AddSubMenu(new cMenuWhatsOn(schedules, now));
+       case kYellow: return AddSubMenu(new cMenuWhatsOn(schedules, false));
+       case kOk:     if (Count())
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->eventInfo));
+                     break;
+       default:      break;
+       }
+     }
+  else if (!HasSubMenu())
+     now = next = false;
+  return state;
+}
+
 // --- cMenuRecordingItem ----------------------------------------------------
 
 class cMenuRecordingItem : public cOsdItem {
@@ -1089,6 +1440,9 @@ cMenuSetup::cMenuSetup(void)
   Add(new cMenuEditBoolItem("MarkInstantRecord",  &data.MarkInstantRecord));
   Add(new cMenuEditIntItem( "LnbFrequLo",         &data.LnbFrequLo));
   Add(new cMenuEditIntItem( "LnbFrequHi",         &data.LnbFrequHi));
+  Add(new cMenuEditIntItem( "SetSystemTime",      &data.SetSystemTime));
+  Add(new cMenuEditIntItem( "MarginStart",        &data.MarginStart));
+  Add(new cMenuEditIntItem( "MarginStop",         &data.MarginStop));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1098,6 +1452,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      switch (Key) {
        case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
+                 cDvbApi::PrimaryDvbApi->SetUseTSTime(data.SetSystemTime);
                  Setup = data;
                  Setup.Save();
                  break;
@@ -1114,6 +1469,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
 cMenuMain::cMenuMain(bool Replaying)
 :cOsdMenu("Main")
 {
+  Add(new cOsdItem("Schedule",   osSchedule));
   Add(new cOsdItem("Channels",   osChannels));
   Add(new cOsdItem("Timer",      osTimer));
   Add(new cOsdItem("Recordings", osRecordings));
@@ -1137,6 +1493,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   switch (state) {
+    case osSchedule:   return AddSubMenu(new cMenuSchedule);
     case osChannels:   return AddSubMenu(new cMenuChannels);
     case osTimer:      return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
@@ -1166,58 +1523,166 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cDirectChannelSelect --------------------------------------------------
+// --- cDisplayChannel -------------------------------------------------------
 
-#define DIRECTCHANNELTIMEOUT 500 //ms
+#define DIRECTCHANNELTIMEOUT  500 //ms
+#define INFOTIMEOUT          5000 //ms
 
-cDirectChannelSelect::cDirectChannelSelect(eKeys FirstKey)
+cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
+:cOsdBase(true)
+{
+  group = Group;
+  withInfo = !group && (!Switched || Setup.ShowInfoOnChSwitch);
+  lines = 0;
+  oldNumber = number = 0;
+  cChannel *channel = Group ? Channels.Get(Number) : Channels.GetByNumber(Number);
+  Interface->Open(MenuColumns, 5);
+  if (channel) {
+     DisplayChannel(channel);
+     DisplayInfo();
+     }
+  lastTime = time_ms();
+}
+
+cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdBase(true)
 {
   oldNumber = CurrentChannel;
   number = 0;
   lastTime = time_ms();
-  Interface->Open(MenuColumns, 1);
+  Interface->Open(MenuColumns, 5);
   ProcessKey(FirstKey);
 }
 
-cDirectChannelSelect::~cDirectChannelSelect()
+cDisplayChannel::~cDisplayChannel()
 {
   if (number < 0)
-     Interface->DisplayChannel(oldNumber);
+     Interface->DisplayChannelNumber(oldNumber);
   Interface->Close();
 }
 
-eOSState cDirectChannelSelect::ProcessKey(eKeys Key)
+void cDisplayChannel::DisplayChannel(const cChannel *Channel)
+{
+  if (!Interface->Recording()) {
+     if (Channel && Channel->number)
+        Interface->DisplayChannelNumber(Channel->number);
+     int BufSize = Width() + 1;
+     char buffer[BufSize];
+     if (Channel && Channel->number)
+        snprintf(buffer, BufSize, "%d  %s", Channel->number, Channel->name);
+     else
+        snprintf(buffer, BufSize, "%s", Channel ? Channel->name : "*** Invalid Channel ***");
+     Interface->Fill(0, 0, MenuColumns, 1, clrBackground);
+     Interface->Write(0, 0, buffer);
+     time_t t = time(NULL);
+     struct tm *now = localtime(&t);
+     snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
+     Interface->Write(-5, 0, buffer);
+     Interface->Flush();
+     }
+}
+
+void cDisplayChannel::DisplayInfo(void)
+{
+  if (withInfo) {
+     const cEventInfo *Present = NULL, *Following = NULL;
+     cThreadLock ThreadLock;
+     const cSchedules *Schedules = cDvbApi::PrimaryDvbApi->Schedules(&ThreadLock);
+     if (Schedules) {
+        const cSchedule *Schedule = Schedules->GetSchedule();
+        if (Schedule) {
+           const char *PresentTitle = NULL, *PresentSubtitle = NULL, *FollowingTitle = NULL, *FollowingSubtitle = NULL;
+           int Lines = 0;
+           if ((Present = Schedule->GetPresentEvent()) != NULL) {
+              PresentTitle = Present->GetTitle();
+              if (!isempty(PresentTitle))
+                 Lines++;
+              PresentSubtitle = Present->GetSubtitle();
+              if (!isempty(PresentSubtitle))
+                 Lines++;
+              }
+           if ((Following = Schedule->GetFollowingEvent()) != NULL) {
+              FollowingTitle = Following->GetTitle();
+              if (!isempty(FollowingTitle))
+                 Lines++;
+              FollowingSubtitle = Following->GetSubtitle();
+              if (!isempty(FollowingSubtitle))
+                 Lines++;
+              }
+           if (Lines > lines) {
+              const int t = 6;
+              int l = 1;
+              Interface->Fill(0, 1, MenuColumns, Lines, clrBackground);
+              if (!isempty(PresentTitle)) {
+                 Interface->Write(0, l, Present->GetTimeString(), clrYellow, clrBackground);
+                 Interface->Write(t, l, PresentTitle, clrCyan, clrBackground);
+                 l++;
+                 }
+              if (!isempty(PresentSubtitle)) {
+                 Interface->Write(t, l, PresentSubtitle, clrCyan, clrBackground);
+                 l++;
+                 }
+              if (!isempty(FollowingTitle)) {
+                 Interface->Write(0, l, Following->GetTimeString(), clrYellow, clrBackground);
+                 Interface->Write(t, l, FollowingTitle, clrCyan, clrBackground);
+                 l++;
+                 }
+              if (!isempty(FollowingSubtitle)) {
+                 Interface->Write(t, l, FollowingSubtitle, clrCyan, clrBackground);
+                 }
+              Interface->Flush();
+              lines = Lines;
+              lastTime = time_ms();
+              }
+           }
+        }
+     }
+}
+
+eOSState cDisplayChannel::ProcessKey(eKeys Key)
 {
   switch (Key) {
-    case k0 ... k9:
+    case k0:
+         if (number == 0) {
+            // keep the "Toggle channels" function working
+            Interface->PutKey(Key);
+            return osEnd;
+            }
+    case k1 ... k9:
          if (number >= 0) {
             number = number * 10 + Key - k0;
-            cChannel *channel = Channels.GetByNumber(number);
-            const char *Name = channel ? channel->name : "*** Invalid Channel ***";
-            int BufSize = MenuColumns + 1;
-            char buffer[BufSize];
-            snprintf(buffer, BufSize, "%d  %s", number, Name);
-            Interface->DisplayChannel(number);
-            Interface->Clear();
-            Interface->Write(0, 0, buffer);
-            lastTime = time_ms();
-            if (!channel) {
-               number = -1;
-               lastTime += 1000;
+            if (number > 0) {
+               cChannel *channel = Channels.GetByNumber(number);
+               DisplayChannel(channel);
+               lastTime = time_ms();
+               if (!channel) {
+                  number = -1;
+                  lastTime += 1000;
+                  }
                }
             }
          break;
     case kNone:
-         if (time_ms() - lastTime > DIRECTCHANNELTIMEOUT) {
+         if (number && time_ms() - lastTime > DIRECTCHANNELTIMEOUT) {
             if (number > 0 && !Channels.SwitchTo(number))
                number = -1;
+            return osEnd;
             }
-         else
-            break;
-    default: return osEnd;
+         break;
+    //TODO
+    //XXX case kGreen:  return osEventNow;
+    //XXX case kYellow: return osEventNext;
+    case kOk:     if (group)
+                     Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(CurrentGroup))->number);
+                  return osEnd;
+    default:      Interface->PutKey(Key);
+                  return osEnd;
     };
-  return osContinue;
+  if (time_ms() - lastTime < INFOTIMEOUT) {
+     DisplayInfo();
+     return osContinue;
+     }
+  return osEnd;
 }
 
 // --- cRecordControl --------------------------------------------------------
diff --git a/menu.h b/menu.h
index c36427f12..d979069e4 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.12 2000/10/08 15:21:52 kls Exp $
+ * $Id: menu.h 1.13 2000/11/01 14:03:09 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -24,14 +24,18 @@ class cMenuMain : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
   
-class cDirectChannelSelect : public cOsdBase {
+class cDisplayChannel : public cOsdBase {
 private:
-  int oldNumber;
-  int number;
+  bool withInfo, group;
+  int lines;
   int lastTime;
+  int oldNumber, number;
+  void DisplayChannel(const cChannel *Channel);
+  void DisplayInfo(void);
 public:
-  cDirectChannelSelect(eKeys FirstKey);
-  virtual ~cDirectChannelSelect();
+  cDisplayChannel(int Number, bool Switched, bool Group = false);
+  cDisplayChannel(eKeys FirstKey);
+  virtual ~cDisplayChannel();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/osd.c b/osd.c
index 75d9eadeb..f3458274b 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.9 2000/10/08 12:20:34 kls Exp $
+ * $Id: osd.c 1.11 2000/11/01 11:21:51 kls Exp $
  */
 
 #include "osd.h"
@@ -24,7 +24,7 @@ cOsdItem::cOsdItem(eOSState State)
   bgColor = clrBackground;
 }
 
-cOsdItem::cOsdItem(char *Text, eOSState State)
+cOsdItem::cOsdItem(const char *Text, eOSState State)
 {
   text = NULL;
   offset = -1;
@@ -74,7 +74,7 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
 
 // --- cOsdMenu --------------------------------------------------------------
 
-cOsdMenu::cOsdMenu(char *Title, int c0, int c1, int c2, int c3, int c4)
+cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
   visible = false;
   title = strdup(Title);
@@ -108,6 +108,12 @@ void cOsdMenu::SetStatus(const char *s)
      Interface->Status(status);
 }
 
+void cOsdMenu::SetTitle(const char *Title, bool Copy)
+{
+  delete title;
+  title = Copy ? strdup(Title) : Title;
+}
+
 void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
   // strings are NOT copied - must be constants!!!
@@ -164,7 +170,8 @@ void cOsdMenu::Display(void)
             break;
          }
      }
-  Interface->Status(status);
+  if (!isempty(status))
+     Interface->Status(status);
 }
 
 void cOsdMenu::RefreshCurrent(void)
diff --git a/osd.h b/osd.h
index 876c87cfc..473e87de4 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.11 2000/09/10 09:50:38 kls Exp $
+ * $Id: osd.h 1.14 2000/11/01 14:29:07 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -19,6 +19,7 @@
 enum eOSState { osUnknown,
                 osMenu,
                 osContinue,
+                osSchedule,
                 osChannels,
                 osTimer,
                 osRecordings,
@@ -43,13 +44,13 @@ class cOsdItem : public cListObject {
   eDvbColor fgColor, bgColor; 
 public:
   cOsdItem(eOSState State = osUnknown);
-  cOsdItem(char *Text, eOSState State = osUnknown);
+  cOsdItem(const char *Text, eOSState State = osUnknown);
   virtual ~cOsdItem();
   bool HasUserColor(void) { return userColor; }
   void SetText(const char *Text, bool Copy = true);
   void SetColor(eDvbColor FgColor, eDvbColor BgColor = clrBackground);
   const char *Text(void) { return text; }
-  void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
+  virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   virtual void Set(void) {}
   virtual eOSState ProcessKey(eKeys Key);
   };
@@ -60,13 +61,15 @@ class cOsdBase {
 public:
   cOsdBase(bool FastResponse = false) { needsFastResponse = FastResponse; }
   virtual ~cOsdBase() {}
-  virtual eOSState ProcessKey(eKeys Key) = 0;
+  int Width(void) { return Interface->Width(); }
+  int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
+  virtual eOSState ProcessKey(eKeys Key) = 0;
   };
 
 class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
 private:
-  char *title;
+  const char *title;
   int cols[cInterface::MaxCols];
   int first, current, marked;
   cOsdMenu *subMenu;
@@ -83,10 +86,11 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   eOSState AddSubMenu(cOsdMenu *SubMenu);
   bool HasSubMenu(void) { return subMenu; }
   void SetStatus(const char *s);
+  void SetTitle(const char *Title, bool Copy = true);
   void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   virtual void Del(int Index);
 public:
-  cOsdMenu(char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
+  cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
   int Current(void) { return current; }
   void Add(cOsdItem *Item, bool Current = false);
diff --git a/recording.c b/recording.c
index f9ab01621..3ddf8d350 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.19 2000/10/08 12:20:53 kls Exp $
+ * $Id: recording.c 1.20 2000/11/01 16:00:36 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -86,6 +86,13 @@ cRecording::cRecording(cTimer *Timer)
   titleBuffer = NULL;
   fileName = NULL;
   name = strdup(Timer->file);
+  // substitute characters that would cause problems in file names:
+  for (char *p = name; *p; p++) {
+      switch (*p) {
+        case '\n': *p = ' '; break;
+        case '/':  *p = '-'; break; 
+        }
+      }
   summary = Timer->summary ? strdup(Timer->summary) : NULL;
   if (summary)
      strreplace(summary, '|', '\n');
diff --git a/setup.conf b/setup.conf
deleted file mode 100644
index e7ec26747..000000000
--- a/setup.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# VDR Setup
-PrimaryDVB         = 1
-ShowInfoOnChSwitch = 1
-MenuScrollPage     = 1
-MarkInstantRecord  = 1
-LnbFrequLo         = 9750
-LnbFrequHi         = 10600
diff --git a/thread.c b/thread.c
index 7304e682a..b124581fc 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.2 2000/10/08 16:45:50 kls Exp $
+ * $Id: thread.c 1.3 2000/10/28 15:26:02 kls Exp $
  */
 
 #include "thread.h"
@@ -88,16 +88,27 @@ void cThread::WakeUp(void)
 
 cThreadLock::cThreadLock(cThread *Thread)
 {
-  thread = Thread;
-  locked = Thread->Lock();
+  thread = NULL;
+  locked = false;
+  Lock(Thread);
 }
 
 cThreadLock::~cThreadLock()
 {
-  if (locked)
+  if (thread && locked)
      thread->Unlock();
 }
 
+bool cThreadLock::Lock(cThread *Thread)
+{
+  if (Thread && !thread) {
+     thread = Thread;
+     locked = Thread->Lock();
+     return locked;
+     }
+  return false;
+}
+
 bool cThreadLock::Locked(void)
 {
   return locked;
diff --git a/thread.h b/thread.h
index 86b9e922c..b47f6d715 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.1 2000/10/08 08:36:21 kls Exp $
+ * $Id: thread.h 1.2 2000/10/28 15:08:09 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -47,8 +47,9 @@ class cThreadLock {
   cThread *thread;
   bool locked;
 public:
-  cThreadLock(cThread *Thread);
+  cThreadLock(cThread *Thread = NULL);
   ~cThreadLock();
+  bool Lock(cThread *Thread);
   bool Locked(void);
   };
 
diff --git a/timers.conf b/timers.conf
index fc0e12a60..8f6bcf2fb 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,16 +1,15 @@
 1:15:M------:2128:2205:99:7:Neues:
 1:3:-T-----:2013:2125:99:99:SevenDays:
 1:10:-T-----:2058:2202:99:10:Quarks:
-1:26:-T-----:2320:0040:99:99:UFO:
+1:26:-T-----:2250:0005:99:99:UFO:
 1:14:--W----:1920:2020:99:99:Rettungsflieger:
-1:2:--W----:2110:2325:99:99:BulleVonToelz:
+0:2:--W----:2110:2325:99:99:BulleVonToelz:
 1:3:---T---:2210:2315:99:10:IngoAppelt:
-0:2:----F--:2140:2225:10:10:WWW:
-1:1:----F--:2212:2325:99:99:7Tage7Koepfe:
+1:2:----F--:2013:2125:99:99:Farscape:
+1:1:----F--:2215:2325:99:99:7Tage7Koepfe:
 1:11:-----S-:2058:2135:99:99:Computer:
-1:2:-----S-:2211:2340:99:30:Wochenshow:
+1:2:-----S-:2250:0005:99:30:Wochenshow:
 1:11:------S:2013:2035:99:10:Centauri:
-1:14:------S:2158:2235:99:14:MaxUndLisa:
 1:15:MTWTF--:1828:1901:10:5:nano:
-1:1:-TWTF--:0955:1040:99:99:Ellen:
 1:1:MTWTF--:1553:1710:99:99:Hammerman:
+1:3:3:0220:0350:99:99:Seven Days - Das Tor zur Zeit:Die Rache des Alien||Als das Zeitsprung-Team die Leiche eines bei Roswell gefundenen Aliens obduziert, entdecken sie einen Chip in seiner Wirbels�ule. Dr. Ballard, der �hnliche R�ckenprobleme wie der Alien hat, l�sst sich den Chip einsetzen. Tats�chlich regeneriert Ballard vollst�ndig. Doch dann �ndert sich sein Verhalten: Er wird dem Alien immer �hnlicher. Schlie�lich gelingt es ihm, mit einer Superwaffe Millionen Menschen zu t�ten - einschlie�lich des Zeitsprung-Teams. Nur Parker �berlebt.
diff --git a/tools.c b/tools.c
index fc15a9853..4acea0b3d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.21 2000/10/07 18:02:24 kls Exp $
+ * $Id: tools.c 1.22 2000/10/29 11:21:55 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -85,11 +85,16 @@ char *strreplace(char *s, char c1, char c2)
   return s;
 }
 
-char *skipspace(char *s)
+char *skipspace(const char *s)
 {
   while (*s && isspace(*s))
         s++;
-  return s;
+  return (char *)s;
+}
+
+bool isempty(const char *s)
+{
+  return !(s && *skipspace(s));
 }
 
 int time_ms(void)
@@ -520,7 +525,7 @@ void cListBase::Clear(void)
   objects = lastObject = NULL;
 }
 
-cListObject *cListBase::Get(int Index)
+cListObject *cListBase::Get(int Index) const
 {
   if (Index < 0)
      return NULL;
@@ -530,7 +535,7 @@ cListObject *cListBase::Get(int Index)
   return object;
 }
 
-int cListBase::Count(void)
+int cListBase::Count(void) const
 {
   int n = 0;
   cListObject *object = objects;
diff --git a/tools.h b/tools.h
index 17b643ffb..b5bdd278d 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.17 2000/10/07 18:00:21 kls Exp $
+ * $Id: tools.h 1.18 2000/10/29 11:19:20 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -40,7 +40,8 @@ void purge(int filedes);
 char *readline(FILE *f);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
-char *skipspace(char *s);
+char *skipspace(const char *s);
+bool isempty(const char *s);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
@@ -80,8 +81,8 @@ class cListObject {
   void Append(cListObject *Object);
   void Unlink(void);
   int Index(void);
-  cListObject *Prev(void) { return prev; }
-  cListObject *Next(void) { return next; }
+  cListObject *Prev(void) const { return prev; }
+  cListObject *Next(void) const { return next; }
   };
 
 class cListBase {
@@ -95,15 +96,15 @@ class cListBase {
   virtual void Move(int From, int To);
   void Move(cListObject *From, cListObject *To);
   void Clear(void);
-  cListObject *Get(int Index);
-  int Count(void);
+  cListObject *Get(int Index) const;
+  int Count(void) const;
   };
 
 template<class T> class cList : public cListBase {
 public:
-  T *Get(int Index) { return (T *)cListBase::Get(Index); }
-  T *First(void) { return (T *)objects; }
-  T *Next(T *object) { return (T *)object->Next(); }
+  T *Get(int Index) const { return (T *)cListBase::Get(Index); }
+  T *First(void) const { return (T *)objects; }
+  T *Next(const T *object) const { return (T *)object->Next(); }
   };
 
 #endif //__TOOLS_H
diff --git a/vdr.c b/vdr.c
index c8cabb0b5..b1321aef2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.39 2000/10/08 14:49:25 kls Exp $
+ * $Id: vdr.c 1.41 2000/11/01 14:31:32 kls Exp $
  */
 
 #include <getopt.h>
@@ -161,10 +161,6 @@ int main(int argc, char *argv[])
   if (!cDvbApi::Init())
      abort();
 
-  // User interface:
-
-  Interface = new cInterface(SVDRPport);
-
   // Configuration data:
 
   if (!ConfigDirectory)
@@ -176,14 +172,21 @@ int main(int argc, char *argv[])
 #ifdef REMOTE_LIRC
   Keys.SetDummyValues();
 #else
-  if (!Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF)))
-     Interface->LearnKeys();
+  bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
 #endif
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
   Channels.SwitchTo(CurrentChannel);
 
+  // User interface:
+
+  Interface = new cInterface(SVDRPport);
+#ifndef REMOTE_LIRC
+  if (!KeysLoaded)
+     Interface->LearnKeys();
+#endif
+
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
@@ -202,7 +205,7 @@ int main(int argc, char *argv[])
         // Channel display:
         if (CurrentChannel != LastChannel) {
            if (!Menu)
-              Channels.ShowChannel(CurrentChannel, LastChannel > 0);
+              Menu = new cDisplayChannel(CurrentChannel, LastChannel > 0);
            PreviousChannel = LastChannel;
            LastChannel = CurrentChannel;
            }
@@ -262,7 +265,7 @@ int main(int argc, char *argv[])
              // Direct Channel Select:
              case k1 ... k9:
                   if (!Interface->Recording())
-                     Menu = new cDirectChannelSelect(key);
+                     Menu = new cDisplayChannel(key);
                   break;
              // Left/Right rotates trough channel groups:
              case kLeft|k_Repeat:
@@ -276,8 +279,7 @@ int main(int argc, char *argv[])
                                 CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
                              if (CurrentGroup < 0)
                                 CurrentGroup = SaveGroup;
-                             if (Channels.ShowChannel(CurrentGroup, false, true) == kOk)
-                                Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(CurrentGroup))->number);
+                             Menu = new cDisplayChannel(CurrentGroup, false, true);
                              }
                           break;
              // Up/Down Channel Select:

From 9aa2cda494d7af2733362de78234441a25959e86 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 19 Nov 2000 18:00:00 +0100
Subject: [PATCH 015/307] Version 0.68 - Date and time in the title of an event
 info page are now always right adjusted. - The 'current channel' is now
 handled device specific (in case there is more   than one DVB card). - The
 'SetSystemTime' option in the "Setup" menu is now shown as "yes/no". -
 Implemented "internationalization" (see 'i18n.c' for information on how to  
 add new languages). Thanks to Miha Setina for translating the OSD texts to  
 the Slovenian language. - Fixed learning keys on the PC keyboard (display
 oscillated). - Fixed a timing problem with OSD refresh and SVDRP. - Avoiding
 multiple definitions of the same timer in the "Schedule" menu (this   could
 happen when pressing the "Red" button while editing the timer). - There can
 now be a configuration file named 'commands.conf' that defines   commands
 that can be executed through the "Main" menu's "Commands" option   (see
 FORMATS for details on how to define these commands). - Added a 'fixed' font
 for use with the output of system commands. - The 'Priority' parameter of the
 timers is now also used to interrupt a low   priority timer recording if a
 higher priority timer wants to record. - A timer recording on a DVB card with
 a CAM module will now be interrupted   by a timer that needs to use this
 specific DVB card to record an encrypted   channel, if the timer currently
 occupying this DVB card doesn't need the   CAM module (and thus can continue
 recording on a different DVB card). - The "Yellow" button in the "What's on
 now/next?" menus now displays the   schedule of the current channel from that
 menu. - All DVB cards in a multi-card system now write their EIT information
 into the   same data structure. - If there is more than one DVB card in the
 system, the non-primary cards are   now used to periodically scan through the
 channels in order to keep the   EPG info up-to-date. Scanning kicks in after
 60 seconds of user inactivity   (timeout in order to keep user interactions
 instantaneously) and each channel   that has the 'pnr' parameter defined in
 'channels.conf' is switched to for   20 seconds. If there is only one DVB
 card in the system, that card will start   scanning after 5 hours
 (configurable through the "Setup" menu) of user inactivity   and will switch
 back to the channel it originally displayed at the first sign of   user
 activity. Any scanning will only occur if that particular card is not  
 currently recording or replaying. - Now shifting the 'Subtitle' info into the
 'ExtendedDescription' on stations   that don't send the EIT information
 correctly (like, e.g., 'VOX'). - Implemented a 10 seconds latency when
 removing files. - Fixed unwanted reaction on the "Green" and "Yellow" button
 in the "Event" display. - Implemented 'Transfer Mode' to display video data
 from the DVB card that actually   can receive a certain channel on the
 primary interface. This is currently in   an early state and may still cause
 some problems, but it appears to work nice   already.

---
 BUGS          |    4 +-
 CONTRIBUTORS  |    3 +
 FORMATS       |   31 +-
 HISTORY       |   46 +
 MANUAL        |   43 +-
 Makefile      |   28 +-
 README        |   11 +-
 channels.conf |   66 +-
 config.c      |   97 +-
 config.h      |   30 +-
 dvbapi.c      |  210 +-
 dvbapi.h      |   68 +-
 dvbosd.c      |   19 +-
 dvbosd.h      |    6 +-
 eit.c         |   40 +-
 eit.h         |    7 +-
 font.c        |   16 +-
 font.h        |    3 +-
 fontfix.c     | 6498 +++++++++++++++++++++++++++++++++++++++++++++++++
 i18n.c        |  478 ++++
 i18n.h        |   19 +
 interface.c   |   70 +-
 interface.h   |    3 +-
 menu.c        |  414 +++-
 menu.h        |    4 +-
 osd.c         |   12 +-
 osd.h         |    6 +-
 recording.c   |    7 +-
 remote.c      |    4 +-
 svdrp.c       |   16 +-
 thread.c      |    8 +-
 thread.h      |   14 +-
 timers.conf   |   15 +-
 tools.c       |   14 +-
 tools.h       |    5 +-
 vdr.c         |   38 +-
 36 files changed, 8044 insertions(+), 309 deletions(-)
 create mode 100644 fontfix.c
 create mode 100644 i18n.c
 create mode 100644 i18n.h

diff --git a/BUGS b/BUGS
index d24d37072..506316a50 100644
--- a/BUGS
+++ b/BUGS
@@ -4,5 +4,5 @@ Video Disk Recorder - Known Bugs
 * Sometimes the picture "jumps" as if a frame is skipped.
   Presumably this is a problem in the card driver or firmware?
 
-* The first picture captured with the GRAB command in SVDRP
-  is empty. Also, these pictures appear to be too dark.
+* The pictures captured with the GRAB command in SVDRP
+  appear to be too dark.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index db47d8b9e..279706da6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -40,3 +40,6 @@ Bastian Guse <bastian@nocopy.de>
 
 Matthias Schniedermeyer <ms@citd.de>
  for implementing the 'MarkInstantRecord' setup option.
+
+Miha Setina <mihasetina@softhome.net>
+ for translating the OSD texts to the Slovenian language.
diff --git a/FORMATS b/FORMATS
index 331fe3d55..3eee494f6 100644
--- a/FORMATS
+++ b/FORMATS
@@ -47,8 +47,11 @@ Video Disk Recorder File Formats
       ----F-- = Friday
       -----S- = Saturday
       ------S = Sunday
-    (any combination is possible, for example MTWTF--) or the "day of month" (1..31)
-  - Star time (first two digits for the hour, second two digits for the minutes)
+    (any combination is possible, for example MTWTF--, and the days may be
+    indicated by any characters except '-', so for example ABC---- would set
+    a timer that records on monday, tuesday and wednesday) or the "day of month"
+    (1..31)
+  - Start time (first two digits for the hour, second two digits for the minutes)
   - End time (first two digits for the hour, second two digits for the minutes)
   - Priority (from 00 to 99, 00 = lowest prioity, 99 = highest priority)
   - Guaranteed lifetime of recording (in days)
@@ -63,3 +66,27 @@ Video Disk Recorder File Formats
 
   See the MANUAL file for a description of the available options.
 
+* commands.conf
+
+  This file contains the definitions of commands that can be executed from
+  the "Main" menus "Commands" option.
+
+  Each line contains one command definition in the following format:
+
+    title : command
+
+  where 'title' is the string the will be displayed in the "Commands" menu,
+  and 'command' is the actual command string that will be executed when this
+  option is selected. The delimiting ':' may be surrounded by any number of
+  white space characters.
+
+  In order to avoid error messages to stderr, every command should have
+  stderr redirected to stdout. Everything the command prints to stdout will
+  be displayed in a result window, with 'title' as its title.
+
+  Examples:
+
+    Check for new mail: /usr/local/bin/checkmail 2>&1
+    CPU status        : /usr/loval/bin/cpustatus 2>&1
+    Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+
diff --git a/HISTORY b/HISTORY
index 189fd7b32..485f24a2c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -265,3 +265,49 @@ Video Disk Recorder Revision History
 - Problematic characters in recording names (which can come from timers that
   are programmed via the "Schedules" menu) are now replaced by suitable
   substitutes.
+
+2000-11-19: Version 0.68
+
+- Date and time in the title of an event info page are now always right adjusted.
+- The 'current channel' is now handled device specific (in case there is more
+  than one DVB card).
+- The 'SetSystemTime' option in the "Setup" menu is now shown as "yes/no".
+- Implemented "internationalization" (see 'i18n.c' for information on how to
+  add new languages). Thanks to Miha Setina for translating the OSD texts to
+  the Slovenian language.
+- Fixed learning keys on the PC keyboard (display oscillated).
+- Fixed a timing problem with OSD refresh and SVDRP.
+- Avoiding multiple definitions of the same timer in the "Schedule" menu (this
+  could happen when pressing the "Red" button while editing the timer).
+- There can now be a configuration file named 'commands.conf' that defines
+  commands that can be executed through the "Main" menu's "Commands" option
+  (see FORMATS for details on how to define these commands).
+- Added a 'fixed' font for use with the output of system commands.
+- The 'Priority' parameter of the timers is now also used to interrupt a low
+  priority timer recording if a higher priority timer wants to record.
+- A timer recording on a DVB card with a CAM module will now be interrupted
+  by a timer that needs to use this specific DVB card to record an encrypted
+  channel, if the timer currently occupying this DVB card doesn't need the
+  CAM module (and thus can continue recording on a different DVB card).
+- The "Yellow" button in the "What's on now/next?" menus now displays the
+  schedule of the current channel from that menu. 
+- All DVB cards in a multi-card system now write their EIT information into the
+  same data structure.
+- If there is more than one DVB card in the system, the non-primary cards are
+  now used to periodically scan through the channels in order to keep the
+  EPG info up-to-date. Scanning kicks in after 60 seconds of user inactivity
+  (timeout in order to keep user interactions instantaneously) and each channel
+  that has the 'pnr' parameter defined in 'channels.conf' is switched to for
+  20 seconds. If there is only one DVB card in the system, that card will start
+  scanning after 5 hours (configurable through the "Setup" menu) of user inactivity
+  and will switch back to the channel it originally displayed at the first sign of
+  user activity. Any scanning will only occur if that particular card is not
+  currently recording or replaying.
+- Now shifting the 'Subtitle' info into the 'ExtendedDescription' on stations
+  that don't send the EIT information correctly (like, e.g., 'VOX').
+- Implemented a 10 seconds latency when removing files.
+- Fixed unwanted reaction on the "Green" and "Yellow" button in the "Event" display.
+- Implemented 'Transfer Mode' to display video data from the DVB card that actually
+  can receive a certain channel on the primary interface. This is currently in
+  an early state and may still cause some problems, but it appears to work nice
+  already.
diff --git a/MANUAL b/MANUAL
index ffcc10b86..46466bf8b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -74,8 +74,8 @@ Video Disk Recorder User's Manual
   programmes that will start next on all channels.
 
   Inside the "What's on now/next?" menus the "Green" button toggles between
-  the "Now" and "Next" display, and the "Yellow" button gets you back to the
-  "Schedule" menu of the current channel.
+  the "Now" and "Next" display, and the "Yellow" button takes you to the
+  "Schedule" menu of the current channel in the list.
 
   The "Red" button allows you to instantly program a timer to record the
   selected programme. You will get into the "Edit Timer" menu in which
@@ -203,7 +203,9 @@ Video Disk Recorder User's Manual
              to free space for a new recording. If the disk is full and a new
              recording needs more space, an existing recording with the lowest
              Priority (and which has exceeded its guaranteed Lifetime) will be
-             removed.
+             removed. If all available DVB cards are currently occupied, a
+             timer with a higher priority will interrupt the timer with the
+             lowest priority in order to start recording.
   Lifetime:  The number of days (0..99) a recording made through this timer is
              guaranteed to remain on disk before it is automatically removed
              to free up space for a new recording. Note that setting this
@@ -228,6 +230,10 @@ Video Disk Recorder User's Manual
   displayed as "no" and "yes" in the "Setup" menu, while in the setup file they
   are stored as '0' and '1', respectively):
 
+  OSDLanguage = 0        Defines the language used to display the OSD texts.
+                         0 = Englisch
+                         1 = Deutsch
+
   PrimaryDVB = 1         Defines the primary DVB interface (i.e. the one that
                          will display the menus and will react on input through
                          the remote control). Valid values range from '1' to the
@@ -266,6 +272,37 @@ Video Disk Recorder User's Manual
                          1 = system time wil be set
                          Note that this works only if VDR is running under a user
                          id that has permisson to set the system time.
+
   MarginStart = 2        Defines how many minutes before the official start time
   MarginStop = 10        of a broadcast VDR shall start recording, and how long
                          after the official end time it shall stop recording.
+
+  EPGScanTimeout = 5     The time (in hours) of user inactivity after which the
+                         DVB card in a single card system starts scanning channels
+                         to keep the EPG up-to-date.
+                         A value of '0' turns off scanning on a single card system.
+
+* Executing system commands
+
+  The "Main" menu option "Commands" allows you to execute any system commands
+  defined in the configuration file 'commands.conf' (see FORMATS for details).
+  The "Commands" option will only be present in the "Main" menu if a valid
+  'commands.conf' file containing at least one command definition has been
+  found at program start.
+
+  This feature can be used to do virtually anything, like checking for new
+  mail, displaying the CPU temperature - you name it! All you need to do is
+  enter the necessary command definition into 'commands.conf' and implement
+  the actual command that will be called. Such a command can typically be a
+  shell script or a Perl program. Anything that command writes to stdout will
+  be displayed on a result screen after executing the command. This screen will
+  use a 'fixed' font so that you can generate formatted output. In order to
+  avoid error messages going to stderr, command definitions should redirect
+  stderr to stdout (see FORMATS).
+
+  WARNING: THE COMMANDS DEFINED IN 'commands.conf' WILL BE EXECUTED UNDER THE
+  =======  SAME USER ID THAT VDR IS RUNNING WITH. BE VERY CAREFUL WHEN
+           DEFINING THESE COMMANDS AND MAKE SURE THEY DON'T HARM YOUR SYSTEM,
+           ESPECIALLY IF YOU ARE RUNNING VDR UNDER A HIGH PRIVILEGED USER ID
+           (LIKE 'root').
+
diff --git a/Makefile b/Makefile
index 9db79f395..739d3942b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,16 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.14 2000/10/28 16:24:16 kls Exp $
+# $Id: Makefile 1.16 2000/11/18 14:58:10 kls Exp $
 
 DVBDIR   = ../DVB
 
 INCLUDES = -I$(DVBDIR)/driver
-OBJS = config.o dvbapi.o dvbosd.o eit.o font.o interface.o menu.o osd.o\
+OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o osd.o\
        recording.o remote.o svdrp.o thread.o tools.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
+FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
 
 ifndef REMOTE
 REMOTE = KBD
@@ -25,8 +26,8 @@ DEFINES += -DDEBUG_OSD
 endif
 
 all: vdr
-font: genfontfile fontosd.c
-	@echo "font file created."
+font: genfontfile fontfix.c fontosd.c
+	@echo "font files created."
 
 # Implicit rules:
 
@@ -35,20 +36,21 @@ font: genfontfile fontosd.c
 
 # Dependencies:
 
-config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
+config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
 dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h videodir.h
 dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
 eit.o      : eit.c eit.h thread.h tools.h
-font.o     : font.c font.h fontosd.c tools.h
-interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
-menu.o     : menu.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
-osd.o      : osd.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h osd.h remote.h svdrp.h thread.h tools.h
+font.o     : font.c font.h fontfix.c fontosd.c tools.h
+i18n.o     : i18n.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h thread.h tools.h
+interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
+menu.o     : menu.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
+osd.o      : osd.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
 recording.o: recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 remote.o   : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
 svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
 thread.o   : thread.c thread.h
 tools.o    : tools.c tools.h
-vdr.o      : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
+vdr.o      : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
 
 # The main program:
@@ -56,8 +58,10 @@ videodir.o : videodir.c tools.h videodir.h
 vdr: $(OBJS)
 	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread -o vdr
 
-# The font file:
+# The font files:
 
+fontfix.c:
+	genfontfile "cFont::tPixelData FontFix" $(FIXFONT) > $@
 fontosd.c:
 	genfontfile "cFont::tPixelData FontOsd" $(OSDFONT) > $@
 
@@ -73,4 +77,4 @@ genfontfile: genfontfile.o
 clean:
 	-rm -f $(OBJS) vdr genfontfile genfontfile.o
 CLEAN: clean
-	-rm -f fontosd.c
+	-rm -f fontfix.c fontosd.c
diff --git a/README b/README
index cfc10a765..b1e071ee0 100644
--- a/README
+++ b/README
@@ -1,9 +1,8 @@
-On Screen Menu for the Video Disk Recorder
-------------------------------------------
+Video Disk Recorder ('VDR')
+---------------------------
 
-These files contain the source code of an on screen
-menu for a video disk recorder based on the DVB driver
-of the LinuxTV project (http://linuxtv.org).
+These files contain the source code of the "Video Disk Recorder",
+which is based on the DVB driver of the LinuxTV project (http://linuxtv.org).
 For details about the "Video Disk Recorder" project please
 refer to http://www.cadsoft.de/people/kls/vdr.
 
@@ -13,6 +12,8 @@ Web pages, which can be used within this program.
 Please see the INSTALL file for details on how to install
 this program on your computer.
 
+The MANUAL file describes how to operate the VDR.
+
 The author can be contacted at kls@cadsoft.de.
 
 Yet another "set-top-box"?
diff --git a/channels.conf b/channels.conf
index c61669cab..ce30919e9 100644
--- a/channels.conf
+++ b/channels.conf
@@ -6,7 +6,6 @@ ARD:11837:h:1:27500:101:102:0:28106
 BR3:11837:h:1:27500:201:202:0:28107
 Hessen-3:11837:h:1:27500:301:302:0:28108
 N3:12110:h:1:27500:2401:2402:0:28224
-:Group 1
 SR3:11837:h:1:27500:501:502:0:28110
 WDR:11837:h:1:27500:601:602:0:28111
 BR-alpha:11837:h:1:27500:701:702:0:28112
@@ -16,25 +15,24 @@ ZDF:11954:h:1:27500:110:120:0:28006
 3sat:11954:h:1:27500:210:220:0:28007
 KiKa:11954:h:1:27500:310:320:0:28008
 arte:11836:h:1:27500:401:402:0:28109
-:Group 2
-Eurosport:11954:h:1:27500:410:420:0:28009
 ORF Sat:11954:h:1:27500:506:507:0:28010
 ZDF.info:11954:h:1:27500:610:620:0:28011
-:Group 3
-CNN:12168:v:1:27500:165:100:0:0
+CNN:12168:v:1:27500:165:100:0:28512
 Super RTL:12188:h:1:27500:165:120:0:12040
 VOX:12188:h:1:27500:167:136:0:12060
 DW TV:12363:v:1:27500:305:306:0:8905
 Kabel 1:12480:v:1:27500:511:512:0:899
-TM3:12480:v:1:27500:767:768:0:0
-DSF:12480:v:1:27500:1023:1024:0:0
-HOT:12480:v:1:27500:1279:1280:0:0
-BloombergTV:12552:v:1:22000:162:99:0:0
+tm3:12480:v:1:27500:767:768:0:897
+DSF:12480:v:1:27500:1023:1024:0:900
+HOT:12480:v:1:27500:1279:1280:0:40
+Bloomberg TV Germany:12551:v:1:22000:162:99:0:12160
+BLOOMBERG TV:11817:v:1:27500:163:92:0:8004
+Bloomberg:12168:v:1:27500:167:112:0:12721
 Sky News:12552:v:1:22000:305:306:0:3995
-KinderNet:12574:h:1:22000:163:92:0:0
-Alice:12610:v:1:22000:162:96:0:0
-n-tv:12670:v:1:22000:162:96:0:0
-Grand Tourisme:12670:v:1:22000:289:290:0:0
+KinderNet:12574:h:1:22000:163:92:0:5020
+Alice:12610:v:1:22000:162:96:0:12200
+n-tv:12669:v:1:22000:162:96:0:12730
+Grand Tourisme:12670:v:1:22000:289:290:0:17300
 TW1:12692:h:1:22000:166:167:0:13013
 Eurosport:11954:h:1:27500:410:420:0:28009
 EinsExtra:12110:H:1:27500:101:102:0:28201
@@ -43,10 +41,12 @@ EinsMuXx:12110:H:1:27500:301:302:0:28203
 ZDF Theaterkanal:11954:H:1:27500:1110:1120:0:28016
 ZDF.doku:11954:H:1:27500:660:670:0:28014
 MDR:12110:h:1:27500:401:402:0:28204
+NICK-PARAMOUNT:12246:v:1:27500:167:108:0:29312
 ORB:12110:h:1:27500:501:502:0:28205
 B1:12110:h:1:27500:601:602:0:28206
 ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
-Premiere World Promo:11798:h:1:27500:255:256:0:0
+:Premiere World
+Premiere World Promo:11798:h:1:27500:255:256:0:8
 Premiere:11798:h:1:27500:511:512:2:10
 Star Kino:11798:h:1:27500:767:768:2:9
 Cine Action:11798:h:1:27500:1023:1024:2:20
@@ -54,9 +54,31 @@ Cine Comedy:11798:h:1:27500:1279:1280:2:29
 Sci Fantasy:11798:h:1:27500:1535:1536:2:41
 Romantic Movies:11798:h:1:27500:1791:1792:2:11
 Studio Universal:11798:h:1:27500:2047:2048:2:21
-TV Niepokalanow:11876:h:1:27500:305:321:0:0
-Mosaico:11934:v:1:27500:165:100:0:0
-Andalucia TV:11934:v:1:27500:166:104:0:0
+13th Street:11797:h:1:27500:2303:2304:2:43
+Junior:12031:h:1:27500:255:256:2:19
+K-Toon:12032:h:1:27500:511:512:2:12
+Disney Channel:12031:h:1:27500:767:768:2:15
+Fox Kids:11798:h:1:27500:255:256:2:0
+Sunset:12031:h:1:27500:1023:1024:2:16
+Comedy:12031:h:1:27500:1279:1280:2:28
+Planet:12031:h:1:27500:2047:2048:2:13
+Discovery Channel:12031:h:1:27500:1791:1792:2:14
+Krimi&Co:12031:h:1:27500:1535:1536:2:23
+Filmpalast:12090:v:1:27500:255:256:2:36
+Heimatkanal:11758:h:1:27500:2815:2816:2:517
+Goldstar:11758:h:1:27500:3839:3840:2:518
+Classica:12090:v:1:27500:767:768:2:34
+Seasons:12090:v:1:27500:511:512:2:33
+Blue Channel:11758:h:1:27500:2559:2560:2:516
+Feed (F1 Boxengasse):11720:h:1:27500:2559:2560:2:242
+Feed (F1 Data):11720:h:1:27500:3071:3072:2:244
+Feed (F1 Multi):11720:h:1:27500:2815:2816:2:243
+Feed (F1 On Board):11720:h:1:27500:2303:2304:2:241
+Feed (F1 Verfolger):11720:h:1:27500:2047:2048:2:240
+:
+TV Niepokalanow:11876:h:1:27500:305:321:0:20601
+Mosaico:11934:v:1:27500:165:100:0:29010
+Andalucia TV:11934:v:1:27500:166:104:0:29011
 TVC Internacional:11934:v:1:27500:167:108:0:0
 Nasza TV:11992:h:1:27500:165:98:0:0
 WishLine test:12012:v:1:27500:163:90:0:0
@@ -96,7 +118,7 @@ ESC 1:12363:v:1:27500:163:104:0:0
 TV5 Europe:12363:v:1:27500:164:112:0:0
 TV7 Tunisia:12363:v:1:27500:166:128:0:0
 ARTE:12363:v:1:27500:167:137:0:0
-RAI Uno:12363:v:1:27500:289:290:0:0
+RAI Uno:12363:v:1:27500:289:290:0:8904
 RTP International:12363:v:1:27500:300:301:0:0
 Fashion TV:12402:v:1:27500:163:92:0:0
 VideoService:12422:h:1:27500:255:256:0:0
@@ -116,6 +138,10 @@ Astra Vision 1:12552:v:1:22000:168:150:0:0
 RTL Tele Letzebuerg:12552:v:1:22000:168:144:0:0
 Astra Mosaic:12552:v:1:22000:175:176:0:0
 MHP test:12604:h:1:22000:5632:8191:0:0
-Bloomberg TV Germany:12552:v:1:22000:162:99:0:12160
-Video Italia:12610:v:1:22000:121:122:0:0
+VERONICA:12574:h:1:22000:161:84:0:5010
+VH1 Classic:12699:v:1:22000:3071:3072:0:28647
+VH-1 Germany:12699:v:1:22000:3081:3082:0:28648
+Via 1 - Sch�ner Reisen:12148:h:1:27500:511:512:0:44
+Video Italia:12610:v:1:22000:121:122:0:12220
 AC 3 promo:12670:v:1:22000:308:256:0:0
+ORF/ZDF:12699:h:1:22000:506:507:0:13012
diff --git a/config.c b/config.c
index 5b485f663..8964e5a04 100644
--- a/config.c
+++ b/config.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.29 2000/11/01 18:22:43 kls Exp $
+ * $Id: config.c 1.34 2000/11/18 13:26:36 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include "dvbapi.h"
+#include "i18n.h"
 #include "interface.h"
 
 // -- cKeys ------------------------------------------------------------------
@@ -256,22 +257,23 @@ bool cChannel::Save(FILE *f)
   return fprintf(f, ToText()) > 0;
 }
 
-bool cChannel::Switch(cDvbApi *DvbApi)
+bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
 {
   if (!DvbApi)
      DvbApi = cDvbApi::PrimaryDvbApi;
   if (!DvbApi->Recording() && !groupSep) {
-     isyslog(LOG_INFO, "switching to channel %d", number);
-     CurrentChannel = number;
+     if (Log) {
+        isyslog(LOG_INFO, "switching to channel %d", number);
+        }
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
+         if (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
          esyslog(LOG_ERR, "retrying");
          }
      return false;
      }
   if (DvbApi->Recording())
-     Interface->Info("Channel locked (recording)!");
+     Interface->Info(tr("Channel locked (recording)!"));
   return false;
 }
 
@@ -284,7 +286,7 @@ cTimer::cTimer(bool Instant)
   startTime = stopTime = 0;
   recording = false;
   active = Instant;
-  cChannel *ch = Channels.GetByNumber(CurrentChannel);
+  cChannel *ch = Channels.GetByNumber(cDvbApi::CurrentChannel());
   channel = ch ? ch->number : 0;
   time_t t = time(NULL);
   struct tm *now = localtime(&t);
@@ -294,8 +296,8 @@ cTimer::cTimer(bool Instant)
   if (stop >= 2400)
      stop -= 2400;
 //TODO VPS???
-  priority = 99;
-  lifetime = 99;
+  priority = DEFAULTPRIORITY;
+  lifetime = DEFAULTLIFETIME;
   *file = 0;
   summary = NULL;
   if (Instant && ch)
@@ -319,8 +321,8 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   stop = time->tm_hour * 100 + time->tm_min;
   if (stop >= 2400)
      stop -= 2400;
-  priority = 99;
-  lifetime = 99;
+  priority = DEFAULTPRIORITY;
+  lifetime = DEFAULTLIFETIME;
   *file = 0;
   const char *Title = EventInfo->GetTitle();
   if (!isempty(Title))
@@ -406,7 +408,7 @@ const char *cTimer::PrintDay(int d)
   static char buffer[8];
   if ((d & 0x80000000) != 0) {
      char *b = buffer;
-     char *w = "MTWTFSS";
+     const char *w = tr("MTWTFSS");
      *b = 0;
      while (*w) {
            *b++ = (d & 1) ? *w : '-';
@@ -426,7 +428,7 @@ bool cTimer::Parse(const char *s)
   delete summary;
   summary = NULL;
   //XXX Apparently sscanf() doesn't work correctly if the last %a argument
-  //XXX results in an empty string (this firt occured when the EIT gathering
+  //XXX results in an empty string (this first occured when the EIT gathering
   //XXX was put into a separate thread - don't know why this happens...
   //XXX As a cure we copy the original string and add a blank.
   //XXX If anybody can shed some light on why sscanf() failes here, I'd love
@@ -539,13 +541,71 @@ cTimer *cTimer::GetMatch(void)
   return t0;
 }
 
+// --- cCommand -------------------------------------------------------------
+
+char *cCommand::result = NULL;
+
+cCommand::cCommand(void)
+{
+  title = command = NULL;
+}
+
+cCommand::~cCommand()
+{
+  delete title;
+  delete command;
+}
+
+bool cCommand::Parse(const char *s)
+{
+  const char *p = strchr(s, ':');
+  if (p) {
+     int l = p - s;
+     if (l > 0) {
+        title = new char[l + 1];
+        strn0cpy(title, s, l + 1);
+        if (!isempty(title)) {
+           command = stripspace(strdup(skipspace(p + 1)));
+           return !isempty(command);
+           }
+        }
+     }
+  return false;
+}
+
+const char *cCommand::Execute(void)
+{
+  dsyslog(LOG_INFO, "executing command '%s'", command);
+  delete result;
+  result = NULL;
+  FILE *p = popen(command, "r");
+  if (p) {
+     int l = 0;
+     int c;
+     while ((c = fgetc(p)) != EOF) {
+           if (l % 20 == 0)
+              result = (char *)realloc(result, l + 21);
+           result[l++] = c;
+           }
+     if (result)
+        result[l] = 0;
+     pclose(p);
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: can't open pipe for command '%s'", command);
+  return result;
+}
+
 // -- cKeys ------------------------------------------------------------------
 
 cKeys Keys;
 
+// -- cCommands --------------------------------------------------------------
+
+cCommands Commands;
+
 // -- cChannels --------------------------------------------------------------
 
-int CurrentChannel = 1;
 int CurrentGroup = -1;
 
 cChannels Channels;
@@ -652,6 +712,7 @@ char *cSetup::fileName = NULL;
 
 cSetup::cSetup(void)
 {
+  OSDLanguage = 0;
   PrimaryDVB = 1;
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
@@ -661,6 +722,7 @@ cSetup::cSetup(void)
   SetSystemTime = 0;
   MarginStart = 2;
   MarginStop = 10;
+  EPGScanTimeout = 5;
 }
 
 bool cSetup::Parse(char *s)
@@ -669,7 +731,8 @@ bool cSetup::Parse(char *s)
   char *Name  = strtok(s, Delimiters);
   char *Value = strtok(NULL, Delimiters);
   if (Name && Value) {
-     if      (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
+     if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
+     else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
      else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
      else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
      else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
@@ -678,6 +741,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
      else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
      else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
+     else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
      else
         return false;
      return true;
@@ -719,6 +783,7 @@ bool cSetup::Save(const char *FileName)
      FILE *f = fopen(FileName, "w");
      if (f) {
         fprintf(f, "# VDR Setup\n");
+        fprintf(f, "OSDLanguage        = %d\n", OSDLanguage);
         fprintf(f, "PrimaryDVB         = %d\n", PrimaryDVB);
         fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
         fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
@@ -727,7 +792,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
         fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
         fprintf(f, "MarginStart        = %d\n", MarginStart);
-        fprintf(f, "MarginStop         = %d\n", MarginStop);
+        fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
         fclose(f);
         isyslog(LOG_INFO, "saved setup to %s", FileName);
         return true;
diff --git a/config.h b/config.h
index f9bd579e7..db3f1edc9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.29 2000/11/01 13:42:29 kls Exp $
+ * $Id: config.h 1.34 2000/11/18 13:25:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.67"
+#define VDRVERSION "0.68"
 
 #define MaxBuffer 10000
 
@@ -92,9 +92,12 @@ class cChannel : public cListObject {
   const char *ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
-  bool Switch(cDvbApi *DvbApi = NULL);
+  bool Switch(cDvbApi *DvbApi = NULL, bool Log = true);
   };
 
+#define DEFAULTPRIORITY 99
+#define DEFAULTLIFETIME 99
+
 class cTimer : public cListObject {
 private:
   time_t startTime, stopTime;
@@ -115,7 +118,7 @@ class cTimer : public cListObject {
   char *summary;
   cTimer(bool Instant = false);
   cTimer(const cEventInfo *EventInfo);
-  ~cTimer();
+  virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
   const char *ToText(void);
   bool Parse(const char *s);
@@ -132,6 +135,19 @@ class cTimer : public cListObject {
   static const char *PrintDay(int d);
   };
 
+class cCommand : public cListObject {
+private:
+  char *title;
+  char *command;
+  static char *result;
+public:
+  cCommand(void);
+  virtual ~cCommand();
+  bool Parse(const char *s);
+  const char *Title(void) { return title; }
+  const char *Execute(void);
+  };
+
 template<class T> class cConfig : public cList<T> {
 private:
   char *fileName;
@@ -217,12 +233,14 @@ class cTimers : public cConfig<cTimer> {
   cTimer *GetTimer(cTimer *Timer);
   };
 
-extern int CurrentChannel;
+class cCommands : public cConfig<cCommand> {};
+
 extern int CurrentGroup;
 
 extern cChannels Channels;
 extern cTimers Timers;
 extern cKeys Keys;
+extern cCommands Commands;
 
 class cSetup {
 private:
@@ -230,6 +248,7 @@ class cSetup {
   bool Parse(char *s);
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
+  int OSDLanguage;
   int PrimaryDVB;
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
@@ -238,6 +257,7 @@ class cSetup {
   int LnbFrequHi;
   int SetSystemTime;
   int MarginStart, MarginStop;
+  int EPGScanTimeout;
   cSetup(void);
   bool Load(const char *FileName);
   bool Save(const char *FileName = NULL);
diff --git a/dvbapi.c b/dvbapi.c
index cc246d2f0..5e4f2e647 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.34 2000/11/01 09:19:27 kls Exp $
+ * $Id: dvbapi.c 1.40 2000/11/19 16:46:37 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -372,7 +372,9 @@ class cRingBuffer {
   int *inFile, *outFile;
 protected:
   int Free(void) { return ((tail >= head) ? size + head - tail : head - tail) - 1; }
+public:
   int Available(void) { return (tail >= head) ? tail - head : size - head + tail; }
+protected:
   int Readable(void) { return (tail >= head) ? size - tail - (head ? 0 : 1) : head - tail - 1; } // keep a 1 byte gap!
   int Writeable(void) { return (tail >= head) ? tail - head : size - head; }
   int Byte(int Offset);
@@ -1079,6 +1081,63 @@ int cReplayBuffer::Write(int Max)
   return Written;
 }
 
+// --- cTransferBuffer -------------------------------------------------------
+
+class cTransferBuffer : public cThread {
+private:
+  bool active;
+  int fromDevice, toDevice;
+protected:
+  virtual void Action(void);
+public:
+  cTransferBuffer(int FromDevice, int ToDevice);
+  virtual ~cTransferBuffer();
+  };
+
+cTransferBuffer::cTransferBuffer(int FromDevice, int ToDevice)
+{
+  fromDevice = FromDevice;
+  toDevice = ToDevice;
+  active = true;
+  Start();
+}
+
+cTransferBuffer::~cTransferBuffer()
+{
+  {
+    LOCK_THREAD;
+    active = false;
+  }
+  for (time_t t0 = time(NULL); time(NULL) - t0 < 3; ) {
+      LOCK_THREAD;
+      if (active)
+         break;
+      }
+}
+
+void cTransferBuffer::Action(void)
+{
+  dsyslog(LOG_INFO, "data transfer thread started (pid=%d)", getpid());
+  //XXX hack to make the video device go into 'replaying' mode:
+  char *dummy = "AV"; // must be "AV" to make the driver go into AV_PES mode!
+  write(toDevice, dummy, strlen(dummy));
+  {
+    cRingBuffer Buffer(&fromDevice, &toDevice, VIDEOBUFSIZE, 0, 0);
+    while (active && Buffer.Available() < 100000) { // need to give the read buffer a head start
+          Buffer.Read(); // initializes fromDevice for reading
+          usleep(1); // this keeps the CPU load low
+          }
+    for (; active;) {
+        if (Buffer.Read() < 0 || Buffer.Write() < 0)
+           break;
+        usleep(1); // this keeps the CPU load low
+        }
+  }
+  dsyslog(LOG_INFO, "data transfer thread stopped (pid=%d)", getpid());
+  LOCK_THREAD;
+  active = true;
+}
+
 // --- cDvbApi ---------------------------------------------------------------
 
 int cDvbApi::NumDvbApis = 0;
@@ -1091,6 +1150,10 @@ cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
   pidRecord = pidReplay = 0;
   fromRecord = toRecord = -1;
   fromReplay = toReplay = -1;
+  ca = 0;
+  priority = -1;
+  transferBuffer = NULL;
+  transferringFromDvbApi = NULL;
   videoDev = open(VideoFileName, O_RDWR | O_NONBLOCK);
   if (videoDev >= 0) {
      siProcessor = new cSIProcessor(VbiFileName);
@@ -1130,6 +1193,7 @@ cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
 #endif
   lastProgress = lastTotal = -1;
   replayTitle = NULL;
+  currentChannel = 1;
 }
 
 cDvbApi::~cDvbApi()
@@ -1139,7 +1203,9 @@ cDvbApi::~cDvbApi()
      Close();
      Stop();
      StopRecord();
+     StopTransfer();
      OvlO(false); //Overlay off!
+     //XXX the following call sometimes causes a segfault - driver problem?
      close(videoDev);
      }
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
@@ -1160,22 +1226,25 @@ bool cDvbApi::SetPrimaryDvbApi(int n)
   return false;
 }
 
-cDvbApi *cDvbApi::GetDvbApi(int Ca)
+cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
 {
   cDvbApi *d = NULL;
-  Ca--;
+  int index = Ca - 1;
   for (int i = MAXDVBAPI; --i >= 0; ) {
-      if (dvbApi[i] && !dvbApi[i]->Recording()) {
-         if (i == Ca)
-            return dvbApi[i];
-         if (Ca < 0) {
+      if (dvbApi[i]) {
+         if (i == index) { // means we need exactly _this_ device
             d = dvbApi[i];
-            if (d != PrimaryDvbApi)
+            break;
+            }
+         else if (Ca == 0) { // means any device would be acceptable
+            if (!d || !dvbApi[i]->Recording() || (d->Recording() && d->Priority() > dvbApi[i]->Priority()))
+               d = dvbApi[i];
+            if (d && d != PrimaryDvbApi && !d->Recording()) // avoids the PrimaryDvbApi if possible
                break;
             }
          }
       }
-  return d;
+  return (d && (!d->Recording() || d->Priority() < Priority || (!d->Ca() && Ca))) ? d : NULL;
 }
 
 int cDvbApi::Index(void)
@@ -1616,6 +1685,24 @@ int cDvbApi::Width(unsigned char c)
 #endif
 }
 
+int cDvbApi::WidthInCells(const char *s)
+{
+#ifdef DEBUG_OSD
+  return strlen(s);
+#else
+  return (osd->Width(s) + charWidth - 1) / charWidth;
+#endif
+}
+
+eDvbFont cDvbApi::SetFont(eDvbFont Font)
+{
+#ifdef DEBUG_OSD
+  return Font;
+#else
+  return osd->SetFont(Font);
+#endif
+}
+
 void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
 {
   if (x < 0) x = cols + x;
@@ -1689,9 +1776,15 @@ bool cDvbApi::ShowProgress(bool Initial)
   return false;
 }
 
-bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr)
+bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr)
 {
   if (videoDev >= 0) {
+     StopTransfer();
+     if (transferringFromDvbApi) {
+        transferringFromDvbApi->StopTransfer();
+        transferringFromDvbApi = NULL;
+        }
+     SetReplayMode(VID_PLAY_RESET);
      struct frontend front;
      ioctl(videoDev, VIDIOCGFRONTEND, &front);
      unsigned int freq = FrequencyMHz;
@@ -1712,8 +1805,20 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
      front.AFC       = 1;
      ioctl(videoDev, VIDIOCSFRONTEND, &front);
      if (front.sync & 0x1F == 0x1F) {
-        if (siProcessor)
+        if (this == PrimaryDvbApi && siProcessor)
            siProcessor->SetCurrentServiceID(Pnr);
+        currentChannel = ChannelNumber;
+        // If this DVB card can't receive this channel, let's see if we can
+        // use the card that actually can receive it and transfer data from there:
+        if (Ca && Ca != Index() + 1) {
+           cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
+           if (CaDvbApi) {
+              if (!CaDvbApi->Recording()) {
+                 if (CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid, Ca, Pnr))
+                    transferringFromDvbApi = CaDvbApi->StartTransfer(videoDev);
+                 }
+              }
+           }
         return true;
         }
      esyslog(LOG_ERR, "ERROR: channel not sync'ed (front.sync=%X)!", front.sync);
@@ -1721,6 +1826,27 @@ bool cDvbApi::SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Sr
   return false;
 }
 
+bool cDvbApi::Transferring(void)
+{
+  return transferBuffer;
+}
+
+cDvbApi *cDvbApi::StartTransfer(int TransferToVideoDev)
+{
+  StopTransfer();
+  transferBuffer = new cTransferBuffer(videoDev, TransferToVideoDev);
+  return this;
+}
+
+void cDvbApi::StopTransfer(void)
+{
+  if (transferBuffer) {
+     delete transferBuffer;
+     transferBuffer = NULL;
+     SetReplayMode(VID_PLAY_RESET);
+     }
+}
+
 bool cDvbApi::Recording(void)
 {
   if (pidRecord && !CheckProcess(pidRecord))
@@ -1735,7 +1861,7 @@ bool cDvbApi::Replaying(void)
   return pidReplay;
 }
 
-bool cDvbApi::StartRecord(const char *FileName)
+bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
 {
   if (Recording()) {
      esyslog(LOG_ERR, "ERROR: StartRecord() called while recording - ignored!");
@@ -1743,6 +1869,8 @@ bool cDvbApi::StartRecord(const char *FileName)
      }
   if (videoDev >= 0) {
 
+     StopTransfer();
+
      Stop(); // TODO: remove this if the driver is able to do record and replay at the same time
 
      // Check FileName:
@@ -1832,6 +1960,9 @@ bool cDvbApi::StartRecord(const char *FileName)
 
      fromRecord = fromRecordPipe[0];
      toRecord = toRecordPipe[1];
+
+     ca = Ca;
+     priority = Priority;
      return true;
      }
   return false;
@@ -1846,6 +1977,8 @@ void cDvbApi::StopRecord(void)
      toRecord = fromRecord = -1;
      KillProcess(pidRecord);
      pidRecord = 0;
+     ca = 0;
+     priority = -1;
      SetReplayMode(VID_PLAY_RESET); //XXX
      }
 }
@@ -1865,6 +1998,7 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
      esyslog(LOG_ERR, "ERROR: StartReplay() called while recording - ignored!");
      return false;
      }
+  StopTransfer();
   Stop();
   if (videoDev >= 0) {
 
@@ -2086,3 +2220,55 @@ bool cDvbApi::GetIndex(int *Current, int *Total)
   return false;
 }
 
+// --- cEITScanner -----------------------------------------------------------
+
+cEITScanner::cEITScanner(void)
+{
+  lastScan = lastActivity = time(NULL);
+  currentChannel = 0;
+  lastChannel = 1;
+}
+
+void cEITScanner::Activity(void)
+{
+  if (currentChannel) {
+     Channels.SwitchTo(currentChannel);
+     currentChannel = 0;
+     }
+  lastActivity = time(NULL);
+}
+
+void cEITScanner::Process(void)
+{
+  if (Channels.MaxNumber() > 1) {
+     time_t now = time(NULL);
+     if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
+        for (int i = 0; i < cDvbApi::NumDvbApis; i++) {
+            cDvbApi *DvbApi = cDvbApi::GetDvbApi(i, 0);
+            if (DvbApi) {
+               if (DvbApi != cDvbApi::PrimaryDvbApi || (cDvbApi::NumDvbApis == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                  if (!(DvbApi->Recording() || DvbApi->Replaying() || DvbApi->Transferring())) {
+                     int oldCh = lastChannel;
+                     int ch = oldCh + 1;
+                     while (ch != oldCh) {
+                           if (ch > Channels.MaxNumber())
+                              ch = 1;
+                           cChannel *Channel = Channels.GetByNumber(ch);
+                           if (Channel && Channel->pnr) {
+                              if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
+                                 currentChannel = DvbApi->Channel();
+                              Channel->Switch(DvbApi, false);
+                              lastChannel = ch;
+                              break;
+                              }
+                           ch++;
+                           }
+                     }
+                  }
+               }
+            }
+        lastScan = time(NULL);
+        }
+     }
+}
+
diff --git a/dvbapi.h b/dvbapi.h
index 16a2b7a71..f6640ff5d 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.20 2000/11/01 09:18:50 kls Exp $
+ * $Id: dvbapi.h 1.26 2000/11/19 14:09:41 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -42,10 +42,11 @@ class cResumeFile {
   bool Save(int Index);
   };
 
+class cTransferBuffer;
+
 class cDvbApi {
 private:
   int videoDev;
-  cSIProcessor *siProcessor;
   cDvbApi(const char *VideoFileName, const char *VbiFileName);
 public:
   ~cDvbApi();
@@ -59,11 +60,15 @@ class cDvbApi {
   static bool SetPrimaryDvbApi(int n);
          // Sets the primary DVB device to 'n' (which must be in the range
          // 1...NumDvbApis) and returns true if this was possible.
-  static cDvbApi *GetDvbApi(int Ca = 0);
+  static cDvbApi *GetDvbApi(int Ca, int Priority);
          // Selects a free DVB device, starting with the highest device number
          // (but avoiding, if possible, the PrimaryDvbApi).
-         // If Ca is not 0, the device with the given number will be returned
-         // if it is not currently recording.
+         // If Ca is not 0, the device with the given number will be returned.
+         // If all DVB devices are currently recording, the one recording the
+         // lowest priority timer (if any) that is lower than the given Priority
+         // will be returned.
+         // The caller must check whether the returned DVB device is actually
+         // recording and stop recording if necessary.
   int Index(void);
          // Returns the index of this DvbApi.
   static bool Init(void);
@@ -75,6 +80,9 @@ class cDvbApi {
 
   // EIT facilities
 
+private:
+  cSIProcessor *siProcessor;
+public:
   const cSchedules *Schedules(cThreadLock *ThreadLock) const;
          // Caller must provide a cThreadLock which has to survive the entire
          // time the returned cSchedules is accessed. Once the cSchedules is no
@@ -124,6 +132,8 @@ class cDvbApi {
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
   int CellWidth(void);
   int Width(unsigned char c);
+  int WidthInCells(const char *s);
+  eDvbFont SetFont(eDvbFont Font);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
   void Flush(void);
 
@@ -137,7 +147,26 @@ class cDvbApi {
 
   // Channel facilities
 
-  bool SetChannel(int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr);
+private:
+  int currentChannel;
+public:
+  bool SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr);
+  static int CurrentChannel(void) { return PrimaryDvbApi ? PrimaryDvbApi->currentChannel : 0; }
+  int Channel(void) { return currentChannel; }
+
+  // Transfer facilities
+
+private:
+  cTransferBuffer *transferBuffer;
+  cDvbApi *transferringFromDvbApi;
+public:
+  bool Transferring(void);
+       // Returns true if we are currently transferring video data.
+private:
+  cDvbApi *StartTransfer(int TransferToVideoDev);
+       // Starts transferring video data from this DVB device to TransferToVideoDev.
+  void StopTransfer(void);
+       // Stops transferring video data (in case a transfer is currently active).
 
   // Record/Replay facilities
 
@@ -153,14 +182,23 @@ class cDvbApi {
   pid_t pidRecord, pidReplay;
   int fromRecord, toRecord;
   int fromReplay, toReplay;
+  int ca;
+  int priority;
   void SetReplayMode(int Mode);
+protected:
+  int  Ca(void) { return ca; }
+       // Returns the ca of the current recording session (0..MAXDVBAPI).
+  int  Priority(void) { return priority; }
+       // Returns the priority of the current recording session (0..99),
+       // or -1 if no recording is currently active.
 public:
   bool Recording(void);
        // Returns true if we are currently recording.
   bool Replaying(void);
        // Returns true if we are currently replaying.
-  bool StartRecord(const char *FileName);
-       // Starts recording the current channel into the given file.
+  bool StartRecord(const char *FileName, int Ca, int Priority);
+       // Starts recording the current channel into the given file, with
+       // the given ca and priority.
        // In order to be able to record longer movies,
        // a numerical suffix will be appended to the file name. The inital
        // value of that suffix will be larger than any existing file under
@@ -194,4 +232,18 @@ class cDvbApi {
   bool GetIndex(int *Current, int *Total = NULL);
   };
 
+class cEITScanner {
+private:
+  enum { ActivityTimeout = 60,
+         ScanTimeout = 20
+       };
+  time_t lastScan, lastActivity;
+  int currentChannel, lastChannel;
+public:
+  cEITScanner(void);
+  bool Active(void) { return currentChannel; }
+  void Activity(void);
+  void Process(void);
+  };
+
 #endif //__DVBAPI_H
diff --git a/dvbosd.c b/dvbosd.c
index c0150e269..457175d8b 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.4 2000/11/01 09:13:32 kls Exp $
+ * $Id: dvbosd.c 1.6 2000/11/18 15:36:51 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -21,6 +21,7 @@ cBitmap::cBitmap(int Width, int Height)
   width = Width;
   height = Height;
   bitmap = NULL;
+  fontType = fontOsd;
   font = NULL;
   if (width > 0 && height > 0) {
      bitmap = new char[width * height];
@@ -42,10 +43,15 @@ cBitmap::~cBitmap()
   delete bitmap;
 }
 
-void cBitmap::SetFont(eDvbFont Font)
+eDvbFont cBitmap::SetFont(eDvbFont Font)
 {
-  delete font;
-  font = new cFont(Font);
+  eDvbFont oldFont = fontType;
+  if (fontType != Font || !font) {
+     delete font;
+     font = new cFont(Font);
+     fontType = Font;
+     }
+  return oldFont;
 }
 
 bool cBitmap::Dirty(void)
@@ -81,6 +87,11 @@ int cBitmap::Width(unsigned char c)
   return font ? font->Width(c) : -1;
 }
 
+int cBitmap::Width(const char *s)
+{
+  return font ? font->Width(s) : -1;
+}
+
 void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
 {
   if (bitmap) {
diff --git a/dvbosd.h b/dvbosd.h
index 149dc6cb1..e2a424a8d 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.2 2000/11/01 09:13:44 kls Exp $
+ * $Id: dvbosd.h 1.4 2000/11/18 15:25:25 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -45,6 +45,7 @@ enum eDvbColor {
 class cBitmap {
 private:
   cFont *font;
+  eDvbFont fontType;
 protected:
   int width, height;
   char *bitmap;
@@ -53,10 +54,11 @@ class cBitmap {
 public:
   cBitmap(int Width, int Height);
   virtual ~cBitmap();
-  void SetFont(eDvbFont Font);
+  eDvbFont SetFont(eDvbFont Font);
   bool Dirty(void);
   void SetPixel(int x, int y, eDvbColor Color);
   int Width(unsigned char c);
+  int Width(const char *s);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void Clear(void);
diff --git a/eit.c b/eit.c
index 65856e6c3..79855282f 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.7 2000/11/02 17:06:19 kls Exp $
+ * $Id: eit.c 1.9 2000/11/18 13:42:28 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -24,7 +24,6 @@
 #include <fstream.h>
 #include <iomanip.h>
 #include <iostream.h>
-#include <minmax.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -753,7 +752,7 @@ schedule information */
 
 cEIT::cEIT(void * buf, int length, cSchedules *Schedules)
 {
-	buflen = min((unsigned int)length, sizeof(buffer));
+	buflen = length < int(sizeof(buffer)) ? length : sizeof(buffer);
 	memset(buffer, 0, sizeof(buffer));
 	memcpy(buffer, buf, buflen);
 	tid = buffer[0];
@@ -1057,15 +1056,20 @@ bool cEIT::WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop,
 
 #define MAX_FILTERS 20
 
+int cSIProcessor::numSIProcessors = 0;
+cSchedules *cSIProcessor::schedules = NULL;
+cMutex cSIProcessor::schedulesMutex;
+
 /**  */
 cSIProcessor::cSIProcessor(const char *FileName)
 {
+   masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
 	useTStime = false;
    filters = NULL;
-   schedules = NULL;
    if ((fsvbi = open(FileName, O_RDONLY)) >= 0)
    {
-      schedules = new cSchedules;
+      if (!numSIProcessors++) // the first one creates it
+         schedules = new cSchedules;
 	   filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
    }
    else
@@ -1079,7 +1083,8 @@ cSIProcessor::~cSIProcessor()
       Stop();
    	ShutDownFilters();
       delete filters;
-      delete schedules;
+      if (!--numSIProcessors) // the last one deletes it
+         delete schedules;
       close(fsvbi);
    }
 }
@@ -1094,7 +1099,7 @@ void cSIProcessor::Action()
       return;
       }
 
-   dsyslog(LOG_INFO, "EIT processing thread started (pid=%d)", getpid());
+   dsyslog(LOG_INFO, "EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 	
    unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
 	unsigned int seclen;
@@ -1104,15 +1109,20 @@ void cSIProcessor::Action()
 	
 	while(true)
 	{
-      time_t now = time(NULL);
-      struct tm *ptm = localtime(&now);
-      if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
+      if (masterSIProcessor)
       {
-         LOCK_THREAD;
+         time_t now = time(NULL);
+         struct tm *ptm = localtime(&now);
+         if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
+         {
+            LOCK_THREAD;
 
-         isyslog(LOG_INFO, "Now cleaning up things");
-         schedules->Cleanup();
-         lastCleanup = now;
+            schedulesMutex.Lock();
+            isyslog(LOG_INFO, "cleaning up schedules data");
+            schedules->Cleanup();
+            schedulesMutex.Unlock();
+            lastCleanup = now;
+         }
       }
 
 		/* wait data become ready from the bitfilter */
@@ -1151,8 +1161,10 @@ void cSIProcessor::Action()
 					{
                   LOCK_THREAD;
 
+                  schedulesMutex.Lock();
 	               cEIT ceit(buf, seclen, schedules);
 						ceit.ProcessEIT();
+                  schedulesMutex.Unlock();
 					}
 					else
 						dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
diff --git a/eit.h b/eit.h
index fec498baf..d5c4ebdcf 100644
--- a/eit.h
+++ b/eit.h
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.2 2000/10/29 10:21:56 kls Exp $
+ * $Id: eit.h 1.3 2000/11/17 16:14:27 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -120,7 +120,10 @@ typedef struct sip_filter {
 
 class cSIProcessor : public cThread {
 private:
-  cSchedules *schedules;
+  static int numSIProcessors;
+  static cSchedules *schedules;
+  static cMutex schedulesMutex;
+  bool masterSIProcessor;
   bool useTStime;
   SIP_FILTER *filters;
   int fsvbi;
diff --git a/font.c b/font.c
index 3ef40835b..22c92be00 100644
--- a/font.c
+++ b/font.c
@@ -4,21 +4,27 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.1 2000/10/01 15:01:49 kls Exp $
+ * $Id: font.c 1.2 2000/11/18 15:16:08 kls Exp $
  */
 
 #include "font.h"
 #include "tools.h"
 
+#include "fontfix.c"
 #include "fontosd.c"
 
-cFont::cFont(eDvbFont Font)//XXX
+cFont::cFont(eDvbFont Font)
 {
+
+#define FONTINDEX(Name)\
+    case font##Name: for (int i = 0; i < NUMCHARS; i++)\
+                         data[i] = (tCharData *)&Font##Name[i < 32 ? 0 : i - 32];\
+                     break;
+
   switch (Font) {
     default:
-    case fontOsd: for (int i = 0; i < NUMCHARS; i++)
-                      data[i] = (tCharData *)&FontOsd[i < 32 ? 0 : i - 32];
-                  break;
+    FONTINDEX(Osd);
+    FONTINDEX(Fix);
     // TODO others...
     }
 }
diff --git a/font.h b/font.h
index f31c6b599..414eaa8b7 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.1 2000/10/01 15:00:35 kls Exp $
+ * $Id: font.h 1.2 2000/11/18 14:51:45 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -12,6 +12,7 @@
 
 enum eDvbFont {
   fontOsd,
+  fontFix,
 /* TODO as soon as we have the font files...
   fontTtxSmall,
   fontTtxLarge,
diff --git a/fontfix.c b/fontfix.c
new file mode 100644
index 000000000..67eb1621f
--- /dev/null
+++ b/fontfix.c
@@ -0,0 +1,6498 @@
+cFont::tPixelData FontFix[][28] = {
+  {             // 32
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 33
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 34
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00000880,  // ....*...*......
+     0x00000880,  // ....*...*......
+     0x00000880,  // ....*...*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 35
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 36
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000F60,  // ....****.**....
+     0x00001FE0,  // ...********....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F80,  // ...******......
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00003FE0,  // ..*********....
+     0x000037C0,  // ..**.*****.....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 37
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F00,  // ....****.......
+     0x00001980,  // ...**..**......
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00001980,  // ...**..**......
+     0x00000F00,  // ....****.......
+     0x00000070,  // .........***...
+     0x000003C0,  // ......****.....
+     0x00000E00,  // ....***........
+     0x000039E0,  // ..***..****....
+     0x00000330,  // ......**..**...
+     0x00000618,  // .....**....**..
+     0x00000618,  // .....**....**..
+     0x00000330,  // ......**..**...
+     0x000001E0,  // .......****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 38
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000E00,  // ....***........
+     0x00001F30,  // ...*****..**...
+     0x00001BF0,  // ...**.******...
+     0x000031E0,  // ..**...****....
+     0x000030C0,  // ..**....**.....
+     0x000031E0,  // ..**...****....
+     0x00003FF8,  // ..***********..
+     0x00001F38,  // ...*****..***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000800,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 40
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000060,  // .........**....
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000E0,  // ........***....
+     0x00000060,  // .........**....
+     0x00000000,  // ...............
+  },
+  {             // 41
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001C00,  // ...***.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00000000,  // ...............
+  },
+  {             // 42
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003330,  // ..**..**..**...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000300,  // ......**.......
+     0x00000FC0,  // ....******.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 43
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 44
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000800,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 45
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 46
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 47
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 48
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00001860,  // ...**....**....
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 49
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 50
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 51
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000007C0,  // .....*****.....
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x00003FE0,  // ..*********....
+     0x00001FC0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 52
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000007F0,  // .....*******...
+     0x000007F0,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 53
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ...*********...
+     0x00001FF0,  // ...*********...
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BC0,  // ...**.****.....
+     0x00001FF0,  // ...*********...
+     0x00001C70,  // ...***...***...
+     0x00000038,  // ..........***..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00003038,  // ..**......***..
+     0x00003870,  // ..***....***...
+     0x00001FF0,  // ...*********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 54
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F0,  // .......*****...
+     0x000007F0,  // .....*******...
+     0x00000F00,  // ....****.......
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00003800,  // ..***..........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003830,  // ..***.....**...
+     0x00001C70,  // ...***...***...
+     0x00001FE0,  // ...********....
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 55
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 56
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 57
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // ......****.....
+     0x00000FF0,  // ....********...
+     0x00000C30,  // ....**....**...
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C78,  // ...***...****..
+     0x00000FD8,  // ....******.**..
+     0x00000798,  // .....****..**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 58
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 59
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001000,  // ...*...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 60
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000001C,  // ...........***.
+     0x00000078,  // .........****..
+     0x000001E0,  // .......****....
+     0x00000780,  // .....****......
+     0x00001E00,  // ...****........
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001E00,  // ...****........
+     0x00000780,  // .....****......
+     0x000001E0,  // .......****....
+     0x00000078,  // .........****..
+     0x0000001C,  // ...........***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007000,  // .***...........
+     0x00003C00,  // ..****.........
+     0x00000F00,  // ....****.......
+     0x000003C0,  // ......****.....
+     0x000000F0,  // ........****...
+     0x0000003C,  // ..........****.
+     0x0000003C,  // ..........****.
+     0x000000F0,  // ........****...
+     0x000003C0,  // ......****.....
+     0x00000F00,  // ....****.......
+     0x00003C00,  // ..****.........
+     0x00007000,  // .***...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00001870,  // ...**....***...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000001E0,  // .......****....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 64
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x00003060,  // ..**.....**....
+     0x00003060,  // ..**.....**....
+     0x000031E0,  // ..**...****....
+     0x000033E0,  // ..**..*****....
+     0x00003760,  // ..**.***.**....
+     0x00003660,  // ..**.**..**....
+     0x00003660,  // ..**.**..**....
+     0x00003760,  // ..**.***.**....
+     0x000033F0,  // ..**..******...
+     0x000031F0,  // ..**...*****...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 65
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF0,  // .***********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003000,  // ..**...........
+     0x00003818,  // ..***......**..
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 68
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 69
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x000018CC,  // ...**...**..**.
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 71
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x000060FC,  // .**.....******.
+     0x000060FC,  // .**.....******.
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 73
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 74
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFC,  // ....**********.
+     0x00000FFC,  // ....**********.
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x000070E0,  // .***....***....
+     0x00003FC0,  // ..********.....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 75
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCF8,  // ******..*****..
+     0x0000FCF8,  // ******..*****..
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00003F00,  // ..******.......
+     0x00003B80,  // ..***.***......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 77
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F03C,  // ****......****.
+     0x0000F03C,  // ****......****.
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006798,  // .**..****..**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 78
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 79
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF8,  // .************..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x0000070C,  // .....***....**.
+     0x00001FFC,  // ...***********.
+     0x00001CF0,  // ...***..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FF80,  // *********......
+     0x0000FFE0,  // ***********....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003070,  // ..**.....***...
+     0x00003FE0,  // ..*********....
+     0x00003F80,  // ..*******......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 83
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 85
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 86
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006FD8,  // .**.******.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00003CF0,  // ..****..****...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 88
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000000,  // ...............
+  },
+  {             // 92
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 93
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+  },
+  {             // 94
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 95
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFFE,  // ***************
+     0x0000FFFE,  // ***************
+     0x00000000,  // ...............
+  },
+  {             // 96
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x00000040,  // .........*.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 97
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 98
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BE0,  // ...**.*****....
+     0x00001FF8,  // ...**********..
+     0x00001E38,  // ...****...***..
+     0x00001C1C,  // ...***.....***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00001C1C,  // ...***.....***.
+     0x00001E38,  // ...****...***..
+     0x00007FF8,  // .************..
+     0x00007BE0,  // .****.*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 99
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 100
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F0,  // ........****...
+     0x000000F0,  // ........****...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FFC,  // ..************.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 101
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 102
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F8,  // .......******..
+     0x000003F8,  // ......*******..
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 103
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001FC0,  // ...*******.....
+  },
+  {             // 104
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000F000,  // ****...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 105
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 106
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // ..********.....
+     0x00003FC0,  // ..********.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00003F80,  // ..*******......
+     0x00003F00,  // ..******.......
+  },
+  {             // 107
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x000018F0,  // ...**...****...
+     0x000018F0,  // ...**...****...
+     0x000019C0,  // ...**..***.....
+     0x00001B80,  // ...**.***......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00001B80,  // ...**.***......
+     0x000019C0,  // ...**..***.....
+     0x000018E0,  // ...**...***....
+     0x000078FC,  // .****...******.
+     0x000078FC,  // .****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 108
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 109
+     15, 26,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001DEF0,  // ***.****.****...
+     0x0001FFF8,  // **************..
+     0x00007398,  // ..***..***..**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001F3DE,  // *****..****.****
+     0x0001F3DE,  // *****..****.****
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 111
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 112
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7C0,  // ****.*****.....
+     0x0000FFF0,  // ************...
+     0x00003C70,  // ..****...***...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00003C70,  // ..****...***...
+     0x00003FF0,  // ..**********...
+     0x000037C0,  // ..**.*****.....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x0000FE00,  // *******........
+     0x0000FE00,  // *******........
+  },
+  {             // 113
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x000001FC,  // .......*******.
+     0x000001FC,  // .......*******.
+  },
+  {             // 114
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00003FF8,  // ..***********..
+     0x00000F18,  // ....****...**..
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 115
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 116
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001C70,  // ...***...***...
+     0x00000FF0,  // ....********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 117
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 118
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 119
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00003330,  // ..**..**..**...
+     0x000037B0,  // ..**.****.**...
+     0x000037B0,  // ..**.****.**...
+     0x00003CF0,  // ..****..****...
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 121
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 122
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 123
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x000000E0,  // ........***....
+     0x00000000,  // ...............
+  },
+  {             // 124
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 125
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000380,  // ......***......
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+  },
+  {             // 126
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E18,  // ...****....**..
+     0x00003F38,  // ..******..***..
+     0x000073F0,  // .***..******...
+     0x000061E0,  // .**....****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 127
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 161
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000000,  // ...............
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000600,  // .....**........
+  },
+  {             // 162
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000F60,  // ....****.**....
+     0x00001FE0,  // ...********....
+     0x000038E0,  // ..***...***....
+     0x00003060,  // ..**.....**....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003860,  // ..***....**....
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 163
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00000FE0,  // ....*******....
+     0x00001C60,  // ...***...**....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x00003818,  // ..***......**..
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 164
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 165
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 166
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 167
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007F0,  // .....*******...
+     0x00000FF0,  // ....********...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001C00,  // ...***.........
+     0x00003F00,  // ..******.......
+     0x000067C0,  // .**..*****.....
+     0x000061F0,  // .**....*****...
+     0x00007878,  // .****....****..
+     0x00003E18,  // ..*****....**..
+     0x00000F98,  // ....*****..**..
+     0x000003F8,  // ......*******..
+     0x000000F0,  // ........****...
+     0x00000060,  // .........**....
+     0x00003060,  // ..**.....**....
+     0x000030E0,  // ..**....***....
+     0x00003FC0,  // ..********.....
+     0x00003F80,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 168
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00006798,  // .**..****..**..
+     0x00006FD8,  // .**.******.**..
+     0x0000DCCC,  // **.***..**..**.
+     0x0000D80C,  // **.**.......**.
+     0x0000D80C,  // **.**.......**.
+     0x0000DCCC,  // **.***..**..**.
+     0x00006FD8,  // .**.******.**..
+     0x00006798,  // .**..****..**..
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x000000C0,  // ........**.....
+     0x00000FC0,  // ....******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000019E0,  // ...**..****....
+     0x00000F60,  // ....****.**....
+     0x00000000,  // ...............
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 171
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000071C,  // .....***...***.
+     0x00000E38,  // ....***...***..
+     0x00001C70,  // ...***...***...
+     0x000038E0,  // ..***...***....
+     0x000071C0,  // .***...***.....
+     0x000038E0,  // ..***...***....
+     0x00001C70,  // ...***...***...
+     0x00000E38,  // ....***...***..
+     0x0000071C,  // .....***...***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 172
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 173
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 174
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00006F98,  // .**.*****..**..
+     0x00006FD8,  // .**.******.**..
+     0x0000CCCC,  // **..**..**..**.
+     0x0000CCCC,  // **..**..**..**.
+     0x0000CF8C,  // **..*****...**.
+     0x0000CD8C,  // **..**.**...**.
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 176
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 177
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 178
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000C60,  // ....**...**....
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 179
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000000C0,  // ........**.....
+     0x000003C0,  // ......****.....
+     0x00000060,  // .........**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 180
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00003FFC,  // ..************.
+     0x00003FBC,  // ..*******.****.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+  },
+  {             // 182
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FF8,  // ....*********..
+     0x00003FF8,  // ..***********..
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00003F60,  // ..******.**....
+     0x00000F60,  // ....****.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00001F78,  // ...*****.****..
+     0x00001F78,  // ...*****.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 183
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 184
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 185
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 186
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 187
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000071C0,  // .***...***.....
+     0x000038E0,  // ..***...***....
+     0x00001C70,  // ...***...***...
+     0x00000E38,  // ....***...***..
+     0x0000071C,  // .....***...***.
+     0x00000E38,  // ....***...***..
+     0x00001C70,  // ...***...***...
+     0x000038E0,  // ..***...***....
+     0x000071C0,  // .***...***.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 188
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ...**...........
+     0x0001F002,  // *****..........*
+     0x00003006,  // ...**.........**
+     0x0000300C,  // ...**........**.
+     0x00003018,  // ...**.......**..
+     0x00003030,  // ...**......**...
+     0x00003060,  // ...**.....**....
+     0x000030C8,  // ...**....**..*..
+     0x0001FF98,  // **********..**..
+     0x00000338,  // .......**..***..
+     0x00000658,  // ......**..*.**..
+     0x00000C98,  // .....**..*..**..
+     0x00001918,  // ....**..*...**..
+     0x000031FC,  // ...**...*******.
+     0x00006018,  // ..**........**..
+     0x0000403C,  // ..*........****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ...**...........
+     0x0001F002,  // *****..........*
+     0x00003006,  // ...**.........**
+     0x0000300C,  // ...**........**.
+     0x00003018,  // ...**.......**..
+     0x00003030,  // ...**......**...
+     0x00003060,  // ...**.....**....
+     0x000030FC,  // ...**....******.
+     0x0001FFE6,  // ************..**
+     0x00000346,  // .......**.*...**
+     0x0000060C,  // ......**.....**.
+     0x00000C18,  // .....**.....**..
+     0x00001830,  // ....**.....**...
+     0x00003060,  // ...**.....**....
+     0x000060C6,  // ..**.....**...**
+     0x000040FE,  // ..*......*******
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C00,  // .*****.........
+     0x0000C602,  // **...**.......*
+     0x0000C606,  // **...**......**
+     0x00000C0C,  // ....**......**.
+     0x00003C18,  // ..****.....**..
+     0x00000630,  // .....**...**...
+     0x0000C660,  // **...**..**....
+     0x0000C6C8,  // **...**.**..*..
+     0x00007D98,  // .*****.**..**..
+     0x00000338,  // ......**..***..
+     0x00000658,  // .....**..*.**..
+     0x00000C98,  // ....**..*..**..
+     0x00001918,  // ...**..*...**..
+     0x000031FC,  // ..**...*******.
+     0x00006018,  // .**........**..
+     0x0000403C,  // .*........****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00001E00,  // ...****........
+     0x00003800,  // ..***..........
+     0x00003000,  // ..**...........
+     0x00003060,  // ..**.....**....
+     0x00003060,  // ..**.....**....
+     0x00003860,  // ..***....**....
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+  },
+  {             // 192
+     15, 26,
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 26,
+     0x00000600,  // .....**........
+     0x00000F00,  // ....****.......
+     0x00001F80,  // ...******......
+     0x000039C0,  // ..***..***.....
+     0x000070E0,  // .***....***....
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 26,
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000D80,  // ....**.**......
+     0x00000880,  // ....*...*......
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFE,  // ....***********
+     0x00000FFE,  // ....***********
+     0x00000386,  // ......***....**
+     0x00000786,  // .....****....**
+     0x00000780,  // .....****......
+     0x00000D98,  // ....**.**..**..
+     0x000009F8,  // ....*..******..
+     0x000019F8,  // ...**..******..
+     0x00001F98,  // ...******..**..
+     0x00003F80,  // ..*******......
+     0x00003180,  // ..**...**......
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x0000F7FE,  // ****.**********
+     0x0000F7FE,  // ****.**********
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 199
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003008,  // ..**........*..
+     0x00003818,  // ..***......**..
+     0x00001FF0,  // ...*********...
+     0x000007E0,  // .....******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 200
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 205
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 206
+     15, 26,
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 207
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000FE0C,  // *******.....**.
+     0x0000FE0C,  // *******.....**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // .....***..**...
+     0x00000FE0,  // ....*******....
+     0x000019C0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x000001C0,  // .......***.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // .....***..**...
+     0x00000FE0,  // ....*******....
+     0x000019C0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00002010,  // ..*........*...
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00002010,  // ..*........*...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000C,  // ............**.
+     0x00000018,  // ...........**..
+     0x000007F0,  // .....*******...
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003078,  // ..**.....****..
+     0x000070DC,  // .***....**.***.
+     0x0000608C,  // .**.....*...**.
+     0x0000618C,  // .**....**...**.
+     0x0000630C,  // .**...**....**.
+     0x0000620C,  // .**...*.....**.
+     0x0000660C,  // .**..**.....**.
+     0x0000741C,  // .***.*.....***.
+     0x00003C18,  // ..****.....**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000037C0,  // ..**.*****.....
+     0x00006000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 218
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 219
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 221
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E00,  // .******........
+     0x00007E00,  // .******........
+     0x00001800,  // ...**..........
+     0x00001FE0,  // ...********....
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00007E00,  // .******........
+     0x00007E00,  // .******........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x000018E0,  // ...**...***....
+     0x00001BC0,  // ...**.****.....
+     0x00001BE0,  // ...**.*****....
+     0x00001870,  // ...**....***...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000019B8,  // ...**..**.***..
+     0x00007DF0,  // .*****.*****...
+     0x00007CE0,  // .*****..***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 225
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 226
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 227
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 228
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 229
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000D80,  // ....**.**......
+     0x00000880,  // ....*...*......
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 230
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00007FF8,  // .************..
+     0x0000679C,  // .**..****..***.
+     0x0000030C,  // ......**....**.
+     0x00001F0C,  // ...*****....**.
+     0x00007FFC,  // .*************.
+     0x0000E3FC,  // ***...********.
+     0x0000C300,  // **....**.......
+     0x0000C78C,  // **...****...**.
+     0x0000FFFC,  // **************.
+     0x00007CF0,  // .*****..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 231
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007030,  // .***......**...
+     0x00006030,  // .**.......**...
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00000FE0,  // ....*******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 232
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 233
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 234
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000007C0,  // .....*****.....
+     0x00000EE0,  // ....***.***....
+     0x00001C70,  // ...***...***...
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 235
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 236
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 237
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 238
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 240
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000FC70,  // ******...***...
+     0x00000FF0,  // ....********...
+     0x00001F80,  // ...******......
+     0x00007DC0,  // .*****.***.....
+     0x000070E0,  // .***....***....
+     0x00000FF0,  // ....********...
+     0x00003FF0,  // ..**********...
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 241
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 242
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 243
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 244
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 245
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 246
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 247
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFF8,  // *************..
+     0x0000FFF8,  // *************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 248
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000C,  // ............**.
+     0x00000FD8,  // ....******.**..
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x000070D8,  // .***....**.**..
+     0x00006198,  // .**....**..**..
+     0x00006318,  // .**...**...**..
+     0x00006618,  // .**..**....**..
+     0x00006C38,  // .**.**....***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00003FC0,  // ..********.....
+     0x00006000,  // .**............
+     0x0000C000,  // **.............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 249
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 250
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 251
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 252
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 253
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 254
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BE0,  // ...**.*****....
+     0x00001FF8,  // ...**********..
+     0x00001E38,  // ...****...***..
+     0x00001C1C,  // ...***.....***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00001C1C,  // ...***.....***.
+     0x00001E38,  // ...****...***..
+     0x00001FF8,  // ...**********..
+     0x00001BE0,  // ...**.*****....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 255
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  };
diff --git a/i18n.c b/i18n.c
new file mode 100644
index 000000000..7b93062d3
--- /dev/null
+++ b/i18n.c
@@ -0,0 +1,478 @@
+/*
+ * i18n.c: Internationalization
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: i18n.c 1.6 2000/11/19 12:12:53 kls Exp $
+ *
+ * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
+ *
+ */
+
+/*
+ * How to add a new language:
+ *
+ * 1. Announce your translation action on the Linux-DVB mailing
+ *    list to avoid duplicate work.
+ * 2. Increase the value of 'NumLanguages'.
+ * 3. Insert a new line in every member of the 'Phrases[]' array,
+ *    containing the translated text for the new language.
+ *    For example, assuming you want to add the Italian language,
+ *
+ *       { "English",
+ *         "Deutsch",
+ *       },
+ *
+ *    would become
+ *
+ *       { "English",
+ *         "Deutsch",
+ *         "Italiano",
+ *       },
+ *
+ *    and so on. Insert your language so that all the entries
+ *    following 'English' will be sorted alphabetically, and write
+ *    the name of your language in your language (not in English,
+ *    which means that it should be 'Italiano', not 'Italian').
+ *    Note that only the characters defined in 'fontosd.c' will
+ *    be available!
+ * 4. Compile VDR and test the new language by switching to it
+ *    in the "Setup" menu.
+ * 5. Send the modified 'i18n.c' file to <kls@cadsoft.de> to have
+ *    it included in the next version of VDR.
+ */
+
+#include "i18n.h"
+#include <stdio.h>
+#include "config.h"
+#include "tools.h"
+
+const int NumLanguages = 3;
+
+typedef const char *tPhrase[NumLanguages];
+
+const tPhrase Phrases[] = {
+  // The name of the language (this MUST be the first phrase!):
+  { "English",
+    "Deutsch",
+    "Slovenski",
+  },
+  // Menu titles:
+  { "Main",
+    "Hauptmen�",
+    "Glavni meni",
+  },
+  { "Schedule",
+    "Programm",
+    "Urnik",
+  },
+  { "Channels",
+    "Kan�le",
+    "Kanali",
+  },
+  { "Timers",
+    "Timer",
+    "Termini",
+  },
+  { "Recordings",
+    "Aufzeichnungen",
+    "Posnetki",
+  },
+  { "Setup",
+    "Einstellungen",
+    "Nastavitve",
+  },
+  { "Commands",
+    "Befehle",
+    "Ukazi",
+  },
+  { "Edit Channel",
+    "Kanal Editieren",
+    "Uredi kanal",
+  },
+  { "Edit Timer",
+    "Timer Editieren",
+    "Uredi termin",
+  },
+  { "Event",
+    "Sendung",
+    "Oddaja",
+  },
+  { "Summary",
+    "Inhalt",
+    "Vsebina",
+  },
+  { "Schedule - %s",
+    "Programm - %s",
+    "Urnik - %s",
+  },
+  { "What's on now?",
+    "Was l�uft jetzt?",
+    "Kaj je na sporedu?",
+  },
+  { "What's on next?",
+    "Was l�uft als n�chstes?",
+    "Kaj sledi?",
+  },
+  // Button texts (must not be more than 10 characters!):
+  { "Edit",
+    "Editieren",
+    "Uredi",
+  },
+  { "New",
+    "Neu",
+    "Novo",
+  },
+  { "Delete",
+    "L�schen",
+    "Odstrani",
+  },
+  { "Mark",
+    "Markieren",
+    "Oznaci",
+  },
+  { "Record",
+    "Aufnehmen",
+    "Posnemi",
+  },
+  { "Play",
+    "Wiedergabe",
+    "Predavajaj",
+  },
+  { "Resume",
+    "Weiter",
+    "Nadaljuj",
+  },
+  { "Summary",
+    "Inhalt",
+    "Vsebina",
+  },
+  { "Switch",
+    "Umschalten",
+    "Preklopi",
+  },
+  { "Now",
+    "Jetzt",
+    "Sedaj",
+  },
+  { "Next",
+    "N�chste",
+    "Naslednji",
+  },
+  { "Schedule",
+    "Programm",
+    "Urnik",
+  },
+  // Confirmations:
+  { "Delete Channel?",
+    "Kanal l�schen?",
+    "Odstrani kanal?",
+  },
+  { "Delete Timer?",
+    "Timer l�schen?",
+    "Odstani termin?",
+  },
+  { "Delete Recording?",
+    "Aufzeichnung l�schen?",
+    "Odstrani posnetek?",
+  },
+  { "Stop Recording?",
+    "Aufzeichnung beenden?",
+    "Koncaj snemanje?",
+  },
+  // Channel parameters:
+  { "Name",
+    "Name",
+    "Naziv",
+  },
+  { "Frequency",
+    "Frequenz",
+    "Frekvenca",
+  },
+  { "Polarization",
+    "Polarisation",
+    "Polarizacija",
+  },
+  { "Diseqc",
+    "Diseqc",
+    "Diseqc",
+  },
+  { "Srate",
+    "Srate",
+    "Srate",
+  },
+  { "Vpid",
+    "Vpid",
+    "Vpid",
+  },
+  { "Apid",
+    "Apid",
+    "Apid",
+  },
+  { "CA",
+    "CA",
+    "CA",
+  },
+  { "Pnr",
+    "Pnr",
+    "Pnr",
+  },
+  // Timer parameters:
+  { "Active",
+    "Aktiv",
+    "Aktivno",
+  },
+  { "Channel",
+    "Kanal",
+    "Kanal",
+  },
+  { "Day",
+    "Tag",
+    "Dan",
+  },
+  { "Start",
+    "Anfang",
+    "Zacetek",
+  },
+  { "Stop",
+    "Ende",
+    "Konec",
+  },
+  { "Priority",
+    "Priorit�t",
+    "Prioriteta",
+  },
+  { "Lifetime",
+    "Lebensdauer",
+    "Veljavnost",
+  },
+  { "File",
+    "Datei",
+    "Datoteka",
+  },
+  // Error messages:
+  { "Channel is being used by a timer!",
+    "Kanal wird von einem Timer benutzt!",
+    "Urnik zaseda kanal!",
+  },
+  { "Can't switch channel!",
+    "Kanal kann nicht umgeschaltet werden!",
+    "Ne morem preklopiti kanala!",
+  },
+  { "Timer is recording!",
+    "Timer zeichnet gerade auf!",
+    "Snemanje po urniku!",
+  },
+  { "Error while deleting recording!",
+    "Fehler beim L�schen der Aufzeichnung!",
+    "Napaka pri odstranjevanju posnetka!",
+  },
+  { "*** Invalid Channel ***",
+    "*** Ung�ltiger Kanal ***",
+    "*** Neznan kanal ***",
+  },
+  { "No free DVB device to record!",
+    "Keine freie DVB-Karte zum Aufnehmen!",
+    "Ni proste DVB naprave za snemanje!",
+  },
+  { "Channel locked (recording)!",
+    "Kanal blockiert (zeichnet auf)!",
+    "Zaklenjen kanal (snemanje)!",
+  },
+  // Setup parameters:
+  { "OSD-Language",
+    "OSD-Sprache",
+    "OSD-jezik",
+  },
+  { "PrimaryDVB",
+    "Prim�res Interface",
+    "Primarna naprava",
+  },
+  { "ShowInfoOnChSwitch",
+    "Info zeigen",
+    "Pokazi naziv kanala",
+  },
+  { "MenuScrollPage",
+    "Seitenweise scrollen",
+    "Drsni meni",
+  },
+  { "MarkInstantRecord",
+    "Direktaufz. markieren",
+    "Oznaci direktno snemanje",
+  },
+  { "LnbFrequLo",
+    "Untere LNB-Frequenz",
+    "Spodnja LNB-frek.",
+  },
+  { "LnbFrequHi",
+    "Obere LNB-Frequenz",
+    "Zgornja LNB-frek.",
+  },
+  { "SetSystemTime",
+    "Systemzeit stellen",
+    "Sistemski cas",
+  },
+  { "MarginStart",
+    "Zeitpuffer bei Anfang",
+    "Premor pred zacetkom",
+  },
+  { "MarginStop",
+    "Zeitpuffer bei Ende",
+    "Premor za koncem",
+  },
+  { "EPGScanTimeout",
+    "Zeit bis EPG Scan",
+    "Cas do EPG pregleda",
+  },
+  // The days of the week:
+  { "MTWTFSS",
+    "MDMDFSS",
+    "PTSCPSN",
+  },
+  // Learning keys:
+  { "Learning Remote Control Keys",
+    "Fernbedienungs-Codes lernen",
+    "Ucim se kod upravljalca",
+  },
+  { "Phase 1: Detecting RC code type",
+    "Phase 1: FB Code feststellen",
+    "Faza 1: Sprejemanje IR kode",
+  },
+  { "Press any key on the RC unit",
+    "Eine Taste auf der FB dr�cken",
+    "Pritisnite tipko na upravljalcu",
+  },
+  { "RC code detected!",
+    "FB Code erkannt!",
+    "IR koda sprejeta!",
+  },
+  { "Do not press any key...",
+    "Keine Taste dr�cken...",
+    "Ne pritiskajte tipk...",
+  },
+  { "Phase 2: Learning specific key codes",
+    "Phase 2: Einzelne Tastencodes lernen",
+    "Faza 2: Ucenje posebnih kod",
+  },
+  { "Press key for '%s'",
+    "Taste f�r '%s' dr�cken",
+    "Pritisnite tipko za '%s'",
+  },
+  { "Press 'Up' to confirm",
+    "'Auf' dr�cken zum Best�tigen",
+    "Pritisnite tipko 'Gor' za potrditev",
+  },
+  { "Press 'Down' to continue",
+    "'Ab' dr�cken zum Weitermachen",
+    "Pritisnite tipko 'Dol' za nadaljevanje",
+  },
+  { "(press 'Up' to go back)",
+    "('Auf' dr�cken um zur�ckzugehen)",
+    "(pritisnite 'Gor' za nazaj)",
+  },
+  { "(press 'Down' to end key definition)",
+    "('Ab' dr�cken zum Beenden",
+    "(pritisnite 'Dol' za konec)",
+  },
+  { "Phase 3: Saving key codes",
+    "Phase 3: Codes abspeichern",
+    "Faza 3: Shranjujem kodo",
+  },
+  { "Press 'Up' to save, 'Down' to cancel",
+    "'Auf' speichert, 'Ab' bricht ab",
+    "'Gor' za potrditev, 'Dol' za prekinitev",
+  },
+  // Key names:
+  { "Up",
+    "Auf",
+    "Gor",
+  },
+  { "Down",
+    "Ab",
+    "Dol",
+  },
+  { "Menu",
+    "Men�",
+    "Meni",
+  },
+  { "Ok",
+    "Ok",
+    "Ok",
+  },
+  { "Back",
+    "Zur�ck",
+    "Nazaj",
+  },
+  { "Left",
+    "Links",
+    "Levo",
+  },
+  { "Right",
+    "Rechts",
+    "Desno",
+  },
+  { "Red",
+    "Rot",
+    "Rdeca",
+  },
+  { "Green",
+    "Gr�n",
+    "Zelena",
+  },
+  { "Yellow",
+    "Gelb",
+    "Rumena",
+  },
+  { "Blue",
+    "Blau",
+    "Modra",
+  },
+  // Miscellaneous:
+  { "yes",
+    "ja",
+    "da",
+  },
+  { "no",
+    "nein",
+    "ne",
+  },
+  { "Stop replaying",
+    "Wiedergabe beenden",
+    "Prekini ponavljanje",
+  },
+  { "Stop recording ", // note the trailing blank!
+    "Aufzeichnung beenden ",
+    "Prekini shranjevanje ",
+  },
+  { "Switching primary DVB...",
+    "Prim�res Interface wird umgeschaltet...",
+    "Preklapljanje primarne naprave...",
+  },
+  { "Up/Dn for new location - OK to move",
+    "Auf/Ab f�r neue Position - dann OK",
+    "Gor/Dol za novo poz. - Ok za premik",
+  },
+  { NULL }
+  };
+
+const char *tr(const char *s)
+{
+  if (Setup.OSDLanguage) {
+     for (const tPhrase *p = Phrases; **p; p++) {
+         if (strcmp(s, **p) == 0) {
+            const char *t = (*p)[Setup.OSDLanguage];
+            if (t && *t)
+               return t;
+            }
+         }
+     esyslog(LOG_ERR, "no translation found for '%s' in language %d (%s)\n", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
+     }
+  return s;
+}
+
+const char * const * Languages(void)
+{
+  return &Phrases[0][0];
+}
+
diff --git a/i18n.h b/i18n.h
new file mode 100644
index 000000000..c94241a54
--- /dev/null
+++ b/i18n.h
@@ -0,0 +1,19 @@
+/*
+ * i18n.h: Internationalization
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: i18n.h 1.1 2000/11/11 09:27:25 kls Exp $
+ */
+
+#ifndef __I18N_H
+#define __I18N_H
+
+extern const int NumLanguages;
+
+const char *tr(const char *s);
+
+const char * const * Languages(void);
+
+#endif //__I18N_H
diff --git a/interface.c b/interface.c
index 810270fed..e5cc1d25c 100644
--- a/interface.c
+++ b/interface.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.28 2000/11/01 15:27:52 kls Exp $
+ * $Id: interface.c 1.32 2000/11/18 15:28:50 kls Exp $
  */
 
 #include "interface.h"
 #include <ctype.h>
 #include <unistd.h>
+#include "i18n.h"
 
 cInterface *Interface = NULL;
 
@@ -57,8 +58,7 @@ void cInterface::Close(void)
 
 unsigned int cInterface::GetCh(bool Wait, bool *Repeat, bool *Release)
 {
-  if (open)
-     cDvbApi::PrimaryDvbApi->Flush();
+  Flush();
   if (!rcIo->InputAvailable())
      cFile::AnyFileReady(-1, Wait ? 1000 : 0);
   unsigned int Command;
@@ -67,6 +67,7 @@ unsigned int cInterface::GetCh(bool Wait, bool *Repeat, bool *Release)
 
 eKeys cInterface::GetKey(bool Wait)
 {
+  Flush();
   if (SVDRP)
      SVDRP->Process();
   eKeys Key = keyFromWait;
@@ -89,8 +90,7 @@ void cInterface::PutKey(eKeys Key)
 
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
-  if (open)
-     cDvbApi::PrimaryDvbApi->Flush();
+  Flush();
   eKeys Key = kNone;
   time_t timeout = time(NULL) + Seconds;
   for (;;) {
@@ -136,6 +136,11 @@ void cInterface::SetCols(int *c)
       }
 }
 
+eDvbFont cInterface::SetFont(eDvbFont Font)
+{
+  return cDvbApi::PrimaryDvbApi->SetFont(Font);
+}
+
 char *cInterface::WrapText(const char *Text, int Width, int *Height)
 {
   // Wraps the Text to make it fit into the area defined by the given Width
@@ -238,11 +243,24 @@ void cInterface::WriteText(int x, int y, const char *s, eDvbColor FgColor, eDvbC
 
 void cInterface::Title(const char *s)
 {
-  int x = (Width() - strlen(s)) / 2;
-  if (x < 0)
-     x = 0;
   ClearEol(0, 0, clrCyan);
-  Write(x, 0, s, clrBlack, clrCyan);
+  const char *t = strchr(s, '\t');
+  if (t) {
+     char buffer[Width() + 1];
+     unsigned int n = t - s;
+     if (n >= sizeof(buffer))
+        n = sizeof(buffer) - 1;
+     strn0cpy(buffer, s, n);
+     Write(1, 0, buffer, clrBlack, clrCyan);
+     t++;
+     Write(-(cDvbApi::PrimaryDvbApi->WidthInCells(t) + 1), 0, t, clrBlack, clrCyan);
+     }
+  else {
+     int x = (Width() - strlen(s)) / 2;
+     if (x < 0)
+        x = 0;
+     Write(x, 0, s, clrBlack, clrCyan);
+     }
 }
 
 void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
@@ -308,10 +326,10 @@ void cInterface::QueryKeys(void)
 {
   Keys.Clear();
   Clear();
-  WriteText(1, 1, "Learning Remote Control Keys");
-  WriteText(1, 3, "Phase 1: Detecting RC code type");
-  WriteText(1, 5, "Press any key on the RC unit");
-  cDvbApi::PrimaryDvbApi->Flush();
+  WriteText(1, 1, tr("Learning Remote Control Keys"));
+  WriteText(1, 3, tr("Phase 1: Detecting RC code type"));
+  WriteText(1, 5, tr("Press any key on the RC unit"));
+  Flush();
 #ifndef REMOTE_KBD
   unsigned char Code = 0;
   unsigned short Address;
@@ -325,22 +343,22 @@ void cInterface::QueryKeys(void)
       if (rcIo->DetectCode(&Code, &Address)) {
          Keys.code = Code;
          Keys.address = Address;
-         WriteText(1, 5, "RC code detected!");
-         WriteText(1, 6, "Do not press any key...");
-         cDvbApi::PrimaryDvbApi->Flush();
+         WriteText(1, 5, tr("RC code detected!"));
+         WriteText(1, 6, tr("Do not press any key..."));
+         Flush();
          rcIo->Flush(3000);
          ClearEol(0, 5);
          ClearEol(0, 6);
-         cDvbApi::PrimaryDvbApi->Flush();
+         Flush();
          break;
          }
 #endif
       }
-  WriteText(1, 3, "Phase 2: Learning specific key codes");
+  WriteText(1, 3, tr("Phase 2: Learning specific key codes"));
   tKey *k = Keys.keys;
   while (k->type != kNone) {
         char *Prompt;
-        asprintf(&Prompt, "Press key for '%s'", k->name);
+        asprintf(&Prompt, tr("Press key for '%s'"), tr(k->name));
         WriteText(1, 5, Prompt);
         delete Prompt;
         for (;;) {
@@ -352,8 +370,8 @@ void cInterface::QueryKeys(void)
                                 break;
                                 }
                  case kDown: if (k > Keys.keys + 1) {
-                                WriteText(1, 5, "Press 'Up' to confirm");
-                                WriteText(1, 6, "Press 'Down' to continue");
+                                WriteText(1, 5, tr("Press 'Up' to confirm"));
+                                WriteText(1, 6, tr("Press 'Down' to continue"));
                                 ClearEol(0, 7);
                                 ClearEol(0, 8);
                                 for (;;) {
@@ -378,11 +396,11 @@ void cInterface::QueryKeys(void)
                }
             }
         if (k > Keys.keys)
-           WriteText(1, 7, "(press 'Up' to go back)");
+           WriteText(1, 7, tr("(press 'Up' to go back)"));
         else
            ClearEol(0, 7);
         if (k > Keys.keys + 1)
-           WriteText(1, 8, "(press 'Down' to end key definition)");
+           WriteText(1, 8, tr("(press 'Down' to end key definition)"));
         else
            ClearEol(0, 8);
         }
@@ -396,9 +414,9 @@ void cInterface::LearnKeys(void)
       Clear();
       QueryKeys();
       Clear();
-      WriteText(1, 1, "Learning Remote Control Keys");
-      WriteText(1, 3, "Phase 3: Saving key codes");
-      WriteText(1, 5, "Press 'Up' to save, 'Down' to cancel");
+      WriteText(1, 1, tr("Learning Remote Control Keys"));
+      WriteText(1, 3, tr("Phase 3: Saving key codes"));
+      WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
       for (;;) {
           eKeys key = GetKey();
           if (key == kUp) {
diff --git a/interface.h b/interface.h
index 5dd8ee3ad..cd46fbaa7 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.19 2000/11/01 15:27:23 kls Exp $
+ * $Id: interface.h 1.20 2000/11/18 15:27:59 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -43,6 +43,7 @@ class cInterface {
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
   void Flush(void);
   void SetCols(int *c);
+  eDvbFont SetFont(eDvbFont Font);
   char *WrapText(const char *Text, int Width, int *Height);
   void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   void WriteText(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
diff --git a/menu.c b/menu.c
index c3611ccd3..3cf832819 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.40 2000/11/01 16:14:48 kls Exp $
+ * $Id: menu.c 1.52 2000/11/18 16:30:13 kls Exp $
  */
 
 #include "menu.h"
@@ -14,6 +14,7 @@
 #include <string.h>
 #include "config.h"
 #include "eit.h"
+#include "i18n.h"
 
 #define MENUTIMEOUT 120 // seconds
 
@@ -131,7 +132,7 @@ cMenuEditBoolItem::cMenuEditBoolItem(const char *Name, int *Value)
 void cMenuEditBoolItem::Set(void)
 {
   char buf[16];
-  snprintf(buf, sizeof(buf), "%s", *value ? "yes" : "no");
+  snprintf(buf, sizeof(buf), "%s", *value ? tr("yes") : tr("no"));
   SetValue(buf);
 }
 
@@ -493,6 +494,29 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
   return osContinue;
 }
 
+// --- cMenuEditStraItem -----------------------------------------------------
+
+class cMenuEditStraItem : public cMenuEditIntItem {
+private:
+  const char * const *strings;
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings);
+  };
+
+cMenuEditStraItem::cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings)
+:cMenuEditIntItem(Name, Value, 0, NumStrings - 1)
+{
+  strings = Strings;
+  Set();
+}
+
+void cMenuEditStraItem::Set(void)
+{
+  SetValue(strings[*value]);
+}
+
 // --- cMenuEditChannel ------------------------------------------------------
 
 class cMenuEditChannel : public cOsdMenu {
@@ -505,20 +529,20 @@ class cMenuEditChannel : public cOsdMenu {
   };
 
 cMenuEditChannel::cMenuEditChannel(int Index)
-:cOsdMenu("Edit Channel", 14)
+:cOsdMenu(tr("Edit Channel"), 14)
 {
   channel = Channels.Get(Index);
   if (channel) {
      data = *channel;
-     Add(new cMenuEditStrItem( "Name",          data.name, sizeof(data.name), FileNameChars));
-     Add(new cMenuEditIntItem( "Frequency",    &data.frequency, 10000, 13000)); //TODO exact limits???
-     Add(new cMenuEditChrItem( "Polarization", &data.polarization, "hv"));
-     Add(new cMenuEditIntItem( "Diseqc",       &data.diseqc, 0, 10)); //TODO exact limits???
-     Add(new cMenuEditIntItem( "Srate",        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
-     Add(new cMenuEditIntItem( "Vpid",         &data.vpid, 0, 10000)); //TODO exact limits???
-     Add(new cMenuEditIntItem( "Apid",         &data.apid, 0, 10000)); //TODO exact limits???
-     Add(new cMenuEditIntItem( "CA",           &data.ca, 0, cDvbApi::NumDvbApis));
-     Add(new cMenuEditIntItem( "Pnr",          &data.pnr, 0));
+     Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), FileNameChars));
+     Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency, 10000, 13000)); //TODO exact limits???
+     Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
+     Add(new cMenuEditIntItem( tr("Diseqc"),       &data.diseqc, 0, 10)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("Srate"),        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
+     Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("Apid"),         &data.apid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("CA"),           &data.ca, 0, cDvbApi::NumDvbApis));
+     Add(new cMenuEditIntItem( tr("Pnr"),          &data.pnr, 0));
      }
 }
 
@@ -589,18 +613,18 @@ class cMenuChannels : public cOsdMenu {
   };
 
 cMenuChannels::cMenuChannels(void)
-:cOsdMenu("Channels", 4)
+:cOsdMenu(tr("Channels"), 4)
 {
   //TODO
   int i = 0;
   cChannel *channel;
-  int curr = ((channel = Channels.GetByNumber(CurrentChannel)) != NULL) ? channel->Index() : -1;
+  int curr = ((channel = Channels.GetByNumber(cDvbApi::CurrentChannel())) != NULL) ? channel->Index() : -1;
 
   while ((channel = Channels.Get(i)) != NULL) {
         Add(new cMenuChannelItem(i, channel), i == curr);
         i++;
         }
-  SetHelp("Edit", "New", "Delete", "Mark");
+  SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
 }
 
 eOSState cMenuChannels::Switch(void)
@@ -641,11 +665,11 @@ eOSState cMenuChannels::Del(void)
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
          if (ti->channel == DeletedChannel) {
-            Interface->Error("Channel is being used by a timer!");
+            Interface->Error(tr("Channel is being used by a timer!"));
             return osContinue;
             }
          }
-     if (Interface->Confirm("Delete Channel?")) {
+     if (Interface->Confirm(tr("Delete Channel?"))) {
         // Move and renumber the channels:
         Channels.Del(channel);
         Channels.ReNumber();
@@ -733,8 +757,9 @@ class cMenuTextItem : public cOsdItem {
   char *text;
   int x, y, w, h, lines, offset;
   eDvbColor fgColor, bgColor;
+  eDvbFont font;
 public:
-  cMenuTextItem(const char *Text, int X, int Y, int W, int H = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
+  cMenuTextItem(const char *Text, int X, int Y, int W, int H = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground, eDvbFont Font = fontOsd);
   ~cMenuTextItem();
   int Height(void) { return h; }
   void Clear(void);
@@ -746,7 +771,7 @@ class cMenuTextItem : public cOsdItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbColor FgColor, eDvbColor BgColor)
+cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbColor FgColor, eDvbColor BgColor, eDvbFont Font)
 {
   x = X;
   y = Y;
@@ -754,8 +779,11 @@ cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbC
   h = H;
   fgColor = FgColor;
   bgColor = BgColor;
+  font = Font;
   offset = 0;
+  eDvbFont oldFont = Interface->SetFont(font);
   text = Interface->WrapText(Text, w - 1, &lines);
+  Interface->SetFont(oldFont);
   if (h < 0)
      h = lines;
 }
@@ -774,6 +802,7 @@ void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
 {
   int l = 0;
   char *t = text;
+  eDvbFont oldFont = Interface->SetFont(font);
   while (*t) {
         char *n = strchr(t, '\n');
         if (l >= offset) {
@@ -791,6 +820,7 @@ void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
         if (++l >= h + offset)
            break;
         }
+  Interface->SetFont(oldFont);
   // scroll indicators use inverted color scheme!
   if (CanScrollUp())   Interface->Write(x + w - 1, y,         "^", bgColor, fgColor);
   if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
@@ -826,26 +856,30 @@ eOSState cMenuTextItem::ProcessKey(eKeys Key)
   return osContinue;
 }
 
-// --- cMenuSummary ----------------------------------------------------------
+// --- cMenuText -------------------------------------------------------------
 
-class cMenuSummary : public cOsdMenu {
+class cMenuText : public cOsdMenu {
 public:
-  cMenuSummary(const char *Text);
+  cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuSummary::cMenuSummary(const char *Text)
-:cOsdMenu("Summary")
+cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
+:cOsdMenu(Title)
 {
-  Add(new cMenuTextItem(Text, 1, 2, MenuColumns - 2, MAXOSDITEMS));
+  Add(new cMenuTextItem(Text, 1, 2, MenuColumns - 2, MAXOSDITEMS, clrWhite, clrBackground, Font));
 }
 
-eOSState cMenuSummary::ProcessKey(eKeys Key)
+eOSState cMenuText::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
 
-  if (state == osUnknown)
-     state = osContinue;
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk: return osBack;
+       default:  state = osContinue;
+       }
+     }
   return state;
 }
 
@@ -861,22 +895,22 @@ class cMenuEditTimer : public cOsdMenu {
   };
 
 cMenuEditTimer::cMenuEditTimer(int Index, bool New)
-:cOsdMenu("Edit Timer", 10)
+:cOsdMenu(tr("Edit Timer"), 12)
 {
   timer = Timers.Get(Index);
   if (timer) {
      data = *timer;
      if (New)
         data.active = 1;
-     Add(new cMenuEditBoolItem("Active",       &data.active));
-     Add(new cMenuEditChanItem("Channel",      &data.channel)); 
-     Add(new cMenuEditDayItem( "Day",          &data.day)); 
-     Add(new cMenuEditTimeItem("Start",        &data.start)); 
-     Add(new cMenuEditTimeItem("Stop",         &data.stop)); 
+     Add(new cMenuEditBoolItem(tr("Active"),       &data.active));
+     Add(new cMenuEditChanItem(tr("Channel"),      &data.channel)); 
+     Add(new cMenuEditDayItem( tr("Day"),          &data.day)); 
+     Add(new cMenuEditTimeItem(tr("Start"),        &data.start)); 
+     Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop)); 
 //TODO VPS???
-     Add(new cMenuEditIntItem( "Priority",     &data.priority, 0, 99));
-     Add(new cMenuEditIntItem( "Lifetime",     &data.lifetime, 0, 99));
-     Add(new cMenuEditStrItem( "File",          data.file, sizeof(data.file), FileNameChars));
+     Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, 99));
+     Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, 99));
+     Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), FileNameChars));
      }
 }
 
@@ -885,16 +919,21 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
-     if (Key == kOk) {
-        if (!*data.file)
-           strcpy(data.file, Channels.GetChannelNameByNumber(data.channel));
-        if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
-           *timer = data;
-           Timers.Save();
-           isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
-           }
-        state = osBack;
-        }
+     switch (Key) {
+       case kOk:     if (!*data.file)
+                        strcpy(data.file, Channels.GetChannelNameByNumber(data.channel));
+                     if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
+                        *timer = data;
+                        Timers.Save();
+                        isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+                        }
+                     return osBack;
+       case kRed:
+       case kGreen:
+       case kYellow:
+       case kBlue:   return osContinue;
+       default: break;
+       }
      }
   return state;
 }
@@ -948,7 +987,7 @@ class cMenuTimers : public cOsdMenu {
   };
 
 cMenuTimers::cMenuTimers(void)
-:cOsdMenu("Timer", 2, 4, 10, 6, 6)
+:cOsdMenu(tr("Timers"), 2, 4, 10, 6, 6)
 {
   int i = 0;
   cTimer *timer;
@@ -957,7 +996,7 @@ cMenuTimers::cMenuTimers(void)
         Add(new cMenuTimerItem(i, timer));
         i++;
         }
-  SetHelp("Edit", "New", "Delete", "Mark");
+  SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
 }
 
 eOSState cMenuTimers::Activate(bool On)
@@ -1000,7 +1039,7 @@ eOSState cMenuTimers::Del(void)
   cTimer *ti = Timers.Get(Index);
   if (ti) {
      if (!ti->recording) {
-        if (Interface->Confirm("Delete Timer?")) {
+        if (Interface->Confirm(tr("Delete Timer?"))) {
            Timers.Del(Timers.Get(Index));
            cOsdMenu::Del(Index);
            Timers.Save();
@@ -1009,7 +1048,7 @@ eOSState cMenuTimers::Del(void)
            }
         }
      else
-        Interface->Error("Timer is recording!");
+        Interface->Error(tr("Timer is recording!"));
      }
   return osContinue;
 }
@@ -1029,7 +1068,7 @@ eOSState cMenuTimers::Summary(void)
      return osContinue;
   cTimer *ti = Timers.Get(Current());
   if (ti && ti->summary && *ti->summary)
-     return AddSubMenu(new cMenuSummary(ti->summary));
+     return AddSubMenu(new cMenuText(tr("Summary"), ti->summary));
   return Edit(); // convenience for people not using the Summary feature ;-)
 }
 
@@ -1064,29 +1103,42 @@ class cMenuEvent : public cOsdMenu {
 };
 
 cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
-:cOsdMenu("Event")
+:cOsdMenu(tr("Event"))
 {
   eventInfo = EventInfo;
   if (eventInfo) {
      cChannel *channel = Channels.GetByServiceID(eventInfo->GetServiceID());
      if (channel) {
-        const char *p;
         char *buffer;
-        asprintf(&buffer, "%-17.*s %.*s  %s - %s", 17, channel->name, 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
+        asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->name, 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
         SetTitle(buffer, false);
         int Line = 2;
         cMenuTextItem *item;
-        if (!isempty(p = eventInfo->GetTitle())) {
-           Add(item = new cMenuTextItem(p, 1, Line, MenuColumns - 2, -1, clrCyan));
+        const char *Title = eventInfo->GetTitle();
+        const char *Subtitle = eventInfo->GetSubtitle();
+        const char *ExtendedDescription = eventInfo->GetExtendedDescription();
+        // Some channels send a 'Subtitle' that should actually be the 'ExtendedDescription'
+        // (their 'ExtendedDescription' is then empty). In order to handle this correctly
+        // we silently shift that text to where it belongs.
+        // The German TV station 'VOX' is notorious for this - why can't they do it correctly
+        // like all the others? Well, at least like those who actually send the full range
+        // of information (like, e.g., 'Sat.1'). Some stations (like 'RTL') don't even
+        // bother sending anything but the 'Title'...
+        if (isempty(ExtendedDescription) && !isempty(Subtitle) && strlen(Subtitle) > 2 * MenuColumns) {
+           ExtendedDescription = Subtitle;
+           Subtitle = NULL;
+           }
+        if (!isempty(Title)) {
+           Add(item = new cMenuTextItem(Title, 1, Line, MenuColumns - 2, -1, clrCyan));
            Line += item->Height() + 1;
            }
-        if (!isempty(p = eventInfo->GetSubtitle())) {
-           Add(item = new cMenuTextItem(p, 1, Line, MenuColumns - 2, -1, clrYellow));
+        if (!isempty(Subtitle)) {
+           Add(item = new cMenuTextItem(Subtitle, 1, Line, MenuColumns - 2, -1, clrYellow));
            Line += item->Height() + 1;
            }
-        if (!isempty(p = eventInfo->GetExtendedDescription()))
-           Add(new cMenuTextItem(p, 1, Line, MenuColumns - 2, Height() - Line - 2, clrCyan), true);
-        SetHelp("Record", NULL, NULL, CanSwitch ? "Switch" : NULL);
+        if (!isempty(ExtendedDescription))
+           Add(new cMenuTextItem(ExtendedDescription, 1, Line, MenuColumns - 2, Height() - Line - 2, clrCyan), true);
+        SetHelp(tr("Record"), NULL, NULL, CanSwitch ? tr("Switch") : NULL);
         }
      }
 }
@@ -1097,6 +1149,8 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
+       case kGreen:
+       case kYellow: return osContinue;
        case kOk:     return osBack;
        default: break;
        }
@@ -1127,18 +1181,22 @@ class cMenuWhatsOn : public cOsdMenu {
 private:
   eOSState Record(void);
   eOSState Switch(void);
+  static const cEventInfo *scheduleEventInfo;
 public:
   cMenuWhatsOn(const cSchedules *Schedules, bool Now);
+  static const cEventInfo *ScheduleEventInfo(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+const cEventInfo *cMenuWhatsOn::scheduleEventInfo = NULL;
+
 static int CompareEventChannel(const void *p1, const void *p2)
 {
   return (int)( (*(const cEventInfo **)p1)->GetChannelNumber() - (*(const cEventInfo **)p2)->GetChannelNumber());
 }
 
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now)
-:cOsdMenu(Now ? "What's on now?" : "What's on next?", 4, 7, 6)
+:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), 4, 7, 6)
 {
   const cSchedule *Schedule = Schedules->First();
   const cEventInfo **pArray = NULL;
@@ -1164,7 +1222,14 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now)
       Add(new cMenuWhatsOnItem(pArray[a]));
 
   delete pArray;
-  SetHelp("Record", Now ? "Next" : "Now", "Schedule", "Switch");
+  SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Schedule"), tr("Switch"));
+}
+
+const cEventInfo *cMenuWhatsOn::ScheduleEventInfo(void)
+{
+  const cEventInfo *ei = scheduleEventInfo;
+  scheduleEventInfo = NULL;
+  return ei;
 }
 
 eOSState cMenuWhatsOn::Switch(void)
@@ -1175,7 +1240,7 @@ eOSState cMenuWhatsOn::Switch(void)
      if (channel && channel->Switch())
         return osEnd;
      }
-  Interface->Error("Can't switch channel!");
+  Interface->Error(tr("Can't switch channel!"));
   return osContinue;
 }
 
@@ -1184,9 +1249,16 @@ eOSState cMenuWhatsOn::Record(void)
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {      
      cTimer *timer = new cTimer(item->eventInfo);
-     Timers.Add(timer);
-     Timers.Save();
-     isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+     cTimer *t = Timers.GetTimer(timer);
+     if (!t) {
+        Timers.Add(timer);
+        Timers.Save();
+        isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+        }
+     else {
+        delete timer;
+        timer = t;
+        }
      return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
      }
   return osContinue;
@@ -1199,7 +1271,12 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      switch (Key) {
        case kRed:    return Record();
-       case kYellow: return osBack;
+       case kYellow: {
+                       cMenuWhatsOnItem *mi = (cMenuWhatsOnItem *)Get(Current());
+                       if (mi)
+                          scheduleEventInfo = mi->eventInfo;
+                     }
+                     return osBack;
        case kBlue:   return Switch();
        case kOk:     if (Count())
                         return AddSubMenu(new cMenuEvent(((cMenuWhatsOnItem *)Get(Current()))->eventInfo, true));
@@ -1234,7 +1311,7 @@ class cMenuSchedule : public cOsdMenu {
   const cSchedules *schedules;
   bool now, next;
   eOSState Record(void);
-  void PrepareSchedule(void);
+  void PrepareSchedule(cChannel *Channel);
   void PrepareWhatsOnNext(bool On);
 public:
   cMenuSchedule(void);
@@ -1242,17 +1319,15 @@ class cMenuSchedule : public cOsdMenu {
   };
 
 cMenuSchedule::cMenuSchedule(void)
-:cOsdMenu("Schedule", 6, 6)
+:cOsdMenu("", 6, 6)
 {
   now = next = false;
-  cChannel *channel = Channels.GetByNumber(CurrentChannel);
+  cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
   if (channel) {
-     char *buffer = NULL;
-     asprintf(&buffer, "Schedule - %s", channel->name);
-     SetTitle(buffer, false);
+     schedules = cDvbApi::PrimaryDvbApi->Schedules(&threadLock);
+     PrepareSchedule(channel);
+     SetHelp(tr("Record"), tr("Now"), tr("Next"));
      }
-  PrepareSchedule();
-  SetHelp("Record", "Now", "Next");
 }
 
 static int CompareEventTime(const void *p1, const void *p2)
@@ -1260,11 +1335,14 @@ static int CompareEventTime(const void *p1, const void *p2)
   return (int)((*(cEventInfo **)p1)->GetTime() - (*(cEventInfo **)p2)->GetTime());
 }
 
-void cMenuSchedule::PrepareSchedule(void)
+void cMenuSchedule::PrepareSchedule(cChannel *Channel)
 {
-  schedules = cDvbApi::PrimaryDvbApi->Schedules(&threadLock);
+  Clear();
+  char *buffer = NULL;
+  asprintf(&buffer, tr("Schedule - %s"), Channel->name);
+  SetTitle(buffer, false);
   if (schedules) {
-     const cSchedule *Schedule = schedules->GetSchedule();
+     const cSchedule *Schedule = Channel->pnr ? schedules->GetSchedule(Channel->pnr) : schedules->GetSchedule();
      int num = Schedule->NumEvents();
      const cEventInfo **pArray = (const cEventInfo **)malloc(num * sizeof(cEventInfo *));
      if (pArray) {
@@ -1290,9 +1368,16 @@ eOSState cMenuSchedule::Record(void)
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {      
      cTimer *timer = new cTimer(item->eventInfo);
-     Timers.Add(timer);
-     Timers.Save();
-     isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+     cTimer *t = Timers.GetTimer(timer);
+     if (!t) {
+        Timers.Add(timer);
+        Timers.Save();
+        isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+        }
+     else {
+        delete timer;
+        timer = t;
+        }
      return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
      }
   return osContinue;
@@ -1319,8 +1404,17 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        default:      break;
        }
      }
-  else if (!HasSubMenu())
+  else if (!HasSubMenu()) {
      now = next = false;
+     const cEventInfo *ei = cMenuWhatsOn::ScheduleEventInfo();
+     if (ei) {
+        cChannel *channel = Channels.GetByServiceID(ei->GetServiceID());
+        if (channel) {
+           PrepareSchedule(channel);
+           Display();
+           }
+        }
+     }
   return state;
 }
 
@@ -1347,7 +1441,7 @@ void cMenuRecordingItem::Set(void)
 // --- cMenuRecordings -------------------------------------------------------
 
 cMenuRecordings::cMenuRecordings(void)
-:cOsdMenu("Recordings", 6, 6)
+:cOsdMenu(tr("Recordings"), 6, 6)
 {
   if (Recordings.Load()) {
      const char *lastReplayed = cReplayControl::LastReplayed();
@@ -1357,7 +1451,7 @@ cMenuRecordings::cMenuRecordings(void)
            recording = Recordings.Next(recording);
            }
      }
-  SetHelp("Play", NULL, "Delete", "Summary");
+  SetHelp(tr("Play"), NULL, tr("Delete"), tr("Summary"));
   Display();
 }
 
@@ -1377,18 +1471,18 @@ eOSState cMenuRecordings::Del(void)
   if (ri) {
 //XXX what if this recording's file is currently in use???
 //XXX     if (!ti->recording) {
-        if (Interface->Confirm("Delete Recording?")) {
+        if (Interface->Confirm(tr("Delete Recording?"))) {
            if (ri->recording->Delete()) {
               cReplayControl::ClearLastReplayed(ri->recording->FileName());
               cOsdMenu::Del(Current());
               Display();
               }
            else
-              Interface->Error("Error while deleting recording!");
+              Interface->Error(tr("Error while deleting recording!"));
            }
 //XXX        }
 //XXX     else
-//XXX        Interface->Error("Timer is recording!");
+//XXX        Interface->Error(tr("Timer is recording!"));
      }
   return osContinue;
 }
@@ -1399,7 +1493,7 @@ eOSState cMenuRecordings::Summary(void)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && ri->recording->Summary() && *ri->recording->Summary())
-     return AddSubMenu(new cMenuSummary(ri->recording->Summary()));
+     return AddSubMenu(new cMenuText(tr("Summary"), ri->recording->Summary()));
   return osContinue;
 }
 
@@ -1425,24 +1519,36 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
 class cMenuSetup : public cOsdMenu {
 private:
   cSetup data;
+  int osdLanguage;
+  void Set(void);
 public:
   cMenuSetup(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuSetup::cMenuSetup(void)
-:cOsdMenu("Setup", 20)
+:cOsdMenu("", 25)
 {
   data = Setup;
-  Add(new cMenuEditIntItem( "PrimaryDVB",         &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
-  Add(new cMenuEditBoolItem("ShowInfoOnChSwitch", &data.ShowInfoOnChSwitch));
-  Add(new cMenuEditBoolItem("MenuScrollPage",     &data.MenuScrollPage));
-  Add(new cMenuEditBoolItem("MarkInstantRecord",  &data.MarkInstantRecord));
-  Add(new cMenuEditIntItem( "LnbFrequLo",         &data.LnbFrequLo));
-  Add(new cMenuEditIntItem( "LnbFrequHi",         &data.LnbFrequHi));
-  Add(new cMenuEditIntItem( "SetSystemTime",      &data.SetSystemTime));
-  Add(new cMenuEditIntItem( "MarginStart",        &data.MarginStart));
-  Add(new cMenuEditIntItem( "MarginStop",         &data.MarginStop));
+  osdLanguage = Setup.OSDLanguage;
+  Set();
+}
+
+void cMenuSetup::Set(void)
+{
+  Clear();
+  SetTitle(tr("Setup"));
+  Add(new cMenuEditStraItem(tr("OSD-Language"),       &data.OSDLanguage, NumLanguages, Languages()));
+  Add(new cMenuEditIntItem( tr("PrimaryDVB"),         &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
+  Add(new cMenuEditBoolItem(tr("ShowInfoOnChSwitch"), &data.ShowInfoOnChSwitch));
+  Add(new cMenuEditBoolItem(tr("MenuScrollPage"),     &data.MenuScrollPage));
+  Add(new cMenuEditBoolItem(tr("MarkInstantRecord"),  &data.MarkInstantRecord));
+  Add(new cMenuEditIntItem( tr("LnbFrequLo"),         &data.LnbFrequLo));
+  Add(new cMenuEditIntItem( tr("LnbFrequHi"),         &data.LnbFrequHi));
+  Add(new cMenuEditBoolItem(tr("SetSystemTime"),      &data.SetSystemTime));
+  Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
+  Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
+  Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1451,7 +1557,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
+       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osEnd;
                  cDvbApi::PrimaryDvbApi->SetUseTSTime(data.SetSystemTime);
                  Setup = data;
                  Setup.Save();
@@ -1459,23 +1565,79 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (data.OSDLanguage != osdLanguage) {
+     int OriginalOSDLanguage = Setup.OSDLanguage;
+     Setup.OSDLanguage = data.OSDLanguage;
+     Set();
+     Display();
+     osdLanguage = data.OSDLanguage;
+     Setup.OSDLanguage = OriginalOSDLanguage;
+     }
+  return state;
+}
+
+// --- cMenuCommands ---------------------------------------------------------
+
+class cMenuCommands : public cOsdMenu {
+private:
+  eOSState Execute(void);
+public:
+  cMenuCommands(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuCommands::cMenuCommands(void)
+:cOsdMenu(tr("Commands"))
+{
+  int i = 0;
+  cCommand *command;
+
+  while ((command = Commands.Get(i)) != NULL) {
+        Add(new cOsdItem(command->Title()));
+        i++;
+        }
+}
+
+eOSState cMenuCommands::Execute(void)
+{
+  cCommand *command = Commands.Get(Current());
+  if (command) {
+     const char *Result = command->Execute();
+     if (Result)
+        return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
+     }
+  return osContinue;
+}
+
+eOSState cMenuCommands::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:  return Execute();
+       default:   break;
+       }
+     }
   return state;
 }
 
 // --- cMenuMain -------------------------------------------------------------
 
-#define STOP_RECORDING "Stop recording "
+#define STOP_RECORDING tr("Stop recording ")
 
 cMenuMain::cMenuMain(bool Replaying)
-:cOsdMenu("Main")
-{
-  Add(new cOsdItem("Schedule",   osSchedule));
-  Add(new cOsdItem("Channels",   osChannels));
-  Add(new cOsdItem("Timer",      osTimer));
-  Add(new cOsdItem("Recordings", osRecordings));
-  Add(new cOsdItem("Setup",      osSetup));
+:cOsdMenu(tr("Main"))
+{
+  Add(new cOsdItem(tr("Schedule"),   osSchedule));
+  Add(new cOsdItem(tr("Channels"),   osChannels));
+  Add(new cOsdItem(tr("Timers"),     osTimers));
+  Add(new cOsdItem(tr("Recordings"), osRecordings));
+  Add(new cOsdItem(tr("Setup"),      osSetup));
+  if (Commands.Count())
+     Add(new cOsdItem(tr("Commands"),  osCommands));
   if (Replaying)
-     Add(new cOsdItem("Stop replaying", osStopReplay));
+     Add(new cOsdItem(tr("Stop replaying"), osStopReplay));
   const char *s = NULL;
   while ((s = cRecordControls::GetInstantId(s)) != NULL) {
         char *buffer = NULL;
@@ -1483,7 +1645,7 @@ cMenuMain::cMenuMain(bool Replaying)
         Add(new cOsdItem(buffer, osStopRecord));
         delete buffer;
         }
-  SetHelp("Record", NULL, NULL, cReplayControl::LastReplayed() ? "Resume" : NULL);
+  SetHelp(tr("Record"), NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -1495,10 +1657,11 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   switch (state) {
     case osSchedule:   return AddSubMenu(new cMenuSchedule);
     case osChannels:   return AddSubMenu(new cMenuChannels);
-    case osTimer:      return AddSubMenu(new cMenuTimers);
+    case osTimers:     return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
     case osSetup:      return AddSubMenu(new cMenuSetup);
-    case osStopRecord: if (Interface->Confirm("Stop Recording?")) {
+    case osCommands:   return AddSubMenu(new cMenuCommands);
+    case osStopRecord: if (Interface->Confirm(tr("Stop Recording?"))) {
                           cOsdItem *item = Get(Current());
                           if (item) {
                              cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
@@ -1547,7 +1710,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
 cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdBase(true)
 {
-  oldNumber = CurrentChannel;
+  oldNumber = cDvbApi::CurrentChannel();
   number = 0;
   lastTime = time_ms();
   Interface->Open(MenuColumns, 5);
@@ -1571,7 +1734,7 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
      if (Channel && Channel->number)
         snprintf(buffer, BufSize, "%d  %s", Channel->number, Channel->name);
      else
-        snprintf(buffer, BufSize, "%s", Channel ? Channel->name : "*** Invalid Channel ***");
+        snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
      Interface->Fill(0, 0, MenuColumns, 1, clrBackground);
      Interface->Write(0, 0, buffer);
      time_t t = time(NULL);
@@ -1697,12 +1860,12 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
      timer = new cTimer(true);
      Timers.Add(timer);
      Timers.Save();
-     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s on %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->Index() + 1);
+     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->Index() + 1);
      }
   timer->SetRecording(true);
   Channels.SwitchTo(timer->channel, dvbApi);
   cRecording Recording(timer);
-  if (dvbApi->StartRecord(Recording.FileName()))
+  if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
      Recording.WriteSummary();
   Interface->DisplayRecording(dvbApi->Index(), true);
 }
@@ -1744,12 +1907,13 @@ cRecordControl *cRecordControls::RecordControls[MAXDVBAPI] = { NULL };
 
 bool cRecordControls::Start(cTimer *Timer)
 {
-  int ch = Timer ? Timer->channel : CurrentChannel;
+  int ch = Timer ? Timer->channel : cDvbApi::CurrentChannel();
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
-     cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca);
+     cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca, Timer ? Timer->priority : DEFAULTPRIORITY);
      if (dvbApi) {
+        Stop(dvbApi);
         for (int i = 0; i < MAXDVBAPI; i++) {
             if (!RecordControls[i]) {
                RecordControls[i] = new cRecordControl(dvbApi, Timer);
@@ -1776,6 +1940,18 @@ void cRecordControls::Stop(const char *InstantId)
       }
 }
 
+void cRecordControls::Stop(cDvbApi *DvbApi)
+{
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (RecordControls[i]) {
+         if (RecordControls[i]->Uses(DvbApi)) {
+            isyslog(LOG_INFO, "stopping recording on DVB device %d due to higher priority", DvbApi->Index() + 1);
+            RecordControls[i]->Stop();
+            }
+         }
+      }
+}
+
 const char *cRecordControls::GetInstantId(const char *LastInstantId)
 {
   for (int i = 0; i < MAXDVBAPI; i++) {
diff --git a/menu.h b/menu.h
index d979069e4..8153f5d78 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.13 2000/11/01 14:03:09 kls Exp $
+ * $Id: menu.h 1.14 2000/11/12 12:33:00 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -59,6 +59,7 @@ class cRecordControl {
   cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
   virtual ~cRecordControl();
   bool Process(void);
+  bool Uses(cDvbApi *DvbApi) { return DvbApi == dvbApi; }
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
   const char *InstantId(void) { return instantId; }
@@ -70,6 +71,7 @@ class cRecordControls {
 public:
   static bool Start(cTimer *Timer = NULL);
   static void Stop(const char *InstantId);
+  static void Stop(cDvbApi *DvbApi);
   static const char *GetInstantId(const char *LastInstantId);
   static void Process(void);
   };
diff --git a/osd.c b/osd.c
index f3458274b..bc9c94850 100644
--- a/osd.c
+++ b/osd.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.11 2000/11/01 11:21:51 kls Exp $
+ * $Id: osd.c 1.13 2000/11/12 15:29:25 kls Exp $
  */
 
 #include "osd.h"
 #include <assert.h>
 #include <string.h>
+#include "i18n.h"
 
 // --- cOsdItem --------------------------------------------------------------
 
@@ -188,6 +189,13 @@ void cOsdMenu::DisplayCurrent(bool Current)
      item->Display(current - first, Current ? clrBlack : clrWhite, Current ? clrCyan : clrBackground);
 }
 
+void cOsdMenu::Clear(void)
+{
+  first = 0;
+  current = marked = -1;
+  cList<cOsdItem>::Clear();
+}
+
 bool cOsdMenu::SpecialItem(int idx)
 {
   cOsdItem *item = Get(idx);
@@ -248,7 +256,7 @@ void cOsdMenu::Mark(void)
 {
   if (Count() && marked < 0) {
      marked = current;
-     SetStatus("Up/Dn for new location - OK to move");
+     SetStatus(tr("Up/Dn for new location - OK to move"));
      }
 }
 
diff --git a/osd.h b/osd.h
index 473e87de4..0d8085dfd 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.14 2000/11/01 14:29:07 kls Exp $
+ * $Id: osd.h 1.17 2000/11/12 15:27:34 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -21,9 +21,10 @@ enum eOSState { osUnknown,
                 osContinue,
                 osSchedule,
                 osChannels,
-                osTimer,
+                osTimers,
                 osRecordings,
                 osSetup,
+                osCommands,
                 osRecord,
                 osReplay,
                 osStopRecord,
@@ -77,6 +78,7 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   const char *status;
 protected:
   bool visible;
+  virtual void Clear(void);
   bool SpecialItem(int idx);
   void RefreshCurrent(void);
   void DisplayCurrent(bool Current);
diff --git a/recording.c b/recording.c
index 3ddf8d350..f45be9632 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.20 2000/11/01 16:00:36 kls Exp $
+ * $Id: recording.c 1.21 2000/11/18 16:22:29 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -32,6 +32,7 @@
 #define MINDISKSPACE 1024 // MB
 
 #define DISKCHECKDELTA 300 // seconds between checks for free disk space
+#define REMOVELATENCY   10 // seconds to wait until next check after removing a file 
 
 void AssertFreeDiskSpace(void)
 {
@@ -51,8 +52,10 @@ void AssertFreeDiskSpace(void)
                     r0 = r;
                  r = Recordings.Next(r);
                  }
-           if (r0 && r0->Remove())
+           if (r0 && r0->Remove()) {
+              LastFreeDiskCheck += REMOVELATENCY;
               return;
+              }
            }
         // No "deleted" files to remove, so let's see if we can delete a recording:
         if (Recordings.Load(false)) {
diff --git a/remote.c b/remote.c
index f60d7685c..349a44527 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.18 2000/10/08 16:49:41 kls Exp $
+ * $Id: remote.c 1.19 2000/11/11 11:22:22 kls Exp $
  */
 
 #include "remote.h"
@@ -73,7 +73,7 @@ bool cRcIoKBD::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
 {
   if (Command) {
      *Command = getch();
-     return *Command > 0;
+     return int(*Command) > 0;
      }
   return false;
 }
diff --git a/svdrp.c b/svdrp.c
index cf91cafb2..66ae8e9ad 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.11 2000/10/08 12:21:14 kls Exp $
+ * $Id: svdrp.c 1.12 2000/11/05 13:44:42 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -302,13 +302,13 @@ void cSVDRP::CmdCHAN(const char *Option)
            n = o;
         }
      else if (strcmp(Option, "-") == 0) {
-        n = CurrentChannel;
-        if (CurrentChannel > 1)
+        n = cDvbApi::CurrentChannel();
+        if (n > 1)
            n--;
         }
      else if (strcmp(Option, "+") == 0) {
-        n = CurrentChannel;
-        if (CurrentChannel < Channels.MaxNumber())
+        n = cDvbApi::CurrentChannel();
+        if (n < Channels.MaxNumber())
            n++;
         }
      else {
@@ -342,11 +342,11 @@ void cSVDRP::CmdCHAN(const char *Option)
         return;
         }
      }
-  cChannel *channel = Channels.GetByNumber(CurrentChannel);
+  cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
   if (channel)
-     Reply(250, "%d %s", CurrentChannel, channel->name);
+     Reply(250, "%d %s", channel->number, channel->name);
   else
-     Reply(550, "Unable to find channel \"%d\"", CurrentChannel);
+     Reply(550, "Unable to find channel \"%d\"", cDvbApi::CurrentChannel());
 }
 
 void cSVDRP::CmdDELC(const char *Option)
diff --git a/thread.c b/thread.c
index b124581fc..67b5ab96e 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.3 2000/10/28 15:26:02 kls Exp $
+ * $Id: thread.c 1.4 2000/11/14 18:38:25 kls Exp $
  */
 
 #include "thread.h"
@@ -24,7 +24,6 @@ cThread::cThread(void)
      signal(SIGIO, SignalHandler);
      signalHandlerInstalled = true;
      }
-  pthread_mutex_init(&mutex, NULL);
   running = false;
   parentPid = lockingPid = 0;
   locked = 0;
@@ -32,7 +31,6 @@ cThread::cThread(void)
 
 cThread::~cThread()
 {
-  pthread_mutex_destroy(&mutex);
 }
 
 void cThread::SignalHandler(int signum)
@@ -64,7 +62,7 @@ void cThread::Stop(void)
 bool cThread::Lock(void)
 {
   if (!lockingPid || lockingPid != getpid()) {
-     pthread_mutex_lock(&mutex);
+     Mutex.Lock();
      lockingPid = getpid();
      }
   locked++;
@@ -75,7 +73,7 @@ void cThread::Unlock(void)
 {
   if (!--locked) {
      lockingPid = 0;
-     pthread_mutex_unlock(&mutex);
+     Mutex.Unlock();
      }
 }
 
diff --git a/thread.h b/thread.h
index b47f6d715..c85c51e2c 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.2 2000/10/28 15:08:09 kls Exp $
+ * $Id: thread.h 1.3 2000/11/14 18:38:11 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -13,11 +13,21 @@
 #include <pthread.h>
 #include <sys/types.h>
 
+class cMutex {
+private:
+  pthread_mutex_t mutex;
+public:
+  cMutex(void) { pthread_mutex_init(&mutex, NULL); }
+  ~cMutex() { pthread_mutex_destroy(&mutex); }
+  void Lock(void) { pthread_mutex_lock(&mutex); }
+  void Unlock(void) { pthread_mutex_unlock(&mutex); }
+  };
+
 class cThread {
   friend class cThreadLock;
 private:
   pthread_t thread;
-  pthread_mutex_t mutex;
+  cMutex Mutex;
   pid_t parentPid, lockingPid;
   int locked;
   bool running;
diff --git a/timers.conf b/timers.conf
index 8f6bcf2fb..05946a53a 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,15 +1,14 @@
-1:15:M------:2128:2205:99:7:Neues:
+1:15:M------:2128:2205:80:7:Neues:
 1:3:-T-----:2013:2125:99:99:SevenDays:
 1:10:-T-----:2058:2202:99:10:Quarks:
-1:26:-T-----:2250:0005:99:99:UFO:
-1:14:--W----:1920:2020:99:99:Rettungsflieger:
+1:25:-T-----:2305:0020:99:99:UFO:
+1:14:--W----:1920:2020:70:99:Rettungsflieger:
 0:2:--W----:2110:2325:99:99:BulleVonToelz:
-1:3:---T---:2210:2315:99:10:IngoAppelt:
+1:3:---T---:2210:2315:50:20:IngoAppelt:
 1:2:----F--:2013:2125:99:99:Farscape:
-1:1:----F--:2215:2325:99:99:7Tage7Koepfe:
-1:11:-----S-:2058:2135:99:99:Computer:
-1:2:-----S-:2250:0005:99:30:Wochenshow:
+1:1:----F--:2215:2325:50:20:7Tage7Koepfe:
+0:11:-----S-:2058:2135:99:99:Computer:
+0:2:-----S-:2220:2340:99:30:Wochenshow:
 1:11:------S:2013:2035:99:10:Centauri:
 1:15:MTWTF--:1828:1901:10:5:nano:
 1:1:MTWTF--:1553:1710:99:99:Hammerman:
-1:3:3:0220:0350:99:99:Seven Days - Das Tor zur Zeit:Die Rache des Alien||Als das Zeitsprung-Team die Leiche eines bei Roswell gefundenen Aliens obduziert, entdecken sie einen Chip in seiner Wirbels�ule. Dr. Ballard, der �hnliche R�ckenprobleme wie der Alien hat, l�sst sich den Chip einsetzen. Tats�chlich regeneriert Ballard vollst�ndig. Doch dann �ndert sich sein Verhalten: Er wird dem Alien immer �hnlicher. Schlie�lich gelingt es ihm, mit einer Superwaffe Millionen Menschen zu t�ten - einschlie�lich des Zeitsprung-Teams. Nur Parker �berlebt.
diff --git a/tools.c b/tools.c
index 4acea0b3d..6d86f1620 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.22 2000/10/29 11:21:55 kls Exp $
+ * $Id: tools.c 1.23 2000/11/11 15:17:12 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -92,6 +92,18 @@ char *skipspace(const char *s)
   return (char *)s;
 }
 
+char *stripspace(char *s)
+{
+  if (s && *s) {
+     for (char *p = s + strlen(s) - 1; p >= s; p--) {
+         if (!isspace(*p))
+            break;
+         *p = 0;
+         }
+     }
+  return s;
+}
+
 bool isempty(const char *s)
 {
   return !(s && *skipspace(s));
diff --git a/tools.h b/tools.h
index b5bdd278d..f83e7da4a 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.18 2000/10/29 11:19:20 kls Exp $
+ * $Id: tools.h 1.20 2000/11/12 15:27:06 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -41,6 +41,7 @@ char *readline(FILE *f);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
 char *skipspace(const char *s);
+char *stripspace(char *s);
 bool isempty(const char *s);
 int time_ms(void);
 void delay_ms(int ms);
@@ -95,7 +96,7 @@ class cListBase {
   void Del(cListObject *Object);
   virtual void Move(int From, int To);
   void Move(cListObject *From, cListObject *To);
-  void Clear(void);
+  virtual void Clear(void);
   cListObject *Get(int Index) const;
   int Count(void) const;
   };
diff --git a/vdr.c b/vdr.c
index b1321aef2..8a842003a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.41 2000/11/01 14:31:32 kls Exp $
+ * $Id: vdr.c 1.46 2000/11/18 13:46:56 kls Exp $
  */
 
 #include <getopt.h>
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include "config.h"
 #include "dvbapi.h"
+#include "i18n.h"
 #include "interface.h"
 #include "menu.h"
 #include "recording.h"
@@ -156,11 +157,6 @@ int main(int argc, char *argv[])
      }
   isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
 
-  // DVB interfaces:
-
-  if (!cDvbApi::Init())
-     abort();
-
   // Configuration data:
 
   if (!ConfigDirectory)
@@ -169,15 +165,23 @@ int main(int argc, char *argv[])
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
+  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
 #ifdef REMOTE_LIRC
   Keys.SetDummyValues();
 #else
   bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
 #endif
 
+  // DVB interfaces:
+
+  if (!cDvbApi::Init())
+     abort();
+
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
-  Channels.SwitchTo(CurrentChannel);
+  Channels.SwitchTo(1);
+
+  cEITScanner EITScanner;
 
   // User interface:
 
@@ -199,15 +203,15 @@ int main(int argc, char *argv[])
   cOsdBase *Menu = NULL;
   cReplayControl *ReplayControl = NULL;
   int LastChannel = -1;
-  int PreviousChannel = CurrentChannel;
+  int PreviousChannel = cDvbApi::CurrentChannel();
 
   while (!Interrupted) {
         // Channel display:
-        if (CurrentChannel != LastChannel) {
+        if (!EITScanner.Active() && cDvbApi::CurrentChannel() != LastChannel) {
            if (!Menu)
-              Menu = new cDisplayChannel(CurrentChannel, LastChannel > 0);
+              Menu = new cDisplayChannel(cDvbApi::CurrentChannel(), LastChannel > 0);
            PreviousChannel = LastChannel;
-           LastChannel = CurrentChannel;
+           LastChannel = cDvbApi::CurrentChannel();
            }
         // Timers and Recordings:
         if (!Menu) {
@@ -222,6 +226,8 @@ int main(int argc, char *argv[])
         // User Input:
         cOsdBase **Interact = Menu ? &Menu : (cOsdBase **)&ReplayControl;
         eKeys key = Interface->GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
+        if (NORMALKEY(key) != kNone)
+           EITScanner.Activity();
         if (*Interact) {
            switch ((*Interact)->ProcessKey(key)) {
              case osMenu:   DELETENULL(Menu);
@@ -229,7 +235,7 @@ int main(int argc, char *argv[])
                             break;
              case osRecord: DELETENULL(Menu);
                             if (!cRecordControls::Start())
-                               Interface->Error("No free DVB device to record!");
+                               Interface->Error(tr("No free DVB device to record!"));
                             break;
              case osRecordings:
                             DELETENULL(Menu);
@@ -246,7 +252,7 @@ int main(int argc, char *argv[])
                             break;
              case osSwitchDvb:
                             DELETENULL(*Interact);
-                            Interface->Info("Switching primary DVB...");
+                            Interface->Info(tr("Switching primary DVB..."));
                             cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
                             break;
              case osBack:
@@ -259,7 +265,7 @@ int main(int argc, char *argv[])
            switch (key) {
              // Toggle channels:
              case k0:
-                  if (PreviousChannel != CurrentChannel)
+                  if (PreviousChannel != cDvbApi::CurrentChannel())
                      Channels.SwitchTo(PreviousChannel);
                   break;
              // Direct Channel Select:
@@ -287,7 +293,7 @@ int main(int argc, char *argv[])
              case kUp:
              case kDown|k_Repeat:
              case kDown: if (!Interface->Recording()) {
-                            int n = CurrentChannel + (NORMALKEY(key) == kUp ? 1 : -1);
+                            int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
                             cChannel *channel = Channels.GetByNumber(n);
                             if (channel)
                                channel->Switch();
@@ -300,6 +306,8 @@ int main(int argc, char *argv[])
              default:    break;
              }
            }
+        if (!Menu)
+           EITScanner.Process();
         }
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
   delete Menu;

From 3fe3c15d5db9c1f3982ffe6dac1ae4ad56d1664d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Thu, 18 Jan 2001 18:00:00 +0100
Subject: [PATCH 016/307] Version 0.70 - VDR now requires driver version 0.8.1
 or higher. - Recordings are now saved in PES mode. Note that you now need to
 install the   driver *WITHOUT* 'outstream=0'! This is the default when you
 'make insmod' in   the DVB/driver directory.   Old recordings (in AV_PES
 mode) can still be replayed (as long as the driver   still supports replaying
 AV_PES files). The only limitation with this is that   in fast forward/back
 mode the picture may be slightly distorted and there may   be sound
 fragments. - The EPG data is now dumped into the file /video/epg.data every
 ten minutes.   Use the Perl script 'epg2html.pl' to convert the raw EPG data
 into a simple   HTML programme listing. - Fixed handling of channel switching
 with the "Blue" button in the "What's on   now/next?" menus. - Fixed saving
 the MarginStop setup parameter. - Fixed missing initialization in cConfig. -
 Implemented "On Disk Editing". - There is no more default 'timers.conf' file.
 - Added Italian language texts (thanks to Alberto Carraro). - Fixed starting
 a replay session when the program is currently in "transfer   mode". - Fixed
 setting/modifying timers via SVDRP with empty summary fields. - Fixed a
 problem with recordings that have a single quote character in their   name
 (this is now mapped to 0x01). - Changed the value for Diseqc to '0' in the
 default 'channels.conf'. - Fixed displaying channels and recording status in
 the RCU's LED display when   a recording is interrupted due to higher
 priority. - Implemented safe writing of config files (first writes into a
 temporary file   and then renames it). - In case the video data stream is
 broken the log message will come only every   5 seconds. - The current
 channel is now saved in the 'setup.conf' file when VDR is cancelled,   and
 will be restored next time it is started (thanks to Deti Fliegl). - The EIT
 scanning thread is now locked when switching channels to avoid problems. -
 Encrypted channels can now be selected even without knowing the PNR (however,
 it   is still necessary for the EPG info).

---
 CONTRIBUTORS   |    6 +
 FORMATS        |   23 +
 HISTORY        |   38 ++
 INSTALL        |   17 +-
 MANUAL         |   46 ++
 Makefile       |    8 +-
 README         |    2 +-
 TODO           |    3 -
 channels.conf  |  291 ++++-----
 config.c       |   29 +-
 config.h       |   73 ++-
 dvb.c.071.diff |  100 ----
 dvbapi.c       | 1533 +++++++++++++++++++++++++++---------------------
 dvbapi.h       |   64 +-
 dvbosd.c       |   12 +-
 dvbosd.h       |    3 +-
 eit.c          |   58 +-
 eit.h          |    5 +-
 epg2html.pl    |   96 +++
 i18n.c         |  140 ++++-
 interface.c    |    8 +-
 interface.h    |    3 +-
 menu.c         |  265 +++++++--
 menu.h         |   11 +-
 osd.h          |    3 +-
 recording.c    |  112 +++-
 recording.h    |   25 +-
 remote.c       |    6 +-
 svdrp.c        |    3 +-
 thread.c       |   36 +-
 thread.h       |    7 +-
 timers.conf    |   14 -
 tools.c        |  119 ++--
 tools.h        |   33 +-
 vdr.c          |   15 +-
 videodir.c     |   19 +-
 videodir.h     |    3 +-
 37 files changed, 2056 insertions(+), 1173 deletions(-)
 delete mode 100644 dvb.c.071.diff
 create mode 100644 epg2html.pl
 delete mode 100644 timers.conf

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 279706da6..ee44ada63 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -43,3 +43,9 @@ Matthias Schniedermeyer <ms@citd.de>
 
 Miha Setina <mihasetina@softhome.net>
  for translating the OSD texts to the Slovenian language.
+
+Alberto Carraro <bertocar@tin.it>
+ for translating the OSD texts to the Italian language.
+
+Deti Fliegl <deti@fliegl.de>
+ for implementing the 'CurrentChannel' setup parameter.
diff --git a/FORMATS b/FORMATS
index 3eee494f6..ed52518d2 100644
--- a/FORMATS
+++ b/FORMATS
@@ -90,3 +90,26 @@ Video Disk Recorder File Formats
     CPU status        : /usr/loval/bin/cpustatus 2>&1
     Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
 
+* marks.vdr
+
+  This file (if present in a recording directory) contains the editing marks
+  defined for this recording.
+
+  Each line contains the definition of one mark in the following format:
+
+    hh:mm:ss.ff comment
+
+  where 'hh:mm:ss.ff' is a frame position within the recording, given as "hours,
+  minutes, seconds and (optional) frame number". 'comment' can be any string
+  and may be used to describe this mark. If present, 'comment' must be separated
+  from the frame position by at least one blank.
+
+  The lines in this file need not necessarily appear in the correct temporal
+  sequence, they will be automatically sorted by time index.
+
+  CURRENT RESTRICTIONS:
+
+  - the 'comment' is currently not used by VDR
+  - marks must have a frame number, and that frame MUST be an I-frame (this
+    means that only marks generated by VDR itself can be used, since they
+    will always be guaranteed to mark I-frames).
diff --git a/HISTORY b/HISTORY
index 485f24a2c..8d5e88494 100644
--- a/HISTORY
+++ b/HISTORY
@@ -311,3 +311,41 @@ Video Disk Recorder Revision History
   can receive a certain channel on the primary interface. This is currently in
   an early state and may still cause some problems, but it appears to work nice
   already.
+
+2001-01-18: Version 0.70
+
+- VDR now requires driver version 0.8.1 or higher.
+- Recordings are now saved in PES mode. Note that you now need to install the
+  driver *WITHOUT* 'outstream=0'! This is the default when you 'make insmod' in
+  the DVB/driver directory.
+  Old recordings (in AV_PES mode) can still be replayed (as long as the driver
+  still supports replaying AV_PES files). The only limitation with this is that
+  in fast forward/back mode the picture may be slightly distorted and there may
+  be sound fragments.
+- The EPG data is now dumped into the file /video/epg.data every ten minutes.
+  Use the Perl script 'epg2html.pl' to convert the raw EPG data into a simple
+  HTML programme listing.
+- Fixed handling of channel switching with the "Blue" button in the "What's on
+  now/next?" menus.
+- Fixed saving the MarginStop setup parameter.
+- Fixed missing initialization in cConfig.
+- Implemented "On Disk Editing".
+- There is no more default 'timers.conf' file.
+- Added Italian language texts (thanks to Alberto Carraro).
+- Fixed starting a replay session when the program is currently in "transfer
+  mode".
+- Fixed setting/modifying timers via SVDRP with empty summary fields.
+- Fixed a problem with recordings that have a single quote character in their
+  name (this is now mapped to 0x01).
+- Changed the value for Diseqc to '0' in the default 'channels.conf'.
+- Fixed displaying channels and recording status in the RCU's LED display when
+  a recording is interrupted due to higher priority.
+- Implemented safe writing of config files (first writes into a temporary file
+  and then renames it).
+- In case the video data stream is broken the log message will come only every
+  5 seconds.
+- The current channel is now saved in the 'setup.conf' file when VDR is cancelled,
+  and will be restored next time it is started (thanks to Deti Fliegl).
+- The EIT scanning thread is now locked when switching channels to avoid problems.
+- Encrypted channels can now be selected even without knowing the PNR (however, it
+  is still necessary for the EPG info).
diff --git a/INSTALL b/INSTALL
index 7def1687e..e2a67a0fd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,13 +15,11 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile.
 
-This program requires the card driver version 0.71 or higher
-to work properly. Currently you need to load the dvb.o module with
-option outstream=0, so your insmod statement should read
-'insmod dvb.o outstream=0'. This is necessary because 'vdr' works
-with AV_PES data and will change once it has been modified to work
-directly with MPEG2. You also need to apply the patch 'dvb.c.071.diff'
-for the On Screen Display to work properly.
+This program requires the card driver version 0.8.1 or higher
+to work properly. You need to load the dvb.o module *without* option
+'outstream=0' (previous versions of VDR required this option to have
+the driver supply the data in AV_PES format; as of version 0.70 VDR
+works with PES format).
 
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
@@ -39,7 +37,7 @@ following values 'make' call to activate the respective control mode:
   REMOTE=RCU    control via the "Remote Control Unit" receiver
                 (see http://www.cadsoft.de/people/kls/vdr/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
-                (see http://fsinfo.cs.uni-sb.de/~columbus/lirc)
+                (see http://www.lirc.org)
 
 Adding "DEBUG_OSD=1" will use the PC screen (or current window)
 to display texts instead of the DVB card's on-screen display
@@ -168,6 +166,5 @@ into learning mode.
 
 If the program has been compiled with 'REMOTE=LIRC', no 'keys.conf' file
 will be used. Instead, the key names as listed in the source file 'config.c'
-must be used when setting up LIRC. See http://www2.arnes.si/~mthale1 for
-more about LIRC.
+must be used when setting up LIRC. See http://www.lirc.org for more about LIRC.
 
diff --git a/MANUAL b/MANUAL
index 46466bf8b..b0e9abe01 100644
--- a/MANUAL
+++ b/MANUAL
@@ -174,6 +174,52 @@ Video Disk Recorder User's Manual
             used to easily delete a recording after watching it, or to switch
             to a different recording.
 
+* Editing a Recording
+
+  While in Replay mode, the following keys can be used to manipulate editing
+  marks:
+
+  - 0       Toggles an editing mark. If the mark indicator shows a red triangle,
+            the current mark is deleted. Otherwise a new mark is set at the
+            current position.
+  - 4, 6    Move an editing mark back and forward. You need to first jump to
+            an editing mark for this to work.
+  - 7, 9    Jump back and forward between editing marks. Replay goes into still
+            mode after jumping to a mark.
+  - 8       Positions replay at a point 3 seconds before the current or next
+            "start" mark and starts replay.
+  - 2       Start the actual cutting process.
+
+  Editing marks are represented by black, vertical lines in the progress display.
+  A small black triangle at the top of the mark means that this is a "start"
+  mark, and a triangle at the bottom means that this is an "end" mark.
+  The cutting process will save all video data between "start" and "end" marks
+  into a new file (the original recording remains untouched). The new file will
+  have the same name as the original recording, preceeded with a '%' character
+  (imagine the '%' somehow looking like a pair of scissors ;-). Red bars in the
+  progress display indicate which video sequences will be saved by the cutting
+  process.
+
+  The video sequences to be saved by the cutting process are determined by an
+  "even/odd" algorithm. This means that every odd numbered editing mark (i.e.
+  1, 3, 5,...) represents a "start" mark, while every even numbered mark (2, 4,
+  6,...) is an "end" mark. Inserting or toggling a mark on or off automatically
+  adjusts the sequence to the right side of that mark.
+
+  Use the keys described under "Replay Control" to position to, e.g., the
+  beginning and end of commercial breaks and press the '0' key to set the
+  necessary editing marks. After that you may want to use the '7' and '9'
+  keys to jump to each mark and maybe use the '4' and '6' keys to fine tune
+  them. Once all marks are in place, press '2' to start the actual cutting
+  process, which will run as a background process. When replaying the edited
+  version of the recording you can use the '8' key to jump to a point just
+  before the next cut and have a look at the resulting sequence.
+
+  Currently editing marks can only be set at I-frames, which typically is
+  every 12th frame. So editing can be done with a resolution of roughly half
+  a second. A "start" mark marks the first frame of a resulting video
+  sequence, and an "end" mark marks the last frame of that sequence.
+
 * Programming the Timer
 
   Use the "Timer" menu to maintain your list of timer controlled recordings.
diff --git a/Makefile b/Makefile
index 739d3942b..4505c7b56 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.16 2000/11/18 14:58:10 kls Exp $
+# $Id: Makefile 1.18 2001/01/13 12:26:43 kls Exp $
 
 DVBDIR   = ../DVB
 
@@ -37,9 +37,9 @@ font: genfontfile fontfix.c fontosd.c
 # Dependencies:
 
 config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h videodir.h
+dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
-eit.o      : eit.c eit.h thread.h tools.h
+eit.o      : eit.c config.h dvbapi.h dvbosd.h eit.h font.h thread.h tools.h videodir.h
 font.o     : font.c font.h fontfix.c fontosd.c tools.h
 i18n.o     : i18n.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h thread.h tools.h
 interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
@@ -48,7 +48,7 @@ osd.o      : osd.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h os
 recording.o: recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 remote.o   : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
 svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
-thread.o   : thread.c thread.h
+thread.o   : thread.c thread.h tools.h
 tools.o    : tools.c tools.h
 vdr.o      : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 videodir.o : videodir.c tools.h videodir.h
diff --git a/README b/README
index b1e071ee0..0dfc875ef 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ driver software (of course, the hardware still has to be bought).
 
 The on screen menu system is simple, but shall provide all the
 possibilites necessary to perform timer controlled recording,
-file management and, maybe, even "on disk editing". The menus
+file management and even "on disk editing". The menus
 of commercial set-top-boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
diff --git a/TODO b/TODO
index f2fb5ead2..1ae7d7176 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,5 @@ TODO list for the Video Disk Recorder project
 
 * Implement simultaneous record/replay with a single DVB card once
   the card driver/firmware allows this.
-* Implement "on-disk editing" to allow "cutting out" of certain
-  scenes in order to archive them (or, reversely, cut out
-  commercial breaks).
 * Implement channel scanning.
 * Implement remaining commands in SVDRP.
diff --git a/channels.conf b/channels.conf
index ce30919e9..43e69cd6f 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,147 +1,148 @@
-RTL:12188:h:1:27500:163:104:0:12003
-Sat.1:12480:v:1:27500:1791:1792:0:46
-Pro-7:12480:v:1:27500:255:256:0:898
-RTL2:12188:h:1:27500:166:128:0:12020
-ARD:11837:h:1:27500:101:102:0:28106
-BR3:11837:h:1:27500:201:202:0:28107
-Hessen-3:11837:h:1:27500:301:302:0:28108
-N3:12110:h:1:27500:2401:2402:0:28224
-SR3:11837:h:1:27500:501:502:0:28110
-WDR:11837:h:1:27500:601:602:0:28111
-BR-alpha:11837:h:1:27500:701:702:0:28112
-SWR BW:11837:h:1:27500:801:802:0:28113
-Phoenix:11837:h:1:27500:901:902:0:28114
-ZDF:11954:h:1:27500:110:120:0:28006
-3sat:11954:h:1:27500:210:220:0:28007
-KiKa:11954:h:1:27500:310:320:0:28008
-arte:11836:h:1:27500:401:402:0:28109
-ORF Sat:11954:h:1:27500:506:507:0:28010
-ZDF.info:11954:h:1:27500:610:620:0:28011
-CNN:12168:v:1:27500:165:100:0:28512
-Super RTL:12188:h:1:27500:165:120:0:12040
-VOX:12188:h:1:27500:167:136:0:12060
-DW TV:12363:v:1:27500:305:306:0:8905
-Kabel 1:12480:v:1:27500:511:512:0:899
-tm3:12480:v:1:27500:767:768:0:897
-DSF:12480:v:1:27500:1023:1024:0:900
-HOT:12480:v:1:27500:1279:1280:0:40
-Bloomberg TV Germany:12551:v:1:22000:162:99:0:12160
-BLOOMBERG TV:11817:v:1:27500:163:92:0:8004
-Bloomberg:12168:v:1:27500:167:112:0:12721
-Sky News:12552:v:1:22000:305:306:0:3995
-KinderNet:12574:h:1:22000:163:92:0:5020
-Alice:12610:v:1:22000:162:96:0:12200
-n-tv:12669:v:1:22000:162:96:0:12730
-Grand Tourisme:12670:v:1:22000:289:290:0:17300
-TW1:12692:h:1:22000:166:167:0:13013
-Eurosport:11954:h:1:27500:410:420:0:28009
-EinsExtra:12110:H:1:27500:101:102:0:28201
-EinsFestival:12110:H:1:27500:201:202:0:28202
-EinsMuXx:12110:H:1:27500:301:302:0:28203
-ZDF Theaterkanal:11954:H:1:27500:1110:1120:0:28016
-ZDF.doku:11954:H:1:27500:660:670:0:28014
-MDR:12110:h:1:27500:401:402:0:28204
-NICK-PARAMOUNT:12246:v:1:27500:167:108:0:29312
-ORB:12110:h:1:27500:501:502:0:28205
-B1:12110:h:1:27500:601:602:0:28206
-ARD Online-Kanal:12722:h:1:22000:8191:701:0:0
+RTL:12188:h:0:27500:163:104:0:12003
+Sat.1:12480:v:0:27500:1791:1792:0:46
+Pro-7:12480:v:0:27500:255:256:0:898
+RTL2:12188:h:0:27500:166:128:0:12020
+ARD:11837:h:0:27500:101:102:0:28106
+BR3:11837:h:0:27500:201:202:0:28107
+Hessen-3:11837:h:0:27500:301:302:0:28108
+N3:12110:h:0:27500:2401:2402:0:28224
+SR3:11837:h:0:27500:501:502:0:28110
+WDR:11837:h:0:27500:601:602:0:28111
+BR-alpha:11837:h:0:27500:701:702:0:28112
+SWR BW:11837:h:0:27500:801:802:0:28113
+Phoenix:11837:h:0:27500:901:902:0:28114
+ZDF:11954:h:0:27500:110:120:0:28006
+3sat:11954:h:0:27500:210:220:0:28007
+KiKa:11954:h:0:27500:310:320:0:28008
+arte:11836:h:0:27500:401:402:0:28109
+ORF Sat:11954:h:0:27500:506:507:0:28010
+ZDF.info:11954:h:0:27500:610:620:0:28011
+CNN:12168:v:0:27500:165:100:0:28512
+Super RTL:12188:h:0:27500:165:120:0:12040
+VOX:12188:h:0:27500:167:136:0:12060
+DW TV:12363:v:0:27500:305:306:0:8905
+Kabel 1:12480:v:0:27500:511:512:0:899
+tm3:12480:v:0:27500:767:768:0:897
+DSF:12480:v:0:27500:1023:1024:0:900
+HOT:12480:v:0:27500:1279:1280:0:40
+Bloomberg TV Germany:12551:v:0:22000:162:99:0:12160
+BLOOMBERG TV:11817:v:0:27500:163:92:0:8004
+Bloomberg:12168:v:0:27500:167:112:0:12721
+Sky News:12552:v:0:22000:305:306:0:3995
+KinderNet:12574:h:0:22000:163:92:0:5020
+Alice:12610:v:0:22000:162:96:0:12200
+n-tv:12669:v:0:22000:162:96:0:12730
+Grand Tourisme:12670:v:0:22000:289:290:0:17300
+TW1:12692:h:0:22000:166:167:0:13013
+Eurosport:11954:h:0:27500:410:420:0:28009
+EinsExtra:12110:h:0:27500:101:102:0:28201
+EinsFestival:12110:h:0:27500:201:202:0:28202
+EinsMuXx:12110:h:0:27500:301:302:0:28203
+ZDF Theaterkanal:11954:h:0:27500:1110:1120:0:28016
+ZDF.doku:11954:h:0:27500:660:670:0:28014
+MDR:12110:h:0:27500:401:402:0:28204
+NICK-PARAMOUNT:12246:v:0:27500:167:108:0:29312
+ORB:12110:h:0:27500:501:502:0:28205
+B1:12110:h:0:27500:601:602:0:28206
+ARD Online-Kanal:12722:h:0:22000:8191:701:0:0
 :Premiere World
-Premiere World Promo:11798:h:1:27500:255:256:0:8
-Premiere:11798:h:1:27500:511:512:2:10
-Star Kino:11798:h:1:27500:767:768:2:9
-Cine Action:11798:h:1:27500:1023:1024:2:20
-Cine Comedy:11798:h:1:27500:1279:1280:2:29
-Sci Fantasy:11798:h:1:27500:1535:1536:2:41
-Romantic Movies:11798:h:1:27500:1791:1792:2:11
-Studio Universal:11798:h:1:27500:2047:2048:2:21
-13th Street:11797:h:1:27500:2303:2304:2:43
-Junior:12031:h:1:27500:255:256:2:19
-K-Toon:12032:h:1:27500:511:512:2:12
-Disney Channel:12031:h:1:27500:767:768:2:15
-Fox Kids:11798:h:1:27500:255:256:2:0
-Sunset:12031:h:1:27500:1023:1024:2:16
-Comedy:12031:h:1:27500:1279:1280:2:28
-Planet:12031:h:1:27500:2047:2048:2:13
-Discovery Channel:12031:h:1:27500:1791:1792:2:14
-Krimi&Co:12031:h:1:27500:1535:1536:2:23
-Filmpalast:12090:v:1:27500:255:256:2:36
-Heimatkanal:11758:h:1:27500:2815:2816:2:517
-Goldstar:11758:h:1:27500:3839:3840:2:518
-Classica:12090:v:1:27500:767:768:2:34
-Seasons:12090:v:1:27500:511:512:2:33
-Blue Channel:11758:h:1:27500:2559:2560:2:516
-Feed (F1 Boxengasse):11720:h:1:27500:2559:2560:2:242
-Feed (F1 Data):11720:h:1:27500:3071:3072:2:244
-Feed (F1 Multi):11720:h:1:27500:2815:2816:2:243
-Feed (F1 On Board):11720:h:1:27500:2303:2304:2:241
-Feed (F1 Verfolger):11720:h:1:27500:2047:2048:2:240
+Premiere World Promo:11798:h:0:27500:255:256:0:8
+Premiere:11798:h:0:27500:511:512:2:10
+Star Kino:11798:h:0:27500:767:768:2:9
+Cine Action:11798:h:0:27500:1023:1024:2:20
+Cine Comedy:11798:h:0:27500:1279:1280:2:29
+Sci Fantasy:11798:h:0:27500:1535:1536:2:41
+Romantic Movies:11798:h:0:27500:1791:1792:2:11
+Studio Universal:11798:h:0:27500:2047:2048:2:21
+13th Street:11797:h:0:27500:2303:2304:2:43
+Junior:12031:h:0:27500:255:256:2:19
+K-Toon:12032:h:0:27500:511:512:2:12
+Disney Channel:12031:h:0:27500:767:768:2:15
+Fox Kids:11798:h:0:27500:255:256:2:0
+Sunset:12031:h:0:27500:1023:1024:2:16
+Comedy:12031:h:0:27500:1279:1280:2:28
+Planet:12031:h:0:27500:2047:2048:2:13
+Discovery Channel:12031:h:0:27500:1791:1792:2:14
+Krimi&Co:12031:h:0:27500:1535:1536:2:23
+Filmpalast:12090:v:0:27500:255:256:2:36
+Heimatkanal:11758:h:0:27500:2815:2816:2:517
+Goldstar:11758:h:0:27500:3839:3840:2:518
+Classica:12090:v:0:27500:767:768:2:34
+Seasons:12090:v:0:27500:511:512:2:33
+Blue Channel:11758:h:0:27500:2559:2560:2:516
+Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:2:242
+Feed (F1 Data):11720:h:0:27500:3071:3072:2:244
+Feed (F1 Multi):11720:h:0:27500:2815:2816:2:243
+Feed (F1 On Board):11720:h:0:27500:2303:2304:2:241
+Feed (F1 Verfolger):11720:h:0:27500:2047:2048:2:240
 :
-TV Niepokalanow:11876:h:1:27500:305:321:0:20601
-Mosaico:11934:v:1:27500:165:100:0:29010
-Andalucia TV:11934:v:1:27500:166:104:0:29011
-TVC Internacional:11934:v:1:27500:167:108:0:0
-Nasza TV:11992:h:1:27500:165:98:0:0
-WishLine test:12012:v:1:27500:163:90:0:0
-Pro 7 Austria:12051:v:1:27500:161:84:0:0
-Kabel 1 Schweiz:12051:v:1:27500:162:163:0:0
-Kabel 1 Austria:12051:v:1:27500:166:167:0:0
-Pro 7 Schweiz:12051:v:1:27500:289:290:0:0
-Kiosque:12129:v:1:27500:160:80:0:0
-KTO:12129:v:1:27500:170:120:0:0
-TCM:12168:v:1:27500:160:80:0:0
-Cartoon Network France & Spain:12168:v:1:27500:161:84:0:0
-TVBS Europe:12168:v:1:27500:162:88:0:0
-TVBS Europe:12168:v:1:27500:162:89:0:0
-Travel:12168:v:1:27500:163:92:0:0
-TCM Espania:12168:v:1:27500:164:96:0:0
-MTV Spain:12168:v:1:27500:167:112:0:0
-TCM France:12168:v:1:27500:169:64:0:0
-RTL2 CH:12188:h:1:27500:164:112:0:0
-La Cinquieme:12207:v:1:27500:160:80:0:0
-ARTE:12207:v:1:27500:165:100:0:0
-Post Filial TV:12226:h:1:27500:255:256:0:0
-Canal Canaris:12246:v:1:27500:160:80:0:0
-Canal Canaris:12246:v:1:27500:160:81:0:0
-Canal Canaris:12246:v:1:27500:160:82:0:0
-Canal Canaris:12246:v:1:27500:160:83:0:0
-AB Sat Passion promo:12266:h:1:27500:160:80:0:0
-AB Channel 1:12266:h:1:27500:161:84:0:0
-Taquilla 0:12285:v:1:27500:165:100:0:0
-CSAT:12324:v:1:27500:160:80:0:0
-Mosaique:12324:v:1:27500:162:88:0:0
-Mosaique 2:12324:v:1:27500:163:92:0:0
-Mosaique 3:12324:v:1:27500:164:96:0:0
-Le Sesame C+:12324:v:1:27500:165:1965:0:0
-FEED:12344:h:1:27500:163:92:0:0
-RTM 1:12363:v:1:27500:162:96:0:0
-ESC 1:12363:v:1:27500:163:104:0:0
-TV5 Europe:12363:v:1:27500:164:112:0:0
-TV7 Tunisia:12363:v:1:27500:166:128:0:0
-ARTE:12363:v:1:27500:167:137:0:0
-RAI Uno:12363:v:1:27500:289:290:0:8904
-RTP International:12363:v:1:27500:300:301:0:0
-Fashion TV:12402:v:1:27500:163:92:0:0
-VideoService:12422:h:1:27500:255:256:0:0
-Beta Research promo:12422:h:1:27500:1023:1024:0:0
-Canal Canarias:12441:v:1:27500:160:80:0:0
-TVC International:12441:v:1:27500:512:660:0:0
-Fitur:12441:v:1:27500:514:662:0:0
-Astra Info 1:12552:v:1:22000:164:112:0:0
-Astra Info 2:12552:v:1:22000:165:120:0:0
-Astra Vision 1:12552:v:1:22000:168:144:0:0
-Astra Vision 1:12552:v:1:22000:168:145:0:0
-Astra Vision 1:12552:v:1:22000:168:146:0:0
-Astra Vision 1:12552:v:1:22000:168:147:0:0
-Astra Vision 1:12552:v:1:22000:168:148:0:0
-Astra Vision 1:12552:v:1:22000:168:149:0:0
-Astra Vision 1:12552:v:1:22000:168:150:0:0
-RTL Tele Letzebuerg:12552:v:1:22000:168:144:0:0
-Astra Mosaic:12552:v:1:22000:175:176:0:0
-MHP test:12604:h:1:22000:5632:8191:0:0
-VERONICA:12574:h:1:22000:161:84:0:5010
-VH1 Classic:12699:v:1:22000:3071:3072:0:28647
-VH-1 Germany:12699:v:1:22000:3081:3082:0:28648
-Via 1 - Sch�ner Reisen:12148:h:1:27500:511:512:0:44
-Video Italia:12610:v:1:22000:121:122:0:12220
-AC 3 promo:12670:v:1:22000:308:256:0:0
-ORF/ZDF:12699:h:1:22000:506:507:0:13012
+TV Niepokalanow:11876:h:0:27500:305:321:0:20601
+Mosaico:11934:v:0:27500:165:100:0:29010
+Andalucia TV:11934:v:0:27500:166:104:0:29011
+TVC Internacional:11934:v:0:27500:167:108:0:0
+Nasza TV:11992:h:0:27500:165:98:0:0
+WishLine test:12012:v:0:27500:163:90:0:0
+Pro 7 Austria:12051:v:0:27500:161:84:0:0
+Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0
+Kabel 1 Austria:12051:v:0:27500:166:167:0:0
+Pro 7 Schweiz:12051:v:0:27500:289:290:0:0
+Kiosque:12129:v:0:27500:160:80:0:0
+KTO:12129:v:0:27500:170:120:0:0
+TCM:12168:v:0:27500:160:80:0:0
+Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0
+TVBS Europe:12168:v:0:27500:162:88:0:0
+TVBS Europe:12168:v:0:27500:162:89:0:0
+Travel:12168:v:0:27500:163:92:0:0
+TCM Espania:12168:v:0:27500:164:96:0:0
+MTV Spain:12168:v:0:27500:167:112:0:0
+TCM France:12168:v:0:27500:169:64:0:0
+RTL2 CH:12188:h:0:27500:164:112:0:0
+La Cinquieme:12207:v:0:27500:160:80:0:0
+ARTE:12207:v:0:27500:165:100:0:0
+Post Filial TV:12226:h:0:27500:255:256:0:0
+Canal Canaris:12246:v:0:27500:160:80:0:0
+Canal Canaris:12246:v:0:27500:160:81:0:0
+Canal Canaris:12246:v:0:27500:160:82:0:0
+Canal Canaris:12246:v:0:27500:160:83:0:0
+AB Sat Passion promo:12266:h:0:27500:160:80:0:0
+AB Channel 1:12266:h:0:27500:161:84:0:0
+Taquilla 0:12285:v:0:27500:165:100:0:0
+CSAT:12324:v:0:27500:160:80:0:0
+Mosaique:12324:v:0:27500:162:88:0:0
+Mosaique 2:12324:v:0:27500:163:92:0:0
+Mosaique 3:12324:v:0:27500:164:96:0:0
+Le Sesame C+:12324:v:0:27500:165:1965:0:0
+FEED:12344:h:0:27500:163:92:0:0
+RTM 1:12363:v:0:27500:162:96:0:0
+ESC 1:12363:v:0:27500:163:104:0:0
+TV5 Europe:12363:v:0:27500:164:112:0:0
+TV7 Tunisia:12363:v:0:27500:166:128:0:0
+ARTE:12363:v:0:27500:167:137:0:0
+RAI Uno:12363:v:0:27500:289:290:0:8904
+RTP International:12363:v:0:27500:300:301:0:0
+Fashion TV:12402:v:0:27500:163:92:0:0
+VideoService:12422:h:0:27500:255:256:0:0
+Beta Research promo:12422:h:0:27500:1023:1024:0:0
+Canal Canarias:12441:v:0:27500:160:80:0:0
+TVC International:12441:v:0:27500:512:660:0:0
+Fitur:12441:v:0:27500:514:662:0:0
+Astra Info 1:12552:v:0:22000:164:112:0:0
+Astra Info 2:12552:v:0:22000:165:120:0:0
+Astra Vision 1:12552:v:0:22000:168:144:0:0
+Astra Vision 1:12552:v:0:22000:168:145:0:0
+Astra Vision 1:12552:v:0:22000:168:146:0:0
+Astra Vision 1:12552:v:0:22000:168:147:0:0
+Astra Vision 1:12552:v:0:22000:168:148:0:0
+Astra Vision 1:12552:v:0:22000:168:149:0:0
+Astra Vision 1:12552:v:0:22000:168:150:0:0
+RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0
+Astra Mosaic:12552:v:0:22000:175:176:0:0
+MHP test:12604:h:0:22000:5632:8191:0:0
+VERONICA:12574:h:0:22000:161:84:0:5010
+VH1 Classic:12699:v:0:22000:3071:3072:0:28647
+VH-1 Germany:12699:v:0:22000:3081:3082:0:28648
+Via 1 - Sch�ner Reisen:12148:h:0:27500:511:512:0:44
+Video Italia:12610:v:0:22000:121:122:0:12220
+AC 3 promo:12670:v:0:22000:308:256:0:0
+ORF/ZDF:12699:h:0:22000:506:507:0:13012
+VIVA:12670:v:0:22000:309:310:0:12732
diff --git a/config.c b/config.c
index 8964e5a04..5838c68c0 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.34 2000/11/18 13:26:36 kls Exp $
+ * $Id: config.c 1.39 2001/01/14 15:29:15 kls Exp $
  */
 
 #include "config.h"
@@ -119,10 +119,9 @@ bool cKeys::Load(const char *FileName)
 
 bool cKeys::Save(void)
 {
-  //TODO make backup copies???
   bool result = true;
-  FILE *f = fopen(fileName, "w");
-  if (f) {
+  cSafeFile f(fileName);
+  if (f.Open()) {
      if (fprintf(f, "Code\t%c\nAddress\t%04X\n", code, address) > 0) {
         for (tKey *k = keys; k->type != kNone; k++) {
             if (fprintf(f, "%s\t%08X\n", k->name, k->code) <= 0) {
@@ -133,7 +132,7 @@ bool cKeys::Save(void)
          }
      else
         result = false;
-     fclose(f);
+     f.Close();
      }
   else
      result = false;
@@ -196,7 +195,7 @@ cChannel::cChannel(const cChannel *Channel)
   strcpy(name,   Channel ? Channel->name         : "Pro7");
   frequency    = Channel ? Channel->frequency    : 12480;
   polarization = Channel ? Channel->polarization : 'v';
-  diseqc       = Channel ? Channel->diseqc       : 1;
+  diseqc       = Channel ? Channel->diseqc       : 0;
   srate        = Channel ? Channel->srate        : 27500;
   vpid         = Channel ? Channel->vpid         : 255;
   apid         = Channel ? Channel->apid         : 256;
@@ -435,9 +434,11 @@ bool cTimer::Parse(const char *s)
   //XXX to hear about that!
   char *s2 = NULL;
   int l2 = strlen(s);
-  if (s[l2 - 2] == ':') { // note that 's' has a trailing '\n'
-     s2 = (char *)malloc(l2 + 2);
-     strcat(strn0cpy(s2, s, l2), " \n");
+  while (l2 > 0 && isspace(s[l2 - 1]))
+        l2--;
+  if (s[l2 - 1] == ':') {
+     s2 = (char *)malloc(l2 + 3);
+     strcat(strn0cpy(s2, s, l2 + 1), " \n");
      s = s2;
      }
   if (8 <= sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
@@ -723,6 +724,7 @@ cSetup::cSetup(void)
   MarginStart = 2;
   MarginStop = 10;
   EPGScanTimeout = 5;
+  CurrentChannel = -1;
 }
 
 bool cSetup::Parse(char *s)
@@ -742,6 +744,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
      else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
      else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
+     else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
      else
         return false;
      return true;
@@ -780,8 +783,8 @@ bool cSetup::Save(const char *FileName)
   if (!FileName)
      FileName = fileName;
   if (FileName) {
-     FILE *f = fopen(FileName, "w");
-     if (f) {
+     cSafeFile f(FileName);
+     if (f.Open()) {
         fprintf(f, "# VDR Setup\n");
         fprintf(f, "OSDLanguage        = %d\n", OSDLanguage);
         fprintf(f, "PrimaryDVB         = %d\n", PrimaryDVB);
@@ -792,8 +795,10 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
         fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
         fprintf(f, "MarginStart        = %d\n", MarginStart);
+        fprintf(f, "MarginStop         = %d\n", MarginStop);
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
-        fclose(f);
+        fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
+        f.Close();
         isyslog(LOG_INFO, "saved setup to %s", FileName);
         return true;
         }
diff --git a/config.h b/config.h
index db3f1edc9..277e957e2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.34 2000/11/18 13:25:53 kls Exp $
+ * $Id: config.h 1.38 2001/01/14 15:29:27 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -14,11 +14,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include "dvbapi.h"
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.68"
+#define VDRVERSION "0.70"
 
 #define MaxBuffer 10000
 
@@ -42,6 +43,15 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              k_Flags   = k_Repeat | k_Release,
            };
 
+// This is in preparation for having more key codes:
+#define kMarkToggle      k0
+#define kMarkMoveBack    k4
+#define kMarkMoveForward k6
+#define kMarkJumpBack    k7
+#define kMarkJumpForward k9
+#define kEditCut         k2
+#define kEditTest        k8
+
 #define RAWKEY(k)    ((k) & ~k_Flags)
 #define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
 #define NORMALKEY(k) ((k) & ~k_Repeat)
@@ -157,43 +167,45 @@ template<class T> class cConfig : public cList<T> {
     cList<T>::Clear();
   }
 public:
+  cConfig(void) { fileName = NULL; }
+  virtual ~cConfig() { delete fileName; }
   virtual bool Load(const char *FileName)
   {
-    isyslog(LOG_INFO, "loading %s", FileName);
-    bool result = true;
     Clear();
     fileName = strdup(FileName);
-    FILE *f = fopen(fileName, "r");
-    if (f) {
-       int line = 0;
-       char buffer[MaxBuffer];
-       while (fgets(buffer, sizeof(buffer), f) > 0) {
-             line++;
-             T *l = new T;
-             if (l->Parse(buffer))
-                Add(l);
-             else {
-                esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
-                delete l;
-                result = false;
-                break;
+    bool result = false;
+    if (access(FileName, F_OK) == 0) {
+       isyslog(LOG_INFO, "loading %s", FileName);
+       FILE *f = fopen(fileName, "r");
+       if (f) {
+          int line = 0;
+          char buffer[MaxBuffer];
+          result = true;
+          while (fgets(buffer, sizeof(buffer), f) > 0) {
+                line++;
+                T *l = new T;
+                if (l->Parse(buffer))
+                   Add(l);
+                else {
+                   esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+                   delete l;
+                   result = false;
+                   break;
+                   }
                 }
-             }
-       fclose(f);
-       }
-    else {
-       LOG_ERROR_STR(fileName);
-       result = false;
+          fclose(f);
+          }
+       else
+          LOG_ERROR_STR(fileName);
        }
     return result;
   }
   bool Save(void)
   {
-  //TODO make backup copies???
     bool result = true;
     T *l = (T *)First();
-    FILE *f = fopen(fileName, "w");
-    if (f) {
+    cSafeFile f(fileName);
+    if (f.Open()) {
        while (l) {
              if (!l->Save(f)) {
                 result = false;
@@ -201,12 +213,10 @@ template<class T> class cConfig : public cList<T> {
                 }
              l = (T *)l->Next();
              }
-       fclose(f);
+       f.Close();
        }
-    else {
-       LOG_ERROR_STR(fileName);
+    else
        result = false;
-       }
     return result;
   }
   };
@@ -258,6 +268,7 @@ class cSetup {
   int SetSystemTime;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
+  int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);
   bool Save(const char *FileName = NULL);
diff --git a/dvb.c.071.diff b/dvb.c.071.diff
deleted file mode 100644
index ac7ba3a4a..000000000
--- a/dvb.c.071.diff
+++ /dev/null
@@ -1,100 +0,0 @@
---- dvb.c.001	Sun Sep 17 22:02:37 2000
-+++ dvb.c	Tue Oct  3 12:11:46 2000
-@@ -1143,6 +1143,8 @@
- {
-         int bpp;
-         int i;
-+        int d, delta; //XXX kls: additional variables for data compression
-+        u8 c;         //XXX kls: additional variables for data compression
-         DECLARE_WAITQUEUE(wait, current);
-         
-         if (dvb->bmp_state==BMP_LOADING) {
-@@ -1160,27 +1162,38 @@
-         if (dvb->bmp_state==BMP_LOADING)
-                 return -1;
-         dvb->bmp_state=BMP_LOADING;
--        if (format==BITMAP8) bpp=8;
--        else if (format==BITMAP4) bpp=4;
--        else if (format==BITMAP2) bpp=2;
--        else if (format==BITMAP1) bpp=1;
-+        if      (format==BITMAP8) { bpp=8; delta = 1; } //XXX kls: initialize 'delta', too
-+        else if (format==BITMAP4) { bpp=4; delta = 2; }
-+        else if (format==BITMAP2) { bpp=2; delta = 4; }
-+        else if (format==BITMAP1) { bpp=1; delta = 8; }
-         else {
-           dvb->bmp_state=BMP_NONE;
-           return -1;
-         }
--        dvb->bmplen= (dx*dy*bpp)/8;
-+        dvb->bmplen= ((dx*dy*bpp+7)&~7)/8; //XXX kls: need to round up to include partial bytes
-         dvb->bmpp=0;
-         if (dvb->bmplen>32768) {
-                 dvb->bmp_state=BMP_NONE;
-                 return -1;
-         }
-         for (i=0; i<dy; i++) {
--                if (copy_from_user(dvb->bmpbuf+1024+i*dx, data+i*inc, (dx*bpp)/8)) {
-+                if (copy_from_user(dvb->bmpbuf+1024+i*dx, data+i*inc, dx)) { //XXX kls: incoming data is "1 byte per pixel"
-                         dvb->bmp_state=BMP_NONE;
-                         return -1;
-                 }
-                 
-         }
-+        // XXX kls: Incoming data is always "one byte per pixel", so we need to compress
-+        // the data in case we have a lower resolution than 8 bpp:
-+        if (format != BITMAP8) {
-+                for (i=0; i<dx*dy/delta; i++) {
-+                        c = ((u8 *)dvb->bmpbuf)[1024+i*delta+delta-1];
-+                        for (d=delta-2; d>=0; d--) {
-+                                c |= (((u8 *)dvb->bmpbuf)[1024+i*delta+d] << ((delta-d-1)*bpp));
-+                        ((u8 *)dvb->bmpbuf)[1024+i] = c;
-+                        }
-+                }
-+        }
-         dvb->bmplen+=1024;
-         return outcom(dvb, COMTYPE_OSD, LoadBmp, 3, format, dx, dy);
- } 
-@@ -1256,24 +1269,25 @@
-         int i;
- 
-         w=x1-x0+1; h=y1-y0+1;
--        if (inc>0)
--                w=inc;
--        if (w>720 || h>576) 
-+        if (inc<=0)
-+                inc=w; //XXX kls: see dvb_4l.h: "inc<=0 uses blockwidth as linewidth"
-+        if (w<=0 || w>720 || h<=0 || h>576) //XXX kls: checking lower bounds, too
-                 return -1;
--        bpp=8;     //dvb->osdbpp[dvb->osdwin];
--        bpl=w*bpp/8;
-+        bpp=dvb->osdbpp[dvb->osdwin]+1; //XXX kls: 'bpp' needs to be taken from the window
-+        bpl=((w*bpp+7)&~7)/8; //XXX kls: need to round up to include partial bytes
-         size=h*bpl;
--        lpb=(64*1024)/bpl;
-+        lpb=(32*1024)/bpl; //XXX kls: apparently 32K is the maximum possible value
-         bnum=size/(lpb*bpl);
-         brest=size-bnum*lpb*bpl;
- 
-         for (i=0; i<bnum; i++) {
--                LoadBitmap(dvb, BITMAP8, w, lpb, inc, data);
-+                LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, lpb, inc, data); //XXX kls: need to take the format from the actual window
-                 BlitBitmap(dvb, dvb->osdwin, x0, y0+i*lpb, 1);
--                data+=bpl;
-+                data+=lpb*inc; //XXX kls: incrementing must be done in "one byte per pixel"
-+                ddelay(3); //XXX kls: without this the block is sometimes not fully displayed - firmware bug?
-         }
-         if (brest) {
--                LoadBitmap(dvb, BITMAP8, w, brest/bpl, inc, data);
-+                LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, brest/bpl, inc, data); //XXX kls: need to take the format from the actual window
-                 BlitBitmap(dvb, dvb->osdwin, x0, y0+bnum*lpb, 1);
-         }
-         ReleaseBitmap(dvb);
-@@ -6141,7 +6155,7 @@
-         init_waitqueue_head(&dvb->bmpq);
-         spin_lock_init (&(dvb->bmplock));
-         dvb->bmpp=dvb->bmplen=0;
--        dvb->bmpbuf=vmalloc(32768+1024);
-+        dvb->bmpbuf=vmalloc(8*32768+1024); //XXX kls: '8*' to be prepared for the maximum possible incoming data at 1 bpp
- 
-         init_waitqueue_head(&dvb->debiq);
-         dvb->debilock=SPIN_LOCK_UNLOCKED;
diff --git a/dvbapi.c b/dvbapi.c
index 5e4f2e647..e583baf94 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.40 2000/11/19 16:46:37 kls Exp $
+ * $Id: dvbapi.c 1.50 2001/01/18 19:53:54 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -21,6 +21,7 @@ extern "C" {
 #include <unistd.h>
 #include "config.h"
 #include "interface.h"
+#include "recording.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -32,23 +33,25 @@ extern "C" {
 
 // The minimum amount of video data necessary to identify frames
 // (must be smaller than VIDEOBUFSIZE!):
-#define MINVIDEODATA (20*1024) // just a safe guess (max. size of any AV_PES block, plus some safety)
+#define MINVIDEODATA (256*1024) // just a safe guess (max. size of any frame block, plus some safety)
 
 // The maximum time the buffer is allowed to write data to disk when recording:
 #define MAXRECORDWRITETIME 50 // ms
 
-#define AV_PES_HEADER_LEN 8
-
-// AV_PES block types:
-#define AV_PES_VIDEO 1
-#define AV_PES_AUDIO 2
-
 // Picture types:
 #define NO_PICTURE 0
 #define I_FRAME    1
 #define P_FRAME    2
 #define B_FRAME    3
 
+// Start codes:
+#define SC_PICTURE 0x00  // "picture header"
+#define SC_SEQU    0xB3  // "sequence header"
+#define SC_PHEAD   0xBA  // "pack header"
+#define SC_SHEAD   0xBB  // "system header"
+#define SC_AUDIO   0xC0
+#define SC_VIDEO   0xE0
+
 #define FRAMESPERSEC 25
 
 // The maximum file size is limited by the range that can be covered
@@ -73,6 +76,35 @@ extern "C" {
 
 typedef unsigned char uchar;
 
+static void SetPlayMode(int VideoDev, int Mode)
+{
+  if (VideoDev >= 0) {
+     struct video_play_mode pmode;
+     pmode.mode = Mode;
+     ioctl(VideoDev, VIDIOCSPLAYMODE, &pmode);
+     }
+}
+
+const char *IndexToHMSF(int Index, bool WithFrame)
+{
+  static char buffer[16];
+  int f = (Index % FRAMESPERSEC) + 1;
+  int s = (Index / FRAMESPERSEC);
+  int m = s / 60 % 60;
+  int h = s / 3600;
+  s %= 60;
+  snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
+  return buffer;
+}
+
+int HMSFToIndex(const char *HMSF)
+{
+  int h, m, s, f = 0;
+  if (3 <= sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f))
+     return (h * 3600 + m * 60 + s) * FRAMESPERSEC + f - 1;
+  return 0;
+}
+
 // --- cResumeFile ------------------------------------------------------------
 
 cResumeFile::cResumeFile(const char *FileName)
@@ -135,16 +167,15 @@ class cIndexFile {
   cResumeFile resumeFile;
   bool CatchUp(void);
 public:
-  cIndexFile(const char *FileName, bool Record = false);
+  cIndexFile(const char *FileName, bool Record);
   ~cIndexFile();
   void Write(uchar PictureType, uchar FileNumber, int FileOffset);
-  bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL);
-  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length = NULL);
+  bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
+  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL);
   int Get(uchar FileNumber, int FileOffset);
-  int Last(void) { return last; }
+  int Last(void) { CatchUp(); return last; }
   int GetResume(void) { return resumeFile.Read(); }
   bool StoreResume(int Index) { return resumeFile.Save(Index); }
-  static char *Str(int Index, bool WithFrame = false);
   };
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
@@ -276,7 +307,7 @@ void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
      }
 }
 
-bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType)
+bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
 {
   if (index) {
      CatchUp();
@@ -285,6 +316,14 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
         *FileOffset = index[Index].offset;
         if (PictureType)
            *PictureType = index[Index].type;
+        if (Length) {
+           int fn = index[Index + 1].number;
+           int fo = index[Index + 1].offset;
+           if (fn == *FileNumber)
+              *Length = fo - *FileOffset;
+           else
+              *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
+           }
         return true;
         }
      }
@@ -301,8 +340,14 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
          Index += d;
          if (Index >= 0 && Index <= last - 100) { // '- 100': need to stay off the end!
             if (index[Index].type == I_FRAME) {
-               *FileNumber = index[Index].number;
-               *FileOffset = index[Index].offset;
+               if (FileNumber)
+                  *FileNumber = index[Index].number;
+               else
+                  FileNumber = &index[Index].number;
+               if (FileOffset)
+                  *FileOffset = index[Index].offset;
+               else
+                  FileOffset = &index[Index].offset;
                if (Length) {
                   // all recordings end with a non-I_FRAME, so the following should be safe:
                   int fn = index[Index + 1].number;
@@ -339,18 +384,6 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
   return -1;
 }
 
-char *cIndexFile::Str(int Index, bool WithFrame)
-{
-  static char buffer[16];
-  int f = (Index % FRAMESPERSEC) + 1;
-  int s = (Index / FRAMESPERSEC);
-  int m = s / 60 % 60;
-  int h = s / 3600;
-  s %= 60;
-  snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
-  return buffer;
-}
-
 // --- cRingBuffer -----------------------------------------------------------
 
 /* cRingBuffer reads data from an input file, stores it in a buffer and writes
@@ -378,6 +411,12 @@ class cRingBuffer {
   int Readable(void) { return (tail >= head) ? size - tail - (head ? 0 : 1) : head - tail - 1; } // keep a 1 byte gap!
   int Writeable(void) { return (tail >= head) ? tail - head : size - head; }
   int Byte(int Offset);
+  bool Set(int Offset, int Length, int Value);
+protected:
+  int GetStartCode(int Offset) { return (Byte(Offset) == 0x00 && Byte(Offset + 1) == 0x00 && Byte(Offset + 2) == 0x01) ? Byte(Offset + 3) : -1; }
+  int GetPictureType(int Offset) { return (Byte(Offset + 5) >> 3) & 0x07; }
+  int FindStartCode(uchar Code, int Offset = 0);
+  int GetPacketLength(int Offset = 0);
 public:
   cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit = 0, int AvailLimit = 0);
   virtual ~cRingBuffer();
@@ -422,19 +461,36 @@ int cRingBuffer::Byte(int Offset)
   return -1;
 }
 
-void cRingBuffer::Skip(int n)
+bool cRingBuffer::Set(int Offset, int Length, int Value)
 {
-  if (head < tail) {
-     head += n;
-     if (head > tail)
-        head = tail;
+  if (buffer && Offset + Length <= Available() ) {
+     Offset += head;
+     while (Length--) {
+           if (Offset >= size)
+              Offset -= size;
+           buffer[Offset] = Value;
+           Offset++;
+           }
+     return true;
      }
-  else if (head > tail) {
-     head += n;
-     if (head >= size)
-        head -= size;
-     if (head > tail)
-        head = tail;
+  return false;
+}
+
+void cRingBuffer::Skip(int n)
+{
+  if (n > 0) {
+     if (head < tail) {
+        head += n;
+        if (head > tail)
+           head = tail;
+        }
+     else if (head > tail) {
+        head += n;
+        if (head >= size)
+           head -= size;
+        if (head > tail)
+           head = tail;
+        }
      }
 }
 
@@ -477,9 +533,11 @@ int cRingBuffer::Read(int Max)
                if (tail >= size)
                   tail = 0;
                }
-            else if (r < 0 && errno != EAGAIN) {
-               LOG_ERROR;
-               return -1;
+            else if (r < 0) {
+               if (errno != EAGAIN) {
+                  LOG_ERROR;
+                  return -1;
+                  }
                }
             else
                eof = true;
@@ -533,37 +591,53 @@ int cRingBuffer::Write(int Max)
   return -1;
 }
 
-// --- cFileBuffer -----------------------------------------------------------
+int cRingBuffer::FindStartCode(uchar Code, int Offset)
+{
+  // Searches for a start code (beginning at Offset) and returns the number
+  // of bytes from Offset to the start code.
 
-class cFileBuffer : public cRingBuffer {
-protected:
-  cIndexFile *index;
-  uchar fileNumber;
+  int n = Available() - Offset;
+
+  for (int i = 0; i < n; i++) {
+      int c = GetStartCode(Offset + i);
+      if (c == Code) 
+         return i;
+      if (i > 0 && c == SC_PHEAD)
+         break; // found another block start while looking for a different code
+      }
+  return -1;
+}
+
+int cRingBuffer::GetPacketLength(int Offset)
+{
+  // Returns the entire length of the packet starting at offset.
+  return (Byte(Offset + 4) << 8) + Byte(Offset + 5) + 6;
+}
+
+// --- cFileName -------------------------------------------------------------
+
+class cFileName {
+private:
+  int file;
+  int fileNumber;
   char *fileName, *pFileNumber;
-  bool stop;
-  int GetAvPesLength(void)
-  {
-    if (Byte(0) == 'A' && Byte(1) == 'V' && Byte(4) == 'U')
-       return (Byte(6) << 8) + Byte(7) + AV_PES_HEADER_LEN;
-    return 0;
-  }
-  int GetAvPesType(void) { return Byte(2); }
-  int GetAvPesTag(void) { return Byte(3); }
-  int FindAvPesBlock(void);
-  int GetPictureType(int Offset) { return (Byte(Offset + 5) >> 3) & 0x07; }
-  int FindPictureStartCode(int Length);
+  bool record;
 public:
-  cFileBuffer(int *InFile, int *OutFile, const char *FileName, bool Recording, int Size, int FreeLimit = 0, int AvailLimit = 0);
-  virtual ~cFileBuffer();
-  void Stop(void) { stop = true; }
+  cFileName(const char *FileName, bool Record);
+  ~cFileName();
+  const char *Name(void) { return fileName; }
+  int Number(void) { return fileNumber; }
+  int Open(void);
+  void Close(void);
+  int SetOffset(int Number, int Offset = 0);
+  int NextFile(void);
   };
 
-cFileBuffer::cFileBuffer(int *InFile, int *OutFile, const char *FileName, bool Recording, int Size, int FreeLimit = 0, int AvailLimit = 0)
-:cRingBuffer(InFile, OutFile, Size, FreeLimit, AvailLimit)
+cFileName::cFileName(const char *FileName, bool Record)
 {
-  index = NULL;
+  file = -1;
   fileNumber = 0;
-  stop = false;
+  record = Record;
   // Prepare the file name:
   fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
   if (!fileName) {
@@ -572,98 +646,165 @@ cFileBuffer::cFileBuffer(int *InFile, int *OutFile, const char *FileName, bool R
      }
   strcpy(fileName, FileName);
   pFileNumber = fileName + strlen(fileName);
-  // Create the index file:
-  index = new cIndexFile(FileName, Recording);
-  if (!index)
-     esyslog(LOG_ERR, "ERROR: can't allocate index");
-     // let's continue without index, so we'll at least have the recording
+  SetOffset(1);
 }
 
-cFileBuffer::~cFileBuffer()
+cFileName::~cFileName()
 {
-  delete index;
+  Close();
   delete fileName;
 }
 
-int cFileBuffer::FindAvPesBlock(void)
+int cFileName::Open(void)
+{
+  if (file < 0) {
+     if (record) {
+        dsyslog(LOG_INFO, "recording to '%s'", fileName);
+        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | O_NONBLOCK);
+        if (file < 0)
+           LOG_ERROR_STR(fileName);
+        }
+     else {
+        if (access(fileName, R_OK) == 0) {
+           dsyslog(LOG_INFO, "playing '%s'", fileName);
+           file = open(fileName, O_RDONLY | O_NONBLOCK);
+           if (file < 0)
+              LOG_ERROR_STR(fileName);
+           }
+        else if (errno != ENOENT)
+           LOG_ERROR_STR(fileName);
+        }
+     }
+  return file;
+}
+
+void cFileName::Close(void)
 {
-  int Skipped = 0;
+  if (file >= 0) {
+     if ((record && CloseVideoFile(file) < 0) || (!record && close(file) < 0))
+        LOG_ERROR_STR(fileName);
+     file = -1;
+     }
+}
 
-  while (Available() > MINVIDEODATA) {
-        if (GetAvPesLength())
-           return Skipped;
-        Skip(1);
-        Skipped++;
+int cFileName::SetOffset(int Number, int Offset)
+{
+  if (fileNumber != Number)
+     Close();
+  if (0 < Number && Number <= MAXFILESPERRECORDING) {
+     fileNumber = Number;
+     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
+     if (record) {
+        if (access(fileName, F_OK) == 0) // file exists, let's try next suffix
+           return SetOffset(Number + 1);
+        else if (errno != ENOENT) { // something serious has happened
+           LOG_ERROR_STR(fileName);
+           return -1;
+           }
+        // found a non existing file suffix
         }
+     if (Open() >= 0) {
+        if (!record && Offset >= 0 && lseek(file, Offset, SEEK_SET) != Offset) {
+           LOG_ERROR_STR(fileName);
+           return -1;
+           }
+        }
+     return file;
+     }
+  esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
   return -1;
 }
 
-int cFileBuffer::FindPictureStartCode(int Length)
+int cFileName::NextFile(void)
 {
-  for (int i = AV_PES_HEADER_LEN; i < Length; i++) {
-      if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1 && Byte(i + 3) == 0)
-         return i;
-      }
-  return -1;
+  return SetOffset(fileNumber + 1);
 }
 
 // --- cRecordBuffer ---------------------------------------------------------
 
-class cRecordBuffer : public cFileBuffer {
+class cRecordBuffer : public cRingBuffer, public cThread {
 private:
+  cFileName fileName;
+  cIndexFile *index;
   uchar pictureType;
   int fileSize;
+  int videoDev;
   int recordFile;
-  uchar tagAudio, tagVideo;
-  bool ok, synced;
+  bool ok, synced, stop;
   time_t lastDiskSpaceCheck;
   bool RunningLowOnDiskSpace(void);
+  int ScanVideoPacket(int *PictureType, int Offset);
   int Synchronize(void);
   bool NextFile(void);
   virtual int Write(int Max = -1);
+  bool WriteWithTimeout(void);
+protected:
+  virtual void Action(void);
 public:
   cRecordBuffer(int *InFile, const char *FileName);
   virtual ~cRecordBuffer();
-  int WriteWithTimeout(bool EndIfEmpty = false);
   };
 
 cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
-:cFileBuffer(InFile, &recordFile, FileName, true, VIDEOBUFSIZE, VIDEOBUFSIZE / 10, 0)
+:cRingBuffer(InFile, &recordFile, VIDEOBUFSIZE, VIDEOBUFSIZE / 10, 0)
+,fileName(FileName, true)
 {
+  index = NULL;
   pictureType = NO_PICTURE;
   fileSize = 0;
-  recordFile = -1;
-  tagAudio = tagVideo = 0;
-  ok = synced = false;
+  videoDev = *InFile;
+  recordFile = fileName.Open();
+  ok = synced = stop = false;
   lastDiskSpaceCheck = time(NULL);
-  if (!fileName)
-     return;//XXX find a better way???
-  // Find the highest existing file suffix:
-  for (;;) {
-      sprintf(pFileNumber, RECORDFILESUFFIX, ++fileNumber);
-      if (access(fileName, F_OK) < 0) {
-         if (errno == ENOENT)
-            break; // found a non existing file suffix
-         LOG_ERROR;
-         return;
-         }
-      }
+  if (!fileName.Name())
+     return;
+  // Create the index file:
+  index = new cIndexFile(FileName, true);
+  if (!index)
+     esyslog(LOG_ERR, "ERROR: can't allocate index");
+     // let's continue without index, so we'll at least have the recording
   ok = true;
-  //XXX hack to make the video device go into 'recording' mode:
-  char dummy;
-  read(*InFile, &dummy, sizeof(dummy));
+  Start();
 }
 
 cRecordBuffer::~cRecordBuffer()
 {
-  if (recordFile >= 0)
-     CloseVideoFile(recordFile);
+  stop = true;
+  Cancel(3);
+  delete index;
+}
+
+void cRecordBuffer::Action(void)
+{
+  dsyslog(LOG_INFO, "recording thread started (pid=%d)", getpid());
+
+  time_t t = time(NULL);
+  for (;;) {
+      usleep(1); // this keeps the CPU load low
+
+      LOCK_THREAD;
+
+      int r = Read();
+      if (r >= 0) {
+         if (r > 0)
+            t = time(NULL);
+         if (!WriteWithTimeout())
+            break;
+         }
+      if (r < 0 || (r == 0 && time(NULL) - t > 5)) {
+         esyslog(LOG_ERR, "ERROR: video data stream broken");
+         t = time(NULL);
+         }
+      }
+  SetPlayMode(videoDev, VID_PLAY_RESET);
+
+  dsyslog(LOG_INFO, "end recording thread");
 }
 
 bool cRecordBuffer::RunningLowOnDiskSpace(void)
 {
   if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
-     uint Free = FreeDiskSpaceMB(fileName);
+     uint Free = FreeDiskSpaceMB(fileName.Name());
      lastDiskSpaceCheck = time(NULL);
      if (Free < MINFREEDISKSPACE) {
         dsyslog(LOG_INFO, "low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
@@ -673,109 +814,109 @@ bool cRecordBuffer::RunningLowOnDiskSpace(void)
   return false;
 }
 
+int cRecordBuffer::ScanVideoPacket(int *PictureType, int Offset)
+{
+  // Scans the video packet starting at Offset and returns its length.
+  // If the return value is -1 the packet was not completely in the buffer.
+
+  int Length = GetPacketLength(Offset);
+  if (Length <= Available()) {
+     for (int i = Offset; i < Offset + Length; i++) {
+         if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
+            switch (Byte(i + 3)) {
+              case SC_PICTURE: *PictureType = GetPictureType(i);
+                               return Length;
+              }
+            }
+         }
+     *PictureType = NO_PICTURE;
+     return Length;
+     }
+  return -1;
+}
+
 int cRecordBuffer::Synchronize(void)
 {
-  int Length = 0;
-  int Skipped = 0;
-  int s;
-
-  while ((s = FindAvPesBlock()) >= 0) {
-        pictureType = NO_PICTURE;
-        Skipped += s;
-        Length = GetAvPesLength();
-        if (Length <= MINVIDEODATA) {
-           switch (GetAvPesType()) {
-             case AV_PES_VIDEO:
-                     {
-                       int PictureOffset = FindPictureStartCode(Length);
-                       if (PictureOffset >= 0) {
-                          pictureType = GetPictureType(PictureOffset);
-                          if (pictureType < I_FRAME || pictureType > B_FRAME)
-                             esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pictureType);
-                          }
-                     }
-                     if (!synced) {
-                        tagVideo = GetAvPesTag();
-                        if (pictureType == I_FRAME) {
-                           synced = true;
-                           Skipped = 0;
-                           }
-                        else {
-                           Skip(Length - 1);
-                           Length = 0;
-                           }
-                        }
-                     else {
-                        if (++tagVideo != GetAvPesTag()) {
-                           esyslog(LOG_ERR, "ERROR: missed video data block #%d (next block is #%d)", tagVideo, GetAvPesTag());
-                           tagVideo = GetAvPesTag();
-                           }
-                        }
-                     break;
-             case AV_PES_AUDIO:
-                     if (!synced) {
-                        tagAudio = GetAvPesTag();
-                        Skip(Length - 1);
-                        Length = 0;
-                        }
-                     else {
-                        //XXX might get fooled the first time!!!
-                        if (++tagAudio != GetAvPesTag()) {
-                           esyslog(LOG_ERR, "ERROR: missed audio data block #%d (next block is #%d)", tagAudio, GetAvPesTag());
-                           tagAudio = GetAvPesTag();
-                           }
-                        }
-                     break;
-             default: // unknown data
-                      Length = 0; // don't skip entire block - maybe we're just not in sync with AV_PES yet
-                      if (synced)
-                         esyslog(LOG_ERR, "ERROR: unknown data type '%d'", GetAvPesType());
-             }
-           if (Length > 0)
-              break;
-           }
-        else if (synced) {
-           esyslog(LOG_ERR, "ERROR: block length too big (%d)", Length);
-           Length = 0;
+  // Positions to the start of a data block (skipping everything up to
+  // an I-frame if not synced) and returns the block length.
+
+  int LastPackHeader = -1;
+
+  pictureType = NO_PICTURE;
+
+  //XXX remove this once the buffer is handled with two separate threads:
+  if (!synced && Free() < 100000) {
+     dsyslog(LOG_INFO, "unable to synchronize, dropped %d bytes", Available());
+     Clear();
+     return 0;
+     }
+  for (int i = 0; Available() > MINVIDEODATA && i < MINVIDEODATA; i++) {
+      if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
+         switch (Byte(i + 3)) {
+           case SC_PHEAD:   LastPackHeader = i;
+                            break;
+           case SC_VIDEO:   {
+                              int pt = NO_PICTURE;
+                              int l = ScanVideoPacket(&pt, i);
+                              if (l < 0)
+                                 return 0; // no useful data found, wait for more
+                              if (pt != NO_PICTURE) {
+                                 if (pt < I_FRAME || B_FRAME < pt) {
+                                   esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
+                                   }
+                                 else if (pictureType == NO_PICTURE) {
+                                    if (!synced) {
+                                       if (LastPackHeader == 0) {
+                                          if (pt == I_FRAME)
+                                             synced = true;
+                                          }
+                                       else if (LastPackHeader > 0) {
+                                          Skip(LastPackHeader);
+                                          LastPackHeader = -1;
+                                          i = 0;
+                                          break;
+                                          }
+                                       else { // LastPackHeader < 0
+                                          Skip(i + l);
+                                          i = 0;
+                                          break;
+                                          }
+                                       }
+                                    if (synced)
+                                       pictureType = pt;
+                                    }
+                                 else if (LastPackHeader > 0)
+                                    return LastPackHeader;
+                                 else
+                                    return i;
+                                 }
+                              i += l - 1; // -1 to compensate for i++ in the loop!
+                              LastPackHeader = -1;
+                            }
+                            break;
+           case SC_AUDIO:   i += GetPacketLength(i) - 1; // -1 to compensate for i++ in the loop!
+                            break;
            }
-        Skip(1);
-        Skipped++;
-        }
-  if (synced && Skipped)
-     esyslog(LOG_ERR, "ERROR: skipped %d bytes", Skipped);
-  return Length;
+         }
+      }
+  return 0; // no useful data found, wait for more
 }
 
 bool cRecordBuffer::NextFile(void)
 {
   if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
      if (fileSize > MAXVIDEOFILESIZE || RunningLowOnDiskSpace()) {
-        if (CloseVideoFile(recordFile) < 0)
-           LOG_ERROR;
-           // don't return 'false', maybe we can still record into the next file
-        recordFile = -1;
-        fileNumber++;
-        if (fileNumber == 0)
-           esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+        recordFile = fileName.NextFile();
         fileSize = 0;
         }
      }
-  if (recordFile < 0) {
-     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
-     dsyslog(LOG_INFO, "recording to '%s'", fileName);
-     recordFile = OpenVideoFile(fileName, O_RDWR | O_CREAT | O_NONBLOCK);
-     if (recordFile < 0) {
-        LOG_ERROR;
-        return false;
-        }
-     }
-  return true;
+  return recordFile >= 0;
 }
 
 int cRecordBuffer::Write(int Max)
 {
   // This function ignores the incoming 'Max'!
-  // It tries to write out exactly *one* block of AV_PES data.
+  // It tries to write out exactly *one* frame block.
   if (!ok)
      return -1;
   int n = Synchronize();
@@ -786,10 +927,10 @@ int cRecordBuffer::Write(int Max)
         }
      if (NextFile()) {
         if (index && pictureType != NO_PICTURE)
-           index->Write(pictureType, fileNumber, fileSize);
+           index->Write(pictureType, fileName.Number(), fileSize);
         int written = 0;
         for (;;) {
-            int w = cFileBuffer::Write(n);
+            int w = cRingBuffer::Write(n);
             if (w >= 0) {
                fileSize += w;
                written += w;
@@ -806,30 +947,41 @@ int cRecordBuffer::Write(int Max)
   return 0;
 }
 
-int cRecordBuffer::WriteWithTimeout(bool EndIfEmpty)
+bool cRecordBuffer::WriteWithTimeout(void)
 {
-  int w, written = 0;
   int t0 = time_ms();
-  while ((w = Write()) > 0 && time_ms() - t0 < MAXRECORDWRITETIME)
-        written += w;
-  return w < 0 ? w : (written == 0 && EndIfEmpty ? -1 : written);
+  do {
+     int w = Write();
+     if (w < 0)
+        return false;
+     if (w == 0)
+        break;
+     } while (time_ms() - t0 < MAXRECORDWRITETIME);
+  return true;
 }
 
 // --- cReplayBuffer ---------------------------------------------------------
 
-enum eReplayMode { rmPlay, rmFastForward, rmFastRewind, rmSlowRewind };
-
-class cReplayBuffer : public cFileBuffer {
+class cReplayBuffer : public cRingBuffer, public cThread {
 private:
+  enum eReplayCmd { rcNone, rcStill, rcPause, rcPlay, rcForward, rcBackward };
+  enum eReplayMode { rmStill, rmPlay, rmFastForward, rmFastRewind, rmSlowRewind };
+  cIndexFile *index;
+  cFileName fileName;
   int fileOffset;
+  int videoDev;
   int replayFile;
   eReplayMode mode;
-  bool skipAudio;
-  int lastIndex;
+  int lastIndex, stillIndex;
   int brakeCounter;
-  void SkipAudioBlocks(void);
+  eReplayCmd command;
+  bool active;
   bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
   void Close(void);
+  void SetCmd(eReplayCmd Cmd) { LOCK_THREAD; command = Cmd; }
+  void SetTemporalReference(void);
+protected:
+  virtual void Action(void);
 public:
   cReplayBuffer(int *OutFile, const char *FileName);
   virtual ~cReplayBuffer();
@@ -838,38 +990,136 @@ class cReplayBuffer : public cFileBuffer {
   void SetMode(eReplayMode Mode);
   int Resume(void);
   bool Save(void);
+  void Pause(void)    { SetCmd(rcPause); }
+  void Play(void)     { SetCmd(rcPlay); }
+  void Forward(void)  { SetCmd(rcForward); }
+  void Backward(void) { SetCmd(rcBackward); }
+  int SkipFrames(int Frames);
   void SkipSeconds(int Seconds);
-  void GetIndex(int &Current, int &Total);
+  void Goto(int Position, bool Still = false);
+  void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
   };
 
 cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
-:cFileBuffer(&replayFile, OutFile, FileName, false, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+:cRingBuffer(&replayFile, OutFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+,fileName(FileName, false)
 {
+  index = NULL;
   fileOffset = 0;
-  replayFile = -1;
+  videoDev = *OutFile;
+  replayFile = fileName.Open();
   mode = rmPlay;
   brakeCounter = 0;
-  skipAudio = false;
-  lastIndex = -1;
-  if (!fileName)
-     return;//XXX find a better way???
-  // All recordings start with '1':
-  fileNumber = 1; //TODO what if it doesn't start with '1'???
-  //XXX hack to make the video device go into 'replaying' mode:
-  char *dummy = "AV"; // must be "AV" to make the driver go into AV_PES mode!
-  write(*OutFile, dummy, strlen(dummy));
+  command = rcNone;
+  lastIndex = stillIndex = -1;
+  active = false;
+  if (!fileName.Name())
+     return;
+  // Create the index file:
+  index = new cIndexFile(FileName, false);
+  if (!index)
+     esyslog(LOG_ERR, "ERROR: can't allocate index");
+     // let's continue without index, so we'll at least have the recording
+  Start();
 }
 
 cReplayBuffer::~cReplayBuffer()
 {
+  active = false;
+  Cancel(3);
   Close();
+  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+  SetPlayMode(videoDev, VID_PLAY_RESET);
+  delete index;
+}
+
+void cReplayBuffer::Action(void)
+{
+  dsyslog(LOG_INFO, "replay thread started (pid=%d)", getpid());
+
+  bool Paused = false;
+  bool FastForward = false;
+  bool FastRewind = false;
+
+  int ResumeIndex = Resume();
+  if (ResumeIndex >= 0)
+     isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, IndexToHMSF(ResumeIndex, true));
+  active = true;
+  while (active) {
+        usleep(1); // this keeps the CPU load low
+
+        LOCK_THREAD;
+
+        if (command != rcNone) {
+           switch (command) {
+             case rcStill:    SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+                              SetPlayMode(videoDev, VID_PLAY_NORMAL);
+                              SetMode(rmStill);
+                              Paused = FastForward = FastRewind = false;
+                              break;
+             case rcPause:    SetPlayMode(videoDev, Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
+                              Paused = !Paused;
+                              if (FastForward || FastRewind) {
+                                 SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+                                 Clear();
+                                 }
+                              FastForward = FastRewind = false;
+                              SetMode(rmPlay);
+                              if (!Paused)
+                                 stillIndex = -1;
+                              break;
+             case rcPlay:     if (FastForward || FastRewind || Paused) {
+                                 SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+                                 SetPlayMode(videoDev, VID_PLAY_NORMAL);
+                                 FastForward = FastRewind = Paused = false;
+                                 SetMode(rmPlay);
+                                 }
+                              stillIndex = -1;
+                              break;
+             case rcForward:  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+                              Clear();
+                              FastForward = !FastForward;
+                              FastRewind = false;
+                              if (Paused) {
+                                 SetMode(rmPlay);
+                                 SetPlayMode(videoDev, FastForward ? VID_PLAY_SLOW_MOTION : VID_PLAY_PAUSE);
+                                 }
+                              else {
+                                 SetPlayMode(videoDev, VID_PLAY_NORMAL);
+                                 SetMode(FastForward ? rmFastForward : rmPlay);
+                                 }
+                              stillIndex = -1;
+                              break;
+             case rcBackward: SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+                              Clear();
+                              FastRewind = !FastRewind;
+                              FastForward = false;
+                              if (Paused) {
+                                 SetMode(FastRewind ? rmSlowRewind : rmPlay);
+                                 SetPlayMode(videoDev, FastRewind ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
+                                 }
+                              else {
+                                 SetPlayMode(videoDev, VID_PLAY_NORMAL);
+                                 SetMode(FastRewind ? rmFastRewind : rmPlay);
+                                 }
+                              stillIndex = -1;
+                              break;
+             default:         break;
+             }
+           command = rcNone;
+           }
+        if (Read() < 0 || Write() < 0)
+           break;
+        }
+  Save();
+
+  dsyslog(LOG_INFO, "end replaying thread");
 }
 
 void cReplayBuffer::Close(void)
 {
   if (replayFile >= 0) {
-     if (close(replayFile) < 0)
-        LOG_ERROR;
+     fileName.Close();
      replayFile = -1;
      fileOffset = 0;
      }
@@ -878,7 +1128,6 @@ void cReplayBuffer::Close(void)
 void cReplayBuffer::SetMode(eReplayMode Mode)
 {
   mode = Mode;
-  skipAudio = Mode != rmPlay;
   brakeCounter = 0;
   if (mode != rmPlay)
      Clear();
@@ -901,14 +1150,11 @@ int cReplayBuffer::Resume(void)
 bool cReplayBuffer::Save(void)
 {
   if (index) {
-     int Index = index->Get(fileNumber, fileOffset);
+     int Index = index->Get(fileName.Number(), fileOffset);
      if (Index >= 0) {
         Index -= RESUMEBACKUP;
-        if (Index > 0) {
-           uchar FileNumber;
-           int FileOffset;
-           Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset);
-           }
+        if (Index > 0)
+           Index = index->GetNextIFrame(Index, false);
         else
            Index = 0;
         if (Index >= 0)
@@ -918,15 +1164,39 @@ bool cReplayBuffer::Save(void)
   return false;
 }
 
+int cReplayBuffer::SkipFrames(int Frames)
+{
+  if (index && Frames) {
+
+     LOCK_THREAD;
+
+     int Current, Total;
+     GetIndex(Current, Total, true);
+     int OldCurrent = Current;
+     Current = index->GetNextIFrame(Current + Frames, Frames > 0);
+     return Current >= 0 ? Current : OldCurrent;
+     }
+  return -1;
+}
+
 void cReplayBuffer::SkipSeconds(int Seconds)
 {
+  LOCK_THREAD;
+
+  SetPlayMode(videoDev, VID_PLAY_PAUSE);
+  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+  SetPlayMode(videoDev, VID_PLAY_NORMAL);
+  command = rcPlay;
+  SetMode(rmPlay);
+  Clear();
+
   if (index && Seconds) {
-     int Index = index->Get(fileNumber, fileOffset);
+     int Index = index->Get(fileName.Number(), fileOffset);
      if (Index >= 0) {
         if (Seconds < 0) {
            int sec = index->Last() / FRAMESPERSEC;
            if (Seconds < -sec)
-              Seconds = - sec;
+              Seconds = -sec;
            }
         Index += Seconds * FRAMESPERSEC;
         if (Index < 0)
@@ -934,103 +1204,120 @@ void cReplayBuffer::SkipSeconds(int Seconds)
         uchar FileNumber;
         int FileOffset;
         if (index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) >= 0)
-        if ((Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset)) >= 0)
            NextFile(FileNumber, FileOffset);
         }
      }
 }
 
-void cReplayBuffer::GetIndex(int &Current, int &Total)
+void cReplayBuffer::Goto(int Index, bool Still)
 {
-  if (index) {
-     Current = index->Get(fileNumber, fileOffset);
-     Total = index->Last();
-     }
-  else
-     Current = Total = -1;
+  LOCK_THREAD;
+
+  if (Still)
+     command = rcStill;
+  if (++Index <= 0)
+     Index = 1; // not '0', to allow GetNextIFrame() below to work!
+  uchar FileNumber;
+  int FileOffset;
+  if ((stillIndex = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset)) >= 0)
+     NextFile(FileNumber, FileOffset);
+  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
+  Clear();
 }
 
-void cReplayBuffer::SkipAudioBlocks(void)
+void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
-  int Length;
+  if (index) {
 
-  while ((Length = GetAvPesLength()) > 0) {
-        if (GetAvPesType() == AV_PES_AUDIO)
-           Skip(Length);
-        else
-           break;
+     LOCK_THREAD;
+
+     if (stillIndex >= 0)
+        Current = stillIndex;
+     else {
+        Current = index->Get(fileName.Number(), fileOffset);
+        if (SnapToIFrame) {
+           int i1 = index->GetNextIFrame(Current + 1, false);
+           int i2 = index->GetNextIFrame(Current, true);
+           Current = (abs(Current - i1) <= abs(Current - i2)) ? i1 : i2;
+           }
         }
+     Total = index->Last();
+     }
+  else
+     Current = Total = -1;
 }
 
 bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
 {
   if (FileNumber > 0) {
      Clear();
-     if (FileNumber != fileNumber) {
-        Close();
-        fileNumber = FileNumber;
-        }
+     fileOffset = FileOffset;
+     replayFile = fileName.SetOffset(FileNumber, FileOffset);
      }
-  if (replayFile >= 0 && EndOfFile()) {
+  else if (replayFile >= 0 && EndOfFile()) {
      Close();
-     fileNumber++;
-     if (fileNumber == 0)
-        esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+     replayFile = fileName.NextFile();
      }
-  if (replayFile < 0) {
-     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
-     if (access(fileName, R_OK) == 0) {
-        dsyslog(LOG_INFO, "playing '%s'", fileName);
-        replayFile = open(fileName, O_RDONLY | O_NONBLOCK);
-        if (replayFile < 0) {
-           LOG_ERROR;
-           return false;
+  return replayFile >= 0;
+}
+
+void cReplayBuffer::SetTemporalReference(void)
+{
+  for (int i = 0; i < Available(); i++) {
+      if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
+         switch (Byte(i + 3)) {
+           case SC_PICTURE: {
+                              unsigned short m = (Byte(i + 4) << 8) | Byte(i + 5);
+                              m &= 0x003F;
+                              Set(i + 4, 1, m >> 8);
+                              Set(i + 5, 1, m & 0xFF);
+                            }
+                            return;
            }
-        }
-     else if (errno != ENOENT)
-        LOG_ERROR;
-     }
-  if (replayFile >= 0) {
-     if (FileOffset >= 0) {
-        if ((fileOffset = lseek(replayFile, FileOffset, SEEK_SET)) != FileOffset)
-           LOG_ERROR;
-           // don't return 'false', maybe we can still replay the file
-        }
-     return true;
-     }
-  return false;
+         }
+      }
 }
 
 int cReplayBuffer::Read(int Max = -1)
 {
-  if (stop)
-     return -1;
   if (mode != rmPlay) {
      if (index) {
         if (Available())
            return 0; // write out the entire block
-        int Index = (lastIndex >= 0) ? lastIndex : index->Get(fileNumber, fileOffset);
-        if (Index >= 0) {
+        if (mode == rmStill) {
            uchar FileNumber;
            int FileOffset, Length;
-           if (mode == rmSlowRewind && (brakeCounter++ % 24) != 0) {
-              // show every I_FRAME 24 times in rmSlowRewind mode to achieve roughly the same speed as in slow forward mode
-              Index = index->GetNextIFrame(Index, true, &FileNumber, &FileOffset, &Length); // jump ahead one frame
-              }
-           Index = index->GetNextIFrame(Index, mode == rmFastForward, &FileNumber, &FileOffset, &Length);
-           if (Index >= 0) {
+           if (index->GetNextIFrame(stillIndex + 1, false, &FileNumber, &FileOffset, &Length) >= 0) {
               if (!NextFile(FileNumber, FileOffset))
                  return -1;
               Max = Length;
               }
-           lastIndex = Index;
+           command = rcPause;
            }
-        if (Index < 0) {
-           // This results in normal replay after a fast rewind.
-           // After a fast forward it will stop.
-           // TODO Could we cause it to pause at the last frame?
-           SetMode(rmPlay);
-           return 0;
+        else {
+           int Index = (lastIndex >= 0) ? lastIndex : index->Get(fileName.Number(), fileOffset);
+           if (Index >= 0) {
+              if (mode == rmSlowRewind && (brakeCounter++ % 24) != 0) {
+                 // show every I_FRAME 24 times in rmSlowRewind mode to achieve roughly the same speed as in slow forward mode
+                 Index = index->GetNextIFrame(Index, true); // jump ahead one frame
+                 }
+              uchar FileNumber;
+              int FileOffset, Length;
+              Index = index->GetNextIFrame(Index, mode == rmFastForward, &FileNumber, &FileOffset, &Length);
+              if (Index >= 0) {
+                 if (!NextFile(FileNumber, FileOffset))
+                    return -1;
+                 Max = Length;
+                 }
+              lastIndex = Index;
+              }
+           if (Index < 0) {
+              // This results in normal replay after a fast rewind.
+              // After a fast forward it will stop.
+              // TODO Could we cause it to pause at the last frame?
+              SetMode(rmPlay);
+              return 0;
+              }
            }
         }
      }
@@ -1041,12 +1328,22 @@ int cReplayBuffer::Read(int Max = -1)
      int readin = 0;
      do {
         // If Max is > 0 here we need to make sure we read in the entire block!
-        int r = cFileBuffer::Read(Max);
+        int r = cRingBuffer::Read(Max);
         if (r >= 0)
            readin += r;
         else
            return -1;
         } while (readin < Max && Free() > 0);
+     if (mode != rmPlay) {
+        // delete the audio data in modes other than rmPlay:
+        int AudioOffset, StartOffset = 0;
+        while ((AudioOffset = FindStartCode(SC_AUDIO, StartOffset)) >= 0) {
+              if (!Set(StartOffset + AudioOffset, GetPacketLength(StartOffset + AudioOffset), 0))
+                 break; // to be able to replay old AV_PES recordings!
+              StartOffset += AudioOffset;
+              }
+        SetTemporalReference();
+        }
      return readin;
      }
   if (Available() > 0)
@@ -1057,16 +1354,10 @@ int cReplayBuffer::Read(int Max = -1)
 int cReplayBuffer::Write(int Max)
 {
   int Written = 0;
-  int Av = Available();
-  if (skipAudio) {
-     SkipAudioBlocks();
-     Max = GetAvPesLength();
-     fileOffset += Av - Available();
-     }
   if (Max) {
      int w;
      do {
-        w = cFileBuffer::Write(Max);
+        w = cRingBuffer::Write(Max);
         if (w >= 0) {
            fileOffset += w;
            Written += w;
@@ -1076,7 +1367,7 @@ int cReplayBuffer::Write(int Max)
            }
         else
            return w;
-        } while (Max > 0); // we MUST write this entire AV_PES block
+        } while (Max > 0); // we MUST write this entire frame block
      }
   return Written;
 }
@@ -1098,44 +1389,188 @@ cTransferBuffer::cTransferBuffer(int FromDevice, int ToDevice)
 {
   fromDevice = FromDevice;
   toDevice = ToDevice;
-  active = true;
+  active = false;
   Start();
 }
 
 cTransferBuffer::~cTransferBuffer()
 {
-  {
-    LOCK_THREAD;
-    active = false;
-  }
-  for (time_t t0 = time(NULL); time(NULL) - t0 < 3; ) {
-      LOCK_THREAD;
-      if (active)
-         break;
-      }
+  active = false;
+  Cancel(3);
+  SetPlayMode(fromDevice, VID_PLAY_RESET);
+  SetPlayMode(toDevice, VID_PLAY_RESET);
 }
 
 void cTransferBuffer::Action(void)
 {
   dsyslog(LOG_INFO, "data transfer thread started (pid=%d)", getpid());
-  //XXX hack to make the video device go into 'replaying' mode:
-  char *dummy = "AV"; // must be "AV" to make the driver go into AV_PES mode!
-  write(toDevice, dummy, strlen(dummy));
-  {
-    cRingBuffer Buffer(&fromDevice, &toDevice, VIDEOBUFSIZE, 0, 0);
-    while (active && Buffer.Available() < 100000) { // need to give the read buffer a head start
-          Buffer.Read(); // initializes fromDevice for reading
-          usleep(1); // this keeps the CPU load low
-          }
-    for (; active;) {
+
+  cRingBuffer Buffer(&fromDevice, &toDevice, VIDEOBUFSIZE, 0, 0);
+  active = true;
+  while (active && Buffer.Available() < 100000) { // need to give the read buffer a head start
+        Buffer.Read(); // initializes fromDevice for reading
+        usleep(1); // this keeps the CPU load low
+        }
+  while (active) {
         if (Buffer.Read() < 0 || Buffer.Write() < 0)
            break;
         usleep(1); // this keeps the CPU load low
         }
-  }
   dsyslog(LOG_INFO, "data transfer thread stopped (pid=%d)", getpid());
-  LOCK_THREAD;
-  active = true;
+}
+
+// --- cCuttingBuffer --------------------------------------------------------
+
+class cCuttingBuffer : public cRingBuffer, public cThread {
+private:
+  bool active;
+  int fromFile, toFile;
+  cFileName *fromFileName, *toFileName;
+  cIndexFile *fromIndex, *toIndex;
+  cMarks fromMarks, toMarks;
+protected:
+  virtual void Action(void);
+public:
+  cCuttingBuffer(const char *FromFileName, const char *ToFileName);
+  virtual ~cCuttingBuffer();
+  };
+
+cCuttingBuffer::cCuttingBuffer(const char *FromFileName, const char *ToFileName)
+:cRingBuffer(&fromFile, &toFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+{
+  active = false;
+  fromFile = toFile = -1;
+  fromFileName = toFileName = NULL;
+  fromIndex = toIndex = NULL;
+  if (fromMarks.Load(FromFileName) && fromMarks.Count()) {
+     fromFileName = new cFileName(FromFileName, false);
+     toFileName = new cFileName(ToFileName, true);
+     fromIndex = new cIndexFile(FromFileName, false);
+     toIndex = new cIndexFile(ToFileName, true);
+     toMarks.Load(ToFileName); // doesn't actually load marks, just sets the file name
+     Start();
+     }
+  else
+     esyslog(LOG_ERR, "no editing marks found for %s", FromFileName);
+}
+
+cCuttingBuffer::~cCuttingBuffer()
+{
+  active = false;
+  Cancel(3);
+  delete fromFileName;
+  delete toFileName;
+  delete fromIndex;
+  delete toIndex;
+}
+
+void cCuttingBuffer::Action(void)
+{
+  dsyslog(LOG_INFO, "video cutting thread started (pid=%d)", getpid());
+
+  cMark *Mark = fromMarks.First();
+  if (Mark) {
+     fromFile = fromFileName->Open();
+     toFile = toFileName->Open();
+     active = fromFile >= 0 && toFile >= 0;
+     int Index = Mark->position;
+     Mark = fromMarks.Next(Mark);
+     int FileSize = 0;
+     int CurrentFileNumber = 0;
+     int LastIFrame = 0;
+     toMarks.Add(0);
+     toMarks.Save();
+     while (active) {
+           uchar FileNumber;
+           int FileOffset, Length;
+           uchar PictureType;
+   
+           Clear(); // makes sure one frame is completely read and written
+   
+           // Read one frame:
+   
+           if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
+              if (FileNumber != CurrentFileNumber) {
+                 fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
+                 CurrentFileNumber = FileNumber;
+                 }
+              if (fromFile >= 0)
+                 Length = cRingBuffer::Read(Length);
+              else
+                 break;
+              }
+           else
+              break;
+
+           // Write one frame:
+
+           if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
+              if (FileSize > MAXVIDEOFILESIZE) {
+                 toFile = toFileName->NextFile();
+                 if (toFile < 0)
+                    break;
+                 FileSize = 0;
+                 }
+              LastIFrame = 0;
+              }
+           cRingBuffer::Write(Length);
+           toIndex->Write(PictureType, toFileName->Number(), FileSize);
+           FileSize += Length;
+           if (!LastIFrame)
+              LastIFrame = toIndex->Last();
+
+           // Check editing marks:
+
+           if (Mark && Index >= Mark->position) {
+              Mark = fromMarks.Next(Mark);
+              if (Mark) {
+                 Index = Mark->position;
+                 Mark = fromMarks.Next(Mark);
+                 CurrentFileNumber = 0; // triggers SetOffset before reading next frame
+                 toMarks.Add(LastIFrame);
+                 toMarks.Add(toIndex->Last() + 1);
+                 toMarks.Save();
+                 }
+              else
+                 break; // final end mark reached
+              }
+           }
+     }
+  else
+     esyslog(LOG_ERR, "no editing marks found!");
+  dsyslog(LOG_INFO, "end video cutting thread");
+}
+
+// --- cVideoCutter ----------------------------------------------------------
+
+cCuttingBuffer *cVideoCutter::cuttingBuffer = NULL;
+
+bool cVideoCutter::Start(const char *FileName)
+{
+  if (!cuttingBuffer) {
+     const char *EditedVersionName = PrefixVideoFileName(FileName, '%');
+     if (EditedVersionName && RemoveVideoFile(EditedVersionName) && MakeDirs(EditedVersionName, true)) {
+        cuttingBuffer = new cCuttingBuffer(FileName, EditedVersionName);
+        return true;
+        }
+     }
+  return false;
+}
+
+void cVideoCutter::Stop(void)
+{
+  delete cuttingBuffer;
+  cuttingBuffer = NULL;
+}
+
+bool cVideoCutter::Active(void)
+{
+  if (cuttingBuffer) {
+     if (cuttingBuffer->Active())
+        return true;
+     Stop();
+     }
+  return false;
 }
 
 // --- cDvbApi ---------------------------------------------------------------
@@ -1147,13 +1582,12 @@ cDvbApi *cDvbApi::PrimaryDvbApi = NULL;
 cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
 {
   siProcessor = NULL;
-  pidRecord = pidReplay = 0;
-  fromRecord = toRecord = -1;
-  fromReplay = toReplay = -1;
-  ca = 0;
-  priority = -1;
+  recordBuffer = NULL;
+  replayBuffer = NULL;
   transferBuffer = NULL;
   transferringFromDvbApi = NULL;
+  ca = 0;
+  priority = -1;
   videoDev = open(VideoFileName, O_RDWR | O_NONBLOCK);
   if (videoDev >= 0) {
      siProcessor = new cSIProcessor(VbiFileName);
@@ -1191,8 +1625,6 @@ cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
 #else
   osd = NULL;
 #endif
-  lastProgress = lastTotal = -1;
-  replayTitle = NULL;
   currentChannel = 1;
 }
 
@@ -1201,7 +1633,7 @@ cDvbApi::~cDvbApi()
   if (videoDev >= 0) {
      delete siProcessor;
      Close();
-     Stop();
+     StopReplay();
      StopRecord();
      StopTransfer();
      OvlO(false); //Overlay off!
@@ -1211,7 +1643,6 @@ cDvbApi::~cDvbApi()
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   endwin();
 #endif
-  delete replayTitle;
 }
 
 bool cDvbApi::SetPrimaryDvbApi(int n)
@@ -1618,8 +2049,6 @@ void cDvbApi::Open(int w, int h)
   SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
   SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
   SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
-
-  lastProgress = lastTotal = -1;
 }
 
 void cDvbApi::Close(void)
@@ -1633,7 +2062,6 @@ void cDvbApi::Close(void)
   delete osd;
   osd = NULL;
 #endif
-  lastProgress = lastTotal = -1;
 }
 
 void cDvbApi::Clear(void)
@@ -1662,6 +2090,13 @@ void cDvbApi::Fill(int x, int y, int w, int h, eDvbColor color)
 #endif
 }
 
+void cDvbApi::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+#ifndef DEBUG_OSD
+  osd->SetBitmap(x, y, Bitmap);
+#endif
+}
+
 void cDvbApi::ClrEol(int x, int y, eDvbColor color)
 {
   Fill(x, y, cols - x, 1, color);
@@ -1676,6 +2111,15 @@ int cDvbApi::CellWidth(void)
 #endif
 }
 
+int cDvbApi::LineHeight(void)
+{
+#ifdef DEBUG_OSD
+  return 1;
+#else
+  return lineHeight;
+#endif
+}
+
 int cDvbApi::Width(unsigned char c)
 {
 #ifdef DEBUG_OSD
@@ -1724,67 +2168,12 @@ void cDvbApi::Flush(void)
 #endif
 }
 
-bool cDvbApi::ShowProgress(bool Initial)
-{
-  int Current, Total;
-
-  if (GetIndex(&Current, &Total)) {
-     if (Initial) {
-        Clear();
-        if (replayTitle)
-           Text(0, 0, replayTitle);
-        }
-     if (Total != lastTotal)
-        Text(-7, 2, cIndexFile::Str(Total));
-     Flush();
-#ifdef DEBUG_OSD
-     int p = cols * Current / Total;
-     Fill(0, 1, p, 1, clrGreen);
-     Fill(p, 1, cols - p, 1, clrWhite);
-#else
-     int w = cols * charWidth;
-     int p = w * Current / Total;
-     if (p != lastProgress) {
-        int y1 = 1 * lineHeight;
-        int y2 = 2 * lineHeight - 1;
-        int x1, x2;
-        eDvbColor color;
-        if (lastProgress < p) {
-           x1 = lastProgress + 1;
-           x2 = p;
-           if (p >= w)
-              p = w - 1;
-           color = clrGreen;
-           }
-        else {
-           x1 = p + 1;
-           x2 = lastProgress;
-           color = clrWhite;
-           }
-        if (lastProgress < 0)
-           osd->Fill(0, y1, w - 1, y2, clrWhite);
-        osd->Fill(x1, y1, x2, y2, color);
-        lastProgress = p;
-        }
-     Flush();
-#endif
-     Text(0, 2, cIndexFile::Str(Current));
-     Flush();
-     lastTotal = Total;
-     return true;
-     }
-  return false;
-}
-
 bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr)
 {
   if (videoDev >= 0) {
+     cThreadLock ThreadLock(siProcessor); // makes sure the siProcessor won't access the vbi-device while switching
      StopTransfer();
-     if (transferringFromDvbApi) {
-        transferringFromDvbApi->StopTransfer();
-        transferringFromDvbApi = NULL;
-        }
-     SetReplayMode(VID_PLAY_RESET);
+     SetPlayMode(videoDev, VID_PLAY_RESET);
      struct frontend front;
      ioctl(videoDev, VIDIOCGFRONTEND, &front);
      unsigned int freq = FrequencyMHz;
@@ -1793,8 +2182,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
         freq -= Setup.LnbFrequLo;
      else
         freq -= Setup.LnbFrequHi;
-     front.channel_flags = Ca ? DVB_CHANNEL_CA : DVB_CHANNEL_FTA;
-     front.pnr       = Pnr;
+     front.pnr       = 0;
      front.freq      = freq * 1000000UL;
      front.diseqc    = Diseqc;
      front.srate     = Srate * 1000;
@@ -1821,7 +2209,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
            }
         return true;
         }
-     esyslog(LOG_ERR, "ERROR: channel not sync'ed (front.sync=%X)!", front.sync);
+     esyslog(LOG_ERR, "ERROR: channel %d not sync'ed (front.sync=%X)!", ChannelNumber, front.sync);
      }
   return false;
 }
@@ -1843,22 +2231,31 @@ void cDvbApi::StopTransfer(void)
   if (transferBuffer) {
      delete transferBuffer;
      transferBuffer = NULL;
-     SetReplayMode(VID_PLAY_RESET);
+     SetPlayMode(videoDev, VID_PLAY_RESET);
+     }
+  if (transferringFromDvbApi) {
+     transferringFromDvbApi->StopTransfer();
+     transferringFromDvbApi = NULL;
      }
 }
 
+int cDvbApi::SecondsToFrames(int Seconds)
+{
+  return Seconds * FRAMESPERSEC;
+}
+
 bool cDvbApi::Recording(void)
 {
-  if (pidRecord && !CheckProcess(pidRecord))
-     pidRecord = 0;
-  return pidRecord;
+  if (recordBuffer && !recordBuffer->Active())
+     StopRecord();
+  return recordBuffer != NULL;
 }
 
 bool cDvbApi::Replaying(void)
 {
-  if (pidReplay && !CheckProcess(pidReplay))
-     pidReplay = 0;
-  return pidReplay;
+  if (replayBuffer && !replayBuffer->Active())
+     StopReplay();
+  return replayBuffer != NULL;
 }
 
 bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
@@ -1871,7 +2268,7 @@ bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
 
      StopTransfer();
 
-     Stop(); // TODO: remove this if the driver is able to do record and replay at the same time
+     StopReplay(); // TODO: remove this if the driver is able to do record and replay at the same time
 
      // Check FileName:
 
@@ -1886,129 +2283,41 @@ bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
      if (!MakeDirs(FileName, true))
         return false;
 
-     // Open pipes for recording process:
+     // Create recording buffer:
 
-     int fromRecordPipe[2], toRecordPipe[2];
+     recordBuffer = new cRecordBuffer(&videoDev, FileName);
 
-     if (pipe(fromRecordPipe) != 0) {
-        LOG_ERROR;
-        return false;
-        }
-     if (pipe(toRecordPipe) != 0) {
-        LOG_ERROR;
-        return false;
-        }
-
-     // Create recording process:
-
-     pidRecord = fork();
-     if (pidRecord < 0) {
-        LOG_ERROR;
-        return false;
-        }
-     if (pidRecord == 0) {
-
-        // This is the actual recording process
-
-        dsyslog(LOG_INFO, "start recording process (pid=%d)", getpid());
-        bool DataStreamBroken = false;
-        int fromMain = toRecordPipe[0];
-        int toMain = fromRecordPipe[1];
-        cRecordBuffer *Buffer = new cRecordBuffer(&videoDev, FileName);
-        if (Buffer) {
-           for (;;) {
-               fd_set set;
-               FD_ZERO(&set);
-               FD_SET(videoDev, &set);
-               FD_SET(fromMain, &set);
-               struct timeval timeout;
-               timeout.tv_sec = 1;
-               timeout.tv_usec = 0;
-               bool ForceEnd = false;
-               if (select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0) {
-                  if (FD_ISSET(videoDev, &set)) {
-                     if (Buffer->Read() < 0)
-                        break;
-                     DataStreamBroken = false;
-                     }
-                  if (FD_ISSET(fromMain, &set)) {
-                     switch (readchar(fromMain)) {
-                       case dvbStop: Buffer->Stop();
-                                     ForceEnd = DataStreamBroken;
-                                     break;
-                       }
-                     }
-                  }
-               else {
-                  DataStreamBroken = true;
-                  esyslog(LOG_ERR, "ERROR: video data stream broken");
-                  }
-               if (Buffer->WriteWithTimeout(ForceEnd) < 0)
-                  break;
-               }
-           delete Buffer;
-           }
-        else
-           esyslog(LOG_ERR, "ERROR: can't allocate recording buffer");
-        close(fromMain);
-        close(toMain);
-        dsyslog(LOG_INFO, "end recording process");
-        exit(0);
+     if (recordBuffer) {
+        ca = Ca;
+        priority = Priority;
+        return true;
         }
-
-     // Establish communication with the recording process:
-
-     fromRecord = fromRecordPipe[0];
-     toRecord = toRecordPipe[1];
-
-     ca = Ca;
-     priority = Priority;
-     return true;
+     else
+        esyslog(LOG_ERR, "ERROR: can't allocate recording buffer");
      }
   return false;
 }
 
 void cDvbApi::StopRecord(void)
 {
-  if (pidRecord) {
-     writechar(toRecord, dvbStop);
-     close(toRecord);
-     close(fromRecord);
-     toRecord = fromRecord = -1;
-     KillProcess(pidRecord);
-     pidRecord = 0;
+  if (recordBuffer) {
+     delete recordBuffer;
+     recordBuffer = NULL;
      ca = 0;
      priority = -1;
-     SetReplayMode(VID_PLAY_RESET); //XXX
      }
 }
 
-void cDvbApi::SetReplayMode(int Mode)
-{
-  if (videoDev >= 0) {
-     struct video_play_mode pmode;
-     pmode.mode = Mode;
-     ioctl(videoDev, VIDIOCSPLAYMODE, &pmode);
-     }
-}
-
-bool cDvbApi::StartReplay(const char *FileName, const char *Title)
+bool cDvbApi::StartReplay(const char *FileName)
 {
   if (Recording()) {
      esyslog(LOG_ERR, "ERROR: StartReplay() called while recording - ignored!");
      return false;
      }
   StopTransfer();
-  Stop();
+  StopReplay();
   if (videoDev >= 0) {
 
-     lastProgress = lastTotal = -1;
-     delete replayTitle;
-     if (Title) {
-        if ((replayTitle = strdup(Title)) == NULL)
-           esyslog(LOG_ERR, "ERROR: StartReplay: can't copy title '%s'", Title);
-        }
-
      // Check FileName:
 
      if (!FileName) {
@@ -2017,209 +2326,77 @@ bool cDvbApi::StartReplay(const char *FileName, const char *Title)
         }
      isyslog(LOG_INFO, "replay %s", FileName);
 
-     // Open pipes for replay process:
-
-     int fromReplayPipe[2], toReplayPipe[2];
-
-     if (pipe(fromReplayPipe) != 0) {
-        LOG_ERROR;
-        return false;
-        }
-     if (pipe(toReplayPipe) != 0) {
-        LOG_ERROR;
-        return false;
-        }
-
-     // Create replay process:
+     // Create replay buffer:
 
-     pidReplay = fork();
-     if (pidReplay < 0) {
-        LOG_ERROR;
-        return false;
-        }
-     if (pidReplay == 0) {
-
-        // This is the actual replaying process
-
-        dsyslog(LOG_INFO, "start replaying process (pid=%d)", getpid());
-        int fromMain = toReplayPipe[0];
-        int toMain = fromReplayPipe[1];
-        cReplayBuffer *Buffer = new cReplayBuffer(&videoDev, FileName);
-        if (Buffer) {
-           bool Paused = false;
-           bool FastForward = false;
-           bool FastRewind = false;
-           int ResumeIndex = Buffer->Resume();
-           if (ResumeIndex >= 0)
-              isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, cIndexFile::Str(ResumeIndex, true));
-           for (;;) {
-               if (Buffer->Read() < 0)
-                  break;
-               fd_set setIn, setOut;
-               FD_ZERO(&setIn);
-               FD_ZERO(&setOut);
-               FD_SET(fromMain, &setIn);
-               FD_SET(videoDev, &setOut);
-               struct timeval timeout;
-               timeout.tv_sec = 1;
-               timeout.tv_usec = 0;
-               if (select(FD_SETSIZE, &setIn, &setOut, NULL, &timeout) > 0) {
-                  if (FD_ISSET(videoDev, &setOut)) {
-                     if (Buffer->Write() < 0)
-                        break;
-                     }
-                  if (FD_ISSET(fromMain, &setIn)) {
-                     switch (readchar(fromMain)) {
-                       case dvbStop:     SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                         Buffer->Stop();
-                                         break;
-                       case dvbPause:    SetReplayMode(Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
-                                         Paused = !Paused;
-                                         if (FastForward || FastRewind) {
-                                            SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                            Buffer->Clear();
-                                            }
-                                         FastForward = FastRewind = false;
-                                         Buffer->SetMode(rmPlay);
-                                         break;
-                       case dvbPlay:     if (FastForward || FastRewind || Paused) {
-                                            SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                            SetReplayMode(VID_PLAY_NORMAL);
-                                            FastForward = FastRewind = Paused = false;
-                                            Buffer->SetMode(rmPlay);
-                                            }
-                                         break;
-                       case dvbForward:  SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                         Buffer->Clear();
-                                         FastForward = !FastForward;
-                                         FastRewind = false;
-                                         if (Paused) {
-                                            Buffer->SetMode(rmPlay);
-                                            SetReplayMode(FastForward ? VID_PLAY_SLOW_MOTION : VID_PLAY_PAUSE);
-                                            }
-                                         else {
-                                            SetReplayMode(VID_PLAY_NORMAL);
-                                            Buffer->SetMode(FastForward ? rmFastForward : rmPlay);
-                                            }
-                                         break;
-                       case dvbBackward: SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                         Buffer->Clear();
-                                         FastRewind = !FastRewind;
-                                         FastForward = false;
-                                         if (Paused) {
-                                            Buffer->SetMode(FastRewind ? rmSlowRewind : rmPlay);
-                                            SetReplayMode(FastRewind ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
-                                            }
-                                         else {
-                                            SetReplayMode(VID_PLAY_NORMAL);
-                                            Buffer->SetMode(FastRewind ? rmFastRewind : rmPlay);
-                                            }
-                                         break;
-                       case dvbSkip:     {
-                                           int Seconds;
-                                           if (readint(fromMain, Seconds)) {
-                                              SetReplayMode(VID_PLAY_CLEAR_BUFFER);
-                                              SetReplayMode(VID_PLAY_NORMAL);
-                                              FastForward = FastRewind = Paused = false;
-                                              Buffer->SetMode(rmPlay);
-                                              Buffer->SkipSeconds(Seconds);
-                                              }
-                                         }
-                                         break;
-                       case dvbGetIndex: {
-                                           int Current, Total;
-                                           Buffer->GetIndex(Current, Total);
-                                           writeint(toMain, Current);
-                                           writeint(toMain, Total);
-                                         }
-                                         break;
-                       }
-                     }
-                  }
-               }
-           Buffer->Save();
-           delete Buffer;
-           }
-        else
-           esyslog(LOG_ERR, "ERROR: can't allocate replaying buffer");
-        close(fromMain);
-        close(toMain);
-        SetReplayMode(VID_PLAY_RESET); //XXX
-        dsyslog(LOG_INFO, "end replaying process");
-        exit(0);
-        }
-
-     // Establish communication with the replay process:
-
-     fromReplay = fromReplayPipe[0];
-     toReplay = toReplayPipe[1];
-     return true;
+     replayBuffer = new cReplayBuffer(&videoDev, FileName);
+     if (replayBuffer)
+        return true;
+     else
+        esyslog(LOG_ERR, "ERROR: can't allocate replaying buffer");
      }
   return false;
 }
 
-void cDvbApi::Stop(void)
+void cDvbApi::StopReplay(void)
 {
-  if (pidReplay) {
-     writechar(toReplay, dvbStop);
-     close(toReplay);
-     close(fromReplay);
-     toReplay = fromReplay = -1;
-     KillProcess(pidReplay);
-     pidReplay = 0;
-     SetReplayMode(VID_PLAY_RESET); //XXX
+  if (replayBuffer) {
+     delete replayBuffer;
+     replayBuffer = NULL;
      }
 }
 
 void cDvbApi::Pause(void)
 {
-  if (pidReplay)
-     writechar(toReplay, dvbPause);
+  if (replayBuffer)
+     replayBuffer->Pause();
 }
 
 void cDvbApi::Play(void)
 {
-  if (pidReplay)
-     writechar(toReplay, dvbPlay);
+  if (replayBuffer)
+     replayBuffer->Play();
 }
 
 void cDvbApi::Forward(void)
 {
-  if (pidReplay)
-     writechar(toReplay, dvbForward);
+  if (replayBuffer)
+     replayBuffer->Forward();
 }
 
 void cDvbApi::Backward(void)
 {
-  if (pidReplay)
-     writechar(toReplay, dvbBackward);
+  if (replayBuffer)
+     replayBuffer->Backward();
 }
 
-void cDvbApi::Skip(int Seconds)
+void cDvbApi::SkipSeconds(int Seconds)
 {
-  if (pidReplay) {
-     writechar(toReplay, dvbSkip);
-     writeint(toReplay, Seconds);
-     }
+  if (replayBuffer)
+     replayBuffer->SkipSeconds(Seconds);
 }
 
-bool cDvbApi::GetIndex(int *Current, int *Total)
+int cDvbApi::SkipFrames(int Frames)
 {
-  if (pidReplay) {
-     int total;
-     purge(fromReplay);
-     writechar(toReplay, dvbGetIndex);
-     if (readint(fromReplay, *Current) && readint(fromReplay, total)) {
-        if (Total)
-           *Total = total;
-        }
-     else
-        *Current = -1;
-     return *Current >= 0;
+  if (replayBuffer)
+     return replayBuffer->SkipFrames(Frames);
+  return -1;
+}
+
+bool cDvbApi::GetIndex(int &Current, int &Total, bool SnapToIFrame)
+{
+  if (replayBuffer) {
+     replayBuffer->GetIndex(Current, Total, SnapToIFrame);
+     return true;
      }
   return false;
 }
 
+void cDvbApi::Goto(int Position, bool Still)
+{
+  if (replayBuffer)
+     replayBuffer->Goto(Position, Still);
+}
+
 // --- cEITScanner -----------------------------------------------------------
 
 cEITScanner::cEITScanner(void)
diff --git a/dvbapi.h b/dvbapi.h
index f6640ff5d..cf0584f80 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.26 2000/11/19 14:09:41 kls Exp $
+ * $Id: dvbapi.h 1.30 2001/01/07 15:56:10 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -22,6 +22,7 @@ typedef unsigned char __u8;
 #include <dvb.h>
 #include "dvbosd.h"
 #include "eit.h"
+#include "thread.h"
 
 // Overlay facilities
 #define MAXCLIPRECTS 100
@@ -42,7 +43,24 @@ class cResumeFile {
   bool Save(int Index);
   };
 
+const char *IndexToHMSF(int Index, bool WithFrame = false);
+      // Converts the given index to a string, optionally containing the frame number.
+int HMSFToIndex(const char *HMSF);
+      // Converts the given string (format: "hh:mm:ss.ff") to an index.
+
+class cRecordBuffer;
+class cReplayBuffer;
 class cTransferBuffer;
+class cCuttingBuffer;
+
+class cVideoCutter {
+private:
+  static cCuttingBuffer *cuttingBuffer;
+public:
+  static bool Start(const char *FileName);
+  static void Stop(void);
+  static bool Active(void);
+  };
 
 class cDvbApi {
 private:
@@ -129,22 +147,16 @@ class cDvbApi {
   void Close(void);
   void Clear(void);
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
   int CellWidth(void);
+  int LineHeight(void);
   int Width(unsigned char c);
   int WidthInCells(const char *s);
   eDvbFont SetFont(eDvbFont Font);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
   void Flush(void);
 
-  // Progress Display facilities
-
-private:
-  int lastProgress, lastTotal;
-  char *replayTitle;
-public:
-  bool ShowProgress(bool Initial = false);
-
   // Channel facilities
 
 private:
@@ -171,20 +183,10 @@ class cDvbApi {
   // Record/Replay facilities
 
 private:
-  enum { dvbStop = 1, // let's not have 0 as a command
-         dvbPause,
-         dvbPlay,
-         dvbForward,
-         dvbBackward,
-         dvbSkip,
-         dvbGetIndex,
-       };
-  pid_t pidRecord, pidReplay;
-  int fromRecord, toRecord;
-  int fromReplay, toReplay;
+  cRecordBuffer *recordBuffer;
+  cReplayBuffer *replayBuffer;
   int ca;
   int priority;
-  void SetReplayMode(int Mode);
 protected:
   int  Ca(void) { return ca; }
        // Returns the ca of the current recording session (0..MAXDVBAPI).
@@ -192,6 +194,8 @@ class cDvbApi {
        // Returns the priority of the current recording session (0..99),
        // or -1 if no recording is currently active.
 public:
+  int  SecondsToFrames(int Seconds);
+       // Returns the number of frames corresponding to the given number of seconds.
   bool Recording(void);
        // Returns true if we are currently recording.
   bool Replaying(void);
@@ -209,12 +213,11 @@ class cDvbApi {
        // returned.
   void StopRecord(void);
        // Stops the current recording session (if any).
-  bool StartReplay(const char *FileName, const char *Title = NULL);
+  bool StartReplay(const char *FileName);
        // Starts replaying the given file.
        // If there is already a replay session active, it will be stopped
        // and the new file will be played back.
-       // If provided Title will be used in the progress display.
-  void Stop(void);
+  void StopReplay(void);
        // Stops the current replay session (if any).
   void Pause(void);
        // Pauses the current replay session, or resumes a paused session.
@@ -224,12 +227,21 @@ class cDvbApi {
        // Runs the current replay session forward at a higher speed.
   void Backward(void);
        // Runs the current replay session backwards at a higher speed.
-  void Skip(int Seconds);
+  void SkipSeconds(int Seconds);
        // Skips the given number of seconds in the current replay session.
        // The sign of 'Seconds' determines the direction in which to skip.
        // Use a very large negative value to go all the way back to the
        // beginning of the recording.
-  bool GetIndex(int *Current, int *Total = NULL);
+  int  SkipFrames(int Frames);
+       // Returns the new index into the current replay session after skipping
+       // the given number of frames (no actual repositioning is done!).
+       // The sign of 'Frames' determines the direction in which to skip.
+  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+       // Returns the current and total frame index, optionally snapped to the
+       // nearest I-frame.
+  void Goto(int Index, bool Still = false);
+       // Positions to the given index and displays that frame as a still picture
+       // if Still is true. 
   };
 
 class cEITScanner {
diff --git a/dvbosd.c b/dvbosd.c
index 457175d8b..395ad32ed 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.6 2000/11/18 15:36:51 kls Exp $
+ * $Id: dvbosd.c 1.7 2000/12/09 11:13:00 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -82,6 +82,16 @@ void cBitmap::SetPixel(int x, int y, eDvbColor Color)
      }
 }
 
+void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+  if (bitmap && Bitmap.bitmap) {
+     for (int ix = 0; ix < Bitmap.width; ix++) {
+         for (int iy = 0; iy < Bitmap.height; iy++)
+             SetPixel(x + ix, y + iy, eDvbColor(Bitmap.bitmap[Bitmap.width * iy + ix]));
+         }
+     }
+}
+
 int cBitmap::Width(unsigned char c)
 {
   return font ? font->Width(c) : -1;
diff --git a/dvbosd.h b/dvbosd.h
index e2a424a8d..eefdb621e 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.4 2000/11/18 15:25:25 kls Exp $
+ * $Id: dvbosd.h 1.5 2000/12/09 10:32:47 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -57,6 +57,7 @@ class cBitmap {
   eDvbFont SetFont(eDvbFont Font);
   bool Dirty(void);
   void SetPixel(int x, int y, eDvbColor Color);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
   int Width(unsigned char c);
   int Width(const char *s);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
diff --git a/eit.c b/eit.c
index 79855282f..e7c60c164 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.9 2000/11/18 13:42:28 kls Exp $
+ * $Id: eit.c 1.11 2000/12/03 15:33:37 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -33,6 +33,8 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include "config.h"
+#include "videodir.h"
 
 // --- cMJD ------------------------------------------------------------------
 
@@ -129,7 +131,7 @@ bool cMJD::SetSystemTime()
 		isyslog(LOG_INFO, "System Time = %s (%ld)\n", ctime(&loctim), loctim);
 		isyslog(LOG_INFO, "Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
 		if (stime(&mjdtime) < 0)
-         esyslog(LOG_ERR, "ERROR while setting system time: %s", strerror(errno));
+         esyslog(LOG_ERR, "ERROR while setting system time: %m");
 		return true;
 	}
 	
@@ -393,6 +395,21 @@ unsigned short cEventInfo::GetServiceID() const
    return uServiceID;
 }
 
+/**  */
+void cEventInfo::Dump(FILE *f) const
+{
+   if (tTime + lDuration >= time(NULL)) {
+      fprintf(f, "E %u %ld %ld\n", uEventID, tTime, lDuration);
+      if (!isempty(pTitle))
+         fprintf(f, "T %s\n", pTitle);
+      if (!isempty(pSubtitle))
+         fprintf(f, "S %s\n", pSubtitle);
+      if (!isempty(pExtendedDescription))
+         fprintf(f, "D %s\n", pExtendedDescription);
+      fprintf(f, "e\n");
+      }
+}
+
 // --- cSchedule -------------------------------------------------------------
 
 cSchedule::cSchedule(unsigned short servid)
@@ -529,6 +546,19 @@ void cSchedule::Cleanup(time_t tTime)
 	}
 }
 
+/**  */
+void cSchedule::Dump(FILE *f) const
+{
+   cChannel *channel = Channels.GetByServiceID(uServiceID);
+   if (channel)
+   {
+      fprintf(f, "C %u %s\n", uServiceID, channel->name);
+      for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
+         p->Dump(f);
+      fprintf(f, "c\n");
+   }
+}
+
 // --- cSchedules ------------------------------------------------------------
 
 cSchedules::cSchedules()
@@ -590,6 +620,13 @@ void cSchedules::Cleanup()
 	}
 }
 
+/**  */
+void cSchedules::Dump(FILE *f) const
+{
+   for (cSchedule *p = First(); p; p = Next(p))
+      p->Dump(f);
+}
+
 // --- cEIT ------------------------------------------------------------------
 
 #define DEC(N) dec << setw(N) << setfill(int('0'))
@@ -1080,7 +1117,7 @@ cSIProcessor::~cSIProcessor()
 {
    if (fsvbi >= 0)
    {
-      Stop();
+      Cancel();
    	ShutDownFilters();
       delete filters;
       if (!--numSIProcessors) // the last one deletes it
@@ -1105,6 +1142,7 @@ void cSIProcessor::Action()
 	unsigned int seclen;
 	unsigned int pid;
    time_t lastCleanup = time(NULL);
+   time_t lastDump = time(NULL);
 	struct pollfd pfd;
 	
 	while(true)
@@ -1123,6 +1161,19 @@ void cSIProcessor::Action()
             schedulesMutex.Unlock();
             lastCleanup = now;
          }
+         if (now - lastDump > 600)
+         {
+            LOCK_THREAD;
+
+            schedulesMutex.Lock();
+            FILE *f = fopen(AddDirectory(VideoDirectory, "epg.data"), "w");
+            if (f) {
+               schedules->Dump(f);
+               fclose(f);
+               }
+            lastDump = now;
+            schedulesMutex.Unlock();
+         }
       }
 
 		/* wait data become ready from the bitfilter */
@@ -1283,4 +1334,3 @@ bool cSIProcessor::RefreshFilters()
 
 	return ret;
 }
-
diff --git a/eit.h b/eit.h
index d5c4ebdcf..bedead755 100644
--- a/eit.h
+++ b/eit.h
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.3 2000/11/17 16:14:27 kls Exp $
+ * $Id: eit.h 1.4 2000/11/24 14:35:22 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -66,6 +66,7 @@ class cEventInfo : public cListObject {
   unsigned short GetServiceID(void) const;
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
+  void Dump(FILE *f) const;
   };
 
 class cSchedule : public cListObject  {
@@ -92,6 +93,7 @@ class cSchedule : public cListObject  {
   const cEventInfo *GetEvent(time_t tTime) const;
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
   int NumEvents(void) const { return Events.Count(); }
+  void Dump(FILE *f) const;
   };
 
 class cSchedules : public cList<cSchedule> {
@@ -107,6 +109,7 @@ class cSchedules : public cList<cSchedule> {
   ~cSchedules();
   const cSchedule *GetSchedule(unsigned short servid) const;
   const cSchedule *GetSchedule(void) const;
+  void Dump(FILE *f) const;
 };
 
 typedef struct sip_filter {
diff --git a/epg2html.pl b/epg2html.pl
new file mode 100644
index 000000000..215eb7356
--- /dev/null
+++ b/epg2html.pl
@@ -0,0 +1,96 @@
+#!/usr/bin/perl
+
+# A simple EPG to HTML converter
+#
+# Converts the EPG data written by 'vdr' into the file /video/epg.data
+# into a simple HTML programme listing, consisting of one file per channel
+# plus an 'index.htm' file. All output files are written into the current
+# directory.
+#
+# Usage: epg2html.pl < /video/epg.data
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: epg2html.pl 1.2 2000/12/01 18:37:46 kls Exp $
+
+@Index = ();
+
+sub GetDay
+{
+  return substr(localtime(shift), 0, 10);
+}
+
+sub GetTime
+{
+  return substr(localtime(shift), 11, 5);
+}
+
+sub Tags
+{
+  my $s = shift;
+  $s =~ s/\&/&amp;/g;
+  $s =~ s/</&lt;/g;
+  $s =~ s/>/&gt;/g;
+  return $s;
+}
+
+while (<>) {
+      chomp;
+      if (/^C ([^ ]+) *(.*)/) {
+         my $Channel = $2;
+         (my $Page = $Channel) =~ y/\/ /-_/;
+         $Page .= ".htm";
+         $Channel = Tags($Channel);
+         push(@Index, qq{<a href="$Page">$Channel</a><br>\n});
+         my %Events = ();
+         while (<>) {
+               if (/^E (.*) (.*) (.*)/) {
+                  (my $Time, $Duration) = ($2, $3);
+                  my $Title = "", $Subtitle = "", $Description = "";
+                  while (<>) {
+                        if    (/^T (.*)/) { $Title       = Tags($1); }
+                        elsif (/^S (.*)/) { $Subtitle    = Tags($1); }
+                        elsif (/^D (.*)/) { $Description = Tags($1); }
+                        elsif (/^e/) {
+                           $Events{$Time} = [($Duration, $Title, $Subtitle, $Description)];
+                           last;
+                           }
+                        }
+                  }
+               elsif (/^c/) {
+                  my @Schedule = ();
+                  my $Day = "";
+                  for $t (sort keys %Events) {
+                      (my $Duration, $Title, $Subtitle, $Description) = @{$Events{$t}};
+                      my $d = GetDay($t);
+                      if ($d ne $Day) {
+                         push(@Schedule, "</table>\n") if ($Day && @Schedule);
+                         push(@Schedule, "<h2>$d</h2>\n");
+                         push(@Schedule, "<table cellspacing=2>\n");
+                         $Day = $d;
+                         }
+                      my $Entry = $Title;
+                      $Entry .= "<br><i>$Subtitle</i>" if $Subtitle;
+                      $Entry .= "<br>$Description" if $Description;
+                      push(@Schedule, "<tr><td valign=top>" . GetTime($t) . "</td><td>$Entry</td></tr>\n");
+                      }
+                  push(@Schedule, "</table>\n") if (@Schedule);
+                  open(PAGE, ">$Page") or die "$Page: $!\n";
+                  print PAGE "<html>\n<head><title>$Channel</title><head>\n<body>\n";
+                  print PAGE "<h1>$Channel</h1>\n";
+                  print PAGE @Schedule;
+                  print PAGE "</body>\n</html>\n";
+                  close(PAGE);
+                  last;
+                  }
+               }
+         }
+      }
+
+open(INDEX, ">index.htm") or die "index.htm: $!\n";
+print INDEX "<html>\n<head><title>EPG Index</title><head>\n<body>\n";
+print INDEX sort { lc($a) cmp lc($b) } @Index;
+print INDEX "</body>\n</html>\n";
+close(INDEX);
+   
diff --git a/i18n.c b/i18n.c
index 7b93062d3..cf1785f3a 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,9 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.6 2000/11/19 12:12:53 kls Exp $
+ * $Id: i18n.c 1.8 2001/01/06 16:17:39 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
+ * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
  *
  */
 
@@ -31,9 +32,8 @@
  *         "Italiano",
  *       },
  *
- *    and so on. Insert your language so that all the entries
- *    following 'English' will be sorted alphabetically, and write
- *    the name of your language in your language (not in English,
+ *    and so on. Append your language after the last existing language
+ *    and write the name of your language in your language (not in English,
  *    which means that it should be 'Italiano', not 'Italian').
  *    Note that only the characters defined in 'fontosd.c' will
  *    be available!
@@ -48,7 +48,7 @@
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 3;
+const int NumLanguages = 4;
 
 typedef const char *tPhrase[NumLanguages];
 
@@ -57,401 +57,523 @@ const tPhrase Phrases[] = {
   { "English",
     "Deutsch",
     "Slovenski",
+    "Italiano",
   },
   // Menu titles:
   { "Main",
     "Hauptmen�",
     "Glavni meni",
+    "Principale",
   },
   { "Schedule",
     "Programm",
     "Urnik",
+    "Programmi",
   },
   { "Channels",
     "Kan�le",
     "Kanali",
+    "Canali",
   },
   { "Timers",
     "Timer",
     "Termini",
+    "Timer",
   },
   { "Recordings",
     "Aufzeichnungen",
     "Posnetki",
+    "Registrazioni",
   },
   { "Setup",
     "Einstellungen",
     "Nastavitve",
+    "Opzioni",
   },
   { "Commands",
     "Befehle",
     "Ukazi",
+    "Comandi",
   },
   { "Edit Channel",
     "Kanal Editieren",
     "Uredi kanal",
+    "Modifica canale",
   },
   { "Edit Timer",
     "Timer Editieren",
     "Uredi termin",
+    "Modifica Timer",
   },
   { "Event",
     "Sendung",
     "Oddaja",
+    "Eventi",
   },
   { "Summary",
     "Inhalt",
     "Vsebina",
+    "Sommario",
   },
   { "Schedule - %s",
     "Programm - %s",
     "Urnik - %s",
+    "Programma - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
     "Kaj je na sporedu?",
+    "In programmazione",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
     "Kaj sledi?",
+    "Prossimi programmi",
   },
   // Button texts (must not be more than 10 characters!):
   { "Edit",
     "Editieren",
     "Uredi",
+    "Modifica",
   },
   { "New",
     "Neu",
     "Novo",
+    "Nuovo",
   },
   { "Delete",
     "L�schen",
     "Odstrani",
+    "Cancella",
   },
   { "Mark",
     "Markieren",
     "Oznaci",
+    "Marca",
   },
   { "Record",
     "Aufnehmen",
     "Posnemi",
+    "Registra",
   },
   { "Play",
     "Wiedergabe",
     "Predavajaj",
+    "Riproduci",
   },
   { "Resume",
     "Weiter",
     "Nadaljuj",
+    "Riprendi",
   },
   { "Summary",
     "Inhalt",
     "Vsebina",
+    "Sommario",
   },
   { "Switch",
     "Umschalten",
     "Preklopi",
+    "Cambia",
   },
   { "Now",
     "Jetzt",
     "Sedaj",
+    "Adesso",
   },
   { "Next",
     "N�chste",
     "Naslednji",
+    "Prossimo",
   },
   { "Schedule",
     "Programm",
     "Urnik",
+    "Programma",
   },
   // Confirmations:
-  { "Delete Channel?",
+  { "Delete channel?",
     "Kanal l�schen?",
     "Odstrani kanal?",
+    "Cancello il canale?",
   },
-  { "Delete Timer?",
+  { "Delete timer?",
     "Timer l�schen?",
     "Odstani termin?",
+    "Cancello il timer?",
   },
-  { "Delete Recording?",
+  { "Delete recording?",
     "Aufzeichnung l�schen?",
     "Odstrani posnetek?",
+    "Cancello la registrazione?",
   },
-  { "Stop Recording?",
+  { "Stop recording?",
     "Aufzeichnung beenden?",
     "Koncaj snemanje?",
+    "Fermo la registrazione?",
+  },
+  { "Cancel editing?",
+    "Schneiden abbrechen?",
+    "Zelite prekiniti urejanje?",
+    "Annullo la modifica?",
   },
   // Channel parameters:
   { "Name",
     "Name",
     "Naziv",
+    "Nome",
   },
   { "Frequency",
     "Frequenz",
     "Frekvenca",
+    "Frequenza",
   },
   { "Polarization",
     "Polarisation",
     "Polarizacija",
+    "Polarizzazione",
   },
   { "Diseqc",
     "Diseqc",
     "Diseqc",
+    "Diseqc",
   },
   { "Srate",
     "Srate",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
     "Vpid",
+    "Vpid",
   },
   { "Apid",
     "Apid",
     "Apid",
+    "Apid",
   },
   { "CA",
     "CA",
     "CA",
+    "CA",
   },
   { "Pnr",
     "Pnr",
     "Pnr",
+    "Pnr",
   },
   // Timer parameters:
   { "Active",
     "Aktiv",
     "Aktivno",
+    "Attivo",
   },
   { "Channel",
     "Kanal",
     "Kanal",
+    "Canale",
   },
   { "Day",
     "Tag",
     "Dan",
+    "Giorno",
   },
   { "Start",
     "Anfang",
     "Zacetek",
+    "Inizio",
   },
   { "Stop",
     "Ende",
     "Konec",
+    "Fine",
   },
   { "Priority",
     "Priorit�t",
     "Prioriteta",
+    "Priorita",
   },
   { "Lifetime",
     "Lebensdauer",
     "Veljavnost",
+    "Durata",
   },
   { "File",
     "Datei",
     "Datoteka",
+    "Nome",
   },
   // Error messages:
   { "Channel is being used by a timer!",
     "Kanal wird von einem Timer benutzt!",
     "Urnik zaseda kanal!",
+    "Canale occupato da un timer!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
     "Ne morem preklopiti kanala!",
+    "Impossibile cambiare canale!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
     "Snemanje po urniku!",
+    "Registrazione di un timer in corso!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
     "Napaka pri odstranjevanju posnetka!",
+    "Errore durante la canc del filmato!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
     "*** Neznan kanal ***",
+    "*** CANALE INVALIDO ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
     "Ni proste DVB naprave za snemanje!",
+    "Nessuna card DVB disp per registrare!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
     "Zaklenjen kanal (snemanje)!",
+    "Canale bloccato (in registrazione)!",
+  },
+  { "Can't start editing process!",
+    "Schnitt kann nicht gestartet werden!",
+    "Ne morem zaceti urejanja!",
+    "Imposs iniziare processo di modifica",
+  },
+  { "Editing process already active!",
+    "Schnitt bereits aktiv!",
+    "Urejanje je ze aktivno!",
+    "Processo di modifica gia` attivo",
   },
   // Setup parameters:
   { "OSD-Language",
     "OSD-Sprache",
     "OSD-jezik",
+    "Linguaggio OSD",
   },
   { "PrimaryDVB",
     "Prim�res Interface",
     "Primarna naprava",
+    "Scheda DVB primaria",
   },
   { "ShowInfoOnChSwitch",
     "Info zeigen",
     "Pokazi naziv kanala",
+    "Vis info nel cambio canale",
   },
   { "MenuScrollPage",
     "Seitenweise scrollen",
     "Drsni meni",
+    "Scrolla pagina nel menu",
   },
   { "MarkInstantRecord",
     "Direktaufz. markieren",
     "Oznaci direktno snemanje",
+    "Marca la registrazione",
   },
   { "LnbFrequLo",
     "Untere LNB-Frequenz",
     "Spodnja LNB-frek.",
+    "Freq LO LNB",
   },
   { "LnbFrequHi",
     "Obere LNB-Frequenz",
     "Zgornja LNB-frek.",
+    "Freq HI LNB",
   },
   { "SetSystemTime",
     "Systemzeit stellen",
     "Sistemski cas",
+    "Setta orario auto",
   },
   { "MarginStart",
     "Zeitpuffer bei Anfang",
     "Premor pred zacetkom",
+    "Min margine inizio",
   },
   { "MarginStop",
     "Zeitpuffer bei Ende",
     "Premor za koncem",
+    "Min margine fine",
   },
   { "EPGScanTimeout",
     "Zeit bis EPG Scan",
     "Cas do EPG pregleda",
+    "Timeout EPG",
   },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
     "PTSCPSN",
+    "DLMMGVS",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
     "Fernbedienungs-Codes lernen",
     "Ucim se kod upravljalca",
+    "Apprendimento tasti unita` remota",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
     "Faza 1: Sprejemanje IR kode",
+    "Fase 1: tipo ricevitore RC",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
     "Pritisnite tipko na upravljalcu",
+    "Premere un tasto nell'unita` RC",
   },
   { "RC code detected!",
     "FB Code erkannt!",
     "IR koda sprejeta!",
+    "Codice RC rilevato!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
     "Ne pritiskajte tipk...",
+    "Non premere alcun tasto...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
     "Faza 2: Ucenje posebnih kod",
+    "Fase 2: Codici specifici dei tasti",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
     "Pritisnite tipko za '%s'",
+    "Premere il tasto per '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
     "Pritisnite tipko 'Gor' za potrditev",
+    "Premere 'Su' per confermare",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
     "Pritisnite tipko 'Dol' za nadaljevanje",
+    "Premere 'Giu' per confermare",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
     "(pritisnite 'Gor' za nazaj)",
+    "(premere 'Su' per tornare indietro)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden",
     "(pritisnite 'Dol' za konec)",
+    "('Giu' per finire la definiz tasti)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
     "Faza 3: Shranjujem kodo",
+    "Fase 3: Salvataggio key codes",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
     "'Gor' za potrditev, 'Dol' za prekinitev",
+    "'Su' per salvare, 'Giu' per annullare",
   },
   // Key names:
   { "Up",
     "Auf",
     "Gor",
+    "Su",
   },
   { "Down",
     "Ab",
     "Dol",
+    "Giu",
   },
   { "Menu",
     "Men�",
     "Meni",
+    "Menu",
   },
   { "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
     "Nazaj",
+    "Indietro",
   },
   { "Left",
     "Links",
     "Levo",
+    "Sinistra",
   },
   { "Right",
     "Rechts",
     "Desno",
+    "Destra",
   },
   { "Red",
     "Rot",
     "Rdeca",
+    "Rosso",
   },
   { "Green",
     "Gr�n",
     "Zelena",
+    "Verde",
   },
   { "Yellow",
     "Gelb",
     "Rumena",
+    "Giallo",
   },
   { "Blue",
     "Blau",
     "Modra",
+    "Blu",
   },
   // Miscellaneous:
   { "yes",
     "ja",
     "da",
+    "si",
   },
   { "no",
     "nein",
     "ne",
+    "no",
   },
   { "Stop replaying",
     "Wiedergabe beenden",
     "Prekini ponavljanje",
+    "Interrompi riproduzione",
   },
   { "Stop recording ", // note the trailing blank!
     "Aufzeichnung beenden ",
     "Prekini shranjevanje ",
+    "Interrompi registrazione ",
+  },
+  { "Cancel editing",
+    "Schneiden abbrechen",
+    "Prekini urejanje",
+    "Annulla modifiche",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
     "Preklapljanje primarne naprave...",
+    "Cambio su card DVB primaria...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
     "Gor/Dol za novo poz. - Ok za premik",
+    "Su/Giu per nuova posizione - OK per muovere",
+  },
+  { "Editing process started",
+    "Schnitt gestartet",
+    "Urejanje se je zacelo",
+    "Processo di modifica iniziato",
   },
   { NULL }
   };
diff --git a/interface.c b/interface.c
index e5cc1d25c..ef8368ae9 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.32 2000/11/18 15:28:50 kls Exp $
+ * $Id: interface.c 1.33 2000/12/09 11:04:10 kls Exp $
  */
 
 #include "interface.h"
@@ -121,6 +121,12 @@ void cInterface::Fill(int x, int y, int w, int h, eDvbColor Color)
      cDvbApi::PrimaryDvbApi->Fill(x, y, w, h, Color);
 }
 
+void cInterface::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+  if (open)
+     cDvbApi::PrimaryDvbApi->SetBitmap(x, y, Bitmap);
+}
+
 void cInterface::Flush(void)
 {
   if (open)
diff --git a/interface.h b/interface.h
index cd46fbaa7..50c376154 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.20 2000/11/18 15:27:59 kls Exp $
+ * $Id: interface.h 1.21 2000/12/09 10:48:41 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -41,6 +41,7 @@ class cInterface {
   void Clear(void);
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
   void Flush(void);
   void SetCols(int *c);
   eDvbFont SetFont(eDvbFont Font);
diff --git a/menu.c b/menu.c
index 3cf832819..144233fc7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.52 2000/11/18 16:30:13 kls Exp $
+ * $Id: menu.c 1.58 2001/01/13 13:07:43 kls Exp $
  */
 
 #include "menu.h"
@@ -669,7 +669,7 @@ eOSState cMenuChannels::Del(void)
             return osContinue;
             }
          }
-     if (Interface->Confirm(tr("Delete Channel?"))) {
+     if (Interface->Confirm(tr("Delete channel?"))) {
         // Move and renumber the channels:
         Channels.Del(channel);
         Channels.ReNumber();
@@ -1039,7 +1039,7 @@ eOSState cMenuTimers::Del(void)
   cTimer *ti = Timers.Get(Index);
   if (ti) {
      if (!ti->recording) {
-        if (Interface->Confirm(tr("Delete Timer?"))) {
+        if (Interface->Confirm(tr("Delete timer?"))) {
            Timers.Del(Timers.Get(Index));
            cOsdMenu::Del(Index);
            Timers.Save();
@@ -1310,7 +1310,9 @@ class cMenuSchedule : public cOsdMenu {
   cThreadLock threadLock;
   const cSchedules *schedules;
   bool now, next;
+  int otherChannel;
   eOSState Record(void);
+  eOSState Switch(void);
   void PrepareSchedule(cChannel *Channel);
   void PrepareWhatsOnNext(bool On);
 public:
@@ -1322,6 +1324,7 @@ cMenuSchedule::cMenuSchedule(void)
 :cOsdMenu("", 6, 6)
 {
   now = next = false;
+  otherChannel = 0;
   cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
   if (channel) {
      schedules = cDvbApi::PrimaryDvbApi->Schedules(&threadLock);
@@ -1383,6 +1386,16 @@ eOSState cMenuSchedule::Record(void)
   return osContinue;
 }
 
+eOSState cMenuSchedule::Switch(void)
+{
+  if (otherChannel) {
+     if (Channels.SwitchTo(otherChannel))
+        return osEnd;
+     }
+  Interface->Error(tr("Can't switch channel!"));
+  return osContinue;
+}
+
 eOSState cMenuSchedule::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
@@ -1398,8 +1411,9 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                      next = !next;
                      return AddSubMenu(new cMenuWhatsOn(schedules, now));
        case kYellow: return AddSubMenu(new cMenuWhatsOn(schedules, false));
+       case kBlue:   return Switch();
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->eventInfo));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->eventInfo, otherChannel));
                      break;
        default:      break;
        }
@@ -1411,6 +1425,10 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
         cChannel *channel = Channels.GetByServiceID(ei->GetServiceID());
         if (channel) {
            PrepareSchedule(channel);
+           if (channel->number != cDvbApi::CurrentChannel()) {
+              otherChannel = channel->number;
+              SetHelp(tr("Record"), tr("Now"), tr("Next"), tr("Switch"));
+              }
            Display();
            }
         }
@@ -1471,7 +1489,7 @@ eOSState cMenuRecordings::Del(void)
   if (ri) {
 //XXX what if this recording's file is currently in use???
 //XXX     if (!ti->recording) {
-        if (Interface->Confirm(tr("Delete Recording?"))) {
+        if (Interface->Confirm(tr("Delete recording?"))) {
            if (ri->recording->Delete()) {
               cReplayControl::ClearLastReplayed(ri->recording->FileName());
               cOsdMenu::Del(Current());
@@ -1645,6 +1663,8 @@ cMenuMain::cMenuMain(bool Replaying)
         Add(new cOsdItem(buffer, osStopRecord));
         delete buffer;
         }
+  if (cVideoCutter::Active())
+     Add(new cOsdItem(tr("Cancel editing"), osCancelEdit));
   SetHelp(tr("Record"), NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
@@ -1661,13 +1681,19 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osRecordings: return AddSubMenu(new cMenuRecordings);
     case osSetup:      return AddSubMenu(new cMenuSetup);
     case osCommands:   return AddSubMenu(new cMenuCommands);
-    case osStopRecord: if (Interface->Confirm(tr("Stop Recording?"))) {
+    case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
                           cOsdItem *item = Get(Current());
                           if (item) {
                              cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
                              return osEnd;
                              }
                           }
+                       break;
+    case osCancelEdit: if (Interface->Confirm(tr("Cancel editing?"))) {
+                          cVideoCutter::Stop();
+                          return osEnd;
+                          }
+                       break;
     default: switch (Key) {
                case kMenu: state = osEnd;    break;
                case kRed:  if (!HasSubMenu())
@@ -1726,23 +1752,21 @@ cDisplayChannel::~cDisplayChannel()
 
 void cDisplayChannel::DisplayChannel(const cChannel *Channel)
 {
-  if (!Interface->Recording()) {
-     if (Channel && Channel->number)
-        Interface->DisplayChannelNumber(Channel->number);
-     int BufSize = Width() + 1;
-     char buffer[BufSize];
-     if (Channel && Channel->number)
-        snprintf(buffer, BufSize, "%d  %s", Channel->number, Channel->name);
-     else
-        snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
-     Interface->Fill(0, 0, MenuColumns, 1, clrBackground);
-     Interface->Write(0, 0, buffer);
-     time_t t = time(NULL);
-     struct tm *now = localtime(&t);
-     snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
-     Interface->Write(-5, 0, buffer);
-     Interface->Flush();
-     }
+  if (Channel && Channel->number)
+     Interface->DisplayChannelNumber(Channel->number);
+  int BufSize = Width() + 1;
+  char buffer[BufSize];
+  if (Channel && Channel->number)
+     snprintf(buffer, BufSize, "%d  %s", Channel->number, Channel->name);
+  else
+     snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
+  Interface->Fill(0, 0, MenuColumns, 1, clrBackground);
+  Interface->Write(0, 0, buffer);
+  time_t t = time(NULL);
+  struct tm *now = localtime(&t);
+  snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
+  Interface->Write(-5, 0, buffer);
+  Interface->Flush();
 }
 
 void cDisplayChannel::DisplayInfo(void)
@@ -1874,7 +1898,6 @@ cRecordControl::~cRecordControl()
 {
   Stop(true);
   delete instantId;
-  Interface->DisplayRecording(dvbApi->Index(), false);
 }
 
 void cRecordControl::Stop(bool KeepInstant)
@@ -1890,6 +1913,7 @@ void cRecordControl::Stop(bool KeepInstant)
         Timers.Save();
         }
      timer = NULL;
+     Interface->DisplayRecording(dvbApi->Index(), false);
      }
 }
 
@@ -1946,7 +1970,7 @@ void cRecordControls::Stop(cDvbApi *DvbApi)
       if (RecordControls[i]) {
          if (RecordControls[i]->Uses(DvbApi)) {
             isyslog(LOG_INFO, "stopping recording on DVB device %d due to higher priority", DvbApi->Index() + 1);
-            RecordControls[i]->Stop();
+            RecordControls[i]->Stop(true);
             }
          }
       }
@@ -1975,6 +1999,50 @@ void cRecordControls::Process(void)
       }
 }
 
+// --- cProgressBar ----------------------------------------------------------
+
+class cProgressBar : public cBitmap {
+protected:
+  int total;
+  int Pos(int p) { return p * width / total; }
+  void Mark(int x, bool Start, bool Current);
+public:
+  cProgressBar(int Width, int Height, int Current, int Total, const cMarks &Marks);
+  };
+
+cProgressBar::cProgressBar(int Width, int Height, int Current, int Total, const cMarks &Marks)
+:cBitmap(Width, Height)
+{
+  total = Total;
+  if (total > 0) {
+     int p = Pos(Current);
+     Fill(0, 0, p, Height - 1, clrGreen);
+     Fill(p + 1, 0, Width - 1, Height - 1, clrWhite);
+     bool Start = true;
+     for (const cMark *m = Marks.First(); m; m = Marks.Next(m)) {
+         int p1 = Pos(m->position);
+         if (Start) {
+            const cMark *m2 = Marks.Next(m);
+            int p2 = Pos(m2 ? m2->position : total);
+            int h = Height / 3;
+            Fill(p1, h, p2, Height - h, clrRed);
+            }
+         Mark(p1, Start, m->position == Current);
+         Start = !Start;
+         }
+     }
+}
+
+void cProgressBar::Mark(int x, bool Start, bool Current)
+{
+  Fill(x, 0, x, height - 1, clrBlack);
+  const int d = height / (Current ? 3 : 9);
+  for (int i = 0; i < d; i++) {
+      int h = Start ? i : height - 1 - i;
+      Fill(x - d + i, h, x + d - i, h, Current ? clrRed : clrBlack);
+      }
+}
+
 // --- cReplayControl --------------------------------------------------------
 
 char *cReplayControl::fileName = NULL;
@@ -1982,16 +2050,18 @@ char *cReplayControl::title = NULL;
 
 cReplayControl::cReplayControl(void)
 {
-  dvbApi = cDvbApi::PrimaryDvbApi;//XXX
-  visible = shown = false;
-  if (fileName)
-     dvbApi->StartReplay(fileName, title);
+  dvbApi = cDvbApi::PrimaryDvbApi;
+  visible = shown = displayFrames = false;
+  if (fileName) {
+     marks.Load(fileName);
+     dvbApi->StartReplay(fileName);
+     }
 }
 
 cReplayControl::~cReplayControl()
 {
   Hide();
-  dvbApi->Stop();
+  dvbApi->StopReplay();
 }
 
 void cReplayControl::SetRecording(const char *FileName, const char *Title)
@@ -2020,7 +2090,7 @@ void cReplayControl::Show(void)
   if (!visible) {
      Interface->Open(MenuColumns, -3);
      needsFastResponse = visible = true;
-     shown = dvbApi->ShowProgress(true);
+     shown = ShowProgress(true);
      }
 }
 
@@ -2032,27 +2102,148 @@ void cReplayControl::Hide(void)
      }
 }
 
+bool cReplayControl::ShowProgress(bool Initial)
+{
+  int Current, Total;
+
+  if (dvbApi->GetIndex(Current, Total) && Total > 0) {
+     if (Initial) {
+        Interface->Clear();
+        if (title)
+           Interface->Write(0, 0, title);
+        displayFrames = marks.Count() > 0;
+        }
+     Interface->Write(-7, 2, IndexToHMSF(Total));
+     Interface->Flush();
+#ifdef DEBUG_OSD
+     int p = Width() * Current / Total;
+     Interface->Fill(0, 1, p, 1, clrGreen);
+     Interface->Fill(p, 1, Width() - p, 1, clrWhite);
+#else
+     cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
+     Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
+     Interface->Flush();
+#endif
+     Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
+     Interface->Flush();
+     return true;
+     }
+  return false;
+}
+
+void cReplayControl::MarkToggle(void)
+{
+  int Current, Total;
+  if (dvbApi->GetIndex(Current, Total, true)) {
+     cMark *m = marks.Get(Current);
+     if (m)
+        marks.Del(m);
+     else
+        marks.Add(Current);
+     marks.Save();
+     }
+  displayFrames = marks.Count() > 0;
+  if (!displayFrames)
+     Interface->Fill(0, 2, Width() / 2, 1, clrBackground);
+}
+
+void cReplayControl::MarkJump(bool Forward)
+{
+  int Current, Total;
+  if (dvbApi->GetIndex(Current, Total)) {
+     cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
+     if (m)
+        dvbApi->Goto(m->position, true);
+     }
+}
+
+void cReplayControl::MarkMove(bool Forward)
+{
+  int Current, Total;
+  if (dvbApi->GetIndex(Current, Total)) {
+     cMark *m = marks.Get(Current);
+     if (m) {
+        int p = dvbApi->SkipFrames(Forward ? 1 : -1);
+        cMark *m2;
+        if (Forward) {
+           if ((m2 = marks.Next(m)) != NULL && m2->position <= p)
+              return;
+           }
+        else {
+           if ((m2 = marks.Prev(m)) != NULL && m2->position >= p)
+              return;
+           }
+        dvbApi->Goto(m->position = p, true);
+        marks.Save();
+        }
+     }
+}
+
+void cReplayControl::EditCut(void)
+{
+  Hide();
+  if (!cVideoCutter::Active()) {
+     if (!cVideoCutter::Start(fileName))
+        Interface->Error(tr("Can't start editing process!"));
+     else
+        Interface->Info(tr("Editing process started"));
+     }
+  else
+     Interface->Error(tr("Editing process already active!"));
+}
+
+void cReplayControl::EditTest(void)
+{
+  int Current, Total;
+  if (dvbApi->GetIndex(Current, Total)) {
+     cMark *m = marks.Get(Current);
+     if (!m)
+        m = marks.GetNext(Current);
+     if (m) {
+        if ((m->Index() & 0x01) != 0)
+           m = marks.Next(m);
+        if (m) {
+           dvbApi->Goto(m->position - dvbApi->SecondsToFrames(3));
+           dvbApi->Play();
+           }
+        }
+     }
+}
+
 eOSState cReplayControl::ProcessKey(eKeys Key)
 {
   if (!dvbApi->Replaying())
      return osEnd;
   if (visible)
-     shown = dvbApi->ShowProgress(!shown) || shown;
+     shown = ShowProgress(!shown) || shown;
   switch (Key) {
+    // Positioning:
     case kUp:      dvbApi->Play(); break;
     case kDown:    dvbApi->Pause(); break;
-    case kBlue:    Hide();
-                   dvbApi->Stop();
-                   return osEnd;
     case kLeft:    dvbApi->Backward(); break;
     case kRight:   dvbApi->Forward(); break;
     case kLeft|k_Release:
     case kRight|k_Release:
                    dvbApi->Play(); break;
     case kGreen|k_Repeat:
-    case kGreen:   dvbApi->Skip(-60); break;
+    case kGreen:   dvbApi->SkipSeconds(-60); break;
     case kYellow|k_Repeat:
-    case kYellow:  dvbApi->Skip(60); break;
+    case kYellow:  dvbApi->SkipSeconds(60); break;
+    case kBlue:    Hide();
+                   dvbApi->StopReplay();
+                   return osEnd;
+    // Editing:
+    //XXX should we do this only when the ProgressDisplay is on???
+    case kMarkToggle:      MarkToggle(); break;
+    case kMarkJumpBack:    MarkJump(false); break;
+    case kMarkJumpForward: MarkJump(true); break;
+    case kMarkMoveBack|k_Repeat:
+    case kMarkMoveBack:    MarkMove(false); break;
+    case kMarkMoveForward|k_Repeat:
+    case kMarkMoveForward: MarkMove(true); break;
+    case kEditCut:         EditCut(); break;
+    case kEditTest:        EditTest(); break;
+    // Menu control:
     case kMenu:    Hide(); return osMenu; // allow direct switching to menu
     case kOk:      visible ? Hide() : Show(); break;
     case kBack:    return osRecordings;
diff --git a/menu.h b/menu.h
index 8153f5d78..923211115 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.14 2000/11/12 12:33:00 kls Exp $
+ * $Id: menu.h 1.16 2000/12/25 14:25:29 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -79,11 +79,18 @@ class cRecordControls {
 class cReplayControl : public cOsdBase {
 private:
   cDvbApi *dvbApi;
-  bool visible, shown;
+  cMarks marks;
+  bool visible, shown, displayFrames;
   void Show(void);
   void Hide(void);
   static char *fileName;
   static char *title;
+  bool ShowProgress(bool Initial);
+  void MarkToggle(void);
+  void MarkJump(bool Forward);
+  void MarkMove(bool Forward);
+  void EditCut(void);
+  void EditTest(void);
 public:
   cReplayControl(void);
   virtual ~cReplayControl();
diff --git a/osd.h b/osd.h
index 0d8085dfd..16d0ec2c3 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.17 2000/11/12 15:27:34 kls Exp $
+ * $Id: osd.h 1.18 2000/12/24 10:16:52 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -29,6 +29,7 @@ enum eOSState { osUnknown,
                 osReplay,
                 osStopRecord,
                 osStopReplay,
+                osCancelEdit,
                 osSwitchDvb,
                 osBack,
                 osEnd,
diff --git a/recording.c b/recording.c
index f45be9632..064731dfd 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.21 2000/11/18 16:22:29 kls Exp $
+ * $Id: recording.c 1.24 2001/01/13 12:17:15 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -26,6 +26,7 @@
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
 
 #define SUMMARYFILESUFFIX "/summary.vdr"
+#define MARKSFILESUFFIX   "/marks.vdr"
 
 #define FINDCMD      "find %s -follow -type d -name '%s' 2> /dev/null | sort -df"
 
@@ -125,6 +126,7 @@ cRecording::cRecording(const char *FileName)
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
         strreplace(name, '_', ' ');
+        strreplace(name, '\x01', '\'');
         }
      // read an optional summary file:
      char *SummaryFileName = NULL;
@@ -175,8 +177,10 @@ const char *cRecording::FileName(void)
   if (!fileName) {
      struct tm *t = localtime(&start);
      asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
-     if (fileName)
+     if (fileName) {
         strreplace(fileName, ' ', '_');
+        strreplace(fileName, '\'', '\x01');
+        }
      }
   return fileName;
 }
@@ -269,3 +273,107 @@ bool cRecordings::Load(bool Deleted)
   return result;
 }
 
+// --- cMark -----------------------------------------------------------------
+
+char *cMark::buffer = NULL;
+
+cMark::cMark(int Position, const char *Comment)
+{
+  position = Position;
+  comment = Comment ? strdup(Comment) : NULL;
+}
+
+cMark::~cMark()
+{
+  delete comment;
+}
+
+const char *cMark::ToText(void)
+{
+  delete buffer;
+  asprintf(&buffer, "%s%s%s\n", IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
+  return buffer;
+}
+
+bool cMark::Parse(const char *s)
+{
+  delete comment;
+  comment = NULL;
+  position = HMSFToIndex(s);
+  const char *p = strchr(s, ' ');
+  if (p) {
+     p = skipspace(p);
+     if (*p) {
+        comment = strdup(p);
+        comment[strlen(comment) - 1] = 0; // strips trailing newline
+        }
+     }
+  return true;
+}
+
+bool cMark::Save(FILE *f)
+{
+  return fprintf(f, ToText()) > 0;
+}
+
+// --- cMarks ----------------------------------------------------------------
+
+bool cMarks::Load(const char *RecordingFileName)
+{
+  const char *MarksFile = AddDirectory(RecordingFileName, MARKSFILESUFFIX);
+  if (cConfig<cMark>::Load(MarksFile)) {
+     Sort();
+     return true;
+     }
+  return false;
+}
+
+void cMarks::Sort(void)
+{
+  for (cMark *m1 = First(); m1; m1 = Next(m1)) {
+      for (cMark *m2 = Next(m1); m2; m2 = Next(m2)) {
+          if (m2->position < m1->position) {
+             swap(m1->position, m2->position);
+             swap(m1->comment, m2->comment);
+             }
+          }
+      }
+}
+
+cMark *cMarks::Add(int Position)
+{
+  cMark *m = Get(Position);
+  if (!m) {
+     cConfig<cMark>::Add(m = new cMark(Position));
+     Sort();
+     }
+  return m;
+}
+
+cMark *cMarks::Get(int Position)
+{
+  for (cMark *mi = First(); mi; mi = Next(mi)) {
+      if (mi->position == Position)
+         return mi;
+      }
+  return NULL;
+}
+
+cMark *cMarks::GetPrev(int Position)
+{
+  for (cMark *mi = Last(); mi; mi = Prev(mi)) {
+      if (mi->position < Position)
+         return mi;
+      }
+  return NULL;
+}
+
+cMark *cMarks::GetNext(int Position)
+{
+  for (cMark *mi = First(); mi; mi = Next(mi)) {
+      if (mi->position > Position)
+         return mi;
+      }
+  return NULL;
+}
+
diff --git a/recording.h b/recording.h
index 7511c6591..454c356f7 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.10 2000/10/03 12:27:49 kls Exp $
+ * $Id: recording.h 1.11 2000/12/16 14:25:20 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -47,4 +47,27 @@ class cRecordings : public cList<cRecording> {
   bool Load(bool Deleted = false);
   };
 
+class cMark : public cListObject {
+private:
+  static char *buffer;
+public:
+  int position;
+  char *comment;
+  cMark(int Position = 0, const char *Comment = NULL);
+  ~cMark();
+  const char *ToText(void);
+  bool Parse(const char *s);
+  bool Save(FILE *f);
+  };
+
+class cMarks : public cConfig<cMark> {
+public:
+  bool Load(const char *RecordingFileName);
+  void Sort(void);
+  cMark *Add(int Position);
+  cMark *Get(int Position);
+  cMark *GetPrev(int Position);
+  cMark *GetNext(int Position);
+  };
+
 #endif //__RECORDING_H
diff --git a/remote.c b/remote.c
index 349a44527..691b5e94e 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.19 2000/11/11 11:22:22 kls Exp $
+ * $Id: remote.c 1.20 2000/12/03 11:55:06 kls Exp $
  */
 
 #include "remote.h"
@@ -115,7 +115,7 @@ cRcIoRCU::cRcIoRCU(char *DeviceName)
 
 cRcIoRCU::~cRcIoRCU()
 {
-  Stop();
+  Cancel();
 }
 
 void cRcIoRCU::Action(void)
@@ -420,7 +420,7 @@ cRcIoLIRC::cRcIoLIRC(char *DeviceName)
 
 cRcIoLIRC::~cRcIoLIRC()
 {
-  Stop();
+  Cancel();
 }
 
 void cRcIoLIRC::Action(void)
diff --git a/svdrp.c b/svdrp.c
index 66ae8e9ad..0ce30dbae 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.12 2000/11/05 13:44:42 kls Exp $
+ * $Id: svdrp.c 1.13 2000/12/03 15:34:35 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -18,6 +18,7 @@
 #include "svdrp.h"
 #include <arpa/inet.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <stdarg.h>
diff --git a/thread.c b/thread.c
index 67b5ab96e..363190d84 100644
--- a/thread.c
+++ b/thread.c
@@ -4,12 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.4 2000/11/14 18:38:25 kls Exp $
+ * $Id: thread.c 1.7 2000/12/24 12:27:21 kls Exp $
  */
 
 #include "thread.h"
+#include <errno.h>
 #include <signal.h>
+#include <sys/wait.h>
 #include <unistd.h>
+#include "tools.h"
 
 // --- cThread ---------------------------------------------------------------
 
@@ -25,7 +28,7 @@ cThread::cThread(void)
      signalHandlerInstalled = true;
      }
   running = false;
-  parentPid = lockingPid = 0;
+  parentPid = threadPid = lockingPid = 0;
   locked = 0;
 }
 
@@ -40,6 +43,7 @@ void cThread::SignalHandler(int signum)
 
 void *cThread::StartThread(cThread *Thread)
 {
+  Thread->threadPid = getpid();
   Thread->Action();
   return NULL;
 }
@@ -49,13 +53,37 @@ bool cThread::Start(void)
   if (!running) {
      running = true;
      parentPid = getpid();
-     pthread_create(&thread, NULL, &StartThread, (void *)this);
+     pthread_create(&thread, NULL, (void *(*) (void *))&StartThread, (void *)this);
+     usleep(10000); // otherwise calling Active() immediately after Start() causes a "pure virtual method called" error
      }
   return true; //XXX return value of pthread_create()???
 }
 
-void cThread::Stop(void)
+bool cThread::Active(void)
 {
+  if (threadPid) {
+     if (kill(threadPid, SIGIO) < 0) { // couldn't find another way of checking whether the thread is still running - any ideas?
+        if (errno == ESRCH)
+           threadPid = 0;
+        else
+           LOG_ERROR;
+        }
+     else
+        return true;
+     }
+  return false;
+}
+
+void cThread::Cancel(int WaitSeconds)
+{
+  if (WaitSeconds > 0) {
+     for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
+         if (!Active())
+            return;
+         usleep(10000);
+         }
+     esyslog(LOG_ERR, "ERROR: thread %d won't end (waited %d seconds) - cancelling it...", threadPid, WaitSeconds);
+     }
   pthread_cancel(thread);
 }
 
diff --git a/thread.h b/thread.h
index c85c51e2c..6aaee0b90 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.3 2000/11/14 18:38:11 kls Exp $
+ * $Id: thread.h 1.4 2000/12/03 11:18:37 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -28,7 +28,7 @@ class cThread {
 private:
   pthread_t thread;
   cMutex Mutex;
-  pid_t parentPid, lockingPid;
+  pid_t parentPid, threadPid, lockingPid;
   int locked;
   bool running;
   static bool signalHandlerInstalled;
@@ -39,11 +39,12 @@ class cThread {
 protected:
   void WakeUp(void);
   virtual void Action(void) = 0;
-  void Stop(void);
+  void Cancel(int WaitSeconds = 0);
 public:
   cThread(void);
   virtual ~cThread();
   bool Start(void);
+  bool Active(void);
   };
 
 // cThreadLock can be used to easily set a lock in a thread and make absolutely
diff --git a/timers.conf b/timers.conf
deleted file mode 100644
index 05946a53a..000000000
--- a/timers.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-1:15:M------:2128:2205:80:7:Neues:
-1:3:-T-----:2013:2125:99:99:SevenDays:
-1:10:-T-----:2058:2202:99:10:Quarks:
-1:25:-T-----:2305:0020:99:99:UFO:
-1:14:--W----:1920:2020:70:99:Rettungsflieger:
-0:2:--W----:2110:2325:99:99:BulleVonToelz:
-1:3:---T---:2210:2315:50:20:IngoAppelt:
-1:2:----F--:2013:2125:99:99:Farscape:
-1:1:----F--:2215:2325:50:20:7Tage7Koepfe:
-0:11:-----S-:2058:2135:99:99:Computer:
-0:2:-----S-:2220:2340:99:30:Wochenshow:
-1:11:------S:2013:2035:99:10:Centauri:
-1:15:MTWTF--:1828:1901:10:5:nano:
-1:1:MTWTF--:1553:1710:99:99:Hammerman:
diff --git a/tools.c b/tools.c
index 6d86f1620..cd2c60f8a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.23 2000/11/11 15:17:12 kls Exp $
+ * $Id: tools.c 1.27 2001/01/13 15:35:02 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -15,10 +15,7 @@
 #if defined(DEBUG_OSD)
 #include <ncurses.h>
 #endif
-#include <signal.h>
-#include <stdlib.h>
 #include <sys/time.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
 #define MaxBuffer 1000
@@ -30,29 +27,6 @@ void writechar(int filedes, char c)
   write(filedes, &c, sizeof(c));
 }
 
-void writeint(int filedes, int n)
-{
-  write(filedes, &n, sizeof(n));
-}
-
-char readchar(int filedes)
-{
-  char c;
-  read(filedes, &c, 1);
-  return c;
-}
-
-bool readint(int filedes, int &n)
-{
-  return cFile::AnyFileReady(filedes, 0) && read(filedes, &n, sizeof(n)) == sizeof(n);
-}
-
-void purge(int filedes)
-{
-  while (cFile::AnyFileReady(filedes, 0))
-        readchar(filedes);
-}
-
 char *readline(FILE *f)
 {
   static char buffer[MaxBuffer];
@@ -146,7 +120,7 @@ const char *AddDirectory(const char *DirName, const char *FileName)
   return buf;
 }
 
-#define DFCMD  "df -m %s"
+#define DFCMD  "df -m '%s'"
 
 uint FreeDiskSpaceMB(const char *Directory)
 {
@@ -205,7 +179,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory)
         if (stat(s, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
            dsyslog(LOG_INFO, "creating directory %s", s);
            if (mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {
-              esyslog(LOG_ERR, "ERROR: %s: %s", s, strerror(errno));
+              LOG_ERROR_STR(s);
               result = false;
               break;
               }
@@ -266,44 +240,32 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
      if (remove(FileName) == 0)
         return true;
      }
-  else
+  else if (errno != ENOENT) {
      LOG_ERROR_STR(FileName);
-  return false;
-}
-
-bool CheckProcess(pid_t pid)
-{
-  pid_t Pid2Check = pid;
-  int status;
-  pid = waitpid(Pid2Check, &status, WNOHANG);
-  if (pid < 0) {
-     if (errno != ECHILD)
-        LOG_ERROR;
      return false;
      }
   return true;
 }
 
-void KillProcess(pid_t pid, int Timeout)
+char *ReadLink(const char *FileName)
 {
-  pid_t Pid2Wait4 = pid;
-  for (time_t t0 = time(NULL); time(NULL) - t0 < Timeout; ) {
-      int status;
-      pid_t pid = waitpid(Pid2Wait4, &status, WNOHANG);
-      if (pid < 0) {
-         if (errno != ECHILD)
-            LOG_ERROR;
-         return;
-         }
-      if (pid == Pid2Wait4)
-         return;
-      }
-  esyslog(LOG_ERR, "ERROR: process %d won't end (waited %d seconds) - terminating it...", Pid2Wait4, Timeout);
-  if (kill(Pid2Wait4, SIGTERM) < 0) {
-     esyslog(LOG_ERR, "ERROR: process %d won't terminate (%s) - killing it...", Pid2Wait4, strerror(errno));
-     if (kill(Pid2Wait4, SIGKILL) < 0)
-        esyslog(LOG_ERR, "ERROR: process %d won't die (%s) - giving up", Pid2Wait4, strerror(errno));
+  char RealName[_POSIX_PATH_MAX];
+  const char *TargetName = NULL;
+  int n = readlink(FileName, RealName, sizeof(RealName) - 1);
+  if (n < 0) {
+     if (errno == ENOENT || errno == EINVAL) // file doesn't exist or is not a symlink
+        TargetName = FileName;
+     else { // some other error occurred
+        LOG_ERROR_STR(FileName);
+        }
+     }
+  else if (n < int(sizeof(RealName))) { // got it!
+     RealName[n] = 0;
+     TargetName = RealName;
      }
+  else
+     esyslog(LOG_ERR, "ERROR: symlink's target name too long: %s", FileName);
+  return TargetName ? strdup(TargetName) : NULL;
 }
 
 // --- cFile -----------------------------------------------------------------
@@ -426,6 +388,45 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
   return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
 }
 
+// --- cSafeFile -------------------------------------------------------------
+
+cSafeFile::cSafeFile(const char *FileName)
+{
+  f = NULL;
+  fileName = ReadLink(FileName);
+  tempName = fileName ? new char[strlen(fileName) + 5] : NULL;
+  if (tempName)
+     strcat(strcpy(tempName, fileName), ".$$$");
+}
+
+cSafeFile::~cSafeFile()
+{
+  if (f)
+     fclose(f);
+  unlink(tempName);
+  delete fileName;
+  delete tempName;
+}
+
+bool cSafeFile::Open(void)
+{
+  if (!f && fileName && tempName) {
+     f = fopen(tempName, "w");
+     if (!f)
+        LOG_ERROR_STR(tempName);
+     }
+  return f != NULL;
+}
+
+void cSafeFile::Close(void)
+{
+  if (f) {
+     fclose(f);
+     f = NULL;
+     rename(tempName, fileName);
+     }
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
diff --git a/tools.h b/tools.h
index f83e7da4a..539dba019 100644
--- a/tools.h
+++ b/tools.h
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.20 2000/11/12 15:27:06 kls Exp $
+ * $Id: tools.h 1.23 2001/01/13 15:36:00 kls Exp $
  */
 
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
-#include <errno.h>
+//#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
@@ -24,19 +24,16 @@ extern int SysLogLevel;
 #define isyslog if (SysLogLevel > 1) syslog
 #define dsyslog if (SysLogLevel > 2) syslog
 
-#define LOG_ERROR         esyslog(LOG_ERR, "ERROR (%s,%d): %s", __FILE__, __LINE__, strerror(errno))
-#define LOG_ERROR_STR(s)  esyslog(LOG_ERR, "ERROR: %s: %s", s, strerror(errno));
+#define LOG_ERROR         esyslog(LOG_ERR, "ERROR (%s,%d): %m", __FILE__, __LINE__)
+#define LOG_ERROR_STR(s)  esyslog(LOG_ERR, "ERROR: %s: %m", s)
 
 #define SECSINDAY  86400
-#define MAXPROCESSTIMEOUT   3 // seconds
 
 #define DELETENULL(p) (delete (p), p = NULL)
 
+template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; };
+
 void writechar(int filedes, char c);
-void writeint(int filedes, int n);
-char readchar(int filedes);
-bool readint(int filedes, int &n);
-void purge(int filedes);
 char *readline(FILE *f);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
@@ -51,8 +48,7 @@ uint FreeDiskSpaceMB(const char *Directory);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
-bool CheckProcess(pid_t pid);
-void KillProcess(pid_t pid, int Timeout = MAXPROCESSTIMEOUT);
+char *ReadLink(const char *FileName);
 
 class cFile {
 private:
@@ -73,6 +69,19 @@ class cFile {
   static bool FileReady(int FileDes, int TimeoutMs = 1000);
   };
 
+class cSafeFile {
+private:
+  FILE *f;
+  char *fileName;
+  char *tempName;
+public:
+  cSafeFile(const char *FileName);
+  ~cSafeFile();
+  operator FILE* () { return f; }
+  bool Open(void);
+  void Close(void);
+  };
+
 class cListObject {
 private:
   cListObject *prev, *next;
@@ -105,6 +114,8 @@ template<class T> class cList : public cListBase {
 public:
   T *Get(int Index) const { return (T *)cListBase::Get(Index); }
   T *First(void) const { return (T *)objects; }
+  T *Last(void) const { return (T *)lastObject; }
+  T *Prev(const T *object) const { return (T *)object->Prev(); }
   T *Next(const T *object) const { return (T *)object->Next(); }
   };
 
diff --git a/vdr.c b/vdr.c
index 8a842003a..698cc7a61 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.46 2000/11/18 13:46:56 kls Exp $
+ * $Id: vdr.c 1.49 2001/01/14 15:29:51 kls Exp $
  */
 
 #include <getopt.h>
@@ -141,8 +141,8 @@ int main(int argc, char *argv[])
 #if !defined(DEBUG_OSD) && !defined(REMOTE_KBD)
      pid_t pid = fork();
      if (pid < 0) {
-        fprintf(stderr, "%s\n", strerror(errno));
-        esyslog(LOG_ERR, "ERROR: %s", strerror(errno));
+        fprintf(stderr, "%m\n");
+        esyslog(LOG_ERR, "ERROR: %m");
         abort();
         }
      if (pid != 0)
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
-  Channels.SwitchTo(1);
+  Channels.SwitchTo(Setup.CurrentChannel);
 
   cEITScanner EITScanner;
 
@@ -306,10 +306,15 @@ int main(int argc, char *argv[])
              default:    break;
              }
            }
-        if (!Menu)
+        if (!Menu) {
            EITScanner.Process();
+           cVideoCutter::Active();
+           }
         }
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
+  Setup.CurrentChannel = cDvbApi::CurrentChannel();
+  Setup.Save();
+  cVideoCutter::Stop();
   delete Menu;
   delete ReplayControl;
   delete Interface;
diff --git a/videodir.c b/videodir.c
index 91d362dbf..4d5c2572b 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.2 2000/09/15 13:23:47 kls Exp $
+ * $Id: videodir.c 1.3 2000/12/24 12:51:41 kls Exp $
  */
 
 #include "videodir.h"
@@ -180,3 +180,20 @@ bool VideoFileSpaceAvailable(unsigned int SizeMB)
      }
   return Dir.FreeMB() >= SizeMB;
 }
+
+const char *PrefixVideoFileName(const char *FileName, char Prefix)
+{
+  static char *PrefixedName = NULL;
+
+  if (!PrefixedName || strlen(PrefixedName) <= strlen(FileName))
+     PrefixedName = (char *)realloc(PrefixedName, strlen(FileName) + 2);
+  if (PrefixedName) {
+     strcpy(PrefixedName, VideoDirectory);
+     char *p = PrefixedName + strlen(PrefixedName);
+     *p++ = '/';
+     *p++ = Prefix;
+     strcpy(p, FileName + strlen(VideoDirectory) + 1);
+     }
+  return PrefixedName;
+}
+
diff --git a/videodir.h b/videodir.h
index 7ce15314d..0716a284b 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.1 2000/07/29 14:08:27 kls Exp $
+ * $Id: videodir.h 1.2 2000/12/24 12:41:10 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -17,5 +17,6 @@ int CloseVideoFile(int FileHandle);
 bool RenameVideoFile(const char *OldName, const char *NewName);
 bool RemoveVideoFile(const char *FileName);
 bool VideoFileSpaceAvailable(unsigned int SizeMB);
+const char *PrefixVideoFileName(const char *FileName, char Prefix);
 
 #endif //__VIDEODIR_H

From f2937af95ceaf3a52c327e96571367ef5475b3a1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 24 Feb 2001 18:00:00 +0100
Subject: [PATCH 017/307] Version 0.71 - Fixed 'Transfer Mode' in cases where a
 non-primary interface was switched to   a channel that only the primary
 interface can receive (which could happen in   the EPG scanner). - The EPG
 scanner now starts with the first channel (it used to start with the   second
 channel). - Reacitvated setting the PNR. - Adapted the frame scanning to the
 new muxing of the driver. - The new compile time option REMOTE=NONE can be
 used to compile VDR without   any remote control support (for applications
 where it shall be controlled   exclusively via SVDRP). - The new command line
 option -D can be used to define which DVB interfaces   a certain instance of
 VDR shall use. - The "Left" and "Right" keys are now used to page up and down
 in lists (thanks   to Martin Hammerschmid). Since the "Timers" menu already
 uses these keys to   (de)activate timers, this functionality is not available
 there. - The "Main" and "Commands" menu now support "hotkeys", which means
 that if the   first non-blank character of a menu item is a digit in the
 range 1..9, that   item can be selected by pressing the respective numeric
 key on the remote   control. - The channel data in 'channels.conf' now
 contains the teletext PID (thanks to   Dave Chapman). Existing files will be
 read normally (and the teletext PID set   to 0), but once they are written
 back (due to some channel editing) the file   will have the new format. - The
 EPG scanner now scans each transponder only once per cycle. - Deleted
 recordings are now automatically removed from disk after a while (not   only
 when disk space is being needed for a new recording). - Fixed repeat function
 in LIRC remote control. - Changed the MAXDVBAPI macro in dvbapi.c to 4 in
 order to directly support the   maximum possible number of DVB cards. - The
 'Ca' parameter in the default 'channels.conf' has been changed from '2'   to
 '3' because the VDR prototype now has 3 DVB cards (and currently the CAM  
 module only works if it is inserted into the last DVB card). - The "Now",
 "Next" and "Schedule" menus now remember the current channel and   restore
 the list when switching between them. - The "Green" button in the
 "Recordings" menu can now be used to rewind a   recording and play it from
 the very beginning. - Fixed handling ':' in timer filenames and '\n' in timer
 summaries (see FORMATS). - When removing recordings empty directories are now
 removed from the video   directory. - Added the "schnitt" tools from Matthias
 Schniedermeyer. - New SVDRP command MESG to display a short message on the
 OSD. - The Perl script 'svdrpsend.pl' can be used to send SVDRP commands to
 VDR. - SVDRP can now immediately reuse the same port if VDR is restarted. -
 SVDRP now has a timeout after which the connection is automatically closed  
 (default is 300 seconds, can be changed in "Setup"). - The compile time
 switch VFAT can be used to make VDR avoid the ':' character   in file names
 (VFAT can't handle them). Do 'make VFAT=1' to enable this. - Support for
 DVB-C (thanks to Hans-Peter Raschke and Peter Hofmann).   See the INSTALL
 file for more information about the use of VDR with cable. - Fixed an
 occasional segfault in the EIT processor. - A value of '0' for the
 EPGScanTimeout setup parameter now completely turns off   scanning for EPG
 data on both single and multiple card systems. - New setup parameter
 "PrimaryLimit" that allows to prevent timers from using the   primary DVB
 interface in multi card systems. Default value is 0, which means   that every
 timer may use the primary interface. - The 'active' field of a timer will now
 be explicitly set to '1' if the user   modifies an active timer (see FORMATS
 for details). - The new command line option -w can be used to activate a
 watchdog that makes   VDR exit in case the main program loop does not respond
 for more than the   given number of seconds. This is mainly useful in
 combination with the new   'runvdr' script that restarts VDR in case is has
 exited.

---
 BUGS                            |   8 -
 CONTRIBUTORS                    |  19 +-
 FORMATS                         |  31 +++-
 HISTORY                         |  64 +++++++
 INSTALL                         |  32 +++-
 MANUAL                          |  28 ++-
 Makefile                        |   9 +-
 TODO                            |   7 -
 Tools/schnitt/README            |  84 +++++++++
 Tools/schnitt/cut.pl            |  40 ++++
 Tools/schnitt/cut2              |   2 +
 Tools/schnitt/cutall            |   4 +
 Tools/schnitt/cutall2           |   5 +
 Tools/schnitt/cutt              |  85 +++++++++
 Tools/schnitt/getpreviframe.pl  |  31 ++++
 Tools/schnitt/index.php         | 215 +++++++++++++++++++++
 Tools/schnitt/lmplex            |  51 +++++
 Tools/schnitt/mv2               |  23 +++
 Tools/schnitt/schnitt.pl        |  26 +++
 Tools/schnitt/schnitt2.pl       |  91 +++++++++
 Tools/schnitt/schnitt3.pl       |  64 +++++++
 Tools/schnitt/schnitt3.pl.new   |  77 ++++++++
 Tools/schnitt/schnitt4.pl       |  13 ++
 Tools/schnitt/schnitt5.pl       |  16 ++
 Tools/schnitt/schnitt6.pl       |  30 +++
 Tools/schnitt/schnittcommon.pli |  64 +++++++
 Tools/schnitt/show              |  11 ++
 Tools/schnitt/unsort            |  25 +++
 Tools/schnitt/vdr-remote.pl     |  40 ++++
 Tools/schnitt/vdr2              |   2 +
 Tools/schnitt/vmount            |  18 ++
 channels.conf                   | 318 +++++++++++++++++---------------
 channels.conf.cable             | 134 ++++++++++++++
 config.c                        |  30 ++-
 config.h                        |   7 +-
 dvbapi.c                        | 208 ++++++++++-----------
 dvbapi.h                        |  26 +--
 eit.c                           |  13 +-
 epg2html.pl                     |   0
 i18n.c                          |  22 ++-
 interface.c                     |  20 +-
 menu.c                          | 115 +++++++++---
 menu.h                          |   4 +-
 osd.c                           |  50 ++++-
 osd.h                           |   7 +-
 recording.c                     |  97 +++++++++-
 recording.h                     |  14 +-
 remote.c                        |  12 +-
 remote.h                        |  10 +-
 runvdr                          |  13 ++
 svdrp.c                         |  54 +++++-
 svdrp.h                         |   8 +-
 svdrpsend.pl                    |  57 ++++++
 tools.c                         |  52 +++++-
 tools.h                         |   3 +-
 vdr.c                           | 111 ++++++++---
 videodir.c                      |  12 +-
 videodir.h                      |   3 +-
 58 files changed, 2214 insertions(+), 401 deletions(-)
 delete mode 100644 BUGS
 delete mode 100644 TODO
 create mode 100644 Tools/schnitt/README
 create mode 100755 Tools/schnitt/cut.pl
 create mode 100755 Tools/schnitt/cut2
 create mode 100755 Tools/schnitt/cutall
 create mode 100755 Tools/schnitt/cutall2
 create mode 100755 Tools/schnitt/cutt
 create mode 100755 Tools/schnitt/getpreviframe.pl
 create mode 100644 Tools/schnitt/index.php
 create mode 100755 Tools/schnitt/lmplex
 create mode 100755 Tools/schnitt/mv2
 create mode 100755 Tools/schnitt/schnitt.pl
 create mode 100755 Tools/schnitt/schnitt2.pl
 create mode 100755 Tools/schnitt/schnitt3.pl
 create mode 100755 Tools/schnitt/schnitt3.pl.new
 create mode 100755 Tools/schnitt/schnitt4.pl
 create mode 100755 Tools/schnitt/schnitt5.pl
 create mode 100755 Tools/schnitt/schnitt6.pl
 create mode 100755 Tools/schnitt/schnittcommon.pli
 create mode 100755 Tools/schnitt/show
 create mode 100755 Tools/schnitt/unsort
 create mode 100755 Tools/schnitt/vdr-remote.pl
 create mode 100755 Tools/schnitt/vdr2
 create mode 100755 Tools/schnitt/vmount
 create mode 100644 channels.conf.cable
 mode change 100644 => 100755 epg2html.pl
 create mode 100755 runvdr
 create mode 100755 svdrpsend.pl

diff --git a/BUGS b/BUGS
deleted file mode 100644
index 506316a50..000000000
--- a/BUGS
+++ /dev/null
@@ -1,8 +0,0 @@
-Video Disk Recorder - Known Bugs
---------------------------------
-
-* Sometimes the picture "jumps" as if a frame is skipped.
-  Presumably this is a problem in the card driver or firmware?
-
-* The pictures captured with the GRAB command in SVDRP
-  appear to be too dark.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ee44ada63..7a93b33ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -34,18 +34,29 @@ Niels de Carpentier <niels@casema.net>
 Martin Hammerschmid <martin@hammerschmid.com>
  for suggesting to display the direct channel select input on the OSD
  for suggesting to use the "Blue" button in the main menu to resume replay
+ for implementing pege up/down with the "Left" and "Right" keys
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
 
 Matthias Schniedermeyer <ms@citd.de>
- for implementing the 'MarkInstantRecord' setup option.
+ for implementing the 'MarkInstantRecord' setup option
+ for his "schnitt" tools
 
 Miha Setina <mihasetina@softhome.net>
- for translating the OSD texts to the Slovenian language.
+ for translating the OSD texts to the Slovenian language
 
 Alberto Carraro <bertocar@tin.it>
- for translating the OSD texts to the Italian language.
+ for translating the OSD texts to the Italian language
 
 Deti Fliegl <deti@fliegl.de>
- for implementing the 'CurrentChannel' setup parameter.
+ for implementing the 'CurrentChannel' setup parameter
+
+Dave Chapman <dave@dchapman.com>
+ for implementing support for the teletext PID
+
+Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de>
+ for his support in adapting VDR to DVB-C
+
+Peter Hofmann <software@pxh.de>
+ for his support in adapting VDR to DVB-C
diff --git a/FORMATS b/FORMATS
index ed52518d2..2a357a355 100644
--- a/FORMATS
+++ b/FORMATS
@@ -13,7 +13,7 @@ Video Disk Recorder File Formats
 
   A "channel definition" is a line with channel data, where the fields
   are separated by ':' characters:
-  Example: "RTL:12188:h:1:27500:163:104:0:12003"
+  Example: "RTL:12188:h:1:27500:163:104:0:0:12003"
 
   The fields in a channel definition have the following meaning (from left
   to right):
@@ -21,15 +21,19 @@ Video Disk Recorder File Formats
   - Name: the channel's name (if the name originally contains a ':' character
     it has to be replaced by '|')
   - Frequency in MHz (as an integer)
-  - Polarization (one of 'h', 'H', 'v', 'V')
-  - Diseqc number
+  - Polarization (one of 'h', 'H', 'v', 'V') **
+  - Diseqc number **
   - Symbol rate
   - Video PID
   - Audio PID
+  - Teletext PID
   - Conditional Access (0 = Free To Air, 1 = can be decrypted by the first
     DVB card, 2 = can be decrypted by the second DVB card)
   - Program Number
 
+  Fields marked with ** are only meaningful for DVB-S (satellite) receivers.
+  DVB-C receivers simply ignore these.
+
 * timers.conf
 
   This file contains the timer setup.
@@ -37,7 +41,10 @@ Video Disk Recorder File Formats
   The fields in a timer definition have the following meaning (from left
   to right):
 
-  - Timer active (0 = inaactive, 1 = active)
+  - Timer active (0 = inactive, 1 = active)
+    Values larger than '1' can be used by external programs to mark active timers
+    and recognize if the user has modified them. When a user modifes an active
+    timer the 'active' field will be explicitly set to '1'.
   - Program number of the channel to record
   - Day of recording, either one or more of
       M------ = Monday
@@ -55,8 +62,10 @@ Video Disk Recorder File Formats
   - End time (first two digits for the hour, second two digits for the minutes)
   - Priority (from 00 to 99, 00 = lowest prioity, 99 = highest priority)
   - Guaranteed lifetime of recording (in days)
-  - Name of timer (will be used to name the recording)
-  - Summary
+  - Name of timer (will be used to name the recording); if the name contains
+    any ':' characters, these have to be replaced with '|'
+  - Summary (any newline characters in the summary have to be replaced with '|';
+    the summary may contain ':' characters)
 
 * setup.conf
 
@@ -86,9 +95,13 @@ Video Disk Recorder File Formats
 
   Examples:
 
-    Check for new mail: /usr/local/bin/checkmail 2>&1
-    CPU status        : /usr/loval/bin/cpustatus 2>&1
-    Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+   1 Check for new mail: /usr/local/bin/checkmail 2>&1
+   2 CPU status        : /usr/loval/bin/cpustatus 2>&1
+   3 Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+
+  If the first non-blank character of the 'title' is a digit in the range
+  1..9, the command can be selected directly by pressing the respective numerical
+  key on the remote control.
 
 * marks.vdr
 
diff --git a/HISTORY b/HISTORY
index 8d5e88494..684d2b65c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -349,3 +349,67 @@ Video Disk Recorder Revision History
 - The EIT scanning thread is now locked when switching channels to avoid problems.
 - Encrypted channels can now be selected even without knowing the PNR (however, it
   is still necessary for the EPG info).
+
+2001-02-24: Version 0.71
+
+- Fixed 'Transfer Mode' in cases where a non-primary interface was switched to
+  a channel that only the primary interface can receive (which could happen in
+  the EPG scanner).
+- The EPG scanner now starts with the first channel (it used to start with the
+  second channel).
+- Reacitvated setting the PNR.
+- Adapted the frame scanning to the new muxing of the driver.
+- The new compile time option REMOTE=NONE can be used to compile VDR without
+  any remote control support (for applications where it shall be controlled
+  exclusively via SVDRP).
+- The new command line option -D can be used to define which DVB interfaces
+  a certain instance of VDR shall use.
+- The "Left" and "Right" keys are now used to page up and down in lists (thanks
+  to Martin Hammerschmid). Since the "Timers" menu already uses these keys to
+  (de)activate timers, this functionality is not available there.
+- The "Main" and "Commands" menu now support "hotkeys", which means that if the
+  first non-blank character of a menu item is a digit in the range 1..9, that
+  item can be selected by pressing the respective numeric key on the remote
+  control.
+- The channel data in 'channels.conf' now contains the teletext PID (thanks to
+  Dave Chapman). Existing files will be read normally (and the teletext PID set
+  to 0), but once they are written back (due to some channel editing) the file
+  will have the new format.
+- The EPG scanner now scans each transponder only once per cycle.
+- Deleted recordings are now automatically removed from disk after a while (not
+  only when disk space is being needed for a new recording).
+- Fixed repeat function in LIRC remote control.
+- Changed the MAXDVBAPI macro in dvbapi.c to 4 in order to directly support the
+  maximum possible number of DVB cards.
+- The 'Ca' parameter in the default 'channels.conf' has been changed from '2'
+  to '3' because the VDR prototype now has 3 DVB cards (and currently the CAM
+  module only works if it is inserted into the last DVB card).
+- The "Now", "Next" and "Schedule" menus now remember the current channel and
+  restore the list when switching between them.
+- The "Green" button in the "Recordings" menu can now be used to rewind a
+  recording and play it from the very beginning.
+- Fixed handling ':' in timer filenames and '\n' in timer summaries (see FORMATS).
+- When removing recordings empty directories are now removed from the video
+  directory.
+- Added the "schnitt" tools from Matthias Schniedermeyer.
+- New SVDRP command MESG to display a short message on the OSD.
+- The Perl script 'svdrpsend.pl' can be used to send SVDRP commands to VDR.
+- SVDRP can now immediately reuse the same port if VDR is restarted.
+- SVDRP now has a timeout after which the connection is automatically closed
+  (default is 300 seconds, can be changed in "Setup").
+- The compile time switch VFAT can be used to make VDR avoid the ':' character
+  in file names (VFAT can't handle them). Do 'make VFAT=1' to enable this.
+- Support for DVB-C (thanks to Hans-Peter Raschke and Peter Hofmann).
+  See the INSTALL file for more information about the use of VDR with cable.
+- Fixed an occasional segfault in the EIT processor.
+- A value of '0' for the EPGScanTimeout setup parameter now completely turns off
+  scanning for EPG data on both single and multiple card systems.
+- New setup parameter "PrimaryLimit" that allows to prevent timers from using the
+  primary DVB interface in multi card systems. Default value is 0, which means
+  that every timer may use the primary interface.
+- The 'active' field of a timer will now be explicitly set to '1' if the user
+  modifies an active timer (see FORMATS for details).
+- The new command line option -w can be used to activate a watchdog that makes
+  VDR exit in case the main program loop does not respond for more than the
+  given number of seconds. This is mainly useful in combination with the new
+  'runvdr' script that restarts VDR in case is has exited.
diff --git a/INSTALL b/INSTALL
index e2a67a0fd..c334ed6d5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,7 +15,7 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile.
 
-This program requires the card driver version 0.8.1 or higher
+This program requires the card driver version 0.8.2 or higher
 to work properly. You need to load the dvb.o module *without* option
 'outstream=0' (previous versions of VDR required this option to have
 the driver supply the data in AV_PES format; as of version 0.70 VDR
@@ -38,6 +38,7 @@ following values 'make' call to activate the respective control mode:
                 (see http://www.cadsoft.de/people/kls/vdr/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
+  REMOTE=NONE   no remote control (in case only SVDRP shall be used)
 
 Adding "DEBUG_OSD=1" will use the PC screen (or current window)
 to display texts instead of the DVB card's on-screen display
@@ -45,6 +46,13 @@ interface. These modes are useful when testing new menus if you
 only have a remote connection to the VDR (which, in my case, is
 located in the living room and has neither a monitor nor a keyboard).
 
+If your video directory will be on a VFAT partition, add the compile
+time switch
+
+  VFAT=1
+
+to the 'make' command.
+
 When running, the 'vdr' program writes status information into the
 system log file (/var/log/messages). You may want to watch these
 messages (tail -f /var/log/mesages) to see if there are any problems.
@@ -63,6 +71,13 @@ If the program shall run as a daemon, use the --daemon option. This
 will completely detach it from the terminal and will continue as a
 background process.
 
+Automatic restart in case of hangups:
+-------------------------------------
+
+If you run VDR using the 'runvdr' shell script it will use the built-in
+watchdog timer to restart the program in case something happens that
+causes a program hangup.
+
 Command line options:
 ---------------------
 
@@ -132,6 +147,21 @@ that the channels defined in 'channels.conf' are correct before attempting
 to record anything. Channel parameters may vary and not all of the channels
 listed in the default 'channels.conf' file have been verified by the author.
 
+As a starting point you can copy the 'channels.conf' file that comes with the
+VDR archive into your video directory (or into your config directory,
+respectively, in case you have redirected it with the -c option).
+
+Running VDR with DVB-C (cable):
+-------------------------------
+
+VDR automatically recognizes if the DVB card in use is a cable card.
+The only things that needs to be different when using digital cable
+is the 'channels.conf' file. The distribution archive contains a default
+'channels.conf.cable', which cable users can rename or copy to 'channels.conf'
+in order to receive cable channels. The format of this file is exactly the
+same as for satellite channels (the fields containing "Polarization" and
+"Diseqc" data are ignored in case of DVB-C).
+
 Learning the remote control keys:
 ---------------------------------
 
diff --git a/MANUAL b/MANUAL
index b0e9abe01..f77bd2763 100644
--- a/MANUAL
+++ b/MANUAL
@@ -12,16 +12,16 @@ Video Disk Recorder User's Manual
 
   Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
-  Left    Prev group  -          -          Disable    Decrement     -           Search back
-  Right   Next group  -          -          Enable     Increment     -           Search forward
+  Left    Prev group  -          Page up    Disable    Decrement     Page up     Search back
+  Right   Next group  -          Page down  Enable     Increment     Page down   Search forward
   Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
   Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
   Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
   Red     -           Record     Edit       Edit       -             Play        -
-  Green   -           -          New        New        -             -           Skip -60s
+  Green   -           -          New        New        -             Rewind      Skip -60s
   Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
-  Blue    -           Resume     Mark       Mark       -             -           Stop
-  0..9    Ch select   -          -          -          Numeric inp.  -           -
+  Blue    -           Resume     Mark       Mark       -             Summary     Stop
+  0..9    Ch select   -          -          -          Numeric inp.  -           Editing
 
 * Navigating through the On Screen Menus
 
@@ -310,7 +310,7 @@ Video Disk Recorder User's Manual
                          1 = instant recordings will be marked.
 
   LnbFrequLo = 9750      The low and high LNB frequencies (in MHz)
-  LnbFrequHi = 10600
+  LnbFrequHi = 10600     (these have no meaning for DVB-C receivers)
 
   SetSystemTime = 0      Defines whether the system time will be set according to
                          the time received from the DVB data stream.
@@ -326,7 +326,21 @@ Video Disk Recorder User's Manual
   EPGScanTimeout = 5     The time (in hours) of user inactivity after which the
                          DVB card in a single card system starts scanning channels
                          to keep the EPG up-to-date.
-                         A value of '0' turns off scanning on a single card system.
+                         A value of '0' completely turns off scanning on both single
+                         and multiple card systems.
+
+  SVDRPTimeout = 300     The time (in seconds) of inactivity on an open SVDRP
+                         connection after which the connection is automatically
+                         closed. Default is 300, a value of 0 means no timeout.
+
+  PrimaryLimit = 0       The minimum priority a timer must have to be allowed to
+                         use the primary DVB interface, or to force another timer
+                         with higher priority to use the primary DVB interface.
+                         This is mainly useful for recordings that should take
+                         place only when there is nothing else to do, but should
+                         never keep the user from viewing stuff on the primary
+                         interface. On systems with only one DVB card, timers
+                         with a priority below PrimaryLimit will never execute.
 
 * Executing system commands
 
diff --git a/Makefile b/Makefile
index 4505c7b56..c1cfabe1a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.18 2001/01/13 12:26:43 kls Exp $
+# $Id: Makefile 1.20 2001/02/24 15:52:58 kls Exp $
 
 DVBDIR   = ../DVB
 
@@ -25,6 +25,11 @@ ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 endif
 
+ifdef VFAT
+# for people who want their video directory on a VFAT partition
+DEFINES += -DVFAT
+endif
+
 all: vdr
 font: genfontfile fontfix.c fontosd.c
 	@echo "font files created."
@@ -75,6 +80,6 @@ genfontfile: genfontfile.o
 # Housekeeping:
 
 clean:
-	-rm -f $(OBJS) vdr genfontfile genfontfile.o
+	-rm -f $(OBJS) vdr genfontfile genfontfile.o core
 CLEAN: clean
 	-rm -f fontfix.c fontosd.c
diff --git a/TODO b/TODO
deleted file mode 100644
index 1ae7d7176..000000000
--- a/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-TODO list for the Video Disk Recorder project
----------------------------------------------
-
-* Implement simultaneous record/replay with a single DVB card once
-  the card driver/firmware allows this.
-* Implement channel scanning.
-* Implement remaining commands in SVDRP.
diff --git a/Tools/schnitt/README b/Tools/schnitt/README
new file mode 100644
index 000000000..29953e0ee
--- /dev/null
+++ b/Tools/schnitt/README
@@ -0,0 +1,84 @@
+			Sammlung von "Hilfs"-Scripten
+
+Diese Sammlung an "Hilfs"-Scripten habe ich mir zum scheiden und anderen
+Zwecken zusammengeschrieben.
+
+Das ganze unterliegt natuerlich der GPL.
+
+Ich bin nicht sonderlich gut im "Dokumentieren". Also gilt die Devise
+"Hilf dir selbst".
+
+Ein paar Worte zu den "Hart"-Codierten Pfaden.
+
+/yele/video	(/video/video0)
+/yelg/video	(/video/video1)
+
+Sind die 2 Pfade auf meinem DVB-Rechner
+
+/x1/video
+
+Ist das Verzeichniss in das die Video zum schneiden verschoben werden.
+
+/x1/temp
+/x2/temp
+
+Sind die beim schneiden verwendeten Temporaer-Verzeichnisse
+
+
+Enthalten sind folgende Scripte:
+
+cutall			-> "Master"-Script zum starten des Scheide vorgangs.
+                           Ist ein "find" nach "cut" -Dateien
+cutt			-> Das "eigentliche" Schnitt-Script
+                           Scheidet die Stuecke aus, demultipext, remultipext,
+                           splitted die Dateien und macht am Ende ein 
+                           ISO-Image daraus
+index.php		-> PHP-Script zum finden der Schnitt-Punkte, mit 
+                           Testmoeglichkeit ob erfolgreich an diesem Punkt
+                           geschnitten werden kann
+mv2			-> Zum Moven der Aufnahmen von meinem DVB-Rechner 
+                           auf mein "Arbeitsrechner"
+schnitt.pl		-> Extraiert ein einzelnes Bild um es anzuzeigen
+                           (Fuer index.php)
+schnitt2.pl		-> Gibt alles zwischen 2 Schnittpunkten auf STDOUT aus
+schnitt3.pl		-> Testet ob erfolgreich geschnitten werden kann.
+schnitt3.pl.new		-> Version fuer PES-Datenstroeme
+schnitt4.pl		-> "Beschleunigtes" Schnitt-Programm fuer VIVA
+                           aufnahmen. 1 "VIDEO" pro Zeile erzeugt 
+                           "a", "b" ... Dateien
+schnitt5.pl		-> Gibt Datei-Nummern von einer Schnittmarke 
+                           +- 15000 Frames aus
+schnitt6.pl		-> Loescht alle Dateien die nicht von in einer von 
+                           schnitt5.pl abgedeckt ist. (Damit mv2 nicht so 
+                           lange braucht)
+show			-> Wird auf einem X-Display gestartet und zeigt das 
+                           aktuelle Bild von "schnitt.pl" an
+vdr-remote.pl		-> "Skeleton" um ueber SVDR-Kommandos zu schicken
+vdr2			-> Start-Script
+vmount			-> Mounten aller zusammengehoeriger ISO-Images zum 
+                           abspielen
+
+Hilsscripte:
+------------
+cut.pl			-> Entspricht weitestgehend "split" aber mit 
+                           "Nummer" anstatt Buchstaben
+cut2			-> Entfernt escapende Backslashes
+cutall2			-> Springt ins Schnitt-Verzeichniss und ruft das 
+                           "eigentliche" Schnitt-Script auf
+lmplex			-> Multiplexed Datenstrome unter Zurhilfename
+                           saemtlicher CPUs
+schnittcommon.pli	-> Das "Common" Script fuer schnitt?.pl
+getpreviframe.pl	-> Findet das vorherige I-Frame.
+unsort			-> Macht das Gegenteil von sort.
+
+
+Die ganze "Schnittloesung" ist leider etwas "unbrauchbar", weil ich aus
+Unachtsamkeit leider die gepatchten Sourcen von 2 wichtigen Programm
+geloescht habe. 
+
+dumpfrage		-> Extraiert das erste Frage in eine Datei zum
+			   anzeigen (gepatchtes dump aus "libmpeg3"
+pvademux		-> gepatcht um eine Pfad-Angabe
+
+Entweder macht jemand/ich patchen "nochmal" oder ich kann auch die
+Binaries zur Verfuegung stellen.
diff --git a/Tools/schnitt/cut.pl b/Tools/schnitt/cut.pl
new file mode 100755
index 000000000..dd62c18ff
--- /dev/null
+++ b/Tools/schnitt/cut.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my $maxsize = 660 * 1024 * 1024;
+
+my $read = 1024*1024;
+my $size = 1024*1024;
+
+my $filenum = "1";
+my $count = 0;
+
+my ($fi,$data);
+
+$fi = sprintf ("part%d",$filenum);
+open (FI,">$fi");
+
+while ($read == $size)
+  {
+    if ($count < $maxsize)
+      {
+	$read = read (STDIN,$data,$size);
+	print FI $data;
+	$count += $size;
+	$a = $count /1024/1024;
+	if ($a % 10 == 0) {
+          print STDERR "File: $filenum Size: ${a}MB\n";
+        }
+      }
+    else
+      {
+	close (FI);
+	$filenum++;
+	$fi = sprintf ("part%d",$filenum);
+	open (FI,">$fi");
+	$count = 0;
+      }
+  }
+
+close FI;
diff --git a/Tools/schnitt/cut2 b/Tools/schnitt/cut2
new file mode 100755
index 000000000..0193ac0c2
--- /dev/null
+++ b/Tools/schnitt/cut2
@@ -0,0 +1,2 @@
+#!/bin/sh
+cat cut | head -n 1 | tr -d [\\\\]
diff --git a/Tools/schnitt/cutall b/Tools/schnitt/cutall
new file mode 100755
index 000000000..355935fd3
--- /dev/null
+++ b/Tools/schnitt/cutall
@@ -0,0 +1,4 @@
+#!/bin/sh
+cutdir=/x1/video/
+
+find $cutdir -name "cut" -exec cutall2 {} \;
diff --git a/Tools/schnitt/cutall2 b/Tools/schnitt/cutall2
new file mode 100755
index 000000000..90b0f46ba
--- /dev/null
+++ b/Tools/schnitt/cutall2
@@ -0,0 +1,5 @@
+#!/bin/sh
+a=`echo $1 | cut -d / -f1-5`
+cd $a
+cutt
+mv cut cut.bak
diff --git a/Tools/schnitt/cutt b/Tools/schnitt/cutt
new file mode 100755
index 000000000..4e89b7a3d
--- /dev/null
+++ b/Tools/schnitt/cutt
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+DIRA=/x2/temp
+DIRB=/x1/temp
+
+if [ -f cut ]; then
+  name="`cut2`"
+  echo $name
+  count=`cat cut | wc -l`
+  let count=count-1
+  let test=count%2
+  if [ "$test" == "1" ]; then
+    echo Ungerade Anzahl von Markierungen
+    exit 1
+  fi
+
+  file=1
+
+  while [ "$count" != "0" ]
+  do
+    start=`cat cut | tail -n $count | head -n 1`
+    let count=count-1
+    end=`cat cut | tail -n $count | head -n 1`
+    let count=count-1
+    echo Cutting\&Demuxing from $start to $end
+    schnitt2.pl $start $end | pvademux $DIRA teil$file
+#    schnitt2.pl $start $end | pes2av_pes | pvademux $DIRA teil$file
+    let file=file+1
+  done
+else
+  echo Keine Beschreibungsdatei
+  exit 1
+fi
+
+# Ab hier mkimg
+
+sync
+
+lmplex $DIRA $DIRB `ls -la $DIRA/teil*.m2v | cut -b 30- | sort -n -r | cut -d / -f4`
+
+echo Multiplexing DONE
+
+rm -f $DIRA/teil*.m2v $DIRA/teil*.mp2
+
+sync
+
+if [ -f $DIRB/teil1.mpg ]; then
+  echo Splitting
+  cd $DIRA
+#  cat $DIRB/teil*.mpg | split -b 723517440
+  cat $DIRB/teil*.mpg | cut.pl
+  rm $DIRB/teil*
+fi
+
+sync
+
+cd $DIRA
+
+if [ -f part2 ]; then
+  count=1
+  cond=0
+
+  while [ "$cond" != "1" ]
+  do
+    mkdir a
+    mv "part$count" "a/${name} Teil $count"
+    echo mkisofs Teil $count
+    mkisofs -r -o $DIRB/image1.raw a
+    rm -rf a
+    mv -- $DIRB/image1.raw "$DIRB/${name} Teil $count"
+    sync
+
+    let count=count+1
+    if [ ! -f "part$count" ]; then
+      cond=1
+    fi
+  done
+else
+  mkdir a
+  mv part1 "a/${name}"
+  echo mkisofs
+  mkisofs -r -o $DIRB/image1.raw a
+  rm -rf a
+  mv -- $DIRB/image1.raw "$DIRB/${name}"
+fi
diff --git a/Tools/schnitt/getpreviframe.pl b/Tools/schnitt/getpreviframe.pl
new file mode 100755
index 000000000..6774f3192
--- /dev/null
+++ b/Tools/schnitt/getpreviframe.pl
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+use strict;
+
+my ($index, $oindex);
+
+require "/usr/local/bin/my/schnittcommon.pli";
+
+if (!open (INDEX,"index.vdr"))
+  {
+    exit 1;
+  }
+
+$index = $oindex = $ARGV[0];
+
+if ($index > 0)
+{
+  &prevI;
+  if ($oindex != $index)
+    {
+      print "$index\n";
+    }
+  else
+    {
+      print "$oindex\n";
+    }
+}
+else
+{
+  print "0\n";
+}
diff --git a/Tools/schnitt/index.php b/Tools/schnitt/index.php
new file mode 100644
index 000000000..58a288fec
--- /dev/null
+++ b/Tools/schnitt/index.php
@@ -0,0 +1,215 @@
+<html>
+<head>
+  <title>Schneiden</title>
+</head>
+<body bgcolor=#C0C0C0>
+<?
+if ($level == 0)
+  {
+    $dircount=0;
+    $handle=opendir('/x1/video');
+    while ($file = readdir($handle)) {
+        if ($file != "." && $file != ".." && $file != "epg.data") { 
+          $dir=$file;
+          $dircount++;
+        }
+    }
+  if ($dircount == 1) {
+    $level=1;
+    }
+  else
+  {
+?>
+<center><h1>Sender</h1></center>
+<form action="index.php" method="post">
+<input type=hidden name=level value="1">
+<?
+      $handle=opendir('/x1/video');
+      while ($file = readdir($handle)) {
+          if ($file != "." && $file != ".." && $file != "epg.data") { 
+              echo "<input type=submit name=dir value=\"$file\">\n"; 
+          }
+      }
+      closedir($handle); 
+?>
+</form>
+<?
+    }
+  }
+if ($level == 1)
+  {
+    $dircount=0;
+    $handle=opendir("/x1/video/$dir");
+    while ($file = readdir($handle)) {
+        if ($file != "." && $file != "..") { 
+          $dira="$dir/$file";
+          $dircount++;
+        } 
+    }
+    if ($dircount == 1) {
+      $dir = $dira;
+      $level = 2;
+    }
+    else
+    {
+?>
+<form action="index.php" method="post">
+<input type=hidden name=level value="2">
+<?
+      echo "<center><h1>Filme/Serien fuer den Sender $dir</h1></center>";
+      $handle=opendir("/x1/video/$dir");
+      while ($file = readdir($handle)) {
+          if ($file != "." && $file != "..") { 
+              echo "<input type=submit name=dir value=\"$dir/$file\"><br>\n"; 
+          } 
+      }
+      closedir($handle); 
+?>
+</form>
+<?
+    }
+  }
+if ($level == 2)
+  {
+if ($aindex)
+  $index = $aindex;
+else if (!$index)
+  $index = 0;
+
+if ($dir)
+  chdir ("/x1/video/$dir");
+
+switch ($cindex) {
+  case "-10000": 
+      if ($index >=10000)
+        $index -= 10000;
+	break;
+  case "-4000": 
+      if ($index >=4000)
+        $index -= 4000;
+	break;
+  case "-2000": 
+      if ($index >=2000)
+        $index -= 2000;
+	break;
+  case "-1000": 
+      if ($index >=1000)
+        $index -= 1000;
+	break;
+  case "-500": 
+      if ($index >=500)
+        $index -= 500;
+	break;
+  case "-100": 
+      if ($index >=100)
+        $index -= 100;
+	break;
+  case "Vorheriges I-Frame":
+        $pindex = $index - 1;
+        $fp = popen ("/usr/local/bin/my/getpreviframe.pl $pindex","r");
+        $i = fgets($fp,1000);
+        $index = chop ($i);
+        pclose ($fp);
+        break;
+  case "Naechstes I-Frame":
+        $index ++;
+        break;
+  case "+100":
+        $index += 100;
+	break;
+  case "+500":
+        $index += 500;
+	break;
+  case "+1000":
+        $index += 1000;
+	break;
+  case "+2000":
+        $index += 2000;
+	break;
+  case "+4000":
+        $index += 4000;
+	break;
+  case "+10000":
+        $index += 10000;
+	break;
+  }
+
+if ($test)
+  {
+    $fp = popen ("/usr/local/bin/my/schnitt3.pl $index","r");
+    $i = fgets($fp,1000);
+    pclose ($fp);
+    $index = chop ($i);
+  }
+
+if ($name)
+  {
+    $fp = fopen ("cut","w");
+    fputs ($fp,"$name\n");
+    fclose ($fp);
+  }
+
+if ($cut)
+  {
+    $fp = fopen ("cut","a");
+    fputs ($fp,"$index\n");
+    fclose ($fp);
+  }
+
+$fp = popen ("/usr/local/bin/my/schnitt.pl $index","r");
+$i = fgets($fp,1000);
+pclose ($fp);
+$index = chop ($i);
+
+system ("/usr/local/bin/my/dumpframe /x2/temp/bild.m2v");
+system ("mv output.ppm /x2/temp");
+system ("touch /x2/temp/newpic");
+system ("killall sleep");
+?>
+<form action="index.php" method="post">
+<input type=hidden name=level value="2">
+<input type=hidden name=dir value="<?=$dir?>">
+<input type=hidden name=index value=<?=$index?>>
+<table width=90% align=center>
+<tr>
+<td><h1>Index <?=$index?></h1></td>
+<td><h1>Dir: <?=$dir?></h1></td>
+</tr>
+</table>
+<table width=80% align=center>
+<tr>
+<td><input type=submit name=cindex value="-10000"></td>
+<td><input type=submit name=cindex value="-4000"></td>
+<td><input type=submit name=cindex value="-2000"></td>
+<td><input type=submit name=cindex value="-1000"></td>
+<td><input type=submit name=cindex value="-500"></td>
+<td><input type=submit name=cindex value="-100"></td>
+<td><input type=submit name=cindex value="Vorheriges I-Frame"></td>
+<td><input type=submit name=cindex value="Naechstes I-Frame"</td>
+<td><input type=submit name=cindex value="+100"></td>
+<td><input type=submit name=cindex value="+500"></td>
+<td><input type=submit name=cindex value="+1000"></td>
+<td><input type=submit name=cindex value="+2000"></td>
+<td><input type=submit name=cindex value="+4000"></td>
+<td><input type=submit name=cindex value="+10000"></td>
+</tr>
+</table>
+<table>
+<tr>
+<td>Absoluter Index: <input type=text name=aindex size=6></td>
+<td><input type=submit name=test value="Schnitt-Test"></td>
+<td><input type=submit name=cut value="Mark"></td>
+</form>
+<form action="index.php" method="post">
+<input type=hidden name=level value="2">
+<input type=hidden name=dir value="<?=$dir?>">
+<input type=hidden name=index value=<?=$index?>>
+<td>Titel: <input type=text name=name size=50 maxlength=255></td>
+</form>
+</tr>
+</table>
+<?
+}
+?>
+</body>
+</html>
diff --git a/Tools/schnitt/lmplex b/Tools/schnitt/lmplex
new file mode 100755
index 000000000..8cbb50f20
--- /dev/null
+++ b/Tools/schnitt/lmplex
@@ -0,0 +1,51 @@
+#! /usr/bin/perl
+
+### Calculate the number of CPUs we want to keep busy
+open IN, "/proc/cpuinfo"; 
+$cpus = grep /processor.*:/, <IN>;
+close IN; 
+
+### This is a list of files to encode
+@names = @ARGV;
+
+$dira = shift @names;
+$dirb = shift @names;
+
+### This is the name of the encoder to use.
+$coder = "/usr/local/bin/mplex ";
+###
+
+###
+###
+###
+
+# Encode a single file
+sub do_one {
+    my($m2v) = shift;
+    # Make mp3 from wav
+    $m2v =~ s/\.m2v$//;
+
+    # In a subprocess, encode the file
+    printf "Multiplexing ${m2v}\n";
+    unless($pid = fork) {
+    	system ("$coder ${dira}/${m2v}.m2v ${dira}/${m2v}.mp2 ${dirb}/${m2v}.mpg");
+	exit;
+    }
+}
+
+# Go ahead and prefork $cpus encoders
+foreach $i (0 .. $cpus-1) {
+	&do_one($names[0]) if ($names[0] ne "");
+	shift @names;
+}
+
+# Wait for the end of each encoder, start a new one...
+foreach $i (@names) {
+	wait;
+	&do_one($i);
+}
+
+# Wait for everything to close down.
+while(wait > 0) {
+	;
+}
diff --git a/Tools/schnitt/mv2 b/Tools/schnitt/mv2
new file mode 100755
index 000000000..a0cefba7f
--- /dev/null
+++ b/Tools/schnitt/mv2
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+DIR = /x1/video
+
+if [ ! "$UID" = 0 ]; then
+  if [ -d "$1" ]; then
+    cd $DIR
+    a=`echo "$1" | cut -d / -f4-`
+    mkdir -p "$a"
+    cd "$a"
+    (echo cd "$1"; echo mget \*)| ftp -i dvb
+    cd $DIR
+    ls -Ls $1 > /tmp/yele
+    ls -Ls $a > /tmp/x1
+    a=`echo "$1" | cut -d \/ -f3-`
+    diff -u /tmp/yele /tmp/x1 &> /dev/null && rm -rfv /yel?/$a
+    rm /tmp/yele
+    rm /tmp/x1
+    rmdir /yel?/video/*
+  fi
+else
+  echo Not as root
+fi
diff --git a/Tools/schnitt/schnitt.pl b/Tools/schnitt/schnitt.pl
new file mode 100755
index 000000000..d5521ebbf
--- /dev/null
+++ b/Tools/schnitt/schnitt.pl
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+require "/usr/local/bin/my/schnittcommon.pli";
+
+if (!open (INDEX,"index.vdr"))
+  {
+    exit 1;
+  }
+$index = $ARGV[0];
+&nextI;
+$offset1 = $offset;
+&readnext;
+$off = $offset - $offset1;
+close (FI);
+$fi = sprintf ("%03d.vdr",$file);
+open (FI,$fi);
+open (FO,">bild");
+sysseek (FI,$offset1,0);
+sysread (FI,$temp,200000);
+syswrite (FO,$temp,200000);
+close (FI);
+close (FO);
+
+`/usr/local/bin/pvademux.old /x2/temp bild`;
+#`/usr/local/bin/pes2av_pes bild | /usr/local/bin/pvademux /x2/temp bild`;
+print "$index\n";
diff --git a/Tools/schnitt/schnitt2.pl b/Tools/schnitt/schnitt2.pl
new file mode 100755
index 000000000..e52b24595
--- /dev/null
+++ b/Tools/schnitt/schnitt2.pl
@@ -0,0 +1,91 @@
+#!/usr/bin/perl
+
+require "/usr/local/bin/my/schnittcommon.pli";
+
+if (!open (INDEX,"index.vdr"))
+  {
+    print "Error opening index.vdr";
+    exit 1;
+  }
+
+$index = $ARGV[0];
+&nextI;
+$file1 = $file;
+$offset1 = $offset;
+$index = $ARGV[1];
+&nextI;
+$file2 = $file;
+$offset2 = $offset;
+
+if ($file1 == $file2)
+  {
+    $count = $offset2 - $offset1;
+    $cond = 0;
+    $size = 1024*1024;
+    $fi = sprintf ("%03d.vdr",$file);
+    open (FI,$fi);
+    sysseek (FI,$offset1,0);
+    while ($cond == 0)
+      {
+	if ($count > $size)
+	  {
+	    $read = sysread (FI,$data,$size);
+            print $data;
+	    $count -= $size;
+	  }
+	else
+	  {
+	    $read = sysread (FI,$data,$count);
+            print $data;
+	    $cond = 1;
+	  }
+      }
+  }
+else
+  {
+    $count = $offset2;
+    $cond = 0;
+    $read = $size = 1024*1024;
+    $fi = sprintf ("%03d.vdr",$file1);
+    open (FI,$fi);
+    sysseek (FI,$offset1,0);
+    while ($read == $size)
+      {
+	$read = sysread (FI,$data,$size);
+        print $data;
+      }
+    close (FI);
+
+    $file1++;
+    while ($file1 != $file2)
+      {
+        $fi = sprintf ("%03d.vdr",$file1);
+        open (FI,$fi);
+        $read = 1024*1024;        
+        while ($read == $size)
+          {
+            $read = sysread (FI,$data,$size);
+            print $data;
+          }
+        close (FI);
+        $file1++;
+      }
+
+    $fi = sprintf ("%03d.vdr",$file2);
+    open (FI,$fi);
+    while ($cond == 0)
+      {
+	if ($count > $size)
+	  {
+	    $read = sysread (FI,$data,$size);
+            print $data;
+	    $count -= $size;
+	  }
+	else
+	  {
+	    $read = sysread (FI,$data,$count);
+            print $data;
+	    $cond = 1;
+	  }
+      }
+  }
diff --git a/Tools/schnitt/schnitt3.pl b/Tools/schnitt/schnitt3.pl
new file mode 100755
index 000000000..7cc0f7f3e
--- /dev/null
+++ b/Tools/schnitt/schnitt3.pl
@@ -0,0 +1,64 @@
+#!/usr/bin/perl
+
+require "/usr/local/bin/my/schnittcommon.pli";
+
+open (INDEX,"index.vdr");
+$index = $ARGV[0];
+&nextI;
+
+$oldindex = $index;
+$tempindex = $index;
+
+$add = -1;
+
+$fi = sprintf ("%03d.vdr",$file);
+open (FI2,$fi);
+open (FO,">test");
+sysseek (FI2,$offset,0);
+sysread (FI2,$temp,3000000);
+syswrite (FO,$temp,3000000);
+close (FI2);
+close (FO);
+`/usr/local/bin/pvademux.old . test`;
+if ( -s "test.mp2")
+  {
+    `rm test*`;
+    print "$index\n";
+    exit 0;
+  }
+
+while (1)
+  {
+    if ($index == 0)
+      {
+        $add = 1;
+      }
+    if ($add = -1)
+      {
+       $index--;
+       &prevI;
+      }
+    else
+      {
+        nextI;
+      }
+    $fi = sprintf ("%03d.vdr",$file);
+    open (FI2,$fi);
+    open (FO,">test");
+    sysseek (FI2,$offset,0);
+    sysread (FI2,$temp,3000000);
+    syswrite (FO,$temp,3000000);
+    close (FI2);
+    close (FO);
+    `/usr/local/bin/pvademux.old . test`;
+    if ( -s "test.mp2")
+      {
+        `rm test*`;
+        if ($index < 0)
+          {
+            $index *= -1;
+          }
+        print "$index\n";
+        exit 0;
+      }
+  }
diff --git a/Tools/schnitt/schnitt3.pl.new b/Tools/schnitt/schnitt3.pl.new
new file mode 100755
index 000000000..04a6239be
--- /dev/null
+++ b/Tools/schnitt/schnitt3.pl.new
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+
+require "/usr/local/bin/my/schnittcommon.pli";
+
+open (INDEX,"index.vdr");
+
+$index = $ARGV[0];
+&nextI;
+
+$oldindex = $index;
+$tempindex = $index;
+
+$add = -1;
+
+$fi = sprintf ("%03d.vdr",$file);
+open (FI2,$fi);
+open (FO,">test2");
+sysseek (FI2,$offset,0);
+sysread (FI2,$temp,3000000);
+syswrite (FO,$temp,3000000);
+close (FI2);
+close (FO);
+
+system ("pes2av_pes test2 > test 2>/dev/null");
+open (PVA,"/usr/local/bin/pvademux.old . test 2>&1 |");
+
+@a=<PVA>; close PVA;
+@b=split (/\s/,$a[2]);
+
+if (!($b[4] =~ /\-/) && $b[4] < 2000)
+  {
+    unlink <test*>;
+    print "$index\n";
+    exit 0;
+  }
+
+while (1)
+  {
+    if ($index == 0)
+      {
+        $add = 1;
+      }
+    if ($add = -1)
+      {
+       $index--;
+       &prevI;
+      }
+    else
+      {
+        nextI;
+      }
+    $fi = sprintf ("%03d.vdr",$file);
+    open (FI2,$fi);
+    open (FO,">test2");
+    sysseek (FI2,$offset,0);
+    sysread (FI2,$temp,3000000);
+    syswrite (FO,$temp,3000000);
+    close (FI2);
+    close (FO);
+
+system ("/usr/local/bin/pes2av_pes test2 > test 2>/dev/null");
+open (PVA,"/usr/local/bin/pvademux.old . test 2>&1 |");
+
+@a=<PVA>; close PVA;
+@b=split (/\s/,$a[2]);
+
+if (!($b[4] =~ /\-/) && $b[4] < 2000)
+  {
+    unlink <test*>;
+        if ($index < 0)
+          {
+            $index *= -1;
+          }
+    print "$index\n";
+    exit 0;
+  }
+}
diff --git a/Tools/schnitt/schnitt4.pl b/Tools/schnitt/schnitt4.pl
new file mode 100755
index 000000000..75f2ad178
--- /dev/null
+++ b/Tools/schnitt/schnitt4.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+open (FI,$ARGV[0]) or die "Kann Input-Datei nicht oeffnen";
+$count = 1;
+
+while (<FI>)
+  {
+    chomp;
+    $char = sprintf ("%c",$count + 96);
+    print "Cutting from/to $_ into /x2/clips/$char\n";
+    system ("/usr/local/bin/my/schnitt2.pl $_ > /x2/clips/$char");
+    $count++;
+  }
diff --git a/Tools/schnitt/schnitt5.pl b/Tools/schnitt/schnitt5.pl
new file mode 100755
index 000000000..7626ab51f
--- /dev/null
+++ b/Tools/schnitt/schnitt5.pl
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+require "/usr/local/bin/my/schnittcommon.pli";
+
+open (INDEX,"index.vdr");
+$index = $ARGV[0] - 15000;
+&nextI;
+
+$file1 = $file;
+
+$index += 30000;
+&nextI;
+
+$file2 = $file;
+
+print "$file1 $file2\n";
+
diff --git a/Tools/schnitt/schnitt6.pl b/Tools/schnitt/schnitt6.pl
new file mode 100755
index 000000000..92d9eb49c
--- /dev/null
+++ b/Tools/schnitt/schnitt6.pl
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+
+open (FI,"a");
+
+while (<FI>)
+{
+  open (SCH,"/usr/local/bin/my/schnitt5.pl $_|");
+  $files = <SCH>;
+  chomp $files;
+  ($a,$b) = split (/\s/,$files);
+  $files[$a] = 1;
+  $files[$b] = 1;
+  close (SCH);
+}
+
+while (<0*.vdr>)
+{
+  $_ =~ /\d(\d\d)\.vdr/;
+  if ($files[$1])
+  {
+    print "Keeping $1\n";
+  }
+  else
+  {
+    print "Deleting $_\n";
+    unlink $_;
+  }
+}
+
+close (FI);
diff --git a/Tools/schnitt/schnittcommon.pli b/Tools/schnitt/schnittcommon.pli
new file mode 100755
index 000000000..f221f41af
--- /dev/null
+++ b/Tools/schnitt/schnittcommon.pli
@@ -0,0 +1,64 @@
+sub nextI 
+  {
+    if (!$size)
+      {
+        $size = -s INDEX;
+      }
+    local ($a,$b,$c,$dummy);
+    $cond = 0;
+    seek (INDEX,$index * 8,0);
+
+    while ($cond == 0)
+      {
+	&readnext;
+	if ($frame == 1)
+	  {
+	    $cond = 1;
+	  }
+	else
+	  {
+	    $index++;
+            if ($index > ($size/8-1))
+              {
+                $index = $size/8-1;
+                &prevI;
+                print "$index\n";
+                exit 1;
+              }
+	  }
+      }
+  }
+
+sub readnext
+  {
+    read (INDEX,$a,4);
+    read (INDEX,$b,1);
+    read (INDEX,$c,1);
+    read (INDEX,$dummy,2);
+    $offset = unpack ("L",$a);
+    $frame = unpack ("C",$b);
+    $file = unpack ("C",$c);
+  }
+
+sub prevI 
+  {
+    local ($a,$b,$c,$dummy);
+    $cond = 0;
+    seek (INDEX,$index * 8,0);
+
+    while ($cond == 0)
+      {
+	&readnext;
+	if ($frame == 1)
+	  {
+	    $cond = 1;
+	  }
+	else
+	  {
+	    $index--;
+	    seek (INDEX,$index * 8,0);
+	  }
+      }
+  }
+
+1;
diff --git a/Tools/schnitt/show b/Tools/schnitt/show
new file mode 100755
index 000000000..afed79b3c
--- /dev/null
+++ b/Tools/schnitt/show
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd /x2/temp
+while true
+do
+  if [ -f newpic ]; then
+    killall xli
+    rm -f newpic
+    xli output.ppm &
+  fi
+sleep 24h
+done
diff --git a/Tools/schnitt/unsort b/Tools/schnitt/unsort
new file mode 100755
index 000000000..83adfb6c6
--- /dev/null
+++ b/Tools/schnitt/unsort
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+
+while (<>)
+{
+  $h{$_}=1;
+}
+
+foreach $key (sort shuffle keys %h)
+{
+  print $key;
+}
+
+sub shuffle {
+  $ran = rand(1);
+
+  if ($ran > 0.5)
+  {
+    return -1;
+  }
+  else
+  {
+    return 1;
+  }
+}
+
diff --git a/Tools/schnitt/vdr-remote.pl b/Tools/schnitt/vdr-remote.pl
new file mode 100755
index 000000000..32d408e0d
--- /dev/null
+++ b/Tools/schnitt/vdr-remote.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Socket;
+
+my ($dest, $port, $iaddr, $paddr, $proto, $line);
+
+$dest = "localhost";
+$port = "2001";
+
+$iaddr = inet_aton($dest)                   || Error("no host: $dest");
+$paddr = sockaddr_in($port, $iaddr);
+
+$proto = getprotobyname('tcp');
+socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
+connect(SOCK, $paddr)                       || Error("connect: $!");
+select (SOCK); $| = 1;
+$a=<SOCK>;
+
+for (;;)
+  {
+    open (FI,"/tmp/vdr-keys");
+    while (<FI>)
+      {
+	chomp;
+	print "$_\r\n";
+	$a=<SOCK>;
+      }
+    close (FI);
+  }
+
+print "quit\r\n";
+$a=<SOCK>;
+close (SOCK)                                || Error("close: $!");
+
+sub Error
+{
+  print STDERR "@_\n";
+  exit 0;
+}
diff --git a/Tools/schnitt/vdr2 b/Tools/schnitt/vdr2
new file mode 100755
index 000000000..96557bf2f
--- /dev/null
+++ b/Tools/schnitt/vdr2
@@ -0,0 +1,2 @@
+#!/bin/sh
+irpty ~/.lircrc-vdr -- vdr -c /home/ms/.vdr -v /video/video0
diff --git a/Tools/schnitt/vmount b/Tools/schnitt/vmount
new file mode 100755
index 000000000..6b7906473
--- /dev/null
+++ b/Tools/schnitt/vmount
@@ -0,0 +1,18 @@
+#!/bin/sh
+count=1
+cond=0
+
+if [ -f "$1" ]; then
+  mount "$1" /mnt/1 -o loop
+  $cond = 1
+else
+  while [ "$cond" != "1" ]
+  do
+    if [ -f "$1$count" ]; then
+      mount "$1$count" /mnt/$count -o loop
+    else
+      cond=1
+    fi
+    let count=count+1
+  done
+fi
diff --git a/channels.conf b/channels.conf
index 43e69cd6f..4947f8238 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,148 +1,174 @@
-RTL:12188:h:0:27500:163:104:0:12003
-Sat.1:12480:v:0:27500:1791:1792:0:46
-Pro-7:12480:v:0:27500:255:256:0:898
-RTL2:12188:h:0:27500:166:128:0:12020
-ARD:11837:h:0:27500:101:102:0:28106
-BR3:11837:h:0:27500:201:202:0:28107
-Hessen-3:11837:h:0:27500:301:302:0:28108
-N3:12110:h:0:27500:2401:2402:0:28224
-SR3:11837:h:0:27500:501:502:0:28110
-WDR:11837:h:0:27500:601:602:0:28111
-BR-alpha:11837:h:0:27500:701:702:0:28112
-SWR BW:11837:h:0:27500:801:802:0:28113
-Phoenix:11837:h:0:27500:901:902:0:28114
-ZDF:11954:h:0:27500:110:120:0:28006
-3sat:11954:h:0:27500:210:220:0:28007
-KiKa:11954:h:0:27500:310:320:0:28008
-arte:11836:h:0:27500:401:402:0:28109
-ORF Sat:11954:h:0:27500:506:507:0:28010
-ZDF.info:11954:h:0:27500:610:620:0:28011
-CNN:12168:v:0:27500:165:100:0:28512
-Super RTL:12188:h:0:27500:165:120:0:12040
-VOX:12188:h:0:27500:167:136:0:12060
-DW TV:12363:v:0:27500:305:306:0:8905
-Kabel 1:12480:v:0:27500:511:512:0:899
-tm3:12480:v:0:27500:767:768:0:897
-DSF:12480:v:0:27500:1023:1024:0:900
-HOT:12480:v:0:27500:1279:1280:0:40
-Bloomberg TV Germany:12551:v:0:22000:162:99:0:12160
-BLOOMBERG TV:11817:v:0:27500:163:92:0:8004
-Bloomberg:12168:v:0:27500:167:112:0:12721
-Sky News:12552:v:0:22000:305:306:0:3995
-KinderNet:12574:h:0:22000:163:92:0:5020
-Alice:12610:v:0:22000:162:96:0:12200
-n-tv:12669:v:0:22000:162:96:0:12730
-Grand Tourisme:12670:v:0:22000:289:290:0:17300
-TW1:12692:h:0:22000:166:167:0:13013
-Eurosport:11954:h:0:27500:410:420:0:28009
-EinsExtra:12110:h:0:27500:101:102:0:28201
-EinsFestival:12110:h:0:27500:201:202:0:28202
-EinsMuXx:12110:h:0:27500:301:302:0:28203
-ZDF Theaterkanal:11954:h:0:27500:1110:1120:0:28016
-ZDF.doku:11954:h:0:27500:660:670:0:28014
-MDR:12110:h:0:27500:401:402:0:28204
-NICK-PARAMOUNT:12246:v:0:27500:167:108:0:29312
-ORB:12110:h:0:27500:501:502:0:28205
-B1:12110:h:0:27500:601:602:0:28206
-ARD Online-Kanal:12722:h:0:22000:8191:701:0:0
+RTL:12188:h:0:27500:163:104:32:0:12003
+Sat.1:12480:v:0:27500:1791:1792:34:0:46
+Pro-7:12480:v:0:27500:255:256:32:0:898
+RTL2:12188:h:0:27500:166:128:68:0:12020
+ARD:11837:h:0:27500:101:102:0:0:28106
+BR3:11837:h:0:27500:201:202:0:0:28107
+Hessen-3:11837:h:0:27500:301:302:0:0:28108
+N3:12110:h:0:27500:2401:2402:0:0:28224
+SR3:11837:h:0:27500:501:502:0:0:28110
+WDR:11837:h:0:27500:601:602:0:0:28111
+BR-alpha:11837:h:0:27500:701:702:0:0:28112
+SWR BW:11837:h:0:27500:801:802:0:0:28113
+Phoenix:11837:h:0:27500:901:902:0:0:28114
+ZDF:11954:h:0:27500:110:120:130:0:28006
+3sat:11954:h:0:27500:210:220:230:0:28007
+KiKa:11954:h:0:27500:310:320:0:0:28008
+arte:11836:h:0:27500:401:402:0:0:28109
+ORF1:12692:h:0:22000:160:161:165:3:13001
+ORF2:12692:h:0:22000:500:501:505:3:13007
+ORF Sat:11954:h:0:27500:506:507:0:0:28010
+ZDF.info:11954:h:0:27500:610:620:0:0:28011
+CNN:12168:v:0:27500:165:100:0:0:28512
+Super RTL:12188:h:0:27500:165:120:65:0:12040
+VOX:12188:h:0:27500:167:136:0:0:12060
+DW TV:12363:v:0:27500:305:306:0:0:8905
+Kabel 1:12480:v:0:27500:511:512:33:0:899
+tm3:12480:v:0:27500:767:768:0:0:897
+DSF:12480:v:0:27500:1023:1024:0:0:900
+HOT:12480:v:0:27500:1279:1280:0:0:40
+Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
+BLOOMBERG TV:11817:v:0:27500:163:92:0:0:8004
+Bloomberg:12168:v:0:27500:167:112:0:0:12721
+Sky News:12552:v:0:22000:305:306:0:0:3995
+KinderNet:12574:h:0:22000:163:92:0:0:5020
+Alice:12610:v:0:22000:162:96:0:0:12200
+n-tv:12669:v:0:22000:162:96:55:0:12730
+Grand Tourisme:12670:v:0:22000:289:290:0:0:17300
+TW1:12692:h:0:22000:166:167:0:0:13013
+Eurosport:11954:h:0:27500:410:420:0:0:28009
+EinsExtra:12110:h:0:27500:101:102:0:0:28201
+EinsFestival:12110:h:0:27500:201:202:0:0:28202
+EinsMuXx:12110:h:0:27500:301:302:0:0:28203
+ZDF Theaterkanal:11954:h:0:27500:1110:1120:0:0:28016
+ZDF.doku:11954:h:0:27500:660:670:0:0:28014
+MDR:12110:h:0:27500:401:402:0:0:28204
+NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
+ORB:12110:h:0:27500:501:502:0:0:28205
+B1:12110:h:0:27500:601:602:0:0:28206
+ARD Online-Kanal:12722:h:0:22000:8191:701:0:0:0
 :Premiere World
-Premiere World Promo:11798:h:0:27500:255:256:0:8
-Premiere:11798:h:0:27500:511:512:2:10
-Star Kino:11798:h:0:27500:767:768:2:9
-Cine Action:11798:h:0:27500:1023:1024:2:20
-Cine Comedy:11798:h:0:27500:1279:1280:2:29
-Sci Fantasy:11798:h:0:27500:1535:1536:2:41
-Romantic Movies:11798:h:0:27500:1791:1792:2:11
-Studio Universal:11798:h:0:27500:2047:2048:2:21
-13th Street:11797:h:0:27500:2303:2304:2:43
-Junior:12031:h:0:27500:255:256:2:19
-K-Toon:12032:h:0:27500:511:512:2:12
-Disney Channel:12031:h:0:27500:767:768:2:15
-Fox Kids:11798:h:0:27500:255:256:2:0
-Sunset:12031:h:0:27500:1023:1024:2:16
-Comedy:12031:h:0:27500:1279:1280:2:28
-Planet:12031:h:0:27500:2047:2048:2:13
-Discovery Channel:12031:h:0:27500:1791:1792:2:14
-Krimi&Co:12031:h:0:27500:1535:1536:2:23
-Filmpalast:12090:v:0:27500:255:256:2:36
-Heimatkanal:11758:h:0:27500:2815:2816:2:517
-Goldstar:11758:h:0:27500:3839:3840:2:518
-Classica:12090:v:0:27500:767:768:2:34
-Seasons:12090:v:0:27500:511:512:2:33
-Blue Channel:11758:h:0:27500:2559:2560:2:516
-Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:2:242
-Feed (F1 Data):11720:h:0:27500:3071:3072:2:244
-Feed (F1 Multi):11720:h:0:27500:2815:2816:2:243
-Feed (F1 On Board):11720:h:0:27500:2303:2304:2:241
-Feed (F1 Verfolger):11720:h:0:27500:2047:2048:2:240
+Premiere World Promo:11798:h:0:27500:255:256:0:0:8
+Premiere:11798:h:0:27500:511:512:0:3:10
+Star Kino:11798:h:0:27500:767:768:0:3:9
+Cine Action:11798:h:0:27500:1023:1024:0:3:20
+Cine Comedy:11798:h:0:27500:1279:1280:0:3:29
+Sci Fantasy:11798:h:0:27500:1535:1536:0:3:41
+Romantic Movies:11798:h:0:27500:1791:1792:0:3:11
+Studio Universal:11798:h:0:27500:2047:2048:0:3:21
+13th Street:11797:h:0:27500:2303:2304:0:3:43
+Junior:12031:h:0:27500:255:256:0:3:19
+K-Toon:12032:h:0:27500:511:512:0:3:12
+Disney Channel:12031:h:0:27500:767:768:0:3:15
+Fox Kids:11798:h:0:27500:255:256:0:3:0
+Sunset:12031:h:0:27500:1023:1024:0:3:16
+Comedy:12031:h:0:27500:1279:1280:0:3:28
+Planet:12031:h:0:27500:2047:2048:0:3:13
+Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
+Krimi&Co:12031:h:0:27500:1535:1536:0:3:23
+Filmpalast:12090:v:0:27500:255:256:0:3:36
+Heimatkanal:11758:h:0:27500:2815:2816:0:3:517
+Goldstar:11758:h:0:27500:3839:3840:0:3:518
+Classica:12090:v:0:27500:767:768:0:3:34
+Seasons:12090:v:0:27500:511:512:0:3:33
+Blue Channel:11758:h:0:27500:2559:2560:0:3:516
+Cinedom 1A de:12070:h:0:27500:1279:1280:0:3:188
+Cinedom 1A en:12070:h:0:27500:1279:1281:0:3:188
+Cinedom 1B:12070:h:0:27500:1791:1792:0:3:191
+Cinedom 1C:12070:h:0:27500:767:768:0:3:185
+Cinedom 1D:11758:h:0:27500:511:512:0:3:178
+Cinedom 1E:11720:h:0:27500:1535:1537:0:3:176
+Cinedom 2A:12070:h:0:27500:1535:1536:0:3:189
+Cinedom 2B:12070:h:0:27500:511:512:0:3:184
+Cinedom 2C:11758:h:0:27500:767:768:0:3:179
+Cinedom 2D:11758:h:0:27500:1023:1024:0:3:193
+Cinedom 2E:11720:h:0:27500:1279:1280:0:3:183
+Cinedom 3A:11758:h:0:27500:255:256:0:3:177
+Cinedom 3B:11758:h:0:27500:1279:1280:0:3:194
+Cinedom 3C:12090:v:0:27500:1279:1280:17689:3:192
+Cinedom 3D:11720:h:0:27500:511:512:0:3:180
+Cinedom 3E:11720:h:0:27500:1023:1024:0:3:182
+Cinedom 4A:11758:h:0:27500:1535:1536:0:3:195
+Cinedom 4B:12032:h:0:27500:2559:2560:0:3:187
+Cinedom 4C:11720:h:0:27500:767:768:0:3:181
+Cinedom 4D:11720:h:0:27500:1791:1792:0:3:190
+Cinedom 4E:12070:h:0:27500:1023:1025:0:3:186
+Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
+Blue Movie 2:11758:h:0:27500:2047:2048:0:3:514
+Blue Movie 3:11758:h:0:27500:2303:2304:0:3:515
+Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:0:3:242
+Feed (F1 Data):11720:h:0:27500:3071:3072:0:3:244
+Feed (F1 Multi):11720:h:0:27500:2815:2816:0:3:243
+Feed (F1 On Board):11720:h:0:27500:2303:2304:0:3:241
+Feed (F1 Verfolger):11720:h:0:27500:2047:2048:0:3:240
 :
-TV Niepokalanow:11876:h:0:27500:305:321:0:20601
-Mosaico:11934:v:0:27500:165:100:0:29010
-Andalucia TV:11934:v:0:27500:166:104:0:29011
-TVC Internacional:11934:v:0:27500:167:108:0:0
-Nasza TV:11992:h:0:27500:165:98:0:0
-WishLine test:12012:v:0:27500:163:90:0:0
-Pro 7 Austria:12051:v:0:27500:161:84:0:0
-Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0
-Kabel 1 Austria:12051:v:0:27500:166:167:0:0
-Pro 7 Schweiz:12051:v:0:27500:289:290:0:0
-Kiosque:12129:v:0:27500:160:80:0:0
-KTO:12129:v:0:27500:170:120:0:0
-TCM:12168:v:0:27500:160:80:0:0
-Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0
-TVBS Europe:12168:v:0:27500:162:88:0:0
-TVBS Europe:12168:v:0:27500:162:89:0:0
-Travel:12168:v:0:27500:163:92:0:0
-TCM Espania:12168:v:0:27500:164:96:0:0
-MTV Spain:12168:v:0:27500:167:112:0:0
-TCM France:12168:v:0:27500:169:64:0:0
-RTL2 CH:12188:h:0:27500:164:112:0:0
-La Cinquieme:12207:v:0:27500:160:80:0:0
-ARTE:12207:v:0:27500:165:100:0:0
-Post Filial TV:12226:h:0:27500:255:256:0:0
-Canal Canaris:12246:v:0:27500:160:80:0:0
-Canal Canaris:12246:v:0:27500:160:81:0:0
-Canal Canaris:12246:v:0:27500:160:82:0:0
-Canal Canaris:12246:v:0:27500:160:83:0:0
-AB Sat Passion promo:12266:h:0:27500:160:80:0:0
-AB Channel 1:12266:h:0:27500:161:84:0:0
-Taquilla 0:12285:v:0:27500:165:100:0:0
-CSAT:12324:v:0:27500:160:80:0:0
-Mosaique:12324:v:0:27500:162:88:0:0
-Mosaique 2:12324:v:0:27500:163:92:0:0
-Mosaique 3:12324:v:0:27500:164:96:0:0
-Le Sesame C+:12324:v:0:27500:165:1965:0:0
-FEED:12344:h:0:27500:163:92:0:0
-RTM 1:12363:v:0:27500:162:96:0:0
-ESC 1:12363:v:0:27500:163:104:0:0
-TV5 Europe:12363:v:0:27500:164:112:0:0
-TV7 Tunisia:12363:v:0:27500:166:128:0:0
-ARTE:12363:v:0:27500:167:137:0:0
-RAI Uno:12363:v:0:27500:289:290:0:8904
-RTP International:12363:v:0:27500:300:301:0:0
-Fashion TV:12402:v:0:27500:163:92:0:0
-VideoService:12422:h:0:27500:255:256:0:0
-Beta Research promo:12422:h:0:27500:1023:1024:0:0
-Canal Canarias:12441:v:0:27500:160:80:0:0
-TVC International:12441:v:0:27500:512:660:0:0
-Fitur:12441:v:0:27500:514:662:0:0
-Astra Info 1:12552:v:0:22000:164:112:0:0
-Astra Info 2:12552:v:0:22000:165:120:0:0
-Astra Vision 1:12552:v:0:22000:168:144:0:0
-Astra Vision 1:12552:v:0:22000:168:145:0:0
-Astra Vision 1:12552:v:0:22000:168:146:0:0
-Astra Vision 1:12552:v:0:22000:168:147:0:0
-Astra Vision 1:12552:v:0:22000:168:148:0:0
-Astra Vision 1:12552:v:0:22000:168:149:0:0
-Astra Vision 1:12552:v:0:22000:168:150:0:0
-RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0
-Astra Mosaic:12552:v:0:22000:175:176:0:0
-MHP test:12604:h:0:22000:5632:8191:0:0
-VERONICA:12574:h:0:22000:161:84:0:5010
-VH1 Classic:12699:v:0:22000:3071:3072:0:28647
-VH-1 Germany:12699:v:0:22000:3081:3082:0:28648
-Via 1 - Sch�ner Reisen:12148:h:0:27500:511:512:0:44
-Video Italia:12610:v:0:22000:121:122:0:12220
-AC 3 promo:12670:v:0:22000:308:256:0:0
-ORF/ZDF:12699:h:0:22000:506:507:0:13012
-VIVA:12670:v:0:22000:309:310:0:12732
+TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
+Mosaico:11934:v:0:27500:165:100:0:0:29010
+Andalucia TV:11934:v:0:27500:166:104:0:0:29011
+TVC Internacional:11934:v:0:27500:167:108:0:0:0
+Nasza TV:11992:h:0:27500:165:98:0:0:0
+WishLine test:12012:v:0:27500:163:90:0:0:0
+Pro 7 Austria:12051:v:0:27500:161:84:0:0:0
+Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0:0
+Kabel 1 Austria:12051:v:0:27500:166:167:0:0:0
+Pro 7 Schweiz:12051:v:0:27500:289:290:0:0:0
+Kiosque:12129:v:0:27500:160:80:0:0:0
+KTO:12129:v:0:27500:170:120:0:0:0
+TCM:12168:v:0:27500:160:80:0:0:0
+Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0:0
+TVBS Europe:12168:v:0:27500:162:88:0:0:0
+TVBS Europe:12168:v:0:27500:162:89:0:0:0
+Travel:12168:v:0:27500:163:92:0:0:0
+TCM Espania:12168:v:0:27500:164:96:0:0:0
+MTV Spain:12168:v:0:27500:167:112:0:0:0
+TCM France:12168:v:0:27500:169:64:0:0:0
+RTL2 CH:12188:h:0:27500:164:112:0:0:0
+La Cinquieme:12207:v:0:27500:160:80:0:0:0
+ARTE:12207:v:0:27500:165:100:0:0:0
+Post Filial TV:12226:h:0:27500:255:256:0:0:0
+Canal Canaris:12246:v:0:27500:160:80:0:0:0
+Canal Canaris:12246:v:0:27500:160:81:0:0:0
+Canal Canaris:12246:v:0:27500:160:82:0:0:0
+Canal Canaris:12246:v:0:27500:160:83:0:0:0
+AB Sat Passion promo:12266:h:0:27500:160:80:0:0:0
+AB Channel 1:12266:h:0:27500:161:84:0:0:0
+Taquilla 0:12285:v:0:27500:165:100:0:0:0
+CSAT:12324:v:0:27500:160:80:0:0:0
+Mosaique:12324:v:0:27500:162:88:0:0:0
+Mosaique 2:12324:v:0:27500:163:92:0:0:0
+Mosaique 3:12324:v:0:27500:164:96:0:0:0
+Le Sesame C+:12324:v:0:27500:165:1965:0:0:0
+FEED:12344:h:0:27500:163:92:0:0:0
+RTM 1:12363:v:0:27500:162:96:0:0:0
+ESC 1:12363:v:0:27500:163:104:0:0:0
+TV5 Europe:12363:v:0:27500:164:112:0:0:0
+TV7 Tunisia:12363:v:0:27500:166:128:0:0:0
+ARTE:12363:v:0:27500:167:137:0:0:0
+RAI Uno:12363:v:0:27500:289:290:0:0:8904
+RTP International:12363:v:0:27500:300:301:0:0:0
+Fashion TV:12402:v:0:27500:163:92:0:0:0
+VideoService:12422:h:0:27500:255:256:0:0:0
+Beta Research promo:12422:h:0:27500:1023:1024:0:0:0
+Canal Canarias:12441:v:0:27500:160:80:0:0:0
+TVC International:12441:v:0:27500:512:660:0:0:0
+Fitur:12441:v:0:27500:514:662:0:0:0
+Astra Info 1:12552:v:0:22000:164:112:0:0:0
+Astra Info 2:12552:v:0:22000:165:120:0:0:0
+Astra Vision 1:12552:v:0:22000:168:144:0:0:0
+Astra Vision 1:12552:v:0:22000:168:145:0:0:0
+Astra Vision 1:12552:v:0:22000:168:146:0:0:0
+Astra Vision 1:12552:v:0:22000:168:147:0:0:0
+Astra Vision 1:12552:v:0:22000:168:148:0:0:0
+Astra Vision 1:12552:v:0:22000:168:149:0:0:0
+Astra Vision 1:12552:v:0:22000:168:150:0:0:0
+RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0:0
+Astra Mosaic:12552:v:0:22000:175:176:0:0:0
+MHP test:12604:h:0:22000:5632:8191:0:0:0
+VERONICA:12574:h:0:22000:161:84:0:0:5010
+VH1 Classic:12699:v:0:22000:3071:3072:0:0:28647
+VH-1 Germany:12699:v:0:22000:3081:3082:0:0:28648
+Via 1 - Sch�ner Reisen:12148:h:0:27500:511:512:0:0:44
+Video Italia:12610:v:0:22000:121:122:0:0:12220
+AC 3 promo:12670:v:0:22000:308:256:0:0:0
+ORF/ZDF:12699:h:0:22000:506:507:0:0:13012
+VIVA:12670:v:0:22000:309:310:0:0:12732
diff --git a/channels.conf.cable b/channels.conf.cable
new file mode 100644
index 000000000..93fc3761d
--- /dev/null
+++ b/channels.conf.cable
@@ -0,0 +1,134 @@
+Leitseite:346:h:0:6900:2254:0:0:5004
+Extreme Sport:346:h:0:6900:801:802:0:0
+Bloomberg:346:h:0:6900:811:812:0:0
+Fashion TV:346:h:0:6900:821:822:0:0
+LANDSCAPE:346:h:0:6900:831:832:0:0
+BET ON JAZZ:346:h:0:6900:841:842:0:0
+Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:50705
+Single TV:346:h:0:6900:621:622:0:0
+HomeNet:346:h:0:6900:0:0:0:0
+Einstein:346:h:0:6900:623:624:0:0
+BLUE CHANNEL:354:h:0:6900:2559:2560:0:0
+GOLDSTAR TV:354:h:0:6900:3839:3840:1:0
+HEIMATKANAL:354:h:0:6900:2815:2816:1:0
+100,6:354:h:0:6900:0:1312:0:0
+SPORT 1:362:h:0:6900:255:256:1:0
+LOVE SONGS:362:h:0:6900:0:320:1:0
+MUSICALS:362:h:0:6900:0:336:1:0
+EASY LISTENING:362:h:0:6900:0:304:1:0
+HITLISTE:362:h:0:6900:0:784:1:0
+ALTERNATIVE ROCK:362:h:0:6900:0:800:1:0
+DANCE:362:h:0:6900:0:816:1:0
+COUNTRY:362:h:0:6900:0:352:1:0
+CLASSIC ROCK:362:h:0:6900:0:544:1:0
+FILMMUSIK:362:h:0:6900:3552:368:1:0
+DEUTSCHE HITS:362:h:0:6900:3552:384:1:0
+SOUL CLASSICS:362:h:0:6900:3439:400:1:0
+T�RK M�ZIGI:362:h:0:6900:0:560:1:0
+GOLD:362:h:0:6900:0:576:1:0
+KLASSIK POPUL�R:362:h:0:6900:3552:592:1:0
+KLASS. SYMPHONIEN:362:h:0:6900:0:608:1:0
+OPER & VOKALMUSIK:362:h:0:6900:0:624:1:0
+BAROCKMUSIK:362:h:0:6900:0:640:1:0
+JAZZ:362:h:0:6900:0:656:1:0
+Videotext:362:h:0:6900:0:0:0:0
+PREMIERE WORLD:370:h:0:6900:255:256:0:10
+PREMIERE:370:h:0:6900:511:0:1:0
+STAR KINO:370:h:0:6900:767:768:1:0
+CINE ACTION:370:h:0:6900:1023:1024:1:0
+CINE COMEDY:370:h:0:6900:1279:1280:1:0
+SCI-FANTASY:370:h:0:6900:1535:1536:1:0
+ROMANTIC MOVIES:370:h:0:6900:1791:1792:1:0
+STUDIO UNIVERSAL:370:h:0:6900:2047:2048:1:0
+13 TH STREET:370:h:0:6900:2303:2304:1:0
+FOX KIDS:370:h:0:6900:2559:2560:1:0
+DISNEY CHANNEL:378:h:0:6900:767:768:1:0
+SUNSET:378:h:0:6900:1023:1024:1:0
+COMEDY:378:h:0:6900:1279:1280:1:0
+KRIMI &CO:378:h:0:6900:1535:1536:1:0
+DISCOVERY CHANNEL:378:h:0:6900:1791:1792:1:0
+PLANET:378:h:0:6900:2047:2048:1:0
+SUPERDOM:378:h:0:6900:2303:2304:1:0
+VCR-Setup:378:h:0:6900:0:0:0:0
+Modem-Setup:378:h:0:6900:0:0:0:0
+SCHLAGER:378:h:0:6900:0:320:1:0
+VOLKSMUSIK:378:h:0:6900:0:336:1:0
+OLD GOLD:378:h:0:6900:0:304:1:0
+TM V1.0:378:h:0:6900:0:0:1:0
+JUNIOR:378:h:0:6900:255:256:1:0
+KICK 1:386:h:0:6900:255:256:1:0
+KICK 2:386:h:0:6900:2559:2560:1:0
+ZDF.digitext:394:h:0:6900:0:0:0:0
+ZDF:394:h:0:6900:110:120:0:28006
+DLR-Berlin:394:h:0:6900:0:710:0:0
+DLF-K�ln:394:h:0:6900:0:810:0:0
+3sat:394:h:0:6900:210:0:0:28007
+KiKa:394:h:0:6900:0:0:0:28008
+Eurosport:394:h:0:6900:410:0:0:28009
+ZDF.info:394:h:0:6900:610:620:0:28011
+EuroNews:394:h:0:6900:2221:2233:0:28015
+ZDF Theaterkanal:394:h:0:6900:1110:0:0:0
+ZDF.doku:394:h:0:6900:660:670:0:28014
+SEASONS:402:h:0:6900:1040:1044:1:0
+CLASSICA:402:h:0:6900:1030:1034:1:0
+FILMPALAST:402:h:0:6900:1050:1054:1:0
+Blockmaster:402:h:0:6900:0:0:1:0
+Test-R:410:h:0:6900:901:0:0:0
+Bayerisches FS:410:h:0:6900:201:202:0:0
+Bayern 4 Klassik:410:h:0:6900:0:3001:0:0
+B5 aktuell:410:h:0:6900:0:3101:0:0
+WDR FERNSEHEN:410:h:0:6900:601:602:0:28111
+Bremen 2:410:h:0:6900:0:3801:0:0
+arte:410:h:0:6900:401:402:0:28109
+Bayern 1:410:h:0:6900:0:3601:0:0
+NDR 4 Info:410:h:0:6900:0:3701:0:0
+SR Fernsehen Suedwest:410:h:0:6900:501:502:0:28110
+SR 1:410:h:0:6900:0:3901:0:0
+Das Erste:410:h:0:6900:101:102:0:28106
+HR2 plus:410:h:0:6900:0:3401:0:0
+HR2:410:h:0:6900:0:3301:0:0
+hessen fernsehen:410:h:0:6900:301:302:0:28108
+hr-chronos:410:h:0:6900:0:3201:0:0
+HR XXL:410:h:0:6900:0:3501:0:0
+hessen:10160:h:1:6900:301:302:0:28108
+BR:10160:h:1:6900:201:202:0:28107
+BR-alpha:410:h:0:6900:701:702:0:28112
+SWR Fernsehen:410:h:0:6900:801:802:0:28113
+Phoenix:410:h:0:6900:901:902:0:0
+ARD-Online-Kanal:426:h:0:6900:0:1805:0:0
+EinsExtra:426:h:0:6900:101:102:0:28201
+EinsFestival:426:h:0:6900:201:202:0:28202
+EinsMuXx:426:h:0:6900:301:302:0:28203
+MDR FERNSEHEN:426:h:0:6900:401:402:0:28204
+ORB-Fernsehen:426:h:0:6900:501:502:0:28205
+B1 Berlin:426:h:0:6900:601:602:0:28206
+Radio 3:426:h:0:6900:0:701:0:0
+MDR KULTUR:426:h:0:6900:0:801:0:0
+Fritz:426:h:0:6900:0:901:0:0
+JUMP:426:h:0:6900:0:1001:0:0
+MDR info:426:h:0:6900:0:1101:0:0
+SPUTNIK:426:h:0:6900:0:1201:0:0
+SFB4 Multikulti:426:h:0:6900:0:1301:0:0
+SWR-2:426:h:0:6900:0:1401:0:0
+WDR3:426:h:0:6900:0:1501:0:0
+WDR 5:426:h:0:6900:0:1601:0:0
+N3:426:h:0:6900:2401:2402:0:0
+ORF:394:h:1:6900:506:507:0:28010
+TV Polonia:434:h:0:6900:641:642:0:0
+Kanal D:434:h:0:6900:651:652:0:0
+RTP international:434:h:0:6900:661:662:0:0
+ATV:434:h:0:6900:631:632:0:0
+ERT-Sat:434:h:0:6900:691:692:0:0
+MV-Test:442:h:0:6900:0:0:0:0
+ZEE TV:442:h:0:6900:517:773:0:0
+NTV i:442:h:0:6900:514:515:0:0
+All Jazz:442:h:0:6900:0:535:0:0
+Cristal New Age:442:h:0:6900:0:536:0:0
+Movie Sounds:442:h:0:6900:0:537:0:0
+Sinfonica:442:h:0:6900:0:538:0:0
+Opernfestival:442:h:0:6900:0:539:0:0
+Barock Fantasie:442:h:0:6900:0:540:0:0
+Musica Camerata:442:h:0:6900:0:541:0:0
+Musica Antica:442:h:0:6900:0:542:0:0
+Adagio:442:h:0:6900:0:543:0:0
+Jazz Legends:442:h:0:6900:0:544:0:0
diff --git a/config.c b/config.c
index 5838c68c0..66eb1780e 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.39 2001/01/14 15:29:15 kls Exp $
+ * $Id: config.c 1.43 2001/02/24 13:20:18 kls Exp $
  */
 
 #include "config.h"
@@ -199,6 +199,7 @@ cChannel::cChannel(const cChannel *Channel)
   srate        = Channel ? Channel->srate        : 27500;
   vpid         = Channel ? Channel->vpid         : 255;
   apid         = Channel ? Channel->apid         : 256;
+  tpid         = Channel ? Channel->tpid         : 32;
   ca           = Channel ? Channel->ca           : 0;
   pnr          = Channel ? Channel->pnr          : 0;
   groupSep     = Channel ? Channel->groupSep     : false;
@@ -216,7 +217,7 @@ const char *cChannel::ToText(cChannel *Channel)
   if (Channel->groupSep)
      asprintf(&buffer, ":%s\n", s);
   else
-     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->ca, Channel->pnr);
+     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->tpid, Channel->ca, Channel->pnr);
   return buffer;
 }
 
@@ -239,8 +240,15 @@ bool cChannel::Parse(const char *s)
      }
   else {
      groupSep = false;
-     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr);
-     if (fields == 9) {
+     //XXX
+     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &tpid, &ca, &pnr);
+     if (fields >= 9) {
+        if (fields == 9) {
+           // allow reading of old format
+           pnr = ca;
+           ca = tpid;
+           tpid = 0;
+           }
         strn0cpy(name, buffer, MaxChannelName);
         delete buffer;
         }
@@ -265,7 +273,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
         isyslog(LOG_INFO, "switching to channel %d", number);
         }
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
+         if (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid, tpid, ca, pnr))
             return true;
          esyslog(LOG_ERR, "retrying");
          }
@@ -360,7 +368,11 @@ cTimer& cTimer::operator= (const cTimer &Timer)
 const char *cTimer::ToText(cTimer *Timer)
 {
   delete buffer;
+  strreplace(Timer->file, ':', '|');
+  strreplace(Timer->summary, '\n', '|');
   asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
+  strreplace(Timer->summary, '|', '\n');
+  strreplace(Timer->file, '|', ':');
   return buffer;
 }
 
@@ -449,6 +461,8 @@ bool cTimer::Parse(const char *s)
      //TODO add more plausibility checks
      day = ParseDay(buffer1);
      strn0cpy(file, buffer2, MaxFileName);
+     strreplace(file, '|', ':');
+     strreplace(summary, '|', '\n');
      delete buffer1;
      delete buffer2;
      delete s2;
@@ -724,6 +738,8 @@ cSetup::cSetup(void)
   MarginStart = 2;
   MarginStop = 10;
   EPGScanTimeout = 5;
+  SVDRPTimeout = 300;
+  PrimaryLimit = 0;
   CurrentChannel = -1;
 }
 
@@ -744,6 +760,8 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
      else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
      else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
+     else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
+     else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
      else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
      else
         return false;
@@ -797,6 +815,8 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MarginStart        = %d\n", MarginStart);
         fprintf(f, "MarginStop         = %d\n", MarginStop);
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
+        fprintf(f, "SVDRPTimeout       = %d\n", SVDRPTimeout);
+        fprintf(f, "PrimaryLimit       = %d\n", PrimaryLimit);
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
         f.Close();
         isyslog(LOG_INFO, "saved setup to %s", FileName);
diff --git a/config.h b/config.h
index 277e957e2..60a95c3af 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.38 2001/01/14 15:29:27 kls Exp $
+ * $Id: config.h 1.42 2001/02/24 13:19:39 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.70"
+#define VDRVERSION "0.71"
 
 #define MaxBuffer 10000
 
@@ -93,6 +93,7 @@ class cChannel : public cListObject {
   int srate;
   int vpid;
   int apid;
+  int tpid;
   int ca;
   int pnr;
   int number;    // Sequence number assigned on load
@@ -268,6 +269,8 @@ class cSetup {
   int SetSystemTime;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
+  int SVDRPTimeout;
+  int PrimaryLimit;
   int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);
diff --git a/dvbapi.c b/dvbapi.c
index e583baf94..8518d7f99 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.50 2001/01/18 19:53:54 kls Exp $
+ * $Id: dvbapi.c 1.61 2001/02/24 13:13:19 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -67,7 +67,6 @@ extern "C" {
 #define DISKCHECKINTERVAL   100 // seconds
 
 #define INDEXFILESUFFIX     "/index.vdr"
-#define RESUMEFILESUFFIX    "/resume.vdr"
 #define RECORDFILESUFFIX    "/%03d.vdr"
 #define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
 
@@ -105,56 +104,6 @@ int HMSFToIndex(const char *HMSF)
   return 0;
 }
 
-// --- cResumeFile ------------------------------------------------------------
-
-cResumeFile::cResumeFile(const char *FileName)
-{
-  fileName = new char[strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1];
-  if (fileName) {
-     strcpy(fileName, FileName);
-     strcat(fileName, RESUMEFILESUFFIX);
-     }
-  else
-     esyslog(LOG_ERR, "ERROR: can't allocate memory for resume file name");
-}
-
-cResumeFile::~cResumeFile()
-{
-  delete fileName;
-}
-
-int cResumeFile::Read(void)
-{
-  int resume = -1;
-  if (fileName) {
-     int f = open(fileName, O_RDONLY);
-     if (f >= 0) {
-        if (read(f, &resume, sizeof(resume)) != sizeof(resume)) {
-           resume = -1;
-           LOG_ERROR_STR(fileName);
-           }
-        close(f);
-        }
-     else if (errno != ENOENT)
-        LOG_ERROR_STR(fileName);
-     }
-  return resume;
-}
-
-bool cResumeFile::Save(int Index)
-{
-  if (fileName) {
-     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
-     if (f >= 0) {
-        if (write(f, &Index, sizeof(Index)) != sizeof(Index))
-           LOG_ERROR_STR(fileName);
-        close(f);
-        return true;
-        }
-     }
-  return false;
-}
-
 // --- cIndexFile ------------------------------------------------------------
 
 class cIndexFile {
@@ -821,7 +770,9 @@ int cRecordBuffer::ScanVideoPacket(int *PictureType, int Offset)
 
   int Length = GetPacketLength(Offset);
   if (Length <= Available()) {
-     for (int i = Offset; i < Offset + Length; i++) {
+     int i = Offset + 8; // the minimum length of the video packet header
+     i += Byte(i) + 1;   // possible additional header bytes
+     for (; i < Offset + Length; i++) {
          if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
             switch (Byte(i + 3)) {
               case SC_PICTURE: *PictureType = GetPictureType(i);
@@ -840,8 +791,6 @@ int cRecordBuffer::Synchronize(void)
   // Positions to the start of a data block (skipping everything up to
   // an I-frame if not synced) and returns the block length.
 
-  int LastPackHeader = -1;
-
   pictureType = NO_PICTURE;
 
   //XXX remove this once the buffer is handled with two separate threads:
@@ -853,8 +802,6 @@ int cRecordBuffer::Synchronize(void)
   for (int i = 0; Available() > MINVIDEODATA && i < MINVIDEODATA; i++) {
       if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
          switch (Byte(i + 3)) {
-           case SC_PHEAD:   LastPackHeader = i;
-                            break;
            case SC_VIDEO:   {
                               int pt = NO_PICTURE;
                               int l = ScanVideoPacket(&pt, i);
@@ -862,21 +809,15 @@ int cRecordBuffer::Synchronize(void)
                                  return 0; // no useful data found, wait for more
                               if (pt != NO_PICTURE) {
                                  if (pt < I_FRAME || B_FRAME < pt) {
-                                   esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
-                                   }
+                                    esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
+                                    }
                                  else if (pictureType == NO_PICTURE) {
                                     if (!synced) {
-                                       if (LastPackHeader == 0) {
-                                          if (pt == I_FRAME)
-                                             synced = true;
-                                          }
-                                       else if (LastPackHeader > 0) {
-                                          Skip(LastPackHeader);
-                                          LastPackHeader = -1;
-                                          i = 0;
-                                          break;
+                                       if (pt == I_FRAME) {
+                                          Skip(i);
+                                          synced = true;
                                           }
-                                       else { // LastPackHeader < 0
+                                       else {
                                           Skip(i + l);
                                           i = 0;
                                           break;
@@ -885,13 +826,15 @@ int cRecordBuffer::Synchronize(void)
                                     if (synced)
                                        pictureType = pt;
                                     }
-                                 else if (LastPackHeader > 0)
-                                    return LastPackHeader;
                                  else
                                     return i;
                                  }
+                              else if (!synced) {
+                                 Skip(i + l);
+                                 i = 0;
+                                 break;
+                                 }
                               i += l - 1; // -1 to compensate for i++ in the loop!
-                              LastPackHeader = -1;
                             }
                             break;
            case SC_AUDIO:   i += GetPacketLength(i) - 1; // -1 to compensate for i++ in the loop!
@@ -1576,6 +1519,7 @@ bool cVideoCutter::Active(void)
 // --- cDvbApi ---------------------------------------------------------------
 
 int cDvbApi::NumDvbApis = 0;
+int cDvbApi::useDvbApi = 0;
 cDvbApi *cDvbApi::dvbApi[MAXDVBAPI] = { NULL };
 cDvbApi *cDvbApi::PrimaryDvbApi = NULL;
 
@@ -1645,6 +1589,12 @@ cDvbApi::~cDvbApi()
 #endif
 }
 
+void cDvbApi::SetUseDvbApi(int n)
+{
+  if (n < MAXDVBAPI)
+     useDvbApi |= (1 << n);
+}
+
 bool cDvbApi::SetPrimaryDvbApi(int n)
 {
   n--;
@@ -1659,7 +1609,7 @@ bool cDvbApi::SetPrimaryDvbApi(int n)
 
 cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
 {
-  cDvbApi *d = NULL;
+  cDvbApi *d = NULL, *dMinPriority = NULL;
   int index = Ca - 1;
   for (int i = MAXDVBAPI; --i >= 0; ) {
       if (dvbApi[i]) {
@@ -1669,13 +1619,25 @@ cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
             }
          else if (Ca == 0) { // means any device would be acceptable
             if (!d || !dvbApi[i]->Recording() || (d->Recording() && d->Priority() > dvbApi[i]->Priority()))
-               d = dvbApi[i];
+               d = dvbApi[i]; // this is one that is either not currently recording or has the lowest priority
             if (d && d != PrimaryDvbApi && !d->Recording()) // avoids the PrimaryDvbApi if possible
                break;
+            if (d && d->Recording() && d->Priority() < Setup.PrimaryLimit && (!dMinPriority || d->Priority() < dMinPriority->Priority()))
+               dMinPriority = d; // this is the one with the lowest priority below Setup.PrimaryLimit
             }
          }
       }
-  return (d && (!d->Recording() || d->Priority() < Priority || (!d->Ca() && Ca))) ? d : NULL;
+  if (d == PrimaryDvbApi) { // the PrimaryDvbApi was the only one that was free
+     if (Priority < Setup.PrimaryLimit)
+        return NULL;        // not enough priority to use the PrimaryDvbApi
+     if (dMinPriority)      // there's one that must not use the PrimaryDvbApi...
+        d = dMinPriority;   // ...so let's kick out that one
+     }
+  return (d                           // we found one...
+      && (!d->Recording()             // ...that's either not currently recording...
+          || d->Priority() < Priority // ...or has a lower priority...
+          || (!d->Ca() && Ca)))       // ...or doesn't need this card
+          ? d : NULL;
 }
 
 int cDvbApi::Index(void)
@@ -1691,33 +1653,34 @@ bool cDvbApi::Init(void)
 {
   NumDvbApis = 0;
   for (int i = 0; i < MAXDVBAPI; i++) {
-      char fileName[strlen(VIDEODEVICE) + 10];
-      sprintf(fileName, "%s%d", VIDEODEVICE, i);
-      if (access(fileName, F_OK | R_OK | W_OK) == 0) {
-         dsyslog(LOG_INFO, "probing %s", fileName);
-         int f = open(fileName, O_RDWR);
-         if (f >= 0) {
-            struct video_capability cap;
-            int r = ioctl(f, VIDIOCGCAP, &cap);
-            close(f);
-            if (r == 0 && (cap.type & VID_TYPE_DVB)) {
-               char vbiFileName[strlen(VBIDEVICE) + 10];
-               sprintf(vbiFileName, "%s%d", VBIDEVICE, i);
-               dvbApi[i] = new cDvbApi(fileName, vbiFileName);
-               NumDvbApis++;
+      if (useDvbApi == 0 || (useDvbApi & (1 << i)) != 0) {
+         char fileName[strlen(VIDEODEVICE) + 10];
+         sprintf(fileName, "%s%d", VIDEODEVICE, i);
+         if (access(fileName, F_OK | R_OK | W_OK) == 0) {
+            dsyslog(LOG_INFO, "probing %s", fileName);
+            int f = open(fileName, O_RDWR);
+            if (f >= 0) {
+               struct video_capability cap;
+               int r = ioctl(f, VIDIOCGCAP, &cap);
+               close(f);
+               if (r == 0 && (cap.type & VID_TYPE_DVB)) {
+                  char vbiFileName[strlen(VBIDEVICE) + 10];
+                  sprintf(vbiFileName, "%s%d", VBIDEVICE, i);
+                  dvbApi[NumDvbApis++] = new cDvbApi(fileName, vbiFileName);
+                  }
+               }
+            else {
+               if (errno != ENODEV)
+                  LOG_ERROR_STR(fileName);
+               break;
                }
             }
          else {
-            if (errno != ENODEV)
+            if (errno != ENOENT)
                LOG_ERROR_STR(fileName);
             break;
             }
          }
-      else {
-         if (errno != ENOENT)
-            LOG_ERROR_STR(fileName);
-         break;
-         }
       }
   PrimaryDvbApi = dvbApi[0];
   if (NumDvbApis > 0) {
@@ -2168,7 +2131,7 @@ void cDvbApi::Flush(void)
 #endif
 }
 
-bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr)
+bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr)
 {
   if (videoDev >= 0) {
      cThreadLock ThreadLock(siProcessor); // makes sure the siProcessor won't access the vbi-device while switching
@@ -2177,20 +2140,29 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
      struct frontend front;
      ioctl(videoDev, VIDIOCGFRONTEND, &front);
      unsigned int freq = FrequencyMHz;
-     front.ttk = (freq < 11700UL) ? 0 : 1;
-     if (freq < 11700UL)
-        freq -= Setup.LnbFrequLo;
-     else
-        freq -= Setup.LnbFrequHi;
-     front.pnr       = 0;
+     if (front.type == FRONT_DVBS) {
+        front.ttk = (freq < 11700UL) ? 0 : 1;
+        if (freq < 11700UL) {
+           freq -= Setup.LnbFrequLo;
+           front.ttk = 0;
+           }
+        else {
+           freq -= Setup.LnbFrequHi;
+           front.ttk = 1;
+           }
+        }
+     front.channel_flags = Ca ? DVB_CHANNEL_CA : DVB_CHANNEL_FTA;
+     front.pnr       = Pnr;
      front.freq      = freq * 1000000UL;
      front.diseqc    = Diseqc;
      front.srate     = Srate * 1000;
      front.volt      = (Polarization == 'v' || Polarization == 'V') ? 0 : 1;
      front.video_pid = Vpid;
      front.audio_pid = Apid;
+     front.tt_pid    = Tpid;
      front.fec       = 8;
      front.AFC       = 1;
+     front.qam       = 2;
      ioctl(videoDev, VIDIOCSFRONTEND, &front);
      if (front.sync & 0x1F == 0x1F) {
         if (this == PrimaryDvbApi && siProcessor)
@@ -2198,11 +2170,11 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
         currentChannel = ChannelNumber;
         // If this DVB card can't receive this channel, let's see if we can
         // use the card that actually can receive it and transfer data from there:
-        if (Ca && Ca != Index() + 1) {
+        if (this == PrimaryDvbApi && Ca && Ca != Index() + 1) {
            cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
            if (CaDvbApi) {
               if (!CaDvbApi->Recording()) {
-                 if (CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid, Ca, Pnr))
+                 if (CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid, Tpid, Ca, Pnr))
                     transferringFromDvbApi = CaDvbApi->StartTransfer(videoDev);
                  }
               }
@@ -2403,7 +2375,25 @@ cEITScanner::cEITScanner(void)
 {
   lastScan = lastActivity = time(NULL);
   currentChannel = 0;
-  lastChannel = 1;
+  lastChannel = 0;
+  numTransponders = 0;
+  transponders = NULL;
+}
+
+cEITScanner::~cEITScanner()
+{
+  delete transponders;
+}
+
+bool cEITScanner::TransponderScanned(cChannel *Channel)
+{
+  for (int i = 0; i < numTransponders; i++) {
+      if (transponders[i] == Channel->frequency)
+         return true;
+      }
+  transponders = (int *)realloc(transponders, ++numTransponders * sizeof(int));
+  transponders[numTransponders - 1] = Channel->frequency;
+  return false;
 }
 
 void cEITScanner::Activity(void)
@@ -2417,7 +2407,7 @@ void cEITScanner::Activity(void)
 
 void cEITScanner::Process(void)
 {
-  if (Channels.MaxNumber() > 1) {
+  if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         for (int i = 0; i < cDvbApi::NumDvbApis; i++) {
@@ -2428,10 +2418,12 @@ void cEITScanner::Process(void)
                      int oldCh = lastChannel;
                      int ch = oldCh + 1;
                      while (ch != oldCh) {
-                           if (ch > Channels.MaxNumber())
+                           if (ch > Channels.MaxNumber()) {
                               ch = 1;
+                              numTransponders = 0;
+                              }
                            cChannel *Channel = Channels.GetByNumber(ch);
-                           if (Channel && Channel->pnr) {
+                           if (Channel && Channel->pnr && !TransponderScanned(Channel)) {
                               if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
                                  currentChannel = DvbApi->Channel();
                               Channel->Switch(DvbApi, false);
diff --git a/dvbapi.h b/dvbapi.h
index cf0584f80..de646121e 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.30 2001/01/07 15:56:10 kls Exp $
+ * $Id: dvbapi.h 1.35 2001/02/11 10:41:10 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -33,21 +33,13 @@ typedef struct CRect {
 #define MenuLines   15
 #define MenuColumns 40
 
-class cResumeFile {
-private:
-  char *fileName;
-public:
-  cResumeFile(const char *FileName);
-  ~cResumeFile();
-  int Read(void);
-  bool Save(int Index);
-  };
-
 const char *IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
 int HMSFToIndex(const char *HMSF);
       // Converts the given string (format: "hh:mm:ss.ff") to an index.
 
+class cChannel;
+
 class cRecordBuffer;
 class cReplayBuffer;
 class cTransferBuffer;
@@ -69,12 +61,17 @@ class cDvbApi {
 public:
   ~cDvbApi();
 
-#define MAXDVBAPI 2
+#define MAXDVBAPI 4
   static int NumDvbApis;
 private:
   static cDvbApi *dvbApi[MAXDVBAPI];
+  static int useDvbApi;
 public:
   static cDvbApi *PrimaryDvbApi;
+  static void SetUseDvbApi(int n);
+         // Sets the 'useDvbApi' flag of the given DVB device.
+         // If this function is not called before Init(), all DVB devices
+         // will be used.
   static bool SetPrimaryDvbApi(int n);
          // Sets the primary DVB device to 'n' (which must be in the range
          // 1...NumDvbApis) and returns true if this was possible.
@@ -162,7 +159,7 @@ class cDvbApi {
 private:
   int currentChannel;
 public:
-  bool SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Ca, int Pnr);
+  bool SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr);
   static int CurrentChannel(void) { return PrimaryDvbApi ? PrimaryDvbApi->currentChannel : 0; }
   int Channel(void) { return currentChannel; }
 
@@ -251,8 +248,11 @@ class cEITScanner {
        };
   time_t lastScan, lastActivity;
   int currentChannel, lastChannel;
+  int numTransponders, *transponders;
+  bool TransponderScanned(cChannel *Channel);
 public:
   cEITScanner(void);
+  ~cEITScanner();
   bool Active(void) { return currentChannel; }
   void Activity(void);
   void Process(void);
diff --git a/eit.c b/eit.c
index e7c60c164..08588b06b 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.11 2000/12/03 15:33:37 kls Exp $
+ * $Id: eit.c 1.12 2001/02/24 12:12:58 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -851,7 +851,8 @@ int cEIT::ProcessEIT()
 					break;
 	
 				case EIT_COMPONENT_DESCRIPTOR	:
-					strdvbcpy(tmp, &buffer[bufact + 8], buffer[bufact + 1] - 6);
+               if (buffer[bufact + 1] > 6) // kls 2001-02-24: otherwise strncpy() causes a segfault in strdvbcpy()
+					   strdvbcpy(tmp, &buffer[bufact + 8], buffer[bufact + 1] - 6);
 					//dsyslog(LOG_INFO, "Found EIT_COMPONENT_DESCRIPTOR %c%c%c 0x%02x/0x%02x/0x%02x '%s'\n", buffer[bufact + 5], buffer[bufact + 6], buffer[bufact + 7], buffer[2], buffer[3], buffer[4], tmp);
 					break;
 	
@@ -910,6 +911,14 @@ int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
 {
 	int a = 0;
 	
+   // kls 2001-02-24: if we come in with negative values, the caller must
+   // have done something wrong and the strncpy() below will cause a segfault
+   if (max <= 0)
+   {
+      *dst = 0;
+      return 0;
+   }
+
 	if (*src == 0x05 || (*src >= 0x20 && *src <= 0xff))
 	{
 		for (a = 0; a < max; a++)
diff --git a/epg2html.pl b/epg2html.pl
old mode 100644
new mode 100755
diff --git a/i18n.c b/i18n.c
index cf1785f3a..f81a2029d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.8 2001/01/06 16:17:39 kls Exp $
+ * $Id: i18n.c 1.14 2001/02/24 13:57:14 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -161,6 +161,11 @@ const tPhrase Phrases[] = {
     "Predavajaj",
     "Riproduci",
   },
+  { "Rewind",
+    "Anfang",
+    "Zacetek",
+    "Da inizio",
+  },
   { "Resume",
     "Weiter",
     "Nadaljuj",
@@ -253,6 +258,11 @@ const tPhrase Phrases[] = {
     "Apid",
     "Apid",
   },
+  { "Tpid",
+    "Tpid",
+    "Tpid",
+    "Tpid",
+  },
   { "CA",
     "CA",
     "CA",
@@ -406,6 +416,16 @@ const tPhrase Phrases[] = {
     "Cas do EPG pregleda",
     "Timeout EPG",
   },
+  { "SVDRPTimeout",
+    "SVDRP Timeout",
+    "", // TODO
+    "Timeout SVDRP",
+  },
+  { "PrimaryLimit",
+    "Prim�r-Limit",
+    "", // TODO
+    "", // TODO
+  },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
diff --git a/interface.c b/interface.c
index ef8368ae9..55cdb0b9c 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.33 2000/12/09 11:04:10 kls Exp $
+ * $Id: interface.c 1.35 2001/02/18 10:46:13 kls Exp $
  */
 
 #include "interface.h"
@@ -26,8 +26,10 @@ cInterface::cInterface(int SVDRPport)
   rcIo = new cRcIoRCU("/dev/ttyS1");
 #elif defined(REMOTE_LIRC)
   rcIo = new cRcIoLIRC("/dev/lircd");
-#else
+#elif defined(REMOTE_KBD)
   rcIo = new cRcIoKBD;
+#else
+  rcIo = new cRcIoBase; // acts as a dummy device
 #endif
   rcIo->SetCode(Keys.code, Keys.address);
   if (SVDRPport)
@@ -68,8 +70,16 @@ unsigned int cInterface::GetCh(bool Wait, bool *Repeat, bool *Release)
 eKeys cInterface::GetKey(bool Wait)
 {
   Flush();
-  if (SVDRP)
+  if (SVDRP) {
      SVDRP->Process();
+     if (!open) {
+        char *message = SVDRP->GetMessage();
+        if (message) {
+           Info(message);
+           delete message;
+           }
+        }
+     }
   eKeys Key = keyFromWait;
   if (Key == kNone) {
      bool Repeat = false, Release = false;
@@ -279,7 +289,7 @@ void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
 void cInterface::Info(const char *s)
 {
   Open();
-  isyslog(LOG_INFO, s);
+  isyslog(LOG_INFO, "info: %s", s);
   Status(s, clrWhite, clrGreen);
   Wait();
   Status(NULL);
@@ -289,7 +299,7 @@ void cInterface::Info(const char *s)
 void cInterface::Error(const char *s)
 {
   Open();
-  esyslog(LOG_ERR, s);
+  esyslog(LOG_ERR, "ERROR: %s", s);
   Status(s, clrWhite, clrRed);
   Wait();
   Status(NULL);
diff --git a/menu.c b/menu.c
index 144233fc7..45be9eb93 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.58 2001/01/13 13:07:43 kls Exp $
+ * $Id: menu.c 1.68 2001/02/24 14:53:40 kls Exp $
  */
 
 #include "menu.h"
@@ -541,6 +541,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditIntItem( tr("Srate"),        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
      Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid, 0, 10000)); //TODO exact limits???
      Add(new cMenuEditIntItem( tr("Apid"),         &data.apid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid, 0, 10000)); //TODO exact limits???
      Add(new cMenuEditIntItem( tr("CA"),           &data.ca, 0, cDvbApi::NumDvbApis));
      Add(new cMenuEditIntItem( tr("Pnr"),          &data.pnr, 0));
      }
@@ -924,6 +925,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                         strcpy(data.file, Channels.GetChannelNameByNumber(data.channel));
                      if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
                         *timer = data;
+                        if (timer->active)
+                           timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
                         Timers.Save();
                         isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
                         }
@@ -1074,6 +1077,16 @@ eOSState cMenuTimers::Summary(void)
 
 eOSState cMenuTimers::ProcessKey(eKeys Key)
 {
+  // Must do these before calling cOsdMenu::ProcessKey() because cOsdMenu
+  // uses them to page up/down:
+  if (!HasSubMenu()) {
+     switch (Key) {
+       case kLeft:
+       case kRight:  return Activate(Key == kRight);
+       default: break;
+       }
+     }
+
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1181,13 +1194,17 @@ class cMenuWhatsOn : public cOsdMenu {
 private:
   eOSState Record(void);
   eOSState Switch(void);
+  static int currentChannel;
   static const cEventInfo *scheduleEventInfo;
 public:
-  cMenuWhatsOn(const cSchedules *Schedules, bool Now);
+  cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr);
+  static int CurrentChannel(void) { return currentChannel; }
+  static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; }
   static const cEventInfo *ScheduleEventInfo(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+int cMenuWhatsOn::currentChannel = 0;
 const cEventInfo *cMenuWhatsOn::scheduleEventInfo = NULL;
 
 static int CompareEventChannel(const void *p1, const void *p2)
@@ -1195,7 +1212,7 @@ static int CompareEventChannel(const void *p1, const void *p2)
   return (int)( (*(const cEventInfo **)p1)->GetChannelNumber() - (*(const cEventInfo **)p2)->GetChannelNumber());
 }
 
-cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now)
+cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
 :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), 4, 7, 6)
 {
   const cSchedule *Schedule = Schedules->First();
@@ -1219,8 +1236,9 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now)
   qsort(pArray, num, sizeof(cEventInfo *), CompareEventChannel);
 
   for (int a = 0; a < num; a++)
-      Add(new cMenuWhatsOnItem(pArray[a]));
+      Add(new cMenuWhatsOnItem(pArray[a]), pArray[a]->GetChannelNumber() == CurrentChannelNr);
 
+  currentChannel = CurrentChannelNr;
   delete pArray;
   SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Schedule"), tr("Switch"));
 }
@@ -1271,12 +1289,16 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      switch (Key) {
        case kRed:    return Record();
-       case kYellow: {
+       case kYellow: state = osBack;
+                     // continue with kGreen
+       case kGreen:  {
                        cMenuWhatsOnItem *mi = (cMenuWhatsOnItem *)Get(Current());
-                       if (mi)
+                       if (mi) {
                           scheduleEventInfo = mi->eventInfo;
+                          currentChannel = mi->eventInfo->GetChannelNumber();
+                          }
                      }
-                     return osBack;
+                     break;
        case kBlue:   return Switch();
        case kOk:     if (Count())
                         return AddSubMenu(new cMenuEvent(((cMenuWhatsOnItem *)Get(Current()))->eventInfo, true));
@@ -1314,7 +1336,6 @@ class cMenuSchedule : public cOsdMenu {
   eOSState Record(void);
   eOSState Switch(void);
   void PrepareSchedule(cChannel *Channel);
-  void PrepareWhatsOnNext(bool On);
 public:
   cMenuSchedule(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -1327,6 +1348,7 @@ cMenuSchedule::cMenuSchedule(void)
   otherChannel = 0;
   cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
   if (channel) {
+     cMenuWhatsOn::SetCurrentChannel(channel->number);
      schedules = cDvbApi::PrimaryDvbApi->Schedules(&threadLock);
      PrepareSchedule(channel);
      SetHelp(tr("Record"), tr("Now"), tr("Next"));
@@ -1403,14 +1425,22 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      switch (Key) {
        case kRed:    return Record();
-       case kGreen:  if (!now && !next) {
-                        now = true;
-                        return AddSubMenu(new cMenuWhatsOn(schedules, true));
-                        }
-                     now = !now;
-                     next = !next;
-                     return AddSubMenu(new cMenuWhatsOn(schedules, now));
-       case kYellow: return AddSubMenu(new cMenuWhatsOn(schedules, false));
+       case kGreen:  {
+                       if (!now && !next) {
+                          int ChannelNr = 0;
+                          if (Count()) {
+                             cChannel *channel = Channels.GetByServiceID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetServiceID());
+                             if (channel)
+                                ChannelNr = channel->number;
+                             }
+                          now = true;
+                          return AddSubMenu(new cMenuWhatsOn(schedules, true, ChannelNr));
+                          }
+                       now = !now;
+                       next = !next;
+                       return AddSubMenu(new cMenuWhatsOn(schedules, now, cMenuWhatsOn::CurrentChannel()));
+                     }
+       case kYellow: return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
        case kBlue:   return Switch();
        case kOk:     if (Count())
                         return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->eventInfo, otherChannel));
@@ -1469,7 +1499,7 @@ cMenuRecordings::cMenuRecordings(void)
            recording = Recordings.Next(recording);
            }
      }
-  SetHelp(tr("Play"), NULL, tr("Delete"), tr("Summary"));
+  SetHelp(tr("Play"), tr("Rewind"), tr("Delete"), tr("Summary"));
   Display();
 }
 
@@ -1483,6 +1513,18 @@ eOSState cMenuRecordings::Play(void)
   return osContinue;
 }
 
+eOSState cMenuRecordings::Rewind(void)
+{
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri) {
+     cDvbApi::PrimaryDvbApi->StopReplay(); // must do this first to be able to rewind the currently replayed recording
+     cResumeFile ResumeFile(ri->recording->FileName());
+     ResumeFile.Delete();
+     return Play();
+     }
+  return osContinue;
+}
+
 eOSState cMenuRecordings::Del(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
@@ -1523,6 +1565,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
      switch (Key) {
        case kOk:
        case kRed:    return Play();
+       case kGreen:  return Rewind();
        case kYellow: return Del();
        case kBlue:   return Summary();
        case kMenu:   return osEnd;
@@ -1567,6 +1610,8 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
   Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
   Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
+  Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
+  Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1614,6 +1659,7 @@ cMenuCommands::cMenuCommands(void)
         Add(new cOsdItem(command->Title()));
         i++;
         }
+  SetHasHotkeys();
 }
 
 eOSState cMenuCommands::Execute(void)
@@ -1644,18 +1690,25 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
 #define STOP_RECORDING tr("Stop recording ")
 
+static const char *hk(int n, const char *s)
+{
+  static char buffer[32];
+  snprintf(buffer, sizeof(buffer), " %d %s", n, s);
+  return buffer;
+}
+
 cMenuMain::cMenuMain(bool Replaying)
 :cOsdMenu(tr("Main"))
 {
-  Add(new cOsdItem(tr("Schedule"),   osSchedule));
-  Add(new cOsdItem(tr("Channels"),   osChannels));
-  Add(new cOsdItem(tr("Timers"),     osTimers));
-  Add(new cOsdItem(tr("Recordings"), osRecordings));
-  Add(new cOsdItem(tr("Setup"),      osSetup));
+  Add(new cOsdItem(hk(1, tr("Schedule")),   osSchedule));
+  Add(new cOsdItem(hk(2, tr("Channels")),   osChannels));
+  Add(new cOsdItem(hk(3, tr("Timers")),     osTimers));
+  Add(new cOsdItem(hk(4, tr("Recordings")), osRecordings));
+  Add(new cOsdItem(hk(5, tr("Setup")),      osSetup));
   if (Commands.Count())
-     Add(new cOsdItem(tr("Commands"),  osCommands));
+     Add(new cOsdItem(hk(6, tr("Commands")),  osCommands));
   if (Replaying)
-     Add(new cOsdItem(tr("Stop replaying"), osStopReplay));
+     Add(new cOsdItem(tr(" Stop replaying"), osStopReplay));
   const char *s = NULL;
   while ((s = cRecordControls::GetInstantId(s)) != NULL) {
         char *buffer = NULL;
@@ -1664,10 +1717,11 @@ cMenuMain::cMenuMain(bool Replaying)
         delete buffer;
         }
   if (cVideoCutter::Active())
-     Add(new cOsdItem(tr("Cancel editing"), osCancelEdit));
+     Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
   SetHelp(tr("Record"), NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
+  SetHasHotkeys();
 }
 
 eOSState cMenuMain::ProcessKey(eKeys Key)
@@ -1945,7 +1999,7 @@ bool cRecordControls::Start(cTimer *Timer)
                }
             }
         }
-     else
+     else if (!Timer || Timer->priority >= Setup.PrimaryLimit)
         esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch);
      }
   else
@@ -1999,6 +2053,15 @@ void cRecordControls::Process(void)
       }
 }
 
+bool cRecordControls::Active(void)
+{
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (RecordControls[i])
+         return true;
+      }
+  return false;
+}
+
 // --- cProgressBar ----------------------------------------------------------
 
 class cProgressBar : public cBitmap {
diff --git a/menu.h b/menu.h
index 923211115..356122e02 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.16 2000/12/25 14:25:29 kls Exp $
+ * $Id: menu.h 1.18 2001/02/11 10:30:35 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -43,6 +43,7 @@ class cMenuRecordings : public cOsdMenu {
 private:
   cRecordings Recordings;
   eOSState Play(void);
+  eOSState Rewind(void);
   eOSState Del(void);
   eOSState Summary(void);
 public:
@@ -74,6 +75,7 @@ class cRecordControls {
   static void Stop(cDvbApi *DvbApi);
   static const char *GetInstantId(const char *LastInstantId);
   static void Process(void);
+  static bool Active(void);
   };
 
 class cReplayControl : public cOsdBase {
diff --git a/osd.c b/osd.c
index bc9c94850..c29c98316 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.13 2000/11/12 15:29:25 kls Exp $
+ * $Id: osd.c 1.16 2001/02/24 16:26:11 kls Exp $
  */
 
 #include "osd.h"
@@ -77,6 +77,7 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
 
 cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
+  hasHotkeys = false;
   visible = false;
   title = strdup(Title);
   cols[0] = c0;
@@ -252,6 +253,32 @@ void cOsdMenu::CursorDown(void)
      }
 }
 
+void cOsdMenu::PageUp(void)
+{
+  if (Count() <= MAXOSDITEMS)
+     return;
+  current -= MAXOSDITEMS;
+  first -= MAXOSDITEMS;
+  if (first < 0)
+     first = current = 0;
+  Display();
+  DisplayCurrent(true);
+}
+
+void cOsdMenu::PageDown(void) 
+{
+  if (Count() <= MAXOSDITEMS)
+     return;
+  current += MAXOSDITEMS;
+  first += MAXOSDITEMS;
+  if (current > Count() - 1) {
+     current = Count() - 1;
+     first = Count() - MAXOSDITEMS;
+     }
+  Display();
+  DisplayCurrent(true);
+}
+
 void cOsdMenu::Mark(void)
 {
   if (Count() && marked < 0) {
@@ -260,6 +287,20 @@ void cOsdMenu::Mark(void)
      }
 }
 
+eOSState cOsdMenu::HotKey(eKeys Key)
+{
+  for (cOsdItem *item = First(); item; item = Next(item)) {
+      const char *s = item->Text();
+      if (s && (s = skipspace(s)) != NULL) {
+         if (*s == Key - k1 + '1') {
+            current = item->Index();
+            return ProcessKey(kOk);
+            }
+         }
+      }
+  return osContinue;
+}
+
 eOSState cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
 {
   delete subMenu;
@@ -289,10 +330,17 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
         return state;
      }
   switch (Key) {
+    case k1...k9: if (hasHotkeys)
+                     return HotKey(Key);
+                  break;
     case kUp|k_Repeat:
     case kUp:   CursorUp();   break;
     case kDown|k_Repeat:
     case kDown: CursorDown(); break;
+    case kLeft|k_Repeat:
+    case kLeft: PageUp(); break;
+    case kRight|k_Repeat:
+    case kRight: PageDown(); break;
     case kBack: return osBack;
     case kOk:   if (marked >= 0) {
                    SetStatus(NULL);
diff --git a/osd.h b/osd.h
index 16d0ec2c3..c0fb1a1ef 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.18 2000/12/24 10:16:52 kls Exp $
+ * $Id: osd.h 1.20 2001/02/03 15:13:59 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -77,6 +77,7 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
   const char *status;
+  bool hasHotkeys;
 protected:
   bool visible;
   virtual void Clear(void);
@@ -85,7 +86,10 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   void DisplayCurrent(bool Current);
   void CursorUp(void);
   void CursorDown(void);
+  void PageUp(void);
+  void PageDown(void);
   void Mark(void);
+  eOSState HotKey(eKeys Key);
   eOSState AddSubMenu(cOsdMenu *SubMenu);
   bool HasSubMenu(void) { return subMenu; }
   void SetStatus(const char *s);
@@ -95,6 +99,7 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
 public:
   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
+  void SetHasHotkeys(void) { hasHotkeys = true; }
   int Current(void) { return current; }
   void Add(cOsdItem *Item, bool Current = false);
   void Display(void);
diff --git a/recording.c b/recording.c
index 064731dfd..d6e5a333e 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.24 2001/01/13 12:17:15 kls Exp $
+ * $Id: recording.c 1.28 2001/02/18 16:14:05 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -15,16 +15,20 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "dvbapi.h"
 #include "interface.h"
 #include "tools.h"
 #include "videodir.h"
 
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
+#ifdef VFAT
+#define DATAFORMAT   "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
+#else
 #define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
+#endif
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
 
+#define RESUMEFILESUFFIX  "/resume.vdr"
 #define SUMMARYFILESUFFIX "/summary.vdr"
 #define MARKSFILESUFFIX   "/marks.vdr"
 
@@ -32,8 +36,35 @@
 
 #define MINDISKSPACE 1024 // MB
 
-#define DISKCHECKDELTA 300 // seconds between checks for free disk space
-#define REMOVELATENCY   10 // seconds to wait until next check after removing a file 
+#define DELETEDLIFETIME     1 // hours after which a deleted recording will be actually removed
+#define REMOVECHECKDELTA 3600 // seconds between checks for removing deleted files
+#define DISKCHECKDELTA    300 // seconds between checks for free disk space
+#define REMOVELATENCY      10 // seconds to wait until next check after removing a file 
+
+void RemoveDeletedRecordings(void)
+{
+  static time_t LastRemoveCheck = 0;
+  if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
+     // Remove the oldest file that has been "deleted":
+     cRecordings Recordings;
+     if (Recordings.Load(true)) {
+        cRecording *r = Recordings.First();
+        cRecording *r0 = r;
+        while (r) {
+              if (r->start < r0->start)
+                 r0 = r;
+              r = Recordings.Next(r);
+              }
+        if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 60) {
+           r0->Remove();
+           RemoveEmptyVideoDirectories();
+           LastRemoveCheck += REMOVELATENCY;
+           return;
+           }
+        }
+     LastRemoveCheck = time(NULL);
+     }
+}
 
 void AssertFreeDiskSpace(void)
 {
@@ -83,6 +114,64 @@ void AssertFreeDiskSpace(void)
      }
 }
 
+// --- cResumeFile ------------------------------------------------------------
+
+cResumeFile::cResumeFile(const char *FileName)
+{
+  fileName = new char[strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1];
+  if (fileName) {
+     strcpy(fileName, FileName);
+     strcat(fileName, RESUMEFILESUFFIX);
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: can't allocate memory for resume file name");
+}
+
+cResumeFile::~cResumeFile()
+{
+  delete fileName;
+}
+
+int cResumeFile::Read(void)
+{
+  int resume = -1;
+  if (fileName) {
+     int f = open(fileName, O_RDONLY);
+     if (f >= 0) {
+        if (read(f, &resume, sizeof(resume)) != sizeof(resume)) {
+           resume = -1;
+           LOG_ERROR_STR(fileName);
+           }
+        close(f);
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR_STR(fileName);
+     }
+  return resume;
+}
+
+bool cResumeFile::Save(int Index)
+{
+  if (fileName) {
+     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
+     if (f >= 0) {
+        if (write(f, &Index, sizeof(Index)) != sizeof(Index))
+           LOG_ERROR_STR(fileName);
+        close(f);
+        return true;
+        }
+     }
+  return false;
+}
+
+void cResumeFile::Delete(void)
+{
+  if (fileName) {
+     if (remove(fileName) < 0 && errno != ENOENT)
+        LOG_ERROR_STR(fileName);
+     }
+}
+
 // --- cRecording ------------------------------------------------------------
 
 cRecording::cRecording(cTimer *Timer)
diff --git a/recording.h b/recording.h
index 454c356f7..b561fa2f9 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.11 2000/12/16 14:25:20 kls Exp $
+ * $Id: recording.h 1.13 2001/02/11 10:45:52 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -14,8 +14,20 @@
 #include "config.h"
 #include "tools.h"
 
+void RemoveDeletedRecordings(void);
 void AssertFreeDiskSpace(void);
 
+class cResumeFile {
+private:
+  char *fileName;
+public:
+  cResumeFile(const char *FileName);
+  ~cResumeFile();
+  int Read(void);
+  bool Save(int Index);
+  void Delete(void);
+  };
+
 class cRecording : public cListObject {
   friend class cRecordings;
 private:
diff --git a/remote.c b/remote.c
index 691b5e94e..940243863 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.20 2000/12/03 11:55:06 kls Exp $
+ * $Id: remote.c 1.21 2001/02/04 19:17:59 kls Exp $
  */
 
 #include "remote.h"
@@ -428,6 +428,7 @@ void cRcIoLIRC::Action(void)
   dsyslog(LOG_INFO, "LIRC remote control thread started (pid=%d)", getpid());
 
   int FirstTime = 0;
+  int LastTime = 0;
   char buf[LIRC_BUFFER_SIZE];
   char LastKeyName[LIRC_KEY_BUF];
 
@@ -451,14 +452,17 @@ void cRcIoLIRC::Action(void)
                   continue; // repeat function kicks in after a short delay
                receivedData = receivedRepeat = true;
                }
+            LastTime = Now;
             WakeUp();
             }
          }
       else if (receivedData) { // the last data before releasing the key hasn't been fetched yet
          if (receivedRepeat) { // it was a repeat, so let's make it a release
-            receivedRepeat = false;
-            receivedRelease = true;
-            WakeUp();
+            if (time_ms() - LastTime > REPEATDELAY) {
+               receivedRepeat = false;
+               receivedRelease = true;
+               WakeUp();
+               }
             }
          }
       else if (receivedRepeat) { // all data has already been fetched, but the last one was a repeat, so let's generate a release
diff --git a/remote.h b/remote.h
index 0ea4442ae..659de1aca 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.13 2000/10/08 12:11:34 kls Exp $
+ * $Id: remote.h 1.14 2001/02/02 14:49:10 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -18,9 +18,9 @@
 class cRcIoBase {
 protected:
   time_t t;
-  cRcIoBase(void);
 public:
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  cRcIoBase(void);
   virtual ~cRcIoBase();
   virtual bool SetCode(unsigned char Code, unsigned short Address) { return true; }
   virtual bool SetMode(unsigned char Mode) { return true; }
@@ -29,8 +29,8 @@ class cRcIoBase {
   virtual bool String(char *s) { return true; }
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
   virtual void Flush(int WaitMs = 0) {}
-  virtual bool InputAvailable(void) = 0;
-  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL) = 0;
+  virtual bool InputAvailable(void) { return false; }
+  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL) { return false; }
   };
 
 #if defined REMOTE_KBD
@@ -93,7 +93,7 @@ class cRcIoLIRC : public cRcIoBase, private cThread {
   virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
   };
 
-#else
+#elif !defined REMOTE_NONE
 
 #error Please define a remote control mode!
 
diff --git a/runvdr b/runvdr
new file mode 100755
index 000000000..83b2ea62f
--- /dev/null
+++ b/runvdr
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+DVBDIR='../DVB/driver'
+VDRCMD='./vdr -w 60'
+
+while test 1; do
+#      (cd $DVBDIR; make reload)
+#      sleep 3
+      if $VDRCMD; then exit; fi
+      date
+      echo "restarting VDR"
+      sleep 10
+      done
diff --git a/svdrp.c b/svdrp.c
index 0ce30dbae..ffdac28b4 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.13 2000/12/03 15:34:35 kls Exp $
+ * $Id: svdrp.c 1.14 2001/02/18 14:18:13 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -63,6 +63,10 @@ bool cSocket::Open(void)
         port = 0;
         return false;
         }
+     // allow it to always reuse the same port:
+     int ReUseAddr = 1;
+     setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &ReUseAddr, sizeof(ReUseAddr));
+     //
      struct sockaddr_in name;
      name.sin_family = AF_INET;
      name.sin_port = htons(port);
@@ -137,6 +141,12 @@ const char *HelpPages[] = {
   "LSTT [ <number> ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed.",
+  "MESG [ <message> ]\n"
+  "    Displays the given message on the OSD. If message is omitted, the\n"
+  "    currently pending message (if any) will be returned. The message\n"
+  "    will be displayed for a few seconds as soon as the OSD has become\n"
+  "    idle. If a new MESG command is entered while the previous message\n"
+  "    has not yet been displayed, the old message will be overwritten.",
   "MODC <number> <settings>\n"
   "    Modify a channel. Settings must be in the same format as returned\n"
   "    by the LSTC command.",
@@ -224,22 +234,25 @@ const char *GetHelpPage(const char *Cmd)
 cSVDRP::cSVDRP(int Port)
 :socket(Port)
 {
+  message = NULL;
+  lastActivity = 0;
   isyslog(LOG_INFO, "SVDRP listening on port %d", Port);
 }
 
 cSVDRP::~cSVDRP()
 {
   Close();
+  delete message;
 }
 
-void cSVDRP::Close(void)
+void cSVDRP::Close(bool Timeout)
 {
   if (file.IsOpen()) {
      //TODO how can we get the *full* hostname?
      char buffer[MAXCMDBUFFER];
      gethostname(buffer, sizeof(buffer));
-     Reply(221, "%s closing connection", buffer);
-     isyslog(LOG_INFO, "closing connection"); //TODO store IP#???
+     Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
+     isyslog(LOG_INFO, "closing SVDRP connection"); //TODO store IP#???
      file.Close();
      }
 }
@@ -557,6 +570,20 @@ void cSVDRP::CmdLSTT(const char *Option)
      }
 }
 
+void cSVDRP::CmdMESG(const char *Option)
+{
+  if (*Option) {
+     delete message;
+     message = strdup(Option);
+     isyslog(LOG_INFO, "SVDRP message: '%s'", message);
+     Reply(250, "Message stored");
+     }
+  else if (message)
+     Reply(250, "%s", message);
+  else
+     Reply(550, "No pending message");
+}
+
 void cSVDRP::CmdMODC(const char *Option)
 {
   if (*Option) {
@@ -820,6 +847,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("HITK"))  CmdHITK(s);
   else if (CMD("LSTC"))  CmdLSTC(s);
   else if (CMD("LSTT"))  CmdLSTT(s);
+  else if (CMD("MESG"))  CmdMESG(s);
   else if (CMD("MODC"))  CmdMODC(s);
   else if (CMD("MODT"))  CmdMODT(s);
   else if (CMD("MOVC"))  CmdMOVC(s);
@@ -839,7 +867,8 @@ void cSVDRP::Execute(char *Cmd)
 
 void cSVDRP::Process(void)
 {
-  bool SendGreeting = !file.IsOpen();
+  bool NewConnection = !file.IsOpen();
+  bool SendGreeting = NewConnection;
 
   if (file.IsOpen() || file.Open(socket.Accept())) {
      char buffer[MAXCMDBUFFER];
@@ -849,6 +878,8 @@ void cSVDRP::Process(void)
         time_t now = time(NULL);
         Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, ctime(&now));
         }
+     if (NewConnection)
+        lastActivity = time(NULL);
      int rbytes = file.ReadString(buffer, sizeof(buffer) - 1);
      if (rbytes > 0) {
         //XXX overflow check???
@@ -859,11 +890,22 @@ void cSVDRP::Process(void)
         buffer[rbytes] = 0;
         // showtime!
         Execute(buffer);
+        lastActivity = time(NULL);
         }
      else if (rbytes < 0)
         Close();
+     else if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
+        isyslog(LOG_INFO, "timeout on SVDRP connection");
+        Close(true);
+        }
      }
 }
 
-//TODO timeout???
+char *cSVDRP::GetMessage(void)
+{
+  char *s = message;
+  message = NULL;
+  return s;
+}
+
 //TODO more than one connection???
diff --git a/svdrp.h b/svdrp.h
index 12eb11e3e..62c1e7537 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.6 2000/09/17 13:22:04 kls Exp $
+ * $Id: svdrp.h 1.7 2001/02/18 13:36:47 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -31,7 +31,9 @@ class cSVDRP {
   cSocket socket;
   cFile file;
   CRect ovlClipRects[MAXCLIPRECTS];
-  void Close(void);
+  char *message;
+  time_t lastActivity;
+  void Close(bool Timeout = false);
   bool Send(const char *s, int length = -1);
   void Reply(int Code, const char *fmt, ...);
   void CmdCHAN(const char *Option);
@@ -42,6 +44,7 @@ class cSVDRP {
   void CmdHITK(const char *Option);
   void CmdLSTC(const char *Option);
   void CmdLSTT(const char *Option);
+  void CmdMESG(const char *Option);
   void CmdMODC(const char *Option);
   void CmdMODT(const char *Option);
   void CmdMOVC(const char *Option);
@@ -59,6 +62,7 @@ class cSVDRP {
   cSVDRP(int Port);
   ~cSVDRP();
   void Process(void);
+  char *GetMessage(void);
   };
 
 #endif //__SVDRP_H
diff --git a/svdrpsend.pl b/svdrpsend.pl
new file mode 100755
index 000000000..5efd504be
--- /dev/null
+++ b/svdrpsend.pl
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+use Socket;
+use Getopt::Std;
+
+$Usage = qq{
+Usage: $0 options command...
+
+Options: -d hostname        destination hostname (default: localhost)
+         -p port            SVDRP port number (default: 2001)
+};
+
+die $Usage if (!$ARGV[0] || !getopts("d:p:"));
+
+$Dest = $opt_d  || "localhost";
+$Port = $opt_p  || 2001;
+$Cmd  = "@ARGV" || Error("missing command");
+
+$Timeout = 10; # max. seconds to wait for response
+
+$SIG{ALRM} = sub { Error("timeout"); };
+alarm($Timeout);
+
+$iaddr = inet_aton($Dest)                   || Error("no host: $Dest");
+$paddr = sockaddr_in($Port, $iaddr);
+
+$proto = getprotobyname('tcp');
+socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
+connect(SOCK, $paddr)                       || Error("connect: $!");
+select(SOCK); $| = 1;
+Receive();
+Send($Cmd);
+Send("quit");
+close(SOCK)                                 || Error("close: $!");
+
+sub Send
+{
+  my $cmd = shift || Error("no command to send");
+  print SOCK "$cmd\r\n";
+  Receive();
+}
+
+sub Receive
+{
+  while (<SOCK>) {
+        print STDOUT $_;
+        last if substr($_, 3, 1) ne "-";
+        }
+}
+
+sub Error
+{
+  print STDERR "@_\n";
+  close(SOCK);
+  exit 0;
+}
+
diff --git a/tools.c b/tools.c
index cd2c60f8a..a3b27e5a7 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.27 2001/01/13 15:35:02 kls Exp $
+ * $Id: tools.c 1.30 2001/02/11 14:44:22 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -51,7 +51,7 @@ char *strreplace(char *s, char c1, char c2)
 {
   char *p = s;
 
-  while (*p) {
+  while (p && *p) {
         if (*p == c1)
            *p = c2;
         p++;
@@ -237,8 +237,10 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
            }
         }
      dsyslog(LOG_INFO, "removing %s", FileName);
-     if (remove(FileName) == 0)
-        return true;
+     if (remove(FileName) < 0) {
+        LOG_ERROR_STR(FileName);
+        return false;
+        }
      }
   else if (errno != ENOENT) {
      LOG_ERROR_STR(FileName);
@@ -247,6 +249,48 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
   return true;
 }
 
+bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
+{
+  DIR *d = opendir(DirName);
+  if (d) {
+     bool empty = true;
+     struct dirent *e;
+     while ((e = readdir(d)) != NULL) {
+           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..") && strcmp(e->d_name, "lost+found")) {
+              char *buffer;
+              asprintf(&buffer, "%s/%s", DirName, e->d_name);
+              struct stat st;
+              if (stat(buffer, &st) == 0) {
+                 if (S_ISDIR(st.st_mode)) {
+                    if (!RemoveEmptyDirectories(buffer, true))
+                       empty = false;
+                    }
+                 else
+                    empty = false;
+                 }
+              else {
+                 LOG_ERROR_STR(buffer);
+                 delete buffer;
+                 return false;
+                 }
+              delete buffer;
+              }
+           }
+     closedir(d);
+     if (RemoveThis && empty) {
+        dsyslog(LOG_INFO, "removing %s", DirName);
+        if (remove(DirName) < 0) {
+           LOG_ERROR_STR(DirName);
+           return false;
+           }
+        }
+     return empty;
+     }
+  else
+     LOG_ERROR_STR(DirName);
+  return false;
+}
+
 char *ReadLink(const char *FileName)
 {
   char RealName[_POSIX_PATH_MAX];
diff --git a/tools.h b/tools.h
index 539dba019..96d09826e 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.23 2001/01/13 15:36:00 kls Exp $
+ * $Id: tools.h 1.24 2001/02/11 13:39:40 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -48,6 +48,7 @@ uint FreeDiskSpaceMB(const char *Directory);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
+bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 
 class cFile {
diff --git a/vdr.c b/vdr.c
index 698cc7a61..938afcf09 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.49 2001/01/14 15:29:51 kls Exp $
+ * $Id: vdr.c 1.54 2001/02/24 16:18:43 kls Exp $
  */
 
 #include <getopt.h>
@@ -44,6 +44,8 @@
 #define KEYS_CONF "keys.conf"
 #endif
 
+#define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
+
 static int Interrupted = 0;
 
 static void SignalHandler(int signum)
@@ -53,48 +55,76 @@ static void SignalHandler(int signum)
   signal(signum, SignalHandler);
 }
 
+static void Watchdog(int signum)
+{
+  // Something terrible must have happened that prevented the 'alarm()' from
+  // being called in time, so let's get out of here:
+  esyslog(LOG_ERR, "PANIC: watchdog timer expired - exiting!");
+  exit(1);
+}
+
 int main(int argc, char *argv[])
 {
   // Command line options:
 
 #define DEFAULTSVDRPPORT 2001
+#define DEFAULTWATCHDOG     0 // seconds
 
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *ConfigDirectory = NULL;
   bool DaemonMode = false;
+  int WatchdogTimeout = DEFAULTWATCHDOG;
 
   static struct option long_options[] = {
-      { "config", required_argument, NULL, 'c' },
-      { "daemon", no_argument,       NULL, 'd' },
-      { "help",   no_argument,       NULL, 'h' },
-      { "log",    required_argument, NULL, 'l' },
-      { "port",   required_argument, NULL, 'p' },
-      { "video",  required_argument, NULL, 'v' },
+      { "config",   required_argument, NULL, 'c' },
+      { "daemon",   no_argument,       NULL, 'd' },
+      { "device",   required_argument, NULL, 'D' },
+      { "help",     no_argument,       NULL, 'h' },
+      { "log",      required_argument, NULL, 'l' },
+      { "port",     required_argument, NULL, 'p' },
+      { "video",    required_argument, NULL, 'v' },
+      { "watchdog", required_argument, NULL, 'w' },
       { 0 }
     };
   
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "c:dhl:p:v:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "c:dD:hl:p:v:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'c': ConfigDirectory = optarg;
                     break;
           case 'd': DaemonMode = true; break;
+          case 'D': if (isnumber(optarg)) {
+                       int n = atoi(optarg);
+                       if (0 <= n && n < MAXDVBAPI) {
+                          cDvbApi::SetUseDvbApi(n);
+                          break;
+                          }
+                       }
+                    fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
+                    abort();
+                    break;
           case 'h': printf("Usage: vdr [OPTION]\n\n"           // for easier orientation, this is column 80|
-                           "  -c DIR,   --config=DIR  read config files from DIR (default is to read them\n"
-                           "                          from the video directory)\n"
-                           "  -h,       --help        display this help and exit\n"
-                           "  -d,       --daemon      run in daemon mode\n"
-                           "  -l LEVEL, --log=LEVEL   set log level (default: 3)\n"
-                           "                          0 = no logging, 1 = errors only,\n"
-                           "                          2 = errors and info, 3 = errors, info and debug\n"
-                           "  -p PORT,  --port=PORT   use PORT for SVDRP (default: %d)\n"
-                           "                          0 turns off SVDRP\n"
-                           "  -v DIR,   --video=DIR   use DIR as video directory (default is %s)\n"
+                           "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
+                           "                           from the video directory)\n"
+                           "  -h,       --help         display this help and exit\n"
+                           "  -d,       --daemon       run in daemon mode\n"
+                           "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
+                           "                           there may be several -D options (default: all DVB\n"
+                           "                           devices will be used)\n"
+                           "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
+                           "                           0 = no logging, 1 = errors only,\n"
+                           "                           2 = errors and info, 3 = errors, info and debug\n"
+                           "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
+                           "                           0 turns off SVDRP\n"
+                           "  -v DIR,   --video=DIR    use DIR as video directory (default is %s)\n"
+                           "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
+                           "                           seconds (default: %d); '0' disables the watchdog\n"
                            "\n"
                            "Report bugs to <vdr-bugs@cadsoft.de>\n",
                            DEFAULTSVDRPPORT,
-                           VideoDirectory
+                           VideoDirectory,
+                           DEFAULTWATCHDOG
                            );
                     return 0;
                     break;
@@ -119,6 +149,16 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
+          case 'w': if (isnumber(optarg)) {
+                       int t = atoi(optarg);
+                       if (t >= 0) {
+                          WatchdogTimeout = t;
+                          break;
+                          }
+                       }
+                    fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg);
+                    abort();
+                    break;
           default:  abort();
           }
         }
@@ -166,9 +206,9 @@ int main(int argc, char *argv[])
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
-#ifdef REMOTE_LIRC
+#if defined(REMOTE_LIRC)
   Keys.SetDummyValues();
-#else
+#elif !defined(REMOTE_NONE)
   bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
 #endif
 
@@ -186,7 +226,7 @@ int main(int argc, char *argv[])
   // User interface:
 
   Interface = new cInterface(SVDRPport);
-#ifndef REMOTE_LIRC
+#if !defined(REMOTE_LIRC) && !defined(REMOTE_NONE)
   if (!KeysLoaded)
      Interface->LearnKeys();
 #endif
@@ -197,6 +237,8 @@ int main(int argc, char *argv[])
   if (signal(SIGINT,  SignalHandler) == SIG_IGN) signal(SIGINT,  SIG_IGN);
   if (signal(SIGTERM, SignalHandler) == SIG_IGN) signal(SIGTERM, SIG_IGN);
   if (signal(SIGPIPE, SignalHandler) == SIG_IGN) signal(SIGPIPE, SIG_IGN);
+  if (WatchdogTimeout > 0)
+     if (signal(SIGALRM, Watchdog)   == SIG_IGN) signal(SIGALRM, SIG_IGN);
 
   // Main program loop:
 
@@ -204,8 +246,23 @@ int main(int argc, char *argv[])
   cReplayControl *ReplayControl = NULL;
   int LastChannel = -1;
   int PreviousChannel = cDvbApi::CurrentChannel();
+  time_t LastActivity = time(NULL);
+  int MaxLatencyTime = 0;
+
+  if (WatchdogTimeout > 0) {
+     dsyslog(LOG_INFO, "setting watchdog timer to %d seconds", WatchdogTimeout);
+     alarm(WatchdogTimeout); // Initial watchdog timer start
+     }
 
   while (!Interrupted) {
+        // Restart the Watchdog timer:
+        if (WatchdogTimeout > 0) {
+           int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);
+           if (LatencyTime > MaxLatencyTime) {
+              MaxLatencyTime = LatencyTime;
+              dsyslog(LOG_INFO, "max. latency time %d seconds", MaxLatencyTime);
+              }
+           }
         // Channel display:
         if (!EITScanner.Active() && cDvbApi::CurrentChannel() != LastChannel) {
            if (!Menu)
@@ -310,6 +367,14 @@ int main(int argc, char *argv[])
            EITScanner.Process();
            cVideoCutter::Active();
            }
+        if (!*Interact && !cRecordControls::Active()) {
+           if (time(NULL) - LastActivity > ACTIVITYTIMEOUT) {
+              RemoveDeletedRecordings();
+              LastActivity = time(NULL);
+              }
+           }
+        else
+           LastActivity = time(NULL);
         }
   isyslog(LOG_INFO, "caught signal %d", Interrupted);
   Setup.CurrentChannel = cDvbApi::CurrentChannel();
@@ -319,6 +384,8 @@ int main(int argc, char *argv[])
   delete ReplayControl;
   delete Interface;
   cDvbApi::Cleanup();
+  if (WatchdogTimeout > 0)
+     dsyslog(LOG_INFO, "max. latency time %d seconds", MaxLatencyTime);
   isyslog(LOG_INFO, "exiting");
   if (SysLogLevel > 0)
      closelog();
diff --git a/videodir.c b/videodir.c
index 4d5c2572b..2824d04e3 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.3 2000/12/24 12:51:41 kls Exp $
+ * $Id: videodir.c 1.4 2001/02/11 13:48:30 kls Exp $
  */
 
 #include "videodir.h"
@@ -28,7 +28,7 @@ class cVideoDirectory {
   cVideoDirectory(void);
   ~cVideoDirectory();
   uint FreeMB(void);
-  const char *Name(void) { return name; }
+  const char *Name(void) { return name ? name : VideoDirectory; }
   const char *Stored(void) { return stored; }
   int Length(void) { return length; }
   bool IsDistributed(void) { return name != NULL; }
@@ -197,3 +197,11 @@ const char *PrefixVideoFileName(const char *FileName, char Prefix)
   return PrefixedName;
 }
 
+void RemoveEmptyVideoDirectories(void)
+{
+  cVideoDirectory Dir;
+  do {
+     RemoveEmptyDirectories(Dir.Name());
+     } while (Dir.Next());
+}
+
diff --git a/videodir.h b/videodir.h
index 0716a284b..0197de303 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.2 2000/12/24 12:41:10 kls Exp $
+ * $Id: videodir.h 1.3 2001/02/11 13:12:50 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -18,5 +18,6 @@ bool RenameVideoFile(const char *OldName, const char *NewName);
 bool RemoveVideoFile(const char *FileName);
 bool VideoFileSpaceAvailable(unsigned int SizeMB);
 const char *PrefixVideoFileName(const char *FileName, char Prefix);
+void RemoveEmptyVideoDirectories(void);
 
 #endif //__VIDEODIR_H

From 610c5600df98b35226536ffe92b1fd231128c7d4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 1 Apr 2001 18:00:00 +0200
Subject: [PATCH 018/307] =?UTF-8?q?Version=200.72=20-=20Fixed=20SVDRP=20co?=
 =?UTF-8?q?mmands=20LSTC=20and=20LSTT=20to=20make=20them=20return=20an=20e?=
 =?UTF-8?q?rror=20message=20if=20=20=20no=20channels=20or=20timers=20are?=
 =?UTF-8?q?=20defined.=20-=20Enhanced=20'channels.conf.cable'=20(thanks=20?=
 =?UTF-8?q?to=20Hans-Peter=20Raschke).=20-=20Fixed=20switching=20to=20anot?=
 =?UTF-8?q?her=20channel=20via=20the=20EPG=20while=20a=20recording=20is=20?=
 =?UTF-8?q?being=20=20=20replayed.=20-=20Fixed=20a=20memory=20leak=20in=20?=
 =?UTF-8?q?the=20EIT=20processor=20that=20happened=20when=20the=20system?=
 =?UTF-8?q?=20time=20=20=20was=20set.=20-=20Removed=20some=20redundant=20c?=
 =?UTF-8?q?ode=20from=20the=20cListBase=20destructor.=20-=20Fixed=20intern?=
 =?UTF-8?q?ationalization=20of=20some=20Main=20menu=20texts.=20-=20Updated?=
 =?UTF-8?q?=20'channels.conf'=20after=20the=20recent=20changes=20of=20Prem?=
 =?UTF-8?q?iere=20World=20(thanks=20=20=20to=20Axel=20Gruber).=20-=20Redes?=
 =?UTF-8?q?igned=20the=20ring=20buffer=20to=20make=20it=20work=20with=20tw?=
 =?UTF-8?q?o=20separate=20threads=20for=20=20=20input=20and=20output=20(al?=
 =?UTF-8?q?so=20prepared=20for=20using=20a=20remultiplexer).=20-=20Fixed?=
 =?UTF-8?q?=20setting=20system=20time=20from=20transponders.=20-=20Fixed?=
 =?UTF-8?q?=20a=20segfault=20in=20the=20Schedule=20menu=20in=20case=20ther?=
 =?UTF-8?q?e=20is=20no=20EPG=20information.=20-=20The=20'runvdr'=20script?=
 =?UTF-8?q?=20now=20kills=20any=20leftover=20vdr=20threads=20before=20rest?=
 =?UTF-8?q?arting=20it.=20-=20Fixed=20a=20problem=20with=20Daylight=20Savi?=
 =?UTF-8?q?ng=20Time=20when=20displaying=20the=20times=20of=20=20=20record?=
 =?UTF-8?q?ings.=20-=20Added=20Dutch=20language=20texts=20(thanks=20to=20A?=
 =?UTF-8?q?rnold=20Niessen).=20-=20The=20new=20command=20line=20option=20-?=
 =?UTF-8?q?t=20can=20be=20used=20to=20set=20the=20controlling=20terminal?=
 =?UTF-8?q?=20=20=20(thanks=20to=20J=FCrgen=20Sauer).=20This=20is=20especi?=
 =?UTF-8?q?ally=20useful=20when=20starting=20VDR=20through=20=20=20an=20en?=
 =?UTF-8?q?try=20in=20/etc/inittab=20(see=20INSTALL).=20-=20Since=20the=20?=
 =?UTF-8?q?CAM=20module=20only=20works=20if=20it=20is=20installed=20in=20t?=
 =?UTF-8?q?he=20"highest"=20DVB=20card,=20=20=20recordings=20now=20search?=
 =?UTF-8?q?=20for=20a=20free=20DVB=20card=20from=20lowest=20to=20highest?=
 =?UTF-8?q?=20index=20(as=20=20=20opposed=20to=20the=20previous=20"highest?=
 =?UTF-8?q?=20to=20lowest"=20search)=20in=20order=20to=20not=20use=20the?=
 =?UTF-8?q?=20=20=20CAM=20card=20for=20FTA=20recordings=20unless=20necessa?=
 =?UTF-8?q?ry.=20This=20is=20only=20important=20for=20=20=20systems=20with?=
 =?UTF-8?q?=20three=20or=20more=20DVB=20cards.=20-=20Added=20the=20"statdv?=
 =?UTF-8?q?b2vdr"=20tool=20from=20Hans-Peter=20Raschke.=20-=20Fixed=20a=20?=
 =?UTF-8?q?segfault=20that=20sometimes=20happened=20when=20killing=20VDR.?=
 =?UTF-8?q?=20-=20VDR=20now=20returns=20an=20exit=20status=20of=20'2'=20in?=
 =?UTF-8?q?=20case=20of=20an=20error=20at=20startup,=20instead=20=20=20of?=
 =?UTF-8?q?=20terminating=20with=20'abort()'=20(which=20caused=20a=20core?=
 =?UTF-8?q?=20dump).=20-=20SVDRP=20now=20also=20works=20with=20clients=20t?=
 =?UTF-8?q?hat=20don't=20do=20line=20buffering=20(like=20the=20=20=20Windo?=
 =?UTF-8?q?ws=20'telnet').=20-=20Empty=20lines=20in=20config=20files=20no?=
 =?UTF-8?q?=20longer=20cause=20error=20messages.=20-=20New=20SVDRP=20comma?=
 =?UTF-8?q?nd=20LSTE=20to=20list=20the=20EPG=20data.=20-=20The=20SVDRP=20H?=
 =?UTF-8?q?ELP=20command=20now=20prints=20the=20topics=20in=20several=20co?=
 =?UTF-8?q?lumns.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS            |   10 +
 HISTORY                 |   39 ++
 INSTALL                 |    5 +
 Makefile                |   41 +-
 Tools/statdvb2vdr/ch.pl |  250 +++++++
 channels.conf           |   63 +-
 channels.conf.cable     |  301 ++++----
 config.c                |   66 +-
 config.h                |   22 +-
 dvbapi.c                |  321 +++------
 eit.c                   | 1452 ++++++++++++++++++++-------------------
 eit.h                   |   17 +-
 i18n.c                  |  143 +++-
 menu.c                  |   42 +-
 recording.c             |    3 +-
 remux.c                 |  173 +++++
 remux.h                 |   51 ++
 ringbuffer.c            |  170 +++++
 ringbuffer.h            |   55 ++
 runvdr                  |   13 +-
 svdrp.c                 |  114 ++-
 svdrp.h                 |    7 +-
 tools.c                 |   28 +-
 tools.h                 |    3 +-
 vdr.c                   |   36 +-
 25 files changed, 2151 insertions(+), 1274 deletions(-)
 create mode 100644 Tools/statdvb2vdr/ch.pl
 create mode 100644 remux.c
 create mode 100644 remux.h
 create mode 100644 ringbuffer.c
 create mode 100644 ringbuffer.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7a93b33ca..8a67f37c9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -57,6 +57,16 @@ Dave Chapman <dave@dchapman.com>
 
 Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de>
  for his support in adapting VDR to DVB-C
+ for adding the 'statdvb2vdr' tool (see Tools/statdvb2vdr)
 
 Peter Hofmann <software@pxh.de>
  for his support in adapting VDR to DVB-C
+
+Axel Gruber <axel@agm.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
+ for translating the OSD texts to the Dutch language
+
+J�rgen Sauer <jojo@automatix.de>
+ for implementing the -t option to set the controlling terminal
diff --git a/HISTORY b/HISTORY
index 684d2b65c..203377d37 100644
--- a/HISTORY
+++ b/HISTORY
@@ -413,3 +413,42 @@ Video Disk Recorder Revision History
   VDR exit in case the main program loop does not respond for more than the
   given number of seconds. This is mainly useful in combination with the new
   'runvdr' script that restarts VDR in case is has exited.
+
+2001-04-01: Version 0.72
+
+- Fixed SVDRP commands LSTC and LSTT to make them return an error message if
+  no channels or timers are defined.
+- Enhanced 'channels.conf.cable' (thanks to Hans-Peter Raschke).
+- Fixed switching to another channel via the EPG while a recording is being
+  replayed.
+- Fixed a memory leak in the EIT processor that happened when the system time
+  was set.
+- Removed some redundant code from the cListBase destructor.
+- Fixed internationalization of some Main menu texts.
+- Updated 'channels.conf' after the recent changes of Premiere World (thanks
+  to Axel Gruber).
+- Redesigned the ring buffer to make it work with two separate threads for
+  input and output (also prepared for using a remultiplexer).
+- Fixed setting system time from transponders.
+- Fixed a segfault in the Schedule menu in case there is no EPG information.
+- The 'runvdr' script now kills any leftover vdr threads before restarting it.
+- Fixed a problem with Daylight Saving Time when displaying the times of
+  recordings.
+- Added Dutch language texts (thanks to Arnold Niessen).
+- The new command line option -t can be used to set the controlling terminal
+  (thanks to J�rgen Sauer). This is especially useful when starting VDR through
+  an entry in /etc/inittab (see INSTALL).
+- Since the CAM module only works if it is installed in the "highest" DVB card,
+  recordings now search for a free DVB card from lowest to highest index (as
+  opposed to the previous "highest to lowest" search) in order to not use the
+  CAM card for FTA recordings unless necessary. This is only important for
+  systems with three or more DVB cards.
+- Added the "statdvb2vdr" tool from Hans-Peter Raschke.
+- Fixed a segfault that sometimes happened when killing VDR.
+- VDR now returns an exit status of '2' in case of an error at startup, instead
+  of terminating with 'abort()' (which caused a core dump).
+- SVDRP now also works with clients that don't do line buffering (like the
+  Windows 'telnet').
+- Empty lines in config files no longer cause error messages.
+- New SVDRP command LSTE to list the EPG data.
+- The SVDRP HELP command now prints the topics in several columns.
diff --git a/INSTALL b/INSTALL
index c334ed6d5..6910f6b47 100644
--- a/INSTALL
+++ b/INSTALL
@@ -71,6 +71,11 @@ If the program shall run as a daemon, use the --daemon option. This
 will completely detach it from the terminal and will continue as a
 background process.
 
+When starting the program through an entry in /etc/inittab, use the --terminal
+option to set the controlling terminal, as in
+
+vdr:123:respawn:/usr/local/bin/vdr --terminal=/dev/tty8 -w 60
+
 Automatic restart in case of hangups:
 -------------------------------------
 
diff --git a/Makefile b/Makefile
index c1cfabe1a..cec04caef 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,14 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.20 2001/02/24 15:52:58 kls Exp $
+# $Id: Makefile 1.21 2001/03/11 11:36:15 kls Exp $
 
 DVBDIR   = ../DVB
 
 INCLUDES = -I$(DVBDIR)/driver
 OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o osd.o\
-       recording.o remote.o svdrp.o thread.o tools.o vdr.o videodir.o
+       recording.o remote.o remux.o ringbuffer.o svdrp.o thread.o tools.o vdr.o\
+       videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
@@ -37,26 +38,28 @@ font: genfontfile fontfix.c fontosd.c
 # Implicit rules:
 
 %.o: %.c
-	g++ -g -O2 -Wall -m486 -c $(DEFINES) $(INCLUDES) $<
+	g++ -g -O2 -Wall -Woverloaded-virtual -m486 -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
-config.o   : config.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-dvbapi.o   : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
-dvbosd.o   : dvbosd.c dvbosd.h font.h tools.h
-eit.o      : eit.c config.h dvbapi.h dvbosd.h eit.h font.h thread.h tools.h videodir.h
-font.o     : font.c font.h fontfix.c fontosd.c tools.h
-i18n.o     : i18n.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h thread.h tools.h
-interface.o: interface.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-menu.o     : menu.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
-osd.o      : osd.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
-recording.o: recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
-remote.o   : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
-svdrp.o    : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
-thread.o   : thread.c thread.h tools.h
-tools.o    : tools.c tools.h
-vdr.o      : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
-videodir.o : videodir.c tools.h videodir.h
+config.o    : config.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
+dvbapi.o    : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h remux.h ringbuffer.h svdrp.h thread.h tools.h videodir.h
+dvbosd.o    : dvbosd.c dvbosd.h font.h tools.h
+eit.o       : eit.c config.h dvbapi.h dvbosd.h eit.h font.h thread.h tools.h videodir.h
+font.o      : font.c font.h fontfix.c fontosd.c tools.h
+i18n.o      : i18n.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h thread.h tools.h
+interface.o : interface.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
+menu.o      : menu.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
+osd.o       : osd.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
+recording.o : recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
+remote.o    : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
+remux.o     : remux.c remux.h tools.h
+ringbuffer.o: ringbuffer.c ringbuffer.h thread.h tools.h
+svdrp.o     : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
+thread.o    : thread.c thread.h tools.h
+tools.o     : tools.c tools.h
+vdr.o       : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
+videodir.o  : videodir.c tools.h videodir.h
 
 # The main program:
 
diff --git a/Tools/statdvb2vdr/ch.pl b/Tools/statdvb2vdr/ch.pl
new file mode 100644
index 000000000..91e918d27
--- /dev/null
+++ b/Tools/statdvb2vdr/ch.pl
@@ -0,0 +1,250 @@
+#!/usr/bin/perl
+
+# Reads the file statdvb.dat produced by the Siemens windows 
+# software (1.50), which contains the scanned channels of an
+# DVB-C (-S). The file ist located in the windows directory.
+#
+# Output is suitable for VDR (channels.conf). Only tested for
+# the cable version. Should work with slight modifications for
+# the sat version.
+#
+# 8. M�rz 2001 - Hans-Peter Raschke
+
+
+# file structure derived from "DvbGlobalDef.h" of the Siemens
+# DVB kit.
+
+# typedef int TABLETYPE;
+# enum TunStandard
+# {
+# 	PAL_BG,     //B/G stereo or mono
+# 	PAL_I,      //I mono (with Nicam stereo)
+# 	PAL_DK,     //D/K mono
+# 	SECAM_L,    //L mono (with Nicam stereo)
+# 	SECAM_LI,	//Secam L� (with Nicam stereo)
+# 	SECAM_DK,
+# 	SECAM_BG,
+# 	NTSC_M,
+# 	DVB_C,
+# 	DVB_S,
+# 	DVB_T
+# };
+# 
+# typedef struct TunProgDataTag //xx bytes+1string
+# {
+# 	int 	nNumber;				//logical number of the program
+# 	DWORD   dwFrequency;				//frequency in khz
+# 	CString 	csName;				//name of the program
+# 	TunStandard	eStandard;			//standard of the program
+# 	DWORD	dwExtraInfo;				//specific info, like teletext,reserved data
+# 							//0x8 == external input 1-CVBS
+# 							//0x10 == external input 2-Y/C
+# 							//0x20 == scrambled Program stream
+# 							//0x40 == ASTRA Sattable
+# 							//0x80 == Eutelsat Sattable
+# 							//0xC0 == Sattable from File
+# 							//0x100 == Pulsed switch to other satellite dish
+# 							//0x1000-0xF000 = Other Satellite Nr(if Sattable from File)
+# //Digital only params beginning from here
+# 	WORD ProgNr;					//DVB Nr for the prog (PAS related)
+# 	WORD wTS_ID;					//Transport-Stream ID orig.
+# 	WORD wNW_ID;					//Network ID orig.
+# 	WORD wService_ID;				//Service /Programm Id
+# 	BYTE nModulation;				//Modulation-Type QAM,QPSK,other
+# 	BYTE nFEC_outerinner;				//outer(high nibble) and inner(low n.)
+# 	DWORD dwSymbolrate;				//in symbol/s
+# 	BOOL b22kHz;					//east or west(TRUE) position in Sat
+# 	BOOL bVertical_pos;				//horizontal or vertical(TRUE) position in SAT
+# 	BYTE nProgtype;					//type of service (e.g. tv, radio)
+# 	WORD wVideo_PID;				//video-pid of the channel
+# 	WORD wAudio_PID;				//audio-pid of the channel
+# 	WORD wPMT_PID;					//PID of the associated PMT
+# 	WORD wTxt_PID;					//teletext PID for the program
+# 	WORD wSubtitling_PID;				//subtitling PID for the program
+# 	WORD wData_PID;					//PID for data broadcast
+# 	BYTE nIPFilter;					//filter for different ip's
+# 	DWORD dwReserved1;				//Shows some extended Information LOWORD=DataBroadcast_Id, 
+# 							//MSB showing Databroadcast, (HIWORD & 0xFF)=ComponentTag from the stream ident desc
+# 	DWORD dwReserved2;				//reserved dword
+# }DVBTunProgData;
+# 
+
+use strict;
+use FileHandle;
+
+# for a full dump
+my @varNames	= ("nNumber",			# logical number of the program 
+                   "dwFrequency",		# frequency in khz
+	           "csName",			# name of the program
+	           "eStandard",			# standard of the program
+	  	   "dwExtraInfo",		# specific info, like teletext,reserved data
+						# 0x8 == external input 1-CVBS
+						# 0x10 == external input 2-Y/C
+						# 0x20 == scrambled Program stream
+						# 0x40 == ASTRA Sattable
+						# 0x80 == Eutelsat Sattable
+						# 0xC0 == Sattable from File
+						# 0x100 == Pulsed switch to other satellite dish
+						# 0x1000-0xF000 = Other Satellite Nr(if Sattable from File)
+	           "ProgNr",			# DVB Nr for the prog (PAS related)
+	           "wTS_ID",			# Transport-Stream ID orig.
+	           "wNW_ID",			# Network ID orig.
+	           "wService_ID",		# Service /Programm Id
+	           "nModulation",		# Modulation-Type QAM,QPSK,other
+	           "nFEC_outerinner",		# outer(high nibble) and inner(low n.)
+	           "dwSymbolrate",		# in symbol/s
+	           "b22kHz",			# east or west(TRUE) position in Sat
+	           "bVertical_pos",		# horizontal or vertical(TRUE) position in SAT
+	           "nProgtype",			# type of service (e.g. tv, radio)
+	           "wVideo_PID",		# video-pid of the channel
+	           "wAudio_PID",		# audio-pid of the channel
+	           "wPMT_PID",			# PID of the associated PMT
+	           "wTxt_PID",			# teletext PID for the program
+	           "wSubtitling_PID",	  	# subtitling PID for the program
+	           "wData_PID");		# PID for data broadcast
+
+my @outVar = ("csName", 
+              "dwFrequency", 
+	      "bVertical_pos", 
+	      "b22kHz", 
+	      "dwSymbolrate",
+	      "wVideo_PID",
+	      "wAudio_PID",
+	      "wTxt_PID",
+	      "dwExtraInfo",
+	      "ProgNr");
+
+# channels that need a valid smartcard
+my @addCrypted = ("Extreme Sport",
+                  "Bloomberg",
+                  "Fashion TV",
+                  "BET ON JAZZ",
+                  "LANDSCAPE",
+                  "Einstein",
+                  "Single TV");
+	      
+my @chNames	= ();				# list of scanned channels
+my $camNo	= 1;				# number of CI/CAM to use
+my %chData;					# all channel data
+my $buff;					# input buffer
+my $fh		= new FileHandle("$ARGV[0]")	or die "Datei $ARGV[0] nicht gefunden!";
+
+binmode($fh);					# could be run on windows
+$fh->seek(4, 0);				# skip id
+
+my $chCnt	= 0;
+while (!$fh->eof()) {
+  $chCnt++;
+
+  last 					if ($fh->read($buff, 7) != 7);
+  my ($nNumber, 
+      $dwFrequency,
+      $sLen
+     )		= unpack("SLC", $buff);
+  
+  last 					if ($fh->read($buff, $sLen) != $sLen);
+  my ($csName)	= unpack("A$sLen", $buff);
+  $csName	=~ s/:/./g;
+  $csName	=~ s/^\s+//;
+  $csName	=~ s/\s+$//;
+
+  last 					if ($fh->read($buff, 54) != 54);
+  my ($eStandard,
+      $dwExtraInfo,
+      $ProgNr,
+      $wTS_ID,
+      $wNW_ID,
+      $wService_ID,
+      $nModulation,
+      $nFEC_outerinner,
+      $dwSymbolrate,
+      $b22kHz,
+      $bVertical_pos,
+      $nProgtype,
+      $wVideo_PID,
+      $wAudio_PID,
+      $wPMT_PID,
+      $wTxt_PID,
+      $wSubtitling_PID,
+      $wData_PID
+     )		= unpack("LLSSSSCCLLLCSSSSSS", $buff);
+
+  # some modifications for VDR  
+  $dwFrequency 	 /= 1000;
+  $bVertical_pos = $bVertical_pos ? "v" : "h";
+  $dwSymbolrate	 /= 1000;
+  $dwExtraInfo	 = ($dwExtraInfo == 32 || grep(($_ cmp $csName) == 0, @addCrypted)) ? $camNo : 0;
+
+  my $x		= 1;
+  my $orgName	= $csName;
+  while (exists($chData{$csName})) {
+    $csName	 = "$orgName" . "_$x";
+    $x++;
+  }
+  push(@chNames, $csName);
+
+  my %tmp = ("nNumber"		=> $nNumber,			
+             "dwFrequency"	=> $dwFrequency,		
+	     "csName"		=> $orgName,			
+	     "eStandard"	=> $eStandard,			
+	     "dwExtraInfo"	=> $dwExtraInfo,		
+	     "ProgNr"		=> $ProgNr,			
+	     "wTS_ID"		=> $wTS_ID,			
+	     "wNW_ID"		=> $wNW_ID,			
+	     "wService_ID"	=> $wService_ID,		
+	     "nModulation"	=> $nModulation,		
+	     "nFEC_outerinner"	=> $nFEC_outerinner,		
+	     "dwSymbolrate"	=> $dwSymbolrate,		
+	     "b22kHz"		=> $b22kHz,			
+	     "bVertical_pos"	=> $bVertical_pos,		
+	     "nProgtype"	=> $nProgtype,			
+	     "wVideo_PID"	=> $wVideo_PID,		
+	     "wAudio_PID"	=> $wAudio_PID,		
+	     "wPMT_PID"		=> $wPMT_PID,			
+	     "wTxt_PID"		=> $wTxt_PID,			
+	     "wSubtitling_PID"	=> $wSubtitling_PID,	  	
+	     "wData_PID"	=> $wData_PID);		
+  $chData{$csName}	= {%tmp};
+}
+
+print STDERR "$chCnt channels found!\n";
+
+# now we print the channels.conf	      
+# crypted TV
+print ":verschl�sselte Fernsehprogramme\n";
+for my $n (@chNames) {
+  my %tmp	= %{$chData{$n}};
+  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 1 && $tmp{"dwExtraInfo"});
+}
+
+# TV
+print ":Fernsehprogramme\n";
+for my $n (@chNames) {
+  my %tmp	= %{$chData{$n}};
+  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 1 && !$tmp{"dwExtraInfo"});
+}
+
+# crypted radio
+print ":verschl�sselte Radioprogramme\n";
+for my $n (@chNames) {
+  my %tmp	= %{$chData{$n}};
+  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 2 && $tmp{"dwExtraInfo"});
+}
+
+# radio
+print ":Radioprogramme\n";
+for my $n (@chNames) {
+  my %tmp	= %{$chData{$n}};
+  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 2 && !$tmp{"dwExtraInfo"});
+}
+
+sub printChannel {
+  my $p		= shift;
+  my @tmp	= ();
+
+  for my $n (@outVar) {
+    push(@tmp, ${$p}{$n});
+  }
+  
+  print join(":", @tmp), "\n";
+}  
diff --git a/channels.conf b/channels.conf
index 4947f8238..36b5b2843 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,4 +1,4 @@
-RTL:12188:h:0:27500:163:104:32:0:12003
+RTL:12188:h:0:27500:163:104:105:0:12003
 Sat.1:12480:v:0:27500:1791:1792:34:0:46
 Pro-7:12480:v:0:27500:255:256:32:0:898
 RTL2:12188:h:0:27500:166:128:68:0:12020
@@ -54,53 +54,54 @@ Star Kino:11798:h:0:27500:767:768:0:3:9
 Cine Action:11798:h:0:27500:1023:1024:0:3:20
 Cine Comedy:11798:h:0:27500:1279:1280:0:3:29
 Sci Fantasy:11798:h:0:27500:1535:1536:0:3:41
-Romantic Movies:11798:h:0:27500:1791:1792:0:3:11
-Studio Universal:11798:h:0:27500:2047:2048:0:3:21
+Romantic Movies:11797:h:0:27500:1791:1792:0:3:11
+Studio Universal:12090:v:0:27500:255:256:0:3:36
 13th Street:11797:h:0:27500:2303:2304:0:3:43
 Junior:12031:h:0:27500:255:256:0:3:19
 K-Toon:12032:h:0:27500:511:512:0:3:12
-Disney Channel:12031:h:0:27500:767:768:0:3:15
-Fox Kids:11798:h:0:27500:255:256:0:3:0
+Disney Channel:12090:v:0:27500:767:768:0:3:34
+Fox Kids:11797:h:0:27500:2559:2560:0:3:22
 Sunset:12031:h:0:27500:1023:1024:0:3:16
 Comedy:12031:h:0:27500:1279:1280:0:3:28
-Planet:12031:h:0:27500:2047:2048:0:3:13
+Planet:12090:v:0:27500:1279:1280:0:3:13
 Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
 Krimi&Co:12031:h:0:27500:1535:1536:0:3:23
-Filmpalast:12090:v:0:27500:255:256:0:3:36
+Filmpalast:11758:h:0:27500:2559:2560:0:3:516
 Heimatkanal:11758:h:0:27500:2815:2816:0:3:517
 Goldstar:11758:h:0:27500:3839:3840:0:3:518
-Classica:12090:v:0:27500:767:768:0:3:34
+Classica:12031:h:0:27500:767:768:0:3:15
 Seasons:12090:v:0:27500:511:512:0:3:33
-Blue Channel:11758:h:0:27500:2559:2560:0:3:516
-Cinedom 1A de:12070:h:0:27500:1279:1280:0:3:188
-Cinedom 1A en:12070:h:0:27500:1279:1281:0:3:188
-Cinedom 1B:12070:h:0:27500:1791:1792:0:3:191
-Cinedom 1C:12070:h:0:27500:767:768:0:3:185
-Cinedom 1D:11758:h:0:27500:511:512:0:3:178
-Cinedom 1E:11720:h:0:27500:1535:1537:0:3:176
+Sport 1:11720:h:0:27500:255:256:0:3:17
+Sport 2:12070:h:0:27500:2047:2048:0:3:27
+Sport 3:12070:h:0:27500:2303:2304:0:3:18
+Sport 4:12070:h:0:27500:2559:2560:0:3:24
+Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:0:3:242
+Feed (F1 Data):11720:h:0:27500:3071:3072:0:3:244
+Feed (F1 Multi):11720:h:0:27500:2815:2816:0:3:243
+Feed (F1 On Board):11720:h:0:27500:2303:2304:0:3:241
+Feed (F1 Verfolger):11720:h:0:27500:2047:2048:0:3:240
+Cinedom Deluxe:12070:h:0:27500:1279:1280:0:3:188
+Cinedom 1A de:11758:h:0:27500:511:512:0:3:178
+Cinedom 1A en:11758:h:0:27500:511:513:0:3:178
+Cinedom 1B:12070:h:0:27500:767:768:0:3:185
+Cinedom 1C:12070:h:0:27500:1791:1792:0:3:191
+Cinedom 1E??:11720:h:0:27500:1535:1537:0:3:176
 Cinedom 2A:12070:h:0:27500:1535:1536:0:3:189
-Cinedom 2B:12070:h:0:27500:511:512:0:3:184
-Cinedom 2C:11758:h:0:27500:767:768:0:3:179
-Cinedom 2D:11758:h:0:27500:1023:1024:0:3:193
-Cinedom 2E:11720:h:0:27500:1279:1280:0:3:183
+Cinedom 2B:11758:h:0:27500:767:768:0:3:179
+Cinedom 2C:11758:h:0:27500:1023:1024:0:3:193
+Cinedom 2D??:12070:h:0:27500:511:512:0:3:184
 Cinedom 3A:11758:h:0:27500:255:256:0:3:177
 Cinedom 3B:11758:h:0:27500:1279:1280:0:3:194
-Cinedom 3C:12090:v:0:27500:1279:1280:17689:3:192
-Cinedom 3D:11720:h:0:27500:511:512:0:3:180
-Cinedom 3E:11720:h:0:27500:1023:1024:0:3:182
+Cinedom 3C??:12090:v:0:27500:1279:1280:17689:3:192
 Cinedom 4A:11758:h:0:27500:1535:1536:0:3:195
-Cinedom 4B:12032:h:0:27500:2559:2560:0:3:187
-Cinedom 4C:11720:h:0:27500:767:768:0:3:181
-Cinedom 4D:11720:h:0:27500:1791:1792:0:3:190
-Cinedom 4E:12070:h:0:27500:1023:1025:0:3:186
+Cinedom 4B:12070:h:0:27500:1023:1025:0:3:186
+Cinedom 4C??:11720:h:0:27500:767:768:0:3:181
+Cinedom 5A:12032:h:0:27500:2559:2560:0:3:187
+Beate Uhse_TV:11797:h:0:27500:2047:2048:0:3:21
+Blue Channel:11758:h:0:27500:2559:2560:0:3:516
 Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
 Blue Movie 2:11758:h:0:27500:2047:2048:0:3:514
 Blue Movie 3:11758:h:0:27500:2303:2304:0:3:515
-Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:0:3:242
-Feed (F1 Data):11720:h:0:27500:3071:3072:0:3:244
-Feed (F1 Multi):11720:h:0:27500:2815:2816:0:3:243
-Feed (F1 On Board):11720:h:0:27500:2303:2304:0:3:241
-Feed (F1 Verfolger):11720:h:0:27500:2047:2048:0:3:240
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
diff --git a/channels.conf.cable b/channels.conf.cable
index 93fc3761d..c60fb8f6d 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,134 +1,167 @@
-Leitseite:346:h:0:6900:2254:0:0:5004
-Extreme Sport:346:h:0:6900:801:802:0:0
-Bloomberg:346:h:0:6900:811:812:0:0
-Fashion TV:346:h:0:6900:821:822:0:0
-LANDSCAPE:346:h:0:6900:831:832:0:0
-BET ON JAZZ:346:h:0:6900:841:842:0:0
-Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:50705
-Single TV:346:h:0:6900:621:622:0:0
-HomeNet:346:h:0:6900:0:0:0:0
-Einstein:346:h:0:6900:623:624:0:0
-BLUE CHANNEL:354:h:0:6900:2559:2560:0:0
-GOLDSTAR TV:354:h:0:6900:3839:3840:1:0
-HEIMATKANAL:354:h:0:6900:2815:2816:1:0
-100,6:354:h:0:6900:0:1312:0:0
-SPORT 1:362:h:0:6900:255:256:1:0
-LOVE SONGS:362:h:0:6900:0:320:1:0
-MUSICALS:362:h:0:6900:0:336:1:0
-EASY LISTENING:362:h:0:6900:0:304:1:0
-HITLISTE:362:h:0:6900:0:784:1:0
-ALTERNATIVE ROCK:362:h:0:6900:0:800:1:0
-DANCE:362:h:0:6900:0:816:1:0
-COUNTRY:362:h:0:6900:0:352:1:0
-CLASSIC ROCK:362:h:0:6900:0:544:1:0
-FILMMUSIK:362:h:0:6900:3552:368:1:0
-DEUTSCHE HITS:362:h:0:6900:3552:384:1:0
-SOUL CLASSICS:362:h:0:6900:3439:400:1:0
-T�RK M�ZIGI:362:h:0:6900:0:560:1:0
-GOLD:362:h:0:6900:0:576:1:0
-KLASSIK POPUL�R:362:h:0:6900:3552:592:1:0
-KLASS. SYMPHONIEN:362:h:0:6900:0:608:1:0
-OPER & VOKALMUSIK:362:h:0:6900:0:624:1:0
-BAROCKMUSIK:362:h:0:6900:0:640:1:0
-JAZZ:362:h:0:6900:0:656:1:0
-Videotext:362:h:0:6900:0:0:0:0
-PREMIERE WORLD:370:h:0:6900:255:256:0:10
-PREMIERE:370:h:0:6900:511:0:1:0
-STAR KINO:370:h:0:6900:767:768:1:0
-CINE ACTION:370:h:0:6900:1023:1024:1:0
-CINE COMEDY:370:h:0:6900:1279:1280:1:0
-SCI-FANTASY:370:h:0:6900:1535:1536:1:0
-ROMANTIC MOVIES:370:h:0:6900:1791:1792:1:0
-STUDIO UNIVERSAL:370:h:0:6900:2047:2048:1:0
-13 TH STREET:370:h:0:6900:2303:2304:1:0
-FOX KIDS:370:h:0:6900:2559:2560:1:0
-DISNEY CHANNEL:378:h:0:6900:767:768:1:0
-SUNSET:378:h:0:6900:1023:1024:1:0
-COMEDY:378:h:0:6900:1279:1280:1:0
-KRIMI &CO:378:h:0:6900:1535:1536:1:0
-DISCOVERY CHANNEL:378:h:0:6900:1791:1792:1:0
-PLANET:378:h:0:6900:2047:2048:1:0
-SUPERDOM:378:h:0:6900:2303:2304:1:0
-VCR-Setup:378:h:0:6900:0:0:0:0
-Modem-Setup:378:h:0:6900:0:0:0:0
-SCHLAGER:378:h:0:6900:0:320:1:0
-VOLKSMUSIK:378:h:0:6900:0:336:1:0
-OLD GOLD:378:h:0:6900:0:304:1:0
-TM V1.0:378:h:0:6900:0:0:1:0
-JUNIOR:378:h:0:6900:255:256:1:0
-KICK 1:386:h:0:6900:255:256:1:0
-KICK 2:386:h:0:6900:2559:2560:1:0
-ZDF.digitext:394:h:0:6900:0:0:0:0
-ZDF:394:h:0:6900:110:120:0:28006
-DLR-Berlin:394:h:0:6900:0:710:0:0
-DLF-K�ln:394:h:0:6900:0:810:0:0
-3sat:394:h:0:6900:210:0:0:28007
-KiKa:394:h:0:6900:0:0:0:28008
-Eurosport:394:h:0:6900:410:0:0:28009
-ZDF.info:394:h:0:6900:610:620:0:28011
-EuroNews:394:h:0:6900:2221:2233:0:28015
-ZDF Theaterkanal:394:h:0:6900:1110:0:0:0
-ZDF.doku:394:h:0:6900:660:670:0:28014
-SEASONS:402:h:0:6900:1040:1044:1:0
-CLASSICA:402:h:0:6900:1030:1034:1:0
-FILMPALAST:402:h:0:6900:1050:1054:1:0
-Blockmaster:402:h:0:6900:0:0:1:0
-Test-R:410:h:0:6900:901:0:0:0
-Bayerisches FS:410:h:0:6900:201:202:0:0
-Bayern 4 Klassik:410:h:0:6900:0:3001:0:0
-B5 aktuell:410:h:0:6900:0:3101:0:0
-WDR FERNSEHEN:410:h:0:6900:601:602:0:28111
-Bremen 2:410:h:0:6900:0:3801:0:0
-arte:410:h:0:6900:401:402:0:28109
-Bayern 1:410:h:0:6900:0:3601:0:0
-NDR 4 Info:410:h:0:6900:0:3701:0:0
-SR Fernsehen Suedwest:410:h:0:6900:501:502:0:28110
-SR 1:410:h:0:6900:0:3901:0:0
-Das Erste:410:h:0:6900:101:102:0:28106
-HR2 plus:410:h:0:6900:0:3401:0:0
-HR2:410:h:0:6900:0:3301:0:0
-hessen fernsehen:410:h:0:6900:301:302:0:28108
-hr-chronos:410:h:0:6900:0:3201:0:0
-HR XXL:410:h:0:6900:0:3501:0:0
-hessen:10160:h:1:6900:301:302:0:28108
-BR:10160:h:1:6900:201:202:0:28107
-BR-alpha:410:h:0:6900:701:702:0:28112
-SWR Fernsehen:410:h:0:6900:801:802:0:28113
-Phoenix:410:h:0:6900:901:902:0:0
-ARD-Online-Kanal:426:h:0:6900:0:1805:0:0
-EinsExtra:426:h:0:6900:101:102:0:28201
-EinsFestival:426:h:0:6900:201:202:0:28202
-EinsMuXx:426:h:0:6900:301:302:0:28203
-MDR FERNSEHEN:426:h:0:6900:401:402:0:28204
-ORB-Fernsehen:426:h:0:6900:501:502:0:28205
-B1 Berlin:426:h:0:6900:601:602:0:28206
-Radio 3:426:h:0:6900:0:701:0:0
-MDR KULTUR:426:h:0:6900:0:801:0:0
-Fritz:426:h:0:6900:0:901:0:0
-JUMP:426:h:0:6900:0:1001:0:0
-MDR info:426:h:0:6900:0:1101:0:0
-SPUTNIK:426:h:0:6900:0:1201:0:0
-SFB4 Multikulti:426:h:0:6900:0:1301:0:0
-SWR-2:426:h:0:6900:0:1401:0:0
-WDR3:426:h:0:6900:0:1501:0:0
-WDR 5:426:h:0:6900:0:1601:0:0
-N3:426:h:0:6900:2401:2402:0:0
-ORF:394:h:1:6900:506:507:0:28010
-TV Polonia:434:h:0:6900:641:642:0:0
-Kanal D:434:h:0:6900:651:652:0:0
-RTP international:434:h:0:6900:661:662:0:0
-ATV:434:h:0:6900:631:632:0:0
-ERT-Sat:434:h:0:6900:691:692:0:0
-MV-Test:442:h:0:6900:0:0:0:0
-ZEE TV:442:h:0:6900:517:773:0:0
-NTV i:442:h:0:6900:514:515:0:0
-All Jazz:442:h:0:6900:0:535:0:0
-Cristal New Age:442:h:0:6900:0:536:0:0
-Movie Sounds:442:h:0:6900:0:537:0:0
-Sinfonica:442:h:0:6900:0:538:0:0
-Opernfestival:442:h:0:6900:0:539:0:0
-Barock Fantasie:442:h:0:6900:0:540:0:0
-Musica Camerata:442:h:0:6900:0:541:0:0
-Musica Antica:442:h:0:6900:0:542:0:0
-Adagio:442:h:0:6900:0:543:0:0
-Jazz Legends:442:h:0:6900:0:544:0:0
+:verschl�sselte Fernsehprogramme
+Extreme Sport:346:h:0:6900:801:802:0:1:50700
+Bloomberg:346:h:0:6900:811:812:0:1:50701
+Fashion TV:346:h:0:6900:821:822:0:1:50702
+BET ON JAZZ:346:h:0:6900:841:842:0:1:50704
+LANDSCAPE:346:h:0:6900:831:832:0:1:50703
+Einstein:346:h:0:6900:623:624:0:1:50719
+Single TV:346:h:0:6900:621:622:0:1:50706
+Einstein:346:h:0:6900:255:256:0:1:40100
+GOLDSTAR TV:354:h:0:6900:3839:3840:0:1:518
+HEIMATKANAL:354:h:0:6900:2815:2816:0:1:517
+FILMPALAST:354:h:0:6900:2559:2560:0:1:516
+FILMPALAST:354:h:0:6900:1535:1536:0:1:195
+FILMPALAST:354:h:0:6900:1279:1280:0:1:194
+FILMPALAST:354:h:0:6900:255:256:0:1:177
+FILMPALAST:354:h:0:6900:767:768:0:1:179
+FILMPALAST:354:h:0:6900:511:513:0:1:178
+FILMPALAST:354:h:0:6900:1023:1024:0:1:193
+BLUE MOVIE 1:354:h:0:6900:255:256:0:1:513
+BLUE MOVIE 2:354:h:0:6900:255:256:0:1:514
+BLUE MOVIE 3:354:h:0:6900:255:256:0:1:515
+SPORT 1:362:h:0:6900:255:256:0:1:17
+F1 Boxenstrasse:362:h:0:6900:2815:2816:0:1:240
+F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
+F1 Multikanal:362:h:0:6900:2047:2048:0:1:243
+SPORT 1:362:h:0:6900:255:256:0:1:180
+SPORT 1:362:h:0:6900:255:256:0:1:181
+SPORT 1:362:h:0:6900:255:256:0:1:182
+SPORT 1:362:h:0:6900:255:256:0:1:183
+SPORT 1:362:h:0:6900:255:256:0:1:176
+SPORT 1:362:h:0:6900:255:256:0:1:190
+PREMIERE:370:h:0:6900:511:512:0:1:10
+STAR KINO:370:h:0:6900:767:768:0:1:9
+CINE ACTION:370:h:0:6900:1023:1024:0:1:20
+CINE COMEDY:370:h:0:6900:1279:1280:0:1:29
+SCI-FANTASY:370:h:0:6900:1535:1536:0:1:41
+ROMANTIC MOVIES:370:h:0:6900:1791:1792:0:1:11
+BEATE-UHSE.TV:370:h:0:6900:2047:2048:0:1:21
+13 TH STREET:370:h:0:6900:2303:2304:0:1:43
+FOX KIDS:370:h:0:6900:255:256:0:1:22
+SUNSET:378:h:0:6900:1023:1024:0:1:16
+COMEDY:378:h:0:6900:1279:1280:0:1:28
+KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
+DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
+CLASSICA:378:h:0:6900:767:768:0:1:15
+SUPERDOM:378:h:0:6900:2303:2304:0:1:42
+K-TOON:378:h:0:6900:511:512:0:1:12
+SUPERDOM:378:h:0:6900:2047:2048:0:1:192
+SUPERDOM:378:h:0:6900:2559:2560:0:1:187
+JUNIOR:378:h:0:6900:255:256:0:1:19
+SUPERDOM 5:378:h:0:6900:2815:2816:0:1:213
+KICK 1:386:h:0:6900:255:257:0:1:26
+KICK 4:386:h:0:6900:1279:1281:0:1:188
+KICK 4:386:h:0:6900:1535:1536:0:1:189
+SPORT 2:386:h:0:6900:2047:2048:0:1:27
+KICK 4:386:h:0:6900:1023:1024:0:1:186
+KICK 2:386:h:0:6900:2559:2560:0:1:300
+KICK 4:386:h:0:6900:767:769:0:1:185
+SPORT 3:386:h:0:6900:2303:2304:0:1:18
+SUPERDOM 3:386:h:0:6900:3583:3584:0:1:211
+SPORT 4:386:h:0:6900:255:256:0:1:24
+KICK 3:386:h:0:6900:255:256:0:1:301
+KICK 4:386:h:0:6900:255:256:0:1:302
+KICK 4:386:h:0:6900:255:256:0:1:184
+KICK 4:386:h:0:6900:255:256:0:1:191
+EuroNews:394:h:0:6900:255:256:0:1:65039
+SEASONS:402:h:0:6900:1040:1044:0:1:33
+DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
+STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
+PLANET:402:h:0:6900:1100:1104:0:1:13
+BBC PRIME:402:h:0:6900:255:256:0:1:32
+ATV:402:h:0:6900:255:256:0:1:39
+:Fernsehprogramme
+Leitseite:346:h:0:6900:2254:0:0:0:5004
+Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:0:50705
+PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
+ZDF:394:h:0:6900:110:120:130:0:28006
+3sat:394:h:0:6900:210:220:230:0:28007
+KiKa:394:h:0:6900:255:256:0:0:28008
+Eurosport:394:h:0:6900:410:420:430:0:28009
+ZDF.info:394:h:0:6900:610:620:0:0:28011
+EuroNews:394:h:0:6900:2221:2233:768:0:28015
+ZDF Theaterkanal:394:h:0:6900:1110:1120:0:0:28016
+ZDF.doku:394:h:0:6900:660:670:0:0:28014
+Test-R:410:h:0:6900:901:902:104:0:28130
+Bayerisches FS:410:h:0:6900:201:202:204:0:28107
+WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
+arte:410:h:0:6900:401:402:404:0:28109
+SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
+Das Erste:410:h:0:6900:101:102:104:0:28106
+hessen fernsehen:410:h:0:6900:301:302:304:0:28108
+BR-alpha:410:h:0:6900:701:702:704:0:28112
+SWR Fernsehen:410:h:0:6900:801:802:804:0:28113
+Phoenix:410:h:0:6900:255:256:0:0:28114
+Phoenix:410:h:0:6900:255:256:0:0:61225
+ARD-Online-Kanal:426:h:0:6900:0:1801:0:0:28218
+EinsExtra:426:h:0:6900:101:102:0:0:28201
+EinsFestival:426:h:0:6900:201:202:0:0:28202
+EinsMuXx:426:h:0:6900:301:302:0:0:28203
+MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
+ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
+B1 Berlin:426:h:0:6900:601:602:604:0:28206
+N3:426:h:0:6900:2401:2402:2404:0:28224
+TV Polonia:434:h:0:6900:641:642:0:0:53204
+Kanal D:434:h:0:6900:651:652:0:0:53205
+RTP international:434:h:0:6900:661:662:0:0:53206
+ATV:434:h:0:6900:631:632:0:0:53203
+ERT-Sat:434:h:0:6900:691:692:0:0:53209
+CNE:434:h:0:6900:255:256:0:0:53208
+ERT-Sat:434:h:0:6900:255:256:0:0:48587
+ZEE TV:442:h:0:6900:517:773:0:0:53301
+NTV i:442:h:0:6900:514:515:0:0:53302
+:verschl�sselte Radioprogramme
+LOVE SONGS:362:h:0:6900:0:320:0:1:163
+MUSICALS:362:h:0:6900:0:336:0:1:164
+EASY LISTENING:362:h:0:6900:0:304:0:1:162
+HITLISTE:362:h:0:6900:0:784:0:1:150
+ALTERNATIVE ROCK:362:h:0:6900:0:800:0:1:151
+DANCE:362:h:0:6900:0:816:0:1:152
+COUNTRY:362:h:0:6900:0:352:0:1:153
+CLASSIC ROCK:362:h:0:6900:0:544:0:1:154
+FILMMUSIK:362:h:0:6900:0:368:0:1:155
+DEUTSCHE HITS:362:h:0:6900:0:384:0:1:156
+SOUL CLASSICS:362:h:0:6900:0:400:0:1:157
+T�RK M�ZIGI:362:h:0:6900:0:560:0:1:158
+GOLD:362:h:0:6900:0:576:0:1:159
+KLASSIK POPUL�R:362:h:0:6900:0:592:0:1:145
+KLASS. SYMPHONIEN:362:h:0:6900:0:608:0:1:146
+OPER & VOKALMUSIK:362:h:0:6900:0:624:0:1:147
+BAROCKMUSIK:362:h:0:6900:0:640:0:1:148
+SCHLAGER:378:h:0:6900:0:320:0:1:166
+VOLKSMUSIK:378:h:0:6900:0:336:0:1:167
+OLD GOLD:378:h:0:6900:0:304:0:1:165
+:Radioprogramme
+100,6:354:h:0:6900:0:1312:0:0:161
+DLR-Berlin:394:h:0:6900:0:710:0:0:28012
+DLF-K�ln:394:h:0:6900:0:810:0:0:28013
+�sterreich 1:394:h:0:6900:0:169:0:0:28017
+Bayern 4 Klassik:410:h:0:6900:0:3001:0:0:28120
+B5 aktuell:410:h:0:6900:0:3101:0:0:28121
+Bremen 2:410:h:0:6900:0:3801:0:0:28128
+Bayern 1:410:h:0:6900:0:3601:0:0:28126
+NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
+SR 1:410:h:0:6900:0:3901:0:0:28129
+HR2 plus:410:h:0:6900:0:3401:0:0:28124
+HR2:410:h:0:6900:0:3301:0:0:28123
+hr-chronos:410:h:0:6900:0:3201:0:0:28122
+HR XXL:410:h:0:6900:0:3501:0:0:28125
+Radio 3:426:h:0:6900:0:701:0:0:28207
+MDR KULTUR:426:h:0:6900:0:801:0:0:28208
+Fritz:426:h:0:6900:0:901:0:0:28209
+JUMP:426:h:0:6900:0:1001:0:0:28210
+MDR info:426:h:0:6900:0:1101:0:0:28211
+SPUTNIK:426:h:0:6900:0:1201:0:0:28212
+SFB4 Multikulti:426:h:0:6900:0:1301:0:0:28213
+SWR-2:426:h:0:6900:0:1401:0:0:28214
+WDR3:426:h:0:6900:0:1501:0:0:28215
+WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
+All Jazz:442:h:0:6900:0:535:0:0:53350
+Cristal New Age:442:h:0:6900:0:536:0:0:53351
+Movie Sounds:442:h:0:6900:0:537:0:0:53352
+Sinfonica:442:h:0:6900:0:538:0:0:53353
+Opernfestival:442:h:0:6900:0:539:0:0:53354
+Barock Fantasie:442:h:0:6900:0:540:0:0:53355
+Musica Camerata:442:h:0:6900:0:541:0:0:53356
+Musica Antica:442:h:0:6900:0:542:0:0:53357
+Adagio:442:h:0:6900:0:543:0:0:53358
diff --git a/config.c b/config.c
index 66eb1780e..acf1996ae 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.43 2001/02/24 13:20:18 kls Exp $
+ * $Id: config.c 1.44 2001/04/01 14:32:22 kls Exp $
  */
 
 #include "config.h"
@@ -75,37 +75,39 @@ bool cKeys::Load(const char *FileName)
         result = true;
         while (fgets(buffer, sizeof(buffer), f) > 0) {
               line++;
-              char *Name = buffer;
-              char *p = strpbrk(Name, " \t");
-              if (p) {
-                 *p = 0; // terminates 'Name'
-                 while (*++p && isspace(*p))
-                       ;
-                 if (*p) {
-                    if (strcasecmp(Name, "Code") == 0)
-                       code = *p;
-                    else if (strcasecmp(Name, "Address") == 0)
-                       address = strtol(p, NULL, 16);
-                    else {
-                       for (tKey *k = keys; k->type != kNone; k++) {
-                           if (strcasecmp(Name, k->name) == 0) {
-                              k->code = strtol(p, NULL, 16);
-                              Name = NULL; // to indicate that we found it
+              if (!isempty(buffer)) {
+                 char *Name = buffer;
+                 char *p = strpbrk(Name, " \t");
+                 if (p) {
+                    *p = 0; // terminates 'Name'
+                    while (*++p && isspace(*p))
+                          ;
+                    if (*p) {
+                       if (strcasecmp(Name, "Code") == 0)
+                          code = *p;
+                       else if (strcasecmp(Name, "Address") == 0)
+                          address = strtol(p, NULL, 16);
+                       else {
+                          for (tKey *k = keys; k->type != kNone; k++) {
+                              if (strcasecmp(Name, k->name) == 0) {
+                                 k->code = strtol(p, NULL, 16);
+                                 Name = NULL; // to indicate that we found it
+                                 break;
+                                 }
+                              }
+                           if (Name) {
+                              esyslog(LOG_ERR, "unknown key in %s, line %d\n", fileName, line);
+                              result = false;
                               break;
                               }
                            }
-                        if (Name) {
-                           esyslog(LOG_ERR, "unknown key in %s, line %d\n", fileName, line);
-                           result = false;
-                           break;
-                           }
-                        }
+                       }
+                    continue;
                     }
-                 continue;
+                 esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+                 result = false;
+                 break;
                  }
-              esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
-              result = false;
-              break;
               }
         fclose(f);
         }
@@ -782,10 +784,12 @@ bool cSetup::Load(const char *FileName)
      bool result = true;
      while (fgets(buffer, sizeof(buffer), f) > 0) {
            line++;
-           if (*buffer != '#' && !Parse(buffer)) {
-              esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
-              result = false;
-              break;
+           if (!isempty(buffer)) {
+              if (*buffer != '#' && !Parse(buffer)) {
+                 esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+                 result = false;
+                 break;
+                 }
               }
            }
      fclose(f);
diff --git a/config.h b/config.h
index 60a95c3af..6c21fb2f6 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.42 2001/02/24 13:19:39 kls Exp $
+ * $Id: config.h 1.44 2001/04/01 14:44:40 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.71"
+#define VDRVERSION "0.72"
 
 #define MaxBuffer 10000
 
@@ -184,14 +184,16 @@ template<class T> class cConfig : public cList<T> {
           result = true;
           while (fgets(buffer, sizeof(buffer), f) > 0) {
                 line++;
-                T *l = new T;
-                if (l->Parse(buffer))
-                   Add(l);
-                else {
-                   esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
-                   delete l;
-                   result = false;
-                   break;
+                if (!isempty(buffer)) {
+                   T *l = new T;
+                   if (l->Parse(buffer))
+                      Add(l);
+                   else {
+                      esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+                      delete l;
+                      result = false;
+                      break;
+                      }
                    }
                 }
           fclose(f);
diff --git a/dvbapi.c b/dvbapi.c
index 8518d7f99..a929b5039 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.61 2001/02/24 13:13:19 kls Exp $
+ * $Id: dvbapi.c 1.66 2001/03/31 15:01:57 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -22,6 +22,8 @@ extern "C" {
 #include "config.h"
 #include "interface.h"
 #include "recording.h"
+#include "remux.h"
+#include "ringbuffer.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -29,29 +31,9 @@ extern "C" {
 #define VBIDEVICE   "/dev/vbi"
 
 // The size of the array used to buffer video data:
+// (must be larger than MINVIDEODATA - see remux.h)
 #define VIDEOBUFSIZE (1024*1024)
 
-// The minimum amount of video data necessary to identify frames
-// (must be smaller than VIDEOBUFSIZE!):
-#define MINVIDEODATA (256*1024) // just a safe guess (max. size of any frame block, plus some safety)
-
-// The maximum time the buffer is allowed to write data to disk when recording:
-#define MAXRECORDWRITETIME 50 // ms
-
-// Picture types:
-#define NO_PICTURE 0
-#define I_FRAME    1
-#define P_FRAME    2
-#define B_FRAME    3
-
-// Start codes:
-#define SC_PICTURE 0x00  // "picture header"
-#define SC_SEQU    0xB3  // "sequence header"
-#define SC_PHEAD   0xBA  // "pack header"
-#define SC_SHEAD   0xBB  // "system header"
-#define SC_AUDIO   0xC0
-#define SC_VIDEO   0xE0
-
 #define FRAMESPERSEC 25
 
 // The maximum file size is limited by the range that can be covered
@@ -333,7 +315,7 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
   return -1;
 }
 
-// --- cRingBuffer -----------------------------------------------------------
+// --- cRingBuffer_ -----------------------------------------------------------
 
 /* cRingBuffer reads data from an input file, stores it in a buffer and writes
    it to an output file upon request. The Read() and Write() functions should
@@ -344,7 +326,7 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
    will be made.
 */
 
-class cRingBuffer {
+class cRingBuffer_ {
 private:
   uchar *buffer;
   int size, head, tail, freeLimit, availLimit;
@@ -367,8 +349,8 @@ class cRingBuffer {
   int FindStartCode(uchar Code, int Offset = 0);
   int GetPacketLength(int Offset = 0);
 public:
-  cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit = 0, int AvailLimit = 0);
-  virtual ~cRingBuffer();
+  cRingBuffer_(int *InFile, int *OutFile, int Size, int FreeLimit = 0, int AvailLimit = 0);
+  virtual ~cRingBuffer_();
   virtual int Read(int Max = -1);
   virtual int Write(int Max = -1);
   bool EndOfFile(void) { return eof; }
@@ -377,7 +359,7 @@ class cRingBuffer {
   void Skip(int n);
   };
 
-cRingBuffer::cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit, int AvailLimit)
+cRingBuffer_::cRingBuffer_(int *InFile, int *OutFile, int Size, int FreeLimit, int AvailLimit)
 {
   inFile = InFile;
   outFile = OutFile;
@@ -393,13 +375,13 @@ cRingBuffer::cRingBuffer(int *InFile, int *OutFile, int Size, int FreeLimit, int
      esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", size);
 }
 
-cRingBuffer::~cRingBuffer()
+cRingBuffer_::~cRingBuffer_()
 {
   dsyslog(LOG_INFO, "buffer stats: %d free, %d overflows, limit exceeded %d times", minFree, countOverflow, countLimit);
   delete buffer;
 }
 
-int cRingBuffer::Byte(int Offset)
+int cRingBuffer_::Byte(int Offset)
 {
   if (buffer && Offset < Available()) {
      Offset += head;
@@ -410,7 +392,7 @@ int cRingBuffer::Byte(int Offset)
   return -1;
 }
 
-bool cRingBuffer::Set(int Offset, int Length, int Value)
+bool cRingBuffer_::Set(int Offset, int Length, int Value)
 {
   if (buffer && Offset + Length <= Available() ) {
      Offset += head;
@@ -425,7 +407,7 @@ bool cRingBuffer::Set(int Offset, int Length, int Value)
   return false;
 }
 
-void cRingBuffer::Skip(int n)
+void cRingBuffer_::Skip(int n)
 {
   if (n > 0) {
      if (head < tail) {
@@ -443,7 +425,7 @@ void cRingBuffer::Skip(int n)
      }
 }
 
-int cRingBuffer::Read(int Max)
+int cRingBuffer_::Read(int Max)
 {
   if (buffer) {
      eof = false;
@@ -501,7 +483,7 @@ int cRingBuffer::Read(int Max)
   return -1;
 }
 
-int cRingBuffer::Write(int Max)
+int cRingBuffer_::Write(int Max)
 {
   if (buffer) {
      int avail = Available();
@@ -540,7 +522,7 @@ int cRingBuffer::Write(int Max)
   return -1;
 }
 
-int cRingBuffer::FindStartCode(uchar Code, int Offset)
+int cRingBuffer_::FindStartCode(uchar Code, int Offset)
 {
   // Searches for a start code (beginning at Offset) and returns the number
   // of bytes from Offset to the start code.
@@ -557,7 +539,7 @@ int cRingBuffer::FindStartCode(uchar Code, int Offset)
   return -1;
 }
 
-int cRingBuffer::GetPacketLength(int Offset)
+int cRingBuffer_::GetPacketLength(int Offset)
 {
   // Returns the entire length of the packet starting at offset.
   return (Byte(Offset + 4) << 8) + Byte(Offset + 5) + 6;
@@ -671,31 +653,29 @@ int cFileName::NextFile(void)
 
 // --- cRecordBuffer ---------------------------------------------------------
 
-class cRecordBuffer : public cRingBuffer, public cThread {
+class cRecordBuffer : public cRingBuffer {
 private:
   cFileName fileName;
   cIndexFile *index;
+  cRemux remux;
   uchar pictureType;
   int fileSize;
   int videoDev;
   int recordFile;
-  bool ok, synced, stop;
+  bool recording;
   time_t lastDiskSpaceCheck;
   bool RunningLowOnDiskSpace(void);
-  int ScanVideoPacket(int *PictureType, int Offset);
-  int Synchronize(void);
   bool NextFile(void);
-  virtual int Write(int Max = -1);
-  bool WriteWithTimeout(void);
 protected:
-  virtual void Action(void);
+  virtual void Input(void);
+  virtual void Output(void);
 public:
   cRecordBuffer(int *InFile, const char *FileName);
   virtual ~cRecordBuffer();
   };
 
 cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
-:cRingBuffer(InFile, &recordFile, VIDEOBUFSIZE, VIDEOBUFSIZE / 10, 0)
+:cRingBuffer(VIDEOBUFSIZE)
 ,fileName(FileName, true)
 {
   index = NULL;
@@ -703,7 +683,7 @@ cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
   fileSize = 0;
   videoDev = *InFile;
   recordFile = fileName.Open();
-  ok = synced = stop = false;
+  recording = false;
   lastDiskSpaceCheck = time(NULL);
   if (!fileName.Name())
      return;
@@ -712,44 +692,15 @@ cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
   if (!index)
      esyslog(LOG_ERR, "ERROR: can't allocate index");
      // let's continue without index, so we'll at least have the recording
-  ok = true;
   Start();
 }
 
 cRecordBuffer::~cRecordBuffer()
 {
-  stop = true;
-  Cancel(3);
+  Stop();
   delete index;
 }
 
-void cRecordBuffer::Action(void)
-{
-  dsyslog(LOG_INFO, "recording thread started (pid=%d)", getpid());
-
-  time_t t = time(NULL);
-  for (;;) {
-      usleep(1); // this keeps the CPU load low
-
-      LOCK_THREAD;
-
-      int r = Read();
-      if (r >= 0) {
-         if (r > 0)
-            t = time(NULL);
-         if (!WriteWithTimeout())
-            break;
-         }
-      if (r < 0 || (r == 0 && time(NULL) - t > 5)) {
-         esyslog(LOG_ERR, "ERROR: video data stream broken");
-         t = time(NULL);
-         }
-      }
-  SetPlayMode(videoDev, VID_PLAY_RESET);
-
-  dsyslog(LOG_INFO, "end recording thread");
-}
-
 bool cRecordBuffer::RunningLowOnDiskSpace(void)
 {
   if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
@@ -763,88 +714,6 @@ bool cRecordBuffer::RunningLowOnDiskSpace(void)
   return false;
 }
 
-int cRecordBuffer::ScanVideoPacket(int *PictureType, int Offset)
-{
-  // Scans the video packet starting at Offset and returns its length.
-  // If the return value is -1 the packet was not completely in the buffer.
-
-  int Length = GetPacketLength(Offset);
-  if (Length <= Available()) {
-     int i = Offset + 8; // the minimum length of the video packet header
-     i += Byte(i) + 1;   // possible additional header bytes
-     for (; i < Offset + Length; i++) {
-         if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
-            switch (Byte(i + 3)) {
-              case SC_PICTURE: *PictureType = GetPictureType(i);
-                               return Length;
-              }
-            }
-         }
-     *PictureType = NO_PICTURE;
-     return Length;
-     }
-  return -1;
-}
-
-int cRecordBuffer::Synchronize(void)
-{
-  // Positions to the start of a data block (skipping everything up to
-  // an I-frame if not synced) and returns the block length.
-
-  pictureType = NO_PICTURE;
-
-  //XXX remove this once the buffer is handled with two separate threads:
-  if (!synced && Free() < 100000) {
-     dsyslog(LOG_INFO, "unable to synchronize, dropped %d bytes", Available());
-     Clear();
-     return 0;
-     }
-  for (int i = 0; Available() > MINVIDEODATA && i < MINVIDEODATA; i++) {
-      if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
-         switch (Byte(i + 3)) {
-           case SC_VIDEO:   {
-                              int pt = NO_PICTURE;
-                              int l = ScanVideoPacket(&pt, i);
-                              if (l < 0)
-                                 return 0; // no useful data found, wait for more
-                              if (pt != NO_PICTURE) {
-                                 if (pt < I_FRAME || B_FRAME < pt) {
-                                    esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
-                                    }
-                                 else if (pictureType == NO_PICTURE) {
-                                    if (!synced) {
-                                       if (pt == I_FRAME) {
-                                          Skip(i);
-                                          synced = true;
-                                          }
-                                       else {
-                                          Skip(i + l);
-                                          i = 0;
-                                          break;
-                                          }
-                                       }
-                                    if (synced)
-                                       pictureType = pt;
-                                    }
-                                 else
-                                    return i;
-                                 }
-                              else if (!synced) {
-                                 Skip(i + l);
-                                 i = 0;
-                                 break;
-                                 }
-                              i += l - 1; // -1 to compensate for i++ in the loop!
-                            }
-                            break;
-           case SC_AUDIO:   i += GetPacketLength(i) - 1; // -1 to compensate for i++ in the loop!
-                            break;
-           }
-         }
-      }
-  return 0; // no useful data found, wait for more
-}
-
 bool cRecordBuffer::NextFile(void)
 {
   if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
@@ -856,56 +725,93 @@ bool cRecordBuffer::NextFile(void)
   return recordFile >= 0;
 }
 
-int cRecordBuffer::Write(int Max)
+void cRecordBuffer::Input(void)
 {
-  // This function ignores the incoming 'Max'!
-  // It tries to write out exactly *one* frame block.
-  if (!ok)
-     return -1;
-  int n = Synchronize();
-  if (n) {
-     if (stop && pictureType == I_FRAME) {
-        ok = false;
-        return -1; // finish the recording before the next 'I' frame
-        }
-     if (NextFile()) {
-        if (index && pictureType != NO_PICTURE)
-           index->Write(pictureType, fileName.Number(), fileSize);
-        int written = 0;
-        for (;;) {
-            int w = cRingBuffer::Write(n);
-            if (w >= 0) {
-               fileSize += w;
-               written += w;
-               n -= w;
-               if (n == 0)
-                  return written;
+  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
+
+  uchar b[MINVIDEODATA];
+  time_t t = time(NULL);
+  recording = true;
+  for (;;) {
+      int r = read(videoDev, b, sizeof(b));
+      if (r > 0) {
+         uchar *p = b;
+         while (r > 0) {
+               int w = Put(p, r);
+               p += w;
+               r -= w;
                }
-            else
-               return w;
+         t = time(NULL);
+         }
+      else if (r < 0) {
+         if (errno != EAGAIN) {
+            LOG_ERROR;
+            break;
             }
-        }
-     return -1;
-     }
-  return 0;
+         }
+      else if (time(NULL) - t > 5) {
+         esyslog(LOG_ERR, "ERROR: video data stream broken");
+         t = time(NULL);
+         }
+      cFile::FileReady(videoDev, 100);
+      if (!recording)
+         break;
+      }
+  SetPlayMode(videoDev, VID_PLAY_RESET);
+
+  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
 }
 
-bool cRecordBuffer::WriteWithTimeout(void)
+void cRecordBuffer::Output(void)
 {
-  int t0 = time_ms();
-  do {
-     int w = Write();
-     if (w < 0)
-        return false;
-     if (w == 0)
-        break;
-     } while (time_ms() - t0 < MAXRECORDWRITETIME);
-  return true;
+  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+
+  uchar b[MINVIDEODATA * 2];
+  int r = 0;
+  for (;;) {
+      usleep(1); // this keeps the CPU load low
+      r += Get(b + r, sizeof(b) - r);
+      if (r > 0) {
+         //XXX buffer full???
+         int Count = r, Result;
+         const uchar *p = remux.Process(b, Count, Result, pictureType);
+         if (p) {
+            if (!Busy() && pictureType == I_FRAME) // finish the recording before the next 'I' frame
+               break;
+            if (NextFile()) {
+               if (index && pictureType != NO_PICTURE)
+                  index->Write(pictureType, fileName.Number(), fileSize);
+               while (Result > 0) {
+                     int w = write(recordFile, p, Result);
+                     if (w < 0) {
+                        LOG_ERROR_STR(fileName.Name());
+                        recording = false;
+                        return;
+                        }
+                     p += w;
+                     Result -= w;
+                     fileSize += w;
+                     }
+               }
+            else
+               break;
+            }
+         if (Count > 0) {
+            r -= Count;
+            memmove(b, b + Count, r);
+            }
+         if (!recording)
+            break;
+         }
+      }
+  recording = false;
+
+  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
 }
 
 // --- cReplayBuffer ---------------------------------------------------------
 
-class cReplayBuffer : public cRingBuffer, public cThread {
+class cReplayBuffer : public cRingBuffer_, public cThread {
 private:
   enum eReplayCmd { rcNone, rcStill, rcPause, rcPlay, rcForward, rcBackward };
   enum eReplayMode { rmStill, rmPlay, rmFastForward, rmFastRewind, rmSlowRewind };
@@ -944,7 +850,7 @@ class cReplayBuffer : public cRingBuffer, public cThread {
   };
 
 cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
-:cRingBuffer(&replayFile, OutFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+:cRingBuffer_(&replayFile, OutFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
 ,fileName(FileName, false)
 {
   index = NULL;
@@ -1271,7 +1177,7 @@ int cReplayBuffer::Read(int Max = -1)
      int readin = 0;
      do {
         // If Max is > 0 here we need to make sure we read in the entire block!
-        int r = cRingBuffer::Read(Max);
+        int r = cRingBuffer_::Read(Max);
         if (r >= 0)
            readin += r;
         else
@@ -1300,7 +1206,7 @@ int cReplayBuffer::Write(int Max)
   if (Max) {
      int w;
      do {
-        w = cRingBuffer::Write(Max);
+        w = cRingBuffer_::Write(Max);
         if (w >= 0) {
            fileOffset += w;
            Written += w;
@@ -1348,7 +1254,7 @@ void cTransferBuffer::Action(void)
 {
   dsyslog(LOG_INFO, "data transfer thread started (pid=%d)", getpid());
 
-  cRingBuffer Buffer(&fromDevice, &toDevice, VIDEOBUFSIZE, 0, 0);
+  cRingBuffer_ Buffer(&fromDevice, &toDevice, VIDEOBUFSIZE, 0, 0);
   active = true;
   while (active && Buffer.Available() < 100000) { // need to give the read buffer a head start
         Buffer.Read(); // initializes fromDevice for reading
@@ -1364,7 +1270,7 @@ void cTransferBuffer::Action(void)
 
 // --- cCuttingBuffer --------------------------------------------------------
 
-class cCuttingBuffer : public cRingBuffer, public cThread {
+class cCuttingBuffer : public cRingBuffer_, public cThread {
 private:
   bool active;
   int fromFile, toFile;
@@ -1379,7 +1285,7 @@ class cCuttingBuffer : public cRingBuffer, public cThread {
   };
 
 cCuttingBuffer::cCuttingBuffer(const char *FromFileName, const char *ToFileName)
-:cRingBuffer(&fromFile, &toFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+:cRingBuffer_(&fromFile, &toFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
 {
   active = false;
   fromFile = toFile = -1;
@@ -1438,7 +1344,7 @@ void cCuttingBuffer::Action(void)
                  CurrentFileNumber = FileNumber;
                  }
               if (fromFile >= 0)
-                 Length = cRingBuffer::Read(Length);
+                 Length = cRingBuffer_::Read(Length);
               else
                  break;
               }
@@ -1456,7 +1362,7 @@ void cCuttingBuffer::Action(void)
                  }
               LastIFrame = 0;
               }
-           cRingBuffer::Write(Length);
+           cRingBuffer_::Write(Length);
            toIndex->Write(PictureType, toFileName->Number(), FileSize);
            FileSize += Length;
            if (!LastIFrame)
@@ -1535,7 +1441,7 @@ cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
   videoDev = open(VideoFileName, O_RDWR | O_NONBLOCK);
   if (videoDev >= 0) {
      siProcessor = new cSIProcessor(VbiFileName);
-     if (!NumDvbApis) // only the first one shall set the system time
+     if (!dvbApi[0]) // only the first one shall set the system time
         siProcessor->SetUseTSTime(Setup.SetSystemTime);
      siProcessor->AddFilter(0x14, 0x70);  // TDT
      siProcessor->AddFilter(0x14, 0x73);  // TOT
@@ -1582,7 +1488,7 @@ cDvbApi::~cDvbApi()
      StopTransfer();
      OvlO(false); //Overlay off!
      //XXX the following call sometimes causes a segfault - driver problem?
-     close(videoDev);
+     //XXX close(videoDev);
      }
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   endwin();
@@ -1611,7 +1517,7 @@ cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
 {
   cDvbApi *d = NULL, *dMinPriority = NULL;
   int index = Ca - 1;
-  for (int i = MAXDVBAPI; --i >= 0; ) {
+  for (int i = 0; i < MAXDVBAPI; i++) {
       if (dvbApi[i]) {
          if (i == index) { // means we need exactly _this_ device
             d = dvbApi[i];
@@ -2136,6 +2042,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
   if (videoDev >= 0) {
      cThreadLock ThreadLock(siProcessor); // makes sure the siProcessor won't access the vbi-device while switching
      StopTransfer();
+     StopReplay();
      SetPlayMode(videoDev, VID_PLAY_RESET);
      struct frontend front;
      ioctl(videoDev, VIDIOCGFRONTEND, &front);
diff --git a/eit.c b/eit.c
index 08588b06b..6cbe504d3 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.12 2001/02/24 12:12:58 kls Exp $
+ * $Id: eit.c 1.15 2001/04/01 15:36:09 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -39,11 +39,11 @@
 // --- cMJD ------------------------------------------------------------------
 
 class cMJD {
-public: 
-	cMJD();
-	cMJD(u_char date_hi, u_char date_lo);
-	cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese);
-  	~cMJD();
+public:
+   cMJD();
+   cMJD(u_char date_hi, u_char date_lo);
+   cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese);
+   ~cMJD();
   /**  */
   void ConvertToTime();
   /**  */
@@ -73,18 +73,18 @@ cMJD::cMJD()
 
 cMJD::cMJD(u_char date_hi, u_char date_lo)
 {
-	mjd = date_hi << 8 | date_lo;
-	time_hour = time_minute = time_second = 0;
-	ConvertToTime();
+   mjd = date_hi << 8 | date_lo;
+   time_hour = time_minute = time_second = 0;
+   ConvertToTime();
 }
 
 cMJD::cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese)
 {
-	mjd = date_hi << 8 | date_lo;
-	time_hour = timehr;
-	time_minute = timemi;
-	time_second = timese;
-	ConvertToTime();	
+   mjd = date_hi << 8 | date_lo;
+   time_hour = timehr;
+   time_minute = timemi;
+   time_second = timese;
+   ConvertToTime();
 }
 
 cMJD::~cMJD()
@@ -94,103 +94,102 @@ cMJD::~cMJD()
 /**  */
 void cMJD::ConvertToTime()
 {
-	struct tm t;
-	
-	t.tm_sec = time_second;
-	t.tm_min = time_minute;
-	t.tm_hour = time_hour;
-	int k;
-	
-	t.tm_year = (int) ((mjd - 15078.2) / 365.25);
-	t.tm_mon = (int) ((mjd - 14956.1 - (int)(t.tm_year * 365.25)) / 30.6001);
-	t.tm_mday = (int) (mjd - 14956 - (int)(t.tm_year * 365.25) - (int)(t.tm_mon * 30.6001));
-	k = (t.tm_mon == 14 || t.tm_mon == 15) ? 1 : 0;
-	t.tm_year = t.tm_year + k;
-	t.tm_mon = t.tm_mon - 1 - k * 12;
-	t.tm_mon--;
-
-	t.tm_isdst = -1;
-	t.tm_gmtoff = 0;
-	
-	mjdtime = timegm(&t);
-	
-	//isyslog(LOG_INFO, "Time parsed = %s\n", ctime(&mjdtime));
+   struct tm t;
+
+   t.tm_sec = time_second;
+   t.tm_min = time_minute;
+   t.tm_hour = time_hour;
+   int k;
+
+   t.tm_year = (int) ((mjd - 15078.2) / 365.25);
+   t.tm_mon = (int) ((mjd - 14956.1 - (int)(t.tm_year * 365.25)) / 30.6001);
+   t.tm_mday = (int) (mjd - 14956 - (int)(t.tm_year * 365.25) - (int)(t.tm_mon * 30.6001));
+   k = (t.tm_mon == 14 || t.tm_mon == 15) ? 1 : 0;
+   t.tm_year = t.tm_year + k;
+   t.tm_mon = t.tm_mon - 1 - k * 12;
+   t.tm_mon--;
+
+   t.tm_isdst = -1;
+   t.tm_gmtoff = 0;
+
+   mjdtime = timegm(&t);
+
+   //isyslog(LOG_INFO, "Time parsed = %s\n", ctime(&mjdtime));
 }
 
 /**  */
 bool cMJD::SetSystemTime()
 {
-	struct tm *ptm;
-	time_t loctim;
-	
-	ptm = localtime(&mjdtime);
-	loctim = time(NULL);
-
-	if (abs(mjdtime - loctim) > 2)
-	{
-		isyslog(LOG_INFO, "System Time = %s (%ld)\n", ctime(&loctim), loctim);
-		isyslog(LOG_INFO, "Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
-		if (stime(&mjdtime) < 0)
+   struct tm *ptm;
+   time_t loctim;
+
+   ptm = localtime(&mjdtime);
+   loctim = time(NULL);
+
+   if (abs(mjdtime - loctim) > 2)
+   {
+      isyslog(LOG_INFO, "System Time = %s (%ld)\n", ctime(&loctim), loctim);
+      isyslog(LOG_INFO, "Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
+      if (stime(&mjdtime) < 0)
          esyslog(LOG_ERR, "ERROR while setting system time: %m");
-		return true;
-	}
-	
-	return false;
+      return true;
+   }
+
+   return false;
 }
 /**  */
 time_t cMJD::GetTime_t()
 {
-	return mjdtime;
+   return mjdtime;
 }
 
 // --- cTDT ------------------------------------------------------------------
 
 typedef struct {
-	u_char	table_id							: 8;
+   u_char   table_id                   : 8;
 
 #if BYTE_ORDER == BIG_ENDIAN
-	u_char	section_syntax_indicator	: 1;
-	u_char										: 3;
-	u_char	section_length_hi				: 4;
+   u_char   section_syntax_indicator   : 1;
+   u_char                              : 3;
+   u_char   section_length_hi          : 4;
 #else
-	u_char	section_length_hi				: 4;
-	u_char										: 3;
-	u_char	section_syntax_indicator	: 1;
+   u_char   section_length_hi          : 4;
+   u_char                              : 3;
+   u_char   section_syntax_indicator   : 1;
 #endif
 
-	u_char	section_length_lo				: 8;
+   u_char   section_length_lo          : 8;
 
 
-	u_char	utc_date_hi						: 8;
-	u_char	utc_date_lo						: 8;
-	u_char	utc_hour							: 4;
-	u_char	utc_hour_ten					: 4;
-	u_char	utc_min							: 4;
-	u_char	utc_min_ten						: 4;
-	u_char	utc_sec							: 4;
-	u_char	utc_sec_ten						: 4;
+   u_char   utc_date_hi                : 8;
+   u_char   utc_date_lo                : 8;
+   u_char   utc_hour                   : 4;
+   u_char   utc_hour_ten               : 4;
+   u_char   utc_min                    : 4;
+   u_char   utc_min_ten                : 4;
+   u_char   utc_sec                    : 4;
+   u_char   utc_sec_ten                : 4;
 } tdt_t;
 
 class cTDT {
-public: 
-	cTDT(tdt_t *ptdt);
-	~cTDT();
+public:
+   cTDT(tdt_t *ptdt);
+   ~cTDT();
   /**  */
   bool SetSystemTime();
 protected: // Protected attributes
   /**  */
   tdt_t tdt;
   /**  */
-  cMJD * mjd;
+  cMJD mjd; // kls 2001-03-02: made this a member instead of a pointer (it wasn't deleted in the destructor!)
 };
 
 cTDT::cTDT(tdt_t *ptdt)
+:tdt(*ptdt)
+,mjd(tdt.utc_date_hi, tdt.utc_date_lo, tdt.utc_hour_ten * 10 + tdt.utc_hour,
+                                       tdt.utc_min_ten  * 10 + tdt.utc_min,
+                                       tdt.utc_sec_ten  * 10 + tdt.utc_sec)
 {
-	tdt = *ptdt;
-	mjd = new cMJD(tdt.utc_date_hi, tdt.utc_date_lo,
-						tdt.utc_hour_ten * 10 + tdt.utc_hour,
-						tdt.utc_min_ten * 10 + tdt.utc_min,
-						tdt.utc_sec_ten * 10 + tdt.utc_sec);
 }
 
 cTDT::~cTDT()
@@ -199,22 +198,22 @@ cTDT::~cTDT()
 /**  */
 bool cTDT::SetSystemTime()
 {
-	return mjd->SetSystemTime();
+   return mjd.SetSystemTime();
 }
 
 // --- cEventInfo ------------------------------------------------------------
 
 cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
 {
-	pTitle = NULL;
-	pSubtitle = NULL;
-	pExtendedDescription = NULL;
-	bIsPresent = bIsFollowing = false;
-	lDuration = 0;
-	tTime = 0;
-	uEventID = eventid;
-	uServiceID = serviceid;
-	cExtendedDescriptorNumber = 0;
+   pTitle = NULL;
+   pSubtitle = NULL;
+   pExtendedDescription = NULL;
+   bIsPresent = bIsFollowing = false;
+   lDuration = 0;
+   tTime = 0;
+   uEventID = eventid;
+   uServiceID = serviceid;
+   cExtendedDescriptorNumber = 0;
    nChannelNumber = 0;
 }
 
@@ -228,165 +227,165 @@ cEventInfo::~cEventInfo()
 /**  */
 const char * cEventInfo::GetTitle() const
 {
-	return pTitle;
+   return pTitle;
 }
 /**  */
 const char * cEventInfo::GetSubtitle() const
 {
-	return pSubtitle;
+   return pSubtitle;
 }
 /**  */
 const char * cEventInfo::GetExtendedDescription() const
 {
-	return pExtendedDescription;
+   return pExtendedDescription;
 }
 /**  */
 bool cEventInfo::IsPresent() const
 {
-	return bIsPresent;
+   return bIsPresent;
 }
 /**  */
 void cEventInfo::SetPresent(bool pres)
 {
-	bIsPresent = pres;
+   bIsPresent = pres;
 }
 /**  */
 bool cEventInfo::IsFollowing() const
 {
-	return bIsFollowing;
+   return bIsFollowing;
 }
 /**  */
 void cEventInfo::SetFollowing(bool foll)
 {
-	bIsFollowing = foll;
+   bIsFollowing = foll;
 }
 /**  */
 const char * cEventInfo::GetDate() const
 {
-	static char szDate[25];
+   static char szDate[25];
 
-	strftime(szDate, sizeof(szDate), "%d.%m.%Y", localtime(&tTime));
+   strftime(szDate, sizeof(szDate), "%d.%m.%Y", localtime(&tTime));
 
-	return szDate;
+   return szDate;
 }
 /**  */
 const char * cEventInfo::GetTimeString() const
 {
-	static char szTime[25];
-	
-	strftime(szTime, sizeof(szTime), "%R", localtime(&tTime));
-	
-	return szTime;
+   static char szTime[25];
+
+   strftime(szTime, sizeof(szTime), "%R", localtime(&tTime));
+
+   return szTime;
 }
 /**  */
 const char * cEventInfo::GetEndTimeString() const
 {
-	static char szEndTime[25];
+   static char szEndTime[25];
    time_t tEndTime = tTime + lDuration;
-	
-	strftime(szEndTime, sizeof(szEndTime), "%R", localtime(&tEndTime));
-	
-	return szEndTime;
+
+   strftime(szEndTime, sizeof(szEndTime), "%R", localtime(&tEndTime));
+
+   return szEndTime;
 }
 /**  */
 time_t cEventInfo::GetTime() const
 {
-	return tTime;
+   return tTime;
 }
 /**  */
 long cEventInfo::GetDuration() const
 {
-	return lDuration;
+   return lDuration;
 }
 /**  */
 unsigned short cEventInfo::GetEventID() const
 {
-	return uEventID;
+   return uEventID;
 }
 /**  */
 bool cEventInfo::SetTitle(char *string)
 {
-	if (string == NULL)
-		return false;
-	
-	pTitle = strdup(string);
-	if (pTitle == NULL)
-		return false;
-		
-	return true;
+   if (string == NULL)
+      return false;
+
+   pTitle = strdup(string);
+   if (pTitle == NULL)
+      return false;
+
+   return true;
 }
 /**  */
 bool cEventInfo::SetSubtitle(char *string)
 {
-	if (string == NULL)
-		return false;
-	
-	pSubtitle = strdup(string);
-	if (pSubtitle == NULL)
-		return false;
-		
-	return true;
+   if (string == NULL)
+      return false;
+
+   pSubtitle = strdup(string);
+   if (pSubtitle == NULL)
+      return false;
+
+   return true;
 }
 /**  */
 bool cEventInfo::AddExtendedDescription(char *string)
 {
-	int size = 0;
-	bool first = true;
-	char *p;
-	
-	if (string == NULL)
-		return false;
-	
-	if (pExtendedDescription)
-	{
-		first = false;
-		size += strlen(pExtendedDescription);
-	}
-
-	size += (strlen(string) + 1);
-
-	p = (char *)realloc(pExtendedDescription, size);
-	if (p == NULL)
-		return false;
-	
-	if (first)
-		*p = 0;
-	
-	strcat(p, string);
-	
-	pExtendedDescription = p;
-
-	return true;
+   int size = 0;
+   bool first = true;
+   char *p;
+
+   if (string == NULL)
+      return false;
+
+   if (pExtendedDescription)
+   {
+      first = false;
+      size += strlen(pExtendedDescription);
+   }
+
+   size += (strlen(string) + 1);
+
+   p = (char *)realloc(pExtendedDescription, size);
+   if (p == NULL)
+      return false;
+
+   if (first)
+      *p = 0;
+
+   strcat(p, string);
+
+   pExtendedDescription = p;
+
+   return true;
 }
 /**  */
 void cEventInfo::SetTime(time_t t)
 {
-	tTime = t;
+   tTime = t;
 }
 /**  */
 void cEventInfo::SetDuration(long l)
 {
-	lDuration = l;
+   lDuration = l;
 }
 /**  */
 void cEventInfo::SetEventID(unsigned short evid)
 {
-	uEventID = evid;
+   uEventID = evid;
 }
 /**  */
 void cEventInfo::SetServiceID(unsigned short servid)
 {
-	uServiceID = servid;
+   uServiceID = servid;
 }
 /**  */
 u_char cEventInfo::GetExtendedDescriptorNumber() const
 {
-	return cExtendedDescriptorNumber;
+   return cExtendedDescriptorNumber;
 }
 /**  */
 void cEventInfo::IncreaseExtendedDescriptorNumber()
 {
-	cExtendedDescriptorNumber++;
+   cExtendedDescriptorNumber++;
 }
 
 /**  */
@@ -396,17 +395,17 @@ unsigned short cEventInfo::GetServiceID() const
 }
 
 /**  */
-void cEventInfo::Dump(FILE *f) const
+void cEventInfo::Dump(FILE *f, const char *Prefix) const
 {
    if (tTime + lDuration >= time(NULL)) {
-      fprintf(f, "E %u %ld %ld\n", uEventID, tTime, lDuration);
+      fprintf(f, "%sE %u %ld %ld\n", Prefix, uEventID, tTime, lDuration);
       if (!isempty(pTitle))
-         fprintf(f, "T %s\n", pTitle);
+         fprintf(f, "%sT %s\n", Prefix, pTitle);
       if (!isempty(pSubtitle))
-         fprintf(f, "S %s\n", pSubtitle);
+         fprintf(f, "%sS %s\n", Prefix, pSubtitle);
       if (!isempty(pExtendedDescription))
-         fprintf(f, "D %s\n", pExtendedDescription);
-      fprintf(f, "e\n");
+         fprintf(f, "%sD %s\n", Prefix, pExtendedDescription);
+      fprintf(f, "%se\n", Prefix);
       }
 }
 
@@ -414,8 +413,8 @@ void cEventInfo::Dump(FILE *f) const
 
 cSchedule::cSchedule(unsigned short servid)
 {
-	pPresent = pFollowing = NULL;
-	uServiceID = servid;
+   pPresent = pFollowing = NULL;
+   uServiceID = servid;
 }
 
 
@@ -429,15 +428,15 @@ const cEventInfo * cSchedule::GetPresentEvent() const
    time_t now = time(NULL);
    if (pPresent && !(pPresent->GetTime() <= now && now <= pPresent->GetTime() + pPresent->GetDuration()))
    {
-	   cEventInfo *pe = Events.First();
-	   while (pe != NULL)
-	   {
-		   if (pe->GetTime() <= now && now <= pe->GetTime() + pe->GetDuration())
+      cEventInfo *pe = Events.First();
+      while (pe != NULL)
+      {
+         if (pe->GetTime() <= now && now <= pe->GetTime() + pe->GetDuration())
             return pe;
          pe = Events.Next(pe);
-	   }
+      }
    }
-	return pPresent;
+   return pPresent;
 }
 /**  */
 const cEventInfo * cSchedule::GetFollowingEvent() const
@@ -451,111 +450,111 @@ const cEventInfo * cSchedule::GetFollowingEvent() const
       cEventInfo *pe = Events.First(), *pf = NULL;
       while (pe != NULL)
       {
-	      int dt = pe->GetTime() - now;
-	      if (dt > 0 && dt < minDt)
+         int dt = pe->GetTime() - now;
+         if (dt > 0 && dt < minDt)
          {
             minDt = dt;
             pf = pe;
          }
-	      pe = Events.Next(pe);
+         pe = Events.Next(pe);
       }
       return pf;
    }
-	return pFollowing;
+   return pFollowing;
 }
 /**  */
 void cSchedule::SetServiceID(unsigned short servid)
 {
-	uServiceID = servid;
+   uServiceID = servid;
 }
 /**  */
 unsigned short cSchedule::GetServiceID() const
 {
-	return uServiceID;
+   return uServiceID;
 }
 /**  */
 const cEventInfo * cSchedule::GetEvent(unsigned short uEventID) const
 {
-	cEventInfo *pe = Events.First();
-	while (pe != NULL)
-	{
-		if (pe->GetEventID() == uEventID)
-			return pe;
-			
-		pe = Events.Next(pe);
-	}
-	
-	return NULL;
+   cEventInfo *pe = Events.First();
+   while (pe != NULL)
+   {
+      if (pe->GetEventID() == uEventID)
+         return pe;
+
+      pe = Events.Next(pe);
+   }
+
+   return NULL;
 }
 /**  */
 const cEventInfo * cSchedule::GetEvent(time_t tTime) const
 {
-	cEventInfo *pe = Events.First();
-	while (pe != NULL)
-	{
-		if (pe->GetTime() == tTime)
-			return pe;
-			
-		pe = Events.Next(pe);
-	}
-	
-	return NULL;
+   cEventInfo *pe = Events.First();
+   while (pe != NULL)
+   {
+      if (pe->GetTime() == tTime)
+         return pe;
+
+      pe = Events.Next(pe);
+   }
+
+   return NULL;
 }
 /**  */
 bool cSchedule::SetPresentEvent(cEventInfo *pEvent)
 {
-	if (pPresent != NULL)
-		pPresent->SetPresent(false);
-	pPresent = pEvent;
-	pPresent->SetPresent(true);
-	
-	return true;
+   if (pPresent != NULL)
+      pPresent->SetPresent(false);
+   pPresent = pEvent;
+   pPresent->SetPresent(true);
+
+   return true;
 }
 
 /**  */
 bool cSchedule::SetFollowingEvent(cEventInfo *pEvent)
 {
-	if (pFollowing != NULL)
-		pFollowing->SetFollowing(false);
-	pFollowing = pEvent;
-	pFollowing->SetFollowing(true);
-	
-	return true;
+   if (pFollowing != NULL)
+      pFollowing->SetFollowing(false);
+   pFollowing = pEvent;
+   pFollowing->SetFollowing(true);
+
+   return true;
 }
 
 /**  */
 void cSchedule::Cleanup()
 {
-	Cleanup(time(NULL));
+   Cleanup(time(NULL));
 }
 
 /**  */
 void cSchedule::Cleanup(time_t tTime)
 {
-	cEventInfo *pEvent;
-	for (int a = 0; true ; a++)
-	{
-		pEvent = Events.Get(a);
-		if (pEvent == NULL)
-			break;
-		if (pEvent->GetTime() + pEvent->GetDuration() < tTime)
-		{
-			Events.Del(pEvent);
-			a--;
-		}
-	}
+   cEventInfo *pEvent;
+   for (int a = 0; true ; a++)
+   {
+      pEvent = Events.Get(a);
+      if (pEvent == NULL)
+         break;
+      if (pEvent->GetTime() + pEvent->GetDuration() < tTime)
+      {
+         Events.Del(pEvent);
+         a--;
+      }
+   }
 }
 
 /**  */
-void cSchedule::Dump(FILE *f) const
+void cSchedule::Dump(FILE *f, const char *Prefix) const
 {
    cChannel *channel = Channels.GetByServiceID(uServiceID);
    if (channel)
    {
-      fprintf(f, "C %u %s\n", uServiceID, channel->name);
+      fprintf(f, "%sC %u %s\n", Prefix, uServiceID, channel->name);
       for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
-         p->Dump(f);
-      fprintf(f, "c\n");
+         p->Dump(f, Prefix);
+      fprintf(f, "%sc\n", Prefix);
    }
 }
 
@@ -563,8 +562,8 @@ void cSchedule::Dump(FILE *f) const
 
 cSchedules::cSchedules()
 {
-	pCurrentSchedule = NULL;
-	uCurrentServiceID = 0;
+   pCurrentSchedule = NULL;
+   uCurrentServiceID = 0;
 }
 
 cSchedules::~cSchedules()
@@ -573,58 +572,58 @@ cSchedules::~cSchedules()
 /**  */
 bool cSchedules::SetCurrentServiceID(unsigned short servid)
 {
-	pCurrentSchedule = GetSchedule(servid);
-	if (pCurrentSchedule == NULL)
-	{
-		Add(new cSchedule(servid));
-		pCurrentSchedule = GetSchedule(servid);
-		if (pCurrentSchedule == NULL)
-			return false;
-	}
-	
-	uCurrentServiceID = servid;
-	
-	return true;
+   pCurrentSchedule = GetSchedule(servid);
+   if (pCurrentSchedule == NULL)
+   {
+      Add(new cSchedule(servid));
+      pCurrentSchedule = GetSchedule(servid);
+      if (pCurrentSchedule == NULL)
+         return false;
+   }
+
+   uCurrentServiceID = servid;
+
+   return true;
 }
 /**  */
 const cSchedule * cSchedules::GetSchedule() const
 {
-	return pCurrentSchedule;
+   return pCurrentSchedule;
 }
 /**  */
 const cSchedule * cSchedules::GetSchedule(unsigned short servid) const
 {
-	cSchedule *p;
-	
-	p = First();
-	while (p != NULL)
-	{
-		if (p->GetServiceID() == servid)
-			return p;
-		p = Next(p);
-	}
-	
-	return NULL;
+   cSchedule *p;
+
+   p = First();
+   while (p != NULL)
+   {
+      if (p->GetServiceID() == servid)
+         return p;
+      p = Next(p);
+   }
+
+   return NULL;
 }
 
 /**  */
 void cSchedules::Cleanup()
 {
-	cSchedule *p;
-	
-	p = First();
-	while (p != NULL)
-	{
-		p->Cleanup(time(NULL));
-		p = Next(p);
-	}
+   cSchedule *p;
+
+   p = First();
+   while (p != NULL)
+   {
+      p->Cleanup(time(NULL));
+      p = Next(p);
+   }
 }
 
 /**  */
-void cSchedules::Dump(FILE *f) const
+void cSchedules::Dump(FILE *f, const char *Prefix) const
 {
    for (cSchedule *p = First(); p; p = Next(p))
-      p->Dump(f);
+      p->Dump(f, Prefix);
 }
 
 // --- cEIT ------------------------------------------------------------------
@@ -632,136 +631,136 @@ void cSchedules::Dump(FILE *f) const
 #define DEC(N) dec << setw(N) << setfill(int('0'))
 #define HEX(N) hex << setw(N) << setfill(int('0'))
 
-#define EIT_STUFFING_DESCRIPTOR						0x42
-#define EIT_LINKAGE_DESCRIPTOR						0x4a
-#define EIT_SHORT_EVENT_DESCRIPTOR 					0x4d
-#define EIT_EXTENDED_EVENT_DESCRIPTOR 				0x4e
-#define EIT_TIME_SHIFTED_EVENT_DESCRIPTOR			0x4f
-#define EIT_COMPONENT_DESCRIPTOR						0x50
-#define EIT_CA_IDENTIFIER_DESCRIPTOR				0x53
-#define EIT_CONTENT_DESCRIPTOR						0x54
-#define EIT_PARENTAL_RATING_DESCRIPTOR				0x55
-#define EIT_TELEPHONE_DESCRIPTOR						0x57
-#define EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR	0x5e
-#define EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR	0x5f
-#define EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR	0x61
-#define EIT_DATA_BROADCAST_DESCRIPTOR				0x64
-#define EIT_PDC_DESCRIPTOR								0x69
+#define EIT_STUFFING_DESCRIPTOR                 0x42
+#define EIT_LINKAGE_DESCRIPTOR                  0x4a
+#define EIT_SHORT_EVENT_DESCRIPTOR              0x4d
+#define EIT_EXTENDED_EVENT_DESCRIPTOR           0x4e
+#define EIT_TIME_SHIFTED_EVENT_DESCRIPTOR       0x4f
+#define EIT_COMPONENT_DESCRIPTOR                0x50
+#define EIT_CA_IDENTIFIER_DESCRIPTOR            0x53
+#define EIT_CONTENT_DESCRIPTOR                  0x54
+#define EIT_PARENTAL_RATING_DESCRIPTOR          0x55
+#define EIT_TELEPHONE_DESCRIPTOR                0x57
+#define EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR   0x5e
+#define EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR   0x5f
+#define EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR   0x61
+#define EIT_DATA_BROADCAST_DESCRIPTOR           0x64
+#define EIT_PDC_DESCRIPTOR                      0x69
 
 typedef struct eit_struct {
-	u_char	table_id 						: 8;
+   u_char   table_id                   : 8;
 
 #if BYTE_ORDER == BIG_ENDIAN
-	u_char	section_syntax_indicator	: 1;
-	u_char										: 3;
-	u_char	section_length_hi 			: 4;
+   u_char   section_syntax_indicator   : 1;
+   u_char                              : 3;
+   u_char   section_length_hi          : 4;
 #else
-	u_char	section_length_hi 			: 4;
-	u_char										: 3;
-	u_char	section_syntax_indicator	: 1;
+   u_char   section_length_hi          : 4;
+   u_char                              : 3;
+   u_char   section_syntax_indicator   : 1;
 #endif
 
-	u_char	section_length_lo 			: 8;
+   u_char   section_length_lo          : 8;
 
-	u_char	service_id_hi					: 8;
-	u_char	service_id_lo					: 8;
+   u_char   service_id_hi              : 8;
+   u_char   service_id_lo              : 8;
 
 #if BYTE_ORDER == BIG_ENDIAN
-	u_char										: 2;
-	u_char	version_number 				: 5;
-	u_char	current_next_indicator		: 1;
+   u_char                              : 2;
+   u_char   version_number             : 5;
+   u_char   current_next_indicator     : 1;
 #else
-	u_char	current_next_indicator		: 1;
-	u_char	version_number 				: 5;
-	u_char										: 2;
+   u_char   current_next_indicator     : 1;
+   u_char   version_number             : 5;
+   u_char                              : 2;
 #endif
 
-	u_char	section_number 				: 8;
-	u_char	last_section_number			: 8;
-	u_char	transport_stream_id_hi		: 8;
-	u_char	transport_stream_id_lo		: 8;
-	u_char	original_network_id_hi		: 8;
-	u_char	original_network_id_lo		: 8;
-	u_char	segment_last_section_number	: 8;
-	u_char	segment_last_table_id		: 8;
+   u_char   section_number             : 8;
+   u_char   last_section_number        : 8;
+   u_char   transport_stream_id_hi     : 8;
+   u_char   transport_stream_id_lo     : 8;
+   u_char   original_network_id_hi     : 8;
+   u_char   original_network_id_lo     : 8;
+   u_char   segment_last_section_number   : 8;
+   u_char   segment_last_table_id      : 8;
 } eit_t;
 
 typedef struct eit_loop_struct {
-	u_char	event_id_hi 					: 8;
-	u_char	event_id_lo 					: 8;
-
-	u_char	date_hi							: 8;
-	u_char	date_lo							: 8;
-	u_char	time_hour						: 4;
-	u_char	time_hour_ten					: 4;
-	u_char	time_minute 					: 4;
-	u_char	time_minute_ten				: 4;
-	u_char	time_second 					: 4;
-	u_char	time_second_ten				: 4;
-
-	u_char	dur_hour 						: 4;
-	u_char	dur_hour_ten					: 4;
-	u_char	dur_minute						: 4;
-	u_char	dur_minute_ten 				: 4;
-	u_char	dur_second						: 4;
-	u_char	dur_second_ten 				: 4;
+   u_char   event_id_hi                : 8;
+   u_char   event_id_lo                : 8;
+
+   u_char   date_hi                    : 8;
+   u_char   date_lo                    : 8;
+   u_char   time_hour                  : 4;
+   u_char   time_hour_ten              : 4;
+   u_char   time_minute                : 4;
+   u_char   time_minute_ten            : 4;
+   u_char   time_second                : 4;
+   u_char   time_second_ten            : 4;
+
+   u_char   dur_hour                   : 4;
+   u_char   dur_hour_ten               : 4;
+   u_char   dur_minute                 : 4;
+   u_char   dur_minute_ten             : 4;
+   u_char   dur_second                 : 4;
+   u_char   dur_second_ten             : 4;
 
 #if BYTE_ORDER == BIG_ENDIAN
-	u_char	running_status 				: 3;
-	u_char	free_ca_mode					: 1;
-	u_char	descriptors_loop_length_hi : 4;
+   u_char   running_status             : 3;
+   u_char   free_ca_mode               : 1;
+   u_char   descriptors_loop_length_hi : 4;
 #else
-	u_char	descriptors_loop_length_hi : 4;
-	u_char	free_ca_mode					: 1;
-	u_char	running_status 				: 3;
+   u_char   descriptors_loop_length_hi : 4;
+   u_char   free_ca_mode               : 1;
+   u_char   running_status             : 3;
 #endif
 
-	u_char	descriptors_loop_length_lo : 8;
+   u_char   descriptors_loop_length_lo : 8;
 } eit_loop_t;
 
 typedef struct eit_short_event_struct {
-	u_char	descriptor_tag 				: 8;
-	u_char	descriptor_length 			: 8;
+   u_char   descriptor_tag             : 8;
+   u_char   descriptor_length          : 8;
 
-	u_char	language_code_1				: 8;
-	u_char	language_code_2				: 8;
-	u_char	language_code_3				: 8;
+   u_char   language_code_1            : 8;
+   u_char   language_code_2            : 8;
+   u_char   language_code_3            : 8;
 
-	u_char	event_name_length 			: 8;
+   u_char   event_name_length          : 8;
 } eit_short_event_t;
 
 typedef struct eit_extended_event_struct {
-	u_char	descriptor_tag 				: 8;
-	u_char	descriptor_length 			: 8;
+   u_char   descriptor_tag             : 8;
+   u_char   descriptor_length          : 8;
 
-	u_char	last_descriptor_number		: 4;
-	u_char	descriptor_number				: 4;
+   u_char   last_descriptor_number     : 4;
+   u_char   descriptor_number          : 4;
 
-	u_char	language_code_1				: 8;
-	u_char	language_code_2				: 8;
-	u_char	language_code_3				: 8;
+   u_char   language_code_1            : 8;
+   u_char   language_code_2            : 8;
+   u_char   language_code_3            : 8;
 
-	u_char	length_of_items 				: 8;
+   u_char   length_of_items            : 8;
 } eit_extended_event_t;
 
 typedef struct eit_content_descriptor {
-	u_char	descriptor_tag					: 8;
-	u_char	descriptor_length				: 8;
+   u_char   descriptor_tag             : 8;
+   u_char   descriptor_length          : 8;
 } eit_content_descriptor_t;
 
 typedef struct eit_content_loop {
-	u_char	content_nibble_level_2		: 4;
-	u_char 	content_nibble_level_1		: 4;
-	u_char	user_nibble_2					: 4;
-	u_char	user_nibble_1					: 4;
+   u_char   content_nibble_level_2     : 4;
+   u_char   content_nibble_level_1     : 4;
+   u_char   user_nibble_2              : 4;
+   u_char   user_nibble_1              : 4;
 } eit_content_loop_t;
 
 class cEIT {
 private:
    cSchedules *schedules;
-public: 
-	cEIT(void *buf, int length, cSchedules *Schedules);
-	~cEIT();
+public:
+   cEIT(void *buf, int length, cSchedules *Schedules);
+   ~cEIT();
   /**  */
   int ProcessEIT();
 
@@ -789,10 +788,10 @@ schedule information */
 
 cEIT::cEIT(void * buf, int length, cSchedules *Schedules)
 {
-	buflen = length < int(sizeof(buffer)) ? length : sizeof(buffer);
-	memset(buffer, 0, sizeof(buffer));
-	memcpy(buffer, buf, buflen);
-	tid = buffer[0];
+   buflen = length < int(sizeof(buffer)) ? length : sizeof(buffer);
+   memset(buffer, 0, sizeof(buffer));
+   memcpy(buffer, buf, buflen);
+   tid = buffer[0];
    schedules = Schedules;
 }
 
@@ -803,114 +802,114 @@ cEIT::~cEIT()
 /**  */
 int cEIT::ProcessEIT()
 {
-	int bufact = 0;
-	eit_t *eit;
-	eit_loop_t *eitloop;
-	u_char tmp[256];
-
-	if (bufact + (int)sizeof(eit_t) > buflen)
-		return 0;
-	eit = (eit_t *)buffer;
-	bufact += sizeof(eit_t);	
-
-	unsigned int service = (eit->service_id_hi << 8) | eit->service_id_lo;
-
-	while(bufact + (int)sizeof(eit_loop_t) <= buflen)
-	{	
-		eitloop = (eit_loop_t *)&buffer[bufact];
-		bufact += sizeof(eit_loop_t);
-
-		int descdatalen = (eitloop->descriptors_loop_length_hi << 8) + eitloop->descriptors_loop_length_lo;
-		int descdataact = 0;
-
-		while (descdataact < descdatalen && bufact < buflen)
-		{
-			switch (buffer[bufact])
-			{
-				eit_content_descriptor_t *cont;
-				eit_content_loop_t *contloop;
-
-				case EIT_STUFFING_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_STUFFING_DESCRIPTOR");
-					break;
-	
-				case EIT_LINKAGE_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_LINKAGE_DESCRIPTOR");
-					break;
-	
-				case EIT_SHORT_EVENT_DESCRIPTOR:
-					WriteShortEventDescriptor(service, eitloop, &buffer[bufact]);
-					break;
-		
-				case EIT_EXTENDED_EVENT_DESCRIPTOR:
-					WriteExtEventDescriptor(service, eitloop, &buffer[bufact]);
-					break;
-
-				case EIT_TIME_SHIFTED_EVENT_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_TIME_SHIFTED_EVENT_DESCRIPTOR");
-					break;
-	
-				case EIT_COMPONENT_DESCRIPTOR	:
+   int bufact = 0;
+   eit_t *eit;
+   eit_loop_t *eitloop;
+   u_char tmp[256];
+
+   if (bufact + (int)sizeof(eit_t) > buflen)
+      return 0;
+   eit = (eit_t *)buffer;
+   bufact += sizeof(eit_t);
+
+   unsigned int service = (eit->service_id_hi << 8) | eit->service_id_lo;
+
+   while(bufact + (int)sizeof(eit_loop_t) <= buflen)
+   {
+      eitloop = (eit_loop_t *)&buffer[bufact];
+      bufact += sizeof(eit_loop_t);
+
+      int descdatalen = (eitloop->descriptors_loop_length_hi << 8) + eitloop->descriptors_loop_length_lo;
+      int descdataact = 0;
+
+      while (descdataact < descdatalen && bufact < buflen)
+      {
+         switch (buffer[bufact])
+         {
+            eit_content_descriptor_t *cont;
+            eit_content_loop_t *contloop;
+
+            case EIT_STUFFING_DESCRIPTOR  :
+               //dsyslog(LOG_INFO, "Found EIT_STUFFING_DESCRIPTOR");
+               break;
+
+            case EIT_LINKAGE_DESCRIPTOR   :
+               //dsyslog(LOG_INFO, "Found EIT_LINKAGE_DESCRIPTOR");
+               break;
+
+            case EIT_SHORT_EVENT_DESCRIPTOR:
+               WriteShortEventDescriptor(service, eitloop, &buffer[bufact]);
+               break;
+
+            case EIT_EXTENDED_EVENT_DESCRIPTOR:
+               WriteExtEventDescriptor(service, eitloop, &buffer[bufact]);
+               break;
+
+            case EIT_TIME_SHIFTED_EVENT_DESCRIPTOR :
+               //dsyslog(LOG_INFO, "Found EIT_TIME_SHIFTED_EVENT_DESCRIPTOR");
+               break;
+
+            case EIT_COMPONENT_DESCRIPTOR :
                if (buffer[bufact + 1] > 6) // kls 2001-02-24: otherwise strncpy() causes a segfault in strdvbcpy()
-					   strdvbcpy(tmp, &buffer[bufact + 8], buffer[bufact + 1] - 6);
-					//dsyslog(LOG_INFO, "Found EIT_COMPONENT_DESCRIPTOR %c%c%c 0x%02x/0x%02x/0x%02x '%s'\n", buffer[bufact + 5], buffer[bufact + 6], buffer[bufact + 7], buffer[2], buffer[3], buffer[4], tmp);
-					break;
-	
-				case EIT_CA_IDENTIFIER_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_CA_IDENTIFIER_DESCRIPTOR");
-					break;
-	
-				case EIT_CONTENT_DESCRIPTOR	:
-					cont = (eit_content_descriptor_t *)buffer;
-					contloop = (eit_content_loop_t *)&buffer[sizeof(eit_content_descriptor_t)];
-					//dsyslog(LOG_INFO, "Found EIT_CONTENT_DESCRIPTOR 0x%02x/0x%02x\n", contloop->content_nibble_level_1, contloop->content_nibble_level_2);
-					break;
-	
-				case EIT_PARENTAL_RATING_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_PARENTAL_RATING_DESCRIPTOR");
-					break;
-	
-				case EIT_TELEPHONE_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_TELEPHONE_DESCRIPTOR");
-					break;
-	
-				case EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR");
-					break;
-	
-				case EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR");
-					break;
-	
-				case EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR");
-					break;
-	
-				case EIT_DATA_BROADCAST_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_DATA_BROADCAST_DESCRIPTOR");
-					break;
-	
-				case EIT_PDC_DESCRIPTOR	:
-					//dsyslog(LOG_INFO, "Found EIT_PDC_DESCRIPTOR");
-					break;
-			
-				default:
-					//dsyslog(LOG_INFO, "Found unhandled descriptor 0x%02x with length of %04d\n", (int)buffer[bufact], (int)buffer[bufact + 1]);
-					break;
-			}
-			descdataact += (buffer[bufact + 1] + 2);
-			bufact += (buffer[bufact + 1] + 2);
-		}
-	}
-
-	return 0;
+                  strdvbcpy(tmp, &buffer[bufact + 8], buffer[bufact + 1] - 6);
+               //dsyslog(LOG_INFO, "Found EIT_COMPONENT_DESCRIPTOR %c%c%c 0x%02x/0x%02x/0x%02x '%s'\n", buffer[bufact + 5], buffer[bufact + 6], buffer[bufact + 7], buffer[2], buffer[3], buffer[4], tmp);
+               break;
+
+            case EIT_CA_IDENTIFIER_DESCRIPTOR   :
+               //dsyslog(LOG_INFO, "Found EIT_CA_IDENTIFIER_DESCRIPTOR");
+               break;
+
+            case EIT_CONTENT_DESCRIPTOR   :
+               cont = (eit_content_descriptor_t *)buffer;
+               contloop = (eit_content_loop_t *)&buffer[sizeof(eit_content_descriptor_t)];
+               //dsyslog(LOG_INFO, "Found EIT_CONTENT_DESCRIPTOR 0x%02x/0x%02x\n", contloop->content_nibble_level_1, contloop->content_nibble_level_2);
+               break;
+
+            case EIT_PARENTAL_RATING_DESCRIPTOR :
+               //dsyslog(LOG_INFO, "Found EIT_PARENTAL_RATING_DESCRIPTOR");
+               break;
+
+            case EIT_TELEPHONE_DESCRIPTOR :
+               //dsyslog(LOG_INFO, "Found EIT_TELEPHONE_DESCRIPTOR");
+               break;
+
+            case EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR   :
+               //dsyslog(LOG_INFO, "Found EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR");
+               break;
+
+            case EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR   :
+               //dsyslog(LOG_INFO, "Found EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR");
+               break;
+
+            case EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR   :
+               //dsyslog(LOG_INFO, "Found EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR");
+               break;
+
+            case EIT_DATA_BROADCAST_DESCRIPTOR  :
+               //dsyslog(LOG_INFO, "Found EIT_DATA_BROADCAST_DESCRIPTOR");
+               break;
+
+            case EIT_PDC_DESCRIPTOR :
+               //dsyslog(LOG_INFO, "Found EIT_PDC_DESCRIPTOR");
+               break;
+
+            default:
+               //dsyslog(LOG_INFO, "Found unhandled descriptor 0x%02x with length of %04d\n", (int)buffer[bufact], (int)buffer[bufact + 1]);
+               break;
+         }
+         descdataact += (buffer[bufact + 1] + 2);
+         bufact += (buffer[bufact + 1] + 2);
+      }
+   }
+
+   return 0;
 }
 
 /**  */
 int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
 {
-	int a = 0;
-	
+   int a = 0;
+
    // kls 2001-02-24: if we come in with negative values, the caller must
    // have done something wrong and the strncpy() below will cause a segfault
    if (max <= 0)
@@ -919,42 +918,42 @@ int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
       return 0;
    }
 
-	if (*src == 0x05 || (*src >= 0x20 && *src <= 0xff))
-	{
-		for (a = 0; a < max; a++)
-		{
-			if (*src == 0)
-				break;
-		
-			if ((*src >= ' ' && *src <= '~') || (*src >= 0xa0 && *src <= 0xff))
-				*dst++ = *src++;
-			else
-			{
-				// if ((*src > '~' && *src < 0xa0) || *src == 0xff)
-				// cerr << "found special character 0x" << HEX(2) << (int)*src << endl;
-				src++;
-			}
-		}
-		*dst = 0;
-	}
-	else
-	{
-		const char *ret;
-
-		switch (*src)
-		{
-			case 0x01: ret = "Coding according to character table 1"; break;
-			case 0x02: ret = "Coding according to character table 2"; break;
-			case 0x03: ret = "Coding according to character table 3"; break;
-			case 0x04: ret = "Coding according to character table 4"; break;
-			case 0x10: ret = "Coding according to ISO/IEC 8859"; break;
-			case 0x11: ret = "Coding according to ISO/IEC 10646"; break;
-			case 0x12: ret = "Coding according to KSC 5601"; break;
-			default: ret = "Unknown coding"; break;
-		}
-		strncpy((char *)dst, ret, max);
-	}
-	return a;
+   if (*src == 0x05 || (*src >= 0x20 && *src <= 0xff))
+   {
+      for (a = 0; a < max; a++)
+      {
+         if (*src == 0)
+            break;
+
+         if ((*src >= ' ' && *src <= '~') || (*src >= 0xa0 && *src <= 0xff))
+            *dst++ = *src++;
+         else
+         {
+            // if ((*src > '~' && *src < 0xa0) || *src == 0xff)
+            // cerr << "found special character 0x" << HEX(2) << (int)*src << endl;
+            src++;
+         }
+      }
+      *dst = 0;
+   }
+   else
+   {
+      const char *ret;
+
+      switch (*src)
+      {
+         case 0x01: ret = "Coding according to character table 1"; break;
+         case 0x02: ret = "Coding according to character table 2"; break;
+         case 0x03: ret = "Coding according to character table 3"; break;
+         case 0x04: ret = "Coding according to character table 4"; break;
+         case 0x10: ret = "Coding according to ISO/IEC 8859"; break;
+         case 0x11: ret = "Coding according to ISO/IEC 10646"; break;
+         case 0x12: ret = "Coding according to KSC 5601"; break;
+         default: ret = "Unknown coding"; break;
+      }
+      strncpy((char *)dst, ret, max);
+   }
+   return a;
 }
 
 /** returns true if this EIT covers a
@@ -962,140 +961,140 @@ present/following information, false if it's
 schedule information */
 bool cEIT::IsPresentFollowing()
 {
-	if (tid == 0x4e || tid == 0x4f)
-		return true;
+   if (tid == 0x4e || tid == 0x4f)
+      return true;
 
-	return false;
+   return false;
 }
 
 /**  */
 bool cEIT::WriteShortEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf)
 {
-	u_char tmp[256];
-	eit_short_event_t *evt = (eit_short_event_t *)buf;
-	unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
-	cEventInfo *pEvent;
-
-	//isyslog(LOG_INFO, "Found Short Event Descriptor");
-	
-	cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
-	if (pSchedule == NULL)
-	{
-		schedules->Add(new cSchedule(service));
-		pSchedule = (cSchedule *)schedules->GetSchedule(service);
-		if (pSchedule == NULL)
-			return false;
-	}
+   u_char tmp[256];
+   eit_short_event_t *evt = (eit_short_event_t *)buf;
+   unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
+   cEventInfo *pEvent;
+
+   //isyslog(LOG_INFO, "Found Short Event Descriptor");
+
+   cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
+   if (pSchedule == NULL)
+   {
+      schedules->Add(new cSchedule(service));
+      pSchedule = (cSchedule *)schedules->GetSchedule(service);
+      if (pSchedule == NULL)
+         return false;
+   }
 
    /* cSchedule::GetPresentEvent() and cSchedule::GetFollowingEvent() verify
       the temporal sanity of these events, so calling them here appears to
       be a bad idea... (kls 2000-11-01)
-	//
-	// if we are working on a present/following info, let's see whether
-	// we already have present/following info for this service and if yes
-	// check whether it's the same eventid, if yes, just return, nothing
-	// left to do.
-	//
-	if (IsPresentFollowing())
-	{
-		if (eitloop->running_status == 4 || eitloop->running_status == 3)
-			pEvent = (cEventInfo *)pSchedule->GetPresentEvent();
-		else
-			pEvent = (cEventInfo *)pSchedule->GetFollowingEvent();
-
-		if (pEvent != NULL)
-			if (pEvent->GetEventID() == eventid)
-				return true;
-	}
+   //
+   // if we are working on a present/following info, let's see whether
+   // we already have present/following info for this service and if yes
+   // check whether it's the same eventid, if yes, just return, nothing
+   // left to do.
+   //
+   if (IsPresentFollowing())
+   {
+      if (eitloop->running_status == 4 || eitloop->running_status == 3)
+         pEvent = (cEventInfo *)pSchedule->GetPresentEvent();
+      else
+         pEvent = (cEventInfo *)pSchedule->GetFollowingEvent();
+
+      if (pEvent != NULL)
+         if (pEvent->GetEventID() == eventid)
+            return true;
+   }
    */
 
-	//
-	// let's see whether we have that eventid already
-	// in case not, we have to create a new cEventInfo for it
-	//
-	pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
-	if (pEvent == NULL)
-	{
-		pSchedule->Events.Add(new cEventInfo(service, eventid));
-		pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
-		if (pEvent == NULL)
-			return false;
-		
-		strdvbcpy(tmp, &buf[sizeof(eit_short_event_t)], evt->event_name_length);
-		pEvent->SetTitle((char *)tmp);
-		strdvbcpy(tmp, &buf[sizeof(eit_short_event_t) + evt->event_name_length + 1],
-					 (int)buf[sizeof(eit_short_event_t) + evt->event_name_length]);
-		pEvent->SetSubtitle((char *)tmp);
-		cMJD mjd(eitloop->date_hi, eitloop->date_lo,
-					eitloop->time_hour_ten * 10 + eitloop->time_hour,
-					eitloop->time_minute_ten * 10 + eitloop->time_minute,
-					eitloop->time_second_ten * 10 + eitloop->time_second);
-		pEvent->SetTime(mjd.GetTime_t());
-		pEvent->SetDuration((long)((long)((eitloop->dur_hour_ten * 10 + eitloop->dur_hour) * 60l * 60l) +
-											(long)((eitloop->dur_minute_ten * 10 + eitloop->dur_minute) * 60l) +
-											(long)(eitloop->dur_second_ten * 10 + eitloop->dur_second)));
-	}
-	
-	if (IsPresentFollowing())
-	{
-		if (eitloop->running_status == 4 || eitloop->running_status == 3)
-			pSchedule->SetPresentEvent(pEvent);
-		else if (eitloop->running_status == 1 || eitloop->running_status == 2 || eitloop->running_status == 0)
-			pSchedule->SetFollowingEvent(pEvent);
-	}
-
-	return true;
+   //
+   // let's see whether we have that eventid already
+   // in case not, we have to create a new cEventInfo for it
+   //
+   pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
+   if (pEvent == NULL)
+   {
+      pSchedule->Events.Add(new cEventInfo(service, eventid));
+      pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
+      if (pEvent == NULL)
+         return false;
+
+      strdvbcpy(tmp, &buf[sizeof(eit_short_event_t)], evt->event_name_length);
+      pEvent->SetTitle((char *)tmp);
+      strdvbcpy(tmp, &buf[sizeof(eit_short_event_t) + evt->event_name_length + 1],
+                (int)buf[sizeof(eit_short_event_t) + evt->event_name_length]);
+      pEvent->SetSubtitle((char *)tmp);
+      cMJD mjd(eitloop->date_hi, eitloop->date_lo,
+               eitloop->time_hour_ten * 10 + eitloop->time_hour,
+               eitloop->time_minute_ten * 10 + eitloop->time_minute,
+               eitloop->time_second_ten * 10 + eitloop->time_second);
+      pEvent->SetTime(mjd.GetTime_t());
+      pEvent->SetDuration((long)((long)((eitloop->dur_hour_ten * 10 + eitloop->dur_hour) * 60l * 60l) +
+                                 (long)((eitloop->dur_minute_ten * 10 + eitloop->dur_minute) * 60l) +
+                                 (long)(eitloop->dur_second_ten * 10 + eitloop->dur_second)));
+   }
+
+   if (IsPresentFollowing())
+   {
+      if (eitloop->running_status == 4 || eitloop->running_status == 3)
+         pSchedule->SetPresentEvent(pEvent);
+      else if (eitloop->running_status == 1 || eitloop->running_status == 2 || eitloop->running_status == 0)
+         pSchedule->SetFollowingEvent(pEvent);
+   }
+
+   return true;
 }
 
 /**  */
 bool cEIT::WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf)
 {
-	u_char tmp[256];
-	eit_extended_event_t *evt = (eit_extended_event_t *)buf;
-	int bufact, buflen;
-	unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
-	cEventInfo *pEvent;
-	
-	//isyslog(LOG_INFO, "Found Extended Event Descriptor");
-	
-	cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
-	if (pSchedule == NULL)
-	{
-		schedules->Add(new cSchedule(service));
-		pSchedule = (cSchedule *)schedules->GetSchedule(service);
-		if (pSchedule == NULL)
-			return false;
-	}
-
-	pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
-	if (pEvent == NULL)
-		return false;
-	
-	if (evt->descriptor_number != pEvent->GetExtendedDescriptorNumber())
-		return false;
-	
-	bufact = sizeof(eit_extended_event_t);
-	buflen = buf[1] + 2;
-	
-	if (evt->length_of_items > 0)
-	{
-		while (bufact - sizeof(eit_extended_event_t) < evt->length_of_items)
-		{
-			strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
-			// could use value in tmp now to do something,
-			// haven't seen any items as of yet transmitted from satellite
-			bufact += (buf[bufact] + 1);
-		}
-	}
-	
-	strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
-	if (pEvent->AddExtendedDescription((char *)tmp))
-	{
-		pEvent->IncreaseExtendedDescriptorNumber();
-		return true;
-	}
-	
-	return false;
+   u_char tmp[256];
+   eit_extended_event_t *evt = (eit_extended_event_t *)buf;
+   int bufact, buflen;
+   unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
+   cEventInfo *pEvent;
+
+   //isyslog(LOG_INFO, "Found Extended Event Descriptor");
+
+   cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
+   if (pSchedule == NULL)
+   {
+      schedules->Add(new cSchedule(service));
+      pSchedule = (cSchedule *)schedules->GetSchedule(service);
+      if (pSchedule == NULL)
+         return false;
+   }
+
+   pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
+   if (pEvent == NULL)
+      return false;
+
+   if (evt->descriptor_number != pEvent->GetExtendedDescriptorNumber())
+      return false;
+
+   bufact = sizeof(eit_extended_event_t);
+   buflen = buf[1] + 2;
+
+   if (evt->length_of_items > 0)
+   {
+      while (bufact - sizeof(eit_extended_event_t) < evt->length_of_items)
+      {
+         strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
+         // could use value in tmp now to do something,
+         // haven't seen any items as of yet transmitted from satellite
+         bufact += (buf[bufact] + 1);
+      }
+   }
+
+   strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
+   if (pEvent->AddExtendedDescription((char *)tmp))
+   {
+      pEvent->IncreaseExtendedDescriptorNumber();
+      return true;
+   }
+
+   return false;
 }
 
 // --- cSIProcessor ----------------------------------------------------------
@@ -1110,13 +1109,13 @@ cMutex cSIProcessor::schedulesMutex;
 cSIProcessor::cSIProcessor(const char *FileName)
 {
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
-	useTStime = false;
+   useTStime = false;
    filters = NULL;
    if ((fsvbi = open(FileName, O_RDONLY)) >= 0)
    {
       if (!numSIProcessors++) // the first one creates it
          schedules = new cSchedules;
-	   filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
+      filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
    }
    else
       LOG_ERROR_STR(FileName);
@@ -1126,8 +1125,9 @@ cSIProcessor::~cSIProcessor()
 {
    if (fsvbi >= 0)
    {
-      Cancel();
-   	ShutDownFilters();
+      active = false;
+      Cancel(3);
+      ShutDownFilters();
       delete filters;
       if (!--numSIProcessors) // the last one deletes it
          delete schedules;
@@ -1146,16 +1146,18 @@ void cSIProcessor::Action()
       }
 
    dsyslog(LOG_INFO, "EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
-	
+
    unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
-	unsigned int seclen;
-	unsigned int pid;
+   unsigned int seclen;
+   unsigned int pid;
    time_t lastCleanup = time(NULL);
    time_t lastDump = time(NULL);
-	struct pollfd pfd;
-	
-	while(true)
-	{
+   struct pollfd pfd;
+
+   active = true;
+
+   while(active)
+   {
       if (masterSIProcessor)
       {
          time_t now = time(NULL);
@@ -1185,65 +1187,65 @@ void cSIProcessor::Action()
          }
       }
 
-		/* wait data become ready from the bitfilter */
-		pfd.fd = fsvbi;
-		pfd.events = POLLIN;
-		if(poll(&pfd, 1, 1000) != 0) /* timeout is 5 secs */
-		{
-			// fprintf(stderr, "<data>\n");
-			/* read section */
-			read(fsvbi, buf, 8);
-			seclen = (buf[6] << 8) | buf[7];
-			pid = (buf[4] << 8) | buf[5];
-			read(fsvbi, buf, seclen);
-
-			//dsyslog(LOG_INFO, "Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
-
-			switch (pid)
-			{
-				case 0x14:
-					if (buf[0] == 0x70)
-					{
-						if (useTStime)
+      /* wait data become ready from the bitfilter */
+      pfd.fd = fsvbi;
+      pfd.events = POLLIN;
+      if(poll(&pfd, 1, 1000) != 0) /* timeout is 5 secs */
+      {
+         // fprintf(stderr, "<data>\n");
+         /* read section */
+         read(fsvbi, buf, 8);
+         seclen = (buf[6] << 8) | buf[7];
+         pid = (buf[4] << 8) | buf[5];
+         read(fsvbi, buf, seclen);
+
+         //dsyslog(LOG_INFO, "Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
+
+         switch (pid)
+         {
+            case 0x14:
+               if (buf[0] == 0x70)
+               {
+                  if (useTStime)
                   {
                      cTDT ctdt((tdt_t *)buf);
-							ctdt.SetSystemTime();
+                     ctdt.SetSystemTime();
                   }
-					}
+               }
                   /*XXX this comes pretty often:
-					else
-						dsyslog(LOG_INFO, "Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
+               else
+                  dsyslog(LOG_INFO, "Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
                   XXX*/
-					break;
-				
-				case 0x12:
-					if (buf[0] != 0x72)
-					{
+               break;
+
+            case 0x12:
+               if (buf[0] != 0x72)
+               {
                   LOCK_THREAD;
 
                   schedulesMutex.Lock();
-	               cEIT ceit(buf, seclen, schedules);
-						ceit.ProcessEIT();
+                  cEIT ceit(buf, seclen, schedules);
+                  ceit.ProcessEIT();
                   schedulesMutex.Unlock();
-					}
-					else
-						dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
-					break;
-				
-				default:
-					break;
-			}
-		}
-		else
-		{
+               }
+               else
+                  dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
+               break;
+
+            default:
+               break;
+         }
+      }
+      else
+      {
          LOCK_THREAD;
 
          //XXX this comes pretty often
-			//isyslog(LOG_INFO, "Received timeout from poll, refreshing filters\n");
-			RefreshFilters();
-		}
-//		WakeUp();
-	}
+         //isyslog(LOG_INFO, "Received timeout from poll, refreshing filters\n");
+         RefreshFilters();
+      }
+//    WakeUp();
+   }
 }
 
 /** Add a filter with packet identifier pid and
@@ -1253,42 +1255,42 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
    if (fsvbi < 0)
       return false;
 
-	int section = ((int)tid << 8) | 0x00ff;
-	
-	struct bitfilter filt = {
-		pid,
-		{ section, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-		  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
-		  SECTION_CONTINUOS, 0,
-		  FILTER_MEM,
-		  {},
-		};
-
-	if (ioctl(fsvbi, VIDIOCSBITFILTER, &filt) < 0)
-		return false;
-		
-	for (int a = 0; a < MAX_FILTERS; a++)
-	{
-		if (filters[a].inuse == false)
-		{
-			filters[a].pid = pid;
-			filters[a].tid = tid;
-			filters[a].handle = filt.handle;
-			filters[a].inuse = true;
-			// dsyslog(LOG_INFO, "  Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
-			return true;
-		}
-	}
-	
-	return false;
+   int section = ((int)tid << 8) | 0x00ff;
+
+   struct bitfilter filt = {
+      pid,
+      { section, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
+        SECTION_CONTINUOS, 0,
+        FILTER_MEM,
+        {},
+      };
+
+   if (ioctl(fsvbi, VIDIOCSBITFILTER, &filt) < 0)
+      return false;
+
+   for (int a = 0; a < MAX_FILTERS; a++)
+   {
+      if (filters[a].inuse == false)
+      {
+         filters[a].pid = pid;
+         filters[a].tid = tid;
+         filters[a].handle = filt.handle;
+         filters[a].inuse = true;
+         // dsyslog(LOG_INFO, "  Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+         return true;
+      }
+   }
+
+   return false;
 }
 
 /** set whether local systems time should be
 set by the received TDT or TOT packets */
 bool cSIProcessor::SetUseTSTime(bool use)
 {
-	useTStime = use;
-	return useTStime;
+   useTStime = use;
+   return useTStime;
 }
 
 /**  */
@@ -1297,22 +1299,22 @@ bool cSIProcessor::ShutDownFilters()
    if (fsvbi < 0)
       return false;
 
-	bool ret = true;
-	
-	for (int a = 0; a < MAX_FILTERS; a++)
-	{
-		if (filters[a].inuse == true)
-		{
-			if (ioctl(fsvbi, VIDIOCSSHUTDOWNFILTER, &filters[a].handle) < 0)
-				ret = false;
+   bool ret = true;
+
+   for (int a = 0; a < MAX_FILTERS; a++)
+   {
+      if (filters[a].inuse == true)
+      {
+         if (ioctl(fsvbi, VIDIOCSSHUTDOWNFILTER, &filters[a].handle) < 0)
+            ret = false;
+
+         // dsyslog(LOG_INFO, "Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
 
-			// dsyslog(LOG_INFO, "Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
-			
-			filters[a].inuse = false;
-		}
-	}
+         filters[a].inuse = false;
+      }
+   }
 
-	return ret;
+   return ret;
 }
 
 /** */
@@ -1328,18 +1330,18 @@ bool cSIProcessor::RefreshFilters()
    if (fsvbi < 0)
       return false;
 
-	bool ret = true;
-	
-	ret = ShutDownFilters();
-	
-	for (int a = 0; a < MAX_FILTERS; a++)
-	{
-		if (filters[a].inuse == false && filters[a].pid != 0 && filters[a].tid != 0)
-		{
-			if (!AddFilter(filters[a].pid, filters[a].tid))
-				ret = false;
-		}
-	}
-
-	return ret;
+   bool ret = true;
+
+   ret = ShutDownFilters();
+
+   for (int a = 0; a < MAX_FILTERS; a++)
+   {
+      if (filters[a].inuse == false && filters[a].pid != 0 && filters[a].tid != 0)
+      {
+         if (!AddFilter(filters[a].pid, filters[a].tid))
+            ret = false;
+      }
+   }
+
+   return ret;
 }
diff --git a/eit.h b/eit.h
index bedead755..3d491935c 100644
--- a/eit.h
+++ b/eit.h
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.4 2000/11/24 14:35:22 kls Exp $
+ * $Id: eit.h 1.6 2001/04/01 15:14:12 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -49,7 +49,7 @@ class cEventInfo : public cListObject {
   bool SetSubtitle(char *string);
   void IncreaseExtendedDescriptorNumber(void);
   cEventInfo(unsigned short serviceid, unsigned short eventid);
-public: 
+public:
   ~cEventInfo();
   const char *GetTimeString(void) const;
   const char *GetEndTimeString(void) const;
@@ -66,7 +66,7 @@ class cEventInfo : public cListObject {
   unsigned short GetServiceID(void) const;
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
-  void Dump(FILE *f) const;
+  void Dump(FILE *f, const char *Prefix = "") const;
   };
 
 class cSchedule : public cListObject  {
@@ -84,7 +84,7 @@ class cSchedule : public cListObject  {
   void Cleanup(time_t tTime);
   void Cleanup(void);
   cSchedule(unsigned short servid = 0);
-public: 
+public:
   ~cSchedule();
   const cEventInfo *GetPresentEvent(void) const;
   const cEventInfo *GetFollowingEvent(void) const;
@@ -93,7 +93,7 @@ class cSchedule : public cListObject  {
   const cEventInfo *GetEvent(time_t tTime) const;
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
   int NumEvents(void) const { return Events.Count(); }
-  void Dump(FILE *f) const;
+  void Dump(FILE *f, const char *Prefix = "") const;
   };
 
 class cSchedules : public cList<cSchedule> {
@@ -104,12 +104,12 @@ class cSchedules : public cList<cSchedule> {
 protected:
   bool SetCurrentServiceID(unsigned short servid);
   void Cleanup();
-public: 
+public:
   cSchedules(void);
   ~cSchedules();
   const cSchedule *GetSchedule(unsigned short servid) const;
   const cSchedule *GetSchedule(void) const;
-  void Dump(FILE *f) const;
+  void Dump(FILE *f, const char *Prefix = "") const;
 };
 
 typedef struct sip_filter {
@@ -130,9 +130,10 @@ class cSIProcessor : public cThread {
   bool useTStime;
   SIP_FILTER *filters;
   int fsvbi;
+  bool active;
   bool RefreshFilters(void);
   void Action(void);
-public: 
+public:
   cSIProcessor(const char *FileName);
   ~cSIProcessor();
   bool SetUseTSTime(bool use);
diff --git a/i18n.c b/i18n.c
index f81a2029d..b2c321aa2 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.14 2001/02/24 13:57:14 kls Exp $
+ * $Id: i18n.c 1.16 2001/03/31 09:58:14 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
+ * Dutch     translations provided by Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
  *
  */
 
@@ -48,7 +49,7 @@
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 4;
+const int NumLanguages = 5;
 
 typedef const char *tPhrase[NumLanguages];
 
@@ -58,542 +59,648 @@ const tPhrase Phrases[] = {
     "Deutsch",
     "Slovenski",
     "Italiano",
+    "Nederlands",
   },
   // Menu titles:
   { "Main",
     "Hauptmen�",
     "Glavni meni",
     "Principale",
+    "Hoofdmenu",
   },
   { "Schedule",
     "Programm",
     "Urnik",
     "Programmi",
+    "Gids",
   },
   { "Channels",
     "Kan�le",
     "Kanali",
     "Canali",
+    "Kanalen",
   },
   { "Timers",
     "Timer",
     "Termini",
     "Timer",
+    "Timers",
   },
   { "Recordings",
     "Aufzeichnungen",
     "Posnetki",
     "Registrazioni",
+    "Opnames",
   },
   { "Setup",
     "Einstellungen",
     "Nastavitve",
     "Opzioni",
+    "Instellingen",
   },
   { "Commands",
     "Befehle",
     "Ukazi",
     "Comandi",
+    "Commando's",
   },
   { "Edit Channel",
     "Kanal Editieren",
     "Uredi kanal",
     "Modifica canale",
+    "Kanaal aanpassen",
   },
   { "Edit Timer",
     "Timer Editieren",
     "Uredi termin",
     "Modifica Timer",
+    "Timer veranderen",
   },
   { "Event",
     "Sendung",
     "Oddaja",
     "Eventi",
+    "Uitzending",
   },
   { "Summary",
     "Inhalt",
     "Vsebina",
     "Sommario",
+    "Inhoud",
   },
   { "Schedule - %s",
     "Programm - %s",
     "Urnik - %s",
     "Programma - %s",
+    "Programma - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
     "Kaj je na sporedu?",
     "In programmazione",
+    "Wat is er nu?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
     "Kaj sledi?",
     "Prossimi programmi",
+    "Wat komt er hierna?",
   },
   // Button texts (must not be more than 10 characters!):
   { "Edit",
     "Editieren",
     "Uredi",
     "Modifica",
+    "Verander",
   },
   { "New",
     "Neu",
     "Novo",
     "Nuovo",
+    "Nieuw",
   },
   { "Delete",
     "L�schen",
     "Odstrani",
     "Cancella",
+    "Verwijder",
   },
   { "Mark",
     "Markieren",
     "Oznaci",
     "Marca",
+    "Verplaats",
   },
   { "Record",
     "Aufnehmen",
     "Posnemi",
     "Registra",
+    "Opnemen",
   },
   { "Play",
     "Wiedergabe",
     "Predavajaj",
     "Riproduci",
+    "Afspelen",
   },
   { "Rewind",
     "Anfang",
     "Zacetek",
     "Da inizio",
+    "Spoel terug",
   },
   { "Resume",
     "Weiter",
     "Nadaljuj",
     "Riprendi",
+    "Verder",
   },
   { "Summary",
     "Inhalt",
     "Vsebina",
     "Sommario",
+    "Inhoud",
   },
   { "Switch",
     "Umschalten",
     "Preklopi",
     "Cambia",
+    "Selecteer",
   },
   { "Now",
     "Jetzt",
     "Sedaj",
     "Adesso",
+    "Nu",
   },
   { "Next",
     "N�chste",
     "Naslednji",
     "Prossimo",
+    "Hierna",
   },
   { "Schedule",
     "Programm",
     "Urnik",
     "Programma",
+    "Programma",
   },
   // Confirmations:
   { "Delete channel?",
     "Kanal l�schen?",
     "Odstrani kanal?",
     "Cancello il canale?",
+    "Kanaal verwijderen?",
   },
   { "Delete timer?",
     "Timer l�schen?",
     "Odstani termin?",
     "Cancello il timer?",
+    "Timer verwijderen?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
     "Odstrani posnetek?",
     "Cancello la registrazione?",
+    "Opname verwijderen?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
     "Koncaj snemanje?",
     "Fermo la registrazione?",
+    "Opname stoppen?",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
     "Zelite prekiniti urejanje?",
     "Annullo la modifica?",
+    "Bewerken afbreken?",
   },
   // Channel parameters:
   { "Name",
     "Name",
     "Naziv",
     "Nome",
+    "Naam",
   },
   { "Frequency",
     "Frequenz",
     "Frekvenca",
     "Frequenza",
+    "Frequentie",
   },
   { "Polarization",
     "Polarisation",
     "Polarizacija",
     "Polarizzazione",
+    "Polarisatie",
   },
   { "Diseqc",
     "Diseqc",
     "Diseqc",
     "Diseqc",
+    "Diseqc",
   },
   { "Srate",
     "Srate",
     "Srate",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
     "Vpid",
     "Vpid",
+    "Vpid",
   },
   { "Apid",
     "Apid",
     "Apid",
     "Apid",
+    "Apid",
   },
   { "Tpid",
     "Tpid",
     "Tpid",
     "Tpid",
+    "Tpid",
   },
   { "CA",
     "CA",
     "CA",
     "CA",
+    "CA",
   },
   { "Pnr",
     "Pnr",
     "Pnr",
     "Pnr",
+    "Pnr",
   },
   // Timer parameters:
   { "Active",
     "Aktiv",
     "Aktivno",
     "Attivo",
+    "Actief",
   },
   { "Channel",
     "Kanal",
     "Kanal",
     "Canale",
+    "Kanaal",
   },
   { "Day",
     "Tag",
     "Dan",
     "Giorno",
+    "Dag",
   },
   { "Start",
     "Anfang",
     "Zacetek",
     "Inizio",
+    "Begin",
   },
   { "Stop",
     "Ende",
     "Konec",
     "Fine",
+    "Einde",
   },
   { "Priority",
     "Priorit�t",
     "Prioriteta",
     "Priorita",
+    "Prioriteit",
   },
   { "Lifetime",
     "Lebensdauer",
     "Veljavnost",
     "Durata",
+    "Bewaarduur",
   },
   { "File",
     "Datei",
     "Datoteka",
     "Nome",
+    "Filenaam",
   },
   // Error messages:
   { "Channel is being used by a timer!",
     "Kanal wird von einem Timer benutzt!",
     "Urnik zaseda kanal!",
     "Canale occupato da un timer!",
+    "Kanaal wordt gebruikt door een timer!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
     "Ne morem preklopiti kanala!",
     "Impossibile cambiare canale!",
+    "Kan geen kanaal wisselen!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
     "Snemanje po urniku!",
     "Registrazione di un timer in corso!",
+    "Timer is aan het opnemen!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
     "Napaka pri odstranjevanju posnetka!",
     "Errore durante la canc del filmato!",
+    "Fout bij verwijderen opname!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
     "*** Neznan kanal ***",
     "*** CANALE INVALIDO ***",
+    "*** Ongeldig kanaal ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
     "Ni proste DVB naprave za snemanje!",
     "Nessuna card DVB disp per registrare!",
+    "Geen vrije DVB kaart om op te nemen!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
     "Zaklenjen kanal (snemanje)!",
     "Canale bloccato (in registrazione)!",
+    "Kanaal geblokkeerd (neemt op)!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
     "Ne morem zaceti urejanja!",
     "Imposs iniziare processo di modifica",
+    "Kan niet beginnen met bewerken!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
     "Urejanje je ze aktivno!",
     "Processo di modifica gia` attivo",
+    "Bewerken is al actief!",
   },
   // Setup parameters:
   { "OSD-Language",
     "OSD-Sprache",
     "OSD-jezik",
     "Linguaggio OSD",
+    "OSD-taal",
   },
   { "PrimaryDVB",
     "Prim�res Interface",
     "Primarna naprava",
     "Scheda DVB primaria",
+    "Eerste DVB kaart",
   },
   { "ShowInfoOnChSwitch",
     "Info zeigen",
     "Pokazi naziv kanala",
     "Vis info nel cambio canale",
+    "Kanaal info tonen",
   },
   { "MenuScrollPage",
     "Seitenweise scrollen",
     "Drsni meni",
     "Scrolla pagina nel menu",
+    "Scrollen per pagina",
   },
   { "MarkInstantRecord",
     "Direktaufz. markieren",
     "Oznaci direktno snemanje",
     "Marca la registrazione",
+    "Direkte opnamen markeren",
   },
   { "LnbFrequLo",
     "Untere LNB-Frequenz",
     "Spodnja LNB-frek.",
     "Freq LO LNB",
+    "Laagste LNB frequentie",
   },
   { "LnbFrequHi",
     "Obere LNB-Frequenz",
     "Zgornja LNB-frek.",
     "Freq HI LNB",
+    "Hoogste LNB frequentie",
   },
   { "SetSystemTime",
     "Systemzeit stellen",
     "Sistemski cas",
     "Setta orario auto",
+    "Systeem klok instellen",
   },
   { "MarginStart",
     "Zeitpuffer bei Anfang",
     "Premor pred zacetkom",
     "Min margine inizio",
+    "Tijd marge (begin)",
   },
   { "MarginStop",
     "Zeitpuffer bei Ende",
     "Premor za koncem",
     "Min margine fine",
+    "Tijd marge (eind)",
   },
   { "EPGScanTimeout",
     "Zeit bis EPG Scan",
     "Cas do EPG pregleda",
     "Timeout EPG",
+    "EPG-scan Timeout",
   },
   { "SVDRPTimeout",
     "SVDRP Timeout",
     "", // TODO
     "Timeout SVDRP",
+    "SVDRP Timeout",
   },
   { "PrimaryLimit",
     "Prim�r-Limit",
     "", // TODO
     "", // TODO
+    "", // TODO
   },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
     "PTSCPSN",
     "DLMMGVS",
+    "MDWDVZZ",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
     "Fernbedienungs-Codes lernen",
     "Ucim se kod upravljalca",
     "Apprendimento tasti unita` remota",
+    "Leren toetsen afstandsbediening",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
     "Faza 1: Sprejemanje IR kode",
     "Fase 1: tipo ricevitore RC",
+    "Fase 1: detecteren type afstandsbediening",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
     "Pritisnite tipko na upravljalcu",
     "Premere un tasto nell'unita` RC",
+    "Druk op een willekeurige knop",
   },
   { "RC code detected!",
     "FB Code erkannt!",
     "IR koda sprejeta!",
     "Codice RC rilevato!",
+    "Afstandsbediening code herkend!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
     "Ne pritiskajte tipk...",
     "Non premere alcun tasto...",
+    "Druk niet op een knop...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
     "Faza 2: Ucenje posebnih kod",
     "Fase 2: Codici specifici dei tasti",
+    "Fase 2: Leren specifieke toets-codes",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
     "Pritisnite tipko za '%s'",
     "Premere il tasto per '%s'",
+    "Druk knop voor '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
     "Pritisnite tipko 'Gor' za potrditev",
     "Premere 'Su' per confermare",
+    "Druk 'Omhoog' om te bevestigen",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
     "Pritisnite tipko 'Dol' za nadaljevanje",
     "Premere 'Giu' per confermare",
+    "Druk 'Omlaag' om verder te gaan",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
     "(pritisnite 'Gor' za nazaj)",
     "(premere 'Su' per tornare indietro)",
+    "(druk 'Omhoog' om terug te gaan)",
   },
   { "(press 'Down' to end key definition)",
-    "('Ab' dr�cken zum Beenden",
+    "('Ab' dr�cken zum Beenden)",
     "(pritisnite 'Dol' za konec)",
     "('Giu' per finire la definiz tasti)",
+    "(Druk 'Omlaag' om te beeindigen)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
     "Faza 3: Shranjujem kodo",
     "Fase 3: Salvataggio key codes",
+    "Fase 3: Opslaan toets codes",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
     "'Gor' za potrditev, 'Dol' za prekinitev",
     "'Su' per salvare, 'Giu' per annullare",
+    "'Omhoog' te bewaren, 'Omlaag' voor annuleren",
   },
   // Key names:
   { "Up",
     "Auf",
     "Gor",
     "Su",
+    "Omhoog",
   },
   { "Down",
     "Ab",
     "Dol",
     "Giu",
+    "Omlaag",
   },
   { "Menu",
     "Men�",
     "Meni",
     "Menu",
+    "Menu",
   },
   { "Ok",
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
     "Nazaj",
     "Indietro",
+    "Terug",
   },
   { "Left",
     "Links",
     "Levo",
     "Sinistra",
+    "Links",
   },
   { "Right",
     "Rechts",
     "Desno",
     "Destra",
+    "Rechts",
   },
   { "Red",
     "Rot",
     "Rdeca",
     "Rosso",
+    "Rood",
   },
   { "Green",
     "Gr�n",
     "Zelena",
     "Verde",
+    "Groen",
   },
   { "Yellow",
     "Gelb",
     "Rumena",
     "Giallo",
+    "Geel",
   },
   { "Blue",
     "Blau",
     "Modra",
     "Blu",
+    "Blauw",
   },
   // Miscellaneous:
   { "yes",
     "ja",
     "da",
     "si",
+    "ja",
   },
   { "no",
     "nein",
     "ne",
     "no",
-  },
-  { "Stop replaying",
-    "Wiedergabe beenden",
-    "Prekini ponavljanje",
-    "Interrompi riproduzione",
-  },
-  { "Stop recording ", // note the trailing blank!
-    "Aufzeichnung beenden ",
-    "Prekini shranjevanje ",
-    "Interrompi registrazione ",
-  },
-  { "Cancel editing",
-    "Schneiden abbrechen",
-    "Prekini urejanje",
-    "Annulla modifiche",
+    "nee",
+  },
+  { " Stop replaying", // note the leading blank!
+    " Wiedergabe beenden",
+    " Prekini ponavljanje",
+    " Interrompi riproduzione",
+    " Stop afspelen",
+  },
+  { " Stop recording ", // note the leading and trailing blanks!
+    " Aufzeichnung beenden ",
+    " Prekini shranjevanje ",
+    " Interrompi registrazione ",
+    " Stop opnemen ",
+  },
+  { " Cancel editing", // note the leading blank!
+    " Schneiden abbrechen",
+    " Prekini urejanje",
+    " Annulla modifiche",
+    " Bewerken afbreken",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
     "Preklapljanje primarne naprave...",
     "Cambio su card DVB primaria...",
+    "Eerste DVB-kaart wordt omgeschakeld...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
     "Gor/Dol za novo poz. - Ok za premik",
     "Su/Giu per nuova posizione - OK per muovere",
+    "Gebruik Omhoog/Omlaag - daarna Ok",
   },
   { "Editing process started",
     "Schnitt gestartet",
     "Urejanje se je zacelo",
     "Processo di modifica iniziato",
+    "Bewerken is gestart",
   },
   { NULL }
   };
diff --git a/menu.c b/menu.c
index 45be9eb93..09c180c47 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.68 2001/02/24 14:53:40 kls Exp $
+ * $Id: menu.c 1.70 2001/03/18 10:16:56 kls Exp $
  */
 
 #include "menu.h"
@@ -1425,23 +1425,27 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      switch (Key) {
        case kRed:    return Record();
-       case kGreen:  {
-                       if (!now && !next) {
-                          int ChannelNr = 0;
-                          if (Count()) {
-                             cChannel *channel = Channels.GetByServiceID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetServiceID());
-                             if (channel)
-                                ChannelNr = channel->number;
-                             }
-                          now = true;
-                          return AddSubMenu(new cMenuWhatsOn(schedules, true, ChannelNr));
-                          }
-                       now = !now;
-                       next = !next;
-                       return AddSubMenu(new cMenuWhatsOn(schedules, now, cMenuWhatsOn::CurrentChannel()));
-                     }
-       case kYellow: return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
-       case kBlue:   return Switch();
+       case kGreen:  if (schedules) {
+                        if (!now && !next) {
+                           int ChannelNr = 0;
+                           if (Count()) {
+                              cChannel *channel = Channels.GetByServiceID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetServiceID());
+                              if (channel)
+                                 ChannelNr = channel->number;
+                              }
+                           now = true;
+                           return AddSubMenu(new cMenuWhatsOn(schedules, true, ChannelNr));
+                           }
+                        now = !now;
+                        next = !next;
+                        return AddSubMenu(new cMenuWhatsOn(schedules, now, cMenuWhatsOn::CurrentChannel()));
+                        }
+       case kYellow: if (schedules)
+                        return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
+                     break;
+       case kBlue:   if (Count())
+                        return Switch();
+                     break;
        case kOk:     if (Count())
                         return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->eventInfo, otherChannel));
                      break;
@@ -1688,7 +1692,7 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
 // --- cMenuMain -------------------------------------------------------------
 
-#define STOP_RECORDING tr("Stop recording ")
+#define STOP_RECORDING tr(" Stop recording ")
 
 static const char *hk(int n, const char *s)
 {
diff --git a/recording.c b/recording.c
index d6e5a333e..fc0daa57a 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.28 2001/02/18 16:14:05 kls Exp $
+ * $Id: recording.c 1.29 2001/03/31 09:38:30 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -206,6 +206,7 @@ cRecording::cRecording(const char *FileName)
   if (p) {
      time_t now = time(NULL);
      struct tm t = *localtime(&now); // this initializes the time zone in 't'
+     t.tm_isdst = -1; // makes sure mktime() will determine the correct dst setting
      if (7 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
         t.tm_year -= 1900;
         t.tm_mon--;
diff --git a/remux.c b/remux.c
new file mode 100644
index 000000000..e48296d84
--- /dev/null
+++ b/remux.c
@@ -0,0 +1,173 @@
+/*
+ * remux.c: A streaming MPEG2 remultiplexer
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: remux.c 1.1 2001/03/31 08:42:17 kls Exp $
+ */
+
+/* The calling interface of the 'cRemux::Process()' function is defined
+   as follows:
+
+   'Data' points to a chunk of data that consists of 'Count' bytes.
+   The 'Process' function shall try to remultiplex as much of the
+   data as possible and return a pointer to the resulting buffer.
+   That buffer typically is different from the incoming 'Data',
+   but in the simplest case (when 'Process' does nothing) might
+   as well point to the original 'Data'. When returning, 'Count'
+   shall be set to the number of bytes that have been processed
+   (i.e. have been taken from 'Data'), while 'Result' indicates
+   how many bytes the returned buffer contains. 'PictureType' shall
+   be set to NO_PICTURE if the returned data does not start a new
+   picture, or one of I_FRAME, P_FRAME or B_FRAME if a new picture
+   starting point has been found. This also means that the returned
+   data buffer may contain at most one entire video frame, because
+   the next frame must be returned with its own value for 'PictureType'.
+
+   'Process' shall do it's best to keep the latency time as short
+   as possible in order to allow a quick start of VDR's "Transfer
+   mode" (displaying the signal of one DVB card on another card).
+   In order to do that, this function may decide to first pass
+   through the incoming data (almost) unprocessed, and make
+   actual processing kick in after a few seconds (if that is at
+   all possible for the algorithm). This may result in a non-
+   optimal stream at the beginning, which won't matter for normal
+   recordings but may make switching through encrypted channels
+   in "Transfer mode" faster.
+
+   In the resulting data stream, a new packet shall always be started
+   when a frame border is encountered. VDR needs this in order to
+   be able to detect and store the frame indexes, and to easily
+   display single frames in fast forward/back mode. The very first
+   data block returned shall be the starting point of an I_FRAME.
+   Everything before that shall be silently dropped.
+
+   If the incoming data is not enough to do remultiplexing, a value
+   of NULL shall be returned ('Result' has no meaning then). This
+   will tell the caller to wait for more data to be presented in
+   the next call. If NULL is returned and 'Count' is not 0, the
+   caller shall remove 'Count' bytes from the beginning of 'Data'
+   before the next call. This is the way 'Process' indicates that
+   it must skip that data.
+
+   Any data that is not used during this call will appear at the
+   beginning of the incoming 'Data' buffer at the next call, plus
+   any new data that has become available.
+
+   It is guaranteed that the caller will completely process any
+   returned data before the next call to 'Process'. That way, 'Process'
+   can dynamically allocate its return buffer and be sure the caller
+   doesn't keep any pointers into that buffer.
+*/
+
+#include "remux.h"
+#include "tools.h"
+
+#if defined(REMUX_NONE)
+
+cRemux::cRemux(void)
+{
+  synced = false;
+}
+
+cRemux::~cRemux()
+{
+}
+
+int cRemux::GetPacketLength(const uchar *Data, int Count, int Offset)
+{
+  // Returns the entire length of the packet starting at offset, or -1 in case of error.
+  return (Offset + 5 < Count) ? (Data[Offset + 4] << 8) + Data[Offset + 5] + 6 : -1;
+}
+
+int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType)
+{
+  // Scans the video packet starting at Offset and returns its length.
+  // If the return value is -1 the packet was not completely in the buffer.
+
+  int Length = GetPacketLength(Data, Count, Offset);
+  if (Length > 0 && Offset + Length <= Count) {
+     int i = Offset + 8; // the minimum length of the video packet header
+     i += Data[i] + 1;   // possible additional header bytes
+     for (; i < Offset + Length; i++) {
+         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
+            switch (Data[i + 3]) {
+              case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
+                               return Length;
+              }
+            }
+         }
+     PictureType = NO_PICTURE;
+     return Length;
+     }
+  return -1;
+}
+
+const uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar &PictureType)
+{
+  int Skip = 0;
+
+  PictureType = NO_PICTURE;
+
+  if (Count >= MINVIDEODATA) {
+     for (int i = 0; i < Count; i++) {
+         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
+            switch (Data[i + 3]) {
+              case SC_VIDEO:
+                   {
+                     uchar pt = NO_PICTURE;
+                     int l = ScanVideoPacket(Data, Count, i, pt);
+                     if (l < 0) {
+                        if (Skip < Count)
+                           Count = Skip;
+                        return NULL; // no useful data found, wait for more
+                        }
+                     if (pt != NO_PICTURE) {
+                        if (pt < I_FRAME || B_FRAME < pt) {
+                           esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
+                           }
+                        else if (PictureType == NO_PICTURE) {
+                           if (!synced) {
+                              if (pt == I_FRAME) {
+                                 Skip = i;
+                                 synced = true;
+                                 }
+                              else {
+                                 i += l;
+                                 Skip = i;
+                                 break;
+                                 }
+                              }
+                           if (synced)
+                              PictureType = pt;
+                           }
+                        else {
+                           Count = i;
+                           Result = i - Skip;
+                           return Data + Skip;
+                           }
+                        }
+                     else if (!synced) {
+                        i += l;
+                        Skip = i;
+                        break;
+                        }
+                     i += l - 1; // -1 to compensate for i++ in the loop!
+                   }
+                   break;
+              case SC_AUDIO:
+                   i += GetPacketLength(Data, Count, i) - 1; // -1 to compensate for i++ in the loop!
+                   break;
+              }
+            }
+         }
+     }
+  if (Skip < Count)
+     Count = Skip;
+  return NULL; // no useful data found, wait for more
+}
+
+#elif defined(REMUX_TEST)
+#endif
+
diff --git a/remux.h b/remux.h
new file mode 100644
index 000000000..bceb676bf
--- /dev/null
+++ b/remux.h
@@ -0,0 +1,51 @@
+/*
+ * remux.h: A streaming MPEG2 remultiplexer
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: remux.h 1.1 2001/03/31 08:42:27 kls Exp $
+ */
+
+#ifndef __REMUX_H
+#define __REMUX_H
+
+// There are various experiments with different types of remultiplexers
+// going on at the moment. Select the remultiplexer here:
+#define REMUX_NONE 1
+//#define REMUX_TEST 1
+
+// Picture types:
+#define NO_PICTURE 0
+#define I_FRAME    1
+#define P_FRAME    2
+#define B_FRAME    3
+
+// Start codes:
+#define SC_PICTURE 0x00  // "picture header"
+#define SC_SEQU    0xB3  // "sequence header"
+#define SC_PHEAD   0xBA  // "pack header"
+#define SC_SHEAD   0xBB  // "system header"
+#define SC_AUDIO   0xC0
+#define SC_VIDEO   0xE0
+
+// The minimum amount of video data necessary to identify frames:
+#define MINVIDEODATA (256*1024) // just a safe guess (max. size of any frame block, plus some safety)
+
+typedef unsigned char uchar;
+
+class cRemux {
+private:
+#if defined(REMUX_NONE)
+  bool synced;
+  int GetPacketLength(const uchar *Data, int Count, int Offset);
+  int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
+#elif defined(REMUX_TEST)
+#endif
+public:
+  cRemux(void);
+  ~cRemux();
+  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar &PictureType);
+  };
+
+#endif // __REMUX_H
diff --git a/ringbuffer.c b/ringbuffer.c
new file mode 100644
index 000000000..48707133c
--- /dev/null
+++ b/ringbuffer.c
@@ -0,0 +1,170 @@
+/*
+ * ringbuffer.c: A threaded ring buffer
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Parts of this file were inspired by the 'ringbuffy.c' from the
+ * LinuxDVB driver (see linuxtv.org).
+ *
+ * $Id: ringbuffer.c 1.1 2001/03/10 17:11:34 kls Exp $
+ */
+
+#include "ringbuffer.h"
+#include "tools.h"
+
+// --- cRingBufferInputThread -------------------------------------------------
+
+class cRingBufferInputThread : public cThread {
+private:
+  cRingBuffer *ringBuffer;
+protected:
+  virtual void Action(void) { ringBuffer->Input(); }
+public:
+  cRingBufferInputThread(cRingBuffer *RingBuffer) { ringBuffer = RingBuffer; }
+  };
+
+// --- cRingBufferOutputThread ------------------------------------------------
+
+class cRingBufferOutputThread : public cThread {
+private:
+  cRingBuffer *ringBuffer;
+protected:
+  virtual void Action(void) { ringBuffer->Output(); }
+public:
+  cRingBufferOutputThread(cRingBuffer *RingBuffer) { ringBuffer = RingBuffer; }
+  };
+
+// --- cRingBuffer ------------------------------------------------------------
+
+cRingBuffer::cRingBuffer(int Size)
+{
+  size = Size;
+  buffer = NULL;
+  inputThread = NULL;
+  outputThread = NULL;
+  maxFill = 0;
+  busy = false;
+  if (size > 1) { // 'size - 1' must not be 0!
+     buffer = new uchar[size];
+     if (!buffer)
+        esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", size);
+     Clear();
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: illegal size for ring buffer (%d)", size);
+}
+
+cRingBuffer::~cRingBuffer()
+{
+  delete inputThread;
+  delete outputThread;
+  delete buffer;
+  dsyslog(LOG_INFO, "buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
+}
+
+void cRingBuffer::Clear(void)
+{
+  mutex.Lock();
+  head = tail = 0;
+  mutex.Unlock();
+}
+
+int cRingBuffer::Put(const uchar *Data, int Count)
+{
+  if (Count > 0) {
+     mutex.Lock();
+     int rest = size - head;
+     int diff = tail - head;
+     mutex.Unlock();
+     int free = (diff > 0) ? diff - 1 : size + diff - 1;
+     // Statistics:
+     int fill = size - free - 1 + Count;
+     if (fill >= size)
+        fill = size - 1;
+     if (fill > maxFill) {
+        maxFill = fill;
+        int percent = maxFill * 100 / (size - 1);
+        if (percent > 75)
+           dsyslog(LOG_INFO, "buffer usage: %d%%", percent);
+        }
+     //
+     if (free <= 0)
+        return 0;
+     if (free < Count)
+        Count = free;
+     if (Count > maxFill)
+        maxFill = Count;
+     if (Count >= rest) {
+        memcpy(buffer + head, Data, rest);
+        if (Count - rest)
+           memcpy(buffer, Data + rest, Count - rest);
+        head = Count - rest;
+        }
+     else {
+        memcpy(buffer + head, Data, Count);
+        head += Count;
+        }
+     }
+  return Count;
+}
+
+int cRingBuffer::Get(uchar *Data, int Count)
+{
+  if (Count > 0) {
+     mutex.Lock();
+     int rest = size - tail;
+     int diff = head - tail;
+     mutex.Unlock();
+     int cont = (diff >= 0) ? diff : size + diff;
+     if (rest <= 0)
+        return 0;
+     if (cont < Count)
+        Count = cont;
+     if (Count >= rest) {
+        memcpy(Data, buffer + tail, rest);
+        if (Count - rest)
+           memcpy(Data + rest, buffer, Count - rest);
+        tail = Count - rest;
+        }
+     else {
+        memcpy(Data, buffer + tail, Count);
+        tail += Count;
+        }
+     }
+  return Count;
+}
+
+bool cRingBuffer::Start(void)
+{
+  if (!busy) {
+     busy = true;
+     outputThread = new cRingBufferOutputThread(this);
+     if (!outputThread->Start())
+        DELETENULL(outputThread);
+     inputThread = new cRingBufferInputThread(this);
+     if (!inputThread->Start()) {
+        DELETENULL(inputThread);
+        DELETENULL(outputThread);
+        }
+     busy = outputThread && inputThread;
+     }
+  return busy;
+}
+
+bool cRingBuffer::Active(void)
+{
+  return outputThread && outputThread->Active() && inputThread && inputThread->Active();
+}
+
+void cRingBuffer::Stop(void)
+{
+  busy = false;
+  for (time_t t0 = time(NULL) + 3; time(NULL) < t0; ) {
+      if (!((outputThread && outputThread->Active()) || (inputThread && inputThread->Active())))
+         break;
+      }
+  DELETENULL(inputThread);
+  DELETENULL(outputThread);
+}
+
diff --git a/ringbuffer.h b/ringbuffer.h
new file mode 100644
index 000000000..1669a4946
--- /dev/null
+++ b/ringbuffer.h
@@ -0,0 +1,55 @@
+/*
+ * ringbuffer.h: A threaded ring buffer
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: ringbuffer.h 1.1 2001/03/10 14:00:59 kls Exp $
+ */
+
+#ifndef __RINGBUFFER_H
+#define __RINGBUFFER_H
+
+#include "thread.h"
+
+typedef unsigned char uchar;
+
+class cRingBufferInputThread;
+class cRingBufferOutputThread;
+
+class cRingBuffer {
+  friend class cRingBufferInputThread;
+  friend class cRingBufferOutputThread;
+private:
+  cRingBufferInputThread *inputThread;
+  cRingBufferOutputThread *outputThread;
+  cMutex mutex;
+  int size, head, tail;
+  uchar *buffer;
+  int maxFill;
+  bool busy;
+protected:
+  bool Busy(void) { return busy; }
+  void Clear(void);
+    // Immediately clears the ring buffer.
+  int Put(const uchar *Data, int Count);
+    // Puts at most Count bytes of Data into the ring buffer.
+    // Returns the number of bytes actually stored.
+  int Get(uchar *Data, int Count);
+    // Gets at most Count bytes of Data from the ring buffer.
+    // Returns the number of bytes actually retrieved.
+  virtual void Input(void) = 0;
+    // Runs as a separate thread and shall continuously read data from
+    // a source and call Put() to store the data in the ring buffer.
+  virtual void Output(void) = 0;
+    // Runs as a separate thread and shall continuously call Get() to
+    // retrieve data from the ring buffer and write it to a destination.
+public:
+  cRingBuffer(int Size);
+  virtual ~cRingBuffer();
+  bool Start(void);
+  bool Active(void);
+  void Stop(void);
+  };
+
+#endif // __RINGBUFFER_H
diff --git a/runvdr b/runvdr
index 83b2ea62f..5ec345854 100755
--- a/runvdr
+++ b/runvdr
@@ -1,13 +1,18 @@
 #!/bin/sh
 
-DVBDIR='../DVB/driver'
-VDRCMD='./vdr -w 60'
+DVBDIR="../DVB/driver"
+VDRPRG="./vdr"
+VDRCMD="$VDRPRG -w 60"
 
-while test 1; do
+KILLPROC="/sbin/killproc -TERM"
+
+while (true) do
 #      (cd $DVBDIR; make reload)
 #      sleep 3
-      if $VDRCMD; then exit; fi
+      $VDRCMD
+      if test $? -ne 1; then exit; fi
       date
       echo "restarting VDR"
+      $KILLPROC $VDRPRG
       sleep 10
       done
diff --git a/svdrp.c b/svdrp.c
index ffdac28b4..df4ffaccb 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.14 2001/02/18 14:18:13 kls Exp $
+ * $Id: svdrp.c 1.18 2001/04/01 16:06:54 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -113,7 +113,6 @@ int cSocket::Accept(void)
 
 // --- cSVDRP ----------------------------------------------------------------
 
-#define MAXCMDBUFFER 10000
 #define MAXHELPTOPIC 10
 
 const char *HelpPages[] = {
@@ -138,6 +137,8 @@ const char *HelpPages[] = {
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
   "    containing the given string as part of their name are listed.",
+  "LSTE\n"
+  "    List EPG data.",
   "LSTT [ <number> ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed.",
@@ -188,6 +189,7 @@ const char *HelpPages[] = {
 /* SVDRP Reply Codes:
 
  214 Help message
+ 215 EPG data record
  220 VDR service ready
  221 VDR service closing transmission channel
  250 Requested VDR action okay, completed
@@ -234,6 +236,7 @@ const char *GetHelpPage(const char *Cmd)
 cSVDRP::cSVDRP(int Port)
 :socket(Port)
 {
+  numChars = 0;
   message = NULL;
   lastActivity = 0;
   isyslog(LOG_INFO, "SVDRP listening on port %d", Port);
@@ -470,13 +473,24 @@ void cSVDRP::CmdHELP(const char *Option)
      Reply(-214, "This is VDR version %s", VDRVERSION);
      Reply(-214, "Topics:");
      const char **hp = HelpPages;
+     int NumPages = 0;
      while (*hp) {
-           //TODO multi-column???
-           const char *topic = GetHelpTopic(*hp);
-           if (topic)
-              Reply(-214, "    %s", topic);
+           NumPages++;
            hp++;
            }
+     const int TopicsPerLine = 5;
+     int x = 0;
+     for (int y = 0; (y * TopicsPerLine + x) < NumPages; y++) {
+         char buffer[TopicsPerLine * (MAXHELPTOPIC + 5)];
+         char *q = buffer;
+         for (x = 0; x < TopicsPerLine && (y * TopicsPerLine + x) < NumPages; x++) {
+             const char *topic = GetHelpTopic(HelpPages[(y * TopicsPerLine + x)]);
+             if (topic)
+                q += sprintf(q, "    %s", topic);
+             }
+         x = 0;
+         Reply(-214, buffer);
+         }
      Reply(-214, "To report bugs in the implementation send email to");
      Reply(-214, "    vdr-bugs@cadsoft.de");
      }
@@ -535,7 +549,7 @@ void cSVDRP::CmdLSTC(const char *Option)
            Reply(250, "%d %s", next->number, next->ToText());
         }
      }
-  else {
+  else if (Channels.MaxNumber() >= 1) {
      for (int i = 1; i <= Channels.MaxNumber(); i++) {
          cChannel *channel = Channels.GetByNumber(i);
         if (channel)
@@ -544,6 +558,27 @@ void cSVDRP::CmdLSTC(const char *Option)
            Reply(501, "Channel \"%d\" not found", i);
          }
      }
+  else
+     Reply(550, "No channels defined");
+}
+
+void cSVDRP::CmdLSTE(const char *Option)
+{
+  cThreadLock ThreadLock;
+  const cSchedules *Schedules = cDvbApi::PrimaryDvbApi->Schedules(&ThreadLock);
+  if (Schedules) {
+     FILE *f = fdopen(file, "w");
+     if (f) {
+        Schedules->Dump(f, "215-");
+        fflush(f);
+        Reply(215, "End of EPG data");
+        // don't 'fclose(f)' here!
+        }
+     else
+        Reply(451, "Can't open file connection");
+     }
+  else
+     Reply(451, "Can't get EPG data");
 }
 
 void cSVDRP::CmdLSTT(const char *Option)
@@ -559,7 +594,7 @@ void cSVDRP::CmdLSTT(const char *Option)
      else
         Reply(501, "Error in timer number \"%s\"", Option);
      }
-  else {
+  else if (Timers.Count()) {
      for (int i = 0; i < Timers.Count(); i++) {
          cTimer *timer = Timers.Get(i);
         if (timer)
@@ -568,6 +603,8 @@ void cSVDRP::CmdLSTT(const char *Option)
            Reply(501, "Timer \"%d\" not found", i + 1);
          }
      }
+  else
+     Reply(550, "No timers defined");
 }
 
 void cSVDRP::CmdMESG(const char *Option)
@@ -838,7 +875,8 @@ void cSVDRP::Execute(char *Cmd)
   char *s = Cmd;
   while (*s && !isspace(*s))
         s++;
-  *s++ = 0;
+  if (*s)
+     *s++ = 0;
   if      (CMD("CHAN"))  CmdCHAN(s);
   else if (CMD("DELC"))  CmdDELC(s);
   else if (CMD("DELT"))  CmdDELT(s);
@@ -846,6 +884,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("HELP"))  CmdHELP(s);
   else if (CMD("HITK"))  CmdHITK(s);
   else if (CMD("LSTC"))  CmdLSTC(s);
+  else if (CMD("LSTE"))  CmdLSTE(s);
   else if (CMD("LSTT"))  CmdLSTT(s);
   else if (CMD("MESG"))  CmdMESG(s);
   else if (CMD("MODC"))  CmdMODC(s);
@@ -860,8 +899,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("OVLP"))  CmdOVLP(s);
   else if (CMD("OVLO"))  CmdOVLO(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
-  else if (CMD("QUIT")
-       ||  CMD("\x04"))  Close();
+  else if (CMD("QUIT"))  Close();
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
 }
 
@@ -871,29 +909,55 @@ void cSVDRP::Process(void)
   bool SendGreeting = NewConnection;
 
   if (file.IsOpen() || file.Open(socket.Accept())) {
-     char buffer[MAXCMDBUFFER];
      if (SendGreeting) {
         //TODO how can we get the *full* hostname?
+        char buffer[MAXCMDBUFFER];
         gethostname(buffer, sizeof(buffer));
         time_t now = time(NULL);
         Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, ctime(&now));
         }
      if (NewConnection)
         lastActivity = time(NULL);
-     int rbytes = file.ReadString(buffer, sizeof(buffer) - 1);
-     if (rbytes > 0) {
-        //XXX overflow check???
-        // strip trailing whitespace:
-        while (rbytes > 0 && strchr(" \t\r\n", buffer[rbytes - 1]))
-              buffer[--rbytes] = 0;
-        // make sure the string is terminated:
-        buffer[rbytes] = 0;
-        // showtime!
-        Execute(buffer);
-        lastActivity = time(NULL);
+     if (file.Ready(false)) {
+        unsigned char c;
+        int r = read(file, &c, 1);
+        if (r > 0) {
+           if (c == '\n' || c == 0x00) {
+              // strip trailing whitespace:
+              while (numChars > 0 && strchr(" \t\r\n", cmdLine[numChars - 1]))
+                    cmdLine[--numChars] = 0;
+              // make sure the string is terminated:
+              cmdLine[numChars] = 0;
+              // showtime!
+              Execute(cmdLine);
+              numChars = 0;
+              }
+           else if (c == 0x04 && numChars == 0) {
+              // end of file (only at beginning of line)
+              Close();
+              }
+           else if (c == 0x08 || c == 0x7F) {
+              // backspace or delete (last character)
+              if (numChars > 0)
+                 numChars--;
+              }
+           else if (c <= 0x03 || c == 0x0D || 0xF0 <= c) {
+              // ignore control characters
+              }
+           else if (numChars < sizeof(cmdLine) - 1) {
+              cmdLine[numChars++] = c;
+              cmdLine[numChars] = 0;
+              }
+           else {
+              Reply(501, "Command line too long");
+              esyslog(LOG_ERR, "SVDRP: command line too long: '%s'", cmdLine);
+              numChars = 0;
+              }
+           lastActivity = time(NULL);
+           }
+        else if (r < 0)
+           Close();
         }
-     else if (rbytes < 0)
-        Close();
      else if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
         isyslog(LOG_INFO, "timeout on SVDRP connection");
         Close(true);
diff --git a/svdrp.h b/svdrp.h
index 62c1e7537..83827082a 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.7 2001/02/18 13:36:47 kls Exp $
+ * $Id: svdrp.h 1.9 2001/04/01 15:05:38 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -26,11 +26,15 @@ class cSocket {
   int Accept(void);
   };
 
+#define MAXCMDBUFFER 1024
+
 class cSVDRP {
 private:
   cSocket socket;
   cFile file;
   CRect ovlClipRects[MAXCLIPRECTS];
+  uint numChars;
+  char cmdLine[MAXCMDBUFFER];
   char *message;
   time_t lastActivity;
   void Close(bool Timeout = false);
@@ -43,6 +47,7 @@ class cSVDRP {
   void CmdHELP(const char *Option);
   void CmdHITK(const char *Option);
   void CmdLSTC(const char *Option);
+  void CmdLSTE(const char *Option);
   void CmdLSTT(const char *Option);
   void CmdMESG(const char *Option);
   void CmdMODC(const char *Option);
diff --git a/tools.c b/tools.c
index a3b27e5a7..c303a8ab8 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.30 2001/02/11 14:44:22 kls Exp $
+ * $Id: tools.c 1.32 2001/04/01 14:13:36 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -369,27 +369,6 @@ void cFile::Close(void)
      }
 }
 
-int cFile::ReadString(char *Buffer, int Size)
-{
-  int rbytes = 0;
-  bool wait = true;
-
-  while (Ready(wait)) {
-        int n = read(f, Buffer + rbytes, 1);
-        if (n == 0)
-           break; // EOF
-        if (n < 0) {
-           LOG_ERROR;
-           return -1;
-           }
-        rbytes += n;
-        if (rbytes == Size || Buffer[rbytes - 1] == '\n')
-           break;
-        wait = false;
-        }
-  return rbytes;
-}
-
 bool cFile::Ready(bool Wait)
 {
   return f >= 0 && AnyFileReady(f, Wait ? 1000 : 0);
@@ -519,11 +498,6 @@ cListBase::cListBase(void)
 cListBase::~cListBase()
 {
   Clear();
-  while (objects) {
-        cListObject *object = objects->Next();
-        delete objects;
-        objects = object;
-        }
 }
 
 void cListBase::Add(cListObject *Object) 
diff --git a/tools.h b/tools.h
index 96d09826e..a9d61218f 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.24 2001/02/11 13:39:40 kls Exp $
+ * $Id: tools.h 1.25 2001/04/01 14:13:42 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -64,7 +64,6 @@ class cFile {
   bool Open(int FileDes);
   void Close(void);
   bool IsOpen(void) { return f >= 0; }
-  int ReadString(char *Buffer, int Size);
   bool Ready(bool Wait = true);
   static bool AnyFileReady(int FileDes = -1, int TimeoutMs = 1000);
   static bool FileReady(int FileDes, int TimeoutMs = 1000);
diff --git a/vdr.c b/vdr.c
index 938afcf09..8ed209a63 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.54 2001/02/24 16:18:43 kls Exp $
+ * $Id: vdr.c 1.56 2001/04/01 11:16:54 kls Exp $
  */
 
 #include <getopt.h>
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
   const char *ConfigDirectory = NULL;
   bool DaemonMode = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
+  char *Terminal = NULL;
 
   static struct option long_options[] = {
       { "config",   required_argument, NULL, 'c' },
@@ -84,12 +85,13 @@ int main(int argc, char *argv[])
       { "port",     required_argument, NULL, 'p' },
       { "video",    required_argument, NULL, 'v' },
       { "watchdog", required_argument, NULL, 'w' },
+      { "terminal", required_argument, NULL, 't' },
       { 0 }
     };
   
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "c:dD:hl:p:v:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "c:dD:hl:p:v:w:t:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'c': ConfigDirectory = optarg;
                     break;
@@ -102,7 +104,7 @@ int main(int argc, char *argv[])
                           }
                        }
                     fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
-                    abort();
+                    return 2;
                     break;
           case 'h': printf("Usage: vdr [OPTION]\n\n"           // for easier orientation, this is column 80|
                            "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
@@ -117,9 +119,10 @@ int main(int argc, char *argv[])
                            "                           2 = errors and info, 3 = errors, info and debug\n"
                            "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                            "                           0 turns off SVDRP\n"
-                           "  -v DIR,   --video=DIR    use DIR as video directory (default is %s)\n"
+                           "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
+                           "  -t TTY,   --terminal=TTY controlling tty\n"
                            "\n"
                            "Report bugs to <vdr-bugs@cadsoft.de>\n",
                            DEFAULTSVDRPPORT,
@@ -136,15 +139,17 @@ int main(int argc, char *argv[])
                           }
                        }
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
-                    abort();
+                    return 2;
                     break;
           case 'p': if (isnumber(optarg))
                        SVDRPport = atoi(optarg);
                     else {
                        fprintf(stderr, "vdr: invalid port number: %s\n", optarg);
-                       abort();
+                       return 2;
                        }
                     break;
+          case 't': Terminal = optarg;
+                    break;
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
@@ -157,9 +162,9 @@ int main(int argc, char *argv[])
                           }
                        }
                     fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg);
-                    abort();
+                    return 2;
                     break;
-          default:  abort();
+          default:  return 2;
           }
         }
 
@@ -172,7 +177,7 @@ int main(int argc, char *argv[])
 
   if (!DirectoryOk(VideoDirectory, true)) {
      fprintf(stderr, "vdr: can't access video directory %s\n", VideoDirectory);
-     abort();
+     return 2;
      }
 
   // Daemon mode:
@@ -183,7 +188,7 @@ int main(int argc, char *argv[])
      if (pid < 0) {
         fprintf(stderr, "%m\n");
         esyslog(LOG_ERR, "ERROR: %m");
-        abort();
+        return 2;
         }
      if (pid != 0)
         return 0; // initial program immediately returns
@@ -192,9 +197,16 @@ int main(int argc, char *argv[])
      fclose(stderr);
 #else
      fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD or REMOTE_KBD on!\n");
-     abort();
+     return 2;
 #endif
      }
+  else if (Terminal) {
+     // Claim new controlling terminal
+     stdin  = freopen(Terminal, "r", stdin);
+     stdout = freopen(Terminal, "w", stdout);
+     stderr = freopen(Terminal, "w", stderr);
+     }
+
   isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
 
   // Configuration data:
@@ -215,7 +227,7 @@ int main(int argc, char *argv[])
   // DVB interfaces:
 
   if (!cDvbApi::Init())
-     abort();
+     return 2;
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 

From 8f9cc68f76c4fd0960f919a77fb16a6455922deb Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 29 Jul 2001 18:00:00 +0200
Subject: [PATCH 019/307] =?UTF-8?q?Version=200.85=20-=20Added=20Norwegian?=
 =?UTF-8?q?=20language=20texts=20(thanks=20to=20J=F8rgen=20Tvedt).=20-=20I?=
 =?UTF-8?q?ncreased=20the=20usleep=20value=20in=20cDvbOsd::Cmd()=20to=2050?=
 =?UTF-8?q?00=20in=20order=20to=20work=20on=20=20=20systems=20with=20the?=
 =?UTF-8?q?=20KURT/utime-patch=20(thanks=20to=20Guido=20Fiala).=20-=20Chan?=
 =?UTF-8?q?ged=20the=20check=20whether=20the=20driver=20is=20loaded=20in?=
 =?UTF-8?q?=20runvdr=20to=20check=20for=20the=20=20=20'dvb'=20module=20(th?=
 =?UTF-8?q?e=20last=20one=20loaded).=20-=20Fixed=20repeat=20function=20wit?=
 =?UTF-8?q?h=20LIRC=20(thanks=20to=20Stefan=20Huelswitt).=20-=20Increased?=
 =?UTF-8?q?=20the=20upper=20limit=20for=20the=20symbol=20rate=20to=2030000?=
 =?UTF-8?q?=20(thanks=20to=20Ulrich=20=20=20R=F6der).=20-=20Made=20the=20p?=
 =?UTF-8?q?osition=20of=20the=20channel=20display=20configurable=20(thanks?=
 =?UTF-8?q?=20to=20Stefan=20=20=20Huelswitt).=20-=20Made=20the=20width=20a?=
 =?UTF-8?q?nd=20height=20of=20the=20OSD=20configurable=20(thanks=20to=20St?=
 =?UTF-8?q?efan=20Huelswitt).=20-=20DiSEqC=20support=20can=20now=20be=20ge?=
 =?UTF-8?q?nerally=20enabled/disabled=20in=20the=20Setup=20menu.=20This=20?=
 =?UTF-8?q?=20=20may=20be=20necessary=20if=20your=20multiswitch=20gets=20i?=
 =?UTF-8?q?rritated=20by=20the=20default=20DiSEqC=20=20=20codes=20'0'=20(t?=
 =?UTF-8?q?hanks=20to=20Markus=20Lang).=20-=20Fixed=20replaying=20in=20cas?=
 =?UTF-8?q?e=20there=20is=20no=20index=20file.=20-=20Fixed=20jumping=20to?=
 =?UTF-8?q?=20an=20editing=20mark=20when=20replay=20has=20been=20paused.?=
 =?UTF-8?q?=20-=20Avoiding=20unnecessary=20code=20execution=20in=20the=20r?=
 =?UTF-8?q?eplay=20progress=20display=20(thanks=20=20=20to=20Guido=20Fiala?=
 =?UTF-8?q?).=20-=20When=20entering=20time=20values=20the=20digits=20that?=
 =?UTF-8?q?=20still=20have=20to=20be=20entered=20are=20now=20=20=20shown?=
 =?UTF-8?q?=20as=20'-'=20(as=20in=20"1-:--").=20-=20When=20setting=20an=20?=
 =?UTF-8?q?editing=20mark=20while=20the=20progress=20display=20is=20not=20?=
 =?UTF-8?q?active,=20the=20=20=20display=20will=20now=20be=20turned=20on?=
 =?UTF-8?q?=20for=20a=20short=20while=20to=20indicate=20the=20successful?=
 =?UTF-8?q?=20=20=20setting=20of=20the=20mark.=20-=20Updated=20'channels.c?=
 =?UTF-8?q?onf'=20for=20Premiere=20World=20(thanks=20to=20Helmut=20Sch=E4c?=
 =?UTF-8?q?hner).=20=20=20Check=20your=20timers=20if=20you=20use=20this=20?=
 =?UTF-8?q?channels.conf=20file,=20since=20the=20sequence=20of=20=20=20sev?=
 =?UTF-8?q?eral=20PW=20channels=20has=20been=20changed.=20-=20Changed=20th?=
 =?UTF-8?q?e=20color=20of=20"Info"=20messages=20to=20"black=20on=20green"?=
 =?UTF-8?q?=20and=20that=20of=20the=20=20=20confirmation=20messages=20(lik?=
 =?UTF-8?q?e=20"Delete...")=20to=20"black=20on=20yellow".=20-=20Fixed=20di?=
 =?UTF-8?q?splay=20with=20DEBUG=5FOSD=20(it=20still=20crashes=20sometimes,?=
 =?UTF-8?q?=20esp.=20when=20replaying,=20=20=20but=20I=20can't=20seem=20to?=
 =?UTF-8?q?=20find=20what=20causes=20this...=20any=20ideas=20anybody=3F).?=
 =?UTF-8?q?=20-=20Avoiding=20audio/video=20distortions=20in=20'Transfer=20?=
 =?UTF-8?q?Mode'=20by=20no=20longer=20actually=20=20=20tuning=20the=20prim?=
 =?UTF-8?q?ary=20interface=20(which=20can't=20receive=20this=20channel,=20?=
 =?UTF-8?q?anyway).=20=20=20Apparently=20the=20driver=20gets=20irritated?=
 =?UTF-8?q?=20when=20the=20channel=20is=20switched=20and=20a=20=20=20repla?=
 =?UTF-8?q?y=20session=20is=20started=20immediately=20after=20that.=20-=20?=
 =?UTF-8?q?Increased=20timeout=20until=20reporting=20"video=20data=20strea?=
 =?UTF-8?q?m=20broken"=20when=20recording.=20-=20Explicitly=20switching=20?=
 =?UTF-8?q?back=20to=20the=20previously=20active=20channel=20after=20endin?=
 =?UTF-8?q?g=20a=20=20=20replay=20session=20(to=20have=20it=20shown=20corr?=
 =?UTF-8?q?ectly=20in=20case=20it=20was=20in=20'Transfer=20Mode').?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                   |   36 +
 FORMATS                        |   22 +-
 HISTORY                        |  163 +++-
 INSTALL                        |   16 +-
 MANUAL                         |   48 +-
 Makefile                       |    8 +-
 Tools/schnitt/README           |   63 +-
 Tools/schnitt/cut.pl           |   19 +-
 Tools/schnitt/cut2             |    2 +-
 Tools/schnitt/cutall           |    4 +-
 Tools/schnitt/cutall2          |    2 +-
 Tools/schnitt/cutt             |  129 +--
 Tools/schnitt/getpreviframe.pl |    6 -
 Tools/schnitt/mv2              |   35 +-
 Tools/schnitt/schnitt.pl       |    3 +-
 Tools/schnitt/schnitt2.pl      |    2 +
 Tools/schnitt/show             |    2 +-
 Tools/schnitt/vmount           |    2 +-
 channels.conf                  |  122 ++-
 config.c                       |   81 +-
 config.h                       |   26 +-
 dvbapi.c                       | 1621 ++++++++++++++++++--------------
 dvbapi.h                       |   75 +-
 dvbosd.c                       |  352 ++++++-
 dvbosd.h                       |   84 +-
 eit.c                          |  257 +++--
 eit.h                          |   10 +-
 i18n.c                         |  458 ++++++++-
 interface.c                    |   22 +-
 interface.h                    |    4 +-
 menu.c                         |  250 +++--
 menu.h                         |    6 +-
 osd.h                          |    4 +-
 recording.c                    |   57 +-
 recording.h                    |    4 +-
 remote.c                       |   12 +-
 remote.h                       |    4 +-
 remux.c                        |  539 ++++++++++-
 remux.h                        |   37 +-
 ringbuffer.c                   |   37 +-
 ringbuffer.h                   |    8 +-
 runvdr                         |   36 +-
 svdrp.c                        |    8 +-
 thread.c                       |   60 +-
 thread.h                       |   17 +-
 tools.c                        |   22 +-
 tools.h                        |    3 +-
 vdr.c                          |   20 +-
 videodir.c                     |    4 +-
 49 files changed, 3431 insertions(+), 1371 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8a67f37c9..676cf8991 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -23,6 +23,7 @@ Guido Fiala <gfiala@s.netic.de>
  for implementing the SVDRP command 'HITK'
  for implementing image grabbing
  for implementing overlay capabilities (see his 'kvdr' tool at http://www.s.netic.de/gfiala)
+ for making the replay progress display avoid unnecessary code execution
 
 Robert Schneider <Robert.Schneider@lotus.com>
  for implementing EIT support for displaying the current/next info
@@ -42,6 +43,7 @@ Bastian Guse <bastian@nocopy.de>
 Matthias Schniedermeyer <ms@citd.de>
  for implementing the 'MarkInstantRecord' setup option
  for his "schnitt" tools
+ for his "master-timer" tool
 
 Miha Setina <mihasetina@softhome.net>
  for translating the OSD texts to the Slovenian language
@@ -54,6 +56,7 @@ Deti Fliegl <deti@fliegl.de>
 
 Dave Chapman <dave@dchapman.com>
  for implementing support for the teletext PID
+ for his great support in switching to the NAPI
 
 Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de>
  for his support in adapting VDR to DVB-C
@@ -70,3 +73,36 @@ Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
 
 J�rgen Sauer <jojo@automatix.de>
  for implementing the -t option to set the controlling terminal
+
+Benjamin Reichardt <reichard@math.uni-goettingen.de>
+ for his help in debugging the transition to the new API
+
+Henning Holtschneider <hh@holtschneider.com>
+ for patching 'runvdr' to check whether the driver is already loaded
+
+Paulo Manuel Martins Lopes <pmml@netvita.pt>
+ for translating the OSD texts to the Portugese language
+
+Markus Lang <markus.lang@nissan-db.de> and Ulrich R�der <dynamite@efr-net.de>
+ for making DiSEqC support configurable
+
+Jean-Claude Repetto <jc@repetto.org>
+ for translating the OSD texts to the French language
+
+Andre Valentin <av2000@topmail.de>
+ for increasing the key name buffer size for LIRC
+
+J�rgen Tvedt <pjtvedt@online.no>
+ for translating the OSD texts to the Norwegian language
+
+Stefan Huelswitt <huels@iname.com>
+ for fixing the repeat function with LIRC
+ for making the position of the channel display configurable
+ for making the width and height of the OSD configurable
+
+Ulrich R�der <dynamite@efr-net.de>
+ for pointing out that there are channels that have a symbol rate higher than
+ 27500.
+
+Helmut Sch�chner <schaechner@yahoo.com>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
diff --git a/FORMATS b/FORMATS
index 2a357a355..03739ee50 100644
--- a/FORMATS
+++ b/FORMATS
@@ -13,7 +13,7 @@ Video Disk Recorder File Formats
 
   A "channel definition" is a line with channel data, where the fields
   are separated by ':' characters:
-  Example: "RTL:12188:h:1:27500:163:104:0:0:12003"
+  Example: "RTL:12188:h:1:27500:163:104:105:0:12003"
 
   The fields in a channel definition have the following meaning (from left
   to right):
@@ -25,7 +25,9 @@ Video Disk Recorder File Formats
   - Diseqc number **
   - Symbol rate
   - Video PID
-  - Audio PID
+  - Audio PID (either one number, or two, separated by a comma)
+    If this channel also carries Dolby Digital sound, the Dolby PIDs follow
+    the audio PIDs, separated by a semicolon, as in "...:101,102;103,104:..."
   - Teletext PID
   - Conditional Access (0 = Free To Air, 1 = can be decrypted by the first
     DVB card, 2 = can be decrypted by the second DVB card)
@@ -60,8 +62,10 @@ Video Disk Recorder File Formats
     (1..31)
   - Start time (first two digits for the hour, second two digits for the minutes)
   - End time (first two digits for the hour, second two digits for the minutes)
-  - Priority (from 00 to 99, 00 = lowest prioity, 99 = highest priority)
-  - Guaranteed lifetime of recording (in days)
+  - Priority (from 0 to 99, 0 = lowest prioity, 99 = highest priority)
+  - Guaranteed lifetime of recording (in days); 0 means that this recording may
+    be automatically deleted by a new recording with higher priority, 99 means
+    that this recording will never be automatically deleted
   - Name of timer (will be used to name the recording); if the name contains
     any ':' characters, these have to be replaced with '|'
   - Summary (any newline characters in the summary have to be replaced with '|';
@@ -126,3 +130,13 @@ Video Disk Recorder File Formats
   - marks must have a frame number, and that frame MUST be an I-frame (this
     means that only marks generated by VDR itself can be used, since they
     will always be guaranteed to mark I-frames).
+
+* 001.vdr ... 255.vdr
+
+  These are the actual recorded MPEG data files. In order to keep the size of
+  an individual file below a given limit, a recording is split into several
+  files. The contents of these files is "Packetized Elementary Stream" (PES)
+  and contains ES packets with ids 0xE0 for video, 0xC0 for audio 1 and 0xC1
+  for audio 2 (if available). Dolby Digital data is stored in packets with
+  ids 0xBD.
+
diff --git a/HISTORY b/HISTORY
index 203377d37..d625b260f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -290,7 +290,7 @@ Video Disk Recorder Revision History
   channel, if the timer currently occupying this DVB card doesn't need the
   CAM module (and thus can continue recording on a different DVB card).
 - The "Yellow" button in the "What's on now/next?" menus now displays the
-  schedule of the current channel from that menu. 
+  schedule of the current channel from that menu.
 - All DVB cards in a multi-card system now write their EIT information into the
   same data structure.
 - If there is more than one DVB card in the system, the non-primary cards are
@@ -332,8 +332,8 @@ Video Disk Recorder Revision History
 - Implemented "On Disk Editing".
 - There is no more default 'timers.conf' file.
 - Added Italian language texts (thanks to Alberto Carraro).
-- Fixed starting a replay session when the program is currently in "transfer
-  mode".
+- Fixed starting a replay session when the program is currently in 'Transfer
+  Mode'.
 - Fixed setting/modifying timers via SVDRP with empty summary fields.
 - Fixed a problem with recordings that have a single quote character in their
   name (this is now mapped to 0x01).
@@ -452,3 +452,160 @@ Video Disk Recorder Revision History
 - Empty lines in config files no longer cause error messages.
 - New SVDRP command LSTE to list the EPG data.
 - The SVDRP HELP command now prints the topics in several columns.
+
+2001-06-02: Version 0.80
+
+- VDR now requires driver version 0.9.0 or higher.
+- Switched to the "new API" (thanks to Dave Chapman for his great support in
+  this task).
+- New setup parameter "LnbSLOF" that defines the switching frequency of the LNB.
+- Fixed a bug in the EPG scanner with more than one DVB card.
+- Fixed checking for free disk space, so that it works with NFS mounted drives.
+- Files are now created with mode 644.
+- Fixed checking the exit status in the 'runvdr' script.
+- Activated loading the driver in 'runvdr'. Please read the comments in 'runvdr'
+  for details.
+- The new "emergency exit" feature automatically triggers a restart of VDR (if
+  used with 'runvdr', otherwise it simply exists) if
+  * tuning the channel for a recording fails
+  * no useful data is received within the first 1MB of a recording
+  * no data is received within a recording for more than 5 seconds
+  This should make sure that a recording is successfully restarted after any
+  problems.
+- Processing the EIT data is now disabled during replay and 'Transfer Mode' in
+  order to avoid video and audio glitches (there appears to be a bandwidth
+  problem somewhere in the driver/firmware/hardware).
+- Due to the reduced amount of OSD memory provided by the driver the number of
+  lines in the OSD had to be reduced by 2. By rearranging some of the display
+  items the amount of visible information remained the same as before, though.
+  If your DVB card has even less memory (which would result in only the
+  channel switching display and the replay progress display being visible, but
+  no Main menu), try reducing the constant 'MenuLines' in dvbapi.h (currently
+  '13') even further.
+- There are two new setup parameters to define the "Default Priority" and
+  "Default Lifetime" when creating a new timer event.
+- The meaning of the "Lifetime" parameter has been modified: a value of '99'
+  now means that the recording will live "forever", and a value of '0' means
+  that the recording has no guaranteed lifetime and will be deleted whenever
+  a new recording with higher priority needs disk space.
+- Updated version of Matthias Schniedermeyer's 'schnitt' tools.
+- New 'master-timer' tool (thanks to Matthias Schniedermeyer).
+
+2001-06-12: Version 0.81
+
+- Fixed handling the case where the driver reports EAGAIN during recording,
+  but no data comes within 5 seconds.
+- Fixed EPG scanning on single DVB card systems.
+- There can now be two audio PIDs per channel, which can be toggled via the
+  "Green" button in the "Main" menu. The "Edit Channel" menu therefore now
+  has two audio PID fields (Apid1 and Apid2). By default, Apid2 is 0, which
+  means there is no alternate audio track.
+- Fixed replaying in case the driver reports EAGAIN.
+- Now 'runvdr' checks if the driver is already loaded (thanks to Henning
+  Holtschneider).
+- Fixed removing recordings with Lifetime = 99.
+- Improved channel switching.
+
+2001-06-16: Version 0.82
+
+- Increased timeout until reporting "broken video data stream" when recording.
+- Increased amount of non-useful data received by cRemux before assuming the
+  recording will fail.
+- If there are two audio PIDs defined for a channel, both audio tracks will
+  now be recorded and can be selectively replayed later. See the FORMATS file
+  for details on how these different audio tracks are stored in the recorded
+  files. In order for this to work properly you need to use a driver version
+  dated 2001-06-16 or later, where the default PES filter buffer size has been
+  reduced. This will create packets for the second audio track that are small
+  enough to multiplex smoothly with the video data.
+- Fixed a bug in the editing mechanism (didn't work with recordings that
+  consist of more than one data file).
+- The compile time switch VFAT has been fixed to recognize the ':' character
+  in recording names, too.
+- Setting all PIDs to 0x1FFF before switching channel.
+- New setup parameter "VideoFormat" to define the aspect ratio of the tv set
+  in use (4:3 or 16:9).
+
+2001-06-26: Version 0.83
+
+- Avoiding "Device or resource busy" error message when setting PIDs.
+- Added Portugese language texts (thanks to Paulo Manuel Martins Lopes).
+- Recording and replaying Dolby Digital (AC3) sound.
+- No longer getting stuck when a channel doesn't sync while switching
+  with the 'Up' and 'Down' keys.
+
+2001-07-22: Version 0.84
+
+- Fixed video packet scanning to make it recognize the whole range of
+  allowed video packet ids.
+- Added an additional "emergency exit" in case channel switching doesn't
+  work several times in a row (when will the driver finally become stable
+  enough to allow rock solid channel switching??).
+- No longer sending a Diseqc command if the Diseqc value for a given channel
+  is '0'. Previously this caused problems with some multi-switches (thanks to
+  Markus Lang and Ulrich R�der).
+- When switching channels by entering the channel number via the numeric keys
+  on the remote control, the channel number displayed is now followed by the
+  '-' character to indicate that additional digits can be entered.
+- Increased the timeout for numeric channel switching from 500ms to 1s.
+- Fixed handling the "Green" button in the "Schedules" menu for channels that
+  have a second audio PID.
+- Fixed high system load when displaying a still picture in replay.
+- Fixed a hanging SVDRP connection if the client dies without issuing QUIT.
+- Increased the frame buffer size to 192KB.
+- Removed a superfluous VIDEO_FREEZE call in the replay buffer.
+- Added French language texts (thanks to Jean-Claude Repetto).
+- Modified OSD to use 2bpp windows (4 colors) in order to work with less
+  memory, allow a larger OSD window and be faster. The group separators in the
+  "Channels" menu had to be given a different color.
+- Moved the channel display to the bottom of the screen.
+- Displaying the frame counter in the replay progress display only when editing
+  a mark.
+- Fixed handling characters above 0xEF in SVDRP.
+- Fixed a possible crash in parsing incorrect lines in 'channels.conf'.
+- New channel settings for Premiere World (Dolby Digital PIDs not yet
+  available).
+- Increased the buffer for key names received from LIRC (thanks to Andre
+  Valentin).
+- Fixed handling a channel group separator at the very beginning of the
+  'channels.conf' file.
+
+2001-07-29: Version 0.85
+
+- Added Norwegian language texts (thanks to J�rgen Tvedt).
+- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
+  systems with the KURT/utime-patch (thanks to Guido Fiala).
+- Changed the check whether the driver is loaded in runvdr to check for the
+  'dvb' module (the last one loaded).
+- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
+- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
+  R�der).
+- Made the position of the channel display configurable (thanks to Stefan
+  Huelswitt).
+- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
+- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
+  may be necessary if your multiswitch gets irritated by the default DiSEqC
+  codes '0' (thanks to Markus Lang).
+- Fixed replaying in case there is no index file.
+- Fixed jumping to an editing mark when replay has been paused.
+- Avoiding unnecessary code execution in the replay progress display (thanks
+  to Guido Fiala).
+- When entering time values the digits that still have to be entered are now
+  shown as '-' (as in "1-:--").
+- When setting an editing mark while the progress display is not active, the
+  display will now be turned on for a short while to indicate the successful
+  setting of the mark.
+- Updated 'channels.conf' for Premiere World (thanks to Helmut Sch�chner).
+  Check your timers if you use this channels.conf file, since the sequence of
+  several PW channels has been changed.
+- Changed the color of "Info" messages to "black on green" and that of the
+  confirmation messages (like "Delete...") to "black on yellow".
+- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
+  but I can't seem to find what causes this... any ideas anybody?).
+- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
+  tuning the primary interface (which can't receive this channel, anyway).
+  Apparently the driver gets irritated when the channel is switched and a
+  replay session is started immediately after that.
+- Increased timeout until reporting "video data stream broken" when recording.
+- Explicitly switching back to the previously active channel after ending a
+  replay session (to have it shown correctly in case it was in 'Transfer Mode').
diff --git a/INSTALL b/INSTALL
index 6910f6b47..28037eb36 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,7 +15,7 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile.
 
-This program requires the card driver version 0.8.2 or higher
+This program requires the card driver version 0.9.0 or higher
 to work properly. You need to load the dvb.o module *without* option
 'outstream=0' (previous versions of VDR required this option to have
 the driver supply the data in AV_PES format; as of version 0.70 VDR
@@ -81,13 +81,25 @@ Automatic restart in case of hangups:
 
 If you run VDR using the 'runvdr' shell script it will use the built-in
 watchdog timer to restart the program in case something happens that
-causes a program hangup.
+causes a program hangup. If you change the command line options for the
+call to the VDR program, be sure to NOT use the '-d' option! Otherwise
+VDR will go into 'deamon' mode and the initial program call will return
+immediately!
 
 Command line options:
 ---------------------
 
 Use "vdr --help" for a list of available command line options.
 
+Replaying Dolby Digital audio:
+------------------------------
+
+To replay Dolby Digital audio you need a program that reads the DD data
+from stdin and processes it in a way suitable for your audio hardware.
+This program must be given to VDR with the '-a' option, as in
+
+  vdr -a ac3play
+
 The video data directory:
 -------------------------
 
diff --git a/MANUAL b/MANUAL
index f77bd2763..c59f3fefc 100644
--- a/MANUAL
+++ b/MANUAL
@@ -18,7 +18,7 @@ Video Disk Recorder User's Manual
   Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
   Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
   Red     -           Record     Edit       Edit       -             Play        -
-  Green   -           -          New        New        -             Rewind      Skip -60s
+  Green   -           Language   New        New        -             Rewind      Skip -60s
   Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
   Blue    -           Resume     Mark       Mark       -             Summary     Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           Editing
@@ -32,11 +32,11 @@ Video Disk Recorder User's Manual
   confirms any changes (or switches to a channel in the "Channels" menu).
   The "Back" key goes back one level in the menu structure, discarding
   any changes that might have been made in the current menu.
-  
+
   In the "Timers" menu, the current timer can be enabled or disabled with
   the "Right" or "Left" key, respectively (enabled timers are marked with ">").
   "Ok" here opens the "Edit timer" menu.
-  
+
   Textual options, like channel names or recording file names, can be edited
   by pressing the "Right" button (which puts brackets around the current
   character as in "[R]TL"), selecting the desired character position with
@@ -46,10 +46,10 @@ Video Disk Recorder User's Manual
   brackets (as in abc[^]), the next press to the "Left" or "Ok" button will
   actually cut off the string. Using "Up" and/or "Down" brings back the
   original rest of the string (unless you have pressed "Left" or "Ok").
-  
+
   The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
   in various menus and are listed at the bottom of the on-screen-display.
-  
+
   At any point in the menu system, pressing the "Menu" key again will
   immediately leave the menu system (discarding any pending changes).
 
@@ -100,7 +100,7 @@ Video Disk Recorder User's Manual
      and browse through the list with the "Up" and "Down" key; to switch to the
      selected channel press "Ok".
   3. Directly type in the channel number with the numeric keys ('0'..'9');
-     if no key is pressed for about half a second, the digits collected so
+     if no key is pressed for about one second, the digits collected so
      far will define the channel number.
   4. From the "Now", "Next" and "Event" menus (accessible through the "Schedule"
      menu) by pressing the "Blue" button.
@@ -115,6 +115,16 @@ Video Disk Recorder User's Manual
   To bring up the channel display without switching channels you can press
   the "Ok" button.
 
+* Selecting language specific audio track
+
+  If the current channel provides different audio tracks (typically for
+  different languages), the "Green" button in the "Main" menu can be pressed
+  to toggle between these. There can be two different audio PIDs per channel,
+  assuming that typically a channel broadcasts a country specific language
+  plus the movie's original soundtrack.
+  Recordings made form such channels will contain both audio tracks, and when
+  replaying the desired audio track can be selected the same way.
+
 * Switching through channel groups
 
   If the 'channels.conf' file contains "group separators" you can switch
@@ -257,6 +267,9 @@ Video Disk Recorder User's Manual
              to free up space for a new recording. Note that setting this
              parameter to very high values for all recordings may soon fill up
              the entire disk and cause new recordings to fail due to low disk
+             space. The special value 99 means that this recording will live
+             "forever", and a value of 0 means that this recording can be
+             deleted any time if a recording with a higher priority needs disk
              space.
   File:      The name under which a recording created through this timer will
              be stored on disk (the actual name will also contain the date and
@@ -309,9 +322,14 @@ Video Disk Recorder User's Manual
                          0 = instant recordings will not be marked
                          1 = instant recordings will be marked.
 
-  LnbFrequLo = 9750      The low and high LNB frequencies (in MHz)
+  LnbSLOF    = 11700     The switching frequency (in MHz) between low and high LOF
+  LnbFrequLo = 9750      The LNB's low and high local oscillator frequencies (in MHz)
   LnbFrequHi = 10600     (these have no meaning for DVB-C receivers)
 
+  DiSEqC = 1             Generally turns DiSEqC support on or off.
+                         0 = disabled
+                         1 = enabled
+
   SetSystemTime = 0      Defines whether the system time will be set according to
                          the time received from the DVB data stream.
                          0 = system time will not be set
@@ -341,6 +359,22 @@ Video Disk Recorder User's Manual
                          never keep the user from viewing stuff on the primary
                          interface. On systems with only one DVB card, timers
                          with a priority below PrimaryLimit will never execute.
+  
+  DefaultPriority = 50   The default Priority and Lifetime values used when
+  DefaultLifetime = 50   creating a new timer event. A Lifetime value of 99
+                         means that this recording will never be deleted
+                         automatically.
+
+  VideoFormat = 0        The video format (or aspect ratio) of the tv set in use.
+                         0 = 4:3
+                         1 = 16:9
+
+  ChannelInfoPos = 0     The position of the channel info window in the OSD.
+                         0 = bottom
+                         1 = top
+
+  OSDwidth  = 52         The width and height of the OSD .
+  OSDheight = 18         The valid ranges are width=40...56, height=12...21.
 
 * Executing system commands
 
diff --git a/Makefile b/Makefile
index cec04caef..507de2146 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.21 2001/03/11 11:36:15 kls Exp $
+# $Id: Makefile 1.22 2001/06/02 09:15:39 kls Exp $
 
 DVBDIR   = ../DVB
 
-INCLUDES = -I$(DVBDIR)/driver
+INCLUDES = -I$(DVBDIR)/ost/include
 OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o osd.o\
        recording.o remote.o remux.o ringbuffer.o svdrp.o thread.o tools.o vdr.o\
        videodir.o
@@ -43,7 +43,7 @@ font: genfontfile fontfix.c fontosd.c
 # Dependencies:
 
 config.o    : config.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-dvbapi.o    : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h remux.h ringbuffer.h svdrp.h thread.h tools.h videodir.h
+dvbapi.o    : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h recording.h remux.h ringbuffer.h thread.h tools.h videodir.h
 dvbosd.o    : dvbosd.c dvbosd.h font.h tools.h
 eit.o       : eit.c config.h dvbapi.h dvbosd.h eit.h font.h thread.h tools.h videodir.h
 font.o      : font.c font.h fontfix.c fontosd.c tools.h
@@ -53,7 +53,7 @@ menu.o      : menu.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h
 osd.o       : osd.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
 recording.o : recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 remote.o    : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
-remux.o     : remux.c remux.h tools.h
+remux.o     : remux.c remux.h thread.h tools.h
 ringbuffer.o: ringbuffer.c ringbuffer.h thread.h tools.h
 svdrp.o     : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
 thread.o    : thread.c thread.h tools.h
diff --git a/Tools/schnitt/README b/Tools/schnitt/README
index 29953e0ee..8e1cacc99 100644
--- a/Tools/schnitt/README
+++ b/Tools/schnitt/README
@@ -1,4 +1,6 @@
 			Sammlung von "Hilfs"-Scripten
+                         von Matthias Schniedermeyer
+                                 ms@citd.de
 
 Diese Sammlung an "Hilfs"-Scripten habe ich mir zum scheiden und anderen
 Zwecken zusammengeschrieben.
@@ -10,10 +12,10 @@ Ich bin nicht sonderlich gut im "Dokumentieren". Also gilt die Devise
 
 Ein paar Worte zu den "Hart"-Codierten Pfaden.
 
-/yele/video	(/video/video0)
-/yelg/video	(/video/video1)
+/dvb/video
+/dvb2/video
 
-Sind die 2 Pfade auf meinem DVB-Rechner
+Sind die 2 DVB-Rechner.
 
 /x1/video
 
@@ -30,14 +32,23 @@ Enthalten sind folgende Scripte:
 cutall			-> "Master"-Script zum starten des Scheide vorgangs.
                            Ist ein "find" nach "cut" -Dateien
 cutt			-> Das "eigentliche" Schnitt-Script
-                           Scheidet die Stuecke aus, demultipext, remultipext,
-                           splitted die Dateien und macht am Ende ein 
-                           ISO-Image daraus
+			   Bei einem einzelnen Block wird diese direkt
+                           gesplitet und dann zu einem ISO-Image verarbeitet
+			   Wenn mehrere Teile (=War mit Werbung) vorhanden
+			   sind, dann werden zuerst die einzelnen Teile,
+			   legt nummerierte Verzeichniss ein und kopiert bzw
+                           splitet die einzelnen Dateien in die Verzeichniss
+                           und macht dann daraus die ISO-Images
+			   (Leider funktioniert das aus irgendwelche Gruenden
+			   (noch) nicht mit Serien die nur eine CD gross sind
+			   aber das wird noch)
 index.php		-> PHP-Script zum finden der Schnitt-Punkte, mit 
                            Testmoeglichkeit ob erfolgreich an diesem Punkt
                            geschnitten werden kann
-mv2			-> Zum Moven der Aufnahmen von meinem DVB-Rechner 
+mv2			-> Zum Moven der Aufnahmen von meinen DVB-Rechnern
                            auf mein "Arbeitsrechner"
+play			-> Zum Abspielen einer Aufnahme von meinem Recher auf 
+			   dem "Frontend" DVB-Rechner
 schnitt.pl		-> Extraiert ein einzelnes Bild um es anzuzeigen
                            (Fuer index.php)
 schnitt2.pl		-> Gibt alles zwischen 2 Schnittpunkten auf STDOUT aus
@@ -58,27 +69,43 @@ vdr2			-> Start-Script
 vmount			-> Mounten aller zusammengehoeriger ISO-Images zum 
                            abspielen
 
-Hilsscripte:
+Hilfsscripte:
 ------------
 cut.pl			-> Entspricht weitestgehend "split" aber mit 
                            "Nummer" anstatt Buchstaben
 cut2			-> Entfernt escapende Backslashes
+cut2.pl/cut3.pl		-> Fuer Aufnehmen die aus mehreren Bloecken bestehen 
+                           (=Mit Werbung)
 cutall2			-> Springt ins Schnitt-Verzeichniss und ruft das 
                            "eigentliche" Schnitt-Script auf
-lmplex			-> Multiplexed Datenstrome unter Zurhilfename
-                           saemtlicher CPUs
+cutall3.pl		-> Wenn in einem Verzeichniss mehrere Aufnahmen sind
+                           splitet dies Programm diese und ruft fuer jede
+                           Aufnahme das "cutt"-Script auf
 schnittcommon.pli	-> Das "Common" Script fuer schnitt?.pl
 getpreviframe.pl	-> Findet das vorherige I-Frame.
 unsort			-> Macht das Gegenteil von sort.
 
+dump.c			-> Muss in der "libmpeg3"-Verzeichniss des 
+			   "mpeg2-movie"-Packets kopiert werden und dann mit 
+			   "make" compilieren
+			   Dieses C-Programm ist dafuer da um fuer das
+			   PHP-Script das Bild anzuzeigen wo man gerade ist.
+			   Da mir der "urspruengliche" Source-Code dafuer
+			   abhanden gekommen ist und ich den Patch neumachen
+			   musste (Wie immer mit "Verbesserungen") ist index.php
+			   nocht nicht auf die neue Version angepasst. Die
+			   Anpassung besteht aber nur darin eine "1" an die
+			   Kommandozeile anzuhaengen.
 
-Die ganze "Schnittloesung" ist leider etwas "unbrauchbar", weil ich aus
-Unachtsamkeit leider die gepatchten Sourcen von 2 wichtigen Programm
-geloescht habe. 
 
-dumpfrage		-> Extraiert das erste Frage in eine Datei zum
-			   anzeigen (gepatchtes dump aus "libmpeg3"
-pvademux		-> gepatcht um eine Pfad-Angabe
+Im Gegensatz zur "alten"-Version ist diese Version "vollstaendig"
+einsatzfaehig!
 
-Entweder macht jemand/ich patchen "nochmal" oder ich kann auch die
-Binaries zur Verfuegung stellen.
+
+Wenn jemand Fragen zum Einsatz hat dann "loechern Sie mich"
+
+ms@citd.de
+
+
+Ich kann auch gerne die Einrichtung per "Fernwartung" (=ssh) uebernehmen.
+(Wenn noetig compiliere ich auch auch apache mit PHP usw.)
diff --git a/Tools/schnitt/cut.pl b/Tools/schnitt/cut.pl
index dd62c18ff..e05507692 100755
--- a/Tools/schnitt/cut.pl
+++ b/Tools/schnitt/cut.pl
@@ -1,30 +1,25 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
-use strict;
+chdir ($ARGV[0]) if ($ARGV[0]);
 
-my $maxsize = 660 * 1024 * 1024;
+$read = $size = 1024*1024;
 
-my $read = 1024*1024;
-my $size = 1024*1024;
-
-my $filenum = "1";
-my $count = 0;
-
-my ($fi,$data);
+$filenum = "1";
+$count = 0;
 
 $fi = sprintf ("part%d",$filenum);
 open (FI,">$fi");
 
 while ($read == $size)
   {
-    if ($count < $maxsize)
+    if ($count < 660*1024*1024)
       {
 	$read = read (STDIN,$data,$size);
 	print FI $data;
 	$count += $size;
 	$a = $count /1024/1024;
 	if ($a % 10 == 0) {
-          print STDERR "File: $filenum Size: ${a}MB\n";
+          print stderr "File: $filenum Size: ${a}MB\n";
         }
       }
     else
diff --git a/Tools/schnitt/cut2 b/Tools/schnitt/cut2
index 0193ac0c2..09e9acbcc 100755
--- a/Tools/schnitt/cut2
+++ b/Tools/schnitt/cut2
@@ -1,2 +1,2 @@
 #!/bin/sh
-cat cut | head -n 1 | tr -d [\\\\]
+cat cut2 | head -n 1 | tr -d [\\\\]
diff --git a/Tools/schnitt/cutall b/Tools/schnitt/cutall
index 355935fd3..a6803e2b7 100755
--- a/Tools/schnitt/cutall
+++ b/Tools/schnitt/cutall
@@ -1,4 +1,2 @@
 #!/bin/sh
-cutdir=/x1/video/
-
-find $cutdir -name "cut" -exec cutall2 {} \;
+find /x1/video/ -name "cut" -exec cutall2 {} \;
diff --git a/Tools/schnitt/cutall2 b/Tools/schnitt/cutall2
index 90b0f46ba..962d57722 100755
--- a/Tools/schnitt/cutall2
+++ b/Tools/schnitt/cutall2
@@ -1,5 +1,5 @@
 #!/bin/sh
 a=`echo $1 | cut -d / -f1-5`
 cd $a
-cutt
+cutall3.pl
 mv cut cut.bak
diff --git a/Tools/schnitt/cutt b/Tools/schnitt/cutt
index 4e89b7a3d..1942437a0 100755
--- a/Tools/schnitt/cutt
+++ b/Tools/schnitt/cutt
@@ -3,10 +3,13 @@
 DIRA=/x2/temp
 DIRB=/x1/temp
 
-if [ -f cut ]; then
+if [ ! -f cut2 ]; then
+  echo Keine Beschreibungsdatei
+  exit 1
+else
   name="`cut2`"
   echo $name
-  count=`cat cut | wc -l`
+  count=`cat cut2 | wc -l`
   let count=count-1
   let test=count%2
   if [ "$test" == "1" ]; then
@@ -16,70 +19,88 @@ if [ -f cut ]; then
 
   file=1
 
-  while [ "$count" != "0" ]
-  do
-    start=`cat cut | tail -n $count | head -n 1`
+  if [ "$count" == "2" ]; then
+    start=`cat cut2 | tail -n $count | head -n 1`
     let count=count-1
-    end=`cat cut | tail -n $count | head -n 1`
-    let count=count-1
-    echo Cutting\&Demuxing from $start to $end
-    schnitt2.pl $start $end | pvademux $DIRA teil$file
-#    schnitt2.pl $start $end | pes2av_pes | pvademux $DIRA teil$file
-    let file=file+1
-  done
-else
-  echo Keine Beschreibungsdatei
-  exit 1
+    end=`cat cut2 | tail -n $count | head -n 1`
+    schnitt2.pl $start $end | avpes2mpeg | cut.pl $DIRA
+    secondway=2
+  else
+    while [ "$count" != "0" ]
+    do
+      start=`cat cut2 | tail -n $count | head -n 1`
+      let count=count-1
+      end=`cat cut2 | tail -n $count | head -n 1`
+      let count=count-1
+      echo Cutting \& Converting from $start to $end
+      schnitt2.pl $start $end | avpes2mpeg > $DIRA/teil$file.mpg
+#      schnitt2.pl $start $end | pvademux $DIRA teil$file
+      let file=file+1
+    done
+  fi
 fi
 
 # Ab hier mkimg
 
-sync
-
-lmplex $DIRA $DIRB `ls -la $DIRA/teil*.m2v | cut -b 30- | sort -n -r | cut -d / -f4`
-
-echo Multiplexing DONE
-
-rm -f $DIRA/teil*.m2v $DIRA/teil*.mp2
+rm cut2
 
 sync
 
-if [ -f $DIRB/teil1.mpg ]; then
-  echo Splitting
+if [ "$secondway" != "2" ]; then
   cd $DIRA
-#  cat $DIRB/teil*.mpg | split -b 723517440
-  cat $DIRB/teil*.mpg | cut.pl
-  rm $DIRB/teil*
-fi
-
-sync
-
-cd $DIRA
+  cut2.pl "$name"
+  if [ -d 2 ]; then
+    count=1
+    cond=0
+
+    while [ "$cond" != "1" ]
+    do
+      echo mkisofs Teil $count
+      mkisofs -r -o $DIRB/image1.raw $count
+      rm -rf $count
+      mv -- $DIRB/image1.raw "$DIRB/${name} CD $count"
+      sync
+      let count=count+1
+      if [ ! -d $count ]; then
+        cond=1
+      fi
+    done
+  else
+    echo mkisofs
+    mkisofs -r -o $DIRB/image1.raw $count
+    rm -rf $count
+    mv -- $DIRB/image1.raw "$DIRB/${name}"
+  fi
+else
 
-if [ -f part2 ]; then
-  count=1
-  cond=0
+  cd $DIRA
 
-  while [ "$cond" != "1" ]
-  do
+  if [ -f part2 ]; then
+    count=1
+    cond=0
+
+    while [ "$cond" != "1" ]
+    do
+      mkdir a
+      mv "part$count" "a/${name} CD $count.mpg"
+      echo mkisofs Teil $count
+      mkisofs -r -o $DIRB/image1.raw a
+      rm -rf a
+      mv -- $DIRB/image1.raw "$DIRB/${name} CD $count"
+      sync
+
+      let count=count+1
+      if [ ! -f "part$count" ]; then
+        cond=1
+      fi
+    done
+  else
     mkdir a
-    mv "part$count" "a/${name} Teil $count"
-    echo mkisofs Teil $count
+    mv part1 "a/${name}.mpg"
+    echo mkisofs
     mkisofs -r -o $DIRB/image1.raw a
     rm -rf a
-    mv -- $DIRB/image1.raw "$DIRB/${name} Teil $count"
-    sync
-
-    let count=count+1
-    if [ ! -f "part$count" ]; then
-      cond=1
-    fi
-  done
-else
-  mkdir a
-  mv part1 "a/${name}"
-  echo mkisofs
-  mkisofs -r -o $DIRB/image1.raw a
-  rm -rf a
-  mv -- $DIRB/image1.raw "$DIRB/${name}"
+    mv -- $DIRB/image1.raw "$DIRB/${name}"
+  fi
 fi
+
diff --git a/Tools/schnitt/getpreviframe.pl b/Tools/schnitt/getpreviframe.pl
index 6774f3192..4829304c3 100755
--- a/Tools/schnitt/getpreviframe.pl
+++ b/Tools/schnitt/getpreviframe.pl
@@ -1,18 +1,12 @@
 #!/usr/bin/perl
 
-use strict;
-
-my ($index, $oindex);
-
 require "/usr/local/bin/my/schnittcommon.pli";
 
 if (!open (INDEX,"index.vdr"))
   {
     exit 1;
   }
-
 $index = $oindex = $ARGV[0];
-
 if ($index > 0)
 {
   &prevI;
diff --git a/Tools/schnitt/mv2 b/Tools/schnitt/mv2
index a0cefba7f..c27a9ffe6 100755
--- a/Tools/schnitt/mv2
+++ b/Tools/schnitt/mv2
@@ -1,23 +1,30 @@
 #!/bin/sh
+#
+# Move files from DVB-Computer(s) to localmachine into $LOCALDIR
+#
 
-DIR = /x1/video
+LOCALDIR=/x1/video
 
 if [ ! "$UID" = 0 ]; then
   if [ -d "$1" ]; then
-    cd $DIR
-    a=`echo "$1" | cut -d / -f4-`
-    mkdir -p "$a"
-    cd "$a"
-    (echo cd "$1"; echo mget \*)| ftp -i dvb
-    cd $DIR
-    ls -Ls $1 > /tmp/yele
-    ls -Ls $a > /tmp/x1
-    a=`echo "$1" | cut -d \/ -f3-`
-    diff -u /tmp/yele /tmp/x1 &> /dev/null && rm -rfv /yel?/$a
-    rm /tmp/yele
-    rm /tmp/x1
-    rmdir /yel?/video/*
+    if [ -f "$1/index.vdr" ]; then
+      cd $LOCALDIR
+      recdir=`echo "$1" | cut -d / -f4-`
+      mkdir -p "$recdir"
+      cd "$recdir"
+      dvbcomp=`echo "$1" | cut -d / -f2`
+      (echo cd "/video/video0/$recdir"; echo mget \*)| ftp -i $dvbcomp
+      cd $LOCALDIR
+      ssh $dvbcomp ls -Ls /video/video0/$recdir > /tmp/dvb
+      ls -Ls $recdir > /tmp/local
+      diff -u /tmp/dvb /tmp/local &> /dev/null && rm -rfv /$dvbcomp/video?/$recdir
+      rm /tmp/dvb
+      rm /tmp/local
+      rmdir --ignore-fail-on-non-empty `find /$dvbcomp/video?/ -type d -mindepth 1 | cut -d \/ -f-4 | grep -v temp | sort | uniq`
+    fi
   fi
 else
   echo Not as root
 fi
+
+/usr/local/bin/my/process_summary.pl
diff --git a/Tools/schnitt/schnitt.pl b/Tools/schnitt/schnitt.pl
index d5521ebbf..ac72a144f 100755
--- a/Tools/schnitt/schnitt.pl
+++ b/Tools/schnitt/schnitt.pl
@@ -21,6 +21,7 @@
 close (FI);
 close (FO);
 
-`/usr/local/bin/pvademux.old /x2/temp bild`;
+`cat bild | /usr/local/bin/avpes2mpeg > avpes`;
+`/usr/local/bin/my/dumpframe avpes 1`;
 #`/usr/local/bin/pes2av_pes bild | /usr/local/bin/pvademux /x2/temp bild`;
 print "$index\n";
diff --git a/Tools/schnitt/schnitt2.pl b/Tools/schnitt/schnitt2.pl
index e52b24595..d81b5fd59 100755
--- a/Tools/schnitt/schnitt2.pl
+++ b/Tools/schnitt/schnitt2.pl
@@ -10,10 +10,12 @@
 
 $index = $ARGV[0];
 &nextI;
+#&readnext;
 $file1 = $file;
 $offset1 = $offset;
 $index = $ARGV[1];
 &nextI;
+#&readnext;
 $file2 = $file;
 $offset2 = $offset;
 
diff --git a/Tools/schnitt/show b/Tools/schnitt/show
index afed79b3c..bfcc58a8f 100755
--- a/Tools/schnitt/show
+++ b/Tools/schnitt/show
@@ -5,7 +5,7 @@ do
   if [ -f newpic ]; then
     killall xli
     rm -f newpic
-    xli output.ppm &
+    xli output000.ppm &
   fi
 sleep 24h
 done
diff --git a/Tools/schnitt/vmount b/Tools/schnitt/vmount
index 6b7906473..ab16e4579 100755
--- a/Tools/schnitt/vmount
+++ b/Tools/schnitt/vmount
@@ -4,7 +4,7 @@ cond=0
 
 if [ -f "$1" ]; then
   mount "$1" /mnt/1 -o loop
-  $cond = 1
+  cond=1
 else
   while [ "$cond" != "1" ]
   do
diff --git a/channels.conf b/channels.conf
index 36b5b2843..8fc1a980c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,6 +1,6 @@
 RTL:12188:h:0:27500:163:104:105:0:12003
 Sat.1:12480:v:0:27500:1791:1792:34:0:46
-Pro-7:12480:v:0:27500:255:256:32:0:898
+Pro-7:12480:v:0:27500:255:256;257:32:0:898
 RTL2:12188:h:0:27500:166:128:68:0:12020
 ARD:11837:h:0:27500:101:102:0:0:28106
 BR3:11837:h:0:27500:201:202:0:0:28107
@@ -16,7 +16,7 @@ ZDF:11954:h:0:27500:110:120:130:0:28006
 KiKa:11954:h:0:27500:310:320:0:0:28008
 arte:11836:h:0:27500:401:402:0:0:28109
 ORF1:12692:h:0:22000:160:161:165:3:13001
-ORF2:12692:h:0:22000:500:501:505:3:13007
+ORF2:12692:h:0:22000:500:501:505:3:13002
 ORF Sat:11954:h:0:27500:506:507:0:0:28010
 ZDF.info:11954:h:0:27500:610:620:0:0:28011
 CNN:12168:v:0:27500:165:100:0:0:28512
@@ -46,62 +46,81 @@ MDR:12110:h:0:27500:401:402:0:0:28204
 NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
 ORB:12110:h:0:27500:501:502:0:0:28205
 B1:12110:h:0:27500:601:602:0:0:28206
-ARD Online-Kanal:12722:h:0:22000:8191:701:0:0:0
+ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
-Premiere World Promo:11798:h:0:27500:255:256:0:0:8
-Premiere:11798:h:0:27500:511:512:0:3:10
-Star Kino:11798:h:0:27500:767:768:0:3:9
-Cine Action:11798:h:0:27500:1023:1024:0:3:20
-Cine Comedy:11798:h:0:27500:1279:1280:0:3:29
-Sci Fantasy:11798:h:0:27500:1535:1536:0:3:41
-Romantic Movies:11797:h:0:27500:1791:1792:0:3:11
-Studio Universal:12090:v:0:27500:255:256:0:3:36
-13th Street:11797:h:0:27500:2303:2304:0:3:43
+Premiere World:11797:h:0:27500:255:256:32:0:8
+Premiere 1:11797:h:0:27500:511:512:0:3:10
+Premiere 2:11797:h:0:27500:1791:1792:0:3:11
+Premiere 3:11797:h:0:27500:2303:2304:0:3:43
+Premiere Star:11797:h:0:27500:767:768:0:3:9
+Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:3:41
+Premiere Action:11797:h:0:27500:1023:1024:0:3:20
+Premiere Comedy:11797:h:0:27500:1279:1280:0:3:29
+13th Street:12031:h:0:27500:2303:2304:0:3:42
+Studio Universal:12090:V:0:27500:255:256:0:3:36
+Filmpalast:12031:h:0:27500:2559:2560:0:3:516
+Heimatkanal:12031:h:0:27500:2815:2816:0:3:517
+Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
+Planet:12090:V:0:27500:1279:1280:0:3:13
+Fox Kids:12031:h:0:27500:1279:1280:0:3:28
 Junior:12031:h:0:27500:255:256:0:3:19
-K-Toon:12032:h:0:27500:511:512:0:3:12
-Disney Channel:12090:v:0:27500:767:768:0:3:34
-Fox Kids:11797:h:0:27500:2559:2560:0:3:22
+K-Toon:12031:h:0:27500:511:512:0:3:12
+Disney Channel:12090:V:0:27500:767:768:0:3:34
 Sunset:12031:h:0:27500:1023:1024:0:3:16
-Comedy:12031:h:0:27500:1279:1280:0:3:28
-Planet:12090:v:0:27500:1279:1280:0:3:13
-Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
 Krimi&Co:12031:h:0:27500:1535:1536:0:3:23
-Filmpalast:11758:h:0:27500:2559:2560:0:3:516
-Heimatkanal:11758:h:0:27500:2815:2816:0:3:517
-Goldstar:11758:h:0:27500:3839:3840:0:3:518
+Goldstar TV:12031:h:0:27500:3839:3840:0:3:518
 Classica:12031:h:0:27500:767:768:0:3:15
-Seasons:12090:v:0:27500:511:512:0:3:33
-Sport 1:11720:h:0:27500:255:256:0:3:17
-Sport 2:12070:h:0:27500:2047:2048:0:3:27
-Sport 3:12070:h:0:27500:2303:2304:0:3:18
-Sport 4:12070:h:0:27500:2559:2560:0:3:24
-Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:0:3:242
-Feed (F1 Data):11720:h:0:27500:3071:3072:0:3:244
-Feed (F1 Multi):11720:h:0:27500:2815:2816:0:3:243
-Feed (F1 On Board):11720:h:0:27500:2303:2304:0:3:241
-Feed (F1 Verfolger):11720:h:0:27500:2047:2048:0:3:240
-Cinedom Deluxe:12070:h:0:27500:1279:1280:0:3:188
-Cinedom 1A de:11758:h:0:27500:511:512:0:3:178
-Cinedom 1A en:11758:h:0:27500:511:513:0:3:178
-Cinedom 1B:12070:h:0:27500:767:768:0:3:185
-Cinedom 1C:12070:h:0:27500:1791:1792:0:3:191
-Cinedom 1E??:11720:h:0:27500:1535:1537:0:3:176
-Cinedom 2A:12070:h:0:27500:1535:1536:0:3:189
-Cinedom 2B:11758:h:0:27500:767:768:0:3:179
-Cinedom 2C:11758:h:0:27500:1023:1024:0:3:193
-Cinedom 2D??:12070:h:0:27500:511:512:0:3:184
-Cinedom 3A:11758:h:0:27500:255:256:0:3:177
-Cinedom 3B:11758:h:0:27500:1279:1280:0:3:194
-Cinedom 3C??:12090:v:0:27500:1279:1280:17689:3:192
-Cinedom 4A:11758:h:0:27500:1535:1536:0:3:195
-Cinedom 4B:12070:h:0:27500:1023:1025:0:3:186
-Cinedom 4C??:11720:h:0:27500:767:768:0:3:181
-Cinedom 5A:12032:h:0:27500:2559:2560:0:3:187
-Beate Uhse_TV:11797:h:0:27500:2047:2048:0:3:21
-Blue Channel:11758:h:0:27500:2559:2560:0:3:516
+Seasons:12090:V:0:27500:511:512:0:3:33
+:Cinedom
+Cinedom Deluxe:11758:h:0:27500:255:256,257;259:0:3:189
+Cinedom 1A:11758:h:0:27500:511:512,513:0:3:190
+Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:3:178
+Cinedom 1C:11720:h:0:27500:511:512,513:0:3:180
+Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:3:176
+Cinedom 2A:11758:h:0:27500:1023:1024:0:3:193
+Cinedom 2B:11720:h:0:27500:1279:1280:0:3:183
+Cinedom 2C:12070:h:0:27500:1791:1792:0:3:179
+Cinedom 2D:12070:h:0:27500:511:512:0:3:184
+Cinedom 2E:12070:h:0:27500:1279:1280:0:3:188
+Cinedom 3A:11758:h:0:27500:2559:2560:0:3:192
+Cinedom 3B:11758:h:0:27500:1535:1536:0:3:195
+Cinedom 3C:12070:h:0:27500:767:768:0:3:185
+Cinedom 3D:11720:h:0:27500:1023:1024:0:3:182
+Cinedom 4A:11758:h:0:27500:767:768:0:3:191
+Cinedom 4B:11720:h:0:27500:767:768:0:3:181
+Cinedom 4C:12070:h:0:27500:2047:2048:0:3:187
+Cinedom 5A:11758:h:0:27500:1279:1280:0:3:194
+Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
+Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
+:Beta Digital
+CNBC:12148:h:0:27500:255:256:0:3:35
+Liberty TV.com:12610:V:0:22000:941:943:0:0:12199
+:PW Erotic
+Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:3:21
 Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
 Blue Movie 2:11758:h:0:27500:2047:2048:0:3:514
 Blue Movie 3:11758:h:0:27500:2303:2304:0:3:515
+:Sportsworld
+Premiere Sport 1:11719:h:0:27500:255:256:0:3:17
+Premiere Sport 2:11719:h:0:27500:3327:3328:0:3:27
+Premiere Sport 3:11758:h:0:27500:2815:2816:0:3:18
+:Formel 1
+Infokanal:11720:h:0:27500:3071:3072:0:3:244
+Multikanal:11720:h:0:27500:2815:2816:0:3:243
+Supersignal:11720:h:0:27500:255:256:0:3:17
+Verfolgerfeld:11720:h:0:27500:2303:2304:0:3:241
+Cockpitkanal:11720:h:0:27500:2559:2560:0:3:242
+Boxengasse:11720:h:0:27500:2047:2048:0:3:240
+:Premiere World Bundesliga
+Superdom:12070:h:0:27500:255:256:0:3:26
+Spiel 1:11719:h:0:27500:255:256,257:0:3:17
+Spiel 2:11719:h:0:27500:2047:2048,2049:0:3:240
+BuLi-Konferenz:12070:h:0:27500:3071:3072,3073:0:3:208
+BuLi-Spiel 1:12070:h:0:27500:3327:3328,3329:0:3:209
+BuLi-Spiel 2:12070:h:0:27500:2303:2304,2305:0:3:210
+BuLi-Spiel 3:12070:h:0:27500:3583:3584,3585:0:3:211
+BuLi-Spiel 4:12070:h:0:27500:2559:2560,2561:0:3:212
+BuLi-Spiel 5:12070:h:0:27500:2815:2816,2817:0:3:213
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
@@ -164,7 +183,7 @@ Astra Vision 1:12552:v:0:22000:168:149:0:0:0
 Astra Vision 1:12552:v:0:22000:168:150:0:0:0
 RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0:0
 Astra Mosaic:12552:v:0:22000:175:176:0:0:0
-MHP test:12604:h:0:22000:5632:8191:0:0:0
+MHP test:12604:h:0:22000:5632:0:0:0:0
 VERONICA:12574:h:0:22000:161:84:0:0:5010
 VH1 Classic:12699:v:0:22000:3071:3072:0:0:28647
 VH-1 Germany:12699:v:0:22000:3081:3082:0:0:28648
@@ -173,3 +192,4 @@ Video Italia:12610:v:0:22000:121:122:0:0:12220
 AC 3 promo:12670:v:0:22000:308:256:0:0:0
 ORF/ZDF:12699:h:0:22000:506:507:0:0:13012
 VIVA:12670:v:0:22000:309:310:0:0:12732
+MTV Central Europe:12699:v:0:22000:3031:3032:0:0:28643
diff --git a/config.c b/config.c
index acf1996ae..8e0cce300 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.44 2001/04/01 14:32:22 kls Exp $
+ * $Id: config.c 1.52 2001/07/27 13:45:28 kls Exp $
  */
 
 #include "config.h"
@@ -155,7 +155,7 @@ eKeys cKeys::Get(unsigned int Code)
 }
 
 eKeys cKeys::Translate(const char *Command)
-{  
+{
   if (Command) {
      const tKey *k = keys;
      while ((k->type != kNone) && strcasecmp(k->name, Command) != 0)
@@ -166,7 +166,7 @@ eKeys cKeys::Translate(const char *Command)
 }
 
 unsigned int cKeys::Encode(const char *Command)
-{  
+{
   eKeys k = Translate(Command);
   if (k != kNone)
      return keys[k].code;
@@ -200,7 +200,10 @@ cChannel::cChannel(const cChannel *Channel)
   diseqc       = Channel ? Channel->diseqc       : 0;
   srate        = Channel ? Channel->srate        : 27500;
   vpid         = Channel ? Channel->vpid         : 255;
-  apid         = Channel ? Channel->apid         : 256;
+  apid1        = Channel ? Channel->apid1        : 256;
+  apid2        = Channel ? Channel->apid2        : 0;
+  dpid1        = Channel ? Channel->dpid1        : 257;
+  dpid2        = Channel ? Channel->dpid2        : 0;
   tpid         = Channel ? Channel->tpid         : 32;
   ca           = Channel ? Channel->ca           : 0;
   pnr          = Channel ? Channel->pnr          : 0;
@@ -218,8 +221,19 @@ const char *cChannel::ToText(cChannel *Channel)
   delete buffer;
   if (Channel->groupSep)
      asprintf(&buffer, ":%s\n", s);
-  else
-     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->tpid, Channel->ca, Channel->pnr);
+  else {
+     char apidbuf[32];
+     char *q = apidbuf;
+     q += snprintf(q, sizeof(apidbuf), "%d", Channel->apid1);
+     if (Channel->apid2)
+        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->apid2);
+     if (Channel->dpid1 || Channel->dpid2)
+        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ";%d", Channel->dpid1);
+     if (Channel->dpid2)
+        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
+     *q = 0;
+     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%s:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->pnr);
+     }
   return buffer;
 }
 
@@ -242,8 +256,21 @@ bool cChannel::Parse(const char *s)
      }
   else {
      groupSep = false;
-     //XXX
-     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &tpid, &ca, &pnr);
+     char *apidbuf = NULL;
+     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%a[^:]:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apidbuf, &tpid, &ca, &pnr);
+     apid1 = apid2 = 0;
+     dpid1 = dpid2 = 0;
+     if (apidbuf) {
+        char *p = strchr(apidbuf, ';');
+        if (p)
+           *p++ = 0;
+        sscanf(apidbuf, "%d,%d", &apid1, &apid2);
+        if (p)
+           sscanf(p, "%d,%d", &dpid1, &dpid2);
+        delete apidbuf;
+        }
+     else
+        return false;
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
@@ -275,7 +302,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
         isyslog(LOG_INFO, "switching to channel %d", number);
         }
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid, tpid, ca, pnr))
+         if (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr))
             return true;
          esyslog(LOG_ERR, "retrying");
          }
@@ -305,8 +332,8 @@ cTimer::cTimer(bool Instant)
   if (stop >= 2400)
      stop -= 2400;
 //TODO VPS???
-  priority = DEFAULTPRIORITY;
-  lifetime = DEFAULTLIFETIME;
+  priority = Setup.DefaultPriority;
+  lifetime = Setup.DefaultLifetime;
   *file = 0;
   summary = NULL;
   if (Instant && ch)
@@ -330,8 +357,8 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   stop = time->tm_hour * 100 + time->tm_min;
   if (stop >= 2400)
      stop -= 2400;
-  priority = DEFAULTPRIORITY;
-  lifetime = DEFAULTLIFETIME;
+  priority = Setup.DefaultPriority;
+  lifetime = Setup.DefaultLifetime;
   *file = 0;
   const char *Title = EventInfo->GetTitle();
   if (!isempty(Title))
@@ -524,14 +551,14 @@ bool cTimer::Matches(time_t t)
 }
 
 time_t cTimer::StartTime(void)
-{ 
+{
   if (!startTime)
      Matches();
   return startTime;
 }
 
 time_t cTimer::StopTime(void)
-{ 
+{
   if (!stopTime)
      Matches();
   return stopTime;
@@ -734,14 +761,22 @@ cSetup::cSetup(void)
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
   MarkInstantRecord = 1;
+  LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
+  DiSEqC = 1;
   SetSystemTime = 0;
   MarginStart = 2;
   MarginStop = 10;
   EPGScanTimeout = 5;
   SVDRPTimeout = 300;
   PrimaryLimit = 0;
+  DefaultPriority = 50;
+  DefaultLifetime = 50;
+  VideoFormat = VIDEO_FORMAT_4_3;
+  ChannelInfoPos = 0;
+  OSDwidth = 52;
+  OSDheight = 18;
   CurrentChannel = -1;
 }
 
@@ -756,14 +791,22 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
      else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
      else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
+     else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
      else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
      else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
+     else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
      else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
      else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
      else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
      else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
      else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
      else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
+     else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
+     else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+     else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
+     else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
+     else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
+     else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
      else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
      else
         return false;
@@ -813,14 +856,22 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
         fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
         fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
+        fprintf(f, "LnbSLOF            = %d\n", LnbSLOF);
         fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
+        fprintf(f, "DiSEqC             = %d\n", DiSEqC);
         fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
         fprintf(f, "MarginStart        = %d\n", MarginStart);
         fprintf(f, "MarginStop         = %d\n", MarginStop);
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
         fprintf(f, "SVDRPTimeout       = %d\n", SVDRPTimeout);
         fprintf(f, "PrimaryLimit       = %d\n", PrimaryLimit);
+        fprintf(f, "DefaultPriority    = %d\n", DefaultPriority);
+        fprintf(f, "DefaultLifetime    = %d\n", DefaultLifetime);
+        fprintf(f, "VideoFormat        = %d\n", VideoFormat);
+        fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
+        fprintf(f, "OSDwidth           = %d\n", OSDwidth);
+        fprintf(f, "OSDheight          = %d\n", OSDheight);
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
         f.Close();
         isyslog(LOG_INFO, "saved setup to %s", FileName);
diff --git a/config.h b/config.h
index 6c21fb2f6..58d038241 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.44 2001/04/01 14:44:40 kls Exp $
+ * $Id: config.h 1.55 2001/07/27 13:32:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,10 +19,18 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.72"
+#define VDRVERSION "0.85"
 
 #define MaxBuffer 10000
 
+#define MAXPRIORITY 99
+#define MAXLIFETIME 99
+
+#define MINOSDWIDTH  40
+#define MAXOSDWIDTH  56
+#define MINOSDHEIGHT 12
+#define MAXOSDHEIGHT 21
+
 enum eKeys { // "Up" and "Down" must be the first two keys!
              kUp,
              kDown,
@@ -92,7 +100,8 @@ class cChannel : public cListObject {
   int diseqc;
   int srate;
   int vpid;
-  int apid;
+  int apid1, apid2;
+  int dpid1, dpid2;
   int tpid;
   int ca;
   int pnr;
@@ -106,9 +115,6 @@ class cChannel : public cListObject {
   bool Switch(cDvbApi *DvbApi = NULL, bool Log = true);
   };
 
-#define DEFAULTPRIORITY 99
-#define DEFAULTLIFETIME 99
-
 class cTimer : public cListObject {
 private:
   time_t startTime, stopTime;
@@ -240,7 +246,7 @@ class cChannels : public cConfig<cChannel> {
   bool SwitchTo(int Number, cDvbApi *DvbApi = NULL);
   int MaxNumber(void) { return maxNumber; }
   };
- 
+
 class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
@@ -266,13 +272,19 @@ class cSetup {
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
   int MarkInstantRecord;
+  int LnbSLOF;
   int LnbFrequLo;
   int LnbFrequHi;
+  int DiSEqC;
   int SetSystemTime;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
   int SVDRPTimeout;
   int PrimaryLimit;
+  int DefaultPriority, DefaultLifetime;
+  int VideoFormat;
+  int ChannelInfoPos;
+  int OSDwidth, OSDheight;
   int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);
diff --git a/dvbapi.c b/dvbapi.c
index a929b5039..07b6f61bc 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,13 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.66 2001/03/31 15:01:57 kls Exp $
+ * $Id: dvbapi.c 1.96 2001/07/29 10:32:50 kls Exp $
  */
 
 #include "dvbapi.h"
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 extern "C" {
+#define HAVE_BOOLEAN
 #include <jpeglib.h>
 }
 #include <stdlib.h>
@@ -20,20 +22,29 @@ extern "C" {
 #include <sys/time.h>
 #include <unistd.h>
 #include "config.h"
-#include "interface.h"
 #include "recording.h"
 #include "remux.h"
 #include "ringbuffer.h"
 #include "tools.h"
 #include "videodir.h"
 
-#define VIDEODEVICE "/dev/video"
-#define VBIDEVICE   "/dev/vbi"
+#define DEV_VIDEO      "/dev/video"
+#define DEV_OST_OSD    "/dev/ost/osd"
+#define DEV_OST_QAMFE  "/dev/ost/qamfe"
+#define DEV_OST_QPSKFE "/dev/ost/qpskfe"
+#define DEV_OST_SEC    "/dev/ost/sec"
+#define DEV_OST_DVR    "/dev/ost/dvr"
+#define DEV_OST_DEMUX  "/dev/ost/demux"
+#define DEV_OST_VIDEO  "/dev/ost/video"
+#define DEV_OST_AUDIO  "/dev/ost/audio"
 
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
 #define VIDEOBUFSIZE (1024*1024)
 
+// The maximum size of a single frame:
+#define MAXFRAMESIZE (192*1024)
+
 #define FRAMESPERSEC 25
 
 // The maximum file size is limited by the range that can be covered
@@ -55,16 +66,13 @@ extern "C" {
 // The number of frames to back up when resuming an interrupted replay session:
 #define RESUMEBACKUP (10 * FRAMESPERSEC)
 
-typedef unsigned char uchar;
+// The maximum time we wait before assuming that a recorded video data stream
+// is broken:
+#define MAXBROKENTIMEOUT 30 // seconds
 
-static void SetPlayMode(int VideoDev, int Mode)
-{
-  if (VideoDev >= 0) {
-     struct video_play_mode pmode;
-     pmode.mode = Mode;
-     ioctl(VideoDev, VIDIOCSPLAYMODE, &pmode);
-     }
-}
+#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
+
+typedef unsigned char uchar;
 
 const char *IndexToHMSF(int Index, bool WithFrame)
 {
@@ -100,6 +108,7 @@ class cIndexFile {
 public:
   cIndexFile(const char *FileName, bool Record);
   ~cIndexFile();
+  bool Ok(void) { return index != NULL; }
   void Write(uchar PictureType, uchar FileNumber, int FileOffset);
   bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
   int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL);
@@ -158,8 +167,10 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
            else
               LOG_ERROR;
            }
+        else if (!Record)
+           isyslog(LOG_INFO, "missing index file %s", fileName);
         if (Record) {
-           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP)) >= 0) {
+           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
               if (delta) {
                  esyslog(LOG_ERR, "ERROR: padding index file with %d '0' bytes", delta);
                  while (delta--)
@@ -315,236 +326,6 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
   return -1;
 }
 
-// --- cRingBuffer_ -----------------------------------------------------------
-
-/* cRingBuffer reads data from an input file, stores it in a buffer and writes
-   it to an output file upon request. The Read() and Write() functions should
-   be called only when the associated file is ready to provide or receive data
-   (use the 'select()' function to determine that), and the files should be
-   opened in non-blocking mode.
-   The '...Limit' parameters define safety limits. If they are exceeded a log entry
-   will be made.
-*/
-
-class cRingBuffer_ {
-private:
-  uchar *buffer;
-  int size, head, tail, freeLimit, availLimit;
-  int countLimit, countOverflow;
-  int minFree;
-  bool eof;
-  int *inFile, *outFile;
-protected:
-  int Free(void) { return ((tail >= head) ? size + head - tail : head - tail) - 1; }
-public:
-  int Available(void) { return (tail >= head) ? tail - head : size - head + tail; }
-protected:
-  int Readable(void) { return (tail >= head) ? size - tail - (head ? 0 : 1) : head - tail - 1; } // keep a 1 byte gap!
-  int Writeable(void) { return (tail >= head) ? tail - head : size - head; }
-  int Byte(int Offset);
-  bool Set(int Offset, int Length, int Value);
-protected:
-  int GetStartCode(int Offset) { return (Byte(Offset) == 0x00 && Byte(Offset + 1) == 0x00 && Byte(Offset + 2) == 0x01) ? Byte(Offset + 3) : -1; }
-  int GetPictureType(int Offset) { return (Byte(Offset + 5) >> 3) & 0x07; }
-  int FindStartCode(uchar Code, int Offset = 0);
-  int GetPacketLength(int Offset = 0);
-public:
-  cRingBuffer_(int *InFile, int *OutFile, int Size, int FreeLimit = 0, int AvailLimit = 0);
-  virtual ~cRingBuffer_();
-  virtual int Read(int Max = -1);
-  virtual int Write(int Max = -1);
-  bool EndOfFile(void) { return eof; }
-  bool Empty(void) { return Available() == 0; }
-  void Clear(void) { head = tail = 0; }
-  void Skip(int n);
-  };
-
-cRingBuffer_::cRingBuffer_(int *InFile, int *OutFile, int Size, int FreeLimit, int AvailLimit)
-{
-  inFile = InFile;
-  outFile = OutFile;
-  size = Size;
-  Clear();
-  freeLimit = FreeLimit;
-  availLimit = AvailLimit;
-  eof = false;
-  countLimit = countOverflow = 0;
-  minFree = size - 1;
-  buffer = new uchar[size];
-  if (!buffer)
-     esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", size);
-}
-
-cRingBuffer_::~cRingBuffer_()
-{
-  dsyslog(LOG_INFO, "buffer stats: %d free, %d overflows, limit exceeded %d times", minFree, countOverflow, countLimit);
-  delete buffer;
-}
-
-int cRingBuffer_::Byte(int Offset)
-{
-  if (buffer && Offset < Available()) {
-     Offset += head;
-     if (Offset >= size)
-        Offset -= size;
-     return buffer[Offset];
-     }
-  return -1;
-}
-
-bool cRingBuffer_::Set(int Offset, int Length, int Value)
-{
-  if (buffer && Offset + Length <= Available() ) {
-     Offset += head;
-     while (Length--) {
-           if (Offset >= size)
-              Offset -= size;
-           buffer[Offset] = Value;
-           Offset++;
-           }
-     return true;
-     }
-  return false;
-}
-
-void cRingBuffer_::Skip(int n)
-{
-  if (n > 0) {
-     if (head < tail) {
-        head += n;
-        if (head > tail)
-           head = tail;
-        }
-     else if (head > tail) {
-        head += n;
-        if (head >= size)
-           head -= size;
-        if (head > tail)
-           head = tail;
-        }
-     }
-}
-
-int cRingBuffer_::Read(int Max)
-{
-  if (buffer) {
-     eof = false;
-     int free = Free();
-     if (free < minFree)
-        minFree = free;
-     if (freeLimit) {
-        if (free == 0) {
-           esyslog(LOG_ERR, "ERROR: buffer overflow (size=%d)", size);
-           countOverflow++;
-           }
-        else if (free < freeLimit) {
-           dsyslog(LOG_INFO, "free buffer space dipped into limit (%d < %d)", free, freeLimit);
-           countLimit++;
-           }
-        }
-     if (free == 0)
-        return 0; // the buffer is full
-     int readin = 0;
-     for (int i = 0; i < 2; i++) {
-         // If we read in exactly as many bytes as are immediately
-         // "readable" we have to do it again, because that means we
-         // were at the very end of the physical buffer and possibly only
-         // read in very few bytes.
-         int immediate = Readable();
-         int n = immediate;
-         if (Max > 0 && n > Max)
-            n = Max;
-         if (n > 0) {
-            int r = read(*inFile, buffer + tail, n);
-            if (r > 0) {
-               readin += r;
-               tail += r;
-               if (tail > size)
-                  esyslog(LOG_ERR, "ERROR: ooops: buffer tail (%d) exceeds size (%d)", tail, size);
-               if (tail >= size)
-                  tail = 0;
-               }
-            else if (r < 0) {
-               if (errno != EAGAIN) {
-                  LOG_ERROR;
-                  return -1;
-                  }
-               }
-            else
-               eof = true;
-            if (r == immediate && Max != immediate && tail == 0)
-               Max -= immediate;
-            else
-               break;
-            }
-         }
-     return readin;
-     }
-  return -1;
-}
-
-int cRingBuffer_::Write(int Max)
-{
-  if (buffer) {
-     int avail = Available();
-     if (availLimit) {
-        //XXX stats???
-        if (avail == 0)
-           //XXX esyslog(LOG_ERR, "ERROR: buffer empty!");
-        {//XXX
-           esyslog(LOG_ERR, "ERROR: buffer empty! %d", Max);
-           return Max > 0 ? Max : 0;
-           }//XXX
-        else if (avail < availLimit)
-;//XXX           dsyslog(LOG_INFO, "available buffer data dipped into limit (%d < %d)", avail, availLimit);
-        }
-     if (avail == 0)
-        return 0; // the buffer is empty
-     int n = Writeable();
-     if (Max > 0 && n > Max)
-        n = Max;
-     int w = write(*outFile, buffer + head, n);
-     if (w > 0) {
-        head += w;
-        if (head > size)
-           esyslog(LOG_ERR, "ERROR: ooops: buffer head (%d) exceeds size (%d)", head, size);
-        if (head >= size)
-           head = 0;
-        }
-     else if (w < 0) {
-        if (errno != EAGAIN)
-           LOG_ERROR;
-        else
-           w = 0;
-        }
-     return w;
-     }
-  return -1;
-}
-
-int cRingBuffer_::FindStartCode(uchar Code, int Offset)
-{
-  // Searches for a start code (beginning at Offset) and returns the number
-  // of bytes from Offset to the start code.
-
-  int n = Available() - Offset;
-
-  for (int i = 0; i < n; i++) {
-      int c = GetStartCode(Offset + i);
-      if (c == Code) 
-         return i;
-      if (i > 0 && c == SC_PHEAD)
-         break; // found another block start while looking for a different code
-      }
-  return -1;
-}
-
-int cRingBuffer_::GetPacketLength(int Offset)
-{
-  // Returns the entire length of the packet starting at offset.
-  return (Byte(Offset + 4) << 8) + Byte(Offset + 5) + 6;
-}
-
 // --- cFileName -------------------------------------------------------------
 
 class cFileName {
@@ -553,8 +334,9 @@ class cFileName {
   int fileNumber;
   char *fileName, *pFileNumber;
   bool record;
+  bool blocking;
 public:
-  cFileName(const char *FileName, bool Record);
+  cFileName(const char *FileName, bool Record, bool Blocking = false);
   ~cFileName();
   const char *Name(void) { return fileName; }
   int Number(void) { return fileNumber; }
@@ -564,11 +346,12 @@ class cFileName {
   int NextFile(void);
   };
 
-cFileName::cFileName(const char *FileName, bool Record)
+cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
 {
   file = -1;
   fileNumber = 0;
   record = Record;
+  blocking = Blocking;
   // Prepare the file name:
   fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
   if (!fileName) {
@@ -589,16 +372,17 @@ cFileName::~cFileName()
 int cFileName::Open(void)
 {
   if (file < 0) {
+     int BlockingFlag = blocking ? 0 : O_NONBLOCK;
      if (record) {
         dsyslog(LOG_INFO, "recording to '%s'", fileName);
-        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | O_NONBLOCK);
+        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | BlockingFlag);
         if (file < 0)
            LOG_ERROR_STR(fileName);
         }
      else {
         if (access(fileName, R_OK) == 0) {
            dsyslog(LOG_INFO, "playing '%s'", fileName);
-           file = open(fileName, O_RDONLY | O_NONBLOCK);
+           file = open(fileName, O_RDONLY | BlockingFlag);
            if (file < 0)
               LOG_ERROR_STR(fileName);
            }
@@ -655,6 +439,7 @@ int cFileName::NextFile(void)
 
 class cRecordBuffer : public cRingBuffer {
 private:
+  cDvbApi *dvbApi;
   cFileName fileName;
   cIndexFile *index;
   cRemux remux;
@@ -670,18 +455,19 @@ class cRecordBuffer : public cRingBuffer {
   virtual void Input(void);
   virtual void Output(void);
 public:
-  cRecordBuffer(int *InFile, const char *FileName);
+  cRecordBuffer(cDvbApi *DvbApi, const char *FileName, int VPid, int APid1, int APid2, int DPid1, int DPid2);
   virtual ~cRecordBuffer();
   };
 
-cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
-:cRingBuffer(VIDEOBUFSIZE)
+cRecordBuffer::cRecordBuffer(cDvbApi *DvbApi, const char *FileName, int VPid, int APid1, int APid2, int DPid1, int DPid2)
+:cRingBuffer(VIDEOBUFSIZE, true)
 ,fileName(FileName, true)
+,remux(VPid, APid1, APid2, DPid1, DPid2, true)
 {
+  dvbApi = DvbApi;
   index = NULL;
   pictureType = NO_PICTURE;
   fileSize = 0;
-  videoDev = *InFile;
   recordFile = fileName.Open();
   recording = false;
   lastDiskSpaceCheck = time(NULL);
@@ -692,12 +478,14 @@ cRecordBuffer::cRecordBuffer(int *InFile, const char *FileName)
   if (!index)
      esyslog(LOG_ERR, "ERROR: can't allocate index");
      // let's continue without index, so we'll at least have the recording
+  videoDev = dvbApi->SetModeRecord();
   Start();
 }
 
 cRecordBuffer::~cRecordBuffer()
 {
   Stop();
+  dvbApi->SetModeNormal(true);
   delete index;
 }
 
@@ -746,18 +534,19 @@ void cRecordBuffer::Input(void)
       else if (r < 0) {
          if (errno != EAGAIN) {
             LOG_ERROR;
-            break;
+            if (errno != EBUFFEROVERFLOW)
+               break;
             }
          }
-      else if (time(NULL) - t > 5) {
+      if (time(NULL) - t > MAXBROKENTIMEOUT) {
          esyslog(LOG_ERR, "ERROR: video data stream broken");
+         cThread::EmergencyExit(true);
          t = time(NULL);
          }
       cFile::FileReady(videoDev, 100);
       if (!recording)
          break;
       }
-  SetPlayMode(videoDev, VID_PLAY_RESET);
 
   dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
 }
@@ -766,15 +555,14 @@ void cRecordBuffer::Output(void)
 {
   dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
 
-  uchar b[MINVIDEODATA * 2];
+  uchar b[MINVIDEODATA];
   int r = 0;
   for (;;) {
-      usleep(1); // this keeps the CPU load low
-      r += Get(b + r, sizeof(b) - r);
-      if (r > 0) {
-         //XXX buffer full???
+      int g = Get(b + r, sizeof(b) - r);
+      if (g > 0) {
+         r += g;
          int Count = r, Result;
-         const uchar *p = remux.Process(b, Count, Result, pictureType);
+         const uchar *p = remux.Process(b, Count, Result, &pictureType);
          if (p) {
             if (!Busy() && pictureType == I_FRAME) // finish the recording before the next 'I' frame
                break;
@@ -803,166 +591,353 @@ void cRecordBuffer::Output(void)
          if (!recording)
             break;
          }
+      else
+         usleep(1); // this keeps the CPU load low
       }
   recording = false;
 
   dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
 }
 
+// --- ReadFrame -------------------------------------------------------------
+
+int ReadFrame(int f, uchar *b, int Length, int Max)
+{
+  if (Length == -1)
+     Length = Max; // this means we read up to EOF (see cIndex)
+  else if (Length > Max) {
+     esyslog(LOG_ERR, "ERROR: frame larger than buffer (%d > %d)", Length, Max);
+     Length = Max;
+     }
+  int r = read(f, b, Length);
+  if (r < 0)
+     LOG_ERROR;
+  return r;
+}
+
 // --- cReplayBuffer ---------------------------------------------------------
 
-class cReplayBuffer : public cRingBuffer_, public cThread {
+class cReplayBuffer : public cRingBuffer {
 private:
-  enum eReplayCmd { rcNone, rcStill, rcPause, rcPlay, rcForward, rcBackward };
-  enum eReplayMode { rmStill, rmPlay, rmFastForward, rmFastRewind, rmSlowRewind };
+  cDvbApi *dvbApi;
   cIndexFile *index;
   cFileName fileName;
   int fileOffset;
-  int videoDev;
+  int videoDev, audioDev;
+  FILE *dolbyDev;
   int replayFile;
-  eReplayMode mode;
-  int lastIndex, stillIndex;
-  int brakeCounter;
-  eReplayCmd command;
-  bool active;
+  bool eof;
+  int blockInput, blockOutput;
+  bool paused, fastForward, fastRewind;
+  int lastIndex, stillIndex, playIndex;
+  bool canToggleAudioTrack;
+  uchar audioTrack;
   bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
+  void Clear(bool Block = false);
   void Close(void);
-  void SetCmd(eReplayCmd Cmd) { LOCK_THREAD; command = Cmd; }
-  void SetTemporalReference(void);
+  void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
+  void DisplayFrame(uchar *b, int Length);
+  int Resume(void);
+  bool Save(void);
 protected:
-  virtual void Action(void);
+  virtual void Input(void);
+  virtual void Output(void);
 public:
-  cReplayBuffer(int *OutFile, const char *FileName);
+  cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const char *FileName);
   virtual ~cReplayBuffer();
-  virtual int Read(int Max = -1);
-  virtual int Write(int Max = -1);
-  void SetMode(eReplayMode Mode);
-  int Resume(void);
-  bool Save(void);
-  void Pause(void)    { SetCmd(rcPause); }
-  void Play(void)     { SetCmd(rcPlay); }
-  void Forward(void)  { SetCmd(rcForward); }
-  void Backward(void) { SetCmd(rcBackward); }
+  void Pause(void);
+  void Play(void);
+  void Forward(void);
+  void Backward(void);
   int SkipFrames(int Frames);
   void SkipSeconds(int Seconds);
   void Goto(int Position, bool Still = false);
   void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+  bool CanToggleAudioTrack(void) { return canToggleAudioTrack; }
+  void ToggleAudioTrack(void);
   };
 
-cReplayBuffer::cReplayBuffer(int *OutFile, const char *FileName)
-:cRingBuffer_(&replayFile, OutFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
+cReplayBuffer::cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const char *FileName)
+:cRingBuffer(VIDEOBUFSIZE)
 ,fileName(FileName, false)
 {
+  dvbApi = DvbApi;
   index = NULL;
   fileOffset = 0;
-  videoDev = *OutFile;
+  videoDev = VideoDev;
+  audioDev = AudioDev;
+  dolbyDev = NULL;
+  if (cDvbApi::AudioCommand()) {
+     dolbyDev = popen(cDvbApi::AudioCommand(), "w");
+     if (!dolbyDev)
+        esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
+     }
   replayFile = fileName.Open();
-  mode = rmPlay;
-  brakeCounter = 0;
-  command = rcNone;
-  lastIndex = stillIndex = -1;
-  active = false;
+  eof = false;
+  blockInput = blockOutput = false;
+  paused = fastForward = fastRewind = false;
+  lastIndex = stillIndex = playIndex = -1;
+  canToggleAudioTrack = false;
+  audioTrack = 0xC0;
   if (!fileName.Name())
      return;
   // Create the index file:
   index = new cIndexFile(FileName, false);
-  if (!index)
+  if (!index) {
      esyslog(LOG_ERR, "ERROR: can't allocate index");
-     // let's continue without index, so we'll at least have the recording
+     }
+  else if (!index->Ok()) {
+     delete index;
+     index = NULL;
+     }
+  dvbApi->SetModeReplay();
   Start();
 }
 
 cReplayBuffer::~cReplayBuffer()
 {
-  active = false;
-  Cancel(3);
+  Stop();
+  Save();
   Close();
-  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-  SetPlayMode(videoDev, VID_PLAY_RESET);
+  if (dolbyDev)
+     pclose(dolbyDev);
+  dvbApi->SetModeNormal(false);
   delete index;
 }
 
-void cReplayBuffer::Action(void)
+void cReplayBuffer::Input(void)
 {
-  dsyslog(LOG_INFO, "replay thread started (pid=%d)", getpid());
-
-  bool Paused = false;
-  bool FastForward = false;
-  bool FastRewind = false;
+  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
 
   int ResumeIndex = Resume();
   if (ResumeIndex >= 0)
      isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, IndexToHMSF(ResumeIndex, true));
-  active = true;
-  while (active) {
-        usleep(1); // this keeps the CPU load low
-
-        LOCK_THREAD;
-
-        if (command != rcNone) {
-           switch (command) {
-             case rcStill:    SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-                              SetPlayMode(videoDev, VID_PLAY_NORMAL);
-                              SetMode(rmStill);
-                              Paused = FastForward = FastRewind = false;
-                              break;
-             case rcPause:    SetPlayMode(videoDev, Paused ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
-                              Paused = !Paused;
-                              if (FastForward || FastRewind) {
-                                 SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-                                 Clear();
-                                 }
-                              FastForward = FastRewind = false;
-                              SetMode(rmPlay);
-                              if (!Paused)
-                                 stillIndex = -1;
-                              break;
-             case rcPlay:     if (FastForward || FastRewind || Paused) {
-                                 SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-                                 SetPlayMode(videoDev, VID_PLAY_NORMAL);
-                                 FastForward = FastRewind = Paused = false;
-                                 SetMode(rmPlay);
-                                 }
-                              stillIndex = -1;
-                              break;
-             case rcForward:  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-                              Clear();
-                              FastForward = !FastForward;
-                              FastRewind = false;
-                              if (Paused) {
-                                 SetMode(rmPlay);
-                                 SetPlayMode(videoDev, FastForward ? VID_PLAY_SLOW_MOTION : VID_PLAY_PAUSE);
-                                 }
-                              else {
-                                 SetPlayMode(videoDev, VID_PLAY_NORMAL);
-                                 SetMode(FastForward ? rmFastForward : rmPlay);
-                                 }
-                              stillIndex = -1;
-                              break;
-             case rcBackward: SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-                              Clear();
-                              FastRewind = !FastRewind;
-                              FastForward = false;
-                              if (Paused) {
-                                 SetMode(FastRewind ? rmSlowRewind : rmPlay);
-                                 SetPlayMode(videoDev, FastRewind ? VID_PLAY_NORMAL : VID_PLAY_PAUSE);
-                                 }
-                              else {
-                                 SetPlayMode(videoDev, VID_PLAY_NORMAL);
-                                 SetMode(FastRewind ? rmFastRewind : rmPlay);
-                                 }
-                              stillIndex = -1;
-                              break;
-             default:         break;
-             }
-           command = rcNone;
+
+  int lastIndex = -1;
+  int brakeCounter = 0;
+  uchar b[MAXFRAMESIZE];
+  while (Busy() && (blockInput || NextFile())) {
+        if (!blockInput && stillIndex < 0) {
+           int r = 0;
+           if (fastForward && !paused || fastRewind) {
+              int Index = (lastIndex >= 0) ? lastIndex : index->Get(fileName.Number(), fileOffset);
+              uchar FileNumber;
+              int FileOffset, Length;
+              if (!paused || (brakeCounter++ % 24) == 0) // show every I_FRAME 24 times in rmSlowRewind mode to achieve roughly the same speed as in slow forward mode
+                 Index = index->GetNextIFrame(Index, fastForward, &FileNumber, &FileOffset, &Length);
+              if (Index >= 0) {
+                 if (!NextFile(FileNumber, FileOffset))
+                    break;
+                 }
+              else {
+                 paused = fastForward = fastRewind = false;
+                 Play();
+                 continue;
+                 }
+              lastIndex = Index;
+              playIndex = -1;
+              r = ReadFrame(replayFile, b, Length, sizeof(b));
+              StripAudioPackets(b, r);
+              }
+           else if (index) {
+              lastIndex = -1;
+              playIndex = (playIndex >= 0) ? playIndex + 1 : index->Get(fileName.Number(), fileOffset);
+              uchar FileNumber;
+              int FileOffset, Length;
+              if (!(index->Get(playIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
+                 break;
+              r = ReadFrame(replayFile, b, Length, sizeof(b));
+              StripAudioPackets(b, r, audioTrack);
+              }
+           else // allows replay even if the index file is missing
+              r = read(replayFile, b, sizeof(b));
+           if (r > 0) {
+              uchar *p = b;
+              while (r > 0 && Busy() && !blockInput) {
+                    int w = Put(p, r);
+                    p += w;
+                    r -= w;
+                    usleep(1); // this keeps the CPU load low
+                    }
+              }
+           else if (r ==0)
+              eof = true;
+           else if (r < 0 && errno != EAGAIN) {
+              LOG_ERROR;
+              break;
+              }
            }
-        if (Read() < 0 || Write() < 0)
-           break;
+        else
+           usleep(1); // this keeps the CPU load low
+        if (blockInput > 1)
+           blockInput = 1;
         }
-  Save();
 
-  dsyslog(LOG_INFO, "end replaying thread");
+  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
+}
+
+void cReplayBuffer::Output(void)
+{
+  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+
+  uchar b[MINVIDEODATA];
+  while (Busy()) {
+        int r = blockOutput ? 0 : Get(b, sizeof(b));
+        if (r > 0) {
+           uchar *p = b;
+           while (r > 0 && Busy() && !blockOutput) {
+                 cFile::FileReadyForWriting(videoDev, 100);
+                 int w = write(videoDev, p, r);
+                 if (w > 0) {
+                    p += w;
+                    r -= w;
+                    fileOffset += w;
+                    }
+                 else if (w < 0 && errno != EAGAIN) {
+                    LOG_ERROR;
+                    Stop();
+                    return;
+                    }
+                 }
+           }
+        else
+           usleep(1); // this keeps the CPU load low
+        if (blockOutput > 1)
+           blockOutput = 1;
+        }
+
+  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
+}
+
+void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
+{
+  for (int i = 0; i < Length - 6; i++) {
+      if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
+         uchar c = b[i + 3];
+         int l = b[i + 4] * 256 + b[i + 5] + 6;
+         switch (c) {
+           case 0xBD: // dolby
+                if (Except && dolbyDev) {
+                   int written = b[i + 8] + 9; // skips the PES header
+                   int n = l - written;
+                   while (n > 0) {
+                         int w = fwrite(&b[i + written], 1, n, dolbyDev);
+                         if (w < 0) {
+                            LOG_ERROR;
+                            break;
+                            }
+                         n -= w;
+                         written += w;
+                         }
+                   }
+                // continue with deleting the data - otherwise it disturbs DVB replay
+           case 0xC0 ... 0xC1: // audio
+                if (c == 0xC1)
+                   canToggleAudioTrack = true;
+                if (!Except || c != Except) {
+                   int n = l;
+                   for (int j = i; j < Length && n--; j++)
+                       b[j] = 0x00;
+                   }
+                break;
+           case 0xE0 ... 0xEF: // video
+                break;
+           default:
+                //esyslog(LOG_ERR, "ERROR: unexpected packet id %02X", c);
+                l = 0;
+           }
+         if (l)
+            i += l - 1; // the loop increments, too!
+         }
+      /*XXX
+      else
+         esyslog(LOG_ERR, "ERROR: broken packet header");
+         XXX*/
+      }
+}
+
+void cReplayBuffer::DisplayFrame(uchar *b, int Length)
+{
+  StripAudioPackets(b, Length);
+  videoDisplayStillPicture sp = { (char *)b, Length };
+  CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
+  CHECK(ioctl(audioDev, AUDIO_SET_MUTE, true));
+  CHECK(ioctl(videoDev, VIDEO_STILLPICTURE, &sp));
+}
+
+void cReplayBuffer::Clear(bool Block)
+{
+  if (!(blockInput || blockOutput)) {
+     blockInput = blockOutput = 2;
+     time_t t0 = time(NULL);
+     while ((blockInput > 1 || blockOutput > 1) && time(NULL) - t0 < 2)
+           usleep(1);
+     Lock();
+     cRingBuffer::Clear();
+     playIndex = -1;
+     CHECK(ioctl(videoDev, VIDEO_CLEAR_BUFFER));
+     CHECK(ioctl(audioDev, AUDIO_CLEAR_BUFFER));
+     }
+  if (!Block) {
+     blockInput = blockOutput = 0;
+     Unlock();
+     }
+}
+
+void cReplayBuffer::Pause(void)
+{
+  paused = !paused;
+  CHECK(ioctl(videoDev, paused ? VIDEO_FREEZE : VIDEO_CONTINUE));
+  if (fastForward || fastRewind) {
+     if (paused)
+        Clear();
+     fastForward = fastRewind = false;
+     }
+  CHECK(ioctl(audioDev, AUDIO_SET_MUTE, paused));
+  stillIndex = -1;
+}
+
+void cReplayBuffer::Play(void)
+{
+  if (fastForward || fastRewind || paused) {
+     if (!paused)
+        Clear();
+     stillIndex = -1;
+     CHECK(ioctl(videoDev, paused ? VIDEO_CONTINUE : VIDEO_PLAY));
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, false));
+     fastForward = fastRewind = paused = false;
+     }
+}
+
+void cReplayBuffer::Forward(void)
+{
+  if (index || paused) {
+     if (!paused)
+        Clear(true);
+     stillIndex = -1;
+     fastForward = !fastForward;
+     fastRewind = false;
+     if (paused)
+        CHECK(ioctl(videoDev, fastForward ? VIDEO_SLOWMOTION : VIDEO_FREEZE, 2));
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastForward));
+     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastForward || paused));
+     if (!paused)
+        Clear(false);
+     }
+}
+
+void cReplayBuffer::Backward(void)
+{
+  if (index) {
+     Clear(true);
+     stillIndex = -1;
+     fastRewind = !fastRewind;
+     fastForward = false;
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastRewind));
+     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastRewind || paused));
+     Clear(false);
+     }
 }
 
 void cReplayBuffer::Close(void)
@@ -974,14 +949,6 @@ void cReplayBuffer::Close(void)
      }
 }
 
-void cReplayBuffer::SetMode(eReplayMode Mode)
-{
-  mode = Mode;
-  brakeCounter = 0;
-  if (mode != rmPlay)
-     Clear();
-}
-
 int cReplayBuffer::Resume(void)
 {
   if (index) {
@@ -1016,9 +983,6 @@ bool cReplayBuffer::Save(void)
 int cReplayBuffer::SkipFrames(int Frames)
 {
   if (index && Frames) {
-
-     LOCK_THREAD;
-
      int Current, Total;
      GetIndex(Current, Total, true);
      int OldCurrent = Current;
@@ -1030,16 +994,8 @@ int cReplayBuffer::SkipFrames(int Frames)
 
 void cReplayBuffer::SkipSeconds(int Seconds)
 {
-  LOCK_THREAD;
-
-  SetPlayMode(videoDev, VID_PLAY_PAUSE);
-  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-  SetPlayMode(videoDev, VID_PLAY_NORMAL);
-  command = rcPlay;
-  SetMode(rmPlay);
-  Clear();
-
   if (index && Seconds) {
+     Clear(true);
      int Index = index->Get(fileName.Number(), fileOffset);
      if (Index >= 0) {
         if (Seconds < 0) {
@@ -1055,31 +1011,41 @@ void cReplayBuffer::SkipSeconds(int Seconds)
         if (index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) >= 0)
            NextFile(FileNumber, FileOffset);
         }
+     Clear(false);
+     Play();
      }
 }
 
 void cReplayBuffer::Goto(int Index, bool Still)
 {
-  LOCK_THREAD;
-
-  if (Still)
-     command = rcStill;
-  if (++Index <= 0)
-     Index = 1; // not '0', to allow GetNextIFrame() below to work!
-  uchar FileNumber;
-  int FileOffset;
-  if ((stillIndex = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset)) >= 0)
-     NextFile(FileNumber, FileOffset);
-  SetPlayMode(videoDev, VID_PLAY_CLEAR_BUFFER);
-  Clear();
+  if (index) {
+     Clear(true);
+     if (paused)
+        CHECK(ioctl(videoDev, VIDEO_CONTINUE));
+     if (++Index <= 0)
+        Index = 1; // not '0', to allow GetNextIFrame() below to work!
+     uchar FileNumber;
+     int FileOffset, Length;
+     Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
+     if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
+        stillIndex = Index;
+        playIndex = -1;
+        uchar b[MAXFRAMESIZE];
+        int r = ReadFrame(replayFile, b, Length, sizeof(b));
+        if (r > 0)
+           DisplayFrame(b, r);
+        fileOffset += Length;
+        paused = true;
+        }
+     else
+        stillIndex = playIndex = -1;
+     Clear(false);
+     }
 }
 
 void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
-
-     LOCK_THREAD;
-
      if (stillIndex >= 0)
         Current = stillIndex;
      else {
@@ -1099,178 +1065,145 @@ void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
 {
   if (FileNumber > 0) {
-     Clear();
      fileOffset = FileOffset;
      replayFile = fileName.SetOffset(FileNumber, FileOffset);
      }
-  else if (replayFile >= 0 && EndOfFile()) {
+  else if (replayFile >= 0 && eof) {
      Close();
      replayFile = fileName.NextFile();
      }
+  eof = false;
   return replayFile >= 0;
 }
 
-void cReplayBuffer::SetTemporalReference(void)
-{
-  for (int i = 0; i < Available(); i++) {
-      if (Byte(i) == 0 && Byte(i + 1) == 0 && Byte(i + 2) == 1) {
-         switch (Byte(i + 3)) {
-           case SC_PICTURE: {
-                              unsigned short m = (Byte(i + 4) << 8) | Byte(i + 5);
-                              m &= 0x003F;
-                              Set(i + 4, 1, m >> 8);
-                              Set(i + 5, 1, m & 0xFF);
-                            }
-                            return;
-           }
-         }
-      }
-}
-
-int cReplayBuffer::Read(int Max = -1)
+void cReplayBuffer::ToggleAudioTrack(void)
 {
-  if (mode != rmPlay) {
-     if (index) {
-        if (Available())
-           return 0; // write out the entire block
-        if (mode == rmStill) {
-           uchar FileNumber;
-           int FileOffset, Length;
-           if (index->GetNextIFrame(stillIndex + 1, false, &FileNumber, &FileOffset, &Length) >= 0) {
-              if (!NextFile(FileNumber, FileOffset))
-                 return -1;
-              Max = Length;
-              }
-           command = rcPause;
-           }
-        else {
-           int Index = (lastIndex >= 0) ? lastIndex : index->Get(fileName.Number(), fileOffset);
-           if (Index >= 0) {
-              if (mode == rmSlowRewind && (brakeCounter++ % 24) != 0) {
-                 // show every I_FRAME 24 times in rmSlowRewind mode to achieve roughly the same speed as in slow forward mode
-                 Index = index->GetNextIFrame(Index, true); // jump ahead one frame
-                 }
-              uchar FileNumber;
-              int FileOffset, Length;
-              Index = index->GetNextIFrame(Index, mode == rmFastForward, &FileNumber, &FileOffset, &Length);
-              if (Index >= 0) {
-                 if (!NextFile(FileNumber, FileOffset))
-                    return -1;
-                 Max = Length;
-                 }
-              lastIndex = Index;
-              }
-           if (Index < 0) {
-              // This results in normal replay after a fast rewind.
-              // After a fast forward it will stop.
-              // TODO Could we cause it to pause at the last frame?
-              SetMode(rmPlay);
-              return 0;
-              }
-           }
-        }
-     }
-  else
-     lastIndex = -1;
-  //XXX timeout as in recording???
-  if (NextFile()) {
-     int readin = 0;
-     do {
-        // If Max is > 0 here we need to make sure we read in the entire block!
-        int r = cRingBuffer_::Read(Max);
-        if (r >= 0)
-           readin += r;
-        else
-           return -1;
-        } while (readin < Max && Free() > 0);
-     if (mode != rmPlay) {
-        // delete the audio data in modes other than rmPlay:
-        int AudioOffset, StartOffset = 0;
-        while ((AudioOffset = FindStartCode(SC_AUDIO, StartOffset)) >= 0) {
-              if (!Set(StartOffset + AudioOffset, GetPacketLength(StartOffset + AudioOffset), 0))
-                 break; // to be able to replay old AV_PES recordings!
-              StartOffset += AudioOffset;
-              }
-        SetTemporalReference();
-        }
-     return readin;
-     }
-  if (Available() > 0)
-     return 0;
-  return -1;
-}
-
-int cReplayBuffer::Write(int Max)
-{
-  int Written = 0;
-  if (Max) {
-     int w;
-     do {
-        w = cRingBuffer_::Write(Max);
-        if (w >= 0) {
-           fileOffset += w;
-           Written += w;
-           if (Max < 0)
-              break;
-           Max -= w;
-           }
-        else
-           return w;
-        } while (Max > 0); // we MUST write this entire frame block
+  if (CanToggleAudioTrack()) {
+     audioTrack = (audioTrack == 0xC0) ? 0xC1 : 0xC0;
+     Clear();
      }
-  return Written;
 }
 
 // --- cTransferBuffer -------------------------------------------------------
 
-class cTransferBuffer : public cThread {
+class cTransferBuffer : public cRingBuffer {
 private:
-  bool active;
+  cDvbApi *dvbApi;
   int fromDevice, toDevice;
+  bool gotBufferReserve;
+  cRemux remux;
 protected:
-  virtual void Action(void);
+  virtual void Input(void);
+  virtual void Output(void);
 public:
-  cTransferBuffer(int FromDevice, int ToDevice);
+  cTransferBuffer(cDvbApi *DvbApi, int ToDevice, int VPid, int APid);
   virtual ~cTransferBuffer();
+  void SetAudioPid(int APid);
   };
 
-cTransferBuffer::cTransferBuffer(int FromDevice, int ToDevice)
+cTransferBuffer::cTransferBuffer(cDvbApi *DvbApi, int ToDevice, int VPid, int APid)
+:cRingBuffer(VIDEOBUFSIZE, true)
+,remux(VPid, APid, 0, 0, 0)
 {
-  fromDevice = FromDevice;
+  dvbApi = DvbApi;
+  fromDevice = dvbApi->SetModeRecord();
   toDevice = ToDevice;
-  active = false;
+  gotBufferReserve = false;
   Start();
 }
 
 cTransferBuffer::~cTransferBuffer()
 {
-  active = false;
-  Cancel(3);
-  SetPlayMode(fromDevice, VID_PLAY_RESET);
-  SetPlayMode(toDevice, VID_PLAY_RESET);
+  Stop();
+  dvbApi->SetModeNormal(true);
 }
 
-void cTransferBuffer::Action(void)
+void cTransferBuffer::SetAudioPid(int APid)
 {
-  dsyslog(LOG_INFO, "data transfer thread started (pid=%d)", getpid());
+  Clear();
+  //XXX we may need to have access to the audio device, too, in order to clear it
+  CHECK(ioctl(toDevice, VIDEO_CLEAR_BUFFER));
+  gotBufferReserve = false;
+  remux.SetAudioPid(APid);
+}
+
+void cTransferBuffer::Input(void)
+{
+  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
 
-  cRingBuffer_ Buffer(&fromDevice, &toDevice, VIDEOBUFSIZE, 0, 0);
-  active = true;
-  while (active && Buffer.Available() < 100000) { // need to give the read buffer a head start
-        Buffer.Read(); // initializes fromDevice for reading
-        usleep(1); // this keeps the CPU load low
+  uchar b[MINVIDEODATA];
+  int n = 0;
+  while (Busy()) {
+        cFile::FileReady(fromDevice, 100);
+        int r = read(fromDevice, b + n, sizeof(b) - n);
+        if (r > 0) {
+           n += r;
+           int Count = n, Result;
+           const uchar *p = remux.Process(b, Count, Result);
+           if (p) {
+              while (Result > 0 && Busy()) {
+                    int w = Put(p, Result);
+                    p += w;
+                    Result -= w;
+                    }
+              }
+           if (Count > 0) {
+              n -= Count;
+              memmove(b, b + Count, n);
+              }
+           }
+        else if (r < 0) {
+           if (errno != EAGAIN) {
+              LOG_ERROR;
+              if (errno != EBUFFEROVERFLOW)
+                 break;
+              }
+           }
         }
-  while (active) {
-        if (Buffer.Read() < 0 || Buffer.Write() < 0)
-           break;
-        usleep(1); // this keeps the CPU load low
+
+  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
+}
+
+void cTransferBuffer::Output(void)
+{
+  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+
+  uchar b[MINVIDEODATA];
+  while (Busy()) {
+        if (!gotBufferReserve) {
+           if (Available() < MAXFRAMESIZE) {
+              usleep(100000); // allow the buffer to collect some reserve
+              continue;
+              }
+           else
+              gotBufferReserve = true;
+           }
+        int r = Get(b, sizeof(b));
+        if (r > 0) {
+           uchar *p = b;
+           while (r > 0 && Busy()) {
+                 int w = write(toDevice, p, r);
+                 if (w > 0) {
+                    p += w;
+                    r -= w;
+                    }
+                 else if (w < 0 && errno != EAGAIN) {
+                    LOG_ERROR;
+                    Stop();
+                    return;
+                    }
+                 }
+           }
+        else
+           usleep(1); // this keeps the CPU load low
         }
-  dsyslog(LOG_INFO, "data transfer thread stopped (pid=%d)", getpid());
+
+  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
 }
 
 // --- cCuttingBuffer --------------------------------------------------------
 
-class cCuttingBuffer : public cRingBuffer_, public cThread {
+class cCuttingBuffer : public cThread {
 private:
   bool active;
   int fromFile, toFile;
@@ -1285,15 +1218,14 @@ class cCuttingBuffer : public cRingBuffer_, public cThread {
   };
 
 cCuttingBuffer::cCuttingBuffer(const char *FromFileName, const char *ToFileName)
-:cRingBuffer_(&fromFile, &toFile, VIDEOBUFSIZE, 0, VIDEOBUFSIZE / 10)
 {
   active = false;
   fromFile = toFile = -1;
   fromFileName = toFileName = NULL;
   fromIndex = toIndex = NULL;
   if (fromMarks.Load(FromFileName) && fromMarks.Count()) {
-     fromFileName = new cFileName(FromFileName, false);
-     toFileName = new cFileName(ToFileName, true);
+     fromFileName = new cFileName(FromFileName, false, true);
+     toFileName = new cFileName(ToFileName, true, true);
      fromIndex = new cIndexFile(FromFileName, false);
      toIndex = new cIndexFile(ToFileName, true);
      toMarks.Load(ToFileName); // doesn't actually load marks, just sets the file name
@@ -1329,22 +1261,24 @@ void cCuttingBuffer::Action(void)
      int LastIFrame = 0;
      toMarks.Add(0);
      toMarks.Save();
+     uchar buffer[MAXFRAMESIZE];
      while (active) {
            uchar FileNumber;
            int FileOffset, Length;
            uchar PictureType;
-   
-           Clear(); // makes sure one frame is completely read and written
-   
+
            // Read one frame:
-   
+
            if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
               if (FileNumber != CurrentFileNumber) {
                  fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
                  CurrentFileNumber = FileNumber;
                  }
-              if (fromFile >= 0)
-                 Length = cRingBuffer_::Read(Length);
+              if (fromFile >= 0) {
+                 Length = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
+                 if (Length < 0)
+                    break;
+                 }
               else
                  break;
               }
@@ -1362,7 +1296,7 @@ void cCuttingBuffer::Action(void)
                  }
               LastIFrame = 0;
               }
-           cRingBuffer_::Write(Length);
+           write(toFile, buffer, Length);
            toIndex->Write(PictureType, toFileName->Number(), FileSize);
            FileSize += Length;
            if (!LastIFrame)
@@ -1424,13 +1358,32 @@ bool cVideoCutter::Active(void)
 
 // --- cDvbApi ---------------------------------------------------------------
 
+
+static const char *OstName(const char *Name, int n)
+{
+  static char buffer[_POSIX_PATH_MAX];
+  snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
+  return buffer;
+}
+
+static int OstOpen(const char *Name, int n, int Mode, bool ReportError = false)
+{
+  const char *FileName = OstName(Name, n);
+  int fd = open(FileName, Mode);
+  if (fd < 0 && ReportError)
+     LOG_ERROR_STR(FileName);
+  return fd;
+}
+
 int cDvbApi::NumDvbApis = 0;
 int cDvbApi::useDvbApi = 0;
 cDvbApi *cDvbApi::dvbApi[MAXDVBAPI] = { NULL };
 cDvbApi *cDvbApi::PrimaryDvbApi = NULL;
+char *cDvbApi::audioCommand = NULL;
 
-cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
+cDvbApi::cDvbApi(int n)
 {
+  vPid = aPid1 = aPid2 = dPid1 = dPid2 = 0;
   siProcessor = NULL;
   recordBuffer = NULL;
   replayBuffer = NULL;
@@ -1438,21 +1391,49 @@ cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
   transferringFromDvbApi = NULL;
   ca = 0;
   priority = -1;
-  videoDev = open(VideoFileName, O_RDWR | O_NONBLOCK);
-  if (videoDev >= 0) {
-     siProcessor = new cSIProcessor(VbiFileName);
+
+  // Devices that are only present on DVB-C or DVB-S cards:
+
+  fd_qamfe   = OstOpen(DEV_OST_QAMFE,  n, O_RDWR);
+  fd_qpskfe  = OstOpen(DEV_OST_QPSKFE, n, O_RDWR);
+  fd_sec     = OstOpen(DEV_OST_SEC,    n, O_RDWR);
+
+  // Devices that all DVB cards must have:
+
+  fd_demuxv  = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
+  fd_demuxa1 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
+  fd_demuxa2 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
+  fd_demuxd1 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
+  fd_demuxd2 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
+  fd_demuxt  = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
+
+  // Devices not present on "budget" cards:
+
+  fd_osd     = OstOpen(DEV_OST_OSD,    n, O_RDWR);
+  fd_video   = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
+  fd_audio   = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
+
+  // Devices that may not be available, and are not necessary for normal operation:
+
+  videoDev   = OstOpen(DEV_VIDEO,      n, O_RDWR);
+
+  // Devices that will be dynamically opened and closed when necessary:
+
+  fd_dvr     = -1;
+
+  // Video format:
+
+  SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+
+  // We only check the devices that must be present - the others will be checked before accessing them:
+
+  if (((fd_qpskfe >= 0 && fd_sec >= 0) || fd_qamfe >= 0) && fd_demuxv >= 0 && fd_demuxa1 >= 0 && fd_demuxa2 >= 0 && fd_demuxd1 >= 0 && fd_demuxd2 >= 0 && fd_demuxt >= 0) {
+     siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
      if (!dvbApi[0]) // only the first one shall set the system time
         siProcessor->SetUseTSTime(Setup.SetSystemTime);
-     siProcessor->AddFilter(0x14, 0x70);  // TDT
-     siProcessor->AddFilter(0x14, 0x73);  // TOT
-     siProcessor->AddFilter(0x12, 0x4e);  // event info, actual TS, present/following
-     siProcessor->AddFilter(0x12, 0x4f);  // event info, other TS, present/following
-     siProcessor->AddFilter(0x12, 0x50);  // event info, actual TS, schedule
-     siProcessor->AddFilter(0x12, 0x60);  // event info, other TS, schedule
-     siProcessor->Start();
      }
   else
-     LOG_ERROR_STR(VideoFileName);
+     esyslog(LOG_ERR, "ERROR: can't open video device %d", n);
   cols = rows = 0;
 
   ovlGeoSet = ovlStat = ovlFbSet = false;
@@ -1480,16 +1461,14 @@ cDvbApi::cDvbApi(const char *VideoFileName, const char *VbiFileName)
 
 cDvbApi::~cDvbApi()
 {
-  if (videoDev >= 0) {
-     delete siProcessor;
-     Close();
-     StopReplay();
-     StopRecord();
-     StopTransfer();
-     OvlO(false); //Overlay off!
-     //XXX the following call sometimes causes a segfault - driver problem?
-     //XXX close(videoDev);
-     }
+  delete siProcessor;
+  Close();
+  StopReplay();
+  StopRecord();
+  StopTransfer();
+  OvlO(false); //Overlay off!
+  // We're not explicitly closing any device files here, since this sometimes
+  // caused segfaults. Besides, the program is about to terminate anyway...
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   endwin();
 #endif
@@ -1555,37 +1534,32 @@ int cDvbApi::Index(void)
   return -1;
 }
 
+bool cDvbApi::Probe(const char *FileName)
+{
+  if (access(FileName, F_OK) == 0) {
+     dsyslog(LOG_INFO, "probing %s", FileName);
+     int f = open(FileName, O_RDONLY);
+     if (f >= 0) {
+        close(f);
+        return true;
+        }
+     else if (errno != ENODEV && errno != EINVAL)
+        LOG_ERROR_STR(FileName);
+     }
+  else if (errno != ENOENT)
+     LOG_ERROR_STR(FileName);
+  return false;
+}
+
 bool cDvbApi::Init(void)
 {
   NumDvbApis = 0;
   for (int i = 0; i < MAXDVBAPI; i++) {
       if (useDvbApi == 0 || (useDvbApi & (1 << i)) != 0) {
-         char fileName[strlen(VIDEODEVICE) + 10];
-         sprintf(fileName, "%s%d", VIDEODEVICE, i);
-         if (access(fileName, F_OK | R_OK | W_OK) == 0) {
-            dsyslog(LOG_INFO, "probing %s", fileName);
-            int f = open(fileName, O_RDWR);
-            if (f >= 0) {
-               struct video_capability cap;
-               int r = ioctl(f, VIDIOCGCAP, &cap);
-               close(f);
-               if (r == 0 && (cap.type & VID_TYPE_DVB)) {
-                  char vbiFileName[strlen(VBIDEVICE) + 10];
-                  sprintf(vbiFileName, "%s%d", VBIDEVICE, i);
-                  dvbApi[NumDvbApis++] = new cDvbApi(fileName, vbiFileName);
-                  }
-               }
-            else {
-               if (errno != ENODEV)
-                  LOG_ERROR_STR(fileName);
-               break;
-               }
-            }
-         else {
-            if (errno != ENOENT)
-               LOG_ERROR_STR(fileName);
+         if (Probe(OstName(DEV_OST_QPSKFE, i)) || Probe(OstName(DEV_OST_QAMFE, i)))
+            dvbApi[NumDvbApis++] = new cDvbApi(i);
+         else
             break;
-            }
          }
       }
   PrimaryDvbApi = dvbApi[0];
@@ -1616,6 +1590,8 @@ const cSchedules *cDvbApi::Schedules(cThreadLock *ThreadLock) const
 
 bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
+  if (videoDev < 0)
+     return false;
   int result = 0;
   // just do this once?
   struct video_mbuf mbuf;
@@ -1711,6 +1687,8 @@ bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX,
 
 bool cDvbApi::OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette)
 {
+  if (videoDev < 0)
+     return false;
   int result = 0;
   // get the actual X-Server settings???
   // plausibility-check problem: can't be verified w/o X-server!!!
@@ -1752,6 +1730,8 @@ bool cDvbApi::OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette)
 
 bool cDvbApi::OvlG(int SizeX, int SizeY, int PosX, int PosY)
 {
+  if (videoDev < 0)
+     return false;
   int result = 0;
   // get the actual X-Server settings???
   struct video_capability vc;
@@ -1798,6 +1778,8 @@ bool cDvbApi::OvlG(int SizeX, int SizeY, int PosX, int PosY)
 
 bool cDvbApi::OvlC(int ClipCount, CRect *cr)
 {
+  if (videoDev < 0)
+     return false;
   if (ovlGeoSet && ovlFbSet) {
      for (int i = 0; i < ClipCount; i++) {
          ovlClipRects[i].x = cr[i].x;
@@ -1815,6 +1797,8 @@ bool cDvbApi::OvlC(int ClipCount, CRect *cr)
 
 bool cDvbApi::OvlP(__u16 Brightness, __u16 Colour, __u16 Hue, __u16 Contrast)
 {
+  if (videoDev < 0)
+     return false;
   int result = 0;
   ovlBrightness = Brightness;
   ovlColour = Colour;
@@ -1836,6 +1820,8 @@ bool cDvbApi::OvlP(__u16 Brightness, __u16 Colour, __u16 Hue, __u16 Contrast)
 
 bool cDvbApi::OvlO(bool Value)
 {
+  if (videoDev < 0)
+     return false;
   int result = 0;
   if (!ovlGeoSet && Value)
      return false;
@@ -1867,30 +1853,11 @@ void cDvbApi::SetColor(eDvbColor colorFg, eDvbColor colorBg)
          }
       }
 }
-#else
-void cDvbApi::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
-{
-  if (videoDev >= 0) {
-     struct drawcmd dc;
-     dc.cmd   = cmd;
-     dc.color = color;
-     dc.x0    = x0;
-     dc.y0    = y0;
-     dc.x1    = x1;
-     dc.y1    = y1;
-     dc.data  = (void *)data;
-     ioctl(videoDev, VIDIOCSOSDCOMMAND, &dc);
-     usleep(10); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
-                 // XXX and sometimes the OSD was no longer displayed).
-                 // XXX Increase the value if the problem still persists on your particular system.
-                 // TODO Check if this is still necessary with driver versions after 0.6.
-     }
-}
 #endif
 
 void cDvbApi::Open(int w, int h)
 {
-  int d = (h < 0) ? MenuLines + h : 0;
+  int d = (h < 0) ? Setup.OSDheight + h : 0;
   h = abs(h);
   cols = w;
   rows = h;
@@ -1899,16 +1866,7 @@ void cDvbApi::Open(int w, int h)
   syncok(window, true);
   #define B2C(b) (((b) * 1000) / 255)
   #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
-#else
-  w *= charWidth;
-  h *= lineHeight;
-  d *= lineHeight;
-  int x = (720 - MenuColumns * charWidth) / 2; //TODO PAL vs. NTSC???
-  int y = (576 - MenuLines * lineHeight) / 2 + d;
-  osd = new cDvbOsd(videoDev, x, y, x + w - 1, y + h - 1, 4);
-  #define SETCOLOR(n, r, g, b, o) Cmd(OSD_SetColor, n, r, g, b, o)
-  SETCOLOR(clrTransparent, 0x00, 0x00, 0x00,   0);
-#endif
+  //XXX
   SETCOLOR(clrBackground,  0x00, 0x00, 0x00, 127); // background 50% gray
   SETCOLOR(clrBlack,       0x00, 0x00, 0x00, 255);
   SETCOLOR(clrRed,         0xFC, 0x14, 0x14, 255);
@@ -1918,6 +1876,35 @@ void cDvbApi::Open(int w, int h)
   SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
   SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
   SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
+#else
+  w *= charWidth;
+  h *= lineHeight;
+  d *= lineHeight;
+  int x = (720 - (Setup.OSDwidth - 1) * charWidth) / 2; //TODO PAL vs. NTSC???
+  int y = (576 - Setup.OSDheight * lineHeight) / 2 + d;
+  //XXX
+  osd = new cDvbOsd(fd_osd, x, y);
+  //XXX TODO this should be transferred to the places where the individual windows are requested (there's too much detailed knowledge here!)
+  if (h / lineHeight == 5) { //XXX channel display
+     osd->Create(0,              0, w, h, 4);
+     }
+  else if (h / lineHeight == 1) { //XXX info display
+     osd->Create(0,              0, w, h, 4);
+     }
+  else if (d == 0) { //XXX full menu
+     osd->Create(0,                            0, w,                         lineHeight, 2);
+     osd->Create(0,                   lineHeight, w, (Setup.OSDheight - 3) * lineHeight, 2, true, clrBackground, clrCyan, clrWhite, clrBlack);
+     osd->Create(0, (Setup.OSDheight - 2) * lineHeight, w,               2 * lineHeight, 4);
+     }
+  else { //XXX progress display
+     /*XXX
+     osd->Create(0,              0, w, lineHeight, 1);
+     osd->Create(0,     lineHeight, w, lineHeight, 2, false);
+     osd->Create(0, 2 * lineHeight, w, lineHeight, 1);
+     XXX*///XXX some pixels are not drawn correctly with lower bpp values
+     osd->Create(0,              0, w, 3*lineHeight, 4);
+     }
+#endif
 }
 
 void cDvbApi::Close(void)
@@ -2037,60 +2024,270 @@ void cDvbApi::Flush(void)
 #endif
 }
 
-bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr)
+int cDvbApi::SetModeRecord(void)
 {
-  if (videoDev >= 0) {
-     cThreadLock ThreadLock(siProcessor); // makes sure the siProcessor won't access the vbi-device while switching
-     StopTransfer();
-     StopReplay();
-     SetPlayMode(videoDev, VID_PLAY_RESET);
-     struct frontend front;
-     ioctl(videoDev, VIDIOCGFRONTEND, &front);
-     unsigned int freq = FrequencyMHz;
-     if (front.type == FRONT_DVBS) {
-        front.ttk = (freq < 11700UL) ? 0 : 1;
-        if (freq < 11700UL) {
+  // Sets up the DVB device for recording
+
+  SetPids(true);
+  if (fd_dvr >= 0)
+     close(fd_dvr);
+  fd_dvr = OstOpen(DEV_OST_DVR, Index(), O_RDONLY | O_NONBLOCK);
+  if (fd_dvr < 0)
+     LOG_ERROR;
+  return fd_dvr;
+}
+
+void cDvbApi::SetModeReplay(void)
+{
+  // Sets up the DVB device for replay
+
+  if (fd_video >= 0 && fd_audio >= 0) {
+     if (siProcessor)
+        siProcessor->SetStatus(false);
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_PLAY));
+     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+     CHECK(ioctl(fd_video, VIDEO_PLAY));
+     }
+}
+
+void cDvbApi::SetModeNormal(bool FromRecording)
+{
+  // Puts the DVB device back into "normal" viewing mode (after replay or recording)
+
+  if (FromRecording) {
+     close(fd_dvr);
+     fd_dvr = -1;
+     SetPids(false);
+     }
+  else {
+     if (fd_video >= 0 && fd_audio >= 0) {
+        CHECK(ioctl(fd_video, VIDEO_STOP, true));
+        CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+        CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+        CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+        CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
+        CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+        CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+        if (siProcessor)
+           siProcessor->SetStatus(true);
+        }
+     }
+}
+
+void cDvbApi::SetVideoFormat(videoFormat_t Format)
+{
+  if (fd_video)
+     CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, Format));
+}
+
+bool cDvbApi::SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output)
+{
+  if (Pid) {
+     CHECK(ioctl(fd, DMX_STOP));
+     dmxPesFilterParams pesFilterParams;
+     pesFilterParams.pid     = Pid;
+     pesFilterParams.input   = DMX_IN_FRONTEND;
+     pesFilterParams.output  = Output;
+     pesFilterParams.pesType = PesType;
+     pesFilterParams.flags   = DMX_IMMEDIATE_START;
+     if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+        if (Pid != 0x1FFF)
+           LOG_ERROR;
+        return false;
+        }
+     }
+  return true;
+}
+
+bool cDvbApi::SetPids(bool ForRecording)
+{
+  return SetVpid(vPid,   ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
+         SetApid1(aPid1, ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
+         SetApid2(ForRecording ? aPid2 : 0, DMX_OUT_TS_TAP) &&
+         SetDpid1(ForRecording ? dPid1 : 0, DMX_OUT_TS_TAP) &&
+         SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP);
+}
+
+bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
+{
+  // Make sure the siProcessor won't access the device while switching
+  cThreadLock ThreadLock(siProcessor);
+
+  StopTransfer();
+  StopReplay();
+
+  // Must set this anyway to avoid getting stuck when switching through
+  // channels with 'Up' and 'Down' keys:
+  currentChannel = ChannelNumber;
+  vPid = Vpid;
+  aPid1 = Apid1;
+  aPid2 = Apid2;
+  dPid1 = Dpid1;
+  dPid2 = Dpid2;
+
+  // Avoid noise while switching:
+
+  if (fd_video >= 0 && fd_audio >= 0) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     }
+
+  // If this card can't receive this channel, we must not actually switch
+  // the channel here, because that would irritate the driver when we
+  // start replaying in Transfer Mode immediately after switching the channel:
+  bool NeedsTransferMode = (this == PrimaryDvbApi && Ca && Ca != Index() + 1);
+
+  if (!NeedsTransferMode) {
+
+     // Turn off current PIDs:
+
+     SetVpid( 0x1FFF, DMX_OUT_DECODER);
+     SetApid1(0x1FFF, DMX_OUT_DECODER);
+     SetApid2(0x1FFF, DMX_OUT_DECODER);
+     SetDpid1(0x1FFF, DMX_OUT_DECODER);
+     SetDpid2(0x1FFF, DMX_OUT_DECODER);
+     SetTpid( 0x1FFF, DMX_OUT_DECODER);
+
+     bool ChannelSynced = false;
+
+     if (fd_qpskfe >= 0 && fd_sec >= 0) { // DVB-S
+
+        // Frequency offsets:
+
+        unsigned int freq = FrequencyMHz;
+        int tone = SEC_TONE_OFF;
+
+        if (freq < (unsigned int)Setup.LnbSLOF) {
            freq -= Setup.LnbFrequLo;
-           front.ttk = 0;
+           tone = SEC_TONE_OFF;
            }
         else {
            freq -= Setup.LnbFrequHi;
-           front.ttk = 1;
+           tone = SEC_TONE_ON;
+           }
+
+        qpskParameters qpsk;
+        qpsk.iFrequency = freq * 1000UL;
+        qpsk.SymbolRate = Srate * 1000UL;
+        qpsk.FEC_inner = FEC_AUTO;
+
+        int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+
+        // DiseqC:
+
+        secCommand scmd;
+        scmd.type = 0;
+        scmd.u.diseqc.addr = 0x10;
+        scmd.u.diseqc.cmd = 0x38;
+        scmd.u.diseqc.numParams = 1;
+        scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
+
+        secCmdSequence scmds;
+        scmds.voltage = volt;
+        scmds.miniCommand = SEC_MINI_NONE;
+        scmds.continuousTone = tone;
+        scmds.numCommands = Setup.DiSEqC ? 1 : 0;
+        scmds.commands = &scmd;
+
+        CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+
+        // Tuning:
+
+        CHECK(ioctl(fd_qpskfe, QPSK_TUNE, &qpsk));
+
+        // Wait for channel sync:
+
+        if (cFile::FileReady(fd_qpskfe, 5000)) {
+           qpskEvent event;
+           int res = ioctl(fd_qpskfe, QPSK_GET_EVENT, &event);
+           if (res >= 0)
+              ChannelSynced = event.type == FE_COMPLETION_EV;
+           else
+              esyslog(LOG_ERR, "ERROR %d in qpsk get event", res);
            }
+        else
+           esyslog(LOG_ERR, "ERROR: timeout while tuning\n");
         }
-     front.channel_flags = Ca ? DVB_CHANNEL_CA : DVB_CHANNEL_FTA;
-     front.pnr       = Pnr;
-     front.freq      = freq * 1000000UL;
-     front.diseqc    = Diseqc;
-     front.srate     = Srate * 1000;
-     front.volt      = (Polarization == 'v' || Polarization == 'V') ? 0 : 1;
-     front.video_pid = Vpid;
-     front.audio_pid = Apid;
-     front.tt_pid    = Tpid;
-     front.fec       = 8;
-     front.AFC       = 1;
-     front.qam       = 2;
-     ioctl(videoDev, VIDIOCSFRONTEND, &front);
-     if (front.sync & 0x1F == 0x1F) {
-        if (this == PrimaryDvbApi && siProcessor)
-           siProcessor->SetCurrentServiceID(Pnr);
-        currentChannel = ChannelNumber;
-        // If this DVB card can't receive this channel, let's see if we can
-        // use the card that actually can receive it and transfer data from there:
-        if (this == PrimaryDvbApi && Ca && Ca != Index() + 1) {
-           cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
-           if (CaDvbApi) {
-              if (!CaDvbApi->Recording()) {
-                 if (CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid, Tpid, Ca, Pnr))
-                    transferringFromDvbApi = CaDvbApi->StartTransfer(videoDev);
-                 }
+     else if (fd_qamfe >= 0) { // DVB-C
+
+        // Frequency and symbol rate:
+
+        qamParameters qam;
+        qam.Frequency = FrequencyMHz * 1000000UL;
+        qam.SymbolRate = Srate * 1000UL;
+        qam.FEC_inner = FEC_AUTO;
+        qam.QAM = QAM_64;
+
+        // Tuning:
+
+        CHECK(ioctl(fd_qamfe, QAM_TUNE, &qam));
+
+        // Wait for channel sync:
+
+        if (cFile::FileReady(fd_qamfe, 5000)) {
+           qamEvent event;
+           int res = ioctl(fd_qamfe, QAM_GET_EVENT, &event);
+           if (res >= 0)
+              ChannelSynced = event.type == FE_COMPLETION_EV;
+           else
+              esyslog(LOG_ERR, "ERROR %d in qam get event", res);
+           }
+        else
+           esyslog(LOG_ERR, "ERROR: timeout while tuning\n");
+        }
+     else {
+        esyslog(LOG_ERR, "ERROR: attempt to set channel without DVB-S or DVB-C device");
+        return false;
+        }
+
+     if (!ChannelSynced) {
+        esyslog(LOG_ERR, "ERROR: channel %d not sync'ed!", ChannelNumber);
+        if (this == PrimaryDvbApi)
+           cThread::RaisePanic();
+        return false;
+        }
+
+     // PID settings:
+
+     if (!SetPids(false)) {
+        esyslog(LOG_ERR, "ERROR: failed to set PIDs for channel %d", ChannelNumber);
+        return false;
+        }
+     SetTpid(Tpid, DMX_OUT_DECODER);
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     }
+
+  if (this == PrimaryDvbApi && siProcessor)
+     siProcessor->SetCurrentServiceID(Pnr);
+
+  // If this DVB card can't receive this channel, let's see if we can
+  // use the card that actually can receive it and transfer data from there:
+
+  if (NeedsTransferMode) {
+     cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
+     if (CaDvbApi) {
+        if (!CaDvbApi->Recording()) {
+           if (CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid1, Apid2, Dpid1, Dpid2, Tpid, Ca, Pnr)) {
+              SetModeReplay();
+              transferringFromDvbApi = CaDvbApi->StartTransfer(fd_video);
               }
            }
-        return true;
         }
-     esyslog(LOG_ERR, "ERROR: channel %d not sync'ed (front.sync=%X)!", ChannelNumber, front.sync);
      }
-  return false;
+
+  if (fd_video >= 0 && fd_audio >= 0) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+     }
+
+  return true;
 }
 
 bool cDvbApi::Transferring(void)
@@ -2101,7 +2298,7 @@ bool cDvbApi::Transferring(void)
 cDvbApi *cDvbApi::StartTransfer(int TransferToVideoDev)
 {
   StopTransfer();
-  transferBuffer = new cTransferBuffer(videoDev, TransferToVideoDev);
+  transferBuffer = new cTransferBuffer(this, TransferToVideoDev, vPid, aPid1);
   return this;
 }
 
@@ -2110,7 +2307,6 @@ void cDvbApi::StopTransfer(void)
   if (transferBuffer) {
      delete transferBuffer;
      transferBuffer = NULL;
-     SetPlayMode(videoDev, VID_PLAY_RESET);
      }
   if (transferringFromDvbApi) {
      transferringFromDvbApi->StopTransfer();
@@ -2143,37 +2339,36 @@ bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
      esyslog(LOG_ERR, "ERROR: StartRecord() called while recording - ignored!");
      return false;
      }
-  if (videoDev >= 0) {
 
-     StopTransfer();
+  StopTransfer();
 
-     StopReplay(); // TODO: remove this if the driver is able to do record and replay at the same time
+  StopReplay(); // TODO: remove this if the driver is able to do record and replay at the same time
 
-     // Check FileName:
+  // Check FileName:
 
-     if (!FileName) {
-        esyslog(LOG_ERR, "ERROR: StartRecord: file name is (null)");
-        return false;
-        }
-     isyslog(LOG_INFO, "record %s", FileName);
+  if (!FileName) {
+     esyslog(LOG_ERR, "ERROR: StartRecord: file name is (null)");
+     return false;
+     }
+  isyslog(LOG_INFO, "record %s", FileName);
 
-     // Create directories if necessary:
+  // Create directories if necessary:
 
-     if (!MakeDirs(FileName, true))
-        return false;
+  if (!MakeDirs(FileName, true))
+     return false;
 
-     // Create recording buffer:
+  // Create recording buffer:
 
-     recordBuffer = new cRecordBuffer(&videoDev, FileName);
+  recordBuffer = new cRecordBuffer(this, FileName, vPid, aPid1, aPid2, dPid1, dPid2);
 
-     if (recordBuffer) {
-        ca = Ca;
-        priority = Priority;
-        return true;
-        }
-     else
-        esyslog(LOG_ERR, "ERROR: can't allocate recording buffer");
+  if (recordBuffer) {
+     ca = Ca;
+     priority = Priority;
+     return true;
      }
+  else
+     esyslog(LOG_ERR, "ERROR: can't allocate recording buffer");
+
   return false;
 }
 
@@ -2195,7 +2390,7 @@ bool cDvbApi::StartReplay(const char *FileName)
      }
   StopTransfer();
   StopReplay();
-  if (videoDev >= 0) {
+  if (fd_video >= 0 && fd_audio >= 0) {
 
      // Check FileName:
 
@@ -2207,7 +2402,7 @@ bool cDvbApi::StartReplay(const char *FileName)
 
      // Create replay buffer:
 
-     replayBuffer = new cReplayBuffer(&videoDev, FileName);
+     replayBuffer = new cReplayBuffer(this, fd_video, fd_audio, FileName);
      if (replayBuffer)
         return true;
      else
@@ -2221,6 +2416,12 @@ void cDvbApi::StopReplay(void)
   if (replayBuffer) {
      delete replayBuffer;
      replayBuffer = NULL;
+     if (this == PrimaryDvbApi) {
+        // let's explicitly switch the channel back in case it was in Transfer Mode:
+        cChannel *Channel = Channels.GetByNumber(currentChannel);
+        if (Channel)
+           Channel->Switch(this, false);
+        }
      }
 }
 
@@ -2276,6 +2477,38 @@ void cDvbApi::Goto(int Position, bool Still)
      replayBuffer->Goto(Position, Still);
 }
 
+bool cDvbApi::CanToggleAudioTrack(void)
+{
+  return replayBuffer ? replayBuffer->CanToggleAudioTrack() : (aPid1 && aPid2 && aPid1 != aPid2);
+}
+
+bool cDvbApi::ToggleAudioTrack(void)
+{
+  if (replayBuffer) {
+     replayBuffer->ToggleAudioTrack();
+     return true;
+     }
+  else {
+     int a = aPid2;
+     aPid2 = aPid1;
+     aPid1 = a;
+     if (transferringFromDvbApi)
+        return transferringFromDvbApi->ToggleAudioTrack();
+     else {
+        if (transferBuffer)
+           transferBuffer->SetAudioPid(aPid1);
+        return SetPids(transferBuffer != NULL);
+        }
+     }
+  return false;
+}
+
+void cDvbApi::SetAudioCommand(const char *Command)
+{
+  delete audioCommand;
+  audioCommand = strdup(Command);
+}
+
 // --- cEITScanner -----------------------------------------------------------
 
 cEITScanner::cEITScanner(void)
@@ -2318,7 +2551,7 @@ void cEITScanner::Process(void)
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         for (int i = 0; i < cDvbApi::NumDvbApis; i++) {
-            cDvbApi *DvbApi = cDvbApi::GetDvbApi(i, 0);
+            cDvbApi *DvbApi = cDvbApi::GetDvbApi(i + 1, MAXPRIORITY);
             if (DvbApi) {
                if (DvbApi != cDvbApi::PrimaryDvbApi || (cDvbApi::NumDvbApis == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
                   if (!(DvbApi->Recording() || DvbApi->Replaying() || DvbApi->Transferring())) {
diff --git a/dvbapi.h b/dvbapi.h
index de646121e..2203d799e 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,22 +4,28 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.35 2001/02/11 10:41:10 kls Exp $
+ * $Id: dvbapi.h 1.42 2001/07/27 11:40:38 kls Exp $
  */
 
 #ifndef __DVBAPI_H
 #define __DVBAPI_H
 
-// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
-typedef unsigned int __u32;
-typedef unsigned short __u16;
-typedef unsigned char __u8;
-
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
 #include <ncurses.h>
 #endif
+#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
+                    // FIXME: shouldn't every header file include ALL the other header
+                    // FIXME: files it depends on? The sequence in which header files
+                    // FIXME: are included here should not matter - and it should NOT
+                    // FIXME: be necessary to include <stdlib.h> here!
+#include <linux/videodev.h>
+#include <ost/dmx.h>
+#include <ost/sec.h>
+#include <ost/frontend.h>
+#include <ost/video.h>
+#include <ost/audio.h>
+#include <ost/osd.h>
 #include <stdio.h>
-#include <dvb.h>
 #include "dvbosd.h"
 #include "eit.h"
 #include "thread.h"
@@ -30,9 +36,6 @@ typedef struct CRect {
   signed short x, y, width, height;
   };
 
-#define MenuLines   15
-#define MenuColumns 40
-
 const char *IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
 int HMSFToIndex(const char *HMSF);
@@ -55,9 +58,22 @@ class cVideoCutter {
   };
 
 class cDvbApi {
+  friend class cRecordBuffer;
+  friend class cReplayBuffer;
+  friend class cTransferBuffer;
 private:
   int videoDev;
-  cDvbApi(const char *VideoFileName, const char *VbiFileName);
+  int fd_osd, fd_qpskfe, fd_qamfe, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt;
+  int vPid, aPid1, aPid2, dPid1, dPid2;
+  bool SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output);
+  bool SetVpid(int Vpid, dmxOutput_t Output)  { return SetPid(fd_demuxv,  DMX_PES_VIDEO,    Vpid, Output); }
+  bool SetApid1(int Apid, dmxOutput_t Output) { return SetPid(fd_demuxa1, DMX_PES_AUDIO,    Apid, Output); }
+  bool SetApid2(int Apid, dmxOutput_t Output) { return SetPid(fd_demuxa2, DMX_PES_OTHER,    Apid, Output); }
+  bool SetDpid1(int Dpid, dmxOutput_t Output) { return SetPid(fd_demuxd1, DMX_PES_OTHER,    Dpid, Output); }
+  bool SetDpid2(int Dpid, dmxOutput_t Output) { return SetPid(fd_demuxd2, DMX_PES_OTHER,    Dpid, Output); }
+  bool SetTpid(int Tpid, dmxOutput_t Output)  { return SetPid(fd_demuxt,  DMX_PES_TELETEXT, Tpid, Output); }
+  bool SetPids(bool ForRecording);
+  cDvbApi(int n);
 public:
   ~cDvbApi();
 
@@ -86,8 +102,10 @@ class cDvbApi {
          // recording and stop recording if necessary.
   int Index(void);
          // Returns the index of this DvbApi.
+  static bool Probe(const char *FileName);
+         // Probes for existing DVB devices.
   static bool Init(void);
-         // Initializes the DVB API and probes for existing DVB devices.
+         // Initializes the DVB API.
          // Must be called before accessing any DVB functions.
   static void Cleanup(void);
          // Closes down all DVB devices.
@@ -138,7 +156,6 @@ class cDvbApi {
   cDvbOsd *osd;
 #endif
   int cols, rows;
-  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
 public:
   void Open(int w, int h);
   void Close(void);
@@ -154,12 +171,16 @@ class cDvbApi {
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
   void Flush(void);
 
+  // Video format facilities:
+
+  void SetVideoFormat(videoFormat_t Format);
+
   // Channel facilities
 
 private:
   int currentChannel;
 public:
-  bool SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr);
+  bool SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr);
   static int CurrentChannel(void) { return PrimaryDvbApi ? PrimaryDvbApi->currentChannel : 0; }
   int Channel(void) { return currentChannel; }
 
@@ -184,12 +205,15 @@ class cDvbApi {
   cReplayBuffer *replayBuffer;
   int ca;
   int priority;
-protected:
   int  Ca(void) { return ca; }
        // Returns the ca of the current recording session (0..MAXDVBAPI).
   int  Priority(void) { return priority; }
-       // Returns the priority of the current recording session (0..99),
+       // Returns the priority of the current recording session (0..MAXPRIORITY),
        // or -1 if no recording is currently active.
+  int  SetModeRecord(void);
+       // Initiates recording mode and returns the file handle to read from.
+  void SetModeReplay(void);
+  void SetModeNormal(bool FromRecording);
 public:
   int  SecondsToFrames(int Seconds);
        // Returns the number of frames corresponding to the given number of seconds.
@@ -238,7 +262,24 @@ class cDvbApi {
        // nearest I-frame.
   void Goto(int Index, bool Still = false);
        // Positions to the given index and displays that frame as a still picture
-       // if Still is true. 
+       // if Still is true.
+
+  // Audio track facilities
+
+public:
+  bool CanToggleAudioTrack(void);
+       // Returns true if we are currently replaying and this recording has two
+       // audio tracks, or if the current channel has two audio PIDs.
+  bool ToggleAudioTrack(void);
+       // Toggles the audio track if possible.
+
+  // Dolby Digital audio facilities
+
+private:
+  static char *audioCommand;
+public:
+  static void SetAudioCommand(const char *Command);
+  static const char *AudioCommand(void) { return audioCommand; }
   };
 
 class cEITScanner {
diff --git a/dvbosd.c b/dvbosd.c
index 395ad32ed..90ac067dc 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.7 2000/12/09 11:13:00 kls Exp $
+ * $Id: dvbosd.c 1.10 2001/07/24 16:25:34 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -14,12 +14,83 @@
 #include <sys/unistd.h>
 #include "tools.h"
 
+// --- cPalette --------------------------------------------------------------
+
+cPalette::cPalette(int Bpp)
+{
+  maxColors = 1 << Bpp;
+  numColors = 0;
+  full = false;
+}
+
+int cPalette::Index(eDvbColor Color)
+{
+  for (int i = 0; i < numColors; i++) {
+      if (color[i] == Color) {
+         used[i] = true;
+         return i;
+         }
+      }
+  if (!full) {
+     if (numColors < maxColors) {
+        color[numColors++] = Color;
+        used[numColors - 1] = true;
+        fetched[numColors - 1] = false;
+        return numColors - 1;
+        }
+     for (int i = maxColors; --i >= 0; ) {
+         if (!used[i]) {
+            color[i] = Color;
+            used[i] = true;
+            fetched[i] = false;
+            return i;
+            }
+         }
+     esyslog(LOG_ERR, "ERROR: too many different colors used in palette");
+     full = true;
+     }
+  return 0;
+}
+
+void cPalette::Reset(void)
+{
+  for (int i = 0; i < numColors; i++)
+      used[i] = false;
+  full = false;
+}
+
+const eDvbColor *cPalette::Colors(int &FirstColor, int &LastColor)
+{
+  for (FirstColor = 0; FirstColor < numColors; FirstColor++) {
+      if (!fetched[FirstColor]) {
+         for (LastColor = FirstColor; LastColor < numColors && !fetched[LastColor]; LastColor++)
+             fetched[LastColor] = true;
+         LastColor--; // the loop ended one past the last one!
+         return &color[FirstColor];
+         }
+      }
+  return NULL;
+}
+
+void cPalette::Take(const cPalette &Palette, tIndexes *Indexes)
+{
+  for (int i = 0; i < Palette.numColors; i++) {
+      if (Palette.used[i]) {
+         int n = Index(Palette.color[i]);
+         if (Indexes)
+            (*Indexes)[i] = n;
+         }
+      }
+}
+
 // --- cBitmap ---------------------------------------------------------------
 
-cBitmap::cBitmap(int Width, int Height)
+cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
+:cPalette(Bpp)
 {
   width = Width;
   height = Height;
+  clearWithBackground = ClearWithBackground;
   bitmap = NULL;
   fontType = fontOsd;
   font = NULL;
@@ -27,7 +98,7 @@ cBitmap::cBitmap(int Width, int Height)
      bitmap = new char[width * height];
      if (bitmap) {
         Clean();
-        memset(bitmap, clrTransparent, width * height);
+        memset(bitmap, 0x00, width * height);
         SetFont(fontOsd);
         }
      else
@@ -54,9 +125,38 @@ eDvbFont cBitmap::SetFont(eDvbFont Font)
   return oldFont;
 }
 
-bool cBitmap::Dirty(void)
+bool cBitmap::Dirty(int &x1, int &y1, int &x2, int &y2)
 {
-  return dirtyX2 >= 0;
+  if (dirtyX2 >= 0) {
+     //XXX Workaround: apparently the bitmap sent to the driver always has to be a multiple
+     //XXX of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
+     //TODO Fix driver (should be able to handle any size bitmaps!)
+     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && ((dirtyX2 - dirtyX1) & 7) != 7) {
+           if (dirtyX2 < width - 1)
+              dirtyX2++;
+           else if (dirtyX1 > 0)
+              dirtyX1--;
+           }
+     //XXX "... / 2" <==> Bpp???
+     while ((dirtyY1 > 0 || dirtyY2 < height - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
+           if (dirtyY2 < height - 1)
+              dirtyY2++;
+           else if (dirtyY1 > 0)
+              dirtyY1--;
+           }
+     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
+           if (dirtyX2 < width - 1)
+              dirtyX2++;
+           else if (dirtyX1 > 0)
+              dirtyX1--;
+           }
+     x1 = dirtyX1;
+     y1 = dirtyY1;
+     x2 = dirtyX2;
+     y2 = dirtyY2;
+     return true;
+     }
+  return false;
 }
 
 void cBitmap::Clean(void)
@@ -67,12 +167,12 @@ void cBitmap::Clean(void)
   dirtyY2 = -1;
 }
 
-void cBitmap::SetPixel(int x, int y, eDvbColor Color)
+void cBitmap::SetIndex(int x, int y, char Index)
 {
   if (bitmap) {
      if (0 <= x && x < width && 0 <= y && y < height) {
-        if (bitmap[width * y + x] != Color) {
-           bitmap[width * y + x] = Color;
+        if (bitmap[width * y + x] != Index) {
+           bitmap[width * y + x] = Index;
            if (dirtyX1 > x)  dirtyX1 = x;
            if (dirtyY1 > y)  dirtyY1 = y;
            if (dirtyX2 < x)  dirtyX2 = x;
@@ -82,12 +182,19 @@ void cBitmap::SetPixel(int x, int y, eDvbColor Color)
      }
 }
 
+void cBitmap::SetPixel(int x, int y, eDvbColor Color)
+{
+  SetIndex(x, y, Index(Color));
+}
+
 void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
 {
   if (bitmap && Bitmap.bitmap) {
+     tIndexes Indexes;
+     Take(Bitmap, &Indexes);
      for (int ix = 0; ix < Bitmap.width; ix++) {
          for (int iy = 0; iy < Bitmap.height; iy++)
-             SetPixel(x + ix, y + iy, eDvbColor(Bitmap.bitmap[Bitmap.width * iy + ix]));
+             SetIndex(x + ix, y + iy, Indexes[Bitmap.bitmap[Bitmap.width * iy + ix]]);
          }
      }
 }
@@ -105,6 +212,8 @@ int cBitmap::Width(const char *s)
 void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
 {
   if (bitmap) {
+     char fg = Index(ColorFg);
+     char bg = Index(ColorBg);
      int h = font->Height(s);
      while (s && *s) {
            const cFont::tCharData *CharData = font->CharData(*s++);
@@ -113,7 +222,7 @@ void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor Col
            for (int row = 0; row < h; row++) {
                cFont::tPixelData PixelData = CharData->lines[row];
                for (int col = CharData->width; col-- > 0; ) {
-                   SetPixel(x + col, y + row, (PixelData & 1) ? ColorFg : ColorBg);
+                   SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
                    PixelData >>= 1;
                    }
                }
@@ -125,39 +234,109 @@ void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor Col
 void cBitmap::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
 {
   if (bitmap) {
+     char c = Index(Color);
      for (int y = y1; y <= y2; y++)
          for (int x = x1; x <= x2; x++)
-             SetPixel(x, y, Color);
+             SetIndex(x, y, c);
      }
 }
 
 void cBitmap::Clear(void)
 {
-  Fill(0, 0, width - 1, height - 1, clrBackground);
+  Reset();
+  if (clearWithBackground)
+     Fill(0, 0, width - 1, height - 1, clrBackground);
+}
+
+const char *cBitmap::Data(int x, int y)
+{
+  return &bitmap[y * width + x];
+}
+
+// --- cWindow ---------------------------------------------------------------
+
+class cWindow : public cBitmap {
+private:
+  int x0, y0;
+  bool shown;
+public:
+  cWindow(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true);
+  int X0(void) { return x0; }
+  int Y0(void) { return y0; }
+  bool Shown(void) { bool s = shown; shown = true; return s; }
+  bool Contains(int x, int y);
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
+  const char *Data(int x, int y);
+  };
+
+cWindow::cWindow(int x, int y, int w, int h, int Bpp, bool ClearWithBackground)
+:cBitmap(w, h, Bpp, ClearWithBackground)
+{
+  x0 = x;
+  y0 = y;
+  shown = false;
+}
+
+bool cWindow::Contains(int x, int y)
+{
+  x -= x0;
+  y -= y0;
+  return x >= 0 && y >= 0 && x < width && y < height;
+}
+
+void cWindow::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+{
+  cBitmap::Fill(x1 - x0, y1 - y0, x2 - x0, y2 - y0, Color);
+}
+
+void cWindow::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+  cBitmap::SetBitmap(x - x0, y - y0, Bitmap);
+}
+
+void cWindow::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
+{
+  cBitmap::Text(x - x0, y - y0, s, ColorFg, ColorBg);
+}
+
+const char *cWindow::Data(int x, int y)
+{
+  return cBitmap::Data(x, y);
 }
 
 // --- cDvbOsd ---------------------------------------------------------------
 
-cDvbOsd::cDvbOsd(int VideoDev, int x1, int y1, int x2, int y2, int Bpp)
-:cBitmap(x2 - x1 + 1, y2 - y1 + 1)
+cDvbOsd::cDvbOsd(int VideoDev, int x, int y, int w, int h, int Bpp)
 {
   videoDev = VideoDev;
-  if (videoDev >= 0)
-     Cmd(OSD_Open, Bpp, x1, y1, x2, y2);
+  numWindows = 0;
+  x0 = x;
+  y0 = y;
+  if (videoDev >= 0) {
+     if (w > 0 && h > 0)
+        Create(0, 0, w, h, Bpp);
+     }
   else
      esyslog(LOG_ERR, "ERROR: illegal video device handle (%d)!", videoDev);
 }
 
 cDvbOsd::~cDvbOsd()
 {
-  if (videoDev >= 0)
-     Cmd(OSD_Close);
+  if (videoDev >= 0) {
+     while (numWindows > 0) {
+           Cmd(OSD_SetWindow, 0, numWindows--);
+           Cmd(OSD_Close);
+           delete window[numWindows];
+           }
+     }
 }
 
 void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
   if (videoDev >= 0) {
-     struct drawcmd dc;
+     osd_cmd_t dc;
      dc.cmd   = cmd;
      dc.color = color;
      dc.x0    = x0;
@@ -169,41 +348,120 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      sigset_t set, oldset;
      sigfillset(&set);
      sigprocmask(SIG_BLOCK, &set, &oldset);
-     ioctl(videoDev, VIDIOCSOSDCOMMAND, &dc);
-     usleep(10); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
-                 // XXX and sometimes the OSD was no longer displayed).
-                 // XXX Increase the value if the problem still persists on your particular system.
-                 // TODO Check if this is still necessary with driver versions after 0.7.
+     ioctl(videoDev, OSD_SEND_CMD, &dc);
+     usleep(5000); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
+                   // XXX and sometimes the OSD was no longer displayed).
+                   // XXX Increase the value if the problem still persists on your particular system.
+                   // TODO Check if this is still necessary with driver versions after 0.7.
      sigprocmask(SIG_SETMASK, &oldset, NULL);
      }
 }
 
-void cDvbOsd::Flush(void)
+bool cDvbOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, eDvbColor Color0, eDvbColor Color1, eDvbColor Color2, eDvbColor Color3)
 {
-  if (Dirty()) {
-     //XXX Workaround: apparently the bitmap sent to the driver always has to be a multiple
-     //XXX of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
-     //TODO Fix driver (should be able to handle any size bitmaps!)
-     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && ((dirtyX2 - dirtyX1) & 7) != 7) {
-           if (dirtyX2 < width - 1)
-              dirtyX2++;
-           else if (dirtyX1 > 0)
-              dirtyX1--;
-           }
-     while ((dirtyY1 > 0 || dirtyY2 < height - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
-           if (dirtyY2 < height - 1)
-              dirtyY2++;
-           else if (dirtyY1 > 0)
-              dirtyY1--;
+  /* TODO XXX
+     - check that no two windows overlap
+  */
+  if (numWindows < MAXNUMWINDOWS) {
+     if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
+        if ((w & 0x03) != 0) {
+           w += 4 - (w & 0x03);
+           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
            }
-     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
-           if (dirtyX2 < width - 1)
-              dirtyX2++;
-           else if (dirtyX1 > 0)
-              dirtyX1--;
+        cWindow *win = new cWindow(x, y, w, h, Bpp, ClearWithBackground);
+        if (Color0 != clrTransparent) {
+           win->Index(Color0);
+           win->Index(Color1);
+           win->Index(Color2);
+           win->Index(Color3);
+           win->Reset();
            }
-     Cmd(OSD_SetBlock, width, dirtyX1, dirtyY1, dirtyX2, dirtyY2, &bitmap[dirtyY1 * width + dirtyX1]);
-     Clean();
+        window[numWindows++] = win;
+        Cmd(OSD_SetWindow, 0, numWindows);
+        Cmd(OSD_Open, Bpp, x0 + x, y0 + y, x0 + x + w - 1, y0 + y + h - 1, (void *)1); // initially hidden!
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: illegal OSD parameters");
      }
+  else
+     esyslog(LOG_ERR, "ERROR: too many OSD windows");
+  return false;
+}
+
+cWindow *cDvbOsd::GetWindow(int x, int y)
+{
+  for (int i = 0; i < numWindows; i++) {
+      if (window[i]->Contains(x, y))
+         return window[i];
+      }
+  return NULL;
+}
+
+void cDvbOsd::Flush(void)
+{
+  for (int i = 0; i < numWindows; i++) {
+      int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+      if (window[i]->Dirty(x1, y1, x2, y2)) {
+         Cmd(OSD_SetWindow, 0, i + 1);
+         int FirstColor = 0, LastColor = 0;
+         const eDvbColor *pal;
+         while ((pal = window[i]->Colors(FirstColor, LastColor)) != NULL)
+               Cmd(OSD_SetPalette, FirstColor, LastColor, 0, 0, 0, pal);
+         Cmd(OSD_SetBlock, window[i]->Width(), x1, y1, x2, y2, window[i]->Data(x1, y1));
+         window[i]->Clean();
+         }
+      }
+  // Showing the windows in a separate loop to avoid seeing them come up one after another
+  for (int i = 0; i < numWindows; i++) {
+      if (!window[i]->Shown()) {
+         Cmd(OSD_SetWindow, 0, i + 1);
+         Cmd(OSD_MoveWindow, 0, x0 + window[i]->X0(), y0 + window[i]->Y0());
+         }
+      }
+}
+
+void cDvbOsd::Clear(void)
+{
+  for (int i = 0; i < numWindows; i++)
+      window[i]->Clear();
+}
+
+void cDvbOsd::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+{
+  cWindow *w = GetWindow(x1, y1);
+  if (w)
+     w->Fill(x1, y1, x2, y2, Color);
+}
+
+void cDvbOsd::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+  cWindow *w = GetWindow(x, y);
+  if (w)
+     w->SetBitmap(x, y, Bitmap);
+}
+
+int cDvbOsd::Width(unsigned char c)
+{
+  return numWindows ? window[0]->Width(c) : 0;
+}
+
+int cDvbOsd::Width(const char *s)
+{
+  return numWindows ? window[0]->Width(s) : 0;
+}
+
+eDvbFont cDvbOsd::SetFont(eDvbFont Font)
+{
+  eDvbFont oldFont = Font;
+  for (int i = 0; i < numWindows; i++)
+      oldFont = window[i]->SetFont(Font);
+  return oldFont;
+}
+
+void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground)
+{
+  cWindow *w = GetWindow(x, y);
+  if (w)
+     w->Text(x, y, s, ColorFg, ColorBg);
 }
 
diff --git a/dvbosd.h b/dvbosd.h
index eefdb621e..5039a9159 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,35 +4,26 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.5 2000/12/09 10:32:47 kls Exp $
+ * $Id: dvbosd.h 1.8 2001/07/28 16:22:32 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
-// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
-typedef unsigned int __u32;
-typedef unsigned short __u16;
-typedef unsigned char __u8;
-
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
 #include <ncurses.h>
 #endif
+#include <ost/osd.h>
 #include <stdio.h>
-#include <dvb.h>
 #include "font.h"
 
-enum eDvbColor { 
-#ifndef DEBUG_OSD
-  clrTransparent,
-#endif
-  clrBackground,
+#define MAXNUMCOLORS 16
+
+enum eDvbColor {
 #ifdef DEBUG_OSD
+  clrBackground,
   clrTransparent = clrBackground,
   clrBlack = clrBackground,
-#else
-  clrBlack,
-#endif
   clrRed,
   clrGreen,
   clrYellow,
@@ -40,39 +31,88 @@ enum eDvbColor {
   clrMagenta,
   clrCyan,
   clrWhite,
+#else
+  clrTransparent = 0x00000000,
+  clrBackground  = 0x7F000000, // 50% gray
+  clrBlack       = 0xFF000000,
+  clrRed         = 0xFF1414FC,
+  clrGreen       = 0xFF24FC24,
+  clrYellow      = 0xFF24C0FC,
+  clrMagenta     = 0xFFFC00B0,
+  clrBlue        = 0xFFFC0000,
+  clrCyan        = 0xFFFCFC00,
+  clrWhite       = 0xFFFCFCFC,
+#endif
+  };
+
+class cPalette {
+private:
+  eDvbColor color[MAXNUMCOLORS];
+  int maxColors, numColors;
+  bool used[MAXNUMCOLORS];
+  bool fetched[MAXNUMCOLORS];
+  bool full;
+protected:
+  typedef unsigned char tIndexes[MAXNUMCOLORS];
+public:
+  cPalette(int Bpp);
+  int Index(eDvbColor Color);
+  void Reset(void);
+  const eDvbColor *Colors(int &FirstColor, int &LastColor);
+  void Take(const cPalette &Palette, tIndexes *Indexes = NULL);
   };
 
-class cBitmap {
+class cBitmap : public cPalette {
 private:
   cFont *font;
   eDvbFont fontType;
+  void SetIndex(int x, int y, char Index);
+  char *bitmap;
+  bool clearWithBackground;
 protected:
   int width, height;
-  char *bitmap;
   int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
-  void Clean(void);
 public:
-  cBitmap(int Width, int Height);
+  cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground = true);
   virtual ~cBitmap();
   eDvbFont SetFont(eDvbFont Font);
-  bool Dirty(void);
+  bool Dirty(int &x1, int &y1, int &x2, int &y2);
   void SetPixel(int x, int y, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  int Width(void) { return width; }
   int Width(unsigned char c);
   int Width(const char *s);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void Clean(void);
   void Clear(void);
+  const char *Data(int x, int y);
   };
 
-class cDvbOsd : public cBitmap {
+#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
+
+class cWindow;
+
+class cDvbOsd {
 private:
   int videoDev;
+  int numWindows;
+  int x0, y0;
+  cWindow *window[MAXNUMWINDOWS];
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
+  cWindow *GetWindow(int x, int y);
 public:
-  cDvbOsd(int VideoDev, int x1, int y1, int x2, int y2, int Bpp);
+  cDvbOsd(int VideoDev, int x, int y, int w = -1, int h = -1, int Bpp = -1);
   ~cDvbOsd();
+  bool Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, eDvbColor Color0 = clrTransparent, eDvbColor Color1 = clrTransparent, eDvbColor Color2 = clrTransparent, eDvbColor Color3 = clrTransparent);
   void Flush(void);
+  void Clear(void);
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  int Width(unsigned char c);
+  int Width(const char *s);
+  eDvbFont SetFont(eDvbFont Font);
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   };
 
 #endif //__DVBOSD_H
diff --git a/eit.c b/eit.c
index 6cbe504d3..3de610209 100644
--- a/eit.c
+++ b/eit.c
@@ -13,17 +13,16 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.15 2001/04/01 15:36:09 kls Exp $
+ * $Id: eit.c 1.16 2001/05/26 10:58:01 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
 #include <ctype.h>
-#include <dvb_comcode.h>
-#include <dvb_v4l.h>
 #include <fcntl.h>
 #include <fstream.h>
 #include <iomanip.h>
 #include <iostream.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1108,31 +1107,43 @@ cMutex cSIProcessor::schedulesMutex;
 /**  */
 cSIProcessor::cSIProcessor(const char *FileName)
 {
+   fileName = strdup(FileName);
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
    useTStime = false;
    filters = NULL;
-   if ((fsvbi = open(FileName, O_RDONLY)) >= 0)
-   {
-      if (!numSIProcessors++) // the first one creates it
-         schedules = new cSchedules;
-      filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
-   }
-   else
-      LOG_ERROR_STR(FileName);
+   if (!numSIProcessors++) // the first one creates it
+      schedules = new cSchedules;
+   filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
+   SetStatus(true);
+   Start();
 }
 
 cSIProcessor::~cSIProcessor()
 {
-   if (fsvbi >= 0)
+   active = false;
+   Cancel(3);
+   ShutDownFilters();
+   delete filters;
+   if (!--numSIProcessors) // the last one deletes it
+      delete schedules;
+   delete fileName;
+}
+
+void cSIProcessor::SetStatus(bool On)
+{
+   LOCK_THREAD;
+   schedulesMutex.Lock();
+   ShutDownFilters();
+   if (On)
    {
-      active = false;
-      Cancel(3);
-      ShutDownFilters();
-      delete filters;
-      if (!--numSIProcessors) // the last one deletes it
-         delete schedules;
-      close(fsvbi);
+      AddFilter(0x14, 0x70);  // TDT
+      AddFilter(0x14, 0x73);  // TOT
+      AddFilter(0x12, 0x4e);  // event info, actual TS, present/following
+      AddFilter(0x12, 0x4f);  // event info, other TS, present/following
+      AddFilter(0x12, 0x50);  // event info, actual TS, schedule
+      AddFilter(0x12, 0x60);  // event info, other TS, schedule
    }
+   schedulesMutex.Unlock();
 }
 
 /** use the vbi device to parse all relevant SI
@@ -1140,19 +1151,10 @@ information and let the classes corresponding
 to the tables write their information to the disk */
 void cSIProcessor::Action()
 {
-   if (fsvbi < 0) {
-      esyslog(LOG_ERR, "cSIProcessor::Action() called without open file - returning");
-      return;
-      }
-
    dsyslog(LOG_INFO, "EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 
-   unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
-   unsigned int seclen;
-   unsigned int pid;
    time_t lastCleanup = time(NULL);
    time_t lastDump = time(NULL);
-   struct pollfd pfd;
 
    active = true;
 
@@ -1187,100 +1189,123 @@ void cSIProcessor::Action()
          }
       }
 
-      /* wait data become ready from the bitfilter */
-      pfd.fd = fsvbi;
-      pfd.events = POLLIN;
-      if(poll(&pfd, 1, 1000) != 0) /* timeout is 5 secs */
+      // set up pfd structures for all active filter
+      pollfd pfd[MAX_FILTERS];
+      int NumUsedFilters = 0;
+      for (int a = 0; a < MAX_FILTERS ; a++)
       {
-         // fprintf(stderr, "<data>\n");
-         /* read section */
-         read(fsvbi, buf, 8);
-         seclen = (buf[6] << 8) | buf[7];
-         pid = (buf[4] << 8) | buf[5];
-         read(fsvbi, buf, seclen);
-
-         //dsyslog(LOG_INFO, "Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
+         if (filters[a].inuse)
+         {
+            pfd[NumUsedFilters].fd = filters[a].handle;
+            pfd[NumUsedFilters].events = POLLIN;
+            NumUsedFilters++;
+         }
+      }
 
-         switch (pid)
+      // wait until data becomes ready from the bitfilter
+      if (poll(pfd, NumUsedFilters, 1000) != 0)
+      {
+         for (int a = 0; a < NumUsedFilters ; a++)
          {
-            case 0x14:
-               if (buf[0] == 0x70)
+            if (pfd[a].revents & POLLIN)
+            {
+               /* read section */
+               unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
+               if (read(filters[a].handle, buf, 3) == 3)
                {
-                  if (useTStime)
+                  int seclen = ((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF);
+                  int pid = filters[a].pid;
+                  int n = read(filters[a].handle, buf + 3, seclen);
+                  if (n == seclen)
                   {
-                     cTDT ctdt((tdt_t *)buf);
-                     ctdt.SetSystemTime();
+                     seclen += 3;
+                     //dsyslog(LOG_INFO, "Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
+                     switch (pid)
+                     {
+                        case 0x14:
+                           if (buf[0] == 0x70)
+                           {
+                              if (useTStime)
+                              {
+                                 cTDT ctdt((tdt_t *)buf);
+                                 ctdt.SetSystemTime();
+                              }
+                           }
+                              /*XXX this comes pretty often:
+                           else
+                              dsyslog(LOG_INFO, "Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
+                              XXX*/
+                           break;
+
+                        case 0x12:
+                           if (buf[0] != 0x72)
+                           {
+                              LOCK_THREAD;
+
+                              schedulesMutex.Lock();
+                              cEIT ceit(buf, seclen, schedules);
+                              ceit.ProcessEIT();
+                              schedulesMutex.Unlock();
+                           }
+                           else
+                              dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
+                           break;
+
+                        default:
+                           break;
+                     }
                   }
+                  else
+                     dsyslog(LOG_INFO, "read incomplete section - seclen = %d, n = %d", seclen, n);
                }
-                  /*XXX this comes pretty often:
-               else
-                  dsyslog(LOG_INFO, "Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
-                  XXX*/
-               break;
-
-            case 0x12:
-               if (buf[0] != 0x72)
-               {
-                  LOCK_THREAD;
-
-                  schedulesMutex.Lock();
-                  cEIT ceit(buf, seclen, schedules);
-                  ceit.ProcessEIT();
-                  schedulesMutex.Unlock();
-               }
-               else
-                  dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
-               break;
-
-            default:
-               break;
+            }
          }
       }
-      else
-      {
-         LOCK_THREAD;
-
-         //XXX this comes pretty often
-         //isyslog(LOG_INFO, "Received timeout from poll, refreshing filters\n");
-         RefreshFilters();
-      }
-//    WakeUp();
    }
+
+   dsyslog(LOG_INFO, "EIT processing thread ended (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 }
 
 /** Add a filter with packet identifier pid and
 table identifer tid */
 bool cSIProcessor::AddFilter(u_char pid, u_char tid)
 {
-   if (fsvbi < 0)
-      return false;
-
-   int section = ((int)tid << 8) | 0x00ff;
-
-   struct bitfilter filt = {
-      pid,
-      { section, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000},
-        SECTION_CONTINUOS, 0,
-        FILTER_MEM,
-        {},
-      };
-
-   if (ioctl(fsvbi, VIDIOCSBITFILTER, &filt) < 0)
-      return false;
+   dmxSctFilterParams sctFilterParams;
+   sctFilterParams.pid = pid;
+   memset(&sctFilterParams.filter.filter, 0, DMX_FILTER_SIZE);
+   memset(&sctFilterParams.filter.mask, 0, DMX_FILTER_SIZE);
+   sctFilterParams.timeout = 0;
+   sctFilterParams.flags = DMX_IMMEDIATE_START;
+   sctFilterParams.filter.filter[0] = tid;
+   sctFilterParams.filter.mask[0] = 0xFF;
 
    for (int a = 0; a < MAX_FILTERS; a++)
    {
-      if (filters[a].inuse == false)
+      if (!filters[a].inuse)
       {
          filters[a].pid = pid;
          filters[a].tid = tid;
-         filters[a].handle = filt.handle;
-         filters[a].inuse = true;
-         // dsyslog(LOG_INFO, "  Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+         if ((filters[a].handle = open(fileName, O_RDWR | O_NONBLOCK)) >= 0)
+         {
+            if (ioctl(filters[a].handle, DMX_SET_FILTER, &sctFilterParams) >= 0)
+               filters[a].inuse = true;
+            else
+            {
+               esyslog(LOG_ERR, "ERROR: can't set filter");
+               close(filters[a].handle);
+               return false;
+            }
+            // dsyslog(LOG_INFO, "  Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+         }
+         else
+         {
+            esyslog(LOG_ERR, "ERROR: can't open filter handle");
+            return false;
+         }
          return true;
       }
    }
+   esyslog(LOG_ERR, "ERROR: too many filters");
 
    return false;
 }
@@ -1294,27 +1319,19 @@ bool cSIProcessor::SetUseTSTime(bool use)
 }
 
 /**  */
-bool cSIProcessor::ShutDownFilters()
+bool cSIProcessor::ShutDownFilters(void)
 {
-   if (fsvbi < 0)
-      return false;
-
-   bool ret = true;
-
    for (int a = 0; a < MAX_FILTERS; a++)
    {
-      if (filters[a].inuse == true)
+      if (filters[a].inuse)
       {
-         if (ioctl(fsvbi, VIDIOCSSHUTDOWNFILTER, &filters[a].handle) < 0)
-            ret = false;
-
+         close(filters[a].handle);
          // dsyslog(LOG_INFO, "Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
-
          filters[a].inuse = false;
       }
    }
 
-   return ret;
+   return true; // there's no real 'boolean' to return here...
 }
 
 /** */
@@ -1323,25 +1340,3 @@ bool cSIProcessor::SetCurrentServiceID(unsigned short servid)
   LOCK_THREAD;
   return schedules ? schedules->SetCurrentServiceID(servid) : false;
 }
-
-/**  */
-bool cSIProcessor::RefreshFilters()
-{
-   if (fsvbi < 0)
-      return false;
-
-   bool ret = true;
-
-   ret = ShutDownFilters();
-
-   for (int a = 0; a < MAX_FILTERS; a++)
-   {
-      if (filters[a].inuse == false && filters[a].pid != 0 && filters[a].tid != 0)
-      {
-         if (!AddFilter(filters[a].pid, filters[a].tid))
-            ret = false;
-      }
-   }
-
-   return ret;
-}
diff --git a/eit.h b/eit.h
index 3d491935c..e6bbd13e6 100644
--- a/eit.h
+++ b/eit.h
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.6 2001/04/01 15:14:12 kls Exp $
+ * $Id: eit.h 1.7 2001/05/25 12:56:53 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -129,16 +129,16 @@ class cSIProcessor : public cThread {
   bool masterSIProcessor;
   bool useTStime;
   SIP_FILTER *filters;
-  int fsvbi;
+  char *fileName;
   bool active;
-  bool RefreshFilters(void);
   void Action(void);
+  bool AddFilter(u_char pid, u_char tid);
+  bool ShutDownFilters(void);
 public:
   cSIProcessor(const char *FileName);
   ~cSIProcessor();
+  void SetStatus(bool On);
   bool SetUseTSTime(bool use);
-  bool AddFilter(u_char pid, u_char tid);
-  bool ShutDownFilters(void);
   bool SetCurrentServiceID(unsigned short servid);
   const cSchedules *Schedules(void) { return schedules; }
   };
diff --git a/i18n.c b/i18n.c
index b2c321aa2..571eea92d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,11 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.16 2001/03/31 09:58:14 kls Exp $
+ * $Id: i18n.c 1.26 2001/07/27 13:32:43 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
  * Dutch     translations provided by Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
+ * Portugese translations provided by Paulo Manuel Martins Lopes <pmml@netvita.pt>
+ * French    translations provided by Jean-Claude Repetto <jc@repetto.org>
+ * Norwegian translations provided by J�rgen Tvedt <pjtvedt@online.no>
  *
  */
 
@@ -49,7 +52,7 @@
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 5;
+const int NumLanguages = 8;
 
 typedef const char *tPhrase[NumLanguages];
 
@@ -60,6 +63,9 @@ const tPhrase Phrases[] = {
     "Slovenski",
     "Italiano",
     "Nederlands",
+    "Portugues",
+    "Fran�ais",
+    "Norsk",
   },
   // Menu titles:
   { "Main",
@@ -67,84 +73,126 @@ const tPhrase Phrases[] = {
     "Glavni meni",
     "Principale",
     "Hoofdmenu",
+    "Principal",
+    "Menu",
+    "Hovedmeny",
   },
   { "Schedule",
     "Programm",
     "Urnik",
     "Programmi",
     "Gids",
+    "Programa",
+    "Programmes",
+    "Programmer",
   },
   { "Channels",
     "Kan�le",
     "Kanali",
     "Canali",
     "Kanalen",
+    "Canal",
+    "Cha�nes",
+    "Kanaler",
   },
   { "Timers",
     "Timer",
     "Termini",
     "Timer",
     "Timers",
+    "Alarmes",
+    "Programmation",
+    "Timer",
   },
   { "Recordings",
     "Aufzeichnungen",
     "Posnetki",
     "Registrazioni",
     "Opnames",
+    "Gravacoes",
+    "Enregistrements",
+    "Opptak",
   },
   { "Setup",
     "Einstellungen",
     "Nastavitve",
     "Opzioni",
     "Instellingen",
+    "Configurar",
+    "Configuration",
+    "Konfigurasjon",
   },
   { "Commands",
     "Befehle",
     "Ukazi",
     "Comandi",
     "Commando's",
+    "Comandos",
+    "Commandes",
+    "Kommandoer",
   },
   { "Edit Channel",
     "Kanal Editieren",
     "Uredi kanal",
     "Modifica canale",
     "Kanaal aanpassen",
+    "Modificar Canal",
+    "Modifier une cha�ne",
+    "Editer Kanal",
   },
   { "Edit Timer",
     "Timer Editieren",
     "Uredi termin",
     "Modifica Timer",
     "Timer veranderen",
+    "Modificar Alarme",
+    "Changer la programmation",
+    "Editer Timer",
   },
   { "Event",
     "Sendung",
     "Oddaja",
     "Eventi",
     "Uitzending",
+    "Evento",
+    "Ev�nement",
+    "Hendelse"
   },
   { "Summary",
     "Inhalt",
     "Vsebina",
     "Sommario",
     "Inhoud",
+    "Resumo",
+    "R�sum�",
+    "Sammendrag",
   },
   { "Schedule - %s",
     "Programm - %s",
     "Urnik - %s",
     "Programma - %s",
     "Programma - %s",
+    "Programa - %s",
+    "Programmes - %s",
+    "Program Guide - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
     "Kaj je na sporedu?",
     "In programmazione",
     "Wat is er nu?",
+    "O que ver agora?",
+    "Programmes en cours",
+    "Hvilket program sendes n�?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
     "Kaj sledi?",
     "Prossimi programmi",
     "Wat komt er hierna?",
+    "O que ver depois?",
+    "Prochains programmes",
+    "Hvilket program er neste?",
   },
   // Button texts (must not be more than 10 characters!):
   { "Edit",
@@ -152,78 +200,126 @@ const tPhrase Phrases[] = {
     "Uredi",
     "Modifica",
     "Verander",
+    "Modificar",
+    "Modifier",
+    "Editer",
   },
   { "New",
     "Neu",
     "Novo",
     "Nuovo",
     "Nieuw",
+    "Novo",
+    "Nouveau",
+    "Ny",
   },
   { "Delete",
     "L�schen",
     "Odstrani",
     "Cancella",
     "Verwijder",
+    "Apagar",
+    "Supprimer",
+    "Slett",
   },
   { "Mark",
     "Markieren",
     "Oznaci",
     "Marca",
     "Verplaats",
+    "Marcar",
+    "Marquer",
+    "Marker",
   },
   { "Record",
     "Aufnehmen",
     "Posnemi",
     "Registra",
     "Opnemen",
+    "Gravar",
+    "Enregistre",
+    "Ta opp",
   },
   { "Play",
     "Wiedergabe",
     "Predavajaj",
     "Riproduci",
     "Afspelen",
+    "Play",
+    "Lire",
+    "Spill av",
   },
   { "Rewind",
     "Anfang",
     "Zacetek",
     "Da inizio",
     "Spoel terug",
+    "Rebobinar",
+    "Retour",
+    "Spol tilbake",
   },
   { "Resume",
     "Weiter",
     "Nadaljuj",
     "Riprendi",
     "Verder",
+    "Continuar",
+    "Reprendre",
+    "Fortsett",
   },
   { "Summary",
     "Inhalt",
     "Vsebina",
     "Sommario",
     "Inhoud",
+    "Resumo",
+    "R�sum�",
+    "Sammendrag",
   },
   { "Switch",
     "Umschalten",
     "Preklopi",
     "Cambia",
     "Selecteer",
+    "Seleccionar",
+    "Regarder",
+    "Skift til",
   },
   { "Now",
     "Jetzt",
     "Sedaj",
     "Adesso",
     "Nu",
+    "Agora",
+    "Maintenant",
+    "N�",
   },
   { "Next",
     "N�chste",
     "Naslednji",
     "Prossimo",
     "Hierna",
+    "Proximo",
+    "Apr�s",
+    "Neste",
   },
   { "Schedule",
     "Programm",
     "Urnik",
     "Programma",
     "Programma",
+    "Programa",
+    "Programme",
+    "Programmer",
+  },
+  { "Language",
+    "Sprache",
+    "Jezik",
+    "Linguaggio",
+    "Taal",
+    "", // TODO
+    "Langue",
+    "Spr�k",
   },
   // Confirmations:
   { "Delete channel?",
@@ -231,30 +327,45 @@ const tPhrase Phrases[] = {
     "Odstrani kanal?",
     "Cancello il canale?",
     "Kanaal verwijderen?",
+    "Apagar o Canal?",
+    "Supprimer la cha�ne?",
+    "Slette kanal?",
   },
   { "Delete timer?",
     "Timer l�schen?",
     "Odstani termin?",
     "Cancello il timer?",
     "Timer verwijderen?",
+    "Apagar o Alarme?",
+    "Supprimer la programmation?",
+    "Slette timer?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
     "Odstrani posnetek?",
     "Cancello la registrazione?",
     "Opname verwijderen?",
+    "Apagar Gravac�o?",
+    "Supprimer l'enregistrement?",
+    "Slette opptak?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
     "Koncaj snemanje?",
     "Fermo la registrazione?",
     "Opname stoppen?",
+    "Parar Gravac�o?",
+    "Arr�ter l'enregistrement?",
+    "Stoppe opptak?",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
     "Zelite prekiniti urejanje?",
     "Annullo la modifica?",
     "Bewerken afbreken?",
+    "Cancelar Modificar?",
+    "Annuler les modifications?",
+    "Avbryte redigering",
   },
   // Channel parameters:
   { "Name",
@@ -262,60 +373,117 @@ const tPhrase Phrases[] = {
     "Naziv",
     "Nome",
     "Naam",
+    "Nome",
+    "Nom",
+    "Navn",
   },
   { "Frequency",
     "Frequenz",
     "Frekvenca",
     "Frequenza",
     "Frequentie",
+    "Frequencia",
+    "Fr�quence",
+    "Frekvens",
   },
   { "Polarization",
     "Polarisation",
     "Polarizacija",
     "Polarizzazione",
     "Polarisatie",
+    "Polarizacao",
+    "Polarisation",
+    "Polaritet",
   },
   { "Diseqc",
     "Diseqc",
     "Diseqc",
     "Diseqc",
     "Diseqc",
+    "Diseqc",
+    "Diseqc",
+    "Diseqc",
   },
   { "Srate",
     "Srate",
     "Srate",
     "Srate",
     "Srate",
+    "Srate",
+    "Srate",
+    "Symbolrate",
   },
   { "Vpid",
     "Vpid",
     "Vpid",
     "Vpid",
     "Vpid",
-  },
-  { "Apid",
-    "Apid",
-    "Apid",
-    "Apid",
-    "Apid",
+    "Vpid",
+    "Vpid",
+    "Video pid",
+  },
+  { "Apid1",
+    "Apid1",
+    "Apid1",
+    "Apid1",
+    "Apid1",
+    "Apid1",
+    "Apid1",
+    "Audio pid1",
+  },
+  { "Apid2",
+    "Apid2",
+    "Apid2",
+    "Apid2",
+    "Apid2",
+    "Apid2",
+    "Apid2",
+    "Audio pid2",
+  },
+  { "Dpid1",
+    "Dpid1",
+    "Dpid1",
+    "Dpid1",
+    "Dpid1",
+    "Dpid1",
+    "Dpid1",
+    "AC3 pid1",
+  },
+  { "Dpid2",
+    "Dpid2",
+    "Dpid2",
+    "Dpid2",
+    "Dpid2",
+    "Dpid2",
+    "Dpid2",
+    "AC3 pid2",
   },
   { "Tpid",
     "Tpid",
     "Tpid",
     "Tpid",
     "Tpid",
+    "Tpid",
+    "Tpid",
+    "Teletext pid",
   },
   { "CA",
     "CA",
     "CA",
     "CA",
     "CA",
+    "CA",
+    "CA",
+    "Kortleser",
   },
   { "Pnr",
     "Pnr",
     "Pnr",
     "Pnr",
     "Pnr",
+    "Pnr",
+    "Pnr",
+    "Program Id",
   },
   // Timer parameters:
   { "Active",
@@ -323,48 +491,72 @@ const tPhrase Phrases[] = {
     "Aktivno",
     "Attivo",
     "Actief",
+    "Activo",
+    "Actif",
+    "Aktiv",
   },
   { "Channel",
     "Kanal",
     "Kanal",
     "Canale",
     "Kanaal",
+    "Canal",
+    "Cha�ne",
+    "Kanal",
   },
   { "Day",
     "Tag",
     "Dan",
     "Giorno",
     "Dag",
+    "Dia",
+    "Jour",
+    "Dag",
   },
   { "Start",
     "Anfang",
     "Zacetek",
     "Inizio",
     "Begin",
+    "Inicio",
+    "D�but",
+    "Start",
   },
   { "Stop",
     "Ende",
     "Konec",
     "Fine",
     "Einde",
+    "Fim",
+    "Fin",
+    "Slutt",
   },
   { "Priority",
     "Priorit�t",
     "Prioriteta",
     "Priorita",
     "Prioriteit",
+    "Prioridade",
+    "Priorit�",
+    "Prioritet",
   },
   { "Lifetime",
     "Lebensdauer",
     "Veljavnost",
     "Durata",
     "Bewaarduur",
+    "Duracao",
+    "Dur�e de vie",
+    "Levetid",
   },
   { "File",
     "Datei",
     "Datoteka",
     "Nome",
     "Filenaam",
+    "Ficheiro",
+    "Fichier",
+    "Filnavn",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -372,54 +564,81 @@ const tPhrase Phrases[] = {
     "Urnik zaseda kanal!",
     "Canale occupato da un timer!",
     "Kanaal wordt gebruikt door een timer!",
+    "Canal a ser utilizador por um alarme!",
+    "Cette cha�ne est en cours d'utilisation!"
+    "Kanalen er i bruk av en timer!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
     "Ne morem preklopiti kanala!",
     "Impossibile cambiare canale!",
     "Kan geen kanaal wisselen!",
+    "Nao pode mudar de canal!",
+    "Impossible de changer de cha�ne!",
+    "Ikke mulig � skifte kanal!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
     "Snemanje po urniku!",
     "Registrazione di un timer in corso!",
     "Timer is aan het opnemen!",
+    "Alarme a gravar!",
+    "Enregistrement en cours!",
+    "Timer gj�r opptak!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
     "Napaka pri odstranjevanju posnetka!",
     "Errore durante la canc del filmato!",
     "Fout bij verwijderen opname!",
+    "Erro enquanto apagava uma gravacao!",
+    "Erreur de suppression de l'enregistrement!",
+    "Feil under sletting av opptak!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
     "*** Neznan kanal ***",
     "*** CANALE INVALIDO ***",
     "*** Ongeldig kanaal ***",
+    "*** Canal Invalido! ***",
+    "*** Cha�ne invalide! ***",
+    "*** Ugyldig Kanal! ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
     "Ni proste DVB naprave za snemanje!",
     "Nessuna card DVB disp per registrare!",
     "Geen vrije DVB kaart om op te nemen!",
+    "Nenhuma placa DVB disponivel para gravar!",
+    "Pas de carte DVB disponible pour l'enregistrement!",
+    "Ingen ledige DVB enheter for opptak!"
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
     "Zaklenjen kanal (snemanje)!",
     "Canale bloccato (in registrazione)!",
     "Kanaal geblokkeerd (neemt op)!",
+    "Canal bloqueado (a gravar)!",
+    "Cha�ne verrouill�e (enregistrement en cours)!",
+    "Kanalen er l�st (opptak)!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
     "Ne morem zaceti urejanja!",
     "Imposs iniziare processo di modifica",
     "Kan niet beginnen met bewerken!",
+    "Nao pode iniciar a modificacao!",
+    "Impossible de commencer le montage!",
+    "Kan ikke starte redigeringsprosessen!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
     "Urejanje je ze aktivno!",
     "Processo di modifica gia` attivo",
     "Bewerken is al actief!",
+    "Processo de modificacao ja activo!",
+    "Montage d�j� en cours!",
+    "Redigeringsprosessen er allerede aktiv!",
   },
   // Setup parameters:
   { "OSD-Language",
@@ -427,78 +646,186 @@ const tPhrase Phrases[] = {
     "OSD-jezik",
     "Linguaggio OSD",
     "OSD-taal",
+    "Linguagem OSD",
+    "Langue OSD",
+    "OSD Spr�k",
   },
   { "PrimaryDVB",
     "Prim�res Interface",
     "Primarna naprava",
     "Scheda DVB primaria",
     "Eerste DVB kaart",
+    "DVB primario",
+    "Premi�re carte DVB",
+    "Hoved DVB-enhet",
   },
   { "ShowInfoOnChSwitch",
     "Info zeigen",
     "Pokazi naziv kanala",
     "Vis info nel cambio canale",
     "Kanaal info tonen",
+    "Mostrar info ao mudar de Canal",
+    "Affichage progr. en cours",
+    "Info ved kanalskifte",
   },
   { "MenuScrollPage",
     "Seitenweise scrollen",
     "Drsni meni",
     "Scrolla pagina nel menu",
     "Scrollen per pagina",
+    "Scroll da pagina no menu",
+    "Affichage progr. suivant",
+    "Rask rulling i menyer",
   },
   { "MarkInstantRecord",
     "Direktaufz. markieren",
     "Oznaci direktno snemanje",
     "Marca la registrazione",
     "Direkte opnamen markeren",
+    "Marca de gravacao",
+    "Enregistrement imm�diat",
+    "Markere direkteopptak",
+  },
+  { "LnbSLOF",
+    "LnbSLOF",
+    "LnbSLOF",
+    "LnbSLOF",
+    "LnbSLOF",
+    "LnbSLOF",
+    "LnbSLOF",
+    "LO-grensefrekvens",
   },
   { "LnbFrequLo",
     "Untere LNB-Frequenz",
     "Spodnja LNB-frek.",
     "Freq LO LNB",
     "Laagste LNB frequentie",
+    "Freq LO LNB",
+    "Fr�quence basse LNB",
+    "LO-frekvens i lavb�ndet",
   },
   { "LnbFrequHi",
     "Obere LNB-Frequenz",
     "Zgornja LNB-frek.",
     "Freq HI LNB",
     "Hoogste LNB frequentie",
+    "Freq HI LNB",
+    "Fr�quence haute LNB",
+    "LO-frekvens i h�yb�ndet",
+  },
+  { "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
   },
   { "SetSystemTime",
     "Systemzeit stellen",
     "Sistemski cas",
     "Setta orario auto",
     "Systeem klok instellen",
+    "Ajustar relogio do sistema",
+    "Ajuster l'heure du syst�me",
+    "Juster system-klokken",
   },
   { "MarginStart",
     "Zeitpuffer bei Anfang",
     "Premor pred zacetkom",
     "Min margine inizio",
     "Tijd marge (begin)",
+    "Margem de inicio",
+    "Marge ant�rieure",
+    "Opptaks margin (start)",
   },
   { "MarginStop",
     "Zeitpuffer bei Ende",
     "Premor za koncem",
     "Min margine fine",
     "Tijd marge (eind)",
+    "Margem de fim",
+    "Marge post�rieure",
+    "Opptaks margin (slutt)",
   },
   { "EPGScanTimeout",
     "Zeit bis EPG Scan",
     "Cas do EPG pregleda",
     "Timeout EPG",
     "EPG-scan Timeout",
+    "Timeout EPG",
+    "Temps maxi EPG",
+    "Ledig tid f�r EPG-s�k",
   },
   { "SVDRPTimeout",
     "SVDRP Timeout",
     "", // TODO
     "Timeout SVDRP",
     "SVDRP Timeout",
+    "Timeout SVDRP",
+    "Temps maxi SVDRP",
+    "Ubrukt SVDRP-levetid",
   },
   { "PrimaryLimit",
     "Prim�r-Limit",
     "", // TODO
     "", // TODO
     "", // TODO
+    "Limite Primario",
+    "Premi�re limite",
+    "Prioritets grense HovedDVB",
+  },
+  { "DefaultPriority",
+    "Default Priorit�t",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Prioridade por defeito",
+    "Priorit� par d�faut",
+    "Normal prioritet (Timer)",
+  },
+  { "DefaultLifetime",
+    "Default Lebensdauer",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Validade por defeito",
+    "Dur�e de vie par d�faut",
+    "Normal levetid (Timer)",
+  },
+  { "VideoFormat",
+    "Video Format",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Format vid�o",
+    "TV Format",
+  },
+  { "ChannelInfoPos",
+    "Kanal Info Position",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "OSDwidth",
+    "OSD Breite",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "OSDheight",
+    "OSD H�he",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
   },
   // The days of the week:
   { "MTWTFSS",
@@ -506,6 +833,9 @@ const tPhrase Phrases[] = {
     "PTSCPSN",
     "DLMMGVS",
     "MDWDVZZ",
+    "STQQSSD",
+    "LMMJVSD",
+    "MTOTFLS",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -513,78 +843,117 @@ const tPhrase Phrases[] = {
     "Ucim se kod upravljalca",
     "Apprendimento tasti unita` remota",
     "Leren toetsen afstandsbediening",
+    "Aprender as teclas do telecomando",
+    "Apprentissage des codes de t�l�commande",
+    "L�re fjernkontrolltaster",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
     "Faza 1: Sprejemanje IR kode",
     "Fase 1: tipo ricevitore RC",
     "Fase 1: detecteren type afstandsbediening",
+    "Fase 1: detectar tipo de receptor",
+    "Phase 1: D�tection du type de code",
+    "Fase 1: Finne fjernkontroll-kodetype",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
     "Pritisnite tipko na upravljalcu",
     "Premere un tasto nell'unita` RC",
     "Druk op een willekeurige knop",
+    "Pressione qualquer tecla do telecomando", 
+    "Appuyer sur une touche de la t�l�commande",
+    "Trykk en av tastene p� fjernkontrollen",
   },
   { "RC code detected!",
     "FB Code erkannt!",
     "IR koda sprejeta!",
     "Codice RC rilevato!",
     "Afstandsbediening code herkend!",
+    "Codigo do telecomando detectado!",
+    "Code de la t�l�commande d�tect�!",
+    "Fjernkontroll-kodetype funnet!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
     "Ne pritiskajte tipk...",
     "Non premere alcun tasto...",
     "Druk niet op een knop...",
+    "Nao pressione nada...",
+    "Ne pas appuyer sur une touche ...",
+    "Ikke trykk p� noen av tastene...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
     "Faza 2: Ucenje posebnih kod",
     "Fase 2: Codici specifici dei tasti",
     "Fase 2: Leren specifieke toets-codes",
+    "Fase 2: A aprender codigos especificos",
+    "Phase 2: Apprentissage des codes des touches",
+    "Fase 2: L�re spesifikke tastekoder",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
     "Pritisnite tipko za '%s'",
     "Premere il tasto per '%s'",
     "Druk knop voor '%s'",
+    "Pressione tecla para '%s'",
+    "Appuyer sur la touche '%s'",
+    "Trykk tasten for '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
     "Pritisnite tipko 'Gor' za potrditev",
     "Premere 'Su' per confermare",
     "Druk 'Omhoog' om te bevestigen",
+    "Pressione 'Cima' para confirmar",
+    "Appuyer sur 'Haut' pour confirmer",
+    "Trykk 'Opp' for � bekrefte",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
     "Pritisnite tipko 'Dol' za nadaljevanje",
     "Premere 'Giu' per confermare",
     "Druk 'Omlaag' om verder te gaan",
+    "Pressione 'Baixo' para continuar",
+    "Appuyer sur 'Bas' pour continuer",
+    "Trykk Ned' for � fortsette",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
     "(pritisnite 'Gor' za nazaj)",
     "(premere 'Su' per tornare indietro)",
     "(druk 'Omhoog' om terug te gaan)",
+    "(Pressione 'Cima' para voltar)",
+    "(Appuyer sur 'Haut' pour revenir en arri�re)",
+    "(trykk 'Opp' for � g� tilbake)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
     "(pritisnite 'Dol' za konec)",
     "('Giu' per finire la definiz tasti)",
     "(Druk 'Omlaag' om te beeindigen)",
+    "(Pressione 'Baixo' para terminar a definicao)",
+    "(Appuyer sur 'Bas' pour terminer)",
+    "(trykk 'Ned' for � avslutte innl�ring)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
     "Faza 3: Shranjujem kodo",
     "Fase 3: Salvataggio key codes",
     "Fase 3: Opslaan toets codes",
+    "Fase 3: A Salvar os codigos das teclas",
+    "Phase 3: Sauvegarde des codes des touches",
+    "Fase 3: Lagre tastekoder",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
     "'Gor' za potrditev, 'Dol' za prekinitev",
     "'Su' per salvare, 'Giu' per annullare",
     "'Omhoog' te bewaren, 'Omlaag' voor annuleren",
+    "'Cima' para Salvar, 'Baixo' para Cancelar",
+    "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler",
+    "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
   },
   // Key names:
   { "Up",
@@ -592,66 +961,99 @@ const tPhrase Phrases[] = {
     "Gor",
     "Su",
     "Omhoog",
+    "Cima",
+    "Haut",
+    "Opp",
   },
   { "Down",
     "Ab",
     "Dol",
     "Giu",
     "Omlaag",
+    "Baixo",
+    "Bas",
+    "Ned",
   },
   { "Menu",
     "Men�",
     "Meni",
     "Menu",
     "Menu",
+    "Menu",
+    "Menu",
+    "Meny",
   },
   { "Ok",
     "Ok",
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
+    "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
     "Nazaj",
     "Indietro",
     "Terug",
+    "Voltar",
+    "Retour",
+    "Tilbake",
   },
   { "Left",
     "Links",
     "Levo",
     "Sinistra",
     "Links",
+    "Esquerda",
+    "Gauche",
+    "Venstre",
   },
   { "Right",
     "Rechts",
     "Desno",
     "Destra",
     "Rechts",
+    "Direita",
+    "Droite",
+    "H�yre",
   },
   { "Red",
     "Rot",
     "Rdeca",
     "Rosso",
     "Rood",
+    "Vermelho",
+    "Rouge",
+    "R�d",
   },
   { "Green",
     "Gr�n",
     "Zelena",
     "Verde",
     "Groen",
+    "Verde",
+    "Vert",
+    "Gr�nn",
   },
   { "Yellow",
     "Gelb",
     "Rumena",
     "Giallo",
     "Geel",
+    "Amarelo",
+    "Jaune",
+    "Gul",
   },
   { "Blue",
     "Blau",
     "Modra",
     "Blu",
     "Blauw",
+    "Azul",
+    "Bleu",
+    "Bl�",
   },
   // Miscellaneous:
   { "yes",
@@ -659,48 +1061,88 @@ const tPhrase Phrases[] = {
     "da",
     "si",
     "ja",
+    "sim",
+    "oui",
+    "ja",
   },
   { "no",
     "nein",
     "ne",
     "no",
     "nee",
+    "nao",
+    "non",
+    "nei",
+  },
+  { "top",
+    "oben",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "bottom",
+    "unten",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
     " Prekini ponavljanje",
     " Interrompi riproduzione",
     " Stop afspelen",
+    " Parar reproducao",
+    " Arr�ter la lecture",
+    " Stopp avspilling",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
     " Prekini shranjevanje ",
     " Interrompi registrazione ",
     " Stop opnemen ",
+    " Parar gravacao ",
+    " Arr�ter l'enregistrement ",
+    " Stopp opptak fra ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
     " Prekini urejanje",
     " Annulla modifiche",
     " Bewerken afbreken",
+    " Anular modificacao",
+    " Annuler le montage",
+    " Avbryt editering",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
     "Preklapljanje primarne naprave...",
     "Cambio su card DVB primaria...",
     "Eerste DVB-kaart wordt omgeschakeld...",
+    "A mudar placa DVB primaria...",
+    "Changement de carte DVB...",
+    "Bytter hoved DVB-enhet... ",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
     "Gor/Dol za novo poz. - Ok za premik",
     "Su/Giu per nuova posizione - OK per muovere",
     "Gebruik Omhoog/Omlaag - daarna Ok",
+    "Cima/Baixo para nova localizacao - Ok para mudar",
+    "Haut/Bas -> nouvelle place - OK -> d�placer",
+    "Opp/Ned for ny plass - OK for � flytte",
   },
   { "Editing process started",
     "Schnitt gestartet",
     "Urejanje se je zacelo",
     "Processo di modifica iniziato",
     "Bewerken is gestart",
+    "Processo de modificacao iniciado",
+    "Op�ration de montage lanc�e",
+    "Redigeringsprosess startet",
   },
   { NULL }
   };
diff --git a/interface.c b/interface.c
index 55cdb0b9c..03dca06f2 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.35 2001/02/18 10:46:13 kls Exp $
+ * $Id: interface.c 1.39 2001/07/28 14:57:52 kls Exp $
  */
 
 #include "interface.h"
@@ -44,8 +44,13 @@ cInterface::~cInterface()
 
 void cInterface::Open(int NumCols, int NumLines)
 {
-  if (!open++)
+  if (!open++) {
+     if (NumCols == 0)
+        NumCols = Setup.OSDwidth;
+     if (NumLines == 0)
+        NumLines = Setup.OSDheight;
      cDvbApi::PrimaryDvbApi->Open(width = NumCols, height = NumLines);
+     }
 }
 
 void cInterface::Close(void)
@@ -281,16 +286,17 @@ void cInterface::Title(const char *s)
 
 void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
-  ClearEol(0, -3, s ? BgColor : clrBackground);
+  int Line = (abs(height) == 1) ? 0 : -2;
+  ClearEol(0, Line, s ? BgColor : clrBackground);
   if (s)
-     Write(0, -3, s, FgColor, BgColor);
+     Write(0, Line, s, FgColor, BgColor);
 }
 
 void cInterface::Info(const char *s)
 {
-  Open();
+  Open(Setup.OSDwidth, -1);
   isyslog(LOG_INFO, "info: %s", s);
-  Status(s, clrWhite, clrGreen);
+  Status(s, clrBlack, clrGreen);
   Wait();
   Status(NULL);
   Close();
@@ -298,7 +304,7 @@ void cInterface::Info(const char *s)
 
 void cInterface::Error(const char *s)
 {
-  Open();
+  Open(Setup.OSDwidth, -1);
   esyslog(LOG_ERR, "ERROR: %s", s);
   Status(s, clrWhite, clrRed);
   Wait();
@@ -310,7 +316,7 @@ bool cInterface::Confirm(const char *s)
 {
   Open();
   isyslog(LOG_INFO, "confirm: %s", s);
-  Status(s, clrBlack, clrGreen);
+  Status(s, clrBlack, clrYellow);
   bool result = Wait(10) == kOk;
   Status(NULL);
   Close();
diff --git a/interface.h b/interface.h
index 50c376154..2b0e2f1ae 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.21 2000/12/09 10:48:41 kls Exp $
+ * $Id: interface.h 1.22 2001/07/27 11:38:01 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -32,7 +32,7 @@ class cInterface {
 public:
   cInterface(int SVDRPport = 0);
   ~cInterface();
-  void Open(int NumCols = MenuColumns, int NumLines = MenuLines);
+  void Open(int NumCols = 0, int NumLines = 0);
   void Close(void);
   int Width(void) { return width; }
   int Height(void) { return height; }
diff --git a/menu.c b/menu.c
index 09c180c47..30532a7d6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.70 2001/03/18 10:16:56 kls Exp $
+ * $Id: menu.c 1.88 2001/07/28 16:17:28 kls Exp $
  */
 
 #include "menu.h"
@@ -118,21 +118,24 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
 
 class cMenuEditBoolItem : public cMenuEditIntItem {
 protected:
+  const char *falseString, *trueString;
   virtual void Set(void);
 public:
-  cMenuEditBoolItem(const char *Name, int *Value);
+  cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString = NULL, const char *TrueString = NULL);
   };
 
-cMenuEditBoolItem::cMenuEditBoolItem(const char *Name, int *Value)
+cMenuEditBoolItem::cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString, const char *TrueString)
 :cMenuEditIntItem(Name, Value, 0, 1)
 {
+  falseString = FalseString ? FalseString : tr("no");
+  trueString = TrueString ? TrueString : tr("yes");
   Set();
 }
 
 void cMenuEditBoolItem::Set(void)
 {
   char buf[16];
-  snprintf(buf, sizeof(buf), "%s", *value ? tr("yes") : tr("no"));
+  snprintf(buf, sizeof(buf), "%s", *value ? trueString : falseString);
   SetValue(buf);
 }
 
@@ -274,7 +277,12 @@ cMenuEditTimeItem::cMenuEditTimeItem(const char *Name, int *Value)
 void cMenuEditTimeItem::Set(void)
 {
   char buf[10];
-  snprintf(buf, sizeof(buf), "%02d:%02d", hh, mm);
+  switch (pos) {
+    case 1:  snprintf(buf, sizeof(buf), "%01d-:--", hh / 10); break;
+    case 2:  snprintf(buf, sizeof(buf), "%02d:--", hh); break;
+    case 3:  snprintf(buf, sizeof(buf), "%02d:%01d-", hh, mm / 10); break;
+    default: snprintf(buf, sizeof(buf), "%02d:%02d", hh, mm);
+    }
   SetValue(buf);
 }
 
@@ -538,10 +546,13 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency, 10000, 13000)); //TODO exact limits???
      Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
      Add(new cMenuEditIntItem( tr("Diseqc"),       &data.diseqc, 0, 10)); //TODO exact limits???
-     Add(new cMenuEditIntItem( tr("Srate"),        &data.srate, 22000, 27500)); //TODO exact limits - toggle???
-     Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid, 0, 10000)); //TODO exact limits???
-     Add(new cMenuEditIntItem( tr("Apid"),         &data.apid, 0, 10000)); //TODO exact limits???
-     Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid, 0, 10000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("Srate"),        &data.srate, 22000, 30000)); //TODO exact limits - toggle???
+     Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid, 0, 0xFFFE));
+     Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0xFFFE));
+     Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0xFFFE));
+     Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0xFFFE));
+     Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0xFFFE));
+     Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid, 0, 0xFFFE));
      Add(new cMenuEditIntItem( tr("CA"),           &data.ca, 0, cDvbApi::NumDvbApis));
      Add(new cMenuEditIntItem( tr("Pnr"),          &data.pnr, 0));
      }
@@ -579,7 +590,7 @@ cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
   index = Index;
   channel = Channel;
   if (channel->groupSep)
-     SetColor(clrWhite, clrBlue);
+     SetColor(clrWhite, clrCyan);
   Set();
 }
 
@@ -589,7 +600,7 @@ void cMenuChannelItem::Set(void)
   if (!channel->groupSep)
      asprintf(&buffer, "%d\t%s", channel->number, channel->name );
   else
-     asprintf(&buffer, "\t%s", channel->name); 
+     asprintf(&buffer, "\t%s", channel->name);
   SetText(buffer, false);
 }
 
@@ -868,7 +879,7 @@ class cMenuText : public cOsdMenu {
 cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
 :cOsdMenu(Title)
 {
-  Add(new cMenuTextItem(Text, 1, 2, MenuColumns - 2, MAXOSDITEMS, clrWhite, clrBackground, Font));
+  Add(new cMenuTextItem(Text, 1, 2, Setup.OSDwidth - 2, MAXOSDITEMS, clrWhite, clrBackground, Font));
 }
 
 eOSState cMenuText::ProcessKey(eKeys Key)
@@ -904,13 +915,13 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
      if (New)
         data.active = 1;
      Add(new cMenuEditBoolItem(tr("Active"),       &data.active));
-     Add(new cMenuEditChanItem(tr("Channel"),      &data.channel)); 
-     Add(new cMenuEditDayItem( tr("Day"),          &data.day)); 
-     Add(new cMenuEditTimeItem(tr("Start"),        &data.start)); 
-     Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop)); 
+     Add(new cMenuEditChanItem(tr("Channel"),      &data.channel));
+     Add(new cMenuEditDayItem( tr("Day"),          &data.day));
+     Add(new cMenuEditTimeItem(tr("Start"),        &data.start));
+     Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop));
 //TODO VPS???
-     Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, 99));
-     Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, 99));
+     Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
+     Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
      Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), FileNameChars));
      }
 }
@@ -963,9 +974,9 @@ void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
-                    timer->active ? '>' : ' ', 
-                    timer->channel, 
-                    timer->PrintDay(timer->day), 
+                    timer->active ? '>' : ' ',
+                    timer->channel,
+                    timer->PrintDay(timer->day),
                     timer->start / 100,
                     timer->start % 100,
                     timer->stop / 100,
@@ -1137,20 +1148,20 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
         // like all the others? Well, at least like those who actually send the full range
         // of information (like, e.g., 'Sat.1'). Some stations (like 'RTL') don't even
         // bother sending anything but the 'Title'...
-        if (isempty(ExtendedDescription) && !isempty(Subtitle) && strlen(Subtitle) > 2 * MenuColumns) {
+        if (isempty(ExtendedDescription) && !isempty(Subtitle) && int(strlen(Subtitle)) > 2 * Setup.OSDwidth) {
            ExtendedDescription = Subtitle;
            Subtitle = NULL;
            }
         if (!isempty(Title)) {
-           Add(item = new cMenuTextItem(Title, 1, Line, MenuColumns - 2, -1, clrCyan));
+           Add(item = new cMenuTextItem(Title, 1, Line, Setup.OSDwidth - 2, -1, clrCyan));
            Line += item->Height() + 1;
            }
         if (!isempty(Subtitle)) {
-           Add(item = new cMenuTextItem(Subtitle, 1, Line, MenuColumns - 2, -1, clrYellow));
+           Add(item = new cMenuTextItem(Subtitle, 1, Line, Setup.OSDwidth - 2, -1, clrYellow));
            Line += item->Height() + 1;
            }
         if (!isempty(ExtendedDescription))
-           Add(new cMenuTextItem(ExtendedDescription, 1, Line, MenuColumns - 2, Height() - Line - 2, clrCyan), true);
+           Add(new cMenuTextItem(ExtendedDescription, 1, Line, Setup.OSDwidth - 2, Height() - Line - 2, clrCyan), true);
         SetHelp(tr("Record"), NULL, NULL, CanSwitch ? tr("Switch") : NULL);
         }
      }
@@ -1265,7 +1276,7 @@ eOSState cMenuWhatsOn::Switch(void)
 eOSState cMenuWhatsOn::Record(void)
 {
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
-  if (item) {      
+  if (item) {
      cTimer *timer = new cTimer(item->eventInfo);
      cTimer *t = Timers.GetTimer(timer);
      if (!t) {
@@ -1391,7 +1402,7 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
 eOSState cMenuSchedule::Record(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
-  if (item) {      
+  if (item) {
      cTimer *timer = new cTimer(item->eventInfo);
      cTimer *t = Timers.GetTimer(timer);
      if (!t) {
@@ -1608,14 +1619,22 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditBoolItem(tr("ShowInfoOnChSwitch"), &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem(tr("MenuScrollPage"),     &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("MarkInstantRecord"),  &data.MarkInstantRecord));
+  Add(new cMenuEditIntItem( tr("LnbSLOF"),            &data.LnbSLOF));
   Add(new cMenuEditIntItem( tr("LnbFrequLo"),         &data.LnbFrequLo));
   Add(new cMenuEditIntItem( tr("LnbFrequHi"),         &data.LnbFrequHi));
+  Add(new cMenuEditBoolItem(tr("DiSEqC"),             &data.DiSEqC));
   Add(new cMenuEditBoolItem(tr("SetSystemTime"),      &data.SetSystemTime));
   Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
   Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
   Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
-  Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit));
+  Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("DefaultPriority"),    &data.DefaultPriority, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("DefaultLifetime"),    &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditBoolItem(tr("VideoFormat"),        &data.VideoFormat, "4:3", "16:9"));
+  Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
+  Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
+  Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1626,6 +1645,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
      switch (Key) {
        case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osEnd;
                  cDvbApi::PrimaryDvbApi->SetUseTSTime(data.SetSystemTime);
+                 cDvbApi::PrimaryDvbApi->SetVideoFormat(data.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
                  Setup = data;
                  Setup.Save();
                  break;
@@ -1722,7 +1742,7 @@ cMenuMain::cMenuMain(bool Replaying)
         }
   if (cVideoCutter::Active())
      Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
-  SetHelp(tr("Record"), NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
   SetHasHotkeys();
@@ -1753,14 +1773,22 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                           }
                        break;
     default: switch (Key) {
-               case kMenu: state = osEnd;    break;
-               case kRed:  if (!HasSubMenu())
-                              state = osRecord;
-                           break;
-               case kBlue: if (!HasSubMenu())
-                              state = osReplay;
-                           break;
-               default:    break;
+               case kMenu:  state = osEnd;    break;
+               case kRed:   if (!HasSubMenu())
+                               state = osRecord;
+                            break;
+               case kGreen: if (!HasSubMenu()) {
+                               if (cDvbApi::PrimaryDvbApi->CanToggleAudioTrack()) {
+                                  Interface->Clear();
+                                  cDvbApi::PrimaryDvbApi->ToggleAudioTrack();
+                                  state = osEnd;
+                                  }
+                               }
+                            break;
+               case kBlue:  if (!HasSubMenu())
+                               state = osReplay;
+                            break;
+               default:     break;
                }
     }
   if (Key != kNone)
@@ -1772,7 +1800,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 
 // --- cDisplayChannel -------------------------------------------------------
 
-#define DIRECTCHANNELTIMEOUT  500 //ms
+#define DIRECTCHANNELTIMEOUT 1000 //ms
 #define INFOTIMEOUT          5000 //ms
 
 cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
@@ -1783,7 +1811,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
   lines = 0;
   oldNumber = number = 0;
   cChannel *channel = Group ? Channels.Get(Number) : Channels.GetByNumber(Number);
-  Interface->Open(MenuColumns, 5);
+  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
   if (channel) {
      DisplayChannel(channel);
      DisplayInfo();
@@ -1797,7 +1825,7 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   oldNumber = cDvbApi::CurrentChannel();
   number = 0;
   lastTime = time_ms();
-  Interface->Open(MenuColumns, 5);
+  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
   ProcessKey(FirstKey);
 }
 
@@ -1810,21 +1838,20 @@ cDisplayChannel::~cDisplayChannel()
 
 void cDisplayChannel::DisplayChannel(const cChannel *Channel)
 {
-  if (Channel && Channel->number)
+  if (Channel && Channel->number > 0)
      Interface->DisplayChannelNumber(Channel->number);
   int BufSize = Width() + 1;
   char buffer[BufSize];
-  if (Channel && Channel->number)
-     snprintf(buffer, BufSize, "%d  %s", Channel->number, Channel->name);
+  if (Channel && Channel->number > 0)
+     snprintf(buffer, BufSize, "%d%s  %s", Channel->number, number ? "-" : "", Channel->name);
   else
      snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
-  Interface->Fill(0, 0, MenuColumns, 1, clrBackground);
+  Interface->Fill(0, 0, Setup.OSDwidth, 1, clrBackground);
   Interface->Write(0, 0, buffer);
   time_t t = time(NULL);
   struct tm *now = localtime(&t);
   snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
   Interface->Write(-5, 0, buffer);
-  Interface->Flush();
 }
 
 void cDisplayChannel::DisplayInfo(void)
@@ -1857,7 +1884,7 @@ void cDisplayChannel::DisplayInfo(void)
            if (Lines > lines) {
               const int t = 6;
               int l = 1;
-              Interface->Fill(0, 1, MenuColumns, Lines, clrBackground);
+              Interface->Fill(0, 1, Setup.OSDwidth, Lines, clrBackground);
               if (!isempty(PresentTitle)) {
                  Interface->Write(0, l, Present->GetTimeString(), clrYellow, clrBackground);
                  Interface->Write(t, l, PresentTitle, clrCyan, clrBackground);
@@ -1945,11 +1972,14 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
      asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->Index() + 1);
      }
   timer->SetRecording(true);
-  Channels.SwitchTo(timer->channel, dvbApi);
-  cRecording Recording(timer);
-  if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
-     Recording.WriteSummary();
-  Interface->DisplayRecording(dvbApi->Index(), true);
+  if (Channels.SwitchTo(timer->channel, dvbApi)) {
+     cRecording Recording(timer);
+     if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
+        Recording.WriteSummary();
+     Interface->DisplayRecording(dvbApi->Index(), true);
+     }
+  else
+     cThread::EmergencyExit(true);
 }
 
 cRecordControl::~cRecordControl()
@@ -1979,7 +2009,7 @@ bool cRecordControl::Process(void)
 {
   if (!timer || !timer->Matches())
      return false;
-  AssertFreeDiskSpace();
+  AssertFreeDiskSpace(timer->priority);
   return true;
 }
 
@@ -1993,7 +2023,7 @@ bool cRecordControls::Start(cTimer *Timer)
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
-     cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca, Timer ? Timer->priority : DEFAULTPRIORITY);
+     cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca, Timer ? Timer->priority : Setup.DefaultPriority);
      if (dvbApi) {
         Stop(dvbApi);
         for (int i = 0; i < MAXDVBAPI; i++) {
@@ -2078,7 +2108,7 @@ class cProgressBar : public cBitmap {
   };
 
 cProgressBar::cProgressBar(int Width, int Height, int Current, int Total, const cMarks &Marks)
-:cBitmap(Width, Height)
+:cBitmap(Width, Height, 2)
 {
   total = Total;
   if (total > 0) {
@@ -2119,6 +2149,8 @@ cReplayControl::cReplayControl(void)
 {
   dvbApi = cDvbApi::PrimaryDvbApi;
   visible = shown = displayFrames = false;
+  lastCurrent = lastTotal = -1;
+  timeoutShow = 0;
   if (fileName) {
      marks.Load(fileName);
      dvbApi->StartReplay(fileName);
@@ -2152,12 +2184,14 @@ void cReplayControl::ClearLastReplayed(const char *FileName)
      }
 }
 
-void cReplayControl::Show(void)
+void cReplayControl::Show(int Seconds)
 {
   if (!visible) {
-     Interface->Open(MenuColumns, -3);
+     Interface->Open(Setup.OSDwidth, -3);
      needsFastResponse = visible = true;
      shown = ShowProgress(true);
+     if (Seconds > 0)
+        timeoutShow = time(NULL) + Seconds;
      }
 }
 
@@ -2178,21 +2212,27 @@ bool cReplayControl::ShowProgress(bool Initial)
         Interface->Clear();
         if (title)
            Interface->Write(0, 0, title);
-        displayFrames = marks.Count() > 0;
+        lastCurrent = lastTotal = -1;
+        }
+     if (Total != lastTotal) {
+        Interface->Write(-7, 2, IndexToHMSF(Total));
+        Interface->Flush();
+        lastTotal = Total;
         }
-     Interface->Write(-7, 2, IndexToHMSF(Total));
-     Interface->Flush();
+     if (Current != lastCurrent) {
 #ifdef DEBUG_OSD
-     int p = Width() * Current / Total;
-     Interface->Fill(0, 1, p, 1, clrGreen);
-     Interface->Fill(p, 1, Width() - p, 1, clrWhite);
+        int p = Width() * Current / Total;
+        Interface->Fill(0, 1, p, 1, clrGreen);
+        Interface->Fill(p, 1, Width() - p, 1, clrWhite);
 #else
-     cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
-     Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
-     Interface->Flush();
+        cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
+        Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
+        Interface->Flush();
 #endif
-     Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
-     Interface->Flush();
+        Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
+        Interface->Flush();
+        lastCurrent = Current;
+        }
      return true;
      }
   return false;
@@ -2205,22 +2245,24 @@ void cReplayControl::MarkToggle(void)
      cMark *m = marks.Get(Current);
      if (m)
         marks.Del(m);
-     else
+     else {
         marks.Add(Current);
+        Show(2);
+        }
      marks.Save();
      }
-  displayFrames = marks.Count() > 0;
-  if (!displayFrames)
-     Interface->Fill(0, 2, Width() / 2, 1, clrBackground);
 }
 
 void cReplayControl::MarkJump(bool Forward)
 {
-  int Current, Total;
-  if (dvbApi->GetIndex(Current, Total)) {
-     cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
-     if (m)
-        dvbApi->Goto(m->position, true);
+  if (marks.Count()) {
+     int Current, Total;
+     if (dvbApi->GetIndex(Current, Total)) {
+        cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
+        if (m)
+           dvbApi->Goto(m->position, true);
+        }
+     displayFrames = true;
      }
 }
 
@@ -2230,6 +2272,7 @@ void cReplayControl::MarkMove(bool Forward)
   if (dvbApi->GetIndex(Current, Total)) {
      cMark *m = marks.Get(Current);
      if (m) {
+        displayFrames = true;
         int p = dvbApi->SkipFrames(Forward ? 1 : -1);
         cMark *m2;
         if (Forward) {
@@ -2281,8 +2324,16 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
 {
   if (!dvbApi->Replaying())
      return osEnd;
-  if (visible)
-     shown = ShowProgress(!shown) || shown;
+  if (visible) {
+     if (timeoutShow && time(NULL) > timeoutShow) {
+        Hide();
+        timeoutShow = 0;
+        }
+     else
+        shown = ShowProgress(!shown) || shown;
+     }
+  bool DisplayedFrames = displayFrames;
+  displayFrames = false;
   switch (Key) {
     // Positioning:
     case kUp:      dvbApi->Play(); break;
@@ -2299,23 +2350,34 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     case kBlue:    Hide();
                    dvbApi->StopReplay();
                    return osEnd;
-    // Editing:
-    //XXX should we do this only when the ProgressDisplay is on???
-    case kMarkToggle:      MarkToggle(); break;
-    case kMarkJumpBack:    MarkJump(false); break;
-    case kMarkJumpForward: MarkJump(true); break;
-    case kMarkMoveBack|k_Repeat:
-    case kMarkMoveBack:    MarkMove(false); break;
-    case kMarkMoveForward|k_Repeat:
-    case kMarkMoveForward: MarkMove(true); break;
-    case kEditCut:         EditCut(); break;
-    case kEditTest:        EditTest(); break;
-    // Menu control:
-    case kMenu:    Hide(); return osMenu; // allow direct switching to menu
-    case kOk:      visible ? Hide() : Show(); break;
-    case kBack:    return osRecordings;
-    default:       return osUnknown;
+    default: {
+      switch (Key) {
+        // Editing:
+        //XXX should we do this only when the ProgressDisplay is on???
+        case kMarkToggle:      MarkToggle(); break;
+        case kMarkJumpBack:    MarkJump(false); break;
+        case kMarkJumpForward: MarkJump(true); break;
+        case kMarkMoveBack|k_Repeat:
+        case kMarkMoveBack:    MarkMove(false); break;
+        case kMarkMoveForward|k_Repeat:
+        case kMarkMoveForward: MarkMove(true); break;
+        case kEditCut:         EditCut(); break;
+        case kEditTest:        EditTest(); break;
+        default: {
+          displayFrames = DisplayedFrames;
+          switch (Key) {
+            // Menu control:
+            case kMenu:    Hide(); return osMenu; // allow direct switching to menu
+            case kOk:      visible ? Hide() : Show(); break;
+            case kBack:    return osRecordings;
+            default:       return osUnknown;
+            }
+          }
+        }
+      }
     }
+  if (DisplayedFrames && !displayFrames)
+     Interface->Fill(0, 2, Width() / 2, 1, clrBackground);
   return osContinue;
 }
 
diff --git a/menu.h b/menu.h
index 356122e02..adc10b726 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.18 2001/02/11 10:30:35 kls Exp $
+ * $Id: menu.h 1.20 2001/07/28 13:59:29 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -83,7 +83,9 @@ class cReplayControl : public cOsdBase {
   cDvbApi *dvbApi;
   cMarks marks;
   bool visible, shown, displayFrames;
-  void Show(void);
+  int lastCurrent, lastTotal;
+  time_t timeoutShow;
+  void Show(int Seconds = 0);
   void Hide(void);
   static char *fileName;
   static char *title;
diff --git a/osd.h b/osd.h
index c0fb1a1ef..a1977be4f 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.20 2001/02/03 15:13:59 kls Exp $
+ * $Id: osd.h 1.22 2001/07/27 11:33:30 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -14,7 +14,7 @@
 #include "interface.h"
 #include "tools.h"
 
-#define MAXOSDITEMS 9
+#define MAXOSDITEMS (Setup.OSDheight - 4)
 
 enum eOSState { osUnknown,
                 osMenu,
diff --git a/recording.c b/recording.c
index fc0daa57a..ddca1a4b2 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.29 2001/03/31 09:38:30 kls Exp $
+ * $Id: recording.c 1.32 2001/06/16 10:33:20 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -39,7 +39,7 @@
 #define DELETEDLIFETIME     1 // hours after which a deleted recording will be actually removed
 #define REMOVECHECKDELTA 3600 // seconds between checks for removing deleted files
 #define DISKCHECKDELTA    300 // seconds between checks for free disk space
-#define REMOVELATENCY      10 // seconds to wait until next check after removing a file 
+#define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 
 void RemoveDeletedRecordings(void)
 {
@@ -66,7 +66,7 @@ void RemoveDeletedRecordings(void)
      }
 }
 
-void AssertFreeDiskSpace(void)
+void AssertFreeDiskSpace(int Priority)
 {
   // With every call to this function we try to actually remove
   // a file, or mark a file for removal ("delete" it), so that
@@ -94,13 +94,16 @@ void AssertFreeDiskSpace(void)
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
-                 if ((time(NULL) - r->start) / SECSINDAY > r->lifetime) {
-                    if (r0) {
-                       if (r->priority < r0->priority)
+                 if (r->lifetime < MAXLIFETIME) { // recordings with MAXLIFETIME live forever
+                    if ((r->lifetime == 0 && Priority > r->priority) || // the recording has guaranteed lifetime and the new recording has higher priority
+                        (time(NULL) - r->start) / SECSINDAY > r->lifetime) { // the recording's guaranteed lifetime has expired
+                       if (r0) {
+                          if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
+                             r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
+                          }
+                       else
                           r0 = r;
                        }
-                    else
-                       r0 = r;
                     }
                  r = Recordings.Next(r);
                  }
@@ -153,7 +156,7 @@ int cResumeFile::Read(void)
 bool cResumeFile::Save(int Index)
 {
   if (fileName) {
-     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP);
+     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
      if (f >= 0) {
         if (write(f, &Index, sizeof(Index)) != sizeof(Index))
            LOG_ERROR_STR(fileName);
@@ -174,18 +177,31 @@ void cResumeFile::Delete(void)
 
 // --- cRecording ------------------------------------------------------------
 
+struct tCharExchange { char a; char b; };
+tCharExchange CharExchange[] = {
+  { ' ',  '_'    },
+  { '\'', '\x01' },
+  { '/',  '\x02' },
+#ifdef VFAT
+  { ':',  '\x03' },
+#endif
+  { 0, 0 }
+  };
+
+char *ExchangeChars(char *s, bool ToFileSystem)
+{
+  for (struct tCharExchange *ce = CharExchange; ce->a && ce->b; ce++)
+      strreplace(s, ToFileSystem ? ce->a : ce->b, ToFileSystem ? ce->b : ce->a);
+  return s;
+}
+
 cRecording::cRecording(cTimer *Timer)
 {
   titleBuffer = NULL;
   fileName = NULL;
   name = strdup(Timer->file);
   // substitute characters that would cause problems in file names:
-  for (char *p = name; *p; p++) {
-      switch (*p) {
-        case '\n': *p = ' '; break;
-        case '/':  *p = '-'; break; 
-        }
-      }
+  strreplace(name, '\n', ' ');
   summary = Timer->summary ? strdup(Timer->summary) : NULL;
   if (summary)
      strreplace(summary, '|', '\n');
@@ -215,8 +231,7 @@ cRecording::cRecording(const char *FileName)
         name = new char[p - FileName + 1];
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
-        strreplace(name, '_', ' ');
-        strreplace(name, '\x01', '\'');
+        ExchangeChars(name, false);
         }
      // read an optional summary file:
      char *SummaryFileName = NULL;
@@ -239,7 +254,7 @@ cRecording::cRecording(const char *FileName)
                  delete summary;
                  summary = NULL;
                  }
-              
+
               }
            else
               esyslog(LOG_ERR, "can't allocate %d byte of memory for summary file '%s'", size + 1, SummaryFileName);
@@ -266,11 +281,9 @@ const char *cRecording::FileName(void)
 {
   if (!fileName) {
      struct tm *t = localtime(&start);
+     ExchangeChars(name, true);
      asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
-     if (fileName) {
-        strreplace(fileName, ' ', '_');
-        strreplace(fileName, '\'', '\x01');
-        }
+     ExchangeChars(name, false);
      }
   return fileName;
 }
diff --git a/recording.h b/recording.h
index b561fa2f9..059133e72 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.13 2001/02/11 10:45:52 kls Exp $
+ * $Id: recording.h 1.14 2001/06/02 10:00:25 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -15,7 +15,7 @@
 #include "tools.h"
 
 void RemoveDeletedRecordings(void);
-void AssertFreeDiskSpace(void);
+void AssertFreeDiskSpace(int Priority);
 
 class cResumeFile {
 private:
diff --git a/remote.c b/remote.c
index 940243863..db8fa870d 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.21 2001/02/04 19:17:59 kls Exp $
+ * $Id: remote.c 1.23 2001/07/27 10:17:19 kls Exp $
  */
 
 #include "remote.h"
@@ -439,7 +439,7 @@ void cRcIoLIRC::Action(void)
       if (cFile::FileReady(f, REPEATLIMIT) && read(f, buf, sizeof(buf)) > 21) {
          if (!receivedData) { // only accept new data the previous data has been fetched
             int count;
-            sscanf(buf, "%*x %x %7s", &count, LastKeyName); // '7' in '%7s' is LIRC_KEY_BUF-1!
+            sscanf(buf, "%*x %x %29s", &count, LastKeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
             int Now = time_ms();
             if (count == 0) {
                strcpy(keyName, LastKeyName);
@@ -466,9 +466,11 @@ void cRcIoLIRC::Action(void)
             }
          }
       else if (receivedRepeat) { // all data has already been fetched, but the last one was a repeat, so let's generate a release
-         receivedData = receivedRelease = true;
-         receivedRepeat = false;
-         WakeUp();
+         if (time_ms() - LastTime > REPEATDELAY) {
+            receivedData = receivedRelease = true;
+            receivedRepeat = false;
+            WakeUp();
+            }
          }
       }
 }
diff --git a/remote.h b/remote.h
index 659de1aca..bbdf2facc 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.14 2001/02/02 14:49:10 kls Exp $
+ * $Id: remote.h 1.15 2001/07/22 14:42:59 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -81,7 +81,7 @@ class cRcIoRCU : public cRcIoBase, private cThread {
 
 class cRcIoLIRC : public cRcIoBase, private cThread {
 private:
-  enum { LIRC_KEY_BUF = 8, LIRC_BUFFER_SIZE = 128 };
+  enum { LIRC_KEY_BUF = 30, LIRC_BUFFER_SIZE = 128 };
   int f;
   char keyName[LIRC_KEY_BUF];
   bool receivedData, receivedRepeat, receivedRelease;
diff --git a/remux.c b/remux.c
index e48296d84..3c7ec6e62 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 1.1 2001/03/31 08:42:17 kls Exp $
+ * The parts of this code that implement cTS2PES have been taken from
+ * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
+ * VDR's needs.
+ *
+ * $Id: remux.c 1.5 2001/06/24 16:37:23 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -62,17 +66,390 @@
 */
 
 #include "remux.h"
+#include "thread.h"
 #include "tools.h"
 
-#if defined(REMUX_NONE)
+// --- cTS2PES ---------------------------------------------------------------
+
+#include <netinet/in.h>
+
+//XXX TODO: these should really be available in some driver header file!
+#define PROG_STREAM_MAP  0xBC
+#ifndef PRIVATE_STREAM1
+#define PRIVATE_STREAM1  0xBD
+#endif
+#define PADDING_STREAM   0xBE
+#ifndef PRIVATE_STREAM2
+#define PRIVATE_STREAM2  0xBF
+#endif
+#define AUDIO_STREAM_S   0xC0
+#define AUDIO_STREAM_E   0xDF
+#define VIDEO_STREAM_S   0xE0
+#define VIDEO_STREAM_E   0xEF
+#define ECM_STREAM       0xF0
+#define EMM_STREAM       0xF1
+#define DSM_CC_STREAM    0xF2
+#define ISO13522_STREAM  0xF3
+#define PROG_STREAM_DIR  0xFF
+
+//pts_dts flags
+#define PTS_ONLY         0x80
+
+#define TS_SIZE        188
+#define PAY_START      0x40
+#define PID_MASK_HI    0x1F
+//flags
+#define ADAPT_FIELD    0x20
+//XXX TODO
+
+#define MAX_PLENGTH 0xFFFF
+#define MMAX_PLENGTH (4*MAX_PLENGTH)
+
+#define IPACKS 2048
+
+// Start codes:
+#define SC_PICTURE 0x00  // "picture header"
+
+#define MAXNONUSEFULDATA (10*1024*1024)
+
+class cTS2PES {
+private:
+  int size;
+  int found;
+  int count;
+  uint8_t *buf;
+  uint8_t cid;
+  uint8_t audioCid;
+  int plength;
+  uint8_t plen[2];
+  uint8_t flag1;
+  uint8_t flag2;
+  uint8_t hlength;
+  int mpeg;
+  uint8_t check;
+  int which;
+  bool done;
+  uint8_t *resultBuffer;
+  int *resultCount;
+  static uint8_t headr[];
+  void store(uint8_t *Data, int Count);
+  void reset_ipack(void);
+  void send_ipack(void);
+  void write_ipack(const uint8_t *Data, int Count);
+  void instant_repack(const uint8_t *Buf, int Count);
+public:
+  cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t AudioCid = 0x00);
+  ~cTS2PES();
+  void ts_to_pes(const uint8_t *Buf); // don't need count (=188)
+  void Clear(void);
+  };
+
+uint8_t cTS2PES::headr[] = { 0x00, 0x00, 0x01 };
 
-cRemux::cRemux(void)
+cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t AudioCid)
 {
+  resultBuffer = ResultBuffer;
+  resultCount = ResultCount;
+  size = Size;
+  audioCid = AudioCid;
+
+  if (!(buf = new uint8_t[size]))
+     esyslog(LOG_ERR, "Not enough memory for ts_transform");
+
+  reset_ipack();
+}
+
+cTS2PES::~cTS2PES()
+{
+  delete buf;
+}
+
+void cTS2PES::Clear(void)
+{
+  reset_ipack();
+}
+
+void cTS2PES::store(uint8_t *Data, int Count)
+{
+  if (*resultCount + Count > RESULTBUFFERSIZE) {
+     esyslog(LOG_ERR, "ERROR: result buffer overflow (%d + %d > %d)", *resultCount, Count, RESULTBUFFERSIZE);
+     Count = RESULTBUFFERSIZE - *resultCount;
+     }
+  memcpy(resultBuffer + *resultCount, Data, Count);
+  *resultCount += Count;
+}
+
+void cTS2PES::reset_ipack(void)
+{
+  found = 0;
+  cid = 0;
+  plength = 0;
+  flag1 = 0;
+  flag2 = 0;
+  hlength = 0;
+  mpeg = 0;
+  check = 0;
+  which = 0;
+  done = false;
+  count = 0;
+}
+
+void cTS2PES::send_ipack(void)
+{
+  if (count < 10)
+     return;
+  buf[3] = (AUDIO_STREAM_S <= cid && cid <= AUDIO_STREAM_E && audioCid) ? audioCid : cid;
+  buf[4] = (uint8_t)(((count - 6) & 0xFF00) >> 8);
+  buf[5] = (uint8_t)((count - 6) & 0x00FF);
+  store(buf, count);
+
+  switch (mpeg) {
+    case 2:
+            buf[6] = 0x80;
+            buf[7] = 0x00;
+            buf[8] = 0x00;
+            count = 9;
+            break;
+    case 1:
+            buf[6] = 0x0F;
+            count = 7;
+            break;
+    }
+}
+
+void cTS2PES::write_ipack(const uint8_t *Data, int Count)
+{
+  if (count < 6) {
+     memcpy(buf, headr, 3);
+     count = 6;
+     }
+
+  if (count + Count < size) {
+     memcpy(buf + count, Data, Count);
+     count += Count;
+     }
+  else {
+     int rest = size - count;
+     memcpy(buf + count, Data, rest);
+     count += rest;
+     send_ipack();
+     if (Count - rest > 0)
+        write_ipack(Data + rest, Count - rest);
+     }
+}
+
+void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
+{
+  int c = 0;
+
+  while (c < Count && (mpeg == 0 || (mpeg == 1 && found < 7) || (mpeg == 2 && found < 9)) && (found < 5 || !done)) {
+        switch (found ) {
+          case 0:
+          case 1:
+                  if (Buf[c] == 0x00)
+                     found++;
+                  else
+                     found = 0;
+                  c++;
+                  break;
+          case 2:
+                  if (Buf[c] == 0x01)
+                     found++;
+                  else if (Buf[c] != 0)
+                     found = 0;
+                  c++;
+                  break;
+          case 3:
+                  cid = 0;
+                  switch (Buf[c]) {
+                    case PROG_STREAM_MAP:
+                    case PRIVATE_STREAM2:
+                    case PROG_STREAM_DIR:
+                    case ECM_STREAM     :
+                    case EMM_STREAM     :
+                    case PADDING_STREAM :
+                    case DSM_CC_STREAM  :
+                    case ISO13522_STREAM:
+                         done = true;
+                    case PRIVATE_STREAM1:
+                    case VIDEO_STREAM_S ... VIDEO_STREAM_E:
+                    case AUDIO_STREAM_S ... AUDIO_STREAM_E:
+                         found++;
+                         cid = Buf[c++];
+                         break;
+                    default:
+                         found = 0;
+                         break;
+                    }
+                  break;
+          case 4:
+                  if (Count - c > 1) {
+                     unsigned short *pl = (unsigned short *)(Buf + c);
+                     plength = ntohs(*pl);
+                     c += 2;
+                     found += 2;
+                     }
+                  else {
+                     plen[0] = Buf[c];
+                     found++;
+                     return;
+                     }
+                  break;
+          case 5: {
+                    plen[1] = Buf[c++];
+                    unsigned short *pl = (unsigned short *)plen;
+                    plength = ntohs(*pl);
+                    found++;
+                  }
+                  break;
+          case 6:
+                  if (!done) {
+                     flag1 = Buf[c++];
+                     found++;
+                     if ((flag1 & 0xC0) == 0x80 )
+                        mpeg = 2;
+                     else {
+                        esyslog(LOG_INFO, "ERROR: can't record MPEG1!");
+                        hlength = 0;
+                        which = 0;
+                        mpeg = 1;
+                        flag2 = 0;
+                        }
+                     }
+                  break;
+          case 7:
+                  if (!done && mpeg == 2) {
+                     flag2 = Buf[c++];
+                     found++;
+                     }
+                  break;
+          case 8:
+                  if (!done && mpeg == 2) {
+                     hlength = Buf[c++];
+                     found++;
+                     }
+                  break;
+          default:
+                  break;
+          }
+        }
+
+  if (!plength)
+     plength = MMAX_PLENGTH - 6;
+
+  if (done || ((mpeg == 2 && found >= 9) || (mpeg == 1 && found >= 7))) {
+     switch (cid) {
+       case AUDIO_STREAM_S ... AUDIO_STREAM_E:
+       case VIDEO_STREAM_S ... VIDEO_STREAM_E:
+       case PRIVATE_STREAM1:
+
+            if (mpeg == 2 && found == 9) {
+               write_ipack(&flag1, 1);
+               write_ipack(&flag2, 1);
+               write_ipack(&hlength, 1);
+               }
+
+            if (mpeg == 2 && (flag2 & PTS_ONLY) && found < 14) {
+               while (c < Count && found < 14) {
+                     write_ipack(Buf + c, 1);
+                     c++;
+                     found++;
+                     }
+               if (c == Count)
+                  return;
+               }
+
+            while (c < Count && found < plength + 6) {
+                  int l = Count - c;
+                  if (l + found > plength + 6)
+                     l = plength + 6 - found;
+                  write_ipack(Buf + c, l);
+                  found += l;
+                  c += l;
+                  }
+
+            break;
+       }
+
+     if (done) {
+        if (found + Count - c < plength + 6) {
+           found += Count - c;
+           c = Count;
+           }
+        else {
+           c += plength + 6 - found;
+           found = plength + 6;
+           }
+        }
+
+     if (plength && found == plength + 6) {
+        send_ipack();
+        reset_ipack();
+        if (c < Count)
+           instant_repack(Buf + c, Count - c);
+        }
+     }
+  return;
+}
+
+void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
+{
+  if (!Buf)
+     return;
+
+  if (Buf[1] & PAY_START) {
+     if (plength == MMAX_PLENGTH - 6 && found > 6) {
+        plength = found - 6;
+        found = 0;
+        send_ipack();
+        reset_ipack();
+        }
+     }
+
+  uint8_t off = 0;
+
+  if (Buf[3] & ADAPT_FIELD) {  // adaptation field?
+     off = Buf[4] + 1;
+     if (off + 4 > 187)
+        return;
+     }
+
+  instant_repack(Buf + 4 + off, TS_SIZE - 4 - off);
+}
+
+// --- cRemux ----------------------------------------------------------------
+
+cRemux::cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure)
+{
+  vPid = VPid;
+  aPid1 = APid1;
+  aPid2 = APid2;
+  dPid1 = DPid1;
+  dPid2 = DPid2;
+  exitOnFailure = ExitOnFailure;
   synced = false;
+  skipped = 0;
+  resultCount = resultDelivered = 0;
+  vTS2PES  =         new cTS2PES(resultBuffer, &resultCount, IPACKS);
+  aTS2PES1 =         new cTS2PES(resultBuffer, &resultCount, IPACKS, 0xC0);
+  aTS2PES2 = aPid2 ? new cTS2PES(resultBuffer, &resultCount, IPACKS, 0xC1) : NULL;
+  dTS2PES1 = dPid1 ? new cTS2PES(resultBuffer, &resultCount, IPACKS)       : NULL;
+  //XXX don't yet know how to tell apart primary and secondary DD data...
+  dTS2PES2 = /*XXX dPid2 ? new cTS2PES(resultBuffer, &resultCount, IPACKS) : XXX*/ NULL;
 }
 
 cRemux::~cRemux()
 {
+  delete vTS2PES;
+  delete aTS2PES1;
+  delete aTS2PES2;
+  delete dTS2PES1;
+  delete dTS2PES2;
+}
+
+int cRemux::GetPid(const uchar *Data)
+{
+  return (((uint16_t)Data[0] & PID_MASK_HI) << 8) | (Data[1] & 0xFF);
 }
 
 int cRemux::GetPacketLength(const uchar *Data, int Count, int Offset)
@@ -104,70 +481,140 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
   return -1;
 }
 
-const uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar &PictureType)
+void cRemux::SetAudioPid(int APid)
 {
-  int Skip = 0;
+  aPid1 = APid;
+  vTS2PES->Clear();
+  aTS2PES1->Clear();
+  resultCount = resultDelivered = 0;
+}
 
-  PictureType = NO_PICTURE;
+const uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar *PictureType)
+{
+  uchar dummyPictureType;
+  if (!PictureType)
+     PictureType = &dummyPictureType;
 
-  if (Count >= MINVIDEODATA) {
-     for (int i = 0; i < Count; i++) {
-         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
-            switch (Data[i + 3]) {
-              case SC_VIDEO:
+/*XXX
+  // test recording the raw TS:
+  Result = Count;
+  *PictureType = I_FRAME;
+  return Data;
+XXX*/
+
+  // Remove any previously delivered data from the result buffer:
+
+  if (resultDelivered) {
+     if (resultDelivered < resultCount)
+        memmove(resultBuffer, resultBuffer + resultDelivered, resultCount - resultDelivered);
+     resultCount -= resultDelivered;
+     resultDelivered = 0;
+     }
+
+  // Convert incoming TS data into multiplexed PES:
+
+  int used = 0;
+  for (int i = 0; i < Count; i += TS_SIZE) {
+      if (Count - i < TS_SIZE)
+         break;
+      int pid = GetPid(Data + i + 1);
+      if (Data[i + 3] & 0x10) { // got payload
+         if      (pid == vPid)              vTS2PES->ts_to_pes(Data + i);
+         else if (pid == aPid1)             aTS2PES1->ts_to_pes(Data + i);
+         else if (pid == aPid2 && aTS2PES2) aTS2PES2->ts_to_pes(Data + i);
+         else if (pid == dPid1 && dTS2PES1) dTS2PES1->ts_to_pes(Data + i);
+         else if (pid == dPid2 && dTS2PES2) dTS2PES2->ts_to_pes(Data + i);
+         }
+      used += TS_SIZE;
+      if (resultCount > (int)sizeof(resultBuffer) / 2)
+         break;
+      }
+  Count = used;
+
+/*XXX
+  // test recording without determining the real frame borders:
+  *PictureType = I_FRAME;
+  Result = resultDelivered = resultCount;
+  return Result ? resultBuffer : NULL;
+XXX*/
+
+  // Check if we're getting anywhere here:
+
+  if (!synced && skipped >= 0) {
+     if (skipped > MAXNONUSEFULDATA) {
+        esyslog(LOG_ERR, "ERROR: no useful data seen within %d byte of video stream", skipped);
+        skipped = -1;
+        if (exitOnFailure)
+           cThread::EmergencyExit(true);
+        }
+     else
+        skipped += Count;
+     }
+
+  // Check for frame borders:
+
+  *PictureType = NO_PICTURE;
+
+  if (resultCount >= MINVIDEODATA) {
+     for (int i = 0; i < resultCount; i++) {
+         if (resultBuffer[i] == 0 && resultBuffer[i + 1] == 0 && resultBuffer[i + 2] == 1) {
+            switch (resultBuffer[i + 3]) {
+              case VIDEO_STREAM_S ... VIDEO_STREAM_E:
                    {
                      uchar pt = NO_PICTURE;
-                     int l = ScanVideoPacket(Data, Count, i, pt);
-                     if (l < 0) {
-                        if (Skip < Count)
-                           Count = Skip;
+                     int l = ScanVideoPacket(resultBuffer, resultCount, i, pt);
+                     if (l < 0)
                         return NULL; // no useful data found, wait for more
-                        }
                      if (pt != NO_PICTURE) {
                         if (pt < I_FRAME || B_FRAME < pt) {
                            esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
                            }
-                        else if (PictureType == NO_PICTURE) {
-                           if (!synced) {
-                              if (pt == I_FRAME) {
-                                 Skip = i;
-                                 synced = true;
-                                 }
-                              else {
-                                 i += l;
-                                 Skip = i;
-                                 break;
-                                 }
+                        else if (!synced) {
+                           if (pt == I_FRAME) {
+                              resultDelivered = i; // will drop everything before this position
+                              synced = true;
+                              }
+                           else {
+                              resultDelivered = i + l; // will drop everything before and including this packet
+                              return NULL;
                               }
-                           if (synced)
-                              PictureType = pt;
-                           }
-                        else {
-                           Count = i;
-                           Result = i - Skip;
-                           return Data + Skip;
                            }
                         }
-                     else if (!synced) {
-                        i += l;
-                        Skip = i;
-                        break;
+                     if (synced) {
+                        *PictureType = pt;
+                        Result = l;
+                        const uchar *p = resultBuffer + resultDelivered;
+                        resultDelivered += l;
+                        return p;
+                        }
+                     else {
+                        resultDelivered = i + l; // will drop everything before and including this packet
+                        return NULL;
                         }
-                     i += l - 1; // -1 to compensate for i++ in the loop!
                    }
                    break;
-              case SC_AUDIO:
-                   i += GetPacketLength(Data, Count, i) - 1; // -1 to compensate for i++ in the loop!
+              case PRIVATE_STREAM1:
+              case AUDIO_STREAM_S ... AUDIO_STREAM_E:
+                   {
+                     int l = GetPacketLength(resultBuffer, resultCount, i);
+                     if (l < 0)
+                        return NULL; // no useful data found, wait for more
+                     if (synced) {
+                        Result = l;
+                        const uchar *p = resultBuffer + resultDelivered;
+                        resultDelivered += l;
+                        return p;
+                        }
+                     else {
+                        resultDelivered = i + l; // will drop everything before and including this packet
+                        return NULL;
+                        }
+                   }
                    break;
               }
             }
          }
      }
-  if (Skip < Count)
-     Count = Skip;
   return NULL; // no useful data found, wait for more
 }
 
-#elif defined(REMUX_TEST)
-#endif
-
diff --git a/remux.h b/remux.h
index bceb676bf..792469e5c 100644
--- a/remux.h
+++ b/remux.h
@@ -4,16 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.1 2001/03/31 08:42:27 kls Exp $
+ * $Id: remux.h 1.5 2001/06/23 14:06:59 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
-// There are various experiments with different types of remultiplexers
-// going on at the moment. Select the remultiplexer here:
-#define REMUX_NONE 1
-//#define REMUX_TEST 1
+#include <time.h> //XXX FIXME: DVB/ost/include/ost/dmx.h should include <time.h> itself!!!
+#include <ost/dmx.h>
 
 // Picture types:
 #define NO_PICTURE 0
@@ -21,31 +19,32 @@
 #define P_FRAME    2
 #define B_FRAME    3
 
-// Start codes:
-#define SC_PICTURE 0x00  // "picture header"
-#define SC_SEQU    0xB3  // "sequence header"
-#define SC_PHEAD   0xBA  // "pack header"
-#define SC_SHEAD   0xBB  // "system header"
-#define SC_AUDIO   0xC0
-#define SC_VIDEO   0xE0
-
 // The minimum amount of video data necessary to identify frames:
-#define MINVIDEODATA (256*1024) // just a safe guess (max. size of any frame block, plus some safety)
+#define MINVIDEODATA (16*1024) // just a safe guess (max. size of any frame block, plus some safety)
+
+#define RESULTBUFFERSIZE (MINVIDEODATA * 4)
 
 typedef unsigned char uchar;
+class cTS2PES;
 
 class cRemux {
 private:
-#if defined(REMUX_NONE)
+  bool exitOnFailure;
   bool synced;
+  int skipped;
+  int vPid, aPid1, aPid2, dPid1, dPid2;
+  cTS2PES *vTS2PES, *aTS2PES1, *aTS2PES2, *dTS2PES1, *dTS2PES2;
+  uchar resultBuffer[RESULTBUFFERSIZE];
+  int resultCount;
+  int resultDelivered;
+  int GetPid(const uchar *Data);
   int GetPacketLength(const uchar *Data, int Count, int Offset);
   int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
-#elif defined(REMUX_TEST)
-#endif
 public:
-  cRemux(void);
+  cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
   ~cRemux();
-  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar &PictureType);
+  void SetAudioPid(int APid);
+  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
   };
 
 #endif // __REMUX_H
diff --git a/ringbuffer.c b/ringbuffer.c
index 48707133c..8511a1c23 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.1 2001/03/10 17:11:34 kls Exp $
+ * $Id: ringbuffer.c 1.2 2001/05/20 11:58:08 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -37,9 +37,10 @@ class cRingBufferOutputThread : public cThread {
 
 // --- cRingBuffer ------------------------------------------------------------
 
-cRingBuffer::cRingBuffer(int Size)
+cRingBuffer::cRingBuffer(int Size, bool Statistics)
 {
   size = Size;
+  statistics = Statistics;
   buffer = NULL;
   inputThread = NULL;
   outputThread = NULL;
@@ -60,7 +61,17 @@ cRingBuffer::~cRingBuffer()
   delete inputThread;
   delete outputThread;
   delete buffer;
-  dsyslog(LOG_INFO, "buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
+  if (statistics)
+     dsyslog(LOG_INFO, "buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
+}
+
+int cRingBuffer::Available(void)
+{
+  mutex.Lock();
+  int diff = head - tail;
+  int cont = (diff >= 0) ? diff : size + diff;
+  mutex.Unlock();
+  return cont;
 }
 
 void cRingBuffer::Clear(void)
@@ -78,17 +89,17 @@ int cRingBuffer::Put(const uchar *Data, int Count)
      int diff = tail - head;
      mutex.Unlock();
      int free = (diff > 0) ? diff - 1 : size + diff - 1;
-     // Statistics:
-     int fill = size - free - 1 + Count;
-     if (fill >= size)
-        fill = size - 1;
-     if (fill > maxFill) {
-        maxFill = fill;
-        int percent = maxFill * 100 / (size - 1);
-        if (percent > 75)
-           dsyslog(LOG_INFO, "buffer usage: %d%%", percent);
+     if (statistics) {
+        int fill = size - free - 1 + Count;
+        if (fill >= size)
+           fill = size - 1;
+        if (fill > maxFill) {
+           maxFill = fill;
+           int percent = maxFill * 100 / (size - 1);
+           if (percent > 75)
+              dsyslog(LOG_INFO, "buffer usage: %d%%", percent);
+           }
         }
-     //
      if (free <= 0)
         return 0;
      if (free < Count)
diff --git a/ringbuffer.h b/ringbuffer.h
index 1669a4946..49be769c2 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.1 2001/03/10 14:00:59 kls Exp $
+ * $Id: ringbuffer.h 1.2 2001/05/20 11:56:44 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -28,7 +28,11 @@ class cRingBuffer {
   uchar *buffer;
   int maxFill;
   bool busy;
+  bool statistics;
 protected:
+  void Lock(void) { mutex.Lock(); }
+  void Unlock(void) { mutex.Unlock(); }
+  int Available(void);
   bool Busy(void) { return busy; }
   void Clear(void);
     // Immediately clears the ring buffer.
@@ -45,7 +49,7 @@ class cRingBuffer {
     // Runs as a separate thread and shall continuously call Get() to
     // retrieve data from the ring buffer and write it to a destination.
 public:
-  cRingBuffer(int Size);
+  cRingBuffer(int Size, bool Statistics = false);
   virtual ~cRingBuffer();
   bool Start(void);
   bool Active(void);
diff --git a/runvdr b/runvdr
index 5ec345854..afd645fc4 100755
--- a/runvdr
+++ b/runvdr
@@ -1,18 +1,44 @@
 #!/bin/sh
 
+# runvdr: Loads the DVB driver and runs VDR
+#
+# If VDR exits abnormally, the driver will be reloaded
+# and VDR restarted.
+#
+# Set the environment variable VDRUSR to the user id you
+# want VDR to run with. If VDRUSR is not set, VDR will run
+# as 'root', which is not necessarily advisable.
+#
+# Since this script loads the DVB driver, it must be started
+# as user 'root'.
+#
+# Any command line parameters will be passed on to the
+# actual 'vdr' program.
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: runvdr 1.8 2001/07/27 07:35:19 kls Exp $
+
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
-VDRCMD="$VDRPRG -w 60"
+VDRCMD="$VDRPRG -w 60 $*"
 
+LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
 KILLPROC="/sbin/killproc -TERM"
 
+# Load driver if it hasn't been loaded already:
+if [ $LSMOD -eq 0 ] ; then
+   (cd $DVBDIR; make insmod)
+   fi
+
 while (true) do
-#      (cd $DVBDIR; make reload)
-#      sleep 3
-      $VDRCMD
-      if test $? -ne 1; then exit; fi
+      su -c "$VDRCMD" $VDRUSR
+      if test $? -eq 0; then exit; fi
       date
       echo "restarting VDR"
       $KILLPROC $VDRPRG
       sleep 10
+      (cd $DVBDIR; make rmmod; make insmod)
+      date
       done
diff --git a/svdrp.c b/svdrp.c
index df4ffaccb..a626fdade 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.18 2001/04/01 16:06:54 kls Exp $
+ * $Id: svdrp.c 1.20 2001/07/22 13:58:48 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -941,7 +941,7 @@ void cSVDRP::Process(void)
               if (numChars > 0)
                  numChars--;
               }
-           else if (c <= 0x03 || c == 0x0D || 0xF0 <= c) {
+           else if (c <= 0x03 || c == 0x0D) {
               // ignore control characters
               }
            else if (numChars < sizeof(cmdLine) - 1) {
@@ -955,8 +955,10 @@ void cSVDRP::Process(void)
               }
            lastActivity = time(NULL);
            }
-        else if (r < 0)
+        else if (r <= 0) {
+           isyslog(LOG_INFO, "lost connection to SVDRP client");
            Close();
+           }
         }
      else if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
         isyslog(LOG_INFO, "timeout on SVDRP connection");
diff --git a/thread.c b/thread.c
index 363190d84..e253ea042 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.7 2000/12/24 12:27:21 kls Exp $
+ * $Id: thread.c 1.9 2001/06/27 11:34:41 kls Exp $
  */
 
 #include "thread.h"
@@ -14,12 +14,43 @@
 #include <unistd.h>
 #include "tools.h"
 
+// --- cMutex ----------------------------------------------------------------
+
+cMutex::cMutex(void)
+{
+  lockingPid = 0;
+  locked = 0;
+  pthread_mutex_init(&mutex, NULL);
+}
+
+cMutex::~cMutex()
+{
+  pthread_mutex_destroy(&mutex);
+}
+
+void cMutex::Lock(void)
+{
+  if (getpid() != lockingPid || !locked)
+     pthread_mutex_lock(&mutex);
+  lockingPid = getpid();
+  locked++;
+}
+
+void cMutex::Unlock(void)
+{
+ if (!--locked)
+    pthread_mutex_unlock(&mutex);
+}
+
 // --- cThread ---------------------------------------------------------------
 
 // The signal handler is necessary to be able to use SIGIO to wake up any
 // pending 'select()' call.
 
+time_t cThread::lastPanic = 0;
+int cThread::panicLevel = 0;
 bool cThread::signalHandlerInstalled = false;
+bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(void)
 {
@@ -110,6 +141,33 @@ void cThread::WakeUp(void)
   kill(parentPid, SIGIO); // makes any waiting 'select()' call return immediately
 }
 
+#define MAXPANICLEVEL 10
+
+void cThread::RaisePanic(void)
+{
+  if (lastPanic > 0) {
+     if (time(NULL) - lastPanic < 5)
+        panicLevel++;
+     else if (panicLevel > 0)
+        panicLevel--;
+     }
+  lastPanic = time(NULL);
+  if (panicLevel > MAXPANICLEVEL) {
+     esyslog(LOG_ERR, "ERROR: max. panic level exceeded");
+     EmergencyExit(true);
+     }
+  else
+     dsyslog(LOG_INFO, "panic level: %d", panicLevel);
+}
+
+bool cThread::EmergencyExit(bool Request)
+{
+  if (!Request)
+     return emergencyExitRequested;
+  esyslog(LOG_ERR, "initiating emergency exit");
+  return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
+}
+
 // --- cThreadLock -----------------------------------------------------------
 
 cThreadLock::cThreadLock(cThread *Thread)
diff --git a/thread.h b/thread.h
index 6aaee0b90..bf9804d33 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.4 2000/12/03 11:18:37 kls Exp $
+ * $Id: thread.h 1.6 2001/06/27 11:22:04 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -16,11 +16,13 @@
 class cMutex {
 private:
   pthread_mutex_t mutex;
+  pid_t lockingPid;
+  int locked;
 public:
-  cMutex(void) { pthread_mutex_init(&mutex, NULL); }
-  ~cMutex() { pthread_mutex_destroy(&mutex); }
-  void Lock(void) { pthread_mutex_lock(&mutex); }
-  void Unlock(void) { pthread_mutex_unlock(&mutex); }
+  cMutex(void);
+  ~cMutex();
+  void Lock(void);
+  void Unlock(void);
   };
 
 class cThread {
@@ -31,6 +33,9 @@ class cThread {
   pid_t parentPid, threadPid, lockingPid;
   int locked;
   bool running;
+  static time_t lastPanic;
+  static int panicLevel;
+  static bool emergencyExitRequested;
   static bool signalHandlerInstalled;
   static void SignalHandler(int signum);
   static void *StartThread(cThread *Thread);
@@ -45,6 +50,8 @@ class cThread {
   virtual ~cThread();
   bool Start(void);
   bool Active(void);
+  static void RaisePanic(void);
+  static bool EmergencyExit(bool Request = false);
   };
 
 // cThreadLock can be used to easily set a lock in a thread and make absolutely
diff --git a/tools.c b/tools.c
index c303a8ab8..de1a52c39 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.32 2001/04/01 14:13:36 kls Exp $
+ * $Id: tools.c 1.34 2001/05/20 08:30:54 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -120,7 +120,7 @@ const char *AddDirectory(const char *DirName, const char *FileName)
   return buf;
 }
 
-#define DFCMD  "df -m '%s'"
+#define DFCMD  "df -m -P '%s'"
 
 uint FreeDiskSpaceMB(const char *Directory)
 {
@@ -132,7 +132,7 @@ uint FreeDiskSpaceMB(const char *Directory)
   if (p) {
      char *s;
      while ((s = readline(p)) != NULL) {
-           if (*s == '/') {
+           if (strchr(s, '/')) {
               uint available;
               sscanf(s, "%*s %*d %*d %u", &available);
               Free = available;
@@ -411,6 +411,22 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
   return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
 }
 
+bool cFile::FileReadyForWriting(int FileDes, int TimeoutMs)
+{
+#ifdef DEBUG_OSD
+  refresh();
+#endif
+  fd_set set;
+  struct timeval timeout;
+  FD_ZERO(&set);
+  FD_SET(FileDes, &set);
+  if (TimeoutMs < 100)
+     TimeoutMs = 100;
+  timeout.tv_sec  = 0;
+  timeout.tv_usec = TimeoutMs * 1000;
+  return select(FD_SETSIZE, NULL, &set, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
+}
+
 // --- cSafeFile -------------------------------------------------------------
 
 cSafeFile::cSafeFile(const char *FileName)
diff --git a/tools.h b/tools.h
index a9d61218f..b4a0cb672 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.25 2001/04/01 14:13:42 kls Exp $
+ * $Id: tools.h 1.26 2001/05/20 08:29:45 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -67,6 +67,7 @@ class cFile {
   bool Ready(bool Wait = true);
   static bool AnyFileReady(int FileDes = -1, int TimeoutMs = 1000);
   static bool FileReady(int FileDes, int TimeoutMs = 1000);
+  static bool FileReadyForWriting(int FileDes, int TimeoutMs = 1000);
   };
 
 class cSafeFile {
diff --git a/vdr.c b/vdr.c
index 8ed209a63..12b1a5381 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.56 2001/04/01 11:16:54 kls Exp $
+ * $Id: vdr.c 1.58 2001/06/23 12:29:41 kls Exp $
  */
 
 #include <getopt.h>
@@ -77,6 +77,7 @@ int main(int argc, char *argv[])
   char *Terminal = NULL;
 
   static struct option long_options[] = {
+      { "audio",    required_argument, NULL, 'a' },
       { "config",   required_argument, NULL, 'c' },
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
@@ -91,8 +92,10 @@ int main(int argc, char *argv[])
   
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "c:dD:hl:p:v:w:t:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:hl:p:v:w:t:", long_options, &option_index)) != -1) {
         switch (c) {
+          case 'a': cDvbApi::SetAudioCommand(optarg);
+                    break;
           case 'c': ConfigDirectory = optarg;
                     break;
           case 'd': DaemonMode = true; break;
@@ -107,6 +110,7 @@ int main(int argc, char *argv[])
                     return 2;
                     break;
           case 'h': printf("Usage: vdr [OPTION]\n\n"           // for easier orientation, this is column 80|
+                           "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
                            "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
                            "                           from the video directory)\n"
                            "  -h,       --help         display this help and exit\n"
@@ -267,6 +271,11 @@ int main(int argc, char *argv[])
      }
 
   while (!Interrupted) {
+        // Handle emergency exits:
+        if (cThread::EmergencyExit()) {
+           esyslog(LOG_ERR, "emergency exit requested - shutting down");
+           break;
+           }
         // Restart the Watchdog timer:
         if (WatchdogTimeout > 0) {
            int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);
@@ -388,7 +397,8 @@ int main(int argc, char *argv[])
         else
            LastActivity = time(NULL);
         }
-  isyslog(LOG_INFO, "caught signal %d", Interrupted);
+  if (Interrupted)
+     isyslog(LOG_INFO, "caught signal %d", Interrupted);
   Setup.CurrentChannel = cDvbApi::CurrentChannel();
   Setup.Save();
   cVideoCutter::Stop();
@@ -401,5 +411,9 @@ int main(int argc, char *argv[])
   isyslog(LOG_INFO, "exiting");
   if (SysLogLevel > 0)
      closelog();
+  if (cThread::EmergencyExit()) {
+     esyslog(LOG_ERR, "emergency exit!");
+     return 1;
+     }
   return 0;
 }
diff --git a/videodir.c b/videodir.c
index 2824d04e3..6f35a3dcc 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.4 2001/02/11 13:48:30 kls Exp $
+ * $Id: videodir.c 1.5 2001/05/01 09:48:57 kls Exp $
  */
 
 #include "videodir.h"
@@ -137,7 +137,7 @@ int OpenVideoFile(const char *FileName, int Flags)
            }
         }
      }
-  int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR | S_IRGRP);
+  int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
   if (ActualFileName != FileName)
      delete ActualFileName;
   return Result;

From f1d1c9849c8e27cccb46cf9c0d0ccb59da3f91f9 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 6 Aug 2001 18:00:00 +0200
Subject: [PATCH 020/307] Version 0.90 - Modified the display of the channel
 group separators (thanks to Markus Lang   for this suggestion). - Added
 support for replaying DVDs (thanks to Andreas Schultz). See INSTALL for  
 instructions on how to compile VDR with DVD support. - Fixed replay progress
 display in case replay is paused while watching an   ongoing recording. -
 Ringbuffer uses semaphores to signal empty/full conditions. - Fixed
 calculating the timeout value in cFile::FileReady() (thanks to   Wolfgang
 Henselmann-Weiss).

---
 CONTRIBUTORS                               |   10 +
 HISTORY                                    |   12 +
 INSTALL                                    |   24 +-
 MANUAL                                     |    2 +-
 Makefile                                   |   51 +-
 Tools/master-timer/LIESMICH                |  106 ++
 Tools/master-timer/README                  |   52 +
 Tools/master-timer/Todo                    |   10 +
 Tools/master-timer/master-timer.pl         | 1169 ++++++++++++++++
 Tools/master-timer/process_summary.pl      |   79 ++
 Tools/master-timer/sample/channels-to-scan |    8 +
 Tools/master-timer/sample/config           |   14 +
 Tools/master-timer/sample/deepblack        |   79 ++
 Tools/master-timer/sample/done             |    1 +
 Tools/master-timer/sample/subtitle-movie   |   41 +
 Tools/master-timer/sample/torecord         |   32 +
 Tools/master-timer/scan-channels           |    8 +
 Tools/schnitt/cut2.pl                      |   39 +
 Tools/schnitt/cut3.pl                      |   40 +
 Tools/schnitt/cutall3.pl                   |   31 +
 Tools/schnitt/dump.c                       |   65 +
 Tools/schnitt/play                         |   10 +
 ac3dec/Makefile                            |   22 +
 ac3dec/ac3.h                               |   60 +
 ac3dec/ac3_internal.h                      |  344 +++++
 ac3dec/bit_allocate.c                      |  494 +++++++
 ac3dec/bit_allocate.h                      |   24 +
 ac3dec/bitstream.c                         |   76 +
 ac3dec/bitstream.h                         |   76 +
 ac3dec/coeff.c                             |  353 +++++
 ac3dec/coeff.h                             |   24 +
 ac3dec/crc.c                               |   96 ++
 ac3dec/crc.h                               |   27 +
 ac3dec/debug.c                             |   58 +
 ac3dec/debug.h                             |   37 +
 ac3dec/decode.c                            |  269 ++++
 ac3dec/decode.h                            |   22 +
 ac3dec/dither.c                            |  115 ++
 ac3dec/dither.h                            |   37 +
 ac3dec/downmix.c                           |  428 ++++++
 ac3dec/downmix.h                           |   28 +
 ac3dec/exponent.c                          |  135 ++
 ac3dec/exponent.h                          |   28 +
 ac3dec/imdct.c                             |  468 +++++++
 ac3dec/imdct.h                             |   26 +
 ac3dec/parse.c                             |  597 ++++++++
 ac3dec/parse.h                             |   28 +
 ac3dec/rematrix.c                          |   83 ++
 ac3dec/rematrix.h                          |   25 +
 ac3dec/sanity_check.c                      |  131 ++
 ac3dec/sanity_check.h                      |   27 +
 ac3dec/stats.c                             |  178 +++
 ac3dec/stats.h                             |   27 +
 channels.conf                              |    2 +-
 config.h                                   |    4 +-
 dvbapi.c                                   | 1451 ++++++++++++++++----
 dvbapi.h                                   |   19 +-
 dvd.c                                      |  148 ++
 dvd.h                                      |   53 +
 i18n.c                                     |   22 +-
 menu.c                                     |  201 ++-
 menu.h                                     |   28 +-
 osd.c                                      |    3 +-
 osd.h                                      |    9 +-
 ringbuffer.c                               |  253 +++-
 ringbuffer.h                               |   84 +-
 thread.c                                   |   39 +-
 thread.h                                   |   17 +-
 tools.c                                    |    6 +-
 vdr.c                                      |   46 +-
 70 files changed, 8206 insertions(+), 405 deletions(-)
 create mode 100644 Tools/master-timer/LIESMICH
 create mode 100644 Tools/master-timer/README
 create mode 100644 Tools/master-timer/Todo
 create mode 100755 Tools/master-timer/master-timer.pl
 create mode 100755 Tools/master-timer/process_summary.pl
 create mode 100644 Tools/master-timer/sample/channels-to-scan
 create mode 100644 Tools/master-timer/sample/config
 create mode 100644 Tools/master-timer/sample/deepblack
 create mode 100644 Tools/master-timer/sample/done
 create mode 100644 Tools/master-timer/sample/subtitle-movie
 create mode 100644 Tools/master-timer/sample/torecord
 create mode 100755 Tools/master-timer/scan-channels
 create mode 100755 Tools/schnitt/cut2.pl
 create mode 100755 Tools/schnitt/cut3.pl
 create mode 100755 Tools/schnitt/cutall3.pl
 create mode 100644 Tools/schnitt/dump.c
 create mode 100755 Tools/schnitt/play
 create mode 100644 ac3dec/Makefile
 create mode 100644 ac3dec/ac3.h
 create mode 100644 ac3dec/ac3_internal.h
 create mode 100644 ac3dec/bit_allocate.c
 create mode 100644 ac3dec/bit_allocate.h
 create mode 100644 ac3dec/bitstream.c
 create mode 100644 ac3dec/bitstream.h
 create mode 100644 ac3dec/coeff.c
 create mode 100644 ac3dec/coeff.h
 create mode 100644 ac3dec/crc.c
 create mode 100644 ac3dec/crc.h
 create mode 100644 ac3dec/debug.c
 create mode 100644 ac3dec/debug.h
 create mode 100644 ac3dec/decode.c
 create mode 100644 ac3dec/decode.h
 create mode 100644 ac3dec/dither.c
 create mode 100644 ac3dec/dither.h
 create mode 100644 ac3dec/downmix.c
 create mode 100644 ac3dec/downmix.h
 create mode 100644 ac3dec/exponent.c
 create mode 100644 ac3dec/exponent.h
 create mode 100644 ac3dec/imdct.c
 create mode 100644 ac3dec/imdct.h
 create mode 100644 ac3dec/parse.c
 create mode 100644 ac3dec/parse.h
 create mode 100644 ac3dec/rematrix.c
 create mode 100644 ac3dec/rematrix.h
 create mode 100644 ac3dec/sanity_check.c
 create mode 100644 ac3dec/sanity_check.h
 create mode 100644 ac3dec/stats.c
 create mode 100644 ac3dec/stats.h
 create mode 100644 dvd.c
 create mode 100644 dvd.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 676cf8991..46a84101f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -106,3 +106,13 @@ Ulrich R
 
 Helmut Sch�chner <schaechner@yahoo.com>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Andreas Schultz <aschultz@warp10.net>
+ for adding support for replaying DVDs (much of this was derived from
+ dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>)
+
+Aaron Holtzman
+ for writing 'ac3dec'
+
+Wolfgang Henselmann-Weiss <Wolfgang_Henselmann@betaresearch.de>
+ for fixing calculating the timeout value in cFile::FileReady()
diff --git a/HISTORY b/HISTORY
index d625b260f..041e4423f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -609,3 +609,15 @@ Video Disk Recorder Revision History
 - Increased timeout until reporting "video data stream broken" when recording.
 - Explicitly switching back to the previously active channel after ending a
   replay session (to have it shown correctly in case it was in 'Transfer Mode').
+
+2001-08-06: Version 0.90
+
+- Modified the display of the channel group separators (thanks to Markus Lang
+  for this suggestion).
+- Added support for replaying DVDs (thanks to Andreas Schultz). See INSTALL for
+  instructions on how to compile VDR with DVD support.
+- Fixed replay progress display in case replay is paused while watching an
+  ongoing recording.
+- Ringbuffer uses semaphores to signal empty/full conditions.
+- Fixed calculating the timeout value in cFile::FileReady() (thanks to
+  Wolfgang Henselmann-Weiss).
diff --git a/INSTALL b/INSTALL
index 28037eb36..86b4a1eee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,7 +15,16 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile.
 
-This program requires the card driver version 0.9.0 or higher
+If you want to use your DVD drive you will need to compile VDR with
+
+  make DVD=1
+
+to activate DVD support. VDR then also needs the package 'libdvdread'
+in order to replay DVDs. This package is expected to be located in the
+directory ../DVD (seen from the VDR directory).  Adjust the definition
+of DVDDIR in the Makefile if necessary.
+
+VDR requires the card driver version 0.9.0 or higher
 to work properly. You need to load the dvb.o module *without* option
 'outstream=0' (previous versions of VDR required this option to have
 the driver supply the data in AV_PES format; as of version 0.70 VDR
@@ -100,6 +109,19 @@ This program must be given to VDR with the '-a' option, as in
 
   vdr -a ac3play
 
+Accessing the DVD drive:
+------------------------
+
+By default VDR expects the DVD drive to be located at /dev/dvd (which
+typically is a symbolic link to the actual device, for instance /dev/hdc).
+You can use the '-V' option to overwrite this, as in
+
+  vdr -V /media/dvd
+
+Note that the user id under which VDR runs needs to have write access to
+the DVD device in order to replay CSS protected DVDs (which also requires
+the presence of the 'libcss' library).
+
 The video data directory:
 -------------------------
 
diff --git a/MANUAL b/MANUAL
index c59f3fefc..59ff57c93 100644
--- a/MANUAL
+++ b/MANUAL
@@ -19,7 +19,7 @@ Video Disk Recorder User's Manual
   Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
   Red     -           Record     Edit       Edit       -             Play        -
   Green   -           Language   New        New        -             Rewind      Skip -60s
-  Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
+  Yellow  -           Eject DVD  Delete     Delete     -             Delete      Skip +60s
   Blue    -           Resume     Mark       Mark       -             Summary     Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           Editing
 
diff --git a/Makefile b/Makefile
index 507de2146..891871741 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,24 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.22 2001/06/02 09:15:39 kls Exp $
+# $Id: Makefile 1.24 2001/08/06 16:13:42 kls Exp $
 
 DVBDIR   = ../DVB
+DVDDIR   = ../DVD
+AC3DIR   = ./ac3dec
 
 INCLUDES = -I$(DVBDIR)/ost/include
-OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o osd.o\
+
+ifdef DVD
+INCLUDES += -I$(DVDDIR)/libdvdread
+LIBDIRS  += -L$(DVDDIR)/libdvdread/dvdread/.libs
+DEFINES  += -DDVDSUPPORT
+DEFINES  += -D_LARGEFILE64_SOURCE # needed by libdvdread
+AC3LIB    = $(AC3DIR)/libac3.a
+DVDLIB    = -ldvdread
+endif
+
+OBJS = config.o dvbapi.o dvbosd.o dvd.o eit.o font.o i18n.o interface.o menu.o osd.o\
        recording.o remote.o remux.o ringbuffer.o svdrp.o thread.o tools.o vdr.o\
        videodir.o
 
@@ -42,29 +54,30 @@ font: genfontfile fontfix.c fontosd.c
 
 # Dependencies:
 
-config.o    : config.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-dvbapi.o    : dvbapi.c config.h dvbapi.h dvbosd.h eit.h font.h recording.h remux.h ringbuffer.h thread.h tools.h videodir.h
+config.o    : config.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
+dvbapi.o    : dvbapi.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h recording.h remux.h ringbuffer.h thread.h tools.h videodir.h
 dvbosd.o    : dvbosd.c dvbosd.h font.h tools.h
-eit.o       : eit.c config.h dvbapi.h dvbosd.h eit.h font.h thread.h tools.h videodir.h
+dvd.o       : dvd.c dvd.h
+eit.o       : eit.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h thread.h tools.h videodir.h
 font.o      : font.c font.h fontfix.c fontosd.c tools.h
-i18n.o      : i18n.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h thread.h tools.h
-interface.o : interface.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-menu.o      : menu.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
-osd.o       : osd.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
-recording.o : recording.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
-remote.o    : remote.c config.h dvbapi.h dvbosd.h eit.h font.h remote.h thread.h tools.h
+i18n.o      : i18n.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h thread.h tools.h
+interface.o : interface.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
+menu.o      : menu.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
+osd.o       : osd.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
+recording.o : recording.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
+remote.o    : remote.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h remote.h thread.h tools.h
 remux.o     : remux.c remux.h thread.h tools.h
 ringbuffer.o: ringbuffer.c ringbuffer.h thread.h tools.h
-svdrp.o     : svdrp.c config.h dvbapi.h dvbosd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
+svdrp.o     : svdrp.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
 thread.o    : thread.c thread.h tools.h
 tools.o     : tools.c tools.h
-vdr.o       : vdr.c config.h dvbapi.h dvbosd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
+vdr.o       : vdr.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
 videodir.o  : videodir.c tools.h videodir.h
 
 # The main program:
 
-vdr: $(OBJS)
-	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread -o vdr
+vdr: $(OBJS) $(AC3LIB)
+	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) -o vdr
 
 # The font files:
 
@@ -80,9 +93,15 @@ genfontfile.o: genfontfile.c
 genfontfile: genfontfile.o
 	gcc -o $@ -L/usr/X11R6/lib $< -lX11
 
+# The ac3dec library:
+
+$(AC3LIB):
+	make -C $(AC3DIR) all
+
 # Housekeeping:
 
 clean:
-	-rm -f $(OBJS) vdr genfontfile genfontfile.o core
+	make -C $(AC3DIR) clean
+	-rm -f $(OBJS) vdr genfontfile genfontfile.o core *~
 CLEAN: clean
 	-rm -f fontfix.c fontosd.c
diff --git a/Tools/master-timer/LIESMICH b/Tools/master-timer/LIESMICH
new file mode 100644
index 000000000..969487507
--- /dev/null
+++ b/Tools/master-timer/LIESMICH
@@ -0,0 +1,106 @@
+		Master-Timer
+		============
+
+
+1. Einleitung
+-------------
+
+Master-Timer ist ein System zum automatischen Aufnehmen von Serien und Filmen.
+
+2. Voraussetzungen
+------------------
+
+VDR liefert die "epg.data".
+
+3. Konfigurationsdateien
+------------------------
+
+Alle Konfigurationsdateien liegen unter "<HOME>.master-timer"
+
+config: Eine Ansammlung von Key-Value Paaren. Alle sind "optional" und 
+        erhalten dann die angegebenen Default-Werte
+
+(# = Kommentarzeilen)
+marginstart	(Default 600)
+  Anzahl der "Sicherheits" Sekunden die ein Timer frueher beginnen soll
+
+marginstop	(Default 600)
+  Anzahl der "Sicherheits" Sekunden die ein Timer laenger dauern soll
+
+defaultprio	(Default 50)
+  Die Prioritaet die fuer Timer verwendet wird wo keine Prioritaet 
+  angegeben ist
+
+DVBCards	(Default 1)
+  Anzahl der vorhandenen DVB-Karten (Derzeit nicht verwendet)
+
+Dest-Host 	(Default "localhost")
+  Host-name oder IP des Rechners auf dem VDR laeuft
+
+Dest-Port 	(Default "2001")
+  Port der VDR verwendet
+
+jointimers	(Default 0)
+  Sollen aufeinanderfolgende Timer auf den gleichen Kanal zusammengefasst 
+  werden (0 = "Nein", alles andere "Ja")
+
+debug		(Default 0)
+  Debug-Level, die einzelnen Debug-Werte muessen aus folgenden Werten 
+  zusammengezaehlt werden
+    1     : Dump "torecord"
+    2     : Dump all timers
+    4     : Show when a timer will be deleted
+    8     : Dump the "Done" REs
+    16    : Verbose Config-Reading
+
+deepblack: Eine Liste von Titeln die man NIEMALS NIMMER sehen will
+           Jede Zeile = 1 Titel
+
+subtitle-movies: Eine Liste der "Subtitel" die ein Zeichen fuer einen Film sind
+                 (Soweit die von den Sendern richtig ausgefuellt sind.)
+                 Jede Zeile = 1 Subtitel
+
+torecord: Die Sachen die man Aufnehmen will
+          Jede Zeile = 1 Timer
+# Format: (Every field is "optional".
+# [Title RE|Subtitle RE|Description RE|Channel-Name|Timeframe|Prio|Timer-Title]
+#
+# To record something at least one of the "Title", "Subtitle" or "Description" 
+# Fields has to be provided. This 3 fields are "include" and the rest are 
+# "exclude" fields!
+#
+# More than one channel definition can be provided. The delimiter is ";"
+# Additionaly you can make a "blacklist" of Channels when you prepent a "!" to the first Channel Definition
+# The "!" is only tested for the FIRST Channel definition.
+# You can only have a white or a blacklist (Mixing doesn't make sense!)
+#
+# ex. Record the series "Deep Space Nine" on Sci-Fantasy in the timeframe 09:00 - 14:00
+# Deep Space Nine|||Sci-Fantasy|0900-1400|99|DS9
+#
+# Record all "Actionfilm"s with "Schwarzenegger"
+# |Actionfilm|Schwarzenegger
+#
+
+
+done: 	The titles/subtitles which are already recorded/should not be recorded
+        (Programmed Timers which got inserted into "done" will be deleted 
+         automaticaly)
+
+4. Notices
+----------
+
+- Recordings "overlapping" on the same channel, will be joined into one Timer
+- Title/Subtitle/Descriptions are "fixed" for Channel that don't fill them 
+  out "correctly" (Currently the "Bugs" from Pro-7/VOX/VIVA)
+  Pro7: Remove the Title from the Subtitle  '<Title> / <Subtitle>'
+  VOX/VIVA: Subtitle is enclosed into "" and after ". " is the description
+  VIVA: When the Subtitle beginns with space the subtitle is moved to
+        description
+  All (except the second VIVA one) fixes are tried onto ALL Subtitles.
+
+5. Known-Bugs
+-------------
+
+- It isn't checked if there are enough DVB-Cards
+- Overlapping Timers, on the same channel, are always joined
+- JOINed timers which are "done" don't get deleted automaticaly
diff --git a/Tools/master-timer/README b/Tools/master-timer/README
new file mode 100644
index 000000000..c71e6e185
--- /dev/null
+++ b/Tools/master-timer/README
@@ -0,0 +1,52 @@
+		Master-Timer (w) by Matthias Schniedermeyer (ms@citd.de)
+		============
+
+
+1. Introduction
+---------------
+
+Master-Timer ist a system for recording Films/Series automaticaly
+
+2. Requierements
+----------------
+
+epg.data
+
+3. Config-Files
+---------------
+
+For all files: One Entry per Line. Each line is a "Regular Expresion" 
+               So you can use all Perl-Style REs you want.
+               The RE are matched with "i" so they are case insensitive!
+               (Except for the "done"-list, these must match excatly!)
+
+deepblack: Blacklist of "Titles" you NEVER EVER want to get to you eyes
+
+subtitle-movies: A list of "Subtitles" which indicate a movie. 
+                 (For Channels that correctly fill out the Subtitle. 
+                  e.g. it won't work for *eRTL*)
+
+torecord:  The titles/subtitles/Description you want to record
+
+done: 	The titles/subtitles which are already recorded/should not be recorded
+        (Programmed Timers which got inserted into "done" will be deleted 
+         automaticaly)
+
+4. Notices
+----------
+
+- Recordings "overlapping" on the same channel, will be joined into one Timer
+- Title/Subtitle/Descriptions are "fixed" for Channel that don't fill them 
+  out "correctly" (Currently the "Bugs" from Pro-7/VOX/VIVA)
+  Pro7: Remove the Title from the Subtitle  '<Title> / <Subtitle>'
+  VOX/VIVA: Subtitle is enclosed into "" and after ". " is the description
+  VIVA: When the Subtitle beginns with space the subtitle is moved to
+        description
+  All (except the second VIVA one) fixes are tried onto ALL Subtitles.
+
+5. Known-Bugs
+-------------
+
+- It isn't checked if there are enough DVB-Cards
+- Overlapping Timers, on the same channel, are always joined
+- JOINed timers which are "done" don't get deleted automaticaly
diff --git a/Tools/master-timer/Todo b/Tools/master-timer/Todo
new file mode 100644
index 000000000..722ee969c
--- /dev/null
+++ b/Tools/master-timer/Todo
@@ -0,0 +1,10 @@
+
+- "Intelligenter" Kanal-Scanner (z.B. nur 1 Kanal fuer ein
+  Sender-"Gruppe")
+- Filtern nach Serie/Film
+- "Komfortable" Anzeige, mit Black & Whitelisten, fuer Genres/Titeln usw.
+- Unterstueztung von 1xVDR pro Karte
+- Abspielen (mit automatischen "killen" des "Frontend"-VDRs) von
+  Aufzeichnungen
+- "View"-Timer d.h. Timer der nicht Aufnimmt sondern nur den Kanal aendert
+- "unwichtige" Timer "verdraengen" wenn andere Aufnahmen anstehen.
diff --git a/Tools/master-timer/master-timer.pl b/Tools/master-timer/master-timer.pl
new file mode 100755
index 000000000..3b98acc8d
--- /dev/null
+++ b/Tools/master-timer/master-timer.pl
@@ -0,0 +1,1169 @@
+#!/usr/bin/perl -w
+
+use strict;
+# For the TCP-Connection to VDR
+use Socket;
+# For converting the Timers, read from VDR, back to Unix-Timestamps
+use Time::Local;
+
+# Debugmode
+# You have to add the following numbers to build the debug-var
+# 1     : Dump the "torecord"
+# 2     : Dump all timers
+# 4     : Show when a timer will be deleted
+# 8     : Dump the "Done" REs
+# 16    : Verbose Config-Reading
+my $debug = 0;
+
+# The Supervariable Program
+# %Program{$title}{$channel}{$time}{duration}
+#                                  {subtitle}
+#                                  {description}
+
+# The Supervariable Timer
+# %Timer{$time}{$channel}{$title}{duration}
+#                                {subtitle}
+#                                {prio}
+#                                {real_title}
+#                                {VDR} (Already programmed)
+# The Value of VDR is ">0" for the position in the Timer-List or "R" for a "Repeating" Timer.
+# A Value of >1.000.000 is a Master Timer-Timer which is already programmed into VDR
+
+# Variable-Definition
+my (%Program, @channels, %channels, %Timer);
+
+# Which Subtitles are Movies
+my ($subtitle_movie);
+
+# Blacklist
+my ($title_deepblack);
+
+# What is already recorded/Should not be recorded
+my ($title_done, $subtitle_done);
+
+# What to record
+my ($title_torecord, $subtitle_torecord, $description_torecord, @title_torecord, @subtitle_torecord, @description_torecord, @channel_torecord, @timeframe_torecord, @prio_torecord, @timer_title_torecord, $num_torecord, @marginstart_torecord, @marginstop_torecord, @machine_torecord);
+
+# Default Priority for Timers (Config: defaultprio)
+my $default_prio = 50;
+
+# How many DVB-S cards are there (Config: DVBCards)
+my $DVB_cards = 1;
+
+# How many seconds to substract from the time and to add to the duration
+my $marginstart = 60*10; # Config: Marginstart
+my $marginstop = 60*10; # Config: Marginstop
+
+# Shall Timers, on the same channel, be joined if they overlap
+my $jointimers = 0;
+
+# Hostname/IP of DVB-Computer and the Port of VDR
+my @Dest = ("localhost:2001"); # Config: Dest
+
+# Which VDR-Instance shall be used
+my $currentVDR = 1;
+
+# Working-Variables
+my ($title, $duration, $subtitle, $channel, $time, $description, $hit);
+my (@time, @date);
+
+sub sub_die
+  {
+    my ($error) = @_;
+    &closesocket();
+    die "$error";
+  }
+
+
+if ($ARGV[0])
+  {
+    $currentVDR = $ARGV[0];
+  }
+
+&init();
+&dumpdone() if ($debug & 8);
+&dumptorecord() if ($debug & 1);
+&fetchVDRTimers();
+&process_torecord();
+print "Timers before joining\n" if ($debug & 2 && $jointimers);
+&dumptimers() if ($debug & 2);
+if ($jointimers)
+  {
+    &jointimers();
+    print "Timers after joining\n" if ($debug & 2);
+    &dumptimers() if ($debug & 2);
+  }
+
+&printtimers();
+&transfertimers();
+&closesocket();
+
+#
+# Subfunctions
+#
+
+sub dumpdone()
+  {
+    print "Start Done-dump\n";
+    print "Titledone: \"$title_done\"\n";
+    print "Subtitledone \"$subtitle_done\"\n";
+    print "End Done-dump\n";
+  }
+
+sub dumptorecord()
+  {
+    print "Start Torecord-dump\n";
+    print "Regex-Title: $title_torecord\n";
+    print "Regex-Subtitle: $subtitle_torecord\n";
+    print "Regex-Description: $description_torecord\n";
+    foreach my $num (0 .. $num_torecord)
+      {
+	print "Timer Number $num: ";
+
+	print "Title: \"$title_torecord[$num]\" " if ($title_torecord[$num]);
+	print "Title: \"\" " unless ($title_torecord[$num]);
+
+	print "Subtitle: \"$subtitle_torecord[$num]\" "if ($subtitle_torecord[$num]);
+	print "Subtitle: \"\" " unless ($subtitle_torecord[$num]);
+	
+	print "Description: \"$description_torecord[$num]\" " if ($description_torecord[$num]);
+	print "Description: \"\" " unless ($description_torecord[$num]);
+	
+	print "Timeframe: \"$timeframe_torecord[$num]\" " if ($timeframe_torecord[$num]);
+	print "Timeframe: \"\" " unless ($timeframe_torecord[$num]);
+	
+	print "Channel: \"". join (";",@{$channel_torecord[$num]})."\" " if ($channel_torecord[$num]);
+	print "Channel: \"\" " unless ($channel_torecord[$num]);
+	
+	print "Prio: \"$prio_torecord[$num]\" " if ($prio_torecord[$num]);
+	print "Prio: \"\" " unless ($prio_torecord[$num]);
+	
+	print "Timertitle: \"$timer_title_torecord[$num]\" " if ($timer_title_torecord[$num]);
+	print "Timertitle: \"\" " unless ($timer_title_torecord[$num]);
+
+	print "Marginstart: \"$marginstart_torecord[$num]\" " if ($marginstart_torecord[$num]);
+	print "Marginstart: \"\" " unless ($marginstart_torecord[$num]);
+
+	print "Marginstop: \"$marginstop_torecord[$num]\" " if ($marginstop_torecord[$num]);
+	print "Marginstop: \"\" " unless ($marginstop_torecord[$num]);
+
+	print "Machine: \"$machine_torecord[$num]\" " if ($machine_torecord[$num]);
+	print "Machine: \"\" " unless ($machine_torecord[$num]);
+
+	print "\n";
+      }
+    print "End Torecord-dump\n";
+  }
+
+sub dumptimers()
+  {
+    print "Start Timers-dump\n";
+    foreach $time (sort {$a <=> $b} keys %Timer)
+      {
+	foreach $channel (sort keys %{%Timer->{$time}})
+	  {
+	    foreach $title (sort keys %{%Timer->{$time}->{$channel}})
+	      {
+		my ($prio, @time, @date, @time2);
+		my ($realtitle);
+		@time = &GetTime ($time);
+		@date = &GetDay ($time);
+		@time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
+		$subtitle = $Timer{$time}{$channel}{$title}{subtitle};
+		$prio = $Timer{$time}{$channel}{$title}{prio};
+		$realtitle = $Timer{$time}{$channel}{$title}{real_title};
+		print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:99:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\":$Timer{$time}{$channel}{$title}{VDR}\n";
+	      }
+	  }
+      }
+    print "End Timers-dump\n";
+  }
+
+sub printtimers()
+  {
+    foreach $time (sort {$a <=> $b} keys %Timer)
+      {
+	foreach $channel (sort keys %{%Timer->{$time}})
+	  {
+	    foreach $title (sort keys %{%Timer->{$time}->{$channel}})
+	      {
+		my ($prio, @time, @date, @time2);
+		if ($Timer{$time}{$channel}{$title}{VDR} eq 0)
+		  {
+		    my ($realtitle);
+		    @time = &GetTime ($time);
+		    @date = &GetDay ($time);
+		    @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
+		    $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
+		    $prio = $Timer{$time}{$channel}{$title}{prio};
+		    $realtitle = $Timer{$time}{$channel}{$title}{real_title};
+
+		    print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:99:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"\n";
+		  }
+	      }
+	  }
+      }
+  }
+
+sub transfertimers()
+  {
+    foreach $time (sort {$a <=> $b} keys %Timer)
+      {
+	foreach $channel (sort keys %{%Timer->{$time}})
+	  {
+	    foreach $title (sort keys %{%Timer->{$time}->{$channel}})
+	      {
+		my ($prio, @time, @date, @time2, $realtitle, $result);
+		if ($Timer{$time}{$channel}{$title}{VDR} eq 0)
+		  {
+		    @time = &GetTime ($time);
+		    @date = &GetDay ($time);
+		    @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
+		    $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
+		    $prio = $Timer{$time}{$channel}{$title}{prio};
+		    $realtitle = $Timer{$time}{$channel}{$title}{real_title};
+
+		    ($result) = GetSend ("newt 2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:99:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"");
+		    print "Timer: $result" if ($debug & 2);
+		  }
+	      }
+	  }
+      }
+  }
+
+# Convert the Unix-Time-Stamp into "month" and "Day of month"
+sub GetDay
+ {
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
+    $mon++;
+    $mon = sprintf ("%02i",$mon);
+    $mday = sprintf ("%02i",$mday);
+    return ($mon, $mday);
+  }
+
+# Convert the Unix-Time-Stramp into "hour" and "minute"
+sub GetTime
+  {
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
+    $hour = sprintf ("%02i",$hour);
+    $min = sprintf ("%02i",$min);
+    return ($hour, $min);
+  }
+
+# Workaround some EPG-Bugs
+sub correct_epg_data
+  {
+    if ($subtitle)
+      {
+	# For Pro-7. Remove $title from $subtitle
+	$subtitle =~ s/$title\s\/\s//;
+	
+	# For VOX & VIVA. The Format it '"<Subtitle>". <Description>'
+	if ($subtitle =~ /^\"(.*?)\"\.\s(.*)/)
+	  {
+	    # Lets see if there are Channels that where the VOX/VIVA scheme matches, but also have a description
+	    if ($description)
+	      {
+		sub_die ("Subtitle: \"$subtitle\"\nDescription\"$description\"\n");
+	      }
+	    $subtitle = $1;
+	    $description = $2;
+	  }
+	elsif ($channel eq "VIVA")
+	  {
+	    if ($subtitle =~ /^\s(.*)/)
+	      {
+		$subtitle = "";
+		$description = $1;
+	      }
+	  }
+      }
+
+    # Workaround for the broken PRO-7/Kabel-1 EPG-Date. If Time is between 00.00 and 05.00 the time is shifted forward by a day
+    if ($channel eq "Pro-7" || $channel eq "Kabel-1")
+      {
+	my (@time);
+	@time = GetTime ($time);
+	if ($time[0] >= 0 && ($time[0] <= 4 || ($time[0] == 5 && $time[1] == 0)))
+	  {
+	    $time += 24*60*60;
+	  }
+      }
+}
+
+# Add a Recording into the "to record"-List
+sub addtimer
+  {
+    my ($hit, $title, $realtitle, $subtitle, $channel, $time, $duration, $prio, $VDR, $time2, $title2, $channel2, $marginstart, $marginstop);
+    ($title, $realtitle, $subtitle, $channel, $time, $duration, $prio, $VDR, $marginstart, $marginstop) = @_;
+#    print "Title: \"$title\" Realtitle: \"$realtitle\" Subtitle: \"$subtitle\" Channel: \"$channel\" Time: \"$time\" Duration: \"$duration\" Prio: \"$prio\" VDR: \"$VDR\"\n";
+
+    $hit = 1;
+
+    foreach $time2 (sort keys %Timer)
+      {
+        foreach $title2 (sort keys %{%Timer->{$time2}->{$channel}})
+          {
+	    my ($ctime, $ctime2);
+	    $ctime = $time2;
+	    $ctime2 = $time2 + $Timer{$time2}{$channel}{$title2}{duration};
+
+	    if (($time >= $ctime) && ($time <= $ctime2))
+	      {
+		undef $hit;
+	      }
+          }
+      }
+
+
+    if ($hit)
+      {
+	$time -= $marginstart;
+	$duration += $marginstart + $marginstop;
+	$Timer{$time}{$channel}{$title}{duration}=$duration;
+	$Timer{$time}{$channel}{$title}{subtitle}=$subtitle;
+	$Timer{$time}{$channel}{$title}{prio}=$prio;
+	$Timer{$time}{$channel}{$title}{VDR}=$VDR;
+	$Timer{$time}{$channel}{$title}{real_title}=$realtitle;
+      }
+  }
+
+sub deltimer()
+  {
+    my ($time, $channel, $title, $delete_from_VDR);
+    ($time, $channel, $title, $delete_from_VDR) = @_;
+
+#    if ($delete_from_VDR)
+#      {
+#	if ($Timer{$time}{$channel}{$title}{VDR})
+#	  {
+#	    if ($Timer{$time}{$channel}{$title}{VDR} =~ s/ ^R/)
+#	      {
+#		print "Error: A Repeating-Timer can't be deleted from VDR: \"$title\"\n";
+#	      }
+#	    elsif ($Timer{$time}{$channel}{$title}{VDR} < 1000000)
+#	      {
+#		print "A User-Programmed Timer has been deleted from VDR: \"$title\"\n";
+#	      }
+#	    else
+#	      {
+#		
+#	      }
+#	  }
+#      }
+
+    delete $Timer{$time}{$channel}{$title}{duration};
+    delete $Timer{$time}{$channel}{$title}{subtitle};
+    delete $Timer{$time}{$channel}{$title}{prio};
+    delete $Timer{$time}{$channel}{$title}{VDR};
+    delete $Timer{$time}{$channel}{$title}{real_title};
+    delete $Timer{$time}{$channel}{$title};
+    delete $Timer{$time}{$channel} if (keys %{ $Timer{$time}{$channel} } == 1);
+    delete $Timer{$time} if (keys %{ $Timer{$time} } == 1);
+  }
+
+sub jointimers
+  {
+    #
+    # FIXME: 2 Timers on the same channel will always be joined.
+    # It should be checked if there is another DVB-Card available.
+    #
+    # FIXME2: When one timer is already programmed in VDR, delete that timer in VDR.
+    my ($running, $counter, @times, $channel, $title, $channel2, $title2);
+    $running = 1;
+  outer: while ($running)
+      {
+	$counter = 0;
+	@times = sort {$a <=> $b} keys %Timer;
+
+	# We only need to check till the second last timer. The last one can't have a overlapping one.
+	while ($counter < $#times)
+	  {
+	    foreach $channel (sort keys %{%Timer->{$times[$counter]}})
+	      {
+		foreach $title (sort keys %{%Timer->{$times[$counter]}->{$channel}})
+		  {
+		    if ($times[$counter + 1] < ($times[$counter] + $Timer{$times[$counter]}{$channel}{$title}{duration}))
+		      {
+			foreach $channel2 (sort keys %{%Timer->{$times[$counter + 1]}})
+			  {
+			    foreach $title2 (sort keys %{%Timer->{$times[$counter + 1]}->{$channel}})
+			      {
+				if ($channel eq $channel2)
+				  {
+				    my ($duration, $subtitle, $prio, $realtitle, $duration2, $subtitle2, $prio2, $realtitle2);
+				    # Values from Lower-Timer
+				    $duration = $Timer{$times[$counter]}{$channel}{$title}{duration};
+				    $subtitle = $Timer{$times[$counter]}{$channel}{$title}{subtitle};
+				    $prio = $Timer{$times[$counter]}{$channel}{$title}{prio};
+				    $realtitle = $Timer{$times[$counter]}{$channel}{$title}{real_title};
+
+				    # Values from Higher-Timer
+				    $duration2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{duration};
+				    $subtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{subtitle};
+				    $prio2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{prio};
+				    $realtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{real_title};
+
+				    # Use the Higher Priority for the new Timer
+				    $prio = ($prio > $prio2) ? $prio : $prio2;
+
+				    # Delete the two "Obsolet" Timers
+				    &deltimer ($times[$counter], $channel, $title);
+				    &deltimer ($times[$counter + 1], $channel2, $title2);
+
+				    # And set the new one
+				    &addtimer ("$title + $title2", "$realtitle\~$realtitle2", "$subtitle\~$subtitle2", $channel, $times[$counter], $duration2 + ($times[$counter + 1 ] - $times[$counter]),$prio,0,0,0);
+
+				    # Now a Value is "missing", so we will redo the whole thing. (This will do three-times JOIN correct)
+				    redo outer;
+				  }
+			      }
+			  }
+		      }
+		  }
+	      }
+	    $counter++;
+	  }
+	undef $running;
+      }
+  }
+
+sub process_torecord
+  {
+    my ($first_hit, $prio, $timer_title);
+    foreach $title (sort keys %Program)
+      {
+	foreach $channel (sort keys %{%Program->{$title}})
+	  {
+	    foreach $time (sort {$a <=> $b} keys %{%Program->{$title}->{$channel}})
+	      {
+		undef $hit;
+
+		# First look if any of the Title/Subtitle/Description REs match
+		if ($title =~ /$title_torecord/i)
+		  {
+		    $hit = 1;
+		  }
+		elsif ($Program{$title}{$channel}{$time}{subtitle} && $Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_torecord/i)
+		  {
+		    $hit = 1;
+		  }
+		elsif ($Program{$title}{$channel}{$time}{description} && $Program{$title}{$channel}{$time}{description} =~ /$description_torecord/i)
+		  {
+		    $hit = 1;
+		  }
+
+		# Now look if we have a "exact" hit
+		if ($hit)
+		  {
+		    my ($counter);
+		    undef $hit;
+		    foreach $counter (0 .. $num_torecord)
+		      {
+			
+			if ($title_torecord[$counter])
+			  {	
+			    if (!($title =~ /$title_torecord[$counter]/i))
+			      {
+				next;
+			      }
+			  }
+
+			if ($subtitle_torecord[$counter])
+			  {
+			    if (!($Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_torecord[$counter]/i))
+			      {
+				next;
+			      }
+			    elsif (!$title_torecord[$counter] && !$description_torecord[$counter])
+			      {
+				next;
+			      }
+			  }
+
+			if ($description_torecord[$counter])
+			  {
+			    if ($Program{$title}{$channel}{$time}{description})
+			      {
+				if (!($Program{$title}{$channel}{$time}{description} =~ /$description_torecord[$counter]/i))
+				  {
+				    next;
+				  }
+			      }
+			    elsif (!$title_torecord[$counter] && !$subtitle_torecord[$counter])
+			      {
+				next;
+			      }
+			  }
+
+			if ($channel_torecord[$counter])
+			  {
+			    my ($hit);
+			    # Blacklist-Mode
+			    if ($channel_torecord[$counter][0] =~ /^!/)
+			      {
+				$hit = 1;
+				foreach (0 .. $#{$channel_torecord[$counter]})
+				  {
+				    # Strip a possibel "!" Charactar
+				    $channel_torecord[$counter][$_] =~ /^!?(.*)/;
+				    if ($channel =~ /^$1$/)
+				      {
+					undef $hit;
+					last;
+				      }
+				  }
+			      }
+			    # Whitelist-Mode
+			    else
+			      {
+				undef $hit;
+				foreach (0 .. $#{$channel_torecord[$counter]})
+				  {
+				    # Strip a possibel "!" Charactar
+				    $channel_torecord[$counter][$_] =~ /^!?(.*)/;
+				    if ($channel =~ /^$1$/)
+				      {
+					$hit = 1;
+					last ;
+				      }
+				  }
+			      }
+			    if (!$hit)
+			      {
+				next;
+			      }
+			  }
+
+			if ($timeframe_torecord[$counter])
+			  {
+			    my (@time, $time2, $ctime, $ctime2);
+			    @time = GetTime($time);
+			    $time2 = "$time[0]$time[1]";
+
+			    ($ctime, $ctime2) = split (/\-/,$timeframe_torecord[$counter]);
+
+			    if (!$ctime)
+			      {
+				$ctime = "0";
+			      }
+			    if (!$ctime2)
+			      {
+				$ctime2 = "2400";
+			      }
+
+			    if ($ctime < $ctime2)
+			      {
+				if (!($time2 >= $ctime && $time2 <= $ctime2))
+				  {
+				    next;
+				  }
+			      }
+			    else
+			      {
+				if (!(($time2 >= $ctime && $time2 <= "2400") || ($time2 >= "0" && $time2 <= $ctime2)))
+				  {
+				    next;
+				  }
+			      }
+			  }
+
+			if ($prio_torecord[$counter])
+			  {
+			    $prio = $prio_torecord[$counter];
+			  }
+			else
+			  {
+			    $prio = 50;
+			  }
+
+			# What Title to use for the timer
+			if ($timer_title_torecord[$counter])
+			  {
+			    $timer_title = $timer_title_torecord[$counter]
+			  }
+			elsif ($title_torecord[$counter])
+			  {
+			    $timer_title = $title_torecord[$counter]
+			  }
+			else
+			  {
+			    $timer_title = $title;
+			  }
+
+			my ($subtitle);
+			if ($Program{$title}{$channel}{$time}{subtitle})
+			  {
+			    $subtitle = $Program{$title}{$channel}{$time}{subtitle};
+			  }
+			else
+			  {
+			    $subtitle = "";
+			  }
+
+			&addtimer ($timer_title,$title,$subtitle,$channel,$time,$Program{$title}{$channel}{$time}{duration},$prio,0,$marginstart_torecord[$counter],$marginstop_torecord[$counter]);
+			last;
+		      }
+		  }
+	      }
+	  }
+      }
+  }
+
+# Open the connection to VDR
+sub initsocket
+  {
+    my ($Dest, $Port) = split (/\:/,$Dest[$currentVDR - 1],2);
+    my $iaddr = inet_aton($Dest);
+    my $paddr = sockaddr_in($Port, $iaddr);
+
+    socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp'));
+    connect(SOCKET, $paddr) or sub_die ("Can't connect to VDR\n");
+    select(SOCKET); $| = 1;
+    select(STDOUT);
+
+    while (<SOCKET>) {
+      last if substr($_, 3, 1) ne "-";
+    }
+  }
+
+# Send a command to VDR and read back the result
+sub GetSend
+  {
+    my ($command, @retval);
+
+    while ($command = shift)
+      {
+	print SOCKET "$command\r\n";
+	while (<SOCKET>) {
+	  (@retval) = (@retval, $_);
+	  last if substr($_, 3, 1) ne "-";
+	}
+      }
+
+    foreach my $retval (@retval)
+      {
+	$retval =~ s/\x0d//g;
+      }
+    return (@retval);
+  }
+
+# Close the socket to VDR
+sub closesocket
+  {
+    print SOCKET "Quit\r\n";
+    close(SOCKET);
+  }
+
+
+# Fetch the timers-List from VDR via SVDR and process it.
+sub fetchVDRTimers
+  {
+    my (@timers, $timer, $position, $active, $channel, $day, $start, $end, $prio, $ttl, $title, $subtitle, $minute, $duration);
+    my ($utime, $utime2);
+
+    # First fetch the timers-list from VDR
+    @timers = GetSend ("lstt");
+
+    foreach $timer (@timers)
+      {
+#	$timer =~ s/\x0d//g;
+	chomp $timer;
+	# a Valid Timer-line beginns with "250"
+	if ($timer =~ s/250-|250\s//)
+	  {
+	    # Extract the Position in front of the line
+	    ($position, $timer) = split (/\s/,$timer,2);
+
+#	    print "Position: \"$position\" Timer: \"$timer\"\n";
+	    # Split the : seperated values
+	    ($active, $channel, $day, $start, $end, $prio, $ttl, $title, $subtitle) = split (/\:/,$timer,9);
+
+	    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+	    # If the string is exactly 7 char wide, then its a "repeating"-timer
+	    if ($active >= 1)
+	      {
+		if ($day =~ /(.)(.)(.)(.)(.)(.)(.)/)
+		  {
+		    my (@days);
+		    @days = ($1, $2, $3, $4, $5, $6, $7);
+		    ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+		    $start =~ /(\d\d)(\d\d)/;
+		    $hour = $1;
+		    $minute = $2;
+		    $utime = timelocal 0, $minute, $hour, $mday, $mon, $year;
+		    $end =~ /(\d\d)(\d\d)/;
+		    $hour = $1;
+		    $minute = $2;
+		    $utime2 = timelocal 0, $minute, $hour, $mday, $mon, $year;
+		    if ($end < $start)
+		      {
+			$utime2 += 24*60*60;
+		      }
+		    $duration = $utime2 - $utime;
+
+		    # "Normalize" the timestamp to monday
+		    $utime = $utime - ($wday * 24 * 60 *60);
+
+		    foreach my $num (0 .. $#days)
+		      {
+			if ($days[$num] ne "-")
+			  {
+			    my $utime3;
+			    # Todays before today will be shifted in the next week
+			    if (($num + 1) < $wday)
+			      {
+				$utime3 = $utime + (($num + 7 + 1) * 24 * 60 * 60);
+			      }
+			    else
+			      {
+				$utime3 = $utime + (($num + 1) * 24 * 60 * 60);
+			      }
+			    &addtimer ($title,$title,$subtitle,$channels[$channel],$utime3,$duration,$prio,"R$position",0,0);
+			  }
+		      }
+		  }
+
+		# When the Day-Value is between 1 and 31, then its a "One time" Timer
+		elsif (($day >= 1) && ($day <= 31))
+		  {
+		    if ($active == "2")
+		      {
+			$position += 1000000;
+		      }
+		    # When the Day is before the Current-Day, then the Timer is for the next month
+		    if ($day < $mday)
+		      {
+			$mon++;
+			if ($mon == 12)
+			  {
+			    $mon = 0;
+			    $year ++;
+			  }
+		      }
+		    $start =~ /(\d\d)(\d\d)/;
+		    $hour = $1;
+		    $minute = $2;
+		    $utime = timelocal 0, $minute, $hour, $day, $mon, $year;
+		    $end =~ /(\d\d)(\d\d)/;
+		    $hour = $1;
+		    $minute = $2;
+		    $utime2 = timelocal 0, $minute, $hour, $day, $mon, $year;
+		    if ($end < $start)
+		      {
+			$utime2 += 24*60*60;
+		      }
+		    $duration = $utime2 - $utime;
+
+		    &addtimer ($title,$title,$subtitle,$channels[$channel],$utime,$duration,$prio,$position,0,0);
+		  }
+	      }
+	  }
+      }
+  }
+
+# Parse file "epg.data"
+sub initepgdata
+  {
+    open (FI,"epg.data") or sub_die ("Can't open file \"epg.data\"\n");
+
+    while (<FI>)
+      {
+	# Begin Channel
+	if (/^C\s(\d+)\s+(.+)/)
+	  {
+	    $channel = $2;
+	    while (<FI>)
+	      {
+		# End Channel
+		if (/^c$/)
+		  {
+		    last;
+		  }
+		# Begin Timer
+		elsif (/^E\s(\d+)\s+(\d+)\s+(\d+)$/)
+		  {
+		    # Undef this Variables because it is possibel that not every timer uses this values
+		    undef $duration;
+		    undef $subtitle;
+		    undef $description;
+
+		    $time=$2;
+		    $duration=$3;
+		  }
+		# Title
+		elsif (/^T\s(.*)/)
+		  {
+		    $title = $1;
+		  }
+		# Subtitle
+		elsif (/^S\s(.*)/)
+		  {
+		    $subtitle=$1;
+		  }
+		# Description
+		elsif (/^D\s(.*)/)
+		  {
+		    $description=$1;
+		  }
+		# End Timer
+		elsif (/^e$/)
+		  {
+		    # Only accept timers that are in the future
+		    if ($time < time)
+		      {
+			next;
+		      }
+
+		    # Work around the diffrent Bugs in the data
+		    &correct_epg_data();
+
+		    # Check if the title is in the DEEP-Blacklist
+		    if ($title =~ /$title_deepblack/i)
+		      {
+			next;
+		      }
+
+		    # Check if the Title & Subtitle is in the Done-List
+		    if ($title =~ /$title_done/)
+		      {
+			if ($subtitle)
+			  {
+			    if ($subtitle =~ /$subtitle_done/)
+			      {
+				next;
+			      }
+			  }
+		      }
+
+		    $Program{$title}{$channel}{$time}{duration}=$duration;
+		    if ($subtitle)
+		      {
+			$Program{$title}{$channel}{$time}{subtitle}=$subtitle;
+		      }
+		    if ($description)
+		      {
+			$Program{$title}{$channel}{$time}{description}=$description;
+		      }
+		  }
+	      }
+	  }
+      }
+    close (FI);
+  }
+
+# What is a Movie (When correctly stored into Subtitle)
+sub initmovie
+  {
+    my (@list,$list);
+    open (FI,"$ENV{HOME}/.master-timer/subtitle-movie") or return;
+    @list = <FI>;
+    close(FI);
+
+    foreach $list (@list)
+      {
+	chomp $list;
+      }
+    $subtitle_movie = join ('|',@list);
+  }
+
+# What should be blacklistet
+sub initblacklist
+  {
+    my (@list,$list);
+    if (open (FI,"$ENV{HOME}/.master-timer/deepblack"))
+      {
+	@list = <FI>;
+	close(FI);
+	
+	foreach $list (@list)
+	  {
+	    chomp $list;
+	  }
+	$title_deepblack = join ('|',@list);
+      }
+    else
+      {
+	$title_deepblack = "^\$";
+      }
+  }
+
+# What is already recorded/Should not be recorded
+sub initdone
+  {
+    my (@list,$list, %title_done, %subtitle_done, $title_temp, $subtitle_temp);
+    if (open (FI,"$ENV{HOME}/.master-timer/done"))
+      {
+	@list = <FI>;
+	close (FI);
+
+	foreach $list (@list)
+	  {
+	    chomp $list;
+	    ($title_temp,$subtitle_temp) = split (/\|/,$list);
+	    if ($title_temp)
+	      {
+		$title_done{"^$title_temp\$"} = 1;
+	      }
+	    if ($subtitle_temp)
+	      {
+		$subtitle_done{"^$subtitle_temp\$"} = 1;
+	      }
+	  }
+	$title_done = join ('|',sort keys %title_done);
+	$subtitle_done = join ('|',sort keys %subtitle_done);
+
+	# Ein paar Zeichen Escapen
+	$title_done =~ s/\?/\\\?/g;
+	$title_done =~ s/\+/\\\+/g;
+	$subtitle_done =~ s/\?/\\\?/g;
+	$subtitle_done =~ s/\+/\\\+/g;
+
+	# Now delete Timers in VDR that are already in the done-List
+	my ($position, $timer, $active, $g, $title, $subtitle, $counter, @todel);
+	$counter = 0;
+	@list = GetSend ("LSTT");
+	
+	foreach $timer (@list)
+	  {
+#	    $timer =~ s/0x0d//g;
+	    chomp $timer;
+	    if ($timer =~ s/250-|250\s//)
+	      {
+		($position, $timer) = split (/\s/,$timer,2);
+		# Split the : seperated values
+		($active, $g, $g, $g, $g, $g, $g, $title, $subtitle) = split (/\:/,$timer,9);
+		if ($active == 2)
+		  {
+		    # Title: "Shakespeare in Love"||Subtitle: "Romanze"
+		    my ($ctitle, $csubtitle);
+		    if ($subtitle && $subtitle =~ /^Title\:\s\"(.*)\"\|\|Subtitle\:\s\"(.*)\"/)
+		      {
+			$title = $1;
+			$subtitle = $2;
+			if ($subtitle)
+			  {
+			    my (@titles, @subtitles, $num, $hit);
+			    undef $hit;
+			    @titles = split (/\~/,$title);
+			    @subtitles = split (/\~/,$subtitle);
+			    foreach $num (0 .. $#titles)
+			      {
+				if ($titles[$num] =~ /$title_done/ && $subtitles[$num] =~ /$subtitle_done/)
+				  {
+				    $hit = 1;
+				  }
+				else
+				  {
+				    undef $hit;
+				    last;
+				  }
+			      }
+
+			    if ($hit)
+			      {
+				my ($result);
+				print "Delete Timer: $title $subtitle\n" if ($debug & 4);
+				$position -= $counter;
+				($result) = GetSend ("DELT $position");
+				print "Result: $result" if ($debug & 4);
+				if ($result =~ /^250/)
+				  {
+				    $counter++;
+				  }
+			      }
+			  }
+		      }
+		  }
+	      }
+	  }
+      }
+  }
+
+# What should be recorded
+sub inittorecord
+  {
+    my (@list, $list, $title, $subtitle, $description, $channel, $timeframe, $prio, $timer_title, $margin, $machine, @title_list, @subtitle_list, @description_list);
+    my $counter = 0;
+    open (FI,"$ENV{HOME}/.master-timer/torecord") or sub_die ("Can't open file \"torecord\"\n");
+    @list = <FI>;
+    close(FI);
+
+    foreach $list (0 .. $#list)
+      {
+	chomp $list[$list];
+	if ($list[$list] && !($list[$list] =~ /^\#/))
+	  {
+	    ($title, $subtitle, $description, $channel, $timeframe, $prio, $timer_title, $margin, $machine) = split (/\|/,$list[$list]);
+
+	    # Accept torecord only if it is for the current machine
+	    if ((!$machine && $currentVDR == 1) || $machine == $currentVDR)
+	      {
+		if ($title)
+		  {
+		    $title_torecord[$counter] = $title;
+		    $title_list[$#title_list + 1] = $title;
+		  }
+		if ($subtitle)
+		  {
+		    $subtitle_torecord[$counter] = $subtitle;
+		    $subtitle_list[$#subtitle_list + 1] = $subtitle;
+		  }
+		if ($description)
+		  {
+		    $description_torecord[$counter] = $description;
+		    $description_list[$#description_list + 1] = $description;
+		  }
+		if ($channel)
+		  {
+		    my (@temp);
+		    @temp = split (/\;/,$channel);
+		    foreach (0 .. $#temp)
+		      {
+			$channel_torecord[$counter][$_] = $temp[$_];
+		      }
+		  }
+		if ($timeframe)
+		  {
+		    $timeframe_torecord[$counter] = $timeframe;
+		  }
+		if ($prio)
+		  {
+		    $prio_torecord[$counter] = $prio;
+		  }
+		else
+		  {
+		    $prio_torecord[$counter] = $default_prio;
+		  }
+		if ($timer_title)
+		  {
+		    $timer_title_torecord[$counter] = $timer_title;
+		  }
+		if ($margin)
+		  {
+		    my ($start, $stop);
+		    ($start, $stop) = split (/;/,$margin, 2);
+		    $marginstart_torecord[$counter] = $start if ($start);
+		    $marginstop_torecord[$counter] = $stop if ($stop);
+		  }
+		# Set Default-Margins if not margins defined
+		$marginstart_torecord[$counter] = $marginstart if (!$marginstart_torecord[$counter]);
+		$marginstop_torecord[$counter] = $marginstop if (!$marginstop_torecord[$counter]);
+		$counter++;
+	      }
+	  }
+      }
+
+    $num_torecord = $counter - 1;
+
+    $title_torecord = join ('|',@title_list);
+    $subtitle_torecord = join ('|',@subtitle_list);
+    $description_torecord = join ('|',@description_list);
+
+    if (!$title_torecord)
+      {
+	$title_torecord = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+      }
+    if (!$subtitle_torecord)
+      {
+	$subtitle_torecord = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+      }
+    if (!$description_torecord)
+      {
+	$description_torecord = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+      }
+  }
+
+# Parse the "channels.conf" of VDR
+sub initchannellist
+  {
+    my ($counter, $chan, $garbage, $card, @temp_channels, $temp, $i);
+
+    @temp_channels = GetSend ("LSTC");
+
+    foreach $i (0 .. $#temp_channels)
+      {
+	$temp = $temp_channels[$i];
+#	$temp =~ s/\x0d//g;
+	chomp $temp;
+
+	if ($temp =~ s/250-|250\s//)
+	  {
+	    ($counter, $temp) = split (/\s/,$temp,2);
+	    ($chan, $garbage,$garbage, $garbage, $garbage, $garbage, $garbage, $card, $garbage) = split (/\:/,$temp);
+	    $channels[$counter] = $chan;
+	    $channels{$chan}{number} = $counter;
+	    $channels{$chan}{card} = $card;
+	    $counter++;
+	  }
+      }
+  }
+
+sub initconfigfile
+  {
+    open (FI,"$ENV{HOME}/.master-timer/config") or return;
+    while (<FI>)
+      {
+	s/\#.*//;
+	chomp;
+	if ($_)
+	  {
+	    my ($key, $value);
+	    ($key, $value) = split (/\s+=\s+/);
+	    if ($key =~ /^debug$/i)
+	      {
+		$debug = $value;
+		print "Debug-Level = $value\n" if ($debug & 16);
+	      }
+	    elsif ($key =~ /^marginstart$/i)
+	      {
+		print "Marginstart = $value\n" if ($debug & 16);
+		$marginstart = $value;
+	      }
+	    elsif ($key =~ /^marginstop$/i)
+	      {
+		print "Marginstop = $value\n" if ($debug & 16);
+		$marginstop = $value;
+	      }
+	    elsif ($key =~ /^DVBCards$/i)
+	      {
+		print "DVB_Cards = $value\n" if ($debug & 16);
+		$DVB_cards = $value;
+	      }
+	    elsif ($key =~ /^defaultprio$/i)
+	      {
+		print "Default Priority = $value\n" if ($debug & 16);
+		$default_prio = $value;
+	      }
+	    elsif ($key =~ /^Dest$/i)
+	      {
+		print "Destination Host/IP:Port = $value\n" if ($debug & 16);
+		@Dest = split (/\s+/,$value);
+	      }
+	    elsif ($key =~ /^jointimers$/i)
+	      {
+		print "Join Timers = $value\n" if ($debug & 16);
+		$jointimers = $value;
+	      }
+	    else
+	      {
+		print "Unkown Key: \"$key\" with Value: \"$value\"\n";
+	      }
+	  }
+      }
+    print "End Config\n" if ($debug & 16);
+  }
+
+sub init
+  {
+    &initconfigfile();
+    &initsocket();
+    &initmovie();
+    &initblacklist();
+    &initdone();
+    &initchannellist();
+    &initepgdata();
+    &inittorecord();
+  }
diff --git a/Tools/master-timer/process_summary.pl b/Tools/master-timer/process_summary.pl
new file mode 100755
index 000000000..ebe63009f
--- /dev/null
+++ b/Tools/master-timer/process_summary.pl
@@ -0,0 +1,79 @@
+#!/usr/bin/perl -w
+
+$dir = "/home/ms/.master-timer";
+
+open (FI,"$dir/done") or die "Can't open \"done\"\n";
+while (<FI>)
+  {
+    chomp;
+    if ($_)
+      {
+        ($title,$subtitle) = split (/\|/,$_,2);
+        $Done{$title}{$subtitle}=1;
+      }
+  }
+close (FI);
+
+&traverse('/video');
+
+if ($hit)
+  {
+    rename ("$dir/done","$dir/done.bak");
+    open (FO,">$dir/done");
+    foreach $title (sort keys %Done)
+      {
+	foreach $subtitle (sort keys %{%Done->{$title}})
+	  {
+	    print FO "$title\|$subtitle\n";
+	  }
+      }
+  }
+
+sub traverse
+  {
+    local($dir) = shift;
+    local($path);
+    unless (opendir(DIR, $dir))
+      {
+	warn "Can't open $dir\n";
+	closedir(DIR);
+	return;
+      }
+    foreach (readdir(DIR))
+      {
+	next if $_ eq '.' || $_ eq '..';
+	$path = "$dir/$_";
+	if (-d $path) 	# a directory
+	  {
+	    &traverse($path);
+	}
+	if ($_ eq "summary.vdr")
+	  {
+	    open (FI,"$path") or die "Can't open \"$path\"\n";
+	    @lines = <FI>;
+	    close (FI);
+	    if ($lines[0] =~ /^Title\:\s\"(.*)\"/)
+	      {
+		@titles = split (/\~/,$1);
+		if ($lines[2] && $lines[2] =~ /^Subtitle\:\s\"(.*)\"/)
+		  {
+		    @subtitles = split (/\~/,$1);
+		    foreach $num (0 .. $#titles)
+		      {
+			if ($titles[$num] && $subtitles[$num])
+			  {
+			    if (!$Done{$titles[$num]}{$subtitles[$num]})
+			      {
+				$Done{$titles[$num]}{$subtitles[$num]}=1;
+				$hit = 1;
+			      }
+			  }
+		      }
+		  }
+	      }
+	  }
+      }
+    closedir(DIR);
+  }
+
+
diff --git a/Tools/master-timer/sample/channels-to-scan b/Tools/master-timer/sample/channels-to-scan
new file mode 100644
index 000000000..6acf15792
--- /dev/null
+++ b/Tools/master-timer/sample/channels-to-scan
@@ -0,0 +1,8 @@
+1
+2
+3
+4
+5
+13
+18
+21
diff --git a/Tools/master-timer/sample/config b/Tools/master-timer/sample/config
new file mode 100644
index 000000000..d01c8a858
--- /dev/null
+++ b/Tools/master-timer/sample/config
@@ -0,0 +1,14 @@
+# How Many Seconds "too early" should the timer begin
+marginstart	= 600
+# How Many Seocnds "too long" should the timer end
+marginstop	= 600
+# When the Prio isn't provied in the config-File use this value
+defaultprio	= 50
+# How many DVB-Cards are installed in the Computer (Not used yet)
+DVBCards	= 3
+# IP/Hostname:Port of the Destinations (Space is used for delimiter)
+Dest-Host 	= localhost:2001
+# Should Timers on the same channels be joined when they overlapp (0 = off)
+jointimers	= 1
+# Debug-Level
+debug		= 0
diff --git a/Tools/master-timer/sample/deepblack b/Tools/master-timer/sample/deepblack
new file mode 100644
index 000000000..63b4f9e94
--- /dev/null
+++ b/Tools/master-timer/sample/deepblack
@@ -0,0 +1,79 @@
+F�r alle F�lle Stefanie
+'MAX' - Das ganze Leben!
+10 vor 11
+17:30 live
+18:30
+24 Stunden
+Andreas T�rck
+Arabella
+^BIZZ$
+Big Brother
+Britt - Der Talk um Eins
+B�rbel Sch�fer
+Call TV
+Chicago Hope - Endstation Hoffnung
+Chicago Hope
+DIE REDAKTION
+Dauerwerbesendungen
+Die Harald Schmidt Show
+Die Oliver Geissen Show
+Die Quiz Show
+Doppelter Einsatz
+Dr. Stefan Frank - Der Arzt, dem die Frauen vertrauen
+EXCLUSIV
+EXTRA
+Ehekriege
+Ein Bayer auf R�gen
+Emergency Room
+Explosiv - Das Magazin
+GIRLSCAMP
+Gl�cksrad
+Gute Zeiten, schlechte Zeiten
+Hallo, Onkel Doc!
+Hans Meiser
+Hercules
+Hinter  Gittern - Der Frauenknast
+Infomercials
+Jeder gegen Jeden
+K1 DIE REPORTAGE
+K1 Das Magazin
+K1 Nachrichten
+Kickers
+Kochduell
+Nachrichten
+Nicole - Entscheidung am Nachmittag
+OP ruft Dr. Bruckner
+PREMIERE WORLD - Das Programm
+PROSIEBEN REPORTAGE
+Peter Imhof
+Programm ab
+Programm von
+Punkt 12
+Punkt 6
+Punkt 9
+RTL II News
+RTL SHOP
+RTL aktuell
+RTL-Nachtjournal
+SAT.1-FR�HST�CKSFERNSEHEN
+Spiegel TV-Reportage
+UEFA Champions
+fussball
+f�ball
+Vera am Mittag
+Wolffs Revier
+Zapping
+alphateam
+peep!
+s.a.m.
+taff.
+^blitz$
+SK K�lsch
+^Becker$
+Kommissar Rex
+Fit For Fun TV
+Nur die Liebe z�hlt
+Unsere kleine Farm
+Die Waltons
+^Die Zwei$
+^Sieben$
diff --git a/Tools/master-timer/sample/done b/Tools/master-timer/sample/done
new file mode 100644
index 000000000..76819c7be
--- /dev/null
+++ b/Tools/master-timer/sample/done
@@ -0,0 +1 @@
+Alles Routine|Kom�die
diff --git a/Tools/master-timer/sample/subtitle-movie b/Tools/master-timer/sample/subtitle-movie
new file mode 100644
index 000000000..3b5a0abf5
--- /dev/null
+++ b/Tools/master-timer/sample/subtitle-movie
@@ -0,0 +1,41 @@
+^Abenteuerfilm$
+^Actionfilm$
+^Actionkom�die$
+^Actionthriller$
+^Agentenfilm$
+^Biografie$
+^Biographie$
+^Computeranimation$
+^Drama$
+^Episodenfilm$
+^Erotikfilm$
+^Familiendrama$
+^Fantasy$
+^Fantasykom�die$
+^Gangsterfilm$
+^Gerichtsfilm$
+^Gesellschaftsdrama$
+^Horrorfilm$
+^Horrorkom�die$
+^Kinderfilm$
+^Kom�die$
+^Kriegsfilm$
+^Krimikom�die$
+^Kriminalfilm$
+^Liebesfilm$
+^Melodram$
+^Melodrama$
+^Musical$
+^Politthriller$
+^Psychothriller$
+^Road Movie$
+^Romanze$
+^Satire$
+^Science-Fiction$
+^Spielfilm$
+^TV Movie$
+^TV-Drama$
+^Thriller$
+^Western$
+^Zeichentrick$
+^Zeichentrickkom�die$
diff --git a/Tools/master-timer/sample/torecord b/Tools/master-timer/sample/torecord
new file mode 100644
index 000000000..030683068
--- /dev/null
+++ b/Tools/master-timer/sample/torecord
@@ -0,0 +1,32 @@
+# Format: (Every field is "optional".
+# [Title RE|Subtitle RE|Description RE|Channel-Name|Timeframe|Prio|Timer-Title|Marginstart;Marginstop|VDR-Instance]
+#
+# To record something at least one of the "Title", "Subtitle" or "Description" 
+# Fields has to be provided. This 3 fields are "include" and the rest are 
+# "exclude" fields!
+#
+# More than one channel definition can be provided. The delimiter is ";"
+# Additionaly you can make a "blacklist" of Channels when you prepent a "!" to the first Channel Definition
+# The "!" is only tested for the FIRST Channel definition.
+# You can only have a white or a blacklist (Mixing doesn't make sense!)
+#
+# ex. Record the series "Deep Space Nine" on Sci-Fantasy in the timeframe 09:00 - 14:00 with 60 Seconds Marginstart and -60 Seconds Marginstop
+# Deep Space Nine|||Sci-Fantasy|0900-1400|99|DS9|60;-60
+#
+# Record all "Actionfilm"s with "Schwarzenegger"
+# |Actionfilm|Schwarzenegger
+#
+Babylon 5|||!Pro-7||99|60;-60|1
+Deep Space Nine|||||99|DS9|60;-60|2
+Seven Days|||||99|
+Stargate|||||99|
+Futurama||||2100-2300|50|
+Ally McBeal|||||99|
+Snoops|||||50|
+^Friends$|||||99|Friends|
+Pensacola|||||50|
+seaQuest|||||50|
+||Paltrow|Sci Fantasy;13th Street;Star Kino;Cine Action;Cine Comedy;Romantic Movies;Studio Universal;Premiere||99|
+||Aniston|||99|
+Matrix
+
diff --git a/Tools/master-timer/scan-channels b/Tools/master-timer/scan-channels
new file mode 100755
index 000000000..324181b98
--- /dev/null
+++ b/Tools/master-timer/scan-channels
@@ -0,0 +1,8 @@
+#!/bin/sh
+old=`svdrpsend.pl chan | grep 250 | cut -d " " -f2`
+for dat in `cat $HOME/.master-timer/channels-to-scan`
+do
+  svdrpsend.pl "chan $dat"
+  sleep 30s
+done
+svdrpsend.pl "chan $old"
diff --git a/Tools/schnitt/cut2.pl b/Tools/schnitt/cut2.pl
new file mode 100755
index 000000000..6131e880a
--- /dev/null
+++ b/Tools/schnitt/cut2.pl
@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+
+$titel = $ARGV[0];
+
+chdir ("/x2/temp");
+
+@files=<teil*.mpg>;
+$cd = 1;
+mkdir "/x2/temp/$cd";
+open (FF,">/x2/temp/$cd/$titel\ CD\ $cd");
+close (FF);
+
+foreach $file (@files)
+  {
+    $size = -s $file;
+    $total += $size;
+    if ($total <= 660*1024*1024)
+      {
+	print "Moving $file\n";
+	system ("mv /x2/temp/$file /x2/temp/$cd/$file");
+      }
+    else
+      {
+	print "Splitting $file\n";
+	$file =~ s/\.mpg$//;
+	$total -= $size;
+	$size = (660*1024*1024) - $total;
+	$cd = `cut3.pl /x2/temp $cd $file $size \'$titel\' < $file.mpg`;
+	chomp $cd;
+        $total = 0;
+	@files2=</x2/temp/$cd/teil*>;
+	foreach $file2 (@files2)
+	  {
+	    $total += -s $file2;
+	  }
+        print "CD: $cd Total $total\n";
+	unlink "$file.mpg";
+      }
+  }
diff --git a/Tools/schnitt/cut3.pl b/Tools/schnitt/cut3.pl
new file mode 100755
index 000000000..ddaf0d6f1
--- /dev/null
+++ b/Tools/schnitt/cut3.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+$read = $size = 1024*1024;
+
+$dir = $ARGV[0];
+$subdir = $ARGV[1];
+$teil = $ARGV[2];
+$count1 = $ARGV[3];
+$title = $ARGV[4];
+
+$filenum = "1";
+$count = 0;
+
+open (FI,">$dir/$subdir/$teil.$filenum.mpg");
+
+while ($read == $size)
+  {
+    if (($filenum == 1 && $count < $count1) || ($filenum > 1 && $count < 660*1024*1024))
+      {
+	$read = read (STDIN,$data,$size);
+	print FI $data;
+	$count += $size;
+	$a = $count /1024/1024;
+      }
+    else
+      {
+	close (FI);
+	$filenum++;
+	$subdir++;
+        mkdir ("$dir/$subdir");
+	open (FF,">$dir/$subdir/$title\ CD\ $subdir");
+	close (FF);
+	open (FI,">$dir/$subdir/$teil.$filenum.mpg");
+	$count = 0;
+      }
+  }
+
+close FI;
+
+print "$subdir\n";
diff --git a/Tools/schnitt/cutall3.pl b/Tools/schnitt/cutall3.pl
new file mode 100755
index 000000000..696166697
--- /dev/null
+++ b/Tools/schnitt/cutall3.pl
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+open (FI,"cut") or die "Kann Cut-Datei nicht oeffnen\n";
+
+outer: while (<FI>)
+  {
+    chomp;
+    if (! ($_ > 1 || $_ eq "0"))
+      {
+	open (FO,">cut2");
+	print FO "$_\n";
+	while (<FI>)
+	  {
+	    chomp;
+	    if ($_ > 1 || $_ eq "0")
+	      {
+		print FO "$_\n";
+	      }
+	    else
+	      {
+		system ("cutt");
+		redo outer;
+	      }
+	  }
+      }
+  }
+if ( -f "cut2")
+  {
+    system ("cutt");
+    unlink "cut2";
+  }
diff --git a/Tools/schnitt/dump.c b/Tools/schnitt/dump.c
new file mode 100644
index 000000000..a362f6892
--- /dev/null
+++ b/Tools/schnitt/dump.c
@@ -0,0 +1,65 @@
+#include "libmpeg3.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+
+int main(int argc, char *argv[])
+{
+	mpeg3_t *file;
+	int x,y,ii,i,j,result,out;
+	int howmany;
+	unsigned char *output, **output_rows;
+	char filename[100];
+	char header[100];
+	char temp;
+
+	howmany = atoi (argv[2]);
+
+	if ((file = mpeg3_open(argv[1])) == NULL)
+	  {
+	    printf ("Open failed\n");
+	    return 1;
+	  }
+	mpeg3_set_cpus(file,1);
+	mpeg3_set_mmx(file,0);
+	if (mpeg3_has_video == 0)
+	  {
+	    printf ("Stream has no Video\n");
+	    return 1;
+	  }
+	x = mpeg3_video_width(file,0);
+	y = mpeg3_video_height(file, 0);
+	output = malloc (x*y*3 + 4);
+	output_rows = malloc (sizeof(unsigned char*) * y);
+	for(i = 0; i < y; i++)
+	  output_rows[i] = &output[i * x * 3];
+ 	
+	for (ii = 0; ii < howmany; ii++)
+	  {
+	    result = mpeg3_read_frame(file,output_rows,0,0,x,y,x,y,0,0);
+	
+	    sprintf (filename,"/x2/temp/output%03i.ppm",ii);
+	    sprintf (header,"P6\n%i %i\n255\n\r",x,y);
+
+/*	    printf ("Opening %s\n",filename); */
+	    
+	    if ((out = open (filename,O_CREAT|O_WRONLY|O_TRUNC,0755)) == -1)
+	      {
+		printf ("Can't open %s\n",filename);
+		return 1;
+	      }
+
+	    write (out,header,strlen(header));
+	    
+	    for (i = 0; i < y; i++)
+	      for (j = 0; j < x; j++)
+		{
+		  temp = output [(i*x+j)*3 + 1];
+		  output[(i*x+j)*3 + 1] = output [(i*x+j)*3 + 0];
+		  output[(i*x+j)*3 + 0] = temp;
+		}
+	    write (out, output, x*y*3);
+	    close (out);
+	  }
+}
diff --git a/Tools/schnitt/play b/Tools/schnitt/play
new file mode 100755
index 000000000..0c43bff5f
--- /dev/null
+++ b/Tools/schnitt/play
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ "$1" != "" ]; then
+  vmount "$1"
+fi
+ssh dvb2 /usr/local/bin/my/novdr
+sleep 1s
+cat /mnt/*/* | buffer -b 1000 -S 1024 | ssh dvb2 play2
+ssh dvb2 rm /tmp/novdr
+umount /mnt/*
+
diff --git a/ac3dec/Makefile b/ac3dec/Makefile
new file mode 100644
index 000000000..a0547e915
--- /dev/null
+++ b/ac3dec/Makefile
@@ -0,0 +1,22 @@
+#
+# Makefile for 'ac3dec'
+#
+# $Id: Makefile 1.1 2001/08/03 12:58:06 kls Exp $
+
+OBJS = coeff.o decode.o exponent.o rematrix.o bit_allocate.o crc.o dither.o\
+       imdct.o sanity_check.o bitstream.o debug.o downmix.o parse.o stats.o                                  
+
+DEFINES += -DDOLBY_SURROUND
+
+all: libac3.a
+
+libac3.a: $(OBJS)
+	ar -rc libac3.a $(OBJS)
+
+# Implicit rules:
+
+%.o: %.c
+	gcc -g -O2 -Wall -m486 -c $(DEFINES) $<
+
+clean:
+	rm -f *~ libac3.a $(OBJS)
diff --git a/ac3dec/ac3.h b/ac3dec/ac3.h
new file mode 100644
index 000000000..4919fc504
--- /dev/null
+++ b/ac3dec/ac3.h
@@ -0,0 +1,60 @@
+/* 
+ *    ac3.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#ifndef AARONS_TYPES
+#define AARONS_TYPES
+typedef unsigned long long uint_64;
+typedef unsigned int   uint_32;
+typedef unsigned short uint_16;
+typedef unsigned char  uint_8;
+
+typedef signed long long sint_64;
+typedef signed int     sint_32;
+typedef signed short   sint_16;
+typedef signed char    sint_8;
+#endif
+
+#define AC3_DOLBY_SURR_ENABLE 0x1
+#define AC3_3DNOW_ENABLE      0x2
+#define AC3_MMX_ENABLE        0x4
+#define AC3_ALTIVEC_ENABLE    0x8
+
+typedef struct ac3_config_s
+{
+	//Bit flags that enable various things
+	uint_32 flags;
+	//Callback that points the decoder to new stream data
+  void   (*fill_buffer_callback)(uint_8 **, uint_8 **);
+	//Number of discrete channels in final output (for downmixing)
+	uint_16 num_output_ch;
+	//Which channel of a dual mono stream to select
+	uint_16 dual_mono_ch_sel;
+} ac3_config_t;
+
+void ac3_init(ac3_config_t *);
+uint_32 ac3_decode_data(uint_8 *data_start,uint_8 *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data);
+
+
+
+
diff --git a/ac3dec/ac3_internal.h b/ac3dec/ac3_internal.h
new file mode 100644
index 000000000..235189ede
--- /dev/null
+++ b/ac3dec/ac3_internal.h
@@ -0,0 +1,344 @@
+/* 
+ *    ac3_internal.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef __GNUC__
+#define inline 
+#endif
+
+/* Exponent strategy constants */
+#define EXP_REUSE (0)
+#define EXP_D15   (1)
+#define EXP_D25   (2)
+#define EXP_D45   (3)
+
+/* Delta bit allocation constants */
+#define DELTA_BIT_REUSE (0)
+#define DELTA_BIT_NEW (1)
+#define DELTA_BIT_NONE (2)
+#define DELTA_BIT_RESERVED (3)
+
+/* samples work structure */
+typedef float stream_samples_t[6][256];
+
+/* global config structure */
+extern ac3_config_t ac3_config;
+/* global error flag */
+extern uint_32 error_flag;
+
+/* Everything you wanted to know about band structure */
+/*
+ * The entire frequency domain is represented by 256 real
+ * floating point fourier coefficients. Only the lower 253
+ * coefficients are actually utilized however. We use arrays
+ * of 256 to be efficient in some cases.
+ *
+ * The 5 full bandwidth channels (fbw) can have their higher
+ * frequencies coupled together. These coupled channels then
+ * share their high frequency components.
+ *
+ * This coupling band is broken up into 18 sub-bands starting
+ * at mantissa number 37. Each sub-band is 12 bins wide.
+ *
+ * There are 50 bit allocation sub-bands which cover the entire
+ * frequency range. The sub-bands are of non-uniform width, and
+ * approximate a 1/6 octave scale.
+ */
+
+/* The following structures are filled in by their corresponding parse_*
+ * functions. See http://www.atsc.org/Standards/A52/a_52.pdf for
+ * full details on each field. Indented fields are used to denote
+ * conditional fields.
+ */
+
+typedef struct syncinfo_s
+{
+	uint_32	magic;
+	/* Sync word == 0x0B77 */
+	 uint_16   syncword; 
+	/* crc for the first 5/8 of the sync block */
+	/* uint_16   crc1; */
+	/* Stream Sampling Rate (kHz) 0 = 48, 1 = 44.1, 2 = 32, 3 = reserved */
+	uint_16		fscod;	
+	/* Frame size code */
+	uint_16		frmsizecod;
+
+	/* Information not in the AC-3 bitstream, but derived */
+	/* Frame size in 16 bit words */
+	uint_16 frame_size;
+	/* Bit rate in kilobits */
+	uint_16 bit_rate;
+	/* sampling rate in hertz */
+	uint_32 sampling_rate;
+
+} syncinfo_t;
+
+typedef struct bsi_s
+{
+	uint_32	magic;
+	/* Bit stream identification == 0x8 */
+	uint_16 bsid;	
+	/* Bit stream mode */
+	uint_16 bsmod;
+	/* Audio coding mode */
+	uint_16 acmod;
+	/* If we're using the centre channel then */
+		/* centre mix level */
+		uint_16 cmixlev;
+	/* If we're using the surround channel then */
+		/* surround mix level */
+		uint_16 surmixlev;
+	/* If we're in 2/0 mode then */
+		/* Dolby surround mix level - NOT USED - */
+		uint_16 dsurmod;
+	/* Low frequency effects on */
+	uint_16 lfeon;
+	/* Dialogue Normalization level */
+	uint_16 dialnorm;
+	/* Compression exists */
+	uint_16 compre;
+		/* Compression level */
+		uint_16 compr;
+	/* Language code exists */
+	uint_16 langcode;
+		/* Language code */
+		uint_16 langcod;
+	/* Audio production info exists*/
+	uint_16 audprodie;
+		uint_16 mixlevel;
+		uint_16 roomtyp;
+	/* If we're in dual mono mode (acmod == 0) then extra stuff */
+		uint_16 dialnorm2;
+		uint_16 compr2e;
+			uint_16 compr2;
+		uint_16 langcod2e;
+			uint_16 langcod2;
+		uint_16 audprodi2e;
+			uint_16 mixlevel2;
+			uint_16 roomtyp2;
+	/* Copyright bit */
+	uint_16 copyrightb;
+	/* Original bit */
+	uint_16 origbs;
+	/* Timecode 1 exists */
+	uint_16 timecod1e;
+		/* Timecode 1 */
+		uint_16 timecod1;
+	/* Timecode 2 exists */
+	uint_16 timecod2e;
+		/* Timecode 2 */
+		uint_16 timecod2;
+	/* Additional bit stream info exists */
+	uint_16 addbsie;
+		/* Additional bit stream length - 1 (in bytes) */
+		uint_16 addbsil;
+		/* Additional bit stream information (max 64 bytes) */
+		uint_8	addbsi[64];
+
+	/* Information not in the AC-3 bitstream, but derived */
+	/* Number of channels (excluding LFE)
+	 * Derived from acmod */
+	uint_16 nfchans;
+} bsi_t;
+
+
+/* more pain */
+typedef struct audblk_s
+{
+	uint_32	magic1;
+	/* block switch bit indexed by channel num */
+	uint_16 blksw[5];
+	/* dither enable bit indexed by channel num */
+	uint_16 dithflag[5];
+	/* dynamic range gain exists */
+	uint_16 dynrnge;
+		/* dynamic range gain */
+		uint_16 dynrng;
+	/* if acmod==0 then */
+	/* dynamic range 2 gain exists */
+	uint_16 dynrng2e;
+		/* dynamic range 2 gain */
+		uint_16 dynrng2;
+	/* coupling strategy exists */
+	uint_16 cplstre;
+		/* coupling in use */
+		uint_16 cplinu;
+			/* channel coupled */
+			uint_16 chincpl[5];
+			/* if acmod==2 then */
+				/* Phase flags in use */
+				uint_16 phsflginu;
+			/* coupling begin frequency code */
+			uint_16 cplbegf;
+			/* coupling end frequency code */
+			uint_16 cplendf;
+			/* coupling band structure bits */
+			uint_16 cplbndstrc[18];
+			/* Do coupling co-ords exist for this channel? */
+			uint_16 cplcoe[5];
+			/* Master coupling co-ordinate */
+			uint_16 mstrcplco[5];
+			/* Per coupling band coupling co-ordinates */
+			uint_16 cplcoexp[5][18];
+			uint_16 cplcomant[5][18];
+			/* Phase flags for dual mono */
+			uint_16 phsflg[18];
+	/* Is there a rematrixing strategy */
+	uint_16 rematstr;
+		/* Rematrixing bits */
+		uint_16 rematflg[4];
+	/* Coupling exponent strategy */
+	uint_16 cplexpstr;
+	/* Exponent strategy for full bandwidth channels */
+	uint_16 chexpstr[5];
+	/* Exponent strategy for lfe channel */
+	uint_16 lfeexpstr;
+	/* Channel bandwidth for independent channels */
+	uint_16 chbwcod[5];
+		/* The absolute coupling exponent */
+		uint_16 cplabsexp;
+		/* Coupling channel exponents (D15 mode gives 18 * 12 /3  encoded exponents */
+		uint_16 cplexps[18 * 12 / 3];
+	/* Sanity checking constant */
+	uint_32	magic2;
+	/* fbw channel exponents */
+	uint_16 exps[5][252 / 3];
+	/* channel gain range */
+	uint_16 gainrng[5];
+	/* low frequency exponents */
+	uint_16 lfeexps[3];
+
+	/* Bit allocation info */
+	uint_16 baie;
+		/* Slow decay code */
+		uint_16 sdcycod;
+		/* Fast decay code */
+		uint_16 fdcycod;
+		/* Slow gain code */
+		uint_16 sgaincod;
+		/* dB per bit code */
+		uint_16 dbpbcod;
+		/* masking floor code */
+		uint_16 floorcod;
+
+	/* SNR offset info */
+	uint_16 snroffste;
+		/* coarse SNR offset */
+		uint_16 csnroffst;
+		/* coupling fine SNR offset */
+		uint_16 cplfsnroffst;
+		/* coupling fast gain code */
+		uint_16 cplfgaincod;
+		/* fbw fine SNR offset */
+		uint_16 fsnroffst[5];
+		/* fbw fast gain code */
+		uint_16 fgaincod[5];
+		/* lfe fine SNR offset */
+		uint_16 lfefsnroffst;
+		/* lfe fast gain code */
+		uint_16 lfefgaincod;
+	
+	/* Coupling leak info */
+	uint_16 cplleake;
+		/* coupling fast leak initialization */
+		uint_16 cplfleak;
+		/* coupling slow leak initialization */
+		uint_16 cplsleak;
+	
+	/* delta bit allocation info */
+	uint_16 deltbaie;
+		/* coupling delta bit allocation exists */
+		uint_16 cpldeltbae;
+		/* fbw delta bit allocation exists */
+		uint_16 deltbae[5];
+		/* number of cpl delta bit segments */
+		uint_16 cpldeltnseg;
+			/* coupling delta bit allocation offset */
+			uint_16 cpldeltoffst[8];
+			/* coupling delta bit allocation length */
+			uint_16 cpldeltlen[8];
+			/* coupling delta bit allocation length */
+			uint_16 cpldeltba[8];
+		/* number of delta bit segments */
+		uint_16 deltnseg[5];
+			/* fbw delta bit allocation offset */
+			uint_16 deltoffst[5][8];
+			/* fbw delta bit allocation length */
+			uint_16 deltlen[5][8];
+			/* fbw delta bit allocation length */
+			uint_16 deltba[5][8];
+
+	/* skip length exists */
+	uint_16 skiple;
+		/* skip length */
+		uint_16 skipl;
+
+	//Removed Feb 2000 -ah
+	/* channel mantissas */
+	//uint_16 chmant[5][256];
+
+	/* coupling mantissas */
+	uint_16 cplmant[256];
+
+	//Removed Feb 2000 -ah
+	/* coupling mantissas */
+	//uint_16 lfemant[7];
+
+
+	/*  -- Information not in the bitstream, but derived thereof  -- */
+
+	/* Number of coupling sub-bands */
+	uint_16 ncplsubnd;
+
+	/* Number of combined coupling sub-bands
+	 * Derived from ncplsubnd and cplbndstrc */
+	uint_16 ncplbnd;
+
+	/* Number of exponent groups by channel
+	 * Derived from strmant, endmant */
+	uint_16 nchgrps[5];
+
+	/* Number of coupling exponent groups
+	 * Derived from cplbegf, cplendf, cplexpstr */
+	uint_16 ncplgrps;
+			
+	/* End mantissa numbers of fbw channels */
+	uint_16 endmant[5];
+
+	/* Start and end mantissa numbers for the coupling channel */
+	uint_16 cplstrtmant;
+	uint_16 cplendmant;
+
+	/* Decoded exponent info */
+	uint_16 fbw_exp[5][256];
+	uint_16 cpl_exp[256];
+	uint_16 lfe_exp[7];
+
+	/* Bit allocation pointer results */
+	uint_16 fbw_bap[5][256];
+	uint_16 cpl_bap[256];
+	uint_16 lfe_bap[7];
+	
+	uint_32	magic3;
+} audblk_t;
+
+
diff --git a/ac3dec/bit_allocate.c b/ac3dec/bit_allocate.c
new file mode 100644
index 000000000..053e09cd0
--- /dev/null
+++ b/ac3dec/bit_allocate.c
@@ -0,0 +1,494 @@
+/* 
+ *  bit_allocate.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+
+static inline sint_16 logadd(sint_16 a,sint_16  b);
+static sint_16 calc_lowcomp(sint_16 a,sint_16 b0,sint_16 b1,sint_16 bin);
+static inline uint_16 min(sint_16 a,sint_16 b);
+static inline uint_16 max(sint_16 a,sint_16 b);
+static void ba_compute_psd(sint_16 start, sint_16 end, sint_16 exps[], 
+		sint_16 psd[], sint_16 bndpsd[]);
+
+static void ba_compute_excitation(sint_16 start, sint_16 end,sint_16 fgain,
+		sint_16 fastleak, sint_16 slowleak, sint_16 is_lfe, sint_16 bndpsd[],
+		sint_16 excite[]);
+static void ba_compute_mask(sint_16 start, sint_16 end, uint_16 fscod,
+		uint_16 deltbae, uint_16 deltnseg, uint_16 deltoffst[], uint_16 deltba[],
+		uint_16 deltlen[], sint_16 excite[], sint_16 mask[]);
+static void ba_compute_bap(sint_16 start, sint_16 end, sint_16 snroffset,
+		sint_16 psd[], sint_16 mask[], sint_16 bap[]);
+
+/* Misc LUTs for bit allocation process */
+
+static sint_16 slowdec[]  = { 0x0f,  0x11,  0x13,  0x15  };
+static sint_16 fastdec[]  = { 0x3f,  0x53,  0x67,  0x7b  };
+static sint_16 slowgain[] = { 0x540, 0x4d8, 0x478, 0x410 };
+static sint_16 dbpbtab[]  = { 0x000, 0x700, 0x900, 0xb00 };
+
+static uint_16 floortab[] = { 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800 };
+static sint_16 fastgain[] = { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400  };
+
+
+static sint_16 bndtab[] = {  0,  1,  2,   3,   4,   5,   6,   7,   8,   9, 
+                     10, 11, 12,  13,  14,  15,  16,  17,  18,  19,
+                     20, 21, 22,  23,  24,  25,  26,  27,  28,  31,
+                     34, 37, 40,  43,  46,  49,  55,  61,  67,  73,
+                     79, 85, 97, 109, 121, 133, 157, 181, 205, 229 };
+
+static sint_16 bndsz[]  = { 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+                     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+                     1,  1,  1,  1,  1,  1,  1,  1,  3,  3,
+                     3,  3,  3,  3,  3,  6,  6,  6,  6,  6,
+                     6, 12, 12, 12, 12, 24, 24, 24, 24, 24 };
+
+static sint_16 masktab[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+                     16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 28, 28, 29,
+                     29, 29, 30, 30, 30, 31, 31, 31, 32, 32, 32, 33, 33, 33, 34, 34,
+                     34, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 37, 37, 37,
+                     37, 37, 37, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 40,
+                     40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+                     41, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43,
+                     43, 43, 43, 43, 43, 43, 43, 43, 43, 44, 44, 44, 44, 44, 44, 44,
+                     44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+                     45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 46, 46, 46,
+                     46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+                     46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+                     47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48,
+                     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+                     48, 48, 48, 48, 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+                     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  0,  0,  0 };
+
+
+static sint_16 latab[] = { 0x0040, 0x003f, 0x003e, 0x003d, 0x003c, 0x003b, 0x003a, 0x0039,
+                    0x0038, 0x0037, 0x0036, 0x0035, 0x0034, 0x0034, 0x0033, 0x0032,
+                    0x0031, 0x0030, 0x002f, 0x002f, 0x002e, 0x002d, 0x002c, 0x002c,
+                    0x002b, 0x002a, 0x0029, 0x0029, 0x0028, 0x0027, 0x0026, 0x0026,
+                    0x0025, 0x0024, 0x0024, 0x0023, 0x0023, 0x0022, 0x0021, 0x0021,
+                    0x0020, 0x0020, 0x001f, 0x001e, 0x001e, 0x001d, 0x001d, 0x001c,
+                    0x001c, 0x001b, 0x001b, 0x001a, 0x001a, 0x0019, 0x0019, 0x0018,
+                    0x0018, 0x0017, 0x0017, 0x0016, 0x0016, 0x0015, 0x0015, 0x0015,
+                    0x0014, 0x0014, 0x0013, 0x0013, 0x0013, 0x0012, 0x0012, 0x0012,
+                    0x0011, 0x0011, 0x0011, 0x0010, 0x0010, 0x0010, 0x000f, 0x000f,
+                    0x000f, 0x000e, 0x000e, 0x000e, 0x000d, 0x000d, 0x000d, 0x000d,
+                    0x000c, 0x000c, 0x000c, 0x000c, 0x000b, 0x000b, 0x000b, 0x000b,
+                    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0009, 0x0009, 0x0009,
+                    0x0009, 0x0009, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+                    0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0006, 0x0006,
+                    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005,
+                    0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0004, 0x0004,
+                    0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
+                    0x0004, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003,
+                    0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002,
+                    0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
+                    0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
+                    0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+                    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+                    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+                    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+                    0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+                    0x0000, 0x0000, 0x0000, 0x0000};
+
+static sint_16 hth[][50] = {{ 0x04d0, 0x04d0, 0x0440, 0x0400, 0x03e0, 0x03c0, 0x03b0, 0x03b0,  
+                      0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 0x0390,  
+                      0x0380, 0x0380, 0x0370, 0x0370, 0x0360, 0x0360, 0x0350, 0x0350,  
+                      0x0340, 0x0340, 0x0330, 0x0320, 0x0310, 0x0300, 0x02f0, 0x02f0,
+                      0x02f0, 0x02f0, 0x0300, 0x0310, 0x0340, 0x0390, 0x03e0, 0x0420,
+                      0x0460, 0x0490, 0x04a0, 0x0460, 0x0440, 0x0440, 0x0520, 0x0800,
+                      0x0840, 0x0840 },
+                      
+                    { 0x04f0, 0x04f0, 0x0460, 0x0410, 0x03e0, 0x03d0, 0x03c0, 0x03b0, 
+                      0x03b0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 
+                      0x0390, 0x0380, 0x0380, 0x0380, 0x0370, 0x0370, 0x0360, 0x0360, 
+                      0x0350, 0x0350, 0x0340, 0x0340, 0x0320, 0x0310, 0x0300, 0x02f0, 
+                      0x02f0, 0x02f0, 0x02f0, 0x0300, 0x0320, 0x0350, 0x0390, 0x03e0, 
+                      0x0420, 0x0450, 0x04a0, 0x0490, 0x0460, 0x0440, 0x0480, 0x0630, 
+                      0x0840, 0x0840 },
+                      
+                    { 0x0580, 0x0580, 0x04b0, 0x0450, 0x0420, 0x03f0, 0x03e0, 0x03d0, 
+                      0x03c0, 0x03b0, 0x03b0, 0x03b0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 
+                      0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 0x0390, 0x0390, 
+                      0x0380, 0x0380, 0x0380, 0x0370, 0x0360, 0x0350, 0x0340, 0x0330, 
+                      0x0320, 0x0310, 0x0300, 0x02f0, 0x02f0, 0x02f0, 0x0300, 0x0310, 
+                      0x0330, 0x0350, 0x03c0, 0x0410, 0x0470, 0x04a0, 0x0460, 0x0440, 
+                      0x0450, 0x04e0 }};
+
+
+static sint_16 baptab[] = { 0,  1,  1,  1,  1,  1,  2,  2,  3,  3,  3,  4,  4,  5,  5,  6,
+                     6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10, 
+                     10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14,
+                     14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15 };
+
+static sint_16 sdecay;
+static sint_16 fdecay;
+static sint_16 sgain;
+static sint_16 dbknee;
+static sint_16 floor;
+static sint_16 psd[256];
+static sint_16 bndpsd[256];
+static sint_16 excite[256];
+static sint_16 mask[256];
+
+static inline uint_16
+max(sint_16 a,sint_16 b)
+{
+	return (a > b ? a : b);
+}
+	
+static inline uint_16
+min(sint_16 a,sint_16 b)
+{
+	return (a < b ? a : b);
+}
+
+static inline sint_16 
+logadd(sint_16 a,sint_16  b) 
+{ 
+	sint_16 c;
+	sint_16 address;
+
+	c = a - b; 
+	address = min((abs(c) >> 1), 255); 
+	
+	if (c >= 0) 
+		return(a + latab[address]); 
+	else 
+		return(b + latab[address]); 
+}
+
+
+void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk)
+{
+	uint_16 i;
+	sint_16 fgain;
+	sint_16 snroffset;
+	sint_16 start;
+	sint_16 end;
+	sint_16 fastleak;
+	sint_16 slowleak;
+
+	/* Only perform bit_allocation if the exponents have changed or we
+	 * have new sideband information */
+	if (audblk->chexpstr[0]  == 0 && audblk->chexpstr[1] == 0 &&
+			audblk->chexpstr[2]  == 0 && audblk->chexpstr[3] == 0 &&
+			audblk->chexpstr[4]  == 0 && audblk->cplexpstr   == 0 &&
+			audblk->lfeexpstr    == 0 && audblk->baie        == 0 &&
+			audblk->snroffste    == 0 && audblk->deltbaie    == 0)
+		return;
+
+	/* Do some setup before we do the bit alloc */
+	sdecay = slowdec[audblk->sdcycod]; 
+	fdecay = fastdec[audblk->fdcycod];
+	sgain = slowgain[audblk->sgaincod]; 
+	dbknee = dbpbtab[audblk->dbpbcod]; 
+	floor = floortab[audblk->floorcod]; 
+
+	/* if all the SNR offset constants are zero then the whole block is zero */
+	if(!audblk->csnroffst    && !audblk->fsnroffst[0] && 
+		 !audblk->fsnroffst[1] && !audblk->fsnroffst[2] && 
+		 !audblk->fsnroffst[3] && !audblk->fsnroffst[4] &&
+		 !audblk->cplfsnroffst && !audblk->lfefsnroffst)
+	{
+		memset(audblk->fbw_bap,0,sizeof(uint_16) * 256 * 5);
+		memset(audblk->cpl_bap,0,sizeof(uint_16) * 256);
+		memset(audblk->lfe_bap,0,sizeof(uint_16) * 7);
+		return;
+	}
+		 
+
+	for(i = 0; i < bsi->nfchans; i++)
+	{
+		start = 0;
+		end = audblk->endmant[i] ; 
+		fgain = fastgain[audblk->fgaincod[i]]; 
+		snroffset = (((audblk->csnroffst - 15) << 4) + audblk->fsnroffst[i]) << 2 ;
+		fastleak = 0;
+		slowleak = 0;
+
+		ba_compute_psd(start, end, audblk->fbw_exp[i], psd, bndpsd);
+
+		ba_compute_excitation(start, end , fgain, fastleak, slowleak, 0, bndpsd, excite);
+
+		ba_compute_mask(start, end, fscod, audblk->deltbae[i], audblk->deltnseg[i], 
+				audblk->deltoffst[i], audblk->deltba[i], audblk->deltlen[i], excite, mask);
+
+		ba_compute_bap(start, end, snroffset, psd, mask, audblk->fbw_bap[i]);
+	}
+
+	if(audblk->cplinu)
+	{
+		start = audblk->cplstrtmant; 
+		end = audblk->cplendmant; 
+		fgain = fastgain[audblk->cplfgaincod];
+		snroffset = (((audblk->csnroffst - 15) << 4) + audblk->cplfsnroffst) << 2 ;
+		fastleak = (audblk->cplfleak << 8) + 768; 
+		slowleak = (audblk->cplsleak << 8) + 768;
+
+		ba_compute_psd(start, end, audblk->cpl_exp, psd, bndpsd);
+
+		ba_compute_excitation(start, end , fgain, fastleak, slowleak, 0, bndpsd, excite);
+
+		ba_compute_mask(start, end, fscod, audblk->cpldeltbae, audblk->cpldeltnseg, 
+				audblk->cpldeltoffst, audblk->cpldeltba, audblk->cpldeltlen, excite, mask);
+
+		ba_compute_bap(start, end, snroffset, psd, mask, audblk->cpl_bap);
+	}
+
+	if(bsi->lfeon)
+	{
+		start = 0;
+		end = 7;
+		fgain = fastgain[audblk->lfefgaincod];
+		snroffset = (((audblk->csnroffst - 15) << 4) + audblk->lfefsnroffst) << 2 ;
+		fastleak = 0;
+		slowleak = 0;
+
+		ba_compute_psd(start, end, audblk->lfe_exp, psd, bndpsd);
+
+		ba_compute_excitation(start, end , fgain, fastleak, slowleak, 1, bndpsd, excite);
+
+		/* Perform no delta bit allocation for lfe */
+		ba_compute_mask(start, end, fscod, 2, 0, 0, 0, 0, excite, mask);
+
+		ba_compute_bap(start, end, snroffset, psd, mask, audblk->lfe_bap);
+	}
+}
+
+
+static void ba_compute_psd(sint_16 start, sint_16 end, sint_16 exps[], 
+		sint_16 psd[], sint_16 bndpsd[])
+{
+	int bin,i,j,k;
+	sint_16 lastbin = 0;
+	
+	/* Map the exponents into dBs */
+	for (bin=start; bin<end; bin++) 
+	{ 
+		psd[bin] = (3072 - (exps[bin] << 7)); 
+	}
+
+	/* Integrate the psd function over each bit allocation band */
+	j = start; 
+	k = masktab[start]; 
+	
+	do 
+	{ 
+		lastbin = min(bndtab[k] + bndsz[k], end); 
+		bndpsd[k] = psd[j]; 
+		j++; 
+
+		for (i = j; i < lastbin; i++) 
+		{ 
+			bndpsd[k] = logadd(bndpsd[k], psd[j]);
+			j++; 
+		} 
+		
+		k++; 
+	} while (end > lastbin);
+}
+
+static void ba_compute_excitation(sint_16 start, sint_16 end,sint_16 fgain,
+		sint_16 fastleak, sint_16 slowleak, sint_16 is_lfe, sint_16 bndpsd[],
+		sint_16 excite[])
+{
+	int bin;
+	sint_16 bndstrt;
+	sint_16 bndend;
+	sint_16 lowcomp = 0;
+	sint_16 begin = 0;
+
+	/* Compute excitation function */
+	bndstrt = masktab[start]; 
+	bndend = masktab[end - 1] + 1; 
+	
+	if (bndstrt == 0) /* For fbw and lfe channels */ 
+	{ 
+		lowcomp = calc_lowcomp(lowcomp, bndpsd[0], bndpsd[1], 0); 
+		excite[0] = bndpsd[0] - fgain - lowcomp; 
+		lowcomp = calc_lowcomp(lowcomp, bndpsd[1], bndpsd[2], 1);
+		excite[1] = bndpsd[1] - fgain - lowcomp; 
+		begin = 7 ; 
+		
+		/* Note: Do not call calc_lowcomp() for the last band of the lfe channel, (bin = 6) */ 
+		for (bin = 2; bin < 7; bin++) 
+		{ 
+			if (!(is_lfe && (bin == 6)))
+				lowcomp = calc_lowcomp(lowcomp, bndpsd[bin], bndpsd[bin+1], bin); 
+			fastleak = bndpsd[bin] - fgain; 
+			slowleak = bndpsd[bin] - sgain; 
+			excite[bin] = fastleak - lowcomp; 
+			
+			if (!(is_lfe && (bin == 6)))
+			{
+				if (bndpsd[bin] <= bndpsd[bin+1]) 
+				{
+					begin = bin + 1 ; 
+					break; 
+				} 
+			}
+		} 
+		
+		for (bin = begin; bin < min(bndend, 22); bin++) 
+		{ 
+			if (!(is_lfe && (bin == 6)))
+				lowcomp = calc_lowcomp(lowcomp, bndpsd[bin], bndpsd[bin+1], bin); 
+			fastleak -= fdecay ; 
+			fastleak = max(fastleak, bndpsd[bin] - fgain); 
+			slowleak -= sdecay ; 
+			slowleak = max(slowleak, bndpsd[bin] - sgain); 
+			excite[bin] = max(fastleak - lowcomp, slowleak); 
+		} 
+		begin = 22; 
+	} 
+	else /* For coupling channel */ 
+	{ 
+		begin = bndstrt; 
+	} 
+
+	for (bin = begin; bin < bndend; bin++) 
+	{ 
+		fastleak -= fdecay; 
+		fastleak = max(fastleak, bndpsd[bin] - fgain); 
+		slowleak -= sdecay; 
+		slowleak = max(slowleak, bndpsd[bin] - sgain); 
+		excite[bin] = max(fastleak, slowleak) ; 
+	} 
+}
+
+static void ba_compute_mask(sint_16 start, sint_16 end, uint_16 fscod,
+		uint_16 deltbae, uint_16 deltnseg, uint_16 deltoffst[], uint_16 deltba[],
+		uint_16 deltlen[], sint_16 excite[], sint_16 mask[])
+{
+	int bin,k;
+	sint_16 bndstrt;
+	sint_16 bndend;
+	sint_16 delta;
+
+	bndstrt = masktab[start]; 
+	bndend = masktab[end - 1] + 1; 
+
+	/* Compute the masking curve */
+
+	for (bin = bndstrt; bin < bndend; bin++) 
+	{ 
+		if (bndpsd[bin] < dbknee) 
+		{ 
+			excite[bin] += ((dbknee - bndpsd[bin]) >> 2); 
+		} 
+		mask[bin] = max(excite[bin], hth[fscod][bin]);
+	}
+	
+	/* Perform delta bit modulation if necessary */
+	if ((deltbae == DELTA_BIT_REUSE) || (deltbae == DELTA_BIT_NEW)) 
+	{ 
+		sint_16 band = 0; 
+		sint_16 seg = 0; 
+		
+		for (seg = 0; seg < deltnseg+1; seg++) 
+		{ 
+			band += deltoffst[seg]; 
+			if (deltba[seg] >= 4) 
+			{ 
+				delta = (deltba[seg] - 3) << 7;
+			} 
+			else 
+			{ 
+				delta = (deltba[seg] - 4) << 7;
+			} 
+			
+			for (k = 0; k < deltlen[seg]; k++) 
+			{ 
+				mask[band] += delta; 
+				band++; 
+			} 
+		} 
+	}
+}
+
+static void ba_compute_bap(sint_16 start, sint_16 end, sint_16 snroffset,
+		sint_16 psd[], sint_16 mask[], sint_16 bap[])
+{
+	int i,j,k;
+	sint_16 lastbin = 0;
+	sint_16 address = 0;
+
+	/* Compute the bit allocation pointer for each bin */
+	i = start; 
+	j = masktab[start]; 
+
+	do 
+	{ 
+		lastbin = min(bndtab[j] + bndsz[j], end); 
+		mask[j] -= snroffset; 
+		mask[j] -= floor; 
+		
+		if (mask[j] < 0) 
+			mask[j] = 0; 
+
+		mask[j] &= 0x1fe0;
+		mask[j] += floor; 
+		for (k = i; k < lastbin; k++) 
+		{ 
+			address = (psd[i] - mask[j]) >> 5; 
+			address = min(63, max(0, address)); 
+			bap[i] = baptab[address]; 
+			i++; 
+		} 
+		j++; 
+	} while (end > lastbin);
+}
+
+static sint_16 
+calc_lowcomp(sint_16 a,sint_16 b0,sint_16 b1,sint_16 bin) 
+{ 
+
+	if (bin < 7) 
+	{ 
+		if ((b0 + 256) == b1)
+			a = 384; 
+	 	else if (b0 > b1) 
+			a = max(0, a - 64); 
+	} 
+	else if (bin < 20) 
+	{ 
+		if ((b0 + 256) == b1) 
+			a = 320; 
+		else if (b0 > b1) 
+			a = max(0, a - 64) ; 
+	}
+	else  
+		a = max(0, a - 128); 
+	
+	return(a);
+}
+
diff --git a/ac3dec/bit_allocate.h b/ac3dec/bit_allocate.h
new file mode 100644
index 000000000..e48b0b2bb
--- /dev/null
+++ b/ac3dec/bit_allocate.h
@@ -0,0 +1,24 @@
+/* 
+ *  bit_allocate.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/bitstream.c b/ac3dec/bitstream.c
new file mode 100644
index 000000000..296d5ee3d
--- /dev/null
+++ b/ac3dec/bitstream.c
@@ -0,0 +1,76 @@
+/* 
+ *  bitstream.c
+ *
+ *	Copyright (C) Aaron Holtzman - Dec 1999
+ *
+ *  This file is part of ac3dec, a free AC-3 audio decoder
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "ac3.h"
+#include "ac3_internal.h"
+#include "bitstream.h"
+
+
+uint_8 *buffer_start = 0;
+uint_32 bits_left = 0;
+uint_32 current_word;
+
+static inline void
+bitstream_fill_current()
+{
+	current_word = *((uint_32*)buffer_start)++;
+	current_word = swab32(current_word);
+}
+
+//
+// The fast paths for _get is in the
+// bitstream.h header file so it can be inlined.
+//
+// The "bottom half" of this routine is suffixed _bh
+//
+// -ah
+//
+
+uint_32
+bitstream_get_bh(uint_32 num_bits)
+{
+	uint_32 result;
+
+	num_bits -= bits_left;
+	result = (current_word << (32 - bits_left)) >> (32 - bits_left);
+
+	bitstream_fill_current();
+
+	if(num_bits != 0)
+		result = (result << num_bits) | (current_word >> (32 - num_bits));
+	
+	bits_left = 32 - num_bits;
+
+	return result;
+}
+
+void
+bitstream_init(uint_8 *start)
+{
+	//initialize the start of the buffer
+	buffer_start = start;
+	bits_left = 0;
+}
diff --git a/ac3dec/bitstream.h b/ac3dec/bitstream.h
new file mode 100644
index 000000000..335193064
--- /dev/null
+++ b/ac3dec/bitstream.h
@@ -0,0 +1,76 @@
+/* 
+ *  bitstream.h
+ *
+ *	Copyright (C) Aaron Holtzman - Dec 1999
+ *
+ *  This file is part of ac3dec, a free AC-3 audio decoder
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+//My new and improved vego-matic endian swapping routine
+//(stolen from the kernel)
+#ifdef WORDS_BIGENDIAN
+
+#	define swab32(x) (x)
+
+#else
+
+#	if defined (__i386__)
+
+#	define swab32(x) __i386_swab32(x)
+	static inline const uint_32 __i386_swab32(uint_32 x)
+	{
+		__asm__("bswap %0" : "=r" (x) : "0" (x));
+		return x;
+	}
+
+#	else
+
+#	define swab32(x)\
+((((uint_8*)&x)[0] << 24) | (((uint_8*)&x)[1] << 16) |  \
+ (((uint_8*)&x)[2] << 8)  | (((uint_8*)&x)[3]))
+
+#	endif
+#endif
+
+extern uint_32 bits_left;
+extern uint_32 current_word;
+
+void bitstream_init(uint_8 *start);
+
+uint_8 bitstream_get_byte(void);
+
+uint_8 *bitstream_get_buffer_start(void);
+void bitstream_buffer_frame(uint_32 frame_size);
+
+uint_32 bitstream_get_bh(uint_32 num_bits);
+
+static inline uint_32 
+bitstream_get(uint_32 num_bits)
+{
+	uint_32 result;
+	
+	if(num_bits < bits_left)
+	{
+		result = (current_word << (32 - bits_left)) >> (32 - num_bits);
+		bits_left -= num_bits;
+		return result;
+	}
+
+	return bitstream_get_bh(num_bits);
+}
+
diff --git a/ac3dec/coeff.c b/ac3dec/coeff.c
new file mode 100644
index 000000000..b9f03ff65
--- /dev/null
+++ b/ac3dec/coeff.c
@@ -0,0 +1,353 @@
+/* 
+ *    coeff.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "decode.h"
+#include "bitstream.h"
+#include "dither.h"
+#include "coeff.h"
+
+//
+//Lookup tables of 0.15 two's complement quantization values
+//
+static const uint_16 q_1[3] = 
+{
+	( -2 << 15)/3, 0,(  2 << 15)/3 
+};
+
+static const uint_16 q_2[5] = 
+{
+	( -4 << 15)/5,( -2 << 15)/5, 0,
+	(  2 << 15)/5,(  4 << 15)/5
+};
+
+static const uint_16 q_3[7] = 
+{
+	( -6 << 15)/7,( -4 << 15)/7,( -2 << 15)/7, 0,
+	(  2 << 15)/7,(  4 << 15)/7,(  6 << 15)/7
+};
+
+static const uint_16 q_4[11] = 
+{
+	(-10 << 15)/11,(-8 << 15)/11,(-6 << 15)/11, ( -4 << 15)/11,(-2 << 15)/11,  0,
+	(  2 << 15)/11,( 4 << 15)/11,( 6 << 15)/11, (  8 << 15)/11,(10 << 15)/11
+};
+
+static const uint_16 q_5[15] = 
+{
+	(-14 << 15)/15,(-12 << 15)/15,(-10 << 15)/15,
+	( -8 << 15)/15,( -6 << 15)/15,( -4 << 15)/15,
+	( -2 << 15)/15,   0          ,(  2 << 15)/15,
+	(  4 << 15)/15,(  6 << 15)/15,(  8 << 15)/15,
+	( 10 << 15)/15,( 12 << 15)/15,( 14 << 15)/15
+};
+
+//
+// Scale factors for convert_to_float
+//
+
+static const uint_32 u32_scale_factors[25] = 
+{
+	0x38000000, //2 ^ -(0 + 15)
+	0x37800000, //2 ^ -(1 + 15)
+	0x37000000, //2 ^ -(2 + 15)
+	0x36800000, //2 ^ -(3 + 15)
+	0x36000000, //2 ^ -(4 + 15)
+	0x35800000, //2 ^ -(5 + 15)
+	0x35000000, //2 ^ -(6 + 15)
+	0x34800000, //2 ^ -(7 + 15)
+	0x34000000, //2 ^ -(8 + 15)
+	0x33800000, //2 ^ -(9 + 15)
+	0x33000000, //2 ^ -(10 + 15)
+	0x32800000, //2 ^ -(11 + 15)
+	0x32000000, //2 ^ -(12 + 15)
+	0x31800000, //2 ^ -(13 + 15)
+	0x31000000, //2 ^ -(14 + 15)
+	0x30800000, //2 ^ -(15 + 15)
+	0x30000000, //2 ^ -(16 + 15)
+	0x2f800000, //2 ^ -(17 + 15)
+	0x2f000000, //2 ^ -(18 + 15)
+	0x2e800000, //2 ^ -(19 + 15)
+	0x2e000000, //2 ^ -(20 + 15)
+	0x2d800000, //2 ^ -(21 + 15)
+	0x2d000000, //2 ^ -(22 + 15)
+	0x2c800000, //2 ^ -(23 + 15)
+	0x2c000000  //2 ^ -(24 + 15)
+};
+
+static float *scale_factor = (float*)u32_scale_factors;
+
+//These store the persistent state of the packed mantissas
+static uint_16 m_1[3];
+static uint_16 m_2[3];
+static uint_16 m_4[2];
+static uint_16 m_1_pointer;
+static uint_16 m_2_pointer;
+static uint_16 m_4_pointer;
+
+//Conversion from bap to number of bits in the mantissas
+//zeros account for cases 0,1,2,4 which are special cased
+static uint_16 qnttztab[16] = { 0, 0, 0, 3, 0 , 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16};
+
+static void    coeff_reset(void);
+static sint_16 coeff_get_mantissa(uint_16 bap, uint_16 dithflag);
+static void    coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint_32 ch);
+
+//
+// Convert a 0.15 fixed point number into IEEE single
+// precision floating point and scale by 2^-exp
+//
+static inline float
+convert_to_float(uint_16 exp, sint_16 mantissa)
+{
+	float x;
+
+	//the scale by 2^-15 is built into the scale factor table
+	x = mantissa * scale_factor[exp];
+
+	return x;
+}
+
+void
+coeff_unpack(bsi_t *bsi, audblk_t *audblk, stream_samples_t samples)
+{
+	uint_16 i,j;
+	uint_32 done_cpl = 0;
+	sint_16 mantissa;
+
+	coeff_reset();
+
+	for(i=0; i< bsi->nfchans; i++)
+	{
+		for(j=0; j < audblk->endmant[i]; j++)
+		{
+			mantissa = coeff_get_mantissa(audblk->fbw_bap[i][j],audblk->dithflag[i]);
+			samples[i][j] = convert_to_float(audblk->fbw_exp[i][j],mantissa);
+		}
+
+		if(audblk->cplinu && audblk->chincpl[i] && !(done_cpl))
+		{
+			// ncplmant is equal to 12 * ncplsubnd
+			// Don't dither coupling channel until channel separation so that
+			// interchannel noise is uncorrelated 
+			for(j=audblk->cplstrtmant; j < audblk->cplendmant; j++)
+				audblk->cplmant[j] = coeff_get_mantissa(audblk->cpl_bap[j],0);
+			done_cpl = 1;
+		}
+	}
+
+	//uncouple the channel if necessary
+	if(audblk->cplinu)
+	{
+		for(i=0; i< bsi->nfchans; i++)
+		{
+			if(audblk->chincpl[i])
+				coeff_uncouple_ch(samples[i],bsi,audblk,i);
+		}
+
+	}
+
+	if(bsi->lfeon)
+	{
+		// There are always 7 mantissas for lfe, no dither for lfe 
+		for(j=0; j < 7 ; j++)
+		{
+			mantissa = coeff_get_mantissa(audblk->lfe_bap[j],0);
+			samples[5][j] = convert_to_float(audblk->lfe_exp[j],mantissa);
+		}
+	}
+}
+
+//
+//Fetch a mantissa from the bitstream
+//
+//The mantissa returned is a signed 0.15 fixed point number
+//
+static sint_16
+coeff_get_mantissa(uint_16 bap, uint_16 dithflag)
+{
+	uint_16 mantissa;
+	uint_16 group_code;
+
+	//If the bap is 0-5 then we have special cases to take care of
+	switch(bap)
+	{
+		case 0:
+			if(dithflag)
+				mantissa = dither_gen();
+			else
+				mantissa = 0;
+			break;
+
+		case 1:
+			if(m_1_pointer > 2)
+			{
+				group_code = bitstream_get(5);
+
+				if(group_code > 26)
+					goto error;
+
+				m_1[0] = group_code / 9; 
+				m_1[1] = (group_code % 9) / 3; 
+				m_1[2] = (group_code % 9) % 3; 
+				m_1_pointer = 0;
+			}
+			mantissa = m_1[m_1_pointer++];
+			mantissa = q_1[mantissa];
+			break;
+		case 2:
+
+			if(m_2_pointer > 2)
+			{
+				group_code = bitstream_get(7);
+
+				if(group_code > 124)
+					goto error;
+
+				m_2[0] = group_code / 25;
+				m_2[1] = (group_code % 25) / 5 ;
+				m_2[2] = (group_code % 25) % 5 ; 
+				m_2_pointer = 0;
+			}
+			mantissa = m_2[m_2_pointer++];
+			mantissa = q_2[mantissa];
+			break;
+
+		case 3:
+			mantissa = bitstream_get(3);
+
+			if(mantissa > 6)
+				goto error;
+
+			mantissa = q_3[mantissa];
+			break;
+
+		case 4:
+			if(m_4_pointer > 1)
+			{
+				group_code = bitstream_get(7);
+
+				if(group_code > 120)
+					goto error;
+
+				m_4[0] = group_code / 11;
+				m_4[1] = group_code % 11;
+				m_4_pointer = 0;
+			}
+			mantissa = m_4[m_4_pointer++];
+			mantissa = q_4[mantissa];
+			break;
+
+		case 5:
+			mantissa = bitstream_get(4);
+
+			if(mantissa > 14)
+				goto error;
+
+			mantissa = q_5[mantissa];
+			break;
+
+		default:
+			mantissa = bitstream_get(qnttztab[bap]);
+			mantissa <<= 16 - qnttztab[bap];
+	}
+
+	return mantissa;
+
+
+
+error:
+	if(!error_flag)
+		fprintf(stderr,"** Invalid mantissa - skipping frame **\n");
+	error_flag = 1;
+
+	return 0;
+}
+
+//
+// Reset the mantissa state
+//
+static void 
+coeff_reset(void)
+{
+	m_1[2] = m_1[1] = m_1[0] = 0;
+	m_2[2] = m_2[1] = m_2[0] = 0;
+	m_4[1] = m_4[0] = 0;
+	m_1_pointer = m_2_pointer = m_4_pointer = 3;
+}
+
+//
+// Uncouple the coupling channel into a fbw channel
+//
+static void
+coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint_32 ch)
+{
+	uint_32 bnd = 0;
+	uint_32 sub_bnd = 0;
+	uint_32 i,j;
+	float cpl_coord = 1.0;
+	uint_32 cpl_exp_tmp;
+	uint_32 cpl_mant_tmp;
+	sint_16 mantissa;
+
+
+	for(i=audblk->cplstrtmant;i<audblk->cplendmant;)
+	{
+		if(!audblk->cplbndstrc[sub_bnd++])
+		{
+			cpl_exp_tmp = audblk->cplcoexp[ch][bnd] + 3 * audblk->mstrcplco[ch];
+			if(audblk->cplcoexp[ch][bnd] == 15)
+				cpl_mant_tmp = (audblk->cplcomant[ch][bnd]) << 11;
+			else
+				cpl_mant_tmp = ((0x10) | audblk->cplcomant[ch][bnd]) << 10;
+			
+			cpl_coord = convert_to_float(cpl_exp_tmp,cpl_mant_tmp) * 8.0f;
+
+			//Invert the phase for the right channel if necessary
+			if(bsi->acmod == 0x2 && audblk->phsflginu && ch == 1 && audblk->phsflg[bnd])
+				cpl_coord *= -1;
+
+			bnd++;
+		}
+
+		for(j=0;j < 12; j++)
+		{
+			//Get new dither values for each channel if necessary, so
+			//the channels are uncorrelated
+			if(audblk->dithflag[ch] && audblk->cpl_bap[i] == 0)
+				mantissa = dither_gen();
+			else
+				mantissa = audblk->cplmant[i];
+
+			samples[i]  = cpl_coord * convert_to_float(audblk->cpl_exp[i],mantissa);
+
+			i++;
+		}
+	}
+}
diff --git a/ac3dec/coeff.h b/ac3dec/coeff.h
new file mode 100644
index 000000000..dc822a9bd
--- /dev/null
+++ b/ac3dec/coeff.h
@@ -0,0 +1,24 @@
+/* 
+ *    coeff.h
+ *
+ *	Copyright (C) Aaron Holtzman - Feb 2000
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+void coeff_unpack(bsi_t *bsi, audblk_t *audblk,stream_samples_t samples);
diff --git a/ac3dec/crc.c b/ac3dec/crc.c
new file mode 100644
index 000000000..3210ce7f8
--- /dev/null
+++ b/ac3dec/crc.c
@@ -0,0 +1,96 @@
+/* 
+ *    crc.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+#include <sys/time.h>
+
+#include "crc.h"
+
+static const uint_16 crc_lut[256] = 
+{
+	0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
+	0x8033,0x0036,0x003c,0x8039,0x0028,0x802d,0x8027,0x0022,
+	0x8063,0x0066,0x006c,0x8069,0x0078,0x807d,0x8077,0x0072,
+	0x0050,0x8055,0x805f,0x005a,0x804b,0x004e,0x0044,0x8041,
+	0x80c3,0x00c6,0x00cc,0x80c9,0x00d8,0x80dd,0x80d7,0x00d2,
+	0x00f0,0x80f5,0x80ff,0x00fa,0x80eb,0x00ee,0x00e4,0x80e1,
+	0x00a0,0x80a5,0x80af,0x00aa,0x80bb,0x00be,0x00b4,0x80b1,
+	0x8093,0x0096,0x009c,0x8099,0x0088,0x808d,0x8087,0x0082,
+	0x8183,0x0186,0x018c,0x8189,0x0198,0x819d,0x8197,0x0192,
+	0x01b0,0x81b5,0x81bf,0x01ba,0x81ab,0x01ae,0x01a4,0x81a1,
+	0x01e0,0x81e5,0x81ef,0x01ea,0x81fb,0x01fe,0x01f4,0x81f1,
+	0x81d3,0x01d6,0x01dc,0x81d9,0x01c8,0x81cd,0x81c7,0x01c2,
+	0x0140,0x8145,0x814f,0x014a,0x815b,0x015e,0x0154,0x8151,
+	0x8173,0x0176,0x017c,0x8179,0x0168,0x816d,0x8167,0x0162,
+	0x8123,0x0126,0x012c,0x8129,0x0138,0x813d,0x8137,0x0132,
+	0x0110,0x8115,0x811f,0x011a,0x810b,0x010e,0x0104,0x8101,
+	0x8303,0x0306,0x030c,0x8309,0x0318,0x831d,0x8317,0x0312,
+	0x0330,0x8335,0x833f,0x033a,0x832b,0x032e,0x0324,0x8321,
+	0x0360,0x8365,0x836f,0x036a,0x837b,0x037e,0x0374,0x8371,
+	0x8353,0x0356,0x035c,0x8359,0x0348,0x834d,0x8347,0x0342,
+	0x03c0,0x83c5,0x83cf,0x03ca,0x83db,0x03de,0x03d4,0x83d1,
+	0x83f3,0x03f6,0x03fc,0x83f9,0x03e8,0x83ed,0x83e7,0x03e2,
+	0x83a3,0x03a6,0x03ac,0x83a9,0x03b8,0x83bd,0x83b7,0x03b2,
+	0x0390,0x8395,0x839f,0x039a,0x838b,0x038e,0x0384,0x8381,
+	0x0280,0x8285,0x828f,0x028a,0x829b,0x029e,0x0294,0x8291,
+	0x82b3,0x02b6,0x02bc,0x82b9,0x02a8,0x82ad,0x82a7,0x02a2,
+	0x82e3,0x02e6,0x02ec,0x82e9,0x02f8,0x82fd,0x82f7,0x02f2,
+	0x02d0,0x82d5,0x82df,0x02da,0x82cb,0x02ce,0x02c4,0x82c1,
+	0x8243,0x0246,0x024c,0x8249,0x0258,0x825d,0x8257,0x0252,
+	0x0270,0x8275,0x827f,0x027a,0x826b,0x026e,0x0264,0x8261,
+	0x0220,0x8225,0x822f,0x022a,0x823b,0x023e,0x0234,0x8231,
+	0x8213,0x0216,0x021c,0x8219,0x0208,0x820d,0x8207,0x0202
+};
+
+static uint_16 state;
+
+void
+crc_init(void)
+{
+	state = 0;
+}
+
+
+inline void crc_process_byte(uint_8 data)
+{
+	state = crc_lut[data ^ (state>>8)] ^ (state<<8);
+}
+
+void
+crc_process_frame(uint_8 *data,uint_32 num_bytes)
+{
+	uint_32 i;
+
+	for(i=0;i<num_bytes;i++)
+		crc_process_byte(data[i]);
+}
+
+int
+crc_validate(void)
+{
+	return(state  == 0);
+}
diff --git a/ac3dec/crc.h b/ac3dec/crc.h
new file mode 100644
index 000000000..07d57b154
--- /dev/null
+++ b/ac3dec/crc.h
@@ -0,0 +1,27 @@
+/* 
+ *  crc.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+ 
+int crc_validate(void);
+void crc_init(void);
+void crc_process_byte(uint_8 data);
+void crc_process_frame(uint_8 *data,uint_32 num_bytes);
diff --git a/ac3dec/debug.c b/ac3dec/debug.c
new file mode 100644
index 000000000..b7d6a3b08
--- /dev/null
+++ b/ac3dec/debug.c
@@ -0,0 +1,58 @@
+/*
+ *
+ * debug.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdlib.h>
+#include "debug.h"
+
+static int debug_level = -1;
+
+// Determine is debug output is required.
+// We could potentially have multiple levels of debug info
+int debug_is_on(void)
+{
+	char *env_var;
+	
+	if(debug_level < 0)
+	{
+	  env_var = getenv("AC3_DEBUG");
+
+		if (env_var)
+		{
+			debug_level = 1;
+		}
+		else
+			debug_level = 0;
+	}
+	
+	return debug_level;
+}
+
+//If you don't have gcc, then ya don't get debug output
+#ifndef __GNUC__
+void dprintf(char fmt[],...)
+{
+	int foo = 0;
+}
+#endif
+
diff --git a/ac3dec/debug.h b/ac3dec/debug.h
new file mode 100644
index 000000000..f45cb5b1a
--- /dev/null
+++ b/ac3dec/debug.h
@@ -0,0 +1,37 @@
+/*
+ *
+ * debug.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+int debug_is_on(void);
+
+#ifdef __GNUC__
+#define dprintf(format,args...)\
+{\
+	if (debug_is_on())\
+	{\
+		fprintf(stderr,format,## args);\
+	}\
+}
+#else
+void dprintf(char fmt[],...);
+#endif
diff --git a/ac3dec/decode.c b/ac3dec/decode.c
new file mode 100644
index 000000000..5e7f034bd
--- /dev/null
+++ b/ac3dec/decode.c
@@ -0,0 +1,269 @@
+/* 
+ *    decode.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *      Added support for DVB-s PCI card by:
+ *      Matjaz Thaler <matjaz.thaler@rd.iskraemeco.si> - November 2000
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif 
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "ac3.h"
+#include "ac3_internal.h"
+#include "bitstream.h"
+#include "imdct.h"
+#include "exponent.h"
+#include "coeff.h"
+#include "bit_allocate.h"
+#include "parse.h"
+#include "crc.h"
+#include "stats.h"
+#include "rematrix.h"
+#include "sanity_check.h"
+#include "downmix.h"
+#include "debug.h"
+
+#define AC3_BUFFER_SIZE (6*1024*16)      
+
+//our global config structure
+ac3_config_t ac3_config;
+uint_32 error_flag = 0;
+
+static audblk_t audblk;
+static bsi_t bsi;
+static syncinfo_t syncinfo;
+static uint_32 frame_count = 0;
+//static uint_32 is_output_initialized = 0;
+
+//the floating point samples for one audblk
+static stream_samples_t samples;
+
+//the integer samples for the entire frame (with enough space for 2 ch out)
+//if this size change, be sure to change the size when muting
+static sint_16 s16_samples[2 * 6 * 256];
+
+
+//Storage for the syncframe
+#define SYNC_BUFFER_MAX_SIZE 4096
+static uint_8 sync_buffer[SYNC_BUFFER_MAX_SIZE];
+static uint_32 sync_buffer_size = 0;;
+
+uint_32
+decode_sync_buffer_syncframe(syncinfo_t *syncinfo, uint_8 **start,uint_8 *end)
+{
+	uint_8 *cur = *start;
+	uint_16 syncword = syncinfo->syncword;
+	uint_32 ret = 0;
+
+	// 
+	// Find an ac3 sync frame.
+	// 
+resync:
+
+	while(syncword != 0x0b77)
+	{
+		if(cur >= end)
+			goto done;
+		syncword = (syncword << 8) + *cur++;
+	}
+
+	//need the next 3 bytes to decide how big the frame is
+	while(sync_buffer_size < 3)
+	{
+		if(cur >= end)
+			goto done;
+
+		sync_buffer[sync_buffer_size++] = *cur++;
+	}
+	
+	parse_syncinfo(syncinfo,sync_buffer);
+	stats_print_syncinfo(syncinfo);
+
+	while(sync_buffer_size < syncinfo->frame_size * 2 - 2)
+	{
+		if(cur >= end)
+			goto done;
+
+		sync_buffer[sync_buffer_size++] = *cur++;
+	}
+	
+	// Check the crc over the entire frame 
+	crc_init();
+	crc_process_frame(sync_buffer,syncinfo->frame_size * 2 - 2);
+
+	if(!crc_validate())
+	{
+		fprintf(stderr,"** CRC failed - skipping frame **\n");
+		syncword = 0xffff;
+		sync_buffer_size = 0;
+		goto resync;
+	}
+	
+	//
+	//if we got to this point, we found a valid ac3 frame to decode
+	//
+
+	bitstream_init(sync_buffer);
+	//get rid of the syncinfo struct as we already parsed it
+	bitstream_get(24);
+
+	//reset the syncword for next time
+	syncword = 0xffff;
+	sync_buffer_size = 0;
+	ret = 1;
+
+done:
+	syncinfo->syncword = syncword;
+	*start = cur;
+	return ret;
+}
+
+void
+decode_mute(void)
+{
+	fprintf(stderr,"muting frame\n");
+	//mute the frame
+	memset(s16_samples,0,sizeof(sint_16) * 256 * 2 * 6);
+	error_flag = 0;
+}
+
+
+void
+ac3_init(ac3_config_t *config)
+{
+	memcpy(&ac3_config,config,sizeof(ac3_config_t));
+
+	imdct_init();
+	sanity_check_init(&syncinfo,&bsi,&audblk);
+
+	//	ac3_output = *foo;
+}
+
+uint_32 ac3_decode_data(uint_8 *data_start,uint_8 *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data)
+{
+	uint_32 i;
+	int datasize;
+	char *data;
+
+	if(ac3reset != 0){
+	  syncinfo.syncword = 0xffff;
+	  sync_buffer_size = 0;
+	}
+	
+	while(decode_sync_buffer_syncframe(&syncinfo,&data_start,data_end))
+	{
+		dprintf("(decode) begin frame %d\n",frame_count++);
+
+		if(error_flag)
+		{
+			decode_mute();
+			continue;
+		}
+
+		parse_bsi(&bsi);
+
+		for(i=0; i < 6; i++)
+		{
+			//Initialize freq/time sample storage
+			memset(samples,0,sizeof(float) * 256 * (bsi.nfchans + bsi.lfeon));
+
+			// Extract most of the audblk info from the bitstream
+			// (minus the mantissas 
+			parse_audblk(&bsi,&audblk);
+
+			// Take the differential exponent data and turn it into
+			// absolute exponents 
+			exponent_unpack(&bsi,&audblk); 
+			if(error_flag)
+				goto error;
+
+			// Figure out how many bits per mantissa 
+			bit_allocate(syncinfo.fscod,&bsi,&audblk);
+
+			// Extract the mantissas from the stream and
+			// generate floating point frequency coefficients
+			coeff_unpack(&bsi,&audblk,samples);
+			if(error_flag)
+				goto error;
+
+			if(bsi.acmod == 0x2)
+				rematrix(&audblk,samples);
+
+			// Convert the frequency samples into time samples 
+			imdct(&bsi,&audblk,samples);
+
+			// Downmix into the requested number of channels
+			// and convert floating point to sint_16
+			downmix(&bsi,samples,&s16_samples[i * 2 * 256]);
+
+			sanity_check(&syncinfo,&bsi,&audblk);
+			if(error_flag)
+				goto error;
+
+			continue;
+		}
+		
+		parse_auxdata(&syncinfo);
+
+		/*
+		if(!is_output_initialized)
+		{
+			ac3_output.open(16,syncinfo.sampling_rate,2);
+			is_output_initialized = 1;
+		}
+		*/
+		data = (char *)s16_samples;
+		datasize = 0;
+		while(datasize < 6144){
+		  if(((*input_pointer+1) % AC3_BUFFER_SIZE) != *output_pointer){    // There is room in the sync_buffer
+		    ac3_data[*input_pointer]=data[datasize];
+		    datasize++;
+		    *input_pointer = (*input_pointer+1) % AC3_BUFFER_SIZE;
+		  }
+		  else{
+		    *input_pointer = *output_pointer = 0;
+		    break;
+		  }
+		}
+
+
+		//write(1, s16_samples, 256 * 6 * 2* 2);
+		//ac3_output.play(s16_samples, 256 * 6 * 2);
+error:
+		;
+		//find a new frame
+	}
+
+	return 0;	
+}
diff --git a/ac3dec/decode.h b/ac3dec/decode.h
new file mode 100644
index 000000000..bb84a1105
--- /dev/null
+++ b/ac3dec/decode.h
@@ -0,0 +1,22 @@
+/* 
+ *  decode.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
diff --git a/ac3dec/dither.c b/ac3dec/dither.c
new file mode 100644
index 000000000..31e74f629
--- /dev/null
+++ b/ac3dec/dither.c
@@ -0,0 +1,115 @@
+/* 
+ *    dither.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "dither.h"
+
+
+const uint_16 dither_lut[256] = 
+{
+ 0x0000, 0xa011, 0xe033, 0x4022, 0x6077, 0xc066, 0x8044, 0x2055,
+ 0xc0ee, 0x60ff, 0x20dd, 0x80cc, 0xa099, 0x0088, 0x40aa, 0xe0bb,
+ 0x21cd, 0x81dc, 0xc1fe, 0x61ef, 0x41ba, 0xe1ab, 0xa189, 0x0198,
+ 0xe123, 0x4132, 0x0110, 0xa101, 0x8154, 0x2145, 0x6167, 0xc176,
+ 0x439a, 0xe38b, 0xa3a9, 0x03b8, 0x23ed, 0x83fc, 0xc3de, 0x63cf,
+ 0x8374, 0x2365, 0x6347, 0xc356, 0xe303, 0x4312, 0x0330, 0xa321,
+ 0x6257, 0xc246, 0x8264, 0x2275, 0x0220, 0xa231, 0xe213, 0x4202,
+ 0xa2b9, 0x02a8, 0x428a, 0xe29b, 0xc2ce, 0x62df, 0x22fd, 0x82ec,
+ 0x8734, 0x2725, 0x6707, 0xc716, 0xe743, 0x4752, 0x0770, 0xa761,
+ 0x47da, 0xe7cb, 0xa7e9, 0x07f8, 0x27ad, 0x87bc, 0xc79e, 0x678f,
+ 0xa6f9, 0x06e8, 0x46ca, 0xe6db, 0xc68e, 0x669f, 0x26bd, 0x86ac,
+ 0x6617, 0xc606, 0x8624, 0x2635, 0x0660, 0xa671, 0xe653, 0x4642,
+ 0xc4ae, 0x64bf, 0x249d, 0x848c, 0xa4d9, 0x04c8, 0x44ea, 0xe4fb,
+ 0x0440, 0xa451, 0xe473, 0x4462, 0x6437, 0xc426, 0x8404, 0x2415,
+ 0xe563, 0x4572, 0x0550, 0xa541, 0x8514, 0x2505, 0x6527, 0xc536,
+ 0x258d, 0x859c, 0xc5be, 0x65af, 0x45fa, 0xe5eb, 0xa5c9, 0x05d8,
+ 0xae79, 0x0e68, 0x4e4a, 0xee5b, 0xce0e, 0x6e1f, 0x2e3d, 0x8e2c,
+ 0x6e97, 0xce86, 0x8ea4, 0x2eb5, 0x0ee0, 0xaef1, 0xeed3, 0x4ec2,
+ 0x8fb4, 0x2fa5, 0x6f87, 0xcf96, 0xefc3, 0x4fd2, 0x0ff0, 0xafe1,
+ 0x4f5a, 0xef4b, 0xaf69, 0x0f78, 0x2f2d, 0x8f3c, 0xcf1e, 0x6f0f,
+ 0xede3, 0x4df2, 0x0dd0, 0xadc1, 0x8d94, 0x2d85, 0x6da7, 0xcdb6,
+ 0x2d0d, 0x8d1c, 0xcd3e, 0x6d2f, 0x4d7a, 0xed6b, 0xad49, 0x0d58,
+ 0xcc2e, 0x6c3f, 0x2c1d, 0x8c0c, 0xac59, 0x0c48, 0x4c6a, 0xec7b,
+ 0x0cc0, 0xacd1, 0xecf3, 0x4ce2, 0x6cb7, 0xcca6, 0x8c84, 0x2c95,
+ 0x294d, 0x895c, 0xc97e, 0x696f, 0x493a, 0xe92b, 0xa909, 0x0918,
+ 0xe9a3, 0x49b2, 0x0990, 0xa981, 0x89d4, 0x29c5, 0x69e7, 0xc9f6,
+ 0x0880, 0xa891, 0xe8b3, 0x48a2, 0x68f7, 0xc8e6, 0x88c4, 0x28d5,
+ 0xc86e, 0x687f, 0x285d, 0x884c, 0xa819, 0x0808, 0x482a, 0xe83b,
+ 0x6ad7, 0xcac6, 0x8ae4, 0x2af5, 0x0aa0, 0xaab1, 0xea93, 0x4a82,
+ 0xaa39, 0x0a28, 0x4a0a, 0xea1b, 0xca4e, 0x6a5f, 0x2a7d, 0x8a6c,
+ 0x4b1a, 0xeb0b, 0xab29, 0x0b38, 0x2b6d, 0x8b7c, 0xcb5e, 0x6b4f,
+ 0x8bf4, 0x2be5, 0x6bc7, 0xcbd6, 0xeb83, 0x4b92, 0x0bb0, 0xaba1
+};
+
+uint_16 lfsr_state = 1;
+
+//
+// see dither_gen (inline-able) in dither.h
+//
+
+#if 0
+
+//
+// this is the old dither_gen with is much slower than the new inlined
+// lut version and is still here because it's easier to understand.
+//
+
+/* 
+ * Generate eight bits of pseudo-entropy using a 16 bit linear
+ * feedback shift register (LFSR). The primitive polynomial used
+ * is 1 + x^4 + x^14 + x^16.
+ *
+ * The distribution is uniform, over the range [-0.707,0.707]
+ *
+ */
+
+uint_16 dither_gen(void)
+{
+	int i;
+	uint_32 state;
+
+	//explicitly bring the state into a local var as gcc > 3.0?
+	//doesn't know how to optimize out the stores
+	state = lfsr_state;
+
+	//Generate eight pseudo random bits
+	for(i=0;i<8;i++)
+	{
+		state <<= 1;	
+
+		if(state & 0x10000)
+			state ^= 0xa011;
+	}
+
+	lfsr_state = state;
+
+	return (((((sint_32)state<<8)>>8) * (sint_32) (0.707106 * 256.0))>>16);
+}
+
+#endif
diff --git a/ac3dec/dither.h b/ac3dec/dither.h
new file mode 100644
index 000000000..6d68e1b54
--- /dev/null
+++ b/ac3dec/dither.h
@@ -0,0 +1,37 @@
+/* 
+ *    dither.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+extern uint_16 lfsr_state;
+extern const uint_16 dither_lut[256]; 
+
+static inline uint_16 dither_gen(void)
+{
+	sint_16 state;
+
+	state = dither_lut[lfsr_state >> 8] ^ (lfsr_state << 8);
+	
+	lfsr_state = (uint_16) state;
+
+	return ((state * (sint_32) (0.707106 * 256.0))>>8);
+}
diff --git a/ac3dec/downmix.c b/ac3dec/downmix.c
new file mode 100644
index 000000000..94bc51a81
--- /dev/null
+++ b/ac3dec/downmix.c
@@ -0,0 +1,428 @@
+/*
+ *
+ *  downmix.c
+ *    
+ *	Copyright (C) Aaron Holtzman - Sept 1999
+ *
+ *	Originally based on code by Yuqing Deng.
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "decode.h"
+#include "downmix.h"
+#include "debug.h"
+
+
+//Pre-scaled downmix coefficients
+static float cmixlev_lut[4] = { 0.2928, 0.2468, 0.2071, 0.2468 };
+static float smixlev_lut[4] = { 0.2928, 0.2071, 0.0   , 0.2071 };
+
+static void 
+downmix_3f_2r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float right_tmp;
+	float left_tmp;
+	float clev,slev;
+	float *centre = 0, *left = 0, *right = 0, *left_sur = 0, *right_sur = 0;
+
+	left      = samples[0];
+	centre    = samples[1];
+	right     = samples[2];
+	left_sur  = samples[3];
+	right_sur = samples[4];
+
+	clev = cmixlev_lut[bsi->cmixlev];
+	slev = smixlev_lut[bsi->surmixlev];
+
+#if defined DOLBY_SURROUND
+	for (j = 0; j < 256; j++) 
+	{
+	        right_tmp = *left_sur++ + *right_sur++;
+		left_tmp  = 1.4142f * *left++  + *centre - right_tmp;
+		right_tmp += 1.4142f * *right++ + *centre++;
+	    
+	        s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 16000.0f);
+	        s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 16000.0f);
+	}
+#else
+	for (j = 0; j < 256; j++) 
+	{
+		left_tmp = 0.4142f * *left++  + clev * *centre   + slev * *left_sur++;
+		right_tmp= 0.4142f * *right++ + clev * *centre++ + slev * *right_sur++;
+
+		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
+		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
+	}
+#endif
+}
+
+static void
+downmix_2f_2r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float right_tmp;
+	float left_tmp;
+	float slev;
+	float *left = 0, *right = 0, *left_sur = 0, *right_sur = 0;
+
+	left      = samples[0];
+	right     = samples[1];
+	left_sur  = samples[2];
+	right_sur = samples[3];
+
+	slev = smixlev_lut[bsi->surmixlev];
+
+	for (j = 0; j < 256; j++) 
+	{
+		left_tmp = 0.4142f * *left++  + slev * *left_sur++;
+		right_tmp= 0.4142f * *right++ + slev * *right_sur++;
+
+		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
+		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
+	}
+}
+
+static void
+downmix_3f_1r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float right_tmp;
+	float left_tmp;
+	float clev,slev;
+	float *centre = 0, *left = 0, *right = 0, *sur = 0;
+
+	left      = samples[0];
+	centre    = samples[1];
+	right     = samples[2];
+	//Mono surround
+	sur = samples[3];
+
+	clev = cmixlev_lut[bsi->cmixlev];
+	slev = smixlev_lut[bsi->surmixlev];
+
+	for (j = 0; j < 256; j++) 
+	{
+		left_tmp = 0.4142f * *left++  + clev * *centre++ + slev * *sur;
+		right_tmp= 0.4142f * *right++ + clev * *centre   + slev * *sur++;
+
+		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
+		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
+	}
+}
+
+
+static void
+downmix_2f_1r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float right_tmp;
+	float left_tmp;
+	float slev;
+	float *left = 0, *right = 0, *sur = 0;
+
+	left      = samples[0];
+	right     = samples[1];
+	//Mono surround
+	sur = samples[2];
+
+	slev = smixlev_lut[bsi->surmixlev];
+
+	for (j = 0; j < 256; j++) 
+	{
+		left_tmp = 0.4142f * *left++  + slev * *sur;
+		right_tmp= 0.4142f * *right++ + slev * *sur++;
+
+		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
+		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
+	}
+}
+
+static void
+downmix_3f_0r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float right_tmp;
+	float left_tmp;
+	float clev;
+	float *centre = 0, *left = 0, *right = 0;
+
+	left      = samples[0];
+	centre    = samples[1];
+	right     = samples[2];
+
+	clev = cmixlev_lut[bsi->cmixlev];
+
+	for (j = 0; j < 256; j++) 
+	{
+		left_tmp = 0.4142f * *left++  + clev * *centre; 
+		right_tmp= 0.4142f * *right++ + clev * *centre++;   
+
+		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
+		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
+	}
+}
+				
+static void
+downmix_2f_0r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float *left = 0, *right = 0;
+
+	left      = samples[0];
+	right     = samples[1];
+
+	for (j = 0; j < 256; j++) 
+	{
+		s16_samples[j * 2 ]    = (sint_16) (*left++  * 32767.0f);
+		s16_samples[j * 2 + 1] = (sint_16) (*right++ * 32767.0f);
+	}
+}
+
+static void
+downmix_1f_0r_to_2ch(float *centre,sint_16 *s16_samples)
+{
+	uint_32 j;
+	float tmp;
+
+	//Mono program!
+
+	for (j = 0; j < 256; j++) 
+	{
+		tmp =  32767.0f * 0.7071f * *centre++;
+
+		s16_samples[j * 2 ] = s16_samples[j * 2 + 1] = (sint_16) tmp;
+	}
+}
+
+//
+// Downmix into 2 or 4 channels  (4 ch isn't in quite yet)
+//
+// The downmix function names have the following format
+//
+// downmix_Xf_Yr_to_[2|4]ch[_dolby]
+//
+// where X        = number of front channels
+//       Y        = number of rear channels
+//       [2|4]    = number of output channels
+//       [_dolby] = with or without dolby surround mix
+//
+
+void downmix(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+{
+	if(bsi->acmod > 7)
+		dprintf("(downmix) invalid acmod number\n"); 
+
+	//
+	//There are two main cases, with or without Dolby Surround
+	//
+	if(ac3_config.flags & AC3_DOLBY_SURR_ENABLE)
+	{
+		fprintf(stderr,"Dolby Surround Mixes not currently enabled\n");
+		exit(1);
+	}
+
+	//Non-Dolby surround downmixes
+	switch(bsi->acmod)
+	{
+		// 3/2
+		case 7:
+			downmix_3f_2r_to_2ch(bsi,samples,s16_samples);
+		break;
+
+		// 2/2
+		case 6:
+			downmix_2f_2r_to_2ch(bsi,samples,s16_samples);
+		break;
+
+		// 3/1
+		case 5:
+			downmix_3f_1r_to_2ch(bsi,samples,s16_samples);
+		break;
+
+		// 2/1
+		case 4:
+			downmix_2f_1r_to_2ch(bsi,samples,s16_samples);
+		break;
+
+		// 3/0
+		case 3:
+			downmix_3f_0r_to_2ch(bsi,samples,s16_samples);
+		break;
+
+		case 2:
+			downmix_2f_0r_to_2ch(bsi,samples,s16_samples);
+		break;
+
+		// 1/0
+		case 1:
+			downmix_1f_0r_to_2ch(samples[0],s16_samples);
+		break;
+
+		// 1+1
+		case 0:
+			downmix_1f_0r_to_2ch(samples[ac3_config.dual_mono_ch_sel],s16_samples);
+		break;
+	}
+}
+
+
+
+#if 0 
+
+	//the dolby mixes lay here for the time being
+	switch(bsi->acmod)
+	{
+		// 3/2
+		case 7:
+			left      = samples[0];
+			centre    = samples[1];
+			right     = samples[2];
+			left_sur  = samples[3];
+			right_sur = samples[4];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp = 0.2265f * *left_sur++ + 0.2265f * *right_sur++;
+				left_tmp  = -1 * right_tmp;
+				right_tmp += 0.3204f * *right++ + 0.2265f * *centre;
+				left_tmp  += 0.3204f * *left++  + 0.2265f * *centre++;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = left_tmp;
+			}
+
+		break;
+
+		// 2/2
+		case 6:
+			left      = samples[0];
+			right     = samples[1];
+			left_sur  = samples[2];
+			right_sur = samples[3];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp = 0.2265f * *left_sur++ + 0.2265f * *right_sur++;
+				left_tmp  = -1 * right_tmp;
+				right_tmp += 0.3204f * *right++;
+				left_tmp  += 0.3204f * *left++ ;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = left_tmp;
+			}
+		break;
+
+		// 3/1
+		case 5:
+			left      = samples[0];
+			centre    = samples[1];
+			right     = samples[2];
+			//Mono surround
+			right_sur = samples[3];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp =  0.2265f * *right_sur++;
+				left_tmp  = -1 * right_tmp;
+				right_tmp += 0.3204f * *right++ + 0.2265f * *centre;
+				left_tmp  += 0.3204f * *left++  + 0.2265f * *centre++;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = left_tmp;
+			}
+		break;
+
+		// 2/1
+		case 4:
+			left      = samples[0];
+			right     = samples[1];
+			//Mono surround
+			right_sur = samples[2];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp =  0.2265f * *right_sur++;
+				left_tmp  = -1 * right_tmp;
+				right_tmp += 0.3204f * *right++; 
+				left_tmp  += 0.3204f * *left++;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = left_tmp;
+			}
+		break;
+
+		// 3/0
+		case 3:
+			left      = samples[0];
+			centre    = samples[1];
+			right     = samples[2];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp = 0.3204f * *right++ + 0.2265f * *centre;
+				left_tmp  = 0.3204f * *left++  + 0.2265f * *centre++;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = left_tmp;
+			}
+		break;
+
+		// 2/0
+		case 2:
+		//Do nothing!
+		break;
+
+		// 1/0
+		case 1:
+			//Mono program!
+			right = samples[0];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp = 0.7071f * *right++;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = right_tmp;
+			}
+			
+		break;
+
+		// 1+1
+		case 0:
+			//Dual mono, output selected by user
+			right = samples[ac3_config.dual_mono_ch_sel];
+
+			for (j = 0; j < 256; j++) 
+			{
+				right_tmp = 0.7071f * *right++;
+
+				samples[1][j] = right_tmp;
+				samples[0][j] = right_tmp;
+			}
+		break;
+#endif
diff --git a/ac3dec/downmix.h b/ac3dec/downmix.h
new file mode 100644
index 000000000..7537c6229
--- /dev/null
+++ b/ac3dec/downmix.h
@@ -0,0 +1,28 @@
+/*
+ *
+ *  downmix.h
+ *    
+ *	Copyright (C) Aaron Holtzman - Sept 1999
+ *
+ *	Originally based on code by Yeqing Deng.
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+void downmix(bsi_t* bsi, stream_samples_t stream_samples,sint_16 *s16_samples);
diff --git a/ac3dec/exponent.c b/ac3dec/exponent.c
new file mode 100644
index 000000000..98111a5ba
--- /dev/null
+++ b/ac3dec/exponent.c
@@ -0,0 +1,135 @@
+/* 
+ *    exponent.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "decode.h"
+#include "exponent.h"
+
+
+static void exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp, 
+		uint_16 exps[], uint_16 *dest);
+
+void
+exponent_unpack( bsi_t *bsi, audblk_t *audblk)
+{
+	uint_16 i;
+
+	for(i=0; i< bsi->nfchans; i++)
+		exp_unpack_ch(UNPACK_FBW, audblk->chexpstr[i], audblk->nchgrps[i], audblk->exps[i][0], 
+				&audblk->exps[i][1], audblk->fbw_exp[i]);
+
+	if(audblk->cplinu)
+		exp_unpack_ch(UNPACK_CPL, audblk->cplexpstr, audblk->ncplgrps, audblk->cplabsexp << 1,	
+				audblk->cplexps, &audblk->cpl_exp[audblk->cplstrtmant]);
+
+	if(bsi->lfeon)
+		exp_unpack_ch(UNPACK_LFE, audblk->lfeexpstr, 2, audblk->lfeexps[0], 
+				&audblk->lfeexps[1], audblk->lfe_exp);
+}
+
+
+static void
+exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp, 
+		uint_16 exps[], uint_16 *dest)
+{
+	uint_16 i,j;
+	sint_16 exp_acc;
+	sint_16 exp_1,exp_2,exp_3;
+
+	if(expstr == EXP_REUSE)
+		return;
+
+	/* Handle the initial absolute exponent */
+	exp_acc = initial_exp;
+	j = 0;
+
+	/* In the case of a fbw channel then the initial absolute values is 
+	 * also an exponent */
+	if(type != UNPACK_CPL)
+		dest[j++] = exp_acc;
+
+	/* Loop through the groups and fill the dest array appropriately */
+	for(i=0; i< ngrps; i++)
+	{
+		if(exps[i] > 124)
+			goto error;
+
+		exp_1 = exps[i] / 25;
+		exp_2 = (exps[i] - (exp_1 * 25)) / 5;
+		exp_3 = exps[i] - (exp_1 * 25) - (exp_2 * 5) ;
+
+		exp_acc += (exp_1 - 2);
+
+		switch(expstr)
+		{
+			case EXP_D45:
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+			case EXP_D25:
+				dest[j++] = exp_acc;
+			case EXP_D15:
+				dest[j++] = exp_acc;
+		}
+
+		exp_acc += (exp_2 - 2);
+
+		switch(expstr)
+		{
+			case EXP_D45:
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+			case EXP_D25:
+				dest[j++] = exp_acc;
+			case EXP_D15:
+				dest[j++] = exp_acc;
+		}
+
+		exp_acc += (exp_3 - 2);
+
+		switch(expstr)
+		{
+			case EXP_D45:
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+			case EXP_D25:
+				dest[j++] = exp_acc;
+			case EXP_D15:
+				dest[j++] = exp_acc;
+		}
+	}	
+
+	return;
+
+			goto error;
+error:
+	if(!error_flag)
+		fprintf(stderr,"** Invalid exponent - skipping frame **\n");
+	error_flag = 1;
+}
+
diff --git a/ac3dec/exponent.h b/ac3dec/exponent.h
new file mode 100644
index 000000000..06c59db03
--- /dev/null
+++ b/ac3dec/exponent.h
@@ -0,0 +1,28 @@
+/* 
+ *    exponent.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#define UNPACK_FBW  1
+#define UNPACK_CPL  2
+#define UNPACK_LFE  4
+
+void exponent_unpack( bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/imdct.c b/ac3dec/imdct.c
new file mode 100644
index 000000000..ae2794ed7
--- /dev/null
+++ b/ac3dec/imdct.c
@@ -0,0 +1,468 @@
+/* 
+ *  imdct.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "decode.h"
+#include "imdct.h"
+
+void imdct_do_256(float data[],float delay[]);
+void imdct_do_512(float data[],float delay[]);
+
+typedef struct complex_s
+{
+	float real;
+	float imag;
+} complex_t;
+
+
+#define N 512
+
+
+/* 128 point bit-reverse LUT */
+static uint_8 bit_reverse_512[128] = {
+	0x00, 0x40, 0x20, 0x60, 0x10, 0x50, 0x30, 0x70, 
+	0x08, 0x48, 0x28, 0x68, 0x18, 0x58, 0x38, 0x78, 
+	0x04, 0x44, 0x24, 0x64, 0x14, 0x54, 0x34, 0x74, 
+	0x0c, 0x4c, 0x2c, 0x6c, 0x1c, 0x5c, 0x3c, 0x7c, 
+	0x02, 0x42, 0x22, 0x62, 0x12, 0x52, 0x32, 0x72, 
+	0x0a, 0x4a, 0x2a, 0x6a, 0x1a, 0x5a, 0x3a, 0x7a, 
+	0x06, 0x46, 0x26, 0x66, 0x16, 0x56, 0x36, 0x76, 
+	0x0e, 0x4e, 0x2e, 0x6e, 0x1e, 0x5e, 0x3e, 0x7e, 
+	0x01, 0x41, 0x21, 0x61, 0x11, 0x51, 0x31, 0x71, 
+	0x09, 0x49, 0x29, 0x69, 0x19, 0x59, 0x39, 0x79, 
+	0x05, 0x45, 0x25, 0x65, 0x15, 0x55, 0x35, 0x75, 
+	0x0d, 0x4d, 0x2d, 0x6d, 0x1d, 0x5d, 0x3d, 0x7d, 
+	0x03, 0x43, 0x23, 0x63, 0x13, 0x53, 0x33, 0x73, 
+	0x0b, 0x4b, 0x2b, 0x6b, 0x1b, 0x5b, 0x3b, 0x7b, 
+	0x07, 0x47, 0x27, 0x67, 0x17, 0x57, 0x37, 0x77, 
+	0x0f, 0x4f, 0x2f, 0x6f, 0x1f, 0x5f, 0x3f, 0x7f};
+
+static uint_8 bit_reverse_256[64] = {
+	0x00, 0x20, 0x10, 0x30, 0x08, 0x28, 0x18, 0x38, 
+	0x04, 0x24, 0x14, 0x34, 0x0c, 0x2c, 0x1c, 0x3c, 
+	0x02, 0x22, 0x12, 0x32, 0x0a, 0x2a, 0x1a, 0x3a, 
+	0x06, 0x26, 0x16, 0x36, 0x0e, 0x2e, 0x1e, 0x3e, 
+	0x01, 0x21, 0x11, 0x31, 0x09, 0x29, 0x19, 0x39, 
+	0x05, 0x25, 0x15, 0x35, 0x0d, 0x2d, 0x1d, 0x3d, 
+	0x03, 0x23, 0x13, 0x33, 0x0b, 0x2b, 0x1b, 0x3b, 
+	0x07, 0x27, 0x17, 0x37, 0x0f, 0x2f, 0x1f, 0x3f};
+
+static complex_t buf[128];
+
+/* Twiddle factor LUT */
+static complex_t *w[7];
+static complex_t w_1[1];
+static complex_t w_2[2];
+static complex_t w_4[4];
+static complex_t w_8[8];
+static complex_t w_16[16];
+static complex_t w_32[32];
+static complex_t w_64[64];
+
+/* Twiddle factors for IMDCT */
+static float xcos1[128];
+static float xsin1[128];
+static float xcos2[64];
+static float xsin2[64];
+
+/* Delay buffer for time domain interleaving */
+static float delay[6][256];
+
+/* Windowing function for Modified DCT - Thank you acroread */
+static float window[] = {
+	0.00014, 0.00024, 0.00037, 0.00051, 0.00067, 0.00086, 0.00107, 0.00130,
+	0.00157, 0.00187, 0.00220, 0.00256, 0.00297, 0.00341, 0.00390, 0.00443,
+	0.00501, 0.00564, 0.00632, 0.00706, 0.00785, 0.00871, 0.00962, 0.01061,
+	0.01166, 0.01279, 0.01399, 0.01526, 0.01662, 0.01806, 0.01959, 0.02121,
+	0.02292, 0.02472, 0.02662, 0.02863, 0.03073, 0.03294, 0.03527, 0.03770,
+	0.04025, 0.04292, 0.04571, 0.04862, 0.05165, 0.05481, 0.05810, 0.06153,
+	0.06508, 0.06878, 0.07261, 0.07658, 0.08069, 0.08495, 0.08935, 0.09389,
+	0.09859, 0.10343, 0.10842, 0.11356, 0.11885, 0.12429, 0.12988, 0.13563,
+	0.14152, 0.14757, 0.15376, 0.16011, 0.16661, 0.17325, 0.18005, 0.18699,
+	0.19407, 0.20130, 0.20867, 0.21618, 0.22382, 0.23161, 0.23952, 0.24757,
+	0.25574, 0.26404, 0.27246, 0.28100, 0.28965, 0.29841, 0.30729, 0.31626,
+	0.32533, 0.33450, 0.34376, 0.35311, 0.36253, 0.37204, 0.38161, 0.39126,
+	0.40096, 0.41072, 0.42054, 0.43040, 0.44030, 0.45023, 0.46020, 0.47019,
+	0.48020, 0.49022, 0.50025, 0.51028, 0.52031, 0.53033, 0.54033, 0.55031,
+	0.56026, 0.57019, 0.58007, 0.58991, 0.59970, 0.60944, 0.61912, 0.62873,
+	0.63827, 0.64774, 0.65713, 0.66643, 0.67564, 0.68476, 0.69377, 0.70269,
+	0.71150, 0.72019, 0.72877, 0.73723, 0.74557, 0.75378, 0.76186, 0.76981,
+	0.77762, 0.78530, 0.79283, 0.80022, 0.80747, 0.81457, 0.82151, 0.82831,
+	0.83496, 0.84145, 0.84779, 0.85398, 0.86001, 0.86588, 0.87160, 0.87716,
+	0.88257, 0.88782, 0.89291, 0.89785, 0.90264, 0.90728, 0.91176, 0.91610,
+	0.92028, 0.92432, 0.92822, 0.93197, 0.93558, 0.93906, 0.94240, 0.94560,
+	0.94867, 0.95162, 0.95444, 0.95713, 0.95971, 0.96217, 0.96451, 0.96674,
+	0.96887, 0.97089, 0.97281, 0.97463, 0.97635, 0.97799, 0.97953, 0.98099,
+	0.98236, 0.98366, 0.98488, 0.98602, 0.98710, 0.98811, 0.98905, 0.98994,
+	0.99076, 0.99153, 0.99225, 0.99291, 0.99353, 0.99411, 0.99464, 0.99513,
+	0.99558, 0.99600, 0.99639, 0.99674, 0.99706, 0.99736, 0.99763, 0.99788,
+	0.99811, 0.99831, 0.99850, 0.99867, 0.99882, 0.99895, 0.99908, 0.99919,
+	0.99929, 0.99938, 0.99946, 0.99953, 0.99959, 0.99965, 0.99969, 0.99974,
+	0.99978, 0.99981, 0.99984, 0.99986, 0.99988, 0.99990, 0.99992, 0.99993,
+	0.99994, 0.99995, 0.99996, 0.99997, 0.99998, 0.99998, 0.99998, 0.99999,
+	0.99999, 0.99999, 0.99999, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000,
+	1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000 };
+
+
+static inline void swap_cmplx(complex_t *a, complex_t *b)
+{
+	complex_t tmp;
+
+	tmp = *a;
+	*a = *b;
+	*b = tmp;
+}
+
+
+
+static inline complex_t cmplx_mult(complex_t a, complex_t b)
+{
+	complex_t ret;
+
+	ret.real = a.real * b.real - a.imag * b.imag;
+	ret.imag = a.real * b.imag + a.imag * b.real;
+
+	return ret;
+}
+
+void imdct_init(void)
+{
+	int i,k;
+	complex_t angle_step;
+	complex_t current_angle;
+
+	/* Twiddle factors to turn IFFT into IMDCT */
+	for( i=0; i < 128; i++)
+	{
+		xcos1[i] = -cos(2.0f * M_PI * (8*i+1)/(8*N)) ; 
+		xsin1[i] = -sin(2.0f * M_PI * (8*i+1)/(8*N)) ;
+	}
+	
+	/* More twiddle factors to turn IFFT into IMDCT */
+	for( i=0; i < 64; i++)
+	{
+		xcos2[i] = -cos(2.0f * M_PI * (8*i+1)/(4*N)) ; 
+		xsin2[i] = -sin(2.0f * M_PI * (8*i+1)/(4*N)) ;
+	}
+
+	/* Canonical twiddle factors for FFT */
+	w[0] = w_1;
+	w[1] = w_2;
+	w[2] = w_4;
+	w[3] = w_8;
+	w[4] = w_16;
+	w[5] = w_32;
+	w[6] = w_64;
+
+	for( i = 0; i < 7; i++)
+	{
+		angle_step.real = cos(-2.0 * M_PI / (1 << (i+1)));
+		angle_step.imag = sin(-2.0 * M_PI / (1 << (i+1)));
+
+		current_angle.real = 1.0;
+		current_angle.imag = 0.0;
+
+		for (k = 0; k < 1 << i; k++)
+		{
+			w[i][k] = current_angle;
+			current_angle = cmplx_mult(current_angle,angle_step);
+		}
+	}
+}
+
+void
+imdct_do_512(float data[],float delay[])
+{
+	int i,k;
+	int p,q;
+	int m;
+	int two_m;
+	int two_m_plus_one;
+
+	float tmp_a_i;
+	float tmp_a_r;
+	float tmp_b_i;
+	float tmp_b_r;
+
+	float *data_ptr;
+	float *delay_ptr;
+	float *window_ptr;
+	
+	//
+	// 512 IMDCT with source and dest data in 'data'
+	//
+	
+	// Pre IFFT complex multiply plus IFFT cmplx conjugate and bit reverse
+	// permutation
+	for( i=0; i < 128; i++)
+	{
+		k = bit_reverse_512[i];
+
+		/* z[i] = (X[256-2*i-1] + j * X[2*i]) * (xcos1[i] + j * xsin1[i]) ; */ 
+		buf[k].real =         (data[256-2*i-1] * xcos1[i])  -  (data[2*i]       * xsin1[i]);
+	  buf[k].imag = -1.0 * ((data[2*i]       * xcos1[i])  +  (data[256-2*i-1] * xsin1[i]));
+	}
+
+	// FFT Merge 
+	for (m=0; m < 7; m++)
+	{
+		if(m)
+			two_m = (1 << m);
+		else
+			two_m = 1;
+
+		two_m_plus_one = (1 << (m+1));
+
+		for(k = 0; k < two_m; k++)
+		{
+			for(i = 0; i < 128; i += two_m_plus_one)
+			{
+				p = k + i;
+				q = p + two_m;
+				tmp_a_r = buf[p].real;
+				tmp_a_i = buf[p].imag;
+				tmp_b_r = buf[q].real * w[m][k].real - buf[q].imag * w[m][k].imag;
+				tmp_b_i = buf[q].imag * w[m][k].real + buf[q].real * w[m][k].imag;
+				buf[p].real = tmp_a_r + tmp_b_r;
+				buf[p].imag =  tmp_a_i + tmp_b_i;
+				buf[q].real = tmp_a_r - tmp_b_r;
+				buf[q].imag =  tmp_a_i - tmp_b_i;
+
+			}
+		}
+	}
+
+	/* Post IFFT complex multiply  plus IFFT complex conjugate*/
+	for( i=0; i < 128; i++)
+	{
+		/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
+		tmp_a_r = buf[i].real;
+		tmp_a_i = buf[i].imag;
+		//Note that I flipped the signs on the imaginary ops to do the complex conj
+		buf[i].real =(tmp_a_r * xcos1[i])  +  (tmp_a_i  * xsin1[i]);
+	  buf[i].imag =(tmp_a_r * xsin1[i])  -  (tmp_a_i  * xcos1[i]);
+	}
+	
+	data_ptr = data;
+	delay_ptr = delay;
+	window_ptr = window;
+
+	/* Window and convert to real valued signal */
+	for(i=0; i< 64; i++) 
+	{ 
+		*data_ptr++   = 2.0f * (-buf[64+i].imag   * *window_ptr++ + *delay_ptr++); 
+		*data_ptr++   = 2.0f * ( buf[64-i-1].real * *window_ptr++ + *delay_ptr++); 
+	}
+
+	for(i=0; i< 64; i++) 
+	{ 
+		*data_ptr++  = 2.0f * (-buf[i].real       * *window_ptr++ + *delay_ptr++); 
+		*data_ptr++  = 2.0f * ( buf[128-i-1].imag * *window_ptr++ + *delay_ptr++); 
+	}
+	
+	/* The trailing edge of the window goes into the delay line */
+	delay_ptr = delay;
+
+	for(i=0; i< 64; i++) 
+	{ 
+		*delay_ptr++  = -buf[64+i].real   * *--window_ptr; 
+		*delay_ptr++  =  buf[64-i-1].imag * *--window_ptr; 
+	}
+
+	for(i=0; i<64; i++) 
+	{
+		*delay_ptr++  =  buf[i].imag       * *--window_ptr; 
+		*delay_ptr++  = -buf[128-i-1].real * *--window_ptr; 
+	}
+}
+
+void
+imdct_do_256(float data[],float delay[])
+{
+	int i,k;
+	int p,q;
+	int m;
+	int two_m;
+	int two_m_plus_one;
+
+	float tmp_a_i;
+	float tmp_a_r;
+	float tmp_b_i;
+	float tmp_b_r;
+
+	float *data_ptr;
+	float *delay_ptr;
+	float *window_ptr;
+
+	complex_t *buf_1, *buf_2;
+
+	buf_1 = &buf[0];
+	buf_2 = &buf[64];
+
+	// Pre IFFT complex multiply plus IFFT cmplx conjugate and bit reverse
+	// permutation
+	for(i=0; i<64; i++) 
+	{ 
+		/* X1[i] = X[2*i]  */
+		/* X2[i] = X[2*i+1]     */
+
+		k = bit_reverse_256[i];
+
+		p = 2 * (128-2*i-1);
+		q = 2 * (2 * i);
+
+		/* Z1[i] = (X1[128-2*i-1] + j * X1[2*i]) * (xcos2[i] + j * xsin2[i]); */ 
+		buf_1[k].real =         data[p] * xcos2[i] - data[q] * xsin2[i];
+	  buf_1[k].imag = -1.0f * (data[q] * xcos2[i] + data[p] * xsin2[i]); 
+		/* Z2[i] = (X2[128-2*i-1] + j * X2[2*i]) * (xcos2[i] + j * xsin2[i]); */ 
+		buf_2[k].real =          data[p + 1] * xcos2[i] - data[q + 1] * xsin2[i];
+	  buf_2[k].imag = -1.0f * ( data[q + 1] * xcos2[i] + data[p + 1] * xsin2[i]); 
+	}
+
+	// FFT Merge 
+	for (m=0; m < 6; m++)
+	{
+		two_m = (1 << m);
+		two_m_plus_one = (1 << (m+1));
+
+		if(m)
+			two_m = (1 << m);
+		else
+			two_m = 1;
+
+		for(k = 0; k < two_m; k++)
+		{
+			for(i = 0; i < 64; i += two_m_plus_one)
+			{
+				p = k + i;
+				q = p + two_m;
+				//Do block 1
+				tmp_a_r = buf_1[p].real;
+				tmp_a_i = buf_1[p].imag;
+				tmp_b_r = buf_1[q].real * w[m][k].real - buf_1[q].imag * w[m][k].imag;
+				tmp_b_i = buf_1[q].imag * w[m][k].real + buf_1[q].real * w[m][k].imag;
+				buf_1[p].real = tmp_a_r + tmp_b_r;
+				buf_1[p].imag =  tmp_a_i + tmp_b_i;
+				buf_1[q].real = tmp_a_r - tmp_b_r;
+				buf_1[q].imag =  tmp_a_i - tmp_b_i;
+
+				//Do block 2
+				tmp_a_r = buf_2[p].real;
+				tmp_a_i = buf_2[p].imag;
+				tmp_b_r = buf_2[q].real * w[m][k].real - buf_2[q].imag * w[m][k].imag;
+				tmp_b_i = buf_2[q].imag * w[m][k].real + buf_2[q].real * w[m][k].imag;
+				buf_2[p].real = tmp_a_r + tmp_b_r;
+				buf_2[p].imag =  tmp_a_i + tmp_b_i;
+				buf_2[q].real = tmp_a_r - tmp_b_r;
+				buf_2[q].imag =  tmp_a_i - tmp_b_i;
+
+			}
+		}
+	}
+
+	// Post IFFT complex multiply 
+	for( i=0; i < 64; i++)
+	{
+		//Note that I flipped the signs on the imaginary ops to do the complex conj
+		
+		/* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ 
+		tmp_a_r = buf_1[i].real;
+		tmp_a_i = buf_1[i].imag;
+		buf_1[i].real =(tmp_a_r * xcos2[i])  +  (tmp_a_i  * xsin2[i]);
+	  buf_1[i].imag =(tmp_a_r * xsin2[i])  -  (tmp_a_i  * xcos2[i]);
+		/* y2[n] = z2[n] * (xcos2[n] + j * xsin2[n]) ; */ 
+		tmp_a_r = buf_2[i].real;
+		tmp_a_i = buf_2[i].imag;
+		buf_2[i].real =(tmp_a_r * xcos2[i])  +  (tmp_a_i  * xsin2[i]);
+	  buf_2[i].imag =(tmp_a_r * xsin2[i])  -  (tmp_a_i  * xcos2[i]);
+	}
+	
+	data_ptr = data;
+	delay_ptr = delay;
+	window_ptr = window;
+
+	/* Window and convert to real valued signal */
+	for(i=0; i< 64; i++) 
+	{ 
+		*data_ptr++  = 2.0f * (-buf_1[i].imag      * *window_ptr++ + *delay_ptr++);
+		*data_ptr++  = 2.0f * ( buf_1[64-i-1].real * *window_ptr++ + *delay_ptr++);
+	}
+
+	for(i=0; i< 64; i++) 
+	{
+		*data_ptr++  = 2.0f * (-buf_1[i].real      * *window_ptr++ + *delay_ptr++);
+		*data_ptr++  = 2.0f * ( buf_1[64-i-1].imag * *window_ptr++ + *delay_ptr++);
+	}
+	
+	delay_ptr = delay;
+
+	for(i=0; i< 64; i++) 
+	{
+		*delay_ptr++ = -buf_2[i].real      * *--window_ptr;
+		*delay_ptr++ =  buf_2[64-i-1].imag * *--window_ptr;
+	}
+
+	for(i=0; i< 64; i++) 
+	{
+		*delay_ptr++ =  buf_2[i].imag      * *--window_ptr;
+		*delay_ptr++ = -buf_2[64-i-1].real * *--window_ptr;
+	}
+}
+
+//FIXME remove - for timing code
+///#include <sys/time.h>
+//FIXME remove
+
+void 
+imdct(bsi_t *bsi,audblk_t *audblk, stream_samples_t samples) {
+	int i;
+
+	//handy timing code
+	//struct timeval start,end;
+
+	//gettimeofday(&start,0);
+	
+	for(i=0; i<bsi->nfchans;i++)
+	{
+		if(audblk->blksw[i])
+			imdct_do_256(samples[i],delay[i]);
+		else
+			imdct_do_512(samples[i],delay[i]);
+	}
+	//gettimeofday(&end,0);
+	//printf("imdct %ld us\n",(end.tv_sec - start.tv_sec) * 1000000 +
+        //end.tv_usec - start.tv_usec);
+
+	//XXX We don't bother with the IMDCT for the LFE as it's currently
+	//unused.
+	//if (bsi->lfeon)
+	//	imdct_do_512(coeffs->lfe,samples->channel[5],delay[5]);
+	//	
+}
diff --git a/ac3dec/imdct.h b/ac3dec/imdct.h
new file mode 100644
index 000000000..750aa8798
--- /dev/null
+++ b/ac3dec/imdct.h
@@ -0,0 +1,26 @@
+/* 
+ *  imdct.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+void imdct(bsi_t *bsi,audblk_t *audblk, stream_samples_t samples);
+void imdct_init(void);
diff --git a/ac3dec/parse.c b/ac3dec/parse.c
new file mode 100644
index 000000000..3560bc5ab
--- /dev/null
+++ b/ac3dec/parse.c
@@ -0,0 +1,597 @@
+/* 
+ *    parse.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "bitstream.h"
+#include "stats.h"
+#include "debug.h"
+#include "parse.h"
+
+/* Misc LUT */
+static const uint_16 nfchans[8] = {2,1,2,3,3,4,4,5};
+
+struct frmsize_s
+{
+	uint_16 bit_rate;
+	uint_16 frm_size[3];
+};
+
+static const struct frmsize_s frmsizecod_tbl[64] = 
+{
+	{ 32  ,{64   ,69   ,96   } },
+	{ 32  ,{64   ,70   ,96   } },
+	{ 40  ,{80   ,87   ,120  } },
+	{ 40  ,{80   ,88   ,120  } },
+	{ 48  ,{96   ,104  ,144  } },
+	{ 48  ,{96   ,105  ,144  } },
+	{ 56  ,{112  ,121  ,168  } },
+	{ 56  ,{112  ,122  ,168  } },
+	{ 64  ,{128  ,139  ,192  } },
+	{ 64  ,{128  ,140  ,192  } },
+	{ 80  ,{160  ,174  ,240  } },
+	{ 80  ,{160  ,175  ,240  } },
+	{ 96  ,{192  ,208  ,288  } },
+	{ 96  ,{192  ,209  ,288  } },
+	{ 112 ,{224  ,243  ,336  } },
+	{ 112 ,{224  ,244  ,336  } },
+	{ 128 ,{256  ,278  ,384  } },
+	{ 128 ,{256  ,279  ,384  } },
+	{ 160 ,{320  ,348  ,480  } },
+	{ 160 ,{320  ,349  ,480  } },
+	{ 192 ,{384  ,417  ,576  } },
+	{ 192 ,{384  ,418  ,576  } },
+	{ 224 ,{448  ,487  ,672  } },
+	{ 224 ,{448  ,488  ,672  } },
+	{ 256 ,{512  ,557  ,768  } },
+	{ 256 ,{512  ,558  ,768  } },
+	{ 320 ,{640  ,696  ,960  } },
+	{ 320 ,{640  ,697  ,960  } },
+	{ 384 ,{768  ,835  ,1152 } },
+	{ 384 ,{768  ,836  ,1152 } },
+	{ 448 ,{896  ,975  ,1344 } },
+	{ 448 ,{896  ,976  ,1344 } },
+	{ 512 ,{1024 ,1114 ,1536 } },
+	{ 512 ,{1024 ,1115 ,1536 } },
+	{ 576 ,{1152 ,1253 ,1728 } },
+	{ 576 ,{1152 ,1254 ,1728 } },
+	{ 640 ,{1280 ,1393 ,1920 } },
+	{ 640 ,{1280 ,1394 ,1920 } }
+};
+
+/* Parse a syncinfo structure, minus the sync word */
+void
+parse_syncinfo(syncinfo_t *syncinfo,uint_8 *data)
+{
+	//
+	// We need to read in the entire syncinfo struct (0x0b77 + 24 bits)
+	// in order to determine how big the frame is
+	//
+
+	// Get the sampling rate 
+	syncinfo->fscod  = (data[2] >> 6) & 0x3;
+
+	if(syncinfo->fscod == 3)
+	{
+		//invalid sampling rate code
+		error_flag = 1;	
+		return;
+	}
+	else if(syncinfo->fscod == 2)
+		syncinfo->sampling_rate = 32000;
+	else if(syncinfo->fscod == 1)
+		syncinfo->sampling_rate = 44100;
+	else
+		syncinfo->sampling_rate = 48000;
+
+	// Get the frame size code 
+	syncinfo->frmsizecod = data[2] & 0x3f;
+
+	// Calculate the frame size and bitrate
+	syncinfo->frame_size = 
+		frmsizecod_tbl[syncinfo->frmsizecod].frm_size[syncinfo->fscod];
+	syncinfo->bit_rate = frmsizecod_tbl[syncinfo->frmsizecod].bit_rate;
+
+}
+
+/*
+ * This routine fills a bsi struct from the AC3 stream
+ */
+
+void
+parse_bsi(bsi_t *bsi)
+{
+	uint_32 i;
+
+	/* Check the AC-3 version number */
+	bsi->bsid = bitstream_get(5);
+
+	/* Get the audio service provided by the steram */
+	bsi->bsmod = bitstream_get(3);
+
+	/* Get the audio coding mode (ie how many channels)*/
+	bsi->acmod = bitstream_get(3);
+	/* Predecode the number of full bandwidth channels as we use this
+	 * number a lot */
+	bsi->nfchans = nfchans[bsi->acmod];
+
+	/* If it is in use, get the centre channel mix level */
+	if ((bsi->acmod & 0x1) && (bsi->acmod != 0x1))
+		bsi->cmixlev = bitstream_get(2);
+
+	/* If it is in use, get the surround channel mix level */
+	if (bsi->acmod & 0x4)
+		bsi->surmixlev = bitstream_get(2);
+
+	/* Get the dolby surround mode if in 2/0 mode */
+	if(bsi->acmod == 0x2)
+		bsi->dsurmod= bitstream_get(2);
+
+	/* Is the low frequency effects channel on? */
+	bsi->lfeon = bitstream_get(1);
+
+	/* Get the dialogue normalization level */
+	bsi->dialnorm = bitstream_get(5);
+
+	/* Does compression gain exist? */
+	bsi->compre = bitstream_get(1);
+	if (bsi->compre)
+	{
+		/* Get compression gain */
+		bsi->compr = bitstream_get(8);
+	}
+
+	/* Does language code exist? */
+	bsi->langcode = bitstream_get(1);
+	if (bsi->langcode)
+	{
+		/* Get langauge code */
+		bsi->langcod = bitstream_get(8);
+	}
+
+	/* Does audio production info exist? */
+	bsi->audprodie = bitstream_get(1);
+	if (bsi->audprodie)
+	{
+		/* Get mix level */
+		bsi->mixlevel = bitstream_get(5);
+
+		/* Get room type */
+		bsi->roomtyp = bitstream_get(2);
+	}
+
+	/* If we're in dual mono mode then get some extra info */
+	if (bsi->acmod ==0)
+	{
+		/* Get the dialogue normalization level two */
+		bsi->dialnorm2 = bitstream_get(5);
+
+		/* Does compression gain two exist? */
+		bsi->compr2e = bitstream_get(1);
+		if (bsi->compr2e)
+		{
+			/* Get compression gain two */
+			bsi->compr2 = bitstream_get(8);
+		}
+
+		/* Does language code two exist? */
+		bsi->langcod2e = bitstream_get(1);
+		if (bsi->langcod2e)
+		{
+			/* Get langauge code two */
+			bsi->langcod2 = bitstream_get(8);
+		}
+
+		/* Does audio production info two exist? */
+		bsi->audprodi2e = bitstream_get(1);
+		if (bsi->audprodi2e)
+		{
+			/* Get mix level two */
+			bsi->mixlevel2 = bitstream_get(5);
+
+			/* Get room type two */
+			bsi->roomtyp2 = bitstream_get(2);
+		}
+	}
+
+	/* Get the copyright bit */
+	bsi->copyrightb = bitstream_get(1);
+
+	/* Get the original bit */
+	bsi->origbs = bitstream_get(1);
+	
+	/* Does timecode one exist? */
+	bsi->timecod1e = bitstream_get(1);
+
+	if(bsi->timecod1e)
+		bsi->timecod1 = bitstream_get(14);
+
+	/* Does timecode two exist? */
+	bsi->timecod2e = bitstream_get(1);
+
+	if(bsi->timecod2e)
+		bsi->timecod2 = bitstream_get(14);
+
+	/* Does addition info exist? */
+	bsi->addbsie = bitstream_get(1);
+
+	if(bsi->addbsie)
+	{
+		/* Get how much info is there */
+		bsi->addbsil = bitstream_get(6);
+
+		/* Get the additional info */
+		for(i=0;i<(bsi->addbsil + 1);i++)
+			bsi->addbsi[i] = bitstream_get(8);
+	}
+
+	stats_print_bsi(bsi);
+}
+
+/* More pain inducing parsing */
+void
+parse_audblk(bsi_t *bsi,audblk_t *audblk)
+{
+	int i,j;
+
+	for (i=0;i < bsi->nfchans; i++)
+	{
+		/* Is this channel an interleaved 256 + 256 block ? */
+		audblk->blksw[i] = bitstream_get(1);
+	}
+
+	for (i=0;i < bsi->nfchans; i++)
+	{
+		/* Should we dither this channel? */
+		audblk->dithflag[i] = bitstream_get(1);
+	}
+
+	/* Does dynamic range control exist? */
+	audblk->dynrnge = bitstream_get(1);
+	if (audblk->dynrnge)
+	{
+		/* Get dynamic range info */
+		audblk->dynrng = bitstream_get(8);
+	}
+
+	/* If we're in dual mono mode then get the second channel DR info */
+	if (bsi->acmod == 0)
+	{
+		/* Does dynamic range control two exist? */
+		audblk->dynrng2e = bitstream_get(1);
+		if (audblk->dynrng2e)
+		{
+			/* Get dynamic range info */
+			audblk->dynrng2 = bitstream_get(8);
+		}
+	}
+
+	/* Does coupling strategy exist? */
+	audblk->cplstre = bitstream_get(1);
+	if (audblk->cplstre)
+	{
+		/* Is coupling turned on? */
+		audblk->cplinu = bitstream_get(1);
+		if(audblk->cplinu)
+		{
+			for(i=0;i < bsi->nfchans; i++)
+				audblk->chincpl[i] = bitstream_get(1);
+			if(bsi->acmod == 0x2)
+				audblk->phsflginu = bitstream_get(1);
+			audblk->cplbegf = bitstream_get(4);
+			audblk->cplendf = bitstream_get(4);
+			audblk->ncplsubnd = (audblk->cplendf + 2) - audblk->cplbegf + 1;
+
+			/* Calculate the start and end bins of the coupling channel */
+			audblk->cplstrtmant = (audblk->cplbegf * 12) + 37 ; 
+			audblk->cplendmant =  ((audblk->cplendf + 3) * 12) + 37;
+
+			/* The number of combined subbands is ncplsubnd minus each combined
+			 * band */
+			audblk->ncplbnd = audblk->ncplsubnd; 
+
+			for(i=1; i< audblk->ncplsubnd; i++)
+			{
+				audblk->cplbndstrc[i] = bitstream_get(1);
+				audblk->ncplbnd -= audblk->cplbndstrc[i];
+			}
+		}
+	}
+
+	if(audblk->cplinu)
+	{
+		/* Loop through all the channels and get their coupling co-ords */	
+		for(i=0;i < bsi->nfchans;i++)
+		{
+			if(!audblk->chincpl[i])
+				continue;
+
+			/* Is there new coupling co-ordinate info? */
+			audblk->cplcoe[i] = bitstream_get(1);
+
+			if(audblk->cplcoe[i])
+			{
+				audblk->mstrcplco[i] = bitstream_get(2); 
+				for(j=0;j < audblk->ncplbnd; j++)
+				{
+					audblk->cplcoexp[i][j] = bitstream_get(4); 
+					audblk->cplcomant[i][j] = bitstream_get(4); 
+				}
+			}
+		}
+
+		/* If we're in dual mono mode, there's going to be some phase info */
+		if( (bsi->acmod == 0x2) && audblk->phsflginu && 
+				(audblk->cplcoe[0] || audblk->cplcoe[1]))
+		{
+			for(j=0;j < audblk->ncplbnd; j++)
+				audblk->phsflg[j] = bitstream_get(1); 
+
+		}
+	}
+
+	/* If we're in dual mono mode, there may be a rematrix strategy */
+	if(bsi->acmod == 0x2)
+	{
+		audblk->rematstr = bitstream_get(1);
+		if(audblk->rematstr)
+		{
+			if (audblk->cplinu == 0) 
+			{ 
+				for(i = 0; i < 4; i++) 
+					audblk->rematflg[i] = bitstream_get(1);
+			}
+			if((audblk->cplbegf > 2) && audblk->cplinu) 
+			{
+				for(i = 0; i < 4; i++) 
+					audblk->rematflg[i] = bitstream_get(1);
+			}
+			if((audblk->cplbegf <= 2) && audblk->cplinu) 
+			{ 
+				for(i = 0; i < 3; i++) 
+					audblk->rematflg[i] = bitstream_get(1);
+			} 
+			if((audblk->cplbegf == 0) && audblk->cplinu) 
+				for(i = 0; i < 2; i++) 
+					audblk->rematflg[i] = bitstream_get(1);
+
+		}
+	}
+
+	if (audblk->cplinu)
+	{
+		/* Get the coupling channel exponent strategy */
+		audblk->cplexpstr = bitstream_get(2);
+		audblk->ncplgrps = (audblk->cplendmant - audblk->cplstrtmant) / 
+				(3 << (audblk->cplexpstr-1));
+	}
+
+	for(i = 0; i < bsi->nfchans; i++)
+		audblk->chexpstr[i] = bitstream_get(2);
+
+	/* Get the exponent strategy for lfe channel */
+	if(bsi->lfeon) 
+		audblk->lfeexpstr = bitstream_get(1);
+
+	/* Determine the bandwidths of all the fbw channels */
+	for(i = 0; i < bsi->nfchans; i++) 
+	{ 
+		uint_16 grp_size;
+
+		if(audblk->chexpstr[i] != EXP_REUSE) 
+		{ 
+			if (audblk->cplinu && audblk->chincpl[i]) 
+			{
+				audblk->endmant[i] = audblk->cplstrtmant;
+			}
+			else
+			{
+				audblk->chbwcod[i] = bitstream_get(6); 
+				audblk->endmant[i] = ((audblk->chbwcod[i] + 12) * 3) + 37;
+			}
+
+			/* Calculate the number of exponent groups to fetch */
+			grp_size =  3 * (1 << (audblk->chexpstr[i] - 1));
+			audblk->nchgrps[i] = (audblk->endmant[i] - 1 + (grp_size - 3)) / grp_size;
+		}
+	}
+
+	/* Get the coupling exponents if they exist */
+	if(audblk->cplinu && (audblk->cplexpstr != EXP_REUSE))
+	{
+		audblk->cplabsexp = bitstream_get(4);
+		for(i=0;i< audblk->ncplgrps;i++)
+			audblk->cplexps[i] = bitstream_get(7);
+	}
+
+	/* Get the fwb channel exponents */
+	for(i=0;i < bsi->nfchans; i++)
+	{
+		if(audblk->chexpstr[i] != EXP_REUSE)
+		{
+			audblk->exps[i][0] = bitstream_get(4);			
+			for(j=1;j<=audblk->nchgrps[i];j++)
+				audblk->exps[i][j] = bitstream_get(7);
+			audblk->gainrng[i] = bitstream_get(2);
+		}
+	}
+
+	/* Get the lfe channel exponents */
+	if(bsi->lfeon && (audblk->lfeexpstr != EXP_REUSE))
+	{
+		audblk->lfeexps[0] = bitstream_get(4);
+		audblk->lfeexps[1] = bitstream_get(7);
+		audblk->lfeexps[2] = bitstream_get(7);
+	}
+
+	/* Get the parametric bit allocation parameters */
+	audblk->baie = bitstream_get(1);
+
+	if(audblk->baie)
+	{
+		audblk->sdcycod = bitstream_get(2);
+		audblk->fdcycod = bitstream_get(2);
+		audblk->sgaincod = bitstream_get(2);
+		audblk->dbpbcod = bitstream_get(2);
+		audblk->floorcod = bitstream_get(3);
+	}
+
+	/* Get the SNR off set info if it exists */
+	audblk->snroffste = bitstream_get(1);
+
+	if(audblk->snroffste)
+	{
+		audblk->csnroffst = bitstream_get(6);
+
+		if(audblk->cplinu)
+		{
+			audblk->cplfsnroffst = bitstream_get(4);
+			audblk->cplfgaincod = bitstream_get(3);
+		}
+
+		for(i = 0;i < bsi->nfchans; i++)
+		{
+			audblk->fsnroffst[i] = bitstream_get(4);
+			audblk->fgaincod[i] = bitstream_get(3);
+		}
+		if(bsi->lfeon)
+		{
+
+			audblk->lfefsnroffst = bitstream_get(4);
+			audblk->lfefgaincod = bitstream_get(3);
+		}
+	}
+
+	/* Get coupling leakage info if it exists */
+	if(audblk->cplinu)
+	{
+		audblk->cplleake = bitstream_get(1);	
+		
+		if(audblk->cplleake)
+		{
+			audblk->cplfleak = bitstream_get(3);
+			audblk->cplsleak = bitstream_get(3);
+		}
+	}
+	
+	/* Get the delta bit alloaction info */
+	audblk->deltbaie = bitstream_get(1);	
+	
+	if(audblk->deltbaie)
+	{
+		if(audblk->cplinu)
+			audblk->cpldeltbae = bitstream_get(2);
+
+		for(i = 0;i < bsi->nfchans; i++)
+			audblk->deltbae[i] = bitstream_get(2);
+
+		if (audblk->cplinu && (audblk->cpldeltbae == DELTA_BIT_NEW))
+		{
+			audblk->cpldeltnseg = bitstream_get(3);
+			for(i = 0;i < audblk->cpldeltnseg + 1; i++)
+			{
+				audblk->cpldeltoffst[i] = bitstream_get(5);
+				audblk->cpldeltlen[i] = bitstream_get(4);
+				audblk->cpldeltba[i] = bitstream_get(3);
+			}
+		}
+
+		for(i = 0;i < bsi->nfchans; i++)
+		{
+			if (audblk->deltbae[i] == DELTA_BIT_NEW)
+			{
+				audblk->deltnseg[i] = bitstream_get(3);
+				for(j = 0; j < audblk->deltnseg[i] + 1; j++)
+				{
+					audblk->deltoffst[i][j] = bitstream_get(5);
+					audblk->deltlen[i][j] = bitstream_get(4);
+					audblk->deltba[i][j] = bitstream_get(3);
+				}
+			}
+		}
+	}
+
+	/* Check to see if there's any dummy info to get */
+	if((audblk->skiple =  bitstream_get(1)))
+	{
+		uint_16 skip_data;
+
+		audblk->skipl = bitstream_get(9);
+		//XXX remove
+		//fprintf(stderr,"(parse) skipping %d bytes\n",audblk->skipl);
+
+		for(i = 0; i < audblk->skipl ; i++)
+		{
+			skip_data = bitstream_get(8);
+			//XXX remove
+			//fprintf(stderr,"skipped data %2x\n",skip_data);
+			//if(skip_data != 0)
+			//{	
+				//dprintf("(parse) Invalid skipped data %2x\n",skip_data);
+				//exit(1);
+			//}
+		}
+	}
+
+	stats_print_audblk(bsi,audblk);
+}
+
+void
+parse_auxdata(syncinfo_t *syncinfo)
+{
+	//FIXME keep this now that we don't really need it?
+#if 0
+	int i;
+	int skip_length;
+	uint_16 crc;
+	uint_16 auxdatae;
+
+	skip_length = (syncinfo->frame_size * 16)  - bitstream_get_total_bits() - 17 - 1;
+
+	//XXX remove
+	//dprintf("(auxdata) skipping %d auxbits\n",skip_length);
+	
+	for(i=0; i <  skip_length; i++)
+		//printf("Skipped bit %i\n",(uint_16)bitstream_get(1));
+		bitstream_get(1);
+
+	//get the auxdata exists bit
+	auxdatae = bitstream_get(1);	
+
+	//XXX remove
+	//dprintf("auxdatae = %i\n",auxdatae);
+
+	//Skip the CRC reserved bit
+	bitstream_get(1);
+
+	//Get the crc
+	crc = bitstream_get(16);
+#endif
+}
+
+
diff --git a/ac3dec/parse.h b/ac3dec/parse.h
new file mode 100644
index 000000000..cdaee66f4
--- /dev/null
+++ b/ac3dec/parse.h
@@ -0,0 +1,28 @@
+/* 
+ *    parse.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+void parse_syncinfo(syncinfo_t *syncinfo,uint_8 *data);
+void parse_audblk(bsi_t *bsi,audblk_t *audblk);
+void parse_bsi(bsi_t *bsi);
+void parse_auxdata(syncinfo_t *syncinfo);
+
diff --git a/ac3dec/rematrix.c b/ac3dec/rematrix.c
new file mode 100644
index 000000000..caa709430
--- /dev/null
+++ b/ac3dec/rematrix.c
@@ -0,0 +1,83 @@
+/* 
+ *    rematrix.c
+ *
+ *	Copyright (C) Aaron Holtzman - July 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "decode.h"
+#include "rematrix.h"
+
+struct rematrix_band_s
+{
+	uint_32 start;
+	uint_32 end;
+};
+
+struct rematrix_band_s rematrix_band[] = { {13,24}, {25,36}, {37 ,60}, {61,252}};
+
+static inline uint_32 min(uint_32 a,uint_32 b);
+
+static inline uint_32
+min(uint_32 a,uint_32 b)
+{
+	return (a < b ? a : b);
+}
+
+/* This routine simply does stereo rematixing for the 2 channel 
+ * stereo mode */
+void rematrix(audblk_t *audblk, stream_samples_t samples)
+{
+	uint_32 num_bands;
+	uint_32 start;
+	uint_32 end;
+	uint_32 i,j;
+	float left,right;
+
+	if(!audblk->cplinu || audblk->cplbegf > 2)
+		num_bands = 4;
+	else if (audblk->cplbegf > 0)
+		num_bands = 3;
+	else
+		num_bands = 2;
+
+	for(i=0;i < num_bands; i++)
+	{
+		if(!audblk->rematflg[i])
+			continue;
+
+		start = rematrix_band[i].start;
+		end = min(rematrix_band[i].end ,12 * audblk->cplbegf + 36);
+	
+		for(j=start;j < end; j++)
+		{
+			left  = samples[0][j] + samples[1][j];
+			right = samples[0][j] - samples[1][j];
+			samples[0][j] = left;
+			samples[1][j] = right;
+		}
+	}
+}
diff --git a/ac3dec/rematrix.h b/ac3dec/rematrix.h
new file mode 100644
index 000000000..0be6528f6
--- /dev/null
+++ b/ac3dec/rematrix.h
@@ -0,0 +1,25 @@
+/* 
+ *    rematrix.h
+ *
+ *	Copyright (C) Aaron Holtzman - July 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+void rematrix(audblk_t *audblk, stream_samples_t samples);
diff --git a/ac3dec/sanity_check.c b/ac3dec/sanity_check.c
new file mode 100644
index 000000000..461f20ea9
--- /dev/null
+++ b/ac3dec/sanity_check.c
@@ -0,0 +1,131 @@
+/* 
+ *  sanity_check.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+#include "sanity_check.h"
+
+
+void 
+sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
+{
+	syncinfo->magic = AC3_MAGIC_NUMBER;
+	bsi->magic = AC3_MAGIC_NUMBER;
+	audblk->magic1 = AC3_MAGIC_NUMBER;
+	audblk->magic2 = AC3_MAGIC_NUMBER;
+	audblk->magic3 = AC3_MAGIC_NUMBER;
+}
+
+void 
+sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
+{
+	int i;
+
+	if(syncinfo->magic != AC3_MAGIC_NUMBER)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- syncinfo magic number **");
+		error_flag = 1;
+	}
+	
+	if(bsi->magic != AC3_MAGIC_NUMBER)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- bsi magic number **");
+		error_flag = 1;
+	}
+
+	if(audblk->magic1 != AC3_MAGIC_NUMBER)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 1 **"); 
+		error_flag = 1;
+	}
+
+	if(audblk->magic2 != AC3_MAGIC_NUMBER)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 2 **"); 
+		error_flag = 1;
+	}
+
+	if(audblk->magic3 != AC3_MAGIC_NUMBER)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 3 **"); 
+		error_flag = 1;
+	}
+
+	for(i = 0;i < 5 ; i++)
+	{
+		if (audblk->fbw_exp[i][255] !=0 || audblk->fbw_exp[i][254] !=0 || 
+				audblk->fbw_exp[i][253] !=0)
+		{
+			fprintf(stderr,"\n** Sanity check failed -- fbw_exp out of bounds **"); 
+			error_flag = 1;
+		}
+
+		if (audblk->fbw_bap[i][255] !=0 || audblk->fbw_bap[i][254] !=0 || 
+				audblk->fbw_bap[i][253] !=0)
+		{
+			fprintf(stderr,"\n** Sanity check failed -- fbw_bap out of bounds **"); 
+			error_flag = 1;
+		}
+
+	}
+
+	if (audblk->cpl_exp[255] !=0 || audblk->cpl_exp[254] !=0 || 
+			audblk->cpl_exp[253] !=0)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- cpl_exp out of bounds **"); 
+		error_flag = 1;
+	}
+
+	if (audblk->cpl_bap[255] !=0 || audblk->cpl_bap[254] !=0 || 
+			audblk->cpl_bap[253] !=0)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- cpl_bap out of bounds **"); 
+		error_flag = 1;
+	}
+
+	if (audblk->cplmant[255] !=0 || audblk->cplmant[254] !=0 || 
+			audblk->cplmant[253] !=0)
+	{
+		fprintf(stderr,"\n** Sanity check failed -- cpl_mant out of bounds **"); 
+		error_flag = 1;
+	}
+
+	if ((audblk->cplinu == 1) && (audblk->cplbegf > (audblk->cplendf+2)))
+	{
+		fprintf(stderr,"\n** Sanity check failed -- cpl params inconsistent **"); 
+		error_flag = 1;
+	}
+
+	for(i=0; i < bsi->nfchans; i++)
+	{
+		if((audblk->chincpl[i] == 0) && (audblk->chbwcod[i] > 60))
+		{
+			fprintf(stderr,"\n** Sanity check failed -- chbwcod too big **"); 
+			error_flag = 1;
+		}
+	}
+
+	return;
+}	
diff --git a/ac3dec/sanity_check.h b/ac3dec/sanity_check.h
new file mode 100644
index 000000000..c4ca63a21
--- /dev/null
+++ b/ac3dec/sanity_check.h
@@ -0,0 +1,27 @@
+/* 
+ *  sanity_check.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#define AC3_MAGIC_NUMBER 0xdeadbeef
+
+void sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
+void sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/stats.c b/ac3dec/stats.c
new file mode 100644
index 000000000..cfeb453f4
--- /dev/null
+++ b/ac3dec/stats.c
@@ -0,0 +1,178 @@
+/* 
+ *  stats.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+//#include "config.h"
+#include "ac3.h"
+#include "ac3_internal.h"
+
+
+#include "decode.h"
+#include "stats.h"
+#include "debug.h"
+
+
+static const char *service_ids[8] = 
+{
+	"CM","ME","VI","HI",
+	 "D", "C","E", "VO"
+};
+
+struct mixlev_s
+{
+	float clev;
+	char *desc;
+};
+
+static const struct mixlev_s cmixlev_tbl[4] =  
+{
+	{0.707, "(-3.0 dB)"}, {0.595, "(-4.5 dB)"},
+	{0.500, "(-6.0 dB)"}, {1.0,  "Invalid"}
+};
+
+static const struct mixlev_s smixlev_tbl[4] =  
+{
+	{0.707, "(-3.0 dB)"}, {0.500, "(-6.0 dB)"},
+	{  0.0,   "off    "}, {  1.0, "Invalid"}
+};
+
+static const char *language[128] = 
+{
+	"unknown", "Albanian", "Breton", "Catalan", "Croatian", "Welsh", "Czech", "Danish", 
+	"German", "English", "Spanish", "Esperanto", "Estonian", "Basque", "Faroese", "French", 
+	"Frisian", "Irish", "Gaelic", "Galician", "Icelandic", "Italian", "Lappish", "Latin", 
+	"Latvian", "Luxembourgian", "Lithuanian", "Hungarian", "Maltese", "Dutch", "Norwegian", "Occitan", 
+	"Polish", "Portugese", "Romanian", "Romansh", "Serbian", "Slovak", "Slovene", "Finnish", 
+	"Swedish", "Turkish", "Flemish", "Walloon", "0x2c", "0x2d", "0x2e", "0x2f", 
+	"0x30", "0x31", "0x32", "0x33", "0x34", "0x35", "0x36", "0x37", 
+	"0x38", "0x39", "0x3a", "0x3b", "0x3c", "0x3d", "0x3e", "0x3f", 
+	"background", "0x41", "0x42", "0x43", "0x44", "Zulu", "Vietnamese", "Uzbek", 
+	"Urdu", "Ukrainian", "Thai", "Telugu", "Tatar", "Tamil", "Tadzhik", "Swahili", 
+	"Sranan Tongo", "Somali", "Sinhalese", "Shona", "Serbo-Croat", "Ruthenian", "Russian", "Quechua", 
+	"Pustu", "Punjabi", "Persian", "Papamiento", "Oriya", "Nepali", "Ndebele", "Marathi", 
+	"Moldavian", "Malaysian", "Malagasay", "Macedonian", "Laotian", "Korean", "Khmer", "Kazakh",
+	"Kannada", "Japanese", "Indonesian", "Hindi", "Hebrew", "Hausa", "Gurani", "Gujurati", 
+	"Greek", "Georgian", "Fulani", "Dari", "Churash", "Chinese", "Burmese", "Bulgarian", 
+	"Bengali", "Belorussian", "Bambora", "Azerbijani", "Assamese", "Armenian", "Arabic", "Amharic"
+};
+
+void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi)
+{
+	fprintf(stdout,"ac3dec-0.6.2-cvs (C) 2000 Aaron Holtzman (aholtzma@ess.engr.uvic.ca)\n");
+
+	fprintf(stdout,"%d.%d Mode ",bsi->nfchans,bsi->lfeon);
+	fprintf(stdout,"%2.1f KHz",syncinfo->sampling_rate * 1e-3);
+	fprintf(stdout,"%4d kbps ",syncinfo->bit_rate);
+	if (bsi->langcode && (bsi->langcod < 128))
+		fprintf(stdout,"%s ", language[bsi->langcod]);
+
+	switch(bsi->bsmod)
+	{
+		case 0:
+			fprintf(stdout,"Complete Main Audio Service");
+			break;
+		case 1:
+			fprintf(stdout,"Music and Effects Audio Service");
+		case 2:
+			fprintf(stdout,"Visually Impaired Audio Service");
+			break;
+		case 3:
+			fprintf(stdout,"Hearing Impaired Audio Service");
+			break;
+		case 4:
+			fprintf(stdout,"Dialogue Audio Service");
+			break;
+		case 5:
+			fprintf(stdout,"Commentary Audio Service");
+			break;
+		case 6:
+			fprintf(stdout,"Emergency Audio Service");
+			break;
+		case 7:
+			fprintf(stdout,"Voice Over Audio Service");
+			break;
+	}
+	fprintf(stdout,"\n");
+}
+
+void stats_print_syncinfo(syncinfo_t *syncinfo)
+{
+	dprintf("(syncinfo) ");
+	
+	switch (syncinfo->fscod)
+	{
+		case 2:
+			dprintf("32 KHz   ");
+			break;
+		case 1:
+			dprintf("44.1 KHz ");
+			break;
+		case 0:
+			dprintf("48 KHz   ");
+			break;
+		default:
+			dprintf("Invalid sampling rate ");
+			break;
+	}
+
+	dprintf("%4d kbps %4d words per frame\n",syncinfo->bit_rate, 
+			syncinfo->frame_size);
+
+}
+	
+void stats_print_bsi(bsi_t *bsi)
+{
+	dprintf("(bsi) ");
+	dprintf("%s",service_ids[bsi->bsmod]);
+	dprintf(" %d.%d Mode ",bsi->nfchans,bsi->lfeon);
+	if ((bsi->acmod & 0x1) && (bsi->acmod != 0x1))
+		dprintf(" Centre Mix Level %s ",cmixlev_tbl[bsi->cmixlev].desc);
+	if (bsi->acmod & 0x4)
+		dprintf(" Sur Mix Level %s ",smixlev_tbl[bsi->cmixlev].desc);
+	dprintf("\n");
+
+}
+
+char *exp_strat_tbl[4] = {"R   ","D15 ","D25 ","D45 "};
+
+void stats_print_audblk(bsi_t *bsi,audblk_t *audblk)
+{
+	uint_32 i;
+
+	dprintf("(audblk) ");
+	dprintf("%s ",audblk->cplinu ? "cpl on " : "cpl off");
+	dprintf("%s ",audblk->baie? "bai " : "    ");
+	dprintf("%s ",audblk->snroffste? "snroffst " : "         ");
+	dprintf("%s ",audblk->deltbaie? "deltba " : "       ");
+	dprintf("%s ",audblk->phsflginu? "phsflg " : "       ");
+	dprintf("(%s %s %s %s %s) ",exp_strat_tbl[audblk->chexpstr[0]],
+		exp_strat_tbl[audblk->chexpstr[1]],exp_strat_tbl[audblk->chexpstr[2]],
+		exp_strat_tbl[audblk->chexpstr[3]],exp_strat_tbl[audblk->chexpstr[4]]);
+	dprintf("[");
+	for(i=0;i<bsi->nfchans;i++)
+		dprintf("%1d",audblk->blksw[i]);
+	dprintf("]");
+
+	dprintf("\n");
+}
diff --git a/ac3dec/stats.h b/ac3dec/stats.h
new file mode 100644
index 000000000..8a9ecb69b
--- /dev/null
+++ b/ac3dec/stats.h
@@ -0,0 +1,27 @@
+/* 
+ *  stats.h
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+void stats_print_syncinfo(syncinfo_t *syncinfo);
+void stats_print_bsi(bsi_t *bsi);
+void stats_print_audblk(bsi_t *bsi,audblk_t *audblk);
+void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi);
diff --git a/channels.conf b/channels.conf
index 8fc1a980c..1f62f70d9 100644
--- a/channels.conf
+++ b/channels.conf
@@ -94,7 +94,7 @@ Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
 Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
 :Beta Digital
 CNBC:12148:h:0:27500:255:256:0:3:35
-Liberty TV.com:12610:V:0:22000:941:943:0:0:12199
+Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
 :PW Erotic
 Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:3:21
 Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
diff --git a/config.h b/config.h
index 58d038241..bbf5d6594 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.55 2001/07/27 13:32:53 kls Exp $
+ * $Id: config.h 1.57 2001/08/06 16:44:38 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.85"
+#define VDRVERSION "0.90"
 
 #define MaxBuffer 10000
 
diff --git a/dvbapi.c b/dvbapi.c
index 07b6f61bc..0524f00f2 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,9 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.96 2001/07/29 10:32:50 kls Exp $
+ * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
+ * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
+ *
+ * $Id: dvbapi.c 1.101 2001/08/06 16:24:13 kls Exp $
  */
 
+//#define DVDDEBUG        1
+
 #include "dvbapi.h"
 #include <dirent.h>
 #include <errno.h>
@@ -21,6 +26,13 @@ extern "C" {
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
+
+#ifdef DVDSUPPORT
+extern "C" {
+#include "ac3dec/ac3.h"
+}
+#endif //DVDSUPPORT
+
 #include "config.h"
 #include "recording.h"
 #include "remux.h"
@@ -40,7 +52,8 @@ extern "C" {
 
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE (1024*1024)
+#define VIDEOBUFSIZE    (1024*1024)
+#define AC3_BUFFER_SIZE (6*1024*16)
 
 // The maximum size of a single frame:
 #define MAXFRAMESIZE (192*1024)
@@ -437,7 +450,7 @@ int cFileName::NextFile(void)
 
 // --- cRecordBuffer ---------------------------------------------------------
 
-class cRecordBuffer : public cRingBuffer {
+class cRecordBuffer : public cRingBufferLinear {
 private:
   cDvbApi *dvbApi;
   cFileName fileName;
@@ -460,7 +473,7 @@ class cRecordBuffer : public cRingBuffer {
   };
 
 cRecordBuffer::cRecordBuffer(cDvbApi *DvbApi, const char *FileName, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cRingBuffer(VIDEOBUFSIZE, true)
+:cRingBufferLinear(VIDEOBUFSIZE, true)
 ,fileName(FileName, true)
 ,remux(VPid, APid1, APid2, DPid1, DPid2, true)
 {
@@ -615,70 +628,228 @@ int ReadFrame(int f, uchar *b, int Length, int Max)
   return r;
 }
 
-// --- cReplayBuffer ---------------------------------------------------------
+// --- cPlayBuffer ---------------------------------------------------------
 
-class cReplayBuffer : public cRingBuffer {
-private:
+class cPlayBuffer : public cRingBufferFrame {
+protected:
   cDvbApi *dvbApi;
-  cIndexFile *index;
-  cFileName fileName;
-  int fileOffset;
   int videoDev, audioDev;
   FILE *dolbyDev;
-  int replayFile;
-  bool eof;
   int blockInput, blockOutput;
-  bool paused, fastForward, fastRewind;
-  int lastIndex, stillIndex, playIndex;
+  bool still, paused, fastForward, fastRewind;
+  int readIndex, writeIndex;
+  bool canDoTrickMode;
   bool canToggleAudioTrack;
   uchar audioTrack;
+  virtual void Empty(bool Block = false);
+  virtual void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00) {}
+  virtual void Output(void);
+public:
+  cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev);
+  virtual ~cPlayBuffer();
+  virtual void Pause(void);
+  virtual void Play(void);
+  virtual void Forward(void);
+  virtual void Backward(void);
+  virtual int SkipFrames(int Frames) { return -1; }
+  virtual void SkipSeconds(int Seconds) {}
+  virtual void Goto(int Position, bool Still = false) {}
+  virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { Current = Total = -1; }
+  bool CanToggleAudioTrack(void) { return canToggleAudioTrack; };
+  virtual void ToggleAudioTrack(void);
+  };
+
+cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
+:cRingBufferFrame(VIDEOBUFSIZE)
+{
+  dvbApi = DvbApi;
+  videoDev = VideoDev;
+  audioDev = AudioDev;
+  dolbyDev = NULL;
+  blockInput = blockOutput = false;
+  still = paused = fastForward = fastRewind = false;
+  readIndex = writeIndex = -1;
+  canDoTrickMode = false;
+  canToggleAudioTrack = false;
+  audioTrack = 0xC0;
+  if (cDvbApi::AudioCommand()) {
+     dolbyDev = popen(cDvbApi::AudioCommand(), "w");
+     if (!dolbyDev)
+        esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
+     }
+}
+
+cPlayBuffer::~cPlayBuffer()
+{
+  if (dolbyDev)
+     pclose(dolbyDev);
+}
+
+void cPlayBuffer::Output(void)
+{
+  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+
+  while (Busy()) {
+        if (blockOutput) {
+           if (blockOutput > 1)
+              blockOutput = 1;
+           continue;
+           }
+        const cFrame *frame = Get();
+        if (frame) {
+           StripAudioPackets((uchar *)frame->Data(), frame->Count(), (fastForward || fastRewind) ? 0x00 : audioTrack);//XXX
+           for (int i = 0; i < ((paused && fastRewind) ? 24 : 1); i++) { // show every I_FRAME 24 times in slow rewind mode to achieve roughly the same speed as in slow forward mode
+               const uchar *p = frame->Data();
+               int r = frame->Count();
+               while (r > 0 && Busy() && !blockOutput) {
+                     cFile::FileReadyForWriting(videoDev, 100);
+                     int w = write(videoDev, p, r);
+                     if (w > 0) {
+                        p += w;
+                        r -= w;
+                        }
+                     else if (w < 0 && errno != EAGAIN) {
+                        LOG_ERROR;
+                        Stop();
+                        return;
+                        }
+                     }
+               writeIndex = frame->Index();
+               }
+           Drop(frame);
+           }
+        }
+
+  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
+}
+
+void cPlayBuffer::Empty(bool Block)
+{
+  if (!(blockInput || blockOutput)) {
+     blockInput = blockOutput = 2;
+     EnablePut();
+     EnableGet();
+     time_t t0 = time(NULL);
+     while ((blockInput > 1 || blockOutput > 1) && time(NULL) - t0 < 2)
+           usleep(1);
+     Lock();
+     readIndex = writeIndex;
+     cRingBufferFrame::Clear();
+     CHECK(ioctl(videoDev, VIDEO_CLEAR_BUFFER));
+     CHECK(ioctl(audioDev, AUDIO_CLEAR_BUFFER));
+     }
+  if (!Block) {
+     blockInput = blockOutput = 0;
+     Unlock();
+     }
+}
+
+void cPlayBuffer::Pause(void)
+{
+  paused = !paused;
+  bool empty = fastForward || fastRewind;
+  if (empty)
+     Empty(true);
+  fastForward = fastRewind = false;
+  CHECK(ioctl(videoDev, paused ? VIDEO_FREEZE : VIDEO_CONTINUE));
+  CHECK(ioctl(audioDev, AUDIO_SET_MUTE, paused));
+  still = false;
+  if (empty)
+     Empty(false);
+}
+
+void cPlayBuffer::Play(void)
+{
+  if (fastForward || fastRewind || paused) {
+     bool empty = !paused || fastRewind;
+     if (empty)
+        Empty(true);
+     still = false;
+     CHECK(ioctl(videoDev, paused ? VIDEO_CONTINUE : VIDEO_PLAY));
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, false));
+     if (empty)
+        Empty(false);
+     fastForward = fastRewind = paused = false;
+     }
+}
+
+void cPlayBuffer::Forward(void)
+{
+  if (canDoTrickMode || paused) {
+     bool empty = !paused || fastRewind;
+     if (empty) {
+        Empty(true);
+        if (fastForward)
+           readIndex -= 150; // this about compensates for the buffered data, so that we don't get too far ahead
+        }
+     still = false;
+     fastForward = !fastForward;
+     fastRewind = false;
+     if (paused)
+        CHECK(ioctl(videoDev, fastForward ? VIDEO_SLOWMOTION : VIDEO_FREEZE, 2));
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastForward));
+     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastForward || paused));
+     if (empty)
+        Empty(false);
+     }
+}
+
+void cPlayBuffer::Backward(void)
+{
+  if (canDoTrickMode) {
+     Empty(true);
+     still = false;
+     fastRewind = !fastRewind;
+     fastForward = false;
+     if (paused)
+        CHECK(ioctl(videoDev, fastRewind ? VIDEO_CONTINUE : VIDEO_FREEZE));
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastRewind));
+     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastRewind || paused));
+     Empty(false);
+     }
+}
+
+void cPlayBuffer::ToggleAudioTrack(void)
+{
+  if (CanToggleAudioTrack()) {
+     audioTrack = (audioTrack == 0xC0) ? 0xC1 : 0xC0;
+     Empty();
+     }
+}
+
+// --- cReplayBuffer ---------------------------------------------------------
+
+class cReplayBuffer : public cPlayBuffer {
+private:
+  cIndexFile *index;
+  cFileName fileName;
+  int replayFile;
+  bool eof;
   bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
-  void Clear(bool Block = false);
   void Close(void);
-  void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
+  virtual void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
   void DisplayFrame(uchar *b, int Length);
   int Resume(void);
   bool Save(void);
 protected:
   virtual void Input(void);
-  virtual void Output(void);
 public:
   cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const char *FileName);
   virtual ~cReplayBuffer();
-  void Pause(void);
-  void Play(void);
-  void Forward(void);
-  void Backward(void);
-  int SkipFrames(int Frames);
-  void SkipSeconds(int Seconds);
-  void Goto(int Position, bool Still = false);
-  void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
-  bool CanToggleAudioTrack(void) { return canToggleAudioTrack; }
-  void ToggleAudioTrack(void);
+  virtual int SkipFrames(int Frames);
+  virtual void SkipSeconds(int Seconds);
+  virtual void Goto(int Position, bool Still = false);
+  virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
   };
 
 cReplayBuffer::cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const char *FileName)
-:cRingBuffer(VIDEOBUFSIZE)
+:cPlayBuffer(DvbApi, VideoDev, AudioDev)
 ,fileName(FileName, false)
 {
-  dvbApi = DvbApi;
   index = NULL;
-  fileOffset = 0;
-  videoDev = VideoDev;
-  audioDev = AudioDev;
-  dolbyDev = NULL;
-  if (cDvbApi::AudioCommand()) {
-     dolbyDev = popen(cDvbApi::AudioCommand(), "w");
-     if (!dolbyDev)
-        esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
-     }
   replayFile = fileName.Open();
   eof = false;
-  blockInput = blockOutput = false;
-  paused = fastForward = fastRewind = false;
-  lastIndex = stillIndex = playIndex = -1;
-  canToggleAudioTrack = false;
-  audioTrack = 0xC0;
   if (!fileName.Name())
      return;
   // Create the index file:
@@ -690,6 +861,7 @@ cReplayBuffer::cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const
      delete index;
      index = NULL;
      }
+  canDoTrickMode = index != NULL;
   dvbApi->SetModeReplay();
   Start();
 }
@@ -699,8 +871,6 @@ cReplayBuffer::~cReplayBuffer()
   Stop();
   Save();
   Close();
-  if (dolbyDev)
-     pclose(dolbyDev);
   dvbApi->SetModeNormal(false);
   delete index;
 }
@@ -709,22 +879,23 @@ void cReplayBuffer::Input(void)
 {
   dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
 
-  int ResumeIndex = Resume();
-  if (ResumeIndex >= 0)
-     isyslog(LOG_INFO, "resuming replay at index %d (%s)", ResumeIndex, IndexToHMSF(ResumeIndex, true));
+  readIndex = Resume();
+  if (readIndex >= 0)
+     isyslog(LOG_INFO, "resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
-  int lastIndex = -1;
-  int brakeCounter = 0;
   uchar b[MAXFRAMESIZE];
   while (Busy() && (blockInput || NextFile())) {
-        if (!blockInput && stillIndex < 0) {
+        if (blockInput) {
+           if (blockInput > 1)
+              blockInput = 1;
+           continue;
+           }
+        if (!still) {
            int r = 0;
            if (fastForward && !paused || fastRewind) {
-              int Index = (lastIndex >= 0) ? lastIndex : index->Get(fileName.Number(), fileOffset);
               uchar FileNumber;
               int FileOffset, Length;
-              if (!paused || (brakeCounter++ % 24) == 0) // show every I_FRAME 24 times in rmSlowRewind mode to achieve roughly the same speed as in slow forward mode
-                 Index = index->GetNextIFrame(Index, fastForward, &FileNumber, &FileOffset, &Length);
+              int Index = index->GetNextIFrame(readIndex, fastForward, &FileNumber, &FileOffset, &Length);
               if (Index >= 0) {
                  if (!NextFile(FileNumber, FileOffset))
                     break;
@@ -734,126 +905,85 @@ void cReplayBuffer::Input(void)
                  Play();
                  continue;
                  }
-              lastIndex = Index;
-              playIndex = -1;
+              readIndex = Index;
               r = ReadFrame(replayFile, b, Length, sizeof(b));
-              StripAudioPackets(b, r);
               }
            else if (index) {
-              lastIndex = -1;
-              playIndex = (playIndex >= 0) ? playIndex + 1 : index->Get(fileName.Number(), fileOffset);
               uchar FileNumber;
               int FileOffset, Length;
-              if (!(index->Get(playIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
+              readIndex++;
+              if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
                  break;
               r = ReadFrame(replayFile, b, Length, sizeof(b));
-              StripAudioPackets(b, r, audioTrack);
               }
            else // allows replay even if the index file is missing
               r = read(replayFile, b, sizeof(b));
            if (r > 0) {
-              uchar *p = b;
-              while (r > 0 && Busy() && !blockInput) {
-                    int w = Put(p, r);
-                    p += w;
-                    r -= w;
-                    usleep(1); // this keeps the CPU load low
-                    }
+              cFrame *frame = new cFrame(b, r, readIndex);
+              while (Busy() && !blockInput && !Put(frame))
+                    ;
               }
-           else if (r ==0)
+           else if (r == 0)
               eof = true;
            else if (r < 0 && errno != EAGAIN) {
               LOG_ERROR;
               break;
               }
            }
-        else
+        else//XXX
            usleep(1); // this keeps the CPU load low
-        if (blockInput > 1)
-           blockInput = 1;
         }
 
   dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
 }
 
-void cReplayBuffer::Output(void)
-{
-  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
-
-  uchar b[MINVIDEODATA];
-  while (Busy()) {
-        int r = blockOutput ? 0 : Get(b, sizeof(b));
-        if (r > 0) {
-           uchar *p = b;
-           while (r > 0 && Busy() && !blockOutput) {
-                 cFile::FileReadyForWriting(videoDev, 100);
-                 int w = write(videoDev, p, r);
-                 if (w > 0) {
-                    p += w;
-                    r -= w;
-                    fileOffset += w;
-                    }
-                 else if (w < 0 && errno != EAGAIN) {
-                    LOG_ERROR;
-                    Stop();
-                    return;
-                    }
-                 }
-           }
-        else
-           usleep(1); // this keeps the CPU load low
-        if (blockOutput > 1)
-           blockOutput = 1;
-        }
-
-  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
-}
-
 void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
 {
-  for (int i = 0; i < Length - 6; i++) {
-      if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
-         uchar c = b[i + 3];
-         int l = b[i + 4] * 256 + b[i + 5] + 6;
-         switch (c) {
-           case 0xBD: // dolby
-                if (Except && dolbyDev) {
-                   int written = b[i + 8] + 9; // skips the PES header
-                   int n = l - written;
-                   while (n > 0) {
-                         int w = fwrite(&b[i + written], 1, n, dolbyDev);
-                         if (w < 0) {
-                            LOG_ERROR;
-                            break;
+  if (canDoTrickMode) {
+     for (int i = 0; i < Length - 6; i++) {
+         if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
+            uchar c = b[i + 3];
+            int l = b[i + 4] * 256 + b[i + 5] + 6;
+            switch (c) {
+              case 0xBD: // dolby
+                   if (Except && dolbyDev) {
+                      int written = b[i + 8] + 9; // skips the PES header
+                      int n = l - written;
+                      while (n > 0) {
+                            int w = fwrite(&b[i + written], 1, n, dolbyDev);
+                            if (w < 0) {
+                               LOG_ERROR;
+                               break;
+                               }
+                            n -= w;
+                            written += w;
                             }
-                         n -= w;
-                         written += w;
-                         }
-                   }
-                // continue with deleting the data - otherwise it disturbs DVB replay
-           case 0xC0 ... 0xC1: // audio
-                if (c == 0xC1)
-                   canToggleAudioTrack = true;
-                if (!Except || c != Except) {
-                   int n = l;
-                   for (int j = i; j < Length && n--; j++)
-                       b[j] = 0x00;
-                   }
-                break;
-           case 0xE0 ... 0xEF: // video
-                break;
-           default:
-                //esyslog(LOG_ERR, "ERROR: unexpected packet id %02X", c);
-                l = 0;
-           }
-         if (l)
-            i += l - 1; // the loop increments, too!
+                      }
+                   // continue with deleting the data - otherwise it disturbs DVB replay
+              case 0xC0 ... 0xC1: // audio
+                   if (c == 0xC1)
+                      canToggleAudioTrack = true;
+                   if (!Except || c != Except) {
+                      int n = l;
+                      for (int j = i; j < Length && n--; j++)
+                          b[j] = 0x00;
+                      }
+                   break;
+              case 0xE0 ... 0xEF: // video
+                   break;
+              default:
+                   //esyslog(LOG_ERR, "ERROR: unexpected packet id %02X", c);
+                   l = 0;
+              }
+            if (l)
+               i += l - 1; // the loop increments, too!
+            }
+         /*XXX
+         else
+            esyslog(LOG_ERR, "ERROR: broken packet header");
+            XXX*/
          }
-      /*XXX
-      else
-         esyslog(LOG_ERR, "ERROR: broken packet header");
-         XXX*/
-      }
+     }
 }
 
 void cReplayBuffer::DisplayFrame(uchar *b, int Length)
@@ -865,87 +995,11 @@ void cReplayBuffer::DisplayFrame(uchar *b, int Length)
   CHECK(ioctl(videoDev, VIDEO_STILLPICTURE, &sp));
 }
 
-void cReplayBuffer::Clear(bool Block)
-{
-  if (!(blockInput || blockOutput)) {
-     blockInput = blockOutput = 2;
-     time_t t0 = time(NULL);
-     while ((blockInput > 1 || blockOutput > 1) && time(NULL) - t0 < 2)
-           usleep(1);
-     Lock();
-     cRingBuffer::Clear();
-     playIndex = -1;
-     CHECK(ioctl(videoDev, VIDEO_CLEAR_BUFFER));
-     CHECK(ioctl(audioDev, AUDIO_CLEAR_BUFFER));
-     }
-  if (!Block) {
-     blockInput = blockOutput = 0;
-     Unlock();
-     }
-}
-
-void cReplayBuffer::Pause(void)
-{
-  paused = !paused;
-  CHECK(ioctl(videoDev, paused ? VIDEO_FREEZE : VIDEO_CONTINUE));
-  if (fastForward || fastRewind) {
-     if (paused)
-        Clear();
-     fastForward = fastRewind = false;
-     }
-  CHECK(ioctl(audioDev, AUDIO_SET_MUTE, paused));
-  stillIndex = -1;
-}
-
-void cReplayBuffer::Play(void)
-{
-  if (fastForward || fastRewind || paused) {
-     if (!paused)
-        Clear();
-     stillIndex = -1;
-     CHECK(ioctl(videoDev, paused ? VIDEO_CONTINUE : VIDEO_PLAY));
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, false));
-     fastForward = fastRewind = paused = false;
-     }
-}
-
-void cReplayBuffer::Forward(void)
-{
-  if (index || paused) {
-     if (!paused)
-        Clear(true);
-     stillIndex = -1;
-     fastForward = !fastForward;
-     fastRewind = false;
-     if (paused)
-        CHECK(ioctl(videoDev, fastForward ? VIDEO_SLOWMOTION : VIDEO_FREEZE, 2));
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastForward));
-     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastForward || paused));
-     if (!paused)
-        Clear(false);
-     }
-}
-
-void cReplayBuffer::Backward(void)
-{
-  if (index) {
-     Clear(true);
-     stillIndex = -1;
-     fastRewind = !fastRewind;
-     fastForward = false;
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastRewind));
-     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastRewind || paused));
-     Clear(false);
-     }
-}
-
 void cReplayBuffer::Close(void)
 {
   if (replayFile >= 0) {
      fileName.Close();
      replayFile = -1;
-     fileOffset = 0;
      }
 }
 
@@ -966,7 +1020,7 @@ int cReplayBuffer::Resume(void)
 bool cReplayBuffer::Save(void)
 {
   if (index) {
-     int Index = index->Get(fileName.Number(), fileOffset);
+     int Index = writeIndex;
      if (Index >= 0) {
         Index -= RESUMEBACKUP;
         if (Index > 0)
@@ -995,8 +1049,8 @@ int cReplayBuffer::SkipFrames(int Frames)
 void cReplayBuffer::SkipSeconds(int Seconds)
 {
   if (index && Seconds) {
-     Clear(true);
-     int Index = index->Get(fileName.Number(), fileOffset);
+     Empty(true);
+     int Index = writeIndex;
      if (Index >= 0) {
         if (Seconds < 0) {
            int sec = index->Last() / FRAMESPERSEC;
@@ -1008,10 +1062,9 @@ void cReplayBuffer::SkipSeconds(int Seconds)
            Index = 1; // not '0', to allow GetNextIFrame() below to work!
         uchar FileNumber;
         int FileOffset;
-        if (index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) >= 0)
-           NextFile(FileNumber, FileOffset);
+        readIndex = writeIndex = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) - 1; // Input() will first increment it!
         }
-     Clear(false);
+     Empty(false);
      Play();
      }
 }
@@ -1019,7 +1072,7 @@ void cReplayBuffer::SkipSeconds(int Seconds)
 void cReplayBuffer::Goto(int Index, bool Still)
 {
   if (index) {
-     Clear(true);
+     Empty(true);
      if (paused)
         CHECK(ioctl(videoDev, VIDEO_CONTINUE));
      if (++Index <= 0)
@@ -1028,28 +1081,27 @@ void cReplayBuffer::Goto(int Index, bool Still)
      int FileOffset, Length;
      Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
      if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
-        stillIndex = Index;
-        playIndex = -1;
+        still = true;
         uchar b[MAXFRAMESIZE];
         int r = ReadFrame(replayFile, b, Length, sizeof(b));
         if (r > 0)
            DisplayFrame(b, r);
-        fileOffset += Length;
         paused = true;
         }
      else
-        stillIndex = playIndex = -1;
-     Clear(false);
+        still = false;
+     readIndex = writeIndex = Index;
+     Empty(false);
      }
 }
 
 void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
-     if (stillIndex >= 0)
-        Current = stillIndex;
+     if (still)
+        Current = readIndex;
      else {
-        Current = index->Get(fileName.Number(), fileOffset);
+        Current = writeIndex;
         if (SnapToIFrame) {
            int i1 = index->GetNextIFrame(Current + 1, false);
            int i2 = index->GetNextIFrame(Current, true);
@@ -1064,10 +1116,8 @@ void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 
 bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
 {
-  if (FileNumber > 0) {
-     fileOffset = FileOffset;
+  if (FileNumber > 0)
      replayFile = fileName.SetOffset(FileNumber, FileOffset);
-     }
   else if (replayFile >= 0 && eof) {
      Close();
      replayFile = fileName.NextFile();
@@ -1076,17 +1126,892 @@ bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
   return replayFile >= 0;
 }
 
-void cReplayBuffer::ToggleAudioTrack(void)
+#ifdef DVDSUPPORT
+// --- cDVDplayBuffer --------------------------------------------------------
+
+class cDVDplayBuffer : public cPlayBuffer {
+private:
+  uchar audioTrack;
+
+  cDVD *dvd;//XXX necessary???
+
+  int titleid;
+  int chapid;
+  int angle;
+  dvd_file_t *title;
+  ifo_handle_t *vmg_file;
+  ifo_handle_t *vts_file;
+
+  int doplay;
+  int cyclestate;
+  int prevcycle;
+  int brakeCounter;
+  int skipCnt;
+
+  tt_srpt_t *tt_srpt;
+  vts_ptt_srpt_t *vts_ptt_srpt;
+  pgc_t *cur_pgc;
+  dsi_t dsi_pack;
+  unsigned int next_vobu;
+  unsigned int prev_vobu;
+  unsigned int next_ilvu_start;
+  unsigned int cur_output_size;
+  unsigned int min_output_size;
+  unsigned int pktcnt;
+  int pgc_id;
+  int start_cell;
+  int next_cell;
+  int prev_cell;
+  int cur_cell;
+  unsigned int cur_pack;
+  int ttn;
+  int pgn;
+
+  uchar *data;
+
+  int logAudioTrack;
+  int maxAudioTrack;
+
+  ac3_config_t ac3_config;
+  enum { AC3_STOP, AC3_START, AC3_PLAY } ac3stat;
+  uchar *ac3data;
+  int ac3inp;
+  int ac3outp;
+  int lpcm_count;
+  int is_nav_pack(unsigned char *buffer);
+  void Close(void);
+  virtual void Empty(bool Block = false);
+  int decode_packet(unsigned char *sector, int iframe);
+  int ScanVideoPacket(const uchar *Data, int Count, uchar *PictureType);
+  bool PacketStart(uchar **Data, int len);
+  int GetPacketType(const uchar *Data);
+  int GetStuffingLen(const uchar *Data);
+  int GetPacketLength(const uchar *Data);
+  int GetPESHeaderLength(const uchar *Data);
+  int SendPCM(int size);
+  void playDecodedAC3(void);
+  void handleAC3(unsigned char *sector, int length);
+  void putFrame(unsigned char *sector, int length);
+  unsigned int getAudioStream(unsigned int StreamId);
+  void setChapid(void);
+  void NextState(int State) { prevcycle = cyclestate; cyclestate = State; }
+protected:
+  virtual void Input(void);
+public:
+  cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD *DvD, int title);
+  virtual ~cDVDplayBuffer();
+  virtual int SkipFrames(int Frames);
+  virtual void SkipSeconds(int Seconds);
+  virtual void Goto(int Position, bool Still = false);
+  virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+  virtual void ToggleAudioTrack(void);
+  };
+
+#define cOPENDVD         0
+#define cOPENTITLE       1
+#define cOPENCHAPTER     2
+#define cOUTCELL         3
+#define cREADFRAME       4
+#define cOUTPACK         5
+#define cOUTFRAMES       6
+
+#define aAC3          0x80
+#define aLPCM         0xA0
+
+cDVDplayBuffer::cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD *DvD, int title)
+:cPlayBuffer(DvbApi, VideoDev, AudioDev)
+{
+  dvd = DvD;
+  titleid = title;
+  chapid = 0;
+  angle = 0;
+  cyclestate = cOPENDVD;
+  prevcycle = 0;
+  brakeCounter = 0;
+  skipCnt = 0;
+  logAudioTrack = 0;
+  canToggleAudioTrack = true;//XXX determine from cDVD!
+  ac3_config.num_output_ch = 2;
+  //    ac3_config.flags = /* mm_accel() | */ MM_ACCEL_MLIB;
+  ac3_config.flags = 0;
+  ac3_init(&ac3_config);
+  data = new uchar[1024 * DVD_VIDEO_LB_LEN];
+  ac3data = new uchar[AC3_BUFFER_SIZE];
+  ac3inp = ac3outp = 0;
+  ac3stat = AC3_START;
+  canDoTrickMode = true;
+  dvbApi->SetModeReplay();
+  Start();
+}
+
+cDVDplayBuffer::~cDVDplayBuffer()
 {
-  if (CanToggleAudioTrack()) {
-     audioTrack = (audioTrack == 0xC0) ? 0xC1 : 0xC0;
-     Clear();
+  Stop();
+  Close();
+  dvbApi->SetModeNormal(false);
+  delete ac3data;
+  delete data;
+}
+
+unsigned int cDVDplayBuffer::getAudioStream(unsigned int StreamId)
+{
+  unsigned int trackID;
+
+  if ((cyclestate < cOPENCHAPTER) || (StreamId > 7))
+     return 0;
+  if (!(cur_pgc->audio_control[StreamId] & 0x8000))
+     return 0;
+  int track = (cur_pgc->audio_control[StreamId] >> 8) & 0x07;
+  switch (vts_file->vtsi_mat->vts_audio_attr[track].audio_format) {
+    case 0: // ac3
+            trackID = aAC3;
+            break;
+    case 2: // mpeg1
+    case 3: // mpeg2ext
+    case 4: // lpcm
+    case 6: // dts
+            trackID = aLPCM;
+            break;
+    default: esyslog(LOG_ERR, "ERROR: unknown Audio stream info");
+             return 0;
+    }
+  trackID |= track;
+  return trackID;
+}
+
+void cDVDplayBuffer::ToggleAudioTrack(void)
+{
+  unsigned int newTrack;
+
+  if (CanToggleAudioTrack() && maxAudioTrack != 0) {
+     logAudioTrack = (logAudioTrack + 1) % maxAudioTrack;
+     if ((newTrack = getAudioStream(logAudioTrack)) != 0)
+        audioTrack = newTrack;
+#ifdef DVDDEBUG
+     dsyslog(LOG_INFO, "DVB: Audio Stream ID changed to: %x", audioTrack);
+#endif
+     ac3stat = AC3_START;
+     ac3outp = ac3inp;
+     }
+}
+
+/**
+ * Returns true if the pack is a NAV pack.  This check is clearly insufficient,
+ * and sometimes we incorrectly think that valid other packs are NAV packs.  I
+ * need to make this stronger.
+ */
+inline int cDVDplayBuffer::is_nav_pack(unsigned char *buffer)
+{
+  return buffer[41] == 0xbf && buffer[1027] == 0xbf;
+}
+
+void cDVDplayBuffer::Input(void)
+{
+  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
+
+  doplay = true;
+  while (Busy() && doplay) {
+        if (blockInput) {
+           if (blockInput > 1)
+              blockInput = 1;
+           continue;
+           }
+
+        //BEGIN: ripped from play_title
+
+        /**
+         * Playback by cell in this pgc, starting at the cell for our chapter.
+         */
+
+        //dsyslog(LOG_INFO, "DVD: cyclestate: %d", cyclestate);
+        switch (cyclestate) {
+
+          case cOPENDVD: // open the DVD and get all the basic information
+               {
+                 if (!dvd->isValid()) {
+                    doplay = false;
+                    break;
+                    }
+
+                 /**
+                  * Load the video manager to find out the information about the titles on
+                  * this disc.
+                  */
+                 vmg_file = dvd->openVMG();
+                 if (!vmg_file) {
+                    esyslog(LOG_ERR, "ERROR: can't open VMG info");
+                    doplay = false;
+                    break;
+                    }
+                 tt_srpt = vmg_file->tt_srpt;
+
+                 NextState(cOPENTITLE);
+                 break;
+               }
+
+          case cOPENTITLE: // open the selected title
+               {
+                 /**
+                  * Make sure our title number is valid.
+                  */
+                 isyslog(LOG_INFO, "DVD: there are %d titles on this DVD", tt_srpt->nr_of_srpts);
+                 if (titleid < 0 || titleid >= tt_srpt->nr_of_srpts) {
+                    esyslog(LOG_ERR, "ERROR: invalid title %d", titleid + 1);
+                    doplay = false;
+                    break;
+                    }
+
+                 /**
+                  * Load the VTS information for the title set our title is in.
+                  */
+                 vts_file = dvd->openVTS(tt_srpt->title[titleid].title_set_nr);
+                 if (!vts_file) {
+                    esyslog(LOG_ERR, "ERROR: can't open the title %d info file", tt_srpt->title[titleid].title_set_nr);
+                    doplay = false;
+                    break;
+                    }
+
+                 NextState(cOPENCHAPTER);
+                 break;
+               }
+
+          case cOPENCHAPTER:
+               {
+                 /**
+                  * Make sure the chapter number is valid for this title.
+                  */
+                 isyslog(LOG_INFO, "DVD: there are %d chapters in this title", tt_srpt->title[titleid].nr_of_ptts);
+                 if (chapid < 0 || chapid >= tt_srpt->title[titleid].nr_of_ptts) {
+                    esyslog(LOG_ERR, "ERROR: invalid chapter %d", chapid + 1);
+                    doplay = false;
+                    break;
+                    }
+
+                 /**
+                  * Determine which program chain we want to watch.  This is based on the
+                  * chapter number.
+                  */
+                 ttn = tt_srpt->title[titleid].vts_ttn;
+                 vts_ptt_srpt = vts_file->vts_ptt_srpt;
+                 pgc_id = vts_ptt_srpt->title[ttn - 1].ptt[chapid].pgcn;
+                 pgn = vts_ptt_srpt->title[ttn - 1].ptt[chapid].pgn;
+                 cur_pgc = vts_file->vts_pgcit->pgci_srp[pgc_id - 1].pgc;
+                 start_cell = cur_pgc->program_map[pgn - 1] - 1;
+
+                 /**
+                  * setup Audio information
+                  **/
+                 for (maxAudioTrack = 0; maxAudioTrack < 8; maxAudioTrack++) {
+                     if (!(cur_pgc->audio_control[maxAudioTrack] & 0x8000))
+                        break;
+                     }
+                 canToggleAudioTrack = (maxAudioTrack > 0);
+                 // init the AudioInformation
+                 audioTrack = getAudioStream(logAudioTrack);
+#ifdef DVDDEBUG
+                 dsyslog(LOG_INFO, "DVD: max: %d, track: %x", maxAudioTrack, audioTrack);
+#endif
+
+                 /**
+                  * We've got enough info, time to open the title set data.
+                  */
+                 title = dvd->openTitle(tt_srpt->title[titleid].title_set_nr, DVD_READ_TITLE_VOBS);
+                 if (!title) {
+                    esyslog(LOG_ERR, "ERROR: can't open title VOBS (VTS_%02d_1.VOB).", tt_srpt->title[titleid].title_set_nr);
+                    doplay = false;
+                    break;
+                    }
+
+                 /**
+                  * Playback by cell in this pgc, starting at the cell for our chapter.
+                  */
+                 next_cell = start_cell;
+                 prev_cell = start_cell;
+                 cur_cell  = start_cell;
+
+                 NextState(cOUTCELL);
+                 break;
+               }
+
+          case cOUTCELL:
+               {
+#ifdef DVDDEBUG
+                 dsyslog(LOG_INFO, "DVD: new cell: %d", cur_cell);
+                 dsyslog(LOG_INFO, "DVD: vob_id: %x, cell_nr: %x", cur_pgc->cell_position[cur_cell].vob_id_nr, cur_pgc->cell_position[cur_cell].cell_nr);
+#endif
+
+                 if (cur_cell < 0) {
+                    cur_cell = 0;
+                    Backward();
+                    }
+                 doplay = (cur_cell < cur_pgc->nr_of_cells);
+                 if (!doplay)
+                    break;
+
+                 /* Check if we're entering an angle block. */
+                 if (cur_pgc->cell_playback[cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK) {
+                    cur_cell += angle;
+                    for (int i = 0; ; ++i) {
+                        if (cur_pgc->cell_playback[cur_cell + i].block_mode == BLOCK_MODE_LAST_CELL) {
+                           next_cell = cur_cell + i + 1;
+                           break;
+                           }
+                        }
+                    }
+                 else {
+                    next_cell = cur_cell + 1;
+                    prev_cell = cur_cell - 1;
+                    }
+
+                 // init settings for next state
+                 if (!fastRewind)
+                    cur_pack = cur_pgc->cell_playback[cur_cell].first_sector;
+                 else
+                    cur_pack = cur_pgc->cell_playback[cur_cell].last_vobu_start_sector;
+
+                 NextState(cOUTPACK);
+                 break;
+               }
+
+          case cOUTPACK:
+               {
+#ifdef DVDDEBUG
+                 dsyslog(LOG_INFO, "DVD: new pack: %d", cur_pack);
+#endif
+                 /**
+                  * We loop until we're out of this cell.
+                  */
+
+                 if (!fastRewind) {
+                    if (cur_pack >= cur_pgc->cell_playback[cur_cell].last_sector) {
+                       cur_cell = next_cell;
+#ifdef DVDDEBUG
+                       dsyslog(LOG_INFO, "DVD: end of pack");
+#endif
+                       NextState(cOUTCELL);
+                       break;
+                       }
+                    }
+                 else {
+#ifdef DVDDEBUG
+                    dsyslog(LOG_INFO, "DVD: prev: %d, curr: %x, next: %x, prev: %x", prevcycle, cur_pack, next_vobu, prev_vobu);
+#endif
+                    if ((cur_pack & 0x80000000) != 0) {
+                       cur_cell = prev_cell;
+#ifdef DVDDEBUG
+                       dsyslog(LOG_INFO, "DVD: start of pack");
+#endif
+                       NextState(cOUTCELL);
+                       break;
+                       }
+                    }
+
+                 /**
+                  * Read NAV packet.
+                  */
+                 int len = DVDReadBlocks(title, cur_pack, 1, data);
+                 if (len == 0) {
+                    esyslog(LOG_ERR, "ERROR: read failed for block %d", cur_pack);
+                    doplay = false;
+                    break;
+                    }
+                 if (!is_nav_pack(data)) {
+                    esyslog(LOG_ERR, "ERROR: no nav_pack");
+                    return;
+                    }
+
+                 /**
+                  * Parse the contained dsi packet.
+                  */
+                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]), sizeof(dsi_t));
+                 if (cur_pack != dsi_pack.dsi_gi.nv_pck_lbn) {
+                    esyslog(LOG_ERR, "ERROR: cur_pack != dsi_pack.dsi_gi.nv_pck_lbn");
+                    return;
+                    }
+                 // navPrint_DSI(&dsi_pack);
+
+                 /**
+                  * Determine where we go next.  These values are the ones we mostly
+                  * care about.
+                  */
+                 next_ilvu_start = cur_pack + dsi_pack.sml_agli.data[angle].address;
+                 cur_output_size = dsi_pack.dsi_gi.vobu_ea;
+                 min_output_size = dsi_pack.dsi_gi.vobu_1stref_ea;
+
+                 /**
+                  * If we're not at the end of this cell, we can determine the next
+                  * VOBU to display using the VOBU_SRI information section of the
+                  * DSI.  Using this value correctly follows the current angle,
+                  * avoiding the doubled scenes in The Matrix, and makes our life
+                  * really happy.
+                  *
+                  * Otherwise, we set our next address past the end of this cell to
+                  * force the code above to go to the next cell in the program.
+                  */
+                 if (dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL)
+                    next_vobu = cur_pack + (dsi_pack.vobu_sri.next_vobu & 0x7fffffff);
+                 else
+                    next_vobu = cur_pack + cur_output_size + 1;
+
+                 if (dsi_pack.vobu_sri.prev_vobu != SRI_END_OF_CELL)
+                    prev_vobu = cur_pack - (dsi_pack.vobu_sri.prev_vobu & 0x7fffffff);
+                 else {
+#ifdef DVDDEBUG
+                    dsyslog(LOG_INFO, "DVD: cur: %x, prev: %x", cur_pack, dsi_pack.vobu_sri.prev_vobu);
+#endif
+                    prev_vobu =  0x80000000;
+                    }
+
+#ifdef DVDDEBUG
+                 dsyslog(LOG_INFO, "DVD: curr: %x, next: %x, prev: %x", cur_pack, next_vobu, prev_vobu);
+#endif
+                 if (cur_output_size >= 1024) {
+                    esyslog(LOG_ERR, "ERROR: cur_output_size >= 1024");
+                    return;
+                    }
+                 cur_pack++;
+
+                 NextState(cREADFRAME);
+                 break;
+               }
+
+          case cREADFRAME:
+               {
+                 int trickMode = (fastForward && !paused || fastRewind);
+
+                 /* FIXME:
+                  *   the entire trickMode code relies on the assumtion
+                  *   that there is only one I-FRAME per PACK
+                  *
+                  *   I have no clue wether that is correct or not !!!
+                  */
+                 if (trickMode && (skipCnt++ % 4 != 0)) {
+                    cur_pack = (!fastRewind) ? next_vobu : prev_vobu;
+                    NextState(cOUTPACK);
+                    break;
+                    }
+
+                 if (trickMode)
+                    cur_output_size = min_output_size;
+
+                 /**
+                  * Read in cursize packs.
+                  */
+#ifdef DVDDEBUG
+                 dsyslog(LOG_INFO, "DVD: read pack: %d", cur_pack);
+#endif
+                 int len = DVDReadBlocks(title, cur_pack, cur_output_size, data);
+                 if (len != (int)cur_output_size * DVD_VIDEO_LB_LEN) {
+                    esyslog(LOG_ERR, "ERROR: read failed for %d blocks at %d", cur_output_size, cur_pack);
+                    doplay = false;
+                    break;
+                    }
+                 pktcnt = 0;
+                 NextState(cOUTFRAMES);
+                 break;
+               }
+
+          case cOUTFRAMES:
+               {
+                 int trickMode = (fastForward && !paused || fastRewind);
+
+                 /**
+                  * Output cursize packs.
+                  */
+                 if (pktcnt >= cur_output_size) {
+                    cur_pack = next_vobu;
+                    NextState(cOUTPACK);
+                    break;
+                    }
+                 //dsyslog(LOG_INFO, "DVD: pack: %d, frame: %d", cur_pack, pktcnt);
+
+                 if (decode_packet(&data[pktcnt * DVD_VIDEO_LB_LEN], trickMode) != 1) {   //we've got a video packet
+                    if (trickMode) {
+                        //dsyslog(LOG_INFO, "DVD: did pack: %d", pktcnt);
+                        cur_pack = (!fastRewind) ? next_vobu : prev_vobu;
+                        NextState(cOUTPACK);
+                        break;
+                        }
+                    }
+
+                 pktcnt++;
+
+                 if (pktcnt >= cur_output_size) {
+                    cur_pack = next_vobu;
+                    NextState(cOUTPACK);
+                    break;
+                    }
+                 break;
+               }
+
+        default:
+               {
+                 esyslog(LOG_ERR, "ERROR: cyclestate %d not known", cyclestate);
+                 return;
+               }
+        }
+
+        // dsyslog(LOG_INF, "DVD: new cyclestate: %d, pktcnt: %d, cur: %d", cyclestate, pktcnt, cur_output_size);
+        }
+
+  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
+}
+
+#define NO_PICTURE 0
+#define SC_PICTURE 0x00
+
+inline bool cDVDplayBuffer::PacketStart(uchar **Data, int len)
+{
+  while (len > 6 && !((*Data)[0] == 0x00 && (*Data)[1] == 0x00 && (*Data)[2] == 0x01))
+        (*Data)++;
+  return ((*Data)[0] == 0x00 && (*Data)[1] == 0x00 && (*Data)[2] == 0x01);
+}
+
+inline int cDVDplayBuffer::GetPacketType(const uchar *Data)
+{
+  return Data[3];
+}
+
+inline int cDVDplayBuffer::GetStuffingLen(const uchar *Data)
+{
+  return Data[13] & 0x07;
+}
+
+inline int cDVDplayBuffer::GetPacketLength(const uchar *Data)
+{
+  return (Data[4] << 8) + Data[5] + 6;
+}
+
+inline int cDVDplayBuffer::GetPESHeaderLength(const uchar *Data)
+{
+  return (Data[8]);
+}
+
+int cDVDplayBuffer::ScanVideoPacket(const uchar *Data, int Count, uchar *PictureType)
+{
+  // Scans the video packet starting at Offset and returns its length.
+  // If the return value is -1 the packet was not completely in the buffer.
+
+  int Length = GetPacketLength(Data);
+  if (Length > 0 && Length <= Count) {
+     int i = 8; // the minimum length of the video packet header
+     i += Data[i] + 1;   // possible additional header bytes
+     for (; i < Length; i++) {
+         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
+            switch (Data[i + 3]) {
+              case SC_PICTURE: *PictureType = (uchar)(Data[i + 5] >> 3) & 0x07;
+                               return Length;
+              }
+            }
+         }
+     PictureType = NO_PICTURE;
+     return Length;
+     }
+  return -1;
+}
+
+#define SYSTEM_HEADER    0xBB
+#define PROG_STREAM_MAP  0xBC
+#ifndef PRIVATE_STREAM1
+#define PRIVATE_STREAM1  0xBD
+#endif
+#define PADDING_STREAM   0xBE
+#ifndef PRIVATE_STREAM2
+#define PRIVATE_STREAM2  0xBF
+#endif
+#define AUDIO_STREAM_S   0xC0
+#define AUDIO_STREAM_E   0xDF
+#define VIDEO_STREAM_S   0xE0
+#define VIDEO_STREAM_E   0xEF
+#define ECM_STREAM       0xF0
+#define EMM_STREAM       0xF1
+#define DSM_CC_STREAM    0xF2
+#define ISO13522_STREAM  0xF3
+#define PROG_STREAM_DIR  0xFF
+
+// data=PCM samples, 16 bit, LSB first, 48kHz, stereo
+int cDVDplayBuffer::SendPCM(int size)
+{
+
+#define MAXSIZE 2032
+
+  uchar buffer[MAXSIZE + 16];
+  int length = 0;
+  int p_size;
+
+  if (ac3inp == ac3outp)
+     return 1;
+
+  while (size > 0) {
+        if (size >= MAXSIZE)
+           p_size = MAXSIZE;
+        else
+           p_size = size;
+        length = 10;
+
+        while (p_size) {
+             if (ac3outp != ac3inp) { // data in the buffer
+                buffer[(length + 6) ^ 1] = ac3data[ac3outp]; // swab because ac3dec delivers wrong byteorder
+                                                             // XXX there is no 'swab' here??? (kls)
+                p_size--;
+                length++;
+                ac3outp = (ac3outp + 1) % AC3_BUFFER_SIZE;
+                }
+             else
+                break;
+             }
+
+        buffer[0] = 0x00;
+        buffer[1] = 0x00;
+        buffer[2] = 0x01;
+        buffer[3] = PRIVATE_STREAM1;
+
+        buffer[4] = (length >> 8) & 0xff;
+        buffer[5] = length & 0xff;
+
+        buffer[6] = 0x80;
+        buffer[7] = 0x00;
+        buffer[8] = 0x00;
+
+        buffer[9]  = aLPCM; // substream ID
+        buffer[10] = 0x00;  // other stuff (see DVD specs), ignored by driver
+        buffer[11] = 0x00;
+        buffer[12] = 0x00;
+        buffer[13] = 0x00;
+        buffer[14] = 0x00;
+        buffer[15] = 0x00;
+
+        length += 6;
+
+        putFrame(buffer, length);
+        size -= MAXSIZE;
+        }
+  return 0;
+}
+
+void cDVDplayBuffer::playDecodedAC3(void)
+{
+  int ac3_datasize = (AC3_BUFFER_SIZE + ac3inp - ac3outp) % AC3_BUFFER_SIZE;
+
+  if (ac3_datasize) {
+     if (ac3_datasize > 1024 * 48)
+        SendPCM(3096);
+     else if (ac3_datasize > 1024 * 32)
+        SendPCM(1536);
+     else if (ac3_datasize > 1024 * 16 && !(lpcm_count % 2))
+        SendPCM(1536);
+     else if (ac3_datasize && !(lpcm_count % 4))
+        SendPCM(1536);
+     lpcm_count++;
+     }
+  else
+     lpcm_count=0;
+}
+
+void cDVDplayBuffer::handleAC3(unsigned char *sector, int length)
+{
+  if (dolbyDev) {
+     while (length > 0) {
+           int w = fwrite(sector, 1, length , dolbyDev);
+           if (w < 0) {
+              LOG_ERROR;
+              break;
+              }
+           length -= w;
+           sector += w;
+           }
+     }
+  else {
+     if (ac3stat == AC3_PLAY)
+        ac3_decode_data(sector, sector+length, 0, &ac3inp, &ac3outp, (char *)ac3data);
+     else if (ac3stat == AC3_START) {
+        ac3_decode_data(sector, sector+length, 1, &ac3inp, &ac3outp, (char *)ac3data);
+        ac3stat = AC3_PLAY;
+        }
      }
+  //playDecodedAC3();
 }
 
+void cDVDplayBuffer::putFrame(unsigned char *sector, int length)
+{
+  cFrame *frame = new cFrame(sector, length);
+  while (Busy() && !blockInput && !Put(frame))
+        ;
+}
+
+int cDVDplayBuffer::decode_packet(unsigned char *sector, int trickMode)
+{
+  uchar pt = 1;
+#if 0
+  uchar *osect = sector;
+#endif
+
+  //make sure we got a PS packet header
+  if (!PacketStart(&sector, DVD_VIDEO_LB_LEN) && GetPacketType(sector) != 0xBA) {
+     esyslog(LOG_ERR, "ERROR: got unexpected packet: %x %x %x %x", sector[0], sector[1], sector[2], sector[3]);
+     return -1;
+     }
+
+  int offset = 14 + GetStuffingLen(sector);
+  sector += offset;
+  int r = DVD_VIDEO_LB_LEN - offset;
+  int datalen = r;
+
+  sector[6] &= 0x8f;
+  uchar *data = sector;
+
+  switch (GetPacketType(sector)) {
+    case VIDEO_STREAM_S ... VIDEO_STREAM_E:
+         {
+           ScanVideoPacket(sector, r, &pt);
+           if (trickMode && pt != 1)
+              return pt;
+           break;
+         }
+    case AUDIO_STREAM_S ... AUDIO_STREAM_E: {
+         // no sound in trick mode
+         if (trickMode)
+            return 1;
+         if (audioTrack != GetPacketType(sector))
+            return 5;
+         break;
+         }
+    case PRIVATE_STREAM1:
+         {
+           datalen = GetPacketLength(sector);
+           //skip optional Header bytes
+           datalen -= GetPESHeaderLength(sector);
+           data += GetPESHeaderLength(sector);
+           //skip mandatory header bytes
+           data += 3;
+           //fallthrough is intended
+         }
+    case PRIVATE_STREAM2:
+         {
+           //FIXME: Stream1 + Stream2 is ok, but is Stream2 alone also?
+
+           // no sound in trick mode
+           if (trickMode)
+              return 1;
+
+           // skip PS header bytes
+           data += 6;
+           // data now points to the beginning of the payload
+
+           if (audioTrack == *data) {
+              switch (audioTrack & 0xF8) {
+                case aAC3:
+                     data += 4;
+                     // correct a3 data lenght - FIXME: why 13 ???
+                     datalen -= 13;
+                     handleAC3(data, datalen);
+                     break;
+                case aLPCM:
+                     // write(audio, sector+14 , sector[19]+(sector[18]<<8)+6);
+                     putFrame(sector, GetPacketLength(sector));
+                     break;
+                default:
+                     break;
+                }
+              }
+           return pt;
+         }
+    default:
+    case SYSTEM_HEADER:
+    case PROG_STREAM_MAP:
+         {
+           esyslog(LOG_ERR, "ERROR: don't know what to do - packetType: %x", GetPacketType(sector));
+           // just skip them for now,l but try to debug it
+           dsyslog(LOG_INFO, "DVD: curr cell: %8x, Nr of cells: %8x", cur_cell, cur_pgc->nr_of_cells);
+           dsyslog(LOG_INFO, "DVD: curr pack: %8x, last sector: %8x", cur_pack, cur_pgc->cell_playback[cur_cell].last_sector);
+           dsyslog(LOG_INFO, "DVD: curr pkt:  %8x, output size: %8x", pktcnt, cur_output_size);
+#if 0
+           // looks like my DVD is/was brocken .......
+           for (int n = 0; n <= 255; n++) {
+               dsyslog(LOG_INFO, "%4x   %2x %2x %2x %2x  %2x %2x %2x %2x", n * 8,
+                        osect[n * 8 + 0], osect[n * 8 + 1], osect[n * 8 + 2], osect[n * 8 + 3],
+                        osect[n * 8 + 4], osect[n * 8 + 5], osect[n * 8 + 6], osect[n * 8 + 7]);
+               }
+           return 0;
+#endif
+           return pt;
+         }
+    }
+  putFrame(sector, r);
+  if ((audioTrack & 0xF8) == aAC3)
+     playDecodedAC3();
+  return pt;
+}
+
+void cDVDplayBuffer::Empty(bool Block)
+{
+  if (!(blockInput || blockOutput)) {
+     cPlayBuffer::Empty(true);
+     ac3stat = AC3_START;
+     ac3outp = ac3inp;
+     }
+  if (!Block)
+     cPlayBuffer::Empty(false);
+}
+
+void cDVDplayBuffer::Close(void)
+{
+  dvd->Close();
+}
+
+int cDVDplayBuffer::SkipFrames(int Frames)
+{
+  return -1;
+}
+
+/* Figure out the correct pgN from the cell and update state. */
+void cDVDplayBuffer::setChapid(void)
+{
+  int new_pgN = 0;
+
+  while (new_pgN < cur_pgc->nr_of_programs && cur_cell >= cur_pgc->program_map[new_pgN])
+        new_pgN++;
+
+  if (new_pgN == cur_pgc->nr_of_programs) { /* We are at the last program */
+     if (cur_cell > cur_pgc->nr_of_cells)
+        chapid = 1; /* We are past the last cell */
+     }
+
+  chapid = new_pgN;
+}
+
+void cDVDplayBuffer::SkipSeconds(int Seconds)
+{
+  if (Seconds) {
+     setChapid();
+     int newchapid = Seconds > 0 ? chapid + 1 : chapid - 1;
+
+     if (newchapid >= 0 && newchapid < tt_srpt->title[titleid].nr_of_ptts) {
+        Empty(true);
+        chapid = newchapid;
+        NextState(cOPENCHAPTER);
+        if (ac3stat != AC3_STOP)
+           ac3stat = AC3_START;
+        ac3outp = ac3inp;
+        Empty(false);
+        Play();
+        }
+     }
+}
+
+void cDVDplayBuffer::Goto(int Index, bool Still)
+{
+}
+
+void cDVDplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
+{
+  Current = Total = -1;
+}
+#endif //DVDSUPPORT
+
 // --- cTransferBuffer -------------------------------------------------------
 
-class cTransferBuffer : public cRingBuffer {
+class cTransferBuffer : public cRingBufferLinear {
 private:
   cDvbApi *dvbApi;
   int fromDevice, toDevice;
@@ -1102,7 +2027,7 @@ class cTransferBuffer : public cRingBuffer {
   };
 
 cTransferBuffer::cTransferBuffer(cDvbApi *DvbApi, int ToDevice, int VPid, int APid)
-:cRingBuffer(VIDEOBUFSIZE, true)
+:cRingBufferLinear(VIDEOBUFSIZE, true)
 ,remux(VPid, APid, 0, 0, 0)
 {
   dvbApi = DvbApi;
@@ -2212,7 +3137,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
               esyslog(LOG_ERR, "ERROR %d in qpsk get event", res);
            }
         else
-           esyslog(LOG_ERR, "ERROR: timeout while tuning\n");
+           esyslog(LOG_ERR, "ERROR: timeout while tuning");
         }
      else if (fd_qamfe >= 0) { // DVB-C
 
@@ -2239,7 +3164,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
               esyslog(LOG_ERR, "ERROR %d in qam get event", res);
            }
         else
-           esyslog(LOG_ERR, "ERROR: timeout while tuning\n");
+           esyslog(LOG_ERR, "ERROR: timeout while tuning");
         }
      else {
         esyslog(LOG_ERR, "ERROR: attempt to set channel without DVB-S or DVB-C device");
@@ -2411,6 +3336,36 @@ bool cDvbApi::StartReplay(const char *FileName)
   return false;
 }
 
+#ifdef DVDSUPPORT
+bool cDvbApi::StartDVDplay(cDVD *dvd, int TitleID)
+{
+  if (Recording()) {
+     esyslog(LOG_ERR, "ERROR: StartDVDplay() called while recording - ignored!");
+     return false;
+     }
+  StopTransfer();
+  StopReplay();
+  if (fd_video >= 0 && fd_audio >= 0) {
+
+     // Check DeviceName:
+
+     if (!dvd) {
+        esyslog(LOG_ERR, "ERROR: StartDVDplay: DVD device is (null)");
+        return false;
+        }
+
+     // Create replay buffer:
+
+     replayBuffer = new cDVDplayBuffer(this, fd_video, fd_audio, dvd, TitleID);
+     if (replayBuffer)
+        return true;
+     else
+        esyslog(LOG_ERR, "ERROR: can't allocate replaying buffer");
+     }
+  return false;
+}
+#endif //DVDSUPPORT
+
 void cDvbApi::StopReplay(void)
 {
   if (replayBuffer) {
diff --git a/dvbapi.h b/dvbapi.h
index 2203d799e..41193ae74 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.42 2001/07/27 11:40:38 kls Exp $
+ * $Id: dvbapi.h 1.44 2001/08/05 15:57:45 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -26,7 +26,11 @@
 #include <ost/audio.h>
 #include <ost/osd.h>
 #include <stdio.h>
+
 #include "dvbosd.h"
+#ifdef DVDSUPPORT
+#include "dvd.h"
+#endif //DVDSUPPORT
 #include "eit.h"
 #include "thread.h"
 
@@ -44,7 +48,11 @@ int HMSFToIndex(const char *HMSF);
 class cChannel;
 
 class cRecordBuffer;
+class cPlayBuffer;
 class cReplayBuffer;
+#ifdef DVDSUPPORT
+class cDVDplayBuffer;
+#endif //DVDSUPPORT
 class cTransferBuffer;
 class cCuttingBuffer;
 
@@ -60,6 +68,9 @@ class cVideoCutter {
 class cDvbApi {
   friend class cRecordBuffer;
   friend class cReplayBuffer;
+#ifdef DVDSUPPORT
+  friend class cDVDplayBuffer;
+#endif //DVDSUPPORT
   friend class cTransferBuffer;
 private:
   int videoDev;
@@ -202,7 +213,7 @@ class cDvbApi {
 
 private:
   cRecordBuffer *recordBuffer;
-  cReplayBuffer *replayBuffer;
+  cPlayBuffer *replayBuffer;
   int ca;
   int priority;
   int  Ca(void) { return ca; }
@@ -238,6 +249,10 @@ class cDvbApi {
        // Starts replaying the given file.
        // If there is already a replay session active, it will be stopped
        // and the new file will be played back.
+#ifdef DVDSUPPORT
+  bool StartDVDplay(cDVD *dvd, int TitleID);//XXX dvd parameter necessary???
+       // Starts replaying the given TitleID on the DVD.
+#endif //DVDSUPPORT
   void StopReplay(void);
        // Stops the current replay session (if any).
   void Pause(void);
diff --git a/dvd.c b/dvd.c
new file mode 100644
index 000000000..841e998b0
--- /dev/null
+++ b/dvd.c
@@ -0,0 +1,148 @@
+/*
+ * dvd.c: Functions for handling DVDs
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Initially written by Andreas Schultz <aschultz@warp10.net>
+ *
+ * $Id: dvd.c 1.3 2001/08/06 16:07:44 kls Exp $
+ */
+
+#ifdef DVDSUPPORT
+
+//#define DVDSUPPORTDEBUG 1
+//#define DEBUG_BUFFER    1
+
+#include <fcntl.h>
+#include <linux/cdrom.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include "dvd.h"
+
+// --- cDVD ----------------------------------------------------------------------------
+
+const char *cDVD::deviceName = "/dev/dvd";
+cDVD *cDVD::dvdInstance = NULL;
+
+cDVD *cDVD::getDVD(void)
+{
+  if (!dvdInstance)
+     new cDVD;
+  return dvdInstance;
+}
+
+cDVD::cDVD(void)
+{
+  dvd = NULL;
+  title = NULL;
+  vmg_file = NULL;
+  vts_file = NULL;
+  dvdInstance = this;
+}
+
+cDVD::~cDVD()
+{
+  Close();
+}
+
+int cDVD::Command(int Cmd)
+{
+  int result = -1;
+  int f;
+  if ((f = open(deviceName, O_RDONLY | O_NONBLOCK)) > 0) {
+     result = ioctl(f, Cmd, 0);
+     close(f);
+     }
+  return result;
+}
+
+void cDVD::SetDeviceName(const char *DeviceName)
+{
+  deviceName = strdup(DeviceName);
+}
+
+const char *cDVD::DeviceName(void)
+{
+  return deviceName;
+}
+
+bool cDVD::DriveExists(void)
+{
+  return access(deviceName, F_OK) == 0;
+}
+
+bool cDVD::DiscOk(void)
+{
+  return Command(CDROM_DRIVE_STATUS) == CDS_DISC_OK;
+}
+
+void cDVD::Eject(void)
+{
+  if (dvdInstance)
+     dvdInstance->Close();
+  Command(CDROMEJECT);
+}
+
+void cDVD::Open(void)
+{
+  if (!dvd)
+     dvd = DVDOpen(deviceName);
+}
+
+void cDVD::Close(void)
+{
+#ifdef DVDSUPPORTDEBUG
+  dsyslog(LOG_INFO, "DVD: cDVD::Close(%p): vts: %p, vmg: %p, title: %p, dvd: %p", this, vts_file, vmg_file, title, dvd);
+#endif
+  if (vts_file)
+     ifoClose(vts_file);
+  if (vmg_file)
+     ifoClose(vmg_file);
+  if (title)
+     DVDCloseFile(title);
+  if (dvd)
+     DVDClose(dvd);
+  vts_file = NULL;
+  vmg_file = NULL;
+  title = NULL;
+  dvd = NULL;
+}
+
+ifo_handle_t *cDVD::openVMG(void)
+{
+  if (!isValid())
+     return NULL;
+  if (!vmg_file)
+     vmg_file = ifoOpen(dvd, 0);
+  return vmg_file;
+}
+
+ifo_handle_t *cDVD::openVTS(int TitleSet)
+{
+  if (!isValid())
+     return NULL;
+  if (vts_file && (titleset != TitleSet)) {
+     ifoClose(vts_file);
+     vts_file = NULL;
+     }
+  if (!vts_file) {
+     titleset = TitleSet;
+     vts_file = ifoOpen(dvd, TitleSet);
+     }
+  return vts_file;
+}
+
+dvd_file_t *cDVD::openTitle(int Title, dvd_read_domain_t domain)
+{
+  if (!isValid())
+     return NULL;
+  if (title)
+     DVDCloseFile(title);
+  title = DVDOpenFile(dvd, Title, domain);
+  return title;
+}
+
+#endif //DVDSUPPORT
diff --git a/dvd.h b/dvd.h
new file mode 100644
index 000000000..68fc1d38f
--- /dev/null
+++ b/dvd.h
@@ -0,0 +1,53 @@
+/*
+ * dvd.h: Functions for handling DVDs
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Initially written by Andreas Schultz <aschultz@warp10.net>
+ *
+ * $Id: dvd.h 1.3 2001/08/05 16:00:57 kls Exp $
+ */
+
+#ifndef __DVD_H
+#define __DVD_H
+
+#ifdef DVDSUPPORT
+
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/dvd_udf.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_print.h>
+
+class cDVD {
+private:
+  static cDVD *dvdInstance;
+  static const char *deviceName;
+  dvd_reader_t *dvd;
+  dvd_file_t *title;
+  ifo_handle_t *vmg_file;
+  ifo_handle_t *vts_file;
+  int titleset;
+  static int Command(int Cmd);
+public:
+  cDVD(void);
+  ~cDVD();
+  static void SetDeviceName(const char *DeviceName);
+  static const char *DeviceName(void);
+  static bool DriveExists(void);
+  static bool DiscOk(void);
+  static void Eject(void);
+  void Open(void);
+  void Close(void);
+  bool isValid(void) { return (dvd != NULL); }
+  ifo_handle_t *openVMG(void);
+  ifo_handle_t *openVTS(int TitleSet);
+  dvd_file_t *openTitle(int Title, dvd_read_domain_t domain);
+  static cDVD *getDVD(void);
+  };
+
+#endif //DVDSUPPORT
+
+#endif //__DVD_H
diff --git a/i18n.c b/i18n.c
index 571eea92d..ebc366d9d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.26 2001/07/27 13:32:43 kls Exp $
+ * $Id: i18n.c 1.27 2001/08/02 14:40:16 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -113,6 +113,15 @@ const tPhrase Phrases[] = {
     "Enregistrements",
     "Opptak",
   },
+  { "DVD",
+    "DVD",
+    "DVD",
+    "DVD",
+    "DVD",
+    "DVD",
+    "DVD",
+    "DVD",
+  },
   { "Setup",
     "Einstellungen",
     "Nastavitve",
@@ -194,7 +203,7 @@ const tPhrase Phrases[] = {
     "Prochains programmes",
     "Hvilket program er neste?",
   },
-  // Button texts (must not be more than 10 characters!):
+  // Button texts (should not be more than 10 characters!):
   { "Edit",
     "Editieren",
     "Uredi",
@@ -321,6 +330,15 @@ const tPhrase Phrases[] = {
     "Langue",
     "Spr�k",
   },
+  { "Eject DVD",
+    "DVD auswerfen",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Confirmations:
   { "Delete channel?",
     "Kanal l�schen?",
diff --git a/menu.c b/menu.c
index 30532a7d6..e25b23041 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.88 2001/07/28 16:17:28 kls Exp $
+ * $Id: menu.c 1.95 2001/08/05 16:09:41 kls Exp $
  */
 
 #include "menu.h"
@@ -590,7 +590,7 @@ cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
   index = Index;
   channel = Channel;
   if (channel->groupSep)
-     SetColor(clrWhite, clrCyan);
+     SetColor(clrCyan, clrBackground);
   Set();
 }
 
@@ -600,7 +600,7 @@ void cMenuChannelItem::Set(void)
   if (!channel->groupSep)
      asprintf(&buffer, "%d\t%s", channel->number, channel->name );
   else
-     asprintf(&buffer, "\t%s", channel->name);
+     asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->name);
   SetText(buffer, false);
 }
 
@@ -1590,6 +1590,80 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
   return state;
 }
 
+#ifdef DVDSUPPORT
+// --- cMenuDVDItem ----------------------------------------------------------
+
+class cMenuDVDItem : public cOsdItem {
+  private:
+  int title;
+  int chapters;
+  virtual void Set(void);
+public:
+  cMenuDVDItem(int Title, int Chapters);
+  int Title(void) { return title; }
+  };
+
+cMenuDVDItem::cMenuDVDItem(int Title, int Chapters)
+{
+  title = Title;
+  chapters = Chapters;
+  Set();
+}
+
+void cMenuDVDItem::Set(void)
+{
+  char *buffer = NULL;
+  asprintf(&buffer, " %2d.\tTitle - \t%2d\tChapters", title + 1, chapters);
+  SetText(buffer, false);
+}
+
+// --- cMenuDVD --------------------------------------------------------------
+
+cMenuDVD::cMenuDVD(void)
+:cOsdMenu(tr("DVD"), 5, 8, 3)
+{
+  if ((dvd = cDVD::getDVD())) {
+     dvd->Open();
+     ifo_handle_t *vmg = dvd->openVMG();
+     if (vmg) {
+        dsyslog(LOG_INFO, "DVD: vmg: %p", vmg);//XXX
+        tt_srpt_t *tt_srpt = vmg->tt_srpt;
+        dsyslog(LOG_INFO, "DVD: tt_srpt: %p", tt_srpt);//XXX
+        for (int i = 0; i < tt_srpt->nr_of_srpts; i++)
+            Add(new cMenuDVDItem(i, tt_srpt->title[i].nr_of_ptts));
+        }
+     }
+  SetHelp(tr("Play"), NULL, NULL, NULL);
+  Display();
+}
+
+eOSState cMenuDVD::Play(void)
+{
+  cMenuDVDItem *ri = (cMenuDVDItem *)Get(Current());
+  if (ri) {
+     cReplayControl::SetDVD(dvd, ri->Title());
+     isyslog(LOG_INFO, "DVD: playing title %d", ri->Title());
+     return osReplay;
+     }
+  return osContinue;
+}
+
+eOSState cMenuDVD::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:
+       case kRed:    return Play();
+       case kMenu:   return osEnd;
+       default: break;
+       }
+     }
+  return state;
+}
+#endif //DVDSUPPORT
+
 // --- cMenuSetup ------------------------------------------------------------
 
 class cMenuSetup : public cOsdMenu {
@@ -1714,23 +1788,21 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
 #define STOP_RECORDING tr(" Stop recording ")
 
-static const char *hk(int n, const char *s)
-{
-  static char buffer[32];
-  snprintf(buffer, sizeof(buffer), " %d %s", n, s);
-  return buffer;
-}
-
 cMenuMain::cMenuMain(bool Replaying)
 :cOsdMenu(tr("Main"))
 {
-  Add(new cOsdItem(hk(1, tr("Schedule")),   osSchedule));
-  Add(new cOsdItem(hk(2, tr("Channels")),   osChannels));
-  Add(new cOsdItem(hk(3, tr("Timers")),     osTimers));
-  Add(new cOsdItem(hk(4, tr("Recordings")), osRecordings));
-  Add(new cOsdItem(hk(5, tr("Setup")),      osSetup));
+  digit = 0;
+  Add(new cOsdItem(hk(tr("Schedule")),   osSchedule));
+  Add(new cOsdItem(hk(tr("Channels")),   osChannels));
+  Add(new cOsdItem(hk(tr("Timers")),     osTimers));
+  Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
+#ifdef DVDSUPPORT
+  if (cDVD::DriveExists())
+  Add(new cOsdItem(hk(tr("DVD")),        osDVD));
+#endif //DVDSUPPORT
+  Add(new cOsdItem(hk(tr("Setup")),      osSetup));
   if (Commands.Count())
-     Add(new cOsdItem(hk(6, tr("Commands")),  osCommands));
+     Add(new cOsdItem(hk(tr("Commands")),  osCommands));
   if (Replaying)
      Add(new cOsdItem(tr(" Stop replaying"), osStopReplay));
   const char *s = NULL;
@@ -1741,13 +1813,30 @@ cMenuMain::cMenuMain(bool Replaying)
         delete buffer;
         }
   if (cVideoCutter::Active())
-     Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
-  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+     Add(new cOsdItem(hk(tr(" Cancel editing")), osCancelEdit));
+  const char *DVDbutton =
+#ifdef DVDSUPPORT
+                          cDVD::DiscOk() ? tr("Eject DVD") : NULL;
+#else
+                          NULL;
+#endif //DVDSUPPORT
+  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, DVDbutton, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
   SetHasHotkeys();
 }
 
+const char *cMenuMain::hk(const char *s)
+{
+  static char buffer[32];
+  if (digit < 9) {
+     snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
+     return buffer;
+     }
+  else
+     return s;
+}
+
 eOSState cMenuMain::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
@@ -1757,6 +1846,9 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osChannels:   return AddSubMenu(new cMenuChannels);
     case osTimers:     return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
+#ifdef DVDSUPPORT
+    case osDVD:        return AddSubMenu(new cMenuDVD);
+#endif //DVDSUPPORT
     case osSetup:      return AddSubMenu(new cMenuSetup);
     case osCommands:   return AddSubMenu(new cMenuCommands);
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
@@ -1773,22 +1865,31 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                           }
                        break;
     default: switch (Key) {
-               case kMenu:  state = osEnd;    break;
-               case kRed:   if (!HasSubMenu())
-                               state = osRecord;
-                            break;
-               case kGreen: if (!HasSubMenu()) {
-                               if (cDvbApi::PrimaryDvbApi->CanToggleAudioTrack()) {
-                                  Interface->Clear();
-                                  cDvbApi::PrimaryDvbApi->ToggleAudioTrack();
-                                  state = osEnd;
-                                  }
-                               }
-                            break;
-               case kBlue:  if (!HasSubMenu())
-                               state = osReplay;
-                            break;
-               default:     break;
+               case kMenu:   state = osEnd;    break;
+               case kRed:    if (!HasSubMenu())
+                                state = osRecord;
+                             break;
+               case kGreen:  if (!HasSubMenu()) {
+                                if (cDvbApi::PrimaryDvbApi->CanToggleAudioTrack()) {
+                                   Interface->Clear();
+                                   cDvbApi::PrimaryDvbApi->ToggleAudioTrack();
+                                   state = osEnd;
+                                   }
+                                }
+                             break;
+#ifdef DVDSUPPORT
+               case kYellow: if (!HasSubMenu()) {
+                                if (cDVD::DiscOk()) {
+                                   cDVD::Eject();
+                                   state = osEnd;
+                                   }
+                                }
+                             break;
+#endif //DVDSUPPORT
+               case kBlue:   if (!HasSubMenu())
+                                state = osReplay;
+                             break;
+               default:      break;
                }
     }
   if (Key != kNone)
@@ -2144,6 +2245,10 @@ void cProgressBar::Mark(int x, bool Start, bool Current)
 
 char *cReplayControl::fileName = NULL;
 char *cReplayControl::title = NULL;
+#ifdef DVDSUPPORT
+cDVD *cReplayControl::dvd = NULL;//XXX
+int  cReplayControl::titleid = 0;//XXX
+#endif //DVDSUPPORT
 
 cReplayControl::cReplayControl(void)
 {
@@ -2155,6 +2260,10 @@ cReplayControl::cReplayControl(void)
      marks.Load(fileName);
      dvbApi->StartReplay(fileName);
      }
+#ifdef DVDSUPPORT
+  else if (dvd)
+     dvbApi->StartDVDplay(dvd, titleid);//XXX
+#endif //DVDSUPPORT
 }
 
 cReplayControl::~cReplayControl()
@@ -2171,6 +2280,15 @@ void cReplayControl::SetRecording(const char *FileName, const char *Title)
   title = Title ? strdup(Title) : NULL;
 }
 
+#ifdef DVDSUPPORT
+void cReplayControl::SetDVD(cDVD *DVD, int Title)//XXX
+{
+  SetRecording(NULL, NULL);
+  dvd = DVD;
+  titleid = Title;
+}
+#endif //DVDSUPPORT
+
 const char *cReplayControl::LastReplayed(void)
 {
   return fileName;
@@ -2216,10 +2334,10 @@ bool cReplayControl::ShowProgress(bool Initial)
         }
      if (Total != lastTotal) {
         Interface->Write(-7, 2, IndexToHMSF(Total));
-        Interface->Flush();
-        lastTotal = Total;
+        if (!Initial)
+           Interface->Flush();
         }
-     if (Current != lastCurrent) {
+     if (Current != lastCurrent || Total != lastTotal) {
 #ifdef DEBUG_OSD
         int p = Width() * Current / Total;
         Interface->Fill(0, 1, p, 1, clrGreen);
@@ -2227,12 +2345,14 @@ bool cReplayControl::ShowProgress(bool Initial)
 #else
         cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
         Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
-        Interface->Flush();
+        if (!Initial)
+           Interface->Flush();
 #endif
         Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
         Interface->Flush();
         lastCurrent = Current;
         }
+     lastTotal = Total;
      return true;
      }
   return false;
@@ -2338,11 +2458,10 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     // Positioning:
     case kUp:      dvbApi->Play(); break;
     case kDown:    dvbApi->Pause(); break;
-    case kLeft:    dvbApi->Backward(); break;
-    case kRight:   dvbApi->Forward(); break;
     case kLeft|k_Release:
+    case kLeft:    dvbApi->Backward(); break;
     case kRight|k_Release:
-                   dvbApi->Play(); break;
+    case kRight:   dvbApi->Forward(); break;
     case kGreen|k_Repeat:
     case kGreen:   dvbApi->SkipSeconds(-60); break;
     case kYellow|k_Repeat:
diff --git a/menu.h b/menu.h
index adc10b726..c47e5cbd8 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.20 2001/07/28 13:59:29 kls Exp $
+ * $Id: menu.h 1.22 2001/08/05 16:04:58 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -13,17 +13,22 @@
 #define _GNU_SOURCE
 
 #include "dvbapi.h"
+#ifdef DVDSUPPORT
+#include "dvd.h"
+#endif //DVDSUPPORT
 #include "osd.h"
 #include "recording.h"
 
 class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
+  int digit;
+  const char *hk(const char *s);
 public:
   cMenuMain(bool Replaying);
   virtual eOSState ProcessKey(eKeys Key);
   };
-  
+
 class cDisplayChannel : public cOsdBase {
 private:
   bool withInfo, group;
@@ -39,6 +44,18 @@ class cDisplayChannel : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+#ifdef DVDSUPPORT
+class cMenuDVD : public cOsdMenu {
+private:
+  cDVD *dvd;//XXX member really necessary???
+  eOSState Play(void);
+  eOSState Eject(void);
+public:
+  cMenuDVD(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+#endif //DVDSUPPORT
+
 class cMenuRecordings : public cOsdMenu {
 private:
   cRecordings Recordings;
@@ -88,6 +105,10 @@ class cReplayControl : public cOsdBase {
   void Show(int Seconds = 0);
   void Hide(void);
   static char *fileName;
+#ifdef DVDSUPPORT
+  static cDVD *dvd;//XXX member really necessary???
+  static int titleid;//XXX
+#endif //DVDSUPPORT
   static char *title;
   bool ShowProgress(bool Initial);
   void MarkToggle(void);
@@ -101,6 +122,9 @@ class cReplayControl : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
+#ifdef DVDSUPPORT
+  static void SetDVD(cDVD *DVD, int Title);//XXX
+#endif //DVDSUPPORT
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
   };
diff --git a/osd.c b/osd.c
index c29c98316..daedc1ee4 100644
--- a/osd.c
+++ b/osd.c
@@ -4,11 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.16 2001/02/24 16:26:11 kls Exp $
+ * $Id: osd.c 1.17 2001/08/02 14:18:17 kls Exp $
  */
 
 #include "osd.h"
-#include <assert.h>
 #include <string.h>
 #include "i18n.h"
 
diff --git a/osd.h b/osd.h
index a1977be4f..ec1b11571 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.22 2001/07/27 11:33:30 kls Exp $
+ * $Id: osd.h 1.23 2001/08/02 13:48:34 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -27,6 +27,7 @@ enum eOSState { osUnknown,
                 osCommands,
                 osRecord,
                 osReplay,
+                osDVD,
                 osStopRecord,
                 osStopReplay,
                 osCancelEdit,
@@ -43,7 +44,7 @@ class cOsdItem : public cListObject {
 protected:
   bool fresh;
   bool userColor;
-  eDvbColor fgColor, bgColor; 
+  eDvbColor fgColor, bgColor;
 public:
   cOsdItem(eOSState State = osUnknown);
   cOsdItem(const char *Text, eOSState State = osUnknown);
@@ -55,7 +56,7 @@ class cOsdItem : public cListObject {
   virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   virtual void Set(void) {}
   virtual eOSState ProcessKey(eKeys Key);
-  };
+};
 
 class cOsdBase {
 protected:
@@ -67,7 +68,7 @@ class cOsdBase {
   int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
   virtual eOSState ProcessKey(eKeys Key) = 0;
-  };
+};
 
 class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
 private:
diff --git a/ringbuffer.c b/ringbuffer.c
index 8511a1c23..7e09b2af5 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.2 2001/05/20 11:58:08 kls Exp $
+ * $Id: ringbuffer.c 1.4 2001/08/05 12:17:45 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -41,61 +41,128 @@ cRingBuffer::cRingBuffer(int Size, bool Statistics)
 {
   size = Size;
   statistics = Statistics;
-  buffer = NULL;
   inputThread = NULL;
   outputThread = NULL;
+  busy = false;
   maxFill = 0;
+}
+
+cRingBuffer::~cRingBuffer()
+{
+  delete inputThread;
+  delete outputThread;
+  if (statistics)
+     dsyslog(LOG_INFO, "buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
+}
+
+void cRingBuffer::WaitForPut(void)
+{
+  putMutex.Lock();
+  readyForPut.Wait(putMutex);
+  putMutex.Unlock();
+}
+
+void cRingBuffer::WaitForGet(void)
+{
+  getMutex.Lock();
+  readyForGet.Wait(getMutex);
+  getMutex.Unlock();
+}
+
+void cRingBuffer::EnablePut(void)
+{
+  readyForPut.Broadcast();
+}
+
+void cRingBuffer::EnableGet(void)
+{
+  readyForGet.Broadcast();
+}
+
+bool cRingBuffer::Start(void)
+{
+  if (!busy) {
+     busy = true;
+     outputThread = new cRingBufferOutputThread(this);
+     if (!outputThread->Start())
+        DELETENULL(outputThread);
+     inputThread = new cRingBufferInputThread(this);
+     if (!inputThread->Start()) {
+        DELETENULL(inputThread);
+        DELETENULL(outputThread);
+        }
+     busy = outputThread && inputThread;
+     }
+  return busy;
+}
+
+bool cRingBuffer::Active(void)
+{
+  return outputThread && outputThread->Active() && inputThread && inputThread->Active();
+}
+
+void cRingBuffer::Stop(void)
+{
   busy = false;
-  if (size > 1) { // 'size - 1' must not be 0!
-     buffer = new uchar[size];
+  for (time_t t0 = time(NULL) + 3; time(NULL) < t0; ) {
+      if (!((outputThread && outputThread->Active()) || (inputThread && inputThread->Active())))
+         break;
+      }
+  DELETENULL(inputThread);
+  DELETENULL(outputThread);
+}
+
+// --- cRingBufferLinear ----------------------------------------------------
+
+cRingBufferLinear::cRingBufferLinear(int Size, bool Statistics)
+:cRingBuffer(Size, Statistics)
+{
+  buffer = NULL;
+  if (Size > 1) { // 'Size - 1' must not be 0!
+     buffer = new uchar[Size];
      if (!buffer)
-        esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", size);
+        esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", Size);
      Clear();
      }
   else
-     esyslog(LOG_ERR, "ERROR: illegal size for ring buffer (%d)", size);
+     esyslog(LOG_ERR, "ERROR: illegal size for ring buffer (%d)", Size);
 }
 
-cRingBuffer::~cRingBuffer()
+cRingBufferLinear::~cRingBufferLinear()
 {
-  delete inputThread;
-  delete outputThread;
   delete buffer;
-  if (statistics)
-     dsyslog(LOG_INFO, "buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
 
-int cRingBuffer::Available(void)
+int cRingBufferLinear::Available(void)
 {
-  mutex.Lock();
+  Lock();
   int diff = head - tail;
-  int cont = (diff >= 0) ? diff : size + diff;
-  mutex.Unlock();
-  return cont;
+  Unlock();
+  return (diff >= 0) ? diff : Size() + diff;
 }
 
-void cRingBuffer::Clear(void)
+void cRingBufferLinear::Clear(void)
 {
-  mutex.Lock();
+  Lock();
   head = tail = 0;
-  mutex.Unlock();
+  Unlock();
 }
 
-int cRingBuffer::Put(const uchar *Data, int Count)
+int cRingBufferLinear::Put(const uchar *Data, int Count)
 {
   if (Count > 0) {
-     mutex.Lock();
-     int rest = size - head;
+     Lock();
+     int rest = Size() - head;
      int diff = tail - head;
-     mutex.Unlock();
-     int free = (diff > 0) ? diff - 1 : size + diff - 1;
+     Unlock();
+     int free = (diff > 0) ? diff - 1 : Size() + diff - 1;
      if (statistics) {
-        int fill = size - free - 1 + Count;
-        if (fill >= size)
-           fill = size - 1;
+        int fill = Size() - free - 1 + Count;
+        if (fill >= Size())
+           fill = Size() - 1;
         if (fill > maxFill) {
            maxFill = fill;
-           int percent = maxFill * 100 / (size - 1);
+           int percent = maxFill * 100 / (Size() - 1);
            if (percent > 75)
               dsyslog(LOG_INFO, "buffer usage: %d%%", percent);
            }
@@ -120,14 +187,14 @@ int cRingBuffer::Put(const uchar *Data, int Count)
   return Count;
 }
 
-int cRingBuffer::Get(uchar *Data, int Count)
+int cRingBufferLinear::Get(uchar *Data, int Count)
 {
   if (Count > 0) {
-     mutex.Lock();
-     int rest = size - tail;
+     Lock();
+     int rest = Size() - tail;
      int diff = head - tail;
-     mutex.Unlock();
-     int cont = (diff >= 0) ? diff : size + diff;
+     Unlock();
+     int cont = (diff >= 0) ? diff : Size() + diff;
      if (rest <= 0)
         return 0;
      if (cont < Count)
@@ -146,36 +213,112 @@ int cRingBuffer::Get(uchar *Data, int Count)
   return Count;
 }
 
-bool cRingBuffer::Start(void)
+// --- cFrame ----------------------------------------------------------------
+
+cFrame::cFrame(const uchar *Data, int Count, int Index)
 {
-  if (!busy) {
-     busy = true;
-     outputThread = new cRingBufferOutputThread(this);
-     if (!outputThread->Start())
-        DELETENULL(outputThread);
-     inputThread = new cRingBufferInputThread(this);
-     if (!inputThread->Start()) {
-        DELETENULL(inputThread);
-        DELETENULL(outputThread);
+  count = Count;
+  index = Index;
+  data = new uchar[count];
+  if (data)
+     memcpy(data, Data, count);
+  else
+     esyslog(LOG_ERR, "ERROR: can't allocate frame buffer (count=%d)", count);
+  next = NULL;
+}
+
+cFrame::~cFrame()
+{
+  delete data;
+}
+
+// --- cRingBufferFrame ------------------------------------------------------
+
+cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics = false)
+:cRingBuffer(Size, Statistics)
+{
+  head = NULL;
+  currentFill = 0;
+}
+
+cRingBufferFrame::~cRingBufferFrame()
+{
+  Clear();
+}
+
+void cRingBufferFrame::Clear(void)
+{
+  Lock();
+  const cFrame *p;
+  while ((p = Get(false)) != NULL)
+        Drop(p);
+  Unlock();
+  EnablePut();
+  EnableGet();
+}
+
+bool cRingBufferFrame::Put(cFrame *Frame)
+{
+  if (Frame->Count() <= Free()) {
+     Lock();
+     if (head) {
+        Frame->next = head->next;
+        head->next = Frame;
+        head = Frame;
         }
-     busy = outputThread && inputThread;
+     else {
+        head = Frame->next = Frame;
+        }
+     currentFill += Frame->Count();
+     Unlock();
+     EnableGet();
+     return true;
      }
-  return busy;
+  WaitForPut();
+  return false;
 }
 
-bool cRingBuffer::Active(void)
+const cFrame *cRingBufferFrame::Get(bool Wait)
 {
-  return outputThread && outputThread->Active() && inputThread && inputThread->Active();
+  Lock();
+  cFrame *p = head ? head->next : NULL;
+  Unlock();
+  if (!p && Wait)
+     WaitForGet();
+  return p;
 }
 
-void cRingBuffer::Stop(void)
+void cRingBufferFrame::Delete(const cFrame *Frame)
 {
-  busy = false;
-  for (time_t t0 = time(NULL) + 3; time(NULL) < t0; ) {
-      if (!((outputThread && outputThread->Active()) || (inputThread && inputThread->Active())))
-         break;
-      }
-  DELETENULL(inputThread);
-  DELETENULL(outputThread);
+  currentFill -= Frame->Count();
+  delete Frame;
+}
+
+void cRingBufferFrame::Drop(const cFrame *Frame)
+{
+  Lock();
+  if (head) {
+     if (Frame == head->next) {
+        if (head->next != head) {
+           head->next = Frame->next;
+           Delete(Frame);
+           }
+        else {
+           Delete(head);
+           head = NULL;
+           }
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: attempt to drop wrong frame from ring buffer!");
+     }
+  Unlock();
+  EnablePut();
 }
 
+int cRingBufferFrame::Available(void)
+{
+  Lock();
+  int av = currentFill;
+  Unlock();
+  return av;
+}
diff --git a/ringbuffer.h b/ringbuffer.h
index 49be769c2..f61d9e04c 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.2 2001/05/20 11:56:44 kls Exp $
+ * $Id: ringbuffer.h 1.4 2001/08/05 11:12:06 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -24,24 +24,24 @@ class cRingBuffer {
   cRingBufferInputThread *inputThread;
   cRingBufferOutputThread *outputThread;
   cMutex mutex;
-  int size, head, tail;
-  uchar *buffer;
-  int maxFill;
+  cCondVar readyForPut, readyForGet;
+  cMutex putMutex, getMutex;
+  int size;
   bool busy;
-  bool statistics;
 protected:
+  int maxFill;//XXX
+  bool statistics;//XXX
+  void WaitForPut(void);
+  void WaitForGet(void);
+  void EnablePut(void);
+  void EnableGet(void);
+  virtual void Clear(void) = 0;
+  virtual int Available(void) = 0;
+  int Free(void) { return size - Available() - 1; }
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
-  int Available(void);
+  int Size(void) { return size; }
   bool Busy(void) { return busy; }
-  void Clear(void);
-    // Immediately clears the ring buffer.
-  int Put(const uchar *Data, int Count);
-    // Puts at most Count bytes of Data into the ring buffer.
-    // Returns the number of bytes actually stored.
-  int Get(uchar *Data, int Count);
-    // Gets at most Count bytes of Data from the ring buffer.
-    // Returns the number of bytes actually retrieved.
   virtual void Input(void) = 0;
     // Runs as a separate thread and shall continuously read data from
     // a source and call Put() to store the data in the ring buffer.
@@ -56,4 +56,60 @@ class cRingBuffer {
   void Stop(void);
   };
 
+class cRingBufferLinear : public cRingBuffer {
+private:
+  int head, tail;
+  uchar *buffer;
+protected:
+  virtual int Available(void);
+  virtual void Clear(void);
+    // Immediately clears the ring buffer.
+  int Put(const uchar *Data, int Count);
+    // Puts at most Count bytes of Data into the ring buffer.
+    // Returns the number of bytes actually stored.
+  int Get(uchar *Data, int Count);
+    // Gets at most Count bytes of Data from the ring buffer.
+    // Returns the number of bytes actually retrieved.
+public:
+  cRingBufferLinear(int Size, bool Statistics = false);
+  virtual ~cRingBufferLinear();
+  };
+
+class cFrame {
+  friend class cRingBufferFrame;
+private:
+  cFrame *next;
+  uchar *data;
+  int count;
+  int index;
+public:
+  cFrame(const uchar *Data, int Count, int Index = -1);
+  ~cFrame();
+  const uchar *Data(void) const { return data; }
+  int Count(void) const { return count; }
+  int Index(void) const { return index; }
+  };
+
+class cRingBufferFrame : public cRingBuffer {
+private:
+  cFrame *head;
+  int currentFill;
+  void Delete(const cFrame *Frame);
+protected:
+  virtual int Available(void);
+  virtual void Clear(void);
+    // Immediately clears the ring buffer.
+  bool Put(cFrame *Frame);
+    // Puts the Frame into the ring buffer.
+    // Returns true if this was possible.
+  const cFrame *Get(bool Wait = true);
+    // Gets the next frame from the ring buffer.
+    // The actual data still remains in the buffer until Drop() is called.
+  void Drop(const cFrame *Frame);
+    // Drops the Frame that has just been fetched with Get().
+public:
+  cRingBufferFrame(int Size, bool Statistics = false);
+  virtual ~cRingBufferFrame();
+  };
+
 #endif // __RINGBUFFER_H
diff --git a/thread.c b/thread.c
index e253ea042..bfc8aab12 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.9 2001/06/27 11:34:41 kls Exp $
+ * $Id: thread.c 1.11 2001/08/05 10:36:52 kls Exp $
  */
 
 #include "thread.h"
@@ -14,6 +14,42 @@
 #include <unistd.h>
 #include "tools.h"
 
+// --- cCondVar --------------------------------------------------------------
+
+cCondVar::cCondVar(void)
+{
+  pthread_cond_init(&cond, 0);
+}
+
+cCondVar::~cCondVar()
+{
+  pthread_cond_destroy(&cond);
+}
+
+bool cCondVar::Wait(cMutex &Mutex)
+{
+  return pthread_cond_wait(&cond, &Mutex.mutex);
+}
+
+/*
+bool cCondVar::TimedWait(cMutex &Mutex, unsigned long tmout)
+{
+  return pthread_cond_timedwait(&cond, &Mutex.mutex, tmout);
+}
+*/
+
+void cCondVar::Broadcast(void)
+{
+  pthread_cond_broadcast(&cond);
+}
+
+/*
+void cCondVar::Signal(void)
+{
+  pthread_cond_signal(&cond);
+}
+*/
+
 // --- cMutex ----------------------------------------------------------------
 
 cMutex::cMutex(void)
@@ -85,6 +121,7 @@ bool cThread::Start(void)
      running = true;
      parentPid = getpid();
      pthread_create(&thread, NULL, (void *(*) (void *))&StartThread, (void *)this);
+     pthread_setschedparam(thread, SCHED_RR, 0);
      usleep(10000); // otherwise calling Active() immediately after Start() causes a "pure virtual method called" error
      }
   return true; //XXX return value of pthread_create()???
diff --git a/thread.h b/thread.h
index bf9804d33..e8e796eb1 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.6 2001/06/27 11:22:04 kls Exp $
+ * $Id: thread.h 1.8 2001/08/05 10:36:47 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -13,7 +13,22 @@
 #include <pthread.h>
 #include <sys/types.h>
 
+class cMutex;
+
+class cCondVar {
+private:
+  pthread_cond_t cond;
+public:
+  cCondVar(void);
+  ~cCondVar();
+  bool Wait(cMutex &Mutex);
+  //bool TimedWait(cMutex &Mutex, unsigned long tmout);
+  void Broadcast(void);
+  //void Signal(void);
+  };
+
 class cMutex {
+  friend class cCondVar;
 private:
   pthread_mutex_t mutex;
   pid_t lockingPid;
diff --git a/tools.c b/tools.c
index de1a52c39..c75efbb99 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.34 2001/05/20 08:30:54 kls Exp $
+ * $Id: tools.c 1.35 2001/08/05 12:38:06 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -406,8 +406,8 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
   FD_SET(FileDes, &set);
   if (TimeoutMs < 100)
      TimeoutMs = 100;
-  timeout.tv_sec  = 0;
-  timeout.tv_usec = TimeoutMs * 1000;
+  timeout.tv_sec  = TimeoutMs / 1000;
+  timeout.tv_usec = (TimeoutMs % 1000) * 1000;
   return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
 }
 
diff --git a/vdr.c b/vdr.c
index 12b1a5381..15a69de06 100644
--- a/vdr.c
+++ b/vdr.c
@@ -2,27 +2,27 @@
  * vdr.c: Video Disk Recorder main program
  *
  * Copyright (C) 2000 Klaus Schmidinger
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- * 
+ *
  * The author can be reached at kls@cadsoft.de
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.58 2001/06/23 12:29:41 kls Exp $
+ * $Id: vdr.c 1.61 2001/08/05 16:15:51 kls Exp $
  */
 
 #include <getopt.h>
@@ -31,6 +31,9 @@
 #include <unistd.h>
 #include "config.h"
 #include "dvbapi.h"
+#ifdef DVDSUPPORT
+#include "dvd.h"
+#endif //DVDSUPPORT
 #include "i18n.h"
 #include "interface.h"
 #include "menu.h"
@@ -85,14 +88,15 @@ int main(int argc, char *argv[])
       { "log",      required_argument, NULL, 'l' },
       { "port",     required_argument, NULL, 'p' },
       { "video",    required_argument, NULL, 'v' },
+      { "dvd",      required_argument, NULL, 'V' },
       { "watchdog", required_argument, NULL, 'w' },
       { "terminal", required_argument, NULL, 't' },
       { 0 }
     };
-  
+
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:hl:p:v:w:t:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:hl:p:v:V:w:t:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -124,6 +128,7 @@ int main(int argc, char *argv[])
                            "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                            "                           0 turns off SVDRP\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
+                           "  -V DEV,   --dvd=DEV      use DEV as the DVD device (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
@@ -131,6 +136,11 @@ int main(int argc, char *argv[])
                            "Report bugs to <vdr-bugs@cadsoft.de>\n",
                            DEFAULTSVDRPPORT,
                            VideoDirectory,
+#ifdef DVDSUPPORT
+                           cDVD::DeviceName(),
+#else
+                           "no DVD support",
+#endif //DVDSUPPORT
                            DEFAULTWATCHDOG
                            );
                     return 0;
@@ -158,6 +168,18 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
+          case 'V': 
+#ifdef DVDSUPPORT
+                    cDVD::SetDeviceName(optarg);
+                    if (!cDVD::DriveExists()) {
+                       fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
+                       return 2;
+                       }
+#else
+                    fprintf(stderr, "vdr: DVD support has not been compiled in!");
+                    return 2;
+#endif //DVDSUPPORT
+                    break;
           case 'w': if (isnumber(optarg)) {
                        int t = atoi(optarg);
                        if (t >= 0) {
@@ -173,7 +195,7 @@ int main(int argc, char *argv[])
         }
 
   // Log file:
-  
+
   if (SysLogLevel > 0)
      openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
 
@@ -324,6 +346,12 @@ int main(int argc, char *argv[])
                             DELETENULL(ReplayControl);
                             ReplayControl = new cReplayControl;
                             break;
+#ifdef DVDSUPPORT
+             case osDVD:    DELETENULL(Menu);
+                            DELETENULL(ReplayControl);
+                            Menu = new cMenuDVD;
+                            break;
+#endif //DVDSUPPORT
              case osStopReplay:
                             DELETENULL(*Interact);
                             DELETENULL(ReplayControl);
@@ -358,7 +386,7 @@ int main(int argc, char *argv[])
              case kRight: if (!Interface->Recording()) {
                              int SaveGroup = CurrentGroup;
                              if (NORMALKEY(key) == kRight)
-                                CurrentGroup = Channels.GetNextGroup(CurrentGroup) ; 
+                                CurrentGroup = Channels.GetNextGroup(CurrentGroup) ;
                              else
                                 CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
                              if (CurrentGroup < 0)

From efea0f64d08052b0189d962101e1a3634d4adfc8 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 12 Aug 2001 18:00:00 +0200
Subject: [PATCH 021/307] Version 0.91 - Fixed displaying colored button texts
 that are too long. - Suppressing replay progress display when replaying a
 DVD. - Updated channels.conf.cable (thanks to Uwe Scheffler). - Updated
 French OSD texts (thanks to Jean-Claude Repetto). - Improved AC3 decoding
 when replaying DVDs (thanks to Matjaz Thaler). - Fixed handling DVB card
 indexes when using only one card in a multi-card   system. - Changed the
 'Eject DVD' button text to a simple 'Eject' (the German text   was too
 long...). - Made the font file generation more stable (thanks to Artur
 Skawina). - Changed the default value for the "DiSEqC" setup parameter to
 "off". - The new command line option '-E' can be used to define where the EPG
 data   shall be written to. This is especially useful if VDR runs in a system
   that turns off the video disk when it is not used, and therefore needs   to
 write the EPG file to a ramdisk (or turn off writing it alltogether).   See
 'vdr --help' for details. - Making sure the disk is up and running before
 starting recording (this   is important for systems that turn off the video
 disk when it is not used). - Added the "Jump" function in replay mode (thanks
 to Stefan Huelswitt).   See the description of the "Red" key in MANUAL under
 "Replay Control" for   details. - Fixed displaying editing marks when
 toggling a mark in "pause" mode. - If there is no free DVB device to record,
 the log message will now be given   only once. - Made I/O more robust by
 handling EINTR (thanks to Werner Fink).

---
 CONTRIBUTORS          |  13 +
 HISTORY               |  32 +-
 INSTALL               |  11 +
 MANUAL                |   6 +-
 Makefile              |  18 +-
 ac3dec/Makefile       |  14 +-
 ac3dec/ac3.h          |  56 ++--
 ac3dec/ac3_internal.h | 251 ++++++++-------
 ac3dec/bit_allocate.c | 278 ++++++++--------
 ac3dec/bit_allocate.h |   2 +-
 ac3dec/bitstream.c    |  53 +--
 ac3dec/bitstream.h    |  54 +---
 ac3dec/bswap.h        |  80 +++++
 ac3dec/cmplx.h        |  29 ++
 ac3dec/coeff.c        | 446 ++++++++++++++-----------
 ac3dec/cpu_accel.c    | 129 ++++++++
 ac3dec/crc.c          |  26 +-
 ac3dec/crc.h          |   4 +-
 ac3dec/debug.c        |  16 +-
 ac3dec/debug.h        |  10 +-
 ac3dec/decode.c       | 251 ++++++++-------
 ac3dec/dither.c       |  13 +-
 ac3dec/dither.h       |  12 +-
 ac3dec/downmix.c      | 441 +++----------------------
 ac3dec/downmix.h      |   8 +-
 ac3dec/downmix_c.c    | 161 +++++++++
 ac3dec/downmix_c.h    |  32 ++
 ac3dec/downmix_i386.S |  92 ++++++
 ac3dec/downmix_i386.h |  27 ++
 ac3dec/downmix_kni.S  | 396 +++++++++++++++++++++++
 ac3dec/downmix_kni.h  |  32 ++
 ac3dec/exponent.c     |  61 ++--
 ac3dec/imdct.c        | 734 +++++++++++++++++++++++-------------------
 ac3dec/imdct.h        |   2 +-
 ac3dec/imdct512_kni.S | 548 +++++++++++++++++++++++++++++++
 ac3dec/imdct_c.c      | 218 +++++++++++++
 ac3dec/imdct_c.h      |  36 +++
 ac3dec/imdct_kni.c    | 103 ++++++
 ac3dec/imdct_kni.h    |  36 +++
 ac3dec/mm_accel.h     |  36 +++
 ac3dec/parse.c        | 252 ++++-----------
 ac3dec/parse.h        |   4 +-
 ac3dec/rematrix.c     |  54 ++--
 ac3dec/sanity_check.c |  85 +++--
 ac3dec/sanity_check.h |   4 +-
 ac3dec/srfft.c        | 305 ++++++++++++++++++
 ac3dec/srfft.h        |  39 +++
 ac3dec/srfft_kni.S    | 289 +++++++++++++++++
 ac3dec/srfft_kni.h    |  30 ++
 ac3dec/srfft_kni_c.c  |  93 ++++++
 ac3dec/srfftp.h       | 305 ++++++++++++++++++
 ac3dec/stats.c        |  26 +-
 channels.conf.cable   | 264 ++++++++-------
 config.c              |  13 +-
 config.h              |   7 +-
 dvbapi.c              |  64 ++--
 dvbapi.h              |   9 +-
 eit.c                 |  28 +-
 eit.h                 |   5 +-
 i18n.c                |  61 ++--
 interface.c           |   4 +-
 menu.c                | 130 +++++++-
 menu.h                |   7 +-
 recording.c           |   8 +-
 remote.c              |   6 +-
 svdrp.c               |   6 +-
 tools.c               |  61 +++-
 tools.h               |   5 +-
 vdr.c                 |  23 +-
 69 files changed, 4985 insertions(+), 1969 deletions(-)
 create mode 100644 ac3dec/bswap.h
 create mode 100644 ac3dec/cmplx.h
 create mode 100644 ac3dec/cpu_accel.c
 create mode 100644 ac3dec/downmix_c.c
 create mode 100644 ac3dec/downmix_c.h
 create mode 100644 ac3dec/downmix_i386.S
 create mode 100644 ac3dec/downmix_i386.h
 create mode 100644 ac3dec/downmix_kni.S
 create mode 100644 ac3dec/downmix_kni.h
 create mode 100644 ac3dec/imdct512_kni.S
 create mode 100644 ac3dec/imdct_c.c
 create mode 100644 ac3dec/imdct_c.h
 create mode 100644 ac3dec/imdct_kni.c
 create mode 100644 ac3dec/imdct_kni.h
 create mode 100644 ac3dec/mm_accel.h
 create mode 100644 ac3dec/srfft.c
 create mode 100644 ac3dec/srfft.h
 create mode 100644 ac3dec/srfft_kni.S
 create mode 100644 ac3dec/srfft_kni.h
 create mode 100644 ac3dec/srfft_kni_c.c
 create mode 100644 ac3dec/srfftp.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 46a84101f..241c86140 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -99,6 +99,7 @@ Stefan Huelswitt <huels@iname.com>
  for fixing the repeat function with LIRC
  for making the position of the channel display configurable
  for making the width and height of the OSD configurable
+ for implementing the "Jump" function in replay mode
 
 Ulrich R�der <dynamite@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -116,3 +117,15 @@ Aaron Holtzman
 
 Wolfgang Henselmann-Weiss <Wolfgang_Henselmann@betaresearch.de>
  for fixing calculating the timeout value in cFile::FileReady()
+
+Uwe Scheffler <UweScheffler@t-online.de>
+ for his help in keeping 'channels.conf.cable' up to date
+
+Matjaz Thaler <matjaz.thaler@guest.arnes.si>
+ for improving AC3 decoding when replaying DVDs
+
+Artur Skawina <skawina@geocities.com>
+ for improving the font file generation in the Makefile
+
+Werner Fink <werner@suse.de>
+ for making I/O more robust by handling EINTR
diff --git a/HISTORY b/HISTORY
index 041e4423f..715b66823 100644
--- a/HISTORY
+++ b/HISTORY
@@ -83,7 +83,7 @@ Video Disk Recorder Revision History
   with file names that contain blanks, all blanks in recording file names are
   converted to underscores.
 - The polarization can now be given in uppercase or lowercase characters in
-  channels.conf.
+  'channels.conf'.
 - Fixed buffer initialization to work with DVB driver version 0.6.
 - Implemented the "Simple Video Disk Recorder Protocol" (SVDRP) to control
   the VDR over a network connection.
@@ -147,7 +147,7 @@ Video Disk Recorder Revision History
   the OSD to no longer be displayed (thanks to Niels de Carpentier).
 - Added the '-m486' option to the compiler call.
 - If a channel name contains a colon (':') it is now replaced with a '|' in
-  channels.conf.
+  'channels.conf'.
 - Not everybody appears to like the "page scrolling" mechanism introduced by
   Heino Goldenstein in version 0.61, so this is now configurable via the "Setup"
   menu.
@@ -621,3 +621,31 @@ Video Disk Recorder Revision History
 - Ringbuffer uses semaphores to signal empty/full conditions.
 - Fixed calculating the timeout value in cFile::FileReady() (thanks to
   Wolfgang Henselmann-Weiss).
+
+2001-08-12: Version 0.91
+
+- Fixed displaying colored button texts that are too long.
+- Suppressing replay progress display when replaying a DVD.
+- Updated channels.conf.cable (thanks to Uwe Scheffler).
+- Updated French OSD texts (thanks to Jean-Claude Repetto).
+- Improved AC3 decoding when replaying DVDs (thanks to Matjaz Thaler).
+- Fixed handling DVB card indexes when using only one card in a multi-card
+  system.
+- Changed the 'Eject DVD' button text to a simple 'Eject' (the German text
+  was too long...).
+- Made the font file generation more stable (thanks to Artur Skawina).
+- Changed the default value for the "DiSEqC" setup parameter to "off".
+- The new command line option '-E' can be used to define where the EPG data
+  shall be written to. This is especially useful if VDR runs in a system
+  that turns off the video disk when it is not used, and therefore needs
+  to write the EPG file to a ramdisk (or turn off writing it alltogether).
+  See 'vdr --help' for details.
+- Making sure the disk is up and running before starting recording (this
+  is important for systems that turn off the video disk when it is not used).
+- Added the "Jump" function in replay mode (thanks to Stefan Huelswitt).
+  See the description of the "Red" key in MANUAL under "Replay Control" for
+  details.
+- Fixed displaying editing marks when toggling a mark in "pause" mode.
+- If there is no free DVB device to record, the log message will now be given
+  only once.
+- Made I/O more robust by handling EINTR (thanks to Werner Fink).
diff --git a/INSTALL b/INSTALL
index 86b4a1eee..946e06de9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,6 +23,9 @@ to activate DVD support. VDR then also needs the package 'libdvdread'
 in order to replay DVDs. This package is expected to be located in the
 directory ../DVD (seen from the VDR directory).  Adjust the definition
 of DVDDIR in the Makefile if necessary.
+You can find 'libdvdread' at
+
+  http://www.dtek.chalmers.se/groups/dvd/downloads.html
 
 VDR requires the card driver version 0.9.0 or higher
 to work properly. You need to load the dvb.o module *without* option
@@ -190,6 +193,14 @@ As a starting point you can copy the 'channels.conf' file that comes with the
 VDR archive into your video directory (or into your config directory,
 respectively, in case you have redirected it with the -c option).
 
+Setting up DiSEqC:
+------------------
+
+If you are using a DVB-S card with a satellite equipment that needs to be
+accessed using DiSEqC, you have to go to the "Setup" menu and set the "DiSEqC"
+parameter to "on". Also check the "DiSEqC" parameters for the various channels
+and set them to the necessary values.
+
 Running VDR with DVB-C (cable):
 -------------------------------
 
diff --git a/MANUAL b/MANUAL
index 59ff57c93..17f024836 100644
--- a/MANUAL
+++ b/MANUAL
@@ -17,7 +17,7 @@ Video Disk Recorder User's Manual
   Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
   Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
   Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
-  Red     -           Record     Edit       Edit       -             Play        -
+  Red     -           Record     Edit       Edit       -             Play        Jump
   Green   -           Language   New        New        -             Rewind      Skip -60s
   Yellow  -           Eject DVD  Delete     Delete     -             Delete      Skip +60s
   Blue    -           Resume     Mark       Mark       -             Summary     Stop
@@ -172,6 +172,10 @@ Video Disk Recorder User's Manual
             backward at a slower speed; press again to return to pause mode.
             Pressing and holding down the button performs the function until
             the button is released again.
+  - Red     Jump to a specific location. Enter the time you want to jump to
+            and then press "Left" or "Right" to jump relative to the current
+            position, "Up" to jump to an absolute position, and "Down" to
+            jump and pause at an absolute position.
   - Green
     Yellow  Skips about 60 seconds back or forward.
             Pressing and holding down the button performs the function until
diff --git a/Makefile b/Makefile
index 891871741..7fcc62a8c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.24 2001/08/06 16:13:42 kls Exp $
+# $Id: Makefile 1.25 2001/08/10 16:46:45 kls Exp $
+
+.DELETE_ON_ERROR:
 
 DVBDIR   = ../DVB
 DVDDIR   = ../DVD
@@ -82,16 +84,14 @@ vdr: $(OBJS) $(AC3LIB)
 # The font files:
 
 fontfix.c:
-	genfontfile "cFont::tPixelData FontFix" $(FIXFONT) > $@
+	./genfontfile "cFont::tPixelData FontFix" "$(FIXFONT)" > $@
 fontosd.c:
-	genfontfile "cFont::tPixelData FontOsd" $(OSDFONT) > $@
+	./genfontfile "cFont::tPixelData FontOsd" "$(OSDFONT)" > $@
 
 # The font file generator:
 
-genfontfile.o: genfontfile.c
-	gcc -O2 -c $<
-genfontfile: genfontfile.o
-	gcc -o $@ -L/usr/X11R6/lib $< -lX11
+genfontfile: genfontfile.c
+	gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
 
 # The ac3dec library:
 
@@ -103,5 +103,7 @@ $(AC3LIB):
 clean:
 	make -C $(AC3DIR) clean
 	-rm -f $(OBJS) vdr genfontfile genfontfile.o core *~
-CLEAN: clean
+fontclean:
 	-rm -f fontfix.c fontosd.c
+CLEAN: clean fontclean
+
diff --git a/ac3dec/Makefile b/ac3dec/Makefile
index a0547e915..7ab5ad028 100644
--- a/ac3dec/Makefile
+++ b/ac3dec/Makefile
@@ -1,10 +1,16 @@
 #
 # Makefile for 'ac3dec'
 #
-# $Id: Makefile 1.1 2001/08/03 12:58:06 kls Exp $
+# $Id: Makefile 1.2 2001/08/10 12:44:07 kls Exp $
+
+#OBJS = coeff.o decode.o exponent.o rematrix.o bit_allocate.o crc.o dither.o\
+#       imdct.o sanity_check.o bitstream.o debug.o downmix.o parse.o stats.o\
+#       downmix_c.o imdct.o                             
+
+OBJS = bit_allocate.o bitstream.o coeff.o cpu_accel.o crc.o debug.o decode.o\
+       dither.o downmix.o downmix_c.o exponent.o imdct.o imdct_c.o imdct_kni.o\
+       parse.o rematrix.o sanity_check.o srfft.o srfft_kni_c.o stats.o 
 
-OBJS = coeff.o decode.o exponent.o rematrix.o bit_allocate.o crc.o dither.o\
-       imdct.o sanity_check.o bitstream.o debug.o downmix.o parse.o stats.o                                  
 
 DEFINES += -DDOLBY_SURROUND
 
@@ -16,7 +22,7 @@ libac3.a: $(OBJS)
 # Implicit rules:
 
 %.o: %.c
-	gcc -g -O2 -Wall -m486 -c $(DEFINES) $<
+	gcc -g -O2 -Wall -m486 -I./ -c $(DEFINES) $<
 
 clean:
 	rm -f *~ libac3.a $(OBJS)
diff --git a/ac3dec/ac3.h b/ac3dec/ac3.h
index 4919fc504..d325f3bb3 100644
--- a/ac3dec/ac3.h
+++ b/ac3dec/ac3.h
@@ -22,39 +22,37 @@
  *
  */
 
-#ifndef AARONS_TYPES
-#define AARONS_TYPES
-typedef unsigned long long uint_64;
-typedef unsigned int   uint_32;
-typedef unsigned short uint_16;
-typedef unsigned char  uint_8;
-
-typedef signed long long sint_64;
-typedef signed int     sint_32;
-typedef signed short   sint_16;
-typedef signed char    sint_8;
+#define AC3_BUFFER_SIZE (6*1024*16)
+
+#ifndef __AC3_H__
+#define __AC3_H__
+
+#ifdef __OMS__
+#include <oms/plugin/output_audio.h>
+#else
+//#include "audio_out.h"
 #endif
 
-#define AC3_DOLBY_SURR_ENABLE 0x1
-#define AC3_3DNOW_ENABLE      0x2
-#define AC3_MMX_ENABLE        0x4
-#define AC3_ALTIVEC_ENABLE    0x8
-
-typedef struct ac3_config_s
-{
-	//Bit flags that enable various things
-	uint_32 flags;
-	//Callback that points the decoder to new stream data
-  void   (*fill_buffer_callback)(uint_8 **, uint_8 **);
-	//Number of discrete channels in final output (for downmixing)
-	uint_16 num_output_ch;
-	//Which channel of a dual mono stream to select
-	uint_16 dual_mono_ch_sel;
-} ac3_config_t;
+#include <inttypes.h>
 
-void ac3_init(ac3_config_t *);
-uint_32 ac3_decode_data(uint_8 *data_start,uint_8 *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data);
+#define AC3_DOLBY_SURR_ENABLE	(1<<0)
+#define AC3_ALTIVEC_ENABLE	(1<<1)
 
+typedef struct ac3_config_s {
+	// Bit flags that enable various things
+	uint32_t flags;
+	// Number of discrete channels in final output (for downmixing)
+	uint16_t num_output_ch;
+	// Which channel of a dual mono stream to select
+	uint16_t dual_mono_ch_sel;
+} ac3_config_t;
 
+void ac3dec_init (void);
 
+#ifdef __OMS__
+size_t ac3dec_decode_data (plugin_output_audio_t *output, uint8_t *data_start, uint8_t *data_end);
+#else
+size_t ac3dec_decode_data (uint8_t *data_start ,uint8_t *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data);
+#endif
 
+#endif
diff --git a/ac3dec/ac3_internal.h b/ac3dec/ac3_internal.h
index 235189ede..259396fdc 100644
--- a/ac3dec/ac3_internal.h
+++ b/ac3dec/ac3_internal.h
@@ -25,6 +25,8 @@
 #define inline 
 #endif
 
+#include <setjmp.h>
+
 /* Exponent strategy constants */
 #define EXP_REUSE (0)
 #define EXP_D15   (1)
@@ -43,7 +45,8 @@ typedef float stream_samples_t[6][256];
 /* global config structure */
 extern ac3_config_t ac3_config;
 /* global error flag */
-extern uint_32 error_flag;
+extern jmp_buf error_jmp_mark;
+#define HANDLE_ERROR() longjmp (error_jmp_mark, -1)
 
 /* Everything you wanted to know about band structure */
 /*
@@ -72,273 +75,279 @@ extern uint_32 error_flag;
 
 typedef struct syncinfo_s
 {
-	uint_32	magic;
+	uint32_t	magic;
 	/* Sync word == 0x0B77 */
-	 uint_16   syncword; 
+	 uint16_t   syncword; 
 	/* crc for the first 5/8 of the sync block */
-	/* uint_16   crc1; */
+	/* uint16_t   crc1; */
 	/* Stream Sampling Rate (kHz) 0 = 48, 1 = 44.1, 2 = 32, 3 = reserved */
-	uint_16		fscod;	
+	uint16_t		fscod;	
 	/* Frame size code */
-	uint_16		frmsizecod;
+	uint16_t		frmsizecod;
 
 	/* Information not in the AC-3 bitstream, but derived */
 	/* Frame size in 16 bit words */
-	uint_16 frame_size;
+	uint16_t frame_size;
 	/* Bit rate in kilobits */
-	uint_16 bit_rate;
+	uint16_t bit_rate;
 	/* sampling rate in hertz */
-	uint_32 sampling_rate;
+	uint32_t sampling_rate;
 
 } syncinfo_t;
 
 typedef struct bsi_s
 {
-	uint_32	magic;
+	uint32_t	magic;
 	/* Bit stream identification == 0x8 */
-	uint_16 bsid;	
+	uint16_t bsid;	
 	/* Bit stream mode */
-	uint_16 bsmod;
+	uint16_t bsmod;
 	/* Audio coding mode */
-	uint_16 acmod;
+	uint16_t acmod;
 	/* If we're using the centre channel then */
 		/* centre mix level */
-		uint_16 cmixlev;
+		uint16_t cmixlev;
 	/* If we're using the surround channel then */
 		/* surround mix level */
-		uint_16 surmixlev;
+		uint16_t surmixlev;
 	/* If we're in 2/0 mode then */
 		/* Dolby surround mix level - NOT USED - */
-		uint_16 dsurmod;
+		uint16_t dsurmod;
 	/* Low frequency effects on */
-	uint_16 lfeon;
+	uint16_t lfeon;
 	/* Dialogue Normalization level */
-	uint_16 dialnorm;
+	uint16_t dialnorm;
 	/* Compression exists */
-	uint_16 compre;
+	uint16_t compre;
 		/* Compression level */
-		uint_16 compr;
+		uint16_t compr;
 	/* Language code exists */
-	uint_16 langcode;
+	uint16_t langcode;
 		/* Language code */
-		uint_16 langcod;
+		uint16_t langcod;
 	/* Audio production info exists*/
-	uint_16 audprodie;
-		uint_16 mixlevel;
-		uint_16 roomtyp;
+	uint16_t audprodie;
+		uint16_t mixlevel;
+		uint16_t roomtyp;
 	/* If we're in dual mono mode (acmod == 0) then extra stuff */
-		uint_16 dialnorm2;
-		uint_16 compr2e;
-			uint_16 compr2;
-		uint_16 langcod2e;
-			uint_16 langcod2;
-		uint_16 audprodi2e;
-			uint_16 mixlevel2;
-			uint_16 roomtyp2;
+		uint16_t dialnorm2;
+		uint16_t compr2e;
+			uint16_t compr2;
+		uint16_t langcod2e;
+			uint16_t langcod2;
+		uint16_t audprodi2e;
+			uint16_t mixlevel2;
+			uint16_t roomtyp2;
 	/* Copyright bit */
-	uint_16 copyrightb;
+	uint16_t copyrightb;
 	/* Original bit */
-	uint_16 origbs;
+	uint16_t origbs;
 	/* Timecode 1 exists */
-	uint_16 timecod1e;
+	uint16_t timecod1e;
 		/* Timecode 1 */
-		uint_16 timecod1;
+		uint16_t timecod1;
 	/* Timecode 2 exists */
-	uint_16 timecod2e;
+	uint16_t timecod2e;
 		/* Timecode 2 */
-		uint_16 timecod2;
+		uint16_t timecod2;
 	/* Additional bit stream info exists */
-	uint_16 addbsie;
+	uint16_t addbsie;
 		/* Additional bit stream length - 1 (in bytes) */
-		uint_16 addbsil;
+		uint16_t addbsil;
 		/* Additional bit stream information (max 64 bytes) */
-		uint_8	addbsi[64];
+		uint8_t	addbsi[64];
 
 	/* Information not in the AC-3 bitstream, but derived */
 	/* Number of channels (excluding LFE)
 	 * Derived from acmod */
-	uint_16 nfchans;
+	uint16_t nfchans;
 } bsi_t;
 
 
 /* more pain */
 typedef struct audblk_s
 {
-	uint_32	magic1;
+	uint32_t	magic1;
 	/* block switch bit indexed by channel num */
-	uint_16 blksw[5];
+	uint16_t blksw[5];
 	/* dither enable bit indexed by channel num */
-	uint_16 dithflag[5];
+	uint16_t dithflag[5];
 	/* dynamic range gain exists */
-	uint_16 dynrnge;
+	uint16_t dynrnge;
 		/* dynamic range gain */
-		uint_16 dynrng;
+		uint16_t dynrng;
 	/* if acmod==0 then */
 	/* dynamic range 2 gain exists */
-	uint_16 dynrng2e;
+	uint16_t dynrng2e;
 		/* dynamic range 2 gain */
-		uint_16 dynrng2;
+		uint16_t dynrng2;
 	/* coupling strategy exists */
-	uint_16 cplstre;
+	uint16_t cplstre;
 		/* coupling in use */
-		uint_16 cplinu;
+		uint16_t cplinu;
 			/* channel coupled */
-			uint_16 chincpl[5];
+			uint16_t chincpl[5];
 			/* if acmod==2 then */
 				/* Phase flags in use */
-				uint_16 phsflginu;
+				uint16_t phsflginu;
 			/* coupling begin frequency code */
-			uint_16 cplbegf;
+			uint16_t cplbegf;
 			/* coupling end frequency code */
-			uint_16 cplendf;
+			uint16_t cplendf;
 			/* coupling band structure bits */
-			uint_16 cplbndstrc[18];
+			uint16_t cplbndstrc[18];
 			/* Do coupling co-ords exist for this channel? */
-			uint_16 cplcoe[5];
+			uint16_t cplcoe[5];
 			/* Master coupling co-ordinate */
-			uint_16 mstrcplco[5];
+			uint16_t mstrcplco[5];
 			/* Per coupling band coupling co-ordinates */
-			uint_16 cplcoexp[5][18];
-			uint_16 cplcomant[5][18];
+			uint16_t cplcoexp[5][18];
+			uint16_t cplcomant[5][18];
 			/* Phase flags for dual mono */
-			uint_16 phsflg[18];
+			uint16_t phsflg[18];
 	/* Is there a rematrixing strategy */
-	uint_16 rematstr;
+	uint16_t rematstr;
 		/* Rematrixing bits */
-		uint_16 rematflg[4];
+		uint16_t rematflg[4];
 	/* Coupling exponent strategy */
-	uint_16 cplexpstr;
+	uint16_t cplexpstr;
 	/* Exponent strategy for full bandwidth channels */
-	uint_16 chexpstr[5];
+	uint16_t chexpstr[5];
 	/* Exponent strategy for lfe channel */
-	uint_16 lfeexpstr;
+	uint16_t lfeexpstr;
 	/* Channel bandwidth for independent channels */
-	uint_16 chbwcod[5];
+	uint16_t chbwcod[5];
 		/* The absolute coupling exponent */
-		uint_16 cplabsexp;
+		uint16_t cplabsexp;
 		/* Coupling channel exponents (D15 mode gives 18 * 12 /3  encoded exponents */
-		uint_16 cplexps[18 * 12 / 3];
+		uint16_t cplexps[18 * 12 / 3];
 	/* Sanity checking constant */
-	uint_32	magic2;
+	uint32_t	magic2;
 	/* fbw channel exponents */
-	uint_16 exps[5][252 / 3];
+	uint16_t exps[5][252 / 3];
 	/* channel gain range */
-	uint_16 gainrng[5];
+	uint16_t gainrng[5];
 	/* low frequency exponents */
-	uint_16 lfeexps[3];
+	uint16_t lfeexps[3];
 
 	/* Bit allocation info */
-	uint_16 baie;
+	uint16_t baie;
 		/* Slow decay code */
-		uint_16 sdcycod;
+		uint16_t sdcycod;
 		/* Fast decay code */
-		uint_16 fdcycod;
+		uint16_t fdcycod;
 		/* Slow gain code */
-		uint_16 sgaincod;
+		uint16_t sgaincod;
 		/* dB per bit code */
-		uint_16 dbpbcod;
+		uint16_t dbpbcod;
 		/* masking floor code */
-		uint_16 floorcod;
+		uint16_t floorcod;
 
 	/* SNR offset info */
-	uint_16 snroffste;
+	uint16_t snroffste;
 		/* coarse SNR offset */
-		uint_16 csnroffst;
+		uint16_t csnroffst;
 		/* coupling fine SNR offset */
-		uint_16 cplfsnroffst;
+		uint16_t cplfsnroffst;
 		/* coupling fast gain code */
-		uint_16 cplfgaincod;
+		uint16_t cplfgaincod;
 		/* fbw fine SNR offset */
-		uint_16 fsnroffst[5];
+		uint16_t fsnroffst[5];
 		/* fbw fast gain code */
-		uint_16 fgaincod[5];
+		uint16_t fgaincod[5];
 		/* lfe fine SNR offset */
-		uint_16 lfefsnroffst;
+		uint16_t lfefsnroffst;
 		/* lfe fast gain code */
-		uint_16 lfefgaincod;
+		uint16_t lfefgaincod;
 	
 	/* Coupling leak info */
-	uint_16 cplleake;
+	uint16_t cplleake;
 		/* coupling fast leak initialization */
-		uint_16 cplfleak;
+		uint16_t cplfleak;
 		/* coupling slow leak initialization */
-		uint_16 cplsleak;
+		uint16_t cplsleak;
 	
 	/* delta bit allocation info */
-	uint_16 deltbaie;
+	uint16_t deltbaie;
 		/* coupling delta bit allocation exists */
-		uint_16 cpldeltbae;
+		uint16_t cpldeltbae;
 		/* fbw delta bit allocation exists */
-		uint_16 deltbae[5];
+		uint16_t deltbae[5];
 		/* number of cpl delta bit segments */
-		uint_16 cpldeltnseg;
+		uint16_t cpldeltnseg;
 			/* coupling delta bit allocation offset */
-			uint_16 cpldeltoffst[8];
+			uint16_t cpldeltoffst[8];
 			/* coupling delta bit allocation length */
-			uint_16 cpldeltlen[8];
+			uint16_t cpldeltlen[8];
 			/* coupling delta bit allocation length */
-			uint_16 cpldeltba[8];
+			uint16_t cpldeltba[8];
 		/* number of delta bit segments */
-		uint_16 deltnseg[5];
+		uint16_t deltnseg[5];
 			/* fbw delta bit allocation offset */
-			uint_16 deltoffst[5][8];
+			uint16_t deltoffst[5][8];
 			/* fbw delta bit allocation length */
-			uint_16 deltlen[5][8];
+			uint16_t deltlen[5][8];
 			/* fbw delta bit allocation length */
-			uint_16 deltba[5][8];
+			uint16_t deltba[5][8];
 
 	/* skip length exists */
-	uint_16 skiple;
+	uint16_t skiple;
 		/* skip length */
-		uint_16 skipl;
+		uint16_t skipl;
 
 	//Removed Feb 2000 -ah
+	//added Jul 2000 ++dent
 	/* channel mantissas */
-	//uint_16 chmant[5][256];
+	uint16_t chmant[5][256];
 
 	/* coupling mantissas */
-	uint_16 cplmant[256];
+//	uint16_t cplmant[256];
+
+	//Added Jun 2000 -MaXX
+	/* coupling floats */
+	float cpl_flt[ 256 ];
 
 	//Removed Feb 2000 -ah
+	//added Jul 2000 ++dent
 	/* coupling mantissas */
-	//uint_16 lfemant[7];
+	uint16_t lfemant[7];
 
 
 	/*  -- Information not in the bitstream, but derived thereof  -- */
 
 	/* Number of coupling sub-bands */
-	uint_16 ncplsubnd;
+	uint16_t ncplsubnd;
 
 	/* Number of combined coupling sub-bands
 	 * Derived from ncplsubnd and cplbndstrc */
-	uint_16 ncplbnd;
+	uint16_t ncplbnd;
 
 	/* Number of exponent groups by channel
 	 * Derived from strmant, endmant */
-	uint_16 nchgrps[5];
+	uint16_t nchgrps[5];
 
 	/* Number of coupling exponent groups
 	 * Derived from cplbegf, cplendf, cplexpstr */
-	uint_16 ncplgrps;
+	uint16_t ncplgrps;
 			
 	/* End mantissa numbers of fbw channels */
-	uint_16 endmant[5];
+	uint16_t endmant[5];
 
 	/* Start and end mantissa numbers for the coupling channel */
-	uint_16 cplstrtmant;
-	uint_16 cplendmant;
+	uint16_t cplstrtmant;
+	uint16_t cplendmant;
 
 	/* Decoded exponent info */
-	uint_16 fbw_exp[5][256];
-	uint_16 cpl_exp[256];
-	uint_16 lfe_exp[7];
+	uint16_t fbw_exp[5][256];
+	uint16_t cpl_exp[256];
+	uint16_t lfe_exp[7];
 
 	/* Bit allocation pointer results */
-	uint_16 fbw_bap[5][256];
-	uint_16 cpl_bap[256];
-	uint_16 lfe_bap[7];
+	uint16_t fbw_bap[5][256];
+	uint16_t cpl_bap[256];
+	uint16_t lfe_bap[7];
 	
-	uint_32	magic3;
+	uint32_t	magic3;
 } audblk_t;
 
 
diff --git a/ac3dec/bit_allocate.c b/ac3dec/bit_allocate.c
index 053e09cd0..008743402 100644
--- a/ac3dec/bit_allocate.c
+++ b/ac3dec/bit_allocate.c
@@ -28,46 +28,46 @@
 
 
 
-static inline sint_16 logadd(sint_16 a,sint_16  b);
-static sint_16 calc_lowcomp(sint_16 a,sint_16 b0,sint_16 b1,sint_16 bin);
-static inline uint_16 min(sint_16 a,sint_16 b);
-static inline uint_16 max(sint_16 a,sint_16 b);
-static void ba_compute_psd(sint_16 start, sint_16 end, sint_16 exps[], 
-		sint_16 psd[], sint_16 bndpsd[]);
-
-static void ba_compute_excitation(sint_16 start, sint_16 end,sint_16 fgain,
-		sint_16 fastleak, sint_16 slowleak, sint_16 is_lfe, sint_16 bndpsd[],
-		sint_16 excite[]);
-static void ba_compute_mask(sint_16 start, sint_16 end, uint_16 fscod,
-		uint_16 deltbae, uint_16 deltnseg, uint_16 deltoffst[], uint_16 deltba[],
-		uint_16 deltlen[], sint_16 excite[], sint_16 mask[]);
-static void ba_compute_bap(sint_16 start, sint_16 end, sint_16 snroffset,
-		sint_16 psd[], sint_16 mask[], sint_16 bap[]);
+static inline int16_t logadd(int16_t a,int16_t  b);
+static int16_t calc_lowcomp(int16_t a,int16_t b0,int16_t b1,int16_t bin);
+static inline uint16_t min(int16_t a,int16_t b);
+static inline uint16_t max(int16_t a,int16_t b);
+static void ba_compute_psd(int16_t start, int16_t end, int16_t exps[], 
+		int16_t psd[], int16_t bndpsd[]);
+
+static void ba_compute_excitation(int16_t start, int16_t end,int16_t fgain,
+		int16_t fastleak, int16_t slowleak, int16_t is_lfe, int16_t bndpsd[],
+		int16_t excite[]);
+static void ba_compute_mask(int16_t start, int16_t end, uint16_t fscod,
+		uint16_t deltbae, uint16_t deltnseg, uint16_t deltoffst[], uint16_t deltba[],
+		uint16_t deltlen[], int16_t excite[], int16_t mask[]);
+static void ba_compute_bap(int16_t start, int16_t end, int16_t snroffset,
+		int16_t psd[], int16_t mask[], int16_t bap[]);
 
 /* Misc LUTs for bit allocation process */
 
-static sint_16 slowdec[]  = { 0x0f,  0x11,  0x13,  0x15  };
-static sint_16 fastdec[]  = { 0x3f,  0x53,  0x67,  0x7b  };
-static sint_16 slowgain[] = { 0x540, 0x4d8, 0x478, 0x410 };
-static sint_16 dbpbtab[]  = { 0x000, 0x700, 0x900, 0xb00 };
+static int16_t slowdec[]  = { 0x0f,  0x11,  0x13,  0x15  };
+static int16_t fastdec[]  = { 0x3f,  0x53,  0x67,  0x7b  };
+static int16_t slowgain[] = { 0x540, 0x4d8, 0x478, 0x410 };
+static int16_t dbpbtab[]  = { 0x000, 0x700, 0x900, 0xb00 };
 
-static uint_16 floortab[] = { 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800 };
-static sint_16 fastgain[] = { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400  };
+static uint16_t floortab[] = { 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800 };
+static int16_t fastgain[] = { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400  };
 
 
-static sint_16 bndtab[] = {  0,  1,  2,   3,   4,   5,   6,   7,   8,   9, 
+static int16_t bndtab[] = {  0,  1,  2,   3,   4,   5,   6,   7,   8,   9, 
                      10, 11, 12,  13,  14,  15,  16,  17,  18,  19,
                      20, 21, 22,  23,  24,  25,  26,  27,  28,  31,
                      34, 37, 40,  43,  46,  49,  55,  61,  67,  73,
                      79, 85, 97, 109, 121, 133, 157, 181, 205, 229 };
 
-static sint_16 bndsz[]  = { 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+static int16_t bndsz[]  = { 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
                      1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
                      1,  1,  1,  1,  1,  1,  1,  1,  3,  3,
                      3,  3,  3,  3,  3,  6,  6,  6,  6,  6,
                      6, 12, 12, 12, 12, 24, 24, 24, 24, 24 };
 
-static sint_16 masktab[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+static int16_t masktab[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
                      16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 28, 28, 29,
                      29, 29, 30, 30, 30, 31, 31, 31, 32, 32, 32, 33, 33, 33, 34, 34,
                      34, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 37, 37, 37,
@@ -85,7 +85,7 @@ static sint_16 masktab[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12,
                      49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  0,  0,  0 };
 
 
-static sint_16 latab[] = { 0x0040, 0x003f, 0x003e, 0x003d, 0x003c, 0x003b, 0x003a, 0x0039,
+static int16_t latab[] = { 0x0040, 0x003f, 0x003e, 0x003d, 0x003c, 0x003b, 0x003a, 0x0039,
                     0x0038, 0x0037, 0x0036, 0x0035, 0x0034, 0x0034, 0x0033, 0x0032,
                     0x0031, 0x0030, 0x002f, 0x002f, 0x002e, 0x002d, 0x002c, 0x002c,
                     0x002b, 0x002a, 0x0029, 0x0029, 0x0028, 0x0027, 0x0026, 0x0026,
@@ -119,7 +119,7 @@ static sint_16 latab[] = { 0x0040, 0x003f, 0x003e, 0x003d, 0x003c, 0x003b, 0x003
                     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
                     0x0000, 0x0000, 0x0000, 0x0000};
 
-static sint_16 hth[][50] = {{ 0x04d0, 0x04d0, 0x0440, 0x0400, 0x03e0, 0x03c0, 0x03b0, 0x03b0,  
+static int16_t hth[][50] = {{ 0x04d0, 0x04d0, 0x0440, 0x0400, 0x03e0, 0x03c0, 0x03b0, 0x03b0,  
                       0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 0x0390,  
                       0x0380, 0x0380, 0x0370, 0x0370, 0x0360, 0x0360, 0x0350, 0x0350,  
                       0x0340, 0x0340, 0x0330, 0x0320, 0x0310, 0x0300, 0x02f0, 0x02f0,
@@ -144,38 +144,50 @@ static sint_16 hth[][50] = {{ 0x04d0, 0x04d0, 0x0440, 0x0400, 0x03e0, 0x03c0, 0x
                       0x0450, 0x04e0 }};
 
 
-static sint_16 baptab[] = { 0,  1,  1,  1,  1,  1,  2,  2,  3,  3,  3,  4,  4,  5,  5,  6,
+static int16_t baptab[] = { 0,  1,  1,  1,  1,  1,  2,  2,  3,  3,  3,  4,  4,  5,  5,  6,
                      6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10, 
                      10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14,
                      14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15 };
 
-static sint_16 sdecay;
-static sint_16 fdecay;
-static sint_16 sgain;
-static sint_16 dbknee;
-static sint_16 floor;
-static sint_16 psd[256];
-static sint_16 bndpsd[256];
-static sint_16 excite[256];
-static sint_16 mask[256];
-
-static inline uint_16
-max(sint_16 a,sint_16 b)
+static int16_t sdecay;
+static int16_t fdecay;
+static int16_t sgain;
+static int16_t dbknee;
+static int16_t floor;
+static int16_t psd[256];
+static int16_t bndpsd[256];
+static int16_t excite[256];
+static int16_t mask[256];
+
+
+/**
+ *
+ **/
+
+static inline uint16_t max(int16_t a,int16_t b)
 {
 	return (a > b ? a : b);
 }
+
+
+/**
+ *
+ **/
 	
-static inline uint_16
-min(sint_16 a,sint_16 b)
+static inline uint16_t min(int16_t a,int16_t b)
 {
 	return (a < b ? a : b);
 }
 
-static inline sint_16 
-logadd(sint_16 a,sint_16  b) 
+
+/**
+ *
+ **/
+
+static inline int16_t logadd(int16_t a,int16_t  b) 
 { 
-	sint_16 c;
-	sint_16 address;
+	int16_t c;
+	int16_t address;
 
 	c = a - b; 
 	address = min((abs(c) >> 1), 255); 
@@ -187,15 +199,19 @@ logadd(sint_16 a,sint_16  b)
 }
 
 
-void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk)
+/**
+ *
+ **/
+
+void bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk)
 {
-	uint_16 i;
-	sint_16 fgain;
-	sint_16 snroffset;
-	sint_16 start;
-	sint_16 end;
-	sint_16 fastleak;
-	sint_16 slowleak;
+	uint16_t i;
+	int16_t fgain;
+	int16_t snroffset;
+	int16_t start;
+	int16_t end;
+	int16_t fastleak;
+	int16_t slowleak;
 
 	/* Only perform bit_allocation if the exponents have changed or we
 	 * have new sideband information */
@@ -217,11 +233,10 @@ void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk)
 	if(!audblk->csnroffst    && !audblk->fsnroffst[0] && 
 		 !audblk->fsnroffst[1] && !audblk->fsnroffst[2] && 
 		 !audblk->fsnroffst[3] && !audblk->fsnroffst[4] &&
-		 !audblk->cplfsnroffst && !audblk->lfefsnroffst)
-	{
-		memset(audblk->fbw_bap,0,sizeof(uint_16) * 256 * 5);
-		memset(audblk->cpl_bap,0,sizeof(uint_16) * 256);
-		memset(audblk->lfe_bap,0,sizeof(uint_16) * 7);
+		 !audblk->cplfsnroffst && !audblk->lfefsnroffst) {
+		memset(audblk->fbw_bap,0,sizeof(uint16_t) * 256 * 5);
+		memset(audblk->cpl_bap,0,sizeof(uint16_t) * 256);
+		memset(audblk->lfe_bap,0,sizeof(uint16_t) * 7);
 		return;
 	}
 		 
@@ -245,8 +260,7 @@ void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk)
 		ba_compute_bap(start, end, snroffset, psd, mask, audblk->fbw_bap[i]);
 	}
 
-	if(audblk->cplinu)
-	{
+	if(audblk->cplinu) {
 		start = audblk->cplstrtmant; 
 		end = audblk->cplendmant; 
 		fgain = fastgain[audblk->cplfgaincod];
@@ -264,8 +278,7 @@ void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk)
 		ba_compute_bap(start, end, snroffset, psd, mask, audblk->cpl_bap);
 	}
 
-	if(bsi->lfeon)
-	{
+	if(bsi->lfeon) {
 		start = 0;
 		end = 7;
 		fgain = fastgain[audblk->lfefgaincod];
@@ -285,15 +298,18 @@ void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk)
 }
 
 
-static void ba_compute_psd(sint_16 start, sint_16 end, sint_16 exps[], 
-		sint_16 psd[], sint_16 bndpsd[])
+/**
+ *
+ **/
+
+static void ba_compute_psd(int16_t start, int16_t end, int16_t exps[], 
+		int16_t psd[], int16_t bndpsd[])
 {
 	int bin,i,j,k;
-	sint_16 lastbin = 0;
+	int16_t lastbin = 0;
 	
 	/* Map the exponents into dBs */
-	for (bin=start; bin<end; bin++) 
-	{ 
+	for (bin=start; bin<end; bin++) { 
 		psd[bin] = (3072 - (exps[bin] << 7)); 
 	}
 
@@ -301,14 +317,12 @@ static void ba_compute_psd(sint_16 start, sint_16 end, sint_16 exps[],
 	j = start; 
 	k = masktab[start]; 
 	
-	do 
-	{ 
+	do { 
 		lastbin = min(bndtab[k] + bndsz[k], end); 
 		bndpsd[k] = psd[j]; 
 		j++; 
 
-		for (i = j; i < lastbin; i++) 
-		{ 
+		for (i = j; i < lastbin; i++) { 
 			bndpsd[k] = logadd(bndpsd[k], psd[j]);
 			j++; 
 		} 
@@ -317,49 +331,49 @@ static void ba_compute_psd(sint_16 start, sint_16 end, sint_16 exps[],
 	} while (end > lastbin);
 }
 
-static void ba_compute_excitation(sint_16 start, sint_16 end,sint_16 fgain,
-		sint_16 fastleak, sint_16 slowleak, sint_16 is_lfe, sint_16 bndpsd[],
-		sint_16 excite[])
+
+/**
+ *
+ **/
+
+static void ba_compute_excitation(int16_t start, int16_t end,int16_t fgain,
+		int16_t fastleak, int16_t slowleak, int16_t is_lfe, int16_t bndpsd[],
+		int16_t excite[])
 {
 	int bin;
-	sint_16 bndstrt;
-	sint_16 bndend;
-	sint_16 lowcomp = 0;
-	sint_16 begin = 0;
+	int16_t bndstrt;
+	int16_t bndend;
+	int16_t lowcomp = 0;
+	int16_t begin = 0;
 
 	/* Compute excitation function */
 	bndstrt = masktab[start]; 
 	bndend = masktab[end - 1] + 1; 
 	
-	if (bndstrt == 0) /* For fbw and lfe channels */ 
-	{ 
+	if (bndstrt == 0) { /* For fbw and lfe channels */ 
 		lowcomp = calc_lowcomp(lowcomp, bndpsd[0], bndpsd[1], 0); 
 		excite[0] = bndpsd[0] - fgain - lowcomp; 
 		lowcomp = calc_lowcomp(lowcomp, bndpsd[1], bndpsd[2], 1);
 		excite[1] = bndpsd[1] - fgain - lowcomp; 
 		begin = 7 ; 
 		
-		/* Note: Do not call calc_lowcomp() for the last band of the lfe channel, (bin = 6) */ 
-		for (bin = 2; bin < 7; bin++) 
-		{ 
+// Note: Do not call calc_lowcomp() for the last band of the lfe channel,(bin=6)
+		for (bin = 2; bin < 7; bin++) { 
 			if (!(is_lfe && (bin == 6)))
 				lowcomp = calc_lowcomp(lowcomp, bndpsd[bin], bndpsd[bin+1], bin); 
 			fastleak = bndpsd[bin] - fgain; 
 			slowleak = bndpsd[bin] - sgain; 
 			excite[bin] = fastleak - lowcomp; 
 			
-			if (!(is_lfe && (bin == 6)))
-			{
-				if (bndpsd[bin] <= bndpsd[bin+1]) 
-				{
+			if (!(is_lfe && (bin == 6))) {
+				if (bndpsd[bin] <= bndpsd[bin+1]) {
 					begin = bin + 1 ; 
 					break; 
 				} 
 			}
 		} 
 		
-		for (bin = begin; bin < min(bndend, 22); bin++) 
-		{ 
+		for (bin = begin; bin < min(bndend, 22); bin++) { 
 			if (!(is_lfe && (bin == 6)))
 				lowcomp = calc_lowcomp(lowcomp, bndpsd[bin], bndpsd[bin+1], bin); 
 			fastleak -= fdecay ; 
@@ -371,12 +385,9 @@ static void ba_compute_excitation(sint_16 start, sint_16 end,sint_16 fgain,
 		begin = 22; 
 	} 
 	else /* For coupling channel */ 
-	{ 
 		begin = bndstrt; 
-	} 
 
-	for (bin = begin; bin < bndend; bin++) 
-	{ 
+	for (bin = begin; bin < bndend; bin++) { 
 		fastleak -= fdecay; 
 		fastleak = max(fastleak, bndpsd[bin] - fgain); 
 		slowleak -= sdecay; 
@@ -385,49 +396,47 @@ static void ba_compute_excitation(sint_16 start, sint_16 end,sint_16 fgain,
 	} 
 }
 
-static void ba_compute_mask(sint_16 start, sint_16 end, uint_16 fscod,
-		uint_16 deltbae, uint_16 deltnseg, uint_16 deltoffst[], uint_16 deltba[],
-		uint_16 deltlen[], sint_16 excite[], sint_16 mask[])
+
+/**
+ *
+ **/
+
+static void ba_compute_mask(int16_t start, int16_t end, uint16_t fscod,
+		uint16_t deltbae, uint16_t deltnseg, uint16_t deltoffst[], uint16_t deltba[],
+		uint16_t deltlen[], int16_t excite[], int16_t mask[])
 {
 	int bin,k;
-	sint_16 bndstrt;
-	sint_16 bndend;
-	sint_16 delta;
+	int16_t bndstrt;
+	int16_t bndend;
+	int16_t delta;
 
 	bndstrt = masktab[start]; 
 	bndend = masktab[end - 1] + 1; 
 
 	/* Compute the masking curve */
 
-	for (bin = bndstrt; bin < bndend; bin++) 
-	{ 
-		if (bndpsd[bin] < dbknee) 
-		{ 
+	for (bin = bndstrt; bin < bndend; bin++) { 
+		if (bndpsd[bin] < dbknee) { 
 			excite[bin] += ((dbknee - bndpsd[bin]) >> 2); 
 		} 
 		mask[bin] = max(excite[bin], hth[fscod][bin]);
 	}
 	
 	/* Perform delta bit modulation if necessary */
-	if ((deltbae == DELTA_BIT_REUSE) || (deltbae == DELTA_BIT_NEW)) 
-	{ 
-		sint_16 band = 0; 
-		sint_16 seg = 0; 
+	if ((deltbae == DELTA_BIT_REUSE) || (deltbae == DELTA_BIT_NEW)) { 
+		int16_t band = 0; 
+		int16_t seg = 0; 
 		
-		for (seg = 0; seg < deltnseg+1; seg++) 
-		{ 
+		for (seg = 0; seg < deltnseg+1; seg++) { 
 			band += deltoffst[seg]; 
-			if (deltba[seg] >= 4) 
-			{ 
+
+			if (deltba[seg] >= 4) { 
 				delta = (deltba[seg] - 3) << 7;
-			} 
-			else 
-			{ 
+			} else { 
 				delta = (deltba[seg] - 4) << 7;
 			} 
 			
-			for (k = 0; k < deltlen[seg]; k++) 
-			{ 
+			for (k = 0; k < deltlen[seg]; k++) { 
 				mask[band] += delta; 
 				band++; 
 			} 
@@ -435,19 +444,23 @@ static void ba_compute_mask(sint_16 start, sint_16 end, uint_16 fscod,
 	}
 }
 
-static void ba_compute_bap(sint_16 start, sint_16 end, sint_16 snroffset,
-		sint_16 psd[], sint_16 mask[], sint_16 bap[])
+
+/**
+ *
+ **/
+
+static void ba_compute_bap(int16_t start, int16_t end, int16_t snroffset,
+		int16_t psd[], int16_t mask[], int16_t bap[])
 {
 	int i,j,k;
-	sint_16 lastbin = 0;
-	sint_16 address = 0;
+	int16_t lastbin = 0;
+	int16_t address = 0;
 
 	/* Compute the bit allocation pointer for each bin */
 	i = start; 
 	j = masktab[start]; 
 
-	do 
-	{ 
+	do { 
 		lastbin = min(bndtab[j] + bndsz[j], end); 
 		mask[j] -= snroffset; 
 		mask[j] -= floor; 
@@ -457,8 +470,7 @@ static void ba_compute_bap(sint_16 start, sint_16 end, sint_16 snroffset,
 
 		mask[j] &= 0x1fe0;
 		mask[j] += floor; 
-		for (k = i; k < lastbin; k++) 
-		{ 
+		for (k = i; k < lastbin; k++) { 
 			address = (psd[i] - mask[j]) >> 5; 
 			address = min(63, max(0, address)); 
 			bap[i] = baptab[address]; 
@@ -468,25 +480,25 @@ static void ba_compute_bap(sint_16 start, sint_16 end, sint_16 snroffset,
 	} while (end > lastbin);
 }
 
-static sint_16 
-calc_lowcomp(sint_16 a,sint_16 b0,sint_16 b1,sint_16 bin) 
+
+/**
+ *
+ **/
+
+static int16_t calc_lowcomp (int16_t a, int16_t b0, int16_t b1, int16_t bin) 
 { 
 
-	if (bin < 7) 
-	{ 
+	if (bin < 7) { 
 		if ((b0 + 256) == b1)
 			a = 384; 
 	 	else if (b0 > b1) 
 			a = max(0, a - 64); 
-	} 
-	else if (bin < 20) 
-	{ 
+	} else if (bin < 20) { 
 		if ((b0 + 256) == b1) 
 			a = 320; 
 		else if (b0 > b1) 
 			a = max(0, a - 64) ; 
-	}
-	else  
+	} else  
 		a = max(0, a - 128); 
 	
 	return(a);
diff --git a/ac3dec/bit_allocate.h b/ac3dec/bit_allocate.h
index e48b0b2bb..a6a3c7703 100644
--- a/ac3dec/bit_allocate.h
+++ b/ac3dec/bit_allocate.h
@@ -21,4 +21,4 @@
  *
  */
 
-void bit_allocate(uint_16 fscod, bsi_t *bsi, audblk_t *audblk);
+void bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/bitstream.c b/ac3dec/bitstream.c
index 296d5ee3d..f48d2408a 100644
--- a/ac3dec/bitstream.c
+++ b/ac3dec/bitstream.c
@@ -23,54 +23,57 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <inttypes.h>
+
+#include <bswap.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "ac3.h"
 #include "ac3_internal.h"
 #include "bitstream.h"
 
 
-uint_8 *buffer_start = 0;
-uint_32 bits_left = 0;
-uint_32 current_word;
+uint32_t bits_left = 0;
+uint64_t current_word;
+uint64_t *buffer_start = 0;
+
+
+static inline uint64_t getdword (void)
+{
+	return be2me_64 (*buffer_start++);
+}
+
 
-static inline void
-bitstream_fill_current()
+static inline void bitstream_fill_current (void)
 {
-	current_word = *((uint_32*)buffer_start)++;
-	current_word = swab32(current_word);
+	//current_word = bswap_64 (*buffer_start++);
+	current_word = getdword ();
 }
 
-//
-// The fast paths for _get is in the
-// bitstream.h header file so it can be inlined.
-//
-// The "bottom half" of this routine is suffixed _bh
-//
-// -ah
-//
-
-uint_32
-bitstream_get_bh(uint_32 num_bits)
+
+uint32_t bitstream_get_bh (uint32_t num_bits)
 {
-	uint_32 result;
+	uint32_t result;
 
 	num_bits -= bits_left;
-	result = (current_word << (32 - bits_left)) >> (32 - bits_left);
+	result = (current_word << (64 - bits_left)) >> (64 - bits_left);
 
 	bitstream_fill_current();
 
 	if(num_bits != 0)
-		result = (result << num_bits) | (current_word >> (32 - num_bits));
+		result = (result << num_bits) | (current_word >> (64 - num_bits));
 	
-	bits_left = 32 - num_bits;
+	bits_left = 64 - num_bits;
 
 	return result;
 }
 
-void
-bitstream_init(uint_8 *start)
+
+void bitstream_init (uint8_t *start)
 {
 	//initialize the start of the buffer
-	buffer_start = start;
+	buffer_start = (uint64_t *) start;
 	bits_left = 0;
 }
diff --git a/ac3dec/bitstream.h b/ac3dec/bitstream.h
index 335193064..f34726a77 100644
--- a/ac3dec/bitstream.h
+++ b/ac3dec/bitstream.h
@@ -21,56 +21,24 @@
  *
  */
 
-//My new and improved vego-matic endian swapping routine
-//(stolen from the kernel)
-#ifdef WORDS_BIGENDIAN
 
-#	define swab32(x) (x)
+#include <inttypes.h>
 
-#else
+extern uint32_t bits_left;
+extern uint64_t current_word;
 
-#	if defined (__i386__)
+void bitstream_init(uint8_t *start);
+inline uint32_t bitstream_get_bh(uint32_t num_bits);
 
-#	define swab32(x) __i386_swab32(x)
-	static inline const uint_32 __i386_swab32(uint_32 x)
-	{
-		__asm__("bswap %0" : "=r" (x) : "0" (x));
-		return x;
-	}
-
-#	else
-
-#	define swab32(x)\
-((((uint_8*)&x)[0] << 24) | (((uint_8*)&x)[1] << 16) |  \
- (((uint_8*)&x)[2] << 8)  | (((uint_8*)&x)[3]))
-
-#	endif
-#endif
-
-extern uint_32 bits_left;
-extern uint_32 current_word;
-
-void bitstream_init(uint_8 *start);
-
-uint_8 bitstream_get_byte(void);
-
-uint_8 *bitstream_get_buffer_start(void);
-void bitstream_buffer_frame(uint_32 frame_size);
-
-uint_32 bitstream_get_bh(uint_32 num_bits);
-
-static inline uint_32 
-bitstream_get(uint_32 num_bits)
+static inline uint32_t bitstream_get (uint32_t num_bits)
 {
-	uint_32 result;
-	
-	if(num_bits < bits_left)
-	{
-		result = (current_word << (32 - bits_left)) >> (32 - num_bits);
+	uint32_t result;
+
+	if (num_bits < bits_left) {
+		result = (current_word << (64 - bits_left)) >> (64 - num_bits);
 		bits_left -= num_bits;
 		return result;
 	}
 
-	return bitstream_get_bh(num_bits);
+	return bitstream_get_bh (num_bits);
 }
-
diff --git a/ac3dec/bswap.h b/ac3dec/bswap.h
new file mode 100644
index 000000000..73d398aa1
--- /dev/null
+++ b/ac3dec/bswap.h
@@ -0,0 +1,80 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __BSWAP_H__
+#define __BSWAP_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_BYTESWAP_H
+#include <byteswap.h>
+#else
+
+#include <inttypes.h>
+
+#ifdef WORDS_BIGENDIAN
+// FIXME these need to actually swap ;)
+#define bswap_16(x) (x)
+#define bswap_32(x) (x)
+#define bswap_64(x) (x)
+#else
+// This is wrong, 'cannot take address of ...'
+#define bswap_16(x) ((((uint8_t*)&x)[2] << 8) \
+			| (((uint8_t*)&x)[3]))
+
+// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
+#define bswap_32(x) \
+     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+
+#define bswap_64(x) \
+     (__extension__						\
+      ({ union { __extension__ unsigned long long int __ll;	\
+                 unsigned long int __l[2]; } __w, __r;		\
+         __w.__ll = (x);					\
+         __r.__l[0] = bswap_32 (__w.__l[1]);			\
+         __r.__l[1] = bswap_32 (__w.__l[0]);			\
+         __r.__ll; }))
+#endif
+
+#endif
+
+// be2me ... BigEndian to MachineEndian
+// le2me ... LittleEndian to MachineEndian
+
+#ifdef WORDS_BIGENDIAN
+#define be2me_16(x) (x)
+#define be2me_32(x) (x)
+#define be2me_64(x) (x)
+#define le2me_16(x) bswap_16(x)
+#define le2me_32(x) bswap_32(x)
+#define le2me_64(x) bswap_64(x)
+#else
+#define be2me_16(x) bswap_16(x)
+#define be2me_32(x) bswap_32(x)
+#define be2me_64(x) bswap_64(x)
+#define le2me_16(x) (x)
+#define le2me_32(x) (x)
+#define le2me_64(x) (x)
+#endif
+
+#endif
diff --git a/ac3dec/cmplx.h b/ac3dec/cmplx.h
new file mode 100644
index 000000000..9f74721ec
--- /dev/null
+++ b/ac3dec/cmplx.h
@@ -0,0 +1,29 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __COMPLEX_H__
+#define __COMPLEX_H__
+
+typedef struct complex {
+	float re;
+	float im;
+} complex_t;
+
+#endif
diff --git a/ac3dec/coeff.c b/ac3dec/coeff.c
index b9f03ff65..7d5579cae 100644
--- a/ac3dec/coeff.c
+++ b/ac3dec/coeff.c
@@ -28,51 +28,183 @@
 #include "ac3_internal.h"
 
 
-#include "decode.h"
 #include "bitstream.h"
 #include "dither.h"
 #include "coeff.h"
 
+
 //
 //Lookup tables of 0.15 two's complement quantization values
 //
-static const uint_16 q_1[3] = 
+#define Q0 ((-2 << 15) / 3.0)
+#define Q1 (0)
+#define Q2 ((2 << 15) / 3.0)
+
+static const float q_1_0[ 32 ] =
 {
-	( -2 << 15)/3, 0,(  2 << 15)/3 
-};
+	Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,
+	Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,
+	Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,
+	0,0,0,0,0
+};                                                                              
 
-static const uint_16 q_2[5] = 
+static const float q_1_1[ 32 ] =
 {
-	( -4 << 15)/5,( -2 << 15)/5, 0,
-	(  2 << 15)/5,(  4 << 15)/5
-};
+	Q0,Q0,Q0,Q1,Q1,Q1,Q2,Q2,Q2,
+	Q0,Q0,Q0,Q1,Q1,Q1,Q2,Q2,Q2,
+	Q0,Q0,Q0,Q1,Q1,Q1,Q2,Q2,Q2,
+	0,0,0,0,0
+};                                                                              
 
-static const uint_16 q_3[7] = 
+static const float q_1_2[ 32 ] =
+{
+	Q0,Q1,Q2,Q0,Q1,Q2,Q0,Q1,Q2,
+	Q0,Q1,Q2,Q0,Q1,Q2,Q0,Q1,Q2,
+	Q0,Q1,Q2,Q0,Q1,Q2,Q0,Q1,Q2,
+	0,0,0,0,0
+};                                                                              
+
+#undef Q0
+#undef Q1
+#undef Q2
+
+#define Q0 ((-4 << 15) / 5.0)
+#define Q1 ((-2 << 15) / 5.0)
+#define Q2 (0)
+#define Q3 ((2 << 15) / 5.0)
+#define Q4 ((4 << 15) / 5.0)
+
+static const float q_2_0[ 128 ] =
+{
+	Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,
+	Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,
+	Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,
+	Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,
+	Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,
+	Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,
+	Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,
+	Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,
+	Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,
+	Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,
+	0,0,0
+};                                                                              
+
+static const float q_2_1[ 128 ] =
+{
+	Q0,Q0,Q0,Q0,Q0,Q1,Q1,Q1,Q1,Q1,
+	Q2,Q2,Q2,Q2,Q2,Q3,Q3,Q3,Q3,Q3,
+	Q4,Q4,Q4,Q4,Q4,Q0,Q0,Q0,Q0,Q0,
+	Q1,Q1,Q1,Q1,Q1,Q2,Q2,Q2,Q2,Q2,
+	Q3,Q3,Q3,Q3,Q3,Q4,Q4,Q4,Q4,Q4,
+	Q0,Q0,Q0,Q0,Q0,Q1,Q1,Q1,Q1,Q1,
+	Q2,Q2,Q2,Q2,Q2,Q3,Q3,Q3,Q3,Q3,
+	Q4,Q4,Q4,Q4,Q4,Q0,Q0,Q0,Q0,Q0,
+	Q1,Q1,Q1,Q1,Q1,Q2,Q2,Q2,Q2,Q2,
+	Q3,Q3,Q3,Q3,Q3,Q4,Q4,Q4,Q4,Q4,
+	Q0,Q0,Q0,Q0,Q0,Q1,Q1,Q1,Q1,Q1,
+	Q2,Q2,Q2,Q2,Q2,Q3,Q3,Q3,Q3,Q3,
+	Q4,Q4,Q4,Q4,Q4,0,0,0
+ };
+
+static const float q_2_2[ 128 ] =
+ {
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
+	Q0,Q1,Q2,Q3,Q4,0,0,0
+};                                                                              
+
+#undef Q0
+#undef Q1
+#undef Q2
+#undef Q3
+#undef Q4                                                                      
+
+static const float q_3[7] =
 {
-	( -6 << 15)/7,( -4 << 15)/7,( -2 << 15)/7, 0,
-	(  2 << 15)/7,(  4 << 15)/7,(  6 << 15)/7
+	(-6 << 15)/7.0, (-4 << 15)/7.0, (-2 << 15)/7.0, 0.0,
+	( 2 << 15)/7.0, ( 4 << 15)/7.0, ( 6 << 15)/7.0
 };
 
-static const uint_16 q_4[11] = 
+#define Q0 ((-10 << 15) / 11.0)
+#define Q1 ((-8 << 15) / 11.0)
+#define Q2 ((-6 << 15) / 11.0)
+#define Q3 ((-4 << 15) / 11.0)
+#define Q4 ((-2 << 15) / 11.0)
+#define Q5 (0)
+#define Q6 ((2 << 15) / 11.0)
+#define Q7 ((4 << 15) / 11.0)
+#define Q8 ((6 << 15) / 11.0)
+#define Q9 ((8 << 15) / 11.0)
+#define QA ((10 << 15) / 11.0)
+
+static const float q_4_0[ 128 ] =
 {
-	(-10 << 15)/11,(-8 << 15)/11,(-6 << 15)/11, ( -4 << 15)/11,(-2 << 15)/11,  0,
-	(  2 << 15)/11,( 4 << 15)/11,( 6 << 15)/11, (  8 << 15)/11,(10 << 15)/11
+	Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0,
+	Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1,
+	Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2,
+	Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3,
+	Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4,
+	Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5,
+	Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6,
+	Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7,
+	Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8,
+	Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9,
+	QA, QA, QA, QA, QA, QA, QA, QA, QA, QA, QA,
+	 0,  0,  0,  0,  0,  0,  0
+ };
+
+static const float q_4_1[ 128 ] =
+{
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
+	 0,  0,  0,  0,  0,  0,  0
 };
 
-static const uint_16 q_5[15] = 
+#undef Q0
+#undef Q1
+#undef Q2
+#undef Q3
+#undef Q4
+#undef Q5
+#undef Q6
+#undef Q7
+#undef Q8
+#undef Q9
+#undef QA                                                                       
+
+static const float q_5[15] =
 {
-	(-14 << 15)/15,(-12 << 15)/15,(-10 << 15)/15,
-	( -8 << 15)/15,( -6 << 15)/15,( -4 << 15)/15,
-	( -2 << 15)/15,   0          ,(  2 << 15)/15,
-	(  4 << 15)/15,(  6 << 15)/15,(  8 << 15)/15,
-	( 10 << 15)/15,( 12 << 15)/15,( 14 << 15)/15
-};
+	(-14 << 15)/15.0,(-12 << 15)/15.0,(-10 << 15)/15.0,
+	( -8 << 15)/15.0,( -6 << 15)/15.0,( -4 << 15)/15.0,
+	( -2 << 15)/15.0,   0.0          ,(  2 << 15)/15.0,
+	(  4 << 15)/15.0,(  6 << 15)/15.0,(  8 << 15)/15.0,
+	( 10 << 15)/15.0,( 12 << 15)/15.0,( 14 << 15)/15.0
+};                                                                              
 
 //
 // Scale factors for convert_to_float
 //
 
-static const uint_32 u32_scale_factors[25] = 
+static const uint32_t u32_scale_factors[25] = 
 {
 	0x38000000, //2 ^ -(0 + 15)
 	0x37800000, //2 ^ -(1 + 15)
@@ -104,230 +236,179 @@ static const uint_32 u32_scale_factors[25] =
 static float *scale_factor = (float*)u32_scale_factors;
 
 //These store the persistent state of the packed mantissas
-static uint_16 m_1[3];
-static uint_16 m_2[3];
-static uint_16 m_4[2];
-static uint_16 m_1_pointer;
-static uint_16 m_2_pointer;
-static uint_16 m_4_pointer;
+static float q_1[2];
+static float q_2[2];
+static float q_4[1];
+static int32_t q_1_pointer;
+static int32_t q_2_pointer;
+static int32_t q_4_pointer;
+static float __inline__
+coeff_get_float(uint16_t bap, uint16_t dithflag, uint16_t exp);
 
 //Conversion from bap to number of bits in the mantissas
 //zeros account for cases 0,1,2,4 which are special cased
-static uint_16 qnttztab[16] = { 0, 0, 0, 3, 0 , 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16};
-
-static void    coeff_reset(void);
-static sint_16 coeff_get_mantissa(uint_16 bap, uint_16 dithflag);
-static void    coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint_32 ch);
-
-//
-// Convert a 0.15 fixed point number into IEEE single
-// precision floating point and scale by 2^-exp
-//
-static inline float
-convert_to_float(uint_16 exp, sint_16 mantissa)
+static uint16_t qnttztab[16] =
 {
-	float x;
-
-	//the scale by 2^-15 is built into the scale factor table
-	x = mantissa * scale_factor[exp];
+	 0,  0,  0,  3,
+	 0,  4,  5,  6,
+	 7,  8,  9, 10,
+	11, 12, 14, 16
+};
 
-	return x;
-}
+static void	coeff_reset(void);
+static float	coeff_get_float(uint16_t bap, uint16_t dithflag, uint16_t exp);
+static void	coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint32_t ch);
 
-void
-coeff_unpack(bsi_t *bsi, audblk_t *audblk, stream_samples_t samples)
+void coeff_unpack(bsi_t *bsi, audblk_t *audblk, stream_samples_t samples)
 {
-	uint_16 i,j;
-	uint_32 done_cpl = 0;
-	sint_16 mantissa;
+	uint16_t i,j;
+	uint32_t done_cpl = 0;
 
 	coeff_reset();
 
-	for(i=0; i< bsi->nfchans; i++)
-	{
+	for(i=0; i< bsi->nfchans; i++) {
 		for(j=0; j < audblk->endmant[i]; j++)
-		{
-			mantissa = coeff_get_mantissa(audblk->fbw_bap[i][j],audblk->dithflag[i]);
-			samples[i][j] = convert_to_float(audblk->fbw_exp[i][j],mantissa);
-		}
+			samples[i][j] = coeff_get_float(audblk->fbw_bap[i][j], audblk->dithflag[i], audblk->fbw_exp[i][j]);
 
-		if(audblk->cplinu && audblk->chincpl[i] && !(done_cpl))
-		{
+		if(audblk->cplinu && audblk->chincpl[i] && !(done_cpl)) {
 			// ncplmant is equal to 12 * ncplsubnd
-			// Don't dither coupling channel until channel separation so that
-			// interchannel noise is uncorrelated 
+			// Don't dither coupling channel until channel
+			// separation so that interchannel noise is uncorrelated 
 			for(j=audblk->cplstrtmant; j < audblk->cplendmant; j++)
-				audblk->cplmant[j] = coeff_get_mantissa(audblk->cpl_bap[j],0);
+				audblk->cpl_flt[j] = coeff_get_float(audblk->cpl_bap[j],0, audblk->cpl_exp[j]);
 			done_cpl = 1;
 		}
 	}
 
 	//uncouple the channel if necessary
-	if(audblk->cplinu)
-	{
-		for(i=0; i< bsi->nfchans; i++)
-		{
+	if(audblk->cplinu) {
+		for(i=0; i< bsi->nfchans; i++) {
 			if(audblk->chincpl[i])
 				coeff_uncouple_ch(samples[i],bsi,audblk,i);
 		}
 
 	}
 
-	if(bsi->lfeon)
-	{
+	if(bsi->lfeon) {
 		// There are always 7 mantissas for lfe, no dither for lfe 
 		for(j=0; j < 7 ; j++)
-		{
-			mantissa = coeff_get_mantissa(audblk->lfe_bap[j],0);
-			samples[5][j] = convert_to_float(audblk->lfe_exp[j],mantissa);
-		}
+			samples[5][j] = coeff_get_float(audblk->lfe_bap[j], 0, audblk->lfe_exp[j]);
 	}
 }
 
-//
-//Fetch a mantissa from the bitstream
-//
-//The mantissa returned is a signed 0.15 fixed point number
-//
-static sint_16
-coeff_get_mantissa(uint_16 bap, uint_16 dithflag)
+
+/**
+ * Fetch a float from the bitstream
+ **/
+
+static float inline coeff_get_float (uint16_t bap, uint16_t dithflag, uint16_t exp)
 {
-	uint_16 mantissa;
-	uint_16 group_code;
+	uint16_t dummy = 0;
 
 	//If the bap is 0-5 then we have special cases to take care of
-	switch(bap)
-	{
+	switch(bap) {
 		case 0:
 			if(dithflag)
-				mantissa = dither_gen();
-			else
-				mantissa = 0;
-			break;
+				return (dither_gen() * scale_factor[exp]);
+
+			return 0.0;
 
 		case 1:
-			if(m_1_pointer > 2)
-			{
-				group_code = bitstream_get(5);
-
-				if(group_code > 26)
-					goto error;
-
-				m_1[0] = group_code / 9; 
-				m_1[1] = (group_code % 9) / 3; 
-				m_1[2] = (group_code % 9) % 3; 
-				m_1_pointer = 0;
-			}
-			mantissa = m_1[m_1_pointer++];
-			mantissa = q_1[mantissa];
-			break;
+			if (q_1_pointer >= 0)
+				return(q_1[q_1_pointer--] * scale_factor[exp]);
+
+			if ((dummy = bitstream_get (5)) > 26)
+				goto error;
+
+			q_1[1] = q_1_1[dummy];
+			q_1[0] = q_1_2[dummy];
+			q_1_pointer = 1;
+
+			return (q_1_0[dummy] * scale_factor[exp]);
+
 		case 2:
+			if(q_2_pointer >= 0)
+				return (q_2[q_2_pointer--] * scale_factor[exp]);
 
-			if(m_2_pointer > 2)
-			{
-				group_code = bitstream_get(7);
+			if ((dummy = bitstream_get (7)) > 124)
+				goto error;
 
-				if(group_code > 124)
-					goto error;
+			q_2[1] = q_2_1[dummy];
+			q_2[0] = q_2_2[dummy];
+			q_2_pointer = 1;
 
-				m_2[0] = group_code / 25;
-				m_2[1] = (group_code % 25) / 5 ;
-				m_2[2] = (group_code % 25) % 5 ; 
-				m_2_pointer = 0;
-			}
-			mantissa = m_2[m_2_pointer++];
-			mantissa = q_2[mantissa];
-			break;
+			return (q_2_0[dummy] * scale_factor[exp]);
 
 		case 3:
-			mantissa = bitstream_get(3);
-
-			if(mantissa > 6)
+			if ((dummy = bitstream_get (3)) > 6)
 				goto error;
 
-			mantissa = q_3[mantissa];
-			break;
+			return (q_3[dummy] * scale_factor[exp]);
 
 		case 4:
-			if(m_4_pointer > 1)
-			{
-				group_code = bitstream_get(7);
+			if(q_4_pointer >= 0)
+				return (q_4[q_4_pointer--] * scale_factor[exp]);
 
-				if(group_code > 120)
-					goto error;
+			if ((dummy = bitstream_get (7)) > 120)
+				goto error;
 
-				m_4[0] = group_code / 11;
-				m_4[1] = group_code % 11;
-				m_4_pointer = 0;
-			}
-			mantissa = m_4[m_4_pointer++];
-			mantissa = q_4[mantissa];
-			break;
+			q_4[0] = q_4_1[dummy];
+			q_4_pointer = 0;
 
-		case 5:
-			mantissa = bitstream_get(4);
+			return (q_4_0[dummy] * scale_factor[exp]);  
 
-			if(mantissa > 14)
+		case 5:
+			if ((dummy = bitstream_get (4)) > 14)
 				goto error;
 
-			mantissa = q_5[mantissa];
-			break;
+			return (q_5[dummy] * scale_factor[exp]);
 
 		default:
-			mantissa = bitstream_get(qnttztab[bap]);
-			mantissa <<= 16 - qnttztab[bap];
+			dummy = bitstream_get(qnttztab[bap]);
+			dummy <<= 16 - qnttztab[bap];
+			return ((int16_t)dummy * scale_factor[exp]);  
 	}
 
-	return mantissa;
-
-
-
 error:
-	if(!error_flag)
-		fprintf(stderr,"** Invalid mantissa - skipping frame **\n");
-	error_flag = 1;
-
-	return 0;
+#ifdef DEBUG
+	fprintf(stderr,"** Invalid mantissa - skipping frame **\n");
+#endif
+	HANDLE_ERROR();
 }
 
-//
-// Reset the mantissa state
-//
-static void 
-coeff_reset(void)
+
+/**
+ * Reset the mantissa state
+ **/
+
+static void coeff_reset(void)
 {
-	m_1[2] = m_1[1] = m_1[0] = 0;
-	m_2[2] = m_2[1] = m_2[0] = 0;
-	m_4[1] = m_4[0] = 0;
-	m_1_pointer = m_2_pointer = m_4_pointer = 3;
+	q_1_pointer = q_2_pointer = q_4_pointer = -1;
 }
 
-//
-// Uncouple the coupling channel into a fbw channel
-//
-static void
-coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint_32 ch)
+
+/**
+ * Uncouple the coupling channel into a fbw channel
+ **/
+
+static void coeff_uncouple_ch (float samples[],bsi_t *bsi,audblk_t *audblk,uint32_t ch)
 {
-	uint_32 bnd = 0;
-	uint_32 sub_bnd = 0;
-	uint_32 i,j;
+	uint32_t bnd = 0;
+	uint32_t sub_bnd = 0;
+	uint32_t i,j;
 	float cpl_coord = 1.0;
-	uint_32 cpl_exp_tmp;
-	uint_32 cpl_mant_tmp;
-	sint_16 mantissa;
-
+	uint32_t cpl_exp_tmp;
+	uint32_t cpl_mant_tmp;
 
-	for(i=audblk->cplstrtmant;i<audblk->cplendmant;)
-	{
-		if(!audblk->cplbndstrc[sub_bnd++])
-		{
+	for (i=audblk->cplstrtmant;i<audblk->cplendmant;) {
+		if (!audblk->cplbndstrc[sub_bnd++]) {
 			cpl_exp_tmp = audblk->cplcoexp[ch][bnd] + 3 * audblk->mstrcplco[ch];
-			if(audblk->cplcoexp[ch][bnd] == 15)
+			if (audblk->cplcoexp[ch][bnd] == 15)
 				cpl_mant_tmp = (audblk->cplcomant[ch][bnd]) << 11;
 			else
 				cpl_mant_tmp = ((0x10) | audblk->cplcomant[ch][bnd]) << 10;
 			
-			cpl_coord = convert_to_float(cpl_exp_tmp,cpl_mant_tmp) * 8.0f;
+			cpl_coord = (cpl_mant_tmp * scale_factor[cpl_exp_tmp]) * 8.0f;
 
 			//Invert the phase for the right channel if necessary
 			if(bsi->acmod == 0x2 && audblk->phsflginu && ch == 1 && audblk->phsflg[bnd])
@@ -336,16 +417,13 @@ coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint_32 ch)
 			bnd++;
 		}
 
-		for(j=0;j < 12; j++)
-		{
-			//Get new dither values for each channel if necessary, so
-			//the channels are uncorrelated
-			if(audblk->dithflag[ch] && audblk->cpl_bap[i] == 0)
-				mantissa = dither_gen();
+		for(j=0;j < 12; j++) {
+			// Get new dither values for each channel if necessary,
+			// so the channels are uncorrelated
+			if(audblk->dithflag[ch] && !audblk->cpl_bap[i])
+				samples[i] = cpl_coord * (dither_gen() * scale_factor[audblk->cpl_exp[i]]);
 			else
-				mantissa = audblk->cplmant[i];
-
-			samples[i]  = cpl_coord * convert_to_float(audblk->cpl_exp[i],mantissa);
+				samples[i] = cpl_coord * audblk->cpl_flt[i];
 
 			i++;
 		}
diff --git a/ac3dec/cpu_accel.c b/ac3dec/cpu_accel.c
new file mode 100644
index 000000000..e01db83f6
--- /dev/null
+++ b/ac3dec/cpu_accel.c
@@ -0,0 +1,129 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#include <inttypes.h>
+#include "mm_accel.h"
+
+//#ifdef __i386__
+#if 0
+
+#ifdef __PIC__
+#define cpuid(op, eax, ebx, ecx, edx)		\
+	__asm__ __volatile__ ("pushl %%ebx\n\t"	\
+		  "cpuid\n\t"			\
+		  "movl %%ebx, %%esi\n\t"	\
+		  "popl %%ebx"			\
+		: "=a" (eax),			\
+		  "=S" (ebx),			\
+		  "=c" (ecx),			\
+		  "=d" (edx)			\
+		: "a" (op)			\
+		: "cc")
+#else
+#define cpuid(op, eax, ebx, ecx, edx)		\
+	__asm__("cpuid"				\
+		: "=a" (eax),			\
+		  "=b" (ebx),			\
+		  "=c" (ecx),			\
+		  "=d" (edx)			\
+		: "a" (op)			\
+		: "cc")
+#endif
+
+static inline int has_cpuid ()
+{
+	return 1;
+/*
+	uint32_t eax, ebx;
+
+	asm ("pushfl\n\t"
+		  "popl %0\n\t"
+		  "movl %0,%1\n\t"
+		  "xorl $0x200000,%0\n\t"
+		  "pushl %0\n\t"
+		  "popfl\n\t"
+		  "pushfl\n\t"
+		  "popl %0"
+		: "=a" (eax),
+		  "=b" (ebx)
+		:
+		: "cc");
+
+	return (eax != ebx);
+*/
+}
+
+
+static uint32_t x86_accel (void)
+{
+	uint32_t eax, ebx, ecx, edx;
+	int AMD;
+	uint32_t caps;
+
+	if (!has_cpuid ())		// no cpuid
+		return 0;
+
+	cpuid (0x00000000, eax, ebx, ecx, edx);
+	if (!eax)			// vendor string only
+		return 0;
+
+	AMD = (ebx == 0x68747541) && (ecx == 0x444d4163) && (edx == 0x69746e65);
+
+	cpuid (0x00000001, eax, ebx, ecx, edx);
+	if (! (edx & 0x00800000))	// no MMX
+		return 0;
+
+	caps = OMS_ACCEL_X86_MMX;
+	if (edx & 0x02000000)		// SSE - identical to AMD MMX extensions
+		caps = OMS_ACCEL_X86_MMX | OMS_ACCEL_X86_MMXEXT;
+
+	cpuid (0x80000000, eax, ebx, ecx, edx);
+	if (eax < 0x80000001)		// no extended capabilities
+		return caps;
+
+	cpuid (0x80000001, eax, ebx, ecx, edx);
+
+	if (edx & 0x80000000)
+		caps |= OMS_ACCEL_X86_3DNOW;
+
+	if (AMD && (edx & 0x00400000))	// AMD MMX extensions
+		caps |= OMS_ACCEL_X86_MMXEXT;
+
+	return caps;
+}
+#endif
+
+uint32_t mm_accel (void)
+{
+//#ifdef __i386__
+#if 0
+    static int got_accel = 0;
+    static uint32_t accel;
+
+    if (!got_accel) {
+	got_accel = 1;
+	accel = x86_accel ();
+    }
+
+    return accel;
+#else
+    return 0;
+#endif
+}
diff --git a/ac3dec/crc.c b/ac3dec/crc.c
index 3210ce7f8..2d5ef8065 100644
--- a/ac3dec/crc.c
+++ b/ac3dec/crc.c
@@ -30,7 +30,7 @@
 
 #include "crc.h"
 
-static const uint_16 crc_lut[256] = 
+static const uint16_t crc_lut[256] = 
 {
 	0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
 	0x8033,0x0036,0x003c,0x8039,0x0028,0x802d,0x8027,0x0022,
@@ -66,31 +66,31 @@ static const uint_16 crc_lut[256] =
 	0x8213,0x0216,0x021c,0x8219,0x0208,0x820d,0x8207,0x0202
 };
 
-static uint_16 state;
+static uint16_t state;
 
-void
-crc_init(void)
+
+void crc_init(void)
 {
 	state = 0;
 }
 
 
-inline void crc_process_byte(uint_8 data)
+inline void crc_process_byte (uint8_t data)
 {
 	state = crc_lut[data ^ (state>>8)] ^ (state<<8);
 }
 
-void
-crc_process_frame(uint_8 *data,uint_32 num_bytes)
+
+void crc_process_frame (uint8_t *data,uint32_t num_bytes)
 {
-	uint_32 i;
+	uint32_t i;
 
-	for(i=0;i<num_bytes;i++)
-		crc_process_byte(data[i]);
+	for(i=0; i<num_bytes; i++)
+		crc_process_byte (data[i]);
 }
 
-int
-crc_validate(void)
+
+int crc_validate(void)
 {
-	return(state  == 0);
+	return (state == 0);
 }
diff --git a/ac3dec/crc.h b/ac3dec/crc.h
index 07d57b154..16489656c 100644
--- a/ac3dec/crc.h
+++ b/ac3dec/crc.h
@@ -23,5 +23,5 @@
  
 int crc_validate(void);
 void crc_init(void);
-void crc_process_byte(uint_8 data);
-void crc_process_frame(uint_8 *data,uint_32 num_bytes);
+void crc_process_byte(uint8_t data);
+void crc_process_frame(uint8_t *data,uint32_t num_bytes);
diff --git a/ac3dec/debug.c b/ac3dec/debug.c
index b7d6a3b08..b84511d7f 100644
--- a/ac3dec/debug.c
+++ b/ac3dec/debug.c
@@ -31,18 +31,8 @@ static int debug_level = -1;
 // We could potentially have multiple levels of debug info
 int debug_is_on(void)
 {
-	char *env_var;
-	
-	if(debug_level < 0)
-	{
-	  env_var = getenv("AC3_DEBUG");
-
-		if (env_var)
-		{
-			debug_level = 1;
-		}
-		else
-			debug_level = 0;
+	if(debug_level < 0) {
+		debug_level = getenv ("AC3_DEBUG") ? 1 : 0;
 	}
 	
 	return debug_level;
@@ -52,7 +42,7 @@ int debug_is_on(void)
 #ifndef __GNUC__
 void dprintf(char fmt[],...)
 {
-	int foo = 0;
+	return;
 }
 #endif
 
diff --git a/ac3dec/debug.h b/ac3dec/debug.h
index f45cb5b1a..691d40329 100644
--- a/ac3dec/debug.h
+++ b/ac3dec/debug.h
@@ -22,16 +22,20 @@
  *
  */
 
-int debug_is_on(void);
+int debug_is_on (void);
 
 #ifdef __GNUC__
-#define dprintf(format,args...)\
+#ifdef DEBUG
+#define dprintf(args...)\
 {\
 	if (debug_is_on())\
 	{\
-		fprintf(stderr,format,## args);\
+		fprintf(stderr, args);\
 	}\
 }
 #else
+#define dprintf(args...) { };
+#endif
+#else
 void dprintf(char fmt[],...);
 #endif
diff --git a/ac3dec/decode.c b/ac3dec/decode.c
index 5e7f034bd..fb852055c 100644
--- a/ac3dec/decode.c
+++ b/ac3dec/decode.c
@@ -3,9 +3,6 @@
  *
  *	Copyright (C) Aaron Holtzman - May 1999
  *
- *      Added support for DVB-s PCI card by:
- *      Matjaz Thaler <matjaz.thaler@rd.iskraemeco.si> - November 2000
- *
  *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
  *	
  *  ac3dec is free software; you can redistribute it and/or modify
@@ -22,6 +19,17 @@
  *  along with GNU Make; see the file COPYING.  If not, write to
  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
+ *------------------------------------------------------------
+ *
+ *	Thomas Mirlacher <dent@cosy.sbg.ac.at>
+ *	added OMS support
+ * 11 Jan 2001
+ *	Thomas Mirlacher <dent@cosy.sbg.ac.at>
+ *	faster error response using jmp functions
+ * 
+ *  9 Aug 2001      
+ *      Matjaz Thaler <matjaz.thaler@rd.iskraemeco.si>
+ *      Added support for DVB-s PCI card
  *
  */
 
@@ -34,14 +42,17 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/time.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+
+#ifdef __OMS__
+#include <oms/oms.h>
+#include <oms/plugin/output_audio.h>
+#endif
 
 #include "ac3.h"
 #include "ac3_internal.h"
 #include "bitstream.h"
+#include "downmix.h"
+#include "srfft.h"
 #include "imdct.h"
 #include "exponent.h"
 #include "coeff.h"
@@ -51,96 +62,91 @@
 #include "stats.h"
 #include "rematrix.h"
 #include "sanity_check.h"
-#include "downmix.h"
 #include "debug.h"
-
-#define AC3_BUFFER_SIZE (6*1024*16)      
-
+#ifndef __OMS__
+//#include "audio_out.h"
+#endif
 //our global config structure
 ac3_config_t ac3_config;
-uint_32 error_flag = 0;
 
 static audblk_t audblk;
 static bsi_t bsi;
 static syncinfo_t syncinfo;
-static uint_32 frame_count = 0;
-//static uint_32 is_output_initialized = 0;
+#ifndef __OMS__
+static uint32_t done_banner;
+#endif
+static uint32_t is_output_initialized = 0;
 
 //the floating point samples for one audblk
 static stream_samples_t samples;
 
 //the integer samples for the entire frame (with enough space for 2 ch out)
 //if this size change, be sure to change the size when muting
-static sint_16 s16_samples[2 * 6 * 256];
-
+static int16_t s16_samples[2 * 6 * 256] __attribute__ ((aligned(16)));
 
+// downmix stuff
+static float cmixlev_lut[4] = { 0.707, 0.595, 0.500, 0.707 };
+static float smixlev_lut[4] = { 0.707, 0.500, 0.0   , 0.500 };
+static dm_par_t dm_par;
+ 
 //Storage for the syncframe
-#define SYNC_BUFFER_MAX_SIZE 4096
-static uint_8 sync_buffer[SYNC_BUFFER_MAX_SIZE];
-static uint_32 sync_buffer_size = 0;;
+#define BUFFER_MAX_SIZE 4096
+static uint8_t buffer[BUFFER_MAX_SIZE];
+static uint32_t buffer_size = 0;;
+// for error handling
+jmp_buf error_jmp_mark;
 
-uint_32
-decode_sync_buffer_syncframe(syncinfo_t *syncinfo, uint_8 **start,uint_8 *end)
+static uint32_t decode_buffer_syncframe (syncinfo_t *syncinfo, uint8_t **start, uint8_t *end)
 {
-	uint_8 *cur = *start;
-	uint_16 syncword = syncinfo->syncword;
-	uint_32 ret = 0;
+	uint8_t *cur = *start;
+	uint16_t syncword = syncinfo->syncword;
+	uint32_t ret = 0;
 
-	// 
 	// Find an ac3 sync frame.
-	// 
-resync:
-
-	while(syncword != 0x0b77)
-	{
-		if(cur >= end)
+	while (syncword != 0x0b77) {
+		if (cur >= end)
 			goto done;
 		syncword = (syncword << 8) + *cur++;
 	}
 
 	//need the next 3 bytes to decide how big the frame is
-	while(sync_buffer_size < 3)
-	{
+	while (buffer_size < 3) {
 		if(cur >= end)
 			goto done;
 
-		sync_buffer[sync_buffer_size++] = *cur++;
+		buffer[buffer_size++] = *cur++;
 	}
 	
-	parse_syncinfo(syncinfo,sync_buffer);
-	stats_print_syncinfo(syncinfo);
+	parse_syncinfo (syncinfo,buffer);
+	stats_print_syncinfo (syncinfo);
 
-	while(sync_buffer_size < syncinfo->frame_size * 2 - 2)
-	{
+	while (buffer_size < syncinfo->frame_size * 2 - 2) {
 		if(cur >= end)
 			goto done;
 
-		sync_buffer[sync_buffer_size++] = *cur++;
+		buffer[buffer_size++] = *cur++;
 	}
-	
+
+#if 0
 	// Check the crc over the entire frame 
 	crc_init();
-	crc_process_frame(sync_buffer,syncinfo->frame_size * 2 - 2);
+	crc_process_frame (buffer, syncinfo->frame_size * 2 - 2);
 
-	if(!crc_validate())
-	{
+	if (!crc_validate()) {
 		fprintf(stderr,"** CRC failed - skipping frame **\n");
-		syncword = 0xffff;
-		sync_buffer_size = 0;
-		goto resync;
+		goto done;
 	}
-	
-	//
+#endif
+
 	//if we got to this point, we found a valid ac3 frame to decode
-	//
 
-	bitstream_init(sync_buffer);
+	bitstream_init (buffer);
 	//get rid of the syncinfo struct as we already parsed it
-	bitstream_get(24);
+	bitstream_get (24);
 
 	//reset the syncword for next time
 	syncword = 0xffff;
-	sync_buffer_size = 0;
+	buffer_size = 0;
 	ret = 1;
 
 done:
@@ -149,100 +155,131 @@ decode_sync_buffer_syncframe(syncinfo_t *syncinfo, uint_8 **start,uint_8 *end)
 	return ret;
 }
 
-void
-decode_mute(void)
+
+void inline decode_mute (void)
 {
-	fprintf(stderr,"muting frame\n");
 	//mute the frame
-	memset(s16_samples,0,sizeof(sint_16) * 256 * 2 * 6);
-	error_flag = 0;
+	memset (s16_samples, 0, sizeof(int16_t) * 256 * 2 * 6);
 }
 
 
-void
-ac3_init(ac3_config_t *config)
+void ac3dec_init (void)
 {
-	memcpy(&ac3_config,config,sizeof(ac3_config_t));
-
-	imdct_init();
-	sanity_check_init(&syncinfo,&bsi,&audblk);
-
-	//	ac3_output = *foo;
+// FIXME - don't do that statically here
+	ac3_config.num_output_ch = 2;
+	ac3_config.flags = 0;
+
+	imdct_init ();
+	downmix_init ();
+	memset (&syncinfo, 0, sizeof (syncinfo));
+	memset (&bsi, 0, sizeof (bsi));
+	memset (&audblk, 0, sizeof (audblk));
+	sanity_check_init (&syncinfo,&bsi,&audblk);
 }
 
-uint_32 ac3_decode_data(uint_8 *data_start,uint_8 *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data)
+#ifdef __OMS__
+size_t ac3dec_decode_data (plugin_output_audio_t *output, uint8_t *data_start, uint8_t *data_end)
+#else
+size_t ac3dec_decode_data (uint8_t *data_start ,uint8_t *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data)
+#endif
 {
-	uint_32 i;
+	uint32_t i;
 	int datasize;
 	char *data;
 
+
 	if(ac3reset != 0){
 	  syncinfo.syncword = 0xffff;
-	  sync_buffer_size = 0;
+	  buffer_size = 0;
+	}
+		
+	if (setjmp (error_jmp_mark) < 0) {
+		ac3dec_init ();
+		return 0;
 	}
-	
-	while(decode_sync_buffer_syncframe(&syncinfo,&data_start,data_end))
-	{
-		dprintf("(decode) begin frame %d\n",frame_count++);
 
-		if(error_flag)
-		{
-			decode_mute();
-			continue;
+	while (decode_buffer_syncframe (&syncinfo, &data_start, data_end)) {
+		parse_bsi (&bsi);
+
+#ifndef __OMS__
+		if(!done_banner) {
+		  //			stats_print_banner(&syncinfo,&bsi);
+			done_banner = 1;
 		}
+#endif
+
+		// compute downmix parameters
+		// downmix to tow channels for now
+		dm_par.clev = 0.0; dm_par.slev = 0.0; dm_par.unit = 1.0;
+		if (bsi.acmod & 0x1)	// have center
+			dm_par.clev = cmixlev_lut[bsi.cmixlev];
+
+		if (bsi.acmod & 0x4)	// have surround channels
+			dm_par.slev = smixlev_lut[bsi.surmixlev];
 
-		parse_bsi(&bsi);
+		dm_par.unit /= 1.0 + dm_par.clev + dm_par.slev;
+		dm_par.clev *= dm_par.unit;
+		dm_par.slev *= dm_par.unit;
 
-		for(i=0; i < 6; i++)
-		{
+		for(i=0; i < 6; i++) {
 			//Initialize freq/time sample storage
-			memset(samples,0,sizeof(float) * 256 * (bsi.nfchans + bsi.lfeon));
+			memset (samples, 0, sizeof(float) * 256 * (bsi.nfchans + bsi.lfeon));
 
 			// Extract most of the audblk info from the bitstream
 			// (minus the mantissas 
-			parse_audblk(&bsi,&audblk);
+			parse_audblk (&bsi,&audblk);
 
 			// Take the differential exponent data and turn it into
 			// absolute exponents 
-			exponent_unpack(&bsi,&audblk); 
-			if(error_flag)
-				goto error;
+			exponent_unpack (&bsi,&audblk); 
 
 			// Figure out how many bits per mantissa 
-			bit_allocate(syncinfo.fscod,&bsi,&audblk);
+			bit_allocate (syncinfo.fscod,&bsi,&audblk);
 
 			// Extract the mantissas from the stream and
 			// generate floating point frequency coefficients
-			coeff_unpack(&bsi,&audblk,samples);
-			if(error_flag)
-				goto error;
+			coeff_unpack (&bsi,&audblk,samples);
 
-			if(bsi.acmod == 0x2)
-				rematrix(&audblk,samples);
+			if (bsi.acmod == 0x2)
+				rematrix (&audblk,samples);
 
 			// Convert the frequency samples into time samples 
-			imdct(&bsi,&audblk,samples);
+			imdct (&bsi,&audblk,samples, &s16_samples[i * 2 * 256], &dm_par);
 
 			// Downmix into the requested number of channels
-			// and convert floating point to sint_16
-			downmix(&bsi,samples,&s16_samples[i * 2 * 256]);
+			// and convert floating point to int16_t
+			// downmix(&bsi,samples,&s16_samples[i * 2 * 256]);
 
-			sanity_check(&syncinfo,&bsi,&audblk);
-			if(error_flag)
-				goto error;
+			if (sanity_check(&syncinfo,&bsi,&audblk) < 0) {
+				HANDLE_ERROR ();
+				return 0;
+			}
 
 			continue;
 		}
-		
-		parse_auxdata(&syncinfo);
 
-		/*
-		if(!is_output_initialized)
-		{
-			ac3_output.open(16,syncinfo.sampling_rate,2);
+		if (!is_output_initialized) {
+#ifdef __OMS__
+			plugin_output_audio_attr_t attr;
+#ifdef __sun__
+			attr.format = 16;
+#else
+			attr.format = AFMT_S16_NE;
+#endif
+			attr.speed = syncinfo.sampling_rate;
+			attr.channels = 2;
+
+			//	output->setup (&attr);
+#else
+			//			ao_functions->open (16, syncinfo.sampling_rate, 2);
+#endif
 			is_output_initialized = 1;
 		}
-		*/
+
+#ifdef __OMS__
+		output->write (s16_samples, 256 * 6 * 2 * 2);
+#else
+		//		ao_functions->play(s16_samples, 256 * 6 * 2);
 		data = (char *)s16_samples;
 		datasize = 0;
 		while(datasize < 6144){
@@ -257,13 +294,11 @@ uint_32 ac3_decode_data(uint_8 *data_start,uint_8 *data_end, int ac3reset, int *
 		  }
 		}
 
+#endif
 
-		//write(1, s16_samples, 256 * 6 * 2* 2);
-		//ac3_output.play(s16_samples, 256 * 6 * 2);
-error:
-		;
-		//find a new frame
 	}
 
+	decode_mute ();
+
 	return 0;	
 }
diff --git a/ac3dec/dither.c b/ac3dec/dither.c
index 31e74f629..079c04d6d 100644
--- a/ac3dec/dither.c
+++ b/ac3dec/dither.c
@@ -31,7 +31,7 @@
 #include "dither.h"
 
 
-const uint_16 dither_lut[256] = 
+const uint16_t dither_lut[256] = 
 {
  0x0000, 0xa011, 0xe033, 0x4022, 0x6077, 0xc066, 0x8044, 0x2055,
  0xc0ee, 0x60ff, 0x20dd, 0x80cc, 0xa099, 0x0088, 0x40aa, 0xe0bb,
@@ -67,7 +67,7 @@ const uint_16 dither_lut[256] =
  0x8bf4, 0x2be5, 0x6bc7, 0xcbd6, 0xeb83, 0x4b92, 0x0bb0, 0xaba1
 };
 
-uint_16 lfsr_state = 1;
+uint16_t lfsr_state = 1;
 
 //
 // see dither_gen (inline-able) in dither.h
@@ -89,18 +89,17 @@ uint_16 lfsr_state = 1;
  *
  */
 
-uint_16 dither_gen(void)
+uint16_t dither_gen(void)
 {
 	int i;
-	uint_32 state;
+	uint32_t state;
 
 	//explicitly bring the state into a local var as gcc > 3.0?
 	//doesn't know how to optimize out the stores
 	state = lfsr_state;
 
 	//Generate eight pseudo random bits
-	for(i=0;i<8;i++)
-	{
+	for(i=0;i<8;i++) {
 		state <<= 1;	
 
 		if(state & 0x10000)
@@ -109,7 +108,7 @@ uint_16 dither_gen(void)
 
 	lfsr_state = state;
 
-	return (((((sint_32)state<<8)>>8) * (sint_32) (0.707106 * 256.0))>>16);
+	return (((((int32_t)state<<8)>>8) * (int32_t) (0.707106 * 256.0))>>16);
 }
 
 #endif
diff --git a/ac3dec/dither.h b/ac3dec/dither.h
index 6d68e1b54..abb9f518e 100644
--- a/ac3dec/dither.h
+++ b/ac3dec/dither.h
@@ -22,16 +22,16 @@
  */
 
 
-extern uint_16 lfsr_state;
-extern const uint_16 dither_lut[256]; 
+extern uint16_t lfsr_state;
+extern const uint16_t dither_lut[256]; 
 
-static inline uint_16 dither_gen(void)
+static inline uint16_t dither_gen(void)
 {
-	sint_16 state;
+	int16_t state;
 
 	state = dither_lut[lfsr_state >> 8] ^ (lfsr_state << 8);
 	
-	lfsr_state = (uint_16) state;
+	lfsr_state = (uint16_t) state;
 
-	return ((state * (sint_32) (0.707106 * 256.0))>>8);
+	return ((state * (int32_t) (0.707106 * 256.0))>>8);
 }
diff --git a/ac3dec/downmix.c b/ac3dec/downmix.c
index 94bc51a81..8eac3e21f 100644
--- a/ac3dec/downmix.c
+++ b/ac3dec/downmix.c
@@ -1,10 +1,7 @@
 /*
- *
- *  downmix.c
+ *  imdct.c
  *    
- *	Copyright (C) Aaron Holtzman - Sept 1999
- *
- *	Originally based on code by Yuqing Deng.
+ *	Copyright (C) Aaron Holtzman - May 1999
  *
  *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
  *	
@@ -28,401 +25,65 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <mm_accel.h>
+
 #include "ac3.h"
 #include "ac3_internal.h"
 
-
-#include "decode.h"
-#include "downmix.h"
 #include "debug.h"
+#include "downmix.h"
+#include "downmix_c.h"
+#include "downmix_i386.h"
+#ifdef HAVE_KNI
+#include "downmix_kni.h"
+#endif
 
+void (*downmix_3f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
+void (*downmix_3f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
+void (*downmix_2f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
+void (*downmix_2f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
+void (*downmix_3f_0r_to_2ch)(float *samples, dm_par_t * dm_par);
+void (*stream_sample_2ch_to_s16)(int16_t *s16_samples, float *left, float *right);
+void (*stream_sample_1ch_to_s16)(int16_t *s16_samples, float *center);
 
-//Pre-scaled downmix coefficients
-static float cmixlev_lut[4] = { 0.2928, 0.2468, 0.2071, 0.2468 };
-static float smixlev_lut[4] = { 0.2928, 0.2071, 0.0   , 0.2071 };
 
-static void 
-downmix_3f_2r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
+void downmix_init()
 {
-	uint_32 j;
-	float right_tmp;
-	float left_tmp;
-	float clev,slev;
-	float *centre = 0, *left = 0, *right = 0, *left_sur = 0, *right_sur = 0;
-
-	left      = samples[0];
-	centre    = samples[1];
-	right     = samples[2];
-	left_sur  = samples[3];
-	right_sur = samples[4];
-
-	clev = cmixlev_lut[bsi->cmixlev];
-	slev = smixlev_lut[bsi->surmixlev];
-
-#if defined DOLBY_SURROUND
-	for (j = 0; j < 256; j++) 
+#ifdef __i386__
+#ifdef HAVE_KNI
+	uint32_t accel = mm_accel ();
+
+// other dowmixing should go here too
+	if (accel & MM_ACCEL_X86_MMXEXT) {
+		dprintf("Using SSE for downmix\n");
+		downmix_3f_2r_to_2ch = downmix_3f_2r_to_2ch_kni;
+		downmix_2f_2r_to_2ch = downmix_2f_2r_to_2ch_kni;
+		downmix_3f_1r_to_2ch = downmix_3f_1r_to_2ch_kni;
+		downmix_2f_1r_to_2ch = downmix_2f_1r_to_2ch_kni;
+		downmix_3f_0r_to_2ch = downmix_3f_0r_to_2ch_kni;
+		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_kni;
+		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_kni;
+	} else if (accel & MM_ACCEL_X86_3DNOW) {
+	} else
+#endif
+#endif
 	{
-	        right_tmp = *left_sur++ + *right_sur++;
-		left_tmp  = 1.4142f * *left++  + *centre - right_tmp;
-		right_tmp += 1.4142f * *right++ + *centre++;
-	    
-	        s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 16000.0f);
-	        s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 16000.0f);
-	}
+		downmix_3f_2r_to_2ch = downmix_3f_2r_to_2ch_c;
+		downmix_2f_2r_to_2ch = downmix_2f_2r_to_2ch_c;
+		downmix_3f_1r_to_2ch = downmix_3f_1r_to_2ch_c;
+		downmix_2f_1r_to_2ch = downmix_2f_1r_to_2ch_c;
+		downmix_3f_0r_to_2ch = downmix_3f_0r_to_2ch_c;
+#ifdef __i386__
+#if 1
+		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_c;
+		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_c;
 #else
-	for (j = 0; j < 256; j++) 
-	{
-		left_tmp = 0.4142f * *left++  + clev * *centre   + slev * *left_sur++;
-		right_tmp= 0.4142f * *right++ + clev * *centre++ + slev * *right_sur++;
-
-		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
-		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
-	}
+		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_i386;
+		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_i386;
+#endif
+#else
+		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_c;
+		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_c;
 #endif
-}
-
-static void
-downmix_2f_2r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
-{
-	uint_32 j;
-	float right_tmp;
-	float left_tmp;
-	float slev;
-	float *left = 0, *right = 0, *left_sur = 0, *right_sur = 0;
-
-	left      = samples[0];
-	right     = samples[1];
-	left_sur  = samples[2];
-	right_sur = samples[3];
-
-	slev = smixlev_lut[bsi->surmixlev];
-
-	for (j = 0; j < 256; j++) 
-	{
-		left_tmp = 0.4142f * *left++  + slev * *left_sur++;
-		right_tmp= 0.4142f * *right++ + slev * *right_sur++;
-
-		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
-		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
-	}
-}
-
-static void
-downmix_3f_1r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
-{
-	uint_32 j;
-	float right_tmp;
-	float left_tmp;
-	float clev,slev;
-	float *centre = 0, *left = 0, *right = 0, *sur = 0;
-
-	left      = samples[0];
-	centre    = samples[1];
-	right     = samples[2];
-	//Mono surround
-	sur = samples[3];
-
-	clev = cmixlev_lut[bsi->cmixlev];
-	slev = smixlev_lut[bsi->surmixlev];
-
-	for (j = 0; j < 256; j++) 
-	{
-		left_tmp = 0.4142f * *left++  + clev * *centre++ + slev * *sur;
-		right_tmp= 0.4142f * *right++ + clev * *centre   + slev * *sur++;
-
-		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
-		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
-	}
-}
-
-
-static void
-downmix_2f_1r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
-{
-	uint_32 j;
-	float right_tmp;
-	float left_tmp;
-	float slev;
-	float *left = 0, *right = 0, *sur = 0;
-
-	left      = samples[0];
-	right     = samples[1];
-	//Mono surround
-	sur = samples[2];
-
-	slev = smixlev_lut[bsi->surmixlev];
-
-	for (j = 0; j < 256; j++) 
-	{
-		left_tmp = 0.4142f * *left++  + slev * *sur;
-		right_tmp= 0.4142f * *right++ + slev * *sur++;
-
-		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
-		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
-	}
-}
-
-static void
-downmix_3f_0r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
-{
-	uint_32 j;
-	float right_tmp;
-	float left_tmp;
-	float clev;
-	float *centre = 0, *left = 0, *right = 0;
-
-	left      = samples[0];
-	centre    = samples[1];
-	right     = samples[2];
-
-	clev = cmixlev_lut[bsi->cmixlev];
-
-	for (j = 0; j < 256; j++) 
-	{
-		left_tmp = 0.4142f * *left++  + clev * *centre; 
-		right_tmp= 0.4142f * *right++ + clev * *centre++;   
-
-		s16_samples[j * 2 ]    = (sint_16) (left_tmp  * 32767.0f);
-		s16_samples[j * 2 + 1] = (sint_16) (right_tmp * 32767.0f);
-	}
-}
-				
-static void
-downmix_2f_0r_to_2ch(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
-{
-	uint_32 j;
-	float *left = 0, *right = 0;
-
-	left      = samples[0];
-	right     = samples[1];
-
-	for (j = 0; j < 256; j++) 
-	{
-		s16_samples[j * 2 ]    = (sint_16) (*left++  * 32767.0f);
-		s16_samples[j * 2 + 1] = (sint_16) (*right++ * 32767.0f);
-	}
-}
-
-static void
-downmix_1f_0r_to_2ch(float *centre,sint_16 *s16_samples)
-{
-	uint_32 j;
-	float tmp;
-
-	//Mono program!
-
-	for (j = 0; j < 256; j++) 
-	{
-		tmp =  32767.0f * 0.7071f * *centre++;
-
-		s16_samples[j * 2 ] = s16_samples[j * 2 + 1] = (sint_16) tmp;
-	}
-}
-
-//
-// Downmix into 2 or 4 channels  (4 ch isn't in quite yet)
-//
-// The downmix function names have the following format
-//
-// downmix_Xf_Yr_to_[2|4]ch[_dolby]
-//
-// where X        = number of front channels
-//       Y        = number of rear channels
-//       [2|4]    = number of output channels
-//       [_dolby] = with or without dolby surround mix
-//
-
-void downmix(bsi_t* bsi, stream_samples_t samples,sint_16 *s16_samples)
-{
-	if(bsi->acmod > 7)
-		dprintf("(downmix) invalid acmod number\n"); 
-
-	//
-	//There are two main cases, with or without Dolby Surround
-	//
-	if(ac3_config.flags & AC3_DOLBY_SURR_ENABLE)
-	{
-		fprintf(stderr,"Dolby Surround Mixes not currently enabled\n");
-		exit(1);
-	}
-
-	//Non-Dolby surround downmixes
-	switch(bsi->acmod)
-	{
-		// 3/2
-		case 7:
-			downmix_3f_2r_to_2ch(bsi,samples,s16_samples);
-		break;
-
-		// 2/2
-		case 6:
-			downmix_2f_2r_to_2ch(bsi,samples,s16_samples);
-		break;
-
-		// 3/1
-		case 5:
-			downmix_3f_1r_to_2ch(bsi,samples,s16_samples);
-		break;
-
-		// 2/1
-		case 4:
-			downmix_2f_1r_to_2ch(bsi,samples,s16_samples);
-		break;
-
-		// 3/0
-		case 3:
-			downmix_3f_0r_to_2ch(bsi,samples,s16_samples);
-		break;
-
-		case 2:
-			downmix_2f_0r_to_2ch(bsi,samples,s16_samples);
-		break;
-
-		// 1/0
-		case 1:
-			downmix_1f_0r_to_2ch(samples[0],s16_samples);
-		break;
-
-		// 1+1
-		case 0:
-			downmix_1f_0r_to_2ch(samples[ac3_config.dual_mono_ch_sel],s16_samples);
-		break;
 	}
 }
-
-
-
-#if 0 
-
-	//the dolby mixes lay here for the time being
-	switch(bsi->acmod)
-	{
-		// 3/2
-		case 7:
-			left      = samples[0];
-			centre    = samples[1];
-			right     = samples[2];
-			left_sur  = samples[3];
-			right_sur = samples[4];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp = 0.2265f * *left_sur++ + 0.2265f * *right_sur++;
-				left_tmp  = -1 * right_tmp;
-				right_tmp += 0.3204f * *right++ + 0.2265f * *centre;
-				left_tmp  += 0.3204f * *left++  + 0.2265f * *centre++;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = left_tmp;
-			}
-
-		break;
-
-		// 2/2
-		case 6:
-			left      = samples[0];
-			right     = samples[1];
-			left_sur  = samples[2];
-			right_sur = samples[3];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp = 0.2265f * *left_sur++ + 0.2265f * *right_sur++;
-				left_tmp  = -1 * right_tmp;
-				right_tmp += 0.3204f * *right++;
-				left_tmp  += 0.3204f * *left++ ;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = left_tmp;
-			}
-		break;
-
-		// 3/1
-		case 5:
-			left      = samples[0];
-			centre    = samples[1];
-			right     = samples[2];
-			//Mono surround
-			right_sur = samples[3];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp =  0.2265f * *right_sur++;
-				left_tmp  = -1 * right_tmp;
-				right_tmp += 0.3204f * *right++ + 0.2265f * *centre;
-				left_tmp  += 0.3204f * *left++  + 0.2265f * *centre++;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = left_tmp;
-			}
-		break;
-
-		// 2/1
-		case 4:
-			left      = samples[0];
-			right     = samples[1];
-			//Mono surround
-			right_sur = samples[2];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp =  0.2265f * *right_sur++;
-				left_tmp  = -1 * right_tmp;
-				right_tmp += 0.3204f * *right++; 
-				left_tmp  += 0.3204f * *left++;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = left_tmp;
-			}
-		break;
-
-		// 3/0
-		case 3:
-			left      = samples[0];
-			centre    = samples[1];
-			right     = samples[2];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp = 0.3204f * *right++ + 0.2265f * *centre;
-				left_tmp  = 0.3204f * *left++  + 0.2265f * *centre++;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = left_tmp;
-			}
-		break;
-
-		// 2/0
-		case 2:
-		//Do nothing!
-		break;
-
-		// 1/0
-		case 1:
-			//Mono program!
-			right = samples[0];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp = 0.7071f * *right++;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = right_tmp;
-			}
-			
-		break;
-
-		// 1+1
-		case 0:
-			//Dual mono, output selected by user
-			right = samples[ac3_config.dual_mono_ch_sel];
-
-			for (j = 0; j < 256; j++) 
-			{
-				right_tmp = 0.7071f * *right++;
-
-				samples[1][j] = right_tmp;
-				samples[0][j] = right_tmp;
-			}
-		break;
-#endif
diff --git a/ac3dec/downmix.h b/ac3dec/downmix.h
index 7537c6229..dcfe1e12e 100644
--- a/ac3dec/downmix.h
+++ b/ac3dec/downmix.h
@@ -25,4 +25,10 @@
  *
  */
 
-void downmix(bsi_t* bsi, stream_samples_t stream_samples,sint_16 *s16_samples);
+typedef struct dm_par_s {
+	float unit;  
+	float clev;  
+	float slev;          
+} dm_par_t;                                                                     
+
+void downmix_init();
diff --git a/ac3dec/downmix_c.c b/ac3dec/downmix_c.c
new file mode 100644
index 000000000..875d785e4
--- /dev/null
+++ b/ac3dec/downmix_c.c
@@ -0,0 +1,161 @@
+/*
+ *  downmix_c.c
+ *    
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+#include "debug.h"
+#include "downmix.h"
+#include "downmix_c.h"
+
+
+void downmix_3f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
+{
+	int i;
+	float *left, *right, *center, *left_sur, *right_sur;
+	float left_tmp, right_tmp;
+
+	left = samples;
+	right = samples + 256 * 2;
+	center = samples + 256;
+	left_sur = samples + 256 * 3;
+	right_sur = samples + 256 * 4;
+
+	for (i=0; i < 256; i++) {
+#if defined DOLBY_SURROUND
+	  	left_tmp = dm_par->unit * *left  + dm_par->clev * *center - dm_par->slev * (*left_sur + *right_sur);
+	  	right_tmp= dm_par->unit * *right++ + dm_par->clev * *center + dm_par->slev * (*left_sur++ + *right_sur++);
+#else
+		left_tmp = dm_par->unit * *left  + dm_par->clev * *center + dm_par->slev * *left_sur++;
+		right_tmp= dm_par->unit * *right++ + dm_par->clev * *center + dm_par->slev * *right_sur++;
+#endif
+		*left++ = left_tmp;
+		*center++ = right_tmp;
+
+	}
+}
+
+
+void downmix_2f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
+{
+	int i;
+	float *left, *right, *left_sur, *right_sur;
+	float left_tmp, right_tmp;
+               
+	left = &samples[0];
+	right = &samples[256];
+	left_sur = &samples[512];
+	right_sur = &samples[768];
+
+	for (i = 0; i < 256; i++) {
+		left_tmp = dm_par->unit * *left  + dm_par->slev * *left_sur++;
+		right_tmp= dm_par->unit * *right + dm_par->slev * *right_sur++;
+		*left++ = left_tmp;
+		*right++ = right_tmp;
+	}
+}
+
+
+void downmix_3f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
+{
+	int i;
+	float *left, *right, *center, *right_sur;
+	float left_tmp, right_tmp;
+
+	left = &samples[0];
+	right = &samples[512];
+	center = &samples[256];
+	right_sur = &samples[768];
+
+	for (i = 0; i < 256; i++) {
+		left_tmp = dm_par->unit * *left  + dm_par->clev * *center  - dm_par->slev * *right_sur;
+		right_tmp= dm_par->unit * *right++ + dm_par->clev * *center + dm_par->slev * *right_sur++;
+		*left++ = left_tmp;
+		*center++ = right_tmp;
+	}
+}
+
+
+void downmix_2f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
+{
+	int i;
+	float *left, *right, *right_sur;
+	float left_tmp, right_tmp;
+
+	left = &samples[0];
+	right = &samples[256];
+	right_sur = &samples[512];
+
+	for (i = 0; i < 256; i++) {
+		left_tmp = dm_par->unit * *left  - dm_par->slev * *right_sur;
+		right_tmp= dm_par->unit * *right + dm_par->slev * *right_sur++;
+		*left++ = left_tmp;
+		*right++ = right_tmp;
+	}
+}
+
+
+void downmix_3f_0r_to_2ch_c (float *samples, dm_par_t *dm_par)
+{
+	int i;
+	float *left, *right, *center;
+	float left_tmp, right_tmp;
+
+	left = &samples[0];
+	center = &samples[256];
+	right = &samples[512];
+
+	for (i = 0; i < 256; i++) {
+		left_tmp = dm_par->unit * *left  + dm_par->clev * *center;
+		right_tmp= dm_par->unit * *right++ + dm_par->clev * *center;
+		*left++ = left_tmp;
+		*center++ = right_tmp;
+	}
+}
+
+
+void stream_sample_2ch_to_s16_c (int16_t *s16_samples, float *left, float *right)
+{
+	int i;
+
+	for (i=0; i < 256; i++) {
+		*s16_samples++ = (int16_t) *left++;
+		*s16_samples++ = (int16_t) *right++;
+	}
+}
+
+
+void stream_sample_1ch_to_s16_c (int16_t *s16_samples, float *center)
+{
+	int i;
+	float tmp;
+
+	for (i=0; i < 256; i++) {
+		*s16_samples++ = tmp = (int16_t) (0.7071f * *center++);
+		*s16_samples++ = tmp;
+	}
+}
diff --git a/ac3dec/downmix_c.h b/ac3dec/downmix_c.h
new file mode 100644
index 000000000..3643f65e8
--- /dev/null
+++ b/ac3dec/downmix_c.h
@@ -0,0 +1,32 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __DOWNMIX_C_H__
+#define __DOWNMIX_C_H__
+
+void downmix_3f_2r_to_2ch_c(float *samples, dm_par_t * dm_par);
+void downmix_3f_1r_to_2ch_c(float *samples, dm_par_t * dm_par);
+void downmix_2f_2r_to_2ch_c(float *samples, dm_par_t * dm_par);
+void downmix_2f_1r_to_2ch_c(float *samples, dm_par_t * dm_par);
+void downmix_3f_0r_to_2ch_c(float *samples, dm_par_t * dm_par);            
+void stream_sample_2ch_to_s16_c(int16_t *s16_samples, float *left, float *right);
+void stream_sample_1ch_to_s16_c(int16_t *s16_samples, float *center);      
+
+#endif
diff --git a/ac3dec/downmix_i386.S b/ac3dec/downmix_i386.S
new file mode 100644
index 000000000..20f2e8c37
--- /dev/null
+++ b/ac3dec/downmix_i386.S
@@ -0,0 +1,92 @@
+/* This is basicly gcc generated.
+ * Only the floating point rounding mode loads and saves
+ * are removed in the stream_sample_to_s16 functions.
+ */                                                                            
+
+#ifdef __i386__
+
+	.file	"downmix.c"
+	.version	"01.01"
+gcc2_compiled.:
+.text
+	.align 4
+.globl stream_sample_2ch_to_s16_i386
+	.type	 stream_sample_2ch_to_s16_i386,@function
+stream_sample_2ch_to_s16_i386:
+	pushl %ebp
+	movl %esp,%ebp
+	subl $28,%esp
+	pushl %edi
+	pushl %esi
+	pushl %ebx
+	movl 8(%ebp),%edx
+	movl 12(%ebp),%ebx
+	movl 16(%ebp),%ecx
+	movl $255,%esi
+	.p2align 4,,7
+.L373:
+	flds (%ebx)
+	fistpl -8(%ebp)
+	movl -8(%ebp),%eax
+	movw %ax,(%edx)
+	addl $2,%edx
+	addl $4,%ebx
+	flds (%ecx)
+	fistpl -8(%ebp)
+	movl -8(%ebp),%eax
+	movw %ax,(%edx)
+	addl $4,%ecx
+	addl $2,%edx
+	decl %esi
+	jns .L373
+	popl %ebx
+	popl %esi
+	popl %edi
+	leave
+	ret
+.Lfe6:
+	.size	 stream_sample_2ch_to_s16_i386,.Lfe6-stream_sample_2ch_to_s16_i386
+.section	.rodata
+	.align 4
+.LC46:
+	.long 0x3f350481
+.text
+	.align 4
+.globl stream_sample_1ch_to_s16_i386
+	.type	 stream_sample_1ch_to_s16_i386,@function
+stream_sample_1ch_to_s16_i386:
+	pushl %ebp
+	movl %esp,%ebp
+	subl $16,%esp
+	pushl %esi
+	pushl %ebx
+	movl 8(%ebp),%edx
+	movl 12(%ebp),%ecx
+	flds .LC46
+	movl $255,%ebx
+	.p2align 4,,7
+.L379:
+	flds (%ecx)
+	fmul %st(1),%st
+	fistpl -8(%ebp)
+	movl -8(%ebp),%eax
+	movw %ax,-2(%ebp)
+	addl $4,%ecx
+	flds -2(%ebp)
+	fistpl -8(%ebp)
+	movl -8(%ebp),%eax
+	movw %ax,(%edx)
+	addl $2,%edx
+	movw %ax,(%edx)
+	addl $2,%edx
+	decl %ebx
+	jns .L379
+	fstp %st(0)
+	popl %ebx
+	popl %esi
+	leave
+	ret
+.Lfe7:
+	.size	 stream_sample_1ch_to_s16_i386,.Lfe7-stream_sample_1ch_to_s16_i386
+	.ident	"GCC: (GNU) 2.95.3 19991030 (prerelease)"
+#endif
diff --git a/ac3dec/downmix_i386.h b/ac3dec/downmix_i386.h
new file mode 100644
index 000000000..e34d7d6cf
--- /dev/null
+++ b/ac3dec/downmix_i386.h
@@ -0,0 +1,27 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __DOWNMIX_I386_H__
+#define __DOWNMIX_I386_H__
+
+void stream_sample_2ch_to_s16_i386(int16_t *s16_samples, float *left, float *right);
+void stream_sample_1ch_to_s16_i386(int16_t *s16_samples, float *center);      
+
+#endif
diff --git a/ac3dec/downmix_kni.S b/ac3dec/downmix_kni.S
new file mode 100644
index 000000000..7df8c060f
--- /dev/null
+++ b/ac3dec/downmix_kni.S
@@ -0,0 +1,396 @@
+/* 
+ *  downmix_kni.S
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - October 2000
+ *
+ *
+ *  downmix_kni.S is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  downmix_kni.S is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifdef __i386__
+
+.section .rodata
+	.align 4
+sqrt2:	.float 0f0.7071068
+	.p2align 5,0,
+	
+	.section .text
+	
+	.align 4
+	.global downmix_3f_2r_to_2ch_kni
+	.type downmix_3f_2r_to_2ch_kni, @function
+
+downmix_3f_2r_to_2ch_kni:
+	pushl	%ebp
+	movl  	%esp, %ebp
+	
+	pushl	%eax
+	pushl	%ebx
+	pushl	%ecx
+
+	movl 	8(%ebp), %eax /* samples[] */
+	movl	12(%ebp), %ebx /* &dm_par */
+	movl	$64, %ecx		/* loop counter */
+
+	movss	(%ebx), %xmm5	/* unit */
+	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
+
+	movss	4(%ebx), %xmm6		/* clev */
+	shufps	$0, %xmm6, %xmm6	/* clev | clev | clev | clev */
+
+	movss	8(%ebx), %xmm7		/* slev */
+	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
+
+.loop:	
+	movaps	(%eax), %xmm0 /*  left */
+	movaps	2048(%eax), %xmm1 /* right */
+	movaps 	1024(%eax), %xmm2	/* center */
+	mulps	%xmm5, %xmm0
+	mulps	%xmm5, %xmm1
+	
+	mulps	%xmm6, %xmm2
+	movaps	3072(%eax), %xmm3	/* leftsur */
+	movaps	4096(%eax), %xmm4	/* rithgsur */
+	addps	%xmm2, %xmm0
+	addps 	%xmm2, %xmm1
+
+	mulps	%xmm7, %xmm3
+	mulps	%xmm7, %xmm4
+	addps	%xmm3, %xmm0
+	addps	%xmm4, %xmm1
+
+	movaps	%xmm0, (%eax)
+	movaps	%xmm1, 1024(%eax)
+
+	addl	$16, %eax
+	decl 	%ecx
+	jnz	.loop
+
+	popl	%ecx
+	popl	%ebx
+	popl 	%eax
+
+	leave
+	ret
+	.p2align 4,,7
+
+	.global downmix_2f_2r_to_2ch_kni
+	.type downmix_2f_2r_to_2ch_kni, @function
+
+downmix_2f_2r_to_2ch_kni:
+	pushl %ebp
+	movl  %esp, %ebp
+
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+
+	movl 8(%ebp), %eax /* samples[] */
+	movl 12(%ebp), %ebx /* &dm_par */
+	movl $64, %ecx	/* loop counter */
+
+	movss (%ebx), %xmm5	/* unit */
+	shufps $0, %xmm5, %xmm5 /* unit | unit | unit | unit */
+
+	movss	8(%ebx), %xmm7		/* slev */
+	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
+
+.loop3:	
+	movaps	(%eax), %xmm0 /*  left */
+	movaps	1024(%eax), %xmm1 /* right */
+	movaps 	2048(%eax), %xmm3	/* leftsur */
+	mulps	%xmm5, %xmm0
+	mulps	%xmm5, %xmm1
+	
+	movaps	3072(%eax), %xmm4	/* rightsur */
+
+	mulps	%xmm7, %xmm3
+	mulps	%xmm7, %xmm4
+	addps	%xmm3, %xmm0
+	addps	%xmm4, %xmm1
+
+	movaps	%xmm0, (%eax)
+	movaps	%xmm1, 1024(%eax)
+
+	addl	$16, %eax
+	decl 	%ecx
+	jnz	.loop3
+
+	popl	%ecx
+	popl	%ebx
+	popl 	%eax
+
+	leave
+	ret
+	.p2align 4,,7
+	
+	.global downmix_3f_1r_to_2ch_kni
+	.type downmix_3f_1r_to_2ch_kni, @function
+
+downmix_3f_1r_to_2ch_kni:
+	pushl	%ebp
+	movl  	%esp, %ebp
+	
+	pushl	%eax
+	pushl	%ebx
+	pushl	%ecx
+
+	movl 	8(%ebp), %eax /* samples[] */
+	movl	12(%ebp), %ebx /* &dm_par */
+	movl	$64, %ecx		/* loop counter */
+
+	movss	(%ebx), %xmm5	/* unit */
+	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
+
+	movss	4(%ebx), %xmm6		/* clev */
+	shufps	$0, %xmm6, %xmm6	/* clev | clev | clev | clev */
+
+	movss	8(%ebx), %xmm7		/* slev */
+	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
+
+.loop4:	
+	movaps	(%eax), %xmm0 /*  left */
+	movaps	2048(%eax), %xmm1 /* right */
+	movaps 	1024(%eax), %xmm2	/* center */
+	mulps	%xmm5, %xmm0
+	mulps	%xmm5, %xmm1
+	
+	mulps	%xmm6, %xmm2
+	movaps	3072(%eax), %xmm3	/* sur */
+
+	addps	%xmm2, %xmm0
+	mulps	%xmm7, %xmm3
+	
+	addps 	%xmm2, %xmm1
+
+	subps	%xmm3, %xmm0
+	addps	%xmm3, %xmm1
+
+	movaps	%xmm0, (%eax)
+	movaps	%xmm1, 1024(%eax)
+
+	addl	$16, %eax
+	decl 	%ecx
+	jnz	.loop4
+
+	popl	%ecx
+	popl	%ebx
+	popl 	%eax
+
+	leave
+	ret
+	.p2align 4,,7
+		
+	.global downmix_2f_1r_to_2ch_kni
+	.type downmix_2f_1r_to_2ch_kni, @function
+
+downmix_2f_1r_to_2ch_kni:
+	pushl	%ebp
+	movl  	%esp, %ebp
+	
+	pushl	%eax
+	pushl	%ebx
+	pushl	%ecx
+
+	movl 	8(%ebp), %eax /* samples[] */
+	movl	12(%ebp), %ebx /* &dm_par */
+	movl	$64, %ecx		/* loop counter */
+
+	movss	(%ebx), %xmm5	/* unit */
+	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
+
+	movss	8(%ebx), %xmm7		/* slev */
+	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
+
+.loop5:	
+	movaps	(%eax), %xmm0 /*  left */
+	movaps	1024(%eax), %xmm1 /* right */
+	
+	mulps	%xmm5, %xmm0
+	mulps	%xmm5, %xmm1
+	
+	movaps	2048(%eax), %xmm3	/* sur */
+
+	mulps	%xmm7, %xmm3
+	
+	subps	%xmm3, %xmm0
+	addps	%xmm3, %xmm1
+
+	movaps	%xmm0, (%eax)
+	movaps	%xmm1, 1024(%eax)
+
+	addl	$16, %eax
+	decl 	%ecx
+	jnz	.loop5
+
+	popl	%ecx
+	popl	%ebx
+	popl 	%eax
+
+	leave
+	ret
+	.p2align 4,,7
+	
+	.global downmix_3f_0r_to_2ch_kni
+	.type downmix_3f_0r_to_2ch_kni, @function
+
+downmix_3f_0r_to_2ch_kni:
+	pushl	%ebp
+	movl  	%esp, %ebp
+	
+	pushl	%eax
+	pushl	%ebx
+	pushl	%ecx
+
+	movl 	8(%ebp), %eax /* samples[] */
+	movl	12(%ebp), %ebx /* &dm_par */
+	movl	$64, %ecx		/* loop counter */
+
+	movss	(%ebx), %xmm5	/* unit */
+	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
+
+	movss	4(%ebx), %xmm6		/* clev */
+	shufps	$0, %xmm6, %xmm6	/* clev | clev | clev | clev */
+
+
+.loop6:	
+	movaps	(%eax), %xmm0 /*  left */
+	movaps	2048(%eax), %xmm1 /* right */
+	movaps 	1024(%eax), %xmm2	/* center */
+	mulps	%xmm5, %xmm0
+	mulps	%xmm5, %xmm1
+	
+	mulps	%xmm6, %xmm2
+
+	addps	%xmm2, %xmm0
+	
+	addps 	%xmm2, %xmm1
+
+	movaps	%xmm0, (%eax)
+	movaps	%xmm1, 1024(%eax)
+
+	addl	$16, %eax
+	decl 	%ecx
+	jnz	.loop6
+
+	popl	%ecx
+	popl	%ebx
+	popl 	%eax
+
+	leave
+	ret
+	.p2align 4,,7
+	
+	.global stream_sample_2ch_to_s16_kni
+	.type stream_sample_2ch_to_s16_kni, @function
+
+stream_sample_2ch_to_s16_kni:
+	pushl %ebp
+	movl  %esp, %ebp
+
+	pushl %eax
+	pushl %ebx
+	pushl %edx
+	pushl %ecx
+
+	movl 8(%ebp), %eax	/* s16_samples */
+	movl 12(%ebp), %ebx	/* left */
+	movl 16(%ebp), %edx	/* right */
+	movl $64, %ecx
+
+.loop1:
+	movaps (%ebx), %xmm0	/* l3 | l2 | l1 | l0 */
+	movaps (%edx), %xmm1	/* r3 | r2 | r1 | r0 */
+	movhlps %xmm0, %xmm2	/* l3 | l2 */
+	movhlps %xmm1, %xmm3	/* r3 | r2 */
+	unpcklps %xmm1, %xmm0	/* r1 | l1 | r0 | l0 */
+	unpcklps %xmm3, %xmm2	/* r3 | l3 | r2 | l2 */
+
+	cvtps2pi %xmm0, %mm0	/* r0 l0 --> mm0, int_32 */
+	movhlps %xmm0, %xmm0	
+	cvtps2pi %xmm0, %mm1	/* r1 l1 --> mm1, int_32 */
+
+	cvtps2pi %xmm2, %mm2	/* r2 l2 --> mm2, int_32 */
+	movhlps %xmm2, %xmm2
+	cvtps2pi %xmm2, %mm3	/* r3 l3 --> mm3, int_32 */
+	packssdw %mm1, %mm0	/* r1 l1 r0 l0 --> mm0, int_16 */
+	packssdw %mm3, %mm2	/* r3 l3 r2 l2 --> mm2, int_16 */
+
+	movq %mm0, (%eax)
+	movq %mm2, 8(%eax)
+	addl $16, %eax
+	addl $16, %ebx
+	addl $16, %edx
+
+	decl %ecx
+	jnz .loop1
+
+	popl %ecx
+	popl %edx
+	popl %ebx
+	popl %eax
+
+	emms
+
+	leave
+	ret
+	.p2align 4,,7
+	
+	.global stream_sample_1ch_to_s16_kni
+	.type stream_sample_1ch_to_s16_kni, @function
+
+stream_sample_1ch_to_s16_kni:
+	pushl %ebp
+	movl  %esp, %ebp
+
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+
+	movl $sqrt2, %eax
+	movss (%eax), %xmm7
+	movl 8(%ebp), %eax	/* s16_samples */
+	movl 12(%ebp), %ebx	/* left */
+	shufps $0, %xmm7, %xmm7
+	movl $64, %ecx
+
+.loop2:
+	movaps (%ebx), %xmm0	/* c3 | c2 | c1 | c0 */
+	mulps %xmm7, %xmm0
+	movhlps %xmm0, %xmm2	/* c3 | c2 */
+
+	cvtps2pi %xmm0, %mm0	/* c1 c0 --> mm0, int_32 */
+	cvtps2pi %xmm2, %mm1	/* c3 c2 --> mm1, int_32 */
+
+	packssdw %mm0, %mm0	/* c1 c1 c0 c0 --> mm0, int_16 */
+	packssdw %mm1, %mm1	/* c3 c3 c2 c2 --> mm1, int_16 */
+
+	movq %mm0, (%eax)
+	movq %mm1, 8(%eax)
+	addl $16, %eax
+	addl $16, %ebx
+
+	decl %ecx
+	jnz .loop2
+
+	popl %ecx
+	popl %ebx
+	popl %eax
+	
+	emms
+	leave
+	ret 
+#endif
diff --git a/ac3dec/downmix_kni.h b/ac3dec/downmix_kni.h
new file mode 100644
index 000000000..323f2a754
--- /dev/null
+++ b/ac3dec/downmix_kni.h
@@ -0,0 +1,32 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __DOWNMIX_KNI_H__
+#define __DOWNMIX_KNI_H__
+
+void downmix_3f_2r_to_2ch_kni(float *samples, dm_par_t * dm_par);
+void downmix_3f_1r_to_2ch_kni(float *samples, dm_par_t * dm_par);
+void downmix_2f_2r_to_2ch_kni(float *samples, dm_par_t * dm_par);
+void downmix_2f_1r_to_2ch_kni(float *samples, dm_par_t * dm_par);
+void downmix_3f_0r_to_2ch_kni(float *samples, dm_par_t * dm_par);
+void stream_sample_2ch_to_s16_kni(int16_t *s16_samples, float *left, float *right);
+void stream_sample_1ch_to_s16_kni(int16_t *s16_samples, float *center);
+
+#endif
diff --git a/ac3dec/exponent.c b/ac3dec/exponent.c
index 98111a5ba..16fca4652 100644
--- a/ac3dec/exponent.c
+++ b/ac3dec/exponent.c
@@ -28,41 +28,43 @@
 #include "ac3_internal.h"
 
 
-#include "decode.h"
 #include "exponent.h"
 
 
-static void exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp, 
-		uint_16 exps[], uint_16 *dest);
+static inline void exp_unpack_ch(uint16_t type,uint16_t expstr,uint16_t ngrps,uint16_t initial_exp, uint16_t exps[], uint16_t *dest);
 
-void
-exponent_unpack( bsi_t *bsi, audblk_t *audblk)
+
+/**
+ *
+ **/
+
+void exponent_unpack( bsi_t *bsi, audblk_t *audblk)
 {
-	uint_16 i;
+	uint16_t i;
 
 	for(i=0; i< bsi->nfchans; i++)
-		exp_unpack_ch(UNPACK_FBW, audblk->chexpstr[i], audblk->nchgrps[i], audblk->exps[i][0], 
-				&audblk->exps[i][1], audblk->fbw_exp[i]);
+		exp_unpack_ch(UNPACK_FBW, audblk->chexpstr[i], audblk->nchgrps[i], audblk->exps[i][0], &audblk->exps[i][1], audblk->fbw_exp[i]);
 
 	if(audblk->cplinu)
-		exp_unpack_ch(UNPACK_CPL, audblk->cplexpstr, audblk->ncplgrps, audblk->cplabsexp << 1,	
-				audblk->cplexps, &audblk->cpl_exp[audblk->cplstrtmant]);
+		exp_unpack_ch(UNPACK_CPL, audblk->cplexpstr, audblk->ncplgrps, audblk->cplabsexp << 1, audblk->cplexps, &audblk->cpl_exp[audblk->cplstrtmant]);
 
 	if(bsi->lfeon)
-		exp_unpack_ch(UNPACK_LFE, audblk->lfeexpstr, 2, audblk->lfeexps[0], 
-				&audblk->lfeexps[1], audblk->lfe_exp);
+		exp_unpack_ch(UNPACK_LFE, audblk->lfeexpstr, 2, audblk->lfeexps[0], &audblk->lfeexps[1], audblk->lfe_exp);
 }
 
 
-static void
-exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp, 
-		uint_16 exps[], uint_16 *dest)
+/**
+ *
+ **/
+
+static inline void exp_unpack_ch(uint16_t type,uint16_t expstr,uint16_t ngrps,uint16_t initial_exp, 
+		uint16_t exps[], uint16_t *dest)
 {
-	uint_16 i,j;
-	sint_16 exp_acc;
-	sint_16 exp_1,exp_2,exp_3;
+	uint16_t i,j;
+	int16_t exp_acc;
+	int16_t exp_1,exp_2,exp_3;
 
-	if(expstr == EXP_REUSE)
+	if (expstr == EXP_REUSE)
 		return;
 
 	/* Handle the initial absolute exponent */
@@ -75,8 +77,7 @@ exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp,
 		dest[j++] = exp_acc;
 
 	/* Loop through the groups and fill the dest array appropriately */
-	for(i=0; i< ngrps; i++)
-	{
+	for(i=0; i< ngrps; i++) {
 		if(exps[i] > 124)
 			goto error;
 
@@ -86,8 +87,7 @@ exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp,
 
 		exp_acc += (exp_1 - 2);
 
-		switch(expstr)
-		{
+		switch(expstr) {
 			case EXP_D45:
 				dest[j++] = exp_acc;
 				dest[j++] = exp_acc;
@@ -99,8 +99,7 @@ exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp,
 
 		exp_acc += (exp_2 - 2);
 
-		switch(expstr)
-		{
+		switch(expstr) {
 			case EXP_D45:
 				dest[j++] = exp_acc;
 				dest[j++] = exp_acc;
@@ -112,8 +111,7 @@ exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp,
 
 		exp_acc += (exp_3 - 2);
 
-		switch(expstr)
-		{
+		switch(expstr) {
 			case EXP_D45:
 				dest[j++] = exp_acc;
 				dest[j++] = exp_acc;
@@ -125,11 +123,10 @@ exp_unpack_ch(uint_16 type,uint_16 expstr,uint_16 ngrps,uint_16 initial_exp,
 	}	
 
 	return;
-
-			goto error;
 error:
-	if(!error_flag)
-		fprintf(stderr,"** Invalid exponent - skipping frame **\n");
-	error_flag = 1;
+#ifdef DEBUG
+	fprintf (stderr,"** Invalid exponent - skipping frame **\n");
+#endif
+	HANDLE_ERROR ();
 }
 
diff --git a/ac3dec/imdct.c b/ac3dec/imdct.c
index ae2794ed7..c09ef4138 100644
--- a/ac3dec/imdct.c
+++ b/ac3dec/imdct.c
@@ -28,75 +28,48 @@
 #include "ac3.h"
 #include "ac3_internal.h"
 
-
-#include "decode.h"
+#include "downmix.h"
 #include "imdct.h"
+#include "imdct_c.h"
+#ifdef HAVE_KNI
+#include "imdct_kni.h"
+#endif
+#include "srfft.h"
 
-void imdct_do_256(float data[],float delay[]);
-void imdct_do_512(float data[],float delay[]);
 
-typedef struct complex_s
-{
-	float real;
-	float imag;
-} complex_t;
+extern void (*downmix_3f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
+extern void (*downmix_3f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
+extern void (*downmix_2f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
+extern void (*downmix_2f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
+extern void (*downmix_3f_0r_to_2ch)(float *samples, dm_par_t * dm_par);
+
 
+extern void (*stream_sample_2ch_to_s16)(int16_t *s16_samples, float *left, float *right);
+extern void (*stream_sample_1ch_to_s16)(int16_t *s16_samples, float *center);
+
+void (*fft_64p) (complex_t *);
+void (*imdct_do_512) (float data[],float delay[]);
+void (*imdct_do_512_nol) (float data[], float delay[]);
+
+void imdct_do_256 (float data[],float delay[]);
 
 #define N 512
 
+/* static complex_t buf[128]; */
+//static complex_t buf[128] __attribute__((aligned(16)));
+complex_t buf[128] __attribute__((aligned(16)));
 
-/* 128 point bit-reverse LUT */
-static uint_8 bit_reverse_512[128] = {
-	0x00, 0x40, 0x20, 0x60, 0x10, 0x50, 0x30, 0x70, 
-	0x08, 0x48, 0x28, 0x68, 0x18, 0x58, 0x38, 0x78, 
-	0x04, 0x44, 0x24, 0x64, 0x14, 0x54, 0x34, 0x74, 
-	0x0c, 0x4c, 0x2c, 0x6c, 0x1c, 0x5c, 0x3c, 0x7c, 
-	0x02, 0x42, 0x22, 0x62, 0x12, 0x52, 0x32, 0x72, 
-	0x0a, 0x4a, 0x2a, 0x6a, 0x1a, 0x5a, 0x3a, 0x7a, 
-	0x06, 0x46, 0x26, 0x66, 0x16, 0x56, 0x36, 0x76, 
-	0x0e, 0x4e, 0x2e, 0x6e, 0x1e, 0x5e, 0x3e, 0x7e, 
-	0x01, 0x41, 0x21, 0x61, 0x11, 0x51, 0x31, 0x71, 
-	0x09, 0x49, 0x29, 0x69, 0x19, 0x59, 0x39, 0x79, 
-	0x05, 0x45, 0x25, 0x65, 0x15, 0x55, 0x35, 0x75, 
-	0x0d, 0x4d, 0x2d, 0x6d, 0x1d, 0x5d, 0x3d, 0x7d, 
-	0x03, 0x43, 0x23, 0x63, 0x13, 0x53, 0x33, 0x73, 
-	0x0b, 0x4b, 0x2b, 0x6b, 0x1b, 0x5b, 0x3b, 0x7b, 
-	0x07, 0x47, 0x27, 0x67, 0x17, 0x57, 0x37, 0x77, 
-	0x0f, 0x4f, 0x2f, 0x6f, 0x1f, 0x5f, 0x3f, 0x7f};
-
-static uint_8 bit_reverse_256[64] = {
-	0x00, 0x20, 0x10, 0x30, 0x08, 0x28, 0x18, 0x38, 
-	0x04, 0x24, 0x14, 0x34, 0x0c, 0x2c, 0x1c, 0x3c, 
-	0x02, 0x22, 0x12, 0x32, 0x0a, 0x2a, 0x1a, 0x3a, 
-	0x06, 0x26, 0x16, 0x36, 0x0e, 0x2e, 0x1e, 0x3e, 
-	0x01, 0x21, 0x11, 0x31, 0x09, 0x29, 0x19, 0x39, 
-	0x05, 0x25, 0x15, 0x35, 0x0d, 0x2d, 0x1d, 0x3d, 
-	0x03, 0x23, 0x13, 0x33, 0x0b, 0x2b, 0x1b, 0x3b, 
-	0x07, 0x27, 0x17, 0x37, 0x0f, 0x2f, 0x1f, 0x3f};
-
-static complex_t buf[128];
-
-/* Twiddle factor LUT */
-static complex_t *w[7];
-static complex_t w_1[1];
-static complex_t w_2[2];
-static complex_t w_4[4];
-static complex_t w_8[8];
-static complex_t w_16[16];
-static complex_t w_32[32];
-static complex_t w_64[64];
+/* Delay buffer for time domain interleaving */
+static float delay[6][256];
+static float delay1[6][256];
 
 /* Twiddle factors for IMDCT */
-static float xcos1[128];
-static float xsin1[128];
 static float xcos2[64];
 static float xsin2[64];
 
-/* Delay buffer for time domain interleaving */
-static float delay[6][256];
-
 /* Windowing function for Modified DCT - Thank you acroread */
-static float window[] = {
+//static float window[] = {
+float window[] = {
 	0.00014, 0.00024, 0.00037, 0.00051, 0.00067, 0.00086, 0.00107, 0.00130,
 	0.00157, 0.00187, 0.00220, 0.00256, 0.00297, 0.00341, 0.00390, 0.00443,
 	0.00501, 0.00564, 0.00632, 0.00706, 0.00785, 0.00871, 0.00962, 0.01061,
@@ -128,146 +101,116 @@ static float window[] = {
 	0.99978, 0.99981, 0.99984, 0.99986, 0.99988, 0.99990, 0.99992, 0.99993,
 	0.99994, 0.99995, 0.99996, 0.99997, 0.99998, 0.99998, 0.99998, 0.99999,
 	0.99999, 0.99999, 0.99999, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000,
-	1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000 };
-
+	1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
+};
 
-static inline void swap_cmplx(complex_t *a, complex_t *b)
+//static const int pm128[128] =
+const int pm128[128] =
 {
-	complex_t tmp;
-
-	tmp = *a;
-	*a = *b;
-	*b = tmp;
-}
-
-
-
-static inline complex_t cmplx_mult(complex_t a, complex_t b)
+	0, 16, 32, 48, 64, 80,  96, 112,  8, 40, 72, 104, 24, 56,  88, 120,
+	4, 20, 36, 52, 68, 84, 100, 116, 12, 28, 44,  60, 76, 92, 108, 124,
+	2, 18, 34, 50, 66, 82,  98, 114, 10, 42, 74, 106, 26, 58,  90, 122,
+	6, 22, 38, 54, 70, 86, 102, 118, 14, 46, 78, 110, 30, 62,  94, 126,
+	1, 17, 33, 49, 65, 81,  97, 113,  9, 41, 73, 105, 25, 57,  89, 121,
+	5, 21, 37, 53, 69, 85, 101, 117, 13, 29, 45,  61, 77, 93, 109, 125,
+	3, 19, 35, 51, 67, 83,  99, 115, 11, 43, 75, 107, 27, 59,  91, 123,
+	7, 23, 39, 55, 71, 87, 103, 119, 15, 31, 47,  63, 79, 95, 111, 127
+}; 
+
+static const int pm64[64] =
 {
-	complex_t ret;
-
-	ret.real = a.real * b.real - a.imag * b.imag;
-	ret.imag = a.real * b.imag + a.imag * b.real;
-
-	return ret;
-}
-
-void imdct_init(void)
-{
-	int i,k;
-	complex_t angle_step;
-	complex_t current_angle;
-
-	/* Twiddle factors to turn IFFT into IMDCT */
-	for( i=0; i < 128; i++)
-	{
-		xcos1[i] = -cos(2.0f * M_PI * (8*i+1)/(8*N)) ; 
-		xsin1[i] = -sin(2.0f * M_PI * (8*i+1)/(8*N)) ;
-	}
-	
-	/* More twiddle factors to turn IFFT into IMDCT */
-	for( i=0; i < 64; i++)
-	{
-		xcos2[i] = -cos(2.0f * M_PI * (8*i+1)/(4*N)) ; 
-		xsin2[i] = -sin(2.0f * M_PI * (8*i+1)/(4*N)) ;
-	}
-
-	/* Canonical twiddle factors for FFT */
-	w[0] = w_1;
-	w[1] = w_2;
-	w[2] = w_4;
-	w[3] = w_8;
-	w[4] = w_16;
-	w[5] = w_32;
-	w[6] = w_64;
-
-	for( i = 0; i < 7; i++)
-	{
-		angle_step.real = cos(-2.0 * M_PI / (1 << (i+1)));
-		angle_step.imag = sin(-2.0 * M_PI / (1 << (i+1)));
-
-		current_angle.real = 1.0;
-		current_angle.imag = 0.0;
-
-		for (k = 0; k < 1 << i; k++)
-		{
-			w[i][k] = current_angle;
-			current_angle = cmplx_mult(current_angle,angle_step);
-		}
+	0,  8, 16, 24, 32, 40, 48, 56,
+	4, 20, 36, 52, 12, 28, 44, 60,
+	2, 10, 18, 26, 34, 42, 50, 58,
+	6, 14, 22, 30, 38, 46, 54, 62,
+	1,  9, 17, 25, 33, 41, 49, 57,
+	5, 21, 37, 53, 13, 29, 45, 61,
+	3, 11, 19, 27, 35, 43, 51, 59,
+	7, 23, 39, 55, 15, 31, 47, 63
+};
+
+
+void imdct_init (void)
+ {
+	int i;
+	float scale = 255.99609372;
+
+#ifdef __i386__
+#ifdef HAVE_KNI
+	if (!imdct_init_kni ());
+	else
+#endif
+#endif
+	if (!imdct_init_c ());
+
+	// More twiddle factors to turn IFFT into IMDCT */
+	for (i=0; i < 64; i++) {
+		xcos2[i] = cos(2.0f * M_PI * (8*i+1)/(4*N)) * scale;
+		xsin2[i] = sin(2.0f * M_PI * (8*i+1)/(4*N)) * scale;
 	}
 }
 
-void
-imdct_do_512(float data[],float delay[])
+
+void imdct_do_256 (float data[],float delay[])
 {
-	int i,k;
-	int p,q;
-	int m;
-	int two_m;
-	int two_m_plus_one;
+	int i, j, k;
+	int p, q;
 
 	float tmp_a_i;
 	float tmp_a_r;
-	float tmp_b_i;
-	float tmp_b_r;
 
 	float *data_ptr;
 	float *delay_ptr;
 	float *window_ptr;
-	
-	//
-	// 512 IMDCT with source and dest data in 'data'
-	//
-	
-	// Pre IFFT complex multiply plus IFFT cmplx conjugate and bit reverse
-	// permutation
-	for( i=0; i < 128; i++)
-	{
-		k = bit_reverse_512[i];
-
-		/* z[i] = (X[256-2*i-1] + j * X[2*i]) * (xcos1[i] + j * xsin1[i]) ; */ 
-		buf[k].real =         (data[256-2*i-1] * xcos1[i])  -  (data[2*i]       * xsin1[i]);
-	  buf[k].imag = -1.0 * ((data[2*i]       * xcos1[i])  +  (data[256-2*i-1] * xsin1[i]));
-	}
 
-	// FFT Merge 
-	for (m=0; m < 7; m++)
-	{
-		if(m)
-			two_m = (1 << m);
-		else
-			two_m = 1;
-
-		two_m_plus_one = (1 << (m+1));
-
-		for(k = 0; k < two_m; k++)
-		{
-			for(i = 0; i < 128; i += two_m_plus_one)
-			{
-				p = k + i;
-				q = p + two_m;
-				tmp_a_r = buf[p].real;
-				tmp_a_i = buf[p].imag;
-				tmp_b_r = buf[q].real * w[m][k].real - buf[q].imag * w[m][k].imag;
-				tmp_b_i = buf[q].imag * w[m][k].real + buf[q].real * w[m][k].imag;
-				buf[p].real = tmp_a_r + tmp_b_r;
-				buf[p].imag =  tmp_a_i + tmp_b_i;
-				buf[q].real = tmp_a_r - tmp_b_r;
-				buf[q].imag =  tmp_a_i - tmp_b_i;
+	complex_t *buf1, *buf2;
 
-			}
-		}
+	buf1 = &buf[0];
+	buf2 = &buf[64];
+
+// Pre IFFT complex multiply plus IFFT complex conjugate
+	for (k=0; k<64; k++) { 
+		/* X1[k] = X[2*k]	*/
+		/* X2[k] = X[2*k+1]	*/
+
+		j = pm64[k];
+		p = 2 * (128-2*j-1);
+		q = 2 * (2 * j);
+
+		/* Z1[k] = (X1[128-2*k-1] + j * X1[2*k]) * (xcos2[k] + j * xsin2[k]); */
+		buf1[k].re =         data[p] * xcos2[j] - data[q] * xsin2[j];
+		buf1[k].im = -1.0f * (data[q] * xcos2[j] + data[p] * xsin2[j]);
+		/* Z2[k] = (X2[128-2*k-1] + j * X2[2*k]) * (xcos2[k] + j * xsin2[k]); */
+		buf2[k].re =          data[p + 1] * xcos2[j] - data[q + 1] * xsin2[j];
+		buf2[k].im = -1.0f * ( data[q + 1] * xcos2[j] + data[p + 1] * xsin2[j]);
 	}
 
-	/* Post IFFT complex multiply  plus IFFT complex conjugate*/
-	for( i=0; i < 128; i++)
-	{
-		/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
-		tmp_a_r = buf[i].real;
-		tmp_a_i = buf[i].imag;
-		//Note that I flipped the signs on the imaginary ops to do the complex conj
-		buf[i].real =(tmp_a_r * xcos1[i])  +  (tmp_a_i  * xsin1[i]);
-	  buf[i].imag =(tmp_a_r * xsin1[i])  -  (tmp_a_i  * xcos1[i]);
+	fft_64p(&buf1[0]);
+	fft_64p(&buf2[0]);
+
+#ifdef DEBUG
+       //DEBUG FFT
+#if 0
+	printf ("Post FFT, buf1\n");
+	for (i=0; i < 64; i++)
+		printf("%d %f %f\n", i, buf_1[i].re, buf_1[i].im);
+	printf ("Post FFT, buf2\n");
+	for (i=0; i < 64; i++)
+		printf("%d %f %f\n", i, buf_2[i].re, buf_2[i].im);
+#endif
+#endif
+
+
+	// Post IFFT complex multiply 
+	for( i=0; i < 64; i++) {
+		tmp_a_r =  buf1[i].re;
+		tmp_a_i = -buf1[i].im;
+		buf1[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
+		buf1[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
+		tmp_a_r =  buf2[i].re;
+		tmp_a_i = -buf2[i].im;
+		buf2[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
+		buf2[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
 	}
 	
 	data_ptr = data;
@@ -275,164 +218,122 @@ imdct_do_512(float data[],float delay[])
 	window_ptr = window;
 
 	/* Window and convert to real valued signal */
-	for(i=0; i< 64; i++) 
-	{ 
-		*data_ptr++   = 2.0f * (-buf[64+i].imag   * *window_ptr++ + *delay_ptr++); 
-		*data_ptr++   = 2.0f * ( buf[64-i-1].real * *window_ptr++ + *delay_ptr++); 
+	for(i=0; i< 64; i++) { 
+		*data_ptr++  = -buf1[i].im      * *window_ptr++ + *delay_ptr++;
+		*data_ptr++  = buf1[64-i-1].re * *window_ptr++ + *delay_ptr++;
 	}
 
-	for(i=0; i< 64; i++) 
-	{ 
-		*data_ptr++  = 2.0f * (-buf[i].real       * *window_ptr++ + *delay_ptr++); 
-		*data_ptr++  = 2.0f * ( buf[128-i-1].imag * *window_ptr++ + *delay_ptr++); 
+	for(i=0; i< 64; i++) {
+		*data_ptr++  = -buf1[i].re      * *window_ptr++ + *delay_ptr++;
+		*data_ptr++  = buf1[64-i-1].im * *window_ptr++ + *delay_ptr++;
 	}
 	
-	/* The trailing edge of the window goes into the delay line */
 	delay_ptr = delay;
 
-	for(i=0; i< 64; i++) 
-	{ 
-		*delay_ptr++  = -buf[64+i].real   * *--window_ptr; 
-		*delay_ptr++  =  buf[64-i-1].imag * *--window_ptr; 
+	for(i=0; i< 64; i++) {
+		*delay_ptr++ = -buf2[i].re      * *--window_ptr;
+		*delay_ptr++ =  buf2[64-i-1].im * *--window_ptr;
 	}
 
-	for(i=0; i<64; i++) 
-	{
-		*delay_ptr++  =  buf[i].imag       * *--window_ptr; 
-		*delay_ptr++  = -buf[128-i-1].real * *--window_ptr; 
+	for(i=0; i< 64; i++) {
+		*delay_ptr++ =  buf2[i].im      * *--window_ptr;
+		*delay_ptr++ = -buf2[64-i-1].re * *--window_ptr;
 	}
 }
 
-void
-imdct_do_256(float data[],float delay[])
+
+/**
+ *
+ **/
+
+void imdct_do_256_nol (float data[], float delay[])
 {
-	int i,k;
-	int p,q;
-	int m;
-	int two_m;
-	int two_m_plus_one;
+	int i, j, k;
+	int p, q;
 
 	float tmp_a_i;
 	float tmp_a_r;
-	float tmp_b_i;
-	float tmp_b_r;
 
 	float *data_ptr;
 	float *delay_ptr;
 	float *window_ptr;
 
-	complex_t *buf_1, *buf_2;
-
-	buf_1 = &buf[0];
-	buf_2 = &buf[64];
-
-	// Pre IFFT complex multiply plus IFFT cmplx conjugate and bit reverse
-	// permutation
-	for(i=0; i<64; i++) 
-	{ 
-		/* X1[i] = X[2*i]  */
-		/* X2[i] = X[2*i+1]     */
-
-		k = bit_reverse_256[i];
-
-		p = 2 * (128-2*i-1);
-		q = 2 * (2 * i);
-
-		/* Z1[i] = (X1[128-2*i-1] + j * X1[2*i]) * (xcos2[i] + j * xsin2[i]); */ 
-		buf_1[k].real =         data[p] * xcos2[i] - data[q] * xsin2[i];
-	  buf_1[k].imag = -1.0f * (data[q] * xcos2[i] + data[p] * xsin2[i]); 
-		/* Z2[i] = (X2[128-2*i-1] + j * X2[2*i]) * (xcos2[i] + j * xsin2[i]); */ 
-		buf_2[k].real =          data[p + 1] * xcos2[i] - data[q + 1] * xsin2[i];
-	  buf_2[k].imag = -1.0f * ( data[q + 1] * xcos2[i] + data[p + 1] * xsin2[i]); 
-	}
-
-	// FFT Merge 
-	for (m=0; m < 6; m++)
-	{
-		two_m = (1 << m);
-		two_m_plus_one = (1 << (m+1));
-
-		if(m)
-			two_m = (1 << m);
-		else
-			two_m = 1;
-
-		for(k = 0; k < two_m; k++)
-		{
-			for(i = 0; i < 64; i += two_m_plus_one)
-			{
-				p = k + i;
-				q = p + two_m;
-				//Do block 1
-				tmp_a_r = buf_1[p].real;
-				tmp_a_i = buf_1[p].imag;
-				tmp_b_r = buf_1[q].real * w[m][k].real - buf_1[q].imag * w[m][k].imag;
-				tmp_b_i = buf_1[q].imag * w[m][k].real + buf_1[q].real * w[m][k].imag;
-				buf_1[p].real = tmp_a_r + tmp_b_r;
-				buf_1[p].imag =  tmp_a_i + tmp_b_i;
-				buf_1[q].real = tmp_a_r - tmp_b_r;
-				buf_1[q].imag =  tmp_a_i - tmp_b_i;
-
-				//Do block 2
-				tmp_a_r = buf_2[p].real;
-				tmp_a_i = buf_2[p].imag;
-				tmp_b_r = buf_2[q].real * w[m][k].real - buf_2[q].imag * w[m][k].imag;
-				tmp_b_i = buf_2[q].imag * w[m][k].real + buf_2[q].real * w[m][k].imag;
-				buf_2[p].real = tmp_a_r + tmp_b_r;
-				buf_2[p].imag =  tmp_a_i + tmp_b_i;
-				buf_2[q].real = tmp_a_r - tmp_b_r;
-				buf_2[q].imag =  tmp_a_i - tmp_b_i;
-
-			}
-		}
-	}
-
-	// Post IFFT complex multiply 
-	for( i=0; i < 64; i++)
-	{
-		//Note that I flipped the signs on the imaginary ops to do the complex conj
-		
-		/* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ 
-		tmp_a_r = buf_1[i].real;
-		tmp_a_i = buf_1[i].imag;
-		buf_1[i].real =(tmp_a_r * xcos2[i])  +  (tmp_a_i  * xsin2[i]);
-	  buf_1[i].imag =(tmp_a_r * xsin2[i])  -  (tmp_a_i  * xcos2[i]);
-		/* y2[n] = z2[n] * (xcos2[n] + j * xsin2[n]) ; */ 
-		tmp_a_r = buf_2[i].real;
-		tmp_a_i = buf_2[i].imag;
-		buf_2[i].real =(tmp_a_r * xcos2[i])  +  (tmp_a_i  * xsin2[i]);
-	  buf_2[i].imag =(tmp_a_r * xsin2[i])  -  (tmp_a_i  * xcos2[i]);
-	}
-	
-	data_ptr = data;
-	delay_ptr = delay;
-	window_ptr = window;
-
-	/* Window and convert to real valued signal */
-	for(i=0; i< 64; i++) 
-	{ 
-		*data_ptr++  = 2.0f * (-buf_1[i].imag      * *window_ptr++ + *delay_ptr++);
-		*data_ptr++  = 2.0f * ( buf_1[64-i-1].real * *window_ptr++ + *delay_ptr++);
-	}
-
-	for(i=0; i< 64; i++) 
-	{
-		*data_ptr++  = 2.0f * (-buf_1[i].real      * *window_ptr++ + *delay_ptr++);
-		*data_ptr++  = 2.0f * ( buf_1[64-i-1].imag * *window_ptr++ + *delay_ptr++);
-	}
-	
-	delay_ptr = delay;
-
-	for(i=0; i< 64; i++) 
-	{
-		*delay_ptr++ = -buf_2[i].real      * *--window_ptr;
-		*delay_ptr++ =  buf_2[64-i-1].imag * *--window_ptr;
-	}
-
-	for(i=0; i< 64; i++) 
-	{
-		*delay_ptr++ =  buf_2[i].imag      * *--window_ptr;
-		*delay_ptr++ = -buf_2[64-i-1].real * *--window_ptr;
+	complex_t *buf1, *buf2;
+
+	buf1 = &buf[0];
+	buf2 = &buf[64];
+
+       /* Pre IFFT complex multiply plus IFFT cmplx conjugate */
+	for(k=0; k<64; k++) {
+               /* X1[k] = X[2*k]  */
+               /* X2[k] = X[2*k+1]     */
+               j = pm64[k];
+               p = 2 * (128-2*j-1);
+               q = 2 * (2 * j);
+
+               /* Z1[k] = (X1[128-2*k-1] + j * X1[2*k]) * (xcos2[k] + j * xsin2[k]); */
+               buf1[k].re =         data[p] * xcos2[j] - data[q] * xsin2[j];
+               buf1[k].im = -1.0f * (data[q] * xcos2[j] + data[p] * xsin2[j]);
+               /* Z2[k] = (X2[128-2*k-1] + j * X2[2*k]) * (xcos2[k] + j * xsin2[k]); */
+               buf2[k].re =          data[p + 1] * xcos2[j] - data[q + 1] * xsin2[j];
+               buf2[k].im = -1.0f * ( data[q + 1] * xcos2[j] + data[p + 1] * xsin2[j]);
+       }
+
+
+       fft_64p(&buf1[0]);
+       fft_64p(&buf2[0]);
+
+#ifdef DEBUG
+	//DEBUG FFT
+#if 0
+       printf("Post FFT, buf1\n");
+       for (i=0; i < 64; i++)
+               printf("%d %f %f\n", i, buf_1[i].re, buf_1[i].im);
+       printf("Post FFT, buf2\n");
+       for (i=0; i < 64; i++)
+               printf("%d %f %f\n", i, buf_2[i].re, buf_2[i].im);
+#endif
+#endif
+
+       /* Post IFFT complex multiply */
+       for( i=0; i < 64; i++) {
+               /* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */
+               tmp_a_r =  buf1[i].re;
+               tmp_a_i = -buf1[i].im;
+               buf1[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
+               buf1[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
+               /* y2[n] = z2[n] * (xcos2[n] + j * xsin2[n]) ; */
+               tmp_a_r =  buf2[i].re;
+               tmp_a_i = -buf2[i].im;
+               buf2[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
+               buf2[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
+       }
+      
+       data_ptr = data;
+       delay_ptr = delay;
+       window_ptr = window;
+
+       /* Window and convert to real valued signal, no overlap */
+       for(i=0; i< 64; i++) {
+               *data_ptr++  = -buf1[i].im      * *window_ptr++;
+               *data_ptr++  = buf1[64-i-1].re * *window_ptr++;
+       }
+
+       for(i=0; i< 64; i++) {
+               *data_ptr++  = -buf1[i].re      * *window_ptr++ + *delay_ptr++;
+               *data_ptr++  = buf1[64-i-1].im * *window_ptr++ + *delay_ptr++;
+       }
+
+       delay_ptr = delay;
+
+       for(i=0; i< 64; i++) {
+               *delay_ptr++ = -buf2[i].re      * *--window_ptr;
+               *delay_ptr++ =  buf2[64-i-1].im * *--window_ptr;
+       }
+
+       for(i=0; i< 64; i++) {
+               *delay_ptr++ =  buf2[i].im      * *--window_ptr;
+               *delay_ptr++ = -buf2[64-i-1].re * *--window_ptr;
 	}
 }
 
@@ -440,29 +341,190 @@ imdct_do_256(float data[],float delay[])
 ///#include <sys/time.h>
 //FIXME remove
 
-void 
-imdct(bsi_t *bsi,audblk_t *audblk, stream_samples_t samples) {
+void imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples, int16_t *s16_samples, dm_par_t* dm_par)
+{
 	int i;
+	int doable = 0;
+	float *center=NULL, *left, *right, *left_sur, *right_sur;
+	float *delay_left, *delay_right;
+	float *delay1_left, *delay1_right, *delay1_center, *delay1_sr, *delay1_sl;
+	float right_tmp, left_tmp;
+	void (*do_imdct)(float data[], float deley[]);
+
+	// test if dm in frequency is doable
+	if (!(doable = audblk->blksw[0]))
+		do_imdct = imdct_do_512;
+	else
+		do_imdct = imdct_do_256;
+
+	// downmix in the frequency domain if all the channels
+	// use the same imdct
+	for (i=0; i < bsi->nfchans; i++) {
+		if (doable != audblk->blksw[i]) {
+			do_imdct = NULL;
+			break;
+		}
+	}
 
-	//handy timing code
-	//struct timeval start,end;
+	if (do_imdct) {
+		//dowmix first and imdct
+		switch(bsi->acmod) {
+		case 7:		// 3/2
+			downmix_3f_2r_to_2ch (samples[0], dm_par);
+			break;
+		case 6:		// 2/2
+			downmix_2f_2r_to_2ch (samples[0], dm_par);
+			break;
+		case 5:		// 3/1
+			downmix_3f_1r_to_2ch (samples[0], dm_par);
+			break;
+		case 4:		// 2/1
+			downmix_2f_1r_to_2ch (samples[0], dm_par);
+			break;
+		case 3:		// 3/0
+			downmix_3f_0r_to_2ch (samples[0], dm_par);
+			break;
+		case 2:
+			break;
+		default:	// 1/0
+			if (bsi->acmod == 1)
+				center = samples[0];
+			else if (bsi->acmod == 0)
+				center = samples[ac3_config.dual_mono_ch_sel];
+			do_imdct(center, delay[0]); // no downmix
+
+			stream_sample_1ch_to_s16 (s16_samples, center);
+
+			return;
+			//goto done;
+			break;
+		}
 
-	//gettimeofday(&start,0);
-	
-	for(i=0; i<bsi->nfchans;i++)
-	{
-		if(audblk->blksw[i])
-			imdct_do_256(samples[i],delay[i]);
-		else
-			imdct_do_512(samples[i],delay[i]);
+		do_imdct (samples[0], delay[0]);
+		do_imdct (samples[1], delay[1]);
+		stream_sample_2ch_to_s16(s16_samples, samples[0], samples[1]);
+
+	} else {		//imdct and then dowmix
+		// delay and samples should be saved and mixed
+		//fprintf(stderr, "time domain downmix\n");
+		for (i=0; i<bsi->nfchans; i++) {
+			if (audblk->blksw[i])
+				imdct_do_256_nol (samples[i],delay1[i]);
+			else
+				imdct_do_512_nol (samples[i],delay1[i]);
+		}
+
+		// mix the sample, overlap
+		switch(bsi->acmod) {
+		case 7:		// 3/2
+			left = samples[0];
+			center = samples[1];
+			right = samples[2];
+			left_sur = samples[3];
+			right_sur = samples[4];
+			delay_left = delay[0];
+			delay_right = delay[1];
+			delay1_left = delay1[0];
+			delay1_center = delay1[1];
+			delay1_right = delay1[2];
+			delay1_sl = delay1[3];
+			delay1_sr = delay1[4];
+
+			for (i = 0; i < 256; i++) {
+				left_tmp = dm_par->unit * *left++  + dm_par->clev * *center  + dm_par->slev * *left_sur++;
+				right_tmp= dm_par->unit * *right++ + dm_par->clev * *center++ + dm_par->slev * *right_sur++;
+				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
+				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
+				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->clev * *delay1_center  + dm_par->slev * *delay1_sl++;
+				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->clev * *center++ + dm_par->slev * *delay1_sr++;
+			}
+			break;
+		case 6:		// 2/2
+			left = samples[0];
+			right = samples[1];
+			left_sur = samples[2];
+			right_sur = samples[3];
+			delay_left = delay[0];
+			delay_right = delay[1];
+			delay1_left = delay1[0];
+			delay1_right = delay1[1];
+			delay1_sl = delay1[2];
+			delay1_sr = delay1[3];
+
+			for (i = 0; i < 256; i++) {
+				left_tmp = dm_par->unit * *left++  + dm_par->slev * *left_sur++;
+				right_tmp= dm_par->unit * *right++ + dm_par->slev * *right_sur++;
+				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
+				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
+				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->slev * *delay1_sl++;
+				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->slev * *delay1_sr++;
+			}
+			break;
+		case 5:		// 3/1
+			left = samples[0];
+			center = samples[1];
+			right = samples[2];
+			right_sur = samples[3];
+			delay_left = delay[0];
+			delay_right = delay[1];
+			delay1_left = delay1[0];
+			delay1_center = delay1[1];
+			delay1_right = delay1[2];
+			delay1_sl = delay1[3];
+
+			for (i = 0; i < 256; i++) {
+				left_tmp = dm_par->unit * *left++  + dm_par->clev * *center  - dm_par->slev * *right_sur;
+				right_tmp= dm_par->unit * *right++ + dm_par->clev * *center++ + dm_par->slev * *right_sur++;
+				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
+				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
+				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->clev * *delay1_center  + dm_par->slev * *delay1_sl;
+				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->clev * *center++ + dm_par->slev * *delay1_sl++;
+			}
+			break;
+		case 4:		// 2/1
+			left = samples[0];
+			right = samples[1];
+			right_sur = samples[2];
+			delay_left = delay[0];
+			delay_right = delay[1];
+			delay1_left = delay1[0];
+			delay1_right = delay1[1];
+			delay1_sl = delay1[2];
+
+			for (i = 0; i < 256; i++) {
+				left_tmp = dm_par->unit * *left++ - dm_par->slev * *right_sur;
+				right_tmp= dm_par->unit * *right++ + dm_par->slev * *right_sur++;
+				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
+				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
+				*delay_left++ = dm_par->unit * *delay1_left++ + dm_par->slev * *delay1_sl;
+				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->slev * *delay1_sl++;
+			}
+			break;
+		case 3:		// 3/0
+			left = samples[0];
+			center = samples[1];
+			right = samples[2];
+			delay_left = delay[0];
+			delay_right = delay[1];
+			delay1_left = delay1[0];
+			delay1_center = delay1[1];
+			delay1_right = delay1[2];
+
+			for (i = 0; i < 256; i++) {
+				left_tmp = dm_par->unit * *left++  + dm_par->clev * *center;
+				right_tmp= dm_par->unit * *right++ + dm_par->clev * *center++;
+				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
+				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
+				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->clev * *delay1_center;
+				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->clev * *center++;
+			}
+			break;
+		case 2:		// copy to output
+			for (i = 0; i < 256; i++) {
+				*s16_samples++ = (int16_t)samples[0][i];
+				*s16_samples++ = (int16_t)samples[1][i];
+			}
+			break;
+		}
 	}
-	//gettimeofday(&end,0);
-	//printf("imdct %ld us\n",(end.tv_sec - start.tv_sec) * 1000000 +
-        //end.tv_usec - start.tv_usec);
-
-	//XXX We don't bother with the IMDCT for the LFE as it's currently
-	//unused.
-	//if (bsi->lfeon)
-	//	imdct_do_512(coeffs->lfe,samples->channel[5],delay[5]);
-	//	
 }
diff --git a/ac3dec/imdct.h b/ac3dec/imdct.h
index 750aa8798..8f10af00b 100644
--- a/ac3dec/imdct.h
+++ b/ac3dec/imdct.h
@@ -22,5 +22,5 @@
  *
  */
 
-void imdct(bsi_t *bsi,audblk_t *audblk, stream_samples_t samples);
+void imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples, int16_t *s16_samples, dm_par_t *dm_par);
 void imdct_init(void);
diff --git a/ac3dec/imdct512_kni.S b/ac3dec/imdct512_kni.S
new file mode 100644
index 000000000..10b8de6fe
--- /dev/null
+++ b/ac3dec/imdct512_kni.S
@@ -0,0 +1,548 @@
+/* 
+ *  imdct512_kni.S
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - October 2000
+ *
+ *
+ *  imdct512_kni.S is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  imdct512_kni.S is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifdef __i386__
+
+.text
+	.align 4
+.global imdct512_pre_ifft_twiddle_kni
+	.type imdct512_pre_ifft_twiddle_kni, @function
+imdct512_pre_ifft_twiddle_kni:
+	
+	pushl %ebp
+	movl  %esp, %ebp
+	addl  $-4, %esp /* local variable, loop counter */
+	
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+	pushl %edx
+	pushl %edi
+	pushl %esi
+
+	movl 8(%ebp), %eax  	/* pmt */
+	movl 12(%ebp), %ebx	/* buf */
+	movl 16(%ebp), %ecx	/* data */
+	movl 20(%ebp), %edx 	/* xcos_sin_sse */
+	movl $64, -4(%ebp)
+	
+	
+.loop:
+	movl (%eax), %esi
+	movl 4(%eax), %edi
+	movss (%ecx, %esi, 8), %xmm1 /* 2j */
+	movss (%ecx, %edi, 8), %xmm3 /* 2(j+1) */
+
+	shll $1, %esi
+	shll $1, %edi
+
+	movaps (%edx, %esi, 8), %xmm0; /* -c_j | -s_j | -s_j | c_j */
+	movaps (%edx, %edi, 8), %xmm2; /* -c_j+1 | -s_j+1 | -s_j+1 | c_j+1 */
+
+	negl %esi
+	negl %edi
+
+	movss 1020(%ecx, %esi, 4), %xmm4 /* 255-2j */
+	addl $8, %eax
+	movss 1020(%ecx, %edi, 4), %xmm5 /* 255-2(j+1) */
+
+	shufps $0, %xmm1, %xmm4 /* 2j | 2j | 255-2j | 255-2j */
+	shufps $0, %xmm3, %xmm5 /* 2(j+1) | 2(j+1) | 255-2(j+1) | 255-2(j+1) */
+	mulps %xmm4, %xmm0
+	mulps %xmm5, %xmm2
+	movhlps %xmm0, %xmm1
+	movhlps %xmm2, %xmm3
+	addl $16, %ebx
+	addps %xmm1, %xmm0
+	addps %xmm3, %xmm2
+	movlhps %xmm2, %xmm0
+	movaps %xmm0, -16(%ebx)
+	decl -4(%ebp)
+     	jnz .loop
+
+	popl %esi
+	popl %edi
+	popl %edx
+	popl %ecx
+	popl %ebx
+	popl %eax
+
+	addl $4, %esp
+	popl %ebp
+
+	ret
+	.p2align 4,0
+
+.global imdct512_post_ifft_twiddle_kni
+	.type imdct512_post_ifft_twiddle_kni, @function
+imdct512_post_ifft_twiddle_kni:
+	
+	pushl %ebp
+	movl  %esp, %ebp
+	
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+
+	movl 8(%ebp), %eax /* buf[] */
+	movl 12(%ebp), %ebx /* xcos_sin_sse[] */
+	movl $32, %ecx /* loop counter */
+
+.loop1:
+	movaps	(%eax), %xmm0  /*  im1 | re1 | im0 | re0 */
+
+	movaps  (%ebx), %xmm2  /* -c | -s | -s | c */
+	movhlps  %xmm0, %xmm1  /* im1 | re1 */
+	movaps  16(%ebx), %xmm3  /* -c1 | -s1 | -s1 | c1 */
+
+	shufps $0x50, %xmm0, %xmm0 /* im0 | im0 | re0 | re0 */
+	shufps $0x50, %xmm1, %xmm1 /* im1 | im1 | re1 | re1 */
+
+	movaps  16(%eax), %xmm4 /* im3 | re3 | im2 | re2 */
+
+	shufps $0x27, %xmm2, %xmm2 /* c | -s | -s | -c */
+	movhlps  %xmm4, %xmm5 /* im3 | re3 */
+	shufps $0x27, %xmm3, %xmm3 /* c1 | -s1 | -s1 | -c1 */
+
+	movaps  32(%ebx), %xmm6   /* -c2 | -s2 | -s2 | c2 */
+	movaps  48(%ebx), %xmm7   /* -c3 | -s3 | -s3 | c3 */
+
+	shufps $0x50, %xmm4, %xmm4 /* im2 | im2 | re2 | re2 */
+	shufps $0x50, %xmm5, %xmm5 /* im3 | im3 | re3 | re3 */
+
+	mulps %xmm2, %xmm0
+	mulps %xmm3, %xmm1
+
+	shufps $0x27, %xmm6, %xmm6 /* c2 | -s2 | -s2 | -c2 */
+	shufps $0x27, %xmm7, %xmm7 /* c3 | -s3 | -s3 | -c3 */
+
+	movhlps %xmm0, %xmm2
+	movhlps %xmm1, %xmm3
+
+	mulps %xmm6, %xmm4
+	mulps %xmm7, %xmm5
+
+	addps %xmm2, %xmm0
+	addps %xmm3, %xmm1
+
+	movhlps %xmm4, %xmm6
+	movhlps %xmm5, %xmm7
+
+	addps %xmm6, %xmm4
+	addps %xmm7, %xmm5
+
+	movlhps %xmm1, %xmm0
+	movlhps %xmm5, %xmm4
+
+	movaps %xmm0, (%eax)
+	movaps %xmm4, 16(%eax)
+	addl $64, %ebx
+	addl $32, %eax
+	decl %ecx
+	jnz .loop1
+
+	popl %ecx
+	popl %ebx
+	popl %eax
+
+	leave
+	ret
+	.p2align 4,0
+
+.global imdct512_window_delay_kni
+	.type imdct512_window_delay_kni, @function
+imdct512_window_delay_kni:
+	
+	pushl %ebp
+	movl  %esp, %ebp
+	
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+	pushl %edx
+	pushl %esi
+	pushl %edi
+
+	movl 20(%ebp), %ebx /* delay */
+	movl 16(%ebp), %edx /* window */
+
+	movl 8(%ebp), %eax  /* buf */
+	movl $16, %ecx /* loop count */
+	leal 516(%eax), %esi /* buf[64].im */
+	leal 504(%eax), %edi /* buf[63].re */ 
+	movl 12(%ebp), %eax /* data */
+.first_128_samples:
+
+	movss (%esi), %xmm0
+	movss 8(%esi), %xmm2
+	movss (%edi), %xmm1
+	movss -8(%edi), %xmm3
+
+	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
+
+	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	movaps (%ebx), %xmm5 /* d3 | d2 | d1 | d0 */
+	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
+
+	movss 16(%esi), %xmm6 /* im2 */
+	movss 24(%esi), %xmm7 /* im3 */
+	subps %xmm1, %xmm0  /* -re1 | im1 | -re0 | im0 */
+	movss -16(%edi), %xmm2 /* re2 */
+	movss -24(%edi), %xmm3 /* re3 */
+	mulps %xmm4, %xmm0
+	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
+	addps %xmm5, %xmm0
+	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
+	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
+	movaps 16(%ebx), %xmm5 /* d7 | d6 | d5 | d4 */
+	subps %xmm2, %xmm6 /* -re3 | im3 | -re2 | im2 */
+	addl $32, %edx
+	movaps %xmm0, (%eax)
+	addl $32, %ebx
+	mulps %xmm4, %xmm6
+	addl $32, %esi
+	addl $32, %eax
+	addps %xmm5, %xmm6
+	addl $-32, %edi
+	movaps %xmm6, -16(%eax)
+	decl %ecx
+	jnz .first_128_samples
+
+	movl 8(%ebp), %esi  /* buf[0].re */
+	leal 1020(%esi), %edi /* buf[127].im */ 
+	movl $16, %ecx /* loop count */
+.second_128_samples:
+
+	movss (%esi), %xmm0 /* buf[i].re */
+	movss 8(%esi), %xmm2 /* re1 */
+	movss (%edi), %xmm1 /* buf[127-i].im */
+	movss -8(%edi), %xmm3 /* im1 */
+
+	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im1 */
+	
+	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	movaps (%ebx), %xmm5 /* d3 | d2 | d1 | d0 */
+
+	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
+	movss 16(%esi), %xmm6 /* re2 */
+	movss 24(%esi), %xmm7 /* re3 */
+	movss -16(%edi), %xmm2 /* im2 */
+	movss -24(%edi), %xmm3 /* im3 */
+	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
+	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
+	mulps %xmm4, %xmm0
+	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
+	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
+	addl $32, %esi
+	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
+	addps %xmm5, %xmm0
+	mulps %xmm4, %xmm6
+	addl $-32, %edi
+	movaps 16(%ebx), %xmm5 /* d7 | d6 | d5 | d4 */
+	movaps %xmm0, (%eax)
+	addps %xmm5, %xmm6
+	addl $32, %edx
+	addl $32, %eax
+	addl $32, %ebx
+	movaps %xmm6, -16(%eax)
+	decl %ecx
+	jnz .second_128_samples
+
+	movl 8(%ebp), %eax
+	leal 512(%eax), %esi /* buf[64].re */
+	leal 508(%eax), %edi /* buf[63].im */ 
+	movl $16, %ecx /* loop count */
+	movl 20(%ebp), %eax /* delay */
+.first_128_delay:
+
+	movss (%esi), %xmm0
+	movss 8(%esi), %xmm2
+	movss (%edi), %xmm1
+	movss -8(%edi), %xmm3
+
+	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im0 */
+
+	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
+	movss 16(%esi), %xmm6 /* re2 */
+	movss 24(%esi), %xmm7 /* re3 */
+	movss -16(%edi), %xmm2 /* im2 */
+	movss -24(%edi), %xmm3 /* im3 */
+	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
+	addl $-32, %edx
+	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
+	mulps %xmm4, %xmm0
+	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
+	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
+	movaps %xmm0, (%eax)
+	addl $32, %esi
+	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
+	addl $-32, %edi
+	mulps %xmm5, %xmm6
+	addl $32, %eax
+	movaps %xmm6, -16(%eax)
+	decl %ecx
+	jnz .first_128_delay
+
+	movl 8(%ebp), %ebx
+	leal 4(%ebx), %esi /* buf[0].im */
+	leal 1016(%ebx), %edi /* buf[127].re */ 
+	movl $16, %ecx /* loop count */
+.second_128_delay:
+
+	movss (%esi), %xmm0
+	movss 8(%esi), %xmm2
+	movss (%edi), %xmm1
+	movss -8(%edi), %xmm3
+
+	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
+
+	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
+	movss 16(%esi), %xmm6 /* im2 */
+	movss 24(%esi), %xmm7 /* im3 */
+	movss -16(%edi), %xmm2 /* re2 */
+	movss -24(%edi), %xmm3 /* re3 */
+	subps %xmm0, %xmm1 /* re1 | -im1 | re0 | -im0 */
+	addl $-32, %edx
+	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
+	mulps %xmm4, %xmm1
+	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
+	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
+	movaps %xmm1, (%eax)
+	addl $32, %esi
+	subps %xmm6, %xmm2 /* re | -im3 | re | -im2 */
+	addl $-32, %edi
+	mulps %xmm5, %xmm2
+	addl $32, %eax
+	movaps %xmm2, -16(%eax)
+	decl %ecx
+	jnz .second_128_delay
+
+	popl %edi
+	popl %esi
+	popl %edx
+	popl %ecx
+	popl %ebx
+	popl %eax
+	
+	leave
+	ret
+	.p2align 4,0
+	
+.global imdct512_window_delay_nol_kni
+	.type imdct512_window_delay_nol_kni, @function
+imdct512_window_delay_nol_kni:
+	
+	pushl %ebp
+	movl  %esp, %ebp
+	
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+	pushl %edx
+	pushl %esi
+	pushl %edi
+
+	/* movl 20(%ebp), %ebx delay */
+	movl 16(%ebp), %edx /* window */
+
+	movl 8(%ebp), %eax  /* buf */
+	movl $16, %ecx /* loop count */
+	leal 516(%eax), %esi /* buf[64].im */
+	leal 504(%eax), %edi /* buf[63].re */ 
+	movl 12(%ebp), %eax /* data */
+.first_128_sample:
+
+	movss (%esi), %xmm0
+	movss 8(%esi), %xmm2
+	movss (%edi), %xmm1
+	movss -8(%edi), %xmm3
+
+	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
+
+	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	/* movaps (%ebx), %xmm5 d3 | d2 | d1 | d0 */
+	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
+
+	movss 16(%esi), %xmm6 /* im2 */
+	movss 24(%esi), %xmm7 /* im3 */
+	subps %xmm1, %xmm0  /* -re1 | im1 | -re0 | im0 */
+	movss -16(%edi), %xmm2 /* re2 */
+	movss -24(%edi), %xmm3 /* re3 */
+	mulps %xmm4, %xmm0
+	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
+	/* addps %xmm5, %xmm0 */
+	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
+	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
+	/* movaps 16(%ebx), %xmm5  d7 | d6 | d5 | d4 */
+	subps %xmm2, %xmm6 /* -re3 | im3 | -re2 | im2 */
+	addl $32, %edx
+	movaps %xmm0, (%eax)
+	/* addl $32, %ebx */
+	mulps %xmm4, %xmm6
+	addl $32, %esi
+	addl $32, %eax
+	/* addps %xmm5, %xmm6 */
+	addl $-32, %edi
+	movaps %xmm6, -16(%eax)
+	decl %ecx
+	jnz .first_128_sample
+
+	movl 8(%ebp), %esi  /* buf[0].re */
+	leal 1020(%esi), %edi /* buf[127].im */ 
+	movl $16, %ecx /* loop count */
+.second_128_sample:
+
+	movss (%esi), %xmm0 /* buf[i].re */
+	movss 8(%esi), %xmm2 /* re1 */
+	movss (%edi), %xmm1 /* buf[127-i].im */
+	movss -8(%edi), %xmm3 /* im1 */
+
+	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im1 */
+	
+	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	/* movaps (%ebx), %xmm5 d3 | d2 | d1 | d0 */
+
+	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
+	movss 16(%esi), %xmm6 /* re2 */
+	movss 24(%esi), %xmm7 /* re3 */
+	movss -16(%edi), %xmm2 /* im2 */
+	movss -24(%edi), %xmm3 /* im3 */
+	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
+	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
+	mulps %xmm4, %xmm0
+	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
+	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
+	addl $32, %esi
+	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
+	/* addps %xmm5, %xmm0 */
+	mulps %xmm4, %xmm6
+	addl $-32, %edi
+	/* movaps 16(%ebx), %xmm5  d7 | d6 | d5 | d4 */
+	movaps %xmm0, (%eax)
+	/* addps %xmm5, %xmm6 */
+	addl $32, %edx
+	addl $32, %eax
+	/* addl $32, %ebx */
+	movaps %xmm6, -16(%eax)
+	decl %ecx
+	jnz .second_128_sample
+
+	movl 8(%ebp), %eax
+	leal 512(%eax), %esi /* buf[64].re */
+	leal 508(%eax), %edi /* buf[63].im */ 
+	movl $16, %ecx /* loop count */
+	movl 20(%ebp), %eax /* delay */
+.first_128_delays:
+
+	movss (%esi), %xmm0
+	movss 8(%esi), %xmm2
+	movss (%edi), %xmm1
+	movss -8(%edi), %xmm3
+
+	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im0 */
+
+	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
+	movss 16(%esi), %xmm6 /* re2 */
+	movss 24(%esi), %xmm7 /* re3 */
+	movss -16(%edi), %xmm2 /* im2 */
+	movss -24(%edi), %xmm3 /* im3 */
+	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
+	addl $-32, %edx
+	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
+	mulps %xmm4, %xmm0
+	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
+	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
+	movaps %xmm0, (%eax)
+	addl $32, %esi
+	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
+	addl $-32, %edi
+	mulps %xmm5, %xmm6
+	addl $32, %eax
+	movaps %xmm6, -16(%eax)
+	decl %ecx
+	jnz .first_128_delays
+
+	movl 8(%ebp), %ebx
+	leal 4(%ebx), %esi /* buf[0].im */
+	leal 1016(%ebx), %edi /* buf[127].re */ 
+	movl $16, %ecx /* loop count */
+.second_128_delays:
+
+	movss (%esi), %xmm0
+	movss 8(%esi), %xmm2
+	movss (%edi), %xmm1
+	movss -8(%edi), %xmm3
+
+	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
+	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
+
+	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
+	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
+	movss 16(%esi), %xmm6 /* im2 */
+	movss 24(%esi), %xmm7 /* im3 */
+	movss -16(%edi), %xmm2 /* re2 */
+	movss -24(%edi), %xmm3 /* re3 */
+	subps %xmm0, %xmm1 /* re1 | -im1 | re0 | -im0 */
+	addl $-32, %edx
+	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
+	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
+	mulps %xmm4, %xmm1
+	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
+	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
+	movaps %xmm1, (%eax)
+	addl $32, %esi
+	subps %xmm6, %xmm2 /* re | -im3 | re | -im2 */
+	addl $-32, %edi
+	mulps %xmm5, %xmm2
+	addl $32, %eax
+	movaps %xmm2, -16(%eax)
+	decl %ecx
+	jnz .second_128_delays
+
+	popl %edi
+	popl %esi
+	popl %edx
+	popl %ecx
+	popl %ebx
+	popl %eax
+	
+	leave
+	ret
+	.p2align 4,0
+#endif
diff --git a/ac3dec/imdct_c.c b/ac3dec/imdct_c.c
new file mode 100644
index 000000000..1f2bfe849
--- /dev/null
+++ b/ac3dec/imdct_c.c
@@ -0,0 +1,218 @@
+/* 
+ *  imdct.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+#include "downmix.h"
+#include "imdct_c.h"
+#include "srfft.h"
+
+
+#define N 512
+
+extern void (*imdct_do_512) (float data[],float delay[]);
+extern void (*imdct_do_512_nol) (float data[], float delay[]);
+extern void (*fft_64p) (complex_t *);
+
+extern const int pm128[];
+extern float window[];
+extern complex_t buf[128];
+
+extern void fft_64p_c (complex_t *);
+extern void fft_128p_c (complex_t *);
+
+static void imdct_do_512_c (float data[],float delay[]);
+static void imdct_do_512_nol_c (float data[], float delay[]);
+
+/* Twiddle factors for IMDCT */
+static float xcos1[128] __attribute__((aligned(16)));
+static float xsin1[128] __attribute__((aligned(16)));
+
+
+int imdct_init_c (void)
+{
+	int i;
+	float scale = 255.99609372;
+
+	imdct_do_512 = imdct_do_512_c;
+	imdct_do_512_nol = imdct_do_512_nol_c;
+	fft_64p = fft_64p_c;
+
+	/* Twiddle factors to turn IFFT into IMDCT */
+         
+	for (i=0; i < 128; i++) {
+		xcos1[i] = cos(2.0f * M_PI * (8*i+1)/(8*N)) * scale; 
+		xsin1[i] = sin(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
+	}
+
+	return 0;
+}
+
+
+static void imdct_do_512_c (float data[], float delay[])
+{
+	int i, j;
+	float tmp_a_r, tmp_a_i;
+	float *data_ptr;
+	float *delay_ptr;
+	float *window_ptr;
+
+// 512 IMDCT with source and dest data in 'data'
+// Pre IFFT complex multiply plus IFFT complex conjugate
+
+	for( i=0; i < 128; i++) {
+		j = pm128[i];
+		//a = (data[256-2*j-1] - data[2*j]) * (xcos1[j] + xsin1[j]);
+		//c = data[2*j] * xcos1[j];
+		//b = data[256-2*j-1] * xsin1[j];
+		//buf1[i].re = a - b + c;
+		//buf1[i].im = b + c;
+		buf[i].re = (data[256-2*j-1] * xcos1[j]) - (data[2*j] * xsin1[j]);
+		buf[i].im = -1.0 * (data[2*j] * xcos1[j] + data[256-2*j-1] * xsin1[j]);
+	}
+
+	fft_128p_c (&buf[0]);
+
+// Post IFFT complex multiply  plus IFFT complex conjugate
+	for (i=0; i < 128; i++) {
+		tmp_a_r = buf[i].re;
+		tmp_a_i = buf[i].im;
+		//a = (tmp_a_r - tmp_a_i) * (xcos1[j] + xsin1[j]);
+		//b = tmp_a_r * xsin1[j];
+		//c = tmp_a_i * xcos1[j];
+		//buf[j].re = a - b + c;
+		//buf[j].im = b + c;
+		buf[i].re =(tmp_a_r * xcos1[i])  +  (tmp_a_i  * xsin1[i]);
+		buf[i].im =(tmp_a_r * xsin1[i])  -  (tmp_a_i  * xcos1[i]);
+	}
+
+	data_ptr = data;
+	delay_ptr = delay;
+	window_ptr = window;
+
+// Window and convert to real valued signal
+	for (i=0; i< 64; i++) {
+		*data_ptr++   = -buf[64+i].im   * *window_ptr++ + *delay_ptr++;
+		*data_ptr++   = buf[64-i-1].re * *window_ptr++ + *delay_ptr++;
+	}
+
+	for(i=0; i< 64; i++) {
+		*data_ptr++  = -buf[i].re       * *window_ptr++ + *delay_ptr++;
+		*data_ptr++  = buf[128-i-1].im * *window_ptr++ + *delay_ptr++;
+	}
+
+// The trailing edge of the window goes into the delay line
+	delay_ptr = delay;
+
+	for(i=0; i< 64; i++) {
+		*delay_ptr++  = -buf[64+i].re   * *--window_ptr;
+		*delay_ptr++  =  buf[64-i-1].im * *--window_ptr;
+	}
+
+	for(i=0; i<64; i++) {
+		*delay_ptr++  =  buf[i].im       * *--window_ptr;
+		*delay_ptr++  = -buf[128-i-1].re * *--window_ptr;
+	}
+}
+
+
+static void imdct_do_512_nol_c (float data[], float delay[])
+{
+	int i, j;
+
+	float tmp_a_i;
+	float tmp_a_r;
+
+	float *data_ptr;
+	float *delay_ptr;
+	float *window_ptr;
+
+        //
+        // 512 IMDCT with source and dest data in 'data'
+        //
+
+	// Pre IFFT complex multiply plus IFFT cmplx conjugate
+
+        for( i=0; i < 128; i++) {
+	/* z[i] = (X[256-2*i-1] + j * X[2*i]) * (xcos1[i] + j * xsin1[i]) */
+		j = pm128[i];
+	//a = (data[256-2*j-1] - data[2*j]) * (xcos1[j] + xsin1[j]);
+	//c = data[2*j] * xcos1[j];
+	//b = data[256-2*j-1] * xsin1[j];
+	//buf1[i].re = a - b + c;
+
+         //buf1[i].im = b + c;
+		buf[i].re = (data[256-2*j-1] * xcos1[j]) - (data[2*j] * xsin1[j]);
+		buf[i].im = -1.0 * (data[2*j] * xcos1[j] + data[256-2*j-1] * xsin1[j]);
+	}
+       
+	fft_128p_c (&buf[0]);
+
+       /* Post IFFT complex multiply  plus IFFT complex conjugate*/
+	for (i=0; i < 128; i++) {
+		/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
+		/* int j1 = i; */
+		tmp_a_r = buf[i].re;
+		tmp_a_i = buf[i].im;
+		//a = (tmp_a_r - tmp_a_i) * (xcos1[j] + xsin1[j]);
+		//b = tmp_a_r * xsin1[j];
+		//c = tmp_a_i * xcos1[j];
+		//buf[j].re = a - b + c;
+		//buf[j].im = b + c;
+		buf[i].re =(tmp_a_r * xcos1[i])  +  (tmp_a_i  * xsin1[i]);
+		buf[i].im =(tmp_a_r * xsin1[i])  -  (tmp_a_i  * xcos1[i]);
+	}
+       
+	data_ptr = data;
+	delay_ptr = delay;
+	window_ptr = window;
+
+	/* Window and convert to real valued signal, no overlap here*/
+	for (i=0; i< 64; i++) { 
+		*data_ptr++   = -buf[64+i].im   * *window_ptr++; 
+		*data_ptr++   = buf[64-i-1].re * *window_ptr++; 
+	}
+
+	for(i=0; i< 64; i++) { 
+		*data_ptr++  = -buf[i].re       * *window_ptr++; 
+		*data_ptr++  = buf[128-i-1].im * *window_ptr++; 
+	}
+       
+	/* The trailing edge of the window goes into the delay line */
+	delay_ptr = delay;
+
+	for(i=0; i< 64; i++) { 
+		*delay_ptr++  = -buf[64+i].re   * *--window_ptr; 
+		*delay_ptr++  =  buf[64-i-1].im * *--window_ptr; 
+	}
+
+	for(i=0; i<64; i++) {
+		*delay_ptr++  =  buf[i].im       * *--window_ptr; 
+		*delay_ptr++  = -buf[128-i-1].re * *--window_ptr; 
+	}
+}
diff --git a/ac3dec/imdct_c.h b/ac3dec/imdct_c.h
new file mode 100644
index 000000000..d2c31b54b
--- /dev/null
+++ b/ac3dec/imdct_c.h
@@ -0,0 +1,36 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __IMDCT_C_H__
+#define __IMDCT_C_H__
+
+#include "cmplx.h"
+
+int imdct_init_c (void);
+
+void fft_128p_c (complex_t *);
+void fft_64p_c (complex_t *);
+
+void imdct512_pre_ifft_twiddle_c (const int *pmt, complex_t *buf, float *data, float *xcos_sin_sse);
+void imdct512_post_ifft_twiddle_c (complex_t *buf, float *xcos_sin_sse);
+void imdct512_window_delay_c (complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
+void imdct512_window_delay_nol_c (complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
+
+#endif
diff --git a/ac3dec/imdct_kni.c b/ac3dec/imdct_kni.c
new file mode 100644
index 000000000..b44547a95
--- /dev/null
+++ b/ac3dec/imdct_kni.c
@@ -0,0 +1,103 @@
+/* 
+ *  imdct_kni.c
+ *
+ *	Copyright (C) Aaron Holtzman - May 1999
+ *
+ *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
+ *	
+ *  ac3dec is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  ac3dec is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ *
+ */
+
+#ifdef __i386__
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <mm_accel.h>
+#include "ac3.h"
+#include "ac3_internal.h"
+
+#include "downmix.h"
+#include "imdct_kni.h"
+#include "srfft.h"
+
+#define N 512
+
+/* Delay buffer for time domain interleaving */
+static float xcos_sin_sse[128 * 4] __attribute__((aligned(16)));
+
+extern void (*imdct_do_512) (float data[],float delay[]);
+extern void (*imdct_do_512_nol) (float data[], float delay[]);
+extern void (*fft_64p) (complex_t *);
+
+extern const int pm128[];
+extern float window[];
+extern complex_t buf[128];
+
+extern void fft_64p_kni (complex_t *);
+extern void fft_128p_kni (complex_t *);
+
+static void imdct_do_512_kni (float data[], float delay[]);
+static void imdct_do_512_nol_kni (float data[], float delay[]);
+
+
+int imdct_init_kni (void)
+{
+	uint32_t accel = mm_accel ();
+
+	if (accel & MM_ACCEL_X86_MMXEXT) {
+		int i;
+		float scale = 255.99609372;
+
+		fprintf (stderr, "Using SSE for IMDCT\n");
+		imdct_do_512 = imdct_do_512_kni;
+		imdct_do_512_nol = imdct_do_512_nol_kni;
+		fft_64p = fft_64p_kni;
+
+		for (i=0; i < 128; i++) {
+			float xcos_i = cos(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
+                       	float xsin_i = sin(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
+                       	xcos_sin_sse[i * 4] = xcos_i;
+                       	xcos_sin_sse[i * 4 + 1] = -xsin_i;
+                       	xcos_sin_sse[i * 4 + 2] = -xsin_i;
+                       	xcos_sin_sse[i * 4 + 3] = -xcos_i;
+               	}
+
+		return 0;
+	} else
+		return -1;
+}
+
+
+static void imdct_do_512_kni (float data[], float delay[])
+{
+	imdct512_pre_ifft_twiddle_kni (pm128, buf, data, xcos_sin_sse);
+	fft_128p_kni (buf);
+	imdct512_post_ifft_twiddle_kni (buf, xcos_sin_sse);
+	imdct512_window_delay_kni (buf, data, window, delay);
+}
+
+
+static void imdct_do_512_nol_kni (float data[], float delay[])
+{
+	imdct512_pre_ifft_twiddle_kni (pm128, buf, data, xcos_sin_sse);  
+	fft_128p_kni (buf);
+	imdct512_post_ifft_twiddle_kni (buf, xcos_sin_sse);
+	imdct512_window_delay_nol_kni (buf, data, window, delay);
+}
+
+#endif
diff --git a/ac3dec/imdct_kni.h b/ac3dec/imdct_kni.h
new file mode 100644
index 000000000..2193c0753
--- /dev/null
+++ b/ac3dec/imdct_kni.h
@@ -0,0 +1,36 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __IMDCT_KNI_H__
+#define __IMDCT_KNI_H__
+
+#include "cmplx.h"
+
+int imdct_init_kni (void);
+
+void fft_128p_kni(complex_t *);
+void fft_64p_kni(complex_t *);
+
+void imdct512_pre_ifft_twiddle_kni(const int *pmt, complex_t *buf, float *data, float *xcos_sin_sse);
+void imdct512_post_ifft_twiddle_kni(complex_t *buf, float *xcos_sin_sse);
+void imdct512_window_delay_kni(complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
+void imdct512_window_delay_nol_kni(complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
+
+#endif
diff --git a/ac3dec/mm_accel.h b/ac3dec/mm_accel.h
new file mode 100644
index 000000000..82dc5837f
--- /dev/null
+++ b/ac3dec/mm_accel.h
@@ -0,0 +1,36 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __MM_ACCEL_H__
+#define __MM_ACCEL_H__
+
+#include <inttypes.h>
+
+// generic accelerations
+#define MM_ACCEL_MLIB		0x00000001
+
+// x86 accelerations
+#define MM_ACCEL_X86_MMX	0x80000000
+#define MM_ACCEL_X86_3DNOW	0x40000000
+#define MM_ACCEL_X86_MMXEXT	0x20000000
+
+uint32_t mm_accel (void);
+
+#endif
diff --git a/ac3dec/parse.c b/ac3dec/parse.c
index 3560bc5ab..49ea57c67 100644
--- a/ac3dec/parse.c
+++ b/ac3dec/parse.c
@@ -31,15 +31,16 @@
 #include "bitstream.h"
 #include "stats.h"
 #include "debug.h"
+#include "crc.h"
 #include "parse.h"
 
 /* Misc LUT */
-static const uint_16 nfchans[8] = {2,1,2,3,3,4,4,5};
+static const uint16_t nfchans[8] = {2,1,2,3,3,4,4,5};
 
 struct frmsize_s
 {
-	uint_16 bit_rate;
-	uint_16 frm_size[3];
+	uint16_t bit_rate;
+	uint16_t frm_size[3];
 };
 
 static const struct frmsize_s frmsizecod_tbl[64] = 
@@ -85,8 +86,7 @@ static const struct frmsize_s frmsizecod_tbl[64] =
 };
 
 /* Parse a syncinfo structure, minus the sync word */
-void
-parse_syncinfo(syncinfo_t *syncinfo,uint_8 *data)
+void parse_syncinfo(syncinfo_t *syncinfo, uint8_t *data)
 {
 	//
 	// We need to read in the entire syncinfo struct (0x0b77 + 24 bits)
@@ -96,10 +96,8 @@ parse_syncinfo(syncinfo_t *syncinfo,uint_8 *data)
 	// Get the sampling rate 
 	syncinfo->fscod  = (data[2] >> 6) & 0x3;
 
-	if(syncinfo->fscod == 3)
-	{
+	if(syncinfo->fscod == 3) {
 		//invalid sampling rate code
-		error_flag = 1;	
 		return;
 	}
 	else if(syncinfo->fscod == 2)
@@ -119,15 +117,13 @@ parse_syncinfo(syncinfo_t *syncinfo,uint_8 *data)
 
 }
 
-/*
+
+/**
  * This routine fills a bsi struct from the AC3 stream
- */
+ **/
 
-void
-parse_bsi(bsi_t *bsi)
+void parse_bsi(bsi_t *bsi)
 {
-	uint_32 i;
-
 	/* Check the AC-3 version number */
 	bsi->bsid = bitstream_get(5);
 
@@ -159,25 +155,19 @@ parse_bsi(bsi_t *bsi)
 	bsi->dialnorm = bitstream_get(5);
 
 	/* Does compression gain exist? */
-	bsi->compre = bitstream_get(1);
-	if (bsi->compre)
-	{
+	if ((bsi->compre = bitstream_get(1))) {
 		/* Get compression gain */
 		bsi->compr = bitstream_get(8);
 	}
 
 	/* Does language code exist? */
-	bsi->langcode = bitstream_get(1);
-	if (bsi->langcode)
-	{
+	if ((bsi->langcode = bitstream_get(1))) {
 		/* Get langauge code */
 		bsi->langcod = bitstream_get(8);
 	}
 
 	/* Does audio production info exist? */
-	bsi->audprodie = bitstream_get(1);
-	if (bsi->audprodie)
-	{
+	if ((bsi->audprodie = bitstream_get(1))) {
 		/* Get mix level */
 		bsi->mixlevel = bitstream_get(5);
 
@@ -186,31 +176,24 @@ parse_bsi(bsi_t *bsi)
 	}
 
 	/* If we're in dual mono mode then get some extra info */
-	if (bsi->acmod ==0)
-	{
+	if (!bsi->acmod) {
 		/* Get the dialogue normalization level two */
 		bsi->dialnorm2 = bitstream_get(5);
 
 		/* Does compression gain two exist? */
-		bsi->compr2e = bitstream_get(1);
-		if (bsi->compr2e)
-		{
+		if ((bsi->compr2e = bitstream_get(1))) {
 			/* Get compression gain two */
 			bsi->compr2 = bitstream_get(8);
 		}
 
 		/* Does language code two exist? */
-		bsi->langcod2e = bitstream_get(1);
-		if (bsi->langcod2e)
-		{
+		if ((bsi->langcod2e = bitstream_get(1))) {
 			/* Get langauge code two */
 			bsi->langcod2 = bitstream_get(8);
 		}
 
 		/* Does audio production info two exist? */
-		bsi->audprodi2e = bitstream_get(1);
-		if (bsi->audprodi2e)
-		{
+		if ((bsi->audprodi2e = bitstream_get(1))) {
 			/* Get mix level two */
 			bsi->mixlevel2 = bitstream_get(5);
 
@@ -226,22 +209,17 @@ parse_bsi(bsi_t *bsi)
 	bsi->origbs = bitstream_get(1);
 	
 	/* Does timecode one exist? */
-	bsi->timecod1e = bitstream_get(1);
-
-	if(bsi->timecod1e)
+	if ((bsi->timecod1e = bitstream_get(1)))
 		bsi->timecod1 = bitstream_get(14);
 
 	/* Does timecode two exist? */
-	bsi->timecod2e = bitstream_get(1);
-
-	if(bsi->timecod2e)
+	if ((bsi->timecod2e = bitstream_get(1)))
 		bsi->timecod2 = bitstream_get(14);
 
 	/* Does addition info exist? */
-	bsi->addbsie = bitstream_get(1);
+	if ((bsi->addbsie = bitstream_get(1))) {
+		uint32_t i;
 
-	if(bsi->addbsie)
-	{
 		/* Get how much info is there */
 		bsi->addbsil = bitstream_get(6);
 
@@ -253,52 +231,41 @@ parse_bsi(bsi_t *bsi)
 	stats_print_bsi(bsi);
 }
 
+
 /* More pain inducing parsing */
-void
-parse_audblk(bsi_t *bsi,audblk_t *audblk)
+void parse_audblk(bsi_t *bsi,audblk_t *audblk)
 {
 	int i,j;
 
-	for (i=0;i < bsi->nfchans; i++)
-	{
+	for (i=0; i < bsi->nfchans; i++) {
 		/* Is this channel an interleaved 256 + 256 block ? */
 		audblk->blksw[i] = bitstream_get(1);
 	}
 
-	for (i=0;i < bsi->nfchans; i++)
-	{
+	for (i=0;i < bsi->nfchans; i++) {
 		/* Should we dither this channel? */
 		audblk->dithflag[i] = bitstream_get(1);
 	}
 
 	/* Does dynamic range control exist? */
-	audblk->dynrnge = bitstream_get(1);
-	if (audblk->dynrnge)
-	{
+	if ((audblk->dynrnge = bitstream_get(1))) {
 		/* Get dynamic range info */
 		audblk->dynrng = bitstream_get(8);
 	}
 
 	/* If we're in dual mono mode then get the second channel DR info */
-	if (bsi->acmod == 0)
-	{
+	if (bsi->acmod == 0) {
 		/* Does dynamic range control two exist? */
-		audblk->dynrng2e = bitstream_get(1);
-		if (audblk->dynrng2e)
-		{
+		if ((audblk->dynrng2e = bitstream_get(1))) {
 			/* Get dynamic range info */
 			audblk->dynrng2 = bitstream_get(8);
 		}
 	}
 
 	/* Does coupling strategy exist? */
-	audblk->cplstre = bitstream_get(1);
-	if (audblk->cplstre)
-	{
+	if ((audblk->cplstre = bitstream_get(1))) {
 		/* Is coupling turned on? */
-		audblk->cplinu = bitstream_get(1);
-		if(audblk->cplinu)
-		{
+		if ((audblk->cplinu = bitstream_get(1))) {
 			for(i=0;i < bsi->nfchans; i++)
 				audblk->chincpl[i] = bitstream_get(1);
 			if(bsi->acmod == 0x2)
@@ -315,30 +282,23 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 			 * band */
 			audblk->ncplbnd = audblk->ncplsubnd; 
 
-			for(i=1; i< audblk->ncplsubnd; i++)
-			{
+			for(i=1; i< audblk->ncplsubnd; i++) {
 				audblk->cplbndstrc[i] = bitstream_get(1);
 				audblk->ncplbnd -= audblk->cplbndstrc[i];
 			}
 		}
 	}
 
-	if(audblk->cplinu)
-	{
+	if(audblk->cplinu) {
 		/* Loop through all the channels and get their coupling co-ords */	
-		for(i=0;i < bsi->nfchans;i++)
-		{
+		for(i=0;i < bsi->nfchans;i++) {
 			if(!audblk->chincpl[i])
 				continue;
 
 			/* Is there new coupling co-ordinate info? */
-			audblk->cplcoe[i] = bitstream_get(1);
-
-			if(audblk->cplcoe[i])
-			{
+			if ((audblk->cplcoe[i] = bitstream_get(1))) {
 				audblk->mstrcplco[i] = bitstream_get(2); 
-				for(j=0;j < audblk->ncplbnd; j++)
-				{
+				for(j=0;j < audblk->ncplbnd; j++) {
 					audblk->cplcoexp[i][j] = bitstream_get(4); 
 					audblk->cplcomant[i][j] = bitstream_get(4); 
 				}
@@ -347,8 +307,7 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 
 		/* If we're in dual mono mode, there's going to be some phase info */
 		if( (bsi->acmod == 0x2) && audblk->phsflginu && 
-				(audblk->cplcoe[0] || audblk->cplcoe[1]))
-		{
+				(audblk->cplcoe[0] || audblk->cplcoe[1])) {
 			for(j=0;j < audblk->ncplbnd; j++)
 				audblk->phsflg[j] = bitstream_get(1); 
 
@@ -356,23 +315,17 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	}
 
 	/* If we're in dual mono mode, there may be a rematrix strategy */
-	if(bsi->acmod == 0x2)
-	{
-		audblk->rematstr = bitstream_get(1);
-		if(audblk->rematstr)
-		{
-			if (audblk->cplinu == 0) 
-			{ 
+	if(bsi->acmod == 0x2) {
+		if ((audblk->rematstr = bitstream_get(1))) {
+			if (!audblk->cplinu) { 
 				for(i = 0; i < 4; i++) 
 					audblk->rematflg[i] = bitstream_get(1);
 			}
-			if((audblk->cplbegf > 2) && audblk->cplinu) 
-			{
+			if((audblk->cplbegf > 2) && audblk->cplinu) {
 				for(i = 0; i < 4; i++) 
 					audblk->rematflg[i] = bitstream_get(1);
 			}
-			if((audblk->cplbegf <= 2) && audblk->cplinu) 
-			{ 
+			if((audblk->cplbegf <= 2) && audblk->cplinu) { 
 				for(i = 0; i < 3; i++) 
 					audblk->rematflg[i] = bitstream_get(1);
 			} 
@@ -383,8 +336,7 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 		}
 	}
 
-	if (audblk->cplinu)
-	{
+	if (audblk->cplinu) {
 		/* Get the coupling channel exponent strategy */
 		audblk->cplexpstr = bitstream_get(2);
 		audblk->ncplgrps = (audblk->cplendmant - audblk->cplstrtmant) / 
@@ -399,18 +351,13 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 		audblk->lfeexpstr = bitstream_get(1);
 
 	/* Determine the bandwidths of all the fbw channels */
-	for(i = 0; i < bsi->nfchans; i++) 
-	{ 
-		uint_16 grp_size;
-
-		if(audblk->chexpstr[i] != EXP_REUSE) 
-		{ 
-			if (audblk->cplinu && audblk->chincpl[i]) 
-			{
+	for(i = 0; i < bsi->nfchans; i++) { 
+		uint16_t grp_size;
+
+		if(audblk->chexpstr[i] != EXP_REUSE) { 
+			if (audblk->cplinu && audblk->chincpl[i]) {
 				audblk->endmant[i] = audblk->cplstrtmant;
-			}
-			else
-			{
+			} else {
 				audblk->chbwcod[i] = bitstream_get(6); 
 				audblk->endmant[i] = ((audblk->chbwcod[i] + 12) * 3) + 37;
 			}
@@ -422,18 +369,15 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	}
 
 	/* Get the coupling exponents if they exist */
-	if(audblk->cplinu && (audblk->cplexpstr != EXP_REUSE))
-	{
+	if(audblk->cplinu && (audblk->cplexpstr != EXP_REUSE)) {
 		audblk->cplabsexp = bitstream_get(4);
 		for(i=0;i< audblk->ncplgrps;i++)
 			audblk->cplexps[i] = bitstream_get(7);
 	}
 
 	/* Get the fwb channel exponents */
-	for(i=0;i < bsi->nfchans; i++)
-	{
-		if(audblk->chexpstr[i] != EXP_REUSE)
-		{
+	for(i=0;i < bsi->nfchans; i++) {
+		if(audblk->chexpstr[i] != EXP_REUSE) {
 			audblk->exps[i][0] = bitstream_get(4);			
 			for(j=1;j<=audblk->nchgrps[i];j++)
 				audblk->exps[i][j] = bitstream_get(7);
@@ -442,8 +386,7 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	}
 
 	/* Get the lfe channel exponents */
-	if(bsi->lfeon && (audblk->lfeexpstr != EXP_REUSE))
-	{
+	if(bsi->lfeon && (audblk->lfeexpstr != EXP_REUSE)) {
 		audblk->lfeexps[0] = bitstream_get(4);
 		audblk->lfeexps[1] = bitstream_get(7);
 		audblk->lfeexps[2] = bitstream_get(7);
@@ -452,8 +395,7 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	/* Get the parametric bit allocation parameters */
 	audblk->baie = bitstream_get(1);
 
-	if(audblk->baie)
-	{
+	if(audblk->baie) {
 		audblk->sdcycod = bitstream_get(2);
 		audblk->fdcycod = bitstream_get(2);
 		audblk->sgaincod = bitstream_get(2);
@@ -464,23 +406,19 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	/* Get the SNR off set info if it exists */
 	audblk->snroffste = bitstream_get(1);
 
-	if(audblk->snroffste)
-	{
+	if(audblk->snroffste) {
 		audblk->csnroffst = bitstream_get(6);
 
-		if(audblk->cplinu)
-		{
+		if(audblk->cplinu) {
 			audblk->cplfsnroffst = bitstream_get(4);
 			audblk->cplfgaincod = bitstream_get(3);
 		}
 
-		for(i = 0;i < bsi->nfchans; i++)
-		{
+		for(i = 0;i < bsi->nfchans; i++) {
 			audblk->fsnroffst[i] = bitstream_get(4);
 			audblk->fgaincod[i] = bitstream_get(3);
 		}
-		if(bsi->lfeon)
-		{
+		if(bsi->lfeon) {
 
 			audblk->lfefsnroffst = bitstream_get(4);
 			audblk->lfefgaincod = bitstream_get(3);
@@ -488,12 +426,10 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	}
 
 	/* Get coupling leakage info if it exists */
-	if(audblk->cplinu)
-	{
+	if(audblk->cplinu) {
 		audblk->cplleake = bitstream_get(1);	
 		
-		if(audblk->cplleake)
-		{
+		if(audblk->cplleake) {
 			audblk->cplfleak = bitstream_get(3);
 			audblk->cplsleak = bitstream_get(3);
 		}
@@ -502,32 +438,26 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	/* Get the delta bit alloaction info */
 	audblk->deltbaie = bitstream_get(1);	
 	
-	if(audblk->deltbaie)
-	{
+	if(audblk->deltbaie) {
 		if(audblk->cplinu)
 			audblk->cpldeltbae = bitstream_get(2);
 
 		for(i = 0;i < bsi->nfchans; i++)
 			audblk->deltbae[i] = bitstream_get(2);
 
-		if (audblk->cplinu && (audblk->cpldeltbae == DELTA_BIT_NEW))
-		{
+		if (audblk->cplinu && (audblk->cpldeltbae == DELTA_BIT_NEW)) {
 			audblk->cpldeltnseg = bitstream_get(3);
-			for(i = 0;i < audblk->cpldeltnseg + 1; i++)
-			{
+			for(i = 0;i < audblk->cpldeltnseg + 1; i++) {
 				audblk->cpldeltoffst[i] = bitstream_get(5);
 				audblk->cpldeltlen[i] = bitstream_get(4);
 				audblk->cpldeltba[i] = bitstream_get(3);
 			}
 		}
 
-		for(i = 0;i < bsi->nfchans; i++)
-		{
-			if (audblk->deltbae[i] == DELTA_BIT_NEW)
-			{
+		for(i = 0;i < bsi->nfchans; i++) {
+			if (audblk->deltbae[i] == DELTA_BIT_NEW) {
 				audblk->deltnseg[i] = bitstream_get(3);
-				for(j = 0; j < audblk->deltnseg[i] + 1; j++)
-				{
+				for(j = 0; j < audblk->deltnseg[i] + 1; j++) {
 					audblk->deltoffst[i][j] = bitstream_get(5);
 					audblk->deltlen[i][j] = bitstream_get(4);
 					audblk->deltba[i][j] = bitstream_get(3);
@@ -537,61 +467,15 @@ parse_audblk(bsi_t *bsi,audblk_t *audblk)
 	}
 
 	/* Check to see if there's any dummy info to get */
-	if((audblk->skiple =  bitstream_get(1)))
-	{
-		uint_16 skip_data;
+	if((audblk->skiple =  bitstream_get(1))) {
+		uint16_t skip_data;
 
 		audblk->skipl = bitstream_get(9);
-		//XXX remove
-		//fprintf(stderr,"(parse) skipping %d bytes\n",audblk->skipl);
 
-		for(i = 0; i < audblk->skipl ; i++)
-		{
+		for (i = 0; i < audblk->skipl; i++) {
 			skip_data = bitstream_get(8);
-			//XXX remove
-			//fprintf(stderr,"skipped data %2x\n",skip_data);
-			//if(skip_data != 0)
-			//{	
-				//dprintf("(parse) Invalid skipped data %2x\n",skip_data);
-				//exit(1);
-			//}
 		}
 	}
 
 	stats_print_audblk(bsi,audblk);
 }
-
-void
-parse_auxdata(syncinfo_t *syncinfo)
-{
-	//FIXME keep this now that we don't really need it?
-#if 0
-	int i;
-	int skip_length;
-	uint_16 crc;
-	uint_16 auxdatae;
-
-	skip_length = (syncinfo->frame_size * 16)  - bitstream_get_total_bits() - 17 - 1;
-
-	//XXX remove
-	//dprintf("(auxdata) skipping %d auxbits\n",skip_length);
-	
-	for(i=0; i <  skip_length; i++)
-		//printf("Skipped bit %i\n",(uint_16)bitstream_get(1));
-		bitstream_get(1);
-
-	//get the auxdata exists bit
-	auxdatae = bitstream_get(1);	
-
-	//XXX remove
-	//dprintf("auxdatae = %i\n",auxdatae);
-
-	//Skip the CRC reserved bit
-	bitstream_get(1);
-
-	//Get the crc
-	crc = bitstream_get(16);
-#endif
-}
-
-
diff --git a/ac3dec/parse.h b/ac3dec/parse.h
index cdaee66f4..6264fea1d 100644
--- a/ac3dec/parse.h
+++ b/ac3dec/parse.h
@@ -21,8 +21,6 @@
  *
  */
 
-void parse_syncinfo(syncinfo_t *syncinfo,uint_8 *data);
+void parse_syncinfo(syncinfo_t *syncinfo,uint8_t *data);
 void parse_audblk(bsi_t *bsi,audblk_t *audblk);
 void parse_bsi(bsi_t *bsi);
-void parse_auxdata(syncinfo_t *syncinfo);
-
diff --git a/ac3dec/rematrix.c b/ac3dec/rematrix.c
index caa709430..f1df19b19 100644
--- a/ac3dec/rematrix.c
+++ b/ac3dec/rematrix.c
@@ -28,52 +28,60 @@
 #include "ac3_internal.h"
 
 
-#include "decode.h"
 #include "rematrix.h"
 
+
 struct rematrix_band_s
 {
-	uint_32 start;
-	uint_32 end;
+	uint32_t start;
+	uint32_t end;
+} rematrix_band[] = {
+	{13, 24},
+	{25, 36},
+	{37, 60},
+	{61, 252}
 };
 
-struct rematrix_band_s rematrix_band[] = { {13,24}, {25,36}, {37 ,60}, {61,252}};
 
-static inline uint_32 min(uint_32 a,uint_32 b);
+/**
+ *
+ **/
 
-static inline uint_32
-min(uint_32 a,uint_32 b)
+inline uint32_t min (uint32_t a, uint32_t b)
 {
-	return (a < b ? a : b);
+	return (a < b) ? a : b;
 }
 
-/* This routine simply does stereo rematixing for the 2 channel 
- * stereo mode */
-void rematrix(audblk_t *audblk, stream_samples_t samples)
+
+/**
+ * This routine simply does stereo remartixing for the 2 channel 
+ * stereo mode
+ **/
+
+void rematrix (audblk_t *audblk, stream_samples_t samples)
 {
-	uint_32 num_bands;
-	uint_32 start;
-	uint_32 end;
-	uint_32 i,j;
-	float left,right;
+	uint32_t num_bands;
+	uint32_t start;
+	uint32_t end;
+	int i,j;
 
-	if(!audblk->cplinu || audblk->cplbegf > 2)
+	if (!audblk->cplinu || audblk->cplbegf > 2)
 		num_bands = 4;
 	else if (audblk->cplbegf > 0)
 		num_bands = 3;
 	else
 		num_bands = 2;
 
-	for(i=0;i < num_bands; i++)
-	{
-		if(!audblk->rematflg[i])
+	for (i=0; i < num_bands; i++) {
+		if (!audblk->rematflg[i])
 			continue;
 
 		start = rematrix_band[i].start;
-		end = min(rematrix_band[i].end ,12 * audblk->cplbegf + 36);
+		end = min (rematrix_band[i].end ,12 * audblk->cplbegf + 36);
 	
-		for(j=start;j < end; j++)
-		{
+		for (j=start;j < end; j++) {
+			float left,right;
+
 			left  = samples[0][j] + samples[1][j];
 			right = samples[0][j] - samples[1][j];
 			samples[0][j] = left;
diff --git a/ac3dec/sanity_check.c b/ac3dec/sanity_check.c
index 461f20ea9..d475de14f 100644
--- a/ac3dec/sanity_check.c
+++ b/ac3dec/sanity_check.c
@@ -28,8 +28,11 @@
 #include "sanity_check.h"
 
 
-void 
-sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
+/**
+ *
+ **/
+
+void sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
 {
 	syncinfo->magic = AC3_MAGIC_NUMBER;
 	bsi->magic = AC3_MAGIC_NUMBER;
@@ -38,94 +41,84 @@ sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
 	audblk->magic3 = AC3_MAGIC_NUMBER;
 }
 
-void 
-sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
+
+/**
+ *
+ **/
+
+int sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
 {
 	int i;
 
-	if(syncinfo->magic != AC3_MAGIC_NUMBER)
-	{
+	if(syncinfo->magic != AC3_MAGIC_NUMBER) {
 		fprintf(stderr,"\n** Sanity check failed -- syncinfo magic number **");
-		error_flag = 1;
+		return -1;
 	}
 	
-	if(bsi->magic != AC3_MAGIC_NUMBER)
-	{
+	if(bsi->magic != AC3_MAGIC_NUMBER) {
 		fprintf(stderr,"\n** Sanity check failed -- bsi magic number **");
-		error_flag = 1;
+		return -1;
 	}
 
-	if(audblk->magic1 != AC3_MAGIC_NUMBER)
-	{
+	if(audblk->magic1 != AC3_MAGIC_NUMBER) {
 		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 1 **"); 
-		error_flag = 1;
+		return -1;
 	}
 
-	if(audblk->magic2 != AC3_MAGIC_NUMBER)
-	{
+	if(audblk->magic2 != AC3_MAGIC_NUMBER) {
 		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 2 **"); 
-		error_flag = 1;
+		return -1;
 	}
 
-	if(audblk->magic3 != AC3_MAGIC_NUMBER)
-	{
+	if(audblk->magic3 != AC3_MAGIC_NUMBER) {
 		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 3 **"); 
-		error_flag = 1;
+		return -1;
 	}
 
-	for(i = 0;i < 5 ; i++)
-	{
+	for(i = 0;i < 5 ; i++) {
 		if (audblk->fbw_exp[i][255] !=0 || audblk->fbw_exp[i][254] !=0 || 
-				audblk->fbw_exp[i][253] !=0)
-		{
+				audblk->fbw_exp[i][253] !=0) {
 			fprintf(stderr,"\n** Sanity check failed -- fbw_exp out of bounds **"); 
-			error_flag = 1;
+			return -1;
 		}
 
 		if (audblk->fbw_bap[i][255] !=0 || audblk->fbw_bap[i][254] !=0 || 
-				audblk->fbw_bap[i][253] !=0)
-		{
+				audblk->fbw_bap[i][253] !=0) {
 			fprintf(stderr,"\n** Sanity check failed -- fbw_bap out of bounds **"); 
-			error_flag = 1;
+			return -1;
 		}
 
 	}
 
 	if (audblk->cpl_exp[255] !=0 || audblk->cpl_exp[254] !=0 || 
-			audblk->cpl_exp[253] !=0)
-	{
+			audblk->cpl_exp[253] !=0) {
 		fprintf(stderr,"\n** Sanity check failed -- cpl_exp out of bounds **"); 
-		error_flag = 1;
+		return -1;
 	}
 
 	if (audblk->cpl_bap[255] !=0 || audblk->cpl_bap[254] !=0 || 
-			audblk->cpl_bap[253] !=0)
-	{
+			audblk->cpl_bap[253] !=0) {
 		fprintf(stderr,"\n** Sanity check failed -- cpl_bap out of bounds **"); 
-		error_flag = 1;
+		return -1;
 	}
 
-	if (audblk->cplmant[255] !=0 || audblk->cplmant[254] !=0 || 
-			audblk->cplmant[253] !=0)
-	{
+	if (audblk->cpl_flt[255] !=0 || audblk->cpl_flt[254] !=0 || 
+			audblk->cpl_flt[253] !=0) {
 		fprintf(stderr,"\n** Sanity check failed -- cpl_mant out of bounds **"); 
-		error_flag = 1;
+		return -1;
 	}
 
-	if ((audblk->cplinu == 1) && (audblk->cplbegf > (audblk->cplendf+2)))
-	{
+	if ((audblk->cplinu == 1) && (audblk->cplbegf > (audblk->cplendf+2))) {
 		fprintf(stderr,"\n** Sanity check failed -- cpl params inconsistent **"); 
-		error_flag = 1;
+		return -1;
 	}
 
-	for(i=0; i < bsi->nfchans; i++)
-	{
-		if((audblk->chincpl[i] == 0) && (audblk->chbwcod[i] > 60))
-		{
+	for(i=0; i < bsi->nfchans; i++) {
+		if((audblk->chincpl[i] == 0) && (audblk->chbwcod[i] > 60)) {
 			fprintf(stderr,"\n** Sanity check failed -- chbwcod too big **"); 
-			error_flag = 1;
+			return -1;
 		}
 	}
 
-	return;
+	return 0;
 }	
diff --git a/ac3dec/sanity_check.h b/ac3dec/sanity_check.h
index c4ca63a21..ead9399c9 100644
--- a/ac3dec/sanity_check.h
+++ b/ac3dec/sanity_check.h
@@ -23,5 +23,5 @@
 
 #define AC3_MAGIC_NUMBER 0xdeadbeef
 
-void sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
-void sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
+void sanity_check_init (syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
+int sanity_check (syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/srfft.c b/ac3dec/srfft.c
new file mode 100644
index 000000000..4cbb62954
--- /dev/null
+++ b/ac3dec/srfft.c
@@ -0,0 +1,305 @@
+/* 
+ *  srfft.c
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
+ *
+ *  64 and 128 point split radix fft for ac3dec
+ *
+ *  The algorithm is desribed in the book:
+ *  "Computational Frameworks of the Fast Fourier Transform".
+ *
+ *  The ideas and the the organization of code borrowed from djbfft written by
+ *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
+ *  http://cr.yp.to/djbfft.html.
+ *
+ *  srfft.c is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  srfft.c is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdio.h>
+
+#include "srfft.h"
+#include "srfftp.h"
+
+void fft_8 (complex_t *x);
+
+void fft_4(complex_t *x)
+{
+  /* delta_p = 1 here */
+  /* x[k] = sum_{i=0..3} x[i] * w^{i*k}, w=e^{-2*pi/4} 
+   */
+
+  register float yt_r, yt_i, yb_r, yb_i, u_r, u_i, vi_r, vi_i;
+  
+  yt_r = x[0].re;
+  yb_r = yt_r - x[2].re;
+  yt_r += x[2].re;
+
+  u_r = x[1].re;
+  vi_i = x[3].re - u_r;
+  u_r += x[3].re;
+  
+  u_i = x[1].im;
+  vi_r = u_i - x[3].im;
+  u_i += x[3].im;
+
+  yt_i = yt_r;
+  yt_i += u_r;
+  x[0].re = yt_i;
+  yt_r -= u_r;
+  x[2].re = yt_r;
+  yt_i = yb_r;
+  yt_i += vi_r;
+  x[1].re = yt_i;
+  yb_r -= vi_r;
+  x[3].re = yb_r;
+
+  yt_i = x[0].im;
+  yb_i = yt_i - x[2].im;
+  yt_i += x[2].im;
+
+  yt_r = yt_i;
+  yt_r += u_i;
+  x[0].im = yt_r;
+  yt_i -= u_i;
+  x[2].im = yt_i;
+  yt_r = yb_i;
+  yt_r += vi_i;
+  x[1].im = yt_r;
+  yb_i -= vi_i;
+  x[3].im = yb_i;
+}
+
+
+void fft_8 (complex_t *x)
+{
+  /* delta_p = diag{1, sqrt(i)} here */
+  /* x[k] = sum_{i=0..7} x[i] * w^{i*k}, w=e^{-2*pi/8} 
+   */
+  register float wT1_r, wT1_i, wB1_r, wB1_i, wT2_r, wT2_i, wB2_r, wB2_i;
+  
+  wT1_r = x[1].re;
+  wT1_i = x[1].im;
+  wB1_r = x[3].re;
+  wB1_i = x[3].im;
+
+  x[1] = x[2];
+  x[2] = x[4];
+  x[3] = x[6];
+  fft_4(&x[0]);
+
+  
+  /* x[0] x[4] */
+  wT2_r = x[5].re;
+  wT2_r += x[7].re;
+  wT2_r += wT1_r;
+  wT2_r += wB1_r;
+  wT2_i = wT2_r;
+  wT2_r += x[0].re;
+  wT2_i = x[0].re - wT2_i;
+  x[0].re = wT2_r;
+  x[4].re = wT2_i;
+
+  wT2_i = x[5].im;
+  wT2_i += x[7].im;
+  wT2_i += wT1_i;
+  wT2_i += wB1_i;
+  wT2_r = wT2_i;
+  wT2_r += x[0].im;
+  wT2_i = x[0].im - wT2_i;
+  x[0].im = wT2_r;
+  x[4].im = wT2_i;
+  
+  /* x[2] x[6] */
+  wT2_r = x[5].im;
+  wT2_r -= x[7].im;
+  wT2_r += wT1_i;
+  wT2_r -= wB1_i;
+  wT2_i = wT2_r;
+  wT2_r += x[2].re;
+  wT2_i = x[2].re - wT2_i;
+  x[2].re = wT2_r;
+  x[6].re = wT2_i;
+
+  wT2_i = x[5].re;
+  wT2_i -= x[7].re;
+  wT2_i += wT1_r;
+  wT2_i -= wB1_r;
+  wT2_r = wT2_i;
+  wT2_r += x[2].im;
+  wT2_i = x[2].im - wT2_i;
+  x[2].im = wT2_i;
+  x[6].im = wT2_r;
+  
+
+  /* x[1] x[5] */
+  wT2_r = wT1_r;
+  wT2_r += wB1_i;
+  wT2_r -= x[5].re;
+  wT2_r -= x[7].im;
+  wT2_i = wT1_i;
+  wT2_i -= wB1_r;
+  wT2_i -= x[5].im;
+  wT2_i += x[7].re;
+
+  wB2_r = wT2_r;
+  wB2_r += wT2_i;
+  wT2_i -= wT2_r;
+  wB2_r *= HSQRT2;
+  wT2_i *= HSQRT2;
+  wT2_r = wB2_r;
+  wB2_r += x[1].re;
+  wT2_r =  x[1].re - wT2_r;
+
+  wB2_i = x[5].re;
+  x[1].re = wB2_r;
+  x[5].re = wT2_r;
+
+  wT2_r = wT2_i;
+  wT2_r += x[1].im;
+  wT2_i = x[1].im - wT2_i;
+  wB2_r = x[5].im;
+  x[1].im = wT2_r;
+  x[5].im = wT2_i;
+
+  /* x[3] x[7] */
+  wT1_r -= wB1_i;
+  wT1_i += wB1_r;
+  wB1_r = wB2_i - x[7].im;
+  wB1_i = wB2_r + x[7].re;
+  wT1_r -= wB1_r;
+  wT1_i -= wB1_i;
+  wB1_r = wT1_r + wT1_i;
+  wB1_r *= HSQRT2;
+  wT1_i -= wT1_r;
+  wT1_i *= HSQRT2;
+  wB2_r = x[3].re;
+  wB2_i = wB2_r + wT1_i;
+  wB2_r -= wT1_i;
+  x[3].re = wB2_i;
+  x[7].re = wB2_r;
+  wB2_i = x[3].im;
+  wB2_r = wB2_i + wB1_r;
+  wB2_i -= wB1_r;
+  x[3].im = wB2_i;
+  x[7].im = wB2_r;
+}
+
+
+void fft_asmb(int k, complex_t *x, complex_t *wTB,
+	     const complex_t *d, const complex_t *d_3)
+{
+  register complex_t  *x2k, *x3k, *x4k, *wB;
+  register float a_r, a_i, a1_r, a1_i, u_r, u_i, v_r, v_i;
+
+  x2k = x + 2 * k;
+  x3k = x2k + 2 * k;
+  x4k = x3k + 2 * k;
+  wB = wTB + 2 * k;
+  
+  TRANSZERO(x[0],x2k[0],x3k[0],x4k[0]);
+  TRANS(x[1],x2k[1],x3k[1],x4k[1],wTB[1],wB[1],d[1],d_3[1]);
+  
+  --k;
+  for(;;) {
+     TRANS(x[2],x2k[2],x3k[2],x4k[2],wTB[2],wB[2],d[2],d_3[2]);
+     TRANS(x[3],x2k[3],x3k[3],x4k[3],wTB[3],wB[3],d[3],d_3[3]);
+     if (!--k) break;
+     x += 2;
+     x2k += 2;
+     x3k += 2;
+     x4k += 2;
+     d += 2;
+     d_3 += 2;
+     wTB += 2;
+     wB += 2;
+  }
+ 
+}
+
+void fft_asmb16(complex_t *x, complex_t *wTB)
+{
+  register float a_r, a_i, a1_r, a1_i, u_r, u_i, v_r, v_i;
+  int k = 2;
+
+  /* transform x[0], x[8], x[4], x[12] */
+  TRANSZERO(x[0],x[4],x[8],x[12]);
+
+  /* transform x[1], x[9], x[5], x[13] */
+  TRANS(x[1],x[5],x[9],x[13],wTB[1],wTB[5],delta16[1],delta16_3[1]);
+
+  /* transform x[2], x[10], x[6], x[14] */
+  TRANSHALF_16(x[2],x[6],x[10],x[14]);
+
+  /* transform x[3], x[11], x[7], x[15] */
+  TRANS(x[3],x[7],x[11],x[15],wTB[3],wTB[7],delta16[3],delta16_3[3]);
+
+} 
+
+
+void fft_64p_c (complex_t *a)
+{
+  fft_8(&a[0]); fft_4(&a[8]); fft_4(&a[12]);
+  fft_asmb16(&a[0], &a[8]);
+  
+  fft_8(&a[16]), fft_8(&a[24]);
+  fft_asmb(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
+
+  fft_8(&a[32]); fft_4(&a[40]); fft_4(&a[44]);
+  fft_asmb16(&a[32], &a[40]);
+
+  fft_8(&a[48]); fft_4(&a[56]); fft_4(&a[60]);
+  fft_asmb16(&a[48], &a[56]);
+
+  fft_asmb(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
+}
+
+
+void fft_128p_c (complex_t *a)
+{
+  fft_8(&a[0]); fft_4(&a[8]); fft_4(&a[12]);
+  fft_asmb16(&a[0], &a[8]);
+  
+  fft_8(&a[16]), fft_8(&a[24]);
+  fft_asmb(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
+
+  fft_8(&a[32]); fft_4(&a[40]); fft_4(&a[44]);
+  fft_asmb16(&a[32], &a[40]);
+
+  fft_8(&a[48]); fft_4(&a[56]); fft_4(&a[60]);
+  fft_asmb16(&a[48], &a[56]);
+
+  fft_asmb(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
+
+  fft_8(&a[64]); fft_4(&a[72]); fft_4(&a[76]);
+  /* fft_16(&a[64]); */
+  fft_asmb16(&a[64], &a[72]);
+
+  fft_8(&a[80]); fft_8(&a[88]);
+  
+  /* fft_32(&a[64]); */
+  fft_asmb(4, &a[64], &a[80],&delta32[0], &delta32_3[0]);
+
+  fft_8(&a[96]); fft_4(&a[104]), fft_4(&a[108]);
+  /* fft_16(&a[96]); */
+  fft_asmb16(&a[96], &a[104]);
+
+  fft_8(&a[112]), fft_8(&a[120]);
+  /* fft_32(&a[96]); */
+  fft_asmb(4, &a[96], &a[112], &delta32[0], &delta32_3[0]);
+  
+  /* fft_128(&a[0]); */
+  fft_asmb(16, &a[0], &a[64], &delta128[0], &delta128_3[0]);
+}
diff --git a/ac3dec/srfft.h b/ac3dec/srfft.h
new file mode 100644
index 000000000..7916092a4
--- /dev/null
+++ b/ac3dec/srfft.h
@@ -0,0 +1,39 @@
+/* 
+ *  srfft.h
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
+ *
+ *  64 and 128 point split radix fft for ac3dec
+ *
+ *  The algorithm is desribed in the book:
+ *  "Computational Frameworks of the Fast Fourier Transform".
+ *
+ *  The ideas and the the organization of code borrowed from djbfft written by
+ *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
+ *  http://cr.yp.to/djbfft.html.
+ *
+ *  srfft.h is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  srfft.h is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef SRFFT_H__
+#define SRFFT_H__
+
+#include "cmplx.h"
+
+void fft_64p_c (complex_t *x);
+void fft_128p_c (complex_t *x);
+
+#endif /* SRFFT_H__ */
diff --git a/ac3dec/srfft_kni.S b/ac3dec/srfft_kni.S
new file mode 100644
index 000000000..a42a41b14
--- /dev/null
+++ b/ac3dec/srfft_kni.S
@@ -0,0 +1,289 @@
+/* 
+ *  srfft_kni.S
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - October 2000
+ *
+ *
+ *  srfft_kni.S is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  srfft_kni.S is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifdef __i386__
+
+.section	.rodata
+	.align 16
+hsqrt2:	 .float 0f0.707106781188
+	 .float 0f0.707106781188
+	 .float 0f-0.707106781188
+	 .float 0f-0.707106781188
+C_1:	 .float 0f-1.0
+	 .float 0f1.0
+	 .float 0f-1.0
+	 .float 0f1.0
+	
+.text
+	.align 4
+.global fft_4_kni
+	.type fft_4_kni, @function
+fft_4_kni:
+	pushl %ebp
+	movl %esp, %ebp
+	movl 8(%ebp), %eax		/* complex_t * */
+	
+	movaps (%eax), %xmm0		/* x[1] | x[0] */
+	movaps 16(%eax), %xmm2		/* x[3] | x[2] */
+	movaps %xmm0, %xmm1		/* x[1] | x[0] */
+	addps %xmm2, %xmm0		/* x[1] + x[3] | x[0] + x[2] */
+	subps %xmm2, %xmm1		/* x[1] - x[3] | x[0] - x[2] */
+	xorps %xmm6, %xmm6
+	movhlps %xmm1, %xmm4		/* x[1] - x[3] */
+	movhlps %xmm0, %xmm3		/* x[1] + x[3] */
+	subss %xmm4, %xmm6		/* -(x[1] - x[3]).re */
+	movlhps %xmm1, %xmm0		/* x[0] - x[2] | x[0] + x[2] */
+	movss %xmm6, %xmm4		/* (x[1] - x[3]).im | (x[3]-x[1]).re */
+	movaps %xmm0, %xmm2		/* x[0] - x[2] | x[0] + x[2] */
+	shufps $0x14, %xmm4, %xmm3	/* -i*(x[2] - x[3] | x[2] + x[3] */
+	addps %xmm3, %xmm0
+	subps %xmm3, %xmm2
+	movaps %xmm0, (%eax)
+	movaps %xmm2, 16(%eax)
+
+	leave
+	ret
+	
+
+	.align 4
+.global fft_8_kni
+	.type fft_8_kni, @function
+fft_8_kni:
+	pushl %ebp
+	movl %esp, %ebp
+	movl 8(%ebp), %eax		/* complext_t */
+
+	pushl %ebx
+	movlps (%eax), %xmm0		/* x[0] */
+	movlps 32(%eax), %xmm1		/* x[4] */
+	movhps 16(%eax), %xmm0		/* x[2] | x[0] */
+	movhps 48(%eax), %xmm1		/* x[6] | x[4] */
+	movaps %xmm0, %xmm2		/* x[2] | x[0] */
+	xorps %xmm3, %xmm3
+	addps %xmm1, %xmm0		/* x[2] + x[6] | x[0] + x[4] */
+	subps %xmm1, %xmm2		/* x[2] - x[6] | x[0] - x[4] */
+	movhlps %xmm0, %xmm5		/* x[2] + x[6] */
+	movhlps %xmm2, %xmm4
+	movlhps %xmm2, %xmm0		/* x[0] - x[4] | x[0] + x[4] */
+	subss %xmm4, %xmm3		/* -(x[2]-x[6]).re */
+	movaps %xmm0, %xmm7		/* x[0] - x[4] | x[0] + x[4] */
+	movss %xmm3, %xmm4		/* (x[2]-x[6]).im | -(x[2]-x[6]).re */
+	movlps 8(%eax), %xmm1		/* x[1] */
+	shufps $0x14, %xmm4, %xmm5	/* -i*(x[2] - x[6]) | x[2] + x[6] */
+
+	addps %xmm5, %xmm0		/* yt */
+	subps %xmm5, %xmm7		/* yb */
+
+	movhps 24(%eax), %xmm1		/* x[3] | x[1] */
+	movl $hsqrt2, %ebx
+	movlps 40(%eax), %xmm2		/* x[5] */
+	movhps 56(%eax), %xmm2		/* /x[7] | x[5] */
+	movaps %xmm1, %xmm3		/* x[3] | x[1] */
+	addps %xmm2, %xmm1		/* x[3] + x[7] | x[1] + x[5] */
+	subps %xmm2, %xmm3		/* x[3] - x[7] | x[1] - x[5] */
+	movaps (%ebx), %xmm4		/* -1/sqrt2 | -1/sqrt2 | 1/sqrt2 | 1/sqrt2 */
+	movaps %xmm3, %xmm6		/* x[3] - x[7] | x[1] - x[5] */
+	mulps %xmm4, %xmm3
+	shufps $0xc8, %xmm4, %xmm4	/* -1/sqrt2 | 1/sqrt2 | -1/sqrt2 | 1/sqrt2 */
+	shufps $0xb1, %xmm6, %xmm6
+	mulps %xmm4, %xmm6
+	addps %xmm3, %xmm6		/* (-1-i)/sqrt2 * (x[3]-x[7]) | (1-i)/sqrt2 * (x[1] - x[5] */
+	movhlps %xmm1, %xmm5		/* x[3] + x[7] */
+	movlhps %xmm6, %xmm1		/* (1+i)/sqrt2 * (x[1]-x[5]) | x[1]+x[5] */
+	shufps $0xe4, %xmm6, %xmm5	/* (-1-i)/sqrt2 * (x[3]-x[7]) | x[3]+x[7] */
+	movaps %xmm1, %xmm3		/* (1-i)/sqrt2 * (x[1]-x[5]) | x[1]+x[5] */
+	movl $C_1, %ebx
+	addps %xmm5, %xmm1		/* u */
+	subps %xmm5, %xmm3		/* v */
+	movaps %xmm0, %xmm2		/* yb */
+	movaps %xmm7, %xmm4		/* yt */
+	movaps (%ebx), %xmm5
+	mulps %xmm5, %xmm3
+	addps %xmm1, %xmm0		/* yt + u */
+	subps %xmm1, %xmm2		/* yt - u */
+	shufps $0xb1, %xmm3, %xmm3		/* -i * v */
+	movaps %xmm0, (%eax)
+	movaps %xmm2, 32(%eax)
+	addps %xmm3, %xmm4		/* yb - i*v */
+	subps %xmm3, %xmm7		/* yb + i*v */
+	movaps %xmm4, 16(%eax)
+	movaps %xmm7, 48(%eax)
+
+	popl %ebx
+	leave
+	ret
+
+	.align 4
+.global fft_asmb_kni 
+	.type fft_asmb, @function
+fft_asmb_kni:
+	pushl %ebp
+	movl %esp, %ebp
+
+	subl $4, %esp
+		
+	pushl %eax
+	pushl %ebx
+	pushl %ecx
+	pushl %edx
+	pushl %esi
+	pushl %edi
+
+	movl 8(%ebp),  %ecx		/* k */
+	movl 12(%ebp), %eax		/* x */
+	movl %ecx, -4(%ebp)		/* k */
+	movl 16(%ebp), %ebx		/* wT */
+	movl 20(%ebp), %edx		/* d */
+	movl 24(%ebp), %esi		/* d3 */
+	shll $4, %ecx			/* 16k */
+	addl $8, %edx
+	leal (%eax, %ecx, 2), %edi
+	addl $8, %esi
+	
+	/* TRANSZERO and TRANS */
+	movaps (%eax), %xmm0		/* x[1] | x[0] */
+	movaps (%ebx), %xmm1		/* wT[1] | wT[0] */
+	movaps (%ebx, %ecx), %xmm2	/* wB[1] | wB[0] */
+	movlps (%edx), %xmm3		/* d */
+	movlps (%esi), %xmm4		/* d3 */
+	movhlps %xmm1, %xmm5		/* wT[1] */
+	movhlps %xmm2, %xmm6		/* wB[1] */
+	shufps $0x50, %xmm3, %xmm3	/* d[1].im | d[1].im | d[1].re | d[1].re */
+	shufps $0x50, %xmm4, %xmm4	/* d3[1].im | d3[1].im | d3[i].re | d3[i].re */
+	movlhps %xmm5, %xmm5		/* wT[1] | wT[1] */
+	movlhps %xmm6, %xmm6		/* wB[1] | wB[1] */
+	mulps %xmm3, %xmm5
+	mulps %xmm4, %xmm6
+	movhlps %xmm5, %xmm7		/* wT[1].im * d[1].im | wT[1].re * d[1].im */
+	movlhps %xmm6, %xmm5		/* wB[1].im * d3[1].re | wB[1].re * d3[1].re | wT[1].im * d[1].re | wT[1].re * d[1].re */
+	shufps $0xb1, %xmm6, %xmm7	/* wB[1].re * d3[1].im | wB[i].im * d3[1].im | wT[1].re * d[1].im | wT[1].im * d[1].im */
+	movl $C_1, %edi
+	movaps (%edi), %xmm4
+	mulps %xmm4, %xmm7
+	addps %xmm7, %xmm5		/* wB[1] * d3[1] | wT[1] * d[1] */
+	movlhps %xmm5, %xmm1		/* d[1] * wT[1] | wT[0] */
+	shufps $0xe4, %xmm5, %xmm2	/* d3[1] * wB[1] | wB[0] */
+	movaps %xmm1, %xmm3		/* d[1] * wT[1] | wT[0] */
+	leal (%eax, %ecx, 2), %edi
+	addps %xmm2, %xmm1		/* u */
+	subps %xmm2, %xmm3		/* v */
+	mulps %xmm4, %xmm3
+	movaps (%eax, %ecx), %xmm5	/* xk[1] | xk[0] */
+	shufps $0xb1, %xmm3, %xmm3	/* -i * v */
+	movaps %xmm0, %xmm2		/* x[1] | x[0] */
+	movaps %xmm5, %xmm6		/* xk[1] | xk[0] */
+	addps %xmm1, %xmm0
+	subps %xmm1, %xmm2
+	addps %xmm3, %xmm5
+	subps %xmm3, %xmm6
+	movaps %xmm0, (%eax)
+	movaps %xmm2, (%edi)
+	movaps %xmm5, (%eax, %ecx)
+	movaps %xmm6, (%edi, %ecx)
+	addl $16, %eax
+	addl $16, %ebx
+	addl $8, %edx
+	addl $8, %esi
+	decl -4(%ebp)
+
+.loop:
+	movaps (%ebx), %xmm0		/* wT[1] | wT[0] */
+	movaps (%edx), %xmm1		/* d[1] | d[0] */
+
+	movaps (%ebx, %ecx), %xmm4	/* wB[1] | wB[0] */
+	movaps (%esi), %xmm5		/* d3[1] | d3[0] */
+
+	movhlps %xmm0, %xmm2		/* wT[1] */
+	movhlps %xmm1, %xmm3		/* d[1] */
+
+	movhlps %xmm4, %xmm6		/* wB[1] */
+	movhlps %xmm5, %xmm7		/* d3[1] */
+
+	shufps $0x50, %xmm1, %xmm1	/* d[0].im | d[0].im | d[0].re | d[0].re */
+	shufps $0x50, %xmm3, %xmm3	/* d[1].im | d[1].im | d[1].re | d[1].re */
+
+	movlhps %xmm0, %xmm0		/* wT[0] | wT[0] */
+	shufps $0x50, %xmm5, %xmm5	/* d3[0].im | d3[0].im | d3[0].re | d3[0].re */
+	movlhps %xmm2, %xmm2		/* wT[1] | wT[1] */
+	shufps $0x50, %xmm7, %xmm7	/* d3[1].im | d3[1].im | d3[1].re | d3[1].re */
+
+	mulps %xmm1, %xmm0		/* d[0].im * wT[0].im | d[0].im * wT[0].re | d[0].re * wT[0].im | d[0].re * wT[0].re */
+	mulps %xmm3, %xmm2		/* d[1].im * wT[1].im | d[1].im * wT[1].re | d[1].re * wT[1].im | d[1].re * wT[1].re */
+	movlhps %xmm4, %xmm4		/* wB[0] | wB[0] */
+	movlhps %xmm6, %xmm6		/* wB[1] | wB[1] */
+
+	movhlps %xmm0, %xmm1		/* d[0].im * wT[0].im | d[0].im * wT[0].re */
+	movlhps %xmm2, %xmm0		/* d[1].re * wT[1].im | d[1].re * wT[1].re | d[0].re * wT[0].im | d[0].re * wT[0].re */
+	mulps %xmm5, %xmm4		/* wB[0].im * d3[0].im | wB[0].re * d3[0].im | wB[0].im * d3[0].re | wB[0].re * d3[0].re */
+	mulps %xmm7, %xmm6		/* wB[1].im * d3[1].im | wB[1].re * d3[1].im | wB[1].im * d3[1].re | wB[1].re * d3[1].re */
+	shufps $0xb1, %xmm2, %xmm1	/* d[1].im * wT[1].re | d[1].im * wT[1].im | d[0].im * wT[0].re | d[0].im * wT[0].im */
+	movl $C_1, %edi
+	movaps (%edi), %xmm3		/* 1.0 | -1.0 | 1.0 | -1.0 */
+
+	movhlps %xmm4, %xmm5		/* wB[0].im * d3[0].im | wB[0].re * d3[0].im */
+	mulps %xmm3, %xmm1		/* d[1].im * wT[1].re | -d[1].im * wT[1].im | d[0].im * wT[0].re | -d[0].im * wT[0].im */
+	movlhps %xmm6, %xmm4		/* wB[1].im * d3[1].re | wB[1].re * d3[1].re | wB[0].im * d3[0].re | wB[0].im * d3[0].re */
+	addps %xmm1, %xmm0		/* wT[1] * d[1] | wT[0] * d[0] */
+
+	shufps $0xb1, %xmm6, %xmm5	/* wB[1].re * d3[1].im | wB[1].im * d3[1].im | wB[0].re * d3[0].im | wB[0].im * d3[0].im */
+	mulps %xmm3, %xmm5		/* wB[1].re * d3[1].im | -wB[1].im * d3[1].im | wB[0].re * d3[0].im | -wB[0].im * d3[0].im */
+	addps %xmm5, %xmm4		/* wB[1] * d3[1] | wB[0] * d3[0] */
+
+	movaps %xmm0, %xmm1		/* wT[1] * d[1] | wT[0] * d[0] */
+	addps %xmm4, %xmm0		/* u */
+	subps %xmm4, %xmm1		/* v */
+	movaps (%eax), %xmm6		/* x[1] | x[0] */
+	leal (%eax, %ecx, 2), %edi
+	mulps %xmm3, %xmm1
+	addl $16, %ebx
+	addl $16, %esi
+	shufps $0xb1, %xmm1, %xmm1	/* -i * v */
+	movaps (%eax, %ecx), %xmm7	/* xk[1] | xk[0] */
+	movaps %xmm6, %xmm2
+	movaps %xmm7, %xmm4
+	addps %xmm0, %xmm6
+	subps %xmm0, %xmm2
+	movaps %xmm6, (%eax)
+	movaps %xmm2, (%edi)
+	addps %xmm1, %xmm7
+	subps %xmm1, %xmm4
+	addl $16, %edx
+	movaps %xmm7, (%eax, %ecx)
+	movaps %xmm4, (%edi, %ecx)
+
+	addl $16, %eax
+	decl -4(%ebp)
+	jnz .loop
+
+.end:		
+	popl %edi	
+	popl %esi
+	popl %edx
+	popl %ecx
+	popl %ebx
+	popl %eax
+	
+	addl $4, %esp
+		
+	leave
+	ret
+#endif
diff --git a/ac3dec/srfft_kni.h b/ac3dec/srfft_kni.h
new file mode 100644
index 000000000..6dc468e34
--- /dev/null
+++ b/ac3dec/srfft_kni.h
@@ -0,0 +1,30 @@
+/*****
+*
+* This file is part of the OMS program.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*****/
+
+#ifndef __SRFF_KNI__
+#define __SRFF_KNI__
+
+#include "cmplx.h"
+
+void fft_4_kni (complex_t *a);
+void fft_8_kni (complex_t *a);
+void fft_asmb_kni (int, complex_t*, complex_t *, complex_t *, complex_t*);
+
+#endif
diff --git a/ac3dec/srfft_kni_c.c b/ac3dec/srfft_kni_c.c
new file mode 100644
index 000000000..d461110fc
--- /dev/null
+++ b/ac3dec/srfft_kni_c.c
@@ -0,0 +1,93 @@
+/* 
+ *  srfft_kni.c
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
+ *
+ *  64 and 128 point split radix fft for ac3dec
+ *
+ *  The algorithm is desribed in the book:
+ *  "Computational Frameworks of the Fast Fourier Transform".
+ *
+ *  The ideas and the the organization of code borrowed from djbfft written by
+ *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
+ *  http://cr.yp.to/djbfft.html.
+ *
+ *  srfft.c is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  srfft.c is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifdef __i386__
+
+#include <stdio.h>
+
+#include "srfft_kni.h"
+#include "srfftp.h"
+
+void fft_64p_kni(complex_t *a)
+{
+	fft_8_kni(&a[0]); fft_4_kni(&a[8]); fft_4_kni(&a[12]);
+	fft_asmb_kni(2, &a[0], &a[8], &delta16[0], &delta16_3[0]);
+  
+	fft_8_kni(&a[16]), fft_8_kni(&a[24]);
+	fft_asmb_kni(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
+
+	fft_8_kni(&a[32]); fft_4_kni(&a[40]); fft_4_kni(&a[44]);
+	fft_asmb_kni(2, &a[32], &a[40], &delta16[0], &delta16_3[0]);
+
+	fft_8_kni(&a[48]); fft_4_kni(&a[56]); fft_4_kni(&a[60]);
+	fft_asmb_kni(2, &a[48], &a[56], &delta16[0], &delta16_3[0]);
+
+	fft_asmb_kni(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
+}
+
+
+void fft_128p_kni(complex_t *a)
+{
+	fft_8_kni(&a[0]); fft_4_kni(&a[8]); fft_4_kni(&a[12]);
+	fft_asmb_kni(2, &a[0], &a[8], &delta16[0], &delta16_3[0]);
+  
+	fft_8_kni(&a[16]), fft_8_kni(&a[24]);
+	fft_asmb_kni(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
+
+	fft_8_kni(&a[32]); fft_4_kni(&a[40]); fft_4_kni(&a[44]);
+	fft_asmb_kni(2, &a[32], &a[40], &delta16[0], &delta16_3[0]);
+
+	fft_8_kni(&a[48]); fft_4_kni(&a[56]); fft_4_kni(&a[60]);
+	fft_asmb_kni(2, &a[48], &a[56], &delta16[0], &delta16_3[0]);
+
+	fft_asmb_kni(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
+
+	fft_8_kni(&a[64]); fft_4_kni(&a[72]); fft_4_kni(&a[76]);
+	/* fft_16(&a[64]); */
+	fft_asmb_kni(2, &a[64], &a[72], &delta16[0], &delta16_3[0]);
+
+	fft_8_kni(&a[80]); fft_8_kni(&a[88]);
+  
+	/* fft_32(&a[64]); */
+	fft_asmb_kni(4, &a[64], &a[80],&delta32[0], &delta32_3[0]);
+
+	fft_8_kni(&a[96]); fft_4_kni(&a[104]), fft_4_kni(&a[108]);
+	/* fft_16(&a[96]); */
+	fft_asmb_kni(2, &a[96], &a[104], &delta16[0], &delta16_3[0]);
+
+	fft_8_kni(&a[112]), fft_8_kni(&a[120]);
+	/* fft_32(&a[96]); */
+	fft_asmb_kni(4, &a[96], &a[112], &delta32[0], &delta32_3[0]);
+  
+	/* fft_128(&a[0]); */
+	fft_asmb_kni(16, &a[0], &a[64], &delta128[0], &delta128_3[0]);
+}
+
+#endif
diff --git a/ac3dec/srfftp.h b/ac3dec/srfftp.h
new file mode 100644
index 000000000..6f4471530
--- /dev/null
+++ b/ac3dec/srfftp.h
@@ -0,0 +1,305 @@
+
+/* 
+ *  srfftp.h
+ *
+ *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
+ *
+ *  64 and 128 point split radix fft for ac3dec
+ *
+ *  The algorithm is desribed in the book:
+ *  "Computational Frameworks of the Fast Fourier Transform".
+ *
+ *  The ideas and the the organization of code borrowed from djbfft written by
+ *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
+ *  http://cr.yp.to/djbfft.html.
+ *
+ *  srfftp.h is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  srfftp.h is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef SRFFTP_H__
+#define SRFFTP_H__
+
+#include "cmplx.h"
+
+static complex_t delta16[4] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.92387953251129, -0.38268343236509},
+   {0.70710678118655, -0.70710678118655},
+   {0.38268343236509, -0.92387953251129}};
+
+static complex_t delta16_3[4] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.38268343236509, -0.92387953251129},
+   {-0.70710678118655, -0.70710678118655},
+   {-0.92387953251129, 0.38268343236509}};
+
+static complex_t delta32[8] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.98078528040323, -0.19509032201613},
+   {0.92387953251129, -0.38268343236509},
+   {0.83146961230255, -0.55557023301960},
+   {0.70710678118655, -0.70710678118655},
+   {0.55557023301960, -0.83146961230255},
+   {0.38268343236509, -0.92387953251129},
+   {0.19509032201613, -0.98078528040323}};
+
+static complex_t delta32_3[8] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.83146961230255, -0.55557023301960},
+   {0.38268343236509, -0.92387953251129},
+   {-0.19509032201613, -0.98078528040323},
+   {-0.70710678118655, -0.70710678118655},
+   {-0.98078528040323, -0.19509032201613},
+   {-0.92387953251129, 0.38268343236509},
+   {-0.55557023301960, 0.83146961230255}};
+
+static complex_t delta64[16] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.99518472667220, -0.09801714032956},
+   {0.98078528040323, -0.19509032201613},
+   {0.95694033573221, -0.29028467725446},
+   {0.92387953251129, -0.38268343236509},
+   {0.88192126434836, -0.47139673682600},
+   {0.83146961230255, -0.55557023301960},
+   {0.77301045336274, -0.63439328416365},
+   {0.70710678118655, -0.70710678118655},
+   {0.63439328416365, -0.77301045336274},
+   {0.55557023301960, -0.83146961230255},
+   {0.47139673682600, -0.88192126434835},
+   {0.38268343236509, -0.92387953251129},
+   {0.29028467725446, -0.95694033573221},
+   {0.19509032201613, -0.98078528040323},
+   {0.09801714032956, -0.99518472667220}};
+
+static complex_t delta64_3[16] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.95694033573221, -0.29028467725446},
+   {0.83146961230255, -0.55557023301960},
+   {0.63439328416365, -0.77301045336274},
+   {0.38268343236509, -0.92387953251129},
+   {0.09801714032956, -0.99518472667220},
+   {-0.19509032201613, -0.98078528040323},
+   {-0.47139673682600, -0.88192126434836},
+   {-0.70710678118655, -0.70710678118655},
+   {-0.88192126434835, -0.47139673682600},
+   {-0.98078528040323, -0.19509032201613},
+   {-0.99518472667220, 0.09801714032956},
+   {-0.92387953251129, 0.38268343236509},
+   {-0.77301045336274, 0.63439328416365},
+   {-0.55557023301960, 0.83146961230255},
+   {-0.29028467725446, 0.95694033573221}};
+
+static complex_t delta128[32] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.99879545620517, -0.04906767432742},
+   {0.99518472667220, -0.09801714032956},
+   {0.98917650996478, -0.14673047445536},
+   {0.98078528040323, -0.19509032201613},
+   {0.97003125319454, -0.24298017990326},
+   {0.95694033573221, -0.29028467725446},
+   {0.94154406518302, -0.33688985339222},
+   {0.92387953251129, -0.38268343236509},
+   {0.90398929312344, -0.42755509343028},
+   {0.88192126434836, -0.47139673682600},
+   {0.85772861000027, -0.51410274419322},
+   {0.83146961230255, -0.55557023301960},
+   {0.80320753148064, -0.59569930449243},
+   {0.77301045336274, -0.63439328416365},
+   {0.74095112535496, -0.67155895484702},
+   {0.70710678118655, -0.70710678118655},
+   {0.67155895484702, -0.74095112535496},
+   {0.63439328416365, -0.77301045336274},
+   {0.59569930449243, -0.80320753148064},
+   {0.55557023301960, -0.83146961230255},
+   {0.51410274419322, -0.85772861000027},
+   {0.47139673682600, -0.88192126434835},
+   {0.42755509343028, -0.90398929312344},
+   {0.38268343236509, -0.92387953251129},
+   {0.33688985339222, -0.94154406518302},
+   {0.29028467725446, -0.95694033573221},
+   {0.24298017990326, -0.97003125319454},
+   {0.19509032201613, -0.98078528040323},
+   {0.14673047445536, -0.98917650996478},
+   {0.09801714032956, -0.99518472667220},
+   {0.04906767432742, -0.99879545620517}};
+
+static complex_t delta128_3[32] = 
+ { {1.00000000000000,  0.00000000000000},
+   {0.98917650996478, -0.14673047445536},
+   {0.95694033573221, -0.29028467725446},
+   {0.90398929312344, -0.42755509343028},
+   {0.83146961230255, -0.55557023301960},
+   {0.74095112535496, -0.67155895484702},
+   {0.63439328416365, -0.77301045336274},
+   {0.51410274419322, -0.85772861000027},
+   {0.38268343236509, -0.92387953251129},
+   {0.24298017990326, -0.97003125319454},
+   {0.09801714032956, -0.99518472667220},
+   {-0.04906767432742, -0.99879545620517},
+   {-0.19509032201613, -0.98078528040323},
+   {-0.33688985339222, -0.94154406518302},
+   {-0.47139673682600, -0.88192126434836},
+   {-0.59569930449243, -0.80320753148065},
+   {-0.70710678118655, -0.70710678118655},
+   {-0.80320753148065, -0.59569930449243},
+   {-0.88192126434835, -0.47139673682600},
+   {-0.94154406518302, -0.33688985339222},
+   {-0.98078528040323, -0.19509032201613},
+   {-0.99879545620517, -0.04906767432742},
+   {-0.99518472667220, 0.09801714032956},
+   {-0.97003125319454, 0.24298017990326},
+   {-0.92387953251129, 0.38268343236509},
+   {-0.85772861000027, 0.51410274419322},
+   {-0.77301045336274, 0.63439328416365},
+   {-0.67155895484702, 0.74095112535496},
+   {-0.55557023301960, 0.83146961230255},
+   {-0.42755509343028, 0.90398929312344},
+   {-0.29028467725446, 0.95694033573221},
+   {-0.14673047445536, 0.98917650996478}};
+
+#define HSQRT2 0.707106781188;
+
+#define TRANSZERO(A0,A4,A8,A12) { \
+  u_r = wTB[0].re; \
+  v_i = u_r - wTB[k*2].re; \
+  u_r += wTB[k*2].re; \
+  u_i = wTB[0].im; \
+  v_r = wTB[k*2].im - u_i; \
+  u_i += wTB[k*2].im; \
+  a_r = A0.re; \
+  a_i = A0.im; \
+  a1_r = a_r; \
+  a1_r += u_r; \
+  A0.re = a1_r; \
+  a_r -= u_r; \
+  A8.re = a_r; \
+  a1_i = a_i; \
+  a1_i += u_i; \
+  A0.im = a1_i; \
+  a_i -= u_i; \
+  A8.im = a_i; \
+  a1_r = A4.re; \
+  a1_i = A4.im; \
+  a_r = a1_r; \
+  a_r -= v_r; \
+  A4.re = a_r; \
+  a1_r += v_r; \
+  A12.re = a1_r; \
+  a_i = a1_i; \
+  a_i -= v_i; \
+  A4.im = a_i; \
+  a1_i += v_i; \
+  A12.im = a1_i; \
+  }
+
+#define TRANSHALF_16(A2,A6,A10,A14) {\
+  u_r = wTB[2].re; \
+  a_r = u_r; \
+  u_i = wTB[2].im; \
+  u_r += u_i; \
+  u_i -= a_r; \
+  a_r = wTB[6].re; \
+  a1_r = a_r; \
+  a_i = wTB[6].im; \
+  a_r = a_i - a_r; \
+  a_i += a1_r; \
+  v_i = u_r - a_r; \
+  u_r += a_r; \
+  v_r = u_i + a_i; \
+  u_i -= a_i; \
+  v_i *= HSQRT2; \
+  v_r *= HSQRT2; \
+  u_r *= HSQRT2; \
+  u_i *= HSQRT2; \
+  a_r = A2.re; \
+  a_i = A2.im; \
+  a1_r = a_r; \
+  a1_r += u_r; \
+  A2.re = a1_r; \
+  a_r -= u_r; \
+  A10.re = a_r; \
+  a1_i = a_i; \
+  a1_i += u_i; \
+  A2.im = a1_i; \
+  a_i -= u_i; \
+  A10.im = a_i; \
+  a1_r = A6.re; \
+  a1_i = A6.im;  \
+  a_r = a1_r; \
+  a1_r += v_r; \
+  A6.re = a1_r; \
+  a_r -= v_r; \
+  A14.re = a_r; \
+  a_i = a1_i; \
+  a1_i -= v_i; \
+  A6.im = a1_i; \
+  a_i += v_i; \
+  A14.im = a_i; \
+  }
+
+#define TRANS(A1,A5,A9,A13,WT,WB,D,D3) { \
+  u_r = WT.re; \
+  a_r = u_r; \
+  a_r *= D.im; \
+  u_r *= D.re; \
+  a_i = WT.im; \
+  a1_i = a_i; \
+  a1_i *= D.re; \
+  a_i *= D.im; \
+  u_r -= a_i; \
+  u_i = a_r; \
+  u_i += a1_i; \
+  a_r = WB.re; \
+  a1_r = a_r; \
+  a1_r *= D3.re; \
+  a_r *= D3.im; \
+  a_i = WB.im; \
+  a1_i = a_i; \
+  a_i *= D3.re; \
+  a1_i *= D3.im; \
+  a1_r -= a1_i; \
+  a_r += a_i; \
+  v_i = u_r - a1_r; \
+  u_r += a1_r; \
+  v_r = a_r - u_i; \
+  u_i += a_r; \
+  a_r = A1.re; \
+  a_i = A1.im; \
+  a1_r = a_r; \
+  a1_r += u_r; \
+  A1.re = a1_r; \
+  a_r -= u_r; \
+  A9.re = a_r; \
+  a1_i = a_i; \
+  a1_i += u_i; \
+  A1.im = a1_i; \
+  a_i -= u_i; \
+  A9.im = a_i; \
+  a1_r = A5.re; \
+  a1_i = A5.im;  \
+  a_r = a1_r; \
+  a1_r -= v_r; \
+  A5.re = a1_r; \
+  a_r += v_r; \
+  A13.re = a_r; \
+  a_i = a1_i; \
+  a1_i -= v_i; \
+  A5.im = a1_i; \
+  a_i += v_i; \
+  A13.im = a_i; \
+  }
+
+#endif
diff --git a/ac3dec/stats.c b/ac3dec/stats.c
index cfeb453f4..4bdad09a1 100644
--- a/ac3dec/stats.c
+++ b/ac3dec/stats.c
@@ -28,16 +28,16 @@
 #include "ac3_internal.h"
 
 
-#include "decode.h"
 #include "stats.h"
 #include "debug.h"
 
-
+#if !defined (__GNUC__) || defined (DEBUG)
 static const char *service_ids[8] = 
 {
 	"CM","ME","VI","HI",
 	 "D", "C","E", "VO"
 };
+#endif
 
 struct mixlev_s
 {
@@ -77,9 +77,10 @@ static const char *language[128] =
 	"Bengali", "Belorussian", "Bambora", "Azerbijani", "Assamese", "Armenian", "Arabic", "Amharic"
 };
 
+
 void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi)
 {
-	fprintf(stdout,"ac3dec-0.6.2-cvs (C) 2000 Aaron Holtzman (aholtzma@ess.engr.uvic.ca)\n");
+  //	fprintf(stdout,PACKAGE"-"VERSION" (C) 2000 Aaron Holtzman (aholtzma@ess.engr.uvic.ca)\n");
 
 	fprintf(stdout,"%d.%d Mode ",bsi->nfchans,bsi->lfeon);
 	fprintf(stdout,"%2.1f KHz",syncinfo->sampling_rate * 1e-3);
@@ -87,8 +88,7 @@ void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi)
 	if (bsi->langcode && (bsi->langcod < 128))
 		fprintf(stdout,"%s ", language[bsi->langcod]);
 
-	switch(bsi->bsmod)
-	{
+	switch(bsi->bsmod) {
 		case 0:
 			fprintf(stdout,"Complete Main Audio Service");
 			break;
@@ -116,12 +116,12 @@ void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi)
 	fprintf(stdout,"\n");
 }
 
-void stats_print_syncinfo(syncinfo_t *syncinfo)
+
+void stats_print_syncinfo (syncinfo_t *syncinfo)
 {
 	dprintf("(syncinfo) ");
 	
-	switch (syncinfo->fscod)
-	{
+	switch (syncinfo->fscod) {
 		case 2:
 			dprintf("32 KHz   ");
 			break;
@@ -140,9 +140,9 @@ void stats_print_syncinfo(syncinfo_t *syncinfo)
 			syncinfo->frame_size);
 
 }
+
 	
-void stats_print_bsi(bsi_t *bsi)
-{
+void stats_print_bsi(bsi_t *bsi) {
 	dprintf("(bsi) ");
 	dprintf("%s",service_ids[bsi->bsmod]);
 	dprintf(" %d.%d Mode ",bsi->nfchans,bsi->lfeon);
@@ -154,11 +154,11 @@ void stats_print_bsi(bsi_t *bsi)
 
 }
 
+
 char *exp_strat_tbl[4] = {"R   ","D15 ","D25 ","D45 "};
 
-void stats_print_audblk(bsi_t *bsi,audblk_t *audblk)
-{
-	uint_32 i;
+void stats_print_audblk(bsi_t *bsi,audblk_t *audblk) {
+	uint32_t i;
 
 	dprintf("(audblk) ");
 	dprintf("%s ",audblk->cplinu ? "cpl on " : "cpl off");
diff --git a/channels.conf.cable b/channels.conf.cable
index c60fb8f6d..60b3eb573 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,99 +1,47 @@
-:verschl�sselte Fernsehprogramme
-Extreme Sport:346:h:0:6900:801:802:0:1:50700
-Bloomberg:346:h:0:6900:811:812:0:1:50701
-Fashion TV:346:h:0:6900:821:822:0:1:50702
-BET ON JAZZ:346:h:0:6900:841:842:0:1:50704
-LANDSCAPE:346:h:0:6900:831:832:0:1:50703
-Einstein:346:h:0:6900:623:624:0:1:50719
-Single TV:346:h:0:6900:621:622:0:1:50706
-Einstein:346:h:0:6900:255:256:0:1:40100
-GOLDSTAR TV:354:h:0:6900:3839:3840:0:1:518
-HEIMATKANAL:354:h:0:6900:2815:2816:0:1:517
-FILMPALAST:354:h:0:6900:2559:2560:0:1:516
-FILMPALAST:354:h:0:6900:1535:1536:0:1:195
-FILMPALAST:354:h:0:6900:1279:1280:0:1:194
-FILMPALAST:354:h:0:6900:255:256:0:1:177
-FILMPALAST:354:h:0:6900:767:768:0:1:179
-FILMPALAST:354:h:0:6900:511:513:0:1:178
-FILMPALAST:354:h:0:6900:1023:1024:0:1:193
-BLUE MOVIE 1:354:h:0:6900:255:256:0:1:513
-BLUE MOVIE 2:354:h:0:6900:255:256:0:1:514
-BLUE MOVIE 3:354:h:0:6900:255:256:0:1:515
-SPORT 1:362:h:0:6900:255:256:0:1:17
-F1 Boxenstrasse:362:h:0:6900:2815:2816:0:1:240
-F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
-F1 Multikanal:362:h:0:6900:2047:2048:0:1:243
-SPORT 1:362:h:0:6900:255:256:0:1:180
-SPORT 1:362:h:0:6900:255:256:0:1:181
-SPORT 1:362:h:0:6900:255:256:0:1:182
-SPORT 1:362:h:0:6900:255:256:0:1:183
-SPORT 1:362:h:0:6900:255:256:0:1:176
-SPORT 1:362:h:0:6900:255:256:0:1:190
-PREMIERE:370:h:0:6900:511:512:0:1:10
-STAR KINO:370:h:0:6900:767:768:0:1:9
-CINE ACTION:370:h:0:6900:1023:1024:0:1:20
-CINE COMEDY:370:h:0:6900:1279:1280:0:1:29
-SCI-FANTASY:370:h:0:6900:1535:1536:0:1:41
-ROMANTIC MOVIES:370:h:0:6900:1791:1792:0:1:11
-BEATE-UHSE.TV:370:h:0:6900:2047:2048:0:1:21
-13 TH STREET:370:h:0:6900:2303:2304:0:1:43
-FOX KIDS:370:h:0:6900:255:256:0:1:22
-SUNSET:378:h:0:6900:1023:1024:0:1:16
-COMEDY:378:h:0:6900:1279:1280:0:1:28
+:verschl�sselte Fernsehprogramm
+PREMIERE 1:370:h:0:6900:511:512:0:1:10
+PREMIERE 2:370:h:0:6900:1791:1792:0:1:11
+PREMIERE 3:370:h:0:6900:2303:2304:0:1:43
+PREMIERE ACTION:370:h:0:6900:1023:1024:0:1:20
+PREMIERE SCI-FI:370:h:0:6900:1535:1536:0:1:41
+PREMIERE STAR:370:h:0:6900:767:768:0:1:9
+PREMIERE COMEDY:370:h:0:6900:1279:1280:0:1:29
+13 TH STREET:378:h:0:6900:2303:2304:0:1:42
 KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
+STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
 DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
-CLASSICA:378:h:0:6900:767:768:0:1:15
-SUPERDOM:378:h:0:6900:2303:2304:0:1:42
-K-TOON:378:h:0:6900:511:512:0:1:12
-SUPERDOM:378:h:0:6900:2047:2048:0:1:192
-SUPERDOM:378:h:0:6900:2559:2560:0:1:187
-JUNIOR:378:h:0:6900:255:256:0:1:19
-SUPERDOM 5:378:h:0:6900:2815:2816:0:1:213
-KICK 1:386:h:0:6900:255:257:0:1:26
-KICK 4:386:h:0:6900:1279:1281:0:1:188
-KICK 4:386:h:0:6900:1535:1536:0:1:189
-SPORT 2:386:h:0:6900:2047:2048:0:1:27
-KICK 4:386:h:0:6900:1023:1024:0:1:186
-KICK 2:386:h:0:6900:2559:2560:0:1:300
-KICK 4:386:h:0:6900:767:769:0:1:185
-SPORT 3:386:h:0:6900:2303:2304:0:1:18
-SUPERDOM 3:386:h:0:6900:3583:3584:0:1:211
-SPORT 4:386:h:0:6900:255:256:0:1:24
-KICK 3:386:h:0:6900:255:256:0:1:301
-KICK 4:386:h:0:6900:255:256:0:1:302
-KICK 4:386:h:0:6900:255:256:0:1:184
-KICK 4:386:h:0:6900:255:256:0:1:191
-EuroNews:394:h:0:6900:255:256:0:1:65039
-SEASONS:402:h:0:6900:1040:1044:0:1:33
 DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
-STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
+SUNSET:378:h:0:6900:1023:1024:0:1:16
 PLANET:402:h:0:6900:1100:1104:0:1:13
-BBC PRIME:402:h:0:6900:255:256:0:1:32
-ATV:402:h:0:6900:255:256:0:1:39
+SEASONS:402:h:0:6900:1040:1044:0:1:33
+CLASSICA:378:h:0:6900:767:768:0:1:15
+GOLDSTAR TV:378:h:0:6900:3839:3840:0:1:518
+FILMPALAST:378:h:0:6900:2559:2560:0:1:516
+HEIMATKANAL:378:h:0:6900:2815:2816:0:1:517
+FOX KIDS:378:h:0:6900:1279:1280:0:1:28
+JUNIOR:378:h:0:6900:255:256:0:1:19
+K-TOON:378:h:0:6900:12:13:0:1:12
 :Fernsehprogramme
-Leitseite:346:h:0:6900:2254:0:0:0:5004
-Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:0:50705
-PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
+Das Erste:410:h:0:6900:101:102:104:0:28106
 ZDF:394:h:0:6900:110:120:130:0:28006
-3sat:394:h:0:6900:210:220:230:0:28007
-KiKa:394:h:0:6900:255:256:0:0:28008
-Eurosport:394:h:0:6900:410:420:430:0:28009
 ZDF.info:394:h:0:6900:610:620:0:0:28011
-EuroNews:394:h:0:6900:2221:2233:768:0:28015
-ZDF Theaterkanal:394:h:0:6900:1110:1120:0:0:28016
 ZDF.doku:394:h:0:6900:660:670:0:0:28014
+ZDF Theaterkanal:394:h:0:6900:3440:3441:0:0:28016
+3sat:394:h:0:6900:210:220:230:0:28007
+KiKa:394:h:0:6900:310:320:330:0:28008
+EuroNews:394:h:0:6900:2221:2233:768:0:28015
+Eurosport:394:h:0:6900:410:420:430:0:28009
+DW-tv:610:h:0:6900:634:632:0:0:6101
+CNBC:394:h:0:6900:510:520:530:0:28010
 Test-R:410:h:0:6900:901:902:104:0:28130
 Bayerisches FS:410:h:0:6900:201:202:204:0:28107
 WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
 arte:410:h:0:6900:401:402:404:0:28109
 SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
-Das Erste:410:h:0:6900:101:102:104:0:28106
 hessen fernsehen:410:h:0:6900:301:302:304:0:28108
 BR-alpha:410:h:0:6900:701:702:704:0:28112
 SWR Fernsehen:410:h:0:6900:801:802:804:0:28113
-Phoenix:410:h:0:6900:255:256:0:0:28114
-Phoenix:410:h:0:6900:255:256:0:0:61225
-ARD-Online-Kanal:426:h:0:6900:0:1801:0:0:28218
+Phoenix:410:h:0:6900:901:902:0:0:28114
 EinsExtra:426:h:0:6900:101:102:0:0:28201
 EinsFestival:426:h:0:6900:201:202:0:0:28202
 EinsMuXx:426:h:0:6900:301:302:0:0:28203
@@ -101,36 +49,87 @@ MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
 ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
 B1 Berlin:426:h:0:6900:601:602:604:0:28206
 N3:426:h:0:6900:2401:2402:2404:0:28224
-TV Polonia:434:h:0:6900:641:642:0:0:53204
-Kanal D:434:h:0:6900:651:652:0:0:53205
-RTP international:434:h:0:6900:661:662:0:0:53206
+:Mediavision
+Extreme Sport:346:h:0:6900:801:802:0:1:50700
+Bloomberg:346:h:0:6900:811:812:0:1:50701
+Single TV:346:h:0:6900:621:622:0:1:50706
+Fashion TV:346:h:0:6900:821:822:0:1:50702
+BET ON JAZZ:346:h:0:6900:841:842:0:1:50704
+LANDSCAPE:346:h:0:6900:831:832:0:1:50703
+Einstein:346:h:0:6900:623:624:0:1:50719
+Leitseite:346:h:0:6900:2254:0:0:0:5004
+Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:0:50705
+Parlamentsfernsehen:610:h:0:6900:33:36:47:0:6100
+:Diverse TV-Sender
+TV Polonia:434:h:0:6900:641:642:0:1:53204
+Kanal D:434:h:0:6900:651:652:0:1:53205
+RTP international:434:h:0:6900:661:662:0:1:53206
+ERT-Sat:434:h:0:6900:691:692:0:1:53209
+CNE:434:h:0:6900:4056:4057:0:1:53208
+ZEE TV:442:h:0:6900:517:773:0:1:53301
+NTV i:442:h:0:6900:514:515:0:1:53302
+Leonardo:610:h:0:6900:653:652:0:1:6102
+Alice:610:h:0:6900:651:650:0:1:6103
+Nuvolari:610:h:0:6900:649:648:0:1:6104
 ATV:434:h:0:6900:631:632:0:0:53203
-ERT-Sat:434:h:0:6900:691:692:0:0:53209
-CNE:434:h:0:6900:255:256:0:0:53208
-ERT-Sat:434:h:0:6900:255:256:0:0:48587
-ZEE TV:442:h:0:6900:517:773:0:0:53301
-NTV i:442:h:0:6900:514:515:0:0:53302
-:verschl�sselte Radioprogramme
-LOVE SONGS:362:h:0:6900:0:320:0:1:163
-MUSICALS:362:h:0:6900:0:336:0:1:164
-EASY LISTENING:362:h:0:6900:0:304:0:1:162
-HITLISTE:362:h:0:6900:0:784:0:1:150
-ALTERNATIVE ROCK:362:h:0:6900:0:800:0:1:151
-DANCE:362:h:0:6900:0:816:0:1:152
-COUNTRY:362:h:0:6900:0:352:0:1:153
-CLASSIC ROCK:362:h:0:6900:0:544:0:1:154
-FILMMUSIK:362:h:0:6900:0:368:0:1:155
-DEUTSCHE HITS:362:h:0:6900:0:384:0:1:156
-SOUL CLASSICS:362:h:0:6900:0:400:0:1:157
-T�RK M�ZIGI:362:h:0:6900:0:560:0:1:158
-GOLD:362:h:0:6900:0:576:0:1:159
-KLASSIK POPUL�R:362:h:0:6900:0:592:0:1:145
-KLASS. SYMPHONIEN:362:h:0:6900:0:608:0:1:146
-OPER & VOKALMUSIK:362:h:0:6900:0:624:0:1:147
-BAROCKMUSIK:362:h:0:6900:0:640:0:1:148
-SCHLAGER:378:h:0:6900:0:320:0:1:166
-VOLKSMUSIK:378:h:0:6900:0:336:0:1:167
-OLD GOLD:378:h:0:6900:0:304:0:1:165
+unknown:434:h:0:6900:2570:2571:0:0:18954
+TW1:610:h:0:6900:6106:6107:0:0:6106
+unknown:346:h:0:6900:2930:2931:0:0:11122
+unknown:394:h:0:6900:1844:1845:0:1:59188
+unknown:410:h:0:6900:627:628:0:1:627
+PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
+:Premiere World Bundesliga
+SUPERDOM:386:h:0:6900:255:257:0:1:26
+Superdom:362:h:0:6900:255:256:0:1:26
+Spiel 1:362:h:0:6900:255:256,257:0:1:17
+Spiel 2:362:h:0:6900:2047:2048,2049:0:1:240
+BuLi-Konferenz:362:h:0:6900:3071:3072,3073:0:1:208
+BuLi-Spiel 1:362:h:0:6900:3327:3328,3329:0:1:209
+BuLi-Spiel 2:362:h:0:6900:2303:2304,2305:0:1:210
+BuLi-Spiel 3:362:h:0:6900:3583:3584,3585:0:1:211
+BuLi-Spiel 4:362:h:0:6900:2559:2560,2561:0:1:212
+BuLi-Spiel 5:362:h:0:6900:2815:2816,2817:0:1:213
+:Premiere Sport
+PR-SPORT 1:362:h:0:6900:255:256:0:1:17
+PR-SPORT 2:362:h:0:6900:3327:3328:0:1:27
+PR-SPORT 3:362:h:0:6900:2815:2816:0:1:18
+:Premiere Formel 1
+F1 Studio:362:h:0:6900:255:256:0:1:17
+F1 Box:362:h:0:6900:2047:2048:0:1:240
+F1 Verfolger:362:h:0:6900:2303:2304:0:1:241
+F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
+F1 Multi:362:h:0:6900:2815:2816:0:1:243
+F1 Info:362:h:0:6900:3071:3072:0:1:244
+:Premiere Cinedom 1
+Cinedom 1A:362:h:0:6900:1535:1536,1537:0:1:176
+Cinedom 1B:386:h:0:6900:1535:1536,1537:0:1:178
+Cinedom 1C:362:h:0:6900:511:512,513:0:1:180
+Cinedom 1D:354:h:0:6900:511:512,513:0:1:190
+:Premiere Cinedom 2
+Cinedom 2A:386:h:0:6900:1791:1792:0:1:179
+Cinedom 2B:362:h:0:6900:1279:1280:0:1:183
+Cinedom 2C:386:h:0:6900:511:512:0:1:184
+Cinedom 2D:386:h:0:6900:1279:1280:0:1:188
+Cinedom 2E:354:h:0:6900:1023:1024:0:1:193
+: Premiere Cinedom 3
+Cinedom 3A:362:h:0:6900:1023:1024:0:1:182
+Cinedom 3B:386:h:0:6900:767:768:0:1:185
+Cinedom 3C:354:h:0:6900:2559:2560:0:1:192
+Cinedom 3D:354:h:0:6900:1535:1536:0:1:195
+: Premiere Cinedom 4
+Cinedom 4A:362:h:0:6900:767:768:0:1:181
+Cinedom 4B:386:h:0:6900:2047:2048:0:1:187
+Cinedom 4C:354:h:0:6900:767:768:0:1:191
+: Premiere Cinedom 5
+Cinedom 5A:386:h:0:6900:1023:1024:0:1:186
+Cinedom 5B:354:h:0:6900:1279:1280:0:1:194
+: Premiere Cinedom Deluxe
+CINEDOM DELUXE:354:h:0:6900:255:256,257;259:0:1:189
+:Premiere Erotic
+BEATE-UHSE.TV:354:h:0:6900:3839:3840:0:1:21
+BLUE MOVIE 1:354:h:0:6900:1791:1792:0:1:513
+BLUE MOVIE 2:354:h:0:6900:2047:2048:0:1:514
+BLUE MOVIE 3:354:h:0:6900:2303:2304:0:1:515
 :Radioprogramme
 100,6:354:h:0:6900:0:1312:0:0:161
 DLR-Berlin:394:h:0:6900:0:710:0:0:28012
@@ -142,26 +141,49 @@ Bremen 2:410:h:0:6900:0:3801:0:0:28128
 Bayern 1:410:h:0:6900:0:3601:0:0:28126
 NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
 SR 1:410:h:0:6900:0:3901:0:0:28129
-HR2 plus:410:h:0:6900:0:3401:0:0:28124
-HR2:410:h:0:6900:0:3301:0:0:28123
-hr-chronos:410:h:0:6900:0:3201:0:0:28122
+hr-klassik:410:h:0:6900:0:3401:0:0:28124
+hr2:410:h:0:6900:0:3301:0:0:28123
 HR XXL:410:h:0:6900:0:3501:0:0:28125
+hr-chronos:410:h:0:6900:0:3201:0:0:28122
 Radio 3:426:h:0:6900:0:701:0:0:28207
 MDR KULTUR:426:h:0:6900:0:801:0:0:28208
 Fritz:426:h:0:6900:0:901:0:0:28209
 JUMP:426:h:0:6900:0:1001:0:0:28210
 MDR info:426:h:0:6900:0:1101:0:0:28211
 SPUTNIK:426:h:0:6900:0:1201:0:0:28212
-SFB4 Multikulti:426:h:0:6900:0:1301:0:0:28213
+RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
 SWR-2:426:h:0:6900:0:1401:0:0:28214
 WDR3:426:h:0:6900:0:1501:0:0:28215
 WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
-All Jazz:442:h:0:6900:0:535:0:0:53350
+:verschl�sselte Radioprogramme
+KLASSIK POPUL�R:378:h:0:6900:0:592:0:1:145
+KLASS. SYMPHONIEN:378:h:0:6900:0:608:0:1:146
+OPER & VOKALMUSIK:378:h:0:6900:0:624:0:1:147
+BAROCKMUSIK:378:h:0:6900:0:640:0:1:148
+JAZZ:378:h:0:6900:0:656:0:1:149
+HITLISTE:378:h:0:6900:0:784:0:1:150
+ALTERNATIVE ROCK:378:h:0:6900:0:800:0:1:151
+DANCE:378:h:0:6900:0:816:0:1:152
+COUNTRY:378:h:0:6900:0:352:0:1:153
+CLASSIC ROCK:378:h:0:6900:0:544:0:1:154
+FILMMUSIK:378:h:0:6900:0:368:0:1:155
+DEUTSCHE HITS:402:h:0:6900:0:1156:0:1:156
+SOUL CLASSICS:402:h:0:6900:0:1161:0:1:157
+T�RK M�ZIGI:402:h:0:6900:0:1166:0:1:158
+GOLD:402:h:0:6900:0:1171:0:1:159
+EASY LISTENING:402:h:0:6900:0:1201:0:1:162
+LOVE SONGS:402:h:0:6900:0:1191:0:1:163
+MUSICALS:402:h:0:6900:0:1196:0:1:164
+OLD GOLD:402:h:0:6900:0:1186:0:1:165
+SCHLAGER:402:h:0:6900:0:1176:0:1:166
+VOLKSMUSIK:402:h:0:6900:0:1181:0:1:167
+All Jazz:442:h:0:6900:0:535:0:1:53350
 Cristal New Age:442:h:0:6900:0:536:0:0:53351
-Movie Sounds:442:h:0:6900:0:537:0:0:53352
-Sinfonica:442:h:0:6900:0:538:0:0:53353
-Opernfestival:442:h:0:6900:0:539:0:0:53354
-Barock Fantasie:442:h:0:6900:0:540:0:0:53355
-Musica Camerata:442:h:0:6900:0:541:0:0:53356
-Musica Antica:442:h:0:6900:0:542:0:0:53357
-Adagio:442:h:0:6900:0:543:0:0:53358
+Movie Sounds:442:h:0:6900:0:537:0:1:53352
+Sinfonica:442:h:0:6900:0:538:0:1:53353
+Opernfestival:442:h:0:6900:0:539:0:1:53354
+Barock Fantasie:442:h:0:6900:0:540:0:1:53355
+Musica Camerata:442:h:0:6900:0:541:0:1:53356
+Musica Antica:442:h:0:6900:0:542:0:1:53357
+Adagio:442:h:0:6900:0:543:0:1:53358
+Jazz Legends:442:h:0:6900:0:544:0:1:53359
diff --git a/config.c b/config.c
index 8e0cce300..27cd62edf 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.52 2001/07/27 13:45:28 kls Exp $
+ * $Id: config.c 1.54 2001/08/11 15:34:42 kls Exp $
  */
 
 #include "config.h"
@@ -320,7 +320,7 @@ char *cTimer::buffer = NULL;
 cTimer::cTimer(bool Instant)
 {
   startTime = stopTime = 0;
-  recording = false;
+  recording = pending = false;
   active = Instant;
   cChannel *ch = Channels.GetByNumber(cDvbApi::CurrentChannel());
   channel = ch ? ch->number : 0;
@@ -343,7 +343,7 @@ cTimer::cTimer(bool Instant)
 cTimer::cTimer(const cEventInfo *EventInfo)
 {
   startTime = stopTime = 0;
-  recording = false;
+  recording = pending = false;
   active = true;
   cChannel *ch = Channels.GetByServiceID(EventInfo->GetServiceID());
   channel = ch ? ch->number : 0;
@@ -570,6 +570,11 @@ void cTimer::SetRecording(bool Recording)
   isyslog(LOG_INFO, "timer %d %s", Index() + 1, recording ? "start" : "stop");
 }
 
+void cTimer::SetPending(bool Pending)
+{
+  pending = Pending;
+}
+
 cTimer *cTimer::GetMatch(void)
 {
   time_t t = time(NULL); // all timers must be checked against the exact same time to correctly handle Priority!
@@ -764,7 +769,7 @@ cSetup::cSetup(void)
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
-  DiSEqC = 1;
+  DiSEqC = 0;
   SetSystemTime = 0;
   MarginStart = 2;
   MarginStop = 10;
diff --git a/config.h b/config.h
index bbf5d6594..c9faf6cb4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.57 2001/08/06 16:44:38 kls Exp $
+ * $Id: config.h 1.59 2001/08/11 15:28:21 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.90"
+#define VDRVERSION "0.91"
 
 #define MaxBuffer 10000
 
@@ -122,7 +122,7 @@ class cTimer : public cListObject {
   static const char *ToText(cTimer *Timer);
 public:
   enum { MaxFileName = 256 };
-  bool recording;
+  bool recording, pending;
   int active;
   int channel;
   int day;
@@ -145,6 +145,7 @@ class cTimer : public cListObject {
   time_t StartTime(void);
   time_t StopTime(void);
   void SetRecording(bool Recording);
+  void SetPending(bool Pending);
   static cTimer *GetMatch(void);
   static int TimeToInt(int t);
   static time_t Day(time_t t);
diff --git a/dvbapi.c b/dvbapi.c
index 0524f00f2..4c3861054 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.101 2001/08/06 16:24:13 kls Exp $
+ * $Id: dvbapi.c 1.106 2001/08/12 15:09:42 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -53,13 +53,10 @@ extern "C" {
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
 #define VIDEOBUFSIZE    (1024*1024)
-#define AC3_BUFFER_SIZE (6*1024*16)
 
 // The maximum size of a single frame:
 #define MAXFRAMESIZE (192*1024)
 
-#define FRAMESPERSEC 25
-
 // The maximum file size is limited by the range that can be covered
 // with 'int'. 4GB might be possible (if the range is considered
 // 'unsigned'), 2GB should be possible (even if the range is considered
@@ -85,6 +82,8 @@ extern "C" {
 
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 
+#define FATALERRNO (errno != EAGAIN && errno != EINTR)
+
 typedef unsigned char uchar;
 
 const char *IndexToHMSF(int Index, bool WithFrame)
@@ -161,7 +160,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
                  if (index) {
                     f = open(fileName, O_RDONLY);
                     if (f >= 0) {
-                       if ((int)read(f, index, buf.st_size) != buf.st_size) {
+                       if ((int)safe_read(f, index, buf.st_size) != buf.st_size) {
                           esyslog(LOG_ERR, "ERROR: can't read from file '%s'", fileName);
                           delete index;
                           index = NULL;
@@ -225,7 +224,7 @@ bool cIndexFile::CatchUp(void)
               int offset = (last + 1) * sizeof(tIndex);
               int delta = (newLast - last) * sizeof(tIndex);
               if (lseek(f, offset, SEEK_SET) == offset) {
-                 if (read(f, &index[last + 1], delta) != delta) {
+                 if (safe_read(f, &index[last + 1], delta) != delta) {
                     esyslog(LOG_ERR, "ERROR: can't read from index");
                     delete index;
                     index = NULL;
@@ -252,7 +251,7 @@ void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 {
   if (f >= 0) {
      tIndex i = { FileOffset, PictureType, FileNumber, 0 };
-     if (write(f, &i, sizeof(i)) != sizeof(i)) {
+     if (safe_write(f, &i, sizeof(i)) != sizeof(i)) {
         esyslog(LOG_ERR, "ERROR: can't write to index file");
         close(f);
         f = -1;
@@ -545,7 +544,7 @@ void cRecordBuffer::Input(void)
          t = time(NULL);
          }
       else if (r < 0) {
-         if (errno != EAGAIN) {
+         if (FATALERRNO) {
             LOG_ERROR;
             if (errno != EBUFFEROVERFLOW)
                break;
@@ -572,8 +571,9 @@ void cRecordBuffer::Output(void)
   int r = 0;
   for (;;) {
       int g = Get(b + r, sizeof(b) - r);
-      if (g > 0) {
+      if (g > 0)
          r += g;
+      if (r > 0) {
          int Count = r, Result;
          const uchar *p = remux.Process(b, Count, Result, &pictureType);
          if (p) {
@@ -583,7 +583,7 @@ void cRecordBuffer::Output(void)
                if (index && pictureType != NO_PICTURE)
                   index->Write(pictureType, fileName.Number(), fileSize);
                while (Result > 0) {
-                     int w = write(recordFile, p, Result);
+                     int w = safe_write(recordFile, p, Result);
                      if (w < 0) {
                         LOG_ERROR_STR(fileName.Name());
                         recording = false;
@@ -622,7 +622,7 @@ int ReadFrame(int f, uchar *b, int Length, int Max)
      esyslog(LOG_ERR, "ERROR: frame larger than buffer (%d > %d)", Length, Max);
      Length = Max;
      }
-  int r = read(f, b, Length);
+  int r = safe_read(f, b, Length);
   if (r < 0)
      LOG_ERROR;
   return r;
@@ -708,7 +708,7 @@ void cPlayBuffer::Output(void)
                         p += w;
                         r -= w;
                         }
-                     else if (w < 0 && errno != EAGAIN) {
+                     else if (w < 0 && FATALERRNO) {
                         LOG_ERROR;
                         Stop();
                         return;
@@ -925,7 +925,7 @@ void cReplayBuffer::Input(void)
               }
            else if (r == 0)
               eof = true;
-           else if (r < 0 && errno != EAGAIN) {
+           else if (r < 0 && FATALERRNO) {
               LOG_ERROR;
               break;
               }
@@ -1172,7 +1172,6 @@ class cDVDplayBuffer : public cPlayBuffer {
   int logAudioTrack;
   int maxAudioTrack;
 
-  ac3_config_t ac3_config;
   enum { AC3_STOP, AC3_START, AC3_PLAY } ac3stat;
   uchar *ac3data;
   int ac3inp;
@@ -1231,10 +1230,7 @@ cDVDplayBuffer::cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD
   skipCnt = 0;
   logAudioTrack = 0;
   canToggleAudioTrack = true;//XXX determine from cDVD!
-  ac3_config.num_output_ch = 2;
-  //    ac3_config.flags = /* mm_accel() | */ MM_ACCEL_MLIB;
-  ac3_config.flags = 0;
-  ac3_init(&ac3_config);
+  ac3dec_init();
   data = new uchar[1024 * DVD_VIDEO_LB_LEN];
   ac3data = new uchar[AC3_BUFFER_SIZE];
   ac3inp = ac3outp = 0;
@@ -1823,9 +1819,9 @@ void cDVDplayBuffer::handleAC3(unsigned char *sector, int length)
      }
   else {
      if (ac3stat == AC3_PLAY)
-        ac3_decode_data(sector, sector+length, 0, &ac3inp, &ac3outp, (char *)ac3data);
+        ac3dec_decode_data(sector, sector + length, 0, &ac3inp, &ac3outp, (char *)ac3data);
      else if (ac3stat == AC3_START) {
-        ac3_decode_data(sector, sector+length, 1, &ac3inp, &ac3outp, (char *)ac3data);
+        ac3dec_decode_data(sector, sector + length, 1, &ac3inp, &ac3outp, (char *)ac3data);
         ac3stat = AC3_PLAY;
         }
      }
@@ -2078,7 +2074,7 @@ void cTransferBuffer::Input(void)
               }
            }
         else if (r < 0) {
-           if (errno != EAGAIN) {
+           if (FATALERRNO) {
               LOG_ERROR;
               if (errno != EBUFFEROVERFLOW)
                  break;
@@ -2112,7 +2108,7 @@ void cTransferBuffer::Output(void)
                     p += w;
                     r -= w;
                     }
-                 else if (w < 0 && errno != EAGAIN) {
+                 else if (w < 0 && FATALERRNO) {
                     LOG_ERROR;
                     Stop();
                     return;
@@ -2221,7 +2217,7 @@ void cCuttingBuffer::Action(void)
                  }
               LastIFrame = 0;
               }
-           write(toFile, buffer, Length);
+           safe_write(toFile, buffer, Length);
            toIndex->Write(PictureType, toFileName->Number(), FileSize);
            FileSize += Length;
            if (!LastIFrame)
@@ -2316,6 +2312,7 @@ cDvbApi::cDvbApi(int n)
   transferringFromDvbApi = NULL;
   ca = 0;
   priority = -1;
+  cardIndex = n;
 
   // Devices that are only present on DVB-C or DVB-S cards:
 
@@ -2423,7 +2420,7 @@ cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
   int index = Ca - 1;
   for (int i = 0; i < MAXDVBAPI; i++) {
       if (dvbApi[i]) {
-         if (i == index) { // means we need exactly _this_ device
+         if (dvbApi[i]->CardIndex() == index) { // means we need exactly _this_ device
             d = dvbApi[i];
             break;
             }
@@ -2450,15 +2447,6 @@ cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
           ? d : NULL;
 }
 
-int cDvbApi::Index(void)
-{
-  for (int i = 0; i < MAXDVBAPI; i++) {
-      if (dvbApi[i] == this)
-         return i;
-      }
-  return -1;
-}
-
 bool cDvbApi::Probe(const char *FileName)
 {
   if (access(FileName, F_OK) == 0) {
@@ -2956,7 +2944,7 @@ int cDvbApi::SetModeRecord(void)
   SetPids(true);
   if (fd_dvr >= 0)
      close(fd_dvr);
-  fd_dvr = OstOpen(DEV_OST_DVR, Index(), O_RDONLY | O_NONBLOCK);
+  fd_dvr = OstOpen(DEV_OST_DVR, CardIndex(), O_RDONLY | O_NONBLOCK);
   if (fd_dvr < 0)
      LOG_ERROR;
   return fd_dvr;
@@ -3066,7 +3054,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
   // If this card can't receive this channel, we must not actually switch
   // the channel here, because that would irritate the driver when we
   // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (this == PrimaryDvbApi && Ca && Ca != Index() + 1);
+  bool NeedsTransferMode = (this == PrimaryDvbApi && Ca && Ca != CardIndex() + 1);
 
   if (!NeedsTransferMode) {
 
@@ -3282,6 +3270,10 @@ bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
   if (!MakeDirs(FileName, true))
      return false;
 
+  // Make sure the disk is up and running:
+
+  SpinUpDisk(FileName);
+
   // Create recording buffer:
 
   recordBuffer = new cRecordBuffer(this, FileName, vPid, aPid1, aPid2, dPid1, dPid2);
@@ -3505,7 +3497,7 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        for (int i = 0; i < cDvbApi::NumDvbApis; i++) {
+        for (int i = 0; i < MAXDVBAPI; i++) {
             cDvbApi *DvbApi = cDvbApi::GetDvbApi(i + 1, MAXPRIORITY);
             if (DvbApi) {
                if (DvbApi != cDvbApi::PrimaryDvbApi || (cDvbApi::NumDvbApis == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
diff --git a/dvbapi.h b/dvbapi.h
index 41193ae74..2cd57bfa1 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.44 2001/08/05 15:57:45 kls Exp $
+ * $Id: dvbapi.h 1.46 2001/08/11 12:22:01 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -40,6 +40,8 @@ typedef struct CRect {
   signed short x, y, width, height;
   };
 
+#define FRAMESPERSEC 25
+
 const char *IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
 int HMSFToIndex(const char *HMSF);
@@ -93,6 +95,7 @@ class cDvbApi {
 private:
   static cDvbApi *dvbApi[MAXDVBAPI];
   static int useDvbApi;
+  int cardIndex;
 public:
   static cDvbApi *PrimaryDvbApi;
   static void SetUseDvbApi(int n);
@@ -111,8 +114,8 @@ class cDvbApi {
          // will be returned.
          // The caller must check whether the returned DVB device is actually
          // recording and stop recording if necessary.
-  int Index(void);
-         // Returns the index of this DvbApi.
+  int CardIndex(void) { return cardIndex; }
+         // Returns the card index of this DvbApi (0 ... MAXDVBAPI - 1).
   static bool Probe(const char *FileName);
          // Probes for existing DVB devices.
   static bool Init(void);
diff --git a/eit.c b/eit.c
index 3de610209..14738f3b2 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.16 2001/05/26 10:58:01 kls Exp $
+ * $Id: eit.c 1.19 2001/08/12 15:04:37 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1099,10 +1099,12 @@ bool cEIT::WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop,
 // --- cSIProcessor ----------------------------------------------------------
 
 #define MAX_FILTERS 20
+#define EPGDATAFILENAME "epg.data"
 
 int cSIProcessor::numSIProcessors = 0;
 cSchedules *cSIProcessor::schedules = NULL;
 cMutex cSIProcessor::schedulesMutex;
+const char *cSIProcessor::epgDataFileName = EPGDATAFILENAME;
 
 /**  */
 cSIProcessor::cSIProcessor(const char *FileName)
@@ -1129,6 +1131,20 @@ cSIProcessor::~cSIProcessor()
    delete fileName;
 }
 
+void cSIProcessor::SetEpgDataFileName(const char *FileName)
+{
+  epgDataFileName = NULL;
+  if (FileName)
+     epgDataFileName = strdup(DirectoryOk(FileName) ? AddDirectory(FileName, EPGDATAFILENAME) : FileName);
+}
+
+const char *cSIProcessor::GetEpgDataFileName(void)
+{
+  if (epgDataFileName)
+     return *epgDataFileName == '/' ? epgDataFileName : AddDirectory(VideoDirectory, epgDataFileName);
+  return NULL;
+}
+
 void cSIProcessor::SetStatus(bool On)
 {
    LOCK_THREAD;
@@ -1174,16 +1190,18 @@ void cSIProcessor::Action()
             schedulesMutex.Unlock();
             lastCleanup = now;
          }
-         if (now - lastDump > 600)
+         if (epgDataFileName && now - lastDump > 600)
          {
             LOCK_THREAD;
 
             schedulesMutex.Lock();
-            FILE *f = fopen(AddDirectory(VideoDirectory, "epg.data"), "w");
+            FILE *f = fopen(GetEpgDataFileName(), "w");
             if (f) {
                schedules->Dump(f);
                fclose(f);
                }
+            else
+               LOG_ERROR;
             lastDump = now;
             schedulesMutex.Unlock();
          }
@@ -1211,11 +1229,11 @@ void cSIProcessor::Action()
             {
                /* read section */
                unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
-               if (read(filters[a].handle, buf, 3) == 3)
+               if (safe_read(filters[a].handle, buf, 3) == 3)
                {
                   int seclen = ((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF);
                   int pid = filters[a].pid;
-                  int n = read(filters[a].handle, buf + 3, seclen);
+                  int n = safe_read(filters[a].handle, buf + 3, seclen);
                   if (n == seclen)
                   {
                      seclen += 3;
diff --git a/eit.h b/eit.h
index e6bbd13e6..d4ba69f69 100644
--- a/eit.h
+++ b/eit.h
@@ -13,7 +13,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.7 2001/05/25 12:56:53 kls Exp $
+ * $Id: eit.h 1.8 2001/08/11 09:06:17 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -126,6 +126,7 @@ class cSIProcessor : public cThread {
   static int numSIProcessors;
   static cSchedules *schedules;
   static cMutex schedulesMutex;
+  static const char *epgDataFileName;
   bool masterSIProcessor;
   bool useTStime;
   SIP_FILTER *filters;
@@ -137,6 +138,8 @@ class cSIProcessor : public cThread {
 public:
   cSIProcessor(const char *FileName);
   ~cSIProcessor();
+  static void SetEpgDataFileName(const char *FileName);
+  static const char *GetEpgDataFileName(void);
   void SetStatus(bool On);
   bool SetUseTSTime(bool use);
   bool SetCurrentServiceID(unsigned short servid);
diff --git a/i18n.c b/i18n.c
index ebc366d9d..3d75c245d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.27 2001/08/02 14:40:16 kls Exp $
+ * $Id: i18n.c 1.31 2001/08/11 13:22:24 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -164,7 +164,7 @@ const tPhrase Phrases[] = {
     "Eventi",
     "Uitzending",
     "Evento",
-    "Ev�nement",
+    "Ev�nement",
     "Hendelse"
   },
   { "Summary",
@@ -330,13 +330,13 @@ const tPhrase Phrases[] = {
     "Langue",
     "Spr�k",
   },
-  { "Eject DVD",
-    "DVD auswerfen",
-    "", // TODO
+  { "Eject",
+    "Auswerfen",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
+    "Ejection",
     "", // TODO
   },
   // Confirmations:
@@ -413,14 +413,14 @@ const tPhrase Phrases[] = {
     "Polarisation",
     "Polaritet",
   },
-  { "Diseqc",
-    "Diseqc",
-    "Diseqc",
-    "Diseqc",
-    "Diseqc",
-    "Diseqc",
-    "Diseqc",
-    "Diseqc",
+  { "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -428,7 +428,7 @@ const tPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Srate",
-    "Srate",
+    "Fr�q. Symbole",
     "Symbolrate",
   },
   { "Vpid",
@@ -437,7 +437,7 @@ const tPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "Vpid",
-    "Vpid",
+    "PID Vid�o",
     "Video pid",
   },
   { "Apid1",
@@ -446,7 +446,7 @@ const tPhrase Phrases[] = {
     "Apid1",
     "Apid1",
     "Apid1",
-    "Apid1",
+    "PID Audio (1)",
     "Audio pid1",
   },
   { "Apid2",
@@ -455,7 +455,7 @@ const tPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "Apid2",
-    "Apid2",
+    "PID Audio (2)",
     "Audio pid2",
   },
   { "Dpid1",
@@ -464,7 +464,7 @@ const tPhrase Phrases[] = {
     "Dpid1",
     "Dpid1",
     "Dpid1",
-    "Dpid1",
+    "PID AC3 (1)",
     "AC3 pid1",
   },
   { "Dpid2",
@@ -473,7 +473,7 @@ const tPhrase Phrases[] = {
     "Dpid2",
     "Dpid2",
     "Dpid2",
-    "Dpid2",
+    "PID AC3 (2)",
     "AC3 pid2",
   },
   { "Tpid",
@@ -482,7 +482,7 @@ const tPhrase Phrases[] = {
     "Tpid",
     "Tpid",
     "Tpid",
-    "Tpid",
+    "PID T�l�texte",
     "Teletext pid",
   },
   { "CA",
@@ -491,7 +491,7 @@ const tPhrase Phrases[] = {
     "CA",
     "CA",
     "CA",
-    "CA",
+    "Cryptage",
     "Kortleser",
   },
   { "Pnr",
@@ -500,7 +500,7 @@ const tPhrase Phrases[] = {
     "Pnr",
     "Pnr",
     "Pnr",
-    "Pnr",
+    "Num. Progr.",
     "Program Id",
   },
   // Timer parameters:
@@ -710,7 +710,7 @@ const tPhrase Phrases[] = {
     "LnbSLOF",
     "LnbSLOF",
     "LnbSLOF",
-    "LnbSLOF",
+    "Limite de bandes LNB",
     "LO-grensefrekvens",
   },
   { "LnbFrequLo",
@@ -827,6 +827,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Position infos cha�nes",
     "", // TODO
   },
   { "OSDwidth",
@@ -835,6 +836,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Largeur affichage",
     "", // TODO
   },
   { "OSDheight",
@@ -843,6 +845,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Hauteur affichage",
     "", // TODO
   },
   // The days of the week:
@@ -1098,6 +1101,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "haut",
     "", // TODO
   },
   { "bottom",
@@ -1106,6 +1110,15 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "bas",
+    "", // TODO
+  },
+  { "Jump: ", // note the trailing blank
+    "Springen: ",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
     "", // TODO
   },
   { " Stop replaying", // note the leading blank!
@@ -1141,7 +1154,7 @@ const tPhrase Phrases[] = {
     "Cambio su card DVB primaria...",
     "Eerste DVB-kaart wordt omgeschakeld...",
     "A mudar placa DVB primaria...",
-    "Changement de carte DVB...",
+    "Changement de carte DVB principale...",
     "Bytter hoved DVB-enhet... ",
   },
   { "Up/Dn for new location - OK to move",
diff --git a/interface.c b/interface.c
index 03dca06f2..e2d83b359 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.39 2001/07/28 14:57:52 kls Exp $
+ * $Id: interface.c 1.40 2001/08/07 16:23:28 kls Exp $
  */
 
 #include "interface.h"
@@ -328,7 +328,7 @@ void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvb
 {
   if (open && Text) {
      const int w = Width() / 4;
-     int l = (w - strlen(Text)) / 2;
+     int l = (w - int(strlen(Text))) / 2;
      if (l < 0)
         l = 0;
      cDvbApi::PrimaryDvbApi->Fill(Index * w, -1, w, 1, BgColor);
diff --git a/menu.c b/menu.c
index e25b23041..0f89fab32 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.95 2001/08/05 16:09:41 kls Exp $
+ * $Id: menu.c 1.103 2001/08/12 12:42:37 kls Exp $
  */
 
 #include "menu.h"
@@ -545,7 +545,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), FileNameChars));
      Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency, 10000, 13000)); //TODO exact limits???
      Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
-     Add(new cMenuEditIntItem( tr("Diseqc"),       &data.diseqc, 0, 10)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("DiSEqC"),       &data.diseqc, 0, 10)); //TODO exact limits???
      Add(new cMenuEditIntItem( tr("Srate"),        &data.srate, 22000, 30000)); //TODO exact limits - toggle???
      Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid, 0, 0xFFFE));
      Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0xFFFE));
@@ -1813,10 +1813,10 @@ cMenuMain::cMenuMain(bool Replaying)
         delete buffer;
         }
   if (cVideoCutter::Active())
-     Add(new cOsdItem(hk(tr(" Cancel editing")), osCancelEdit));
+     Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
   const char *DVDbutton =
 #ifdef DVDSUPPORT
-                          cDVD::DiscOk() ? tr("Eject DVD") : NULL;
+                          cDVD::DiscOk() ? tr("Eject") : NULL;
 #else
                           NULL;
 #endif //DVDSUPPORT
@@ -2070,14 +2070,15 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
      timer = new cTimer(true);
      Timers.Add(timer);
      Timers.Save();
-     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->Index() + 1);
+     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->CardIndex() + 1);
      }
+  timer->SetPending(true);
   timer->SetRecording(true);
   if (Channels.SwitchTo(timer->channel, dvbApi)) {
      cRecording Recording(timer);
      if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
         Recording.WriteSummary();
-     Interface->DisplayRecording(dvbApi->Index(), true);
+     Interface->DisplayRecording(dvbApi->CardIndex(), true);
      }
   else
      cThread::EmergencyExit(true);
@@ -2102,7 +2103,7 @@ void cRecordControl::Stop(bool KeepInstant)
         Timers.Save();
         }
      timer = NULL;
-     Interface->DisplayRecording(dvbApi->Index(), false);
+     Interface->DisplayRecording(dvbApi->CardIndex(), false);
      }
 }
 
@@ -2134,8 +2135,8 @@ bool cRecordControls::Start(cTimer *Timer)
                }
             }
         }
-     else if (!Timer || Timer->priority >= Setup.PrimaryLimit)
-        esyslog(LOG_ERR, "ERROR: no free DVB device to record channel %d!", ch);
+     else if (!Timer || (Timer->priority >= Setup.PrimaryLimit && !Timer->pending))
+        isyslog(LOG_ERR, "no free DVB device to record channel %d!", ch);
      }
   else
      esyslog(LOG_ERR, "ERROR: channel %d not defined!", ch);
@@ -2158,7 +2159,7 @@ void cRecordControls::Stop(cDvbApi *DvbApi)
   for (int i = 0; i < MAXDVBAPI; i++) {
       if (RecordControls[i]) {
          if (RecordControls[i]->Uses(DvbApi)) {
-            isyslog(LOG_INFO, "stopping recording on DVB device %d due to higher priority", DvbApi->Index() + 1);
+            isyslog(LOG_INFO, "stopping recording on DVB device %d due to higher priority", DvbApi->CardIndex() + 1);
             RecordControls[i]->Stop(true);
             }
          }
@@ -2256,6 +2257,7 @@ cReplayControl::cReplayControl(void)
   visible = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
   timeoutShow = 0;
+  timeSearchActive = false;
   if (fileName) {
      marks.Load(fileName);
      dvbApi->StartReplay(fileName);
@@ -2305,10 +2307,8 @@ void cReplayControl::ClearLastReplayed(const char *FileName)
 void cReplayControl::Show(int Seconds)
 {
   if (!visible) {
-     Interface->Open(Setup.OSDwidth, -3);
-     needsFastResponse = visible = true;
      shown = ShowProgress(true);
-     if (Seconds > 0)
+     if (shown && Seconds > 0)
         timeoutShow = time(NULL) + Seconds;
      }
 }
@@ -2326,6 +2326,10 @@ bool cReplayControl::ShowProgress(bool Initial)
   int Current, Total;
 
   if (dvbApi->GetIndex(Current, Total) && Total > 0) {
+     if (!visible) {
+        Interface->Open(Setup.OSDwidth, -3);
+        needsFastResponse = visible = true;
+        }
      if (Initial) {
         Interface->Clear();
         if (title)
@@ -2358,11 +2362,104 @@ bool cReplayControl::ShowProgress(bool Initial)
   return false;
 }
 
+void cReplayControl::TimeSearchDisplay(void)
+{
+  char buf[64];
+  int len;
+  
+  strcpy(buf, tr("Jump: "));
+  len = strlen(buf);
+  
+  switch (timeSearchPos) {
+    case 1:  sprintf(buf + len, "%01d-:--", timeSearchHH / 10); break;
+    case 2:  sprintf(buf + len, "%02d:--", timeSearchHH); break;
+    case 3:  sprintf(buf + len, "%02d:%01d-", timeSearchHH, timeSearchMM / 10); break;
+    case 4:  sprintf(buf + len, "%02d:%02d", timeSearchHH, timeSearchMM); break;
+    default: sprintf(buf + len, "--:--"); break;
+    }
+
+  Interface->Write(12, 2, buf);
+}
+
+void cReplayControl::TimeSearchProcess(eKeys Key)
+{
+  int Seconds = timeSearchHH * 3600 + timeSearchMM * 60;
+  switch (Key) {
+    case k0 ... k9:
+         {
+           int n = Key - k0;
+           int s = (lastTotal / FRAMESPERSEC);
+           int m = s / 60 % 60;
+           int h = s / 3600;
+           switch (timeSearchPos) {
+             case 0: if (n * 10 <= h) {
+                        timeSearchHH = n * 10;
+                        timeSearchPos++;
+                        }
+                     break;
+             case 1: if (timeSearchHH + n <= h) {
+                        timeSearchHH += n;
+                        timeSearchPos++;
+                        }
+                     break;
+             case 2: if (n <= 5 && timeSearchHH * 60 + n * 10 <= h * 60 + m) {
+                        timeSearchMM += n * 10;
+                        timeSearchPos++;
+                        }
+                     break;
+             case 3: if (timeSearchHH * 60 + timeSearchMM + n <= h * 60 + m) {
+                        timeSearchMM += n;
+                        timeSearchPos++;
+                        }
+                     break;
+             }
+           TimeSearchDisplay();
+         }
+         break;
+    case kLeft:
+    case kRight:
+         dvbApi->SkipSeconds(Seconds * (Key == kRight ? 1 : -1));
+         timeSearchActive = false;
+         break;
+    case kUp:
+    case kDown:
+         dvbApi->Goto(Seconds * FRAMESPERSEC, Key == kDown);
+         timeSearchActive = false;
+         break;
+    default:
+         timeSearchActive = false;
+         break;
+    }
+
+  if (!timeSearchActive) {
+     if (timeSearchHide)
+        Hide();
+     else
+        Interface->Fill(12, 2, Width() - 22, 1, clrBackground);
+     }
+}
+
+void cReplayControl::TimeSearch(void)
+{
+  timeSearchHH = timeSearchMM = timeSearchPos = 0;
+  timeSearchHide = false;
+  if (!visible) {
+     Show();
+     if (visible)
+        timeSearchHide = true;
+     else
+        return;
+     }
+  TimeSearchDisplay();
+  timeSearchActive = true;
+}
+
 void cReplayControl::MarkToggle(void)
 {
   int Current, Total;
   if (dvbApi->GetIndex(Current, Total, true)) {
      cMark *m = marks.Get(Current);
+     lastCurrent = -1; // triggers redisplay
      if (m)
         marks.Del(m);
      else {
@@ -2454,6 +2551,10 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
      }
   bool DisplayedFrames = displayFrames;
   displayFrames = false;
+  if (timeSearchActive && Key != kNone) {
+     TimeSearchProcess(Key);
+     return osContinue;
+     }
   switch (Key) {
     // Positioning:
     case kUp:      dvbApi->Play(); break;
@@ -2462,6 +2563,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     case kLeft:    dvbApi->Backward(); break;
     case kRight|k_Release:
     case kRight:   dvbApi->Forward(); break;
+    case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
     case kGreen:   dvbApi->SkipSeconds(-60); break;
     case kYellow|k_Repeat:
@@ -2496,7 +2598,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
       }
     }
   if (DisplayedFrames && !displayFrames)
-     Interface->Fill(0, 2, Width() / 2, 1, clrBackground);
+     Interface->Fill(0, 2, 11, 1, clrBackground);
   return osContinue;
 }
 
diff --git a/menu.h b/menu.h
index c47e5cbd8..f75ca8670 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.22 2001/08/05 16:04:58 kls Exp $
+ * $Id: menu.h 1.23 2001/08/11 14:08:50 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -102,6 +102,11 @@ class cReplayControl : public cOsdBase {
   bool visible, shown, displayFrames;
   int lastCurrent, lastTotal;
   time_t timeoutShow;
+  bool timeSearchActive, timeSearchHide;  
+  int timeSearchHH, timeSearchMM, timeSearchPos;
+  void TimeSearchDisplay(void);
+  void TimeSearchProcess(eKeys Key);
+  void TimeSearch(void);
   void Show(int Seconds = 0);
   void Hide(void);
   static char *fileName;
diff --git a/recording.c b/recording.c
index ddca1a4b2..0190d108f 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.32 2001/06/16 10:33:20 kls Exp $
+ * $Id: recording.c 1.33 2001/08/12 15:09:59 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -141,7 +141,7 @@ int cResumeFile::Read(void)
   if (fileName) {
      int f = open(fileName, O_RDONLY);
      if (f >= 0) {
-        if (read(f, &resume, sizeof(resume)) != sizeof(resume)) {
+        if (safe_read(f, &resume, sizeof(resume)) != sizeof(resume)) {
            resume = -1;
            LOG_ERROR_STR(fileName);
            }
@@ -158,7 +158,7 @@ bool cResumeFile::Save(int Index)
   if (fileName) {
      int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
      if (f >= 0) {
-        if (write(f, &Index, sizeof(Index)) != sizeof(Index))
+        if (safe_write(f, &Index, sizeof(Index)) != sizeof(Index))
            LOG_ERROR_STR(fileName);
         close(f);
         return true;
@@ -243,7 +243,7 @@ cRecording::cRecording(const char *FileName)
            int size = buf.st_size;
            summary = new char[size + 1]; // +1 for terminating 0
            if (summary) {
-              int rbytes = read(f, summary, size);
+              int rbytes = safe_read(f, summary, size);
               if (rbytes >= 0) {
                  summary[rbytes] = 0;
                  if (rbytes != size)
diff --git a/remote.c b/remote.c
index db8fa870d..eed91105b 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.23 2001/07/27 10:17:19 kls Exp $
+ * $Id: remote.c 1.24 2001/08/12 15:07:26 kls Exp $
  */
 
 #include "remote.h"
@@ -199,7 +199,7 @@ int cRcIoRCU::ReceiveByte(int TimeoutMs)
   // Returns the byte if one was received within a timeout, -1 otherwise
   if (cFile::FileReady(f, TimeoutMs)) {
      unsigned char b;
-     if (read(f, &b, 1) == 1)
+     if (safe_read(f, &b, 1) == 1)
         return b;
      else
         LOG_ERROR;
@@ -436,7 +436,7 @@ void cRcIoLIRC::Action(void)
 
       LOCK_THREAD;
 
-      if (cFile::FileReady(f, REPEATLIMIT) && read(f, buf, sizeof(buf)) > 21) {
+      if (cFile::FileReady(f, REPEATLIMIT) && safe_read(f, buf, sizeof(buf)) > 21) {
          if (!receivedData) { // only accept new data the previous data has been fetched
             int count;
             sscanf(buf, "%*x %x %29s", &count, LastKeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
diff --git a/svdrp.c b/svdrp.c
index a626fdade..d3bceec1d 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.20 2001/07/22 13:58:48 kls Exp $
+ * $Id: svdrp.c 1.21 2001/08/12 15:10:16 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -264,7 +264,7 @@ bool cSVDRP::Send(const char *s, int length)
 {
   if (length < 0)
      length = strlen(s);
-  int wbytes = write(file, s, length);
+  int wbytes = safe_write(file, s, length);
   if (wbytes == length)
      return true;
   if (wbytes < 0) {
@@ -920,7 +920,7 @@ void cSVDRP::Process(void)
         lastActivity = time(NULL);
      if (file.Ready(false)) {
         unsigned char c;
-        int r = read(file, &c, 1);
+        int r = safe_read(file, &c, 1);
         if (r > 0) {
            if (c == '\n' || c == 0x00) {
               // strip trailing whitespace:
diff --git a/tools.c b/tools.c
index c75efbb99..e6aba17a5 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.35 2001/08/05 12:38:06 kls Exp $
+ * $Id: tools.c 1.39 2001/08/12 15:12:54 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -15,6 +15,7 @@
 #if defined(DEBUG_OSD)
 #include <ncurses.h>
 #endif
+#include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
 
@@ -22,9 +23,33 @@
 
 int SysLogLevel = 3;
 
+ssize_t safe_read(int filedes, void *buffer, size_t size)
+{
+  for (;;) {
+      ssize_t p = read(filedes, buffer, size);
+      if (p < 0 && errno == EINTR) {
+         dsyslog(LOG_INFO, "EINTR while reading from file handle %d - retrying", filedes);
+         continue;
+         }
+      return p;
+      }
+}
+
+ssize_t safe_write(int filedes, const void *buffer, size_t size)
+{
+  for (;;) {
+      ssize_t p = write(filedes, buffer, size);
+      if (p < 0 && errno == EINTR) {
+         dsyslog(LOG_INFO, "EINTR while writing to file handle %d - retrying", filedes);
+         continue;
+         }
+      return p;
+      }
+}
+
 void writechar(int filedes, char c)
 {
-  write(filedes, &c, sizeof(c));
+  safe_write(filedes, &c, sizeof(c));
 }
 
 char *readline(FILE *f)
@@ -312,6 +337,38 @@ char *ReadLink(const char *FileName)
   return TargetName ? strdup(TargetName) : NULL;
 }
 
+bool SpinUpDisk(const char *FileName)
+{
+  static char *buf = NULL;
+  for (int n = 0; n < 10; n++) {
+      delete buf;
+      if (DirectoryOk(FileName))
+         asprintf(&buf, "%s/vdr-%06d", *FileName ? FileName : ".", n);
+      else
+         asprintf(&buf, "%s.vdr-%06d", FileName, n);
+      if (access(buf, F_OK) != 0) { // the file does not exist
+         timeval tp1, tp2;
+         gettimeofday(&tp1, NULL);
+         int f = open(buf, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+         // O_SYNC doesn't work on all file systems
+         if (f >= 0) {
+            close(f);
+            system("sync");
+            remove(buf);
+            gettimeofday(&tp2, NULL);
+            double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0;
+            if (seconds > 0.5)
+               dsyslog(LOG_INFO, "SpinUpDisk took %.2f seconds\n", seconds);
+            return true;
+            }
+         else
+            LOG_ERROR_STR(buf);
+         }
+      }
+  esyslog(LOG_ERR, "ERROR: SpinUpDisk failed");
+  return false;
+}
+
 // --- cFile -----------------------------------------------------------------
 
 bool cFile::files[FD_SETSIZE] = { false };
diff --git a/tools.h b/tools.h
index b4a0cb672..bf2e46b52 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.26 2001/05/20 08:29:45 kls Exp $
+ * $Id: tools.h 1.28 2001/08/12 15:13:02 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -33,6 +33,8 @@ extern int SysLogLevel;
 
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; };
 
+ssize_t safe_read(int filedes, void *buffer, size_t size);
+ssize_t safe_write(int filedes, const void *buffer, size_t size);
 void writechar(int filedes, char c);
 char *readline(FILE *f);
 char *strn0cpy(char *dest, const char *src, size_t n);
@@ -50,6 +52,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
+bool SpinUpDisk(const char *FileName);
 
 class cFile {
 private:
diff --git a/vdr.c b/vdr.c
index 15a69de06..af305419a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.61 2001/08/05 16:15:51 kls Exp $
+ * $Id: vdr.c 1.63 2001/08/11 15:33:30 kls Exp $
  */
 
 #include <getopt.h>
@@ -84,6 +84,7 @@ int main(int argc, char *argv[])
       { "config",   required_argument, NULL, 'c' },
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
+      { "epgfile",  required_argument, NULL, 'E' },
       { "help",     no_argument,       NULL, 'h' },
       { "log",      required_argument, NULL, 'l' },
       { "port",     required_argument, NULL, 'p' },
@@ -91,12 +92,12 @@ int main(int argc, char *argv[])
       { "dvd",      required_argument, NULL, 'V' },
       { "watchdog", required_argument, NULL, 'w' },
       { "terminal", required_argument, NULL, 't' },
-      { 0 }
+      { NULL }
     };
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:hl:p:v:V:w:t:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:t:v:V:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -113,27 +114,34 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
                     return 2;
                     break;
+          case 'E': cSIProcessor::SetEpgDataFileName(*optarg != '-' ? optarg : NULL);
+                    break;
           case 'h': printf("Usage: vdr [OPTION]\n\n"           // for easier orientation, this is column 80|
                            "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
                            "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
                            "                           from the video directory)\n"
-                           "  -h,       --help         display this help and exit\n"
                            "  -d,       --daemon       run in daemon mode\n"
                            "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
                            "                           there may be several -D options (default: all DVB\n"
                            "                           devices will be used)\n"
+                           "  -E FILE   --epgfile=FILE write the EPG data into the given FILE (default is\n"
+                           "                           %s); use '-E-' to disable this\n"
+                           "                           if FILE is a directory, the default EPG file will be\n"
+                           "                           created in that directory\n"
+                           "  -h,       --help         display this help and exit\n"
                            "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                            "                           0 = no logging, 1 = errors only,\n"
                            "                           2 = errors and info, 3 = errors, info and debug\n"
                            "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                            "                           0 turns off SVDRP\n"
+                           "  -t TTY,   --terminal=TTY controlling tty\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                            "  -V DEV,   --dvd=DEV      use DEV as the DVD device (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
-                           "  -t TTY,   --terminal=TTY controlling tty\n"
                            "\n"
                            "Report bugs to <vdr-bugs@cadsoft.de>\n",
+                           cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
                            DEFAULTSVDRPPORT,
                            VideoDirectory,
 #ifdef DVDSUPPORT
@@ -317,9 +325,8 @@ int main(int argc, char *argv[])
         if (!Menu) {
            cTimer *Timer = cTimer::GetMatch();
            if (Timer) {
-              if (!cRecordControls::Start(Timer)) {
-                 //TODO need to do something to prevent the timer from hitting over and over again...
-                 }
+              if (!cRecordControls::Start(Timer))
+                 Timer->SetPending(true);
               }
            cRecordControls::Process();
            }

From 371bf0665eda455c67926999f52b4850cd8529e4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 18 Aug 2001 18:00:00 +0200
Subject: [PATCH 022/307] Version 0.92 - The "channel not sync'ed" log message
 now also lists the card number. - Now using the EIT services from 'libdtv'
 (thanks to Rolf Hakenes), which   provides EPG information for NVOD ("Near
 Video On Demand") channels. - Doing some bug fixing on the EPG data (some tv
 stations apparently have   their own idea on how to fill in the data...). The
 level up to which EPG   bugs are fixed can be controlled with the
 EPGBugfixLevel parameter in the   "Setup" menu (see MANUAL for details, and
 cEventInfo::FixEpgBugs() in eit.c   for the actual implementation). - Fixed
 broken recordings after a driver buffer overflow. - Fixed the chirping sound
 after Pause/Play of a DVD (thanks to Andreas   Schultz).

---
 CONTRIBUTORS                     |    3 +
 HISTORY                          |   14 +
 MANUAL                           |   18 +
 Makefile                         |   19 +-
 config.c                         |    5 +-
 config.h                         |    5 +-
 dvbapi.c                         |   24 +-
 eit.c                            |  669 +++++------------
 eit.h                            |   15 +-
 i18n.c                           |   11 +-
 libdtv/COPYING                   |  339 +++++++++
 libdtv/Makefile                  |   73 ++
 libdtv/README                    |   27 +
 libdtv/liblx/COPYING             |  339 +++++++++
 libdtv/liblx/Makefile            |   62 ++
 libdtv/liblx/liblx.h             |  448 +++++++++++
 libdtv/liblx/xListFuncs.c        |  187 +++++
 libdtv/liblx/xMemMgt.c           |  621 +++++++++++++++
 libdtv/libsi/COPYING             |  339 +++++++++
 libdtv/libsi/Makefile            |   83 ++
 libdtv/libsi/README              |    2 +
 libdtv/libsi/include/libsi.h     |  816 ++++++++++++++++++++
 libdtv/libsi/include/si_tables.h | 1205 ++++++++++++++++++++++++++++++
 libdtv/libsi/si_debug_services.c |  487 ++++++++++++
 libdtv/libsi/si_debug_services.h |  217 ++++++
 libdtv/libsi/si_parser.c         |  881 ++++++++++++++++++++++
 libdtv/libvdr/COPYING            |  339 +++++++++
 libdtv/libvdr/Makefile           |   62 ++
 libdtv/libvdr/libvdr.c           |  169 +++++
 libdtv/libvdr/libvdr.h           |  111 +++
 menu.c                           |   38 +-
 menu.h                           |    4 +-
 remux.c                          |   21 +-
 tools.c                          |   28 +-
 tools.h                          |    4 +-
 35 files changed, 7179 insertions(+), 506 deletions(-)
 create mode 100644 libdtv/COPYING
 create mode 100644 libdtv/Makefile
 create mode 100644 libdtv/README
 create mode 100644 libdtv/liblx/COPYING
 create mode 100644 libdtv/liblx/Makefile
 create mode 100644 libdtv/liblx/liblx.h
 create mode 100644 libdtv/liblx/xListFuncs.c
 create mode 100644 libdtv/liblx/xMemMgt.c
 create mode 100644 libdtv/libsi/COPYING
 create mode 100644 libdtv/libsi/Makefile
 create mode 100644 libdtv/libsi/README
 create mode 100644 libdtv/libsi/include/libsi.h
 create mode 100644 libdtv/libsi/include/si_tables.h
 create mode 100644 libdtv/libsi/si_debug_services.c
 create mode 100644 libdtv/libsi/si_debug_services.h
 create mode 100644 libdtv/libsi/si_parser.c
 create mode 100644 libdtv/libvdr/COPYING
 create mode 100644 libdtv/libvdr/Makefile
 create mode 100644 libdtv/libvdr/libvdr.c
 create mode 100644 libdtv/libvdr/libvdr.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 241c86140..c055c1759 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -129,3 +129,6 @@ Artur Skawina <skawina@geocities.com>
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
+
+Rolf Hakenes <hakenes@hippomi.de>
+ for providing 'libdtv' and adapting the EIT mechanisms to it
diff --git a/HISTORY b/HISTORY
index 715b66823..b76067bd0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -649,3 +649,17 @@ Video Disk Recorder Revision History
 - If there is no free DVB device to record, the log message will now be given
   only once.
 - Made I/O more robust by handling EINTR (thanks to Werner Fink).
+
+2001-08-18: Version 0.92
+
+- The "channel not sync'ed" log message now also lists the card number.
+- Now using the EIT services from 'libdtv' (thanks to Rolf Hakenes), which
+  provides EPG information for NVOD ("Near Video On Demand") channels.
+- Doing some bug fixing on the EPG data (some tv stations apparently have
+  their own idea on how to fill in the data...). The level up to which EPG
+  bugs are fixed can be controlled with the EPGBugfixLevel parameter in the
+  "Setup" menu (see MANUAL for details, and cEventInfo::FixEpgBugs() in eit.c
+  for the actual implementation).
+- Fixed broken recordings after a driver buffer overflow.
+- Fixed the chirping sound after Pause/Play of a DVD (thanks to Andreas
+  Schultz).
diff --git a/MANUAL b/MANUAL
index 17f024836..9d7748120 100644
--- a/MANUAL
+++ b/MANUAL
@@ -351,6 +351,24 @@ Video Disk Recorder User's Manual
                          A value of '0' completely turns off scanning on both single
                          and multiple card systems.
 
+  EPGBugfixLevel = 2     Some tv stations transmit weirdly formatted EPG data.
+                         VDR attempts to fix these bugs up to the given level:
+                         0 = no EPG fixing
+                         1 = basic fixing of text location (Title, Subtitle and
+                             Extended Description)
+                         2 = removal of excess whitespace and hyphens
+                         3 = fixing the date in timestamps between 00:00 and 06:00
+                             (use with care - hopefully one day Pro7 and Kabel1
+                             will learn how to read the clock/calender)
+                         Default is '2', which will do all textual fixes, but
+                         leaves out the timestamp fixes, since these might cause
+                         recordings to fail. Use '3' at your own risk.
+                         Note that after changing the setting of this parameter
+                         any EPG data that has already been received will remain
+                         in its existing format - only newly received data will
+                         be fixed accordingly. Restart VDR if you want to make sure
+                         all data is fixed.
+
   SVDRPTimeout = 300     The time (in seconds) of inactivity on an open SVDRP
                          connection after which the connection is automatically
                          closed. Default is 300, a value of 0 means no timeout.
diff --git a/Makefile b/Makefile
index 7fcc62a8c..067f34abc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,19 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.25 2001/08/10 16:46:45 kls Exp $
+# $Id: Makefile 1.26 2001/08/15 13:56:11 kls Exp $
 
 .DELETE_ON_ERROR:
 
 DVBDIR   = ../DVB
 DVDDIR   = ../DVD
 AC3DIR   = ./ac3dec
+DTVDIR   = ./libdtv
 
 INCLUDES = -I$(DVBDIR)/ost/include
 
+DTVLIB   = $(DTVDIR)/libdtv.a
+
 ifdef DVD
 INCLUDES += -I$(DVDDIR)/libdvdread
 LIBDIRS  += -L$(DVDDIR)/libdvdread/dvdread/.libs
@@ -57,10 +60,10 @@ font: genfontfile fontfix.c fontosd.c
 # Dependencies:
 
 config.o    : config.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-dvbapi.o    : dvbapi.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h recording.h remux.h ringbuffer.h thread.h tools.h videodir.h
+dvbapi.o    : dvbapi.c $(AC3DIR)/ac3.h config.h dvbapi.h dvbosd.h dvd.h eit.h font.h recording.h remux.h ringbuffer.h thread.h tools.h videodir.h
 dvbosd.o    : dvbosd.c dvbosd.h font.h tools.h
 dvd.o       : dvd.c dvd.h
-eit.o       : eit.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h thread.h tools.h videodir.h
+eit.o       : eit.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h $(DTVDIR)/libdtv.h thread.h tools.h videodir.h
 font.o      : font.c font.h fontfix.c fontosd.c tools.h
 i18n.o      : i18n.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h thread.h tools.h
 interface.o : interface.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
@@ -78,8 +81,8 @@ videodir.o  : videodir.c tools.h videodir.h
 
 # The main program:
 
-vdr: $(OBJS) $(AC3LIB)
-	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) -o vdr
+vdr: $(OBJS) $(AC3LIB) $(DTVLIB)
+	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr
 
 # The font files:
 
@@ -98,10 +101,16 @@ genfontfile: genfontfile.c
 $(AC3LIB):
 	make -C $(AC3DIR) all
 
+# The libdtv library:
+
+$(DTVLIB) $(DTVDIR)/libdtv.h:
+	make -C $(DTVDIR) all
+
 # Housekeeping:
 
 clean:
 	make -C $(AC3DIR) clean
+	make -C $(DTVDIR) clean
 	-rm -f $(OBJS) vdr genfontfile genfontfile.o core *~
 fontclean:
 	-rm -f fontfix.c fontosd.c
diff --git a/config.c b/config.c
index 27cd62edf..aed32549d 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.54 2001/08/11 15:34:42 kls Exp $
+ * $Id: config.c 1.55 2001/08/17 13:02:01 kls Exp $
  */
 
 #include "config.h"
@@ -774,6 +774,7 @@ cSetup::cSetup(void)
   MarginStart = 2;
   MarginStop = 10;
   EPGScanTimeout = 5;
+  EPGBugfixLevel = 2;
   SVDRPTimeout = 300;
   PrimaryLimit = 0;
   DefaultPriority = 50;
@@ -804,6 +805,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
      else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
      else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
+     else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
      else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
      else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
      else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
@@ -869,6 +871,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MarginStart        = %d\n", MarginStart);
         fprintf(f, "MarginStop         = %d\n", MarginStop);
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
+        fprintf(f, "EPGBugfixLevel     = %d\n", EPGBugfixLevel);
         fprintf(f, "SVDRPTimeout       = %d\n", SVDRPTimeout);
         fprintf(f, "PrimaryLimit       = %d\n", PrimaryLimit);
         fprintf(f, "DefaultPriority    = %d\n", DefaultPriority);
diff --git a/config.h b/config.h
index c9faf6cb4..ce77598b0 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.59 2001/08/11 15:28:21 kls Exp $
+ * $Id: config.h 1.61 2001/08/17 13:00:48 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.91"
+#define VDRVERSION "0.92"
 
 #define MaxBuffer 10000
 
@@ -280,6 +280,7 @@ class cSetup {
   int SetSystemTime;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
+  int EPGBugfixLevel;
   int SVDRPTimeout;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
diff --git a/dvbapi.c b/dvbapi.c
index 4c3861054..6ff39b3df 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.106 2001/08/12 15:09:42 kls Exp $
+ * $Id: dvbapi.c 1.109 2001/08/19 15:09:48 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -545,9 +545,13 @@ void cRecordBuffer::Input(void)
          }
       else if (r < 0) {
          if (FATALERRNO) {
-            LOG_ERROR;
-            if (errno != EBUFFEROVERFLOW)
+            if (errno == EBUFFEROVERFLOW) { // this error code is not defined in the library
+               esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
+               }
+            else {
+               LOG_ERROR;
                break;
+               }
             }
          }
       if (time(NULL) - t > MAXBROKENTIMEOUT) {
@@ -752,7 +756,7 @@ void cPlayBuffer::Pause(void)
      Empty(true);
   fastForward = fastRewind = false;
   CHECK(ioctl(videoDev, paused ? VIDEO_FREEZE : VIDEO_CONTINUE));
-  CHECK(ioctl(audioDev, AUDIO_SET_MUTE, paused));
+  //CHECK(ioctl(audioDev, AUDIO_SET_MUTE, paused)); //XXX this caused chirping sound when playing a DVD
   still = false;
   if (empty)
      Empty(false);
@@ -767,7 +771,7 @@ void cPlayBuffer::Play(void)
      still = false;
      CHECK(ioctl(videoDev, paused ? VIDEO_CONTINUE : VIDEO_PLAY));
      CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, false));
+     //CHECK(ioctl(audioDev, AUDIO_SET_MUTE, false)); //XXX this caused chirping sound when playing a DVD
      if (empty)
         Empty(false);
      fastForward = fastRewind = paused = false;
@@ -2075,9 +2079,13 @@ void cTransferBuffer::Input(void)
            }
         else if (r < 0) {
            if (FATALERRNO) {
-              LOG_ERROR;
-              if (errno != EBUFFEROVERFLOW)
+              if (errno == EBUFFEROVERFLOW) { // this error code is not defined in the library
+                 esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
+                 }
+              else {
+                 LOG_ERROR;
                  break;
+                 }
               }
            }
         }
@@ -3160,7 +3168,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
         }
 
      if (!ChannelSynced) {
-        esyslog(LOG_ERR, "ERROR: channel %d not sync'ed!", ChannelNumber);
+        esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
         if (this == PrimaryDvbApi)
            cThread::RaisePanic();
         return false;
diff --git a/eit.c b/eit.c
index 14738f3b2..d2927ccc0 100644
--- a/eit.c
+++ b/eit.c
@@ -4,6 +4,9 @@
     begin                : Fri Aug 25 2000
     copyright            : (C) 2000 by Robert Schneider
     email                : Robert.Schneider@web.de
+
+    2001-08-15: Adapted to 'libdtv' by Rolf Hakenes <hakenes@hippomi.de>
+
  ***************************************************************************/
 
 /***************************************************************************
@@ -13,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.19 2001/08/12 15:04:37 kls Exp $
+ * $Id: eit.c 1.22 2001/08/19 14:44:32 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -33,6 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "config.h"
+#include "libdtv/libdtv.h"
 #include "videodir.h"
 
 // --- cMJD ------------------------------------------------------------------
@@ -144,32 +148,6 @@ time_t cMJD::GetTime_t()
 
 // --- cTDT ------------------------------------------------------------------
 
-typedef struct {
-   u_char   table_id                   : 8;
-
-#if BYTE_ORDER == BIG_ENDIAN
-   u_char   section_syntax_indicator   : 1;
-   u_char                              : 3;
-   u_char   section_length_hi          : 4;
-#else
-   u_char   section_length_hi          : 4;
-   u_char                              : 3;
-   u_char   section_syntax_indicator   : 1;
-#endif
-
-   u_char   section_length_lo          : 8;
-
-
-   u_char   utc_date_hi                : 8;
-   u_char   utc_date_lo                : 8;
-   u_char   utc_hour                   : 4;
-   u_char   utc_hour_ten               : 4;
-   u_char   utc_min                    : 4;
-   u_char   utc_min_ten                : 4;
-   u_char   utc_sec                    : 4;
-   u_char   utc_sec_ten                : 4;
-} tdt_t;
-
 class cTDT {
 public:
    cTDT(tdt_t *ptdt);
@@ -183,11 +161,11 @@ class cTDT {
   cMJD mjd; // kls 2001-03-02: made this a member instead of a pointer (it wasn't deleted in the destructor!)
 };
 
+#define BCD2DEC(b) (((b >> 4) & 0x0F) * 10 + (b & 0x0F))
+
 cTDT::cTDT(tdt_t *ptdt)
 :tdt(*ptdt)
-,mjd(tdt.utc_date_hi, tdt.utc_date_lo, tdt.utc_hour_ten * 10 + tdt.utc_hour,
-                                       tdt.utc_min_ten  * 10 + tdt.utc_min,
-                                       tdt.utc_sec_ten  * 10 + tdt.utc_sec)
+,mjd(tdt.utc_mjd_hi, tdt.utc_mjd_lo, BCD2DEC(tdt.utc_time_h), BCD2DEC(tdt.utc_time_m), BCD2DEC(tdt.utc_time_s))
 {
 }
 
@@ -212,7 +190,6 @@ cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
    tTime = 0;
    uEventID = eventid;
    uServiceID = serviceid;
-   cExtendedDescriptorNumber = 0;
    nChannelNumber = 0;
 }
 
@@ -302,7 +279,7 @@ unsigned short cEventInfo::GetEventID() const
    return uEventID;
 }
 /**  */
-bool cEventInfo::SetTitle(char *string)
+bool cEventInfo::SetTitle(const char *string)
 {
    if (string == NULL)
       return false;
@@ -314,7 +291,7 @@ bool cEventInfo::SetTitle(char *string)
    return true;
 }
 /**  */
-bool cEventInfo::SetSubtitle(char *string)
+bool cEventInfo::SetSubtitle(const char *string)
 {
    if (string == NULL)
       return false;
@@ -326,7 +303,7 @@ bool cEventInfo::SetSubtitle(char *string)
    return true;
 }
 /**  */
-bool cEventInfo::AddExtendedDescription(char *string)
+bool cEventInfo::AddExtendedDescription(const char *string)
 {
    int size = 0;
    bool first = true;
@@ -376,16 +353,6 @@ void cEventInfo::SetServiceID(unsigned short servid)
 {
    uServiceID = servid;
 }
-/**  */
-u_char cEventInfo::GetExtendedDescriptorNumber() const
-{
-   return cExtendedDescriptorNumber;
-}
-/**  */
-void cEventInfo::IncreaseExtendedDescriptorNumber()
-{
-   cExtendedDescriptorNumber++;
-}
 
 /**  */
 unsigned short cEventInfo::GetServiceID() const
@@ -408,6 +375,116 @@ void cEventInfo::Dump(FILE *f, const char *Prefix) const
       }
 }
 
+void cEventInfo::FixEpgBugs(void)
+{
+  if (Setup.EPGBugfixLevel == 0)
+     return;
+
+  // Some TV stations apparently have their own idea about how to fill in the
+  // EPG data. Let's fix their bugs as good as we can:
+  if (pTitle) {
+
+     // Pro7 preceeds the Subtitle with the Title:
+     //
+     // Title
+     // Title / Subtitle
+     //
+     if (pSubtitle && strstr(pSubtitle, pTitle) == pSubtitle) {
+        char *p = pSubtitle + strlen(pTitle);
+        const char *delim = " / ";
+        if (strstr(p, delim) == p) {
+           p += strlen(delim);
+           memmove(pSubtitle, p, strlen(p) + 1);
+           }
+        }
+
+     // VOX and VIVA put the Subtitle in quotes and use either the Subtitle
+     // or the Extended Description field, depending on how long the string is:
+     //
+     // Title
+     // "Subtitle". Extended Description
+     //
+     if ((pSubtitle == NULL) != (pExtendedDescription == NULL)) {
+        char *p = pSubtitle ? pSubtitle : pExtendedDescription;
+        if (*p == '"') {
+           const char *delim = "\".";
+           char *e = strstr(p + 1, delim);
+           if (e) {
+              *e = 0;
+              char *s = strdup(p + 1);
+              char *d = strdup(e + strlen(delim));
+              delete pSubtitle;
+              delete pExtendedDescription;
+              pSubtitle = s;
+              pExtendedDescription = d;
+              }
+           }
+        }
+
+     // VOX and VIVA put the Extended Description into the Subtitle (preceeded
+     // by a blank) if there is no actual Subtitle and the Extended Description
+     // is short enough:
+     //
+     // Title
+     //  Extended Description
+     //
+     if (pSubtitle && !pExtendedDescription) {
+        if (*pSubtitle == ' ') {
+           memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle));
+           pExtendedDescription = pSubtitle;
+           pSubtitle = NULL;
+           }
+        }
+     }
+
+     // Pro7 sometimes repeats the Title in the Subtitle:
+     //
+     // Title
+     // Title
+     //
+     if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
+        delete pSubtitle;
+        pSubtitle = NULL;
+        }
+
+     if (Setup.EPGBugfixLevel <= 1)
+        return;
+
+     // Some channels apparently try to do some formatting in the texts,
+     // which is a bad idea because they have no way of knowing the width
+     // of the window that will actually display the text.
+     // Remove excess whitespace:
+     pTitle = compactspace(pTitle);
+     pSubtitle = compactspace(pSubtitle);
+     pExtendedDescription = compactspace(pExtendedDescription);
+     // Remove superfluous hyphens:
+     if (pExtendedDescription) {
+        char *p = pExtendedDescription + 1;
+        while (*p) {
+              if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
+                 if (!startswith(p + 2, "und ")) // special case in German, as in "Lach- und Sachgeschichten"
+                    memmove(p, p + 2, strlen(p + 2) + 1);
+                 }
+              p++;
+              }
+        }
+
+     if (Setup.EPGBugfixLevel <= 2)
+        return;
+
+     // Pro7 and Kabel1 apparently are unable to use a calendar/clock,
+     // because all events between 00:00 and 06:00 have the date of the
+     // day before (sometimes even this correction doesn't help).
+     // Channels are recognized by their ServiceID, which may only work
+     // correctly on the ASTRA satellite system.
+     if (uServiceID == 898    // Pro-7
+      || uServiceID == 899) { // Kabel 1
+        tm *t = localtime(&tTime);
+        if (t->tm_hour * 3600 + t->tm_min * 60 + t->tm_sec <= 6 * 3600)
+           tTime += 24 * 3600;
+        }
+}
+
 // --- cSchedule -------------------------------------------------------------
 
 cSchedule::cSchedule(unsigned short servid)
@@ -425,7 +502,7 @@ const cEventInfo * cSchedule::GetPresentEvent() const
 {
    // checking temporal sanity of present event (kls 2000-11-01)
    time_t now = time(NULL);
-   if (pPresent && !(pPresent->GetTime() <= now && now <= pPresent->GetTime() + pPresent->GetDuration()))
+//XXX   if (pPresent && !(pPresent->GetTime() <= now && now <= pPresent->GetTime() + pPresent->GetDuration()))
    {
       cEventInfo *pe = Events.First();
       while (pe != NULL)
@@ -435,6 +512,7 @@ const cEventInfo * cSchedule::GetPresentEvent() const
          pe = Events.Next(pe);
       }
    }
+   return NULL;//XXX
    return pPresent;
 }
 /**  */
@@ -443,7 +521,7 @@ const cEventInfo * cSchedule::GetFollowingEvent() const
    // checking temporal sanity of following event (kls 2000-11-01)
    time_t now = time(NULL);
    const cEventInfo *pr = GetPresentEvent(); // must have it verified!
-   if (pFollowing && !(pr && pr->GetTime() + pr->GetDuration() <= pFollowing->GetTime()))
+if (pr)//XXX   if (pFollowing && !(pr && pr->GetTime() + pr->GetDuration() <= pFollowing->GetTime()))
    {
       int minDt = INT_MAX;
       cEventInfo *pe = Events.First(), *pf = NULL;
@@ -459,6 +537,7 @@ const cEventInfo * cSchedule::GetFollowingEvent() const
       }
       return pf;
    }
+   return NULL;//XXX
    return pFollowing;
 }
 /**  */
@@ -491,7 +570,7 @@ const cEventInfo * cSchedule::GetEvent(time_t tTime) const
    cEventInfo *pe = Events.First();
    while (pe != NULL)
    {
-      if (pe->GetTime() == tTime)
+      if (pe->GetTime() <= tTime && tTime <= pe->GetTime() + pe->GetDuration())
          return pe;
 
       pe = Events.Next(pe);
@@ -536,7 +615,7 @@ void cSchedule::Cleanup(time_t tTime)
       pEvent = Events.Get(a);
       if (pEvent == NULL)
          break;
-      if (pEvent->GetTime() + pEvent->GetDuration() < tTime)
+      if (pEvent->GetTime() + pEvent->GetDuration() + 3600 < tTime) // adding one hour for safety
       {
          Events.Del(pEvent);
          a--;
@@ -627,170 +706,28 @@ void cSchedules::Dump(FILE *f, const char *Prefix) const
 
 // --- cEIT ------------------------------------------------------------------
 
-#define DEC(N) dec << setw(N) << setfill(int('0'))
-#define HEX(N) hex << setw(N) << setfill(int('0'))
-
-#define EIT_STUFFING_DESCRIPTOR                 0x42
-#define EIT_LINKAGE_DESCRIPTOR                  0x4a
-#define EIT_SHORT_EVENT_DESCRIPTOR              0x4d
-#define EIT_EXTENDED_EVENT_DESCRIPTOR           0x4e
-#define EIT_TIME_SHIFTED_EVENT_DESCRIPTOR       0x4f
-#define EIT_COMPONENT_DESCRIPTOR                0x50
-#define EIT_CA_IDENTIFIER_DESCRIPTOR            0x53
-#define EIT_CONTENT_DESCRIPTOR                  0x54
-#define EIT_PARENTAL_RATING_DESCRIPTOR          0x55
-#define EIT_TELEPHONE_DESCRIPTOR                0x57
-#define EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR   0x5e
-#define EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR   0x5f
-#define EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR   0x61
-#define EIT_DATA_BROADCAST_DESCRIPTOR           0x64
-#define EIT_PDC_DESCRIPTOR                      0x69
-
-typedef struct eit_struct {
-   u_char   table_id                   : 8;
-
-#if BYTE_ORDER == BIG_ENDIAN
-   u_char   section_syntax_indicator   : 1;
-   u_char                              : 3;
-   u_char   section_length_hi          : 4;
-#else
-   u_char   section_length_hi          : 4;
-   u_char                              : 3;
-   u_char   section_syntax_indicator   : 1;
-#endif
-
-   u_char   section_length_lo          : 8;
-
-   u_char   service_id_hi              : 8;
-   u_char   service_id_lo              : 8;
-
-#if BYTE_ORDER == BIG_ENDIAN
-   u_char                              : 2;
-   u_char   version_number             : 5;
-   u_char   current_next_indicator     : 1;
-#else
-   u_char   current_next_indicator     : 1;
-   u_char   version_number             : 5;
-   u_char                              : 2;
-#endif
-
-   u_char   section_number             : 8;
-   u_char   last_section_number        : 8;
-   u_char   transport_stream_id_hi     : 8;
-   u_char   transport_stream_id_lo     : 8;
-   u_char   original_network_id_hi     : 8;
-   u_char   original_network_id_lo     : 8;
-   u_char   segment_last_section_number   : 8;
-   u_char   segment_last_table_id      : 8;
-} eit_t;
-
-typedef struct eit_loop_struct {
-   u_char   event_id_hi                : 8;
-   u_char   event_id_lo                : 8;
-
-   u_char   date_hi                    : 8;
-   u_char   date_lo                    : 8;
-   u_char   time_hour                  : 4;
-   u_char   time_hour_ten              : 4;
-   u_char   time_minute                : 4;
-   u_char   time_minute_ten            : 4;
-   u_char   time_second                : 4;
-   u_char   time_second_ten            : 4;
-
-   u_char   dur_hour                   : 4;
-   u_char   dur_hour_ten               : 4;
-   u_char   dur_minute                 : 4;
-   u_char   dur_minute_ten             : 4;
-   u_char   dur_second                 : 4;
-   u_char   dur_second_ten             : 4;
-
-#if BYTE_ORDER == BIG_ENDIAN
-   u_char   running_status             : 3;
-   u_char   free_ca_mode               : 1;
-   u_char   descriptors_loop_length_hi : 4;
-#else
-   u_char   descriptors_loop_length_hi : 4;
-   u_char   free_ca_mode               : 1;
-   u_char   running_status             : 3;
-#endif
-
-   u_char   descriptors_loop_length_lo : 8;
-} eit_loop_t;
-
-typedef struct eit_short_event_struct {
-   u_char   descriptor_tag             : 8;
-   u_char   descriptor_length          : 8;
-
-   u_char   language_code_1            : 8;
-   u_char   language_code_2            : 8;
-   u_char   language_code_3            : 8;
-
-   u_char   event_name_length          : 8;
-} eit_short_event_t;
-
-typedef struct eit_extended_event_struct {
-   u_char   descriptor_tag             : 8;
-   u_char   descriptor_length          : 8;
-
-   u_char   last_descriptor_number     : 4;
-   u_char   descriptor_number          : 4;
-
-   u_char   language_code_1            : 8;
-   u_char   language_code_2            : 8;
-   u_char   language_code_3            : 8;
-
-   u_char   length_of_items            : 8;
-} eit_extended_event_t;
-
-typedef struct eit_content_descriptor {
-   u_char   descriptor_tag             : 8;
-   u_char   descriptor_length          : 8;
-} eit_content_descriptor_t;
-
-typedef struct eit_content_loop {
-   u_char   content_nibble_level_2     : 4;
-   u_char   content_nibble_level_1     : 4;
-   u_char   user_nibble_2              : 4;
-   u_char   user_nibble_1              : 4;
-} eit_content_loop_t;
-
 class cEIT {
 private:
    cSchedules *schedules;
 public:
-   cEIT(void *buf, int length, cSchedules *Schedules);
+   cEIT(unsigned char *buf, int length, cSchedules *Schedules);
    ~cEIT();
   /**  */
-  int ProcessEIT();
+  int ProcessEIT(unsigned char *buffer);
 
 protected: // Protected methods
-  /**  */
-  int strdvbcpy(unsigned char *dst, unsigned char *src, int max);
   /** returns true if this EIT covers a
 present/following information, false if it's
 schedule information */
   bool IsPresentFollowing();
-  /**  */
-  bool WriteShortEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf);
-  /**  */
-  bool WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf);
 protected: // Protected attributes
-  int buflen;
-protected: // Protected attributes
-  /**  */
-  u_char buffer[4097];
   /** Table ID of this EIT struct */
   u_char tid;
-  /** EITs service id (program number) */
-  u_short pid;
 };
 
-cEIT::cEIT(void * buf, int length, cSchedules *Schedules)
+cEIT::cEIT(unsigned char * buf, int length, cSchedules *Schedules)
 {
-   buflen = length < int(sizeof(buffer)) ? length : sizeof(buffer);
-   memset(buffer, 0, sizeof(buffer));
-   memcpy(buffer, buf, buflen);
-   tid = buffer[0];
+   tid = buf[0];
    schedules = Schedules;
 }
 
@@ -799,162 +736,72 @@ cEIT::~cEIT()
 }
 
 /**  */
-int cEIT::ProcessEIT()
-{
-   int bufact = 0;
-   eit_t *eit;
-   eit_loop_t *eitloop;
-   u_char tmp[256];
-
-   if (bufact + (int)sizeof(eit_t) > buflen)
-      return 0;
-   eit = (eit_t *)buffer;
-   bufact += sizeof(eit_t);
-
-   unsigned int service = (eit->service_id_hi << 8) | eit->service_id_lo;
-
-   while(bufact + (int)sizeof(eit_loop_t) <= buflen)
-   {
-      eitloop = (eit_loop_t *)&buffer[bufact];
-      bufact += sizeof(eit_loop_t);
-
-      int descdatalen = (eitloop->descriptors_loop_length_hi << 8) + eitloop->descriptors_loop_length_lo;
-      int descdataact = 0;
-
-      while (descdataact < descdatalen && bufact < buflen)
-      {
-         switch (buffer[bufact])
-         {
-            eit_content_descriptor_t *cont;
-            eit_content_loop_t *contloop;
-
-            case EIT_STUFFING_DESCRIPTOR  :
-               //dsyslog(LOG_INFO, "Found EIT_STUFFING_DESCRIPTOR");
-               break;
-
-            case EIT_LINKAGE_DESCRIPTOR   :
-               //dsyslog(LOG_INFO, "Found EIT_LINKAGE_DESCRIPTOR");
-               break;
-
-            case EIT_SHORT_EVENT_DESCRIPTOR:
-               WriteShortEventDescriptor(service, eitloop, &buffer[bufact]);
-               break;
-
-            case EIT_EXTENDED_EVENT_DESCRIPTOR:
-               WriteExtEventDescriptor(service, eitloop, &buffer[bufact]);
-               break;
-
-            case EIT_TIME_SHIFTED_EVENT_DESCRIPTOR :
-               //dsyslog(LOG_INFO, "Found EIT_TIME_SHIFTED_EVENT_DESCRIPTOR");
-               break;
-
-            case EIT_COMPONENT_DESCRIPTOR :
-               if (buffer[bufact + 1] > 6) // kls 2001-02-24: otherwise strncpy() causes a segfault in strdvbcpy()
-                  strdvbcpy(tmp, &buffer[bufact + 8], buffer[bufact + 1] - 6);
-               //dsyslog(LOG_INFO, "Found EIT_COMPONENT_DESCRIPTOR %c%c%c 0x%02x/0x%02x/0x%02x '%s'\n", buffer[bufact + 5], buffer[bufact + 6], buffer[bufact + 7], buffer[2], buffer[3], buffer[4], tmp);
-               break;
-
-            case EIT_CA_IDENTIFIER_DESCRIPTOR   :
-               //dsyslog(LOG_INFO, "Found EIT_CA_IDENTIFIER_DESCRIPTOR");
-               break;
-
-            case EIT_CONTENT_DESCRIPTOR   :
-               cont = (eit_content_descriptor_t *)buffer;
-               contloop = (eit_content_loop_t *)&buffer[sizeof(eit_content_descriptor_t)];
-               //dsyslog(LOG_INFO, "Found EIT_CONTENT_DESCRIPTOR 0x%02x/0x%02x\n", contloop->content_nibble_level_1, contloop->content_nibble_level_2);
-               break;
-
-            case EIT_PARENTAL_RATING_DESCRIPTOR :
-               //dsyslog(LOG_INFO, "Found EIT_PARENTAL_RATING_DESCRIPTOR");
-               break;
-
-            case EIT_TELEPHONE_DESCRIPTOR :
-               //dsyslog(LOG_INFO, "Found EIT_TELEPHONE_DESCRIPTOR");
-               break;
-
-            case EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR   :
-               //dsyslog(LOG_INFO, "Found EIT_MULTILINGUAL_COMPONENT_DESCRIPTOR");
-               break;
-
-            case EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR   :
-               //dsyslog(LOG_INFO, "Found EIT_PRIVATE_DATE_SPECIFIER_DESCRIPTOR");
-               break;
-
-            case EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR   :
-               //dsyslog(LOG_INFO, "Found EIT_SHORT_SMOOTHING_BUFFER_DESCRIPTOR");
-               break;
-
-            case EIT_DATA_BROADCAST_DESCRIPTOR  :
-               //dsyslog(LOG_INFO, "Found EIT_DATA_BROADCAST_DESCRIPTOR");
-               break;
-
-            case EIT_PDC_DESCRIPTOR :
-               //dsyslog(LOG_INFO, "Found EIT_PDC_DESCRIPTOR");
-               break;
-
-            default:
-               //dsyslog(LOG_INFO, "Found unhandled descriptor 0x%02x with length of %04d\n", (int)buffer[bufact], (int)buffer[bufact + 1]);
-               break;
-         }
-         descdataact += (buffer[bufact + 1] + 2);
-         bufact += (buffer[bufact + 1] + 2);
+int cEIT::ProcessEIT(unsigned char *buffer)
+{
+   cEventInfo *pEvent, *rEvent = NULL;
+   cSchedule *pSchedule, *rSchedule = NULL;
+   struct LIST *VdrProgramInfos;
+   struct VdrProgramInfo *VdrProgramInfo;
+
+   if (!buffer)
+      return -1;
+
+   VdrProgramInfos = createVdrProgramInfos(buffer);
+
+   if (VdrProgramInfos) {
+      for (VdrProgramInfo = (struct VdrProgramInfo *) VdrProgramInfos->Head; VdrProgramInfo; VdrProgramInfo = (struct VdrProgramInfo *) xSucc (VdrProgramInfo)) {
+          pSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ServiceID);
+          if (!pSchedule) {
+             schedules->Add(new cSchedule(VdrProgramInfo->ServiceID));
+             pSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ServiceID);
+             if (!pSchedule)
+                break;
+             }
+          if (VdrProgramInfo->ReferenceServiceID) {
+             rSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ReferenceServiceID);
+             if (!rSchedule)
+                break;
+             rEvent = (cEventInfo *)rSchedule->GetEvent((unsigned short)VdrProgramInfo->ReferenceEventID);
+             if (!rEvent)
+                break;
+             }
+          pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
+          if (!pEvent) {
+             pSchedule->Events.Add(new cEventInfo(VdrProgramInfo->ServiceID, VdrProgramInfo->EventID));
+             pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
+             if (!pEvent)
+                break;
+             if (rEvent) {
+                pEvent->SetTitle(rEvent->GetTitle());
+                pEvent->SetSubtitle(rEvent->GetSubtitle());
+                pEvent->SetTime(VdrProgramInfo->StartTime);
+                pEvent->SetDuration(VdrProgramInfo->Duration);
+                pEvent->AddExtendedDescription(rEvent->GetExtendedDescription());
+                pEvent->FixEpgBugs();
+                }
+             else {
+                pEvent->SetTitle(VdrProgramInfo->ShortName);
+                pEvent->SetSubtitle(VdrProgramInfo->ShortText);
+                pEvent->SetTime(VdrProgramInfo->StartTime);
+                pEvent->SetDuration(VdrProgramInfo->Duration);
+                pEvent->AddExtendedDescription(VdrProgramInfo->ExtendedName);
+                pEvent->AddExtendedDescription(VdrProgramInfo->ExtendedText);
+                pEvent->FixEpgBugs();
+                }
+             }
+          if (IsPresentFollowing()) {
+             if ((GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_PAUSING) || (GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_RUNNING))
+                pSchedule->SetPresentEvent(pEvent);
+             else if (GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_AWAITING)
+                pSchedule->SetFollowingEvent(pEvent);
+             }
+          }
       }
-   }
 
+   xMemFreeAll(NULL);
    return 0;
 }
 
-/**  */
-int cEIT::strdvbcpy(unsigned char *dst, unsigned char *src, int max)
-{
-   int a = 0;
-
-   // kls 2001-02-24: if we come in with negative values, the caller must
-   // have done something wrong and the strncpy() below will cause a segfault
-   if (max <= 0)
-   {
-      *dst = 0;
-      return 0;
-   }
-
-   if (*src == 0x05 || (*src >= 0x20 && *src <= 0xff))
-   {
-      for (a = 0; a < max; a++)
-      {
-         if (*src == 0)
-            break;
-
-         if ((*src >= ' ' && *src <= '~') || (*src >= 0xa0 && *src <= 0xff))
-            *dst++ = *src++;
-         else
-         {
-            // if ((*src > '~' && *src < 0xa0) || *src == 0xff)
-            // cerr << "found special character 0x" << HEX(2) << (int)*src << endl;
-            src++;
-         }
-      }
-      *dst = 0;
-   }
-   else
-   {
-      const char *ret;
-
-      switch (*src)
-      {
-         case 0x01: ret = "Coding according to character table 1"; break;
-         case 0x02: ret = "Coding according to character table 2"; break;
-         case 0x03: ret = "Coding according to character table 3"; break;
-         case 0x04: ret = "Coding according to character table 4"; break;
-         case 0x10: ret = "Coding according to ISO/IEC 8859"; break;
-         case 0x11: ret = "Coding according to ISO/IEC 10646"; break;
-         case 0x12: ret = "Coding according to KSC 5601"; break;
-         default: ret = "Unknown coding"; break;
-      }
-      strncpy((char *)dst, ret, max);
-   }
-   return a;
-}
-
 /** returns true if this EIT covers a
 present/following information, false if it's
 schedule information */
@@ -966,136 +813,6 @@ bool cEIT::IsPresentFollowing()
    return false;
 }
 
-/**  */
-bool cEIT::WriteShortEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf)
-{
-   u_char tmp[256];
-   eit_short_event_t *evt = (eit_short_event_t *)buf;
-   unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
-   cEventInfo *pEvent;
-
-   //isyslog(LOG_INFO, "Found Short Event Descriptor");
-
-   cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
-   if (pSchedule == NULL)
-   {
-      schedules->Add(new cSchedule(service));
-      pSchedule = (cSchedule *)schedules->GetSchedule(service);
-      if (pSchedule == NULL)
-         return false;
-   }
-
-   /* cSchedule::GetPresentEvent() and cSchedule::GetFollowingEvent() verify
-      the temporal sanity of these events, so calling them here appears to
-      be a bad idea... (kls 2000-11-01)
-   //
-   // if we are working on a present/following info, let's see whether
-   // we already have present/following info for this service and if yes
-   // check whether it's the same eventid, if yes, just return, nothing
-   // left to do.
-   //
-   if (IsPresentFollowing())
-   {
-      if (eitloop->running_status == 4 || eitloop->running_status == 3)
-         pEvent = (cEventInfo *)pSchedule->GetPresentEvent();
-      else
-         pEvent = (cEventInfo *)pSchedule->GetFollowingEvent();
-
-      if (pEvent != NULL)
-         if (pEvent->GetEventID() == eventid)
-            return true;
-   }
-   */
-
-   //
-   // let's see whether we have that eventid already
-   // in case not, we have to create a new cEventInfo for it
-   //
-   pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
-   if (pEvent == NULL)
-   {
-      pSchedule->Events.Add(new cEventInfo(service, eventid));
-      pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
-      if (pEvent == NULL)
-         return false;
-
-      strdvbcpy(tmp, &buf[sizeof(eit_short_event_t)], evt->event_name_length);
-      pEvent->SetTitle((char *)tmp);
-      strdvbcpy(tmp, &buf[sizeof(eit_short_event_t) + evt->event_name_length + 1],
-                (int)buf[sizeof(eit_short_event_t) + evt->event_name_length]);
-      pEvent->SetSubtitle((char *)tmp);
-      cMJD mjd(eitloop->date_hi, eitloop->date_lo,
-               eitloop->time_hour_ten * 10 + eitloop->time_hour,
-               eitloop->time_minute_ten * 10 + eitloop->time_minute,
-               eitloop->time_second_ten * 10 + eitloop->time_second);
-      pEvent->SetTime(mjd.GetTime_t());
-      pEvent->SetDuration((long)((long)((eitloop->dur_hour_ten * 10 + eitloop->dur_hour) * 60l * 60l) +
-                                 (long)((eitloop->dur_minute_ten * 10 + eitloop->dur_minute) * 60l) +
-                                 (long)(eitloop->dur_second_ten * 10 + eitloop->dur_second)));
-   }
-
-   if (IsPresentFollowing())
-   {
-      if (eitloop->running_status == 4 || eitloop->running_status == 3)
-         pSchedule->SetPresentEvent(pEvent);
-      else if (eitloop->running_status == 1 || eitloop->running_status == 2 || eitloop->running_status == 0)
-         pSchedule->SetFollowingEvent(pEvent);
-   }
-
-   return true;
-}
-
-/**  */
-bool cEIT::WriteExtEventDescriptor(unsigned short service, eit_loop_t *eitloop, u_char *buf)
-{
-   u_char tmp[256];
-   eit_extended_event_t *evt = (eit_extended_event_t *)buf;
-   int bufact, buflen;
-   unsigned short eventid = (unsigned short)((eitloop->event_id_hi << 8) | eitloop->event_id_lo);
-   cEventInfo *pEvent;
-
-   //isyslog(LOG_INFO, "Found Extended Event Descriptor");
-
-   cSchedule *pSchedule = (cSchedule *)schedules->GetSchedule(service);
-   if (pSchedule == NULL)
-   {
-      schedules->Add(new cSchedule(service));
-      pSchedule = (cSchedule *)schedules->GetSchedule(service);
-      if (pSchedule == NULL)
-         return false;
-   }
-
-   pEvent = (cEventInfo *)pSchedule->GetEvent(eventid);
-   if (pEvent == NULL)
-      return false;
-
-   if (evt->descriptor_number != pEvent->GetExtendedDescriptorNumber())
-      return false;
-
-   bufact = sizeof(eit_extended_event_t);
-   buflen = buf[1] + 2;
-
-   if (evt->length_of_items > 0)
-   {
-      while (bufact - sizeof(eit_extended_event_t) < evt->length_of_items)
-      {
-         strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
-         // could use value in tmp now to do something,
-         // haven't seen any items as of yet transmitted from satellite
-         bufact += (buf[bufact] + 1);
-      }
-   }
-
-   strdvbcpy(tmp, &buf[bufact + 1], (int)buf[bufact]);
-   if (pEvent->AddExtendedDescription((char *)tmp))
-   {
-      pEvent->IncreaseExtendedDescriptorNumber();
-      return true;
-   }
-
-   return false;
-}
-
 // --- cSIProcessor ----------------------------------------------------------
 
 #define MAX_FILTERS 20
@@ -1262,7 +979,7 @@ void cSIProcessor::Action()
 
                               schedulesMutex.Lock();
                               cEIT ceit(buf, seclen, schedules);
-                              ceit.ProcessEIT();
+                              ceit.ProcessEIT(buf);
                               schedulesMutex.Unlock();
                            }
                            else
diff --git a/eit.h b/eit.h
index d4ba69f69..8ca5f1e53 100644
--- a/eit.h
+++ b/eit.h
@@ -4,6 +4,9 @@
     begin                : Fri Aug 25 2000
     copyright            : (C) 2000 by Robert Schneider
     email                : Robert.Schneider@web.de
+
+    2001-08-15: Adapted to 'libdtv' by Rolf Hakenes <hakenes@hippomi.de>
+
  ***************************************************************************/
 
 /***************************************************************************
@@ -13,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.8 2001/08/11 09:06:17 kls Exp $
+ * $Id: eit.h 1.10 2001/08/15 15:47:31 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -35,19 +38,17 @@ class cEventInfo : public cListObject {
   unsigned short uEventID;          // Event ID of this event
   long lDuration;                   // duration of event in seconds
   time_t tTime;                     // Start time
-  u_char cExtendedDescriptorNumber; // current extended descriptor number that has to be inserted
   int nChannelNumber;               // the actual channel number from VDR's channel list (used in cMenuSchedule for sorting by channel number)
 protected:
   void SetFollowing(bool foll);
   void SetPresent(bool pres);
-  bool SetTitle(char *string);
+  bool SetTitle(const char *string);
   void SetServiceID(unsigned short servid);
   void SetEventID(unsigned short evid);
   void SetDuration(long l);
   void SetTime(time_t t);
-  bool AddExtendedDescription(char *string);
-  bool SetSubtitle(char *string);
-  void IncreaseExtendedDescriptorNumber(void);
+  bool AddExtendedDescription(const char *string);
+  bool SetSubtitle(const char *string);
   cEventInfo(unsigned short serviceid, unsigned short eventid);
 public:
   ~cEventInfo();
@@ -62,11 +63,11 @@ class cEventInfo : public cListObject {
   unsigned short GetEventID(void) const;
   long GetDuration(void) const;
   time_t GetTime(void) const;
-  u_char GetExtendedDescriptorNumber(void) const;
   unsigned short GetServiceID(void) const;
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
   void Dump(FILE *f, const char *Prefix = "") const;
+  void FixEpgBugs(void);
   };
 
 class cSchedule : public cListObject  {
diff --git a/i18n.c b/i18n.c
index 3d75c245d..987822862 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.31 2001/08/11 13:22:24 kls Exp $
+ * $Id: i18n.c 1.32 2001/08/17 13:03:15 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -776,6 +776,15 @@ const tPhrase Phrases[] = {
     "Temps maxi EPG",
     "Ledig tid f�r EPG-s�k",
   },
+  { "EPGBugfixLevel",
+    "EPG Fehlerbereinigung",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "SVDRPTimeout",
     "SVDRP Timeout",
     "", // TODO
diff --git a/libdtv/COPYING b/libdtv/COPYING
new file mode 100644
index 000000000..a43ea2126
--- /dev/null
+++ b/libdtv/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/libdtv/Makefile b/libdtv/Makefile
new file mode 100644
index 000000000..50a140044
--- /dev/null
+++ b/libdtv/Makefile
@@ -0,0 +1,73 @@
+##############################################################
+###                                                        ###
+### Makefile: global makefile for libdtv                   ###
+###                                                        ###
+##############################################################
+
+## $Revision: 1.1 $
+## $Date: 2001/06/25 12:53:00 $
+## $Author: kls $
+##
+##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+##
+## libdtv is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## libdtv is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You may have received a copy of the GNU General Public License
+## along with libdtv; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+#
+#
+#
+
+#
+#  adapt this to your GNU make executable
+#
+MAKE = make
+
+AR = ar
+ARFLAGS = ru
+RANLIB = ranlib
+
+SUBDIRS = liblx libsi libvdr
+
+all: newdist
+
+new: clean newdist
+
+clean:
+	@echo "making all clean..."
+	@for i in $(SUBDIRS);\
+	do \
+	    ( echo $$i; cd $$i ;\
+	    $(MAKE) clean ) ;\
+	done
+	@rm -rf lib include libdtv.*
+
+newdist:
+	@mkdir -p include lib
+	@echo "making all distributions..."
+	@for i in $(SUBDIRS) ;\
+	do \
+	    ( cd $$i ;\
+	    $(MAKE) new dist ) ;\
+	done
+	@echo "making libdtv.a/libdtv.h..."
+	@cat include/* > libdtv.h
+	@mkdir -p tmp
+	@for i in $(SUBDIRS) ;\
+	do \
+	    ( cd tmp;\
+              $(AR) x ../lib/$$i.a;\
+              $(AR) $(ARFLAGS) ../libdtv.a *;\
+              rm -f *) ;\
+	done
+	@rm -rf lib include tmp
diff --git a/libdtv/README b/libdtv/README
new file mode 100644
index 000000000..88ee04904
--- /dev/null
+++ b/libdtv/README
@@ -0,0 +1,27 @@
+DTV System Information Library
+==============================
+
+This is intended to support the VDR application of Klaus Schmidinger with
+extended EIT support, mainly on NVOD channels.
+Bug reports and suggestions are very appreciated and should be sent to
+hakenes@hippomi.de
+
+Have fun,
+
+  (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+  
+libdtv is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+  
+libdtv is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+  
+You may have received a copy of the GNU General Public License
+along with libdtv; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
diff --git a/libdtv/liblx/COPYING b/libdtv/liblx/COPYING
new file mode 100644
index 000000000..a43ea2126
--- /dev/null
+++ b/libdtv/liblx/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/libdtv/liblx/Makefile b/libdtv/liblx/Makefile
new file mode 100644
index 000000000..a8034dec2
--- /dev/null
+++ b/libdtv/liblx/Makefile
@@ -0,0 +1,62 @@
+##############################################################
+###                                                        ###
+### Makefile: local makefile for liblx                     ###
+###                                                        ###
+##############################################################
+
+## $Revision: 1.1 $
+## $Date: 2001/06/26 07:18:42 $
+## $Author: kls $
+##
+##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+##
+## dtv_scan is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## dtv_scan is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You may have received a copy of the GNU General Public License
+## along with dtv_scan; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+#
+#
+#
+CC = gcc
+CFLAGS = -O2 -g -pedantic -Wmissing-prototypes -Wstrict-prototypes \
+         -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
+
+
+AR = ar
+ARFLAGS = r
+RANLIB = ranlib
+RM = rm -f
+CP = cp
+
+LXINCLUDE = liblx.h
+LXLIB = liblx.a
+LXOBJS = xMemMgt.o xListFuncs.o
+
+all : $(LXLIB)
+
+clean :
+	@echo "cleaning workspace..."
+	@$(RM) $(LXOBJS) $(LXLIB)
+
+new : clean all
+
+$(LXLIB) : $(LXOBJS)
+	@echo "updating library..."
+	@$(AR) $(ARFLAGS) $(LXLIB) $(LXOBJS)
+	@$(RANLIB) $(LXLIB)
+
+dist: all
+	@echo "distributing liblx.a and liblx.h..."
+	@$(CP) $(LXLIB) ../lib
+	@$(CP) $(LXINCLUDE) ../include
+    
diff --git a/libdtv/liblx/liblx.h b/libdtv/liblx/liblx.h
new file mode 100644
index 000000000..f2527e7ab
--- /dev/null
+++ b/libdtv/liblx/liblx.h
@@ -0,0 +1,448 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// liblx.h: definitions necessary for the liblx package   ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/06/26 07:18:42 $
+// $Author: kls $
+//
+//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// liblx is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// liblx is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with liblx; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#ifndef LIBLX_H
+#define LIBLX_H
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+
+/*
+ *
+ *   list support structures
+ *
+ */
+struct NODE
+{
+   struct NODE                 *Succ;
+   struct NODE                 *Pred;
+   char                        *Name;
+   unsigned short               HashKey;
+};
+
+struct LIST
+{
+   struct NODE                 *Head;
+   struct NODE                 *Tail;
+   char                        *Name;
+   unsigned long                Size;
+};
+
+
+/*
+ *
+ *   memory managment structures
+ *
+ */
+struct MEM_ENTRY
+{
+   struct MEM_ENTRY        *Succ;
+   struct MEM_ENTRY        *Pred;
+   unsigned long            Size;
+};
+
+struct MEM_CHUNK
+{
+   struct MEM_CHUNK        *Succ;
+   struct MEM_CHUNK        *Pred;
+   unsigned long            Size;
+   struct MEM_ENTRY        *FirstFreeMemEntry;
+   struct MEM_ENTRY        *FirstUsedMemEntry;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ *
+ *   list functions (package xList)
+ *
+ */
+    unsigned short      xHashKey (char *);
+    struct LIST        *xNewList (char *);
+    struct NODE        *xNewNode (char *, unsigned long);
+    struct NODE        *xFindName (struct LIST *, char *);
+/*
+ *
+ *   memory management
+ *
+ */
+    void                xMemAllo (unsigned long, unsigned char **);
+    void                xMemFre (unsigned char *);
+    void                xMemFreeAll (struct MEM_CHUNK **);
+    void                xMemMerge (struct MEM_CHUNK **);
+    struct MEM_CHUNK  **xGetRemember (void);
+    void                xSetRemember (struct MEM_CHUNK **);
+    void                xPrintMemList (struct MEM_CHUNK **);
+    unsigned long       xGetMemSize (struct MEM_CHUNK **);
+extern unsigned long    xAllocatedMemory;
+    char               *xSetText (char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#define     MEM_CHUNK_SIZE    65536
+
+#define xMemAlloc(size, ptr) \
+   xMemAllo (((unsigned long)((size))), ((unsigned char **)((ptr))))
+#define xMemFree(ptr) xMemFre (((unsigned char *)((ptr))))
+/*
+ *
+ *   list support macros
+ *
+ */
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |   xCreateNode (NodeStruct,Name) allocates a correctly sized and     |
+ |   typed node struct.                                                |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xCreateNode(NodeStruct,Name) \
+   (NodeStruct) = (void *) xNewNode(Name, sizeof(*(NodeStruct)))
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |      xSize (List) scans for the ->Size field of a list struct       |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xSize(List) ((List) ? ((struct LIST *)(List))->Size : 0)
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |    xName (NodeStruct) scans for the ->Node.Name of a node struct    |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xName(NodeStruct) (((struct NODE *)(NodeStruct))->Name)
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |    xSucc (NodeStruct) scans for the ->Node.Succ of a node struct    |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xSucc(NodeStruct) (((struct NODE *)(NodeStruct))->Succ)
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |    xPred (NodeStruct) scans for the ->Node.Pred of a node struct    |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xPred(NodeStruct) (((struct NODE *)(NodeStruct))->Pred)
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |    xForeach(List,NodeStruct) builds a loop to process each list     |
+ |    element.                                                         |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xForeach(List,NodeStruct) \
+   if (List) for ((NodeStruct) = (void *) ((struct LIST *)(List))->Head; \
+           (NodeStruct); (NodeStruct) = (void *) xSucc (NodeStruct))
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |    xForeachReverse(List,NodeStruct) builds a loop to process each   |
+ |    element in reverse order.                                        |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xForeachReverse(List,NodeStruct) \
+   if (List) for ((NodeStruct) = (void *) ((struct LIST *)(List))->Tail; \
+           NodeStruct; (NodeStruct) = (void *) xPred (NodeStruct))
+
+
+/*---------------------------------------------------------------------*
+ |                                                                     |
+ |    xRemove(List,NodeStruct) unchains a node struct out of a list.   |
+ |                                                                     |
+ *---------------------------------------------------------------------*/
+#define xRemove(List,NodeStruct) \
+   do \
+   { \
+      struct NODE *TmpNode; \
+      struct LIST *TmpList; \
+      \
+      TmpNode = ((struct NODE *)(NodeStruct)); \
+      TmpList = ((struct LIST *)(List)); \
+	  \
+      if (TmpNode->Pred) \
+         (TmpNode->Pred)->Succ = TmpNode->Succ; \
+      else TmpList->Head = TmpNode->Succ; \
+      if (TmpNode->Succ) \
+         (TmpNode->Succ)->Pred = TmpNode->Pred; \
+      else TmpList->Tail = TmpNode->Pred; \
+      TmpList->Size --; \
+   } while (0)
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xAddHead                                            *
+ *                                                                       *
+ *     arguments :   List - pointer to a LIST structure                  *
+ *                                                                       *
+ *                   Node - pointer to a NODE structure                  *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *     xAddHead() inserts 'Node' at the head of 'List'.                  *
+ *                                                                       *
+ *************************************************************************/
+#define xAddHead(List, NodeStruct) \
+   do { \
+      struct NODE *TmpNode; \
+      struct LIST *TmpList; \
+      \
+      TmpNode = ((struct NODE *)(NodeStruct)); \
+      TmpList = ((struct LIST *)(List)); \
+	  \
+      if (TmpList->Head) { \
+         TmpNode->Pred = NULL; \
+         TmpNode->Succ = TmpList->Head; \
+         (TmpList->Head)->Pred = TmpNode; \
+         TmpList->Head = TmpNode; } \
+      else { \
+         TmpList->Head = TmpNode; \
+         TmpList->Tail = TmpNode; \
+         TmpNode->Pred = NULL; \
+         TmpNode->Succ = NULL; } \
+      TmpList->Size++; \
+   } while (0)
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xAddTail                                            *
+ *                                                                       *
+ *     arguments :   List - pointer to a LIST structure                  *
+ *                                                                       *
+ *                   Node - pointer to a NODE structure                  *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *     xAddTail() inserts 'Node' at the tail of 'List'.                  *
+ *                                                                       *
+ *************************************************************************/
+#define xAddTail(List, NodeStruct) \
+   do { \
+      struct NODE *TmpNode; \
+      struct LIST *TmpList; \
+      \
+      TmpNode = ((struct NODE *)(NodeStruct)); \
+      TmpList = ((struct LIST *)(List)); \
+	  \
+      if (TmpList->Head) { \
+         TmpNode->Succ = NULL; \
+         TmpNode->Pred = TmpList->Tail; \
+         (TmpList->Tail)->Succ = TmpNode; \
+         TmpList->Tail = TmpNode; } \
+      else { \
+         TmpList->Head = TmpNode; \
+         TmpList->Tail = TmpNode; \
+         TmpNode->Pred = NULL; \
+         TmpNode->Succ = NULL; } \
+      TmpList->Size++; \
+   } while (0)
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xRemHead                                            *
+ *                                                                       *
+ *     arguments :   List - pointer to a LIST structure                  *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *     xRemHead() removes a Node from head of 'List'.                    *
+ *                                                                       *
+ *************************************************************************/
+#define xRemHead(List) \
+   do { \
+      struct LIST *TmpList; \
+      \
+      TmpList = ((struct LIST *)(List)); \
+	  \
+      if (TmpList->Head) \
+      { \
+         TmpList->Head = (TmpList->Head)->Succ; \
+         if (TmpList->Head) (TmpList->Head)->Pred = NULL; \
+         else TmpList->Tail = NULL; \
+         TmpList->Size--; \
+      } \
+   } while (0)
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xRemTail                                            *
+ *                                                                       *
+ *     arguments :   List - pointer to a LIST structure                  *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *     xRemTail() removes a Node from the tail of 'List'.                *
+ *                                                                       *
+ *************************************************************************/
+#define xRemTail(List) \
+   do { \
+      struct LIST *TmpList; \
+      \
+      TmpList = ((struct LIST *)(List)); \
+	  \
+      if (TmpList->Tail) \
+      { \
+         TmpList->Tail = (TmpList->Tail)->Pred; \
+         if (TmpList->Tail) (TmpList->Tail)->Succ = NULL; \
+         else TmpList->Head = NULL; \
+         TmpList->Size--; \
+      } \
+   } while (0)
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xConCat                                             *
+ *                                                                       *
+ *     arguments :   DestinationList - pointer to the destination        *
+ *                                     LIST structure                    *
+ *                                                                       *
+ *                   SourceList - pointer to the source LIST structure   *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xConCat() concats 'SourceList' with 'DestinationList' and clears    *
+ *   'SourceList'.                                                       *
+ *                                                                       *
+ *************************************************************************/
+#define xConCat(DestinationList, SourceList) \
+   do { \
+      struct LIST *SrcList; \
+      struct LIST *DstList; \
+      \
+      SrcList = ((struct LIST *)(SourceList)); \
+      DstList = ((struct LIST *)(DestinationList)); \
+	  \
+      if (DstList && SrcList) \
+      { \
+         if (DstList->Head) { \
+            if (SrcList->Head) { \
+               (DstList->Tail)->Succ = SrcList->Head; \
+               (SrcList->Head)->Pred = DstList->Tail; \
+               DstList->Tail = SrcList->Tail; \
+               DstList->Size += SrcList->Size; \
+               SrcList->Size = 0; \
+               SrcList->Head = NULL; \
+               SrcList->Tail = NULL; } } \
+         else { \
+            DstList->Head = SrcList->Head; \
+            DstList->Tail = SrcList->Tail; \
+            DstList->Size += SrcList->Size; \
+            SrcList->Size = 0; \
+            SrcList->Head = NULL; \
+            SrcList->Tail = NULL; } \
+      } \
+      else if (SrcList) ((struct LIST *)(DestinationList)) = SrcList; \
+   } while (0)
+
+
+
+#define xJoinList(SourceList, DestinationList, NodeStruct) \
+   do { \
+      struct NODE *KeyNode; \
+      struct NODE *TmpNode; \
+      struct LIST *SrcList; \
+      struct LIST *DstList; \
+      \
+      KeyNode = ((struct NODE *)(NodeStruct)); \
+      SrcList = ((struct LIST *)(SourceList)); \
+      DstList = ((struct LIST *)(DestinationList)); \
+	  \
+      if (SrcList->Head) \
+      { \
+         TmpNode = KeyNode->Succ; \
+         KeyNode->Succ = SrcList->Head; \
+         SrcList->Tail->Succ = TmpNode; \
+         SrcList->Head->Pred = KeyNode; \
+         if (!TmpNode) DstList->Tail = SrcList->Tail; \
+         else TmpNode->Pred = SrcList->Tail; \
+         DstList->Size += SrcList->Size; \
+         SrcList->Size = 0; \
+         SrcList->Head = NULL; \
+         SrcList->Tail = NULL; \
+      } \
+   } while (0)
+
+#define xJoin(SourceNode, DestinationList, NodeStruct) \
+   do { \
+      struct NODE *KeyNode; \
+      struct NODE *TmpNode; \
+      struct NODE *SrcNode; \
+      struct LIST *DstList; \
+      \
+      KeyNode = ((struct NODE *)(NodeStruct)); \
+      SrcNode = ((struct NODE *)(SourceNode)); \
+      DstList = ((struct LIST *)(DestinationList)); \
+	  \
+      if (SrcNode) \
+      { \
+         TmpNode = KeyNode->Succ; \
+         KeyNode->Succ = SrcNode; \
+         SrcNode->Succ = TmpNode; \
+         SrcNode->Pred = KeyNode; \
+         if (!TmpNode) DstList->Tail = SrcNode; \
+         else TmpNode->Pred = SrcNode; \
+         DstList->Size += 1; \
+      } \
+   } while (0)
+
+#define xClearList(SrcList) \
+   do { \
+         (SrcList)->Size = 0; \
+         (SrcList)->Head = NULL; \
+         (SrcList)->Tail = NULL; \
+   } while (0)
+
+#define xSetName(nodestruct, name) \
+   do { \
+      struct NODE *TmpNode; \
+      \
+      TmpNode = (struct NODE *) (nodestruct); \
+      \
+      TmpNode->Name = xSetText (name); \
+      TmpNode->HashKey = xHashKey (name); \
+   } while (0)
+
+#endif
diff --git a/libdtv/liblx/xListFuncs.c b/libdtv/liblx/xListFuncs.c
new file mode 100644
index 000000000..34df7a895
--- /dev/null
+++ b/libdtv/liblx/xListFuncs.c
@@ -0,0 +1,187 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// xListFuncs.c: list handling functions of liblx         ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/06/25 12:29:47 $
+// $Author: kls $
+//
+//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// liblx is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// liblx is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with liblx; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#include "liblx.h"
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xHashKey                                            *
+ *                                                                       *
+ *     arguments :   Name - character pointer                            *
+ *                                                                       *
+ *     return    :   16 Bit CRC checksum as hashkey                      *
+ *                                                                       *
+ *************************************************************************/
+unsigned short xHashKey (Name)
+
+char *Name;
+{
+    unsigned short     Key = 0;
+    unsigned long      Value;
+    char              *Ptr;
+
+    if (!Name) return (0);
+
+    for (Ptr = Name; *Ptr; Ptr++) {
+        Value = ((Key >> 8) ^ (*Ptr)) & 0xFF;
+        Value = Value ^ (Value >> 4);
+        Key = 0xFFFF & ((Key << 8) ^ Value ^ (Value << 5) ^ (Value << 12));
+    }
+    return (Key);
+}
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xNewNode                                            *
+ *                                                                       *
+ *     arguments :   Name - character pointer to the node's name         *
+ *                                                                       *
+ *                   Size - size of the surrounding structure in bytes   *
+ *                                                                       *
+ *     return    :   pointer to a correct initialized NODE structure     *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xNewNode() allocates memory for a NODE structure and initializes    *
+ *   it properly. If argument Name points to a string, it copies that    *
+ *   into a new allocated memory area and assigns Node->Name to it.      *
+ *   Because NODE's are often part of bigger structures, the size of     *
+ *   the surrounding structure could be specified to allocate it.        *
+ *                                                                       *
+ *************************************************************************/
+
+struct NODE *xNewNode (Name, Size)
+
+char *Name;
+unsigned long Size;
+{
+   struct NODE      *Node;
+
+   if (Size < sizeof(struct NODE)) Size = sizeof(struct NODE);
+
+   xMemAlloc (Size, &Node);
+
+   Node->Succ = NULL;
+   Node->Pred = NULL;
+
+   if (Name == NULL)
+   {
+      Node->Name = NULL;
+      Node->HashKey = 0;
+   }
+   else
+   {
+      xMemAlloc (strlen (Name) + 1, &(Node->Name));
+      strcpy (Node->Name, Name);
+      Node->HashKey = xHashKey (Name);
+   }
+
+   return (Node);
+}
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xNewList                                            *
+ *                                                                       *
+ *     arguments :   Name - character pointer to the list's name         *
+ *                                                                       *
+ *     return    :   pointer to a correct initialized LIST structure     *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xNewList() allocates memory for a LIST structure and initializes    *
+ *   it properly. If argument Name points to a string, it copies that    *
+ *   into a new allocated memory area and assigns List->Name to it.      *
+ *                                                                       *
+ *************************************************************************/
+
+struct LIST *xNewList (Name)
+
+char *Name;
+{
+   struct LIST      *List;
+
+   xMemAlloc (sizeof(struct LIST), &List);
+
+   List->Head = NULL;
+   List->Tail = NULL;
+   List->Size = 0;
+
+   if (Name == NULL)
+   {
+      List->Name = NULL;
+   }
+   else
+   {
+      xMemAlloc (strlen (Name) + 1, &(List->Name));
+      strcpy (List->Name, Name);
+   }
+
+   return (List);
+}
+
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xFindName                                           *
+ *                                                                       *
+ *     arguments :   List - pointer to a LIST structure                  *
+ *                                                                       *
+ *                   Name - pointer to a name string                     *
+ *                                                                       *
+ *     return    :   pointer to a NODE structure                         *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xFindName() looks for element with name 'Name' in list 'List' and   *
+ *   returns its NODE structure.                                         *
+ *                                                                       *
+ *************************************************************************/
+
+struct NODE *xFindName (List, Name)
+
+struct LIST *List;
+char *Name;
+{
+   struct NODE     *Node;
+   unsigned short   HashKey;
+
+   if (!Name || !List) return (NULL);
+
+   HashKey = xHashKey (Name);
+
+   for (Node = List->Head; Node; Node = Node->Succ)
+      if (HashKey == Node->HashKey)
+         if (Node->Name)
+            if (strcmp (Node->Name, Name) == 0) return (Node);
+
+   return (NULL);
+}
diff --git a/libdtv/liblx/xMemMgt.c b/libdtv/liblx/xMemMgt.c
new file mode 100644
index 000000000..363ee4a59
--- /dev/null
+++ b/libdtv/liblx/xMemMgt.c
@@ -0,0 +1,621 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// xMemMgt.c: memory management functions of liblx        ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/06/25 12:29:47 $
+// $Author: kls $
+//
+//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// liblx is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// liblx is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with liblx; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#include <stdio.h>
+#include <malloc.h>
+
+#include "liblx.h"
+
+#ifdef DEBUG
+void logPrintf(int, char *, ...);
+#endif
+
+static struct MEM_CHUNK *xRememberKey = NULL;
+
+static struct MEM_CHUNK **xRememberPtr = &xRememberKey;
+
+unsigned long xAllocatedMemory = 0;
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xMemAlloc                                           *
+ *                                                                       *
+ *     parameter :   Size - size of the requested memory area            *
+ *                                                                       *
+ *                   DataPointer - pointer to data pointer               *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xMemAlloc() is a clustered, remembering memory management routine.  *
+ *   It uses its own tables for free and used memory blocks on private   *
+ *   memory area. With xMemFree(), you can free this memory likewise     *
+ *   the C free() routine, with xMemFreeAll() all memory at once.        *
+ *   By changing the current remember key with xSetRemember() you can    *
+ *   define a local memory area, which can be freed by only one call of  *
+ *   xMemFreeAll() (see xSetRemember() / xGetRemember()).                *
+ *                                                                       *
+ *************************************************************************/
+
+void xMemAllo (Size, DataPointer)
+
+unsigned long Size;
+unsigned char **DataPointer;
+{
+   struct MEM_CHUNK        *MemChunk, *MemChunkPred;
+   struct MEM_ENTRY        *MemEntry, *MemEntryPred;
+   long int                 NewSize;
+   unsigned short           FoundFlag;
+#ifdef DEBUG
+   unsigned char           *ptr;
+#endif
+
+   while (Size % 4) Size++;
+
+   if (Size > (MEM_CHUNK_SIZE - sizeof(struct MEM_CHUNK) - 
+                  sizeof(struct MEM_ENTRY)))
+   {
+      NewSize = Size + sizeof(struct MEM_CHUNK) + sizeof(struct MEM_ENTRY);
+
+      if (MemChunk = (*xRememberPtr))
+      {
+         do
+         {
+            MemChunkPred = MemChunk;
+         } while (MemChunk = MemChunk->Succ);
+      }
+      else MemChunkPred = (struct MEM_CHUNK *) &(*xRememberPtr);
+
+      MemChunk = MemChunkPred->Succ = (struct MEM_CHUNK *) malloc (NewSize);
+      xAllocatedMemory += NewSize;
+
+#ifdef DEBUG
+      for (ptr = (unsigned char *) MemChunk; ptr < (unsigned char *)
+            (MemChunk) + NewSize; ptr++)
+             *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
+#endif
+
+      if (!MemChunk)
+      {
+#ifdef DEBUG
+         logPrintf (0, "Not enough memory...\r\n");
+#endif
+         exit (1);
+      }
+
+      MemChunk->Size = NewSize;
+      MemChunk->Pred = MemChunkPred;
+      MemChunk->Succ = NULL;
+      MemChunk->FirstFreeMemEntry = NULL;
+      MemChunk->FirstUsedMemEntry =
+         MemEntry = (struct MEM_ENTRY *) ((unsigned char *)MemChunk +
+                       sizeof(struct MEM_CHUNK));
+
+      MemEntry->Size = Size;
+      MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstUsedMemEntry;
+      MemEntry->Succ = NULL;
+
+      *DataPointer = (unsigned char *) ((unsigned char *)MemEntry +
+                                           sizeof(struct MEM_ENTRY));
+#ifdef DEBUG_CALLS
+      logPrintf (0, "xMemAlloc: %x, %d bytes\r\n", *DataPointer, Size);
+#endif
+      return;
+   }
+
+   MemEntry = NULL;
+   FoundFlag = 0;
+
+   if (MemChunk = (*xRememberPtr))
+   {
+      do
+      {
+         if (MemEntry = MemChunk->FirstFreeMemEntry)
+         do
+         {
+            if (Size <= MemEntry->Size) FoundFlag = 1;
+         } while ((FoundFlag == 0) && (MemEntry = MemEntry->Succ));
+         MemChunkPred = MemChunk;
+      } while ((FoundFlag == 0) && (MemChunk = MemChunk->Succ));
+   }
+   else MemChunkPred = (struct MEM_CHUNK *) &(*xRememberPtr);
+
+   if (!MemEntry)
+   {
+      MemChunk = MemChunkPred->Succ =
+         (struct MEM_CHUNK *) malloc (MEM_CHUNK_SIZE);
+      xAllocatedMemory += MEM_CHUNK_SIZE;
+
+#ifdef DEBUG
+      for (ptr = (unsigned char *) MemChunk; ptr < (unsigned char *)
+            (MemChunk) + MEM_CHUNK_SIZE; ptr++)
+             *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
+#endif
+
+      if (!MemChunk)
+      {
+#ifdef DEBUG
+         logPrintf (0, "Not enough memory...\r\n");
+#endif
+         exit (1);
+      }
+
+      MemChunk->Size = MEM_CHUNK_SIZE;
+      MemChunk->Pred = MemChunkPred;
+      MemChunk->Succ = NULL;
+      MemChunk->FirstUsedMemEntry = NULL;
+      MemChunk->FirstFreeMemEntry =
+         MemEntry = (struct MEM_ENTRY *) 
+		               ((unsigned char *)MemChunk + sizeof(struct MEM_CHUNK));
+
+      MemEntry->Size = MEM_CHUNK_SIZE - sizeof(struct MEM_CHUNK) - 
+	                                       sizeof(struct MEM_ENTRY);
+      MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstFreeMemEntry;
+      MemEntry->Succ = NULL;
+   }
+
+   NewSize = MemEntry->Size - sizeof(struct MEM_ENTRY) - Size;
+
+   MemEntry->Size = Size;
+   *DataPointer = (unsigned char *) 
+                     ((unsigned char *)MemEntry + sizeof(struct MEM_ENTRY));
+
+#ifdef DEBUG
+   for (ptr = *DataPointer; ptr < (unsigned char *)
+            (*DataPointer) + Size; ptr++)
+   {
+     if (((unsigned long )ptr)&1)
+     {  if (*ptr != 0x55)
+           logPrintf (0, "freed memory was used\r\n"); }
+     else { if (*ptr != 0xAA)
+           logPrintf (0, "freed memory was used\r\n"); }
+   }
+#endif
+
+   if (MemEntry->Succ) 
+      ((struct MEM_ENTRY *)MemEntry->Succ)->Pred = MemEntry->Pred;
+   ((struct MEM_ENTRY *)MemEntry->Pred)->Succ = MemEntry->Succ;
+
+   if (MemChunk->FirstUsedMemEntry)
+      MemChunk->FirstUsedMemEntry->Pred = MemEntry;
+   MemEntry->Succ = MemChunk->FirstUsedMemEntry;
+   MemChunk->FirstUsedMemEntry = MemEntry;
+   MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstUsedMemEntry;
+
+   if (NewSize > 0)
+   {
+      MemEntry = (struct MEM_ENTRY *) 
+	          ((unsigned char *)MemEntry + sizeof(struct MEM_ENTRY) + Size);
+      MemEntry->Size = NewSize;
+
+      if (MemChunk->FirstFreeMemEntry)
+         MemChunk->FirstFreeMemEntry->Pred = MemEntry;
+      MemEntry->Succ = MemChunk->FirstFreeMemEntry;
+      MemChunk->FirstFreeMemEntry = MemEntry;
+      MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstFreeMemEntry;
+   }
+#ifdef DEBUG_CALLS
+   logPrintf (0, "xMemAlloc: %x, %d bytes\r\n", *DataPointer, Size);
+#endif
+   return;
+}
+
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xMemFree                                            *
+ *                                                                       *
+ *     parameter :   DataPointer - data pointer                          *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xMemFree() frees with xMemAlloc() allocated memory.                 *
+ *                                                                       *
+ *************************************************************************/
+
+void xMemFre (DataPointer)
+
+unsigned char *DataPointer;
+{
+   struct MEM_CHUNK            *MemChunk, *MemChunkPred;
+   struct MEM_ENTRY            *MemEntry, *TempEntry, *PredEntry, *SuccEntry;
+   unsigned short               FoundFlag;
+#ifdef DEBUG
+   unsigned char           *ptr;
+#endif
+
+   if (!DataPointer)
+   {
+      return;
+   }
+   else
+   {
+      MemEntry = NULL;
+      FoundFlag = 0;
+
+      if (MemChunk = (*xRememberPtr))
+      do
+      {
+         if (MemEntry = MemChunk->FirstUsedMemEntry)
+         do
+         {
+            if (DataPointer == (unsigned char *) ((unsigned char *) MemEntry +
+                   sizeof(struct MEM_ENTRY))) FoundFlag = 1;
+         } while ((FoundFlag == 0) && (MemEntry = MemEntry->Succ));
+      } while ((FoundFlag == 0) && (MemChunk = MemChunk->Succ));
+
+      if (FoundFlag == 1)
+      {
+#ifdef DEBUG_CALLS
+   logPrintf (0, "xMemFree: %x, %d bytes\r\n", DataPointer, MemEntry->Size);
+#endif
+         if (MemEntry->Succ)
+            ((struct MEM_ENTRY *)MemEntry->Succ)->Pred = MemEntry->Pred;
+         ((struct MEM_ENTRY *)MemEntry->Pred)->Succ = MemEntry->Succ;
+
+         if (!MemChunk->FirstUsedMemEntry)
+         {
+            if (MemChunk->Succ)
+               ((struct MEM_CHUNK *)MemChunk->Succ)->Pred = MemChunk->Pred;
+            ((struct MEM_CHUNK *)MemChunk->Pred)->Succ = MemChunk->Succ;
+            if (xAllocatedMemory > 0) xAllocatedMemory -= MemChunk->Size;
+            free (MemChunk);
+            return;
+         }
+
+         FoundFlag = 0;
+         PredEntry = NULL;
+         SuccEntry = NULL;
+         if (TempEntry = MemChunk->FirstFreeMemEntry)
+         do
+         {
+            if ((struct MEM_ENTRY *)((unsigned char *)TempEntry +
+                  TempEntry->Size + sizeof(struct MEM_ENTRY)) == MemEntry)
+            {
+               FoundFlag ++;
+               PredEntry = TempEntry;
+            }
+            if ((struct MEM_ENTRY *)((unsigned char *)MemEntry +
+                  MemEntry->Size + sizeof(struct MEM_ENTRY)) == TempEntry)
+            {
+               FoundFlag ++;
+               SuccEntry = TempEntry;
+            }
+         } while ((FoundFlag != 2) && (TempEntry = TempEntry->Succ));
+
+         if (PredEntry)
+         {
+            if (SuccEntry)
+            {
+               /* Vorgdnger + Nachfolger */
+
+               if (SuccEntry->Succ)
+                  ((struct MEM_ENTRY *)SuccEntry->Succ)->Pred = SuccEntry->Pred;
+               ((struct MEM_ENTRY *)SuccEntry->Pred)->Succ = SuccEntry->Succ;
+
+               PredEntry->Size += MemEntry->Size + sizeof(struct MEM_ENTRY) +
+                                  SuccEntry->Size + sizeof(struct MEM_ENTRY);
+            }
+            else
+            {
+               /* nur Vorgaenger */
+
+               PredEntry->Size += MemEntry->Size + sizeof(struct MEM_ENTRY);
+            }
+#ifdef DEBUG
+            for (ptr = (unsigned char *) (PredEntry) + sizeof(struct MEM_ENTRY);
+                ptr < (unsigned char *) (PredEntry) + sizeof(struct MEM_ENTRY) +
+                PredEntry->Size; ptr++)
+                  *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
+#endif
+         }
+         else
+         {
+            if (SuccEntry)
+            {
+               /* nur Nachfolger */
+
+               if (SuccEntry->Succ)
+                  ((struct MEM_ENTRY *)SuccEntry->Succ)->Pred = SuccEntry->Pred;
+               ((struct MEM_ENTRY *)SuccEntry->Pred)->Succ = SuccEntry->Succ;
+
+               MemEntry->Size += SuccEntry->Size + sizeof(struct MEM_ENTRY);
+            }
+
+            if (MemChunk->FirstFreeMemEntry)
+               MemChunk->FirstFreeMemEntry->Pred = MemEntry;
+            MemEntry->Succ = MemChunk->FirstFreeMemEntry;
+            MemChunk->FirstFreeMemEntry = MemEntry;
+            MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstFreeMemEntry;
+#ifdef DEBUG
+            for (ptr = (unsigned char *) (MemEntry) + sizeof(struct MEM_ENTRY);
+                ptr < (unsigned char *) (MemEntry) + sizeof(struct MEM_ENTRY) +
+                MemEntry->Size; ptr++)
+                 *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
+#endif
+         }
+      }
+#ifdef DEBUG_CALLS
+   else
+   logPrintf (0, "xMemFree: tried to free unallocated data %x\r\n", DataPointer);
+#endif
+   }
+   return;
+}
+
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xMemFreeAll                                         *
+ *                                                                       *
+ *     parameter :   RememberPtr                                         *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xMemFreeAll() frees all with xMemAlloc() allocated memory. If Re-   *
+ *   memberPtr is not NULL, the MEM_CHUNK structure from the specified   *
+ *   Address is freed, otherwise the natural MEM_CHUNK will be done.     *
+ *                                                                       *
+ *************************************************************************/
+
+
+void xMemFreeAll (RememberPtr)
+
+struct MEM_CHUNK **RememberPtr;
+{
+   struct MEM_CHUNK            *MemChunk, *MemChunkPred;
+
+   if (RememberPtr)
+   {
+      if (MemChunkPred = (*RememberPtr))
+      do
+      {
+         MemChunk = MemChunkPred->Succ;
+         if (xAllocatedMemory > 0) xAllocatedMemory -= MemChunkPred->Size;
+         free (MemChunkPred);
+      } while (MemChunkPred = MemChunk);
+      *RememberPtr = NULL;
+   }
+   else
+   {
+      if (MemChunkPred = (*xRememberPtr))
+      do
+      {
+         MemChunk = MemChunkPred->Succ;
+         if (xAllocatedMemory > 0) xAllocatedMemory -= MemChunkPred->Size;
+         free (MemChunkPred);
+      } while (MemChunkPred = MemChunk);
+      *xRememberPtr = NULL;
+   }
+}
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xMemMerge                                           *
+ *                                                                       *
+ *     parameter :   RememberPtr                                         *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xMemMerge() merges the memory area pointed to by RememberKey with   *
+ *   the currently used in xRememberPtr.                                 *
+ *                                                                       *
+ *************************************************************************/
+
+void xMemMerge (RememberPtr)
+
+struct MEM_CHUNK **RememberPtr;
+{
+   struct MEM_CHUNK            *MemChunk, *MemChunkPred;
+
+   if (RememberPtr)
+   {
+      if (MemChunk = (*xRememberPtr))
+      {
+         while (MemChunk->Succ) MemChunk = MemChunk->Succ;
+         MemChunk->Succ = (*RememberPtr);
+         *RememberPtr = NULL;
+      }
+      else (*xRememberPtr = *RememberPtr);
+   }
+   return;
+}
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xGetRemember                                        *
+ *                                                                       *
+ *     parameter :   none                                                *
+ *                                                                       *
+ *     return    :   pointer to a MEM_CHUNK tree                         *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xGetRemember() returns the currently used MEM_CHUNK tree.           *
+ *                                                                       *
+ *************************************************************************/
+
+
+struct MEM_CHUNK **xGetRemember ()
+{
+   return (xRememberPtr);
+}
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xSetRemember                                        *
+ *                                                                       *
+ *     parameter :   pointer to a MEM_CHUNK tree                         *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xSetRemember() redefines the currently used MEM_CHUNK pointer. If   *
+ *   RememberPtr is NULL, the natural MEM_CHUNK is reloaded.             *
+ *                                                                       *
+ *************************************************************************/
+
+
+void xSetRemember (RememberPtr)
+
+struct MEM_CHUNK **RememberPtr;
+{
+   if (RememberPtr)
+      xRememberPtr = RememberPtr;
+   else
+      xRememberPtr = &xRememberKey;
+}
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xPrintMemList                                       *
+ *                                                                       *
+ *     parameter :   pointer to a MEM_CHUNK tree                         *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xPrintMemList() prints the currently allocated memory blocks of     *
+ *   the specified RememberPtr.                                          *
+ *                                                                       *
+ *************************************************************************/
+
+
+void xPrintMemList (Remember)
+
+struct MEM_CHUNK **Remember;
+{
+   struct MEM_CHUNK           *MemChunk;
+   struct MEM_ENTRY           *MemEntry;
+
+   fprintf (stderr, "MemChunkPtr = %x\n", (int) Remember);
+
+   if (MemChunk = *Remember)
+   do
+   {
+      fprintf (stderr, "\tMemChunk at %x with Size %d\n", (int) MemChunk, 
+                 (int) MemChunk->Size);
+
+      if (MemEntry = MemChunk->FirstFreeMemEntry)
+      do
+      {
+         fprintf (stderr, "\t\tFree MemEntry at %x (%x) with Size %d\n", 
+                   (int) MemEntry, (int)((unsigned char *)MemEntry + 
+                      sizeof(struct MEM_ENTRY)), (int) MemEntry->Size);
+
+      } while (MemEntry = MemEntry->Succ);
+
+      if (MemEntry = MemChunk->FirstUsedMemEntry)
+      do
+      {
+         fprintf (stderr, "\t\tUsed MemEntry at %x (%x) with Size %d\n", 
+                   (int) MemEntry, (int)((unsigned char *)MemEntry + 
+                      sizeof(struct MEM_ENTRY)), (int) MemEntry->Size);
+
+      } while (MemEntry = MemEntry->Succ);
+
+   } while (MemChunk = MemChunk->Succ);
+   else fprintf (stderr, "\tNo current MemChunk\n");
+}
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xGetMemSize                                         *
+ *                                                                       *
+ *     parameter :   pointer to a MEM_CHUNK tree                         *
+ *                                                                       *
+ *     return    :   none                                                *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xGetMemSize() gets the size of the currently allocated memory       *
+ *   blocks of the specified (or natural if NULL) RememberPtr            *
+ *                                                                       *
+ *************************************************************************/
+
+
+unsigned long xGetMemSize (RememberPtr)
+
+struct MEM_CHUNK **RememberPtr;
+{
+   struct MEM_CHUNK           *MemChunk;
+   struct MEM_ENTRY           *MemEntry;
+   unsigned long               Result = 0;
+
+   if (RememberPtr) MemChunk = *RememberPtr;
+   else MemChunk = xRememberKey;
+
+   if (MemChunk)
+   do { Result += (unsigned long) MemChunk->Size; }
+   while (MemChunk = MemChunk->Succ);
+
+   return (Result);
+}
+
+
+/*************************************************************************
+ *                                                                       *
+ *     function  :   xSetText                                            *
+ *                                                                       *
+ *     arguments :   xText - pointer to a string                         *
+ *                                                                       *
+ *     return    :   pointer to an new allocated string                  *
+ *                                                                       *
+ *-----------------------------------------------------------------------*
+ *                                                                       *
+ *   xSetText() allocates memory for the string pointed to by 'xText'    *
+ *   and duplicates it.                                                  *
+ *                                                                       *
+ *************************************************************************/
+
+char *xSetText (xText)
+
+char *xText;
+{
+   char   *NewText;
+
+   if (!xText) return (NULL);
+
+   xMemAlloc (strlen(xText) + 1, &NewText);
+   strcpy (NewText, xText);
+
+   return (NewText);   
+}
diff --git a/libdtv/libsi/COPYING b/libdtv/libsi/COPYING
new file mode 100644
index 000000000..a43ea2126
--- /dev/null
+++ b/libdtv/libsi/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/libdtv/libsi/Makefile b/libdtv/libsi/Makefile
new file mode 100644
index 000000000..4b939b944
--- /dev/null
+++ b/libdtv/libsi/Makefile
@@ -0,0 +1,83 @@
+##############################################################
+###                                                        ###
+### Makefile: local makefile for libsi                     ###
+###                                                        ###
+##############################################################
+
+## $Revision: 1.1 $
+## $Date: 2001/08/15 14:47:22 $
+## $Author: kls $
+##
+##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+##
+## dtv_scan is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## dtv_scan is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You may have received a copy of the GNU General Public License
+## along with dtv_scan; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+#
+#
+#
+
+.DELETE_ON_ERROR:
+
+CC = gcc
+CFLAGS = -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
+         -DNAPI -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -ansi -pedantic 
+
+INCDIRS = -Iinclude -I../include
+DISTDIR = ../lib
+DISTINCDIR = ../include
+INCLUDES = include/libsi.h include/si_tables.h
+MAKEDEPEND = gcc -M
+
+LIBDIRS = -L. -L../lib
+LIBS = -lsi -llx
+
+AR = ar
+ARFLAGS = ru
+RANLIB = ranlib
+
+SILIB = libsi.a
+OBJS = si_parser.o si_debug_services.o
+
+all : $(SILIB)
+
+clean :
+	@echo cleaning workspace...
+	@rm -f $(OBJS) $(SILIB) *~
+	@rm -f Makefile.dep
+
+depend : Makefile.dep
+Makefile.dep :
+	@echo "updating dependencies..."
+	@$(MAKEDEPEND) $(INCDIRS) $(OBJS:%.o=%.c) $(SITEST_OBJS:%.o=%.c) \
+           $(SISCAN_OBJS:%.o=%.c) > Makefile.dep
+
+new : clean depend all
+
+dist: all
+	@echo "distributing $(SILIB) to $(DISTDIR)..."
+	@cp $(SILIB) $(DISTDIR)
+	@cp $(INCLUDES) $(DISTINCDIR)
+	@$(RANLIB) $(DISTDIR)/$(SILIB)
+
+$(SILIB) : $(OBJS)
+	@echo updating library...
+	@$(AR) $(ARFLAGS) $(SILIB) $(OBJS)
+	@$(RANLIB) $(SILIB)
+
+.c.o : 
+	@echo compiling $<...
+	@$(CC) $(DEFINES) $(CFLAGS) $(INCDIRS) -c $<
+
+include Makefile.dep
diff --git a/libdtv/libsi/README b/libdtv/libsi/README
new file mode 100644
index 000000000..4f1be1ab5
--- /dev/null
+++ b/libdtv/libsi/README
@@ -0,0 +1,2 @@
+DVB - System Information Library
+================================
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
new file mode 100644
index 000000000..3790ae156
--- /dev/null
+++ b/libdtv/libsi/include/libsi.h
@@ -0,0 +1,816 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// libsi.h: definitions for data structures of libsi      ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/06/26 07:18:43 $
+// $Author: kls $
+//
+//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libsi is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libsi is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libsi; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#ifndef LIBSI_H
+#define LIBSI_H
+
+#include <time.h>
+#include <sys/types.h>
+#include <asm/types.h>
+
+
+  /* Program Identifier */
+
+#define PID_PAT               0x00           /* Program Association Table */
+#define PID_BAT               0x01           /* Bouquet Association Table */
+#define PID_CAT               0x01           /* Conditional Access Table */
+#define PID_NIT               0x10           /* Network Information Table */
+#define PID_SDT               0x11           /* Service Description Table */
+#define PID_EIT               0x12           /* Event Information Table */
+#define PID_RST               0x13           /* Running Status Table */
+#define PID_TDT               0x14           /* Time Date Table */
+#define PID_TOT               0x14           /* Time Offset Table */
+#define PID_ST                0x14           /* Stuffing Table */
+                           /* 0x15 - 0x1F */ /* Reserved for future use */
+
+  /* Table Identifier */
+
+#define TID_PAT               0x00           /* Program Association Section */
+#define TID_CAT               0x01           /* Conditional Access Section */
+#define TID_PMT               0x02           /* Conditional Access Section */
+                           /* 0x03 - 0x3F */ /* Reserved for future use */
+#define TID_NIT_ACT           0x40           /* Network Information Section -
+                                                   actual */
+#define TID_NIT_OTH           0x41           /* Network Information Section -
+                                                   other */
+#define TID_SDT_ACT           0x42           /* Service Description Section -
+                                                   actual */
+#define TID_SDT_OTH           0x46           /* Service Description Section -
+                                                   other */
+#define TID_EIT_ACT           0x4E           /* Event Information Section -
+                                                   actual */
+#define TID_EIT_OTH           0x4F           /* Event Information Section -
+                                                   other */
+#define TID_EIT_ACT_SCH       0x50           /* Event Information Section -
+                                                   actual, schedule  */
+#define TID_EIT_OTH_SCH       0x60           /* Event Information Section -
+                                                   other, schedule */
+#define TID_TDT               0x70           /* Time Date Section */
+#define TID_TOT               0x73           /* Time Offset Section */
+#define TID_CA_ECM_0          0x80
+#define TID_CA_ECM_1          0x81
+
+#define TID_BAT               0x01           /* Bouquet Association Section */
+
+#define TID_EIT               0x12           /* Event Information Section */
+#define TID_RST               0x13           /* Running Status Section */
+#define TID_ST                0x14           /* Stuffung Section */
+                           /* 0xFF */        /* Reserved for future use */
+
+  /* Descriptor Identifier */
+
+  /* defined by ISO/IEC 13818-1 */
+
+#define DESCR_VIDEO_STREAM                   0x02
+#define DESCR_AUDIO_STREAM                   0x03
+#define DESCR_HIERARCHY                      0x04
+#define DESCR_REGISTRATION                   0x05
+#define DESCR_DATA_STREAM_ALIGN              0x06
+#define DESCR_TARGET_BACKGRID                0x07
+#define DESCR_VIDEO_WINDOW                   0x08
+#define DESCR_CA                             0x09
+#define DESCR_ISO_639_LANGUAGE               0x0A
+#define DESCR_SYSTEM_CLOCK                   0x0B
+#define DESCR_MULTIPLEX_BUFFER_UTIL          0x0C
+#define DESCR_COPYRIGHT                      0x0D
+#define DESCR_MAXIMUM_BITRATE                0x0E
+#define DESCR_PRIVATE_DATA_IND               0x0F
+#define DESCR_SMOOTHING_BUFFER               0x10
+#define DESCR_STD                            0x11
+#define DESCR_IBP                            0x12
+                                          /* 0x13 - 0x3F */ /* Reserved */
+
+  /* defined by ETSI */
+
+#define DESCR_NW_NAME                        0x40
+#define DESCR_SERVICE_LIST                   0x41
+#define DESCR_STUFFING                       0x42
+#define DESCR_SAT_DEL_SYS                    0x43
+#define DESCR_CABLE_DEL_SYS                  0x44
+#define DESCR_VBI_DATA                       0x45
+#define DESCR_VBI_TELETEXT                   0x46
+#define DESCR_BOUQUET_NAME                   0x47
+#define DESCR_SERVICE                        0x48
+#define DESCR_COUNTRY_AVAIL                  0x49
+#define DESCR_LINKAGE                        0x4A
+#define DESCR_NVOD_REF                       0x4B
+#define DESCR_TIME_SHIFTED_SERVICE           0x4C
+#define DESCR_SHORT_EVENT                    0x4D
+#define DESCR_EXTENDED_EVENT                 0x4E
+#define DESCR_TIME_SHIFTED_EVENT             0x4F
+#define DESCR_COMPONENT                      0x50
+#define DESCR_MOSAIC                         0x51
+#define DESCR_STREAM_ID                      0x52
+#define DESCR_CA_IDENT                       0x53
+#define DESCR_CONTENT                        0x54
+#define DESCR_PARENTAL_RATING                0x55
+#define DESCR_TELETEXT                       0x56
+#define DESCR_TELEPHONE                      0x57
+#define DESCR_LOCAL_TIME_OFF                 0x58
+#define DESCR_SUBTITLING                     0x59
+#define DESCR_TERR_DEL_SYS                   0x5A
+#define DESCR_ML_NW_NAME                     0x5B
+#define DESCR_ML_BQ_NAME                     0x5C
+#define DESCR_ML_SERVICE_NAME                0x5D
+#define DESCR_ML_COMPONENT                   0x5E
+#define DESCR_PRIV_DATA_SPEC                 0x5F
+#define DESCR_SERVICE_MOVE                   0x60
+#define DESCR_SHORT_SMOOTH_BUF               0x61
+#define DESCR_FREQUENCY_LIST                 0x62
+#define DESCR_PARTIAL_TP_STREAM              0x63
+#define DESCR_DATA_BROADCAST                 0x64
+#define DESCR_CA_SYSTEM                      0x65
+#define DESCR_DATA_BROADCAST_ID              0x66
+#define DESCR_TRANSPORT_STREAM               0x67
+#define DESCR_DSNG                           0x68
+#define DESCR_PDC                            0x69
+#define DESCR_AC3                            0x6A
+#define DESCR_ANCILLARY_DATA                 0x6B
+#define DESCR_CELL_LIST                      0x6C
+#define DESCR_CELL_FREQ_LINK                 0x6D
+#define DESCR_ANNOUNCEMENT_SUPPORT           0x6E
+
+
+#define MAX_SECTION_BUFFER 4096
+
+
+/* Strukturen zur Aufnahme der SDT und EIT Informationen */
+
+struct Service {
+   struct NODE          Node;
+   int                  ServiceID;
+   int                  TransportStreamID;
+   int                  OriginalNetworkID;
+   int                  SdtVersion;
+   unsigned short       Status;
+   struct LIST         *Descriptors;
+   struct LIST         *Events;
+};
+
+#define EIT_SCHEDULE_FLAG               0x0001
+#define GetScheduleFlag(x)              ((x)&EIT_SCHEDULE_FLAG)
+#define SetScheduleFlag(x)              ((x)|=EIT_SCHEDULE_FLAG)
+#define EIT_PRESENT_FOLLOWING_FLAG      0x0002
+#define GetPresentFollowing(x)          ((x)&EIT_PRESENT_FOLLOWING_FLAG)
+#define SetPresentFollowing(x)          ((x)|=EIT_PRESENT_FOLLOWING_FLAG)
+#define RUNNING_STATUS_NOT_RUNNING      0x0000
+#define RUNNING_STATUS_AWAITING         0x0004
+#define RUNNING_STATUS_PAUSING          0x0008
+#define RUNNING_STATUS_RUNNING          0x000C
+#define GetRunningStatus(x)             ((x)&RUNNING_STATUS_RUNNING)
+#define SetRunningStatus(x,s)           ((x)|=((s)&RUNNING_STATUS_RUNNING))
+#define FREE_TO_AIR                     0x0000
+#define CONDITIONAL_ACCESS              0x0010
+#define GetConditionalAccess(x)         ((x)&CONDITIONAL_ACCESS)
+#define SetConditionalAccess(x)         ((x)|=CONDITIONAL_ACCESS)
+
+#define CreateService(service, svid, tsid, onid, vers, sta) \
+   do \
+   { \
+      xCreateNode (service, NULL); \
+      service->ServiceID = svid; \
+      service->TransportStreamID = tsid; \
+      service->OriginalNetworkID = onid; \
+      service->SdtVersion = vers; \
+      service->Status = sta; \
+      service->Descriptors = xNewList (NULL); \
+      service->Events = xNewList (NULL); \
+   } while (0)
+
+
+struct Event {
+   struct NODE          Node;
+   int                  EventID;
+   int                  ServiceID;
+   int                  EitVersion;
+   int                  TransportStreamID;
+   int                  OriginalNetworkID;
+   time_t               StartTime;
+   time_t               Duration;
+   unsigned short       Status;
+   struct LIST         *Descriptors;
+};
+
+#define CreateEvent(event, evid, svid, tsid, onid, vers, sta) \
+   do \
+   { \
+      xCreateNode (event, NULL); \
+      event->EventID = evid; \
+      event->ServiceID = svid; \
+      event->TransportStreamID = tsid; \
+      event->OriginalNetworkID = onid; \
+      event->EitVersion = vers; \
+      event->Status = sta; \
+      event->Descriptors = xNewList (NULL); \
+   } while (0)
+
+
+/* Strukturen zur Aufnahme der PAT und PMT Informationen */
+
+struct Program {
+   struct NODE          Node;
+   int                  ProgramID;
+   int                  TransportStreamID;
+   int                  NetworkPID;
+   int                  PatVersion;
+   struct LIST         *Pids;
+};
+
+#define CreateProgram(program, pgid, tsid, npid, vers) \
+   do \
+   { \
+      xCreateNode (program, NULL); \
+      program->ProgramID = pgid; \
+      program->TransportStreamID = tsid; \
+      program->NetworkPID = npid; \
+      program->PatVersion = vers; \
+      program->Pids = xNewList (NULL); \
+   } while (0)
+
+struct Pid {
+   struct NODE          Node;
+   int                  ProgramID;
+   int                  PcrPID;
+   int                  PmtVersion;
+   struct LIST         *Descriptors;
+   struct LIST         *InfoList;
+};
+
+#define CreatePid(pid, pgid, pcid, vers) \
+   do \
+   { \
+      xCreateNode (pid, NULL); \
+      pid->ProgramID = pgid; \
+      pid->PcrPID = pcid; \
+      pid->PmtVersion = vers; \
+      pid->Descriptors = xNewList (NULL); \
+      pid->InfoList = xNewList (NULL); \
+   } while (0)
+
+struct PidInfo {
+   struct NODE          Node;
+   int                  StreamType;
+   int                  ElementaryPid;
+   struct LIST         *Descriptors;
+};
+
+#define CreatePidInfo(pidinfo, styp, epid) \
+   do \
+   { \
+      xCreateNode (pidinfo, NULL); \
+      pidinfo->StreamType = styp; \
+      pidinfo->ElementaryPid = epid; \
+      pidinfo->Descriptors = xNewList (NULL); \
+   } while (0)
+
+
+#define STREAMTYPE_ISO_VIDEO                     1
+#define STREAMTYPE_13818_VIDEO                   2
+#define STREAMTYPE_11172_AUDIO                   3
+#define STREAMTYPE_13818_AUDIO                   4
+#define STREAMTYPE_VIDEOTEXT                     6
+#define STREAMTYPE_13522_MPEG                    7
+#define STREAMTYPE_ITU_222                       8
+#define STREAMTYPE_13818_A                       9
+#define STREAMTYPE_13818_B                      10
+#define STREAMTYPE_13818_C                      11
+#define STREAMTYPE_13818_D                      12
+#define STREAMTYPE_13818_AUX                    13
+
+/* Descriptors */
+
+#define DescriptorTag(x) ((struct Descriptor *)(x))->Tag
+
+struct Descriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+};
+
+
+/* Iso639LanguageDescriptor */
+
+struct Iso639LanguageDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   char                 LanguageCode[4];
+};
+
+#define CreateIso639LanguageDescriptor(descr, lc1, lc2, lc3) \
+   do \
+   { \
+      xCreateNode (((struct Iso639LanguageDescriptor *)descr), NULL); \
+      ((struct Iso639LanguageDescriptor *)descr)->Tag = DESCR_ISO_639_LANGUAGE; \
+      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[0] = lc1; \
+      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[1] = lc2; \
+      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[2] = lc3; \
+      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[3] = '\0'; \
+   } while (0)
+
+
+/* AncillaryDataDescriptor */
+
+struct AncillaryDataDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       Identifier;
+};
+
+#define ANCILLARY_DATA_DVD_VIDEO            0x0001
+#define ANCILLARY_DATA_EXTENDED             0x0002
+#define ANCILLARY_DATA_SWITCHING            0x0004
+#define ANCILLARY_DATA_DAB                  0x0008
+#define ANCILLARY_DATA_SCALE_FACTOR         0x0010
+
+#define CreateAncillaryDataDescriptor(descr, id) \
+   do \
+   { \
+      xCreateNode (((struct AncillaryDataDescriptor *)descr), NULL); \
+      ((struct AncillaryDataDescriptor *)descr)->Tag = DESCR_ANCILLARY_DATA; \
+      ((struct AncillaryDataDescriptor *)descr)->Identifier = id; \
+   } while (0)
+
+
+/* BouquetNameDescriptor */
+
+struct BouquetNameDescriptor {
+   struct NODE          Node;    /* Node enth�lt Namen */
+   unsigned short       Tag;
+};
+
+#define CreateBouquetNameDescriptor(descr, text) \
+   do \
+   { \
+      xCreateNode (((struct BouquetNameDescriptor *)descr), text); \
+      ((struct BouquetNameDescriptor *)descr)->Tag = DESCR_BOUQUET_NAME; \
+   } while (0)
+
+
+/* CountryAvailabilityDescriptor */
+
+struct CountryAvailabilityDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       AvailibilityFlag;
+   unsigned short       Amount;           /* CountryCodes */
+   char                *CountryCodes;
+};
+
+#define COUNTRIES_ARE_AVAILABLE   0x0001
+#define COUNTRIES_ARE_UNAVAILABLE 0x0000
+
+#define CreateCountryAvailabilityDescriptor(descr, ava) \
+   do \
+   { \
+      xCreateNode (((struct CountryAvailabilityDescriptor *)descr), NULL); \
+      ((struct CountryAvailabilityDescriptor *)descr)->Tag = DESCR_COUNTRY_AVAIL; \
+      ((struct CountryAvailabilityDescriptor *)descr)->AvailibilityFlag = ava; \
+      ((struct CountryAvailabilityDescriptor *)descr)->Amount = 0; \
+      ((struct CountryAvailabilityDescriptor *)descr)->CountryCodes = NULL; \
+   } while (0)
+
+#define AddCountryAvailabilityCode(descr, lc1, lc2, lc3) \
+   do \
+   { \
+      char tmpbuf[4], *tmpptr, *ttptr; \
+      \
+      tmpbuf[0] = lc1; tmpbuf[1] = lc2; \
+      tmpbuf[2] = lc3; tmpbuf[3] = '\0'; \
+      xMemAlloc (((struct CountryAvailabilityDescriptor *)descr)->Amount*4 + 8, &tmpptr); \
+      ttptr = tmpptr; \
+      if (((struct CountryAvailabilityDescriptor *)descr)->CountryCodes) { \
+         memcpy (ttptr, ((struct CountryAvailabilityDescriptor *)descr)->CountryCodes, \
+                        ((struct CountryAvailabilityDescriptor *)descr)->Amount*4); \
+         ttptr += ((struct CountryAvailabilityDescriptor *)descr)->Amount*4; \
+      } \
+      memcpy (ttptr, tmpbuf, 4); \
+      ((struct CountryAvailabilityDescriptor *)descr)->CountryCodes = tmpptr; \
+   } while (0)
+
+
+/* CaIdentifierDescriptor */
+
+struct CaIdentifierDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       Amount;           /* SystemIDs */
+   unsigned short      *SystemID;
+};
+
+#define CreateCaIdentifierDescriptor(descr, amo) \
+   do \
+   { \
+      xCreateNode (((struct CaIdentifierDescriptor *)descr), NULL); \
+      ((struct CaIdentifierDescriptor *)descr)->Tag = DESCR_CA_IDENT; \
+      ((struct CaIdentifierDescriptor *)descr)->Amount = amo; \
+      xMemAlloc (amo*2+2, &((struct CaIdentifierDescriptor *)descr)->SystemID); \
+   } while (0)
+
+#define SetCaIdentifierID(descr, num, id) \
+      ((struct CaIdentifierDescriptor *)descr)->SystemID[num] = id
+#define GetCaIdentifierID(descr, num) (((struct CaIdentifierDescriptor *)descr)->SystemID[num])
+
+
+/* StreamIdentifierDescriptor */
+
+struct StreamIdentifierDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       ComponentTag;
+};
+
+#define CreateStreamIdentifierDescriptor(descr, ctag) \
+   do \
+   { \
+      xCreateNode (((struct StreamIdentifierDescriptor *)descr), NULL); \
+      ((struct StreamIdentifierDescriptor *)descr)->Tag = DESCR_STREAM_ID; \
+      ((struct StreamIdentifierDescriptor *)descr)->ComponentTag = (ctag); \
+   } while (0)
+
+
+/* DataBroadcastDescriptor */
+
+struct DataBroadcastDescriptor {
+   struct NODE          Node;          /* Node enth�lt DescriptorText */
+   unsigned short       Tag;
+   unsigned short       DataBroadcastID;
+   unsigned short       ComponentTag;
+   unsigned short       SelectorLength;
+   unsigned char       *SelectorBytes;
+   char                 LanguageCode[4];
+};
+
+struct MosaicDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   /* to be defined */
+};
+
+struct MultiLingualServiceDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   /* to be defined */
+};
+
+
+/* NvodReferenceDescriptor */
+
+struct NvodReferenceDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   struct LIST         *Items;
+};
+
+#define CreateNvodReferenceDescriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct NvodReferenceDescriptor *)descr), NULL); \
+      ((struct NvodReferenceDescriptor *)descr)->Tag = DESCR_NVOD_REF; \
+      ((struct NvodReferenceDescriptor *)descr)->Items = xNewList (NULL); \
+   } while (0)
+
+struct NvodReferenceItem {
+   struct NODE          Node;
+   int                  TransportStreamID;
+   int                  OriginalNetworkID;
+   int                  ServiceID;
+};
+
+#define CreateNvodReferenceItem(itm, tpid, onid, svid) \
+   do \
+   { \
+      xCreateNode (itm, NULL); \
+      itm->TransportStreamID = tpid; \
+      itm->OriginalNetworkID = onid; \
+      itm->ServiceID = svid; \
+   } while (0)
+
+#define AddNvodReferenceItem(desc, tpid, onid, svid) \
+   do \
+   { \
+      struct NvodReferenceItem *item; \
+      \
+      CreateNvodReferenceItem(item, tpid, onid, svid); \
+      xAddTail (((struct NvodReferenceDescriptor *)desc)->Items, item); \
+   } while (0)
+
+
+/* LinkageDescriptor */
+
+struct LinkageDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   int                  TransportStreamID;
+   int                  OriginalNetworkID;
+   int                  ServiceID;
+   int                  LinkageType;
+   int                  PrivateDataLength;
+   unsigned char       *PrivateData;
+};
+
+#define CreateLinkageDescriptor(descr, tpid, onid, svid, ltyp, pdl, pdp) \
+   do \
+   { \
+      xCreateNode (((struct LinkageDescriptor *)descr), NULL); \
+      ((struct LinkageDescriptor *)descr)->Tag = DESCR_LINKAGE; \
+      ((struct LinkageDescriptor *)descr)->TransportStreamID = tpid; \
+      ((struct LinkageDescriptor *)descr)->OriginalNetworkID = onid; \
+      ((struct LinkageDescriptor *)descr)->ServiceID = svid; \
+      ((struct LinkageDescriptor *)descr)->LinkageType = ltyp; \
+      ((struct LinkageDescriptor *)descr)->PrivateDataLength = pdl; \
+      xMemAlloc ((pdl)+1, &(((struct LinkageDescriptor *) \
+         descr)->PrivateData)); \
+      memcpy ((((struct LinkageDescriptor *)descr)->PrivateData),(pdp),(pdl));\
+   } while (0)
+
+
+/* ServiceDescriptor */
+
+struct ServiceDescriptor {
+   struct NODE          Node;      /* Node enth�lt ServiceName */
+   unsigned short       Tag;
+   unsigned short       ServiceType;
+   char                *ServiceProvider;
+};
+
+#define CreateServiceDescriptor(descr, styp, prov, name) \
+   do \
+   { \
+      xCreateNode (((struct ServiceDescriptor *)descr), name); \
+      ((struct ServiceDescriptor *)descr)->Tag = DESCR_SERVICE; \
+      ((struct ServiceDescriptor *)descr)->ServiceType = styp; \
+      ((struct ServiceDescriptor *)descr)->ServiceProvider = prov; \
+   } while (0)
+
+
+
+struct TelephoneDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   /* to be defined */
+};
+
+
+/* TimeShiftedServiceDescriptor */
+
+struct TimeShiftedServiceDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   int                  ReferenceServiceID;
+};
+
+#define CreateTimeShiftedServiceDescriptor(descr, svid) \
+   do \
+   { \
+      xCreateNode (((struct TimeShiftedServiceDescriptor *)descr), NULL); \
+      ((struct TimeShiftedServiceDescriptor *)descr)->Tag = DESCR_TIME_SHIFTED_SERVICE; \
+      ((struct TimeShiftedServiceDescriptor *)descr)->ReferenceServiceID = svid; \
+   } while (0)
+
+
+/* TimeShiftedEventDescriptor */
+
+struct TimeShiftedEventDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   int                  ReferenceServiceID;
+   int                  ReferenceEventID;
+};
+
+#define CreateTimeShiftedEventDescriptor(descr, svid, evid) \
+   do \
+   { \
+      xCreateNode (((struct TimeShiftedEventDescriptor *)descr), NULL); \
+      ((struct TimeShiftedEventDescriptor *)descr)->Tag = DESCR_TIME_SHIFTED_EVENT; \
+      ((struct TimeShiftedEventDescriptor *)descr)->ReferenceServiceID = svid; \
+      ((struct TimeShiftedEventDescriptor *)descr)->ReferenceEventID = evid; \
+   } while (0)
+
+
+/* ComponentDescriptor */
+
+struct ComponentDescriptor {
+   struct NODE          Node;   /* Node enth�lt ComponentText */
+   unsigned short       Tag;
+   unsigned short       StreamContent;
+   unsigned short       ComponentType;
+   unsigned short       ComponentTag;
+   char                 LanguageCode[4];
+};
+
+#define CreateComponentDescriptor(descr, scnt, ctyp, tag, lc1, lc2, lc3, txt) \
+   do \
+   { \
+      xCreateNode (((struct ComponentDescriptor *)descr), txt); \
+      ((struct ComponentDescriptor *)descr)->Tag = DESCR_COMPONENT; \
+      ((struct ComponentDescriptor *)descr)->StreamContent = scnt; \
+      ((struct ComponentDescriptor *)descr)->ComponentType = ctyp; \
+      ((struct ComponentDescriptor *)descr)->ComponentTag = tag; \
+      ((struct ComponentDescriptor *)descr)->LanguageCode[0] = lc1; \
+      ((struct ComponentDescriptor *)descr)->LanguageCode[1] = lc2; \
+      ((struct ComponentDescriptor *)descr)->LanguageCode[2] = lc3; \
+      ((struct ComponentDescriptor *)descr)->LanguageCode[3] = '\0'; \
+   } while (0)
+
+
+/* ContentDescriptor */
+
+struct ContentDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       Amount;        /* ContentIDs */
+   unsigned short      *ContentID;
+};
+
+#define CreateContentDescriptor(descr, amo) \
+   do \
+   { \
+      xCreateNode (((struct ContentDescriptor *)descr), NULL); \
+      ((struct ContentDescriptor *)descr)->Tag = DESCR_CONTENT; \
+      ((struct ContentDescriptor *)descr)->Amount = amo; \
+      xMemAlloc (amo*2+2, &((struct ContentDescriptor *)descr)->ContentID); \
+   } while (0)
+
+#define SetContentID(descr, num, cnib1, cnib2, unib1, unib2) \
+   do \
+   { \
+      ((struct ContentDescriptor *)descr)->ContentID[num] = \
+         ((cnib1&0xF) << 12) | ((cnib2&0xF) << 8) | \
+         ((unib1&0xF) << 4) | (unib2&0xF); \
+   } while (0)
+#define GetContentContentNibble1(descr, num) ((((struct ContentDescriptor *)descr)->ContentID[num]&0xF000) >> 12)
+#define GetContentContentNibble2(descr, num) ((((struct ContentDescriptor *)descr)->ContentID[num]&0x0F00) >> 8)
+#define GetContentUserNibble1(descr, num) ((((struct ContentDescriptor *)descr)->ContentID[num]&0x00F0) >> 4)
+#define GetContentUserNibble2(descr, num) (((struct ContentDescriptor *)descr)->ContentID[num]&0x000F)
+
+
+/* ExtendedEventDescriptor */
+
+struct ExtendedEventDescriptor {
+   struct NODE          Node;    /* Node enth�lt EventText */
+   unsigned short       Tag;
+   unsigned short       DescriptorNumber;
+   unsigned short       LastDescriptorNumber;
+   char                 LanguageCode[4];
+   struct LIST         *Items;
+};
+
+#define CreateExtendedEventDescriptor(descr, dnum, ldnb, lc1, lc2, lc3, text) \
+   do \
+   { \
+      xCreateNode (((struct ExtendedEventDescriptor *)descr), text); \
+      ((struct ExtendedEventDescriptor *)descr)->Tag = DESCR_EXTENDED_EVENT; \
+      ((struct ExtendedEventDescriptor *)descr)->DescriptorNumber = dnum; \
+      ((struct ExtendedEventDescriptor *)descr)->LastDescriptorNumber = ldnb; \
+      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[0] = lc1; \
+      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[1] = lc2; \
+      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[2] = lc3; \
+      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[3] = '\0'; \
+      ((struct ExtendedEventDescriptor *)descr)->Items = xNewList (NULL); \
+   } while (0)
+
+struct ExtendedEventItem {
+   struct NODE          Node;    /* Node enth�lt ItemDescription Text */
+   char                *Text;
+};
+
+#define CreateExtendedEventItem(itm, dtxt, text) \
+   do \
+   { \
+      xCreateNode (itm, dtxt); \
+      itm->Text = text; \
+   } while (0)
+
+#define AddExtendedEventItem(desc, dtxt, text) \
+   do \
+   { \
+      struct ExtendedEventItem *item; \
+      \
+      CreateExtendedEventItem(item, dtxt, text); \
+      xAddTail (((struct ExtendedEventDescriptor *)desc)->Items, item); \
+   } while (0)
+
+
+/* ParentalRatingDescriptor */
+
+struct ParentalRatingDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   struct LIST         *Ratings;
+};
+
+#define CreateParentalRatingDescriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct ParentalRatingDescriptor *)descr), NULL); \
+      ((struct ParentalRatingDescriptor *)descr)->Tag = DESCR_PARENTAL_RATING; \
+      ((struct ParentalRatingDescriptor *)descr)->Ratings = xNewList (NULL); \
+   } while (0)
+
+struct ParentalRating {
+   struct NODE          Node;    /* Node enth�lt ItemDescription Text */
+   char                 LanguageCode[4];
+   char                 Rating;
+};
+
+#define CreateParentalRating(rat, lc1, lc2, lc3, val) \
+   do \
+   { \
+      xCreateNode (rat, NULL); \
+      rat->LanguageCode[0] = lc1; \
+      rat->LanguageCode[1] = lc2; \
+      rat->LanguageCode[2] = lc3; \
+      rat->LanguageCode[3] = '\0'; \
+      rat->Rating = val; \
+   } while (0)
+
+#define AddParentalRating(desc, lc1, lc2, lc3, val) \
+   do \
+   { \
+      struct ParentalRating *item; \
+      \
+      CreateParentalRating(item, lc1, lc2, lc3, val); \
+      xAddTail (((struct ParentalRatingDescriptor *)desc)->Ratings, item); \
+   } while (0)
+
+/* ShortEventDescriptor */
+
+struct ShortEventDescriptor {
+   struct NODE          Node;    /* Node enth�lt EventName */
+   unsigned short       Tag;
+   char                 LanguageCode[4];
+   char                *Text;
+};
+
+#define CreateShortEventDescriptor(descr, name, lc1, lc2, lc3, text) \
+   do \
+   { \
+      xCreateNode (((struct ShortEventDescriptor *)descr), name); \
+      ((struct ShortEventDescriptor *)descr)->Tag = DESCR_SHORT_EVENT; \
+      ((struct ShortEventDescriptor *)descr)->LanguageCode[0] = lc1; \
+      ((struct ShortEventDescriptor *)descr)->LanguageCode[1] = lc2; \
+      ((struct ShortEventDescriptor *)descr)->LanguageCode[2] = lc3; \
+      ((struct ShortEventDescriptor *)descr)->LanguageCode[3] = '\0'; \
+      ((struct ShortEventDescriptor *)descr)->Text = text; \
+   } while (0)
+
+
+
+/* Prototypes */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* si_parser.c */
+
+struct LIST *siParsePAT (u_char *);
+struct Pid *siParsePMT (u_char *);
+struct LIST *siParseSDT (u_char *);
+struct LIST *siParseEIT (u_char *);
+time_t siParseTDT (u_char *);
+void siParseDescriptors (struct LIST *, u_char *, u_int, u_char);
+void siParseDescriptor (struct LIST *, u_char *);
+char *siGetDescriptorText (u_char *, u_int);
+u_long crc32 (char *data, int len);
+
+/* si_debug_services.c */
+
+void siDebugServices (struct LIST *);
+void siDebugService (struct Service *);
+void siDebugEvents (char *, struct LIST *);
+void siDebugPrograms (char *, struct LIST *);
+void siDebugProgram (struct Program *);
+void siDebugPids (char *, struct LIST *);
+void siDebugDescriptors (char *, struct LIST *);
+void siDebugEitServices (struct LIST *);
+void siDebugEitEvents (char *, struct LIST *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/libdtv/libsi/include/si_tables.h b/libdtv/libsi/include/si_tables.h
new file mode 100644
index 000000000..517838af8
--- /dev/null
+++ b/libdtv/libsi/include/si_tables.h
@@ -0,0 +1,1205 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// si_tables.h: definitions for data structures of the    ///
+///              incoming SI data stream                   ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/06/25 12:41:20 $
+// $Author: kls $
+//
+//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libsi is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libsi is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libsi; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#ifndef SI_TABLES_H
+#define SI_TABLES_H
+
+#define HILO(x) (x##_hi << 8 | x##_lo)
+
+#define MjdToEpochTime(x) (((x##_hi << 8 | x##_lo)-40587)*86400)
+#define BcdTimeToSeconds(x) ((3600 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
+                             (60 * ((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))) + \
+                             ((10*((x##_s & 0xF0)>>4)) + (x##_s & 0xF)))
+
+#define TableHasMoreSections(x) (((pat_t *)(x))->last_section_number > ((pat_t *)(x))->section_number)
+#define GetTableId(x) ((pat_t *)(x))->table_id
+#define GetSectionNumber(x) ((pat_t *)(x))->section_number
+#define GetLastSectionNumber(x) ((pat_t *)(x))->last_section_number
+#define GetServiceId(x) (((eit_t *)(x))->service_id_hi << 8) | ((eit_t *)(x))->service_id_lo
+
+/*
+ *
+ *    ETSI ISO/IEC 13818-1 specifies SI which is referred to as PSI. The PSI
+ *    data provides information to enable automatic configuration of the
+ *    receiver to demultiplex and decode the various streams of programs
+ *    within the multiplex. The PSI data is structured as four types of table.
+ *    The tables are transmitted in sections.
+ *
+ *    1) Program Association Table (PAT):
+ *
+ *       - for each service in the multiplex, the PAT indicates the location
+ *         (the Packet Identifier (PID) values of the Transport Stream (TS)
+ *         packets) of the corresponding Program Map Table (PMT).
+ *         It also gives the location of the Network Information Table (NIT).
+ *
+ */
+
+#define PAT_LEN 8
+
+typedef struct {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char dummy                                  :1;        // has to be 0
+   u_char                                        :2;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :2;
+   u_char dummy                                  :1;        // has to be 0
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+} pat_t;
+
+#define PAT_PROG_LEN 4
+
+typedef struct {
+   u_char program_number_hi                      :8;
+   u_char program_number_lo                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :3;
+   u_char network_pid_hi                         :5;
+#else
+   u_char network_pid_hi                         :5;
+   u_char                                        :3;
+#endif
+   u_char network_pid_lo                         :8; 
+   /* or program_map_pid (if prog_num=0)*/
+} pat_prog_t;
+
+/*
+ *
+ *    2) Conditional Access Table (CAT):
+ *
+ *       - the CAT provides information on the CA systems used in the
+ *         multiplex; the information is private and dependent on the CA
+ *         system, but includes the location of the EMM stream, when
+ *         applicable.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    3) Program Map Table (PMT):
+ *
+ *       - the PMT identifies and indicates the locations of the streams that
+ *         make up each service, and the location of the Program Clock
+ *         Reference fields for a service.
+ *
+ */
+
+#define PMT_LEN 12
+
+typedef struct {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char dummy                                  :1; // has to be 0
+   u_char                                        :2;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :2;
+   u_char dummy                                  :1; // has to be 0
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char program_number_hi                      :8;
+   u_char program_number_lo                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :3;
+   u_char PCR_PID_hi                             :5;
+#else
+   u_char PCR_PID_hi                             :5;
+   u_char                                        :3;
+#endif
+   u_char PCR_PID_lo                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char program_info_length_hi                 :4;
+#else
+   u_char program_info_length_hi                 :4;
+   u_char                                        :4;
+#endif
+   u_char program_info_length_lo                 :8;
+   //descriptors
+} pmt_t;
+
+#define PMT_INFO_LEN 5
+
+typedef struct {
+   u_char stream_type                            :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :3;
+   u_char elementary_PID_hi                      :5;
+#else
+   u_char elementary_PID_hi                      :5;
+   u_char                                        :3;
+#endif
+   u_char elementary_PID_lo                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char ES_info_length_hi                      :4;
+#else
+   u_char ES_info_length_hi                      :4;
+   u_char                                        :4;
+#endif
+   u_char ES_info_length_lo                      :8;
+   // descriptors
+} pmt_info_t;
+
+/*
+ *
+ *    4) Network Information Table (NIT):
+ *
+ *       - the NIT is intended to provide information about the physical
+ *         network. The syntax and semantics of the NIT are defined in
+ *         ETSI EN 300 468.
+ *
+ */
+
+#define NIT_LEN 10 
+
+typedef struct { 
+   u_char table_id                               :8; 
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1; 
+   u_char                                        :3; 
+   u_char section_length_hi                      :4; 
+#else 
+   u_char section_length_hi                      :4; 
+   u_char                                        :3; 
+   u_char section_syntax_indicator               :1; 
+#endif
+   u_char section_length_lo                      :8; 
+   u_char network_id_hi                          :8; 
+   u_char network_id_lo                          :8; 
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2; 
+   u_char version_number                         :5; 
+   u_char current_next_indicator                 :1; 
+#else
+   u_char current_next_indicator                 :1; 
+   u_char version_number                         :5; 
+   u_char                                        :2; 
+#endif
+   u_char section_number                         :8; 
+   u_char last_section_number                    :8; 
+#if BYTE_ORDER == BIG_ENDIAN 
+   u_char                                        :4; 
+   u_char network_descriptor_length_hi           :4; 
+#else
+   u_char network_descriptor_length_hi           :4; 
+   u_char                                        :4; 
+#endif
+   u_char network_descriptor_length_lo           :8; 
+  /* descriptors */
+} nit_t; 
+ 
+#define SIZE_NIT_MID 2 
+
+typedef struct {                                 // after descriptors 
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4; 
+   u_char transport_stream_loop_length_hi        :4; 
+#else
+   u_char transport_stream_loop_length_hi        :4; 
+   u_char                                        :4; 
+#endif
+   u_char transport_stream_loop_length_lo        :8; 
+} nit_mid_t; 
+ 
+#define SIZE_NIT_END 4 
+
+struct nit_end_struct { 
+   long CRC; 
+}; 
+ 
+#define NIT_TS_LEN 6 
+
+typedef struct { 
+   u_char transport_stream_id_hi                 :8; 
+   u_char transport_stream_id_lo                 :8; 
+   u_char original_network_id_hi                 :8; 
+   u_char original_network_id_lo                 :8; 
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4; 
+   u_char transport_descriptors_length_hi        :4; 
+#else  
+   u_char transport_descriptors_length_hi        :4; 
+   u_char                                        :4; 
+#endif
+   u_char transport_descriptors_length_lo        :8; 
+   /* descriptors  */
+} nit_ts_t;
+
+/*
+ *
+ *    In addition to the PSI, data is needed to provide identification of
+ *    services and events for the user. In contrast with the PAT, CAT, and
+ *    PMT of the PSI, which give information only for the multiplex in which
+ *    they are contained (the actual multiplex), the additional information
+ *    defined within the present document can also provide information on
+ *    services and events carried by different multiplexes, and even on other
+ *    networks. This data is structured as nine tables:
+ *
+ *    1) Bouquet Association Table (BAT):
+ *
+ *       - the BAT provides information regarding bouquets. As well as giving
+ *         the name of the bouquet, it provides a list of services for each
+ *         bouquet.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    2) Service Description Table (SDT):
+ *
+ *       - the SDT contains data describing the services in the system e.g.
+ *         names of services, the service provider, etc.
+ *
+ */
+
+#define SDT_LEN 11
+
+typedef struct {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
+   u_char                                        :8;
+} sdt_t;
+
+#define SDT_DESCR_LEN 5
+
+typedef struct {
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :6;
+   u_char eit_schedule_flag                      :1;
+   u_char eit_present_following_flag             :1;
+   u_char running_status                         :3;
+   u_char free_ca_mode                           :1;
+   u_char descriptors_loop_length_hi             :4;
+#else
+   u_char eit_present_following_flag             :1;
+   u_char eit_schedule_flag                      :1;
+   u_char                                        :6;
+   u_char descriptors_loop_length_hi             :4;
+   u_char free_ca_mode                           :1;
+   u_char running_status                         :3;
+#endif
+   u_char descriptors_loop_length_lo             :8;
+} sdt_descr_t;
+
+/*
+ *
+ *    3) Event Information Table (EIT):
+ * 
+ *       - the EIT contains data concerning events or programmes such as event
+ *         name, start time, duration, etc.; - the use of different descriptors
+ *         allows the transmission of different kinds of event information e.g.
+ *         for different service types.
+ *
+ */
+
+#define EIT_LEN 14
+
+typedef struct {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
+   u_char segment_last_section_number            :8;
+   u_char segment_last_table_id                  :8;
+} eit_t;
+
+#define EIT_EVENT_LEN 12
+
+typedef struct {
+   u_char event_id_hi                            :8;
+   u_char event_id_lo                            :8;
+   u_char mjd_hi                                 :8;
+   u_char mjd_lo                                 :8;
+   u_char start_time_h                           :8;
+   u_char start_time_m                           :8;
+   u_char start_time_s                           :8;
+   u_char duration_h                             :8;
+   u_char duration_m                             :8;
+   u_char duration_s                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char running_status                         :3;
+   u_char free_ca_mode                           :1;
+   u_char descriptors_loop_length_hi             :4;
+#else
+   u_char descriptors_loop_length_hi             :4;
+   u_char free_ca_mode                           :1;
+   u_char running_status                         :3;
+#endif
+   u_char descriptors_loop_length_lo             :8;
+} eit_event_t;
+
+/*
+ *
+ *    4) Running Status Table (RST):
+ *
+ *       - the RST gives the status of an event (running/not running). The RST
+ *         updates this information and allows timely automatic switching to
+ *         events.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    5) Time and Date Table (TDT):
+ *
+ *       - the TDT gives information relating to the present time and date.
+ *         This information is given in a separate table due to the frequent
+ *         updating of this information.
+ *
+ */
+
+#define TDT_LEN 8
+
+typedef struct {
+   u_char table_id                               :8; 
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char utc_mjd_hi                             :8;
+   u_char utc_mjd_lo                             :8;
+   u_char utc_time_h                             :8;
+   u_char utc_time_m                             :8;
+   u_char utc_time_s                             :8;
+} tdt_t;
+
+/*
+ *
+ *    6) Time Offset Table (TOT):
+ *
+ *       - the TOT gives information relating to the present time and date and
+ *         local time offset. This information is given in a separate table due
+ *         to the frequent updating of the time information.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    7) Stuffing Table (ST):
+ *
+ *       - the ST is used to invalidate existing sections, for example at
+ *         delivery system boundaries.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    8) Selection Information Table (SIT):
+ *
+ *       - the SIT is used only in "partial" (i.e. recorded) bitstreams. It
+ *         carries a summary of the SI information required to describe the
+ *         streams in the partial bitstream.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    9) Discontinuity Information Table (DIT):
+ *
+ *       - the DIT is used only in "partial" (i.e. recorded) bitstreams.
+ *         It is inserted where the SI information in the partial bitstream may
+ *         be discontinuous. Where applicable the use of descriptors allows a
+ *         flexible approach to the organization of the tables and allows for
+ *         future compatible extensions.
+ *
+ */
+    /* TO BE DONE */
+/*
+ *
+ *    The following describes the different descriptors that can be used within
+ *    the SI.
+ *
+ *    The following semantics apply to all the descriptors defined in this
+ *    subclause:
+ *
+ *    descriptor_tag: The descriptor tag is an 8-bit field which identifies
+ *                    each descriptor. Those values with MPEG-2 normative
+ *                    meaning are described in ISO/IEC 13818-1. The values of
+ *                    descriptor_tag are defined in 'libsi.h'
+ *    descriptor_length: The descriptor length is an 8-bit field specifying the
+ *                       total number of bytes of the data portion of the
+ *                       descriptor following the byte defining the value of
+ *                       this field.
+ *
+ */
+
+#define DESCR_GEN_LEN 2
+typedef struct descr_gen_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+} descr_gen_t;
+#define CastGenericDescriptor(x) ((descr_gen_t *)(x))
+
+#define GetDescriptorTag(x) (((descr_gen_t *) x)->descriptor_tag)
+#define GetDescriptorLength(x) (((descr_gen_t *) x)->descriptor_length+DESCR_GEN_LEN)
+
+
+/* 0x0A iso_639_language_descriptor */
+
+#define DESCR_ISO_639_LANGUAGE_LEN 5
+typedef struct descr_iso_639_language_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+} descr_iso_639_language_t;
+#define CastIso639LanguageDescriptor(x) ((descr_iso_639_language_t *)(x))
+
+
+/* 0x40 network_name_descriptor */
+
+#define DESCR_NETWORK_NAME_LEN XX
+typedef struct descr_network_name_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_network_name_t;
+#define CastNetworkNameDescriptor(x) ((descr_network_name_t *)(x))
+
+
+/* 0x41 service_list_descriptor */
+
+#define DESCR_SERVICE_LIST_LEN XX
+typedef struct descr_service_list_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_service_list_t;
+#define CastServiceListDescriptor(x) ((descr_service_list_t *)(x))
+
+
+/* 0x42 stuffing_descriptor */
+
+#define DESCR_STUFFING_LEN XX
+typedef struct descr_stuffing_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_stuffing_t;
+#define CastStuffingDescriptor(x) ((descr_stuffing_t *)(x))
+
+
+/* 0x43 satellite_delivery_system_descriptor */
+
+#define DESCR_SATELLITE_DELIVERY_SYSTEM_LEN 13
+typedef struct descr_satellite_delivery_system_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char frequency1                             :8;
+   u_char frequency2                             :8;
+   u_char frequency3                             :8;
+   u_char frequency4                             :8;
+   u_char orbital_position1                      :8;
+   u_char orbital_position2                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char modulation                             :5;
+   u_char polarization                           :2;
+   u_char west_east_flag                         :1;
+#else
+   u_char west_east_flag                         :1;
+   u_char polarization                           :2;
+   u_char modulation                             :5;
+#endif
+   u_char symbol_rate1                           :8;
+   u_char symbol_rate2                           :8;
+   u_char symbol_rate3                           :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char symbol_rate4                           :4;
+   u_char fec_inner                              :4;
+#else
+   u_char fec_inner                              :4;
+   u_char symbol_rate4                           :4;
+#endif
+} descr_satellite_delivery_system_t;
+#define CastSatelliteDeliverySystemDescriptor(x) ((descr_satellite_delivery_system_t *)(x))
+
+
+/* 0x44 cable_delivery_system_descriptor */
+
+#define DESCR_CABLE_DELIVERY_SYSTEM_LEN 13
+typedef struct descr_cable_delivery_system_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char frequency1                             :8;
+   u_char frequency2                             :8;
+   u_char frequency3                             :8;
+   u_char frequency4                             :8;
+   u_char reserved1                              :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char reserved2                              :4;
+   u_char fec_outer                              :4;
+#else
+   u_char fec_outer                              :4;
+   u_char reserved2                              :4;
+#endif
+   u_char modulation                             :8;
+   u_char symbol_rate1                           :8;
+   u_char symbol_rate2                           :8;
+   u_char symbol_rate3                           :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char symbol_rate4                           :4;
+   u_char fec_inner                              :4;
+#else
+   u_char fec_inner                              :4;
+   u_char symbol_rate4                           :4;
+#endif
+} descr_cable_delivery_system_t;
+#define CastCableDeliverySystemDescriptor(x) ((descr_cable_delivery_system_t *)(x))
+
+
+/* 0x45 vbi_data_descriptor */
+
+#define DESCR_VBI_DATA_LEN XX
+typedef struct descr_vbi_data_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_vbi_data_t;
+#define CastVbiDataDescriptor(x) ((descr_vbi_data_t *)(x))
+
+
+/* 0x46 vbi_teletext_descriptor */
+
+#define DESCR_VBI_TELETEXT_LEN XX
+typedef struct descr_vbi_teletext_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_vbi_teletext_t;
+#define CastVbiDescriptor(x) ((descr_vbi_teletext_t *)(x))
+
+
+/* 0x47 bouquet_name_descriptor */
+
+#define DESCR_BOUQUET_NAME_LEN 2
+typedef struct descr_bouquet_name_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+} descr_bouquet_name_t;
+#define CastBouquetNameDescriptor(x) ((descr_bouquet_name_t *)(x))
+
+
+/* 0x48 service_descriptor */
+
+#define DESCR_SERVICE_LEN  4
+typedef struct descr_service_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char service_type                           :8;
+   u_char provider_name_length                   :8;
+} descr_service_t;
+#define CastServiceDescriptor(x) ((descr_service_t *)(x))
+
+
+/* 0x49 country_availability_descriptor */
+
+#define DESCR_COUNTRY_AVAILABILITY_LEN 3
+typedef struct descr_country_availability_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char country_availability_flag              :1;
+   u_char reserved                               :7;
+#else
+   u_char reserved                               :7;
+   u_char country_availability_flag              :1;
+#endif
+} descr_country_availability_t;
+#define CastCountryAvailabilityDescriptor(x) ((descr_country_availability_t *)(x))
+
+
+/* 0x4A linkage_descriptor */
+
+#define DESCR_LINKAGE_LEN 9
+typedef struct descr_linkage_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8; 
+   u_char original_network_id_lo                 :8; 
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+   u_char linkage_type                           :8;
+} descr_linkage_t;
+#define CastLinkageDescriptor(x) ((descr_linkage_t *)(x))
+
+
+/* 0x4B nvod_reference_descriptor */
+
+#define DESCR_NVOD_REFERENCE_LEN 2
+typedef struct descr_nvod_reference_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+} descr_nvod_reference_t;
+#define CastNvodReferenceDescriptor(x) ((descr_nvod_reference_t *)(x))
+
+#define ITEM_NVOD_REFERENCE_LEN 6
+typedef struct item_nvod_reference_struct {
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8; 
+   u_char original_network_id_lo                 :8; 
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+} item_nvod_reference_t;
+#define CastNvodReferenceItem(x) ((item_nvod_reference_t *)(x))
+
+
+
+/* 0x4C time_shifted_service_descriptor */
+
+#define DESCR_TIME_SHIFTED_SERVICE_LEN 4
+typedef struct descr_time_shifted_service_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char reference_service_id_hi                :8;
+   u_char reference_service_id_lo                :8;
+} descr_time_shifted_service_t;
+#define CastTimeShiftedServiceDescriptor(x) ((descr_time_shifted_service_t *)(x))
+
+
+/* 0x4D short_event_descriptor */
+
+#define DESCR_SHORT_EVENT_LEN 6
+typedef struct descr_short_event_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+   u_char event_name_length                      :8;
+} descr_short_event_t;
+#define CastShortEventDescriptor(x) ((descr_short_event_t *)(x))
+
+
+/* 0x4E extended_event_descriptor */
+
+#define DESCR_EXTENDED_EVENT_LEN 7
+typedef struct descr_extended_event_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char descriptor_number                      :4;
+   u_char last_descriptor_number                 :4;
+#else
+   u_char last_descriptor_number                 :4;
+   u_char descriptor_number                      :4;
+#endif
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+   u_char length_of_items                        :8;
+} descr_extended_event_t;
+#define CastExtendedEventDescriptor(x) ((descr_extended_event_t *)(x))
+
+#define ITEM_EXTENDED_EVENT_LEN 1
+typedef struct item_extended_event_struct {
+   u_char item_description_length               :8;
+} item_extended_event_t;
+#define CastExtendedEventItem(x) ((item_extended_event_t *)(x))
+
+
+/* 0x4F time_shifted_event_descriptor */
+
+#define DESCR_TIME_SHIFTED_EVENT_LEN 6
+typedef struct descr_time_shifted_event_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char reference_service_id_hi                :8;
+   u_char reference_service_id_lo                :8;
+   u_char reference_event_id_hi                  :8;
+   u_char reference_event_id_lo                  :8;
+} descr_time_shifted_event_t;
+#define CastTimeShiftedEventDescriptor(x) ((descr_time_shifted_event_t *)(x))
+
+
+/* 0x50 component_descriptor */
+
+#define DESCR_COMPONENT_LEN  8
+typedef struct descr_component_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char reserved                               :4;
+   u_char stream_content                         :4;
+#else
+   u_char stream_content                         :4;
+   u_char reserved                               :4;
+#endif
+   u_char component_type                         :8;
+   u_char component_tag                          :8;
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+} descr_component_t;
+#define CastComponentDescriptor(x) ((descr_component_t *)(x))
+
+
+/* 0x51 mosaic_descriptor */
+
+#define DESCR_MOSAIC_LEN XX
+typedef struct descr_mosaic_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_mosaic_t;
+#define CastMosaicDescriptor(x) ((descr_mosaic_t *)(x))
+
+
+/* 0x52 stream_identifier_descriptor */
+
+#define DESCR_STREAM_IDENTIFIER_LEN 3
+typedef struct descr_stream_identifier_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char component_tag                          :8;
+} descr_stream_identifier_t;
+#define CastStreamIdentifierDescriptor(x) ((descr_stream_identifier_t *)(x))
+
+
+/* 0x53 ca_identifier_descriptor */
+
+#define DESCR_CA_IDENTIFIER_LEN 2
+typedef struct descr_ca_identifier_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+} descr_ca_identifier_t;
+#define CastCaIdentifierDescriptor(x) ((descr_ca_identifier_t *)(x))
+
+
+/* 0x54 content_descriptor */
+
+#define DESCR_CONTENT_LEN 2
+typedef struct descr_content_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+} descr_content_t;
+#define CastContentDescriptor(x) ((descr_content_t *)(x))
+
+typedef struct nibble_content_struct {
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char content_nibble_level_1                 :4;
+   u_char content_nibble_level_2                 :4;
+   u_char user_nibble_1                          :4;
+   u_char user_nibble_2                          :4;
+#else
+   u_char user_nibble_2                          :4;
+   u_char user_nibble_1                          :4;
+   u_char content_nibble_level_2                 :4;
+   u_char content_nibble_level_1                 :4;
+#endif
+} nibble_content_t;
+#define CastContentNibble(x) ((nibble_content_t *)(x))
+
+
+/* 0x55 parental_rating_descriptor */
+
+#define DESCR_PARENTAL_RATING_LEN 2
+typedef struct descr_parental_rating_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+} descr_parental_rating_t;
+#define CastParentalRatingDescriptor(x) ((descr_parental_rating_t *)(x))
+
+#define PARENTAL_RATING_LEN 4
+typedef struct parental_rating_struct {
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+   u_char rating                                 :8;
+} parental_rating_t;
+#define CastParentalRating(x) ((parental_rating_t *)(x))
+
+
+/* 0x56 teletext_descriptor */
+
+#define DESCR_TELETEXT_LEN XX
+typedef struct descr_teletext_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_teletext_t;
+#define CastTeletextDescriptor(x) ((descr_teletext_t *)(x))
+
+
+/* 0x57 telephone_descriptor */
+
+#define DESCR_TELEPHONE_LEN XX
+typedef struct descr_telephone_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_telephone_t;
+#define CastTelephoneDescriptor(x) ((descr_telephone_t *)(x))
+
+
+/* 0x58 local_time_offset_descriptor */
+
+#define DESCR_LOCAL_TIME_OFFSET_LEN XX
+typedef struct descr_local_time_offset_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_local_time_offset_t;
+#define CastLocalTimeOffsetDescriptor(x) ((descr_local_time_offset_t *)(x))
+
+
+/* 0x59 subtitling_descriptor */
+
+#define DESCR_SUBTITLING_LEN XX
+typedef struct descr_subtitling_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_subtitling_t;
+#define CastSubtitlingDescriptor(x) ((descr_subtitling_t *)(x))
+
+
+/* 0x5A terrestrial_delivery_system_descriptor */
+
+#define DESCR_TERRESTRIAL_DELIVERY_SYSTEM_LEN XX
+typedef struct descr_terrestrial_delivery_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_terrestrial_delivery_system_t;
+#define CastTerrestrialDeliverySystemDescriptor(x) ((descr_terrestrial_delivery_system_t *)(x))
+
+
+/* 0x5B multilingual_network_name_descriptor */
+
+#define DESCR_MULTILINGUAL_NETWORK_NAME_LEN XX
+typedef struct descr_multilingual_network_name_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_multilingual_network_name_t;
+#define CastMultilingualNetworkNameDescriptor(x) ((descr_multilingual_network_name_t *)(x))
+
+
+/* 0x5C multilingual_bouquet_name_descriptor */
+
+#define DESCR_MULTILINGUAL_BOUQUET_NAME_LEN XX
+typedef struct descr_multilingual_bouquet_name_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_multilingual_bouquet_name_t;
+#define CastMultilingualBouquetNameDescriptor(x) ((descr_multilingual_bouquet_name_t *)(x))
+
+
+/* 0x5D multilingual_service_name_descriptor */
+
+#define DESCR_MULTILINGUAL_SERVICE_NAME_LEN XX
+typedef struct descr_multilingual_service_name_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_multilingual_service_name_t;
+#define CastMultilingualServiceNameDescriptor(x) ((descr_multilingual_service_name_t *)(x))
+
+
+/* 0x5E multilingual_component_descriptor */
+
+#define DESCR_MULTILINGUAL_COMPONENT_LEN XX
+typedef struct descr_multilingual_component_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_multilingual_component_t;
+#define CastMultilingualComponentDescriptor(x) ((descr_multilingual_component_t *)(x))
+
+
+/* 0x5F private_data_specifier_descriptor */
+
+#define DESCR_PRIVATE_DATA_SPECIFIER_LEN XX
+typedef struct descr_private_data_specifier_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_private_data_specifier_t;
+#define CastPrivateDataSpecifierDescriptor(x) ((descr_private_data_specifier_t *)(x))
+
+
+/* 0x60 service_move_descriptor */
+
+#define DESCR_SERVICE_MOVE_LEN XX
+typedef struct descr_service_move_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_service_move_t;
+#define CastServiceMoveDescriptor(x) ((descr_service_move_t *)(x))
+
+
+/* 0x61 short_smoothing_buffer_descriptor */
+
+#define DESCR_SHORT_SMOOTHING_BUFFER_LEN XX
+typedef struct descr_short_smoothing_buffer_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_short_smoothing_buffer_t;
+#define CastShortSmoothingBufferDescriptor(x) ((descr_short_smoothing_buffer_t *)(x))
+
+
+/* 0x62 frequency_list_descriptor */
+
+#define DESCR_FREQUENCY_LIST_LEN XX
+typedef struct descr_frequency_list_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_frequency_list_t;
+#define CastFrequencyListDescriptor(x) ((descr_frequency_list_t *)(x))
+
+
+/* 0x63 partial_transport_stream_descriptor */
+
+#define DESCR_PARTIAL_TRANSPORT_STREAM_LEN XX
+typedef struct descr_partial_transport_stream_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_partial_transport_stream_t;
+#define CastPartialDescriptor(x) ((descr_partial_transport_stream_t *)(x))
+
+
+/* 0x64 data_broadcast_descriptor */
+
+#define DESCR_DATA_BROADCAST_LEN XX
+typedef struct descr_data_broadcast_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_data_broadcast_t;
+#define CastDataBroadcastDescriptor(x) ((descr_data_broadcast_t *)(x))
+
+
+/* 0x65 ca_system_descriptor */
+
+#define DESCR_CA_SYSTEM_LEN XX
+typedef struct descr_ca_system_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_ca_system_t;
+#define CastCaSystemDescriptor(x) ((descr_ca_system_t *)(x))
+
+
+/* 0x66 data_broadcast_id_descriptor */
+
+#define DESCR_DATA_BROADCAST_ID_LEN XX
+typedef struct descr_data_broadcast_id_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_data_broadcast_id_t;
+#define CastDataBroadcastIdDescriptor(x) ((descr_data_broadcast_id_t *)(x))
+
+
+/* 0x67 transport_stream_descriptor */
+
+#define DESCR_TRANSPORT_STREAM_LEN XX
+typedef struct descr_transport_stream_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_transport_stream_t;
+#define CastTransportStreamDescriptor(x) ((descr_transport_stream_t *)(x))
+
+
+/* 0x68 dsng_descriptor */
+
+#define DESCR_DSNG_LEN XX
+typedef struct descr_dsng_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_dsng_t;
+#define CastDsngDescriptor(x) ((descr_dsng_t *)(x))
+
+
+/* 0x69 pdc_descriptor */
+
+#define DESCR_PDC_LEN XX
+typedef struct descr_pdc_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_pdc_t;
+#define CastPdcDescriptor(x) ((descr_pdc_t *)(x))
+
+
+/* 0x6A ac3_descriptor */
+
+#define DESCR_AC3_LEN XX
+typedef struct descr_ac3_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_ac3_t;
+#define CastAc3Descriptor(x) ((descr_ac3_t *)(x))
+
+
+/* 0x6B ancillary_data_descriptor */
+
+#define DESCR_ANCILLARY_DATA_LEN 3
+typedef struct descr_ancillary_data_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char ancillary_data_identifier              :8;
+} descr_ancillary_data_t;
+#define CastAncillaryDataDescriptor(x) ((descr_ancillary_data_t *)(x))
+
+
+/* 0x6C cell_list_descriptor */
+
+#define DESCR_CELL_LIST_LEN XX
+typedef struct descr_cell_list_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_cell_list_t;
+#define CastCellListDescriptor(x) ((descr_cell_list_t *)(x))
+
+
+/* 0x6D cell_frequency_link_descriptor */
+
+#define DESCR_CELL_FREQUENCY_LINK_LEN XX
+typedef struct descr_cell_frequency_link_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_cell_frequency_link_t;
+#define CastCellFrequencyLinkDescriptor(x) ((descr_cell_frequency_link_t *)(x))
+
+
+/* 0x6E announcement_support_descriptor */
+
+#define DESCR_ANNOUNCEMENT_SUPPORT_LEN XX
+typedef struct descr_announcement_support_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* TBD */
+} descr_announcement_support_t;
+#define CastAnnouncementSupportDescriptor(x) ((descr_announcement_support_t *)(x))
+
+#endif
diff --git a/libdtv/libsi/si_debug_services.c b/libdtv/libsi/si_debug_services.c
new file mode 100644
index 000000000..dd09cff8c
--- /dev/null
+++ b/libdtv/libsi/si_debug_services.c
@@ -0,0 +1,487 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// si_debug_services.c: debugging functions for libsi     ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/08/15 14:40:55 $
+// $Author: kls $
+//
+//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libsi is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libsi is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libsi; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include "../liblx/liblx.h"
+#include "libsi.h"
+#include "si_debug_services.h"
+
+
+
+
+void siDebugServices (struct LIST *Services)
+{
+   struct Service *Service;
+
+   if (!Services) return;
+
+   xForeach (Services, Service)
+   {
+      printf ("Service\n=======\n");
+      printf ("   ServiceID: %d\n", Service->ServiceID);
+      printf ("   TransportStreamID: %d\n", Service->TransportStreamID);
+      printf ("   OriginalNetworkID: %d\n", Service->OriginalNetworkID);
+      printf ("   SdtVersion: %d\n", Service->SdtVersion);
+      printf ("   Status: ");
+      if (GetScheduleFlag (Service->Status))
+         printf ("SCHEDULE_INFO ");
+      if (GetPresentFollowing(Service->Status))
+         printf ("PRESENT_FOLLOWING ");
+      switch (GetRunningStatus (Service->Status))
+      {
+         case RUNNING_STATUS_NOT_RUNNING:
+            printf ("RUNNING_STATUS_NOT_RUNNING\n");
+         break;
+
+         case RUNNING_STATUS_AWAITING:
+            printf ("RUNNING_STATUS_AWAITING\n");
+         break;
+
+         case RUNNING_STATUS_PAUSING:
+            printf ("RUNNING_STATUS_PAUSING\n");
+         break;
+
+         case RUNNING_STATUS_RUNNING:
+            printf ("RUNNING_STATUS_RUNNING\n");
+         break;
+      }
+      siDebugDescriptors ("   ", Service->Descriptors);
+      siDebugEvents ("   ", Service->Events);
+   }
+   return;
+}
+
+void siDebugService (struct Service *Service)
+{
+   if (!Service) return;
+
+   printf ("Service\r\n=======\r\n");
+   printf ("   ServiceID: %d\r\n", Service->ServiceID);
+   printf ("   TransportStreamID: %d\r\n", Service->TransportStreamID);
+   printf ("   OriginalNetworkID: %d\r\n", Service->OriginalNetworkID);
+   printf ("   SdtVersion: %d\r\n", Service->SdtVersion);
+   printf ("   Status: ");
+   if (GetScheduleFlag (Service->Status))
+      printf ("SCHEDULE_INFO ");
+   if (GetPresentFollowing(Service->Status))
+      printf ("PRESENT_FOLLOWING ");
+   switch (GetRunningStatus (Service->Status))
+   {
+      case RUNNING_STATUS_NOT_RUNNING:
+         printf ("RUNNING_STATUS_NOT_RUNNING\r\n");
+      break;
+
+      case RUNNING_STATUS_AWAITING:
+         printf ("RUNNING_STATUS_AWAITING\r\n");
+      break;
+
+      case RUNNING_STATUS_PAUSING:
+         printf ("RUNNING_STATUS_PAUSING\r\n");
+      break;
+
+      case RUNNING_STATUS_RUNNING:
+         printf ("RUNNING_STATUS_RUNNING\r\n");
+      break;
+   }
+   siDebugDescriptors ("\r   ", Service->Descriptors);
+   siDebugEvents ("\r   ", Service->Events);
+
+   return;
+}
+
+void siDebugEvents (char *Prepend, struct LIST *EventList)
+{
+   struct Event *Event;
+   char          NewPrepend[32];
+
+   if (!EventList) return;
+
+   xForeach (EventList, Event)
+   {
+      printf ("%sEvent\n%s=====\n", Prepend, Prepend);
+      printf ("%s   EventID: %d\n", Prepend, Event->EventID);
+      printf ("%s   ServiceID: %d\n", Prepend, Event->ServiceID);
+      printf ("%s   TransportStreamID: %d\n", Prepend, Event->TransportStreamID);
+      printf ("%s   OriginalNetworkID: %d\n", Prepend, Event->OriginalNetworkID);
+      printf ("%s   EitVersion: %d\n", Prepend, Event->EitVersion);
+      printf ("%s   StartTime: %s", Prepend, ctime (&Event->StartTime));
+      printf ("%s   Duration: %d Minuten\n", Prepend, Event->Duration/60);
+      printf ("%s   Status: ");
+      switch (GetRunningStatus (Event->Status))
+      {
+         case RUNNING_STATUS_NOT_RUNNING:
+            printf ("RUNNING_STATUS_NOT_RUNNING\n");
+         break;
+
+         case RUNNING_STATUS_AWAITING:
+            printf ("RUNNING_STATUS_AWAITING\n");
+         break;
+
+         case RUNNING_STATUS_PAUSING:
+            printf ("RUNNING_STATUS_PAUSING\n");
+         break;
+
+         case RUNNING_STATUS_RUNNING:
+            printf ("RUNNING_STATUS_RUNNING\n");
+         break;
+      }
+      sprintf (NewPrepend, "%s   ", Prepend);
+      siDebugDescriptors (NewPrepend, Event->Descriptors);
+   }
+   return;
+}
+
+
+void siDebugPrograms (char *Prepend, struct LIST *ProgramList)
+{
+   struct Program *Program;
+   char            NewPrepend[32];
+
+   if (!ProgramList) return;
+
+   xForeach (ProgramList, Program)
+   {
+      printf ("%sProgram\n%s=======\n", Prepend, Prepend);
+      printf ("%s   ProgramID: %d\n", Prepend, Program->ProgramID);
+      printf ("%s   TransportStreamID: %d\n", Prepend, Program->TransportStreamID);
+      printf ("%s   NetworkPID: %d\n", Prepend, Program->NetworkPID);
+      printf ("%s   PatVersion: %d\n", Prepend, Program->PatVersion);
+
+      sprintf (NewPrepend, "%s   ", Prepend);
+      siDebugPids (NewPrepend, Program->Pids);
+   }
+   return;
+}
+
+void siDebugProgram (struct Program *Program)
+{
+   if (!Program) return;
+
+   printf ("Program\r\n=======\r\n");
+   printf ("   ProgramID: %d\r\n", Program->ProgramID);
+   printf ("   TransportStreamID: %d\r\n", Program->TransportStreamID);
+   printf ("   NetworkPID: %d\r\n", Program->NetworkPID);
+   printf ("   PatVersion: %d\r\n", Program->PatVersion);
+
+   siDebugPids ("\r   ", Program->Pids);
+
+   return;
+}
+
+void siDebugPids (char *Prepend, struct LIST *PidList)
+{
+   struct Pid         *Pid;
+   struct PidInfo     *PidInfo;
+   char                NewPrepend[32];
+   int                 index;
+
+   if (!PidList) return;
+
+   xForeach (PidList, Pid)
+   {
+      printf ("%sPid\n%s===\n", Prepend, Prepend);
+      printf ("%s   ProgramID: %d\n", Prepend, Pid->ProgramID);
+      printf ("%s   PcrPid: %d\n", Prepend, Pid->PcrPID);
+      printf ("%s   PmtVersion: %d\n", Prepend, Pid->PmtVersion);
+
+      xForeach (Pid->InfoList, PidInfo)
+      {
+         printf ("%s   PidInfo\n%s   =======\n", Prepend, Prepend);
+         index = PidInfo->StreamType;
+         if (index > 0x0F && index <= 0x7F) index = 0x0E;
+         if (index >= 0x80) index = 0x0F;
+         printf ("%s      StreamType: %s\n", Prepend, StreamTypes[index]);
+         printf ("%s      ElementaryPid: %d\n", Prepend, PidInfo->ElementaryPid);
+
+         sprintf (NewPrepend, "%s         ", Prepend);
+         siDebugDescriptors (NewPrepend, PidInfo->Descriptors);
+      }
+   }
+   return;
+}
+
+
+void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
+{
+   struct Descriptor *Descriptor;
+   int i;
+
+   xForeach (Descriptors, Descriptor)
+   {
+      switch (DescriptorTag (Descriptor))
+      {
+         case DESCR_ANCILLARY_DATA:
+            printf ("%sDescriptor: Ancillary Data\n", Prepend);
+            printf ("%s   Identifier: ", Prepend);
+            if (((struct AncillaryDataDescriptor *)Descriptor)->
+                   Identifier & ANCILLARY_DATA_DVD_VIDEO)
+               printf ("DVD-Video Ancillary Data ");
+            if (((struct AncillaryDataDescriptor *)Descriptor)->
+                   Identifier & ANCILLARY_DATA_EXTENDED)
+               printf ("Extended Ancillary Data ");
+            if (((struct AncillaryDataDescriptor *)Descriptor)->
+                   Identifier & ANCILLARY_DATA_SWITCHING)
+               printf ("Announcement Switching Data ");
+            if (((struct AncillaryDataDescriptor *)Descriptor)->
+                   Identifier & ANCILLARY_DATA_DAB)
+               printf ("DAB Ancillary Data ");
+            if (((struct AncillaryDataDescriptor *)Descriptor)->
+                   Identifier & ANCILLARY_DATA_SCALE_FACTOR)
+               printf ("Scale Factor Error Check (ScF-CRC) ");
+            printf ("\n");
+         break;
+
+         case DESCR_BOUQUET_NAME:
+            printf ("%sDescriptor: Bouquet Name\n", Prepend);
+            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
+         break;
+
+         case DESCR_COMPONENT:
+            printf ("%sDescriptor: Component\n", Prepend);
+            printf ("%s   Text: %s\n", Prepend, xName (Descriptor));
+            printf ("%s   Content/Type: ", Prepend);
+            for (i = 0; i < COMPONENT_TYPE_NUMBER; i++)
+               if ((((struct ComponentDescriptor *)Descriptor)->
+                        StreamContent == ComponentTypes[i].Content) &&
+                   (((struct ComponentDescriptor *)Descriptor)->
+                        ComponentType == ComponentTypes[i].Type))
+               { printf ("%s\n", ComponentTypes[i].Description); break; }
+            if (i == COMPONENT_TYPE_NUMBER) { printf ("unbekannt\n"); }
+            printf ("%s   ComponentTag: 0x%02x\n", Prepend,
+               ((struct ComponentDescriptor *)Descriptor)->ComponentTag);
+            printf ("%s   LanguageCode: %s\n", Prepend,
+               ((struct ComponentDescriptor *)Descriptor)->LanguageCode);
+         break;
+
+         case DESCR_SERVICE:
+            printf ("%sDescriptor: Service\n", Prepend);
+            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
+            printf ("%s   ServiceType: ", Prepend);
+            for (i = 0; i < SERVICE_TYPE_NUMBER; i++)
+               if ((((struct ServiceDescriptor *)Descriptor)->
+                        ServiceType == ServiceTypes[i].Type))
+               { printf ("%s\n", ServiceTypes[i].Description); break; }
+            if (i == SERVICE_TYPE_NUMBER) { printf ("unbekannt\n"); }
+            printf ("%s   ServiceProvider: %s\n", Prepend,
+               ((struct ServiceDescriptor *)Descriptor)->ServiceProvider);
+         break;
+
+         case DESCR_COUNTRY_AVAIL:
+            printf ("%sDescriptor: Country Availability\n", Prepend);
+            printf ("%s   Type: %s\n", Prepend, (((struct CountryAvailabilityDescriptor *)Descriptor)->
+                       AvailibilityFlag == COUNTRIES_ARE_AVAILABLE) ? "countries are available" :
+                       "countries are unavailable");
+            {
+               char *cptr = ((struct CountryAvailabilityDescriptor *)Descriptor)->CountryCodes; int j;
+               for (j = 0; j < ((struct CountryAvailabilityDescriptor *)Descriptor)->Amount; j++)
+                { printf ("%s   Country: %s\n", Prepend, cptr); cptr += 4; }
+            }
+         break;
+
+         case DESCR_SHORT_EVENT:
+            printf ("%sDescriptor: Short Event\n", Prepend);
+            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
+            printf ("%s   LanguageCode: %s\n", Prepend,
+               ((struct ShortEventDescriptor *)Descriptor)->LanguageCode);
+            printf ("%s   Text: %s\n", Prepend,
+               ((struct ShortEventDescriptor *)Descriptor)->Text);
+         break;
+
+         case DESCR_EXTENDED_EVENT:
+         {
+            struct ExtendedEventItem *Item;
+
+            printf ("%sDescriptor: Extended Event\n", Prepend);
+            printf ("%s   Text: %s\n", Prepend, xName (Descriptor));
+            printf ("%s   DescriptorNumber: %d\n", Prepend,
+               ((struct ExtendedEventDescriptor *)Descriptor)->DescriptorNumber);
+            printf ("%s   LastDescriptorNumber: %d\n", Prepend,
+               ((struct ExtendedEventDescriptor *)Descriptor)->LastDescriptorNumber);
+            printf ("%s   LanguageCode: %s\n", Prepend,
+               ((struct ExtendedEventDescriptor *)Descriptor)->LanguageCode);
+            xForeach (((struct ExtendedEventDescriptor *)Descriptor)->Items, Item)
+            {
+               printf ("%s   Item:\n");
+               printf ("%s      Description: %s\n", xName(Item));
+               printf ("%s      Text: %s\n", Item->Text);
+            }
+         }
+         break;
+
+         case DESCR_CA_IDENT:
+            printf ("%sDescriptor: Conditional Access Identity\n", Prepend);
+            {
+               int j;
+               for (j = 0; j < ((struct CaIdentifierDescriptor *)Descriptor)->Amount; j++)
+                  printf ("%s   SystemID: 0x%04x\n", Prepend, GetCaIdentifierID (Descriptor, j));
+            }
+         break;
+
+         case DESCR_CONTENT:
+            printf ("%sDescriptor: Content\n", Prepend);
+            {
+               int j;
+               for (j = 0; j < ((struct ContentDescriptor *)Descriptor)->Amount; j++)
+               {
+                  printf ("%s   Content: ", Prepend);
+                  for (i = 0; i < CONTENT_TYPE_NUMBER; i++)
+                     if ((GetContentContentNibble1(Descriptor, j) == ContentTypes[i].Nibble1) &&
+                         (GetContentContentNibble2(Descriptor, j) == ContentTypes[i].Nibble2))
+                     { printf ("%s\n", ContentTypes[i].Description); break; }
+                  if (i == CONTENT_TYPE_NUMBER) { printf ("unbekannt\n"); }
+                  printf ("%s   User-Nibble 1: 0x%1x\n", Prepend, GetContentUserNibble1(Descriptor, j));
+                  printf ("%s   User-Nibble 2: 0x%1x\n", Prepend, GetContentUserNibble2(Descriptor, j));
+               }
+            }
+         break;
+
+         case DESCR_PARENTAL_RATING:
+         {
+            struct ParentalRating *Rating;
+
+            printf ("%sDescriptor: Parental Rating\n", Prepend);
+            xForeach (((struct ParentalRatingDescriptor *)Descriptor)->Ratings, Rating)
+            {
+               printf ("%s   Rating:\n");
+               printf ("%s      LanguageCode: %s\n", Rating->LanguageCode);
+               printf ("%s      Rating: ");
+               if (Rating->Rating == 0) printf ("(undefined)\n");
+               else { if (Rating->Rating <= 0x10) printf ("minimum age is %d\n", Rating->Rating + 3);
+                      else printf ("(rating is provider defined)\n"); }
+            }
+         }
+         break;
+
+         case DESCR_NVOD_REF:
+         {
+            struct NvodReferenceItem *Item;
+
+            printf ("%sDescriptor: NVOD Reference\n", Prepend);
+            xForeach (((struct NvodReferenceDescriptor *)Descriptor)->Items, Item)
+            {
+               printf ("%s   Item:\n", Prepend);
+               printf ("%s      ServiceID: %d\n", Prepend, Item->ServiceID);
+               printf ("%s      TransportStreamID: %d\n", Prepend, Item->TransportStreamID);
+               printf ("%s      OriginalNetworkID: %d\n", Prepend, Item->OriginalNetworkID);
+            }
+         }
+         break;
+
+         case DESCR_TIME_SHIFTED_SERVICE:
+            printf ("%sDescriptor: Time Shifted Service\n", Prepend);
+            printf ("%s   ReferenceServiceID: %d\n", Prepend,
+                                      ((struct TimeShiftedServiceDescriptor *)
+                                         Descriptor)->ReferenceServiceID);
+         break;
+
+         case DESCR_TIME_SHIFTED_EVENT:
+            printf ("%sDescriptor: Time Shifted Event\n", Prepend);
+            printf ("%s   ReferenceServiceID: %d\n", Prepend,
+                                      ((struct TimeShiftedEventDescriptor *)
+                                         Descriptor)->ReferenceServiceID);
+            printf ("%s   ReferenceEventID: %d\n", Prepend,
+                                      ((struct TimeShiftedEventDescriptor *)
+                                         Descriptor)->ReferenceEventID);
+         break;
+
+         case DESCR_ISO_639_LANGUAGE:
+            printf ("%sDescriptor: ISO 639 Language\n", Prepend);
+            printf ("%s   LanguageCode: %s\n", Prepend,
+               ((struct Iso639LanguageDescriptor *)Descriptor)->LanguageCode);
+         break;
+
+         case DESCR_STREAM_ID:
+            printf ("%sDescriptor: Stream Identifier\n", Prepend);
+            printf ("%s   ComponentTag: %d\n", Prepend,
+               ((struct StreamIdentifierDescriptor *)Descriptor)->ComponentTag);
+         break;
+
+         case DESCR_LINKAGE:
+            printf ("%sDescriptor: Linkage\n", Prepend);
+            printf ("%s   TransportStreamID: %d\n", Prepend,
+               ((struct LinkageDescriptor *)Descriptor)->TransportStreamID);
+            printf ("%s   OriginalNetworkID: %d\n", Prepend,
+               ((struct LinkageDescriptor *)Descriptor)->OriginalNetworkID);
+            printf ("%s   ServiceID: %d\n", Prepend,
+               ((struct LinkageDescriptor *)Descriptor)->ServiceID);
+            printf ("%s   LinkageType: %d\n", Prepend,
+               ((struct LinkageDescriptor *)Descriptor)->LinkageType);
+            if (((struct LinkageDescriptor *)Descriptor)->PrivateDataLength)
+            {
+               int j;
+               printf ("%s   PrivateData: ", Prepend);
+               for (j = 0; j < ((struct LinkageDescriptor *)
+                        Descriptor)->PrivateDataLength; j++)
+                  printf ("0x%02X ", ((struct LinkageDescriptor *)
+                        Descriptor)->PrivateData[j]);
+               printf ("\n");
+            }
+         break;
+
+         case DESCR_NW_NAME:
+         case DESCR_SERVICE_LIST:
+         case DESCR_STUFFING:
+         case DESCR_SAT_DEL_SYS:
+         case DESCR_CABLE_DEL_SYS:
+         case DESCR_VBI_DATA:
+         case DESCR_VBI_TELETEXT:
+         case DESCR_MOSAIC:
+         case DESCR_TELETEXT:
+         case DESCR_TELEPHONE:
+         case DESCR_LOCAL_TIME_OFF:
+         case DESCR_SUBTITLING:
+         case DESCR_TERR_DEL_SYS:
+         case DESCR_ML_NW_NAME:
+         case DESCR_ML_BQ_NAME:
+         case DESCR_ML_SERVICE_NAME:
+         case DESCR_ML_COMPONENT:
+         case DESCR_PRIV_DATA_SPEC:
+         case DESCR_SERVICE_MOVE:
+         case DESCR_SHORT_SMOOTH_BUF:
+         case DESCR_FREQUENCY_LIST:
+         case DESCR_PARTIAL_TP_STREAM:
+         case DESCR_DATA_BROADCAST:
+         case DESCR_CA_SYSTEM:
+         case DESCR_DATA_BROADCAST_ID:
+         case DESCR_TRANSPORT_STREAM:
+         case DESCR_DSNG:
+         case DESCR_PDC:
+         case DESCR_AC3:
+         case DESCR_CELL_LIST:
+         case DESCR_CELL_FREQ_LINK:
+         case DESCR_ANNOUNCEMENT_SUPPORT:
+         default:
+            printf ("%sDescriptor: (noch nicht unterst�tzt)\n", Prepend);
+         break;
+      }
+   }
+   return;
+}
+
diff --git a/libdtv/libsi/si_debug_services.h b/libdtv/libsi/si_debug_services.h
new file mode 100644
index 000000000..33528dbbb
--- /dev/null
+++ b/libdtv/libsi/si_debug_services.h
@@ -0,0 +1,217 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// si_debug_services.h: local debugging definitions       ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/06/25 12:29:47 $
+// $Author: kls $
+//
+//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libsi is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libsi is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libsi; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+struct component_type {
+   u_char   Content;
+   u_char   Type;
+   char    *Description;
+};
+
+static struct component_type ComponentTypes[] = {
+   { 0x01, 0x01, "video, 4:3 aspect ratio, 25 Hz" },
+   { 0x01, 0x02, "video, 16:9 aspect ratio with pan vectors, 25 Hz" },
+   { 0x01, 0x03, "video, 16:9 aspect ratio without pan vectors, 25 Hz" },
+   { 0x01, 0x04, "video, > 16:9 aspect ratio, 25 Hz" },
+   { 0x01, 0x05, "video, 4:3 aspect ratio, 30 Hz" },
+   { 0x01, 0x06, "video, 16:9 aspect ratio with pan vectors, 30 Hz" },
+   { 0x01, 0x07, "video, 16:9 aspect ratio without pan vectors, 30 Hz" },
+   { 0x01, 0x08, "video, > 16:9 aspect ratio, 30 Hz" },
+   { 0x01, 0x09, "HD video, 4:3 aspect ratio, 25 Hz" },
+   { 0x01, 0x0A, "HD video, 16:9 aspect ratio with pan vectors, 25 Hz" },
+   { 0x01, 0x0B, "HD video, 16:9 aspect ratio without pan vectors, 25 Hz" },
+   { 0x01, 0x0C, "HD video, > 16:9 aspect ratio, 25 Hz" },
+   { 0x01, 0x0D, "HD video, 4:3 aspect ratio, 30 Hz" },
+   { 0x01, 0x0E, "HD video, 16:9 aspect ratio with pan vectors, 30 Hz" },
+   { 0x01, 0x0F, "HD video, 16:9 aspect ratio without pan vectors, 30 Hz" },
+   { 0x01, 0x10, "HD video, > 16:9 aspect ratio, 30 Hz" },
+   { 0x02, 0x01, "audio, single mono channel" },
+   { 0x02, 0x02, "audio, dual mono channel" },
+   { 0x02, 0x03, "audio, stereo (2 channel)" },
+   { 0x02, 0x04, "audio, multi lingual, multi channel" },
+   { 0x02, 0x05, "audio, surround sound" },
+   { 0x02, 0x40, "audio description for the visually impaired" },
+   { 0x02, 0x41, "audio for the hard of hearing" },
+   { 0x03, 0x01, "EBU Teletext subtitles" },
+   { 0x03, 0x02, "associated EBU Teletext" },
+   { 0x03, 0x03, "VBI data" },
+   { 0x03, 0x10, "DVB subtitles (normal), no aspect criticality" },
+   { 0x03, 0x11, "DVB subtitles (normal), aspect 4:3 only" },
+   { 0x03, 0x12, "DVB subtitles (normal), aspect 16:9 only" },
+   { 0x03, 0x13, "DVB subtitles (normal), aspect 2.21:1 only" },
+   { 0x03, 0x20, "DVB subtitles (hard of hearing), no aspect criticality" },
+   { 0x03, 0x21, "DVB subtitles (hard of hearing), aspect 4:3 only" },
+   { 0x03, 0x22, "DVB subtitles (hard of hearing), aspect 16:9 only" },
+   { 0x03, 0x23, "DVB subtitles (hard of hearing), aspect 2.21:1 only" }
+};
+#define COMPONENT_TYPE_NUMBER 35
+
+
+struct service_type {
+   u_char   Type;
+   char    *Description;
+};
+
+static struct service_type ServiceTypes[] = {
+   { 0x01, "digital television service" },
+   { 0x02, "digital radio sound service" },
+   { 0x03, "Teletext service" },
+   { 0x04, "NVOD reference service" },
+   { 0x05, "NVOD time-shifted service" },
+   { 0x06, "mosaic service" },
+   { 0x07, "PAL coded signal" },
+   { 0x08, "SECAM coded signal" },
+   { 0x09, "D/D2-MAC" },
+   { 0x0A, "FM Radio" },
+   { 0x0B, "NTSC coded signal" },
+   { 0x0C, "data broadcast service" },
+   { 0x0D, "common interface data" },
+   { 0x0E, "RCS Map" },
+   { 0x0F, "RCS FLS" },
+   { 0x10, "DVB MHP service" }
+};
+#define SERVICE_TYPE_NUMBER 16
+
+
+struct content_type {
+   u_char   Nibble1;
+   u_char   Nibble2;
+   char    *Description;
+};
+
+static struct content_type ContentTypes[] = {
+   /*   Movie/Drama: */
+   { 0x01, 0x00, "movie/drama (general)" },
+   { 0x01, 0x01, "detective/thriller" },
+   { 0x01, 0x02, "adventure/western/war" },
+   { 0x01, 0x03, "science fiction/fantasy/horror" },
+   { 0x01, 0x04, "comedy" },
+   { 0x01, 0x05, "soap/melodrama/folkloric" },
+   { 0x01, 0x06, "romance" },
+   { 0x01, 0x07, "serious/classical/religious/historical movie/drama" },
+   { 0x01, 0x08, "adult movie/drama" },
+   /*   News/Current affairs: */
+   { 0x02, 0x00, "news/current affairs (general)" },
+   { 0x02, 0x01, "news/weather report" },
+   { 0x02, 0x02, "news magazine" },
+   { 0x02, 0x03, "documentary" },
+   { 0x02, 0x04, "discussion/interview/debate" },
+   /*   Show/Game show: */
+   { 0x03, 0x00, "show/game show (general)" },
+   { 0x03, 0x01, "game show/quiz/contest" },
+   { 0x03, 0x02, "variety show" },
+   { 0x03, 0x03, "talk show" },
+   /*   Sports: */
+   { 0x04, 0x00, "sports (general)" },
+   { 0x04, 0x01, "special events (Olympic Games, World Cup etc.)" },
+   { 0x04, 0x02, "sports magazines" },
+   { 0x04, 0x03, "football/soccer" },
+   { 0x04, 0x04, "tennis/squash" },
+   { 0x04, 0x05, "team sports (excluding football)" },
+   { 0x04, 0x06, "athletics" },
+   { 0x04, 0x07, "motor sport" },
+   { 0x04, 0x08, "water sport" },
+   { 0x04, 0x09, "winter sports" },
+   { 0x04, 0x0A, "equestrian" },
+   { 0x04, 0x0B, "martial sports" },
+   /*   Children's/Youth programmes: */
+   { 0x05, 0x00, "children's/youth programmes (general)" },
+   { 0x05, 0x01, "pre-school children's programmes" },
+   { 0x05, 0x02, "entertainment programmes for 6 to14" },
+   { 0x05, 0x03, "entertainment programmes for 10 to 16" },
+   { 0x05, 0x04, "informational/educational/school programmes" },
+   { 0x05, 0x05, "cartoons/puppets" },
+   /*   Music/Ballet/Dance: */
+   { 0x06, 0x00, "music/ballet/dance (general)" },
+   { 0x06, 0x01, "rock/pop" },
+   { 0x06, 0x02, "serious music/classical music" },
+   { 0x06, 0x03, "folk/traditional music" },
+   { 0x06, 0x04, "jazz" },
+   { 0x06, 0x05, "musical/opera" },
+   { 0x06, 0x06, "ballet" },
+   /*   Arts/Culture (without music): */
+   { 0x07, 0x00, "arts/culture (without music, general)" },
+   { 0x07, 0x01, "performing arts" },
+   { 0x07, 0x02, "fine arts" },
+   { 0x07, 0x03, "religion" },
+   { 0x07, 0x04, "popular culture/traditional arts" },
+   { 0x07, 0x05, "literature" },
+   { 0x07, 0x06, "film/cinema" },
+   { 0x07, 0x07, "experimental film/video" },
+   { 0x07, 0x08, "broadcasting/press" },
+   { 0x07, 0x09, "new media" },
+   { 0x07, 0x0A, "arts/culture magazines" },
+   { 0x07, 0x0B, "fashion" },
+   /*   Social/Political issues/Economics: */
+   { 0x08, 0x00, "social/political issues/economics (general)" },
+   { 0x08, 0x01, "magazines/reports/documentary" },
+   { 0x08, 0x02, "economics/social advisory" },
+   { 0x08, 0x03, "remarkable people" },
+   /*   Children's/Youth programmes: */
+   /*   Education/ Science/Factual topics: */
+   { 0x09, 0x00, "education/science/factual topics (general)" },
+   { 0x09, 0x01, "nature/animals/environment" },
+   { 0x09, 0x02, "technology/natural sciences" },
+   { 0x09, 0x03, "medicine/physiology/psychology" },
+   { 0x09, 0x04, "foreign countries/expeditions" },
+   { 0x09, 0x05, "social/spiritual sciences" },
+   { 0x09, 0x06, "further education" },
+   { 0x09, 0x07, "languages" },
+   /*   Leisure hobbies: */
+   { 0x0A, 0x00, "leisure hobbies (general)" },
+   { 0x0A, 0x01, "tourism/travel" },
+   { 0x0A, 0x02, "handicraft" },
+   { 0x0A, 0x03, "motoring" },
+   { 0x0A, 0x04, "fitness & health" },
+   { 0x0A, 0x05, "cooking" },
+   { 0x0A, 0x06, "advertisement/shopping" },
+   { 0x0A, 0x07, "gardening" },
+   { 0x0B, 0x00, "original language" },
+   { 0x0B, 0x01, "black & white" },
+   { 0x0B, 0x02, "unpublished" },
+   { 0x0B, 0x03, "live broadcast" }
+};
+#define CONTENT_TYPE_NUMBER 79
+
+static char StreamTypes[][70] = {
+   "ITU-T|ISO/IEC Reserved",
+   "ISO/IEC Video",
+   "13818-2 Video or 11172-2 constrained parameter video stream",
+   "ISO/IEC 11172 Audio",
+   "ISO/IEC 13818-3 Audio",
+   "private_sections",
+   "packets containing private data / Videotext",
+   "ISO/IEC 13522 MPEG",
+   "ITU-T Rec. H.222.1",
+   "ISO/IEC 13818-6 type A",
+   "ISO/IEC 13818-6 type B",
+   "ISO/IEC 13818-6 type C",
+   "ISO/IEC 13818-6 type D",
+   "ISO/IEC 13818-1 auxiliary",
+   "ITU-T Rec. H.222.0 | ISO 13818-1 Reserved",
+   "User private"
+};
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
new file mode 100644
index 000000000..acafa7b2e
--- /dev/null
+++ b/libdtv/libsi/si_parser.c
@@ -0,0 +1,881 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// si_parser.c: main parsing functions of libsi           ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/08/15 14:41:45 $
+// $Author: kls $
+//
+//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libsi is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libsi is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libsi; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#include <stdio.h>
+#include <math.h>
+#include <time.h>
+
+#include "../liblx/liblx.h"
+#include "libsi.h"
+#include "si_tables.h"
+
+
+
+struct LIST *siParsePAT (u_char *Buffer) 
+{
+   pat_t               *Pat;
+   pat_prog_t          *PatProgram;
+   u_char              *Ptr;
+   u_int                SectionLength;
+   int                  TransportStreamID;
+   int                  PatVersion;
+   struct Program      *Program;
+   struct LIST         *ProgramList = NULL;
+
+   if (!Buffer) return NULL;
+
+   Pat = (pat_t *) Buffer; Ptr = Buffer;
+
+   if (Pat->table_id != TID_PAT) {
+//      fprintf (stderr, "PAT: wrong TID %d\n", Pat->table_id);
+      return NULL;
+   }
+
+   SectionLength = HILO (Pat->section_length) + 3 - PAT_LEN - 4;
+
+   if (crc32 (Ptr, HILO (Pat->section_length) + 3)) return (NULL);
+
+   TransportStreamID = HILO (Pat->transport_stream_id);
+   PatVersion = Pat->version_number;
+
+   Ptr += PAT_LEN;
+
+   while (SectionLength > 0)
+   {
+      PatProgram = (pat_prog_t *) Ptr;
+
+      CreateProgram (Program, HILO (PatProgram->program_number),
+         TransportStreamID, HILO (PatProgram->network_pid), PatVersion);
+
+      if (!ProgramList) ProgramList = xNewList (NULL);
+      xAddTail (ProgramList, Program);
+
+      SectionLength -= PAT_PROG_LEN;
+      Ptr += PAT_PROG_LEN;
+   }
+
+   return (ProgramList);
+}
+
+
+struct Pid *siParsePMT (u_char *Buffer) 
+{
+   pmt_t               *Pmt;
+   pmt_info_t          *PmtInfo;
+   u_char              *Ptr;
+   u_int                SectionLength, ProgramInfoLength,
+                        StreamLength, LoopLength;
+   int                  ProgramID;
+   int                  PcrID;
+   int                  PmtVersion;
+   struct Pid          *Pid;
+   struct PidInfo      *PidInfo;
+
+   if (!Buffer) return NULL;
+
+   Pmt = (pmt_t *) Buffer; Ptr = Buffer;
+
+   if (Pmt->table_id != TID_PMT) {
+//      fprintf (stderr, "PMT: wrong TID %d\n", Pmt->table_id);
+      return NULL;
+   }
+
+   SectionLength = HILO (Pmt->section_length) + 3 - 4;
+
+   if (crc32 (Ptr, HILO (Pmt->section_length) + 3)) return (NULL);
+
+   ProgramInfoLength = HILO (Pmt->program_info_length);
+   StreamLength = SectionLength - ProgramInfoLength - PMT_LEN;
+
+   ProgramID = HILO (Pmt->program_number);
+   PmtVersion = Pmt->version_number;
+   PcrID = HILO (Pmt->PCR_PID);
+
+   Ptr += PMT_LEN;
+
+   CreatePid (Pid, ProgramID, PcrID, PmtVersion);
+
+   siParseDescriptors (Pid->Descriptors, Ptr, ProgramInfoLength, Pmt->table_id);
+
+   Ptr += ProgramInfoLength;
+
+   while (StreamLength > 0)
+   {
+      PmtInfo = (pmt_info_t *) Ptr;
+
+      CreatePidInfo (PidInfo, PmtInfo->stream_type,
+                        HILO (PmtInfo->elementary_PID));
+
+      LoopLength = HILO (PmtInfo->ES_info_length);
+      Ptr += PMT_INFO_LEN;
+
+      siParseDescriptors (PidInfo->Descriptors, Ptr, LoopLength, Pmt->table_id);
+
+      xAddTail (Pid->InfoList, PidInfo);
+
+      StreamLength -= LoopLength + PMT_INFO_LEN;
+      Ptr += LoopLength;
+   }
+
+   return (Pid);
+}
+
+
+struct LIST *siParseSDT (u_char *Buffer) 
+{
+   sdt_t               *Sdt;
+   sdt_descr_t         *SdtDescriptor;
+   u_char              *Ptr;
+   u_int                SectionLength, LoopLength;
+   int                  TransportStreamID;
+   int                  SdtVersion;
+   int                  OriginalNetworkID;
+   struct Service      *Service;
+   struct LIST         *ServiceList = NULL;
+
+   if (!Buffer) return NULL;
+
+   Sdt = (sdt_t *) Buffer; Ptr = Buffer;
+
+   if (Sdt->table_id != TID_SDT_ACT && Sdt->table_id != TID_SDT_OTH) {
+//      fprintf (stderr, "SDT: wrong TID %d\n", Sdt->table_id);
+      return NULL;
+   }
+
+   SectionLength = HILO (Sdt->section_length) + 3 - SDT_LEN - 4;
+
+   if (crc32 (Ptr, HILO (Sdt->section_length) + 3)) return (NULL);
+
+   TransportStreamID = HILO (Sdt->transport_stream_id);
+   SdtVersion = Sdt->version_number;
+   OriginalNetworkID = HILO (Sdt->original_network_id);
+
+   Ptr += SDT_LEN;
+
+   while (SectionLength > 0)
+   {
+      SdtDescriptor = (sdt_descr_t *) Ptr;
+
+      CreateService (Service, HILO (SdtDescriptor->service_id),
+         TransportStreamID, OriginalNetworkID, SdtVersion,
+         SdtDescriptor->free_ca_mode ? CONDITIONAL_ACCESS : FREE_TO_AIR);
+
+      switch (SdtDescriptor->running_status)
+      {
+         case 0x01:
+            SetRunningStatus (Service->Status, RUNNING_STATUS_NOT_RUNNING);
+         break;
+
+         case 0x02:
+            SetRunningStatus (Service->Status, RUNNING_STATUS_AWAITING);
+         break;
+
+         case 0x03:
+            SetRunningStatus (Service->Status, RUNNING_STATUS_PAUSING);
+         break;
+
+         case 0x04:
+         default:
+            SetRunningStatus (Service->Status, RUNNING_STATUS_RUNNING);
+         break;
+      }
+      if (SdtDescriptor->eit_schedule_flag)
+         SetScheduleFlag (Service->Status);
+      if (SdtDescriptor->eit_present_following_flag)
+         SetPresentFollowing (Service->Status);
+
+      LoopLength = HILO (SdtDescriptor->descriptors_loop_length);
+      Ptr += SDT_DESCR_LEN;
+
+      siParseDescriptors (Service->Descriptors, Ptr, LoopLength, Sdt->table_id);
+
+      if (!ServiceList) ServiceList = xNewList (NULL);
+      xAddTail (ServiceList, Service);
+
+      SectionLength -= LoopLength + SDT_DESCR_LEN;
+      Ptr += LoopLength;
+   }
+
+   return (ServiceList);
+}
+
+
+struct LIST *siParseEIT (u_char *Buffer) 
+{
+   eit_t               *Eit;
+   eit_event_t         *EitEvent;
+   u_char              *Ptr;
+   u_int                SectionLength, LoopLength;
+   int                  ServiceID;
+   int                  EitVersion;
+   int                  TransportStreamID;
+   int                  OriginalNetworkID;
+   struct Event        *Event;
+   struct LIST         *EventList = NULL;
+
+   if (!Buffer) return NULL;
+
+   Eit = (eit_t *) Buffer; Ptr = Buffer;
+
+   if (Eit->table_id != TID_EIT_ACT && Eit->table_id != TID_EIT_OTH &&
+       !(Eit->table_id >= TID_EIT_ACT_SCH &&
+         Eit->table_id <= TID_EIT_ACT_SCH + 0x0F) &&
+       !(Eit->table_id >= TID_EIT_OTH_SCH &&
+         Eit->table_id <= TID_EIT_OTH_SCH + 0x0F)) {
+//      fprintf (stderr, "EIT: wrong TID %d\n", Eit->table_id);
+      return NULL;
+   }
+
+   SectionLength = HILO (Eit->section_length) + 3 - EIT_LEN - 4;
+
+   if (crc32 (Ptr, HILO (Eit->section_length) + 3)) return (NULL);
+
+   ServiceID = HILO (Eit->service_id);
+   TransportStreamID = HILO (Eit->transport_stream_id);
+   EitVersion = Eit->version_number;
+   OriginalNetworkID = HILO (Eit->original_network_id);
+
+   Ptr += EIT_LEN;
+
+   while (SectionLength > 0)
+   {
+      struct tm thisTime;
+      int year, month, day;
+      double mjd;
+
+      EitEvent = (eit_event_t *) Ptr;
+
+      CreateEvent (Event, HILO (EitEvent->event_id), ServiceID,
+         TransportStreamID, OriginalNetworkID, EitVersion,
+         EitEvent->free_ca_mode ? CONDITIONAL_ACCESS : FREE_TO_AIR);
+
+      switch (EitEvent->running_status)
+      {
+         case 0x01:
+            SetRunningStatus (Event->Status, RUNNING_STATUS_NOT_RUNNING);
+         break;
+
+         case 0x02:
+            SetRunningStatus (Event->Status, RUNNING_STATUS_AWAITING);
+         break;
+
+         case 0x03:
+            SetRunningStatus (Event->Status, RUNNING_STATUS_PAUSING);
+         break;
+
+         case 0x04:
+         default:
+            SetRunningStatus (Event->Status, RUNNING_STATUS_RUNNING);
+         break;
+      }
+      Event->StartTime = MjdToEpochTime (EitEvent->mjd) +
+                         BcdTimeToSeconds (EitEvent->start_time);
+      Event->Duration = BcdTimeToSeconds (EitEvent->duration);
+
+      LoopLength = HILO (EitEvent->descriptors_loop_length);
+      Ptr += EIT_EVENT_LEN;
+
+      siParseDescriptors (Event->Descriptors, Ptr, LoopLength, Eit->table_id);
+
+      if (!EventList) EventList = xNewList (NULL);
+      xAddTail (EventList, Event);
+
+      SectionLength -= LoopLength + EIT_EVENT_LEN;
+      Ptr += LoopLength;
+   }
+
+   return (EventList);
+}
+
+
+time_t siParseTDT (u_char *Buffer) 
+{
+   tdt_t               *Tdt;
+   u_char              *Ptr;
+   u_int                SectionLength;
+   int                  TdtVersion;
+   time_t               CurrentTime;
+
+   if (!Buffer) return 0;
+
+   Tdt = (tdt_t *) Buffer; Ptr = Buffer;
+
+   if (Tdt->table_id != TID_TDT) {
+//      fprintf (stderr, "TDT: wrong TID %d\n", Tdt->table_id);
+      return 0;
+   }
+
+   SectionLength = HILO (Tdt->section_length) + 3;  /* no CRC ?! */
+
+   CurrentTime = MjdToEpochTime (Tdt->utc_mjd) +
+                 BcdTimeToSeconds (Tdt->utc_time);
+
+   return (CurrentTime);
+}
+
+
+void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
+                         u_int Length, u_char TableID)
+{
+   u_int        DescriptorLength;
+   u_char      *Ptr;
+
+   DescriptorLength = 0;
+   Ptr = Buffer;
+
+   while (DescriptorLength < Length)
+   {
+      switch (TableID)
+      {
+         case TID_NIT_ACT: case TID_NIT_OTH:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_NW_NAME:
+               case DESCR_SERVICE_LIST:
+               case DESCR_STUFFING:
+               case DESCR_SAT_DEL_SYS:
+               case DESCR_CABLE_DEL_SYS:
+               case DESCR_LINKAGE:
+               case DESCR_TERR_DEL_SYS:
+               case DESCR_ML_NW_NAME:
+               case DESCR_PRIV_DATA_SPEC:
+               case DESCR_CELL_LIST:
+               case DESCR_CELL_FREQ_LINK:
+               case DESCR_ANNOUNCEMENT_SUPPORT:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+               /*   fprintf (stderr, "forbidden descriptor 0x%x in NIT\n",
+                              GetDescriptorTag(Ptr));*/
+               break;
+            }
+         break;
+
+         case TID_BAT:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_SERVICE_LIST:
+               case DESCR_STUFFING:
+               case DESCR_BOUQUET_NAME:
+               case DESCR_SERVICE:
+               case DESCR_COUNTRY_AVAIL:
+               case DESCR_LINKAGE:
+               case DESCR_CA_IDENT:
+               case DESCR_ML_BQ_NAME:
+               case DESCR_PRIV_DATA_SPEC:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+                  /*fprintf (stderr, "forbidden descriptor 0x%x in BAT\n",
+                              GetDescriptorTag(Ptr));*/
+               break;
+            }
+         break;
+
+         case TID_SDT_ACT: case TID_SDT_OTH:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_STUFFING:
+               case DESCR_BOUQUET_NAME:
+               case DESCR_SERVICE: 
+               case DESCR_COUNTRY_AVAIL: 
+               case DESCR_LINKAGE:
+               case DESCR_NVOD_REF:
+               case DESCR_TIME_SHIFTED_SERVICE:
+               case DESCR_MOSAIC:
+               case DESCR_CA_IDENT:
+               case DESCR_TELEPHONE:
+               case DESCR_ML_SERVICE_NAME:
+               case DESCR_PRIV_DATA_SPEC:
+               case DESCR_DATA_BROADCAST:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+                  /* fprintf (stderr, "forbidden descriptor 0x%x in SDT\n",
+                              GetDescriptorTag(Ptr)); */
+               break;
+            }
+         break;
+
+         case TID_EIT_ACT: case TID_EIT_OTH:
+         case TID_EIT_ACT_SCH: case TID_EIT_OTH_SCH:
+         case TID_EIT_ACT_SCH+1: case TID_EIT_OTH_SCH+1:
+         case TID_EIT_ACT_SCH+2: case TID_EIT_OTH_SCH+2:
+         case TID_EIT_ACT_SCH+3: case TID_EIT_OTH_SCH+3:
+         case TID_EIT_ACT_SCH+4: case TID_EIT_OTH_SCH+4:
+         case TID_EIT_ACT_SCH+5: case TID_EIT_OTH_SCH+5:
+         case TID_EIT_ACT_SCH+6: case TID_EIT_OTH_SCH+6:
+         case TID_EIT_ACT_SCH+7: case TID_EIT_OTH_SCH+7:
+         case TID_EIT_ACT_SCH+8: case TID_EIT_OTH_SCH+8:
+         case TID_EIT_ACT_SCH+9: case TID_EIT_OTH_SCH+9:
+         case TID_EIT_ACT_SCH+10: case TID_EIT_OTH_SCH+10:
+         case TID_EIT_ACT_SCH+11: case TID_EIT_OTH_SCH+11:
+         case TID_EIT_ACT_SCH+12: case TID_EIT_OTH_SCH+12:
+         case TID_EIT_ACT_SCH+13: case TID_EIT_OTH_SCH+13:
+         case TID_EIT_ACT_SCH+14: case TID_EIT_OTH_SCH+14:
+         case TID_EIT_ACT_SCH+15: case TID_EIT_OTH_SCH+15:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_STUFFING:
+               case DESCR_LINKAGE:
+               case DESCR_SHORT_EVENT:
+               case DESCR_EXTENDED_EVENT:
+               case DESCR_TIME_SHIFTED_EVENT:
+               case DESCR_COMPONENT:
+               case DESCR_CA_IDENT:
+               case DESCR_CONTENT:
+               case DESCR_PARENTAL_RATING:
+               case DESCR_TELEPHONE:
+               case DESCR_ML_COMPONENT:
+               case DESCR_PRIV_DATA_SPEC:
+               case DESCR_SHORT_SMOOTH_BUF:
+               case DESCR_DATA_BROADCAST:
+               case DESCR_PDC:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+                  /*fprintf (stderr, "forbidden descriptor 0x%x in EIT\n",
+                              GetDescriptorTag(Ptr));*/
+               break;
+            }
+         break;
+
+         case TID_TOT:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_LOCAL_TIME_OFF:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+                  /*fprintf (stderr, "forbidden descriptor 0x%x in TOT\n",
+                              GetDescriptorTag(Ptr));*/
+               break;
+            }
+         break;
+
+         case TID_PMT:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_VBI_DATA:
+               case DESCR_VBI_TELETEXT:
+               case DESCR_MOSAIC:
+               case DESCR_STREAM_ID:
+               case DESCR_TELETEXT:
+               case DESCR_SUBTITLING:
+               case DESCR_PRIV_DATA_SPEC:
+               case DESCR_SERVICE_MOVE:
+               case DESCR_CA_SYSTEM:
+               case DESCR_DATA_BROADCAST_ID:
+               case DESCR_AC3:
+               case DESCR_ANCILLARY_DATA:
+               case DESCR_VIDEO_STREAM:
+               case DESCR_AUDIO_STREAM:
+               case DESCR_HIERARCHY:
+               case DESCR_REGISTRATION:
+               case DESCR_DATA_STREAM_ALIGN:
+               case DESCR_TARGET_BACKGRID:
+               case DESCR_VIDEO_WINDOW:
+               case DESCR_CA:
+               case DESCR_ISO_639_LANGUAGE:
+               case DESCR_SYSTEM_CLOCK:
+               case DESCR_MULTIPLEX_BUFFER_UTIL:
+               case DESCR_COPYRIGHT:
+               case DESCR_MAXIMUM_BITRATE:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+                  /* fprintf (stderr, "forbidden descriptor 0x%x in PMT\n",
+                              GetDescriptorTag(Ptr)); */
+               break;
+            }
+         break;
+
+         default:
+            fprintf (stderr, "descriptor 0x%x in unsupported table 0x%x\n",
+                         GetDescriptorTag(Ptr), TableID);
+         break;
+      }
+      DescriptorLength += GetDescriptorLength (Ptr);
+      Ptr += GetDescriptorLength (Ptr);
+   }
+   return;
+}
+
+
+void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
+{
+   struct NODE     *Descriptor = NULL;
+   char            *Text , *Text2;
+   u_char          *Ptr;
+   int              Length, i;
+
+   if (!Descriptors || !Buffer) return;
+
+   Ptr = Buffer;
+
+   switch (GetDescriptorTag(Buffer))
+   {
+      case DESCR_ANCILLARY_DATA:
+         CreateAncillaryDataDescriptor (Descriptor,
+                   CastAncillaryDataDescriptor(Buffer)->ancillary_data_identifier);
+      break;
+
+      case DESCR_BOUQUET_NAME:
+         Text = siGetDescriptorText (Buffer + DESCR_BOUQUET_NAME_LEN,
+                   GetDescriptorLength (Buffer) - DESCR_BOUQUET_NAME_LEN);
+         CreateBouquetNameDescriptor (Descriptor, Text);
+//         xMemFree (Text);
+      break;
+
+      case DESCR_COMPONENT:
+         Text = siGetDescriptorText (Buffer + DESCR_COMPONENT_LEN,
+                   GetDescriptorLength (Buffer) - DESCR_COMPONENT_LEN);
+         CreateComponentDescriptor (Descriptor,
+                   CastComponentDescriptor(Buffer)->stream_content,
+                   CastComponentDescriptor(Buffer)->component_type,
+                   CastComponentDescriptor(Buffer)->component_tag,
+                   CastComponentDescriptor(Buffer)->lang_code1,
+                   CastComponentDescriptor(Buffer)->lang_code2,
+                   CastComponentDescriptor(Buffer)->lang_code3, Text);
+//         xMemFree (Text);
+      break;
+
+      case DESCR_SERVICE:
+         Text = siGetDescriptorText (Buffer + DESCR_SERVICE_LEN,
+                   CastServiceDescriptor(Buffer)->provider_name_length);
+         Text2 = siGetDescriptorText (Buffer + DESCR_SERVICE_LEN +
+                   CastServiceDescriptor(Buffer)->provider_name_length + 1,
+                   *((u_char *)(Buffer + DESCR_SERVICE_LEN +
+                   CastServiceDescriptor(Buffer)->provider_name_length)));
+         CreateServiceDescriptor (Descriptor,
+                   CastServiceDescriptor(Buffer)->service_type, Text, Text2);
+//         xMemFree (Text2);
+      break;
+
+      case DESCR_COUNTRY_AVAIL:
+         CreateCountryAvailabilityDescriptor (Descriptor,
+                   CastCountryAvailabilityDescriptor(Buffer)->country_availability_flag);
+         Length = GetDescriptorLength (Buffer) - DESCR_COUNTRY_AVAILABILITY_LEN;
+         Ptr += DESCR_COUNTRY_AVAILABILITY_LEN;
+         while (Length > 0)
+            { AddCountryAvailabilityCode(Descriptor,
+                      Ptr[0], Ptr[1], Ptr[2]); Ptr += 3; Length -= 3; }
+      break;
+
+      case DESCR_SHORT_EVENT:
+         Text = siGetDescriptorText (Buffer + DESCR_SHORT_EVENT_LEN,
+                   CastShortEventDescriptor(Buffer)->event_name_length);
+         Text2 = siGetDescriptorText (Buffer + DESCR_SHORT_EVENT_LEN +
+                   CastShortEventDescriptor(Buffer)->event_name_length + 1,
+                   *((u_char *)(Buffer + DESCR_SHORT_EVENT_LEN +
+                   CastShortEventDescriptor(Buffer)->event_name_length)));
+         CreateShortEventDescriptor (Descriptor, Text,
+                   CastShortEventDescriptor(Buffer)->lang_code1,
+                   CastShortEventDescriptor(Buffer)->lang_code2,
+                   CastShortEventDescriptor(Buffer)->lang_code3, Text2);
+//         xMemFree (Text);
+      break;
+
+      case DESCR_EXTENDED_EVENT:
+         Text = siGetDescriptorText (Buffer + DESCR_EXTENDED_EVENT_LEN +
+                   CastExtendedEventDescriptor(Buffer)->length_of_items + 1,
+                   *((u_char *)(Buffer + DESCR_EXTENDED_EVENT_LEN +
+                   CastExtendedEventDescriptor(Buffer)->length_of_items)));
+         CreateExtendedEventDescriptor (Descriptor,
+                   CastExtendedEventDescriptor(Buffer)->descriptor_number,
+                   CastExtendedEventDescriptor(Buffer)->last_descriptor_number,
+                   CastExtendedEventDescriptor(Buffer)->lang_code1,
+                   CastExtendedEventDescriptor(Buffer)->lang_code2,
+                   CastExtendedEventDescriptor(Buffer)->lang_code3, Text);
+//         xMemFree (Text);
+         Length = CastExtendedEventDescriptor(Buffer)->length_of_items;
+         Ptr += DESCR_EXTENDED_EVENT_LEN;
+         while (Length > 0)
+         {
+            Text = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN,
+                      CastExtendedEventItem(Ptr)->item_description_length);
+            Text2 = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN +
+                      CastExtendedEventItem(Ptr)->item_description_length + 1,
+                      *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
+                      CastExtendedEventItem(Ptr)->item_description_length)));
+            AddExtendedEventItem (Descriptor, Text2, Text);
+//            xMemFree (Text2);
+            Length -= ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
+                      *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
+                        CastExtendedEventItem(Ptr)->item_description_length)) + 1;
+            Ptr += ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
+                      *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
+                        CastExtendedEventItem(Ptr)->item_description_length)) + 1;
+         }
+      break;
+
+      case DESCR_CA_IDENT:
+         CreateCaIdentifierDescriptor (Descriptor,
+                   (GetDescriptorLength(Buffer) - DESCR_CA_IDENTIFIER_LEN) / 2);
+         Length = GetDescriptorLength (Buffer) - DESCR_CA_IDENTIFIER_LEN;
+         Ptr += DESCR_CA_IDENTIFIER_LEN; i = 0;
+         while (Length > 0)
+            { SetCaIdentifierID(Descriptor, i, *((u_short *) Ptr));
+              Length -= 2; Ptr += 2; i++; }
+      break;
+
+      case DESCR_CONTENT:
+         CreateContentDescriptor (Descriptor,
+                   (GetDescriptorLength(Buffer) - DESCR_CONTENT_LEN) / 2);
+         Length = GetDescriptorLength (Buffer) - DESCR_CONTENT_LEN;
+         Ptr += DESCR_CONTENT_LEN; i = 0;
+         while (Length > 0)
+            { SetContentID(Descriptor, i, CastContentNibble(Ptr)->content_nibble_level_1,
+                              CastContentNibble(Ptr)->content_nibble_level_2,
+                              CastContentNibble(Ptr)->user_nibble_1,
+                              CastContentNibble(Ptr)->user_nibble_2);
+              Length -= 2; Ptr += 2; i++; }
+      break;
+
+      case DESCR_STUFFING:
+         /* intentionally ignored */
+      break;
+
+      case DESCR_PARENTAL_RATING:
+         CreateParentalRatingDescriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer) - DESCR_PARENTAL_RATING_LEN;
+         Ptr += DESCR_PARENTAL_RATING_LEN; i = 0;
+         while (Length > 0)
+            { AddParentalRating (Descriptor, CastParentalRating(Ptr)->lang_code1,
+                 CastParentalRating(Ptr)->lang_code2, CastParentalRating(Ptr)->lang_code3,
+                 CastParentalRating(Ptr)->rating);
+              Length -= PARENTAL_RATING_LEN; Ptr += PARENTAL_RATING_LEN; i++; }
+      break;
+
+      case DESCR_NVOD_REF:
+         CreateNvodReferenceDescriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer) - DESCR_NVOD_REFERENCE_LEN;
+         Ptr += DESCR_NVOD_REFERENCE_LEN;
+         while (Length > 0)
+         {
+            AddNvodReferenceItem (Descriptor,
+               HILO (CastNvodReferenceItem(Ptr)->transport_stream_id),
+               HILO (CastNvodReferenceItem(Ptr)->original_network_id),
+               HILO (CastNvodReferenceItem(Ptr)->service_id));
+            Length -= ITEM_NVOD_REFERENCE_LEN;
+            Ptr += ITEM_NVOD_REFERENCE_LEN;
+         }
+      break;
+
+      case DESCR_TIME_SHIFTED_SERVICE:
+         CreateTimeShiftedServiceDescriptor (Descriptor,
+            HILO (CastTimeShiftedServiceDescriptor(Ptr)->reference_service_id));
+      break;
+
+      case DESCR_TIME_SHIFTED_EVENT:
+         CreateTimeShiftedEventDescriptor (Descriptor,
+            HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_service_id),
+            HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_event_id));
+      break;
+
+      case DESCR_ISO_639_LANGUAGE:
+         CreateIso639LanguageDescriptor (Descriptor,
+                   CastIso639LanguageDescriptor(Buffer)->lang_code1,
+                   CastIso639LanguageDescriptor(Buffer)->lang_code2,
+                   CastIso639LanguageDescriptor(Buffer)->lang_code3);
+      break;
+
+      case DESCR_STREAM_ID:
+         CreateStreamIdentifierDescriptor (Descriptor,
+                   CastStreamIdentifierDescriptor(Ptr)->component_tag);
+      break;
+
+      case DESCR_LINKAGE:
+         CreateLinkageDescriptor (Descriptor,
+                   HILO (CastLinkageDescriptor(Ptr)->transport_stream_id),
+                   HILO (CastLinkageDescriptor(Ptr)->original_network_id),
+                   HILO (CastLinkageDescriptor(Ptr)->service_id),
+                   CastLinkageDescriptor(Ptr)->linkage_type,
+                   GetDescriptorLength (Ptr) - DESCR_LINKAGE_LEN,
+                   Ptr + DESCR_LINKAGE_LEN);
+      break;
+
+      case DESCR_VIDEO_STREAM:
+      case DESCR_AUDIO_STREAM:
+      case DESCR_HIERARCHY:
+      case DESCR_REGISTRATION:
+      case DESCR_DATA_STREAM_ALIGN:
+      case DESCR_TARGET_BACKGRID:
+      case DESCR_VIDEO_WINDOW:
+      case DESCR_CA:
+      case DESCR_SYSTEM_CLOCK:
+      case DESCR_MULTIPLEX_BUFFER_UTIL:
+      case DESCR_COPYRIGHT:
+      case DESCR_MAXIMUM_BITRATE:
+      case DESCR_PRIVATE_DATA_IND:
+      case DESCR_SMOOTHING_BUFFER:
+      case DESCR_STD:
+      case DESCR_IBP:
+      case DESCR_NW_NAME:
+      case DESCR_SERVICE_LIST:
+      case DESCR_SAT_DEL_SYS:
+      case DESCR_CABLE_DEL_SYS:
+      case DESCR_VBI_DATA:
+      case DESCR_VBI_TELETEXT:
+      case DESCR_MOSAIC:
+      case DESCR_TELETEXT:
+      case DESCR_TELEPHONE:
+      case DESCR_LOCAL_TIME_OFF:
+      case DESCR_SUBTITLING:
+      case DESCR_TERR_DEL_SYS:
+      case DESCR_ML_NW_NAME:
+      case DESCR_ML_BQ_NAME:
+      case DESCR_ML_SERVICE_NAME:
+      case DESCR_ML_COMPONENT:
+      case DESCR_PRIV_DATA_SPEC:
+      case DESCR_SERVICE_MOVE:
+      case DESCR_SHORT_SMOOTH_BUF:
+      case DESCR_FREQUENCY_LIST:
+      case DESCR_PARTIAL_TP_STREAM:
+      case DESCR_DATA_BROADCAST:
+      case DESCR_CA_SYSTEM:
+      case DESCR_DATA_BROADCAST_ID:
+      case DESCR_TRANSPORT_STREAM:
+      case DESCR_DSNG:
+      case DESCR_PDC:
+      case DESCR_AC3:
+      case DESCR_CELL_LIST:
+      case DESCR_CELL_FREQ_LINK:
+      case DESCR_ANNOUNCEMENT_SUPPORT:
+      default:
+         /* fprintf (stderr, "unsupported descriptor 0x%x\n",
+                              GetDescriptorTag(Buffer)); */
+      break;
+   }
+   if (Descriptor) xAddTail (Descriptors, Descriptor);
+   return;
+}
+
+
+/*
+ *  ToDo:  ETSI conformal text definition
+ */
+char *siGetDescriptorText (u_char *Buffer, u_int Length)
+{
+   char *tmp, *result;
+   int i;
+
+   if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff))
+   {
+      xMemAlloc (Length+1, &result);
+      tmp = result;
+      for (i = 0; i < Length; i++)
+      {
+         if (*Buffer == 0) break;
+
+         if ((*Buffer >= ' ' && *Buffer <= '~') ||
+             (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer++;
+         else Buffer++;
+      }
+      *tmp = '\0';
+   }
+   else
+   {
+      switch (*Buffer)
+      {
+         case 0x01: result = xSetText ("Coding according to character table 1"); break;
+         case 0x02: result = xSetText ("Coding according to character table 2"); break;
+         case 0x03: result = xSetText ("Coding according to character table 3"); break;
+         case 0x04: result = xSetText ("Coding according to character table 4"); break;
+         case 0x10: result = xSetText ("Coding according to ISO/IEC 8859"); break;
+         case 0x11: result = xSetText ("Coding according to ISO/IEC 10646"); break;
+         case 0x12: result = xSetText ("Coding according to KSC 5601"); break;
+         default: result = xSetText ("Unknown coding"); break;
+      }
+   }
+
+   return (result);
+}
+
+// CRC32 lookup table for polynomial 0x04c11db7
+
+static u_long crc_table[256] = {
+	0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+	0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+	0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+	0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+	0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
+	0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+	0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
+	0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+	0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
+	0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+	0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
+	0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+	0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
+	0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+	0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
+	0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+	0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
+	0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+	0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
+	0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+	0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
+	0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+	0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
+	0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+	0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
+	0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+	0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
+	0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+	0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
+	0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+	0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
+	0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+	0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
+	0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+	0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
+	0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+	0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
+	0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+	0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
+	0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+	0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
+	0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
+
+u_long crc32 (char *data, int len)
+{
+	register int i;
+	u_long crc = 0xffffffff;
+
+	for (i=0; i<len; i++)
+		crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
+
+	return crc;
+}
diff --git a/libdtv/libvdr/COPYING b/libdtv/libvdr/COPYING
new file mode 100644
index 000000000..a43ea2126
--- /dev/null
+++ b/libdtv/libvdr/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
new file mode 100644
index 000000000..8aecffc61
--- /dev/null
+++ b/libdtv/libvdr/Makefile
@@ -0,0 +1,62 @@
+##############################################################
+###                                                        ###
+### Makefile: local makefile for libvdr                    ###
+###                                                        ###
+##############################################################
+
+## $Revision: 1.1 $
+## $Date: 2001/08/15 14:05:16 $
+## $Author: kls $
+##
+##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+##
+## libdtv is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## libdtv is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You may have received a copy of the GNU General Public License
+## along with libdtv; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+#
+#
+#
+CC = gcc
+CFLAGS = -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
+         -Wimplicit -D__USE_FIXED_PROTOTYPES__ -I../include # -DDEBUG
+
+
+AR = ar
+ARFLAGS = r
+RANLIB = ranlib
+RM = rm -f
+CP = cp
+
+VDRINCLUDE = libvdr.h
+VDRLIB = libvdr.a
+VDROBJS = libvdr.o
+
+all : $(VDRLIB)
+
+clean :
+	@echo "cleaning workspace..."
+	@$(RM) $(VDROBJS) $(VDRLIB)
+
+new : clean all
+
+$(VDRLIB) : $(VDROBJS)
+	@echo "updating library..."
+	@$(AR) $(ARFLAGS) $(VDRLIB) $(VDROBJS)
+	@$(RANLIB) $(VDRLIB)
+
+dist: all
+	@echo "distributing libvdr.a and libvdr.h..."
+	@$(CP) $(VDRLIB) ../lib
+	@$(CP) $(VDRINCLUDE) ../include
+    
diff --git a/libdtv/libvdr/libvdr.c b/libdtv/libvdr/libvdr.c
new file mode 100644
index 000000000..5caa5d7c4
--- /dev/null
+++ b/libdtv/libvdr/libvdr.c
@@ -0,0 +1,169 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// libvdr.c: routines to parse the DVB-SI stream          ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/08/15 14:05:24 $
+// $Author: kls $
+//
+//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libvdr is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libvdr is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libvdr; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+
+#include <liblx.h>
+#include <libsi.h>
+#include <si_tables.h>
+#include "libvdr.h"
+
+
+
+struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
+{
+   struct VdrProgramInfo      *VdrProgramInfo;
+   struct LIST                *Result, *EventList;
+   struct Event               *Event;
+   struct Descriptor          *Descriptor;
+
+   if (!siBuffer) return (NULL);
+
+   if (!(EventList = siParseEIT (siBuffer))) return (NULL);
+
+   Result = xNewList (NULL);
+
+   xForeach (EventList, Event)
+   {
+      VdrProgramInfo = NULL;
+
+      xForeach (Event->Descriptors, Descriptor)
+      {
+         switch (Descriptor->Tag)
+         {
+            case DESCR_SHORT_EVENT:
+            {
+               if (!xName(Descriptor) || !xName(Descriptor)[0])
+                  break;
+
+               if (!VdrProgramInfo)
+               {
+                  CreateVdrProgramInfo(VdrProgramInfo,
+                     Event->EventID, Event->TransportStreamID,
+                     Event->ServiceID, Event->StartTime,
+                     Event->Duration, Event->Status);
+
+                  VdrProgramInfo->ShortName =
+                     xSetText (xName (Descriptor));
+                  VdrProgramInfo->ShortText =
+                     xSetText (((struct ShortEventDescriptor
+                        *)Descriptor)->Text);
+                  memcpy (VdrProgramInfo->LanguageCode, ((struct
+                     ShortEventDescriptor *)Descriptor)->
+                     LanguageCode, 4);
+               }
+            }
+            break;
+
+            case DESCR_TIME_SHIFTED_EVENT:
+            {
+               struct tm *StartTime;
+
+               if (!VdrProgramInfo)
+               {
+                  CreateVdrProgramInfo(VdrProgramInfo,
+                     Event->EventID, Event->TransportStreamID,
+                     Event->ServiceID, Event->StartTime,
+                     Event->Duration, Event->Status);
+
+                  VdrProgramInfo->ReferenceServiceID =
+                     ((struct TimeShiftedEventDescriptor
+                        *)Descriptor)->ReferenceServiceID;
+                  VdrProgramInfo->ReferenceEventID =
+                     ((struct TimeShiftedEventDescriptor
+                        *)Descriptor)->ReferenceEventID;
+               }
+            }
+            break;
+
+            case DESCR_EXTENDED_EVENT:
+            {
+               struct ExtendedEventItem *Item;
+
+               if (VdrProgramInfo)
+               {
+                  if (xName (Descriptor))
+                     AddToText (xName (Descriptor),
+                        VdrProgramInfo->ExtendedName);
+                  xForeach (((struct ExtendedEventDescriptor*)
+                     Descriptor)->Items, Item)
+                  {
+                     AddItemToText (xName (Item),
+                        VdrProgramInfo->ExtendedText);
+                     AddItemToText (Item->Text,
+                        VdrProgramInfo->ExtendedText);
+                  }
+               }
+            }
+            break;
+
+            case DESCR_CONTENT:
+            {
+               int i, j;
+
+               if (VdrProgramInfo)
+               {
+                  for (j = 0; j < ((struct ContentDescriptor*)
+                     Descriptor)->Amount; j++)
+                  {
+                     VdrProgramInfo->ContentNibble1 =
+                        GetContentContentNibble1(Descriptor, j);
+                     VdrProgramInfo->ContentNibble2 =
+                        GetContentContentNibble2(Descriptor, j);
+                  }
+               }
+            }
+            break;
+
+            case DESCR_PARENTAL_RATING:
+            {
+               struct ParentalRating *Rating;
+
+               if (VdrProgramInfo)
+               {
+                  xForeach (((struct ParentalRatingDescriptor *)
+                              Descriptor)->Ratings, Rating)
+                     if (!strncmp (VdrProgramInfo->LanguageCode,
+                             Rating->LanguageCode, 3))
+                        VdrProgramInfo->Rating = Rating->Rating;
+               }
+            }
+            break;
+         }
+      }
+      if (VdrProgramInfo) xAddTail (Result, VdrProgramInfo);
+   }
+
+   return (Result);
+}
diff --git a/libdtv/libvdr/libvdr.h b/libdtv/libvdr/libvdr.h
new file mode 100644
index 000000000..6fde10be3
--- /dev/null
+++ b/libdtv/libvdr/libvdr.h
@@ -0,0 +1,111 @@
+//////////////////////////////////////////////////////////////
+///                                                        ///
+/// libvdr.h: definitions necessary for the libvdr package ///
+///                                                        ///
+//////////////////////////////////////////////////////////////
+
+// $Revision: 1.1 $
+// $Date: 2001/08/15 10:54:13 $
+// $Author: kls $
+//
+//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//
+// libvdr is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// libvdr is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You may have received a copy of the GNU General Public License
+// along with libvdr; see the file COPYING.  If not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+#ifndef LIBVDR_H
+#define LIBVDR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct LIST *createVdrProgramInfos (unsigned char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+struct VdrProgramInfo {
+   struct NODE          Node;
+   int                  EventID;
+   int                  TransportStreamID;
+   int                  ServiceID;
+   time_t               StartTime;
+   time_t               Duration;
+   unsigned short       Status;
+   char                 LanguageCode[4];
+   unsigned short       Rating;
+   unsigned short       ContentNibble1;
+   unsigned short       ContentNibble2;
+   char                *ShortName;
+   char                *ShortText;
+   char                *ExtendedName;
+   char                *ExtendedText;
+   int                  ReferenceServiceID;
+   int                  ReferenceEventID;
+};
+
+
+#define CreateVdrProgramInfo(cinf, evid, tpid, svid, stst, dura, sta) \
+   do \
+   { \
+      xCreateNode (cinf, NULL); \
+      cinf->EventID = evid; \
+      cinf->TransportStreamID = tpid; \
+      cinf->ServiceID = svid; \
+      cinf->StartTime = stst; \
+      cinf->Duration = dura; \
+      cinf->Status = sta; \
+      cinf->LanguageCode[0] = 0; \
+      cinf->Rating = 0; \
+      cinf->ContentNibble1 = 0; \
+      cinf->ContentNibble2 = 0; \
+      cinf->ShortName = NULL; \
+      cinf->ShortText = NULL; \
+      cinf->ExtendedName = NULL; \
+      cinf->ExtendedText = NULL; \
+      cinf->ReferenceServiceID = 0; \
+      cinf->ReferenceEventID = 0; \
+   } while (0)
+
+#define AddToText(src, dest) \
+   do { \
+      if (dest) \
+      { \
+         char *tmbuf; \
+         xMemAlloc (strlen (src) + strlen (dest) + 4, &tmbuf); \
+         sprintf (tmbuf, "%s%s", (dest), (src)); \
+         xMemFree (dest); (dest) = tmbuf; \
+      } else { \
+         (dest) = xSetText (src); \
+      } \
+   } while (0)
+
+
+#define AddItemToText(src, dest) \
+   do { \
+      if (dest) \
+      { \
+         char *tmbuf; \
+         xMemAlloc (strlen (src) + strlen (dest) + 4, &tmbuf); \
+         sprintf (tmbuf, "%s|%s", (dest), (src)); \
+         xMemFree (dest); (dest) = tmbuf; \
+      } else { \
+         (dest) = xSetText (src); \
+      } \
+   } while (0)
+
+#endif
diff --git a/menu.c b/menu.c
index 0f89fab32..4cc43f099 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.103 2001/08/12 12:42:37 kls Exp $
+ * $Id: menu.c 1.105 2001/08/19 14:45:31 kls Exp $
  */
 
 #include "menu.h"
@@ -17,6 +17,7 @@
 #include "i18n.h"
 
 #define MENUTIMEOUT 120 // seconds
+#define MAXWAIT4EPGINFO 10 // seconds
 
 const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#^";
 
@@ -1701,6 +1702,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
   Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
   Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
+  Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, 3));
   Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
   Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultPriority"),    &data.DefaultPriority, 0, MAXPRIORITY));
@@ -2062,6 +2064,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
 
 cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
 {
+  eventInfo = NULL;
   instantId = NULL;
   dvbApi = DvbApi;
   if (!dvbApi) dvbApi = cDvbApi::PrimaryDvbApi;//XXX
@@ -2075,6 +2078,11 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
   timer->SetPending(true);
   timer->SetRecording(true);
   if (Channels.SwitchTo(timer->channel, dvbApi)) {
+     if (GetEventInfo()) {
+        //XXX this is in preparation for storing recordings in subdirectories and giving them the name of the Subtitle
+        dsyslog(LOG_INFO, "Title: '%s' Subtitle: '%s'", eventInfo->GetTitle(), eventInfo->GetSubtitle());//XXX
+        //XXX modify timer's name and summary, mark it as modified (revert later when stopping)
+        }
      cRecording Recording(timer);
      if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
         Recording.WriteSummary();
@@ -2090,6 +2098,34 @@ cRecordControl::~cRecordControl()
   delete instantId;
 }
 
+bool cRecordControl::GetEventInfo(void)
+{
+  cChannel *channel = Channels.GetByNumber(timer->channel);
+  time_t Time = timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
+  for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
+      {
+        cThreadLock ThreadLock;
+        const cSchedules *Schedules = dvbApi->Schedules(&ThreadLock);
+        if (Schedules) {
+           const cSchedule *Schedule = Schedules->GetSchedule(channel->pnr);
+           if (Schedule) {
+              eventInfo = Schedule->GetEvent(Time);
+              if (eventInfo) {
+                 if (seconds > 0)
+                    dsyslog(LOG_INFO, "got EPG info after %d seconds", seconds);
+                 return true;
+                 }
+              }
+           }
+      }
+      if (seconds == 0)
+         dsyslog(LOG_INFO, "waiting for EPG info...");
+      sleep(1);
+      }
+  dsyslog(LOG_INFO, "no EPG info available");
+  return false;
+}
+
 void cRecordControl::Stop(bool KeepInstant)
 {
   if (timer) {
diff --git a/menu.h b/menu.h
index f75ca8670..d6db00285 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.23 2001/08/11 14:08:50 kls Exp $
+ * $Id: menu.h 1.24 2001/08/18 10:22:43 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -72,7 +72,9 @@ class cRecordControl {
 private:
   cDvbApi *dvbApi;
   cTimer *timer;
+  const cEventInfo *eventInfo;
   char *instantId;
+  bool GetEventInfo(void);
 public:
   cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
   virtual ~cRecordControl();
diff --git a/remux.c b/remux.c
index 3c7ec6e62..f89b897b6 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.5 2001/06/24 16:37:23 kls Exp $
+ * $Id: remux.c 1.6 2001/08/19 11:52:05 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -489,6 +489,8 @@ void cRemux::SetAudioPid(int APid)
   resultCount = resultDelivered = 0;
 }
 
+#define TS_SYNC_BYTE 0x47
+
 const uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar *PictureType)
 {
   uchar dummyPictureType;
@@ -511,12 +513,27 @@ XXX*/
      resultDelivered = 0;
      }
 
+  int used = 0;
+
+  // Make sure we are looking at a TS packet:
+
+  while (Count > TS_SIZE) {
+        if (Data[0] == TS_SYNC_BYTE && Data[TS_SIZE] == TS_SYNC_BYTE)
+           break;
+        Data++;
+        Count--;
+        used++;
+        }
+  if (used)
+     esyslog(LOG_ERR, "ERROR: skipped %d byte to sync on TS packet", used);
+
   // Convert incoming TS data into multiplexed PES:
 
-  int used = 0;
   for (int i = 0; i < Count; i += TS_SIZE) {
       if (Count - i < TS_SIZE)
          break;
+      if (Data[i] != TS_SYNC_BYTE)
+         break;
       int pid = GetPid(Data + i + 1);
       if (Data[i + 3] & 0x10) { // got payload
          if      (pid == vPid)              vTS2PES->ts_to_pes(Data + i);
diff --git a/tools.c b/tools.c
index e6aba17a5..30b675b2e 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.39 2001/08/12 15:12:54 kls Exp $
+ * $Id: tools.c 1.40 2001/08/17 12:45:42 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -103,6 +103,32 @@ char *stripspace(char *s)
   return s;
 }
 
+char *compactspace(char *s)
+{
+  if (s && *s) {
+     char *t = stripspace(skipspace(s));
+     char *p = t;
+     while (p && *p) {
+           char *q = skipspace(p);
+           if (q - p > 1)
+              memmove(p + 1, q, strlen(q) + 1);
+           p++;
+           }
+     if (t != s)
+        memmove(s, t, strlen(t) + 1);
+     }
+  return s;
+}
+
+bool startswith(const char *s, const char *p)
+{
+  while (*p) {
+        if (*p++ != *s++)
+           return false;
+        }
+  return true;
+}
+
 bool isempty(const char *s)
 {
   return !(s && *skipspace(s));
diff --git a/tools.h b/tools.h
index bf2e46b52..af7958fef 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.28 2001/08/12 15:13:02 kls Exp $
+ * $Id: tools.h 1.29 2001/08/17 12:44:39 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -41,6 +41,8 @@ char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
 char *skipspace(const char *s);
 char *stripspace(char *s);
+char *compactspace(char *s);
+bool startswith(const char *s, const char *p);
 bool isempty(const char *s);
 int time_ms(void);
 void delay_ms(int ms);

From ae8fe25312b6b0ec18fd0c6c2a275f334ada02db Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Aug 2001 18:00:00 +0200
Subject: [PATCH 023/307] Version 0.93 - The menus and the channel display now
 show the current date and time. - The new Setup parameter MaxVideoFileSize
 can be used to customize the   maximum size of the recorded video files. -
 Fixed a bug in handling repeating timers that record over midnight (the  
 calculation of matching timers has been completely rewritten). - Timers that
 are currently recording are now marked with '#' in the "Timers"   menu. -
 Timers are now sorted in the "Timers" menu, showing the sequence in which  
 they will be recording. This can be disabled in the "Setup" menu. Note   that
 the "Mark" button doesn't work if timers are displayed sorted.

---
 HISTORY       |  13 +++++
 MANUAL        |  25 +++++++-
 channels.conf |   2 +
 config.c      | 157 +++++++++++++++++++++++++++++++-------------------
 config.h      |  16 +++--
 dvbapi.c      |  22 +++----
 dvbapi.h      |  11 +++-
 i18n.c        |  29 +++++++++-
 interface.c   |   4 +-
 libdtv/x.txt  |  55 ++++++++++++++++++
 menu.c        |  66 +++++++++++++--------
 osd.c         |  12 ++--
 osd.h         |   6 +-
 tools.c       |  34 ++++++++++-
 tools.h       |   5 +-
 vdr.c         |   4 +-
 16 files changed, 344 insertions(+), 117 deletions(-)
 create mode 100644 libdtv/x.txt

diff --git a/HISTORY b/HISTORY
index b76067bd0..250d85728 100644
--- a/HISTORY
+++ b/HISTORY
@@ -663,3 +663,16 @@ Video Disk Recorder Revision History
 - Fixed broken recordings after a driver buffer overflow.
 - Fixed the chirping sound after Pause/Play of a DVD (thanks to Andreas
   Schultz).
+
+2001-08-26: Version 0.93
+
+- The menus and the channel display now show the current date and time.
+- The new Setup parameter MaxVideoFileSize can be used to customize the
+  maximum size of the recorded video files.
+- Fixed a bug in handling repeating timers that record over midnight (the
+  calculation of matching timers has been completely rewritten).
+- Timers that are currently recording are now marked with '#' in the "Timers"
+  menu.
+- Timers are now sorted in the "Timers" menu, showing the sequence in which
+  they will be recording. This can be disabled in the "Setup" menu. Note
+  that the "Mark" button doesn't work if timers are displayed sorted.
diff --git a/MANUAL b/MANUAL
index 9d7748120..ae93099fb 100644
--- a/MANUAL
+++ b/MANUAL
@@ -8,7 +8,7 @@ Video Disk Recorder User's Manual
   possible, several keys have different meanings in the various
   modes:
 
-  Key     Normal      Main       Channels   Timer      Edit/New      Recordings  Replay
+  Key     Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
 
   Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
@@ -20,9 +20,12 @@ Video Disk Recorder User's Manual
   Red     -           Record     Edit       Edit       -             Play        Jump
   Green   -           Language   New        New        -             Rewind      Skip -60s
   Yellow  -           Eject DVD  Delete     Delete     -             Delete      Skip +60s
-  Blue    -           Resume     Mark       Mark       -             Summary     Stop
+  Blue    -           Resume     Mark       Mark(1)    -             Summary     Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           Editing
 
+  (1) The "Mark" button in the "Timers" menu only works if sorting the timers
+      has been disabled in the "Setup" menu.
+
 * Navigating through the On Screen Menus
 
   The "Main" menu can be called up with the "Menu" key of your remote
@@ -34,7 +37,8 @@ Video Disk Recorder User's Manual
   any changes that might have been made in the current menu.
 
   In the "Timers" menu, the current timer can be enabled or disabled with
-  the "Right" or "Left" key, respectively (enabled timers are marked with ">").
+  the "Right" or "Left" key, respectively (enabled timers are marked with '>',
+  timers that are currently recording are marked with '#').
   "Ok" here opens the "Edit timer" menu.
 
   Textual options, like channel names or recording file names, can be edited
@@ -296,6 +300,12 @@ Video Disk Recorder User's Manual
   OSDLanguage = 0        Defines the language used to display the OSD texts.
                          0 = Englisch
                          1 = Deutsch
+                         2 = Slovenian
+                         3 = Italian
+                         4 = Dutch
+                         5 = Portugese
+                         6 = French
+                         7 = Norwegian
 
   PrimaryDVB = 1         Defines the primary DVB interface (i.e. the one that
                          will display the menus and will react on input through
@@ -373,6 +383,10 @@ Video Disk Recorder User's Manual
                          connection after which the connection is automatically
                          closed. Default is 300, a value of 0 means no timeout.
 
+  SortTimers = 1         Turns sorting the timers in the "Timers" menu on/off.
+                         Timers are sorted by ascending start times, with the
+                         first one being the next timer that will start.
+
   PrimaryLimit = 0       The minimum priority a timer must have to be allowed to
                          use the primary DVB interface, or to force another timer
                          with higher priority to use the primary DVB interface.
@@ -398,6 +412,11 @@ Video Disk Recorder User's Manual
   OSDwidth  = 52         The width and height of the OSD .
   OSDheight = 18         The valid ranges are width=40...56, height=12...21.
 
+  MaxVideoFileSize=2000  The maximum size of a single recorded video file in MB.
+                         The valid range is 100...2000. Default is 2000, but
+                         you may want to use smaller values if you are planning
+                         on archiving a recording to CD.
+
 * Executing system commands
 
   The "Main" menu option "Commands" allows you to execute any system commands
diff --git a/channels.conf b/channels.conf
index 1f62f70d9..9c904916e 100644
--- a/channels.conf
+++ b/channels.conf
@@ -192,4 +192,6 @@ Video Italia:12610:v:0:22000:121:122:0:0:12220
 AC 3 promo:12670:v:0:22000:308:256:0:0:0
 ORF/ZDF:12699:h:0:22000:506:507:0:0:13012
 VIVA:12670:v:0:22000:309:310:0:0:12732
+VIVA2:12552:v:0:22000:171:172:0:0:12120
 MTV Central Europe:12699:v:0:22000:3031:3032:0:0:28643
+IFA-TV:10832:h:0:22000:132:133:32:0:7251
diff --git a/config.c b/config.c
index aed32549d..ad4b9dad4 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.55 2001/08/17 13:02:01 kls Exp $
+ * $Id: config.c 1.59 2001/08/26 14:46:43 kls Exp $
  */
 
 #include "config.h"
@@ -394,6 +394,13 @@ cTimer& cTimer::operator= (const cTimer &Timer)
   return *this;
 }
 
+bool cTimer::operator< (const cTimer &Timer)
+{
+  time_t t1 = StartTime();
+  time_t t2 = (*(cTimer *)&Timer).StartTime();
+  return t1 < t2 || (t1 == t2 && priority > Timer.priority);
+}
+
 const char *cTimer::ToText(cTimer *Timer)
 {
   delete buffer;
@@ -415,13 +422,6 @@ int cTimer::TimeToInt(int t)
   return (t / 100 * 60 + t % 100) * 60;
 }
 
-time_t cTimer::Day(time_t t)
-{
-  struct tm d = *localtime(&t);
-  d.tm_hour = d.tm_min = d.tm_sec = 0;
-  return mktime(&d);
-}
-
 int cTimer::ParseDay(const char *s)
 {
   char *tail;
@@ -511,43 +511,66 @@ bool cTimer::IsSingleEvent(void)
   return (day & 0x80000000) == 0;
 }
 
+int cTimer::GetMDay(time_t t)
+{
+  return localtime(&t)->tm_mday;
+}
+
+int cTimer::GetWDay(time_t t)
+{
+  int weekday = localtime(&t)->tm_wday;
+  return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
+}
+
+bool cTimer::DayMatches(time_t t)
+{
+  return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
+}
+
+time_t cTimer::IncDay(time_t t, int Days)
+{
+  tm tm = *localtime(&t);
+  tm.tm_mday += Days; // now tm_mday may be out of its valid range
+  int h = tm.tm_hour; // save original hour to compensate for DST change
+  t = mktime(&tm);    // normalize all values
+  tm.tm_hour = h;     // compensate for DST change
+  return mktime(&tm); // calculate final result
+}
+
+time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
+{
+  tm tm = *localtime(&t);
+  tm.tm_hour = SecondsFromMidnight / 3600;
+  tm.tm_min = (SecondsFromMidnight % 3600) / 60;
+  tm.tm_sec =  SecondsFromMidnight % 60;
+  return mktime(&tm);
+}
+
 bool cTimer::Matches(time_t t)
 {
-  if (active) {
-     if (t == 0)
-        t = time(NULL);
-     struct tm now = *localtime(&t);
-     int weekday = now.tm_wday == 0 ? 6 : now.tm_wday - 1; // we start with monday==0!
-     int begin = TimeToInt(start);
-     int end   = TimeToInt(stop);
-     bool twoDays = (end < begin);
-
-     bool todayMatches = false, yesterdayMatches = false;
-     if ((day & 0x80000000) != 0) {
-        if ((day & (1 << weekday)) != 0)
-           todayMatches = true;
-        else if (twoDays) {
-           int yesterday = weekday == 0 ? 6 : weekday - 1;
-           if ((day & (1 << yesterday)) != 0)
-              yesterdayMatches = true;
-           }
-        }
-     else if (day == now.tm_mday)
-        todayMatches = true;
-     else if (twoDays) {
-        time_t ty = t - SECSINDAY;
-        if (day == localtime(&ty)->tm_mday)
-           yesterdayMatches = true;
-        }
-     if (todayMatches || (twoDays && yesterdayMatches)) {
-        startTime = Day(t - (yesterdayMatches ? SECSINDAY : 0)) + begin;
-        stopTime  = startTime + (twoDays ? SECSINDAY - begin + end : end - begin);
-        }
-     else
-        startTime = stopTime = 0;
-     return startTime <= t && t <= stopTime;
-     }
-  return false;
+  startTime = stopTime = 0;
+  if (t == 0)
+     t = time(NULL);
+
+  int begin  = TimeToInt(start); // seconds from midnight
+  int length = TimeToInt(stop) - begin;
+  if (length < 0)
+     length += SECSINDAY;
+
+  int DaysToCheck = IsSingleEvent() ? 31 : 7;
+  for (int i = -1; i <= DaysToCheck; i++) {
+      time_t t0 = IncDay(t, i);
+      if (DayMatches(t0)) {
+         time_t a = SetTime(t0, begin);
+         time_t b = a + length;
+         if (t <= b) {
+            startTime = a;
+            stopTime = b;
+            break;
+            }
+         }
+      }
+  return active && startTime <= t && t <= stopTime;
 }
 
 time_t cTimer::StartTime(void)
@@ -575,21 +598,6 @@ void cTimer::SetPending(bool Pending)
   pending = Pending;
 }
 
-cTimer *cTimer::GetMatch(void)
-{
-  time_t t = time(NULL); // all timers must be checked against the exact same time to correctly handle Priority!
-  cTimer *t0 = NULL;
-  cTimer *ti = (cTimer *)Timers.First();
-  while (ti) {
-        if (!ti->recording && ti->Matches(t)) {
-           if (!t0 || ti->priority > t0->priority)
-              t0 = ti;
-           }
-        ti = (cTimer *)ti->Next();
-        }
-  return t0;
-}
-
 // --- cCommand -------------------------------------------------------------
 
 char *cCommand::result = NULL;
@@ -753,6 +761,33 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
   return NULL;
 }
 
+cTimer *cTimers::GetMatch(void)
+{
+  time_t t = time(NULL); // all timers must be checked against the exact same time to correctly handle Priority!
+  cTimer *t0 = NULL;
+  cTimer *ti = First();
+  while (ti) {
+        if (!ti->recording && ti->Matches(t)) {
+           if (!t0 || ti->priority > t0->priority)
+              t0 = ti;
+           }
+        ti = (cTimer *)ti->Next();
+        }
+  return t0;
+}
+
+cTimer *cTimers::GetNextActiveTimer(void)
+{
+  cTimer *t0 = NULL;
+  cTimer *ti = First();
+  while (ti) {
+        if (ti->active && (!t0 || *ti < *t0))
+           t0 = ti;
+        ti = (cTimer *)ti->Next();
+        }
+  return t0;
+}
+
 // -- cSetup -----------------------------------------------------------------
 
 cSetup Setup;
@@ -776,6 +811,7 @@ cSetup::cSetup(void)
   EPGScanTimeout = 5;
   EPGBugfixLevel = 2;
   SVDRPTimeout = 300;
+  SortTimers = 1;
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 50;
@@ -783,6 +819,7 @@ cSetup::cSetup(void)
   ChannelInfoPos = 0;
   OSDwidth = 52;
   OSDheight = 18;
+  MaxVideoFileSize = MAXVIDEOFILESIZE;
   CurrentChannel = -1;
 }
 
@@ -807,6 +844,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
      else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
      else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
+     else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
      else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
      else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
      else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
@@ -814,6 +852,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
      else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
      else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
+     else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
      else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
      else
         return false;
@@ -873,6 +912,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
         fprintf(f, "EPGBugfixLevel     = %d\n", EPGBugfixLevel);
         fprintf(f, "SVDRPTimeout       = %d\n", SVDRPTimeout);
+        fprintf(f, "SortTimers         = %d\n", SortTimers);
         fprintf(f, "PrimaryLimit       = %d\n", PrimaryLimit);
         fprintf(f, "DefaultPriority    = %d\n", DefaultPriority);
         fprintf(f, "DefaultLifetime    = %d\n", DefaultLifetime);
@@ -880,6 +920,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
         fprintf(f, "OSDwidth           = %d\n", OSDwidth);
         fprintf(f, "OSDheight          = %d\n", OSDheight);
+        fprintf(f, "MaxVideoFileSize   = %d\n", MaxVideoFileSize);
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
         f.Close();
         isyslog(LOG_INFO, "saved setup to %s", FileName);
diff --git a/config.h b/config.h
index ce77598b0..70f35740b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.61 2001/08/17 13:00:48 kls Exp $
+ * $Id: config.h 1.66 2001/08/26 14:46:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.92"
+#define VDRVERSION "0.93"
 
 #define MaxBuffer 10000
 
@@ -137,18 +137,22 @@ class cTimer : public cListObject {
   cTimer(const cEventInfo *EventInfo);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
+  bool operator< (const cTimer &Timer);
   const char *ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void);
+  int GetMDay(time_t t);
+  int GetWDay(time_t t);
+  bool DayMatches(time_t t);
+  time_t IncDay(time_t t, int Days);
+  time_t SetTime(time_t t, int SecondsFromMidnight);
   bool Matches(time_t t = 0);
   time_t StartTime(void);
   time_t StopTime(void);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
-  static cTimer *GetMatch(void);
   static int TimeToInt(int t);
-  static time_t Day(time_t t);
   static int ParseDay(const char *s);
   static const char *PrintDay(int d);
   };
@@ -251,6 +255,8 @@ class cChannels : public cConfig<cChannel> {
 class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
+  cTimer *GetMatch(void);
+  cTimer *GetNextActiveTimer(void);
   };
 
 class cCommands : public cConfig<cCommand> {};
@@ -282,11 +288,13 @@ class cSetup {
   int EPGScanTimeout;
   int EPGBugfixLevel;
   int SVDRPTimeout;
+  int SortTimers;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int VideoFormat;
   int ChannelInfoPos;
   int OSDwidth, OSDheight;
+  int MaxVideoFileSize;
   int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);
diff --git a/dvbapi.c b/dvbapi.c
index 6ff39b3df..51434e12a 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.109 2001/08/19 15:09:48 kls Exp $
+ * $Id: dvbapi.c 1.110 2001/08/25 13:52:38 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -50,20 +50,16 @@ extern "C" {
 #define DEV_OST_VIDEO  "/dev/ost/video"
 #define DEV_OST_AUDIO  "/dev/ost/audio"
 
+#define KILOBYTE(n) ((n) * 1024)
+#define MEGABYTE(n) ((n) * 1024 * 1024)
+
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE    (1024*1024)
+#define VIDEOBUFSIZE  MEGABYTE(1)
 
 // The maximum size of a single frame:
-#define MAXFRAMESIZE (192*1024)
-
-// The maximum file size is limited by the range that can be covered
-// with 'int'. 4GB might be possible (if the range is considered
-// 'unsigned'), 2GB should be possible (even if the range is considered
-// 'signed'), so let's use 1GB for absolute safety (the actual file size
-// may be slightly higher because we stop recording only before the next
-// 'I' frame, to have a complete Group Of Pictures):
-#define MAXVIDEOFILESIZE (1024*1024*1024) // Byte
+#define MAXFRAMESIZE  KILOBYTE(192)
+
 #define MAXFILESPERRECORDING 255
 
 #define MINFREEDISKSPACE    (512) // MB
@@ -517,7 +513,7 @@ bool cRecordBuffer::RunningLowOnDiskSpace(void)
 bool cRecordBuffer::NextFile(void)
 {
   if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
-     if (fileSize > MAXVIDEOFILESIZE || RunningLowOnDiskSpace()) {
+     if (fileSize > MEGABYTE(Setup.MaxVideoFileSize) || RunningLowOnDiskSpace()) {
         recordFile = fileName.NextFile();
         fileSize = 0;
         }
@@ -2217,7 +2213,7 @@ void cCuttingBuffer::Action(void)
            // Write one frame:
 
            if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
-              if (FileSize > MAXVIDEOFILESIZE) {
+              if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
                  toFile = toFileName->NextFile();
                  if (toFile < 0)
                     break;
diff --git a/dvbapi.h b/dvbapi.h
index 2cd57bfa1..c93a9f35d 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.46 2001/08/11 12:22:01 kls Exp $
+ * $Id: dvbapi.h 1.47 2001/08/25 13:37:00 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -42,6 +42,15 @@ typedef struct CRect {
 
 #define FRAMESPERSEC 25
 
+// The maximum file size is limited by the range that can be covered
+// with 'int'. 4GB might be possible (if the range is considered
+// 'unsigned'), 2GB should be possible (even if the range is considered
+// 'signed'), so let's use 2000MB for absolute safety (the actual file size
+// may be slightly higher because we stop recording only before the next
+// 'I' frame, to have a complete Group Of Pictures):
+#define MAXVIDEOFILESIZE 2000 // MB
+#define MINVIDEOFILESIZE  100 // MB
+
 const char *IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
 int HMSFToIndex(const char *HMSF);
diff --git a/i18n.c b/i18n.c
index 987822862..35a6bb1e9 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.32 2001/08/17 13:03:15 kls Exp $
+ * $Id: i18n.c 1.35 2001/08/26 13:45:10 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -794,6 +794,15 @@ const tPhrase Phrases[] = {
     "Temps maxi SVDRP",
     "Ubrukt SVDRP-levetid",
   },
+  { "SortTimers",
+    "Timer sortieren",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "PrimaryLimit",
     "Prim�r-Limit",
     "", // TODO
@@ -857,6 +866,15 @@ const tPhrase Phrases[] = {
     "Hauteur affichage",
     "", // TODO
   },
+  { "MaxVideoFileSize",
+    "Max. Video Dateigr��e",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
@@ -867,6 +885,15 @@ const tPhrase Phrases[] = {
     "LMMJVSD",
     "MTOTFLS",
   },
+  { "MonTueWedThuFriSatSun", // must all be 3 letters!
+    "MonDieMitDonFreSamSon",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Learning keys:
   { "Learning Remote Control Keys",
     "Fernbedienungs-Codes lernen",
diff --git a/interface.c b/interface.c
index e2d83b359..1e06f4af2 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.40 2001/08/07 16:23:28 kls Exp $
+ * $Id: interface.c 1.41 2001/08/25 13:15:00 kls Exp $
  */
 
 #include "interface.h"
@@ -271,7 +271,7 @@ void cInterface::Title(const char *s)
      unsigned int n = t - s;
      if (n >= sizeof(buffer))
         n = sizeof(buffer) - 1;
-     strn0cpy(buffer, s, n);
+     strn0cpy(buffer, s, n + 1);
      Write(1, 0, buffer, clrBlack, clrCyan);
      t++;
      Write(-(cDvbApi::PrimaryDvbApi->WidthInCells(t) + 1), 0, t, clrBlack, clrCyan);
diff --git a/libdtv/x.txt b/libdtv/x.txt
new file mode 100644
index 000000000..0d12dddb8
--- /dev/null
+++ b/libdtv/x.txt
@@ -0,0 +1,55 @@
+Hallo ZDF-EPG-Redaktion!
+
+Es w�rde mich interessieren, warum im digitalen EPG des
+ZDF (�ber Astra) die Beschreibung der Sendungen oftmals
+Trennungsstriche und zus�tzliche Leerzeichen enth�lt.
+So zum Beispiel bei folgendem Eintrag:
+
+----------------------------------------------------
+ ZDF                           23.08  10:50 - 11:35 
+                                                    
+ Mit Leib und Seele                                 
+                                                    
+ Der einzige Mensch                                 
+                                                    
+ Stehlin hat die Fr�hmesse abge- sagt und sein      
+ Kommen im Pfarr- haus angek�ndigt. August, erbost  
+ �ber die Heimlichkeiten und Re- dereien von        
+ Stutz, erzwingt eine Aussprache mit Stehlin.     
+----------------------------------------------------
+
+der ohne Trennungsstriche so aussehen k�nnte:
+
+----------------------------------------------------
+ ZDF                           23.08  10:50 - 11:35 
+                                                    
+ Mit Leib und Seele                                 
+                                                    
+ Der einzige Mensch                                 
+                                                    
+ Stehlin hat die Fr�hmesse abgesagt und sein        
+ Kommen im Pfarrhaus angek�ndigt. August, erbost    
+ �ber die Heimlichkeiten und Redereien von Stutz,   
+ erzwingt eine Aussprache mit Stehlin.              
+----------------------------------------------------
+
+Ich kann mir das nur so erkl�ren, da� Sie konkrete Annahmen
+dar�ber machen, mit welcher Zeilenl�nge die Set-Top-Box diese
+Texte darstellt - aber das ist in meinen Augen eine ziemlich
+verwegene Annahme, denn es sollte ja wohl der STB �berlassen bleiben,
+wie gro� das Fenster f�r die Darstellung des EPG ist.
+
+Pro-7 zum Beispiel macht sowas nicht, wodurch der Text deultich
+besser dargestellt wird.
+
+Wenn Sie wenigstens nach dem (bzw. statt des) Bindestrich(s) ein deutlich
+erkennbares Sonderzeichen einf�gen w�rden, dann k�nnte man das zuverl�ssig
+herausfiltern, aber so macht der ZDF-EPG immer wieder einen
+schlechten Eindruck.
+
+�ber eine Antwort von Ihnen w�rde ich mich sehr freuen.
+
+MfG
+Klaus Schmidinger
+
+
diff --git a/menu.c b/menu.c
index 4cc43f099..6d6eae8e2 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.105 2001/08/19 14:45:31 kls Exp $
+ * $Id: menu.c 1.109 2001/08/26 14:03:27 kls Exp $
  */
 
 #include "menu.h"
@@ -957,25 +957,30 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 
 class cMenuTimerItem : public cOsdItem {
 private:
-  int index;
   cTimer *timer;
 public:
-  cMenuTimerItem(int Index, cTimer *Timer);
+  cMenuTimerItem(cTimer *Timer);
+  virtual bool operator< (const cListObject &ListObject);
   virtual void Set(void);
+  cTimer *Timer(void) { return timer; }
   };
 
-cMenuTimerItem::cMenuTimerItem(int Index, cTimer *Timer)
+cMenuTimerItem::cMenuTimerItem(cTimer *Timer)
 {
-  index = Index;
   timer = Timer;
   Set();
 }
 
+bool cMenuTimerItem::operator< (const cListObject &ListObject)
+{
+  return *timer < *((cMenuTimerItem *)&ListObject)->timer;
+}
+
 void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
-                    timer->active ? '>' : ' ',
+                    timer->active ? timer->recording ? '#' : '>' : ' ',
                     timer->channel,
                     timer->PrintDay(timer->day),
                     timer->start / 100,
@@ -996,6 +1001,7 @@ class cMenuTimers : public cOsdMenu {
   eOSState Del(void);
   virtual void Move(int From, int To);
   eOSState Summary(void);
+  cTimer *CurrentTimer(void);
 public:
   cMenuTimers(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -1008,15 +1014,23 @@ cMenuTimers::cMenuTimers(void)
   cTimer *timer;
 
   while ((timer = Timers.Get(i)) != NULL) {
-        Add(new cMenuTimerItem(i, timer));
+        Add(new cMenuTimerItem(timer));
         i++;
         }
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
+  if (Setup.SortTimers)
+     Sort();
+  SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? NULL : tr("Mark"));
+}
+
+cTimer *cMenuTimers::CurrentTimer(void)
+{
+  cMenuTimerItem *item = (cMenuTimerItem *)Get(Current());
+  return item ? item->Timer() : NULL;
 }
 
 eOSState cMenuTimers::Activate(bool On)
 {
-  cTimer *timer = Timers.Get(Current());
+  cTimer *timer = CurrentTimer();
   if (timer && timer->active != On) {
      timer->active = On;
      RefreshCurrent();
@@ -1031,8 +1045,8 @@ eOSState cMenuTimers::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog(LOG_INFO, "editing timer %d", Current() + 1);
-  return AddSubMenu(new cMenuEditTimer(Current()));
+  isyslog(LOG_INFO, "editing timer %d", CurrentTimer()->Index() + 1);
+  return AddSubMenu(new cMenuEditTimer(CurrentTimer()->Index()));
 }
 
 eOSState cMenuTimers::New(void)
@@ -1041,22 +1055,22 @@ eOSState cMenuTimers::New(void)
      return osContinue;
   cTimer *timer = new cTimer;
   Timers.Add(timer);
-  Add(new cMenuTimerItem(timer->Index()/*XXX*/, timer), true);
+  Add(new cMenuTimerItem(timer), true);
   Timers.Save();
   isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
-  return AddSubMenu(new cMenuEditTimer(Current(), true));
+  return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
 }
 
 eOSState cMenuTimers::Del(void)
 {
   // Check if this timer is active:
-  int Index = Current();
-  cTimer *ti = Timers.Get(Index);
+  cTimer *ti = CurrentTimer();
   if (ti) {
      if (!ti->recording) {
         if (Interface->Confirm(tr("Delete timer?"))) {
-           Timers.Del(Timers.Get(Index));
-           cOsdMenu::Del(Index);
+           int Index = ti->Index();
+           Timers.Del(ti);
+           cOsdMenu::Del(Current());
            Timers.Save();
            Display();
            isyslog(LOG_INFO, "timer %d deleted", Index + 1);
@@ -1081,7 +1095,7 @@ eOSState cMenuTimers::Summary(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  cTimer *ti = Timers.Get(Current());
+  cTimer *ti = CurrentTimer();
   if (ti && ti->summary && *ti->summary)
      return AddSubMenu(new cMenuText(tr("Summary"), ti->summary));
   return Edit(); // convenience for people not using the Summary feature ;-)
@@ -1109,7 +1123,9 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        case kRed:    return Edit();
        case kGreen:  return New();
        case kYellow: return Del();
-       case kBlue:   Mark(); break;
+       case kBlue:   if (!Setup.SortTimers)
+                        Mark();
+                     break;
        default: break;
        }
      }
@@ -1137,6 +1153,7 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
         char *buffer;
         asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->name, 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
         SetTitle(buffer, false);
+        delete buffer;
         int Line = 2;
         cMenuTextItem *item;
         const char *Title = eventInfo->GetTitle();
@@ -1377,7 +1394,8 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
   Clear();
   char *buffer = NULL;
   asprintf(&buffer, tr("Schedule - %s"), Channel->name);
-  SetTitle(buffer, false);
+  SetTitle(buffer);
+  delete buffer;
   if (schedules) {
      const cSchedule *Schedule = Channel->pnr ? schedules->GetSchedule(Channel->pnr) : schedules->GetSchedule();
      int num = Schedule->NumEvents();
@@ -1704,6 +1722,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, 3));
   Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
+  Add(new cMenuEditBoolItem(tr("SortTimers"),         &data.SortTimers));
   Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultPriority"),    &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultLifetime"),    &data.DefaultLifetime, 0, MAXLIFETIME));
@@ -1711,6 +1730,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
+  Add(new cMenuEditIntItem( tr("MaxVideoFileSize"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1951,10 +1971,8 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
      snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
   Interface->Fill(0, 0, Setup.OSDwidth, 1, clrBackground);
   Interface->Write(0, 0, buffer);
-  time_t t = time(NULL);
-  struct tm *now = localtime(&t);
-  snprintf(buffer, BufSize, "%02d:%02d", now->tm_hour, now->tm_min);
-  Interface->Write(-5, 0, buffer);
+  const char *date = DayDateTime();
+  Interface->Write(-strlen(date), 0, date);
 }
 
 void cDisplayChannel::DisplayInfo(void)
diff --git a/osd.c b/osd.c
index daedc1ee4..02f437481 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.17 2001/08/02 14:18:17 kls Exp $
+ * $Id: osd.c 1.18 2001/08/25 13:15:16 kls Exp $
  */
 
 #include "osd.h"
@@ -78,7 +78,8 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
   hasHotkeys = false;
   visible = false;
-  title = strdup(Title);
+  title = NULL;
+  SetTitle(Title);
   cols[0] = c0;
   cols[1] = c1;
   cols[2] = c2;
@@ -109,10 +110,13 @@ void cOsdMenu::SetStatus(const char *s)
      Interface->Status(status);
 }
 
-void cOsdMenu::SetTitle(const char *Title, bool Copy)
+void cOsdMenu::SetTitle(const char *Title, bool ShowDate)
 {
   delete title;
-  title = Copy ? strdup(Title) : Title;
+  if (ShowDate)
+     asprintf(&title, "%s\t%s", Title, DayDateTime(time(NULL)));
+  else
+     title = strdup(Title);
 }
 
 void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
diff --git a/osd.h b/osd.h
index ec1b11571..2d243f166 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.23 2001/08/02 13:48:34 kls Exp $
+ * $Id: osd.h 1.24 2001/08/25 12:56:46 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -72,7 +72,7 @@ class cOsdBase {
 
 class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
 private:
-  const char *title;
+  char *title;
   int cols[cInterface::MaxCols];
   int first, current, marked;
   cOsdMenu *subMenu;
@@ -94,7 +94,7 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   eOSState AddSubMenu(cOsdMenu *SubMenu);
   bool HasSubMenu(void) { return subMenu; }
   void SetStatus(const char *s);
-  void SetTitle(const char *Title, bool Copy = true);
+  void SetTitle(const char *Title, bool ShowDate = true);
   void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   virtual void Del(int Index);
 public:
diff --git a/tools.c b/tools.c
index 30b675b2e..f51bc85d4 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.40 2001/08/17 12:45:42 kls Exp $
+ * $Id: tools.c 1.43 2001/08/26 15:45:41 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -17,7 +17,9 @@
 #endif
 #include <stdlib.h>
 #include <sys/time.h>
+#include <time.h>
 #include <unistd.h>
+#include "i18n.h"
 
 #define MaxBuffer 1000
 
@@ -395,6 +397,20 @@ bool SpinUpDisk(const char *FileName)
   return false;
 }
 
+const char *DayDateTime(time_t t)
+{
+  static char buffer[32];
+  if (t == 0)
+     time(&t);
+  tm *tm = localtime(&t);
+  int weekday = tm->tm_wday == 0 ? 6 : tm->tm_wday - 1; // we start with monday==0!
+  const char *day = tr("MonTueWedThuFriSatSun");
+  day += weekday * 3;
+  strncpy(buffer, day, 3);
+  snprintf(buffer + 3, sizeof(buffer) - 3, " %2d.%02d %02d:%02d", tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
+  return buffer;
+}
+
 // --- cFile -----------------------------------------------------------------
 
 bool cFile::files[FD_SETSIZE] = { false };
@@ -677,3 +693,19 @@ int cListBase::Count(void) const
   return n;
 }
 
+void cListBase::Sort(void)
+{
+  bool swapped;
+  do {
+     swapped = false;
+     cListObject *object = objects;
+     while (object) {
+           if (object->Next() && *object->Next() < *object) {
+              Move(object->Next(), object);
+              swapped = true;
+              }
+           object = object->Next();
+           }
+     } while (swapped);
+}
+
diff --git a/tools.h b/tools.h
index af7958fef..2f89f3f0e 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.29 2001/08/17 12:44:39 kls Exp $
+ * $Id: tools.h 1.31 2001/08/26 12:52:49 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -55,6 +55,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
+const char *DayDateTime(time_t t = 0);
 
 class cFile {
 private:
@@ -94,6 +95,7 @@ class cListObject {
 public:
   cListObject(void);
   virtual ~cListObject();
+  virtual bool operator< (const cListObject &ListObject) { return false; }
   void Append(cListObject *Object);
   void Unlink(void);
   int Index(void);
@@ -114,6 +116,7 @@ class cListBase {
   virtual void Clear(void);
   cListObject *Get(int Index) const;
   int Count(void) const;
+  void Sort(void);
   };
 
 template<class T> class cList : public cListBase {
diff --git a/vdr.c b/vdr.c
index af305419a..3f8f8da83 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.63 2001/08/11 15:33:30 kls Exp $
+ * $Id: vdr.c 1.64 2001/08/26 15:02:00 kls Exp $
  */
 
 #include <getopt.h>
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
            }
         // Timers and Recordings:
         if (!Menu) {
-           cTimer *Timer = cTimer::GetMatch();
+           cTimer *Timer = Timers.GetMatch();
            if (Timer) {
               if (!cRecordControls::Start(Timer))
                  Timer->SetPending(true);

From bb18b9e0b449afff418f010c1b2e255acd3fbad3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 2 Sep 2001 18:00:00 +0200
Subject: [PATCH 024/307] Version 0.94 - Implemented automatic shutdown (see
 INSTALL and MANUAL for details). - New SVDRP command NEXT to show the next
 timer event. - The new remote control key "Power" can be used to turn the VDR
 machine   off (this requires the presence of the '-s' option). - Fixed code
 for the default "Ok" button on the PC keyboard (was 0x162 on   the "good old"
 keyboards (with the F-keys at the left side), while it changed   to 0x15E on
 the newer keyboards). - When a recording is edited, the summary information
 (if present) is now   also copied. - When a recording is running on the
 primary interface, any attempt to change   the current channel will now lead
 to a "Channel locked" message. - The main program loop now first checks
 whether any timer recordings are   finished, before starting a new timer
 recording. This is important in case   one timer ends at the same time
 another timer starts. - New setup parameter OSDMessageTime to define how long
 an OSD message shall   be displayed. - The "File" parameter of a timer can
 now contain the '~' character to store   the recording in a hierarchical
 directory structure. The '~' character has   been chosen since the file
 system's directory delimiter '/' may be part of   a regular programme name
 (showing the directory hierarchy in the "Recordings"   menu will follow
 later). - Repeating timers now create recordings that contain the 'Subtitle'
 information   from the EPG data in their file name. Typically (on tv stations
 that care   about their viewers) this contains the episode title of a series.
 The   subtitle is appended to the timer's file name, separated by a '~'
 character,   so that it results in all recordings of this timer being
 collected in a   common subdirectory. You can disable this with the
 'UseSubtitle' parameter   in the "Setup" menu. - The summary information is
 now taken from the EPG data at the actual time of   recording (no longer at
 the time the timer is created in the "Schedule" menu).   If a timer already
 has summary data, that data will be used. If you have   repeating timers in
 your 'timers.conf', you may want to make sure they do   NOT contain any
 summary information (that's the last field in the timer   definitions). Use
 your favourite text editor to delete that information.   That way every
 recording will store the actual summary data at the time of   the recording.

---
 FORMATS      |   4 +-
 HISTORY      |  39 ++++++++++++++++
 INSTALL      |  52 +++++++++++++++++++++
 MANUAL       |  34 ++++++++++++++
 Makefile     |  29 ++++--------
 config.c     |  35 +++++++--------
 config.h     |  10 +++--
 dvbapi.c     |   6 ++-
 i18n.c       |  74 +++++++++++++++++++++++++++++-
 interface.c  |  15 ++++---
 interface.h  |   8 ++--
 keys-pc.conf | Bin 283 -> 300 bytes
 libdtv/x.txt |  55 -----------------------
 menu.c       |  38 +++++++---------
 menu.h       |   6 +--
 recording.c  |  49 ++++++++++++++++----
 recording.h  |   5 ++-
 svdrp.c      |  35 ++++++++++++++-
 svdrp.h      |   3 +-
 vdr.c        | 124 +++++++++++++++++++++++++++++++++++++--------------
 videodir.c   |  22 ++++++---
 21 files changed, 456 insertions(+), 187 deletions(-)
 delete mode 100644 libdtv/x.txt

diff --git a/FORMATS b/FORMATS
index 03739ee50..3c5d36d43 100644
--- a/FORMATS
+++ b/FORMATS
@@ -67,7 +67,9 @@ Video Disk Recorder File Formats
     be automatically deleted by a new recording with higher priority, 99 means
     that this recording will never be automatically deleted
   - Name of timer (will be used to name the recording); if the name contains
-    any ':' characters, these have to be replaced with '|'
+    any ':' characters, these have to be replaced with '|'. If the name shall
+    contain subdirectories, these have to be delimited by '~' (since the '/'
+    character may be part of a regular programme name).
   - Summary (any newline characters in the summary have to be replaced with '|';
     the summary may contain ':' characters)
 
diff --git a/HISTORY b/HISTORY
index 250d85728..d2be05446 100644
--- a/HISTORY
+++ b/HISTORY
@@ -676,3 +676,42 @@ Video Disk Recorder Revision History
 - Timers are now sorted in the "Timers" menu, showing the sequence in which
   they will be recording. This can be disabled in the "Setup" menu. Note
   that the "Mark" button doesn't work if timers are displayed sorted.
+
+2001-09-02: Version 0.94
+
+- Implemented automatic shutdown (see INSTALL and MANUAL for details).
+- New SVDRP command NEXT to show the next timer event.
+- The new remote control key "Power" can be used to turn the VDR machine
+  off (this requires the presence of the '-s' option).
+- Fixed code for the default "Ok" button on the PC keyboard (was 0x162 on
+  the "good old" keyboards (with the F-keys at the left side), while it changed
+  to 0x15E on the newer keyboards).
+- When a recording is edited, the summary information (if present) is now
+  also copied.
+- When a recording is running on the primary interface, any attempt to change
+  the current channel will now lead to a "Channel locked" message.
+- The main program loop now first checks whether any timer recordings are
+  finished, before starting a new timer recording. This is important in case
+  one timer ends at the same time another timer starts.
+- New setup parameter OSDMessageTime to define how long an OSD message shall
+  be displayed.
+- The "File" parameter of a timer can now contain the '~' character to store
+  the recording in a hierarchical directory structure. The '~' character has
+  been chosen since the file system's directory delimiter '/' may be part of
+  a regular programme name (showing the directory hierarchy in the "Recordings"
+  menu will follow later).
+- Repeating timers now create recordings that contain the 'Subtitle' information
+  from the EPG data in their file name. Typically (on tv stations that care
+  about their viewers) this contains the episode title of a series. The
+  subtitle is appended to the timer's file name, separated by a '~' character,
+  so that it results in all recordings of this timer being collected in a
+  common subdirectory. You can disable this with the 'UseSubtitle' parameter
+  in the "Setup" menu.
+- The summary information is now taken from the EPG data at the actual time of
+  recording (no longer at the time the timer is created in the "Schedule" menu).
+  If a timer already has summary data, that data will be used. If you have
+  repeating timers in your 'timers.conf', you may want to make sure they do
+  NOT contain any summary information (that's the last field in the timer
+  definitions). Use your favourite text editor to delete that information.
+  That way every recording will store the actual summary data at the time of
+  the recording.
diff --git a/INSTALL b/INSTALL
index 946e06de9..e15f13ee9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -98,6 +98,57 @@ call to the VDR program, be sure to NOT use the '-d' option! Otherwise
 VDR will go into 'deamon' mode and the initial program call will return
 immediately!
 
+Automatic shutdown:
+-------------------
+
+If you define a shutdown command via the '-s' command line option, VDR
+will call the given command if there is currently no recording or replay
+active, the user has been inactive for at least MinUserInactivity minutes
+and the next timer event is at least MinEventTimeout minutes in the future
+(see the Setup parameters in MANUAL).
+
+The command given in the '-s' option will be called with two parameters.
+The first one is the time (in UTC) of the next timer event (as a time_t
+type number), and the second one is the number of seconds from the current
+time until the next timer event. Your program can choose which one to use
+for programming some sort of hardware device that makes sure the computer
+will be restarted in time before the next timer event. Your program must
+also initiate the actual shutdown procedure of the computer. After this
+your program should return to VDR. VDR will not automatically exit after
+calling the shutdown program, but will rather continue normally untit it
+receives a SIGTERM when the computer is actually shut down. So in case
+the shutdown fails, or the shutdown program for some reason decides not to
+perform a shutdown, VDR will stay up and running.
+
+If there are currently no timers active, both parameters will be '0'.
+In that case the program shall not set the hardware for automatic restart
+and only perform the system shutdown. A program that uses the second parameter
+to set the hardware for restart must therefore also check whether the first
+parameter is '0'.
+
+Before the shutdown program is called, the user will be prompted to inform
+him that the system is about to shut down. If any remote control key is
+pressed while this prompt is visible, the shutdown will be cancelled (and
+tried again after another MinUserInactivity minutes). The shutdown prompt
+will be displayed for 5 minutes, which should be enough time for the user
+to react.
+
+A sample shell script to be used with the '-s' option might look like this:
+
+#!/bin/sh
+setRTCwakeup $(($1 - 300))
+sudo halt
+
+Here 'setRTCwakeup' would be some program that uses the first parameter
+(which is the absolute time of the next timer event) to set the Real Time
+Clock so that it wakes up the computer 5 minutes (i.e. 300 seconds) before
+that event. The 'sudo halt' command then shuts down the computer.
+You will have to substitute both commands with whatever applies to your
+particular hard- and software environment.
+
+If the '-s' option is present, the VDR machine can be turned off by pressing
+the "Power" key on the remote control.
+
 Command line options:
 ---------------------
 
@@ -239,6 +290,7 @@ The default PC key assignments are:
   Back                      'End' in numeric block
   Red, Green, Yellow, Blue  'F1'..'F4'
   0..9                      '0'..'9' in top row
+  Power                     'P'
 
 If you prefer different key assignments, or if the default doesn't work for
 your keyboard, simply delete the file 'keys-pc.conf' and restart 'vdr' to get
diff --git a/MANUAL b/MANUAL
index ae93099fb..c6b5efd7a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -22,6 +22,7 @@ Video Disk Recorder User's Manual
   Yellow  -           Eject DVD  Delete     Delete     -             Delete      Skip +60s
   Blue    -           Resume     Mark       Mark(1)    -             Summary     Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           Editing
+  Power   Shutdown    -          -          -          -             -           -
 
   (1) The "Mark" button in the "Timers" menu only works if sorting the timers
       has been disabled in the "Setup" menu.
@@ -284,6 +285,18 @@ Video Disk Recorder User's Manual
              time, so it is possible to have a "repeating timer" store all its
              recordings under the same name; they will be distinguishable by
              their date and time).
+             If the file name contains the special character '~', the recording
+             will be stored in a hierarchical directory structure. For instance,
+             a file name of "Sci-Fi~Star Trek~Voyager" will result in a directory
+             structure "/video/Sci-Fi/Star_Trek/Voyager". The '~' character has
+             been chosen for this since the file system's directory delimiter '/'
+             may be part of a regular programme name.
+             Repeating timers create recordings that contain the 'Subtitle'
+             information from the EPG data in their file name. Typically (on tv
+             stations that care about their viewers) this contains the episode
+             title of a series. The subtitle is appended to the timer's file name,
+             separated by a '~' character, so that it results in all recordings
+             of this timer being collected in a common subdirectory.
              If this field is left blank, the channel name will be used to form
              the name of the recording.
 
@@ -401,6 +414,14 @@ Video Disk Recorder User's Manual
                          means that this recording will never be deleted
                          automatically.
 
+  UseSubtitle = 1        Repeating timers use the EPG's 'Subtitle' information to
+                         create recording file names in a hierarchical structure
+                         (for instance to gather all episodes of a series in a
+                         common subdirectory). This parameter can be used to
+                         control this.
+                         0 = don't use the 'Subtitle'
+                         1 = use it (and create subdirectories)
+
   VideoFormat = 0        The video format (or aspect ratio) of the tv set in use.
                          0 = 4:3
                          1 = 16:9
@@ -412,11 +433,24 @@ Video Disk Recorder User's Manual
   OSDwidth  = 52         The width and height of the OSD .
   OSDheight = 18         The valid ranges are width=40...56, height=12...21.
 
+  OSDMessageTime = 1     The time (in seconds) how long an informational
+                         message shall be displayed on the OSD. The valid range
+                         is 1...60.
+
   MaxVideoFileSize=2000  The maximum size of a single recorded video file in MB.
                          The valid range is 100...2000. Default is 2000, but
                          you may want to use smaller values if you are planning
                          on archiving a recording to CD.
 
+  MinEventTimeout=120    If the command line option '-s' has been set, VDR will
+  MinUserInactivity=120  automatically shutdown the computer if the next timer
+                         event is at least MinEventTimeout minutes in the future,
+                         and the user has been inactive for at least
+                         MinUserInactivity minutes. Setting MinUserInactivity
+                         to 0 disables the automatic shutdown, while still
+                         retaining the possibility to manually shutdown the
+                         computer.
+
 * Executing system commands
 
   The "Main" menu option "Commands" allows you to execute any system commands
diff --git a/Makefile b/Makefile
index 067f34abc..f39be0886 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.26 2001/08/15 13:56:11 kls Exp $
+# $Id: Makefile 1.27 2001/08/31 13:13:30 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -59,25 +59,12 @@ font: genfontfile fontfix.c fontosd.c
 
 # Dependencies:
 
-config.o    : config.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-dvbapi.o    : dvbapi.c $(AC3DIR)/ac3.h config.h dvbapi.h dvbosd.h dvd.h eit.h font.h recording.h remux.h ringbuffer.h thread.h tools.h videodir.h
-dvbosd.o    : dvbosd.c dvbosd.h font.h tools.h
-dvd.o       : dvd.c dvd.h
-eit.o       : eit.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h $(DTVDIR)/libdtv.h thread.h tools.h videodir.h
-font.o      : font.c font.h fontfix.c fontosd.c tools.h
-i18n.o      : i18n.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h thread.h tools.h
-interface.o : interface.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h remote.h svdrp.h thread.h tools.h
-menu.o      : menu.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h
-osd.o       : osd.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h osd.h remote.h svdrp.h thread.h tools.h
-recording.o : recording.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h interface.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
-remote.o    : remote.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h remote.h thread.h tools.h
-remux.o     : remux.c remux.h thread.h tools.h
-ringbuffer.o: ringbuffer.c ringbuffer.h thread.h tools.h
-svdrp.o     : svdrp.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h interface.h remote.h svdrp.h thread.h tools.h
-thread.o    : thread.c thread.h tools.h
-tools.o     : tools.c tools.h
-vdr.o       : vdr.c config.h dvbapi.h dvbosd.h dvd.h eit.h font.h i18n.h interface.h menu.h osd.h recording.h remote.h svdrp.h thread.h tools.h videodir.h
-videodir.o  : videodir.c tools.h videodir.h
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+include $(DEPFILE)
 
 # The main program:
 
@@ -111,7 +98,7 @@ $(DTVLIB) $(DTVDIR)/libdtv.h:
 clean:
 	make -C $(AC3DIR) clean
 	make -C $(DTVDIR) clean
-	-rm -f $(OBJS) vdr genfontfile genfontfile.o core *~
+	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core *~
 fontclean:
 	-rm -f fontfix.c fontosd.c
 CLEAN: clean fontclean
diff --git a/config.c b/config.c
index ad4b9dad4..a97d7e4c4 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.59 2001/08/26 14:46:43 kls Exp $
+ * $Id: config.c 1.64 2001/09/02 15:04:13 kls Exp $
  */
 
 #include "config.h"
@@ -38,6 +38,7 @@ tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { k7,             "7",             0 },
                     { k8,             "8",             0 },
                     { k9,             "9",             0 },
+                    { kPower,         "Power",         0 },
                     { kNone,          "",              0 },
                   };
 
@@ -364,21 +365,6 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   if (!isempty(Title))
      strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
   summary = NULL;
-  const char *Subtitle = EventInfo->GetSubtitle();
-  if (isempty(Subtitle))
-     Subtitle = "";
-  const char *Summary = EventInfo->GetExtendedDescription();
-  if (isempty(Summary))
-     Summary = "";
-  if (*Subtitle || *Summary) {
-     asprintf(&summary, "%s%s%s", Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
-     char *p = summary;
-     while (*p) {
-           if (*p == '\n')
-              *p = '|';
-           p++;
-           }
-     }
 }
 
 cTimer::~cTimer()
@@ -570,7 +556,7 @@ bool cTimer::Matches(time_t t)
             }
          }
       }
-  return active && startTime <= t && t <= stopTime;
+  return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
 }
 
 time_t cTimer::StartTime(void)
@@ -761,9 +747,8 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
   return NULL;
 }
 
-cTimer *cTimers::GetMatch(void)
+cTimer *cTimers::GetMatch(time_t t)
 {
-  time_t t = time(NULL); // all timers must be checked against the exact same time to correctly handle Priority!
   cTimer *t0 = NULL;
   cTimer *ti = First();
   while (ti) {
@@ -815,11 +800,15 @@ cSetup::cSetup(void)
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 50;
+  UseSubtitle = 1;
   VideoFormat = VIDEO_FORMAT_4_3;
   ChannelInfoPos = 0;
   OSDwidth = 52;
   OSDheight = 18;
+  OSDMessageTime = 1;
   MaxVideoFileSize = MAXVIDEOFILESIZE;
+  MinEventTimeout = 120;
+  MinUserInactivity = 120;
   CurrentChannel = -1;
 }
 
@@ -848,11 +837,15 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
      else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
      else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+     else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
      else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
      else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
      else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
      else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
+     else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
      else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
+     else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
+     else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
      else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
      else
         return false;
@@ -916,11 +909,15 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "PrimaryLimit       = %d\n", PrimaryLimit);
         fprintf(f, "DefaultPriority    = %d\n", DefaultPriority);
         fprintf(f, "DefaultLifetime    = %d\n", DefaultLifetime);
+        fprintf(f, "UseSubtitle        = %d\n", UseSubtitle);
         fprintf(f, "VideoFormat        = %d\n", VideoFormat);
         fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
         fprintf(f, "OSDwidth           = %d\n", OSDwidth);
         fprintf(f, "OSDheight          = %d\n", OSDheight);
+        fprintf(f, "OSDMessageTime     = %d\n", OSDMessageTime);
         fprintf(f, "MaxVideoFileSize   = %d\n", MaxVideoFileSize);
+        fprintf(f, "MinEventTimeout    = %d\n", MinEventTimeout);
+        fprintf(f, "MinUserInactivity  = %d\n", MinUserInactivity);
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
         f.Close();
         isyslog(LOG_INFO, "saved setup to %s", FileName);
diff --git a/config.h b/config.h
index 70f35740b..c3fab9a8a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.66 2001/08/26 14:46:53 kls Exp $
+ * $Id: config.h 1.72 2001/09/02 15:45:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.93"
+#define VDRVERSION "0.94"
 
 #define MaxBuffer 10000
 
@@ -44,6 +44,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kYellow,
              kBlue,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+             kPower,
              kNone,
              // The following flags are OR'd with the above codes:
              k_Repeat  = 0x8000,
@@ -255,7 +256,7 @@ class cChannels : public cConfig<cChannel> {
 class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
-  cTimer *GetMatch(void);
+  cTimer *GetMatch(time_t t);
   cTimer *GetNextActiveTimer(void);
   };
 
@@ -291,10 +292,13 @@ class cSetup {
   int SortTimers;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
+  int UseSubtitle;
   int VideoFormat;
   int ChannelInfoPos;
   int OSDwidth, OSDheight;
+  int OSDMessageTime;
   int MaxVideoFileSize;
+  int MinEventTimeout, MinUserInactivity;
   int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);
diff --git a/dvbapi.c b/dvbapi.c
index 51434e12a..8e502ed15 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.110 2001/08/25 13:52:38 kls Exp $
+ * $Id: dvbapi.c 1.111 2001/09/01 13:27:52 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -2256,8 +2256,10 @@ cCuttingBuffer *cVideoCutter::cuttingBuffer = NULL;
 bool cVideoCutter::Start(const char *FileName)
 {
   if (!cuttingBuffer) {
-     const char *EditedVersionName = PrefixVideoFileName(FileName, '%');
+     cRecording Recording(FileName);
+     const char *EditedVersionName = Recording.PrefixFileName('%');
      if (EditedVersionName && RemoveVideoFile(EditedVersionName) && MakeDirs(EditedVersionName, true)) {
+        Recording.WriteSummary();
         cuttingBuffer = new cCuttingBuffer(FileName, EditedVersionName);
         return true;
         }
diff --git a/i18n.c b/i18n.c
index 35a6bb1e9..086d85a3c 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.35 2001/08/26 13:45:10 kls Exp $
+ * $Id: i18n.c 1.39 2001/09/02 15:17:33 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -385,6 +385,24 @@ const tPhrase Phrases[] = {
     "Annuler les modifications?",
     "Avbryte redigering",
   },
+  { "Recording - shut down anyway?",
+    "Aufnahme l�uft - trotzdem ausschalten?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Press any key to cancel shutdown",
+    "Taste dr�cken um Shutdown abzubrechen",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Channel parameters:
   { "Name",
     "Name",
@@ -658,6 +676,15 @@ const tPhrase Phrases[] = {
     "Montage d�j� en cours!",
     "Redigeringsprosessen er allerede aktiv!",
   },
+  { "Can't shutdown - option '-s' not given!",
+    "Shutdown unm�glich - Option '-s' fehlt!",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Setup parameters:
   { "OSD-Language",
     "OSD-Sprache",
@@ -830,6 +857,15 @@ const tPhrase Phrases[] = {
     "Dur�e de vie par d�faut",
     "Normal levetid (Timer)",
   },
+  { "UseSubtitle",
+    "Subtitle verwenden",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "VideoFormat",
     "Video Format",
     "", // TODO
@@ -866,6 +902,15 @@ const tPhrase Phrases[] = {
     "Hauteur affichage",
     "", // TODO
   },
+  { "OSDMessageTime",
+    "OSD Nachricht Dauer",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "MaxVideoFileSize",
     "Max. Video Dateigr��e",
     "", // TODO
@@ -875,6 +920,24 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "MinEventTimeout",
+    "Mindest Event Pause",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "MinUserInactivity",
+    "Mindest User Inaktivit�t",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
@@ -1112,6 +1175,15 @@ const tPhrase Phrases[] = {
     "Bleu",
     "Bl�",
   },
+  { "Power",
+    "Ausschalten",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Miscellaneous:
   { "yes",
     "ja",
diff --git a/interface.c b/interface.c
index 1e06f4af2..8695a3670 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.41 2001/08/25 13:15:00 kls Exp $
+ * $Id: interface.c 1.44 2001/09/01 15:18:46 kls Exp $
  */
 
 #include "interface.h"
@@ -20,6 +20,7 @@ cInterface::cInterface(int SVDRPport)
   cols[0] = 0;
   width = height = 0;
   keyFromWait = kNone;
+  interrupted = false;
   rcIo = NULL;
   SVDRP = NULL;
 #if defined(REMOTE_RCU)
@@ -105,16 +106,19 @@ void cInterface::PutKey(eKeys Key)
 
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
+  if (Seconds == 0)
+     Seconds = Setup.OSDMessageTime;
   Flush();
   eKeys Key = kNone;
   time_t timeout = time(NULL) + Seconds;
   for (;;) {
       Key = GetKey();
-      if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout)
+      if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout || interrupted)
          break;
       }
   if (KeepChar && ISRAWKEY(Key))
      keyFromWait = Key;
+  interrupted = false;
   return Key;
 }
 
@@ -312,12 +316,13 @@ void cInterface::Error(const char *s)
   Close();
 }
 
-bool cInterface::Confirm(const char *s)
+bool cInterface::Confirm(const char *s, int Seconds, bool WaitForTimeout)
 {
   Open();
   isyslog(LOG_INFO, "confirm: %s", s);
   Status(s, clrBlack, clrYellow);
-  bool result = Wait(10) == kOk;
+  eKeys k = Wait(Seconds);
+  bool result = WaitForTimeout ? k == kNone : k == kOk;
   Status(NULL);
   Close();
   isyslog(LOG_INFO, "%sconfirmed", result ? "" : "not ");
@@ -353,7 +358,7 @@ void cInterface::QueryKeys(void)
   WriteText(1, 5, tr("Press any key on the RC unit"));
   Flush();
 #ifndef REMOTE_KBD
-  unsigned char Code = 0;
+  unsigned char Code = '0';
   unsigned short Address;
 #endif
   for (;;) {
diff --git a/interface.h b/interface.h
index 2b0e2f1ae..dbfa1bca7 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.22 2001/07/27 11:38:01 kls Exp $
+ * $Id: interface.h 1.24 2001/09/01 15:14:50 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -23,17 +23,19 @@ class cInterface {
   int open;
   int cols[MaxCols];
   eKeys keyFromWait;
+  bool interrupted;
   cSVDRP *SVDRP;
   cRcIoBase *rcIo;
   unsigned int GetCh(bool Wait = true, bool *Repeat = NULL, bool *Release = NULL);
   void QueryKeys(void);
   void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
-  eKeys Wait(int Seconds = 1, bool KeepChar = false);
+  eKeys Wait(int Seconds = 0, bool KeepChar = false);
 public:
   cInterface(int SVDRPport = 0);
   ~cInterface();
   void Open(int NumCols = 0, int NumLines = 0);
   void Close(void);
+  void Interrupt(void) { interrupted = true; }
   int Width(void) { return width; }
   int Height(void) { return height; }
   eKeys GetKey(bool Wait = true);
@@ -52,7 +54,7 @@ class cInterface {
   void Status(const char *s, eDvbColor FgColor = clrBlack, eDvbColor BgColor = clrCyan);
   void Info(const char *s);
   void Error(const char *s);
-  bool Confirm(const char *s);
+  bool Confirm(const char *s, int Seconds = 10, bool WaitForTimeout = false);
   void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
   void DisplayChannelNumber(int Number);
diff --git a/keys-pc.conf b/keys-pc.conf
index cb0192be3fcc6e296bcd6efd69c099dfd7fdf664..ab4b58d5e775d71cc950c523290e77cd5b6d97c4 100644
GIT binary patch
delta 38
qcmbQuw1$bzIX@+p(_kW-J(H>HME5I#0r};rMG6WE24G-nzy$!)z6ucl

delta 20
bcmZ3(G@FUdIX@+plVKv8J(HQyME5HIIXwl!

diff --git a/libdtv/x.txt b/libdtv/x.txt
deleted file mode 100644
index 0d12dddb8..000000000
--- a/libdtv/x.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Hallo ZDF-EPG-Redaktion!
-
-Es w�rde mich interessieren, warum im digitalen EPG des
-ZDF (�ber Astra) die Beschreibung der Sendungen oftmals
-Trennungsstriche und zus�tzliche Leerzeichen enth�lt.
-So zum Beispiel bei folgendem Eintrag:
-
-----------------------------------------------------
- ZDF                           23.08  10:50 - 11:35 
-                                                    
- Mit Leib und Seele                                 
-                                                    
- Der einzige Mensch                                 
-                                                    
- Stehlin hat die Fr�hmesse abge- sagt und sein      
- Kommen im Pfarr- haus angek�ndigt. August, erbost  
- �ber die Heimlichkeiten und Re- dereien von        
- Stutz, erzwingt eine Aussprache mit Stehlin.     
-----------------------------------------------------
-
-der ohne Trennungsstriche so aussehen k�nnte:
-
-----------------------------------------------------
- ZDF                           23.08  10:50 - 11:35 
-                                                    
- Mit Leib und Seele                                 
-                                                    
- Der einzige Mensch                                 
-                                                    
- Stehlin hat die Fr�hmesse abgesagt und sein        
- Kommen im Pfarrhaus angek�ndigt. August, erbost    
- �ber die Heimlichkeiten und Redereien von Stutz,   
- erzwingt eine Aussprache mit Stehlin.              
-----------------------------------------------------
-
-Ich kann mir das nur so erkl�ren, da� Sie konkrete Annahmen
-dar�ber machen, mit welcher Zeilenl�nge die Set-Top-Box diese
-Texte darstellt - aber das ist in meinen Augen eine ziemlich
-verwegene Annahme, denn es sollte ja wohl der STB �berlassen bleiben,
-wie gro� das Fenster f�r die Darstellung des EPG ist.
-
-Pro-7 zum Beispiel macht sowas nicht, wodurch der Text deultich
-besser dargestellt wird.
-
-Wenn Sie wenigstens nach dem (bzw. statt des) Bindestrich(s) ein deutlich
-erkennbares Sonderzeichen einf�gen w�rden, dann k�nnte man das zuverl�ssig
-herausfiltern, aber so macht der ZDF-EPG immer wieder einen
-schlechten Eindruck.
-
-�ber eine Antwort von Ihnen w�rde ich mich sehr freuen.
-
-MfG
-Klaus Schmidinger
-
-
diff --git a/menu.c b/menu.c
index 6d6eae8e2..5ff54cbd8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.109 2001/08/26 14:03:27 kls Exp $
+ * $Id: menu.c 1.115 2001/09/02 15:27:54 kls Exp $
  */
 
 #include "menu.h"
@@ -19,7 +19,7 @@
 #define MENUTIMEOUT 120 // seconds
 #define MAXWAIT4EPGINFO 10 // seconds
 
-const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#^";
+const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#~^";
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -494,6 +494,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     if (value[pos] == '^')
                        value[pos] = 0;
                     pos = -1;
+                    stripspace(value);
                     break;
                     }
                  // run into default
@@ -1159,17 +1160,6 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
         const char *Title = eventInfo->GetTitle();
         const char *Subtitle = eventInfo->GetSubtitle();
         const char *ExtendedDescription = eventInfo->GetExtendedDescription();
-        // Some channels send a 'Subtitle' that should actually be the 'ExtendedDescription'
-        // (their 'ExtendedDescription' is then empty). In order to handle this correctly
-        // we silently shift that text to where it belongs.
-        // The German TV station 'VOX' is notorious for this - why can't they do it correctly
-        // like all the others? Well, at least like those who actually send the full range
-        // of information (like, e.g., 'Sat.1'). Some stations (like 'RTL') don't even
-        // bother sending anything but the 'Title'...
-        if (isempty(ExtendedDescription) && !isempty(Subtitle) && int(strlen(Subtitle)) > 2 * Setup.OSDwidth) {
-           ExtendedDescription = Subtitle;
-           Subtitle = NULL;
-           }
         if (!isempty(Title)) {
            Add(item = new cMenuTextItem(Title, 1, Line, Setup.OSDwidth - 2, -1, clrCyan));
            Line += item->Height() + 1;
@@ -1726,11 +1716,15 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultPriority"),    &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultLifetime"),    &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditBoolItem(tr("UseSubtitle"),        &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("VideoFormat"),        &data.VideoFormat, "4:3", "16:9"));
   Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
+  Add(new cMenuEditIntItem( tr("OSDMessageTime"),     &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditIntItem( tr("MaxVideoFileSize"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
+  Add(new cMenuEditIntItem( tr("MinEventTimeout"),    &data.MinEventTimeout));
+  Add(new cMenuEditIntItem( tr("MinUserInactivity"),  &data.MinUserInactivity));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -2096,12 +2090,14 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
   timer->SetPending(true);
   timer->SetRecording(true);
   if (Channels.SwitchTo(timer->channel, dvbApi)) {
+     const char *Subtitle = NULL;
+     const char *Summary = NULL;
      if (GetEventInfo()) {
-        //XXX this is in preparation for storing recordings in subdirectories and giving them the name of the Subtitle
-        dsyslog(LOG_INFO, "Title: '%s' Subtitle: '%s'", eventInfo->GetTitle(), eventInfo->GetSubtitle());//XXX
-        //XXX modify timer's name and summary, mark it as modified (revert later when stopping)
+        dsyslog(LOG_INFO, "Title: '%s' Subtitle: '%s'", eventInfo->GetTitle(), eventInfo->GetSubtitle());
+        Subtitle = eventInfo->GetSubtitle();
+        Summary = eventInfo->GetExtendedDescription();
         }
-     cRecording Recording(timer);
+     cRecording Recording(timer, Subtitle, Summary);
      if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
         Recording.WriteSummary();
      Interface->DisplayRecording(dvbApi->CardIndex(), true);
@@ -2161,9 +2157,9 @@ void cRecordControl::Stop(bool KeepInstant)
      }
 }
 
-bool cRecordControl::Process(void)
+bool cRecordControl::Process(time_t t)
 {
-  if (!timer || !timer->Matches())
+  if (!timer || !timer->Matches(t))
      return false;
   AssertFreeDiskSpace(timer->priority);
   return true;
@@ -2233,11 +2229,11 @@ const char *cRecordControls::GetInstantId(const char *LastInstantId)
   return NULL;
 }
 
-void cRecordControls::Process(void)
+void cRecordControls::Process(time_t t)
 {
   for (int i = 0; i < MAXDVBAPI; i++) {
       if (RecordControls[i]) {
-         if (!RecordControls[i]->Process())
+         if (!RecordControls[i]->Process(t))
             DELETENULL(RecordControls[i]);
          }
       }
diff --git a/menu.h b/menu.h
index d6db00285..2c5ed3941 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.24 2001/08/18 10:22:43 kls Exp $
+ * $Id: menu.h 1.25 2001/09/01 14:52:48 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -78,7 +78,7 @@ class cRecordControl {
 public:
   cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
   virtual ~cRecordControl();
-  bool Process(void);
+  bool Process(time_t t);
   bool Uses(cDvbApi *DvbApi) { return DvbApi == dvbApi; }
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
@@ -93,7 +93,7 @@ class cRecordControls {
   static void Stop(const char *InstantId);
   static void Stop(cDvbApi *DvbApi);
   static const char *GetInstantId(const char *LastInstantId);
-  static void Process(void);
+  static void Process(time_t t);
   static bool Active(void);
   };
 
diff --git a/recording.c b/recording.c
index 0190d108f..f65737812 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.33 2001/08/12 15:09:59 kls Exp $
+ * $Id: recording.c 1.36 2001/09/02 15:09:28 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -179,6 +179,7 @@ void cResumeFile::Delete(void)
 
 struct tCharExchange { char a; char b; };
 tCharExchange CharExchange[] = {
+  { '~',  '/'    },
   { ' ',  '_'    },
   { '\'', '\x01' },
   { '/',  '\x02' },
@@ -190,24 +191,45 @@ tCharExchange CharExchange[] = {
 
 char *ExchangeChars(char *s, bool ToFileSystem)
 {
-  for (struct tCharExchange *ce = CharExchange; ce->a && ce->b; ce++)
-      strreplace(s, ToFileSystem ? ce->a : ce->b, ToFileSystem ? ce->b : ce->a);
+  char *p = s;
+  while (*p) {
+        for (struct tCharExchange *ce = CharExchange; ce->a && ce->b; ce++) {
+            if (*p == (ToFileSystem ? ce->a : ce->b)) {
+               *p = ToFileSystem ? ce->b : ce->a;
+               break;
+               }
+            }
+        p++;
+        }
   return s;
 }
 
-cRecording::cRecording(cTimer *Timer)
+cRecording::cRecording(cTimer *Timer, const char *Subtitle, const char *Summary)
 {
   titleBuffer = NULL;
   fileName = NULL;
-  name = strdup(Timer->file);
+  if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
+     name = strdup(Timer->file);
+  else {
+     if (isempty(Subtitle))
+        Subtitle = " ";
+     asprintf(&name, "%s~%s", Timer->file, Subtitle);
+     }
   // substitute characters that would cause problems in file names:
   strreplace(name, '\n', ' ');
-  summary = Timer->summary ? strdup(Timer->summary) : NULL;
-  if (summary)
-     strreplace(summary, '|', '\n');
   start = Timer->StartTime();
   priority = Timer->priority;
   lifetime = Timer->lifetime;
+  // handle summary:
+  summary = !isempty(Timer->summary) ? strdup(Timer->summary) : NULL;
+  if (!summary) {
+     if (isempty(Subtitle))
+        Subtitle = "";
+     if (isempty(Summary))
+        Summary = "";
+     if (*Subtitle || *Summary)
+        asprintf(&summary, "%s%s%s", Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
+     }
 }
 
 cRecording::cRecording(const char *FileName)
@@ -311,6 +333,17 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator)
   return titleBuffer;
 }
 
+const char *cRecording::PrefixFileName(char Prefix)
+{
+  const char *p = PrefixVideoFileName(FileName(), Prefix);
+  if (p) {
+     delete fileName;
+     fileName = strdup(p);
+     return fileName;
+     }
+  return NULL;
+}
+
 bool cRecording::WriteSummary(void)
 {
   if (summary) {
diff --git a/recording.h b/recording.h
index 059133e72..e1af3db3c 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.14 2001/06/02 10:00:25 kls Exp $
+ * $Id: recording.h 1.16 2001/09/02 11:35:56 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -39,12 +39,13 @@ class cRecording : public cListObject {
   time_t start;
   int priority;
   int lifetime;
-  cRecording(cTimer *Timer);
+  cRecording(cTimer *Timer, const char *Subtitle, const char *Summary);
   cRecording(const char *FileName);
   ~cRecording();
   const char *FileName(void);
   const char *Title(char Delimiter = ' ', bool NewIndicator = false);
   const char *Summary(void) { return summary; }
+  const char *PrefixFileName(char Prefix);
   bool WriteSummary(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
diff --git a/svdrp.c b/svdrp.c
index d3bceec1d..5f8aad403 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.21 2001/08/12 15:10:16 kls Exp $
+ * $Id: svdrp.c 1.22 2001/09/01 09:50:03 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -166,6 +166,16 @@ const char *HelpPages[] = {
   "    Create a new timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. It is an error if a timer with the same channel,\n"
   "    day, start and stop time already exists.",
+  "NEXT [ abs | rel ]\n"
+  "    Show the next timer event. If no option is given, the output will be\n"
+  "    in human readable form. With option 'abs' the absolute time of the next\n"
+  "    event will be given as the number of seconds since the epoch (time_t\n"
+  "    format), while with option 'rel' the relative time will be given as the\n"
+  "    number of seconds from now until the event. If the absolute time given\n"
+  "    is smaller than the current time, or if the relative time is less than\n"
+  "    zero, this means that the timer is currently recording and has started\n"
+  "    at the given time. The first value in the resulting line is the number\n"
+  "    of the timer.",
   "OVLF <sizex> <sizey> <fbaddr> <bpp> <palette>\n"
   "    Set the size, address depth and palette of the overlay.",
   "OVLG <sizex> <sizey> <posx> <posy>\n"
@@ -737,6 +747,28 @@ void cSVDRP::CmdNEWT(const char *Option)
      Reply(501, "Missing timer settings");
 }
 
+void cSVDRP::CmdNEXT(const char *Option)
+{
+  cTimer *t = Timers.GetNextActiveTimer();
+  if (t) {
+     time_t Start = t->StartTime();
+     int Number = t->Index() + 1;
+     if (!*Option) {
+        char *s = ctime(&Start);
+        s[strlen(s) - 1] = 0; // strip trailing newline
+        Reply(250, "%d %s", Number, s);
+        }
+     else if (strcasecmp(Option, "ABS") == 0)
+        Reply(250, "%d %ld", Number, Start);
+     else if (strcasecmp(Option, "REL") == 0)
+        Reply(250, "%d %ld", Number, Start - time(NULL));
+     else
+        Reply(501, "Unknown option: \"%s\"", Option);
+     }
+  else
+     Reply(550, "No active timers");
+}
+
 void cSVDRP::CmdOVLF(const char *Option)
 {
   if (*Option) {
@@ -893,6 +925,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("MOVT"))  CmdMOVT(s);
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
+  else if (CMD("NEXT"))  CmdNEXT(s);
   else if (CMD("OVLF"))  CmdOVLF(s);
   else if (CMD("OVLG"))  CmdOVLG(s);
   else if (CMD("OVLC"))  CmdOVLC(s);
diff --git a/svdrp.h b/svdrp.h
index 83827082a..503439a4b 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.9 2001/04/01 15:05:38 kls Exp $
+ * $Id: svdrp.h 1.10 2001/09/01 09:24:50 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -56,6 +56,7 @@ class cSVDRP {
   void CmdMOVT(const char *Option);
   void CmdNEWC(const char *Option);
   void CmdNEWT(const char *Option);
+  void CmdNEXT(const char *Option);
   void CmdOVLF(const char *Option);
   void CmdOVLG(const char *Option);
   void CmdOVLC(const char *Option);
diff --git a/vdr.c b/vdr.c
index 3f8f8da83..efb5e1c38 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,9 +22,10 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.64 2001/08/26 15:02:00 kls Exp $
+ * $Id: vdr.c 1.68 2001/09/01 14:50:40 kls Exp $
  */
 
+#define _GNU_SOURCE
 #include <getopt.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -48,13 +49,16 @@
 #endif
 
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
+#define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 
 static int Interrupted = 0;
 
 static void SignalHandler(int signum)
 {
-  if (signum != SIGPIPE)
+  if (signum != SIGPIPE) {
      Interrupted = signum;
+     Interface->Interrupt();
+     }
   signal(signum, SignalHandler);
 }
 
@@ -77,7 +81,8 @@ int main(int argc, char *argv[])
   const char *ConfigDirectory = NULL;
   bool DaemonMode = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
-  char *Terminal = NULL;
+  const char *Terminal = NULL;
+  const char *Shutdown = NULL;
 
   static struct option long_options[] = {
       { "audio",    required_argument, NULL, 'a' },
@@ -88,16 +93,17 @@ int main(int argc, char *argv[])
       { "help",     no_argument,       NULL, 'h' },
       { "log",      required_argument, NULL, 'l' },
       { "port",     required_argument, NULL, 'p' },
+      { "shutdown", required_argument, NULL, 's' },
+      { "terminal", required_argument, NULL, 't' },
       { "video",    required_argument, NULL, 'v' },
       { "dvd",      required_argument, NULL, 'V' },
       { "watchdog", required_argument, NULL, 'w' },
-      { "terminal", required_argument, NULL, 't' },
       { NULL }
     };
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:t:v:V:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:s:t:v:V:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -134,6 +140,7 @@ int main(int argc, char *argv[])
                            "                           2 = errors and info, 3 = errors, info and debug\n"
                            "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                            "                           0 turns off SVDRP\n"
+                           "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                            "  -V DEV,   --dvd=DEV      use DEV as the DVD device (default: %s)\n"
@@ -170,6 +177,8 @@ int main(int argc, char *argv[])
                        return 2;
                        }
                     break;
+          case 's': Shutdown = optarg;
+                    break;
           case 't': Terminal = optarg;
                     break;
           case 'v': VideoDirectory = optarg;
@@ -292,8 +301,9 @@ int main(int argc, char *argv[])
   cReplayControl *ReplayControl = NULL;
   int LastChannel = -1;
   int PreviousChannel = cDvbApi::CurrentChannel();
-  time_t LastActivity = time(NULL);
+  time_t LastActivity = 0;
   int MaxLatencyTime = 0;
+  bool ForceShutdown = false;
 
   if (WatchdogTimeout > 0) {
      dsyslog(LOG_INFO, "setting watchdog timer to %d seconds", WatchdogTimeout);
@@ -323,18 +333,21 @@ int main(int argc, char *argv[])
            }
         // Timers and Recordings:
         if (!Menu) {
-           cTimer *Timer = Timers.GetMatch();
+           time_t Now = time(NULL); // must do both following calls with the exact same time!
+           cRecordControls::Process(Now);
+           cTimer *Timer = Timers.GetMatch(Now);
            if (Timer) {
               if (!cRecordControls::Start(Timer))
                  Timer->SetPending(true);
               }
-           cRecordControls::Process();
            }
         // User Input:
         cOsdBase **Interact = Menu ? &Menu : (cOsdBase **)&ReplayControl;
         eKeys key = Interface->GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
-        if (NORMALKEY(key) != kNone)
+        if (NORMALKEY(key) != kNone) {
            EITScanner.Activity();
+           LastActivity = time(NULL);
+           }
         if (*Interact) {
            switch ((*Interact)->ProcessKey(key)) {
              case osMenu:   DELETENULL(Menu);
@@ -383,39 +396,50 @@ int main(int argc, char *argv[])
                   break;
              // Direct Channel Select:
              case k1 ... k9:
-                  if (!Interface->Recording())
-                     Menu = new cDisplayChannel(key);
+                  Menu = new cDisplayChannel(key);
                   break;
              // Left/Right rotates trough channel groups:
              case kLeft|k_Repeat:
              case kLeft:
              case kRight|k_Repeat:
-             case kRight: if (!Interface->Recording()) {
-                             int SaveGroup = CurrentGroup;
-                             if (NORMALKEY(key) == kRight)
-                                CurrentGroup = Channels.GetNextGroup(CurrentGroup) ;
-                             else
-                                CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
-                             if (CurrentGroup < 0)
-                                CurrentGroup = SaveGroup;
-                             Menu = new cDisplayChannel(CurrentGroup, false, true);
-                             }
-                          break;
+             case kRight: {
+                  int SaveGroup = CurrentGroup;
+                  if (NORMALKEY(key) == kRight)
+                     CurrentGroup = Channels.GetNextGroup(CurrentGroup) ;
+                  else
+                     CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
+                  if (CurrentGroup < 0)
+                     CurrentGroup = SaveGroup;
+                  Menu = new cDisplayChannel(CurrentGroup, false, true);
+                  break;
+                  }
              // Up/Down Channel Select:
              case kUp|k_Repeat:
              case kUp:
              case kDown|k_Repeat:
-             case kDown: if (!Interface->Recording()) {
-                            int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
-                            cChannel *channel = Channels.GetByNumber(n);
-                            if (channel)
-                               channel->Switch();
-                            }
-                         break;
+             case kDown: {
+                  int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
+                  cChannel *channel = Channels.GetByNumber(n);
+                  if (channel)
+                     channel->Switch();
+                  break;
+                  }
              // Menu Control:
              case kMenu: Menu = new cMenuMain(ReplayControl); break;
              // Viewing Control:
              case kOk:   LastChannel = -1; break; // forces channel display
+             // Power off:
+             case kPower: isyslog(LOG_INFO, "Power button pressed");
+                          if (!Shutdown) {
+                             Interface->Error(tr("Can't shutdown - option '-s' not given!"));
+                             break;
+                             }
+                          if (cRecordControls::Active()) {
+                             if (Interface->Confirm(tr("Recording - shut down anyway?")))
+                                ForceShutdown = true;
+                             }
+                          LastActivity = 1; // not 0, see below!
+                          break;
              default:    break;
              }
            }
@@ -423,14 +447,46 @@ int main(int argc, char *argv[])
            EITScanner.Process();
            cVideoCutter::Active();
            }
-        if (!*Interact && !cRecordControls::Active()) {
-           if (time(NULL) - LastActivity > ACTIVITYTIMEOUT) {
+        if (!*Interact && (!cRecordControls::Active() || ForceShutdown)) {
+           time_t Now = time(NULL);
+           if (Now - LastActivity > ACTIVITYTIMEOUT) {
+              // Shutdown:
+              if (Shutdown && (Setup.MinUserInactivity && Now - LastActivity > Setup.MinUserInactivity * 60 || ForceShutdown)) {
+                 ForceShutdown = false;
+                 cTimer *timer = Timers.GetNextActiveTimer();
+                 time_t Next  = timer ? timer->StartTime() : 0;
+                 time_t Delta = timer ? Next - Now : 0;
+                 if (timer)
+                    dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next));
+                 if (!Next || Delta > Setup.MinEventTimeout * 60) {
+                    if (!LastActivity) {
+                       // Apparently the user started VDR manually
+                       dsyslog(LOG_INFO, "assuming manual start of VDR");
+                       LastActivity = Now;
+                       continue; // skip the rest of the housekeeping for now
+                       }
+                    if (WatchdogTimeout > 0)
+                       signal(SIGALRM, SIG_IGN);
+                    if (Interface->Confirm(tr("Press any key to cancel shutdown"), LastActivity == 1 ? 5 : SHUTDOWNWAIT, true)) {
+                       char *cmd;
+                       asprintf(&cmd, "%s %ld %ld", Shutdown, Next, Delta);
+                       isyslog(LOG_INFO, "executing '%s'", cmd);
+                       system(cmd);
+                       delete cmd;
+                       }
+                    else if (WatchdogTimeout > 0) {
+                       alarm(WatchdogTimeout);
+                       if (signal(SIGALRM, Watchdog) == SIG_IGN)
+                          signal(SIGALRM, SIG_IGN);
+                       }
+                    LastActivity = Now; // don't try again too soon
+                    continue; // skip the rest of the housekeeping for now
+                    }
+                 }
+              // Disk housekeeping:
               RemoveDeletedRecordings();
-              LastActivity = time(NULL);
               }
            }
-        else
-           LastActivity = time(NULL);
         }
   if (Interrupted)
      isyslog(LOG_INFO, "caught signal %d", Interrupted);
diff --git a/videodir.c b/videodir.c
index 6f35a3dcc..d9d3f8524 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.5 2001/05/01 09:48:57 kls Exp $
+ * $Id: videodir.c 1.6 2001/09/02 14:55:15 kls Exp $
  */
 
 #include "videodir.h"
@@ -188,13 +188,21 @@ const char *PrefixVideoFileName(const char *FileName, char Prefix)
   if (!PrefixedName || strlen(PrefixedName) <= strlen(FileName))
      PrefixedName = (char *)realloc(PrefixedName, strlen(FileName) + 2);
   if (PrefixedName) {
-     strcpy(PrefixedName, VideoDirectory);
-     char *p = PrefixedName + strlen(PrefixedName);
-     *p++ = '/';
-     *p++ = Prefix;
-     strcpy(p, FileName + strlen(VideoDirectory) + 1);
+     const char *p = FileName + strlen(FileName); // p points at the terminating 0
+     int n = 2;
+     while (p-- > FileName && n > 0) {
+           if (*p == '/') {
+              if (--n == 0) {
+                 int l = p - FileName + 1;
+                 strncpy(PrefixedName, FileName, l);
+                 PrefixedName[l] = Prefix;
+                 strcpy(PrefixedName + l + 1, p + 1);
+                 return PrefixedName;
+                 }
+              }
+           }
      }
-  return PrefixedName;
+  return NULL;
 }
 
 void RemoveEmptyVideoDirectories(void)

From 156831036e9b0fcbfc719033cc89e08c1985cad6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 16 Sep 2001 18:00:00 +0200
Subject: [PATCH 025/307] Version 0.95 - Fixed behaviour in case the shutdown
 didn't take place (there were many   "next timer event at..." messages in
 that case). - Reduced the default value for MinEventTimeout to 30 minutes. -
 Fixed detecting manual start in shutdown feature. - An error message is now
 displayed in case the Transfer Mode can't be   started because the necessary
 DVB card is currently recording (or there   is no DVB card that can access
 this channel). - Fixed toggling channels with the '0' key in case the "Ok"
 button has been   pressed to display the current/next information. - Pressing
 the "Power" key now always initiates the shutdown sequence (after   user
 confirmation in case of a recording timer), event if there is currently   a
 menu or a replay session active. Note the additional remarks in INSTALL  
 regarding the values of the two parameters given to the shutdown program   in
 case of a currently recording timer. - Switching through channel groups with
 the "Left" and "Right" keys now   always starts at the group that contains
 the current channel. - Implemented "Multi Speed Mode" (thanks to Stefan
 Huelswitt). - Implemented backtracing to hit the right spot after fast
 forward/rewind   (thanks to Stefan Huelswitt). - Implemented replay mode
 display (thanks to Stefan Huelswitt, with a few   rewrites by kls). - Changed
 the size of all input buffers used to parse config files or receive   SVDRP
 commands to the same value of 10KB. This allows long strings to be   used in
 the 'summary' field of a timer, for instance. - The pipe to the Dolby Digital
 replay command (option '-a') now closes all   unused file descriptors in the
 child process to avoid crashing when the   OSD is used (thanks to Andreas
 Vitting). - Switched to the driver's new tuning API (VDR now requires a
 driver version   dated 2001-09-14 or higher). - Changed obsolete macro
 VIDEO_WINDOW_CHROMAKEY to VID_TYPE_CHROMAKEY (thanks   to Guido Fiala). - New
 version of the "Master-Timer" tool (thanks to Matthias Schniedermeyer). -
 Better error handling when writing configuration files. - Fixed putting the
 final editing mark into the edited version's marks file. - Fixed manipulating
 an editing mark at the very end of a recording. - Fixed starting a new replay
 immediately after stopping a previous one (had   caused a mix between live
 video and replay). - Three new keys ("Volume+", Volume-" and "Mute") to
 control the DVB card's   audio output volume. - New version of the
 'epg2timers' tool (thanks to Carsten Koch).

---
 CONTRIBUTORS                                  |    9 +-
 HISTORY                                       |   43 +
 INSTALL                                       |   15 +-
 MANUAL                                        |   22 +-
 Tools/epg2timers/README                       |  151 ++
 Tools/epg2timers/epg2timers.cxx               |  578 ++++-
 Tools/epg2timers/epg_channel_names            |  400 +++
 Tools/epg2timers/get_merkliste.pl             |   82 +
 Tools/epg2timers/loadvdr.pl                   |   89 +
 Tools/epg2timers/update_timers                |   22 +
 Tools/epg2timers/update_timers.old            |   24 +
 Tools/master-timer/LIESMICH                   |  154 +-
 Tools/master-timer/README                     |   54 +-
 Tools/master-timer/THANKS                     |   18 +
 Tools/master-timer/Todo                       |    4 -
 Tools/master-timer/convert-DTV2VDR.pl         |  151 ++
 Tools/master-timer/convert-oldtorecord.pl     |   61 +
 Tools/master-timer/master-timer.pl            | 2231 +++++++++--------
 Tools/master-timer/sample/channels-to-scan    |    4 +-
 Tools/master-timer/sample/config              |   38 +-
 .../master-timer/sample/convert-channel-list  |   26 +
 Tools/master-timer/sample/deepblack           |  251 +-
 Tools/master-timer/sample/subtitle-movie      |   11 +
 Tools/master-timer/sample/torecord            |  116 +-
 config.c                                      |   59 +-
 config.h                                      |   22 +-
 dvbapi.c                                      |  486 ++--
 dvbapi.h                                      |   26 +-
 i18n.c                                        |   56 +-
 keys-pc.conf                                  |    3 +
 menu.c                                        |  112 +-
 menu.h                                        |   11 +-
 svdrp.c                                       |    6 +-
 svdrp.h                                       |    6 +-
 thread.c                                      |  106 +-
 thread.h                                      |   18 +-
 tools.c                                       |   26 +-
 tools.h                                       |   13 +-
 vdr.c                                         |   59 +-
 39 files changed, 3969 insertions(+), 1594 deletions(-)
 create mode 100644 Tools/epg2timers/README
 create mode 100644 Tools/epg2timers/epg_channel_names
 create mode 100755 Tools/epg2timers/get_merkliste.pl
 create mode 100755 Tools/epg2timers/loadvdr.pl
 create mode 100755 Tools/epg2timers/update_timers
 create mode 100755 Tools/epg2timers/update_timers.old
 create mode 100644 Tools/master-timer/THANKS
 create mode 100755 Tools/master-timer/convert-DTV2VDR.pl
 create mode 100755 Tools/master-timer/convert-oldtorecord.pl
 create mode 100644 Tools/master-timer/sample/convert-channel-list

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c055c1759..9090ca9f3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -100,10 +100,13 @@ Stefan Huelswitt <huels@iname.com>
  for making the position of the channel display configurable
  for making the width and height of the OSD configurable
  for implementing the "Jump" function in replay mode
+ for implementing "Multi Speed Mode"
+ for implementing backtracing for fast forward/rewind
+ for implementing the replay mode display
 
 Ulrich R�der <dynamite@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
- 27500.
+ 27500
 
 Helmut Sch�chner <schaechner@yahoo.com>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -132,3 +135,7 @@ Werner Fink <werner@suse.de>
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
+
+Andreas Vitting <Andreas@huji.de>
+ for providing code that closes all unused file descriptors in the child
+ process of a pipe (used in cPipe)
diff --git a/HISTORY b/HISTORY
index d2be05446..4b68aebca 100644
--- a/HISTORY
+++ b/HISTORY
@@ -715,3 +715,46 @@ Video Disk Recorder Revision History
   definitions). Use your favourite text editor to delete that information.
   That way every recording will store the actual summary data at the time of
   the recording.
+
+2001-09-16: Version 0.95
+
+- Fixed behaviour in case the shutdown didn't take place (there were many
+  "next timer event at..." messages in that case).
+- Reduced the default value for MinEventTimeout to 30 minutes.
+- Fixed detecting manual start in shutdown feature.
+- An error message is now displayed in case the Transfer Mode can't be
+  started because the necessary DVB card is currently recording (or there
+  is no DVB card that can access this channel).
+- Fixed toggling channels with the '0' key in case the "Ok" button has been
+  pressed to display the current/next information.
+- Pressing the "Power" key now always initiates the shutdown sequence (after
+  user confirmation in case of a recording timer), event if there is currently
+  a menu or a replay session active. Note the additional remarks in INSTALL
+  regarding the values of the two parameters given to the shutdown program
+  in case of a currently recording timer.
+- Switching through channel groups with the "Left" and "Right" keys now
+  always starts at the group that contains the current channel.
+- Implemented "Multi Speed Mode" (thanks to Stefan Huelswitt).
+- Implemented backtracing to hit the right spot after fast forward/rewind
+  (thanks to Stefan Huelswitt).
+- Implemented replay mode display (thanks to Stefan Huelswitt, with a few
+  rewrites by kls).
+- Changed the size of all input buffers used to parse config files or receive
+  SVDRP commands to the same value of 10KB. This allows long strings to be
+  used in the 'summary' field of a timer, for instance.
+- The pipe to the Dolby Digital replay command (option '-a') now closes all
+  unused file descriptors in the child process to avoid crashing when the
+  OSD is used (thanks to Andreas Vitting).
+- Switched to the driver's new tuning API (VDR now requires a driver version
+  dated 2001-09-14 or higher).
+- Changed obsolete macro VIDEO_WINDOW_CHROMAKEY to VID_TYPE_CHROMAKEY (thanks
+  to Guido Fiala).
+- New version of the "Master-Timer" tool (thanks to Matthias Schniedermeyer).
+- Better error handling when writing configuration files.
+- Fixed putting the final editing mark into the edited version's marks file.
+- Fixed manipulating an editing mark at the very end of a recording.
+- Fixed starting a new replay immediately after stopping a previous one (had
+  caused a mix between live video and replay).
+- Three new keys ("Volume+", Volume-" and "Mute") to control the DVB card's
+  audio output volume.
+- New version of the 'epg2timers' tool (thanks to Carsten Koch).
diff --git a/INSTALL b/INSTALL
index e15f13ee9..56200e86e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,11 +27,8 @@ You can find 'libdvdread' at
 
   http://www.dtek.chalmers.se/groups/dvd/downloads.html
 
-VDR requires the card driver version 0.9.0 or higher
-to work properly. You need to load the dvb.o module *without* option
-'outstream=0' (previous versions of VDR required this option to have
-the driver supply the data in AV_PES format; as of version 0.70 VDR
-works with PES format).
+VDR requires the card driver version dated 2001-09-14 or higher
+to work properly.
 
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
@@ -126,6 +123,12 @@ and only perform the system shutdown. A program that uses the second parameter
 to set the hardware for restart must therefore also check whether the first
 parameter is '0'.
 
+If a timer is currently recording, the parameters will reflect the start
+time of that timer. This means that the first parameter will be a time in
+the past, and the second parameter will be a negative number. This only
+happens if the user presses the "Power" key while a timer is currently
+recording.
+
 Before the shutdown program is called, the user will be prompted to inform
 him that the system is about to shut down. If any remote control key is
 pressed while this prompt is visible, the shutdown will be cancelled (and
@@ -291,6 +294,8 @@ The default PC key assignments are:
   Red, Green, Yellow, Blue  'F1'..'F4'
   0..9                      '0'..'9' in top row
   Power                     'P'
+  Volume+/-                 '+', '-'
+  Mute                      'm'
 
 If you prefer different key assignments, or if the default doesn't work for
 your keyboard, simply delete the file 'keys-pc.conf' and restart 'vdr' to get
diff --git a/MANUAL b/MANUAL
index c6b5efd7a..05f2f3ca9 100644
--- a/MANUAL
+++ b/MANUAL
@@ -8,7 +8,7 @@ Video Disk Recorder User's Manual
   possible, several keys have different meanings in the various
   modes:
 
-  Key     Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
+  Key         Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
 
   Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
@@ -23,6 +23,9 @@ Video Disk Recorder User's Manual
   Blue    -           Resume     Mark       Mark(1)    -             Summary     Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           Editing
   Power   Shutdown    -          -          -          -             -           -
+  Volume+ Volume up   -          -          -          -             -           -
+  Volume- Volume down -          -          -          -             -           -
+  Mute    Mute        -          -          -          -             -           -
 
   (1) The "Mark" button in the "Timers" menu only works if sorting the timers
       has been disabled in the "Setup" menu.
@@ -177,6 +180,10 @@ Video Disk Recorder User's Manual
             backward at a slower speed; press again to return to pause mode.
             Pressing and holding down the button performs the function until
             the button is released again.
+            If "Multi Speed Mode" has been enabled in the "Setup" menu, the
+            function of these buttons changes in a way that gives you three
+            fast and slow speeds, through which you can switch by pressing
+            the respective button several times.
   - Red     Jump to a specific location. Enter the time you want to jump to
             and then press "Left" or "Right" to jump relative to the current
             position, "Up" to jump to an absolute position, and "Down" to
@@ -442,7 +449,7 @@ Video Disk Recorder User's Manual
                          you may want to use smaller values if you are planning
                          on archiving a recording to CD.
 
-  MinEventTimeout=120    If the command line option '-s' has been set, VDR will
+  MinEventTimeout=30     If the command line option '-s' has been set, VDR will
   MinUserInactivity=120  automatically shutdown the computer if the next timer
                          event is at least MinEventTimeout minutes in the future,
                          and the user has been inactive for at least
@@ -451,6 +458,17 @@ Video Disk Recorder User's Manual
                          retaining the possibility to manually shutdown the
                          computer.
 
+  MultiSpeedMode = 0     Defines the function of the "Left" and "Right" keys in
+                         replay mode. If set to 0, one speed will be used, while
+                         if set to 1 there will be three speeds for fast and slow
+                         search, respectively.
+                         0 = off
+                         1 = on
+
+  ShowReplayMode = 0     Turns displaying the current replay mode on or off.
+                         0 = off
+                         1 = on
+
 * Executing system commands
 
   The "Main" menu option "Commands" allows you to execute any system commands
diff --git a/Tools/epg2timers/README b/Tools/epg2timers/README
new file mode 100644
index 000000000..53888b160
--- /dev/null
+++ b/Tools/epg2timers/README
@@ -0,0 +1,151 @@
+Overview.
+=========
+
+The 4 modules in this directory are designed to allow vdr timer 
+programming via the http://tvtv.de web EPG (Electronic Program Guide).
+
+Once you have these modules properly configured and installed, 
+you should be able to simply click on the things you want vdr 
+to record in the http://tvtv.de web EPG and be done with it. 
+Everything else can be handled automatically.
+
+
+
+Module description.
+===================
+
+The http://tvtv.de web EPG creates a so-called "merkliste"
+("a list of items to remember") containing all the broadcasts
+you selected.
+
+1.  The perl script "get_merkliste.pl" transfers this "merkliste"
+    from the http://tvtv.de web site to a local file "merkliste.html".
+
+2.  The C++ program "epg2timers" converts this HTML file into vdr's
+    timers.conf format.
+    
+3.  The perl script "loadvdr.pl" pumps these new timer entries
+    into a running vdr using telnet and the SVDRP protocol.
+
+4.  The shell script "update_timers" implements the overall 
+    control of the entire process.
+    It retrieves the latest merkliste from http://tvtv.de,
+    converts it to timers.conf format and sends the timer entries 
+    to vdr.
+    
+    
+
+Configuration.
+==============
+
+get_merkliste.pl requires configuration of the "files_to_fetch"
+variable preset. 
+Log in to your http://tvtv.de account and click on the "Bookmark"
+item in the "Setup" submenu of the "Mein Programm" side bar menu.
+This will open a window with a URL in the location field that ends
+with an ID value. Replace the xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+in the "files_to_fetch" variable preset with your ID value.
+If you are using an HTTP proxy, uncomment the line containing
+the $ua->proxy call and put your proxy details in.
+
+epg2timers.cxx allows various items to be configured, but it
+should work out of the box. See "tvtv.de channel names" below.
+
+update_timers must know where to find the get_merkliste.pl
+perl script and the compiled epg2timers binary. Both must be
+in a directory pointed to by the TOOLDIR variable.
+update_timers also must know where to find vdr's current 
+channels.conf file. Put that into the CHANPATH.
+
+Depending on the price of your internet access, you may want to
+run update_timers more or less frequently. It may also be a good
+idea to run it at times where it is unlikely to interfere with 
+your current use of vdr. Configure a crontab entry according to
+these personal preferences. Here is the entry I use:
+1       2       *       *       *       /home/cko/bin/update_timers
+It runs update_timers only once a night at 02:01 a.m.
+
+
+Installation.
+=============
+Create your TOOLDIR directory if it does not already exist.
+Copy get_merkliste.pl and loadvdr.pl into it, compile epg2timers.cxx 
+with the command:
+    g++ epg2timers.cxx -o epg2timers
+and move the epg2timers binary into the TOOLDIR directory.
+
+The get_merkliste.pl script requires certain packages to run.
+Besides of course perl, install perl-libwww-perl (at least
+that's the name on SuSE 7.2, it may have a different name in
+your distribution).
+
+If you have problems with SVDRP and loadvdr.pl, you may want to
+try out the update_timers.old script, which replaces the timers.conf
+file directly and kills vdr (assuming that it will be restarted
+by the runvdr script) to make vdr reload the timers.conf file.
+
+
+tvtv.de channel names.
+======================
+The file epg_channel_names contains the names of all channels
+currently (as of September 9, 2001) supported by the tvtv.de 
+web EPG. The variable "channel_map" in epg2timers.cxx maps
+these names into PNRs (aka Service IDs). I have initialized
+this table with provider names converted from a d-box channel 
+scan of Astra 19.2E, so the PNRs should be correct for that 
+satellite, but most of the names propably aren't yet- I simply 
+had not enough time yet to go through epg_channel_names
+and insert all its channel names at the proper places in the
+channel map. Consider the map supplied an example. ;-)
+If you fix any of the entries, please send me a patch.
+For my own humble purposes, the table works well as it is.
+Of course, your channels.conf must contain the matching
+PNRs (last field in each line).
+
+
+To Do.
+======
+These are just ideas. They MAY get implemented.
+If you want them to happen, contribute a patch. ;-)
+
+*  Support vdr hierarchical directories (after vdr does)
+   by mapping the http://tvtv.de genre texts into 
+   directory names.
+*  start_time_safety_margin for epg2timers.
+
+
+Authors.
+========
+Carsten Koch:    epg2timers.cxx, update_timers,  this README file.
+                                     
+Axel Gruber and 
+Rolf Hakenes:    get_merkliste.pl
+
+Peter Ahlert:    loadvdr.pl
+
+
+Credits.
+========
+I am grateful (in chronological order) to 
+
+* Klaus Schmidinger for his excellent vdr program and for
+  keeping an open mind in all directions.
+  
+* Suse (my wife, not the Linux distributor ;-) for encouraging me to 
+  write epg2timers in June 2000 and for her constant patience and support.
+  
+* Andreas Steinhauser for periodically criticizing the epg2timers 
+  "manual mode" until I came up with the idea to fully automatize it
+  and for contributing ideas.
+ 
+* Axel Gruber for reminding me half a year later, for pushing
+  the idea until it got implemented, for asking for new features
+  all the time and for contributing ideas.
+
+* Axel Gruber and Rolf Hakenes for contributing the get_merkliste.pl
+  perl script.
+  
+* Peter Ahlert for contributing the loadvdr.pl perl script.
+
+
+Carsten, September 2001.
diff --git a/Tools/epg2timers/epg2timers.cxx b/Tools/epg2timers/epg2timers.cxx
index 07e8182d7..94e1c8a4b 100644
--- a/Tools/epg2timers/epg2timers.cxx
+++ b/Tools/epg2timers/epg2timers.cxx
@@ -1,13 +1,13 @@
 /*
- * epg2timers.cxx: Convert an EPG "merkliste" page (http://www.tvtv.de) to a timers.conf 
- *                 file for Klaus Schmidinger's vdr (http://www.cadsoft.de/people/kls/vdr).
+ * epg2timers.cxx: Convert an EPG "merkliste" HTML page (http://tvtv.de)
+ *                 to timers.conf format for Klaus Schmidinger's vdr 
+ *                 (http://www.cadsoft.de/people/kls/vdr).
  *
- * Copyright (C) 2000 Carsten Koch
+ * Copyright (C) 2000, 2001 Carsten Koch
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * version 2 as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,65 +23,349 @@
  */
  
  
+#include <malloc.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
+// User-configurable options.
 
-static const char date_line[]       = "\t<td align=center valign=middle colspan=3><span id=fb-b10>";
-static const char start_time_line[] = " \t\t<td bgcolor=\"#7f98bf\" align=center><span id=\"fb-w14\"><nobr>&nbsp;";
-static const char stop_time_line[]  = "\t\t\t<tr><td bgcolor=\"#002b64\" align=center><span id=\"fn-w9\">bis ";
-static const char channel_line[]    = "\t\t\t<tr><td bgcolor=\"#002b64\" align=center><span id=\"fb-w9\">";
-static const char title_line[]      = "\t\t\t\t<td bgcolor=\"#002b64\" align=left width=100%><span id=\"fb-w10\">";
-static const char summary_line[]    = "\t\t\t<table border=0 cellpadding=10 cellspacing=0 bgcolor=\"white\" width=100%>";
-static const char * const channel_names[] =
+static const int stop_time_safety_margin = 10;  // add 10 minutes to stop time in case start was delayed
+static const int recording_priority = 50;       // vdr recording priority setting for all timer entries generated
+static const int recording_lifetime = 98;       // vdr recording life time setting for all timer entries generated
+
+
+// Usually, you should not want to change any of these.
+
+static const int max_title   = 256;             // maximum length+1 of title file name generated
+static const int max_genre   = 32;              // maximum length+1 of genre text parsed
+static const int max_line    = 1024;            // line buffer (not used when parsing summary text)
+static const int max_summary = 9000;            // Summary can be up to 9000 bytes long (a bit shorter than vdr's SVDRP command buffer)
+static const int max_vdr_channel = 1000;        // maximum size+1 of your channels.conf
+
+// The following table maps http://tvtv.de channel names into Astra 19.2E PIDs.
+// It is incomplete. Contributions welcome.
+
+typedef struct
 {
-"3sat",
-"ARTE",
-"*B1 Berlin",
-"BR3",
-"Bloomberg TV",
-"BR Alpha",
-"CNN",
-"ARD",
-"*DW-tv",
-"Eins Extra",
-"Eins Festival",
-"Eins MuXx",
-"euroNEWS",
-"HR3",
-"Kabel1",
-"Kinderkanal",
-"MDR",
-"MTV",
-"NDR",
-"NTV",
-"ORB",
-"*ORF1",
-"Phoenix",
-"PRO7",
-"RTL",
-"RTL2",
-"SAT1",
-"skynews",
-"SWF",
-"Super RTL",
-"TM3",
-"TW1",
-"VOX",
-"WDR",
-"Theaterkanal",
-"ZDF",
-"ZDF.doku",
-"ZDF.info", 
-""
+   const char * tvtv_name;
+   unsigned short pnr;
+} map_entry;
+
+
+static const map_entry channel_map[] =
+{
+   //   Deutschsprachig
+   {"13th Street", 42},
+   {"3sat", 28007},
+   {"ARTE", 28109},
+   {"B1", 28206},
+   {"BR3", 28107},
+   {"BR-alpha", 28112},
+   {"ARD", 28106},
+   {"Discovery", 14},
+   {"Disney Channel", 34},
+   {"Eins Extra", 28201},
+   {"Eins Festival", 28202},
+   {"Eins MuXx", 28203},
+   {"Filmpalast", 516},
+   {"FOX KIDS", 28},
+   {"Heimatkanal", 517},
+   {"HR", 28108},
+   {"Junior", 19},
+   {"Kabel 1", 899},
+   {"Kinderkanal", 28008},
+   {"Krimi&Co", 23},
+   {"K-Toon", 12},
+   {"Liberty TV.com", 12199},
+   {"MDR", 28204},
+   {"NDR", 28224},
+   {"NEUN LIVE", 897},
+   {"ORB", 28205},
+   {"ORF1", 13001},
+   {"ORF2", 13002},
+   {"Phoenix", 28114},
+   {"Planet", 13},
+   {"Premiere 1", 10},
+   {"Premiere 2", 11},
+   {"Premiere 3", 43},
+   {"Premiere Action", 20},
+   {"Premiere Comedy", 29},
+   {"Premiere SCI-FI", 41},
+   {"Premiere Star", 9},
+   {"PREMIERE WORLD", 8},
+   {"ProSieben", 898},
+   {"RTL", 12003},
+   {"RTL2", 12020},
+   {"SAT.1", 46},
+   {"SeaSonS", 33},
+   {"SR", 28110},
+   {"Studio Universal", 36},
+   {"Sunset", 16},
+   {"Super RTL", 12040},
+   {"Test-Z1", 28305},
+   {"TW1", 13013},
+   {"Via 1 - Sch�ner Reise", 44},
+   {"VOX", 12060},
+   {"WDR", 28111},
+   {"ZDF", 28006},
+   {"ZDF.doku", 28014},
+   {"ZDF.info", 28011},
+   //  Movies
+   {"AXN", 29506},
+   {"CANAL+", 29100},
+   {"CANAL+ AZUL", 29101},
+   {"CANAL+ ROJO", 29102},
+   {"CANAL+ VERT", 8208},
+   {"CANAL+ 16/9", 8204},
+   {"CANAL+ 16|9", 29024},
+   {"C+ROOD", 4005},
+   {"CINE CINEMA I", 8206},
+   {"CINE CINEMA II", 8002},
+   {"CINE CINEMA III", 8003},
+   {"CINE CLASSICS", 8709},
+   {"CINE CINEMA 16/9", 8301},
+   {"cinecinemas", 4008},
+   {"CINECLASSICS", 29203},
+   {"Cinedom 1", 176},
+   {"Cinedom 1B", 178},
+   {"Cinedom 1C", 180},
+   {"Cinedom 1D", 190},
+   {"Cinedom 2", 179},
+   {"Cinedom 2B", 183},
+   {"Cinedom 2C", 184},
+   {"Cinedom 2D", 188},
+   {"Cinedom 2E", 193},
+   {"Cinedom 3", 182},
+   {"Cinedom 3B", 185},
+   {"Cinedom 3C", 192},
+   {"Cinedom 3D", 195},
+   {"Cinedom 4", 181},
+   {"Cinedom 4B", 187},
+   {"Cinedom 4C", 191},
+   {"Cinedom 5", 186},
+   {"Cinedom 5B", 194},
+   {"Cindedom Deluxe", 189},
+   {"CINEMAN�A AZUL", 29501},
+   {"CINEMAN�A ROJO", 29605},
+   {"CINEMAN�A", 29500},
+   {"K1", 8401},
+   {"K2", 8402},
+   {"K3", 8403},
+   {"K4", 8404},
+   {"K5", 8405},
+   {"K6", 8406},
+   {"K7", 8407},
+   {"K9", 8409},
+   {"K12", 8412},
+   {"TAQUILLA 1", 29206},
+   {"TAQUILLA 2", 29207},
+   {"TAQUILLA 3", 29502},
+   {"TAQUILLA 4", 29503},
+   {"TAQUILLA 5", 29504},
+   {"TAQUILLA 6", 29301},
+   {"TAQUILLA 7", 29302},
+   {"TAQUILLA 8", 29303},
+   {"TAQUILLA 11", 29316},
+   {"TAQUILLA 12", 29610},
+   {"TAQUILLA 13", 29402},
+   {"TAQUILLA 14", 29212},
+   {"TAQUILLA 16|9", 29606},
+   //  Music
+   {"40 LATINO", 29031},
+   {"40 TV", 29110},
+   {"CANAL+ JAUNE", 8203},
+   {"CLASSICA", 15},
+   {"GOLDSTAR TV", 518},
+   {"MCM 2", 8305},
+   {"MCM AFRICA", 8307},
+   {"MCM", 8302},
+   {"MTV 2", 28649},
+   {"MTV 6", 28641},
+   {"MTV Base", 28645},
+   {"MTV Central", 28643},
+   {"MTV F", 28642},
+   {"MTV Hits", 28644},
+   {"MUZZIK", 8007},
+   {"RFM TV", 17008},
+   {"TMF", 5015},
+   {"VH1 Classic", 28647},
+   {"VH1", 28646},
+   {"Video Italia", 12220},
+   {"VIVA ZWEI", 12120},
+   {"VIVA", 12732},
+   {"ZIK'/XXL", 17004},
+   //  News
+   {"BBC WORLD", 17007},
+   {"Bloomberg TV", 12160},
+   {"CNBC", 28010},
+   {"CNBC", 35},
+   {"CNBC-NBC", 29202},
+   {"CNN", 28512},
+   {"DW-tv", 9005},
+   {"EuroNews", 28015},
+   {"FOX NEWS", 29032},
+   {"N24", 47},
+   {"n-tv", 12730},
+   {"Sky News", 3995},
+   //  Netherlands
+   {"NED1", 4011},
+   {"NED2", 4012},
+   {"NED3", 4013},
+   {"NET5", 5004},
+   {"RTL4", 2004},
+   {"RTL5", 2005},
+   {"SBS6", 5005},
+   {"V8/Fox Kids", 5020},
+   {"Yorin", 5010},
+   //  Porn
+   {"BEATE-UHSE.TV", 21},
+   {"Blue Movie1", 513},
+   {"Blue Movie2", 514},
+   {"Blue Movie3", 515},
+   {"K10", 8410},
+   {"TAQUILLA X", 29213},
+   {"TAQUILLA X", 29602},
+   {"TAQUILLA XX", 29607},
+   {"X-ZONE", 4009},
+   //  Sports
+   {"C+BLAUW", 4006},
+   {"DSF", 900},
+   {"EUROSPORT", 8101},
+   {"Eurosport", 28009},
+   {"EUROSPORT", 29310},
+   {"EUROSPORTNEWS", 29037},
+   {"PATHE SPORT|", 8009},
+   {"PREMIERE SPORT 1", 17},
+   {"PREMIERE SPORT 2", 27},
+   {"SUPERDOM", 26},
+   //  French
+   {"13EME RUE", 8703},
+   {"AB 1", 17001},
+   {"AB MOTEURS", 17000},
+   {"ACTION", 17010},
+   {"ALLOCINE TV", 8308},
+   {"ANIMAUX", 17002},
+   {"ARTE", 9009},
+   {"BLOOMBERG TV", 8004},
+   {"CA TV", 8610},
+   {"CANAL+", 8201},
+   {"CANAL+ BLEU", 8202},
+   {"CANAL J", 8108},
+   {"CANAL JIMMY", 8006},
+   {"CANALCLUB", 8812},
+   {"Cartoon Network", 28511},
+   {"CLUB TELEACHAT", 8303},
+   {"COMEDIE !", 8702},
+   {"CONTACT TV", 8804},
+   {"CUISINE.TV", 8112},
+   {"DEMAIN !", 8701},
+   {"DISNEY CHANNEL", 8207},
+   {"DT CSAT 10", 9159},
+   {"ENCYCLOPEDIA", 17003},
+   {"ESCALES", 17005},
+   {"EURONEWS", 8505},
+   {"FORUM", 8707},
+   {"FRANCE 2", 8801},
+   {"FRANCE 3", 8802},
+   {"GAME ONE", 8717},
+   {"i TELEVISION", 8010},
+   {"KIOSQUE", 8704},
+   {"KTO", 8304},
+   {"LA CHAINE METEO", 8008},
+   {"LA CINQUIEME", 8501},
+   {"LaCha�neHistoire", 17006},
+   {"LCI", 8107},
+   {"LCP", 8506},
+   {"L'EQUIPE TV", 8706},
+   {"LibertyTV.com", 12280},
+   {"MANGAS", 17011},
+   {"MONTECARLO TMC", 8102},
+   {"Motors TV", 12300},
+   {"NAT GEOGRAPHIC", 8310},
+   {"PAD", 8211},
+   {"PARIS PREMIERE", 8104},
+   {"PLANETE 2", 8507},
+   {"PLANETE", 8103},
+   {"PMU sur Canal+", 8210},
+   {"RFO SAT", 8708},
+   {"SANTE - VIE", 8110},
+   {"SEASONS", 8001},
+   {"TCM", 28515},
+   {"TEST CDN 1", 8616},
+   {"TEST CDN 3", 8627},
+   {"TiJi", 8309},
+   {"TV 5", 9001},
+   {"TV BREIZH", 8502},
+   {"TV Puls", 20601},
+   {"TV5 Europe", 12240},
+   {"VOYAGE", 8105},
+   //  Spanish
+   {"ANDALUC�A TV", 29011},
+   {"Bloomberg", 12721},
+   {"CALLE 13", 29609},
+   {"Canal Canarias", 29700},
+   {"Cartoon Network", 29314},
+   {"CNN+", 29020},
+   {"DISCOVERY", 29116},
+   {"DISNEY CHANNEL", 29111},
+   {"DOCUMAN�A", 29200},
+   {"ESTILO", 29305},
+   {"ETB", 29035},
+   {"FASHION TV", 29115},
+   {"FOX KIDS", 29209},
+   {"FOX", 29507},
+   {"MOSAICO", 29315},
+   {"M�TEO", 29014},
+   {"Nat Geo Channel", 29034},
+   {"NICK-PARAMOUNT", 29312},
+   {"RTPI", 9006},
+   {"SEASONS", 29204},
+   {"TAQUILLA 0", 29205},
+   {"TCM.", 28516},
+   {"TVC INT.", 29701},
+   {"VIAJAR", 29306},
+   //  Miscellaneous
+   {"Alice", 12200},
+   {"Canal Algerie", 9008},
+   {"CANALPRO TV", 8516},
+   {"ESC1 - EGYPTE", 9003},
+   {"FASHION TV.COM", 17009},
+   {"Home Shopping Euro", 45},
+   {"Home Shopping Euro", 40},
+   {"Kabel 1 Austria", 20004},
+   {"Kabel 1 Schweiz", 20003},
+   {"Polonia 1/Top Sho", 20366},
+   {"ProSieben A", 20002},
+   {"ProSieben Schweiz", 20001},
+   {"QVC GERMANY", 12100},
+   {"RAI 1", 9004},
+   {"REAL MADRID TV", 29019},
+   {"RealityTV", 20309},
+   {"RTL TELE Letzebuerg", 3994},
+   {"RTM - MAROC", 9002},
+   {"S�DWEST BW", 28113},
+   {"S�DWEST RP", 28231},
+   {"Super 1", 20364},
+   {"Travel", 28001},
+   {"TV7", 9007},
+   {"TV-NIEP II", 12740},
+   {"Wishline", 12320}
 };
+
+
+// Nothing user-configurable below this line.
+
+static const char date_line[]       = "\t<td align=center valign=middle colspan=3><span id=fb-b10>";
+static const char start_time_line[] = " \t\t<td id=\"jobview-box-date\" align=center><nobr>&nbsp;";
+static const char stop_time_line[]  = "\t\t\t<tr><td id=\"line\" align=center><span id=\"fn-w9\">bis ";
+static const char channel_line[]    = "\t\t\t<tr><td align=center><span id=\"fb-w9\">";
+static const char title_line[]      = "\t\t\t\t<td align=left width=100%><span id=\"fb-w10\">";
+static const char summary_line[]    = "<span id=\"fn-b8\">";
+static const char genre_line[]      = "\t\t\t\t<td align=right valign=center nowrap><span id=\"fn-w10\">";
+
 static const int month_lengths[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
-static const int max_channel =  sizeof(channel_names)/sizeof(char *);
-static const int max_title = 50;                // maximum length of title file name generated
-static const int max_line = 1024;               // line buffer (not used when parsing summary text)
-static const int max_summary = 5000;            // Summary can be up to 5000 bytes long
-static const int stop_time_safety_margin = 10;  // add 10 minutes to stop time in case start was delayed
 
 
 
@@ -102,6 +386,10 @@ char map_special_char(const char * const word)
       return '�';
    else if (strcmp(word, "szlig") == 0)
       return '�';
+   else if (strcmp(word, "nbsp") == 0)
+      return ' ';
+   else if (strcmp(word, "amp") == 0)
+      return '&';
    return ' ';
 }
 
@@ -109,40 +397,52 @@ char map_special_char(const char * const word)
 
 
 
-void read_file_name(const char * const line, char * const file_name)
+void read_file_name_and_title(const char * const line, char * const file_name, char * const title)
       
 {
    int line_index = sizeof(title_line) - 1;
    int title_index = 0;
-   char ch = line[line_index++];
+   int file_name_index = 0;
+   char ch;
    do
    {
+      ch = line[line_index++];
       if (ch == '&')
       {
          char word[10];
          int i = 0;
          while ((line[line_index + i] != ';') && (i < 9))
-            word[i++] = line[line_index + i];
-         word[i] = 0;
-         ch = map_special_char(word);
-         line_index += i;
+         {
+            word[i] = line[line_index + i]; i++;
+         }
+         if (line[line_index + i] == ';')
+         {
+            word[i] = 0;
+            ch = map_special_char(word);
+            line_index += i;
+         }
       }
       switch (ch)
       {
-         case '�': file_name[title_index++] = 'a'; file_name[title_index++] = 'e'; break;
-         case '�': file_name[title_index++] = 'o'; file_name[title_index++] = 'e'; break;
-         case '�': file_name[title_index++] = 'u'; file_name[title_index++] = 'e'; break;
-         case '�': file_name[title_index++] = 'A'; file_name[title_index++] = 'e'; break;
-         case '�': file_name[title_index++] = 'O'; file_name[title_index++] = 'e'; break;
-         case '�': file_name[title_index++] = 'U'; file_name[title_index++] = 'e'; break;
-         case '�': file_name[title_index++] = 's'; file_name[title_index++] = 's'; break;
+         case '�': file_name[file_name_index++] = 'a'; file_name[file_name_index++] = 'e'; break;
+         case '�': file_name[file_name_index++] = 'o'; file_name[file_name_index++] = 'e'; break;
+         case '�': file_name[file_name_index++] = 'u'; file_name[file_name_index++] = 'e'; break;
+         case '�': file_name[file_name_index++] = 'A'; file_name[file_name_index++] = 'e'; break;
+         case '�': file_name[file_name_index++] = 'O'; file_name[file_name_index++] = 'e'; break;
+         case '�': file_name[file_name_index++] = 'U'; file_name[file_name_index++] = 'e'; break;
+         case '�': file_name[file_name_index++] = 's'; file_name[file_name_index++] = 's'; break;
+         case ' ': file_name[file_name_index++] = '_'; break;
+         case '&': 
+            file_name[file_name_index++] = 'u'; file_name[file_name_index++] = 'n'; file_name[file_name_index++] = 'd'; 
+         break;
          default:
-            if (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) || ((ch >= '0') && (ch <= '9')))
-               file_name[title_index++] = ch;
+            if (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) || ((ch >= '0') && (ch <= '9')) || (ch == '-'))
+               file_name[file_name_index++] = ch;
       }
-      ch = int(line[line_index++]);
-   } while ((title_index < max_title-1) && (ch != '<') && (ch != 0) && (line_index < max_line-1));
-   file_name[title_index] = 0;
+      title[title_index++] = ch;
+   } while ((file_name_index < max_title-5) && (ch != '<') && (ch != 0));
+   file_name[file_name_index] = 0;
+   title[title_index-1] = 0;
 }
 
 
@@ -184,7 +484,7 @@ void read_summary(char * const summary)
                word[word_index++] = ch;
             } while ((word_index < 6) && (ch != '>') && (ch != EOF));
             while ((ch != '>') && (ch != EOF)) ch = getchar();
-            if (strncmp("/table", word, 6) == 0)
+            if (strncmp("/span", word, 4) == 0)
                done = true;
          }
          break;
@@ -207,62 +507,150 @@ void read_summary(char * const summary)
 
 
 
+int find_channel_number(const unsigned short * const vdr_pnrs, const char * const channel_name)
+      
+{
+   for (int tvtv_channel_number = 0; tvtv_channel_number < sizeof(channel_map)/sizeof(map_entry); tvtv_channel_number++)
+      if (strcmp(channel_name, channel_map[tvtv_channel_number].tvtv_name) == 0)
+         for (int vdr_channel_number = 0; vdr_pnrs[vdr_channel_number] != 0xFFFF; vdr_channel_number++)
+            if (vdr_pnrs[vdr_channel_number] == channel_map[tvtv_channel_number].pnr)
+               return vdr_channel_number;
+   fprintf(stderr, "Error - channel '%s' not recognized.\n", channel_name);
+   exit(1);
+   /*NOTREACHED*/
+}
+
+
 
-main()
 
+unsigned short * read_vdr_pnrs(const char * const channels_conf_file_name)
+      
 {
-   int channel    =  0;
+   FILE * channels_conf = fopen(channels_conf_file_name, "r");
+   if (channels_conf == NULL)
+   {
+      perror("unable to open channels.conf.");
+      exit(1);
+   }
+   unsigned short * vdr_pnrs = (unsigned short *) malloc(max_vdr_channel * sizeof(unsigned short));
+   int vdr_channel_number = 0;
+   while (!feof(channels_conf) && (vdr_channel_number < max_vdr_channel-1))
+   {
+      char line[1024];
+      fgets(line, sizeof(line)-1, channels_conf);
+      int pnr;
+      if ((line[0] != ':') && 
+          (sscanf(line, "%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%d", &pnr) == 1))
+         vdr_pnrs[vdr_channel_number++] = pnr;
+   }
+   vdr_pnrs[vdr_channel_number++] = 0xFFFF; // sentinel
+   fprintf(stderr, "%d pnrs.\n", vdr_channel_number);
+   return (unsigned short *) realloc(vdr_pnrs, vdr_channel_number * sizeof(unsigned short));
+}
+
+
+
+
+void process_input(const unsigned short * const vdr_pnrs)
+      
+{
+
+   int channel    = -1;
    int day        = -1;
    int next_day   = -1;
    int start_time = -1;
-   int stop_time  = -1;
+   int stop_hour  = -1;
+   int stop_minute= -1;
+   char genre[max_genre] = {0};
    char summary[max_summary] = {0};
    char file_name[max_title] = {0};
+   char title[max_title] = {0};
 
    while (!feof(stdin))
    {
       char line[max_line];
       fgets(line, max_line-1, stdin);
+      line[max_line-1] = 0;
       if (strncmp(line, date_line, sizeof(date_line)-1) == 0)
       {
          const int month = (line[sizeof(date_line) + 6]- '0') * 10 + line[sizeof(date_line) + 7]-'0';
          day = (line[sizeof(date_line) + 3]- '0') * 10 + line[sizeof(date_line) + 4]-'0';
-         next_day = day == month_lengths[month]? 1 : day + 1;
+         next_day = day == month_lengths[month-1]? 1 : day + 1;
       }
       else if (strncmp(line, start_time_line, sizeof(start_time_line)-1) == 0)
-      {
          start_time = (line[sizeof(start_time_line) - 1] - '0') * 1000 +
                       (line[sizeof(start_time_line)    ] - '0') * 100 +
                       (line[sizeof(start_time_line) + 2] - '0') * 10 +
                       (line[sizeof(start_time_line) + 3] - '0');
-      }
       else if (strncmp(line, stop_time_line, sizeof(stop_time_line)-1) == 0)
       {
-         stop_time = ((line[sizeof(stop_time_line) - 1] - '0') * 1000 +
-                      (line[sizeof(stop_time_line)    ] - '0') * 100 +
-                      (line[sizeof(stop_time_line) + 2] - '0') * 10 +
-                      (line[sizeof(stop_time_line) + 3] - '0') + stop_time_safety_margin) % 2400;
-         if ((day < 0) || (start_time < 0) || (file_name[0] == 0) || (channel == max_channel))
+         stop_hour =   (line[sizeof(stop_time_line) - 1] - '0') * 10 +
+                       (line[sizeof(stop_time_line)    ] - '0');
+         stop_minute = (line[sizeof(stop_time_line) + 2] - '0') * 10 +
+                       (line[sizeof(stop_time_line) + 3] - '0') + 
+                       stop_time_safety_margin;
+         if (stop_minute > 59)
+         {
+            stop_minute -= 60;
+            if (stop_hour == 23)
+               stop_hour = 0;
+            else
+               stop_hour++;
+         }
+         if ((day < 0) || (start_time < 0) || (file_name[0] == 0) || (channel == -1))
+         {
             fprintf(stderr, "Input data error.\n");
+            exit(1);
+         }
          else
-            printf("1:%03d:%02d:%04d:%04d:2:7:%s:%s\n", channel+1, start_time < 600? next_day : day, start_time, stop_time, file_name, summary);
-         start_time = -1; stop_time = -1; file_name[0] = 0; summary[0] = 0; channel = max_channel;
+            printf("1:%03d:%02d:%04d:%02d%02d:%d:%d:%s:\"%s\" %s||%s||||||(epg2timers)\n", 
+                   channel+1, start_time < 600? next_day : day, start_time, stop_hour, stop_minute, 
+                   recording_priority, recording_lifetime, file_name, 
+                   title, genre, summary);
+         start_time = -1; channel = -1;
+         file_name[0] = 0; summary[0] = 0; genre[0] = 0;
       }
       else if (strncmp(line, title_line, sizeof(title_line)-1) == 0)
-         read_file_name(line, file_name);
+         read_file_name_and_title(line, file_name, title);
       else if (strncmp(line, channel_line, sizeof(channel_line)-1) == 0)
       {
          int i = sizeof(channel_line);
-         while ((i < max_line-1) && (line[i] != '<')) i++;
+         while ((line[i] != '<') && (line[i] != 0)) i++;
          line[i] = 0; // end of string
-         for (channel = 0; (channel < max_channel) && 
-                           (strcmp(line + sizeof(channel_line) - 1, channel_names[channel]) != 0);
-              channel++);
-         if (channel == max_channel)
-            fprintf(stderr, "Error - channel '%s' not recognized.\n", line + sizeof(channel_line) - 1);
+         channel = find_channel_number(vdr_pnrs, line + sizeof(channel_line) - 1);
       }
       else if (strncmp(line, summary_line, sizeof(summary_line)-1) == 0)
          read_summary(summary);
+      else if (strncmp(line, genre_line, sizeof(genre_line)-1) == 0)
+      {
+         int genre_index;
+         for (genre_index = 0; genre_index < max_genre-1; genre_index++)
+         {
+            const char ch = line[genre_index + sizeof(genre_line)-1];
+            if ((ch == 0) || (ch == '&') || (ch == '<'))
+               break;
+            genre[genre_index] = ch;
+         }
+         genre[genre_index] = 0;
+      }
    }
 }
 
+
+
+
+main(int argc, char *argv[])
+
+{
+   fprintf(stderr, "epg2timers Version 0.5, 15-Sep-2001.\n");
+   
+   if (argc != 2)
+   {
+      fprintf(stderr, "usage: %s channels.conf\n", argv[0]);
+      exit(1);
+   }
+   
+   const unsigned short * const vdr_pnrs = read_vdr_pnrs(argv[1]);
+   process_input(vdr_pnrs);
+   exit(0);
+}
diff --git a/Tools/epg2timers/epg_channel_names b/Tools/epg2timers/epg_channel_names
new file mode 100644
index 000000000..2633a9909
--- /dev/null
+++ b/Tools/epg2timers/epg_channel_names
@@ -0,0 +1,400 @@
+ATV,at
+ORF1,at
+ORF2,at
+TW1,at
+
+Club RTL,be
+Ketnet/Canvas,be
+TVI,be
+tv1,be
+
+SF1,ch
+sf2,ch
+
+13th Street,de
+3sat,de,at,ch
+ARD,de
+ARTE,de
+B1,de
+BBC World,de
+BEATE-UHSE.TV,de
+BR-alpha,de
+BR3,de
+Bet on Jazz,de
+Bloomberg TV,de
+Blue Movie1,de
+Blue Movie2,de
+Blue Movie3,de
+CNBC,de
+CNN,de
+Cartoon,de
+Cindedom Deluxe,de
+Cinedom 1,de
+Cinedom 2,de
+Cinedom 3,de
+Cinedom 4,de
+Cinedom 5,de
+Classica,de
+DSF,de
+Discovery,de
+Disney Channel,de
+Eins Extra,de
+Eins Festival,de
+Eins MuXx,de
+EuroNews,de
+Eurosport,de
+FOX KIDS,de
+Filmpalast,de
+Goldstar TV,de
+HH-1,de
+HR,de
+Heimatkanal,de
+Junior,de
+K-Toon,de
+Kabel 1,de
+Kinderkanal,de
+Krimi&Co,de
+MDR,de
+MTV,de
+MTV2,de
+N24,de
+NBC,de
+NDR,de
+NEUN LIVE,de
+ONYX,de
+ORB,de
+Phoenix,de
+Planet,de
+Premiere 1,de
+Premiere 2,de
+Premiere 3,de
+Premiere Action,de
+Premiere Comedy,de
+Premiere SCI-FI,de
+Premiere Sport1,de
+Premiere Sport2,de
+Premiere Sport3,de
+Premiere Star,de
+Premiere analog,de
+ProSieben,de
+QVC,de
+RTL,de
+RTL2,de
+SAT.1,de
+SR,de
+SWR BW,de
+SWR RP,de
+SeaSonS,de
+Studio Universal,de
+Sunset,de
+Super RTL,de
+TNT,de
+TRT,de,tr
+TV.BERLIN,de
+Theaterkanal,de
+VIVA,de
+VIVA2,de
+VOX,de
+WDR,de
+ZDF,de
+ZDF.doku,de
+ZDF.info,de
+n-tv,de
+skynews,de
+tv.m,de
+
+Danmark 1,dk
+TV2 Danmark,dk
+
+MTV3,fi
+Nelonen 4,fi
+Subtv,fi
+TV1,fi
+TV2,fi
+
+13�me Rue,fr
+AB 1,fr
+Arte,fr
+Arte Sat,fr
+Canal J,fr
+Canal Jimmy,fr
+Canal+,fr
+Canal+ Bel. bleu,fr
+Canal+ Bel. jaune,fr
+Canal+ Belgique,fr
+Canal+ bleu,fr
+Canal+ jaune,fr
+Canal+ vert,fr
+Cin� Cin�mas 1,fr
+Cin� Cin�mas 2,fr
+Cin� Cin�mas 3,fr
+Cin� Classics,fr
+Cin�faz,fr
+Cin�star 1,fr
+Cin�star 2,fr
+Cin�toile,fr
+Com�die !,fr
+Disney Channel,fr
+Escale,fr
+Eurosport,fr
+Festival,fr
+Fox Kids,fr
+France 2,fr
+France 3,fr
+Histoire,fr
+LCI,fr
+La Cinqui�me Sat,fr
+La cha�ne histoire,fr
+La cinqui�me,fr
+M6,fr
+M6 Music,fr
+MCM,fr
+MTV,fr
+Mangas,fr
+Mezzo,fr
+Muzzik,fr
+Odyss�e,fr
+Paris Premi�re,fr
+Path� sport,fr
+Plan�te,fr
+RTBF 1,fr
+RTBF 2,fr
+RTL 9,fr
+S�rie Club,fr
+TCM,fr
+TF1,fr
+TMC,fr
+TSR 1,fr
+TSR 2,fr
+TV5,fr
+T�l�toon,fr
+T�va,fr
+Voyage,fr
+XXL,fr
+
+ANIMALplanet,hu
+Budapest TV,hu
+Duna TV,hu
+FILMM�ZEUM,hu
+FOX KIDS/SPORTS,hu
+F�NIX TV,hu
+Game Channel,hu
+HBO,hu
+Hallmark,hu
+MAGYAR ATV,hu
+Minimax,hu
+National Geographic,hu
+Nickelodeon,hu
+RTL Klub,hu
+Romantica,hu
+SATeLIT,hu
+SPORT1,hu
+Spektrum TV,hu
+TV2,hu
+VIASAT3,hu
+VIVA+,hu
+fix.tv,hu
+m1,hu
+m2,hu
+
++ Calcio,it
++ F1,it
+Adult +,it
+CANALE 5,it
+Canal Jimmy,it
+Canale Viaggi,it
+Cartoon Network,it
+Cine Classics,it
+CineCinemas 1,it
+CineCinemas 2,it
+Classica,it
+Cult Network,it
+Discovery Channel,it
+Disney Channel,it
+Euro News,it
+Eurosport,it
+Hallmark,it
+Happy Channel,it
+ITALIA 1,it
+La 7,it
+MTV,it
+MTV - TMC 2,it
+Marcopolo,it
+Match Music,it
+Milan Channel,it
+Nuvolari Motor,it
+Odeon,it
+Planete,it
+Primafila,it
+RAI 1,it
+RAI 2,it
+RAI 3,it
+RAI Sat Fiction,it
+RETE 4,it
+Raisat Album,it
+Raisat Art,it
+Raisat Cinema,it
+Raisat Educational,it
+Raisat Gambero Rosso,it
+Raisat Nettuno 1,it
+Raisat Nettuno 2,it
+Raisat Ragazzi,it
+Raisat Show,it
+Raisat Sport,it
+SNAI Sat,it
+Salute e benessere,it
+Sat 2000,it
+Satisfation Club TV,it
+Seasons,it
+Stream Calcio,it
+Stream News,it
+Studio Universal,it
+TSI 1,it
+TSI 2,it
+TVL,it
+Tele+ 16:9,it
+Tele+ Bianco,it
+Tele+ Grigio,it
+Tele+ Nero,it
+VIVA - Rete A,it
+
+Netherland 1,nl
+Netherland 2,nl
+Netherland 3,nl
+
+ATV Avrupa,tr
+Kanal D,tr
+Kral TV,tr
+NTV Turkey,tr
+Show TV,tr
+Star TV,tr
+
+Adult Channel,uk
+Adventure One,uk
+Anglia,uk
+BBC Choice,uk
+BBC Choice NI,uk
+BBC Choice Scotland,uk
+BBC Choice Wales,uk
+BBC Knowledge,uk
+BBC News 24,uk
+BBC Parliament,uk
+BBC Prime,uk
+BBC World,uk
+BBC1,uk
+BBC1 North. Ireland,uk
+BBC1 Scotland,uk
+BBC1 Wales,uk
+BBC2,uk
+BBC2 North. Ireland,uk
+BBC2 Scotland,uk
+BBC2 Wales,uk
+Bangla TV,uk
+Bloomberg TV,uk
+Border,uk
+Bravo (Analogue),uk
+Bravo (Digital),uk
+British Eurosport,uk
+CNBC Europe,uk
+CNN,uk
+Carlton Central,uk
+Carlton Cinema,uk
+Carlton Food,uk
+Carlton Westcountry,uk
+Carlton/LWT,uk
+Cartoon Network,uk
+Challenge TV,uk
+Channel 4,uk
+Channel 5,uk
+Channel Television,uk
+Disc. Animal Planet,uk
+Disc. Channel (Ana.),uk
+Disc. Civilisations,uk
+Disc. Home Leisure,uk
+Disc. Sci-Trek,uk
+Disc. Travel Advent.,uk
+Discovery Channel,uk
+Discovery Kids,uk
+Discovery Wings,uk
+Disney,uk
+Euronews,uk
+Fantasy Ch. Dig.,uk
+Fantasy Channel,uk
+Film Four,uk
+Fox Kids,uk
+Grampian,uk
+Granada,uk
+Granada Breeze,uk
+Granada Men & Motors,uk
+Granada Plus,uk
+HTV Wales,uk
+HTV West,uk
+Hallmark,uk
+History Channel,uk
+ITN News Channel,uk
+ITV Sport Channel,uk
+ITV Sport Plus,uk
+ITV2,uk
+Landscape,uk
+Living,uk
+MTV UK,uk
+MUTV,uk
+Meridian,uk
+National Geographic,uk
+Network 2,uk
+Nick Junior,uk
+Nick Junior Analogue,uk
+Nickelodeon (dig.),uk
+Nickleodeon (ana.),uk
+Pakistani Channel,uk
+Paramount Comedy,uk
+Performance,uk
+Play UK,uk
+Playboy TV,uk
+QVC,uk
+RTE1,uk
+Racing Channel,uk
+Rapture TV,uk
+S2,uk
+S4C,uk
+S4C digidol,uk
+SKY Cinema,uk
+SKY Movie Max(SDig.),uk
+SKY Movie Max(ana.),uk
+SKY News,uk
+SKY Premier(Digital),uk
+SKY Premier(OnDigi),uk
+SKY Sports 1,uk
+SKY Sports 2,uk
+SKY Sports 3,uk
+Sci-Fi Cable,uk
+Sci-Fi Satelite,uk
+Scottish,uk
+Screenshop,uk
+Shop!,uk
+Sky Movie Max(OnDig),uk
+Sky One,uk
+Sky One (OnDigital),uk
+Sky Premier(Ana.),uk
+Sky Sports .com,uk
+Sky Sports Extra,uk
+Sky Travel,uk
+Sony Entertainment,uk
+TCM,uk
+TCM (Analogue),uk
+TG4,uk
+TV3,uk
+Tara Television,uk
+The Box,uk
+Trouble Analogue,uk
+Trouble Digital,uk
+Tyne Tees Television,uk
+UK Drama,uk
+UK Gold,uk
+UK Gold 2,uk
+UK Horizons,uk
+UK Style,uk
+Ulster ,uk
+VH1,uk
+Yorkshire,uk
+Zee TV,uk
diff --git a/Tools/epg2timers/get_merkliste.pl b/Tools/epg2timers/get_merkliste.pl
new file mode 100755
index 000000000..bb23fa3b2
--- /dev/null
+++ b/Tools/epg2timers/get_merkliste.pl
@@ -0,0 +1,82 @@
+#!/usr/bin/perl
+# Create a user agent object
+
+use HTML::Entities;
+use HTML::Parser;
+use LWP::UserAgent;
+use IO::Handle;
+
+STDOUT->autoflush(1);
+
+$ua = new LWP::UserAgent;
+$ua->agent("Mozilla/9.1 " . $ua->agent);
+# $ua->proxy('http', 'http://localhost:8080/');
+
+$filename = "merkliste.html";
+$base_url = "http://www.tvtv.de";
+# Hier das Bookmark von TVTV eintragen:
+@files_to_fetch = ("/cgi-bin/bookmark.cgi?id=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+
+$num = 0;
+$state = 0;
+
+$p = HTML::Parser->new( api_version => 3,
+                        start_h =>  [\&fparser_start, "tagname, attr"],
+                        unbroken_text => 1 );
+
+foreach $url (@files_to_fetch) {
+   $nurl = $base_url . $url;
+   print "Getting " . $nurl . "...\n";
+   $req = new HTTP::Request GET => $nurl;
+   $res = $ua->request($req);
+   if ($res->is_success) {
+      open (OUTFILE, ">" . $filename);
+      print OUTFILE $res->content;
+      close (OUTFILE);
+      $p->parse ($res->content);
+      $p->eof;
+   } else {
+      print "...FAILED\n";
+   }
+}
+# Zielordner fuer die Speicherung der Merkliste:
+
+print "...saved to 'merkliste.html'\n";
+sub fparser_start {
+   my($tagname, $attr_t) = @_;
+   my(%attr) = %$attr_t;
+
+   if ($tagname eq "frame") {
+      if ($state == 1) {
+         if (($attr{name} eq "frame_main") ||
+             ($attr{name} eq "frame_nav") ||
+             ($attr{name} eq "frame_nav_bottom")) {
+            push @files_to_fetch, $attr{src};
+         }
+      }
+      if ($state == 2) {
+         if (($attr{name} eq "frame_content")) {
+            push @files_to_fetch, $attr{src};
+         }
+      }
+   }
+   if ($tagname eq "a") {
+      if ($attr{href} ne "") {
+         $last_href = $attr{href};
+         if ($state == 0) {
+            push @files_to_fetch, $last_href;
+            $state = 1;
+         }
+      }
+   }
+   if ($tagname eq "img") {
+      if ($state == 1) {
+         if ($attr{src} =~ /b_joblist/i) {
+            $state = 2;
+            push @files_to_fetch, $last_href;
+         }
+      }
+   }
+}
+
+
diff --git a/Tools/epg2timers/loadvdr.pl b/Tools/epg2timers/loadvdr.pl
new file mode 100755
index 000000000..485b0a4a5
--- /dev/null
+++ b/Tools/epg2timers/loadvdr.pl
@@ -0,0 +1,89 @@
+#!/usr/bin/perl
+#
+# 0.01 loadvdr (peter)
+# 0.02 delete old entries before updating (peter) 
+# 0.03 dumped Net::Telnet because of lost connections
+#
+# please submit diffs to petera@gmx.net
+#
+# ./epg2timers < merkliste.html | perl -w loadvdr.pl
+#
+#
+
+use Socket;
+use Getopt::Std;
+
+@resp = ();
+
+$Dest = "localhost";
+$Port = 2001;
+
+$Timeout = 10; # max. seconds to wait for response
+
+$SIG{ALRM} = sub { Error("timeout"); };
+alarm($Timeout);
+
+$iaddr = inet_aton($Dest)                   || Error("no host: $Dest");
+$paddr = sockaddr_in($Port, $iaddr);
+
+$proto = getprotobyname('tcp');
+socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
+connect(SOCK, $paddr)                       || Error("connect: $!");
+select(SOCK); $| = 1;
+Receive_void();
+
+Send("lstt");
+
+foreach $item (reverse @resp){
+  if ($item =~ /^250.(\d{1,2}).*\(epg2timers\)/) {
+    Send_void("DELT $1");
+  }
+}
+
+while (defined ($line = <STDIN>)) {
+  chomp $line;
+  Send_void("UPDT $line");
+}
+
+Send("quit");
+close(SOCK)                                 || Error("close: $!");
+
+
+
+sub Send
+{
+  my $cmd = shift || Error("no command to send");
+  print SOCK "$cmd\r\n";
+  Receive();
+}
+
+sub Send_void
+{
+  my $cmd = $_[0];
+  print SOCK "$cmd\r\n";
+  Receive_void();
+}
+
+sub Receive
+{
+  while (<SOCK>) {
+        chomp;
+        push @resp,$_;
+        last if substr($_, 3, 1) ne "-";
+        }
+}
+
+sub Receive_void
+{
+  while (<SOCK>) {
+        last if substr($_, 3, 1) ne "-";
+        }
+}
+
+sub Error
+{
+  print STDERR "@_\n";
+  close(SOCK);
+  exit 0;
+}
+
diff --git a/Tools/epg2timers/update_timers b/Tools/epg2timers/update_timers
new file mode 100755
index 000000000..3849841b6
--- /dev/null
+++ b/Tools/epg2timers/update_timers
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# update_timers: retrieve a new "merkliste" from http://tvtv.de,
+# convert it to vdr format and transmit it to vdr via SVDRP.
+
+TOOLDIR="/home/cko/bin"
+CHANPATH="/home/cko/VDR/channels.conf"
+
+cd /tmp
+rm -f merkliste.html
+
+# if you have a slow dial up connection to your name server and/or ISP,
+# this will avoid a timeout in get_merkliste.pl.
+ping -c 2 www.tvtv.de
+
+# get the "merkliste".
+$TOOLDIR/get_merkliste.pl
+
+if [ -s merkliste.html ] ; then
+   # convert merkliste.html to timers.conf format and transmit it to vdr.
+   $TOOLDIR/epg2timers $CHANPATH < merkliste.html | $TOOLDIR/loadvdr.pl
+fi
diff --git a/Tools/epg2timers/update_timers.old b/Tools/epg2timers/update_timers.old
new file mode 100755
index 000000000..c4c3f5c5e
--- /dev/null
+++ b/Tools/epg2timers/update_timers.old
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# update_timers: load a new "merkliste" from http://tvtv.de
+# and create a new VDR timer configuration file (timers.conf)
+# from it. Restart VDR if the timers have changed.
+
+TOOLDIR="/home/cko/bin"
+VDRDIR="/home/cko/VDR"
+
+cd /tmp
+rm -f merkliste.html epgtimers.new epgtimers.old vdrtimers.old
+ping -c 2 www.tvtv.de
+$TOOLDIR/get_merkliste.pl
+if [ -s merkliste.html ] ; then
+   $TOOLDIR/epg2timers $VDRDIR/channels.conf < merkliste.html | sort -t: +2.0 -5.0 > epgtimers.new
+   fgrep '(epg2timers)' $VDRDIR/timers.conf | sort -t: +2.0 -5.0 > epgtimers.old
+   if ! cmp -s epgtimers.old epgtimers.new ; then
+      /sbin/killproc $VDRDIR/vdr
+      fgrep -v '(epg2timers)' $VDRDIR/timers.conf > vdrtimers.old
+      cat epgtimers.new vdrtimers.old | sort -t: +2.0 -5.0 > $VDRDIR/timers.conf
+      echo "Timers updated."
+   fi
+fi
+rm -f merkliste.html epgtimers.new epgtimers.old vdrtimers.old
diff --git a/Tools/master-timer/LIESMICH b/Tools/master-timer/LIESMICH
index 969487507..8e53da955 100644
--- a/Tools/master-timer/LIESMICH
+++ b/Tools/master-timer/LIESMICH
@@ -1,106 +1,70 @@
-		Master-Timer
-		============
+Master-Timer
+============
+(w) by Matthias Schniedermeyer (ms@citd.de)
 
 
 1. Einleitung
 -------------
 
 Master-Timer ist ein System zum automatischen Aufnehmen von Serien und Filmen.
+Beim Aufruf werden die Konfigurationsdateien gelesen, die Datei "epg.data" im
+aktuellen Verzeichnis nach passenden Sendungen durchsucht und die ermittelten
+Timer per SVDRP in VDR programmiert. Danach beendet sich Master-Timer.
 
-2. Voraussetzungen
-------------------
+Entsprechend empfiehlt es sich, Master-Timer per cronjob aufzurufen.
 
-VDR liefert die "epg.data".
-
-3. Konfigurationsdateien
+2. Konfigurationsdateien
 ------------------------
 
-Alle Konfigurationsdateien liegen unter "<HOME>.master-timer"
-
-config: Eine Ansammlung von Key-Value Paaren. Alle sind "optional" und 
-        erhalten dann die angegebenen Default-Werte
-
-(# = Kommentarzeilen)
-marginstart	(Default 600)
-  Anzahl der "Sicherheits" Sekunden die ein Timer frueher beginnen soll
-
-marginstop	(Default 600)
-  Anzahl der "Sicherheits" Sekunden die ein Timer laenger dauern soll
-
-defaultprio	(Default 50)
-  Die Prioritaet die fuer Timer verwendet wird wo keine Prioritaet 
-  angegeben ist
-
-DVBCards	(Default 1)
-  Anzahl der vorhandenen DVB-Karten (Derzeit nicht verwendet)
-
-Dest-Host 	(Default "localhost")
-  Host-name oder IP des Rechners auf dem VDR laeuft
-
-Dest-Port 	(Default "2001")
-  Port der VDR verwendet
-
-jointimers	(Default 0)
-  Sollen aufeinanderfolgende Timer auf den gleichen Kanal zusammengefasst 
-  werden (0 = "Nein", alles andere "Ja")
-
-debug		(Default 0)
-  Debug-Level, die einzelnen Debug-Werte muessen aus folgenden Werten 
-  zusammengezaehlt werden
-    1     : Dump "torecord"
-    2     : Dump all timers
-    4     : Show when a timer will be deleted
-    8     : Dump the "Done" REs
-    16    : Verbose Config-Reading
-
-deepblack: Eine Liste von Titeln die man NIEMALS NIMMER sehen will
-           Jede Zeile = 1 Titel
-
-subtitle-movies: Eine Liste der "Subtitel" die ein Zeichen fuer einen Film sind
-                 (Soweit die von den Sendern richtig ausgefuellt sind.)
-                 Jede Zeile = 1 Subtitel
-
-torecord: Die Sachen die man Aufnehmen will
-          Jede Zeile = 1 Timer
-# Format: (Every field is "optional".
-# [Title RE|Subtitle RE|Description RE|Channel-Name|Timeframe|Prio|Timer-Title]
-#
-# To record something at least one of the "Title", "Subtitle" or "Description" 
-# Fields has to be provided. This 3 fields are "include" and the rest are 
-# "exclude" fields!
-#
-# More than one channel definition can be provided. The delimiter is ";"
-# Additionaly you can make a "blacklist" of Channels when you prepent a "!" to the first Channel Definition
-# The "!" is only tested for the FIRST Channel definition.
-# You can only have a white or a blacklist (Mixing doesn't make sense!)
-#
-# ex. Record the series "Deep Space Nine" on Sci-Fantasy in the timeframe 09:00 - 14:00
-# Deep Space Nine|||Sci-Fantasy|0900-1400|99|DS9
-#
-# Record all "Actionfilm"s with "Schwarzenegger"
-# |Actionfilm|Schwarzenegger
-#
-
-
-done: 	The titles/subtitles which are already recorded/should not be recorded
-        (Programmed Timers which got inserted into "done" will be deleted 
-         automaticaly)
-
-4. Notices
-----------
-
-- Recordings "overlapping" on the same channel, will be joined into one Timer
-- Title/Subtitle/Descriptions are "fixed" for Channel that don't fill them 
-  out "correctly" (Currently the "Bugs" from Pro-7/VOX/VIVA)
-  Pro7: Remove the Title from the Subtitle  '<Title> / <Subtitle>'
-  VOX/VIVA: Subtitle is enclosed into "" and after ". " is the description
-  VIVA: When the Subtitle beginns with space the subtitle is moved to
-        description
-  All (except the second VIVA one) fixes are tried onto ALL Subtitles.
-
-5. Known-Bugs
--------------
+Alle Konfigurationsdateien liegen unter "~/.master-timer". Es werden
+regulaere Ausdruecke ohne Unterscheidung der Gross-/Kleinschreibung
+benutzt.
+
+config: Die Hauptkonfigurationsdatei.
+
+deepblack: Eine Negativliste von Titeln, die man NIEMALS NIMMER sehen will.
+           Die epg-datensaetze werden beim Parsen einfach entfernt.
+
+subtitle-movies: Eine Liste der "Subtitel", die ein Zeichen fuer einen Film
+  sind (soweit die von den Sendern richtig ausgefuellt sind). Die
+  Einstellungen in dieser Datei werden fuer das Makro "MOVIE" in torecord
+  benutzt.
+  Kommentarzeilen sind nicht erlaubt.
+
+torecord: Liste der aufzunehmenden Filme.
+
+done: Liste der Titel/Subtitel, die bereits aufgenommen wurden. Timer, die
+  hier auftauchen, werden in VDR automatisch geloescht.
+
+channels-to-scan: Diese Kanaele werden vom Skript "scan-channels" durch-
+  geschaltet (zwecks Einlesen der EPG-Daten). Die Datei wird von Master-
+  Timer selbst nicht benutzt.
+
+3. Anmerkungen
+--------------
+
+- einige Sender fuellen die EPG-Felder nicht korrekt aus. Diese Fehler
+  werden von Master-Timer automatisch korrigiert.
+
+  Pro7: Title aus dem Subtitle entfernen '<Title> / <Subtitle>'
+  Pro7: Timer zwischen 00:00 und 05:00 werden einen Tag in die Zukunft
+        verschoben (Als unguten Nebeneffekt hat dies zur Folge das zum
+        aktuellen Tag NICHT die epg-Daten das folgenden Tags (=Das was in
+        der Fernsehzeitschrift noch auf der gleichen Seite ist) mehr gesendet
+        werden. Wenn man also "Last Minute" etwas aufnehmen will, dann muss
+        man (leider) einen Timer "per Hand" in VDR einprogrammieren!)
+  VOX/VIVA: Subtitle ist in "" eingeschlossen nd nach ". " steht die description
+  VIVA: Wenn der Subtitle mit einem Space beginnt, dann wird der komplette
+        Subtitle in die Description verschoben
+  RTL2: Wenn der EPG-Datensatz eine Dauer von kleiner/gleich 1 Sekunde hat, 
+        wird er einfach verworfen.
+
+Bis auf den jeweils 2ten VIVA&Pro-7 Bug werden die Fixes an jedem
+epg-Datensatz ausprobiert.
+
+4. Bekannte Bugs
+----------------
 
-- It isn't checked if there are enough DVB-Cards
-- Overlapping Timers, on the same channel, are always joined
-- JOINed timers which are "done" don't get deleted automaticaly
+- Es wird nicht geprueft ob noch genug DVB-Karten vorhanden sind
+- "Joined timers" werden nur automatisch geloescht wenn alle dazugehoerigen
+  Sendungen "done" sind.
diff --git a/Tools/master-timer/README b/Tools/master-timer/README
index c71e6e185..05cc41acc 100644
--- a/Tools/master-timer/README
+++ b/Tools/master-timer/README
@@ -1,43 +1,49 @@
-		Master-Timer (w) by Matthias Schniedermeyer (ms@citd.de)
-		============
+Master-Timer
+============
+(w) by Matthias Schniedermeyer (ms@citd.de)
 
 
 1. Introduction
 ---------------
 
-Master-Timer ist a system for recording Films/Series automaticaly
+Master-Timer is a system designed for automatically recording movies.
+Upon execution it reads its configuration files, scans the file "epg.data"
+in the current directory for matching titles and programs them via SVDRP
+into VDR.
 
-2. Requierements
-----------------
+You may for example run Master-Timer as a cron job.
 
-epg.data
-
-3. Config-Files
+2. Config files
 ---------------
 
-For all files: One Entry per Line. Each line is a "Regular Expresion" 
-               So you can use all Perl-Style REs you want.
-               The RE are matched with "i" so they are case insensitive!
-               (Except for the "done"-list, these must match excatly!)
+Configuration files are located in "~/.master-timer". Each entry is a
+regular expression so you can use all Perl style REs you want. They are
+processed case insensitive.
+
+config: Main configuration file.
 
-deepblack: Blacklist of "Titles" you NEVER EVER want to get to you eyes
+deepblack: Blacklist of "titles" you NEVER EVER want to see.
 
-subtitle-movies: A list of "Subtitles" which indicate a movie. 
-                 (For Channels that correctly fill out the Subtitle. 
-                  e.g. it won't work for *eRTL*)
+subtitle-movies: A list of "Subtitles" which indicate a movie (used
+  by the "MOVIE" macro in torecord).
+  For channels that correctly fill out the subtitle e.g. it will not
+  work with *eRTL*.
 
-torecord:  The titles/subtitles/Description you want to record
+torecord:  The titles you want to record.
 
 done: 	The titles/subtitles which are already recorded/should not be recorded
-        (Programmed Timers which got inserted into "done" will be deleted 
-         automaticaly)
+  Programmed timers which got inserted into "done" will be deleted
+  automatically.
+
+channels-to-scan: Used only by the separate "scan-channels" script which
+  switches through channels in order to get EPG data.
 
 4. Notices
 ----------
 
-- Recordings "overlapping" on the same channel, will be joined into one Timer
-- Title/Subtitle/Descriptions are "fixed" for Channel that don't fill them 
-  out "correctly" (Currently the "Bugs" from Pro-7/VOX/VIVA)
+- Recordings overlapping on the same channel will be joined into one timer
+- Title/Subtitle/Descriptions are "fixed" for channels that don't fill them 
+  out correctly (Pro-7/VOX/VIVA)
   Pro7: Remove the Title from the Subtitle  '<Title> / <Subtitle>'
   VOX/VIVA: Subtitle is enclosed into "" and after ". " is the description
   VIVA: When the Subtitle beginns with space the subtitle is moved to
@@ -48,5 +54,5 @@ done: 	The titles/subtitles which are already recorded/should not be recorded
 -------------
 
 - It isn't checked if there are enough DVB-Cards
-- Overlapping Timers, on the same channel, are always joined
-- JOINed timers which are "done" don't get deleted automaticaly
+- Overlapping timers on the same channel are always joined
+- Joined timers which are "done" don't get deleted automatically
diff --git a/Tools/master-timer/THANKS b/Tools/master-timer/THANKS
new file mode 100644
index 000000000..04bb13bad
--- /dev/null
+++ b/Tools/master-timer/THANKS
@@ -0,0 +1,18 @@
+Klaus Schmidinger
+	- VDR
+
+Malte Kiesel
+	- Suggestions
+	- Bug Reports
+	- Documentation Updates for README/LIESMICH/torecord/deepblack/config
+
+Guido Fiala
+	- Suggestions
+	- Bug Repots
+	- finding bugs i found just before i read that part of his mails
+          (First the bug, then the errormessages! Otherwise i will search/find
+           the bug myself :-))) )
+
+Axel Gruber
+	- Suggestions
+	- Bug Reports
diff --git a/Tools/master-timer/Todo b/Tools/master-timer/Todo
index 722ee969c..1757ade08 100644
--- a/Tools/master-timer/Todo
+++ b/Tools/master-timer/Todo
@@ -1,9 +1,5 @@
 
-- "Intelligenter" Kanal-Scanner (z.B. nur 1 Kanal fuer ein
-  Sender-"Gruppe")
-- Filtern nach Serie/Film
 - "Komfortable" Anzeige, mit Black & Whitelisten, fuer Genres/Titeln usw.
-- Unterstueztung von 1xVDR pro Karte
 - Abspielen (mit automatischen "killen" des "Frontend"-VDRs) von
   Aufzeichnungen
 - "View"-Timer d.h. Timer der nicht Aufnimmt sondern nur den Kanal aendert
diff --git a/Tools/master-timer/convert-DTV2VDR.pl b/Tools/master-timer/convert-DTV2VDR.pl
new file mode 100755
index 000000000..fb2a78310
--- /dev/null
+++ b/Tools/master-timer/convert-DTV2VDR.pl
@@ -0,0 +1,151 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+# The EPG-Entrys
+my (%Entry, %channel, $mode);
+
+# 0 = VDR -> DTV
+# 1 = DTV -> VDR
+$mode = 0;
+
+read_channel_list();
+if ($mode) {
+  &read_dtv();
+  &read_epgdata();
+} else {
+  &read_epgdata();
+  &read_dtv();
+}
+&print_VDR();
+
+sub read_epgdata {
+  my ($channel, $duration, $title, $subtitle, $description, $time);
+  open (FI,"epg.data") or die ("Can't open file \"epg.data\"\n");
+
+  while (<FI>) {
+    # Begin Channel
+    if (/^C\s(\d+)\s+(.+)/) {
+      $channel=$2;
+      while (<FI>) {
+	# End Channel
+	if (/^c$/) {
+	  last;
+	}
+	# Begin Timer
+	elsif (/^E\s(\d+)\s+(\d+)\s+(\d+)$/) {
+	  # Undef this Variables because it is possibel that not every timer uses this values
+	  undef $duration;
+	  undef $subtitle;
+	  undef $description;
+
+	  $time=$2;
+	  $duration=$3;
+	}
+	# Title
+	elsif (/^T\s(.*)/) {
+	  $title=$1;
+	}
+	# Subtitle
+	elsif (/^S\s(.*)/) {
+	  $subtitle=$1;
+	}
+	# Description
+	elsif (/^D\s(.*)/) {
+	  $description=$1;
+	}
+	# End Timer
+	elsif (/^e$/) {
+	  if ($mode) {
+	    # DTV -> VDR
+	    $Entry{$channel}{$time}{subtitle}=$subtitle if ($subtitle);
+	    if ($description) {
+	      if ($Entry{$channel}{$time}{description}) {
+		$Entry{$channel}{$time}{description} = "DTV: '$Entry{$channel}{$time}{description}' VDR: '$description'";
+	      } else {
+		$Entry{$channel}{$time}{description} = "DTV: '' VDR: '$description'";
+	      }
+	    }
+	  } else {
+	    # VDR -> DTV
+	    $Entry{$channel}{$time}{title}=$title;
+	    $Entry{$channel}{$time}{duration}=$duration;
+	    $Entry{$channel}{$time}{subtitle}=$subtitle if ($subtitle);
+	    $Entry{$channel}{$time}{description}=$description if ($description);
+	  }
+	}
+      }
+    }
+  }
+  close (FI);
+}
+
+sub read_dtv {
+  my ($channel, $time, $duration, $title, $category, $subtitle, $description);
+  open (FI,$ARGV[0]) or die "Can't open DTV-File";
+
+  while (<FI>) {
+    chomp;
+    ($channel, $time, $duration, $title, $category, $subtitle, $description) = split (/\|/);
+    if (!$channel{$channel}) {
+      next;
+    }
+    $channel = $channel{$channel};
+    if ($mode) {
+      # DTV -> VDR
+      if (!$subtitle && $description =~ /^\"(.*?)\"\:\s(.*)/) {
+	$Entry{$channel}{$time}{subtitle} = $1;
+	$description = $2;
+      }
+      $Entry{$channel}{$time}{title} = $title;
+      $Entry{$channel}{$time}{duration} = $duration;
+      $Entry{$channel}{$time}{subtitle} = $subtitle if ($subtitle);
+      $Entry{$channel}{$time}{category} = $category if ($category);
+      $Entry{$channel}{$time}{description} = $description if ($description);
+    } else {
+      # VDR -> DTV
+      $Entry{$channel}{$time}{category} = $category if ($category);
+      if ($description) {
+	if (!$Entry{$channel}{$time}{subtitle} && $description =~ /^\"(.*?)\"\:\s(.*)/) {
+	  $Entry{$channel}{$time}{subtitle} = $1;
+	  $description = $2;
+	}
+	if ($Entry{$channel}{$time}{description}) {
+	  $Entry{$channel}{$time}{description} = "DTV: '$description' VDR: '$Entry{$channel}{$time}{description}'";
+	} else {
+	  $Entry{$channel}{$time}{description} = "DTV: '$description' VDR: ''";
+	}
+      }
+    }
+  }
+  close (FI);
+}
+
+sub read_channel_list {
+  my ($old, $new);
+  open (FI,"$ENV{HOME}/.master-timer/convert-channel-list") or die ("Can't read channel-List");
+  while (<FI>) {
+    chomp;
+    ($old, $new) = split (/\|/);
+    $channel{$old} = $new;
+  }
+  close (FI);
+}
+
+sub print_VDR() {
+  my ($channel, $title, $time);
+  foreach $channel (sort keys %Entry) {
+    print "C 1 $channel\n";
+    foreach $time (sort keys %{%Entry->{$channel}}) {
+      if ($Entry{$channel}{$time}{duration}) {
+	print "E 1 $time $Entry{$channel}{$time}{duration}\n";
+	print "K $Entry{$channel}{$time}{category}\n" if ($Entry{$channel}{$time}{category});
+	print "T $Entry{$channel}{$time}{title}\n";
+	print "S $Entry{$channel}{$time}{subtitle}\n" if ($Entry{$channel}{$time}{subtitle});
+	print "D $Entry{$channel}{$time}{description}\n" if ($Entry{$channel}{$time}{description});
+	print "e\n";
+      }
+    }
+    print "c\n";
+  }
+}
diff --git a/Tools/master-timer/convert-oldtorecord.pl b/Tools/master-timer/convert-oldtorecord.pl
new file mode 100755
index 000000000..853c20bab
--- /dev/null
+++ b/Tools/master-timer/convert-oldtorecord.pl
@@ -0,0 +1,61 @@
+#!/usr/bin/perl
+
+while (<>)
+  {
+    chomp;
+    if ($_ && !(/^\#/))
+      {
+	($title, $subtitle, $description, $channel, $timeframe, $prio, $timer_title, $margin, $machine) = split (/\|/,$_);
+	
+	if ($timer_title) {
+	  print "[$timer_title]\n";
+	} elsif ($title) {
+	  print "[$title]\n";
+	} elsif ($subtitle) {
+	  print "[$subtitle]\n";
+	} elsif ($description) {
+	  print "[$description]\n";
+	} else {
+	  die ("Illegal Format");
+	}
+	
+	# Accept torecord only if it is for the current machine
+	if ($title)
+	  {
+	    print "Title = $title\n";
+	  }
+	if ($subtitle)
+	  {
+	    print "Subtitle = $subtitle\n";
+	  }
+	if ($description)
+	  {
+	    print "Description = $description\n";
+	  }
+	if ($channel)
+	  {
+	    print "Channel = $channel\n";
+	  }
+	if ($timeframe)
+	  {
+	    print "Timeframe = $timeframe\n";
+	  }
+	if ($prio)
+	  {
+	    print "Prio = $prio\n";
+	  }
+	if ($timer_title)
+	  {
+	    print "Timertitle = $timer_title\n";
+	  }
+	if ($margin)
+	  {
+	    print "Margin = $margin\n";
+	  }
+	if ($machine)
+	  {
+	    print "Instance = $machine\n";
+	  }
+	print "\n";
+      }
+  }
diff --git a/Tools/master-timer/master-timer.pl b/Tools/master-timer/master-timer.pl
index 3b98acc8d..5ddf90940 100755
--- a/Tools/master-timer/master-timer.pl
+++ b/Tools/master-timer/master-timer.pl
@@ -5,6 +5,8 @@
 use Socket;
 # For converting the Timers, read from VDR, back to Unix-Timestamps
 use Time::Local;
+# For parsing the command line
+use Getopt::Std;
 
 # Debugmode
 # You have to add the following numbers to build the debug-var
@@ -13,7 +15,9 @@
 # 4     : Show when a timer will be deleted
 # 8     : Dump the "Done" REs
 # 16    : Verbose Config-Reading
-my $debug = 0;
+# 32    : Dump Program Variable
+# 64    : Excessive deepblack/torecord debuging
+my $debug = 6;
 
 # The Supervariable Program
 # %Program{$title}{$channel}{$time}{duration}
@@ -23,26 +27,51 @@
 # The Supervariable Timer
 # %Timer{$time}{$channel}{$title}{duration}
 #                                {subtitle}
+#                                {description}
 #                                {prio}
+#                                {lifetime}
 #                                {real_title}
 #                                {VDR} (Already programmed)
 # The Value of VDR is ">0" for the position in the Timer-List or "R" for a "Repeating" Timer.
 # A Value of >1.000.000 is a Master Timer-Timer which is already programmed into VDR
 
+# The Supervariable torecord/deepblack
+# $torecord{timercount}
+#          {titleRE}
+#          {subtitleRE}
+#          {descriptionRE}
+#          {title}[COUNT]
+#          {subtitle}[COUNT]
+#          {description}[COUNT]
+#          {timeframe}[COUNT]
+#          {blackchannel}[COUNT] or {channel}[COUNT]
+#          {weekday}[COUNT]
+#          {minlength}[COUNT]
+#          {maxlength}[COUNT]
+#          {prio}[COUNT]
+#          {timertitle}[COUNT]
+#          {marginstart}[COUNT]
+#          {marginstop}[COUNT]
+#          {instance}[COUNT]
+
 # Variable-Definition
 my (%Program, @channels, %channels, %Timer);
 
 # Which Subtitles are Movies
 my ($subtitle_movie);
+my ($test_subtitle_movie);
 
 # Blacklist
-my ($title_deepblack);
+my (%deepblack);
 
 # What is already recorded/Should not be recorded
 my ($title_done, $subtitle_done);
 
 # What to record
-my ($title_torecord, $subtitle_torecord, $description_torecord, @title_torecord, @subtitle_torecord, @description_torecord, @channel_torecord, @timeframe_torecord, @prio_torecord, @timer_title_torecord, $num_torecord, @marginstart_torecord, @marginstop_torecord, @machine_torecord);
+my (%torecord);
+
+# The Commandline
+my (%Opts);
 
 # Default Priority for Timers (Config: defaultprio)
 my $default_prio = 50;
@@ -63,1107 +92,1321 @@
 # Which VDR-Instance shall be used
 my $currentVDR = 1;
 
-# Working-Variables
-my ($title, $duration, $subtitle, $channel, $time, $description, $hit);
-my (@time, @date);
+# Where are the Config-Files
+my $configdir = "$ENV{HOME}/.master-timer";
 
-sub sub_die
-  {
-    my ($error) = @_;
-    &closesocket();
-    die "$error";
-  }
+# Should the description be transfered to VDR?
+my $Description = 0;
 
+# Working-Variables
+my ($title, $duration, $subtitle, $channel, $time, $description, $category, $hit);
+my (@time, @date);
 
-if ($ARGV[0])
-  {
-    $currentVDR = $ARGV[0];
-  }
+END {
+  &closesocket();
+}
 
 &init();
 &dumpdone() if ($debug & 8);
-&dumptorecord() if ($debug & 1);
+&dumptorecord("torecord") if ($debug & 1);
+&dumptorecord("deepblack") if ($debug & 1);
+print "Subtitle-Movie \"$subtitle_movie\"\n" if($debug & 1);
+# If we only have to dump the running series then exit after dumping them
+if ($Opts{s}) {
+  &dumpepgdata;
+  exit 0;
+}
+&processdone();
 &fetchVDRTimers();
 &process_torecord();
 print "Timers before joining\n" if ($debug & 2 && $jointimers);
 &dumptimers() if ($debug & 2);
-if ($jointimers)
-  {
-    &jointimers();
-    print "Timers after joining\n" if ($debug & 2);
-    &dumptimers() if ($debug & 2);
-  }
+
+if ($jointimers) {
+  &jointimers();
+  print "Timers after joining\n" if ($debug & 2);
+  &dumptimers() if ($debug & 2);
+}
+
+&dumpepgdata if ($debug & 32);
 
 &printtimers();
 &transfertimers();
-&closesocket();
+
+#
+# End of Program
+#
 
 #
 # Subfunctions
 #
 
-sub dumpdone()
-  {
-    print "Start Done-dump\n";
-    print "Titledone: \"$title_done\"\n";
-    print "Subtitledone \"$subtitle_done\"\n";
-    print "End Done-dump\n";
+sub dumpdone() {
+  print "Start Done-dump\n";
+  print "Titledone: \"$title_done\"\n";
+  print "Subtitledone \"$subtitle_done\"\n";
+  print "End Done-dump\n";
+}
+
+sub dumpepgdata () {
+  print "Start EPG-Dump\n";
+  foreach $title (sort keys %Program) {
+    foreach $channel (sort keys %{%Program->{$title}}) {
+      foreach $time (sort {$a <=> $b} keys %{%Program->{$title}->{$channel}}) {
+	print "Title: \"$title\" ";
+	if (!$Opts{s}) {
+	  print "Subtitle: \"$Program{$title}{$channel}{$time}{subtitle}\" " if ($Program{$title}{$channel}{$time}{subtitle});
+	  print "Time: \"$time\"";
+	}
+	print "Channel: \"$channel\"";
+	print "\n";
+	if ($Opts{s}) {
+	  last;
+	}
+      }
+    }
+  }
+  print "End EPG-Dump\n";
+}
+
+
+sub dumptorecord() {
+  my ($context) = shift;
+  my ($rContext);
+
+  if ($context eq "torecord") {
+    $rContext = \%torecord;
+  } elsif ($context eq "deepblack") {
+    $rContext = \%deepblack;
+  } else {
+    die ("Illegal Context");
   }
 
-sub dumptorecord()
-  {
-    print "Start Torecord-dump\n";
-    print "Regex-Title: $title_torecord\n";
-    print "Regex-Subtitle: $subtitle_torecord\n";
-    print "Regex-Description: $description_torecord\n";
-    foreach my $num (0 .. $num_torecord)
-      {
-	print "Timer Number $num: ";
-
-	print "Title: \"$title_torecord[$num]\" " if ($title_torecord[$num]);
-	print "Title: \"\" " unless ($title_torecord[$num]);
-
-	print "Subtitle: \"$subtitle_torecord[$num]\" "if ($subtitle_torecord[$num]);
-	print "Subtitle: \"\" " unless ($subtitle_torecord[$num]);
+  print "Start $context-dump\n";
+  print "Regex-Title: $$rContext{titleRE}\n";
+  print "Regex-Subtitle: $$rContext{subtitleRE}\n";
+  print "Regex-Description: $$rContext{descriptionRE}\n";
+  foreach my $num (0 .. $$rContext{timercount}) {
+    print "Entry Number $num: ";
+
+    print "Title: \"$$rContext{title}[$num]\" " if ($$rContext{title}[$num]);
+    print "Title: \"\" " unless ($$rContext{title}[$num]);
+
+    print "Subtitle: \"$$rContext{subtitle}[$num]\" "if ($$rContext{subtitle}[$num]);
+    print "Subtitle: \"\" " unless ($$rContext{subtitle}[$num]);
+	
+    print "Description: \"$$rContext{description}[$num]\" " if ($$rContext{description}[$num]);
+    print "Description: \"\" " unless ($$rContext{description}[$num]);
+	
+    print "Category: \"$$rContext{category}[$num]\" " if ($$rContext{category}[$num]);
+    print "Category: \"\" " unless ($$rContext{category}[$num]);
 	
-	print "Description: \"$description_torecord[$num]\" " if ($description_torecord[$num]);
-	print "Description: \"\" " unless ($description_torecord[$num]);
+    print "Timeframe: \"$$rContext{timeframe}[$num]\" " if ($$rContext{timeframe}[$num]);
+    print "Timeframe: \"\" " unless ($$rContext{timeframe}[$num]);
 	
-	print "Timeframe: \"$timeframe_torecord[$num]\" " if ($timeframe_torecord[$num]);
-	print "Timeframe: \"\" " unless ($timeframe_torecord[$num]);
+    print "Weekday: \"$$rContext{weekday}[$num]\" " if ($$rContext{weekday}[$num]);
+    print "Weekday: \"\" " unless ($$rContext{weekday}[$num]);
 	
-	print "Channel: \"". join (";",@{$channel_torecord[$num]})."\" " if ($channel_torecord[$num]);
-	print "Channel: \"\" " unless ($channel_torecord[$num]);
+    print "Channel: \"$$rContext{channel}[$num]\" " if ($$rContext{channel}[$num]);
+    print "Channel: \"\" " unless ($$rContext{channel}[$num]);
 	
-	print "Prio: \"$prio_torecord[$num]\" " if ($prio_torecord[$num]);
-	print "Prio: \"\" " unless ($prio_torecord[$num]);
+    print "Blackchannel: \"$$rContext{blackchannel}[$num]\" " if ($$rContext{blackchannel}[$num]);
+    print "Blackchannel: \"\" " unless ($$rContext{blackchannel}[$num]);
 	
-	print "Timertitle: \"$timer_title_torecord[$num]\" " if ($timer_title_torecord[$num]);
-	print "Timertitle: \"\" " unless ($timer_title_torecord[$num]);
+    print "Prio: \"$$rContext{prio}[$num]\" " if ($$rContext{prio}[$num]);
+    print "Prio: \"\" " unless ($$rContext{prio}[$num]);
+	
+    print "Timertitle: \"$$rContext{timertitle}[$num]\" " if ($$rContext{timertitle}[$num]);
+    print "Timertitle: \"\" " unless ($$rContext{timertitle}[$num]);
 
-	print "Marginstart: \"$marginstart_torecord[$num]\" " if ($marginstart_torecord[$num]);
-	print "Marginstart: \"\" " unless ($marginstart_torecord[$num]);
+    print "Marginstart: \"$$rContext{marginstart}[$num]\" " if ($$rContext{marginstart}[$num]);
+    print "Marginstart: \"\" " unless ($$rContext{marginstart}[$num]);
 
-	print "Marginstop: \"$marginstop_torecord[$num]\" " if ($marginstop_torecord[$num]);
-	print "Marginstop: \"\" " unless ($marginstop_torecord[$num]);
+    print "Marginstop: \"$$rContext{marginstop}[$num]\" " if ($$rContext{marginstop}[$num]);
+    print "Marginstop: \"\" " unless ($$rContext{marginstop}[$num]);
 
-	print "Machine: \"$machine_torecord[$num]\" " if ($machine_torecord[$num]);
-	print "Machine: \"\" " unless ($machine_torecord[$num]);
+    print "Minlength: \"$$rContext{minlength}[$num]\" " if ($$rContext{minlength}[$num]);
+    print "Minlength: \"\" " unless ($$rContext{minlength}[$num]);
 
-	print "\n";
-      }
-    print "End Torecord-dump\n";
+    print "Maxlength: \"$$rContext{maxlength}[$num]\" " if ($$rContext{maxlength}[$num]);
+    print "Maxlength: \"\" " unless ($$rContext{maxlength}[$num]);
+
+    print "Instance: \"$$rContext{instance}[$num]\" " if ($$rContext{instance}[$num]);
+    print "Instance: \"\" " unless ($$rContext{instance}[$num]);
+
+    print "\n";
   }
+  print "End $context-dump\n";
+}
 
-sub dumptimers()
-  {
-    print "Start Timers-dump\n";
-    foreach $time (sort {$a <=> $b} keys %Timer)
-      {
-	foreach $channel (sort keys %{%Timer->{$time}})
-	  {
-	    foreach $title (sort keys %{%Timer->{$time}->{$channel}})
-	      {
-		my ($prio, @time, @date, @time2);
-		my ($realtitle);
-		@time = &GetTime ($time);
-		@date = &GetDay ($time);
-		@time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
-		$subtitle = $Timer{$time}{$channel}{$title}{subtitle};
-		$prio = $Timer{$time}{$channel}{$title}{prio};
-		$realtitle = $Timer{$time}{$channel}{$title}{real_title};
-		print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:99:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\":$Timer{$time}{$channel}{$title}{VDR}\n";
-	      }
-	  }
+sub dumptimers() {
+  print "Start Timers-dump\n";
+  foreach $time (sort {$a <=> $b} keys %Timer) {
+    foreach $channel (sort keys %{%Timer->{$time}}) {
+      foreach $title (sort keys %{%Timer->{$time}->{$channel}}) {
+	my ($prio, $lifetime, @time, @date, @time2);
+	my ($realtitle);
+	@time = &GetTime ($time);
+	@date = &GetDay ($time);
+	@time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
+	$subtitle = $Timer{$time}{$channel}{$title}{subtitle};
+	$prio = $Timer{$time}{$channel}{$title}{prio};
+	$lifetime = $Timer{$time}{$channel}{$title}{lifetime};
+	$realtitle = $Timer{$time}{$channel}{$title}{real_title};
+	print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:$lifetime:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\":$Timer{$time}{$channel}{$title}{VDR}\n";
       }
-    print "End Timers-dump\n";
+    }
   }
+  print "End Timers-dump\n";
+}
 
-sub printtimers()
-  {
-    foreach $time (sort {$a <=> $b} keys %Timer)
-      {
-	foreach $channel (sort keys %{%Timer->{$time}})
-	  {
-	    foreach $title (sort keys %{%Timer->{$time}->{$channel}})
-	      {
-		my ($prio, @time, @date, @time2);
-		if ($Timer{$time}{$channel}{$title}{VDR} eq 0)
-		  {
-		    my ($realtitle);
-		    @time = &GetTime ($time);
-		    @date = &GetDay ($time);
-		    @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
-		    $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
-		    $prio = $Timer{$time}{$channel}{$title}{prio};
-		    $realtitle = $Timer{$time}{$channel}{$title}{real_title};
-
-		    print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:99:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"\n";
-		  }
-	      }
-	  }
+sub printtimers() {
+  foreach $time (sort {$a <=> $b} keys %Timer) {
+    foreach $channel (sort keys %{%Timer->{$time}}) {
+      foreach $title (sort keys %{%Timer->{$time}->{$channel}}) {
+	my ($prio, $lifetime, @time, @date, @time2);
+	if ($Timer{$time}{$channel}{$title}{VDR} eq 0) {
+	  my ($realtitle);
+	  @time = &GetTime ($time);
+	  @date = &GetDay ($time);
+	  @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
+	  $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
+	  $prio = $Timer{$time}{$channel}{$title}{prio};
+	  $lifetime = $Timer{$time}{$channel}{$title}{lifetime};
+	  $realtitle = $Timer{$time}{$channel}{$title}{real_title};
+
+	  print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:$lifetime:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"\n";
+	}
       }
+    }
   }
+}
 
-sub transfertimers()
-  {
-    foreach $time (sort {$a <=> $b} keys %Timer)
-      {
-	foreach $channel (sort keys %{%Timer->{$time}})
-	  {
-	    foreach $title (sort keys %{%Timer->{$time}->{$channel}})
-	      {
-		my ($prio, @time, @date, @time2, $realtitle, $result);
-		if ($Timer{$time}{$channel}{$title}{VDR} eq 0)
-		  {
-		    @time = &GetTime ($time);
-		    @date = &GetDay ($time);
-		    @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
-		    $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
-		    $prio = $Timer{$time}{$channel}{$title}{prio};
-		    $realtitle = $Timer{$time}{$channel}{$title}{real_title};
-
-		    ($result) = GetSend ("newt 2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:99:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"");
-		    print "Timer: $result" if ($debug & 2);
-		  }
-	      }
+sub transfertimers() {
+  foreach $time (sort {$a <=> $b} keys %Timer) {
+    foreach $channel (sort keys %{%Timer->{$time}}) {
+      foreach $title (sort keys %{%Timer->{$time}->{$channel}}) {
+	my ($prio, $lifetime, $description, @time, @date, @time2, $realtitle, $result);
+	if ($Timer{$time}{$channel}{$title}{VDR} eq 0) {
+	  @time = &GetTime ($time);
+	  @date = &GetDay ($time);
+	  @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
+	  $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
+	  $prio = $Timer{$time}{$channel}{$title}{prio};
+	  $lifetime = $Timer{$time}{$channel}{$title}{lifetime};
+	  if ($Description) {
+	    $description = "||Description :\"$Timer{$time}{$channel}{$title}{description}\"";
+	  } else {
+	    $description = "";
 	  }
+	  $realtitle = $Timer{$time}{$channel}{$title}{real_title};
+
+	  ($result) = GetSend ("newt 2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:$lifetime:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"$description");
+	  print "Timer: $result" if ($debug & 2);
+	}
       }
+    }
   }
+}
 
 # Convert the Unix-Time-Stamp into "month" and "Day of month"
-sub GetDay
- {
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
-    $mon++;
-    $mon = sprintf ("%02i",$mon);
-    $mday = sprintf ("%02i",$mday);
-    return ($mon, $mday);
-  }
+sub GetDay {
+  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
+  $mon++;
+  $mon = sprintf ("%02i",$mon);
+  $mday = sprintf ("%02i",$mday);
+  return ($mon, $mday);
+}
+# Convert the Unix-Time-Stramp into Weekday
+sub GetWDay {
+  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
+  return ($wday);
+}
 
 # Convert the Unix-Time-Stramp into "hour" and "minute"
-sub GetTime
-  {
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
-    $hour = sprintf ("%02i",$hour);
-    $min = sprintf ("%02i",$min);
-    return ($hour, $min);
-  }
+sub GetTime {
+  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
+  $hour = sprintf ("%02i",$hour);
+  $min = sprintf ("%02i",$min);
+  return ($hour, $min);
+}
 
 # Workaround some EPG-Bugs
-sub correct_epg_data
-  {
-    if ($subtitle)
-      {
-	# For Pro-7. Remove $title from $subtitle
-	$subtitle =~ s/$title\s\/\s//;
+sub correct_epg_data {
+  if ($subtitle) {
+    # For Pro-7. Remove $title from $subtitle
+    $subtitle =~ s/\Q$title\E\s\/\s//;
 	
-	# For VOX & VIVA. The Format it '"<Subtitle>". <Description>'
-	if ($subtitle =~ /^\"(.*?)\"\.\s(.*)/)
-	  {
-	    # Lets see if there are Channels that where the VOX/VIVA scheme matches, but also have a description
-	    if ($description)
-	      {
-		sub_die ("Subtitle: \"$subtitle\"\nDescription\"$description\"\n");
-	      }
-	    $subtitle = $1;
-	    $description = $2;
-	  }
-	elsif ($channel eq "VIVA")
-	  {
-	    if ($subtitle =~ /^\s(.*)/)
-	      {
-		$subtitle = "";
-		$description = $1;
-	      }
-	  }
+    # For VOX & VIVA. The Format it '"<Subtitle>". <Description>'
+    if ($subtitle =~ /^\"(.*?)\"\.\s(.*)/) {
+      # Lets see if there are Channels that where the VOX/VIVA scheme matches, but also have a description
+      if ($description) {
+	my $one = $1;
+	my $two = $2;
+	if ($description =~ /^DTV\:\s\'(.*)\' VDR:\s\'\'$/) {
+	  $description = "DTV: '$1' VDR: '$two'";
+	  $subtitle = $one;
+	} else {
+	  die ("Title: \"$title\" Channel: \"$channel\" Subtitle: \"$subtitle\"\nDescription: \"$description\"\n");
+	}
       }
-
-    # Workaround for the broken PRO-7/Kabel-1 EPG-Date. If Time is between 00.00 and 05.00 the time is shifted forward by a day
-    if ($channel eq "Pro-7" || $channel eq "Kabel-1")
-      {
-	my (@time);
-	@time = GetTime ($time);
-	if ($time[0] >= 0 && ($time[0] <= 4 || ($time[0] == 5 && $time[1] == 0)))
-	  {
-	    $time += 24*60*60;
-	  }
+      $subtitle = $1;
+      $description = $2;
+    }
+    elsif ($channel eq "VIVA") {
+      if ($subtitle =~ /^\s(.*)/) {
+	$subtitle = "";
+	$description = $1;
       }
+    }
+  }
+
+  # Workaround for the broken PRO-7/Kabel-1 EPG-Date. If Time is between 00.00 and 05.00 the time is shifted forward by a day
+  if ($channel eq "Pro-7" || $channel eq "Kabel-1") {
+    my (@time);
+    @time = GetTime ($time);
+    if ($time[0] >= 0 && ($time[0] <= 4 || ($time[0] == 5 && $time[1] == 0))) {
+      $time += 24*60*60;
+    }
+  }
 }
 
 # Add a Recording into the "to record"-List
-sub addtimer
-  {
-    my ($hit, $title, $realtitle, $subtitle, $channel, $time, $duration, $prio, $VDR, $time2, $title2, $channel2, $marginstart, $marginstop);
-    ($title, $realtitle, $subtitle, $channel, $time, $duration, $prio, $VDR, $marginstart, $marginstop) = @_;
-#    print "Title: \"$title\" Realtitle: \"$realtitle\" Subtitle: \"$subtitle\" Channel: \"$channel\" Time: \"$time\" Duration: \"$duration\" Prio: \"$prio\" VDR: \"$VDR\"\n";
-
-    $hit = 1;
-
-    foreach $time2 (sort keys %Timer)
-      {
-        foreach $title2 (sort keys %{%Timer->{$time2}->{$channel}})
-          {
-	    my ($ctime, $ctime2);
-	    $ctime = $time2;
-	    $ctime2 = $time2 + $Timer{$time2}{$channel}{$title2}{duration};
-
-	    if (($time >= $ctime) && ($time <= $ctime2))
-	      {
-		undef $hit;
-	      }
-          }
+sub addtimer {
+  my ($title, $realtitle, $subtitle, $channel, $time, $duration, $prio, $lifetime, $description, $VDR, $time2, $title2, $channel2, $marginstart, $marginstop);
+  ($title, $realtitle, $subtitle, $description, $channel, $time, $duration, $prio, $lifetime, $VDR, $marginstart, $marginstop) = @_;
+#  print "Title: \"$title\" Realtitle: \"$realtitle\" Subtitle: \"$subtitle\" Channel: \"$channel\" Time: \"$time\" Duration: \"$duration\" Prio: \"$prio\" VDR: \"$VDR\"\n";
+
+  foreach $time2 (sort keys %Timer) {
+    foreach $title2 (sort keys %{%Timer->{$time2}->{$channel}}) {
+      my ($ctime, $ctime2);
+      $ctime = $time2;
+      $ctime2 = $time2 + $Timer{$time2}{$channel}{$title2}{duration};
+
+      if (($time >= $ctime) && ($time <= $ctime2)) {
+	return;
       }
+    }
+  }
 
+  $time -= $marginstart;
+  $duration += $marginstart + $marginstop;
+  $Timer{$time}{$channel}{$title}{duration}=$duration;
+  $Timer{$time}{$channel}{$title}{subtitle}=$subtitle;
+  $Timer{$time}{$channel}{$title}{description}=$description;
+  $Timer{$time}{$channel}{$title}{prio}=$prio;
+  $Timer{$time}{$channel}{$title}{lifetime}=$lifetime;
+  $Timer{$time}{$channel}{$title}{VDR}=$VDR;
+  $Timer{$time}{$channel}{$title}{real_title}=$realtitle;
+}
 
-    if ($hit)
-      {
-	$time -= $marginstart;
-	$duration += $marginstart + $marginstop;
-	$Timer{$time}{$channel}{$title}{duration}=$duration;
-	$Timer{$time}{$channel}{$title}{subtitle}=$subtitle;
-	$Timer{$time}{$channel}{$title}{prio}=$prio;
-	$Timer{$time}{$channel}{$title}{VDR}=$VDR;
-	$Timer{$time}{$channel}{$title}{real_title}=$realtitle;
-      }
-  }
+sub deltimer() {
+  my ($time, $channel, $title, $delete_from_VDR);
+  ($time, $channel, $title, $delete_from_VDR) = @_;
 
-sub deltimer()
-  {
-    my ($time, $channel, $title, $delete_from_VDR);
-    ($time, $channel, $title, $delete_from_VDR) = @_;
-
-#    if ($delete_from_VDR)
-#      {
-#	if ($Timer{$time}{$channel}{$title}{VDR})
-#	  {
-#	    if ($Timer{$time}{$channel}{$title}{VDR} =~ s/ ^R/)
-#	      {
-#		print "Error: A Repeating-Timer can't be deleted from VDR: \"$title\"\n";
-#	      }
-#	    elsif ($Timer{$time}{$channel}{$title}{VDR} < 1000000)
-#	      {
-#		print "A User-Programmed Timer has been deleted from VDR: \"$title\"\n";
-#	      }
-#	    else
-#	      {
-#		
-#	      }
-#	  }
+#  if ($delete_from_VDR) {
+#    if ($Timer{$time}{$channel}{$title}{VDR}) {
+#      if ($Timer{$time}{$channel}{$title}{VDR} =~ s/ ^R/) {
+#	print "Error: A Repeating-Timer can't be deleted from VDR: \"$title\"\n";
+#      }
+#      elsif ($Timer{$time}{$channel}{$title}{VDR} < 1000000) {
+#	print "A User-Programmed Timer has been deleted from VDR: \"$title\"\n";
+#      }
+#      else {
+#	
 #      }
+#    }
+#  }
+
+  delete $Timer{$time}{$channel}{$title}{duration};
+  delete $Timer{$time}{$channel}{$title}{subtitle};
+  delete $Timer{$time}{$channel}{$title}{prio};
+  delete $Timer{$time}{$channel}{$title}{VDR};
+  delete $Timer{$time}{$channel}{$title}{real_title};
+  delete $Timer{$time}{$channel}{$title};
+  delete $Timer{$time}{$channel} if (keys %{ $Timer{$time}{$channel} } == 1);
+  delete $Timer{$time} if (keys %{ $Timer{$time} } == 1);
+}
 
-    delete $Timer{$time}{$channel}{$title}{duration};
-    delete $Timer{$time}{$channel}{$title}{subtitle};
-    delete $Timer{$time}{$channel}{$title}{prio};
-    delete $Timer{$time}{$channel}{$title}{VDR};
-    delete $Timer{$time}{$channel}{$title}{real_title};
-    delete $Timer{$time}{$channel}{$title};
-    delete $Timer{$time}{$channel} if (keys %{ $Timer{$time}{$channel} } == 1);
-    delete $Timer{$time} if (keys %{ $Timer{$time} } == 1);
-  }
+sub delprogram() {
+  my ($title, $channel, $time);
+  ($title, $channel, $time) = @_;
 
-sub jointimers
-  {
-    #
-    # FIXME: 2 Timers on the same channel will always be joined.
-    # It should be checked if there is another DVB-Card available.
-    #
-    # FIXME2: When one timer is already programmed in VDR, delete that timer in VDR.
-    my ($running, $counter, @times, $channel, $title, $channel2, $title2);
-    $running = 1;
-  outer: while ($running)
-      {
-	$counter = 0;
-	@times = sort {$a <=> $b} keys %Timer;
-
-	# We only need to check till the second last timer. The last one can't have a overlapping one.
-	while ($counter < $#times)
-	  {
-	    foreach $channel (sort keys %{%Timer->{$times[$counter]}})
-	      {
-		foreach $title (sort keys %{%Timer->{$times[$counter]}->{$channel}})
-		  {
-		    if ($times[$counter + 1] < ($times[$counter] + $Timer{$times[$counter]}{$channel}{$title}{duration}))
-		      {
-			foreach $channel2 (sort keys %{%Timer->{$times[$counter + 1]}})
-			  {
-			    foreach $title2 (sort keys %{%Timer->{$times[$counter + 1]}->{$channel}})
-			      {
-				if ($channel eq $channel2)
-				  {
-				    my ($duration, $subtitle, $prio, $realtitle, $duration2, $subtitle2, $prio2, $realtitle2);
-				    # Values from Lower-Timer
-				    $duration = $Timer{$times[$counter]}{$channel}{$title}{duration};
-				    $subtitle = $Timer{$times[$counter]}{$channel}{$title}{subtitle};
-				    $prio = $Timer{$times[$counter]}{$channel}{$title}{prio};
-				    $realtitle = $Timer{$times[$counter]}{$channel}{$title}{real_title};
-
-				    # Values from Higher-Timer
-				    $duration2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{duration};
-				    $subtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{subtitle};
-				    $prio2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{prio};
-				    $realtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{real_title};
-
-				    # Use the Higher Priority for the new Timer
-				    $prio = ($prio > $prio2) ? $prio : $prio2;
-
-				    # Delete the two "Obsolet" Timers
-				    &deltimer ($times[$counter], $channel, $title);
-				    &deltimer ($times[$counter + 1], $channel2, $title2);
-
-				    # And set the new one
-				    &addtimer ("$title + $title2", "$realtitle\~$realtitle2", "$subtitle\~$subtitle2", $channel, $times[$counter], $duration2 + ($times[$counter + 1 ] - $times[$counter]),$prio,0,0,0);
-
-				    # Now a Value is "missing", so we will redo the whole thing. (This will do three-times JOIN correct)
-				    redo outer;
-				  }
-			      }
-			  }
-		      }
-		  }
+  delete $Program{$title}{$channel}{$time};
+  delete $Program{$title}{$channel} if (keys %{ $Program{$title}{$channel} } == 1);
+  delete $Program{$title} if (keys %{ $Program{$title} } == 1);
+}
+
+sub jointimers {
+  #
+  # FIXME: 2 Timers on the same channel will always be joined.
+  # It should be checked if there is another DVB-Card available.
+  #
+  # FIXME2: When one timer is already programmed in VDR, delete that timer in VDR.
+  my ($running, $counter, @times, $channel, $title, $channel2, $title2);
+  $running = 1;
+ outer: while ($running) {
+    $counter = 0;
+    @times = sort {$a <=> $b} keys %Timer;
+
+    # We only need to check till the second last timer. The last one can't have a overlapping one.
+    while ($counter < $#times) {
+      foreach $channel (sort keys %{%Timer->{$times[$counter]}}) {
+	foreach $title (sort keys %{%Timer->{$times[$counter]}->{$channel}}) {
+	  if ($times[$counter + 1] < ($times[$counter] + $Timer{$times[$counter]}{$channel}{$title}{duration})) {
+	    foreach $channel2 (sort keys %{%Timer->{$times[$counter + 1]}}) {
+	      foreach $title2 (sort keys %{%Timer->{$times[$counter + 1]}->{$channel}}) {
+		if ($channel eq $channel2) {
+		  my ($duration, $subtitle, $description, $prio, $lifetime, $realtitle, $duration2, $subtitle2, $description2, $prio2, $lifetime2, $realtitle2);
+		  # Values from Lower-Timer
+		  $duration = $Timer{$times[$counter]}{$channel}{$title}{duration};
+		  $subtitle = $Timer{$times[$counter]}{$channel}{$title}{subtitle};
+		  $description = $Timer{$times[$counter]}{$channel}{$title}{description};
+		  $prio = $Timer{$times[$counter]}{$channel}{$title}{prio};
+		  $lifetime = $Timer{$times[$counter]}{$channel}{$title}{lifetime};
+		  $realtitle = $Timer{$times[$counter]}{$channel}{$title}{real_title};
+
+		  # Values from Higher-Timer
+		  $duration2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{duration};
+		  $subtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{subtitle};
+		  $description2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{description};
+		  $prio2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{prio};
+		  $lifetime2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{lifetime};
+		  $realtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{real_title};
+
+		  # Use the Higher Priority/Lifetime for the new Timer
+		  $prio = ($prio > $prio2) ? $prio : $prio2;
+		  $lifetime = ($lifetime > $lifetime2) ? $lifetime : $lifetime2;
+
+		  # Delete the two "Obsolet" Timers
+		  &deltimer ($times[$counter], $channel, $title);
+		  &deltimer ($times[$counter + 1], $channel2, $title2);
+
+		  # And set the new one
+		  &addtimer ("$title + $title2", "$realtitle\~$realtitle2", "$subtitle\~$subtitle2", "$description\~$description2", $channel, $times[$counter], $duration2 + ($times[$counter + 1 ] - $times[$counter]),$prio,$lifetime,0,0,0);
+
+		  # Now a Value is "missing", so we will redo the whole thing. (This will do three-times JOIN correct)
+		  redo outer;
+		}
 	      }
-	    $counter++;
+	    }
 	  }
-	undef $running;
+	}
       }
+      $counter++;
+    }
+    undef $running;
   }
+}
 
-sub process_torecord
-  {
-    my ($first_hit, $prio, $timer_title);
-    foreach $title (sort keys %Program)
-      {
-	foreach $channel (sort keys %{%Program->{$title}})
-	  {
-	    foreach $time (sort {$a <=> $b} keys %{%Program->{$title}->{$channel}})
-	      {
-		undef $hit;
-
-		# First look if any of the Title/Subtitle/Description REs match
-		if ($title =~ /$title_torecord/i)
-		  {
-		    $hit = 1;
-		  }
-		elsif ($Program{$title}{$channel}{$time}{subtitle} && $Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_torecord/i)
-		  {
-		    $hit = 1;
-		  }
-		elsif ($Program{$title}{$channel}{$time}{description} && $Program{$title}{$channel}{$time}{description} =~ /$description_torecord/i)
-		  {
-		    $hit = 1;
-		  }
-
-		# Now look if we have a "exact" hit
-		if ($hit)
-		  {
-		    my ($counter);
-		    undef $hit;
-		    foreach $counter (0 .. $num_torecord)
-		      {
-			
-			if ($title_torecord[$counter])
-			  {	
-			    if (!($title =~ /$title_torecord[$counter]/i))
-			      {
-				next;
-			      }
-			  }
-
-			if ($subtitle_torecord[$counter])
-			  {
-			    if (!($Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_torecord[$counter]/i))
-			      {
-				next;
-			      }
-			    elsif (!$title_torecord[$counter] && !$description_torecord[$counter])
-			      {
-				next;
-			      }
-			  }
-
-			if ($description_torecord[$counter])
-			  {
-			    if ($Program{$title}{$channel}{$time}{description})
-			      {
-				if (!($Program{$title}{$channel}{$time}{description} =~ /$description_torecord[$counter]/i))
-				  {
-				    next;
-				  }
-			      }
-			    elsif (!$title_torecord[$counter] && !$subtitle_torecord[$counter])
-			      {
-				next;
-			      }
-			  }
-
-			if ($channel_torecord[$counter])
-			  {
-			    my ($hit);
-			    # Blacklist-Mode
-			    if ($channel_torecord[$counter][0] =~ /^!/)
-			      {
-				$hit = 1;
-				foreach (0 .. $#{$channel_torecord[$counter]})
-				  {
-				    # Strip a possibel "!" Charactar
-				    $channel_torecord[$counter][$_] =~ /^!?(.*)/;
-				    if ($channel =~ /^$1$/)
-				      {
-					undef $hit;
-					last;
-				      }
-				  }
-			      }
-			    # Whitelist-Mode
-			    else
-			      {
-				undef $hit;
-				foreach (0 .. $#{$channel_torecord[$counter]})
-				  {
-				    # Strip a possibel "!" Charactar
-				    $channel_torecord[$counter][$_] =~ /^!?(.*)/;
-				    if ($channel =~ /^$1$/)
-				      {
-					$hit = 1;
-					last ;
-				      }
-				  }
-			      }
-			    if (!$hit)
-			      {
-				next;
-			      }
-			  }
-
-			if ($timeframe_torecord[$counter])
-			  {
-			    my (@time, $time2, $ctime, $ctime2);
-			    @time = GetTime($time);
-			    $time2 = "$time[0]$time[1]";
-
-			    ($ctime, $ctime2) = split (/\-/,$timeframe_torecord[$counter]);
-
-			    if (!$ctime)
-			      {
-				$ctime = "0";
-			      }
-			    if (!$ctime2)
-			      {
-				$ctime2 = "2400";
-			      }
-
-			    if ($ctime < $ctime2)
-			      {
-				if (!($time2 >= $ctime && $time2 <= $ctime2))
-				  {
-				    next;
-				  }
-			      }
-			    else
-			      {
-				if (!(($time2 >= $ctime && $time2 <= "2400") || ($time2 >= "0" && $time2 <= $ctime2)))
-				  {
-				    next;
-				  }
-			      }
-			  }
-
-			if ($prio_torecord[$counter])
-			  {
-			    $prio = $prio_torecord[$counter];
-			  }
-			else
-			  {
-			    $prio = 50;
-			  }
-
-			# What Title to use for the timer
-			if ($timer_title_torecord[$counter])
-			  {
-			    $timer_title = $timer_title_torecord[$counter]
-			  }
-			elsif ($title_torecord[$counter])
-			  {
-			    $timer_title = $title_torecord[$counter]
-			  }
-			else
-			  {
-			    $timer_title = $title;
-			  }
-
-			my ($subtitle);
-			if ($Program{$title}{$channel}{$time}{subtitle})
-			  {
-			    $subtitle = $Program{$title}{$channel}{$time}{subtitle};
-			  }
-			else
-			  {
-			    $subtitle = "";
-			  }
-
-			&addtimer ($timer_title,$title,$subtitle,$channel,$time,$Program{$title}{$channel}{$time}{duration},$prio,0,$marginstart_torecord[$counter],$marginstop_torecord[$counter]);
-			last;
-		      }
-		  }
-	      }
+sub process_torecord {
+  my ($subtitle, $description, $prio, $lifetime, $timertitle, $counter);
+  foreach $title (sort keys %Program) {
+    foreach $channel (sort keys %{%Program->{$title}}) {
+      foreach $time (sort {$a <=> $b} keys %{%Program->{$title}->{$channel}}) {
+
+	$counter = &testtimer("torecord", $title, $channel, $time);
+	if ($counter ne "Nothing") {
+
+	  # What Priority
+	  if ($torecord{prio}[$counter]) {
+	    $prio = $torecord{prio}[$counter];
+	  }
+	  else {
+	    $prio = 50;
+	  }
+
+	  # What Lifetime
+	  if ($torecord{lifetime}[$counter]) {
+	    $lifetime = $torecord{lifetime}[$counter];
+	  }
+	  else {
+	    $lifetime = 50;
+	  }
+
+	  # What Title to use for the timer
+	  if ($torecord{timertitle}[$counter]) {
+	    $timertitle = $torecord{timertitle}[$counter]
 	  }
+	  elsif ($torecord{title}[$counter]) {
+	    $timertitle = $torecord{title}[$counter]
+	  }
+	  else {
+	    $timertitle = $title;
+	  }
+
+	  # What subtitle to use
+	  if ($Program{$title}{$channel}{$time}{subtitle}) {
+	    $subtitle = $Program{$title}{$channel}{$time}{subtitle};
+	  }
+	  else {
+	    $subtitle = "";
+	  }
+
+	  # What Description to use
+	  if ($Program{$title}{$channel}{$time}{description}) {
+	    $description = $Program{$title}{$channel}{$time}{description};
+	  }
+	  else {
+	    $description = "";
+	  }
+
+	  &addtimer ($timertitle,$title,$subtitle,$description,$channel,$time,$Program{$title}{$channel}{$time}{duration},$prio,$lifetime,0,$torecord{marginstart}[$counter],$torecord{marginstop}[$counter]);
+	}
       }
+    }
   }
+}
 
-# Open the connection to VDR
-sub initsocket
-  {
-    my ($Dest, $Port) = split (/\:/,$Dest[$currentVDR - 1],2);
-    my $iaddr = inet_aton($Dest);
-    my $paddr = sockaddr_in($Port, $iaddr);
-
-    socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp'));
-    connect(SOCKET, $paddr) or sub_die ("Can't connect to VDR\n");
-    select(SOCKET); $| = 1;
-    select(STDOUT);
-
-    while (<SOCKET>) {
-      last if substr($_, 3, 1) ne "-";
-    }
+# Test if a torecord/deepblack Entry matches the current EPG-Data-Field
+sub testtimer {
+  my ($context) = shift;
+  my ($title) = shift;
+  my ($channel) = shift;
+  my ($time) = shift;
+  my ($counter, $rContext);
+
+  if ($context eq "torecord") {
+    $rContext = \%torecord;
+  } elsif ($context eq "deepblack") {
+    $rContext = \%deepblack;
+  } else {
+    die ("Illegal Context");
   }
 
-# Send a command to VDR and read back the result
-sub GetSend
-  {
-    my ($command, @retval);
-
-    while ($command = shift)
-      {
-	print SOCKET "$command\r\n";
-	while (<SOCKET>) {
-	  (@retval) = (@retval, $_);
-	  last if substr($_, 3, 1) ne "-";
+  if ($debug & 64) {
+    print "\n";
+    print "Context: \"$context\"\nTitle: \"$title\"\n";
+    print "Subtitle: \"$Program{$title}{$channel}{$time}{subtitle}\"\n" if ($Program{$title}{$channel}{$time}{subtitle});
+    print "Description \"$Program{$title}{$channel}{$time}{description}\"\n" if ($Program{$title}{$channel}{$time}{description});
+    print "Category \"$Program{$title}{$channel}{$time}{category}\"\n" if ($Program{$title}{$channel}{$time}{category});
+    print "Channel: $channel\n";
+    print "Time: $time\n";
+    print "Duration: $Program{$title}{$channel}{$time}{duration}\n";
+  }
+
+  # First look if any of the Title/Subtitle/Description REs match
+  if ($title =~ /$$rContext{titleRE}/i) {
+    print "Title hit\n" if ($debug & 64);
+  }
+  elsif ($Program{$title}{$channel}{$time}{subtitle} && $Program{$title}{$channel}{$time}{subtitle} =~ /$$rContext{subtitleRE}/i) {
+    print "SubTitle hit\n" if ($debug & 64);
+  }elsif ($Program{$title}{$channel}{$time}{subtitle} && $test_subtitle_movie && $Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_movie/) {
+    print "SubTitle-Movie hit\n" if ($debug & 64);
+  }
+  elsif ($Program{$title}{$channel}{$time}{description} && $Program{$title}{$channel}{$time}{description} =~ /$$rContext{descriptionRE}/i) {
+    print "Description hit\n" if ($debug & 64);
+  } else {
+    # No "Fast"-hit. Exiting
+    return "Nothing";
+  }
+
+  # Now look if we have a "exact" hit
+  print "In Exact Hit Loop\n" if ($debug & 64);
+  foreach my $counter (0 .. $$rContext{timercount}) {
+
+    print "Before Title Match\n" if ($debug & 64);
+    if ($$rContext{title}[$counter]) {	
+      print "In Title Match \"$$rContext{title}[$counter]\"\n" if ($debug & 64);
+      if (!($title =~ /$$rContext{title}[$counter]/i)) {
+	print "Title rejected\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    print "Before Subtitle Match\n" if ($debug & 64);
+    if ($$rContext{subtitle}[$counter]) {
+      print "In Subtitle Match \"$$rContext{subtitle}[$counter]\"\n" if ($debug & 64);
+      if ($Program{$title}{$channel}{$time}{subtitle}) {
+	if ($$rContext{subtitle}[$counter] =~ /^movie$/i) {
+	  if (!($Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_movie/i)) {
+	    print "Subtitle rejected 1\n" if ($debug & 64);
+	    next;
+	  }
+	}
+	elsif ($$rContext{subtitle}[$counter] =~ /^\!movie$/i) {
+	  if (($Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_movie/i)) {
+	    print "Subtitle rejected 2\n" if ($debug & 64);
+	    next;
+	  }
+	}
+	elsif (!($Program{$title}{$channel}{$time}{subtitle} =~ /$$rContext{subtitle}[$counter]/i)) {
+	  print "Subtitle rejected 3\n" if ($debug & 64);
+	  next;
+	}
+      } else {
+	# We had a Subtitle, but epg.data did not have a subtitle for this record so no chance to record this
+	print "Subtitle rejected 4\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    print "Before Description Match\n" if ($debug & 64);
+    if ($$rContext{description}[$counter]) {
+      print "In Description Match \"$$rContext{description}[$counter]\"\n" if ($debug & 64);
+      if ($Program{$title}{$channel}{$time}{description}) {
+	if (!($Program{$title}{$channel}{$time}{description} =~ /$$rContext{description}[$counter]/i)) {
+	  print "Description rejected 1\n" if ($debug & 64);
+	  next;
+	}
+      }
+      elsif (!$$rContext{title}[$counter] && !$$rContext{subtitle}[$counter]) {
+	print "Description rejected 2\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    print "Before Category Match\n" if ($debug & 64);
+    if ($$rContext{category}[$counter]) {
+      print "In Category Match \"$$rContext{category}[$counter]\"\n" if ($debug & 64);
+      if ($Program{$title}{$channel}{$time}{category}) {
+	my ($left, $right);
+	($left, $right) = split (/\//, $$rContext{category}[$counter]);
+	if ($left) {
+	  print "In Category Match Left \"$left\"\n" if ($debug & 64);
+	  if (!($Program{$title}{$channel}{$time}{category} =~ /^$left\//)) {
+	    print "Category rejected 1\n" if ($debug & 64);
+	    next;
+	  }
+	}
+	if ($right) {
+	  print "In Category Match Right \"$right\"\n" if ($debug & 64);
+	  if (!($Program{$title}{$channel}{$time}{category} =~ /\/$right$/)) {
+	    print "Category rejected 2\n" if ($debug & 64);
+	    next;
+	  }
+	}
+      } else {
+	# We had a Category, but the epg.data not. So discard this Entry
+	print "Category rejected 3\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    print "Before Channel Match\n" if ($debug & 64);
+    if ($$rContext{channel}[$counter]) {
+      print "In Channel Match Whitelist-Mode \"$$rContext{channel}[$counter]\"\n" if ($debug & 64);
+      if (!($channel =~ /$$rContext{channel}[$counter]/)) {
+	print "Channel rejected\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    if ($$rContext{blackchannel}[$counter]) {
+      print "In Channel Match Blacklist-Mode \"$$rContext{blackchannel}[$counter]\"\n" if ($debug & 64);
+      if ($channel =~ /$$rContext{blackchannel}[$counter]/) {
+	print "Channel rejected\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    print "Before Timeframe Match\n" if ($debug & 64);
+    if ($$rContext{timeframe}[$counter]) {
+      print "In Timeframe Match \"$$rContext{timeframe}[$counter]\"\n" if ($debug & 64);
+      my (@time, $time2, $ctime, $ctime2);
+      @time = GetTime($time);
+      $time2 = "$time[0]$time[1]";
+	
+      ($ctime, $ctime2) = split (/\-/,$$rContext{timeframe}[$counter]);
+	
+      if (!$ctime) {
+	$ctime = "0";
+      }
+      if (!$ctime2) {
+	$ctime2 = "2400";
+      }
+
+      if ($ctime < $ctime2) {
+	if (!($time2 >= $ctime && $time2 <= $ctime2)) {
+	  print "Timeframe rejected 1\n" if ($debug & 64);
+	  next;
+	}
+      }
+      else {
+	if (!(($time2 >= $ctime && $time2 <= "2400") || ($time2 >= "0" && $time2 <= $ctime2))) {
+	  print "Timeframe rejected 2\n" if ($debug & 64);
+	  next;
 	}
       }
+    }
+
+    print "Before Weekday Match\n" if ($debug & 64);
+    if ($$rContext{weekday}[$counter]) {
+      print "In Weekday Match \"$$rContext{weekday}\"\n" if ($debug & 64);
+      my ($wday);
+      $wday = getWDay($time);
+      $$rContext{weekday}[$counter] =~ /(.)(.)(.)(.)(.)(.)(.)/;
+      if ($$wday eq "-") {
+	print "Weekday rejected\n" if ($debug & 64);
+	next;
+      }
+    }
+
+    print "Before Minlength Match\n" if ($debug & 64);
+    if ($$rContext{minlength}[$counter]) {
+      print "In Minlength Match \"$$rContext{minlength}[$counter]\"\n" if ($debug & 64);
+      if ($Program{$title}{$channel}{$time}{duration} < $$rContext{minlength}[$counter]) {
+	print "Minlength rejected\n" if ($debug & 64);
+	next;
+      }
+    }
 
-    foreach my $retval (@retval)
-      {
-	$retval =~ s/\x0d//g;
+    print "Before Maxlength Match\n" if ($debug & 64);
+    if ($$rContext{maxlength}[$counter]) {
+      print "In Maxlength Match \"$$rContext{maxlength}[$counter]\"\n" if ($debug & 64);
+      if ($Program{$title}{$channel}{$time}{duration} > $$rContext{maxlength}[$counter]) {
+	print "Maxlength rejected\n" if ($debug & 64);
+	next;
       }
-    return (@retval);
+    }
+
+    # All test passed. Accept this timer
+    print "All Tests passed entry accepted/blacklisted\n" if ($debug & 64);
+    return ($counter);
+    }
+  # Foreach ran out without a hit
+  return "Nothing";
+}
+
+# Open the connection to VDR
+sub initsocket {
+  my ($Dest, $Port) = split (/\:/,$Dest[$currentVDR - 1],2);
+  my $iaddr = inet_aton($Dest);
+  my $paddr = sockaddr_in($Port, $iaddr);
+  my $Timeout = 10; # max. seconds to wait for response
+
+  $SIG{ALRM} = sub { die("Timeout while connecting to VDR"); };
+  alarm($Timeout);
+
+  socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp'));
+  connect(SOCKET, $paddr) or die ("Can't connect to VDR\n");
+  select(SOCKET); $| = 1;
+  select(STDOUT);
+
+  while (<SOCKET>) {
+    last if substr($_, 3, 1) ne "-";
   }
+  alarm(0);
+}
+
+# Send a command to VDR and read back the result
+sub GetSend {
+  my ($command, @retval);
+
+    while ($command = shift) {
+      print SOCKET "$command\r\n";
+      while (<SOCKET>) {
+	s/\x0d//g;
+	(@retval) = (@retval, $_);
+	last if substr($_, 3, 1) ne "-";
+      }
+    }
+  return (@retval);
+}
 
 # Close the socket to VDR
-sub closesocket
-  {
-    print SOCKET "Quit\r\n";
-    close(SOCKET);
-  }
+sub closesocket {
+  print SOCKET "Quit\r\n";
+  close(SOCKET);
+}
 
 
 # Fetch the timers-List from VDR via SVDR and process it.
-sub fetchVDRTimers
-  {
-    my (@timers, $timer, $position, $active, $channel, $day, $start, $end, $prio, $ttl, $title, $subtitle, $minute, $duration);
-    my ($utime, $utime2);
-
-    # First fetch the timers-list from VDR
-    @timers = GetSend ("lstt");
-
-    foreach $timer (@timers)
-      {
-#	$timer =~ s/\x0d//g;
-	chomp $timer;
-	# a Valid Timer-line beginns with "250"
-	if ($timer =~ s/250-|250\s//)
-	  {
-	    # Extract the Position in front of the line
-	    ($position, $timer) = split (/\s/,$timer,2);
-
-#	    print "Position: \"$position\" Timer: \"$timer\"\n";
-	    # Split the : seperated values
-	    ($active, $channel, $day, $start, $end, $prio, $ttl, $title, $subtitle) = split (/\:/,$timer,9);
-
-	    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-	    # If the string is exactly 7 char wide, then its a "repeating"-timer
-	    if ($active >= 1)
-	      {
-		if ($day =~ /(.)(.)(.)(.)(.)(.)(.)/)
-		  {
-		    my (@days);
-		    @days = ($1, $2, $3, $4, $5, $6, $7);
-		    ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-		    $start =~ /(\d\d)(\d\d)/;
-		    $hour = $1;
-		    $minute = $2;
-		    $utime = timelocal 0, $minute, $hour, $mday, $mon, $year;
-		    $end =~ /(\d\d)(\d\d)/;
-		    $hour = $1;
-		    $minute = $2;
-		    $utime2 = timelocal 0, $minute, $hour, $mday, $mon, $year;
-		    if ($end < $start)
-		      {
-			$utime2 += 24*60*60;
-		      }
-		    $duration = $utime2 - $utime;
-
-		    # "Normalize" the timestamp to monday
-		    $utime = $utime - ($wday * 24 * 60 *60);
-
-		    foreach my $num (0 .. $#days)
-		      {
-			if ($days[$num] ne "-")
-			  {
-			    my $utime3;
-			    # Todays before today will be shifted in the next week
-			    if (($num + 1) < $wday)
-			      {
-				$utime3 = $utime + (($num + 7 + 1) * 24 * 60 * 60);
-			      }
-			    else
-			      {
-				$utime3 = $utime + (($num + 1) * 24 * 60 * 60);
-			      }
-			    &addtimer ($title,$title,$subtitle,$channels[$channel],$utime3,$duration,$prio,"R$position",0,0);
-			  }
-		      }
-		  }
-
-		# When the Day-Value is between 1 and 31, then its a "One time" Timer
-		elsif (($day >= 1) && ($day <= 31))
-		  {
-		    if ($active == "2")
-		      {
-			$position += 1000000;
-		      }
-		    # When the Day is before the Current-Day, then the Timer is for the next month
-		    if ($day < $mday)
-		      {
-			$mon++;
-			if ($mon == 12)
-			  {
-			    $mon = 0;
-			    $year ++;
-			  }
-		      }
-		    $start =~ /(\d\d)(\d\d)/;
-		    $hour = $1;
-		    $minute = $2;
-		    $utime = timelocal 0, $minute, $hour, $day, $mon, $year;
-		    $end =~ /(\d\d)(\d\d)/;
-		    $hour = $1;
-		    $minute = $2;
-		    $utime2 = timelocal 0, $minute, $hour, $day, $mon, $year;
-		    if ($end < $start)
-		      {
-			$utime2 += 24*60*60;
-		      }
-		    $duration = $utime2 - $utime;
-
-		    &addtimer ($title,$title,$subtitle,$channels[$channel],$utime,$duration,$prio,$position,0,0);
-		  }
+sub fetchVDRTimers {
+  my (@timers, $timer, $position, $active, $channel, $day, $start, $end, $prio, $lifetime, $title, $subtitle, $minute, $duration);
+  my ($utime, $utime2);
+
+  # First fetch the timers-list from VDR
+  @timers = GetSend ("lstt");
+
+  foreach $timer (@timers) {
+    chomp $timer;
+    # a Valid Timer-line beginns with "250"
+    if ($timer =~ s/250-|250\s//) {
+      # Extract the Position in front of the line
+      ($position, $timer) = split (/\s/,$timer,2);
+
+#      print "Position: \"$position\" Timer: \"$timer\"\n";
+      # Split the : seperated values
+      ($active, $channel, $day, $start, $end, $prio, $lifetime, $title, $subtitle) = split (/\:/,$timer,9);
+
+      my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+      # If the string is exactly 7 char wide, then its a "repeating"-timer
+      if ($active >= 1) {
+	if ($day =~ /(.)(.)(.)(.)(.)(.)(.)/) {
+	  my (@days);
+	  @days = ($1, $2, $3, $4, $5, $6, $7);
+	  ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+	  $start =~ /(\d\d)(\d\d)/;
+	  $hour = $1;
+	  $minute = $2;
+	  $utime = timelocal 0, $minute, $hour, $mday, $mon, $year;
+	  $end =~ /(\d\d)(\d\d)/;
+	  $hour = $1;
+	  $minute = $2;
+	  $utime2 = timelocal 0, $minute, $hour, $mday, $mon, $year;
+	  if ($end < $start) {
+	    $utime2 += 24*60*60;
+	  }
+	  $duration = $utime2 - $utime;
+
+	  # "Normalize" the timestamp to monday
+	  $utime = $utime - ($wday * 24 * 60 *60);
+
+	  foreach my $num (0 .. $#days) {
+	    if ($days[$num] ne "-") {
+	      my $utime3;
+	      # Days before today will be shifted in the next week
+	      if (($num + 1) < $wday) {
+		$utime3 = $utime + (($num + 7 + 1) * 24 * 60 * 60);
 	      }
+	      else {
+		$utime3 = $utime + (($num + 1) * 24 * 60 * 60);
+	      }
+	      &addtimer ($title,$title,$subtitle,"",$channels[$channel],$utime3,$duration,$prio,$lifetime,"R$position",0,0);
+	    }
+	  }
+	}
+
+	# When the Day-Value is between 1 and 31, then its a "One time" Timer
+	elsif (($day >= 1) && ($day <= 31)) {
+	  if ($active == "2") {
+	    $position += 1000000;
+	  }
+	  # When the Day is before the Current-Day, then the Timer is for the next month
+	  if ($day < $mday) {
+	    $mon++;
+	    if ($mon == 12) {
+	      $mon = 0;
+	      $year ++;
+	    }
 	  }
+	  $start =~ /(\d\d)(\d\d)/;
+	  $hour = $1;
+	  $minute = $2;
+	  $utime = timelocal 0, $minute, $hour, $day, $mon, $year;
+	  $end =~ /(\d\d)(\d\d)/;
+	  $hour = $1;
+	  $minute = $2;
+	  $utime2 = timelocal 0, $minute, $hour, $day, $mon, $year;
+	  if ($end < $start) {
+	    $utime2 += 24*60*60;
+	  }
+	  $duration = $utime2 - $utime;
+
+	  &addtimer ($title,$title,$subtitle,"",$channels[$channel],$utime,$duration,$prio,$lifetime,$position,0,0);
+	}
       }
+    }
   }
+}
 
 # Parse file "epg.data"
-sub initepgdata
-  {
-    open (FI,"epg.data") or sub_die ("Can't open file \"epg.data\"\n");
-
-    while (<FI>)
-      {
-	# Begin Channel
-	if (/^C\s(\d+)\s+(.+)/)
-	  {
-	    $channel = $2;
-	    while (<FI>)
-	      {
-		# End Channel
-		if (/^c$/)
-		  {
-		    last;
-		  }
-		# Begin Timer
-		elsif (/^E\s(\d+)\s+(\d+)\s+(\d+)$/)
-		  {
-		    # Undef this Variables because it is possibel that not every timer uses this values
-		    undef $duration;
-		    undef $subtitle;
-		    undef $description;
-
-		    $time=$2;
-		    $duration=$3;
-		  }
-		# Title
-		elsif (/^T\s(.*)/)
-		  {
-		    $title = $1;
-		  }
-		# Subtitle
-		elsif (/^S\s(.*)/)
-		  {
-		    $subtitle=$1;
-		  }
-		# Description
-		elsif (/^D\s(.*)/)
-		  {
-		    $description=$1;
-		  }
-		# End Timer
-		elsif (/^e$/)
-		  {
-		    # Only accept timers that are in the future
-		    if ($time < time)
-		      {
-			next;
-		      }
-
-		    # Work around the diffrent Bugs in the data
-		    &correct_epg_data();
-
-		    # Check if the title is in the DEEP-Blacklist
-		    if ($title =~ /$title_deepblack/i)
-		      {
-			next;
-		      }
-
-		    # Check if the Title & Subtitle is in the Done-List
-		    if ($title =~ /$title_done/)
-		      {
-			if ($subtitle)
-			  {
-			    if ($subtitle =~ /$subtitle_done/)
-			      {
-				next;
-			      }
-			  }
-		      }
-
-		    $Program{$title}{$channel}{$time}{duration}=$duration;
-		    if ($subtitle)
-		      {
-			$Program{$title}{$channel}{$time}{subtitle}=$subtitle;
-		      }
-		    if ($description)
-		      {
-			$Program{$title}{$channel}{$time}{description}=$description;
-		      }
-		  }
-	      }
+sub initepgdata {
+  open (FI,"epg.data") or die ("Can't open file \"epg.data\"\n");
+
+    while (<FI>) {
+      # Begin Channel
+      if (/^C\s(\d+)\s+(.+)/) {
+	$channel=$2;
+	while (<FI>) {
+	  # End Channel
+	  if (/^c$/) {
+	    last;
+	  }
+	  # Begin Timer
+	  elsif (/^E\s(\d+)\s+(\d+)\s+(\d+)$/) {
+	    # Undef this Variables because it is possibel that not every timer uses this values
+	    undef $duration;
+	    undef $subtitle;
+	    undef $description;
+	    undef $category;
+
+	    $time=$2;
+	    $duration=$3;
+	  }
+	  # Title
+	  elsif (/^T\s(.*)/) {
+	    $title=$1;
+	  }
+	  # Subtitle
+	  elsif (/^S\s(.*)/) {
+	    $subtitle=$1;
 	  }
+	  # Description
+	  elsif (/^D\s(.*)/) {
+	    $description=$1;
+	  }
+	  elsif (/^K\s(.*)/) {
+	    $category=$1;
+	  }
+	  # End Timer
+	  elsif (/^e$/) {
+	    # Only accept timers that are in the future
+	    if ($time < time) {
+	      next;
+	    }
+	    # Only accept timers that are at least 2 Seconds long
+	    if ($duration <= 1) {
+	      next;
+	    }
+
+	    # Work around the different Bugs in the data
+	    &correct_epg_data();
+
+	    # Check if the Title & Subtitle is in the Done-List (Only if Subtitle exists)
+	    if ($subtitle && $title =~ /$title_done/ && $subtitle =~ /$subtitle_done/) {
+	      next;
+	    }
+
+	    $Program{$title}{$channel}{$time}{duration}=$duration;
+	    if ($subtitle) {
+	      $Program{$title}{$channel}{$time}{subtitle}=$subtitle;
+	    }
+	    if ($description) {
+	      $Program{$title}{$channel}{$time}{description}=$description;
+	    }
+	    if ($category) {
+	      $Program{$title}{$channel}{$time}{category}=$category;
+	    }
+	    # Check if the title is in the DEEP-Blacklist
+	    if (&testtimer("deepblack", $title, $channel, $time) ne "Nothing") {
+	      print "Deepblack: \"$title\"" if ($debug & 64);
+	      print " $subtitle" if ($debug & 64 && $subtitle);
+	      print "\n" if ($debug & 64);
+	      &delprogram ($title, $channel, $time);
+	    }
+	  }
+	}
       }
-    close (FI);
-  }
+    }
+  close (FI);
+}
 
 # What is a Movie (When correctly stored into Subtitle)
-sub initmovie
-  {
-    my (@list,$list);
-    open (FI,"$ENV{HOME}/.master-timer/subtitle-movie") or return;
-    @list = <FI>;
-    close(FI);
-
-    foreach $list (@list)
-      {
-	chomp $list;
-      }
-    $subtitle_movie = join ('|',@list);
+sub initmovie {
+  my (@list,$list);
+  open (FI,"${configdir}/subtitle-movie") or return;
+  @list = <FI>;
+  close(FI);
+
+  foreach $list (@list) {
+    chomp $list;
   }
+  $subtitle_movie = join ('|',@list);
+}
 
-# What should be blacklistet
-sub initblacklist
-  {
-    my (@list,$list);
-    if (open (FI,"$ENV{HOME}/.master-timer/deepblack"))
-      {
-	@list = <FI>;
-	close(FI);
-	
-	foreach $list (@list)
-	  {
-	    chomp $list;
-	  }
-	$title_deepblack = join ('|',@list);
-      }
-    else
-      {
-	$title_deepblack = "^\$";
+# What is already recorded/Should not be recorded
+sub initdone {
+  my (@list,$list, %title_done, %subtitle_done, $title_temp, $subtitle_temp);
+  open (FI,"${configdir}/done") or return;
+  @list = <FI>;
+  close (FI);
+
+  foreach $list (@list) {
+    chomp $list;
+    ($title_temp,$subtitle_temp) = split (/\|/,$list);
+    if ($title_temp) {
+      $title_done{"^\Q$title_temp\E\$"} = 1;
+    }
+    if ($subtitle_temp) {
+      $subtitle_done{"^\Q$subtitle_temp\E\$"} = 1;
+    }
+  }
+  $title_done = join ('|',sort keys %title_done);
+  $subtitle_done = join ('|',sort keys %subtitle_done);
+}
+
+sub processdone {
+  # Now delete Timers in VDR that are already in the done-List
+  my ($list, @list, $position, $timer, $active, $g, $title, $subtitle, $counter, @todel);
+  $counter = 0;
+  @list = GetSend ("LSTT");
+
+  foreach $timer (@list) {
+    chomp $timer;
+    if ($timer =~ s/250-|250\s//) {
+      ($position, $timer) = split (/\s/,$timer,2);
+      # Split the : seperated values
+      ($active, $g, $g, $g, $g, $g, $g, $title, $subtitle) = split (/\:/,$timer,9);
+      if ($active == 2) {
+        # Title: "Shakespeare in Love"||Subtitle: "Romanze"
+        my ($ctitle, $csubtitle);
+        if ($subtitle && $subtitle =~ /^Title\:\s\"(.*)\"\|\|Subtitle\:\s\"(.*)\"/) {
+          $title = $1;
+          $subtitle = $2;
+          if ($subtitle) {
+            my (@titles, @subtitles, $num, $hit);
+            undef $hit;
+            @titles = split (/\~/,$title);
+            @subtitles = split (/\~/,$subtitle);
+            foreach $num (0 .. $#titles) {
+              if ($titles[$num] =~ /$title_done/ && $subtitles[$num] =~ /$subtitle_done/) {
+                $hit = 1;
+              }
+              else {
+                undef $hit;
+                last;
+              }
+            }
+
+            if ($hit) {
+              my ($result);
+              print "Delete Timer: $title $subtitle\n" if ($debug & 4);
+              $position -= $counter;
+              ($result) = GetSend ("DELT $position");
+              print "Result: $result" if ($debug & 4);
+              if ($result =~ /^250/) {
+                $counter++;
+              }
+            }
+          }
+        }
       }
+    }
   }
+}
 
-# What is already recorded/Should not be recorded
-sub initdone
-  {
-    my (@list,$list, %title_done, %subtitle_done, $title_temp, $subtitle_temp);
-    if (open (FI,"$ENV{HOME}/.master-timer/done"))
-      {
-	@list = <FI>;
-	close (FI);
-
-	foreach $list (@list)
-	  {
-	    chomp $list;
-	    ($title_temp,$subtitle_temp) = split (/\|/,$list);
-	    if ($title_temp)
-	      {
-		$title_done{"^$title_temp\$"} = 1;
-	      }
-	    if ($subtitle_temp)
-	      {
-		$subtitle_done{"^$subtitle_temp\$"} = 1;
-	      }
+# What should be recorded
+sub inittorecord {
+  my ($context) = shift;
+  my ($rContext);
+  my (@title_list, @subtitle_list, @description_list, $line);
+  my (%Input);
+  my $counter = 0;
+
+  if ($context eq "torecord") {
+    $rContext = \%torecord;
+    open (FI,"${configdir}/${context}") or die ("Can't open file \"$context\"\n");
+  } elsif ($context eq "deepblack") {
+    $rContext = \%deepblack;
+    open (FI,"${configdir}/${context}") or return;
+  } else {
+    die ("Illegal Context");
+  }
+
+
+ outer: while (<FI>) {
+    chomp if ($_);
+    if ($_ && !(/^\#/) && /^\[.*\]$/) {
+      $line = $.;
+      undef %Input;
+      while (<FI>) {
+	chomp;
+	if ($_ && !(/^\#/)) {
+	  if (/^\[.*?\]$/) {
+	    last;
 	  }
-	$title_done = join ('|',sort keys %title_done);
-	$subtitle_done = join ('|',sort keys %subtitle_done);
-
-	# Ein paar Zeichen Escapen
-	$title_done =~ s/\?/\\\?/g;
-	$title_done =~ s/\+/\\\+/g;
-	$subtitle_done =~ s/\?/\\\?/g;
-	$subtitle_done =~ s/\+/\\\+/g;
-
-	# Now delete Timers in VDR that are already in the done-List
-	my ($position, $timer, $active, $g, $title, $subtitle, $counter, @todel);
-	$counter = 0;
-	@list = GetSend ("LSTT");
-	
-	foreach $timer (@list)
-	  {
-#	    $timer =~ s/0x0d//g;
-	    chomp $timer;
-	    if ($timer =~ s/250-|250\s//)
-	      {
-		($position, $timer) = split (/\s/,$timer,2);
-		# Split the : seperated values
-		($active, $g, $g, $g, $g, $g, $g, $title, $subtitle) = split (/\:/,$timer,9);
-		if ($active == 2)
-		  {
-		    # Title: "Shakespeare in Love"||Subtitle: "Romanze"
-		    my ($ctitle, $csubtitle);
-		    if ($subtitle && $subtitle =~ /^Title\:\s\"(.*)\"\|\|Subtitle\:\s\"(.*)\"/)
-		      {
-			$title = $1;
-			$subtitle = $2;
-			if ($subtitle)
-			  {
-			    my (@titles, @subtitles, $num, $hit);
-			    undef $hit;
-			    @titles = split (/\~/,$title);
-			    @subtitles = split (/\~/,$subtitle);
-			    foreach $num (0 .. $#titles)
-			      {
-				if ($titles[$num] =~ /$title_done/ && $subtitles[$num] =~ /$subtitle_done/)
-				  {
-				    $hit = 1;
-				  }
-				else
-				  {
-				    undef $hit;
-				    last;
-				  }
-			      }
-
-			    if ($hit)
-			      {
-				my ($result);
-				print "Delete Timer: $title $subtitle\n" if ($debug & 4);
-				$position -= $counter;
-				($result) = GetSend ("DELT $position");
-				print "Result: $result" if ($debug & 4);
-				if ($result =~ /^250/)
-				  {
-				    $counter++;
-				  }
-			      }
-			  }
-		      }
-		  }
-	      }
+
+	  my ($key, $value);
+	  ($key, $value) = split (/\s+=\s+/);
+
+	  if ($key =~ /^title$/i) {
+	    if ($Input{title}) {
+	      $Input{title} .= "|$value";
+	    } else {
+	      $Input{title} = $value;
+	    }
+	    print "Titel = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^subtitle$/i) {
+	    if ($Input{subtitle}) {
+	      $Input{subtitle} .= "|$value";
+	    } else {
+	      $Input{subtitle} = $value;
+	    }
+	    print "Subtitel = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^description$/i) {
+	    if ($Input{description}) {
+	      $Input{description} .= "|$value";
+	    } else {
+	      $Input{description} = $value;
+	    }
+	    print "Description = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^category$/i) {
+	    $Input{category} = $value;
+	    print "Category = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^channel$/i) {
+	    if ($Input{channel}) {
+	      $Input{channel} .= "|^$value\$";
+	    } else {
+	      $Input{channel} = $value;
+	    }
+	    print "Channel = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^timeframe$/i) {
+	    $Input{timeframe} = $value;
+	    print "Timeframe = $value\n" if ($debug & 16);
 	  }
+	  elsif ($key =~ /^weekday$/i) {
+	    $Input{weekday} = $value;
+	    print "Weekday = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^minlength$/i) {
+	    $Input{minlength} = $value;
+	    print "Minlength = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^maxlength$/i) {
+	    $Input{maxlength} = $value;
+	    print "Maxlength = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^prio$/i) {
+	    $Input{prio} = $value;
+	    print "Prio = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^lifetime$/i) {
+	    $Input{lifetime} = $value;
+	    print "Lifetime = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^timertitle$/i) {
+	    $Input{timertitle} = $value;
+	    print "Timertitel = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^margin$/i) {
+	    $Input{margin} = $value;
+	    print "Margin = $value\n" if ($debug & 16);
+	  }
+	  elsif ($key =~ /^instance$/i) {
+	    $Input{instance} = $value;
+	    print "Instance = $value\n" if ($debug & 16);
+	  } else {
+	    print "Unkown Key: \"$key\" with Value: \"$value\"\n";
+	  }
+	}
       }
-  }
 
-# What should be recorded
-sub inittorecord
-  {
-    my (@list, $list, $title, $subtitle, $description, $channel, $timeframe, $prio, $timer_title, $margin, $machine, @title_list, @subtitle_list, @description_list);
-    my $counter = 0;
-    open (FI,"$ENV{HOME}/.master-timer/torecord") or sub_die ("Can't open file \"torecord\"\n");
-    @list = <FI>;
-    close(FI);
-
-    foreach $list (0 .. $#list)
-      {
-	chomp $list[$list];
-	if ($list[$list] && !($list[$list] =~ /^\#/))
-	  {
-	    ($title, $subtitle, $description, $channel, $timeframe, $prio, $timer_title, $margin, $machine) = split (/\|/,$list[$list]);
-
-	    # Accept torecord only if it is for the current machine
-	    if ((!$machine && $currentVDR == 1) || $machine == $currentVDR)
-	      {
-		if ($title)
-		  {
-		    $title_torecord[$counter] = $title;
-		    $title_list[$#title_list + 1] = $title;
-		  }
-		if ($subtitle)
-		  {
-		    $subtitle_torecord[$counter] = $subtitle;
-		    $subtitle_list[$#subtitle_list + 1] = $subtitle;
-		  }
-		if ($description)
-		  {
-		    $description_torecord[$counter] = $description;
-		    $description_list[$#description_list + 1] = $description;
-		  }
-		if ($channel)
-		  {
-		    my (@temp);
-		    @temp = split (/\;/,$channel);
-		    foreach (0 .. $#temp)
-		      {
-			$channel_torecord[$counter][$_] = $temp[$_];
-		      }
-		  }
-		if ($timeframe)
-		  {
-		    $timeframe_torecord[$counter] = $timeframe;
-		  }
-		if ($prio)
-		  {
-		    $prio_torecord[$counter] = $prio;
-		  }
-		else
-		  {
-		    $prio_torecord[$counter] = $default_prio;
-		  }
-		if ($timer_title)
-		  {
-		    $timer_title_torecord[$counter] = $timer_title;
-		  }
-		if ($margin)
-		  {
-		    my ($start, $stop);
-		    ($start, $stop) = split (/;/,$margin, 2);
-		    $marginstart_torecord[$counter] = $start if ($start);
-		    $marginstop_torecord[$counter] = $stop if ($stop);
-		  }
-		# Set Default-Margins if not margins defined
-		$marginstart_torecord[$counter] = $marginstart if (!$marginstart_torecord[$counter]);
-		$marginstop_torecord[$counter] = $marginstop if (!$marginstop_torecord[$counter]);
-		$counter++;
-	      }
+      # Accept entry only if it is for the current instance or for "no" instance
+      if (($Opts{s} && $Input{instance} && $Input{instance} eq "s") || !$Input{instance} || ($Input{instance} ne "s" && $Input{instance} == $currentVDR)) {
+	# Accept entry only if at least a Title/Subtitle/Description is provied
+	if (!$Input{title} && !$Input{subtitle} && !$Input{description}) {
+	  print "No Title/Subtitle/Description Field. $context entry ignored. Block beginning at Line $line\n";
+	  redo outer;
+	}
+
+	if ($Input{title}) {
+	  $$rContext{title}[$counter] = $Input{title};
+	  $title_list[$#title_list + 1] = $Input{title};
+	}
+	if ($Input{subtitle}) {
+	  if ($Input{subtitle} =~ /^movie$/i || $Input{subtitle} =~ /^\!movie$/i) {
+	    $test_subtitle_movie = 1;
+	  }
+	  $$rContext{subtitle}[$counter] = $Input{subtitle};
+	  $subtitle_list[$#subtitle_list + 1] = $Input{subtitle};
+	}
+	if ($Input{description}) {
+	  $$rContext{description}[$counter] = $Input{description};
+	  $description_list[$#description_list + 1] = $Input{description};
+	}
+	if ($Input{category}) {
+	  $$rContext{category}[$counter] = $Input{category};
+	}
+	if ($Input{channel}) {
+	  if ($Input{channel} =~ /\!/) {
+	    $Input{channel} =~ s/\!//g;
+	    $$rContext{blackchannel}[$counter] = $Input{channel};
+	  } else {
+	    $$rContext{channel}[$counter] = $Input{channel};
 	  }
+	}
+	if ($Input{timeframe}) {
+	  $$rContext{timeframe}[$counter] = $Input{timeframe};
+	}
+	if ($Input{weekday}) {
+	  $$rContext{weekday}[$counter] = $Input{weekday};
+	}
+	if ($Input{minlength}) {
+	  if ($Input{minlength} =~ /^(\d+)m$/) {
+	    $Input{minlength} = $1 * 60
+	  } elsif ($Input{minlength} =~ /^(\d+)h$/) {
+	    $Input{minlength} = $1 * 60 * 60
+	  }
+	  $$rContext{minlength}[$counter] = $Input{minlength};
+	}
+	if ($Input{maxlength}) {
+	  if ($Input{maxlength} =~ /^(\d+)m$/) {
+	    $Input{maxlength} = $1 * 60
+	  } elsif ($Input{maxlength} =~ /^(\d+)h$/) {
+	    $Input{maxlength} = $1 * 60 * 60
+	  }
+	  $$rContext{maxlength}[$counter] = $Input{maxlength};
+	}
+	if ($Input{prio}) {
+	  $$rContext{prio}[$counter] = $Input{prio};
+	}
+	if ($Input{lifetime}) {
+	  $$rContext{lifetime}[$counter] = $Input{lifetime};
+	}
+	else {
+	  $$rContext{prio}[$counter] = $default_prio;
+	}
+	if ($Input{timertitle}) {
+	  $$rContext{timertitle}[$counter] = $Input{timertitle};
+	}
+	if ($Input{margin}) {
+	  my ($start, $stop);
+	  ($start, $stop) = split (/;/,$Input{margin}, 2);
+	  $$rContext{marginstart}[$counter] = $start if ($start);
+	  $$rContext{marginstop}[$counter] = $stop if ($stop);
+	}
+	# Set Default-Margins if no margins defined
+	$$rContext{marginstart}[$counter] = $marginstart if (!$$rContext{marginstart}[$counter]);
+	$$rContext{marginstop}[$counter] = $marginstop if (!$$rContext{marginstop}[$counter]);
+	$counter++;
+	if ($Input{instance}) {
+	  $$rContext{instance}[$counter] = $Input{instance};
+	}
       }
+      redo outer;
+    }
+  }
+
+  $$rContext{timercount} = $counter - 1;
+
+  $$rContext{titleRE} = join ('|',@title_list);
+  if ($$rContext{titleRE} && $$rContext{titleRE} =~ /\|.\|/) {
+    $$rContext{titleRE} = ".";
+  }
+  $$rContext{subtitleRE} = join ('|',@subtitle_list);
+  if ($$rContext{subtitleRE} && $$rContext{subtitleRE} =~ /\|.\|/) {
+    $$rContext{subtitleRE} = ".";
+  }
+  $$rContext{descriptionRE} = join ('|',@description_list);
+  if ($$rContext{descriptionRE} && $$rContext{descriptionRE} =~ /\|.\|/) {
+    $$rContext{descriptionRE} = ".";
+  }
+
+  if (!$$rContext{titleRE}) {
+    $$rContext{titleRE} = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+  }
+  if (!$$rContext{subtitleRE}) {
+    $$rContext{subtitleRE} = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+  }
+  if (!$$rContext{descriptionRE}) {
+    $$rContext{descriptionRE} = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+  }
+}
+
+# Parse "LSTC"-Command of VDR
+sub initchannellist {
+  my ($counter, $chan, $garbage, $card, @temp_channels, $temp, $i);
 
-    $num_torecord = $counter - 1;
+  @temp_channels = GetSend ("LSTC");
 
-    $title_torecord = join ('|',@title_list);
-    $subtitle_torecord = join ('|',@subtitle_list);
-    $description_torecord = join ('|',@description_list);
+  foreach $i (0 .. $#temp_channels) {
+    $temp = $temp_channels[$i];
+    chomp $temp;
 
-    if (!$title_torecord)
-      {
-	$title_torecord = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+    if ($temp =~ s/250-|250\s//) {
+      ($counter, $temp) = split (/\s/,$temp,2);
+      ($chan, $garbage,$garbage, $garbage, $garbage, $garbage, $garbage, $card, $garbage) = split (/\:/,$temp);
+      $channels[$counter] = $chan;
+      $channels{$chan}{number} = $counter;
+      $channels{$chan}{card} = $card;
+      $counter++;
+    }
+  }
+}
+
+sub initconfigfile {
+  open (FI,"${configdir}/config") or return;
+  while (<FI>) {
+    s/\#.*//;
+    chomp;
+    if ($_) {
+      my ($key, $value);
+      ($key, $value) = split (/\s+=\s+/);
+      if ($key =~ /^debug$/i) {
+	$debug = $value;
+	print "Debug-Level = $value\n" if ($debug & 16);
       }
-    if (!$subtitle_torecord)
-      {
-	$subtitle_torecord = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+      elsif ($key =~ /^marginstart$/i) {
+	print "Marginstart = $value\n" if ($debug & 16);
+	$marginstart = $value;
       }
-    if (!$description_torecord)
-      {
-	$description_torecord = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
+      elsif ($key =~ /^marginstop$/i) {
+	print "Marginstop = $value\n" if ($debug & 16);
+	$marginstop = $value;
       }
-  }
-
-# Parse the "channels.conf" of VDR
-sub initchannellist
-  {
-    my ($counter, $chan, $garbage, $card, @temp_channels, $temp, $i);
-
-    @temp_channels = GetSend ("LSTC");
-
-    foreach $i (0 .. $#temp_channels)
-      {
-	$temp = $temp_channels[$i];
-#	$temp =~ s/\x0d//g;
-	chomp $temp;
-
-	if ($temp =~ s/250-|250\s//)
-	  {
-	    ($counter, $temp) = split (/\s/,$temp,2);
-	    ($chan, $garbage,$garbage, $garbage, $garbage, $garbage, $garbage, $card, $garbage) = split (/\:/,$temp);
-	    $channels[$counter] = $chan;
-	    $channels{$chan}{number} = $counter;
-	    $channels{$chan}{card} = $card;
-	    $counter++;
-	  }
+      elsif ($key =~ /^DVBCards$/i) {
+	print "DVB_Cards = $value\n" if ($debug & 16);
+	$DVB_cards = $value;
+      }
+      elsif ($key =~ /^defaultprio$/i) {
+	print "Default Priority = $value\n" if ($debug & 16);
+	$default_prio = $value;
+      }
+      elsif ($key =~ /^Dest$/i) {
+	print "Destination Host/IP:Port = $value\n" if ($debug & 16);
+	@Dest = split (/\s+/,$value);
+      }
+      elsif ($key =~ /^jointimers$/i) {
+	print "Join Timers = $value\n" if ($debug & 16);
+	$jointimers = $value;
+      }
+      elsif ($key =~ /^description$/i) {
+	print "Description = $value\n" if ($debug & 16);
+	$Description = $value;
+      }
+      else {
+	print "Unkown Key: \"$key\" with Value: \"$value\"\n";
       }
+    }
   }
+  print "End Config\n" if ($debug & 16);
+}
 
-sub initconfigfile
-  {
-    open (FI,"$ENV{HOME}/.master-timer/config") or return;
-    while (<FI>)
-      {
-	s/\#.*//;
-	chomp;
-	if ($_)
-	  {
-	    my ($key, $value);
-	    ($key, $value) = split (/\s+=\s+/);
-	    if ($key =~ /^debug$/i)
-	      {
-		$debug = $value;
-		print "Debug-Level = $value\n" if ($debug & 16);
-	      }
-	    elsif ($key =~ /^marginstart$/i)
-	      {
-		print "Marginstart = $value\n" if ($debug & 16);
-		$marginstart = $value;
-	      }
-	    elsif ($key =~ /^marginstop$/i)
-	      {
-		print "Marginstop = $value\n" if ($debug & 16);
-		$marginstop = $value;
-	      }
-	    elsif ($key =~ /^DVBCards$/i)
-	      {
-		print "DVB_Cards = $value\n" if ($debug & 16);
-		$DVB_cards = $value;
-	      }
-	    elsif ($key =~ /^defaultprio$/i)
-	      {
-		print "Default Priority = $value\n" if ($debug & 16);
-		$default_prio = $value;
-	      }
-	    elsif ($key =~ /^Dest$/i)
-	      {
-		print "Destination Host/IP:Port = $value\n" if ($debug & 16);
-		@Dest = split (/\s+/,$value);
-	      }
-	    elsif ($key =~ /^jointimers$/i)
-	      {
-		print "Join Timers = $value\n" if ($debug & 16);
-		$jointimers = $value;
-	      }
-	    else
-	      {
-		print "Unkown Key: \"$key\" with Value: \"$value\"\n";
-	      }
-	  }
-      }
-    print "End Config\n" if ($debug & 16);
+sub initcommandline() {
+  my $Usage = qq{
+Usage: $0 [options] [Instance]...
+
+Options: -d hostname:Port   hostname/ip:Port (localhost:2001)
+         -c configdir       Directory where all config files are located
+                            (~/.master-timer)
+         -i instance        Which VDR-Instance, from the config-file, should be
+                            used
+         -s                 Print all series from epg.data and exit
+         -v debuglevel      Level of debug-messages to print
+         -h                 This Help-Page
+};
+
+  # Only process commandline if not already processed
+  if (!$Opts{done}) {
+    die $Usage if (!getopts("d:p:c:i:sv:h",\%Opts));
   }
+  die $Usage if ($Opts{h});
+  # Mark the options as already processed
+  $Opts{done} = 1;
 
-sub init
-  {
-    &initconfigfile();
-    &initsocket();
-    &initmovie();
-    &initblacklist();
-    &initdone();
-    &initchannellist();
-    &initepgdata();
-    &inittorecord();
+  if ($Opts{v}) {
+    $debug = $Opts{v};
+  }
+  if ($Opts{i}) {
+    $currentVDR = $Opts{i};
+  }
+  if ($Opts{d}) {
+    @Dest = ($Opts{d});
   }
+  if ($Opts{c}) {
+    $configdir = $Opts{c};
+  }
+}
+
+sub init {
+  &initcommandline();
+  &initconfigfile();
+  # Process commandline a second time, so that configs from the config-file are overwritten
+  &initcommandline();
+  &initsocket();
+  &initmovie();
+  &initdone();
+  &initchannellist();
+  &inittorecord("deepblack");
+  &initepgdata();
+  &inittorecord("torecord");
+}
diff --git a/Tools/master-timer/sample/channels-to-scan b/Tools/master-timer/sample/channels-to-scan
index 6acf15792..22f473d57 100644
--- a/Tools/master-timer/sample/channels-to-scan
+++ b/Tools/master-timer/sample/channels-to-scan
@@ -3,6 +3,4 @@
 3
 4
 5
-13
-18
-21
+49
diff --git a/Tools/master-timer/sample/config b/Tools/master-timer/sample/config
index d01c8a858..3180943f4 100644
--- a/Tools/master-timer/sample/config
+++ b/Tools/master-timer/sample/config
@@ -1,14 +1,32 @@
-# How Many Seconds "too early" should the timer begin
+# Master-Timer config file. Values shown here are defaults.
+
+# How many seconds "too early" should the timer begin
 marginstart	= 600
-# How Many Seocnds "too long" should the timer end
+
+# How many seconds "too long" should the timer end
 marginstop	= 600
-# When the Prio isn't provied in the config-File use this value
+
+# When the Prio isn't provided in the config file use this value
 defaultprio	= 50
-# How many DVB-Cards are installed in the Computer (Not used yet)
-DVBCards	= 3
-# IP/Hostname:Port of the Destinations (Space is used for delimiter)
-Dest-Host 	= localhost:2001
-# Should Timers on the same channels be joined when they overlapp (0 = off)
-jointimers	= 1
-# Debug-Level
+
+# How many DVB cards are installed in the computer (not used yet)
+DVBCards	= 1
+
+# IP/Hostname:Port of the destination (space is used for delimiter)
+Dest	 	= localhost:2001
+
+# Should timers on the same channels be joined when they overlap (0 = off)
+jointimers	= 0
+
+# Should the description be transfered to VDR?
+description     = 0
+
+# Debug level
+#    1     : Dump "torecord"
+#    2     : Dump all timers
+#    4     : Show when a timer will be deleted
+#    8     : Dump the "Done" REs
+#    16    : Verbose config reading
+#    32    : Dump program variables
+#    64    : Excessive deepblack/torecord debuging
 debug		= 0
diff --git a/Tools/master-timer/sample/convert-channel-list b/Tools/master-timer/sample/convert-channel-list
new file mode 100644
index 000000000..a97f3c531
--- /dev/null
+++ b/Tools/master-timer/sample/convert-channel-list
@@ -0,0 +1,26 @@
+Kabel 1|Kabel 1
+MTV|MTV Central
+PRW 13TH Street|13th Street
+PRW Discovery Channel|Discovery Channel
+PRW Disney Channel|Disney Channel
+PRW FOX KIDS|Fox Kids
+PRW Junior|Junior
+PRW K-Toon|K-Toon
+PRW Krimi & Co|Krimi &Co
+PRW Planet|Planet
+PRW Sci-Fantasy|Premiere Sci-Fi
+PRW Studio Universal|Studio Universal
+PRW Sunset|Sunset
+Premiere Action|Premiere Action
+Premiere Comedy|Premiere Comedy
+Premiere STAR|Premiere Star
+Premiere World 1|Premiere 1
+Premiere World 2|Premiere 2
+Premiere World 3|premiere 3
+Pro Sieben|Pro-7
+RTL|RTL
+RTL 2|RTL2
+Sat.1|Sat.1
+Super RTL|Super RTL
+Viva|VIVA
+Vox|VOX
diff --git a/Tools/master-timer/sample/deepblack b/Tools/master-timer/sample/deepblack
index 63b4f9e94..12884fe73 100644
--- a/Tools/master-timer/sample/deepblack
+++ b/Tools/master-timer/sample/deepblack
@@ -1,79 +1,172 @@
-F�r alle F�lle Stefanie
-'MAX' - Das ganze Leben!
-10 vor 11
-17:30 live
-18:30
-24 Stunden
-Andreas T�rck
-Arabella
-^BIZZ$
-Big Brother
-Britt - Der Talk um Eins
-B�rbel Sch�fer
-Call TV
-Chicago Hope - Endstation Hoffnung
-Chicago Hope
-DIE REDAKTION
-Dauerwerbesendungen
-Die Harald Schmidt Show
-Die Oliver Geissen Show
-Die Quiz Show
-Doppelter Einsatz
-Dr. Stefan Frank - Der Arzt, dem die Frauen vertrauen
-EXCLUSIV
-EXTRA
-Ehekriege
-Ein Bayer auf R�gen
-Emergency Room
-Explosiv - Das Magazin
-GIRLSCAMP
-Gl�cksrad
-Gute Zeiten, schlechte Zeiten
-Hallo, Onkel Doc!
-Hans Meiser
-Hercules
-Hinter  Gittern - Der Frauenknast
-Infomercials
-Jeder gegen Jeden
-K1 DIE REPORTAGE
-K1 Das Magazin
-K1 Nachrichten
-Kickers
-Kochduell
-Nachrichten
-Nicole - Entscheidung am Nachmittag
-OP ruft Dr. Bruckner
-PREMIERE WORLD - Das Programm
-PROSIEBEN REPORTAGE
-Peter Imhof
-Programm ab
-Programm von
-Punkt 12
-Punkt 6
-Punkt 9
-RTL II News
-RTL SHOP
-RTL aktuell
-RTL-Nachtjournal
-SAT.1-FR�HST�CKSFERNSEHEN
-Spiegel TV-Reportage
-UEFA Champions
-fussball
-f�ball
-Vera am Mittag
-Wolffs Revier
-Zapping
-alphateam
-peep!
-s.a.m.
-taff.
-^blitz$
-SK K�lsch
-^Becker$
-Kommissar Rex
-Fit For Fun TV
-Nur die Liebe z�hlt
-Unsere kleine Farm
-Die Waltons
-^Die Zwei$
-^Sieben$
+# [<Anytext>]
+#   This marks the beginning of a deepblack-entry
+# Title = <text>
+#   This matches a title
+# Subtitle = <text>
+#   This matches a subtitle
+# Description = <text>
+#   This matches a description
+# Category = <left>/<right>
+#   This matches a DTV-Category
+# Channel = <Channel>
+#   Restricts a deepblack-entry to a specific channel.
+#   A single "!" at start of channel list negates the selection.
+# Timeframe = <begin>-<end>
+#   Restricts a deepblack-entry to a specific timeframe.
+#   No timers with start time in the timeframe will be programmed.
+# minlength = <Number>
+#   Restricts a deepblack-entry to a specific minimum length
+#   (postfix "m" for minutes, "h" for hours.)
+# maxlength = <Number>
+#   Restricts a deepblack-entry to a specific maximum length
+#   (postfix "m" for minutes, "h" for hours.)
+# weekday = MTWTFSS
+#   Restricts a deepblack-entry to a specific weekday
+# instance = <Number>
+#   Only apply this deepblack-entry for a specific Instance
+#   "s" is a special value used for "-s"-Mode
+#
+# The "Title", "Subtitle", "Description", "Channel"-Lines can be
+# supplied any number of times for a specific entry
+#
+# To deepblack something at least one of the "Title", "Subtitle" or
+# "Description" (If you don't have anything "better" use "Title = ."
+# for this matches everything) fields has to be provided.
+# These three fields are "include" and the rest are "exclude" fields.
+
+[Blacklist all Talkshows]
+Title = .
+Category = Talk
+
+[Blacklist all Lifestyles]
+Title = .
+Category = /Lifestyles
+
+[Blacklist Sport/Tennis]
+Title = .
+Category = Sport/Tennis
+
+[Record only ZDF and Pro7]
+Title = .
+Channel = !ZDF
+Channel = ProSieben
+
+[Blacklist a timeframe]
+Title = .
+Timeframe = 1000-1400
+
+[Blacklist everything with less than 5 minutes duration]
+Title = .
+maxlength = 5m
+
+[Sinnlose Serien]
+Title = F�r alle F�lle Stefanie
+Title = Chicago Hope - Endstation Hoffnung
+Title = Chicago Hope
+Title = Doppelter Einsatz
+Title = Dr. Stefan Frank - Der Arzt, dem die Frauen vertrauen
+Title = Ehekriege
+Title = Ein Bayer auf R�gen
+Title = Emergency Room
+Title = Gute Zeiten, schlechte Zeiten
+Title = Hallo, Onkel Doc!
+Title = Hercules
+Title = Hinter  Gittern - Der Frauenknast
+Title = OP ruft Dr. Bruckner
+Title = Wolffs Revier
+Title = alphateam
+Title = SK K�lsch
+Title = ^Becker$
+Title = Kommissar Rex
+Title = Nur die Liebe z�hlt
+Title = Unsere kleine Farm
+Title = Die Waltons
+Title = ^Die Zwei$
+
+[Glueckspiele]
+Title = Die Quiz Show
+Title = Gl�cksrad
+Title = Jeder gegen Jeden
+Title = Kochduell
+
+[Infotainment und Boulevardzeug]
+Title = 'MAX' - Das ganze Leben!
+Title = ^BIZZ$
+Title = Big Brother
+Title = GIRLSCAMP
+Title = Call TV
+Title = DIE REDAKTION
+Title = EXCLUSIV
+Title = EXTRA
+Title = Explosiv - Das Magazin
+Title = K1 DIE REPORTAGE
+Title = K1 Das Magazin
+Title = PROSIEBEN REPORTAGE
+Title = Fit For Fun TV
+Title = peep!
+Title = s.a.m.
+Title = taff.
+Title = ^blitz$
+Title = Die Harald Schmidt Show
+Title = Spiegel TV-Reportage
+
+[Nachrichten]
+Title = 10 vor 11
+Title = 17:30 live
+Title = 18:30
+Title = 24 Stunden
+Title = Punkt 12
+Title = Punkt 6
+Title = Punkt 9
+Title = RTL II News
+Title = RTL aktuell
+Title = RTL-Nachtjournal
+Title = K1 Nachrichten
+Title = Nachrichten
+
+[Talkshows]
+Title = Andreas T�rck
+Title = Arabella
+Title = Britt - Der Talk um Eins
+Title = B�rbel Sch�fer
+Title = Die Oliver Geissen Show
+Title = Peter Imhof
+Title = Vera am Mittag
+Title = Hans Meiser
+Title = Nicole - Entscheidung am Nachmittag
+Title = Franklin
+
+[So richtig Sinnloses]
+Title = Dauerwerbesendungen
+Title = Infomercials
+Title = Kickers
+Title = RTL SHOP
+Title = SAT.1-FR�HST�CKSFERNSEHEN
+Title = Zapping
+
+[PREMIERE WORLD - Das Programm]
+Title = PREMIERE WORLD - Das Programm
+Title = Programm ab
+Title = Programm von
+
+[Fussball]
+Title = fussball
+Title = fu�ball
+Title = UEFA Champions
+
+#Sonstiges
+[^Sieben$]
+Title = ^Sieben$
+
+[Starportr�t Kevin Spacey]
+Title = Starportr�t Kevin Spacey
+
+ 
+[All Movies for -s]
+Subtitle = MOVIE
+Instance = s
+ 
+[All >= 65m for -s]
+Title = .
+minlength = 65m
+Instance = s
diff --git a/Tools/master-timer/sample/subtitle-movie b/Tools/master-timer/sample/subtitle-movie
index 3b5a0abf5..9bd357973 100644
--- a/Tools/master-timer/sample/subtitle-movie
+++ b/Tools/master-timer/sample/subtitle-movie
@@ -3,6 +3,7 @@
 ^Actionkom�die$
 ^Actionthriller$
 ^Agentenfilm$
+^Beziehungskom�die$
 ^Biografie$
 ^Biographie$
 ^Computeranimation$
@@ -12,19 +13,24 @@
 ^Familiendrama$
 ^Fantasy$
 ^Fantasykom�die$
+^Fantasy-Kom�die$
 ^Gangsterfilm$
 ^Gerichtsfilm$
 ^Gesellschaftsdrama$
+^Historiendrama$
 ^Horrorfilm$
 ^Horrorkom�die$
+^Jugenddrama$
 ^Kinderfilm$
 ^Kom�die$
 ^Kriegsfilm$
 ^Krimikom�die$
 ^Kriminalfilm$
 ^Liebesfilm$
+^Liebeskom�die$
 ^Melodram$
 ^Melodrama$
+^Monumentalfilm$
 ^Musical$
 ^Politthriller$
 ^Psychothriller$
@@ -32,10 +38,15 @@
 ^Romanze$
 ^Satire$
 ^Science-Fiction$
+^Science-Fiction-Kom�die$
 ^Spielfilm$
 ^TV Movie$
 ^TV-Drama$
+^Teil .$
+^Teil 0.$
 ^Thriller$
+^Tragikom�die$
 ^Western$
+^Westernkom�die$
 ^Zeichentrick$
 ^Zeichentrickkom�die$
diff --git a/Tools/master-timer/sample/torecord b/Tools/master-timer/sample/torecord
index 030683068..0c97b9162 100644
--- a/Tools/master-timer/sample/torecord
+++ b/Tools/master-timer/sample/torecord
@@ -1,32 +1,90 @@
-# Format: (Every field is "optional".
-# [Title RE|Subtitle RE|Description RE|Channel-Name|Timeframe|Prio|Timer-Title|Marginstart;Marginstop|VDR-Instance]
+# [<Anytext>]
+#   This marks the beginning of a timer entry
+# Title = <text>
+#   This matches a title
+# Subtitle = <text>
+#   This matches a subtitle.
+#   You may use the magic "MOVIE" or "!MOVIE" which matches
+#   all entries from file "subtitle-movie".
+# Description = <text>
+#   This matches a description
+# Category = <left>/<right>
+#   This matches a DTV-Category
+# Channel = <Channel>
+#   Restricts a time to a specific channel.
+#   A single "!" at start of channel list negates the selection.
+# Timeframe = <begin>-<end>
+#   Restricts timer to a specific timeframe.
+#   Only timers with start time in the timeframe will be programmed.
+# minlength = <Number>
+#   Restricts timer entry to a specific minimum length
+#   (postfix "m" for minutes, "h" for hours.)
+# maxlength = <Number>
+#   Restricts a timer entry to a specific maximum length
+#   (postfix "m" for minutes, "h" for hours.)
+# weekday = MTWTFSS
+#   Restricts a timer to a specific weekday
+# Timertitle = <text>
+#   The title used for this timer.
+#   If this is not provided "Title" will be used.
+#   If "Title" is not provided the EPG title will be used.
+# Margin = <Number>;<Number>
+#   Seconds added to the beginning and end of the timer.
+#   Positive numbers will lengthen the recording.
+# instance = <Number>
+#   The instance of VDR for which this timer is.
+#   If this is not provided the timer is valid for ALL instances.
 #
-# To record something at least one of the "Title", "Subtitle" or "Description" 
-# Fields has to be provided. This 3 fields are "include" and the rest are 
-# "exclude" fields!
-#
-# More than one channel definition can be provided. The delimiter is ";"
-# Additionaly you can make a "blacklist" of Channels when you prepent a "!" to the first Channel Definition
-# The "!" is only tested for the FIRST Channel definition.
-# You can only have a white or a blacklist (Mixing doesn't make sense!)
-#
-# ex. Record the series "Deep Space Nine" on Sci-Fantasy in the timeframe 09:00 - 14:00 with 60 Seconds Marginstart and -60 Seconds Marginstop
-# Deep Space Nine|||Sci-Fantasy|0900-1400|99|DS9|60;-60
+# The "Title", "Subtitle", "Description", "Channel"-Lines can be
+# supplied any number of times for a specific entry
 #
-# Record all "Actionfilm"s with "Schwarzenegger"
-# |Actionfilm|Schwarzenegger
-#
-Babylon 5|||!Pro-7||99|60;-60|1
-Deep Space Nine|||||99|DS9|60;-60|2
-Seven Days|||||99|
-Stargate|||||99|
-Futurama||||2100-2300|50|
-Ally McBeal|||||99|
-Snoops|||||50|
-^Friends$|||||99|Friends|
-Pensacola|||||50|
-seaQuest|||||50|
-||Paltrow|Sci Fantasy;13th Street;Star Kino;Cine Action;Cine Comedy;Romantic Movies;Studio Universal;Premiere||99|
-||Aniston|||99|
-Matrix
+# To record something at least one of the "Title", "Subtitle" or "Description"
+# fields has to be provided. These three fields are "include" and the rest are
+# "exclude" fields!
+
+[Dies ist ein Test-Timer]
+Title = Titel
+Subtitle = Subtitel
+Description = Description
+Category = Serie/Krimi
+Channel = Pro-7
+Channel = VIVA
+Timeframe = 1230-1830
+Prio = 50
+Lifetime = 50
+minlength = 10m
+maxlength = 3h
+weekday = ---T---
+Timertitle = Test
+Margin = 600;600
+instance = 2
+
+# Record Babylon 5 only if NOT playing on Pro 7;
+# recording starts one minute too early and ends
+# one minute too early (to skip following ads).
+[Babylon 5]
+Title = Babylon 5
+Channel = !Pro-7
+Prio = 99
+Margin = 60;-60
+
+[DS9]
+Title = Deep Space Nine
+Prio = 99
+Timertitle = DS9
+Margin = 60;-60
+
+[Seven Days]
+Title = Seven Days
+Prio = 99
+
+[Stargate]
+Title = Stargate
+Prio = 99
+
+[Aniston]
+Description = Aniston
+Prio = 99
 
+[Matrix]
+Title = Matrix
diff --git a/config.c b/config.c
index a97d7e4c4..87e833235 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.64 2001/09/02 15:04:13 kls Exp $
+ * $Id: config.c 1.72 2001/09/16 14:54:32 kls Exp $
  */
 
 #include "config.h"
@@ -39,6 +39,9 @@ tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { k8,             "8",             0 },
                     { k9,             "9",             0 },
                     { kPower,         "Power",         0 },
+                    { kVolUp,         "Volume+",       0 },
+                    { kVolDn,         "Volume-",       0 },
+                    { kMute,          "Mute",          0 },
                     { kNone,          "",              0 },
                   };
 
@@ -72,7 +75,7 @@ bool cKeys::Load(const char *FileName)
      FILE *f = fopen(fileName, "r");
      if (f) {
         int line = 0;
-        char buffer[MaxBuffer];
+        char buffer[MAXPARSEBUFFER];
         result = true;
         while (fgets(buffer, sizeof(buffer), f) > 0) {
               line++;
@@ -122,24 +125,14 @@ bool cKeys::Load(const char *FileName)
 
 bool cKeys::Save(void)
 {
-  bool result = true;
   cSafeFile f(fileName);
   if (f.Open()) {
-     if (fprintf(f, "Code\t%c\nAddress\t%04X\n", code, address) > 0) {
-        for (tKey *k = keys; k->type != kNone; k++) {
-            if (fprintf(f, "%s\t%08X\n", k->name, k->code) <= 0) {
-               result = false;
-               break;
-               }
-            }
-         }
-     else
-        result = false;
-     f.Close();
+     fprintf(f, "Code\t%c\nAddress\t%04X\n", code, address);
+     for (tKey *k = keys; k->type != kNone; k++)
+         fprintf(f, "%s\t%08X\n", k->name, k->code);
+     return f.Close();
      }
-  else
-     result = false;
-  return result;
+  return false;
 }
 
 eKeys cKeys::Get(unsigned int Code)
@@ -303,14 +296,19 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
         isyslog(LOG_INFO, "switching to channel %d", number);
         }
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr))
-            return true;
+         switch (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr)) {
+           case scrOk:         return true;
+           case scrNoTransfer: if (Interface)
+                                  Interface->Error(tr("Can't start Transfer Mode!"));
+                               return false;
+           case scrFailed:     break; // loop will retry
+           }
          esyslog(LOG_ERR, "retrying");
          }
      return false;
      }
   if (DvbApi->Recording())
-     Interface->Info(tr("Channel locked (recording)!"));
+     Interface->Error(tr("Channel locked (recording)!"));
   return false;
 }
 
@@ -649,8 +647,6 @@ cCommands Commands;
 
 // -- cChannels --------------------------------------------------------------
 
-int CurrentGroup = -1;
-
 cChannels Channels;
 
 bool cChannels::Load(const char *FileName)
@@ -807,8 +803,10 @@ cSetup::cSetup(void)
   OSDheight = 18;
   OSDMessageTime = 1;
   MaxVideoFileSize = MAXVIDEOFILESIZE;
-  MinEventTimeout = 120;
+  MinEventTimeout = 30;
   MinUserInactivity = 120;
+  MultiSpeedMode = 0;
+  ShowReplayMode = 0;
   CurrentChannel = -1;
 }
 
@@ -846,6 +844,8 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
      else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
      else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
+     else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
+     else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
      else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
      else
         return false;
@@ -862,7 +862,7 @@ bool cSetup::Load(const char *FileName)
   FILE *f = fopen(fileName, "r");
   if (f) {
      int line = 0;
-     char buffer[MaxBuffer];
+     char buffer[MAXPARSEBUFFER];
      bool result = true;
      while (fgets(buffer, sizeof(buffer), f) > 0) {
            line++;
@@ -918,13 +918,14 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MaxVideoFileSize   = %d\n", MaxVideoFileSize);
         fprintf(f, "MinEventTimeout    = %d\n", MinEventTimeout);
         fprintf(f, "MinUserInactivity  = %d\n", MinUserInactivity);
+        fprintf(f, "MultiSpeedMode     = %d\n", MultiSpeedMode);
+        fprintf(f, "ShowReplayMode     = %d\n", ShowReplayMode);
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
-        f.Close();
-        isyslog(LOG_INFO, "saved setup to %s", FileName);
-        return true;
+        if (f.Close()) {
+           isyslog(LOG_INFO, "saved setup to %s", FileName);
+           return true;
+           }
         }
-     else
-        LOG_ERROR_STR(FileName);
      }
   else
      esyslog(LOG_ERR, "attempt to save setup without file name");
diff --git a/config.h b/config.h
index c3fab9a8a..194d04e2b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.72 2001/09/02 15:45:17 kls Exp $
+ * $Id: config.h 1.79 2001/09/16 14:54:36 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,9 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.94"
-
-#define MaxBuffer 10000
+#define VDRVERSION "0.95"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -45,6 +43,9 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kBlue,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
              kPower,
+             kVolUp,
+             kVolDn,
+             kMute,
              kNone,
              // The following flags are OR'd with the above codes:
              k_Repeat  = 0x8000,
@@ -61,9 +62,9 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 #define kEditCut         k2
 #define kEditTest        k8
 
-#define RAWKEY(k)    ((k) & ~k_Flags)
+#define RAWKEY(k)    (eKeys((k) & ~k_Flags))
 #define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
-#define NORMALKEY(k) ((k) & ~k_Repeat)
+#define NORMALKEY(k) (eKeys((k) & ~k_Repeat))
 
 struct tKey {
   eKeys type;
@@ -192,7 +193,7 @@ template<class T> class cConfig : public cList<T> {
        FILE *f = fopen(fileName, "r");
        if (f) {
           int line = 0;
-          char buffer[MaxBuffer];
+          char buffer[MAXPARSEBUFFER];
           result = true;
           while (fgets(buffer, sizeof(buffer), f) > 0) {
                 line++;
@@ -228,7 +229,8 @@ template<class T> class cConfig : public cList<T> {
                 }
              l = (T *)l->Next();
              }
-       f.Close();
+       if (!f.Close())
+          result = false;
        }
     else
        result = false;
@@ -262,8 +264,6 @@ class cTimers : public cConfig<cTimer> {
 
 class cCommands : public cConfig<cCommand> {};
 
-extern int CurrentGroup;
-
 extern cChannels Channels;
 extern cTimers Timers;
 extern cKeys Keys;
@@ -299,6 +299,8 @@ class cSetup {
   int OSDMessageTime;
   int MaxVideoFileSize;
   int MinEventTimeout, MinUserInactivity;
+  int MultiSpeedMode;
+  int ShowReplayMode;
   int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);
diff --git a/dvbapi.c b/dvbapi.c
index 8e502ed15..16b3e3084 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.111 2001/09/01 13:27:52 kls Exp $
+ * $Id: dvbapi.c 1.125 2001/09/16 13:55:03 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -40,18 +40,14 @@ extern "C" {
 #include "tools.h"
 #include "videodir.h"
 
-#define DEV_VIDEO      "/dev/video"
-#define DEV_OST_OSD    "/dev/ost/osd"
-#define DEV_OST_QAMFE  "/dev/ost/qamfe"
-#define DEV_OST_QPSKFE "/dev/ost/qpskfe"
-#define DEV_OST_SEC    "/dev/ost/sec"
-#define DEV_OST_DVR    "/dev/ost/dvr"
-#define DEV_OST_DEMUX  "/dev/ost/demux"
-#define DEV_OST_VIDEO  "/dev/ost/video"
-#define DEV_OST_AUDIO  "/dev/ost/audio"
-
-#define KILOBYTE(n) ((n) * 1024)
-#define MEGABYTE(n) ((n) * 1024 * 1024)
+#define DEV_VIDEO         "/dev/video"
+#define DEV_OST_OSD       "/dev/ost/osd"
+#define DEV_OST_FRONTEND  "/dev/ost/frontend"
+#define DEV_OST_SEC       "/dev/ost/sec"
+#define DEV_OST_DVR       "/dev/ost/dvr"
+#define DEV_OST_DEMUX     "/dev/ost/demux"
+#define DEV_OST_VIDEO     "/dev/ost/video"
+#define DEV_OST_AUDIO     "/dev/ost/audio"
 
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
@@ -288,7 +284,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
-         if (Index >= 0 && Index <= last - 100) { // '- 100': need to stay off the end!
+         if (Index >= 0 && Index <= last) {
             if (index[Index].type == I_FRAME) {
                if (FileNumber)
                   *FileNumber = index[Index].number;
@@ -628,19 +624,84 @@ int ReadFrame(int f, uchar *b, int Length, int Max)
   return r;
 }
 
+// --- cBackTrace ----------------------------------------------------------
+
+#define AVG_FRAME_SIZE 15000         // an assumption about the average frame size
+#define DVB_BUF_SIZE   (256 * 1024)  // an assumption about the dvb firmware buffer size
+#define BACKTRACE_ENTRIES (DVB_BUF_SIZE / AVG_FRAME_SIZE + 20) // how many entries are needed to backtrace buffer contents
+
+class cBackTrace {
+private:
+  int index[BACKTRACE_ENTRIES];
+  int length[BACKTRACE_ENTRIES];
+  int pos, num;
+public:
+  cBackTrace(void);
+  void Clear(void);
+  void Add(int Index, int Length);
+  int Get(bool Forward);
+  };
+
+cBackTrace::cBackTrace(void)
+{
+  Clear();
+}
+
+void cBackTrace::Clear(void)
+{
+  pos = num = 0;
+}
+
+void cBackTrace::Add(int Index, int Length)
+{
+  index[pos] = Index;
+  length[pos] = Length;
+  if (++pos >= BACKTRACE_ENTRIES)
+     pos = 0;
+  if (num < BACKTRACE_ENTRIES)
+     num++;
+}
+
+int cBackTrace::Get(bool Forward)
+{
+  int p = pos;
+  int n = num;
+  int l = DVB_BUF_SIZE + (Forward ? 0 : 256 * 1024); //XXX (256 * 1024) == DVB_BUF_SIZE ???
+  int i = -1;
+
+  while (n && l > 0) {
+        if (--p < 0)
+           p = BACKTRACE_ENTRIES - 1;
+        i = index[p] - 1;
+        l -= length[p];
+        n--; 
+        }
+  return i;
+}
+
 // --- cPlayBuffer ---------------------------------------------------------
 
+#define MAX_VIDEO_SLOWMOTION 63 // max. arg to pass to VIDEO_SLOWMOTION // TODO is this value correct?
+
 class cPlayBuffer : public cRingBufferFrame {
+private:
+  cBackTrace backTrace;
 protected:
+  enum ePlayModes { pmPlay, pmPause, pmSlow, pmFast, pmStill };
+  enum ePlayDirs { pdForward, pdBackward };
+  static int Speeds[];
   cDvbApi *dvbApi;
   int videoDev, audioDev;
-  FILE *dolbyDev;
+  cPipe dolbyDev;
   int blockInput, blockOutput;
-  bool still, paused, fastForward, fastRewind;
+  ePlayModes playMode;
+  ePlayDirs playDir;
+  int trickSpeed;
   int readIndex, writeIndex;
   bool canDoTrickMode;
   bool canToggleAudioTrack;
   uchar audioTrack;
+  void TrickSpeed(int Increment);
   virtual void Empty(bool Block = false);
   virtual void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00) {}
   virtual void Output(void);
@@ -655,34 +716,38 @@ class cPlayBuffer : public cRingBufferFrame {
   virtual void SkipSeconds(int Seconds) {}
   virtual void Goto(int Position, bool Still = false) {}
   virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { Current = Total = -1; }
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
   bool CanToggleAudioTrack(void) { return canToggleAudioTrack; };
   virtual void ToggleAudioTrack(void);
   };
 
+#define NORMAL_SPEED  4 // the index of the '1' entry in the following array
+#define MAX_SPEEDS    3 // the offset of the maximum speed from normal speed in either direction
+#define SPEED_MULT   12 // the speed multiplier
+int cPlayBuffer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
+
 cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
 :cRingBufferFrame(VIDEOBUFSIZE)
 {
   dvbApi = DvbApi;
   videoDev = VideoDev;
   audioDev = AudioDev;
-  dolbyDev = NULL;
   blockInput = blockOutput = false;
-  still = paused = fastForward = fastRewind = false;
+  playMode = pmPlay;
+  playDir = pdForward;
+  trickSpeed = NORMAL_SPEED;
   readIndex = writeIndex = -1;
   canDoTrickMode = false;
   canToggleAudioTrack = false;
   audioTrack = 0xC0;
   if (cDvbApi::AudioCommand()) {
-     dolbyDev = popen(cDvbApi::AudioCommand(), "w");
-     if (!dolbyDev)
+     if (!dolbyDev.Open(cDvbApi::AudioCommand(), "w"))
         esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
      }
 }
 
 cPlayBuffer::~cPlayBuffer()
 {
-  if (dolbyDev)
-     pclose(dolbyDev);
 }
 
 void cPlayBuffer::Output(void)
@@ -697,25 +762,24 @@ void cPlayBuffer::Output(void)
            }
         const cFrame *frame = Get();
         if (frame) {
-           StripAudioPackets((uchar *)frame->Data(), frame->Count(), (fastForward || fastRewind) ? 0x00 : audioTrack);//XXX
-           for (int i = 0; i < ((paused && fastRewind) ? 24 : 1); i++) { // show every I_FRAME 24 times in slow rewind mode to achieve roughly the same speed as in slow forward mode
-               const uchar *p = frame->Data();
-               int r = frame->Count();
-               while (r > 0 && Busy() && !blockOutput) {
-                     cFile::FileReadyForWriting(videoDev, 100);
-                     int w = write(videoDev, p, r);
-                     if (w > 0) {
-                        p += w;
-                        r -= w;
-                        }
-                     else if (w < 0 && FATALERRNO) {
-                        LOG_ERROR;
-                        Stop();
-                        return;
-                        }
-                     }
-               writeIndex = frame->Index();
-               }
+           StripAudioPackets((uchar *)frame->Data(), frame->Count(), (playMode == pmFast || playMode == pmSlow) ? 0x00 : audioTrack);//XXX
+           const uchar *p = frame->Data();
+           int r = frame->Count();
+           while (r > 0 && Busy() && !blockOutput) {
+                 cFile::FileReadyForWriting(videoDev, 100);
+                 int w = write(videoDev, p, r);
+                 if (w > 0) {
+                    p += w;
+                    r -= w;
+                    }
+                 else if (w < 0 && FATALERRNO) {
+                    LOG_ERROR;
+                    Stop();
+                    return;
+                    }
+                 }
+           writeIndex = frame->Index();
+           backTrace.Add(frame->Index(), frame->Count());
            Drop(frame);
            }
         }
@@ -723,6 +787,26 @@ void cPlayBuffer::Output(void)
   dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
 }
 
+void cPlayBuffer::TrickSpeed(int Increment)
+{
+  int nts = trickSpeed + Increment;
+  if (Speeds[nts] == 1) {
+     trickSpeed = nts;
+     if (playMode == pmFast)
+        Play();
+     else
+        Pause();
+     }
+  else if (Speeds[nts]) {
+     trickSpeed = nts;
+     int Mult = (playMode == pmSlow && playDir == pdForward) ? 1 : SPEED_MULT;
+     int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
+     if (sp > MAX_VIDEO_SLOWMOTION)
+        sp = MAX_VIDEO_SLOWMOTION;
+     CHECK(ioctl(videoDev, VIDEO_SLOWMOTION, sp));
+     }
+}
+
 void cPlayBuffer::Empty(bool Block)
 {
   if (!(blockInput || blockOutput)) {
@@ -733,83 +817,153 @@ void cPlayBuffer::Empty(bool Block)
      while ((blockInput > 1 || blockOutput > 1) && time(NULL) - t0 < 2)
            usleep(1);
      Lock();
-     readIndex = writeIndex;
+     if ((readIndex = backTrace.Get(playDir == pdForward)) < 0)
+        readIndex = writeIndex;
      cRingBufferFrame::Clear();
      CHECK(ioctl(videoDev, VIDEO_CLEAR_BUFFER));
      CHECK(ioctl(audioDev, AUDIO_CLEAR_BUFFER));
      }
   if (!Block) {
      blockInput = blockOutput = 0;
+     backTrace.Clear();
      Unlock();
      }
 }
 
 void cPlayBuffer::Pause(void)
 {
-  paused = !paused;
-  bool empty = fastForward || fastRewind;
-  if (empty)
-     Empty(true);
-  fastForward = fastRewind = false;
-  CHECK(ioctl(videoDev, paused ? VIDEO_FREEZE : VIDEO_CONTINUE));
-  //CHECK(ioctl(audioDev, AUDIO_SET_MUTE, paused)); //XXX this caused chirping sound when playing a DVD
-  still = false;
-  if (empty)
-     Empty(false);
+  if (playMode == pmPause || playMode == pmStill)
+     Play();
+  else {
+     bool empty = (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
+     if (empty)
+        Empty(true);
+     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
+     CHECK(ioctl(videoDev, VIDEO_FREEZE));
+     playMode = pmPause;
+     if (empty)
+        Empty(false);
+     }
 }
 
 void cPlayBuffer::Play(void)
 {
-  if (fastForward || fastRewind || paused) {
-     bool empty = !paused || fastRewind;
+  if (playMode != pmPlay) {
+     bool empty = (playMode == pmStill || playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
      if (empty)
         Empty(true);
-     still = false;
-     CHECK(ioctl(videoDev, paused ? VIDEO_CONTINUE : VIDEO_PLAY));
      CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
-     //CHECK(ioctl(audioDev, AUDIO_SET_MUTE, false)); //XXX this caused chirping sound when playing a DVD
+     CHECK(ioctl(videoDev, VIDEO_CONTINUE));
+     playMode = pmPlay;
+     playDir = pdForward;
      if (empty)
         Empty(false);
-     fastForward = fastRewind = paused = false;
-     }
+    }
 }
 
 void cPlayBuffer::Forward(void)
 {
-  if (canDoTrickMode || paused) {
-     bool empty = !paused || fastRewind;
-     if (empty) {
-        Empty(true);
-        if (fastForward)
-           readIndex -= 150; // this about compensates for the buffered data, so that we don't get too far ahead
-        }
-     still = false;
-     fastForward = !fastForward;
-     fastRewind = false;
-     if (paused)
-        CHECK(ioctl(videoDev, fastForward ? VIDEO_SLOWMOTION : VIDEO_FREEZE, 2));
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastForward));
-     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastForward || paused));
-     if (empty)
-        Empty(false);
+  if (canDoTrickMode) {
+     switch (playMode) {
+       case pmFast:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdForward ? 1 : -1);
+               break;
+               }
+            else if (playDir == pdForward) {
+               Play();
+               break;
+               }
+            // run into pmPlay
+       case pmPlay:
+            Empty(true);
+            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
+            playMode = pmFast;
+            playDir = pdForward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
+            Empty(false);
+            break;
+       case pmSlow:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdForward ? -1 : 1);
+               break;
+               }
+            else if (playDir == pdForward) {
+               Pause();
+               break;
+               }
+            // run into pmPause
+       case pmStill:
+       case pmPause:
+            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
+            playMode = pmSlow;
+            playDir = pdForward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
+            break;
+       }
      }
 }
 
 void cPlayBuffer::Backward(void)
 {
   if (canDoTrickMode) {
-     Empty(true);
-     still = false;
-     fastRewind = !fastRewind;
-     fastForward = false;
-     if (paused)
-        CHECK(ioctl(videoDev, fastRewind ? VIDEO_CONTINUE : VIDEO_FREEZE));
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, !fastRewind));
-     CHECK(ioctl(audioDev, AUDIO_SET_MUTE, fastRewind || paused));
-     Empty(false);
+     switch (playMode) {
+       case pmFast:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdBackward ? 1 : -1);
+               break;
+               }
+            else if (playDir == pdBackward) {
+               Play();
+               break;
+               }
+            // run into pmPlay
+       case pmPlay:
+            Empty(true);
+            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
+            playMode = pmFast;
+            playDir = pdBackward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
+            Empty(false);
+            break;
+       case pmSlow:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdBackward ? -1 : 1);
+               break;
+               }
+            else if (playDir == pdBackward) {
+               Pause();
+               break;
+               }
+            // run into pmPause
+       case pmStill:
+       case pmPause:
+            Empty(true);
+            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
+            playMode = pmSlow;
+            playDir = pdBackward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
+            Empty(false);
+            break;
+       }
      }
 }
 
+bool cPlayBuffer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
+{
+  Play = (playMode == pmPlay || playMode == pmFast);
+  Forward = (playDir == pdForward);
+  if (playMode == pmFast || playMode == pmSlow)
+     Speed = Setup.MultiSpeedMode ? abs(trickSpeed - NORMAL_SPEED) : 0;
+  else
+     Speed = -1;
+  return true;
+}
+
 void cPlayBuffer::ToggleAudioTrack(void)
 {
   if (CanToggleAudioTrack()) {
@@ -890,18 +1044,17 @@ void cReplayBuffer::Input(void)
               blockInput = 1;
            continue;
            }
-        if (!still) {
+        if (playMode != pmStill) {
            int r = 0;
-           if (fastForward && !paused || fastRewind) {
+           if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
               uchar FileNumber;
               int FileOffset, Length;
-              int Index = index->GetNextIFrame(readIndex, fastForward, &FileNumber, &FileOffset, &Length);
+              int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length);
               if (Index >= 0) {
                  if (!NextFile(FileNumber, FileOffset))
                     break;
                  }
               else {
-                 paused = fastForward = fastRewind = false;
                  Play();
                  continue;
                  }
@@ -1073,23 +1226,21 @@ void cReplayBuffer::Goto(int Index, bool Still)
 {
   if (index) {
      Empty(true);
-     if (paused)
-        CHECK(ioctl(videoDev, VIDEO_CONTINUE));
      if (++Index <= 0)
         Index = 1; // not '0', to allow GetNextIFrame() below to work!
      uchar FileNumber;
      int FileOffset, Length;
      Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
      if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
-        still = true;
         uchar b[MAXFRAMESIZE];
         int r = ReadFrame(replayFile, b, Length, sizeof(b));
-        if (r > 0)
+        if (r > 0) {
+           if (playMode == pmPause)
+              CHECK(ioctl(videoDev, VIDEO_CONTINUE));
            DisplayFrame(b, r);
-        paused = true;
+           }
+        playMode = pmStill;
         }
-     else
-        still = false;
      readIndex = writeIndex = Index;
      Empty(false);
      }
@@ -1098,7 +1249,7 @@ void cReplayBuffer::Goto(int Index, bool Still)
 void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
-     if (still)
+     if (playMode == pmStill)
         Current = readIndex;
      else {
         Current = writeIndex;
@@ -1180,7 +1331,7 @@ class cDVDplayBuffer : public cPlayBuffer {
   int is_nav_pack(unsigned char *buffer);
   void Close(void);
   virtual void Empty(bool Block = false);
-  int decode_packet(unsigned char *sector, int iframe);
+  int decode_packet(unsigned char *sector, bool trickmode);
   int ScanVideoPacket(const uchar *Data, int Count, uchar *PictureType);
   bool PacketStart(uchar **Data, int len);
   int GetPacketType(const uchar *Data);
@@ -1460,7 +1611,7 @@ void cDVDplayBuffer::Input(void)
                     }
 
                  // init settings for next state
-                 if (!fastRewind)
+                 if (playDir == pdForward)
                     cur_pack = cur_pgc->cell_playback[cur_cell].first_sector;
                  else
                     cur_pack = cur_pgc->cell_playback[cur_cell].last_vobu_start_sector;
@@ -1478,7 +1629,7 @@ void cDVDplayBuffer::Input(void)
                   * We loop until we're out of this cell.
                   */
 
-                 if (!fastRewind) {
+                 if (playDir == pdForward) {
                     if (cur_pack >= cur_pgc->cell_playback[cur_cell].last_sector) {
                        cur_cell = next_cell;
 #ifdef DVDDEBUG
@@ -1573,7 +1724,7 @@ void cDVDplayBuffer::Input(void)
 
           case cREADFRAME:
                {
-                 int trickMode = (fastForward && !paused || fastRewind);
+                 bool trickMode = (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
 
                  /* FIXME:
                   *   the entire trickMode code relies on the assumtion
@@ -1582,7 +1733,7 @@ void cDVDplayBuffer::Input(void)
                   *   I have no clue wether that is correct or not !!!
                   */
                  if (trickMode && (skipCnt++ % 4 != 0)) {
-                    cur_pack = (!fastRewind) ? next_vobu : prev_vobu;
+                    cur_pack = (playDir == pdForward) ? next_vobu : prev_vobu;
                     NextState(cOUTPACK);
                     break;
                     }
@@ -1609,7 +1760,7 @@ void cDVDplayBuffer::Input(void)
 
           case cOUTFRAMES:
                {
-                 int trickMode = (fastForward && !paused || fastRewind);
+                 bool trickMode = (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
 
                  /**
                   * Output cursize packs.
@@ -1624,7 +1775,7 @@ void cDVDplayBuffer::Input(void)
                  if (decode_packet(&data[pktcnt * DVD_VIDEO_LB_LEN], trickMode) != 1) {   //we've got a video packet
                     if (trickMode) {
                         //dsyslog(LOG_INFO, "DVD: did pack: %d", pktcnt);
-                        cur_pack = (!fastRewind) ? next_vobu : prev_vobu;
+                        cur_pack = (playDir == pdForward) ? next_vobu : prev_vobu;
                         NextState(cOUTPACK);
                         break;
                         }
@@ -1835,7 +1986,7 @@ void cDVDplayBuffer::putFrame(unsigned char *sector, int length)
         ;
 }
 
-int cDVDplayBuffer::decode_packet(unsigned char *sector, int trickMode)
+int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
 {
   uchar pt = 1;
 #if 0
@@ -2213,6 +2364,8 @@ void cCuttingBuffer::Action(void)
            // Write one frame:
 
            if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
+              if (!Mark) // edited version shall end before next I-frame
+                 break;
               if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
                  toFile = toFileName->NextFile();
                  if (toFile < 0)
@@ -2231,16 +2384,18 @@ void cCuttingBuffer::Action(void)
 
            if (Mark && Index >= Mark->position) {
               Mark = fromMarks.Next(Mark);
+              toMarks.Add(LastIFrame);
+              if (Mark)
+                 toMarks.Add(toIndex->Last() + 1);
+              toMarks.Save();
               if (Mark) {
                  Index = Mark->position;
                  Mark = fromMarks.Next(Mark);
                  CurrentFileNumber = 0; // triggers SetOffset before reading next frame
-                 toMarks.Add(LastIFrame);
-                 toMarks.Add(toIndex->Last() + 1);
-                 toMarks.Save();
                  }
-              else
-                 break; // final end mark reached
+              // the 'else' case (i.e. 'final end mark reached') is handled above
+              // in 'Write one frame', so that the edited version will end right
+              // before the next I-frame.
               }
            }
      }
@@ -2322,9 +2477,8 @@ cDvbApi::cDvbApi(int n)
 
   // Devices that are only present on DVB-C or DVB-S cards:
 
-  fd_qamfe   = OstOpen(DEV_OST_QAMFE,  n, O_RDWR);
-  fd_qpskfe  = OstOpen(DEV_OST_QPSKFE, n, O_RDWR);
-  fd_sec     = OstOpen(DEV_OST_SEC,    n, O_RDWR);
+  fd_frontend = OstOpen(DEV_OST_FRONTEND, n, O_RDWR);
+  fd_sec      = OstOpen(DEV_OST_SEC,      n, O_RDWR);
 
   // Devices that all DVB cards must have:
 
@@ -2355,7 +2509,7 @@ cDvbApi::cDvbApi(int n)
 
   // We only check the devices that must be present - the others will be checked before accessing them:
 
-  if (((fd_qpskfe >= 0 && fd_sec >= 0) || fd_qamfe >= 0) && fd_demuxv >= 0 && fd_demuxa1 >= 0 && fd_demuxa2 >= 0 && fd_demuxd1 >= 0 && fd_demuxd2 >= 0 && fd_demuxt >= 0) {
+  if (fd_frontend >= 0 && fd_demuxv >= 0 && fd_demuxa1 >= 0 && fd_demuxa2 >= 0 && fd_demuxd1 >= 0 && fd_demuxd2 >= 0 && fd_demuxt >= 0) {
      siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
      if (!dvbApi[0]) // only the first one shall set the system time
         siProcessor->SetUseTSTime(Setup.SetSystemTime);
@@ -2385,6 +2539,8 @@ cDvbApi::cDvbApi(int n)
   osd = NULL;
 #endif
   currentChannel = 1;
+  mute = false;
+  volume = 255;
 }
 
 cDvbApi::~cDvbApi()
@@ -2475,7 +2631,7 @@ bool cDvbApi::Init(void)
   NumDvbApis = 0;
   for (int i = 0; i < MAXDVBAPI; i++) {
       if (useDvbApi == 0 || (useDvbApi & (1 << i)) != 0) {
-         if (Probe(OstName(DEV_OST_QPSKFE, i)) || Probe(OstName(DEV_OST_QAMFE, i)))
+         if (Probe(OstName(DEV_OST_FRONTEND, i)))
             dvbApi[NumDvbApis++] = new cDvbApi(i);
          else
             break;
@@ -2674,7 +2830,10 @@ bool cDvbApi::OvlG(int SizeX, int SizeY, int PosX, int PosY)
      vw.width = SizeX;
      vw.height = SizeY;
      vw.chromakey = ovlPalette;
-     vw.flags = VIDEO_WINDOW_CHROMAKEY; // VIDEO_WINDOW_INTERLACE; //VIDEO_CLIP_BITMAP;
+#ifndef VID_TYPE_CHROMAKEY // name changed somewhere down the road in kernel 2.4.x
+#define VID_TYPE_CHROMAKEY VIDEO_WINDOW_CHROMAKEY
+#endif
+     vw.flags = VID_TYPE_CHROMAKEY; // VIDEO_WINDOW_INTERLACE; //VIDEO_CLIP_BITMAP;
      vw.clips = ovlClipRects;
      vw.clipcount = ovlClipCount;
      result |= ioctl(videoDev, VIDIOCSWIN, &vw);
@@ -2781,7 +2940,7 @@ void cDvbApi::Open(int w, int h)
   cols = w;
   rows = h;
 #ifdef DEBUG_OSD
-  window = subwin(stdscr, h, w, d, 0);
+  window = subwin(stdscr, h, w, d, (Setup.OSDwidth - w) / 2);
   syncok(window, true);
   #define B2C(b) (((b) * 1000) / 255)
   #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
@@ -2799,7 +2958,7 @@ void cDvbApi::Open(int w, int h)
   w *= charWidth;
   h *= lineHeight;
   d *= lineHeight;
-  int x = (720 - (Setup.OSDwidth - 1) * charWidth) / 2; //TODO PAL vs. NTSC???
+  int x = (720 - w + charWidth) / 2; //TODO PAL vs. NTSC???
   int y = (576 - Setup.OSDheight * lineHeight) / 2 + d;
   //XXX
   osd = new cDvbOsd(fd_osd, x, y);
@@ -3031,7 +3190,7 @@ bool cDvbApi::SetPids(bool ForRecording)
          SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP);
 }
 
-bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
+eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
 {
   // Make sure the siProcessor won't access the device while switching
   cThreadLock ThreadLock(siProcessor);
@@ -3075,7 +3234,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
 
      bool ChannelSynced = false;
 
-     if (fd_qpskfe >= 0 && fd_sec >= 0) { // DVB-S
+     if (fd_sec >= 0) { // DVB-S
 
         // Frequency offsets:
 
@@ -3091,10 +3250,10 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
            tone = SEC_TONE_ON;
            }
 
-        qpskParameters qpsk;
-        qpsk.iFrequency = freq * 1000UL;
-        qpsk.SymbolRate = Srate * 1000UL;
-        qpsk.FEC_inner = FEC_AUTO;
+        FrontendParameters Frontend;
+        Frontend.Frequency = freq * 1000UL;
+        Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
+        Frontend.u.qpsk.FEC_inner = FEC_AUTO;
 
         int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
 
@@ -3118,65 +3277,65 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
 
         // Tuning:
 
-        CHECK(ioctl(fd_qpskfe, QPSK_TUNE, &qpsk));
+        CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
 
         // Wait for channel sync:
 
-        if (cFile::FileReady(fd_qpskfe, 5000)) {
-           qpskEvent event;
-           int res = ioctl(fd_qpskfe, QPSK_GET_EVENT, &event);
+        if (cFile::FileReady(fd_frontend, 5000)) {
+           FrontendEvent event;
+           int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
            if (res >= 0)
               ChannelSynced = event.type == FE_COMPLETION_EV;
            else
-              esyslog(LOG_ERR, "ERROR %d in qpsk get event", res);
+              esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
            }
         else
            esyslog(LOG_ERR, "ERROR: timeout while tuning");
         }
-     else if (fd_qamfe >= 0) { // DVB-C
+     else if (fd_frontend >= 0) { // DVB-C
 
         // Frequency and symbol rate:
 
-        qamParameters qam;
-        qam.Frequency = FrequencyMHz * 1000000UL;
-        qam.SymbolRate = Srate * 1000UL;
-        qam.FEC_inner = FEC_AUTO;
-        qam.QAM = QAM_64;
+        FrontendParameters Frontend;
+        Frontend.Frequency = FrequencyMHz * 1000000UL;
+        Frontend.u.qam.SymbolRate = Srate * 1000UL;
+        Frontend.u.qam.FEC_inner = FEC_AUTO;
+        Frontend.u.qam.QAM = QAM_64;
 
         // Tuning:
 
-        CHECK(ioctl(fd_qamfe, QAM_TUNE, &qam));
+        CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
 
         // Wait for channel sync:
 
-        if (cFile::FileReady(fd_qamfe, 5000)) {
-           qamEvent event;
-           int res = ioctl(fd_qamfe, QAM_GET_EVENT, &event);
+        if (cFile::FileReady(fd_frontend, 5000)) {
+           FrontendEvent event;
+           int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
            if (res >= 0)
               ChannelSynced = event.type == FE_COMPLETION_EV;
            else
-              esyslog(LOG_ERR, "ERROR %d in qam get event", res);
+              esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
            }
         else
            esyslog(LOG_ERR, "ERROR: timeout while tuning");
         }
      else {
         esyslog(LOG_ERR, "ERROR: attempt to set channel without DVB-S or DVB-C device");
-        return false;
+        return scrFailed;
         }
 
      if (!ChannelSynced) {
         esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
         if (this == PrimaryDvbApi)
            cThread::RaisePanic();
-        return false;
+        return scrFailed;
         }
 
      // PID settings:
 
      if (!SetPids(false)) {
         esyslog(LOG_ERR, "ERROR: failed to set PIDs for channel %d", ChannelNumber);
-        return false;
+        return scrFailed;
         }
      SetTpid(Tpid, DMX_OUT_DECODER);
      if (fd_audio >= 0)
@@ -3186,19 +3345,21 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
   if (this == PrimaryDvbApi && siProcessor)
      siProcessor->SetCurrentServiceID(Pnr);
 
+  eSetChannelResult Result = scrOk;
+
   // If this DVB card can't receive this channel, let's see if we can
   // use the card that actually can receive it and transfer data from there:
 
   if (NeedsTransferMode) {
      cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
-     if (CaDvbApi) {
-        if (!CaDvbApi->Recording()) {
-           if (CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid1, Apid2, Dpid1, Dpid2, Tpid, Ca, Pnr)) {
-              SetModeReplay();
-              transferringFromDvbApi = CaDvbApi->StartTransfer(fd_video);
-              }
+     if (CaDvbApi && !CaDvbApi->Recording()) {
+        if ((Result = CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid1, Apid2, Dpid1, Dpid2, Tpid, Ca, Pnr)) == scrOk) {
+           SetModeReplay();
+           transferringFromDvbApi = CaDvbApi->StartTransfer(fd_video);
            }
         }
+     else
+        Result = scrNoTransfer;
      }
 
   if (fd_video >= 0 && fd_audio >= 0) {
@@ -3206,7 +3367,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
      CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
 
-  return true;
+  return Result;
 }
 
 bool cDvbApi::Transferring(void)
@@ -3372,8 +3533,10 @@ void cDvbApi::StopReplay(void)
      if (this == PrimaryDvbApi) {
         // let's explicitly switch the channel back in case it was in Transfer Mode:
         cChannel *Channel = Channels.GetByNumber(currentChannel);
-        if (Channel)
+        if (Channel) {
            Channel->Switch(this, false);
+           usleep(100000); // allow driver to sync in case a new replay will start immediately
+           }
         }
      }
 }
@@ -3424,6 +3587,11 @@ bool cDvbApi::GetIndex(int &Current, int &Total, bool SnapToIFrame)
   return false;
 }
 
+bool cDvbApi::GetReplayMode(bool &Play, bool &Forward, int &Speed)
+{
+  return replayBuffer && replayBuffer->GetReplayMode(Play, Forward, Speed);
+}
+
 void cDvbApi::Goto(int Position, bool Still)
 {
   if (replayBuffer)
@@ -3456,6 +3624,24 @@ bool cDvbApi::ToggleAudioTrack(void)
   return false;
 }
 
+void cDvbApi::ToggleMute(void)
+{
+  int OldVolume = volume;
+  mute = !mute;
+  SetVolume(0, mute);
+  volume = OldVolume;
+}
+
+void cDvbApi::SetVolume(int Volume, bool Absolute)
+{
+  if (fd_audio >= 0) {
+     volume = min(max(Absolute ? Volume : volume + Volume, 0), 255);
+     audioMixer_t am;
+     am.volume_left = am.volume_right = volume;
+     CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
+     }
+}
+
 void cDvbApi::SetAudioCommand(const char *Command)
 {
   delete audioCommand;
diff --git a/dvbapi.h b/dvbapi.h
index c93a9f35d..d0a68e795 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.47 2001/08/25 13:37:00 kls Exp $
+ * $Id: dvbapi.h 1.51 2001/09/16 13:54:23 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -56,6 +56,8 @@ const char *IndexToHMSF(int Index, bool WithFrame = false);
 int HMSFToIndex(const char *HMSF);
       // Converts the given string (format: "hh:mm:ss.ff") to an index.
 
+enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
+
 class cChannel;
 
 class cRecordBuffer;
@@ -85,7 +87,7 @@ class cDvbApi {
   friend class cTransferBuffer;
 private:
   int videoDev;
-  int fd_osd, fd_qpskfe, fd_qamfe, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt;
+  int fd_osd, fd_frontend, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt;
   int vPid, aPid1, aPid2, dPid1, dPid2;
   bool SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output);
   bool SetVpid(int Vpid, dmxOutput_t Output)  { return SetPid(fd_demuxv,  DMX_PES_VIDEO,    Vpid, Output); }
@@ -203,7 +205,7 @@ class cDvbApi {
 private:
   int currentChannel;
 public:
-  bool SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr);
+  eSetChannelResult SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr);
   static int CurrentChannel(void) { return PrimaryDvbApi ? PrimaryDvbApi->currentChannel : 0; }
   int Channel(void) { return currentChannel; }
 
@@ -287,6 +289,12 @@ class cDvbApi {
   bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
        // Returns the current and total frame index, optionally snapped to the
        // nearest I-frame.
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
+       // Returns the current replay mode (if applicable).
+       // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
+       // we are going forward or backward and 'Speed' is -1 if this is normal
+       // play/pause mode, 0 if it is single speed fast/slow forward/back mode
+       // and >0 if this is multi speed mode.
   void Goto(int Index, bool Still = false);
        // Positions to the given index and displays that frame as a still picture
        // if Still is true.
@@ -307,6 +315,18 @@ class cDvbApi {
 public:
   static void SetAudioCommand(const char *Command);
   static const char *AudioCommand(void) { return audioCommand; }
+
+  // Volume facilities:
+
+private:
+  bool mute;
+  int volume;
+public:
+  void ToggleMute(void);
+       // Turns the volume off or on.
+  void SetVolume(int Volume, bool Absolute = false);
+       // Sets the volume to the given value, either absolutely or relative to
+       // the current volume.
   };
 
 class cEITScanner {
diff --git a/i18n.c b/i18n.c
index 086d85a3c..5e440c951 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.39 2001/09/02 15:17:33 kls Exp $
+ * $Id: i18n.c 1.43 2001/09/16 14:43:05 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -658,6 +658,15 @@ const tPhrase Phrases[] = {
     "Cha�ne verrouill�e (enregistrement en cours)!",
     "Kanalen er l�st (opptak)!",
   },
+  { "Can't start Transfer Mode!",
+    "Transfer-Mode kann nicht gestartet werden!",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
     "Ne morem zaceti urejanja!",
@@ -938,6 +947,24 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "MultiSpeedMode",
+    "MultiSpeed Modus",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "ShowReplayMode",
+    "Wiedergabe Status",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
@@ -1184,6 +1211,33 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "Volume+",
+    "Lautst�rke+",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Volume-",
+    "Lautst�rke-",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Mute",
+    "Stumm",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Miscellaneous:
   { "yes",
     "ja",
diff --git a/keys-pc.conf b/keys-pc.conf
index ab4b58d5e..d727712d3 100644
--- a/keys-pc.conf
+++ b/keys-pc.conf
@@ -22,3 +22,6 @@ Blue	0000010C
 8	00000038
 9	00000039
 Power   00000050
+Volume+	0000002B
+Volume-	0000002D
+Mute	0000006D
diff --git a/menu.c b/menu.c
index 5ff54cbd8..98fd30235 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.115 2001/09/02 15:27:54 kls Exp $
+ * $Id: menu.c 1.120 2001/09/15 10:36:31 kls Exp $
  */
 
 #include "menu.h"
@@ -16,8 +16,9 @@
 #include "eit.h"
 #include "i18n.h"
 
-#define MENUTIMEOUT 120 // seconds
-#define MAXWAIT4EPGINFO 10 // seconds
+#define MENUTIMEOUT     120 // seconds
+#define MAXWAIT4EPGINFO  10 // seconds
+#define MODETIMEOUT       3 // seconds
 
 const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#~^";
 
@@ -1725,6 +1726,8 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("MaxVideoFileSize"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
   Add(new cMenuEditIntItem( tr("MinEventTimeout"),    &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("MinUserInactivity"),  &data.MinUserInactivity));
+  Add(new cMenuEditBoolItem(tr("MultiSpeedMode"),     &data.MultiSpeedMode));
+  Add(new cMenuEditBoolItem(tr("ShowReplayMode"),     &data.ShowReplayMode));
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -1920,14 +1923,14 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 #define DIRECTCHANNELTIMEOUT 1000 //ms
 #define INFOTIMEOUT          5000 //ms
 
-cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
+cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 :cOsdBase(true)
 {
-  group = Group;
-  withInfo = !group && (!Switched || Setup.ShowInfoOnChSwitch);
+  group = -1;
+  withInfo = !Switched || Setup.ShowInfoOnChSwitch;
   lines = 0;
   oldNumber = number = 0;
-  cChannel *channel = Group ? Channels.Get(Number) : Channels.GetByNumber(Number);
+  cChannel *channel = Channels.GetByNumber(Number);
   Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
   if (channel) {
      DisplayChannel(channel);
@@ -1939,6 +1942,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched, bool Group)
 cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdBase(true)
 {
+  group = -1;
   oldNumber = cDvbApi::CurrentChannel();
   number = 0;
   lastTime = time_ms();
@@ -2049,6 +2053,32 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                }
             }
          break;
+    case kLeft:
+    case kRight:
+         withInfo = false;
+         if (group < 0) {
+            cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
+            if (channel)
+               group = channel->Index();
+            }
+         if (group >= 0) {
+            int SaveGroup = group;
+            if (Key == kRight)
+               group = Channels.GetNextGroup(group) ;
+            else
+               group = Channels.GetPrevGroup(group < 1 ? 1 : group);
+            if (group < 0)
+               group = SaveGroup;
+            cChannel *channel = Channels.Get(group);
+            if (channel) {
+               Interface->Clear();
+               DisplayChannel(channel);
+               if (!channel->groupSep)
+                  group = -1;
+               }
+            }
+         lastTime = time_ms();
+         break;
     case kNone:
          if (number && time_ms() - lastTime > DIRECTCHANNELTIMEOUT) {
             if (number > 0 && !Channels.SwitchTo(number))
@@ -2059,8 +2089,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     //TODO
     //XXX case kGreen:  return osEventNow;
     //XXX case kYellow: return osEventNext;
-    case kOk:     if (group)
-                     Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(CurrentGroup))->number);
+    case kOk:     if (group >= 0)
+                     Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->number);
                   return osEnd;
     default:      Interface->PutKey(Key);
                   return osEnd;
@@ -2304,7 +2334,7 @@ int  cReplayControl::titleid = 0;//XXX
 cReplayControl::cReplayControl(void)
 {
   dvbApi = cDvbApi::PrimaryDvbApi;
-  visible = shown = displayFrames = false;
+  visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
   timeoutShow = 0;
   timeSearchActive = false;
@@ -2367,7 +2397,51 @@ void cReplayControl::Hide(void)
 {
   if (visible) {
      Interface->Close();
-     needsFastResponse = visible = false;
+     needsFastResponse = visible = modeOnly = false;
+     }
+}
+
+void cReplayControl::DisplayAtBottom(const char *s)
+{
+  if (s) {
+     int w = dvbApi->WidthInCells(s);
+     int d = max(Width() - w, 0) / 2;
+     Interface->Write(d, -1, s);
+     Interface->Flush();
+     }
+  else
+     Interface->Fill(12, 2, Width() - 22, 1, clrBackground);
+}
+
+void cReplayControl::ShowMode(void)
+{
+  if (Setup.ShowReplayMode && !timeSearchActive) {
+     bool Play, Forward;
+     int Speed;
+     if (dvbApi->GetReplayMode(Play, Forward, Speed)) {
+
+        if (!visible) {
+           // open small display
+           Interface->Open(9, -1);
+           Interface->Clear();
+           visible = modeOnly = true;
+           }
+
+        timeoutShow = (modeOnly && !timeoutShow && Speed == -1 && Play) ? time(NULL) + MODETIMEOUT : 0;
+        const char *Mode;
+        if (Speed == -1) Mode = Play    ? "  >  " : " ||  ";
+        else if (Play)   Mode = Forward ? " X>> " : " <<X ";
+        else             Mode = Forward ? " X|> " : " <|X ";
+        char buf[16];
+        strn0cpy(buf, Mode, sizeof(buf));
+        char *p = strchr(buf, 'X');
+        if (p)
+           *p = Speed > 0 ? '1' + Speed - 1 : ' ';
+
+        eDvbFont OldFont = Interface->SetFont(fontFix);
+        DisplayAtBottom(buf);
+        Interface->SetFont(OldFont);
+        }
      }
 }
 
@@ -2407,6 +2481,7 @@ bool cReplayControl::ShowProgress(bool Initial)
         lastCurrent = Current;
         }
      lastTotal = Total;
+     ShowMode();
      return true;
      }
   return false;
@@ -2428,7 +2503,7 @@ void cReplayControl::TimeSearchDisplay(void)
     default: sprintf(buf + len, "--:--"); break;
     }
 
-  Interface->Write(12, 2, buf);
+  DisplayAtBottom(buf);
 }
 
 void cReplayControl::TimeSearchProcess(eKeys Key)
@@ -2485,7 +2560,8 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
      if (timeSearchHide)
         Hide();
      else
-        Interface->Fill(12, 2, Width() - 22, 1, clrBackground);
+        DisplayAtBottom();
+     ShowMode();
      }
 }
 
@@ -2493,6 +2569,8 @@ void cReplayControl::TimeSearch(void)
 {
   timeSearchHH = timeSearchMM = timeSearchPos = 0;
   timeSearchHide = false;
+  if (modeOnly)
+     Hide();
   if (!visible) {
      Show();
      if (visible)
@@ -2596,7 +2674,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         Hide();
         timeoutShow = 0;
         }
-     else
+     else if (!modeOnly)
         shown = ShowProgress(!shown) || shown;
      }
   bool DisplayedFrames = displayFrames;
@@ -2605,13 +2683,16 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
      TimeSearchProcess(Key);
      return osContinue;
      }
+  bool DoShowMode = true;
   switch (Key) {
     // Positioning:
     case kUp:      dvbApi->Play(); break;
     case kDown:    dvbApi->Pause(); break;
     case kLeft|k_Release:
+                   if (Setup.MultiSpeedMode) break;
     case kLeft:    dvbApi->Backward(); break;
     case kRight|k_Release:
+                   if (Setup.MultiSpeedMode) break;
     case kRight:   dvbApi->Forward(); break;
     case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
@@ -2622,6 +2703,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                    dvbApi->StopReplay();
                    return osEnd;
     default: {
+      DoShowMode = false;
       switch (Key) {
         // Editing:
         //XXX should we do this only when the ProgressDisplay is on???
@@ -2647,6 +2729,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         }
       }
     }
+  if (DoShowMode)
+     ShowMode();
   if (DisplayedFrames && !displayFrames)
      Interface->Fill(0, 2, 11, 1, clrBackground);
   return osContinue;
diff --git a/menu.h b/menu.h
index 2c5ed3941..bb31c72a6 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.25 2001/09/01 14:52:48 kls Exp $
+ * $Id: menu.h 1.28 2001/09/14 15:09:49 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -31,14 +31,15 @@ class cMenuMain : public cOsdMenu {
 
 class cDisplayChannel : public cOsdBase {
 private:
-  bool withInfo, group;
+  int group;
+  bool withInfo;
   int lines;
   int lastTime;
   int oldNumber, number;
   void DisplayChannel(const cChannel *Channel);
   void DisplayInfo(void);
 public:
-  cDisplayChannel(int Number, bool Switched, bool Group = false);
+  cDisplayChannel(int Number, bool Switched);
   cDisplayChannel(eKeys FirstKey);
   virtual ~cDisplayChannel();
   virtual eOSState ProcessKey(eKeys Key);
@@ -101,7 +102,7 @@ class cReplayControl : public cOsdBase {
 private:
   cDvbApi *dvbApi;
   cMarks marks;
-  bool visible, shown, displayFrames;
+  bool visible, modeOnly, shown, displayFrames;
   int lastCurrent, lastTotal;
   time_t timeoutShow;
   bool timeSearchActive, timeSearchHide;  
@@ -117,6 +118,8 @@ class cReplayControl : public cOsdBase {
   static int titleid;//XXX
 #endif //DVDSUPPORT
   static char *title;
+  void DisplayAtBottom(const char *s = NULL);
+  void ShowMode(void);
   bool ShowProgress(bool Initial);
   void MarkToggle(void);
   void MarkJump(bool Forward);
diff --git a/svdrp.c b/svdrp.c
index 5f8aad403..d1833612f 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.22 2001/09/01 09:50:03 kls Exp $
+ * $Id: svdrp.c 1.23 2001/09/14 14:31:22 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -262,7 +262,7 @@ void cSVDRP::Close(bool Timeout)
 {
   if (file.IsOpen()) {
      //TODO how can we get the *full* hostname?
-     char buffer[MAXCMDBUFFER];
+     char buffer[BUFSIZ];
      gethostname(buffer, sizeof(buffer));
      Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
      isyslog(LOG_INFO, "closing SVDRP connection"); //TODO store IP#???
@@ -944,7 +944,7 @@ void cSVDRP::Process(void)
   if (file.IsOpen() || file.Open(socket.Accept())) {
      if (SendGreeting) {
         //TODO how can we get the *full* hostname?
-        char buffer[MAXCMDBUFFER];
+        char buffer[BUFSIZ];
         gethostname(buffer, sizeof(buffer));
         time_t now = time(NULL);
         Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, ctime(&now));
diff --git a/svdrp.h b/svdrp.h
index 503439a4b..1c16f88b4 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.10 2001/09/01 09:24:50 kls Exp $
+ * $Id: svdrp.h 1.11 2001/09/14 14:35:34 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -26,15 +26,13 @@ class cSocket {
   int Accept(void);
   };
 
-#define MAXCMDBUFFER 1024
-
 class cSVDRP {
 private:
   cSocket socket;
   cFile file;
   CRect ovlClipRects[MAXCLIPRECTS];
   uint numChars;
-  char cmdLine[MAXCMDBUFFER];
+  char cmdLine[MAXPARSEBUFFER];
   char *message;
   time_t lastActivity;
   void Close(bool Timeout = false);
diff --git a/thread.c b/thread.c
index bfc8aab12..ec66440e0 100644
--- a/thread.c
+++ b/thread.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.11 2001/08/05 10:36:52 kls Exp $
+ * $Id: thread.c 1.12 2001/09/15 13:00:58 kls Exp $
  */
 
 #include "thread.h"
 #include <errno.h>
 #include <signal.h>
+#include <sys/resource.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include "tools.h"
@@ -235,3 +236,106 @@ bool cThreadLock::Locked(void)
   return locked;
 }
 
+// --- cPipe -----------------------------------------------------------------
+
+// cPipe::Open() and cPipe::Close() are based on code originally received from
+// Andreas Vitting <Andreas@huji.de>
+
+cPipe::cPipe(void)
+{
+  pid = -1;
+  f = NULL;
+}
+
+cPipe::~cPipe()
+{
+  Close();
+}
+
+bool cPipe::Open(const char *Command, const char *Mode)
+{
+  int fd[2];
+
+  if (pipe(fd) < 0) {
+     LOG_ERROR;
+     return false;
+     }
+  if ((pid = fork()) < 0) { // fork failed
+     LOG_ERROR;
+     close(fd[0]);
+     close(fd[1]);
+     return false;
+     }
+
+  char *mode = "w";
+  int iopipe = 0;
+
+  if (pid > 0) { // parent process
+     if (strcmp(Mode, "r") == 0) {
+        mode = "r";
+        iopipe = 1;
+        }
+     close(fd[iopipe]);
+     f = fdopen(fd[1 - iopipe], mode);
+     if ((f = fdopen(fd[1 - iopipe], mode)) == NULL) {
+        LOG_ERROR;
+        close(fd[1 - iopipe]);
+        }
+     return f != NULL;
+     }
+  else { // child process
+     int iofd = STDOUT_FILENO;
+     if (strcmp(Mode, "w") == 0) {
+        mode = "r";
+        iopipe = 1;
+        iofd = STDIN_FILENO;
+        }
+     close(fd[iopipe]);
+     if (dup2(fd[1 - iopipe], iofd) == -1) { // now redirect
+        LOG_ERROR;
+        close(fd[1 - iopipe]);
+        _exit(-1);
+        }
+     else {
+        for (int i = STDERR_FILENO + 1; i < fd[1 - iopipe]; i++)
+            close(i); //close all dup'ed filedescriptors
+        if (execl("/bin/sh", "sh", "-c", Command, NULL) == -1) {
+           LOG_ERROR_STR(Command);
+           close(fd[1 - iopipe]);
+           _exit(-1);
+           }
+        }
+     _exit(0);
+     }
+}
+
+int cPipe::Close(void)
+{
+  int ret = -1;
+
+  if (f) {
+     fclose(f);
+     f = NULL;
+     }
+
+  if (pid >= 0) {
+     int status = 0;
+     struct rusage ru;
+     int i = 5;
+     while (ret == -1 && i > 0) {
+           usleep(1000);
+           ret = wait4(pid, &status, WNOHANG, &ru);
+           i--;
+           }
+   
+     if (!i) {
+        kill(pid, SIGKILL);
+        ret = -1;
+        }
+     else if (ret == -1 || !WIFEXITED(status))
+        ret = -1;
+     pid = -1;
+     }
+
+  return ret;
+}
diff --git a/thread.h b/thread.h
index e8e796eb1..221f9ac7a 100644
--- a/thread.h
+++ b/thread.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.8 2001/08/05 10:36:47 kls Exp $
+ * $Id: thread.h 1.9 2001/09/15 12:46:52 kls Exp $
  */
 
 #ifndef __THREAD_H
 #define __THREAD_H
 
 #include <pthread.h>
+#include <stdio.h>
 #include <sys/types.h>
 
 class cMutex;
@@ -88,4 +89,19 @@ class cThreadLock {
 
 #define LOCK_THREAD cThreadLock ThreadLock(this)
 
+// cPipe implements a pipe that closes all unnecessary file descriptors in
+// the child process.
+
+class cPipe {
+private:
+  pid_t pid;
+  FILE *f;
+public:
+  cPipe(void);
+  ~cPipe();
+  operator FILE* () { return f; }
+  bool Open(const char *Command, const char *Mode);
+  int Close(void);
+  };
+
 #endif //__THREAD_H
diff --git a/tools.c b/tools.c
index f51bc85d4..d6b65e55c 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.43 2001/08/26 15:45:41 kls Exp $
+ * $Id: tools.c 1.45 2001/09/15 15:41:16 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -21,8 +21,6 @@
 #include <unistd.h>
 #include "i18n.h"
 
-#define MaxBuffer 1000
-
 int SysLogLevel = 3;
 
 ssize_t safe_read(int filedes, void *buffer, size_t size)
@@ -56,7 +54,7 @@ void writechar(int filedes, char c)
 
 char *readline(FILE *f)
 {
-  static char buffer[MaxBuffer];
+  static char buffer[MAXPARSEBUFFER];
   if (fgets(buffer, sizeof(buffer), f) > 0) {
      int l = strlen(buffer) - 1;
      if (l >= 0 && buffer[l] == '\n')
@@ -556,13 +554,27 @@ bool cSafeFile::Open(void)
   return f != NULL;
 }
 
-void cSafeFile::Close(void)
+bool cSafeFile::Close(void)
 {
+  bool result = true;
   if (f) {
-     fclose(f);
+     if (ferror(f) != 0) {
+        LOG_ERROR_STR(tempName);
+        result = false;
+        }
+     if (fclose(f) < 0) {
+        LOG_ERROR_STR(tempName);
+        result = false;
+        }
      f = NULL;
-     rename(tempName, fileName);
+     if (result && rename(tempName, fileName) < 0) {
+        LOG_ERROR_STR(fileName);
+        result = false;
+        }
      }
+  else
+     result = false;
+  return result;
 }
 
 // --- cListObject -----------------------------------------------------------
diff --git a/tools.h b/tools.h
index 2f89f3f0e..188adb458 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.31 2001/08/26 12:52:49 kls Exp $
+ * $Id: tools.h 1.34 2001/09/15 15:22:57 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -29,9 +29,16 @@ extern int SysLogLevel;
 
 #define SECSINDAY  86400
 
+#define KILOBYTE(n) ((n) * 1024)
+#define MEGABYTE(n) ((n) * 1024 * 1024)
+
+#define MAXPARSEBUFFER KILOBYTE(10)
+
 #define DELETENULL(p) (delete (p), p = NULL)
 
-template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; };
+template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
+template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
+template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);
 ssize_t safe_write(int filedes, const void *buffer, size_t size);
@@ -86,7 +93,7 @@ class cSafeFile {
   ~cSafeFile();
   operator FILE* () { return f; }
   bool Open(void);
-  void Close(void);
+  bool Close(void);
   };
 
 class cListObject {
diff --git a/vdr.c b/vdr.c
index efb5e1c38..b288108d7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.68 2001/09/01 14:50:40 kls Exp $
+ * $Id: vdr.c 1.73 2001/09/16 14:54:45 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -50,6 +50,9 @@
 
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
+#define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
+
+#define VOLUMEDELTA      5 // used to increase/decrease the volume
 
 static int Interrupted = 0;
 
@@ -328,7 +331,8 @@ int main(int argc, char *argv[])
         if (!EITScanner.Active() && cDvbApi::CurrentChannel() != LastChannel) {
            if (!Menu)
               Menu = new cDisplayChannel(cDvbApi::CurrentChannel(), LastChannel > 0);
-           PreviousChannel = LastChannel;
+           if (LastChannel > 0)
+              PreviousChannel = LastChannel;
            LastChannel = cDvbApi::CurrentChannel();
            }
         // Timers and Recordings:
@@ -348,7 +352,7 @@ int main(int argc, char *argv[])
            EITScanner.Activity();
            LastActivity = time(NULL);
            }
-        if (*Interact) {
+        if (*Interact && key != kPower) {
            switch ((*Interact)->ProcessKey(key)) {
              case osMenu:   DELETENULL(Menu);
                             Menu = new cMenuMain(ReplayControl);
@@ -390,10 +394,12 @@ int main(int argc, char *argv[])
         else {
            switch (key) {
              // Toggle channels:
-             case k0:
-                  if (PreviousChannel != cDvbApi::CurrentChannel())
-                     Channels.SwitchTo(PreviousChannel);
+             case k0: {
+                  int CurrentChannel = cDvbApi::CurrentChannel();
+                  Channels.SwitchTo(PreviousChannel);
+                  PreviousChannel = CurrentChannel;
                   break;
+                  }
              // Direct Channel Select:
              case k1 ... k9:
                   Menu = new cDisplayChannel(key);
@@ -402,17 +408,9 @@ int main(int argc, char *argv[])
              case kLeft|k_Repeat:
              case kLeft:
              case kRight|k_Repeat:
-             case kRight: {
-                  int SaveGroup = CurrentGroup;
-                  if (NORMALKEY(key) == kRight)
-                     CurrentGroup = Channels.GetNextGroup(CurrentGroup) ;
-                  else
-                     CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
-                  if (CurrentGroup < 0)
-                     CurrentGroup = SaveGroup;
-                  Menu = new cDisplayChannel(CurrentGroup, false, true);
+             case kRight:
+                  Menu = new cDisplayChannel(NORMALKEY(key));
                   break;
-                  }
              // Up/Down Channel Select:
              case kUp|k_Repeat:
              case kUp:
@@ -428,8 +426,19 @@ int main(int argc, char *argv[])
              case kMenu: Menu = new cMenuMain(ReplayControl); break;
              // Viewing Control:
              case kOk:   LastChannel = -1; break; // forces channel display
+             // Volume Control:
+             case kVolUp|k_Repeat:
+             case kVolUp:
+             case kVolDn|k_Repeat:
+             case kVolDn:
+                  cDvbApi::PrimaryDvbApi->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
+                  break;
+             case kMute:
+                  cDvbApi::PrimaryDvbApi->ToggleMute();
+                  break;
              // Power off:
              case kPower: isyslog(LOG_INFO, "Power button pressed");
+                          DELETENULL(*Interact);
                           if (!Shutdown) {
                              Interface->Error(tr("Can't shutdown - option '-s' not given!"));
                              break;
@@ -451,20 +460,24 @@ int main(int argc, char *argv[])
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
-              if (Shutdown && (Setup.MinUserInactivity && Now - LastActivity > Setup.MinUserInactivity * 60 || ForceShutdown)) {
-                 ForceShutdown = false;
+              if (Shutdown && Setup.MinUserInactivity && Now - LastActivity > Setup.MinUserInactivity * 60) {
                  cTimer *timer = Timers.GetNextActiveTimer();
                  time_t Next  = timer ? timer->StartTime() : 0;
                  time_t Delta = timer ? Next - Now : 0;
-                 if (timer)
-                    dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next));
-                 if (!Next || Delta > Setup.MinEventTimeout * 60) {
-                    if (!LastActivity) {
+                 if (!LastActivity) {
+                    if (!timer || Delta > MANUALSTART) {
                        // Apparently the user started VDR manually
                        dsyslog(LOG_INFO, "assuming manual start of VDR");
                        LastActivity = Now;
-                       continue; // skip the rest of the housekeeping for now
+                       continue; // don't run into the actual shutdown procedure below
                        }
+                    else
+                       LastActivity = 1;
+                    }
+                 if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
+                    ForceShutdown = false;
+                    if (timer)
+                       dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next));
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), LastActivity == 1 ? 5 : SHUTDOWNWAIT, true)) {

From 66bab90b60048a46e401ea506d3aa65c43779700 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Sep 2001 18:00:00 +0200
Subject: [PATCH 026/307] Version 0.96 - Made VDR compile with libdvdread-0.9.1
 (thanks to Andreas Schultz).   Note that you now _need_ version 0.9.1 of
 libdvdread to compile VDR with   DVD support! - Several fixes to the replay
 mode display (thanks to Stefan Huelswitt):   no more replay mode display when
 pressing the "Green" or "Yellow" button   (Skip +/-60s); fixed timeout when
 pressing '0' to set an editing mark while   the progress display is not
 shown; mode display is shown after progress   display is closed; pressing
 "Ok" while the mode display is on brings up   the progress display; no more
 unnecessary display of "normal play mode". - Supplying the new frontend
 parameter 'Inversion' (currently it is always   set to INVERSION_AUTO, which
 should work with all channels on Astra). - Removing unnecessary double quotes
 from EPG Subtitle in EPGBugfixLevel >=1. - EPG info is now updated if the
 contents changes but the ID remains the same. - Fixed handling SVDRP commands
 whith more than one blank between the command   word and the options. - The
 current volume setting is now saved to setup.conf and restored at the   next
 program start. - New command line option '-r' to define a command that gets
 called before and   after each recording (see INSTALL for details). -
 Implemented a check to see whether the system time is running linearly. -
 Writing the current time (as seen by VDR) into the log file when starting   a
 timer recording (this may help debugging cases where timers don't start   at
 the expected time). - Made the volume, mute and power keys work when a menu
 is active, too (thanks   to Matthias Weingart).

---
 CONTRIBUTORS |   3 +
 FORMATS      |   2 +-
 HISTORY      |  28 +++++++
 INSTALL      |  57 ++++++++++++-
 config.c     |   5 +-
 config.h     |   5 +-
 dvbapi.c     |  23 ++++--
 dvbapi.h     |   5 +-
 eit.c        | 105 ++++++++++--------------
 eit.h        |   8 +-
 menu.c       |  36 ++++++---
 menu.h       |   3 +-
 recording.c  |  16 +++-
 recording.h  |  14 +++-
 svdrp.c      |   3 +-
 thread.c     |  11 ++-
 tools.c      |  15 +++-
 tools.h      |   3 +-
 vdr.c        | 220 ++++++++++++++++++++++++++++-----------------------
 19 files changed, 358 insertions(+), 204 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9090ca9f3..f1157b1f7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -139,3 +139,6 @@ Rolf Hakenes <hakenes@hippomi.de>
 Andreas Vitting <Andreas@huji.de>
  for providing code that closes all unused file descriptors in the child
  process of a pipe (used in cPipe)
+
+Matthias Weingart <matthias@pentax.boerde.de>
+ for fixing handling of the volume, mute and power keys when menus are active
diff --git a/FORMATS b/FORMATS
index 3c5d36d43..9142fd70d 100644
--- a/FORMATS
+++ b/FORMATS
@@ -102,7 +102,7 @@ Video Disk Recorder File Formats
   Examples:
 
    1 Check for new mail: /usr/local/bin/checkmail 2>&1
-   2 CPU status        : /usr/loval/bin/cpustatus 2>&1
+   2 CPU status        : /usr/local/bin/cpustatus 2>&1
    3 Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
 
   If the first non-blank character of the 'title' is a digit in the range
diff --git a/HISTORY b/HISTORY
index 4b68aebca..143c2f45b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -758,3 +758,31 @@ Video Disk Recorder Revision History
 - Three new keys ("Volume+", Volume-" and "Mute") to control the DVB card's
   audio output volume.
 - New version of the 'epg2timers' tool (thanks to Carsten Koch).
+
+2001-09-23: Version 0.96
+
+- Made VDR compile with libdvdread-0.9.1 (thanks to Andreas Schultz).
+  Note that you now _need_ version 0.9.1 of libdvdread to compile VDR with
+  DVD support!
+- Several fixes to the replay mode display (thanks to Stefan Huelswitt):
+  no more replay mode display when pressing the "Green" or "Yellow" button
+  (Skip +/-60s); fixed timeout when pressing '0' to set an editing mark while
+  the progress display is not shown; mode display is shown after progress
+  display is closed; pressing "Ok" while the mode display is on brings up
+  the progress display; no more unnecessary display of "normal play mode".
+- Supplying the new frontend parameter 'Inversion' (currently it is always
+  set to INVERSION_AUTO, which should work with all channels on Astra).
+- Removing unnecessary double quotes from EPG Subtitle in EPGBugfixLevel >=1.
+- EPG info is now updated if the contents changes but the ID remains the same.
+- Fixed handling SVDRP commands whith more than one blank between the command
+  word and the options.
+- The current volume setting is now saved to setup.conf and restored at the
+  next program start.
+- New command line option '-r' to define a command that gets called before and
+  after each recording (see INSTALL for details).
+- Implemented a check to see whether the system time is running linearly.
+- Writing the current time (as seen by VDR) into the log file when starting
+  a timer recording (this may help debugging cases where timers don't start
+  at the expected time).
+- Made the volume, mute and power keys work when a menu is active, too (thanks
+  to Matthias Weingart).
diff --git a/INSTALL b/INSTALL
index 56200e86e..b942603ec 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,12 @@ You can find 'libdvdread' at
 
   http://www.dtek.chalmers.se/groups/dvd/downloads.html
 
-VDR requires the card driver version dated 2001-09-14 or higher
+If you want to replay CSS encrypted DVDs you also need to get the 'libdvdcss'
+library from
+
+  http://www.videolan.org/libdvdcss/download.html
+
+VDR requires the Linux-DVB card driver version dated 2001-09-14 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
@@ -112,10 +117,11 @@ for programming some sort of hardware device that makes sure the computer
 will be restarted in time before the next timer event. Your program must
 also initiate the actual shutdown procedure of the computer. After this
 your program should return to VDR. VDR will not automatically exit after
-calling the shutdown program, but will rather continue normally untit it
+calling the shutdown program, but will rather continue normally until it
 receives a SIGTERM when the computer is actually shut down. So in case
 the shutdown fails, or the shutdown program for some reason decides not to
-perform a shutdown, VDR will stay up and running.
+perform a shutdown, VDR will stay up and running and will call the shutdown
+program again after another MinUserInactivity minutes.
 
 If there are currently no timers active, both parameters will be '0'.
 In that case the program shall not set the hardware for automatic restart
@@ -152,6 +158,49 @@ particular hard- and software environment.
 If the '-s' option is present, the VDR machine can be turned off by pressing
 the "Power" key on the remote control.
 
+Executing commands before and after a recording:
+------------------------------------------------
+
+You can use the '-r' option to define a program or script that gets called
+before and after a recording is performed, and after an editing process
+has finished.
+
+The program will be called with two string parameters. The first parameter
+is one of
+
+  before      if this is *before* a recording starts
+  after       if this is *after* a recording has finished
+  edited      if this is after a recording has been *edited*
+
+and the second parameter contains the full name of the recording's
+directory (which may not yet exists at that moment in the "before" case).
+In the "edited" case it will be the name of the edited version.
+
+Within this program you can do anything you would like to do before and/or
+after a recording or after an editing process. However, the program must return
+as soon as possible, because otherwise it will block further execution of VDR.
+Be especially careful to make sure the program returns before the watchdog
+timeout you may have set up with the '-w' option! If the operation you want to
+perform will take longer, you will have to run it as a background job.
+
+An example script for use with the '-r' option could look like this:
+
+#!/bin/sh
+case "$1" in
+     before)
+            echo "Before recording $2"
+            ;;
+     after)
+            echo "After recording $2"
+            ;;
+     edited)
+            echo "Edited recording $2"
+            ;;
+     *)
+            echo "ERROR: unknown state: $1"
+            ;;
+     esac
+
 Command line options:
 ---------------------
 
@@ -177,7 +226,7 @@ You can use the '-V' option to overwrite this, as in
 
 Note that the user id under which VDR runs needs to have write access to
 the DVD device in order to replay CSS protected DVDs (which also requires
-the presence of the 'libcss' library).
+the presence of the 'libdvdcss' library).
 
 The video data directory:
 -------------------------
diff --git a/config.c b/config.c
index 87e833235..4df73614d 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.72 2001/09/16 14:54:32 kls Exp $
+ * $Id: config.c 1.73 2001/09/22 13:36:59 kls Exp $
  */
 
 #include "config.h"
@@ -808,6 +808,7 @@ cSetup::cSetup(void)
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
   CurrentChannel = -1;
+  CurrentVolume = MAXVOLUME;
 }
 
 bool cSetup::Parse(char *s)
@@ -847,6 +848,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
      else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
      else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
+     else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
      else
         return false;
      return true;
@@ -921,6 +923,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MultiSpeedMode     = %d\n", MultiSpeedMode);
         fprintf(f, "ShowReplayMode     = %d\n", ShowReplayMode);
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
+        fprintf(f, "CurrentVolume      = %d\n", CurrentVolume);
         if (f.Close()) {
            isyslog(LOG_INFO, "saved setup to %s", FileName);
            return true;
diff --git a/config.h b/config.h
index 194d04e2b..8012cd26c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.79 2001/09/16 14:54:36 kls Exp $
+ * $Id: config.h 1.81 2001/09/22 13:37:05 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.95"
+#define VDRVERSION "0.96"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -302,6 +302,7 @@ class cSetup {
   int MultiSpeedMode;
   int ShowReplayMode;
   int CurrentChannel;
+  int CurrentVolume;
   cSetup(void);
   bool Load(const char *FileName);
   bool Save(const char *FileName = NULL);
diff --git a/dvbapi.c b/dvbapi.c
index 16b3e3084..8a6e69152 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.125 2001/09/16 13:55:03 kls Exp $
+ * $Id: dvbapi.c 1.129 2001/09/23 13:44:27 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -1670,7 +1670,7 @@ void cDVDplayBuffer::Input(void)
                  /**
                   * Parse the contained dsi packet.
                   */
-                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]), sizeof(dsi_t));
+                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]));
                  if (cur_pack != dsi_pack.dsi_gi.nv_pck_lbn) {
                     esyslog(LOG_ERR, "ERROR: cur_pack != dsi_pack.dsi_gi.nv_pck_lbn");
                     return;
@@ -1748,7 +1748,7 @@ void cDVDplayBuffer::Input(void)
                  dsyslog(LOG_INFO, "DVD: read pack: %d", cur_pack);
 #endif
                  int len = DVDReadBlocks(title, cur_pack, cur_output_size, data);
-                 if (len != (int)cur_output_size * DVD_VIDEO_LB_LEN) {
+                 if (len != (int)cur_output_size) {
                     esyslog(LOG_ERR, "ERROR: read failed for %d blocks at %d", cur_output_size, cur_pack);
                     doplay = false;
                     break;
@@ -2406,16 +2406,18 @@ void cCuttingBuffer::Action(void)
 
 // --- cVideoCutter ----------------------------------------------------------
 
+char *cVideoCutter::editedVersionName = NULL;
 cCuttingBuffer *cVideoCutter::cuttingBuffer = NULL;
 
 bool cVideoCutter::Start(const char *FileName)
 {
   if (!cuttingBuffer) {
      cRecording Recording(FileName);
-     const char *EditedVersionName = Recording.PrefixFileName('%');
-     if (EditedVersionName && RemoveVideoFile(EditedVersionName) && MakeDirs(EditedVersionName, true)) {
+     const char *evn = Recording.PrefixFileName('%');
+     if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
+        editedVersionName = strdup(evn);
         Recording.WriteSummary();
-        cuttingBuffer = new cCuttingBuffer(FileName, EditedVersionName);
+        cuttingBuffer = new cCuttingBuffer(FileName, editedVersionName);
         return true;
         }
      }
@@ -2434,6 +2436,9 @@ bool cVideoCutter::Active(void)
      if (cuttingBuffer->Active())
         return true;
      Stop();
+     cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
+     delete editedVersionName;
+     editedVersionName = NULL;
      }
   return false;
 }
@@ -2540,7 +2545,7 @@ cDvbApi::cDvbApi(int n)
 #endif
   currentChannel = 1;
   mute = false;
-  volume = 255;
+  volume = MAXVOLUME;
 }
 
 cDvbApi::~cDvbApi()
@@ -3252,6 +3257,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
 
         FrontendParameters Frontend;
         Frontend.Frequency = freq * 1000UL;
+        Frontend.Inversion = INVERSION_AUTO;
         Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
         Frontend.u.qpsk.FEC_inner = FEC_AUTO;
 
@@ -3298,6 +3304,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
 
         FrontendParameters Frontend;
         Frontend.Frequency = FrequencyMHz * 1000000UL;
+        Frontend.Inversion = INVERSION_AUTO;
         Frontend.u.qam.SymbolRate = Srate * 1000UL;
         Frontend.u.qam.FEC_inner = FEC_AUTO;
         Frontend.u.qam.QAM = QAM_64;
@@ -3635,7 +3642,7 @@ void cDvbApi::ToggleMute(void)
 void cDvbApi::SetVolume(int Volume, bool Absolute)
 {
   if (fd_audio >= 0) {
-     volume = min(max(Absolute ? Volume : volume + Volume, 0), 255);
+     volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
      audioMixer_t am;
      am.volume_left = am.volume_right = volume;
      CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
diff --git a/dvbapi.h b/dvbapi.h
index d0a68e795..8e67f9b4b 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.51 2001/09/16 13:54:23 kls Exp $
+ * $Id: dvbapi.h 1.53 2001/09/23 11:01:46 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -51,6 +51,8 @@ typedef struct CRect {
 #define MAXVIDEOFILESIZE 2000 // MB
 #define MINVIDEOFILESIZE  100 // MB
 
+#define MAXVOLUME 255
+
 const char *IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
 int HMSFToIndex(const char *HMSF);
@@ -71,6 +73,7 @@ class cCuttingBuffer;
 
 class cVideoCutter {
 private:
+  static char *editedVersionName;
   static cCuttingBuffer *cuttingBuffer;
 public:
   static bool Start(const char *FileName);
diff --git a/eit.c b/eit.c
index d2927ccc0..1fceeef1e 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.22 2001/08/19 14:44:32 kls Exp $
+ * $Id: eit.c 1.24 2001/09/22 13:07:21 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -279,59 +279,19 @@ unsigned short cEventInfo::GetEventID() const
    return uEventID;
 }
 /**  */
-bool cEventInfo::SetTitle(const char *string)
+void cEventInfo::SetTitle(const char *string)
 {
-   if (string == NULL)
-      return false;
-
-   pTitle = strdup(string);
-   if (pTitle == NULL)
-      return false;
-
-   return true;
+   pTitle = strcpyrealloc(pTitle, string);
 }
 /**  */
-bool cEventInfo::SetSubtitle(const char *string)
+void cEventInfo::SetSubtitle(const char *string)
 {
-   if (string == NULL)
-      return false;
-
-   pSubtitle = strdup(string);
-   if (pSubtitle == NULL)
-      return false;
-
-   return true;
+   pSubtitle = strcpyrealloc(pSubtitle, string);
 }
 /**  */
-bool cEventInfo::AddExtendedDescription(const char *string)
+void cEventInfo::SetExtendedDescription(const char *string)
 {
-   int size = 0;
-   bool first = true;
-   char *p;
-
-   if (string == NULL)
-      return false;
-
-   if (pExtendedDescription)
-   {
-      first = false;
-      size += strlen(pExtendedDescription);
-   }
-
-   size += (strlen(string) + 1);
-
-   p = (char *)realloc(pExtendedDescription, size);
-   if (p == NULL)
-      return false;
-
-   if (first)
-      *p = 0;
-
-   strcat(p, string);
-
-   pExtendedDescription = p;
-
-   return true;
+   pExtendedDescription = strcpyrealloc(pExtendedDescription, string);
 }
 /**  */
 void cEventInfo::SetTime(time_t t)
@@ -447,6 +407,22 @@ void cEventInfo::FixEpgBugs(void)
         pSubtitle = NULL;
         }
 
+     // ZDF.info puts the Subtitle between double quotes, which is nothing
+     // but annoying (some even put a '.' after the closing '"'):
+     //
+     // Title
+     // "Subtitle"[.]
+     //
+     if (pSubtitle && *pSubtitle == '"') {
+        int l = strlen(pSubtitle);
+        if (l > 2 && (pSubtitle[l - 1] == '"' || (pSubtitle[l - 1] == '.' && pSubtitle[l - 2] == '"'))) {
+           memmove(pSubtitle, pSubtitle + 1, l);
+           char *p = strrchr(pSubtitle, '"');
+           if (p)
+              *p = 0;
+           }
+        }
+
      if (Setup.EPGBugfixLevel <= 1)
         return;
 
@@ -767,28 +743,29 @@ int cEIT::ProcessEIT(unsigned char *buffer)
              }
           pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
           if (!pEvent) {
+             // If we don't have that event ID yet, we create a new one.
+             // Otherwise we copy the information into the existing event anyway, because the data might have changed.
              pSchedule->Events.Add(new cEventInfo(VdrProgramInfo->ServiceID, VdrProgramInfo->EventID));
              pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
              if (!pEvent)
                 break;
-             if (rEvent) {
-                pEvent->SetTitle(rEvent->GetTitle());
-                pEvent->SetSubtitle(rEvent->GetSubtitle());
-                pEvent->SetTime(VdrProgramInfo->StartTime);
-                pEvent->SetDuration(VdrProgramInfo->Duration);
-                pEvent->AddExtendedDescription(rEvent->GetExtendedDescription());
-                pEvent->FixEpgBugs();
-                }
-             else {
-                pEvent->SetTitle(VdrProgramInfo->ShortName);
-                pEvent->SetSubtitle(VdrProgramInfo->ShortText);
-                pEvent->SetTime(VdrProgramInfo->StartTime);
-                pEvent->SetDuration(VdrProgramInfo->Duration);
-                pEvent->AddExtendedDescription(VdrProgramInfo->ExtendedName);
-                pEvent->AddExtendedDescription(VdrProgramInfo->ExtendedText);
-                pEvent->FixEpgBugs();
-                }
              }
+          if (rEvent) {
+             pEvent->SetTitle(rEvent->GetTitle());
+             pEvent->SetSubtitle(rEvent->GetSubtitle());
+             pEvent->SetExtendedDescription(rEvent->GetExtendedDescription());
+             }
+          else {
+             pEvent->SetTitle(VdrProgramInfo->ShortName);
+             pEvent->SetSubtitle(VdrProgramInfo->ShortText);
+             pEvent->SetExtendedDescription(VdrProgramInfo->ExtendedName);
+             //XXX kls 2001-09-22:
+             //XXX apparently this never occurred, so I have simpified ExtendedDescription handling
+             //XXX pEvent->AddExtendedDescription(VdrProgramInfo->ExtendedText);
+             }
+          pEvent->SetTime(VdrProgramInfo->StartTime);
+          pEvent->SetDuration(VdrProgramInfo->Duration);
+          pEvent->FixEpgBugs();
           if (IsPresentFollowing()) {
              if ((GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_PAUSING) || (GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_RUNNING))
                 pSchedule->SetPresentEvent(pEvent);
diff --git a/eit.h b/eit.h
index 8ca5f1e53..91d5b2b38 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.10 2001/08/15 15:47:31 kls Exp $
+ * $Id: eit.h 1.11 2001/09/22 11:43:21 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -42,13 +42,13 @@ class cEventInfo : public cListObject {
 protected:
   void SetFollowing(bool foll);
   void SetPresent(bool pres);
-  bool SetTitle(const char *string);
+  void SetTitle(const char *string);
   void SetServiceID(unsigned short servid);
   void SetEventID(unsigned short evid);
   void SetDuration(long l);
   void SetTime(time_t t);
-  bool AddExtendedDescription(const char *string);
-  bool SetSubtitle(const char *string);
+  void SetExtendedDescription(const char *string);
+  void SetSubtitle(const char *string);
   cEventInfo(unsigned short serviceid, unsigned short eventid);
 public:
   ~cEventInfo();
diff --git a/menu.c b/menu.c
index 98fd30235..23b16e294 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.120 2001/09/15 10:36:31 kls Exp $
+ * $Id: menu.c 1.127 2001/09/23 10:58:48 kls Exp $
  */
 
 #include "menu.h"
@@ -2108,6 +2108,7 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
 {
   eventInfo = NULL;
   instantId = NULL;
+  fileName = NULL;
   dvbApi = DvbApi;
   if (!dvbApi) dvbApi = cDvbApi::PrimaryDvbApi;//XXX
   timer = Timer;
@@ -2128,7 +2129,9 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
         Summary = eventInfo->GetExtendedDescription();
         }
      cRecording Recording(timer, Subtitle, Summary);
-     if (dvbApi->StartRecord(Recording.FileName(), Channels.GetByNumber(timer->channel)->ca, timer->priority))
+     fileName = strdup(Recording.FileName());
+     cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
+     if (dvbApi->StartRecord(fileName, Channels.GetByNumber(timer->channel)->ca, timer->priority))
         Recording.WriteSummary();
      Interface->DisplayRecording(dvbApi->CardIndex(), true);
      }
@@ -2140,6 +2143,7 @@ cRecordControl::~cRecordControl()
 {
   Stop(true);
   delete instantId;
+  delete fileName;
 }
 
 bool cRecordControl::GetEventInfo(void)
@@ -2184,6 +2188,7 @@ void cRecordControl::Stop(bool KeepInstant)
         }
      timer = NULL;
      Interface->DisplayRecording(dvbApi->CardIndex(), false);
+     cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
      }
 }
 
@@ -2386,10 +2391,11 @@ void cReplayControl::ClearLastReplayed(const char *FileName)
 
 void cReplayControl::Show(int Seconds)
 {
+  if (modeOnly)
+     Hide();
   if (!visible) {
      shown = ShowProgress(true);
-     if (shown && Seconds > 0)
-        timeoutShow = time(NULL) + Seconds;
+     timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0;
      }
 }
 
@@ -2397,7 +2403,11 @@ void cReplayControl::Hide(void)
 {
   if (visible) {
      Interface->Close();
-     needsFastResponse = visible = modeOnly = false;
+     needsFastResponse = visible = false;
+     if (!modeOnly)
+        ShowMode();
+     else
+        modeOnly = false;
      }
 }
 
@@ -2419,15 +2429,19 @@ void cReplayControl::ShowMode(void)
      bool Play, Forward;
      int Speed;
      if (dvbApi->GetReplayMode(Play, Forward, Speed)) {
+        bool NormalPlay = (Play && Speed == -1);
 
         if (!visible) {
+           if (NormalPlay)
+              return; // no need to do indicate ">" unless there was a different mode displayed before
            // open small display
            Interface->Open(9, -1);
            Interface->Clear();
            visible = modeOnly = true;
            }
 
-        timeoutShow = (modeOnly && !timeoutShow && Speed == -1 && Play) ? time(NULL) + MODETIMEOUT : 0;
+        if (modeOnly && !timeoutShow && NormalPlay)
+           timeoutShow = time(NULL) + MODETIMEOUT;
         const char *Mode;
         if (Speed == -1) Mode = Play    ? "  >  " : " ||  ";
         else if (Play)   Mode = Forward ? " X>> " : " <<X ";
@@ -2696,9 +2710,9 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     case kRight:   dvbApi->Forward(); break;
     case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
-    case kGreen:   dvbApi->SkipSeconds(-60); break;
+    case kGreen:   dvbApi->SkipSeconds(-60); DoShowMode = false; break;
     case kYellow|k_Repeat:
-    case kYellow:  dvbApi->SkipSeconds(60); break;
+    case kYellow:  dvbApi->SkipSeconds( 60); DoShowMode = false; break;
     case kBlue:    Hide();
                    dvbApi->StopReplay();
                    return osEnd;
@@ -2721,7 +2735,11 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
           switch (Key) {
             // Menu control:
             case kMenu:    Hide(); return osMenu; // allow direct switching to menu
-            case kOk:      visible ? Hide() : Show(); break;
+            case kOk:      if (visible && !modeOnly)
+                              Hide();
+                           else
+                              Show();
+                           break;
             case kBack:    return osRecordings;
             default:       return osUnknown;
             }
diff --git a/menu.h b/menu.h
index bb31c72a6..f7411c61c 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.28 2001/09/14 15:09:49 kls Exp $
+ * $Id: menu.h 1.30 2001/09/23 10:57:33 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -75,6 +75,7 @@ class cRecordControl {
   cTimer *timer;
   const cEventInfo *eventInfo;
   char *instantId;
+  char *fileName;
   bool GetEventInfo(void);
 public:
   cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
diff --git a/recording.c b/recording.c
index f65737812..df5040740 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.36 2001/09/02 15:09:28 kls Exp $
+ * $Id: recording.c 1.37 2001/09/23 13:43:29 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -513,3 +513,17 @@ cMark *cMarks::GetNext(int Position)
   return NULL;
 }
 
+// --- cRecordingUserCommand -------------------------------------------------
+
+const char *cRecordingUserCommand::command = NULL;
+
+void cRecordingUserCommand::InvokeCommand(const char *State, const char *RecordingFileName)
+{
+  if (command) {
+     char *cmd;
+     asprintf(&cmd, "%s %s '%s'", command, State, RecordingFileName);
+     isyslog(LOG_INFO, "executing '%s'", cmd);
+     system(cmd);
+     delete cmd;
+     }
+}
diff --git a/recording.h b/recording.h
index e1af3db3c..d2391a907 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.16 2001/09/02 11:35:56 kls Exp $
+ * $Id: recording.h 1.17 2001/09/23 13:43:58 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -83,4 +83,16 @@ class cMarks : public cConfig<cMark> {
   cMark *GetNext(int Position);
   };
 
+#define RUC_BEFORERECORDING "before"
+#define RUC_AFTERRECORDING  "after"
+#define RUC_EDITEDRECORDING "edited"
+
+class cRecordingUserCommand {
+private:
+  static const char *command;
+public:
+  static void SetCommand(const char *Command) { command = Command; }
+  static void InvokeCommand(const char *State, const char *RecordingFileName);
+  };
+
 #endif //__RECORDING_H
diff --git a/svdrp.c b/svdrp.c
index d1833612f..3c90bb02d 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.23 2001/09/14 14:31:22 kls Exp $
+ * $Id: svdrp.c 1.24 2001/09/22 13:30:02 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -909,6 +909,7 @@ void cSVDRP::Execute(char *Cmd)
         s++;
   if (*s)
      *s++ = 0;
+  s = skipspace(s);
   if      (CMD("CHAN"))  CmdCHAN(s);
   else if (CMD("DELC"))  CmdDELC(s);
   else if (CMD("DELT"))  CmdDELT(s);
diff --git a/thread.c b/thread.c
index ec66440e0..f4ba76a19 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.12 2001/09/15 13:00:58 kls Exp $
+ * $Id: thread.c 1.13 2001/09/23 14:04:35 kls Exp $
  */
 
 #include "thread.h"
@@ -67,16 +67,19 @@ cMutex::~cMutex()
 
 void cMutex::Lock(void)
 {
-  if (getpid() != lockingPid || !locked)
+  if (getpid() != lockingPid || !locked) {
      pthread_mutex_lock(&mutex);
-  lockingPid = getpid();
+     lockingPid = getpid();
+     }
   locked++;
 }
 
 void cMutex::Unlock(void)
 {
- if (!--locked)
+ if (!--locked) {
+    lockingPid = 0;
     pthread_mutex_unlock(&mutex);
+    }
 }
 
 // --- cThread ---------------------------------------------------------------
diff --git a/tools.c b/tools.c
index d6b65e55c..7238137ef 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.45 2001/09/15 15:41:16 kls Exp $
+ * $Id: tools.c 1.46 2001/09/22 12:13:40 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -64,6 +64,19 @@ char *readline(FILE *f)
   return NULL;
 }
 
+char *strcpyrealloc(char *dest, const char *src)
+{
+  if (src) {
+     int l = max(dest ? strlen(dest) : 0, strlen(src)) + 1; // don't let the block get smaller!
+     dest = (char *)realloc(dest, l);
+     if (dest)
+        strcpy(dest, src);
+     else
+        esyslog(LOG_ERR, "ERROR: out of memory");
+     }
+  return dest;
+}
+
 char *strn0cpy(char *dest, const char *src, size_t n)
 {
   char *s = dest;
diff --git a/tools.h b/tools.h
index 188adb458..cc67a8067 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.34 2001/09/15 15:22:57 kls Exp $
+ * $Id: tools.h 1.35 2001/09/22 12:12:55 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -44,6 +44,7 @@ ssize_t safe_read(int filedes, void *buffer, size_t size);
 ssize_t safe_write(int filedes, const void *buffer, size_t size);
 void writechar(int filedes, char c);
 char *readline(FILE *f);
+char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
 char *skipspace(const char *s);
diff --git a/vdr.c b/vdr.c
index b288108d7..d7c3f06e7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.73 2001/09/16 14:54:45 kls Exp $
+ * $Id: vdr.c 1.79 2001/09/23 14:33:39 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -96,6 +96,7 @@ int main(int argc, char *argv[])
       { "help",     no_argument,       NULL, 'h' },
       { "log",      required_argument, NULL, 'l' },
       { "port",     required_argument, NULL, 'p' },
+      { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
       { "video",    required_argument, NULL, 'v' },
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:s:t:v:V:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:r:s:t:v:V:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -143,6 +144,7 @@ int main(int argc, char *argv[])
                            "                           2 = errors and info, 3 = errors, info and debug\n"
                            "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                            "                           0 turns off SVDRP\n"
+                           "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                            "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
@@ -180,6 +182,8 @@ int main(int argc, char *argv[])
                        return 2;
                        }
                     break;
+          case 'r': cRecordingUserCommand::SetCommand(optarg);
+                    break;
           case 's': Shutdown = optarg;
                     break;
           case 't': Terminal = optarg;
@@ -278,6 +282,7 @@ int main(int argc, char *argv[])
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
   Channels.SwitchTo(Setup.CurrentChannel);
+  cDvbApi::PrimaryDvbApi->SetVolume(Setup.CurrentVolume, true);
 
   cEITScanner EITScanner;
 
@@ -305,6 +310,7 @@ int main(int argc, char *argv[])
   int LastChannel = -1;
   int PreviousChannel = cDvbApi::CurrentChannel();
   time_t LastActivity = 0;
+  time_t LinearTime = time(NULL);
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
 
@@ -314,6 +320,14 @@ int main(int argc, char *argv[])
      }
 
   while (!Interrupted) {
+        // Test if we are running in the Einstein continuum:
+        time_t Now = time(NULL);
+        time_t LinearDelta = Now - LinearTime;
+        if (LinearDelta) {
+           if (LinearDelta < 0 || LinearDelta > 300) // assuming nothing will block for more than 5 minutes
+              esyslog(LOG_ERR, "ERROR: time warp detected (%d seconds)", LinearDelta);
+           LinearTime = Now;
+           }
         // Handle emergency exits:
         if (cThread::EmergencyExit()) {
            esyslog(LOG_ERR, "emergency exit requested - shutting down");
@@ -341,6 +355,7 @@ int main(int argc, char *argv[])
            cRecordControls::Process(Now);
            cTimer *Timer = Timers.GetMatch(Now);
            if (Timer) {
+              dsyslog(LOG_INFO, "system time seen is %s", ctime(&Now));
               if (!cRecordControls::Start(Timer))
                  Timer->SetPending(true);
               }
@@ -352,106 +367,111 @@ int main(int argc, char *argv[])
            EITScanner.Activity();
            LastActivity = time(NULL);
            }
-        if (*Interact && key != kPower) {
-           switch ((*Interact)->ProcessKey(key)) {
-             case osMenu:   DELETENULL(Menu);
-                            Menu = new cMenuMain(ReplayControl);
-                            break;
-             case osRecord: DELETENULL(Menu);
-                            if (!cRecordControls::Start())
-                               Interface->Error(tr("No free DVB device to record!"));
-                            break;
-             case osRecordings:
-                            DELETENULL(Menu);
-                            DELETENULL(ReplayControl);
-                            Menu = new cMenuRecordings;
-                            break;
-             case osReplay: DELETENULL(Menu);
-                            DELETENULL(ReplayControl);
-                            ReplayControl = new cReplayControl;
-                            break;
+        // Keys that must work independent of any interactive mode:
+        switch (key) {
+          // Volume Control:
+          case kVolUp|k_Repeat:
+          case kVolUp:
+          case kVolDn|k_Repeat:
+          case kVolDn:
+               cDvbApi::PrimaryDvbApi->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
+               break;
+          case kMute:
+               cDvbApi::PrimaryDvbApi->ToggleMute();
+               break;
+          // Power off:
+          case kPower: isyslog(LOG_INFO, "Power button pressed");
+                       DELETENULL(*Interact);
+                       if (!Shutdown) {
+                          Interface->Error(tr("Can't shutdown - option '-s' not given!"));
+                          break;
+                          }
+                       if (cRecordControls::Active()) {
+                          if (Interface->Confirm(tr("Recording - shut down anyway?")))
+                             ForceShutdown = true;
+                          }
+                       LastActivity = 1; // not 0, see below!
+                       break;
+          default:
+            if (*Interact) {
+               switch ((*Interact)->ProcessKey(key)) {
+                 case osMenu:   DELETENULL(Menu);
+                                Menu = new cMenuMain(ReplayControl);
+                                break;
+                 case osRecord: DELETENULL(Menu);
+                                if (!cRecordControls::Start())
+                                   Interface->Error(tr("No free DVB device to record!"));
+                                break;
+                 case osRecordings:
+                                DELETENULL(Menu);
+                                DELETENULL(ReplayControl);
+                                Menu = new cMenuRecordings;
+                                break;
+                 case osReplay: DELETENULL(Menu);
+                                DELETENULL(ReplayControl);
+                                ReplayControl = new cReplayControl;
+                                break;
 #ifdef DVDSUPPORT
-             case osDVD:    DELETENULL(Menu);
-                            DELETENULL(ReplayControl);
-                            Menu = new cMenuDVD;
-                            break;
+                 case osDVD:    DELETENULL(Menu);
+                                DELETENULL(ReplayControl);
+                                Menu = new cMenuDVD;
+                                break;
 #endif //DVDSUPPORT
-             case osStopReplay:
-                            DELETENULL(*Interact);
-                            DELETENULL(ReplayControl);
-                            break;
-             case osSwitchDvb:
-                            DELETENULL(*Interact);
-                            Interface->Info(tr("Switching primary DVB..."));
-                            cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
-                            break;
-             case osBack:
-             case osEnd:    DELETENULL(*Interact);
-                            break;
-             default:       ;
-             }
-           }
-        else {
-           switch (key) {
-             // Toggle channels:
-             case k0: {
-                  int CurrentChannel = cDvbApi::CurrentChannel();
-                  Channels.SwitchTo(PreviousChannel);
-                  PreviousChannel = CurrentChannel;
-                  break;
-                  }
-             // Direct Channel Select:
-             case k1 ... k9:
-                  Menu = new cDisplayChannel(key);
-                  break;
-             // Left/Right rotates trough channel groups:
-             case kLeft|k_Repeat:
-             case kLeft:
-             case kRight|k_Repeat:
-             case kRight:
-                  Menu = new cDisplayChannel(NORMALKEY(key));
-                  break;
-             // Up/Down Channel Select:
-             case kUp|k_Repeat:
-             case kUp:
-             case kDown|k_Repeat:
-             case kDown: {
-                  int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
-                  cChannel *channel = Channels.GetByNumber(n);
-                  if (channel)
-                     channel->Switch();
-                  break;
-                  }
-             // Menu Control:
-             case kMenu: Menu = new cMenuMain(ReplayControl); break;
-             // Viewing Control:
-             case kOk:   LastChannel = -1; break; // forces channel display
-             // Volume Control:
-             case kVolUp|k_Repeat:
-             case kVolUp:
-             case kVolDn|k_Repeat:
-             case kVolDn:
-                  cDvbApi::PrimaryDvbApi->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
-                  break;
-             case kMute:
-                  cDvbApi::PrimaryDvbApi->ToggleMute();
-                  break;
-             // Power off:
-             case kPower: isyslog(LOG_INFO, "Power button pressed");
-                          DELETENULL(*Interact);
-                          if (!Shutdown) {
-                             Interface->Error(tr("Can't shutdown - option '-s' not given!"));
-                             break;
-                             }
-                          if (cRecordControls::Active()) {
-                             if (Interface->Confirm(tr("Recording - shut down anyway?")))
-                                ForceShutdown = true;
-                             }
-                          LastActivity = 1; // not 0, see below!
-                          break;
-             default:    break;
-             }
-           }
+                 case osStopReplay:
+                                DELETENULL(*Interact);
+                                DELETENULL(ReplayControl);
+                                break;
+                 case osSwitchDvb:
+                                DELETENULL(*Interact);
+                                Interface->Info(tr("Switching primary DVB..."));
+                                cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
+                                break;
+                 case osBack:
+                 case osEnd:    DELETENULL(*Interact);
+                                break;
+                 default:       ;
+                 }
+               }
+            else {
+               // Key functions in "normal" viewing mode:
+               switch (key) {
+                 // Toggle channels:
+                 case k0: {
+                      int CurrentChannel = cDvbApi::CurrentChannel();
+                      Channels.SwitchTo(PreviousChannel);
+                      PreviousChannel = CurrentChannel;
+                      break;
+                      }
+                 // Direct Channel Select:
+                 case k1 ... k9:
+                      Menu = new cDisplayChannel(key);
+                      break;
+                 // Left/Right rotates trough channel groups:
+                 case kLeft|k_Repeat:
+                 case kLeft:
+                 case kRight|k_Repeat:
+                 case kRight:
+                      Menu = new cDisplayChannel(NORMALKEY(key));
+                      break;
+                 // Up/Down Channel Select:
+                 case kUp|k_Repeat:
+                 case kUp:
+                 case kDown|k_Repeat:
+                 case kDown: {
+                      int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
+                      cChannel *channel = Channels.GetByNumber(n);
+                      if (channel)
+                         channel->Switch();
+                      break;
+                      }
+                 // Menu Control:
+                 case kMenu: Menu = new cMenuMain(ReplayControl); break;
+                 // Viewing Control:
+                 case kOk:   LastChannel = -1; break; // forces channel display
+                 default:    break;
+                 }
+               }
+          }
         if (!Menu) {
            EITScanner.Process();
            cVideoCutter::Active();

From 8465398c6d2a57bc30a07fb61353a7c8ba6db574 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 21 Oct 2001 18:00:00 +0200
Subject: [PATCH 027/307] =?UTF-8?q?Version=200.97=20-=20Implemented=20a=20?=
 =?UTF-8?q?lock=20file=20to=20prevent=20more=20than=20one=20instance=20of?=
 =?UTF-8?q?=20VDR=20from=20removing=20=20=20files=20from=20the=20video=20d?=
 =?UTF-8?q?irectory=20at=20the=20same=20time.=20-=20The=20new=20setup=20pa?=
 =?UTF-8?q?rameter=20SplitEditedFiles=20can=20be=20used=20to=20control=20w?=
 =?UTF-8?q?hether=20or=20=20=20not=20the=20result=20of=20an=20editing=20pr?=
 =?UTF-8?q?ocess=20shall=20be=20written=20into=20separate=20files.=20-=20F?=
 =?UTF-8?q?ixed=20handling=20repeat=20function=20when=20using=20LIRC=20(th?=
 =?UTF-8?q?anks=20to=20Matthias=20Weingart).=20-=20The=20shutdown=20progra?=
 =?UTF-8?q?m=20(defined=20with=20the=20'-s'=20option)=20now=20also=20gets?=
 =?UTF-8?q?=20the=20channel=20=20=20number=20and=20recording=20title=20of?=
 =?UTF-8?q?=20the=20timer=20(see=20INSTALL).=20-=20New=20channel=20data=20?=
 =?UTF-8?q?for=20'Premiere=20One',=20'Premiere=20X-Action',=20'Fox=20Kids?=
 =?UTF-8?q?=20T=FCrkce'=20=20=20and=20'N24'=20(thanks=20to=20Andreas=20Sha?=
 =?UTF-8?q?re,=20Ulrich=20R=F6der,=20Uwe=20Scheffler=20and=20Simon=20=20?=
 =?UTF-8?q?=20Bauschulte).=20Note=20that=20if=20you=20are=20using=20the=20?=
 =?UTF-8?q?default=20'channels.conf'=20or=20=20=20'channels.conf.cable'=20?=
 =?UTF-8?q?files=20you=20may=20need=20to=20check=20any=20exiting=20timers?=
 =?UTF-8?q?=20to=20see=20=20=20whether=20they=20still=20use=20the=20correc?=
 =?UTF-8?q?t=20channel=20number.=20-=20Fixed=20the=20"EPG=20bugfix"=20(som?=
 =?UTF-8?q?etimes=20had=20duplicate=20information=20in=20Subtitle=20and=20?=
 =?UTF-8?q?=20=20Extended=20Description).=20-=20Fixed=20checking=20for=20v?=
 =?UTF-8?q?alid=20video=20device=20when=20setting=20the=20video=20mode.=20?=
 =?UTF-8?q?-=20The=20external=20command=20'sort'=20is=20no=20longer=20requ?=
 =?UTF-8?q?ired.=20VDR=20now=20sorts=20the=20list=20of=20=20=20recordings?=
 =?UTF-8?q?=20itself,=20making=20sure=20that=20recordings=20that=20stem=20?=
 =?UTF-8?q?from=20repeating=20timers=20=20=20are=20sorted=20chronologicall?=
 =?UTF-8?q?y.=20Sorting=20is=20done=20according=20to=20the=20setting=20of?=
 =?UTF-8?q?=20the=20=20=20current=20locale,=20so=20you=20may=20want=20to?=
 =?UTF-8?q?=20make=20sure=20LC=5FCOLLATE=20is=20set=20to=20the=20desired?=
 =?UTF-8?q?=20=20=20value=20(see=20INSTALL).=20-=20Fixed=20handling=20'new?=
 =?UTF-8?q?line'=20characters=20in=20EPG=20texts=20(thanks=20to=20Rolf=20H?=
 =?UTF-8?q?akenes=20for=20=20=20an=20improved=20version=20of=20his=20'libd?=
 =?UTF-8?q?tv').=20=20=20Newline=20characters=20are=20always=20mapped=20to?=
 =?UTF-8?q?=20a=20single=20"blank"=20in=20VDR,=20because=20they=20=20=20wo?=
 =?UTF-8?q?uld=20otherwise=20disturb=20the=20Title=20and=20Subtitle=20layo?=
 =?UTF-8?q?ut=20in=20the=20channel=20display=20=20=20(where=20these=20are?=
 =?UTF-8?q?=20assumed=20to=20be=20single=20line=20texts)=20and=20would=20h?=
 =?UTF-8?q?ave=20to=20be=20=20=20specially=20handled=20in=20the=20'epg.dat?=
 =?UTF-8?q?a'=20file=20and=20the=20LSTE=20command=20in=20SVDRP.=20-=20Mapp?=
 =?UTF-8?q?ing=20`=20("backtick")=20characters=20in=20EPG=20texts=20to=20'?=
 =?UTF-8?q?=20(single=20quote).=20-=20Fixed=20timers=20starting=20and=20en?=
 =?UTF-8?q?ding=20at=20unexpected=20times.=20'localtime()'=20was=20not=20?=
 =?UTF-8?q?=20=20thread=20safe,=20now=20using=20localtime=5Fr().=20-=20Rem?=
 =?UTF-8?q?oved=20the=20"system=20time=20seen..."=20message.=20-=20Fixed?=
 =?UTF-8?q?=20a=20bug=20in=20the=20replay=20mode=20display=20when=20pressi?=
 =?UTF-8?q?ng=20the=20Green=20or=20Yellow=20=20=20button=20while=20in=20tr?=
 =?UTF-8?q?ick=20mode=20(thanks=20to=20Stefan=20Huelswitt)=20-=20Closing?=
 =?UTF-8?q?=20all=20open=20file=20descriptors=20when=20calling=20external?=
 =?UTF-8?q?=20programs.=20-=20The=20menu=20timeout=20now=20also=20works=20?=
 =?UTF-8?q?when=20pressing=20the=20"Back"=20button=20during=20replay=20=20?=
 =?UTF-8?q?=20to=20enter=20the=20"Recordings"=20menu.=20-=20Updated=20'cha?=
 =?UTF-8?q?nnels.conf'=20for=20the=20"Bundesliga"=20channels=20of=20Premie?=
 =?UTF-8?q?re=20World=20=20=20(thanks=20to=20Helmut=20Sch=E4chner).=20-=20?=
 =?UTF-8?q?Fixed=20reading=20timers.conf=20and=20channels.conf=20that=20co?=
 =?UTF-8?q?ntain=20blanks=20after=20numeric=20=20=20values.=20-=20Fixed=20?=
 =?UTF-8?q?handling=20trick=20modes=20near=20the=20beginning=20and=20end?=
 =?UTF-8?q?=20of=20a=20recording.=20-=20Pressing=20the=20"Back"=20button?=
 =?UTF-8?q?=20while=20replaying=20a=20DVD=20now=20leads=20to=20the=20DVD?=
 =?UTF-8?q?=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     |  10 +-
 HISTORY                          |  44 ++++++++
 INSTALL                          |  26 ++++-
 MANUAL                           |  11 +-
 Makefile                         |   4 +-
 channels.conf                    |  24 +++--
 channels.conf.cable              | 151 +++++++++++++-------------
 config.c                         |  37 ++++---
 config.h                         |   6 +-
 dvbapi.c                         | 130 ++++++++++++----------
 eit.c                            |  35 ++++--
 i18n.c                           |  11 +-
 libdtv/Makefile                  |   6 +-
 libdtv/liblx/Makefile            |   6 +-
 libdtv/liblx/liblx.h             |   6 +-
 libdtv/liblx/xListFuncs.c        |   2 +-
 libdtv/liblx/xMemMgt.c           |   2 +-
 libdtv/libsi/Makefile            |   8 +-
 libdtv/libsi/include/libsi.h     | 178 ++++++++++++++++++++++++++++---
 libdtv/libsi/include/si_tables.h |  66 +++++++++---
 libdtv/libsi/si_debug_services.c |  62 +++++++++--
 libdtv/libsi/si_debug_services.h |   2 +-
 libdtv/libsi/si_parser.c         |  72 +++++++++++--
 libdtv/libvdr/Makefile           |   6 +-
 libdtv/libvdr/libvdr.c           |   4 +-
 libdtv/libvdr/libvdr.h           |   6 +-
 menu.c                           |  26 +++--
 menu.h                           |   7 +-
 recording.c                      |  66 ++++++++++--
 recording.h                      |   6 +-
 remote.c                         |   3 +-
 svdrp.c                          |   4 +-
 thread.c                         |  36 ++++++-
 thread.h                         |   7 +-
 tools.c                          |  76 ++++++++++++-
 tools.h                          |  13 ++-
 vdr.c                            |  19 ++--
 37 files changed, 902 insertions(+), 276 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f1157b1f7..3a04af16c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -104,9 +104,10 @@ Stefan Huelswitt <huels@iname.com>
  for implementing backtracing for fast forward/rewind
  for implementing the replay mode display
 
-Ulrich R�der <dynamite@efr-net.de>
+Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
  27500
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
 Helmut Sch�chner <schaechner@yahoo.com>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -142,3 +143,10 @@ Andreas Vitting <Andreas@huji.de>
 
 Matthias Weingart <matthias@pentax.boerde.de>
  for fixing handling of the volume, mute and power keys when menus are active
+ for fixing the repeat function when using the LIRC remote control
+
+Andreas Share <a.share@t-online.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Simon Bauschulte <SemiSchwabe@Brutzel.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
diff --git a/HISTORY b/HISTORY
index 143c2f45b..5087c9ef1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -786,3 +786,47 @@ Video Disk Recorder Revision History
   at the expected time).
 - Made the volume, mute and power keys work when a menu is active, too (thanks
   to Matthias Weingart).
+
+2001-10-21: Version 0.97
+
+- Implemented a lock file to prevent more than one instance of VDR from removing
+  files from the video directory at the same time.
+- The new setup parameter SplitEditedFiles can be used to control whether or
+  not the result of an editing process shall be written into separate files.
+- Fixed handling repeat function when using LIRC (thanks to Matthias Weingart).
+- The shutdown program (defined with the '-s' option) now also gets the channel
+  number and recording title of the timer (see INSTALL).
+- New channel data for 'Premiere One', 'Premiere X-Action', 'Fox Kids T�rkce'
+  and 'N24' (thanks to Andreas Share, Ulrich R�der, Uwe Scheffler and Simon
+  Bauschulte). Note that if you are using the default 'channels.conf' or
+  'channels.conf.cable' files you may need to check any exiting timers to see
+  whether they still use the correct channel number.
+- Fixed the "EPG bugfix" (sometimes had duplicate information in Subtitle and
+  Extended Description).
+- Fixed checking for valid video device when setting the video mode.
+- The external command 'sort' is no longer required. VDR now sorts the list of
+  recordings itself, making sure that recordings that stem from repeating timers
+  are sorted chronologically. Sorting is done according to the setting of the
+  current locale, so you may want to make sure LC_COLLATE is set to the desired
+  value (see INSTALL).
+- Fixed handling 'newline' characters in EPG texts (thanks to Rolf Hakenes for
+  an improved version of his 'libdtv').
+  Newline characters are always mapped to a single "blank" in VDR, because they
+  would otherwise disturb the Title and Subtitle layout in the channel display
+  (where these are assumed to be single line texts) and would have to be
+  specially handled in the 'epg.data' file and the LSTE command in SVDRP.
+- Mapping ` ("backtick") characters in EPG texts to ' (single quote).
+- Fixed timers starting and ending at unexpected times. 'localtime()' was not
+  thread safe, now using localtime_r().
+- Removed the "system time seen..." message.
+- Fixed a bug in the replay mode display when pressing the Green or Yellow
+  button while in trick mode (thanks to Stefan Huelswitt)
+- Closing all open file descriptors when calling external programs.
+- The menu timeout now also works when pressing the "Back" button during replay
+  to enter the "Recordings" menu.
+- Updated 'channels.conf' for the "Bundesliga" channels of Premiere World
+  (thanks to Helmut Sch�chner).
+- Fixed reading timers.conf and channels.conf that contain blanks after numeric
+  values.
+- Fixed handling trick modes near the beginning and end of a recording.
+- Pressing the "Back" button while replaying a DVD now leads to the DVD menu.
diff --git a/INSTALL b/INSTALL
index b942603ec..e7e673162 100644
--- a/INSTALL
+++ b/INSTALL
@@ -90,6 +90,24 @@ option to set the controlling terminal, as in
 
 vdr:123:respawn:/usr/local/bin/vdr --terminal=/dev/tty8 -w 60
 
+Locale
+------
+
+When presenting the list of recordings, VDR sorts the entries according to
+the current "locale" settings. This makes sure that special characters (like
+the German "umlauts") appear at the expected positions. In order to benefit
+from this you may have to set the locale environment variable, for instance
+
+  export LANG=de_DE
+
+for a German locale. If you don't want this to result in German error messages
+in the log file, it is sufficient to just set
+
+  export LC_COLLATE=de_DE
+
+which only influences the way strings are sorted and leaves error messages
+in English.
+
 Automatic restart in case of hangups:
 -------------------------------------
 
@@ -109,7 +127,7 @@ active, the user has been inactive for at least MinUserInactivity minutes
 and the next timer event is at least MinEventTimeout minutes in the future
 (see the Setup parameters in MANUAL).
 
-The command given in the '-s' option will be called with two parameters.
+The command given in the '-s' option will be called with four parameters.
 The first one is the time (in UTC) of the next timer event (as a time_t
 type number), and the second one is the number of seconds from the current
 time until the next timer event. Your program can choose which one to use
@@ -129,6 +147,12 @@ and only perform the system shutdown. A program that uses the second parameter
 to set the hardware for restart must therefore also check whether the first
 parameter is '0'.
 
+The third parameter contains the number of the channel that will be recorded
+by the next timer (or 0 if no timer is present), and the fourth parameter
+contains the file name of the recording as defined in the timer (or an empty
+string if no timer is present). These can be used by the shutdown program to
+show that information on some display interface etc.
+
 If a timer is currently recording, the parameters will reflect the start
 time of that timer. This means that the first parameter will be a time in
 the past, and the second parameter will be a negative number. This only
diff --git a/MANUAL b/MANUAL
index 05f2f3ca9..7bb1ec83f 100644
--- a/MANUAL
+++ b/MANUAL
@@ -8,7 +8,7 @@ Video Disk Recorder User's Manual
   possible, several keys have different meanings in the various
   modes:
 
-  Key         Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
+  Key     Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
 
   Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
@@ -386,7 +386,8 @@ Video Disk Recorder User's Manual
                          0 = no EPG fixing
                          1 = basic fixing of text location (Title, Subtitle and
                              Extended Description)
-                         2 = removal of excess whitespace and hyphens
+                         2 = removal of excess whitespace and hyphens, mapping of
+                             wrongly used characters
                          3 = fixing the date in timestamps between 00:00 and 06:00
                              (use with care - hopefully one day Pro7 and Kabel1
                              will learn how to read the clock/calender)
@@ -449,6 +450,12 @@ Video Disk Recorder User's Manual
                          you may want to use smaller values if you are planning
                          on archiving a recording to CD.
 
+  SplitEditedFiles = 0   During the actual editing process VDR writes the result
+                         into files that may grow up to MaxVideoFileSize. If you
+                         prefer to have each marked sequence stored in a separate
+                         file (named 001.vdr, 002.vdr, ...) you can set this
+                         option to 1.
+
   MinEventTimeout=30     If the command line option '-s' has been set, VDR will
   MinUserInactivity=120  automatically shutdown the computer if the next timer
                          event is at least MinEventTimeout minutes in the future,
diff --git a/Makefile b/Makefile
index f39be0886..4efae4b12 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.27 2001/08/31 13:13:30 kls Exp $
+# $Id: Makefile 1.28 2001/10/07 15:14:50 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -39,6 +39,8 @@ endif
 
 DEFINES += -DREMOTE_$(REMOTE)
 
+DEFINES += -D_GNU_SOURCE
+
 ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 endif
diff --git a/channels.conf b/channels.conf
index 9c904916e..200fbfe01 100644
--- a/channels.conf
+++ b/channels.conf
@@ -24,7 +24,7 @@ Super RTL:12188:h:0:27500:165:120:65:0:12040
 VOX:12188:h:0:27500:167:136:0:0:12060
 DW TV:12363:v:0:27500:305:306:0:0:8905
 Kabel 1:12480:v:0:27500:511:512:33:0:899
-tm3:12480:v:0:27500:767:768:0:0:897
+Neun Live:12480:v:0:27500:767:768:0:0:897
 DSF:12480:v:0:27500:1023:1024:0:0:900
 HOT:12480:v:0:27500:1279:1280:0:0:40
 Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
@@ -52,9 +52,11 @@ Premiere World:11797:h:0:27500:255:256:32:0:8
 Premiere 1:11797:h:0:27500:511:512:0:3:10
 Premiere 2:11797:h:0:27500:1791:1792:0:3:11
 Premiere 3:11797:h:0:27500:2303:2304:0:3:43
+Premiere One:12032:h:0:27500:3071:3072:0:3:51
 Premiere Star:11797:h:0:27500:767:768:0:3:9
 Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:3:41
 Premiere Action:11797:h:0:27500:1023:1024:0:3:20
+Premiere X-Action:11798:h:0:27500:2047:2048:0:3:50
 Premiere Comedy:11797:h:0:27500:1279:1280:0:3:29
 13th Street:12031:h:0:27500:2303:2304:0:3:42
 Studio Universal:12090:V:0:27500:255:256:0:3:36
@@ -63,6 +65,7 @@ Heimatkanal:12031:h:0:27500:2815:2816:0:3:517
 Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
 Planet:12090:V:0:27500:1279:1280:0:3:13
 Fox Kids:12031:h:0:27500:1279:1280:0:3:28
+Fox Kids T�rkce:11914:H:0:27500:767:768:8191:3:54
 Junior:12031:h:0:27500:255:256:0:3:19
 K-Toon:12031:h:0:27500:511:512:0:3:12
 Disney Channel:12090:V:0:27500:767:768:0:3:34
@@ -93,6 +96,7 @@ Cinedom 5A:11758:h:0:27500:1279:1280:0:3:194
 Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
 Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
 :Beta Digital
+N24:11914:H:0:27500:255:256:8191:3:52
 CNBC:12148:h:0:27500:255:256:0:3:35
 Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
 :PW Erotic
@@ -112,15 +116,15 @@ Verfolgerfeld:11720:h:0:27500:2303:2304:0:3:241
 Cockpitkanal:11720:h:0:27500:2559:2560:0:3:242
 Boxengasse:11720:h:0:27500:2047:2048:0:3:240
 :Premiere World Bundesliga
-Superdom:12070:h:0:27500:255:256:0:3:26
-Spiel 1:11719:h:0:27500:255:256,257:0:3:17
-Spiel 2:11719:h:0:27500:2047:2048,2049:0:3:240
-BuLi-Konferenz:12070:h:0:27500:3071:3072,3073:0:3:208
-BuLi-Spiel 1:12070:h:0:27500:3327:3328,3329:0:3:209
-BuLi-Spiel 2:12070:h:0:27500:2303:2304,2305:0:3:210
-BuLi-Spiel 3:12070:h:0:27500:3583:3584,3585:0:3:211
-BuLi-Spiel 4:12070:h:0:27500:2559:2560,2561:0:3:212
-BuLi-Spiel 5:12070:h:0:27500:2815:2816,2817:0:3:213
+Superdom:11758:h:0:27500:2815:8192:0:3:18
+BuLi-Konferenz:11758:h:0:27500:3071:3072,3073:0:3:215
+BuLi-Spiel 1:11719:h:0:27500:255:256,257:0:3:17
+BuLi-Spiel 2:11719:h:0:27500:2047:2048,2049:0:3:240
+BuLi-Spiel 3:11719:h:0:27500:3327:3328,3329:0:3:241
+BuLi-Spiel 4:11719:h:0:27500:2303:2304,2305:0:3:242
+BuLi-Spiel 5:11719:h:0:27500:3583:3584,3585:0:3:243
+BuLi-Spiel 6:11719:h:0:27500:2559:2560,2561:0:3:244
+BuLi-Spiel 7:11758:h:0:27500:2815:2816,2817:0:3:214
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
diff --git a/channels.conf.cable b/channels.conf.cable
index 60b3eb573..6e0f43b70 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,54 +1,56 @@
 :verschl�sselte Fernsehprogramm
-PREMIERE 1:370:h:0:6900:511:512:0:1:10
-PREMIERE 2:370:h:0:6900:1791:1792:0:1:11
-PREMIERE 3:370:h:0:6900:2303:2304:0:1:43
-PREMIERE ACTION:370:h:0:6900:1023:1024:0:1:20
+PREMIERE ONE:378:h:0:6900:3071:3072:0:1:51
+PREMIERE MOVIE 1:370:h:0:6900:511:512:0:1:10
+PREMIERE MOVIE 2:370:h:0:6900:1791:1792:0:1:11
+PREMIERE MOVIE 3:370:h:0:6900:2303:2304:0:1:43
+PREMIERE ACTION:370:h:0:6900:1023:1024,1025:0:1:20
+PREMIERE X-ACTION:370:h:0:6900:2047:2048,2049:0:1:50
 PREMIERE SCI-FI:370:h:0:6900:1535:1536:0:1:41
 PREMIERE STAR:370:h:0:6900:767:768:0:1:9
 PREMIERE COMEDY:370:h:0:6900:1279:1280:0:1:29
-13 TH STREET:378:h:0:6900:2303:2304:0:1:42
+13 TH STREET:378:h:0:6900:2303:2304,2305:0:1:42
 KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
 STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
 DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
+FILMPALAST:378:h:0:6900:2559:2560:0:1:516
 DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
 SUNSET:378:h:0:6900:1023:1024:0:1:16
 PLANET:402:h:0:6900:1100:1104:0:1:13
-SEASONS:402:h:0:6900:1040:1044:0:1:33
 CLASSICA:378:h:0:6900:767:768:0:1:15
 GOLDSTAR TV:378:h:0:6900:3839:3840:0:1:518
-FILMPALAST:378:h:0:6900:2559:2560:0:1:516
 HEIMATKANAL:378:h:0:6900:2815:2816:0:1:517
+K-TOON:378:h:0:6900:511:512:0:1:12
 FOX KIDS:378:h:0:6900:1279:1280:0:1:28
+KiKa:394:h:0:6900:310:320:330:0:28008
 JUNIOR:378:h:0:6900:255:256:0:1:19
-K-TOON:378:h:0:6900:12:13:0:1:12
 :Fernsehprogramme
-Das Erste:410:h:0:6900:101:102:104:0:28106
-ZDF:394:h:0:6900:110:120:130:0:28006
+Das Erste:410:h:0:6900:101:102,88:104:0:28106
+ZDF:394:h:0:6900:110:120,121:130:0:28006
 ZDF.info:394:h:0:6900:610:620:0:0:28011
 ZDF.doku:394:h:0:6900:660:670:0:0:28014
-ZDF Theaterkanal:394:h:0:6900:3440:3441:0:0:28016
+ZDF Theaterkanal:394:h:0:6900:1110:1120:130:0:28016
+EinsExtra:426:h:0:6900:101:102:0:0:28201
+EinsFestival:426:h:0:6900:201:202:0:0:28202
+EinsMuXx:426:h:0:6900:301:302:0:0:28203
 3sat:394:h:0:6900:210:220:230:0:28007
-KiKa:394:h:0:6900:310:320:330:0:28008
+arte:410:h:0:6900:401:402:404:0:28109
 EuroNews:394:h:0:6900:2221:2233:768:0:28015
+Phoenix:410:h:0:6900:901:902:0:0:28114
 Eurosport:394:h:0:6900:410:420:430:0:28009
 DW-tv:610:h:0:6900:634:632:0:0:6101
 CNBC:394:h:0:6900:510:520:530:0:28010
-Test-R:410:h:0:6900:901:902:104:0:28130
-Bayerisches FS:410:h:0:6900:201:202:204:0:28107
 WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
-arte:410:h:0:6900:401:402:404:0:28109
+MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
 SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
-hessen fernsehen:410:h:0:6900:301:302:304:0:28108
+SuedWest BW:410:h:0:6900:801:802:804:0:28113
+SuedWest RP:426:h:0:6900:3101:3102:3104:0:28231
 BR-alpha:410:h:0:6900:701:702:704:0:28112
-SWR Fernsehen:410:h:0:6900:801:802:804:0:28113
-Phoenix:410:h:0:6900:901:902:0:0:28114
-EinsExtra:426:h:0:6900:101:102:0:0:28201
-EinsFestival:426:h:0:6900:201:202:0:0:28202
-EinsMuXx:426:h:0:6900:301:302:0:0:28203
-MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
-ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
 B1 Berlin:426:h:0:6900:601:602:604:0:28206
 N3:426:h:0:6900:2401:2402:2404:0:28224
+ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
+hessen fernsehen:410:h:0:6900:301:302:304:0:28108
+Bayerisches FS:410:h:0:6900:201:202:204:0:28107
+Test-R:410:h:0:6900:901:902:104:0:28130
 :Mediavision
 Extreme Sport:346:h:0:6900:801:802:0:1:50700
 Bloomberg:346:h:0:6900:811:812:0:1:50701
@@ -60,6 +62,7 @@ Einstein:346:h:0:6900:623:624:0:1:50719
 Leitseite:346:h:0:6900:2254:0:0:0:5004
 Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:0:50705
 Parlamentsfernsehen:610:h:0:6900:33:36:47:0:6100
+Vh1 - Classic:610:h:0:6900:604:603:0:0:6106
 :Diverse TV-Sender
 TV Polonia:434:h:0:6900:641:642:0:1:53204
 Kanal D:434:h:0:6900:651:652:0:1:53205
@@ -68,18 +71,10 @@ ERT-Sat:434:h:0:6900:691:692:0:1:53209
 CNE:434:h:0:6900:4056:4057:0:1:53208
 ZEE TV:442:h:0:6900:517:773:0:1:53301
 NTV i:442:h:0:6900:514:515:0:1:53302
-Leonardo:610:h:0:6900:653:652:0:1:6102
-Alice:610:h:0:6900:651:650:0:1:6103
-Nuvolari:610:h:0:6900:649:648:0:1:6104
 ATV:434:h:0:6900:631:632:0:0:53203
-unknown:434:h:0:6900:2570:2571:0:0:18954
 TW1:610:h:0:6900:6106:6107:0:0:6106
-unknown:346:h:0:6900:2930:2931:0:0:11122
-unknown:394:h:0:6900:1844:1845:0:1:59188
-unknown:410:h:0:6900:627:628:0:1:627
 PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
 :Premiere World Bundesliga
-SUPERDOM:386:h:0:6900:255:257:0:1:26
 Superdom:362:h:0:6900:255:256:0:1:26
 Spiel 1:362:h:0:6900:255:256,257:0:1:17
 Spiel 2:362:h:0:6900:2047:2048,2049:0:1:240
@@ -90,9 +85,9 @@ BuLi-Spiel 3:362:h:0:6900:3583:3584,3585:0:1:211
 BuLi-Spiel 4:362:h:0:6900:2559:2560,2561:0:1:212
 BuLi-Spiel 5:362:h:0:6900:2815:2816,2817:0:1:213
 :Premiere Sport
-PR-SPORT 1:362:h:0:6900:255:256:0:1:17
-PR-SPORT 2:362:h:0:6900:3327:3328:0:1:27
-PR-SPORT 3:362:h:0:6900:2815:2816:0:1:18
+PREMIERE SPORT 1:362:h:0:6900:255:256:0:1:17
+PREMIERE SPORT 2:362:h:0:6900:3327:3328:0:1:27
+PREMIERE SPORT 3:354:h:0:6900:2815:2816:0:1:18
 :Premiere Formel 1
 F1 Studio:362:h:0:6900:255:256:0:1:17
 F1 Box:362:h:0:6900:2047:2048:0:1:240
@@ -106,35 +101,40 @@ Cinedom 1B:386:h:0:6900:1535:1536,1537:0:1:178
 Cinedom 1C:362:h:0:6900:511:512,513:0:1:180
 Cinedom 1D:354:h:0:6900:511:512,513:0:1:190
 :Premiere Cinedom 2
-Cinedom 2A:386:h:0:6900:1791:1792:0:1:179
-Cinedom 2B:362:h:0:6900:1279:1280:0:1:183
+Cinedom 2A:386:h:0:6900:1791:1792,1793:0:1:179
+Cinedom 2B:362:h:0:6900:1279:1280,1281:0:1:183
 Cinedom 2C:386:h:0:6900:511:512:0:1:184
 Cinedom 2D:386:h:0:6900:1279:1280:0:1:188
 Cinedom 2E:354:h:0:6900:1023:1024:0:1:193
 : Premiere Cinedom 3
-Cinedom 3A:362:h:0:6900:1023:1024:0:1:182
+Cinedom 3A:362:h:0:6900:1023:1024,1025:0:1:182
 Cinedom 3B:386:h:0:6900:767:768:0:1:185
 Cinedom 3C:354:h:0:6900:2559:2560:0:1:192
 Cinedom 3D:354:h:0:6900:1535:1536:0:1:195
 : Premiere Cinedom 4
-Cinedom 4A:362:h:0:6900:767:768:0:1:181
+Cinedom 4A:362:h:0:6900:767:768,769:0:1:181
 Cinedom 4B:386:h:0:6900:2047:2048:0:1:187
 Cinedom 4C:354:h:0:6900:767:768:0:1:191
 : Premiere Cinedom 5
-Cinedom 5A:386:h:0:6900:1023:1024:0:1:186
-Cinedom 5B:354:h:0:6900:1279:1280:0:1:194
+Cinedom 5A:386:h:0:6900:1023:1024,1025:0:1:186
+Cinedom 5B:354:h:0:6900:1279:1280,1281:0:1:194
 : Premiere Cinedom Deluxe
-CINEDOM DELUXE:354:h:0:6900:255:256,257;259:0:1:189
+CINEDOM DELUXE:354:h:0:6900:255:256,257:0:1:189
 :Premiere Erotic
 BEATE-UHSE.TV:354:h:0:6900:3839:3840:0:1:21
 BLUE MOVIE 1:354:h:0:6900:1791:1792:0:1:513
 BLUE MOVIE 2:354:h:0:6900:2047:2048:0:1:514
 BLUE MOVIE 3:354:h:0:6900:2303:2304:0:1:515
 :Radioprogramme
-100,6:354:h:0:6900:0:1312:0:0:161
+Fritz:426:h:0:6900:0:901:0:0:28209
+HR XXL:410:h:0:6900:0:3501:0:0:28125
+JUMP:426:h:0:6900:0:1001:0:0:28210
+SPUTNIK:426:h:0:6900:0:1201:0:0:28212
+RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
 DLR-Berlin:394:h:0:6900:0:710:0:0:28012
 DLF-K�ln:394:h:0:6900:0:810:0:0:28013
 �sterreich 1:394:h:0:6900:0:169:0:0:28017
+100,6:354:h:0:6900:0:1312:0:0:161
 Bayern 4 Klassik:410:h:0:6900:0:3001:0:0:28120
 B5 aktuell:410:h:0:6900:0:3101:0:0:28121
 Bremen 2:410:h:0:6900:0:3801:0:0:28128
@@ -143,47 +143,42 @@ NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
 SR 1:410:h:0:6900:0:3901:0:0:28129
 hr-klassik:410:h:0:6900:0:3401:0:0:28124
 hr2:410:h:0:6900:0:3301:0:0:28123
-HR XXL:410:h:0:6900:0:3501:0:0:28125
 hr-chronos:410:h:0:6900:0:3201:0:0:28122
 Radio 3:426:h:0:6900:0:701:0:0:28207
 MDR KULTUR:426:h:0:6900:0:801:0:0:28208
-Fritz:426:h:0:6900:0:901:0:0:28209
-JUMP:426:h:0:6900:0:1001:0:0:28210
 MDR info:426:h:0:6900:0:1101:0:0:28211
-SPUTNIK:426:h:0:6900:0:1201:0:0:28212
-RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
 SWR-2:426:h:0:6900:0:1401:0:0:28214
 WDR3:426:h:0:6900:0:1501:0:0:28215
 WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
 :verschl�sselte Radioprogramme
-KLASSIK POPUL�R:378:h:0:6900:0:592:0:1:145
-KLASS. SYMPHONIEN:378:h:0:6900:0:608:0:1:146
-OPER & VOKALMUSIK:378:h:0:6900:0:624:0:1:147
-BAROCKMUSIK:378:h:0:6900:0:640:0:1:148
-JAZZ:378:h:0:6900:0:656:0:1:149
-HITLISTE:378:h:0:6900:0:784:0:1:150
-ALTERNATIVE ROCK:378:h:0:6900:0:800:0:1:151
-DANCE:378:h:0:6900:0:816:0:1:152
-COUNTRY:378:h:0:6900:0:352:0:1:153
-CLASSIC ROCK:378:h:0:6900:0:544:0:1:154
-FILMMUSIK:378:h:0:6900:0:368:0:1:155
-DEUTSCHE HITS:402:h:0:6900:0:1156:0:1:156
-SOUL CLASSICS:402:h:0:6900:0:1161:0:1:157
-T�RK M�ZIGI:402:h:0:6900:0:1166:0:1:158
-GOLD:402:h:0:6900:0:1171:0:1:159
-EASY LISTENING:402:h:0:6900:0:1201:0:1:162
-LOVE SONGS:402:h:0:6900:0:1191:0:1:163
-MUSICALS:402:h:0:6900:0:1196:0:1:164
-OLD GOLD:402:h:0:6900:0:1186:0:1:165
-SCHLAGER:402:h:0:6900:0:1176:0:1:166
-VOLKSMUSIK:402:h:0:6900:0:1181:0:1:167
-All Jazz:442:h:0:6900:0:535:0:1:53350
-Cristal New Age:442:h:0:6900:0:536:0:0:53351
-Movie Sounds:442:h:0:6900:0:537:0:1:53352
-Sinfonica:442:h:0:6900:0:538:0:1:53353
-Opernfestival:442:h:0:6900:0:539:0:1:53354
-Barock Fantasie:442:h:0:6900:0:540:0:1:53355
-Musica Camerata:442:h:0:6900:0:541:0:1:53356
-Musica Antica:442:h:0:6900:0:542:0:1:53357
-Adagio:442:h:0:6900:0:543:0:1:53358
-Jazz Legends:442:h:0:6900:0:544:0:1:53359
+ALTERNATIVE ROCK:378:h:0:6900:1:800:0:1:151
+HITLISTE:378:h:0:6900:1:784:0:1:150
+DANCE:378:h:0:6900:1:816:0:1:152
+EASY LISTENING:402:h:0:6900:1:1201:0:1:162
+CLASSIC ROCK:378:h:0:6900:1:544:0:1:154
+Cristal New Age:442:h:0:6900:1:536:0:0:53351
+Movie Sounds:442:h:0:6900:1:537:0:1:53352
+LOVE SONGS:402:h:0:6900:1:1191:0:1:163
+KLASSIK POPUL�R:378:h:0:6900:1:592:0:1:145
+KLASS. SYMPHONIEN:378:h:0:6900:1:608:0:1:146
+OPER & VOKALMUSIK:378:h:0:6900:1:624:0:1:147
+BAROCKMUSIK:378:h:0:6900:1:640:0:1:148
+JAZZ:378:h:0:6900:1:656:0:1:149
+COUNTRY:378:h:0:6900:1:352:0:1:153
+FILMMUSIK:378:h:0:6900:1:368:0:1:155
+DEUTSCHE HITS:402:h:0:6900:1:1156:0:1:156
+SOUL CLASSICS:402:h:0:6900:1:1161:0:1:157
+T�RK M�ZIGI:402:h:0:6900:1:1166:0:1:158
+GOLD:402:h:0:6900:1:1171:0:1:159
+MUSICALS:402:h:0:6900:1:1196:0:1:164
+OLD GOLD:402:h:0:6900:1:1186:0:1:165
+SCHLAGER:402:h:0:6900:1:1176:0:1:166
+VOLKSMUSIK:402:h:0:6900:1:1181:0:1:167
+All Jazz:442:h:0:6900:1:535:0:1:53350
+Sinfonica:442:h:0:6900:1:538:0:1:53353
+Opernfestival:442:h:0:6900:1:539:0:1:53354
+Barock Fantasie:442:h:0:6900:1:540:0:1:53355
+Musica Camerata:442:h:0:6900:1:541:0:1:53356
+Musica Antica:442:h:0:6900:1:542:0:1:53357
+Adagio:442:h:0:6900:1:543:0:1:53358
+Jazz Legends:442:h:0:6900:1:544:0:1:53359
diff --git a/config.c b/config.c
index 4df73614d..6ebaaacb9 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.73 2001/09/22 13:36:59 kls Exp $
+ * $Id: config.c 1.76 2001/10/20 13:09:38 kls Exp $
  */
 
 #include "config.h"
@@ -14,6 +14,10 @@
 #include "i18n.h"
 #include "interface.h"
 
+// IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
+// format characters in order to allow any number of blanks after a numeric
+// value!
+
 // -- cKeys ------------------------------------------------------------------
 
 tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
@@ -251,16 +255,16 @@ bool cChannel::Parse(const char *s)
   else {
      groupSep = false;
      char *apidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%a[^:]:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apidbuf, &tpid, &ca, &pnr);
+     int fields = sscanf(s, "%a[^:]:%d :%c:%d :%d :%d :%a[^:]:%d :%d :%d ", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apidbuf, &tpid, &ca, &pnr);
      apid1 = apid2 = 0;
      dpid1 = dpid2 = 0;
      if (apidbuf) {
         char *p = strchr(apidbuf, ';');
         if (p)
            *p++ = 0;
-        sscanf(apidbuf, "%d,%d", &apid1, &apid2);
+        sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
         if (p)
-           sscanf(p, "%d,%d", &dpid1, &dpid2);
+           sscanf(p, "%d ,%d ", &dpid1, &dpid2);
         delete apidbuf;
         }
      else
@@ -324,7 +328,8 @@ cTimer::cTimer(bool Instant)
   cChannel *ch = Channels.GetByNumber(cDvbApi::CurrentChannel());
   channel = ch ? ch->number : 0;
   time_t t = time(NULL);
-  struct tm *now = localtime(&t);
+  struct tm tm_r;
+  struct tm *now = localtime_r(&t, &tm_r);
   day = now->tm_mday;
   start = now->tm_hour * 100 + now->tm_min;
   stop = start + 200; // "instant recording" records 2 hours by default
@@ -349,10 +354,11 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   time_t tstart = EventInfo->GetTime();
   time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
   tstart -= Setup.MarginStart * 60;
-  struct tm *time = localtime(&tstart);
+  struct tm tm_r;
+  struct tm *time = localtime_r(&tstart, &tm_r);
   day = time->tm_mday;
   start = time->tm_hour * 100 + time->tm_min;
-  time = localtime(&tstop);
+  time = localtime_r(&tstop, &tm_r);
   stop = time->tm_hour * 100 + time->tm_min;
   if (stop >= 2400)
      stop -= 2400;
@@ -466,7 +472,7 @@ bool cTimer::Parse(const char *s)
      strcat(strn0cpy(s2, s, l2 + 1), " \n");
      s = s2;
      }
-  if (8 <= sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
+  if (8 <= sscanf(s, "%d :%d :%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
      if (summary && !*skipspace(summary)) {
         delete summary;
         summary = NULL;
@@ -497,12 +503,14 @@ bool cTimer::IsSingleEvent(void)
 
 int cTimer::GetMDay(time_t t)
 {
-  return localtime(&t)->tm_mday;
+  struct tm tm_r;
+  return localtime_r(&t, &tm_r)->tm_mday;
 }
 
 int cTimer::GetWDay(time_t t)
 {
-  int weekday = localtime(&t)->tm_wday;
+  struct tm tm_r;
+  int weekday = localtime_r(&t, &tm_r)->tm_wday;
   return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
 }
 
@@ -513,7 +521,8 @@ bool cTimer::DayMatches(time_t t)
 
 time_t cTimer::IncDay(time_t t, int Days)
 {
-  tm tm = *localtime(&t);
+  struct tm tm_r;
+  tm tm = *localtime_r(&t, &tm_r);
   tm.tm_mday += Days; // now tm_mday may be out of its valid range
   int h = tm.tm_hour; // save original hour to compensate for DST change
   t = mktime(&tm);    // normalize all values
@@ -523,7 +532,8 @@ time_t cTimer::IncDay(time_t t, int Days)
 
 time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
 {
-  tm tm = *localtime(&t);
+  struct tm tm_r;
+  tm tm = *localtime_r(&t, &tm_r);
   tm.tm_hour = SecondsFromMidnight / 3600;
   tm.tm_min = (SecondsFromMidnight % 3600) / 60;
   tm.tm_sec =  SecondsFromMidnight % 60;
@@ -803,6 +813,7 @@ cSetup::cSetup(void)
   OSDheight = 18;
   OSDMessageTime = 1;
   MaxVideoFileSize = MAXVIDEOFILESIZE;
+  SplitEditedFiles = 0;
   MinEventTimeout = 30;
   MinUserInactivity = 120;
   MultiSpeedMode = 0;
@@ -843,6 +854,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
      else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
      else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
+     else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
      else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
      else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
      else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
@@ -918,6 +930,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "OSDheight          = %d\n", OSDheight);
         fprintf(f, "OSDMessageTime     = %d\n", OSDMessageTime);
         fprintf(f, "MaxVideoFileSize   = %d\n", MaxVideoFileSize);
+        fprintf(f, "SplitEditedFiles   = %d\n", SplitEditedFiles);
         fprintf(f, "MinEventTimeout    = %d\n", MinEventTimeout);
         fprintf(f, "MinUserInactivity  = %d\n", MinUserInactivity);
         fprintf(f, "MultiSpeedMode     = %d\n", MultiSpeedMode);
diff --git a/config.h b/config.h
index 8012cd26c..d0f0d77f3 100644
--- a/config.h
+++ b/config.h
@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.81 2001/09/22 13:37:05 kls Exp $
+ * $Id: config.h 1.84 2001/10/07 15:13:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -19,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.96"
+#define VDRVERSION "0.97"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -298,6 +297,7 @@ class cSetup {
   int OSDwidth, OSDheight;
   int OSDMessageTime;
   int MaxVideoFileSize;
+  int SplitEditedFiles;
   int MinEventTimeout, MinUserInactivity;
   int MultiSpeedMode;
   int ShowReplayMode;
diff --git a/dvbapi.c b/dvbapi.c
index 8a6e69152..786dff7f0 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.129 2001/09/23 13:44:27 kls Exp $
+ * $Id: dvbapi.c 1.132 2001/10/21 13:36:27 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -72,6 +72,9 @@ extern "C" {
 // is broken:
 #define MAXBROKENTIMEOUT 30 // seconds
 
+// The maximum time to wait before giving up while catching up on an index file:
+#define MAXINDEXCATCHUP   2 // seconds
+
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 
 #define FATALERRNO (errno != EAGAIN && errno != EINTR)
@@ -108,14 +111,14 @@ class cIndexFile {
   int size, last;
   tIndex *index;
   cResumeFile resumeFile;
-  bool CatchUp(void);
+  bool CatchUp(int Index = -1);
 public:
   cIndexFile(const char *FileName, bool Record);
   ~cIndexFile();
   bool Ok(void) { return index != NULL; }
   void Write(uchar PictureType, uchar FileNumber, int FileOffset);
   bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
-  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL);
+  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
   int Get(uchar FileNumber, int FileOffset);
   int Last(void) { CatchUp(); return last; }
   int GetResume(void) { return resumeFile.Read(); }
@@ -199,42 +202,48 @@ cIndexFile::~cIndexFile()
   delete fileName;
 }
 
-bool cIndexFile::CatchUp(void)
+bool cIndexFile::CatchUp(int Index)
 {
   if (index && f >= 0) {
-     struct stat buf;
-     if (fstat(f, &buf) == 0) {
-        int newLast = buf.st_size / sizeof(tIndex) - 1;
-        if (newLast > last) {
-           if (size <= newLast) {
-              size *= 2;
-              if (size <= newLast)
-                 size = newLast + 1;
-              }
-           index = (tIndex *)realloc(index, size * sizeof(tIndex));
-           if (index) {
-              int offset = (last + 1) * sizeof(tIndex);
-              int delta = (newLast - last) * sizeof(tIndex);
-              if (lseek(f, offset, SEEK_SET) == offset) {
-                 if (safe_read(f, &index[last + 1], delta) != delta) {
-                    esyslog(LOG_ERR, "ERROR: can't read from index");
-                    delete index;
-                    index = NULL;
-                    close(f);
-                    f = -1;
-                    }
-                 last = newLast;
-                 return true;
-                 }
-              else
-                 LOG_ERROR;
-              }
-           else
-              esyslog(LOG_ERR, "ERROR: can't realloc() index");
-           }
-        }
-     else
-        LOG_ERROR;
+     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
+         struct stat buf;
+         if (fstat(f, &buf) == 0) {
+            int newLast = buf.st_size / sizeof(tIndex) - 1;
+            if (newLast > last) {
+               if (size <= newLast) {
+                  size *= 2;
+                  if (size <= newLast)
+                     size = newLast + 1;
+                  }
+               index = (tIndex *)realloc(index, size * sizeof(tIndex));
+               if (index) {
+                  int offset = (last + 1) * sizeof(tIndex);
+                  int delta = (newLast - last) * sizeof(tIndex);
+                  if (lseek(f, offset, SEEK_SET) == offset) {
+                     if (safe_read(f, &index[last + 1], delta) != delta) {
+                        esyslog(LOG_ERR, "ERROR: can't read from index");
+                        delete index;
+                        index = NULL;
+                        close(f);
+                        f = -1;
+                        break;
+                        }
+                     last = newLast;
+                     }
+                  else
+                     LOG_ERROR;
+                  }
+               else
+                  esyslog(LOG_ERR, "ERROR: can't realloc() index");
+               }
+            }
+         else
+            LOG_ERROR;
+         if (Index >= last)
+            sleep(1);
+         else
+            return true;
+         }
      }
   return false;
 }
@@ -256,7 +265,7 @@ void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
 {
   if (index) {
-     CatchUp();
+     CatchUp(Index);
      if (Index >= 0 && Index <= last) {
         *FileNumber = index[Index].number;
         *FileOffset = index[Index].offset;
@@ -276,7 +285,7 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
   return false;
 }
 
-int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length)
+int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
 {
   if (index) {
      if (Forward)
@@ -284,7 +293,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
-         if (Index >= 0 && Index <= last) {
+         if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? 100 : 0)) {
             if (index[Index].type == I_FRAME) {
                if (FileNumber)
                   *FileNumber = index[Index].number;
@@ -1049,17 +1058,26 @@ void cReplayBuffer::Input(void)
            if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
               uchar FileNumber;
               int FileOffset, Length;
-              int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length);
+              int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
               if (Index >= 0) {
                  if (!NextFile(FileNumber, FileOffset))
                     break;
                  }
               else {
-                 Play();
+                 // can't call Play() here, because those functions may only be
+                 // called from the foreground thread - and we also don't need
+                 // to empty the buffer here
+                 CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
+                 CHECK(ioctl(videoDev, VIDEO_CONTINUE));
+                 playMode = pmPlay;
+                 playDir = pdForward;
                  continue;
                  }
               readIndex = Index;
               r = ReadFrame(replayFile, b, Length, sizeof(b));
+              // must call StripAudioPackets() here because the buffer is not emptied
+              // when falling back from "fast forward" to "play" (see above)
+              StripAudioPackets(b, r);
               }
            else if (index) {
               uchar FileNumber;
@@ -1205,17 +1223,11 @@ void cReplayBuffer::SkipSeconds(int Seconds)
      Empty(true);
      int Index = writeIndex;
      if (Index >= 0) {
-        if (Seconds < 0) {
-           int sec = index->Last() / FRAMESPERSEC;
-           if (Seconds < -sec)
-              Seconds = -sec;
-           }
-        Index += Seconds * FRAMESPERSEC;
-        if (Index < 0)
-           Index = 1; // not '0', to allow GetNextIFrame() below to work!
-        uchar FileNumber;
-        int FileOffset;
-        readIndex = writeIndex = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset) - 1; // Input() will first increment it!
+        Index = max(Index + Seconds * FRAMESPERSEC, 0);
+        if (Index > 0)
+           Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
+        if (Index >= 0)
+           readIndex = writeIndex = Index - 1; // Input() will first increment it!
         }
      Empty(false);
      Play();
@@ -1250,9 +1262,9 @@ void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
      if (playMode == pmStill)
-        Current = readIndex;
+        Current = max(readIndex, 0);
      else {
-        Current = writeIndex;
+        Current = max(writeIndex, 0);
         if (SnapToIFrame) {
            int i1 = index->GetNextIFrame(Current + 1, false);
            int i2 = index->GetNextIFrame(Current, true);
@@ -2392,6 +2404,12 @@ void cCuttingBuffer::Action(void)
                  Index = Mark->position;
                  Mark = fromMarks.Next(Mark);
                  CurrentFileNumber = 0; // triggers SetOffset before reading next frame
+                 if (Setup.SplitEditedFiles) {
+                    toFile = toFileName->NextFile();
+                    if (toFile < 0)
+                       break;
+                    FileSize = 0;
+                    }
                  }
               // the 'else' case (i.e. 'final end mark reached') is handled above
               // in 'Write one frame', so that the edited version will end right
@@ -3163,7 +3181,7 @@ void cDvbApi::SetModeNormal(bool FromRecording)
 
 void cDvbApi::SetVideoFormat(videoFormat_t Format)
 {
-  if (fd_video)
+  if (fd_video >= 0)
      CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, Format));
 }
 
diff --git a/eit.c b/eit.c
index 1fceeef1e..71ab54c3f 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.24 2001/09/22 13:07:21 kls Exp $
+ * $Id: eit.c 1.28 2001/10/19 13:13:25 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -126,7 +126,8 @@ bool cMJD::SetSystemTime()
    struct tm *ptm;
    time_t loctim;
 
-   ptm = localtime(&mjdtime);
+   struct tm tm_r;
+   ptm = localtime_r(&mjdtime, &tm_r);
    loctim = time(NULL);
 
    if (abs(mjdtime - loctim) > 2)
@@ -240,7 +241,8 @@ const char * cEventInfo::GetDate() const
 {
    static char szDate[25];
 
-   strftime(szDate, sizeof(szDate), "%d.%m.%Y", localtime(&tTime));
+   struct tm tm_r;
+   strftime(szDate, sizeof(szDate), "%d.%m.%Y", localtime_r(&tTime, &tm_r));
 
    return szDate;
 }
@@ -249,7 +251,8 @@ const char * cEventInfo::GetTimeString() const
 {
    static char szTime[25];
 
-   strftime(szTime, sizeof(szTime), "%R", localtime(&tTime));
+   struct tm tm_r;
+   strftime(szTime, sizeof(szTime), "%R", localtime_r(&tTime, &tm_r));
 
    return szTime;
 }
@@ -259,7 +262,8 @@ const char * cEventInfo::GetEndTimeString() const
    static char szEndTime[25];
    time_t tEndTime = tTime + lDuration;
 
-   strftime(szEndTime, sizeof(szEndTime), "%R", localtime(&tEndTime));
+   struct tm tm_r;
+   strftime(szEndTime, sizeof(szEndTime), "%R", localtime_r(&tEndTime, &tm_r));
 
    return szEndTime;
 }
@@ -337,6 +341,12 @@ void cEventInfo::Dump(FILE *f, const char *Prefix) const
 
 void cEventInfo::FixEpgBugs(void)
 {
+  // VDR can't usefully handle newline characters in the EPG data, so let's
+  // always convert them to blanks (independent of the setting of EPGBugfixLevel):
+  strreplace(pTitle, '\n', ' ');
+  strreplace(pSubtitle, '\n', ' ');
+  strreplace(pExtendedDescription, '\n', ' ');
+
   if (Setup.EPGBugfixLevel == 0)
      return;
 
@@ -395,7 +405,6 @@ void cEventInfo::FixEpgBugs(void)
            pSubtitle = NULL;
            }
         }
-     }
 
      // Pro7 sometimes repeats the Title in the Subtitle:
      //
@@ -445,6 +454,13 @@ void cEventInfo::FixEpgBugs(void)
               }
         }
 
+     // Some channels use the ` ("backtick") character, where a ' (single quote)
+     // would be normally used. Actually, "backticks" in normal text don't make
+     // much sense, so let's replace them:
+     strreplace(pTitle, '`', '\'');
+     strreplace(pSubtitle, '`', '\'');
+     strreplace(pExtendedDescription, '`', '\'');
+
      if (Setup.EPGBugfixLevel <= 2)
         return;
 
@@ -455,10 +471,12 @@ void cEventInfo::FixEpgBugs(void)
      // correctly on the ASTRA satellite system.
      if (uServiceID == 898    // Pro-7
       || uServiceID == 899) { // Kabel 1
-        tm *t = localtime(&tTime);
+        struct tm tm_r;
+        tm *t = localtime_r(&tTime, &tm_r);
         if (t->tm_hour * 3600 + t->tm_min * 60 + t->tm_sec <= 6 * 3600)
            tTime += 24 * 3600;
         }
+     }
 }
 
 // --- cSchedule -------------------------------------------------------------
@@ -873,7 +891,8 @@ void cSIProcessor::Action()
       if (masterSIProcessor)
       {
          time_t now = time(NULL);
-         struct tm *ptm = localtime(&now);
+         struct tm tm_r;
+         struct tm *ptm = localtime_r(&now, &tm_r);
          if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
          {
             LOCK_THREAD;
diff --git a/i18n.c b/i18n.c
index 5e440c951..926624a8a 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.43 2001/09/16 14:43:05 kls Exp $
+ * $Id: i18n.c 1.44 2001/09/30 11:31:43 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -929,6 +929,15 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "SplitEditedFiles",
+    "Editierte Dateien zerteilen",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "MinEventTimeout",
     "Mindest Event Pause",
     "", // TODO
diff --git a/libdtv/Makefile b/libdtv/Makefile
index 50a140044..56cb53305 100644
--- a/libdtv/Makefile
+++ b/libdtv/Makefile
@@ -4,9 +4,9 @@
 ###                                                        ###
 ##############################################################
 
-## $Revision: 1.1 $
-## $Date: 2001/06/25 12:53:00 $
-## $Author: kls $
+## $Revision: 1.3 $
+## $Date: 2001/06/25 12:51:41 $
+## $Author: hakenes $
 ##
 ##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 ##
diff --git a/libdtv/liblx/Makefile b/libdtv/liblx/Makefile
index a8034dec2..2531708ae 100644
--- a/libdtv/liblx/Makefile
+++ b/libdtv/liblx/Makefile
@@ -4,9 +4,9 @@
 ###                                                        ###
 ##############################################################
 
-## $Revision: 1.1 $
-## $Date: 2001/06/26 07:18:42 $
-## $Author: kls $
+## $Revision: 1.2 $
+## $Date: 2001/06/25 19:39:00 $
+## $Author: hakenes $
 ##
 ##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 ##
diff --git a/libdtv/liblx/liblx.h b/libdtv/liblx/liblx.h
index f2527e7ab..26ea664ac 100644
--- a/libdtv/liblx/liblx.h
+++ b/libdtv/liblx/liblx.h
@@ -4,9 +4,9 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/06/26 07:18:42 $
-// $Author: kls $
+// $Revision: 1.2 $
+// $Date: 2001/06/25 19:39:00 $
+// $Author: hakenes $
 //
 //   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
diff --git a/libdtv/liblx/xListFuncs.c b/libdtv/liblx/xListFuncs.c
index 34df7a895..7457170eb 100644
--- a/libdtv/liblx/xListFuncs.c
+++ b/libdtv/liblx/xListFuncs.c
@@ -6,7 +6,7 @@
 
 // $Revision: 1.1 $
 // $Date: 2001/06/25 12:29:47 $
-// $Author: kls $
+// $Author: hakenes $
 //
 //   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
diff --git a/libdtv/liblx/xMemMgt.c b/libdtv/liblx/xMemMgt.c
index 363ee4a59..8f619bc8b 100644
--- a/libdtv/liblx/xMemMgt.c
+++ b/libdtv/liblx/xMemMgt.c
@@ -6,7 +6,7 @@
 
 // $Revision: 1.1 $
 // $Date: 2001/06/25 12:29:47 $
-// $Author: kls $
+// $Author: hakenes $
 //
 //   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
diff --git a/libdtv/libsi/Makefile b/libdtv/libsi/Makefile
index 4b939b944..38bff9351 100644
--- a/libdtv/libsi/Makefile
+++ b/libdtv/libsi/Makefile
@@ -4,9 +4,9 @@
 ###                                                        ###
 ##############################################################
 
-## $Revision: 1.1 $
-## $Date: 2001/08/15 14:47:22 $
-## $Author: kls $
+## $Revision: 1.4 $
+## $Date: 2001/10/07 10:24:46 $
+## $Author: hakenes $
 ##
 ##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 ##
@@ -80,4 +80,4 @@ $(SILIB) : $(OBJS)
 	@echo compiling $<...
 	@$(CC) $(DEFINES) $(CFLAGS) $(INCDIRS) -c $<
 
-include Makefile.dep
+-include Makefile.dep
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index 3790ae156..dda2b1e4e 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -4,9 +4,9 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/06/26 07:18:43 $
-// $Author: kls $
+// $Revision: 1.4 $
+// $Date: 2001/10/07 10:24:46 $
+// $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
@@ -288,18 +288,20 @@ struct PidInfo {
    } while (0)
 
 
-#define STREAMTYPE_ISO_VIDEO                     1
+#define STREAMTYPE_11172_VIDEO                   1
 #define STREAMTYPE_13818_VIDEO                   2
 #define STREAMTYPE_11172_AUDIO                   3
 #define STREAMTYPE_13818_AUDIO                   4
-#define STREAMTYPE_VIDEOTEXT                     6
-#define STREAMTYPE_13522_MPEG                    7
-#define STREAMTYPE_ITU_222                       8
-#define STREAMTYPE_13818_A                       9
-#define STREAMTYPE_13818_B                      10
-#define STREAMTYPE_13818_C                      11
-#define STREAMTYPE_13818_D                      12
-#define STREAMTYPE_13818_AUX                    13
+#define STREAMTYPE_13818_PRIVATE                 5
+#define STREAMTYPE_13818_PES_PRIVATE             6
+#define STREAMTYPE_13522_MHPEG                   7
+#define STREAMTYPE_13818_DSMCC                   8
+#define STREAMTYPE_ITU_222_1                     9
+#define STREAMTYPE_13818_A                      10
+#define STREAMTYPE_13818_B                      11
+#define STREAMTYPE_13818_C                      12
+#define STREAMTYPE_13818_D                      13
+#define STREAMTYPE_13818_AUX                    14
 
 /* Descriptors */
 
@@ -331,6 +333,58 @@ struct Iso639LanguageDescriptor {
    } while (0)
 
 
+/* Ac3Descriptor */
+
+#define AC3_TYPE_FLAG          0x0001
+#define BS_ID_FLAG             0x0002
+#define MAIN_ID_FLAG           0x0004
+#define ASVC_FLAG              0x0008
+
+struct Ac3Descriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       PresentFlags;
+   unsigned short       Ac3Type;
+   unsigned short       BsId;
+   unsigned short       MainId;
+   unsigned short       Asvc;
+   unsigned short       Amount;        /* AdditionalData */
+   unsigned char       *AdditionalData;
+};
+
+#define CreateAc3Descriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct Ac3Descriptor *)descr), NULL); \
+      ((struct Ac3Descriptor *)descr)->Tag = DESCR_AC3; \
+   } while (0)
+
+#define AddAc3FlagAndValue(descr, flg, val) \
+   do \
+   { \
+      if ((flg) & AC3_TYPE_FLAG) { \
+         ((struct Ac3Descriptor *)descr)->PresentFlags |= AC3_TYPE_FLAG; \
+         ((struct Ac3Descriptor *)descr)->Ac3Type = (val); } \
+      else if ((flg) & BS_ID_FLAG) { \
+         ((struct Ac3Descriptor *)descr)->PresentFlags |= BS_ID_FLAG; \
+         ((struct Ac3Descriptor *)descr)->BsId = (val); } \
+      else if ((flg) & MAIN_ID_FLAG) { \
+         ((struct Ac3Descriptor *)descr)->PresentFlags |= MAIN_ID_FLAG; \
+         ((struct Ac3Descriptor *)descr)->MainId = (val); } \
+      else if ((flg) & ASVC_FLAG) { \
+         ((struct Ac3Descriptor *)descr)->PresentFlags |= ASVC_FLAG; \
+         ((struct Ac3Descriptor *)descr)->Asvc = (val); } \
+   } while (0)
+
+#define AddAc3AdditionalData(descr, ptr, len) \
+   do \
+   { \
+      xMemAlloc ((len)+1, &(((struct Ac3Descriptor *) \
+         descr)->AdditionalData)); \
+      memcpy ((((struct Ac3Descriptor *)descr)->AdditionalData),(ptr),(len)); \
+   } while (0)
+
+
 /* AncillaryDataDescriptor */
 
 struct AncillaryDataDescriptor {
@@ -778,6 +832,106 @@ struct ShortEventDescriptor {
    } while (0)
 
 
+/* TeletextDescriptor */
+
+struct TeletextDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   struct LIST         *Items;
+};
+
+#define CreateTeletextDescriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct TeletextDescriptor *)descr), NULL); \
+      ((struct TeletextDescriptor *)descr)->Tag = DESCR_TELETEXT; \
+      ((struct TeletextDescriptor *)descr)->Items = xNewList (NULL); \
+   } while (0)
+
+#define TELETEXT_TYPE_INITIAL_PAGE         0x0001
+#define TELETEXT_TYPE_SUBTITLE_PAGE        0x0002
+#define TELETEXT_TYPE_ADDITIONAL_INFO      0x0003
+#define TELETEXT_TYPE_PROGRAM_SCHEDULE     0x0004
+#define TELETEXT_TYPE_HEARING_IMPAIRED     0x0005
+
+struct TeletextItem {
+   struct NODE          Node;
+   char                 LanguageCode[4];
+   unsigned short       Type;
+   unsigned short       MagazineNumber;
+   unsigned short       PageNumber;
+};
+
+#define CreateTeletextItem(itm, tp, mg, pg, lc1, lc2, lc3) \
+   do \
+   { \
+      xCreateNode (itm, NULL); \
+      ((struct TeletextItem *)itm)->Type = (tp); \
+      ((struct TeletextItem *)itm)->MagazineNumber = (mg); \
+      ((struct TeletextItem *)itm)->PageNumber = (mg); \
+      ((struct TeletextItem *)itm)->LanguageCode[0] = (lc1); \
+      ((struct TeletextItem *)itm)->LanguageCode[1] = (lc2); \
+      ((struct TeletextItem *)itm)->LanguageCode[2] = (lc3); \
+      ((struct TeletextItem *)itm)->LanguageCode[3] = '\0'; \
+   } while (0)
+
+#define AddTeletextItem(desc, tp, mg, pg, lc1, lc2, lc3) \
+   do \
+   { \
+      struct TeletextItem *item; \
+      \
+      CreateTeletextItem(item, tp, mg, pg, lc1, lc2, lc3); \
+      xAddTail (((struct TeletextDescriptor *)desc)->Items, item); \
+   } while (0)
+
+
+/* SubtitlingDescriptor */
+
+struct SubtitlingDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   struct LIST         *Items;
+};
+
+#define CreateSubtitlingDescriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct SubtitlingDescriptor *)descr), NULL); \
+      ((struct SubtitlingDescriptor *)descr)->Tag = DESCR_SUBTITLING; \
+      ((struct SubtitlingDescriptor *)descr)->Items = xNewList (NULL); \
+   } while (0)
+
+struct SubtitlingItem {
+   struct NODE          Node;
+   char                 LanguageCode[4];
+   unsigned char        Type;
+   unsigned short       CompositionPageId;
+   unsigned short       AncillaryPageId;
+};
+
+#define CreateSubtitlingItem(itm, tp, cp, ap, lc1, lc2, lc3) \
+   do \
+   { \
+      xCreateNode (itm, NULL); \
+      ((struct SubtitlingItem *)itm)->Type = (tp); \
+      ((struct SubtitlingItem *)itm)->CompositionPageId = (cp); \
+      ((struct SubtitlingItem *)itm)->AncillaryPageId = (ap); \
+      ((struct SubtitlingItem *)itm)->LanguageCode[0] = (lc1); \
+      ((struct SubtitlingItem *)itm)->LanguageCode[1] = (lc2); \
+      ((struct SubtitlingItem *)itm)->LanguageCode[2] = (lc3); \
+      ((struct SubtitlingItem *)itm)->LanguageCode[3] = '\0'; \
+   } while (0)
+
+#define AddSubtitlingItem(desc, tp, cp, ap, lc1, lc2, lc3) \
+   do \
+   { \
+      struct SubtitlingItem *item; \
+      \
+      CreateSubtitlingItem(item, tp, cp, ap, lc1, lc2, lc3); \
+      xAddTail (((struct SubtitlingDescriptor *)desc)->Items, item); \
+   } while (0)
+
+
 
 /* Prototypes */
 
diff --git a/libdtv/libsi/include/si_tables.h b/libdtv/libsi/include/si_tables.h
index 517838af8..dfda3bf9d 100644
--- a/libdtv/libsi/include/si_tables.h
+++ b/libdtv/libsi/include/si_tables.h
@@ -5,9 +5,9 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/06/25 12:41:20 $
-// $Author: kls $
+// $Revision: 1.3 $
+// $Date: 2001/10/07 10:24:46 $
+// $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
@@ -26,9 +26,6 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-#ifndef SI_TABLES_H
-#define SI_TABLES_H
-
 #define HILO(x) (x##_hi << 8 | x##_lo)
 
 #define MjdToEpochTime(x) (((x##_hi << 8 | x##_lo)-40587)*86400)
@@ -930,14 +927,29 @@ typedef struct parental_rating_struct {
 
 /* 0x56 teletext_descriptor */
 
-#define DESCR_TELETEXT_LEN XX
+#define DESCR_TELETEXT_LEN 2
 typedef struct descr_teletext_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
 } descr_teletext_t;
 #define CastTeletextDescriptor(x) ((descr_teletext_t *)(x))
 
+#define ITEM_TELETEXT_LEN 5
+typedef struct item_teletext_struct {
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char type                                   :5; 
+   u_char magazine_number                        :3; 
+#else 
+   u_char magazine_number                        :3; 
+   u_char type                                   :5; 
+#endif 
+   u_char page_number                            :8; 
+} item_teletext_t;
+#define CastTeletextItem(x) ((item_teletext_t *)(x))
+
 
 /* 0x57 telephone_descriptor */
 
@@ -963,14 +975,26 @@ typedef struct descr_local_time_offset_struct {
 
 /* 0x59 subtitling_descriptor */
 
-#define DESCR_SUBTITLING_LEN XX
+#define DESCR_SUBTITLING_LEN 2
 typedef struct descr_subtitling_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
 } descr_subtitling_t;
 #define CastSubtitlingDescriptor(x) ((descr_subtitling_t *)(x))
 
+#define ITEM_SUBTITLING_LEN 8
+typedef struct item_subtitling_struct {
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+   u_char subtitling_type                        :8; 
+   u_char composition_page_id_hi                 :8; 
+   u_char composition_page_id_lo                 :8; 
+   u_char ancillary_page_id_hi                   :8; 
+   u_char ancillary_page_id_lo                   :8; 
+} item_subtitling_t;
+#define CastSubtitlingItem(x) ((item_subtitling_t *)(x))
+
 
 /* 0x5A terrestrial_delivery_system_descriptor */
 
@@ -1150,11 +1174,27 @@ typedef struct descr_pdc_struct {
 
 /* 0x6A ac3_descriptor */
 
-#define DESCR_AC3_LEN XX
+#define DESCR_AC3_LEN 3
 typedef struct descr_ac3_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char ac3_type_flag                          :1;
+   u_char bsid_flag                              :1;
+   u_char mainid_flag                            :1;
+   u_char asvc_flag                              :1;
+   u_char reserved                               :4;
+#else
+   u_char reserved                               :4;
+   u_char asvc_flag                              :1;
+   u_char mainid_flag                            :1;
+   u_char bsid_flag                              :1;
+   u_char ac3_type_flag                          :1;
+#endif
+   u_char ac3_type                               :8;
+   u_char bsid                                   :8;
+   u_char mainid                                 :8;
+   u_char asvc                                   :8;
 } descr_ac3_t;
 #define CastAc3Descriptor(x) ((descr_ac3_t *)(x))
 
@@ -1202,4 +1242,4 @@ typedef struct descr_announcement_support_struct {
 } descr_announcement_support_t;
 #define CastAnnouncementSupportDescriptor(x) ((descr_announcement_support_t *)(x))
 
-#endif
+
diff --git a/libdtv/libsi/si_debug_services.c b/libdtv/libsi/si_debug_services.c
index dd09cff8c..ae2a92a6c 100644
--- a/libdtv/libsi/si_debug_services.c
+++ b/libdtv/libsi/si_debug_services.c
@@ -4,9 +4,9 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/08/15 14:40:55 $
-// $Author: kls $
+// $Revision: 1.4 $
+// $Date: 2001/10/07 10:24:46 $
+// $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
@@ -34,8 +34,6 @@
 #include "si_debug_services.h"
 
 
-
-
 void siDebugServices (struct LIST *Services)
 {
    struct Service *Service;
@@ -328,9 +326,9 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
                ((struct ExtendedEventDescriptor *)Descriptor)->LanguageCode);
             xForeach (((struct ExtendedEventDescriptor *)Descriptor)->Items, Item)
             {
-               printf ("%s   Item:\n");
-               printf ("%s      Description: %s\n", xName(Item));
-               printf ("%s      Text: %s\n", Item->Text);
+               printf ("%s   Item:\n", Prepend);
+               printf ("%s      Description: %s\n", Prepend, xName(Item));
+               printf ("%s      Text: %s\n", Prepend, Item->Text);
             }
          }
          break;
@@ -445,6 +443,52 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
             }
          break;
 
+         case DESCR_TELETEXT:
+         {
+            struct TeletextItem *Item;
+
+            printf ("%sDescriptor: Teletext\n", Prepend);
+            xForeach (((struct TeletextDescriptor *)Descriptor)->Items, Item)
+            {
+               printf ("%s   Item:\n");
+               printf ("%s      LanguageCode: %s\n", Prepend, Item->LanguageCode);
+               printf ("%s      Type: ", Prepend);
+               switch (Item->Type)
+               {
+                  case 0x01: printf ("initial Teletext page\n"); break;
+                  case 0x02: printf ("Teletext subtitle page\n"); break;
+                  case 0x03: printf ("additional information page\n"); break;
+                  case 0x04: printf ("programme schedule page\n"); break;
+                  case 0x05: printf ("Teletext subtitle page ");
+                             printf ("for hearing impaired people\n"); break;
+                  default: printf ("reserved for future use\n"); break;
+               }
+               printf ("%s      MagazineNumber: %x\n", Prepend, Item->MagazineNumber);
+               printf ("%s      PageNumber: %x\n", Prepend, Item->PageNumber);
+            }
+         }
+         break;
+
+         case DESCR_SUBTITLING:
+         {
+            struct SubtitlingItem *Item;
+
+            printf ("%sDescriptor: Subtitling\n", Prepend);
+            xForeach (((struct SubtitlingDescriptor *)Descriptor)->Items, Item)
+            {
+               printf ("%s   Item:\n");
+               printf ("%s      LanguageCode: %s\n", Prepend, Item->LanguageCode);
+               printf ("%s      Type: ", Prepend);
+               for (i = 0; i < COMPONENT_TYPE_NUMBER; i++)
+                  if ((0x03 == ComponentTypes[i].Content) &&
+                      (Item->Type == ComponentTypes[i].Type))
+                  { printf ("%s\n", ComponentTypes[i].Description); break; }
+               printf ("%s      CompositionPageId: %x\n", Prepend, Item->CompositionPageId);
+               printf ("%s      AncillaryPageId: %x\n", Prepend, Item->AncillaryPageId);
+            }
+         }
+         break;
+
          case DESCR_NW_NAME:
          case DESCR_SERVICE_LIST:
          case DESCR_STUFFING:
@@ -453,10 +497,8 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
          case DESCR_VBI_DATA:
          case DESCR_VBI_TELETEXT:
          case DESCR_MOSAIC:
-         case DESCR_TELETEXT:
          case DESCR_TELEPHONE:
          case DESCR_LOCAL_TIME_OFF:
-         case DESCR_SUBTITLING:
          case DESCR_TERR_DEL_SYS:
          case DESCR_ML_NW_NAME:
          case DESCR_ML_BQ_NAME:
diff --git a/libdtv/libsi/si_debug_services.h b/libdtv/libsi/si_debug_services.h
index 33528dbbb..cd4f196b7 100644
--- a/libdtv/libsi/si_debug_services.h
+++ b/libdtv/libsi/si_debug_services.h
@@ -6,7 +6,7 @@
 
 // $Revision: 1.1 $
 // $Date: 2001/06/25 12:29:47 $
-// $Author: kls $
+// $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index acafa7b2e..76d72c8f1 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -4,9 +4,9 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/08/15 14:41:45 $
-// $Author: kls $
+// $Revision: 1.4 $
+// $Date: 2001/10/07 10:24:46 $
+// $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
@@ -725,6 +725,62 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    Ptr + DESCR_LINKAGE_LEN);
       break;
 
+      case DESCR_TELETEXT:
+         CreateTeletextDescriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer) - DESCR_TELETEXT_LEN;
+         Ptr += DESCR_TELETEXT_LEN;
+         while (Length > 0)
+         {
+            AddTeletextItem (Descriptor,
+                   CastTeletextItem(Ptr)->type,
+                   CastTeletextItem(Ptr)->magazine_number,
+                   CastTeletextItem(Ptr)->page_number,
+                   CastTeletextItem(Ptr)->lang_code1,
+                   CastTeletextItem(Ptr)->lang_code2,
+                   CastTeletextItem(Ptr)->lang_code3);
+            Length -= ITEM_TELETEXT_LEN;
+            Ptr += ITEM_TELETEXT_LEN;
+         }
+      break;
+
+      case DESCR_AC3:
+         CreateAc3Descriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer);
+         if (CastAc3Descriptor(Buffer)->ac3_type_flag)
+          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
+            AC3_TYPE_FLAG, CastAc3Descriptor(Buffer)->ac3_type); }
+         if (CastAc3Descriptor(Buffer)->bsid_flag)
+          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
+            BS_ID_FLAG, CastAc3Descriptor(Buffer)->bsid); }
+         if (CastAc3Descriptor(Buffer)->mainid_flag)
+          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
+            MAIN_ID_FLAG, CastAc3Descriptor(Buffer)->mainid); }
+         if (CastAc3Descriptor(Buffer)->asvc_flag)
+          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
+            ASVC_FLAG, CastAc3Descriptor(Buffer)->asvc); }
+         Length -= DESCR_AC3_LEN;
+         Ptr += DESCR_AC3_LEN;
+         if (Length) AddAc3AdditionalData (Descriptor, Ptr, Length);
+      break;
+
+      case DESCR_SUBTITLING:
+         CreateSubtitlingDescriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer) - DESCR_SUBTITLING_LEN;
+         Ptr += DESCR_SUBTITLING_LEN;
+         while (Length > 0)
+         {
+            AddSubtitlingItem (Descriptor,
+                   CastSubtitlingItem(Ptr)->subtitling_type,
+                   HILO (CastSubtitlingItem(Ptr)->composition_page_id),
+                   HILO (CastSubtitlingItem(Ptr)->ancillary_page_id),
+                   CastSubtitlingItem(Ptr)->lang_code1,
+                   CastSubtitlingItem(Ptr)->lang_code2,
+                   CastSubtitlingItem(Ptr)->lang_code3);
+            Length -= ITEM_SUBTITLING_LEN;
+            Ptr += ITEM_SUBTITLING_LEN;
+         }
+      break;
+
       case DESCR_VIDEO_STREAM:
       case DESCR_AUDIO_STREAM:
       case DESCR_HIERARCHY:
@@ -748,10 +804,8 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_VBI_DATA:
       case DESCR_VBI_TELETEXT:
       case DESCR_MOSAIC:
-      case DESCR_TELETEXT:
       case DESCR_TELEPHONE:
       case DESCR_LOCAL_TIME_OFF:
-      case DESCR_SUBTITLING:
       case DESCR_TERR_DEL_SYS:
       case DESCR_ML_NW_NAME:
       case DESCR_ML_BQ_NAME:
@@ -768,7 +822,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_TRANSPORT_STREAM:
       case DESCR_DSNG:
       case DESCR_PDC:
-      case DESCR_AC3:
       case DESCR_CELL_LIST:
       case DESCR_CELL_FREQ_LINK:
       case DESCR_ANNOUNCEMENT_SUPPORT:
@@ -799,8 +852,11 @@ char *siGetDescriptorText (u_char *Buffer, u_int Length)
          if (*Buffer == 0) break;
 
          if ((*Buffer >= ' ' && *Buffer <= '~') ||
-             (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer++;
-         else Buffer++;
+             (*Buffer == '\n') ||
+             (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer;
+         if (*Buffer == 0x8A) *tmp++ = '\n';
+         if (*Buffer == 0x86 || *Buffer == 0x87) *tmp++ = ' ';
+         Buffer++;
       }
       *tmp = '\0';
    }
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
index 8aecffc61..8bcab4cb1 100644
--- a/libdtv/libvdr/Makefile
+++ b/libdtv/libvdr/Makefile
@@ -4,9 +4,9 @@
 ###                                                        ###
 ##############################################################
 
-## $Revision: 1.1 $
-## $Date: 2001/08/15 14:05:16 $
-## $Author: kls $
+## $Revision: 1.3 $
+## $Date: 2001/10/06 15:33:46 $
+## $Author: hakenes $
 ##
 ##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 ##
diff --git a/libdtv/libvdr/libvdr.c b/libdtv/libvdr/libvdr.c
index 5caa5d7c4..0ade4d39d 100644
--- a/libdtv/libvdr/libvdr.c
+++ b/libdtv/libvdr/libvdr.c
@@ -5,8 +5,8 @@
 //////////////////////////////////////////////////////////////
 
 // $Revision: 1.1 $
-// $Date: 2001/08/15 14:05:24 $
-// $Author: kls $
+// $Date: 2001/10/07 10:25:33 $
+// $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
diff --git a/libdtv/libvdr/libvdr.h b/libdtv/libvdr/libvdr.h
index 6fde10be3..421b2e719 100644
--- a/libdtv/libvdr/libvdr.h
+++ b/libdtv/libvdr/libvdr.h
@@ -4,9 +4,9 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/08/15 10:54:13 $
-// $Author: kls $
+// $Revision: 1.4 $
+// $Date: 2001/10/06 15:33:46 $
+// $Author: hakenes $
 //
 //   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
 //
diff --git a/menu.c b/menu.c
index 23b16e294..0242d91f9 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.127 2001/09/23 10:58:48 kls Exp $
+ * $Id: menu.c 1.131 2001/10/21 14:28:14 kls Exp $
  */
 
 #include "menu.h"
@@ -1636,11 +1636,12 @@ cMenuDVD::cMenuDVD(void)
      dvd->Open();
      ifo_handle_t *vmg = dvd->openVMG();
      if (vmg) {
+        int lastTitleID = cReplayControl::LastTitleID();
         dsyslog(LOG_INFO, "DVD: vmg: %p", vmg);//XXX
         tt_srpt_t *tt_srpt = vmg->tt_srpt;
         dsyslog(LOG_INFO, "DVD: tt_srpt: %p", tt_srpt);//XXX
         for (int i = 0; i < tt_srpt->nr_of_srpts; i++)
-            Add(new cMenuDVDItem(i, tt_srpt->title[i].nr_of_ptts));
+            Add(new cMenuDVDItem(i, tt_srpt->title[i].nr_of_ptts), i == lastTitleID);
         }
      }
   SetHelp(tr("Play"), NULL, NULL, NULL);
@@ -1724,6 +1725,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
   Add(new cMenuEditIntItem( tr("OSDMessageTime"),     &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditIntItem( tr("MaxVideoFileSize"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
+  Add(new cMenuEditBoolItem(tr("SplitEditedFiles"),   &data.SplitEditedFiles));
   Add(new cMenuEditIntItem( tr("MinEventTimeout"),    &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("MinUserInactivity"),  &data.MinUserInactivity));
   Add(new cMenuEditBoolItem(tr("MultiSpeedMode"),     &data.MultiSpeedMode));
@@ -1807,7 +1809,7 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
 #define STOP_RECORDING tr(" Stop recording ")
 
-cMenuMain::cMenuMain(bool Replaying)
+cMenuMain::cMenuMain(bool Replaying, eOSState State)
 :cOsdMenu(tr("Main"))
 {
   digit = 0;
@@ -1843,6 +1845,13 @@ cMenuMain::cMenuMain(bool Replaying)
   Display();
   lastActivity = time(NULL);
   SetHasHotkeys();
+  switch (State) {
+    case osRecordings: AddSubMenu(new cMenuRecordings); break;
+#ifdef DVDSUPPORT
+    case osDVD:        AddSubMenu(new cMenuDVD); break;
+#endif //DVDSUPPORT
+    default: break;
+    }
 }
 
 const char *cMenuMain::hk(const char *s)
@@ -2374,6 +2383,11 @@ void cReplayControl::SetDVD(cDVD *DVD, int Title)//XXX
   dvd = DVD;
   titleid = Title;
 }
+
+int cReplayControl::LastTitleID(void)
+{
+  return titleid;
+}
 #endif //DVDSUPPORT
 
 const char *cReplayControl::LastReplayed(void)
@@ -2710,9 +2724,9 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     case kRight:   dvbApi->Forward(); break;
     case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
-    case kGreen:   dvbApi->SkipSeconds(-60); DoShowMode = false; break;
+    case kGreen:   dvbApi->SkipSeconds(-60); break;
     case kYellow|k_Repeat:
-    case kYellow:  dvbApi->SkipSeconds( 60); DoShowMode = false; break;
+    case kYellow:  dvbApi->SkipSeconds( 60); break;
     case kBlue:    Hide();
                    dvbApi->StopReplay();
                    return osEnd;
@@ -2740,7 +2754,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    return osRecordings;
+            case kBack:    return fileName ? osRecordings : osDVD;
             default:       return osUnknown;
             }
           }
diff --git a/menu.h b/menu.h
index f7411c61c..b41a935b0 100644
--- a/menu.h
+++ b/menu.h
@@ -4,14 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.30 2001/09/23 10:57:33 kls Exp $
+ * $Id: menu.h 1.33 2001/10/21 14:26:01 kls Exp $
  */
 
 #ifndef _MENU_H
 #define _MENU_H
 
-#define _GNU_SOURCE
-
 #include "dvbapi.h"
 #ifdef DVDSUPPORT
 #include "dvd.h"
@@ -25,7 +23,7 @@ class cMenuMain : public cOsdMenu {
   int digit;
   const char *hk(const char *s);
 public:
-  cMenuMain(bool Replaying);
+  cMenuMain(bool Replaying, eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -135,6 +133,7 @@ class cReplayControl : public cOsdBase {
   static void SetRecording(const char *FileName, const char *Title);
 #ifdef DVDSUPPORT
   static void SetDVD(cDVD *DVD, int Title);//XXX
+  static int LastTitleID(void);
 #endif //DVDSUPPORT
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
diff --git a/recording.c b/recording.c
index df5040740..fe56a6e69 100644
--- a/recording.c
+++ b/recording.c
@@ -4,10 +4,9 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.37 2001/09/23 13:43:29 kls Exp $
+ * $Id: recording.c 1.42 2001/10/20 10:28:28 kls Exp $
  */
 
-#define _GNU_SOURCE
 #include "recording.h"
 #include <errno.h>
 #include <fcntl.h>
@@ -32,7 +31,7 @@
 #define SUMMARYFILESUFFIX "/summary.vdr"
 #define MARKSFILESUFFIX   "/marks.vdr"
 
-#define FINDCMD      "find %s -follow -type d -name '%s' 2> /dev/null | sort -df"
+#define FINDCMD      "find %s -follow -type d -name '%s' 2> /dev/null"
 
 #define MINDISKSPACE 1024 // MB
 
@@ -45,6 +44,10 @@ void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
   if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
+     // Make sure only one instance of VDR does this:
+     cLockFile LockFile(VideoDirectory);
+     if (!LockFile.Lock())
+        return;
      // Remove the oldest file that has been "deleted":
      cRecordings Recordings;
      if (Recordings.Load(true)) {
@@ -74,6 +77,10 @@ void AssertFreeDiskSpace(int Priority)
   static time_t LastFreeDiskCheck = 0;
   if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA) {
      if (!VideoFileSpaceAvailable(MINDISKSPACE)) {
+        // Make sure only one instance of VDR does this:
+        cLockFile LockFile(VideoDirectory);
+        if (!LockFile.Lock())
+           return;
         // Remove the oldest file that has been "deleted":
         cRecordings Recordings;
         if (Recordings.Load(true)) {
@@ -207,6 +214,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
 cRecording::cRecording(cTimer *Timer, const char *Subtitle, const char *Summary)
 {
   titleBuffer = NULL;
+  sortBuffer = NULL;
   fileName = NULL;
   if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
      name = strdup(Timer->file);
@@ -235,6 +243,7 @@ cRecording::cRecording(cTimer *Timer, const char *Subtitle, const char *Summary)
 cRecording::cRecording(const char *FileName)
 {
   titleBuffer = NULL;
+  sortBuffer = NULL;
   fileName = strdup(FileName);
   FileName += strlen(VideoDirectory) + 1;
   char *p = strrchr(FileName, '/');
@@ -243,7 +252,8 @@ cRecording::cRecording(const char *FileName)
   summary = NULL;
   if (p) {
      time_t now = time(NULL);
-     struct tm t = *localtime(&now); // this initializes the time zone in 't'
+     struct tm tm_r;
+     struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
      t.tm_isdst = -1; // makes sure mktime() will determine the correct dst setting
      if (7 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
         t.tm_year -= 1900;
@@ -294,15 +304,55 @@ cRecording::cRecording(const char *FileName)
 cRecording::~cRecording()
 {
   delete titleBuffer;
+  delete sortBuffer;
   delete fileName;
   delete name;
   delete summary;
 }
 
+char *cRecording::StripEpisodeName(char *s)
+{
+  char *t = s, *s1 = NULL, *s2 = NULL;
+  while (*t) {
+        if (*t == '/') {
+           if (s1) {
+              if (s2)
+                 s1 = s2;
+              s2 = t;
+              }
+           else
+              s1 = t;
+           }
+        t++;
+        }
+  if (s1 && s2)
+     memmove(s1 + 1, s2, t - s2 + 1);
+  return s;
+}
+
+char *cRecording::SortName(void)
+{
+  if (!sortBuffer) {
+     char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+     int l = strxfrm(NULL, s, 0);
+     sortBuffer = new char[l];
+     strxfrm(sortBuffer, s, l);
+     delete s;
+     }
+  return sortBuffer;
+}
+
+bool cRecording::operator< (const cListObject &ListObject)
+{
+  cRecording *r = (cRecording *)&ListObject;
+  return strcasecmp(SortName(), r->SortName()) < 0;
+}
+
 const char *cRecording::FileName(void)
 {
   if (!fileName) {
-     struct tm *t = localtime(&start);
+     struct tm tm_r;
+     struct tm *t = localtime_r(&start, &tm_r);
      ExchangeChars(name, true);
      asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
      ExchangeChars(name, false);
@@ -320,7 +370,8 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator)
      }
   delete titleBuffer;
   titleBuffer = NULL;
-  struct tm *t = localtime(&start);
+  struct tm tm_r;
+  struct tm *t = localtime_r(&start, &tm_r);
   asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s",
                          t->tm_mday,
                          t->tm_mon + 1,
@@ -401,6 +452,7 @@ bool cRecordings::Load(bool Deleted)
               delete r;
            }
      pclose(p);
+     Sort();
      result = Count() > 0;
      }
   else
@@ -523,7 +575,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
      char *cmd;
      asprintf(&cmd, "%s %s '%s'", command, State, RecordingFileName);
      isyslog(LOG_INFO, "executing '%s'", cmd);
-     system(cmd);
+     SystemExec(cmd);
      delete cmd;
      }
 }
diff --git a/recording.h b/recording.h
index d2391a907..aead97e36 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.17 2001/09/23 13:43:58 kls Exp $
+ * $Id: recording.h 1.18 2001/10/07 10:38:56 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -32,9 +32,12 @@ class cRecording : public cListObject {
   friend class cRecordings;
 private:
   char *titleBuffer;
+  char *sortBuffer;
   char *fileName;
   char *name;
   char *summary;
+  char *StripEpisodeName(char *s);
+  char *SortName(void);
 public:
   time_t start;
   int priority;
@@ -42,6 +45,7 @@ class cRecording : public cListObject {
   cRecording(cTimer *Timer, const char *Subtitle, const char *Summary);
   cRecording(const char *FileName);
   ~cRecording();
+  virtual bool operator< (const cListObject &ListObject);
   const char *FileName(void);
   const char *Title(char Delimiter = ' ', bool NewIndicator = false);
   const char *Summary(void) { return summary; }
diff --git a/remote.c b/remote.c
index eed91105b..26d7acbf7 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.24 2001/08/12 15:07:26 kls Exp $
+ * $Id: remote.c 1.25 2001/09/30 11:39:49 kls Exp $
  */
 
 #include "remote.h"
@@ -451,6 +451,7 @@ void cRcIoLIRC::Action(void)
                if (Now - FirstTime < REPEATDELAY)
                   continue; // repeat function kicks in after a short delay
                receivedData = receivedRepeat = true;
+               receivedRelease = false;
                }
             LastTime = Now;
             WakeUp();
diff --git a/svdrp.c b/svdrp.c
index 3c90bb02d..43c55e467 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,11 +10,9 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.24 2001/09/22 13:30:02 kls Exp $
+ * $Id: svdrp.c 1.25 2001/10/07 15:13:42 kls Exp $
  */
 
-#define _GNU_SOURCE
-
 #include "svdrp.h"
 #include <arpa/inet.h>
 #include <ctype.h>
diff --git a/thread.c b/thread.c
index f4ba76a19..b51489ec8 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.13 2001/09/23 14:04:35 kls Exp $
+ * $Id: thread.c 1.15 2001/10/21 12:25:31 kls Exp $
  */
 
 #include "thread.h"
@@ -161,7 +161,7 @@ void cThread::Cancel(int WaitSeconds)
 
 bool cThread::Lock(void)
 {
-  if (!lockingPid || lockingPid != getpid()) {
+  if (getpid() != lockingPid || !locked) {
      Mutex.Lock();
      lockingPid = getpid();
      }
@@ -342,3 +342,35 @@ int cPipe::Close(void)
 
   return ret;
 }
+
+// --- SystemExec ------------------------------------------------------------
+
+int SystemExec(const char *Command)
+{
+  pid_t pid;
+
+  if ((pid = fork()) < 0) { // fork failed
+     LOG_ERROR;
+     return -1;
+     }
+
+  if (pid > 0) { // parent process
+     int status;
+     if (waitpid(pid, &status, 0) < 0) {
+        LOG_ERROR;
+        return -1;
+        }
+     return status;
+     }
+  else { // child process
+     int MaxPossibleFileDescriptors = getdtablesize();
+     for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
+         close(i); //close all dup'ed filedescriptors
+     if (execl("/bin/sh", "sh", "-c", Command, NULL) == -1) {
+        LOG_ERROR_STR(Command);
+        _exit(-1);
+        }
+     _exit(0);
+     }
+}
+
diff --git a/thread.h b/thread.h
index 221f9ac7a..89dcdf853 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.9 2001/09/15 12:46:52 kls Exp $
+ * $Id: thread.h 1.10 2001/10/20 10:25:19 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -104,4 +104,9 @@ class cPipe {
   int Close(void);
   };
 
+// SystemExec() implements a 'system()' call that closes all unnecessary file
+// descriptors in the child process.
+
+int SystemExec(const char *Command);
+
 #endif //__THREAD_H
diff --git a/tools.c b/tools.c
index 7238137ef..472c50d73 100644
--- a/tools.c
+++ b/tools.c
@@ -4,10 +4,9 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.46 2001/09/22 12:13:40 kls Exp $
+ * $Id: tools.c 1.50 2001/10/19 13:12:45 kls Exp $
  */
 
-#define _GNU_SOURCE
 #include "tools.h"
 #include <ctype.h>
 #include <dirent.h>
@@ -74,6 +73,10 @@ char *strcpyrealloc(char *dest, const char *src)
      else
         esyslog(LOG_ERR, "ERROR: out of memory");
      }
+  else {
+     delete dest;
+     dest = NULL;
+     }
   return dest;
 }
 
@@ -413,7 +416,8 @@ const char *DayDateTime(time_t t)
   static char buffer[32];
   if (t == 0)
      time(&t);
-  tm *tm = localtime(&t);
+  struct tm tm_r;
+  tm *tm = localtime_r(&t, &tm_r);
   int weekday = tm->tm_wday == 0 ? 6 : tm->tm_wday - 1; // we start with monday==0!
   const char *day = tr("MonTueWedThuFriSatSun");
   day += weekday * 3;
@@ -590,6 +594,72 @@ bool cSafeFile::Close(void)
   return result;
 }
 
+// --- cLockFile -------------------------------------------------------------
+
+#define LOCKFILENAME      ".lock-vdr"
+#define LOCKFILESTALETIME 600 // seconds before considering a lock file "stale"
+
+cLockFile::cLockFile(const char *Directory)
+{
+  fileName = NULL;
+  f = -1;
+  if (DirectoryOk(Directory))
+     asprintf(&fileName, "%s/%s", Directory, LOCKFILENAME);
+}
+
+cLockFile::~cLockFile()
+{
+  Unlock();
+  delete fileName;
+}
+
+bool cLockFile::Lock(int WaitSeconds)
+{
+  if (f < 0 && fileName) {
+     time_t Timeout = time(NULL) + WaitSeconds;
+     do {
+        f = open(fileName, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+        if (f < 0) {
+           if (errno == EEXIST) {
+              struct stat fs;
+              if (stat(fileName, &fs) == 0) {
+                 if (time(NULL) - fs.st_mtime > LOCKFILESTALETIME) {
+                    esyslog(LOG_ERR, "ERROR: removing stale lock file '%s'", fileName);
+                    if (remove(fileName) < 0) {
+                       LOG_ERROR_STR(fileName);
+                       break;
+                       }
+                    continue;
+                    }
+                 }
+              else if (errno != ENOENT) {
+                 LOG_ERROR_STR(fileName);
+                 break;
+                 }
+              }
+           else {
+              LOG_ERROR_STR(fileName);
+              break;
+              }
+           if (WaitSeconds)
+              sleep(1);
+           }
+        } while (f < 0 && time(NULL) < Timeout);
+     }
+  return f >= 0;
+}
+
+void cLockFile::Unlock(void)
+{
+  if (f >= 0) {
+     close(f);
+     remove(fileName);
+     f = -1;
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: attempt to unlock %s without holding a lock!", fileName);
+}
+
 // --- cListObject -----------------------------------------------------------
 
 cListObject::cListObject(void)
diff --git a/tools.h b/tools.h
index cc67a8067..843cbf1db 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.35 2001/09/22 12:12:55 kls Exp $
+ * $Id: tools.h 1.36 2001/09/30 10:20:59 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -97,6 +97,17 @@ class cSafeFile {
   bool Close(void);
   };
 
+class cLockFile {
+private:
+  char *fileName;
+  int f;
+public:
+  cLockFile(const char *Directory);
+  ~cLockFile();
+  bool Lock(int WaitSeconds = 0);
+  void Unlock(void);
+  };
+
 class cListObject {
 private:
   cListObject *prev, *next;
diff --git a/vdr.c b/vdr.c
index d7c3f06e7..ce86fd0da 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,11 +22,11 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.79 2001/09/23 14:33:39 kls Exp $
+ * $Id: vdr.c 1.86 2001/10/20 11:18:38 kls Exp $
  */
 
-#define _GNU_SOURCE
 #include <getopt.h>
+#include <locale.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -75,6 +75,10 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
+  // Initiate locale:
+
+  setlocale(LC_ALL, "");
+
   // Command line options:
 
 #define DEFAULTSVDRPPORT 2001
@@ -355,7 +359,6 @@ int main(int argc, char *argv[])
            cRecordControls::Process(Now);
            cTimer *Timer = Timers.GetMatch(Now);
            if (Timer) {
-              dsyslog(LOG_INFO, "system time seen is %s", ctime(&Now));
               if (!cRecordControls::Start(Timer))
                  Timer->SetPending(true);
               }
@@ -405,7 +408,7 @@ int main(int argc, char *argv[])
                  case osRecordings:
                                 DELETENULL(Menu);
                                 DELETENULL(ReplayControl);
-                                Menu = new cMenuRecordings;
+                                Menu = new cMenuMain(ReplayControl, osRecordings);
                                 break;
                  case osReplay: DELETENULL(Menu);
                                 DELETENULL(ReplayControl);
@@ -414,7 +417,7 @@ int main(int argc, char *argv[])
 #ifdef DVDSUPPORT
                  case osDVD:    DELETENULL(Menu);
                                 DELETENULL(ReplayControl);
-                                Menu = new cMenuDVD;
+                                Menu = new cMenuMain(ReplayControl, osDVD);
                                 break;
 #endif //DVDSUPPORT
                  case osStopReplay:
@@ -501,10 +504,12 @@ int main(int argc, char *argv[])
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), LastActivity == 1 ? 5 : SHUTDOWNWAIT, true)) {
+                       int Channel = timer ? timer->channel : 0;
+                       const char *File = timer ? timer->file : "";
                        char *cmd;
-                       asprintf(&cmd, "%s %ld %ld", Shutdown, Next, Delta);
+                       asprintf(&cmd, "%s %ld %ld %d '%s'", Shutdown, Next, Delta, Channel, File);
                        isyslog(LOG_INFO, "executing '%s'", cmd);
-                       system(cmd);
+                       SystemExec(cmd);
                        delete cmd;
                        }
                     else if (WatchdogTimeout > 0) {

From 6e1fd835558b4e70ad94a280a209f050ec0f7a75 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 Nov 2001 18:00:00 +0100
Subject: [PATCH 028/307] =?UTF-8?q?Version=200.98=20-=20Completed=20storin?=
 =?UTF-8?q?g=20the=20current=20audio=20volume=20in=20the=20setup.conf=20fi?=
 =?UTF-8?q?le=20(thanks=20=20=20to=20Andy=20Grobb).=20-=20Fixed=20closing?=
 =?UTF-8?q?=20the=20progress=20display=20with=20the=20"Back"=20key=20when?=
 =?UTF-8?q?=20in=20trick=20mode=20=20=20and=20Setup.ShowReplayMode=20is=20?=
 =?UTF-8?q?enabled=20(thanks=20to=20Stefan=20Huelswitt).=20-=20New=20SVDRP?=
 =?UTF-8?q?=20commands=20LSTR=20and=20DELR=20to=20list=20and=20delete=20re?=
 =?UTF-8?q?cordings=20(thanks=20to=20=20=20Thomas=20Heiligenmann).=20-=20F?=
 =?UTF-8?q?ixed=20a=20crash=20when=20pressing=20the=20'2'=20button=20while?=
 =?UTF-8?q?=20replaying=20a=20DVD.=20-=20Updated=20'channels.conf'=20for?=
 =?UTF-8?q?=20the=20"Bundesliga"=20channels=20of=20Premiere=20World=20=20?=
 =?UTF-8?q?=20(thanks=20to=20Mel=20Sch=E4chner).=20-=20Changed=20the=20tun?=
 =?UTF-8?q?ing=20code=20to=20use=20FrontendInfo=20to=20detect=20the=20type?=
 =?UTF-8?q?=20of=20DVB=20card.=20-=20Removed=20the=20recursion=20stuff=20f?=
 =?UTF-8?q?rom=20cThread=20(cMutex=20already=20does=20this).=20-=20Fixed?=
 =?UTF-8?q?=20handling=20the=20repeat=20function=20in=20the=20channel=20di?=
 =?UTF-8?q?splay.=20-=20Avoiding=20multiple=20EPG=20entries=20for=20the=20?=
 =?UTF-8?q?same=20event=20(thanks=20to=20Rolf=20Hakenes=20=20=20for=20some?=
 =?UTF-8?q?=20valuable=20information=20on=20how=20to=20do=20this).=20-=20A?=
 =?UTF-8?q?=20recording=20on=20the=20primary=20interface=20can=20now=20be?=
 =?UTF-8?q?=20stopped=20to=20make=20it=20continue=20=20=20on=20an=20other?=
 =?UTF-8?q?=20free=20DVB=20card=20(if=20one=20is=20free=20at=20the=20momen?=
 =?UTF-8?q?t).=20See=20MANUAL=20for=20=20=20details.=20-=20Added=20some=20?=
 =?UTF-8?q?missing=20teletext=20PIDs=20(thanks=20to=20Norbert=20Schmidt).?=
 =?UTF-8?q?=20-=20Added=20PTS=20to=20the=20converted=20PCM=20audio=20when?=
 =?UTF-8?q?=20replaying=20a=20DVD=20(thanks=20to=20Andreas=20=20=20Schultz?=
 =?UTF-8?q?).=20Now=20the=20audio=20and=20video=20of=20a=20DVD=20replayed?=
 =?UTF-8?q?=20over=20the=20DVB=20card's=20A/V=20=20=20out=20should=20alway?=
 =?UTF-8?q?s=20be=20in=20sync.=20-=20Fixed=20handling=20the=20"Power"=20ke?=
 =?UTF-8?q?y=20in=20case=20Setup.MinUserInactivity=20is=20set=20to=200=20t?=
 =?UTF-8?q?o=20=20=20disable=20automatic=20shutdown.=20-=20Added=20a=20fif?=
 =?UTF-8?q?th=20parameter=20to=20the=20'shutdown'=20call=20that=20indicate?=
 =?UTF-8?q?s=20the=20reason=20for=20=20=20this=20shutdown=20request=20(see?=
 =?UTF-8?q?=20INSTALL).=20-=20Fixed=20releasing=20'index'=20memory=20after?=
 =?UTF-8?q?=20recording=20or=20playback.=20-=20Fixed=20ejecting=20a=20DVD?=
 =?UTF-8?q?=20while=20it=20is=20being=20replayed.=20-=20Removed=20all=20vi?=
 =?UTF-8?q?deo=20overlay=20stuff=20from=20cDvbApi=20and=20SVDRP.=20Guido?=
 =?UTF-8?q?=20Fiala's=20new=20=20=20'kvdr'=20version=200.4=20now=20does=20?=
 =?UTF-8?q?these=20things=20itself.=20As=20a=20consequence=20of=20this=20y?=
 =?UTF-8?q?ou=20=20=20will=20now=20need=20to=20use=20kvdr=200.4=20or=20lat?=
 =?UTF-8?q?er.=20-=20The=20device=20/dev/video=20is=20now=20opened=20only?=
 =?UTF-8?q?=20if=20necessary=20(to=20GRAB=20an=20image),=20=20=20allowing?=
 =?UTF-8?q?=20other=20programs=20(like=20'kvdr',=20for=20instance)=20to=20?=
 =?UTF-8?q?use=20that=20device.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  14 +-
 HISTORY       |  39 ++-
 INSTALL       |  10 +-
 MANUAL        |  14 +
 channels.conf |  36 +-
 config.h      |   4 +-
 dvbapi.c      | 941 ++++++++++++++++++++++----------------------------
 dvbapi.h      |  30 +-
 eit.c         |  37 +-
 eit.h         |   9 +-
 i18n.c        |  11 +-
 menu.c        |  96 ++++-
 menu.h        |   3 +-
 ringbuffer.c  |   5 +-
 ringbuffer.h  |   8 +-
 svdrp.c       | 183 ++++------
 svdrp.h       |  13 +-
 thread.c      |  33 +-
 thread.h      |  12 +-
 vdr.c         |  10 +-
 20 files changed, 732 insertions(+), 776 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3a04af16c..2fdfcc1fb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -23,6 +23,8 @@ Guido Fiala <gfiala@s.netic.de>
  for implementing the SVDRP command 'HITK'
  for implementing image grabbing
  for implementing overlay capabilities (see his 'kvdr' tool at http://www.s.netic.de/gfiala)
+ (overlay capabilities have been removed again in VDR 0.98, since kvdr version 0.4
+ now does these things itself)
  for making the replay progress display avoid unnecessary code execution
 
 Robert Schneider <Robert.Schneider@lotus.com>
@@ -109,12 +111,13 @@ Ulrich R
  27500
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
-Helmut Sch�chner <schaechner@yahoo.com>
+Mel Sch�chner <schaechner@yahoo.com>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
 Andreas Schultz <aschultz@warp10.net>
  for adding support for replaying DVDs (much of this was derived from
  dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>)
+ for adding PTS to the converted PCM audio when replaying a DVD
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -150,3 +153,12 @@ Andreas Share <a.share@t-online.de>
 
 Simon Bauschulte <SemiSchwabe@Brutzel.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Andy Grobb <Charly98@01019freenet.de>
+ for completing storing the current audio volume in the setup.conf file
+
+Thomas Heiligenmann <thomas@heiligenmann.de>
+ for implementing the SVDRP commands LSTR and DELR
+
+Norbert Schmidt <nschmidt-nrw@t-online.de>
+ for filling in some missing teletext PIDs
diff --git a/HISTORY b/HISTORY
index 5087c9ef1..c9d404e7e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -595,7 +595,7 @@ Video Disk Recorder Revision History
 - When setting an editing mark while the progress display is not active, the
   display will now be turned on for a short while to indicate the successful
   setting of the mark.
-- Updated 'channels.conf' for Premiere World (thanks to Helmut Sch�chner).
+- Updated 'channels.conf' for Premiere World (thanks to Mel Sch�chner).
   Check your timers if you use this channels.conf file, since the sequence of
   several PW channels has been changed.
 - Changed the color of "Info" messages to "black on green" and that of the
@@ -825,8 +825,43 @@ Video Disk Recorder Revision History
 - The menu timeout now also works when pressing the "Back" button during replay
   to enter the "Recordings" menu.
 - Updated 'channels.conf' for the "Bundesliga" channels of Premiere World
-  (thanks to Helmut Sch�chner).
+  (thanks to Mel Sch�chner).
 - Fixed reading timers.conf and channels.conf that contain blanks after numeric
   values.
 - Fixed handling trick modes near the beginning and end of a recording.
 - Pressing the "Back" button while replaying a DVD now leads to the DVD menu.
+
+2001-11-04: Version 0.98
+
+- Completed storing the current audio volume in the setup.conf file (thanks
+  to Andy Grobb).
+- Fixed closing the progress display with the "Back" key when in trick mode
+  and Setup.ShowReplayMode is enabled (thanks to Stefan Huelswitt).
+- New SVDRP commands LSTR and DELR to list and delete recordings (thanks to
+  Thomas Heiligenmann).
+- Fixed a crash when pressing the '2' button while replaying a DVD.
+- Updated 'channels.conf' for the "Bundesliga" channels of Premiere World
+  (thanks to Mel Sch�chner).
+- Changed the tuning code to use FrontendInfo to detect the type of DVB card.
+- Removed the recursion stuff from cThread (cMutex already does this).
+- Fixed handling the repeat function in the channel display.
+- Avoiding multiple EPG entries for the same event (thanks to Rolf Hakenes
+  for some valuable information on how to do this).
+- A recording on the primary interface can now be stopped to make it continue
+  on an other free DVB card (if one is free at the moment). See MANUAL for
+  details.
+- Added some missing teletext PIDs (thanks to Norbert Schmidt).
+- Added PTS to the converted PCM audio when replaying a DVD (thanks to Andreas
+  Schultz). Now the audio and video of a DVD replayed over the DVB card's A/V
+  out should always be in sync.
+- Fixed handling the "Power" key in case Setup.MinUserInactivity is set to 0 to
+  disable automatic shutdown.
+- Added a fifth parameter to the 'shutdown' call that indicates the reason for
+  this shutdown request (see INSTALL).
+- Fixed releasing 'index' memory after recording or playback.
+- Fixed ejecting a DVD while it is being replayed.
+- Removed all video overlay stuff from cDvbApi and SVDRP. Guido Fiala's new
+  'kvdr' version 0.4 now does these things itself. As a consequence of this you
+  will now need to use kvdr 0.4 or later.
+- The device /dev/video is now opened only if necessary (to GRAB an image),
+  allowing other programs (like 'kvdr', for instance) to use that device.
diff --git a/INSTALL b/INSTALL
index e7e673162..d20bf1a13 100644
--- a/INSTALL
+++ b/INSTALL
@@ -25,7 +25,7 @@ directory ../DVD (seen from the VDR directory).  Adjust the definition
 of DVDDIR in the Makefile if necessary.
 You can find 'libdvdread' at
 
-  http://www.dtek.chalmers.se/groups/dvd/downloads.html
+  http://www.dtek.chalmers.se/groups/dvd/downloads.shtml
 
 If you want to replay CSS encrypted DVDs you also need to get the 'libdvdcss'
 library from
@@ -127,7 +127,7 @@ active, the user has been inactive for at least MinUserInactivity minutes
 and the next timer event is at least MinEventTimeout minutes in the future
 (see the Setup parameters in MANUAL).
 
-The command given in the '-s' option will be called with four parameters.
+The command given in the '-s' option will be called with five parameters.
 The first one is the time (in UTC) of the next timer event (as a time_t
 type number), and the second one is the number of seconds from the current
 time until the next timer event. Your program can choose which one to use
@@ -153,6 +153,12 @@ contains the file name of the recording as defined in the timer (or an empty
 string if no timer is present). These can be used by the shutdown program to
 show that information on some display interface etc.
 
+The fifth parameter indicates the reason why the shutdown was requested.
+'0' means this is an automatic shutdown due to some timeout, while '1' means
+that this is a user requested shutdown (resulting from pressing the "Power"
+key). The shutdown program may use this information to decide whether or
+not to actually perform the system shutdown.
+
 If a timer is currently recording, the parameters will reflect the start
 time of that timer. This means that the first parameter will be a time in
 the past, and the second parameter will be a negative number. This only
diff --git a/MANUAL b/MANUAL
index 7bb1ec83f..a9e42a1bf 100644
--- a/MANUAL
+++ b/MANUAL
@@ -310,6 +310,20 @@ Video Disk Recorder User's Manual
   A timer can also be programmed by pressing the "Red" button on the "Schedule",
   "Now", "Next" or "Event" menus.
 
+* Stopping a recording on the primary DVB interface
+
+  If the primary DVB interface is currently recording, the user can't switch
+  the channel or replay another recording on that interface. However, if there
+  is an other DVB interface that is currently not recording and provides the
+  necessary conditional access facilities to continue the recording that is
+  currently being performed on the primary DVB interface, the Main menu will
+  contain an option that allows you to stop recording on the primary DVB
+  interface. Select that option to stop the ongoing recording and thus free the
+  primary DVB interface to allow channel switching or replaying. The interrupted
+  recording will be continued on an other free DVB interface. There may be a
+  short discontinuity at that point when replaying that recording later, so you
+  may want to place such an action for instance in a commercial break.
+
 * Parameters in the "Setup" menu
 
   Select "Setup" from the "Main" menu to enter the setup menu. From there you can
diff --git a/channels.conf b/channels.conf
index 200fbfe01..c9bf996a2 100644
--- a/channels.conf
+++ b/channels.conf
@@ -2,19 +2,19 @@ RTL:12188:h:0:27500:163:104:105:0:12003
 Sat.1:12480:v:0:27500:1791:1792:34:0:46
 Pro-7:12480:v:0:27500:255:256;257:32:0:898
 RTL2:12188:h:0:27500:166:128:68:0:12020
-ARD:11837:h:0:27500:101:102:0:0:28106
-BR3:11837:h:0:27500:201:202:0:0:28107
+ARD:11837:h:0:27500:101:102:104:0:28106
+BR3:11837:h:0:27500:201:202:204:0:28107
 Hessen-3:11837:h:0:27500:301:302:0:0:28108
-N3:12110:h:0:27500:2401:2402:0:0:28224
-SR3:11837:h:0:27500:501:502:0:0:28110
+N3:12110:h:0:27500:2401:2402:2404:0:28224
+SR3:11837:h:0:27500:501:502:504:0:28110
 WDR:11837:h:0:27500:601:602:0:0:28111
-BR-alpha:11837:h:0:27500:701:702:0:0:28112
-SWR BW:11837:h:0:27500:801:802:0:0:28113
-Phoenix:11837:h:0:27500:901:902:0:0:28114
+BR-alpha:11837:h:0:27500:701:702:704:0:28112
+SWR BW:11837:h:0:27500:801:802:804:0:28113
+Phoenix:11837:h:0:27500:901:902:904:0:28114
 ZDF:11954:h:0:27500:110:120:130:0:28006
 3sat:11954:h:0:27500:210:220:230:0:28007
-KiKa:11954:h:0:27500:310:320:0:0:28008
-arte:11836:h:0:27500:401:402:0:0:28109
+KiKa:11954:h:0:27500:310:320:330:0:28008
+arte:11836:h:0:27500:401:402:404:0:28109
 ORF1:12692:h:0:22000:160:161:165:3:13001
 ORF2:12692:h:0:22000:500:501:505:3:13002
 ORF Sat:11954:h:0:27500:506:507:0:0:28010
@@ -42,10 +42,10 @@ EinsFestival:12110:h:0:27500:201:202:0:0:28202
 EinsMuXx:12110:h:0:27500:301:302:0:0:28203
 ZDF Theaterkanal:11954:h:0:27500:1110:1120:0:0:28016
 ZDF.doku:11954:h:0:27500:660:670:0:0:28014
-MDR:12110:h:0:27500:401:402:0:0:28204
+MDR:12110:h:0:27500:401:402:404:0:28204
 NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
-ORB:12110:h:0:27500:501:502:0:0:28205
-B1:12110:h:0:27500:601:602:0:0:28206
+ORB:12110:h:0:27500:501:502:504:0:28205
+B1:12110:h:0:27500:601:602:604:0:28206
 ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
 Premiere World:11797:h:0:27500:255:256:32:0:8
@@ -117,14 +117,14 @@ Cockpitkanal:11720:h:0:27500:2559:2560:0:3:242
 Boxengasse:11720:h:0:27500:2047:2048:0:3:240
 :Premiere World Bundesliga
 Superdom:11758:h:0:27500:2815:8192:0:3:18
-BuLi-Konferenz:11758:h:0:27500:3071:3072,3073:0:3:215
+BuLi-Konferenz:11758:h:0:27500:3327:3328,3329:0:3:215
 BuLi-Spiel 1:11719:h:0:27500:255:256,257:0:3:17
 BuLi-Spiel 2:11719:h:0:27500:2047:2048,2049:0:3:240
-BuLi-Spiel 3:11719:h:0:27500:3327:3328,3329:0:3:241
-BuLi-Spiel 4:11719:h:0:27500:2303:2304,2305:0:3:242
-BuLi-Spiel 5:11719:h:0:27500:3583:3584,3585:0:3:243
-BuLi-Spiel 6:11719:h:0:27500:2559:2560,2561:0:3:244
-BuLi-Spiel 7:11758:h:0:27500:2815:2816,2817:0:3:214
+BuLi-Spiel 3:11719:h:0:27500:2303:2304,2305:0:3:241
+BuLi-Spiel 4:11719:h:0:27500:2559:2560,2561:0:3:242
+BuLi-Spiel 5:11719:h:0:27500:2815:2816,2817:0:3:243
+BuLi-Spiel 6:11719:h:0:27500:3071:3072,3073:0:3:244
+BuLi-Spiel 7:11758:h:0:27500:3071:3072,3073:0:3:214
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
diff --git a/config.h b/config.h
index d0f0d77f3..574496931 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.84 2001/10/07 15:13:23 kls Exp $
+ * $Id: config.h 1.85 2001/10/27 09:56:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.97"
+#define VDRVERSION "0.98"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbapi.c b/dvbapi.c
index 786dff7f0..f72782b4b 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.132 2001/10/21 13:36:27 kls Exp $
+ * $Id: dvbapi.c 1.137 2001/11/04 12:05:36 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -200,6 +200,7 @@ cIndexFile::~cIndexFile()
   if (f >= 0)
      close(f);
   delete fileName;
+  delete index;
 }
 
 bool cIndexFile::CatchUp(int Index)
@@ -713,7 +714,10 @@ class cPlayBuffer : public cRingBufferFrame {
   void TrickSpeed(int Increment);
   virtual void Empty(bool Block = false);
   virtual void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00) {}
+  virtual void PlayExternalDolby(const uchar *b, int MaxLength);
   virtual void Output(void);
+  void putFrame(cFrame *Frame);
+  void putFrame(unsigned char *Data, int Length, eFrameType Type = ftUnknown);
 public:
   cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev);
   virtual ~cPlayBuffer();
@@ -759,6 +763,28 @@ cPlayBuffer::~cPlayBuffer()
 {
 }
 
+void cPlayBuffer::PlayExternalDolby(const uchar *b, int MaxLength)
+{
+  if (dolbyDev) {
+     if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01) {
+        if (b[3] == 0xBD) { // dolby
+           int l = b[4] * 256 + b[5] + 6;
+           int written = b[8] + 9; // skips the PES header
+           int n = min(l - written, MaxLength);
+           while (n > 0) {
+                 int w = fwrite(&b[written], 1, n, dolbyDev);
+                 if (w < 0) {
+                    LOG_ERROR;
+                    break;
+                    }
+                 n -= w;
+                 written += w;
+                 }
+           }
+        }
+     }
+}
+
 void cPlayBuffer::Output(void)
 {
   dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
@@ -771,24 +797,28 @@ void cPlayBuffer::Output(void)
            }
         const cFrame *frame = Get();
         if (frame) {
-           StripAudioPackets((uchar *)frame->Data(), frame->Count(), (playMode == pmFast || playMode == pmSlow) ? 0x00 : audioTrack);//XXX
-           const uchar *p = frame->Data();
-           int r = frame->Count();
-           while (r > 0 && Busy() && !blockOutput) {
-                 cFile::FileReadyForWriting(videoDev, 100);
-                 int w = write(videoDev, p, r);
-                 if (w > 0) {
-                    p += w;
-                    r -= w;
-                    }
-                 else if (w < 0 && FATALERRNO) {
-                    LOG_ERROR;
-                    Stop();
-                    return;
+           if (frame->Type() == ftDolby)
+              PlayExternalDolby(frame->Data(), frame->Count());
+           else {
+              StripAudioPackets((uchar *)frame->Data(), frame->Count(), (playMode == pmFast || playMode == pmSlow) ? 0x00 : audioTrack);//XXX
+              const uchar *p = frame->Data();
+              int r = frame->Count();
+              while (r > 0 && Busy() && !blockOutput) {
+                    cFile::FileReadyForWriting(videoDev, 100);
+                    int w = write(videoDev, p, r);
+                    if (w > 0) {
+                       p += w;
+                       r -= w;
+                       }
+                    else if (w < 0 && FATALERRNO) {
+                       LOG_ERROR;
+                       Stop();
+                       return;
+                       }
                     }
-                 }
-           writeIndex = frame->Index();
-           backTrace.Add(frame->Index(), frame->Count());
+              writeIndex = frame->Index();
+              backTrace.Add(frame->Index(), frame->Count());
+              }
            Drop(frame);
            }
         }
@@ -796,6 +826,20 @@ void cPlayBuffer::Output(void)
   dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
 }
 
+void cPlayBuffer::putFrame(cFrame *Frame)
+{
+  while (Busy() && !blockInput) {
+        if (Put(Frame))
+           return;
+        }
+  delete Frame; // caller relies on frame being put, otherwise this would be a memory leak!
+}
+
+void cPlayBuffer::putFrame(unsigned char *Data, int Length, eFrameType Type)
+{
+  putFrame(new cFrame(Data, Length, Type));
+}
+
 void cPlayBuffer::TrickSpeed(int Increment)
 {
   int nts = trickSpeed + Increment;
@@ -1089,11 +1133,8 @@ void cReplayBuffer::Input(void)
               }
            else // allows replay even if the index file is missing
               r = read(replayFile, b, sizeof(b));
-           if (r > 0) {
-              cFrame *frame = new cFrame(b, r, readIndex);
-              while (Busy() && !blockInput && !Put(frame))
-                    ;
-              }
+           if (r > 0)
+              putFrame(new cFrame(b, r, ftUnknown, readIndex));
            else if (r == 0)
               eof = true;
            else if (r < 0 && FATALERRNO) {
@@ -1117,19 +1158,8 @@ void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
             int l = b[i + 4] * 256 + b[i + 5] + 6;
             switch (c) {
               case 0xBD: // dolby
-                   if (Except && dolbyDev) {
-                      int written = b[i + 8] + 9; // skips the PES header
-                      int n = l - written;
-                      while (n > 0) {
-                            int w = fwrite(&b[i + written], 1, n, dolbyDev);
-                            if (w < 0) {
-                               LOG_ERROR;
-                               break;
-                               }
-                            n -= w;
-                            written += w;
-                            }
-                      }
+                   if (Except && dolbyDev)
+                      PlayExternalDolby(&b[i], Length - i);
                    // continue with deleting the data - otherwise it disturbs DVB replay
               case 0xC0 ... 0xC1: // audio
                    if (c == 0xC1)
@@ -1290,10 +1320,166 @@ bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
 }
 
 #ifdef DVDSUPPORT
+
+#define SYSTEM_HEADER    0xBB
+#define PROG_STREAM_MAP  0xBC
+#ifndef PRIVATE_STREAM1
+#define PRIVATE_STREAM1  0xBD
+#endif
+#define PADDING_STREAM   0xBE
+#ifndef PRIVATE_STREAM2
+#define PRIVATE_STREAM2  0xBF
+#endif
+#define AUDIO_STREAM_S   0xC0
+#define AUDIO_STREAM_E   0xDF
+#define VIDEO_STREAM_S   0xE0
+#define VIDEO_STREAM_E   0xEF
+#define ECM_STREAM       0xF0
+#define EMM_STREAM       0xF1
+#define DSM_CC_STREAM    0xF2
+#define ISO13522_STREAM  0xF3
+#define PROG_STREAM_DIR  0xFF
+
+#define cOPENDVD         0
+#define cOPENTITLE       1
+#define cOPENCHAPTER     2
+#define cOUTCELL         3
+#define cREADFRAME       4
+#define cOUTPACK         5
+#define cOUTFRAMES       6
+
+#define aAC3          0x80
+#define aLPCM         0xA0
+
+// --- cAC3toPCM -------------------------------------------------------------
+
+class cAC3toPCM {
+private:
+  enum { AC3_STOP, AC3_START, AC3_PLAY } ac3stat;
+  uchar *ac3data;
+  int ac3inp;
+  int ac3outp;
+public:
+  cAC3toPCM(void);
+  ~cAC3toPCM();
+  void Clear(void);
+  void Put(unsigned char *sector, int length);
+  cFrame *Get(int size, uchar PTSflags = 0, uchar *PTSdata = 0);
+  };
+
+cAC3toPCM::cAC3toPCM(void)
+{
+  ac3dec_init();
+  ac3data = new uchar[AC3_BUFFER_SIZE];
+  Clear();
+}
+
+cAC3toPCM::~cAC3toPCM()
+{
+  delete ac3data;
+}
+
+void cAC3toPCM::Clear(void)
+{
+  ac3stat = AC3_START;
+  ac3outp = ac3inp = 0;
+}
+
+void cAC3toPCM::Put(unsigned char *sector, int length)
+{
+  ac3dec_decode_data(sector, sector + length, ac3stat == AC3_START, &ac3inp, &ac3outp, (char *)ac3data);
+  ac3stat = AC3_PLAY;
+}
+
+// data=PCM samples, 16 bit, LSB first, 48kHz, stereo
+cFrame *cAC3toPCM::Get(int size, uchar PTSflags, uchar *PTSdata)
+{
+  if (ac3inp == ac3outp)
+     return NULL;
+
+#define MAXSIZE 2022
+
+  uchar buffer[2048];
+  uchar *data;
+
+  if (size > 0) {
+     int p_size = (size > MAXSIZE) ? MAXSIZE : size;
+     int length = 10;      // default header bytes
+     int header = 0;
+     int stuffb = 0;
+
+     switch (PTSflags) {
+       case 2:  header = 5;    // additional header bytes
+                stuffb = 1;
+                break;
+       case 3:  header = 10;
+                break;
+       default: header = 0;
+       }
+
+     //      header = 0; //XXX ???
+     stuffb = 0; //XXX ???
+
+     length += header;
+     length += stuffb;
+
+     buffer[0] = 0x00;
+     buffer[1] = 0x00;
+     buffer[2] = 0x01;
+     buffer[3] = PRIVATE_STREAM1;
+
+     buffer[6] = 0x80;
+     buffer[7] = PTSflags << 6;
+     buffer[8] = header + stuffb;
+
+     if (header)
+        memcpy(&buffer[9], (void *)PTSdata, header);
+
+     // add stuffing
+     data = buffer + 9 + header;
+     for (int cnt = 0; cnt < stuffb; cnt++)
+         data[cnt] = 0xff;
+     length += stuffb;
+
+     // add data
+     data = buffer + 9 + header + stuffb + 7;
+     int cnt = 0;
+     while (p_size) {
+           if (ac3outp != ac3inp) { // data in the buffer
+              data[cnt ^ 1] = ac3data[ac3outp]; // swab because ac3dec delivers wrong byteorder (the "xor" (^) is a swab!)
+              p_size--;
+              cnt++;
+              length++;
+              ac3outp = (ac3outp + 1) % AC3_BUFFER_SIZE;
+              }
+           else
+              break;
+           }
+
+     data = buffer + 9 + header + stuffb;
+     data[0] = aLPCM; // substream ID
+     data[1] = 0x00;  // other stuff (see DVB specs), ignored by driver
+     data[2] = 0x00;
+     data[3] = 0x00;
+     data[4] = 0x00;
+     data[5] = 0x00;
+     data[6] = 0x00;
+
+     buffer[4] = (length >> 8) & 0xff;
+     buffer[5] = length & 0xff;
+
+     length += 6;
+
+     return new cFrame(buffer, length);
+     }
+  return NULL;
+}
+
 // --- cDVDplayBuffer --------------------------------------------------------
 
 class cDVDplayBuffer : public cPlayBuffer {
 private:
+  cAC3toPCM AC3toPCM;
   uchar audioTrack;
 
   cDVD *dvd;//XXX necessary???
@@ -1308,7 +1494,6 @@ class cDVDplayBuffer : public cPlayBuffer {
   int doplay;
   int cyclestate;
   int prevcycle;
-  int brakeCounter;
   int skipCnt;
 
   tt_srpt_t *tt_srpt;
@@ -1335,11 +1520,6 @@ class cDVDplayBuffer : public cPlayBuffer {
   int logAudioTrack;
   int maxAudioTrack;
 
-  enum { AC3_STOP, AC3_START, AC3_PLAY } ac3stat;
-  uchar *ac3data;
-  int ac3inp;
-  int ac3outp;
-  int lpcm_count;
   int is_nav_pack(unsigned char *buffer);
   void Close(void);
   virtual void Empty(bool Block = false);
@@ -1350,10 +1530,7 @@ class cDVDplayBuffer : public cPlayBuffer {
   int GetStuffingLen(const uchar *Data);
   int GetPacketLength(const uchar *Data);
   int GetPESHeaderLength(const uchar *Data);
-  int SendPCM(int size);
-  void playDecodedAC3(void);
-  void handleAC3(unsigned char *sector, int length);
-  void putFrame(unsigned char *sector, int length);
+  void handleAC3(unsigned char *sector, int length, uchar PTSflags, uchar *PTSdata);
   unsigned int getAudioStream(unsigned int StreamId);
   void setChapid(void);
   void NextState(int State) { prevcycle = cyclestate; cyclestate = State; }
@@ -1369,17 +1546,6 @@ class cDVDplayBuffer : public cPlayBuffer {
   virtual void ToggleAudioTrack(void);
   };
 
-#define cOPENDVD         0
-#define cOPENTITLE       1
-#define cOPENCHAPTER     2
-#define cOUTCELL         3
-#define cREADFRAME       4
-#define cOUTPACK         5
-#define cOUTFRAMES       6
-
-#define aAC3          0x80
-#define aLPCM         0xA0
-
 cDVDplayBuffer::cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD *DvD, int title)
 :cPlayBuffer(DvbApi, VideoDev, AudioDev)
 {
@@ -1389,15 +1555,10 @@ cDVDplayBuffer::cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD
   angle = 0;
   cyclestate = cOPENDVD;
   prevcycle = 0;
-  brakeCounter = 0;
   skipCnt = 0;
   logAudioTrack = 0;
   canToggleAudioTrack = true;//XXX determine from cDVD!
-  ac3dec_init();
   data = new uchar[1024 * DVD_VIDEO_LB_LEN];
-  ac3data = new uchar[AC3_BUFFER_SIZE];
-  ac3inp = ac3outp = 0;
-  ac3stat = AC3_START;
   canDoTrickMode = true;
   dvbApi->SetModeReplay();
   Start();
@@ -1408,7 +1569,6 @@ cDVDplayBuffer::~cDVDplayBuffer()
   Stop();
   Close();
   dvbApi->SetModeNormal(false);
-  delete ac3data;
   delete data;
 }
 
@@ -1449,8 +1609,7 @@ void cDVDplayBuffer::ToggleAudioTrack(void)
 #ifdef DVDDEBUG
      dsyslog(LOG_INFO, "DVB: Audio Stream ID changed to: %x", audioTrack);
 #endif
-     ac3stat = AC3_START;
-     ac3outp = ac3inp;
+     AC3toPCM.Clear();
      }
 }
 
@@ -1869,141 +2028,21 @@ int cDVDplayBuffer::ScanVideoPacket(const uchar *Data, int Count, uchar *Picture
   return -1;
 }
 
-#define SYSTEM_HEADER    0xBB
-#define PROG_STREAM_MAP  0xBC
-#ifndef PRIVATE_STREAM1
-#define PRIVATE_STREAM1  0xBD
-#endif
-#define PADDING_STREAM   0xBE
-#ifndef PRIVATE_STREAM2
-#define PRIVATE_STREAM2  0xBF
-#endif
-#define AUDIO_STREAM_S   0xC0
-#define AUDIO_STREAM_E   0xDF
-#define VIDEO_STREAM_S   0xE0
-#define VIDEO_STREAM_E   0xEF
-#define ECM_STREAM       0xF0
-#define EMM_STREAM       0xF1
-#define DSM_CC_STREAM    0xF2
-#define ISO13522_STREAM  0xF3
-#define PROG_STREAM_DIR  0xFF
-
-// data=PCM samples, 16 bit, LSB first, 48kHz, stereo
-int cDVDplayBuffer::SendPCM(int size)
-{
-
-#define MAXSIZE 2032
-
-  uchar buffer[MAXSIZE + 16];
-  int length = 0;
-  int p_size;
-
-  if (ac3inp == ac3outp)
-     return 1;
-
-  while (size > 0) {
-        if (size >= MAXSIZE)
-           p_size = MAXSIZE;
-        else
-           p_size = size;
-        length = 10;
-
-        while (p_size) {
-             if (ac3outp != ac3inp) { // data in the buffer
-                buffer[(length + 6) ^ 1] = ac3data[ac3outp]; // swab because ac3dec delivers wrong byteorder
-                                                             // XXX there is no 'swab' here??? (kls)
-                p_size--;
-                length++;
-                ac3outp = (ac3outp + 1) % AC3_BUFFER_SIZE;
-                }
-             else
-                break;
-             }
-
-        buffer[0] = 0x00;
-        buffer[1] = 0x00;
-        buffer[2] = 0x01;
-        buffer[3] = PRIVATE_STREAM1;
-
-        buffer[4] = (length >> 8) & 0xff;
-        buffer[5] = length & 0xff;
-
-        buffer[6] = 0x80;
-        buffer[7] = 0x00;
-        buffer[8] = 0x00;
-
-        buffer[9]  = aLPCM; // substream ID
-        buffer[10] = 0x00;  // other stuff (see DVD specs), ignored by driver
-        buffer[11] = 0x00;
-        buffer[12] = 0x00;
-        buffer[13] = 0x00;
-        buffer[14] = 0x00;
-        buffer[15] = 0x00;
-
-        length += 6;
-
-        putFrame(buffer, length);
-        size -= MAXSIZE;
-        }
-  return 0;
-}
-
-void cDVDplayBuffer::playDecodedAC3(void)
+void cDVDplayBuffer::handleAC3(unsigned char *sector, int length, uchar PTSflags, uchar *PTSdata)
 {
-  int ac3_datasize = (AC3_BUFFER_SIZE + ac3inp - ac3outp) % AC3_BUFFER_SIZE;
-
-  if (ac3_datasize) {
-     if (ac3_datasize > 1024 * 48)
-        SendPCM(3096);
-     else if (ac3_datasize > 1024 * 32)
-        SendPCM(1536);
-     else if (ac3_datasize > 1024 * 16 && !(lpcm_count % 2))
-        SendPCM(1536);
-     else if (ac3_datasize && !(lpcm_count % 4))
-        SendPCM(1536);
-     lpcm_count++;
-     }
-  else
-     lpcm_count=0;
-}
-
-void cDVDplayBuffer::handleAC3(unsigned char *sector, int length)
-{
-  if (dolbyDev) {
-     while (length > 0) {
-           int w = fwrite(sector, 1, length , dolbyDev);
-           if (w < 0) {
-              LOG_ERROR;
-              break;
-              }
-           length -= w;
-           sector += w;
-           }
-     }
-  else {
-     if (ac3stat == AC3_PLAY)
-        ac3dec_decode_data(sector, sector + length, 0, &ac3inp, &ac3outp, (char *)ac3data);
-     else if (ac3stat == AC3_START) {
-        ac3dec_decode_data(sector, sector + length, 1, &ac3inp, &ac3outp, (char *)ac3data);
-        ac3stat = AC3_PLAY;
-        }
-     }
-  //playDecodedAC3();
-}
-
-void cDVDplayBuffer::putFrame(unsigned char *sector, int length)
-{
-  cFrame *frame = new cFrame(sector, length);
-  while (Busy() && !blockInput && !Put(frame))
-        ;
+#define PCM_FRAME_SIZE 1536
+  AC3toPCM.Put(sector, length);
+  cFrame *frame;
+  if ((frame = AC3toPCM.Get(PCM_FRAME_SIZE, PTSflags, PTSdata)) != NULL)
+     putFrame(frame);
+  while ((frame = AC3toPCM.Get(PCM_FRAME_SIZE)) != NULL)
+        putFrame(frame);
 }
 
 int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
 {
+  //XXX kls 2001-11-03: do we really need all these different return values?
   uchar pt = 1;
-#if 0
-  uchar *osect = sector;
-#endif
 
   //make sure we got a PS packet header
   if (!PacketStart(&sector, DVD_VIDEO_LB_LEN) && GetPacketType(sector) != 0xBA) {
@@ -2017,6 +2056,8 @@ int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
   int datalen = r;
 
   sector[6] &= 0x8f;
+  uchar PTSflags = sector[7] >> 6;
+  uchar *PTSdata = sector + 9;
   uchar *data = sector;
 
   switch (GetPacketType(sector)) {
@@ -2025,6 +2066,7 @@ int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
            ScanVideoPacket(sector, r, &pt);
            if (trickMode && pt != 1)
               return pt;
+           putFrame(sector, r, ftVideo);
            break;
          }
     case AUDIO_STREAM_S ... AUDIO_STREAM_E: {
@@ -2033,6 +2075,7 @@ int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
             return 1;
          if (audioTrack != GetPacketType(sector))
             return 5;
+         putFrame(sector, r, ftAudio);
          break;
          }
     case PRIVATE_STREAM1:
@@ -2060,14 +2103,15 @@ int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
            if (audioTrack == *data) {
               switch (audioTrack & 0xF8) {
                 case aAC3:
+                     if (dolbyDev)
+                        putFrame(sector, r, ftDolby);
                      data += 4;
-                     // correct a3 data lenght - FIXME: why 13 ???
-                     datalen -= 13;
-                     handleAC3(data, datalen);
+                     datalen -= 13; // 3 (mandatory header) + 6 (PS header) + 4 (AC3 header) = 13
+                     handleAC3(data, datalen, PTSflags, PTSdata);
                      break;
                 case aLPCM:
                      // write(audio, sector+14 , sector[19]+(sector[18]<<8)+6);
-                     putFrame(sector, GetPacketLength(sector));
+                     putFrame(sector, GetPacketLength(sector), ftAudio);
                      break;
                 default:
                      break;
@@ -2096,9 +2140,6 @@ int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
            return pt;
          }
     }
-  putFrame(sector, r);
-  if ((audioTrack & 0xF8) == aAC3)
-     playDecodedAC3();
   return pt;
 }
 
@@ -2106,8 +2147,7 @@ void cDVDplayBuffer::Empty(bool Block)
 {
   if (!(blockInput || blockOutput)) {
      cPlayBuffer::Empty(true);
-     ac3stat = AC3_START;
-     ac3outp = ac3inp;
+     AC3toPCM.Clear();
      }
   if (!Block)
      cPlayBuffer::Empty(false);
@@ -2149,9 +2189,7 @@ void cDVDplayBuffer::SkipSeconds(int Seconds)
         Empty(true);
         chapid = newchapid;
         NextState(cOPENCHAPTER);
-        if (ac3stat != AC3_STOP)
-           ac3stat = AC3_START;
-        ac3outp = ac3inp;
+        AC3toPCM.Clear();
         Empty(false);
         Play();
         }
@@ -2488,6 +2526,7 @@ char *cDvbApi::audioCommand = NULL;
 
 cDvbApi::cDvbApi(int n)
 {
+  frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   vPid = aPid1 = aPid2 = dPid1 = dPid2 = 0;
   siProcessor = NULL;
   recordBuffer = NULL;
@@ -2518,10 +2557,6 @@ cDvbApi::cDvbApi(int n)
   fd_video   = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
   fd_audio   = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
 
-  // Devices that may not be available, and are not necessary for normal operation:
-
-  videoDev   = OstOpen(DEV_VIDEO,      n, O_RDWR);
-
   // Devices that will be dynamically opened and closed when necessary:
 
   fd_dvr     = -1;
@@ -2536,15 +2571,14 @@ cDvbApi::cDvbApi(int n)
      siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
      if (!dvbApi[0]) // only the first one shall set the system time
         siProcessor->SetUseTSTime(Setup.SetSystemTime);
+     FrontendInfo feinfo;
+     CHECK(ioctl(fd_frontend, FE_GET_INFO, &feinfo));
+     frontendType = feinfo.type;
      }
   else
      esyslog(LOG_ERR, "ERROR: can't open video device %d", n);
   cols = rows = 0;
 
-  ovlGeoSet = ovlStat = ovlFbSet = false;
-  ovlBrightness = ovlColour = ovlHue = ovlContrast = 32768;
-  ovlClipCount = 0;
-
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
   initscr();
   keypad(stdscr, true);
@@ -2573,7 +2607,6 @@ cDvbApi::~cDvbApi()
   StopReplay();
   StopRecord();
   StopTransfer();
-  OvlO(false); //Overlay off!
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
@@ -2688,255 +2721,96 @@ const cSchedules *cDvbApi::Schedules(cThreadLock *ThreadLock) const
 
 bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  if (videoDev < 0)
-     return false;
   int result = 0;
-  // just do this once?
-  struct video_mbuf mbuf;
-  result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
-  int msize = mbuf.size;
-  // gf: this needs to be a protected member of cDvbApi! //XXX kls: WHY???
-  unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-  if (!mem || mem == (unsigned char *)-1)
-     return false;
-  // set up the size and RGB
-  struct video_capability vc;
-  result |= ioctl(videoDev, VIDIOCGCAP, &vc);
-  struct video_mmap vm;
-  vm.frame = 0;
-  if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
-      (SizeY > 0) && (SizeY <= vc.maxheight)) {
-     vm.width = SizeX;
-     vm.height = SizeY;
-     }
-  else {
-     vm.width = vc.maxwidth;
-     vm.height = vc.maxheight;
-     }
-  vm.format = VIDEO_PALETTE_RGB24;
-  // this needs to be done every time:
-  result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
-  result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
-  // make RGB out of BGR:
-  int memsize = vm.width * vm.height;
-  unsigned char *mem1 = mem;
-  for (int i = 0; i < memsize; i++) {
-      unsigned char tmp = mem1[2];
-      mem1[2] = mem1[0];
-      mem1[0] = tmp;
-      mem1 += 3;
-      }
-
-  if (Quality < 0)
-     Quality = 255; //XXX is this 'best'???
-
-  isyslog(LOG_INFO, "grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
-  FILE *f = fopen(FileName, "wb");
-  if (f) {
-     if (Jpeg) {
-        // write JPEG file:
-        struct jpeg_compress_struct cinfo;
-        struct jpeg_error_mgr jerr;
-        cinfo.err = jpeg_std_error(&jerr);
-        jpeg_create_compress(&cinfo);
-        jpeg_stdio_dest(&cinfo, f);
-        cinfo.image_width = vm.width;
-        cinfo.image_height = vm.height;
-        cinfo.input_components = 3;
-        cinfo.in_color_space = JCS_RGB;
-
-        jpeg_set_defaults(&cinfo);
-        jpeg_set_quality(&cinfo, Quality, true);
-        jpeg_start_compress(&cinfo, true);
-
-        int rs = vm.width * 3;
-        JSAMPROW rp[vm.height];
-        for (int k = 0; k < vm.height; k++)
-            rp[k] = &mem[rs * k];
-        jpeg_write_scanlines(&cinfo, rp, vm.height);
-        jpeg_finish_compress(&cinfo);
-        jpeg_destroy_compress(&cinfo);
-        }
-     else {
-        // write PNM file:
-        if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
-            fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
-           LOG_ERROR_STR(FileName);
-           result |= 1;
+  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR);
+  if (videoDev >= 0) {
+     struct video_mbuf mbuf;
+     result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
+     if (result == 0) {
+        int msize = mbuf.size;
+        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
+        if (mem && mem != (unsigned char *)-1) {
+           // set up the size and RGB
+           struct video_capability vc;
+           result |= ioctl(videoDev, VIDIOCGCAP, &vc);
+           struct video_mmap vm;
+           vm.frame = 0;
+           if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
+               (SizeY > 0) && (SizeY <= vc.maxheight)) {
+              vm.width = SizeX;
+              vm.height = SizeY;
+              }
+           else {
+              vm.width = vc.maxwidth;
+              vm.height = vc.maxheight;
+              }
+           vm.format = VIDEO_PALETTE_RGB24;
+           result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
+           result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
+           // make RGB out of BGR:
+           int memsize = vm.width * vm.height;
+           unsigned char *mem1 = mem;
+           for (int i = 0; i < memsize; i++) {
+               unsigned char tmp = mem1[2];
+               mem1[2] = mem1[0];
+               mem1[0] = tmp;
+               mem1 += 3;
+               }
+         
+           if (Quality < 0)
+              Quality = 255; //XXX is this 'best'???
+         
+           isyslog(LOG_INFO, "grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+           FILE *f = fopen(FileName, "wb");
+           if (f) {
+              if (Jpeg) {
+                 // write JPEG file:
+                 struct jpeg_compress_struct cinfo;
+                 struct jpeg_error_mgr jerr;
+                 cinfo.err = jpeg_std_error(&jerr);
+                 jpeg_create_compress(&cinfo);
+                 jpeg_stdio_dest(&cinfo, f);
+                 cinfo.image_width = vm.width;
+                 cinfo.image_height = vm.height;
+                 cinfo.input_components = 3;
+                 cinfo.in_color_space = JCS_RGB;
+         
+                 jpeg_set_defaults(&cinfo);
+                 jpeg_set_quality(&cinfo, Quality, true);
+                 jpeg_start_compress(&cinfo, true);
+         
+                 int rs = vm.width * 3;
+                 JSAMPROW rp[vm.height];
+                 for (int k = 0; k < vm.height; k++)
+                     rp[k] = &mem[rs * k];
+                 jpeg_write_scanlines(&cinfo, rp, vm.height);
+                 jpeg_finish_compress(&cinfo);
+                 jpeg_destroy_compress(&cinfo);
+                 }
+              else {
+                 // write PNM file:
+                 if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
+                     fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
+                    LOG_ERROR_STR(FileName);
+                    result |= 1;
+                    }
+                 }
+              fclose(f);
+              }
+           else {
+              LOG_ERROR_STR(FileName);
+              result |= 1;
+              }
+           munmap(mem, msize);
            }
+        else
+           result |= 1;
         }
-     fclose(f);
-     }
-  else {
-     LOG_ERROR_STR(FileName);
-     result |= 1;
-     }
-
-  if (ovlStat && ovlGeoSet) {
-     // switch the Overlay on again (gf: why have i to do anything again?)
-     OvlG(ovlSizeX, ovlSizeY, ovlPosX, ovlPosY);
-     }
-  if (ovlFbSet)
-     OvlP(ovlBrightness, ovlColour, ovlHue, ovlContrast);
-
-  munmap(mem, msize);
-  return result == 0;
-}
-
-bool cDvbApi::OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette)
-{
-  if (videoDev < 0)
-     return false;
-  int result = 0;
-  // get the actual X-Server settings???
-  // plausibility-check problem: can't be verified w/o X-server!!!
-  if (SizeX <= 0 || SizeY <= 0 || FbAddr == 0 || Bpp / 8 > 4 ||
-      Bpp / 8 <= 0 || Palette <= 0 || Palette > 13 || ovlClipCount < 0 ||
-      SizeX > 4096 || SizeY > 4096) {
-     ovlFbSet = ovlGeoSet = false;
-     OvlO(false);
-     return false;
-     }
-  else {
-    dsyslog(LOG_INFO, "OvlF: %d %d %x %d %d", SizeX, SizeY, FbAddr, Bpp, Palette);
-    // this is the problematic part!
-    struct video_buffer vb;
-    result |= ioctl(videoDev, VIDIOCGFBUF, &vb);
-    vb.base = (void*)FbAddr;
-    vb.depth = Bpp;
-    vb.height = SizeY;
-    vb.width = SizeX;
-    vb.bytesperline = ((vb.depth + 1) / 8) * vb.width;
-    //now the real thing: setting the framebuffer
-    result |= ioctl(videoDev, VIDIOCSFBUF, &vb);
-    if (result) {
-       ovlFbSet = ovlGeoSet = false;
-       ovlClipCount = 0;
-       OvlO(false);
-       return false;
-       }
-    else {
-       ovlFbSizeX = SizeX;
-       ovlFbSizeY = SizeY;
-       ovlBpp = Bpp;
-       ovlPalette = Palette;
-       ovlFbSet = true;
-       return true;
-      }
-    }
-}
-
-bool cDvbApi::OvlG(int SizeX, int SizeY, int PosX, int PosY)
-{
-  if (videoDev < 0)
-     return false;
-  int result = 0;
-  // get the actual X-Server settings???
-  struct video_capability vc;
-  result |= ioctl(videoDev, VIDIOCGCAP, &vc);
-  if (!ovlFbSet)
-     return false;
-  if (SizeX < vc.minwidth || SizeY < vc.minheight ||
-      SizeX > vc.maxwidth || SizeY>vc.maxheight
-//      || PosX > FbSizeX || PosY > FbSizeY
-//         PosX < -SizeX || PosY < -SizeY ||
-     ) {
-     ovlGeoSet = false;
-     OvlO(false);
-     return false;
-     }
-  else {
-     struct video_window vw;
-     result |= ioctl(videoDev, VIDIOCGWIN,  &vw);
-     vw.x = PosX;
-     vw.y = PosY;
-     vw.width = SizeX;
-     vw.height = SizeY;
-     vw.chromakey = ovlPalette;
-#ifndef VID_TYPE_CHROMAKEY // name changed somewhere down the road in kernel 2.4.x
-#define VID_TYPE_CHROMAKEY VIDEO_WINDOW_CHROMAKEY
-#endif
-     vw.flags = VID_TYPE_CHROMAKEY; // VIDEO_WINDOW_INTERLACE; //VIDEO_CLIP_BITMAP;
-     vw.clips = ovlClipRects;
-     vw.clipcount = ovlClipCount;
-     result |= ioctl(videoDev, VIDIOCSWIN, &vw);
-     if (result) {
-        ovlGeoSet = false;
-        ovlClipCount = 0;
-        return false;
-        }
-     else {
-        ovlSizeX = SizeX;
-        ovlSizeY = SizeY;
-        ovlPosX = PosX;
-        ovlPosY = PosY;
-        ovlGeoSet = true;
-        ovlStat = true;
-        return true;
-        }
+     close(videoDev);
      }
-}
-
-bool cDvbApi::OvlC(int ClipCount, CRect *cr)
-{
-  if (videoDev < 0)
-     return false;
-  if (ovlGeoSet && ovlFbSet) {
-     for (int i = 0; i < ClipCount; i++) {
-         ovlClipRects[i].x = cr[i].x;
-         ovlClipRects[i].y = cr[i].y;
-         ovlClipRects[i].width = cr[i].width;
-         ovlClipRects[i].height = cr[i].height;
-         ovlClipRects[i].next = &(ovlClipRects[i + 1]);
-         }
-     ovlClipCount = ClipCount;
-     //use it:
-     return OvlG(ovlSizeX, ovlSizeY, ovlPosX, ovlPosY);
-     }
-  return false;
-}
-
-bool cDvbApi::OvlP(__u16 Brightness, __u16 Colour, __u16 Hue, __u16 Contrast)
-{
-  if (videoDev < 0)
-     return false;
-  int result = 0;
-  ovlBrightness = Brightness;
-  ovlColour = Colour;
-  ovlHue = Hue;
-  ovlContrast = Contrast;
-  struct video_picture vp;
-  if (!ovlFbSet)
-     return false;
-  result |= ioctl(videoDev, VIDIOCGPICT, &vp);
-  vp.brightness = Brightness;
-  vp.colour = Colour;
-  vp.hue = Hue;
-  vp.contrast = Contrast;
-  vp.depth = ovlBpp;
-  vp.palette = ovlPalette; // gf: is this always ok? VIDEO_PALETTE_RGB565;
-  result |= ioctl(videoDev, VIDIOCSPICT, &vp);
   return result == 0;
 }
 
-bool cDvbApi::OvlO(bool Value)
-{
-  if (videoDev < 0)
-     return false;
-  int result = 0;
-  if (!ovlGeoSet && Value)
-     return false;
-  int one = 1;
-  int zero = 0;
-  result |= ioctl(videoDev, VIDIOCCAPTURE, Value ? &one : &zero);
-  ovlStat = Value;
-  if (result) {
-     ovlStat = false;
-     return false;
-     }
-  return true;
-}
-
 #ifdef DEBUG_OSD
 void cDvbApi::SetColor(eDvbColor colorFg, eDvbColor colorBg)
 {
@@ -3257,97 +3131,106 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
 
      bool ChannelSynced = false;
 
-     if (fd_sec >= 0) { // DVB-S
+     switch (frontendType) {
+       case FE_QPSK: { // DVB-S
 
-        // Frequency offsets:
+            // Frequency offsets:
 
-        unsigned int freq = FrequencyMHz;
-        int tone = SEC_TONE_OFF;
+            unsigned int freq = FrequencyMHz;
+            int tone = SEC_TONE_OFF;
 
-        if (freq < (unsigned int)Setup.LnbSLOF) {
-           freq -= Setup.LnbFrequLo;
-           tone = SEC_TONE_OFF;
-           }
-        else {
-           freq -= Setup.LnbFrequHi;
-           tone = SEC_TONE_ON;
-           }
+            if (freq < (unsigned int)Setup.LnbSLOF) {
+               freq -= Setup.LnbFrequLo;
+               tone = SEC_TONE_OFF;
+               }
+            else {
+               freq -= Setup.LnbFrequHi;
+               tone = SEC_TONE_ON;
+               }
 
-        FrontendParameters Frontend;
-        Frontend.Frequency = freq * 1000UL;
-        Frontend.Inversion = INVERSION_AUTO;
-        Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
-        Frontend.u.qpsk.FEC_inner = FEC_AUTO;
+            FrontendParameters Frontend;
+            Frontend.Frequency = freq * 1000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
+            Frontend.u.qpsk.FEC_inner = FEC_AUTO;
 
-        int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+            int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
 
-        // DiseqC:
+            // DiseqC:
 
-        secCommand scmd;
-        scmd.type = 0;
-        scmd.u.diseqc.addr = 0x10;
-        scmd.u.diseqc.cmd = 0x38;
-        scmd.u.diseqc.numParams = 1;
-        scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
+            secCommand scmd;
+            scmd.type = 0;
+            scmd.u.diseqc.addr = 0x10;
+            scmd.u.diseqc.cmd = 0x38;
+            scmd.u.diseqc.numParams = 1;
+            scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
 
-        secCmdSequence scmds;
-        scmds.voltage = volt;
-        scmds.miniCommand = SEC_MINI_NONE;
-        scmds.continuousTone = tone;
-        scmds.numCommands = Setup.DiSEqC ? 1 : 0;
-        scmds.commands = &scmd;
+            secCmdSequence scmds;
+            scmds.voltage = volt;
+            scmds.miniCommand = SEC_MINI_NONE;
+            scmds.continuousTone = tone;
+            scmds.numCommands = Setup.DiSEqC ? 1 : 0;
+            scmds.commands = &scmd;
 
-        CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+            CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
 
-        // Tuning:
+            // Tuning:
 
-        CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
+            CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
 
-        // Wait for channel sync:
+            // Wait for channel sync:
 
-        if (cFile::FileReady(fd_frontend, 5000)) {
-           FrontendEvent event;
-           int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-           if (res >= 0)
-              ChannelSynced = event.type == FE_COMPLETION_EV;
-           else
-              esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
-           }
-        else
-           esyslog(LOG_ERR, "ERROR: timeout while tuning");
-        }
-     else if (fd_frontend >= 0) { // DVB-C
+            if (cFile::FileReady(fd_frontend, 5000)) {
+               FrontendEvent event;
+               int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
+               if (res >= 0)
+                  ChannelSynced = event.type == FE_COMPLETION_EV;
+               else
+                  esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
+               }
+            else
+               esyslog(LOG_ERR, "ERROR: timeout while tuning");
+            }
+            break;
+       case FE_QAM: { // DVB-C
 
-        // Frequency and symbol rate:
+            // Frequency and symbol rate:
 
-        FrontendParameters Frontend;
-        Frontend.Frequency = FrequencyMHz * 1000000UL;
-        Frontend.Inversion = INVERSION_AUTO;
-        Frontend.u.qam.SymbolRate = Srate * 1000UL;
-        Frontend.u.qam.FEC_inner = FEC_AUTO;
-        Frontend.u.qam.QAM = QAM_64;
+            FrontendParameters Frontend;
+            Frontend.Frequency = FrequencyMHz * 1000000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.qam.SymbolRate = Srate * 1000UL;
+            Frontend.u.qam.FEC_inner = FEC_AUTO;
+            Frontend.u.qam.QAM = QAM_64;
 
-        // Tuning:
+            // Tuning:
 
-        CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
+            CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
 
-        // Wait for channel sync:
+            // Wait for channel sync:
 
-        if (cFile::FileReady(fd_frontend, 5000)) {
-           FrontendEvent event;
-           int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-           if (res >= 0)
-              ChannelSynced = event.type == FE_COMPLETION_EV;
-           else
-              esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
-           }
-        else
-           esyslog(LOG_ERR, "ERROR: timeout while tuning");
-        }
-     else {
-        esyslog(LOG_ERR, "ERROR: attempt to set channel without DVB-S or DVB-C device");
-        return scrFailed;
-        }
+            if (cFile::FileReady(fd_frontend, 5000)) {
+               FrontendEvent event;
+               int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
+               if (res >= 0)
+                  ChannelSynced = event.type == FE_COMPLETION_EV;
+               else
+                  esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
+               }
+            else
+               esyslog(LOG_ERR, "ERROR: timeout while tuning");
+            }
+            break;
+       case FE_OFDM: { // DVB-T
+            //XXX TODO: implement DVB-T tuning (anybody with a DVB-T card out there?)
+            esyslog(LOG_ERR, "ERROR: DVB-T tuning support not yet implemented");
+            return scrFailed;
+            }
+            break;
+       default:
+            esyslog(LOG_ERR, "ERROR: attempt to set channel with unknown DVB frontend type");
+            return scrFailed;
+       }
 
      if (!ChannelSynced) {
         esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
diff --git a/dvbapi.h b/dvbapi.h
index 8e67f9b4b..01bb2dd92 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.53 2001/09/23 11:01:46 kls Exp $
+ * $Id: dvbapi.h 1.58 2001/11/04 11:39:42 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -34,12 +34,6 @@
 #include "eit.h"
 #include "thread.h"
 
-// Overlay facilities
-#define MAXCLIPRECTS 100
-typedef struct CRect {
-  signed short x, y, width, height;
-  };
-
 #define FRAMESPERSEC 25
 
 // The maximum file size is limited by the range that can be covered
@@ -89,7 +83,7 @@ class cDvbApi {
 #endif //DVDSUPPORT
   friend class cTransferBuffer;
 private:
-  int videoDev;
+  FrontendType frontendType;
   int fd_osd, fd_frontend, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt;
   int vPid, aPid1, aPid2, dPid1, dPid2;
   bool SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output);
@@ -154,21 +148,6 @@ class cDvbApi {
 
   bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
 
-  // Overlay facilities
-
-private:
-  bool ovlStat, ovlGeoSet, ovlFbSet;
-  int ovlSizeX, ovlSizeY, ovlPosX, ovlPosY, ovlBpp, ovlPalette, ovlClips, ovlClipCount;
-  int ovlFbSizeX, ovlFbSizeY;
-  __u16 ovlBrightness, ovlColour, ovlHue, ovlContrast;
-  struct video_clip ovlClipRects[MAXCLIPRECTS];
-public:
-  bool OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette);
-  bool OvlG(int SizeX, int SizeY, int PosX, int PosY);
-  bool OvlC(int ClipCount, CRect *Cr);
-  bool OvlP(__u16 Brightness, __u16 Color, __u16 Hue, __u16 Contrast);
-  bool OvlO(bool Value);
-
   // On Screen Display facilities
 
 private:
@@ -233,8 +212,6 @@ class cDvbApi {
   cPlayBuffer *replayBuffer;
   int ca;
   int priority;
-  int  Ca(void) { return ca; }
-       // Returns the ca of the current recording session (0..MAXDVBAPI).
   int  Priority(void) { return priority; }
        // Returns the priority of the current recording session (0..MAXPRIORITY),
        // or -1 if no recording is currently active.
@@ -243,6 +220,8 @@ class cDvbApi {
   void SetModeReplay(void);
   void SetModeNormal(bool FromRecording);
 public:
+  int  Ca(void) { return ca; }
+       // Returns the ca of the current recording session (0..MAXDVBAPI).
   int  SecondsToFrames(int Seconds);
        // Returns the number of frames corresponding to the given number of seconds.
   bool Recording(void);
@@ -330,6 +309,7 @@ class cDvbApi {
   void SetVolume(int Volume, bool Absolute = false);
        // Sets the volume to the given value, either absolutely or relative to
        // the current volume.
+  static int CurrentVolume(void) { return PrimaryDvbApi ? PrimaryDvbApi->volume : 0; }
   };
 
 class cEITScanner {
diff --git a/eit.c b/eit.c
index 71ab54c3f..00792ab5f 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.28 2001/10/19 13:13:25 kls Exp $
+ * $Id: eit.c 1.29 2001/10/28 13:51:22 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -189,6 +189,7 @@ cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
    bIsPresent = bIsFollowing = false;
    lDuration = 0;
    tTime = 0;
+   uTableID = 0;
    uEventID = eventid;
    uServiceID = serviceid;
    nChannelNumber = 0;
@@ -231,6 +232,12 @@ bool cEventInfo::IsFollowing() const
 {
    return bIsFollowing;
 }
+
+void cEventInfo::SetTableID(unsigned char tableid)
+{
+   uTableID = tableid;
+}
+
 /**  */
 void cEventInfo::SetFollowing(bool foll)
 {
@@ -246,6 +253,12 @@ const char * cEventInfo::GetDate() const
 
    return szDate;
 }
+
+const unsigned char cEventInfo::GetTableID(void) const
+{
+   return uTableID;
+}
+
 /**  */
 const char * cEventInfo::GetTimeString() const
 {
@@ -545,21 +558,26 @@ unsigned short cSchedule::GetServiceID() const
    return uServiceID;
 }
 /**  */
-const cEventInfo * cSchedule::GetEvent(unsigned short uEventID) const
+const cEventInfo * cSchedule::GetEvent(unsigned short uEventID, time_t tTime) const
 {
+   // Returns either the event info with the given uEventID or, if that one can't
+   // be found, the one with the given tTime (or NULL if neither can be found)
    cEventInfo *pe = Events.First();
+   cEventInfo *pt = NULL;
    while (pe != NULL)
    {
       if (pe->GetEventID() == uEventID)
          return pe;
+      if (tTime > 0 && pe->GetTime() == tTime) // 'tTime < 0' is apparently used with NVOD channels
+         pt = pe;
 
       pe = Events.Next(pe);
    }
 
-   return NULL;
+   return pt;
 }
 /**  */
-const cEventInfo * cSchedule::GetEvent(time_t tTime) const
+const cEventInfo * cSchedule::GetEventAround(time_t tTime) const
 {
    cEventInfo *pe = Events.First();
    while (pe != NULL)
@@ -759,7 +777,7 @@ int cEIT::ProcessEIT(unsigned char *buffer)
              if (!rEvent)
                 break;
              }
-          pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
+          pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID, VdrProgramInfo->StartTime);
           if (!pEvent) {
              // If we don't have that event ID yet, we create a new one.
              // Otherwise we copy the information into the existing event anyway, because the data might have changed.
@@ -767,6 +785,14 @@ int cEIT::ProcessEIT(unsigned char *buffer)
              pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
              if (!pEvent)
                 break;
+             pEvent->SetTableID(tid);
+             }
+          else {
+             // We have found an existing event, either through its event ID or its start time.
+             // If the new event comes from a table that belongs to an "other TS" and the existing
+             // one comes from a "actual TS" table, lets skip it.
+             if ((tid == 0x4F || tid == 0x60) && (pEvent->GetTableID() == 0x4E || pEvent->GetTableID() == 0x50))
+                continue;
              }
           if (rEvent) {
              pEvent->SetTitle(rEvent->GetTitle());
@@ -774,6 +800,7 @@ int cEIT::ProcessEIT(unsigned char *buffer)
              pEvent->SetExtendedDescription(rEvent->GetExtendedDescription());
              }
           else {
+             pEvent->SetTableID(tid);
              pEvent->SetTitle(VdrProgramInfo->ShortName);
              pEvent->SetSubtitle(VdrProgramInfo->ShortText);
              pEvent->SetExtendedDescription(VdrProgramInfo->ExtendedName);
diff --git a/eit.h b/eit.h
index 91d5b2b38..131419623 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.11 2001/09/22 11:43:21 kls Exp $
+ * $Id: eit.h 1.12 2001/10/28 12:33:10 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -29,6 +29,7 @@ class cEventInfo : public cListObject {
   friend class cSchedule;
   friend class cEIT;
 private:
+  unsigned char uTableID;           // Table ID this event came from
   unsigned short uServiceID;        // Service ID of program for that event
   bool bIsFollowing;                // true if this is the next event on this channel
   bool bIsPresent;                  // true if this is the present event running
@@ -40,6 +41,7 @@ class cEventInfo : public cListObject {
   time_t tTime;                     // Start time
   int nChannelNumber;               // the actual channel number from VDR's channel list (used in cMenuSchedule for sorting by channel number)
 protected:
+  void SetTableID(unsigned char tableid);
   void SetFollowing(bool foll);
   void SetPresent(bool pres);
   void SetTitle(const char *string);
@@ -52,6 +54,7 @@ class cEventInfo : public cListObject {
   cEventInfo(unsigned short serviceid, unsigned short eventid);
 public:
   ~cEventInfo();
+  const unsigned char GetTableID(void) const;
   const char *GetTimeString(void) const;
   const char *GetEndTimeString(void) const;
   const char *GetDate(void) const;
@@ -90,8 +93,8 @@ class cSchedule : public cListObject  {
   const cEventInfo *GetPresentEvent(void) const;
   const cEventInfo *GetFollowingEvent(void) const;
   unsigned short GetServiceID(void) const;
-  const cEventInfo *GetEvent(unsigned short uEventID) const;
-  const cEventInfo *GetEvent(time_t tTime) const;
+  const cEventInfo *GetEvent(unsigned short uEventID, time_t tTime = 0) const;
+  const cEventInfo *GetEventAround(time_t tTime) const;
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
   int NumEvents(void) const { return Events.Count(); }
   void Dump(FILE *f, const char *Prefix = "") const;
diff --git a/i18n.c b/i18n.c
index 926624a8a..764dc3380 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.44 2001/09/30 11:31:43 kls Exp $
+ * $Id: i18n.c 1.45 2001/10/28 16:04:58 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -376,6 +376,15 @@ const tPhrase Phrases[] = {
     "Arr�ter l'enregistrement?",
     "Stoppe opptak?",
   },
+  { "on primary interface",
+    "auf dem prim�ren Interface",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Cancel editing?",
     "Schneiden abbrechen?",
     "Zelite prekiniti urejanje?",
diff --git a/menu.c b/menu.c
index 0242d91f9..154f66cfa 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.131 2001/10/21 14:28:14 kls Exp $
+ * $Id: menu.c 1.139 2001/11/04 10:37:18 kls Exp $
  */
 
 #include "menu.h"
@@ -1808,11 +1808,15 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 // --- cMenuMain -------------------------------------------------------------
 
 #define STOP_RECORDING tr(" Stop recording ")
+#define ON_PRIMARY_INTERFACE tr("on primary interface")
 
 cMenuMain::cMenuMain(bool Replaying, eOSState State)
 :cOsdMenu(tr("Main"))
 {
   digit = 0;
+
+  // Basic menu items:
+
   Add(new cOsdItem(hk(tr("Schedule")),   osSchedule));
   Add(new cOsdItem(hk(tr("Channels")),   osChannels));
   Add(new cOsdItem(hk(tr("Timers")),     osTimers));
@@ -1824,8 +1828,20 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
   Add(new cOsdItem(hk(tr("Setup")),      osSetup));
   if (Commands.Count())
      Add(new cOsdItem(hk(tr("Commands")),  osCommands));
+
+  // Replay control:
+
   if (Replaying)
      Add(new cOsdItem(tr(" Stop replaying"), osStopReplay));
+
+  // Record control:
+
+  if (cRecordControls::StopPrimary()) {
+     char *buffer = NULL;
+     asprintf(&buffer, "%s%s", STOP_RECORDING, ON_PRIMARY_INTERFACE);
+     Add(new cOsdItem(buffer, osStopRecord));
+     }
+
   const char *s = NULL;
   while ((s = cRecordControls::GetInstantId(s)) != NULL) {
         char *buffer = NULL;
@@ -1833,8 +1849,14 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
         Add(new cOsdItem(buffer, osStopRecord));
         delete buffer;
         }
+
+  // Editing control:
+
   if (cVideoCutter::Active())
      Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
+
+  // Color buttons:
+
   const char *DVDbutton =
 #ifdef DVDSUPPORT
                           cDVD::DiscOk() ? tr("Eject") : NULL;
@@ -1845,6 +1867,9 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
   Display();
   lastActivity = time(NULL);
   SetHasHotkeys();
+
+  // Initial submenus:
+
   switch (State) {
     case osRecordings: AddSubMenu(new cMenuRecordings); break;
 #ifdef DVDSUPPORT
@@ -1882,7 +1907,11 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
                           cOsdItem *item = Get(Current());
                           if (item) {
-                             cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
+                             const char *s = item->Text() + strlen(STOP_RECORDING);
+                             if (strcmp(s, ON_PRIMARY_INTERFACE) == 0)
+                                cRecordControls::StopPrimary(true);
+                             else
+                                cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
                              return osEnd;
                              }
                           }
@@ -1908,6 +1937,14 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 #ifdef DVDSUPPORT
                case kYellow: if (!HasSubMenu()) {
                                 if (cDVD::DiscOk()) {
+                                   // We need to stop replaying a DVD before ejecting,
+                                   // otherwise the replay thread crashes. Currently
+                                   // checking LastReplayed() is pretty much the only way
+                                   // of finding out whether we are currently replaying a DVD
+                                   // (i.e. if LastReplayed() returns non-NULL, we are either
+                                   // replaying a normal recording, or nothing at all):
+                                   if (!cReplayControl::LastReplayed())
+                                      cDvbApi::PrimaryDvbApi->StopReplay();
                                    cDVD::Eject();
                                    state = osEnd;
                                    }
@@ -2062,7 +2099,9 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                }
             }
          break;
+    case kLeft|k_Repeat:
     case kLeft:
+    case kRight|k_Repeat:
     case kRight:
          withInfo = false;
          if (group < 0) {
@@ -2072,7 +2111,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             }
          if (group >= 0) {
             int SaveGroup = group;
-            if (Key == kRight)
+            if (NORMALKEY(Key) == kRight)
                group = Channels.GetNextGroup(group) ;
             else
                group = Channels.GetPrevGroup(group < 1 ? 1 : group);
@@ -2101,8 +2140,10 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kOk:     if (group >= 0)
                      Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->number);
                   return osEnd;
-    default:      Interface->PutKey(Key);
-                  return osEnd;
+    default:      if (NORMALKEY(Key) == kUp || NORMALKEY(Key) == kDown || (Key & (k_Repeat | k_Release)) == 0) {
+                     Interface->PutKey(Key);
+                     return osEnd;
+                     }
     };
   if (time_ms() - lastTime < INFOTIMEOUT) {
      DisplayInfo();
@@ -2166,7 +2207,7 @@ bool cRecordControl::GetEventInfo(void)
         if (Schedules) {
            const cSchedule *Schedule = Schedules->GetSchedule(channel->pnr);
            if (Schedule) {
-              eventInfo = Schedule->GetEvent(Time);
+              eventInfo = Schedule->GetEventAround(Time);
               if (eventInfo) {
                  if (seconds > 0)
                     dsyslog(LOG_INFO, "got EPG info after %d seconds", seconds);
@@ -2260,6 +2301,19 @@ void cRecordControls::Stop(cDvbApi *DvbApi)
       }
 }
 
+bool cRecordControls::StopPrimary(bool DoIt)
+{
+  if (cDvbApi::PrimaryDvbApi->Recording()) {
+     cDvbApi *dvbApi = cDvbApi::GetDvbApi(cDvbApi::PrimaryDvbApi->Ca(), 0);
+     if (dvbApi) {
+        if (DoIt)
+           Stop(cDvbApi::PrimaryDvbApi);
+        return true;
+        }
+     }
+  return false;
+}
+
 const char *cRecordControls::GetInstantId(const char *LastInstantId)
 {
   for (int i = 0; i < MAXDVBAPI; i++) {
@@ -2354,7 +2408,8 @@ cReplayControl::cReplayControl(void)
   timeSearchActive = false;
   if (fileName) {
      marks.Load(fileName);
-     dvbApi->StartReplay(fileName);
+     if (!dvbApi->StartReplay(fileName))
+        Interface->Error(tr("Channel locked (recording)!"));
      }
 #ifdef DVDSUPPORT
   else if (dvd)
@@ -2418,10 +2473,7 @@ void cReplayControl::Hide(void)
   if (visible) {
      Interface->Close();
      needsFastResponse = visible = false;
-     if (!modeOnly)
-        ShowMode();
-     else
-        modeOnly = false;
+     modeOnly = false;
      }
 }
 
@@ -2664,15 +2716,18 @@ void cReplayControl::MarkMove(bool Forward)
 
 void cReplayControl::EditCut(void)
 {
-  Hide();
-  if (!cVideoCutter::Active()) {
-     if (!cVideoCutter::Start(fileName))
-        Interface->Error(tr("Can't start editing process!"));
+  if (fileName) {
+     Hide();
+     if (!cVideoCutter::Active()) {
+        if (!cVideoCutter::Start(fileName))
+           Interface->Error(tr("Can't start editing process!"));
+        else
+           Interface->Info(tr("Editing process started"));
+        }
      else
-        Interface->Info(tr("Editing process started"));
+        Interface->Error(tr("Editing process already active!"));
+     ShowMode();
      }
-  else
-     Interface->Error(tr("Editing process already active!"));
 }
 
 void cReplayControl::EditTest(void)
@@ -2700,6 +2755,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
   if (visible) {
      if (timeoutShow && time(NULL) > timeoutShow) {
         Hide();
+        ShowMode();
         timeoutShow = 0;
         }
      else if (!modeOnly)
@@ -2749,8 +2805,10 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
           switch (Key) {
             // Menu control:
             case kMenu:    Hide(); return osMenu; // allow direct switching to menu
-            case kOk:      if (visible && !modeOnly)
+            case kOk:      if (visible && !modeOnly) {
                               Hide();
+                              DoShowMode = true;
+                              }
                            else
                               Show();
                            break;
diff --git a/menu.h b/menu.h
index b41a935b0..250d2ff52 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.33 2001/10/21 14:26:01 kls Exp $
+ * $Id: menu.h 1.34 2001/10/28 15:21:04 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -92,6 +92,7 @@ class cRecordControls {
   static bool Start(cTimer *Timer = NULL);
   static void Stop(const char *InstantId);
   static void Stop(cDvbApi *DvbApi);
+  static bool StopPrimary(bool DoIt = false);
   static const char *GetInstantId(const char *LastInstantId);
   static void Process(time_t t);
   static bool Active(void);
diff --git a/ringbuffer.c b/ringbuffer.c
index 7e09b2af5..8b8420c16 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.4 2001/08/05 12:17:45 kls Exp $
+ * $Id: ringbuffer.c 1.5 2001/11/03 09:50:46 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -215,9 +215,10 @@ int cRingBufferLinear::Get(uchar *Data, int Count)
 
 // --- cFrame ----------------------------------------------------------------
 
-cFrame::cFrame(const uchar *Data, int Count, int Index)
+cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
 {
   count = Count;
+  type = Type;
   index = Index;
   data = new uchar[count];
   if (data)
diff --git a/ringbuffer.h b/ringbuffer.h
index f61d9e04c..7e1025b1e 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.4 2001/08/05 11:12:06 kls Exp $
+ * $Id: ringbuffer.h 1.5 2001/11/03 10:41:33 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -75,18 +75,22 @@ class cRingBufferLinear : public cRingBuffer {
   virtual ~cRingBufferLinear();
   };
 
+enum eFrameType { ftUnknown, ftVideo, ftAudio, ftDolby };
+
 class cFrame {
   friend class cRingBufferFrame;
 private:
   cFrame *next;
   uchar *data;
   int count;
+  eFrameType type;
   int index;
 public:
-  cFrame(const uchar *Data, int Count, int Index = -1);
+  cFrame(const uchar *Data, int Count, eFrameType = ftUnknown, int Index = -1);
   ~cFrame();
   const uchar *Data(void) const { return data; }
   int Count(void) const { return count; }
+  eFrameType Type(void) const { return type; }
   int Index(void) const { return index; }
   };
 
diff --git a/svdrp.c b/svdrp.c
index 43c55e467..48c956391 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.25 2001/10/07 15:13:42 kls Exp $
+ * $Id: svdrp.c 1.27 2001/11/04 11:25:05 kls Exp $
  */
 
 #include "svdrp.h"
@@ -27,6 +27,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include "config.h"
+#include "dvbapi.h"
 #include "interface.h"
 #include "tools.h"
 
@@ -120,6 +121,12 @@ const char *HelpPages[] = {
   "    it returns the current channel number and name.",
   "DELC <number>\n"
   "    Delete channel.",
+  "DELR <number>\n"
+  "    Delete the recording with the given number. Before a recording can be\n"
+  "    deleted, an LSTR command must have been executed in order to retrieve\n"
+  "    the recording numbers. The numbers don't change during subsequent DELR\n"
+  "    commands. CAUTION: THERE IS NO CONFIRMATION PROMPT WHEN DELETING A\n"
+  "    RECORDING - BE SURE YOU KNOW WHAT YOU ARE DOING!",
   "DELT <number>\n"
   "    Delete timer.",
   "GRAB <filename> [ jpeg | pnm [ <quality> [ <sizex> <sizey> ] ] ]\n"
@@ -137,6 +144,9 @@ const char *HelpPages[] = {
   "    containing the given string as part of their name are listed.",
   "LSTE\n"
   "    List EPG data.",
+  "LSTR [ <number> ]\n"
+  "    List recordings. Without option, all recordings are listed. Otherwise\n"
+  "    the summary for the given recording is listed.",
   "LSTT [ <number> ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed.",
@@ -174,16 +184,6 @@ const char *HelpPages[] = {
   "    zero, this means that the timer is currently recording and has started\n"
   "    at the given time. The first value in the resulting line is the number\n"
   "    of the timer.",
-  "OVLF <sizex> <sizey> <fbaddr> <bpp> <palette>\n"
-  "    Set the size, address depth and palette of the overlay.",
-  "OVLG <sizex> <sizey> <posx> <posy>\n"
-  "    Set the size and position of the overlay.",
-  "OVLC <clipcount> <base16-CRect-array>\n"
-  "    Set the overlay clipping rectangles.",
-  "OVLP <brightness> <colour> <hue> <contrast>\n"
-  "    Set the picture parameters for the overlay.",
-  "OVLO 0 | 1\n"
-  "    Switch the overlay on or off.",
   "UPDT <settings>\n"
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
@@ -278,7 +278,6 @@ bool cSVDRP::Send(const char *s, int length)
   if (wbytes < 0) {
      LOG_ERROR;
      file.Close();
-     cDvbApi::PrimaryDvbApi->OvlO(false);
      }
   else //XXX while...???
      esyslog(LOG_ERR, "Wrote %d bytes to client while expecting %d\n", wbytes, length);
@@ -380,6 +379,27 @@ void cSVDRP::CmdDELC(const char *Option)
   Reply(502, "DELC not yet implemented");
 }
 
+void cSVDRP::CmdDELR(const char *Option)
+{
+  if (*Option) {
+     if (isnumber(Option)) {
+        cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
+        if (recording) {
+           if (recording->Delete())
+              Reply(250, "Recording \"%s\" deleted", Option);
+           else
+              Reply(554, "Error while deleting recording!");
+           }
+        else
+           Reply(550, "Recording \"%s\" not found%s", Option, Recordings.Count() ? "" : " (use LSTR before deleting)");
+        }
+     else
+        Reply(501, "Error in recording number \"%s\"", Option);
+     }
+  else
+     Reply(501, "Missing recording number");
+}
+
 void cSVDRP::CmdDELT(const char *Option)
 {
   if (*Option) {
@@ -589,6 +609,38 @@ void cSVDRP::CmdLSTE(const char *Option)
      Reply(451, "Can't get EPG data");
 }
 
+void cSVDRP::CmdLSTR(const char *Option)
+{
+  bool recordings = Recordings.Load();
+  if (*Option) {
+     if (isnumber(Option)) {
+        cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
+        if (recording) {
+           if (recording->Summary()) {
+              char *summary = strdup(recording->Summary());
+              Reply(250, "%s", strreplace(summary,'\n','|'));
+              delete summary;
+              }
+           else
+              Reply(550, "No summary availabe");
+           }
+        else
+           Reply(550, "Recording \"%s\" not found", Option);
+        }
+     else
+        Reply(501, "Error in recording number \"%s\"", Option);
+     }
+  else if (recordings) {
+     cRecording *recording = Recordings.First();
+     while (recording) {
+           Reply(recording == Recordings.Last() ? 250 : -250, "%d %s", recording->Index() + 1, recording->Title(' ', true));
+           recording = Recordings.Next(recording);
+           }
+     }
+  else
+     Reply(550, "No recordings available");
+}
+
 void cSVDRP::CmdLSTT(const char *Option)
 {
   if (*Option) {
@@ -767,106 +819,6 @@ void cSVDRP::CmdNEXT(const char *Option)
      Reply(550, "No active timers");
 }
 
-void cSVDRP::CmdOVLF(const char *Option)
-{
-  if (*Option) {
-     int SizeX = 0, SizeY = 0, Bpp = 0, Palette = 0, FbAddr = 0;
-     if (5 == sscanf(Option, "%d %d %x %d %d", &SizeX, &SizeY, &FbAddr, &Bpp, &Palette)) {
-        //somehow_set_overlay_geometry;
-        if (cDvbApi::PrimaryDvbApi->OvlF(SizeX, SizeY, FbAddr, Bpp, Palette))
-           Reply(250, "Overlay framebuffer set");      
-        else
-           Reply(451, "Illegal overlay framebuffer settings");
-        }
-     else
-        Reply(501, "Could not parse overlay framebuffer settings");
-     }
-  else
-     Reply(501, "Missing overlay framebuffer settings");
-}
-
-void cSVDRP::CmdOVLG(const char *Option)
-{
-  if (*Option) {
-     int SizeX = 0, SizeY = 0, PosX = 0, PosY = 0;
-     if (4 == sscanf(Option, "%d %d %d %d", &SizeX, &SizeY, &PosX, &PosY)) {
-        //somehow_set_overlay_geometry;
-        if (cDvbApi::PrimaryDvbApi->OvlG(SizeX, SizeY, PosX, PosY))
-           Reply(250, "Overlay geometry set"); 
-        else
-           Reply(451, "Illegal overlay geometry settings");
-        }
-     else
-        Reply(501, "Could not parse overlay geometry settings");
-     }
-  else
-     Reply(501, "Missing overlay geometry settings");
-}
-
-void cSVDRP::CmdOVLC(const char *Option)
-{
-  if (*Option) {
-     int ClipCount = 0;
-     unsigned char s[2 * MAXCLIPRECTS * sizeof(CRect) + 2];
-     if (2 == sscanf(Option, "%d %s", &ClipCount, s)) {
-        // Base16-decoding of CRect-array:
-        unsigned char *p = (unsigned char*)ovlClipRects;
-        int i = 0, size = sizeof(CRect)*ClipCount;
-        for (int j = 0; i < size; i++) {
-            p[i]  = (s[j++] - 65);
-            p[i] += (s[j++] - 65) << 4;
-            }
-        if (((unsigned)ClipCount == (i / sizeof(CRect))) && (ClipCount >= 0)) {
-           // apply it:
-           if (cDvbApi::PrimaryDvbApi->OvlC(ClipCount, ovlClipRects))
-              Reply(250, "Overlay-Clipping set");
-           else
-              Reply(451, "Illegal overlay clipping settings");
-           return;
-           }
-        }
-     Reply(501, "Error parsing Overlay-Clipping settings");
-     }
-  else
-     Reply(501, "Missing Clipping settings");
-}
-
-void cSVDRP::CmdOVLP(const char *Option)
-{
-  if (*Option) {
-     int Brightness = 0, Colour = 0, Hue = 0, Contrast = 0;
-     if (4 == sscanf(Option, "%d %d %d %d", &Brightness, &Colour, &Hue, &Contrast)) {
-        //somehow_set_overlay_picture_settings;
-        if (cDvbApi::PrimaryDvbApi->OvlP(Brightness, Colour, Hue, Contrast))
-           Reply(250, "Overlay picture settings set"); 
-        else
-           Reply(451, "Illegal overlay picture settings");
-        }
-     else
-        Reply(501, "Could not parse overlay picture settings");
-     }
-  else
-     Reply(501, "Missing overlay picture settings");
-}
-
-void cSVDRP::CmdOVLO(const char *Option)
-{
-  if (*Option) {
-     int Value;
-     if (1 == sscanf(Option, "%d", &Value)) {
-        //somehow_set_overlay_picture_settings;
-        if (cDvbApi::PrimaryDvbApi->OvlO(Value))
-           Reply(250, "Overlay capture set");  
-        else
-           Reply(451, "Error setting overlay capture");
-        }
-     else
-        Reply(501, "Could not parse status");
-     }
-  else
-     Reply(501, "Missing overlay capture status");
-}
-
 void cSVDRP::CmdUPDT(const char *Option)
 {
   if (*Option) {
@@ -910,12 +862,14 @@ void cSVDRP::Execute(char *Cmd)
   s = skipspace(s);
   if      (CMD("CHAN"))  CmdCHAN(s);
   else if (CMD("DELC"))  CmdDELC(s);
+  else if (CMD("DELR"))  CmdDELR(s);
   else if (CMD("DELT"))  CmdDELT(s);
   else if (CMD("GRAB"))  CmdGRAB(s);
   else if (CMD("HELP"))  CmdHELP(s);
   else if (CMD("HITK"))  CmdHITK(s);
   else if (CMD("LSTC"))  CmdLSTC(s);
   else if (CMD("LSTE"))  CmdLSTE(s);
+  else if (CMD("LSTR"))  CmdLSTR(s);
   else if (CMD("LSTT"))  CmdLSTT(s);
   else if (CMD("MESG"))  CmdMESG(s);
   else if (CMD("MODC"))  CmdMODC(s);
@@ -925,11 +879,6 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
-  else if (CMD("OVLF"))  CmdOVLF(s);
-  else if (CMD("OVLG"))  CmdOVLG(s);
-  else if (CMD("OVLC"))  CmdOVLC(s);
-  else if (CMD("OVLP"))  CmdOVLP(s);
-  else if (CMD("OVLO"))  CmdOVLO(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("QUIT"))  Close();
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
diff --git a/svdrp.h b/svdrp.h
index 1c16f88b4..e68a92e43 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.11 2001/09/14 14:35:34 kls Exp $
+ * $Id: svdrp.h 1.13 2001/11/04 11:20:46 kls Exp $
  */
 
 #ifndef __SVDRP_H
 #define __SVDRP_H
 
-#include "dvbapi.h"
+#include "recording.h"
 #include "tools.h"
 
 class cSocket {
@@ -30,7 +30,7 @@ class cSVDRP {
 private:
   cSocket socket;
   cFile file;
-  CRect ovlClipRects[MAXCLIPRECTS];
+  cRecordings Recordings;
   uint numChars;
   char cmdLine[MAXPARSEBUFFER];
   char *message;
@@ -40,12 +40,14 @@ class cSVDRP {
   void Reply(int Code, const char *fmt, ...);
   void CmdCHAN(const char *Option);
   void CmdDELC(const char *Option);
+  void CmdDELR(const char *Option);
   void CmdDELT(const char *Option);
   void CmdGRAB(const char *Option);
   void CmdHELP(const char *Option);
   void CmdHITK(const char *Option);
   void CmdLSTC(const char *Option);
   void CmdLSTE(const char *Option);
+  void CmdLSTR(const char *Option);
   void CmdLSTT(const char *Option);
   void CmdMESG(const char *Option);
   void CmdMODC(const char *Option);
@@ -55,11 +57,6 @@ class cSVDRP {
   void CmdNEWC(const char *Option);
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
-  void CmdOVLF(const char *Option);
-  void CmdOVLG(const char *Option);
-  void CmdOVLC(const char *Option);
-  void CmdOVLP(const char *Option);
-  void CmdOVLO(const char *Option);
   void CmdUPDT(const char *Option);
   void Execute(char *Cmd);
 public:
diff --git a/thread.c b/thread.c
index b51489ec8..7e5b0ea7f 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.15 2001/10/21 12:25:31 kls Exp $
+ * $Id: thread.c 1.16 2001/10/27 13:23:06 kls Exp $
  */
 
 #include "thread.h"
@@ -99,8 +99,7 @@ cThread::cThread(void)
      signalHandlerInstalled = true;
      }
   running = false;
-  parentPid = threadPid = lockingPid = 0;
-  locked = 0;
+  parentPid = threadPid = 0;
 }
 
 cThread::~cThread()
@@ -159,24 +158,6 @@ void cThread::Cancel(int WaitSeconds)
   pthread_cancel(thread);
 }
 
-bool cThread::Lock(void)
-{
-  if (getpid() != lockingPid || !locked) {
-     Mutex.Lock();
-     lockingPid = getpid();
-     }
-  locked++;
-  return true;
-}
-
-void cThread::Unlock(void)
-{
-  if (!--locked) {
-     lockingPid = 0;
-     Mutex.Unlock();
-     }
-}
-
 void cThread::WakeUp(void)
 {
   kill(parentPid, SIGIO); // makes any waiting 'select()' call return immediately
@@ -228,17 +209,13 @@ bool cThreadLock::Lock(cThread *Thread)
 {
   if (Thread && !thread) {
      thread = Thread;
-     locked = Thread->Lock();
-     return locked;
+     Thread->Lock();
+     locked = true;
+     return true;
      }
   return false;
 }
 
-bool cThreadLock::Locked(void)
-{
-  return locked;
-}
-
 // --- cPipe -----------------------------------------------------------------
 
 // cPipe::Open() and cPipe::Close() are based on code originally received from
diff --git a/thread.h b/thread.h
index 89dcdf853..4547addeb 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.10 2001/10/20 10:25:19 kls Exp $
+ * $Id: thread.h 1.11 2001/10/27 13:22:20 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -45,9 +45,8 @@ class cThread {
   friend class cThreadLock;
 private:
   pthread_t thread;
-  cMutex Mutex;
-  pid_t parentPid, threadPid, lockingPid;
-  int locked;
+  cMutex mutex;
+  pid_t parentPid, threadPid;
   bool running;
   static time_t lastPanic;
   static int panicLevel;
@@ -55,8 +54,8 @@ class cThread {
   static bool signalHandlerInstalled;
   static void SignalHandler(int signum);
   static void *StartThread(cThread *Thread);
-  bool Lock(void);
-  void Unlock(void);
+  void Lock(void) { mutex.Lock(); }
+  void Unlock(void) { mutex.Unlock(); }
 protected:
   void WakeUp(void);
   virtual void Action(void) = 0;
@@ -84,7 +83,6 @@ class cThreadLock {
   cThreadLock(cThread *Thread = NULL);
   ~cThreadLock();
   bool Lock(cThread *Thread);
-  bool Locked(void);
   };
 
 #define LOCK_THREAD cThreadLock ThreadLock(this)
diff --git a/vdr.c b/vdr.c
index ce86fd0da..886b09178 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.86 2001/10/20 11:18:38 kls Exp $
+ * $Id: vdr.c 1.89 2001/11/03 12:23:45 kls Exp $
  */
 
 #include <getopt.h>
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
-              if (Shutdown && Setup.MinUserInactivity && Now - LastActivity > Setup.MinUserInactivity * 60) {
+              if (Shutdown && (Setup.MinUserInactivity || LastActivity == 1) && Now - LastActivity > Setup.MinUserInactivity * 60) {
                  cTimer *timer = Timers.GetNextActiveTimer();
                  time_t Next  = timer ? timer->StartTime() : 0;
                  time_t Delta = timer ? Next - Now : 0;
@@ -503,11 +503,12 @@ int main(int argc, char *argv[])
                        dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next));
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
-                    if (Interface->Confirm(tr("Press any key to cancel shutdown"), LastActivity == 1 ? 5 : SHUTDOWNWAIT, true)) {
+                    bool UserShutdown = key == kPower;
+                    if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
                        int Channel = timer ? timer->channel : 0;
                        const char *File = timer ? timer->file : "";
                        char *cmd;
-                       asprintf(&cmd, "%s %ld %ld %d '%s'", Shutdown, Next, Delta, Channel, File);
+                       asprintf(&cmd, "%s %ld %ld %d '%s' %d", Shutdown, Next, Delta, Channel, File, UserShutdown);
                        isyslog(LOG_INFO, "executing '%s'", cmd);
                        SystemExec(cmd);
                        delete cmd;
@@ -529,6 +530,7 @@ int main(int argc, char *argv[])
   if (Interrupted)
      isyslog(LOG_INFO, "caught signal %d", Interrupted);
   Setup.CurrentChannel = cDvbApi::CurrentChannel();
+  Setup.CurrentVolume  = cDvbApi::CurrentVolume();
   Setup.Save();
   cVideoCutter::Stop();
   delete Menu;

From b420457467ad0c8ae71f8b985914e85b7a0ff5aa Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 Nov 2001 18:00:00 +0100
Subject: [PATCH 029/307] Version 0.99pre1 - Fixed several channel definitions
 in 'channels.conf' (thanks to Thilo   Wunderlich). - Added MPEG audio support
 for DVD (thanks to Andreas Schultz). - Implemented DVB-T support (thanks to
 Dave Chapman).   This currently works only for UK channels. - Removed the
 range limits for the Frequency and Srate parameters of channel   definitions.
 - Changed the maximum value for PIDs in channels.conf from 0xFFFE to 0x1FFF.
 - Fixed DVD audio sync problems (thanks to Andreas Schultz). - Fixed external
 AC3 replay for DVDs (thanks to Andreas Schultz).

---
 CONTRIBUTORS       |   4 ++
 FORMATS            |  10 ++--
 HISTORY            |  13 +++++
 INSTALL            |  27 +++++----
 ac3dec/ac3.h       |   6 ++
 ac3dec/decode.c    |   8 +++
 channels.conf      |  51 ++++++++--------
 channels.conf.terr |  11 ++++
 config.h           |   4 +-
 dvbapi.c           | 141 +++++++++++++++++----------------------------
 dvbapi.h           |   4 +-
 dvd.c              |  23 +++++++-
 dvd.h              |  11 +++-
 menu.c             |  18 +++---
 14 files changed, 188 insertions(+), 143 deletions(-)
 create mode 100644 channels.conf.terr

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2fdfcc1fb..12154c812 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -59,6 +59,7 @@ Deti Fliegl <deti@fliegl.de>
 Dave Chapman <dave@dchapman.com>
  for implementing support for the teletext PID
  for his great support in switching to the NAPI
+ for implementing DVB-T support
 
 Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de>
  for his support in adapting VDR to DVB-C
@@ -162,3 +163,6 @@ Thomas Heiligenmann <thomas@heiligenmann.de>
 
 Norbert Schmidt <nschmidt-nrw@t-online.de>
  for filling in some missing teletext PIDs
+
+Thilo Wunderlich <tw@ubcom.net>
+ for his help in keeping 'channels.conf' up to date
diff --git a/FORMATS b/FORMATS
index 9142fd70d..2a99e6efa 100644
--- a/FORMATS
+++ b/FORMATS
@@ -20,10 +20,10 @@ Video Disk Recorder File Formats
 
   - Name: the channel's name (if the name originally contains a ':' character
     it has to be replaced by '|')
-  - Frequency in MHz (as an integer)
+  - Frequency in MHz for DVB-S and DVB-C, kHz for DVB-T (as an integer)
   - Polarization (one of 'h', 'H', 'v', 'V') **
   - Diseqc number **
-  - Symbol rate
+  - Symbol rate ***
   - Video PID
   - Audio PID (either one number, or two, separated by a comma)
     If this channel also carries Dolby Digital sound, the Dolby PIDs follow
@@ -33,8 +33,10 @@ Video Disk Recorder File Formats
     DVB card, 2 = can be decrypted by the second DVB card)
   - Program Number
 
-  Fields marked with ** are only meaningful for DVB-S (satellite) receivers.
-  DVB-C receivers simply ignore these.
+  Fields marked with ** are only meaningful for DVB-S receivers.
+  DVB-C and DVB-T receivers simply ignore these.
+  Fields marked with *** are only meaningful for DVB-S and DVB-C receivers.
+  DVB-T receivers simply ignore these.
 
 * timers.conf
 
diff --git a/HISTORY b/HISTORY
index c9d404e7e..3f00cb1a9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -865,3 +865,16 @@ Video Disk Recorder Revision History
   will now need to use kvdr 0.4 or later.
 - The device /dev/video is now opened only if necessary (to GRAB an image),
   allowing other programs (like 'kvdr', for instance) to use that device.
+
+2001-11-25: Version 0.99
+
+- Fixed several channel definitions in 'channels.conf' (thanks to Thilo
+  Wunderlich).
+- Added MPEG audio support for DVD (thanks to Andreas Schultz).
+- Implemented DVB-T support (thanks to Dave Chapman).
+  This currently works only for UK channels.
+- Removed the range limits for the Frequency and Srate parameters of channel
+  definitions.
+- Changed the maximum value for PIDs in channels.conf from 0xFFFE to 0x1FFF.
+- Fixed DVD audio sync problems (thanks to Andreas Schultz).
+- Fixed external AC3 replay for DVDs (thanks to Andreas Schultz).
diff --git a/INSTALL b/INSTALL
index d20bf1a13..0ab7edacb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -334,16 +334,23 @@ accessed using DiSEqC, you have to go to the "Setup" menu and set the "DiSEqC"
 parameter to "on". Also check the "DiSEqC" parameters for the various channels
 and set them to the necessary values.
 
-Running VDR with DVB-C (cable):
--------------------------------
-
-VDR automatically recognizes if the DVB card in use is a cable card.
-The only things that needs to be different when using digital cable
-is the 'channels.conf' file. The distribution archive contains a default
-'channels.conf.cable', which cable users can rename or copy to 'channels.conf'
-in order to receive cable channels. The format of this file is exactly the
-same as for satellite channels (the fields containing "Polarization" and
-"Diseqc" data are ignored in case of DVB-C).
+Running VDR with DVB-C (cable) or DVB-T (terrestrial):
+------------------------------------------------------
+
+VDR automatically recognizes if the DVB card in use is a cable or a
+terrestrial card. The only thing that needs to be different when using digital
+cable or terrestrial reception is the 'channels.conf' file. The distribution
+archive contains a default 'channels.conf.cable' and 'channels.conf.terr',
+respectively, which users of such cards can rename or copy to 'channels.conf'
+in order to receive digital cable or terrestrial channels. The format of these
+files is exactly the same as for satellite channels (the fields containing
+"Polarization" and "Diseqc" data are ignored in case of DVB-C and DVB-T, and
+the "Frequency" is in kHz in case of DVB-T).
+
+You can even use a mixture of DVB-S, DVB-C and DVB-T cards in the same system.
+All you need to do is to put all the channel definitions into one big
+'channel.conf' file and set the 'Ca' parameter of each channel to the number
+of the card that can receive it.
 
 Learning the remote control keys:
 ---------------------------------
diff --git a/ac3dec/ac3.h b/ac3dec/ac3.h
index d325f3bb3..8f268fbdb 100644
--- a/ac3dec/ac3.h
+++ b/ac3dec/ac3.h
@@ -19,7 +19,11 @@
  *  along with GNU Make; see the file COPYING.  If not, write to
  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
+ *------------------------------------------------------------
  *
+ * 24 Nov 2001
+ *      Andreas Schultz <aschultz@cs.uni-magdeburg.de>
+ *      Added ac3_buffersize()
  */
 
 #define AC3_BUFFER_SIZE (6*1024*16)
@@ -55,4 +59,6 @@ size_t ac3dec_decode_data (plugin_output_audio_t *output, uint8_t *data_start, u
 size_t ac3dec_decode_data (uint8_t *data_start ,uint8_t *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data);
 #endif
 
+uint32_t ac3_buffersize();
+
 #endif
diff --git a/ac3dec/decode.c b/ac3dec/decode.c
index fb852055c..1ff517c41 100644
--- a/ac3dec/decode.c
+++ b/ac3dec/decode.c
@@ -31,6 +31,9 @@
  *      Matjaz Thaler <matjaz.thaler@rd.iskraemeco.si>
  *      Added support for DVB-s PCI card
  *
+ * 24 Nov 2001
+ *      Andreas Schultz <aschultz@cs.uni-magdeburg.de>
+ *      Added ac3_buffersize()
  */
 
 #ifdef HAVE_CONFIG_H
@@ -96,6 +99,11 @@ static uint32_t buffer_size = 0;;
 // for error handling
 jmp_buf error_jmp_mark;
 
+uint32_t ac3_buffersize()
+{
+  return buffer_size;
+}
+
 static uint32_t decode_buffer_syncframe (syncinfo_t *syncinfo, uint8_t **start, uint8_t *end)
 {
 	uint8_t *cur = *start;
diff --git a/channels.conf b/channels.conf
index c9bf996a2..2cc3975f5 100644
--- a/channels.conf
+++ b/channels.conf
@@ -28,10 +28,10 @@ Neun Live:12480:v:0:27500:767:768:0:0:897
 DSF:12480:v:0:27500:1023:1024:0:0:900
 HOT:12480:v:0:27500:1279:1280:0:0:40
 Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
-BLOOMBERG TV:11817:v:0:27500:163:92:0:0:8004
-Bloomberg:12168:v:0:27500:167:112:0:0:12721
+Bloomberg TV France:11817:v:0:27500:163:92:0:0:8004
+Bloomberg TV Spain:12168:v:0:27500:167:112:0:0:12721
 Sky News:12552:v:0:22000:305:306:0:0:3995
-KinderNet:12574:h:0:22000:163:92:0:0:5020
+Fox Kids Netherlands:12574:h:0:22000:163:92:0:0:5020
 Alice:12610:v:0:22000:162:96:0:0:12200
 n-tv:12669:v:0:22000:162:96:55:0:12730
 Grand Tourisme:12670:v:0:22000:289:290:0:0:17300
@@ -97,7 +97,7 @@ Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
 Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
 :Beta Digital
 N24:11914:H:0:27500:255:256:8191:3:52
-CNBC:12148:h:0:27500:255:256:0:3:35
+CNBC:11954:h:0:27500:510:520:0:0:28010
 Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
 :PW Erotic
 Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:3:21
@@ -105,9 +105,9 @@ Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
 Blue Movie 2:11758:h:0:27500:2047:2048:0:3:514
 Blue Movie 3:11758:h:0:27500:2303:2304:0:3:515
 :Sportsworld
-Premiere Sport 1:11719:h:0:27500:255:256:0:3:17
-Premiere Sport 2:11719:h:0:27500:3327:3328:0:3:27
-Premiere Sport 3:11758:h:0:27500:2815:2816:0:3:18
+Premiere Sport 1:11720:h:0:27500:255:256,257:0:3:17
+Premiere Sport 2:12070:h:0:27500:3839:3840:0:3:27
+Premiere Sport 3:12070:h:0:27500:255:256:0:3:26
 :Formel 1
 Infokanal:11720:h:0:27500:3071:3072:0:3:244
 Multikanal:11720:h:0:27500:2815:2816:0:3:243
@@ -118,12 +118,12 @@ Boxengasse:11720:h:0:27500:2047:2048:0:3:240
 :Premiere World Bundesliga
 Superdom:11758:h:0:27500:2815:8192:0:3:18
 BuLi-Konferenz:11758:h:0:27500:3327:3328,3329:0:3:215
-BuLi-Spiel 1:11719:h:0:27500:255:256,257:0:3:17
-BuLi-Spiel 2:11719:h:0:27500:2047:2048,2049:0:3:240
-BuLi-Spiel 3:11719:h:0:27500:2303:2304,2305:0:3:241
-BuLi-Spiel 4:11719:h:0:27500:2559:2560,2561:0:3:242
-BuLi-Spiel 5:11719:h:0:27500:2815:2816,2817:0:3:243
-BuLi-Spiel 6:11719:h:0:27500:3071:3072,3073:0:3:244
+BuLi-Spiel 1:11720:h:0:27500:255:256,257:0:3:17
+BuLi-Spiel 2:11720:h:0:27500:2047:2048,2049:0:3:240
+BuLi-Spiel 3:11720:h:0:27500:2303:2304,2305:0:3:241
+BuLi-Spiel 4:11720:h:0:27500:2559:2560,2561:0:3:242
+BuLi-Spiel 5:11720:h:0:27500:2815:2816,2817:0:3:243
+BuLi-Spiel 6:11720:h:0:27500:3071:3072,3073:0:3:244
 BuLi-Spiel 7:11758:h:0:27500:3071:3072,3073:0:3:214
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
@@ -132,12 +132,12 @@ Andalucia TV:11934:v:0:27500:166:104:0:0:29011
 TVC Internacional:11934:v:0:27500:167:108:0:0:0
 Nasza TV:11992:h:0:27500:165:98:0:0:0
 WishLine test:12012:v:0:27500:163:90:0:0:0
-Pro 7 Austria:12051:v:0:27500:161:84:0:0:0
-Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0:0
-Kabel 1 Austria:12051:v:0:27500:166:167:0:0:0
-Pro 7 Schweiz:12051:v:0:27500:289:290:0:0:0
+Pro 7 Austria:12051:v:0:27500:161:84:0:0:20002
+Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0:20003
+Kabel 1 Austria:12051:v:0:27500:166:167:0:0:20004
+Pro 7 Schweiz:12051:v:0:27500:289:290:0:0:20001
 Kiosque:12129:v:0:27500:160:80:0:0:0
-KTO:12129:v:0:27500:170:120:0:0:0
+KTO:11739:v:0:27500:163:90:0:0:8304
 TCM:12168:v:0:27500:160:80:0:0:0
 Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0:0
 TVBS Europe:12168:v:0:27500:162:88:0:0:0
@@ -147,14 +147,14 @@ TCM Espania:12168:v:0:27500:164:96:0:0:0
 MTV Spain:12168:v:0:27500:167:112:0:0:0
 TCM France:12168:v:0:27500:169:64:0:0:0
 RTL2 CH:12188:h:0:27500:164:112:0:0:0
-La Cinquieme:12207:v:0:27500:160:80:0:0:0
-ARTE:12207:v:0:27500:165:100:0:0:0
+La Cinquieme:12207:v:0:27500:160:80:0:0:8501
+LCP:12207:v:0:27500:165:100:0:0:8506
 Post Filial TV:12226:h:0:27500:255:256:0:0:0
 Canal Canaris:12246:v:0:27500:160:80:0:0:0
 Canal Canaris:12246:v:0:27500:160:81:0:0:0
 Canal Canaris:12246:v:0:27500:160:82:0:0:0
 Canal Canaris:12246:v:0:27500:160:83:0:0:0
-AB Sat Passion promo:12266:h:0:27500:160:80:0:0:0
+AB Moteurs:12266:h:0:27500:160:80:0:0:17000
 AB Channel 1:12266:h:0:27500:161:84:0:0:0
 Taquilla 0:12285:v:0:27500:165:100:0:0:0
 CSAT:12324:v:0:27500:160:80:0:0:0
@@ -174,7 +174,7 @@ Fashion TV:12402:v:0:27500:163:92:0:0:0
 VideoService:12422:h:0:27500:255:256:0:0:0
 Beta Research promo:12422:h:0:27500:1023:1024:0:0:0
 Canal Canarias:12441:v:0:27500:160:80:0:0:0
-TVC International:12441:v:0:27500:512:660:0:0:0
+TVC International:12441:v:0:27500:512:660:0:0:29701
 Fitur:12441:v:0:27500:514:662:0:0:0
 Astra Info 1:12552:v:0:22000:164:112:0:0:0
 Astra Info 2:12552:v:0:22000:165:120:0:0:0
@@ -185,17 +185,18 @@ Astra Vision 1:12552:v:0:22000:168:147:0:0:0
 Astra Vision 1:12552:v:0:22000:168:148:0:0:0
 Astra Vision 1:12552:v:0:22000:168:149:0:0:0
 Astra Vision 1:12552:v:0:22000:168:150:0:0:0
-RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0:0
+RTL Tele Letzebuerg:12552:v:0:22000:168:144,146:0:0:3994
 Astra Mosaic:12552:v:0:22000:175:176:0:0:0
 MHP test:12604:h:0:22000:5632:0:0:0:0
 VERONICA:12574:h:0:22000:161:84:0:0:5010
 VH1 Classic:12699:v:0:22000:3071:3072:0:0:28647
-VH-1 Germany:12699:v:0:22000:3081:3082:0:0:28648
+MTV 2 Pop:12699:v:0:22000:3081:3082:0:0:28648
 Via 1 - Sch�ner Reisen:12148:h:0:27500:511:512:0:0:44
 Video Italia:12610:v:0:22000:121:122:0:0:12220
 AC 3 promo:12670:v:0:22000:308:256:0:0:0
 ORF/ZDF:12699:h:0:22000:506:507:0:0:13012
 VIVA:12670:v:0:22000:309:310:0:0:12732
 VIVA2:12552:v:0:22000:171:172:0:0:12120
-MTV Central Europe:12699:v:0:22000:3031:3032:0:0:28643
+MTV German:12699:v:0:22000:3031:3032:0:0:28643
 IFA-TV:10832:h:0:22000:132:133:32:0:7251
+QVC Germany:12552:v:0:22000:165:166:0:0:12100
diff --git a/channels.conf.terr b/channels.conf.terr
new file mode 100644
index 000000000..bed1be8c4
--- /dev/null
+++ b/channels.conf.terr
@@ -0,0 +1,11 @@
+: UK channels
+BBC ONE:505833:0:0:0:600:601:0:0:4164
+BBC TWO:505833:0:0:0:610:611:0:0:4228
+ITV 1:481833:0:0:0:512:650:0:0:8261
+Channel 4:481833:0:0:0:2827:2828:0:0:8384
+Channel 5:561833:0:0:0:6017:6018:0:0:12866
+ITV 2:481833:0:0:0:2818:2819:0:0:8325
+BBC CHOICE:505833:0:0:0:620:621:0:0:4351
+BBC NEWS 24:505833:0:0:0:640:641:0:0:4415
+BBC Knowledge:505833:0:0:0:630:631:0:0:4607
+Shop!:561833:0:0:0:6049:6050:0:0:13120
diff --git a/config.h b/config.h
index 574496931..018d00ef2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.85 2001/10/27 09:56:04 kls Exp $
+ * $Id: config.h 1.86 2001/11/25 15:57:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.98"
+#define VDRVERSION "0.99"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbapi.c b/dvbapi.c
index f72782b4b..707db0d92 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.137 2001/11/04 12:05:36 kls Exp $
+ * $Id: dvbapi.c 1.141 2001/11/25 16:38:09 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -710,6 +710,7 @@ class cPlayBuffer : public cRingBufferFrame {
   int readIndex, writeIndex;
   bool canDoTrickMode;
   bool canToggleAudioTrack;
+  bool skipAC3bytes;
   uchar audioTrack;
   void TrickSpeed(int Increment);
   virtual void Empty(bool Block = false);
@@ -752,6 +753,7 @@ cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
   readIndex = writeIndex = -1;
   canDoTrickMode = false;
   canToggleAudioTrack = false;
+  skipAC3bytes = false;
   audioTrack = 0xC0;
   if (cDvbApi::AudioCommand()) {
      if (!dolbyDev.Open(cDvbApi::AudioCommand(), "w"))
@@ -769,7 +771,7 @@ void cPlayBuffer::PlayExternalDolby(const uchar *b, int MaxLength)
      if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01) {
         if (b[3] == 0xBD) { // dolby
            int l = b[4] * 256 + b[5] + 6;
-           int written = b[8] + 9; // skips the PES header
+           int written = b[8] + (skipAC3bytes ? 13 : 9); // skips the PES header
            int n = min(l - written, MaxLength);
            while (n > 0) {
                  int w = fwrite(&b[written], 1, n, dolbyDev);
@@ -1348,9 +1350,6 @@ bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
 #define cOUTPACK         5
 #define cOUTFRAMES       6
 
-#define aAC3          0x80
-#define aLPCM         0xA0
-
 // --- cAC3toPCM -------------------------------------------------------------
 
 class cAC3toPCM {
@@ -1406,22 +1405,16 @@ cFrame *cAC3toPCM::Get(int size, uchar PTSflags, uchar *PTSdata)
      int p_size = (size > MAXSIZE) ? MAXSIZE : size;
      int length = 10;      // default header bytes
      int header = 0;
-     int stuffb = 0;
 
      switch (PTSflags) {
        case 2:  header = 5;    // additional header bytes
-                stuffb = 1;
                 break;
        case 3:  header = 10;
                 break;
        default: header = 0;
        }
 
-     //      header = 0; //XXX ???
-     stuffb = 0; //XXX ???
-
      length += header;
-     length += stuffb;
 
      buffer[0] = 0x00;
      buffer[1] = 0x00;
@@ -1430,19 +1423,13 @@ cFrame *cAC3toPCM::Get(int size, uchar PTSflags, uchar *PTSdata)
 
      buffer[6] = 0x80;
      buffer[7] = PTSflags << 6;
-     buffer[8] = header + stuffb;
+     buffer[8] = header;
 
      if (header)
         memcpy(&buffer[9], (void *)PTSdata, header);
 
-     // add stuffing
-     data = buffer + 9 + header;
-     for (int cnt = 0; cnt < stuffb; cnt++)
-         data[cnt] = 0xff;
-     length += stuffb;
-
      // add data
-     data = buffer + 9 + header + stuffb + 7;
+     data = buffer + 9 + header + 7;
      int cnt = 0;
      while (p_size) {
            if (ac3outp != ac3inp) { // data in the buffer
@@ -1456,7 +1443,7 @@ cFrame *cAC3toPCM::Get(int size, uchar PTSflags, uchar *PTSdata)
               break;
            }
 
-     data = buffer + 9 + header + stuffb;
+     data = buffer + 9 + header;
      data[0] = aLPCM; // substream ID
      data[1] = 0x00;  // other stuff (see DVB specs), ignored by driver
      data[2] = 0x00;
@@ -1560,6 +1547,7 @@ cDVDplayBuffer::cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD
   canToggleAudioTrack = true;//XXX determine from cDVD!
   data = new uchar[1024 * DVD_VIDEO_LB_LEN];
   canDoTrickMode = true;
+  skipAC3bytes = true;
   dvbApi->SetModeReplay();
   Start();
 }
@@ -1574,28 +1562,12 @@ cDVDplayBuffer::~cDVDplayBuffer()
 
 unsigned int cDVDplayBuffer::getAudioStream(unsigned int StreamId)
 {
-  unsigned int trackID;
-
-  if ((cyclestate < cOPENCHAPTER) || (StreamId > 7))
+  if (cyclestate < cOPENCHAPTER || StreamId > 7)
      return 0;
   if (!(cur_pgc->audio_control[StreamId] & 0x8000))
      return 0;
   int track = (cur_pgc->audio_control[StreamId] >> 8) & 0x07;
-  switch (vts_file->vtsi_mat->vts_audio_attr[track].audio_format) {
-    case 0: // ac3
-            trackID = aAC3;
-            break;
-    case 2: // mpeg1
-    case 3: // mpeg2ext
-    case 4: // lpcm
-    case 6: // dts
-            trackID = aLPCM;
-            break;
-    default: esyslog(LOG_ERR, "ERROR: unknown Audio stream info");
-             return 0;
-    }
-  trackID |= track;
-  return trackID;
+  return dvd->getAudioTrack(track) | track;
 }
 
 void cDVDplayBuffer::ToggleAudioTrack(void)
@@ -2033,8 +2005,10 @@ void cDVDplayBuffer::handleAC3(unsigned char *sector, int length, uchar PTSflags
 #define PCM_FRAME_SIZE 1536
   AC3toPCM.Put(sector, length);
   cFrame *frame;
-  if ((frame = AC3toPCM.Get(PCM_FRAME_SIZE, PTSflags, PTSdata)) != NULL)
-     putFrame(frame);
+  if (ac3_buffersize() <= 100) {
+     if ((frame = AC3toPCM.Get(PCM_FRAME_SIZE, PTSflags, PTSdata)) != NULL)
+        putFrame(frame);
+     }
   while ((frame = AC3toPCM.Get(PCM_FRAME_SIZE)) != NULL)
         putFrame(frame);
 }
@@ -3087,7 +3061,7 @@ bool cDvbApi::SetPids(bool ForRecording)
          SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP);
 }
 
-eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
+eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
 {
   // Make sure the siProcessor won't access the device while switching
   cThreadLock ThreadLock(siProcessor);
@@ -3129,14 +3103,14 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
      SetDpid2(0x1FFF, DMX_OUT_DECODER);
      SetTpid( 0x1FFF, DMX_OUT_DECODER);
 
-     bool ChannelSynced = false;
+     FrontendParameters Frontend;
 
      switch (frontendType) {
        case FE_QPSK: { // DVB-S
 
             // Frequency offsets:
 
-            unsigned int freq = FrequencyMHz;
+            unsigned int freq = Frequency;
             int tone = SEC_TONE_OFF;
 
             if (freq < (unsigned int)Setup.LnbSLOF) {
@@ -3148,7 +3122,6 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
                tone = SEC_TONE_ON;
                }
 
-            FrontendParameters Frontend;
             Frontend.Frequency = freq * 1000UL;
             Frontend.Inversion = INVERSION_AUTO;
             Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
@@ -3173,58 +3146,32 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
             scmds.commands = &scmd;
 
             CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
-
-            // Tuning:
-
-            CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
-
-            // Wait for channel sync:
-
-            if (cFile::FileReady(fd_frontend, 5000)) {
-               FrontendEvent event;
-               int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-               if (res >= 0)
-                  ChannelSynced = event.type == FE_COMPLETION_EV;
-               else
-                  esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
-               }
-            else
-               esyslog(LOG_ERR, "ERROR: timeout while tuning");
             }
             break;
        case FE_QAM: { // DVB-C
 
             // Frequency and symbol rate:
 
-            FrontendParameters Frontend;
-            Frontend.Frequency = FrequencyMHz * 1000000UL;
+            Frontend.Frequency = Frequency * 1000000UL;
             Frontend.Inversion = INVERSION_AUTO;
             Frontend.u.qam.SymbolRate = Srate * 1000UL;
             Frontend.u.qam.FEC_inner = FEC_AUTO;
             Frontend.u.qam.QAM = QAM_64;
-
-            // Tuning:
-
-            CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
-
-            // Wait for channel sync:
-
-            if (cFile::FileReady(fd_frontend, 5000)) {
-               FrontendEvent event;
-               int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-               if (res >= 0)
-                  ChannelSynced = event.type == FE_COMPLETION_EV;
-               else
-                  esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
-               }
-            else
-               esyslog(LOG_ERR, "ERROR: timeout while tuning");
             }
             break;
        case FE_OFDM: { // DVB-T
-            //XXX TODO: implement DVB-T tuning (anybody with a DVB-T card out there?)
-            esyslog(LOG_ERR, "ERROR: DVB-T tuning support not yet implemented");
-            return scrFailed;
+
+            // Frequency and OFDM paramaters:
+
+            Frontend.Frequency = Frequency * 1000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
+            Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
+            Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
+            Frontend.u.ofdm.Constellation=QAM_64;
+            Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
+            Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
+            Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
             }
             break;
        default:
@@ -3232,12 +3179,28 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
             return scrFailed;
        }
 
-     if (!ChannelSynced) {
-        esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
-        if (this == PrimaryDvbApi)
-           cThread::RaisePanic();
-        return scrFailed;
+     // Tuning:
+
+     CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
+
+     // Wait for channel sync:
+
+     if (cFile::FileReady(fd_frontend, 5000)) {
+        FrontendEvent event;
+        int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
+        if (res >= 0) {
+           if (event.type != FE_COMPLETION_EV) {
+              esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
+              if (this == PrimaryDvbApi)
+                 cThread::RaisePanic();
+              return scrFailed;
+              }
+           }
+        else
+           esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
         }
+     else
+        esyslog(LOG_ERR, "ERROR: timeout while tuning");
 
      // PID settings:
 
@@ -3261,7 +3224,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char
   if (NeedsTransferMode) {
      cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
      if (CaDvbApi && !CaDvbApi->Recording()) {
-        if ((Result = CaDvbApi->SetChannel(ChannelNumber, FrequencyMHz, Polarization, Diseqc, Srate, Vpid, Apid1, Apid2, Dpid1, Dpid2, Tpid, Ca, Pnr)) == scrOk) {
+        if ((Result = CaDvbApi->SetChannel(ChannelNumber, Frequency, Polarization, Diseqc, Srate, Vpid, Apid1, Apid2, Dpid1, Dpid2, Tpid, Ca, Pnr)) == scrOk) {
            SetModeReplay();
            transferringFromDvbApi = CaDvbApi->StartTransfer(fd_video);
            }
diff --git a/dvbapi.h b/dvbapi.h
index 01bb2dd92..aa4a5feb2 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.58 2001/11/04 11:39:42 kls Exp $
+ * $Id: dvbapi.h 1.59 2001/11/24 11:03:16 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -187,7 +187,7 @@ class cDvbApi {
 private:
   int currentChannel;
 public:
-  eSetChannelResult SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr);
+  eSetChannelResult SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr);
   static int CurrentChannel(void) { return PrimaryDvbApi ? PrimaryDvbApi->currentChannel : 0; }
   int Channel(void) { return currentChannel; }
 
diff --git a/dvd.c b/dvd.c
index 841e998b0..e061b1414 100644
--- a/dvd.c
+++ b/dvd.c
@@ -6,7 +6,7 @@
  *
  * Initially written by Andreas Schultz <aschultz@warp10.net>
  *
- * $Id: dvd.c 1.3 2001/08/06 16:07:44 kls Exp $
+ * $Id: dvd.c 1.4 2001/11/10 13:38:50 kls Exp $
  */
 
 #ifdef DVDSUPPORT
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include "dvd.h"
+#include "tools.h"
 
 // --- cDVD ----------------------------------------------------------------------------
 
@@ -145,4 +146,24 @@ dvd_file_t *cDVD::openTitle(int Title, dvd_read_domain_t domain)
   return title;
 }
 
+int cDVD::getAudioTrack(int stream)
+{
+  if (getVTS()) {
+     switch (getVTS()->vtsi_mat->vts_audio_attr[stream].audio_format) {
+       case 0: // ac3
+               return aAC3;
+       case 2: // mpeg1
+       case 3: // mpeg2ext
+               return aMPEG;
+       case 4: // lpcm
+               return aLPCM;
+       case 6: // dts
+               return aDTS;
+       default:
+               esyslog(LOG_ERR, "ERROR: unknown Audio stream info");
+       }
+     }
+  return 0;
+}
+
 #endif //DVDSUPPORT
diff --git a/dvd.h b/dvd.h
index 68fc1d38f..5ac145489 100644
--- a/dvd.h
+++ b/dvd.h
@@ -6,7 +6,7 @@
  *
  * Initially written by Andreas Schultz <aschultz@warp10.net>
  *
- * $Id: dvd.h 1.3 2001/08/05 16:00:57 kls Exp $
+ * $Id: dvd.h 1.4 2001/11/10 13:38:25 kls Exp $
  */
 
 #ifndef __DVD_H
@@ -21,6 +21,11 @@
 #include <dvdread/nav_read.h>
 #include <dvdread/nav_print.h>
 
+#define aAC3   0x80
+#define aDTS   0x88
+#define aLPCM  0xA0
+#define aMPEG  0xC0
+
 class cDVD {
 private:
   static cDVD *dvdInstance;
@@ -44,8 +49,12 @@ class cDVD {
   bool isValid(void) { return (dvd != NULL); }
   ifo_handle_t *openVMG(void);
   ifo_handle_t *openVTS(int TitleSet);
+  ifo_handle_t *getVTS() { return vts_file; }
   dvd_file_t *openTitle(int Title, dvd_read_domain_t domain);
   static cDVD *getDVD(void);
+  int getAudioNrOfTracks() { return getVTS() ? getVTS()->vtsi_mat->nr_of_vts_audio_streams : 0; }
+  int getAudioLanguage(int stream) { return getVTS() ? getVTS()->vtsi_mat->vts_audio_attr[stream].lang_code : 0; }
+  int getAudioTrack(int stream);
   };
 
 #endif //DVDSUPPORT
diff --git a/menu.c b/menu.c
index 154f66cfa..45899b1ac 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.139 2001/11/04 10:37:18 kls Exp $
+ * $Id: menu.c 1.141 2001/11/24 13:20:37 kls Exp $
  */
 
 #include "menu.h"
@@ -546,16 +546,16 @@ cMenuEditChannel::cMenuEditChannel(int Index)
   if (channel) {
      data = *channel;
      Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), FileNameChars));
-     Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency, 10000, 13000)); //TODO exact limits???
+     Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
      Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
      Add(new cMenuEditIntItem( tr("DiSEqC"),       &data.diseqc, 0, 10)); //TODO exact limits???
-     Add(new cMenuEditIntItem( tr("Srate"),        &data.srate, 22000, 30000)); //TODO exact limits - toggle???
-     Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid, 0, 0xFFFE));
-     Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0xFFFE));
-     Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0xFFFE));
-     Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0xFFFE));
-     Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0xFFFE));
-     Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid, 0, 0xFFFE));
+     Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
+     Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
+     Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0x1FFF));
+     Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0x1FFF));
+     Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
+     Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0x1FFF));
+     Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
      Add(new cMenuEditIntItem( tr("CA"),           &data.ca, 0, cDvbApi::NumDvbApis));
      Add(new cMenuEditIntItem( tr("Pnr"),          &data.pnr, 0));
      }

From 27919ee969866b68fc95b327a047a9989e4b4153 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Jan 2002 18:00:00 +0100
Subject: [PATCH 030/307] Version 0.99pre2 - Fixed setting the OSD size in the
 'Confirm' interface call (thanks to   Deti Fliegl). - Removed the 'read
 incomplete section...' error message in the EIT processor. - Fixed channel
 data for "DW TV" (thanks to Axel Gruber). - Added DPID to "PREMIERE MOVIE 1"
 in channels.conf.cable (thanks to Stephan   Schreiber). - Prepared the OSD
 functions for multiple overlapping windows. - Removed the check to see
 whether the system time is running linearly. - Improved performance of SVDRP
 command entry. - Removed EPGBugfixLevel '3' - after more than a year Pro-7
 finally managed to   broadcast the correct timestamps for EPG events between
 0:00 and 6:00! - Fixed failing watchdog timer if program hangs in OSD
 activities (thanks to   Carsten Koch). - No longer requiring 'libncurses' if
 compiling without DEBUG_OSD=1 and   REMOTE=KBD (thanks to Lauri Pesonen). -
 The "Recordings" menu now displays a hierarchical structure if there are  
 subdirectories for the recordings. This can be controlled through the  
 "RecordingDirs" parameter in the "Setup" menu.   See "MANUAL/Replaying a
 Recording" for details. - Improved speed of setting the Help button texts. -
 Fixed handling file names that contain single quotes (') or dollar signs ($) 
  in the call to the shutdown command (option '-s') and the recording command 
  (option '-r'). - Improved error handling in the editing process; the
 resulting file will be   deleted if an error occured. - A message is now
 prompted at the end of the editing process, indicating   whether the process
 succeeded or failed. - Fixed setting the LastActivity timestamp after a
 shutdown prompt (thanks to   Sergei Haller). - A message is now prompted if
 free disk space becomes low during recording. - The editing process now calls
 AssertFreeDiskSpace() to remove deleted   recordings if the disk becomes
 full. - The "Main" menu now displays in its title the used disk space (in
 percent)   and the estimated free disk space (in hh:mm), assuming a data rate
 of 30 MB   per minute. - Activating the "Recordings" menu now displays
 "scanning recordings..." to   give the user some feedback in case this takes
 longer. - Status messages are now displayed centered. - Removed the 'Tools'
 subdirectory from the VDR archive. All contributed tools   can now be found
 at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.

---
 CONTRIBUTORS                                  |   12 +
 HISTORY                                       |   45 +-
 INSTALL                                       |    2 +-
 MANUAL                                        |   17 +-
 Makefile                                      |    9 +-
 Tools/dvbrc2vdr/Makefile                      |   16 -
 Tools/dvbrc2vdr/channels.conf                 |  282 ----
 Tools/dvbrc2vdr/dvbrc.hotbird                 |   63 -
 Tools/dvbrc2vdr/dvbrc2vdr.c                   |  183 ---
 Tools/dvbrc2vdr/hotbird2                      |  878 ----------
 Tools/dvbrc2vdr/test.conf                     |  799 ----------
 Tools/epg2timers/README                       |  151 --
 Tools/epg2timers/epg2timers.cxx               |  656 --------
 Tools/epg2timers/epg_channel_names            |  400 -----
 Tools/epg2timers/get_merkliste.pl             |   82 -
 Tools/epg2timers/loadvdr.pl                   |   89 --
 Tools/epg2timers/update_timers                |   22 -
 Tools/epg2timers/update_timers.old            |   24 -
 Tools/master-timer/LIESMICH                   |   70 -
 Tools/master-timer/README                     |   58 -
 Tools/master-timer/THANKS                     |   18 -
 Tools/master-timer/Todo                       |    6 -
 Tools/master-timer/convert-DTV2VDR.pl         |  151 --
 Tools/master-timer/convert-oldtorecord.pl     |   61 -
 Tools/master-timer/master-timer.pl            | 1412 -----------------
 Tools/master-timer/process_summary.pl         |   79 -
 Tools/master-timer/sample/channels-to-scan    |    6 -
 Tools/master-timer/sample/config              |   32 -
 .../master-timer/sample/convert-channel-list  |   26 -
 Tools/master-timer/sample/deepblack           |  172 --
 Tools/master-timer/sample/done                |    1 -
 Tools/master-timer/sample/subtitle-movie      |   52 -
 Tools/master-timer/sample/torecord            |   90 --
 Tools/master-timer/scan-channels              |    8 -
 Tools/schnitt/README                          |  111 --
 Tools/schnitt/cut.pl                          |   35 -
 Tools/schnitt/cut2                            |    2 -
 Tools/schnitt/cut2.pl                         |   39 -
 Tools/schnitt/cut3.pl                         |   40 -
 Tools/schnitt/cutall                          |    2 -
 Tools/schnitt/cutall2                         |    5 -
 Tools/schnitt/cutall3.pl                      |   31 -
 Tools/schnitt/cutt                            |  106 --
 Tools/schnitt/dump.c                          |   65 -
 Tools/schnitt/getpreviframe.pl                |   25 -
 Tools/schnitt/index.php                       |  215 ---
 Tools/schnitt/lmplex                          |   51 -
 Tools/schnitt/mv2                             |   30 -
 Tools/schnitt/play                            |   10 -
 Tools/schnitt/schnitt.pl                      |   27 -
 Tools/schnitt/schnitt2.pl                     |   93 --
 Tools/schnitt/schnitt3.pl                     |   64 -
 Tools/schnitt/schnitt3.pl.new                 |   77 -
 Tools/schnitt/schnitt4.pl                     |   13 -
 Tools/schnitt/schnitt5.pl                     |   16 -
 Tools/schnitt/schnitt6.pl                     |   30 -
 Tools/schnitt/schnittcommon.pli               |   64 -
 Tools/schnitt/show                            |   11 -
 Tools/schnitt/unsort                          |   25 -
 Tools/schnitt/vdr-remote.pl                   |   40 -
 Tools/schnitt/vdr2                            |    2 -
 Tools/schnitt/vmount                          |   18 -
 Tools/statdvb2vdr/ch.pl                       |  250 ---
 Tools/xtvrc2vdr/Makefile                      |   16 -
 Tools/xtvrc2vdr/hotbird.conf                  |  191 ---
 Tools/xtvrc2vdr/xtvrc.hotbird                 | 1337 ----------------
 Tools/xtvrc2vdr/xtvrc2vdr.c                   |  146 --
 channels.conf                                 |    4 +-
 channels.conf.cable                           |    2 +-
 config.c                                      |    5 +-
 config.h                                      |    5 +-
 dvbapi.c                                      |   87 +-
 dvbapi.h                                      |    6 +-
 dvbosd.c                                      |  185 ++-
 dvbosd.h                                      |   71 +-
 eit.c                                         |   20 +-
 eit.h                                         |    4 +-
 i18n.c                                        |   70 +-
 interface.c                                   |   26 +-
 menu.c                                        |  208 ++-
 menu.h                                        |   15 +-
 osd.c                                         |   15 +-
 osd.h                                         |    3 +-
 recording.c                                   |  105 +-
 recording.h                                   |   13 +-
 svdrp.c                                       |   80 +-
 tools.c                                       |   48 +-
 tools.h                                       |   10 +-
 vdr.c                                         |   22 +-
 videodir.c                                    |   30 +-
 videodir.h                                    |    7 +-
 91 files changed, 875 insertions(+), 9325 deletions(-)
 delete mode 100644 Tools/dvbrc2vdr/Makefile
 delete mode 100644 Tools/dvbrc2vdr/channels.conf
 delete mode 100644 Tools/dvbrc2vdr/dvbrc.hotbird
 delete mode 100644 Tools/dvbrc2vdr/dvbrc2vdr.c
 delete mode 100644 Tools/dvbrc2vdr/hotbird2
 delete mode 100644 Tools/dvbrc2vdr/test.conf
 delete mode 100644 Tools/epg2timers/README
 delete mode 100644 Tools/epg2timers/epg2timers.cxx
 delete mode 100644 Tools/epg2timers/epg_channel_names
 delete mode 100755 Tools/epg2timers/get_merkliste.pl
 delete mode 100755 Tools/epg2timers/loadvdr.pl
 delete mode 100755 Tools/epg2timers/update_timers
 delete mode 100755 Tools/epg2timers/update_timers.old
 delete mode 100644 Tools/master-timer/LIESMICH
 delete mode 100644 Tools/master-timer/README
 delete mode 100644 Tools/master-timer/THANKS
 delete mode 100644 Tools/master-timer/Todo
 delete mode 100755 Tools/master-timer/convert-DTV2VDR.pl
 delete mode 100755 Tools/master-timer/convert-oldtorecord.pl
 delete mode 100755 Tools/master-timer/master-timer.pl
 delete mode 100755 Tools/master-timer/process_summary.pl
 delete mode 100644 Tools/master-timer/sample/channels-to-scan
 delete mode 100644 Tools/master-timer/sample/config
 delete mode 100644 Tools/master-timer/sample/convert-channel-list
 delete mode 100644 Tools/master-timer/sample/deepblack
 delete mode 100644 Tools/master-timer/sample/done
 delete mode 100644 Tools/master-timer/sample/subtitle-movie
 delete mode 100644 Tools/master-timer/sample/torecord
 delete mode 100755 Tools/master-timer/scan-channels
 delete mode 100644 Tools/schnitt/README
 delete mode 100755 Tools/schnitt/cut.pl
 delete mode 100755 Tools/schnitt/cut2
 delete mode 100755 Tools/schnitt/cut2.pl
 delete mode 100755 Tools/schnitt/cut3.pl
 delete mode 100755 Tools/schnitt/cutall
 delete mode 100755 Tools/schnitt/cutall2
 delete mode 100755 Tools/schnitt/cutall3.pl
 delete mode 100755 Tools/schnitt/cutt
 delete mode 100644 Tools/schnitt/dump.c
 delete mode 100755 Tools/schnitt/getpreviframe.pl
 delete mode 100644 Tools/schnitt/index.php
 delete mode 100755 Tools/schnitt/lmplex
 delete mode 100755 Tools/schnitt/mv2
 delete mode 100755 Tools/schnitt/play
 delete mode 100755 Tools/schnitt/schnitt.pl
 delete mode 100755 Tools/schnitt/schnitt2.pl
 delete mode 100755 Tools/schnitt/schnitt3.pl
 delete mode 100755 Tools/schnitt/schnitt3.pl.new
 delete mode 100755 Tools/schnitt/schnitt4.pl
 delete mode 100755 Tools/schnitt/schnitt5.pl
 delete mode 100755 Tools/schnitt/schnitt6.pl
 delete mode 100755 Tools/schnitt/schnittcommon.pli
 delete mode 100755 Tools/schnitt/show
 delete mode 100755 Tools/schnitt/unsort
 delete mode 100755 Tools/schnitt/vdr-remote.pl
 delete mode 100755 Tools/schnitt/vdr2
 delete mode 100755 Tools/schnitt/vmount
 delete mode 100644 Tools/statdvb2vdr/ch.pl
 delete mode 100644 Tools/xtvrc2vdr/Makefile
 delete mode 100644 Tools/xtvrc2vdr/hotbird.conf
 delete mode 100644 Tools/xtvrc2vdr/xtvrc.hotbird
 delete mode 100644 Tools/xtvrc2vdr/xtvrc2vdr.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 12154c812..073e92719 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -8,6 +8,7 @@ Carsten Koch <Carsten.Koch@icem.de>
  for his idea of using multiple disks (and for testing this feature)
  for implementing the 'new recording' indicator
  for suggesting that the "Back" button in replay mode should bring up the "Recordings" menu
+ for fixing the watchdog timer if the program hangs in OSD activities
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -55,6 +56,7 @@ Alberto Carraro <bertocar@tin.it>
 
 Deti Fliegl <deti@fliegl.de>
  for implementing the 'CurrentChannel' setup parameter
+ for fixing setting the OSD size in the 'Confirm' interface call
 
 Dave Chapman <dave@dchapman.com>
  for implementing support for the teletext PID
@@ -166,3 +168,13 @@ Norbert Schmidt <nschmidt-nrw@t-online.de>
 
 Thilo Wunderlich <tw@ubcom.net>
  for his help in keeping 'channels.conf' up to date
+
+Stephan Schreiber <stephan@sschreiber.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
+
+Lauri Pesonen <lauri.pesonen@firsthop.com>
+ for avoiding linking in 'libncurses' if compiling without DEBUG_OSD=1 and
+ REMOTE=KBD
+
+Sergei Haller <Sergei.Haller@math.uni-giessen.de>
+ for fixing the LastActivity timestamp after a shutdown prompt
diff --git a/HISTORY b/HISTORY
index 3f00cb1a9..7a57c9848 100644
--- a/HISTORY
+++ b/HISTORY
@@ -866,7 +866,7 @@ Video Disk Recorder Revision History
 - The device /dev/video is now opened only if necessary (to GRAB an image),
   allowing other programs (like 'kvdr', for instance) to use that device.
 
-2001-11-25: Version 0.99
+2001-11-25: Version 0.99pre1
 
 - Fixed several channel definitions in 'channels.conf' (thanks to Thilo
   Wunderlich).
@@ -878,3 +878,46 @@ Video Disk Recorder Revision History
 - Changed the maximum value for PIDs in channels.conf from 0xFFFE to 0x1FFF.
 - Fixed DVD audio sync problems (thanks to Andreas Schultz).
 - Fixed external AC3 replay for DVDs (thanks to Andreas Schultz).
+
+2002-01-27: Version 0.99pre2
+
+- Fixed setting the OSD size in the 'Confirm' interface call (thanks to
+  Deti Fliegl).
+- Removed the 'read incomplete section...' error message in the EIT processor.
+- Fixed channel data for "DW TV" (thanks to Axel Gruber).
+- Added DPID to "PREMIERE MOVIE 1" in channels.conf.cable (thanks to Stephan
+  Schreiber).
+- Prepared the OSD functions for multiple overlapping windows.
+- Removed the check to see whether the system time is running linearly.
+- Improved performance of SVDRP command entry.
+- Removed EPGBugfixLevel '3' - after more than a year Pro-7 finally managed to
+  broadcast the correct timestamps for EPG events between 0:00 and 6:00!
+- Fixed failing watchdog timer if program hangs in OSD activities (thanks to
+  Carsten Koch).
+- No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and
+  REMOTE=KBD (thanks to Lauri Pesonen).
+- The "Recordings" menu now displays a hierarchical structure if there are
+  subdirectories for the recordings. This can be controlled through the
+  "RecordingDirs" parameter in the "Setup" menu.
+  See "MANUAL/Replaying a Recording" for details.
+- Improved speed of setting the Help button texts.
+- Fixed handling file names that contain single quotes (') or dollar signs ($)
+  in the call to the shutdown command (option '-s') and the recording command
+  (option '-r').
+- Improved error handling in the editing process; the resulting file will be
+  deleted if an error occured.
+- A message is now prompted at the end of the editing process, indicating
+  whether the process succeeded or failed.
+- Fixed setting the LastActivity timestamp after a shutdown prompt (thanks to
+  Sergei Haller).
+- A message is now prompted if free disk space becomes low during recording.
+- The editing process now calls AssertFreeDiskSpace() to remove deleted
+  recordings if the disk becomes full.
+- The "Main" menu now displays in its title the used disk space (in percent)
+  and the estimated free disk space (in hh:mm), assuming a data rate of 30 MB
+  per minute.
+- Activating the "Recordings" menu now displays "scanning recordings..." to
+  give the user some feedback in case this takes longer.
+- Status messages are now displayed centered.
+- Removed the 'Tools' subdirectory from the VDR archive. All contributed tools
+  can now be found at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.
diff --git a/INSTALL b/INSTALL
index 0ab7edacb..d16509611 100644
--- a/INSTALL
+++ b/INSTALL
@@ -349,7 +349,7 @@ the "Frequency" is in kHz in case of DVB-T).
 
 You can even use a mixture of DVB-S, DVB-C and DVB-T cards in the same system.
 All you need to do is to put all the channel definitions into one big
-'channel.conf' file and set the 'Ca' parameter of each channel to the number
+'channels.conf' file and set the 'Ca' parameter of each channel to the number
 of the card that can receive it.
 
 Learning the remote control keys:
diff --git a/MANUAL b/MANUAL
index a9e42a1bf..99d91be94 100644
--- a/MANUAL
+++ b/MANUAL
@@ -159,6 +159,13 @@ Video Disk Recorder User's Manual
   All recordings are listed in the "Recordings" menu. Browse through the
   list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
   to start playback. New recordings are marked with an '*'.
+  If the Setup parameter RecordingDirs has been set and there are recordings
+  from periodic timers organized in a subdirectory structure, only the
+  directory is displayed and it can be opened by pressing "Ok" (or the "Red"
+  button). A directory entry displays the total number of recordings within
+  that directory (and any possible subdirectory thereof) as well as the total
+  number of new recordings (as opposed to a recording's entry, which displays
+  the date and time of the recording).
   Playback can be stopped via the "Main" menu by selecting "Stop replaying",
   or by pressing the "Blue" button outside the menu.
   A previously stopped playback session can be resumed by pressing the "Blue"
@@ -402,12 +409,7 @@ Video Disk Recorder User's Manual
                              Extended Description)
                          2 = removal of excess whitespace and hyphens, mapping of
                              wrongly used characters
-                         3 = fixing the date in timestamps between 00:00 and 06:00
-                             (use with care - hopefully one day Pro7 and Kabel1
-                             will learn how to read the clock/calender)
-                         Default is '2', which will do all textual fixes, but
-                         leaves out the timestamp fixes, since these might cause
-                         recordings to fail. Use '3' at your own risk.
+                         Default is '2'.
                          Note that after changing the setting of this parameter
                          any EPG data that has already been received will remain
                          in its existing format - only newly received data will
@@ -444,6 +446,9 @@ Video Disk Recorder User's Manual
                          0 = don't use the 'Subtitle'
                          1 = use it (and create subdirectories)
 
+  RecordingDirs = 1      Turns displaying the Recordings menu as a hierarchical
+                         directory structure on or off.
+
   VideoFormat = 0        The video format (or aspect ratio) of the tv set in use.
                          0 = 4:3
                          1 = 16:9
diff --git a/Makefile b/Makefile
index 4efae4b12..38597e8d6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.28 2001/10/07 15:14:50 kls Exp $
+# $Id: Makefile 1.29 2002/01/13 16:57:27 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -37,12 +37,17 @@ ifndef REMOTE
 REMOTE = KBD
 endif
 
+ifeq ($(REMOTE), KBD)
+NCURSESLIB = -lncurses
+endif
+
 DEFINES += -DREMOTE_$(REMOTE)
 
 DEFINES += -D_GNU_SOURCE
 
 ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
+NCURSESLIB = -lncurses
 endif
 
 ifdef VFAT
@@ -71,7 +76,7 @@ include $(DEPFILE)
 # The main program:
 
 vdr: $(OBJS) $(AC3LIB) $(DTVLIB)
-	g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr
+	g++ -g -O2 $(OBJS) $(NCURSESLIB) -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr
 
 # The font files:
 
diff --git a/Tools/dvbrc2vdr/Makefile b/Tools/dvbrc2vdr/Makefile
deleted file mode 100644
index 196f50bef..000000000
--- a/Tools/dvbrc2vdr/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Makefile for dvbrc2vdr utility
-#
-
-OBJS = dvbrc2vdr.o
-
-%.o: %.c
-	gcc -g -O2 -Wall -c $(DEFINES) $<
-
-all: dvbrc2vdr
-
-dvbrc2vdr: $(OBJS)
-	gcc -g -O2 $(OBJS) -o dvbrc2vdr
-
-clean:
-	-rm -f $(OBJS) dvbrc2vdr
diff --git a/Tools/dvbrc2vdr/channels.conf b/Tools/dvbrc2vdr/channels.conf
deleted file mode 100644
index d26699c1d..000000000
--- a/Tools/dvbrc2vdr/channels.conf
+++ /dev/null
@@ -1,282 +0,0 @@
-RAI Uno:11766:v:1:27500:160:80:0:0
-RAI Due:11766:v:1:27500:161:84:0:0
-RAI Tre:11766:v:1:27500:162:88:0:0
-Rete 4:11919:v:1:27500:514:670:0:0
-Canale 5:11919:v:1:27500:513:660:0:0
-Italia 1 :11919:v:1:27500:512:650:0:0
-Video Italia:12610:v:0:22000:121:122:0:0
-Grand Tour.:12670:v:0:22000:289:290:0:0
-AB Sat Passion promo:12266:h:0:27500:160:80:0:0
-Nuvolari Promo:12149:v:1:27500:176:177:0:0
-DigItaly:12673:v:1:27500:220:221:0:0
-NBC Europe:11054:h:1:27500:550:551:0:0
-Bloomberg TV UK:11642:h:1:27500:1560:1520:0:0
-Game Network:12673:v:1:27500:291:292:0:0
-Bulgaria TV:12540:h:1:27500:4612:4613:0:0
-Video Italia :12673:v:1:27500:340:341:0:0
-Racing Channel Test:11623:v:1:27500:223:243:0:0
-Fashion TV:12402:v:0:27500:163:92:0:0
-Palco Promo:12073:v:1:27500:161:84:0:0
-Coming Soon TV:12111:v:1:27500:310:311:0:0
-Alice:12149:v:1:27500:160:161:0:0
-RAI Mosaico:11766:v:1:27500:518:8191:0:0
-RAI SportSat:11804:v:1:27500:512:650:0:0
-Satisfaction TV:12092:h:1:27500:4192:4193:0:0
-RAI Nettuno Sat 2:11804:v:1:27500:513:651:0:0
-RAI Educational:11804:v:1:27500:514:652:0:0
-TelePace :11804:v:1:27500:515:653:0:0
-RAI News24:11804:v:1:27500:516:654:0:0
-AB Channel 1:12266:h:0:27500:161:84:0:0
-Studio Europa:12673:v:1:27500:230:231:0:0
-AB Passion:12692:h:1:27500:160:80:0:0
-Camera dei Deputati:11804:v:1:27500:517:655:0:0
-SAT 2000:11804:v:1:27500:518:656:0:0
-RAI NettunoSat 1:11804:v:1:27500:519:657:0:0
-Ante Prima:11881:v:1:27500:2435:2436:0:0
-Vetrina D+:12034:v:1:27500:166:105:0:0
-D+ Info:12073:v:1:27500:160:80:0:0
-SNAI:11881:v:1:27500:2561:2562:0:0
-RTL:12188:h:0:27500:163:104:0:0
-Sat.1:12480:v:0:27500:1791:1792:0:0
-Pro-7:12480:v:0:27500:255:256:0:0
-RTL2:12188:h:0:27500:166:128:0:0
-VOX:12188:h:0:27500:167:136:0:0
-ARD:11837:h:0:27500:101:102:0:0
-BR3:11837:h:0:27500:201:202:0:0
-INTV:11843:v:1:27500:2324:2325:0:0
-MC Sat Monte Carlo:12540:h:1:27500:5126:5122:0:0
-Hessen-3:11837:h:0:27500:301:302:0:0
-N3:11837:h:0:27500:401:402:0:0
-SR3:11837:h:0:27500:501:502:0:0
-WDR:11837:h:0:27500:601:602:0:0
-BR-alpha:11837:h:0:27500:701:702:0:0
-SWR BW:11837:h:0:27500:801:802:0:0
-Phoenix:11837:h:0:27500:901:902:0:0
-ZDF:11954:h:0:27500:110:120:0:0
-Test 3sat:11954:h:0:27500:210:220:0:0
-Kinderkanal:11954:h:0:27500:310:320:0:0
-arte:11954:h:0:27500:360:370:0:0
-Eurosport:11954:h:0:27500:410:420:0:0
-ZDF Infobox:11954:h:0:27500:610:620:0:0
-CNN:12168:v:0:27500:165:100:0:0
-Super RTL:12188:h:0:27500:165:120:0:0
-VOX:12188:h:0:27500:167:136:0:0
-ORF Sat:11954:h:0:27500:506:507:0:0
-DW TV:12363:v:0:27500:305:306:0:0
-Kabel 1:12480:v:0:27500:511:512:0:0
-TM3:12480:v:0:27500:767:768:0:0
-DSF:12480:v:0:27500:1023:1024:0:0
-HOT:12480:v:0:27500:1279:1280:0:0
-BloombergTV:12552:v:0:22000:162:99:0:0
-Sky News:12552:v:0:22000:305:306:0:0
-KinderNet:12574:h:0:22000:163:92:0:0
-Alice:12610:v:0:22000:162:96:0:0
-n-tv:12670:v:0:22000:162:96:0:0
-RAI Uno:12363:v:0:27500:289:290:0:0
-TW1:12692:h:0:22000:166:167:0:0
-Eins Extra:12722:h:0:22000:101:102:0:0
-Eins Festival:12722:h:0:22000:201:202:0:0
-Eins MuXx:12722:h:0:22000:301:302:0:0
-MDR:12722:h:0:22000:401:402:0:0
-ORB:12722:h:0:22000:501:502:0:0
-B1:12722:h:0:22000:601:602:0:0
-ARD Online-Kanal:12722:h:0:22000:8191:701:0:0
-Premiere World Promo:11798:h:0:27500:255:256:0:0
-Premiere:11798:h:0:27500:511:512:1:10
-Star Kino:11798:h:0:27500:767:768:1:9
-Cine Action:11798:h:0:27500:1023:1024:1:20
-Cine Comedy:11798:h:0:27500:1279:1280:1:29
-Sci Fantasy:11798:h:0:27500:1535:1536:1:41
-Romantic Movies:11798:h:0:27500:1791:1792:1:11
-Studio Universal:11798:h:0:27500:2047:2048:1:21
-TV Niepokalanow:11876:h:0:27500:305:321:0:0
-Mosaico:11934:v:0:27500:165:100:0:0
-Andalucia TV:11934:v:0:27500:166:104:0:0
-TVC Internacional:11934:v:0:27500:167:108:0:0
-Nasza TV:11992:h:0:27500:165:98:0:0
-WishLine test:12012:v:0:27500:163:92:0:0
-Pro 7 Austria:12051:v:0:27500:161:84:0:0
-Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0
-Kabel 1 Austria:12051:v:0:27500:166:167:0:0
-Pro 7 Schweiz:12051:v:0:27500:289:290:0:0
-Kiosque:12129:v:0:27500:160:80:0:0
-KTO:12129:v:0:27500:170:120:0:0
-TCM:12168:v:0:27500:160:80:0:0
-Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0
-TVBS Europe:12168:v:0:27500:162:88:0:0
-TVBS Europe:12168:v:0:27500:162:89:0:0
-Travel:12168:v:0:27500:163:92:0:0
-TCM Espania:12168:v:0:27500:164:96:0:0
-MTV Spain:12168:v:0:27500:167:112:0:0
-TCM France:12168:v:0:27500:169:64:0:0
-RTL2 CH:12188:h:0:27500:164:112:0:0
-La Cinquieme:12207:v:0:27500:160:80:0:0
-ARTE:12207:v:0:27500:165:100:0:0
-Post Filial TV:12226:h:0:27500:255:256:0:0
-Canal Canaris:12246:v:0:27500:160:80:0:0
-Canal Canaris:12246:v:0:27500:160:81:0:0
-Canal Canaris:12246:v:0:27500:160:82:0:0
-Canal Canaris:12246:v:0:27500:160:83:0:0
-Taquilla 0:12285:v:0:27500:165:100:0:0
-CSAT:12324:v:0:27500:160:80:0:0
-Mosaique:12324:v:0:27500:162:88:0:0
-Mosaique 2:12324:v:0:27500:163:92:0:0
-Mosaique 3:12324:v:0:27500:164:96:0:0
-Le Sesame C+:12324:v:0:27500:165:1965:0:0
-FEED:12344:h:0:27500:163:92:0:0
-RTM 1:12363:v:0:27500:162:96:0:0
-ESC 1:12363:v:0:27500:163:104:0:0
-TV5 Europe:12363:v:0:27500:164:112:0:0
-TV7 Tunisia:12363:v:0:27500:166:128:0:0
-ARTE:12363:v:0:27500:167:137:0:0
-RTP International:12363:v:0:27500:300:301:0:0
-VideoService:12422:h:0:27500:255:256:0:0
-Beta Research promo:12422:h:0:27500:1023:1024:0:0
-Canal Canarias:12441:v:0:27500:160:80:0:0
-TVC International:12441:v:0:27500:512:660:0:0
-Fitur:12441:v:0:27500:514:662:0:0
-Astra Info 1:12552:v:0:22000:164:112:0:0
-Astra Info 2:12552:v:0:22000:165:120:0:0
-Astra Vision 1:12552:v:0:22000:168:144:0:0
-Astra Vision 1:12552:v:0:22000:168:145:0:0
-Astra Vision 1:12552:v:0:22000:168:146:0:0
-Astra Vision 1:12552:v:0:22000:168:147:0:0
-Astra Vision 1:12552:v:0:22000:168:148:0:0
-Astra Vision 1:12552:v:0:22000:168:149:0:0
-Astra Vision 1:12552:v:0:22000:168:150:0:0
-RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0
-Astra Mosaic:12552:v:0:22000:175:176:0:0
-MHP test:12604:h:0:22000:5632:8191:0:0
-Bloomberg TV Spain:12610:v:0:22000:45:49:0:0
-AC 3 promo:12670:v:0:22000:308:256:0:0
-TV Polonia:10719:v:1:27500:163:92:0:0
-Credit Agricole:10834:v:1:27500:5321:5333:0:0
-La Chaine Parlementaire:10873:v:1:27500:1020:1030:0:0
-TMT:10892:v:1:27500:163:92:0:0
-Multivision Accueil:10911:v:1:27500:320:330:0:0
-RTL:11054:h:1:27500:160:80:0:0
-VOX:11054:h:1:27500:500:501:0:0
-Sat 1 A:11054:h:1:27500:511:512:0:0
-RTL II Austria:11054:h:1:27500:520:521:0:0
-ZDF:11054:h:1:27500:570:571:0:0
-K-TV:11054:h:1:27500:580:581:0:0
-Sat 1 Schweiz:11604:v:1:27500:101:102:0:0
-MKTV:11623:v:1:27500:222:242:0:0
-Olisat TV Promo:11623:v:1:27500:226:246:0:0
-Bloomberg TV Germany:11642:v:1:27500:1460:1420:0:0
-Bloomberg TV UK:11642:v:1:27500:1560:1520:0:0
-SAT 7:11642:v:1:27500:1660:1620:0:0
-Multivision 1:11662:v:1:27500:120:130:0:0
-Dubai EDTV:11746:v:1:27500:4130:4131:0:0
-Dubai Sport Channel:11746:v:1:27500:4386:4387:0:0
-Dubai Business Channel:11746:v:1:27500:4642:4643:0:0
-Dubai EDTV:11746:v:1:27500:4898:4899:0:0
-ERT Sat:11823:v:1:27500:521:740:0:0
-TVL:11843:v:1:27500:2441:2442:0:0
-Team TV :11881:v:1:27500:2305:2306:0:0
-ART Europe:12015:v:1:27500:164:96:0:0
-ESC 2:12015:v:1:27500:166:104:0:0
-ART Iqra:12015:v:1:27500:168:112:0:0
-Vacaciones TV:12092:v:1:27500:4112:4113:0:0
-TvL - TV Locale:12092:v:1:27500:4160:4161:0:0
-TVE Internacional:12092:v:1:27500:4208:4209:0:0
-TVG - TV de Galicia :12092:v:1:27500:4224:4225:0:0
-La Cadena Del Milagro:12092:v:1:27500:4368:4369:0:0
-Fiesta:12092:v:1:27500:4432:4433:0:0
-Visions Europe:12092:v:1:27500:4416:4417:0:0
-SateliTV/TV Sex Channel:12092:v:1:27500:4480:4481:0:0
-Krisma:12111:v:1:27500:200:201:0:0
-NTV:12111:v:1:27500:210:211:0:0
-Armenia TV 1:12111:v:1:27500:240:241:0:0
-SMAU Channel :12111:v:1:27500:260:261:0:0
-JSC - Al Jazeera Satellite Ch :12111:v:1:27500:270:271:0:0
-Il Tirreno Sat:12111:v:1:27500:280:301:0:0
-CCTV 4:12169:h:1:27500:516:690:0:0
-Kanali Vuolis:12169:v:1:27500:517:700:0:0
-Nova Promo:12169:v:1:27500:521:740:0:0
-ERT Sat :12188:v:1:27500:514:652:0:0
-Kanali Voulis:12188:v:1:27500:515:653:0:0
-OTE Promo:12188:v:1:27500:517:655:0:0
-TV 5 Europe:12245:v:1:27500:121:131:0:0
-Fashion TV:12245:h:1:27500:123:133:0:0
-TV Ajara:12245:v:1:27500:127:137:0:0
-Telekom TV:12265:v:1:27500:1460:1420:0:0
-SLO-TV1:12303:v:1:27500:200:201:0:0
-Polonia 1:12303:v:1:27500:205:206:0:0
-Super 1:12303:v:1:27500:207:208:0:0
-Sicilia Internacional:12303:v:1:27500:210:211:0:0
-SicilSat:12303:v:1:27500:225:226:0:0
-TBNE Italy:12303:v:1:27500:230:231:0:0
-Countdown TV:12303:v:1:27500:235:236:0:0
-Napoli International:12303:v:1:27500:240:241:0:0
-Magic TV:12303:v:1:27500:245:246:0:0
-TEST:12341:v:1:27500:165:108:0:0
-Colour Bars:12380:v:1:27500:3022:3032:0:0
-Tele 24 :12380:v:1:27500:3023:3033:0:0
-Abu Dhabi TV :12380:v:1:27500:3024:3034:0:0
-LCA:12380:v:1:27500:3025:3035:0:0
-RTV Montenegro:12380:v:1:27500:3026:3036:0:0
-SRG SSR Sat Access :12399:v:1:27500:165:98:0:0
-Jam-e-Jam Network 1 (IRIB 1):12437:v:1:27500:160:80:0:0
-Jam-e-Jam Network 2 (IRIB 2):12437:v:1:27500:161:82:0:0
-Sahar University Network:12437:v:1:27500:162:84:0:0
-Maharishi Open University:12476:v:1:27500:42:43:0:0
-Europe by Satellite:12476:h:1:27500:101:201:0:0
-Pink Backup:12476:v:1:27500:308:256:0:0
-Mizik Tropical:12476:h:1:27500:435:436:0:0
-TLI info card:12476:h:1:27500:771:768:0:0
-Liberty TV:12476:h:1:27500:941:942:0:0
-HRT TV 1:12520:v:1:27500:100:101:0:0
-HRT National:12520:v:1:27500:107:108:0:0
-BVN TV:12520:v:1:27500:210:211:0:0
-Sicilia International:12520:v:1:27500:501:502:0:0
-Sardegna Uno:12520:v:1:27500:503:504:0:0
-TGRT:12520:v:1:27500:505:506:0:0
-Euro Mediterraneo:12520:v:1:27500:510:511:0:0
-WWWTravel TV:12540:v:1:27500:1180:1183:0:0
-WWWTravel TV:12540:v:1:27500:1180:1184:0:0
-WWWTravel TV:12540:v:1:27500:1180:1185:0:0
-MBC:12597:v:1:27500:160:80:0:0
-SIMA-YEH-MOGHAVEMENT:12597:v:1:27500:161:84:0:0
-NITV (National Iran TV ):12597:v:1:27500:163:92:0:0
-BET International:12597:v:1:27500:167:108:0:0
-JSTV 2 Info Card:12597:v:1:27500:2011:2012:0:0
-EuroNews French:12597:v:1:27500:2221:2231:0:0
-EuroNews English:12597:v:1:27500:2221:2232:0:0
-EuroNews German:12597:v:1:27500:2221:2233:0:0
-EuroNews Italian:12597:v:1:27500:2221:2234:0:0
-EuroNews Spanish:12597:v:1:27500:2221:2235:0:0
-EuroNews Portuguese:12597:v:1:27500:2221:2236:0:0
-EuroNews English:12597:v:1:27500:2221:2237:0:0
-Canal Agro Rual:12597:v:1:27500:2321:2331:0:0
-MMO9:12616:v:1:27500:2561:2562:0:0
-Dubai Sport Channel:12654:v:1:27500:1060:1020:0:0
-Sharjah TV :12654:v:1:27500:1160:1120:0:0
-Qatar TV:12654:v:1:27500:1260:1220:0:0
-Saudi Channel 1 :12654:v:1:27500:1360:1320:0:0
-Kuwait Space Channel :12654:v:1:27500:1460:1420:0:0
-Libya TV:12654:v:1:27500:1560:1520:0:0
-Sudan TV:12654:v:1:27500:1660:1620:0:0
-Oman TV:12654:v:1:27500:1760:1720:0:0
-Jordan Satellite Channel:12654:v:1:27500:1860:1820:0:0
-Iraq Satellite Channel:12654:v:1:27500:1960:1920:0:0
-Thai TV 5 Global Network :12673:v:1:27500:200:201:0:0
-Telemarket:12673:v:1:27500:350:351:0:0
-Evision:12673:v:1:27500:360:361:0:0
-Onyx TV:12692:v:1:27500:161:84:0:0
-EWTN:10723:v:1:29900:1001:1201:0:0
-Test (Newslynx):10723:v:1:29900:1002:1202:0:0
-MTA International:10723:v:1:29900:1004:1204:0:0
-J TV Test:10992:v:1:27500:2436:2437:0:0
-Bloomberg UK Test Card:11242:v:1:27500:162:88:0:0
-Channel SUN TV:11604:h:1:27500:111:112:0:0
-Olisat TLC test card:11623:v:1:27500:225:245:0:0
-Channel SUN Test (KBT):11623:v:1:27500:229:249:0:0
-Rai way 3 test card:11766:v:1:27500:164:96:0:0
-Rai way 1 test card:11766:v:1:27500:515:653:0:0
-Rai way 2 test card:11766:v:1:27500:516:654:0:0
-Test (Local Satellite):12092:v:1:27500:4176:4177:0:0
-Retelsat Test:12092:v:1:27500:4464:4465:0:0
-AIT Test Card:12111:v:1:27500:220:221:0:0
-Fucino Test Card:12111:v:1:27500:230:231:0:0
-PGM1:12230:v:1:13396:1160:1121:0:0
diff --git a/Tools/dvbrc2vdr/dvbrc.hotbird b/Tools/dvbrc2vdr/dvbrc.hotbird
deleted file mode 100644
index 8717fdbcc..000000000
--- a/Tools/dvbrc2vdr/dvbrc.hotbird
+++ /dev/null
@@ -1,63 +0,0 @@
-LNB ID 1 TYPE 1  LOF1 9750000 LOF2 10600000 SLOF 11800000 DISEQCNR 1
-  SAT ID 1 NAME "Hotbird" LNBID 1 FMIN 12015000 FMAX 12100000
-    TRANSPONDER ID 119c8 SATID 0001 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 0 NAME "T+ BIANCO" SATID ffffff TPID 119c8 SID 2b5d TYPE 1 VPID a0 APID 50 APID 51 TTPID 2c PCRPID a0
-      CHANNEL ID 1 NAME "T+ NERO" SATID ffffff TPID 119c8 SID 2b5f TYPE 1 VPID a1 APID 54 APID 55 TTPID 2d PCRPID a1
-      CHANNEL ID 2 NAME "T+ GRIGIO" SATID ffffff TPID 119c8 SID 2b61 TYPE 1 VPID a2 APID 58 APID 59 PCRPID a2
-      CHANNEL ID 3 NAME "R4" SATID ffffff TPID 119c8 SID 18 TYPE 1 VPID a3 PCRPID a3
-      CHANNEL ID 4 NAME "16:9 TELE+" SATID ffffff TPID 119c8 SID 2b63 TYPE 1 VPID a4 APID 60 APID 61 PCRPID a4
-      CHANNEL ID 5 NAME "VETRINA D+" SATID ffffff TPID 119c8 SID 2b65 TYPE 1 PCRPID a5
-      CHANNEL ID 6 NAME "R/RAGAZZI RAISAT" SATID ffffff TPID 119c8 SID 2b67 TYPE 1 PCRPID a6
-    TRANSPONDER ID 11a90 SATID 0001 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 7 NAME "PALCO" SATID ffffff TPID 11a90 SID 2bc1 TYPE 1 PCRPID af
-      CHANNEL ID 8 NAME "INFO" SATID ffffff TPID 11a90 SID 2bc3 TYPE 1 VPID a1 PCRPID af
-      CHANNEL ID 9 NAME "P1" SATID ffffff TPID 11a90 SID 2bc5 TYPE 1 VPID a2 APID 58 APID 59 PCRPID af
-      CHANNEL ID a NAME "P2" SATID ffffff TPID 11a90 SID 2bc7 TYPE 1 VPID a3 APID 5c APID 5d PCRPID af
-      CHANNEL ID b NAME "P3" SATID ffffff TPID 11a90 SID 2bc9 TYPE 1 VPID a4 APID 60 APID 61 PCRPID af
-      CHANNEL ID c NAME "P4" SATID ffffff TPID 11a90 SID 2bcb TYPE 1 VPID a5 APID 64 APID 65 PCRPID af
-      CHANNEL ID d NAME "P5" SATID ffffff TPID 11a90 SID 2bcd TYPE 1 VPID a6 APID 68 APID 69 PCRPID af
-      CHANNEL ID e NAME "P6" SATID ffffff TPID 11a90 SID 2bcf TYPE 1 VPID a7 APID 6c APID 6d PCRPID af
-    TRANSPONDER ID 11964 SATID 0001 TYPE 1 FREQ 12015000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID f NAME "ART VARIETY" SATID ffffff TPID 11964 SID 19a TYPE 1 VPID a0 PCRPID a0
-      CHANNEL ID 10 NAME "ART CHILDREN" SATID ffffff TPID 11964 SID 1a4 TYPE 1 VPID a1 PCRPID a1
-      CHANNEL ID 11 NAME "ART MOVIES" SATID ffffff TPID 11964 SID 1ae TYPE 1 VPID a2 PCRPID a2
-      CHANNEL ID 12 NAME "ART MUSIC" SATID ffffff TPID 11964 SID 1b8 TYPE 1 VPID a3 PCRPID a3
-      CHANNEL ID 13 NAME "ART EUROPE" SATID ffffff TPID 11964 SID 1c2 TYPE 0 VPID a4 PCRPID a4
-      CHANNEL ID 14 NAME "LBC EUROPE" SATID ffffff TPID 11964 SID 1cc TYPE 1 VPID a5 PCRPID a5
-      CHANNEL ID 15 NAME "EGYPT SAT. CH. 2" SATID ffffff TPID 11964 SID 1d6 TYPE 1 VPID a6 PCRPID a6
-      CHANNEL ID 16 NAME "ART SPORT" SATID ffffff TPID 11964 SID 1d8 TYPE 1 VPID a7 PCRPID a7
-      CHANNEL ID 17 NAME "IQRA" SATID ffffff TPID 11964 SID 1da TYPE 1 VPID a8 PCRPID a8
-    TRANSPONDER ID 11a2c SATID 0001 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
-      CHANNEL ID ffffffff NAME "CNN" SATID ffffff TPID 11a2c SID 2ced TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "BBC" SATID ffffff TPID 11a2c SID 2cef TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "BLOOMBERG" SATID ffffff TPID 11a2c SID 2cf1 TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "CNBC" SATID ffffff TPID 11a2c SID 2cf3 TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "SKYNews" SATID ffffff TPID 11a2c SID 2cf5 TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "TST2" SATID ffffff TPID 11a2c SID 2cf7 TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "TV5" SATID ffffff TPID 11a2c SID 2cf9 TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "EPG" SATID ffffff TPID 11a2c SID 2cfb TYPE 1 PCRPID af
-      CHANNEL ID ffffffff NAME "CNN" SATID ffffff TPID 11a2c SID 2cfd TYPE 1 VPID a0 APID 50 PCRPID af
-      CHANNEL ID ffffffff NAME "CNBC" SATID ffffff TPID 11a2c SID 2cff TYPE 1 VPID a3 APID 5c PCRPID af
-      CHANNEL ID ffffffff NAME "TV5" SATID ffffff TPID 11a2c SID 2d01 TYPE 1 VPID a6 APID 68 PCRPID af
-      CHANNEL ID ffffffff NAME "BBC WORLD" SATID ffffff TPID 11a2c SID 2d03 TYPE 1 VPID a1 APID 54 PCRPID af
-      CHANNEL ID ffffffff SATID ffffff TPID 11a2c SID 2d4b TYPE 0 PCRPID 1ffe
-      CHANNEL ID ffffffff SATID ffffff TPID 11a2c SID 26fc TYPE 0 PCRPID 1ffe
-      CHANNEL ID ffffffff SATID ffffff TPID 11a2c SID 26fd TYPE 0 PCRPID 1ffe
-    TRANSPONDER ID 11af4 SATID 0001 TYPE 1 FREQ 12091901 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 27 NAME "Bolsa" SATID ffffff TPID 11af4 SID 222e TYPE 0
-      CHANNEL ID 28 NAME "Testw" SATID ffffff TPID 11af4 SID 222f TYPE 0
-      CHANNEL ID 29 NAME "SIRE" SATID ffffff TPID 11af4 SID 2230 TYPE 0 PCRPID 102
-      CHANNEL ID 2a NAME "Telesierra" SATID ffffff TPID 11af4 SID 2200 TYPE 0 VPID 1040 APID 1041 PCRPID 1040
-      CHANNEL ID 2b NAME "vtv" SATID ffffff TPID 11af4 SID 21fd TYPE 0 VPID 1010 APID 1012 APID 1011 APID 1013 PCRPID 1010
-      CHANNEL ID 2c NAME "Satisfaction" SATID ffffff TPID 11af4 SID 2202 TYPE 0 VPID 1060 APID 1061 PCRPID 1060
-      CHANNEL ID 2d NAME "C. Milagro" SATID ffffff TPID 11af4 SID 2207 TYPE 0 VPID 1110 APID 1111 PCRPID 1110
-      CHANNEL ID 2e NAME "Fiesta" SATID ffffff TPID 11af4 SID 2210 TYPE 0 VPID 1150 APID 1151 APID 1152 PCRPID 1150
-      CHANNEL ID 2f NAME "TVE Internacional" SATID ffffff TPID 11af4 SID 2203 TYPE 0 VPID 1070 APID 1071 PCRPID 1070
-      CHANNEL ID 30 NAME "TV Galicia" SATID ffffff TPID 11af4 SID 2204 TYPE 0 APID 1090 PCRPID 1090
-      CHANNEL ID 31 NAME "Radio Gallega" SATID ffffff TPID 11af4 SID 2205 TYPE 0 APID 1090 PCRPID 1090
-      CHANNEL ID 32 NAME "Retelsat" SATID ffffff TPID 11af4 SID 2212 TYPE 1 VPID 1170 APID 1171 PCRPID 1170
-      CHANNEL ID 33 NAME "Musicam 1" SATID ffffff TPID 11af4 SID 2209 TYPE 1 APID 1136 PCRPID 1136
-      CHANNEL ID 34 NAME "Musicam 2" SATID ffffff TPID 11af4 SID 220a TYPE 1 APID 1131 PCRPID 1131
-      CHANNEL ID 35 NAME "Musicam 3" SATID ffffff TPID 11af4 SID 220b TYPE 1 APID 1136 PCRPID 1136
-      CHANNEL ID 36 NAME "Musicam 4" SATID ffffff TPID 11af4 SID 220c TYPE 1 APID 1136 PCRPID 1136
-      CHANNEL ID 37 NAME "Musicam 5" SATID ffffff TPID 11af4 SID 220d TYPE 1 APID 1136 PCRPID 1136
diff --git a/Tools/dvbrc2vdr/dvbrc2vdr.c b/Tools/dvbrc2vdr/dvbrc2vdr.c
deleted file mode 100644
index 243ddc02d..000000000
--- a/Tools/dvbrc2vdr/dvbrc2vdr.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *  * dvbrc2vdr.c: Converts 'xtvrc' files to 'vdr' channel format
- *  *
- *  * Copyright (C) 2000 Plamen Ganev
- *  * 
- *  * This program is free software; you can redistribute it and/or
- *  * modify it under the terms of the GNU General Public License
- *  * as published by the Free Software Foundation; either version 2
- *  * of the License, or (at your option) any later version.
- *  * 
- *  * This program is distributed in the hope that it will be useful,
- *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  * GNU General Public License for more details.
- *  * 
- *  * You should have received a copy of the GNU General Public License
- *  * along with this program; if not, write to the Free Software
- *  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *  * 
- *  * The author can be reached at pganev@comm.it
- *  *
- *  */
-
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define MAX_LINE_LEN 1024
-#define MAX_NAME 100
-#define TOKS ": \n\r"
-#define NAMETOKS ":\n\r"
-
-typedef struct {
-   char Name[MAX_NAME+1];
-   int freq;
-   int color, hue, bright, saturation ;
-   int nitv, input ;
-   int pol, srate, fec, vpid, apid, lnbnum, type;
-   int sid, pcrpid ;
-} CHANNEL_DATA ;
-
-void strupr( char *s ){
-   while ( s && *s ){
-     *s = toupper(*s);
-     s++;
-   }
-}
-
-/* Warning: This function uses the last strtol string! */
-int GetTpInfo( CHANNEL_DATA *channel )
-{
-   // s is: ID x SATID x TYPE x FREQ x POL H/V SRATE x FEC x
-   char *p ;
-   
-   p = strtok( NULL, TOKS ) ;  /* Skip ID */
-   p = strtok( NULL, TOKS ) ;  /* Skip x  */
-   p = strtok( NULL, TOKS ) ;  /* Skip SatId */
-   p = strtok( NULL, TOKS ) ;  /* Skip x */
-   p = strtok( NULL, TOKS ) ;  /* Skip Type */
-   p = strtok( NULL, TOKS ) ;  /* Skip x */
-   p = strtok( NULL, TOKS ) ;  /* Skip Freq */
-   p = strtok( NULL, TOKS ) ;  /* Get Freq */
-   channel->freq = atol( p ) / 1000 ; 
-   p = strtok( NULL, TOKS ) ;  /* Skip Pol */
-   p = strtok( NULL, TOKS ) ;  /* Get H/V */
-   channel->pol = (*p=='V') ? 1 : 0 ;
-   p = strtok( NULL, TOKS ) ;  /* Skip SRATE */
-   p = strtok( NULL, TOKS ) ;  /* Get srate */
-   channel->srate = atol(p) / 1000 ; /* Convert SRATE */
-   return 0;
-}
-
-/* Warning: This function uses the last strtol string! */
-int GetChInfo( CHANNEL_DATA *channel )
-{
-   /* s is: ID x NAME "name" SATID x TPID x SID x TYPE x VPID x APID x  */
-   char *p, *q ;
-
-   p = strtok( NULL, TOKS ) ;
-   while ( p ) {
-      if ( !strcmp( p, "ID" )) {
-	 p = strtok( NULL, TOKS ) ;
-      } else if ( !strcmp( p, "NAME")) {
-	 while ( *p++ );     /* Jump to end of "NAME" */
-	 p++ ;               /* One More */
-	 while ( *p == '"' ) p++ ;  /* Skip the " */
-	 q = channel->Name ;
-	 while ( *p != '"' ) 
-	   if ( *p == ':' )
-	     *q++ = '|', p++ ;
-	   else
-   	     *q++ = *p++ ;     /* Copy the name */
-	 *q = 0 ;
-	 p++ ;
-	 p = strtok( p, TOKS ) ;
-	 channel->apid = 8190;
-	 channel->vpid = 8190;
-	 channel->pcrpid = 0 ;
-	 channel->sid = 0;
-      } else if ( !strcmp( p, "VPID")) {
-	 p = strtok( NULL, TOKS ) ;
-	 channel->vpid = strtol( p, NULL, 16 ) ;
-	 p = strtok( NULL, TOKS ) ;
-      } else if ( !strcmp( p, "APID")) {
-	 p = strtok( NULL, TOKS ) ;
-	 channel->apid = strtol( p, NULL, 16 ) ;
-	 p = strtok( NULL, TOKS ) ;
-      } else if ( !strcmp( p, "SID")) {
-	 p = strtok( NULL, TOKS ) ;
-	 channel->sid = strtol( p, NULL, 16 ) ;
-	 p = strtok( NULL, TOKS ) ;
-      } else if ( !strcmp( p, "PCRPID")) {
-	 p = strtok( NULL, TOKS ) ;
-	 channel->pcrpid = strtol( p, NULL, 16 ) ;
-	 p = strtok( NULL, TOKS ) ;
-      } else {
-	 p = strtok( NULL, TOKS ) ;
-      }
-    }
-   return 1;
-}
-
-int ReadChannel( FILE *f, CHANNEL_DATA *channel ) {
-   static char s[MAX_LINE_LEN+1];
-   char *p;
-
-   while (fgets( s, MAX_LINE_LEN, f )){
-      p = strtok( s, TOKS ) ;
-      strupr( p ) ;
-      
-      if ( !strcmp( p, "TRANSPONDER" )){
-	 GetTpInfo( channel ) ;
-      } else if ( !strcmp( p, "CHANNEL" ) ) {
-	 GetChInfo( channel ) ;
-	 return 1 ;
-      }
-   }
-   return 0 ;
-}
-
-int main ( int argc, char *argv[] ){
-   FILE *f, *fo ;
-   int cnt = 0;
-   CHANNEL_DATA channel ;
-   
-   if ( argc != 3 ){
-      printf("USAGE: %s <dvbrc file> <vdr file>\n\n", argv[0] ) ;
-      return 0;
-   }
-   
-   if ( !(f=fopen(argv[1], "rt"))){
-      printf("Can't open %s for reading\n\n", argv[1]);
-      return 0;
-   }
-   
-   if ( !(fo=fopen(argv[2], "wt"))){
-      printf("Can't open %s for writing\n\n", argv[2]);
-      return 0;
-   }
-   
-   while ( ReadChannel( f, &channel ) ) {
-      cnt++;
-      fprintf(fo, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n",
-	     channel.Name ,
-	     channel.freq ,
-	     channel.pol ? 'v' : 'h' ,
-	     1, //channel.lnbnum ,
-	     channel.srate ,
-	     channel.vpid ,
-	     channel.apid ,
-	     0, //channel.type ,
-	     channel.sid ) ;
-   }
-	  
-   printf( "%d channels read.\n\n", cnt ) ;
-   
-   fclose(f);
-   fclose(fo);
-   return 1;
-}
diff --git a/Tools/dvbrc2vdr/hotbird2 b/Tools/dvbrc2vdr/hotbird2
deleted file mode 100644
index 39c7b8779..000000000
--- a/Tools/dvbrc2vdr/hotbird2
+++ /dev/null
@@ -1,878 +0,0 @@
-LNB ID 0 TYPE 1  LOF1 9750000 LOF2 10600000 SLOF 11800000 DISEQCNR 0
-  SAT ID 0 NAME "HotBird" LNBID 0 FMIN 10700000 FMAX 12800000
-    TRANSPONDER ID 2af8 SATID 0000 TYPE 1 FREQ 10719000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 0 NAME "DISCOVERY" SATID ffffff TPID 2af8 SID 1132 TYPE 1 PCRPID a1
-      CHANNEL ID 1 NAME "RTL7" SATID ffffff TPID 2af8 SID 1133 TYPE 1 PCRPID a2
-      CHANNEL ID 2 NAME "TV POLONIA" SATID ffffff TPID 2af8 SID 1134 TYPE 1 PCRPID a3
-      CHANNEL ID 3 NAME "EUROSPORT" SATID ffffff TPID 2af8 SID 1135 TYPE 1 PCRPID a4
-      CHANNEL ID 4 NAME "PLANETE" SATID ffffff TPID 2af8 SID 1136 TYPE 1 PCRPID a5
-      CHANNEL ID 5 NAME "SEASONS" SATID ffffff TPID 2af8 SID 1137 TYPE 1 PCRPID a6
-      CHANNEL ID 6 NAME "VIVA Polska" SATID ffffff TPID 2af8 SID 1138 TYPE 1 PCRPID a7
-      CHANNEL ID 7 NAME "MULTIMUSIC 4" SATID ffffff TPID 2af8 SID 1158 TYPE 1 APID 79 APID 7a APID 7b PCRPID 79
-      CHANNEL ID 8 NAME "EPG" SATID ffffff TPID 2af8 SID 1162 TYPE 1 PCRPID a1
-      CHANNEL ID 9 NAME "CYFRA+ GRY" SATID ffffff TPID 2af8 SID 116c TYPE 1
-    TRANSPONDER ID 0101 SATID 0000 TYPE 1 FREQ 10722000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 2bc0 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
-      CHANNEL ID a NAME "Guide LC" SATID ffffff TPID 2bc0 SID 7d0 TYPE 0 APID 1f5e PCRPID 1f5e
-      CHANNEL ID b NAME "Cinestar 1" SATID ffffff TPID 2bc0 SID 4b1 TYPE 1 VPID 78 APID 82 PCRPID 78
-      CHANNEL ID c NAME "Cinestar 2" SATID ffffff TPID 2bc0 SID 4b2 TYPE 1 VPID dc APID e6 PCRPID dc
-      CHANNEL ID d NAME "Cinetoile" SATID ffffff TPID 2bc0 SID 4b3 TYPE 1 VPID 140 APID 14a PCRPID 140
-      CHANNEL ID e NAME "Shopping Avenue" SATID ffffff TPID 2bc0 SID 4b4 TYPE 1 VPID 1a4 APID 1ae PCRPID 1a4
-      CHANNEL ID f NAME "S�rie Club " SATID ffffff TPID 2bc0 SID 4b5 TYPE 1 VPID 208 APID 212 PCRPID 208
-      CHANNEL ID 10 NAME "FUN TV" SATID ffffff TPID 2bc0 SID 4b6 TYPE 1 VPID 26c APID 276 PCRPID 26c
-      CHANNEL ID 11 NAME "Teva" SATID ffffff TPID 2bc0 SID 4b7 TYPE 1 VPID 2d0 APID 2da PCRPID 2d0
-      CHANNEL ID 12 NAME "M6 Music" SATID ffffff TPID 2bc0 SID 4b8 TYPE 1 VPID 334 APID 33e PCRPID 334
-      CHANNEL ID 13 NAME "Club T�l�achat" SATID ffffff TPID 2bc0 SID 4b9 TYPE 1 VPID 398 APID 3a2 PCRPID 398
-    TRANSPONDER ID 0103 SATID 0000 TYPE 1 FREQ 10775000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 2c88 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 14 NAME "INFOSPORT" SATID ffffff TPID 2c88 SID 579 TYPE 1 VPID 78 APID 82 PCRPID 78
-      CHANNEL ID 15 NAME "R�gions" SATID ffffff TPID 2c88 SID 57a TYPE 1 VPID dc APID e6 PCRPID dc
-      CHANNEL ID 16 NAME "Mezzo" SATID ffffff TPID 2c88 SID 57b TYPE 1 VPID 140 APID 14a PCRPID 140
-      CHANNEL ID 17 NAME "01 01 15 97" SATID ffffff TPID 2c88 SID 5cb TYPE 0
-      CHANNEL ID 18 NAME "01 01 17 97" SATID ffffff TPID 2c88 SID 5cd TYPE 0
-      CHANNEL ID 19 NAME "01 02 17 97" SATID ffffff TPID 2c88 SID 5ce TYPE 0
-      CHANNEL ID 1a NAME "01 02 15 97" SATID ffffff TPID 2c88 SID 5d0 TYPE 0
-      CHANNEL ID 1b NAME "01 02 15 96" SATID ffffff TPID 2c88 SID 5d1 TYPE 0
-      CHANNEL ID 1c NAME "01 03 17 10" SATID ffffff TPID 2c88 SID 5d2 TYPE 0
-      CHANNEL ID 1d NAME "01 03 15 10" SATID ffffff TPID 2c88 SID 5d3 TYPE 0
-      CHANNEL ID 1e NAME "Festival" SATID ffffff TPID 2c88 SID 57c TYPE 1 VPID 1a4 APID 1ae PCRPID 1a4
-      CHANNEL ID 1f NAME "HISTOIRE " SATID ffffff TPID 2c88 SID 57d TYPE 1 VPID 208 APID 212 PCRPID 208
-      CHANNEL ID 20 NAME "T�l�toon" SATID ffffff TPID 2c88 SID 57e TYPE 1 VPID 26c APID 276 PCRPID 26c
-      CHANNEL ID 21 NAME "Odyss�e " SATID ffffff TPID 2c88 SID 57f TYPE 1 VPID 2d0 APID 2da PCRPID 2d0
-      CHANNEL ID 22 NAME "France Musiques" SATID ffffff TPID 2c88 SID 58a TYPE 0 APID 33e PCRPID 33e
-      CHANNEL ID 23 NAME "Hector" SATID ffffff TPID 2c88 SID 58b TYPE 0 APID 33f PCRPID 33f
-      CHANNEL ID 24 NAME "FIP" SATID ffffff TPID 2c88 SID 58c TYPE 0 APID 340 PCRPID 340
-      CHANNEL ID 25 NAME "France Inter" SATID ffffff TPID 2c88 SID 58d TYPE 0 APID 341 PCRPID 341
-      CHANNEL ID 26 NAME "France Info" SATID ffffff TPID 2c88 SID 58e TYPE 0 APID 342 PCRPID 342
-      CHANNEL ID 27 NAME "Elisa" SATID ffffff TPID 2c88 SID 58f TYPE 0 APID 343 PCRPID 343
-      CHANNEL ID 28 NAME "France Culture" SATID ffffff TPID 2c88 SID 590 TYPE 0 APID 344 PCRPID 344
-      CHANNEL ID 29 NAME "Radio Bleue" SATID ffffff TPID 2c88 SID 591 TYPE 0 APID 345 PCRPID 345
-      CHANNEL ID 2a NAME "Le Mouv" SATID ffffff TPID 2c88 SID 592 TYPE 0 APID 346 PCRPID 346
-      CHANNEL ID 2b NAME "TV5" SATID ffffff TPID 2c88 SID 581 TYPE 1 VPID 398 APID 3a2 PCRPID 398
-    TRANSPONDER ID 2d50 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 2c NAME "CENTRONICS" SATID ffffff TPID 2d50 SID 7d0 TYPE 0
-      CHANNEL ID 2d NAME "FRANCE 2 " SATID ffffff TPID 2d50 SID 450 TYPE 1 VPID 140 PCRPID 140
-      CHANNEL ID 2e NAME "FRANCE 3" SATID ffffff TPID 2d50 SID 452 TYPE 1 VPID 208 PCRPID 208
-      CHANNEL ID 2f NAME "Cr�dit Agricole" SATID ffffff TPID 2d50 SID 14b5 TYPE 0 APID 14d5 PCRPID 14c9
-      CHANNEL ID 30 NAME "tps foot" SATID ffffff TPID 2d50 SID 1450 TYPE 0 APID 146e PCRPID 146e
-      CHANNEL ID 31 NAME "LCI" SATID ffffff TPID 2d50 SID 44d TYPE 1 VPID 78 APID 82 PCRPID 78
-      CHANNEL ID 32 NAME "EUROSPORT" SATID ffffff TPID 2d50 SID 44e TYPE 1 VPID dc APID e6 PCRPID dc
-      CHANNEL ID 33 NAME "FRANCE 2" SATID ffffff TPID 2d50 SID 44f TYPE 1 VPID 140 PCRPID 140
-      CHANNEL ID 34 NAME "FRANCE 3" SATID ffffff TPID 2d50 SID 451 TYPE 1 VPID 208 PCRPID 208
-      CHANNEL ID 35 NAME "I TELEVISION" SATID ffffff TPID 2d50 SID 454 TYPE 1 VPID 334 APID 33e PCRPID 334
-      CHANNEL ID 36 NAME "TV Mail alphatest" SATID ffffff TPID 2d50 SID 1645 TYPE 0
-      CHANNEL ID 37 NAME "CHAINE FI" SATID ffffff TPID 2d50 SID 14b4 TYPE 0 APID 14d2 APID 14d3 PCRPID 14d2
-      CHANNEL ID 38 NAME "caisse d'�pargne" SATID ffffff TPID 2d50 SID 14b7 TYPE 0
-      CHANNEL ID 39 NAME "TV Mail" SATID ffffff TPID 2d50 SID 1644 TYPE 0
-    TRANSPONDER ID 2e7c SATID 0000 TYPE 1 FREQ 10892000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 3a NAME "CANAL+" SATID ffffff TPID 2e7c SID 12c1 TYPE 1 PCRPID a0
-      CHANNEL ID 3b NAME "CANAL+ �ӣTY" SATID ffffff TPID 2e7c SID 12c2 TYPE 1 PCRPID a1
-      CHANNEL ID 3c NAME "TMT" SATID ffffff TPID 2e7c SID 12c4 TYPE 1 PCRPID a3
-      CHANNEL ID 3d NAME "ALE KINO!" SATID ffffff TPID 2e7c SID 12c5 TYPE 1 PCRPID a4
-      CHANNEL ID 3e NAME "MINIMAX" SATID ffffff TPID 2e7c SID 12c6 TYPE 1 PCRPID a5
-      CHANNEL ID 3f NAME "TVP 1" SATID ffffff TPID 2e7c SID 12c7 TYPE 1 PCRPID a6
-      CHANNEL ID 40 NAME "TVP 2" SATID ffffff TPID 2e7c SID 12c8 TYPE 1 PCRPID a7
-      CHANNEL ID 41 NAME "CANAL+ NIEBIESKI" SATID ffffff TPID 2e7c SID 12c9 TYPE 1 PCRPID a8
-      CHANNEL ID 42 NAME "EPG" SATID ffffff TPID 2e7c SID 12f2 TYPE 1 TTPID 1f4 PCRPID a0
-    TRANSPONDER ID 2ee0 SATID 0000 TYPE 1 FREQ 0 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 43 NAME "Multivision" SATID ffffff TPID 2ee0 SID 643 TYPE 0 VPID 140 PCRPID 140
-      CHANNEL ID 44 NAME "Grand Classique" SATID ffffff TPID 2ee0 SID 672 TYPE 1 APID 33e PCRPID 33e
-      CHANNEL ID 45 NAME "Symphonies" SATID ffffff TPID 2ee0 SID 673 TYPE 1 APID 33f PCRPID 33f
-      CHANNEL ID 46 NAME "Baroque" SATID ffffff TPID 2ee0 SID 674 TYPE 1 APID 340 PCRPID 340
-      CHANNEL ID 47 NAME "Op�ra" SATID ffffff TPID 2ee0 SID 675 TYPE 1 APID 341 PCRPID 341
-      CHANNEL ID 48 NAME "Contemporain" SATID ffffff TPID 2ee0 SID 676 TYPE 1 APID 342 PCRPID 342
-      CHANNEL ID 49 NAME "Relaxation" SATID ffffff TPID 2ee0 SID 677 TYPE 1 APID 343 PCRPID 343
-      CHANNEL ID 4a NAME "Blues" SATID ffffff TPID 2ee0 SID 678 TYPE 1 APID 344 PCRPID 344
-      CHANNEL ID 4b NAME "Jazz" SATID ffffff TPID 2ee0 SID 679 TYPE 1 APID 345 PCRPID 345
-      CHANNEL ID 4c NAME "Big Band" SATID ffffff TPID 2ee0 SID 67a TYPE 1 APID 346 PCRPID 346
-      CHANNEL ID 4d NAME "Jazz Moderne" SATID ffffff TPID 2ee0 SID 67b TYPE 1 APID 347 PCRPID 347
-      CHANNEL ID 4e NAME "Les Tubes Fran�ais" SATID ffffff TPID 2ee0 SID 67c TYPE 1 APID 348 PCRPID 348
-      CHANNEL ID 4f NAME "RFO SAT" SATID ffffff TPID 2ee0 SID 641 TYPE 0 VPID 78 APID 82 PCRPID 78
-      CHANNEL ID 50 NAME "Appli D1 LC" SATID ffffff TPID 2ee0 SID 690 TYPE 0
-      CHANNEL ID 51 NAME "Cinefaz" SATID ffffff TPID 2ee0 SID 642 TYPE 1 VPID dc APID e6 PCRPID dc
-      CHANNEL ID 52 NAME "TurboPC" SATID ffffff TPID 2ee0 SID af1 TYPE 0
-      CHANNEL ID 53 NAME "MTV2" SATID ffffff TPID 2ee0 SID 647 TYPE 1 VPID 2d0 APID 2da PCRPID 2d0
-      CHANNEL ID 54 NAME "Rire et chansons" SATID ffffff TPID 2ee0 SID 65e TYPE 0 APID 3a2 PCRPID 3a2
-      CHANNEL ID 55 NAME "Radio J" SATID ffffff TPID 2ee0 SID 65f TYPE 1 APID 3a3 PCRPID 3a3
-      CHANNEL ID 56 NAME "Mosqueteiros" SATID ffffff TPID 2ee0 SID 660 TYPE 0 APID 3a4 PCRPID 3a4
-      CHANNEL ID 57 NAME "Abysse" SATID ffffff TPID 2ee0 SID 661 TYPE 1 APID 3a5 PCRPID 3a5
-      CHANNEL ID 58 NAME "RMC" SATID ffffff TPID 2ee0 SID 663 TYPE 1 APID 3a7 PCRPID 3a7
-      CHANNEL ID 59 NAME "Radio Junior" SATID ffffff TPID 2ee0 SID 664 TYPE 0 APID 3a8 PCRPID 3a8
-      CHANNEL ID 5a NAME "NETRADIO" SATID ffffff TPID 2ee0 SID 665 TYPE 0 APID 3a9 PCRPID 3a9
-      CHANNEL ID 5b NAME "Nostalgie" SATID ffffff TPID 2ee0 SID 666 TYPE 0 APID 3aa PCRPID 3aa
-      CHANNEL ID 5c NAME "Skyrock" SATID ffffff TPID 2ee0 SID 667 TYPE 1 APID 3ab PCRPID 3ab
-      CHANNEL ID 5d NAME "Radio Coutoisie" SATID ffffff TPID 2ee0 SID 668 TYPE 0 APID 3ac PCRPID 3ac
-      CHANNEL ID 5e NAME "La Voix des Pays" SATID ffffff TPID 2ee0 SID 669 TYPE 0 APID 3ad PCRPID 3ad
-      CHANNEL ID 5f NAME "INFO EXPRESS" SATID ffffff TPID 2ee0 SID 157c TYPE 0 APID 159a PCRPID 159a
-      CHANNEL ID 60 NAME "METEO" SATID ffffff TPID 2ee0 SID 16a8 TYPE 0 APID 16c6 PCRPID 16c6
-      CHANNEL ID 61 NAME "X X L" SATID ffffff TPID 2ee0 SID 1518 TYPE 1
-      CHANNEL ID 62 NAME "Multivision Cin�ma" SATID ffffff TPID 2ee0 SID 1c20 TYPE 0
-      CHANNEL ID 63 NAME "Multivision Sport" SATID ffffff TPID 2ee0 SID 1c84 TYPE 0 TTPID 18fb
-      CHANNEL ID 64 NAME "Multivision Spectacle" SATID ffffff TPID 2ee0 SID 1ce8 TYPE 0
-    TRANSPONDER ID 2f44 SATID 0000 TYPE 1 FREQ 12673000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 65 NAME "Test OTV8" SATID ffffff TPID 2f44 SID 1d67 TYPE 1 PCRPID e80
-      CHANNEL ID 66 NAME "Test OTV9" SATID ffffff TPID 2f44 SID 1d68 TYPE 1 PCRPID e80
-      CHANNEL ID 67 NAME "Test OTV10" SATID ffffff TPID 2f44 SID 1d69 TYPE 1 PCRPID e80
-      CHANNEL ID 68 NAME "Test OTV11" SATID ffffff TPID 2f44 SID 1d6a TYPE 1 VPID 201 PCRPID 1ffe
-      CHANNEL ID 69 NAME "Test31" SATID ffffff TPID 2f44 SID 1d4d TYPE 1 VPID 200 APID 28a PCRPID 1ffe
-      CHANNEL ID 6a NAME "CNN" SATID ffffff TPID 2f44 SID 1d4e TYPE 1 VPID 201 APID 294 PCRPID 1ffe
-      CHANNEL ID 6b NAME "Q24" SATID ffffff TPID 2f44 SID 1d4f TYPE 0 VPID 202 APID 29e APID 29f APID 2a9 APID 2b3 PCRPID 1ffe
-      CHANNEL ID 6c NAME "Test34" SATID ffffff TPID 2f44 SID 1d50 TYPE 1 VPID 203 APID 2a8 PCRPID 1ffe
-      CHANNEL ID 6d NAME "Test35" SATID ffffff TPID 2f44 SID 1d51 TYPE 1 VPID 204 APID 2b2 PCRPID 1ffe
-      CHANNEL ID 6e NAME "Test OTV1" SATID ffffff TPID 2f44 SID 1d60 TYPE 1 PCRPID e80
-      CHANNEL ID 6f NAME "Test OTV2" SATID ffffff TPID 2f44 SID 1d61 TYPE 1 PCRPID e80
-      CHANNEL ID 70 NAME "Test OTV3" SATID ffffff TPID 2f44 SID 1d62 TYPE 1 PCRPID e80
-      CHANNEL ID 71 NAME "Test OTV4" SATID ffffff TPID 2f44 SID 1d63 TYPE 1 PCRPID e80
-      CHANNEL ID 72 NAME "Test OTV5" SATID ffffff TPID 2f44 SID 1d64 TYPE 1 PCRPID e80
-      CHANNEL ID 73 NAME "Test OTV6" SATID ffffff TPID 2f44 SID 1d65 TYPE 1 PCRPID e80
-      CHANNEL ID 74 NAME "Test OTV7" SATID ffffff TPID 2f44 SID 1d66 TYPE 1 PCRPID e80
-      CHANNEL ID 75 SATID ffffff TPID 2f44 SID 1d74 TYPE 0
-      CHANNEL ID 76 SATID ffffff TPID 2f44 SID 1d75 TYPE 0
-    TRANSPONDER ID 0109 SATID 0000 TYPE 1 FREQ 11033000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 010a SATID 0000 TYPE 1 FREQ 11054000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 3264 SATID 0000 TYPE 1 FREQ 11095910 POL H SRATE 27500000 FEC 8
-      CHANNEL ID ffffffff NAME "Telekom TV" SATID ffffff TPID 3264 SID e7f TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "FantasticOverOpal" SATID ffffff TPID 3264 SID e80 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "Gilat" SATID ffffff TPID 3264 SID e81 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "Siemens TV" SATID ffffff TPID 3264 SID e84 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "S-TV" SATID ffffff TPID 3264 SID e85 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "Optibase Encoder" SATID ffffff TPID 3264 SID e86 TYPE 0 VPID 20 PCRPID 20
-    TRANSPONDER ID 010c SATID 0000 TYPE 1 FREQ 11130000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 010d SATID 0000 TYPE 1 FREQ 11131000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 010e SATID 0000 TYPE 1 FREQ 11196000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 010f SATID 0000 TYPE 1 FREQ 11205000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 0110 SATID 0000 TYPE 1 FREQ 11242000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 012c SATID 0000 TYPE 1 FREQ 11095910 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 7d NAME "FantasticOverOpal" SATID ffffff TPID 12c SID e76 TYPE 0 PCRPID 201
-    TRANSPONDER ID 004d SATID 0000 TYPE 1 FREQ 11303750 POL H SRATE 27500000 FEC 8
-      CHANNEL ID ffffffff NAME "Deutsche Bank / T1" SATID ffffff TPID 4d SID 1 TYPE 1 VPID 488 PCRPID 488
-      CHANNEL ID 7f NAME "Animal Planet" SATID ffffff TPID 4d SID a TYPE 1 VPID 488 PCRPID 488
-      CHANNEL ID 80 NAME "Discovery E Europe-English" SATID ffffff TPID 4d SID 14 TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID ffffffff NAME "Wuerth KG / T21" SATID ffffff TPID 4d SID 15 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 82 NAME "Discovery Italy" SATID ffffff TPID 4d SID 1e TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID ffffffff NAME "BTI / T31" SATID ffffff TPID 4d SID 1f TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 84 NAME "Discovery Russia" SATID ffffff TPID 4d SID 28 TYPE 1 VPID 5b4 PCRPID 5b4
-      CHANNEL ID ffffffff NAME "K-TV (MetroMux) / T41" SATID ffffff TPID 4d SID 29 TYPE 1 VPID 7a8 PCRPID 7a8
-      CHANNEL ID 86 NAME "Animal Planet EE" SATID ffffff TPID 4d SID 32 TYPE 1 VPID 618 PCRPID 618
-      CHANNEL ID 87 NAME "Animal Planet - Russian" SATID ffffff TPID 4d SID 33 TYPE 1 VPID 618 PCRPID 618
-      CHANNEL ID 88 NAME "Discovery Netherlands" SATID ffffff TPID 4d SID 3c TYPE 1 VPID 67c PCRPID 67c
-      CHANNEL ID ffffffff NAME "Q English" SATID ffffff TPID 4d SID 46 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 8a NAME "Travel and Adventure" SATID ffffff TPID 4d SID 50 TYPE 1 VPID 744 PCRPID 744
-      CHANNEL ID 8b NAME "Travel and Adventure- Russian" SATID ffffff TPID 4d SID 51 TYPE 1 VPID 744 PCRPID 744
-      CHANNEL ID 8c NAME "New DCP" SATID ffffff TPID 4d SID 12c TYPE 1 APID 4c4 PCRPID 4c4
-      CHANNEL ID 8d NAME "CCP" SATID ffffff TPID 4d SID 12d TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID ffffffff NAME "Deutsche Bank / T2" SATID ffffff TPID 4d SID 2 TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID 93 NAME "Channel Three" SATID ffffff TPID 4d SID 3 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 94 NAME "Channel Four" SATID ffffff TPID 4d SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 95 NAME "Channel Five" SATID ffffff TPID 4d SID 5 TYPE 0 VPID 618 PCRPID 618
-      CHANNEL ID 96 NAME "Channel 6 = Sat 7 Arabic" SATID ffffff TPID 4d SID 6 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 97 NAME "Channel Seven" SATID ffffff TPID 4d SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 98 NAME "Q German" SATID ffffff TPID 4d SID 47 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 99 NAME "Q French" SATID ffffff TPID 4d SID 48 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 9a NAME "Q Dutch" SATID ffffff TPID 4d SID 49 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 1b8 NAME "DTAG / T11" SATID ffffff TPID 4d SID b TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1b9 NAME "DTAG 50 / T12" SATID ffffff TPID 4d SID c TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1ba NAME "Telekom TV" SATID ffffff TPID 4d SID d TYPE 1 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 1bb NAME "Gerling / T26" SATID ffffff TPID 4d SID 1a TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bc NAME "Hornbach-D / T36" SATID ffffff TPID 4d SID 24 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bd NAME "Hornbach-NL / T38" SATID ffffff TPID 4d SID 26 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1be NAME "Hornbach-CZ / T39" SATID ffffff TPID 4d SID 27 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bf NAME "Testkanal" SATID ffffff TPID 4d SID 63 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 1c0 NAME "KENCAST" SATID ffffff TPID 4d SID 6f TYPE 0 PCRPID 42e
-    TRANSPONDER ID 0113 SATID 0000 TYPE 1 FREQ 11338000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 0114 SATID 0000 TYPE 1 FREQ 11371000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 0115 SATID 0000 TYPE 1 FREQ 11457000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 0116 SATID 0000 TYPE 1 FREQ 11464000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 3c8c SATID 0000 TYPE 1 FREQ 11604100 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 8e NAME "SAT.1 CH" SATID ffffff TPID 3c8c SID 259 TYPE 0 VPID 65 APID 66 TTPID 69 PCRPID 69
-      CHANNEL ID 8f NAME "KBT Channel SUN" SATID ffffff TPID 3c8c SID 25b TYPE 0 VPID 6f APID 70 PCRPID 6f
-      CHANNEL ID 90 NAME "big FM" SATID ffffff TPID 3c8c SID 25c TYPE 0 APID 71 PCRPID 71
-      CHANNEL ID 91 NAME "Event" SATID ffffff TPID 3c8c SID 25a TYPE 0 VPID a0 APID a1 PCRPID a0
-    TRANSPONDER ID 0118 SATID 0000 TYPE 1 FREQ 11623000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 004d SATID 0000 TYPE 1 FREQ 11642500 POL H SRATE 27500000 FEC 8
-      CHANNEL ID ffffffff NAME "Deutsche Bank / T1" SATID ffffff TPID 4d SID 1 TYPE 1 VPID 488 PCRPID 488
-      CHANNEL ID 7f NAME "Animal Planet" SATID ffffff TPID 4d SID a TYPE 1 VPID 488 PCRPID 488
-      CHANNEL ID 80 NAME "Discovery E Europe-English" SATID ffffff TPID 4d SID 14 TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID ffffffff NAME "Wuerth KG / T21" SATID ffffff TPID 4d SID 15 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 82 NAME "Discovery Italy" SATID ffffff TPID 4d SID 1e TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID ffffffff NAME "BTI / T31" SATID ffffff TPID 4d SID 1f TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 84 NAME "Discovery Russia" SATID ffffff TPID 4d SID 28 TYPE 1 VPID 5b4 PCRPID 5b4
-      CHANNEL ID ffffffff NAME "K-TV (MetroMux) / T41" SATID ffffff TPID 4d SID 29 TYPE 1 VPID 7a8 PCRPID 7a8
-      CHANNEL ID 86 NAME "Animal Planet EE" SATID ffffff TPID 4d SID 32 TYPE 1 VPID 618 PCRPID 618
-      CHANNEL ID 87 NAME "Animal Planet - Russian" SATID ffffff TPID 4d SID 33 TYPE 1 VPID 618 PCRPID 618
-      CHANNEL ID 88 NAME "Discovery Netherlands" SATID ffffff TPID 4d SID 3c TYPE 1 VPID 67c PCRPID 67c
-      CHANNEL ID ffffffff NAME "Q English" SATID ffffff TPID 4d SID 46 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 8a NAME "Travel and Adventure" SATID ffffff TPID 4d SID 50 TYPE 1 VPID 744 PCRPID 744
-      CHANNEL ID 8b NAME "Travel and Adventure- Russian" SATID ffffff TPID 4d SID 51 TYPE 1 VPID 744 PCRPID 744
-      CHANNEL ID 8c NAME "New DCP" SATID ffffff TPID 4d SID 12c TYPE 1 APID 4c4 PCRPID 4c4
-      CHANNEL ID 8d NAME "CCP" SATID ffffff TPID 4d SID 12d TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID ffffffff NAME "Deutsche Bank / T2" SATID ffffff TPID 4d SID 2 TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID 93 NAME "Channel Three" SATID ffffff TPID 4d SID 3 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 94 NAME "Channel Four" SATID ffffff TPID 4d SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 95 NAME "Channel Five" SATID ffffff TPID 4d SID 5 TYPE 0 VPID 618 PCRPID 618
-      CHANNEL ID 96 NAME "Channel 6 = Sat 7 Arabic" SATID ffffff TPID 4d SID 6 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 97 NAME "Channel Seven" SATID ffffff TPID 4d SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 98 NAME "Q German" SATID ffffff TPID 4d SID 47 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 99 NAME "Q French" SATID ffffff TPID 4d SID 48 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 9a NAME "Q Dutch" SATID ffffff TPID 4d SID 49 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 1b8 NAME "DTAG / T11" SATID ffffff TPID 4d SID b TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1b9 NAME "DTAG 50 / T12" SATID ffffff TPID 4d SID c TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1ba NAME "Telekom TV" SATID ffffff TPID 4d SID d TYPE 1 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 1bb NAME "Gerling / T26" SATID ffffff TPID 4d SID 1a TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bc NAME "Hornbach-D / T36" SATID ffffff TPID 4d SID 24 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bd NAME "Hornbach-NL / T38" SATID ffffff TPID 4d SID 26 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1be NAME "Hornbach-CZ / T39" SATID ffffff TPID 4d SID 27 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bf NAME "Testkanal" SATID ffffff TPID 4d SID 63 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 1c0 NAME "KENCAST" SATID ffffff TPID 4d SID 6f TYPE 0 PCRPID 42e
-    TRANSPONDER ID 011a SATID 0000 TYPE 1 FREQ 11662000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 3e1c SATID 0000 TYPE 1 FREQ 11681001 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 9b NAME "AB 1" SATID ffffff TPID 3e1c SID c9 TYPE 1 VPID a0 APID 50 TTPID 20 PCRPID a0
-      CHANNEL ID 9c NAME "AB MOTEURS" SATID ffffff TPID 3e1c SID ca TYPE 1 VPID a1 APID 54 TTPID 23 PCRPID a1
-      CHANNEL ID 9d NAME "ANIMAUX" SATID ffffff TPID 3e1c SID cb TYPE 1 VPID a2 APID 58 TTPID 26 PCRPID a2
-      CHANNEL ID 9e NAME "CHASSE ET PECHE" SATID ffffff TPID 3e1c SID cc TYPE 1 VPID a3 APID 5c TTPID 29 PCRPID a3
-      CHANNEL ID 9f NAME "XXL" SATID ffffff TPID 3e1c SID cd TYPE 1 VPID a4 APID 60 TTPID 2c PCRPID a4
-      CHANNEL ID a0 NAME "MUSIQUE CLASSIQUE" SATID ffffff TPID 3e1c SID ce TYPE 1 VPID a5 APID 64 TTPID 2f PCRPID a5
-      CHANNEL ID a1 NAME "ESCALES" SATID ffffff TPID 3e1c SID cf TYPE 1 VPID a6 APID 68 TTPID 32 PCRPID a6
-      CHANNEL ID a2 NAME "FIT/cha�ne HISTOIRE" SATID ffffff TPID 3e1c SID d0 TYPE 1 VPID a7 APID 6c TTPID 35 PCRPID a7
-      CHANNEL ID a3 NAME "RFM TV" SATID ffffff TPID 3e1c SID d1 TYPE 1 VPID a8 APID 70 TTPID 38 PCRPID a8
-    TRANSPONDER ID 13ec SATID 0000 TYPE 1 FREQ 11744599 POL H SRATE 27500000 FEC 8
-      CHANNEL ID a4 NAME "EDTV DRAMA" SATID ffffff TPID 13ec SID 2520 TYPE 0 VPID 1322 PCRPID 1322
-      CHANNEL ID a5 NAME "EDTV RADIO 02" SATID ffffff TPID 13ec SID 2534 TYPE 0 VPID 1322 PCRPID 1322
-      CHANNEL ID a6 NAME "EDTV RADIO 01" SATID ffffff TPID 13ec SID 2533 TYPE 0 VPID 1322 PCRPID 1322
-      CHANNEL ID a7 NAME "EDTV SPORT" SATID ffffff TPID 13ec SID 251e TYPE 0 VPID 1322 PCRPID 1322
-      CHANNEL ID a8 NAME "EDTV BUSINESS" SATID ffffff TPID 13ec SID 251f TYPE 0 VPID 1322 PCRPID 1322
-    TRANSPONDER ID 1450 SATID 0000 TYPE 1 FREQ 11765841 POL V SRATE 27500000 FEC 8
-      CHANNEL ID a9 NAME "RAI1" SATID ffffff TPID 1450 SID d49 TYPE 0 VPID a0 PCRPID 1ffe
-      CHANNEL ID aa NAME "RAI2" SATID ffffff TPID 1450 SID d4a TYPE 0 VPID a1 PCRPID 1ffe
-      CHANNEL ID ab NAME "RAI3" SATID ffffff TPID 1450 SID d4b TYPE 0 VPID a2 PCRPID 1ffe
-      CHANNEL ID ac NAME "Rai Way TEST1" SATID ffffff TPID 1450 SID d4c TYPE 0 VPID 203 PCRPID 1ffe
-      CHANNEL ID ad NAME "Rai Way TEST2" SATID ffffff TPID 1450 SID d4d TYPE 0 VPID 204 PCRPID 1ffe
-      CHANNEL ID ae NAME "Rai Way TEST3" SATID ffffff TPID 1450 SID d4e TYPE 0 VPID a4 PCRPID 1ffe
-      CHANNEL ID af NAME "RAIMOSAICO" SATID ffffff TPID 1450 SID d4f TYPE 0 VPID 206 PCRPID 1ffe
-      CHANNEL ID b0 SATID ffffff TPID 1450 SID da2 TYPE 0
-    TRANSPONDER ID 1518 SATID 0000 TYPE 1 FREQ 11765841 POL V SRATE 27500000 FEC 8
-      CHANNEL ID b1 NAME "RAINews24" SATID ffffff TPID 1518 SID ce5 TYPE 0 VPID 204 PCRPID 1ffe
-      CHANNEL ID b2 NAME "CAMERA DEPUTATI" SATID ffffff TPID 1518 SID ce6 TYPE 0 VPID 205 PCRPID 1ffe
-      CHANNEL ID b3 NAME "TELEPACE" SATID ffffff TPID 1518 SID ce8 TYPE 0 VPID 203 PCRPID 1ffe
-      CHANNEL ID b4 NAME "RAISPORTSAT" SATID ffffff TPID 1518 SID ce9 TYPE 0 VPID 200 PCRPID 1ffe
-      CHANNEL ID b5 NAME "RAINettunoSAT2" SATID ffffff TPID 1518 SID cea TYPE 0 VPID 201 PCRPID 1ffe
-      CHANNEL ID b6 NAME "RAIeducational" SATID ffffff TPID 1518 SID ceb TYPE 0 VPID 202 PCRPID 1ffe
-      CHANNEL ID b7 NAME "RAINettunoSAT1" SATID ffffff TPID 1518 SID cec TYPE 0 VPID 207 PCRPID 1ffe
-      CHANNEL ID b8 NAME "SAT2000" SATID ffffff TPID 1518 SID ced TYPE 0 VPID 206 PCRPID 1ffe
-      CHANNEL ID b9 NAME "RADIOUNO" SATID ffffff TPID 1518 SID cef TYPE 0 APID 29e PCRPID 1ffe
-      CHANNEL ID ba NAME "RADIODUE" SATID ffffff TPID 1518 SID cf0 TYPE 0 APID 29f PCRPID 1ffe
-      CHANNEL ID bb NAME "RADIOTRE" SATID ffffff TPID 1518 SID cf1 TYPE 0 APID 2a0 PCRPID 1ffe
-      CHANNEL ID bc NAME "FDleggera" SATID ffffff TPID 1518 SID cf2 TYPE 0 APID 2a1 PCRPID 1ffe
-      CHANNEL ID bd NAME "FDauditorium" SATID ffffff TPID 1518 SID cf3 TYPE 0 APID 299 PCRPID 1ffe
-      CHANNEL ID be NAME "BLUSAT 2000" SATID ffffff TPID 1518 SID cf4 TYPE 0 APID 2a5 PCRPID 1ffe
-      CHANNEL ID bf NAME "GR PARLAMENTO" SATID ffffff TPID 1518 SID cf5 TYPE 0 APID 298 PCRPID 1ffe
-      CHANNEL ID c0 NAME "ISORADIO" SATID ffffff TPID 1518 SID cf6 TYPE 0 APID 295 PCRPID 1ffe
-    TRANSPONDER ID 157c SATID 0000 TYPE 1 FREQ 11823000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID c1 NAME "R1" SATID ffffff TPID 157c SID 12d TYPE 1 VPID 200 APID 28a PCRPID 1ffe
-      CHANNEL ID c2 NAME "R2" SATID ffffff TPID 157c SID 12e TYPE 1 VPID 201 APID 294 APID 295 PCRPID 1ffe
-      CHANNEL ID c3 NAME "R3" SATID ffffff TPID 157c SID 12f TYPE 1 VPID 202 APID 29e TTPID 242 PCRPID 1ffe
-      CHANNEL ID c4 NAME "R4" SATID ffffff TPID 157c SID 130 TYPE 1 VPID 203 APID 2a8 TTPID 243 PCRPID 1ffe
-      CHANNEL ID c5 NAME "R5" SATID ffffff TPID 157c SID 132 TYPE 1 VPID 124a APID 2bc TTPID 245 PCRPID 1ffe
-      CHANNEL ID c6 NAME "R6" SATID ffffff TPID 157c SID 133 TYPE 1 VPID 206 APID 2c6 PCRPID 1ffe
-      CHANNEL ID c7 NAME "R7" SATID ffffff TPID 157c SID 134 TYPE 1 VPID 207 APID 2d0 PCRPID 1ffe
-      CHANNEL ID c8 NAME "Love Radio" SATID ffffff TPID 157c SID 135 TYPE 1 APID 2c7 PCRPID 1ffe
-      CHANNEL ID c9 NAME "Greek Church" SATID ffffff TPID 157c SID 136 TYPE 1 APID 29f PCRPID 1ffe
-      CHANNEL ID ca NAME "Skai Radio" SATID ffffff TPID 157c SID 137 TYPE 1 APID 2e5 PCRPID 1ffe
-      CHANNEL ID cb NAME "MelodiRadio" SATID ffffff TPID 157c SID 138 TYPE 1 APID 2bd PCRPID 1ffe
-      CHANNEL ID cc NAME "ERA 3" SATID ffffff TPID 157c SID 139 TYPE 1 APID 28b PCRPID 1ffe
-      CHANNEL ID cd NAME "RR1" SATID ffffff TPID 157c SID 13a TYPE 1 APID 2a9 PCRPID 1ffe
-      CHANNEL ID ce NAME "RR2" SATID ffffff TPID 157c SID 13b TYPE 1 APID 2d1 PCRPID 1ffe
-      CHANNEL ID cf NAME "NOVA CINE" SATID ffffff TPID 157c SID 13c TYPE 1 VPID 209 APID 2e4 PCRPID 1ffe
-      CHANNEL ID d0 NAME "FILM NET" SATID ffffff TPID 157c SID 13d TYPE 1 VPID 200 APID 28a PCRPID 1ffe
-      CHANNEL ID d1 NAME "SSportK-T.V" SATID ffffff TPID 157c SID 13e TYPE 1 VPID 201 APID 294 APID 295 PCRPID 1ffe
-      CHANNEL ID d2 NAME "MEGA" SATID ffffff TPID 157c SID 13f TYPE 1 VPID 202 APID 29e TTPID 242 PCRPID 1ffe
-      CHANNEL ID d3 NAME "ANT-1" SATID ffffff TPID 157c SID 140 TYPE 1 VPID 203 APID 2a8 TTPID 243 PCRPID 1ffe
-      CHANNEL ID d4 NAME "STAR" SATID ffffff TPID 157c SID 141 TYPE 1 VPID 205 APID 2bc TTPID 245 PCRPID 1ffe
-      CHANNEL ID d5 NAME "Alter 5" SATID ffffff TPID 157c SID 142 TYPE 1 VPID 206 APID 2c6 PCRPID 1ffe
-      CHANNEL ID d6 NAME "NEW Tempo" SATID ffffff TPID 157c SID 143 TYPE 1 VPID 207 APID 2d0 PCRPID 1ffe
-      CHANNEL ID d7 NAME "Super Sport2" SATID ffffff TPID 157c SID 144 TYPE 1 VPID 204 APID 2b2 APID 2b3 PCRPID 1ffe
-    TRANSPONDER ID 15e0 SATID 0000 TYPE 1 FREQ 11843000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID d8 SATID ffffff TPID 15e0 SID fffe TYPE 0
-      CHANNEL ID d9 NAME "INTV" SATID ffffff TPID 15e0 SID db0 TYPE 1 VPID 914 PCRPID 900
-      CHANNEL ID da NAME "UNIV" SATID ffffff TPID 15e0 SID db3 TYPE 1 VPID 901 PCRPID 900
-      CHANNEL ID db NAME "CULT" SATID ffffff TPID 15e0 SID db6 TYPE 1 VPID 903 PCRPID 900
-      CHANNEL ID dc NAME "ERSP" SATID ffffff TPID 15e0 SID db9 TYPE 1 VPID 905 PCRPID 900
-      CHANNEL ID dd NAME "SINT" SATID ffffff TPID 15e0 SID dbb TYPE 1
-      CHANNEL ID de NAME "CART" SATID ffffff TPID 15e0 SID dbc TYPE 1 VPID 981 PCRPID 980
-      CHANNEL ID df NAME "SINT" SATID ffffff TPID 15e0 SID dbf TYPE 1
-      CHANNEL ID e0 NAME "DISC" SATID ffffff TPID 15e0 SID dc2 TYPE 1 VPID 985 PCRPID 980
-      CHANNEL ID e1 NAME "SINT" SATID ffffff TPID 15e0 SID dc5 TYPE 1
-      CHANNEL ID e2 NAME "TVL" SATID ffffff TPID 15e0 SID dc8 TYPE 1 VPID 989 PCRPID 980
-      CHANNEL ID e3 NAME "SINT" SATID ffffff TPID 15e0 SID dca TYPE 1
-      CHANNEL ID e4 NAME "ROCK" SATID ffffff TPID 15e0 SID dde TYPE 1 APID 910 PCRPID 900
-      CHANNEL ID e5 NAME "RDS" SATID ffffff TPID 15e0 SID de1 TYPE 1 APID 911 PCRPID 900
-      CHANNEL ID e6 NAME "RTL" SATID ffffff TPID 15e0 SID de4 TYPE 1 APID 912 PCRPID 900
-      CHANNEL ID e7 NAME "101" SATID ffffff TPID 15e0 SID de7 TYPE 1 APID 913 PCRPID 900
-      CHANNEL ID e8 NAME "RVOY" SATID ffffff TPID 15e0 SID dea TYPE 1 APID 90b PCRPID 900
-      CHANNEL ID e9 NAME "RKFM" SATID ffffff TPID 15e0 SID deb TYPE 1 APID 90d PCRPID 900
-      CHANNEL ID ea NAME "GLOB" SATID ffffff TPID 15e0 SID dec TYPE 1 APID 90c PCRPID 900
-      CHANNEL ID eb NAME "ANT1" SATID ffffff TPID 15e0 SID ded TYPE 1 APID 90e PCRPID 900
-      CHANNEL ID ec NAME "RRAD" SATID ffffff TPID 15e0 SID dee TYPE 1 APID 90f PCRPID 900
-      CHANNEL ID ed NAME "MC01" SATID ffffff TPID 15e0 SID df0 TYPE 1 APID 908 PCRPID 908
-      CHANNEL ID ee NAME "MC02" SATID ffffff TPID 15e0 SID df3 TYPE 1 APID 909 PCRPID 909
-      CHANNEL ID ef NAME "MC03" SATID ffffff TPID 15e0 SID df6 TYPE 1 APID 90a PCRPID 90a
-    TRANSPONDER ID 1644 SATID 0000 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
-      CHANNEL ID f0 NAME "P7" SATID ffffff TPID 1644 SID 2c25 TYPE 1 VPID a0 APID 50 APID 51 PCRPID af
-      CHANNEL ID f1 NAME "P8" SATID ffffff TPID 1644 SID 2c27 TYPE 1 VPID a1 APID 54 APID 55 PCRPID af
-      CHANNEL ID f2 NAME "P9" SATID ffffff TPID 1644 SID 2c29 TYPE 1 VPID a2 APID 58 APID 59 PCRPID af
-      CHANNEL ID f3 NAME "+GIOCHI" SATID ffffff TPID 1644 SID 2c2e TYPE 1 PCRPID af
-      CHANNEL ID f4 NAME "MM01" SATID ffffff TPID 1644 SID 2c2f TYPE 1 APID 259 PCRPID b0
-      CHANNEL ID f5 NAME "MM02" SATID ffffff TPID 1644 SID 2c30 TYPE 0 APID 25a PCRPID b0
-      CHANNEL ID f6 NAME "MM03" SATID ffffff TPID 1644 SID 2c31 TYPE 0 APID 25b PCRPID b0
-      CHANNEL ID f7 NAME "MM04" SATID ffffff TPID 1644 SID 2c32 TYPE 0 APID 25c PCRPID b0
-      CHANNEL ID f8 NAME "MM05" SATID ffffff TPID 1644 SID 2c33 TYPE 0 APID 25d PCRPID b0
-      CHANNEL ID f9 NAME "MM06" SATID ffffff TPID 1644 SID 2c34 TYPE 0 APID 25e PCRPID b0
-      CHANNEL ID fa NAME "MM07" SATID ffffff TPID 1644 SID 2c35 TYPE 0 APID 25f PCRPID b0
-      CHANNEL ID fb NAME "MM08" SATID ffffff TPID 1644 SID 2c36 TYPE 0 APID 260 PCRPID b0
-      CHANNEL ID fc NAME "MM09" SATID ffffff TPID 1644 SID 2c37 TYPE 0 APID 261 PCRPID b0
-      CHANNEL ID fd NAME "MM10" SATID ffffff TPID 1644 SID 2c38 TYPE 0 APID 262 PCRPID b0
-      CHANNEL ID fe NAME "MM11" SATID ffffff TPID 1644 SID 2c39 TYPE 1 APID 263 PCRPID b0
-      CHANNEL ID ff NAME "MM12" SATID ffffff TPID 1644 SID 2c3a TYPE 0 APID 264 PCRPID b0
-      CHANNEL ID 100 NAME "MM13" SATID ffffff TPID 1644 SID 2c3b TYPE 0 APID 265 PCRPID b0
-      CHANNEL ID 101 NAME "MM14" SATID ffffff TPID 1644 SID 2c3c TYPE 0 APID 266 PCRPID b0
-      CHANNEL ID 102 NAME "MM15" SATID ffffff TPID 1644 SID 2c3d TYPE 0 APID 267 PCRPID b0
-      CHANNEL ID 103 NAME "MM16" SATID ffffff TPID 1644 SID 2c3e TYPE 0 APID 268 PCRPID b0
-      CHANNEL ID 104 NAME "MM17" SATID ffffff TPID 1644 SID 2c3f TYPE 0 APID 269 PCRPID b0
-      CHANNEL ID 105 NAME "MM18" SATID ffffff TPID 1644 SID 2c40 TYPE 0 APID 26a PCRPID b0
-      CHANNEL ID 106 NAME "MM19" SATID ffffff TPID 1644 SID 2c41 TYPE 0 APID 26b PCRPID b0
-      CHANNEL ID 107 NAME "MM20" SATID ffffff TPID 1644 SID 2c42 TYPE 0 APID 26c PCRPID b0
-      CHANNEL ID 108 NAME "MM21" SATID ffffff TPID 1644 SID 2c43 TYPE 1 APID 26d PCRPID b0
-      CHANNEL ID 109 NAME "MM22" SATID ffffff TPID 1644 SID 2c44 TYPE 0 APID 26e PCRPID b0
-      CHANNEL ID 10a NAME "MM23" SATID ffffff TPID 1644 SID 2c45 TYPE 0 APID 26f PCRPID b0
-      CHANNEL ID 10b NAME "MM24" SATID ffffff TPID 1644 SID 2c46 TYPE 0 APID 270 PCRPID b0
-      CHANNEL ID 10c NAME "MM25" SATID ffffff TPID 1644 SID 2c47 TYPE 0 APID 271 PCRPID b0
-      CHANNEL ID 10d NAME "MM26" SATID ffffff TPID 1644 SID 2c48 TYPE 0 APID 272 PCRPID b0
-      CHANNEL ID 10e NAME "MM27" SATID ffffff TPID 1644 SID 2c49 TYPE 0 APID 273 PCRPID b0
-      CHANNEL ID 10f NAME "MM28" SATID ffffff TPID 1644 SID 2c4a TYPE 0 APID 274 PCRPID b0
-      CHANNEL ID 110 NAME "MM29" SATID ffffff TPID 1644 SID 2c4b TYPE 0 APID 275 PCRPID b0
-      CHANNEL ID 111 NAME "MM30" SATID ffffff TPID 1644 SID 2c4c TYPE 0 APID 276 PCRPID b0
-      CHANNEL ID 112 NAME "RCAP" SATID ffffff TPID 1644 SID 2c4d TYPE 1 APID 277 PCRPID b0
-      CHANNEL ID 113 NAME "R105" SATID ffffff TPID 1644 SID 2c4e TYPE 0 APID 278 PCRPID b0
-      CHANNEL ID 114 NAME "RDJ" SATID ffffff TPID 1644 SID 2c4f TYPE 0 APID 279 PCRPID b0
-      CHANNEL ID 115 NAME "RITA" SATID ffffff TPID 1644 SID 2c50 TYPE 0 APID 27a PCRPID b0
-      CHANNEL ID 116 NAME "RMC" SATID ffffff TPID 1644 SID 2c51 TYPE 0 APID 27b PCRPID b0
-      CHANNEL ID 117 NAME "R101" SATID ffffff TPID 1644 SID 2c52 TYPE 0 APID 27c PCRPID b0
-      CHANNEL ID 118 NAME "RRAD" SATID ffffff TPID 1644 SID 2c53 TYPE 0 APID 27d PCRPID b0
-      CHANNEL ID 119 NAME "RR" SATID ffffff TPID 1644 SID 2c54 TYPE 0 APID 27e PCRPID b0
-      CHANNEL ID 11a SATID ffffff TPID 1644 SID 2c61 TYPE 0 APID 259 APID 25a APID 25b APID 25c APID 25d APID 25e APID 25f APID 260 APID 261 APID 262 PCRPID b0
-      CHANNEL ID 11b SATID ffffff TPID 1644 SID 2c62 TYPE 0 APID 263 APID 264 APID 265 APID 266 APID 267 APID 268 APID 269 APID 26a APID 26b APID 26c PCRPID b0
-      CHANNEL ID 11c SATID ffffff TPID 1644 SID 2c63 TYPE 0 APID 26d APID 26e APID 26f APID 270 APID 271 APID 272 APID 273 APID 274 APID 275 APID 276 PCRPID b0
-      CHANNEL ID 11d SATID ffffff TPID 1644 SID 2c64 TYPE 0 APID 277 APID 278 APID 279 APID 27a APID 27b APID 27c APID 27d APID 27e PCRPID b0
-      CHANNEL ID 11e NAME "MULTIMUSICA" SATID ffffff TPID 1644 SID 2c58 TYPE 1 PCRPID b0
-      CHANNEL ID 11f NAME "RADIO" SATID ffffff TPID 1644 SID 2c59 TYPE 1 PCRPID b0
-      CHANNEL ID 120 NAME "MULTIMUSIC 1" SATID ffffff TPID 1644 SID 2c65 TYPE 1 APID 262 APID 259 APID 25a APID 25b APID 25c APID 25d APID 25e APID 25f APID 260 APID 261 PCRPID b0
-      CHANNEL ID 121 NAME "MULTIMUSIC 2" SATID ffffff TPID 1644 SID 2c66 TYPE 1 APID 265 APID 266 APID 267 APID 263 APID 264 APID 268 APID 269 APID 26a APID 26b APID 26c PCRPID b0
-    TRANSPONDER ID 16a8 SATID 0000 TYPE 1 FREQ 12713000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 122 SATID ffffff TPID 16a8 SID fffe TYPE 0
-      CHANNEL ID 123 NAME "TEAM" SATID ffffff TPID 16a8 SID e1a TYPE 1 VPID 901 PCRPID 900
-      CHANNEL ID 124 NAME "SINT" SATID ffffff TPID 16a8 SID e1d TYPE 1
-      CHANNEL ID 125 NAME "VIAG" SATID ffffff TPID 16a8 SID e20 TYPE 1 VPID 904 PCRPID 900
-      CHANNEL ID 126 NAME "SINT" SATID ffffff TPID 16a8 SID e23 TYPE 1
-      CHANNEL ID 127 NAME "EURO" SATID ffffff TPID 16a8 SID e26 TYPE 1 VPID 907 PCRPID 900
-      CHANNEL ID 128 NAME "SINT" SATID ffffff TPID 16a8 SID e27 TYPE 1
-      CHANNEL ID 129 NAME "CNN" SATID ffffff TPID 16a8 SID e29 TYPE 1 VPID 981 PCRPID 980
-      CHANNEL ID 12a NAME "ante prima" SATID ffffff TPID 16a8 SID e2c TYPE 1 VPID 983 PCRPID 980
-      CHANNEL ID 12b NAME "SNAI" SATID ffffff TPID 16a8 SID e2e TYPE 1 VPID a01 PCRPID a00
-      CHANNEL ID 12c NAME "MPPV" SATID ffffff TPID 16a8 SID e30 TYPE 1 VPID a03 PCRPID a00
-      CHANNEL ID 12d NAME "MC04" SATID ffffff TPID 16a8 SID e34 TYPE 1 APID a80 PCRPID a80
-      CHANNEL ID 12e NAME "MC05" SATID ffffff TPID 16a8 SID e35 TYPE 1 APID a81 PCRPID a81
-      CHANNEL ID 12f NAME "MC06" SATID ffffff TPID 16a8 SID e36 TYPE 1 APID a82 PCRPID a82
-      CHANNEL ID 130 NAME "MC07" SATID ffffff TPID 16a8 SID e39 TYPE 1 APID a83 PCRPID a83
-      CHANNEL ID 131 NAME "MC08" SATID ffffff TPID 16a8 SID e3c TYPE 1 APID a84 PCRPID a84
-      CHANNEL ID 132 NAME "MC09" SATID ffffff TPID 16a8 SID e3f TYPE 1 APID a85 PCRPID a85
-      CHANNEL ID 133 NAME "MC10" SATID ffffff TPID 16a8 SID e42 TYPE 1 APID a86 PCRPID a86
-      CHANNEL ID 134 NAME "MC11" SATID ffffff TPID 16a8 SID e45 TYPE 1 APID a87 PCRPID a87
-      CHANNEL ID 135 NAME "MC12" SATID ffffff TPID 16a8 SID e48 TYPE 1 APID a88 PCRPID a88
-      CHANNEL ID 136 NAME "MC13" SATID ffffff TPID 16a8 SID e4b TYPE 1 APID a89 PCRPID a89
-      CHANNEL ID 137 NAME "MC14" SATID ffffff TPID 16a8 SID e4e TYPE 1 APID a8a PCRPID a8a
-      CHANNEL ID 138 NAME "MC15" SATID ffffff TPID 16a8 SID e51 TYPE 1 APID a8b PCRPID a8b
-      CHANNEL ID 139 NAME "MC16" SATID ffffff TPID 16a8 SID e54 TYPE 1 APID a8c PCRPID a8c
-      CHANNEL ID 13a NAME "MC17" SATID ffffff TPID 16a8 SID e57 TYPE 1 APID a8d PCRPID a8d
-      CHANNEL ID 13b NAME "MC18" SATID ffffff TPID 16a8 SID e5a TYPE 1 APID a8e PCRPID a8e
-    TRANSPONDER ID 170c SATID 0000 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 13c NAME "MOSAICO D+" SATID ffffff TPID 170c SID 2c89 TYPE 1 VPID a1 APID 55 APID 51 APID 50 APID 54 PCRPID af
-      CHANNEL ID 13d NAME " MILAN CH." SATID ffffff TPID 170c SID 2c8b TYPE 1 VPID a2 APID 58 APID 59 PCRPID af
-      CHANNEL ID 13e NAME " INTER CH." SATID ffffff TPID 170c SID 2c8d TYPE 1 VPID a3 APID 5c APID 5d PCRPID af
-      CHANNEL ID 13f NAME "TST3" SATID ffffff TPID 170c SID 2c8f TYPE 1 PCRPID af
-    TRANSPONDER ID 1770 SATID 0000 TYPE 1 FREQ 11919280 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 140 NAME " I1" SATID ffffff TPID 1770 SID 1 TYPE 1 VPID 200 APID 28a TTPID 240 PCRPID 1ffe
-      CHANNEL ID 141 NAME " C5" SATID ffffff TPID 1770 SID 2 TYPE 1 VPID 201 APID 294 TTPID 241 PCRPID 1ffe
-      CHANNEL ID 142 NAME " R4" SATID ffffff TPID 1770 SID 3 TYPE 1 VPID 202 APID 29e TTPID 242 PCRPID 1ffe
-      CHANNEL ID 143 NAME "Test" SATID ffffff TPID 1770 SID 4 TYPE 1 VPID 203 APID 2a8 TTPID 243 PCRPID 1ffe
-    TRANSPONDER ID 003d SATID 0000 TYPE 1 FREQ 11938000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 144 NAME "NTV" SATID ffffff TPID 3d SID 1bc1 TYPE 1 VPID a4 APID 58 APID 59 PCRPID a4
-      CHANNEL ID 145 NAME "NTV-PLUS" SATID ffffff TPID 3d SID 1bc2 TYPE 1 VPID a5 APID 5a APID 5b PCRPID a5
-      CHANNEL ID 146 NAME "NTV Int.-HTB" SATID ffffff TPID 3d SID 1bbd TYPE 1 VPID a0 APID 50 PCRPID a0
-      CHANNEL ID 147 NAME "NTV Int.-Nashe Kino" SATID ffffff TPID 3d SID 1bbe TYPE 1 VPID a1 APID 52 PCRPID a1
-      CHANNEL ID 148 NAME "NTV Int.-Detsk. Mir" SATID ffffff TPID 3d SID 1bbf TYPE 1 VPID a2 APID 54 PCRPID a2
-    TRANSPONDER ID 1838 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 149 NAME "DISNEY CHANNEL" SATID ffffff TPID 1838 SID 2a95 TYPE 1 PCRPID a0
-      CHANNEL ID 14a NAME "DISCOVERY" SATID ffffff TPID 1838 SID 2a97 TYPE 1 VPID a1 PCRPID a1
-      CHANNEL ID 14b NAME "EUSP" SATID ffffff TPID 1838 SID 2a99 TYPE 1 VPID a2 APID 58 APID 59 PCRPID a2
-      CHANNEL ID 14c NAME "HAPPY CHANNEL" SATID ffffff TPID 1838 SID 2a9b TYPE 1 PCRPID a3
-      CHANNEL ID 14d NAME "MATCH MUSIC" SATID ffffff TPID 1838 SID 2a9d TYPE 1 PCRPID a4
-      CHANNEL ID 14e NAME "MTV" SATID ffffff TPID 1838 SID 2a9f TYPE 1 PCRPID a5
-      CHANNEL ID 14f NAME "R/CINEMA RAISAT" SATID ffffff TPID 1838 SID 2aa1 TYPE 1 PCRPID a6
-    TRANSPONDER ID 189c SATID 0000 TYPE 1 FREQ 12713000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 150 SATID ffffff TPID 189c SID fffe TYPE 0
-      CHANNEL ID 151 NAME "cine stream" SATID ffffff TPID 189c SID 1e18 TYPE 1 VPID 200 APID 28a PCRPID 1ffe
-      CHANNEL ID 152 NAME "cine movie" SATID ffffff TPID 189c SID 1e1b TYPE 1 VPID 202 APID 29e PCRPID 1ffe
-    TRANSPONDER ID 1900 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 153 NAME "CLASSICA" SATID ffffff TPID 1900 SID 2af9 TYPE 1 PCRPID a0
-      CHANNEL ID 154 NAME "R/GAM ROS RAISAT" SATID ffffff TPID 1900 SID 2afb TYPE 1 PCRPID a1
-      CHANNEL ID 155 NAME "R/ALBUM RAISAT" SATID ffffff TPID 1900 SID 2afd TYPE 1 PCRPID a2
-      CHANNEL ID 156 NAME "HALLMARK" SATID ffffff TPID 1900 SID 2aff TYPE 1 VPID a3 PCRPID a3
-      CHANNEL ID 157 NAME "R/ART RAISAT" SATID ffffff TPID 1900 SID 2b01 TYPE 1 PCRPID a4
-      CHANNEL ID 158 NAME "TST1" SATID ffffff TPID 1900 SID 2b03 TYPE 1 PCRPID a5
-      CHANNEL ID 159 NAME "TMC" SATID ffffff TPID 1900 SID 2b05 TYPE 1 VPID a6 PCRPID a6
-      CHANNEL ID 15a NAME "TMC2" SATID ffffff TPID 1900 SID 2b07 TYPE 1 VPID a7 PCRPID a7
-    TRANSPONDER ID 1964 SATID 0000 TYPE 1 FREQ 12015000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 15b NAME "ART VARIETY" SATID ffffff TPID 1964 SID 19a TYPE 1 VPID a0 PCRPID a0
-      CHANNEL ID 15c NAME "ART CHILDREN" SATID ffffff TPID 1964 SID 1a4 TYPE 1 VPID a1 PCRPID a1
-      CHANNEL ID 15d NAME "ART MOVIES" SATID ffffff TPID 1964 SID 1ae TYPE 1 VPID a2 PCRPID a2
-      CHANNEL ID 15e NAME "ART MUSIC" SATID ffffff TPID 1964 SID 1b8 TYPE 1 VPID a3 PCRPID a3
-      CHANNEL ID 15f NAME "ART EUROPE" SATID ffffff TPID 1964 SID 1c2 TYPE 0 VPID a4 PCRPID a4
-      CHANNEL ID 160 NAME "LBC EUROPE" SATID ffffff TPID 1964 SID 1cc TYPE 1 VPID a5 PCRPID a5
-      CHANNEL ID 161 NAME "EGYPT SAT. CH. 2" SATID ffffff TPID 1964 SID 1d6 TYPE 1 VPID a6 PCRPID a6
-      CHANNEL ID 162 NAME "ART SPORT" SATID ffffff TPID 1964 SID 1d8 TYPE 1 VPID a7 PCRPID a7
-      CHANNEL ID 163 NAME "IQRA" SATID ffffff TPID 1964 SID 1da TYPE 1 VPID a8 PCRPID a8
-    TRANSPONDER ID 19c8 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 164 NAME "T+ BIANCO" SATID ffffff TPID 19c8 SID 2b5d TYPE 1 VPID a0 APID 50 APID 51 TTPID 2c PCRPID a0
-      CHANNEL ID 165 NAME "T+ NERO" SATID ffffff TPID 19c8 SID 2b5f TYPE 1 VPID a1 APID 54 APID 55 TTPID 2d PCRPID a1
-      CHANNEL ID 166 NAME "T+ GRIGIO" SATID ffffff TPID 19c8 SID 2b61 TYPE 1 VPID a2 APID 58 APID 59 PCRPID a2
-      CHANNEL ID 167 NAME "R4" SATID ffffff TPID 19c8 SID 18 TYPE 1 VPID a3 PCRPID a3
-      CHANNEL ID 168 NAME "16:9 TELE+" SATID ffffff TPID 19c8 SID 2b63 TYPE 1 VPID a4 APID 60 APID 61 PCRPID a4
-      CHANNEL ID 169 NAME "VETRINA D+" SATID ffffff TPID 19c8 SID 2b65 TYPE 1 PCRPID a5
-      CHANNEL ID 16a NAME "R/RAGAZZI RAISAT" SATID ffffff TPID 19c8 SID 2b67 TYPE 1 PCRPID a6
-    TRANSPONDER ID 1a2c SATID 0000 TYPE 1 FREQ 12341001 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 16b NAME "CNN" SATID ffffff TPID 1a2c SID 2ced TYPE 1 PCRPID af
-      CHANNEL ID 16c NAME "BBC" SATID ffffff TPID 1a2c SID 2cef TYPE 1 PCRPID af
-      CHANNEL ID 16d NAME "BLOOMBERG" SATID ffffff TPID 1a2c SID 2cf1 TYPE 1 PCRPID af
-      CHANNEL ID 16e NAME "CNBC" SATID ffffff TPID 1a2c SID 2cf3 TYPE 1 PCRPID af
-      CHANNEL ID 16f NAME "SKYNews" SATID ffffff TPID 1a2c SID 2cf5 TYPE 1 PCRPID af
-      CHANNEL ID 170 NAME "TST2" SATID ffffff TPID 1a2c SID 2cf7 TYPE 1 PCRPID af
-      CHANNEL ID 171 NAME "TV5" SATID ffffff TPID 1a2c SID 2cf9 TYPE 1 PCRPID af
-      CHANNEL ID 172 NAME "EPG" SATID ffffff TPID 1a2c SID 2cfb TYPE 1 PCRPID af
-      CHANNEL ID 173 NAME "CNN" SATID ffffff TPID 1a2c SID 2cfd TYPE 1 VPID a0 APID 50 PCRPID af
-      CHANNEL ID 174 NAME "CNBC" SATID ffffff TPID 1a2c SID 2cff TYPE 1 VPID a3 APID 5c PCRPID af
-      CHANNEL ID 175 NAME "TV5" SATID ffffff TPID 1a2c SID 2d01 TYPE 1 VPID a6 APID 68 PCRPID af
-      CHANNEL ID 176 NAME "BBC WORLD" SATID ffffff TPID 1a2c SID 2d03 TYPE 1 VPID a1 APID 54 PCRPID af
-      CHANNEL ID 177 SATID ffffff TPID 1a2c SID 2d4b TYPE 0 PCRPID 1ffe
-      CHANNEL ID 178 SATID ffffff TPID 1a2c SID 26fc TYPE 0 PCRPID 1ffe
-      CHANNEL ID 179 SATID ffffff TPID 1a2c SID 26fd TYPE 0 PCRPID 1ffe
-    TRANSPONDER ID 3264 SATID 0000 TYPE 1 FREQ 11095910 POL V SRATE 27500000 FEC 8
-      CHANNEL ID ffffffff NAME "Telekom TV" SATID ffffff TPID 3264 SID e7f TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "FantasticOverOpal" SATID ffffff TPID 3264 SID e80 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "Gilat" SATID ffffff TPID 3264 SID e81 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "Siemens TV" SATID ffffff TPID 3264 SID e84 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "S-TV" SATID ffffff TPID 3264 SID e85 TYPE 0 VPID 20 PCRPID 20
-      CHANNEL ID ffffffff NAME "Optibase Encoder" SATID ffffff TPID 3264 SID e86 TYPE 0 VPID 20 PCRPID 20
-    TRANSPONDER ID 1af4 SATID 0000 TYPE 1 FREQ 12091901 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 17a NAME "Bolsa" SATID ffffff TPID 1af4 SID 222e TYPE 0
-      CHANNEL ID 17b NAME "Testw" SATID ffffff TPID 1af4 SID 222f TYPE 0
-      CHANNEL ID 17c NAME "SIRE" SATID ffffff TPID 1af4 SID 2230 TYPE 0 PCRPID 102
-      CHANNEL ID 17d NAME "Telesierra" SATID ffffff TPID 1af4 SID 2200 TYPE 0 VPID 1040 APID 1041 PCRPID 1040
-      CHANNEL ID 17e NAME "vtv" SATID ffffff TPID 1af4 SID 21fd TYPE 0 VPID 1010 APID 1012 APID 1011 APID 1013 PCRPID 1010
-      CHANNEL ID 17f NAME "Satisfaction" SATID ffffff TPID 1af4 SID 2202 TYPE 0 VPID 1060 APID 1061 PCRPID 1060
-      CHANNEL ID 180 NAME "C. Milagro" SATID ffffff TPID 1af4 SID 2207 TYPE 0 VPID 1110 APID 1111 PCRPID 1110
-      CHANNEL ID 181 NAME "Fiesta" SATID ffffff TPID 1af4 SID 2210 TYPE 0 VPID 1150 APID 1151 APID 1152 PCRPID 1150
-      CHANNEL ID 182 NAME "TVE Internacional" SATID ffffff TPID 1af4 SID 2203 TYPE 0 VPID 1070 APID 1071 PCRPID 1070
-      CHANNEL ID 183 NAME "TV Galicia" SATID ffffff TPID 1af4 SID 2204 TYPE 0 APID 1090 PCRPID 1090
-      CHANNEL ID 184 NAME "Radio Gallega" SATID ffffff TPID 1af4 SID 2205 TYPE 0 APID 1090 PCRPID 1090
-      CHANNEL ID 185 NAME "Retelsat" SATID ffffff TPID 1af4 SID 2212 TYPE 1 VPID 1170 APID 1171 PCRPID 1170
-      CHANNEL ID 186 NAME "Musicam 1" SATID ffffff TPID 1af4 SID 2209 TYPE 1 APID 1136 PCRPID 1136
-      CHANNEL ID 187 NAME "Musicam 2" SATID ffffff TPID 1af4 SID 220a TYPE 1 APID 1133 PCRPID 1133
-      CHANNEL ID 188 NAME "Musicam 3" SATID ffffff TPID 1af4 SID 220b TYPE 1 APID 1136 PCRPID 1136
-      CHANNEL ID 189 NAME "Musicam 4" SATID ffffff TPID 1af4 SID 220c TYPE 1 APID 1132 PCRPID 1132
-      CHANNEL ID 18a NAME "Musicam 5" SATID ffffff TPID 1af4 SID 220d TYPE 1 APID 1136 PCRPID 1136
-    TRANSPONDER ID 1b58 SATID 0000 TYPE 1 FREQ 12673000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 18b NAME "HBCH FUCINO" SATID ffffff TPID 1b58 SID 2bd TYPE 0 VPID c8 APID c9 PCRPID c8
-      CHANNEL ID 18c NAME "NTVi" SATID ffffff TPID 1b58 SID 2be TYPE 0 VPID d2 APID d3 APID d4 PCRPID d2
-      CHANNEL ID 18d NAME "Test Telespazio" SATID ffffff TPID 1b58 SID 2bf TYPE 0 VPID dc APID dd PCRPID dc
-      CHANNEL ID 18e NAME "Test Telespazio" SATID ffffff TPID 1b58 SID 2c0 TYPE 0 VPID e6 APID e7 PCRPID e6
-      CHANNEL ID 18f NAME "ARMENIA TV" SATID ffffff TPID 1b58 SID 2c1 TYPE 0 VPID f0 APID f1 APID f2 PCRPID f0
-      CHANNEL ID 190 NAME "MEDNET" SATID ffffff TPID 1b58 SID 2c3 TYPE 0 VPID 104 APID 105 PCRPID 104
-      CHANNEL ID 191 NAME "AL JAZEERA" SATID ffffff TPID 1b58 SID 2c4 TYPE 0 VPID 10e APID 10f PCRPID 10e
-      CHANNEL ID 192 NAME "TIRRENO SAT" SATID ffffff TPID 1b58 SID 2c5 TYPE 0 VPID 118 APID 12d TTPID 139 PCRPID 118
-      CHANNEL ID 193 NAME "RADIO ROCK" SATID ffffff TPID 1b58 SID 2c7 TYPE 0 APID d4 PCRPID d2
-      CHANNEL ID 194 NAME "RADIO ARMENIA" SATID ffffff TPID 1b58 SID 2c8 TYPE 0 APID f2 PCRPID f0
-      CHANNEL ID 195 NAME "Coming Soon TV" SATID ffffff TPID 1b58 SID 2cd TYPE 0 APID 28 PCRPID 28
-    TRANSPONDER ID 1c20 SATID 0000 TYPE 1 FREQ 12149000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 196 NAME "AH-EDP1" SATID ffffff TPID 1c20 SID 1c21 TYPE 0 VPID 60 APID 61 PCRPID 60
-      CHANNEL ID 197 NAME "AH-EDP2" SATID ffffff TPID 1c20 SID 1c22 TYPE 0 VPID 70 APID 71 PCRPID 70
-      CHANNEL ID 198 NAME "AH-EDP3" SATID ffffff TPID 1c20 SID 1c23 TYPE 0 VPID 24 APID 25 PCRPID 24
-      CHANNEL ID 199 NAME "AH-EMP4-DATA" SATID ffffff TPID 1c20 SID 1c24 TYPE 0 PCRPID 92
-      CHANNEL ID 19a NAME "Alice" SATID ffffff TPID 1c20 SID 1c34 TYPE 0 VPID a0 APID a1 PCRPID a0
-      CHANNEL ID 19b NAME "Nuvolari" SATID ffffff TPID 1c20 SID 1c35 TYPE 0 VPID b0 APID b1 PCRPID b0
-      CHANNEL ID 19c NAME "Leonardo" SATID ffffff TPID 1c20 SID 1c36 TYPE 0 VPID 80 APID 81 PCRPID 80
-    TRANSPONDER ID 1c84 SATID 0000 TYPE 1 FREQ 12169000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 19d NAME "Discovery" SATID ffffff TPID 1c84 SID 15f TYPE 1 VPID 200 PCRPID 1ffe
-      CHANNEL ID 19e NAME "R9" SATID ffffff TPID 1c84 SID 160 TYPE 1 VPID 201 PCRPID 1ffe
-      CHANNEL ID 19f NAME "BBC World" SATID ffffff TPID 1c84 SID 161 TYPE 1 VPID 202 PCRPID 1ffe
-      CHANNEL ID 1a0 NAME "CNN" SATID ffffff TPID 1c84 SID 162 TYPE 1 VPID 203 PCRPID 1ffe
-      CHANNEL ID 1a1 NAME "CCTV" SATID ffffff TPID 1c84 SID 163 TYPE 0 VPID 204 PCRPID 1ffe
-      CHANNEL ID 1a2 NAME "R10" SATID ffffff TPID 1c84 SID 165 TYPE 1 VPID 206 PCRPID 1ffe
-      CHANNEL ID 1a3 NAME "R8" SATID ffffff TPID 1c84 SID 166 TYPE 1 VPID 207 PCRPID 1ffe
-      CHANNEL ID 1a4 NAME "FILM SAT" SATID ffffff TPID 1c84 SID 167 TYPE 1 VPID 208 PCRPID 1ffe
-      CHANNEL ID 1a5 NAME "Cartoon" SATID ffffff TPID 1c84 SID 168 TYPE 1 VPID 203 PCRPID 1ffe
-      CHANNEL ID 1a6 NAME "Promo" SATID ffffff TPID 1c84 SID 169 TYPE 0 VPID 209 PCRPID 1ffe
-      CHANNEL ID 1a7 NAME "Tempo" SATID ffffff TPID 1c84 SID 16a TYPE 1 VPID 5a0 APID 28b PCRPID f80
-      CHANNEL ID 1a8 NAME "Tempo" SATID ffffff TPID 1c84 SID 16b TYPE 1 APID 295 PCRPID f80
-      CHANNEL ID 1a9 NAME "Tempo" SATID ffffff TPID 1c84 SID 16c TYPE 1 APID 29f PCRPID f80
-      CHANNEL ID 1aa NAME "Tempo" SATID ffffff TPID 1c84 SID 16d TYPE 1 APID 2a9 PCRPID f80
-      CHANNEL ID 1ab NAME "Tempo" SATID ffffff TPID 1c84 SID 16e TYPE 1 APID 2b3 PCRPID f80
-      CHANNEL ID 1ac NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 16f TYPE 1 PCRPID 1080
-      CHANNEL ID 1ad NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 171 TYPE 1 PCRPID 1080
-      CHANNEL ID 1ae NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 172 TYPE 1 PCRPID 1080
-      CHANNEL ID 1af NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 173 TYPE 1 VPID 42b PCRPID 1080
-      CHANNEL ID 1b0 NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 174 TYPE 1 PCRPID 1080
-      CHANNEL ID 1b1 NAME "NOVA INFO" SATID ffffff TPID 1c84 SID 175 TYPE 1 PCRPID 1080
-      CHANNEL ID 1b2 NAME "NOVA Cinema" SATID ffffff TPID 1c84 SID 176 TYPE 1 PCRPID 1080
-      CHANNEL ID 1b3 NAME "NET" SATID ffffff TPID 1c84 SID 178 TYPE 1 VPID 201 PCRPID 1ffe
-      CHANNEL ID 1b4 NAME "MAD T.V" SATID ffffff TPID 1c84 SID 179 TYPE 1 VPID 206 PCRPID 1ffe
-      CHANNEL ID 1b5 NAME "ET-1" SATID ffffff TPID 1c84 SID 17a TYPE 1 VPID 207 PCRPID 1ffe
-      CHANNEL ID 1b6 SATID ffffff TPID 1c84 SID 17b TYPE 0 PCRPID 1000
-      CHANNEL ID 1b7 NAME "�����" SATID ffffff TPID 1c84 SID 180 TYPE 0 VPID 205 PCRPID 1ffe
-    TRANSPONDER ID 0131 SATID 0000 TYPE 1 FREQ 12188000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 0132 SATID 0000 TYPE 1 FREQ 12203000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 0133 SATID 0000 TYPE 1 FREQ 12211000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 004d SATID 0000 TYPE 1 FREQ 12264500 POL V SRATE 27500000 FEC 8
-      CHANNEL ID ffffffff NAME "Deutsche Bank / T1" SATID ffffff TPID 4d SID 1 TYPE 1 VPID 488 PCRPID 488
-      CHANNEL ID 7f NAME "Animal Planet" SATID ffffff TPID 4d SID a TYPE 1 VPID 488 PCRPID 488
-      CHANNEL ID 80 NAME "Discovery E Europe-English" SATID ffffff TPID 4d SID 14 TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID ffffffff NAME "Wuerth KG / T21" SATID ffffff TPID 4d SID 15 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 82 NAME "Discovery Italy" SATID ffffff TPID 4d SID 1e TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID ffffffff NAME "BTI / T31" SATID ffffff TPID 4d SID 1f TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 84 NAME "Discovery Russia" SATID ffffff TPID 4d SID 28 TYPE 1 VPID 5b4 PCRPID 5b4
-      CHANNEL ID ffffffff NAME "K-TV (MetroMux) / T41" SATID ffffff TPID 4d SID 29 TYPE 1 VPID 7a8 PCRPID 7a8
-      CHANNEL ID 86 NAME "Animal Planet EE" SATID ffffff TPID 4d SID 32 TYPE 1 VPID 618 PCRPID 618
-      CHANNEL ID 87 NAME "Animal Planet - Russian" SATID ffffff TPID 4d SID 33 TYPE 1 VPID 618 PCRPID 618
-      CHANNEL ID 88 NAME "Discovery Netherlands" SATID ffffff TPID 4d SID 3c TYPE 1 VPID 67c PCRPID 67c
-      CHANNEL ID ffffffff NAME "Q English" SATID ffffff TPID 4d SID 46 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 8a NAME "Travel and Adventure" SATID ffffff TPID 4d SID 50 TYPE 1 VPID 744 PCRPID 744
-      CHANNEL ID 8b NAME "Travel and Adventure- Russian" SATID ffffff TPID 4d SID 51 TYPE 1 VPID 744 PCRPID 744
-      CHANNEL ID 8c NAME "New DCP" SATID ffffff TPID 4d SID 12c TYPE 1 APID 4c4 PCRPID 4c4
-      CHANNEL ID 8d NAME "CCP" SATID ffffff TPID 4d SID 12d TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID ffffffff NAME "Deutsche Bank / T2" SATID ffffff TPID 4d SID 2 TYPE 1 VPID 4ec PCRPID 4ec
-      CHANNEL ID 93 NAME "Channel Three" SATID ffffff TPID 4d SID 3 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 94 NAME "Channel Four" SATID ffffff TPID 4d SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 95 NAME "Channel Five" SATID ffffff TPID 4d SID 5 TYPE 0 VPID 618 PCRPID 618
-      CHANNEL ID 96 NAME "Channel 6 = Sat 7 Arabic" SATID ffffff TPID 4d SID 6 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 97 NAME "Channel Seven" SATID ffffff TPID 4d SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 98 NAME "Q German" SATID ffffff TPID 4d SID 47 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 99 NAME "Q French" SATID ffffff TPID 4d SID 48 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 9a NAME "Q Dutch" SATID ffffff TPID 4d SID 49 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 1b8 NAME "DTAG / T11" SATID ffffff TPID 4d SID b TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1b9 NAME "DTAG 50 / T12" SATID ffffff TPID 4d SID c TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1ba NAME "Telekom TV" SATID ffffff TPID 4d SID d TYPE 1 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 1bb NAME "Gerling / T26" SATID ffffff TPID 4d SID 1a TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bc NAME "Hornbach-D / T36" SATID ffffff TPID 4d SID 24 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bd NAME "Hornbach-NL / T38" SATID ffffff TPID 4d SID 26 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1be NAME "Hornbach-CZ / T39" SATID ffffff TPID 4d SID 27 TYPE 1 VPID 550 PCRPID 550
-      CHANNEL ID 1bf NAME "Testkanal" SATID ffffff TPID 4d SID 63 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 1c0 NAME "KENCAST" SATID ffffff TPID 4d SID 6f TYPE 0 PCRPID 42e
-    TRANSPONDER ID 1f40 SATID 0000 TYPE 1 FREQ 12302880 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 1c1 NAME "SLO-TV1" SATID ffffff TPID 1f40 SID c81 TYPE 1 VPID c8 PCRPID c8
-      CHANNEL ID 1c2 NAME "SLO-TV2" SATID ffffff TPID 1f40 SID c82 TYPE 1 VPID cb PCRPID cb
-      CHANNEL ID 1c3 NAME "POLONIA 1" SATID ffffff TPID 1f40 SID c83 TYPE 0 VPID cd PCRPID cd
-      CHANNEL ID 1c4 NAME "SLO-RA1-INF" SATID ffffff TPID 1f40 SID c84 TYPE 0 APID fa PCRPID fa
-      CHANNEL ID 1c5 NAME "SLO-RA2" SATID ffffff TPID 1f40 SID c85 TYPE 0 APID fb PCRPID fb
-      CHANNEL ID 1c6 NAME "SLO-RA3" SATID ffffff TPID 1f40 SID c86 TYPE 0 APID fc PCRPID fc
-      CHANNEL ID 1c7 NAME "SUPER 1" SATID ffffff TPID 1f40 SID c87 TYPE 0 VPID cf PCRPID cf
-      CHANNEL ID 1c8 NAME "NAPOLI INT." SATID ffffff TPID 1f40 SID c8a TYPE 0 VPID f0 PCRPID f0
-      CHANNEL ID 1c9 NAME "MAGIC" SATID ffffff TPID 1f40 SID c8b TYPE 0 VPID f5 PCRPID f5
-      CHANNEL ID 1ca NAME "COUNTDOWN" SATID ffffff TPID 1f40 SID c8c TYPE 0 VPID eb PCRPID eb
-      CHANNEL ID 1cb NAME "TBNE" SATID ffffff TPID 1f40 SID c8d TYPE 0 VPID e6 PCRPID e6
-      CHANNEL ID 1cc NAME "SICILSAT" SATID ffffff TPID 1f40 SID c8e TYPE 0 VPID e1 PCRPID e1
-    TRANSPONDER ID 1fa4 SATID 0000 TYPE 1 FREQ 10892000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 1cd NAME "TVP1" SATID ffffff TPID 1fa4 SID 1 TYPE 1 VPID 101 APID 102 APID 17df TTPID 103 PCRPID 101
-      CHANNEL ID 1ce NAME "TVP2" SATID ffffff TPID 1fa4 SID 2 TYPE 1 VPID 141 APID 142 PCRPID 141
-      CHANNEL ID 1cf NAME "POLSAT1" SATID ffffff TPID 1fa4 SID 3 TYPE 1
-      CHANNEL ID 1d0 NAME "TV4" SATID ffffff TPID 1fa4 SID 4 TYPE 1 VPID 101 APID 102 APID 17df TTPID 103 PCRPID 101
-      CHANNEL ID 1d1 NAME "POLSAT2" SATID ffffff TPID 1fa4 SID 5 TYPE 1 VPID 141 APID 142 PCRPID 141
-      CHANNEL ID 1d2 NAME "WOT" SATID ffffff TPID 1fa4 SID 6 TYPE 1
-      CHANNEL ID 1d3 NAME "DISCOVERY" SATID ffffff TPID 1fa4 SID f TYPE 1 VPID 101 APID 102 APID 17df TTPID 103 PCRPID 101
-      CHANNEL ID 1d4 NAME "ANIMAL PLANET" SATID ffffff TPID 1fa4 SID 10 TYPE 1 VPID 141 APID 142 PCRPID 141
-      CHANNEL ID 1d5 NAME "EpgOpenTV" SATID ffffff TPID 1fa4 SID e66 TYPE 0
-    TRANSPONDER ID 2008 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 1d6 NAME "P10" SATID ffffff TPID 2008 SID 2d51 TYPE 1 VPID a0 APID 50 APID 51 PCRPID b0
-      CHANNEL ID 1d7 NAME "P11" SATID ffffff TPID 2008 SID 2d53 TYPE 1 VPID a1 APID 54 APID 55 PCRPID b0
-      CHANNEL ID 1d8 NAME "P12" SATID ffffff TPID 2008 SID 2d55 TYPE 1 VPID a2 APID 58 APID 59 PCRPID b0
-      CHANNEL ID 1d9 NAME "P13" SATID ffffff TPID 2008 SID 2d57 TYPE 1 VPID a3 APID 5c APID 5d PCRPID b0
-      CHANNEL ID 1da NAME "P14" SATID ffffff TPID 2008 SID 2d59 TYPE 1 VPID a4 APID 60 APID 61 PCRPID b0
-      CHANNEL ID 1db NAME "P15" SATID ffffff TPID 2008 SID 2d5b TYPE 1 VPID a5 APID 64 APID 65 PCRPID b0
-      CHANNEL ID 1dc NAME "P16" SATID ffffff TPID 2008 SID 2d5d TYPE 1 VPID a6 APID 68 APID 69 PCRPID b0
-      CHANNEL ID 1dd NAME "PREMIUM" SATID ffffff TPID 2008 SID 2d5f TYPE 1 PCRPID af
-      CHANNEL ID 1de NAME "+F1" SATID ffffff TPID 2008 SID 2d61 TYPE 1 VPID a0 APID 51 APID 298 PCRPID b0
-      CHANNEL ID 1df NAME "+F1" SATID ffffff TPID 2008 SID 2d63 TYPE 1 VPID a1 APID 29a APID 55 PCRPID b0
-      CHANNEL ID 1e0 NAME "+F1" SATID ffffff TPID 2008 SID 2d65 TYPE 1 VPID a2 APID 59 APID 29b PCRPID b0
-      CHANNEL ID 1e1 NAME "+F1" SATID ffffff TPID 2008 SID 2d67 TYPE 1 VPID a3 APID 5d APID 2a2 PCRPID b0
-      CHANNEL ID 1e2 NAME "+F1" SATID ffffff TPID 2008 SID 2d69 TYPE 1 VPID a4 APID 61 APID 60 PCRPID b0
-      CHANNEL ID 1e3 NAME "+F1" SATID ffffff TPID 2008 SID 2d6b TYPE 1 VPID a5 APID 65 APID 2a4 PCRPID b0
-      CHANNEL ID 1e4 NAME "+F1" SATID ffffff TPID 2008 SID 2d6d TYPE 1 VPID a6 APID 69 APID 29a PCRPID b0
-      CHANNEL ID 1e5 NAME "RMC" SATID ffffff TPID 2008 SID 2d6f TYPE 1 PCRPID b8
-      CHANNEL ID 1e6 NAME "R101" SATID ffffff TPID 2008 SID 2d70 TYPE 1 PCRPID b8
-      CHANNEL ID 1e7 NAME "RRAD" SATID ffffff TPID 2008 SID 2d71 TYPE 1 PCRPID b8
-    TRANSPONDER ID 206c SATID 0000 TYPE 1 FREQ 10892000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 1e8 NAME "ON" SATID ffffff TPID 206c SID 7 TYPE 1 VPID 161 APID 162 PCRPID 161
-      CHANNEL ID 1e9 NAME "DLA-CIEBIE" SATID ffffff TPID 206c SID 8 TYPE 1 VPID 211 APID 212 PCRPID 211
-      CHANNEL ID 1ea NAME "KOMEDIA" SATID ffffff TPID 206c SID 9 TYPE 1 VPID 161 APID 162 PCRPID 161
-      CHANNEL ID 1eb NAME "SMYK" SATID ffffff TPID 206c SID a TYPE 1 VPID 211 APID 212 PCRPID 211
-      CHANNEL ID 1ec NAME "RELAKS" SATID ffffff TPID 206c SID b TYPE 1 VPID 161 APID 162 PCRPID 161
-      CHANNEL ID 1ed NAME "INFO" SATID ffffff TPID 206c SID c TYPE 1 VPID 211 APID 212 PCRPID 211
-      CHANNEL ID 1ee NAME "POLSAT SPORT" SATID ffffff TPID 206c SID d TYPE 1 VPID 161 APID 162 PCRPID 161
-    TRANSPONDER ID 20d0 SATID 0000 TYPE 1 FREQ 12379000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 1ef NAME "Paris Premi�re" SATID ffffff TPID 20d0 SID bb9 TYPE 1 VPID bcd APID bd7 PCRPID bcd
-      CHANNEL ID 1f0 NAME "OCC HB3" SATID ffffff TPID 20d0 SID bba TYPE 0 VPID bce APID bd8 PCRPID bce
-      CHANNEL ID 1f1 NAME "TELE 24  Switzerland" SATID ffffff TPID 20d0 SID bbb TYPE 0 VPID bcf APID bd9 PCRPID bcf
-      CHANNEL ID 1f2 NAME "AIR MEDIA" SATID ffffff TPID 20d0 SID c0f TYPE 0 APID dd1 PCRPID dd1
-      CHANNEL ID 1f3 NAME "Abu Dhabi TV" SATID ffffff TPID 20d0 SID bbc TYPE 0 VPID bd0 APID bda PCRPID bd0
-      CHANNEL ID 1f4 NAME "EMIRAT FM 1" SATID ffffff TPID 20d0 SID c0b TYPE 0 APID dcd PCRPID dcd
-      CHANNEL ID 1f5 NAME "EMIRAT FM2" SATID ffffff TPID 20d0 SID c0c TYPE 0 APID dce PCRPID dce
-      CHANNEL ID 1f6 NAME "Radio Italia " SATID ffffff TPID 20d0 SID c09 TYPE 0 APID dcb PCRPID dcb
-      CHANNEL ID 1f7 NAME "EQUIDIA INTER." SATID ffffff TPID 20d0 SID beb TYPE 1 VPID cf9 APID d03 APID d0d APID d17 PCRPID cf9
-      CHANNEL ID 1f8 NAME "RTV MONTENEGRO" SATID ffffff TPID 20d0 SID bbe TYPE 0 VPID bd2 APID bdc PCRPID bd2
-      CHANNEL ID 1f9 NAME "Radio Montenegro" SATID ffffff TPID 20d0 SID c10 TYPE 0 APID dd2 PCRPID dd2
-      CHANNEL ID 1fa NAME "SERTE TEST" SATID ffffff TPID 20d0 SID bbd TYPE 0 VPID bd1 PCRPID bd1
-      CHANNEL ID 1fb NAME "GAME 1" SATID ffffff TPID 20d0 SID bbf TYPE 1 VPID bd3 APID bdd PCRPID bd3
-    TRANSPONDER ID 0055 SATID 0000 TYPE 1 FREQ 12398781 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 1fc NAME "SF 2" SATID ffffff TPID 55 SID 38b TYPE 1 VPID a3 APID 5c APID 5d TTPID 29 PCRPID a3
-      CHANNEL ID 1fd NAME "SRG SSR Sat Access" SATID ffffff TPID 55 SID 38e TYPE 0 VPID a5 APID 62 APID 63 TTPID 2f PCRPID a5
-      CHANNEL ID 1fe NAME "SF 1" SATID ffffff TPID 55 SID 385 TYPE 1 VPID a0 APID 50 APID 51 TTPID 20 PCRPID a0
-      CHANNEL ID 1ff NAME "TSR 1" SATID ffffff TPID 55 SID 386 TYPE 1 VPID a1 APID 54 APID 55 TTPID 23 PCRPID a1
-      CHANNEL ID 200 NAME "TSI 1" SATID ffffff TPID 55 SID 387 TYPE 1 VPID a2 APID 58 APID 59 TTPID 26 PCRPID a2
-      CHANNEL ID 201 NAME "TSR 2" SATID ffffff TPID 55 SID 38c TYPE 1 VPID a4 APID 60 APID 61 TTPID 2c PCRPID a4
-      CHANNEL ID 202 NAME "TSI 2" SATID ffffff TPID 55 SID 38d TYPE 1 VPID a6 APID 64 APID 65 TTPID 32 PCRPID a6
-      CHANNEL ID 203 NAME "OPTION MUSIQUE" SATID ffffff TPID 55 SID 3bd TYPE 0 APID cc PCRPID cc
-      CHANNEL ID 204 NAME "ESPACE 2" SATID ffffff TPID 55 SID 3be TYPE 0 APID cd PCRPID cd
-      CHANNEL ID 205 NAME "SRI-F-I" SATID ffffff TPID 55 SID 3b7 TYPE 0 APID c7 PCRPID c7
-      CHANNEL ID 206 NAME "SRI-EUROPA" SATID ffffff TPID 55 SID 3b9 TYPE 0 VPID 230 APID c8 PCRPID c8
-    TRANSPONDER ID 2198 SATID 0000 TYPE 1 FREQ 12341001 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 207 NAME "POLO" SATID ffffff TPID 2198 SID 2db5 TYPE 1 VPID a0 APID 50 PCRPID a0
-      CHANNEL ID 208 NAME "PLANETE" SATID ffffff TPID 2198 SID 2db7 TYPE 1 VPID a1 APID 54 PCRPID a1
-      CHANNEL ID 209 NAME "JIMMY" SATID ffffff TPID 2198 SID 2db9 TYPE 1 VPID a2 APID 58 PCRPID a2
-      CHANNEL ID 20a NAME "INN" SATID ffffff TPID 2198 SID 2dbb TYPE 1 VPID a3 APID 5c PCRPID a3
-      CHANNEL ID 20b NAME "CIN1" SATID ffffff TPID 2198 SID 2dbd TYPE 1 VPID a4 APID 60 PCRPID a4
-      CHANNEL ID 20c NAME "CIN2" SATID ffffff TPID 2198 SID 2dbf TYPE 1 VPID a5 APID 64 PCRPID a5
-      CHANNEL ID 20d NAME "CINC" SATID ffffff TPID 2198 SID 2dc1 TYPE 1 VPID a6 APID 68 PCRPID a6
-      CHANNEL ID 20e NAME "SEASONS" SATID ffffff TPID 2198 SID 2dc3 TYPE 1 VPID a7 APID 6c PCRPID a7
-      CHANNEL ID 20f NAME "WISHLINE" SATID ffffff TPID 2198 SID 2dc5 TYPE 1 VPID a8 APID 55 APID 5d APID 59 PCRPID a8
-      CHANNEL ID 210 NAME "MARCOPOLO" SATID ffffff TPID 2198 SID 2dc7 TYPE 1 VPID a0 APID 50 APID 51 PCRPID a0
-    TRANSPONDER ID 0049 SATID 0000 TYPE 1 FREQ 12436999 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 211 NAME "JAAM-E-JAM 1" SATID ffffff TPID 49 SID 1 TYPE 0 VPID a0 APID 50 APID 51 PCRPID a0
-      CHANNEL ID 212 NAME "JAAM-E-JAM 2" SATID ffffff TPID 49 SID 2 TYPE 0 VPID a1 APID 52 APID 53 TTPID 21 PCRPID a1
-      CHANNEL ID 213 NAME "SAHAR" SATID ffffff TPID 49 SID 3 TYPE 0 VPID a2 APID 54 APID 55 PCRPID a2
-      CHANNEL ID 214 NAME "TEST(SAHAR)" SATID ffffff TPID 49 SID 4 TYPE 0 VPID a3 APID 56 APID 57 PCRPID a3
-      CHANNEL ID 215 NAME "IRINN" SATID ffffff TPID 49 SID 5 TYPE 0 VPID a4 APID 58 APID 59 PCRPID a4
-      CHANNEL ID 216 NAME "TEST 2" SATID ffffff TPID 49 SID 6 TYPE 0 VPID a5 APID 5a PCRPID a5
-      CHANNEL ID 217 NAME "IRIB1 RADIO" SATID ffffff TPID 49 SID 7 TYPE 0 APID 51 PCRPID a0
-      CHANNEL ID 218 NAME "IRIB ARABIC /International 1 Radio" SATID ffffff TPID 49 SID 8 TYPE 0 APID 53 PCRPID a1
-    TRANSPONDER ID 013d SATID 0000 TYPE 1 FREQ 12460000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 013e SATID 0000 TYPE 1 FREQ 12484000 POL V SRATE 27500000 FEC 8
-    TRANSPONDER ID 22c4 SATID 0000 TYPE 1 FREQ 12475499 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 219 NAME "INT1 FAMILY RADIO" SATID ffffff TPID 22c4 SID 2977 TYPE 0 APID 3c1 PCRPID 3c1
-      CHANNEL ID 21a NAME "RADIO 74" SATID ffffff TPID 22c4 SID 2974 TYPE 0 APID 399 PCRPID 399
-      CHANNEL ID 21b NAME "R 74 INT." SATID ffffff TPID 22c4 SID 2975 TYPE 0 APID 3a3 PCRPID 3a3
-      CHANNEL ID 21c NAME "FAMILY Radio" SATID ffffff TPID 22c4 SID 2976 TYPE 0 APID 3b7 PCRPID 3b7
-      CHANNEL ID 21d NAME "Temp" SATID ffffff TPID 22c4 SID 296f TYPE 0 VPID 303 PCRPID 300
-      CHANNEL ID 21e NAME "SPREE Radio" SATID ffffff TPID 22c4 SID 299c TYPE 0 APID 1f5 PCRPID 1f5
-      CHANNEL ID 21f NAME " RVI  ( VRT ) " SATID ffffff TPID 22c4 SID 2972 TYPE 0 APID 385 PCRPID 385
-      CHANNEL ID 220 NAME "EbS" SATID ffffff TPID 22c4 SID 2969 TYPE 0 VPID 65 APID c9 APID ca APID cb APID cc APID cd APID ce APID cf APID d0 APID d1 APID d2 APID d3 APID d4 APID d5 APID d6 APID d7 APID d8 TTPID 12d PCRPID 65
-      CHANNEL ID 221 NAME "MOU.2" SATID ffffff TPID 22c4 SID 296a TYPE 0 VPID 2a PCRPID 2a
-      CHANNEL ID 222 NAME "MIZIK TROPICAL" SATID ffffff TPID 22c4 SID 296e TYPE 0 VPID 1b3 APID 1b4 PCRPID 1b3
-      CHANNEL ID 223 NAME "MIZIK TROPICAL Radio" SATID ffffff TPID 22c4 SID 2970 TYPE 0 APID 321 PCRPID 321
-      CHANNEL ID 224 NAME "Framboise Nord (CH)" SATID ffffff TPID 22c4 SID 2978 TYPE 0 APID 3cb PCRPID 3cb
-      CHANNEL ID 225 NAME "Framboise Sud (CH)" SATID ffffff TPID 22c4 SID 2979 TYPE 0 APID 3d5 PCRPID 3d5
-      CHANNEL ID 226 NAME "PINK PLUS" SATID ffffff TPID 22c4 SID 296d TYPE 1 VPID 134 APID 100 APID 101 PCRPID 24
-      CHANNEL ID 227 NAME "LIBERTYTV.COM" SATID ffffff TPID 22c4 SID 296b TYPE 0 VPID 3ad APID 3ae PCRPID 3ad
-      CHANNEL ID 228 NAME "KURDSAT" SATID ffffff TPID 22c4 SID 297a TYPE 0 VPID 258 APID 259 PCRPID 1ffe
-      CHANNEL ID 229 NAME "test2" SATID ffffff TPID 22c4 SID 297c TYPE 0 VPID bb8 APID bb9 TTPID bba PCRPID bb8
-    TRANSPONDER ID 2328 SATID 0000 TYPE 1 FREQ 12519840 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 22a NAME "HRT-TV1" SATID ffffff TPID 2328 SID 206d TYPE 1 VPID 64 APID 65 TTPID 66 PCRPID 64
-      CHANNEL ID 22b NAME "HRT-TV2" SATID ffffff TPID 2328 SID 206e TYPE 1 VPID 67 APID 68 TTPID 66 PCRPID 67
-      CHANNEL ID 22c NAME "HRT-TV3" SATID ffffff TPID 2328 SID 206f TYPE 1 VPID 69 APID 6a TTPID 66 PCRPID 69
-      CHANNEL ID 22d NAME "HRT-HR1" SATID ffffff TPID 2328 SID 2071 TYPE 0 APID 96 PCRPID 96
-      CHANNEL ID 22e NAME "HRT-HR2" SATID ffffff TPID 2328 SID 2072 TYPE 0 APID 97 PCRPID 97
-      CHANNEL ID 22f NAME "HRT-HR3" SATID ffffff TPID 2328 SID 2073 TYPE 0 APID 98 PCRPID 98
-      CHANNEL ID 230 NAME "SICILIA INTERNATIONAL" SATID ffffff TPID 2328 SID 2075 TYPE 0 VPID 1f5 PCRPID 1f5
-      CHANNEL ID 231 NAME "HRT-NATIONAL" SATID ffffff TPID 2328 SID 2070 TYPE 1 VPID 6b APID 6c TTPID 66 PCRPID 6b
-      CHANNEL ID 232 NAME "HRT-TEST" SATID ffffff TPID 2328 SID 2074 TYPE 1 VPID 6d APID 6e TTPID 66 PCRPID 6d
-      CHANNEL ID 233 NAME "SARDEGNA UNO" SATID ffffff TPID 2328 SID 2076 TYPE 0 VPID 1f7 PCRPID 1f7
-      CHANNEL ID 234 NAME "R-HRVATSKA" SATID ffffff TPID 2328 SID 2077 TYPE 0 APID 99 PCRPID 99
-      CHANNEL ID 235 NAME "EuroMed" SATID ffffff TPID 2328 SID 2078 TYPE 0 VPID 1fe PCRPID 1fe
-      CHANNEL ID 236 NAME "TGRT" SATID ffffff TPID 2328 SID 2079 TYPE 0 VPID 1f9 PCRPID 1f9
-      CHANNEL ID 237 NAME "HR-TEST" SATID ffffff TPID 2328 SID 207a TYPE 0 APID 9a PCRPID 9a
-      CHANNEL ID 238 NAME "MINI-BVN" SATID ffffff TPID 2328 SID 207b TYPE 0 VPID d2 PCRPID d6
-    TRANSPONDER ID 238c SATID 0000 TYPE 1 FREQ 12713000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 239 NAME "SIMS 91 LARIO" SATID ffffff TPID 238c SID 2262 TYPE 0
-      CHANNEL ID 23a NAME "SKYPLEX TXP91" SATID ffffff TPID 238c SID 2261 TYPE 0
-      CHANNEL ID 23b NAME "Skygate 18" SATID ffffff TPID 238c SID 2 TYPE 0
-      CHANNEL ID 23c NAME "MA12_2905" SATID ffffff TPID 238c SID 226a TYPE 0 PCRPID 1113
-      CHANNEL ID 23d NAME "ES13_1107" SATID ffffff TPID 238c SID 226b TYPE 0 PCRPID 1114
-      CHANNEL ID 23e NAME "ASTONv0107" SATID ffffff TPID 238c SID 226f TYPE 0 PCRPID 1112
-      CHANNEL ID 23f NAME "sisal" SATID ffffff TPID 238c SID 1 TYPE 1 VPID 1104 PCRPID 1104
-      CHANNEL ID 240 NAME "service" SATID ffffff TPID 238c SID 3 TYPE 1 VPID 1104 PCRPID 1104
-      CHANNEL ID 241 NAME "Skyplex 19" SATID ffffff TPID 238c SID 231f TYPE 0
-      CHANNEL ID 242 NAME "Network" SATID ffffff TPID 238c SID 2320 TYPE 0
-      CHANNEL ID 243 NAME "www.travel" SATID ffffff TPID 238c SID 2321 TYPE 0 VPID 49c APID 49f APID 4a0 TTPID 49d PCRPID 49c
-      CHANNEL ID 244 NAME "MagicStar" SATID ffffff TPID 238c SID 2322 TYPE 0 APID 4a4 PCRPID 4a4
-      CHANNEL ID 245 NAME "Skygate 8" SATID ffffff TPID 238c SID 22de TYPE 0
-      CHANNEL ID 246 NAME "UDLR" SATID ffffff TPID 238c SID 22df TYPE 0 APID 19fd
-      CHANNEL ID 247 NAME "UDLR UDcast" SATID ffffff TPID 238c SID 22e0 TYPE 0
-      CHANNEL ID 248 NAME "Skygate 17" SATID ffffff TPID 238c SID 2264 TYPE 0
-      CHANNEL ID 249 NAME "Netshow" SATID ffffff TPID 238c SID 226d TYPE 0
-      CHANNEL ID 24a NAME "MEDIOLANUM" SATID ffffff TPID 238c SID 226e TYPE 0 VPID 1006 PCRPID 1006
-      CHANNEL ID 24b NAME "Skygate 10" SATID ffffff TPID 238c SID 22c5 TYPE 0
-      CHANNEL ID 24c NAME "HitCast Data 1" SATID ffffff TPID 238c SID 22c6 TYPE 0
-      CHANNEL ID 24d NAME "HitCast S.Amer." SATID ffffff TPID 238c SID 22c7 TYPE 0
-      CHANNEL ID 24e NAME "Skygate 1" SATID ffffff TPID 238c SID 22ac TYPE 0
-      CHANNEL ID 24f NAME "MonteCarloSat" SATID ffffff TPID 238c SID 22ad TYPE 0 VPID 1407 APID 1402 PCRPID 1407
-      CHANNEL ID 250 NAME "Bulgaria Radio" SATID ffffff TPID 238c SID 227c TYPE 0 APID 1207
-      CHANNEL ID 251 NAME "skygate 600" SATID ffffff TPID 238c SID 227a TYPE 0
-    TRANSPONDER ID 23f0 SATID 0000 TYPE 1 FREQ 12558201 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 252 NAME "SKYPLEX TXP92" SATID ffffff TPID 23f0 SID 238d TYPE 0
-      CHANNEL ID 253 SATID ffffff TPID 23f0 SID 2491 TYPE 0
-      CHANNEL ID 254 SATID ffffff TPID 23f0 SID 2492 TYPE 0 VPID b09 APID b02 TTPID b0a PCRPID b09
-      CHANNEL ID 255 SATID ffffff TPID 23f0 SID 2493 TYPE 0 VPID b09 TTPID b0a PCRPID b0d
-      CHANNEL ID 256 SATID ffffff TPID 23f0 SID 2494 TYPE 0 VPID b09 TTPID b0a PCRPID b04
-      CHANNEL ID 257 NAME "SKY_4" SATID ffffff TPID 23f0 SID 2487 TYPE 0
-      CHANNEL ID 258 NAME "ESP Int'l" SATID ffffff TPID 23f0 SID 2488 TYPE 1 VPID a0f APID a02 APID a03 TTPID a10 PCRPID a0f
-      CHANNEL ID 259 NAME "ESP Romanian" SATID ffffff TPID 23f0 SID 2489 TYPE 1 APID a09 PCRPID a2c
-      CHANNEL ID 25a NAME "ESP Dutch" SATID ffffff TPID 23f0 SID 248a TYPE 1 VPID a0f APID a04 TTPID a10 PCRPID a2c
-      CHANNEL ID 25b NAME "ESP PolisI" SATID ffffff TPID 23f0 SID 248b TYPE 1 APID a05 PCRPID a2c
-      CHANNEL ID 25c SATID ffffff TPID 23f0 SID 248c TYPE 0 VPID a0f APID a06 TTPID a10 PCRPID a2c
-      CHANNEL ID 25d SATID ffffff TPID 23f0 SID 248d TYPE 0 VPID a0f APID a04 TTPID a10 PCRPID a2c
-      CHANNEL ID 25e SATID ffffff TPID 23f0 SID 248e TYPE 0 VPID a0f APID a08 TTPID a10 PCRPID a2c
-      CHANNEL ID 25f SATID ffffff TPID 23f0 SID 248f TYPE 0 APID a02 APID a03 APID a04 APID a05 PCRPID a0f
-      CHANNEL ID 260 SATID ffffff TPID 23f0 SID 2423 TYPE 0
-    TRANSPONDER ID 0143 SATID 0000 TYPE 1 FREQ 12573000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 0144 SATID 0000 TYPE 1 FREQ 12590000 POL H SRATE 27500000 FEC 8
-    TRANSPONDER ID 24b8 SATID 0000 TYPE 1 FREQ 12596560 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 261 NAME "JSTV 1" SATID ffffff TPID 24b8 SID 2015 TYPE 0 VPID 7d0 APID 7d2 APID 7d3 APID 7d2 PCRPID 7d0
-      CHANNEL ID 262 NAME "JSTV 2" SATID ffffff TPID 24b8 SID 2016 TYPE 0 VPID 7db APID 7dc APID 7dd APID 7dd PCRPID 7db
-      CHANNEL ID 263 NAME "MBC" SATID ffffff TPID 24b8 SID 2009 TYPE 0 VPID a0 APID 50 APID 51 TTPID 20 PCRPID a0
-      CHANNEL ID 264 NAME "Service 2" SATID ffffff TPID 24b8 SID 200a TYPE 0 VPID a1 APID 54 PCRPID a1
-      CHANNEL ID 265 NAME "NITV" SATID ffffff TPID 24b8 SID 200c TYPE 0 VPID a3 APID 5c PCRPID a3
-      CHANNEL ID 266 NAME "SIMAYE AZADI" SATID ffffff TPID 24b8 SID 200f TYPE 0 VPID a6 APID 6a PCRPID a6
-      CHANNEL ID 267 NAME "BET" SATID ffffff TPID 24b8 SID 2010 TYPE 0 VPID a7 APID 6c APID 6d PCRPID a7
-      CHANNEL ID 268 NAME "CNNI" SATID ffffff TPID 24b8 SID 2011 TYPE 1 VPID a8 APID 70 APID 71 TTPID 38 PCRPID a8
-      CHANNEL ID 269 NAME "EuroNews" SATID ffffff TPID 24b8 SID 2013 TYPE 0 VPID 8ad APID 8b7 APID 8b8 APID 8b9 APID 8ba APID 8bb APID 8bc APID 8bd APID 8be TTPID 300 PCRPID 8ad
-      CHANNEL ID 26a NAME "Canal Rural" SATID ffffff TPID 24b8 SID 2014 TYPE 0 VPID 911 APID 91b APID 91c PCRPID 911
-      CHANNEL ID 26b NAME "MediaHW" SATID ffffff TPID 24b8 SID 2063 TYPE 0 PCRPID fa0
-    TRANSPONDER ID 251c SATID 0000 TYPE 1 FREQ 12615000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 26c SATID ffffff TPID 251c SID fffe TYPE 0
-      CHANNEL ID 26d NAME "MMOV" SATID ffffff TPID 251c SID f46 TYPE 1 VPID a10 PCRPID a00
-      CHANNEL ID 26e NAME "MMOV" SATID ffffff TPID 251c SID f49 TYPE 1 VPID a12 PCRPID a01
-      CHANNEL ID 26f NAME "MMOV" SATID ffffff TPID 251c SID f4d TYPE 1 VPID a14 PCRPID a02
-      CHANNEL ID 270 NAME "MMOV" SATID ffffff TPID 251c SID f4e TYPE 1 VPID a16 PCRPID a03
-      CHANNEL ID 271 NAME "MMOV" SATID ffffff TPID 251c SID f4f TYPE 1 VPID a18 PCRPID a04
-      CHANNEL ID 272 NAME "MMOV" SATID ffffff TPID 251c SID f50 TYPE 1 VPID a1a PCRPID a05
-      CHANNEL ID 273 NAME "SC 1" SATID ffffff TPID 251c SID f51 TYPE 1 VPID a07 PCRPID a06
-      CHANNEL ID 274 NAME "SC 2" SATID ffffff TPID 251c SID f54 TYPE 1 VPID a0a PCRPID a06
-      CHANNEL ID 275 NAME "SC 3" SATID ffffff TPID 251c SID f57 TYPE 1 VPID a0d PCRPID a06
-      CHANNEL ID 276 NAME "MC20" SATID ffffff TPID 251c SID f5f TYPE 1 APID 900 PCRPID 900
-      CHANNEL ID 277 NAME "MC21" SATID ffffff TPID 251c SID f62 TYPE 1 APID 901 PCRPID 901
-      CHANNEL ID 278 NAME "MC22" SATID ffffff TPID 251c SID f65 TYPE 1 APID 902 PCRPID 902
-      CHANNEL ID 279 NAME "MC23" SATID ffffff TPID 251c SID f68 TYPE 1 APID 903 PCRPID 903
-      CHANNEL ID 27a NAME "MC24" SATID ffffff TPID 251c SID f6b TYPE 1 APID 904 PCRPID 904
-      CHANNEL ID 27b NAME "MC25" SATID ffffff TPID 251c SID f6e TYPE 1 APID 905 PCRPID 905
-      CHANNEL ID 27c NAME "MC26" SATID ffffff TPID 251c SID f71 TYPE 1 APID 906 PCRPID 906
-      CHANNEL ID 27d NAME "MC27" SATID ffffff TPID 251c SID f74 TYPE 1 APID 907 PCRPID 907
-      CHANNEL ID 27e NAME "MC28" SATID ffffff TPID 251c SID f77 TYPE 1 APID 908 PCRPID 908
-      CHANNEL ID 27f NAME "MC29" SATID ffffff TPID 251c SID f7a TYPE 1 APID 909 PCRPID 909
-      CHANNEL ID 280 NAME "MC30" SATID ffffff TPID 251c SID f7d TYPE 1 APID 90a PCRPID 90a
-      CHANNEL ID 281 NAME "MC31" SATID ffffff TPID 251c SID f80 TYPE 1 APID 90b PCRPID 90b
-      CHANNEL ID 282 NAME "MC32" SATID ffffff TPID 251c SID f83 TYPE 1 APID 90c PCRPID 90c
-      CHANNEL ID 283 NAME "MC33" SATID ffffff TPID 251c SID f86 TYPE 1 APID 90d PCRPID 90d
-      CHANNEL ID 284 NAME "MC34" SATID ffffff TPID 251c SID f89 TYPE 1 APID 90e PCRPID 90e
-      CHANNEL ID 285 NAME "MC35" SATID ffffff TPID 251c SID f8c TYPE 1 APID 90f PCRPID 90f
-      CHANNEL ID 286 NAME "MC36" SATID ffffff TPID 251c SID f8f TYPE 1 APID 910 PCRPID 910
-      CHANNEL ID 287 NAME "MC37" SATID ffffff TPID 251c SID f92 TYPE 1 APID 911 PCRPID 911
-      CHANNEL ID 288 NAME "MC38" SATID ffffff TPID 251c SID f95 TYPE 1 APID 912 PCRPID 912
-      CHANNEL ID 289 NAME "MC39" SATID ffffff TPID 251c SID f98 TYPE 1 APID 913 PCRPID 913
-    TRANSPONDER ID 2580 SATID 0000 TYPE 1 FREQ 12635000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 28a SATID ffffff TPID 2580 SID fffe TYPE 0
-      CHANNEL ID 28b NAME "SC 4" SATID ffffff TPID 2580 SID fa1 TYPE 1 VPID a90 PCRPID a83
-      CHANNEL ID 28c NAME "SC 5" SATID ffffff TPID 2580 SID fa2 TYPE 1 VPID a88 PCRPID a83
-      CHANNEL ID 28d NAME "SC 6" SATID ffffff TPID 2580 SID fa3 TYPE 1 VPID a8d PCRPID a83
-      CHANNEL ID 28e NAME "MMOV" SATID ffffff TPID 2580 SID fa7 TYPE 1 VPID a84 PCRPID a80
-      CHANNEL ID 28f NAME "MMOV" SATID ffffff TPID 2580 SID faa TYPE 1 VPID a86 PCRPID a81
-      CHANNEL ID 290 NAME "MMOV" SATID ffffff TPID 2580 SID fb0 TYPE 1 VPID a93 PCRPID a82
-      CHANNEL ID 291 NAME "MMOV" SATID ffffff TPID 2580 SID fb3 TYPE 1 VPID a95 PCRPID a8b
-      CHANNEL ID 292 NAME "MMOV" SATID ffffff TPID 2580 SID fb6 TYPE 1 VPID a97 PCRPID a8c
-      CHANNEL ID 293 NAME "MMOV" SATID ffffff TPID 2580 SID fb9 TYPE 1 VPID b03 PCRPID b00
-      CHANNEL ID 294 NAME "MMOV" SATID ffffff TPID 2580 SID fbc TYPE 1 VPID b05 PCRPID b01
-    TRANSPONDER ID 25e4 SATID 0000 TYPE 1 FREQ 12654000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 295 NAME "Sharjah        Arabsat Bouquet" SATID ffffff TPID 25e4 SID 1 TYPE 0 VPID 488 PCRPID 488
-      CHANNEL ID 296 NAME "Qatar          Arabsat Bouquet" SATID ffffff TPID 25e4 SID 2 TYPE 0 VPID 4ec PCRPID 4ec
-      CHANNEL ID 297 NAME "Saudi 1        Arabsat Bouquet" SATID ffffff TPID 25e4 SID 3 TYPE 0 VPID 550 PCRPID 550
-      CHANNEL ID 298 NAME "Kuwait         Arabsat Bouquet" SATID ffffff TPID 25e4 SID 4 TYPE 0 VPID 5b4 PCRPID 5b4
-      CHANNEL ID 299 NAME "Libya          Arabsat Bouquet" SATID ffffff TPID 25e4 SID 5 TYPE 0 VPID 618 PCRPID 618
-      CHANNEL ID 29a NAME "Sudan          Arabsat Bouquet" SATID ffffff TPID 25e4 SID 6 TYPE 0 VPID 67c PCRPID 67c
-      CHANNEL ID 29b NAME "Oman           Arabsat Bouquet" SATID ffffff TPID 25e4 SID 7 TYPE 0 VPID 6e0 PCRPID 6e0
-      CHANNEL ID 29c NAME "Jordan         Arabsat Bouquet" SATID ffffff TPID 25e4 SID 8 TYPE 0 VPID 744 PCRPID 744
-      CHANNEL ID 29d NAME "IRAQ TV" SATID ffffff TPID 25e4 SID 9 TYPE 0 VPID 7a8 PCRPID 7a8
-      CHANNEL ID 29e NAME "Dubai Sport" SATID ffffff TPID 25e4 SID a TYPE 0 VPID 424 PCRPID 424
-      CHANNEL ID 29f NAME "Qatar A2       Arabsat Bouquet" SATID ffffff TPID 25e4 SID c TYPE 0 APID 4c5 PCRPID 4c5
-      CHANNEL ID 2a0 NAME "Saudi1 A2      Arabsat Bouquet" SATID ffffff TPID 25e4 SID d TYPE 0 APID 529 PCRPID 529
-      CHANNEL ID 2a1 NAME "Kuwait A2      Arabsat Bouquet" SATID ffffff TPID 25e4 SID e TYPE 0 APID 58d PCRPID 58d
-      CHANNEL ID 2a2 NAME "Jordan A2      Arabsat Bouquet" SATID ffffff TPID 25e4 SID 12 TYPE 0 APID 71d PCRPID 71d
-      CHANNEL ID 2a3 NAME "Radio dubai sport" SATID ffffff TPID 25e4 SID 13 TYPE 0 APID 3fd PCRPID 3fd
-    TRANSPONDER ID 2648 SATID 0000 TYPE 1 FREQ 12673000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 2a4 NAME "Digitaly" SATID ffffff TPID 2648 SID 106b TYPE 0 VPID dc APID dd APID de PCRPID dc
-      CHANNEL ID 2a5 NAME "Telemarket" SATID ffffff TPID 2648 SID 1073 TYPE 0 VPID 15e APID 15f PCRPID 15e
-      CHANNEL ID 2a6 NAME "Internet data 1" SATID ffffff TPID 2648 SID 1074 TYPE 0 TTPID 11f
-      CHANNEL ID 2a7 NAME "eVision" SATID ffffff TPID 2648 SID 1076 TYPE 0 VPID 168 APID 169 APID 16a APID 1be6 PCRPID 168
-      CHANNEL ID 2a8 NAME "ANNI 60" SATID ffffff TPID 2648 SID 1086 TYPE 0 APID fa PCRPID fa
-      CHANNEL ID 2a9 NAME "R. Reporter" SATID ffffff TPID 2648 SID 1087 TYPE 0 APID fb PCRPID fb
-      CHANNEL ID 2aa NAME "Radio Italia S.M.I." SATID ffffff TPID 2648 SID 1088 TYPE 0 APID fc PCRPID fc
-      CHANNEL ID 2ab NAME "R. Tour" SATID ffffff TPID 2648 SID 1089 TYPE 0 APID fd PCRPID fd
-      CHANNEL ID 2ac NAME "R.Rinascente" SATID ffffff TPID 2648 SID 108a TYPE 0 APID fe PCRPID fe
-      CHANNEL ID 2ad NAME "R. Cooky" SATID ffffff TPID 2648 SID 108b TYPE 0 APID ff PCRPID ff
-      CHANNEL ID 2ae NAME "RadioBaby" SATID ffffff TPID 2648 SID 108c TYPE 0 APID 100 PCRPID 100
-      CHANNEL ID 2af NAME "McDonalds" SATID ffffff TPID 2648 SID 108d TYPE 0 APID 101 PCRPID 101
-      CHANNEL ID 2b0 NAME "TRBuonconsiglio" SATID ffffff TPID 2648 SID 108e TYPE 0 APID 191 PCRPID 191
-      CHANNEL ID 2b1 NAME "R-Radio" SATID ffffff TPID 2648 SID 108f TYPE 0 APID 192 PCRPID 192
-      CHANNEL ID 2b2 NAME "R. Donna" SATID ffffff TPID 2648 SID 1090 TYPE 0 APID 193 PCRPID 193
-      CHANNEL ID 2b3 NAME "R. Reporter 2" SATID ffffff TPID 2648 SID 1091 TYPE 0 APID 194 PCRPID 194
-      CHANNEL ID 2b4 NAME "R. West" SATID ffffff TPID 2648 SID 1092 TYPE 0 APID 195 PCRPID 195
-      CHANNEL ID 2b5 NAME "Melodia Russia" SATID ffffff TPID 2648 SID 1093 TYPE 0 VPID 19f6 APID 196 PCRPID 196
-      CHANNEL ID 2b6 NAME "Padre Pio" SATID ffffff TPID 2648 SID 1094 TYPE 0 APID 197 PCRPID 197
-      CHANNEL ID 2b7 NAME "Thai TV5" SATID ffffff TPID 2648 SID 1069 TYPE 0 VPID c8 APID c9 APID ca PCRPID c8
-      CHANNEL ID 2b8 NAME "Studio Europa" SATID ffffff TPID 2648 SID 106c TYPE 0 VPID e6 APID e7 PCRPID e6
-      CHANNEL ID 2b9 NAME "Video  Italia" SATID ffffff TPID 2648 SID 1072 TYPE 0 VPID 154 APID 155 APID 156 PCRPID 154
-    TRANSPONDER ID 26ac SATID 0000 TYPE 1 FREQ 12692000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 2ba NAME "PASSIONS" SATID ffffff TPID 26ac SID 1f5 TYPE 0 VPID a0 PCRPID a0
-      CHANNEL ID 2bb NAME "ONYX" SATID ffffff TPID 26ac SID 1f6 TYPE 0 VPID a1 PCRPID a1
-      CHANNEL ID 2bc NAME "MANGAS" SATID ffffff TPID 26ac SID 1f7 TYPE 1 VPID a2 APID 58 TTPID 26 PCRPID a2
-      CHANNEL ID 2bd NAME "ENCYCLOPEDIA" SATID ffffff TPID 26ac SID 1f8 TYPE 1 VPID a3 APID 5c TTPID 29 PCRPID a3
-      CHANNEL ID 2be NAME "POLAR" SATID ffffff TPID 26ac SID 1f9 TYPE 1 VPID a4 APID 60 TTPID 2c PCRPID a4
-      CHANNEL ID 2bf NAME "CINE PALACE" SATID ffffff TPID 26ac SID 1fa TYPE 1 VPID a5 APID 64 TTPID 2f PCRPID a5
-      CHANNEL ID 2c0 NAME "ROMANCE" SATID ffffff TPID 26ac SID 1fb TYPE 1 VPID a6 APID 68 TTPID 32 PCRPID a6
-      CHANNEL ID 2c1 NAME "RIRE" SATID ffffff TPID 26ac SID 1fc TYPE 1 VPID a7 APID 6c TTPID 35 PCRPID a7
-      CHANNEL ID 2c2 NAME "ACTION" SATID ffffff TPID 26ac SID 1fd TYPE 1 VPID a8 APID 70 TTPID 38 PCRPID a8
-      CHANNEL ID 2c3 NAME "ABsat test RADIO" SATID ffffff TPID 26ac SID 1fe TYPE 1 APID 65 PCRPID a5
-    TRANSPONDER ID 2710 SATID 0000 TYPE 1 FREQ 12713000 POL V SRATE 27500000 FEC 8
-      CHANNEL ID 2c4 SATID ffffff TPID 2710 SID fffe TYPE 0
-      CHANNEL ID 2c5 NAME "MMOV" SATID ffffff TPID 2710 SID 10d0 TYPE 1 VPID a03 PCRPID a00
-      CHANNEL ID 2c6 NAME "MMOV" SATID ffffff TPID 2710 SID 10d3 TYPE 1 VPID a05 PCRPID a01
-      CHANNEL ID 2c7 NAME "MMOV" SATID ffffff TPID 2710 SID 10d6 TYPE 1 VPID a07 PCRPID a02
-      CHANNEL ID 2c8 NAME "MMOV" SATID ffffff TPID 2710 SID 10d9 TYPE 1 VPID 904 PCRPID 900
-      CHANNEL ID 2c9 NAME "MMOV" SATID ffffff TPID 2710 SID 10dc TYPE 1 VPID 90a PCRPID 901
-      CHANNEL ID 2ca NAME "MMOV" SATID ffffff TPID 2710 SID 10e4 TYPE 1 VPID 906 PCRPID 902
-      CHANNEL ID 2cb NAME "MMOV" SATID ffffff TPID 2710 SID 10e7 TYPE 1 VPID 908 PCRPID 903
-    TRANSPONDER ID 2774 SATID 0000 TYPE 1 FREQ 12713000 POL H SRATE 27500000 FEC 8
-      CHANNEL ID 2cc SATID ffffff TPID 2774 SID fffe TYPE 0
-      CHANNEL ID 2cd NAME "SINT" SATID ffffff TPID 2774 SID 2262 TYPE 1
-      CHANNEL ID 2ce NAME "info" SATID ffffff TPID 2774 SID 2264 TYPE 1 VPID 205 PCRPID 1ffe
-      CHANNEL ID 2cf NAME "SINT" SATID ffffff TPID 2774 SID 2266 TYPE 1
-      CHANNEL ID 2d0 NAME "CFN" SATID ffffff TPID 2774 SID 2269 TYPE 1 VPID 20b PCRPID 1ffe
-      CHANNEL ID 2d1 NAME "SINT" SATID ffffff TPID 2774 SID 226c TYPE 1
-      CHANNEL ID 2d2 NAME "duel" SATID ffffff TPID 2774 SID 226f TYPE 1 VPID 206 PCRPID 1ffe
-      CHANNEL ID 2d3 NAME "comedy" SATID ffffff TPID 2774 SID 2272 TYPE 1 VPID 203 PCRPID 1ffe
-      CHANNEL ID 2d4 NAME "fox kids" SATID ffffff TPID 2774 SID 2275 TYPE 1 VPID 201 PCRPID 1ffe
diff --git a/Tools/dvbrc2vdr/test.conf b/Tools/dvbrc2vdr/test.conf
deleted file mode 100644
index 31dddb777..000000000
--- a/Tools/dvbrc2vdr/test.conf
+++ /dev/null
@@ -1,799 +0,0 @@
-DISCOVERY:10719:v:1:27500:8190:8190:0:4402
-RTL7:10719:v:1:27500:8190:8190:0:4403
-TV POLONIA:10719:v:1:27500:8190:8190:0:4404
-EUROSPORT:10719:v:1:27500:8190:8190:0:4405
-PLANETE:10719:v:1:27500:8190:8190:0:4406
-SEASONS:10719:v:1:27500:8190:8190:0:4407
-VIVA Polska:10719:v:1:27500:8190:8190:0:4408
-MULTIMUSIC 4:10719:v:1:27500:8190:123:0:4440
-EPG:10719:v:1:27500:8190:8190:0:4450
-CYFRA+ GRY:10719:v:1:27500:8190:8190:0:4460
-Guide LC:0:v:1:27500:8190:8030:0:2000
-Cinestar 1:0:v:1:27500:120:130:0:1201
-Cinestar 2:0:v:1:27500:220:230:0:1202
-Cinetoile:0:v:1:27500:320:330:0:1203
-Shopping Avenue:0:v:1:27500:420:430:0:1204
-S�rie Club :0:v:1:27500:520:530:0:1205
-FUN TV:0:v:1:27500:620:630:0:1206
-Teva:0:v:1:27500:720:730:0:1207
-M6 Music:0:v:1:27500:820:830:0:1208
-Club T�l�achat:0:v:1:27500:920:930:0:1209
-INFOSPORT:0:v:1:27500:120:130:0:1401
-R�gions:0:v:1:27500:220:230:0:1402
-Mezzo:0:v:1:27500:320:330:0:1403
-01 01 15 97:0:v:1:27500:8190:8190:0:1483
-01 01 17 97:0:v:1:27500:8190:8190:0:1485
-01 02 17 97:0:v:1:27500:8190:8190:0:1486
-01 02 15 97:0:v:1:27500:8190:8190:0:1488
-01 02 15 96:0:v:1:27500:8190:8190:0:1489
-01 03 17 10:0:v:1:27500:8190:8190:0:1490
-01 03 15 10:0:v:1:27500:8190:8190:0:1491
-Festival:0:v:1:27500:420:430:0:1404
-HISTOIRE :0:v:1:27500:520:530:0:1405
-T�l�toon:0:v:1:27500:620:630:0:1406
-Odyss�e :0:v:1:27500:720:730:0:1407
-France Musiques:0:v:1:27500:8190:830:0:1418
-Hector:0:v:1:27500:8190:831:0:1419
-FIP:0:v:1:27500:8190:832:0:1420
-France Inter:0:v:1:27500:8190:833:0:1421
-France Info:0:v:1:27500:8190:834:0:1422
-Elisa:0:v:1:27500:8190:835:0:1423
-France Culture:0:v:1:27500:8190:836:0:1424
-Radio Bleue:0:v:1:27500:8190:837:0:1425
-Le Mouv:0:v:1:27500:8190:838:0:1426
-TV5:0:v:1:27500:920:930:0:1409
-CENTRONICS:0:v:1:27500:8190:8190:0:2000
-FRANCE 2 :0:v:1:27500:320:8190:0:1104
-FRANCE 3:0:v:1:27500:520:8190:0:1106
-Cr�dit Agricole:0:v:1:27500:8190:5333:0:5301
-tps foot:0:v:1:27500:8190:5230:0:5200
-LCI:0:v:1:27500:120:130:0:1101
-EUROSPORT:0:v:1:27500:220:230:0:1102
-FRANCE 2:0:v:1:27500:320:8190:0:1103
-FRANCE 3:0:v:1:27500:520:8190:0:1105
-I TELEVISION:0:v:1:27500:820:830:0:1108
-TV Mail alphatest:0:v:1:27500:8190:8190:0:5701
-CHAINE FI:0:v:1:27500:8190:5331:0:5300
-caisse d'�pargne:0:v:1:27500:8190:8190:0:5303
-TV Mail:0:v:1:27500:8190:8190:0:5700
-CANAL+:10892:h:1:27500:8190:8190:0:4801
-CANAL+ �ӣTY:10892:h:1:27500:8190:8190:0:4802
-TMT:10892:h:1:27500:8190:8190:0:4804
-ALE KINO!:10892:h:1:27500:8190:8190:0:4805
-MINIMAX:10892:h:1:27500:8190:8190:0:4806
-TVP 1:10892:h:1:27500:8190:8190:0:4807
-TVP 2:10892:h:1:27500:8190:8190:0:4808
-CANAL+ NIEBIESKI:10892:h:1:27500:8190:8190:0:4809
-EPG:10892:h:1:27500:8190:8190:0:4850
-Multivision:0:v:1:27500:320:8190:0:1603
-Grand Classique:0:v:1:27500:8190:830:0:1650
-Symphonies:0:v:1:27500:8190:831:0:1651
-Baroque:0:v:1:27500:8190:832:0:1652
-Op�ra:0:v:1:27500:8190:833:0:1653
-Contemporain:0:v:1:27500:8190:834:0:1654
-Relaxation:0:v:1:27500:8190:835:0:1655
-Blues:0:v:1:27500:8190:836:0:1656
-Jazz:0:v:1:27500:8190:837:0:1657
-Big Band:0:v:1:27500:8190:838:0:1658
-Jazz Moderne:0:v:1:27500:8190:839:0:1659
-Les Tubes Fran�ais:0:v:1:27500:8190:840:0:1660
-RFO SAT:0:v:1:27500:120:130:0:1601
-Appli D1 LC:0:v:1:27500:8190:8190:0:1680
-Cinefaz:0:v:1:27500:220:230:0:1602
-TurboPC:0:v:1:27500:8190:8190:0:2801
-MTV2:0:v:1:27500:720:730:0:1607
-Rire et chansons:0:v:1:27500:8190:930:0:1630
-Radio J:0:v:1:27500:8190:931:0:1631
-Mosqueteiros:0:v:1:27500:8190:932:0:1632
-Abysse:0:v:1:27500:8190:933:0:1633
-RMC:0:v:1:27500:8190:935:0:1635
-Radio Junior:0:v:1:27500:8190:936:0:1636
-NETRADIO:0:v:1:27500:8190:937:0:1637
-Nostalgie:0:v:1:27500:8190:938:0:1638
-Skyrock:0:v:1:27500:8190:939:0:1639
-Radio Coutoisie:0:v:1:27500:8190:940:0:1640
-La Voix des Pays:0:v:1:27500:8190:941:0:1641
-INFO EXPRESS:0:v:1:27500:8190:5530:0:5500
-METEO:0:v:1:27500:8190:5830:0:5800
-X X L:0:v:1:27500:8190:8190:0:5400
-Multivision Cin�ma:0:v:1:27500:8190:8190:0:7200
-Multivision Sport:0:v:1:27500:8190:8190:0:7300
-Multivision Spectacle:0:v:1:27500:8190:8190:0:7400
-Test OTV8:12673:h:1:27500:8190:8190:0:7527
-Test OTV9:12673:h:1:27500:8190:8190:0:7528
-Test OTV10:12673:h:1:27500:8190:8190:0:7529
-Test OTV11:12673:h:1:27500:513:8190:0:7530
-Test31:12673:h:1:27500:512:650:0:7501
-CNN:12673:h:1:27500:513:660:0:7502
-Q24:12673:h:1:27500:514:691:0:7503
-Test34:12673:h:1:27500:515:680:0:7504
-Test35:12673:h:1:27500:516:690:0:7505
-Test OTV1:12673:h:1:27500:8190:8190:0:7520
-Test OTV2:12673:h:1:27500:8190:8190:0:7521
-Test OTV3:12673:h:1:27500:8190:8190:0:7522
-Test OTV4:12673:h:1:27500:8190:8190:0:7523
-Test OTV5:12673:h:1:27500:8190:8190:0:7524
-Test OTV6:12673:h:1:27500:8190:8190:0:7525
-Test OTV7:12673:h:1:27500:8190:8190:0:7526
-Test OTV7:12673:h:1:27500:8190:8190:0:7540
-Test OTV7:12673:h:1:27500:8190:8190:0:7541
-Telekom TV:11095:h:1:27500:32:8190:0:3711
-FantasticOverOpal:11095:h:1:27500:32:8190:0:3712
-Gilat:11095:h:1:27500:32:8190:0:3713
-Siemens TV:11095:h:1:27500:32:8190:0:3716
-S-TV:11095:h:1:27500:32:8190:0:3717
-Optibase Encoder:11095:h:1:27500:32:8190:0:3718
-FantasticOverOpal:11095:h:1:27500:8190:8190:0:3702
-Deutsche Bank / T1:11303:h:1:27500:1160:8190:0:1
-Animal Planet:11303:h:1:27500:1160:8190:0:10
-Discovery E Europe-English:11303:h:1:27500:1260:8190:0:20
-Wuerth KG / T21:11303:h:1:27500:1360:8190:0:21
-Discovery Italy:11303:h:1:27500:1360:8190:0:30
-BTI / T31:11303:h:1:27500:1360:8190:0:31
-Discovery Russia:11303:h:1:27500:1460:8190:0:40
-K-TV (MetroMux) / T41:11303:h:1:27500:1960:8190:0:41
-Animal Planet EE:11303:h:1:27500:1560:8190:0:50
-Animal Planet - Russian:11303:h:1:27500:1560:8190:0:51
-Discovery Netherlands:11303:h:1:27500:1660:8190:0:60
-Q English:11303:h:1:27500:1760:8190:0:70
-Travel and Adventure:11303:h:1:27500:1860:8190:0:80
-Travel and Adventure- Russian:11303:h:1:27500:1860:8190:0:81
-New DCP:11303:h:1:27500:8190:1220:0:300
-CCP:11303:h:1:27500:1260:8190:0:301
-Deutsche Bank / T2:11303:h:1:27500:1260:8190:0:2
-Channel Three:11303:h:1:27500:1360:8190:0:3
-Channel Four:11303:h:1:27500:1460:8190:0:4
-Channel Five:11303:h:1:27500:1560:8190:0:5
-Channel 6 = Sat 7 Arabic:11303:h:1:27500:1660:8190:0:6
-Channel Seven:11303:h:1:27500:1760:8190:0:7
-Q German:11303:h:1:27500:1760:8190:0:71
-Q French:11303:h:1:27500:1760:8190:0:72
-Q Dutch:11303:h:1:27500:1760:8190:0:73
-DTAG / T11:11303:h:1:27500:1360:8190:0:11
-DTAG 50 / T12:11303:h:1:27500:1360:8190:0:12
-Telekom TV:11303:h:1:27500:1460:8190:0:13
-Gerling / T26:11303:h:1:27500:1360:8190:0:26
-Hornbach-D / T36:11303:h:1:27500:1360:8190:0:36
-Hornbach-NL / T38:11303:h:1:27500:1360:8190:0:38
-Hornbach-CZ / T39:11303:h:1:27500:1360:8190:0:39
-Testkanal:11303:h:1:27500:1660:8190:0:99
-KENCAST:11303:h:1:27500:8190:8190:0:111
-SAT.1 CH:11604:h:1:27500:101:102:0:601
-KBT Channel SUN:11604:h:1:27500:111:112:0:603
-big FM:11604:h:1:27500:8190:113:0:604
-Event:11604:h:1:27500:160:161:0:602
-Deutsche Bank / T1:11642:h:1:27500:1160:8190:0:1
-Animal Planet:11642:h:1:27500:1160:8190:0:10
-Discovery E Europe-English:11642:h:1:27500:1260:8190:0:20
-Wuerth KG / T21:11642:h:1:27500:1360:8190:0:21
-Discovery Italy:11642:h:1:27500:1360:8190:0:30
-BTI / T31:11642:h:1:27500:1360:8190:0:31
-Discovery Russia:11642:h:1:27500:1460:8190:0:40
-K-TV (MetroMux) / T41:11642:h:1:27500:1960:8190:0:41
-Animal Planet EE:11642:h:1:27500:1560:8190:0:50
-Animal Planet - Russian:11642:h:1:27500:1560:8190:0:51
-Discovery Netherlands:11642:h:1:27500:1660:8190:0:60
-Q English:11642:h:1:27500:1760:8190:0:70
-Travel and Adventure:11642:h:1:27500:1860:8190:0:80
-Travel and Adventure- Russian:11642:h:1:27500:1860:8190:0:81
-New DCP:11642:h:1:27500:8190:1220:0:300
-CCP:11642:h:1:27500:1260:8190:0:301
-Deutsche Bank / T2:11642:h:1:27500:1260:8190:0:2
-Channel Three:11642:h:1:27500:1360:8190:0:3
-Channel Four:11642:h:1:27500:1460:8190:0:4
-Channel Five:11642:h:1:27500:1560:8190:0:5
-Channel 6 = Sat 7 Arabic:11642:h:1:27500:1660:8190:0:6
-Channel Seven:11642:h:1:27500:1760:8190:0:7
-Q German:11642:h:1:27500:1760:8190:0:71
-Q French:11642:h:1:27500:1760:8190:0:72
-Q Dutch:11642:h:1:27500:1760:8190:0:73
-DTAG / T11:11642:h:1:27500:1360:8190:0:11
-DTAG 50 / T12:11642:h:1:27500:1360:8190:0:12
-Telekom TV:11642:h:1:27500:1460:8190:0:13
-Gerling / T26:11642:h:1:27500:1360:8190:0:26
-Hornbach-D / T36:11642:h:1:27500:1360:8190:0:36
-Hornbach-NL / T38:11642:h:1:27500:1360:8190:0:38
-Hornbach-CZ / T39:11642:h:1:27500:1360:8190:0:39
-Testkanal:11642:h:1:27500:1660:8190:0:99
-KENCAST:11642:h:1:27500:8190:8190:0:111
-AB 1:11681:h:1:27500:160:80:0:201
-AB MOTEURS:11681:h:1:27500:161:84:0:202
-ANIMAUX:11681:h:1:27500:162:88:0:203
-CHASSE ET PECHE:11681:h:1:27500:163:92:0:204
-XXL:11681:h:1:27500:164:96:0:205
-MUSIQUE CLASSIQUE:11681:h:1:27500:165:100:0:206
-ESCALES:11681:h:1:27500:166:104:0:207
-FIT/cha�ne HISTOIRE:11681:h:1:27500:167:108:0:208
-RFM TV:11681:h:1:27500:168:112:0:209
-EDTV DRAMA:11744:h:1:27500:4898:8190:0:9504
-EDTV RADIO 02:11744:h:1:27500:4898:8190:0:9524
-EDTV RADIO 01:11744:h:1:27500:4898:8190:0:9523
-EDTV SPORT:11744:h:1:27500:4898:8190:0:9502
-EDTV BUSINESS:11744:h:1:27500:4898:8190:0:9503
-RAI1:11765:v:1:27500:160:8190:0:3401
-RAI2:11765:v:1:27500:161:8190:0:3402
-RAI3:11765:v:1:27500:162:8190:0:3403
-Rai Way TEST1:11765:v:1:27500:515:8190:0:3404
-Rai Way TEST2:11765:v:1:27500:516:8190:0:3405
-Rai Way TEST3:11765:v:1:27500:164:8190:0:3406
-RAIMOSAICO:11765:v:1:27500:518:8190:0:3407
-RAIMOSAICO:11765:v:1:27500:518:8190:0:3490
-RAINews24:11765:v:1:27500:516:8190:0:3301
-CAMERA DEPUTATI:11765:v:1:27500:517:8190:0:3302
-TELEPACE:11765:v:1:27500:515:8190:0:3304
-RAISPORTSAT:11765:v:1:27500:512:8190:0:3305
-RAINettunoSAT2:11765:v:1:27500:513:8190:0:3306
-RAIeducational:11765:v:1:27500:514:8190:0:3307
-RAINettunoSAT1:11765:v:1:27500:519:8190:0:3308
-SAT2000:11765:v:1:27500:518:8190:0:3309
-RADIOUNO:11765:v:1:27500:8190:670:0:3311
-RADIODUE:11765:v:1:27500:8190:671:0:3312
-RADIOTRE:11765:v:1:27500:8190:672:0:3313
-FDleggera:11765:v:1:27500:8190:673:0:3314
-FDauditorium:11765:v:1:27500:8190:665:0:3315
-BLUSAT 2000:11765:v:1:27500:8190:677:0:3316
-GR PARLAMENTO:11765:v:1:27500:8190:664:0:3317
-ISORADIO:11765:v:1:27500:8190:661:0:3318
-R1:11823:h:1:27500:512:650:0:301
-R2:11823:h:1:27500:513:661:0:302
-R3:11823:h:1:27500:514:670:0:303
-R4:11823:h:1:27500:515:680:0:304
-R5:11823:h:1:27500:4682:700:0:306
-R6:11823:h:1:27500:518:710:0:307
-R7:11823:h:1:27500:519:720:0:308
-Love Radio:11823:h:1:27500:8190:711:0:309
-Greek Church:11823:h:1:27500:8190:671:0:310
-Skai Radio:11823:h:1:27500:8190:741:0:311
-MelodiRadio:11823:h:1:27500:8190:701:0:312
-ERA 3:11823:h:1:27500:8190:651:0:313
-RR1:11823:h:1:27500:8190:681:0:314
-RR2:11823:h:1:27500:8190:721:0:315
-NOVA CINE:11823:h:1:27500:521:740:0:316
-FILM NET:11823:h:1:27500:512:650:0:317
-SSportK-T.V:11823:h:1:27500:513:661:0:318
-MEGA:11823:h:1:27500:514:670:0:319
-ANT-1:11823:h:1:27500:515:680:0:320
-STAR:11823:h:1:27500:517:700:0:321
-Alter 5:11823:h:1:27500:518:710:0:322
-NEW Tempo:11823:h:1:27500:519:720:0:323
-Super Sport2:11823:h:1:27500:516:691:0:324
-Super Sport2:11843:v:1:27500:516:691:0:65534
-INTV:11843:v:1:27500:2324:8190:0:3504
-UNIV:11843:v:1:27500:2305:8190:0:3507
-CULT:11843:v:1:27500:2307:8190:0:3510
-ERSP:11843:v:1:27500:2309:8190:0:3513
-SINT:11843:v:1:27500:8190:8190:0:3515
-CART:11843:v:1:27500:2433:8190:0:3516
-SINT:11843:v:1:27500:8190:8190:0:3519
-DISC:11843:v:1:27500:2437:8190:0:3522
-SINT:11843:v:1:27500:8190:8190:0:3525
-TVL:11843:v:1:27500:2441:8190:0:3528
-SINT:11843:v:1:27500:8190:8190:0:3530
-ROCK:11843:v:1:27500:8190:2320:0:3550
-RDS:11843:v:1:27500:8190:2321:0:3553
-RTL:11843:v:1:27500:8190:2322:0:3556
-101:11843:v:1:27500:8190:2323:0:3559
-RVOY:11843:v:1:27500:8190:2315:0:3562
-RKFM:11843:v:1:27500:8190:2317:0:3563
-GLOB:11843:v:1:27500:8190:2316:0:3564
-ANT1:11843:v:1:27500:8190:2318:0:3565
-RRAD:11843:v:1:27500:8190:2319:0:3566
-MC01:11843:v:1:27500:8190:2312:0:3568
-MC02:11843:v:1:27500:8190:2313:0:3571
-MC03:11843:v:1:27500:8190:2314:0:3574
-P7:12341:h:1:27500:160:81:0:11301
-P8:12341:h:1:27500:161:85:0:11303
-P9:12341:h:1:27500:162:89:0:11305
-+GIOCHI:12341:h:1:27500:8190:8190:0:11310
-MM01:12341:h:1:27500:8190:601:0:11311
-MM02:12341:h:1:27500:8190:602:0:11312
-MM03:12341:h:1:27500:8190:603:0:11313
-MM04:12341:h:1:27500:8190:604:0:11314
-MM05:12341:h:1:27500:8190:605:0:11315
-MM06:12341:h:1:27500:8190:606:0:11316
-MM07:12341:h:1:27500:8190:607:0:11317
-MM08:12341:h:1:27500:8190:608:0:11318
-MM09:12341:h:1:27500:8190:609:0:11319
-MM10:12341:h:1:27500:8190:610:0:11320
-MM11:12341:h:1:27500:8190:611:0:11321
-MM12:12341:h:1:27500:8190:612:0:11322
-MM13:12341:h:1:27500:8190:613:0:11323
-MM14:12341:h:1:27500:8190:614:0:11324
-MM15:12341:h:1:27500:8190:615:0:11325
-MM16:12341:h:1:27500:8190:616:0:11326
-MM17:12341:h:1:27500:8190:617:0:11327
-MM18:12341:h:1:27500:8190:618:0:11328
-MM19:12341:h:1:27500:8190:619:0:11329
-MM20:12341:h:1:27500:8190:620:0:11330
-MM21:12341:h:1:27500:8190:621:0:11331
-MM22:12341:h:1:27500:8190:622:0:11332
-MM23:12341:h:1:27500:8190:623:0:11333
-MM24:12341:h:1:27500:8190:624:0:11334
-MM25:12341:h:1:27500:8190:625:0:11335
-MM26:12341:h:1:27500:8190:626:0:11336
-MM27:12341:h:1:27500:8190:627:0:11337
-MM28:12341:h:1:27500:8190:628:0:11338
-MM29:12341:h:1:27500:8190:629:0:11339
-MM30:12341:h:1:27500:8190:630:0:11340
-RCAP:12341:h:1:27500:8190:631:0:11341
-R105:12341:h:1:27500:8190:632:0:11342
-RDJ:12341:h:1:27500:8190:633:0:11343
-RITA:12341:h:1:27500:8190:634:0:11344
-RMC:12341:h:1:27500:8190:635:0:11345
-R101:12341:h:1:27500:8190:636:0:11346
-RRAD:12341:h:1:27500:8190:637:0:11347
-RR:12341:h:1:27500:8190:638:0:11348
-RR:12341:h:1:27500:8190:610:0:11361
-RR:12341:h:1:27500:8190:620:0:11362
-RR:12341:h:1:27500:8190:630:0:11363
-RR:12341:h:1:27500:8190:638:0:11364
-MULTIMUSICA:12341:h:1:27500:8190:8190:0:11352
-RADIO:12341:h:1:27500:8190:8190:0:11353
-MULTIMUSIC 1:12341:h:1:27500:8190:609:0:11365
-MULTIMUSIC 2:12341:h:1:27500:8190:620:0:11366
-MULTIMUSIC 2:12713:v:1:27500:8190:620:0:65534
-TEAM:12713:v:1:27500:2305:8190:0:3610
-SINT:12713:v:1:27500:8190:8190:0:3613
-VIAG:12713:v:1:27500:2308:8190:0:3616
-SINT:12713:v:1:27500:8190:8190:0:3619
-EURO:12713:v:1:27500:2311:8190:0:3622
-SINT:12713:v:1:27500:8190:8190:0:3623
-CNN:12713:v:1:27500:2433:8190:0:3625
-ante prima:12713:v:1:27500:2435:8190:0:3628
-SNAI:12713:v:1:27500:2561:8190:0:3630
-MPPV:12713:v:1:27500:2563:8190:0:3632
-MC04:12713:v:1:27500:8190:2688:0:3636
-MC05:12713:v:1:27500:8190:2689:0:3637
-MC06:12713:v:1:27500:8190:2690:0:3638
-MC07:12713:v:1:27500:8190:2691:0:3641
-MC08:12713:v:1:27500:8190:2692:0:3644
-MC09:12713:v:1:27500:8190:2693:0:3647
-MC10:12713:v:1:27500:8190:2694:0:3650
-MC11:12713:v:1:27500:8190:2695:0:3653
-MC12:12713:v:1:27500:8190:2696:0:3656
-MC13:12713:v:1:27500:8190:2697:0:3659
-MC14:12713:v:1:27500:8190:2698:0:3662
-MC15:12713:v:1:27500:8190:2699:0:3665
-MC16:12713:v:1:27500:8190:2700:0:3668
-MC17:12713:v:1:27500:8190:2701:0:3671
-MC18:12713:v:1:27500:8190:2702:0:3674
-MOSAICO D+:12341:h:1:27500:161:84:0:11401
- MILAN CH.:12341:h:1:27500:162:89:0:11403
- INTER CH.:12341:h:1:27500:163:93:0:11405
-TST3:12341:h:1:27500:8190:8190:0:11407
- I1:11919:v:1:27500:512:650:0:1
- C5:11919:v:1:27500:513:660:0:2
- R4:11919:v:1:27500:514:670:0:3
-Test:11919:v:1:27500:515:680:0:4
-NTV:11938:h:1:27500:164:89:0:7105
-NTV-PLUS:11938:h:1:27500:165:91:0:7106
-NTV Int.-HTB:11938:h:1:27500:160:80:0:7101
-NTV Int.-Nashe Kino:11938:h:1:27500:161:82:0:7102
-NTV Int.-Detsk. Mir:11938:h:1:27500:162:84:0:7103
-DISNEY CHANNEL:12341:v:1:27500:8190:8190:0:10901
-DISCOVERY:12341:v:1:27500:161:8190:0:10903
-EUSP:12341:v:1:27500:162:89:0:10905
-HAPPY CHANNEL:12341:v:1:27500:8190:8190:0:10907
-MATCH MUSIC:12341:v:1:27500:8190:8190:0:10909
-MTV:12341:v:1:27500:8190:8190:0:10911
-R/CINEMA RAISAT:12341:v:1:27500:8190:8190:0:10913
-R/CINEMA RAISAT:12713:h:1:27500:8190:8190:0:65534
-cine stream:12713:h:1:27500:512:650:0:7704
-cine movie:12713:h:1:27500:514:670:0:7707
-CLASSICA:12341:v:1:27500:8190:8190:0:11001
-R/GAM ROS RAISAT:12341:v:1:27500:8190:8190:0:11003
-R/ALBUM RAISAT:12341:v:1:27500:8190:8190:0:11005
-HALLMARK:12341:v:1:27500:163:8190:0:11007
-R/ART RAISAT:12341:v:1:27500:8190:8190:0:11009
-TST1:12341:v:1:27500:8190:8190:0:11011
-TMC:12341:v:1:27500:166:8190:0:11013
-TMC2:12341:v:1:27500:167:8190:0:11015
-ART VARIETY:12015:h:1:27500:160:8190:0:410
-ART CHILDREN:12015:h:1:27500:161:8190:0:420
-ART MOVIES:12015:h:1:27500:162:8190:0:430
-ART MUSIC:12015:h:1:27500:163:8190:0:440
-ART EUROPE:12015:h:1:27500:164:8190:0:450
-LBC EUROPE:12015:h:1:27500:165:8190:0:460
-EGYPT SAT. CH. 2:12015:h:1:27500:166:8190:0:470
-ART SPORT:12015:h:1:27500:167:8190:0:472
-IQRA:12015:h:1:27500:168:8190:0:474
-T+ BIANCO:12341:v:1:27500:160:81:0:11101
-T+ NERO:12341:v:1:27500:161:85:0:11103
-T+ GRIGIO:12341:v:1:27500:162:89:0:11105
-R4:12341:v:1:27500:163:8190:0:24
-16|9 TELE+:12341:v:1:27500:164:97:0:11107
-VETRINA D+:12341:v:1:27500:8190:8190:0:11109
-R/RAGAZZI RAISAT:12341:v:1:27500:8190:8190:0:11111
-CNN:12341:h:1:27500:8190:8190:0:11501
-BBC:12341:h:1:27500:8190:8190:0:11503
-BLOOMBERG:12341:h:1:27500:8190:8190:0:11505
-CNBC:12341:h:1:27500:8190:8190:0:11507
-SKYNews:12341:h:1:27500:8190:8190:0:11509
-TST2:12341:h:1:27500:8190:8190:0:11511
-TV5:12341:h:1:27500:8190:8190:0:11513
-EPG:12341:h:1:27500:8190:8190:0:11515
-CNN:12341:h:1:27500:160:80:0:11517
-CNBC:12341:h:1:27500:163:92:0:11519
-TV5:12341:h:1:27500:166:104:0:11521
-BBC WORLD:12341:h:1:27500:161:84:0:11523
-BBC WORLD:12341:h:1:27500:161:84:0:11595
-BBC WORLD:12341:h:1:27500:161:84:0:9980
-BBC WORLD:12341:h:1:27500:161:84:0:9981
-Telekom TV:11095:v:1:27500:32:8190:0:3711
-FantasticOverOpal:11095:v:1:27500:32:8190:0:3712
-Gilat:11095:v:1:27500:32:8190:0:3713
-Siemens TV:11095:v:1:27500:32:8190:0:3716
-S-TV:11095:v:1:27500:32:8190:0:3717
-Optibase Encoder:11095:v:1:27500:32:8190:0:3718
-Bolsa:12091:h:1:27500:8190:8190:0:8750
-Testw:12091:h:1:27500:8190:8190:0:8751
-SIRE:12091:h:1:27500:8190:8190:0:8752
-Telesierra:12091:h:1:27500:4160:4161:0:8704
-vtv:12091:h:1:27500:4112:4115:0:8701
-Satisfaction:12091:h:1:27500:4192:4193:0:8706
-C. Milagro:12091:h:1:27500:4368:4369:0:8711
-Fiesta:12091:h:1:27500:4432:4434:0:8720
-TVE Internacional:12091:h:1:27500:4208:4209:0:8707
-TV Galicia:12091:h:1:27500:8190:4240:0:8708
-Radio Gallega:12091:h:1:27500:8190:4240:0:8709
-Retelsat:12091:h:1:27500:4464:4465:0:8722
-Musicam 1:12091:h:1:27500:8190:4406:0:8713
-Musicam 2:12091:h:1:27500:8190:4403:0:8714
-Musicam 3:12091:h:1:27500:8190:4406:0:8715
-Musicam 4:12091:h:1:27500:8190:4402:0:8716
-Musicam 5:12091:h:1:27500:8190:4406:0:8717
-HBCH FUCINO:12673:v:1:27500:200:201:0:701
-NTVi:12673:v:1:27500:210:212:0:702
-Test Telespazio:12673:v:1:27500:220:221:0:703
-Test Telespazio:12673:v:1:27500:230:231:0:704
-ARMENIA TV:12673:v:1:27500:240:242:0:705
-MEDNET:12673:v:1:27500:260:261:0:707
-AL JAZEERA:12673:v:1:27500:270:271:0:708
-TIRRENO SAT:12673:v:1:27500:280:301:0:709
-RADIO ROCK:12673:v:1:27500:8190:212:0:711
-RADIO ARMENIA:12673:v:1:27500:8190:242:0:712
-Coming Soon TV:12673:v:1:27500:8190:40:0:717
-AH-EDP1:12149:v:1:27500:96:97:0:7201
-AH-EDP2:12149:v:1:27500:112:113:0:7202
-AH-EDP3:12149:v:1:27500:36:37:0:7203
-AH-EMP4-DATA:12149:v:1:27500:8190:8190:0:7204
-Alice:12149:v:1:27500:160:161:0:7220
-Nuvolari:12149:v:1:27500:176:177:0:7221
-Leonardo:12149:v:1:27500:128:129:0:7222
-Discovery:12169:h:1:27500:512:8190:0:351
-R9:12169:h:1:27500:513:8190:0:352
-BBC World:12169:h:1:27500:514:8190:0:353
-CNN:12169:h:1:27500:515:8190:0:354
-CCTV:12169:h:1:27500:516:8190:0:355
-R10:12169:h:1:27500:518:8190:0:357
-R8:12169:h:1:27500:519:8190:0:358
-FILM SAT:12169:h:1:27500:520:8190:0:359
-Cartoon:12169:h:1:27500:515:8190:0:360
-Promo:12169:h:1:27500:521:8190:0:361
-Tempo:12169:h:1:27500:1440:651:0:362
-Tempo:12169:h:1:27500:8190:661:0:363
-Tempo:12169:h:1:27500:8190:671:0:364
-Tempo:12169:h:1:27500:8190:681:0:365
-Tempo:12169:h:1:27500:8190:691:0:366
-NOVA INFO:12169:h:1:27500:8190:8190:0:367
-NOVA INFO:12169:h:1:27500:8190:8190:0:369
-NOVA INFO:12169:h:1:27500:8190:8190:0:370
-NOVA INFO:12169:h:1:27500:1067:8190:0:371
-NOVA INFO:12169:h:1:27500:8190:8190:0:372
-NOVA INFO:12169:h:1:27500:8190:8190:0:373
-NOVA Cinema:12169:h:1:27500:8190:8190:0:374
-NET:12169:h:1:27500:513:8190:0:376
-MAD T.V:12169:h:1:27500:518:8190:0:377
-ET-1:12169:h:1:27500:519:8190:0:378
-ET-1:12169:h:1:27500:519:8190:0:379
-�����:12169:h:1:27500:517:8190:0:384
-Deutsche Bank / T1:12264:v:1:27500:1160:8190:0:1
-Animal Planet:12264:v:1:27500:1160:8190:0:10
-Discovery E Europe-English:12264:v:1:27500:1260:8190:0:20
-Wuerth KG / T21:12264:v:1:27500:1360:8190:0:21
-Discovery Italy:12264:v:1:27500:1360:8190:0:30
-BTI / T31:12264:v:1:27500:1360:8190:0:31
-Discovery Russia:12264:v:1:27500:1460:8190:0:40
-K-TV (MetroMux) / T41:12264:v:1:27500:1960:8190:0:41
-Animal Planet EE:12264:v:1:27500:1560:8190:0:50
-Animal Planet - Russian:12264:v:1:27500:1560:8190:0:51
-Discovery Netherlands:12264:v:1:27500:1660:8190:0:60
-Q English:12264:v:1:27500:1760:8190:0:70
-Travel and Adventure:12264:v:1:27500:1860:8190:0:80
-Travel and Adventure- Russian:12264:v:1:27500:1860:8190:0:81
-New DCP:12264:v:1:27500:8190:1220:0:300
-CCP:12264:v:1:27500:1260:8190:0:301
-Deutsche Bank / T2:12264:v:1:27500:1260:8190:0:2
-Channel Three:12264:v:1:27500:1360:8190:0:3
-Channel Four:12264:v:1:27500:1460:8190:0:4
-Channel Five:12264:v:1:27500:1560:8190:0:5
-Channel 6 = Sat 7 Arabic:12264:v:1:27500:1660:8190:0:6
-Channel Seven:12264:v:1:27500:1760:8190:0:7
-Q German:12264:v:1:27500:1760:8190:0:71
-Q French:12264:v:1:27500:1760:8190:0:72
-Q Dutch:12264:v:1:27500:1760:8190:0:73
-DTAG / T11:12264:v:1:27500:1360:8190:0:11
-DTAG 50 / T12:12264:v:1:27500:1360:8190:0:12
-Telekom TV:12264:v:1:27500:1460:8190:0:13
-Gerling / T26:12264:v:1:27500:1360:8190:0:26
-Hornbach-D / T36:12264:v:1:27500:1360:8190:0:36
-Hornbach-NL / T38:12264:v:1:27500:1360:8190:0:38
-Hornbach-CZ / T39:12264:v:1:27500:1360:8190:0:39
-Testkanal:12264:v:1:27500:1660:8190:0:99
-KENCAST:12264:v:1:27500:8190:8190:0:111
-SLO-TV1:12302:v:1:27500:200:8190:0:3201
-SLO-TV2:12302:v:1:27500:203:8190:0:3202
-POLONIA 1:12302:v:1:27500:205:8190:0:3203
-SLO-RA1-INF:12302:v:1:27500:8190:250:0:3204
-SLO-RA2:12302:v:1:27500:8190:251:0:3205
-SLO-RA3:12302:v:1:27500:8190:252:0:3206
-SUPER 1:12302:v:1:27500:207:8190:0:3207
-NAPOLI INT.:12302:v:1:27500:240:8190:0:3210
-MAGIC:12302:v:1:27500:245:8190:0:3211
-COUNTDOWN:12302:v:1:27500:235:8190:0:3212
-TBNE:12302:v:1:27500:230:8190:0:3213
-SICILSAT:12302:v:1:27500:225:8190:0:3214
-TVP1:10892:h:1:27500:257:6111:0:1
-TVP2:10892:h:1:27500:321:322:0:2
-POLSAT1:10892:h:1:27500:8190:8190:0:3
-TV4:10892:h:1:27500:257:6111:0:4
-POLSAT2:10892:h:1:27500:321:322:0:5
-WOT:10892:h:1:27500:8190:8190:0:6
-DISCOVERY:10892:h:1:27500:257:6111:0:15
-ANIMAL PLANET:10892:h:1:27500:321:322:0:16
-EpgOpenTV:10892:h:1:27500:8190:8190:0:3686
-P10:12341:v:1:27500:160:81:0:11601
-P11:12341:v:1:27500:161:85:0:11603
-P12:12341:v:1:27500:162:89:0:11605
-P13:12341:v:1:27500:163:93:0:11607
-P14:12341:v:1:27500:164:97:0:11609
-P15:12341:v:1:27500:165:101:0:11611
-P16:12341:v:1:27500:166:105:0:11613
-PREMIUM:12341:v:1:27500:8190:8190:0:11615
-+F1:12341:v:1:27500:160:664:0:11617
-+F1:12341:v:1:27500:161:85:0:11619
-+F1:12341:v:1:27500:162:667:0:11621
-+F1:12341:v:1:27500:163:674:0:11623
-+F1:12341:v:1:27500:164:96:0:11625
-+F1:12341:v:1:27500:165:676:0:11627
-+F1:12341:v:1:27500:166:666:0:11629
-RMC:12341:v:1:27500:8190:8190:0:11631
-R101:12341:v:1:27500:8190:8190:0:11632
-RRAD:12341:v:1:27500:8190:8190:0:11633
-ON:10892:h:1:27500:353:354:0:7
-DLA-CIEBIE:10892:h:1:27500:529:530:0:8
-KOMEDIA:10892:h:1:27500:353:354:0:9
-SMYK:10892:h:1:27500:529:530:0:10
-RELAKS:10892:h:1:27500:353:354:0:11
-INFO:10892:h:1:27500:529:530:0:12
-POLSAT SPORT:10892:h:1:27500:353:354:0:13
-Paris Premi�re:12379:v:1:27500:3021:3031:0:3001
-OCC HB3:12379:v:1:27500:3022:3032:0:3002
-TELE 24  Switzerland:12379:v:1:27500:3023:3033:0:3003
-AIR MEDIA:12379:v:1:27500:8190:3537:0:3087
-Abu Dhabi TV:12379:v:1:27500:3024:3034:0:3004
-EMIRAT FM 1:12379:v:1:27500:8190:3533:0:3083
-EMIRAT FM2:12379:v:1:27500:8190:3534:0:3084
-Radio Italia :12379:v:1:27500:8190:3531:0:3081
-EQUIDIA INTER.:12379:v:1:27500:3321:3351:0:3051
-RTV MONTENEGRO:12379:v:1:27500:3026:3036:0:3006
-Radio Montenegro:12379:v:1:27500:8190:3538:0:3088
-SERTE TEST:12379:v:1:27500:3025:8190:0:3005
-GAME 1:12379:v:1:27500:3027:3037:0:3007
-SF 2:12398:h:1:27500:163:93:0:907
-SRG SSR Sat Access:12398:h:1:27500:165:99:0:910
-SF 1:12398:h:1:27500:160:81:0:901
-TSR 1:12398:h:1:27500:161:85:0:902
-TSI 1:12398:h:1:27500:162:89:0:903
-TSR 2:12398:h:1:27500:164:97:0:908
-TSI 2:12398:h:1:27500:166:101:0:909
-OPTION MUSIQUE:12398:h:1:27500:8190:204:0:957
-ESPACE 2:12398:h:1:27500:8190:205:0:958
-SRI-F-I:12398:h:1:27500:8190:199:0:951
-SRI-EUROPA:12398:h:1:27500:560:200:0:953
-POLO:12341:v:1:27500:160:80:0:11701
-PLANETE:12341:v:1:27500:161:84:0:11703
-JIMMY:12341:v:1:27500:162:88:0:11705
-INN:12341:v:1:27500:163:92:0:11707
-CIN1:12341:v:1:27500:164:96:0:11709
-CIN2:12341:v:1:27500:165:100:0:11711
-CINC:12341:v:1:27500:166:104:0:11713
-SEASONS:12341:v:1:27500:167:108:0:11715
-WISHLINE:12341:v:1:27500:168:89:0:11717
-MARCOPOLO:12341:v:1:27500:160:81:0:11719
-JAAM-E-JAM 1:12436:h:1:27500:160:81:0:1
-JAAM-E-JAM 2:12436:h:1:27500:161:83:0:2
-SAHAR:12436:h:1:27500:162:85:0:3
-TEST(SAHAR):12436:h:1:27500:163:87:0:4
-IRINN:12436:h:1:27500:164:89:0:5
-TEST 2:12436:h:1:27500:165:90:0:6
-IRIB1 RADIO:12436:h:1:27500:8190:81:0:7
-IRIB ARABIC /International 1 Radio:12436:h:1:27500:8190:83:0:8
-INT1 FAMILY RADIO:12475:h:1:27500:8190:961:0:10615
-RADIO 74:12475:h:1:27500:8190:921:0:10612
-R 74 INT.:12475:h:1:27500:8190:931:0:10613
-FAMILY Radio:12475:h:1:27500:8190:951:0:10614
-Temp:12475:h:1:27500:771:8190:0:10607
-SPREE Radio:12475:h:1:27500:8190:501:0:10652
- RVI  ( VRT ) :12475:h:1:27500:8190:901:0:10610
-EbS:12475:h:1:27500:101:216:0:10601
-MOU.2:12475:h:1:27500:42:8190:0:10602
-MIZIK TROPICAL:12475:h:1:27500:435:436:0:10606
-MIZIK TROPICAL Radio:12475:h:1:27500:8190:801:0:10608
-Framboise Nord (CH):12475:h:1:27500:8190:971:0:10616
-Framboise Sud (CH):12475:h:1:27500:8190:981:0:10617
-PINK PLUS:12475:h:1:27500:308:257:0:10605
-LIBERTYTV.COM:12475:h:1:27500:941:942:0:10603
-KURDSAT:12475:h:1:27500:600:601:0:10618
-test2:12475:h:1:27500:3000:3001:0:10620
-HRT-TV1:12519:v:1:27500:100:101:0:8301
-HRT-TV2:12519:v:1:27500:103:104:0:8302
-HRT-TV3:12519:v:1:27500:105:106:0:8303
-HRT-HR1:12519:v:1:27500:8190:150:0:8305
-HRT-HR2:12519:v:1:27500:8190:151:0:8306
-HRT-HR3:12519:v:1:27500:8190:152:0:8307
-SICILIA INTERNATIONAL:12519:v:1:27500:501:8190:0:8309
-HRT-NATIONAL:12519:v:1:27500:107:108:0:8304
-HRT-TEST:12519:v:1:27500:109:110:0:8308
-SARDEGNA UNO:12519:v:1:27500:503:8190:0:8310
-R-HRVATSKA:12519:v:1:27500:8190:153:0:8311
-EuroMed:12519:v:1:27500:510:8190:0:8312
-TGRT:12519:v:1:27500:505:8190:0:8313
-HR-TEST:12519:v:1:27500:8190:154:0:8314
-MINI-BVN:12519:v:1:27500:210:8190:0:8315
-SIMS 91 LARIO:12713:h:1:27500:8190:8190:0:8802
-SKYPLEX TXP91:12713:h:1:27500:8190:8190:0:8801
-Skygate 18:12713:h:1:27500:8190:8190:0:2
-MA12_2905:12713:h:1:27500:8190:8190:0:8810
-ES13_1107:12713:h:1:27500:8190:8190:0:8811
-ASTONv0107:12713:h:1:27500:8190:8190:0:8815
-sisal:12713:h:1:27500:4356:8190:0:1
-service:12713:h:1:27500:4356:8190:0:3
-Skyplex 19:12713:h:1:27500:8190:8190:0:8991
-Network:12713:h:1:27500:8190:8190:0:8992
-www.travel:12713:h:1:27500:1180:1184:0:8993
-MagicStar:12713:h:1:27500:8190:1188:0:8994
-Skygate 8:12713:h:1:27500:8190:8190:0:8926
-UDLR:12713:h:1:27500:8190:6653:0:8927
-UDLR UDcast:12713:h:1:27500:8190:8190:0:8928
-Skygate 17:12713:h:1:27500:8190:8190:0:8804
-Netshow:12713:h:1:27500:8190:8190:0:8813
-MEDIOLANUM:12713:h:1:27500:4102:8190:0:8814
-Skygate 10:12713:h:1:27500:8190:8190:0:8901
-HitCast Data 1:12713:h:1:27500:8190:8190:0:8902
-HitCast S.Amer.:12713:h:1:27500:8190:8190:0:8903
-Skygate 1:12713:h:1:27500:8190:8190:0:8876
-MonteCarloSat:12713:h:1:27500:5127:5122:0:8877
-Bulgaria Radio:12713:h:1:27500:8190:4615:0:8828
-skygate 600:12713:h:1:27500:8190:8190:0:8826
-SKYPLEX TXP92:12558:v:1:27500:8190:8190:0:9101
-SKYPLEX TXP92:12558:v:1:27500:8190:8190:0:9361
-SKYPLEX TXP92:12558:v:1:27500:2825:2818:0:9362
-SKYPLEX TXP92:12558:v:1:27500:2825:2818:0:9363
-SKYPLEX TXP92:12558:v:1:27500:2825:2818:0:9364
-SKY_4:12558:v:1:27500:8190:8190:0:9351
-ESP Int'l:12558:v:1:27500:2575:2563:0:9352
-ESP Romanian:12558:v:1:27500:8190:2569:0:9353
-ESP Dutch:12558:v:1:27500:2575:2564:0:9354
-ESP PolisI:12558:v:1:27500:8190:2565:0:9355
-ESP PolisI:12558:v:1:27500:2575:2566:0:9356
-ESP PolisI:12558:v:1:27500:2575:2564:0:9357
-ESP PolisI:12558:v:1:27500:2575:2568:0:9358
-ESP PolisI:12558:v:1:27500:2575:2565:0:9359
-ESP PolisI:12558:v:1:27500:2575:2565:0:9251
-JSTV 1:12596:v:1:27500:2000:2002:0:8213
-JSTV 2:12596:v:1:27500:2011:2013:0:8214
-MBC:12596:v:1:27500:160:81:0:8201
-Service 2:12596:v:1:27500:161:84:0:8202
-NITV:12596:v:1:27500:163:92:0:8204
-SIMAYE AZADI:12596:v:1:27500:166:106:0:8207
-BET:12596:v:1:27500:167:109:0:8208
-CNNI:12596:v:1:27500:168:113:0:8209
-EuroNews:12596:v:1:27500:2221:2238:0:8211
-Canal Rural:12596:v:1:27500:2321:2332:0:8212
-MediaHW:12596:v:1:27500:8190:8190:0:8291
-MediaHW:12615:h:1:27500:8190:8190:0:65534
-MMOV:12615:h:1:27500:2576:8190:0:3910
-MMOV:12615:h:1:27500:2578:8190:0:3913
-MMOV:12615:h:1:27500:2580:8190:0:3917
-MMOV:12615:h:1:27500:2582:8190:0:3918
-MMOV:12615:h:1:27500:2584:8190:0:3919
-MMOV:12615:h:1:27500:2586:8190:0:3920
-SC 1:12615:h:1:27500:2567:8190:0:3921
-SC 2:12615:h:1:27500:2570:8190:0:3924
-SC 3:12615:h:1:27500:2573:8190:0:3927
-MC20:12615:h:1:27500:8190:2304:0:3935
-MC21:12615:h:1:27500:8190:2305:0:3938
-MC22:12615:h:1:27500:8190:2306:0:3941
-MC23:12615:h:1:27500:8190:2307:0:3944
-MC24:12615:h:1:27500:8190:2308:0:3947
-MC25:12615:h:1:27500:8190:2309:0:3950
-MC26:12615:h:1:27500:8190:2310:0:3953
-MC27:12615:h:1:27500:8190:2311:0:3956
-MC28:12615:h:1:27500:8190:2312:0:3959
-MC29:12615:h:1:27500:8190:2313:0:3962
-MC30:12615:h:1:27500:8190:2314:0:3965
-MC31:12615:h:1:27500:8190:2315:0:3968
-MC32:12615:h:1:27500:8190:2316:0:3971
-MC33:12615:h:1:27500:8190:2317:0:3974
-MC34:12615:h:1:27500:8190:2318:0:3977
-MC35:12615:h:1:27500:8190:2319:0:3980
-MC36:12615:h:1:27500:8190:2320:0:3983
-MC37:12615:h:1:27500:8190:2321:0:3986
-MC38:12615:h:1:27500:8190:2322:0:3989
-MC39:12615:h:1:27500:8190:2323:0:3992
-MC39:12635:v:1:27500:8190:2323:0:65534
-SC 4:12635:v:1:27500:2704:8190:0:4001
-SC 5:12635:v:1:27500:2696:8190:0:4002
-SC 6:12635:v:1:27500:2701:8190:0:4003
-MMOV:12635:v:1:27500:2692:8190:0:4007
-MMOV:12635:v:1:27500:2694:8190:0:4010
-MMOV:12635:v:1:27500:2707:8190:0:4016
-MMOV:12635:v:1:27500:2709:8190:0:4019
-MMOV:12635:v:1:27500:2711:8190:0:4022
-MMOV:12635:v:1:27500:2819:8190:0:4025
-MMOV:12635:v:1:27500:2821:8190:0:4028
-Sharjah        Arabsat Bouquet:12654:h:1:27500:1160:8190:0:1
-Qatar          Arabsat Bouquet:12654:h:1:27500:1260:8190:0:2
-Saudi 1        Arabsat Bouquet:12654:h:1:27500:1360:8190:0:3
-Kuwait         Arabsat Bouquet:12654:h:1:27500:1460:8190:0:4
-Libya          Arabsat Bouquet:12654:h:1:27500:1560:8190:0:5
-Sudan          Arabsat Bouquet:12654:h:1:27500:1660:8190:0:6
-Oman           Arabsat Bouquet:12654:h:1:27500:1760:8190:0:7
-Jordan         Arabsat Bouquet:12654:h:1:27500:1860:8190:0:8
-IRAQ TV:12654:h:1:27500:1960:8190:0:9
-Dubai Sport:12654:h:1:27500:1060:8190:0:10
-Qatar A2       Arabsat Bouquet:12654:h:1:27500:8190:1221:0:12
-Saudi1 A2      Arabsat Bouquet:12654:h:1:27500:8190:1321:0:13
-Kuwait A2      Arabsat Bouquet:12654:h:1:27500:8190:1421:0:14
-Jordan A2      Arabsat Bouquet:12654:h:1:27500:8190:1821:0:18
-Radio dubai sport:12654:h:1:27500:8190:1021:0:19
-Digitaly:12673:v:1:27500:220:222:0:4203
-Telemarket:12673:v:1:27500:350:351:0:4211
-Internet data 1:12673:v:1:27500:8190:8190:0:4212
-eVision:12673:v:1:27500:360:7142:0:4214
-ANNI 60:12673:v:1:27500:8190:250:0:4230
-R. Reporter:12673:v:1:27500:8190:251:0:4231
-Radio Italia S.M.I.:12673:v:1:27500:8190:252:0:4232
-R. Tour:12673:v:1:27500:8190:253:0:4233
-R.Rinascente:12673:v:1:27500:8190:254:0:4234
-R. Cooky:12673:v:1:27500:8190:255:0:4235
-RadioBaby:12673:v:1:27500:8190:256:0:4236
-McDonalds:12673:v:1:27500:8190:257:0:4237
-TRBuonconsiglio:12673:v:1:27500:8190:401:0:4238
-R-Radio:12673:v:1:27500:8190:402:0:4239
-R. Donna:12673:v:1:27500:8190:403:0:4240
-R. Reporter 2:12673:v:1:27500:8190:404:0:4241
-R. West:12673:v:1:27500:8190:405:0:4242
-Melodia Russia:12673:v:1:27500:6646:406:0:4243
-Padre Pio:12673:v:1:27500:8190:407:0:4244
-Thai TV5:12673:v:1:27500:200:202:0:4201
-Studio Europa:12673:v:1:27500:230:231:0:4204
-Video  Italia:12673:v:1:27500:340:342:0:4210
-PASSIONS:12692:h:1:27500:160:8190:0:501
-ONYX:12692:h:1:27500:161:8190:0:502
-MANGAS:12692:h:1:27500:162:88:0:503
-ENCYCLOPEDIA:12692:h:1:27500:163:92:0:504
-POLAR:12692:h:1:27500:164:96:0:505
-CINE PALACE:12692:h:1:27500:165:100:0:506
-ROMANCE:12692:h:1:27500:166:104:0:507
-RIRE:12692:h:1:27500:167:108:0:508
-ACTION:12692:h:1:27500:168:112:0:509
-ABsat test RADIO:12692:h:1:27500:8190:101:0:510
-ABsat test RADIO:12713:v:1:27500:8190:101:0:65534
-MMOV:12713:v:1:27500:2563:8190:0:4304
-MMOV:12713:v:1:27500:2565:8190:0:4307
-MMOV:12713:v:1:27500:2567:8190:0:4310
-MMOV:12713:v:1:27500:2308:8190:0:4313
-MMOV:12713:v:1:27500:2314:8190:0:4316
-MMOV:12713:v:1:27500:2310:8190:0:4324
-MMOV:12713:v:1:27500:2312:8190:0:4327
-MMOV:12713:h:1:27500:2312:8190:0:65534
-SINT:12713:h:1:27500:8190:8190:0:8802
-info:12713:h:1:27500:517:8190:0:8804
-SINT:12713:h:1:27500:8190:8190:0:8806
-CFN:12713:h:1:27500:523:8190:0:8809
-SINT:12713:h:1:27500:8190:8190:0:8812
-duel:12713:h:1:27500:518:8190:0:8815
-comedy:12713:h:1:27500:515:8190:0:8818
-fox kids:12713:h:1:27500:513:8190:0:8821
diff --git a/Tools/epg2timers/README b/Tools/epg2timers/README
deleted file mode 100644
index 53888b160..000000000
--- a/Tools/epg2timers/README
+++ /dev/null
@@ -1,151 +0,0 @@
-Overview.
-=========
-
-The 4 modules in this directory are designed to allow vdr timer 
-programming via the http://tvtv.de web EPG (Electronic Program Guide).
-
-Once you have these modules properly configured and installed, 
-you should be able to simply click on the things you want vdr 
-to record in the http://tvtv.de web EPG and be done with it. 
-Everything else can be handled automatically.
-
-
-
-Module description.
-===================
-
-The http://tvtv.de web EPG creates a so-called "merkliste"
-("a list of items to remember") containing all the broadcasts
-you selected.
-
-1.  The perl script "get_merkliste.pl" transfers this "merkliste"
-    from the http://tvtv.de web site to a local file "merkliste.html".
-
-2.  The C++ program "epg2timers" converts this HTML file into vdr's
-    timers.conf format.
-    
-3.  The perl script "loadvdr.pl" pumps these new timer entries
-    into a running vdr using telnet and the SVDRP protocol.
-
-4.  The shell script "update_timers" implements the overall 
-    control of the entire process.
-    It retrieves the latest merkliste from http://tvtv.de,
-    converts it to timers.conf format and sends the timer entries 
-    to vdr.
-    
-    
-
-Configuration.
-==============
-
-get_merkliste.pl requires configuration of the "files_to_fetch"
-variable preset. 
-Log in to your http://tvtv.de account and click on the "Bookmark"
-item in the "Setup" submenu of the "Mein Programm" side bar menu.
-This will open a window with a URL in the location field that ends
-with an ID value. Replace the xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-in the "files_to_fetch" variable preset with your ID value.
-If you are using an HTTP proxy, uncomment the line containing
-the $ua->proxy call and put your proxy details in.
-
-epg2timers.cxx allows various items to be configured, but it
-should work out of the box. See "tvtv.de channel names" below.
-
-update_timers must know where to find the get_merkliste.pl
-perl script and the compiled epg2timers binary. Both must be
-in a directory pointed to by the TOOLDIR variable.
-update_timers also must know where to find vdr's current 
-channels.conf file. Put that into the CHANPATH.
-
-Depending on the price of your internet access, you may want to
-run update_timers more or less frequently. It may also be a good
-idea to run it at times where it is unlikely to interfere with 
-your current use of vdr. Configure a crontab entry according to
-these personal preferences. Here is the entry I use:
-1       2       *       *       *       /home/cko/bin/update_timers
-It runs update_timers only once a night at 02:01 a.m.
-
-
-Installation.
-=============
-Create your TOOLDIR directory if it does not already exist.
-Copy get_merkliste.pl and loadvdr.pl into it, compile epg2timers.cxx 
-with the command:
-    g++ epg2timers.cxx -o epg2timers
-and move the epg2timers binary into the TOOLDIR directory.
-
-The get_merkliste.pl script requires certain packages to run.
-Besides of course perl, install perl-libwww-perl (at least
-that's the name on SuSE 7.2, it may have a different name in
-your distribution).
-
-If you have problems with SVDRP and loadvdr.pl, you may want to
-try out the update_timers.old script, which replaces the timers.conf
-file directly and kills vdr (assuming that it will be restarted
-by the runvdr script) to make vdr reload the timers.conf file.
-
-
-tvtv.de channel names.
-======================
-The file epg_channel_names contains the names of all channels
-currently (as of September 9, 2001) supported by the tvtv.de 
-web EPG. The variable "channel_map" in epg2timers.cxx maps
-these names into PNRs (aka Service IDs). I have initialized
-this table with provider names converted from a d-box channel 
-scan of Astra 19.2E, so the PNRs should be correct for that 
-satellite, but most of the names propably aren't yet- I simply 
-had not enough time yet to go through epg_channel_names
-and insert all its channel names at the proper places in the
-channel map. Consider the map supplied an example. ;-)
-If you fix any of the entries, please send me a patch.
-For my own humble purposes, the table works well as it is.
-Of course, your channels.conf must contain the matching
-PNRs (last field in each line).
-
-
-To Do.
-======
-These are just ideas. They MAY get implemented.
-If you want them to happen, contribute a patch. ;-)
-
-*  Support vdr hierarchical directories (after vdr does)
-   by mapping the http://tvtv.de genre texts into 
-   directory names.
-*  start_time_safety_margin for epg2timers.
-
-
-Authors.
-========
-Carsten Koch:    epg2timers.cxx, update_timers,  this README file.
-                                     
-Axel Gruber and 
-Rolf Hakenes:    get_merkliste.pl
-
-Peter Ahlert:    loadvdr.pl
-
-
-Credits.
-========
-I am grateful (in chronological order) to 
-
-* Klaus Schmidinger for his excellent vdr program and for
-  keeping an open mind in all directions.
-  
-* Suse (my wife, not the Linux distributor ;-) for encouraging me to 
-  write epg2timers in June 2000 and for her constant patience and support.
-  
-* Andreas Steinhauser for periodically criticizing the epg2timers 
-  "manual mode" until I came up with the idea to fully automatize it
-  and for contributing ideas.
- 
-* Axel Gruber for reminding me half a year later, for pushing
-  the idea until it got implemented, for asking for new features
-  all the time and for contributing ideas.
-
-* Axel Gruber and Rolf Hakenes for contributing the get_merkliste.pl
-  perl script.
-  
-* Peter Ahlert for contributing the loadvdr.pl perl script.
-
-
-Carsten, September 2001.
diff --git a/Tools/epg2timers/epg2timers.cxx b/Tools/epg2timers/epg2timers.cxx
deleted file mode 100644
index 94e1c8a4b..000000000
--- a/Tools/epg2timers/epg2timers.cxx
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * epg2timers.cxx: Convert an EPG "merkliste" HTML page (http://tvtv.de)
- *                 to timers.conf format for Klaus Schmidinger's vdr 
- *                 (http://www.cadsoft.de/people/kls/vdr).
- *
- * Copyright (C) 2000, 2001 Carsten Koch
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- * 
- * The author can be reached at Carsten.Koch@icem.de
- */
- 
- 
-#include <malloc.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-// User-configurable options.
-
-static const int stop_time_safety_margin = 10;  // add 10 minutes to stop time in case start was delayed
-static const int recording_priority = 50;       // vdr recording priority setting for all timer entries generated
-static const int recording_lifetime = 98;       // vdr recording life time setting for all timer entries generated
-
-
-// Usually, you should not want to change any of these.
-
-static const int max_title   = 256;             // maximum length+1 of title file name generated
-static const int max_genre   = 32;              // maximum length+1 of genre text parsed
-static const int max_line    = 1024;            // line buffer (not used when parsing summary text)
-static const int max_summary = 9000;            // Summary can be up to 9000 bytes long (a bit shorter than vdr's SVDRP command buffer)
-static const int max_vdr_channel = 1000;        // maximum size+1 of your channels.conf
-
-// The following table maps http://tvtv.de channel names into Astra 19.2E PIDs.
-// It is incomplete. Contributions welcome.
-
-typedef struct
-{
-   const char * tvtv_name;
-   unsigned short pnr;
-} map_entry;
-
-
-static const map_entry channel_map[] =
-{
-   //   Deutschsprachig
-   {"13th Street", 42},
-   {"3sat", 28007},
-   {"ARTE", 28109},
-   {"B1", 28206},
-   {"BR3", 28107},
-   {"BR-alpha", 28112},
-   {"ARD", 28106},
-   {"Discovery", 14},
-   {"Disney Channel", 34},
-   {"Eins Extra", 28201},
-   {"Eins Festival", 28202},
-   {"Eins MuXx", 28203},
-   {"Filmpalast", 516},
-   {"FOX KIDS", 28},
-   {"Heimatkanal", 517},
-   {"HR", 28108},
-   {"Junior", 19},
-   {"Kabel 1", 899},
-   {"Kinderkanal", 28008},
-   {"Krimi&Co", 23},
-   {"K-Toon", 12},
-   {"Liberty TV.com", 12199},
-   {"MDR", 28204},
-   {"NDR", 28224},
-   {"NEUN LIVE", 897},
-   {"ORB", 28205},
-   {"ORF1", 13001},
-   {"ORF2", 13002},
-   {"Phoenix", 28114},
-   {"Planet", 13},
-   {"Premiere 1", 10},
-   {"Premiere 2", 11},
-   {"Premiere 3", 43},
-   {"Premiere Action", 20},
-   {"Premiere Comedy", 29},
-   {"Premiere SCI-FI", 41},
-   {"Premiere Star", 9},
-   {"PREMIERE WORLD", 8},
-   {"ProSieben", 898},
-   {"RTL", 12003},
-   {"RTL2", 12020},
-   {"SAT.1", 46},
-   {"SeaSonS", 33},
-   {"SR", 28110},
-   {"Studio Universal", 36},
-   {"Sunset", 16},
-   {"Super RTL", 12040},
-   {"Test-Z1", 28305},
-   {"TW1", 13013},
-   {"Via 1 - Sch�ner Reise", 44},
-   {"VOX", 12060},
-   {"WDR", 28111},
-   {"ZDF", 28006},
-   {"ZDF.doku", 28014},
-   {"ZDF.info", 28011},
-   //  Movies
-   {"AXN", 29506},
-   {"CANAL+", 29100},
-   {"CANAL+ AZUL", 29101},
-   {"CANAL+ ROJO", 29102},
-   {"CANAL+ VERT", 8208},
-   {"CANAL+ 16/9", 8204},
-   {"CANAL+ 16|9", 29024},
-   {"C+ROOD", 4005},
-   {"CINE CINEMA I", 8206},
-   {"CINE CINEMA II", 8002},
-   {"CINE CINEMA III", 8003},
-   {"CINE CLASSICS", 8709},
-   {"CINE CINEMA 16/9", 8301},
-   {"cinecinemas", 4008},
-   {"CINECLASSICS", 29203},
-   {"Cinedom 1", 176},
-   {"Cinedom 1B", 178},
-   {"Cinedom 1C", 180},
-   {"Cinedom 1D", 190},
-   {"Cinedom 2", 179},
-   {"Cinedom 2B", 183},
-   {"Cinedom 2C", 184},
-   {"Cinedom 2D", 188},
-   {"Cinedom 2E", 193},
-   {"Cinedom 3", 182},
-   {"Cinedom 3B", 185},
-   {"Cinedom 3C", 192},
-   {"Cinedom 3D", 195},
-   {"Cinedom 4", 181},
-   {"Cinedom 4B", 187},
-   {"Cinedom 4C", 191},
-   {"Cinedom 5", 186},
-   {"Cinedom 5B", 194},
-   {"Cindedom Deluxe", 189},
-   {"CINEMAN�A AZUL", 29501},
-   {"CINEMAN�A ROJO", 29605},
-   {"CINEMAN�A", 29500},
-   {"K1", 8401},
-   {"K2", 8402},
-   {"K3", 8403},
-   {"K4", 8404},
-   {"K5", 8405},
-   {"K6", 8406},
-   {"K7", 8407},
-   {"K9", 8409},
-   {"K12", 8412},
-   {"TAQUILLA 1", 29206},
-   {"TAQUILLA 2", 29207},
-   {"TAQUILLA 3", 29502},
-   {"TAQUILLA 4", 29503},
-   {"TAQUILLA 5", 29504},
-   {"TAQUILLA 6", 29301},
-   {"TAQUILLA 7", 29302},
-   {"TAQUILLA 8", 29303},
-   {"TAQUILLA 11", 29316},
-   {"TAQUILLA 12", 29610},
-   {"TAQUILLA 13", 29402},
-   {"TAQUILLA 14", 29212},
-   {"TAQUILLA 16|9", 29606},
-   //  Music
-   {"40 LATINO", 29031},
-   {"40 TV", 29110},
-   {"CANAL+ JAUNE", 8203},
-   {"CLASSICA", 15},
-   {"GOLDSTAR TV", 518},
-   {"MCM 2", 8305},
-   {"MCM AFRICA", 8307},
-   {"MCM", 8302},
-   {"MTV 2", 28649},
-   {"MTV 6", 28641},
-   {"MTV Base", 28645},
-   {"MTV Central", 28643},
-   {"MTV F", 28642},
-   {"MTV Hits", 28644},
-   {"MUZZIK", 8007},
-   {"RFM TV", 17008},
-   {"TMF", 5015},
-   {"VH1 Classic", 28647},
-   {"VH1", 28646},
-   {"Video Italia", 12220},
-   {"VIVA ZWEI", 12120},
-   {"VIVA", 12732},
-   {"ZIK'/XXL", 17004},
-   //  News
-   {"BBC WORLD", 17007},
-   {"Bloomberg TV", 12160},
-   {"CNBC", 28010},
-   {"CNBC", 35},
-   {"CNBC-NBC", 29202},
-   {"CNN", 28512},
-   {"DW-tv", 9005},
-   {"EuroNews", 28015},
-   {"FOX NEWS", 29032},
-   {"N24", 47},
-   {"n-tv", 12730},
-   {"Sky News", 3995},
-   //  Netherlands
-   {"NED1", 4011},
-   {"NED2", 4012},
-   {"NED3", 4013},
-   {"NET5", 5004},
-   {"RTL4", 2004},
-   {"RTL5", 2005},
-   {"SBS6", 5005},
-   {"V8/Fox Kids", 5020},
-   {"Yorin", 5010},
-   //  Porn
-   {"BEATE-UHSE.TV", 21},
-   {"Blue Movie1", 513},
-   {"Blue Movie2", 514},
-   {"Blue Movie3", 515},
-   {"K10", 8410},
-   {"TAQUILLA X", 29213},
-   {"TAQUILLA X", 29602},
-   {"TAQUILLA XX", 29607},
-   {"X-ZONE", 4009},
-   //  Sports
-   {"C+BLAUW", 4006},
-   {"DSF", 900},
-   {"EUROSPORT", 8101},
-   {"Eurosport", 28009},
-   {"EUROSPORT", 29310},
-   {"EUROSPORTNEWS", 29037},
-   {"PATHE SPORT|", 8009},
-   {"PREMIERE SPORT 1", 17},
-   {"PREMIERE SPORT 2", 27},
-   {"SUPERDOM", 26},
-   //  French
-   {"13EME RUE", 8703},
-   {"AB 1", 17001},
-   {"AB MOTEURS", 17000},
-   {"ACTION", 17010},
-   {"ALLOCINE TV", 8308},
-   {"ANIMAUX", 17002},
-   {"ARTE", 9009},
-   {"BLOOMBERG TV", 8004},
-   {"CA TV", 8610},
-   {"CANAL+", 8201},
-   {"CANAL+ BLEU", 8202},
-   {"CANAL J", 8108},
-   {"CANAL JIMMY", 8006},
-   {"CANALCLUB", 8812},
-   {"Cartoon Network", 28511},
-   {"CLUB TELEACHAT", 8303},
-   {"COMEDIE !", 8702},
-   {"CONTACT TV", 8804},
-   {"CUISINE.TV", 8112},
-   {"DEMAIN !", 8701},
-   {"DISNEY CHANNEL", 8207},
-   {"DT CSAT 10", 9159},
-   {"ENCYCLOPEDIA", 17003},
-   {"ESCALES", 17005},
-   {"EURONEWS", 8505},
-   {"FORUM", 8707},
-   {"FRANCE 2", 8801},
-   {"FRANCE 3", 8802},
-   {"GAME ONE", 8717},
-   {"i TELEVISION", 8010},
-   {"KIOSQUE", 8704},
-   {"KTO", 8304},
-   {"LA CHAINE METEO", 8008},
-   {"LA CINQUIEME", 8501},
-   {"LaCha�neHistoire", 17006},
-   {"LCI", 8107},
-   {"LCP", 8506},
-   {"L'EQUIPE TV", 8706},
-   {"LibertyTV.com", 12280},
-   {"MANGAS", 17011},
-   {"MONTECARLO TMC", 8102},
-   {"Motors TV", 12300},
-   {"NAT GEOGRAPHIC", 8310},
-   {"PAD", 8211},
-   {"PARIS PREMIERE", 8104},
-   {"PLANETE 2", 8507},
-   {"PLANETE", 8103},
-   {"PMU sur Canal+", 8210},
-   {"RFO SAT", 8708},
-   {"SANTE - VIE", 8110},
-   {"SEASONS", 8001},
-   {"TCM", 28515},
-   {"TEST CDN 1", 8616},
-   {"TEST CDN 3", 8627},
-   {"TiJi", 8309},
-   {"TV 5", 9001},
-   {"TV BREIZH", 8502},
-   {"TV Puls", 20601},
-   {"TV5 Europe", 12240},
-   {"VOYAGE", 8105},
-   //  Spanish
-   {"ANDALUC�A TV", 29011},
-   {"Bloomberg", 12721},
-   {"CALLE 13", 29609},
-   {"Canal Canarias", 29700},
-   {"Cartoon Network", 29314},
-   {"CNN+", 29020},
-   {"DISCOVERY", 29116},
-   {"DISNEY CHANNEL", 29111},
-   {"DOCUMAN�A", 29200},
-   {"ESTILO", 29305},
-   {"ETB", 29035},
-   {"FASHION TV", 29115},
-   {"FOX KIDS", 29209},
-   {"FOX", 29507},
-   {"MOSAICO", 29315},
-   {"M�TEO", 29014},
-   {"Nat Geo Channel", 29034},
-   {"NICK-PARAMOUNT", 29312},
-   {"RTPI", 9006},
-   {"SEASONS", 29204},
-   {"TAQUILLA 0", 29205},
-   {"TCM.", 28516},
-   {"TVC INT.", 29701},
-   {"VIAJAR", 29306},
-   //  Miscellaneous
-   {"Alice", 12200},
-   {"Canal Algerie", 9008},
-   {"CANALPRO TV", 8516},
-   {"ESC1 - EGYPTE", 9003},
-   {"FASHION TV.COM", 17009},
-   {"Home Shopping Euro", 45},
-   {"Home Shopping Euro", 40},
-   {"Kabel 1 Austria", 20004},
-   {"Kabel 1 Schweiz", 20003},
-   {"Polonia 1/Top Sho", 20366},
-   {"ProSieben A", 20002},
-   {"ProSieben Schweiz", 20001},
-   {"QVC GERMANY", 12100},
-   {"RAI 1", 9004},
-   {"REAL MADRID TV", 29019},
-   {"RealityTV", 20309},
-   {"RTL TELE Letzebuerg", 3994},
-   {"RTM - MAROC", 9002},
-   {"S�DWEST BW", 28113},
-   {"S�DWEST RP", 28231},
-   {"Super 1", 20364},
-   {"Travel", 28001},
-   {"TV7", 9007},
-   {"TV-NIEP II", 12740},
-   {"Wishline", 12320}
-};
-
-
-// Nothing user-configurable below this line.
-
-static const char date_line[]       = "\t<td align=center valign=middle colspan=3><span id=fb-b10>";
-static const char start_time_line[] = " \t\t<td id=\"jobview-box-date\" align=center><nobr>&nbsp;";
-static const char stop_time_line[]  = "\t\t\t<tr><td id=\"line\" align=center><span id=\"fn-w9\">bis ";
-static const char channel_line[]    = "\t\t\t<tr><td align=center><span id=\"fb-w9\">";
-static const char title_line[]      = "\t\t\t\t<td align=left width=100%><span id=\"fb-w10\">";
-static const char summary_line[]    = "<span id=\"fn-b8\">";
-static const char genre_line[]      = "\t\t\t\t<td align=right valign=center nowrap><span id=\"fn-w10\">";
-
-static const int month_lengths[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-
-
-
-char map_special_char(const char * const word)
-      
-{
-   if (strcmp(word, "auml") == 0)
-      return '�';
-   else if (strcmp(word, "ouml") == 0)
-      return '�';
-   else if (strcmp(word, "uuml") == 0)
-      return '�';
-   else if (strcmp(word, "Auml") == 0)
-      return '�';
-   else if (strcmp(word, "Ouml") == 0)
-      return '�';
-   else if (strcmp(word, "Uuml") == 0)
-      return '�';
-   else if (strcmp(word, "szlig") == 0)
-      return '�';
-   else if (strcmp(word, "nbsp") == 0)
-      return ' ';
-   else if (strcmp(word, "amp") == 0)
-      return '&';
-   return ' ';
-}
-
-
-
-
-
-void read_file_name_and_title(const char * const line, char * const file_name, char * const title)
-      
-{
-   int line_index = sizeof(title_line) - 1;
-   int title_index = 0;
-   int file_name_index = 0;
-   char ch;
-   do
-   {
-      ch = line[line_index++];
-      if (ch == '&')
-      {
-         char word[10];
-         int i = 0;
-         while ((line[line_index + i] != ';') && (i < 9))
-         {
-            word[i] = line[line_index + i]; i++;
-         }
-         if (line[line_index + i] == ';')
-         {
-            word[i] = 0;
-            ch = map_special_char(word);
-            line_index += i;
-         }
-      }
-      switch (ch)
-      {
-         case '�': file_name[file_name_index++] = 'a'; file_name[file_name_index++] = 'e'; break;
-         case '�': file_name[file_name_index++] = 'o'; file_name[file_name_index++] = 'e'; break;
-         case '�': file_name[file_name_index++] = 'u'; file_name[file_name_index++] = 'e'; break;
-         case '�': file_name[file_name_index++] = 'A'; file_name[file_name_index++] = 'e'; break;
-         case '�': file_name[file_name_index++] = 'O'; file_name[file_name_index++] = 'e'; break;
-         case '�': file_name[file_name_index++] = 'U'; file_name[file_name_index++] = 'e'; break;
-         case '�': file_name[file_name_index++] = 's'; file_name[file_name_index++] = 's'; break;
-         case ' ': file_name[file_name_index++] = '_'; break;
-         case '&': 
-            file_name[file_name_index++] = 'u'; file_name[file_name_index++] = 'n'; file_name[file_name_index++] = 'd'; 
-         break;
-         default:
-            if (((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) || ((ch >= '0') && (ch <= '9')) || (ch == '-'))
-               file_name[file_name_index++] = ch;
-      }
-      title[title_index++] = ch;
-   } while ((file_name_index < max_title-5) && (ch != '<') && (ch != 0));
-   file_name[file_name_index] = 0;
-   title[title_index-1] = 0;
-}
-
-
-
-void read_summary(char * const summary)
-      
-{
-   int summary_index = 0;
-   int ch;
-   bool need_space = false;
-   bool done = false;
-   do
-   {
-      ch = getchar();
-      switch (ch)
-      {
-         case '&':
-         {
-            char word[10];
-            int i = 0;
-            ch = getchar();
-            while ((ch != ';') && (ch != EOF) && (i < 9)) 
-            {
-               word[i++] = ch;
-               ch = getchar();
-            }
-            word[i] = 0;
-            if (need_space) {summary[summary_index++] = ' '; need_space = false;}
-            summary[summary_index++] = map_special_char(word);
-         }
-         break;
-         case '<':
-         {
-            char word[6];
-            int word_index = 0;
-            do
-            {
-               ch = getchar();
-               word[word_index++] = ch;
-            } while ((word_index < 6) && (ch != '>') && (ch != EOF));
-            while ((ch != '>') && (ch != EOF)) ch = getchar();
-            if (strncmp("/span", word, 4) == 0)
-               done = true;
-         }
-         break;
-         default:
-         {
-            if (ch <= ' ')
-            {
-               if (summary_index > 0) need_space = true;
-            }
-            else
-            {
-               if (need_space) {summary[summary_index++] = ' '; need_space = false;}
-               summary[summary_index++] = ch;
-            }
-         }
-      }
-   } while ((summary_index < max_summary - 2) && (!done) && (ch != EOF));
-   summary[summary_index] = 0;
-}
-
-
-
-int find_channel_number(const unsigned short * const vdr_pnrs, const char * const channel_name)
-      
-{
-   for (int tvtv_channel_number = 0; tvtv_channel_number < sizeof(channel_map)/sizeof(map_entry); tvtv_channel_number++)
-      if (strcmp(channel_name, channel_map[tvtv_channel_number].tvtv_name) == 0)
-         for (int vdr_channel_number = 0; vdr_pnrs[vdr_channel_number] != 0xFFFF; vdr_channel_number++)
-            if (vdr_pnrs[vdr_channel_number] == channel_map[tvtv_channel_number].pnr)
-               return vdr_channel_number;
-   fprintf(stderr, "Error - channel '%s' not recognized.\n", channel_name);
-   exit(1);
-   /*NOTREACHED*/
-}
-
-
-
-
-unsigned short * read_vdr_pnrs(const char * const channels_conf_file_name)
-      
-{
-   FILE * channels_conf = fopen(channels_conf_file_name, "r");
-   if (channels_conf == NULL)
-   {
-      perror("unable to open channels.conf.");
-      exit(1);
-   }
-   unsigned short * vdr_pnrs = (unsigned short *) malloc(max_vdr_channel * sizeof(unsigned short));
-   int vdr_channel_number = 0;
-   while (!feof(channels_conf) && (vdr_channel_number < max_vdr_channel-1))
-   {
-      char line[1024];
-      fgets(line, sizeof(line)-1, channels_conf);
-      int pnr;
-      if ((line[0] != ':') && 
-          (sscanf(line, "%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%d", &pnr) == 1))
-         vdr_pnrs[vdr_channel_number++] = pnr;
-   }
-   vdr_pnrs[vdr_channel_number++] = 0xFFFF; // sentinel
-   fprintf(stderr, "%d pnrs.\n", vdr_channel_number);
-   return (unsigned short *) realloc(vdr_pnrs, vdr_channel_number * sizeof(unsigned short));
-}
-
-
-
-
-void process_input(const unsigned short * const vdr_pnrs)
-      
-{
-
-   int channel    = -1;
-   int day        = -1;
-   int next_day   = -1;
-   int start_time = -1;
-   int stop_hour  = -1;
-   int stop_minute= -1;
-   char genre[max_genre] = {0};
-   char summary[max_summary] = {0};
-   char file_name[max_title] = {0};
-   char title[max_title] = {0};
-
-   while (!feof(stdin))
-   {
-      char line[max_line];
-      fgets(line, max_line-1, stdin);
-      line[max_line-1] = 0;
-      if (strncmp(line, date_line, sizeof(date_line)-1) == 0)
-      {
-         const int month = (line[sizeof(date_line) + 6]- '0') * 10 + line[sizeof(date_line) + 7]-'0';
-         day = (line[sizeof(date_line) + 3]- '0') * 10 + line[sizeof(date_line) + 4]-'0';
-         next_day = day == month_lengths[month-1]? 1 : day + 1;
-      }
-      else if (strncmp(line, start_time_line, sizeof(start_time_line)-1) == 0)
-         start_time = (line[sizeof(start_time_line) - 1] - '0') * 1000 +
-                      (line[sizeof(start_time_line)    ] - '0') * 100 +
-                      (line[sizeof(start_time_line) + 2] - '0') * 10 +
-                      (line[sizeof(start_time_line) + 3] - '0');
-      else if (strncmp(line, stop_time_line, sizeof(stop_time_line)-1) == 0)
-      {
-         stop_hour =   (line[sizeof(stop_time_line) - 1] - '0') * 10 +
-                       (line[sizeof(stop_time_line)    ] - '0');
-         stop_minute = (line[sizeof(stop_time_line) + 2] - '0') * 10 +
-                       (line[sizeof(stop_time_line) + 3] - '0') + 
-                       stop_time_safety_margin;
-         if (stop_minute > 59)
-         {
-            stop_minute -= 60;
-            if (stop_hour == 23)
-               stop_hour = 0;
-            else
-               stop_hour++;
-         }
-         if ((day < 0) || (start_time < 0) || (file_name[0] == 0) || (channel == -1))
-         {
-            fprintf(stderr, "Input data error.\n");
-            exit(1);
-         }
-         else
-            printf("1:%03d:%02d:%04d:%02d%02d:%d:%d:%s:\"%s\" %s||%s||||||(epg2timers)\n", 
-                   channel+1, start_time < 600? next_day : day, start_time, stop_hour, stop_minute, 
-                   recording_priority, recording_lifetime, file_name, 
-                   title, genre, summary);
-         start_time = -1; channel = -1;
-         file_name[0] = 0; summary[0] = 0; genre[0] = 0;
-      }
-      else if (strncmp(line, title_line, sizeof(title_line)-1) == 0)
-         read_file_name_and_title(line, file_name, title);
-      else if (strncmp(line, channel_line, sizeof(channel_line)-1) == 0)
-      {
-         int i = sizeof(channel_line);
-         while ((line[i] != '<') && (line[i] != 0)) i++;
-         line[i] = 0; // end of string
-         channel = find_channel_number(vdr_pnrs, line + sizeof(channel_line) - 1);
-      }
-      else if (strncmp(line, summary_line, sizeof(summary_line)-1) == 0)
-         read_summary(summary);
-      else if (strncmp(line, genre_line, sizeof(genre_line)-1) == 0)
-      {
-         int genre_index;
-         for (genre_index = 0; genre_index < max_genre-1; genre_index++)
-         {
-            const char ch = line[genre_index + sizeof(genre_line)-1];
-            if ((ch == 0) || (ch == '&') || (ch == '<'))
-               break;
-            genre[genre_index] = ch;
-         }
-         genre[genre_index] = 0;
-      }
-   }
-}
-
-
-
-
-main(int argc, char *argv[])
-
-{
-   fprintf(stderr, "epg2timers Version 0.5, 15-Sep-2001.\n");
-   
-   if (argc != 2)
-   {
-      fprintf(stderr, "usage: %s channels.conf\n", argv[0]);
-      exit(1);
-   }
-   
-   const unsigned short * const vdr_pnrs = read_vdr_pnrs(argv[1]);
-   process_input(vdr_pnrs);
-   exit(0);
-}
diff --git a/Tools/epg2timers/epg_channel_names b/Tools/epg2timers/epg_channel_names
deleted file mode 100644
index 2633a9909..000000000
--- a/Tools/epg2timers/epg_channel_names
+++ /dev/null
@@ -1,400 +0,0 @@
-ATV,at
-ORF1,at
-ORF2,at
-TW1,at
-
-Club RTL,be
-Ketnet/Canvas,be
-TVI,be
-tv1,be
-
-SF1,ch
-sf2,ch
-
-13th Street,de
-3sat,de,at,ch
-ARD,de
-ARTE,de
-B1,de
-BBC World,de
-BEATE-UHSE.TV,de
-BR-alpha,de
-BR3,de
-Bet on Jazz,de
-Bloomberg TV,de
-Blue Movie1,de
-Blue Movie2,de
-Blue Movie3,de
-CNBC,de
-CNN,de
-Cartoon,de
-Cindedom Deluxe,de
-Cinedom 1,de
-Cinedom 2,de
-Cinedom 3,de
-Cinedom 4,de
-Cinedom 5,de
-Classica,de
-DSF,de
-Discovery,de
-Disney Channel,de
-Eins Extra,de
-Eins Festival,de
-Eins MuXx,de
-EuroNews,de
-Eurosport,de
-FOX KIDS,de
-Filmpalast,de
-Goldstar TV,de
-HH-1,de
-HR,de
-Heimatkanal,de
-Junior,de
-K-Toon,de
-Kabel 1,de
-Kinderkanal,de
-Krimi&Co,de
-MDR,de
-MTV,de
-MTV2,de
-N24,de
-NBC,de
-NDR,de
-NEUN LIVE,de
-ONYX,de
-ORB,de
-Phoenix,de
-Planet,de
-Premiere 1,de
-Premiere 2,de
-Premiere 3,de
-Premiere Action,de
-Premiere Comedy,de
-Premiere SCI-FI,de
-Premiere Sport1,de
-Premiere Sport2,de
-Premiere Sport3,de
-Premiere Star,de
-Premiere analog,de
-ProSieben,de
-QVC,de
-RTL,de
-RTL2,de
-SAT.1,de
-SR,de
-SWR BW,de
-SWR RP,de
-SeaSonS,de
-Studio Universal,de
-Sunset,de
-Super RTL,de
-TNT,de
-TRT,de,tr
-TV.BERLIN,de
-Theaterkanal,de
-VIVA,de
-VIVA2,de
-VOX,de
-WDR,de
-ZDF,de
-ZDF.doku,de
-ZDF.info,de
-n-tv,de
-skynews,de
-tv.m,de
-
-Danmark 1,dk
-TV2 Danmark,dk
-
-MTV3,fi
-Nelonen 4,fi
-Subtv,fi
-TV1,fi
-TV2,fi
-
-13�me Rue,fr
-AB 1,fr
-Arte,fr
-Arte Sat,fr
-Canal J,fr
-Canal Jimmy,fr
-Canal+,fr
-Canal+ Bel. bleu,fr
-Canal+ Bel. jaune,fr
-Canal+ Belgique,fr
-Canal+ bleu,fr
-Canal+ jaune,fr
-Canal+ vert,fr
-Cin� Cin�mas 1,fr
-Cin� Cin�mas 2,fr
-Cin� Cin�mas 3,fr
-Cin� Classics,fr
-Cin�faz,fr
-Cin�star 1,fr
-Cin�star 2,fr
-Cin�toile,fr
-Com�die !,fr
-Disney Channel,fr
-Escale,fr
-Eurosport,fr
-Festival,fr
-Fox Kids,fr
-France 2,fr
-France 3,fr
-Histoire,fr
-LCI,fr
-La Cinqui�me Sat,fr
-La cha�ne histoire,fr
-La cinqui�me,fr
-M6,fr
-M6 Music,fr
-MCM,fr
-MTV,fr
-Mangas,fr
-Mezzo,fr
-Muzzik,fr
-Odyss�e,fr
-Paris Premi�re,fr
-Path� sport,fr
-Plan�te,fr
-RTBF 1,fr
-RTBF 2,fr
-RTL 9,fr
-S�rie Club,fr
-TCM,fr
-TF1,fr
-TMC,fr
-TSR 1,fr
-TSR 2,fr
-TV5,fr
-T�l�toon,fr
-T�va,fr
-Voyage,fr
-XXL,fr
-
-ANIMALplanet,hu
-Budapest TV,hu
-Duna TV,hu
-FILMM�ZEUM,hu
-FOX KIDS/SPORTS,hu
-F�NIX TV,hu
-Game Channel,hu
-HBO,hu
-Hallmark,hu
-MAGYAR ATV,hu
-Minimax,hu
-National Geographic,hu
-Nickelodeon,hu
-RTL Klub,hu
-Romantica,hu
-SATeLIT,hu
-SPORT1,hu
-Spektrum TV,hu
-TV2,hu
-VIASAT3,hu
-VIVA+,hu
-fix.tv,hu
-m1,hu
-m2,hu
-
-+ Calcio,it
-+ F1,it
-Adult +,it
-CANALE 5,it
-Canal Jimmy,it
-Canale Viaggi,it
-Cartoon Network,it
-Cine Classics,it
-CineCinemas 1,it
-CineCinemas 2,it
-Classica,it
-Cult Network,it
-Discovery Channel,it
-Disney Channel,it
-Euro News,it
-Eurosport,it
-Hallmark,it
-Happy Channel,it
-ITALIA 1,it
-La 7,it
-MTV,it
-MTV - TMC 2,it
-Marcopolo,it
-Match Music,it
-Milan Channel,it
-Nuvolari Motor,it
-Odeon,it
-Planete,it
-Primafila,it
-RAI 1,it
-RAI 2,it
-RAI 3,it
-RAI Sat Fiction,it
-RETE 4,it
-Raisat Album,it
-Raisat Art,it
-Raisat Cinema,it
-Raisat Educational,it
-Raisat Gambero Rosso,it
-Raisat Nettuno 1,it
-Raisat Nettuno 2,it
-Raisat Ragazzi,it
-Raisat Show,it
-Raisat Sport,it
-SNAI Sat,it
-Salute e benessere,it
-Sat 2000,it
-Satisfation Club TV,it
-Seasons,it
-Stream Calcio,it
-Stream News,it
-Studio Universal,it
-TSI 1,it
-TSI 2,it
-TVL,it
-Tele+ 16:9,it
-Tele+ Bianco,it
-Tele+ Grigio,it
-Tele+ Nero,it
-VIVA - Rete A,it
-
-Netherland 1,nl
-Netherland 2,nl
-Netherland 3,nl
-
-ATV Avrupa,tr
-Kanal D,tr
-Kral TV,tr
-NTV Turkey,tr
-Show TV,tr
-Star TV,tr
-
-Adult Channel,uk
-Adventure One,uk
-Anglia,uk
-BBC Choice,uk
-BBC Choice NI,uk
-BBC Choice Scotland,uk
-BBC Choice Wales,uk
-BBC Knowledge,uk
-BBC News 24,uk
-BBC Parliament,uk
-BBC Prime,uk
-BBC World,uk
-BBC1,uk
-BBC1 North. Ireland,uk
-BBC1 Scotland,uk
-BBC1 Wales,uk
-BBC2,uk
-BBC2 North. Ireland,uk
-BBC2 Scotland,uk
-BBC2 Wales,uk
-Bangla TV,uk
-Bloomberg TV,uk
-Border,uk
-Bravo (Analogue),uk
-Bravo (Digital),uk
-British Eurosport,uk
-CNBC Europe,uk
-CNN,uk
-Carlton Central,uk
-Carlton Cinema,uk
-Carlton Food,uk
-Carlton Westcountry,uk
-Carlton/LWT,uk
-Cartoon Network,uk
-Challenge TV,uk
-Channel 4,uk
-Channel 5,uk
-Channel Television,uk
-Disc. Animal Planet,uk
-Disc. Channel (Ana.),uk
-Disc. Civilisations,uk
-Disc. Home Leisure,uk
-Disc. Sci-Trek,uk
-Disc. Travel Advent.,uk
-Discovery Channel,uk
-Discovery Kids,uk
-Discovery Wings,uk
-Disney,uk
-Euronews,uk
-Fantasy Ch. Dig.,uk
-Fantasy Channel,uk
-Film Four,uk
-Fox Kids,uk
-Grampian,uk
-Granada,uk
-Granada Breeze,uk
-Granada Men & Motors,uk
-Granada Plus,uk
-HTV Wales,uk
-HTV West,uk
-Hallmark,uk
-History Channel,uk
-ITN News Channel,uk
-ITV Sport Channel,uk
-ITV Sport Plus,uk
-ITV2,uk
-Landscape,uk
-Living,uk
-MTV UK,uk
-MUTV,uk
-Meridian,uk
-National Geographic,uk
-Network 2,uk
-Nick Junior,uk
-Nick Junior Analogue,uk
-Nickelodeon (dig.),uk
-Nickleodeon (ana.),uk
-Pakistani Channel,uk
-Paramount Comedy,uk
-Performance,uk
-Play UK,uk
-Playboy TV,uk
-QVC,uk
-RTE1,uk
-Racing Channel,uk
-Rapture TV,uk
-S2,uk
-S4C,uk
-S4C digidol,uk
-SKY Cinema,uk
-SKY Movie Max(SDig.),uk
-SKY Movie Max(ana.),uk
-SKY News,uk
-SKY Premier(Digital),uk
-SKY Premier(OnDigi),uk
-SKY Sports 1,uk
-SKY Sports 2,uk
-SKY Sports 3,uk
-Sci-Fi Cable,uk
-Sci-Fi Satelite,uk
-Scottish,uk
-Screenshop,uk
-Shop!,uk
-Sky Movie Max(OnDig),uk
-Sky One,uk
-Sky One (OnDigital),uk
-Sky Premier(Ana.),uk
-Sky Sports .com,uk
-Sky Sports Extra,uk
-Sky Travel,uk
-Sony Entertainment,uk
-TCM,uk
-TCM (Analogue),uk
-TG4,uk
-TV3,uk
-Tara Television,uk
-The Box,uk
-Trouble Analogue,uk
-Trouble Digital,uk
-Tyne Tees Television,uk
-UK Drama,uk
-UK Gold,uk
-UK Gold 2,uk
-UK Horizons,uk
-UK Style,uk
-Ulster ,uk
-VH1,uk
-Yorkshire,uk
-Zee TV,uk
diff --git a/Tools/epg2timers/get_merkliste.pl b/Tools/epg2timers/get_merkliste.pl
deleted file mode 100755
index bb23fa3b2..000000000
--- a/Tools/epg2timers/get_merkliste.pl
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/perl
-# Create a user agent object
-
-use HTML::Entities;
-use HTML::Parser;
-use LWP::UserAgent;
-use IO::Handle;
-
-STDOUT->autoflush(1);
-
-$ua = new LWP::UserAgent;
-$ua->agent("Mozilla/9.1 " . $ua->agent);
-# $ua->proxy('http', 'http://localhost:8080/');
-
-$filename = "merkliste.html";
-$base_url = "http://www.tvtv.de";
-# Hier das Bookmark von TVTV eintragen:
-@files_to_fetch = ("/cgi-bin/bookmark.cgi?id=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-
-$num = 0;
-$state = 0;
-
-$p = HTML::Parser->new( api_version => 3,
-                        start_h =>  [\&fparser_start, "tagname, attr"],
-                        unbroken_text => 1 );
-
-foreach $url (@files_to_fetch) {
-   $nurl = $base_url . $url;
-   print "Getting " . $nurl . "...\n";
-   $req = new HTTP::Request GET => $nurl;
-   $res = $ua->request($req);
-   if ($res->is_success) {
-      open (OUTFILE, ">" . $filename);
-      print OUTFILE $res->content;
-      close (OUTFILE);
-      $p->parse ($res->content);
-      $p->eof;
-   } else {
-      print "...FAILED\n";
-   }
-}
-# Zielordner fuer die Speicherung der Merkliste:
-
-print "...saved to 'merkliste.html'\n";
-sub fparser_start {
-   my($tagname, $attr_t) = @_;
-   my(%attr) = %$attr_t;
-
-   if ($tagname eq "frame") {
-      if ($state == 1) {
-         if (($attr{name} eq "frame_main") ||
-             ($attr{name} eq "frame_nav") ||
-             ($attr{name} eq "frame_nav_bottom")) {
-            push @files_to_fetch, $attr{src};
-         }
-      }
-      if ($state == 2) {
-         if (($attr{name} eq "frame_content")) {
-            push @files_to_fetch, $attr{src};
-         }
-      }
-   }
-   if ($tagname eq "a") {
-      if ($attr{href} ne "") {
-         $last_href = $attr{href};
-         if ($state == 0) {
-            push @files_to_fetch, $last_href;
-            $state = 1;
-         }
-      }
-   }
-   if ($tagname eq "img") {
-      if ($state == 1) {
-         if ($attr{src} =~ /b_joblist/i) {
-            $state = 2;
-            push @files_to_fetch, $last_href;
-         }
-      }
-   }
-}
-
-
diff --git a/Tools/epg2timers/loadvdr.pl b/Tools/epg2timers/loadvdr.pl
deleted file mode 100755
index 485b0a4a5..000000000
--- a/Tools/epg2timers/loadvdr.pl
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/perl
-#
-# 0.01 loadvdr (peter)
-# 0.02 delete old entries before updating (peter) 
-# 0.03 dumped Net::Telnet because of lost connections
-#
-# please submit diffs to petera@gmx.net
-#
-# ./epg2timers < merkliste.html | perl -w loadvdr.pl
-#
-#
-
-use Socket;
-use Getopt::Std;
-
-@resp = ();
-
-$Dest = "localhost";
-$Port = 2001;
-
-$Timeout = 10; # max. seconds to wait for response
-
-$SIG{ALRM} = sub { Error("timeout"); };
-alarm($Timeout);
-
-$iaddr = inet_aton($Dest)                   || Error("no host: $Dest");
-$paddr = sockaddr_in($Port, $iaddr);
-
-$proto = getprotobyname('tcp');
-socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
-connect(SOCK, $paddr)                       || Error("connect: $!");
-select(SOCK); $| = 1;
-Receive_void();
-
-Send("lstt");
-
-foreach $item (reverse @resp){
-  if ($item =~ /^250.(\d{1,2}).*\(epg2timers\)/) {
-    Send_void("DELT $1");
-  }
-}
-
-while (defined ($line = <STDIN>)) {
-  chomp $line;
-  Send_void("UPDT $line");
-}
-
-Send("quit");
-close(SOCK)                                 || Error("close: $!");
-
-
-
-sub Send
-{
-  my $cmd = shift || Error("no command to send");
-  print SOCK "$cmd\r\n";
-  Receive();
-}
-
-sub Send_void
-{
-  my $cmd = $_[0];
-  print SOCK "$cmd\r\n";
-  Receive_void();
-}
-
-sub Receive
-{
-  while (<SOCK>) {
-        chomp;
-        push @resp,$_;
-        last if substr($_, 3, 1) ne "-";
-        }
-}
-
-sub Receive_void
-{
-  while (<SOCK>) {
-        last if substr($_, 3, 1) ne "-";
-        }
-}
-
-sub Error
-{
-  print STDERR "@_\n";
-  close(SOCK);
-  exit 0;
-}
-
diff --git a/Tools/epg2timers/update_timers b/Tools/epg2timers/update_timers
deleted file mode 100755
index 3849841b6..000000000
--- a/Tools/epg2timers/update_timers
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# update_timers: retrieve a new "merkliste" from http://tvtv.de,
-# convert it to vdr format and transmit it to vdr via SVDRP.
-
-TOOLDIR="/home/cko/bin"
-CHANPATH="/home/cko/VDR/channels.conf"
-
-cd /tmp
-rm -f merkliste.html
-
-# if you have a slow dial up connection to your name server and/or ISP,
-# this will avoid a timeout in get_merkliste.pl.
-ping -c 2 www.tvtv.de
-
-# get the "merkliste".
-$TOOLDIR/get_merkliste.pl
-
-if [ -s merkliste.html ] ; then
-   # convert merkliste.html to timers.conf format and transmit it to vdr.
-   $TOOLDIR/epg2timers $CHANPATH < merkliste.html | $TOOLDIR/loadvdr.pl
-fi
diff --git a/Tools/epg2timers/update_timers.old b/Tools/epg2timers/update_timers.old
deleted file mode 100755
index c4c3f5c5e..000000000
--- a/Tools/epg2timers/update_timers.old
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# update_timers: load a new "merkliste" from http://tvtv.de
-# and create a new VDR timer configuration file (timers.conf)
-# from it. Restart VDR if the timers have changed.
-
-TOOLDIR="/home/cko/bin"
-VDRDIR="/home/cko/VDR"
-
-cd /tmp
-rm -f merkliste.html epgtimers.new epgtimers.old vdrtimers.old
-ping -c 2 www.tvtv.de
-$TOOLDIR/get_merkliste.pl
-if [ -s merkliste.html ] ; then
-   $TOOLDIR/epg2timers $VDRDIR/channels.conf < merkliste.html | sort -t: +2.0 -5.0 > epgtimers.new
-   fgrep '(epg2timers)' $VDRDIR/timers.conf | sort -t: +2.0 -5.0 > epgtimers.old
-   if ! cmp -s epgtimers.old epgtimers.new ; then
-      /sbin/killproc $VDRDIR/vdr
-      fgrep -v '(epg2timers)' $VDRDIR/timers.conf > vdrtimers.old
-      cat epgtimers.new vdrtimers.old | sort -t: +2.0 -5.0 > $VDRDIR/timers.conf
-      echo "Timers updated."
-   fi
-fi
-rm -f merkliste.html epgtimers.new epgtimers.old vdrtimers.old
diff --git a/Tools/master-timer/LIESMICH b/Tools/master-timer/LIESMICH
deleted file mode 100644
index 8e53da955..000000000
--- a/Tools/master-timer/LIESMICH
+++ /dev/null
@@ -1,70 +0,0 @@
-Master-Timer
-============
-(w) by Matthias Schniedermeyer (ms@citd.de)
-
-
-1. Einleitung
--------------
-
-Master-Timer ist ein System zum automatischen Aufnehmen von Serien und Filmen.
-Beim Aufruf werden die Konfigurationsdateien gelesen, die Datei "epg.data" im
-aktuellen Verzeichnis nach passenden Sendungen durchsucht und die ermittelten
-Timer per SVDRP in VDR programmiert. Danach beendet sich Master-Timer.
-
-Entsprechend empfiehlt es sich, Master-Timer per cronjob aufzurufen.
-
-2. Konfigurationsdateien
-------------------------
-
-Alle Konfigurationsdateien liegen unter "~/.master-timer". Es werden
-regulaere Ausdruecke ohne Unterscheidung der Gross-/Kleinschreibung
-benutzt.
-
-config: Die Hauptkonfigurationsdatei.
-
-deepblack: Eine Negativliste von Titeln, die man NIEMALS NIMMER sehen will.
-           Die epg-datensaetze werden beim Parsen einfach entfernt.
-
-subtitle-movies: Eine Liste der "Subtitel", die ein Zeichen fuer einen Film
-  sind (soweit die von den Sendern richtig ausgefuellt sind). Die
-  Einstellungen in dieser Datei werden fuer das Makro "MOVIE" in torecord
-  benutzt.
-  Kommentarzeilen sind nicht erlaubt.
-
-torecord: Liste der aufzunehmenden Filme.
-
-done: Liste der Titel/Subtitel, die bereits aufgenommen wurden. Timer, die
-  hier auftauchen, werden in VDR automatisch geloescht.
-
-channels-to-scan: Diese Kanaele werden vom Skript "scan-channels" durch-
-  geschaltet (zwecks Einlesen der EPG-Daten). Die Datei wird von Master-
-  Timer selbst nicht benutzt.
-
-3. Anmerkungen
---------------
-
-- einige Sender fuellen die EPG-Felder nicht korrekt aus. Diese Fehler
-  werden von Master-Timer automatisch korrigiert.
-
-  Pro7: Title aus dem Subtitle entfernen '<Title> / <Subtitle>'
-  Pro7: Timer zwischen 00:00 und 05:00 werden einen Tag in die Zukunft
-        verschoben (Als unguten Nebeneffekt hat dies zur Folge das zum
-        aktuellen Tag NICHT die epg-Daten das folgenden Tags (=Das was in
-        der Fernsehzeitschrift noch auf der gleichen Seite ist) mehr gesendet
-        werden. Wenn man also "Last Minute" etwas aufnehmen will, dann muss
-        man (leider) einen Timer "per Hand" in VDR einprogrammieren!)
-  VOX/VIVA: Subtitle ist in "" eingeschlossen nd nach ". " steht die description
-  VIVA: Wenn der Subtitle mit einem Space beginnt, dann wird der komplette
-        Subtitle in die Description verschoben
-  RTL2: Wenn der EPG-Datensatz eine Dauer von kleiner/gleich 1 Sekunde hat, 
-        wird er einfach verworfen.
-
-Bis auf den jeweils 2ten VIVA&Pro-7 Bug werden die Fixes an jedem
-epg-Datensatz ausprobiert.
-
-4. Bekannte Bugs
-----------------
-
-- Es wird nicht geprueft ob noch genug DVB-Karten vorhanden sind
-- "Joined timers" werden nur automatisch geloescht wenn alle dazugehoerigen
-  Sendungen "done" sind.
diff --git a/Tools/master-timer/README b/Tools/master-timer/README
deleted file mode 100644
index 05cc41acc..000000000
--- a/Tools/master-timer/README
+++ /dev/null
@@ -1,58 +0,0 @@
-Master-Timer
-============
-(w) by Matthias Schniedermeyer (ms@citd.de)
-
-
-1. Introduction
----------------
-
-Master-Timer is a system designed for automatically recording movies.
-Upon execution it reads its configuration files, scans the file "epg.data"
-in the current directory for matching titles and programs them via SVDRP
-into VDR.
-
-You may for example run Master-Timer as a cron job.
-
-2. Config files
----------------
-
-Configuration files are located in "~/.master-timer". Each entry is a
-regular expression so you can use all Perl style REs you want. They are
-processed case insensitive.
-
-config: Main configuration file.
-
-deepblack: Blacklist of "titles" you NEVER EVER want to see.
-
-subtitle-movies: A list of "Subtitles" which indicate a movie (used
-  by the "MOVIE" macro in torecord).
-  For channels that correctly fill out the subtitle e.g. it will not
-  work with *eRTL*.
-
-torecord:  The titles you want to record.
-
-done: 	The titles/subtitles which are already recorded/should not be recorded
-  Programmed timers which got inserted into "done" will be deleted
-  automatically.
-
-channels-to-scan: Used only by the separate "scan-channels" script which
-  switches through channels in order to get EPG data.
-
-4. Notices
-----------
-
-- Recordings overlapping on the same channel will be joined into one timer
-- Title/Subtitle/Descriptions are "fixed" for channels that don't fill them 
-  out correctly (Pro-7/VOX/VIVA)
-  Pro7: Remove the Title from the Subtitle  '<Title> / <Subtitle>'
-  VOX/VIVA: Subtitle is enclosed into "" and after ". " is the description
-  VIVA: When the Subtitle beginns with space the subtitle is moved to
-        description
-  All (except the second VIVA one) fixes are tried onto ALL Subtitles.
-
-5. Known-Bugs
--------------
-
-- It isn't checked if there are enough DVB-Cards
-- Overlapping timers on the same channel are always joined
-- Joined timers which are "done" don't get deleted automatically
diff --git a/Tools/master-timer/THANKS b/Tools/master-timer/THANKS
deleted file mode 100644
index 04bb13bad..000000000
--- a/Tools/master-timer/THANKS
+++ /dev/null
@@ -1,18 +0,0 @@
-Klaus Schmidinger
-	- VDR
-
-Malte Kiesel
-	- Suggestions
-	- Bug Reports
-	- Documentation Updates for README/LIESMICH/torecord/deepblack/config
-
-Guido Fiala
-	- Suggestions
-	- Bug Repots
-	- finding bugs i found just before i read that part of his mails
-          (First the bug, then the errormessages! Otherwise i will search/find
-           the bug myself :-))) )
-
-Axel Gruber
-	- Suggestions
-	- Bug Reports
diff --git a/Tools/master-timer/Todo b/Tools/master-timer/Todo
deleted file mode 100644
index 1757ade08..000000000
--- a/Tools/master-timer/Todo
+++ /dev/null
@@ -1,6 +0,0 @@
-
-- "Komfortable" Anzeige, mit Black & Whitelisten, fuer Genres/Titeln usw.
-- Abspielen (mit automatischen "killen" des "Frontend"-VDRs) von
-  Aufzeichnungen
-- "View"-Timer d.h. Timer der nicht Aufnimmt sondern nur den Kanal aendert
-- "unwichtige" Timer "verdraengen" wenn andere Aufnahmen anstehen.
diff --git a/Tools/master-timer/convert-DTV2VDR.pl b/Tools/master-timer/convert-DTV2VDR.pl
deleted file mode 100755
index fb2a78310..000000000
--- a/Tools/master-timer/convert-DTV2VDR.pl
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# The EPG-Entrys
-my (%Entry, %channel, $mode);
-
-# 0 = VDR -> DTV
-# 1 = DTV -> VDR
-$mode = 0;
-
-read_channel_list();
-if ($mode) {
-  &read_dtv();
-  &read_epgdata();
-} else {
-  &read_epgdata();
-  &read_dtv();
-}
-&print_VDR();
-
-sub read_epgdata {
-  my ($channel, $duration, $title, $subtitle, $description, $time);
-  open (FI,"epg.data") or die ("Can't open file \"epg.data\"\n");
-
-  while (<FI>) {
-    # Begin Channel
-    if (/^C\s(\d+)\s+(.+)/) {
-      $channel=$2;
-      while (<FI>) {
-	# End Channel
-	if (/^c$/) {
-	  last;
-	}
-	# Begin Timer
-	elsif (/^E\s(\d+)\s+(\d+)\s+(\d+)$/) {
-	  # Undef this Variables because it is possibel that not every timer uses this values
-	  undef $duration;
-	  undef $subtitle;
-	  undef $description;
-
-	  $time=$2;
-	  $duration=$3;
-	}
-	# Title
-	elsif (/^T\s(.*)/) {
-	  $title=$1;
-	}
-	# Subtitle
-	elsif (/^S\s(.*)/) {
-	  $subtitle=$1;
-	}
-	# Description
-	elsif (/^D\s(.*)/) {
-	  $description=$1;
-	}
-	# End Timer
-	elsif (/^e$/) {
-	  if ($mode) {
-	    # DTV -> VDR
-	    $Entry{$channel}{$time}{subtitle}=$subtitle if ($subtitle);
-	    if ($description) {
-	      if ($Entry{$channel}{$time}{description}) {
-		$Entry{$channel}{$time}{description} = "DTV: '$Entry{$channel}{$time}{description}' VDR: '$description'";
-	      } else {
-		$Entry{$channel}{$time}{description} = "DTV: '' VDR: '$description'";
-	      }
-	    }
-	  } else {
-	    # VDR -> DTV
-	    $Entry{$channel}{$time}{title}=$title;
-	    $Entry{$channel}{$time}{duration}=$duration;
-	    $Entry{$channel}{$time}{subtitle}=$subtitle if ($subtitle);
-	    $Entry{$channel}{$time}{description}=$description if ($description);
-	  }
-	}
-      }
-    }
-  }
-  close (FI);
-}
-
-sub read_dtv {
-  my ($channel, $time, $duration, $title, $category, $subtitle, $description);
-  open (FI,$ARGV[0]) or die "Can't open DTV-File";
-
-  while (<FI>) {
-    chomp;
-    ($channel, $time, $duration, $title, $category, $subtitle, $description) = split (/\|/);
-    if (!$channel{$channel}) {
-      next;
-    }
-    $channel = $channel{$channel};
-    if ($mode) {
-      # DTV -> VDR
-      if (!$subtitle && $description =~ /^\"(.*?)\"\:\s(.*)/) {
-	$Entry{$channel}{$time}{subtitle} = $1;
-	$description = $2;
-      }
-      $Entry{$channel}{$time}{title} = $title;
-      $Entry{$channel}{$time}{duration} = $duration;
-      $Entry{$channel}{$time}{subtitle} = $subtitle if ($subtitle);
-      $Entry{$channel}{$time}{category} = $category if ($category);
-      $Entry{$channel}{$time}{description} = $description if ($description);
-    } else {
-      # VDR -> DTV
-      $Entry{$channel}{$time}{category} = $category if ($category);
-      if ($description) {
-	if (!$Entry{$channel}{$time}{subtitle} && $description =~ /^\"(.*?)\"\:\s(.*)/) {
-	  $Entry{$channel}{$time}{subtitle} = $1;
-	  $description = $2;
-	}
-	if ($Entry{$channel}{$time}{description}) {
-	  $Entry{$channel}{$time}{description} = "DTV: '$description' VDR: '$Entry{$channel}{$time}{description}'";
-	} else {
-	  $Entry{$channel}{$time}{description} = "DTV: '$description' VDR: ''";
-	}
-      }
-    }
-  }
-  close (FI);
-}
-
-sub read_channel_list {
-  my ($old, $new);
-  open (FI,"$ENV{HOME}/.master-timer/convert-channel-list") or die ("Can't read channel-List");
-  while (<FI>) {
-    chomp;
-    ($old, $new) = split (/\|/);
-    $channel{$old} = $new;
-  }
-  close (FI);
-}
-
-sub print_VDR() {
-  my ($channel, $title, $time);
-  foreach $channel (sort keys %Entry) {
-    print "C 1 $channel\n";
-    foreach $time (sort keys %{%Entry->{$channel}}) {
-      if ($Entry{$channel}{$time}{duration}) {
-	print "E 1 $time $Entry{$channel}{$time}{duration}\n";
-	print "K $Entry{$channel}{$time}{category}\n" if ($Entry{$channel}{$time}{category});
-	print "T $Entry{$channel}{$time}{title}\n";
-	print "S $Entry{$channel}{$time}{subtitle}\n" if ($Entry{$channel}{$time}{subtitle});
-	print "D $Entry{$channel}{$time}{description}\n" if ($Entry{$channel}{$time}{description});
-	print "e\n";
-      }
-    }
-    print "c\n";
-  }
-}
diff --git a/Tools/master-timer/convert-oldtorecord.pl b/Tools/master-timer/convert-oldtorecord.pl
deleted file mode 100755
index 853c20bab..000000000
--- a/Tools/master-timer/convert-oldtorecord.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl
-
-while (<>)
-  {
-    chomp;
-    if ($_ && !(/^\#/))
-      {
-	($title, $subtitle, $description, $channel, $timeframe, $prio, $timer_title, $margin, $machine) = split (/\|/,$_);
-	
-	if ($timer_title) {
-	  print "[$timer_title]\n";
-	} elsif ($title) {
-	  print "[$title]\n";
-	} elsif ($subtitle) {
-	  print "[$subtitle]\n";
-	} elsif ($description) {
-	  print "[$description]\n";
-	} else {
-	  die ("Illegal Format");
-	}
-	
-	# Accept torecord only if it is for the current machine
-	if ($title)
-	  {
-	    print "Title = $title\n";
-	  }
-	if ($subtitle)
-	  {
-	    print "Subtitle = $subtitle\n";
-	  }
-	if ($description)
-	  {
-	    print "Description = $description\n";
-	  }
-	if ($channel)
-	  {
-	    print "Channel = $channel\n";
-	  }
-	if ($timeframe)
-	  {
-	    print "Timeframe = $timeframe\n";
-	  }
-	if ($prio)
-	  {
-	    print "Prio = $prio\n";
-	  }
-	if ($timer_title)
-	  {
-	    print "Timertitle = $timer_title\n";
-	  }
-	if ($margin)
-	  {
-	    print "Margin = $margin\n";
-	  }
-	if ($machine)
-	  {
-	    print "Instance = $machine\n";
-	  }
-	print "\n";
-      }
-  }
diff --git a/Tools/master-timer/master-timer.pl b/Tools/master-timer/master-timer.pl
deleted file mode 100755
index 5ddf90940..000000000
--- a/Tools/master-timer/master-timer.pl
+++ /dev/null
@@ -1,1412 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-# For the TCP-Connection to VDR
-use Socket;
-# For converting the Timers, read from VDR, back to Unix-Timestamps
-use Time::Local;
-# For parsing the command line
-use Getopt::Std;
-
-# Debugmode
-# You have to add the following numbers to build the debug-var
-# 1     : Dump the "torecord"
-# 2     : Dump all timers
-# 4     : Show when a timer will be deleted
-# 8     : Dump the "Done" REs
-# 16    : Verbose Config-Reading
-# 32    : Dump Program Variable
-# 64    : Excessive deepblack/torecord debuging
-my $debug = 6;
-
-# The Supervariable Program
-# %Program{$title}{$channel}{$time}{duration}
-#                                  {subtitle}
-#                                  {description}
-
-# The Supervariable Timer
-# %Timer{$time}{$channel}{$title}{duration}
-#                                {subtitle}
-#                                {description}
-#                                {prio}
-#                                {lifetime}
-#                                {real_title}
-#                                {VDR} (Already programmed)
-# The Value of VDR is ">0" for the position in the Timer-List or "R" for a "Repeating" Timer.
-# A Value of >1.000.000 is a Master Timer-Timer which is already programmed into VDR
-
-# The Supervariable torecord/deepblack
-# $torecord{timercount}
-#          {titleRE}
-#          {subtitleRE}
-#          {descriptionRE}
-#          {title}[COUNT]
-#          {subtitle}[COUNT]
-#          {description}[COUNT]
-#          {timeframe}[COUNT]
-#          {blackchannel}[COUNT] or {channel}[COUNT]
-#          {weekday}[COUNT]
-#          {minlength}[COUNT]
-#          {maxlength}[COUNT]
-#          {prio}[COUNT]
-#          {timertitle}[COUNT]
-#          {marginstart}[COUNT]
-#          {marginstop}[COUNT]
-#          {instance}[COUNT]
-
-# Variable-Definition
-my (%Program, @channels, %channels, %Timer);
-
-# Which Subtitles are Movies
-my ($subtitle_movie);
-my ($test_subtitle_movie);
-
-# Blacklist
-my (%deepblack);
-
-# What is already recorded/Should not be recorded
-my ($title_done, $subtitle_done);
-
-# What to record
-my (%torecord);
-
-# The Commandline
-my (%Opts);
-
-# Default Priority for Timers (Config: defaultprio)
-my $default_prio = 50;
-
-# How many DVB-S cards are there (Config: DVBCards)
-my $DVB_cards = 1;
-
-# How many seconds to substract from the time and to add to the duration
-my $marginstart = 60*10; # Config: Marginstart
-my $marginstop = 60*10; # Config: Marginstop
-
-# Shall Timers, on the same channel, be joined if they overlap
-my $jointimers = 0;
-
-# Hostname/IP of DVB-Computer and the Port of VDR
-my @Dest = ("localhost:2001"); # Config: Dest
-
-# Which VDR-Instance shall be used
-my $currentVDR = 1;
-
-# Where are the Config-Files
-my $configdir = "$ENV{HOME}/.master-timer";
-
-# Should the description be transfered to VDR?
-my $Description = 0;
-
-# Working-Variables
-my ($title, $duration, $subtitle, $channel, $time, $description, $category, $hit);
-my (@time, @date);
-
-END {
-  &closesocket();
-}
-
-&init();
-&dumpdone() if ($debug & 8);
-&dumptorecord("torecord") if ($debug & 1);
-&dumptorecord("deepblack") if ($debug & 1);
-print "Subtitle-Movie \"$subtitle_movie\"\n" if($debug & 1);
-# If we only have to dump the running series then exit after dumping them
-if ($Opts{s}) {
-  &dumpepgdata;
-  exit 0;
-}
-&processdone();
-&fetchVDRTimers();
-&process_torecord();
-print "Timers before joining\n" if ($debug & 2 && $jointimers);
-&dumptimers() if ($debug & 2);
-
-if ($jointimers) {
-  &jointimers();
-  print "Timers after joining\n" if ($debug & 2);
-  &dumptimers() if ($debug & 2);
-}
-
-&dumpepgdata if ($debug & 32);
-
-&printtimers();
-&transfertimers();
-
-#
-# End of Program
-#
-
-#
-# Subfunctions
-#
-
-sub dumpdone() {
-  print "Start Done-dump\n";
-  print "Titledone: \"$title_done\"\n";
-  print "Subtitledone \"$subtitle_done\"\n";
-  print "End Done-dump\n";
-}
-
-sub dumpepgdata () {
-  print "Start EPG-Dump\n";
-  foreach $title (sort keys %Program) {
-    foreach $channel (sort keys %{%Program->{$title}}) {
-      foreach $time (sort {$a <=> $b} keys %{%Program->{$title}->{$channel}}) {
-	print "Title: \"$title\" ";
-	if (!$Opts{s}) {
-	  print "Subtitle: \"$Program{$title}{$channel}{$time}{subtitle}\" " if ($Program{$title}{$channel}{$time}{subtitle});
-	  print "Time: \"$time\"";
-	}
-	print "Channel: \"$channel\"";
-	print "\n";
-	if ($Opts{s}) {
-	  last;
-	}
-      }
-    }
-  }
-  print "End EPG-Dump\n";
-}
-
-
-sub dumptorecord() {
-  my ($context) = shift;
-  my ($rContext);
-
-  if ($context eq "torecord") {
-    $rContext = \%torecord;
-  } elsif ($context eq "deepblack") {
-    $rContext = \%deepblack;
-  } else {
-    die ("Illegal Context");
-  }
-
-  print "Start $context-dump\n";
-  print "Regex-Title: $$rContext{titleRE}\n";
-  print "Regex-Subtitle: $$rContext{subtitleRE}\n";
-  print "Regex-Description: $$rContext{descriptionRE}\n";
-  foreach my $num (0 .. $$rContext{timercount}) {
-    print "Entry Number $num: ";
-
-    print "Title: \"$$rContext{title}[$num]\" " if ($$rContext{title}[$num]);
-    print "Title: \"\" " unless ($$rContext{title}[$num]);
-
-    print "Subtitle: \"$$rContext{subtitle}[$num]\" "if ($$rContext{subtitle}[$num]);
-    print "Subtitle: \"\" " unless ($$rContext{subtitle}[$num]);
-	
-    print "Description: \"$$rContext{description}[$num]\" " if ($$rContext{description}[$num]);
-    print "Description: \"\" " unless ($$rContext{description}[$num]);
-	
-    print "Category: \"$$rContext{category}[$num]\" " if ($$rContext{category}[$num]);
-    print "Category: \"\" " unless ($$rContext{category}[$num]);
-	
-    print "Timeframe: \"$$rContext{timeframe}[$num]\" " if ($$rContext{timeframe}[$num]);
-    print "Timeframe: \"\" " unless ($$rContext{timeframe}[$num]);
-	
-    print "Weekday: \"$$rContext{weekday}[$num]\" " if ($$rContext{weekday}[$num]);
-    print "Weekday: \"\" " unless ($$rContext{weekday}[$num]);
-	
-    print "Channel: \"$$rContext{channel}[$num]\" " if ($$rContext{channel}[$num]);
-    print "Channel: \"\" " unless ($$rContext{channel}[$num]);
-	
-    print "Blackchannel: \"$$rContext{blackchannel}[$num]\" " if ($$rContext{blackchannel}[$num]);
-    print "Blackchannel: \"\" " unless ($$rContext{blackchannel}[$num]);
-	
-    print "Prio: \"$$rContext{prio}[$num]\" " if ($$rContext{prio}[$num]);
-    print "Prio: \"\" " unless ($$rContext{prio}[$num]);
-	
-    print "Timertitle: \"$$rContext{timertitle}[$num]\" " if ($$rContext{timertitle}[$num]);
-    print "Timertitle: \"\" " unless ($$rContext{timertitle}[$num]);
-
-    print "Marginstart: \"$$rContext{marginstart}[$num]\" " if ($$rContext{marginstart}[$num]);
-    print "Marginstart: \"\" " unless ($$rContext{marginstart}[$num]);
-
-    print "Marginstop: \"$$rContext{marginstop}[$num]\" " if ($$rContext{marginstop}[$num]);
-    print "Marginstop: \"\" " unless ($$rContext{marginstop}[$num]);
-
-    print "Minlength: \"$$rContext{minlength}[$num]\" " if ($$rContext{minlength}[$num]);
-    print "Minlength: \"\" " unless ($$rContext{minlength}[$num]);
-
-    print "Maxlength: \"$$rContext{maxlength}[$num]\" " if ($$rContext{maxlength}[$num]);
-    print "Maxlength: \"\" " unless ($$rContext{maxlength}[$num]);
-
-    print "Instance: \"$$rContext{instance}[$num]\" " if ($$rContext{instance}[$num]);
-    print "Instance: \"\" " unless ($$rContext{instance}[$num]);
-
-    print "\n";
-  }
-  print "End $context-dump\n";
-}
-
-sub dumptimers() {
-  print "Start Timers-dump\n";
-  foreach $time (sort {$a <=> $b} keys %Timer) {
-    foreach $channel (sort keys %{%Timer->{$time}}) {
-      foreach $title (sort keys %{%Timer->{$time}->{$channel}}) {
-	my ($prio, $lifetime, @time, @date, @time2);
-	my ($realtitle);
-	@time = &GetTime ($time);
-	@date = &GetDay ($time);
-	@time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
-	$subtitle = $Timer{$time}{$channel}{$title}{subtitle};
-	$prio = $Timer{$time}{$channel}{$title}{prio};
-	$lifetime = $Timer{$time}{$channel}{$title}{lifetime};
-	$realtitle = $Timer{$time}{$channel}{$title}{real_title};
-	print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:$lifetime:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\":$Timer{$time}{$channel}{$title}{VDR}\n";
-      }
-    }
-  }
-  print "End Timers-dump\n";
-}
-
-sub printtimers() {
-  foreach $time (sort {$a <=> $b} keys %Timer) {
-    foreach $channel (sort keys %{%Timer->{$time}}) {
-      foreach $title (sort keys %{%Timer->{$time}->{$channel}}) {
-	my ($prio, $lifetime, @time, @date, @time2);
-	if ($Timer{$time}{$channel}{$title}{VDR} eq 0) {
-	  my ($realtitle);
-	  @time = &GetTime ($time);
-	  @date = &GetDay ($time);
-	  @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
-	  $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
-	  $prio = $Timer{$time}{$channel}{$title}{prio};
-	  $lifetime = $Timer{$time}{$channel}{$title}{lifetime};
-	  $realtitle = $Timer{$time}{$channel}{$title}{real_title};
-
-	  print "2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:$lifetime:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"\n";
-	}
-      }
-    }
-  }
-}
-
-sub transfertimers() {
-  foreach $time (sort {$a <=> $b} keys %Timer) {
-    foreach $channel (sort keys %{%Timer->{$time}}) {
-      foreach $title (sort keys %{%Timer->{$time}->{$channel}}) {
-	my ($prio, $lifetime, $description, @time, @date, @time2, $realtitle, $result);
-	if ($Timer{$time}{$channel}{$title}{VDR} eq 0) {
-	  @time = &GetTime ($time);
-	  @date = &GetDay ($time);
-	  @time2 = &GetTime ($time + $Timer{$time}{$channel}{$title}{duration});
-	  $subtitle = $Timer{$time}{$channel}{$title}{subtitle};
-	  $prio = $Timer{$time}{$channel}{$title}{prio};
-	  $lifetime = $Timer{$time}{$channel}{$title}{lifetime};
-	  if ($Description) {
-	    $description = "||Description :\"$Timer{$time}{$channel}{$title}{description}\"";
-	  } else {
-	    $description = "";
-	  }
-	  $realtitle = $Timer{$time}{$channel}{$title}{real_title};
-
-	  ($result) = GetSend ("newt 2:$channels{$channel}{number}:$date[1]:$time[0]$time[1]:$time2[0]$time2[1]:$prio:$lifetime:$title:Title: \"$realtitle\"||Subtitle: \"$subtitle\"$description");
-	  print "Timer: $result" if ($debug & 2);
-	}
-      }
-    }
-  }
-}
-
-# Convert the Unix-Time-Stamp into "month" and "Day of month"
-sub GetDay {
-  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
-  $mon++;
-  $mon = sprintf ("%02i",$mon);
-  $mday = sprintf ("%02i",$mday);
-  return ($mon, $mday);
-}
-# Convert the Unix-Time-Stramp into Weekday
-sub GetWDay {
-  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
-  return ($wday);
-}
-
-# Convert the Unix-Time-Stramp into "hour" and "minute"
-sub GetTime {
-  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(shift);
-  $hour = sprintf ("%02i",$hour);
-  $min = sprintf ("%02i",$min);
-  return ($hour, $min);
-}
-
-# Workaround some EPG-Bugs
-sub correct_epg_data {
-  if ($subtitle) {
-    # For Pro-7. Remove $title from $subtitle
-    $subtitle =~ s/\Q$title\E\s\/\s//;
-	
-    # For VOX & VIVA. The Format it '"<Subtitle>". <Description>'
-    if ($subtitle =~ /^\"(.*?)\"\.\s(.*)/) {
-      # Lets see if there are Channels that where the VOX/VIVA scheme matches, but also have a description
-      if ($description) {
-	my $one = $1;
-	my $two = $2;
-	if ($description =~ /^DTV\:\s\'(.*)\' VDR:\s\'\'$/) {
-	  $description = "DTV: '$1' VDR: '$two'";
-	  $subtitle = $one;
-	} else {
-	  die ("Title: \"$title\" Channel: \"$channel\" Subtitle: \"$subtitle\"\nDescription: \"$description\"\n");
-	}
-      }
-      $subtitle = $1;
-      $description = $2;
-    }
-    elsif ($channel eq "VIVA") {
-      if ($subtitle =~ /^\s(.*)/) {
-	$subtitle = "";
-	$description = $1;
-      }
-    }
-  }
-
-  # Workaround for the broken PRO-7/Kabel-1 EPG-Date. If Time is between 00.00 and 05.00 the time is shifted forward by a day
-  if ($channel eq "Pro-7" || $channel eq "Kabel-1") {
-    my (@time);
-    @time = GetTime ($time);
-    if ($time[0] >= 0 && ($time[0] <= 4 || ($time[0] == 5 && $time[1] == 0))) {
-      $time += 24*60*60;
-    }
-  }
-}
-
-# Add a Recording into the "to record"-List
-sub addtimer {
-  my ($title, $realtitle, $subtitle, $channel, $time, $duration, $prio, $lifetime, $description, $VDR, $time2, $title2, $channel2, $marginstart, $marginstop);
-  ($title, $realtitle, $subtitle, $description, $channel, $time, $duration, $prio, $lifetime, $VDR, $marginstart, $marginstop) = @_;
-#  print "Title: \"$title\" Realtitle: \"$realtitle\" Subtitle: \"$subtitle\" Channel: \"$channel\" Time: \"$time\" Duration: \"$duration\" Prio: \"$prio\" VDR: \"$VDR\"\n";
-
-  foreach $time2 (sort keys %Timer) {
-    foreach $title2 (sort keys %{%Timer->{$time2}->{$channel}}) {
-      my ($ctime, $ctime2);
-      $ctime = $time2;
-      $ctime2 = $time2 + $Timer{$time2}{$channel}{$title2}{duration};
-
-      if (($time >= $ctime) && ($time <= $ctime2)) {
-	return;
-      }
-    }
-  }
-
-  $time -= $marginstart;
-  $duration += $marginstart + $marginstop;
-  $Timer{$time}{$channel}{$title}{duration}=$duration;
-  $Timer{$time}{$channel}{$title}{subtitle}=$subtitle;
-  $Timer{$time}{$channel}{$title}{description}=$description;
-  $Timer{$time}{$channel}{$title}{prio}=$prio;
-  $Timer{$time}{$channel}{$title}{lifetime}=$lifetime;
-  $Timer{$time}{$channel}{$title}{VDR}=$VDR;
-  $Timer{$time}{$channel}{$title}{real_title}=$realtitle;
-}
-
-sub deltimer() {
-  my ($time, $channel, $title, $delete_from_VDR);
-  ($time, $channel, $title, $delete_from_VDR) = @_;
-
-#  if ($delete_from_VDR) {
-#    if ($Timer{$time}{$channel}{$title}{VDR}) {
-#      if ($Timer{$time}{$channel}{$title}{VDR} =~ s/ ^R/) {
-#	print "Error: A Repeating-Timer can't be deleted from VDR: \"$title\"\n";
-#      }
-#      elsif ($Timer{$time}{$channel}{$title}{VDR} < 1000000) {
-#	print "A User-Programmed Timer has been deleted from VDR: \"$title\"\n";
-#      }
-#      else {
-#	
-#      }
-#    }
-#  }
-
-  delete $Timer{$time}{$channel}{$title}{duration};
-  delete $Timer{$time}{$channel}{$title}{subtitle};
-  delete $Timer{$time}{$channel}{$title}{prio};
-  delete $Timer{$time}{$channel}{$title}{VDR};
-  delete $Timer{$time}{$channel}{$title}{real_title};
-  delete $Timer{$time}{$channel}{$title};
-  delete $Timer{$time}{$channel} if (keys %{ $Timer{$time}{$channel} } == 1);
-  delete $Timer{$time} if (keys %{ $Timer{$time} } == 1);
-}
-
-sub delprogram() {
-  my ($title, $channel, $time);
-  ($title, $channel, $time) = @_;
-
-  delete $Program{$title}{$channel}{$time};
-  delete $Program{$title}{$channel} if (keys %{ $Program{$title}{$channel} } == 1);
-  delete $Program{$title} if (keys %{ $Program{$title} } == 1);
-}
-
-sub jointimers {
-  #
-  # FIXME: 2 Timers on the same channel will always be joined.
-  # It should be checked if there is another DVB-Card available.
-  #
-  # FIXME2: When one timer is already programmed in VDR, delete that timer in VDR.
-  my ($running, $counter, @times, $channel, $title, $channel2, $title2);
-  $running = 1;
- outer: while ($running) {
-    $counter = 0;
-    @times = sort {$a <=> $b} keys %Timer;
-
-    # We only need to check till the second last timer. The last one can't have a overlapping one.
-    while ($counter < $#times) {
-      foreach $channel (sort keys %{%Timer->{$times[$counter]}}) {
-	foreach $title (sort keys %{%Timer->{$times[$counter]}->{$channel}}) {
-	  if ($times[$counter + 1] < ($times[$counter] + $Timer{$times[$counter]}{$channel}{$title}{duration})) {
-	    foreach $channel2 (sort keys %{%Timer->{$times[$counter + 1]}}) {
-	      foreach $title2 (sort keys %{%Timer->{$times[$counter + 1]}->{$channel}}) {
-		if ($channel eq $channel2) {
-		  my ($duration, $subtitle, $description, $prio, $lifetime, $realtitle, $duration2, $subtitle2, $description2, $prio2, $lifetime2, $realtitle2);
-		  # Values from Lower-Timer
-		  $duration = $Timer{$times[$counter]}{$channel}{$title}{duration};
-		  $subtitle = $Timer{$times[$counter]}{$channel}{$title}{subtitle};
-		  $description = $Timer{$times[$counter]}{$channel}{$title}{description};
-		  $prio = $Timer{$times[$counter]}{$channel}{$title}{prio};
-		  $lifetime = $Timer{$times[$counter]}{$channel}{$title}{lifetime};
-		  $realtitle = $Timer{$times[$counter]}{$channel}{$title}{real_title};
-
-		  # Values from Higher-Timer
-		  $duration2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{duration};
-		  $subtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{subtitle};
-		  $description2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{description};
-		  $prio2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{prio};
-		  $lifetime2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{lifetime};
-		  $realtitle2 = $Timer{$times[$counter + 1]}{$channel2}{$title2}{real_title};
-
-		  # Use the Higher Priority/Lifetime for the new Timer
-		  $prio = ($prio > $prio2) ? $prio : $prio2;
-		  $lifetime = ($lifetime > $lifetime2) ? $lifetime : $lifetime2;
-
-		  # Delete the two "Obsolet" Timers
-		  &deltimer ($times[$counter], $channel, $title);
-		  &deltimer ($times[$counter + 1], $channel2, $title2);
-
-		  # And set the new one
-		  &addtimer ("$title + $title2", "$realtitle\~$realtitle2", "$subtitle\~$subtitle2", "$description\~$description2", $channel, $times[$counter], $duration2 + ($times[$counter + 1 ] - $times[$counter]),$prio,$lifetime,0,0,0);
-
-		  # Now a Value is "missing", so we will redo the whole thing. (This will do three-times JOIN correct)
-		  redo outer;
-		}
-	      }
-	    }
-	  }
-	}
-      }
-      $counter++;
-    }
-    undef $running;
-  }
-}
-
-sub process_torecord {
-  my ($subtitle, $description, $prio, $lifetime, $timertitle, $counter);
-  foreach $title (sort keys %Program) {
-    foreach $channel (sort keys %{%Program->{$title}}) {
-      foreach $time (sort {$a <=> $b} keys %{%Program->{$title}->{$channel}}) {
-
-	$counter = &testtimer("torecord", $title, $channel, $time);
-	if ($counter ne "Nothing") {
-
-	  # What Priority
-	  if ($torecord{prio}[$counter]) {
-	    $prio = $torecord{prio}[$counter];
-	  }
-	  else {
-	    $prio = 50;
-	  }
-
-	  # What Lifetime
-	  if ($torecord{lifetime}[$counter]) {
-	    $lifetime = $torecord{lifetime}[$counter];
-	  }
-	  else {
-	    $lifetime = 50;
-	  }
-
-	  # What Title to use for the timer
-	  if ($torecord{timertitle}[$counter]) {
-	    $timertitle = $torecord{timertitle}[$counter]
-	  }
-	  elsif ($torecord{title}[$counter]) {
-	    $timertitle = $torecord{title}[$counter]
-	  }
-	  else {
-	    $timertitle = $title;
-	  }
-
-	  # What subtitle to use
-	  if ($Program{$title}{$channel}{$time}{subtitle}) {
-	    $subtitle = $Program{$title}{$channel}{$time}{subtitle};
-	  }
-	  else {
-	    $subtitle = "";
-	  }
-
-	  # What Description to use
-	  if ($Program{$title}{$channel}{$time}{description}) {
-	    $description = $Program{$title}{$channel}{$time}{description};
-	  }
-	  else {
-	    $description = "";
-	  }
-
-	  &addtimer ($timertitle,$title,$subtitle,$description,$channel,$time,$Program{$title}{$channel}{$time}{duration},$prio,$lifetime,0,$torecord{marginstart}[$counter],$torecord{marginstop}[$counter]);
-	}
-      }
-    }
-  }
-}
-
-# Test if a torecord/deepblack Entry matches the current EPG-Data-Field
-sub testtimer {
-  my ($context) = shift;
-  my ($title) = shift;
-  my ($channel) = shift;
-  my ($time) = shift;
-  my ($counter, $rContext);
-
-  if ($context eq "torecord") {
-    $rContext = \%torecord;
-  } elsif ($context eq "deepblack") {
-    $rContext = \%deepblack;
-  } else {
-    die ("Illegal Context");
-  }
-
-  if ($debug & 64) {
-    print "\n";
-    print "Context: \"$context\"\nTitle: \"$title\"\n";
-    print "Subtitle: \"$Program{$title}{$channel}{$time}{subtitle}\"\n" if ($Program{$title}{$channel}{$time}{subtitle});
-    print "Description \"$Program{$title}{$channel}{$time}{description}\"\n" if ($Program{$title}{$channel}{$time}{description});
-    print "Category \"$Program{$title}{$channel}{$time}{category}\"\n" if ($Program{$title}{$channel}{$time}{category});
-    print "Channel: $channel\n";
-    print "Time: $time\n";
-    print "Duration: $Program{$title}{$channel}{$time}{duration}\n";
-  }
-
-  # First look if any of the Title/Subtitle/Description REs match
-  if ($title =~ /$$rContext{titleRE}/i) {
-    print "Title hit\n" if ($debug & 64);
-  }
-  elsif ($Program{$title}{$channel}{$time}{subtitle} && $Program{$title}{$channel}{$time}{subtitle} =~ /$$rContext{subtitleRE}/i) {
-    print "SubTitle hit\n" if ($debug & 64);
-  }elsif ($Program{$title}{$channel}{$time}{subtitle} && $test_subtitle_movie && $Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_movie/) {
-    print "SubTitle-Movie hit\n" if ($debug & 64);
-  }
-  elsif ($Program{$title}{$channel}{$time}{description} && $Program{$title}{$channel}{$time}{description} =~ /$$rContext{descriptionRE}/i) {
-    print "Description hit\n" if ($debug & 64);
-  } else {
-    # No "Fast"-hit. Exiting
-    return "Nothing";
-  }
-
-  # Now look if we have a "exact" hit
-  print "In Exact Hit Loop\n" if ($debug & 64);
-  foreach my $counter (0 .. $$rContext{timercount}) {
-
-    print "Before Title Match\n" if ($debug & 64);
-    if ($$rContext{title}[$counter]) {	
-      print "In Title Match \"$$rContext{title}[$counter]\"\n" if ($debug & 64);
-      if (!($title =~ /$$rContext{title}[$counter]/i)) {
-	print "Title rejected\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Subtitle Match\n" if ($debug & 64);
-    if ($$rContext{subtitle}[$counter]) {
-      print "In Subtitle Match \"$$rContext{subtitle}[$counter]\"\n" if ($debug & 64);
-      if ($Program{$title}{$channel}{$time}{subtitle}) {
-	if ($$rContext{subtitle}[$counter] =~ /^movie$/i) {
-	  if (!($Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_movie/i)) {
-	    print "Subtitle rejected 1\n" if ($debug & 64);
-	    next;
-	  }
-	}
-	elsif ($$rContext{subtitle}[$counter] =~ /^\!movie$/i) {
-	  if (($Program{$title}{$channel}{$time}{subtitle} =~ /$subtitle_movie/i)) {
-	    print "Subtitle rejected 2\n" if ($debug & 64);
-	    next;
-	  }
-	}
-	elsif (!($Program{$title}{$channel}{$time}{subtitle} =~ /$$rContext{subtitle}[$counter]/i)) {
-	  print "Subtitle rejected 3\n" if ($debug & 64);
-	  next;
-	}
-      } else {
-	# We had a Subtitle, but epg.data did not have a subtitle for this record so no chance to record this
-	print "Subtitle rejected 4\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Description Match\n" if ($debug & 64);
-    if ($$rContext{description}[$counter]) {
-      print "In Description Match \"$$rContext{description}[$counter]\"\n" if ($debug & 64);
-      if ($Program{$title}{$channel}{$time}{description}) {
-	if (!($Program{$title}{$channel}{$time}{description} =~ /$$rContext{description}[$counter]/i)) {
-	  print "Description rejected 1\n" if ($debug & 64);
-	  next;
-	}
-      }
-      elsif (!$$rContext{title}[$counter] && !$$rContext{subtitle}[$counter]) {
-	print "Description rejected 2\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Category Match\n" if ($debug & 64);
-    if ($$rContext{category}[$counter]) {
-      print "In Category Match \"$$rContext{category}[$counter]\"\n" if ($debug & 64);
-      if ($Program{$title}{$channel}{$time}{category}) {
-	my ($left, $right);
-	($left, $right) = split (/\//, $$rContext{category}[$counter]);
-	if ($left) {
-	  print "In Category Match Left \"$left\"\n" if ($debug & 64);
-	  if (!($Program{$title}{$channel}{$time}{category} =~ /^$left\//)) {
-	    print "Category rejected 1\n" if ($debug & 64);
-	    next;
-	  }
-	}
-	if ($right) {
-	  print "In Category Match Right \"$right\"\n" if ($debug & 64);
-	  if (!($Program{$title}{$channel}{$time}{category} =~ /\/$right$/)) {
-	    print "Category rejected 2\n" if ($debug & 64);
-	    next;
-	  }
-	}
-      } else {
-	# We had a Category, but the epg.data not. So discard this Entry
-	print "Category rejected 3\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Channel Match\n" if ($debug & 64);
-    if ($$rContext{channel}[$counter]) {
-      print "In Channel Match Whitelist-Mode \"$$rContext{channel}[$counter]\"\n" if ($debug & 64);
-      if (!($channel =~ /$$rContext{channel}[$counter]/)) {
-	print "Channel rejected\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    if ($$rContext{blackchannel}[$counter]) {
-      print "In Channel Match Blacklist-Mode \"$$rContext{blackchannel}[$counter]\"\n" if ($debug & 64);
-      if ($channel =~ /$$rContext{blackchannel}[$counter]/) {
-	print "Channel rejected\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Timeframe Match\n" if ($debug & 64);
-    if ($$rContext{timeframe}[$counter]) {
-      print "In Timeframe Match \"$$rContext{timeframe}[$counter]\"\n" if ($debug & 64);
-      my (@time, $time2, $ctime, $ctime2);
-      @time = GetTime($time);
-      $time2 = "$time[0]$time[1]";
-	
-      ($ctime, $ctime2) = split (/\-/,$$rContext{timeframe}[$counter]);
-	
-      if (!$ctime) {
-	$ctime = "0";
-      }
-      if (!$ctime2) {
-	$ctime2 = "2400";
-      }
-
-      if ($ctime < $ctime2) {
-	if (!($time2 >= $ctime && $time2 <= $ctime2)) {
-	  print "Timeframe rejected 1\n" if ($debug & 64);
-	  next;
-	}
-      }
-      else {
-	if (!(($time2 >= $ctime && $time2 <= "2400") || ($time2 >= "0" && $time2 <= $ctime2))) {
-	  print "Timeframe rejected 2\n" if ($debug & 64);
-	  next;
-	}
-      }
-    }
-
-    print "Before Weekday Match\n" if ($debug & 64);
-    if ($$rContext{weekday}[$counter]) {
-      print "In Weekday Match \"$$rContext{weekday}\"\n" if ($debug & 64);
-      my ($wday);
-      $wday = getWDay($time);
-      $$rContext{weekday}[$counter] =~ /(.)(.)(.)(.)(.)(.)(.)/;
-      if ($$wday eq "-") {
-	print "Weekday rejected\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Minlength Match\n" if ($debug & 64);
-    if ($$rContext{minlength}[$counter]) {
-      print "In Minlength Match \"$$rContext{minlength}[$counter]\"\n" if ($debug & 64);
-      if ($Program{$title}{$channel}{$time}{duration} < $$rContext{minlength}[$counter]) {
-	print "Minlength rejected\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    print "Before Maxlength Match\n" if ($debug & 64);
-    if ($$rContext{maxlength}[$counter]) {
-      print "In Maxlength Match \"$$rContext{maxlength}[$counter]\"\n" if ($debug & 64);
-      if ($Program{$title}{$channel}{$time}{duration} > $$rContext{maxlength}[$counter]) {
-	print "Maxlength rejected\n" if ($debug & 64);
-	next;
-      }
-    }
-
-    # All test passed. Accept this timer
-    print "All Tests passed entry accepted/blacklisted\n" if ($debug & 64);
-    return ($counter);
-    }
-  # Foreach ran out without a hit
-  return "Nothing";
-}
-
-# Open the connection to VDR
-sub initsocket {
-  my ($Dest, $Port) = split (/\:/,$Dest[$currentVDR - 1],2);
-  my $iaddr = inet_aton($Dest);
-  my $paddr = sockaddr_in($Port, $iaddr);
-  my $Timeout = 10; # max. seconds to wait for response
-
-  $SIG{ALRM} = sub { die("Timeout while connecting to VDR"); };
-  alarm($Timeout);
-
-  socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp'));
-  connect(SOCKET, $paddr) or die ("Can't connect to VDR\n");
-  select(SOCKET); $| = 1;
-  select(STDOUT);
-
-  while (<SOCKET>) {
-    last if substr($_, 3, 1) ne "-";
-  }
-  alarm(0);
-}
-
-# Send a command to VDR and read back the result
-sub GetSend {
-  my ($command, @retval);
-
-    while ($command = shift) {
-      print SOCKET "$command\r\n";
-      while (<SOCKET>) {
-	s/\x0d//g;
-	(@retval) = (@retval, $_);
-	last if substr($_, 3, 1) ne "-";
-      }
-    }
-  return (@retval);
-}
-
-# Close the socket to VDR
-sub closesocket {
-  print SOCKET "Quit\r\n";
-  close(SOCKET);
-}
-
-
-# Fetch the timers-List from VDR via SVDR and process it.
-sub fetchVDRTimers {
-  my (@timers, $timer, $position, $active, $channel, $day, $start, $end, $prio, $lifetime, $title, $subtitle, $minute, $duration);
-  my ($utime, $utime2);
-
-  # First fetch the timers-list from VDR
-  @timers = GetSend ("lstt");
-
-  foreach $timer (@timers) {
-    chomp $timer;
-    # a Valid Timer-line beginns with "250"
-    if ($timer =~ s/250-|250\s//) {
-      # Extract the Position in front of the line
-      ($position, $timer) = split (/\s/,$timer,2);
-
-#      print "Position: \"$position\" Timer: \"$timer\"\n";
-      # Split the : seperated values
-      ($active, $channel, $day, $start, $end, $prio, $lifetime, $title, $subtitle) = split (/\:/,$timer,9);
-
-      my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-      # If the string is exactly 7 char wide, then its a "repeating"-timer
-      if ($active >= 1) {
-	if ($day =~ /(.)(.)(.)(.)(.)(.)(.)/) {
-	  my (@days);
-	  @days = ($1, $2, $3, $4, $5, $6, $7);
-	  ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-	  $start =~ /(\d\d)(\d\d)/;
-	  $hour = $1;
-	  $minute = $2;
-	  $utime = timelocal 0, $minute, $hour, $mday, $mon, $year;
-	  $end =~ /(\d\d)(\d\d)/;
-	  $hour = $1;
-	  $minute = $2;
-	  $utime2 = timelocal 0, $minute, $hour, $mday, $mon, $year;
-	  if ($end < $start) {
-	    $utime2 += 24*60*60;
-	  }
-	  $duration = $utime2 - $utime;
-
-	  # "Normalize" the timestamp to monday
-	  $utime = $utime - ($wday * 24 * 60 *60);
-
-	  foreach my $num (0 .. $#days) {
-	    if ($days[$num] ne "-") {
-	      my $utime3;
-	      # Days before today will be shifted in the next week
-	      if (($num + 1) < $wday) {
-		$utime3 = $utime + (($num + 7 + 1) * 24 * 60 * 60);
-	      }
-	      else {
-		$utime3 = $utime + (($num + 1) * 24 * 60 * 60);
-	      }
-	      &addtimer ($title,$title,$subtitle,"",$channels[$channel],$utime3,$duration,$prio,$lifetime,"R$position",0,0);
-	    }
-	  }
-	}
-
-	# When the Day-Value is between 1 and 31, then its a "One time" Timer
-	elsif (($day >= 1) && ($day <= 31)) {
-	  if ($active == "2") {
-	    $position += 1000000;
-	  }
-	  # When the Day is before the Current-Day, then the Timer is for the next month
-	  if ($day < $mday) {
-	    $mon++;
-	    if ($mon == 12) {
-	      $mon = 0;
-	      $year ++;
-	    }
-	  }
-	  $start =~ /(\d\d)(\d\d)/;
-	  $hour = $1;
-	  $minute = $2;
-	  $utime = timelocal 0, $minute, $hour, $day, $mon, $year;
-	  $end =~ /(\d\d)(\d\d)/;
-	  $hour = $1;
-	  $minute = $2;
-	  $utime2 = timelocal 0, $minute, $hour, $day, $mon, $year;
-	  if ($end < $start) {
-	    $utime2 += 24*60*60;
-	  }
-	  $duration = $utime2 - $utime;
-
-	  &addtimer ($title,$title,$subtitle,"",$channels[$channel],$utime,$duration,$prio,$lifetime,$position,0,0);
-	}
-      }
-    }
-  }
-}
-
-# Parse file "epg.data"
-sub initepgdata {
-  open (FI,"epg.data") or die ("Can't open file \"epg.data\"\n");
-
-    while (<FI>) {
-      # Begin Channel
-      if (/^C\s(\d+)\s+(.+)/) {
-	$channel=$2;
-	while (<FI>) {
-	  # End Channel
-	  if (/^c$/) {
-	    last;
-	  }
-	  # Begin Timer
-	  elsif (/^E\s(\d+)\s+(\d+)\s+(\d+)$/) {
-	    # Undef this Variables because it is possibel that not every timer uses this values
-	    undef $duration;
-	    undef $subtitle;
-	    undef $description;
-	    undef $category;
-
-	    $time=$2;
-	    $duration=$3;
-	  }
-	  # Title
-	  elsif (/^T\s(.*)/) {
-	    $title=$1;
-	  }
-	  # Subtitle
-	  elsif (/^S\s(.*)/) {
-	    $subtitle=$1;
-	  }
-	  # Description
-	  elsif (/^D\s(.*)/) {
-	    $description=$1;
-	  }
-	  elsif (/^K\s(.*)/) {
-	    $category=$1;
-	  }
-	  # End Timer
-	  elsif (/^e$/) {
-	    # Only accept timers that are in the future
-	    if ($time < time) {
-	      next;
-	    }
-	    # Only accept timers that are at least 2 Seconds long
-	    if ($duration <= 1) {
-	      next;
-	    }
-
-	    # Work around the different Bugs in the data
-	    &correct_epg_data();
-
-	    # Check if the Title & Subtitle is in the Done-List (Only if Subtitle exists)
-	    if ($subtitle && $title =~ /$title_done/ && $subtitle =~ /$subtitle_done/) {
-	      next;
-	    }
-
-	    $Program{$title}{$channel}{$time}{duration}=$duration;
-	    if ($subtitle) {
-	      $Program{$title}{$channel}{$time}{subtitle}=$subtitle;
-	    }
-	    if ($description) {
-	      $Program{$title}{$channel}{$time}{description}=$description;
-	    }
-	    if ($category) {
-	      $Program{$title}{$channel}{$time}{category}=$category;
-	    }
-	    # Check if the title is in the DEEP-Blacklist
-	    if (&testtimer("deepblack", $title, $channel, $time) ne "Nothing") {
-	      print "Deepblack: \"$title\"" if ($debug & 64);
-	      print " $subtitle" if ($debug & 64 && $subtitle);
-	      print "\n" if ($debug & 64);
-	      &delprogram ($title, $channel, $time);
-	    }
-	  }
-	}
-      }
-    }
-  close (FI);
-}
-
-# What is a Movie (When correctly stored into Subtitle)
-sub initmovie {
-  my (@list,$list);
-  open (FI,"${configdir}/subtitle-movie") or return;
-  @list = <FI>;
-  close(FI);
-
-  foreach $list (@list) {
-    chomp $list;
-  }
-  $subtitle_movie = join ('|',@list);
-}
-
-# What is already recorded/Should not be recorded
-sub initdone {
-  my (@list,$list, %title_done, %subtitle_done, $title_temp, $subtitle_temp);
-  open (FI,"${configdir}/done") or return;
-  @list = <FI>;
-  close (FI);
-
-  foreach $list (@list) {
-    chomp $list;
-    ($title_temp,$subtitle_temp) = split (/\|/,$list);
-    if ($title_temp) {
-      $title_done{"^\Q$title_temp\E\$"} = 1;
-    }
-    if ($subtitle_temp) {
-      $subtitle_done{"^\Q$subtitle_temp\E\$"} = 1;
-    }
-  }
-  $title_done = join ('|',sort keys %title_done);
-  $subtitle_done = join ('|',sort keys %subtitle_done);
-}
-
-sub processdone {
-  # Now delete Timers in VDR that are already in the done-List
-  my ($list, @list, $position, $timer, $active, $g, $title, $subtitle, $counter, @todel);
-  $counter = 0;
-  @list = GetSend ("LSTT");
-
-  foreach $timer (@list) {
-    chomp $timer;
-    if ($timer =~ s/250-|250\s//) {
-      ($position, $timer) = split (/\s/,$timer,2);
-      # Split the : seperated values
-      ($active, $g, $g, $g, $g, $g, $g, $title, $subtitle) = split (/\:/,$timer,9);
-      if ($active == 2) {
-        # Title: "Shakespeare in Love"||Subtitle: "Romanze"
-        my ($ctitle, $csubtitle);
-        if ($subtitle && $subtitle =~ /^Title\:\s\"(.*)\"\|\|Subtitle\:\s\"(.*)\"/) {
-          $title = $1;
-          $subtitle = $2;
-          if ($subtitle) {
-            my (@titles, @subtitles, $num, $hit);
-            undef $hit;
-            @titles = split (/\~/,$title);
-            @subtitles = split (/\~/,$subtitle);
-            foreach $num (0 .. $#titles) {
-              if ($titles[$num] =~ /$title_done/ && $subtitles[$num] =~ /$subtitle_done/) {
-                $hit = 1;
-              }
-              else {
-                undef $hit;
-                last;
-              }
-            }
-
-            if ($hit) {
-              my ($result);
-              print "Delete Timer: $title $subtitle\n" if ($debug & 4);
-              $position -= $counter;
-              ($result) = GetSend ("DELT $position");
-              print "Result: $result" if ($debug & 4);
-              if ($result =~ /^250/) {
-                $counter++;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-# What should be recorded
-sub inittorecord {
-  my ($context) = shift;
-  my ($rContext);
-  my (@title_list, @subtitle_list, @description_list, $line);
-  my (%Input);
-  my $counter = 0;
-
-  if ($context eq "torecord") {
-    $rContext = \%torecord;
-    open (FI,"${configdir}/${context}") or die ("Can't open file \"$context\"\n");
-  } elsif ($context eq "deepblack") {
-    $rContext = \%deepblack;
-    open (FI,"${configdir}/${context}") or return;
-  } else {
-    die ("Illegal Context");
-  }
-
-
- outer: while (<FI>) {
-    chomp if ($_);
-    if ($_ && !(/^\#/) && /^\[.*\]$/) {
-      $line = $.;
-      undef %Input;
-      while (<FI>) {
-	chomp;
-	if ($_ && !(/^\#/)) {
-	  if (/^\[.*?\]$/) {
-	    last;
-	  }
-
-	  my ($key, $value);
-	  ($key, $value) = split (/\s+=\s+/);
-
-	  if ($key =~ /^title$/i) {
-	    if ($Input{title}) {
-	      $Input{title} .= "|$value";
-	    } else {
-	      $Input{title} = $value;
-	    }
-	    print "Titel = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^subtitle$/i) {
-	    if ($Input{subtitle}) {
-	      $Input{subtitle} .= "|$value";
-	    } else {
-	      $Input{subtitle} = $value;
-	    }
-	    print "Subtitel = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^description$/i) {
-	    if ($Input{description}) {
-	      $Input{description} .= "|$value";
-	    } else {
-	      $Input{description} = $value;
-	    }
-	    print "Description = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^category$/i) {
-	    $Input{category} = $value;
-	    print "Category = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^channel$/i) {
-	    if ($Input{channel}) {
-	      $Input{channel} .= "|^$value\$";
-	    } else {
-	      $Input{channel} = $value;
-	    }
-	    print "Channel = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^timeframe$/i) {
-	    $Input{timeframe} = $value;
-	    print "Timeframe = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^weekday$/i) {
-	    $Input{weekday} = $value;
-	    print "Weekday = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^minlength$/i) {
-	    $Input{minlength} = $value;
-	    print "Minlength = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^maxlength$/i) {
-	    $Input{maxlength} = $value;
-	    print "Maxlength = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^prio$/i) {
-	    $Input{prio} = $value;
-	    print "Prio = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^lifetime$/i) {
-	    $Input{lifetime} = $value;
-	    print "Lifetime = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^timertitle$/i) {
-	    $Input{timertitle} = $value;
-	    print "Timertitel = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^margin$/i) {
-	    $Input{margin} = $value;
-	    print "Margin = $value\n" if ($debug & 16);
-	  }
-	  elsif ($key =~ /^instance$/i) {
-	    $Input{instance} = $value;
-	    print "Instance = $value\n" if ($debug & 16);
-	  } else {
-	    print "Unkown Key: \"$key\" with Value: \"$value\"\n";
-	  }
-	}
-      }
-
-      # Accept entry only if it is for the current instance or for "no" instance
-      if (($Opts{s} && $Input{instance} && $Input{instance} eq "s") || !$Input{instance} || ($Input{instance} ne "s" && $Input{instance} == $currentVDR)) {
-	# Accept entry only if at least a Title/Subtitle/Description is provied
-	if (!$Input{title} && !$Input{subtitle} && !$Input{description}) {
-	  print "No Title/Subtitle/Description Field. $context entry ignored. Block beginning at Line $line\n";
-	  redo outer;
-	}
-
-	if ($Input{title}) {
-	  $$rContext{title}[$counter] = $Input{title};
-	  $title_list[$#title_list + 1] = $Input{title};
-	}
-	if ($Input{subtitle}) {
-	  if ($Input{subtitle} =~ /^movie$/i || $Input{subtitle} =~ /^\!movie$/i) {
-	    $test_subtitle_movie = 1;
-	  }
-	  $$rContext{subtitle}[$counter] = $Input{subtitle};
-	  $subtitle_list[$#subtitle_list + 1] = $Input{subtitle};
-	}
-	if ($Input{description}) {
-	  $$rContext{description}[$counter] = $Input{description};
-	  $description_list[$#description_list + 1] = $Input{description};
-	}
-	if ($Input{category}) {
-	  $$rContext{category}[$counter] = $Input{category};
-	}
-	if ($Input{channel}) {
-	  if ($Input{channel} =~ /\!/) {
-	    $Input{channel} =~ s/\!//g;
-	    $$rContext{blackchannel}[$counter] = $Input{channel};
-	  } else {
-	    $$rContext{channel}[$counter] = $Input{channel};
-	  }
-	}
-	if ($Input{timeframe}) {
-	  $$rContext{timeframe}[$counter] = $Input{timeframe};
-	}
-	if ($Input{weekday}) {
-	  $$rContext{weekday}[$counter] = $Input{weekday};
-	}
-	if ($Input{minlength}) {
-	  if ($Input{minlength} =~ /^(\d+)m$/) {
-	    $Input{minlength} = $1 * 60
-	  } elsif ($Input{minlength} =~ /^(\d+)h$/) {
-	    $Input{minlength} = $1 * 60 * 60
-	  }
-	  $$rContext{minlength}[$counter] = $Input{minlength};
-	}
-	if ($Input{maxlength}) {
-	  if ($Input{maxlength} =~ /^(\d+)m$/) {
-	    $Input{maxlength} = $1 * 60
-	  } elsif ($Input{maxlength} =~ /^(\d+)h$/) {
-	    $Input{maxlength} = $1 * 60 * 60
-	  }
-	  $$rContext{maxlength}[$counter] = $Input{maxlength};
-	}
-	if ($Input{prio}) {
-	  $$rContext{prio}[$counter] = $Input{prio};
-	}
-	if ($Input{lifetime}) {
-	  $$rContext{lifetime}[$counter] = $Input{lifetime};
-	}
-	else {
-	  $$rContext{prio}[$counter] = $default_prio;
-	}
-	if ($Input{timertitle}) {
-	  $$rContext{timertitle}[$counter] = $Input{timertitle};
-	}
-	if ($Input{margin}) {
-	  my ($start, $stop);
-	  ($start, $stop) = split (/;/,$Input{margin}, 2);
-	  $$rContext{marginstart}[$counter] = $start if ($start);
-	  $$rContext{marginstop}[$counter] = $stop if ($stop);
-	}
-	# Set Default-Margins if no margins defined
-	$$rContext{marginstart}[$counter] = $marginstart if (!$$rContext{marginstart}[$counter]);
-	$$rContext{marginstop}[$counter] = $marginstop if (!$$rContext{marginstop}[$counter]);
-	$counter++;
-	if ($Input{instance}) {
-	  $$rContext{instance}[$counter] = $Input{instance};
-	}
-      }
-      redo outer;
-    }
-  }
-
-  $$rContext{timercount} = $counter - 1;
-
-  $$rContext{titleRE} = join ('|',@title_list);
-  if ($$rContext{titleRE} && $$rContext{titleRE} =~ /\|.\|/) {
-    $$rContext{titleRE} = ".";
-  }
-  $$rContext{subtitleRE} = join ('|',@subtitle_list);
-  if ($$rContext{subtitleRE} && $$rContext{subtitleRE} =~ /\|.\|/) {
-    $$rContext{subtitleRE} = ".";
-  }
-  $$rContext{descriptionRE} = join ('|',@description_list);
-  if ($$rContext{descriptionRE} && $$rContext{descriptionRE} =~ /\|.\|/) {
-    $$rContext{descriptionRE} = ".";
-  }
-
-  if (!$$rContext{titleRE}) {
-    $$rContext{titleRE} = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
-  }
-  if (!$$rContext{subtitleRE}) {
-    $$rContext{subtitleRE} = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
-  }
-  if (!$$rContext{descriptionRE}) {
-    $$rContext{descriptionRE} = "^Dieseshierwirdgarantiertnieundnimmeraufirgendetwassinnvollesmatchen\$";
-  }
-}
-
-# Parse "LSTC"-Command of VDR
-sub initchannellist {
-  my ($counter, $chan, $garbage, $card, @temp_channels, $temp, $i);
-
-  @temp_channels = GetSend ("LSTC");
-
-  foreach $i (0 .. $#temp_channels) {
-    $temp = $temp_channels[$i];
-    chomp $temp;
-
-    if ($temp =~ s/250-|250\s//) {
-      ($counter, $temp) = split (/\s/,$temp,2);
-      ($chan, $garbage,$garbage, $garbage, $garbage, $garbage, $garbage, $card, $garbage) = split (/\:/,$temp);
-      $channels[$counter] = $chan;
-      $channels{$chan}{number} = $counter;
-      $channels{$chan}{card} = $card;
-      $counter++;
-    }
-  }
-}
-
-sub initconfigfile {
-  open (FI,"${configdir}/config") or return;
-  while (<FI>) {
-    s/\#.*//;
-    chomp;
-    if ($_) {
-      my ($key, $value);
-      ($key, $value) = split (/\s+=\s+/);
-      if ($key =~ /^debug$/i) {
-	$debug = $value;
-	print "Debug-Level = $value\n" if ($debug & 16);
-      }
-      elsif ($key =~ /^marginstart$/i) {
-	print "Marginstart = $value\n" if ($debug & 16);
-	$marginstart = $value;
-      }
-      elsif ($key =~ /^marginstop$/i) {
-	print "Marginstop = $value\n" if ($debug & 16);
-	$marginstop = $value;
-      }
-      elsif ($key =~ /^DVBCards$/i) {
-	print "DVB_Cards = $value\n" if ($debug & 16);
-	$DVB_cards = $value;
-      }
-      elsif ($key =~ /^defaultprio$/i) {
-	print "Default Priority = $value\n" if ($debug & 16);
-	$default_prio = $value;
-      }
-      elsif ($key =~ /^Dest$/i) {
-	print "Destination Host/IP:Port = $value\n" if ($debug & 16);
-	@Dest = split (/\s+/,$value);
-      }
-      elsif ($key =~ /^jointimers$/i) {
-	print "Join Timers = $value\n" if ($debug & 16);
-	$jointimers = $value;
-      }
-      elsif ($key =~ /^description$/i) {
-	print "Description = $value\n" if ($debug & 16);
-	$Description = $value;
-      }
-      else {
-	print "Unkown Key: \"$key\" with Value: \"$value\"\n";
-      }
-    }
-  }
-  print "End Config\n" if ($debug & 16);
-}
-
-sub initcommandline() {
-  my $Usage = qq{
-Usage: $0 [options] [Instance]...
-
-Options: -d hostname:Port   hostname/ip:Port (localhost:2001)
-         -c configdir       Directory where all config files are located
-                            (~/.master-timer)
-         -i instance        Which VDR-Instance, from the config-file, should be
-                            used
-         -s                 Print all series from epg.data and exit
-         -v debuglevel      Level of debug-messages to print
-         -h                 This Help-Page
-};
-
-  # Only process commandline if not already processed
-  if (!$Opts{done}) {
-    die $Usage if (!getopts("d:p:c:i:sv:h",\%Opts));
-  }
-  die $Usage if ($Opts{h});
-  # Mark the options as already processed
-  $Opts{done} = 1;
-
-  if ($Opts{v}) {
-    $debug = $Opts{v};
-  }
-  if ($Opts{i}) {
-    $currentVDR = $Opts{i};
-  }
-  if ($Opts{d}) {
-    @Dest = ($Opts{d});
-  }
-  if ($Opts{c}) {
-    $configdir = $Opts{c};
-  }
-}
-
-sub init {
-  &initcommandline();
-  &initconfigfile();
-  # Process commandline a second time, so that configs from the config-file are overwritten
-  &initcommandline();
-  &initsocket();
-  &initmovie();
-  &initdone();
-  &initchannellist();
-  &inittorecord("deepblack");
-  &initepgdata();
-  &inittorecord("torecord");
-}
diff --git a/Tools/master-timer/process_summary.pl b/Tools/master-timer/process_summary.pl
deleted file mode 100755
index ebe63009f..000000000
--- a/Tools/master-timer/process_summary.pl
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/perl -w
-
-$dir = "/home/ms/.master-timer";
-
-open (FI,"$dir/done") or die "Can't open \"done\"\n";
-while (<FI>)
-  {
-    chomp;
-    if ($_)
-      {
-        ($title,$subtitle) = split (/\|/,$_,2);
-        $Done{$title}{$subtitle}=1;
-      }
-  }
-close (FI);
-
-&traverse('/video');
-
-if ($hit)
-  {
-    rename ("$dir/done","$dir/done.bak");
-    open (FO,">$dir/done");
-    foreach $title (sort keys %Done)
-      {
-	foreach $subtitle (sort keys %{%Done->{$title}})
-	  {
-	    print FO "$title\|$subtitle\n";
-	  }
-      }
-  }
-
-sub traverse
-  {
-    local($dir) = shift;
-    local($path);
-    unless (opendir(DIR, $dir))
-      {
-	warn "Can't open $dir\n";
-	closedir(DIR);
-	return;
-      }
-    foreach (readdir(DIR))
-      {
-	next if $_ eq '.' || $_ eq '..';
-	$path = "$dir/$_";
-	if (-d $path) 	# a directory
-	  {
-	    &traverse($path);
-	}
-	if ($_ eq "summary.vdr")
-	  {
-	    open (FI,"$path") or die "Can't open \"$path\"\n";
-	    @lines = <FI>;
-	    close (FI);
-	    if ($lines[0] =~ /^Title\:\s\"(.*)\"/)
-	      {
-		@titles = split (/\~/,$1);
-		if ($lines[2] && $lines[2] =~ /^Subtitle\:\s\"(.*)\"/)
-		  {
-		    @subtitles = split (/\~/,$1);
-		    foreach $num (0 .. $#titles)
-		      {
-			if ($titles[$num] && $subtitles[$num])
-			  {
-			    if (!$Done{$titles[$num]}{$subtitles[$num]})
-			      {
-				$Done{$titles[$num]}{$subtitles[$num]}=1;
-				$hit = 1;
-			      }
-			  }
-		      }
-		  }
-	      }
-	  }
-      }
-    closedir(DIR);
-  }
-
-
diff --git a/Tools/master-timer/sample/channels-to-scan b/Tools/master-timer/sample/channels-to-scan
deleted file mode 100644
index 22f473d57..000000000
--- a/Tools/master-timer/sample/channels-to-scan
+++ /dev/null
@@ -1,6 +0,0 @@
-1
-2
-3
-4
-5
-49
diff --git a/Tools/master-timer/sample/config b/Tools/master-timer/sample/config
deleted file mode 100644
index 3180943f4..000000000
--- a/Tools/master-timer/sample/config
+++ /dev/null
@@ -1,32 +0,0 @@
-# Master-Timer config file. Values shown here are defaults.
-
-# How many seconds "too early" should the timer begin
-marginstart	= 600
-
-# How many seconds "too long" should the timer end
-marginstop	= 600
-
-# When the Prio isn't provided in the config file use this value
-defaultprio	= 50
-
-# How many DVB cards are installed in the computer (not used yet)
-DVBCards	= 1
-
-# IP/Hostname:Port of the destination (space is used for delimiter)
-Dest	 	= localhost:2001
-
-# Should timers on the same channels be joined when they overlap (0 = off)
-jointimers	= 0
-
-# Should the description be transfered to VDR?
-description     = 0
-
-# Debug level
-#    1     : Dump "torecord"
-#    2     : Dump all timers
-#    4     : Show when a timer will be deleted
-#    8     : Dump the "Done" REs
-#    16    : Verbose config reading
-#    32    : Dump program variables
-#    64    : Excessive deepblack/torecord debuging
-debug		= 0
diff --git a/Tools/master-timer/sample/convert-channel-list b/Tools/master-timer/sample/convert-channel-list
deleted file mode 100644
index a97f3c531..000000000
--- a/Tools/master-timer/sample/convert-channel-list
+++ /dev/null
@@ -1,26 +0,0 @@
-Kabel 1|Kabel 1
-MTV|MTV Central
-PRW 13TH Street|13th Street
-PRW Discovery Channel|Discovery Channel
-PRW Disney Channel|Disney Channel
-PRW FOX KIDS|Fox Kids
-PRW Junior|Junior
-PRW K-Toon|K-Toon
-PRW Krimi & Co|Krimi &Co
-PRW Planet|Planet
-PRW Sci-Fantasy|Premiere Sci-Fi
-PRW Studio Universal|Studio Universal
-PRW Sunset|Sunset
-Premiere Action|Premiere Action
-Premiere Comedy|Premiere Comedy
-Premiere STAR|Premiere Star
-Premiere World 1|Premiere 1
-Premiere World 2|Premiere 2
-Premiere World 3|premiere 3
-Pro Sieben|Pro-7
-RTL|RTL
-RTL 2|RTL2
-Sat.1|Sat.1
-Super RTL|Super RTL
-Viva|VIVA
-Vox|VOX
diff --git a/Tools/master-timer/sample/deepblack b/Tools/master-timer/sample/deepblack
deleted file mode 100644
index 12884fe73..000000000
--- a/Tools/master-timer/sample/deepblack
+++ /dev/null
@@ -1,172 +0,0 @@
-# [<Anytext>]
-#   This marks the beginning of a deepblack-entry
-# Title = <text>
-#   This matches a title
-# Subtitle = <text>
-#   This matches a subtitle
-# Description = <text>
-#   This matches a description
-# Category = <left>/<right>
-#   This matches a DTV-Category
-# Channel = <Channel>
-#   Restricts a deepblack-entry to a specific channel.
-#   A single "!" at start of channel list negates the selection.
-# Timeframe = <begin>-<end>
-#   Restricts a deepblack-entry to a specific timeframe.
-#   No timers with start time in the timeframe will be programmed.
-# minlength = <Number>
-#   Restricts a deepblack-entry to a specific minimum length
-#   (postfix "m" for minutes, "h" for hours.)
-# maxlength = <Number>
-#   Restricts a deepblack-entry to a specific maximum length
-#   (postfix "m" for minutes, "h" for hours.)
-# weekday = MTWTFSS
-#   Restricts a deepblack-entry to a specific weekday
-# instance = <Number>
-#   Only apply this deepblack-entry for a specific Instance
-#   "s" is a special value used for "-s"-Mode
-#
-# The "Title", "Subtitle", "Description", "Channel"-Lines can be
-# supplied any number of times for a specific entry
-#
-# To deepblack something at least one of the "Title", "Subtitle" or
-# "Description" (If you don't have anything "better" use "Title = ."
-# for this matches everything) fields has to be provided.
-# These three fields are "include" and the rest are "exclude" fields.
-
-[Blacklist all Talkshows]
-Title = .
-Category = Talk
-
-[Blacklist all Lifestyles]
-Title = .
-Category = /Lifestyles
-
-[Blacklist Sport/Tennis]
-Title = .
-Category = Sport/Tennis
-
-[Record only ZDF and Pro7]
-Title = .
-Channel = !ZDF
-Channel = ProSieben
-
-[Blacklist a timeframe]
-Title = .
-Timeframe = 1000-1400
-
-[Blacklist everything with less than 5 minutes duration]
-Title = .
-maxlength = 5m
-
-[Sinnlose Serien]
-Title = F�r alle F�lle Stefanie
-Title = Chicago Hope - Endstation Hoffnung
-Title = Chicago Hope
-Title = Doppelter Einsatz
-Title = Dr. Stefan Frank - Der Arzt, dem die Frauen vertrauen
-Title = Ehekriege
-Title = Ein Bayer auf R�gen
-Title = Emergency Room
-Title = Gute Zeiten, schlechte Zeiten
-Title = Hallo, Onkel Doc!
-Title = Hercules
-Title = Hinter  Gittern - Der Frauenknast
-Title = OP ruft Dr. Bruckner
-Title = Wolffs Revier
-Title = alphateam
-Title = SK K�lsch
-Title = ^Becker$
-Title = Kommissar Rex
-Title = Nur die Liebe z�hlt
-Title = Unsere kleine Farm
-Title = Die Waltons
-Title = ^Die Zwei$
-
-[Glueckspiele]
-Title = Die Quiz Show
-Title = Gl�cksrad
-Title = Jeder gegen Jeden
-Title = Kochduell
-
-[Infotainment und Boulevardzeug]
-Title = 'MAX' - Das ganze Leben!
-Title = ^BIZZ$
-Title = Big Brother
-Title = GIRLSCAMP
-Title = Call TV
-Title = DIE REDAKTION
-Title = EXCLUSIV
-Title = EXTRA
-Title = Explosiv - Das Magazin
-Title = K1 DIE REPORTAGE
-Title = K1 Das Magazin
-Title = PROSIEBEN REPORTAGE
-Title = Fit For Fun TV
-Title = peep!
-Title = s.a.m.
-Title = taff.
-Title = ^blitz$
-Title = Die Harald Schmidt Show
-Title = Spiegel TV-Reportage
-
-[Nachrichten]
-Title = 10 vor 11
-Title = 17:30 live
-Title = 18:30
-Title = 24 Stunden
-Title = Punkt 12
-Title = Punkt 6
-Title = Punkt 9
-Title = RTL II News
-Title = RTL aktuell
-Title = RTL-Nachtjournal
-Title = K1 Nachrichten
-Title = Nachrichten
-
-[Talkshows]
-Title = Andreas T�rck
-Title = Arabella
-Title = Britt - Der Talk um Eins
-Title = B�rbel Sch�fer
-Title = Die Oliver Geissen Show
-Title = Peter Imhof
-Title = Vera am Mittag
-Title = Hans Meiser
-Title = Nicole - Entscheidung am Nachmittag
-Title = Franklin
-
-[So richtig Sinnloses]
-Title = Dauerwerbesendungen
-Title = Infomercials
-Title = Kickers
-Title = RTL SHOP
-Title = SAT.1-FR�HST�CKSFERNSEHEN
-Title = Zapping
-
-[PREMIERE WORLD - Das Programm]
-Title = PREMIERE WORLD - Das Programm
-Title = Programm ab
-Title = Programm von
-
-[Fussball]
-Title = fussball
-Title = fu�ball
-Title = UEFA Champions
-
-#Sonstiges
-[^Sieben$]
-Title = ^Sieben$
-
-[Starportr�t Kevin Spacey]
-Title = Starportr�t Kevin Spacey
-
- 
-[All Movies for -s]
-Subtitle = MOVIE
-Instance = s
- 
-[All >= 65m for -s]
-Title = .
-minlength = 65m
-Instance = s
diff --git a/Tools/master-timer/sample/done b/Tools/master-timer/sample/done
deleted file mode 100644
index 76819c7be..000000000
--- a/Tools/master-timer/sample/done
+++ /dev/null
@@ -1 +0,0 @@
-Alles Routine|Kom�die
diff --git a/Tools/master-timer/sample/subtitle-movie b/Tools/master-timer/sample/subtitle-movie
deleted file mode 100644
index 9bd357973..000000000
--- a/Tools/master-timer/sample/subtitle-movie
+++ /dev/null
@@ -1,52 +0,0 @@
-^Abenteuerfilm$
-^Actionfilm$
-^Actionkom�die$
-^Actionthriller$
-^Agentenfilm$
-^Beziehungskom�die$
-^Biografie$
-^Biographie$
-^Computeranimation$
-^Drama$
-^Episodenfilm$
-^Erotikfilm$
-^Familiendrama$
-^Fantasy$
-^Fantasykom�die$
-^Fantasy-Kom�die$
-^Gangsterfilm$
-^Gerichtsfilm$
-^Gesellschaftsdrama$
-^Historiendrama$
-^Horrorfilm$
-^Horrorkom�die$
-^Jugenddrama$
-^Kinderfilm$
-^Kom�die$
-^Kriegsfilm$
-^Krimikom�die$
-^Kriminalfilm$
-^Liebesfilm$
-^Liebeskom�die$
-^Melodram$
-^Melodrama$
-^Monumentalfilm$
-^Musical$
-^Politthriller$
-^Psychothriller$
-^Road Movie$
-^Romanze$
-^Satire$
-^Science-Fiction$
-^Science-Fiction-Kom�die$
-^Spielfilm$
-^TV Movie$
-^TV-Drama$
-^Teil .$
-^Teil 0.$
-^Thriller$
-^Tragikom�die$
-^Western$
-^Westernkom�die$
-^Zeichentrick$
-^Zeichentrickkom�die$
diff --git a/Tools/master-timer/sample/torecord b/Tools/master-timer/sample/torecord
deleted file mode 100644
index 0c97b9162..000000000
--- a/Tools/master-timer/sample/torecord
+++ /dev/null
@@ -1,90 +0,0 @@
-# [<Anytext>]
-#   This marks the beginning of a timer entry
-# Title = <text>
-#   This matches a title
-# Subtitle = <text>
-#   This matches a subtitle.
-#   You may use the magic "MOVIE" or "!MOVIE" which matches
-#   all entries from file "subtitle-movie".
-# Description = <text>
-#   This matches a description
-# Category = <left>/<right>
-#   This matches a DTV-Category
-# Channel = <Channel>
-#   Restricts a time to a specific channel.
-#   A single "!" at start of channel list negates the selection.
-# Timeframe = <begin>-<end>
-#   Restricts timer to a specific timeframe.
-#   Only timers with start time in the timeframe will be programmed.
-# minlength = <Number>
-#   Restricts timer entry to a specific minimum length
-#   (postfix "m" for minutes, "h" for hours.)
-# maxlength = <Number>
-#   Restricts a timer entry to a specific maximum length
-#   (postfix "m" for minutes, "h" for hours.)
-# weekday = MTWTFSS
-#   Restricts a timer to a specific weekday
-# Timertitle = <text>
-#   The title used for this timer.
-#   If this is not provided "Title" will be used.
-#   If "Title" is not provided the EPG title will be used.
-# Margin = <Number>;<Number>
-#   Seconds added to the beginning and end of the timer.
-#   Positive numbers will lengthen the recording.
-# instance = <Number>
-#   The instance of VDR for which this timer is.
-#   If this is not provided the timer is valid for ALL instances.
-#
-# The "Title", "Subtitle", "Description", "Channel"-Lines can be
-# supplied any number of times for a specific entry
-#
-# To record something at least one of the "Title", "Subtitle" or "Description"
-# fields has to be provided. These three fields are "include" and the rest are
-# "exclude" fields!
-
-[Dies ist ein Test-Timer]
-Title = Titel
-Subtitle = Subtitel
-Description = Description
-Category = Serie/Krimi
-Channel = Pro-7
-Channel = VIVA
-Timeframe = 1230-1830
-Prio = 50
-Lifetime = 50
-minlength = 10m
-maxlength = 3h
-weekday = ---T---
-Timertitle = Test
-Margin = 600;600
-instance = 2
-
-# Record Babylon 5 only if NOT playing on Pro 7;
-# recording starts one minute too early and ends
-# one minute too early (to skip following ads).
-[Babylon 5]
-Title = Babylon 5
-Channel = !Pro-7
-Prio = 99
-Margin = 60;-60
-
-[DS9]
-Title = Deep Space Nine
-Prio = 99
-Timertitle = DS9
-Margin = 60;-60
-
-[Seven Days]
-Title = Seven Days
-Prio = 99
-
-[Stargate]
-Title = Stargate
-Prio = 99
-
-[Aniston]
-Description = Aniston
-Prio = 99
-
-[Matrix]
-Title = Matrix
diff --git a/Tools/master-timer/scan-channels b/Tools/master-timer/scan-channels
deleted file mode 100755
index 324181b98..000000000
--- a/Tools/master-timer/scan-channels
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-old=`svdrpsend.pl chan | grep 250 | cut -d " " -f2`
-for dat in `cat $HOME/.master-timer/channels-to-scan`
-do
-  svdrpsend.pl "chan $dat"
-  sleep 30s
-done
-svdrpsend.pl "chan $old"
diff --git a/Tools/schnitt/README b/Tools/schnitt/README
deleted file mode 100644
index 8e1cacc99..000000000
--- a/Tools/schnitt/README
+++ /dev/null
@@ -1,111 +0,0 @@
-			Sammlung von "Hilfs"-Scripten
-                         von Matthias Schniedermeyer
-                                 ms@citd.de
-
-Diese Sammlung an "Hilfs"-Scripten habe ich mir zum scheiden und anderen
-Zwecken zusammengeschrieben.
-
-Das ganze unterliegt natuerlich der GPL.
-
-Ich bin nicht sonderlich gut im "Dokumentieren". Also gilt die Devise
-"Hilf dir selbst".
-
-Ein paar Worte zu den "Hart"-Codierten Pfaden.
-
-/dvb/video
-/dvb2/video
-
-Sind die 2 DVB-Rechner.
-
-/x1/video
-
-Ist das Verzeichniss in das die Video zum schneiden verschoben werden.
-
-/x1/temp
-/x2/temp
-
-Sind die beim schneiden verwendeten Temporaer-Verzeichnisse
-
-
-Enthalten sind folgende Scripte:
-
-cutall			-> "Master"-Script zum starten des Scheide vorgangs.
-                           Ist ein "find" nach "cut" -Dateien
-cutt			-> Das "eigentliche" Schnitt-Script
-			   Bei einem einzelnen Block wird diese direkt
-                           gesplitet und dann zu einem ISO-Image verarbeitet
-			   Wenn mehrere Teile (=War mit Werbung) vorhanden
-			   sind, dann werden zuerst die einzelnen Teile,
-			   legt nummerierte Verzeichniss ein und kopiert bzw
-                           splitet die einzelnen Dateien in die Verzeichniss
-                           und macht dann daraus die ISO-Images
-			   (Leider funktioniert das aus irgendwelche Gruenden
-			   (noch) nicht mit Serien die nur eine CD gross sind
-			   aber das wird noch)
-index.php		-> PHP-Script zum finden der Schnitt-Punkte, mit 
-                           Testmoeglichkeit ob erfolgreich an diesem Punkt
-                           geschnitten werden kann
-mv2			-> Zum Moven der Aufnahmen von meinen DVB-Rechnern
-                           auf mein "Arbeitsrechner"
-play			-> Zum Abspielen einer Aufnahme von meinem Recher auf 
-			   dem "Frontend" DVB-Rechner
-schnitt.pl		-> Extraiert ein einzelnes Bild um es anzuzeigen
-                           (Fuer index.php)
-schnitt2.pl		-> Gibt alles zwischen 2 Schnittpunkten auf STDOUT aus
-schnitt3.pl		-> Testet ob erfolgreich geschnitten werden kann.
-schnitt3.pl.new		-> Version fuer PES-Datenstroeme
-schnitt4.pl		-> "Beschleunigtes" Schnitt-Programm fuer VIVA
-                           aufnahmen. 1 "VIDEO" pro Zeile erzeugt 
-                           "a", "b" ... Dateien
-schnitt5.pl		-> Gibt Datei-Nummern von einer Schnittmarke 
-                           +- 15000 Frames aus
-schnitt6.pl		-> Loescht alle Dateien die nicht von in einer von 
-                           schnitt5.pl abgedeckt ist. (Damit mv2 nicht so 
-                           lange braucht)
-show			-> Wird auf einem X-Display gestartet und zeigt das 
-                           aktuelle Bild von "schnitt.pl" an
-vdr-remote.pl		-> "Skeleton" um ueber SVDR-Kommandos zu schicken
-vdr2			-> Start-Script
-vmount			-> Mounten aller zusammengehoeriger ISO-Images zum 
-                           abspielen
-
-Hilfsscripte:
-------------
-cut.pl			-> Entspricht weitestgehend "split" aber mit 
-                           "Nummer" anstatt Buchstaben
-cut2			-> Entfernt escapende Backslashes
-cut2.pl/cut3.pl		-> Fuer Aufnehmen die aus mehreren Bloecken bestehen 
-                           (=Mit Werbung)
-cutall2			-> Springt ins Schnitt-Verzeichniss und ruft das 
-                           "eigentliche" Schnitt-Script auf
-cutall3.pl		-> Wenn in einem Verzeichniss mehrere Aufnahmen sind
-                           splitet dies Programm diese und ruft fuer jede
-                           Aufnahme das "cutt"-Script auf
-schnittcommon.pli	-> Das "Common" Script fuer schnitt?.pl
-getpreviframe.pl	-> Findet das vorherige I-Frame.
-unsort			-> Macht das Gegenteil von sort.
-
-dump.c			-> Muss in der "libmpeg3"-Verzeichniss des 
-			   "mpeg2-movie"-Packets kopiert werden und dann mit 
-			   "make" compilieren
-			   Dieses C-Programm ist dafuer da um fuer das
-			   PHP-Script das Bild anzuzeigen wo man gerade ist.
-			   Da mir der "urspruengliche" Source-Code dafuer
-			   abhanden gekommen ist und ich den Patch neumachen
-			   musste (Wie immer mit "Verbesserungen") ist index.php
-			   nocht nicht auf die neue Version angepasst. Die
-			   Anpassung besteht aber nur darin eine "1" an die
-			   Kommandozeile anzuhaengen.
-
-
-Im Gegensatz zur "alten"-Version ist diese Version "vollstaendig"
-einsatzfaehig!
-
-
-Wenn jemand Fragen zum Einsatz hat dann "loechern Sie mich"
-
-ms@citd.de
-
-
-Ich kann auch gerne die Einrichtung per "Fernwartung" (=ssh) uebernehmen.
-(Wenn noetig compiliere ich auch auch apache mit PHP usw.)
diff --git a/Tools/schnitt/cut.pl b/Tools/schnitt/cut.pl
deleted file mode 100755
index e05507692..000000000
--- a/Tools/schnitt/cut.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl
-
-chdir ($ARGV[0]) if ($ARGV[0]);
-
-$read = $size = 1024*1024;
-
-$filenum = "1";
-$count = 0;
-
-$fi = sprintf ("part%d",$filenum);
-open (FI,">$fi");
-
-while ($read == $size)
-  {
-    if ($count < 660*1024*1024)
-      {
-	$read = read (STDIN,$data,$size);
-	print FI $data;
-	$count += $size;
-	$a = $count /1024/1024;
-	if ($a % 10 == 0) {
-          print stderr "File: $filenum Size: ${a}MB\n";
-        }
-      }
-    else
-      {
-	close (FI);
-	$filenum++;
-	$fi = sprintf ("part%d",$filenum);
-	open (FI,">$fi");
-	$count = 0;
-      }
-  }
-
-close FI;
diff --git a/Tools/schnitt/cut2 b/Tools/schnitt/cut2
deleted file mode 100755
index 09e9acbcc..000000000
--- a/Tools/schnitt/cut2
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cat cut2 | head -n 1 | tr -d [\\\\]
diff --git a/Tools/schnitt/cut2.pl b/Tools/schnitt/cut2.pl
deleted file mode 100755
index 6131e880a..000000000
--- a/Tools/schnitt/cut2.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-
-$titel = $ARGV[0];
-
-chdir ("/x2/temp");
-
-@files=<teil*.mpg>;
-$cd = 1;
-mkdir "/x2/temp/$cd";
-open (FF,">/x2/temp/$cd/$titel\ CD\ $cd");
-close (FF);
-
-foreach $file (@files)
-  {
-    $size = -s $file;
-    $total += $size;
-    if ($total <= 660*1024*1024)
-      {
-	print "Moving $file\n";
-	system ("mv /x2/temp/$file /x2/temp/$cd/$file");
-      }
-    else
-      {
-	print "Splitting $file\n";
-	$file =~ s/\.mpg$//;
-	$total -= $size;
-	$size = (660*1024*1024) - $total;
-	$cd = `cut3.pl /x2/temp $cd $file $size \'$titel\' < $file.mpg`;
-	chomp $cd;
-        $total = 0;
-	@files2=</x2/temp/$cd/teil*>;
-	foreach $file2 (@files2)
-	  {
-	    $total += -s $file2;
-	  }
-        print "CD: $cd Total $total\n";
-	unlink "$file.mpg";
-      }
-  }
diff --git a/Tools/schnitt/cut3.pl b/Tools/schnitt/cut3.pl
deleted file mode 100755
index ddaf0d6f1..000000000
--- a/Tools/schnitt/cut3.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-$read = $size = 1024*1024;
-
-$dir = $ARGV[0];
-$subdir = $ARGV[1];
-$teil = $ARGV[2];
-$count1 = $ARGV[3];
-$title = $ARGV[4];
-
-$filenum = "1";
-$count = 0;
-
-open (FI,">$dir/$subdir/$teil.$filenum.mpg");
-
-while ($read == $size)
-  {
-    if (($filenum == 1 && $count < $count1) || ($filenum > 1 && $count < 660*1024*1024))
-      {
-	$read = read (STDIN,$data,$size);
-	print FI $data;
-	$count += $size;
-	$a = $count /1024/1024;
-      }
-    else
-      {
-	close (FI);
-	$filenum++;
-	$subdir++;
-        mkdir ("$dir/$subdir");
-	open (FF,">$dir/$subdir/$title\ CD\ $subdir");
-	close (FF);
-	open (FI,">$dir/$subdir/$teil.$filenum.mpg");
-	$count = 0;
-      }
-  }
-
-close FI;
-
-print "$subdir\n";
diff --git a/Tools/schnitt/cutall b/Tools/schnitt/cutall
deleted file mode 100755
index a6803e2b7..000000000
--- a/Tools/schnitt/cutall
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-find /x1/video/ -name "cut" -exec cutall2 {} \;
diff --git a/Tools/schnitt/cutall2 b/Tools/schnitt/cutall2
deleted file mode 100755
index 962d57722..000000000
--- a/Tools/schnitt/cutall2
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-a=`echo $1 | cut -d / -f1-5`
-cd $a
-cutall3.pl
-mv cut cut.bak
diff --git a/Tools/schnitt/cutall3.pl b/Tools/schnitt/cutall3.pl
deleted file mode 100755
index 696166697..000000000
--- a/Tools/schnitt/cutall3.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-
-open (FI,"cut") or die "Kann Cut-Datei nicht oeffnen\n";
-
-outer: while (<FI>)
-  {
-    chomp;
-    if (! ($_ > 1 || $_ eq "0"))
-      {
-	open (FO,">cut2");
-	print FO "$_\n";
-	while (<FI>)
-	  {
-	    chomp;
-	    if ($_ > 1 || $_ eq "0")
-	      {
-		print FO "$_\n";
-	      }
-	    else
-	      {
-		system ("cutt");
-		redo outer;
-	      }
-	  }
-      }
-  }
-if ( -f "cut2")
-  {
-    system ("cutt");
-    unlink "cut2";
-  }
diff --git a/Tools/schnitt/cutt b/Tools/schnitt/cutt
deleted file mode 100755
index 1942437a0..000000000
--- a/Tools/schnitt/cutt
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-DIRA=/x2/temp
-DIRB=/x1/temp
-
-if [ ! -f cut2 ]; then
-  echo Keine Beschreibungsdatei
-  exit 1
-else
-  name="`cut2`"
-  echo $name
-  count=`cat cut2 | wc -l`
-  let count=count-1
-  let test=count%2
-  if [ "$test" == "1" ]; then
-    echo Ungerade Anzahl von Markierungen
-    exit 1
-  fi
-
-  file=1
-
-  if [ "$count" == "2" ]; then
-    start=`cat cut2 | tail -n $count | head -n 1`
-    let count=count-1
-    end=`cat cut2 | tail -n $count | head -n 1`
-    schnitt2.pl $start $end | avpes2mpeg | cut.pl $DIRA
-    secondway=2
-  else
-    while [ "$count" != "0" ]
-    do
-      start=`cat cut2 | tail -n $count | head -n 1`
-      let count=count-1
-      end=`cat cut2 | tail -n $count | head -n 1`
-      let count=count-1
-      echo Cutting \& Converting from $start to $end
-      schnitt2.pl $start $end | avpes2mpeg > $DIRA/teil$file.mpg
-#      schnitt2.pl $start $end | pvademux $DIRA teil$file
-      let file=file+1
-    done
-  fi
-fi
-
-# Ab hier mkimg
-
-rm cut2
-
-sync
-
-if [ "$secondway" != "2" ]; then
-  cd $DIRA
-  cut2.pl "$name"
-  if [ -d 2 ]; then
-    count=1
-    cond=0
-
-    while [ "$cond" != "1" ]
-    do
-      echo mkisofs Teil $count
-      mkisofs -r -o $DIRB/image1.raw $count
-      rm -rf $count
-      mv -- $DIRB/image1.raw "$DIRB/${name} CD $count"
-      sync
-      let count=count+1
-      if [ ! -d $count ]; then
-        cond=1
-      fi
-    done
-  else
-    echo mkisofs
-    mkisofs -r -o $DIRB/image1.raw $count
-    rm -rf $count
-    mv -- $DIRB/image1.raw "$DIRB/${name}"
-  fi
-else
-
-  cd $DIRA
-
-  if [ -f part2 ]; then
-    count=1
-    cond=0
-
-    while [ "$cond" != "1" ]
-    do
-      mkdir a
-      mv "part$count" "a/${name} CD $count.mpg"
-      echo mkisofs Teil $count
-      mkisofs -r -o $DIRB/image1.raw a
-      rm -rf a
-      mv -- $DIRB/image1.raw "$DIRB/${name} CD $count"
-      sync
-
-      let count=count+1
-      if [ ! -f "part$count" ]; then
-        cond=1
-      fi
-    done
-  else
-    mkdir a
-    mv part1 "a/${name}.mpg"
-    echo mkisofs
-    mkisofs -r -o $DIRB/image1.raw a
-    rm -rf a
-    mv -- $DIRB/image1.raw "$DIRB/${name}"
-  fi
-fi
-
diff --git a/Tools/schnitt/dump.c b/Tools/schnitt/dump.c
deleted file mode 100644
index a362f6892..000000000
--- a/Tools/schnitt/dump.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "libmpeg3.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-
-int main(int argc, char *argv[])
-{
-	mpeg3_t *file;
-	int x,y,ii,i,j,result,out;
-	int howmany;
-	unsigned char *output, **output_rows;
-	char filename[100];
-	char header[100];
-	char temp;
-
-	howmany = atoi (argv[2]);
-
-	if ((file = mpeg3_open(argv[1])) == NULL)
-	  {
-	    printf ("Open failed\n");
-	    return 1;
-	  }
-	mpeg3_set_cpus(file,1);
-	mpeg3_set_mmx(file,0);
-	if (mpeg3_has_video == 0)
-	  {
-	    printf ("Stream has no Video\n");
-	    return 1;
-	  }
-	x = mpeg3_video_width(file,0);
-	y = mpeg3_video_height(file, 0);
-	output = malloc (x*y*3 + 4);
-	output_rows = malloc (sizeof(unsigned char*) * y);
-	for(i = 0; i < y; i++)
-	  output_rows[i] = &output[i * x * 3];
- 	
-	for (ii = 0; ii < howmany; ii++)
-	  {
-	    result = mpeg3_read_frame(file,output_rows,0,0,x,y,x,y,0,0);
-	
-	    sprintf (filename,"/x2/temp/output%03i.ppm",ii);
-	    sprintf (header,"P6\n%i %i\n255\n\r",x,y);
-
-/*	    printf ("Opening %s\n",filename); */
-	    
-	    if ((out = open (filename,O_CREAT|O_WRONLY|O_TRUNC,0755)) == -1)
-	      {
-		printf ("Can't open %s\n",filename);
-		return 1;
-	      }
-
-	    write (out,header,strlen(header));
-	    
-	    for (i = 0; i < y; i++)
-	      for (j = 0; j < x; j++)
-		{
-		  temp = output [(i*x+j)*3 + 1];
-		  output[(i*x+j)*3 + 1] = output [(i*x+j)*3 + 0];
-		  output[(i*x+j)*3 + 0] = temp;
-		}
-	    write (out, output, x*y*3);
-	    close (out);
-	  }
-}
diff --git a/Tools/schnitt/getpreviframe.pl b/Tools/schnitt/getpreviframe.pl
deleted file mode 100755
index 4829304c3..000000000
--- a/Tools/schnitt/getpreviframe.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/perl
-
-require "/usr/local/bin/my/schnittcommon.pli";
-
-if (!open (INDEX,"index.vdr"))
-  {
-    exit 1;
-  }
-$index = $oindex = $ARGV[0];
-if ($index > 0)
-{
-  &prevI;
-  if ($oindex != $index)
-    {
-      print "$index\n";
-    }
-  else
-    {
-      print "$oindex\n";
-    }
-}
-else
-{
-  print "0\n";
-}
diff --git a/Tools/schnitt/index.php b/Tools/schnitt/index.php
deleted file mode 100644
index 58a288fec..000000000
--- a/Tools/schnitt/index.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<html>
-<head>
-  <title>Schneiden</title>
-</head>
-<body bgcolor=#C0C0C0>
-<?
-if ($level == 0)
-  {
-    $dircount=0;
-    $handle=opendir('/x1/video');
-    while ($file = readdir($handle)) {
-        if ($file != "." && $file != ".." && $file != "epg.data") { 
-          $dir=$file;
-          $dircount++;
-        }
-    }
-  if ($dircount == 1) {
-    $level=1;
-    }
-  else
-  {
-?>
-<center><h1>Sender</h1></center>
-<form action="index.php" method="post">
-<input type=hidden name=level value="1">
-<?
-      $handle=opendir('/x1/video');
-      while ($file = readdir($handle)) {
-          if ($file != "." && $file != ".." && $file != "epg.data") { 
-              echo "<input type=submit name=dir value=\"$file\">\n"; 
-          }
-      }
-      closedir($handle); 
-?>
-</form>
-<?
-    }
-  }
-if ($level == 1)
-  {
-    $dircount=0;
-    $handle=opendir("/x1/video/$dir");
-    while ($file = readdir($handle)) {
-        if ($file != "." && $file != "..") { 
-          $dira="$dir/$file";
-          $dircount++;
-        } 
-    }
-    if ($dircount == 1) {
-      $dir = $dira;
-      $level = 2;
-    }
-    else
-    {
-?>
-<form action="index.php" method="post">
-<input type=hidden name=level value="2">
-<?
-      echo "<center><h1>Filme/Serien fuer den Sender $dir</h1></center>";
-      $handle=opendir("/x1/video/$dir");
-      while ($file = readdir($handle)) {
-          if ($file != "." && $file != "..") { 
-              echo "<input type=submit name=dir value=\"$dir/$file\"><br>\n"; 
-          } 
-      }
-      closedir($handle); 
-?>
-</form>
-<?
-    }
-  }
-if ($level == 2)
-  {
-if ($aindex)
-  $index = $aindex;
-else if (!$index)
-  $index = 0;
-
-if ($dir)
-  chdir ("/x1/video/$dir");
-
-switch ($cindex) {
-  case "-10000": 
-      if ($index >=10000)
-        $index -= 10000;
-	break;
-  case "-4000": 
-      if ($index >=4000)
-        $index -= 4000;
-	break;
-  case "-2000": 
-      if ($index >=2000)
-        $index -= 2000;
-	break;
-  case "-1000": 
-      if ($index >=1000)
-        $index -= 1000;
-	break;
-  case "-500": 
-      if ($index >=500)
-        $index -= 500;
-	break;
-  case "-100": 
-      if ($index >=100)
-        $index -= 100;
-	break;
-  case "Vorheriges I-Frame":
-        $pindex = $index - 1;
-        $fp = popen ("/usr/local/bin/my/getpreviframe.pl $pindex","r");
-        $i = fgets($fp,1000);
-        $index = chop ($i);
-        pclose ($fp);
-        break;
-  case "Naechstes I-Frame":
-        $index ++;
-        break;
-  case "+100":
-        $index += 100;
-	break;
-  case "+500":
-        $index += 500;
-	break;
-  case "+1000":
-        $index += 1000;
-	break;
-  case "+2000":
-        $index += 2000;
-	break;
-  case "+4000":
-        $index += 4000;
-	break;
-  case "+10000":
-        $index += 10000;
-	break;
-  }
-
-if ($test)
-  {
-    $fp = popen ("/usr/local/bin/my/schnitt3.pl $index","r");
-    $i = fgets($fp,1000);
-    pclose ($fp);
-    $index = chop ($i);
-  }
-
-if ($name)
-  {
-    $fp = fopen ("cut","w");
-    fputs ($fp,"$name\n");
-    fclose ($fp);
-  }
-
-if ($cut)
-  {
-    $fp = fopen ("cut","a");
-    fputs ($fp,"$index\n");
-    fclose ($fp);
-  }
-
-$fp = popen ("/usr/local/bin/my/schnitt.pl $index","r");
-$i = fgets($fp,1000);
-pclose ($fp);
-$index = chop ($i);
-
-system ("/usr/local/bin/my/dumpframe /x2/temp/bild.m2v");
-system ("mv output.ppm /x2/temp");
-system ("touch /x2/temp/newpic");
-system ("killall sleep");
-?>
-<form action="index.php" method="post">
-<input type=hidden name=level value="2">
-<input type=hidden name=dir value="<?=$dir?>">
-<input type=hidden name=index value=<?=$index?>>
-<table width=90% align=center>
-<tr>
-<td><h1>Index <?=$index?></h1></td>
-<td><h1>Dir: <?=$dir?></h1></td>
-</tr>
-</table>
-<table width=80% align=center>
-<tr>
-<td><input type=submit name=cindex value="-10000"></td>
-<td><input type=submit name=cindex value="-4000"></td>
-<td><input type=submit name=cindex value="-2000"></td>
-<td><input type=submit name=cindex value="-1000"></td>
-<td><input type=submit name=cindex value="-500"></td>
-<td><input type=submit name=cindex value="-100"></td>
-<td><input type=submit name=cindex value="Vorheriges I-Frame"></td>
-<td><input type=submit name=cindex value="Naechstes I-Frame"</td>
-<td><input type=submit name=cindex value="+100"></td>
-<td><input type=submit name=cindex value="+500"></td>
-<td><input type=submit name=cindex value="+1000"></td>
-<td><input type=submit name=cindex value="+2000"></td>
-<td><input type=submit name=cindex value="+4000"></td>
-<td><input type=submit name=cindex value="+10000"></td>
-</tr>
-</table>
-<table>
-<tr>
-<td>Absoluter Index: <input type=text name=aindex size=6></td>
-<td><input type=submit name=test value="Schnitt-Test"></td>
-<td><input type=submit name=cut value="Mark"></td>
-</form>
-<form action="index.php" method="post">
-<input type=hidden name=level value="2">
-<input type=hidden name=dir value="<?=$dir?>">
-<input type=hidden name=index value=<?=$index?>>
-<td>Titel: <input type=text name=name size=50 maxlength=255></td>
-</form>
-</tr>
-</table>
-<?
-}
-?>
-</body>
-</html>
diff --git a/Tools/schnitt/lmplex b/Tools/schnitt/lmplex
deleted file mode 100755
index 8cbb50f20..000000000
--- a/Tools/schnitt/lmplex
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /usr/bin/perl
-
-### Calculate the number of CPUs we want to keep busy
-open IN, "/proc/cpuinfo"; 
-$cpus = grep /processor.*:/, <IN>;
-close IN; 
-
-### This is a list of files to encode
-@names = @ARGV;
-
-$dira = shift @names;
-$dirb = shift @names;
-
-### This is the name of the encoder to use.
-$coder = "/usr/local/bin/mplex ";
-###
-
-###
-###
-###
-
-# Encode a single file
-sub do_one {
-    my($m2v) = shift;
-    # Make mp3 from wav
-    $m2v =~ s/\.m2v$//;
-
-    # In a subprocess, encode the file
-    printf "Multiplexing ${m2v}\n";
-    unless($pid = fork) {
-    	system ("$coder ${dira}/${m2v}.m2v ${dira}/${m2v}.mp2 ${dirb}/${m2v}.mpg");
-	exit;
-    }
-}
-
-# Go ahead and prefork $cpus encoders
-foreach $i (0 .. $cpus-1) {
-	&do_one($names[0]) if ($names[0] ne "");
-	shift @names;
-}
-
-# Wait for the end of each encoder, start a new one...
-foreach $i (@names) {
-	wait;
-	&do_one($i);
-}
-
-# Wait for everything to close down.
-while(wait > 0) {
-	;
-}
diff --git a/Tools/schnitt/mv2 b/Tools/schnitt/mv2
deleted file mode 100755
index c27a9ffe6..000000000
--- a/Tools/schnitt/mv2
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Move files from DVB-Computer(s) to localmachine into $LOCALDIR
-#
-
-LOCALDIR=/x1/video
-
-if [ ! "$UID" = 0 ]; then
-  if [ -d "$1" ]; then
-    if [ -f "$1/index.vdr" ]; then
-      cd $LOCALDIR
-      recdir=`echo "$1" | cut -d / -f4-`
-      mkdir -p "$recdir"
-      cd "$recdir"
-      dvbcomp=`echo "$1" | cut -d / -f2`
-      (echo cd "/video/video0/$recdir"; echo mget \*)| ftp -i $dvbcomp
-      cd $LOCALDIR
-      ssh $dvbcomp ls -Ls /video/video0/$recdir > /tmp/dvb
-      ls -Ls $recdir > /tmp/local
-      diff -u /tmp/dvb /tmp/local &> /dev/null && rm -rfv /$dvbcomp/video?/$recdir
-      rm /tmp/dvb
-      rm /tmp/local
-      rmdir --ignore-fail-on-non-empty `find /$dvbcomp/video?/ -type d -mindepth 1 | cut -d \/ -f-4 | grep -v temp | sort | uniq`
-    fi
-  fi
-else
-  echo Not as root
-fi
-
-/usr/local/bin/my/process_summary.pl
diff --git a/Tools/schnitt/play b/Tools/schnitt/play
deleted file mode 100755
index 0c43bff5f..000000000
--- a/Tools/schnitt/play
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ "$1" != "" ]; then
-  vmount "$1"
-fi
-ssh dvb2 /usr/local/bin/my/novdr
-sleep 1s
-cat /mnt/*/* | buffer -b 1000 -S 1024 | ssh dvb2 play2
-ssh dvb2 rm /tmp/novdr
-umount /mnt/*
-
diff --git a/Tools/schnitt/schnitt.pl b/Tools/schnitt/schnitt.pl
deleted file mode 100755
index ac72a144f..000000000
--- a/Tools/schnitt/schnitt.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-require "/usr/local/bin/my/schnittcommon.pli";
-
-if (!open (INDEX,"index.vdr"))
-  {
-    exit 1;
-  }
-$index = $ARGV[0];
-&nextI;
-$offset1 = $offset;
-&readnext;
-$off = $offset - $offset1;
-close (FI);
-$fi = sprintf ("%03d.vdr",$file);
-open (FI,$fi);
-open (FO,">bild");
-sysseek (FI,$offset1,0);
-sysread (FI,$temp,200000);
-syswrite (FO,$temp,200000);
-close (FI);
-close (FO);
-
-`cat bild | /usr/local/bin/avpes2mpeg > avpes`;
-`/usr/local/bin/my/dumpframe avpes 1`;
-#`/usr/local/bin/pes2av_pes bild | /usr/local/bin/pvademux /x2/temp bild`;
-print "$index\n";
diff --git a/Tools/schnitt/schnitt2.pl b/Tools/schnitt/schnitt2.pl
deleted file mode 100755
index d81b5fd59..000000000
--- a/Tools/schnitt/schnitt2.pl
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl
-
-require "/usr/local/bin/my/schnittcommon.pli";
-
-if (!open (INDEX,"index.vdr"))
-  {
-    print "Error opening index.vdr";
-    exit 1;
-  }
-
-$index = $ARGV[0];
-&nextI;
-#&readnext;
-$file1 = $file;
-$offset1 = $offset;
-$index = $ARGV[1];
-&nextI;
-#&readnext;
-$file2 = $file;
-$offset2 = $offset;
-
-if ($file1 == $file2)
-  {
-    $count = $offset2 - $offset1;
-    $cond = 0;
-    $size = 1024*1024;
-    $fi = sprintf ("%03d.vdr",$file);
-    open (FI,$fi);
-    sysseek (FI,$offset1,0);
-    while ($cond == 0)
-      {
-	if ($count > $size)
-	  {
-	    $read = sysread (FI,$data,$size);
-            print $data;
-	    $count -= $size;
-	  }
-	else
-	  {
-	    $read = sysread (FI,$data,$count);
-            print $data;
-	    $cond = 1;
-	  }
-      }
-  }
-else
-  {
-    $count = $offset2;
-    $cond = 0;
-    $read = $size = 1024*1024;
-    $fi = sprintf ("%03d.vdr",$file1);
-    open (FI,$fi);
-    sysseek (FI,$offset1,0);
-    while ($read == $size)
-      {
-	$read = sysread (FI,$data,$size);
-        print $data;
-      }
-    close (FI);
-
-    $file1++;
-    while ($file1 != $file2)
-      {
-        $fi = sprintf ("%03d.vdr",$file1);
-        open (FI,$fi);
-        $read = 1024*1024;        
-        while ($read == $size)
-          {
-            $read = sysread (FI,$data,$size);
-            print $data;
-          }
-        close (FI);
-        $file1++;
-      }
-
-    $fi = sprintf ("%03d.vdr",$file2);
-    open (FI,$fi);
-    while ($cond == 0)
-      {
-	if ($count > $size)
-	  {
-	    $read = sysread (FI,$data,$size);
-            print $data;
-	    $count -= $size;
-	  }
-	else
-	  {
-	    $read = sysread (FI,$data,$count);
-            print $data;
-	    $cond = 1;
-	  }
-      }
-  }
diff --git a/Tools/schnitt/schnitt3.pl b/Tools/schnitt/schnitt3.pl
deleted file mode 100755
index 7cc0f7f3e..000000000
--- a/Tools/schnitt/schnitt3.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl
-
-require "/usr/local/bin/my/schnittcommon.pli";
-
-open (INDEX,"index.vdr");
-$index = $ARGV[0];
-&nextI;
-
-$oldindex = $index;
-$tempindex = $index;
-
-$add = -1;
-
-$fi = sprintf ("%03d.vdr",$file);
-open (FI2,$fi);
-open (FO,">test");
-sysseek (FI2,$offset,0);
-sysread (FI2,$temp,3000000);
-syswrite (FO,$temp,3000000);
-close (FI2);
-close (FO);
-`/usr/local/bin/pvademux.old . test`;
-if ( -s "test.mp2")
-  {
-    `rm test*`;
-    print "$index\n";
-    exit 0;
-  }
-
-while (1)
-  {
-    if ($index == 0)
-      {
-        $add = 1;
-      }
-    if ($add = -1)
-      {
-       $index--;
-       &prevI;
-      }
-    else
-      {
-        nextI;
-      }
-    $fi = sprintf ("%03d.vdr",$file);
-    open (FI2,$fi);
-    open (FO,">test");
-    sysseek (FI2,$offset,0);
-    sysread (FI2,$temp,3000000);
-    syswrite (FO,$temp,3000000);
-    close (FI2);
-    close (FO);
-    `/usr/local/bin/pvademux.old . test`;
-    if ( -s "test.mp2")
-      {
-        `rm test*`;
-        if ($index < 0)
-          {
-            $index *= -1;
-          }
-        print "$index\n";
-        exit 0;
-      }
-  }
diff --git a/Tools/schnitt/schnitt3.pl.new b/Tools/schnitt/schnitt3.pl.new
deleted file mode 100755
index 04a6239be..000000000
--- a/Tools/schnitt/schnitt3.pl.new
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/perl
-
-require "/usr/local/bin/my/schnittcommon.pli";
-
-open (INDEX,"index.vdr");
-
-$index = $ARGV[0];
-&nextI;
-
-$oldindex = $index;
-$tempindex = $index;
-
-$add = -1;
-
-$fi = sprintf ("%03d.vdr",$file);
-open (FI2,$fi);
-open (FO,">test2");
-sysseek (FI2,$offset,0);
-sysread (FI2,$temp,3000000);
-syswrite (FO,$temp,3000000);
-close (FI2);
-close (FO);
-
-system ("pes2av_pes test2 > test 2>/dev/null");
-open (PVA,"/usr/local/bin/pvademux.old . test 2>&1 |");
-
-@a=<PVA>; close PVA;
-@b=split (/\s/,$a[2]);
-
-if (!($b[4] =~ /\-/) && $b[4] < 2000)
-  {
-    unlink <test*>;
-    print "$index\n";
-    exit 0;
-  }
-
-while (1)
-  {
-    if ($index == 0)
-      {
-        $add = 1;
-      }
-    if ($add = -1)
-      {
-       $index--;
-       &prevI;
-      }
-    else
-      {
-        nextI;
-      }
-    $fi = sprintf ("%03d.vdr",$file);
-    open (FI2,$fi);
-    open (FO,">test2");
-    sysseek (FI2,$offset,0);
-    sysread (FI2,$temp,3000000);
-    syswrite (FO,$temp,3000000);
-    close (FI2);
-    close (FO);
-
-system ("/usr/local/bin/pes2av_pes test2 > test 2>/dev/null");
-open (PVA,"/usr/local/bin/pvademux.old . test 2>&1 |");
-
-@a=<PVA>; close PVA;
-@b=split (/\s/,$a[2]);
-
-if (!($b[4] =~ /\-/) && $b[4] < 2000)
-  {
-    unlink <test*>;
-        if ($index < 0)
-          {
-            $index *= -1;
-          }
-    print "$index\n";
-    exit 0;
-  }
-}
diff --git a/Tools/schnitt/schnitt4.pl b/Tools/schnitt/schnitt4.pl
deleted file mode 100755
index 75f2ad178..000000000
--- a/Tools/schnitt/schnitt4.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl
-
-open (FI,$ARGV[0]) or die "Kann Input-Datei nicht oeffnen";
-$count = 1;
-
-while (<FI>)
-  {
-    chomp;
-    $char = sprintf ("%c",$count + 96);
-    print "Cutting from/to $_ into /x2/clips/$char\n";
-    system ("/usr/local/bin/my/schnitt2.pl $_ > /x2/clips/$char");
-    $count++;
-  }
diff --git a/Tools/schnitt/schnitt5.pl b/Tools/schnitt/schnitt5.pl
deleted file mode 100755
index 7626ab51f..000000000
--- a/Tools/schnitt/schnitt5.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/perl
-require "/usr/local/bin/my/schnittcommon.pli";
-
-open (INDEX,"index.vdr");
-$index = $ARGV[0] - 15000;
-&nextI;
-
-$file1 = $file;
-
-$index += 30000;
-&nextI;
-
-$file2 = $file;
-
-print "$file1 $file2\n";
-
diff --git a/Tools/schnitt/schnitt6.pl b/Tools/schnitt/schnitt6.pl
deleted file mode 100755
index 92d9eb49c..000000000
--- a/Tools/schnitt/schnitt6.pl
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-
-open (FI,"a");
-
-while (<FI>)
-{
-  open (SCH,"/usr/local/bin/my/schnitt5.pl $_|");
-  $files = <SCH>;
-  chomp $files;
-  ($a,$b) = split (/\s/,$files);
-  $files[$a] = 1;
-  $files[$b] = 1;
-  close (SCH);
-}
-
-while (<0*.vdr>)
-{
-  $_ =~ /\d(\d\d)\.vdr/;
-  if ($files[$1])
-  {
-    print "Keeping $1\n";
-  }
-  else
-  {
-    print "Deleting $_\n";
-    unlink $_;
-  }
-}
-
-close (FI);
diff --git a/Tools/schnitt/schnittcommon.pli b/Tools/schnitt/schnittcommon.pli
deleted file mode 100755
index f221f41af..000000000
--- a/Tools/schnitt/schnittcommon.pli
+++ /dev/null
@@ -1,64 +0,0 @@
-sub nextI 
-  {
-    if (!$size)
-      {
-        $size = -s INDEX;
-      }
-    local ($a,$b,$c,$dummy);
-    $cond = 0;
-    seek (INDEX,$index * 8,0);
-
-    while ($cond == 0)
-      {
-	&readnext;
-	if ($frame == 1)
-	  {
-	    $cond = 1;
-	  }
-	else
-	  {
-	    $index++;
-            if ($index > ($size/8-1))
-              {
-                $index = $size/8-1;
-                &prevI;
-                print "$index\n";
-                exit 1;
-              }
-	  }
-      }
-  }
-
-sub readnext
-  {
-    read (INDEX,$a,4);
-    read (INDEX,$b,1);
-    read (INDEX,$c,1);
-    read (INDEX,$dummy,2);
-    $offset = unpack ("L",$a);
-    $frame = unpack ("C",$b);
-    $file = unpack ("C",$c);
-  }
-
-sub prevI 
-  {
-    local ($a,$b,$c,$dummy);
-    $cond = 0;
-    seek (INDEX,$index * 8,0);
-
-    while ($cond == 0)
-      {
-	&readnext;
-	if ($frame == 1)
-	  {
-	    $cond = 1;
-	  }
-	else
-	  {
-	    $index--;
-	    seek (INDEX,$index * 8,0);
-	  }
-      }
-  }
-
-1;
diff --git a/Tools/schnitt/show b/Tools/schnitt/show
deleted file mode 100755
index bfcc58a8f..000000000
--- a/Tools/schnitt/show
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-cd /x2/temp
-while true
-do
-  if [ -f newpic ]; then
-    killall xli
-    rm -f newpic
-    xli output000.ppm &
-  fi
-sleep 24h
-done
diff --git a/Tools/schnitt/unsort b/Tools/schnitt/unsort
deleted file mode 100755
index 83adfb6c6..000000000
--- a/Tools/schnitt/unsort
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/perl
-
-while (<>)
-{
-  $h{$_}=1;
-}
-
-foreach $key (sort shuffle keys %h)
-{
-  print $key;
-}
-
-sub shuffle {
-  $ran = rand(1);
-
-  if ($ran > 0.5)
-  {
-    return -1;
-  }
-  else
-  {
-    return 1;
-  }
-}
-
diff --git a/Tools/schnitt/vdr-remote.pl b/Tools/schnitt/vdr-remote.pl
deleted file mode 100755
index 32d408e0d..000000000
--- a/Tools/schnitt/vdr-remote.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use Socket;
-
-my ($dest, $port, $iaddr, $paddr, $proto, $line);
-
-$dest = "localhost";
-$port = "2001";
-
-$iaddr = inet_aton($dest)                   || Error("no host: $dest");
-$paddr = sockaddr_in($port, $iaddr);
-
-$proto = getprotobyname('tcp');
-socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
-connect(SOCK, $paddr)                       || Error("connect: $!");
-select (SOCK); $| = 1;
-$a=<SOCK>;
-
-for (;;)
-  {
-    open (FI,"/tmp/vdr-keys");
-    while (<FI>)
-      {
-	chomp;
-	print "$_\r\n";
-	$a=<SOCK>;
-      }
-    close (FI);
-  }
-
-print "quit\r\n";
-$a=<SOCK>;
-close (SOCK)                                || Error("close: $!");
-
-sub Error
-{
-  print STDERR "@_\n";
-  exit 0;
-}
diff --git a/Tools/schnitt/vdr2 b/Tools/schnitt/vdr2
deleted file mode 100755
index 96557bf2f..000000000
--- a/Tools/schnitt/vdr2
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-irpty ~/.lircrc-vdr -- vdr -c /home/ms/.vdr -v /video/video0
diff --git a/Tools/schnitt/vmount b/Tools/schnitt/vmount
deleted file mode 100755
index ab16e4579..000000000
--- a/Tools/schnitt/vmount
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-count=1
-cond=0
-
-if [ -f "$1" ]; then
-  mount "$1" /mnt/1 -o loop
-  cond=1
-else
-  while [ "$cond" != "1" ]
-  do
-    if [ -f "$1$count" ]; then
-      mount "$1$count" /mnt/$count -o loop
-    else
-      cond=1
-    fi
-    let count=count+1
-  done
-fi
diff --git a/Tools/statdvb2vdr/ch.pl b/Tools/statdvb2vdr/ch.pl
deleted file mode 100644
index 91e918d27..000000000
--- a/Tools/statdvb2vdr/ch.pl
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/usr/bin/perl
-
-# Reads the file statdvb.dat produced by the Siemens windows 
-# software (1.50), which contains the scanned channels of an
-# DVB-C (-S). The file ist located in the windows directory.
-#
-# Output is suitable for VDR (channels.conf). Only tested for
-# the cable version. Should work with slight modifications for
-# the sat version.
-#
-# 8. M�rz 2001 - Hans-Peter Raschke
-
-
-# file structure derived from "DvbGlobalDef.h" of the Siemens
-# DVB kit.
-
-# typedef int TABLETYPE;
-# enum TunStandard
-# {
-# 	PAL_BG,     //B/G stereo or mono
-# 	PAL_I,      //I mono (with Nicam stereo)
-# 	PAL_DK,     //D/K mono
-# 	SECAM_L,    //L mono (with Nicam stereo)
-# 	SECAM_LI,	//Secam L� (with Nicam stereo)
-# 	SECAM_DK,
-# 	SECAM_BG,
-# 	NTSC_M,
-# 	DVB_C,
-# 	DVB_S,
-# 	DVB_T
-# };
-# 
-# typedef struct TunProgDataTag //xx bytes+1string
-# {
-# 	int 	nNumber;				//logical number of the program
-# 	DWORD   dwFrequency;				//frequency in khz
-# 	CString 	csName;				//name of the program
-# 	TunStandard	eStandard;			//standard of the program
-# 	DWORD	dwExtraInfo;				//specific info, like teletext,reserved data
-# 							//0x8 == external input 1-CVBS
-# 							//0x10 == external input 2-Y/C
-# 							//0x20 == scrambled Program stream
-# 							//0x40 == ASTRA Sattable
-# 							//0x80 == Eutelsat Sattable
-# 							//0xC0 == Sattable from File
-# 							//0x100 == Pulsed switch to other satellite dish
-# 							//0x1000-0xF000 = Other Satellite Nr(if Sattable from File)
-# //Digital only params beginning from here
-# 	WORD ProgNr;					//DVB Nr for the prog (PAS related)
-# 	WORD wTS_ID;					//Transport-Stream ID orig.
-# 	WORD wNW_ID;					//Network ID orig.
-# 	WORD wService_ID;				//Service /Programm Id
-# 	BYTE nModulation;				//Modulation-Type QAM,QPSK,other
-# 	BYTE nFEC_outerinner;				//outer(high nibble) and inner(low n.)
-# 	DWORD dwSymbolrate;				//in symbol/s
-# 	BOOL b22kHz;					//east or west(TRUE) position in Sat
-# 	BOOL bVertical_pos;				//horizontal or vertical(TRUE) position in SAT
-# 	BYTE nProgtype;					//type of service (e.g. tv, radio)
-# 	WORD wVideo_PID;				//video-pid of the channel
-# 	WORD wAudio_PID;				//audio-pid of the channel
-# 	WORD wPMT_PID;					//PID of the associated PMT
-# 	WORD wTxt_PID;					//teletext PID for the program
-# 	WORD wSubtitling_PID;				//subtitling PID for the program
-# 	WORD wData_PID;					//PID for data broadcast
-# 	BYTE nIPFilter;					//filter for different ip's
-# 	DWORD dwReserved1;				//Shows some extended Information LOWORD=DataBroadcast_Id, 
-# 							//MSB showing Databroadcast, (HIWORD & 0xFF)=ComponentTag from the stream ident desc
-# 	DWORD dwReserved2;				//reserved dword
-# }DVBTunProgData;
-# 
-
-use strict;
-use FileHandle;
-
-# for a full dump
-my @varNames	= ("nNumber",			# logical number of the program 
-                   "dwFrequency",		# frequency in khz
-	           "csName",			# name of the program
-	           "eStandard",			# standard of the program
-	  	   "dwExtraInfo",		# specific info, like teletext,reserved data
-						# 0x8 == external input 1-CVBS
-						# 0x10 == external input 2-Y/C
-						# 0x20 == scrambled Program stream
-						# 0x40 == ASTRA Sattable
-						# 0x80 == Eutelsat Sattable
-						# 0xC0 == Sattable from File
-						# 0x100 == Pulsed switch to other satellite dish
-						# 0x1000-0xF000 = Other Satellite Nr(if Sattable from File)
-	           "ProgNr",			# DVB Nr for the prog (PAS related)
-	           "wTS_ID",			# Transport-Stream ID orig.
-	           "wNW_ID",			# Network ID orig.
-	           "wService_ID",		# Service /Programm Id
-	           "nModulation",		# Modulation-Type QAM,QPSK,other
-	           "nFEC_outerinner",		# outer(high nibble) and inner(low n.)
-	           "dwSymbolrate",		# in symbol/s
-	           "b22kHz",			# east or west(TRUE) position in Sat
-	           "bVertical_pos",		# horizontal or vertical(TRUE) position in SAT
-	           "nProgtype",			# type of service (e.g. tv, radio)
-	           "wVideo_PID",		# video-pid of the channel
-	           "wAudio_PID",		# audio-pid of the channel
-	           "wPMT_PID",			# PID of the associated PMT
-	           "wTxt_PID",			# teletext PID for the program
-	           "wSubtitling_PID",	  	# subtitling PID for the program
-	           "wData_PID");		# PID for data broadcast
-
-my @outVar = ("csName", 
-              "dwFrequency", 
-	      "bVertical_pos", 
-	      "b22kHz", 
-	      "dwSymbolrate",
-	      "wVideo_PID",
-	      "wAudio_PID",
-	      "wTxt_PID",
-	      "dwExtraInfo",
-	      "ProgNr");
-
-# channels that need a valid smartcard
-my @addCrypted = ("Extreme Sport",
-                  "Bloomberg",
-                  "Fashion TV",
-                  "BET ON JAZZ",
-                  "LANDSCAPE",
-                  "Einstein",
-                  "Single TV");
-	      
-my @chNames	= ();				# list of scanned channels
-my $camNo	= 1;				# number of CI/CAM to use
-my %chData;					# all channel data
-my $buff;					# input buffer
-my $fh		= new FileHandle("$ARGV[0]")	or die "Datei $ARGV[0] nicht gefunden!";
-
-binmode($fh);					# could be run on windows
-$fh->seek(4, 0);				# skip id
-
-my $chCnt	= 0;
-while (!$fh->eof()) {
-  $chCnt++;
-
-  last 					if ($fh->read($buff, 7) != 7);
-  my ($nNumber, 
-      $dwFrequency,
-      $sLen
-     )		= unpack("SLC", $buff);
-  
-  last 					if ($fh->read($buff, $sLen) != $sLen);
-  my ($csName)	= unpack("A$sLen", $buff);
-  $csName	=~ s/:/./g;
-  $csName	=~ s/^\s+//;
-  $csName	=~ s/\s+$//;
-
-  last 					if ($fh->read($buff, 54) != 54);
-  my ($eStandard,
-      $dwExtraInfo,
-      $ProgNr,
-      $wTS_ID,
-      $wNW_ID,
-      $wService_ID,
-      $nModulation,
-      $nFEC_outerinner,
-      $dwSymbolrate,
-      $b22kHz,
-      $bVertical_pos,
-      $nProgtype,
-      $wVideo_PID,
-      $wAudio_PID,
-      $wPMT_PID,
-      $wTxt_PID,
-      $wSubtitling_PID,
-      $wData_PID
-     )		= unpack("LLSSSSCCLLLCSSSSSS", $buff);
-
-  # some modifications for VDR  
-  $dwFrequency 	 /= 1000;
-  $bVertical_pos = $bVertical_pos ? "v" : "h";
-  $dwSymbolrate	 /= 1000;
-  $dwExtraInfo	 = ($dwExtraInfo == 32 || grep(($_ cmp $csName) == 0, @addCrypted)) ? $camNo : 0;
-
-  my $x		= 1;
-  my $orgName	= $csName;
-  while (exists($chData{$csName})) {
-    $csName	 = "$orgName" . "_$x";
-    $x++;
-  }
-  push(@chNames, $csName);
-
-  my %tmp = ("nNumber"		=> $nNumber,			
-             "dwFrequency"	=> $dwFrequency,		
-	     "csName"		=> $orgName,			
-	     "eStandard"	=> $eStandard,			
-	     "dwExtraInfo"	=> $dwExtraInfo,		
-	     "ProgNr"		=> $ProgNr,			
-	     "wTS_ID"		=> $wTS_ID,			
-	     "wNW_ID"		=> $wNW_ID,			
-	     "wService_ID"	=> $wService_ID,		
-	     "nModulation"	=> $nModulation,		
-	     "nFEC_outerinner"	=> $nFEC_outerinner,		
-	     "dwSymbolrate"	=> $dwSymbolrate,		
-	     "b22kHz"		=> $b22kHz,			
-	     "bVertical_pos"	=> $bVertical_pos,		
-	     "nProgtype"	=> $nProgtype,			
-	     "wVideo_PID"	=> $wVideo_PID,		
-	     "wAudio_PID"	=> $wAudio_PID,		
-	     "wPMT_PID"		=> $wPMT_PID,			
-	     "wTxt_PID"		=> $wTxt_PID,			
-	     "wSubtitling_PID"	=> $wSubtitling_PID,	  	
-	     "wData_PID"	=> $wData_PID);		
-  $chData{$csName}	= {%tmp};
-}
-
-print STDERR "$chCnt channels found!\n";
-
-# now we print the channels.conf	      
-# crypted TV
-print ":verschl�sselte Fernsehprogramme\n";
-for my $n (@chNames) {
-  my %tmp	= %{$chData{$n}};
-  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 1 && $tmp{"dwExtraInfo"});
-}
-
-# TV
-print ":Fernsehprogramme\n";
-for my $n (@chNames) {
-  my %tmp	= %{$chData{$n}};
-  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 1 && !$tmp{"dwExtraInfo"});
-}
-
-# crypted radio
-print ":verschl�sselte Radioprogramme\n";
-for my $n (@chNames) {
-  my %tmp	= %{$chData{$n}};
-  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 2 && $tmp{"dwExtraInfo"});
-}
-
-# radio
-print ":Radioprogramme\n";
-for my $n (@chNames) {
-  my %tmp	= %{$chData{$n}};
-  printChannel($chData{$n})		if ($tmp{"nProgtype"} == 2 && !$tmp{"dwExtraInfo"});
-}
-
-sub printChannel {
-  my $p		= shift;
-  my @tmp	= ();
-
-  for my $n (@outVar) {
-    push(@tmp, ${$p}{$n});
-  }
-  
-  print join(":", @tmp), "\n";
-}  
diff --git a/Tools/xtvrc2vdr/Makefile b/Tools/xtvrc2vdr/Makefile
deleted file mode 100644
index be5054152..000000000
--- a/Tools/xtvrc2vdr/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Makefile for xtvrc2vdr utility
-#
-
-OBJS = xtvrc2vdr.o
-
-%.o: %.c
-	gcc -g -O2 -Wall -c $(DEFINES) $<
-
-all: xtvrc2vdr
-
-xtvrc2vdr: $(OBJS)
-	gcc -g -O2 $(OBJS) -o xtvrc2vdr
-
-clean:
-	-rm -f $(OBJS) xtvrc2vdr
diff --git a/Tools/xtvrc2vdr/hotbird.conf b/Tools/xtvrc2vdr/hotbird.conf
deleted file mode 100644
index 3431d5c4d..000000000
--- a/Tools/xtvrc2vdr/hotbird.conf
+++ /dev/null
@@ -1,191 +0,0 @@
-TV Polonia:10719:v:1:27500:163:92:0:0
-Credit Agricole:10834:v:1:27500:5321:5333:0:0
-La Chaine Parlementaire:10873:v:1:27500:1020:1030:0:0
-TMT:10892:v:1:27500:163:92:0:0
-Multivision Accueil:10911:v:1:27500:320:330:0:0
-RTL:11054:v:1:27500:160:80:0:0
-VOX:11054:v:1:27500:500:501:0:0
-Sat 1 A:11054:v:1:27500:511:512:0:0
-RTL II Austria:11054:v:1:27500:520:521:0:0
-NBC Europe:11054:v:1:27500:550:551:0:0
-ZDF:11054:v:1:27500:570:571:0:0
-K-T9:11054:v:1:27500:580:581:0:0
-Sat 1 Schweiz:11604:v:1:27500:101:102:0:0
-MKT9:11623:v:1:27500:222:242:0:0
-Olisat TV Promo:11623:v:1:27500:226:246:0:0
-Bloomberg TV Germany:11642:v:1:27500:1460:1420:0:0
-Bloomberg TV UK:11642:v:1:27500:1560:1520:0:0
-SAT 7:11642:v:1:27500:1660:1620:0:0
-Multivision 1:11662:v:1:27500:120:130:0:0
-Dubai EDT9:11746:v:1:27500:4130:4131:0:0
-Dubai Sport Channel:11746:v:1:27500:4386:4387:0:0
-Dubai Business Channel:11746:v:1:27500:4642:4643:0:0
-Dubai EDT9:11746:v:1:27500:4898:4899:0:0
-RAI Uno:11766:v:1:27500:160:80:0:0
-RAI Due:11766:v:1:27500:161:84:0:0
-RAI Tre:11766:v:1:27500:162:88:0:0
-RAI Mosaico:11766:v:1:27500:518:8191:0:0
-RAI SportSat:11804:v:1:27500:512:650:0:0
-RAI Nettuno Sat 2:11804:v:1:27500:513:651:0:0
-RAI Educational:11804:v:1:27500:514:652:0:0
-TelePace :11804:v:1:27500:515:653:0:0
-RAI News24:11804:v:1:27500:516:654:0:0
-Camera dei Deputati:11804:v:1:27500:517:655:0:0
-SAT 2000:11804:v:1:27500:518:656:0:0
-RAI NettunoSat 1:11804:v:1:27500:519:657:0:0
-ERT Sat:11823:v:1:27500:521:740:0:0
-INT9:11843:v:1:27500:2324:2325:0:0
-TVL:11843:v:1:27500:2441:2442:0:0
-Team TV :11881:v:1:27500:2305:2306:0:0
-Ante Prima:11881:v:1:27500:2435:2436:0:0
-SNAI:11881:v:1:27500:2561:2562:0:0
-Italia 1 :11919:v:1:27500:512:650:0:0
-Canale 5:11919:v:1:27500:513:660:0:0
-Rete 4 :11919:v:1:27500:514:670:0:0
-ART Europe:12015:v:1:27500:164:96:0:0
-ESC 2:12015:v:1:27500:166:104:0:0
-ART Iqra:12015:v:1:27500:168:112:0:0
-Vetrina D+:12034:v:1:27500:166:105:0:0
-D+ Info:12073:v:1:27500:160:80:0:0
-Palco Promo:12073:v:1:27500:161:84:0:0
-Vacaciones T9:12092:v:1:27500:4112:4113:0:0
-TvL - TV Locale:12092:v:1:27500:4160:4161:0:0
-Satisfaction T9:12092:v:1:27500:4192:4193:0:0
-TVE Internacional:12092:v:1:27500:4208:4209:0:0
-TVG - TV de Galicia :12092:v:1:27500:4224:4225:0:0
-La Cadena Del Milagro:12092:v:1:27500:4368:4369:0:0
-Fiesta:12092:v:1:27500:4432:4433:0:0
-Visions Europe:12092:v:1:27500:4416:4417:0:0
-SateliTV/TV Sex Channel:12092:v:1:27500:4480:4481:0:0
-Krisma:12111:v:1:27500:200:201:0:0
-NT9:12111:v:1:27500:210:211:0:0
-Armenia TV 1:12111:v:1:27500:240:241:0:0
-SMAU Channel :12111:v:1:27500:260:261:0:0
-JSC - Al Jazeera Satellite Ch :12111:v:1:27500:270:271:0:0
-Il Tirreno Sat:12111:v:1:27500:280:301:0:0
-Coming Soon T9:12111:v:1:27500:310:311:0:0
-Alice:12149:v:1:27500:160:161:0:0
-Nuvolari Promo:12149:v:1:27500:176:177:0:0
-CCTV 4:12169:v:1:27500:516:690:0:0
-Kanali Vuolis:12169:v:1:27500:517:700:0:0
-Nova Promo:12169:v:1:27500:521:740:0:0
-ERT Sat :12188:v:1:27500:514:652:0:0
-Kanali Voulis:12188:v:1:27500:515:653:0:0
-OTE Promo:12188:v:1:27500:517:655:0:0
-TV 5 Europe:12245:v:1:27500:121:131:0:0
-Fashion T9:12245:v:1:27500:123:133:0:0
-TV Ajara:12245:v:1:27500:127:137:0:0
-Telekom T9:12265:v:1:27500:1460:1420:0:0
-SLO-TV1:12303:v:1:27500:200:201:0:0
-Polonia 1:12303:v:1:27500:205:206:0:0
-Super 1:12303:v:1:27500:207:208:0:0
-Sicilia Internacional:12303:v:1:27500:210:211:0:0
-SicilSat:12303:v:1:27500:225:226:0:0
-TBNE Italy:12303:v:1:27500:230:231:0:0
-Countdown T9:12303:v:1:27500:235:236:0:0
-Napoli International:12303:v:1:27500:240:241:0:0
-Magic T9:12303:v:1:27500:245:246:0:0
-TEST:12341:v:1:27500:165:108:0:0
-Colour Bars:12380:v:1:27500:3022:3032:0:0
-Tele 24 :12380:v:1:27500:3023:3033:0:0
-Abu Dhabi TV :12380:v:1:27500:3024:3034:0:0
-LCA:12380:v:1:27500:3025:3035:0:0
-RTV Montenegro:12380:v:1:27500:3026:3036:0:0
-SRG SSR Sat Access :12399:v:1:27500:165:98:0:0
-Jam-e-Jam Network 1 (IRIB 1):12437:v:1:27500:160:80:0:0
-Jam-e-Jam Network 2 (IRIB 2):12437:v:1:27500:161:82:0:0
-Sahar University Network:12437:v:1:27500:162:84:0:0
-Maharishi Open University:12476:v:1:27500:42:43:0:0
-Europe by Satellite:12476:v:1:27500:101:201:0:0
-Pink Backup:12476:v:1:27500:308:256:0:0
-Mizik Tropical:12476:v:1:27500:435:436:0:0
-TLI info card:12476:v:1:27500:771:768:0:0
-Liberty T9:12476:v:1:27500:941:942:0:0
-HRT TV 1:12520:v:1:27500:100:101:0:0
-HRT National:12520:v:1:27500:107:108:0:0
-BVN TV:12520:v:1:27500:210:211:0:0
-Sicilia International:12520:v:1:27500:501:502:0:0
-Sardegna Uno:12520:v:1:27500:503:504:0:0
-TGRT:12520:v:1:27500:505:506:0:0
-Euro Mediterraneo:12520:v:1:27500:510:511:0:0
-WWWTravel T9:12540:v:1:27500:1180:1183:0:0
-WWWTravel T9:12540:v:1:27500:1180:1184:0:0
-WWWTravel T9:12540:v:1:27500:1180:1185:0:0
-Bulgaria T9:12540:v:1:27500:4612:4613:0:0
-MC Sat Monte Carlo:12540:v:1:27500:5126:5122:0:0
-MBC:12597:v:1:27500:160:80:0:0
-SIMA-YEH-MOGHAVEMENT:12597:v:1:27500:161:84:0:0
-NITV (National Iran TV ):12597:v:1:27500:163:92:0:0
-BET International:12597:v:1:27500:167:108:0:0
-JSTV 2 Info Card:12597:v:1:27500:2011:2012:0:0
-EuroNews:12597:v:1:27500:2221:2231:0:0
-EuroNews:12597:v:1:27500:2221:2232:0:0
-EuroNews:12597:v:1:27500:2221:2233:0:0
-EuroNews:12597:v:1:27500:2221:2234:0:0
-EuroNews:12597:v:1:27500:2221:2235:0:0
-EuroNews:12597:v:1:27500:2221:2236:0:0
-EuroNews:12597:v:1:27500:2221:2237:0:0
-Canal Agro Rual:12597:v:1:27500:2321:2331:0:0
-MMO9:12616:v:1:27500:2561:2562:0:0
-Dubai Sport Channel:12654:v:1:27500:1060:1020:0:0
-Sharjah TV :12654:v:1:27500:1160:1120:0:0
-Qatar T9:12654:v:1:27500:1260:1220:0:0
-Saudi Channel 1 :12654:v:1:27500:1360:1320:0:0
-Kuwait Space Channel :12654:v:1:27500:1460:1420:0:0
-Libya T9:12654:v:1:27500:1560:1520:0:0
-Sudan T9:12654:v:1:27500:1660:1620:0:0
-Oman T9:12654:v:1:27500:1760:1720:0:0
-Jordan Satellite Channel:12654:v:1:27500:1860:1820:0:0
-Iraq Satellite Channel:12654:v:1:27500:1960:1920:0:0
-Thai TV 5 Global Network :12673:v:1:27500:200:201:0:0
-DigItaly:12673:v:1:27500:220:221:0:0
-Studio Europa:12673:v:1:27500:230:231:0:0
-Game Network:12673:v:1:27500:291:292:0:0
-Video Italia :12673:v:1:27500:340:341:0:0
-Telemarket:12673:v:1:27500:350:351:0:0
-Evision:12673:v:1:27500:360:361:0:0
-AB Passion:12692:v:1:27500:160:80:0:0
-Onyx T9:12692:v:1:27500:161:84:0:0
-EWTN:10723:v:1:29900:1001:1201:0:0
-Test (Newslynx):10723:v:1:29900:1002:1202:0:0
-MTA International:10723:v:1:29900:1004:1204:0:0
-J TV Test:10992:v:1:27500:2436:2437:0:0
-Bloomberg UK Test Card:11242:v:1:27500:162:88:0:0
-Channel SUN Test (KBT):11604:v:1:27500:111:112:0:0
-Racing Channel Test:11623:v:1:27500:223:243:0:0
-Test Card (pgm 4):11623:v:1:27500:224:244:0:0
-Olisat TLC test card:11623:v:1:27500:225:245:0:0
-Channel SUN Test (KBT):11623:v:1:27500:229:249:0:0
-Rai way 3 test card:11766:v:1:27500:164:96:0:0
-Rai way 1 test card:11766:v:1:27500:515:653:0:0
-Rai way 2 test card:11766:v:1:27500:516:654:0:0
-Test (Local Satellite):12092:v:1:27500:4176:4177:0:0
-Retelsat Test:12092:v:1:27500:4464:4465:0:0
-AIT Test Card:12111:v:1:27500:220:221:0:0
-Fucino Test Card:12111:v:1:27500:230:231:0:0
-Espresso(Antenna Hungaria Test Card):12149:v:1:27500:36:37:0:0
-Antenna Hungaria Test Card:12149:v:1:27500:96:97:0:0
-Antenna Hungaria Test Card:12149:v:1:27500:112:113:0:0
-Leonardo (Antenna Hungaria Test):12149:v:1:27500:128:129:0:0
-Test (Sahar):12437:v:1:27500:163:86:0:0
-Test 1:12437:v:1:27500:164:88:0:0
-Test 2:12437:v:1:27500:165:90:0:0
-CNES-Toulouse test:12558:v:1:27500:6143:6142:0:0
-Test Card:12597:v:1:27500:161:84:0:0
-FEED:11242:v:1:27500:167:108:0:0
-Feed :11623:v:1:27500:221:241:0:0
-Quantum 24 :10913:v:1:3998:1160:1120:0:0
-Quantum 24:10913:v:1:3998:1160:1220:0:0
-VIVA Polska:11131:v:1:4340:98:99:0:0
-Deutsche Welle T9:11196:v:1:9096:101:102:0:0
-Canal 24 Horas :11205:v:1:4000:4130:4131:0:0
-TV 5 Asie :11338:v:1:5632:512:640:0:0
-RAI4IFA:11548:v:1:4398:512:650:0:0
-Pro TV International:12201:v:1:5632:1160:1120:0:0
-TVN Polnoc:12211:v:1:5632:4194:4195:0:0
-WorldNet Europe:12484:v:1:8298:4260:4220:0:0
-WorldNet Europe:12484:v:1:8298:4360:4320:0:0
-WorldNet Europe:12484:v:1:8298:4460:4420:0:0
-WorldNet Europe:12484:v:1:8298:4560:4520:0:0
-TVN Polnoc:12573:v:1:5632:4194:4195:0:0
-APTN:12582:v:1:5632:308:256:0:0
diff --git a/Tools/xtvrc2vdr/xtvrc.hotbird b/Tools/xtvrc2vdr/xtvrc.hotbird
deleted file mode 100644
index c809eeef5..000000000
--- a/Tools/xtvrc2vdr/xtvrc.hotbird
+++ /dev/null
@@ -1,1337 +0,0 @@
-*
-Channel: TV Polonia
-Frequency: 10719
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 163 92 0 10
-
-*
-Channel: Credit Agricole
-Frequency: 10834
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 5321 5333 0 10
-
-*
-Channel: La Chaine Parlementaire
-Frequency: 10873
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 1020 1030 0 10
-
-*
-Channel: TMT
-Frequency: 10892
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 163 92 0 10
-
-*
-Channel: Multivision Accueil
-Frequency: 10911
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 320 330 0 10
-
-*
-Channel: RTL
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 160 80 0 10
-
-*
-Channel: VOX
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 500 501 0 10
-
-*
-Channel: Sat 1 A
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 511 512 0 10
-
-*
-Channel: RTL II Austria
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 520 521 0 10
-
-*
-Channel: NBC Europe
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 550 551 0 10
-
-*
-Channel: ZDF
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 570 571 0 10
-
-*
-Channel: K-T9
-Frequency: 11054
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 580 581 0 10
-
-*
-Channel: Sat 1 Schweiz
-Frequency: 11604
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 101 102 0 10
-
-*
-Channel: MKT9
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 222 242 0 10
-
-*
-Channel: Olisat TV Promo
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 226 246 0 10
-
-*
-Channel: Bloomberg TV Germany
-Frequency: 11642
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1460 1420 0 10
-
-*
-Channel: Bloomberg TV UK
-Frequency: 11642
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1560 1520 0 10
-
-*
-Channel: SAT 7
-Frequency: 11642
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1660 1620 0 10
-
-*
-Channel: Multivision 1
-Frequency: 11662
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 120 130 0 10
-
-*
-Channel: Dubai EDT9
-Frequency: 11746
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4130 4131 0 10
-
-*
-Channel: Dubai Sport Channel
-Frequency: 11746
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4386 4387 0 10
-
-*
-Channel: Dubai Business Channel
-Frequency: 11746
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4642 4643 0 10
-
-*
-Channel: Dubai EDT9
-Frequency: 11746
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4898 4899 0 10
-
-*
-Channel: RAI Uno
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 160 80 0 10
-
-*
-Channel: RAI Due
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 161 84 0 10
-
-*
-Channel: RAI Tre
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 162 88 0 10
-
-*
-Channel: RAI Mosaico
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 518 8191 0 10
-
-*
-Channel: RAI SportSat
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 512 650 0 10
-
-*
-Channel: RAI Nettuno Sat 2
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 513 651 0 10
-
-*
-Channel: RAI Educational
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 514 652 0 10
-
-*
-Channel: TelePace 
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 515 653 0 10
-
-*
-Channel: RAI News24
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 516 654 0 10
-
-*
-Channel: Camera dei Deputati
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 517 655 0 10
-
-*
-Channel: SAT 2000
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 518 656 0 10
-
-*
-Channel: RAI NettunoSat 1
-Frequency: 11804
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 519 657 0 10
-
-*
-Channel: ERT Sat
-Frequency: 11823
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 521 740 0 10
-
-*
-Channel: INT9
-Frequency: 11843
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2324 2325 0 10
-
-*
-Channel: TVL
-Frequency: 11843
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2441 2442 0 10
-
-*
-Channel: Team TV 
-Frequency: 11881
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2305 2306 0 10
-
-*
-Channel: Ante Prima
-Frequency: 11881
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2435 2436 0 10
-
-*
-Channel: SNAI
-Frequency: 11881
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2561 2562 0 10
-
-*
-Channel: Italia 1 
-Frequency: 11919
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 512 650 0 10
-
-*
-Channel: Canale 5
-Frequency: 11919
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 513 660 0 10
-
-*
-Channel: Rete 4 
-Frequency: 11919
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 514 670 0 10
-
-*
-Channel: ART Europe
-Frequency: 12015
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 164 96 0 10
-
-*
-Channel: ESC 2
-Frequency: 12015
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 166 104 0 10
-
-*
-Channel: ART Iqra
-Frequency: 12015
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 168 112 0 10
-
-*
-Channel: Vetrina D+
-Frequency: 12034
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 166 105 0 10
-
-*
-Channel: D+ Info
-Frequency: 12073
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 160 80 0 10
-
-*
-Channel: Palco Promo
-Frequency: 12073
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 161 84 0 10
-
-*
-Channel: Vacaciones T9
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4112 4113 0 10
-
-*
-Channel: TvL - TV Locale
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4160 4161 0 10
-
-*
-Channel: Satisfaction T9
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4192 4193 0 10
-
-*
-Channel: TVE Internacional
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4208 4209 0 10
-
-*
-Channel: TVG - TV de Galicia 
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4224 4225 0 10
-
-*
-Channel: La Cadena Del Milagro
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4368 4369 0 10
-
-*
-Channel: Fiesta
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4432 4433 0 10
-
-*
-Channel: Visions Europe
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4416 4417 0 10
-
-*
-Channel: SateliTV/TV Sex Channel
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4480 4481 0 10
-
-*
-Channel: Krisma
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 200 201 0 10
-
-*
-Channel: NT9
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 210 211 0 10
-
-*
-Channel: Armenia TV 1
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 240 241 0 10
-
-*
-Channel: SMAU Channel 
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 260 261 0 10
-
-*
-Channel: JSC - Al Jazeera Satellite Ch 
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 270 271 0 10
-
-*
-Channel: Il Tirreno Sat
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 280 301 0 10
-
-*
-Channel: Coming Soon T9
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 310 311 0 10
-
-*
-Channel: Alice
-Frequency: 12149
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 160 161 0 10
-
-*
-Channel: Nuvolari Promo
-Frequency: 12149
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 176 177 0 10
-
-*
-Channel: CCTV 4
-Frequency: 12169
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 516 690 0 10
-
-*
-Channel: Kanali Vuolis
-Frequency: 12169
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 517 700 0 10
-
-*
-Channel: Nova Promo
-Frequency: 12169
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 521 740 0 10
-
-*
-Channel: ERT Sat 
-Frequency: 12188
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 514 652 0 10
-
-*
-Channel: Kanali Voulis
-Frequency: 12188
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 515 653 0 10
-
-*
-Channel: OTE Promo
-Frequency: 12188
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 517 655 0 10
-
-*
-Channel: TV 5 Europe
-Frequency: 12245
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 121 131 0 10
-
-*
-Channel: Fashion T9
-Frequency: 12245
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 123 133 0 10
-
-*
-Channel: TV Ajara
-Frequency: 12245
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 127 137 0 10
-
-*
-Channel: Telekom T9
-Frequency: 12265
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 1460 1420 0 10
-
-*
-Channel: SLO-TV1
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 200 201 0 10
-
-*
-Channel: Polonia 1
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 205 206 0 10
-
-*
-Channel: Super 1
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 207 208 0 10
-
-*
-Channel: Sicilia Internacional
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 210 211 0 10
-
-*
-Channel: SicilSat
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 225 226 0 10
-
-*
-Channel: TBNE Italy
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 230 231 0 10
-
-*
-Channel: Countdown T9
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 235 236 0 10
-
-*
-Channel: Napoli International
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 240 241 0 10
-
-*
-Channel: Magic T9
-Frequency: 12303
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 245 246 0 10
-
-*
-Channel: TEST
-Frequency: 12341
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 165 108 0 10
-
-*
-Channel: Colour Bars
-Frequency: 12380
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 3022 3032 0 10
-
-*
-Channel: Tele 24 
-Frequency: 12380
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 3023 3033 0 10
-
-*
-Channel: Abu Dhabi TV 
-Frequency: 12380
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 3024 3034 0 10
-
-*
-Channel: LCA
-Frequency: 12380
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 3025 3035 0 10
-
-*
-Channel: RTV Montenegro
-Frequency: 12380
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 3026 3036 0 10
-
-*
-Channel: SRG SSR Sat Access 
-Frequency: 12399
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 165 98 0 10
-
-*
-Channel: Jam-e-Jam Network 1 (IRIB 1)
-Frequency: 12437
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 160 80 0 10
-
-*
-Channel: Jam-e-Jam Network 2 (IRIB 2)
-Frequency: 12437
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 161 82 0 10
-
-*
-Channel: Sahar University Network
-Frequency: 12437
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 162 84 0 10
-
-*
-Channel: Maharishi Open University
-Frequency: 12476
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 42 43 0 10
-
-*
-Channel: Europe by Satellite
-Frequency: 12476
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 101 201 0 10
-
-*
-Channel: Pink Backup
-Frequency: 12476
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 308 256 0 10
-
-*
-Channel: Mizik Tropical
-Frequency: 12476
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 435 436 0 10
-
-*
-Channel: TLI info card
-Frequency: 12476
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 771 768 0 10
-
-*
-Channel: Liberty T9
-Frequency: 12476
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 941 942 0 10
-
-*
-Channel: HRT TV 1
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 100 101 0 10
-
-*
-Channel: HRT National
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 107 108 0 10
-
-*
-Channel: BVN TV
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 210 211 0 10
-
-*
-Channel: Sicilia International
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 501 502 0 10
-
-*
-Channel: Sardegna Uno
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 503 504 0 10
-
-*
-Channel: TGRT
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 505 506 0 10
-
-*
-Channel: Euro Mediterraneo
-Frequency: 12520
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 510 511 0 10
-
-*
-Channel: WWWTravel T9
-Frequency: 12540
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1180 1183 0 10
-
-*
-Channel: WWWTravel T9
-Frequency: 12540
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1180 1184 0 10
-
-*
-Channel: WWWTravel T9
-Frequency: 12540
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1180 1185 0 10
-
-*
-Channel: Bulgaria T9
-Frequency: 12540
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4612 4613 0 10
-
-*
-Channel: MC Sat Monte Carlo
-Frequency: 12540
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 5126 5122 0 10
-
-*
-Channel: MBC
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 160 80 0 10
-
-*
-Channel: SIMA-YEH-MOGHAVEMENT
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 161 84 0 10
-
-*
-Channel: NITV (National Iran TV )
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 163 92 0 10
-
-*
-Channel: BET International
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 167 108 0 10
-
-*
-Channel: JSTV 2 Info Card
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2011 2012 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2231 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2232 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2233 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2234 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2235 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2236 0 10
-
-*
-Channel: EuroNews
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2221 2237 0 10
-
-*
-Channel: Canal Agro Rual
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2321 2331 0 10
-
-*
-Channel: MMO9
-Frequency: 12616
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 2561 2562 0 10
-
-*
-Channel: Dubai Sport Channel
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1060 1020 0 10
-
-*
-Channel: Sharjah TV 
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1160 1120 0 10
-
-*
-Channel: Qatar T9
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1260 1220 0 10
-
-*
-Channel: Saudi Channel 1 
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1360 1320 0 10
-
-*
-Channel: Kuwait Space Channel 
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1460 1420 0 10
-
-*
-Channel: Libya T9
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1560 1520 0 10
-
-*
-Channel: Sudan T9
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1660 1620 0 10
-
-*
-Channel: Oman T9
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1760 1720 0 10
-
-*
-Channel: Jordan Satellite Channel
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1860 1820 0 10
-
-*
-Channel: Iraq Satellite Channel
-Frequency: 12654
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 1960 1920 0 10
-
-*
-Channel: Thai TV 5 Global Network 
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 200 201 0 10
-
-*
-Channel: DigItaly
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 220 221 0 10
-
-*
-Channel: Studio Europa
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 230 231 0 10
-
-*
-Channel: Game Network
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 291 292 0 10
-
-*
-Channel: Video Italia 
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 340 341 0 10
-
-*
-Channel: Telemarket
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 350 351 0 10
-
-*
-Channel: Evision
-Frequency: 12673
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 360 361 0 10
-
-*
-Channel: AB Passion
-Frequency: 12692
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 160 80 0 10
-
-*
-Channel: Onyx T9
-Frequency: 12692
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 161 84 0 10
-
-*
-Channel: EWTN
-Frequency: 10723
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 29900 2 1001 1201 0 10
-
-*
-Channel: Test (Newslynx)
-Frequency: 10723
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 29900 2 1002 1202 0 10
-
-*
-Channel: MTA International
-Frequency: 10723
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 29900 2 1004 1204 0 10
-
-*
-Channel: J TV Test
-Frequency: 10992
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 2436 2437 0 10
-
-*
-Channel: Bloomberg UK Test Card
-Frequency: 11242
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 162 88 0 10
-
-*
-Channel: Channel SUN Test (KBT)
-Frequency: 11604
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 4 111 112 0 10
-
-*
-Channel: Racing Channel Test
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 223 243 0 10
-
-*
-Channel: Test Card (pgm 4)
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 224 244 0 10
-
-*
-Channel: Olisat TLC test card
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 225 245 0 10
-
-*
-Channel: Channel SUN Test (KBT)
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 229 249 0 10
-
-*
-Channel: Rai way 3 test card
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 164 96 0 10
-
-*
-Channel: Rai way 1 test card
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 515 653 0 10
-
-*
-Channel: Rai way 2 test card
-Frequency: 11766
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 1 516 654 0 10
-
-*
-Channel: Test (Local Satellite)
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4176 4177 0 10
-
-*
-Channel: Retelsat Test
-Frequency: 12092
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 4464 4465 0 10
-
-*
-Channel: AIT Test Card
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 220 221 0 10
-
-*
-Channel: Fucino Test Card
-Frequency: 12111
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 230 231 0 10
-
-*
-Channel: Espresso(Antenna Hungaria Test Card)
-Frequency: 12149
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 36 37 0 10
-
-*
-Channel: Antenna Hungaria Test Card
-Frequency: 12149
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 96 97 0 10
-
-*
-Channel: Antenna Hungaria Test Card
-Frequency: 12149
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 112 113 0 10
-
-*
-Channel: Leonardo (Antenna Hungaria Test)
-Frequency: 12149
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 128 129 0 10
-
-*
-Channel: Test (Sahar)
-Frequency: 12437
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 163 86 0 10
-
-*
-Channel: Test 1
-Frequency: 12437
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 164 88 0 10
-
-*
-Channel: Test 2
-Frequency: 12437
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 27500 2 165 90 0 10
-
-*
-Channel: CNES-Toulouse test
-Frequency: 12558
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 6143 6142 0 10
-
-*
-Channel: Test Card
-Frequency: 12597
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 161 84 0 10
-
-*
-Channel: FEED
-Frequency: 11242
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 167 108 0 10
-
-*
-Channel: Feed 
-Frequency: 11623
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 27500 2 221 241 0 10
-
-*
-Channel: Quantum 24 
-Frequency: 10913
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 3998 0 1160 1120 0 10
-
-*
-Channel: Quantum 24
-Frequency: 10913
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 3998 0 1160 1220 0 10
-
-*
-Channel: VIVA Polska
-Frequency: 11131
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 4340 2 98 99 0 10
-
-*
-Channel: Deutsche Welle T9
-Frequency: 11196
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 9096 0 101 102 0 10
-
-*
-Channel: Canal 24 Horas 
-Frequency: 11205
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 4000 2 4130 4131 0 10
-
-*
-Channel: TV 5 Asie 
-Frequency: 11338
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 5632 2 512 640 0 10
-
-*
-Channel: RAI4IFA
-Frequency: 11548
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 4398 6 512 650 0 10
-
-*
-Channel: Pro TV International
-Frequency: 12201
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 5632 6 1160 1120 0 10
-
-*
-Channel: TVN Polnoc
-Frequency: 12211
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 5632 2 4194 4195 0 10
-
-*
-Channel: WorldNet Europe
-Frequency: 12484
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 8298 2 4260 4220 0 10
-
-*
-Channel: WorldNet Europe
-Frequency: 12484
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 8298 2 4360 4320 0 10
-
-*
-Channel: WorldNet Europe
-Frequency: 12484
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 8298 2 4460 4420 0 10
-
-*
-Channel: WorldNet Europe
-Frequency: 12484
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 9 8298 2 4560 4520 0 10
-
-*
-Channel: TVN Polnoc
-Frequency: 12573
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 5632 2 4194 4195 0 10
-
-*
-Channel: APTN
-Frequency: 12582
-CBHC: 255 0 0 255
-NI: -1 0
-SAT: 10 5632 2 308 256 0 10
-
diff --git a/Tools/xtvrc2vdr/xtvrc2vdr.c b/Tools/xtvrc2vdr/xtvrc2vdr.c
deleted file mode 100644
index 772db66a9..000000000
--- a/Tools/xtvrc2vdr/xtvrc2vdr.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  * xtvrc2vdr.c: Converts 'xtvrc' files to 'vdr' channel format
- *  *
- *  * Copyright (C) 2000 Plamen Ganev
- *  * 
- *  * This program is free software; you can redistribute it and/or
- *  * modify it under the terms of the GNU General Public License
- *  * as published by the Free Software Foundation; either version 2
- *  * of the License, or (at your option) any later version.
- *  * 
- *  * This program is distributed in the hope that it will be useful,
- *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  * GNU General Public License for more details.
- *  * 
- *  * You should have received a copy of the GNU General Public License
- *  * along with this program; if not, write to the Free Software
- *  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *  * 
- *  * The author can be reached at pganev@comm.it
- *  *
- *  */
-
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define MAX_LINE_LEN 1024
-#define MAX_NAME 100
-#define TOKS ": \n\r"
-#define NAMETOKS ":\n\r"
-
-typedef struct {
-   char Name[MAX_NAME+1];
-   int freq;
-   int color, hue, bright, saturation ;
-   int nitv, input ;
-   int pol, srate, fec, vpid, apid, lnbnum, type;
-} CHANNEL_DATA ;
-
-void strlwr( char *s ){
-   while ( s && *s ){
-     *s = tolower(*s);
-     s++;
-   }
-}
-
-int ReadChannel( FILE *f, CHANNEL_DATA *channel ) {
-   static char s[MAX_LINE_LEN+1];
-   char *p;
-
-   memset( channel, sizeof( CHANNEL_DATA ), 0 ) ;
-   
-   while ((p=fgets( s, MAX_LINE_LEN, f ))!=NULL){
-//    printf("%s", s ) ;
-    if (s[0] == '*')
-       break ;
-   }
-   
-   if ( !p ) { /* EOF? */
-//      printf("EOF\n");
-     return 0 ;
-   }
-     
-   while (fgets( s, MAX_LINE_LEN, f )){
-      if ( s[0] == '\n' )
-	return  channel->freq ? 1 : 0;
-      p = strtok( s, TOKS ) ;
-      if ( !p ) {
-	return 0;
-      }
-      strlwr( p ) ;
-      if ( !strcmp( p, "channel" )){
-	 p=strtok( NULL, NAMETOKS );
-	 while ( p && *p==' ')
-	   p++;
-	 strcpy( channel->Name, p );
-//	 printf("%d ", channel->freq ) ;
-      } else if ( !strcmp( p, "frequency")) {
-	 channel->freq = atoi( p=strtok( NULL, TOKS ));
-//	 printf("%d ", channel->freq ) ;
-      } else if ( !strcmp( p, "cbhc")) {
-	 channel->color = atoi(p=strtok(NULL,TOKS));
-	 channel->hue = atoi(p=strtok(NULL,TOKS));
-	 channel->bright = atoi(p=strtok(NULL,TOKS));
-	 channel->saturation = atoi(p=strtok(NULL,TOKS));
-      } else if ( !strcmp( p, "ni")) {
-	 channel->nitv = atoi(p=strtok(NULL,TOKS));
-	 channel->input = atoi(p=strtok(NULL,TOKS));
-      } else if ( !strcmp( p, "sat")) {
-	 channel->pol = atoi(p=strtok(NULL,TOKS));
-	 channel->srate = atoi(p=strtok(NULL,TOKS));
-	 channel->fec = atoi(p=strtok(NULL,TOKS));
-	 channel->vpid = atoi(p=strtok(NULL,TOKS));
-	 channel->apid = atoi(p=strtok(NULL,TOKS));
-	 channel->lnbnum = atoi(p=strtok(NULL,TOKS));
-	 channel->type = atoi(p=strtok(NULL,TOKS));
-      } else
-	printf("Unknown token %s\n", p ) ;
-   }
-   return 1 ;
-}
-
-int main ( int argc, char *argv[] ){
-   FILE *f, *fo ;
-   int cnt = 0;
-   CHANNEL_DATA channel ;
-   
-   if ( argc != 3 ){
-      printf("USAGE: %s <xtvrc file> <vdr file>\n\n", argv[0] ) ;
-      return 0;
-   }
-   
-   if ( !(f=fopen(argv[1], "rt"))){
-      printf("Can't open %s for reading\n\n", argv[1]);
-      return 0;
-   }
-   
-   if ( !(fo=fopen(argv[2], "wt"))){
-      printf("Can't open %s for writing\n\n", argv[2]);
-      return 0;
-   }
-   
-   while ( ReadChannel( f, &channel ) ) {
-      cnt++;
-      fprintf(fo, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n",
-	     channel.Name ,
-	     channel.freq ,
-	     channel.pol ? 'v' : 'h' ,
-	     1, //channel.lnbnum ,
-	     channel.srate ,
-	     channel.vpid ,
-	     channel.apid ,
-	     0, //channel.type ,
-	     0 ); //channel.fec ) ;
-   }
-	  
-   printf( "%d channels read.\n\n", cnt ) ;
-   
-   fclose(f);
-   fclose(fo);
-   return 1;
-}
diff --git a/channels.conf b/channels.conf
index 2cc3975f5..a2bd32fb1 100644
--- a/channels.conf
+++ b/channels.conf
@@ -22,7 +22,7 @@ ZDF.info:11954:h:0:27500:610:620:0:0:28011
 CNN:12168:v:0:27500:165:100:0:0:28512
 Super RTL:12188:h:0:27500:165:120:65:0:12040
 VOX:12188:h:0:27500:167:136:0:0:12060
-DW TV:12363:v:0:27500:305:306:0:0:8905
+DW TV:10788:v:0:22000:305:306:0:0:8905
 Kabel 1:12480:v:0:27500:511:512:33:0:899
 Neun Live:12480:v:0:27500:767:768:0:0:897
 DSF:12480:v:0:27500:1023:1024:0:0:900
@@ -80,7 +80,7 @@ Cinedom 1A:11758:h:0:27500:511:512,513:0:3:190
 Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:3:178
 Cinedom 1C:11720:h:0:27500:511:512,513:0:3:180
 Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:3:176
-Cinedom 2A:11758:h:0:27500:1023:1024:0:3:193
+Cinedom 2A:11758:h:0:27500:1023:1024,1025:0:3:193
 Cinedom 2B:11720:h:0:27500:1279:1280:0:3:183
 Cinedom 2C:12070:h:0:27500:1791:1792:0:3:179
 Cinedom 2D:12070:h:0:27500:511:512:0:3:184
diff --git a/channels.conf.cable b/channels.conf.cable
index 6e0f43b70..b6d5c050a 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,6 +1,6 @@
 :verschl�sselte Fernsehprogramm
 PREMIERE ONE:378:h:0:6900:3071:3072:0:1:51
-PREMIERE MOVIE 1:370:h:0:6900:511:512:0:1:10
+PREMIERE MOVIE 1:370:h:0:6900:511:512;515:0:1:10
 PREMIERE MOVIE 2:370:h:0:6900:1791:1792:0:1:11
 PREMIERE MOVIE 3:370:h:0:6900:2303:2304:0:1:43
 PREMIERE ACTION:370:h:0:6900:1023:1024,1025:0:1:20
diff --git a/config.c b/config.c
index 6ebaaacb9..f93035142 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.76 2001/10/20 13:09:38 kls Exp $
+ * $Id: config.c 1.77 2002/01/19 16:06:42 kls Exp $
  */
 
 #include "config.h"
@@ -807,6 +807,7 @@ cSetup::cSetup(void)
   DefaultPriority = 50;
   DefaultLifetime = 50;
   UseSubtitle = 1;
+  RecordingDirs = 1;
   VideoFormat = VIDEO_FORMAT_4_3;
   ChannelInfoPos = 0;
   OSDwidth = 52;
@@ -848,6 +849,7 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
      else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
      else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
+     else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
      else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
      else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
      else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
@@ -924,6 +926,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "DefaultPriority    = %d\n", DefaultPriority);
         fprintf(f, "DefaultLifetime    = %d\n", DefaultLifetime);
         fprintf(f, "UseSubtitle        = %d\n", UseSubtitle);
+        fprintf(f, "RecordingDirs      = %d\n", RecordingDirs);
         fprintf(f, "VideoFormat        = %d\n", VideoFormat);
         fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
         fprintf(f, "OSDwidth           = %d\n", OSDwidth);
diff --git a/config.h b/config.h
index 018d00ef2..960e51465 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.86 2001/11/25 15:57:08 kls Exp $
+ * $Id: config.h 1.88 2002/01/19 16:06:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.99"
+#define VDRVERSION "0.99pre2"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -292,6 +292,7 @@ class cSetup {
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int UseSubtitle;
+  int RecordingDirs;
   int VideoFormat;
   int ChannelInfoPos;
   int OSDwidth, OSDheight;
diff --git a/dvbapi.c b/dvbapi.c
index 707db0d92..048639c66 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.141 2001/11/25 16:38:09 kls Exp $
+ * $Id: dvbapi.c 1.146 2002/01/26 15:39:48 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -116,7 +116,7 @@ class cIndexFile {
   cIndexFile(const char *FileName, bool Record);
   ~cIndexFile();
   bool Ok(void) { return index != NULL; }
-  void Write(uchar PictureType, uchar FileNumber, int FileOffset);
+  bool Write(uchar PictureType, uchar FileNumber, int FileOffset);
   bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
   int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
   int Get(uchar FileNumber, int FileOffset);
@@ -146,7 +146,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
               delta = buf.st_size % sizeof(tIndex);
               if (delta) {
                  delta = sizeof(tIndex) - delta;
-                 esyslog(LOG_ERR, "ERROR: invalid file size (%d) in '%s'", buf.st_size, fileName);
+                 esyslog(LOG_ERR, "ERROR: invalid file size (%ld) in '%s'", buf.st_size, fileName);
                  }
               last = (buf.st_size + delta) / sizeof(tIndex) - 1;
               if (!Record && last >= 0) {
@@ -249,7 +249,7 @@ bool cIndexFile::CatchUp(int Index)
   return false;
 }
 
-void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
+bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 {
   if (f >= 0) {
      tIndex i = { FileOffset, PictureType, FileNumber, 0 };
@@ -257,10 +257,11 @@ void cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
         esyslog(LOG_ERR, "ERROR: can't write to index file");
         close(f);
         f = -1;
-        return;
+        return false;
         }
      last++;
      }
+  return f >= 0;
 }
 
 bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
@@ -506,7 +507,7 @@ cRecordBuffer::~cRecordBuffer()
 bool cRecordBuffer::RunningLowOnDiskSpace(void)
 {
   if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
-     uint Free = FreeDiskSpaceMB(fileName.Name());
+     int Free = FreeDiskSpaceMB(fileName.Name());
      lastDiskSpaceCheck = time(NULL);
      if (Free < MINFREEDISKSPACE) {
         dsyslog(LOG_INFO, "low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
@@ -2305,6 +2306,7 @@ void cTransferBuffer::Output(void)
 
 class cCuttingBuffer : public cThread {
 private:
+  const char *error;
   bool active;
   int fromFile, toFile;
   cFileName *fromFileName, *toFileName;
@@ -2315,10 +2317,12 @@ class cCuttingBuffer : public cThread {
 public:
   cCuttingBuffer(const char *FromFileName, const char *ToFileName);
   virtual ~cCuttingBuffer();
+  const char *Error(void) { return error; }
   };
 
 cCuttingBuffer::cCuttingBuffer(const char *FromFileName, const char *ToFileName)
 {
+  error = NULL;
   active = false;
   fromFile = toFile = -1;
   fromFileName = toFileName = NULL;
@@ -2367,6 +2371,10 @@ void cCuttingBuffer::Action(void)
            int FileOffset, Length;
            uchar PictureType;
 
+           // Make sure there is enough disk space:
+
+           AssertFreeDiskSpace();
+
            // Read one frame:
 
            if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
@@ -2376,11 +2384,15 @@ void cCuttingBuffer::Action(void)
                  }
               if (fromFile >= 0) {
                  Length = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
-                 if (Length < 0)
+                 if (Length < 0) {
+                    error = "ReadFrame";
                     break;
+                    }
                  }
-              else
+              else {
+                 error = "fromFile";
                  break;
+                 }
               }
            else
               break;
@@ -2392,14 +2404,22 @@ void cCuttingBuffer::Action(void)
                  break;
               if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
                  toFile = toFileName->NextFile();
-                 if (toFile < 0)
+                 if (toFile < 0) {
+                    error = "toFile 1";
                     break;
+                    }
                  FileSize = 0;
                  }
               LastIFrame = 0;
               }
-           safe_write(toFile, buffer, Length);
-           toIndex->Write(PictureType, toFileName->Number(), FileSize);
+           if (safe_write(toFile, buffer, Length) != Length) {
+              error = "safe_write";
+              break;
+              }
+           if (!toIndex->Write(PictureType, toFileName->Number(), FileSize)) {
+              error = "toIndex";
+              break;
+              }
            FileSize += Length;
            if (!LastIFrame)
               LastIFrame = toIndex->Last();
@@ -2418,8 +2438,10 @@ void cCuttingBuffer::Action(void)
                  CurrentFileNumber = 0; // triggers SetOffset before reading next frame
                  if (Setup.SplitEditedFiles) {
                     toFile = toFileName->NextFile();
-                    if (toFile < 0)
+                    if (toFile < 0) {
+                       error = "toFile 2";
                        break;
+                       }
                     FileSize = 0;
                     }
                  }
@@ -2438,10 +2460,14 @@ void cCuttingBuffer::Action(void)
 
 char *cVideoCutter::editedVersionName = NULL;
 cCuttingBuffer *cVideoCutter::cuttingBuffer = NULL;
+bool cVideoCutter::error = false;
+bool cVideoCutter::ended = false;
 
 bool cVideoCutter::Start(const char *FileName)
 {
   if (!cuttingBuffer) {
+     error = false;
+     ended = false;
      cRecording Recording(FileName);
      const char *evn = Recording.PrefixFileName('%');
      if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
@@ -2456,8 +2482,17 @@ bool cVideoCutter::Start(const char *FileName)
 
 void cVideoCutter::Stop(void)
 {
+  bool Interrupted = cuttingBuffer && cuttingBuffer->Active();
+  const char *Error = cuttingBuffer ? cuttingBuffer->Error() : NULL;
   delete cuttingBuffer;
   cuttingBuffer = NULL;
+  if ((Interrupted || Error) && editedVersionName) {
+     if (Interrupted)
+        isyslog(LOG_INFO, "editing process has been interrupted");
+     if (Error)
+        esyslog(LOG_ERR, "ERROR: '%s' during editing process", Error);
+     RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed?
+     }
 }
 
 bool cVideoCutter::Active(void)
@@ -2465,16 +2500,32 @@ bool cVideoCutter::Active(void)
   if (cuttingBuffer) {
      if (cuttingBuffer->Active())
         return true;
+     error = cuttingBuffer->Error();
      Stop();
-     cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
+     if (!error)
+        cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
      delete editedVersionName;
      editedVersionName = NULL;
+     ended = true;
      }
   return false;
 }
 
-// --- cDvbApi ---------------------------------------------------------------
+bool cVideoCutter::Error(void)
+{
+  bool result = error;
+  error = false;
+  return result;
+}
 
+bool cVideoCutter::Ended(void)
+{
+  bool result = ended;
+  ended = false;
+  return result;
+}
+
+// --- cDvbApi ---------------------------------------------------------------
 
 static const char *OstName(const char *Name, int n)
 {
@@ -2842,7 +2893,11 @@ void cDvbApi::Open(int w, int h)
      }
   else if (d == 0) { //XXX full menu
      osd->Create(0,                            0, w,                         lineHeight, 2);
-     osd->Create(0,                   lineHeight, w, (Setup.OSDheight - 3) * lineHeight, 2, true, clrBackground, clrCyan, clrWhite, clrBlack);
+     osd->Create(0,                   lineHeight, w, (Setup.OSDheight - 3) * lineHeight, 2);
+     osd->AddColor(clrBackground);
+     osd->AddColor(clrCyan);
+     osd->AddColor(clrWhite);
+     osd->AddColor(clrBlack);
      osd->Create(0, (Setup.OSDheight - 2) * lineHeight, w,               2 * lineHeight, 4);
      }
   else { //XXX progress display
@@ -3197,7 +3252,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Pol
               }
            }
         else
-           esyslog(LOG_ERR, "ERROR %d in frontend get event", res);
+           esyslog(LOG_ERR, "ERROR %d in frontend get event (channel %d, card %d)", res, ChannelNumber, CardIndex() + 1);
         }
      else
         esyslog(LOG_ERR, "ERROR: timeout while tuning");
diff --git a/dvbapi.h b/dvbapi.h
index aa4a5feb2..733757195 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.59 2001/11/24 11:03:16 kls Exp $
+ * $Id: dvbapi.h 1.60 2002/01/26 13:01:16 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -69,10 +69,14 @@ class cVideoCutter {
 private:
   static char *editedVersionName;
   static cCuttingBuffer *cuttingBuffer;
+  static bool error;
+  static bool ended;
 public:
   static bool Start(const char *FileName);
   static void Stop(void);
   static bool Active(void);
+  static bool Error(void);
+  static bool Ended(void);
   };
 
 class cDvbApi {
diff --git a/dvbosd.c b/dvbosd.c
index 90ac067dc..c34843005 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.10 2001/07/24 16:25:34 kls Exp $
+ * $Id: dvbosd.c 1.12 2002/01/13 16:25:18 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -257,25 +257,35 @@ const char *cBitmap::Data(int x, int y)
 
 class cWindow : public cBitmap {
 private:
+  int handle;  // the index within the OSD's window array (0...MAXNUMWINDOWS - 1)
   int x0, y0;
+  int bpp;
+  bool tiled;
   bool shown;
 public:
-  cWindow(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true);
+  cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled);
   int X0(void) { return x0; }
   int Y0(void) { return y0; }
+  int Bpp(void) { return bpp; }
+  bool Tiled(void) { return tiled; }
   bool Shown(void) { bool s = shown; shown = true; return s; }
+  int Handle(void) { return handle; }
   bool Contains(int x, int y);
+  void Relocate(int x, int y);
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   const char *Data(int x, int y);
   };
 
-cWindow::cWindow(int x, int y, int w, int h, int Bpp, bool ClearWithBackground)
+cWindow::cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
 :cBitmap(w, h, Bpp, ClearWithBackground)
 {
+  handle = Handle;
   x0 = x;
   y0 = y;
+  bpp = Bpp;
+  tiled = Tiled;
   shown = false;
 }
 
@@ -286,19 +296,39 @@ bool cWindow::Contains(int x, int y)
   return x >= 0 && y >= 0 && x < width && y < height;
 }
 
+void cWindow::Relocate(int x, int y)
+{
+  x0 = x;
+  y0 = y;
+}
+
 void cWindow::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
 {
-  cBitmap::Fill(x1 - x0, y1 - y0, x2 - x0, y2 - y0, Color);
+  if (tiled) {
+     x1 -= x0;
+     y1 -= y0;
+     x2 -= x0;
+     y2 -= y0;
+     }
+  cBitmap::Fill(x1, y1, x2, y2, Color);
 }
 
 void cWindow::SetBitmap(int x, int y, const cBitmap &Bitmap)
 {
-  cBitmap::SetBitmap(x - x0, y - y0, Bitmap);
+  if (tiled) {
+     x -= x0;
+     y -= y0;
+     }
+  cBitmap::SetBitmap(x, y, Bitmap);
 }
 
 void cWindow::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
 {
-  cBitmap::Text(x - x0, y - y0, s, ColorFg, ColorBg);
+  if (tiled) {
+     x -= x0;
+     y -= y0;
+     }
+  cBitmap::Text(x, y, s, ColorFg, ColorBg);
 }
 
 const char *cWindow::Data(int x, int y)
@@ -325,14 +355,28 @@ cDvbOsd::cDvbOsd(int VideoDev, int x, int y, int w, int h, int Bpp)
 cDvbOsd::~cDvbOsd()
 {
   if (videoDev >= 0) {
-     while (numWindows > 0) {
-           Cmd(OSD_SetWindow, 0, numWindows--);
-           Cmd(OSD_Close);
-           delete window[numWindows];
-           }
+     for (int i = 0; i < numWindows; i++) {
+         SetWindow(window[i]);
+         Cmd(OSD_Close);
+         delete window[i];
+         }
+     numWindows = 0;
      }
 }
 
+bool cDvbOsd::SetWindow(cWindow *Window)
+{
+  // Window handles are counted 0...(MAXNUMWINDOWS - 1), but the actual window
+  // numbers in the driver are used from 1...MAXNUMWINDOWS.
+  int Handle = Window->Handle();
+  if (0 <= Handle && Handle < MAXNUMWINDOWS) {
+     Cmd(OSD_SetWindow, 0, Handle + 1);
+     return true;
+     }
+  esyslog(LOG_ERR, "ERROR: illegal window handle: %d", Handle);
+  return -1;
+}
+
 void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
   if (videoDev >= 0) {
@@ -347,62 +391,77 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      // must block all signals, otherwise the command might not be fully executed
      sigset_t set, oldset;
      sigfillset(&set);
+     sigdelset(&set, SIGALRM);
      sigprocmask(SIG_BLOCK, &set, &oldset);
      ioctl(videoDev, OSD_SEND_CMD, &dc);
-     usleep(5000); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
-                   // XXX and sometimes the OSD was no longer displayed).
-                   // XXX Increase the value if the problem still persists on your particular system.
-                   // TODO Check if this is still necessary with driver versions after 0.7.
+     if (cmd == OSD_SetBlock) // XXX this is the only command that takes longer
+        usleep(5000); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
+                      // XXX and sometimes the OSD was no longer displayed).
+                      // XXX Increase the value if the problem still persists on your particular system.
+                      // TODO Check if this is still necessary with driver versions after 0.7.
      sigprocmask(SIG_SETMASK, &oldset, NULL);
      }
 }
 
-bool cDvbOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, eDvbColor Color0, eDvbColor Color1, eDvbColor Color2, eDvbColor Color3)
+tWindowHandle cDvbOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
 {
-  /* TODO XXX
-     - check that no two windows overlap
-  */
   if (numWindows < MAXNUMWINDOWS) {
      if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
         if ((w & 0x03) != 0) {
            w += 4 - (w & 0x03);
            esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
            }
-        cWindow *win = new cWindow(x, y, w, h, Bpp, ClearWithBackground);
-        if (Color0 != clrTransparent) {
-           win->Index(Color0);
-           win->Index(Color1);
-           win->Index(Color2);
-           win->Index(Color3);
-           win->Reset();
+        cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
+        if (SetWindow(win)) {
+           window[win->Handle()] = win;
+           Cmd(OSD_Open, Bpp, x0 + x, y0 + y, x0 + x + w - 1, y0 + y + h - 1, (void *)1); // initially hidden!
+           numWindows++;
+           return win->Handle();
            }
-        window[numWindows++] = win;
-        Cmd(OSD_SetWindow, 0, numWindows);
-        Cmd(OSD_Open, Bpp, x0 + x, y0 + y, x0 + x + w - 1, y0 + y + h - 1, (void *)1); // initially hidden!
+        else
+           delete win;
         }
      else
         esyslog(LOG_ERR, "ERROR: illegal OSD parameters");
      }
   else
      esyslog(LOG_ERR, "ERROR: too many OSD windows");
-  return false;
+  return -1;
+}
+
+void cDvbOsd::AddColor(eDvbColor Color, tWindowHandle Window)
+{
+  cWindow *w = GetWindow(Window);
+  if (w) {
+     w->Index(Color);
+     w->Reset();
+     }
 }
 
 cWindow *cDvbOsd::GetWindow(int x, int y)
 {
   for (int i = 0; i < numWindows; i++) {
-      if (window[i]->Contains(x, y))
+      if (window[i]->Tiled() && window[i]->Contains(x, y))
          return window[i];
       }
   return NULL;
 }
 
+cWindow *cDvbOsd::GetWindow(tWindowHandle Window)
+{
+  if (0 <= Window && Window < numWindows)
+     return window[Window];
+  if (Window == LAST_CREATED_WINDOW && numWindows > 0)
+     return window[numWindows - 1];
+  return NULL;
+}
+
 void cDvbOsd::Flush(void)
 {
   for (int i = 0; i < numWindows; i++) {
       int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
       if (window[i]->Dirty(x1, y1, x2, y2)) {
-         Cmd(OSD_SetWindow, 0, i + 1);
+         SetWindow(window[i]);
          int FirstColor = 0, LastColor = 0;
          const eDvbColor *pal;
          while ((pal = window[i]->Colors(FirstColor, LastColor)) != NULL)
@@ -414,28 +473,36 @@ void cDvbOsd::Flush(void)
   // Showing the windows in a separate loop to avoid seeing them come up one after another
   for (int i = 0; i < numWindows; i++) {
       if (!window[i]->Shown()) {
-         Cmd(OSD_SetWindow, 0, i + 1);
+         SetWindow(window[i]);
          Cmd(OSD_MoveWindow, 0, x0 + window[i]->X0(), y0 + window[i]->Y0());
          }
       }
 }
 
-void cDvbOsd::Clear(void)
+void cDvbOsd::Clear(tWindowHandle Window)
 {
-  for (int i = 0; i < numWindows; i++)
-      window[i]->Clear();
+  if (Window == ALL_TILED_WINDOWS || Window == ALL_WINDOWS) {
+     for (int i = 0; i < numWindows; i++)
+         if (Window == ALL_WINDOWS || window[i]->Tiled())
+            window[i]->Clear();
+     }
+  else {
+     cWindow *w = GetWindow(Window);
+     if (w)
+        w->Clear();
+     }
 }
 
-void cDvbOsd::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+void cDvbOsd::Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window)
 {
-  cWindow *w = GetWindow(x1, y1);
+  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x1, y1) : GetWindow(Window);
   if (w)
      w->Fill(x1, y1, x2, y2, Color);
 }
 
-void cDvbOsd::SetBitmap(int x, int y, const cBitmap &Bitmap)
+void cDvbOsd::SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window)
 {
-  cWindow *w = GetWindow(x, y);
+  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
   if (w)
      w->SetBitmap(x, y, Bitmap);
 }
@@ -458,10 +525,44 @@ eDvbFont cDvbOsd::SetFont(eDvbFont Font)
   return oldFont;
 }
 
-void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground)
+void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
 {
-  cWindow *w = GetWindow(x, y);
+  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
   if (w)
      w->Text(x, y, s, ColorFg, ColorBg);
 }
 
+void cDvbOsd::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHeight)
+{
+  cWindow *w = GetWindow(Window);
+  if (w) {
+     SetWindow(w);
+     if (NewWidth > 0 && NewHeight > 0) {
+        if ((NewWidth & 0x03) != 0) {
+           NewWidth += 4 - (NewWidth & 0x03);
+           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
+           }
+        Cmd(OSD_Close);
+        window[w->Handle()] = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());
+        delete w;
+        Cmd(OSD_Open, 2, x0 + x, y0 + y, x0 + x + NewWidth - 1, y0 + y + NewHeight - 1, (void *)1); // initially hidden!
+        }
+     else {
+        w->Relocate(x, y);
+        Cmd(OSD_MoveWindow, 0, x0 + x, y0 + y);
+        }
+     }
+}
+
+void cDvbOsd::Hide(tWindowHandle Window)
+{
+  if (SetWindow(GetWindow(Window)))
+     Cmd(OSD_Hide, 0);
+}
+
+void cDvbOsd::Show(tWindowHandle Window)
+{
+  if (SetWindow(GetWindow(Window)))
+     Cmd(OSD_Show, 0);
+}
+
diff --git a/dvbosd.h b/dvbosd.h
index 5039a9159..ceac507d3 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.8 2001/07/28 16:22:32 kls Exp $
+ * $Id: dvbosd.h 1.9 2001/12/09 15:11:05 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -75,6 +75,7 @@ class cBitmap : public cPalette {
 public:
   cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground = true);
   virtual ~cBitmap();
+  bool ClearWithBackground(void) { return clearWithBackground; }
   eDvbFont SetFont(eDvbFont Font);
   bool Dirty(int &x1, int &y1, int &x2, int &y2);
   void SetPixel(int x, int y, eDvbColor Color);
@@ -93,26 +94,84 @@ class cBitmap : public cPalette {
 
 class cWindow;
 
+typedef int tWindowHandle;
+
+// '-1' is used as an error return value!
+#define ALL_WINDOWS         (-2)
+#define ALL_TILED_WINDOWS   (-3)
+#define LAST_CREATED_WINDOW (-4)
+
 class cDvbOsd {
 private:
   int videoDev;
   int numWindows;
   int x0, y0;
   cWindow *window[MAXNUMWINDOWS];
+  bool SetWindow(cWindow *Window);
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
   cWindow *GetWindow(int x, int y);
+  cWindow *GetWindow(tWindowHandle Window);
 public:
   cDvbOsd(int VideoDev, int x, int y, int w = -1, int h = -1, int Bpp = -1);
+       // Initializes the OSD on the given VideoDev, starting at screen coordinates
+       // (x, y). If w, h and Bpp are given, one window with that width, height and
+       // color depth will be created - otherwise the actual windows will have to
+       // be created by separate calls to Create().
   ~cDvbOsd();
-  bool Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, eDvbColor Color0 = clrTransparent, eDvbColor Color1 = clrTransparent, eDvbColor Color2 = clrTransparent, eDvbColor Color3 = clrTransparent);
+       // Destroys all windows and shuts down the OSD.
+  tWindowHandle Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, bool Tiled = true);
+       // Creates a window at coordinates (x, y), which are relative to the OSD's
+       // origin given in the constructor, with the given width, height and color
+       // depth. ClearWithBackground controls whether the window will be filled with
+       // clrBackground when it is cleared. Setting this to 'false' may be useful
+       // for windows that don't need clrBackground but want to save this color
+       // palette entry for a different color. Tiled controls whether this will
+       // be part of a multi section OSD (with several windows that all have
+       // different color depths and palettes and form one large OSD area), or
+       // whether this is a "standalone" window that will be drawn "in front"
+       // of any windows defined *after* this one (this can be used for highlighting
+       // certain parts of the OSD, as would be done in a 'cursor').
+       // Returns a handle that can be used to identify this window.
+  void AddColor(eDvbColor Color, tWindowHandle Window = LAST_CREATED_WINDOW);
+       // Adds the Color to the color palette of the given window if it is not
+       // already contained in the palette (and if the palette still has free
+       // slots for new colors). The default value LAST_CREATED_WINDOW will
+       // access the most recently created window, without the need of explicitly
+       // using a window handle.
   void Flush(void);
-  void Clear(void);
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
+       // Actually commits all data of all windows to the OSD.
+  void Clear(tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Clears the given window. If ALL_TILED_WINDOWS is given, only the tiled
+       // windows will be cleared, leaving the standalone windows untouched. If
+       // ALL_WINDOWS is given, the standalone windows will also be cleared.
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Fills the rectangle defined by the upper left (x1, y2) and lower right
+       // (x2, y2) corners with the given Color. If a specific window is given,
+       // the coordinates are relative to that window's upper left corner.
+       // Otherwise they are relative to the upper left corner of the entire OSD.
+       // If all tiled windows are selected, only that window which contains the
+       // point (x1, y1) will actually be filled.
+  void SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Sets the pixels within the given window with the data from the given
+       // Bitmap. See Fill() for details about the coordinates.
   int Width(unsigned char c);
+       // Returns the width (in pixels) of the given character in the current font.
   int Width(const char *s);
+       // Returns the width (in pixels) of the given string in the current font.
   eDvbFont SetFont(eDvbFont Font);
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
+       // Sets the current font for subsequent Width() and Text() operations.
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Writes the given string at coordinates (x, y) with the given foreground
+       // and background color into the given window (see Fill() for details
+       // about the coordinates).
+  void Relocate(tWindowHandle Window, int x, int y, int NewWidth = -1, int NewHeight = -1);
+       // Moves the given window to the new location at (x, y). If NewWidth and
+       // NewHeight are also given, the window will also be resized to the new
+       // width and height.
+  void Hide(tWindowHandle Window);
+       // Hides the given window.
+  void Show(tWindowHandle Window);
+       // Shows the given window.
   };
 
 #endif //__DVBOSD_H
diff --git a/eit.c b/eit.c
index 00792ab5f..ed757d2cc 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.29 2001/10/28 13:51:22 kls Exp $
+ * $Id: eit.c 1.31 2002/01/13 16:14:31 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -473,22 +473,6 @@ void cEventInfo::FixEpgBugs(void)
      strreplace(pTitle, '`', '\'');
      strreplace(pSubtitle, '`', '\'');
      strreplace(pExtendedDescription, '`', '\'');
-
-     if (Setup.EPGBugfixLevel <= 2)
-        return;
-
-     // Pro7 and Kabel1 apparently are unable to use a calendar/clock,
-     // because all events between 00:00 and 06:00 have the date of the
-     // day before (sometimes even this correction doesn't help).
-     // Channels are recognized by their ServiceID, which may only work
-     // correctly on the ASTRA satellite system.
-     if (uServiceID == 898    // Pro-7
-      || uServiceID == 899) { // Kabel 1
-        struct tm tm_r;
-        tm *t = localtime_r(&tTime, &tm_r);
-        if (t->tm_hour * 3600 + t->tm_min * 60 + t->tm_sec <= 6 * 3600)
-           tTime += 24 * 3600;
-        }
      }
 }
 
@@ -1013,8 +997,10 @@ void cSIProcessor::Action()
                            break;
                      }
                   }
+                  /*XXX this just fills up the log file - shouldn't we rather try to re-sync?
                   else
                      dsyslog(LOG_INFO, "read incomplete section - seclen = %d, n = %d", seclen, n);
+                  XXX*/
                }
             }
          }
diff --git a/eit.h b/eit.h
index 131419623..48ab91332 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.12 2001/10/28 12:33:10 kls Exp $
+ * $Id: eit.h 1.13 2002/01/13 16:18:23 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -25,6 +25,8 @@
 #include "thread.h"
 #include "tools.h"
 
+#define MAXEPGBUGFIXLEVEL 2
+
 class cEventInfo : public cListObject {
   friend class cSchedule;
   friend class cEIT;
diff --git a/i18n.c b/i18n.c
index 764dc3380..7977fcd44 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.45 2001/10/28 16:04:58 kls Exp $
+ * $Id: i18n.c 1.50 2002/01/27 15:52:32 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -285,6 +285,15 @@ const tPhrase Phrases[] = {
     "R�sum�",
     "Sammendrag",
   },
+  { "Open",
+    "�ffnen",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Switch",
     "Umschalten",
     "Preklopi",
@@ -631,6 +640,15 @@ const tPhrase Phrases[] = {
     "Enregistrement en cours!",
     "Timer gj�r opptak!",
   },
+  { "Error while accessing recording!",
+    "Fehler beim ansprechen der Aufzeichnung!",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
     "Napaka pri odstranjevanju posnetka!",
@@ -703,6 +721,15 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "Low disk space!",
+    "Platte beinahe voll!",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Setup parameters:
   { "OSD-Language",
     "OSD-Sprache",
@@ -884,6 +911,15 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "RecordingDirs",
+    "Aufn. Verzeichnisse",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "VideoFormat",
     "Video Format",
     "", // TODO
@@ -1293,6 +1329,14 @@ const tPhrase Phrases[] = {
     "bas",
     "", // TODO
   },
+  { "free",
+    "frei",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Jump: ", // note the trailing blank
     "Springen: ",
     "", // TODO
@@ -1355,6 +1399,30 @@ const tPhrase Phrases[] = {
     "Op�ration de montage lanc�e",
     "Redigeringsprosess startet",
   },
+  { "Editing process finished",
+    "Schnitt beendet",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Editing process failed!",
+    "Schnitt gescheitert!",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "scanning recordings...",
+    "Aufzeichnungen werden durchsucht...",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { NULL }
   };
 
diff --git a/interface.c b/interface.c
index 8695a3670..b86fb141d 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.44 2001/09/01 15:18:46 kls Exp $
+ * $Id: interface.c 1.47 2002/01/27 15:48:46 kls Exp $
  */
 
 #include "interface.h"
@@ -292,8 +292,12 @@ void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
   int Line = (abs(height) == 1) ? 0 : -2;
   ClearEol(0, Line, s ? BgColor : clrBackground);
-  if (s)
-     Write(0, Line, s, FgColor, BgColor);
+  if (s) {
+     int x = (Width() - strlen(s)) / 2;
+     if (x < 0)
+        x = 0;
+     Write(x, Line, s, FgColor, BgColor);
+     }
 }
 
 void cInterface::Info(const char *s)
@@ -318,7 +322,7 @@ void cInterface::Error(const char *s)
 
 bool cInterface::Confirm(const char *s, int Seconds, bool WaitForTimeout)
 {
-  Open();
+  Open(Setup.OSDwidth, -1);
   isyslog(LOG_INFO, "confirm: %s", s);
   Status(s, clrBlack, clrYellow);
   eKeys k = Wait(Seconds);
@@ -331,13 +335,15 @@ bool cInterface::Confirm(const char *s, int Seconds, bool WaitForTimeout)
 
 void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor)
 {
-  if (open && Text) {
+  if (open) {
      const int w = Width() / 4;
-     int l = (w - int(strlen(Text))) / 2;
-     if (l < 0)
-        l = 0;
-     cDvbApi::PrimaryDvbApi->Fill(Index * w, -1, w, 1, BgColor);
-     cDvbApi::PrimaryDvbApi->Text(Index * w + l, -1, Text, FgColor, BgColor);
+     cDvbApi::PrimaryDvbApi->Fill(Index * w, -1, w, 1, Text ? BgColor : clrBackground);
+     if (Text) {
+        int l = (w - int(strlen(Text))) / 2;
+        if (l < 0)
+           l = 0;
+        cDvbApi::PrimaryDvbApi->Text(Index * w + l, -1, Text, FgColor, BgColor);
+        }
      }
 }
 
diff --git a/menu.c b/menu.c
index 45899b1ac..1cd549158 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.141 2001/11/24 13:20:37 kls Exp $
+ * $Id: menu.c 1.146 2002/01/27 15:50:50 kls Exp $
  */
 
 #include "menu.h"
@@ -15,6 +15,7 @@
 #include "config.h"
 #include "eit.h"
 #include "i18n.h"
+#include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
 #define MAXWAIT4EPGINFO  10 // seconds
@@ -1494,46 +1495,161 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
 // --- cMenuRecordingItem ----------------------------------------------------
 
 class cMenuRecordingItem : public cOsdItem {
+private:
+  char *fileName;
+  char *name;
+  int totalEntries, newEntries;
 public:
-  cRecording *recording;
-  cMenuRecordingItem(cRecording *Recording);
-  virtual void Set(void);
+  cMenuRecordingItem(cRecording *Recording, int Level);
+  ~cMenuRecordingItem();
+  void IncrementCounter(bool New);
+  const char *Name(void) { return name; }
+  const char *FileName(void) { return fileName; }
+  bool IsDirectory(void) { return name != NULL; }
   };
 
-cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording)
+cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
 {
-  recording = Recording;
-  Set();
+  fileName = strdup(Recording->FileName());
+  name = NULL;
+  totalEntries = newEntries = 0;
+  SetText(Recording->Title('\t', true, Level));
+  if (*Text() == '\t')
+     name = strdup(Text() + 2); // 'Text() + 2' to skip the two '\t'
 }
 
-void cMenuRecordingItem::Set(void)
+cMenuRecordingItem::~cMenuRecordingItem()
 {
-  SetText(recording->Title('\t', true));
+  delete fileName;
+  delete name;
+}
+
+void cMenuRecordingItem::IncrementCounter(bool New)
+{
+  totalEntries++;
+  if (New)
+     newEntries++;
+  char *buffer = NULL;
+  asprintf(&buffer, "%d\t%d\t%s", totalEntries, newEntries, name);
+  SetText(buffer, false);
 }
 
 // --- cMenuRecordings -------------------------------------------------------
 
-cMenuRecordings::cMenuRecordings(void)
-:cOsdMenu(tr("Recordings"), 6, 6)
+cRecordings cMenuRecordings::Recordings;
+int cMenuRecordings::helpKeys = -1;
+
+cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
+:cOsdMenu(Base ? Base : tr("Recordings"), 6, 6)
 {
-  if (Recordings.Load()) {
-     const char *lastReplayed = cReplayControl::LastReplayed();
-     cRecording *recording = Recordings.First();
-     while (recording) {
-           Add(new cMenuRecordingItem(recording), lastReplayed && strcmp(lastReplayed, recording->FileName()) == 0);
-           recording = Recordings.Next(recording);
-           }
+  base = Base ? strdup(Base) : NULL;
+  level = Setup.RecordingDirs ? Level : -1;
+  if (!Base) {
+     Interface->Status(tr("scanning recordings..."));
+     Interface->Flush();
      }
-  SetHelp(tr("Play"), tr("Rewind"), tr("Delete"), tr("Summary"));
-  Display();
+  if (Base || Recordings.Load()) {
+     const char *LastReplayed = cReplayControl::LastReplayed();
+     cMenuRecordingItem *LastItem = NULL;
+     char *LastItemText = NULL;
+     for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
+         if (!Base || strstr(recording->Name(), Base) == recording->Name()) {
+            cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
+            if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
+               Add(Item);
+               LastItem = Item;
+               delete LastItemText;
+               LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
+               }
+            else
+               delete Item;
+            if (LastItem) {
+               if (LastReplayed && strcmp(LastReplayed, recording->FileName()) == 0)
+                  SetCurrent(LastItem);
+               if (LastItem->IsDirectory())
+                  LastItem->IncrementCounter(recording->IsNew());
+               }
+            }
+         }
+     delete LastItemText;
+     if (Current() < 0)
+        SetCurrent(First());
+     else if (OpenSubMenus && Open(true))
+        return;
+     }
+  Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
+  SetHelpKeys();
+}
+
+cMenuRecordings::~cMenuRecordings()
+{
+  helpKeys = -1;
+  delete base;
+}
+
+void cMenuRecordings::SetHelpKeys(void)
+{
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  int NewHelpKeys = helpKeys;
+  if (ri) {
+     if (ri->IsDirectory())
+        NewHelpKeys = 1;
+     else {
+        NewHelpKeys = 2;
+        cRecording *recording = GetRecording(ri);
+        if (recording && recording->Summary())
+           NewHelpKeys = 3;
+        }
+     }
+  if (NewHelpKeys != helpKeys) {
+     switch (NewHelpKeys) {
+       case 0: SetHelp(NULL); break;
+       case 1: SetHelp(tr("Open")); break;
+       case 2:
+       case 3: SetHelp(tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Summary") : NULL);
+       }
+     helpKeys = NewHelpKeys;
+     }
+}
+
+cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
+{
+  cRecording *recording = Recordings.GetByName(Item->FileName());
+  if (!recording)
+     Interface->Error(tr("Error while accessing recording!"));
+  return recording;
+}
+
+bool cMenuRecordings::Open(bool OpenSubMenus)
+{
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri && ri->IsDirectory()) {
+     const char *t = ri->Name();
+     char *buffer = NULL;
+     if (base) {
+        asprintf(&buffer, "%s~%s", base, t);
+        t = buffer;
+        }
+     AddSubMenu(new cMenuRecordings(t, level + 1, OpenSubMenus));
+     delete buffer;
+     return true;
+     }
+  return false;
 }
 
 eOSState cMenuRecordings::Play(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri) {
-     cReplayControl::SetRecording(ri->recording->FileName(), ri->recording->Title());
-     return osReplay;
+     if (ri->IsDirectory())
+        Open();
+     else {
+        cRecording *recording = GetRecording(ri);
+        if (recording) {
+           cReplayControl::SetRecording(recording->FileName(), recording->Title());
+           return osReplay;
+           }
+        }
      }
   return osContinue;
 }
@@ -1541,9 +1657,9 @@ eOSState cMenuRecordings::Play(void)
 eOSState cMenuRecordings::Rewind(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri) {
+  if (ri && !ri->IsDirectory()) {
      cDvbApi::PrimaryDvbApi->StopReplay(); // must do this first to be able to rewind the currently replayed recording
-     cResumeFile ResumeFile(ri->recording->FileName());
+     cResumeFile ResumeFile(ri->FileName());
      ResumeFile.Delete();
      return Play();
      }
@@ -1553,17 +1669,21 @@ eOSState cMenuRecordings::Rewind(void)
 eOSState cMenuRecordings::Del(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri) {
+  if (ri && !ri->IsDirectory()) {
 //XXX what if this recording's file is currently in use???
 //XXX     if (!ti->recording) {
         if (Interface->Confirm(tr("Delete recording?"))) {
-           if (ri->recording->Delete()) {
-              cReplayControl::ClearLastReplayed(ri->recording->FileName());
-              cOsdMenu::Del(Current());
-              Display();
+           cRecording *recording = GetRecording(ri);
+           if (recording) {
+              if (recording->Delete()) {
+                 cReplayControl::ClearLastReplayed(ri->FileName());
+                 cOsdMenu::Del(Current());
+                 Recordings.Del(recording);
+                 Display();
+                 }
+              else
+                 Interface->Error(tr("Error while deleting recording!"));
               }
-           else
-              Interface->Error(tr("Error while deleting recording!"));
            }
 //XXX        }
 //XXX     else
@@ -1577,8 +1697,11 @@ eOSState cMenuRecordings::Summary(void)
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri && ri->recording->Summary() && *ri->recording->Summary())
-     return AddSubMenu(new cMenuText(tr("Summary"), ri->recording->Summary()));
+  if (ri && !ri->IsDirectory()) {
+     cRecording *recording = GetRecording(ri);
+     if (recording && recording->Summary() && *recording->Summary())
+        return AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
+     }
   return osContinue;
 }
 
@@ -1597,6 +1720,8 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (!HasSubMenu() && Key != kNone)
+     SetHelpKeys();
   return state;
 }
 
@@ -1712,13 +1837,14 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
   Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
   Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
-  Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, 3));
+  Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
   Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
   Add(new cMenuEditBoolItem(tr("SortTimers"),         &data.SortTimers));
   Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultPriority"),    &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("DefaultLifetime"),    &data.DefaultLifetime, 0, MAXLIFETIME));
   Add(new cMenuEditBoolItem(tr("UseSubtitle"),        &data.UseSubtitle));
+  Add(new cMenuEditBoolItem(tr("RecordingDirs"),      &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("VideoFormat"),        &data.VideoFormat, "4:3", "16:9"));
   Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
@@ -1815,6 +1941,18 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
 {
   digit = 0;
 
+  // Title with disk usage:
+
+#define MB_PER_MINUTE 30 // this is just an estimate!
+
+  char buffer[40];
+  int FreeMB;
+  int Percent = VideoDiskSpace(&FreeMB);
+  int Hours = int(double(FreeMB) / MB_PER_MINUTE / 60);
+  int Minutes = (FreeMB / MB_PER_MINUTE) % 60;
+  snprintf(buffer, sizeof(buffer), "%s  -  Disk %d%%  -  %2d:%02d %s", tr("Main"), Percent, Hours, Minutes, tr("free"));
+  SetTitle(buffer);
+
   // Basic menu items:
 
   Add(new cOsdItem(hk(tr("Schedule")),   osSchedule));
@@ -1871,7 +2009,7 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
   // Initial submenus:
 
   switch (State) {
-    case osRecordings: AddSubMenu(new cMenuRecordings); break;
+    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
 #ifdef DVDSUPPORT
     case osDVD:        AddSubMenu(new cMenuDVD); break;
 #endif //DVDSUPPORT
diff --git a/menu.h b/menu.h
index 250d2ff52..82fd64032 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.34 2001/10/28 15:21:04 kls Exp $
+ * $Id: menu.h 1.35 2002/01/20 13:38:34 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -55,15 +55,24 @@ class cMenuDVD : public cOsdMenu {
   };
 #endif //DVDSUPPORT
 
+class cMenuRecordingItem;
+
 class cMenuRecordings : public cOsdMenu {
 private:
-  cRecordings Recordings;
+  static cRecordings Recordings;
+  char *base;
+  int level;
+  static int helpKeys;
+  void SetHelpKeys(void);
+  cRecording *GetRecording(cMenuRecordingItem *Item);
+  bool Open(bool OpenSubMenus = false);
   eOSState Play(void);
   eOSState Rewind(void);
   eOSState Del(void);
   eOSState Summary(void);
 public:
-  cMenuRecordings(void);
+  cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
+  ~cMenuRecordings();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/osd.c b/osd.c
index 02f437481..0a825d7da 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.18 2001/08/25 13:15:16 kls Exp $
+ * $Id: osd.c 1.20 2002/01/26 11:09:58 kls Exp $
  */
 
 #include "osd.h"
@@ -127,9 +127,7 @@ void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, c
   helpYellow = Yellow;
   helpBlue   = Blue;
   if (visible)
-     Display();
-     //XXX Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
-     //XXX must clear unused button areas!
+     Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
 }
 
 void cOsdMenu::Del(int Index)
@@ -150,6 +148,10 @@ void cOsdMenu::Add(cOsdItem *Item, bool Current)
 
 void cOsdMenu::Display(void)
 {
+  if (subMenu) {
+     subMenu->Display();
+     return;
+     }
   visible = true;
   Interface->Clear();
   Interface->SetCols(cols);
@@ -179,6 +181,11 @@ void cOsdMenu::Display(void)
      Interface->Status(status);
 }
 
+void cOsdMenu::SetCurrent(cOsdItem *Item)
+{
+  current = Item ? Item->Index() : -1;
+}
+
 void cOsdMenu::RefreshCurrent(void)
 {
   cOsdItem *item = Get(current);
diff --git a/osd.h b/osd.h
index 2d243f166..21c931540 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.24 2001/08/25 12:56:46 kls Exp $
+ * $Id: osd.h 1.25 2002/01/20 10:42:14 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -83,6 +83,7 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   bool visible;
   virtual void Clear(void);
   bool SpecialItem(int idx);
+  void SetCurrent(cOsdItem *Item);
   void RefreshCurrent(void);
   void DisplayCurrent(bool Current);
   void CursorUp(void);
diff --git a/recording.c b/recording.c
index fe56a6e69..acdf264cb 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.42 2001/10/20 10:28:28 kls Exp $
+ * $Id: recording.c 1.48 2002/01/27 15:14:45 kls Exp $
  */
 
 #include "recording.h"
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "i18n.h"
 #include "interface.h"
 #include "tools.h"
 #include "videodir.h"
@@ -37,7 +38,7 @@
 
 #define DELETEDLIFETIME     1 // hours after which a deleted recording will be actually removed
 #define REMOVECHECKDELTA 3600 // seconds between checks for removing deleted files
-#define DISKCHECKDELTA    300 // seconds between checks for free disk space
+#define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 
 void RemoveDeletedRecordings(void)
@@ -118,7 +119,7 @@ void AssertFreeDiskSpace(int Priority)
               return;
            }
         // Unable to free disk space, but there's nothing we can do about that...
-        esyslog(LOG_ERR, "low disk space, but no recordings to delete");
+        Interface->Confirm(tr("Low disk space"), 30);
         }
      LastFreeDiskCheck = time(NULL);
      }
@@ -184,6 +185,8 @@ void cResumeFile::Delete(void)
 
 // --- cRecording ------------------------------------------------------------
 
+#define RESUME_NOT_INITIALIZED (-2)
+
 struct tCharExchange { char a; char b; };
 tCharExchange CharExchange[] = {
   { '~',  '/'    },
@@ -213,6 +216,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
 
 cRecording::cRecording(cTimer *Timer, const char *Subtitle, const char *Summary)
 {
+  resume = RESUME_NOT_INITIALIZED;
   titleBuffer = NULL;
   sortBuffer = NULL;
   fileName = NULL;
@@ -242,6 +246,7 @@ cRecording::cRecording(cTimer *Timer, const char *Subtitle, const char *Summary)
 
 cRecording::cRecording(const char *FileName)
 {
+  resume = RESUME_NOT_INITIALIZED;
   titleBuffer = NULL;
   sortBuffer = NULL;
   fileName = strdup(FileName);
@@ -342,6 +347,15 @@ char *cRecording::SortName(void)
   return sortBuffer;
 }
 
+int cRecording::GetResume(void)
+{
+  if (resume == RESUME_NOT_INITIALIZED) {
+     cResumeFile ResumeFile(FileName());
+     resume = ResumeFile.Read();
+     }
+  return resume;
+}
+
 bool cRecording::operator< (const cListObject &ListObject)
 {
   cRecording *r = (cRecording *)&ListObject;
@@ -360,27 +374,47 @@ const char *cRecording::FileName(void)
   return fileName;
 }
 
-const char *cRecording::Title(char Delimiter, bool NewIndicator)
+const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
 {
-  char New = ' ';
-  if (NewIndicator) {
-     cResumeFile ResumeFile(FileName());
-     if (ResumeFile.Read() <= 0)
-        New = '*';
-     }
+  char New = NewIndicator && IsNew() ? '*' : ' ';
   delete titleBuffer;
   titleBuffer = NULL;
-  struct tm tm_r;
-  struct tm *t = localtime_r(&start, &tm_r);
-  asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s",
-                         t->tm_mday,
-                         t->tm_mon + 1,
-                         Delimiter,
-                         t->tm_hour,
-                         t->tm_min,
-                         New,
-                         Delimiter,
-                         name);
+  if (Level < 0 || Level == HierarchyLevels()) {
+     struct tm tm_r;
+     struct tm *t = localtime_r(&start, &tm_r);
+     const char *s;
+     if (Level > 0 && (s = strrchr(name, '~')) != NULL)
+        s++;
+     else
+        s = name;
+     asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s",
+                            t->tm_mday,
+                            t->tm_mon + 1,
+                            Delimiter,
+                            t->tm_hour,
+                            t->tm_min,
+                            New,
+                            Delimiter,
+                            s);
+     }
+  else if (Level < HierarchyLevels()) {
+     const char *s = name;
+     const char *p = s;
+     while (*++s) {
+           if (*s == '~') {
+              if (Level--)
+                 p = s + 1;
+              else
+                 break;
+              }
+           }
+     titleBuffer = new char[s - p + 3];
+     *titleBuffer = Delimiter;
+     *(titleBuffer + 1) = Delimiter;
+     strn0cpy(titleBuffer + 2, p, s - p + 1);
+     }
+  else
+     return "";
   return titleBuffer;
 }
 
@@ -395,6 +429,17 @@ const char *cRecording::PrefixFileName(char Prefix)
   return NULL;
 }
 
+int cRecording::HierarchyLevels(void)
+{
+  const char *s = name;
+  int level = 0;
+  while (*++s) {
+        if (*s == '~')
+           level++;
+        }
+  return level;
+}
+
 bool cRecording::WriteSummary(void)
 {
   if (summary) {
@@ -429,6 +474,11 @@ bool cRecording::Delete(void)
 
 bool cRecording::Remove(void)
 {
+  // let's do a final safety check here:
+  if (!endswith(FileName(), DELEXT)) {
+     esyslog(LOG_ERR, "attempt to remove recording %s", FileName());
+     return false;
+     }
   isyslog(LOG_INFO, "removing recording %s", FileName());
   return RemoveVideoFile(FileName());
 }
@@ -446,7 +496,7 @@ bool cRecordings::Load(bool Deleted)
      char *s;
      while ((s = readline(p)) != NULL) {
            cRecording *r = new cRecording(s);
-           if (r->name)
+           if (r->Name())
               Add(r);
            else
               delete r;
@@ -461,6 +511,15 @@ bool cRecordings::Load(bool Deleted)
   return result;
 }
 
+cRecording *cRecordings::GetByName(const char *FileName)
+{
+  for (cRecording *recording = First(); recording; recording = Next(recording)) {
+      if (strcmp(recording->FileName(), FileName) == 0)
+         return recording;
+      }
+  return NULL;
+}
+
 // --- cMark -----------------------------------------------------------------
 
 char *cMark::buffer = NULL;
@@ -573,7 +632,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 {
   if (command) {
      char *cmd;
-     asprintf(&cmd, "%s %s '%s'", command, State, RecordingFileName);
+     asprintf(&cmd, "%s %s \"%s\"", command, State, strescape(RecordingFileName, "\"$"));
      isyslog(LOG_INFO, "executing '%s'", cmd);
      SystemExec(cmd);
      delete cmd;
diff --git a/recording.h b/recording.h
index aead97e36..3aaa7e9e6 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.18 2001/10/07 10:38:56 kls Exp $
+ * $Id: recording.h 1.21 2002/01/26 15:18:16 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -15,7 +15,7 @@
 #include "tools.h"
 
 void RemoveDeletedRecordings(void);
-void AssertFreeDiskSpace(int Priority);
+void AssertFreeDiskSpace(int Priority = 0);
 
 class cResumeFile {
 private:
@@ -29,8 +29,8 @@ class cResumeFile {
   };
 
 class cRecording : public cListObject {
-  friend class cRecordings;
 private:
+  int resume;
   char *titleBuffer;
   char *sortBuffer;
   char *fileName;
@@ -38,6 +38,7 @@ class cRecording : public cListObject {
   char *summary;
   char *StripEpisodeName(char *s);
   char *SortName(void);
+  int GetResume(void);
 public:
   time_t start;
   int priority;
@@ -46,10 +47,13 @@ class cRecording : public cListObject {
   cRecording(const char *FileName);
   ~cRecording();
   virtual bool operator< (const cListObject &ListObject);
+  const char *Name(void) { return name; }
   const char *FileName(void);
-  const char *Title(char Delimiter = ' ', bool NewIndicator = false);
+  const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1);
   const char *Summary(void) { return summary; }
   const char *PrefixFileName(char Prefix);
+  int HierarchyLevels(void);
+  bool IsNew(void) { return GetResume() <= 0; }
   bool WriteSummary(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
@@ -62,6 +66,7 @@ class cRecording : public cListObject {
 class cRecordings : public cList<cRecording> {
 public:
   bool Load(bool Deleted = false);
+  cRecording *GetByName(const char *FileName);
   };
 
 class cMark : public cListObject {
diff --git a/svdrp.c b/svdrp.c
index 48c956391..67de63c3b 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.27 2001/11/04 11:25:05 kls Exp $
+ * $Id: svdrp.c 1.28 2002/01/13 16:07:42 kls Exp $
  */
 
 #include "svdrp.h"
@@ -899,49 +899,49 @@ void cSVDRP::Process(void)
         }
      if (NewConnection)
         lastActivity = time(NULL);
-     if (file.Ready(false)) {
-        unsigned char c;
-        int r = safe_read(file, &c, 1);
-        if (r > 0) {
-           if (c == '\n' || c == 0x00) {
-              // strip trailing whitespace:
-              while (numChars > 0 && strchr(" \t\r\n", cmdLine[numChars - 1]))
-                    cmdLine[--numChars] = 0;
-              // make sure the string is terminated:
-              cmdLine[numChars] = 0;
-              // showtime!
-              Execute(cmdLine);
-              numChars = 0;
+     while (file.Ready(false)) {
+           unsigned char c;
+           int r = safe_read(file, &c, 1);
+           if (r > 0) {
+              if (c == '\n' || c == 0x00) {
+                 // strip trailing whitespace:
+                 while (numChars > 0 && strchr(" \t\r\n", cmdLine[numChars - 1]))
+                       cmdLine[--numChars] = 0;
+                 // make sure the string is terminated:
+                 cmdLine[numChars] = 0;
+                 // showtime!
+                 Execute(cmdLine);
+                 numChars = 0;
+                 }
+              else if (c == 0x04 && numChars == 0) {
+                 // end of file (only at beginning of line)
+                 Close();
+                 }
+              else if (c == 0x08 || c == 0x7F) {
+                 // backspace or delete (last character)
+                 if (numChars > 0)
+                    numChars--;
+                 }
+              else if (c <= 0x03 || c == 0x0D) {
+                 // ignore control characters
+                 }
+              else if (numChars < sizeof(cmdLine) - 1) {
+                 cmdLine[numChars++] = c;
+                 cmdLine[numChars] = 0;
+                 }
+              else {
+                 Reply(501, "Command line too long");
+                 esyslog(LOG_ERR, "SVDRP: command line too long: '%s'", cmdLine);
+                 numChars = 0;
+                 }
+              lastActivity = time(NULL);
               }
-           else if (c == 0x04 && numChars == 0) {
-              // end of file (only at beginning of line)
+           else if (r <= 0) {
+              isyslog(LOG_INFO, "lost connection to SVDRP client");
               Close();
               }
-           else if (c == 0x08 || c == 0x7F) {
-              // backspace or delete (last character)
-              if (numChars > 0)
-                 numChars--;
-              }
-           else if (c <= 0x03 || c == 0x0D) {
-              // ignore control characters
-              }
-           else if (numChars < sizeof(cmdLine) - 1) {
-              cmdLine[numChars++] = c;
-              cmdLine[numChars] = 0;
-              }
-           else {
-              Reply(501, "Command line too long");
-              esyslog(LOG_ERR, "SVDRP: command line too long: '%s'", cmdLine);
-              numChars = 0;
-              }
-           lastActivity = time(NULL);
-           }
-        else if (r <= 0) {
-           isyslog(LOG_INFO, "lost connection to SVDRP client");
-           Close();
            }
-        }
-     else if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
+     if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
         isyslog(LOG_INFO, "timeout on SVDRP connection");
         Close(true);
         }
diff --git a/tools.c b/tools.c
index 472c50d73..dc579e55f 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.50 2001/10/19 13:12:45 kls Exp $
+ * $Id: tools.c 1.53 2002/01/27 12:36:23 kls Exp $
  */
 
 #include "tools.h"
@@ -136,6 +136,29 @@ char *compactspace(char *s)
   return s;
 }
 
+const char *strescape(const char *s, const char *chars)
+{
+  static char *buffer = NULL;
+  const char *p = s;
+  char *t = NULL;
+  while (*p) {
+        if (strchr(chars, *p)) {
+           if (!t) {
+              buffer = (char *)realloc(buffer, 2 * strlen(s) + 1);
+              t = buffer + (p - s);
+              s = strcpy(buffer, s);
+              }
+           *t++ = '\\';
+           }
+        if (t)
+           *t++ = *p;
+        p++;
+        }
+  if (t)
+     *t = 0;
+  return s;
+}
+
 bool startswith(const char *s, const char *p)
 {
   while (*p) {
@@ -145,6 +168,17 @@ bool startswith(const char *s, const char *p)
   return true;
 }
 
+bool endswith(const char *s, const char *p)
+{
+  const char *se = s + strlen(s) - 1;
+  const char *pe = p + strlen(p) - 1;
+  while (pe >= p) {
+        if (*pe-- != *se-- || (se < s && pe >= p))
+           return false;
+        }
+  return true;
+}
+
 bool isempty(const char *s)
 {
   return !(s && *skipspace(s));
@@ -189,10 +223,12 @@ const char *AddDirectory(const char *DirName, const char *FileName)
 
 #define DFCMD  "df -m -P '%s'"
 
-uint FreeDiskSpaceMB(const char *Directory)
+int FreeDiskSpaceMB(const char *Directory, int *UsedMB)
 {
   //TODO Find a simpler way to determine the amount of free disk space!
-  uint Free = 0;
+  if (UsedMB)
+     *UsedMB = 0;
+  int Free = 0;
   char *cmd = NULL;
   asprintf(&cmd, DFCMD, Directory);
   FILE *p = popen(cmd, "r");
@@ -200,8 +236,10 @@ uint FreeDiskSpaceMB(const char *Directory)
      char *s;
      while ((s = readline(p)) != NULL) {
            if (strchr(s, '/')) {
-              uint available;
-              sscanf(s, "%*s %*d %*d %u", &available);
+              int used, available;
+              sscanf(s, "%*s %*d %d %d", &used, &available);
+              if (UsedMB)
+                 *UsedMB = used;
               Free = available;
               break;
               }
diff --git a/tools.h b/tools.h
index 843cbf1db..f9390185b 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.36 2001/09/30 10:20:59 kls Exp $
+ * $Id: tools.h 1.39 2002/01/26 15:38:10 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -50,20 +50,22 @@ char *strreplace(char *s, char c1, char c2);
 char *skipspace(const char *s);
 char *stripspace(char *s);
 char *compactspace(char *s);
+const char *strescape(const char *s, const char *chars); // returns a statically allocated string!
 bool startswith(const char *s, const char *p);
+bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
-const char *AddDirectory(const char *DirName, const char *FileName);
-uint FreeDiskSpaceMB(const char *Directory);
+const char *AddDirectory(const char *DirName, const char *FileName); // returns a statically allocated string!
+int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
-const char *DayDateTime(time_t t = 0);
+const char *DayDateTime(time_t t = 0); // returns a statically allocated string!
 
 class cFile {
 private:
diff --git a/vdr.c b/vdr.c
index 886b09178..5351e4095 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.89 2001/11/03 12:23:45 kls Exp $
+ * $Id: vdr.c 1.93 2002/01/26 14:07:01 kls Exp $
  */
 
 #include <getopt.h>
@@ -314,7 +314,6 @@ int main(int argc, char *argv[])
   int LastChannel = -1;
   int PreviousChannel = cDvbApi::CurrentChannel();
   time_t LastActivity = 0;
-  time_t LinearTime = time(NULL);
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
 
@@ -324,14 +323,6 @@ int main(int argc, char *argv[])
      }
 
   while (!Interrupted) {
-        // Test if we are running in the Einstein continuum:
-        time_t Now = time(NULL);
-        time_t LinearDelta = Now - LinearTime;
-        if (LinearDelta) {
-           if (LinearDelta < 0 || LinearDelta > 300) // assuming nothing will block for more than 5 minutes
-              esyslog(LOG_ERR, "ERROR: time warp detected (%d seconds)", LinearDelta);
-           LinearTime = Now;
-           }
         // Handle emergency exits:
         if (cThread::EmergencyExit()) {
            esyslog(LOG_ERR, "emergency exit requested - shutting down");
@@ -477,7 +468,12 @@ int main(int argc, char *argv[])
           }
         if (!Menu) {
            EITScanner.Process();
-           cVideoCutter::Active();
+           if (!cVideoCutter::Active() && cVideoCutter::Ended()) {
+              if (cVideoCutter::Error())
+                 Interface->Error(tr("Editing process failed!"));
+              else
+                 Interface->Info(tr("Editing process finished"));
+              }
            }
         if (!*Interact && (!cRecordControls::Active() || ForceShutdown)) {
            time_t Now = time(NULL);
@@ -508,7 +504,7 @@ int main(int argc, char *argv[])
                        int Channel = timer ? timer->channel : 0;
                        const char *File = timer ? timer->file : "";
                        char *cmd;
-                       asprintf(&cmd, "%s %ld %ld %d '%s' %d", Shutdown, Next, Delta, Channel, File, UserShutdown);
+                       asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
                        isyslog(LOG_INFO, "executing '%s'", cmd);
                        SystemExec(cmd);
                        delete cmd;
@@ -518,7 +514,7 @@ int main(int argc, char *argv[])
                        if (signal(SIGALRM, Watchdog) == SIG_IGN)
                           signal(SIGALRM, SIG_IGN);
                        }
-                    LastActivity = Now; // don't try again too soon
+                    LastActivity = time(NULL); // don't try again too soon
                     continue; // skip the rest of the housekeeping for now
                     }
                  }
diff --git a/videodir.c b/videodir.c
index d9d3f8524..dbb1bd197 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.6 2001/09/02 14:55:15 kls Exp $
+ * $Id: videodir.c 1.7 2002/01/27 12:37:26 kls Exp $
  */
 
 #include "videodir.h"
@@ -27,7 +27,7 @@ class cVideoDirectory {
 public:
   cVideoDirectory(void);
   ~cVideoDirectory();
-  uint FreeMB(void);
+  int FreeMB(int *UsedMB = NULL);
   const char *Name(void) { return name ? name : VideoDirectory; }
   const char *Stored(void) { return stored; }
   int Length(void) { return length; }
@@ -53,9 +53,9 @@ cVideoDirectory::~cVideoDirectory()
   delete adjusted;
 }
 
-uint cVideoDirectory::FreeMB(void)
+int cVideoDirectory::FreeMB(int *UsedMB)
 {
-  return FreeDiskSpaceMB(name ? name : VideoDirectory);
+  return FreeDiskSpaceMB(name ? name : VideoDirectory, UsedMB);
 }
 
 bool cVideoDirectory::Next(void)
@@ -117,9 +117,9 @@ int OpenVideoFile(const char *FileName, int Flags)
      cVideoDirectory Dir;
      if (Dir.IsDistributed()) {
         // Find the directory with the most free space:
-        uint MaxFree = Dir.FreeMB();
+        int MaxFree = Dir.FreeMB();
         while (Dir.Next()) {
-              uint Free = FreeDiskSpaceMB(Dir.Name());
+              int Free = FreeDiskSpaceMB(Dir.Name());
               if (Free > MaxFree) {
                  Dir.Store();
                  MaxFree = Free;
@@ -166,7 +166,7 @@ bool RemoveVideoFile(const char *FileName)
   return RemoveFileOrDir(FileName, true);
 }
 
-bool VideoFileSpaceAvailable(unsigned int SizeMB)
+bool VideoFileSpaceAvailable(int SizeMB)
 {
   cVideoDirectory Dir;
   if (Dir.IsDistributed()) {
@@ -181,6 +181,22 @@ bool VideoFileSpaceAvailable(unsigned int SizeMB)
   return Dir.FreeMB() >= SizeMB;
 }
 
+int VideoDiskSpace(int *FreeMB, int *UsedMB)
+{
+  int free = 0, used = 0;
+  cVideoDirectory Dir;
+  do {
+     int u;
+     free += Dir.FreeMB(&u);
+     used += u;
+     } while (Dir.Next());
+  if (FreeMB)
+     *FreeMB = free;
+  if (UsedMB)
+     *UsedMB = used;
+  return (free + used) ? used * 100 / (free + used) : 0;
+}
+
 const char *PrefixVideoFileName(const char *FileName, char Prefix)
 {
   static char *PrefixedName = NULL;
diff --git a/videodir.h b/videodir.h
index 0197de303..a719c5e04 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,19 +4,22 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.3 2001/02/11 13:12:50 kls Exp $
+ * $Id: videodir.h 1.4 2002/01/27 12:37:20 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
 #define __VIDEODIR_H
 
+#include <stdlib.h>
+
 extern const char *VideoDirectory;
 
 int OpenVideoFile(const char *FileName, int Flags);
 int CloseVideoFile(int FileHandle);
 bool RenameVideoFile(const char *OldName, const char *NewName);
 bool RemoveVideoFile(const char *FileName);
-bool VideoFileSpaceAvailable(unsigned int SizeMB);
+bool VideoFileSpaceAvailable(int SizeMB);
+int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
 const char *PrefixVideoFileName(const char *FileName, char Prefix);
 void RemoveEmptyVideoDirectories(void);
 

From 8184b809b250386bb27febeb15f1825f8e4b9013 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Tue, 29 Jan 2002 18:00:00 +0100
Subject: [PATCH 031/307] Version 0.99pre3 - Fixed handling improper buffer
 lengths in the EIT parser (thanks to Deti   Fliegl).

---
 CONTRIBUTORS                 |  1 +
 HISTORY                      |  5 +++++
 config.h                     |  4 ++--
 libdtv/libsi/include/libsi.h |  4 ++--
 libdtv/libsi/si_parser.c     | 16 ++++++++--------
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 073e92719..1d06173f0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -57,6 +57,7 @@ Alberto Carraro <bertocar@tin.it>
 Deti Fliegl <deti@fliegl.de>
  for implementing the 'CurrentChannel' setup parameter
  for fixing setting the OSD size in the 'Confirm' interface call
+ for fixing handling improper buffer lengths in the EIT parser
 
 Dave Chapman <dave@dchapman.com>
  for implementing support for the teletext PID
diff --git a/HISTORY b/HISTORY
index 7a57c9848..819a9f47e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -921,3 +921,8 @@ Video Disk Recorder Revision History
 - Status messages are now displayed centered.
 - Removed the 'Tools' subdirectory from the VDR archive. All contributed tools
   can now be found at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.
+
+2002-01-29: Version 0.99pre3
+
+- Fixed handling improper buffer lengths in the EIT parser (thanks to Deti
+  Fliegl).
diff --git a/config.h b/config.h
index 960e51465..189390a3b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.88 2002/01/19 16:06:53 kls Exp $
+ * $Id: config.h 1.89 2002/01/29 21:53:32 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.99pre2"
+#define VDRVERSION "0.99pre3"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index dda2b1e4e..29079b10d 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -946,9 +946,9 @@ struct Pid *siParsePMT (u_char *);
 struct LIST *siParseSDT (u_char *);
 struct LIST *siParseEIT (u_char *);
 time_t siParseTDT (u_char *);
-void siParseDescriptors (struct LIST *, u_char *, u_int, u_char);
+void siParseDescriptors (struct LIST *, u_char *, int, u_char);
 void siParseDescriptor (struct LIST *, u_char *);
-char *siGetDescriptorText (u_char *, u_int);
+char *siGetDescriptorText (u_char *, int);
 u_long crc32 (char *data, int len);
 
 /* si_debug_services.c */
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index 76d72c8f1..e6ca52527 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -40,7 +40,7 @@ struct LIST *siParsePAT (u_char *Buffer)
    pat_t               *Pat;
    pat_prog_t          *PatProgram;
    u_char              *Ptr;
-   u_int                SectionLength;
+   int                  SectionLength;
    int                  TransportStreamID;
    int                  PatVersion;
    struct Program      *Program;
@@ -87,7 +87,7 @@ struct Pid *siParsePMT (u_char *Buffer)
    pmt_t               *Pmt;
    pmt_info_t          *PmtInfo;
    u_char              *Ptr;
-   u_int                SectionLength, ProgramInfoLength,
+   int                  SectionLength, ProgramInfoLength,
                         StreamLength, LoopLength;
    int                  ProgramID;
    int                  PcrID;
@@ -150,7 +150,7 @@ struct LIST *siParseSDT (u_char *Buffer)
    sdt_t               *Sdt;
    sdt_descr_t         *SdtDescriptor;
    u_char              *Ptr;
-   u_int                SectionLength, LoopLength;
+   int                  SectionLength, LoopLength;
    int                  TransportStreamID;
    int                  SdtVersion;
    int                  OriginalNetworkID;
@@ -229,7 +229,7 @@ struct LIST *siParseEIT (u_char *Buffer)
    eit_t               *Eit;
    eit_event_t         *EitEvent;
    u_char              *Ptr;
-   u_int                SectionLength, LoopLength;
+   int                  SectionLength, LoopLength;
    int                  ServiceID;
    int                  EitVersion;
    int                  TransportStreamID;
@@ -316,7 +316,7 @@ time_t siParseTDT (u_char *Buffer)
 {
    tdt_t               *Tdt;
    u_char              *Ptr;
-   u_int                SectionLength;
+   int                  SectionLength;
    int                  TdtVersion;
    time_t               CurrentTime;
 
@@ -339,9 +339,9 @@ time_t siParseTDT (u_char *Buffer)
 
 
 void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
-                         u_int Length, u_char TableID)
+                         int Length, u_char TableID)
 {
-   u_int        DescriptorLength;
+   int          DescriptorLength;
    u_char      *Ptr;
 
    DescriptorLength = 0;
@@ -838,7 +838,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
 /*
  *  ToDo:  ETSI conformal text definition
  */
-char *siGetDescriptorText (u_char *Buffer, u_int Length)
+char *siGetDescriptorText (u_char *Buffer, int Length)
 {
    char *tmp, *result;
    int i;

From 3db2d636b2757326323418b5293ebc7307bf161d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Wed, 30 Jan 2002 18:00:00 +0100
Subject: [PATCH 032/307] Version 0.99pre4 - Fixed handling improperly
 formatted EIT data (thanks to Rolf Hakenes).

---
 HISTORY                      |  4 ++++
 config.h                     |  4 ++--
 libdtv/libsi/include/libsi.h | 34 ++++++++++++++++++++++++----------
 libdtv/libsi/si_parser.c     | 28 +++++++++++++++-------------
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/HISTORY b/HISTORY
index 819a9f47e..a2c2e41b8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -926,3 +926,7 @@ Video Disk Recorder Revision History
 
 - Fixed handling improper buffer lengths in the EIT parser (thanks to Deti
   Fliegl).
+
+2002-01-30: Version 0.99pre4
+
+- Fixed handling improperly formatted EIT data (thanks to Rolf Hakenes).
diff --git a/config.h b/config.h
index 189390a3b..42f73378c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.89 2002/01/29 21:53:32 kls Exp $
+ * $Id: config.h 1.90 2002/01/30 18:30:03 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -18,7 +18,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.99pre3"
+#define VDRVERSION "0.99pre4"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index 29079b10d..366387a3f 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -4,8 +4,8 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.4 $
-// $Date: 2001/10/07 10:24:46 $
+// $Revision: 1.6 $
+// $Date: 2002/01/30 17:04:13 $
 // $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include <asm/types.h>
 
+#define dvb_pid_t int
+
 
   /* Program Identifier */
 
@@ -274,7 +276,7 @@ struct Pid {
 struct PidInfo {
    struct NODE          Node;
    int                  StreamType;
-   int                  ElementaryPid;
+   dvb_pid_t            ElementaryPid;
    struct LIST         *Descriptors;
 };
 
@@ -283,7 +285,7 @@ struct PidInfo {
    { \
       xCreateNode (pidinfo, NULL); \
       pidinfo->StreamType = styp; \
-      pidinfo->ElementaryPid = epid; \
+      pidinfo->ElementaryPid = (dvb_pid_t) epid; \
       pidinfo->Descriptors = xNewList (NULL); \
    } while (0)
 
@@ -418,7 +420,9 @@ struct BouquetNameDescriptor {
 #define CreateBouquetNameDescriptor(descr, text) \
    do \
    { \
-      xCreateNode (((struct BouquetNameDescriptor *)descr), text); \
+      xCreateNode (((struct BouquetNameDescriptor *)descr), NULL); \
+      ((struct NODE *)descr)->Name = text; \
+      ((struct NODE *)descr)->HashKey = xHashKey (text); \
       ((struct BouquetNameDescriptor *)descr)->Tag = DESCR_BOUQUET_NAME; \
    } while (0)
 
@@ -613,7 +617,9 @@ struct ServiceDescriptor {
 #define CreateServiceDescriptor(descr, styp, prov, name) \
    do \
    { \
-      xCreateNode (((struct ServiceDescriptor *)descr), name); \
+      xCreateNode (((struct ServiceDescriptor *)descr), NULL); \
+      ((struct NODE *)descr)->Name = name; \
+      ((struct NODE *)descr)->HashKey = xHashKey (name); \
       ((struct ServiceDescriptor *)descr)->Tag = DESCR_SERVICE; \
       ((struct ServiceDescriptor *)descr)->ServiceType = styp; \
       ((struct ServiceDescriptor *)descr)->ServiceProvider = prov; \
@@ -678,7 +684,9 @@ struct ComponentDescriptor {
 #define CreateComponentDescriptor(descr, scnt, ctyp, tag, lc1, lc2, lc3, txt) \
    do \
    { \
-      xCreateNode (((struct ComponentDescriptor *)descr), txt); \
+      xCreateNode (((struct ComponentDescriptor *)descr), NULL); \
+      ((struct NODE *)descr)->Name = txt; \
+      ((struct NODE *)descr)->HashKey = xHashKey (txt); \
       ((struct ComponentDescriptor *)descr)->Tag = DESCR_COMPONENT; \
       ((struct ComponentDescriptor *)descr)->StreamContent = scnt; \
       ((struct ComponentDescriptor *)descr)->ComponentType = ctyp; \
@@ -735,7 +743,9 @@ struct ExtendedEventDescriptor {
 #define CreateExtendedEventDescriptor(descr, dnum, ldnb, lc1, lc2, lc3, text) \
    do \
    { \
-      xCreateNode (((struct ExtendedEventDescriptor *)descr), text); \
+      xCreateNode (((struct ExtendedEventDescriptor *)descr), NULL); \
+      ((struct NODE *)descr)->Name = text; \
+      ((struct NODE *)descr)->HashKey = xHashKey (text); \
       ((struct ExtendedEventDescriptor *)descr)->Tag = DESCR_EXTENDED_EVENT; \
       ((struct ExtendedEventDescriptor *)descr)->DescriptorNumber = dnum; \
       ((struct ExtendedEventDescriptor *)descr)->LastDescriptorNumber = ldnb; \
@@ -754,7 +764,9 @@ struct ExtendedEventItem {
 #define CreateExtendedEventItem(itm, dtxt, text) \
    do \
    { \
-      xCreateNode (itm, dtxt); \
+      xCreateNode (itm, NULL); \
+      ((struct NODE *)itm)->Name = dtxt; \
+      ((struct NODE *)itm)->HashKey = xHashKey (dtxt); \
       itm->Text = text; \
    } while (0)
 
@@ -822,7 +834,9 @@ struct ShortEventDescriptor {
 #define CreateShortEventDescriptor(descr, name, lc1, lc2, lc3, text) \
    do \
    { \
-      xCreateNode (((struct ShortEventDescriptor *)descr), name); \
+      xCreateNode (((struct ShortEventDescriptor *)descr), NULL); \
+      ((struct NODE *)descr)->Name = name; \
+      ((struct NODE *)descr)->HashKey = xHashKey (name); \
       ((struct ShortEventDescriptor *)descr)->Tag = DESCR_SHORT_EVENT; \
       ((struct ShortEventDescriptor *)descr)->LanguageCode[0] = lc1; \
       ((struct ShortEventDescriptor *)descr)->LanguageCode[1] = lc2; \
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index e6ca52527..063d93e6a 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -4,8 +4,8 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.4 $
-// $Date: 2001/10/07 10:24:46 $
+// $Revision: 1.6 $
+// $Date: 2002/01/30 17:04:13 $
 // $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
@@ -119,7 +119,8 @@ struct Pid *siParsePMT (u_char *Buffer)
 
    CreatePid (Pid, ProgramID, PcrID, PmtVersion);
 
-   siParseDescriptors (Pid->Descriptors, Ptr, ProgramInfoLength, Pmt->table_id);
+   if (StreamLength >= 0) siParseDescriptors (Pid->Descriptors, Ptr,
+                             ProgramInfoLength, Pmt->table_id);
 
    Ptr += ProgramInfoLength;
 
@@ -209,6 +210,8 @@ struct LIST *siParseSDT (u_char *Buffer)
          SetPresentFollowing (Service->Status);
 
       LoopLength = HILO (SdtDescriptor->descriptors_loop_length);
+      if (LoopLength > SectionLength - SDT_DESCR_LEN)
+         return (ServiceList);
       Ptr += SDT_DESCR_LEN;
 
       siParseDescriptors (Service->Descriptors, Ptr, LoopLength, Sdt->table_id);
@@ -297,6 +300,8 @@ struct LIST *siParseEIT (u_char *Buffer)
       Event->Duration = BcdTimeToSeconds (EitEvent->duration);
 
       LoopLength = HILO (EitEvent->descriptors_loop_length);
+      if (LoopLength > SectionLength - EIT_EVENT_LEN)
+         return (EventList);
       Ptr += EIT_EVENT_LEN;
 
       siParseDescriptors (Event->Descriptors, Ptr, LoopLength, Eit->table_id);
@@ -349,6 +354,8 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
 
    while (DescriptorLength < Length)
    {
+      if ((GetDescriptorLength (Ptr) > Length - DescriptorLength) ||
+          (GetDescriptorLength (Ptr) <= 0)) return;
       switch (TableID)
       {
          case TID_NIT_ACT: case TID_NIT_OTH:
@@ -554,7 +561,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
          Text = siGetDescriptorText (Buffer + DESCR_BOUQUET_NAME_LEN,
                    GetDescriptorLength (Buffer) - DESCR_BOUQUET_NAME_LEN);
          CreateBouquetNameDescriptor (Descriptor, Text);
-//         xMemFree (Text);
       break;
 
       case DESCR_COMPONENT:
@@ -567,7 +573,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    CastComponentDescriptor(Buffer)->lang_code1,
                    CastComponentDescriptor(Buffer)->lang_code2,
                    CastComponentDescriptor(Buffer)->lang_code3, Text);
-//         xMemFree (Text);
       break;
 
       case DESCR_SERVICE:
@@ -579,7 +584,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    CastServiceDescriptor(Buffer)->provider_name_length)));
          CreateServiceDescriptor (Descriptor,
                    CastServiceDescriptor(Buffer)->service_type, Text, Text2);
-//         xMemFree (Text2);
       break;
 
       case DESCR_COUNTRY_AVAIL:
@@ -603,7 +607,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    CastShortEventDescriptor(Buffer)->lang_code1,
                    CastShortEventDescriptor(Buffer)->lang_code2,
                    CastShortEventDescriptor(Buffer)->lang_code3, Text2);
-//         xMemFree (Text);
       break;
 
       case DESCR_EXTENDED_EVENT:
@@ -617,10 +620,9 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    CastExtendedEventDescriptor(Buffer)->lang_code1,
                    CastExtendedEventDescriptor(Buffer)->lang_code2,
                    CastExtendedEventDescriptor(Buffer)->lang_code3, Text);
-//         xMemFree (Text);
          Length = CastExtendedEventDescriptor(Buffer)->length_of_items;
          Ptr += DESCR_EXTENDED_EVENT_LEN;
-         while (Length > 0)
+         while ((Length > 0) && (Length < GetDescriptorLength (Buffer)))
          {
             Text = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN,
                       CastExtendedEventItem(Ptr)->item_description_length);
@@ -629,7 +631,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                       *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
                       CastExtendedEventItem(Ptr)->item_description_length)));
             AddExtendedEventItem (Descriptor, Text2, Text);
-//            xMemFree (Text2);
             Length -= ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
                       *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
                         CastExtendedEventItem(Ptr)->item_description_length)) + 1;
@@ -760,7 +761,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
             ASVC_FLAG, CastAc3Descriptor(Buffer)->asvc); }
          Length -= DESCR_AC3_LEN;
          Ptr += DESCR_AC3_LEN;
-         if (Length) AddAc3AdditionalData (Descriptor, Ptr, Length);
+         if (Length > 0) AddAc3AdditionalData (Descriptor, Ptr, Length);
       break;
 
       case DESCR_SUBTITLING:
@@ -843,6 +844,8 @@ char *siGetDescriptorText (u_char *Buffer, int Length)
    char *tmp, *result;
    int i;
 
+   if ((Length < 0) || (Length > 4095))
+      return (xSetText ("text error"));
    if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff))
    {
       xMemAlloc (Length+1, &result);
@@ -852,9 +855,8 @@ char *siGetDescriptorText (u_char *Buffer, int Length)
          if (*Buffer == 0) break;
 
          if ((*Buffer >= ' ' && *Buffer <= '~') ||
-             (*Buffer == '\n') ||
              (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer;
-         if (*Buffer == 0x8A) *tmp++ = '\n';
+         if (*Buffer == 0x8A || *Buffer == '\n') *tmp++ = '\n';
          if (*Buffer == 0x86 || *Buffer == 0x87) *tmp++ = ' ';
          Buffer++;
       }

From ef0a53af7282b14bd40f2087de28fc12a94e672b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Feb 2002 18:00:00 +0100
Subject: [PATCH 033/307] Version 0.99pre5 - Updated channel settings for 'N24'
 (thanks to Andreas Gebel). - Fixed handling hierarchical recordings menu in
 case of directories starting   with the same sequence of characters. - Fixed
 handling timers on the 29th, 30th or 31st of a month in case the next   month
 has less than 31 days. - Added a description of the sort order of individual
 episodes in the   recordings menu to the MANUAL. - Removed the EPG bugfix for
 "Title / Subtitle" cleanup. Apparently Pro-7 has   finally stopped this nasty
 habit. - Added some EPG bugfix statistics (printed to the log file every time
 the EPG   data is cleaned up and when VDR is terminated). Maybe somebody in
 charge of   the EPG data at the listed channels will read this and take the
 necessary   actions to fix these things... - Changed the [dei]syslog macros
 in tools.h to use a variable number of args,   thus making it safe to use
 them in nested 'if/else' statements. - Fixed error handling in establishing
 an SVDRP connection (thanks to Davide   Achilli) for pointing this out). -
 The new configuration file 'svdrphosts.conf' is now used to define which  
 hosts may access the SVDRP port (by default only 'localhost' has access).  
 See FORMATS for details. - The special keywords TITLE and EPISODE can now be
 used in timer file names   (see MANUAL and FORMATS for details). - The new
 setup parameter NameInstantRecord can be used to define how an   instant
 recording will be named (see MANUAL for details). - When looking for the EPG
 record of the timer that starts a recording, now   that record is taken which
 covers the time calculated as   'start + (Setup.MarginStart * 2) + 1)' in
 order to have a better chance of   hitting the right record in case of an
 instant recording. Timers that start   further in the future should always be
 programmed via the "Schedules" menu. - The special VPIDs '0' and '1' are now
 used to enable recording radio channels.   Actually '0' should be enough, but
 '1' must be used with encrypted channels   (driver bug?). Note, though, that
 since VDR is mainly a *video recorder*, some   features like, e. g.,  the
 progress display, may not work as expected with   radio recordings. Thanks to
 Michael Paar. - Fixed a problem with the ERR macro defined by ncurses.h
 (thanks to Artur   Skawina).

---
 CONTRIBUTORS    |  10 +++
 FORMATS         |  27 ++++++++-
 HISTORY         |  39 ++++++++++++
 INSTALL         |   5 ++
 MANUAL          |  16 +++++
 Makefile        |   4 +-
 channels.conf   |   2 +-
 config.c        | 158 +++++++++++++++++++++++++++++++++---------------
 config.h        |  35 +++++++++--
 dvbapi.c        |  17 ++----
 dvbapi.h        |   3 +-
 dvbosd.h        |   3 +-
 eit.c           |  85 +++++++++++++++++++++-----
 gmon.out        | Bin 0 -> 101224 bytes
 i18n.c          |  11 +++-
 menu.c          |  13 ++--
 recording.c     |  31 +++++++---
 recording.h     |   4 +-
 remux.c         |  16 ++++-
 svdrp.c         |  16 +++--
 svdrphosts.conf |  13 ++++
 tools.c         |  23 ++++++-
 tools.h         |   9 +--
 vdr.c           |   3 +-
 24 files changed, 427 insertions(+), 116 deletions(-)
 create mode 100644 gmon.out
 create mode 100644 svdrphosts.conf

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1d06173f0..e0b9ee1c9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -137,6 +137,7 @@ Matjaz Thaler <matjaz.thaler@guest.arnes.si>
 
 Artur Skawina <skawina@geocities.com>
  for improving the font file generation in the Makefile
+ for pointing out a problem with the ERR macro defined by ncurses.h
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
@@ -179,3 +180,12 @@ Lauri Pesonen <lauri.pesonen@firsthop.com>
 
 Sergei Haller <Sergei.Haller@math.uni-giessen.de>
  for fixing the LastActivity timestamp after a shutdown prompt
+
+Andreas Gebel <andreas@xcapenet.de>
+ for his help in keeping 'channels.conf' up to date
+
+Davide Achilli <davide@objsystem.it>
+ for pointing out a bug in error handling while establishing an SVDRP connection
+
+Michael Paar <mpaar@uumail.de>
+ for enabling recording of radio channels
diff --git a/FORMATS b/FORMATS
index 2a99e6efa..d7d4293c4 100644
--- a/FORMATS
+++ b/FORMATS
@@ -24,7 +24,7 @@ Video Disk Recorder File Formats
   - Polarization (one of 'h', 'H', 'v', 'V') **
   - Diseqc number **
   - Symbol rate ***
-  - Video PID
+  - Video PID (set to '0' for radio channels, '1' for encrypted radio channels)
   - Audio PID (either one number, or two, separated by a comma)
     If this channel also carries Dolby Digital sound, the Dolby PIDs follow
     the audio PIDs, separated by a semicolon, as in "...:101,102;103,104:..."
@@ -72,6 +72,11 @@ Video Disk Recorder File Formats
     any ':' characters, these have to be replaced with '|'. If the name shall
     contain subdirectories, these have to be delimited by '~' (since the '/'
     character may be part of a regular programme name).
+    The special keywords TITLE and EPISODE, if present, will be replaced 
+    with the title and episode information from the EPG data at the time of
+    recording (if that data is available). If at the time of recording either
+    of these cannot be determined, TITLE will default to the channel name, and
+    EPISODE will default to a blank.
   - Summary (any newline characters in the summary have to be replaced with '|';
     the summary may contain ':' characters)
 
@@ -111,6 +116,26 @@ Video Disk Recorder File Formats
   1..9, the command can be selected directly by pressing the respective numerical
   key on the remote control.
 
+* svdrphosts.conf
+
+  This file contains the IP numbers of all hosts that are allowed to access the
+  SVDRP port.
+
+  Each line contains one IP number in the format
+
+    IP-Address[/Netmask]
+
+  where 'IP-Address' is the address of a host or a network in the usual dot
+  separated notation (as in 192.168.100.1). If the optional 'Netmask' is given
+  only the given number of bits of 'IP-Address' are taken into account. This
+  allows you to grant SVDRP access to all hosts of an entire network. 'Netmask'
+  can be any integer from 1 to 32. The special value of 0 is only accepted if
+  the 'IP-Address' is 0.0.0.0, because this will give access to any host (USE
+  THIS WITH CARE!).
+
+  Everything following (and including) a '#' character is considered to be
+  comment.
+
 * marks.vdr
 
   This file (if present in a recording directory) contains the editing marks
diff --git a/HISTORY b/HISTORY
index a2c2e41b8..bf8ce2c9c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -930,3 +930,42 @@ Video Disk Recorder Revision History
 2002-01-30: Version 0.99pre4
 
 - Fixed handling improperly formatted EIT data (thanks to Rolf Hakenes).
+
+2002-02-03: Version 0.99pre5
+
+- Updated channel settings for 'N24' (thanks to Andreas Gebel).
+- Fixed handling hierarchical recordings menu in case of directories starting
+  with the same sequence of characters.
+- Fixed handling timers on the 29th, 30th or 31st of a month in case the next
+  month has less than 31 days.
+- Added a description of the sort order of individual episodes in the
+  recordings menu to the MANUAL.
+- Removed the EPG bugfix for "Title / Subtitle" cleanup. Apparently Pro-7 has
+  finally stopped this nasty habit.
+- Added some EPG bugfix statistics (printed to the log file every time the EPG
+  data is cleaned up and when VDR is terminated). Maybe somebody in charge of
+  the EPG data at the listed channels will read this and take the necessary
+  actions to fix these things...
+- Changed the [dei]syslog macros in tools.h to use a variable number of args,
+  thus making it safe to use them in nested 'if/else' statements.
+- Fixed error handling in establishing an SVDRP connection (thanks to Davide
+  Achilli) for pointing this out).
+- The new configuration file 'svdrphosts.conf' is now used to define which
+  hosts may access the SVDRP port (by default only 'localhost' has access).
+  See FORMATS for details.
+- The special keywords TITLE and EPISODE can now be used in timer file names
+  (see MANUAL and FORMATS for details).
+- The new setup parameter NameInstantRecord can be used to define how an
+  instant recording will be named (see MANUAL for details).
+- When looking for the EPG record of the timer that starts a recording, now
+  that record is taken which covers the time calculated as
+  'start + (Setup.MarginStart * 2) + 1)' in order to have a better chance of
+  hitting the right record in case of an instant recording. Timers that start
+  further in the future should always be programmed via the "Schedules" menu.
+- The special VPIDs '0' and '1' are now used to enable recording radio channels.
+  Actually '0' should be enough, but '1' must be used with encrypted channels
+  (driver bug?). Note, though, that since VDR is mainly a *video recorder*, some
+  features like, e. g.,  the progress display, may not work as expected with
+  radio recordings. Thanks to Michael Paar.
+- Fixed a problem with the ERR macro defined by ncurses.h (thanks to Artur
+  Skawina).
diff --git a/INSTALL b/INSTALL
index d16509611..cf694890e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -81,6 +81,11 @@ WARNING: DUE TO THE OPEN SVDRP PORT THIS PROGRAM MAY CONSTITUTE A
          A CONTROLLED ENVIRONMENT, YOU MAY WANT TO DISABLE SVDRP
          BY USING '--port=0'!
 
+The file 'svdrphosts.conf' can be used to define which hosts are allowed
+to access the SVDRP port. By default only localhost (127.0.0.1) is granted
+access. If you want to give other hosts access to your SVDRP port you need to
+add their IP numbers to 'svdrphosts.conf'.
+
 If the program shall run as a daemon, use the --daemon option. This
 will completely detach it from the terminal and will continue as a
 background process.
diff --git a/MANUAL b/MANUAL
index 99d91be94..d0ce7a2cf 100644
--- a/MANUAL
+++ b/MANUAL
@@ -166,6 +166,14 @@ Video Disk Recorder User's Manual
   that directory (and any possible subdirectory thereof) as well as the total
   number of new recordings (as opposed to a recording's entry, which displays
   the date and time of the recording).
+
+  If the setup parameter UseSubtitle was turned on when a recording took place,
+  VDR adds the "subtitle" (which is usually the name of the episode in case of
+  a series) to the recording's name. The "Recordings" menu then displays all
+  recordings of a periodic timer in chronological order, since these are
+  usually the individual episodes of a series, which you may want to view in
+  the order in which they were broadcast.
+
   Playback can be stopped via the "Main" menu by selecting "Stop replaying",
   or by pressing the "Blue" button outside the menu.
   A previously stopped playback session can be resumed by pressing the "Blue"
@@ -377,6 +385,14 @@ Video Disk Recorder User's Manual
                          0 = instant recordings will not be marked
                          1 = instant recordings will be marked.
 
+  NameInstantRecord = TITLE-EPISODE
+                         Defines how to name an instant recording. If the keywords
+                         TITLE and/or EPISODE are present, they will be replaced
+                         with the title and episode information from the EPG data
+                         at the time of recording (if that data is available).
+                         If this parameter is empty, the channel name will be used
+                         by default.
+
   LnbSLOF    = 11700     The switching frequency (in MHz) between low and high LOF
   LnbFrequLo = 9750      The LNB's low and high local oscillator frequencies (in MHz)
   LnbFrequHi = 10600     (these have no meaning for DVB-C receivers)
diff --git a/Makefile b/Makefile
index 38597e8d6..f74179d93 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.29 2002/01/13 16:57:27 kls Exp $
+# $Id: Makefile 1.30 2002/02/01 14:40:09 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -105,7 +105,7 @@ $(DTVLIB) $(DTVDIR)/libdtv.h:
 clean:
 	make -C $(AC3DIR) clean
 	make -C $(DTVDIR) clean
-	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core *~
+	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
 fontclean:
 	-rm -f fontfix.c fontosd.c
 CLEAN: clean fontclean
diff --git a/channels.conf b/channels.conf
index a2bd32fb1..87796ae26 100644
--- a/channels.conf
+++ b/channels.conf
@@ -96,7 +96,7 @@ Cinedom 5A:11758:h:0:27500:1279:1280:0:3:194
 Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
 Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
 :Beta Digital
-N24:11914:H:0:27500:255:256:8191:3:52
+N24:12480:v:0:27500:2047:2048:0:0:47
 CNBC:11954:h:0:27500:510:520:0:0:28010
 Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
 :PW Erotic
diff --git a/config.c b/config.c
index f93035142..974aed0c2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.77 2002/01/19 16:06:42 kls Exp $
+ * $Id: config.c 1.82 2002/02/03 15:25:44 kls Exp $
  */
 
 #include "config.h"
@@ -296,9 +296,8 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
   if (!DvbApi)
      DvbApi = cDvbApi::PrimaryDvbApi;
   if (!DvbApi->Recording() && !groupSep) {
-     if (Log) {
+     if (Log)
         isyslog(LOG_INFO, "switching to channel %d", number);
-        }
      for (int i = 3; i--;) {
          switch (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr)) {
            case scrOk:         return true;
@@ -341,7 +340,7 @@ cTimer::cTimer(bool Instant)
   *file = 0;
   summary = NULL;
   if (Instant && ch)
-     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", ch->name);
+     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : ch->name);
 }
 
 cTimer::cTimer(const cEventInfo *EventInfo)
@@ -540,6 +539,13 @@ time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
   return mktime(&tm);
 }
 
+char *cTimer::SetFile(const char *File)
+{
+  if (!isempty(File))
+     strn0cpy(file, File, sizeof(file));
+  return file;
+}
+
 bool cTimer::Matches(time_t t)
 {
   startTime = stopTime = 0;
@@ -551,7 +557,7 @@ bool cTimer::Matches(time_t t)
   if (length < 0)
      length += SECSINDAY;
 
-  int DaysToCheck = IsSingleEvent() ? 31 : 7;
+  int DaysToCheck = IsSingleEvent() ? 61 : 7; // 61 to handle months with 31/30/31
   for (int i = -1; i <= DaysToCheck; i++) {
       time_t t0 = IncDay(t, i);
       if (DayMatches(t0)) {
@@ -647,6 +653,40 @@ const char *cCommand::Execute(void)
   return result;
 }
 
+// -- cSVDRPhost -------------------------------------------------------------
+
+cSVDRPhost::cSVDRPhost(void)
+{
+  addr.s_addr = 0;
+  mask = 0;
+}
+
+bool cSVDRPhost::Parse(const char *s)
+{
+  mask = 0xFFFFFFFF;
+  const char *p = strchr(s, '/');
+  if (p) {
+     char *error = NULL;
+     int m = strtoul(p + 1, &error, 10);
+     if (error && !isspace(*error) || m > 32)
+        return false;
+     *(char *)p = 0; // yes, we know it's 'const' - will be restored!
+     if (m == 0)
+        mask = 0;
+     else
+        mask >>= (32 - m);
+     }
+  int result = inet_aton(s, &addr);
+  if (p)
+     *(char *)p = '/'; // there it is again
+  return result != 0 && (mask != 0 || addr.s_addr == 0);
+}
+
+bool cSVDRPhost::Accepts(in_addr_t Address)
+{
+  return (Address & mask) == addr.s_addr;
+}
+
 // -- cKeys ------------------------------------------------------------------
 
 cKeys Keys;
@@ -659,9 +699,9 @@ cCommands Commands;
 
 cChannels Channels;
 
-bool cChannels::Load(const char *FileName)
+bool cChannels::Load(const char *FileName, bool AllowComments)
 {
-  if (cConfig<cChannel>::Load(FileName)) {
+  if (cConfig<cChannel>::Load(FileName, AllowComments)) {
      ReNumber();
      return true;
      }
@@ -779,6 +819,21 @@ cTimer *cTimers::GetNextActiveTimer(void)
   return t0;
 }
 
+// -- cSVDRPhosts ------------------------------------------------------------
+
+cSVDRPhosts SVDRPhosts;
+
+bool cSVDRPhosts::Acceptable(in_addr_t Address)
+{
+  cSVDRPhost *h = First();
+  while (h) {
+        if (h->Accepts(Address))
+           return true;
+        h = (cSVDRPhost *)h->Next();
+        }
+  return false;
+}
+
 // -- cSetup -----------------------------------------------------------------
 
 cSetup Setup;
@@ -792,6 +847,7 @@ cSetup::cSetup(void)
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
   MarkInstantRecord = 1;
+  strcpy(NameInstantRecord, "TITLE-EPISODE");
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
@@ -825,47 +881,51 @@ cSetup::cSetup(void)
 
 bool cSetup::Parse(char *s)
 {
-  const char *Delimiters = " \t\n=";
-  char *Name  = strtok(s, Delimiters);
-  char *Value = strtok(NULL, Delimiters);
-  if (Name && Value) {
-     if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
-     else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
-     else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
-     else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
-     else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
-     else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
-     else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
-     else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
-     else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
-     else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
-     else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
-     else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
-     else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
-     else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
-     else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
-     else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
-     else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
-     else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
-     else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
-     else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
-     else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
-     else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
-     else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
-     else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
-     else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
-     else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
-     else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
-     else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
-     else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
-     else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
-     else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
-     else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
-     else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
-     else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
-     else
-        return false;
-     return true;
+  char *p = strchr(s, '=');
+  if (p) {
+     *p = 0;
+     char *Name  = compactspace(s);
+     char *Value = compactspace(p + 1);
+     if (*Name && *Value) {
+        if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
+        else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
+        else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
+        else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
+        else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
+        else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
+        else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
+        else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
+        else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
+        else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
+        else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
+        else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
+        else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
+        else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
+        else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
+        else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
+        else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
+        else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
+        else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
+        else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+        else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
+        else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
+        else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
+        else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
+        else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
+        else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
+        else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
+        else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
+        else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
+        else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
+        else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
+        else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
+        else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
+        else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
+        else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
+        else
+           return false;
+        return true;
+        }
      }
   return false;
 }
@@ -882,6 +942,7 @@ bool cSetup::Load(const char *FileName)
      bool result = true;
      while (fgets(buffer, sizeof(buffer), f) > 0) {
            line++;
+           stripspace(buffer);
            if (!isempty(buffer)) {
               if (*buffer != '#' && !Parse(buffer)) {
                  esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
@@ -911,6 +972,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
         fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
         fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
+        fprintf(f, "NameInstantRecord  = %s\n", NameInstantRecord);
         fprintf(f, "LnbSLOF            = %d\n", LnbSLOF);
         fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
diff --git a/config.h b/config.h
index 42f73378c..325f4ef28 100644
--- a/config.h
+++ b/config.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.90 2002/01/30 18:30:03 kls Exp $
+ * $Id: config.h 1.93 2002/02/03 15:16:21 kls Exp $
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <arpa/inet.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -18,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.99pre4"
+#define VDRVERSION "0.99pre5"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -65,6 +66,8 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 #define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
 #define NORMALKEY(k) (eKeys((k) & ~k_Repeat))
 
+#define MaxFileName 256
+
 struct tKey {
   eKeys type;
   char *name;
@@ -122,7 +125,6 @@ class cTimer : public cListObject {
   static char *buffer;
   static const char *ToText(cTimer *Timer);
 public:
-  enum { MaxFileName = 256 };
   bool recording, pending;
   int active;
   int channel;
@@ -148,6 +150,7 @@ class cTimer : public cListObject {
   bool DayMatches(time_t t);
   time_t IncDay(time_t t, int Days);
   time_t SetTime(time_t t, int SecondsFromMidnight);
+  char *SetFile(const char *File);
   bool Matches(time_t t = 0);
   time_t StartTime(void);
   time_t StopTime(void);
@@ -171,6 +174,16 @@ class cCommand : public cListObject {
   const char *Execute(void);
   };
 
+class cSVDRPhost : public cListObject {
+private:
+  struct in_addr addr;
+  in_addr_t mask;
+public:
+  cSVDRPhost(void);
+  bool Parse(const char *s);
+  bool Accepts(in_addr_t Address);
+  };
+
 template<class T> class cConfig : public cList<T> {
 private:
   char *fileName;
@@ -182,7 +195,7 @@ template<class T> class cConfig : public cList<T> {
 public:
   cConfig(void) { fileName = NULL; }
   virtual ~cConfig() { delete fileName; }
-  virtual bool Load(const char *FileName)
+  virtual bool Load(const char *FileName, bool AllowComments = false)
   {
     Clear();
     fileName = strdup(FileName);
@@ -196,6 +209,11 @@ template<class T> class cConfig : public cList<T> {
           result = true;
           while (fgets(buffer, sizeof(buffer), f) > 0) {
                 line++;
+                if (AllowComments) {
+                   char *p = strchr(buffer, '#');
+                   if (p)
+                      *p = 0;
+                   }
                 if (!isempty(buffer)) {
                    T *l = new T;
                    if (l->Parse(buffer))
@@ -242,7 +260,7 @@ class cChannels : public cConfig<cChannel> {
   int maxNumber;
 public:
   cChannels(void) { maxNumber = 0; }
-  virtual bool Load(const char *FileName);
+  virtual bool Load(const char *FileName, bool AllowComments = false);
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
@@ -263,10 +281,16 @@ class cTimers : public cConfig<cTimer> {
 
 class cCommands : public cConfig<cCommand> {};
 
+class cSVDRPhosts : public cConfig<cSVDRPhost> {
+public:
+  bool Acceptable(in_addr_t Address);
+  };
+
 extern cChannels Channels;
 extern cTimers Timers;
 extern cKeys Keys;
 extern cCommands Commands;
+extern cSVDRPhosts SVDRPhosts;
 
 class cSetup {
 private:
@@ -279,6 +303,7 @@ class cSetup {
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
   int MarkInstantRecord;
+  char NameInstantRecord[MaxFileName];
   int LnbSLOF;
   int LnbFrequLo;
   int LnbFrequHi;
diff --git a/dvbapi.c b/dvbapi.c
index 048639c66..314d91f6c 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
  * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
  * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  *
- * $Id: dvbapi.c 1.146 2002/01/26 15:39:48 kls Exp $
+ * $Id: dvbapi.c 1.147 2002/02/02 13:04:00 kls Exp $
  */
 
 //#define DVDDEBUG        1
@@ -548,9 +548,8 @@ void cRecordBuffer::Input(void)
          }
       else if (r < 0) {
          if (FATALERRNO) {
-            if (errno == EBUFFEROVERFLOW) { // this error code is not defined in the library
+            if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
                esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
-               }
             else {
                LOG_ERROR;
                break;
@@ -1064,9 +1063,8 @@ cReplayBuffer::cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const
      return;
   // Create the index file:
   index = new cIndexFile(FileName, false);
-  if (!index) {
+  if (!index)
      esyslog(LOG_ERR, "ERROR: can't allocate index");
-     }
   else if (!index->Ok()) {
      delete index;
      index = NULL;
@@ -2251,9 +2249,8 @@ void cTransferBuffer::Input(void)
            }
         else if (r < 0) {
            if (FATALERRNO) {
-              if (errno == EBUFFEROVERFLOW) { // this error code is not defined in the library
+              if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
                  esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
-                 }
               else {
                  LOG_ERROR;
                  break;
@@ -2719,12 +2716,10 @@ bool cDvbApi::Init(void)
          }
       }
   PrimaryDvbApi = dvbApi[0];
-  if (NumDvbApis > 0) {
+  if (NumDvbApis > 0)
      isyslog(LOG_INFO, "found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
-     } // need braces because of isyslog-macro
-  else {
+  else
      esyslog(LOG_ERR, "ERROR: no video device found, giving up!");
-     }
   return NumDvbApis > 0;
 }
 
diff --git a/dvbapi.h b/dvbapi.h
index 733757195..fbc1e9d94 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.60 2002/01/26 13:01:16 kls Exp $
+ * $Id: dvbapi.h 1.61 2002/02/03 16:43:38 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -12,6 +12,7 @@
 
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
 #include <ncurses.h>
+#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
 #endif
 #include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
                     // FIXME: shouldn't every header file include ALL the other header
diff --git a/dvbosd.h b/dvbosd.h
index ceac507d3..0e90414cc 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.9 2001/12/09 15:11:05 kls Exp $
+ * $Id: dvbosd.h 1.10 2002/02/03 16:43:50 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -12,6 +12,7 @@
 
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
 #include <ncurses.h>
+#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
 #endif
 #include <ost/osd.h>
 #include <stdio.h>
diff --git a/eit.c b/eit.c
index ed757d2cc..2860fc4c6 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.31 2002/01/13 16:14:31 kls Exp $
+ * $Id: eit.c 1.33 2002/02/02 12:12:26 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -352,6 +352,64 @@ void cEventInfo::Dump(FILE *f, const char *Prefix) const
       }
 }
 
+#define MAXEPGBUGFIXSTATS 6
+#define MAXEPGBUGFIXCHANS 50
+struct tEpgBugFixStats {
+  int hits;
+  int n;
+  unsigned short serviceIDs[MAXEPGBUGFIXCHANS];
+  tEpgBugFixStats(void) { hits = n = 0; }
+  };
+
+tEpgBugFixStats EpgBugFixStats[MAXEPGBUGFIXSTATS];
+
+static void EpgBugFixStat(int Number, unsigned int ServiceID)
+{
+  if (0 <= Number && Number < MAXEPGBUGFIXSTATS) {
+     tEpgBugFixStats *p = &EpgBugFixStats[Number];
+     p->hits++;
+     int i = 0;
+     for (; i < p->n; i++) {
+         if (p->serviceIDs[i] == ServiceID)
+            break;
+         }
+     if (i == p->n && p->n < MAXEPGBUGFIXCHANS)
+        p->serviceIDs[p->n++] = ServiceID;
+     }
+}
+
+static void ReportEpgBugFixStats(bool Reset = false)
+{
+  if (Setup.EPGBugfixLevel > 0) {
+     dsyslog(LOG_INFO, "=====================");
+     dsyslog(LOG_INFO, "EPG bugfix statistics");
+     dsyslog(LOG_INFO, "=====================");
+     dsyslog(LOG_INFO, "IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
+     dsyslog(LOG_INFO, "CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
+     dsyslog(LOG_INFO, "IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
+     dsyslog(LOG_INFO, "=====================");
+     dsyslog(LOG_INFO, "Fix\tHits\tChannels");
+     char buffer[1024];
+     for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) {
+         const char *delim = "\t";
+         tEpgBugFixStats *p = &EpgBugFixStats[i];
+         char *q = buffer;
+         q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
+         for (int c = 0; c < p->n; c++) {
+             cChannel *channel = Channels.GetByServiceID(p->serviceIDs[c]);
+             if (channel) {
+                q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->name);
+                delim = ", ";
+                }
+             }
+         dsyslog(LOG_INFO, "%s", buffer);
+         if (Reset)
+            p->hits = p->n = 0;
+         }
+     dsyslog(LOG_INFO, "=====================");
+     }
+}
+
 void cEventInfo::FixEpgBugs(void)
 {
   // VDR can't usefully handle newline characters in the EPG data, so let's
@@ -367,20 +425,6 @@ void cEventInfo::FixEpgBugs(void)
   // EPG data. Let's fix their bugs as good as we can:
   if (pTitle) {
 
-     // Pro7 preceeds the Subtitle with the Title:
-     //
-     // Title
-     // Title / Subtitle
-     //
-     if (pSubtitle && strstr(pSubtitle, pTitle) == pSubtitle) {
-        char *p = pSubtitle + strlen(pTitle);
-        const char *delim = " / ";
-        if (strstr(p, delim) == p) {
-           p += strlen(delim);
-           memmove(pSubtitle, p, strlen(p) + 1);
-           }
-        }
-
      // VOX and VIVA put the Subtitle in quotes and use either the Subtitle
      // or the Extended Description field, depending on how long the string is:
      //
@@ -400,6 +444,7 @@ void cEventInfo::FixEpgBugs(void)
               delete pExtendedDescription;
               pSubtitle = s;
               pExtendedDescription = d;
+              EpgBugFixStat(0, GetServiceID());
               }
            }
         }
@@ -416,6 +461,7 @@ void cEventInfo::FixEpgBugs(void)
            memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle));
            pExtendedDescription = pSubtitle;
            pSubtitle = NULL;
+           EpgBugFixStat(1, GetServiceID());
            }
         }
 
@@ -427,6 +473,7 @@ void cEventInfo::FixEpgBugs(void)
      if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
         delete pSubtitle;
         pSubtitle = NULL;
+        EpgBugFixStat(2, GetServiceID());
         }
 
      // ZDF.info puts the Subtitle between double quotes, which is nothing
@@ -442,6 +489,7 @@ void cEventInfo::FixEpgBugs(void)
            char *p = strrchr(pSubtitle, '"');
            if (p)
               *p = 0;
+           EpgBugFixStat(3, GetServiceID());
            }
         }
 
@@ -460,8 +508,10 @@ void cEventInfo::FixEpgBugs(void)
         char *p = pExtendedDescription + 1;
         while (*p) {
               if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
-                 if (!startswith(p + 2, "und ")) // special case in German, as in "Lach- und Sachgeschichten"
+                 if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
                     memmove(p, p + 2, strlen(p + 2) + 1);
+                    EpgBugFixStat(4, GetServiceID());
+                    }
                  }
               p++;
               }
@@ -845,6 +895,8 @@ cSIProcessor::cSIProcessor(const char *FileName)
 
 cSIProcessor::~cSIProcessor()
 {
+   if (masterSIProcessor)
+      ReportEpgBugFixStats();
    active = false;
    Cancel(3);
    ShutDownFilters();
@@ -913,6 +965,7 @@ void cSIProcessor::Action()
             schedules->Cleanup();
             schedulesMutex.Unlock();
             lastCleanup = now;
+            ReportEpgBugFixStats(true);
          }
          if (epgDataFileName && now - lastDump > 600)
          {
diff --git a/gmon.out b/gmon.out
new file mode 100644
index 0000000000000000000000000000000000000000..ea79bc54bbd4e662e4d8c094175c3df7d5c3504b
GIT binary patch
literal 101224
zcmeI4@pGI-8OQJ1d+!#S!K6e88Zoq>(Fu5ML#Jwys|gy0IHa^wBMlhZD+CE8P}Hhn
zOxuhE2ymqlgGRm5j>MUaUTKgb6^^!QWTKM-!(_(HaG}?lAA%k<j&UZVexK*v_hm=_
z0T{o`WVp{gyU*@^cHiB-_lMqg=Uv;Qk^lNH`Bco*J(@88el8M8BerAP*1NW+cLb%v
z55X7wKMl|T4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk4
z01eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp
z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eQ<|DS<H&XE7-A3b+s{P^B6
z5RGuA-aE6wp3ndd&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk4
z01eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp
z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$
z&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk4
z01eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp
z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$
z&;Sk401eQ<`^P}^{nJ(Ulm=*k255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2
zfCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ
z255i=Xn+RZV+Nw7r(&jMbKJ;3;h@ky=)DV>Gcg}#e;zY?=i=r<DOUZ9nCV)QFfR-A
zABve}rMNKy`KNt2CNK-Q1raUQc{pZvUGJI28Ueii1q(x?eztOn6adNJ$Be?*voVuJ
zI||98erkmbAdA!rdBDl%Y@JEB*bG2=pv4wkNWFjrzloVGF*Mo&$O9Us2OWSC;9`js
zUqr7ZHS|R1Tqw``2{h6S*oS(Wtrf5`fKI?-)N7Cg{V(|=^`xCSfDBHd`ItXAg*Je=
zR@e!Ukt*~8rUMvoi_IL5nH4uD{K@J$;U`e>!+;7*n8FlbD<({#1bDN|PUF;XG3?*j
z+0J7IWEON$OyR=@OqfD;EM^X4JUZ;wg5S<^8PC0dhL<r6fi=@Hvo3DClLFkGu+UM&
z5CRwgL<6Wljgb!9b{YZg=$kg$;lh9mM*zt`*g7+S$AUVQSh*oIy3h$IM^Q~Z<U->W
zo+(}KnI$rWs!w@lCBD#NbuKiykanTRg+UiaT^M(v=t3mvG+OOK3Xp5G-5CK$N40M`
zz$^V0<^dCrTbNwonYSOdPz0>M%EByQ-G-nJVE=jxk(Kyxy@j$Xopve#m(<%x6W~B#
zC$-u$FCmF`X8>@^Oxz?FL1OP`J#+R}&){<;T87peZnuyI?77WC7I5}X3zeVq%<k=;
z!Sff1PF(GoWnG>r6Nscdv#QfGx67kxuzxJQ#_l2YF0{JP?LyXtS-{D^#Qhy<9w5Wk
z?J4#}-;P4M$!VwCg+Ui`E{wTQa3OV_XMPq-`0bQ8duBQqLK+Z`=LBHG4{UelzT}w-
z7}f5Wn>>@h(W+_(w6|O618lh2!T>%Tz)r5>^IPy?vz0jE!YrWc2^-nC6?Ks9>ARtK
z3LtgjI&*1168T6h5^V<L5z*B50**^jDOLoWZL<)&)sN^j9t0dfTRM%e0Wv76<H=$T
zly}%VqkwM&FaaoSPxz_p@vTJ8k#-iah>jzHHd_BRC&5lYm|*A*Oyf30rA{B#&El`x
zwKEKmMzsf10I8!;l42Nw4!aynGLOz`q#h6!YXXRPjr0S;Asn^Ev~P7-#_NKP4gq$c
zODbdxa2$P8Sc?TN5w+6+xEqZs415#wgF~XB0z*jc^z_6~IPq;Pm%qi$pH?6;=fb7m
zaU#WTJdHRp{9-Pc`<zH_m*38HqG}8vd#}RU-Jb5F3QYhxvlIpaEoeAahdRR+>g3TJ
z1#}^zP__qy!xw8{Bw7oQI=5{COad~1`(9XrtA~xe_{T&fI@0Tz0!I7z5){i@m=@^%
zp5Hg!YEA&cJ$@eW=KXd`s`23fhM}{N1jsq3kQTt7!aP1?(D3PhqS4+5{KzFM(as1!
z5?m`n@)AJ;g*jVHq546;&Nb(v*jm70WIIow-GYiA0PMk3>dYOKI>@FlX^Sb$18Tly
zi&Z`Z*MOO7WUF<d3D6EZ@8DsGwg3)6qCy(b6GS=y(?O&gkPRXkfV4C9aU>W5NCJfs
zTSwt2paP3YhcFIE1uzL{51<Hm6)Q`Nl>pg(3zhir7-mmrt^hcB%3d_rK8!_<3Darp
z1$_Qd3mL#Ar)@Fw2sV@e$_0X>tr?ID5_ABz6m6XrWRh)NQ?~)u2aR?B!UR2l-QTy3
z_Pa3T!mtZRTo`j<5|9bnDFI}^)*e*t!_>bOHy2$di^7FjfOPbO5}5}`M-{3DaESML
zKGXtMVa;h|4M5saXaPimNC!X~)kqpgM|iaL0!~4d?o~s8@GM!7VsF}xmJMRt2!^m0
zP(W0N(CNbD4?VN5&(^8=5q7>uEHna6J!4@8aQ=f9767mO%0kx=ihagDfLTE4Cl>Mm
zxuNKzxd15q)H7FuqGdnEdV4V8LoMLe#TFU?%O8!KbyBPwAa$-4$N)a}M%;&kfQf1Q
zLtqy0HqvYAc|d6dw^gYVL*>j>wg-KHmjJp&&jCtT2Um{+p4kh~ExPWPnBYv@@AVKs
ze&rxpB-)k4EeMxqg)Cqt8db;vmanvRjsW(pvXBS7g1f&KE3Sx}y+NH6%9kU(My3Gm
z=#s($pzx%HGGux(VmG@EKo}VT$fD4T*-=0bZfXh>fIPNB-J(r>{N4S!8X#NE1!yQ*
z3y|L>3MqhWH44pcqz!O3*zmgmVS;YASOyR#7;+<%QYRQ((MEKnu`AJ0Y+MSJfN*eY
zTxbSJN3~e53t2#zAm`S3&4r>{r+PKo3A$4Y2<N96AP<vzn_uHc)M(kK{W-ltyv1&W
zc>IXehpEzqS{K&3(BeYcg`F<+xsY`s=fVjWih%H^RRll%!y~i~Q22^{PTO2a-Vry)
zOz?XSu;UyHX+W5*8_@7wo1m)GNu2~N3+ik{k=^In1l2v5tiReiDZmXMu#sj!O#oT!
zImuw($>BqImb5((fA_?w$DR|O7%4z_E;Iw$g9LeiJPS)OC(&`hihc`)hx|D`S0au0
zR&MJT2($rYC&x7;5}g5P9f7`wZ8m{}fWwkaiveVXDAZx6jAZOcN3m&zP=#-Ipr~%q
z?H2Tf$`C+0s!MqRumXP?soCo!r~^nlS}gf=+}wgcU2kopakC%rb?MIBGjUToWFrym
z$SqOpx*QNrV-c|FSz9cI58(=_0^AeSsR1kt+8F}8dc@W_0XVtHrf$KvXWxqZyJhEd
zaq|wMx~cZLkaeN?*Vr8XZpV{(K5jC>&X)s(o9Z|~UQOt*tB*R76hOM8k?f!2`VK{*
z;6h|7ZdRc!jkMsjxB<FURV$zdLr};A!okf0WF6p29*MRV@Sr23Cg=f#-kNdTRN$C8
zBWtIKgH=viE!K^zik!3x^MD;#fI3+Mt26f4tvVAoyKwo@Vl!9+@~b*si)?lHAh&=!
z1iArobI?c@yPmu)+9OxP85{%0pRl`S4`wZ#k|g>iN9bwk+eW;nS^Y2DgCZXCrT?&y
z!~<J_>%R7F7*|$#Xm5~V&jTh9xp*nyAih0@w^{m%N+8*0Un&VaiI;f#3rt`UP7MDN
z3|NLk;yTGzR*}%z)^<h!NqGq&kxMUdy3=(b+QFjG$WFkSH|(Z5;6}25*YP?`i;cRG
zalrI8JDzk^LJtY;+W_D(yn0j^2W)uWLIEJRb&U*P<n$m9*uT|g+xQ_rn>y$Q><WY&
z0i2Ilbs8B5NH&F`4?Ee00h{oW)$cXnRK0aD4%iY1DFAZ8o4EzR#3oy;tQy_<vW0rU
z9^BM4TkpkiowN&S7SPaOSMLH~58mkMQttX_!rX(~klvn3H3_p1$D5vJndJ#{2zL=(
ziLI9<%-L4l?qq)205z9e=m1OvFb2q>9W6Fki#HxP8x(SY9xP{Vr|uK5gZG2l(IjAf
zo$Ylu;3O`N{ty7maa~cE0Z0OcHJ?nFcY<NhZ%&wYywTH$KyuL55vbX0>!h$g<!7wE
b1#QAx)9^4lg82+#ewzc4yU@-}{=@Vi&4&!s

literal 0
HcmV?d00001

diff --git a/i18n.c b/i18n.c
index 7977fcd44..3d9089ae0 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.50 2002/01/27 15:52:32 kls Exp $
+ * $Id: i18n.c 1.51 2002/02/03 14:34:33 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -776,6 +776,15 @@ const tPhrase Phrases[] = {
     "Enregistrement imm�diat",
     "Markere direkteopptak",
   },
+  { "NameInstantRecord",
+    "Direktaufz. benennen",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "LnbSLOF",
     "LnbSLOF",
     "LnbSLOF",
diff --git a/menu.c b/menu.c
index 1cd549158..40ac1859d 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.146 2002/01/27 15:50:50 kls Exp $
+ * $Id: menu.c 1.148 2002/02/03 15:42:38 kls Exp $
  */
 
 #include "menu.h"
@@ -1553,7 +1553,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
      cMenuRecordingItem *LastItem = NULL;
      char *LastItemText = NULL;
      for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
-         if (!Base || strstr(recording->Name(), Base) == recording->Name()) {
+         if (!Base || (strstr(recording->Name(), Base) == recording->Name() && recording->Name()[strlen(Base)] == '~')) {
             cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
             if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
                Add(Item);
@@ -1829,6 +1829,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditBoolItem(tr("ShowInfoOnChSwitch"), &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem(tr("MenuScrollPage"),     &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("MarkInstantRecord"),  &data.MarkInstantRecord));
+  Add(new cMenuEditStrItem( tr("NameInstantRecord"),   data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
   Add(new cMenuEditIntItem( tr("LnbSLOF"),            &data.LnbSLOF));
   Add(new cMenuEditIntItem( tr("LnbFrequLo"),         &data.LnbFrequLo));
   Add(new cMenuEditIntItem( tr("LnbFrequHi"),         &data.LnbFrequHi));
@@ -2309,14 +2310,16 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
   timer->SetPending(true);
   timer->SetRecording(true);
   if (Channels.SwitchTo(timer->channel, dvbApi)) {
+     const char *Title = NULL;
      const char *Subtitle = NULL;
      const char *Summary = NULL;
      if (GetEventInfo()) {
-        dsyslog(LOG_INFO, "Title: '%s' Subtitle: '%s'", eventInfo->GetTitle(), eventInfo->GetSubtitle());
+        Title = eventInfo->GetTitle();
         Subtitle = eventInfo->GetSubtitle();
         Summary = eventInfo->GetExtendedDescription();
+        dsyslog(LOG_INFO, "Title: '%s' Subtitle: '%s'", Title, Subtitle);
         }
-     cRecording Recording(timer, Subtitle, Summary);
+     cRecording Recording(timer, Title, Subtitle, Summary);
      fileName = strdup(Recording.FileName());
      cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
      if (dvbApi->StartRecord(fileName, Channels.GetByNumber(timer->channel)->ca, timer->priority))
@@ -2337,7 +2340,7 @@ cRecordControl::~cRecordControl()
 bool cRecordControl::GetEventInfo(void)
 {
   cChannel *channel = Channels.GetByNumber(timer->channel);
-  time_t Time = timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
+  time_t Time = timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
         cThreadLock ThreadLock;
diff --git a/recording.c b/recording.c
index acdf264cb..7a55e1a7d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.48 2002/01/27 15:14:45 kls Exp $
+ * $Id: recording.c 1.49 2002/02/03 15:46:42 kls Exp $
  */
 
 #include "recording.h"
@@ -41,6 +41,9 @@
 #define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 
+#define TIMERMACRO_TITLE    "TITLE"
+#define TIMERMACRO_EPISODE  "EPISODE"
+
 void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
@@ -214,19 +217,33 @@ char *ExchangeChars(char *s, bool ToFileSystem)
   return s;
 }
 
-cRecording::cRecording(cTimer *Timer, const char *Subtitle, const char *Summary)
+cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, const char *Summary)
 {
   resume = RESUME_NOT_INITIALIZED;
   titleBuffer = NULL;
   sortBuffer = NULL;
   fileName = NULL;
-  if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
+  name = NULL;
+  // set up the actual name:
+  if (isempty(Title))
+     Title = Channels.GetChannelNameByNumber(Timer->channel);
+  if (isempty(Subtitle))
+     Subtitle = " ";
+  char *macroTITLE   = strstr(Timer->file, TIMERMACRO_TITLE);
+  char *macroEPISODE = strstr(Timer->file, TIMERMACRO_EPISODE);
+  if (macroTITLE || macroEPISODE) {
      name = strdup(Timer->file);
-  else {
-     if (isempty(Subtitle))
-        Subtitle = " ";
-     asprintf(&name, "%s~%s", Timer->file, Subtitle);
+     name = strreplace(name, TIMERMACRO_TITLE, Title);
+     name = strreplace(name, TIMERMACRO_EPISODE, Subtitle);
+     if (Timer->IsSingleEvent()) {
+        Timer->SetFile(name); // this was an instant recording, so let's set the actual data
+        Timers.Save();
+        }
      }
+  else if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
+     name = strdup(Timer->file);
+  else
+     asprintf(&name, "%s~%s", Timer->file, Subtitle);
   // substitute characters that would cause problems in file names:
   strreplace(name, '\n', ' ');
   start = Timer->StartTime();
diff --git a/recording.h b/recording.h
index 3aaa7e9e6..38626f859 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.21 2002/01/26 15:18:16 kls Exp $
+ * $Id: recording.h 1.22 2002/02/03 11:59:49 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -43,7 +43,7 @@ class cRecording : public cListObject {
   time_t start;
   int priority;
   int lifetime;
-  cRecording(cTimer *Timer, const char *Subtitle, const char *Summary);
+  cRecording(cTimer *Timer, const char *Title, const char *Subtitle, const char *Summary);
   cRecording(const char *FileName);
   ~cRecording();
   virtual bool operator< (const cListObject &ListObject);
diff --git a/remux.c b/remux.c
index f89b897b6..99a644081 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.6 2001/08/19 11:52:05 kls Exp $
+ * $Id: remux.c 1.8 2002/02/03 16:20:37 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -555,6 +555,17 @@ XXX*/
   return Result ? resultBuffer : NULL;
 XXX*/
 
+  // Special VPID case to enable recording radio channels:
+
+  if (vPid == 0 || vPid == 1 || vPid == 0x1FFF) {
+     // XXX actually '0' should be enough, but '1' must be used with encrypted channels (driver bug?)
+     // XXX also allowing 0x1FFF to not break Michael Paar's original patch,
+     // XXX but it would probably be best to only use '0'
+     *PictureType = I_FRAME;
+     Result = resultDelivered = resultCount;
+     return Result ? resultBuffer : NULL;
+     }
+
   // Check if we're getting anywhere here:
 
   if (!synced && skipped >= 0) {
@@ -583,9 +594,8 @@ XXX*/
                      if (l < 0)
                         return NULL; // no useful data found, wait for more
                      if (pt != NO_PICTURE) {
-                        if (pt < I_FRAME || B_FRAME < pt) {
+                        if (pt < I_FRAME || B_FRAME < pt)
                            esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
-                           }
                         else if (!synced) {
                            if (pt == I_FRAME) {
                               resultDelivered = i; // will drop everything before this position
diff --git a/svdrp.c b/svdrp.c
index 67de63c3b..4cdf2fbba 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.28 2002/01/13 16:07:42 kls Exp $
+ * $Id: svdrp.c 1.30 2002/02/02 15:39:46 kls Exp $
  */
 
 #include "svdrp.h"
@@ -101,9 +101,17 @@ int cSocket::Accept(void)
      struct sockaddr_in clientname;
      uint size = sizeof(clientname);
      int newsock = accept(sock, (struct sockaddr *)&clientname, &size);
-     if (newsock > 0)
-        isyslog(LOG_INFO, "connect from %s, port %hd", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port));
-     else if (errno != EINTR)
+     if (newsock > 0) {
+        bool accepted = SVDRPhosts.Acceptable(clientname.sin_addr.s_addr);
+        if (!accepted) {
+           const char *s = "Access denied!\n";
+           write(newsock, s, strlen(s));
+           close(newsock);
+           newsock = -1;
+           }
+        isyslog(LOG_INFO, "connect from %s, port %hd - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
+        }
+     else if (errno != EINTR && errno != EAGAIN)
         LOG_ERROR;
      return newsock;
      }
diff --git a/svdrphosts.conf b/svdrphosts.conf
new file mode 100644
index 000000000..dec9c42a0
--- /dev/null
+++ b/svdrphosts.conf
@@ -0,0 +1,13 @@
+#
+# svdrphosts    This file describes a number of host addresses that
+#               are allowed to connect to the SVDRP port of the Video
+#               Disk Recorder (VDR) running on this system.
+# Syntax:
+#    
+# IP-Address[/Netmask]
+#
+
+127.0.0.1             # always accept localhost
+#192.168.100.0/24     # any host on the local net
+#204.152.189.113      # a specific host
+#0.0.0.0/0            # any host on any net (USE THIS WITH CARE!)
diff --git a/tools.c b/tools.c
index dc579e55f..441c5ce87 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.53 2002/01/27 12:36:23 kls Exp $
+ * $Id: tools.c 1.56 2002/02/03 16:44:08 kls Exp $
  */
 
 #include "tools.h"
@@ -13,6 +13,7 @@
 #include <errno.h>
 #if defined(DEBUG_OSD)
 #include <ncurses.h>
+#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
 #endif
 #include <stdlib.h>
 #include <sys/time.h>
@@ -100,6 +101,23 @@ char *strreplace(char *s, char c1, char c2)
   return s;
 }
 
+char *strreplace(char *s, const char *s1, const char *s2)
+{
+  char *p = strstr(s, s1);
+  if (p) {
+     int of = p - s;
+     int l  = strlen(s);
+     int l1 = strlen(s1);
+     int l2 = strlen(s2);
+     if (l2 > l1)
+        s = (char *)realloc(s, strlen(s) + l2 - l1 + 1);
+     if (l2 != l1)
+        memmove(s + of + l2, s + of + l1, l - of - l1 + 1);
+     strncpy(s + of, s2, l2);
+     }
+  return s;
+}
+
 char *skipspace(const char *s)
 {
   while (*s && isspace(*s))
@@ -404,9 +422,8 @@ char *ReadLink(const char *FileName)
   if (n < 0) {
      if (errno == ENOENT || errno == EINVAL) // file doesn't exist or is not a symlink
         TargetName = FileName;
-     else { // some other error occurred
+     else // some other error occurred
         LOG_ERROR_STR(FileName);
-        }
      }
   else if (n < int(sizeof(RealName))) { // got it!
      RealName[n] = 0;
diff --git a/tools.h b/tools.h
index f9390185b..9663a8edd 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.39 2002/01/26 15:38:10 kls Exp $
+ * $Id: tools.h 1.41 2002/02/03 12:36:25 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -20,9 +20,9 @@
 
 extern int SysLogLevel;
 
-#define esyslog if (SysLogLevel > 0) syslog
-#define isyslog if (SysLogLevel > 1) syslog
-#define dsyslog if (SysLogLevel > 2) syslog
+#define esyslog(a...) void( (SysLogLevel > 0) ? syslog(a) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? syslog(a) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog(a) : void() )
 
 #define LOG_ERROR         esyslog(LOG_ERR, "ERROR (%s,%d): %m", __FILE__, __LINE__)
 #define LOG_ERROR_STR(s)  esyslog(LOG_ERR, "ERROR: %s: %m", s)
@@ -47,6 +47,7 @@ char *readline(FILE *f);
 char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
+char *strreplace(char *s, const char *s1, const char *s2); // re-allocates 's' and deletes the original string if necessary!
 char *skipspace(const char *s);
 char *stripspace(char *s);
 char *compactspace(char *s);
diff --git a/vdr.c b/vdr.c
index 5351e4095..670246a4b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.93 2002/01/26 14:07:01 kls Exp $
+ * $Id: vdr.c 1.94 2002/02/02 15:50:43 kls Exp $
  */
 
 #include <getopt.h>
@@ -272,6 +272,7 @@ int main(int argc, char *argv[])
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
+  SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
 #if defined(REMOTE_LIRC)
   Keys.SetDummyValues();
 #elif !defined(REMOTE_NONE)

From a1da0e5c5de55009716e2c327dda16c61c1dae83 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 10 Feb 2002 18:00:00 +0100
Subject: [PATCH 034/307] =?UTF-8?q?Version=200.99=20-=20Fixed=20a=20bug=20?=
 =?UTF-8?q?in=20moving=20timers=20or=20channels=20to=20the=20last=20positi?=
 =?UTF-8?q?on=20in=20the=20list=20=20=20(thanks=20to=20Matthias=20Schniede?=
 =?UTF-8?q?rmeyer=20for=20helping=20to=20debug=20this=20one).=20-=20Change?=
 =?UTF-8?q?d=20the=20estimated=20data=20rate=20for=20calculating=20the=20r?=
 =?UTF-8?q?emaining=20disk=20capacity=20=20=20to=2025.75=20MB/min.=20-=20O?=
 =?UTF-8?q?nly=20reporting=20the=20'EPG=20bugfix=20statistics'=20if=20ther?=
 =?UTF-8?q?e=20really=20were=20any=20fixes.=20-=20Added=20Finnish=20langua?=
 =?UTF-8?q?ge=20texts=20(thanks=20to=20Hannu=20Savolainen).=20-=20Reverted?=
 =?UTF-8?q?=20to=20the=20previous=20way=20of=20searching=20for=20the=20EPG?=
 =?UTF-8?q?=20record=20of=20the=20current=20=20=20recording=20in=20case=20?=
 =?UTF-8?q?of=20a=20periodic=20timer=20(i.e.=20taking=20the=20one=20that?=
 =?UTF-8?q?=20is=20in=20the=20=20=20middle=20between=20start=20and=20end?=
 =?UTF-8?q?=20time).=20-=20Added=20a=20typedef=20for=20'in=5Faddr=5Ft'=20t?=
 =?UTF-8?q?o=20make=20it=20work=20with=20glibc=20<=202.2=20(thanks=20to=20?=
 =?UTF-8?q?=20=20J=FCrgen=20Schmidt).=20-=20When=20the=20last=20entry=20in?=
 =?UTF-8?q?=20a=20"Recordings"=20menu=20page=20is=20deleted,=20that=20page?=
 =?UTF-8?q?=20is=20now=20=20=20automatically=20closed=20(suggested=20by=20?=
 =?UTF-8?q?Uwe=20Freese).=20-=20Changed=20the=20default=20name=20for=20ins?=
 =?UTF-8?q?tant=20recordings=20to=20"TITLE=20EPISODE"=20(avoiding=20=20=20?=
 =?UTF-8?q?the=20'-').=20-=20If=20Setup.ShowInfoOnChSwitch=20is=20set=20to?=
 =?UTF-8?q?=20"no",=20the=20box=20for=20the=20EPG=20display=20is=20no=20?=
 =?UTF-8?q?=20=20longer=20shown=20(thanks=20to=20Andy=20Grobb).=20-=20If?=
 =?UTF-8?q?=20compiled=20with=20VFAT=3D1,=20characters=20that=20can't=20be?=
 =?UTF-8?q?=20handled=20by=20a=20VFAT=20system=20are=20=20=20now=20encoded?=
 =?UTF-8?q?=20to=20'#XX'.=20-=20When=20the=20user=20presses=20the=20"Power?=
 =?UTF-8?q?"=20button=20and=20there=20is=20a=20timer=20about=20to=20start?=
 =?UTF-8?q?=20=20=20recording=20within=20Setup.MinEventTimeout=20minutes,?=
 =?UTF-8?q?=20there=20is=20now=20a=20confirmation=20=20=20prompt=20telling?=
 =?UTF-8?q?=20the=20user=20that=20there=20is=20an=20upcoming=20timer=20eve?=
 =?UTF-8?q?nt.=20-=20If=20a=20recording=20has=20no=20episode=20title,=20th?=
 =?UTF-8?q?e=20trailing=20'~'=20is=20no=20longer=20shown=20in=20=20=20the?=
 =?UTF-8?q?=20progress=20display.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  16 +++++
 HISTORY       |  27 ++++++++
 channels.conf |   1 +
 config.c      |   4 +-
 config.h      |   6 +-
 eit.c         |  47 +++++++------
 gmon.out      | Bin 101224 -> 0 bytes
 i18n.c        | 182 ++++++++++++++++++++++++++++++++++++++++++++++++--
 menu.c        |  27 ++++++--
 recording.c   |  83 ++++++++++++++++++++---
 tools.c       |   6 +-
 vdr.c         |  11 ++-
 12 files changed, 359 insertions(+), 51 deletions(-)
 delete mode 100644 gmon.out

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e0b9ee1c9..9ccf53db1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -47,6 +47,7 @@ Matthias Schniedermeyer <ms@citd.de>
  for implementing the 'MarkInstantRecord' setup option
  for his "schnitt" tools
  for his "master-timer" tool
+ for helping to debug the "move to last position in list" bug
 
 Miha Setina <mihasetina@softhome.net>
  for translating the OSD texts to the Slovenian language
@@ -161,6 +162,7 @@ Simon Bauschulte <SemiSchwabe@Brutzel.de>
 
 Andy Grobb <Charly98@01019freenet.de>
  for completing storing the current audio volume in the setup.conf file
+ for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no"
 
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
@@ -189,3 +191,17 @@ Davide Achilli <davide@objsystem.it>
 
 Michael Paar <mpaar@uumail.de>
  for enabling recording of radio channels
+
+Hannu Savolainen <hannu@opensound.com>
+ for translating the OSD texts to the Finnish language
+
+J�rgen Schmidt <ju@ct.heise.de>
+ for fixing a problem with 'in_addr_t' on systems with glibc < 2.2.
+
+Uwe Freese <mail@uwe-freese.de>
+ for suggesting to automatically close an empty recordings page after deleting
+ an entry
+
+Rainer Zocholl <Usenet-372114@zocki.toppoint.de>
+ for suggesting a confirmation prompt when the user presses the "Power" button
+ and there is an upcoming timer event
diff --git a/HISTORY b/HISTORY
index bf8ce2c9c..b2b3a9e14 100644
--- a/HISTORY
+++ b/HISTORY
@@ -969,3 +969,30 @@ Video Disk Recorder Revision History
   radio recordings. Thanks to Michael Paar.
 - Fixed a problem with the ERR macro defined by ncurses.h (thanks to Artur
   Skawina).
+
+2002-02-10: Version 0.99
+
+- Fixed a bug in moving timers or channels to the last position in the list
+  (thanks to Matthias Schniedermeyer for helping to debug this one).
+- Changed the estimated data rate for calculating the remaining disk capacity
+  to 25.75 MB/min.
+- Only reporting the 'EPG bugfix statistics' if there really were any fixes.
+- Added Finnish language texts (thanks to Hannu Savolainen).
+- Reverted to the previous way of searching for the EPG record of the current
+  recording in case of a periodic timer (i.e. taking the one that is in the
+  middle between start and end time).
+- Added a typedef for 'in_addr_t' to make it work with glibc < 2.2 (thanks to
+  J�rgen Schmidt).
+- When the last entry in a "Recordings" menu page is deleted, that page is now
+  automatically closed (suggested by Uwe Freese).
+- Changed the default name for instant recordings to "TITLE EPISODE" (avoiding
+  the '-').
+- If Setup.ShowInfoOnChSwitch is set to "no", the box for the EPG display is no
+  longer shown (thanks to Andy Grobb).
+- If compiled with VFAT=1, characters that can't be handled by a VFAT system are
+  now encoded to '#XX'.
+- When the user presses the "Power" button and there is a timer about to start
+  recording within Setup.MinEventTimeout minutes, there is now a confirmation
+  prompt telling the user that there is an upcoming timer event.
+- If a recording has no episode title, the trailing '~' is no longer shown in
+  the progress display.
diff --git a/channels.conf b/channels.conf
index 87796ae26..8d58e61d9 100644
--- a/channels.conf
+++ b/channels.conf
@@ -200,3 +200,4 @@ VIVA2:12552:v:0:22000:171:172:0:0:12120
 MTV German:12699:v:0:22000:3031:3032:0:0:28643
 IFA-TV:10832:h:0:22000:132:133:32:0:7251
 QVC Germany:12552:v:0:22000:165:166:0:0:12100
+TANGOTV:10832:h:1:22000:61:62:0:0:61920
diff --git a/config.c b/config.c
index 974aed0c2..8b5c454fe 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.82 2002/02/03 15:25:44 kls Exp $
+ * $Id: config.c 1.83 2002/02/10 11:39:00 kls Exp $
  */
 
 #include "config.h"
@@ -847,7 +847,7 @@ cSetup::cSetup(void)
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
   MarkInstantRecord = 1;
-  strcpy(NameInstantRecord, "TITLE-EPISODE");
+  strcpy(NameInstantRecord, "TITLE EPISODE");
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
diff --git a/config.h b/config.h
index 325f4ef28..e2e2897fb 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.93 2002/02/03 15:16:21 kls Exp $
+ * $Id: config.h 1.95 2002/02/10 15:44:40 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.99pre5"
+#define VDRVERSION "0.99"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -174,6 +174,8 @@ class cCommand : public cListObject {
   const char *Execute(void);
   };
 
+typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
+
 class cSVDRPhost : public cListObject {
 private:
   struct in_addr addr;
diff --git a/eit.c b/eit.c
index 2860fc4c6..99bcdfff9 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.33 2002/02/02 12:12:26 kls Exp $
+ * $Id: eit.c 1.34 2002/02/09 14:48:43 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -352,7 +352,7 @@ void cEventInfo::Dump(FILE *f, const char *Prefix) const
       }
 }
 
-#define MAXEPGBUGFIXSTATS 6
+#define MAXEPGBUGFIXSTATS 5
 #define MAXEPGBUGFIXCHANS 50
 struct tEpgBugFixStats {
   int hits;
@@ -381,32 +381,39 @@ static void EpgBugFixStat(int Number, unsigned int ServiceID)
 static void ReportEpgBugFixStats(bool Reset = false)
 {
   if (Setup.EPGBugfixLevel > 0) {
-     dsyslog(LOG_INFO, "=====================");
-     dsyslog(LOG_INFO, "EPG bugfix statistics");
-     dsyslog(LOG_INFO, "=====================");
-     dsyslog(LOG_INFO, "IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
-     dsyslog(LOG_INFO, "CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
-     dsyslog(LOG_INFO, "IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
-     dsyslog(LOG_INFO, "=====================");
-     dsyslog(LOG_INFO, "Fix\tHits\tChannels");
+     bool GotHits = false;
      char buffer[1024];
      for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) {
          const char *delim = "\t";
          tEpgBugFixStats *p = &EpgBugFixStats[i];
-         char *q = buffer;
-         q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
-         for (int c = 0; c < p->n; c++) {
-             cChannel *channel = Channels.GetByServiceID(p->serviceIDs[c]);
-             if (channel) {
-                q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->name);
-                delim = ", ";
+         if (p->hits) {
+            if (!GotHits) {
+               dsyslog(LOG_INFO, "=====================");
+               dsyslog(LOG_INFO, "EPG bugfix statistics");
+               dsyslog(LOG_INFO, "=====================");
+               dsyslog(LOG_INFO, "IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
+               dsyslog(LOG_INFO, "CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
+               dsyslog(LOG_INFO, "IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
+               dsyslog(LOG_INFO, "=====================");
+               dsyslog(LOG_INFO, "Fix\tHits\tChannels");
+               GotHits = true;
+               }
+            char *q = buffer;
+            q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
+            for (int c = 0; c < p->n; c++) {
+                cChannel *channel = Channels.GetByServiceID(p->serviceIDs[c]);
+                if (channel) {
+                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->name);
+                   delim = ", ";
+                   }
                 }
-             }
-         dsyslog(LOG_INFO, "%s", buffer);
+            dsyslog(LOG_INFO, "%s", buffer);
+            }
          if (Reset)
             p->hits = p->n = 0;
          }
-     dsyslog(LOG_INFO, "=====================");
+     if (GotHits)
+        dsyslog(LOG_INFO, "=====================");
      }
 }
 
diff --git a/gmon.out b/gmon.out
deleted file mode 100644
index ea79bc54bbd4e662e4d8c094175c3df7d5c3504b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 101224
zcmeI4@pGI-8OQJ1d+!#S!K6e88Zoq>(Fu5ML#Jwys|gy0IHa^wBMlhZD+CE8P}Hhn
zOxuhE2ymqlgGRm5j>MUaUTKgb6^^!QWTKM-!(_(HaG}?lAA%k<j&UZVexK*v_hm=_
z0T{o`WVp{gyU*@^cHiB-_lMqg=Uv;Qk^lNH`Bco*J(@88el8M8BerAP*1NW+cLb%v
z55X7wKMl|T4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk4
z01eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp
z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eQ<|DS<H&XE7-A3b+s{P^B6
z5RGuA-aE6wp3ndd&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk4
z01eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp
z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$
z&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk4
z01eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp
z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$
z&;Sk401eQ<`^P}^{nJ(Ulm=*k255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2
zfCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ
z255i=Xn+RZV+Nw7r(&jMbKJ;3;h@ky=)DV>Gcg}#e;zY?=i=r<DOUZ9nCV)QFfR-A
zABve}rMNKy`KNt2CNK-Q1raUQc{pZvUGJI28Ueii1q(x?eztOn6adNJ$Be?*voVuJ
zI||98erkmbAdA!rdBDl%Y@JEB*bG2=pv4wkNWFjrzloVGF*Mo&$O9Us2OWSC;9`js
zUqr7ZHS|R1Tqw``2{h6S*oS(Wtrf5`fKI?-)N7Cg{V(|=^`xCSfDBHd`ItXAg*Je=
zR@e!Ukt*~8rUMvoi_IL5nH4uD{K@J$;U`e>!+;7*n8FlbD<({#1bDN|PUF;XG3?*j
z+0J7IWEON$OyR=@OqfD;EM^X4JUZ;wg5S<^8PC0dhL<r6fi=@Hvo3DClLFkGu+UM&
z5CRwgL<6Wljgb!9b{YZg=$kg$;lh9mM*zt`*g7+S$AUVQSh*oIy3h$IM^Q~Z<U->W
zo+(}KnI$rWs!w@lCBD#NbuKiykanTRg+UiaT^M(v=t3mvG+OOK3Xp5G-5CK$N40M`
zz$^V0<^dCrTbNwonYSOdPz0>M%EByQ-G-nJVE=jxk(Kyxy@j$Xopve#m(<%x6W~B#
zC$-u$FCmF`X8>@^Oxz?FL1OP`J#+R}&){<;T87peZnuyI?77WC7I5}X3zeVq%<k=;
z!Sff1PF(GoWnG>r6Nscdv#QfGx67kxuzxJQ#_l2YF0{JP?LyXtS-{D^#Qhy<9w5Wk
z?J4#}-;P4M$!VwCg+Ui`E{wTQa3OV_XMPq-`0bQ8duBQqLK+Z`=LBHG4{UelzT}w-
z7}f5Wn>>@h(W+_(w6|O618lh2!T>%Tz)r5>^IPy?vz0jE!YrWc2^-nC6?Ks9>ARtK
z3LtgjI&*1168T6h5^V<L5z*B50**^jDOLoWZL<)&)sN^j9t0dfTRM%e0Wv76<H=$T
zly}%VqkwM&FaaoSPxz_p@vTJ8k#-iah>jzHHd_BRC&5lYm|*A*Oyf30rA{B#&El`x
zwKEKmMzsf10I8!;l42Nw4!aynGLOz`q#h6!YXXRPjr0S;Asn^Ev~P7-#_NKP4gq$c
zODbdxa2$P8Sc?TN5w+6+xEqZs415#wgF~XB0z*jc^z_6~IPq;Pm%qi$pH?6;=fb7m
zaU#WTJdHRp{9-Pc`<zH_m*38HqG}8vd#}RU-Jb5F3QYhxvlIpaEoeAahdRR+>g3TJ
z1#}^zP__qy!xw8{Bw7oQI=5{COad~1`(9XrtA~xe_{T&fI@0Tz0!I7z5){i@m=@^%
zp5Hg!YEA&cJ$@eW=KXd`s`23fhM}{N1jsq3kQTt7!aP1?(D3PhqS4+5{KzFM(as1!
z5?m`n@)AJ;g*jVHq546;&Nb(v*jm70WIIow-GYiA0PMk3>dYOKI>@FlX^Sb$18Tly
zi&Z`Z*MOO7WUF<d3D6EZ@8DsGwg3)6qCy(b6GS=y(?O&gkPRXkfV4C9aU>W5NCJfs
zTSwt2paP3YhcFIE1uzL{51<Hm6)Q`Nl>pg(3zhir7-mmrt^hcB%3d_rK8!_<3Darp
z1$_Qd3mL#Ar)@Fw2sV@e$_0X>tr?ID5_ABz6m6XrWRh)NQ?~)u2aR?B!UR2l-QTy3
z_Pa3T!mtZRTo`j<5|9bnDFI}^)*e*t!_>bOHy2$di^7FjfOPbO5}5}`M-{3DaESML
zKGXtMVa;h|4M5saXaPimNC!X~)kqpgM|iaL0!~4d?o~s8@GM!7VsF}xmJMRt2!^m0
zP(W0N(CNbD4?VN5&(^8=5q7>uEHna6J!4@8aQ=f9767mO%0kx=ihagDfLTE4Cl>Mm
zxuNKzxd15q)H7FuqGdnEdV4V8LoMLe#TFU?%O8!KbyBPwAa$-4$N)a}M%;&kfQf1Q
zLtqy0HqvYAc|d6dw^gYVL*>j>wg-KHmjJp&&jCtT2Um{+p4kh~ExPWPnBYv@@AVKs
ze&rxpB-)k4EeMxqg)Cqt8db;vmanvRjsW(pvXBS7g1f&KE3Sx}y+NH6%9kU(My3Gm
z=#s($pzx%HGGux(VmG@EKo}VT$fD4T*-=0bZfXh>fIPNB-J(r>{N4S!8X#NE1!yQ*
z3y|L>3MqhWH44pcqz!O3*zmgmVS;YASOyR#7;+<%QYRQ((MEKnu`AJ0Y+MSJfN*eY
zTxbSJN3~e53t2#zAm`S3&4r>{r+PKo3A$4Y2<N96AP<vzn_uHc)M(kK{W-ltyv1&W
zc>IXehpEzqS{K&3(BeYcg`F<+xsY`s=fVjWih%H^RRll%!y~i~Q22^{PTO2a-Vry)
zOz?XSu;UyHX+W5*8_@7wo1m)GNu2~N3+ik{k=^In1l2v5tiReiDZmXMu#sj!O#oT!
zImuw($>BqImb5((fA_?w$DR|O7%4z_E;Iw$g9LeiJPS)OC(&`hihc`)hx|D`S0au0
zR&MJT2($rYC&x7;5}g5P9f7`wZ8m{}fWwkaiveVXDAZx6jAZOcN3m&zP=#-Ipr~%q
z?H2Tf$`C+0s!MqRumXP?soCo!r~^nlS}gf=+}wgcU2kopakC%rb?MIBGjUToWFrym
z$SqOpx*QNrV-c|FSz9cI58(=_0^AeSsR1kt+8F}8dc@W_0XVtHrf$KvXWxqZyJhEd
zaq|wMx~cZLkaeN?*Vr8XZpV{(K5jC>&X)s(o9Z|~UQOt*tB*R76hOM8k?f!2`VK{*
z;6h|7ZdRc!jkMsjxB<FURV$zdLr};A!okf0WF6p29*MRV@Sr23Cg=f#-kNdTRN$C8
zBWtIKgH=viE!K^zik!3x^MD;#fI3+Mt26f4tvVAoyKwo@Vl!9+@~b*si)?lHAh&=!
z1iArobI?c@yPmu)+9OxP85{%0pRl`S4`wZ#k|g>iN9bwk+eW;nS^Y2DgCZXCrT?&y
z!~<J_>%R7F7*|$#Xm5~V&jTh9xp*nyAih0@w^{m%N+8*0Un&VaiI;f#3rt`UP7MDN
z3|NLk;yTGzR*}%z)^<h!NqGq&kxMUdy3=(b+QFjG$WFkSH|(Z5;6}25*YP?`i;cRG
zalrI8JDzk^LJtY;+W_D(yn0j^2W)uWLIEJRb&U*P<n$m9*uT|g+xQ_rn>y$Q><WY&
z0i2Ilbs8B5NH&F`4?Ee00h{oW)$cXnRK0aD4%iY1DFAZ8o4EzR#3oy;tQy_<vW0rU
z9^BM4TkpkiowN&S7SPaOSMLH~58mkMQttX_!rX(~klvn3H3_p1$D5vJndJ#{2zL=(
ziLI9<%-L4l?qq)205z9e=m1OvFb2q>9W6Fki#HxP8x(SY9xP{Vr|uK5gZG2l(IjAf
zo$Ylu;3O`N{ty7maa~cE0Z0OcHJ?nFcY<NhZ%&wYywTH$KyuL55vbX0>!h$g<!7wE
b1#QAx)9^4lg82+#ewzc4yU@-}{=@Vi&4&!s

diff --git a/i18n.c b/i18n.c
index 3d9089ae0..f2c414f00 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.51 2002/02/03 14:34:33 kls Exp $
+ * $Id: i18n.c 1.53 2002/02/10 15:07:46 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -12,6 +12,7 @@
  * Portugese translations provided by Paulo Manuel Martins Lopes <pmml@netvita.pt>
  * French    translations provided by Jean-Claude Repetto <jc@repetto.org>
  * Norwegian translations provided by J�rgen Tvedt <pjtvedt@online.no>
+ * Finnish   translations provided by Hannu Savolainen <hannu@opensound.com>
  *
  */
 
@@ -52,7 +53,7 @@
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 8;
+const int NumLanguages = 9;
 
 typedef const char *tPhrase[NumLanguages];
 
@@ -66,6 +67,7 @@ const tPhrase Phrases[] = {
     "Portugues",
     "Fran�ais",
     "Norsk",
+    "Suomi",
   },
   // Menu titles:
   { "Main",
@@ -76,6 +78,7 @@ const tPhrase Phrases[] = {
     "Principal",
     "Menu",
     "Hovedmeny",
+    "Valikko",
   },
   { "Schedule",
     "Programm",
@@ -85,6 +88,7 @@ const tPhrase Phrases[] = {
     "Programa",
     "Programmes",
     "Programmer",
+    "Ohjelmat",
   },
   { "Channels",
     "Kan�le",
@@ -94,6 +98,7 @@ const tPhrase Phrases[] = {
     "Canal",
     "Cha�nes",
     "Kanaler",
+    "Kanavat",
   },
   { "Timers",
     "Timer",
@@ -103,6 +108,7 @@ const tPhrase Phrases[] = {
     "Alarmes",
     "Programmation",
     "Timer",
+    "Ajastin",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -112,6 +118,7 @@ const tPhrase Phrases[] = {
     "Gravacoes",
     "Enregistrements",
     "Opptak",
+    "Nauhoitteet",
   },
   { "DVD",
     "DVD",
@@ -121,6 +128,7 @@ const tPhrase Phrases[] = {
     "DVD",
     "DVD",
     "DVD",
+    "DVD",
   },
   { "Setup",
     "Einstellungen",
@@ -130,6 +138,7 @@ const tPhrase Phrases[] = {
     "Configurar",
     "Configuration",
     "Konfigurasjon",
+    "Asetukset",
   },
   { "Commands",
     "Befehle",
@@ -139,6 +148,7 @@ const tPhrase Phrases[] = {
     "Comandos",
     "Commandes",
     "Kommandoer",
+    "Komennot",
   },
   { "Edit Channel",
     "Kanal Editieren",
@@ -148,6 +158,7 @@ const tPhrase Phrases[] = {
     "Modificar Canal",
     "Modifier une cha�ne",
     "Editer Kanal",
+    "Muokkaa kanavaa",
   },
   { "Edit Timer",
     "Timer Editieren",
@@ -157,6 +168,7 @@ const tPhrase Phrases[] = {
     "Modificar Alarme",
     "Changer la programmation",
     "Editer Timer",
+    "Muokkaa ajastusta",
   },
   { "Event",
     "Sendung",
@@ -165,7 +177,8 @@ const tPhrase Phrases[] = {
     "Uitzending",
     "Evento",
     "Ev�nement",
-    "Hendelse"
+    "Hendelse",
+    "Tapahtuma",
   },
   { "Summary",
     "Inhalt",
@@ -175,6 +188,7 @@ const tPhrase Phrases[] = {
     "Resumo",
     "R�sum�",
     "Sammendrag",
+    "Yhteenveto",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -184,6 +198,7 @@ const tPhrase Phrases[] = {
     "Programa - %s",
     "Programmes - %s",
     "Program Guide - %s",
+    "Ohjelma - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -193,6 +208,7 @@ const tPhrase Phrases[] = {
     "O que ver agora?",
     "Programmes en cours",
     "Hvilket program sendes n�?",
+    "Nykyinen ohjelma",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -202,6 +218,7 @@ const tPhrase Phrases[] = {
     "O que ver depois?",
     "Prochains programmes",
     "Hvilket program er neste?",
+    "Seuraava ohjelma",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -212,6 +229,7 @@ const tPhrase Phrases[] = {
     "Modificar",
     "Modifier",
     "Editer",
+    "Muuta",
   },
   { "New",
     "Neu",
@@ -221,6 +239,7 @@ const tPhrase Phrases[] = {
     "Novo",
     "Nouveau",
     "Ny",
+    "Uusi",
   },
   { "Delete",
     "L�schen",
@@ -230,6 +249,7 @@ const tPhrase Phrases[] = {
     "Apagar",
     "Supprimer",
     "Slett",
+    "Poista",
   },
   { "Mark",
     "Markieren",
@@ -239,6 +259,7 @@ const tPhrase Phrases[] = {
     "Marcar",
     "Marquer",
     "Marker",
+    "Merkitse",
   },
   { "Record",
     "Aufnehmen",
@@ -248,6 +269,7 @@ const tPhrase Phrases[] = {
     "Gravar",
     "Enregistre",
     "Ta opp",
+    "Nauhoita",
   },
   { "Play",
     "Wiedergabe",
@@ -257,6 +279,7 @@ const tPhrase Phrases[] = {
     "Play",
     "Lire",
     "Spill av",
+    "Toista",
   },
   { "Rewind",
     "Anfang",
@@ -266,6 +289,7 @@ const tPhrase Phrases[] = {
     "Rebobinar",
     "Retour",
     "Spol tilbake",
+    "Takaisinkel.",
   },
   { "Resume",
     "Weiter",
@@ -275,6 +299,7 @@ const tPhrase Phrases[] = {
     "Continuar",
     "Reprendre",
     "Fortsett",
+    "Jatka",
   },
   { "Summary",
     "Inhalt",
@@ -284,6 +309,7 @@ const tPhrase Phrases[] = {
     "Resumo",
     "R�sum�",
     "Sammendrag",
+    "Yhteenveto",
   },
   { "Open",
     "�ffnen",
@@ -293,6 +319,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Avaa",
   },
   { "Switch",
     "Umschalten",
@@ -302,6 +329,7 @@ const tPhrase Phrases[] = {
     "Seleccionar",
     "Regarder",
     "Skift til",
+    "Valitse",
   },
   { "Now",
     "Jetzt",
@@ -311,6 +339,7 @@ const tPhrase Phrases[] = {
     "Agora",
     "Maintenant",
     "N�",
+    "Nyt",
   },
   { "Next",
     "N�chste",
@@ -320,6 +349,7 @@ const tPhrase Phrases[] = {
     "Proximo",
     "Apr�s",
     "Neste",
+    "Seuraava",
   },
   { "Schedule",
     "Programm",
@@ -329,6 +359,7 @@ const tPhrase Phrases[] = {
     "Programa",
     "Programme",
     "Programmer",
+    "Ohjelmisto",
   },
   { "Language",
     "Sprache",
@@ -338,6 +369,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Langue",
     "Spr�k",
+    "Kieli",
   },
   { "Eject",
     "Auswerfen",
@@ -347,6 +379,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Ejection",
     "", // TODO
+    "Avaa",
   },
   // Confirmations:
   { "Delete channel?",
@@ -357,6 +390,7 @@ const tPhrase Phrases[] = {
     "Apagar o Canal?",
     "Supprimer la cha�ne?",
     "Slette kanal?",
+    "Poistetaanko kanava?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -366,6 +400,7 @@ const tPhrase Phrases[] = {
     "Apagar o Alarme?",
     "Supprimer la programmation?",
     "Slette timer?",
+    "Poistetaanko ajastus?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -375,6 +410,7 @@ const tPhrase Phrases[] = {
     "Apagar Gravac�o?",
     "Supprimer l'enregistrement?",
     "Slette opptak?",
+    "Poistetaanko nauhoitus?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -384,6 +420,7 @@ const tPhrase Phrases[] = {
     "Parar Gravac�o?",
     "Arr�ter l'enregistrement?",
     "Stoppe opptak?",
+    "Pys�ytet��nk� nauhoitus?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -393,6 +430,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "p��vastaanottimella",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -401,7 +439,8 @@ const tPhrase Phrases[] = {
     "Bewerken afbreken?",
     "Cancelar Modificar?",
     "Annuler les modifications?",
-    "Avbryte redigering",
+    "Avbryte redigering?",
+    "Peruutetaanko muokkaus?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -411,6 +450,17 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Nauhoitus kesken - lopetetaanko se?",
+  },
+  { "Recording in %d minutes, shut down anyway?",
+    "Aufnahme in %d Minuten - trotzdem ausschalten?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -420,6 +470,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Peruuta pys�ytys painamalla jotakin n�pp�int�",
   },
   // Channel parameters:
   { "Name",
@@ -430,6 +481,7 @@ const tPhrase Phrases[] = {
     "Nome",
     "Nom",
     "Navn",
+    "Nimi",
   },
   { "Frequency",
     "Frequenz",
@@ -439,6 +491,7 @@ const tPhrase Phrases[] = {
     "Frequencia",
     "Fr�quence",
     "Frekvens",
+    "Taajuus",
   },
   { "Polarization",
     "Polarisation",
@@ -448,6 +501,7 @@ const tPhrase Phrases[] = {
     "Polarizacao",
     "Polarisation",
     "Polaritet",
+    "Polarisaatio",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -457,6 +511,7 @@ const tPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -466,6 +521,7 @@ const tPhrase Phrases[] = {
     "Srate",
     "Fr�q. Symbole",
     "Symbolrate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -475,6 +531,7 @@ const tPhrase Phrases[] = {
     "Vpid",
     "PID Vid�o",
     "Video pid",
+    "Kuva PID",
   },
   { "Apid1",
     "Apid1",
@@ -484,6 +541,7 @@ const tPhrase Phrases[] = {
     "Apid1",
     "PID Audio (1)",
     "Audio pid1",
+    "��ni PID1",
   },
   { "Apid2",
     "Apid2",
@@ -493,6 +551,7 @@ const tPhrase Phrases[] = {
     "Apid2",
     "PID Audio (2)",
     "Audio pid2",
+    "��ni PID2",
   },
   { "Dpid1",
     "Dpid1",
@@ -502,6 +561,7 @@ const tPhrase Phrases[] = {
     "Dpid1",
     "PID AC3 (1)",
     "AC3 pid1",
+    "AC3 PID1",
   },
   { "Dpid2",
     "Dpid2",
@@ -511,6 +571,7 @@ const tPhrase Phrases[] = {
     "Dpid2",
     "PID AC3 (2)",
     "AC3 pid2",
+    "AC3 PID2",
   },
   { "Tpid",
     "Tpid",
@@ -520,6 +581,7 @@ const tPhrase Phrases[] = {
     "Tpid",
     "PID T�l�texte",
     "Teletext pid",
+    "TekstiTV PID",
   },
   { "CA",
     "CA",
@@ -529,6 +591,7 @@ const tPhrase Phrases[] = {
     "CA",
     "Cryptage",
     "Kortleser",
+    "Salauskortti",
   },
   { "Pnr",
     "Pnr",
@@ -538,6 +601,7 @@ const tPhrase Phrases[] = {
     "Pnr",
     "Num. Progr.",
     "Program Id",
+    "Ohjelmatunnus",
   },
   // Timer parameters:
   { "Active",
@@ -548,6 +612,7 @@ const tPhrase Phrases[] = {
     "Activo",
     "Actif",
     "Aktiv",
+    "Aktiivinen",
   },
   { "Channel",
     "Kanal",
@@ -557,6 +622,7 @@ const tPhrase Phrases[] = {
     "Canal",
     "Cha�ne",
     "Kanal",
+    "Kanava",
   },
   { "Day",
     "Tag",
@@ -566,6 +632,7 @@ const tPhrase Phrases[] = {
     "Dia",
     "Jour",
     "Dag",
+    "P�iv�",
   },
   { "Start",
     "Anfang",
@@ -575,6 +642,7 @@ const tPhrase Phrases[] = {
     "Inicio",
     "D�but",
     "Start",
+    "Aloitus",
   },
   { "Stop",
     "Ende",
@@ -584,6 +652,7 @@ const tPhrase Phrases[] = {
     "Fim",
     "Fin",
     "Slutt",
+    "Lopetus",
   },
   { "Priority",
     "Priorit�t",
@@ -593,6 +662,7 @@ const tPhrase Phrases[] = {
     "Prioridade",
     "Priorit�",
     "Prioritet",
+    "Prioriteetti",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -602,6 +672,7 @@ const tPhrase Phrases[] = {
     "Duracao",
     "Dur�e de vie",
     "Levetid",
+    "Voimassaolo",
   },
   { "File",
     "Datei",
@@ -611,6 +682,7 @@ const tPhrase Phrases[] = {
     "Ficheiro",
     "Fichier",
     "Filnavn",
+    "Tiedosto",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -619,8 +691,9 @@ const tPhrase Phrases[] = {
     "Canale occupato da un timer!",
     "Kanaal wordt gebruikt door een timer!",
     "Canal a ser utilizador por um alarme!",
-    "Cette cha�ne est en cours d'utilisation!"
+    "Cette cha�ne est en cours d'utilisation!",
     "Kanalen er i bruk av en timer!",
+    "Kanava on ajastimen k�yt�ss�!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -630,6 +703,7 @@ const tPhrase Phrases[] = {
     "Nao pode mudar de canal!",
     "Impossible de changer de cha�ne!",
     "Ikke mulig � skifte kanal!",
+    "Kanavan vaihtaminen ei mahdollista!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -639,6 +713,7 @@ const tPhrase Phrases[] = {
     "Alarme a gravar!",
     "Enregistrement en cours!",
     "Timer gj�r opptak!",
+    "Ajastinnauhoitus k�ynniss�!",
   },
   { "Error while accessing recording!",
     "Fehler beim ansprechen der Aufzeichnung!",
@@ -648,6 +723,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Nauhoituksen toistaminen ep�onnistui!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -657,6 +733,7 @@ const tPhrase Phrases[] = {
     "Erro enquanto apagava uma gravacao!",
     "Erreur de suppression de l'enregistrement!",
     "Feil under sletting av opptak!",
+    "Nauhoituksen poistaminen ep�onnistui!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -666,6 +743,7 @@ const tPhrase Phrases[] = {
     "*** Canal Invalido! ***",
     "*** Cha�ne invalide! ***",
     "*** Ugyldig Kanal! ***",
+    "*** Virheellinen kanavavalinta! ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -674,7 +752,8 @@ const tPhrase Phrases[] = {
     "Geen vrije DVB kaart om op te nemen!",
     "Nenhuma placa DVB disponivel para gravar!",
     "Pas de carte DVB disponible pour l'enregistrement!",
-    "Ingen ledige DVB enheter for opptak!"
+    "Ingen ledige DVB enheter for opptak!",
+    "Ei vapaata vastaanotinta nauhoitusta varten!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -684,6 +763,7 @@ const tPhrase Phrases[] = {
     "Canal bloqueado (a gravar)!",
     "Cha�ne verrouill�e (enregistrement en cours)!",
     "Kanalen er l�st (opptak)!",
+    "Kanava lukittu (nauhoitusta varten)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -693,6 +773,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "K�sitt�m�tt�mi� teknisi� ongelmia!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -702,6 +783,7 @@ const tPhrase Phrases[] = {
     "Nao pode iniciar a modificacao!",
     "Impossible de commencer le montage!",
     "Kan ikke starte redigeringsprosessen!",
+    "Muokkauksen aloittaminen ei onnistu!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -711,6 +793,7 @@ const tPhrase Phrases[] = {
     "Processo de modificacao ja activo!",
     "Montage d�j� en cours!",
     "Redigeringsprosessen er allerede aktiv!",
+    "Muokkaus on jo k�ynniss�!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -720,6 +803,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Ei voida sammuttaa '-s' parametria ei annettu!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -729,6 +813,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Kovalevy l�hes t�ynn�!",
   },
   // Setup parameters:
   { "OSD-Language",
@@ -739,6 +824,7 @@ const tPhrase Phrases[] = {
     "Linguagem OSD",
     "Langue OSD",
     "OSD Spr�k",
+    "N�yt�n kieli",
   },
   { "PrimaryDVB",
     "Prim�res Interface",
@@ -748,6 +834,7 @@ const tPhrase Phrases[] = {
     "DVB primario",
     "Premi�re carte DVB",
     "Hoved DVB-enhet",
+    "Ensisij. vast.otin",
   },
   { "ShowInfoOnChSwitch",
     "Info zeigen",
@@ -757,6 +844,7 @@ const tPhrase Phrases[] = {
     "Mostrar info ao mudar de Canal",
     "Affichage progr. en cours",
     "Info ved kanalskifte",
+    "N�yt� kanavainfo",
   },
   { "MenuScrollPage",
     "Seitenweise scrollen",
@@ -766,6 +854,7 @@ const tPhrase Phrases[] = {
     "Scroll da pagina no menu",
     "Affichage progr. suivant",
     "Rask rulling i menyer",
+    "Valikkojen rullaus",
   },
   { "MarkInstantRecord",
     "Direktaufz. markieren",
@@ -775,6 +864,7 @@ const tPhrase Phrases[] = {
     "Marca de gravacao",
     "Enregistrement imm�diat",
     "Markere direkteopptak",
+    "Merkitse v�lit�n nauh.",
   },
   { "NameInstantRecord",
     "Direktaufz. benennen",
@@ -784,6 +874,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Nime� v�lit�n nauh.",
   },
   { "LnbSLOF",
     "LnbSLOF",
@@ -793,6 +884,7 @@ const tPhrase Phrases[] = {
     "LnbSLOF",
     "Limite de bandes LNB",
     "LO-grensefrekvens",
+    "LnbSLOF",
   },
   { "LnbFrequLo",
     "Untere LNB-Frequenz",
@@ -802,6 +894,7 @@ const tPhrase Phrases[] = {
     "Freq LO LNB",
     "Fr�quence basse LNB",
     "LO-frekvens i lavb�ndet",
+    "LO LNB taajuus",
   },
   { "LnbFrequHi",
     "Obere LNB-Frequenz",
@@ -811,6 +904,7 @@ const tPhrase Phrases[] = {
     "Freq HI LNB",
     "Fr�quence haute LNB",
     "LO-frekvens i h�yb�ndet",
+    "HI LNB taajuus",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -820,6 +914,7 @@ const tPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
   },
   { "SetSystemTime",
     "Systemzeit stellen",
@@ -829,6 +924,7 @@ const tPhrase Phrases[] = {
     "Ajustar relogio do sistema",
     "Ajuster l'heure du syst�me",
     "Juster system-klokken",
+    "Vastaanota kellonaika",
   },
   { "MarginStart",
     "Zeitpuffer bei Anfang",
@@ -838,6 +934,7 @@ const tPhrase Phrases[] = {
     "Margem de inicio",
     "Marge ant�rieure",
     "Opptaks margin (start)",
+    "Aloitusmarginaali",
   },
   { "MarginStop",
     "Zeitpuffer bei Ende",
@@ -847,6 +944,7 @@ const tPhrase Phrases[] = {
     "Margem de fim",
     "Marge post�rieure",
     "Opptaks margin (slutt)",
+    "Lopetusmarginaali",
   },
   { "EPGScanTimeout",
     "Zeit bis EPG Scan",
@@ -856,6 +954,7 @@ const tPhrase Phrases[] = {
     "Timeout EPG",
     "Temps maxi EPG",
     "Ledig tid f�r EPG-s�k",
+    "Ohjelmatied. odotusaika",
   },
   { "EPGBugfixLevel",
     "EPG Fehlerbereinigung",
@@ -865,6 +964,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "EPGBugfixLevel",
   },
   { "SVDRPTimeout",
     "SVDRP Timeout",
@@ -874,6 +974,7 @@ const tPhrase Phrases[] = {
     "Timeout SVDRP",
     "Temps maxi SVDRP",
     "Ubrukt SVDRP-levetid",
+    "SVDRP odotusaika",
   },
   { "SortTimers",
     "Timer sortieren",
@@ -883,6 +984,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "J�rjest� ajastimet",
   },
   { "PrimaryLimit",
     "Prim�r-Limit",
@@ -892,6 +994,7 @@ const tPhrase Phrases[] = {
     "Limite Primario",
     "Premi�re limite",
     "Prioritets grense HovedDVB",
+    "PrimaryLimit",
   },
   { "DefaultPriority",
     "Default Priorit�t",
@@ -901,6 +1004,7 @@ const tPhrase Phrases[] = {
     "Prioridade por defeito",
     "Priorit� par d�faut",
     "Normal prioritet (Timer)",
+    "Oletusprioriteetti",
   },
   { "DefaultLifetime",
     "Default Lebensdauer",
@@ -910,6 +1014,7 @@ const tPhrase Phrases[] = {
     "Validade por defeito",
     "Dur�e de vie par d�faut",
     "Normal levetid (Timer)",
+    "Oletus voimassaoloaika",
   },
   { "UseSubtitle",
     "Subtitle verwenden",
@@ -919,6 +1024,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Tekstitys k�yt�ss�",
   },
   { "RecordingDirs",
     "Aufn. Verzeichnisse",
@@ -928,6 +1034,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Nauhoitushakemistot",
   },
   { "VideoFormat",
     "Video Format",
@@ -937,6 +1044,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Format vid�o",
     "TV Format",
+    "Kuvamuoto",
   },
   { "ChannelInfoPos",
     "Kanal Info Position",
@@ -946,6 +1054,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Position infos cha�nes",
     "", // TODO
+    "Kanavainfon sijainti",
   },
   { "OSDwidth",
     "OSD Breite",
@@ -955,6 +1064,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Largeur affichage",
     "", // TODO
+    "Tekstin�yt�n leveys",
   },
   { "OSDheight",
     "OSD H�he",
@@ -964,6 +1074,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Hauteur affichage",
     "", // TODO
+    "Tekstin�yt�n korkeus",
   },
   { "OSDMessageTime",
     "OSD Nachricht Dauer",
@@ -973,6 +1084,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Ilmoitusten n�kymisaika",
   },
   { "MaxVideoFileSize",
     "Max. Video Dateigr��e",
@@ -982,6 +1094,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Maksimi tiedoston koko",
   },
   { "SplitEditedFiles",
     "Editierte Dateien zerteilen",
@@ -991,6 +1104,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Paloittele muokatut",
   },
   { "MinEventTimeout",
     "Mindest Event Pause",
@@ -1000,6 +1114,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Minimi tapahtuman odotus",
   },
   { "MinUserInactivity",
     "Mindest User Inaktivit�t",
@@ -1009,6 +1124,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Minimi k�ytt�j�n odotus",
   },
   { "MultiSpeedMode",
     "MultiSpeed Modus",
@@ -1018,6 +1134,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Moninopeustila",
   },
   { "ShowReplayMode",
     "Wiedergabe Status",
@@ -1027,6 +1144,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "N�yt� toiston tila",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -1037,6 +1155,7 @@ const tPhrase Phrases[] = {
     "STQQSSD",
     "LMMJVSD",
     "MTOTFLS",
+    "MTKTPLS",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -1046,6 +1165,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "MaaTiiKesTorPerLauSun",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -1056,6 +1176,7 @@ const tPhrase Phrases[] = {
     "Aprender as teclas do telecomando",
     "Apprentissage des codes de t�l�commande",
     "L�re fjernkontrolltaster",
+    "Kaukos��timen n�pp�inten opettelu",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -1065,6 +1186,7 @@ const tPhrase Phrases[] = {
     "Fase 1: detectar tipo de receptor",
     "Phase 1: D�tection du type de code",
     "Fase 1: Finne fjernkontroll-kodetype",
+    "Vaihe 1: L�hetystavan selvitt�minen",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -1074,6 +1196,7 @@ const tPhrase Phrases[] = {
     "Pressione qualquer tecla do telecomando", 
     "Appuyer sur une touche de la t�l�commande",
     "Trykk en av tastene p� fjernkontrollen",
+    "Paina mit� tahansa kaukos��timen n�pp�int�",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -1083,6 +1206,7 @@ const tPhrase Phrases[] = {
     "Codigo do telecomando detectado!",
     "Code de la t�l�commande d�tect�!",
     "Fjernkontroll-kodetype funnet!",
+    "N�pp�inpainallus vastaanotettu!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -1092,6 +1216,7 @@ const tPhrase Phrases[] = {
     "Nao pressione nada...",
     "Ne pas appuyer sur une touche ...",
     "Ikke trykk p� noen av tastene...",
+    "�l� paina mit��n n�pp�int�...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -1101,6 +1226,7 @@ const tPhrase Phrases[] = {
     "Fase 2: A aprender codigos especificos",
     "Phase 2: Apprentissage des codes des touches",
     "Fase 2: L�re spesifikke tastekoder",
+    "Vaihe 2: N�pp�inkoodien opettelu",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -1110,6 +1236,7 @@ const tPhrase Phrases[] = {
     "Pressione tecla para '%s'",
     "Appuyer sur la touche '%s'",
     "Trykk tasten for '%s'",
+    "Paina n�pp�int� toiminnolle '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -1119,6 +1246,7 @@ const tPhrase Phrases[] = {
     "Pressione 'Cima' para confirmar",
     "Appuyer sur 'Haut' pour confirmer",
     "Trykk 'Opp' for � bekrefte",
+    "Paina 'Yl�s' hyv�ksy�ksesi",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -1128,6 +1256,7 @@ const tPhrase Phrases[] = {
     "Pressione 'Baixo' para continuar",
     "Appuyer sur 'Bas' pour continuer",
     "Trykk Ned' for � fortsette",
+    "Paina 'Alas' jatkaaksesi",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -1137,6 +1266,7 @@ const tPhrase Phrases[] = {
     "(Pressione 'Cima' para voltar)",
     "(Appuyer sur 'Haut' pour revenir en arri�re)",
     "(trykk 'Opp' for � g� tilbake)",
+    "(paina 'Yl�s' palataksesi takaisin)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -1146,6 +1276,7 @@ const tPhrase Phrases[] = {
     "(Pressione 'Baixo' para terminar a definicao)",
     "(Appuyer sur 'Bas' pour terminer)",
     "(trykk 'Ned' for � avslutte innl�ring)",
+    "(paina 'Alas' lopettaaksesi n�pp�inten opettelun)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -1155,6 +1286,7 @@ const tPhrase Phrases[] = {
     "Fase 3: A Salvar os codigos das teclas",
     "Phase 3: Sauvegarde des codes des touches",
     "Fase 3: Lagre tastekoder",
+    "Vaihe 3: N�pp�inkoodien tallettaminen",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -1164,6 +1296,7 @@ const tPhrase Phrases[] = {
     "'Cima' para Salvar, 'Baixo' para Cancelar",
     "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler",
     "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
+    "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
   },
   // Key names:
   { "Up",
@@ -1174,6 +1307,7 @@ const tPhrase Phrases[] = {
     "Cima",
     "Haut",
     "Opp",
+    "Yl�s",
   },
   { "Down",
     "Ab",
@@ -1183,6 +1317,7 @@ const tPhrase Phrases[] = {
     "Baixo",
     "Bas",
     "Ned",
+    "Alas",
   },
   { "Menu",
     "Men�",
@@ -1192,6 +1327,7 @@ const tPhrase Phrases[] = {
     "Menu",
     "Menu",
     "Meny",
+    "Valikko",
   },
   { "Ok",
     "Ok",
@@ -1201,6 +1337,7 @@ const tPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -1210,6 +1347,7 @@ const tPhrase Phrases[] = {
     "Voltar",
     "Retour",
     "Tilbake",
+    "Takaisin",
   },
   { "Left",
     "Links",
@@ -1219,6 +1357,7 @@ const tPhrase Phrases[] = {
     "Esquerda",
     "Gauche",
     "Venstre",
+    "Vasemmalle",
   },
   { "Right",
     "Rechts",
@@ -1228,6 +1367,7 @@ const tPhrase Phrases[] = {
     "Direita",
     "Droite",
     "H�yre",
+    "Oikealle",
   },
   { "Red",
     "Rot",
@@ -1237,6 +1377,7 @@ const tPhrase Phrases[] = {
     "Vermelho",
     "Rouge",
     "R�d",
+    "Punainen",
   },
   { "Green",
     "Gr�n",
@@ -1246,6 +1387,7 @@ const tPhrase Phrases[] = {
     "Verde",
     "Vert",
     "Gr�nn",
+    "Vihre�",
   },
   { "Yellow",
     "Gelb",
@@ -1255,6 +1397,7 @@ const tPhrase Phrases[] = {
     "Amarelo",
     "Jaune",
     "Gul",
+    "Keltainen",
   },
   { "Blue",
     "Blau",
@@ -1264,6 +1407,7 @@ const tPhrase Phrases[] = {
     "Azul",
     "Bleu",
     "Bl�",
+    "Sininen",
   },
   { "Power",
     "Ausschalten",
@@ -1273,6 +1417,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Virtakytkin",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -1282,6 +1427,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "��nenvoimakkuus+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -1291,6 +1437,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "��nenvoimakkuus-",
   },
   { "Mute",
     "Stumm",
@@ -1300,6 +1447,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "��nen vaimennus",
   },
   // Miscellaneous:
   { "yes",
@@ -1310,6 +1458,7 @@ const tPhrase Phrases[] = {
     "sim",
     "oui",
     "ja",
+    "kyll�",
   },
   { "no",
     "nein",
@@ -1319,6 +1468,7 @@ const tPhrase Phrases[] = {
     "nao",
     "non",
     "nei",
+    "ei",
   },
   { "top",
     "oben",
@@ -1328,6 +1478,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "haut",
     "", // TODO
+    "yl�",
   },
   { "bottom",
     "unten",
@@ -1337,6 +1488,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "bas",
     "", // TODO
+    "ala",
   },
   { "free",
     "frei",
@@ -1345,6 +1497,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "", // TODO
+    "vapaa",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -1353,6 +1507,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "", // TODO
+    "Hypp��",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -1362,6 +1518,7 @@ const tPhrase Phrases[] = {
     " Parar reproducao",
     " Arr�ter la lecture",
     " Stopp avspilling",
+    " Pys�yt� toisto",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -1371,6 +1528,7 @@ const tPhrase Phrases[] = {
     " Parar gravacao ",
     " Arr�ter l'enregistrement ",
     " Stopp opptak fra ",
+    " Pys�yt� nauhoitus ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -1380,6 +1538,7 @@ const tPhrase Phrases[] = {
     " Anular modificacao",
     " Annuler le montage",
     " Avbryt editering",
+    " Peruuta muokkaus",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -1388,7 +1547,8 @@ const tPhrase Phrases[] = {
     "Eerste DVB-kaart wordt omgeschakeld...",
     "A mudar placa DVB primaria...",
     "Changement de carte DVB principale...",
-    "Bytter hoved DVB-enhet... ",
+    "Bytter hoved DVB-enhet...",
+    "Vaihdetaan ensisijainen vastaanotin...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -1398,6 +1558,7 @@ const tPhrase Phrases[] = {
     "Cima/Baixo para nova localizacao - Ok para mudar",
     "Haut/Bas -> nouvelle place - OK -> d�placer",
     "Opp/Ned for ny plass - OK for � flytte",
+    "Yl�s/Alas = liiku, OK = siirr�",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -1407,6 +1568,7 @@ const tPhrase Phrases[] = {
     "Processo de modificacao iniciado",
     "Op�ration de montage lanc�e",
     "Redigeringsprosess startet",
+    "Muokkaus aloitettu",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -1415,6 +1577,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "", // TODO
+    "Muokkaus lopetettu",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -1423,6 +1587,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "", // TODO
+    "Muokkaus ep�onnistui",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -1431,6 +1597,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "", // TODO
+    "haetaan nauhoituksia...",
   },
   { NULL }
   };
diff --git a/menu.c b/menu.c
index 40ac1859d..a7a98ec38 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.148 2002/02/03 15:42:38 kls Exp $
+ * $Id: menu.c 1.152 2002/02/10 11:52:34 kls Exp $
  */
 
 #include "menu.h"
@@ -1680,6 +1680,8 @@ eOSState cMenuRecordings::Del(void)
                  cOsdMenu::Del(Current());
                  Recordings.Del(recording);
                  Display();
+                 if (!Count())
+                    return osBack;
                  }
               else
                  Interface->Error(tr("Error while deleting recording!"));
@@ -1707,6 +1709,7 @@ eOSState cMenuRecordings::Summary(void)
 
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
+  bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1720,6 +1723,13 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (Key == kYellow && HadSubMenu && !HasSubMenu()) {
+     // the last recording in a subdirectory was deleted, so let's go back up
+     cOsdMenu::Del(Current());
+     if (!Count())
+        return osBack;
+     Display();
+     }
   if (!HasSubMenu() && Key != kNone)
      SetHelpKeys();
   return state;
@@ -1944,13 +1954,14 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
 
   // Title with disk usage:
 
-#define MB_PER_MINUTE 30 // this is just an estimate!
+#define MB_PER_MINUTE 25.75 // this is just an estimate!
 
   char buffer[40];
   int FreeMB;
   int Percent = VideoDiskSpace(&FreeMB);
-  int Hours = int(double(FreeMB) / MB_PER_MINUTE / 60);
-  int Minutes = (FreeMB / MB_PER_MINUTE) % 60;
+  int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+  int Hours = Minutes / 60;
+  Minutes %= 60;
   snprintf(buffer, sizeof(buffer), "%s  -  Disk %d%%  -  %2d:%02d %s", tr("Main"), Percent, Hours, Minutes, tr("free"));
   SetTitle(buffer);
 
@@ -2113,10 +2124,11 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 {
   group = -1;
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
+  int EpgLines = withInfo ? 5 : 1;
   lines = 0;
   oldNumber = number = 0;
   cChannel *channel = Channels.GetByNumber(Number);
-  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
+  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   if (channel) {
      DisplayChannel(channel);
      DisplayInfo();
@@ -2131,7 +2143,8 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   oldNumber = cDvbApi::CurrentChannel();
   number = 0;
   lastTime = time_ms();
-  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
+  int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
+  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   ProcessKey(FirstKey);
 }
 
@@ -2340,7 +2353,7 @@ cRecordControl::~cRecordControl()
 bool cRecordControl::GetEventInfo(void)
 {
   cChannel *channel = Channels.GetByNumber(timer->channel);
-  time_t Time = timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60;
+  time_t Time = timer->IsSingleEvent() ? timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60 : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
         cThreadLock ThreadLock;
diff --git a/recording.c b/recording.c
index 7a55e1a7d..d82288756 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.49 2002/02/03 15:46:42 kls Exp $
+ * $Id: recording.c 1.51 2002/02/10 15:41:23 kls Exp $
  */
 
 #include "recording.h"
@@ -196,22 +196,82 @@ tCharExchange CharExchange[] = {
   { ' ',  '_'    },
   { '\'', '\x01' },
   { '/',  '\x02' },
-#ifdef VFAT
-  { ':',  '\x03' },
-#endif
   { 0, 0 }
   };
 
-char *ExchangeChars(char *s, bool ToFileSystem)
+static char *ExchangeChars(char *s, bool ToFileSystem)
 {
   char *p = s;
   while (*p) {
+#define VFAT 1
+#ifdef VFAT
+        // The VFAT file system can't handle all characters, so we
+        // have to take extra efforts to encode/decode them:
+        if (ToFileSystem) {
+           switch (*p) {
+                  // characters that can be used "as is":
+                  case '!':
+                  case '@':
+                  case '$':
+                  case '%':
+                  case '&':
+                  case '(':
+                  case ')':
+                  case '+':
+                  case ',':
+                  case '-':
+                  case '.':
+                  case ';':
+                  case '=':
+                  case '0' ... '9':
+                  case 'a' ... 'z':
+                  case 'A' ... 'Z': break;
+                  // characters that can be mapped to other characters:
+                  case ' ': *p = '_'; break;
+                  case '~': *p = '/'; break;
+                  // characters that have to be encoded:
+                  default: {
+                       int l = p - s;
+                       s = (char *)realloc(s, strlen(s) + 10);
+                       p = s + l;
+                       char buf[4];
+                       sprintf(buf, "#%02X", (unsigned char)*p);
+                       memmove(p + 2, p, strlen(p) + 1);
+                       strncpy(p, buf, 3);
+                       p += 2;
+                       }
+                  }
+           }
+        else {
+           switch (*p) {
+             // mapped characters:
+             case '_': *p = ' '; break;
+             case '/': *p = '~'; break;
+             // encodes characters:
+             case '#': {
+                  if (strlen(p) > 2) {
+                     char buf[3];
+                     sprintf(buf, "%c%c", *(p + 1), *(p + 2));
+                     unsigned char c = strtol(buf, NULL, 16);
+                     *p = c;
+                     memmove(p + 1, p + 3, strlen(p) - 2);
+                     }
+                  }
+                  break;
+             // backwards compatibility:
+             case '\x01': *p = '\''; break;
+             case '\x02': *p = '/';  break;
+             case '\x03': *p = ':';  break;
+             }
+           }
+#else
         for (struct tCharExchange *ce = CharExchange; ce->a && ce->b; ce++) {
             if (*p == (ToFileSystem ? ce->a : ce->b)) {
                *p = ToFileSystem ? ce->b : ce->a;
                break;
                }
             }
+#endif
         p++;
         }
   return s;
@@ -285,7 +345,7 @@ cRecording::cRecording(const char *FileName)
         name = new char[p - FileName + 1];
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
-        ExchangeChars(name, false);
+        name = ExchangeChars(name, false);
         }
      // read an optional summary file:
      char *SummaryFileName = NULL;
@@ -384,9 +444,9 @@ const char *cRecording::FileName(void)
   if (!fileName) {
      struct tm tm_r;
      struct tm *t = localtime_r(&start, &tm_r);
-     ExchangeChars(name, true);
+     name = ExchangeChars(name, true);
      asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
-     ExchangeChars(name, false);
+     name = ExchangeChars(name, false);
      }
   return fileName;
 }
@@ -399,7 +459,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
   if (Level < 0 || Level == HierarchyLevels()) {
      struct tm tm_r;
      struct tm *t = localtime_r(&start, &tm_r);
-     const char *s;
+     char *s;
      if (Level > 0 && (s = strrchr(name, '~')) != NULL)
         s++;
      else
@@ -413,6 +473,11 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
                             New,
                             Delimiter,
                             s);
+     // let's not display a trailing '~':
+     stripspace(titleBuffer);
+     s = &titleBuffer[strlen(titleBuffer) - 1];
+     if (*s == '~')
+        *s = 0;
      }
   else if (Level < HierarchyLevels()) {
      const char *s = name;
diff --git a/tools.c b/tools.c
index 441c5ce87..e95bdf8d2 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.56 2002/02/03 16:44:08 kls Exp $
+ * $Id: tools.c 1.57 2002/02/05 18:16:52 kls Exp $
  */
 
 #include "tools.h"
@@ -804,8 +804,10 @@ void cListBase::Move(cListObject *From, cListObject *To)
            To->Prev()->Append(From);
         From->Append(To);
         }
-     else
+     else {
         lastObject->Append(From);
+        lastObject = From;
+        }
      if (!From->Prev())
         objects = From;
      }
diff --git a/vdr.c b/vdr.c
index 670246a4b..9d5167b46 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.94 2002/02/02 15:50:43 kls Exp $
+ * $Id: vdr.c 1.95 2002/02/10 15:12:43 kls Exp $
  */
 
 #include <getopt.h>
@@ -494,13 +494,20 @@ int main(int argc, char *argv[])
                     else
                        LastActivity = 1;
                     }
+                 bool UserShutdown = key == kPower;
+                 if (UserShutdown && Next && Delta <= Setup.MinEventTimeout * 60 && !ForceShutdown) {
+                    char *buf;
+                    asprintf(&buf, tr("Recording in %d minutes, shut down anyway?"), Delta / 60);
+                    if (Interface->Confirm(buf))
+                       ForceShutdown = true;
+                    delete buf;
+                    }
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
                     if (timer)
                        dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next));
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
-                    bool UserShutdown = key == kPower;
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
                        int Channel = timer ? timer->channel : 0;
                        const char *File = timer ? timer->file : "";

From fb8e7fa302ef8a73feb6958b0cb32cc54f76e677 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 24 Feb 2002 18:00:00 +0100
Subject: [PATCH 035/307] Version 1.0.0pre1 - Added scanning for EPG data for
 another 4 days on channels that support this   (thanks to Oleg Assovski). -
 Removed '#define VFAT 1' from recording.c (was a leftover from testing). -
 Fixed the "Low disk space!" message (thanks to Sergei Haller). - Added the
 TPID to Hessen-3 in 'channels.conf' (thanks to Sergei Haller). - Fixed a
 crash when replaying with DEBUG_OSD=1 (thanks to Stefan Huelswitt). -
 Implemented the "First day" parameter for repeating timers. See FORMATS for  
 information about the enhanced 'timers.conf' file format, and MANUAL for   a
 description of the new item in the "Edit Timer" menu and the enhanced  
 functionality of the "Blue" button in the "Timers" menu. - When deleting a
 recording that is currently still being recorded, the related   timer will
 now automatically be terminated. If this is a repeating timer, it   will
 receive a "First day" setting that skips the timer for this day. - Fixed
 closing all unused file descriptors when opening a pipe (thanks to   Werner
 Fink). - Instant recordings now take the EPG data from the point in time at 5
 minutes   from the start time of the recording. In order for this to work the
 'active'   parameter of a timer now uses the second bit to indicate that this
 is an   "instant" recording (see FORMATS for details). - Fixed the SVDRP GRAB
 command in case the video device can't be opened (thanks   to Adrian
 Stabiszewski). - At startup the data written into 'epg.data' is now read into
 the EPG data   structures. In order for this to work, the 'E' record has been
 extended to   (optionally) contain the 'table ID' (see FORMATS for details).
 - The new SVDRP command PUTE can be used to put EPG data into the EPG list.  
 See FORMATS for details about the required data format. - Taking the German
 umlauts 'as is' when compiled with VFAT. - The new Setup parameter
 RecordDolbyDigital can be used to generally turn off   recording the Dolby
 Digital audio channels in case you want to save disk space   or don't have
 the equipment to replay Dolby Digital audio. - Reading the 'setup.conf' file
 no longer terminates in case of an error, but   rather attempts to read the
 rest of the file. - Removed DVD support from the core VDR source, since the
 current version from   Andreas Schultz is already much further developed (DVD
 menu navigation) and   the concept of "additional players" in VDR is going to
 change in version 1.1.0,   where a new "plugin" interface shall allow the
 easy implementation of new   players without having to patch the core VDR
 source. Until then, Andreas has   agreed to provide his DVD support as a
 completely external patch. - The contents of the distribution archive now
 contains the directory name with   the current version number, as in
 'vdr-1.0.0pre1/...' in order to avoid   inadvertently overwriting an existing
 VDR directory with a new version. - Added a missing error message in SVDRP
 command LSTC in case the given channel   can't be found.

---
 CONTRIBUTORS          |  10 +
 FORMATS               |  55 ++-
 HISTORY               |  48 ++-
 INSTALL               |  30 --
 MANUAL                |  43 +-
 Makefile              |  25 +-
 ac3dec/Makefile       |  28 --
 ac3dec/ac3.h          |  64 ---
 ac3dec/ac3_internal.h | 353 ----------------
 ac3dec/bit_allocate.c | 506 -----------------------
 ac3dec/bit_allocate.h |  24 --
 ac3dec/bitstream.c    |  79 ----
 ac3dec/bitstream.h    |  44 --
 ac3dec/bswap.h        |  80 ----
 ac3dec/cmplx.h        |  29 --
 ac3dec/coeff.c        | 431 --------------------
 ac3dec/coeff.h        |  24 --
 ac3dec/cpu_accel.c    | 129 ------
 ac3dec/crc.c          |  96 -----
 ac3dec/crc.h          |  27 --
 ac3dec/debug.c        |  48 ---
 ac3dec/debug.h        |  41 --
 ac3dec/decode.c       | 312 --------------
 ac3dec/decode.h       |  22 -
 ac3dec/dither.c       | 114 ------
 ac3dec/dither.h       |  37 --
 ac3dec/downmix.c      |  89 ----
 ac3dec/downmix.h      |  34 --
 ac3dec/downmix_c.c    | 161 --------
 ac3dec/downmix_c.h    |  32 --
 ac3dec/downmix_i386.S |  92 -----
 ac3dec/downmix_i386.h |  27 --
 ac3dec/downmix_kni.S  | 396 ------------------
 ac3dec/downmix_kni.h  |  32 --
 ac3dec/exponent.c     | 132 ------
 ac3dec/exponent.h     |  28 --
 ac3dec/imdct.c        | 530 ------------------------
 ac3dec/imdct.h        |  26 --
 ac3dec/imdct512_kni.S | 548 -------------------------
 ac3dec/imdct_c.c      | 218 ----------
 ac3dec/imdct_c.h      |  36 --
 ac3dec/imdct_kni.c    | 103 -----
 ac3dec/imdct_kni.h    |  36 --
 ac3dec/mm_accel.h     |  36 --
 ac3dec/parse.c        | 481 ----------------------
 ac3dec/parse.h        |  26 --
 ac3dec/rematrix.c     |  91 -----
 ac3dec/rematrix.h     |  25 --
 ac3dec/sanity_check.c | 124 ------
 ac3dec/sanity_check.h |  27 --
 ac3dec/srfft.c        | 305 --------------
 ac3dec/srfft.h        |  39 --
 ac3dec/srfft_kni.S    | 289 -------------
 ac3dec/srfft_kni.h    |  30 --
 ac3dec/srfft_kni_c.c  |  93 -----
 ac3dec/srfftp.h       | 305 --------------
 ac3dec/stats.c        | 178 --------
 ac3dec/stats.h        |  27 --
 channels.conf         |   2 +-
 config.c              |  75 +++-
 config.h              |  22 +-
 dvbapi.c              | 925 +-----------------------------------------
 dvbapi.h              |  19 +-
 dvd.c                 | 169 --------
 dvd.h                 |  62 ---
 eit.c                 | 136 ++++++-
 eit.h                 |  15 +-
 i18n.c                |  52 ++-
 menu.c                | 323 +++++++--------
 menu.h                |  28 +-
 osd.h                 |   3 +-
 recording.c           |  12 +-
 svdrp.c               |  80 +++-
 svdrp.h               |  17 +-
 thread.c              |  35 +-
 thread.h              |  18 +-
 tools.c               |  35 +-
 tools.h               |   3 +-
 vdr.c                 |  35 +-
 79 files changed, 733 insertions(+), 8628 deletions(-)
 delete mode 100644 ac3dec/Makefile
 delete mode 100644 ac3dec/ac3.h
 delete mode 100644 ac3dec/ac3_internal.h
 delete mode 100644 ac3dec/bit_allocate.c
 delete mode 100644 ac3dec/bit_allocate.h
 delete mode 100644 ac3dec/bitstream.c
 delete mode 100644 ac3dec/bitstream.h
 delete mode 100644 ac3dec/bswap.h
 delete mode 100644 ac3dec/cmplx.h
 delete mode 100644 ac3dec/coeff.c
 delete mode 100644 ac3dec/coeff.h
 delete mode 100644 ac3dec/cpu_accel.c
 delete mode 100644 ac3dec/crc.c
 delete mode 100644 ac3dec/crc.h
 delete mode 100644 ac3dec/debug.c
 delete mode 100644 ac3dec/debug.h
 delete mode 100644 ac3dec/decode.c
 delete mode 100644 ac3dec/decode.h
 delete mode 100644 ac3dec/dither.c
 delete mode 100644 ac3dec/dither.h
 delete mode 100644 ac3dec/downmix.c
 delete mode 100644 ac3dec/downmix.h
 delete mode 100644 ac3dec/downmix_c.c
 delete mode 100644 ac3dec/downmix_c.h
 delete mode 100644 ac3dec/downmix_i386.S
 delete mode 100644 ac3dec/downmix_i386.h
 delete mode 100644 ac3dec/downmix_kni.S
 delete mode 100644 ac3dec/downmix_kni.h
 delete mode 100644 ac3dec/exponent.c
 delete mode 100644 ac3dec/exponent.h
 delete mode 100644 ac3dec/imdct.c
 delete mode 100644 ac3dec/imdct.h
 delete mode 100644 ac3dec/imdct512_kni.S
 delete mode 100644 ac3dec/imdct_c.c
 delete mode 100644 ac3dec/imdct_c.h
 delete mode 100644 ac3dec/imdct_kni.c
 delete mode 100644 ac3dec/imdct_kni.h
 delete mode 100644 ac3dec/mm_accel.h
 delete mode 100644 ac3dec/parse.c
 delete mode 100644 ac3dec/parse.h
 delete mode 100644 ac3dec/rematrix.c
 delete mode 100644 ac3dec/rematrix.h
 delete mode 100644 ac3dec/sanity_check.c
 delete mode 100644 ac3dec/sanity_check.h
 delete mode 100644 ac3dec/srfft.c
 delete mode 100644 ac3dec/srfft.h
 delete mode 100644 ac3dec/srfft_kni.S
 delete mode 100644 ac3dec/srfft_kni.h
 delete mode 100644 ac3dec/srfft_kni_c.c
 delete mode 100644 ac3dec/srfftp.h
 delete mode 100644 ac3dec/stats.c
 delete mode 100644 ac3dec/stats.h
 delete mode 100644 dvd.c
 delete mode 100644 dvd.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9ccf53db1..bbceff25e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -110,6 +110,7 @@ Stefan Huelswitt <huels@iname.com>
  for implementing "Multi Speed Mode"
  for implementing backtracing for fast forward/rewind
  for implementing the replay mode display
+ for fixing a crash when replaying with DEBUG_OSD=1
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -142,6 +143,7 @@ Artur Skawina <skawina@geocities.com>
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
+ for fixing closing all unused file descriptors when opening a pipe
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -182,6 +184,8 @@ Lauri Pesonen <lauri.pesonen@firsthop.com>
 
 Sergei Haller <Sergei.Haller@math.uni-giessen.de>
  for fixing the LastActivity timestamp after a shutdown prompt
+ for fixing the "Low disk space!" message
+ for adding the TPID to Hessen-3 in 'channels.conf'
 
 Andreas Gebel <andreas@xcapenet.de>
  for his help in keeping 'channels.conf' up to date
@@ -205,3 +209,9 @@ Uwe Freese <mail@uwe-freese.de>
 Rainer Zocholl <Usenet-372114@zocki.toppoint.de>
  for suggesting a confirmation prompt when the user presses the "Power" button
  and there is an upcoming timer event
+
+Oleg Assovski <assen@bitcom.msk.ru>
+ for adding EPG scanning for another 4 days
+
+Adrian Stabiszewski <as@nitegate.de>
+ for fixing the SVDRP GRAB command in case the video device can't be opened
diff --git a/FORMATS b/FORMATS
index d7d4293c4..0da293977 100644
--- a/FORMATS
+++ b/FORMATS
@@ -45,12 +45,16 @@ Video Disk Recorder File Formats
   The fields in a timer definition have the following meaning (from left
   to right):
 
-  - Timer active (0 = inactive, 1 = active)
-    Values larger than '1' can be used by external programs to mark active timers
+  - Timer active (0 = inactive, 1 = active, 3 = instant recording)
+    Values other than these can be used by external programs to mark active timers
     and recognize if the user has modified them. When a user modifes an active
-    timer the 'active' field will be explicitly set to '1'.
+    timer the 'active' field will be explicitly set to '1' (or '0', respectively,
+    if the user deactivates the timer).
+    Note: in order to allow future extensibility, external programs using the
+    'active' parameter should only use the upper 16 bit of this 32 bit parameter
+    and leave the lower 16 bit untouched.
   - Program number of the channel to record
-  - Day of recording, either one or more of
+  - Day of recording (in case of a repeating timer), either one or more of
       M------ = Monday
       -T----- = Tuesday
       --W---- = Wednesday
@@ -61,7 +65,14 @@ Video Disk Recorder File Formats
     (any combination is possible, for example MTWTF--, and the days may be
     indicated by any characters except '-', so for example ABC---- would set
     a timer that records on monday, tuesday and wednesday) or the "day of month"
-    (1..31)
+    (1..31) in case of a single shot timer.
+    The day definition of a repeating timer may be followed by the date when that
+    timer shall hit for the first time. The format for this is @YYYY-MM-DD,
+    so a complete definition could look like this: MTWTF--@2002-02-18. This
+    "first day" feature can be used to disable a repeating timer for a couple
+    of days, or for instance to define a new Mon...Fri timer on wednesday, which
+    actually starts "monday next week". The "first day" date given need not be
+    that of a day when the timer would actually hit.
   - Start time (first two digits for the hour, second two digits for the minutes)
   - End time (first two digits for the hour, second two digits for the minutes)
   - Priority (from 0 to 99, 0 = lowest prioity, 99 = highest priority)
@@ -169,3 +180,37 @@ Video Disk Recorder File Formats
   for audio 2 (if available). Dolby Digital data is stored in packets with
   ids 0xBD.
 
+* epg.data
+
+  This file contains the EPG data in an easily parsable format. The first
+  character of each line defines what kind of data this line contains.
+
+  The following tag characters are defined:
+
+  C <service id> <channel name>
+  E <event id> <start time> <duration> <table id>
+  T <title>
+  S <subtitle>
+  D <description>
+  e
+  c
+
+  Lowercase characters mark the end of a sequence that was started by the
+  corresponding uppercase character. The outer frame consists of a sequence
+  of one or more 'C'...'c' (Channel) entries. Inside these any number of
+  'E'...'e' (Event) entries are allowed. The 'T', 'S' and 'D' entries are
+  optional (although every event should at least have a 'T' entry).
+
+  <service id>   is the "program number" as defined in 'channels.conf'
+  <channel name> is the "name" as in 'channels.conf' (for information only)
+  <start time>   is the time (as a time_t integer) in UTC when this event starts
+  <duration>     is the time (in seconds) that this event will take
+  <table id>     is a hex number that indicates the table this event is contained
+                 in (if this is left empty or 0 this event will not be overwritten
+                 or modified by data that comes from the DVB stream)
+  <title>        is the title of the event
+  <subtitle>     is the subtitle (typically the name of the episode etc.)
+  <description>  is the description of the event
+
+  This file will be read at program startup in order to restore the results of
+  previous EPG scans.
diff --git a/HISTORY b/HISTORY
index b2b3a9e14..ea81172d8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -979,7 +979,7 @@ Video Disk Recorder Revision History
 - Only reporting the 'EPG bugfix statistics' if there really were any fixes.
 - Added Finnish language texts (thanks to Hannu Savolainen).
 - Reverted to the previous way of searching for the EPG record of the current
-  recording in case of a periodic timer (i.e. taking the one that is in the
+  recording in case of a repeating timer (i.e. taking the one that is in the
   middle between start and end time).
 - Added a typedef for 'in_addr_t' to make it work with glibc < 2.2 (thanks to
   J�rgen Schmidt).
@@ -996,3 +996,49 @@ Video Disk Recorder Revision History
   prompt telling the user that there is an upcoming timer event.
 - If a recording has no episode title, the trailing '~' is no longer shown in
   the progress display.
+
+2002-02-24: Version 1.0.0pre1
+
+- Added scanning for EPG data for another 4 days on channels that support this
+  (thanks to Oleg Assovski).
+- Removed '#define VFAT 1' from recording.c (was a leftover from testing).
+- Fixed the "Low disk space!" message (thanks to Sergei Haller).
+- Added the TPID to Hessen-3 in 'channels.conf' (thanks to Sergei Haller).
+- Fixed a crash when replaying with DEBUG_OSD=1 (thanks to Stefan Huelswitt).
+- Implemented the "First day" parameter for repeating timers. See FORMATS for
+  information about the enhanced 'timers.conf' file format, and MANUAL for
+  a description of the new item in the "Edit Timer" menu and the enhanced
+  functionality of the "Blue" button in the "Timers" menu.
+- When deleting a recording that is currently still being recorded, the related
+  timer will now automatically be terminated. If this is a repeating timer, it
+  will receive a "First day" setting that skips the timer for this day.
+- Fixed closing all unused file descriptors when opening a pipe (thanks to
+  Werner Fink).
+- Instant recordings now take the EPG data from the point in time at 5 minutes
+  from the start time of the recording. In order for this to work the 'active'
+  parameter of a timer now uses the second bit to indicate that this is an
+  "instant" recording (see FORMATS for details).
+- Fixed the SVDRP GRAB command in case the video device can't be opened (thanks
+  to Adrian Stabiszewski).
+- At startup the data written into 'epg.data' is now read into the EPG data
+  structures. In order for this to work, the 'E' record has been extended to
+  (optionally) contain the 'table ID' (see FORMATS for details).
+- The new SVDRP command PUTE can be used to put EPG data into the EPG list.
+  See FORMATS for details about the required data format.
+- Taking the German umlauts 'as is' when compiled with VFAT.
+- The new Setup parameter RecordDolbyDigital can be used to generally turn off
+  recording the Dolby Digital audio channels in case you want to save disk space
+  or don't have the equipment to replay Dolby Digital audio.
+- Reading the 'setup.conf' file no longer terminates in case of an error, but
+  rather attempts to read the rest of the file.
+- Removed DVD support from the core VDR source, since the current version from
+  Andreas Schultz is already much further developed (DVD menu navigation) and
+  the concept of "additional players" in VDR is going to change in version 1.1.0,
+  where a new "plugin" interface shall allow the easy implementation of new
+  players without having to patch the core VDR source. Until then, Andreas has
+  agreed to provide his DVD support as a completely external patch.
+- The contents of the distribution archive now contains the directory name with
+  the current version number, as in 'vdr-1.0.0pre1/...' in order to avoid
+  inadvertently overwriting an existing VDR directory with a new version.
+- Added a missing error message in SVDRP command LSTC in case the given channel
+  can't be found.
diff --git a/INSTALL b/INSTALL
index cf694890e..e87f7bea8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,23 +15,6 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile.
 
-If you want to use your DVD drive you will need to compile VDR with
-
-  make DVD=1
-
-to activate DVD support. VDR then also needs the package 'libdvdread'
-in order to replay DVDs. This package is expected to be located in the
-directory ../DVD (seen from the VDR directory).  Adjust the definition
-of DVDDIR in the Makefile if necessary.
-You can find 'libdvdread' at
-
-  http://www.dtek.chalmers.se/groups/dvd/downloads.shtml
-
-If you want to replay CSS encrypted DVDs you also need to get the 'libdvdcss'
-library from
-
-  http://www.videolan.org/libdvdcss/download.html
-
 VDR requires the Linux-DVB card driver version dated 2001-09-14 or higher
 to work properly.
 
@@ -250,19 +233,6 @@ This program must be given to VDR with the '-a' option, as in
 
   vdr -a ac3play
 
-Accessing the DVD drive:
-------------------------
-
-By default VDR expects the DVD drive to be located at /dev/dvd (which
-typically is a symbolic link to the actual device, for instance /dev/hdc).
-You can use the '-V' option to overwrite this, as in
-
-  vdr -V /media/dvd
-
-Note that the user id under which VDR runs needs to have write access to
-the DVD device in order to replay CSS protected DVDs (which also requires
-the presence of the 'libdvdcss' library).
-
 The video data directory:
 -------------------------
 
diff --git a/MANUAL b/MANUAL
index d0ce7a2cf..320d24dad 100644
--- a/MANUAL
+++ b/MANUAL
@@ -12,23 +12,25 @@ Video Disk Recorder User's Manual
 
   Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
   Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
-  Left    Prev group  -          Page up    Disable    Decrement     Page up     Search back
-  Right   Next group  -          Page down  Enable     Increment     Page down   Search forward
+  Left    Prev group  -          Page up    Page up    Decrement     Page up     Search back
+  Right   Next group  -          Page down  Page down  Increment     Page down   Search forward
   Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
   Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
   Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
   Red     -           Record     Edit       Edit       -             Play        Jump
   Green   -           Language   New        New        -             Rewind      Skip -60s
-  Yellow  -           Eject DVD  Delete     Delete     -             Delete      Skip +60s
-  Blue    -           Resume     Mark       Mark(1)    -             Summary     Stop
+  Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
+  Blue    -           Resume     Mark       On/Off(1)  -             Summary     Stop
   0..9    Ch select   -          -          -          Numeric inp.  -           Editing
-  Power   Shutdown    -          -          -          -             -           -
-  Volume+ Volume up   -          -          -          -             -           -
-  Volume- Volume down -          -          -          -             -           -
-  Mute    Mute        -          -          -          -             -           -
 
-  (1) The "Mark" button in the "Timers" menu only works if sorting the timers
-      has been disabled in the "Setup" menu.
+  Power   Shutdown
+  Volume+ Volume up
+  Volume- Volume down
+  Mute    Mute
+
+  (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
+      has been enabled in the "Setup" menu. Otherwise the Blue button is used
+      to "mark" a timer for moving.
 
 * Navigating through the On Screen Menus
 
@@ -41,8 +43,15 @@ Video Disk Recorder User's Manual
   any changes that might have been made in the current menu.
 
   In the "Timers" menu, the current timer can be enabled or disabled with
-  the "Right" or "Left" key, respectively (enabled timers are marked with '>',
-  timers that are currently recording are marked with '#').
+  the "Blue" key (this is only possible if the "Timers" list is sorted,
+  otherwise the "Blue" key is used to mark a timer in order to move it to
+  another position in the list). Enabled timers are marked with '>', timers
+  that are currently recording are marked with '#'. If a timer has the
+  "First day" set so that it will start recording only on the given date,
+  it is marked with '!'. The "Blue" key toggles through the "enabled" and
+  "disabled" states, and for repeating timers that are currently recording
+  also a state that ends this recording prematurely and sets the "First day"
+  date so that it will record again the next time the timer hits.
   "Ok" here opens the "Edit timer" menu.
 
   Textual options, like channel names or recording file names, can be edited
@@ -160,7 +169,7 @@ Video Disk Recorder User's Manual
   list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
   to start playback. New recordings are marked with an '*'.
   If the Setup parameter RecordingDirs has been set and there are recordings
-  from periodic timers organized in a subdirectory structure, only the
+  from repeating timers organized in a subdirectory structure, only the
   directory is displayed and it can be opened by pressing "Ok" (or the "Red"
   button). A directory entry displays the total number of recordings within
   that directory (and any possible subdirectory thereof) as well as the total
@@ -170,7 +179,7 @@ Video Disk Recorder User's Manual
   If the setup parameter UseSubtitle was turned on when a recording took place,
   VDR adds the "subtitle" (which is usually the name of the episode in case of
   a series) to the recording's name. The "Recordings" menu then displays all
-  recordings of a periodic timer in chronological order, since these are
+  recordings of a repeating timer in chronological order, since these are
   usually the individual episodes of a series, which you may want to view in
   the order in which they were broadcast.
 
@@ -321,6 +330,8 @@ Video Disk Recorder User's Manual
              of this timer being collected in a common subdirectory.
              If this field is left blank, the channel name will be used to form
              the name of the recording.
+  First day: The date of the first day when this timer shall start recording
+             (only available for repeating timers).
 
   A timer can also be programmed by pressing the "Red" button on the "Schedule",
   "Now", "Next" or "Event" menus.
@@ -469,6 +480,10 @@ Video Disk Recorder User's Manual
                          0 = 4:3
                          1 = 16:9
 
+  RecordDolbyDigital = 1 Turns recording of the Dolby Digital audio channels on
+                         or off. This may be useful if you don't have the equipment
+                         to replay Dolby Digital audio and want to save disk space.
+
   ChannelInfoPos = 0     The position of the channel info window in the OSD.
                          0 = bottom
                          1 = top
diff --git a/Makefile b/Makefile
index f74179d93..ecb8f81fa 100644
--- a/Makefile
+++ b/Makefile
@@ -4,29 +4,18 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.30 2002/02/01 14:40:09 kls Exp $
+# $Id: Makefile 1.31 2002/02/24 12:29:54 kls Exp $
 
 .DELETE_ON_ERROR:
 
 DVBDIR   = ../DVB
-DVDDIR   = ../DVD
-AC3DIR   = ./ac3dec
 DTVDIR   = ./libdtv
 
 INCLUDES = -I$(DVBDIR)/ost/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-ifdef DVD
-INCLUDES += -I$(DVDDIR)/libdvdread
-LIBDIRS  += -L$(DVDDIR)/libdvdread/dvdread/.libs
-DEFINES  += -DDVDSUPPORT
-DEFINES  += -D_LARGEFILE64_SOURCE # needed by libdvdread
-AC3LIB    = $(AC3DIR)/libac3.a
-DVDLIB    = -ldvdread
-endif
-
-OBJS = config.o dvbapi.o dvbosd.o dvd.o eit.o font.o i18n.o interface.o menu.o osd.o\
+OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o osd.o\
        recording.o remote.o remux.o ringbuffer.o svdrp.o thread.o tools.o vdr.o\
        videodir.o
 
@@ -75,8 +64,8 @@ include $(DEPFILE)
 
 # The main program:
 
-vdr: $(OBJS) $(AC3LIB) $(DTVLIB)
-	g++ -g -O2 $(OBJS) $(NCURSESLIB) -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr
+vdr: $(OBJS) $(DTVLIB)
+	g++ -g -O2 $(OBJS) $(NCURSESLIB) -ljpeg -lpthread $(LIBDIRS) $(DTVLIB) -o vdr
 
 # The font files:
 
@@ -90,11 +79,6 @@ fontosd.c:
 genfontfile: genfontfile.c
 	gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
 
-# The ac3dec library:
-
-$(AC3LIB):
-	make -C $(AC3DIR) all
-
 # The libdtv library:
 
 $(DTVLIB) $(DTVDIR)/libdtv.h:
@@ -103,7 +87,6 @@ $(DTVLIB) $(DTVDIR)/libdtv.h:
 # Housekeeping:
 
 clean:
-	make -C $(AC3DIR) clean
 	make -C $(DTVDIR) clean
 	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
 fontclean:
diff --git a/ac3dec/Makefile b/ac3dec/Makefile
deleted file mode 100644
index 7ab5ad028..000000000
--- a/ac3dec/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Makefile for 'ac3dec'
-#
-# $Id: Makefile 1.2 2001/08/10 12:44:07 kls Exp $
-
-#OBJS = coeff.o decode.o exponent.o rematrix.o bit_allocate.o crc.o dither.o\
-#       imdct.o sanity_check.o bitstream.o debug.o downmix.o parse.o stats.o\
-#       downmix_c.o imdct.o                             
-
-OBJS = bit_allocate.o bitstream.o coeff.o cpu_accel.o crc.o debug.o decode.o\
-       dither.o downmix.o downmix_c.o exponent.o imdct.o imdct_c.o imdct_kni.o\
-       parse.o rematrix.o sanity_check.o srfft.o srfft_kni_c.o stats.o 
-
-
-DEFINES += -DDOLBY_SURROUND
-
-all: libac3.a
-
-libac3.a: $(OBJS)
-	ar -rc libac3.a $(OBJS)
-
-# Implicit rules:
-
-%.o: %.c
-	gcc -g -O2 -Wall -m486 -I./ -c $(DEFINES) $<
-
-clean:
-	rm -f *~ libac3.a $(OBJS)
diff --git a/ac3dec/ac3.h b/ac3dec/ac3.h
deleted file mode 100644
index 8f268fbdb..000000000
--- a/ac3dec/ac3.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* 
- *    ac3.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *------------------------------------------------------------
- *
- * 24 Nov 2001
- *      Andreas Schultz <aschultz@cs.uni-magdeburg.de>
- *      Added ac3_buffersize()
- */
-
-#define AC3_BUFFER_SIZE (6*1024*16)
-
-#ifndef __AC3_H__
-#define __AC3_H__
-
-#ifdef __OMS__
-#include <oms/plugin/output_audio.h>
-#else
-//#include "audio_out.h"
-#endif
-
-#include <inttypes.h>
-
-#define AC3_DOLBY_SURR_ENABLE	(1<<0)
-#define AC3_ALTIVEC_ENABLE	(1<<1)
-
-typedef struct ac3_config_s {
-	// Bit flags that enable various things
-	uint32_t flags;
-	// Number of discrete channels in final output (for downmixing)
-	uint16_t num_output_ch;
-	// Which channel of a dual mono stream to select
-	uint16_t dual_mono_ch_sel;
-} ac3_config_t;
-
-void ac3dec_init (void);
-
-#ifdef __OMS__
-size_t ac3dec_decode_data (plugin_output_audio_t *output, uint8_t *data_start, uint8_t *data_end);
-#else
-size_t ac3dec_decode_data (uint8_t *data_start ,uint8_t *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data);
-#endif
-
-uint32_t ac3_buffersize();
-
-#endif
diff --git a/ac3dec/ac3_internal.h b/ac3dec/ac3_internal.h
deleted file mode 100644
index 259396fdc..000000000
--- a/ac3dec/ac3_internal.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/* 
- *    ac3_internal.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#ifndef __GNUC__
-#define inline 
-#endif
-
-#include <setjmp.h>
-
-/* Exponent strategy constants */
-#define EXP_REUSE (0)
-#define EXP_D15   (1)
-#define EXP_D25   (2)
-#define EXP_D45   (3)
-
-/* Delta bit allocation constants */
-#define DELTA_BIT_REUSE (0)
-#define DELTA_BIT_NEW (1)
-#define DELTA_BIT_NONE (2)
-#define DELTA_BIT_RESERVED (3)
-
-/* samples work structure */
-typedef float stream_samples_t[6][256];
-
-/* global config structure */
-extern ac3_config_t ac3_config;
-/* global error flag */
-extern jmp_buf error_jmp_mark;
-#define HANDLE_ERROR() longjmp (error_jmp_mark, -1)
-
-/* Everything you wanted to know about band structure */
-/*
- * The entire frequency domain is represented by 256 real
- * floating point fourier coefficients. Only the lower 253
- * coefficients are actually utilized however. We use arrays
- * of 256 to be efficient in some cases.
- *
- * The 5 full bandwidth channels (fbw) can have their higher
- * frequencies coupled together. These coupled channels then
- * share their high frequency components.
- *
- * This coupling band is broken up into 18 sub-bands starting
- * at mantissa number 37. Each sub-band is 12 bins wide.
- *
- * There are 50 bit allocation sub-bands which cover the entire
- * frequency range. The sub-bands are of non-uniform width, and
- * approximate a 1/6 octave scale.
- */
-
-/* The following structures are filled in by their corresponding parse_*
- * functions. See http://www.atsc.org/Standards/A52/a_52.pdf for
- * full details on each field. Indented fields are used to denote
- * conditional fields.
- */
-
-typedef struct syncinfo_s
-{
-	uint32_t	magic;
-	/* Sync word == 0x0B77 */
-	 uint16_t   syncword; 
-	/* crc for the first 5/8 of the sync block */
-	/* uint16_t   crc1; */
-	/* Stream Sampling Rate (kHz) 0 = 48, 1 = 44.1, 2 = 32, 3 = reserved */
-	uint16_t		fscod;	
-	/* Frame size code */
-	uint16_t		frmsizecod;
-
-	/* Information not in the AC-3 bitstream, but derived */
-	/* Frame size in 16 bit words */
-	uint16_t frame_size;
-	/* Bit rate in kilobits */
-	uint16_t bit_rate;
-	/* sampling rate in hertz */
-	uint32_t sampling_rate;
-
-} syncinfo_t;
-
-typedef struct bsi_s
-{
-	uint32_t	magic;
-	/* Bit stream identification == 0x8 */
-	uint16_t bsid;	
-	/* Bit stream mode */
-	uint16_t bsmod;
-	/* Audio coding mode */
-	uint16_t acmod;
-	/* If we're using the centre channel then */
-		/* centre mix level */
-		uint16_t cmixlev;
-	/* If we're using the surround channel then */
-		/* surround mix level */
-		uint16_t surmixlev;
-	/* If we're in 2/0 mode then */
-		/* Dolby surround mix level - NOT USED - */
-		uint16_t dsurmod;
-	/* Low frequency effects on */
-	uint16_t lfeon;
-	/* Dialogue Normalization level */
-	uint16_t dialnorm;
-	/* Compression exists */
-	uint16_t compre;
-		/* Compression level */
-		uint16_t compr;
-	/* Language code exists */
-	uint16_t langcode;
-		/* Language code */
-		uint16_t langcod;
-	/* Audio production info exists*/
-	uint16_t audprodie;
-		uint16_t mixlevel;
-		uint16_t roomtyp;
-	/* If we're in dual mono mode (acmod == 0) then extra stuff */
-		uint16_t dialnorm2;
-		uint16_t compr2e;
-			uint16_t compr2;
-		uint16_t langcod2e;
-			uint16_t langcod2;
-		uint16_t audprodi2e;
-			uint16_t mixlevel2;
-			uint16_t roomtyp2;
-	/* Copyright bit */
-	uint16_t copyrightb;
-	/* Original bit */
-	uint16_t origbs;
-	/* Timecode 1 exists */
-	uint16_t timecod1e;
-		/* Timecode 1 */
-		uint16_t timecod1;
-	/* Timecode 2 exists */
-	uint16_t timecod2e;
-		/* Timecode 2 */
-		uint16_t timecod2;
-	/* Additional bit stream info exists */
-	uint16_t addbsie;
-		/* Additional bit stream length - 1 (in bytes) */
-		uint16_t addbsil;
-		/* Additional bit stream information (max 64 bytes) */
-		uint8_t	addbsi[64];
-
-	/* Information not in the AC-3 bitstream, but derived */
-	/* Number of channels (excluding LFE)
-	 * Derived from acmod */
-	uint16_t nfchans;
-} bsi_t;
-
-
-/* more pain */
-typedef struct audblk_s
-{
-	uint32_t	magic1;
-	/* block switch bit indexed by channel num */
-	uint16_t blksw[5];
-	/* dither enable bit indexed by channel num */
-	uint16_t dithflag[5];
-	/* dynamic range gain exists */
-	uint16_t dynrnge;
-		/* dynamic range gain */
-		uint16_t dynrng;
-	/* if acmod==0 then */
-	/* dynamic range 2 gain exists */
-	uint16_t dynrng2e;
-		/* dynamic range 2 gain */
-		uint16_t dynrng2;
-	/* coupling strategy exists */
-	uint16_t cplstre;
-		/* coupling in use */
-		uint16_t cplinu;
-			/* channel coupled */
-			uint16_t chincpl[5];
-			/* if acmod==2 then */
-				/* Phase flags in use */
-				uint16_t phsflginu;
-			/* coupling begin frequency code */
-			uint16_t cplbegf;
-			/* coupling end frequency code */
-			uint16_t cplendf;
-			/* coupling band structure bits */
-			uint16_t cplbndstrc[18];
-			/* Do coupling co-ords exist for this channel? */
-			uint16_t cplcoe[5];
-			/* Master coupling co-ordinate */
-			uint16_t mstrcplco[5];
-			/* Per coupling band coupling co-ordinates */
-			uint16_t cplcoexp[5][18];
-			uint16_t cplcomant[5][18];
-			/* Phase flags for dual mono */
-			uint16_t phsflg[18];
-	/* Is there a rematrixing strategy */
-	uint16_t rematstr;
-		/* Rematrixing bits */
-		uint16_t rematflg[4];
-	/* Coupling exponent strategy */
-	uint16_t cplexpstr;
-	/* Exponent strategy for full bandwidth channels */
-	uint16_t chexpstr[5];
-	/* Exponent strategy for lfe channel */
-	uint16_t lfeexpstr;
-	/* Channel bandwidth for independent channels */
-	uint16_t chbwcod[5];
-		/* The absolute coupling exponent */
-		uint16_t cplabsexp;
-		/* Coupling channel exponents (D15 mode gives 18 * 12 /3  encoded exponents */
-		uint16_t cplexps[18 * 12 / 3];
-	/* Sanity checking constant */
-	uint32_t	magic2;
-	/* fbw channel exponents */
-	uint16_t exps[5][252 / 3];
-	/* channel gain range */
-	uint16_t gainrng[5];
-	/* low frequency exponents */
-	uint16_t lfeexps[3];
-
-	/* Bit allocation info */
-	uint16_t baie;
-		/* Slow decay code */
-		uint16_t sdcycod;
-		/* Fast decay code */
-		uint16_t fdcycod;
-		/* Slow gain code */
-		uint16_t sgaincod;
-		/* dB per bit code */
-		uint16_t dbpbcod;
-		/* masking floor code */
-		uint16_t floorcod;
-
-	/* SNR offset info */
-	uint16_t snroffste;
-		/* coarse SNR offset */
-		uint16_t csnroffst;
-		/* coupling fine SNR offset */
-		uint16_t cplfsnroffst;
-		/* coupling fast gain code */
-		uint16_t cplfgaincod;
-		/* fbw fine SNR offset */
-		uint16_t fsnroffst[5];
-		/* fbw fast gain code */
-		uint16_t fgaincod[5];
-		/* lfe fine SNR offset */
-		uint16_t lfefsnroffst;
-		/* lfe fast gain code */
-		uint16_t lfefgaincod;
-	
-	/* Coupling leak info */
-	uint16_t cplleake;
-		/* coupling fast leak initialization */
-		uint16_t cplfleak;
-		/* coupling slow leak initialization */
-		uint16_t cplsleak;
-	
-	/* delta bit allocation info */
-	uint16_t deltbaie;
-		/* coupling delta bit allocation exists */
-		uint16_t cpldeltbae;
-		/* fbw delta bit allocation exists */
-		uint16_t deltbae[5];
-		/* number of cpl delta bit segments */
-		uint16_t cpldeltnseg;
-			/* coupling delta bit allocation offset */
-			uint16_t cpldeltoffst[8];
-			/* coupling delta bit allocation length */
-			uint16_t cpldeltlen[8];
-			/* coupling delta bit allocation length */
-			uint16_t cpldeltba[8];
-		/* number of delta bit segments */
-		uint16_t deltnseg[5];
-			/* fbw delta bit allocation offset */
-			uint16_t deltoffst[5][8];
-			/* fbw delta bit allocation length */
-			uint16_t deltlen[5][8];
-			/* fbw delta bit allocation length */
-			uint16_t deltba[5][8];
-
-	/* skip length exists */
-	uint16_t skiple;
-		/* skip length */
-		uint16_t skipl;
-
-	//Removed Feb 2000 -ah
-	//added Jul 2000 ++dent
-	/* channel mantissas */
-	uint16_t chmant[5][256];
-
-	/* coupling mantissas */
-//	uint16_t cplmant[256];
-
-	//Added Jun 2000 -MaXX
-	/* coupling floats */
-	float cpl_flt[ 256 ];
-
-	//Removed Feb 2000 -ah
-	//added Jul 2000 ++dent
-	/* coupling mantissas */
-	uint16_t lfemant[7];
-
-
-	/*  -- Information not in the bitstream, but derived thereof  -- */
-
-	/* Number of coupling sub-bands */
-	uint16_t ncplsubnd;
-
-	/* Number of combined coupling sub-bands
-	 * Derived from ncplsubnd and cplbndstrc */
-	uint16_t ncplbnd;
-
-	/* Number of exponent groups by channel
-	 * Derived from strmant, endmant */
-	uint16_t nchgrps[5];
-
-	/* Number of coupling exponent groups
-	 * Derived from cplbegf, cplendf, cplexpstr */
-	uint16_t ncplgrps;
-			
-	/* End mantissa numbers of fbw channels */
-	uint16_t endmant[5];
-
-	/* Start and end mantissa numbers for the coupling channel */
-	uint16_t cplstrtmant;
-	uint16_t cplendmant;
-
-	/* Decoded exponent info */
-	uint16_t fbw_exp[5][256];
-	uint16_t cpl_exp[256];
-	uint16_t lfe_exp[7];
-
-	/* Bit allocation pointer results */
-	uint16_t fbw_bap[5][256];
-	uint16_t cpl_bap[256];
-	uint16_t lfe_bap[7];
-	
-	uint32_t	magic3;
-} audblk_t;
-
-
diff --git a/ac3dec/bit_allocate.c b/ac3dec/bit_allocate.c
deleted file mode 100644
index 008743402..000000000
--- a/ac3dec/bit_allocate.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/* 
- *  bit_allocate.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-
-static inline int16_t logadd(int16_t a,int16_t  b);
-static int16_t calc_lowcomp(int16_t a,int16_t b0,int16_t b1,int16_t bin);
-static inline uint16_t min(int16_t a,int16_t b);
-static inline uint16_t max(int16_t a,int16_t b);
-static void ba_compute_psd(int16_t start, int16_t end, int16_t exps[], 
-		int16_t psd[], int16_t bndpsd[]);
-
-static void ba_compute_excitation(int16_t start, int16_t end,int16_t fgain,
-		int16_t fastleak, int16_t slowleak, int16_t is_lfe, int16_t bndpsd[],
-		int16_t excite[]);
-static void ba_compute_mask(int16_t start, int16_t end, uint16_t fscod,
-		uint16_t deltbae, uint16_t deltnseg, uint16_t deltoffst[], uint16_t deltba[],
-		uint16_t deltlen[], int16_t excite[], int16_t mask[]);
-static void ba_compute_bap(int16_t start, int16_t end, int16_t snroffset,
-		int16_t psd[], int16_t mask[], int16_t bap[]);
-
-/* Misc LUTs for bit allocation process */
-
-static int16_t slowdec[]  = { 0x0f,  0x11,  0x13,  0x15  };
-static int16_t fastdec[]  = { 0x3f,  0x53,  0x67,  0x7b  };
-static int16_t slowgain[] = { 0x540, 0x4d8, 0x478, 0x410 };
-static int16_t dbpbtab[]  = { 0x000, 0x700, 0x900, 0xb00 };
-
-static uint16_t floortab[] = { 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800 };
-static int16_t fastgain[] = { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400  };
-
-
-static int16_t bndtab[] = {  0,  1,  2,   3,   4,   5,   6,   7,   8,   9, 
-                     10, 11, 12,  13,  14,  15,  16,  17,  18,  19,
-                     20, 21, 22,  23,  24,  25,  26,  27,  28,  31,
-                     34, 37, 40,  43,  46,  49,  55,  61,  67,  73,
-                     79, 85, 97, 109, 121, 133, 157, 181, 205, 229 };
-
-static int16_t bndsz[]  = { 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-                     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-                     1,  1,  1,  1,  1,  1,  1,  1,  3,  3,
-                     3,  3,  3,  3,  3,  6,  6,  6,  6,  6,
-                     6, 12, 12, 12, 12, 24, 24, 24, 24, 24 };
-
-static int16_t masktab[] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-                     16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 28, 28, 29,
-                     29, 29, 30, 30, 30, 31, 31, 31, 32, 32, 32, 33, 33, 33, 34, 34,
-                     34, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 37, 37, 37,
-                     37, 37, 37, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 40,
-                     40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-                     41, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43,
-                     43, 43, 43, 43, 43, 43, 43, 43, 43, 44, 44, 44, 44, 44, 44, 44,
-                     44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
-                     45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 46, 46, 46,
-                     46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
-                     46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-                     47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48,
-                     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-                     48, 48, 48, 48, 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-                     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  0,  0,  0 };
-
-
-static int16_t latab[] = { 0x0040, 0x003f, 0x003e, 0x003d, 0x003c, 0x003b, 0x003a, 0x0039,
-                    0x0038, 0x0037, 0x0036, 0x0035, 0x0034, 0x0034, 0x0033, 0x0032,
-                    0x0031, 0x0030, 0x002f, 0x002f, 0x002e, 0x002d, 0x002c, 0x002c,
-                    0x002b, 0x002a, 0x0029, 0x0029, 0x0028, 0x0027, 0x0026, 0x0026,
-                    0x0025, 0x0024, 0x0024, 0x0023, 0x0023, 0x0022, 0x0021, 0x0021,
-                    0x0020, 0x0020, 0x001f, 0x001e, 0x001e, 0x001d, 0x001d, 0x001c,
-                    0x001c, 0x001b, 0x001b, 0x001a, 0x001a, 0x0019, 0x0019, 0x0018,
-                    0x0018, 0x0017, 0x0017, 0x0016, 0x0016, 0x0015, 0x0015, 0x0015,
-                    0x0014, 0x0014, 0x0013, 0x0013, 0x0013, 0x0012, 0x0012, 0x0012,
-                    0x0011, 0x0011, 0x0011, 0x0010, 0x0010, 0x0010, 0x000f, 0x000f,
-                    0x000f, 0x000e, 0x000e, 0x000e, 0x000d, 0x000d, 0x000d, 0x000d,
-                    0x000c, 0x000c, 0x000c, 0x000c, 0x000b, 0x000b, 0x000b, 0x000b,
-                    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0009, 0x0009, 0x0009,
-                    0x0009, 0x0009, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-                    0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0006, 0x0006,
-                    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005,
-                    0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0004, 0x0004,
-                    0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
-                    0x0004, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003,
-                    0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002,
-                    0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
-                    0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
-                    0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-                    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-                    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-                    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-                    0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                    0x0000, 0x0000, 0x0000, 0x0000};
-
-static int16_t hth[][50] = {{ 0x04d0, 0x04d0, 0x0440, 0x0400, 0x03e0, 0x03c0, 0x03b0, 0x03b0,  
-                      0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 0x0390,  
-                      0x0380, 0x0380, 0x0370, 0x0370, 0x0360, 0x0360, 0x0350, 0x0350,  
-                      0x0340, 0x0340, 0x0330, 0x0320, 0x0310, 0x0300, 0x02f0, 0x02f0,
-                      0x02f0, 0x02f0, 0x0300, 0x0310, 0x0340, 0x0390, 0x03e0, 0x0420,
-                      0x0460, 0x0490, 0x04a0, 0x0460, 0x0440, 0x0440, 0x0520, 0x0800,
-                      0x0840, 0x0840 },
-                      
-                    { 0x04f0, 0x04f0, 0x0460, 0x0410, 0x03e0, 0x03d0, 0x03c0, 0x03b0, 
-                      0x03b0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 
-                      0x0390, 0x0380, 0x0380, 0x0380, 0x0370, 0x0370, 0x0360, 0x0360, 
-                      0x0350, 0x0350, 0x0340, 0x0340, 0x0320, 0x0310, 0x0300, 0x02f0, 
-                      0x02f0, 0x02f0, 0x02f0, 0x0300, 0x0320, 0x0350, 0x0390, 0x03e0, 
-                      0x0420, 0x0450, 0x04a0, 0x0490, 0x0460, 0x0440, 0x0480, 0x0630, 
-                      0x0840, 0x0840 },
-                      
-                    { 0x0580, 0x0580, 0x04b0, 0x0450, 0x0420, 0x03f0, 0x03e0, 0x03d0, 
-                      0x03c0, 0x03b0, 0x03b0, 0x03b0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 
-                      0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x0390, 0x0390, 0x0390, 0x0390, 
-                      0x0380, 0x0380, 0x0380, 0x0370, 0x0360, 0x0350, 0x0340, 0x0330, 
-                      0x0320, 0x0310, 0x0300, 0x02f0, 0x02f0, 0x02f0, 0x0300, 0x0310, 
-                      0x0330, 0x0350, 0x03c0, 0x0410, 0x0470, 0x04a0, 0x0460, 0x0440, 
-                      0x0450, 0x04e0 }};
-
-
-static int16_t baptab[] = { 0,  1,  1,  1,  1,  1,  2,  2,  3,  3,  3,  4,  4,  5,  5,  6,
-                     6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10, 
-                     10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14,
-                     14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15 };
-
-static int16_t sdecay;
-static int16_t fdecay;
-static int16_t sgain;
-static int16_t dbknee;
-static int16_t floor;
-static int16_t psd[256];
-static int16_t bndpsd[256];
-static int16_t excite[256];
-static int16_t mask[256];
-
-
-/**
- *
- **/
-
-static inline uint16_t max(int16_t a,int16_t b)
-{
-	return (a > b ? a : b);
-}
-
-
-/**
- *
- **/
-	
-static inline uint16_t min(int16_t a,int16_t b)
-{
-	return (a < b ? a : b);
-}
-
-
-/**
- *
- **/
-
-static inline int16_t logadd(int16_t a,int16_t  b) 
-{ 
-	int16_t c;
-	int16_t address;
-
-	c = a - b; 
-	address = min((abs(c) >> 1), 255); 
-	
-	if (c >= 0) 
-		return(a + latab[address]); 
-	else 
-		return(b + latab[address]); 
-}
-
-
-/**
- *
- **/
-
-void bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk)
-{
-	uint16_t i;
-	int16_t fgain;
-	int16_t snroffset;
-	int16_t start;
-	int16_t end;
-	int16_t fastleak;
-	int16_t slowleak;
-
-	/* Only perform bit_allocation if the exponents have changed or we
-	 * have new sideband information */
-	if (audblk->chexpstr[0]  == 0 && audblk->chexpstr[1] == 0 &&
-			audblk->chexpstr[2]  == 0 && audblk->chexpstr[3] == 0 &&
-			audblk->chexpstr[4]  == 0 && audblk->cplexpstr   == 0 &&
-			audblk->lfeexpstr    == 0 && audblk->baie        == 0 &&
-			audblk->snroffste    == 0 && audblk->deltbaie    == 0)
-		return;
-
-	/* Do some setup before we do the bit alloc */
-	sdecay = slowdec[audblk->sdcycod]; 
-	fdecay = fastdec[audblk->fdcycod];
-	sgain = slowgain[audblk->sgaincod]; 
-	dbknee = dbpbtab[audblk->dbpbcod]; 
-	floor = floortab[audblk->floorcod]; 
-
-	/* if all the SNR offset constants are zero then the whole block is zero */
-	if(!audblk->csnroffst    && !audblk->fsnroffst[0] && 
-		 !audblk->fsnroffst[1] && !audblk->fsnroffst[2] && 
-		 !audblk->fsnroffst[3] && !audblk->fsnroffst[4] &&
-		 !audblk->cplfsnroffst && !audblk->lfefsnroffst) {
-		memset(audblk->fbw_bap,0,sizeof(uint16_t) * 256 * 5);
-		memset(audblk->cpl_bap,0,sizeof(uint16_t) * 256);
-		memset(audblk->lfe_bap,0,sizeof(uint16_t) * 7);
-		return;
-	}
-		 
-
-	for(i = 0; i < bsi->nfchans; i++)
-	{
-		start = 0;
-		end = audblk->endmant[i] ; 
-		fgain = fastgain[audblk->fgaincod[i]]; 
-		snroffset = (((audblk->csnroffst - 15) << 4) + audblk->fsnroffst[i]) << 2 ;
-		fastleak = 0;
-		slowleak = 0;
-
-		ba_compute_psd(start, end, audblk->fbw_exp[i], psd, bndpsd);
-
-		ba_compute_excitation(start, end , fgain, fastleak, slowleak, 0, bndpsd, excite);
-
-		ba_compute_mask(start, end, fscod, audblk->deltbae[i], audblk->deltnseg[i], 
-				audblk->deltoffst[i], audblk->deltba[i], audblk->deltlen[i], excite, mask);
-
-		ba_compute_bap(start, end, snroffset, psd, mask, audblk->fbw_bap[i]);
-	}
-
-	if(audblk->cplinu) {
-		start = audblk->cplstrtmant; 
-		end = audblk->cplendmant; 
-		fgain = fastgain[audblk->cplfgaincod];
-		snroffset = (((audblk->csnroffst - 15) << 4) + audblk->cplfsnroffst) << 2 ;
-		fastleak = (audblk->cplfleak << 8) + 768; 
-		slowleak = (audblk->cplsleak << 8) + 768;
-
-		ba_compute_psd(start, end, audblk->cpl_exp, psd, bndpsd);
-
-		ba_compute_excitation(start, end , fgain, fastleak, slowleak, 0, bndpsd, excite);
-
-		ba_compute_mask(start, end, fscod, audblk->cpldeltbae, audblk->cpldeltnseg, 
-				audblk->cpldeltoffst, audblk->cpldeltba, audblk->cpldeltlen, excite, mask);
-
-		ba_compute_bap(start, end, snroffset, psd, mask, audblk->cpl_bap);
-	}
-
-	if(bsi->lfeon) {
-		start = 0;
-		end = 7;
-		fgain = fastgain[audblk->lfefgaincod];
-		snroffset = (((audblk->csnroffst - 15) << 4) + audblk->lfefsnroffst) << 2 ;
-		fastleak = 0;
-		slowleak = 0;
-
-		ba_compute_psd(start, end, audblk->lfe_exp, psd, bndpsd);
-
-		ba_compute_excitation(start, end , fgain, fastleak, slowleak, 1, bndpsd, excite);
-
-		/* Perform no delta bit allocation for lfe */
-		ba_compute_mask(start, end, fscod, 2, 0, 0, 0, 0, excite, mask);
-
-		ba_compute_bap(start, end, snroffset, psd, mask, audblk->lfe_bap);
-	}
-}
-
-
-/**
- *
- **/
-
-static void ba_compute_psd(int16_t start, int16_t end, int16_t exps[], 
-		int16_t psd[], int16_t bndpsd[])
-{
-	int bin,i,j,k;
-	int16_t lastbin = 0;
-	
-	/* Map the exponents into dBs */
-	for (bin=start; bin<end; bin++) { 
-		psd[bin] = (3072 - (exps[bin] << 7)); 
-	}
-
-	/* Integrate the psd function over each bit allocation band */
-	j = start; 
-	k = masktab[start]; 
-	
-	do { 
-		lastbin = min(bndtab[k] + bndsz[k], end); 
-		bndpsd[k] = psd[j]; 
-		j++; 
-
-		for (i = j; i < lastbin; i++) { 
-			bndpsd[k] = logadd(bndpsd[k], psd[j]);
-			j++; 
-		} 
-		
-		k++; 
-	} while (end > lastbin);
-}
-
-
-/**
- *
- **/
-
-static void ba_compute_excitation(int16_t start, int16_t end,int16_t fgain,
-		int16_t fastleak, int16_t slowleak, int16_t is_lfe, int16_t bndpsd[],
-		int16_t excite[])
-{
-	int bin;
-	int16_t bndstrt;
-	int16_t bndend;
-	int16_t lowcomp = 0;
-	int16_t begin = 0;
-
-	/* Compute excitation function */
-	bndstrt = masktab[start]; 
-	bndend = masktab[end - 1] + 1; 
-	
-	if (bndstrt == 0) { /* For fbw and lfe channels */ 
-		lowcomp = calc_lowcomp(lowcomp, bndpsd[0], bndpsd[1], 0); 
-		excite[0] = bndpsd[0] - fgain - lowcomp; 
-		lowcomp = calc_lowcomp(lowcomp, bndpsd[1], bndpsd[2], 1);
-		excite[1] = bndpsd[1] - fgain - lowcomp; 
-		begin = 7 ; 
-		
-// Note: Do not call calc_lowcomp() for the last band of the lfe channel,(bin=6)
-		for (bin = 2; bin < 7; bin++) { 
-			if (!(is_lfe && (bin == 6)))
-				lowcomp = calc_lowcomp(lowcomp, bndpsd[bin], bndpsd[bin+1], bin); 
-			fastleak = bndpsd[bin] - fgain; 
-			slowleak = bndpsd[bin] - sgain; 
-			excite[bin] = fastleak - lowcomp; 
-			
-			if (!(is_lfe && (bin == 6))) {
-				if (bndpsd[bin] <= bndpsd[bin+1]) {
-					begin = bin + 1 ; 
-					break; 
-				} 
-			}
-		} 
-		
-		for (bin = begin; bin < min(bndend, 22); bin++) { 
-			if (!(is_lfe && (bin == 6)))
-				lowcomp = calc_lowcomp(lowcomp, bndpsd[bin], bndpsd[bin+1], bin); 
-			fastleak -= fdecay ; 
-			fastleak = max(fastleak, bndpsd[bin] - fgain); 
-			slowleak -= sdecay ; 
-			slowleak = max(slowleak, bndpsd[bin] - sgain); 
-			excite[bin] = max(fastleak - lowcomp, slowleak); 
-		} 
-		begin = 22; 
-	} 
-	else /* For coupling channel */ 
-		begin = bndstrt; 
-
-	for (bin = begin; bin < bndend; bin++) { 
-		fastleak -= fdecay; 
-		fastleak = max(fastleak, bndpsd[bin] - fgain); 
-		slowleak -= sdecay; 
-		slowleak = max(slowleak, bndpsd[bin] - sgain); 
-		excite[bin] = max(fastleak, slowleak) ; 
-	} 
-}
-
-
-/**
- *
- **/
-
-static void ba_compute_mask(int16_t start, int16_t end, uint16_t fscod,
-		uint16_t deltbae, uint16_t deltnseg, uint16_t deltoffst[], uint16_t deltba[],
-		uint16_t deltlen[], int16_t excite[], int16_t mask[])
-{
-	int bin,k;
-	int16_t bndstrt;
-	int16_t bndend;
-	int16_t delta;
-
-	bndstrt = masktab[start]; 
-	bndend = masktab[end - 1] + 1; 
-
-	/* Compute the masking curve */
-
-	for (bin = bndstrt; bin < bndend; bin++) { 
-		if (bndpsd[bin] < dbknee) { 
-			excite[bin] += ((dbknee - bndpsd[bin]) >> 2); 
-		} 
-		mask[bin] = max(excite[bin], hth[fscod][bin]);
-	}
-	
-	/* Perform delta bit modulation if necessary */
-	if ((deltbae == DELTA_BIT_REUSE) || (deltbae == DELTA_BIT_NEW)) { 
-		int16_t band = 0; 
-		int16_t seg = 0; 
-		
-		for (seg = 0; seg < deltnseg+1; seg++) { 
-			band += deltoffst[seg]; 
-
-			if (deltba[seg] >= 4) { 
-				delta = (deltba[seg] - 3) << 7;
-			} else { 
-				delta = (deltba[seg] - 4) << 7;
-			} 
-			
-			for (k = 0; k < deltlen[seg]; k++) { 
-				mask[band] += delta; 
-				band++; 
-			} 
-		} 
-	}
-}
-
-
-/**
- *
- **/
-
-static void ba_compute_bap(int16_t start, int16_t end, int16_t snroffset,
-		int16_t psd[], int16_t mask[], int16_t bap[])
-{
-	int i,j,k;
-	int16_t lastbin = 0;
-	int16_t address = 0;
-
-	/* Compute the bit allocation pointer for each bin */
-	i = start; 
-	j = masktab[start]; 
-
-	do { 
-		lastbin = min(bndtab[j] + bndsz[j], end); 
-		mask[j] -= snroffset; 
-		mask[j] -= floor; 
-		
-		if (mask[j] < 0) 
-			mask[j] = 0; 
-
-		mask[j] &= 0x1fe0;
-		mask[j] += floor; 
-		for (k = i; k < lastbin; k++) { 
-			address = (psd[i] - mask[j]) >> 5; 
-			address = min(63, max(0, address)); 
-			bap[i] = baptab[address]; 
-			i++; 
-		} 
-		j++; 
-	} while (end > lastbin);
-}
-
-
-/**
- *
- **/
-
-static int16_t calc_lowcomp (int16_t a, int16_t b0, int16_t b1, int16_t bin) 
-{ 
-
-	if (bin < 7) { 
-		if ((b0 + 256) == b1)
-			a = 384; 
-	 	else if (b0 > b1) 
-			a = max(0, a - 64); 
-	} else if (bin < 20) { 
-		if ((b0 + 256) == b1) 
-			a = 320; 
-		else if (b0 > b1) 
-			a = max(0, a - 64) ; 
-	} else  
-		a = max(0, a - 128); 
-	
-	return(a);
-}
-
diff --git a/ac3dec/bit_allocate.h b/ac3dec/bit_allocate.h
deleted file mode 100644
index a6a3c7703..000000000
--- a/ac3dec/bit_allocate.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 
- *  bit_allocate.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-void bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/bitstream.c b/ac3dec/bitstream.c
deleted file mode 100644
index f48d2408a..000000000
--- a/ac3dec/bitstream.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* 
- *  bitstream.c
- *
- *	Copyright (C) Aaron Holtzman - Dec 1999
- *
- *  This file is part of ac3dec, a free AC-3 audio decoder
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <inttypes.h>
-
-#include <bswap.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ac3.h"
-#include "ac3_internal.h"
-#include "bitstream.h"
-
-
-uint32_t bits_left = 0;
-uint64_t current_word;
-uint64_t *buffer_start = 0;
-
-
-static inline uint64_t getdword (void)
-{
-	return be2me_64 (*buffer_start++);
-}
-
-
-static inline void bitstream_fill_current (void)
-{
-	//current_word = bswap_64 (*buffer_start++);
-	current_word = getdword ();
-}
-
-
-uint32_t bitstream_get_bh (uint32_t num_bits)
-{
-	uint32_t result;
-
-	num_bits -= bits_left;
-	result = (current_word << (64 - bits_left)) >> (64 - bits_left);
-
-	bitstream_fill_current();
-
-	if(num_bits != 0)
-		result = (result << num_bits) | (current_word >> (64 - num_bits));
-	
-	bits_left = 64 - num_bits;
-
-	return result;
-}
-
-
-void bitstream_init (uint8_t *start)
-{
-	//initialize the start of the buffer
-	buffer_start = (uint64_t *) start;
-	bits_left = 0;
-}
diff --git a/ac3dec/bitstream.h b/ac3dec/bitstream.h
deleted file mode 100644
index f34726a77..000000000
--- a/ac3dec/bitstream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
- *  bitstream.h
- *
- *	Copyright (C) Aaron Holtzman - Dec 1999
- *
- *  This file is part of ac3dec, a free AC-3 audio decoder
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <inttypes.h>
-
-extern uint32_t bits_left;
-extern uint64_t current_word;
-
-void bitstream_init(uint8_t *start);
-inline uint32_t bitstream_get_bh(uint32_t num_bits);
-
-static inline uint32_t bitstream_get (uint32_t num_bits)
-{
-	uint32_t result;
-
-	if (num_bits < bits_left) {
-		result = (current_word << (64 - bits_left)) >> (64 - num_bits);
-		bits_left -= num_bits;
-		return result;
-	}
-
-	return bitstream_get_bh (num_bits);
-}
diff --git a/ac3dec/bswap.h b/ac3dec/bswap.h
deleted file mode 100644
index 73d398aa1..000000000
--- a/ac3dec/bswap.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __BSWAP_H__
-#define __BSWAP_H__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#else
-
-#include <inttypes.h>
-
-#ifdef WORDS_BIGENDIAN
-// FIXME these need to actually swap ;)
-#define bswap_16(x) (x)
-#define bswap_32(x) (x)
-#define bswap_64(x) (x)
-#else
-// This is wrong, 'cannot take address of ...'
-#define bswap_16(x) ((((uint8_t*)&x)[2] << 8) \
-			| (((uint8_t*)&x)[3]))
-
-// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
-#define bswap_32(x) \
-     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-
-#define bswap_64(x) \
-     (__extension__						\
-      ({ union { __extension__ unsigned long long int __ll;	\
-                 unsigned long int __l[2]; } __w, __r;		\
-         __w.__ll = (x);					\
-         __r.__l[0] = bswap_32 (__w.__l[1]);			\
-         __r.__l[1] = bswap_32 (__w.__l[0]);			\
-         __r.__ll; }))
-#endif
-
-#endif
-
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
-
-#ifdef WORDS_BIGENDIAN
-#define be2me_16(x) (x)
-#define be2me_32(x) (x)
-#define be2me_64(x) (x)
-#define le2me_16(x) bswap_16(x)
-#define le2me_32(x) bswap_32(x)
-#define le2me_64(x) bswap_64(x)
-#else
-#define be2me_16(x) bswap_16(x)
-#define be2me_32(x) bswap_32(x)
-#define be2me_64(x) bswap_64(x)
-#define le2me_16(x) (x)
-#define le2me_32(x) (x)
-#define le2me_64(x) (x)
-#endif
-
-#endif
diff --git a/ac3dec/cmplx.h b/ac3dec/cmplx.h
deleted file mode 100644
index 9f74721ec..000000000
--- a/ac3dec/cmplx.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __COMPLEX_H__
-#define __COMPLEX_H__
-
-typedef struct complex {
-	float re;
-	float im;
-} complex_t;
-
-#endif
diff --git a/ac3dec/coeff.c b/ac3dec/coeff.c
deleted file mode 100644
index 7d5579cae..000000000
--- a/ac3dec/coeff.c
+++ /dev/null
@@ -1,431 +0,0 @@
-/* 
- *    coeff.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-#include "bitstream.h"
-#include "dither.h"
-#include "coeff.h"
-
-
-//
-//Lookup tables of 0.15 two's complement quantization values
-//
-#define Q0 ((-2 << 15) / 3.0)
-#define Q1 (0)
-#define Q2 ((2 << 15) / 3.0)
-
-static const float q_1_0[ 32 ] =
-{
-	Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,
-	Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,
-	Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,
-	0,0,0,0,0
-};                                                                              
-
-static const float q_1_1[ 32 ] =
-{
-	Q0,Q0,Q0,Q1,Q1,Q1,Q2,Q2,Q2,
-	Q0,Q0,Q0,Q1,Q1,Q1,Q2,Q2,Q2,
-	Q0,Q0,Q0,Q1,Q1,Q1,Q2,Q2,Q2,
-	0,0,0,0,0
-};                                                                              
-
-static const float q_1_2[ 32 ] =
-{
-	Q0,Q1,Q2,Q0,Q1,Q2,Q0,Q1,Q2,
-	Q0,Q1,Q2,Q0,Q1,Q2,Q0,Q1,Q2,
-	Q0,Q1,Q2,Q0,Q1,Q2,Q0,Q1,Q2,
-	0,0,0,0,0
-};                                                                              
-
-#undef Q0
-#undef Q1
-#undef Q2
-
-#define Q0 ((-4 << 15) / 5.0)
-#define Q1 ((-2 << 15) / 5.0)
-#define Q2 (0)
-#define Q3 ((2 << 15) / 5.0)
-#define Q4 ((4 << 15) / 5.0)
-
-static const float q_2_0[ 128 ] =
-{
-	Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,
-	Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,Q0,
-	Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,
-	Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,Q1,
-	Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,
-	Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,Q2,
-	Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,
-	Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,Q3,
-	Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,
-	Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,Q4,
-	0,0,0
-};                                                                              
-
-static const float q_2_1[ 128 ] =
-{
-	Q0,Q0,Q0,Q0,Q0,Q1,Q1,Q1,Q1,Q1,
-	Q2,Q2,Q2,Q2,Q2,Q3,Q3,Q3,Q3,Q3,
-	Q4,Q4,Q4,Q4,Q4,Q0,Q0,Q0,Q0,Q0,
-	Q1,Q1,Q1,Q1,Q1,Q2,Q2,Q2,Q2,Q2,
-	Q3,Q3,Q3,Q3,Q3,Q4,Q4,Q4,Q4,Q4,
-	Q0,Q0,Q0,Q0,Q0,Q1,Q1,Q1,Q1,Q1,
-	Q2,Q2,Q2,Q2,Q2,Q3,Q3,Q3,Q3,Q3,
-	Q4,Q4,Q4,Q4,Q4,Q0,Q0,Q0,Q0,Q0,
-	Q1,Q1,Q1,Q1,Q1,Q2,Q2,Q2,Q2,Q2,
-	Q3,Q3,Q3,Q3,Q3,Q4,Q4,Q4,Q4,Q4,
-	Q0,Q0,Q0,Q0,Q0,Q1,Q1,Q1,Q1,Q1,
-	Q2,Q2,Q2,Q2,Q2,Q3,Q3,Q3,Q3,Q3,
-	Q4,Q4,Q4,Q4,Q4,0,0,0
- };
-
-static const float q_2_2[ 128 ] =
- {
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,Q0,Q1,Q2,Q3,Q4,
-	Q0,Q1,Q2,Q3,Q4,0,0,0
-};                                                                              
-
-#undef Q0
-#undef Q1
-#undef Q2
-#undef Q3
-#undef Q4                                                                      
-
-static const float q_3[7] =
-{
-	(-6 << 15)/7.0, (-4 << 15)/7.0, (-2 << 15)/7.0, 0.0,
-	( 2 << 15)/7.0, ( 4 << 15)/7.0, ( 6 << 15)/7.0
-};
-
-#define Q0 ((-10 << 15) / 11.0)
-#define Q1 ((-8 << 15) / 11.0)
-#define Q2 ((-6 << 15) / 11.0)
-#define Q3 ((-4 << 15) / 11.0)
-#define Q4 ((-2 << 15) / 11.0)
-#define Q5 (0)
-#define Q6 ((2 << 15) / 11.0)
-#define Q7 ((4 << 15) / 11.0)
-#define Q8 ((6 << 15) / 11.0)
-#define Q9 ((8 << 15) / 11.0)
-#define QA ((10 << 15) / 11.0)
-
-static const float q_4_0[ 128 ] =
-{
-	Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0, Q0,
-	Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1, Q1,
-	Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2, Q2,
-	Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3, Q3,
-	Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4, Q4,
-	Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5, Q5,
-	Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6, Q6,
-	Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7, Q7,
-	Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8, Q8,
-	Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9, Q9,
-	QA, QA, QA, QA, QA, QA, QA, QA, QA, QA, QA,
-	 0,  0,  0,  0,  0,  0,  0
- };
-
-static const float q_4_1[ 128 ] =
-{
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, Q8, Q9, QA,
-	 0,  0,  0,  0,  0,  0,  0
-};
-
-#undef Q0
-#undef Q1
-#undef Q2
-#undef Q3
-#undef Q4
-#undef Q5
-#undef Q6
-#undef Q7
-#undef Q8
-#undef Q9
-#undef QA                                                                       
-
-static const float q_5[15] =
-{
-	(-14 << 15)/15.0,(-12 << 15)/15.0,(-10 << 15)/15.0,
-	( -8 << 15)/15.0,( -6 << 15)/15.0,( -4 << 15)/15.0,
-	( -2 << 15)/15.0,   0.0          ,(  2 << 15)/15.0,
-	(  4 << 15)/15.0,(  6 << 15)/15.0,(  8 << 15)/15.0,
-	( 10 << 15)/15.0,( 12 << 15)/15.0,( 14 << 15)/15.0
-};                                                                              
-
-//
-// Scale factors for convert_to_float
-//
-
-static const uint32_t u32_scale_factors[25] = 
-{
-	0x38000000, //2 ^ -(0 + 15)
-	0x37800000, //2 ^ -(1 + 15)
-	0x37000000, //2 ^ -(2 + 15)
-	0x36800000, //2 ^ -(3 + 15)
-	0x36000000, //2 ^ -(4 + 15)
-	0x35800000, //2 ^ -(5 + 15)
-	0x35000000, //2 ^ -(6 + 15)
-	0x34800000, //2 ^ -(7 + 15)
-	0x34000000, //2 ^ -(8 + 15)
-	0x33800000, //2 ^ -(9 + 15)
-	0x33000000, //2 ^ -(10 + 15)
-	0x32800000, //2 ^ -(11 + 15)
-	0x32000000, //2 ^ -(12 + 15)
-	0x31800000, //2 ^ -(13 + 15)
-	0x31000000, //2 ^ -(14 + 15)
-	0x30800000, //2 ^ -(15 + 15)
-	0x30000000, //2 ^ -(16 + 15)
-	0x2f800000, //2 ^ -(17 + 15)
-	0x2f000000, //2 ^ -(18 + 15)
-	0x2e800000, //2 ^ -(19 + 15)
-	0x2e000000, //2 ^ -(20 + 15)
-	0x2d800000, //2 ^ -(21 + 15)
-	0x2d000000, //2 ^ -(22 + 15)
-	0x2c800000, //2 ^ -(23 + 15)
-	0x2c000000  //2 ^ -(24 + 15)
-};
-
-static float *scale_factor = (float*)u32_scale_factors;
-
-//These store the persistent state of the packed mantissas
-static float q_1[2];
-static float q_2[2];
-static float q_4[1];
-static int32_t q_1_pointer;
-static int32_t q_2_pointer;
-static int32_t q_4_pointer;
-static float __inline__
-coeff_get_float(uint16_t bap, uint16_t dithflag, uint16_t exp);
-
-//Conversion from bap to number of bits in the mantissas
-//zeros account for cases 0,1,2,4 which are special cased
-static uint16_t qnttztab[16] =
-{
-	 0,  0,  0,  3,
-	 0,  4,  5,  6,
-	 7,  8,  9, 10,
-	11, 12, 14, 16
-};
-
-static void	coeff_reset(void);
-static float	coeff_get_float(uint16_t bap, uint16_t dithflag, uint16_t exp);
-static void	coeff_uncouple_ch(float samples[],bsi_t *bsi,audblk_t *audblk,uint32_t ch);
-
-void coeff_unpack(bsi_t *bsi, audblk_t *audblk, stream_samples_t samples)
-{
-	uint16_t i,j;
-	uint32_t done_cpl = 0;
-
-	coeff_reset();
-
-	for(i=0; i< bsi->nfchans; i++) {
-		for(j=0; j < audblk->endmant[i]; j++)
-			samples[i][j] = coeff_get_float(audblk->fbw_bap[i][j], audblk->dithflag[i], audblk->fbw_exp[i][j]);
-
-		if(audblk->cplinu && audblk->chincpl[i] && !(done_cpl)) {
-			// ncplmant is equal to 12 * ncplsubnd
-			// Don't dither coupling channel until channel
-			// separation so that interchannel noise is uncorrelated 
-			for(j=audblk->cplstrtmant; j < audblk->cplendmant; j++)
-				audblk->cpl_flt[j] = coeff_get_float(audblk->cpl_bap[j],0, audblk->cpl_exp[j]);
-			done_cpl = 1;
-		}
-	}
-
-	//uncouple the channel if necessary
-	if(audblk->cplinu) {
-		for(i=0; i< bsi->nfchans; i++) {
-			if(audblk->chincpl[i])
-				coeff_uncouple_ch(samples[i],bsi,audblk,i);
-		}
-
-	}
-
-	if(bsi->lfeon) {
-		// There are always 7 mantissas for lfe, no dither for lfe 
-		for(j=0; j < 7 ; j++)
-			samples[5][j] = coeff_get_float(audblk->lfe_bap[j], 0, audblk->lfe_exp[j]);
-	}
-}
-
-
-/**
- * Fetch a float from the bitstream
- **/
-
-static float inline coeff_get_float (uint16_t bap, uint16_t dithflag, uint16_t exp)
-{
-	uint16_t dummy = 0;
-
-	//If the bap is 0-5 then we have special cases to take care of
-	switch(bap) {
-		case 0:
-			if(dithflag)
-				return (dither_gen() * scale_factor[exp]);
-
-			return 0.0;
-
-		case 1:
-			if (q_1_pointer >= 0)
-				return(q_1[q_1_pointer--] * scale_factor[exp]);
-
-			if ((dummy = bitstream_get (5)) > 26)
-				goto error;
-
-			q_1[1] = q_1_1[dummy];
-			q_1[0] = q_1_2[dummy];
-			q_1_pointer = 1;
-
-			return (q_1_0[dummy] * scale_factor[exp]);
-
-		case 2:
-			if(q_2_pointer >= 0)
-				return (q_2[q_2_pointer--] * scale_factor[exp]);
-
-			if ((dummy = bitstream_get (7)) > 124)
-				goto error;
-
-			q_2[1] = q_2_1[dummy];
-			q_2[0] = q_2_2[dummy];
-			q_2_pointer = 1;
-
-			return (q_2_0[dummy] * scale_factor[exp]);
-
-		case 3:
-			if ((dummy = bitstream_get (3)) > 6)
-				goto error;
-
-			return (q_3[dummy] * scale_factor[exp]);
-
-		case 4:
-			if(q_4_pointer >= 0)
-				return (q_4[q_4_pointer--] * scale_factor[exp]);
-
-			if ((dummy = bitstream_get (7)) > 120)
-				goto error;
-
-			q_4[0] = q_4_1[dummy];
-			q_4_pointer = 0;
-
-			return (q_4_0[dummy] * scale_factor[exp]);  
-
-		case 5:
-			if ((dummy = bitstream_get (4)) > 14)
-				goto error;
-
-			return (q_5[dummy] * scale_factor[exp]);
-
-		default:
-			dummy = bitstream_get(qnttztab[bap]);
-			dummy <<= 16 - qnttztab[bap];
-			return ((int16_t)dummy * scale_factor[exp]);  
-	}
-
-error:
-#ifdef DEBUG
-	fprintf(stderr,"** Invalid mantissa - skipping frame **\n");
-#endif
-	HANDLE_ERROR();
-}
-
-
-/**
- * Reset the mantissa state
- **/
-
-static void coeff_reset(void)
-{
-	q_1_pointer = q_2_pointer = q_4_pointer = -1;
-}
-
-
-/**
- * Uncouple the coupling channel into a fbw channel
- **/
-
-static void coeff_uncouple_ch (float samples[],bsi_t *bsi,audblk_t *audblk,uint32_t ch)
-{
-	uint32_t bnd = 0;
-	uint32_t sub_bnd = 0;
-	uint32_t i,j;
-	float cpl_coord = 1.0;
-	uint32_t cpl_exp_tmp;
-	uint32_t cpl_mant_tmp;
-
-	for (i=audblk->cplstrtmant;i<audblk->cplendmant;) {
-		if (!audblk->cplbndstrc[sub_bnd++]) {
-			cpl_exp_tmp = audblk->cplcoexp[ch][bnd] + 3 * audblk->mstrcplco[ch];
-			if (audblk->cplcoexp[ch][bnd] == 15)
-				cpl_mant_tmp = (audblk->cplcomant[ch][bnd]) << 11;
-			else
-				cpl_mant_tmp = ((0x10) | audblk->cplcomant[ch][bnd]) << 10;
-			
-			cpl_coord = (cpl_mant_tmp * scale_factor[cpl_exp_tmp]) * 8.0f;
-
-			//Invert the phase for the right channel if necessary
-			if(bsi->acmod == 0x2 && audblk->phsflginu && ch == 1 && audblk->phsflg[bnd])
-				cpl_coord *= -1;
-
-			bnd++;
-		}
-
-		for(j=0;j < 12; j++) {
-			// Get new dither values for each channel if necessary,
-			// so the channels are uncorrelated
-			if(audblk->dithflag[ch] && !audblk->cpl_bap[i])
-				samples[i] = cpl_coord * (dither_gen() * scale_factor[audblk->cpl_exp[i]]);
-			else
-				samples[i] = cpl_coord * audblk->cpl_flt[i];
-
-			i++;
-		}
-	}
-}
diff --git a/ac3dec/coeff.h b/ac3dec/coeff.h
deleted file mode 100644
index dc822a9bd..000000000
--- a/ac3dec/coeff.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 
- *    coeff.h
- *
- *	Copyright (C) Aaron Holtzman - Feb 2000
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-void coeff_unpack(bsi_t *bsi, audblk_t *audblk,stream_samples_t samples);
diff --git a/ac3dec/cpu_accel.c b/ac3dec/cpu_accel.c
deleted file mode 100644
index e01db83f6..000000000
--- a/ac3dec/cpu_accel.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#include <inttypes.h>
-#include "mm_accel.h"
-
-//#ifdef __i386__
-#if 0
-
-#ifdef __PIC__
-#define cpuid(op, eax, ebx, ecx, edx)		\
-	__asm__ __volatile__ ("pushl %%ebx\n\t"	\
-		  "cpuid\n\t"			\
-		  "movl %%ebx, %%esi\n\t"	\
-		  "popl %%ebx"			\
-		: "=a" (eax),			\
-		  "=S" (ebx),			\
-		  "=c" (ecx),			\
-		  "=d" (edx)			\
-		: "a" (op)			\
-		: "cc")
-#else
-#define cpuid(op, eax, ebx, ecx, edx)		\
-	__asm__("cpuid"				\
-		: "=a" (eax),			\
-		  "=b" (ebx),			\
-		  "=c" (ecx),			\
-		  "=d" (edx)			\
-		: "a" (op)			\
-		: "cc")
-#endif
-
-static inline int has_cpuid ()
-{
-	return 1;
-/*
-	uint32_t eax, ebx;
-
-	asm ("pushfl\n\t"
-		  "popl %0\n\t"
-		  "movl %0,%1\n\t"
-		  "xorl $0x200000,%0\n\t"
-		  "pushl %0\n\t"
-		  "popfl\n\t"
-		  "pushfl\n\t"
-		  "popl %0"
-		: "=a" (eax),
-		  "=b" (ebx)
-		:
-		: "cc");
-
-	return (eax != ebx);
-*/
-}
-
-
-static uint32_t x86_accel (void)
-{
-	uint32_t eax, ebx, ecx, edx;
-	int AMD;
-	uint32_t caps;
-
-	if (!has_cpuid ())		// no cpuid
-		return 0;
-
-	cpuid (0x00000000, eax, ebx, ecx, edx);
-	if (!eax)			// vendor string only
-		return 0;
-
-	AMD = (ebx == 0x68747541) && (ecx == 0x444d4163) && (edx == 0x69746e65);
-
-	cpuid (0x00000001, eax, ebx, ecx, edx);
-	if (! (edx & 0x00800000))	// no MMX
-		return 0;
-
-	caps = OMS_ACCEL_X86_MMX;
-	if (edx & 0x02000000)		// SSE - identical to AMD MMX extensions
-		caps = OMS_ACCEL_X86_MMX | OMS_ACCEL_X86_MMXEXT;
-
-	cpuid (0x80000000, eax, ebx, ecx, edx);
-	if (eax < 0x80000001)		// no extended capabilities
-		return caps;
-
-	cpuid (0x80000001, eax, ebx, ecx, edx);
-
-	if (edx & 0x80000000)
-		caps |= OMS_ACCEL_X86_3DNOW;
-
-	if (AMD && (edx & 0x00400000))	// AMD MMX extensions
-		caps |= OMS_ACCEL_X86_MMXEXT;
-
-	return caps;
-}
-#endif
-
-uint32_t mm_accel (void)
-{
-//#ifdef __i386__
-#if 0
-    static int got_accel = 0;
-    static uint32_t accel;
-
-    if (!got_accel) {
-	got_accel = 1;
-	accel = x86_accel ();
-    }
-
-    return accel;
-#else
-    return 0;
-#endif
-}
diff --git a/ac3dec/crc.c b/ac3dec/crc.c
deleted file mode 100644
index 2d5ef8065..000000000
--- a/ac3dec/crc.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- *    crc.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-#include <sys/time.h>
-
-#include "crc.h"
-
-static const uint16_t crc_lut[256] = 
-{
-	0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
-	0x8033,0x0036,0x003c,0x8039,0x0028,0x802d,0x8027,0x0022,
-	0x8063,0x0066,0x006c,0x8069,0x0078,0x807d,0x8077,0x0072,
-	0x0050,0x8055,0x805f,0x005a,0x804b,0x004e,0x0044,0x8041,
-	0x80c3,0x00c6,0x00cc,0x80c9,0x00d8,0x80dd,0x80d7,0x00d2,
-	0x00f0,0x80f5,0x80ff,0x00fa,0x80eb,0x00ee,0x00e4,0x80e1,
-	0x00a0,0x80a5,0x80af,0x00aa,0x80bb,0x00be,0x00b4,0x80b1,
-	0x8093,0x0096,0x009c,0x8099,0x0088,0x808d,0x8087,0x0082,
-	0x8183,0x0186,0x018c,0x8189,0x0198,0x819d,0x8197,0x0192,
-	0x01b0,0x81b5,0x81bf,0x01ba,0x81ab,0x01ae,0x01a4,0x81a1,
-	0x01e0,0x81e5,0x81ef,0x01ea,0x81fb,0x01fe,0x01f4,0x81f1,
-	0x81d3,0x01d6,0x01dc,0x81d9,0x01c8,0x81cd,0x81c7,0x01c2,
-	0x0140,0x8145,0x814f,0x014a,0x815b,0x015e,0x0154,0x8151,
-	0x8173,0x0176,0x017c,0x8179,0x0168,0x816d,0x8167,0x0162,
-	0x8123,0x0126,0x012c,0x8129,0x0138,0x813d,0x8137,0x0132,
-	0x0110,0x8115,0x811f,0x011a,0x810b,0x010e,0x0104,0x8101,
-	0x8303,0x0306,0x030c,0x8309,0x0318,0x831d,0x8317,0x0312,
-	0x0330,0x8335,0x833f,0x033a,0x832b,0x032e,0x0324,0x8321,
-	0x0360,0x8365,0x836f,0x036a,0x837b,0x037e,0x0374,0x8371,
-	0x8353,0x0356,0x035c,0x8359,0x0348,0x834d,0x8347,0x0342,
-	0x03c0,0x83c5,0x83cf,0x03ca,0x83db,0x03de,0x03d4,0x83d1,
-	0x83f3,0x03f6,0x03fc,0x83f9,0x03e8,0x83ed,0x83e7,0x03e2,
-	0x83a3,0x03a6,0x03ac,0x83a9,0x03b8,0x83bd,0x83b7,0x03b2,
-	0x0390,0x8395,0x839f,0x039a,0x838b,0x038e,0x0384,0x8381,
-	0x0280,0x8285,0x828f,0x028a,0x829b,0x029e,0x0294,0x8291,
-	0x82b3,0x02b6,0x02bc,0x82b9,0x02a8,0x82ad,0x82a7,0x02a2,
-	0x82e3,0x02e6,0x02ec,0x82e9,0x02f8,0x82fd,0x82f7,0x02f2,
-	0x02d0,0x82d5,0x82df,0x02da,0x82cb,0x02ce,0x02c4,0x82c1,
-	0x8243,0x0246,0x024c,0x8249,0x0258,0x825d,0x8257,0x0252,
-	0x0270,0x8275,0x827f,0x027a,0x826b,0x026e,0x0264,0x8261,
-	0x0220,0x8225,0x822f,0x022a,0x823b,0x023e,0x0234,0x8231,
-	0x8213,0x0216,0x021c,0x8219,0x0208,0x820d,0x8207,0x0202
-};
-
-static uint16_t state;
-
-
-void crc_init(void)
-{
-	state = 0;
-}
-
-
-inline void crc_process_byte (uint8_t data)
-{
-	state = crc_lut[data ^ (state>>8)] ^ (state<<8);
-}
-
-
-void crc_process_frame (uint8_t *data,uint32_t num_bytes)
-{
-	uint32_t i;
-
-	for(i=0; i<num_bytes; i++)
-		crc_process_byte (data[i]);
-}
-
-
-int crc_validate(void)
-{
-	return (state == 0);
-}
diff --git a/ac3dec/crc.h b/ac3dec/crc.h
deleted file mode 100644
index 16489656c..000000000
--- a/ac3dec/crc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 
- *  crc.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
- 
-int crc_validate(void);
-void crc_init(void);
-void crc_process_byte(uint8_t data);
-void crc_process_frame(uint8_t *data,uint32_t num_bytes);
diff --git a/ac3dec/debug.c b/ac3dec/debug.c
deleted file mode 100644
index b84511d7f..000000000
--- a/ac3dec/debug.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * debug.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <stdlib.h>
-#include "debug.h"
-
-static int debug_level = -1;
-
-// Determine is debug output is required.
-// We could potentially have multiple levels of debug info
-int debug_is_on(void)
-{
-	if(debug_level < 0) {
-		debug_level = getenv ("AC3_DEBUG") ? 1 : 0;
-	}
-	
-	return debug_level;
-}
-
-//If you don't have gcc, then ya don't get debug output
-#ifndef __GNUC__
-void dprintf(char fmt[],...)
-{
-	return;
-}
-#endif
-
diff --git a/ac3dec/debug.h b/ac3dec/debug.h
deleted file mode 100644
index 691d40329..000000000
--- a/ac3dec/debug.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * debug.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-int debug_is_on (void);
-
-#ifdef __GNUC__
-#ifdef DEBUG
-#define dprintf(args...)\
-{\
-	if (debug_is_on())\
-	{\
-		fprintf(stderr, args);\
-	}\
-}
-#else
-#define dprintf(args...) { };
-#endif
-#else
-void dprintf(char fmt[],...);
-#endif
diff --git a/ac3dec/decode.c b/ac3dec/decode.c
deleted file mode 100644
index 1ff517c41..000000000
--- a/ac3dec/decode.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* 
- *    decode.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *------------------------------------------------------------
- *
- *	Thomas Mirlacher <dent@cosy.sbg.ac.at>
- *	added OMS support
- * 11 Jan 2001
- *	Thomas Mirlacher <dent@cosy.sbg.ac.at>
- *	faster error response using jmp functions
- * 
- *  9 Aug 2001      
- *      Matjaz Thaler <matjaz.thaler@rd.iskraemeco.si>
- *      Added support for DVB-s PCI card
- *
- * 24 Nov 2001
- *      Andreas Schultz <aschultz@cs.uni-magdeburg.de>
- *      Added ac3_buffersize()
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif 
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/time.h>
-
-#ifdef __OMS__
-#include <oms/oms.h>
-#include <oms/plugin/output_audio.h>
-#endif
-
-#include "ac3.h"
-#include "ac3_internal.h"
-#include "bitstream.h"
-#include "downmix.h"
-#include "srfft.h"
-#include "imdct.h"
-#include "exponent.h"
-#include "coeff.h"
-#include "bit_allocate.h"
-#include "parse.h"
-#include "crc.h"
-#include "stats.h"
-#include "rematrix.h"
-#include "sanity_check.h"
-#include "debug.h"
-#ifndef __OMS__
-//#include "audio_out.h"
-#endif
-//our global config structure
-ac3_config_t ac3_config;
-
-static audblk_t audblk;
-static bsi_t bsi;
-static syncinfo_t syncinfo;
-#ifndef __OMS__
-static uint32_t done_banner;
-#endif
-static uint32_t is_output_initialized = 0;
-
-//the floating point samples for one audblk
-static stream_samples_t samples;
-
-//the integer samples for the entire frame (with enough space for 2 ch out)
-//if this size change, be sure to change the size when muting
-static int16_t s16_samples[2 * 6 * 256] __attribute__ ((aligned(16)));
-
-// downmix stuff
-static float cmixlev_lut[4] = { 0.707, 0.595, 0.500, 0.707 };
-static float smixlev_lut[4] = { 0.707, 0.500, 0.0   , 0.500 };
-static dm_par_t dm_par;
- 
-//Storage for the syncframe
-#define BUFFER_MAX_SIZE 4096
-static uint8_t buffer[BUFFER_MAX_SIZE];
-static uint32_t buffer_size = 0;;
-// for error handling
-jmp_buf error_jmp_mark;
-
-uint32_t ac3_buffersize()
-{
-  return buffer_size;
-}
-
-static uint32_t decode_buffer_syncframe (syncinfo_t *syncinfo, uint8_t **start, uint8_t *end)
-{
-	uint8_t *cur = *start;
-	uint16_t syncword = syncinfo->syncword;
-	uint32_t ret = 0;
-
-	// Find an ac3 sync frame.
-	while (syncword != 0x0b77) {
-		if (cur >= end)
-			goto done;
-		syncword = (syncword << 8) + *cur++;
-	}
-
-	//need the next 3 bytes to decide how big the frame is
-	while (buffer_size < 3) {
-		if(cur >= end)
-			goto done;
-
-		buffer[buffer_size++] = *cur++;
-	}
-	
-	parse_syncinfo (syncinfo,buffer);
-	stats_print_syncinfo (syncinfo);
-
-	while (buffer_size < syncinfo->frame_size * 2 - 2) {
-		if(cur >= end)
-			goto done;
-
-		buffer[buffer_size++] = *cur++;
-	}
-
-#if 0
-	// Check the crc over the entire frame 
-	crc_init();
-	crc_process_frame (buffer, syncinfo->frame_size * 2 - 2);
-
-	if (!crc_validate()) {
-		fprintf(stderr,"** CRC failed - skipping frame **\n");
-		goto done;
-	}
-#endif
-
-	//if we got to this point, we found a valid ac3 frame to decode
-
-	bitstream_init (buffer);
-	//get rid of the syncinfo struct as we already parsed it
-	bitstream_get (24);
-
-	//reset the syncword for next time
-	syncword = 0xffff;
-	buffer_size = 0;
-	ret = 1;
-
-done:
-	syncinfo->syncword = syncword;
-	*start = cur;
-	return ret;
-}
-
-
-void inline decode_mute (void)
-{
-	//mute the frame
-	memset (s16_samples, 0, sizeof(int16_t) * 256 * 2 * 6);
-}
-
-
-void ac3dec_init (void)
-{
-// FIXME - don't do that statically here
-	ac3_config.num_output_ch = 2;
-	ac3_config.flags = 0;
-
-	imdct_init ();
-	downmix_init ();
-	memset (&syncinfo, 0, sizeof (syncinfo));
-	memset (&bsi, 0, sizeof (bsi));
-	memset (&audblk, 0, sizeof (audblk));
-	sanity_check_init (&syncinfo,&bsi,&audblk);
-}
-
-#ifdef __OMS__
-size_t ac3dec_decode_data (plugin_output_audio_t *output, uint8_t *data_start, uint8_t *data_end)
-#else
-size_t ac3dec_decode_data (uint8_t *data_start ,uint8_t *data_end, int ac3reset, int *input_pointer, int *output_pointer, char *ac3_data)
-#endif
-{
-	uint32_t i;
-	int datasize;
-	char *data;
-
-
-	if(ac3reset != 0){
-	  syncinfo.syncword = 0xffff;
-	  buffer_size = 0;
-	}
-		
-	if (setjmp (error_jmp_mark) < 0) {
-		ac3dec_init ();
-		return 0;
-	}
-
-	while (decode_buffer_syncframe (&syncinfo, &data_start, data_end)) {
-		parse_bsi (&bsi);
-
-#ifndef __OMS__
-		if(!done_banner) {
-		  //			stats_print_banner(&syncinfo,&bsi);
-			done_banner = 1;
-		}
-#endif
-
-		// compute downmix parameters
-		// downmix to tow channels for now
-		dm_par.clev = 0.0; dm_par.slev = 0.0; dm_par.unit = 1.0;
-		if (bsi.acmod & 0x1)	// have center
-			dm_par.clev = cmixlev_lut[bsi.cmixlev];
-
-		if (bsi.acmod & 0x4)	// have surround channels
-			dm_par.slev = smixlev_lut[bsi.surmixlev];
-
-		dm_par.unit /= 1.0 + dm_par.clev + dm_par.slev;
-		dm_par.clev *= dm_par.unit;
-		dm_par.slev *= dm_par.unit;
-
-		for(i=0; i < 6; i++) {
-			//Initialize freq/time sample storage
-			memset (samples, 0, sizeof(float) * 256 * (bsi.nfchans + bsi.lfeon));
-
-			// Extract most of the audblk info from the bitstream
-			// (minus the mantissas 
-			parse_audblk (&bsi,&audblk);
-
-			// Take the differential exponent data and turn it into
-			// absolute exponents 
-			exponent_unpack (&bsi,&audblk); 
-
-			// Figure out how many bits per mantissa 
-			bit_allocate (syncinfo.fscod,&bsi,&audblk);
-
-			// Extract the mantissas from the stream and
-			// generate floating point frequency coefficients
-			coeff_unpack (&bsi,&audblk,samples);
-
-			if (bsi.acmod == 0x2)
-				rematrix (&audblk,samples);
-
-			// Convert the frequency samples into time samples 
-			imdct (&bsi,&audblk,samples, &s16_samples[i * 2 * 256], &dm_par);
-
-			// Downmix into the requested number of channels
-			// and convert floating point to int16_t
-			// downmix(&bsi,samples,&s16_samples[i * 2 * 256]);
-
-			if (sanity_check(&syncinfo,&bsi,&audblk) < 0) {
-				HANDLE_ERROR ();
-				return 0;
-			}
-
-			continue;
-		}
-
-		if (!is_output_initialized) {
-#ifdef __OMS__
-			plugin_output_audio_attr_t attr;
-#ifdef __sun__
-			attr.format = 16;
-#else
-			attr.format = AFMT_S16_NE;
-#endif
-			attr.speed = syncinfo.sampling_rate;
-			attr.channels = 2;
-
-			//	output->setup (&attr);
-#else
-			//			ao_functions->open (16, syncinfo.sampling_rate, 2);
-#endif
-			is_output_initialized = 1;
-		}
-
-#ifdef __OMS__
-		output->write (s16_samples, 256 * 6 * 2 * 2);
-#else
-		//		ao_functions->play(s16_samples, 256 * 6 * 2);
-		data = (char *)s16_samples;
-		datasize = 0;
-		while(datasize < 6144){
-		  if(((*input_pointer+1) % AC3_BUFFER_SIZE) != *output_pointer){    // There is room in the sync_buffer
-		    ac3_data[*input_pointer]=data[datasize];
-		    datasize++;
-		    *input_pointer = (*input_pointer+1) % AC3_BUFFER_SIZE;
-		  }
-		  else{
-		    *input_pointer = *output_pointer = 0;
-		    break;
-		  }
-		}
-
-#endif
-
-	}
-
-	decode_mute ();
-
-	return 0;	
-}
diff --git a/ac3dec/decode.h b/ac3dec/decode.h
deleted file mode 100644
index bb84a1105..000000000
--- a/ac3dec/decode.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 
- *  decode.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
diff --git a/ac3dec/dither.c b/ac3dec/dither.c
deleted file mode 100644
index 079c04d6d..000000000
--- a/ac3dec/dither.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* 
- *    dither.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-#include "dither.h"
-
-
-const uint16_t dither_lut[256] = 
-{
- 0x0000, 0xa011, 0xe033, 0x4022, 0x6077, 0xc066, 0x8044, 0x2055,
- 0xc0ee, 0x60ff, 0x20dd, 0x80cc, 0xa099, 0x0088, 0x40aa, 0xe0bb,
- 0x21cd, 0x81dc, 0xc1fe, 0x61ef, 0x41ba, 0xe1ab, 0xa189, 0x0198,
- 0xe123, 0x4132, 0x0110, 0xa101, 0x8154, 0x2145, 0x6167, 0xc176,
- 0x439a, 0xe38b, 0xa3a9, 0x03b8, 0x23ed, 0x83fc, 0xc3de, 0x63cf,
- 0x8374, 0x2365, 0x6347, 0xc356, 0xe303, 0x4312, 0x0330, 0xa321,
- 0x6257, 0xc246, 0x8264, 0x2275, 0x0220, 0xa231, 0xe213, 0x4202,
- 0xa2b9, 0x02a8, 0x428a, 0xe29b, 0xc2ce, 0x62df, 0x22fd, 0x82ec,
- 0x8734, 0x2725, 0x6707, 0xc716, 0xe743, 0x4752, 0x0770, 0xa761,
- 0x47da, 0xe7cb, 0xa7e9, 0x07f8, 0x27ad, 0x87bc, 0xc79e, 0x678f,
- 0xa6f9, 0x06e8, 0x46ca, 0xe6db, 0xc68e, 0x669f, 0x26bd, 0x86ac,
- 0x6617, 0xc606, 0x8624, 0x2635, 0x0660, 0xa671, 0xe653, 0x4642,
- 0xc4ae, 0x64bf, 0x249d, 0x848c, 0xa4d9, 0x04c8, 0x44ea, 0xe4fb,
- 0x0440, 0xa451, 0xe473, 0x4462, 0x6437, 0xc426, 0x8404, 0x2415,
- 0xe563, 0x4572, 0x0550, 0xa541, 0x8514, 0x2505, 0x6527, 0xc536,
- 0x258d, 0x859c, 0xc5be, 0x65af, 0x45fa, 0xe5eb, 0xa5c9, 0x05d8,
- 0xae79, 0x0e68, 0x4e4a, 0xee5b, 0xce0e, 0x6e1f, 0x2e3d, 0x8e2c,
- 0x6e97, 0xce86, 0x8ea4, 0x2eb5, 0x0ee0, 0xaef1, 0xeed3, 0x4ec2,
- 0x8fb4, 0x2fa5, 0x6f87, 0xcf96, 0xefc3, 0x4fd2, 0x0ff0, 0xafe1,
- 0x4f5a, 0xef4b, 0xaf69, 0x0f78, 0x2f2d, 0x8f3c, 0xcf1e, 0x6f0f,
- 0xede3, 0x4df2, 0x0dd0, 0xadc1, 0x8d94, 0x2d85, 0x6da7, 0xcdb6,
- 0x2d0d, 0x8d1c, 0xcd3e, 0x6d2f, 0x4d7a, 0xed6b, 0xad49, 0x0d58,
- 0xcc2e, 0x6c3f, 0x2c1d, 0x8c0c, 0xac59, 0x0c48, 0x4c6a, 0xec7b,
- 0x0cc0, 0xacd1, 0xecf3, 0x4ce2, 0x6cb7, 0xcca6, 0x8c84, 0x2c95,
- 0x294d, 0x895c, 0xc97e, 0x696f, 0x493a, 0xe92b, 0xa909, 0x0918,
- 0xe9a3, 0x49b2, 0x0990, 0xa981, 0x89d4, 0x29c5, 0x69e7, 0xc9f6,
- 0x0880, 0xa891, 0xe8b3, 0x48a2, 0x68f7, 0xc8e6, 0x88c4, 0x28d5,
- 0xc86e, 0x687f, 0x285d, 0x884c, 0xa819, 0x0808, 0x482a, 0xe83b,
- 0x6ad7, 0xcac6, 0x8ae4, 0x2af5, 0x0aa0, 0xaab1, 0xea93, 0x4a82,
- 0xaa39, 0x0a28, 0x4a0a, 0xea1b, 0xca4e, 0x6a5f, 0x2a7d, 0x8a6c,
- 0x4b1a, 0xeb0b, 0xab29, 0x0b38, 0x2b6d, 0x8b7c, 0xcb5e, 0x6b4f,
- 0x8bf4, 0x2be5, 0x6bc7, 0xcbd6, 0xeb83, 0x4b92, 0x0bb0, 0xaba1
-};
-
-uint16_t lfsr_state = 1;
-
-//
-// see dither_gen (inline-able) in dither.h
-//
-
-#if 0
-
-//
-// this is the old dither_gen with is much slower than the new inlined
-// lut version and is still here because it's easier to understand.
-//
-
-/* 
- * Generate eight bits of pseudo-entropy using a 16 bit linear
- * feedback shift register (LFSR). The primitive polynomial used
- * is 1 + x^4 + x^14 + x^16.
- *
- * The distribution is uniform, over the range [-0.707,0.707]
- *
- */
-
-uint16_t dither_gen(void)
-{
-	int i;
-	uint32_t state;
-
-	//explicitly bring the state into a local var as gcc > 3.0?
-	//doesn't know how to optimize out the stores
-	state = lfsr_state;
-
-	//Generate eight pseudo random bits
-	for(i=0;i<8;i++) {
-		state <<= 1;	
-
-		if(state & 0x10000)
-			state ^= 0xa011;
-	}
-
-	lfsr_state = state;
-
-	return (((((int32_t)state<<8)>>8) * (int32_t) (0.707106 * 256.0))>>16);
-}
-
-#endif
diff --git a/ac3dec/dither.h b/ac3dec/dither.h
deleted file mode 100644
index abb9f518e..000000000
--- a/ac3dec/dither.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 
- *    dither.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-extern uint16_t lfsr_state;
-extern const uint16_t dither_lut[256]; 
-
-static inline uint16_t dither_gen(void)
-{
-	int16_t state;
-
-	state = dither_lut[lfsr_state >> 8] ^ (lfsr_state << 8);
-	
-	lfsr_state = (uint16_t) state;
-
-	return ((state * (int32_t) (0.707106 * 256.0))>>8);
-}
diff --git a/ac3dec/downmix.c b/ac3dec/downmix.c
deleted file mode 100644
index 8eac3e21f..000000000
--- a/ac3dec/downmix.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  imdct.c
- *    
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <mm_accel.h>
-
-#include "ac3.h"
-#include "ac3_internal.h"
-
-#include "debug.h"
-#include "downmix.h"
-#include "downmix_c.h"
-#include "downmix_i386.h"
-#ifdef HAVE_KNI
-#include "downmix_kni.h"
-#endif
-
-void (*downmix_3f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
-void (*downmix_3f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
-void (*downmix_2f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
-void (*downmix_2f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
-void (*downmix_3f_0r_to_2ch)(float *samples, dm_par_t * dm_par);
-void (*stream_sample_2ch_to_s16)(int16_t *s16_samples, float *left, float *right);
-void (*stream_sample_1ch_to_s16)(int16_t *s16_samples, float *center);
-
-
-void downmix_init()
-{
-#ifdef __i386__
-#ifdef HAVE_KNI
-	uint32_t accel = mm_accel ();
-
-// other dowmixing should go here too
-	if (accel & MM_ACCEL_X86_MMXEXT) {
-		dprintf("Using SSE for downmix\n");
-		downmix_3f_2r_to_2ch = downmix_3f_2r_to_2ch_kni;
-		downmix_2f_2r_to_2ch = downmix_2f_2r_to_2ch_kni;
-		downmix_3f_1r_to_2ch = downmix_3f_1r_to_2ch_kni;
-		downmix_2f_1r_to_2ch = downmix_2f_1r_to_2ch_kni;
-		downmix_3f_0r_to_2ch = downmix_3f_0r_to_2ch_kni;
-		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_kni;
-		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_kni;
-	} else if (accel & MM_ACCEL_X86_3DNOW) {
-	} else
-#endif
-#endif
-	{
-		downmix_3f_2r_to_2ch = downmix_3f_2r_to_2ch_c;
-		downmix_2f_2r_to_2ch = downmix_2f_2r_to_2ch_c;
-		downmix_3f_1r_to_2ch = downmix_3f_1r_to_2ch_c;
-		downmix_2f_1r_to_2ch = downmix_2f_1r_to_2ch_c;
-		downmix_3f_0r_to_2ch = downmix_3f_0r_to_2ch_c;
-#ifdef __i386__
-#if 1
-		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_c;
-		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_c;
-#else
-		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_i386;
-		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_i386;
-#endif
-#else
-		stream_sample_2ch_to_s16 = stream_sample_2ch_to_s16_c;
-		stream_sample_1ch_to_s16 = stream_sample_1ch_to_s16_c;
-#endif
-	}
-}
diff --git a/ac3dec/downmix.h b/ac3dec/downmix.h
deleted file mode 100644
index dcfe1e12e..000000000
--- a/ac3dec/downmix.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- *  downmix.h
- *    
- *	Copyright (C) Aaron Holtzman - Sept 1999
- *
- *	Originally based on code by Yeqing Deng.
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-typedef struct dm_par_s {
-	float unit;  
-	float clev;  
-	float slev;          
-} dm_par_t;                                                                     
-
-void downmix_init();
diff --git a/ac3dec/downmix_c.c b/ac3dec/downmix_c.c
deleted file mode 100644
index 875d785e4..000000000
--- a/ac3dec/downmix_c.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *  downmix_c.c
- *    
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-#include "debug.h"
-#include "downmix.h"
-#include "downmix_c.h"
-
-
-void downmix_3f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
-{
-	int i;
-	float *left, *right, *center, *left_sur, *right_sur;
-	float left_tmp, right_tmp;
-
-	left = samples;
-	right = samples + 256 * 2;
-	center = samples + 256;
-	left_sur = samples + 256 * 3;
-	right_sur = samples + 256 * 4;
-
-	for (i=0; i < 256; i++) {
-#if defined DOLBY_SURROUND
-	  	left_tmp = dm_par->unit * *left  + dm_par->clev * *center - dm_par->slev * (*left_sur + *right_sur);
-	  	right_tmp= dm_par->unit * *right++ + dm_par->clev * *center + dm_par->slev * (*left_sur++ + *right_sur++);
-#else
-		left_tmp = dm_par->unit * *left  + dm_par->clev * *center + dm_par->slev * *left_sur++;
-		right_tmp= dm_par->unit * *right++ + dm_par->clev * *center + dm_par->slev * *right_sur++;
-#endif
-		*left++ = left_tmp;
-		*center++ = right_tmp;
-
-	}
-}
-
-
-void downmix_2f_2r_to_2ch_c (float *samples, dm_par_t *dm_par)
-{
-	int i;
-	float *left, *right, *left_sur, *right_sur;
-	float left_tmp, right_tmp;
-               
-	left = &samples[0];
-	right = &samples[256];
-	left_sur = &samples[512];
-	right_sur = &samples[768];
-
-	for (i = 0; i < 256; i++) {
-		left_tmp = dm_par->unit * *left  + dm_par->slev * *left_sur++;
-		right_tmp= dm_par->unit * *right + dm_par->slev * *right_sur++;
-		*left++ = left_tmp;
-		*right++ = right_tmp;
-	}
-}
-
-
-void downmix_3f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
-{
-	int i;
-	float *left, *right, *center, *right_sur;
-	float left_tmp, right_tmp;
-
-	left = &samples[0];
-	right = &samples[512];
-	center = &samples[256];
-	right_sur = &samples[768];
-
-	for (i = 0; i < 256; i++) {
-		left_tmp = dm_par->unit * *left  + dm_par->clev * *center  - dm_par->slev * *right_sur;
-		right_tmp= dm_par->unit * *right++ + dm_par->clev * *center + dm_par->slev * *right_sur++;
-		*left++ = left_tmp;
-		*center++ = right_tmp;
-	}
-}
-
-
-void downmix_2f_1r_to_2ch_c (float *samples, dm_par_t *dm_par)
-{
-	int i;
-	float *left, *right, *right_sur;
-	float left_tmp, right_tmp;
-
-	left = &samples[0];
-	right = &samples[256];
-	right_sur = &samples[512];
-
-	for (i = 0; i < 256; i++) {
-		left_tmp = dm_par->unit * *left  - dm_par->slev * *right_sur;
-		right_tmp= dm_par->unit * *right + dm_par->slev * *right_sur++;
-		*left++ = left_tmp;
-		*right++ = right_tmp;
-	}
-}
-
-
-void downmix_3f_0r_to_2ch_c (float *samples, dm_par_t *dm_par)
-{
-	int i;
-	float *left, *right, *center;
-	float left_tmp, right_tmp;
-
-	left = &samples[0];
-	center = &samples[256];
-	right = &samples[512];
-
-	for (i = 0; i < 256; i++) {
-		left_tmp = dm_par->unit * *left  + dm_par->clev * *center;
-		right_tmp= dm_par->unit * *right++ + dm_par->clev * *center;
-		*left++ = left_tmp;
-		*center++ = right_tmp;
-	}
-}
-
-
-void stream_sample_2ch_to_s16_c (int16_t *s16_samples, float *left, float *right)
-{
-	int i;
-
-	for (i=0; i < 256; i++) {
-		*s16_samples++ = (int16_t) *left++;
-		*s16_samples++ = (int16_t) *right++;
-	}
-}
-
-
-void stream_sample_1ch_to_s16_c (int16_t *s16_samples, float *center)
-{
-	int i;
-	float tmp;
-
-	for (i=0; i < 256; i++) {
-		*s16_samples++ = tmp = (int16_t) (0.7071f * *center++);
-		*s16_samples++ = tmp;
-	}
-}
diff --git a/ac3dec/downmix_c.h b/ac3dec/downmix_c.h
deleted file mode 100644
index 3643f65e8..000000000
--- a/ac3dec/downmix_c.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __DOWNMIX_C_H__
-#define __DOWNMIX_C_H__
-
-void downmix_3f_2r_to_2ch_c(float *samples, dm_par_t * dm_par);
-void downmix_3f_1r_to_2ch_c(float *samples, dm_par_t * dm_par);
-void downmix_2f_2r_to_2ch_c(float *samples, dm_par_t * dm_par);
-void downmix_2f_1r_to_2ch_c(float *samples, dm_par_t * dm_par);
-void downmix_3f_0r_to_2ch_c(float *samples, dm_par_t * dm_par);            
-void stream_sample_2ch_to_s16_c(int16_t *s16_samples, float *left, float *right);
-void stream_sample_1ch_to_s16_c(int16_t *s16_samples, float *center);      
-
-#endif
diff --git a/ac3dec/downmix_i386.S b/ac3dec/downmix_i386.S
deleted file mode 100644
index 20f2e8c37..000000000
--- a/ac3dec/downmix_i386.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/* This is basicly gcc generated.
- * Only the floating point rounding mode loads and saves
- * are removed in the stream_sample_to_s16 functions.
- */                                                                            
-
-#ifdef __i386__
-
-	.file	"downmix.c"
-	.version	"01.01"
-gcc2_compiled.:
-.text
-	.align 4
-.globl stream_sample_2ch_to_s16_i386
-	.type	 stream_sample_2ch_to_s16_i386,@function
-stream_sample_2ch_to_s16_i386:
-	pushl %ebp
-	movl %esp,%ebp
-	subl $28,%esp
-	pushl %edi
-	pushl %esi
-	pushl %ebx
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%ebx
-	movl 16(%ebp),%ecx
-	movl $255,%esi
-	.p2align 4,,7
-.L373:
-	flds (%ebx)
-	fistpl -8(%ebp)
-	movl -8(%ebp),%eax
-	movw %ax,(%edx)
-	addl $2,%edx
-	addl $4,%ebx
-	flds (%ecx)
-	fistpl -8(%ebp)
-	movl -8(%ebp),%eax
-	movw %ax,(%edx)
-	addl $4,%ecx
-	addl $2,%edx
-	decl %esi
-	jns .L373
-	popl %ebx
-	popl %esi
-	popl %edi
-	leave
-	ret
-.Lfe6:
-	.size	 stream_sample_2ch_to_s16_i386,.Lfe6-stream_sample_2ch_to_s16_i386
-.section	.rodata
-	.align 4
-.LC46:
-	.long 0x3f350481
-.text
-	.align 4
-.globl stream_sample_1ch_to_s16_i386
-	.type	 stream_sample_1ch_to_s16_i386,@function
-stream_sample_1ch_to_s16_i386:
-	pushl %ebp
-	movl %esp,%ebp
-	subl $16,%esp
-	pushl %esi
-	pushl %ebx
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%ecx
-	flds .LC46
-	movl $255,%ebx
-	.p2align 4,,7
-.L379:
-	flds (%ecx)
-	fmul %st(1),%st
-	fistpl -8(%ebp)
-	movl -8(%ebp),%eax
-	movw %ax,-2(%ebp)
-	addl $4,%ecx
-	flds -2(%ebp)
-	fistpl -8(%ebp)
-	movl -8(%ebp),%eax
-	movw %ax,(%edx)
-	addl $2,%edx
-	movw %ax,(%edx)
-	addl $2,%edx
-	decl %ebx
-	jns .L379
-	fstp %st(0)
-	popl %ebx
-	popl %esi
-	leave
-	ret
-.Lfe7:
-	.size	 stream_sample_1ch_to_s16_i386,.Lfe7-stream_sample_1ch_to_s16_i386
-	.ident	"GCC: (GNU) 2.95.3 19991030 (prerelease)"
-#endif
diff --git a/ac3dec/downmix_i386.h b/ac3dec/downmix_i386.h
deleted file mode 100644
index e34d7d6cf..000000000
--- a/ac3dec/downmix_i386.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __DOWNMIX_I386_H__
-#define __DOWNMIX_I386_H__
-
-void stream_sample_2ch_to_s16_i386(int16_t *s16_samples, float *left, float *right);
-void stream_sample_1ch_to_s16_i386(int16_t *s16_samples, float *center);      
-
-#endif
diff --git a/ac3dec/downmix_kni.S b/ac3dec/downmix_kni.S
deleted file mode 100644
index 7df8c060f..000000000
--- a/ac3dec/downmix_kni.S
+++ /dev/null
@@ -1,396 +0,0 @@
-/* 
- *  downmix_kni.S
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - October 2000
- *
- *
- *  downmix_kni.S is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  downmix_kni.S is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifdef __i386__
-
-.section .rodata
-	.align 4
-sqrt2:	.float 0f0.7071068
-	.p2align 5,0,
-	
-	.section .text
-	
-	.align 4
-	.global downmix_3f_2r_to_2ch_kni
-	.type downmix_3f_2r_to_2ch_kni, @function
-
-downmix_3f_2r_to_2ch_kni:
-	pushl	%ebp
-	movl  	%esp, %ebp
-	
-	pushl	%eax
-	pushl	%ebx
-	pushl	%ecx
-
-	movl 	8(%ebp), %eax /* samples[] */
-	movl	12(%ebp), %ebx /* &dm_par */
-	movl	$64, %ecx		/* loop counter */
-
-	movss	(%ebx), %xmm5	/* unit */
-	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
-
-	movss	4(%ebx), %xmm6		/* clev */
-	shufps	$0, %xmm6, %xmm6	/* clev | clev | clev | clev */
-
-	movss	8(%ebx), %xmm7		/* slev */
-	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
-
-.loop:	
-	movaps	(%eax), %xmm0 /*  left */
-	movaps	2048(%eax), %xmm1 /* right */
-	movaps 	1024(%eax), %xmm2	/* center */
-	mulps	%xmm5, %xmm0
-	mulps	%xmm5, %xmm1
-	
-	mulps	%xmm6, %xmm2
-	movaps	3072(%eax), %xmm3	/* leftsur */
-	movaps	4096(%eax), %xmm4	/* rithgsur */
-	addps	%xmm2, %xmm0
-	addps 	%xmm2, %xmm1
-
-	mulps	%xmm7, %xmm3
-	mulps	%xmm7, %xmm4
-	addps	%xmm3, %xmm0
-	addps	%xmm4, %xmm1
-
-	movaps	%xmm0, (%eax)
-	movaps	%xmm1, 1024(%eax)
-
-	addl	$16, %eax
-	decl 	%ecx
-	jnz	.loop
-
-	popl	%ecx
-	popl	%ebx
-	popl 	%eax
-
-	leave
-	ret
-	.p2align 4,,7
-
-	.global downmix_2f_2r_to_2ch_kni
-	.type downmix_2f_2r_to_2ch_kni, @function
-
-downmix_2f_2r_to_2ch_kni:
-	pushl %ebp
-	movl  %esp, %ebp
-
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-
-	movl 8(%ebp), %eax /* samples[] */
-	movl 12(%ebp), %ebx /* &dm_par */
-	movl $64, %ecx	/* loop counter */
-
-	movss (%ebx), %xmm5	/* unit */
-	shufps $0, %xmm5, %xmm5 /* unit | unit | unit | unit */
-
-	movss	8(%ebx), %xmm7		/* slev */
-	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
-
-.loop3:	
-	movaps	(%eax), %xmm0 /*  left */
-	movaps	1024(%eax), %xmm1 /* right */
-	movaps 	2048(%eax), %xmm3	/* leftsur */
-	mulps	%xmm5, %xmm0
-	mulps	%xmm5, %xmm1
-	
-	movaps	3072(%eax), %xmm4	/* rightsur */
-
-	mulps	%xmm7, %xmm3
-	mulps	%xmm7, %xmm4
-	addps	%xmm3, %xmm0
-	addps	%xmm4, %xmm1
-
-	movaps	%xmm0, (%eax)
-	movaps	%xmm1, 1024(%eax)
-
-	addl	$16, %eax
-	decl 	%ecx
-	jnz	.loop3
-
-	popl	%ecx
-	popl	%ebx
-	popl 	%eax
-
-	leave
-	ret
-	.p2align 4,,7
-	
-	.global downmix_3f_1r_to_2ch_kni
-	.type downmix_3f_1r_to_2ch_kni, @function
-
-downmix_3f_1r_to_2ch_kni:
-	pushl	%ebp
-	movl  	%esp, %ebp
-	
-	pushl	%eax
-	pushl	%ebx
-	pushl	%ecx
-
-	movl 	8(%ebp), %eax /* samples[] */
-	movl	12(%ebp), %ebx /* &dm_par */
-	movl	$64, %ecx		/* loop counter */
-
-	movss	(%ebx), %xmm5	/* unit */
-	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
-
-	movss	4(%ebx), %xmm6		/* clev */
-	shufps	$0, %xmm6, %xmm6	/* clev | clev | clev | clev */
-
-	movss	8(%ebx), %xmm7		/* slev */
-	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
-
-.loop4:	
-	movaps	(%eax), %xmm0 /*  left */
-	movaps	2048(%eax), %xmm1 /* right */
-	movaps 	1024(%eax), %xmm2	/* center */
-	mulps	%xmm5, %xmm0
-	mulps	%xmm5, %xmm1
-	
-	mulps	%xmm6, %xmm2
-	movaps	3072(%eax), %xmm3	/* sur */
-
-	addps	%xmm2, %xmm0
-	mulps	%xmm7, %xmm3
-	
-	addps 	%xmm2, %xmm1
-
-	subps	%xmm3, %xmm0
-	addps	%xmm3, %xmm1
-
-	movaps	%xmm0, (%eax)
-	movaps	%xmm1, 1024(%eax)
-
-	addl	$16, %eax
-	decl 	%ecx
-	jnz	.loop4
-
-	popl	%ecx
-	popl	%ebx
-	popl 	%eax
-
-	leave
-	ret
-	.p2align 4,,7
-		
-	.global downmix_2f_1r_to_2ch_kni
-	.type downmix_2f_1r_to_2ch_kni, @function
-
-downmix_2f_1r_to_2ch_kni:
-	pushl	%ebp
-	movl  	%esp, %ebp
-	
-	pushl	%eax
-	pushl	%ebx
-	pushl	%ecx
-
-	movl 	8(%ebp), %eax /* samples[] */
-	movl	12(%ebp), %ebx /* &dm_par */
-	movl	$64, %ecx		/* loop counter */
-
-	movss	(%ebx), %xmm5	/* unit */
-	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
-
-	movss	8(%ebx), %xmm7		/* slev */
-	shufps	$0, %xmm7, %xmm7	/* slev | slev | slev | slev */
-
-.loop5:	
-	movaps	(%eax), %xmm0 /*  left */
-	movaps	1024(%eax), %xmm1 /* right */
-	
-	mulps	%xmm5, %xmm0
-	mulps	%xmm5, %xmm1
-	
-	movaps	2048(%eax), %xmm3	/* sur */
-
-	mulps	%xmm7, %xmm3
-	
-	subps	%xmm3, %xmm0
-	addps	%xmm3, %xmm1
-
-	movaps	%xmm0, (%eax)
-	movaps	%xmm1, 1024(%eax)
-
-	addl	$16, %eax
-	decl 	%ecx
-	jnz	.loop5
-
-	popl	%ecx
-	popl	%ebx
-	popl 	%eax
-
-	leave
-	ret
-	.p2align 4,,7
-	
-	.global downmix_3f_0r_to_2ch_kni
-	.type downmix_3f_0r_to_2ch_kni, @function
-
-downmix_3f_0r_to_2ch_kni:
-	pushl	%ebp
-	movl  	%esp, %ebp
-	
-	pushl	%eax
-	pushl	%ebx
-	pushl	%ecx
-
-	movl 	8(%ebp), %eax /* samples[] */
-	movl	12(%ebp), %ebx /* &dm_par */
-	movl	$64, %ecx		/* loop counter */
-
-	movss	(%ebx), %xmm5	/* unit */
-	shufps	$0, %xmm5, %xmm5	/* unit | unit | unit | unit */
-
-	movss	4(%ebx), %xmm6		/* clev */
-	shufps	$0, %xmm6, %xmm6	/* clev | clev | clev | clev */
-
-
-.loop6:	
-	movaps	(%eax), %xmm0 /*  left */
-	movaps	2048(%eax), %xmm1 /* right */
-	movaps 	1024(%eax), %xmm2	/* center */
-	mulps	%xmm5, %xmm0
-	mulps	%xmm5, %xmm1
-	
-	mulps	%xmm6, %xmm2
-
-	addps	%xmm2, %xmm0
-	
-	addps 	%xmm2, %xmm1
-
-	movaps	%xmm0, (%eax)
-	movaps	%xmm1, 1024(%eax)
-
-	addl	$16, %eax
-	decl 	%ecx
-	jnz	.loop6
-
-	popl	%ecx
-	popl	%ebx
-	popl 	%eax
-
-	leave
-	ret
-	.p2align 4,,7
-	
-	.global stream_sample_2ch_to_s16_kni
-	.type stream_sample_2ch_to_s16_kni, @function
-
-stream_sample_2ch_to_s16_kni:
-	pushl %ebp
-	movl  %esp, %ebp
-
-	pushl %eax
-	pushl %ebx
-	pushl %edx
-	pushl %ecx
-
-	movl 8(%ebp), %eax	/* s16_samples */
-	movl 12(%ebp), %ebx	/* left */
-	movl 16(%ebp), %edx	/* right */
-	movl $64, %ecx
-
-.loop1:
-	movaps (%ebx), %xmm0	/* l3 | l2 | l1 | l0 */
-	movaps (%edx), %xmm1	/* r3 | r2 | r1 | r0 */
-	movhlps %xmm0, %xmm2	/* l3 | l2 */
-	movhlps %xmm1, %xmm3	/* r3 | r2 */
-	unpcklps %xmm1, %xmm0	/* r1 | l1 | r0 | l0 */
-	unpcklps %xmm3, %xmm2	/* r3 | l3 | r2 | l2 */
-
-	cvtps2pi %xmm0, %mm0	/* r0 l0 --> mm0, int_32 */
-	movhlps %xmm0, %xmm0	
-	cvtps2pi %xmm0, %mm1	/* r1 l1 --> mm1, int_32 */
-
-	cvtps2pi %xmm2, %mm2	/* r2 l2 --> mm2, int_32 */
-	movhlps %xmm2, %xmm2
-	cvtps2pi %xmm2, %mm3	/* r3 l3 --> mm3, int_32 */
-	packssdw %mm1, %mm0	/* r1 l1 r0 l0 --> mm0, int_16 */
-	packssdw %mm3, %mm2	/* r3 l3 r2 l2 --> mm2, int_16 */
-
-	movq %mm0, (%eax)
-	movq %mm2, 8(%eax)
-	addl $16, %eax
-	addl $16, %ebx
-	addl $16, %edx
-
-	decl %ecx
-	jnz .loop1
-
-	popl %ecx
-	popl %edx
-	popl %ebx
-	popl %eax
-
-	emms
-
-	leave
-	ret
-	.p2align 4,,7
-	
-	.global stream_sample_1ch_to_s16_kni
-	.type stream_sample_1ch_to_s16_kni, @function
-
-stream_sample_1ch_to_s16_kni:
-	pushl %ebp
-	movl  %esp, %ebp
-
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-
-	movl $sqrt2, %eax
-	movss (%eax), %xmm7
-	movl 8(%ebp), %eax	/* s16_samples */
-	movl 12(%ebp), %ebx	/* left */
-	shufps $0, %xmm7, %xmm7
-	movl $64, %ecx
-
-.loop2:
-	movaps (%ebx), %xmm0	/* c3 | c2 | c1 | c0 */
-	mulps %xmm7, %xmm0
-	movhlps %xmm0, %xmm2	/* c3 | c2 */
-
-	cvtps2pi %xmm0, %mm0	/* c1 c0 --> mm0, int_32 */
-	cvtps2pi %xmm2, %mm1	/* c3 c2 --> mm1, int_32 */
-
-	packssdw %mm0, %mm0	/* c1 c1 c0 c0 --> mm0, int_16 */
-	packssdw %mm1, %mm1	/* c3 c3 c2 c2 --> mm1, int_16 */
-
-	movq %mm0, (%eax)
-	movq %mm1, 8(%eax)
-	addl $16, %eax
-	addl $16, %ebx
-
-	decl %ecx
-	jnz .loop2
-
-	popl %ecx
-	popl %ebx
-	popl %eax
-	
-	emms
-	leave
-	ret 
-#endif
diff --git a/ac3dec/downmix_kni.h b/ac3dec/downmix_kni.h
deleted file mode 100644
index 323f2a754..000000000
--- a/ac3dec/downmix_kni.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __DOWNMIX_KNI_H__
-#define __DOWNMIX_KNI_H__
-
-void downmix_3f_2r_to_2ch_kni(float *samples, dm_par_t * dm_par);
-void downmix_3f_1r_to_2ch_kni(float *samples, dm_par_t * dm_par);
-void downmix_2f_2r_to_2ch_kni(float *samples, dm_par_t * dm_par);
-void downmix_2f_1r_to_2ch_kni(float *samples, dm_par_t * dm_par);
-void downmix_3f_0r_to_2ch_kni(float *samples, dm_par_t * dm_par);
-void stream_sample_2ch_to_s16_kni(int16_t *s16_samples, float *left, float *right);
-void stream_sample_1ch_to_s16_kni(int16_t *s16_samples, float *center);
-
-#endif
diff --git a/ac3dec/exponent.c b/ac3dec/exponent.c
deleted file mode 100644
index 16fca4652..000000000
--- a/ac3dec/exponent.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* 
- *    exponent.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-#include "exponent.h"
-
-
-static inline void exp_unpack_ch(uint16_t type,uint16_t expstr,uint16_t ngrps,uint16_t initial_exp, uint16_t exps[], uint16_t *dest);
-
-
-/**
- *
- **/
-
-void exponent_unpack( bsi_t *bsi, audblk_t *audblk)
-{
-	uint16_t i;
-
-	for(i=0; i< bsi->nfchans; i++)
-		exp_unpack_ch(UNPACK_FBW, audblk->chexpstr[i], audblk->nchgrps[i], audblk->exps[i][0], &audblk->exps[i][1], audblk->fbw_exp[i]);
-
-	if(audblk->cplinu)
-		exp_unpack_ch(UNPACK_CPL, audblk->cplexpstr, audblk->ncplgrps, audblk->cplabsexp << 1, audblk->cplexps, &audblk->cpl_exp[audblk->cplstrtmant]);
-
-	if(bsi->lfeon)
-		exp_unpack_ch(UNPACK_LFE, audblk->lfeexpstr, 2, audblk->lfeexps[0], &audblk->lfeexps[1], audblk->lfe_exp);
-}
-
-
-/**
- *
- **/
-
-static inline void exp_unpack_ch(uint16_t type,uint16_t expstr,uint16_t ngrps,uint16_t initial_exp, 
-		uint16_t exps[], uint16_t *dest)
-{
-	uint16_t i,j;
-	int16_t exp_acc;
-	int16_t exp_1,exp_2,exp_3;
-
-	if (expstr == EXP_REUSE)
-		return;
-
-	/* Handle the initial absolute exponent */
-	exp_acc = initial_exp;
-	j = 0;
-
-	/* In the case of a fbw channel then the initial absolute values is 
-	 * also an exponent */
-	if(type != UNPACK_CPL)
-		dest[j++] = exp_acc;
-
-	/* Loop through the groups and fill the dest array appropriately */
-	for(i=0; i< ngrps; i++) {
-		if(exps[i] > 124)
-			goto error;
-
-		exp_1 = exps[i] / 25;
-		exp_2 = (exps[i] - (exp_1 * 25)) / 5;
-		exp_3 = exps[i] - (exp_1 * 25) - (exp_2 * 5) ;
-
-		exp_acc += (exp_1 - 2);
-
-		switch(expstr) {
-			case EXP_D45:
-				dest[j++] = exp_acc;
-				dest[j++] = exp_acc;
-			case EXP_D25:
-				dest[j++] = exp_acc;
-			case EXP_D15:
-				dest[j++] = exp_acc;
-		}
-
-		exp_acc += (exp_2 - 2);
-
-		switch(expstr) {
-			case EXP_D45:
-				dest[j++] = exp_acc;
-				dest[j++] = exp_acc;
-			case EXP_D25:
-				dest[j++] = exp_acc;
-			case EXP_D15:
-				dest[j++] = exp_acc;
-		}
-
-		exp_acc += (exp_3 - 2);
-
-		switch(expstr) {
-			case EXP_D45:
-				dest[j++] = exp_acc;
-				dest[j++] = exp_acc;
-			case EXP_D25:
-				dest[j++] = exp_acc;
-			case EXP_D15:
-				dest[j++] = exp_acc;
-		}
-	}	
-
-	return;
-error:
-#ifdef DEBUG
-	fprintf (stderr,"** Invalid exponent - skipping frame **\n");
-#endif
-	HANDLE_ERROR ();
-}
-
diff --git a/ac3dec/exponent.h b/ac3dec/exponent.h
deleted file mode 100644
index 06c59db03..000000000
--- a/ac3dec/exponent.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- *    exponent.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#define UNPACK_FBW  1
-#define UNPACK_CPL  2
-#define UNPACK_LFE  4
-
-void exponent_unpack( bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/imdct.c b/ac3dec/imdct.c
deleted file mode 100644
index c09ef4138..000000000
--- a/ac3dec/imdct.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/* 
- *  imdct.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-#include "downmix.h"
-#include "imdct.h"
-#include "imdct_c.h"
-#ifdef HAVE_KNI
-#include "imdct_kni.h"
-#endif
-#include "srfft.h"
-
-
-extern void (*downmix_3f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
-extern void (*downmix_3f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
-extern void (*downmix_2f_2r_to_2ch)(float *samples, dm_par_t * dm_par);
-extern void (*downmix_2f_1r_to_2ch)(float *samples, dm_par_t * dm_par);
-extern void (*downmix_3f_0r_to_2ch)(float *samples, dm_par_t * dm_par);
-
-
-extern void (*stream_sample_2ch_to_s16)(int16_t *s16_samples, float *left, float *right);
-extern void (*stream_sample_1ch_to_s16)(int16_t *s16_samples, float *center);
-
-void (*fft_64p) (complex_t *);
-void (*imdct_do_512) (float data[],float delay[]);
-void (*imdct_do_512_nol) (float data[], float delay[]);
-
-void imdct_do_256 (float data[],float delay[]);
-
-#define N 512
-
-/* static complex_t buf[128]; */
-//static complex_t buf[128] __attribute__((aligned(16)));
-complex_t buf[128] __attribute__((aligned(16)));
-
-/* Delay buffer for time domain interleaving */
-static float delay[6][256];
-static float delay1[6][256];
-
-/* Twiddle factors for IMDCT */
-static float xcos2[64];
-static float xsin2[64];
-
-/* Windowing function for Modified DCT - Thank you acroread */
-//static float window[] = {
-float window[] = {
-	0.00014, 0.00024, 0.00037, 0.00051, 0.00067, 0.00086, 0.00107, 0.00130,
-	0.00157, 0.00187, 0.00220, 0.00256, 0.00297, 0.00341, 0.00390, 0.00443,
-	0.00501, 0.00564, 0.00632, 0.00706, 0.00785, 0.00871, 0.00962, 0.01061,
-	0.01166, 0.01279, 0.01399, 0.01526, 0.01662, 0.01806, 0.01959, 0.02121,
-	0.02292, 0.02472, 0.02662, 0.02863, 0.03073, 0.03294, 0.03527, 0.03770,
-	0.04025, 0.04292, 0.04571, 0.04862, 0.05165, 0.05481, 0.05810, 0.06153,
-	0.06508, 0.06878, 0.07261, 0.07658, 0.08069, 0.08495, 0.08935, 0.09389,
-	0.09859, 0.10343, 0.10842, 0.11356, 0.11885, 0.12429, 0.12988, 0.13563,
-	0.14152, 0.14757, 0.15376, 0.16011, 0.16661, 0.17325, 0.18005, 0.18699,
-	0.19407, 0.20130, 0.20867, 0.21618, 0.22382, 0.23161, 0.23952, 0.24757,
-	0.25574, 0.26404, 0.27246, 0.28100, 0.28965, 0.29841, 0.30729, 0.31626,
-	0.32533, 0.33450, 0.34376, 0.35311, 0.36253, 0.37204, 0.38161, 0.39126,
-	0.40096, 0.41072, 0.42054, 0.43040, 0.44030, 0.45023, 0.46020, 0.47019,
-	0.48020, 0.49022, 0.50025, 0.51028, 0.52031, 0.53033, 0.54033, 0.55031,
-	0.56026, 0.57019, 0.58007, 0.58991, 0.59970, 0.60944, 0.61912, 0.62873,
-	0.63827, 0.64774, 0.65713, 0.66643, 0.67564, 0.68476, 0.69377, 0.70269,
-	0.71150, 0.72019, 0.72877, 0.73723, 0.74557, 0.75378, 0.76186, 0.76981,
-	0.77762, 0.78530, 0.79283, 0.80022, 0.80747, 0.81457, 0.82151, 0.82831,
-	0.83496, 0.84145, 0.84779, 0.85398, 0.86001, 0.86588, 0.87160, 0.87716,
-	0.88257, 0.88782, 0.89291, 0.89785, 0.90264, 0.90728, 0.91176, 0.91610,
-	0.92028, 0.92432, 0.92822, 0.93197, 0.93558, 0.93906, 0.94240, 0.94560,
-	0.94867, 0.95162, 0.95444, 0.95713, 0.95971, 0.96217, 0.96451, 0.96674,
-	0.96887, 0.97089, 0.97281, 0.97463, 0.97635, 0.97799, 0.97953, 0.98099,
-	0.98236, 0.98366, 0.98488, 0.98602, 0.98710, 0.98811, 0.98905, 0.98994,
-	0.99076, 0.99153, 0.99225, 0.99291, 0.99353, 0.99411, 0.99464, 0.99513,
-	0.99558, 0.99600, 0.99639, 0.99674, 0.99706, 0.99736, 0.99763, 0.99788,
-	0.99811, 0.99831, 0.99850, 0.99867, 0.99882, 0.99895, 0.99908, 0.99919,
-	0.99929, 0.99938, 0.99946, 0.99953, 0.99959, 0.99965, 0.99969, 0.99974,
-	0.99978, 0.99981, 0.99984, 0.99986, 0.99988, 0.99990, 0.99992, 0.99993,
-	0.99994, 0.99995, 0.99996, 0.99997, 0.99998, 0.99998, 0.99998, 0.99999,
-	0.99999, 0.99999, 0.99999, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000,
-	1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-};
-
-//static const int pm128[128] =
-const int pm128[128] =
-{
-	0, 16, 32, 48, 64, 80,  96, 112,  8, 40, 72, 104, 24, 56,  88, 120,
-	4, 20, 36, 52, 68, 84, 100, 116, 12, 28, 44,  60, 76, 92, 108, 124,
-	2, 18, 34, 50, 66, 82,  98, 114, 10, 42, 74, 106, 26, 58,  90, 122,
-	6, 22, 38, 54, 70, 86, 102, 118, 14, 46, 78, 110, 30, 62,  94, 126,
-	1, 17, 33, 49, 65, 81,  97, 113,  9, 41, 73, 105, 25, 57,  89, 121,
-	5, 21, 37, 53, 69, 85, 101, 117, 13, 29, 45,  61, 77, 93, 109, 125,
-	3, 19, 35, 51, 67, 83,  99, 115, 11, 43, 75, 107, 27, 59,  91, 123,
-	7, 23, 39, 55, 71, 87, 103, 119, 15, 31, 47,  63, 79, 95, 111, 127
-}; 
-
-static const int pm64[64] =
-{
-	0,  8, 16, 24, 32, 40, 48, 56,
-	4, 20, 36, 52, 12, 28, 44, 60,
-	2, 10, 18, 26, 34, 42, 50, 58,
-	6, 14, 22, 30, 38, 46, 54, 62,
-	1,  9, 17, 25, 33, 41, 49, 57,
-	5, 21, 37, 53, 13, 29, 45, 61,
-	3, 11, 19, 27, 35, 43, 51, 59,
-	7, 23, 39, 55, 15, 31, 47, 63
-};
-
-
-void imdct_init (void)
- {
-	int i;
-	float scale = 255.99609372;
-
-#ifdef __i386__
-#ifdef HAVE_KNI
-	if (!imdct_init_kni ());
-	else
-#endif
-#endif
-	if (!imdct_init_c ());
-
-	// More twiddle factors to turn IFFT into IMDCT */
-	for (i=0; i < 64; i++) {
-		xcos2[i] = cos(2.0f * M_PI * (8*i+1)/(4*N)) * scale;
-		xsin2[i] = sin(2.0f * M_PI * (8*i+1)/(4*N)) * scale;
-	}
-}
-
-
-void imdct_do_256 (float data[],float delay[])
-{
-	int i, j, k;
-	int p, q;
-
-	float tmp_a_i;
-	float tmp_a_r;
-
-	float *data_ptr;
-	float *delay_ptr;
-	float *window_ptr;
-
-	complex_t *buf1, *buf2;
-
-	buf1 = &buf[0];
-	buf2 = &buf[64];
-
-// Pre IFFT complex multiply plus IFFT complex conjugate
-	for (k=0; k<64; k++) { 
-		/* X1[k] = X[2*k]	*/
-		/* X2[k] = X[2*k+1]	*/
-
-		j = pm64[k];
-		p = 2 * (128-2*j-1);
-		q = 2 * (2 * j);
-
-		/* Z1[k] = (X1[128-2*k-1] + j * X1[2*k]) * (xcos2[k] + j * xsin2[k]); */
-		buf1[k].re =         data[p] * xcos2[j] - data[q] * xsin2[j];
-		buf1[k].im = -1.0f * (data[q] * xcos2[j] + data[p] * xsin2[j]);
-		/* Z2[k] = (X2[128-2*k-1] + j * X2[2*k]) * (xcos2[k] + j * xsin2[k]); */
-		buf2[k].re =          data[p + 1] * xcos2[j] - data[q + 1] * xsin2[j];
-		buf2[k].im = -1.0f * ( data[q + 1] * xcos2[j] + data[p + 1] * xsin2[j]);
-	}
-
-	fft_64p(&buf1[0]);
-	fft_64p(&buf2[0]);
-
-#ifdef DEBUG
-       //DEBUG FFT
-#if 0
-	printf ("Post FFT, buf1\n");
-	for (i=0; i < 64; i++)
-		printf("%d %f %f\n", i, buf_1[i].re, buf_1[i].im);
-	printf ("Post FFT, buf2\n");
-	for (i=0; i < 64; i++)
-		printf("%d %f %f\n", i, buf_2[i].re, buf_2[i].im);
-#endif
-#endif
-
-
-	// Post IFFT complex multiply 
-	for( i=0; i < 64; i++) {
-		tmp_a_r =  buf1[i].re;
-		tmp_a_i = -buf1[i].im;
-		buf1[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
-		buf1[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
-		tmp_a_r =  buf2[i].re;
-		tmp_a_i = -buf2[i].im;
-		buf2[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
-		buf2[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
-	}
-	
-	data_ptr = data;
-	delay_ptr = delay;
-	window_ptr = window;
-
-	/* Window and convert to real valued signal */
-	for(i=0; i< 64; i++) { 
-		*data_ptr++  = -buf1[i].im      * *window_ptr++ + *delay_ptr++;
-		*data_ptr++  = buf1[64-i-1].re * *window_ptr++ + *delay_ptr++;
-	}
-
-	for(i=0; i< 64; i++) {
-		*data_ptr++  = -buf1[i].re      * *window_ptr++ + *delay_ptr++;
-		*data_ptr++  = buf1[64-i-1].im * *window_ptr++ + *delay_ptr++;
-	}
-	
-	delay_ptr = delay;
-
-	for(i=0; i< 64; i++) {
-		*delay_ptr++ = -buf2[i].re      * *--window_ptr;
-		*delay_ptr++ =  buf2[64-i-1].im * *--window_ptr;
-	}
-
-	for(i=0; i< 64; i++) {
-		*delay_ptr++ =  buf2[i].im      * *--window_ptr;
-		*delay_ptr++ = -buf2[64-i-1].re * *--window_ptr;
-	}
-}
-
-
-/**
- *
- **/
-
-void imdct_do_256_nol (float data[], float delay[])
-{
-	int i, j, k;
-	int p, q;
-
-	float tmp_a_i;
-	float tmp_a_r;
-
-	float *data_ptr;
-	float *delay_ptr;
-	float *window_ptr;
-
-	complex_t *buf1, *buf2;
-
-	buf1 = &buf[0];
-	buf2 = &buf[64];
-
-       /* Pre IFFT complex multiply plus IFFT cmplx conjugate */
-	for(k=0; k<64; k++) {
-               /* X1[k] = X[2*k]  */
-               /* X2[k] = X[2*k+1]     */
-               j = pm64[k];
-               p = 2 * (128-2*j-1);
-               q = 2 * (2 * j);
-
-               /* Z1[k] = (X1[128-2*k-1] + j * X1[2*k]) * (xcos2[k] + j * xsin2[k]); */
-               buf1[k].re =         data[p] * xcos2[j] - data[q] * xsin2[j];
-               buf1[k].im = -1.0f * (data[q] * xcos2[j] + data[p] * xsin2[j]);
-               /* Z2[k] = (X2[128-2*k-1] + j * X2[2*k]) * (xcos2[k] + j * xsin2[k]); */
-               buf2[k].re =          data[p + 1] * xcos2[j] - data[q + 1] * xsin2[j];
-               buf2[k].im = -1.0f * ( data[q + 1] * xcos2[j] + data[p + 1] * xsin2[j]);
-       }
-
-
-       fft_64p(&buf1[0]);
-       fft_64p(&buf2[0]);
-
-#ifdef DEBUG
-	//DEBUG FFT
-#if 0
-       printf("Post FFT, buf1\n");
-       for (i=0; i < 64; i++)
-               printf("%d %f %f\n", i, buf_1[i].re, buf_1[i].im);
-       printf("Post FFT, buf2\n");
-       for (i=0; i < 64; i++)
-               printf("%d %f %f\n", i, buf_2[i].re, buf_2[i].im);
-#endif
-#endif
-
-       /* Post IFFT complex multiply */
-       for( i=0; i < 64; i++) {
-               /* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */
-               tmp_a_r =  buf1[i].re;
-               tmp_a_i = -buf1[i].im;
-               buf1[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
-               buf1[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
-               /* y2[n] = z2[n] * (xcos2[n] + j * xsin2[n]) ; */
-               tmp_a_r =  buf2[i].re;
-               tmp_a_i = -buf2[i].im;
-               buf2[i].re =(tmp_a_r * xcos2[i])  -  (tmp_a_i  * xsin2[i]);
-               buf2[i].im =(tmp_a_r * xsin2[i])  +  (tmp_a_i  * xcos2[i]);
-       }
-      
-       data_ptr = data;
-       delay_ptr = delay;
-       window_ptr = window;
-
-       /* Window and convert to real valued signal, no overlap */
-       for(i=0; i< 64; i++) {
-               *data_ptr++  = -buf1[i].im      * *window_ptr++;
-               *data_ptr++  = buf1[64-i-1].re * *window_ptr++;
-       }
-
-       for(i=0; i< 64; i++) {
-               *data_ptr++  = -buf1[i].re      * *window_ptr++ + *delay_ptr++;
-               *data_ptr++  = buf1[64-i-1].im * *window_ptr++ + *delay_ptr++;
-       }
-
-       delay_ptr = delay;
-
-       for(i=0; i< 64; i++) {
-               *delay_ptr++ = -buf2[i].re      * *--window_ptr;
-               *delay_ptr++ =  buf2[64-i-1].im * *--window_ptr;
-       }
-
-       for(i=0; i< 64; i++) {
-               *delay_ptr++ =  buf2[i].im      * *--window_ptr;
-               *delay_ptr++ = -buf2[64-i-1].re * *--window_ptr;
-	}
-}
-
-//FIXME remove - for timing code
-///#include <sys/time.h>
-//FIXME remove
-
-void imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples, int16_t *s16_samples, dm_par_t* dm_par)
-{
-	int i;
-	int doable = 0;
-	float *center=NULL, *left, *right, *left_sur, *right_sur;
-	float *delay_left, *delay_right;
-	float *delay1_left, *delay1_right, *delay1_center, *delay1_sr, *delay1_sl;
-	float right_tmp, left_tmp;
-	void (*do_imdct)(float data[], float deley[]);
-
-	// test if dm in frequency is doable
-	if (!(doable = audblk->blksw[0]))
-		do_imdct = imdct_do_512;
-	else
-		do_imdct = imdct_do_256;
-
-	// downmix in the frequency domain if all the channels
-	// use the same imdct
-	for (i=0; i < bsi->nfchans; i++) {
-		if (doable != audblk->blksw[i]) {
-			do_imdct = NULL;
-			break;
-		}
-	}
-
-	if (do_imdct) {
-		//dowmix first and imdct
-		switch(bsi->acmod) {
-		case 7:		// 3/2
-			downmix_3f_2r_to_2ch (samples[0], dm_par);
-			break;
-		case 6:		// 2/2
-			downmix_2f_2r_to_2ch (samples[0], dm_par);
-			break;
-		case 5:		// 3/1
-			downmix_3f_1r_to_2ch (samples[0], dm_par);
-			break;
-		case 4:		// 2/1
-			downmix_2f_1r_to_2ch (samples[0], dm_par);
-			break;
-		case 3:		// 3/0
-			downmix_3f_0r_to_2ch (samples[0], dm_par);
-			break;
-		case 2:
-			break;
-		default:	// 1/0
-			if (bsi->acmod == 1)
-				center = samples[0];
-			else if (bsi->acmod == 0)
-				center = samples[ac3_config.dual_mono_ch_sel];
-			do_imdct(center, delay[0]); // no downmix
-
-			stream_sample_1ch_to_s16 (s16_samples, center);
-
-			return;
-			//goto done;
-			break;
-		}
-
-		do_imdct (samples[0], delay[0]);
-		do_imdct (samples[1], delay[1]);
-		stream_sample_2ch_to_s16(s16_samples, samples[0], samples[1]);
-
-	} else {		//imdct and then dowmix
-		// delay and samples should be saved and mixed
-		//fprintf(stderr, "time domain downmix\n");
-		for (i=0; i<bsi->nfchans; i++) {
-			if (audblk->blksw[i])
-				imdct_do_256_nol (samples[i],delay1[i]);
-			else
-				imdct_do_512_nol (samples[i],delay1[i]);
-		}
-
-		// mix the sample, overlap
-		switch(bsi->acmod) {
-		case 7:		// 3/2
-			left = samples[0];
-			center = samples[1];
-			right = samples[2];
-			left_sur = samples[3];
-			right_sur = samples[4];
-			delay_left = delay[0];
-			delay_right = delay[1];
-			delay1_left = delay1[0];
-			delay1_center = delay1[1];
-			delay1_right = delay1[2];
-			delay1_sl = delay1[3];
-			delay1_sr = delay1[4];
-
-			for (i = 0; i < 256; i++) {
-				left_tmp = dm_par->unit * *left++  + dm_par->clev * *center  + dm_par->slev * *left_sur++;
-				right_tmp= dm_par->unit * *right++ + dm_par->clev * *center++ + dm_par->slev * *right_sur++;
-				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
-				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
-				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->clev * *delay1_center  + dm_par->slev * *delay1_sl++;
-				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->clev * *center++ + dm_par->slev * *delay1_sr++;
-			}
-			break;
-		case 6:		// 2/2
-			left = samples[0];
-			right = samples[1];
-			left_sur = samples[2];
-			right_sur = samples[3];
-			delay_left = delay[0];
-			delay_right = delay[1];
-			delay1_left = delay1[0];
-			delay1_right = delay1[1];
-			delay1_sl = delay1[2];
-			delay1_sr = delay1[3];
-
-			for (i = 0; i < 256; i++) {
-				left_tmp = dm_par->unit * *left++  + dm_par->slev * *left_sur++;
-				right_tmp= dm_par->unit * *right++ + dm_par->slev * *right_sur++;
-				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
-				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
-				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->slev * *delay1_sl++;
-				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->slev * *delay1_sr++;
-			}
-			break;
-		case 5:		// 3/1
-			left = samples[0];
-			center = samples[1];
-			right = samples[2];
-			right_sur = samples[3];
-			delay_left = delay[0];
-			delay_right = delay[1];
-			delay1_left = delay1[0];
-			delay1_center = delay1[1];
-			delay1_right = delay1[2];
-			delay1_sl = delay1[3];
-
-			for (i = 0; i < 256; i++) {
-				left_tmp = dm_par->unit * *left++  + dm_par->clev * *center  - dm_par->slev * *right_sur;
-				right_tmp= dm_par->unit * *right++ + dm_par->clev * *center++ + dm_par->slev * *right_sur++;
-				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
-				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
-				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->clev * *delay1_center  + dm_par->slev * *delay1_sl;
-				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->clev * *center++ + dm_par->slev * *delay1_sl++;
-			}
-			break;
-		case 4:		// 2/1
-			left = samples[0];
-			right = samples[1];
-			right_sur = samples[2];
-			delay_left = delay[0];
-			delay_right = delay[1];
-			delay1_left = delay1[0];
-			delay1_right = delay1[1];
-			delay1_sl = delay1[2];
-
-			for (i = 0; i < 256; i++) {
-				left_tmp = dm_par->unit * *left++ - dm_par->slev * *right_sur;
-				right_tmp= dm_par->unit * *right++ + dm_par->slev * *right_sur++;
-				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
-				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
-				*delay_left++ = dm_par->unit * *delay1_left++ + dm_par->slev * *delay1_sl;
-				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->slev * *delay1_sl++;
-			}
-			break;
-		case 3:		// 3/0
-			left = samples[0];
-			center = samples[1];
-			right = samples[2];
-			delay_left = delay[0];
-			delay_right = delay[1];
-			delay1_left = delay1[0];
-			delay1_center = delay1[1];
-			delay1_right = delay1[2];
-
-			for (i = 0; i < 256; i++) {
-				left_tmp = dm_par->unit * *left++  + dm_par->clev * *center;
-				right_tmp= dm_par->unit * *right++ + dm_par->clev * *center++;
-				*s16_samples++ = (int16_t)(left_tmp + *delay_left);
-				*s16_samples++ = (int16_t)(right_tmp + *delay_right);
-				*delay_left++ = dm_par->unit * *delay1_left++  + dm_par->clev * *delay1_center;
-				*delay_right++ = dm_par->unit * *delay1_right++ + dm_par->clev * *center++;
-			}
-			break;
-		case 2:		// copy to output
-			for (i = 0; i < 256; i++) {
-				*s16_samples++ = (int16_t)samples[0][i];
-				*s16_samples++ = (int16_t)samples[1][i];
-			}
-			break;
-		}
-	}
-}
diff --git a/ac3dec/imdct.h b/ac3dec/imdct.h
deleted file mode 100644
index 8f10af00b..000000000
--- a/ac3dec/imdct.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- *  imdct.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-void imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples, int16_t *s16_samples, dm_par_t *dm_par);
-void imdct_init(void);
diff --git a/ac3dec/imdct512_kni.S b/ac3dec/imdct512_kni.S
deleted file mode 100644
index 10b8de6fe..000000000
--- a/ac3dec/imdct512_kni.S
+++ /dev/null
@@ -1,548 +0,0 @@
-/* 
- *  imdct512_kni.S
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - October 2000
- *
- *
- *  imdct512_kni.S is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  imdct512_kni.S is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifdef __i386__
-
-.text
-	.align 4
-.global imdct512_pre_ifft_twiddle_kni
-	.type imdct512_pre_ifft_twiddle_kni, @function
-imdct512_pre_ifft_twiddle_kni:
-	
-	pushl %ebp
-	movl  %esp, %ebp
-	addl  $-4, %esp /* local variable, loop counter */
-	
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-	pushl %esi
-
-	movl 8(%ebp), %eax  	/* pmt */
-	movl 12(%ebp), %ebx	/* buf */
-	movl 16(%ebp), %ecx	/* data */
-	movl 20(%ebp), %edx 	/* xcos_sin_sse */
-	movl $64, -4(%ebp)
-	
-	
-.loop:
-	movl (%eax), %esi
-	movl 4(%eax), %edi
-	movss (%ecx, %esi, 8), %xmm1 /* 2j */
-	movss (%ecx, %edi, 8), %xmm3 /* 2(j+1) */
-
-	shll $1, %esi
-	shll $1, %edi
-
-	movaps (%edx, %esi, 8), %xmm0; /* -c_j | -s_j | -s_j | c_j */
-	movaps (%edx, %edi, 8), %xmm2; /* -c_j+1 | -s_j+1 | -s_j+1 | c_j+1 */
-
-	negl %esi
-	negl %edi
-
-	movss 1020(%ecx, %esi, 4), %xmm4 /* 255-2j */
-	addl $8, %eax
-	movss 1020(%ecx, %edi, 4), %xmm5 /* 255-2(j+1) */
-
-	shufps $0, %xmm1, %xmm4 /* 2j | 2j | 255-2j | 255-2j */
-	shufps $0, %xmm3, %xmm5 /* 2(j+1) | 2(j+1) | 255-2(j+1) | 255-2(j+1) */
-	mulps %xmm4, %xmm0
-	mulps %xmm5, %xmm2
-	movhlps %xmm0, %xmm1
-	movhlps %xmm2, %xmm3
-	addl $16, %ebx
-	addps %xmm1, %xmm0
-	addps %xmm3, %xmm2
-	movlhps %xmm2, %xmm0
-	movaps %xmm0, -16(%ebx)
-	decl -4(%ebp)
-     	jnz .loop
-
-	popl %esi
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-
-	addl $4, %esp
-	popl %ebp
-
-	ret
-	.p2align 4,0
-
-.global imdct512_post_ifft_twiddle_kni
-	.type imdct512_post_ifft_twiddle_kni, @function
-imdct512_post_ifft_twiddle_kni:
-	
-	pushl %ebp
-	movl  %esp, %ebp
-	
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-
-	movl 8(%ebp), %eax /* buf[] */
-	movl 12(%ebp), %ebx /* xcos_sin_sse[] */
-	movl $32, %ecx /* loop counter */
-
-.loop1:
-	movaps	(%eax), %xmm0  /*  im1 | re1 | im0 | re0 */
-
-	movaps  (%ebx), %xmm2  /* -c | -s | -s | c */
-	movhlps  %xmm0, %xmm1  /* im1 | re1 */
-	movaps  16(%ebx), %xmm3  /* -c1 | -s1 | -s1 | c1 */
-
-	shufps $0x50, %xmm0, %xmm0 /* im0 | im0 | re0 | re0 */
-	shufps $0x50, %xmm1, %xmm1 /* im1 | im1 | re1 | re1 */
-
-	movaps  16(%eax), %xmm4 /* im3 | re3 | im2 | re2 */
-
-	shufps $0x27, %xmm2, %xmm2 /* c | -s | -s | -c */
-	movhlps  %xmm4, %xmm5 /* im3 | re3 */
-	shufps $0x27, %xmm3, %xmm3 /* c1 | -s1 | -s1 | -c1 */
-
-	movaps  32(%ebx), %xmm6   /* -c2 | -s2 | -s2 | c2 */
-	movaps  48(%ebx), %xmm7   /* -c3 | -s3 | -s3 | c3 */
-
-	shufps $0x50, %xmm4, %xmm4 /* im2 | im2 | re2 | re2 */
-	shufps $0x50, %xmm5, %xmm5 /* im3 | im3 | re3 | re3 */
-
-	mulps %xmm2, %xmm0
-	mulps %xmm3, %xmm1
-
-	shufps $0x27, %xmm6, %xmm6 /* c2 | -s2 | -s2 | -c2 */
-	shufps $0x27, %xmm7, %xmm7 /* c3 | -s3 | -s3 | -c3 */
-
-	movhlps %xmm0, %xmm2
-	movhlps %xmm1, %xmm3
-
-	mulps %xmm6, %xmm4
-	mulps %xmm7, %xmm5
-
-	addps %xmm2, %xmm0
-	addps %xmm3, %xmm1
-
-	movhlps %xmm4, %xmm6
-	movhlps %xmm5, %xmm7
-
-	addps %xmm6, %xmm4
-	addps %xmm7, %xmm5
-
-	movlhps %xmm1, %xmm0
-	movlhps %xmm5, %xmm4
-
-	movaps %xmm0, (%eax)
-	movaps %xmm4, 16(%eax)
-	addl $64, %ebx
-	addl $32, %eax
-	decl %ecx
-	jnz .loop1
-
-	popl %ecx
-	popl %ebx
-	popl %eax
-
-	leave
-	ret
-	.p2align 4,0
-
-.global imdct512_window_delay_kni
-	.type imdct512_window_delay_kni, @function
-imdct512_window_delay_kni:
-	
-	pushl %ebp
-	movl  %esp, %ebp
-	
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movl 20(%ebp), %ebx /* delay */
-	movl 16(%ebp), %edx /* window */
-
-	movl 8(%ebp), %eax  /* buf */
-	movl $16, %ecx /* loop count */
-	leal 516(%eax), %esi /* buf[64].im */
-	leal 504(%eax), %edi /* buf[63].re */ 
-	movl 12(%ebp), %eax /* data */
-.first_128_samples:
-
-	movss (%esi), %xmm0
-	movss 8(%esi), %xmm2
-	movss (%edi), %xmm1
-	movss -8(%edi), %xmm3
-
-	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
-
-	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	movaps (%ebx), %xmm5 /* d3 | d2 | d1 | d0 */
-	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
-
-	movss 16(%esi), %xmm6 /* im2 */
-	movss 24(%esi), %xmm7 /* im3 */
-	subps %xmm1, %xmm0  /* -re1 | im1 | -re0 | im0 */
-	movss -16(%edi), %xmm2 /* re2 */
-	movss -24(%edi), %xmm3 /* re3 */
-	mulps %xmm4, %xmm0
-	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
-	addps %xmm5, %xmm0
-	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
-	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
-	movaps 16(%ebx), %xmm5 /* d7 | d6 | d5 | d4 */
-	subps %xmm2, %xmm6 /* -re3 | im3 | -re2 | im2 */
-	addl $32, %edx
-	movaps %xmm0, (%eax)
-	addl $32, %ebx
-	mulps %xmm4, %xmm6
-	addl $32, %esi
-	addl $32, %eax
-	addps %xmm5, %xmm6
-	addl $-32, %edi
-	movaps %xmm6, -16(%eax)
-	decl %ecx
-	jnz .first_128_samples
-
-	movl 8(%ebp), %esi  /* buf[0].re */
-	leal 1020(%esi), %edi /* buf[127].im */ 
-	movl $16, %ecx /* loop count */
-.second_128_samples:
-
-	movss (%esi), %xmm0 /* buf[i].re */
-	movss 8(%esi), %xmm2 /* re1 */
-	movss (%edi), %xmm1 /* buf[127-i].im */
-	movss -8(%edi), %xmm3 /* im1 */
-
-	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im1 */
-	
-	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	movaps (%ebx), %xmm5 /* d3 | d2 | d1 | d0 */
-
-	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
-	movss 16(%esi), %xmm6 /* re2 */
-	movss 24(%esi), %xmm7 /* re3 */
-	movss -16(%edi), %xmm2 /* im2 */
-	movss -24(%edi), %xmm3 /* im3 */
-	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
-	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
-	mulps %xmm4, %xmm0
-	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
-	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
-	addl $32, %esi
-	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
-	addps %xmm5, %xmm0
-	mulps %xmm4, %xmm6
-	addl $-32, %edi
-	movaps 16(%ebx), %xmm5 /* d7 | d6 | d5 | d4 */
-	movaps %xmm0, (%eax)
-	addps %xmm5, %xmm6
-	addl $32, %edx
-	addl $32, %eax
-	addl $32, %ebx
-	movaps %xmm6, -16(%eax)
-	decl %ecx
-	jnz .second_128_samples
-
-	movl 8(%ebp), %eax
-	leal 512(%eax), %esi /* buf[64].re */
-	leal 508(%eax), %edi /* buf[63].im */ 
-	movl $16, %ecx /* loop count */
-	movl 20(%ebp), %eax /* delay */
-.first_128_delay:
-
-	movss (%esi), %xmm0
-	movss 8(%esi), %xmm2
-	movss (%edi), %xmm1
-	movss -8(%edi), %xmm3
-
-	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im0 */
-
-	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
-	movss 16(%esi), %xmm6 /* re2 */
-	movss 24(%esi), %xmm7 /* re3 */
-	movss -16(%edi), %xmm2 /* im2 */
-	movss -24(%edi), %xmm3 /* im3 */
-	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
-	addl $-32, %edx
-	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
-	mulps %xmm4, %xmm0
-	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
-	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
-	movaps %xmm0, (%eax)
-	addl $32, %esi
-	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
-	addl $-32, %edi
-	mulps %xmm5, %xmm6
-	addl $32, %eax
-	movaps %xmm6, -16(%eax)
-	decl %ecx
-	jnz .first_128_delay
-
-	movl 8(%ebp), %ebx
-	leal 4(%ebx), %esi /* buf[0].im */
-	leal 1016(%ebx), %edi /* buf[127].re */ 
-	movl $16, %ecx /* loop count */
-.second_128_delay:
-
-	movss (%esi), %xmm0
-	movss 8(%esi), %xmm2
-	movss (%edi), %xmm1
-	movss -8(%edi), %xmm3
-
-	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
-
-	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
-	movss 16(%esi), %xmm6 /* im2 */
-	movss 24(%esi), %xmm7 /* im3 */
-	movss -16(%edi), %xmm2 /* re2 */
-	movss -24(%edi), %xmm3 /* re3 */
-	subps %xmm0, %xmm1 /* re1 | -im1 | re0 | -im0 */
-	addl $-32, %edx
-	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
-	mulps %xmm4, %xmm1
-	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
-	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
-	movaps %xmm1, (%eax)
-	addl $32, %esi
-	subps %xmm6, %xmm2 /* re | -im3 | re | -im2 */
-	addl $-32, %edi
-	mulps %xmm5, %xmm2
-	addl $32, %eax
-	movaps %xmm2, -16(%eax)
-	decl %ecx
-	jnz .second_128_delay
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	
-	leave
-	ret
-	.p2align 4,0
-	
-.global imdct512_window_delay_nol_kni
-	.type imdct512_window_delay_nol_kni, @function
-imdct512_window_delay_nol_kni:
-	
-	pushl %ebp
-	movl  %esp, %ebp
-	
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	/* movl 20(%ebp), %ebx delay */
-	movl 16(%ebp), %edx /* window */
-
-	movl 8(%ebp), %eax  /* buf */
-	movl $16, %ecx /* loop count */
-	leal 516(%eax), %esi /* buf[64].im */
-	leal 504(%eax), %edi /* buf[63].re */ 
-	movl 12(%ebp), %eax /* data */
-.first_128_sample:
-
-	movss (%esi), %xmm0
-	movss 8(%esi), %xmm2
-	movss (%edi), %xmm1
-	movss -8(%edi), %xmm3
-
-	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
-
-	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	/* movaps (%ebx), %xmm5 d3 | d2 | d1 | d0 */
-	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
-
-	movss 16(%esi), %xmm6 /* im2 */
-	movss 24(%esi), %xmm7 /* im3 */
-	subps %xmm1, %xmm0  /* -re1 | im1 | -re0 | im0 */
-	movss -16(%edi), %xmm2 /* re2 */
-	movss -24(%edi), %xmm3 /* re3 */
-	mulps %xmm4, %xmm0
-	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
-	/* addps %xmm5, %xmm0 */
-	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
-	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
-	/* movaps 16(%ebx), %xmm5  d7 | d6 | d5 | d4 */
-	subps %xmm2, %xmm6 /* -re3 | im3 | -re2 | im2 */
-	addl $32, %edx
-	movaps %xmm0, (%eax)
-	/* addl $32, %ebx */
-	mulps %xmm4, %xmm6
-	addl $32, %esi
-	addl $32, %eax
-	/* addps %xmm5, %xmm6 */
-	addl $-32, %edi
-	movaps %xmm6, -16(%eax)
-	decl %ecx
-	jnz .first_128_sample
-
-	movl 8(%ebp), %esi  /* buf[0].re */
-	leal 1020(%esi), %edi /* buf[127].im */ 
-	movl $16, %ecx /* loop count */
-.second_128_sample:
-
-	movss (%esi), %xmm0 /* buf[i].re */
-	movss 8(%esi), %xmm2 /* re1 */
-	movss (%edi), %xmm1 /* buf[127-i].im */
-	movss -8(%edi), %xmm3 /* im1 */
-
-	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im1 */
-	
-	movaps (%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	/* movaps (%ebx), %xmm5 d3 | d2 | d1 | d0 */
-
-	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
-	movss 16(%esi), %xmm6 /* re2 */
-	movss 24(%esi), %xmm7 /* re3 */
-	movss -16(%edi), %xmm2 /* im2 */
-	movss -24(%edi), %xmm3 /* im3 */
-	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
-	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
-	mulps %xmm4, %xmm0
-	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
-	movaps 16(%edx), %xmm4 /* w7 | w6 | w5 | w4 */
-	addl $32, %esi
-	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
-	/* addps %xmm5, %xmm0 */
-	mulps %xmm4, %xmm6
-	addl $-32, %edi
-	/* movaps 16(%ebx), %xmm5  d7 | d6 | d5 | d4 */
-	movaps %xmm0, (%eax)
-	/* addps %xmm5, %xmm6 */
-	addl $32, %edx
-	addl $32, %eax
-	/* addl $32, %ebx */
-	movaps %xmm6, -16(%eax)
-	decl %ecx
-	jnz .second_128_sample
-
-	movl 8(%ebp), %eax
-	leal 512(%eax), %esi /* buf[64].re */
-	leal 508(%eax), %edi /* buf[63].im */ 
-	movl $16, %ecx /* loop count */
-	movl 20(%ebp), %eax /* delay */
-.first_128_delays:
-
-	movss (%esi), %xmm0
-	movss 8(%esi), %xmm2
-	movss (%edi), %xmm1
-	movss -8(%edi), %xmm3
-
-	movlhps %xmm2, %xmm0 /* 0.0 | re1 | 0.0 | re0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | im1 | 0.0 | im0 */
-
-	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	shufps $0xb1, %xmm1, %xmm1 /* im1 | 0.0 | im0 | 0.0 */
-	movss 16(%esi), %xmm6 /* re2 */
-	movss 24(%esi), %xmm7 /* re3 */
-	movss -16(%edi), %xmm2 /* im2 */
-	movss -24(%edi), %xmm3 /* im3 */
-	subps %xmm1, %xmm0 /* -im1 | re1 | -im0 | re0 */
-	addl $-32, %edx
-	movlhps %xmm7, %xmm6 /* 0.0 | re3 | 0.0 | re2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | im3 | 0.0 | im2 */
-	mulps %xmm4, %xmm0
-	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
-	shufps $0xb1, %xmm2, %xmm2 /* im3 | 0.0 | im2 | 0.0 */
-	movaps %xmm0, (%eax)
-	addl $32, %esi
-	subps %xmm2, %xmm6 /* -im3 | re3 | -im2 | re2 */
-	addl $-32, %edi
-	mulps %xmm5, %xmm6
-	addl $32, %eax
-	movaps %xmm6, -16(%eax)
-	decl %ecx
-	jnz .first_128_delays
-
-	movl 8(%ebp), %ebx
-	leal 4(%ebx), %esi /* buf[0].im */
-	leal 1016(%ebx), %edi /* buf[127].re */ 
-	movl $16, %ecx /* loop count */
-.second_128_delays:
-
-	movss (%esi), %xmm0
-	movss 8(%esi), %xmm2
-	movss (%edi), %xmm1
-	movss -8(%edi), %xmm3
-
-	movlhps %xmm2, %xmm0 /* 0.0 | im1 | 0.0 | im0 */
-	movlhps %xmm3, %xmm1 /* 0.0 | re1 | 0.0 | re0 */
-
-	movaps -16(%edx), %xmm4 /* w3 | w2 | w1 | w0 */
-	shufps $0xb1, %xmm1, %xmm1 /* re1 | 0.0 | re0 | 0.0 */
-	movss 16(%esi), %xmm6 /* im2 */
-	movss 24(%esi), %xmm7 /* im3 */
-	movss -16(%edi), %xmm2 /* re2 */
-	movss -24(%edi), %xmm3 /* re3 */
-	subps %xmm0, %xmm1 /* re1 | -im1 | re0 | -im0 */
-	addl $-32, %edx
-	movlhps %xmm7, %xmm6 /* 0.0 | im3 | 0.0 | im2 */
-	movlhps %xmm3, %xmm2 /* 0.0 | re3 | 0.0 | re2 */
-	mulps %xmm4, %xmm1
-	movaps (%edx), %xmm5 /* w7 | w6 | w5 | w4 */
-	shufps $0xb1, %xmm2, %xmm2 /* re3 | 0.0 | re2 | 0.0 */
-	movaps %xmm1, (%eax)
-	addl $32, %esi
-	subps %xmm6, %xmm2 /* re | -im3 | re | -im2 */
-	addl $-32, %edi
-	mulps %xmm5, %xmm2
-	addl $32, %eax
-	movaps %xmm2, -16(%eax)
-	decl %ecx
-	jnz .second_128_delays
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	
-	leave
-	ret
-	.p2align 4,0
-#endif
diff --git a/ac3dec/imdct_c.c b/ac3dec/imdct_c.c
deleted file mode 100644
index 1f2bfe849..000000000
--- a/ac3dec/imdct_c.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* 
- *  imdct.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-#include "downmix.h"
-#include "imdct_c.h"
-#include "srfft.h"
-
-
-#define N 512
-
-extern void (*imdct_do_512) (float data[],float delay[]);
-extern void (*imdct_do_512_nol) (float data[], float delay[]);
-extern void (*fft_64p) (complex_t *);
-
-extern const int pm128[];
-extern float window[];
-extern complex_t buf[128];
-
-extern void fft_64p_c (complex_t *);
-extern void fft_128p_c (complex_t *);
-
-static void imdct_do_512_c (float data[],float delay[]);
-static void imdct_do_512_nol_c (float data[], float delay[]);
-
-/* Twiddle factors for IMDCT */
-static float xcos1[128] __attribute__((aligned(16)));
-static float xsin1[128] __attribute__((aligned(16)));
-
-
-int imdct_init_c (void)
-{
-	int i;
-	float scale = 255.99609372;
-
-	imdct_do_512 = imdct_do_512_c;
-	imdct_do_512_nol = imdct_do_512_nol_c;
-	fft_64p = fft_64p_c;
-
-	/* Twiddle factors to turn IFFT into IMDCT */
-         
-	for (i=0; i < 128; i++) {
-		xcos1[i] = cos(2.0f * M_PI * (8*i+1)/(8*N)) * scale; 
-		xsin1[i] = sin(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
-	}
-
-	return 0;
-}
-
-
-static void imdct_do_512_c (float data[], float delay[])
-{
-	int i, j;
-	float tmp_a_r, tmp_a_i;
-	float *data_ptr;
-	float *delay_ptr;
-	float *window_ptr;
-
-// 512 IMDCT with source and dest data in 'data'
-// Pre IFFT complex multiply plus IFFT complex conjugate
-
-	for( i=0; i < 128; i++) {
-		j = pm128[i];
-		//a = (data[256-2*j-1] - data[2*j]) * (xcos1[j] + xsin1[j]);
-		//c = data[2*j] * xcos1[j];
-		//b = data[256-2*j-1] * xsin1[j];
-		//buf1[i].re = a - b + c;
-		//buf1[i].im = b + c;
-		buf[i].re = (data[256-2*j-1] * xcos1[j]) - (data[2*j] * xsin1[j]);
-		buf[i].im = -1.0 * (data[2*j] * xcos1[j] + data[256-2*j-1] * xsin1[j]);
-	}
-
-	fft_128p_c (&buf[0]);
-
-// Post IFFT complex multiply  plus IFFT complex conjugate
-	for (i=0; i < 128; i++) {
-		tmp_a_r = buf[i].re;
-		tmp_a_i = buf[i].im;
-		//a = (tmp_a_r - tmp_a_i) * (xcos1[j] + xsin1[j]);
-		//b = tmp_a_r * xsin1[j];
-		//c = tmp_a_i * xcos1[j];
-		//buf[j].re = a - b + c;
-		//buf[j].im = b + c;
-		buf[i].re =(tmp_a_r * xcos1[i])  +  (tmp_a_i  * xsin1[i]);
-		buf[i].im =(tmp_a_r * xsin1[i])  -  (tmp_a_i  * xcos1[i]);
-	}
-
-	data_ptr = data;
-	delay_ptr = delay;
-	window_ptr = window;
-
-// Window and convert to real valued signal
-	for (i=0; i< 64; i++) {
-		*data_ptr++   = -buf[64+i].im   * *window_ptr++ + *delay_ptr++;
-		*data_ptr++   = buf[64-i-1].re * *window_ptr++ + *delay_ptr++;
-	}
-
-	for(i=0; i< 64; i++) {
-		*data_ptr++  = -buf[i].re       * *window_ptr++ + *delay_ptr++;
-		*data_ptr++  = buf[128-i-1].im * *window_ptr++ + *delay_ptr++;
-	}
-
-// The trailing edge of the window goes into the delay line
-	delay_ptr = delay;
-
-	for(i=0; i< 64; i++) {
-		*delay_ptr++  = -buf[64+i].re   * *--window_ptr;
-		*delay_ptr++  =  buf[64-i-1].im * *--window_ptr;
-	}
-
-	for(i=0; i<64; i++) {
-		*delay_ptr++  =  buf[i].im       * *--window_ptr;
-		*delay_ptr++  = -buf[128-i-1].re * *--window_ptr;
-	}
-}
-
-
-static void imdct_do_512_nol_c (float data[], float delay[])
-{
-	int i, j;
-
-	float tmp_a_i;
-	float tmp_a_r;
-
-	float *data_ptr;
-	float *delay_ptr;
-	float *window_ptr;
-
-        //
-        // 512 IMDCT with source and dest data in 'data'
-        //
-
-	// Pre IFFT complex multiply plus IFFT cmplx conjugate
-
-        for( i=0; i < 128; i++) {
-	/* z[i] = (X[256-2*i-1] + j * X[2*i]) * (xcos1[i] + j * xsin1[i]) */
-		j = pm128[i];
-	//a = (data[256-2*j-1] - data[2*j]) * (xcos1[j] + xsin1[j]);
-	//c = data[2*j] * xcos1[j];
-	//b = data[256-2*j-1] * xsin1[j];
-	//buf1[i].re = a - b + c;
-
-         //buf1[i].im = b + c;
-		buf[i].re = (data[256-2*j-1] * xcos1[j]) - (data[2*j] * xsin1[j]);
-		buf[i].im = -1.0 * (data[2*j] * xcos1[j] + data[256-2*j-1] * xsin1[j]);
-	}
-       
-	fft_128p_c (&buf[0]);
-
-       /* Post IFFT complex multiply  plus IFFT complex conjugate*/
-	for (i=0; i < 128; i++) {
-		/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
-		/* int j1 = i; */
-		tmp_a_r = buf[i].re;
-		tmp_a_i = buf[i].im;
-		//a = (tmp_a_r - tmp_a_i) * (xcos1[j] + xsin1[j]);
-		//b = tmp_a_r * xsin1[j];
-		//c = tmp_a_i * xcos1[j];
-		//buf[j].re = a - b + c;
-		//buf[j].im = b + c;
-		buf[i].re =(tmp_a_r * xcos1[i])  +  (tmp_a_i  * xsin1[i]);
-		buf[i].im =(tmp_a_r * xsin1[i])  -  (tmp_a_i  * xcos1[i]);
-	}
-       
-	data_ptr = data;
-	delay_ptr = delay;
-	window_ptr = window;
-
-	/* Window and convert to real valued signal, no overlap here*/
-	for (i=0; i< 64; i++) { 
-		*data_ptr++   = -buf[64+i].im   * *window_ptr++; 
-		*data_ptr++   = buf[64-i-1].re * *window_ptr++; 
-	}
-
-	for(i=0; i< 64; i++) { 
-		*data_ptr++  = -buf[i].re       * *window_ptr++; 
-		*data_ptr++  = buf[128-i-1].im * *window_ptr++; 
-	}
-       
-	/* The trailing edge of the window goes into the delay line */
-	delay_ptr = delay;
-
-	for(i=0; i< 64; i++) { 
-		*delay_ptr++  = -buf[64+i].re   * *--window_ptr; 
-		*delay_ptr++  =  buf[64-i-1].im * *--window_ptr; 
-	}
-
-	for(i=0; i<64; i++) {
-		*delay_ptr++  =  buf[i].im       * *--window_ptr; 
-		*delay_ptr++  = -buf[128-i-1].re * *--window_ptr; 
-	}
-}
diff --git a/ac3dec/imdct_c.h b/ac3dec/imdct_c.h
deleted file mode 100644
index d2c31b54b..000000000
--- a/ac3dec/imdct_c.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __IMDCT_C_H__
-#define __IMDCT_C_H__
-
-#include "cmplx.h"
-
-int imdct_init_c (void);
-
-void fft_128p_c (complex_t *);
-void fft_64p_c (complex_t *);
-
-void imdct512_pre_ifft_twiddle_c (const int *pmt, complex_t *buf, float *data, float *xcos_sin_sse);
-void imdct512_post_ifft_twiddle_c (complex_t *buf, float *xcos_sin_sse);
-void imdct512_window_delay_c (complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
-void imdct512_window_delay_nol_c (complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
-
-#endif
diff --git a/ac3dec/imdct_kni.c b/ac3dec/imdct_kni.c
deleted file mode 100644
index b44547a95..000000000
--- a/ac3dec/imdct_kni.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* 
- *  imdct_kni.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#ifdef __i386__
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <mm_accel.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-#include "downmix.h"
-#include "imdct_kni.h"
-#include "srfft.h"
-
-#define N 512
-
-/* Delay buffer for time domain interleaving */
-static float xcos_sin_sse[128 * 4] __attribute__((aligned(16)));
-
-extern void (*imdct_do_512) (float data[],float delay[]);
-extern void (*imdct_do_512_nol) (float data[], float delay[]);
-extern void (*fft_64p) (complex_t *);
-
-extern const int pm128[];
-extern float window[];
-extern complex_t buf[128];
-
-extern void fft_64p_kni (complex_t *);
-extern void fft_128p_kni (complex_t *);
-
-static void imdct_do_512_kni (float data[], float delay[]);
-static void imdct_do_512_nol_kni (float data[], float delay[]);
-
-
-int imdct_init_kni (void)
-{
-	uint32_t accel = mm_accel ();
-
-	if (accel & MM_ACCEL_X86_MMXEXT) {
-		int i;
-		float scale = 255.99609372;
-
-		fprintf (stderr, "Using SSE for IMDCT\n");
-		imdct_do_512 = imdct_do_512_kni;
-		imdct_do_512_nol = imdct_do_512_nol_kni;
-		fft_64p = fft_64p_kni;
-
-		for (i=0; i < 128; i++) {
-			float xcos_i = cos(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
-                       	float xsin_i = sin(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
-                       	xcos_sin_sse[i * 4] = xcos_i;
-                       	xcos_sin_sse[i * 4 + 1] = -xsin_i;
-                       	xcos_sin_sse[i * 4 + 2] = -xsin_i;
-                       	xcos_sin_sse[i * 4 + 3] = -xcos_i;
-               	}
-
-		return 0;
-	} else
-		return -1;
-}
-
-
-static void imdct_do_512_kni (float data[], float delay[])
-{
-	imdct512_pre_ifft_twiddle_kni (pm128, buf, data, xcos_sin_sse);
-	fft_128p_kni (buf);
-	imdct512_post_ifft_twiddle_kni (buf, xcos_sin_sse);
-	imdct512_window_delay_kni (buf, data, window, delay);
-}
-
-
-static void imdct_do_512_nol_kni (float data[], float delay[])
-{
-	imdct512_pre_ifft_twiddle_kni (pm128, buf, data, xcos_sin_sse);  
-	fft_128p_kni (buf);
-	imdct512_post_ifft_twiddle_kni (buf, xcos_sin_sse);
-	imdct512_window_delay_nol_kni (buf, data, window, delay);
-}
-
-#endif
diff --git a/ac3dec/imdct_kni.h b/ac3dec/imdct_kni.h
deleted file mode 100644
index 2193c0753..000000000
--- a/ac3dec/imdct_kni.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __IMDCT_KNI_H__
-#define __IMDCT_KNI_H__
-
-#include "cmplx.h"
-
-int imdct_init_kni (void);
-
-void fft_128p_kni(complex_t *);
-void fft_64p_kni(complex_t *);
-
-void imdct512_pre_ifft_twiddle_kni(const int *pmt, complex_t *buf, float *data, float *xcos_sin_sse);
-void imdct512_post_ifft_twiddle_kni(complex_t *buf, float *xcos_sin_sse);
-void imdct512_window_delay_kni(complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
-void imdct512_window_delay_nol_kni(complex_t *buf, float *data_ptr, float *window_prt, float *delay_prt);
-
-#endif
diff --git a/ac3dec/mm_accel.h b/ac3dec/mm_accel.h
deleted file mode 100644
index 82dc5837f..000000000
--- a/ac3dec/mm_accel.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __MM_ACCEL_H__
-#define __MM_ACCEL_H__
-
-#include <inttypes.h>
-
-// generic accelerations
-#define MM_ACCEL_MLIB		0x00000001
-
-// x86 accelerations
-#define MM_ACCEL_X86_MMX	0x80000000
-#define MM_ACCEL_X86_3DNOW	0x40000000
-#define MM_ACCEL_X86_MMXEXT	0x20000000
-
-uint32_t mm_accel (void);
-
-#endif
diff --git a/ac3dec/parse.c b/ac3dec/parse.c
deleted file mode 100644
index 49ea57c67..000000000
--- a/ac3dec/parse.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/* 
- *    parse.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-#include "bitstream.h"
-#include "stats.h"
-#include "debug.h"
-#include "crc.h"
-#include "parse.h"
-
-/* Misc LUT */
-static const uint16_t nfchans[8] = {2,1,2,3,3,4,4,5};
-
-struct frmsize_s
-{
-	uint16_t bit_rate;
-	uint16_t frm_size[3];
-};
-
-static const struct frmsize_s frmsizecod_tbl[64] = 
-{
-	{ 32  ,{64   ,69   ,96   } },
-	{ 32  ,{64   ,70   ,96   } },
-	{ 40  ,{80   ,87   ,120  } },
-	{ 40  ,{80   ,88   ,120  } },
-	{ 48  ,{96   ,104  ,144  } },
-	{ 48  ,{96   ,105  ,144  } },
-	{ 56  ,{112  ,121  ,168  } },
-	{ 56  ,{112  ,122  ,168  } },
-	{ 64  ,{128  ,139  ,192  } },
-	{ 64  ,{128  ,140  ,192  } },
-	{ 80  ,{160  ,174  ,240  } },
-	{ 80  ,{160  ,175  ,240  } },
-	{ 96  ,{192  ,208  ,288  } },
-	{ 96  ,{192  ,209  ,288  } },
-	{ 112 ,{224  ,243  ,336  } },
-	{ 112 ,{224  ,244  ,336  } },
-	{ 128 ,{256  ,278  ,384  } },
-	{ 128 ,{256  ,279  ,384  } },
-	{ 160 ,{320  ,348  ,480  } },
-	{ 160 ,{320  ,349  ,480  } },
-	{ 192 ,{384  ,417  ,576  } },
-	{ 192 ,{384  ,418  ,576  } },
-	{ 224 ,{448  ,487  ,672  } },
-	{ 224 ,{448  ,488  ,672  } },
-	{ 256 ,{512  ,557  ,768  } },
-	{ 256 ,{512  ,558  ,768  } },
-	{ 320 ,{640  ,696  ,960  } },
-	{ 320 ,{640  ,697  ,960  } },
-	{ 384 ,{768  ,835  ,1152 } },
-	{ 384 ,{768  ,836  ,1152 } },
-	{ 448 ,{896  ,975  ,1344 } },
-	{ 448 ,{896  ,976  ,1344 } },
-	{ 512 ,{1024 ,1114 ,1536 } },
-	{ 512 ,{1024 ,1115 ,1536 } },
-	{ 576 ,{1152 ,1253 ,1728 } },
-	{ 576 ,{1152 ,1254 ,1728 } },
-	{ 640 ,{1280 ,1393 ,1920 } },
-	{ 640 ,{1280 ,1394 ,1920 } }
-};
-
-/* Parse a syncinfo structure, minus the sync word */
-void parse_syncinfo(syncinfo_t *syncinfo, uint8_t *data)
-{
-	//
-	// We need to read in the entire syncinfo struct (0x0b77 + 24 bits)
-	// in order to determine how big the frame is
-	//
-
-	// Get the sampling rate 
-	syncinfo->fscod  = (data[2] >> 6) & 0x3;
-
-	if(syncinfo->fscod == 3) {
-		//invalid sampling rate code
-		return;
-	}
-	else if(syncinfo->fscod == 2)
-		syncinfo->sampling_rate = 32000;
-	else if(syncinfo->fscod == 1)
-		syncinfo->sampling_rate = 44100;
-	else
-		syncinfo->sampling_rate = 48000;
-
-	// Get the frame size code 
-	syncinfo->frmsizecod = data[2] & 0x3f;
-
-	// Calculate the frame size and bitrate
-	syncinfo->frame_size = 
-		frmsizecod_tbl[syncinfo->frmsizecod].frm_size[syncinfo->fscod];
-	syncinfo->bit_rate = frmsizecod_tbl[syncinfo->frmsizecod].bit_rate;
-
-}
-
-
-/**
- * This routine fills a bsi struct from the AC3 stream
- **/
-
-void parse_bsi(bsi_t *bsi)
-{
-	/* Check the AC-3 version number */
-	bsi->bsid = bitstream_get(5);
-
-	/* Get the audio service provided by the steram */
-	bsi->bsmod = bitstream_get(3);
-
-	/* Get the audio coding mode (ie how many channels)*/
-	bsi->acmod = bitstream_get(3);
-	/* Predecode the number of full bandwidth channels as we use this
-	 * number a lot */
-	bsi->nfchans = nfchans[bsi->acmod];
-
-	/* If it is in use, get the centre channel mix level */
-	if ((bsi->acmod & 0x1) && (bsi->acmod != 0x1))
-		bsi->cmixlev = bitstream_get(2);
-
-	/* If it is in use, get the surround channel mix level */
-	if (bsi->acmod & 0x4)
-		bsi->surmixlev = bitstream_get(2);
-
-	/* Get the dolby surround mode if in 2/0 mode */
-	if(bsi->acmod == 0x2)
-		bsi->dsurmod= bitstream_get(2);
-
-	/* Is the low frequency effects channel on? */
-	bsi->lfeon = bitstream_get(1);
-
-	/* Get the dialogue normalization level */
-	bsi->dialnorm = bitstream_get(5);
-
-	/* Does compression gain exist? */
-	if ((bsi->compre = bitstream_get(1))) {
-		/* Get compression gain */
-		bsi->compr = bitstream_get(8);
-	}
-
-	/* Does language code exist? */
-	if ((bsi->langcode = bitstream_get(1))) {
-		/* Get langauge code */
-		bsi->langcod = bitstream_get(8);
-	}
-
-	/* Does audio production info exist? */
-	if ((bsi->audprodie = bitstream_get(1))) {
-		/* Get mix level */
-		bsi->mixlevel = bitstream_get(5);
-
-		/* Get room type */
-		bsi->roomtyp = bitstream_get(2);
-	}
-
-	/* If we're in dual mono mode then get some extra info */
-	if (!bsi->acmod) {
-		/* Get the dialogue normalization level two */
-		bsi->dialnorm2 = bitstream_get(5);
-
-		/* Does compression gain two exist? */
-		if ((bsi->compr2e = bitstream_get(1))) {
-			/* Get compression gain two */
-			bsi->compr2 = bitstream_get(8);
-		}
-
-		/* Does language code two exist? */
-		if ((bsi->langcod2e = bitstream_get(1))) {
-			/* Get langauge code two */
-			bsi->langcod2 = bitstream_get(8);
-		}
-
-		/* Does audio production info two exist? */
-		if ((bsi->audprodi2e = bitstream_get(1))) {
-			/* Get mix level two */
-			bsi->mixlevel2 = bitstream_get(5);
-
-			/* Get room type two */
-			bsi->roomtyp2 = bitstream_get(2);
-		}
-	}
-
-	/* Get the copyright bit */
-	bsi->copyrightb = bitstream_get(1);
-
-	/* Get the original bit */
-	bsi->origbs = bitstream_get(1);
-	
-	/* Does timecode one exist? */
-	if ((bsi->timecod1e = bitstream_get(1)))
-		bsi->timecod1 = bitstream_get(14);
-
-	/* Does timecode two exist? */
-	if ((bsi->timecod2e = bitstream_get(1)))
-		bsi->timecod2 = bitstream_get(14);
-
-	/* Does addition info exist? */
-	if ((bsi->addbsie = bitstream_get(1))) {
-		uint32_t i;
-
-		/* Get how much info is there */
-		bsi->addbsil = bitstream_get(6);
-
-		/* Get the additional info */
-		for(i=0;i<(bsi->addbsil + 1);i++)
-			bsi->addbsi[i] = bitstream_get(8);
-	}
-
-	stats_print_bsi(bsi);
-}
-
-
-/* More pain inducing parsing */
-void parse_audblk(bsi_t *bsi,audblk_t *audblk)
-{
-	int i,j;
-
-	for (i=0; i < bsi->nfchans; i++) {
-		/* Is this channel an interleaved 256 + 256 block ? */
-		audblk->blksw[i] = bitstream_get(1);
-	}
-
-	for (i=0;i < bsi->nfchans; i++) {
-		/* Should we dither this channel? */
-		audblk->dithflag[i] = bitstream_get(1);
-	}
-
-	/* Does dynamic range control exist? */
-	if ((audblk->dynrnge = bitstream_get(1))) {
-		/* Get dynamic range info */
-		audblk->dynrng = bitstream_get(8);
-	}
-
-	/* If we're in dual mono mode then get the second channel DR info */
-	if (bsi->acmod == 0) {
-		/* Does dynamic range control two exist? */
-		if ((audblk->dynrng2e = bitstream_get(1))) {
-			/* Get dynamic range info */
-			audblk->dynrng2 = bitstream_get(8);
-		}
-	}
-
-	/* Does coupling strategy exist? */
-	if ((audblk->cplstre = bitstream_get(1))) {
-		/* Is coupling turned on? */
-		if ((audblk->cplinu = bitstream_get(1))) {
-			for(i=0;i < bsi->nfchans; i++)
-				audblk->chincpl[i] = bitstream_get(1);
-			if(bsi->acmod == 0x2)
-				audblk->phsflginu = bitstream_get(1);
-			audblk->cplbegf = bitstream_get(4);
-			audblk->cplendf = bitstream_get(4);
-			audblk->ncplsubnd = (audblk->cplendf + 2) - audblk->cplbegf + 1;
-
-			/* Calculate the start and end bins of the coupling channel */
-			audblk->cplstrtmant = (audblk->cplbegf * 12) + 37 ; 
-			audblk->cplendmant =  ((audblk->cplendf + 3) * 12) + 37;
-
-			/* The number of combined subbands is ncplsubnd minus each combined
-			 * band */
-			audblk->ncplbnd = audblk->ncplsubnd; 
-
-			for(i=1; i< audblk->ncplsubnd; i++) {
-				audblk->cplbndstrc[i] = bitstream_get(1);
-				audblk->ncplbnd -= audblk->cplbndstrc[i];
-			}
-		}
-	}
-
-	if(audblk->cplinu) {
-		/* Loop through all the channels and get their coupling co-ords */	
-		for(i=0;i < bsi->nfchans;i++) {
-			if(!audblk->chincpl[i])
-				continue;
-
-			/* Is there new coupling co-ordinate info? */
-			if ((audblk->cplcoe[i] = bitstream_get(1))) {
-				audblk->mstrcplco[i] = bitstream_get(2); 
-				for(j=0;j < audblk->ncplbnd; j++) {
-					audblk->cplcoexp[i][j] = bitstream_get(4); 
-					audblk->cplcomant[i][j] = bitstream_get(4); 
-				}
-			}
-		}
-
-		/* If we're in dual mono mode, there's going to be some phase info */
-		if( (bsi->acmod == 0x2) && audblk->phsflginu && 
-				(audblk->cplcoe[0] || audblk->cplcoe[1])) {
-			for(j=0;j < audblk->ncplbnd; j++)
-				audblk->phsflg[j] = bitstream_get(1); 
-
-		}
-	}
-
-	/* If we're in dual mono mode, there may be a rematrix strategy */
-	if(bsi->acmod == 0x2) {
-		if ((audblk->rematstr = bitstream_get(1))) {
-			if (!audblk->cplinu) { 
-				for(i = 0; i < 4; i++) 
-					audblk->rematflg[i] = bitstream_get(1);
-			}
-			if((audblk->cplbegf > 2) && audblk->cplinu) {
-				for(i = 0; i < 4; i++) 
-					audblk->rematflg[i] = bitstream_get(1);
-			}
-			if((audblk->cplbegf <= 2) && audblk->cplinu) { 
-				for(i = 0; i < 3; i++) 
-					audblk->rematflg[i] = bitstream_get(1);
-			} 
-			if((audblk->cplbegf == 0) && audblk->cplinu) 
-				for(i = 0; i < 2; i++) 
-					audblk->rematflg[i] = bitstream_get(1);
-
-		}
-	}
-
-	if (audblk->cplinu) {
-		/* Get the coupling channel exponent strategy */
-		audblk->cplexpstr = bitstream_get(2);
-		audblk->ncplgrps = (audblk->cplendmant - audblk->cplstrtmant) / 
-				(3 << (audblk->cplexpstr-1));
-	}
-
-	for(i = 0; i < bsi->nfchans; i++)
-		audblk->chexpstr[i] = bitstream_get(2);
-
-	/* Get the exponent strategy for lfe channel */
-	if(bsi->lfeon) 
-		audblk->lfeexpstr = bitstream_get(1);
-
-	/* Determine the bandwidths of all the fbw channels */
-	for(i = 0; i < bsi->nfchans; i++) { 
-		uint16_t grp_size;
-
-		if(audblk->chexpstr[i] != EXP_REUSE) { 
-			if (audblk->cplinu && audblk->chincpl[i]) {
-				audblk->endmant[i] = audblk->cplstrtmant;
-			} else {
-				audblk->chbwcod[i] = bitstream_get(6); 
-				audblk->endmant[i] = ((audblk->chbwcod[i] + 12) * 3) + 37;
-			}
-
-			/* Calculate the number of exponent groups to fetch */
-			grp_size =  3 * (1 << (audblk->chexpstr[i] - 1));
-			audblk->nchgrps[i] = (audblk->endmant[i] - 1 + (grp_size - 3)) / grp_size;
-		}
-	}
-
-	/* Get the coupling exponents if they exist */
-	if(audblk->cplinu && (audblk->cplexpstr != EXP_REUSE)) {
-		audblk->cplabsexp = bitstream_get(4);
-		for(i=0;i< audblk->ncplgrps;i++)
-			audblk->cplexps[i] = bitstream_get(7);
-	}
-
-	/* Get the fwb channel exponents */
-	for(i=0;i < bsi->nfchans; i++) {
-		if(audblk->chexpstr[i] != EXP_REUSE) {
-			audblk->exps[i][0] = bitstream_get(4);			
-			for(j=1;j<=audblk->nchgrps[i];j++)
-				audblk->exps[i][j] = bitstream_get(7);
-			audblk->gainrng[i] = bitstream_get(2);
-		}
-	}
-
-	/* Get the lfe channel exponents */
-	if(bsi->lfeon && (audblk->lfeexpstr != EXP_REUSE)) {
-		audblk->lfeexps[0] = bitstream_get(4);
-		audblk->lfeexps[1] = bitstream_get(7);
-		audblk->lfeexps[2] = bitstream_get(7);
-	}
-
-	/* Get the parametric bit allocation parameters */
-	audblk->baie = bitstream_get(1);
-
-	if(audblk->baie) {
-		audblk->sdcycod = bitstream_get(2);
-		audblk->fdcycod = bitstream_get(2);
-		audblk->sgaincod = bitstream_get(2);
-		audblk->dbpbcod = bitstream_get(2);
-		audblk->floorcod = bitstream_get(3);
-	}
-
-	/* Get the SNR off set info if it exists */
-	audblk->snroffste = bitstream_get(1);
-
-	if(audblk->snroffste) {
-		audblk->csnroffst = bitstream_get(6);
-
-		if(audblk->cplinu) {
-			audblk->cplfsnroffst = bitstream_get(4);
-			audblk->cplfgaincod = bitstream_get(3);
-		}
-
-		for(i = 0;i < bsi->nfchans; i++) {
-			audblk->fsnroffst[i] = bitstream_get(4);
-			audblk->fgaincod[i] = bitstream_get(3);
-		}
-		if(bsi->lfeon) {
-
-			audblk->lfefsnroffst = bitstream_get(4);
-			audblk->lfefgaincod = bitstream_get(3);
-		}
-	}
-
-	/* Get coupling leakage info if it exists */
-	if(audblk->cplinu) {
-		audblk->cplleake = bitstream_get(1);	
-		
-		if(audblk->cplleake) {
-			audblk->cplfleak = bitstream_get(3);
-			audblk->cplsleak = bitstream_get(3);
-		}
-	}
-	
-	/* Get the delta bit alloaction info */
-	audblk->deltbaie = bitstream_get(1);	
-	
-	if(audblk->deltbaie) {
-		if(audblk->cplinu)
-			audblk->cpldeltbae = bitstream_get(2);
-
-		for(i = 0;i < bsi->nfchans; i++)
-			audblk->deltbae[i] = bitstream_get(2);
-
-		if (audblk->cplinu && (audblk->cpldeltbae == DELTA_BIT_NEW)) {
-			audblk->cpldeltnseg = bitstream_get(3);
-			for(i = 0;i < audblk->cpldeltnseg + 1; i++) {
-				audblk->cpldeltoffst[i] = bitstream_get(5);
-				audblk->cpldeltlen[i] = bitstream_get(4);
-				audblk->cpldeltba[i] = bitstream_get(3);
-			}
-		}
-
-		for(i = 0;i < bsi->nfchans; i++) {
-			if (audblk->deltbae[i] == DELTA_BIT_NEW) {
-				audblk->deltnseg[i] = bitstream_get(3);
-				for(j = 0; j < audblk->deltnseg[i] + 1; j++) {
-					audblk->deltoffst[i][j] = bitstream_get(5);
-					audblk->deltlen[i][j] = bitstream_get(4);
-					audblk->deltba[i][j] = bitstream_get(3);
-				}
-			}
-		}
-	}
-
-	/* Check to see if there's any dummy info to get */
-	if((audblk->skiple =  bitstream_get(1))) {
-		uint16_t skip_data;
-
-		audblk->skipl = bitstream_get(9);
-
-		for (i = 0; i < audblk->skipl; i++) {
-			skip_data = bitstream_get(8);
-		}
-	}
-
-	stats_print_audblk(bsi,audblk);
-}
diff --git a/ac3dec/parse.h b/ac3dec/parse.h
deleted file mode 100644
index 6264fea1d..000000000
--- a/ac3dec/parse.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- *    parse.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-void parse_syncinfo(syncinfo_t *syncinfo,uint8_t *data);
-void parse_audblk(bsi_t *bsi,audblk_t *audblk);
-void parse_bsi(bsi_t *bsi);
diff --git a/ac3dec/rematrix.c b/ac3dec/rematrix.c
deleted file mode 100644
index f1df19b19..000000000
--- a/ac3dec/rematrix.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 
- *    rematrix.c
- *
- *	Copyright (C) Aaron Holtzman - July 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-#include "rematrix.h"
-
-
-struct rematrix_band_s
-{
-	uint32_t start;
-	uint32_t end;
-} rematrix_band[] = {
-	{13, 24},
-	{25, 36},
-	{37, 60},
-	{61, 252}
-};
-
-
-/**
- *
- **/
-
-inline uint32_t min (uint32_t a, uint32_t b)
-{
-	return (a < b) ? a : b;
-}
-
-
-/**
- * This routine simply does stereo remartixing for the 2 channel 
- * stereo mode
- **/
-
-void rematrix (audblk_t *audblk, stream_samples_t samples)
-{
-	uint32_t num_bands;
-	uint32_t start;
-	uint32_t end;
-	int i,j;
-
-	if (!audblk->cplinu || audblk->cplbegf > 2)
-		num_bands = 4;
-	else if (audblk->cplbegf > 0)
-		num_bands = 3;
-	else
-		num_bands = 2;
-
-	for (i=0; i < num_bands; i++) {
-		if (!audblk->rematflg[i])
-			continue;
-
-		start = rematrix_band[i].start;
-		end = min (rematrix_band[i].end ,12 * audblk->cplbegf + 36);
-	
-		for (j=start;j < end; j++) {
-			float left,right;
-
-			left  = samples[0][j] + samples[1][j];
-			right = samples[0][j] - samples[1][j];
-			samples[0][j] = left;
-			samples[1][j] = right;
-		}
-	}
-}
diff --git a/ac3dec/rematrix.h b/ac3dec/rematrix.h
deleted file mode 100644
index 0be6528f6..000000000
--- a/ac3dec/rematrix.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
- *    rematrix.h
- *
- *	Copyright (C) Aaron Holtzman - July 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
- */
-
-void rematrix(audblk_t *audblk, stream_samples_t samples);
diff --git a/ac3dec/sanity_check.c b/ac3dec/sanity_check.c
deleted file mode 100644
index d475de14f..000000000
--- a/ac3dec/sanity_check.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
- *  sanity_check.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ac3.h"
-#include "ac3_internal.h"
-#include "sanity_check.h"
-
-
-/**
- *
- **/
-
-void sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
-{
-	syncinfo->magic = AC3_MAGIC_NUMBER;
-	bsi->magic = AC3_MAGIC_NUMBER;
-	audblk->magic1 = AC3_MAGIC_NUMBER;
-	audblk->magic2 = AC3_MAGIC_NUMBER;
-	audblk->magic3 = AC3_MAGIC_NUMBER;
-}
-
-
-/**
- *
- **/
-
-int sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
-{
-	int i;
-
-	if(syncinfo->magic != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- syncinfo magic number **");
-		return -1;
-	}
-	
-	if(bsi->magic != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- bsi magic number **");
-		return -1;
-	}
-
-	if(audblk->magic1 != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 1 **"); 
-		return -1;
-	}
-
-	if(audblk->magic2 != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 2 **"); 
-		return -1;
-	}
-
-	if(audblk->magic3 != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 3 **"); 
-		return -1;
-	}
-
-	for(i = 0;i < 5 ; i++) {
-		if (audblk->fbw_exp[i][255] !=0 || audblk->fbw_exp[i][254] !=0 || 
-				audblk->fbw_exp[i][253] !=0) {
-			fprintf(stderr,"\n** Sanity check failed -- fbw_exp out of bounds **"); 
-			return -1;
-		}
-
-		if (audblk->fbw_bap[i][255] !=0 || audblk->fbw_bap[i][254] !=0 || 
-				audblk->fbw_bap[i][253] !=0) {
-			fprintf(stderr,"\n** Sanity check failed -- fbw_bap out of bounds **"); 
-			return -1;
-		}
-
-	}
-
-	if (audblk->cpl_exp[255] !=0 || audblk->cpl_exp[254] !=0 || 
-			audblk->cpl_exp[253] !=0) {
-		fprintf(stderr,"\n** Sanity check failed -- cpl_exp out of bounds **"); 
-		return -1;
-	}
-
-	if (audblk->cpl_bap[255] !=0 || audblk->cpl_bap[254] !=0 || 
-			audblk->cpl_bap[253] !=0) {
-		fprintf(stderr,"\n** Sanity check failed -- cpl_bap out of bounds **"); 
-		return -1;
-	}
-
-	if (audblk->cpl_flt[255] !=0 || audblk->cpl_flt[254] !=0 || 
-			audblk->cpl_flt[253] !=0) {
-		fprintf(stderr,"\n** Sanity check failed -- cpl_mant out of bounds **"); 
-		return -1;
-	}
-
-	if ((audblk->cplinu == 1) && (audblk->cplbegf > (audblk->cplendf+2))) {
-		fprintf(stderr,"\n** Sanity check failed -- cpl params inconsistent **"); 
-		return -1;
-	}
-
-	for(i=0; i < bsi->nfchans; i++) {
-		if((audblk->chincpl[i] == 0) && (audblk->chbwcod[i] > 60)) {
-			fprintf(stderr,"\n** Sanity check failed -- chbwcod too big **"); 
-			return -1;
-		}
-	}
-
-	return 0;
-}	
diff --git a/ac3dec/sanity_check.h b/ac3dec/sanity_check.h
deleted file mode 100644
index ead9399c9..000000000
--- a/ac3dec/sanity_check.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 
- *  sanity_check.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#define AC3_MAGIC_NUMBER 0xdeadbeef
-
-void sanity_check_init (syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
-int sanity_check (syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk);
diff --git a/ac3dec/srfft.c b/ac3dec/srfft.c
deleted file mode 100644
index 4cbb62954..000000000
--- a/ac3dec/srfft.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* 
- *  srfft.c
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
- *
- *  64 and 128 point split radix fft for ac3dec
- *
- *  The algorithm is desribed in the book:
- *  "Computational Frameworks of the Fast Fourier Transform".
- *
- *  The ideas and the the organization of code borrowed from djbfft written by
- *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
- *  http://cr.yp.to/djbfft.html.
- *
- *  srfft.c is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  srfft.c is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <stdio.h>
-
-#include "srfft.h"
-#include "srfftp.h"
-
-void fft_8 (complex_t *x);
-
-void fft_4(complex_t *x)
-{
-  /* delta_p = 1 here */
-  /* x[k] = sum_{i=0..3} x[i] * w^{i*k}, w=e^{-2*pi/4} 
-   */
-
-  register float yt_r, yt_i, yb_r, yb_i, u_r, u_i, vi_r, vi_i;
-  
-  yt_r = x[0].re;
-  yb_r = yt_r - x[2].re;
-  yt_r += x[2].re;
-
-  u_r = x[1].re;
-  vi_i = x[3].re - u_r;
-  u_r += x[3].re;
-  
-  u_i = x[1].im;
-  vi_r = u_i - x[3].im;
-  u_i += x[3].im;
-
-  yt_i = yt_r;
-  yt_i += u_r;
-  x[0].re = yt_i;
-  yt_r -= u_r;
-  x[2].re = yt_r;
-  yt_i = yb_r;
-  yt_i += vi_r;
-  x[1].re = yt_i;
-  yb_r -= vi_r;
-  x[3].re = yb_r;
-
-  yt_i = x[0].im;
-  yb_i = yt_i - x[2].im;
-  yt_i += x[2].im;
-
-  yt_r = yt_i;
-  yt_r += u_i;
-  x[0].im = yt_r;
-  yt_i -= u_i;
-  x[2].im = yt_i;
-  yt_r = yb_i;
-  yt_r += vi_i;
-  x[1].im = yt_r;
-  yb_i -= vi_i;
-  x[3].im = yb_i;
-}
-
-
-void fft_8 (complex_t *x)
-{
-  /* delta_p = diag{1, sqrt(i)} here */
-  /* x[k] = sum_{i=0..7} x[i] * w^{i*k}, w=e^{-2*pi/8} 
-   */
-  register float wT1_r, wT1_i, wB1_r, wB1_i, wT2_r, wT2_i, wB2_r, wB2_i;
-  
-  wT1_r = x[1].re;
-  wT1_i = x[1].im;
-  wB1_r = x[3].re;
-  wB1_i = x[3].im;
-
-  x[1] = x[2];
-  x[2] = x[4];
-  x[3] = x[6];
-  fft_4(&x[0]);
-
-  
-  /* x[0] x[4] */
-  wT2_r = x[5].re;
-  wT2_r += x[7].re;
-  wT2_r += wT1_r;
-  wT2_r += wB1_r;
-  wT2_i = wT2_r;
-  wT2_r += x[0].re;
-  wT2_i = x[0].re - wT2_i;
-  x[0].re = wT2_r;
-  x[4].re = wT2_i;
-
-  wT2_i = x[5].im;
-  wT2_i += x[7].im;
-  wT2_i += wT1_i;
-  wT2_i += wB1_i;
-  wT2_r = wT2_i;
-  wT2_r += x[0].im;
-  wT2_i = x[0].im - wT2_i;
-  x[0].im = wT2_r;
-  x[4].im = wT2_i;
-  
-  /* x[2] x[6] */
-  wT2_r = x[5].im;
-  wT2_r -= x[7].im;
-  wT2_r += wT1_i;
-  wT2_r -= wB1_i;
-  wT2_i = wT2_r;
-  wT2_r += x[2].re;
-  wT2_i = x[2].re - wT2_i;
-  x[2].re = wT2_r;
-  x[6].re = wT2_i;
-
-  wT2_i = x[5].re;
-  wT2_i -= x[7].re;
-  wT2_i += wT1_r;
-  wT2_i -= wB1_r;
-  wT2_r = wT2_i;
-  wT2_r += x[2].im;
-  wT2_i = x[2].im - wT2_i;
-  x[2].im = wT2_i;
-  x[6].im = wT2_r;
-  
-
-  /* x[1] x[5] */
-  wT2_r = wT1_r;
-  wT2_r += wB1_i;
-  wT2_r -= x[5].re;
-  wT2_r -= x[7].im;
-  wT2_i = wT1_i;
-  wT2_i -= wB1_r;
-  wT2_i -= x[5].im;
-  wT2_i += x[7].re;
-
-  wB2_r = wT2_r;
-  wB2_r += wT2_i;
-  wT2_i -= wT2_r;
-  wB2_r *= HSQRT2;
-  wT2_i *= HSQRT2;
-  wT2_r = wB2_r;
-  wB2_r += x[1].re;
-  wT2_r =  x[1].re - wT2_r;
-
-  wB2_i = x[5].re;
-  x[1].re = wB2_r;
-  x[5].re = wT2_r;
-
-  wT2_r = wT2_i;
-  wT2_r += x[1].im;
-  wT2_i = x[1].im - wT2_i;
-  wB2_r = x[5].im;
-  x[1].im = wT2_r;
-  x[5].im = wT2_i;
-
-  /* x[3] x[7] */
-  wT1_r -= wB1_i;
-  wT1_i += wB1_r;
-  wB1_r = wB2_i - x[7].im;
-  wB1_i = wB2_r + x[7].re;
-  wT1_r -= wB1_r;
-  wT1_i -= wB1_i;
-  wB1_r = wT1_r + wT1_i;
-  wB1_r *= HSQRT2;
-  wT1_i -= wT1_r;
-  wT1_i *= HSQRT2;
-  wB2_r = x[3].re;
-  wB2_i = wB2_r + wT1_i;
-  wB2_r -= wT1_i;
-  x[3].re = wB2_i;
-  x[7].re = wB2_r;
-  wB2_i = x[3].im;
-  wB2_r = wB2_i + wB1_r;
-  wB2_i -= wB1_r;
-  x[3].im = wB2_i;
-  x[7].im = wB2_r;
-}
-
-
-void fft_asmb(int k, complex_t *x, complex_t *wTB,
-	     const complex_t *d, const complex_t *d_3)
-{
-  register complex_t  *x2k, *x3k, *x4k, *wB;
-  register float a_r, a_i, a1_r, a1_i, u_r, u_i, v_r, v_i;
-
-  x2k = x + 2 * k;
-  x3k = x2k + 2 * k;
-  x4k = x3k + 2 * k;
-  wB = wTB + 2 * k;
-  
-  TRANSZERO(x[0],x2k[0],x3k[0],x4k[0]);
-  TRANS(x[1],x2k[1],x3k[1],x4k[1],wTB[1],wB[1],d[1],d_3[1]);
-  
-  --k;
-  for(;;) {
-     TRANS(x[2],x2k[2],x3k[2],x4k[2],wTB[2],wB[2],d[2],d_3[2]);
-     TRANS(x[3],x2k[3],x3k[3],x4k[3],wTB[3],wB[3],d[3],d_3[3]);
-     if (!--k) break;
-     x += 2;
-     x2k += 2;
-     x3k += 2;
-     x4k += 2;
-     d += 2;
-     d_3 += 2;
-     wTB += 2;
-     wB += 2;
-  }
- 
-}
-
-void fft_asmb16(complex_t *x, complex_t *wTB)
-{
-  register float a_r, a_i, a1_r, a1_i, u_r, u_i, v_r, v_i;
-  int k = 2;
-
-  /* transform x[0], x[8], x[4], x[12] */
-  TRANSZERO(x[0],x[4],x[8],x[12]);
-
-  /* transform x[1], x[9], x[5], x[13] */
-  TRANS(x[1],x[5],x[9],x[13],wTB[1],wTB[5],delta16[1],delta16_3[1]);
-
-  /* transform x[2], x[10], x[6], x[14] */
-  TRANSHALF_16(x[2],x[6],x[10],x[14]);
-
-  /* transform x[3], x[11], x[7], x[15] */
-  TRANS(x[3],x[7],x[11],x[15],wTB[3],wTB[7],delta16[3],delta16_3[3]);
-
-} 
-
-
-void fft_64p_c (complex_t *a)
-{
-  fft_8(&a[0]); fft_4(&a[8]); fft_4(&a[12]);
-  fft_asmb16(&a[0], &a[8]);
-  
-  fft_8(&a[16]), fft_8(&a[24]);
-  fft_asmb(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
-
-  fft_8(&a[32]); fft_4(&a[40]); fft_4(&a[44]);
-  fft_asmb16(&a[32], &a[40]);
-
-  fft_8(&a[48]); fft_4(&a[56]); fft_4(&a[60]);
-  fft_asmb16(&a[48], &a[56]);
-
-  fft_asmb(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
-}
-
-
-void fft_128p_c (complex_t *a)
-{
-  fft_8(&a[0]); fft_4(&a[8]); fft_4(&a[12]);
-  fft_asmb16(&a[0], &a[8]);
-  
-  fft_8(&a[16]), fft_8(&a[24]);
-  fft_asmb(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
-
-  fft_8(&a[32]); fft_4(&a[40]); fft_4(&a[44]);
-  fft_asmb16(&a[32], &a[40]);
-
-  fft_8(&a[48]); fft_4(&a[56]); fft_4(&a[60]);
-  fft_asmb16(&a[48], &a[56]);
-
-  fft_asmb(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
-
-  fft_8(&a[64]); fft_4(&a[72]); fft_4(&a[76]);
-  /* fft_16(&a[64]); */
-  fft_asmb16(&a[64], &a[72]);
-
-  fft_8(&a[80]); fft_8(&a[88]);
-  
-  /* fft_32(&a[64]); */
-  fft_asmb(4, &a[64], &a[80],&delta32[0], &delta32_3[0]);
-
-  fft_8(&a[96]); fft_4(&a[104]), fft_4(&a[108]);
-  /* fft_16(&a[96]); */
-  fft_asmb16(&a[96], &a[104]);
-
-  fft_8(&a[112]), fft_8(&a[120]);
-  /* fft_32(&a[96]); */
-  fft_asmb(4, &a[96], &a[112], &delta32[0], &delta32_3[0]);
-  
-  /* fft_128(&a[0]); */
-  fft_asmb(16, &a[0], &a[64], &delta128[0], &delta128_3[0]);
-}
diff --git a/ac3dec/srfft.h b/ac3dec/srfft.h
deleted file mode 100644
index 7916092a4..000000000
--- a/ac3dec/srfft.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 
- *  srfft.h
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
- *
- *  64 and 128 point split radix fft for ac3dec
- *
- *  The algorithm is desribed in the book:
- *  "Computational Frameworks of the Fast Fourier Transform".
- *
- *  The ideas and the the organization of code borrowed from djbfft written by
- *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
- *  http://cr.yp.to/djbfft.html.
- *
- *  srfft.h is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  srfft.h is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef SRFFT_H__
-#define SRFFT_H__
-
-#include "cmplx.h"
-
-void fft_64p_c (complex_t *x);
-void fft_128p_c (complex_t *x);
-
-#endif /* SRFFT_H__ */
diff --git a/ac3dec/srfft_kni.S b/ac3dec/srfft_kni.S
deleted file mode 100644
index a42a41b14..000000000
--- a/ac3dec/srfft_kni.S
+++ /dev/null
@@ -1,289 +0,0 @@
-/* 
- *  srfft_kni.S
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - October 2000
- *
- *
- *  srfft_kni.S is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  srfft_kni.S is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifdef __i386__
-
-.section	.rodata
-	.align 16
-hsqrt2:	 .float 0f0.707106781188
-	 .float 0f0.707106781188
-	 .float 0f-0.707106781188
-	 .float 0f-0.707106781188
-C_1:	 .float 0f-1.0
-	 .float 0f1.0
-	 .float 0f-1.0
-	 .float 0f1.0
-	
-.text
-	.align 4
-.global fft_4_kni
-	.type fft_4_kni, @function
-fft_4_kni:
-	pushl %ebp
-	movl %esp, %ebp
-	movl 8(%ebp), %eax		/* complex_t * */
-	
-	movaps (%eax), %xmm0		/* x[1] | x[0] */
-	movaps 16(%eax), %xmm2		/* x[3] | x[2] */
-	movaps %xmm0, %xmm1		/* x[1] | x[0] */
-	addps %xmm2, %xmm0		/* x[1] + x[3] | x[0] + x[2] */
-	subps %xmm2, %xmm1		/* x[1] - x[3] | x[0] - x[2] */
-	xorps %xmm6, %xmm6
-	movhlps %xmm1, %xmm4		/* x[1] - x[3] */
-	movhlps %xmm0, %xmm3		/* x[1] + x[3] */
-	subss %xmm4, %xmm6		/* -(x[1] - x[3]).re */
-	movlhps %xmm1, %xmm0		/* x[0] - x[2] | x[0] + x[2] */
-	movss %xmm6, %xmm4		/* (x[1] - x[3]).im | (x[3]-x[1]).re */
-	movaps %xmm0, %xmm2		/* x[0] - x[2] | x[0] + x[2] */
-	shufps $0x14, %xmm4, %xmm3	/* -i*(x[2] - x[3] | x[2] + x[3] */
-	addps %xmm3, %xmm0
-	subps %xmm3, %xmm2
-	movaps %xmm0, (%eax)
-	movaps %xmm2, 16(%eax)
-
-	leave
-	ret
-	
-
-	.align 4
-.global fft_8_kni
-	.type fft_8_kni, @function
-fft_8_kni:
-	pushl %ebp
-	movl %esp, %ebp
-	movl 8(%ebp), %eax		/* complext_t */
-
-	pushl %ebx
-	movlps (%eax), %xmm0		/* x[0] */
-	movlps 32(%eax), %xmm1		/* x[4] */
-	movhps 16(%eax), %xmm0		/* x[2] | x[0] */
-	movhps 48(%eax), %xmm1		/* x[6] | x[4] */
-	movaps %xmm0, %xmm2		/* x[2] | x[0] */
-	xorps %xmm3, %xmm3
-	addps %xmm1, %xmm0		/* x[2] + x[6] | x[0] + x[4] */
-	subps %xmm1, %xmm2		/* x[2] - x[6] | x[0] - x[4] */
-	movhlps %xmm0, %xmm5		/* x[2] + x[6] */
-	movhlps %xmm2, %xmm4
-	movlhps %xmm2, %xmm0		/* x[0] - x[4] | x[0] + x[4] */
-	subss %xmm4, %xmm3		/* -(x[2]-x[6]).re */
-	movaps %xmm0, %xmm7		/* x[0] - x[4] | x[0] + x[4] */
-	movss %xmm3, %xmm4		/* (x[2]-x[6]).im | -(x[2]-x[6]).re */
-	movlps 8(%eax), %xmm1		/* x[1] */
-	shufps $0x14, %xmm4, %xmm5	/* -i*(x[2] - x[6]) | x[2] + x[6] */
-
-	addps %xmm5, %xmm0		/* yt */
-	subps %xmm5, %xmm7		/* yb */
-
-	movhps 24(%eax), %xmm1		/* x[3] | x[1] */
-	movl $hsqrt2, %ebx
-	movlps 40(%eax), %xmm2		/* x[5] */
-	movhps 56(%eax), %xmm2		/* /x[7] | x[5] */
-	movaps %xmm1, %xmm3		/* x[3] | x[1] */
-	addps %xmm2, %xmm1		/* x[3] + x[7] | x[1] + x[5] */
-	subps %xmm2, %xmm3		/* x[3] - x[7] | x[1] - x[5] */
-	movaps (%ebx), %xmm4		/* -1/sqrt2 | -1/sqrt2 | 1/sqrt2 | 1/sqrt2 */
-	movaps %xmm3, %xmm6		/* x[3] - x[7] | x[1] - x[5] */
-	mulps %xmm4, %xmm3
-	shufps $0xc8, %xmm4, %xmm4	/* -1/sqrt2 | 1/sqrt2 | -1/sqrt2 | 1/sqrt2 */
-	shufps $0xb1, %xmm6, %xmm6
-	mulps %xmm4, %xmm6
-	addps %xmm3, %xmm6		/* (-1-i)/sqrt2 * (x[3]-x[7]) | (1-i)/sqrt2 * (x[1] - x[5] */
-	movhlps %xmm1, %xmm5		/* x[3] + x[7] */
-	movlhps %xmm6, %xmm1		/* (1+i)/sqrt2 * (x[1]-x[5]) | x[1]+x[5] */
-	shufps $0xe4, %xmm6, %xmm5	/* (-1-i)/sqrt2 * (x[3]-x[7]) | x[3]+x[7] */
-	movaps %xmm1, %xmm3		/* (1-i)/sqrt2 * (x[1]-x[5]) | x[1]+x[5] */
-	movl $C_1, %ebx
-	addps %xmm5, %xmm1		/* u */
-	subps %xmm5, %xmm3		/* v */
-	movaps %xmm0, %xmm2		/* yb */
-	movaps %xmm7, %xmm4		/* yt */
-	movaps (%ebx), %xmm5
-	mulps %xmm5, %xmm3
-	addps %xmm1, %xmm0		/* yt + u */
-	subps %xmm1, %xmm2		/* yt - u */
-	shufps $0xb1, %xmm3, %xmm3		/* -i * v */
-	movaps %xmm0, (%eax)
-	movaps %xmm2, 32(%eax)
-	addps %xmm3, %xmm4		/* yb - i*v */
-	subps %xmm3, %xmm7		/* yb + i*v */
-	movaps %xmm4, 16(%eax)
-	movaps %xmm7, 48(%eax)
-
-	popl %ebx
-	leave
-	ret
-
-	.align 4
-.global fft_asmb_kni 
-	.type fft_asmb, @function
-fft_asmb_kni:
-	pushl %ebp
-	movl %esp, %ebp
-
-	subl $4, %esp
-		
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),  %ecx		/* k */
-	movl 12(%ebp), %eax		/* x */
-	movl %ecx, -4(%ebp)		/* k */
-	movl 16(%ebp), %ebx		/* wT */
-	movl 20(%ebp), %edx		/* d */
-	movl 24(%ebp), %esi		/* d3 */
-	shll $4, %ecx			/* 16k */
-	addl $8, %edx
-	leal (%eax, %ecx, 2), %edi
-	addl $8, %esi
-	
-	/* TRANSZERO and TRANS */
-	movaps (%eax), %xmm0		/* x[1] | x[0] */
-	movaps (%ebx), %xmm1		/* wT[1] | wT[0] */
-	movaps (%ebx, %ecx), %xmm2	/* wB[1] | wB[0] */
-	movlps (%edx), %xmm3		/* d */
-	movlps (%esi), %xmm4		/* d3 */
-	movhlps %xmm1, %xmm5		/* wT[1] */
-	movhlps %xmm2, %xmm6		/* wB[1] */
-	shufps $0x50, %xmm3, %xmm3	/* d[1].im | d[1].im | d[1].re | d[1].re */
-	shufps $0x50, %xmm4, %xmm4	/* d3[1].im | d3[1].im | d3[i].re | d3[i].re */
-	movlhps %xmm5, %xmm5		/* wT[1] | wT[1] */
-	movlhps %xmm6, %xmm6		/* wB[1] | wB[1] */
-	mulps %xmm3, %xmm5
-	mulps %xmm4, %xmm6
-	movhlps %xmm5, %xmm7		/* wT[1].im * d[1].im | wT[1].re * d[1].im */
-	movlhps %xmm6, %xmm5		/* wB[1].im * d3[1].re | wB[1].re * d3[1].re | wT[1].im * d[1].re | wT[1].re * d[1].re */
-	shufps $0xb1, %xmm6, %xmm7	/* wB[1].re * d3[1].im | wB[i].im * d3[1].im | wT[1].re * d[1].im | wT[1].im * d[1].im */
-	movl $C_1, %edi
-	movaps (%edi), %xmm4
-	mulps %xmm4, %xmm7
-	addps %xmm7, %xmm5		/* wB[1] * d3[1] | wT[1] * d[1] */
-	movlhps %xmm5, %xmm1		/* d[1] * wT[1] | wT[0] */
-	shufps $0xe4, %xmm5, %xmm2	/* d3[1] * wB[1] | wB[0] */
-	movaps %xmm1, %xmm3		/* d[1] * wT[1] | wT[0] */
-	leal (%eax, %ecx, 2), %edi
-	addps %xmm2, %xmm1		/* u */
-	subps %xmm2, %xmm3		/* v */
-	mulps %xmm4, %xmm3
-	movaps (%eax, %ecx), %xmm5	/* xk[1] | xk[0] */
-	shufps $0xb1, %xmm3, %xmm3	/* -i * v */
-	movaps %xmm0, %xmm2		/* x[1] | x[0] */
-	movaps %xmm5, %xmm6		/* xk[1] | xk[0] */
-	addps %xmm1, %xmm0
-	subps %xmm1, %xmm2
-	addps %xmm3, %xmm5
-	subps %xmm3, %xmm6
-	movaps %xmm0, (%eax)
-	movaps %xmm2, (%edi)
-	movaps %xmm5, (%eax, %ecx)
-	movaps %xmm6, (%edi, %ecx)
-	addl $16, %eax
-	addl $16, %ebx
-	addl $8, %edx
-	addl $8, %esi
-	decl -4(%ebp)
-
-.loop:
-	movaps (%ebx), %xmm0		/* wT[1] | wT[0] */
-	movaps (%edx), %xmm1		/* d[1] | d[0] */
-
-	movaps (%ebx, %ecx), %xmm4	/* wB[1] | wB[0] */
-	movaps (%esi), %xmm5		/* d3[1] | d3[0] */
-
-	movhlps %xmm0, %xmm2		/* wT[1] */
-	movhlps %xmm1, %xmm3		/* d[1] */
-
-	movhlps %xmm4, %xmm6		/* wB[1] */
-	movhlps %xmm5, %xmm7		/* d3[1] */
-
-	shufps $0x50, %xmm1, %xmm1	/* d[0].im | d[0].im | d[0].re | d[0].re */
-	shufps $0x50, %xmm3, %xmm3	/* d[1].im | d[1].im | d[1].re | d[1].re */
-
-	movlhps %xmm0, %xmm0		/* wT[0] | wT[0] */
-	shufps $0x50, %xmm5, %xmm5	/* d3[0].im | d3[0].im | d3[0].re | d3[0].re */
-	movlhps %xmm2, %xmm2		/* wT[1] | wT[1] */
-	shufps $0x50, %xmm7, %xmm7	/* d3[1].im | d3[1].im | d3[1].re | d3[1].re */
-
-	mulps %xmm1, %xmm0		/* d[0].im * wT[0].im | d[0].im * wT[0].re | d[0].re * wT[0].im | d[0].re * wT[0].re */
-	mulps %xmm3, %xmm2		/* d[1].im * wT[1].im | d[1].im * wT[1].re | d[1].re * wT[1].im | d[1].re * wT[1].re */
-	movlhps %xmm4, %xmm4		/* wB[0] | wB[0] */
-	movlhps %xmm6, %xmm6		/* wB[1] | wB[1] */
-
-	movhlps %xmm0, %xmm1		/* d[0].im * wT[0].im | d[0].im * wT[0].re */
-	movlhps %xmm2, %xmm0		/* d[1].re * wT[1].im | d[1].re * wT[1].re | d[0].re * wT[0].im | d[0].re * wT[0].re */
-	mulps %xmm5, %xmm4		/* wB[0].im * d3[0].im | wB[0].re * d3[0].im | wB[0].im * d3[0].re | wB[0].re * d3[0].re */
-	mulps %xmm7, %xmm6		/* wB[1].im * d3[1].im | wB[1].re * d3[1].im | wB[1].im * d3[1].re | wB[1].re * d3[1].re */
-	shufps $0xb1, %xmm2, %xmm1	/* d[1].im * wT[1].re | d[1].im * wT[1].im | d[0].im * wT[0].re | d[0].im * wT[0].im */
-	movl $C_1, %edi
-	movaps (%edi), %xmm3		/* 1.0 | -1.0 | 1.0 | -1.0 */
-
-	movhlps %xmm4, %xmm5		/* wB[0].im * d3[0].im | wB[0].re * d3[0].im */
-	mulps %xmm3, %xmm1		/* d[1].im * wT[1].re | -d[1].im * wT[1].im | d[0].im * wT[0].re | -d[0].im * wT[0].im */
-	movlhps %xmm6, %xmm4		/* wB[1].im * d3[1].re | wB[1].re * d3[1].re | wB[0].im * d3[0].re | wB[0].im * d3[0].re */
-	addps %xmm1, %xmm0		/* wT[1] * d[1] | wT[0] * d[0] */
-
-	shufps $0xb1, %xmm6, %xmm5	/* wB[1].re * d3[1].im | wB[1].im * d3[1].im | wB[0].re * d3[0].im | wB[0].im * d3[0].im */
-	mulps %xmm3, %xmm5		/* wB[1].re * d3[1].im | -wB[1].im * d3[1].im | wB[0].re * d3[0].im | -wB[0].im * d3[0].im */
-	addps %xmm5, %xmm4		/* wB[1] * d3[1] | wB[0] * d3[0] */
-
-	movaps %xmm0, %xmm1		/* wT[1] * d[1] | wT[0] * d[0] */
-	addps %xmm4, %xmm0		/* u */
-	subps %xmm4, %xmm1		/* v */
-	movaps (%eax), %xmm6		/* x[1] | x[0] */
-	leal (%eax, %ecx, 2), %edi
-	mulps %xmm3, %xmm1
-	addl $16, %ebx
-	addl $16, %esi
-	shufps $0xb1, %xmm1, %xmm1	/* -i * v */
-	movaps (%eax, %ecx), %xmm7	/* xk[1] | xk[0] */
-	movaps %xmm6, %xmm2
-	movaps %xmm7, %xmm4
-	addps %xmm0, %xmm6
-	subps %xmm0, %xmm2
-	movaps %xmm6, (%eax)
-	movaps %xmm2, (%edi)
-	addps %xmm1, %xmm7
-	subps %xmm1, %xmm4
-	addl $16, %edx
-	movaps %xmm7, (%eax, %ecx)
-	movaps %xmm4, (%edi, %ecx)
-
-	addl $16, %eax
-	decl -4(%ebp)
-	jnz .loop
-
-.end:		
-	popl %edi	
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	
-	addl $4, %esp
-		
-	leave
-	ret
-#endif
diff --git a/ac3dec/srfft_kni.h b/ac3dec/srfft_kni.h
deleted file mode 100644
index 6dc468e34..000000000
--- a/ac3dec/srfft_kni.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****
-*
-* This file is part of the OMS program.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 2, or (at your option)
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; see the file COPYING.  If not, write to
-* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*****/
-
-#ifndef __SRFF_KNI__
-#define __SRFF_KNI__
-
-#include "cmplx.h"
-
-void fft_4_kni (complex_t *a);
-void fft_8_kni (complex_t *a);
-void fft_asmb_kni (int, complex_t*, complex_t *, complex_t *, complex_t*);
-
-#endif
diff --git a/ac3dec/srfft_kni_c.c b/ac3dec/srfft_kni_c.c
deleted file mode 100644
index d461110fc..000000000
--- a/ac3dec/srfft_kni_c.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* 
- *  srfft_kni.c
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
- *
- *  64 and 128 point split radix fft for ac3dec
- *
- *  The algorithm is desribed in the book:
- *  "Computational Frameworks of the Fast Fourier Transform".
- *
- *  The ideas and the the organization of code borrowed from djbfft written by
- *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
- *  http://cr.yp.to/djbfft.html.
- *
- *  srfft.c is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  srfft.c is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifdef __i386__
-
-#include <stdio.h>
-
-#include "srfft_kni.h"
-#include "srfftp.h"
-
-void fft_64p_kni(complex_t *a)
-{
-	fft_8_kni(&a[0]); fft_4_kni(&a[8]); fft_4_kni(&a[12]);
-	fft_asmb_kni(2, &a[0], &a[8], &delta16[0], &delta16_3[0]);
-  
-	fft_8_kni(&a[16]), fft_8_kni(&a[24]);
-	fft_asmb_kni(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
-
-	fft_8_kni(&a[32]); fft_4_kni(&a[40]); fft_4_kni(&a[44]);
-	fft_asmb_kni(2, &a[32], &a[40], &delta16[0], &delta16_3[0]);
-
-	fft_8_kni(&a[48]); fft_4_kni(&a[56]); fft_4_kni(&a[60]);
-	fft_asmb_kni(2, &a[48], &a[56], &delta16[0], &delta16_3[0]);
-
-	fft_asmb_kni(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
-}
-
-
-void fft_128p_kni(complex_t *a)
-{
-	fft_8_kni(&a[0]); fft_4_kni(&a[8]); fft_4_kni(&a[12]);
-	fft_asmb_kni(2, &a[0], &a[8], &delta16[0], &delta16_3[0]);
-  
-	fft_8_kni(&a[16]), fft_8_kni(&a[24]);
-	fft_asmb_kni(4, &a[0], &a[16],&delta32[0], &delta32_3[0]);
-
-	fft_8_kni(&a[32]); fft_4_kni(&a[40]); fft_4_kni(&a[44]);
-	fft_asmb_kni(2, &a[32], &a[40], &delta16[0], &delta16_3[0]);
-
-	fft_8_kni(&a[48]); fft_4_kni(&a[56]); fft_4_kni(&a[60]);
-	fft_asmb_kni(2, &a[48], &a[56], &delta16[0], &delta16_3[0]);
-
-	fft_asmb_kni(8, &a[0], &a[32],&delta64[0], &delta64_3[0]);
-
-	fft_8_kni(&a[64]); fft_4_kni(&a[72]); fft_4_kni(&a[76]);
-	/* fft_16(&a[64]); */
-	fft_asmb_kni(2, &a[64], &a[72], &delta16[0], &delta16_3[0]);
-
-	fft_8_kni(&a[80]); fft_8_kni(&a[88]);
-  
-	/* fft_32(&a[64]); */
-	fft_asmb_kni(4, &a[64], &a[80],&delta32[0], &delta32_3[0]);
-
-	fft_8_kni(&a[96]); fft_4_kni(&a[104]), fft_4_kni(&a[108]);
-	/* fft_16(&a[96]); */
-	fft_asmb_kni(2, &a[96], &a[104], &delta16[0], &delta16_3[0]);
-
-	fft_8_kni(&a[112]), fft_8_kni(&a[120]);
-	/* fft_32(&a[96]); */
-	fft_asmb_kni(4, &a[96], &a[112], &delta32[0], &delta32_3[0]);
-  
-	/* fft_128(&a[0]); */
-	fft_asmb_kni(16, &a[0], &a[64], &delta128[0], &delta128_3[0]);
-}
-
-#endif
diff --git a/ac3dec/srfftp.h b/ac3dec/srfftp.h
deleted file mode 100644
index 6f4471530..000000000
--- a/ac3dec/srfftp.h
+++ /dev/null
@@ -1,305 +0,0 @@
-
-/* 
- *  srfftp.h
- *
- *  Copyright (C) Yuqing Deng <Yuqing_Deng@brown.edu> - April 2000
- *
- *  64 and 128 point split radix fft for ac3dec
- *
- *  The algorithm is desribed in the book:
- *  "Computational Frameworks of the Fast Fourier Transform".
- *
- *  The ideas and the the organization of code borrowed from djbfft written by
- *  D. J. Bernstein <djb@cr.py.to>.  djbff can be found at 
- *  http://cr.yp.to/djbfft.html.
- *
- *  srfftp.h is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  srfftp.h is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef SRFFTP_H__
-#define SRFFTP_H__
-
-#include "cmplx.h"
-
-static complex_t delta16[4] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.92387953251129, -0.38268343236509},
-   {0.70710678118655, -0.70710678118655},
-   {0.38268343236509, -0.92387953251129}};
-
-static complex_t delta16_3[4] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.38268343236509, -0.92387953251129},
-   {-0.70710678118655, -0.70710678118655},
-   {-0.92387953251129, 0.38268343236509}};
-
-static complex_t delta32[8] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.98078528040323, -0.19509032201613},
-   {0.92387953251129, -0.38268343236509},
-   {0.83146961230255, -0.55557023301960},
-   {0.70710678118655, -0.70710678118655},
-   {0.55557023301960, -0.83146961230255},
-   {0.38268343236509, -0.92387953251129},
-   {0.19509032201613, -0.98078528040323}};
-
-static complex_t delta32_3[8] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.83146961230255, -0.55557023301960},
-   {0.38268343236509, -0.92387953251129},
-   {-0.19509032201613, -0.98078528040323},
-   {-0.70710678118655, -0.70710678118655},
-   {-0.98078528040323, -0.19509032201613},
-   {-0.92387953251129, 0.38268343236509},
-   {-0.55557023301960, 0.83146961230255}};
-
-static complex_t delta64[16] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.99518472667220, -0.09801714032956},
-   {0.98078528040323, -0.19509032201613},
-   {0.95694033573221, -0.29028467725446},
-   {0.92387953251129, -0.38268343236509},
-   {0.88192126434836, -0.47139673682600},
-   {0.83146961230255, -0.55557023301960},
-   {0.77301045336274, -0.63439328416365},
-   {0.70710678118655, -0.70710678118655},
-   {0.63439328416365, -0.77301045336274},
-   {0.55557023301960, -0.83146961230255},
-   {0.47139673682600, -0.88192126434835},
-   {0.38268343236509, -0.92387953251129},
-   {0.29028467725446, -0.95694033573221},
-   {0.19509032201613, -0.98078528040323},
-   {0.09801714032956, -0.99518472667220}};
-
-static complex_t delta64_3[16] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.95694033573221, -0.29028467725446},
-   {0.83146961230255, -0.55557023301960},
-   {0.63439328416365, -0.77301045336274},
-   {0.38268343236509, -0.92387953251129},
-   {0.09801714032956, -0.99518472667220},
-   {-0.19509032201613, -0.98078528040323},
-   {-0.47139673682600, -0.88192126434836},
-   {-0.70710678118655, -0.70710678118655},
-   {-0.88192126434835, -0.47139673682600},
-   {-0.98078528040323, -0.19509032201613},
-   {-0.99518472667220, 0.09801714032956},
-   {-0.92387953251129, 0.38268343236509},
-   {-0.77301045336274, 0.63439328416365},
-   {-0.55557023301960, 0.83146961230255},
-   {-0.29028467725446, 0.95694033573221}};
-
-static complex_t delta128[32] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.99879545620517, -0.04906767432742},
-   {0.99518472667220, -0.09801714032956},
-   {0.98917650996478, -0.14673047445536},
-   {0.98078528040323, -0.19509032201613},
-   {0.97003125319454, -0.24298017990326},
-   {0.95694033573221, -0.29028467725446},
-   {0.94154406518302, -0.33688985339222},
-   {0.92387953251129, -0.38268343236509},
-   {0.90398929312344, -0.42755509343028},
-   {0.88192126434836, -0.47139673682600},
-   {0.85772861000027, -0.51410274419322},
-   {0.83146961230255, -0.55557023301960},
-   {0.80320753148064, -0.59569930449243},
-   {0.77301045336274, -0.63439328416365},
-   {0.74095112535496, -0.67155895484702},
-   {0.70710678118655, -0.70710678118655},
-   {0.67155895484702, -0.74095112535496},
-   {0.63439328416365, -0.77301045336274},
-   {0.59569930449243, -0.80320753148064},
-   {0.55557023301960, -0.83146961230255},
-   {0.51410274419322, -0.85772861000027},
-   {0.47139673682600, -0.88192126434835},
-   {0.42755509343028, -0.90398929312344},
-   {0.38268343236509, -0.92387953251129},
-   {0.33688985339222, -0.94154406518302},
-   {0.29028467725446, -0.95694033573221},
-   {0.24298017990326, -0.97003125319454},
-   {0.19509032201613, -0.98078528040323},
-   {0.14673047445536, -0.98917650996478},
-   {0.09801714032956, -0.99518472667220},
-   {0.04906767432742, -0.99879545620517}};
-
-static complex_t delta128_3[32] = 
- { {1.00000000000000,  0.00000000000000},
-   {0.98917650996478, -0.14673047445536},
-   {0.95694033573221, -0.29028467725446},
-   {0.90398929312344, -0.42755509343028},
-   {0.83146961230255, -0.55557023301960},
-   {0.74095112535496, -0.67155895484702},
-   {0.63439328416365, -0.77301045336274},
-   {0.51410274419322, -0.85772861000027},
-   {0.38268343236509, -0.92387953251129},
-   {0.24298017990326, -0.97003125319454},
-   {0.09801714032956, -0.99518472667220},
-   {-0.04906767432742, -0.99879545620517},
-   {-0.19509032201613, -0.98078528040323},
-   {-0.33688985339222, -0.94154406518302},
-   {-0.47139673682600, -0.88192126434836},
-   {-0.59569930449243, -0.80320753148065},
-   {-0.70710678118655, -0.70710678118655},
-   {-0.80320753148065, -0.59569930449243},
-   {-0.88192126434835, -0.47139673682600},
-   {-0.94154406518302, -0.33688985339222},
-   {-0.98078528040323, -0.19509032201613},
-   {-0.99879545620517, -0.04906767432742},
-   {-0.99518472667220, 0.09801714032956},
-   {-0.97003125319454, 0.24298017990326},
-   {-0.92387953251129, 0.38268343236509},
-   {-0.85772861000027, 0.51410274419322},
-   {-0.77301045336274, 0.63439328416365},
-   {-0.67155895484702, 0.74095112535496},
-   {-0.55557023301960, 0.83146961230255},
-   {-0.42755509343028, 0.90398929312344},
-   {-0.29028467725446, 0.95694033573221},
-   {-0.14673047445536, 0.98917650996478}};
-
-#define HSQRT2 0.707106781188;
-
-#define TRANSZERO(A0,A4,A8,A12) { \
-  u_r = wTB[0].re; \
-  v_i = u_r - wTB[k*2].re; \
-  u_r += wTB[k*2].re; \
-  u_i = wTB[0].im; \
-  v_r = wTB[k*2].im - u_i; \
-  u_i += wTB[k*2].im; \
-  a_r = A0.re; \
-  a_i = A0.im; \
-  a1_r = a_r; \
-  a1_r += u_r; \
-  A0.re = a1_r; \
-  a_r -= u_r; \
-  A8.re = a_r; \
-  a1_i = a_i; \
-  a1_i += u_i; \
-  A0.im = a1_i; \
-  a_i -= u_i; \
-  A8.im = a_i; \
-  a1_r = A4.re; \
-  a1_i = A4.im; \
-  a_r = a1_r; \
-  a_r -= v_r; \
-  A4.re = a_r; \
-  a1_r += v_r; \
-  A12.re = a1_r; \
-  a_i = a1_i; \
-  a_i -= v_i; \
-  A4.im = a_i; \
-  a1_i += v_i; \
-  A12.im = a1_i; \
-  }
-
-#define TRANSHALF_16(A2,A6,A10,A14) {\
-  u_r = wTB[2].re; \
-  a_r = u_r; \
-  u_i = wTB[2].im; \
-  u_r += u_i; \
-  u_i -= a_r; \
-  a_r = wTB[6].re; \
-  a1_r = a_r; \
-  a_i = wTB[6].im; \
-  a_r = a_i - a_r; \
-  a_i += a1_r; \
-  v_i = u_r - a_r; \
-  u_r += a_r; \
-  v_r = u_i + a_i; \
-  u_i -= a_i; \
-  v_i *= HSQRT2; \
-  v_r *= HSQRT2; \
-  u_r *= HSQRT2; \
-  u_i *= HSQRT2; \
-  a_r = A2.re; \
-  a_i = A2.im; \
-  a1_r = a_r; \
-  a1_r += u_r; \
-  A2.re = a1_r; \
-  a_r -= u_r; \
-  A10.re = a_r; \
-  a1_i = a_i; \
-  a1_i += u_i; \
-  A2.im = a1_i; \
-  a_i -= u_i; \
-  A10.im = a_i; \
-  a1_r = A6.re; \
-  a1_i = A6.im;  \
-  a_r = a1_r; \
-  a1_r += v_r; \
-  A6.re = a1_r; \
-  a_r -= v_r; \
-  A14.re = a_r; \
-  a_i = a1_i; \
-  a1_i -= v_i; \
-  A6.im = a1_i; \
-  a_i += v_i; \
-  A14.im = a_i; \
-  }
-
-#define TRANS(A1,A5,A9,A13,WT,WB,D,D3) { \
-  u_r = WT.re; \
-  a_r = u_r; \
-  a_r *= D.im; \
-  u_r *= D.re; \
-  a_i = WT.im; \
-  a1_i = a_i; \
-  a1_i *= D.re; \
-  a_i *= D.im; \
-  u_r -= a_i; \
-  u_i = a_r; \
-  u_i += a1_i; \
-  a_r = WB.re; \
-  a1_r = a_r; \
-  a1_r *= D3.re; \
-  a_r *= D3.im; \
-  a_i = WB.im; \
-  a1_i = a_i; \
-  a_i *= D3.re; \
-  a1_i *= D3.im; \
-  a1_r -= a1_i; \
-  a_r += a_i; \
-  v_i = u_r - a1_r; \
-  u_r += a1_r; \
-  v_r = a_r - u_i; \
-  u_i += a_r; \
-  a_r = A1.re; \
-  a_i = A1.im; \
-  a1_r = a_r; \
-  a1_r += u_r; \
-  A1.re = a1_r; \
-  a_r -= u_r; \
-  A9.re = a_r; \
-  a1_i = a_i; \
-  a1_i += u_i; \
-  A1.im = a1_i; \
-  a_i -= u_i; \
-  A9.im = a_i; \
-  a1_r = A5.re; \
-  a1_i = A5.im;  \
-  a_r = a1_r; \
-  a1_r -= v_r; \
-  A5.re = a1_r; \
-  a_r += v_r; \
-  A13.re = a_r; \
-  a_i = a1_i; \
-  a1_i -= v_i; \
-  A5.im = a1_i; \
-  a_i += v_i; \
-  A13.im = a_i; \
-  }
-
-#endif
diff --git a/ac3dec/stats.c b/ac3dec/stats.c
deleted file mode 100644
index 4bdad09a1..000000000
--- a/ac3dec/stats.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* 
- *  stats.c
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-//#include "config.h"
-#include "ac3.h"
-#include "ac3_internal.h"
-
-
-#include "stats.h"
-#include "debug.h"
-
-#if !defined (__GNUC__) || defined (DEBUG)
-static const char *service_ids[8] = 
-{
-	"CM","ME","VI","HI",
-	 "D", "C","E", "VO"
-};
-#endif
-
-struct mixlev_s
-{
-	float clev;
-	char *desc;
-};
-
-static const struct mixlev_s cmixlev_tbl[4] =  
-{
-	{0.707, "(-3.0 dB)"}, {0.595, "(-4.5 dB)"},
-	{0.500, "(-6.0 dB)"}, {1.0,  "Invalid"}
-};
-
-static const struct mixlev_s smixlev_tbl[4] =  
-{
-	{0.707, "(-3.0 dB)"}, {0.500, "(-6.0 dB)"},
-	{  0.0,   "off    "}, {  1.0, "Invalid"}
-};
-
-static const char *language[128] = 
-{
-	"unknown", "Albanian", "Breton", "Catalan", "Croatian", "Welsh", "Czech", "Danish", 
-	"German", "English", "Spanish", "Esperanto", "Estonian", "Basque", "Faroese", "French", 
-	"Frisian", "Irish", "Gaelic", "Galician", "Icelandic", "Italian", "Lappish", "Latin", 
-	"Latvian", "Luxembourgian", "Lithuanian", "Hungarian", "Maltese", "Dutch", "Norwegian", "Occitan", 
-	"Polish", "Portugese", "Romanian", "Romansh", "Serbian", "Slovak", "Slovene", "Finnish", 
-	"Swedish", "Turkish", "Flemish", "Walloon", "0x2c", "0x2d", "0x2e", "0x2f", 
-	"0x30", "0x31", "0x32", "0x33", "0x34", "0x35", "0x36", "0x37", 
-	"0x38", "0x39", "0x3a", "0x3b", "0x3c", "0x3d", "0x3e", "0x3f", 
-	"background", "0x41", "0x42", "0x43", "0x44", "Zulu", "Vietnamese", "Uzbek", 
-	"Urdu", "Ukrainian", "Thai", "Telugu", "Tatar", "Tamil", "Tadzhik", "Swahili", 
-	"Sranan Tongo", "Somali", "Sinhalese", "Shona", "Serbo-Croat", "Ruthenian", "Russian", "Quechua", 
-	"Pustu", "Punjabi", "Persian", "Papamiento", "Oriya", "Nepali", "Ndebele", "Marathi", 
-	"Moldavian", "Malaysian", "Malagasay", "Macedonian", "Laotian", "Korean", "Khmer", "Kazakh",
-	"Kannada", "Japanese", "Indonesian", "Hindi", "Hebrew", "Hausa", "Gurani", "Gujurati", 
-	"Greek", "Georgian", "Fulani", "Dari", "Churash", "Chinese", "Burmese", "Bulgarian", 
-	"Bengali", "Belorussian", "Bambora", "Azerbijani", "Assamese", "Armenian", "Arabic", "Amharic"
-};
-
-
-void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi)
-{
-  //	fprintf(stdout,PACKAGE"-"VERSION" (C) 2000 Aaron Holtzman (aholtzma@ess.engr.uvic.ca)\n");
-
-	fprintf(stdout,"%d.%d Mode ",bsi->nfchans,bsi->lfeon);
-	fprintf(stdout,"%2.1f KHz",syncinfo->sampling_rate * 1e-3);
-	fprintf(stdout,"%4d kbps ",syncinfo->bit_rate);
-	if (bsi->langcode && (bsi->langcod < 128))
-		fprintf(stdout,"%s ", language[bsi->langcod]);
-
-	switch(bsi->bsmod) {
-		case 0:
-			fprintf(stdout,"Complete Main Audio Service");
-			break;
-		case 1:
-			fprintf(stdout,"Music and Effects Audio Service");
-		case 2:
-			fprintf(stdout,"Visually Impaired Audio Service");
-			break;
-		case 3:
-			fprintf(stdout,"Hearing Impaired Audio Service");
-			break;
-		case 4:
-			fprintf(stdout,"Dialogue Audio Service");
-			break;
-		case 5:
-			fprintf(stdout,"Commentary Audio Service");
-			break;
-		case 6:
-			fprintf(stdout,"Emergency Audio Service");
-			break;
-		case 7:
-			fprintf(stdout,"Voice Over Audio Service");
-			break;
-	}
-	fprintf(stdout,"\n");
-}
-
-
-void stats_print_syncinfo (syncinfo_t *syncinfo)
-{
-	dprintf("(syncinfo) ");
-	
-	switch (syncinfo->fscod) {
-		case 2:
-			dprintf("32 KHz   ");
-			break;
-		case 1:
-			dprintf("44.1 KHz ");
-			break;
-		case 0:
-			dprintf("48 KHz   ");
-			break;
-		default:
-			dprintf("Invalid sampling rate ");
-			break;
-	}
-
-	dprintf("%4d kbps %4d words per frame\n",syncinfo->bit_rate, 
-			syncinfo->frame_size);
-
-}
-
-	
-void stats_print_bsi(bsi_t *bsi) {
-	dprintf("(bsi) ");
-	dprintf("%s",service_ids[bsi->bsmod]);
-	dprintf(" %d.%d Mode ",bsi->nfchans,bsi->lfeon);
-	if ((bsi->acmod & 0x1) && (bsi->acmod != 0x1))
-		dprintf(" Centre Mix Level %s ",cmixlev_tbl[bsi->cmixlev].desc);
-	if (bsi->acmod & 0x4)
-		dprintf(" Sur Mix Level %s ",smixlev_tbl[bsi->cmixlev].desc);
-	dprintf("\n");
-
-}
-
-
-char *exp_strat_tbl[4] = {"R   ","D15 ","D25 ","D45 "};
-
-void stats_print_audblk(bsi_t *bsi,audblk_t *audblk) {
-	uint32_t i;
-
-	dprintf("(audblk) ");
-	dprintf("%s ",audblk->cplinu ? "cpl on " : "cpl off");
-	dprintf("%s ",audblk->baie? "bai " : "    ");
-	dprintf("%s ",audblk->snroffste? "snroffst " : "         ");
-	dprintf("%s ",audblk->deltbaie? "deltba " : "       ");
-	dprintf("%s ",audblk->phsflginu? "phsflg " : "       ");
-	dprintf("(%s %s %s %s %s) ",exp_strat_tbl[audblk->chexpstr[0]],
-		exp_strat_tbl[audblk->chexpstr[1]],exp_strat_tbl[audblk->chexpstr[2]],
-		exp_strat_tbl[audblk->chexpstr[3]],exp_strat_tbl[audblk->chexpstr[4]]);
-	dprintf("[");
-	for(i=0;i<bsi->nfchans;i++)
-		dprintf("%1d",audblk->blksw[i]);
-	dprintf("]");
-
-	dprintf("\n");
-}
diff --git a/ac3dec/stats.h b/ac3dec/stats.h
deleted file mode 100644
index 8a9ecb69b..000000000
--- a/ac3dec/stats.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 
- *  stats.h
- *
- *	Copyright (C) Aaron Holtzman - May 1999
- *
- *  This file is part of ac3dec, a free Dolby AC-3 stream decoder.
- *	
- *  ac3dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  ac3dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *   
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-void stats_print_syncinfo(syncinfo_t *syncinfo);
-void stats_print_bsi(bsi_t *bsi);
-void stats_print_audblk(bsi_t *bsi,audblk_t *audblk);
-void stats_print_banner(syncinfo_t *syncinfo,bsi_t *bsi);
diff --git a/channels.conf b/channels.conf
index 8d58e61d9..4642edc51 100644
--- a/channels.conf
+++ b/channels.conf
@@ -4,7 +4,7 @@ Pro-7:12480:v:0:27500:255:256;257:32:0:898
 RTL2:12188:h:0:27500:166:128:68:0:12020
 ARD:11837:h:0:27500:101:102:104:0:28106
 BR3:11837:h:0:27500:201:202:204:0:28107
-Hessen-3:11837:h:0:27500:301:302:0:0:28108
+Hessen-3:11837:h:0:27500:301:302:304:0:28108
 N3:12110:h:0:27500:2401:2402:2404:0:28224
 SR3:11837:h:0:27500:501:502:504:0:28110
 WDR:11837:h:0:27500:601:602:0:0:28111
diff --git a/config.c b/config.c
index 8b5c454fe..213fe2cfe 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.83 2002/02/10 11:39:00 kls Exp $
+ * $Id: config.c 1.87 2002/02/24 11:59:14 kls Exp $
  */
 
 #include "config.h"
@@ -323,7 +323,7 @@ cTimer::cTimer(bool Instant)
 {
   startTime = stopTime = 0;
   recording = pending = false;
-  active = Instant;
+  active = Instant ? taActInst : taInactive;
   cChannel *ch = Channels.GetByNumber(cDvbApi::CurrentChannel());
   channel = ch ? ch->number : 0;
   time_t t = time(NULL);
@@ -338,6 +338,7 @@ cTimer::cTimer(bool Instant)
   priority = Setup.DefaultPriority;
   lifetime = Setup.DefaultLifetime;
   *file = 0;
+  firstday = 0;
   summary = NULL;
   if (Instant && ch)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : ch->name);
@@ -367,6 +368,7 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   const char *Title = EventInfo->GetTitle();
   if (!isempty(Title))
      strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
+  firstday = 0;
   summary = NULL;
 }
 
@@ -395,7 +397,7 @@ const char *cTimer::ToText(cTimer *Timer)
   delete buffer;
   strreplace(Timer->file, ':', '|');
   strreplace(Timer->summary, '\n', '|');
-  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
+  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day, Timer->firstday), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
   strreplace(Timer->summary, '|', '\n');
   strreplace(Timer->file, '|', ':');
   return buffer;
@@ -411,20 +413,38 @@ int cTimer::TimeToInt(int t)
   return (t / 100 * 60 + t % 100) * 60;
 }
 
-int cTimer::ParseDay(const char *s)
+int cTimer::ParseDay(const char *s, time_t *FirstDay)
 {
   char *tail;
   int d = strtol(s, &tail, 10);
+  if (FirstDay)
+     *FirstDay = 0;
   if (tail && *tail) {
      d = 0;
      if (tail == s) {
-        if (strlen(s) == 7) {
+        const char *first = strchr(s, '@');
+        int l = first ? first - s : strlen(s);
+        if (l == 7) {
            for (const char *p = s + 6; p >= s; p--) {
-                 d <<= 1;
-                 d |= (*p != '-');
-                 }
+               d <<= 1;
+               d |= (*p != '-');
+               }
            d |= 0x80000000;
            }
+        if (FirstDay && first) {
+           ++first;
+           if (strlen(first) == 10) {
+              struct tm tm_r;
+              if (3 == sscanf(first, "%d-%d-%d", &tm_r.tm_year, &tm_r.tm_mon, &tm_r.tm_mday)) {
+                 tm_r.tm_year -= 1900;
+                 tm_r.tm_mon--;
+                 tm_r.tm_hour = tm_r.tm_min = tm_r.tm_sec = 0;
+                 *FirstDay = mktime(&tm_r);
+                 }
+              }
+           else
+              d = 0;
+           }
         }
      }
   else if (d < 1 || d > 31)
@@ -432,24 +452,40 @@ int cTimer::ParseDay(const char *s)
   return d;
 }
 
-const char *cTimer::PrintDay(int d)
+const char *cTimer::PrintDay(int d, time_t FirstDay)
 {
-  static char buffer[8];
+#define DAYBUFFERSIZE 32
+  static char buffer[DAYBUFFERSIZE];
   if ((d & 0x80000000) != 0) {
      char *b = buffer;
      const char *w = tr("MTWTFSS");
-     *b = 0;
      while (*w) {
            *b++ = (d & 1) ? *w : '-';
            d >>= 1;
            w++;
            }
+     if (FirstDay) {
+        struct tm tm_r;
+        localtime_r(&FirstDay, &tm_r);
+        b += strftime(b, DAYBUFFERSIZE - (b - buffer), "@%Y-%m-%d", &tm_r);
+        }
+     *b = 0;
      }
   else
      sprintf(buffer, "%d", d);
   return buffer;
 }
 
+const char *cTimer::PrintFirstDay(void)
+{
+  if (firstday) {
+     const char *s = PrintDay(day, firstday);
+     if (strlen(s) == 18)
+        return s + 8;
+     }
+  return ""; // not NULL, so the caller can always use the result
+}
+
 bool cTimer::Parse(const char *s)
 {
   char *buffer1 = NULL;
@@ -477,7 +513,7 @@ bool cTimer::Parse(const char *s)
         summary = NULL;
         }
      //TODO add more plausibility checks
-     day = ParseDay(buffer1);
+     day = ParseDay(buffer1, &firstday);
      strn0cpy(file, buffer2, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
@@ -563,13 +599,17 @@ bool cTimer::Matches(time_t t)
       if (DayMatches(t0)) {
          time_t a = SetTime(t0, begin);
          time_t b = a + length;
-         if (t <= b) {
+         if ((!firstday || a >= firstday) && t <= b) {
             startTime = a;
             stopTime = b;
+            if (t >= firstday)
+               firstday = 0;
             break;
             }
          }
       }
+  if (!startTime)
+     startTime = firstday; // just to have something that's more than a week in the future
   return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
 }
 
@@ -598,6 +638,11 @@ void cTimer::SetPending(bool Pending)
   pending = Pending;
 }
 
+void cTimer::SkipToday(void)
+{
+  firstday = IncDay(SetTime(recording ? StartTime() : time(NULL), 0), 1);
+}
+
 // --- cCommand -------------------------------------------------------------
 
 char *cCommand::result = NULL;
@@ -865,6 +910,7 @@ cSetup::cSetup(void)
   UseSubtitle = 1;
   RecordingDirs = 1;
   VideoFormat = VIDEO_FORMAT_4_3;
+  RecordDolbyDigital = 1;
   ChannelInfoPos = 0;
   OSDwidth = 52;
   OSDheight = 18;
@@ -910,6 +956,7 @@ bool cSetup::Parse(char *s)
         else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
         else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
         else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
+        else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
         else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
         else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
         else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
@@ -947,7 +994,6 @@ bool cSetup::Load(const char *FileName)
               if (*buffer != '#' && !Parse(buffer)) {
                  esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
                  result = false;
-                 break;
                  }
               }
            }
@@ -990,6 +1036,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "UseSubtitle        = %d\n", UseSubtitle);
         fprintf(f, "RecordingDirs      = %d\n", RecordingDirs);
         fprintf(f, "VideoFormat        = %d\n", VideoFormat);
+        fprintf(f, "RecordDolbyDigital = %d\n", RecordDolbyDigital);
         fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
         fprintf(f, "OSDwidth           = %d\n", OSDwidth);
         fprintf(f, "OSDheight          = %d\n", OSDheight);
diff --git a/config.h b/config.h
index e2e2897fb..35f1590c0 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.95 2002/02/10 15:44:40 kls Exp $
+ * $Id: config.h 1.99 2002/02/24 13:39:47 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.99"
+#define VDRVERSION "1.0.0pre1"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -119,6 +119,12 @@ class cChannel : public cListObject {
   bool Switch(cDvbApi *DvbApi = NULL, bool Log = true);
   };
 
+enum eTimerActive { taInactive = 0,
+                    taActive   = 1,
+                    taInstant  = 2,
+                    taActInst  = (taActive | taInstant)
+                  };
+
 class cTimer : public cListObject {
 private:
   time_t startTime, stopTime;
@@ -135,6 +141,7 @@ class cTimer : public cListObject {
   int priority;
   int lifetime;
   char file[MaxFileName];
+  time_t firstday;
   char *summary;
   cTimer(bool Instant = false);
   cTimer(const cEventInfo *EventInfo);
@@ -148,17 +155,19 @@ class cTimer : public cListObject {
   int GetMDay(time_t t);
   int GetWDay(time_t t);
   bool DayMatches(time_t t);
-  time_t IncDay(time_t t, int Days);
-  time_t SetTime(time_t t, int SecondsFromMidnight);
+  static time_t IncDay(time_t t, int Days);
+  static time_t SetTime(time_t t, int SecondsFromMidnight);
   char *SetFile(const char *File);
   bool Matches(time_t t = 0);
   time_t StartTime(void);
   time_t StopTime(void);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
+  void SkipToday(void);
+  const char *PrintFirstDay(void);
   static int TimeToInt(int t);
-  static int ParseDay(const char *s);
-  static const char *PrintDay(int d);
+  static int ParseDay(const char *s, time_t *FirstDay = NULL);
+  static const char *PrintDay(int d, time_t FirstDay = 0);
   };
 
 class cCommand : public cListObject {
@@ -321,6 +330,7 @@ class cSetup {
   int UseSubtitle;
   int RecordingDirs;
   int VideoFormat;
+  int RecordDolbyDigital;
   int ChannelInfoPos;
   int OSDwidth, OSDheight;
   int OSDMessageTime;
diff --git a/dvbapi.c b/dvbapi.c
index 314d91f6c..55bc5731d 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,14 +4,9 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * DVD support initially written by Andreas Schultz <aschultz@warp10.net>
- * based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
- *
- * $Id: dvbapi.c 1.147 2002/02/02 13:04:00 kls Exp $
+ * $Id: dvbapi.c 1.152 2002/02/24 12:53:51 kls Exp $
  */
 
-//#define DVDDEBUG        1
-
 #include "dvbapi.h"
 #include <dirent.h>
 #include <errno.h>
@@ -26,13 +21,6 @@ extern "C" {
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-
-#ifdef DVDSUPPORT
-extern "C" {
-#include "ac3dec/ac3.h"
-}
-#endif //DVDSUPPORT
-
 #include "config.h"
 #include "recording.h"
 #include "remux.h"
@@ -1320,865 +1308,6 @@ bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
   return replayFile >= 0;
 }
 
-#ifdef DVDSUPPORT
-
-#define SYSTEM_HEADER    0xBB
-#define PROG_STREAM_MAP  0xBC
-#ifndef PRIVATE_STREAM1
-#define PRIVATE_STREAM1  0xBD
-#endif
-#define PADDING_STREAM   0xBE
-#ifndef PRIVATE_STREAM2
-#define PRIVATE_STREAM2  0xBF
-#endif
-#define AUDIO_STREAM_S   0xC0
-#define AUDIO_STREAM_E   0xDF
-#define VIDEO_STREAM_S   0xE0
-#define VIDEO_STREAM_E   0xEF
-#define ECM_STREAM       0xF0
-#define EMM_STREAM       0xF1
-#define DSM_CC_STREAM    0xF2
-#define ISO13522_STREAM  0xF3
-#define PROG_STREAM_DIR  0xFF
-
-#define cOPENDVD         0
-#define cOPENTITLE       1
-#define cOPENCHAPTER     2
-#define cOUTCELL         3
-#define cREADFRAME       4
-#define cOUTPACK         5
-#define cOUTFRAMES       6
-
-// --- cAC3toPCM -------------------------------------------------------------
-
-class cAC3toPCM {
-private:
-  enum { AC3_STOP, AC3_START, AC3_PLAY } ac3stat;
-  uchar *ac3data;
-  int ac3inp;
-  int ac3outp;
-public:
-  cAC3toPCM(void);
-  ~cAC3toPCM();
-  void Clear(void);
-  void Put(unsigned char *sector, int length);
-  cFrame *Get(int size, uchar PTSflags = 0, uchar *PTSdata = 0);
-  };
-
-cAC3toPCM::cAC3toPCM(void)
-{
-  ac3dec_init();
-  ac3data = new uchar[AC3_BUFFER_SIZE];
-  Clear();
-}
-
-cAC3toPCM::~cAC3toPCM()
-{
-  delete ac3data;
-}
-
-void cAC3toPCM::Clear(void)
-{
-  ac3stat = AC3_START;
-  ac3outp = ac3inp = 0;
-}
-
-void cAC3toPCM::Put(unsigned char *sector, int length)
-{
-  ac3dec_decode_data(sector, sector + length, ac3stat == AC3_START, &ac3inp, &ac3outp, (char *)ac3data);
-  ac3stat = AC3_PLAY;
-}
-
-// data=PCM samples, 16 bit, LSB first, 48kHz, stereo
-cFrame *cAC3toPCM::Get(int size, uchar PTSflags, uchar *PTSdata)
-{
-  if (ac3inp == ac3outp)
-     return NULL;
-
-#define MAXSIZE 2022
-
-  uchar buffer[2048];
-  uchar *data;
-
-  if (size > 0) {
-     int p_size = (size > MAXSIZE) ? MAXSIZE : size;
-     int length = 10;      // default header bytes
-     int header = 0;
-
-     switch (PTSflags) {
-       case 2:  header = 5;    // additional header bytes
-                break;
-       case 3:  header = 10;
-                break;
-       default: header = 0;
-       }
-
-     length += header;
-
-     buffer[0] = 0x00;
-     buffer[1] = 0x00;
-     buffer[2] = 0x01;
-     buffer[3] = PRIVATE_STREAM1;
-
-     buffer[6] = 0x80;
-     buffer[7] = PTSflags << 6;
-     buffer[8] = header;
-
-     if (header)
-        memcpy(&buffer[9], (void *)PTSdata, header);
-
-     // add data
-     data = buffer + 9 + header + 7;
-     int cnt = 0;
-     while (p_size) {
-           if (ac3outp != ac3inp) { // data in the buffer
-              data[cnt ^ 1] = ac3data[ac3outp]; // swab because ac3dec delivers wrong byteorder (the "xor" (^) is a swab!)
-              p_size--;
-              cnt++;
-              length++;
-              ac3outp = (ac3outp + 1) % AC3_BUFFER_SIZE;
-              }
-           else
-              break;
-           }
-
-     data = buffer + 9 + header;
-     data[0] = aLPCM; // substream ID
-     data[1] = 0x00;  // other stuff (see DVB specs), ignored by driver
-     data[2] = 0x00;
-     data[3] = 0x00;
-     data[4] = 0x00;
-     data[5] = 0x00;
-     data[6] = 0x00;
-
-     buffer[4] = (length >> 8) & 0xff;
-     buffer[5] = length & 0xff;
-
-     length += 6;
-
-     return new cFrame(buffer, length);
-     }
-  return NULL;
-}
-
-// --- cDVDplayBuffer --------------------------------------------------------
-
-class cDVDplayBuffer : public cPlayBuffer {
-private:
-  cAC3toPCM AC3toPCM;
-  uchar audioTrack;
-
-  cDVD *dvd;//XXX necessary???
-
-  int titleid;
-  int chapid;
-  int angle;
-  dvd_file_t *title;
-  ifo_handle_t *vmg_file;
-  ifo_handle_t *vts_file;
-
-  int doplay;
-  int cyclestate;
-  int prevcycle;
-  int skipCnt;
-
-  tt_srpt_t *tt_srpt;
-  vts_ptt_srpt_t *vts_ptt_srpt;
-  pgc_t *cur_pgc;
-  dsi_t dsi_pack;
-  unsigned int next_vobu;
-  unsigned int prev_vobu;
-  unsigned int next_ilvu_start;
-  unsigned int cur_output_size;
-  unsigned int min_output_size;
-  unsigned int pktcnt;
-  int pgc_id;
-  int start_cell;
-  int next_cell;
-  int prev_cell;
-  int cur_cell;
-  unsigned int cur_pack;
-  int ttn;
-  int pgn;
-
-  uchar *data;
-
-  int logAudioTrack;
-  int maxAudioTrack;
-
-  int is_nav_pack(unsigned char *buffer);
-  void Close(void);
-  virtual void Empty(bool Block = false);
-  int decode_packet(unsigned char *sector, bool trickmode);
-  int ScanVideoPacket(const uchar *Data, int Count, uchar *PictureType);
-  bool PacketStart(uchar **Data, int len);
-  int GetPacketType(const uchar *Data);
-  int GetStuffingLen(const uchar *Data);
-  int GetPacketLength(const uchar *Data);
-  int GetPESHeaderLength(const uchar *Data);
-  void handleAC3(unsigned char *sector, int length, uchar PTSflags, uchar *PTSdata);
-  unsigned int getAudioStream(unsigned int StreamId);
-  void setChapid(void);
-  void NextState(int State) { prevcycle = cyclestate; cyclestate = State; }
-protected:
-  virtual void Input(void);
-public:
-  cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD *DvD, int title);
-  virtual ~cDVDplayBuffer();
-  virtual int SkipFrames(int Frames);
-  virtual void SkipSeconds(int Seconds);
-  virtual void Goto(int Position, bool Still = false);
-  virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
-  virtual void ToggleAudioTrack(void);
-  };
-
-cDVDplayBuffer::cDVDplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, cDVD *DvD, int title)
-:cPlayBuffer(DvbApi, VideoDev, AudioDev)
-{
-  dvd = DvD;
-  titleid = title;
-  chapid = 0;
-  angle = 0;
-  cyclestate = cOPENDVD;
-  prevcycle = 0;
-  skipCnt = 0;
-  logAudioTrack = 0;
-  canToggleAudioTrack = true;//XXX determine from cDVD!
-  data = new uchar[1024 * DVD_VIDEO_LB_LEN];
-  canDoTrickMode = true;
-  skipAC3bytes = true;
-  dvbApi->SetModeReplay();
-  Start();
-}
-
-cDVDplayBuffer::~cDVDplayBuffer()
-{
-  Stop();
-  Close();
-  dvbApi->SetModeNormal(false);
-  delete data;
-}
-
-unsigned int cDVDplayBuffer::getAudioStream(unsigned int StreamId)
-{
-  if (cyclestate < cOPENCHAPTER || StreamId > 7)
-     return 0;
-  if (!(cur_pgc->audio_control[StreamId] & 0x8000))
-     return 0;
-  int track = (cur_pgc->audio_control[StreamId] >> 8) & 0x07;
-  return dvd->getAudioTrack(track) | track;
-}
-
-void cDVDplayBuffer::ToggleAudioTrack(void)
-{
-  unsigned int newTrack;
-
-  if (CanToggleAudioTrack() && maxAudioTrack != 0) {
-     logAudioTrack = (logAudioTrack + 1) % maxAudioTrack;
-     if ((newTrack = getAudioStream(logAudioTrack)) != 0)
-        audioTrack = newTrack;
-#ifdef DVDDEBUG
-     dsyslog(LOG_INFO, "DVB: Audio Stream ID changed to: %x", audioTrack);
-#endif
-     AC3toPCM.Clear();
-     }
-}
-
-/**
- * Returns true if the pack is a NAV pack.  This check is clearly insufficient,
- * and sometimes we incorrectly think that valid other packs are NAV packs.  I
- * need to make this stronger.
- */
-inline int cDVDplayBuffer::is_nav_pack(unsigned char *buffer)
-{
-  return buffer[41] == 0xbf && buffer[1027] == 0xbf;
-}
-
-void cDVDplayBuffer::Input(void)
-{
-  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
-
-  doplay = true;
-  while (Busy() && doplay) {
-        if (blockInput) {
-           if (blockInput > 1)
-              blockInput = 1;
-           continue;
-           }
-
-        //BEGIN: ripped from play_title
-
-        /**
-         * Playback by cell in this pgc, starting at the cell for our chapter.
-         */
-
-        //dsyslog(LOG_INFO, "DVD: cyclestate: %d", cyclestate);
-        switch (cyclestate) {
-
-          case cOPENDVD: // open the DVD and get all the basic information
-               {
-                 if (!dvd->isValid()) {
-                    doplay = false;
-                    break;
-                    }
-
-                 /**
-                  * Load the video manager to find out the information about the titles on
-                  * this disc.
-                  */
-                 vmg_file = dvd->openVMG();
-                 if (!vmg_file) {
-                    esyslog(LOG_ERR, "ERROR: can't open VMG info");
-                    doplay = false;
-                    break;
-                    }
-                 tt_srpt = vmg_file->tt_srpt;
-
-                 NextState(cOPENTITLE);
-                 break;
-               }
-
-          case cOPENTITLE: // open the selected title
-               {
-                 /**
-                  * Make sure our title number is valid.
-                  */
-                 isyslog(LOG_INFO, "DVD: there are %d titles on this DVD", tt_srpt->nr_of_srpts);
-                 if (titleid < 0 || titleid >= tt_srpt->nr_of_srpts) {
-                    esyslog(LOG_ERR, "ERROR: invalid title %d", titleid + 1);
-                    doplay = false;
-                    break;
-                    }
-
-                 /**
-                  * Load the VTS information for the title set our title is in.
-                  */
-                 vts_file = dvd->openVTS(tt_srpt->title[titleid].title_set_nr);
-                 if (!vts_file) {
-                    esyslog(LOG_ERR, "ERROR: can't open the title %d info file", tt_srpt->title[titleid].title_set_nr);
-                    doplay = false;
-                    break;
-                    }
-
-                 NextState(cOPENCHAPTER);
-                 break;
-               }
-
-          case cOPENCHAPTER:
-               {
-                 /**
-                  * Make sure the chapter number is valid for this title.
-                  */
-                 isyslog(LOG_INFO, "DVD: there are %d chapters in this title", tt_srpt->title[titleid].nr_of_ptts);
-                 if (chapid < 0 || chapid >= tt_srpt->title[titleid].nr_of_ptts) {
-                    esyslog(LOG_ERR, "ERROR: invalid chapter %d", chapid + 1);
-                    doplay = false;
-                    break;
-                    }
-
-                 /**
-                  * Determine which program chain we want to watch.  This is based on the
-                  * chapter number.
-                  */
-                 ttn = tt_srpt->title[titleid].vts_ttn;
-                 vts_ptt_srpt = vts_file->vts_ptt_srpt;
-                 pgc_id = vts_ptt_srpt->title[ttn - 1].ptt[chapid].pgcn;
-                 pgn = vts_ptt_srpt->title[ttn - 1].ptt[chapid].pgn;
-                 cur_pgc = vts_file->vts_pgcit->pgci_srp[pgc_id - 1].pgc;
-                 start_cell = cur_pgc->program_map[pgn - 1] - 1;
-
-                 /**
-                  * setup Audio information
-                  **/
-                 for (maxAudioTrack = 0; maxAudioTrack < 8; maxAudioTrack++) {
-                     if (!(cur_pgc->audio_control[maxAudioTrack] & 0x8000))
-                        break;
-                     }
-                 canToggleAudioTrack = (maxAudioTrack > 0);
-                 // init the AudioInformation
-                 audioTrack = getAudioStream(logAudioTrack);
-#ifdef DVDDEBUG
-                 dsyslog(LOG_INFO, "DVD: max: %d, track: %x", maxAudioTrack, audioTrack);
-#endif
-
-                 /**
-                  * We've got enough info, time to open the title set data.
-                  */
-                 title = dvd->openTitle(tt_srpt->title[titleid].title_set_nr, DVD_READ_TITLE_VOBS);
-                 if (!title) {
-                    esyslog(LOG_ERR, "ERROR: can't open title VOBS (VTS_%02d_1.VOB).", tt_srpt->title[titleid].title_set_nr);
-                    doplay = false;
-                    break;
-                    }
-
-                 /**
-                  * Playback by cell in this pgc, starting at the cell for our chapter.
-                  */
-                 next_cell = start_cell;
-                 prev_cell = start_cell;
-                 cur_cell  = start_cell;
-
-                 NextState(cOUTCELL);
-                 break;
-               }
-
-          case cOUTCELL:
-               {
-#ifdef DVDDEBUG
-                 dsyslog(LOG_INFO, "DVD: new cell: %d", cur_cell);
-                 dsyslog(LOG_INFO, "DVD: vob_id: %x, cell_nr: %x", cur_pgc->cell_position[cur_cell].vob_id_nr, cur_pgc->cell_position[cur_cell].cell_nr);
-#endif
-
-                 if (cur_cell < 0) {
-                    cur_cell = 0;
-                    Backward();
-                    }
-                 doplay = (cur_cell < cur_pgc->nr_of_cells);
-                 if (!doplay)
-                    break;
-
-                 /* Check if we're entering an angle block. */
-                 if (cur_pgc->cell_playback[cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK) {
-                    cur_cell += angle;
-                    for (int i = 0; ; ++i) {
-                        if (cur_pgc->cell_playback[cur_cell + i].block_mode == BLOCK_MODE_LAST_CELL) {
-                           next_cell = cur_cell + i + 1;
-                           break;
-                           }
-                        }
-                    }
-                 else {
-                    next_cell = cur_cell + 1;
-                    prev_cell = cur_cell - 1;
-                    }
-
-                 // init settings for next state
-                 if (playDir == pdForward)
-                    cur_pack = cur_pgc->cell_playback[cur_cell].first_sector;
-                 else
-                    cur_pack = cur_pgc->cell_playback[cur_cell].last_vobu_start_sector;
-
-                 NextState(cOUTPACK);
-                 break;
-               }
-
-          case cOUTPACK:
-               {
-#ifdef DVDDEBUG
-                 dsyslog(LOG_INFO, "DVD: new pack: %d", cur_pack);
-#endif
-                 /**
-                  * We loop until we're out of this cell.
-                  */
-
-                 if (playDir == pdForward) {
-                    if (cur_pack >= cur_pgc->cell_playback[cur_cell].last_sector) {
-                       cur_cell = next_cell;
-#ifdef DVDDEBUG
-                       dsyslog(LOG_INFO, "DVD: end of pack");
-#endif
-                       NextState(cOUTCELL);
-                       break;
-                       }
-                    }
-                 else {
-#ifdef DVDDEBUG
-                    dsyslog(LOG_INFO, "DVD: prev: %d, curr: %x, next: %x, prev: %x", prevcycle, cur_pack, next_vobu, prev_vobu);
-#endif
-                    if ((cur_pack & 0x80000000) != 0) {
-                       cur_cell = prev_cell;
-#ifdef DVDDEBUG
-                       dsyslog(LOG_INFO, "DVD: start of pack");
-#endif
-                       NextState(cOUTCELL);
-                       break;
-                       }
-                    }
-
-                 /**
-                  * Read NAV packet.
-                  */
-                 int len = DVDReadBlocks(title, cur_pack, 1, data);
-                 if (len == 0) {
-                    esyslog(LOG_ERR, "ERROR: read failed for block %d", cur_pack);
-                    doplay = false;
-                    break;
-                    }
-                 if (!is_nav_pack(data)) {
-                    esyslog(LOG_ERR, "ERROR: no nav_pack");
-                    return;
-                    }
-
-                 /**
-                  * Parse the contained dsi packet.
-                  */
-                 navRead_DSI(&dsi_pack, &(data[DSI_START_BYTE]));
-                 if (cur_pack != dsi_pack.dsi_gi.nv_pck_lbn) {
-                    esyslog(LOG_ERR, "ERROR: cur_pack != dsi_pack.dsi_gi.nv_pck_lbn");
-                    return;
-                    }
-                 // navPrint_DSI(&dsi_pack);
-
-                 /**
-                  * Determine where we go next.  These values are the ones we mostly
-                  * care about.
-                  */
-                 next_ilvu_start = cur_pack + dsi_pack.sml_agli.data[angle].address;
-                 cur_output_size = dsi_pack.dsi_gi.vobu_ea;
-                 min_output_size = dsi_pack.dsi_gi.vobu_1stref_ea;
-
-                 /**
-                  * If we're not at the end of this cell, we can determine the next
-                  * VOBU to display using the VOBU_SRI information section of the
-                  * DSI.  Using this value correctly follows the current angle,
-                  * avoiding the doubled scenes in The Matrix, and makes our life
-                  * really happy.
-                  *
-                  * Otherwise, we set our next address past the end of this cell to
-                  * force the code above to go to the next cell in the program.
-                  */
-                 if (dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL)
-                    next_vobu = cur_pack + (dsi_pack.vobu_sri.next_vobu & 0x7fffffff);
-                 else
-                    next_vobu = cur_pack + cur_output_size + 1;
-
-                 if (dsi_pack.vobu_sri.prev_vobu != SRI_END_OF_CELL)
-                    prev_vobu = cur_pack - (dsi_pack.vobu_sri.prev_vobu & 0x7fffffff);
-                 else {
-#ifdef DVDDEBUG
-                    dsyslog(LOG_INFO, "DVD: cur: %x, prev: %x", cur_pack, dsi_pack.vobu_sri.prev_vobu);
-#endif
-                    prev_vobu =  0x80000000;
-                    }
-
-#ifdef DVDDEBUG
-                 dsyslog(LOG_INFO, "DVD: curr: %x, next: %x, prev: %x", cur_pack, next_vobu, prev_vobu);
-#endif
-                 if (cur_output_size >= 1024) {
-                    esyslog(LOG_ERR, "ERROR: cur_output_size >= 1024");
-                    return;
-                    }
-                 cur_pack++;
-
-                 NextState(cREADFRAME);
-                 break;
-               }
-
-          case cREADFRAME:
-               {
-                 bool trickMode = (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
-
-                 /* FIXME:
-                  *   the entire trickMode code relies on the assumtion
-                  *   that there is only one I-FRAME per PACK
-                  *
-                  *   I have no clue wether that is correct or not !!!
-                  */
-                 if (trickMode && (skipCnt++ % 4 != 0)) {
-                    cur_pack = (playDir == pdForward) ? next_vobu : prev_vobu;
-                    NextState(cOUTPACK);
-                    break;
-                    }
-
-                 if (trickMode)
-                    cur_output_size = min_output_size;
-
-                 /**
-                  * Read in cursize packs.
-                  */
-#ifdef DVDDEBUG
-                 dsyslog(LOG_INFO, "DVD: read pack: %d", cur_pack);
-#endif
-                 int len = DVDReadBlocks(title, cur_pack, cur_output_size, data);
-                 if (len != (int)cur_output_size) {
-                    esyslog(LOG_ERR, "ERROR: read failed for %d blocks at %d", cur_output_size, cur_pack);
-                    doplay = false;
-                    break;
-                    }
-                 pktcnt = 0;
-                 NextState(cOUTFRAMES);
-                 break;
-               }
-
-          case cOUTFRAMES:
-               {
-                 bool trickMode = (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
-
-                 /**
-                  * Output cursize packs.
-                  */
-                 if (pktcnt >= cur_output_size) {
-                    cur_pack = next_vobu;
-                    NextState(cOUTPACK);
-                    break;
-                    }
-                 //dsyslog(LOG_INFO, "DVD: pack: %d, frame: %d", cur_pack, pktcnt);
-
-                 if (decode_packet(&data[pktcnt * DVD_VIDEO_LB_LEN], trickMode) != 1) {   //we've got a video packet
-                    if (trickMode) {
-                        //dsyslog(LOG_INFO, "DVD: did pack: %d", pktcnt);
-                        cur_pack = (playDir == pdForward) ? next_vobu : prev_vobu;
-                        NextState(cOUTPACK);
-                        break;
-                        }
-                    }
-
-                 pktcnt++;
-
-                 if (pktcnt >= cur_output_size) {
-                    cur_pack = next_vobu;
-                    NextState(cOUTPACK);
-                    break;
-                    }
-                 break;
-               }
-
-        default:
-               {
-                 esyslog(LOG_ERR, "ERROR: cyclestate %d not known", cyclestate);
-                 return;
-               }
-        }
-
-        // dsyslog(LOG_INF, "DVD: new cyclestate: %d, pktcnt: %d, cur: %d", cyclestate, pktcnt, cur_output_size);
-        }
-
-  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
-}
-
-#define NO_PICTURE 0
-#define SC_PICTURE 0x00
-
-inline bool cDVDplayBuffer::PacketStart(uchar **Data, int len)
-{
-  while (len > 6 && !((*Data)[0] == 0x00 && (*Data)[1] == 0x00 && (*Data)[2] == 0x01))
-        (*Data)++;
-  return ((*Data)[0] == 0x00 && (*Data)[1] == 0x00 && (*Data)[2] == 0x01);
-}
-
-inline int cDVDplayBuffer::GetPacketType(const uchar *Data)
-{
-  return Data[3];
-}
-
-inline int cDVDplayBuffer::GetStuffingLen(const uchar *Data)
-{
-  return Data[13] & 0x07;
-}
-
-inline int cDVDplayBuffer::GetPacketLength(const uchar *Data)
-{
-  return (Data[4] << 8) + Data[5] + 6;
-}
-
-inline int cDVDplayBuffer::GetPESHeaderLength(const uchar *Data)
-{
-  return (Data[8]);
-}
-
-int cDVDplayBuffer::ScanVideoPacket(const uchar *Data, int Count, uchar *PictureType)
-{
-  // Scans the video packet starting at Offset and returns its length.
-  // If the return value is -1 the packet was not completely in the buffer.
-
-  int Length = GetPacketLength(Data);
-  if (Length > 0 && Length <= Count) {
-     int i = 8; // the minimum length of the video packet header
-     i += Data[i] + 1;   // possible additional header bytes
-     for (; i < Length; i++) {
-         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
-            switch (Data[i + 3]) {
-              case SC_PICTURE: *PictureType = (uchar)(Data[i + 5] >> 3) & 0x07;
-                               return Length;
-              }
-            }
-         }
-     PictureType = NO_PICTURE;
-     return Length;
-     }
-  return -1;
-}
-
-void cDVDplayBuffer::handleAC3(unsigned char *sector, int length, uchar PTSflags, uchar *PTSdata)
-{
-#define PCM_FRAME_SIZE 1536
-  AC3toPCM.Put(sector, length);
-  cFrame *frame;
-  if (ac3_buffersize() <= 100) {
-     if ((frame = AC3toPCM.Get(PCM_FRAME_SIZE, PTSflags, PTSdata)) != NULL)
-        putFrame(frame);
-     }
-  while ((frame = AC3toPCM.Get(PCM_FRAME_SIZE)) != NULL)
-        putFrame(frame);
-}
-
-int cDVDplayBuffer::decode_packet(unsigned char *sector, bool trickMode)
-{
-  //XXX kls 2001-11-03: do we really need all these different return values?
-  uchar pt = 1;
-
-  //make sure we got a PS packet header
-  if (!PacketStart(&sector, DVD_VIDEO_LB_LEN) && GetPacketType(sector) != 0xBA) {
-     esyslog(LOG_ERR, "ERROR: got unexpected packet: %x %x %x %x", sector[0], sector[1], sector[2], sector[3]);
-     return -1;
-     }
-
-  int offset = 14 + GetStuffingLen(sector);
-  sector += offset;
-  int r = DVD_VIDEO_LB_LEN - offset;
-  int datalen = r;
-
-  sector[6] &= 0x8f;
-  uchar PTSflags = sector[7] >> 6;
-  uchar *PTSdata = sector + 9;
-  uchar *data = sector;
-
-  switch (GetPacketType(sector)) {
-    case VIDEO_STREAM_S ... VIDEO_STREAM_E:
-         {
-           ScanVideoPacket(sector, r, &pt);
-           if (trickMode && pt != 1)
-              return pt;
-           putFrame(sector, r, ftVideo);
-           break;
-         }
-    case AUDIO_STREAM_S ... AUDIO_STREAM_E: {
-         // no sound in trick mode
-         if (trickMode)
-            return 1;
-         if (audioTrack != GetPacketType(sector))
-            return 5;
-         putFrame(sector, r, ftAudio);
-         break;
-         }
-    case PRIVATE_STREAM1:
-         {
-           datalen = GetPacketLength(sector);
-           //skip optional Header bytes
-           datalen -= GetPESHeaderLength(sector);
-           data += GetPESHeaderLength(sector);
-           //skip mandatory header bytes
-           data += 3;
-           //fallthrough is intended
-         }
-    case PRIVATE_STREAM2:
-         {
-           //FIXME: Stream1 + Stream2 is ok, but is Stream2 alone also?
-
-           // no sound in trick mode
-           if (trickMode)
-              return 1;
-
-           // skip PS header bytes
-           data += 6;
-           // data now points to the beginning of the payload
-
-           if (audioTrack == *data) {
-              switch (audioTrack & 0xF8) {
-                case aAC3:
-                     if (dolbyDev)
-                        putFrame(sector, r, ftDolby);
-                     data += 4;
-                     datalen -= 13; // 3 (mandatory header) + 6 (PS header) + 4 (AC3 header) = 13
-                     handleAC3(data, datalen, PTSflags, PTSdata);
-                     break;
-                case aLPCM:
-                     // write(audio, sector+14 , sector[19]+(sector[18]<<8)+6);
-                     putFrame(sector, GetPacketLength(sector), ftAudio);
-                     break;
-                default:
-                     break;
-                }
-              }
-           return pt;
-         }
-    default:
-    case SYSTEM_HEADER:
-    case PROG_STREAM_MAP:
-         {
-           esyslog(LOG_ERR, "ERROR: don't know what to do - packetType: %x", GetPacketType(sector));
-           // just skip them for now,l but try to debug it
-           dsyslog(LOG_INFO, "DVD: curr cell: %8x, Nr of cells: %8x", cur_cell, cur_pgc->nr_of_cells);
-           dsyslog(LOG_INFO, "DVD: curr pack: %8x, last sector: %8x", cur_pack, cur_pgc->cell_playback[cur_cell].last_sector);
-           dsyslog(LOG_INFO, "DVD: curr pkt:  %8x, output size: %8x", pktcnt, cur_output_size);
-#if 0
-           // looks like my DVD is/was brocken .......
-           for (int n = 0; n <= 255; n++) {
-               dsyslog(LOG_INFO, "%4x   %2x %2x %2x %2x  %2x %2x %2x %2x", n * 8,
-                        osect[n * 8 + 0], osect[n * 8 + 1], osect[n * 8 + 2], osect[n * 8 + 3],
-                        osect[n * 8 + 4], osect[n * 8 + 5], osect[n * 8 + 6], osect[n * 8 + 7]);
-               }
-           return 0;
-#endif
-           return pt;
-         }
-    }
-  return pt;
-}
-
-void cDVDplayBuffer::Empty(bool Block)
-{
-  if (!(blockInput || blockOutput)) {
-     cPlayBuffer::Empty(true);
-     AC3toPCM.Clear();
-     }
-  if (!Block)
-     cPlayBuffer::Empty(false);
-}
-
-void cDVDplayBuffer::Close(void)
-{
-  dvd->Close();
-}
-
-int cDVDplayBuffer::SkipFrames(int Frames)
-{
-  return -1;
-}
-
-/* Figure out the correct pgN from the cell and update state. */
-void cDVDplayBuffer::setChapid(void)
-{
-  int new_pgN = 0;
-
-  while (new_pgN < cur_pgc->nr_of_programs && cur_cell >= cur_pgc->program_map[new_pgN])
-        new_pgN++;
-
-  if (new_pgN == cur_pgc->nr_of_programs) { /* We are at the last program */
-     if (cur_cell > cur_pgc->nr_of_cells)
-        chapid = 1; /* We are past the last cell */
-     }
-
-  chapid = new_pgN;
-}
-
-void cDVDplayBuffer::SkipSeconds(int Seconds)
-{
-  if (Seconds) {
-     setChapid();
-     int newchapid = Seconds > 0 ? chapid + 1 : chapid - 1;
-
-     if (newchapid >= 0 && newchapid < tt_srpt->title[titleid].nr_of_ptts) {
-        Empty(true);
-        chapid = newchapid;
-        NextState(cOPENCHAPTER);
-        AC3toPCM.Clear();
-        Empty(false);
-        Play();
-        }
-     }
-}
-
-void cDVDplayBuffer::Goto(int Index, bool Still)
-{
-}
-
-void cDVDplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
-{
-  Current = Total = -1;
-}
-#endif //DVDSUPPORT
-
 // --- cTransferBuffer -------------------------------------------------------
 
 class cTransferBuffer : public cRingBufferLinear {
@@ -2732,18 +1861,11 @@ void cDvbApi::Cleanup(void)
   PrimaryDvbApi = NULL;
 }
 
-const cSchedules *cDvbApi::Schedules(cThreadLock *ThreadLock) const
-{
-  if (siProcessor && ThreadLock->Lock(siProcessor))
-     return siProcessor->Schedules();
-  return NULL;
-}
-
 bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  int result = 0;
-  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR);
+  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
   if (videoDev >= 0) {
+     int result = 0;
      struct video_mbuf mbuf;
      result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
      if (result == 0) {
@@ -2827,8 +1949,9 @@ bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX,
            result |= 1;
         }
      close(videoDev);
+     return result == 0;
      }
-  return result == 0;
+  return false;
 }
 
 #ifdef DEBUG_OSD
@@ -3017,7 +2140,9 @@ void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor col
 
 void cDvbApi::Flush(void)
 {
-#ifndef DEBUG_OSD
+#ifdef DEBUG_OSD
+  refresh();
+#else
   if (osd)
      osd->Flush();
 #endif
@@ -3106,9 +2231,9 @@ bool cDvbApi::SetPids(bool ForRecording)
 {
   return SetVpid(vPid,   ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
          SetApid1(aPid1, ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
-         SetApid2(ForRecording ? aPid2 : 0, DMX_OUT_TS_TAP) &&
+         SetApid2(ForRecording ? aPid2 : 0, DMX_OUT_TS_TAP) && (!Setup.RecordDolbyDigital ||
          SetDpid1(ForRecording ? dPid1 : 0, DMX_OUT_TS_TAP) &&
-         SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP);
+         SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP));
 }
 
 eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
@@ -3416,36 +2541,6 @@ bool cDvbApi::StartReplay(const char *FileName)
   return false;
 }
 
-#ifdef DVDSUPPORT
-bool cDvbApi::StartDVDplay(cDVD *dvd, int TitleID)
-{
-  if (Recording()) {
-     esyslog(LOG_ERR, "ERROR: StartDVDplay() called while recording - ignored!");
-     return false;
-     }
-  StopTransfer();
-  StopReplay();
-  if (fd_video >= 0 && fd_audio >= 0) {
-
-     // Check DeviceName:
-
-     if (!dvd) {
-        esyslog(LOG_ERR, "ERROR: StartDVDplay: DVD device is (null)");
-        return false;
-        }
-
-     // Create replay buffer:
-
-     replayBuffer = new cDVDplayBuffer(this, fd_video, fd_audio, dvd, TitleID);
-     if (replayBuffer)
-        return true;
-     else
-        esyslog(LOG_ERR, "ERROR: can't allocate replaying buffer");
-     }
-  return false;
-}
-#endif //DVDSUPPORT
-
 void cDvbApi::StopReplay(void)
 {
   if (replayBuffer) {
diff --git a/dvbapi.h b/dvbapi.h
index fbc1e9d94..06028f0bd 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.61 2002/02/03 16:43:38 kls Exp $
+ * $Id: dvbapi.h 1.63 2002/02/24 12:38:08 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -29,9 +29,6 @@
 #include <stdio.h>
 
 #include "dvbosd.h"
-#ifdef DVDSUPPORT
-#include "dvd.h"
-#endif //DVDSUPPORT
 #include "eit.h"
 #include "thread.h"
 
@@ -60,9 +57,6 @@ class cChannel;
 class cRecordBuffer;
 class cPlayBuffer;
 class cReplayBuffer;
-#ifdef DVDSUPPORT
-class cDVDplayBuffer;
-#endif //DVDSUPPORT
 class cTransferBuffer;
 class cCuttingBuffer;
 
@@ -83,9 +77,6 @@ class cVideoCutter {
 class cDvbApi {
   friend class cRecordBuffer;
   friend class cReplayBuffer;
-#ifdef DVDSUPPORT
-  friend class cDVDplayBuffer;
-#endif //DVDSUPPORT
   friend class cTransferBuffer;
 private:
   FrontendType frontendType;
@@ -143,10 +134,6 @@ class cDvbApi {
 private:
   cSIProcessor *siProcessor;
 public:
-  const cSchedules *Schedules(cThreadLock *ThreadLock) const;
-         // Caller must provide a cThreadLock which has to survive the entire
-         // time the returned cSchedules is accessed. Once the cSchedules is no
-         // longer used, the cThreadLock must be destroyed.
   void SetUseTSTime(bool On) { if (siProcessor) siProcessor->SetUseTSTime(On); }
 
   // Image Grab facilities
@@ -250,10 +237,6 @@ class cDvbApi {
        // Starts replaying the given file.
        // If there is already a replay session active, it will be stopped
        // and the new file will be played back.
-#ifdef DVDSUPPORT
-  bool StartDVDplay(cDVD *dvd, int TitleID);//XXX dvd parameter necessary???
-       // Starts replaying the given TitleID on the DVD.
-#endif //DVDSUPPORT
   void StopReplay(void);
        // Stops the current replay session (if any).
   void Pause(void);
diff --git a/dvd.c b/dvd.c
deleted file mode 100644
index e061b1414..000000000
--- a/dvd.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * dvd.c: Functions for handling DVDs
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * Initially written by Andreas Schultz <aschultz@warp10.net>
- *
- * $Id: dvd.c 1.4 2001/11/10 13:38:50 kls Exp $
- */
-
-#ifdef DVDSUPPORT
-
-//#define DVDSUPPORTDEBUG 1
-//#define DEBUG_BUFFER    1
-
-#include <fcntl.h>
-#include <linux/cdrom.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#include "dvd.h"
-#include "tools.h"
-
-// --- cDVD ----------------------------------------------------------------------------
-
-const char *cDVD::deviceName = "/dev/dvd";
-cDVD *cDVD::dvdInstance = NULL;
-
-cDVD *cDVD::getDVD(void)
-{
-  if (!dvdInstance)
-     new cDVD;
-  return dvdInstance;
-}
-
-cDVD::cDVD(void)
-{
-  dvd = NULL;
-  title = NULL;
-  vmg_file = NULL;
-  vts_file = NULL;
-  dvdInstance = this;
-}
-
-cDVD::~cDVD()
-{
-  Close();
-}
-
-int cDVD::Command(int Cmd)
-{
-  int result = -1;
-  int f;
-  if ((f = open(deviceName, O_RDONLY | O_NONBLOCK)) > 0) {
-     result = ioctl(f, Cmd, 0);
-     close(f);
-     }
-  return result;
-}
-
-void cDVD::SetDeviceName(const char *DeviceName)
-{
-  deviceName = strdup(DeviceName);
-}
-
-const char *cDVD::DeviceName(void)
-{
-  return deviceName;
-}
-
-bool cDVD::DriveExists(void)
-{
-  return access(deviceName, F_OK) == 0;
-}
-
-bool cDVD::DiscOk(void)
-{
-  return Command(CDROM_DRIVE_STATUS) == CDS_DISC_OK;
-}
-
-void cDVD::Eject(void)
-{
-  if (dvdInstance)
-     dvdInstance->Close();
-  Command(CDROMEJECT);
-}
-
-void cDVD::Open(void)
-{
-  if (!dvd)
-     dvd = DVDOpen(deviceName);
-}
-
-void cDVD::Close(void)
-{
-#ifdef DVDSUPPORTDEBUG
-  dsyslog(LOG_INFO, "DVD: cDVD::Close(%p): vts: %p, vmg: %p, title: %p, dvd: %p", this, vts_file, vmg_file, title, dvd);
-#endif
-  if (vts_file)
-     ifoClose(vts_file);
-  if (vmg_file)
-     ifoClose(vmg_file);
-  if (title)
-     DVDCloseFile(title);
-  if (dvd)
-     DVDClose(dvd);
-  vts_file = NULL;
-  vmg_file = NULL;
-  title = NULL;
-  dvd = NULL;
-}
-
-ifo_handle_t *cDVD::openVMG(void)
-{
-  if (!isValid())
-     return NULL;
-  if (!vmg_file)
-     vmg_file = ifoOpen(dvd, 0);
-  return vmg_file;
-}
-
-ifo_handle_t *cDVD::openVTS(int TitleSet)
-{
-  if (!isValid())
-     return NULL;
-  if (vts_file && (titleset != TitleSet)) {
-     ifoClose(vts_file);
-     vts_file = NULL;
-     }
-  if (!vts_file) {
-     titleset = TitleSet;
-     vts_file = ifoOpen(dvd, TitleSet);
-     }
-  return vts_file;
-}
-
-dvd_file_t *cDVD::openTitle(int Title, dvd_read_domain_t domain)
-{
-  if (!isValid())
-     return NULL;
-  if (title)
-     DVDCloseFile(title);
-  title = DVDOpenFile(dvd, Title, domain);
-  return title;
-}
-
-int cDVD::getAudioTrack(int stream)
-{
-  if (getVTS()) {
-     switch (getVTS()->vtsi_mat->vts_audio_attr[stream].audio_format) {
-       case 0: // ac3
-               return aAC3;
-       case 2: // mpeg1
-       case 3: // mpeg2ext
-               return aMPEG;
-       case 4: // lpcm
-               return aLPCM;
-       case 6: // dts
-               return aDTS;
-       default:
-               esyslog(LOG_ERR, "ERROR: unknown Audio stream info");
-       }
-     }
-  return 0;
-}
-
-#endif //DVDSUPPORT
diff --git a/dvd.h b/dvd.h
deleted file mode 100644
index 5ac145489..000000000
--- a/dvd.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * dvd.h: Functions for handling DVDs
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * Initially written by Andreas Schultz <aschultz@warp10.net>
- *
- * $Id: dvd.h 1.4 2001/11/10 13:38:25 kls Exp $
- */
-
-#ifndef __DVD_H
-#define __DVD_H
-
-#ifdef DVDSUPPORT
-
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_types.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/dvd_udf.h>
-#include <dvdread/nav_read.h>
-#include <dvdread/nav_print.h>
-
-#define aAC3   0x80
-#define aDTS   0x88
-#define aLPCM  0xA0
-#define aMPEG  0xC0
-
-class cDVD {
-private:
-  static cDVD *dvdInstance;
-  static const char *deviceName;
-  dvd_reader_t *dvd;
-  dvd_file_t *title;
-  ifo_handle_t *vmg_file;
-  ifo_handle_t *vts_file;
-  int titleset;
-  static int Command(int Cmd);
-public:
-  cDVD(void);
-  ~cDVD();
-  static void SetDeviceName(const char *DeviceName);
-  static const char *DeviceName(void);
-  static bool DriveExists(void);
-  static bool DiscOk(void);
-  static void Eject(void);
-  void Open(void);
-  void Close(void);
-  bool isValid(void) { return (dvd != NULL); }
-  ifo_handle_t *openVMG(void);
-  ifo_handle_t *openVTS(int TitleSet);
-  ifo_handle_t *getVTS() { return vts_file; }
-  dvd_file_t *openTitle(int Title, dvd_read_domain_t domain);
-  static cDVD *getDVD(void);
-  int getAudioNrOfTracks() { return getVTS() ? getVTS()->vtsi_mat->nr_of_vts_audio_streams : 0; }
-  int getAudioLanguage(int stream) { return getVTS() ? getVTS()->vtsi_mat->vts_audio_attr[stream].lang_code : 0; }
-  int getAudioTrack(int stream);
-  };
-
-#endif //DVDSUPPORT
-
-#endif //__DVD_H
diff --git a/eit.c b/eit.c
index 99bcdfff9..bd43fe925 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.34 2002/02/09 14:48:43 kls Exp $
+ * $Id: eit.c 1.37 2002/02/23 17:11:19 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -341,7 +341,7 @@ unsigned short cEventInfo::GetServiceID() const
 void cEventInfo::Dump(FILE *f, const char *Prefix) const
 {
    if (tTime + lDuration >= time(NULL)) {
-      fprintf(f, "%sE %u %ld %ld\n", Prefix, uEventID, tTime, lDuration);
+      fprintf(f, "%sE %u %ld %ld %X\n", Prefix, uEventID, tTime, lDuration, uTableID);
       if (!isempty(pTitle))
          fprintf(f, "%sT %s\n", Prefix, pTitle);
       if (!isempty(pSubtitle))
@@ -352,6 +352,54 @@ void cEventInfo::Dump(FILE *f, const char *Prefix) const
       }
 }
 
+bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
+{
+  if (Schedule) {
+     cEventInfo *pEvent = NULL;
+     char *s;
+     while ((s = readline(f)) != NULL) {
+           char *t = skipspace(s + 1);
+           switch (*s) {
+             case 'E': if (!pEvent) {
+                          unsigned int uEventID;
+                          time_t tTime;
+                          long lDuration;
+                          unsigned int uTableID = 0;
+                          int n = sscanf(t, "%u %ld %ld %X", &uEventID, &tTime, &lDuration, &uTableID);
+                          if (n == 3 || n == 4) {
+                             pEvent = (cEventInfo *)Schedule->GetEvent(uEventID, tTime);
+                             if (!pEvent)
+                                pEvent = Schedule->AddEvent(new cEventInfo(Schedule->GetServiceID(), uEventID));
+                             if (pEvent) {
+                                pEvent->SetTableID(uTableID);
+                                pEvent->SetTime(tTime);
+                                pEvent->SetDuration(lDuration);
+                                }
+                             }
+                          }
+                       break;
+             case 'T': if (pEvent)
+                          pEvent->SetTitle(t);
+                       break;
+             case 'S': if (pEvent)
+                          pEvent->SetSubtitle(t);
+                       break;
+             case 'D': if (pEvent)
+                          pEvent->SetExtendedDescription(t);
+                       break;
+             case 'e': pEvent = NULL;
+                       break;
+             case 'c': // to keep things simple we react on 'c' here
+                       return false;
+             default:  esyslog(LOG_ERR, "ERROR: unexpected tag while reading EPG data: %s", s);
+                       return false;
+             }
+           }
+     return true;
+     }
+  return false;
+}
+
 #define MAXEPGBUGFIXSTATS 5
 #define MAXEPGBUGFIXCHANS 50
 struct tEpgBugFixStats {
@@ -545,6 +593,13 @@ cSchedule::cSchedule(unsigned short servid)
 cSchedule::~cSchedule()
 {
 }
+
+cEventInfo *cSchedule::AddEvent(cEventInfo *EventInfo)
+{
+  Events.Add(EventInfo);
+  return EventInfo;
+}
+
 /**  */
 const cEventInfo * cSchedule::GetPresentEvent() const
 {
@@ -689,6 +744,31 @@ void cSchedule::Dump(FILE *f, const char *Prefix) const
    }
 }
 
+bool cSchedule::Read(FILE *f, cSchedules *Schedules)
+{
+  if (Schedules) {
+     char *s;
+     while ((s = readline(f)) != NULL) {
+           if (*s == 'C') {
+              unsigned int uServiceID;
+              if (1 == sscanf(s + 1, "%u", &uServiceID)) {
+                 cSchedule *p = (cSchedule *)Schedules->SetCurrentServiceID(uServiceID);
+                 if (p) {
+                    while (cEventInfo::Read(f, p))
+                          ; // loop stops after having read the closing 'c'
+                    }
+                 }
+              }
+           else {
+              esyslog(LOG_ERR, "ERROR: unexpected tag while reading EPG data: %s", s);
+              return false;
+              }
+           }
+     return true;
+     }
+  return false;
+}
+
 // --- cSchedules ------------------------------------------------------------
 
 cSchedules::cSchedules()
@@ -701,7 +781,7 @@ cSchedules::~cSchedules()
 {
 }
 /**  */
-bool cSchedules::SetCurrentServiceID(unsigned short servid)
+const cSchedule *cSchedules::SetCurrentServiceID(unsigned short servid)
 {
    pCurrentSchedule = GetSchedule(servid);
    if (pCurrentSchedule == NULL)
@@ -709,12 +789,12 @@ bool cSchedules::SetCurrentServiceID(unsigned short servid)
       Add(new cSchedule(servid));
       pCurrentSchedule = GetSchedule(servid);
       if (pCurrentSchedule == NULL)
-         return false;
+         return NULL;
    }
 
    uCurrentServiceID = servid;
 
-   return true;
+   return pCurrentSchedule;
 }
 /**  */
 const cSchedule * cSchedules::GetSchedule() const
@@ -757,6 +837,13 @@ void cSchedules::Dump(FILE *f, const char *Prefix) const
       p->Dump(f, Prefix);
 }
 
+/**  */
+bool cSchedules::Read(FILE *f)
+{
+   cMutexLock MutexLock;
+   return cSchedule::Read(f, (cSchedules *)cSIProcessor::Schedules(MutexLock));
+}
+
 // --- cEIT ------------------------------------------------------------------
 
 class cEIT {
@@ -822,17 +909,20 @@ int cEIT::ProcessEIT(unsigned char *buffer)
           if (!pEvent) {
              // If we don't have that event ID yet, we create a new one.
              // Otherwise we copy the information into the existing event anyway, because the data might have changed.
-             pSchedule->Events.Add(new cEventInfo(VdrProgramInfo->ServiceID, VdrProgramInfo->EventID));
-             pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID);
+             pEvent = pSchedule->AddEvent(new cEventInfo(VdrProgramInfo->ServiceID, VdrProgramInfo->EventID));
              if (!pEvent)
                 break;
              pEvent->SetTableID(tid);
              }
           else {
              // We have found an existing event, either through its event ID or its start time.
+             // If the existing event has a zero table ID it was defined externally and shall
+             // not be overwritten.
+             if (pEvent->GetTableID() == 0x00)
+                continue;
              // If the new event comes from a table that belongs to an "other TS" and the existing
-             // one comes from a "actual TS" table, lets skip it.
-             if ((tid == 0x4F || tid == 0x60) && (pEvent->GetTableID() == 0x4E || pEvent->GetTableID() == 0x50))
+             // one comes from an "actual TS" table, lets skip it.
+             if ((tid == 0x4F || tid == 0x60 || tid == 0x61) && (pEvent->GetTableID() == 0x4E || pEvent->GetTableID() == 0x50 || pEvent->GetTableID() == 0x51))
                 continue;
              }
           if (rEvent) {
@@ -913,6 +1003,32 @@ cSIProcessor::~cSIProcessor()
    delete fileName;
 }
 
+const cSchedules *cSIProcessor::Schedules(cMutexLock &MutexLock)
+{
+  if (MutexLock.Lock(&schedulesMutex))
+     return schedules;
+  return NULL;
+}
+
+bool cSIProcessor::Read(FILE *f)
+{
+  bool OwnFile = f == NULL;
+  if (OwnFile) {
+     const char *FileName = GetEpgDataFileName();
+     if (access(FileName, R_OK) == 0) {
+        dsyslog(LOG_INFO, "reading EPG data from %s", FileName);
+        if ((f = fopen(FileName, "r")) == NULL) {
+           LOG_ERROR;
+           return false;
+           }
+        }
+     }
+  bool result = cSchedules::Read(f);
+  if (OwnFile)
+     fclose(f);
+  return result;
+}
+
 void cSIProcessor::SetEpgDataFileName(const char *FileName)
 {
   epgDataFileName = NULL;
@@ -940,6 +1056,8 @@ void cSIProcessor::SetStatus(bool On)
       AddFilter(0x12, 0x4f);  // event info, other TS, present/following
       AddFilter(0x12, 0x50);  // event info, actual TS, schedule
       AddFilter(0x12, 0x60);  // event info, other TS, schedule
+      AddFilter(0x12, 0x51);  // event info, actual TS, schedule for another 4 days
+      AddFilter(0x12, 0x61);  // event info, other TS, schedule for another 4 days
    }
    schedulesMutex.Unlock();
 }
diff --git a/eit.h b/eit.h
index 48ab91332..55c0f4e05 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.13 2002/01/13 16:18:23 kls Exp $
+ * $Id: eit.h 1.15 2002/02/23 15:30:25 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -72,6 +72,7 @@ class cEventInfo : public cListObject {
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
   void Dump(FILE *f, const char *Prefix = "") const;
+  static bool Read(FILE *f, cSchedule *Schedule);
   void FixEpgBugs(void);
   };
 
@@ -92,6 +93,7 @@ class cSchedule : public cListObject  {
   cSchedule(unsigned short servid = 0);
 public:
   ~cSchedule();
+  cEventInfo *AddEvent(cEventInfo *EventInfo);
   const cEventInfo *GetPresentEvent(void) const;
   const cEventInfo *GetFollowingEvent(void) const;
   unsigned short GetServiceID(void) const;
@@ -100,15 +102,17 @@ class cSchedule : public cListObject  {
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
   int NumEvents(void) const { return Events.Count(); }
   void Dump(FILE *f, const char *Prefix = "") const;
+  static bool Read(FILE *f, cSchedules *Schedules);
   };
 
 class cSchedules : public cList<cSchedule> {
+  friend class cSchedule;
   friend class cSIProcessor;
 private:
   const cSchedule *pCurrentSchedule;
   unsigned short uCurrentServiceID;
 protected:
-  bool SetCurrentServiceID(unsigned short servid);
+  const cSchedule *SetCurrentServiceID(unsigned short servid);
   void Cleanup();
 public:
   cSchedules(void);
@@ -116,6 +120,7 @@ class cSchedules : public cList<cSchedule> {
   const cSchedule *GetSchedule(unsigned short servid) const;
   const cSchedule *GetSchedule(void) const;
   void Dump(FILE *f, const char *Prefix = "") const;
+  static bool Read(FILE *f);
 };
 
 typedef struct sip_filter {
@@ -146,10 +151,14 @@ class cSIProcessor : public cThread {
   ~cSIProcessor();
   static void SetEpgDataFileName(const char *FileName);
   static const char *GetEpgDataFileName(void);
+  static const cSchedules *Schedules(cMutexLock &MutexLock);
+         // Caller must provide a cMutexLock which has to survive the entire
+         // time the returned cSchedules is accessed. Once the cSchedules is no
+         // longer used, the cMutexLock must be destroyed.
+  static bool Read(FILE *f = NULL);
   void SetStatus(bool On);
   bool SetUseTSTime(bool use);
   bool SetCurrentServiceID(unsigned short servid);
-  const cSchedules *Schedules(void) { return schedules; }
   };
 
 #endif
diff --git a/i18n.c b/i18n.c
index f2c414f00..083971573 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.53 2002/02/10 15:07:46 kls Exp $
+ * $Id: i18n.c 1.57 2002/02/24 12:54:12 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -120,16 +120,6 @@ const tPhrase Phrases[] = {
     "Opptak",
     "Nauhoitteet",
   },
-  { "DVD",
-    "DVD",
-    "DVD",
-    "DVD",
-    "DVD",
-    "DVD",
-    "DVD",
-    "DVD",
-    "DVD",
-  },
   { "Setup",
     "Einstellungen",
     "Nastavitve",
@@ -261,6 +251,16 @@ const tPhrase Phrases[] = {
     "Marker",
     "Merkitse",
   },
+  { "On/Off",
+    "Ein/Aus",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Record",
     "Aufnehmen",
     "Posnemi",
@@ -412,6 +412,16 @@ const tPhrase Phrases[] = {
     "Slette opptak?",
     "Poistetaanko nauhoitus?",
   },
+  { "Timer still recording - really delete?",
+    "Timer zeichnet auf - trotzdem l�schen?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Stop recording?",
     "Aufzeichnung beenden?",
     "Koncaj snemanje?",
@@ -684,6 +694,16 @@ const tPhrase Phrases[] = {
     "Filnavn",
     "Tiedosto",
   },
+  { "First day",
+    "Erster Tag",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Error messages:
   { "Channel is being used by a timer!",
     "Kanal wird von einem Timer benutzt!",
@@ -1046,6 +1066,16 @@ const tPhrase Phrases[] = {
     "TV Format",
     "Kuvamuoto",
   },
+  { "RecordDolbyDigital",
+    "Dolby Digital Ton aufz.",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "ChannelInfoPos",
     "Kanal Info Position",
     "", // TODO
diff --git a/menu.c b/menu.c
index a7a98ec38..28e5d4d86 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.152 2002/02/10 11:52:34 kls Exp $
+ * $Id: menu.c 1.159 2002/02/24 12:55:49 kls Exp $
  */
 
 #include "menu.h"
@@ -254,6 +254,62 @@ eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
   return osContinue;
 }
 
+// --- cMenuEditDateItem -----------------------------------------------------
+
+class cMenuEditDateItem : public cMenuEditItem {
+protected:
+  time_t *value;
+  virtual void Set(void);
+public:
+  cMenuEditDateItem(const char *Name, time_t *Value);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  Set();
+}
+
+void cMenuEditDateItem::Set(void)
+{
+#define DATEBUFFERSIZE 32
+  char buf[DATEBUFFERSIZE];
+  if (*value) {
+     struct tm tm_r;
+     localtime_r(value, &tm_r);
+     strftime(buf, DATEBUFFERSIZE, "%Y-%m-%d ", &tm_r);
+     strcat(buf, WeekDayName(tm_r.tm_wday));
+     }
+  else
+     *buf = 0;
+  SetValue(buf);
+}
+
+eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        *value -= SECSINDAY;
+        if (*value < time(NULL))
+           *value = 0;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (!*value)
+           *value = cTimer::SetTime(time(NULL), 0);
+        *value += SECSINDAY;
+        }
+     else
+        return state;
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuEditTimeItem -----------------------------------------------------
 
 class cMenuEditTimeItem : public cMenuEditItem {
@@ -905,6 +961,8 @@ class cMenuEditTimer : public cOsdMenu {
 private:
   cTimer *timer;
   cTimer data;
+  cMenuEditDateItem *firstday;
+  void SetFirstDayItem(void);
 public:
   cMenuEditTimer(int Index, bool New = false);
   virtual eOSState ProcessKey(eKeys Key);
@@ -913,6 +971,7 @@ class cMenuEditTimer : public cOsdMenu {
 cMenuEditTimer::cMenuEditTimer(int Index, bool New)
 :cOsdMenu(tr("Edit Timer"), 12)
 {
+  firstday = NULL;
   timer = Timers.Get(Index);
   if (timer) {
      data = *timer;
@@ -927,6 +986,21 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
      Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
      Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), FileNameChars));
+     SetFirstDayItem();
+     }
+}
+
+void cMenuEditTimer::SetFirstDayItem(void)
+{
+  if (!firstday && !data.IsSingleEvent()) {
+     Add(firstday = new cMenuEditDateItem(tr("First day"), &data.firstday));
+     Display();
+     }
+  else if (firstday && data.IsSingleEvent()) {
+     Del(firstday->Index());
+     firstday = NULL;
+     data.firstday = 0;
+     Display();
      }
 }
 
@@ -953,6 +1027,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (Key != kNone)
+     SetFirstDayItem();
   return state;
 }
 
@@ -983,7 +1059,7 @@ void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
-                    timer->active ? timer->recording ? '#' : '>' : ' ',
+                    !timer->active ? ' ' : timer->firstday ? '!' : timer->recording ? '#' : '>',
                     timer->channel,
                     timer->PrintDay(timer->day),
                     timer->start / 100,
@@ -998,10 +1074,10 @@ void cMenuTimerItem::Set(void)
 
 class cMenuTimers : public cOsdMenu {
 private:
-  eOSState Activate(bool On);
   eOSState Edit(void);
   eOSState New(void);
   eOSState Del(void);
+  eOSState OnOff(void);
   virtual void Move(int From, int To);
   eOSState Summary(void);
   cTimer *CurrentTimer(void);
@@ -1022,7 +1098,7 @@ cMenuTimers::cMenuTimers(void)
         }
   if (Setup.SortTimers)
      Sort();
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? NULL : tr("Mark"));
+  SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? tr("On/Off") : tr("Mark"));
 }
 
 cTimer *cMenuTimers::CurrentTimer(void)
@@ -1031,14 +1107,27 @@ cTimer *cMenuTimers::CurrentTimer(void)
   return item ? item->Timer() : NULL;
 }
 
-eOSState cMenuTimers::Activate(bool On)
+eOSState cMenuTimers::OnOff(void)
 {
   cTimer *timer = CurrentTimer();
-  if (timer && timer->active != On) {
-     timer->active = On;
+  if (timer) {
+     if (timer->IsSingleEvent())
+        timer->active = !timer->active;
+     else if (timer->firstday) {
+        timer->firstday = 0;
+        timer->active = false;
+        }
+     else if (timer->active)
+        timer->SkipToday();
+     else
+        timer->active = true;
+     timer->Matches(); // refresh start and end time
      RefreshCurrent();
      DisplayCurrent(true);
-     isyslog(LOG_INFO, "timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
+     if (timer->firstday)
+        isyslog(LOG_INFO, "timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
+     else
+        isyslog(LOG_INFO, "timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
      Timers.Save();
      }
   return osContinue;
@@ -1106,27 +1195,17 @@ eOSState cMenuTimers::Summary(void)
 
 eOSState cMenuTimers::ProcessKey(eKeys Key)
 {
-  // Must do these before calling cOsdMenu::ProcessKey() because cOsdMenu
-  // uses them to page up/down:
-  if (!HasSubMenu()) {
-     switch (Key) {
-       case kLeft:
-       case kRight:  return Activate(Key == kRight);
-       default: break;
-       }
-     }
-
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
      switch (Key) {
-       case kLeft:
-       case kRight:  return Activate(Key == kRight);
        case kOk:     return Summary();
        case kRed:    return Edit();
        case kGreen:  return New();
        case kYellow: return Del();
-       case kBlue:   if (!Setup.SortTimers)
+       case kBlue:   if (Setup.SortTimers)
+                        OnOff();
+                     else
                         Mark();
                      break;
        default: break;
@@ -1350,7 +1429,7 @@ cMenuScheduleItem::cMenuScheduleItem(const cEventInfo *EventInfo)
 
 class cMenuSchedule : public cOsdMenu {
 private:
-  cThreadLock threadLock;
+  cMutexLock mutexLock;
   const cSchedules *schedules;
   bool now, next;
   int otherChannel;
@@ -1370,7 +1449,7 @@ cMenuSchedule::cMenuSchedule(void)
   cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
   if (channel) {
      cMenuWhatsOn::SetCurrentChannel(channel->number);
-     schedules = cDvbApi::PrimaryDvbApi->Schedules(&threadLock);
+     schedules = cSIProcessor::Schedules(mutexLock);
      PrepareSchedule(channel);
      SetHelp(tr("Record"), tr("Now"), tr("Next"));
      }
@@ -1670,26 +1749,34 @@ eOSState cMenuRecordings::Del(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
-//XXX what if this recording's file is currently in use???
-//XXX     if (!ti->recording) {
-        if (Interface->Confirm(tr("Delete recording?"))) {
-           cRecording *recording = GetRecording(ri);
-           if (recording) {
-              if (recording->Delete()) {
-                 cReplayControl::ClearLastReplayed(ri->FileName());
-                 cOsdMenu::Del(Current());
-                 Recordings.Del(recording);
-                 Display();
-                 if (!Count())
-                    return osBack;
+     if (Interface->Confirm(tr("Delete recording?"))) {
+        cRecordControl *rc = cRecordControls::GetRecordControl(ri->FileName());
+        if (rc) {
+           if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
+              cTimer *timer = rc->Timer();
+              if (timer) {
+                 timer->SkipToday();
+                 cRecordControls::Process(time(NULL));
+                 Timers.Save();
                  }
-              else
-                 Interface->Error(tr("Error while deleting recording!"));
               }
+           else
+              return osContinue;
            }
-//XXX        }
-//XXX     else
-//XXX        Interface->Error(tr("Timer is recording!"));
+        cRecording *recording = GetRecording(ri);
+        if (recording) {
+           if (recording->Delete()) {
+              cReplayControl::ClearLastReplayed(ri->FileName());
+              cOsdMenu::Del(Current());
+              Recordings.Del(recording);
+              Display();
+              if (!Count())
+                 return osBack;
+              }
+           else
+              Interface->Error(tr("Error while deleting recording!"));
+           }
+        }
      }
   return osContinue;
 }
@@ -1735,81 +1822,6 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
   return state;
 }
 
-#ifdef DVDSUPPORT
-// --- cMenuDVDItem ----------------------------------------------------------
-
-class cMenuDVDItem : public cOsdItem {
-  private:
-  int title;
-  int chapters;
-  virtual void Set(void);
-public:
-  cMenuDVDItem(int Title, int Chapters);
-  int Title(void) { return title; }
-  };
-
-cMenuDVDItem::cMenuDVDItem(int Title, int Chapters)
-{
-  title = Title;
-  chapters = Chapters;
-  Set();
-}
-
-void cMenuDVDItem::Set(void)
-{
-  char *buffer = NULL;
-  asprintf(&buffer, " %2d.\tTitle - \t%2d\tChapters", title + 1, chapters);
-  SetText(buffer, false);
-}
-
-// --- cMenuDVD --------------------------------------------------------------
-
-cMenuDVD::cMenuDVD(void)
-:cOsdMenu(tr("DVD"), 5, 8, 3)
-{
-  if ((dvd = cDVD::getDVD())) {
-     dvd->Open();
-     ifo_handle_t *vmg = dvd->openVMG();
-     if (vmg) {
-        int lastTitleID = cReplayControl::LastTitleID();
-        dsyslog(LOG_INFO, "DVD: vmg: %p", vmg);//XXX
-        tt_srpt_t *tt_srpt = vmg->tt_srpt;
-        dsyslog(LOG_INFO, "DVD: tt_srpt: %p", tt_srpt);//XXX
-        for (int i = 0; i < tt_srpt->nr_of_srpts; i++)
-            Add(new cMenuDVDItem(i, tt_srpt->title[i].nr_of_ptts), i == lastTitleID);
-        }
-     }
-  SetHelp(tr("Play"), NULL, NULL, NULL);
-  Display();
-}
-
-eOSState cMenuDVD::Play(void)
-{
-  cMenuDVDItem *ri = (cMenuDVDItem *)Get(Current());
-  if (ri) {
-     cReplayControl::SetDVD(dvd, ri->Title());
-     isyslog(LOG_INFO, "DVD: playing title %d", ri->Title());
-     return osReplay;
-     }
-  return osContinue;
-}
-
-eOSState cMenuDVD::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk:
-       case kRed:    return Play();
-       case kMenu:   return osEnd;
-       default: break;
-       }
-     }
-  return state;
-}
-#endif //DVDSUPPORT
-
 // --- cMenuSetup ------------------------------------------------------------
 
 class cMenuSetup : public cOsdMenu {
@@ -1857,6 +1869,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditBoolItem(tr("UseSubtitle"),        &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("RecordingDirs"),      &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("VideoFormat"),        &data.VideoFormat, "4:3", "16:9"));
+  Add(new cMenuEditBoolItem(tr("RecordDolbyDigital"), &data.RecordDolbyDigital));
   Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
@@ -1971,10 +1984,6 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
   Add(new cOsdItem(hk(tr("Channels")),   osChannels));
   Add(new cOsdItem(hk(tr("Timers")),     osTimers));
   Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
-#ifdef DVDSUPPORT
-  if (cDVD::DriveExists())
-  Add(new cOsdItem(hk(tr("DVD")),        osDVD));
-#endif //DVDSUPPORT
   Add(new cOsdItem(hk(tr("Setup")),      osSetup));
   if (Commands.Count())
      Add(new cOsdItem(hk(tr("Commands")),  osCommands));
@@ -2007,13 +2016,7 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
 
   // Color buttons:
 
-  const char *DVDbutton =
-#ifdef DVDSUPPORT
-                          cDVD::DiscOk() ? tr("Eject") : NULL;
-#else
-                          NULL;
-#endif //DVDSUPPORT
-  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, DVDbutton, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
   SetHasHotkeys();
@@ -2022,9 +2025,6 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
 
   switch (State) {
     case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
-#ifdef DVDSUPPORT
-    case osDVD:        AddSubMenu(new cMenuDVD); break;
-#endif //DVDSUPPORT
     default: break;
     }
 }
@@ -2049,9 +2049,6 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osChannels:   return AddSubMenu(new cMenuChannels);
     case osTimers:     return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
-#ifdef DVDSUPPORT
-    case osDVD:        return AddSubMenu(new cMenuDVD);
-#endif //DVDSUPPORT
     case osSetup:      return AddSubMenu(new cMenuSetup);
     case osCommands:   return AddSubMenu(new cMenuCommands);
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
@@ -2084,23 +2081,6 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                    }
                                 }
                              break;
-#ifdef DVDSUPPORT
-               case kYellow: if (!HasSubMenu()) {
-                                if (cDVD::DiscOk()) {
-                                   // We need to stop replaying a DVD before ejecting,
-                                   // otherwise the replay thread crashes. Currently
-                                   // checking LastReplayed() is pretty much the only way
-                                   // of finding out whether we are currently replaying a DVD
-                                   // (i.e. if LastReplayed() returns non-NULL, we are either
-                                   // replaying a normal recording, or nothing at all):
-                                   if (!cReplayControl::LastReplayed())
-                                      cDvbApi::PrimaryDvbApi->StopReplay();
-                                   cDVD::Eject();
-                                   state = osEnd;
-                                   }
-                                }
-                             break;
-#endif //DVDSUPPORT
                case kBlue:   if (!HasSubMenu())
                                 state = osReplay;
                              break;
@@ -2175,8 +2155,8 @@ void cDisplayChannel::DisplayInfo(void)
 {
   if (withInfo) {
      const cEventInfo *Present = NULL, *Following = NULL;
-     cThreadLock ThreadLock;
-     const cSchedules *Schedules = cDvbApi::PrimaryDvbApi->Schedules(&ThreadLock);
+     cMutexLock MutexLock;
+     const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
      if (Schedules) {
         const cSchedule *Schedule = Schedules->GetSchedule();
         if (Schedule) {
@@ -2350,14 +2330,16 @@ cRecordControl::~cRecordControl()
   delete fileName;
 }
 
+#define INSTANT_REC_EPG_LOOKAHEAD 300 // seconds to look into the EPG data for an instant recording
+
 bool cRecordControl::GetEventInfo(void)
 {
   cChannel *channel = Channels.GetByNumber(timer->channel);
-  time_t Time = timer->IsSingleEvent() ? timer->StartTime() + ((Setup.MarginStart * 2) + 1) * 60 : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
+  time_t Time = timer->active == taActInst ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
-        cThreadLock ThreadLock;
-        const cSchedules *Schedules = dvbApi->Schedules(&ThreadLock);
+        cMutexLock MutexLock;
+        const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
         if (Schedules) {
            const cSchedule *Schedule = Schedules->GetSchedule(channel->pnr);
            if (Schedule) {
@@ -2481,6 +2463,15 @@ const char *cRecordControls::GetInstantId(const char *LastInstantId)
   return NULL;
 }
 
+cRecordControl *cRecordControls::GetRecordControl(const char *FileName)
+{
+  for (int i = 0; i < MAXDVBAPI; i++) {
+      if (RecordControls[i] && strcmp(RecordControls[i]->FileName(), FileName) == 0)
+         return RecordControls[i];
+      }
+  return NULL;
+}
+
 void cRecordControls::Process(time_t t)
 {
   for (int i = 0; i < MAXDVBAPI; i++) {
@@ -2548,10 +2539,6 @@ void cProgressBar::Mark(int x, bool Start, bool Current)
 
 char *cReplayControl::fileName = NULL;
 char *cReplayControl::title = NULL;
-#ifdef DVDSUPPORT
-cDVD *cReplayControl::dvd = NULL;//XXX
-int  cReplayControl::titleid = 0;//XXX
-#endif //DVDSUPPORT
 
 cReplayControl::cReplayControl(void)
 {
@@ -2565,10 +2552,6 @@ cReplayControl::cReplayControl(void)
      if (!dvbApi->StartReplay(fileName))
         Interface->Error(tr("Channel locked (recording)!"));
      }
-#ifdef DVDSUPPORT
-  else if (dvd)
-     dvbApi->StartDVDplay(dvd, titleid);//XXX
-#endif //DVDSUPPORT
 }
 
 cReplayControl::~cReplayControl()
@@ -2585,20 +2568,6 @@ void cReplayControl::SetRecording(const char *FileName, const char *Title)
   title = Title ? strdup(Title) : NULL;
 }
 
-#ifdef DVDSUPPORT
-void cReplayControl::SetDVD(cDVD *DVD, int Title)//XXX
-{
-  SetRecording(NULL, NULL);
-  dvd = DVD;
-  titleid = Title;
-}
-
-int cReplayControl::LastTitleID(void)
-{
-  return titleid;
-}
-#endif //DVDSUPPORT
-
 const char *cReplayControl::LastReplayed(void)
 {
   return fileName;
@@ -2966,7 +2935,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    return fileName ? osRecordings : osDVD;
+            case kBack:    return osRecordings;
             default:       return osUnknown;
             }
           }
diff --git a/menu.h b/menu.h
index 82fd64032..9e49bf65e 100644
--- a/menu.h
+++ b/menu.h
@@ -4,16 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.35 2002/01/20 13:38:34 kls Exp $
+ * $Id: menu.h 1.37 2002/02/24 12:40:37 kls Exp $
  */
 
 #ifndef _MENU_H
 #define _MENU_H
 
 #include "dvbapi.h"
-#ifdef DVDSUPPORT
-#include "dvd.h"
-#endif //DVDSUPPORT
 #include "osd.h"
 #include "recording.h"
 
@@ -43,18 +40,6 @@ class cDisplayChannel : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-#ifdef DVDSUPPORT
-class cMenuDVD : public cOsdMenu {
-private:
-  cDVD *dvd;//XXX member really necessary???
-  eOSState Play(void);
-  eOSState Eject(void);
-public:
-  cMenuDVD(void);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-#endif //DVDSUPPORT
-
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
@@ -92,6 +77,8 @@ class cRecordControl {
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
   const char *InstantId(void) { return instantId; }
+  const char *FileName(void) { return fileName; }
+  cTimer *Timer(void) { return timer; }
   };
 
 class cRecordControls {
@@ -103,6 +90,7 @@ class cRecordControls {
   static void Stop(cDvbApi *DvbApi);
   static bool StopPrimary(bool DoIt = false);
   static const char *GetInstantId(const char *LastInstantId);
+  static cRecordControl *GetRecordControl(const char *FileName);
   static void Process(time_t t);
   static bool Active(void);
   };
@@ -122,10 +110,6 @@ class cReplayControl : public cOsdBase {
   void Show(int Seconds = 0);
   void Hide(void);
   static char *fileName;
-#ifdef DVDSUPPORT
-  static cDVD *dvd;//XXX member really necessary???
-  static int titleid;//XXX
-#endif //DVDSUPPORT
   static char *title;
   void DisplayAtBottom(const char *s = NULL);
   void ShowMode(void);
@@ -141,10 +125,6 @@ class cReplayControl : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
-#ifdef DVDSUPPORT
-  static void SetDVD(cDVD *DVD, int Title);//XXX
-  static int LastTitleID(void);
-#endif //DVDSUPPORT
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
   };
diff --git a/osd.h b/osd.h
index 21c931540..4eb2a22dd 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.25 2002/01/20 10:42:14 kls Exp $
+ * $Id: osd.h 1.26 2002/02/24 12:55:16 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -27,7 +27,6 @@ enum eOSState { osUnknown,
                 osCommands,
                 osRecord,
                 osReplay,
-                osDVD,
                 osStopRecord,
                 osStopReplay,
                 osCancelEdit,
diff --git a/recording.c b/recording.c
index d82288756..4d07434a0 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.51 2002/02/10 15:41:23 kls Exp $
+ * $Id: recording.c 1.54 2002/02/24 11:21:42 kls Exp $
  */
 
 #include "recording.h"
@@ -122,7 +122,7 @@ void AssertFreeDiskSpace(int Priority)
               return;
            }
         // Unable to free disk space, but there's nothing we can do about that...
-        Interface->Confirm(tr("Low disk space"), 30);
+        Interface->Confirm(tr("Low disk space!"), 30);
         }
      LastFreeDiskCheck = time(NULL);
      }
@@ -203,7 +203,6 @@ static char *ExchangeChars(char *s, bool ToFileSystem)
 {
   char *p = s;
   while (*p) {
-#define VFAT 1
 #ifdef VFAT
         // The VFAT file system can't handle all characters, so we
         // have to take extra efforts to encode/decode them:
@@ -225,7 +224,12 @@ static char *ExchangeChars(char *s, bool ToFileSystem)
                   case '=':
                   case '0' ... '9':
                   case 'a' ... 'z':
-                  case 'A' ... 'Z': break;
+                  case 'A' ... 'Z':
+                  case '�': case '�':
+                  case '�': case '�':
+                  case '�': case '�':
+                  case '�':
+                       break;
                   // characters that can be mapped to other characters:
                   case ' ': *p = '_'; break;
                   case '~': *p = '/'; break;
diff --git a/svdrp.c b/svdrp.c
index 4cdf2fbba..228003ea0 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.30 2002/02/02 15:39:46 kls Exp $
+ * $Id: svdrp.c 1.33 2002/02/24 14:16:03 kls Exp $
  */
 
 #include "svdrp.h"
@@ -118,6 +118,52 @@ int cSocket::Accept(void)
   return -1;
 }
 
+// --- cPUTEhandler ----------------------------------------------------------
+
+cPUTEhandler::cPUTEhandler(void)
+{
+  if ((f = tmpfile()) != NULL) {
+     status = 354;
+     message = "Enter EPG data, end with \".\" on a line by itself";
+     }
+  else {
+     LOG_ERROR;
+     status = 554;
+     message = "Error while opening temporary file";
+     }
+}
+
+cPUTEhandler::~cPUTEhandler()
+{
+  if (f)
+     fclose(f);
+}
+
+bool cPUTEhandler::Process(const char *s)
+{
+  if (f) {
+     if (strcmp(s, ".") != 0) {
+        fputs(s, f);
+        fputc('\n', f);
+        return true;
+        }
+     else {
+        rewind(f);
+        if (cSchedules::Read(f)) {
+           status = 250;
+           message = "EPG data processed";
+           }
+        else {
+           status = 451;
+           message = "Error while processing EPG data";
+           }
+        fclose(f);
+        f = NULL;
+        }
+     }
+  return false;
+}
+
 // --- cSVDRP ----------------------------------------------------------------
 
 #define MAXHELPTOPIC 10
@@ -192,6 +238,11 @@ const char *HelpPages[] = {
   "    zero, this means that the timer is currently recording and has started\n"
   "    at the given time. The first value in the resulting line is the number\n"
   "    of the timer.",
+  "PUTE\n"
+  "    Put data into the EPG list. The data entered has to strictly follow the\n"
+  "    format defined in VDR/FORMATS for the 'epg.data' file.  A '.' on a line\n"
+  "    by itself terminates the input and starts processing of the data (all\n"
+  "    entered data is buffered until the terminating '.' is seen).",
   "UPDT <settings>\n"
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
@@ -209,6 +260,7 @@ const char *HelpPages[] = {
  220 VDR service ready
  221 VDR service closing transmission channel
  250 Requested VDR action okay, completed
+ 354 Start sending EPG data
  451 Requested action aborted: local error in processing
  500 Syntax error, command unrecognized
  501 Syntax error in parameters or arguments
@@ -252,6 +304,7 @@ const char *GetHelpPage(const char *Cmd)
 cSVDRP::cSVDRP(int Port)
 :socket(Port)
 {
+  PUTEhandler = NULL;
   numChars = 0;
   message = NULL;
   lastActivity = 0;
@@ -273,6 +326,7 @@ void cSVDRP::Close(bool Timeout)
      Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
      isyslog(LOG_INFO, "closing SVDRP connection"); //TODO store IP#???
      file.Close();
+     DELETENULL(PUTEhandler);
      }
 }
 
@@ -583,6 +637,8 @@ void cSVDRP::CmdLSTC(const char *Option)
               }
         if (next)
            Reply(250, "%d %s", next->number, next->ToText());
+        else
+           Reply(501, "Channel \"%s\" not defined", Option);
         }
      }
   else if (Channels.MaxNumber() >= 1) {
@@ -600,8 +656,8 @@ void cSVDRP::CmdLSTC(const char *Option)
 
 void cSVDRP::CmdLSTE(const char *Option)
 {
-  cThreadLock ThreadLock;
-  const cSchedules *Schedules = cDvbApi::PrimaryDvbApi->Schedules(&ThreadLock);
+  cMutexLock MutexLock;
+  const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
   if (Schedules) {
      FILE *f = fdopen(file, "w");
      if (f) {
@@ -827,6 +883,15 @@ void cSVDRP::CmdNEXT(const char *Option)
      Reply(550, "No active timers");
 }
 
+void cSVDRP::CmdPUTE(const char *Option)
+{
+  delete PUTEhandler;
+  PUTEhandler = new cPUTEhandler;
+  Reply(PUTEhandler->Status(), PUTEhandler->Message());
+  if (PUTEhandler->Status() != 354)
+     DELETENULL(PUTEhandler);
+}
+
 void cSVDRP::CmdUPDT(const char *Option)
 {
   if (*Option) {
@@ -859,6 +924,14 @@ void cSVDRP::CmdUPDT(const char *Option)
 
 void cSVDRP::Execute(char *Cmd)
 {
+  // handle PUTE data:
+  if (PUTEhandler) {
+     if (!PUTEhandler->Process(Cmd)) {
+        Reply(PUTEhandler->Status(), PUTEhandler->Message());
+        DELETENULL(PUTEhandler);
+        }
+     return;
+     }
   // skip leading whitespace:
   Cmd = skipspace(Cmd);
   // find the end of the command word:
@@ -888,6 +961,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
+  else if (CMD("PUTE"))  CmdPUTE(s);
   else if (CMD("QUIT"))  Close();
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
 }
diff --git a/svdrp.h b/svdrp.h
index e68a92e43..42e5b6911 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.13 2001/11/04 11:20:46 kls Exp $
+ * $Id: svdrp.h 1.14 2002/02/24 10:48:21 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -26,11 +26,25 @@ class cSocket {
   int Accept(void);
   };
 
+class cPUTEhandler {
+private:
+  FILE *f;
+  int status;
+  const char *message;
+public:
+  cPUTEhandler(void);
+  ~cPUTEhandler();
+  bool Process(const char *s);
+  int Status(void) { return status; }
+  const char *Message(void) { return message; }
+  };
+
 class cSVDRP {
 private:
   cSocket socket;
   cFile file;
   cRecordings Recordings;
+  cPUTEhandler *PUTEhandler;
   uint numChars;
   char cmdLine[MAXPARSEBUFFER];
   char *message;
@@ -57,6 +71,7 @@ class cSVDRP {
   void CmdNEWC(const char *Option);
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
+  void CmdPUTE(const char *Option);
   void CmdUPDT(const char *Option);
   void Execute(char *Cmd);
 public:
diff --git a/thread.c b/thread.c
index 7e5b0ea7f..94ba86057 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.16 2001/10/27 13:23:06 kls Exp $
+ * $Id: thread.c 1.18 2002/02/23 13:49:06 kls Exp $
  */
 
 #include "thread.h"
@@ -190,6 +190,32 @@ bool cThread::EmergencyExit(bool Request)
   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
 }
 
+// --- cMutexLock ------------------------------------------------------------
+
+cMutexLock::cMutexLock(cMutex *Mutex)
+{
+  mutex = NULL;
+  locked = false;
+  Lock(Mutex);
+}
+
+cMutexLock::~cMutexLock()
+{
+  if (mutex && locked)
+     mutex->Unlock();
+}
+
+bool cMutexLock::Lock(cMutex *Mutex)
+{
+  if (Mutex && !mutex) {
+     mutex = Mutex;
+     Mutex->Lock();
+     locked = true;
+     return true;
+     }
+  return false;
+}
+
 // --- cThreadLock -----------------------------------------------------------
 
 cThreadLock::cThreadLock(cThread *Thread)
@@ -277,8 +303,11 @@ bool cPipe::Open(const char *Command, const char *Mode)
         _exit(-1);
         }
      else {
-        for (int i = STDERR_FILENO + 1; i < fd[1 - iopipe]; i++)
-            close(i); //close all dup'ed filedescriptors
+        for (int i = 0; i <= fd[1]; i++) {
+            if (i == STDIN_FILENO || i == STDOUT_FILENO || i == STDERR_FILENO)
+               continue;
+            close(i); // close all dup'ed filedescriptors
+            }
         if (execl("/bin/sh", "sh", "-c", Command, NULL) == -1) {
            LOG_ERROR_STR(Command);
            close(fd[1 - iopipe]);
diff --git a/thread.h b/thread.h
index 4547addeb..3ac398a2c 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.11 2001/10/27 13:22:20 kls Exp $
+ * $Id: thread.h 1.12 2002/02/23 13:53:38 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -69,6 +69,22 @@ class cThread {
   static bool EmergencyExit(bool Request = false);
   };
 
+// cMutexLock can be used to easily set a lock on mutex and make absolutely
+// sure that it will be unlocked when the block will be left. Several locks can
+// be stacked, so a function that makes many calls to another function which uses
+// cMutexLock may itself use a cMutexLock to make one longer lock instead of many
+// short ones.
+
+class cMutexLock {
+private:
+  cMutex *mutex;
+  bool locked;
+public:
+  cMutexLock(cMutex *Mutex = NULL);
+  ~cMutexLock();
+  bool Lock(cMutex *Mutex);
+  };
+
 // cThreadLock can be used to easily set a lock in a thread and make absolutely
 // sure that it will be unlocked when the block will be left. Several locks can
 // be stacked, so a function that makes many calls to another function which uses
diff --git a/tools.c b/tools.c
index e95bdf8d2..3764a6441 100644
--- a/tools.c
+++ b/tools.c
@@ -4,17 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.57 2002/02/05 18:16:52 kls Exp $
+ * $Id: tools.c 1.59 2002/02/17 12:57:23 kls Exp $
  */
 
 #include "tools.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
-#if defined(DEBUG_OSD)
-#include <ncurses.h>
-#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
-#endif
 #include <stdlib.h>
 #include <sys/time.h>
 #include <time.h>
@@ -466,6 +462,20 @@ bool SpinUpDisk(const char *FileName)
   return false;
 }
 
+const char *WeekDayName(int WeekDay)
+{
+  static char buffer[4];
+  WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with monday==0!
+  if (0 <= WeekDay && WeekDay <= 6) {
+     const char *day = tr("MonTueWedThuFriSatSun");
+     day += WeekDay * 3;
+     strncpy(buffer, day, 3);
+     return buffer;
+     }
+  else
+     return "???";
+}
+
 const char *DayDateTime(time_t t)
 {
   static char buffer[32];
@@ -473,11 +483,7 @@ const char *DayDateTime(time_t t)
      time(&t);
   struct tm tm_r;
   tm *tm = localtime_r(&t, &tm_r);
-  int weekday = tm->tm_wday == 0 ? 6 : tm->tm_wday - 1; // we start with monday==0!
-  const char *day = tr("MonTueWedThuFriSatSun");
-  day += weekday * 3;
-  strncpy(buffer, day, 3);
-  snprintf(buffer + 3, sizeof(buffer) - 3, " %2d.%02d %02d:%02d", tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
+  snprintf(buffer, sizeof(buffer), "%s %2d.%02d %02d:%02d", WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
   return buffer;
 }
 
@@ -545,9 +551,6 @@ bool cFile::Ready(bool Wait)
 
 bool cFile::AnyFileReady(int FileDes, int TimeoutMs)
 {
-#ifdef DEBUG_OSD
-  refresh();
-#endif
   fd_set set;
   FD_ZERO(&set);
   for (int i = 0; i < maxFiles; i++) {
@@ -566,9 +569,6 @@ bool cFile::AnyFileReady(int FileDes, int TimeoutMs)
 
 bool cFile::FileReady(int FileDes, int TimeoutMs)
 {
-#ifdef DEBUG_OSD
-  refresh();
-#endif
   fd_set set;
   struct timeval timeout;
   FD_ZERO(&set);
@@ -582,9 +582,6 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
 
 bool cFile::FileReadyForWriting(int FileDes, int TimeoutMs)
 {
-#ifdef DEBUG_OSD
-  refresh();
-#endif
   fd_set set;
   struct timeval timeout;
   FD_ZERO(&set);
diff --git a/tools.h b/tools.h
index 9663a8edd..08a567234 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.41 2002/02/03 12:36:25 kls Exp $
+ * $Id: tools.h 1.42 2002/02/17 12:57:44 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -66,6 +66,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
+const char *WeekDayName(int WeekDay); // returns a statically allocated string!
 const char *DayDateTime(time_t t = 0); // returns a statically allocated string!
 
 class cFile {
diff --git a/vdr.c b/vdr.c
index 9d5167b46..90c1d8433 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.95 2002/02/10 15:12:43 kls Exp $
+ * $Id: vdr.c 1.97 2002/02/24 12:55:10 kls Exp $
  */
 
 #include <getopt.h>
@@ -32,9 +32,7 @@
 #include <unistd.h>
 #include "config.h"
 #include "dvbapi.h"
-#ifdef DVDSUPPORT
-#include "dvd.h"
-#endif //DVDSUPPORT
+#include "eit.h"
 #include "i18n.h"
 #include "interface.h"
 #include "menu.h"
@@ -104,14 +102,13 @@ int main(int argc, char *argv[])
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
       { "video",    required_argument, NULL, 'v' },
-      { "dvd",      required_argument, NULL, 'V' },
       { "watchdog", required_argument, NULL, 'w' },
       { NULL }
     };
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:r:s:t:v:V:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:r:s:t:v:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -152,7 +149,6 @@ int main(int argc, char *argv[])
                            "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
-                           "  -V DEV,   --dvd=DEV      use DEV as the DVD device (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
                            "\n"
@@ -160,11 +156,6 @@ int main(int argc, char *argv[])
                            cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
                            DEFAULTSVDRPPORT,
                            VideoDirectory,
-#ifdef DVDSUPPORT
-                           cDVD::DeviceName(),
-#else
-                           "no DVD support",
-#endif //DVDSUPPORT
                            DEFAULTWATCHDOG
                            );
                     return 0;
@@ -196,18 +187,6 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
-          case 'V': 
-#ifdef DVDSUPPORT
-                    cDVD::SetDeviceName(optarg);
-                    if (!cDVD::DriveExists()) {
-                       fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
-                       return 2;
-                       }
-#else
-                    fprintf(stderr, "vdr: DVD support has not been compiled in!");
-                    return 2;
-#endif //DVDSUPPORT
-                    break;
           case 'w': if (isnumber(optarg)) {
                        int t = atoi(optarg);
                        if (t >= 0) {
@@ -286,6 +265,8 @@ int main(int argc, char *argv[])
 
   cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
 
+  cSIProcessor::Read();
+
   Channels.SwitchTo(Setup.CurrentChannel);
   cDvbApi::PrimaryDvbApi->SetVolume(Setup.CurrentVolume, true);
 
@@ -406,12 +387,6 @@ int main(int argc, char *argv[])
                                 DELETENULL(ReplayControl);
                                 ReplayControl = new cReplayControl;
                                 break;
-#ifdef DVDSUPPORT
-                 case osDVD:    DELETENULL(Menu);
-                                DELETENULL(ReplayControl);
-                                Menu = new cMenuMain(ReplayControl, osDVD);
-                                break;
-#endif //DVDSUPPORT
                  case osStopReplay:
                                 DELETENULL(*Interact);
                                 DELETENULL(ReplayControl);

From 0bad88704ba7e0346c49bb28be28e709473d9244 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 25 Feb 2002 18:00:00 +0100
Subject: [PATCH 036/307] Version 1.0.0pre2 - Fixed a crash in case there is no
 'epg.data' at program start (thanks to   Andreas Schultz).

---
 CONTRIBUTORS | 1 +
 HISTORY      | 5 +++++
 config.h     | 4 ++--
 eit.c        | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bbceff25e..1acaafcb9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -124,6 +124,7 @@ Andreas Schultz <aschultz@warp10.net>
  for adding support for replaying DVDs (much of this was derived from
  dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>)
  for adding PTS to the converted PCM audio when replaying a DVD
+ for fixing a crash in case there is no 'epg.data' at program start
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index ea81172d8..2b0093e0f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1042,3 +1042,8 @@ Video Disk Recorder Revision History
   inadvertently overwriting an existing VDR directory with a new version.
 - Added a missing error message in SVDRP command LSTC in case the given channel
   can't be found.
+
+2002-02-25: Version 1.0.0pre2
+
+- Fixed a crash in case there is no 'epg.data' at program start (thanks to
+  Andreas Schultz).
diff --git a/config.h b/config.h
index 35f1590c0..b5860d18b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.99 2002/02/24 13:39:47 kls Exp $
+ * $Id: config.h 1.100 2002/02/25 16:29:09 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0pre1"
+#define VDRVERSION "1.0.0pre2"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/eit.c b/eit.c
index bd43fe925..8f4c03724 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.37 2002/02/23 17:11:19 kls Exp $
+ * $Id: eit.c 1.38 2002/02/25 16:30:42 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1022,6 +1022,8 @@ bool cSIProcessor::Read(FILE *f)
            return false;
            }
         }
+     else
+        return false;
      }
   bool result = cSchedules::Read(f);
   if (OwnFile)

From a001a4bf97715d62b387d1da9fd1e48382508428 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Mar 2002 18:00:00 +0100
Subject: [PATCH 037/307] Version 1.0.0pre3 - Fixed parsing 'E' records in
 epg2html.pl. - Fixed a deadlock when switching channels via
 Schedule/Now|Next/Switch (reported   by Martin Hammerschmid). - Changed the
 meaning of the 'Ca' parameter in 'channels.conf'. Each channel can   now
 define which decryption method it needs in order to be accessed. The new  
 configuration file 'ca.conf' contains the defined values, and the default  
 'channels.conf' has been modifed to contain the new values for 'Premiere
 World'   and 'ORF'. If you use the default 'channels.conf' and have the
 conditional   access hardware to receive encrypted channels, please make sure
 you copy the   file 'ca.conf' into your /video directory (or wherever your
 configuration files   are located) and go into the "Setup" menu and set the
 CICAM values according   to your hardware setup. Currently there are two
 possible CICAM entries per   DVB card, so any card can implement up to two
 different conditional access   modes (besides the default "Free To Air" mode,
 which is always assumed to be   available on any DVB card). - Updated French
 language texts (thanks to Jean-Claude Repetto).

---
 CONTRIBUTORS  |   1 +
 FORMATS       |  19 ++++++-
 HISTORY       |  19 +++++++
 MANUAL        |   8 +++
 ca.conf       |  22 ++++++++
 channels.conf | 138 +++++++++++++++++++++++++-------------------------
 config.c      |  73 +++++++++++++++++++++++++-
 config.h      |  25 ++++++++-
 dvbapi.c      | 127 +++++++++++++++++++++++++++++++++-------------
 dvbapi.h      |  31 +++++++++---
 eit.c         |  22 ++------
 epg2html.pl   |   4 +-
 i18n.c        |  76 +++++++++++++--------------
 menu.c        |  65 +++++++++++++++++++++++-
 vdr.c         |   3 +-
 15 files changed, 457 insertions(+), 176 deletions(-)
 create mode 100644 ca.conf

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1acaafcb9..ed63a4bb1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -39,6 +39,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for suggesting to display the direct channel select input on the OSD
  for suggesting to use the "Blue" button in the main menu to resume replay
  for implementing pege up/down with the "Left" and "Right" keys
+ for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
diff --git a/FORMATS b/FORMATS
index 0da293977..91903384e 100644
--- a/FORMATS
+++ b/FORMATS
@@ -29,8 +29,9 @@ Video Disk Recorder File Formats
     If this channel also carries Dolby Digital sound, the Dolby PIDs follow
     the audio PIDs, separated by a semicolon, as in "...:101,102;103,104:..."
   - Teletext PID
-  - Conditional Access (0 = Free To Air, 1 = can be decrypted by the first
-    DVB card, 2 = can be decrypted by the second DVB card)
+  - Conditional Access (0 = Free To Air, 1..4 = explicitly requires the DVB card
+    with the given number, >=100 = requires a specific decryption method defined
+    in 'ca.conf').
   - Program Number
 
   Fields marked with ** are only meaningful for DVB-S receivers.
@@ -38,6 +39,20 @@ Video Disk Recorder File Formats
   Fields marked with *** are only meaningful for DVB-S and DVB-C receivers.
   DVB-T receivers simply ignore these.
 
+* ca.conf
+
+  This file contains the definitions of the various conditional access code
+  numbers. Anything after (and including) a '#' character is comment.
+  Value lines consist of an integer number, followed by a text describing
+  this decryption method (typically the name of the pay tv service using this
+  decryption method).
+  The special value 0 means "Free To Air", i.e. can be used for channels that
+  don't require additional decryption hardware.
+  The values 1..4 can be used for channels that for some reason explicitly
+  need a given DVB card (for backward compatibility).
+  The values defined in this file are the ones used in the 'Ca' parameter of
+  'channels.conf'.
+
 * timers.conf
 
   This file contains the timer setup.
diff --git a/HISTORY b/HISTORY
index 2b0093e0f..84c1460e1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1047,3 +1047,22 @@ Video Disk Recorder Revision History
 
 - Fixed a crash in case there is no 'epg.data' at program start (thanks to
   Andreas Schultz).
+
+2002-03-03: Version 1.0.0pre3
+
+- Fixed parsing 'E' records in epg2html.pl.
+- Fixed a deadlock when switching channels via Schedule/Now|Next/Switch (reported
+  by Martin Hammerschmid).
+- Changed the meaning of the 'Ca' parameter in 'channels.conf'. Each channel can
+  now define which decryption method it needs in order to be accessed. The new
+  configuration file 'ca.conf' contains the defined values, and the default
+  'channels.conf' has been modifed to contain the new values for 'Premiere World'
+  and 'ORF'. If you use the default 'channels.conf' and have the conditional
+  access hardware to receive encrypted channels, please make sure you copy the
+  file 'ca.conf' into your /video directory (or wherever your configuration files
+  are located) and go into the "Setup" menu and set the CICAM values according
+  to your hardware setup. Currently there are two possible CICAM entries per
+  DVB card, so any card can implement up to two different conditional access
+  modes (besides the default "Free To Air" mode, which is always assumed to be
+  available on any DVB card).
+- Updated French language texts (thanks to Jean-Claude Repetto).
diff --git a/MANUAL b/MANUAL
index 320d24dad..c4cda08a5 100644
--- a/MANUAL
+++ b/MANUAL
@@ -526,6 +526,14 @@ Video Disk Recorder User's Manual
                          0 = off
                          1 = on
 
+  CaCaps (no default)    Defines the "Conditional Access Capabilities" of a DVB
+                         card. The value consists of the card number, followed by
+                         a list of decryption method values (defined in 'ca.conf').
+                         For instance
+                           CaCaps = 3 101 102
+                         would define that card number 3 is able to decrypt
+                         "Premiere World" and the "ORF".
+
 * Executing system commands
 
   The "Main" menu option "Commands" allows you to execute any system commands
diff --git a/ca.conf b/ca.conf
new file mode 100644
index 000000000..7024ee427
--- /dev/null
+++ b/ca.conf
@@ -0,0 +1,22 @@
+# Conditional Access configuration for VDR
+#
+# Format:
+#
+# number  description
+#
+# Please contact kls@cadsoft.de before assigning a new number
+# to a description, in order to keep them unique.
+
+0      Free To Air
+
+# BetaCrypt
+
+101    Premiere World
+102    ORF
+
+# Special values to "hard code" a channel to a specific DVB card:
+
+1      DVB 1
+2      DVB 2
+3      DVB 3
+4      DVB 4
diff --git a/channels.conf b/channels.conf
index 4642edc51..db1cbf41b 100644
--- a/channels.conf
+++ b/channels.conf
@@ -15,8 +15,8 @@ ZDF:11954:h:0:27500:110:120:130:0:28006
 3sat:11954:h:0:27500:210:220:230:0:28007
 KiKa:11954:h:0:27500:310:320:330:0:28008
 arte:11836:h:0:27500:401:402:404:0:28109
-ORF1:12692:h:0:22000:160:161:165:3:13001
-ORF2:12692:h:0:22000:500:501:505:3:13002
+ORF1:12692:h:0:22000:160:161:165:102:13001
+ORF2:12692:h:0:22000:500:501:505:102:13002
 ORF Sat:11954:h:0:27500:506:507:0:0:28010
 ZDF.info:11954:h:0:27500:610:620:0:0:28011
 CNN:12168:v:0:27500:165:100:0:0:28512
@@ -49,82 +49,82 @@ B1:12110:h:0:27500:601:602:604:0:28206
 ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
 Premiere World:11797:h:0:27500:255:256:32:0:8
-Premiere 1:11797:h:0:27500:511:512:0:3:10
-Premiere 2:11797:h:0:27500:1791:1792:0:3:11
-Premiere 3:11797:h:0:27500:2303:2304:0:3:43
-Premiere One:12032:h:0:27500:3071:3072:0:3:51
-Premiere Star:11797:h:0:27500:767:768:0:3:9
-Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:3:41
-Premiere Action:11797:h:0:27500:1023:1024:0:3:20
-Premiere X-Action:11798:h:0:27500:2047:2048:0:3:50
-Premiere Comedy:11797:h:0:27500:1279:1280:0:3:29
-13th Street:12031:h:0:27500:2303:2304:0:3:42
-Studio Universal:12090:V:0:27500:255:256:0:3:36
-Filmpalast:12031:h:0:27500:2559:2560:0:3:516
-Heimatkanal:12031:h:0:27500:2815:2816:0:3:517
-Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
-Planet:12090:V:0:27500:1279:1280:0:3:13
-Fox Kids:12031:h:0:27500:1279:1280:0:3:28
-Fox Kids T�rkce:11914:H:0:27500:767:768:8191:3:54
-Junior:12031:h:0:27500:255:256:0:3:19
-K-Toon:12031:h:0:27500:511:512:0:3:12
-Disney Channel:12090:V:0:27500:767:768:0:3:34
-Sunset:12031:h:0:27500:1023:1024:0:3:16
-Krimi&Co:12031:h:0:27500:1535:1536:0:3:23
-Goldstar TV:12031:h:0:27500:3839:3840:0:3:518
-Classica:12031:h:0:27500:767:768:0:3:15
-Seasons:12090:V:0:27500:511:512:0:3:33
+Premiere 1:11797:h:0:27500:511:512:0:101:10
+Premiere 2:11797:h:0:27500:1791:1792:0:101:11
+Premiere 3:11797:h:0:27500:2303:2304:0:101:43
+Premiere One:12032:h:0:27500:3071:3072:0:101:51
+Premiere Star:11797:h:0:27500:767:768:0:101:9
+Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:101:41
+Premiere Action:11797:h:0:27500:1023:1024:0:101:20
+Premiere X-Action:11798:h:0:27500:2047:2048:0:101:50
+Premiere Comedy:11797:h:0:27500:1279:1280:0:101:29
+13th Street:12031:h:0:27500:2303:2304:0:101:42
+Studio Universal:12090:V:0:27500:255:256:0:101:36
+Filmpalast:12031:h:0:27500:2559:2560:0:101:516
+Heimatkanal:12031:h:0:27500:2815:2816:0:101:517
+Discovery Channel:12031:h:0:27500:1791:1792:0:101:14
+Planet:12090:V:0:27500:1279:1280:0:101:13
+Fox Kids:12031:h:0:27500:1279:1280:0:101:28
+Fox Kids T�rkce:11914:H:0:27500:767:768:8191:101:54
+Junior:12031:h:0:27500:255:256:0:101:19
+K-Toon:12031:h:0:27500:511:512:0:101:12
+Disney Channel:12090:V:0:27500:767:768:0:101:34
+Sunset:12031:h:0:27500:1023:1024:0:101:16
+Krimi&Co:12031:h:0:27500:1535:1536:0:101:23
+Goldstar TV:12031:h:0:27500:3839:3840:0:101:518
+Classica:12031:h:0:27500:767:768:0:101:15
+Seasons:12090:V:0:27500:511:512:0:101:33
 :Cinedom
-Cinedom Deluxe:11758:h:0:27500:255:256,257;259:0:3:189
-Cinedom 1A:11758:h:0:27500:511:512,513:0:3:190
-Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:3:178
-Cinedom 1C:11720:h:0:27500:511:512,513:0:3:180
-Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:3:176
-Cinedom 2A:11758:h:0:27500:1023:1024,1025:0:3:193
-Cinedom 2B:11720:h:0:27500:1279:1280:0:3:183
-Cinedom 2C:12070:h:0:27500:1791:1792:0:3:179
-Cinedom 2D:12070:h:0:27500:511:512:0:3:184
-Cinedom 2E:12070:h:0:27500:1279:1280:0:3:188
-Cinedom 3A:11758:h:0:27500:2559:2560:0:3:192
-Cinedom 3B:11758:h:0:27500:1535:1536:0:3:195
-Cinedom 3C:12070:h:0:27500:767:768:0:3:185
-Cinedom 3D:11720:h:0:27500:1023:1024:0:3:182
-Cinedom 4A:11758:h:0:27500:767:768:0:3:191
-Cinedom 4B:11720:h:0:27500:767:768:0:3:181
-Cinedom 4C:12070:h:0:27500:2047:2048:0:3:187
-Cinedom 5A:11758:h:0:27500:1279:1280:0:3:194
-Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
-Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
+Cinedom Deluxe:11758:h:0:27500:255:256,257;259:0:101:189
+Cinedom 1A:11758:h:0:27500:511:512,513:0:101:190
+Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:101:178
+Cinedom 1C:11720:h:0:27500:511:512,513:0:101:180
+Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:101:176
+Cinedom 2A:11758:h:0:27500:1023:1024,1025:0:101:193
+Cinedom 2B:11720:h:0:27500:1279:1280:0:101:183
+Cinedom 2C:12070:h:0:27500:1791:1792:0:101:179
+Cinedom 2D:12070:h:0:27500:511:512:0:101:184
+Cinedom 2E:12070:h:0:27500:1279:1280:0:101:188
+Cinedom 3A:11758:h:0:27500:2559:2560:0:101:192
+Cinedom 3B:11758:h:0:27500:1535:1536:0:101:195
+Cinedom 3C:12070:h:0:27500:767:768:0:101:185
+Cinedom 3D:11720:h:0:27500:1023:1024:0:101:182
+Cinedom 4A:11758:h:0:27500:767:768:0:101:191
+Cinedom 4B:11720:h:0:27500:767:768:0:101:181
+Cinedom 4C:12070:h:0:27500:2047:2048:0:101:187
+Cinedom 5A:11758:h:0:27500:1279:1280:0:101:194
+Cinedom 5B:11720:h:0:27500:1791:1792:0:101:177
+Cinedom 5C:12070:h:0:27500:1023:1024:0:101:186
 :Beta Digital
 N24:12480:v:0:27500:2047:2048:0:0:47
 CNBC:11954:h:0:27500:510:520:0:0:28010
 Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
 :PW Erotic
-Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:3:21
-Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
-Blue Movie 2:11758:h:0:27500:2047:2048:0:3:514
-Blue Movie 3:11758:h:0:27500:2303:2304:0:3:515
+Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:101:21
+Blue Movie 1:11758:h:0:27500:1791:1792:0:101:513
+Blue Movie 2:11758:h:0:27500:2047:2048:0:101:514
+Blue Movie 3:11758:h:0:27500:2303:2304:0:101:515
 :Sportsworld
-Premiere Sport 1:11720:h:0:27500:255:256,257:0:3:17
-Premiere Sport 2:12070:h:0:27500:3839:3840:0:3:27
-Premiere Sport 3:12070:h:0:27500:255:256:0:3:26
+Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
+Premiere Sport 2:12070:h:0:27500:3839:3840:0:101:27
+Premiere Sport 3:12070:h:0:27500:255:256:0:101:26
 :Formel 1
-Infokanal:11720:h:0:27500:3071:3072:0:3:244
-Multikanal:11720:h:0:27500:2815:2816:0:3:243
-Supersignal:11720:h:0:27500:255:256:0:3:17
-Verfolgerfeld:11720:h:0:27500:2303:2304:0:3:241
-Cockpitkanal:11720:h:0:27500:2559:2560:0:3:242
-Boxengasse:11720:h:0:27500:2047:2048:0:3:240
+Infokanal:11720:h:0:27500:3071:3072:0:101:244
+Multikanal:11720:h:0:27500:2815:2816:0:101:243
+Supersignal:11720:h:0:27500:255:256:0:101:17
+Verfolgerfeld:11720:h:0:27500:2303:2304:0:101:241
+Cockpitkanal:11720:h:0:27500:2559:2560:0:101:242
+Boxengasse:11720:h:0:27500:2047:2048:0:101:240
 :Premiere World Bundesliga
-Superdom:11758:h:0:27500:2815:8192:0:3:18
-BuLi-Konferenz:11758:h:0:27500:3327:3328,3329:0:3:215
-BuLi-Spiel 1:11720:h:0:27500:255:256,257:0:3:17
-BuLi-Spiel 2:11720:h:0:27500:2047:2048,2049:0:3:240
-BuLi-Spiel 3:11720:h:0:27500:2303:2304,2305:0:3:241
-BuLi-Spiel 4:11720:h:0:27500:2559:2560,2561:0:3:242
-BuLi-Spiel 5:11720:h:0:27500:2815:2816,2817:0:3:243
-BuLi-Spiel 6:11720:h:0:27500:3071:3072,3073:0:3:244
-BuLi-Spiel 7:11758:h:0:27500:3071:3072,3073:0:3:214
+Superdom:11758:h:0:27500:2815:8192:0:101:18
+BuLi-Konferenz:11758:h:0:27500:3327:3328,3329:0:101:215
+BuLi-Spiel 1:11720:h:0:27500:255:256,257:0:101:17
+BuLi-Spiel 2:11720:h:0:27500:2047:2048,2049:0:101:240
+BuLi-Spiel 3:11720:h:0:27500:2303:2304,2305:0:101:241
+BuLi-Spiel 4:11720:h:0:27500:2559:2560,2561:0:101:242
+BuLi-Spiel 5:11720:h:0:27500:2815:2816,2817:0:101:243
+BuLi-Spiel 6:11720:h:0:27500:3071:3072,3073:0:101:244
+BuLi-Spiel 7:11758:h:0:27500:3071:3072,3073:0:101:214
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
diff --git a/config.c b/config.c
index 213fe2cfe..a91cb8ac2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.87 2002/02/24 11:59:14 kls Exp $
+ * $Id: config.c 1.88 2002/03/03 16:04:21 kls Exp $
  */
 
 #include "config.h"
@@ -732,6 +732,24 @@ bool cSVDRPhost::Accepts(in_addr_t Address)
   return (Address & mask) == addr.s_addr;
 }
 
+// -- cCaDefinition ----------------------------------------------------------
+
+cCaDefinition::cCaDefinition(void)
+{
+  number = 0;
+  description = NULL;
+}
+
+cCaDefinition::~cCaDefinition()
+{
+  delete description;
+}
+
+bool cCaDefinition::Parse(const char *s)
+{
+  return 2 == sscanf(s, "%d %a[^\n]", &number, &description) && description && *description;
+}
+
 // -- cKeys ------------------------------------------------------------------
 
 cKeys Keys;
@@ -879,6 +897,21 @@ bool cSVDRPhosts::Acceptable(in_addr_t Address)
   return false;
 }
 
+// -- cCaDefinitions ---------------------------------------------------------
+
+cCaDefinitions CaDefinitions;
+
+const cCaDefinition *cCaDefinitions::Get(int Number)
+{
+  cCaDefinition *p = First();
+  while (p) {
+        if (p->Number() == Number)
+           return p;
+        p = (cCaDefinition *)p->Next();
+        }
+  return NULL;
+}
+
 // -- cSetup -----------------------------------------------------------------
 
 cSetup Setup;
@@ -921,10 +954,46 @@ cSetup::cSetup(void)
   MinUserInactivity = 120;
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
+  memset(CaCaps, sizeof(CaCaps), 0);
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
 }
 
+void cSetup::PrintCaCaps(FILE *f, const char *Name)
+{
+  for (int d = 0; d < MAXDVBAPI; d++) {
+      if (CaCaps[d][0]) {
+         fprintf(f, "CaCaps             = %d", d + 1);
+         for (int i = 0; i < MAXCACAPS && CaCaps[d][i]; i++)
+             fprintf(f, " %d", CaCaps[d][i]);
+         fprintf(f, "\n");
+         }
+      }
+}
+
+bool cSetup::ParseCaCaps(const char *Value)
+{
+  char *p;
+  int d = strtol(Value, &p, 10);
+  if (d > 0 && d < MAXDVBAPI) {
+     d--;
+     int i = 0;
+     while (p != Value && p && *p) {
+           if (i < MAXCACAPS) {
+              int c = strtol(p, &p, 10);
+              if (c > 0)
+                 CaCaps[d][i++] = c;
+              else
+                 return false;
+              }
+           else
+              return false;
+           }
+     return true;
+     }
+  return false;
+}
+
 bool cSetup::Parse(char *s)
 {
   char *p = strchr(s, '=');
@@ -967,6 +1036,7 @@ bool cSetup::Parse(char *s)
         else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
         else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
         else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
+        else if (!strcasecmp(Name, "CaCaps"))              return ParseCaCaps(Value);
         else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
         else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
         else
@@ -1047,6 +1117,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MinUserInactivity  = %d\n", MinUserInactivity);
         fprintf(f, "MultiSpeedMode     = %d\n", MultiSpeedMode);
         fprintf(f, "ShowReplayMode     = %d\n", ShowReplayMode);
+        PrintCaCaps(f, "CaCaps");
         fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
         fprintf(f, "CurrentVolume      = %d\n", CurrentVolume);
         if (f.Close()) {
diff --git a/config.h b/config.h
index b5860d18b..f5e834351 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.100 2002/02/25 16:29:09 kls Exp $
+ * $Id: config.h 1.102 2002/03/03 16:04:43 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0pre2"
+#define VDRVERSION "1.0.0pre3"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -195,6 +195,18 @@ class cSVDRPhost : public cListObject {
   bool Accepts(in_addr_t Address);
   };
 
+class cCaDefinition : public cListObject {
+private:
+  int number;
+  char *description;
+public:
+  cCaDefinition(void);
+  ~cCaDefinition();
+  bool Parse(const char *s);
+  int Number(void) const { return number; }
+  const char *Description(void) const { return description; }
+  };
+
 template<class T> class cConfig : public cList<T> {
 private:
   char *fileName;
@@ -297,15 +309,23 @@ class cSVDRPhosts : public cConfig<cSVDRPhost> {
   bool Acceptable(in_addr_t Address);
   };
 
+class cCaDefinitions : public cConfig<cCaDefinition> {
+public:
+  const cCaDefinition *Get(int Number);
+  };
+
 extern cChannels Channels;
 extern cTimers Timers;
 extern cKeys Keys;
 extern cCommands Commands;
 extern cSVDRPhosts SVDRPhosts;
+extern cCaDefinitions CaDefinitions;
 
 class cSetup {
 private:
   static char *fileName;
+  void PrintCaCaps(FILE *f, const char *Name);
+  bool ParseCaCaps(const char *Value);
   bool Parse(char *s);
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
@@ -339,6 +359,7 @@ class cSetup {
   int MinEventTimeout, MinUserInactivity;
   int MultiSpeedMode;
   int ShowReplayMode;
+  int CaCaps[MAXDVBAPI][MAXCACAPS];
   int CurrentChannel;
   int CurrentVolume;
   cSetup(void);
diff --git a/dvbapi.c b/dvbapi.c
index 55bc5731d..2f1ca1453 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.152 2002/02/24 12:53:51 kls Exp $
+ * $Id: dvbapi.c 1.154 2002/03/03 15:43:24 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -1684,9 +1684,10 @@ cDvbApi::cDvbApi(int n)
   replayBuffer = NULL;
   transferBuffer = NULL;
   transferringFromDvbApi = NULL;
-  ca = 0;
+  ca = -1;
   priority = -1;
   cardIndex = n;
+  SetCaCaps();
 
   // Devices that are only present on DVB-C or DVB-S cards:
 
@@ -1783,37 +1784,93 @@ bool cDvbApi::SetPrimaryDvbApi(int n)
   return false;
 }
 
+int cDvbApi::CanShift(int Ca, int Priority)
+{
+  // Test whether a recording on this DVB device can be shifted to another one
+  // in order to perform a new recording with the given Ca and Priority on this device:
+  int ShiftLevel = -1; // default means this device can't be shifted
+  if (Recording()) {
+     if (ProvidesCa(Ca) // this device provides the requested Ca
+        && (Ca != this->Ca() // the requested Ca is different from the one currently used...
+           || Priority > this->Priority())) { // ...or the request comes from a higher priority
+        cDvbApi *d = NULL;
+        int Provides[MAXDVBAPI];
+        for (int i = 0; i < NumDvbApis; i++) {
+            if ((Provides[i] = dvbApi[i]->ProvidesCa(this->Ca())) != 0) { // this device is basicly able to do the job
+               if (dvbApi[i] != this) { // it is not _this_ device
+                  int sl = dvbApi[i]->CanShift(this->Ca(), Priority); // this is the original Priority!
+                  if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
+                     d = dvbApi[i];
+                     ShiftLevel = sl;
+                     }
+                  }
+               }
+            }
+        if (ShiftLevel >= 0)
+           ShiftLevel++; // adds the device's own shift
+        }
+     }
+  else if (Priority > this->Priority())
+     ShiftLevel = 0; // no shifting necessary, this device can do the job
+  return ShiftLevel;
+}
+
 cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
 {
-  cDvbApi *d = NULL, *dMinPriority = NULL;
-  int index = Ca - 1;
-  for (int i = 0; i < MAXDVBAPI; i++) {
-      if (dvbApi[i]) {
-         if (dvbApi[i]->CardIndex() == index) { // means we need exactly _this_ device
+  cDvbApi *d = NULL;
+  int Provides[MAXDVBAPI];
+  // Check which devices provide Ca:
+  for (int i = 0; i < NumDvbApis; i++) {
+      if ((Provides[i] = dvbApi[i]->ProvidesCa(Ca)) != 0) { // this device is basicly able to do the job
+         if (Priority > dvbApi[i]->Priority() // Priority is high enough to use this device
+            && (!d // we don't have a device yet, or...
+               || dvbApi[i]->Priority() < d->Priority() // ...this one has an even lower Priority
+               || (dvbApi[i]->Priority() == d->Priority() // ...same Priority...
+                  && Provides[i] < Provides[d->CardIndex()]))) // ...but this one provides fewer Ca values
             d = dvbApi[i];
-            break;
-            }
-         else if (Ca == 0) { // means any device would be acceptable
-            if (!d || !dvbApi[i]->Recording() || (d->Recording() && d->Priority() > dvbApi[i]->Priority()))
-               d = dvbApi[i]; // this is one that is either not currently recording or has the lowest priority
-            if (d && d != PrimaryDvbApi && !d->Recording()) // avoids the PrimaryDvbApi if possible
-               break;
-            if (d && d->Recording() && d->Priority() < Setup.PrimaryLimit && (!dMinPriority || d->Priority() < dMinPriority->Priority()))
-               dMinPriority = d; // this is the one with the lowest priority below Setup.PrimaryLimit
-            }
          }
       }
-  if (d == PrimaryDvbApi) { // the PrimaryDvbApi was the only one that was free
-     if (Priority < Setup.PrimaryLimit)
-        return NULL;        // not enough priority to use the PrimaryDvbApi
-     if (dMinPriority)      // there's one that must not use the PrimaryDvbApi...
-        d = dMinPriority;   // ...so let's kick out that one
+  if (!d && Ca > MAXDVBAPI) {
+     // We didn't find one the easy way, so now we have to try harder:
+     int ShiftLevel = -1;
+     for (int i = 0; i < NumDvbApis; i++) {
+         if (Provides[i]) { // this device is basicly able to do the job, but for some reason we didn't get it above
+            int sl = dvbApi[i]->CanShift(Ca, Priority); // asks this device to shift its job to another device
+            if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
+               d = dvbApi[i]; // found one that can be shifted with the fewest number of subsequent shifts
+               ShiftLevel = sl;
+               }
+            }
+         }
      }
-  return (d                           // we found one...
-      && (!d->Recording()             // ...that's either not currently recording...
-          || d->Priority() < Priority // ...or has a lower priority...
-          || (!d->Ca() && Ca)))       // ...or doesn't need this card
-          ? d : NULL;
+  return d;
+}
+
+void cDvbApi::SetCaCaps(void)
+{
+  for (int i = 0; i < MAXCACAPS; i++)
+      caCaps[i] = Setup.CaCaps[CardIndex()][i];
+}
+
+int cDvbApi::ProvidesCa(int Ca)
+{
+  if (Ca == CardIndex() + 1)
+     return 1; // exactly _this_ card was requested
+  if (Ca && Ca <= MAXDVBAPI)
+     return 0; // a specific card was requested, but not _this_ one
+  int result = Ca ? 0 : 1; // by default every card can provide FTA
+  int others = Ca ? 1 : 0;
+  for (int i = 0; i < MAXCACAPS; i++) {
+      if (caCaps[i]) {
+         if (caCaps[i] == Ca)
+            result = 1;
+         else
+            others++;
+         }
+      else
+         break;
+      }
+  return result ? result + others : 0;
 }
 
 bool cDvbApi::Probe(const char *FileName)
@@ -1854,7 +1911,7 @@ bool cDvbApi::Init(void)
 
 void cDvbApi::Cleanup(void)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < NumDvbApis; i++) {
       delete dvbApi[i];
       dvbApi[i] = NULL;
       }
@@ -2148,6 +2205,11 @@ void cDvbApi::Flush(void)
 #endif
 }
 
+int cDvbApi::Priority(void)
+{
+  return (this == PrimaryDvbApi && !Recording()) ? Setup.PrimaryLimit - 1 : priority;
+}
+
 int cDvbApi::SetModeRecord(void)
 {
   // Sets up the DVB device for recording
@@ -2238,9 +2300,6 @@ bool cDvbApi::SetPids(bool ForRecording)
 
 eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
 {
-  // Make sure the siProcessor won't access the device while switching
-  cThreadLock ThreadLock(siProcessor);
-
   StopTransfer();
   StopReplay();
 
@@ -2265,7 +2324,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Pol
   // If this card can't receive this channel, we must not actually switch
   // the channel here, because that would irritate the driver when we
   // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (this == PrimaryDvbApi && Ca && Ca != CardIndex() + 1);
+  bool NeedsTransferMode = (this == PrimaryDvbApi && !ProvidesCa(Ca));
 
   if (!NeedsTransferMode) {
 
@@ -2507,7 +2566,7 @@ void cDvbApi::StopRecord(void)
   if (recordBuffer) {
      delete recordBuffer;
      recordBuffer = NULL;
-     ca = 0;
+     ca = -1;
      priority = -1;
      }
 }
@@ -2706,7 +2765,7 @@ void cEITScanner::Process(void)
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         for (int i = 0; i < MAXDVBAPI; i++) {
-            cDvbApi *DvbApi = cDvbApi::GetDvbApi(i + 1, MAXPRIORITY);
+            cDvbApi *DvbApi = cDvbApi::GetDvbApi(i + 1, MAXPRIORITY + 1);
             if (DvbApi) {
                if (DvbApi != cDvbApi::PrimaryDvbApi || (cDvbApi::NumDvbApis == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
                   if (!(DvbApi->Recording() || DvbApi->Replaying() || DvbApi->Transferring())) {
diff --git a/dvbapi.h b/dvbapi.h
index 06028f0bd..396b5c217 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.63 2002/02/24 12:38:08 kls Exp $
+ * $Id: dvbapi.h 1.64 2002/03/03 14:51:20 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -94,12 +94,16 @@ class cDvbApi {
 public:
   ~cDvbApi();
 
-#define MAXDVBAPI 4
+#define MAXDVBAPI  4 // the maximum number of DVB cards in the system
+#define MAXCACAPS 16 // the maximum number of different CA values per DVB card
+
   static int NumDvbApis;
 private:
   static cDvbApi *dvbApi[MAXDVBAPI];
   static int useDvbApi;
   int cardIndex;
+  int caCaps[MAXCACAPS];
+  int CanShift(int Ca, int Priority);
 public:
   static cDvbApi *PrimaryDvbApi;
   static void SetUseDvbApi(int n);
@@ -110,9 +114,10 @@ class cDvbApi {
          // Sets the primary DVB device to 'n' (which must be in the range
          // 1...NumDvbApis) and returns true if this was possible.
   static cDvbApi *GetDvbApi(int Ca, int Priority);
-         // Selects a free DVB device, starting with the highest device number
-         // (but avoiding, if possible, the PrimaryDvbApi).
-         // If Ca is not 0, the device with the given number will be returned.
+         // Selects a free DVB device, avoiding the PrimaryDvbApi if possible.
+         // If Ca is not 0, the device with the given number will be returned
+         // in case Ca is <= MAXDVBAPI, or the device that provides the given
+         // value in its caCaps.
          // If all DVB devices are currently recording, the one recording the
          // lowest priority timer (if any) that is lower than the given Priority
          // will be returned.
@@ -120,6 +125,15 @@ class cDvbApi {
          // recording and stop recording if necessary.
   int CardIndex(void) { return cardIndex; }
          // Returns the card index of this DvbApi (0 ... MAXDVBAPI - 1).
+  void SetCaCaps(void);
+         // Sets the CaCaps of this DVB device according to the Setup data.
+  int ProvidesCa(int Ca);
+         // Checks whether this DVB device provides the given value in its
+         // caCaps. Returns 0 if the value is not provided, 1 if only this
+         // value is provided, and > 1 if this and other values are provided.
+         // If the given value is equal to the number of this DVB device,
+         // 1 is returned. If it is 0 (FTA), 1 plus the number of other values
+         // in caCaps is returned.
   static bool Probe(const char *FileName);
          // Probes for existing DVB devices.
   static bool Init(void);
@@ -204,16 +218,17 @@ class cDvbApi {
   cPlayBuffer *replayBuffer;
   int ca;
   int priority;
-  int  Priority(void) { return priority; }
+  int  Priority(void);
        // Returns the priority of the current recording session (0..MAXPRIORITY),
-       // or -1 if no recording is currently active.
+       // or -1 if no recording is currently active. The primary DVB device will
+       // always return at least Setup.PrimaryLimit-1.
   int  SetModeRecord(void);
        // Initiates recording mode and returns the file handle to read from.
   void SetModeReplay(void);
   void SetModeNormal(bool FromRecording);
 public:
   int  Ca(void) { return ca; }
-       // Returns the ca of the current recording session (0..MAXDVBAPI).
+       // Returns the ca of the current recording session.
   int  SecondsToFrames(int Seconds);
        // Returns the number of frames corresponding to the given number of seconds.
   bool Recording(void);
diff --git a/eit.c b/eit.c
index 8f4c03724..9985fbbd8 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.38 2002/02/25 16:30:42 kls Exp $
+ * $Id: eit.c 1.39 2002/03/01 16:32:11 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1047,8 +1047,6 @@ const char *cSIProcessor::GetEpgDataFileName(void)
 
 void cSIProcessor::SetStatus(bool On)
 {
-   LOCK_THREAD;
-   schedulesMutex.Lock();
    ShutDownFilters();
    if (On)
    {
@@ -1061,7 +1059,6 @@ void cSIProcessor::SetStatus(bool On)
       AddFilter(0x12, 0x51);  // event info, actual TS, schedule for another 4 days
       AddFilter(0x12, 0x61);  // event info, other TS, schedule for another 4 days
    }
-   schedulesMutex.Unlock();
 }
 
 /** use the vbi device to parse all relevant SI
@@ -1085,20 +1082,15 @@ void cSIProcessor::Action()
          struct tm *ptm = localtime_r(&now, &tm_r);
          if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
          {
-            LOCK_THREAD;
-
-            schedulesMutex.Lock();
+            cMutexLock MutexLock(&schedulesMutex);
             isyslog(LOG_INFO, "cleaning up schedules data");
             schedules->Cleanup();
-            schedulesMutex.Unlock();
             lastCleanup = now;
             ReportEpgBugFixStats(true);
          }
          if (epgDataFileName && now - lastDump > 600)
          {
-            LOCK_THREAD;
-
-            schedulesMutex.Lock();
+            cMutexLock MutexLock(&schedulesMutex);
             FILE *f = fopen(GetEpgDataFileName(), "w");
             if (f) {
                schedules->Dump(f);
@@ -1107,7 +1099,6 @@ void cSIProcessor::Action()
             else
                LOG_ERROR;
             lastDump = now;
-            schedulesMutex.Unlock();
          }
       }
 
@@ -1162,12 +1153,9 @@ void cSIProcessor::Action()
                         case 0x12:
                            if (buf[0] != 0x72)
                            {
-                              LOCK_THREAD;
-
-                              schedulesMutex.Lock();
+                              cMutexLock MutexLock(&schedulesMutex);
                               cEIT ceit(buf, seclen, schedules);
                               ceit.ProcessEIT(buf);
-                              schedulesMutex.Unlock();
                            }
                            else
                               dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
@@ -1261,6 +1249,6 @@ bool cSIProcessor::ShutDownFilters(void)
 /** */
 bool cSIProcessor::SetCurrentServiceID(unsigned short servid)
 {
-  LOCK_THREAD;
+  cMutexLock MutexLock(&schedulesMutex);
   return schedules ? schedules->SetCurrentServiceID(servid) : false;
 }
diff --git a/epg2html.pl b/epg2html.pl
index 215eb7356..cdeb63841 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.2 2000/12/01 18:37:46 kls Exp $
+# $Id: epg2html.pl 1.3 2002/02/26 22:10:47 kls Exp $
 
 @Index = ();
 
@@ -45,7 +45,7 @@ sub Tags
          push(@Index, qq{<a href="$Page">$Channel</a><br>\n});
          my %Events = ();
          while (<>) {
-               if (/^E (.*) (.*) (.*)/) {
+               if (/^E (.*?) (.*?) (.*?)/) {
                   (my $Time, $Duration) = ($2, $3);
                   my $Title = "", $Subtitle = "", $Description = "";
                   while (<>) {
diff --git a/i18n.c b/i18n.c
index 083971573..2b52c68e4 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.57 2002/02/24 12:54:12 kls Exp $
+ * $Id: i18n.c 1.59 2002/03/03 16:38:57 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -257,7 +257,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Marche/Arr",
     "", // TODO
     "", // TODO
   },
@@ -317,7 +317,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Ouvrir",
     "", // TODO
     "Avaa",
   },
@@ -418,7 +418,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Enregistrement en cours - confirmez la suppression",
     "", // TODO
     "", // TODO
   },
@@ -438,7 +438,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "sur la carte principale",
     "", // TODO
     "p��vastaanottimella",
   },
@@ -458,7 +458,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Enregistrement en cours - confirmez l'arr�t",
     "", // TODO
     "Nauhoitus kesken - lopetetaanko se?",
   },
@@ -468,7 +468,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Enregistrement dans %d minutes - confirmez l'arr�t", // TODO
     "", // TODO
     "", // TODO
   },
@@ -478,7 +478,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Appuyez sur une touche pour annuler l'arr�t",
     "", // TODO
     "Peruuta pys�ytys painamalla jotakin n�pp�int�",
   },
@@ -700,7 +700,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Premier jour",
     "", // TODO
     "", // TODO
   },
@@ -741,7 +741,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Impossible d'acc�der � l'enregistrement",
     "", // TODO
     "Nauhoituksen toistaminen ep�onnistui!",
   },
@@ -791,7 +791,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Impossible d'utiliser le mode transfert!",
     "", // TODO
     "K�sitt�m�tt�mi� teknisi� ongelmia!",
   },
@@ -821,7 +821,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Arr�t impossible - option '-s' absente!",
     "", // TODO
     "Ei voida sammuttaa '-s' parametria ei annettu!",
   },
@@ -831,7 +831,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Disque presque plein!",
     "", // TODO
     "Kovalevy l�hes t�ynn�!",
   },
@@ -892,7 +892,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Noms enregistr. imm�diats",
     "", // TODO
     "Nime� v�lit�n nauh.",
   },
@@ -982,7 +982,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Niveau de correction EPG",
     "", // TODO
     "EPGBugfixLevel",
   },
@@ -1002,7 +1002,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Trier les programmations",
     "", // TODO
     "J�rjest� ajastimet",
   },
@@ -1042,7 +1042,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Utiliser les sous-titres",
     "", // TODO
     "Tekstitys k�yt�ss�",
   },
@@ -1052,7 +1052,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Dossiers d'enregistrements",
     "", // TODO
     "Nauhoitushakemistot",
   },
@@ -1072,7 +1072,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Enregistrer en Dolby Digital", 
     "", // TODO
     "", // TODO
   },
@@ -1112,7 +1112,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Dur�e affichage �cran",
     "", // TODO
     "Ilmoitusten n�kymisaika",
   },
@@ -1122,7 +1122,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Taille maxi des fichiers",
     "", // TODO
     "Maksimi tiedoston koko",
   },
@@ -1132,7 +1132,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "S�parer les s�quences",
     "", // TODO
     "Paloittele muokatut",
   },
@@ -1141,8 +1141,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
-    "", // TODO
+        "", // TODO
+    "MinEventTimeout", // Too difficult to translate - read the manual!
     "", // TODO
     "Minimi tapahtuman odotus",
   },
@@ -1152,7 +1152,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Dur�e minimale d'inactivit�",
     "", // TODO
     "Minimi k�ytt�j�n odotus",
   },
@@ -1162,7 +1162,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Mode multi-vitesses",
     "", // TODO
     "Moninopeustila",
   },
@@ -1172,7 +1172,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Affichage mode de lecture",
     "", // TODO
     "N�yt� toiston tila",
   },
@@ -1193,7 +1193,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "LunMarMerJeuVenSamDim",
     "", // TODO
     "MaaTiiKesTorPerLauSun",
   },
@@ -1445,7 +1445,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Arr�t",
     "", // TODO
     "Virtakytkin",
   },
@@ -1455,7 +1455,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Volume+",
     "", // TODO
     "��nenvoimakkuus+",
   },
@@ -1465,7 +1465,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Volume-",
     "", // TODO
     "��nenvoimakkuus-",
   },
@@ -1475,7 +1475,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Coupure du son",
     "", // TODO
     "��nen vaimennus",
   },
@@ -1526,7 +1526,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "restant",
     "", // TODO
     "vapaa",
   },
@@ -1536,9 +1536,9 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
+    "Acc�s direct: ",
     "", // TODO
-    "", // TODO
-    "Hypp��",
+    "Hypp��:",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -1606,7 +1606,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Montage termin�",
     "", // TODO
     "Muokkaus lopetettu",
   },
@@ -1616,7 +1616,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Echec du montage",
     "", // TODO
     "Muokkaus ep�onnistui",
   },
@@ -1626,7 +1626,7 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Recherche des enregistrements...",
     "", // TODO
     "haetaan nauhoituksia...",
   },
diff --git a/menu.c b/menu.c
index 28e5d4d86..b1e7e49e3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.159 2002/02/24 12:55:49 kls Exp $
+ * $Id: menu.c 1.160 2002/03/03 16:12:29 kls Exp $
  */
 
 #include "menu.h"
@@ -585,6 +585,60 @@ void cMenuEditStraItem::Set(void)
   SetValue(strings[*value]);
 }
 
+// --- cMenuEditCaItem -------------------------------------------------------
+
+class cMenuEditCaItem : public cMenuEditIntItem {
+private:
+  const cCaDefinition *ca;
+  bool allowCardNr;
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditCaItem(const char *Name, int *Value, bool AllowCardNr = false);
+  eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditCaItem::cMenuEditCaItem(const char *Name, int *Value, bool AllowCardNr)
+:cMenuEditIntItem(Name, Value, 0)
+{
+  ca = CaDefinitions.Get(*Value);
+  allowCardNr = AllowCardNr;
+  Set();
+}
+
+void cMenuEditCaItem::Set(void)
+{
+  if (ca)
+     SetValue(ca->Description());
+  else
+     cMenuEditIntItem::Set();
+}
+
+eOSState cMenuEditCaItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (ca && ca->Prev()) {
+           ca = (cCaDefinition *)ca->Prev();
+           *value = ca->Number();
+           }
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (ca && ca->Next() && (allowCardNr || ((cCaDefinition *)ca->Next())->Number() > MAXDVBAPI)) {
+           ca = (cCaDefinition *)ca->Next();
+           *value = ca->Number();
+           }
+        }
+     else
+        return cMenuEditIntItem::ProcessKey(Key);
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuEditChannel ------------------------------------------------------
 
 class cMenuEditChannel : public cOsdMenu {
@@ -613,7 +667,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
      Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0x1FFF));
      Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
-     Add(new cMenuEditIntItem( tr("CA"),           &data.ca, 0, cDvbApi::NumDvbApis));
+     Add(new cMenuEditCaItem(  tr("CA"),           &data.ca, true));
      Add(new cMenuEditIntItem( tr("Pnr"),          &data.pnr, 0));
      }
 }
@@ -1880,6 +1934,13 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("MinUserInactivity"),  &data.MinUserInactivity));
   Add(new cMenuEditBoolItem(tr("MultiSpeedMode"),     &data.MultiSpeedMode));
   Add(new cMenuEditBoolItem(tr("ShowReplayMode"),     &data.ShowReplayMode));
+  for (int d = 0; d < cDvbApi::NumDvbApis; d++) {
+      for (int i = 0; i < 2; i++) {
+          char buffer[32];
+          snprintf(buffer, sizeof(buffer), "%s%d %d", tr("CICAM DVB"), d + 1, i + 1);
+          Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i]));
+          }
+      }
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
diff --git a/vdr.c b/vdr.c
index 90c1d8433..a246be11c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.97 2002/02/24 12:55:10 kls Exp $
+ * $Id: vdr.c 1.98 2002/03/03 14:56:03 kls Exp $
  */
 
 #include <getopt.h>
@@ -252,6 +252,7 @@ int main(int argc, char *argv[])
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
+  CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
 #if defined(REMOTE_LIRC)
   Keys.SetDummyValues();
 #elif !defined(REMOTE_NONE)

From 217fcb26808f74c9de81b4c653757f75ba13852f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Mar 2002 18:00:00 +0100
Subject: [PATCH 038/307] =?UTF-8?q?Version=201.0.0pre4=20-=20Added=20'Ca'?=
 =?UTF-8?q?=20code=20201=20for=20'Cryptoworks,=20GOD-DIGITAL'=20to=20'ca.c?=
 =?UTF-8?q?onf'=20(thanks=20to=20=20=20Bernd=20Schweikert).=20-=20Fixed=20?=
 =?UTF-8?q?avoiding=20the=20primary=20DVB=20interface=20in=20case=20Setup.?=
 =?UTF-8?q?PrimaryLimit=20is=200.=20-=20Fixed=20handling=20CICAM=20setting?=
 =?UTF-8?q?s=20if=20the=20first=20one=20of=20a=20DVB=20card=20was=20FTA.?=
 =?UTF-8?q?=20-=20Fixed=20reacting=20on=20changes=20in=20CICAM=20settings?=
 =?UTF-8?q?=20(needed=20to=20restart=20VDR=20before).=20-=20The=20"Blue"?=
 =?UTF-8?q?=20button=20in=20the=20"Main"=20menu=20now=20works=20as=20"Stop?=
 =?UTF-8?q?"=20button=20if=20a=20recording=20=20=20is=20currently=20being?=
 =?UTF-8?q?=20replayed.=20-=20New=20command=20line=20option=20'-m'=20to=20?=
 =?UTF-8?q?mute=20audio=20of=20the=20primary=20DVB=20device=20at=20=20=20s?=
 =?UTF-8?q?tartup=20(suggested=20by=20Mirko=20G=FCnther).=20-=20The=20new?=
 =?UTF-8?q?=20SVDRP=20command=20VOLU=20can=20be=20used=20to=20control=20th?=
 =?UTF-8?q?e=20audio=20volume=20(suggested=20=20=20by=20Mirko=20G=FCnther)?=
 =?UTF-8?q?.=20-=20Fixed=20resetting=20'mute'=20state=20when=20setting=20t?=
 =?UTF-8?q?he=20volume=20to=20a=20non-zero=20value.=20-=20Added=20log=20me?=
 =?UTF-8?q?ssages=20when=20deleting=20recordings=20in=20case=20the=20disk?=
 =?UTF-8?q?=20runs=20full=20while=20=20=20recording.=20-=20Fixed=20closing?=
 =?UTF-8?q?=20a=20pipe=20(used=20for=20replaying=20Dolby=20Digital=20audio?=
 =?UTF-8?q?),=20which=20=20=20sometimes=20left=20'zombie'=20processes=20be?=
 =?UTF-8?q?hind=20(thanks=20to=20Werner=20Fink=20for=20helping=20=20=20to?=
 =?UTF-8?q?=20debug=20this=20one).=20-=20Now=20starting=20the=20Dolby=20Di?=
 =?UTF-8?q?gital=20output=20thread=20only=20if=20the=20recording=20actuall?=
 =?UTF-8?q?y=20=20=20contains=20Dolby=20Digital=20audio=20data=20(thanks?=
 =?UTF-8?q?=20to=20Werner=20Fink).=20-=20Implemented=20OSD=20for=20Volume?=
 =?UTF-8?q?=20and=20Mute=20(works=20only=20if=20there=20is=20no=20other=20?=
 =?UTF-8?q?OSD=20=20=20activity,=20but=20this=20should=20be=20no=20problem?=
 =?UTF-8?q?=20for=20normal=20use).=20-=20Changed=20the=20MANUAL=20descript?=
 =?UTF-8?q?ion=20of=20the=20"Conditional=20Access"=20setup=20parameters=20?=
 =?UTF-8?q?=20=20to=20reflect=20the=20actual=20"CICAM=20DVBn=20m"=20notati?=
 =?UTF-8?q?on=20in=20the=20"Setup"=20menu.=20-=20The=20new=20Setup=20param?=
 =?UTF-8?q?eter=20"Use=20time=20from=20transponder"=20can=20be=20used=20to?=
 =?UTF-8?q?=20define=20which=20=20=20transponder=20shall=20be=20used=20to?=
 =?UTF-8?q?=20set=20the=20system=20time=20(see=20MANUAL=20for=20details).?=
 =?UTF-8?q?=20=20=20If=20you=20have=20been=20using=20the=20SetSystemTime?=
 =?UTF-8?q?=20option=20previously,=20you=20now=20MUST=20=20=20select=20a?=
 =?UTF-8?q?=20channel=20that=20you=20trust=20to=20have=20a=20reliable=20ti?=
 =?UTF-8?q?me=20base.=20-=20Grouped=20the=20Setup=20parameters=20into=20se?=
 =?UTF-8?q?veral=20sub-menus,=20so=20that=20each=20group=20of=20=20=20para?=
 =?UTF-8?q?meters=20fits=20on=20a=20single=20screen=20-=20unless=20the=20h?=
 =?UTF-8?q?eight=20of=20the=20OSD=20has=20been=20=20=20set=20to=20a=20smal?=
 =?UTF-8?q?l=20value=20(based=20on=20code=20from=20Markus=20Lang).=20-=20C?=
 =?UTF-8?q?hanged=20the=20title=20of=20the=20"Main"=20menu=20to=20"VDR".?=
 =?UTF-8?q?=20-=20Fixed=20displaying=20a=20system=20message=20while=20the?=
 =?UTF-8?q?=20replay=20mode=20is=20being=20shown.=20-=20Physically=20remov?=
 =?UTF-8?q?ing=20a=20deleted=20recording=20if=20one=20with=20the=20same=20?=
 =?UTF-8?q?name=20shall=20be=20=20=20deleted=20again.=20-=20The=20"Left"?=
 =?UTF-8?q?=20and=20"Right"=20keys=20are=20now=20used=20to=20page=20up=20a?=
 =?UTF-8?q?nd=20down=20in=20text=20displays=20=20=20(like=20the=20EPG=20de?=
 =?UTF-8?q?scriptions=20or=20the=20results=20of=20commands=20executed=20fr?=
 =?UTF-8?q?om=20the=20=20=20"Commands"=20menu).=20-=20Fixed=20high=20CPU?=
 =?UTF-8?q?=20usage=20in=20transfer=20mode.=20-=20Replaced=20'killproc'=20?=
 =?UTF-8?q?with=20'killall'=20in=20'runvdr',=20since=20apparently=20'killp?=
 =?UTF-8?q?roc'=20=20=20is=20not=20available=20by=20default=20on=20some=20?=
 =?UTF-8?q?Linux=20distributions,=20whereas=20'killall'=20is.=20=20=20Plea?=
 =?UTF-8?q?se=20check=20if=20your=20system=20provides=20'killall'=20-=20if?=
 =?UTF-8?q?=20it=20doesn't,=20please=20change=20=20=20this=20back=20in=20'?=
 =?UTF-8?q?runvdr'=20and=20report=20this=20(thanks=20to=20Achim=20Lange).?=
 =?UTF-8?q?=20-=20The=20"Commands"=20menu=20now=20automatically=20assigns?=
 =?UTF-8?q?=20number=20keys=20as=20hotkeys=20to=20the=20=20=20commands.=20?=
 =?UTF-8?q?If=20you=20have=20preceeded=20your=20commands=20with=20digits?=
 =?UTF-8?q?=20you=20may=20want=20to=20=20=20remove=20these=20from=20your?=
 =?UTF-8?q?=20'commands.conf'=20file.=20-=20The=20new=20Setup=20item=20"Re?=
 =?UTF-8?q?start"=20can=20be=20used=20to=20force=20a=20complete=20restart?=
 =?UTF-8?q?=20of=20VDR,=20=20=20including=20reloading=20the=20driver.=20No?=
 =?UTF-8?q?te=20that=20this=20can=20only=20work=20if=20VDR=20and=20the=20?=
 =?UTF-8?q?=20=20driver=20are=20wrapped=20into=20a=20mechanism=20that=20ac?=
 =?UTF-8?q?tually=20performs=20this=20action=20if=20VDR=20=20=20exits.=20T?=
 =?UTF-8?q?he=20'runvdr'=20script=20can=20be=20used=20for=20this=20purpose?=
 =?UTF-8?q?.=20-=20Refined=20texts=20of=20the=20"Setup"=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |  18 +-
 COPYING      | 340 +++++++++++++++++++++++++++++++
 FORMATS      |  12 +-
 HISTORY      |  61 +++++-
 MANUAL       | 313 ++++++++++++++++-------------
 ca.conf      |   4 +
 config.c     |  21 +-
 config.h     |   7 +-
 dvbapi.c     |  52 +++--
 dvbapi.h     |  16 +-
 eit.c        |  19 +-
 eit.h        |   6 +-
 i18n.c       | 558 +++++++++++++++++++++++++++++++++------------------
 menu.c       | 532 +++++++++++++++++++++++++++++++++++++++---------
 menu.h       |  19 +-
 osd.c        |  19 +-
 osd.h        |  16 +-
 recording.c  |  12 +-
 runvdr       |   6 +-
 svdrp.c      |  33 ++-
 svdrp.h      |   3 +-
 thread.c     |  19 +-
 vdr.c        |  28 ++-
 23 files changed, 1589 insertions(+), 525 deletions(-)
 create mode 100644 COPYING

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ed63a4bb1..3adfbd961 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -91,9 +91,12 @@ Henning Holtschneider <hh@holtschneider.com>
 Paulo Manuel Martins Lopes <pmml@netvita.pt>
  for translating the OSD texts to the Portugese language
 
-Markus Lang <markus.lang@nissan-db.de> and Ulrich R�der <dynamite@efr-net.de>
+Markus Lang <pretender@gaze.de> and Ulrich R�der <dynamite@efr-net.de>
  for making DiSEqC support configurable
 
+Markus Lang <pretender@gaze.de>
+ for some initial code for grouping the Setup menu into several sub-menus
+
 Jean-Claude Repetto <jc@repetto.org>
  for translating the OSD texts to the French language
 
@@ -146,6 +149,9 @@ Artur Skawina <skawina@geocities.com>
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
  for fixing closing all unused file descriptors when opening a pipe
+ for helping to debug leftover 'zombie' processes when closing a pipe
+ for making the Dolby Digital thread start only if the recording actually
+ contains Dolby Digital data
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -217,3 +223,13 @@ Oleg Assovski <assen@bitcom.msk.ru>
 
 Adrian Stabiszewski <as@nitegate.de>
  for fixing the SVDRP GRAB command in case the video device can't be opened
+
+Bernd Schweikert <bernd.schweikert@dit-gmbh.de>
+ for adding 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf'
+
+Mirko G�nther <mi.guenther@ib-helms.de>
+ for suggesting the -m command line option
+ for suggesting the SVDRP command VOLU
+
+Achim Lange <Achim_Lange@t-online.de>
+ for replacing 'killproc' with 'killall' in 'runvdr' to make it work on Debian
diff --git a/COPYING b/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/FORMATS b/FORMATS
index 91903384e..63ae7e1dd 100644
--- a/FORMATS
+++ b/FORMATS
@@ -117,7 +117,7 @@ Video Disk Recorder File Formats
 * commands.conf
 
   This file contains the definitions of commands that can be executed from
-  the "Main" menus "Commands" option.
+  the "VDR" menu's "Commands" option.
 
   Each line contains one command definition in the following format:
 
@@ -134,13 +134,9 @@ Video Disk Recorder File Formats
 
   Examples:
 
-   1 Check for new mail: /usr/local/bin/checkmail 2>&1
-   2 CPU status        : /usr/local/bin/cpustatus 2>&1
-   3 Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
-
-  If the first non-blank character of the 'title' is a digit in the range
-  1..9, the command can be selected directly by pressing the respective numerical
-  key on the remote control.
+   Check for new mail: /usr/local/bin/checkmail 2>&1
+   CPU status        : /usr/local/bin/cpustatus 2>&1
+   Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
 
 * svdrphosts.conf
 
diff --git a/HISTORY b/HISTORY
index 84c1460e1..708f6d9da 100644
--- a/HISTORY
+++ b/HISTORY
@@ -41,14 +41,14 @@ Video Disk Recorder Revision History
   of the channel, with a prepended '@' character.
 - Timers that are not given an explicit Name now use the channel name with
   a prepended '@' character.
-- If an instant recording is currently active, the Main menu now contains
+- If an instant recording is currently active, the "Main" menu now contains
   an option to stop that recording.
 - Timers are now only processed when the Menu is not active. So after editing
   a timer the effect will take place only after the menu has been closed.
   In order to avoid missing a timer event by inadvertently leaving the menu
   open, the menu will be closed automatically after about two minutes of
   inactivity.
-- If a recording is currently being replayed, the Main menu now contains an
+- If a recording is currently being replayed, the "Main" menu now contains an
   option to stop replaying.
 - Displaying the recording DVB interface status in the decimal points of the
   RCU display.
@@ -424,7 +424,7 @@ Video Disk Recorder Revision History
 - Fixed a memory leak in the EIT processor that happened when the system time
   was set.
 - Removed some redundant code from the cListBase destructor.
-- Fixed internationalization of some Main menu texts.
+- Fixed internationalization of some "Main" menu texts.
 - Updated 'channels.conf' after the recent changes of Premiere World (thanks
   to Axel Gruber).
 - Redesigned the ring buffer to make it work with two separate threads for
@@ -480,7 +480,7 @@ Video Disk Recorder Revision History
   items the amount of visible information remained the same as before, though.
   If your DVB card has even less memory (which would result in only the
   channel switching display and the replay progress display being visible, but
-  no Main menu), try reducing the constant 'MenuLines' in dvbapi.h (currently
+  no "Main" menu), try reducing the constant 'MenuLines' in dvbapi.h (currently
   '13') even further.
 - There are two new setup parameters to define the "Default Priority" and
   "Default Lifetime" when creating a new timer event.
@@ -1066,3 +1066,56 @@ Video Disk Recorder Revision History
   modes (besides the default "Free To Air" mode, which is always assumed to be
   available on any DVB card).
 - Updated French language texts (thanks to Jean-Claude Repetto).
+
+2002-03-17: Version 1.0.0pre4
+
+- Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
+  Bernd Schweikert).
+- Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0.
+- Fixed handling CICAM settings if the first one of a DVB card was FTA.
+- Fixed reacting on changes in CICAM settings (needed to restart VDR before).
+- The "Blue" button in the "Main" menu now works as "Stop" button if a recording
+  is currently being replayed.
+- New command line option '-m' to mute audio of the primary DVB device at
+  startup (suggested by Mirko G�nther).
+- The new SVDRP command VOLU can be used to control the audio volume (suggested
+  by Mirko G�nther).
+- Fixed resetting 'mute' state when setting the volume to a non-zero value.
+- Added log messages when deleting recordings in case the disk runs full while
+  recording.
+- Fixed closing a pipe (used for replaying Dolby Digital audio), which
+  sometimes left 'zombie' processes behind (thanks to Werner Fink for helping
+  to debug this one).
+- Now starting the Dolby Digital output thread only if the recording actually
+  contains Dolby Digital audio data (thanks to Werner Fink).
+- Implemented OSD for Volume and Mute (works only if there is no other OSD
+  activity, but this should be no problem for normal use).
+- Changed the MANUAL description of the "Conditional Access" setup parameters
+  to reflect the actual "CICAM DVBn m" notation in the "Setup" menu.
+- The new Setup parameter "Use time from transponder" can be used to define which
+  transponder shall be used to set the system time (see MANUAL for details).
+  If you have been using the SetSystemTime option previously, you now MUST
+  select a channel that you trust to have a reliable time base.
+- Grouped the Setup parameters into several sub-menus, so that each group of
+  parameters fits on a single screen - unless the height of the OSD has been
+  set to a small value (based on code from Markus Lang).
+- Changed the title of the "Main" menu to "VDR".
+- Fixed displaying a system message while the replay mode is being shown.
+- Physically removing a deleted recording if one with the same name shall be
+  deleted again.
+- The "Left" and "Right" keys are now used to page up and down in text displays
+  (like the EPG descriptions or the results of commands executed from the
+  "Commands" menu).
+- Fixed high CPU usage in transfer mode.
+- Replaced 'killproc' with 'killall' in 'runvdr', since apparently 'killproc'
+  is not available by default on some Linux distributions, whereas 'killall' is.
+  Please check if your system provides 'killall' - if it doesn't, please change
+  this back in 'runvdr' and report this (thanks to Achim Lange).
+- The "Commands" menu now automatically assigns number keys as hotkeys to the
+  commands. If you have preceeded your commands with digits you may want to
+  remove these from your 'commands.conf' file.
+- The new Setup item "Restart" can be used to force a complete restart of VDR,
+  including reloading the driver. Note that this can only work if VDR and the
+  driver are wrapped into a mechanism that actually performs this action if VDR
+  exits. The 'runvdr' script can be used for this purpose.
+- Refined texts of the "Setup" menu.
diff --git a/MANUAL b/MANUAL
index c4cda08a5..b94050512 100644
--- a/MANUAL
+++ b/MANUAL
@@ -8,20 +8,20 @@ Video Disk Recorder User's Manual
   possible, several keys have different meanings in the various
   modes:
 
-  Key     Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
-
-  Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
-  Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
-  Left    Prev group  -          Page up    Page up    Decrement     Page up     Search back
-  Right   Next group  -          Page down  Page down  Increment     Page down   Search forward
-  Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
-  Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
-  Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
-  Red     -           Record     Edit       Edit       -             Play        Jump
-  Green   -           Language   New        New        -             Rewind      Skip -60s
-  Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
-  Blue    -           Resume     Mark       On/Off(1)  -             Summary     Stop
-  0..9    Ch select   -          -          -          Numeric inp.  -           Editing
+  Key     Normal      VDR          Channels   Timers     Edit/New      Recordings  Replay
+
+  Up      Ch up       Crsr up      Crsr up    Crsr up    Crsr up       Crsr up     Play
+  Down    Ch down     Crsr down    Crsr down  Crsr down  Crsr down     Crsr down   Pause
+  Left    Prev group  -            Page up    Page up    Decrement     Page up     Search back
+  Right   Next group  -            Page down  Page down  Increment     Page down   Search forward
+  Ok      Ch display  Select       Switch     Edit       Accept        Play        Progress disp.
+  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off    Menu on
+  Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu    Recordings menu
+  Red     -           Record       Edit       Edit       -             Play        Jump
+  Green   -           Language     New        New        -             Rewind      Skip -60s
+  Yellow  -           -            Delete     Delete     -             Delete      Skip +60s
+  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary     Stop
+  0..9    Ch select   -            -          -          Numeric inp.  -           Editing
 
   Power   Shutdown
   Volume+ Volume up
@@ -34,7 +34,7 @@ Video Disk Recorder User's Manual
 
 * Navigating through the On Screen Menus
 
-  The "Main" menu can be called up with the "Menu" key of your remote
+  The "VDR" menu can be called up with the "Menu" key of your remote
   control unit. The "Up" and "Down" keys are used to select a specific
   item. The "Left" and "Right" keys can be used to change options, and
   the numeric keys allow direct input of numeric data. The "Ok" key
@@ -74,7 +74,7 @@ Video Disk Recorder User's Manual
 
   The "Schedule" menu implements VDR's "Electronic Program Guide" (EPG).
 
-  Select "Schedule" from the "Main" menu and you get a list of all upcoming
+  Select "Schedule" from the "VDR" menu and you get a list of all upcoming
   broadcasts on the current channel.
 
   "Up" and "Down" can be used to scroll through this list, and pressing "Ok"
@@ -135,7 +135,7 @@ Video Disk Recorder User's Manual
 * Selecting language specific audio track
 
   If the current channel provides different audio tracks (typically for
-  different languages), the "Green" button in the "Main" menu can be pressed
+  different languages), the "Green" button in the "VDR" menu can be pressed
   to toggle between these. There can be two different audio PIDs per channel,
   assuming that typically a channel broadcasts a country specific language
   plus the movie's original soundtrack.
@@ -157,7 +157,7 @@ Video Disk Recorder User's Manual
 * Instant Recording
 
   You can start recording the current channel by pressing the "Red" button
-  in the "Main" menu. This will create a timer event named "@channelname" that
+  in the "VDR" menu. This will create a timer event named "@channelname" that
   starts at the current time and records for two hours.
   If you want to modify the recording time you need to edit the timer.
   Stop instant recording by pressing the "Menu" button and selecting
@@ -176,17 +176,17 @@ Video Disk Recorder User's Manual
   number of new recordings (as opposed to a recording's entry, which displays
   the date and time of the recording).
 
-  If the setup parameter UseSubtitle was turned on when a recording took place,
-  VDR adds the "subtitle" (which is usually the name of the episode in case of
+  If the setup parameter "Use episode name" was turned on when a recording took place,
+  VDR adds the "Episode name" (which is usually the name of the episode in case of
   a series) to the recording's name. The "Recordings" menu then displays all
   recordings of a repeating timer in chronological order, since these are
   usually the individual episodes of a series, which you may want to view in
   the order in which they were broadcast.
 
-  Playback can be stopped via the "Main" menu by selecting "Stop replaying",
+  Playback can be stopped via the "VDR" menu by selecting "Stop replaying",
   or by pressing the "Blue" button outside the menu.
   A previously stopped playback session can be resumed by pressing the "Blue"
-  button in the "Main" menu.
+  button in the "VDR" menu.
 
 * Replay Control
 
@@ -322,10 +322,10 @@ Video Disk Recorder User's Manual
              structure "/video/Sci-Fi/Star_Trek/Voyager". The '~' character has
              been chosen for this since the file system's directory delimiter '/'
              may be part of a regular programme name.
-             Repeating timers create recordings that contain the 'Subtitle'
+             Repeating timers create recordings that contain the 'Episode name'
              information from the EPG data in their file name. Typically (on tv
              stations that care about their viewers) this contains the episode
-             title of a series. The subtitle is appended to the timer's file name,
+             title of a series. The episode name is appended to the timer's file name,
              separated by a '~' character, so that it results in all recordings
              of this timer being collected in a common subdirectory.
              If this field is left blank, the channel name will be used to form
@@ -342,7 +342,7 @@ Video Disk Recorder User's Manual
   the channel or replay another recording on that interface. However, if there
   is an other DVB interface that is currently not recording and provides the
   necessary conditional access facilities to continue the recording that is
-  currently being performed on the primary DVB interface, the Main menu will
+  currently being performed on the primary DVB interface, the "VDR" menu will
   contain an option that allows you to stop recording on the primary DVB
   interface. Select that option to stop the ongoing recording and thus free the
   primary DVB interface to allow channel switching or replaying. The interrupted
@@ -352,87 +352,60 @@ Video Disk Recorder User's Manual
 
 * Parameters in the "Setup" menu
 
-  Select "Setup" from the "Main" menu to enter the setup menu. From there you can
+  Select "Setup" from the "VDR" menu to enter the setup menu. From there you can
   modify the following system parameters (note that "boolean" values will be
   displayed as "no" and "yes" in the "Setup" menu, while in the setup file they
   are stored as '0' and '1', respectively):
 
-  OSDLanguage = 0        Defines the language used to display the OSD texts.
-                         0 = Englisch
-                         1 = Deutsch
-                         2 = Slovenian
-                         3 = Italian
-                         4 = Dutch
-                         5 = Portugese
-                         6 = French
-                         7 = Norwegian
-
-  PrimaryDVB = 1         Defines the primary DVB interface (i.e. the one that
-                         will display the menus and will react on input through
-                         the remote control). Valid values range from '1' to the
-                         number of installed DVB cards. If more than one DVB card
-                         is installed and a recording is to be started, the
-                         program will try to use a free DVB card that is different
-                         from the primary DVB interface, so that the viewer will
-                         be disturbed as little as possible.
+  OSD:
 
-  ShowInfoOnChSwitch = 1 Turns the display of the current/next information on
-                         or off when switching the channel. The information is
-                         always displayed when pressing the "Ok" button in
-                         normal viewing mode.
+  Language = English     Defines the language used to display the OSD texts.
 
-  MenuScrollPage = 1     0 = when pressing the "Down" ("Up") key while the cursor
-                             is on the last (first) line of a list page, the
-                             list is advanced by a full page and the cursor will
-                             be at the top (bottom) of that page
-                         1 = dto., but the cursor remains at the bottom (top) of
-                             the page (this mode allows for faster scrolling
-                             through long lists).
+  Width = 52             The width and height of the OSD .
+  Height = 18            The valid ranges are width=40...56, height=12...21.
 
-  MarkInstantRecord = 1  Defines whether an "instant recording" (started by
-                         pressing the "Red" button in the "Main" menu) will be
-                         marked with a '@' character to make it distinguishable
-                         from timer recordings in the "Recordings" menu.
-                         0 = instant recordings will not be marked
-                         1 = instant recordings will be marked.
+  Message time = 1       The time (in seconds) how long an informational
+                         message shall be displayed on the OSD. The valid range
+                         is 1...60.
 
-  NameInstantRecord = TITLE-EPISODE
-                         Defines how to name an instant recording. If the keywords
-                         TITLE and/or EPISODE are present, they will be replaced
-                         with the title and episode information from the EPG data
-                         at the time of recording (if that data is available).
-                         If this parameter is empty, the channel name will be used
-                         by default.
+  Channel info position = bottom
+                         The position of the channel info window in the OSD
+                         (either 'bottom' or 'top').
 
-  LnbSLOF    = 11700     The switching frequency (in MHz) between low and high LOF
-  LnbFrequLo = 9750      The LNB's low and high local oscillator frequencies (in MHz)
-  LnbFrequHi = 10600     (these have no meaning for DVB-C receivers)
+  Info on channel switch = yes
+                         Turns the display of the current/next information on
+                         or off when switching the channel. The information is
+                         always displayed when pressing the "Ok" button in
+                         normal viewing mode.
 
-  DiSEqC = 1             Generally turns DiSEqC support on or off.
-                         0 = disabled
-                         1 = enabled
+  Scroll pages = yes     yes = when pressing the "Down" ("Up") key while the cursor
+                               is on the last (first) line of a list page, the
+                               list is advanced by a full page and the cursor will
+                               be at the top (bottom) of that page
+                         no  = dto., but the cursor remains at the bottom (top) of
+                               the page (this mode allows for faster scrolling
+                               through long lists).
 
-  SetSystemTime = 0      Defines whether the system time will be set according to
-                         the time received from the DVB data stream.
-                         0 = system time will not be set
-                         1 = system time wil be set
-                         Note that this works only if VDR is running under a user
-                         id that has permisson to set the system time.
+  Sort timers = yes      Turns sorting the timers in the "Timers" menu on/off.
+                         Timers are sorted by ascending start times, with the
+                         first one being the next timer that will start.
 
-  MarginStart = 2        Defines how many minutes before the official start time
-  MarginStop = 10        of a broadcast VDR shall start recording, and how long
-                         after the official end time it shall stop recording.
+  Recording directories = yes
+                         Turns displaying the Recordings menu as a hierarchical
+                         directory structure on or off.
+
+  EPG:
 
-  EPGScanTimeout = 5     The time (in hours) of user inactivity after which the
+  EPG scan timeout = 5   The time (in hours) of user inactivity after which the
                          DVB card in a single card system starts scanning channels
                          to keep the EPG up-to-date.
                          A value of '0' completely turns off scanning on both single
                          and multiple card systems.
 
-  EPGBugfixLevel = 2     Some tv stations transmit weirdly formatted EPG data.
+  EPG bugfix level = 2   Some tv stations transmit weirdly formatted EPG data.
                          VDR attempts to fix these bugs up to the given level:
                          0 = no EPG fixing
-                         1 = basic fixing of text location (Title, Subtitle and
+                         1 = basic fixing of text location (Title, Episode and
                              Extended Description)
                          2 = removal of excess whitespace and hyphens, mapping of
                              wrongly used characters
@@ -443,15 +416,74 @@ Video Disk Recorder User's Manual
                          be fixed accordingly. Restart VDR if you want to make sure
                          all data is fixed.
 
-  SVDRPTimeout = 300     The time (in seconds) of inactivity on an open SVDRP
-                         connection after which the connection is automatically
-                         closed. Default is 300, a value of 0 means no timeout.
+  Set system time = no   Defines whether the system time will be set according to
+                         the time received from the DVB data stream.
+                         Note that this works only if VDR is running under a user
+                         id that has permisson to set the system time. You also
+                         need to set the option "Use time from transponder" to a
+                         channel that you trust to transmit a reliable time base
+                         (not all channels seem to have access to a correct time
+                         base...).
+
+  Use time from transponder = 0
+                         The frequency of the transponder that shall be used to
+                         set the system time. The Setup menu will offer the full
+                         list of channels, even if several of them are on the
+                         same transponder. Also, when selecting a channel, saving
+                         the Setup and opening the Setup menu again, there may be
+                         a different channel listed here, since the first one
+                         in 'channels.conf' that is on the given transponder will
+                         be taken. Note that in order to set the system time from
+                         the transponder data the option "Set system time" must also
+                         be enabled.
+
+  DVB:
+
+  Primary DVB interface = 1
+                         Defines the primary DVB interface (i.e. the one that
+                         will display the menus and will react on input through
+                         the remote control). Valid values range from '1' to the
+                         number of installed DVB cards. If more than one DVB card
+                         is installed and a recording is to be started, the
+                         program will try to use a free DVB card that is different
+                         from the primary DVB interface, so that the viewer will
+                         be disturbed as little as possible.
 
-  SortTimers = 1         Turns sorting the timers in the "Timers" menu on/off.
-                         Timers are sorted by ascending start times, with the
-                         first one being the next timer that will start.
+  Video format = 4:3     The video format (or aspect ratio) of the tv set in use
+                         (4:3 or 16:9).
 
-  PrimaryLimit = 0       The minimum priority a timer must have to be allowed to
+  LNB:
+
+  SLOF               = 11700  The switching frequency (in MHz) between low and
+                              high LOF
+  Low LNB frequency  =  9750  The LNB's low and high local oscillator frequencies
+  High LNB frequency = 10600  (in MHz, these have no meaning for DVB-C receivers)
+
+  Use DiSEqC = no        Generally turns DiSEqC support on or off.
+
+  CICAM:
+
+  CICAM DVBn m           Defines the "Conditional Access" capabilities of the DVB
+                         card 'n'. Each DVB card can provide up to two CICAM
+                         methods ('m' = [1, 2]).
+
+                         In the 'setup.conf' file the value consists of the card
+                         number, followed by a list of decryption method values
+                         (defined in 'ca.conf').
+                         For instance
+                           CaCaps = 3 101 102
+                         would define that card number 3 is able to decrypt
+                         "Premiere World" and the "ORF".
+
+  Recording:
+
+  Margin at start = 2    Defines how many minutes before the official start time
+  Margin at stop = 10    of a broadcast VDR shall start recording, and how long
+                         after the official end time it shall stop recording.
+                         These margins are added automatically to timers that
+                         are created from the EPG data.
+
+  Primary limit = 0      The minimum priority a timer must have to be allowed to
                          use the primary DVB interface, or to force another timer
                          with higher priority to use the primary DVB interface.
                          This is mainly useful for recordings that should take
@@ -459,55 +491,67 @@ Video Disk Recorder User's Manual
                          never keep the user from viewing stuff on the primary
                          interface. On systems with only one DVB card, timers
                          with a priority below PrimaryLimit will never execute.
-  
-  DefaultPriority = 50   The default Priority and Lifetime values used when
-  DefaultLifetime = 50   creating a new timer event. A Lifetime value of 99
+
+  Default priority = 50  The default Priority and Lifetime values used when
+  Default lifetime = 50  creating a new timer event. A Lifetime value of 99
                          means that this recording will never be deleted
                          automatically.
 
-  UseSubtitle = 1        Repeating timers use the EPG's 'Subtitle' information to
-                         create recording file names in a hierarchical structure
+  Use episode name = yes Repeating timers use the EPG's 'Episode name' information
+                         to create recording file names in a hierarchical structure
                          (for instance to gather all episodes of a series in a
                          common subdirectory). This parameter can be used to
                          control this.
-                         0 = don't use the 'Subtitle'
-                         1 = use it (and create subdirectories)
+                         no  = don't use the 'Episode name'
+                         yes = use it (and create subdirectories)
 
-  RecordingDirs = 1      Turns displaying the Recordings menu as a hierarchical
-                         directory structure on or off.
+  Mark instant recording = yes
+                         Defines whether an "instant recording" (started by
+                         pressing the "Red" button in the "VDR" menu) will be
+                         marked with a '@' character to make it distinguishable
+                         from timer recordings in the "Recordings" menu.
 
-  VideoFormat = 0        The video format (or aspect ratio) of the tv set in use.
-                         0 = 4:3
-                         1 = 16:9
+  Name instant recording = TITLE EPISODE
+                         Defines how to name an instant recording. If the keywords
+                         TITLE and/or EPISODE are present, they will be replaced
+                         with the title and episode information from the EPG data
+                         at the time of recording (if that data is available).
+                         If this parameter is empty, the channel name will be used
+                         by default.
 
-  RecordDolbyDigital = 1 Turns recording of the Dolby Digital audio channels on
+  Record Dolby Digital = yes
+                         Turns recording of the Dolby Digital audio channels on
                          or off. This may be useful if you don't have the equipment
                          to replay Dolby Digital audio and want to save disk space.
 
-  ChannelInfoPos = 0     The position of the channel info window in the OSD.
-                         0 = bottom
-                         1 = top
-
-  OSDwidth  = 52         The width and height of the OSD .
-  OSDheight = 18         The valid ranges are width=40...56, height=12...21.
-
-  OSDMessageTime = 1     The time (in seconds) how long an informational
-                         message shall be displayed on the OSD. The valid range
-                         is 1...60.
-
-  MaxVideoFileSize=2000  The maximum size of a single recorded video file in MB.
+  Max. video file size = 2000
+                         The maximum size of a single recorded video file in MB.
                          The valid range is 100...2000. Default is 2000, but
                          you may want to use smaller values if you are planning
                          on archiving a recording to CD.
 
-  SplitEditedFiles = 0   During the actual editing process VDR writes the result
+  Split edited files = no
+                         During the actual editing process VDR writes the result
                          into files that may grow up to MaxVideoFileSize. If you
                          prefer to have each marked sequence stored in a separate
                          file (named 001.vdr, 002.vdr, ...) you can set this
-                         option to 1.
+                         option to 'yes'.
+
+  Replay:
+
+  Multi speed mode = no  Defines the function of the "Left" and "Right" keys in
+                         replay mode. If set to 'no', one speed will be used, while
+                         if set to 'yes' there will be three speeds for fast and slow
+                         search, respectively.
+
+  Show replay mode = no  Turns displaying the current replay mode on or off.
 
-  MinEventTimeout=30     If the command line option '-s' has been set, VDR will
-  MinUserInactivity=120  automatically shutdown the computer if the next timer
+  Miscellaneous:
+
+  Min. event timeout = 30
+  Min. user inactivity = 120
+                         If the command line option '-s' has been set, VDR will
+                         automatically shutdown the computer if the next timer
                          event is at least MinEventTimeout minutes in the future,
                          and the user has been inactive for at least
                          MinUserInactivity minutes. Setting MinUserInactivity
@@ -515,30 +559,15 @@ Video Disk Recorder User's Manual
                          retaining the possibility to manually shutdown the
                          computer.
 
-  MultiSpeedMode = 0     Defines the function of the "Left" and "Right" keys in
-                         replay mode. If set to 0, one speed will be used, while
-                         if set to 1 there will be three speeds for fast and slow
-                         search, respectively.
-                         0 = off
-                         1 = on
-
-  ShowReplayMode = 0     Turns displaying the current replay mode on or off.
-                         0 = off
-                         1 = on
-
-  CaCaps (no default)    Defines the "Conditional Access Capabilities" of a DVB
-                         card. The value consists of the card number, followed by
-                         a list of decryption method values (defined in 'ca.conf').
-                         For instance
-                           CaCaps = 3 101 102
-                         would define that card number 3 is able to decrypt
-                         "Premiere World" and the "ORF".
+  SVDRP timeout = 300    The time (in seconds) of inactivity on an open SVDRP
+                         connection after which the connection is automatically
+                         closed. Default is 300, a value of 0 means no timeout.
 
 * Executing system commands
 
-  The "Main" menu option "Commands" allows you to execute any system commands
+  The "VDR" menu option "Commands" allows you to execute any system commands
   defined in the configuration file 'commands.conf' (see FORMATS for details).
-  The "Commands" option will only be present in the "Main" menu if a valid
+  The "Commands" option will only be present in the "VDR" menu if a valid
   'commands.conf' file containing at least one command definition has been
   found at program start.
 
diff --git a/ca.conf b/ca.conf
index 7024ee427..ee2c9c53c 100644
--- a/ca.conf
+++ b/ca.conf
@@ -14,6 +14,10 @@
 101    Premiere World
 102    ORF
 
+# Cryptoworks
+
+201    GOD-DIGITAL
+
 # Special values to "hard code" a channel to a specific DVB card:
 
 1      DVB 1
diff --git a/config.c b/config.c
index a91cb8ac2..b89fe748d 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.88 2002/03/03 16:04:21 kls Exp $
+ * $Id: config.c 1.91 2002/03/17 14:24:09 kls Exp $
  */
 
 #include "config.h"
@@ -811,7 +811,7 @@ cChannel *cChannels::GetByNumber(int Number)
 {
   cChannel *channel = (cChannel *)First();
   while (channel) {
-        if (channel->number == Number)
+        if (!channel->groupSep && channel->number == Number)
            return channel;
         channel = (cChannel *)channel->Next();
         }
@@ -822,7 +822,7 @@ cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
 {
   cChannel *channel = (cChannel *)First();
   while (channel) {
-        if (channel->pnr == ServiceId)
+        if (!channel->groupSep && channel->pnr == ServiceId)
            return channel;
         channel = (cChannel *)channel->Next();
         }
@@ -931,6 +931,7 @@ cSetup::cSetup(void)
   LnbFrequHi = 10600;
   DiSEqC = 0;
   SetSystemTime = 0;
+  TimeTransponder = 0;
   MarginStart = 2;
   MarginStop = 10;
   EPGScanTimeout = 5;
@@ -962,12 +963,16 @@ cSetup::cSetup(void)
 void cSetup::PrintCaCaps(FILE *f, const char *Name)
 {
   for (int d = 0; d < MAXDVBAPI; d++) {
-      if (CaCaps[d][0]) {
-         fprintf(f, "CaCaps             = %d", d + 1);
-         for (int i = 0; i < MAXCACAPS && CaCaps[d][i]; i++)
+      int written = 0;
+      for (int i = 0; i < MAXCACAPS; i++) {
+          if (CaCaps[d][i]) {
+             if (!written++)
+                fprintf(f, "CaCaps             = %d", d + 1);
              fprintf(f, " %d", CaCaps[d][i]);
+             }
+          }
+      if (written)
          fprintf(f, "\n");
-         }
       }
 }
 
@@ -1013,6 +1018,7 @@ bool cSetup::Parse(char *s)
         else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
         else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
         else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
+        else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
         else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
         else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
         else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
@@ -1094,6 +1100,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
         fprintf(f, "DiSEqC             = %d\n", DiSEqC);
         fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
+        fprintf(f, "TimeTransponder    = %d\n", TimeTransponder);
         fprintf(f, "MarginStart        = %d\n", MarginStart);
         fprintf(f, "MarginStop         = %d\n", MarginStop);
         fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
diff --git a/config.h b/config.h
index f5e834351..4a216f139 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.102 2002/03/03 16:04:43 kls Exp $
+ * $Id: config.h 1.105 2002/03/17 14:24:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0pre3"
+#define VDRVERSION "1.0.0pre4"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -92,6 +92,8 @@ class cKeys {
   void Set(eKeys Key, unsigned int Code);
   };
 
+#define ISTRANSPONDER(f1, f2)  (abs((f1) - (f2)) < 4)
+
 class cChannel : public cListObject {
 private:
   static char *buffer;
@@ -340,6 +342,7 @@ class cSetup {
   int LnbFrequHi;
   int DiSEqC;
   int SetSystemTime;
+  int TimeTransponder;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
   int EPGBugfixLevel;
diff --git a/dvbapi.c b/dvbapi.c
index 2f1ca1453..1ade142b0 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.154 2002/03/03 15:43:24 kls Exp $
+ * $Id: dvbapi.c 1.163 2002/03/16 14:20:47 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -63,6 +63,9 @@ extern "C" {
 // The maximum time to wait before giving up while catching up on an index file:
 #define MAXINDEXCATCHUP   2 // seconds
 
+// The default priority for non-primary DVB cards:
+#define DEFAULTPRIORITY  -2
+
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 
 #define FATALERRNO (errno != EAGAIN && errno != EINTR)
@@ -743,10 +746,6 @@ cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
   canToggleAudioTrack = false;
   skipAC3bytes = false;
   audioTrack = 0xC0;
-  if (cDvbApi::AudioCommand()) {
-     if (!dolbyDev.Open(cDvbApi::AudioCommand(), "w"))
-        esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
-     }
 }
 
 cPlayBuffer::~cPlayBuffer()
@@ -755,7 +754,11 @@ cPlayBuffer::~cPlayBuffer()
 
 void cPlayBuffer::PlayExternalDolby(const uchar *b, int MaxLength)
 {
-  if (dolbyDev) {
+  if (cDvbApi::AudioCommand()) {
+     if (!dolbyDev && !dolbyDev.Open(cDvbApi::AudioCommand(), "w")) {
+        esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
+        return;
+        }
      if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01) {
         if (b[3] == 0xBD) { // dolby
            int l = b[4] * 256 + b[5] + 6;
@@ -1147,7 +1150,7 @@ void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
             int l = b[i + 4] * 256 + b[i + 5] + 6;
             switch (c) {
               case 0xBD: // dolby
-                   if (Except && dolbyDev)
+                   if (Except)
                       PlayExternalDolby(&b[i], Length - i);
                    // continue with deleting the data - otherwise it disturbs DVB replay
               case 0xC0 ... 0xC1: // audio
@@ -1408,7 +1411,7 @@ void cTransferBuffer::Output(void)
         int r = Get(b, sizeof(b));
         if (r > 0) {
            uchar *p = b;
-           while (r > 0 && Busy()) {
+           while (r > 0 && Busy() && cFile::FileReadyForWriting(toDevice, 100)) {
                  int w = write(toDevice, p, r);
                  if (w > 0) {
                     p += w;
@@ -1685,9 +1688,8 @@ cDvbApi::cDvbApi(int n)
   transferBuffer = NULL;
   transferringFromDvbApi = NULL;
   ca = -1;
-  priority = -1;
+  priority = DEFAULTPRIORITY;
   cardIndex = n;
-  SetCaCaps();
 
   // Devices that are only present on DVB-C or DVB-S cards:
 
@@ -1721,8 +1723,6 @@ cDvbApi::cDvbApi(int n)
 
   if (fd_frontend >= 0 && fd_demuxv >= 0 && fd_demuxa1 >= 0 && fd_demuxa2 >= 0 && fd_demuxd1 >= 0 && fd_demuxd2 >= 0 && fd_demuxt >= 0) {
      siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
-     if (!dvbApi[0]) // only the first one shall set the system time
-        siProcessor->SetUseTSTime(Setup.SetSystemTime);
      FrontendInfo feinfo;
      CHECK(ioctl(fd_frontend, FE_GET_INFO, &feinfo));
      frontendType = feinfo.type;
@@ -1749,7 +1749,7 @@ cDvbApi::cDvbApi(int n)
 #endif
   currentChannel = 1;
   mute = false;
-  volume = MAXVOLUME;
+  volume = Setup.CurrentVolume;
 }
 
 cDvbApi::~cDvbApi()
@@ -1848,8 +1848,10 @@ cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
 
 void cDvbApi::SetCaCaps(void)
 {
-  for (int i = 0; i < MAXCACAPS; i++)
-      caCaps[i] = Setup.CaCaps[CardIndex()][i];
+  for (int d = 0; d < NumDvbApis; d++) {
+      for (int i = 0; i < MAXCACAPS; i++)
+          dvbApi[d]->caCaps[i] = Setup.CaCaps[dvbApi[d]->CardIndex()][i];
+      }
 }
 
 int cDvbApi::ProvidesCa(int Ca)
@@ -1867,8 +1869,6 @@ int cDvbApi::ProvidesCa(int Ca)
          else
             others++;
          }
-      else
-         break;
       }
   return result ? result + others : 0;
 }
@@ -1906,6 +1906,7 @@ bool cDvbApi::Init(void)
      isyslog(LOG_INFO, "found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
   else
      esyslog(LOG_ERR, "ERROR: no video device found, giving up!");
+  SetCaCaps();
   return NumDvbApis > 0;
 }
 
@@ -2321,6 +2322,11 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Pol
      CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
      }
 
+  // Stop setting system time:
+
+  if (siProcessor)
+     siProcessor->SetCurrentTransponder(0);
+
   // If this card can't receive this channel, we must not actually switch
   // the channel here, because that would irritate the driver when we
   // start replaying in Transfer Mode immediately after switching the channel:
@@ -2472,6 +2478,11 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Pol
      CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
 
+  // Start setting system time:
+
+  if (Result == scrOk && siProcessor)
+     siProcessor->SetCurrentTransponder(Frequency);
+
   return Result;
 }
 
@@ -2567,7 +2578,7 @@ void cDvbApi::StopRecord(void)
      delete recordBuffer;
      recordBuffer = NULL;
      ca = -1;
-     priority = -1;
+     priority = DEFAULTPRIORITY;
      }
 }
 
@@ -2699,12 +2710,13 @@ bool cDvbApi::ToggleAudioTrack(void)
   return false;
 }
 
-void cDvbApi::ToggleMute(void)
+bool cDvbApi::ToggleMute(void)
 {
   int OldVolume = volume;
   mute = !mute;
   SetVolume(0, mute);
   volume = OldVolume;
+  return mute;
 }
 
 void cDvbApi::SetVolume(int Volume, bool Absolute)
@@ -2714,6 +2726,8 @@ void cDvbApi::SetVolume(int Volume, bool Absolute)
      audioMixer_t am;
      am.volume_left = am.volume_right = volume;
      CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
+     if (volume > 0)
+        mute = false;
      }
 }
 
diff --git a/dvbapi.h b/dvbapi.h
index 396b5c217..e9cf8c83a 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.64 2002/03/03 14:51:20 kls Exp $
+ * $Id: dvbapi.h 1.68 2002/03/10 10:50:00 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -43,7 +43,8 @@
 #define MAXVIDEOFILESIZE 2000 // MB
 #define MINVIDEOFILESIZE  100 // MB
 
-#define MAXVOLUME 255
+#define MAXVOLUME         255
+#define VOLUMEDELTA         5 // used to increase/decrease the volume
 
 const char *IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
@@ -125,8 +126,8 @@ class cDvbApi {
          // recording and stop recording if necessary.
   int CardIndex(void) { return cardIndex; }
          // Returns the card index of this DvbApi (0 ... MAXDVBAPI - 1).
-  void SetCaCaps(void);
-         // Sets the CaCaps of this DVB device according to the Setup data.
+  static void SetCaCaps(void);
+         // Sets the CaCaps of all DVB devices according to the Setup data.
   int ProvidesCa(int Ca);
          // Checks whether this DVB device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
@@ -148,8 +149,6 @@ class cDvbApi {
 private:
   cSIProcessor *siProcessor;
 public:
-  void SetUseTSTime(bool On) { if (siProcessor) siProcessor->SetUseTSTime(On); }
-
   // Image Grab facilities
 
   bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
@@ -307,8 +306,9 @@ class cDvbApi {
   bool mute;
   int volume;
 public:
-  void ToggleMute(void);
-       // Turns the volume off or on.
+  bool IsMute(void) { return mute; }
+  bool ToggleMute(void);
+       // Turns the volume off or on and returns the new mute state.
   void SetVolume(int Volume, bool Absolute = false);
        // Sets the volume to the given value, either absolutely or relative to
        // the current volume.
diff --git a/eit.c b/eit.c
index 9985fbbd8..011000b70 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.39 2002/03/01 16:32:11 kls Exp $
+ * $Id: eit.c 1.41 2002/03/17 14:23:41 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -981,7 +981,6 @@ cSIProcessor::cSIProcessor(const char *FileName)
 {
    fileName = strdup(FileName);
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
-   useTStime = false;
    filters = NULL;
    if (!numSIProcessors++) // the first one creates it
       schedules = new cSchedules;
@@ -1138,7 +1137,7 @@ void cSIProcessor::Action()
                         case 0x14:
                            if (buf[0] == 0x70)
                            {
-                              if (useTStime)
+                              if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(currentTransponder, Setup.TimeTransponder))
                               {
                                  cTDT ctdt((tdt_t *)buf);
                                  ctdt.SetSystemTime();
@@ -1222,14 +1221,6 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
    return false;
 }
 
-/** set whether local systems time should be
-set by the received TDT or TOT packets */
-bool cSIProcessor::SetUseTSTime(bool use)
-{
-   useTStime = use;
-   return useTStime;
-}
-
 /**  */
 bool cSIProcessor::ShutDownFilters(void)
 {
@@ -1246,6 +1237,12 @@ bool cSIProcessor::ShutDownFilters(void)
    return true; // there's no real 'boolean' to return here...
 }
 
+/** */
+void cSIProcessor::SetCurrentTransponder(int CurrentTransponder)
+{
+  currentTransponder = CurrentTransponder;
+}
+
 /** */
 bool cSIProcessor::SetCurrentServiceID(unsigned short servid)
 {
diff --git a/eit.h b/eit.h
index 55c0f4e05..5221c403d 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.15 2002/02/23 15:30:25 kls Exp $
+ * $Id: eit.h 1.16 2002/03/10 10:56:57 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -139,7 +139,7 @@ class cSIProcessor : public cThread {
   static cMutex schedulesMutex;
   static const char *epgDataFileName;
   bool masterSIProcessor;
-  bool useTStime;
+  int currentTransponder;
   SIP_FILTER *filters;
   char *fileName;
   bool active;
@@ -157,7 +157,7 @@ class cSIProcessor : public cThread {
          // longer used, the cMutexLock must be destroyed.
   static bool Read(FILE *f = NULL);
   void SetStatus(bool On);
-  bool SetUseTSTime(bool use);
+  void SetCurrentTransponder(int CurrentTransponder);
   bool SetCurrentServiceID(unsigned short servid);
   };
 
diff --git a/i18n.c b/i18n.c
index 2b52c68e4..a7d63059b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.59 2002/03/03 16:38:57 kls Exp $
+ * $Id: i18n.c 1.66 2002/03/17 13:50:43 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -46,6 +46,14 @@
  *    in the "Setup" menu.
  * 5. Send the modified 'i18n.c' file to <kls@cadsoft.de> to have
  *    it included in the next version of VDR.
+ *
+ * In case an English phrase is used in more than one context (and might need
+ * different translations in other languages) it can be preceeded with an
+ * arbitrary string to describe its context, separated from the actual phrase
+ * by a '$' character (see for instance "Button$Stop" vs. "Stop").
+ * Of course this means that no English phrase may contain the '$' character!
+ * If this should ever become necessary, the existing '$' would have to be
+ * replaced with something different...
  */
 
 #include "i18n.h"
@@ -70,15 +78,15 @@ const tPhrase Phrases[] = {
     "Suomi",
   },
   // Menu titles:
-  { "Main",
-    "Hauptmen�",
-    "Glavni meni",
-    "Principale",
-    "Hoofdmenu",
-    "Principal",
-    "Menu",
-    "Hovedmeny",
-    "Valikko",
+  { "VDR",
+    "VDR",
+    "VDR",
+    "VDR",
+    "VDR",
+    "VDR",
+    "VDR",
+    "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -291,6 +299,16 @@ const tPhrase Phrases[] = {
     "Spol tilbake",
     "Takaisinkel.",
   },
+  { "Button$Stop",
+    "Beenden",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Resume",
     "Weiter",
     "Nadaljuj",
@@ -351,7 +369,7 @@ const tPhrase Phrases[] = {
     "Neste",
     "Seuraava",
   },
-  { "Schedule",
+  { "Button$Schedule",
     "Programm",
     "Urnik",
     "Programma",
@@ -366,7 +384,7 @@ const tPhrase Phrases[] = {
     "Jezik",
     "Linguaggio",
     "Taal",
-    "", // TODO
+    "Linguagem", // TODO (correct?)
     "Langue",
     "Spr�k",
     "Kieli",
@@ -452,6 +470,26 @@ const tPhrase Phrases[] = {
     "Avbryte redigering?",
     "Peruutetaanko muokkaus?",
   },
+  { "Really restart?",
+    "Wirklich neu starten?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Recording - restart anyway?",
+    "Aufnahme l�uft - trotzdem neu starten?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
     "", // TODO
@@ -835,29 +873,150 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Kovalevy l�hes t�ynn�!",
   },
+  // Setup pages:
+  { "OSD",
+    "OSD",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "EPG",
+    "EPG",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "DVB",
+    "DVB",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "LNB",
+    "LNB",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "CICAM",
+    "CICAM",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Recording",
+    "Aufnahme",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Replay",
+    "Wiedergabe",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Miscellaneous",
+    "Sonstiges",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Restart",
+    "Neustart",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Setup parameters:
-  { "OSD-Language",
-    "OSD-Sprache",
-    "OSD-jezik",
-    "Linguaggio OSD",
-    "OSD-taal",
-    "Linguagem OSD",
-    "Langue OSD",
-    "OSD Spr�k",
-    "N�yt�n kieli",
-  },
-  { "PrimaryDVB",
-    "Prim�res Interface",
-    "Primarna naprava",
-    "Scheda DVB primaria",
-    "Eerste DVB kaart",
-    "DVB primario",
-    "Premi�re carte DVB",
-    "Hoved DVB-enhet",
-    "Ensisij. vast.otin",
+  { "Setup.OSD$Language",
+    "Sprache",
+    "Jezik",
+    "Linguaggio",
+    "Taal",
+    "Linguagem", // TODO (correct?)
+    "Langue",
+    "Spr�k",
+    "Kieli",
+  },
+  { "Setup.OSD$Width",
+    "Breite",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Largeur", //TODO (correct?)
+    "", // TODO
+    "Leveys", //TODO (correct?)
   },
-  { "ShowInfoOnChSwitch",
-    "Info zeigen",
+  { "Setup.OSD$Height",
+    "H�he",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Hauteur", //TODO (correct?)
+    "", // TODO
+    "Korkeus", //TODO (correct?)
+  },
+  { "Setup.OSD$Message time",
+    "Anzeigedauer f�r Nachrichten",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Dur�e affichage �cran",
+    "", // TODO
+    "Ilmoitusten n�kymisaika",
+  },
+  { "Setup.OSD$Channel info position",
+    "Kanal-Info Position",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Position infos cha�nes",
+    "", // TODO
+    "Kanavainfon sijainti",
+  },
+  { "Setup.OSD$Info on channel switch",
+    "Info beim Kanalwechsel",
     "Pokazi naziv kanala",
     "Vis info nel cambio canale",
     "Kanaal info tonen",
@@ -866,7 +1025,7 @@ const tPhrase Phrases[] = {
     "Info ved kanalskifte",
     "N�yt� kanavainfo",
   },
-  { "MenuScrollPage",
+  { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
     "Drsni meni",
     "Scrolla pagina nel menu",
@@ -876,37 +1035,97 @@ const tPhrase Phrases[] = {
     "Rask rulling i menyer",
     "Valikkojen rullaus",
   },
-  { "MarkInstantRecord",
-    "Direktaufz. markieren",
-    "Oznaci direktno snemanje",
-    "Marca la registrazione",
-    "Direkte opnamen markeren",
-    "Marca de gravacao",
-    "Enregistrement imm�diat",
-    "Markere direkteopptak",
-    "Merkitse v�lit�n nauh.",
+  { "Setup.OSD$Sort timers",
+    "Timer sortieren",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Trier les programmations",
+    "", // TODO
+    "J�rjest� ajastimet",
   },
-  { "NameInstantRecord",
-    "Direktaufz. benennen",
+  { "Setup.OSD$Recording directories",
+    "Aufnahme Verzeichnisse",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "Noms enregistr. imm�diats",
+    "Dossiers d'enregistrements",
     "", // TODO
-    "Nime� v�lit�n nauh.",
+    "Nauhoitushakemistot",
+  },
+  { "Setup.EPG$EPG scan timeout",
+    "Zeit bis EPG Scan",
+    "Cas do EPG pregleda",
+    "Timeout EPG",
+    "EPG-scan Timeout",
+    "Timeout EPG",
+    "Temps maxi EPG",
+    "Ledig tid f�r EPG-s�k",
+    "Ohjelmatied. odotusaika",
+  },
+  { "Setup.EPG$EPG bugfix level",
+    "EPG Fehlerbereinigung",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Niveau de correction EPG",
+    "", // TODO
+    "EPG Bugfix Level",
+  },
+  { "Setup.EPG$Set system time",
+    "Systemzeit stellen",
+    "Sistemski cas",
+    "Setta orario auto",
+    "Systeem klok instellen",
+    "Ajustar relogio do sistema",
+    "Ajuster l'heure du syst�me",
+    "Juster system-klokken",
+    "Vastaanota kellonaika",
+  },
+  { "Setup.EPG$Use time from transponder",
+    "Transponder f�r Systemzeit",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Setup.DVB$Primary DVB interface",
+    "Prim�res DVB Interface",
+    "Primarna naprava",
+    "Scheda DVB primaria",
+    "Eerste DVB kaart",
+    "DVB primario",
+    "Premi�re carte DVB",
+    "Hoved DVB-enhet",
+    "Ensisij. vast.otin",
+  },
+  { "Setup.DVB$Video format",
+    "Video Format",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Format vid�o",
+    "TV Format",
+    "Kuvamuoto",
   },
-  { "LnbSLOF",
-    "LnbSLOF",
-    "LnbSLOF",
-    "LnbSLOF",
-    "LnbSLOF",
-    "LnbSLOF",
+  { "Setup.LNB$SLOF",
+    "SLOF",
+    "SLOF",
+    "SLOF",
+    "SLOF",
+    "SLOF",
     "Limite de bandes LNB",
     "LO-grensefrekvens",
-    "LnbSLOF",
+    "SLOF",
   },
-  { "LnbFrequLo",
+  { "Setup.LNB$Low LNB frequency",
     "Untere LNB-Frequenz",
     "Spodnja LNB-frek.",
     "Freq LO LNB",
@@ -916,7 +1135,7 @@ const tPhrase Phrases[] = {
     "LO-frekvens i lavb�ndet",
     "LO LNB taajuus",
   },
-  { "LnbFrequHi",
+  { "Setup.LNB$High LNB frequency",
     "Obere LNB-Frequenz",
     "Zgornja LNB-frek.",
     "Freq HI LNB",
@@ -926,27 +1145,27 @@ const tPhrase Phrases[] = {
     "LO-frekvens i h�yb�ndet",
     "HI LNB taajuus",
   },
-  { "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-  },
-  { "SetSystemTime",
-    "Systemzeit stellen",
-    "Sistemski cas",
-    "Setta orario auto",
-    "Systeem klok instellen",
-    "Ajustar relogio do sistema",
-    "Ajuster l'heure du syst�me",
-    "Juster system-klokken",
-    "Vastaanota kellonaika",
-  },
-  { "MarginStart",
+  { "Setup.LNB$Use DiSEqC",
+    "DiSEqC benutzen",
+    "DiSEqC", // TODO
+    "DiSEqC", // TODO
+    "DiSEqC", // TODO
+    "DiSEqC", // TODO
+    "DiSEqC", // TODO
+    "DiSEqC", // TODO
+    "DiSEqC", // TODO
+  },
+  { "Setup.CICAM$CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+    "CICAM DVB",
+  },
+  { "Setup.Recording$Margin at start",
     "Zeitpuffer bei Anfang",
     "Premor pred zacetkom",
     "Min margine inizio",
@@ -956,7 +1175,7 @@ const tPhrase Phrases[] = {
     "Opptaks margin (start)",
     "Aloitusmarginaali",
   },
-  { "MarginStop",
+  { "Setup.Recording$Margin at stop",
     "Zeitpuffer bei Ende",
     "Premor za koncem",
     "Min margine fine",
@@ -966,47 +1185,7 @@ const tPhrase Phrases[] = {
     "Opptaks margin (slutt)",
     "Lopetusmarginaali",
   },
-  { "EPGScanTimeout",
-    "Zeit bis EPG Scan",
-    "Cas do EPG pregleda",
-    "Timeout EPG",
-    "EPG-scan Timeout",
-    "Timeout EPG",
-    "Temps maxi EPG",
-    "Ledig tid f�r EPG-s�k",
-    "Ohjelmatied. odotusaika",
-  },
-  { "EPGBugfixLevel",
-    "EPG Fehlerbereinigung",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Niveau de correction EPG",
-    "", // TODO
-    "EPGBugfixLevel",
-  },
-  { "SVDRPTimeout",
-    "SVDRP Timeout",
-    "", // TODO
-    "Timeout SVDRP",
-    "SVDRP Timeout",
-    "Timeout SVDRP",
-    "Temps maxi SVDRP",
-    "Ubrukt SVDRP-levetid",
-    "SVDRP odotusaika",
-  },
-  { "SortTimers",
-    "Timer sortieren",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Trier les programmations",
-    "", // TODO
-    "J�rjest� ajastimet",
-  },
-  { "PrimaryLimit",
+  { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
     "", // TODO
     "", // TODO
@@ -1016,7 +1195,7 @@ const tPhrase Phrases[] = {
     "Prioritets grense HovedDVB",
     "PrimaryLimit",
   },
-  { "DefaultPriority",
+  { "Setup.Recording$Default priority",
     "Default Priorit�t",
     "", // TODO
     "", // TODO
@@ -1026,7 +1205,7 @@ const tPhrase Phrases[] = {
     "Normal prioritet (Timer)",
     "Oletusprioriteetti",
   },
-  { "DefaultLifetime",
+  { "Setup.Recording$Default lifetime",
     "Default Lebensdauer",
     "", // TODO
     "", // TODO
@@ -1036,107 +1215,87 @@ const tPhrase Phrases[] = {
     "Normal levetid (Timer)",
     "Oletus voimassaoloaika",
   },
-  { "UseSubtitle",
-    "Subtitle verwenden",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Utiliser les sous-titres",
-    "", // TODO
-    "Tekstitys k�yt�ss�",
-  },
-  { "RecordingDirs",
-    "Aufn. Verzeichnisse",
+  { "Setup.Recording$Use episode name",
+    "Episodenname verwenden",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "Dossiers d'enregistrements",
+    "Utiliser les sous-titres", // TODO (episode name!)
     "", // TODO
-    "Nauhoitushakemistot",
+    "Tekstitys k�yt�ss�", // TODO (episode name!)
   },
-  { "VideoFormat",
-    "Video Format",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Format vid�o",
-    "TV Format",
-    "Kuvamuoto",
+  { "Setup.Recording$Mark instant recording",
+    "Direktaufzeichnung markieren",
+    "Oznaci direktno snemanje",
+    "Marca la registrazione",
+    "Direkte opnamen markeren",
+    "Marca de gravacao",
+    "Enregistrement imm�diat",
+    "Markere direkteopptak",
+    "Merkitse v�lit�n nauh.",
   },
-  { "RecordDolbyDigital",
-    "Dolby Digital Ton aufz.",
+  { "Setup.Recording$Name instant recording",
+    "Direktaufzeichnung benennen",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "Enregistrer en Dolby Digital", 
-    "", // TODO
+    "Noms enregistr. imm�diats",
     "", // TODO
+    "Nime� v�lit�n nauh.",
   },
-  { "ChannelInfoPos",
-    "Kanal Info Position",
-    "", // TODO
-    "", // TODO
+  { "Setup.Recording$Record Dolby Digital",
+    "Dolby Digital Ton aufzeichnen",
     "", // TODO
     "", // TODO
-    "Position infos cha�nes",
-    "", // TODO
-    "Kanavainfon sijainti",
-  },
-  { "OSDwidth",
-    "OSD Breite",
-    "", // TODO
     "", // TODO
     "", // TODO
+    "Enregistrer en Dolby Digital", 
     "", // TODO
-    "Largeur affichage",
     "", // TODO
-    "Tekstin�yt�n leveys",
   },
-  { "OSDheight",
-    "OSD H�he",
+  { "Setup.Recording$Max. video file size",
+    "Max. Video Dateigr��e",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "Hauteur affichage",
+    "Taille maxi des fichiers",
     "", // TODO
-    "Tekstin�yt�n korkeus",
+    "Maksimi tiedoston koko",
   },
-  { "OSDMessageTime",
-    "OSD Nachricht Dauer",
+  { "Setup.Recording$Split edited files",
+    "Editierte Dateien aufteilen",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "Dur�e affichage �cran",
+    "S�parer les s�quences",
     "", // TODO
-    "Ilmoitusten n�kymisaika",
+    "Paloittele muokatut",
   },
-  { "MaxVideoFileSize",
-    "Max. Video Dateigr��e",
+  { "Setup.Replay$Multi speed mode",
+    "MultiSpeed Modus",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "Taille maxi des fichiers",
+    "Mode multi-vitesses",
     "", // TODO
-    "Maksimi tiedoston koko",
+    "Moninopeustila",
   },
-  { "SplitEditedFiles",
-    "Editierte Dateien zerteilen",
+  { "Setup.Replay$Show replay mode",
+    "Wiedergabestatus anzeigen",
     "", // TODO
     "", // TODO
     "", // TODO
     "", // TODO
-    "S�parer les s�quences",
+    "Affichage mode de lecture",
     "", // TODO
-    "Paloittele muokatut",
+    "N�yt� toiston tila",
   },
-  { "MinEventTimeout",
+  { "Setup.Miscellaneous$Min. event timeout",
     "Mindest Event Pause",
     "", // TODO
     "", // TODO
@@ -1146,8 +1305,8 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Minimi tapahtuman odotus",
   },
-  { "MinUserInactivity",
-    "Mindest User Inaktivit�t",
+  { "Setup.Miscellaneous$Min. user inactivity",
+    "Mindest Benutzer-Inaktivit�t",
     "", // TODO
     "", // TODO
     "", // TODO
@@ -1156,25 +1315,15 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Minimi k�ytt�j�n odotus",
   },
-  { "MultiSpeedMode",
-    "MultiSpeed Modus",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Mode multi-vitesses",
-    "", // TODO
-    "Moninopeustila",
-  },
-  { "ShowReplayMode",
-    "Wiedergabe Status",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Affichage mode de lecture",
+  { "Setup.Miscellaneous$SVDRP timeout",
+    "SVDRP Timeout",
     "", // TODO
-    "N�yt� toiston tila",
+    "Timeout SVDRP",
+    "SVDRP Timeout",
+    "Timeout SVDRP",
+    "Temps maxi SVDRP",
+    "Ubrukt SVDRP-levetid",
+    "SVDRP odotusaika",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -1540,6 +1689,16 @@ const tPhrase Phrases[] = {
     "", // TODO
     "Hypp��:",
   },
+  { "Volume ", // note the trailing blank
+    "Lautst�rke ",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "Volume ",
+    "", // TODO
+    "��nenvoimakkuus ",
+  },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
     " Prekini ponavljanje",
@@ -1645,7 +1804,8 @@ const char *tr(const char *s)
          }
      esyslog(LOG_ERR, "no translation found for '%s' in language %d (%s)\n", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
      }
-  return s;
+  const char *p = strchr(s, '$');
+  return p ? p + 1 : s;
 }
 
 const char * const * Languages(void)
diff --git a/menu.c b/menu.c
index b1e7e49e3..93f1ff7d4 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.160 2002/03/03 16:12:29 kls Exp $
+ * $Id: menu.c 1.172 2002/03/17 14:23:44 kls Exp $
  */
 
 #include "menu.h"
@@ -168,6 +168,47 @@ void cMenuEditChanItem::Set(void)
   SetValue(buf);
 }
 
+// --- cMenuEditTranItem -----------------------------------------------------
+
+class cMenuEditTranItem : public cMenuEditChanItem {
+private:
+  int number;
+  int transponder;
+public:
+  cMenuEditTranItem(const char *Name, int *Value);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value)
+:cMenuEditChanItem(Name, Value)
+{
+  number = 0;
+  transponder = *Value;
+  cChannel *channel = Channels.First();
+  while (channel) {
+        if (!channel->groupSep && ISTRANSPONDER(channel->frequency, *Value)) {
+           number = channel->number;
+           break;
+           }
+        channel = (cChannel *)channel->Next();
+        }
+  *Value = number;
+  Set();
+  *Value = transponder;
+}
+
+eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
+{
+  *value = number;
+  eOSState state = cMenuEditChanItem::ProcessKey(Key);
+  number = *value;
+  cChannel *channel = Channels.GetByNumber(*value);
+  if (channel)
+     transponder = channel->frequency;
+  *value = transponder;
+  return state;
+}
+
 // --- cMenuEditDayItem ------------------------------------------------------
 
 class cMenuEditDayItem : public cMenuEditIntItem {
@@ -892,8 +933,8 @@ class cMenuTextItem : public cOsdItem {
   virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   bool CanScrollUp(void) { return offset > 0; }
   bool CanScrollDown(void) { return h + offset < lines; }
-  void ScrollUp(void);
-  void ScrollDown(void);
+  void ScrollUp(bool Page);
+  void ScrollDown(bool Page);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -952,20 +993,20 @@ void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
   if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
 }
 
-void cMenuTextItem::ScrollUp(void)
+void cMenuTextItem::ScrollUp(bool Page)
 {
   if (CanScrollUp()) {
      Clear();
-     offset--;
+     offset = max(offset - (Page ? h : 1), 0);
      Display();
      }
 }
 
-void cMenuTextItem::ScrollDown(void)
+void cMenuTextItem::ScrollDown(bool Page)
 {
   if (CanScrollDown()) {
      Clear();
-     offset++;
+     offset = min(offset + (Page ? h : 1), lines - h);
      Display();
      }
 }
@@ -973,10 +1014,14 @@ void cMenuTextItem::ScrollDown(void)
 eOSState cMenuTextItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
+    case kLeft|k_Repeat:
+    case kLeft:
     case kUp|k_Repeat:
-    case kUp:            ScrollUp();   break;
+    case kUp:            ScrollUp(NORMALKEY(Key) == kLeft);    break;
+    case kRight|k_Repeat:
+    case kRight:
     case kDown|k_Repeat:
-    case kDown:          ScrollDown(); break;
+    case kDown:          ScrollDown(NORMALKEY(Key) == kRight); break;
     default:             return osUnknown;
     }
   return osContinue;
@@ -1394,7 +1439,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 
   currentChannel = CurrentChannelNr;
   delete pArray;
-  SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Schedule"), tr("Switch"));
+  SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
 }
 
 const cEventInfo *cMenuWhatsOn::ScheduleEventInfo(void)
@@ -1876,84 +1921,45 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuSetup ------------------------------------------------------------
+// --- cMenuSetupPage --------------------------------------------------------
 
-class cMenuSetup : public cOsdMenu {
-private:
+class cMenuSetupPage : public cOsdMenu {
+protected:
   cSetup data;
   int osdLanguage;
-  void Set(void);
+  void SetupTitle(const char *s);
+  virtual void Set(void) = 0;
 public:
-  cMenuSetup(void);
+  cMenuSetupPage(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuSetup::cMenuSetup(void)
-:cOsdMenu("", 25)
+cMenuSetupPage::cMenuSetupPage(void)
+:cOsdMenu("", 30)
 {
   data = Setup;
   osdLanguage = Setup.OSDLanguage;
-  Set();
 }
 
-void cMenuSetup::Set(void)
+void cMenuSetupPage::SetupTitle(const char *s)
 {
-  Clear();
-  SetTitle(tr("Setup"));
-  Add(new cMenuEditStraItem(tr("OSD-Language"),       &data.OSDLanguage, NumLanguages, Languages()));
-  Add(new cMenuEditIntItem( tr("PrimaryDVB"),         &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
-  Add(new cMenuEditBoolItem(tr("ShowInfoOnChSwitch"), &data.ShowInfoOnChSwitch));
-  Add(new cMenuEditBoolItem(tr("MenuScrollPage"),     &data.MenuScrollPage));
-  Add(new cMenuEditBoolItem(tr("MarkInstantRecord"),  &data.MarkInstantRecord));
-  Add(new cMenuEditStrItem( tr("NameInstantRecord"),   data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
-  Add(new cMenuEditIntItem( tr("LnbSLOF"),            &data.LnbSLOF));
-  Add(new cMenuEditIntItem( tr("LnbFrequLo"),         &data.LnbFrequLo));
-  Add(new cMenuEditIntItem( tr("LnbFrequHi"),         &data.LnbFrequHi));
-  Add(new cMenuEditBoolItem(tr("DiSEqC"),             &data.DiSEqC));
-  Add(new cMenuEditBoolItem(tr("SetSystemTime"),      &data.SetSystemTime));
-  Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
-  Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
-  Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
-  Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
-  Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
-  Add(new cMenuEditBoolItem(tr("SortTimers"),         &data.SortTimers));
-  Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));
-  Add(new cMenuEditIntItem( tr("DefaultPriority"),    &data.DefaultPriority, 0, MAXPRIORITY));
-  Add(new cMenuEditIntItem( tr("DefaultLifetime"),    &data.DefaultLifetime, 0, MAXLIFETIME));
-  Add(new cMenuEditBoolItem(tr("UseSubtitle"),        &data.UseSubtitle));
-  Add(new cMenuEditBoolItem(tr("RecordingDirs"),      &data.RecordingDirs));
-  Add(new cMenuEditBoolItem(tr("VideoFormat"),        &data.VideoFormat, "4:3", "16:9"));
-  Add(new cMenuEditBoolItem(tr("RecordDolbyDigital"), &data.RecordDolbyDigital));
-  Add(new cMenuEditBoolItem(tr("ChannelInfoPos"),     &data.ChannelInfoPos, tr("bottom"), tr("top")));
-  Add(new cMenuEditIntItem( tr("OSDwidth"),           &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
-  Add(new cMenuEditIntItem( tr("OSDheight"),          &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
-  Add(new cMenuEditIntItem( tr("OSDMessageTime"),     &data.OSDMessageTime, 1, 60));
-  Add(new cMenuEditIntItem( tr("MaxVideoFileSize"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
-  Add(new cMenuEditBoolItem(tr("SplitEditedFiles"),   &data.SplitEditedFiles));
-  Add(new cMenuEditIntItem( tr("MinEventTimeout"),    &data.MinEventTimeout));
-  Add(new cMenuEditIntItem( tr("MinUserInactivity"),  &data.MinUserInactivity));
-  Add(new cMenuEditBoolItem(tr("MultiSpeedMode"),     &data.MultiSpeedMode));
-  Add(new cMenuEditBoolItem(tr("ShowReplayMode"),     &data.ShowReplayMode));
-  for (int d = 0; d < cDvbApi::NumDvbApis; d++) {
-      for (int i = 0; i < 2; i++) {
-          char buffer[32];
-          snprintf(buffer, sizeof(buffer), "%s%d %d", tr("CICAM DVB"), d + 1, i + 1);
-          Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i]));
-          }
-      }
+  char buf[40]; // can't call tr() for more than one string at a time!
+  char *q = buf + snprintf(buf, sizeof(buf), "%s - ", tr("Setup"));
+  snprintf(q, sizeof(buf) - strlen(buf), "%s", tr(s));
+  SetTitle(buf);
 }
 
-eOSState cMenuSetup::ProcessKey(eKeys Key)
+eOSState cMenuSetupPage::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osEnd;
-                 cDvbApi::PrimaryDvbApi->SetUseTSTime(data.SetSystemTime);
+       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
                  cDvbApi::PrimaryDvbApi->SetVideoFormat(data.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
                  Setup = data;
                  Setup.Save();
+                 cDvbApi::SetCaCaps();
                  break;
        default: break;
        }
@@ -1969,6 +1975,235 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuSetupOSD ---------------------------------------------------------
+
+class cMenuSetupOSD : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupOSD(void) { Set(); }
+  };
+
+void cMenuSetupOSD::Set(void)
+{
+  Clear();
+  SetupTitle("OSD");
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, NumLanguages, Languages()));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Message time"),           &data.OSDMessageTime, 1, 60));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
+}
+
+// --- cMenuSetupEPG ---------------------------------------------------------
+
+class cMenuSetupEPG : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupEPG(void) { Set(); }
+  };
+
+void cMenuSetupEPG::Set(void)
+{
+  Clear();
+  SetupTitle("EPG");
+  Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout"),          &data.EPGScanTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"),          &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
+  Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
+  Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
+}
+
+// --- cMenuSetupDVB ---------------------------------------------------------
+
+class cMenuSetupDVB : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupDVB(void) { Set(); }
+  };
+
+void cMenuSetupDVB::Set(void)
+{
+  Clear();
+  SetupTitle("DVB");
+  Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
+  Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
+}
+
+// --- cMenuSetupLNB ---------------------------------------------------------
+
+class cMenuSetupLNB : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupLNB(void) { Set(); }
+  };
+
+void cMenuSetupLNB::Set(void)
+{
+  Clear();
+  SetupTitle("LNB");
+  Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF"),               &data.LnbSLOF));
+  Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency"),  &data.LnbFrequLo));
+  Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency"), &data.LnbFrequHi));
+  Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"),         &data.DiSEqC));
+}
+
+// --- cMenuSetupCICAM -------------------------------------------------------
+
+class cMenuSetupCICAM : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupCICAM(void) { Set(); }
+  };
+
+void cMenuSetupCICAM::Set(void)
+{
+  Clear();
+  SetupTitle("CICAM");
+  for (int d = 0; d < cDvbApi::NumDvbApis; d++) {
+      for (int i = 0; i < 2; i++) {
+          char buffer[32];
+          snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), d + 1, i + 1);
+          Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i]));
+          }
+      }
+}
+
+// --- cMenuSetupRecord ------------------------------------------------------
+
+class cMenuSetupRecord : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupRecord(void) { Set(); }
+  };
+
+void cMenuSetupRecord::Set(void)
+{
+  Clear();
+  SetupTitle("Recording");
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start"),        &data.MarginStart));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop"),         &data.MarginStop));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),          &data.PrimaryLimit, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),       &data.DefaultPriority, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime"),       &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),       &data.UseSubtitle));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord));
+  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),  data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"),   &data.RecordDolbyDigital));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),     &data.SplitEditedFiles));
+}
+
+// --- cMenuSetupReplay ------------------------------------------------------
+
+class cMenuSetupReplay : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupReplay(void) { Set(); }
+  };
+
+void cMenuSetupReplay::Set(void)
+{
+  Clear();
+  SetupTitle("Replay");
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
+}
+
+// --- cMenuSetupMisc --------------------------------------------------------
+
+class cMenuSetupMisc : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupMisc(void) { Set(); }
+  };
+
+void cMenuSetupMisc::Set(void)
+{
+  Clear();
+  SetupTitle("Miscellaneous");
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout"),   &data.MinEventTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity"), &data.MinUserInactivity));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout"),        &data.SVDRPTimeout));
+}
+
+// --- cMenuSetup ------------------------------------------------------------
+
+class cMenuSetup : public cOsdMenu {
+private:
+  virtual void Set(void);
+  eOSState Restart(void);
+public:
+  cMenuSetup(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuSetup::cMenuSetup(void)
+:cOsdMenu("")
+{
+  Set();
+}
+
+void cMenuSetup::Set(void)
+{
+  Clear();
+  SetTitle(tr("Setup"));
+  SetHasHotkeys();
+  Add(new cOsdItem(hk(tr("OSD")),           osUser1));
+  Add(new cOsdItem(hk(tr("EPG")),           osUser2));
+  Add(new cOsdItem(hk(tr("DVB")),           osUser3));
+  Add(new cOsdItem(hk(tr("LNB")),           osUser4));
+  Add(new cOsdItem(hk(tr("CICAM")),         osUser5));
+  Add(new cOsdItem(hk(tr("Recording")),     osUser6));
+  Add(new cOsdItem(hk(tr("Replay")),        osUser7));
+  Add(new cOsdItem(hk(tr("Miscellaneous")), osUser8));
+  Add(new cOsdItem(hk(tr("Restart")),       osUser9));
+}
+
+eOSState cMenuSetup::Restart(void)
+{
+  if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?"))) {
+     cThread::EmergencyExit(true);
+     return osEnd;
+     }
+  return osContinue;
+}
+
+eOSState cMenuSetup::ProcessKey(eKeys Key)
+{
+  int osdLanguage = Setup.OSDLanguage;
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  switch (state) {
+    case osUser1: return AddSubMenu(new cMenuSetupOSD);
+    case osUser2: return AddSubMenu(new cMenuSetupEPG);
+    case osUser3: return AddSubMenu(new cMenuSetupDVB);
+    case osUser4: return AddSubMenu(new cMenuSetupLNB);
+    case osUser5: return AddSubMenu(new cMenuSetupCICAM);
+    case osUser6: return AddSubMenu(new cMenuSetupRecord);
+    case osUser7: return AddSubMenu(new cMenuSetupReplay);
+    case osUser8: return AddSubMenu(new cMenuSetupMisc);
+    case osUser9: return Restart();
+    default: ;
+    }
+  if (Setup.OSDLanguage != osdLanguage) {
+     Set();
+     if (!HasSubMenu())
+        Display();
+     }
+  return state;
+}
+
 // --- cMenuCommands ---------------------------------------------------------
 
 class cMenuCommands : public cOsdMenu {
@@ -1982,14 +2217,14 @@ class cMenuCommands : public cOsdMenu {
 cMenuCommands::cMenuCommands(void)
 :cOsdMenu(tr("Commands"))
 {
+  SetHasHotkeys();
   int i = 0;
   cCommand *command;
 
   while ((command = Commands.Get(i)) != NULL) {
-        Add(new cOsdItem(command->Title()));
+        Add(new cOsdItem(hk(command->Title())));
         i++;
         }
-  SetHasHotkeys();
 }
 
 eOSState cMenuCommands::Execute(void)
@@ -2022,9 +2257,24 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 #define ON_PRIMARY_INTERFACE tr("on primary interface")
 
 cMenuMain::cMenuMain(bool Replaying, eOSState State)
-:cOsdMenu(tr("Main"))
+:cOsdMenu("")
 {
-  digit = 0;
+  replaying = Replaying;
+  Set();
+
+  // Initial submenus:
+
+  switch (State) {
+    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
+    default: break;
+    }
+}
+
+void cMenuMain::Set(void)
+{
+  Clear();
+  //SetTitle("VDR"); // this is done below, including disk usage
+  SetHasHotkeys();
 
   // Title with disk usage:
 
@@ -2036,7 +2286,7 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
   int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
   int Hours = Minutes / 60;
   Minutes %= 60;
-  snprintf(buffer, sizeof(buffer), "%s  -  Disk %d%%  -  %2d:%02d %s", tr("Main"), Percent, Hours, Minutes, tr("free"));
+  snprintf(buffer, sizeof(buffer), "%s  -  Disk %d%%  -  %2d:%02d %s", tr("VDR"), Percent, Hours, Minutes, tr("free"));
   SetTitle(buffer);
 
   // Basic menu items:
@@ -2051,7 +2301,7 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
 
   // Replay control:
 
-  if (Replaying)
+  if (replaying)
      Add(new cOsdItem(tr(" Stop replaying"), osStopReplay));
 
   // Record control:
@@ -2077,32 +2327,14 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
 
   // Color buttons:
 
-  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, NULL, cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, NULL, replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
-  SetHasHotkeys();
-
-  // Initial submenus:
-
-  switch (State) {
-    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
-    default: break;
-    }
-}
-
-const char *cMenuMain::hk(const char *s)
-{
-  static char buffer[32];
-  if (digit < 9) {
-     snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
-     return buffer;
-     }
-  else
-     return s;
 }
 
 eOSState cMenuMain::ProcessKey(eKeys Key)
 {
+  int osdLanguage = Setup.OSDLanguage;
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   switch (state) {
@@ -2143,13 +2375,19 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 }
                              break;
                case kBlue:   if (!HasSubMenu())
-                                state = osReplay;
+                                state = replaying ? osStopReplay : osReplay;
                              break;
                default:      break;
                }
     }
-  if (Key != kNone)
+  if (Key != kNone) {
      lastActivity = time(NULL);
+     if (Setup.OSDLanguage != osdLanguage) {
+        Set();
+        if (!HasSubMenu())
+           Display();
+        }
+     }
   else if (time(NULL) - lastActivity > MENUTIMEOUT)
      state = osEnd;
   return state;
@@ -2345,6 +2583,109 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
   return osEnd;
 }
 
+// --- cVolumeBar ------------------------------------------------------------
+
+class cVolumeBar : public cBitmap {
+public:
+  cVolumeBar(int Width, int Height, int Current, int Total, const char *Prompt = NULL);
+  };
+
+cVolumeBar::cVolumeBar(int Width, int Height, int Current, int Total, const char *Prompt)
+:cBitmap(Width, Height, 2)
+{
+  int l = Prompt ? cBitmap::Width(Prompt) : 0;
+  int p = (Width - l) * Current / Total;
+  Text(0, 0, Prompt, clrGreen);
+  Fill(l, 0, p, Height - 1, clrGreen);
+  Fill(l + p, 0, Width - 1, Height - 1, clrWhite);
+}
+
+// --- cDisplayVolume --------------------------------------------------------
+
+#define VOLUMETIMEOUT 1000 //ms
+#define MUTETIMEOUT   5000 //ms
+
+cDisplayVolume *cDisplayVolume::displayVolume = NULL;
+
+cDisplayVolume::cDisplayVolume(void)
+:cOsdBase(true)
+{
+  displayVolume = this;
+  timeout = time_ms() + (cDvbApi::PrimaryDvbApi->IsMute() ? MUTETIMEOUT : VOLUMETIMEOUT);
+  Interface->Open(Setup.OSDwidth, -1);
+  Show();
+}
+
+cDisplayVolume::~cDisplayVolume()
+{
+  Interface->Close();
+  displayVolume = NULL;
+}
+
+void cDisplayVolume::Show(void)
+{
+  cDvbApi *dvbApi = cDvbApi::PrimaryDvbApi;
+  if (dvbApi->IsMute()) {
+     Interface->Fill(0, 0, Width(), 1, clrTransparent);
+     Interface->Write(0, 0, tr("Mute"), clrGreen);
+     }
+  else {
+     int Current = cDvbApi::CurrentVolume();
+     int Total = MAXVOLUME;
+     const char *Prompt = tr("Volume ");
+#ifdef DEBUG_OSD
+     int l = strlen(Prompt);
+     int p = int(double(Width() - l) * Current / Total + 0.5);
+     Interface->Write(0, 0, Prompt, clrGreen);
+     Interface->Fill(l, 0, p, 1, clrGreen);
+     Interface->Fill(l + p, 0, Width() - l - p, 1, clrWhite);
+#else
+     cVolumeBar VolumeBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, Prompt);
+     Interface->SetBitmap(0, 0, VolumeBar);
+#endif
+     }
+}
+
+cDisplayVolume *cDisplayVolume::Create(void)
+{
+  if (!displayVolume)
+     new cDisplayVolume;
+  return displayVolume;
+}
+
+void cDisplayVolume::Process(eKeys Key)
+{
+  if (displayVolume)
+     displayVolume->ProcessKey(Key);
+}
+
+eOSState cDisplayVolume::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kVolUp|k_Repeat:
+    case kVolUp:
+    case kVolDn|k_Repeat:
+    case kVolDn:
+         Show();
+         timeout = time_ms() + VOLUMETIMEOUT;
+         break;
+    case kMute:
+         if (cDvbApi::PrimaryDvbApi->IsMute()) {
+            Show();
+            timeout = time_ms() + MUTETIMEOUT;
+            }
+         else
+            timeout = 0;
+         break;
+    case kNone: break;
+    default: if ((Key & k_Release) == 0) {
+                Interface->PutKey(Key);
+                return osEnd;
+                }
+    }
+  return time_ms() < timeout ? osContinue : osEnd;
+}
+
 // --- cRecordControl --------------------------------------------------------
 
 cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
@@ -2666,6 +3007,8 @@ void cReplayControl::DisplayAtBottom(const char *s)
   if (s) {
      int w = dvbApi->WidthInCells(s);
      int d = max(Width() - w, 0) / 2;
+     if (modeOnly) //XXX remove when displaying replay mode differently
+        Interface->Fill(0, -1, Interface->Width(), 1, clrTransparent); //XXX remove when displaying replay mode differently
      Interface->Write(d, -1, s);
      Interface->Flush();
      }
@@ -2685,8 +3028,11 @@ void cReplayControl::ShowMode(void)
            if (NormalPlay)
               return; // no need to do indicate ">" unless there was a different mode displayed before
            // open small display
+           /*XXX change when displaying replay mode differently
            Interface->Open(9, -1);
            Interface->Clear();
+           XXX*/
+           Interface->Open(0, -1); //XXX remove when displaying replay mode differently
            visible = modeOnly = true;
            }
 
diff --git a/menu.h b/menu.h
index 9e49bf65e..ae46d02f2 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.37 2002/02/24 12:40:37 kls Exp $
+ * $Id: menu.h 1.40 2002/03/16 09:51:10 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -17,8 +17,8 @@
 class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
-  int digit;
-  const char *hk(const char *s);
+  bool replaying;
+  void Set(void);
 public:
   cMenuMain(bool Replaying, eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
@@ -40,6 +40,19 @@ class cDisplayChannel : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cDisplayVolume : public cOsdBase {
+private:
+  int timeout;
+  static cDisplayVolume *displayVolume;
+  void Show(void);
+  cDisplayVolume(void);
+public:
+  virtual ~cDisplayVolume();
+  static cDisplayVolume *Create(void);
+  static void Process(eKeys Key);
+  eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
diff --git a/osd.c b/osd.c
index 0a825d7da..e404a6f8a 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.20 2002/01/26 11:09:58 kls Exp $
+ * $Id: osd.c 1.21 2002/03/10 16:18:06 kls Exp $
  */
 
 #include "osd.h"
@@ -102,6 +102,23 @@ cOsdMenu::~cOsdMenu()
   Interface->Close();
 }
 
+const char *cOsdMenu::hk(const char *s)
+{
+  static char buffer[32];
+  if (digit < 9) {
+     snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
+     return buffer;
+     }
+  else
+     return s;
+}
+
+void cOsdMenu::SetHasHotkeys(void)
+{
+  hasHotkeys = true;
+  digit = 0;
+}
+
 void cOsdMenu::SetStatus(const char *s)
 {
   delete status;
diff --git a/osd.h b/osd.h
index 4eb2a22dd..8e825869d 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.26 2002/02/24 12:55:16 kls Exp $
+ * $Id: osd.h 1.27 2002/03/10 16:18:11 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -33,6 +33,16 @@ enum eOSState { osUnknown,
                 osSwitchDvb,
                 osBack,
                 osEnd,
+                os_User, // the following values can be used locally
+                osUser1,
+                osUser2,
+                osUser3,
+                osUser4,
+                osUser5,
+                osUser6,
+                osUser7,
+                osUser8,
+                osUser9,
               };
 
 class cOsdItem : public cListObject {
@@ -77,9 +87,12 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
   const char *status;
+  int digit;
   bool hasHotkeys;
 protected:
   bool visible;
+  const char *hk(const char *s);
+  void SetHasHotkeys(void);
   virtual void Clear(void);
   bool SpecialItem(int idx);
   void SetCurrent(cOsdItem *Item);
@@ -100,7 +113,6 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
 public:
   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
-  void SetHasHotkeys(void) { hasHotkeys = true; }
   int Current(void) { return current; }
   void Add(cOsdItem *Item, bool Current = false);
   void Display(void);
diff --git a/recording.c b/recording.c
index 4d07434a0..56ea05653 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.54 2002/02/24 11:21:42 kls Exp $
+ * $Id: recording.c 1.57 2002/03/16 12:17:44 kls Exp $
  */
 
 #include "recording.h"
@@ -86,6 +86,7 @@ void AssertFreeDiskSpace(int Priority)
         if (!LockFile.Lock())
            return;
         // Remove the oldest file that has been "deleted":
+        isyslog(LOG_INFO, "low disk space while recording, trying to remove a deleted recording...");
         cRecordings Recordings;
         if (Recordings.Load(true)) {
            cRecording *r = Recordings.First();
@@ -101,12 +102,13 @@ void AssertFreeDiskSpace(int Priority)
               }
            }
         // No "deleted" files to remove, so let's see if we can delete a recording:
+        isyslog(LOG_INFO, "...no deleted recording found, trying to delete an old recording...");
         if (Recordings.Load(false)) {
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
                  if (r->lifetime < MAXLIFETIME) { // recordings with MAXLIFETIME live forever
-                    if ((r->lifetime == 0 && Priority > r->priority) || // the recording has guaranteed lifetime and the new recording has higher priority
+                    if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
                         (time(NULL) - r->start) / SECSINDAY > r->lifetime) { // the recording's guaranteed lifetime has expired
                        if (r0) {
                           if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
@@ -122,6 +124,7 @@ void AssertFreeDiskSpace(int Priority)
               return;
            }
         // Unable to free disk space, but there's nothing we can do about that...
+        isyslog(LOG_INFO, "...no old recording found, giving up");
         Interface->Confirm(tr("Low disk space!"), 30);
         }
      LastFreeDiskCheck = time(NULL);
@@ -551,6 +554,11 @@ bool cRecording::Delete(void)
   char *ext = strrchr(NewName, '.');
   if (strcmp(ext, RECEXT) == 0) {
      strncpy(ext, DELEXT, strlen(ext));
+     if (access(NewName, F_OK) == 0) {
+        // the new name already exists, so let's remove that one first:
+        isyslog(LOG_INFO, "removing recording %s", NewName);
+        RemoveVideoFile(NewName);
+        }
      isyslog(LOG_INFO, "deleting recording %s", FileName());
      result = RenameVideoFile(FileName(), NewName);
      }
diff --git a/runvdr b/runvdr
index afd645fc4..13ee73294 100755
--- a/runvdr
+++ b/runvdr
@@ -18,14 +18,14 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.8 2001/07/27 07:35:19 kls Exp $
+# $Id: runvdr 1.9 2002/03/16 16:22:12 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
 VDRCMD="$VDRPRG -w 60 $*"
 
 LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
-KILLPROC="/sbin/killproc -TERM"
+KILL="/usr/bin/killall -q -TERM"
 
 # Load driver if it hasn't been loaded already:
 if [ $LSMOD -eq 0 ] ; then
@@ -37,7 +37,7 @@ while (true) do
       if test $? -eq 0; then exit; fi
       date
       echo "restarting VDR"
-      $KILLPROC $VDRPRG
+      $KILL $VDRPRG
       sleep 10
       (cd $DVBDIR; make rmmod; make insmod)
       date
diff --git a/svdrp.c b/svdrp.c
index 228003ea0..06f8ebbc5 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.33 2002/02/24 14:16:03 kls Exp $
+ * $Id: svdrp.c 1.34 2002/03/08 17:17:05 kls Exp $
  */
 
 #include "svdrp.h"
@@ -247,6 +247,12 @@ const char *HelpPages[] = {
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
   "    and stop time does not yet exists, it will be created.",
+  "VOLU [ <number> | + | - | mute ]\n"
+  "    Set the audio volume to the given number (which is limited to the range\n"
+  "    0...255). If the special options '+' or '-' are given, the volume will\n"
+  "    be turned up or down, respectively. The option 'mute' will toggle the\n"
+  "    audio muting. If no option is given, the current audio volume level will\n"
+  "    be returned.",
   "QUIT\n"
   "    Exit vdr (SVDRP).\n"
   "    You can also hit Ctrl-D to exit.",
@@ -920,6 +926,28 @@ void cSVDRP::CmdUPDT(const char *Option)
      Reply(501, "Missing timer settings");
 }
 
+void cSVDRP::CmdVOLU(const char *Option)
+{
+  if (*Option) {
+     if (isnumber(Option))
+        cDvbApi::PrimaryDvbApi->SetVolume(strtol(Option, NULL, 10), true);
+     else if (strcmp(Option, "+") == 0)
+        cDvbApi::PrimaryDvbApi->SetVolume(VOLUMEDELTA);
+     else if (strcmp(Option, "-") == 0)
+        cDvbApi::PrimaryDvbApi->SetVolume(-VOLUMEDELTA);
+     else if (strcasecmp(Option, "MUTE") == 0)
+        cDvbApi::PrimaryDvbApi->ToggleMute();
+     else {
+        Reply(501, "Unknown option: \"%s\"", Option);
+        return;
+        }
+     }
+  if (cDvbApi::PrimaryDvbApi->IsMute())
+     Reply(250, "Audio is mute");
+  else
+     Reply(250, "Audio volume is %d", cDvbApi::CurrentVolume());
+}
+
 #define CMD(c) (strcasecmp(Cmd, c) == 0)
 
 void cSVDRP::Execute(char *Cmd)
@@ -960,8 +988,9 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
-  else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
+  else if (CMD("UPDT"))  CmdUPDT(s);
+  else if (CMD("VOLU"))  CmdVOLU(s);
   else if (CMD("QUIT"))  Close();
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
 }
diff --git a/svdrp.h b/svdrp.h
index 42e5b6911..29ef83cd6 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.14 2002/02/24 10:48:21 kls Exp $
+ * $Id: svdrp.h 1.15 2002/03/08 16:40:23 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -73,6 +73,7 @@ class cSVDRP {
   void CmdNEXT(const char *Option);
   void CmdPUTE(const char *Option);
   void CmdUPDT(const char *Option);
+  void CmdVOLU(const char *Option);
   void Execute(char *Cmd);
 public:
   cSVDRP(int Port);
diff --git a/thread.c b/thread.c
index 94ba86057..a7e77f1b4 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.18 2002/02/23 13:49:06 kls Exp $
+ * $Id: thread.c 1.19 2002/03/09 12:05:44 kls Exp $
  */
 
 #include "thread.h"
@@ -327,14 +327,21 @@ int cPipe::Close(void)
      f = NULL;
      }
 
-  if (pid >= 0) {
+  if (pid > 0) {
      int status = 0;
-     struct rusage ru;
      int i = 5;
-     while (ret == -1 && i > 0) {
-           usleep(1000);
-           ret = wait4(pid, &status, WNOHANG, &ru);
+     while (i > 0) {
+           ret = waitpid(pid, &status, WNOHANG);
+           if (ret < 0) {
+              if (errno != EINTR && errno != ECHILD) {
+                 LOG_ERROR;
+                 break;
+                 }
+              }
+           else if (ret == pid)
+              break;
            i--;
+           usleep(100000);
            }
    
      if (!i) {
diff --git a/vdr.c b/vdr.c
index a246be11c..17ae1488e 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.98 2002/03/03 14:56:03 kls Exp $
+ * $Id: vdr.c 1.101 2002/03/09 17:10:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -50,8 +50,6 @@
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
 
-#define VOLUMEDELTA      5 // used to increase/decrease the volume
-
 static int Interrupted = 0;
 
 static void SignalHandler(int signum)
@@ -85,6 +83,7 @@ int main(int argc, char *argv[])
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *ConfigDirectory = NULL;
   bool DaemonMode = false;
+  bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
   const char *Shutdown = NULL;
@@ -97,6 +96,7 @@ int main(int argc, char *argv[])
       { "epgfile",  required_argument, NULL, 'E' },
       { "help",     no_argument,       NULL, 'h' },
       { "log",      required_argument, NULL, 'l' },
+      { "mute",     no_argument,       NULL, 'm' },
       { "port",     required_argument, NULL, 'p' },
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:p:r:s:t:v:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:mp:r:s:t:v:w:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -143,6 +143,7 @@ int main(int argc, char *argv[])
                            "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                            "                           0 = no logging, 1 = errors only,\n"
                            "                           2 = errors and info, 3 = errors, info and debug\n"
+                           "  -m,       --mute         mute audio of the primary DVB device at startup\n"
                            "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                            "                           0 turns off SVDRP\n"
                            "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
@@ -170,6 +171,8 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
                     return 2;
                     break;
+          case 'm': MuteAudio = true;
+                    break;
           case 'p': if (isnumber(optarg))
                        SVDRPport = atoi(optarg);
                     else {
@@ -269,7 +272,10 @@ int main(int argc, char *argv[])
   cSIProcessor::Read();
 
   Channels.SwitchTo(Setup.CurrentChannel);
-  cDvbApi::PrimaryDvbApi->SetVolume(Setup.CurrentVolume, true);
+  if (MuteAudio)
+     cDvbApi::PrimaryDvbApi->ToggleMute();
+  else
+     cDvbApi::PrimaryDvbApi->SetVolume(Setup.CurrentVolume, true);
 
   cEITScanner EITScanner;
 
@@ -351,10 +357,16 @@ int main(int argc, char *argv[])
           case kVolUp:
           case kVolDn|k_Repeat:
           case kVolDn:
-               cDvbApi::PrimaryDvbApi->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
-               break;
           case kMute:
-               cDvbApi::PrimaryDvbApi->ToggleMute();
+               if (key == kMute) {
+                  if (!cDvbApi::PrimaryDvbApi->ToggleMute() && !Menu)
+                     break; // no need to display "mute off"
+                  }
+               else
+                  cDvbApi::PrimaryDvbApi->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
+               if (!Menu && (!ReplayControl || !ReplayControl->Visible()))
+                  Menu = cDisplayVolume::Create();
+               cDisplayVolume::Process(key);
                break;
           // Power off:
           case kPower: isyslog(LOG_INFO, "Power button pressed");

From 262327908d329a8c292d8ae71fe9d135390a3cde Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 1 Apr 2002 18:00:00 +0200
Subject: [PATCH 039/307] Version 1.0.0pre5 - Fixed restoring CICAM setup
 values for a fourth DVB card (thanks to Klaus Wolf). - Completed
 internationalization of OSD texts (thanks to Hannu Savolainen,   Arnold
 Niessen, Paulo Lopes, Jean-Claude Repetto, Alberto Carraro, Matjaz   Thaler
 and Truls Slevigen). - Improved file I/O in case of EINTR, which may occur
 e.g. with heavy system   load (thanks to Werner Fink). - Now writing the
 title of a recording into the 'summary.vdr' file. - Workaround for displaying
 still frames with the unpatched LinuxDVB driver   (if anybody ever finds out
 why the unpatched driver doesn't display VDR's   still frames, please let me
 know). - When executing a command from the "Commands" menu, the title of that
 command   is now immediately shown in the status line (followed by "...") to
 give the   user some feedback that the command is being executed, which is
 especially   important if this takes some time. - Fixed scrolling the
 "Channels" menu in case the cursor ends up on a group   delimiter (thanks to
 Bernd Zierath for helping to debug this one). - Added manual pages vdr(1) and
 vdr(5) (which made the FORMATS file obsolete). - New command command line
 option '-V' to display the VDR version. - Adjusting column width for channel
 numbers in case there are more than 999   channels. - Checking the return
 value of '...FileRady...' calls in dvbapi.c for better   performance under
 heavy system load. - New 'make' target 'install', which copies the manual
 pages and executables   to their appropriate system locations and creates the
 /video directory if   it doesn't exist yet. - Automatic hotkey assignment is
 now suppressed if the first entry in   commands.conf starts with a digit in
 the range '1'...'9', followed by a blank. - Fixed a bug in switching back the
 replay mode display in time shift mode   (thanks to Achim Lange for reporting
 this one). - Fixed a bug in the 'First day' timer parameter for timers that
 record over   midnight. - Added units to Setup parameters. - Changed time
 entry in the 'Jump' command during replay, so that it is filled   up from
 right to left. - Now using statfs() to determine the amount of free disk
 space, which avoids   the use of an external 'df' command (thanks to Ruben
 Nunez Francisco). - Fixed skipping the next hit of a repeating timer (thanks
 to Rainer Zocholl   for reporting this one). - Fixed a bug when a timer
 records over midnight of a day that had a change in   Daylight Saving Time. -
 Added Polish language texts (thanks to Michael Rakowski). - Fixed a bug in
 parsing group separators in channels.conf (thanks to Henning   Holtschneider
 for reporting this one). - Changed the default 'Ok' key when using the PC
 keyboard from '5' (in the   numeric block) to 'Enter', because the '5' key
 didn't work on keyboards with   the F-keys on top. - Fixed a bug in the EPG
 bugfix mechanism if the extended description is shorter   than 3 characters
 (thanks to Andreas Schultz).

---
 CONTRIBUTORS |   40 +-
 FORMATS      |  227 ----------
 HISTORY      |   53 ++-
 INSTALL      |   12 +-
 Makefile     |   17 +-
 README       |    8 -
 config.c     |   14 +-
 config.h     |    6 +-
 dvbapi.c     |  162 +++----
 eit.c        |    6 +-
 eit.diff     |   25 ++
 i18n.c       | 1211 +++++++++++++++++++++++++++++---------------------
 keys-pc.conf |    2 +-
 menu.c       |  141 +++---
 menu.h       |    4 +-
 mpatrol.diff |   56 +++
 osd.c        |   24 +-
 recording.c  |    8 +-
 svdrp.c      |   12 +-
 tools.c      |   55 ++-
 vdr.1        |  164 +++++++
 vdr.5        |  382 ++++++++++++++++
 vdr.c        |   11 +-
 23 files changed, 1660 insertions(+), 980 deletions(-)
 delete mode 100644 FORMATS
 create mode 100644 eit.diff
 create mode 100644 mpatrol.diff
 create mode 100644 vdr.1
 create mode 100644 vdr.5

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3adfbd961..6a126c9fb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -51,10 +51,10 @@ Matthias Schniedermeyer <ms@citd.de>
  for helping to debug the "move to last position in list" bug
 
 Miha Setina <mihasetina@softhome.net>
- for translating the OSD texts to the Slovenian language
+ for translating OSD texts to the Slovenian language
 
 Alberto Carraro <bertocar@tin.it>
- for translating the OSD texts to the Italian language
+ for translating OSD texts to the Italian language
 
 Deti Fliegl <deti@fliegl.de>
  for implementing the 'CurrentChannel' setup parameter
@@ -77,7 +77,7 @@ Axel Gruber <axel@agm.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
 Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
- for translating the OSD texts to the Dutch language
+ for translating OSD texts to the Dutch language
 
 J�rgen Sauer <jojo@automatix.de>
  for implementing the -t option to set the controlling terminal
@@ -87,9 +87,10 @@ Benjamin Reichardt <reichard@math.uni-goettingen.de>
 
 Henning Holtschneider <hh@holtschneider.com>
  for patching 'runvdr' to check whether the driver is already loaded
+ for reporting a bug in parsing group separators in channels.conf
 
-Paulo Manuel Martins Lopes <pmml@netvita.pt>
- for translating the OSD texts to the Portugese language
+Paulo Lopes <pmml@netvita.pt>
+ for translating OSD texts to the Portugese language
 
 Markus Lang <pretender@gaze.de> and Ulrich R�der <dynamite@efr-net.de>
  for making DiSEqC support configurable
@@ -98,13 +99,13 @@ Markus Lang <pretender@gaze.de>
  for some initial code for grouping the Setup menu into several sub-menus
 
 Jean-Claude Repetto <jc@repetto.org>
- for translating the OSD texts to the French language
+ for translating OSD texts to the French language
 
 Andre Valentin <av2000@topmail.de>
  for increasing the key name buffer size for LIRC
 
 J�rgen Tvedt <pjtvedt@online.no>
- for translating the OSD texts to the Norwegian language
+ for translating OSD texts to the Norwegian language
 
 Stefan Huelswitt <huels@iname.com>
  for fixing the repeat function with LIRC
@@ -129,6 +130,8 @@ Andreas Schultz <aschultz@warp10.net>
  dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>)
  for adding PTS to the converted PCM audio when replaying a DVD
  for fixing a crash in case there is no 'epg.data' at program start
+ for fixing a bug in the EPG bugfix mechanism if the extended description is shorter
+ than 3 characters
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -141,6 +144,7 @@ Uwe Scheffler <UweScheffler@t-online.de>
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
+ for translating OSD texts to the Slovenian language
 
 Artur Skawina <skawina@geocities.com>
  for improving the font file generation in the Makefile
@@ -205,7 +209,7 @@ Michael Paar <mpaar@uumail.de>
  for enabling recording of radio channels
 
 Hannu Savolainen <hannu@opensound.com>
- for translating the OSD texts to the Finnish language
+ for translating OSD texts to the Finnish language
 
 J�rgen Schmidt <ju@ct.heise.de>
  for fixing a problem with 'in_addr_t' on systems with glibc < 2.2.
@@ -214,9 +218,10 @@ Uwe Freese <mail@uwe-freese.de>
  for suggesting to automatically close an empty recordings page after deleting
  an entry
 
-Rainer Zocholl <Usenet-372114@zocki.toppoint.de>
+Rainer Zocholl <vdrcontrib@zocki.toppoint.de>
  for suggesting a confirmation prompt when the user presses the "Power" button
  and there is an upcoming timer event
+ for reporting a bug in skipping the next hit of a repeating timer
 
 Oleg Assovski <assen@bitcom.msk.ru>
  for adding EPG scanning for another 4 days
@@ -233,3 +238,20 @@ Mirko G
 
 Achim Lange <Achim_Lange@t-online.de>
  for replacing 'killproc' with 'killall' in 'runvdr' to make it work on Debian
+ for reporting a bug in switching back the replay mode display in time shift mode
+
+Klaus Wolf <klaus@wolfsoft.de>
+ for reporting a bug in restoring the CICAM values for a fourth DVB card
+
+Bernd Zierath <b.zierath@ebv.com>
+ for helping to debug scrolling the "Channels" menu in case the cursor ends up on
+ a group separator
+
+Truls Slevigen <truls@slevigen.no>
+ for translating OSD texts to the Norwegian language
+
+Ruben Nunez Francisco <ruben.nunez@tang-it.com>
+ for implementing FreeDiskSpaceMB() without external 'df' command
+
+Michael Rakowski <mrak@gmx.de>
+ for translating OSD texts to the Polish language
diff --git a/FORMATS b/FORMATS
deleted file mode 100644
index 63ae7e1dd..000000000
--- a/FORMATS
+++ /dev/null
@@ -1,227 +0,0 @@
-Video Disk Recorder File Formats
---------------------------------
-
-* channels.conf
-
-  This file contains the channel setup.
-  It consists of two types of lines: "group delimiters" and "channel
-  definitions".
-
-  A "group delimiter" is a line starting with a ':' as the very first
-  character, followed by arbitrary text.
-  Example: ":First group"
-
-  A "channel definition" is a line with channel data, where the fields
-  are separated by ':' characters:
-  Example: "RTL:12188:h:1:27500:163:104:105:0:12003"
-
-  The fields in a channel definition have the following meaning (from left
-  to right):
-
-  - Name: the channel's name (if the name originally contains a ':' character
-    it has to be replaced by '|')
-  - Frequency in MHz for DVB-S and DVB-C, kHz for DVB-T (as an integer)
-  - Polarization (one of 'h', 'H', 'v', 'V') **
-  - Diseqc number **
-  - Symbol rate ***
-  - Video PID (set to '0' for radio channels, '1' for encrypted radio channels)
-  - Audio PID (either one number, or two, separated by a comma)
-    If this channel also carries Dolby Digital sound, the Dolby PIDs follow
-    the audio PIDs, separated by a semicolon, as in "...:101,102;103,104:..."
-  - Teletext PID
-  - Conditional Access (0 = Free To Air, 1..4 = explicitly requires the DVB card
-    with the given number, >=100 = requires a specific decryption method defined
-    in 'ca.conf').
-  - Program Number
-
-  Fields marked with ** are only meaningful for DVB-S receivers.
-  DVB-C and DVB-T receivers simply ignore these.
-  Fields marked with *** are only meaningful for DVB-S and DVB-C receivers.
-  DVB-T receivers simply ignore these.
-
-* ca.conf
-
-  This file contains the definitions of the various conditional access code
-  numbers. Anything after (and including) a '#' character is comment.
-  Value lines consist of an integer number, followed by a text describing
-  this decryption method (typically the name of the pay tv service using this
-  decryption method).
-  The special value 0 means "Free To Air", i.e. can be used for channels that
-  don't require additional decryption hardware.
-  The values 1..4 can be used for channels that for some reason explicitly
-  need a given DVB card (for backward compatibility).
-  The values defined in this file are the ones used in the 'Ca' parameter of
-  'channels.conf'.
-
-* timers.conf
-
-  This file contains the timer setup.
-
-  The fields in a timer definition have the following meaning (from left
-  to right):
-
-  - Timer active (0 = inactive, 1 = active, 3 = instant recording)
-    Values other than these can be used by external programs to mark active timers
-    and recognize if the user has modified them. When a user modifes an active
-    timer the 'active' field will be explicitly set to '1' (or '0', respectively,
-    if the user deactivates the timer).
-    Note: in order to allow future extensibility, external programs using the
-    'active' parameter should only use the upper 16 bit of this 32 bit parameter
-    and leave the lower 16 bit untouched.
-  - Program number of the channel to record
-  - Day of recording (in case of a repeating timer), either one or more of
-      M------ = Monday
-      -T----- = Tuesday
-      --W---- = Wednesday
-      ---T--- = Thrusday
-      ----F-- = Friday
-      -----S- = Saturday
-      ------S = Sunday
-    (any combination is possible, for example MTWTF--, and the days may be
-    indicated by any characters except '-', so for example ABC---- would set
-    a timer that records on monday, tuesday and wednesday) or the "day of month"
-    (1..31) in case of a single shot timer.
-    The day definition of a repeating timer may be followed by the date when that
-    timer shall hit for the first time. The format for this is @YYYY-MM-DD,
-    so a complete definition could look like this: MTWTF--@2002-02-18. This
-    "first day" feature can be used to disable a repeating timer for a couple
-    of days, or for instance to define a new Mon...Fri timer on wednesday, which
-    actually starts "monday next week". The "first day" date given need not be
-    that of a day when the timer would actually hit.
-  - Start time (first two digits for the hour, second two digits for the minutes)
-  - End time (first two digits for the hour, second two digits for the minutes)
-  - Priority (from 0 to 99, 0 = lowest prioity, 99 = highest priority)
-  - Guaranteed lifetime of recording (in days); 0 means that this recording may
-    be automatically deleted by a new recording with higher priority, 99 means
-    that this recording will never be automatically deleted
-  - Name of timer (will be used to name the recording); if the name contains
-    any ':' characters, these have to be replaced with '|'. If the name shall
-    contain subdirectories, these have to be delimited by '~' (since the '/'
-    character may be part of a regular programme name).
-    The special keywords TITLE and EPISODE, if present, will be replaced 
-    with the title and episode information from the EPG data at the time of
-    recording (if that data is available). If at the time of recording either
-    of these cannot be determined, TITLE will default to the channel name, and
-    EPISODE will default to a blank.
-  - Summary (any newline characters in the summary have to be replaced with '|';
-    the summary may contain ':' characters)
-
-* setup.conf
-
-  This file contains the basic configuration options for VDR.
-
-  Each line contains one option in the format "Name = Value".
-
-  See the MANUAL file for a description of the available options.
-
-* commands.conf
-
-  This file contains the definitions of commands that can be executed from
-  the "VDR" menu's "Commands" option.
-
-  Each line contains one command definition in the following format:
-
-    title : command
-
-  where 'title' is the string the will be displayed in the "Commands" menu,
-  and 'command' is the actual command string that will be executed when this
-  option is selected. The delimiting ':' may be surrounded by any number of
-  white space characters.
-
-  In order to avoid error messages to stderr, every command should have
-  stderr redirected to stdout. Everything the command prints to stdout will
-  be displayed in a result window, with 'title' as its title.
-
-  Examples:
-
-   Check for new mail: /usr/local/bin/checkmail 2>&1
-   CPU status        : /usr/local/bin/cpustatus 2>&1
-   Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
-
-* svdrphosts.conf
-
-  This file contains the IP numbers of all hosts that are allowed to access the
-  SVDRP port.
-
-  Each line contains one IP number in the format
-
-    IP-Address[/Netmask]
-
-  where 'IP-Address' is the address of a host or a network in the usual dot
-  separated notation (as in 192.168.100.1). If the optional 'Netmask' is given
-  only the given number of bits of 'IP-Address' are taken into account. This
-  allows you to grant SVDRP access to all hosts of an entire network. 'Netmask'
-  can be any integer from 1 to 32. The special value of 0 is only accepted if
-  the 'IP-Address' is 0.0.0.0, because this will give access to any host (USE
-  THIS WITH CARE!).
-
-  Everything following (and including) a '#' character is considered to be
-  comment.
-
-* marks.vdr
-
-  This file (if present in a recording directory) contains the editing marks
-  defined for this recording.
-
-  Each line contains the definition of one mark in the following format:
-
-    hh:mm:ss.ff comment
-
-  where 'hh:mm:ss.ff' is a frame position within the recording, given as "hours,
-  minutes, seconds and (optional) frame number". 'comment' can be any string
-  and may be used to describe this mark. If present, 'comment' must be separated
-  from the frame position by at least one blank.
-
-  The lines in this file need not necessarily appear in the correct temporal
-  sequence, they will be automatically sorted by time index.
-
-  CURRENT RESTRICTIONS:
-
-  - the 'comment' is currently not used by VDR
-  - marks must have a frame number, and that frame MUST be an I-frame (this
-    means that only marks generated by VDR itself can be used, since they
-    will always be guaranteed to mark I-frames).
-
-* 001.vdr ... 255.vdr
-
-  These are the actual recorded MPEG data files. In order to keep the size of
-  an individual file below a given limit, a recording is split into several
-  files. The contents of these files is "Packetized Elementary Stream" (PES)
-  and contains ES packets with ids 0xE0 for video, 0xC0 for audio 1 and 0xC1
-  for audio 2 (if available). Dolby Digital data is stored in packets with
-  ids 0xBD.
-
-* epg.data
-
-  This file contains the EPG data in an easily parsable format. The first
-  character of each line defines what kind of data this line contains.
-
-  The following tag characters are defined:
-
-  C <service id> <channel name>
-  E <event id> <start time> <duration> <table id>
-  T <title>
-  S <subtitle>
-  D <description>
-  e
-  c
-
-  Lowercase characters mark the end of a sequence that was started by the
-  corresponding uppercase character. The outer frame consists of a sequence
-  of one or more 'C'...'c' (Channel) entries. Inside these any number of
-  'E'...'e' (Event) entries are allowed. The 'T', 'S' and 'D' entries are
-  optional (although every event should at least have a 'T' entry).
-
-  <service id>   is the "program number" as defined in 'channels.conf'
-  <channel name> is the "name" as in 'channels.conf' (for information only)
-  <start time>   is the time (as a time_t integer) in UTC when this event starts
-  <duration>     is the time (in seconds) that this event will take
-  <table id>     is a hex number that indicates the table this event is contained
-                 in (if this is left empty or 0 this event will not be overwritten
-                 or modified by data that comes from the DVB stream)
-  <title>        is the title of the event
-  <subtitle>     is the subtitle (typically the name of the episode etc.)
-  <description>  is the description of the event
-
-  This file will be read at program startup in order to restore the results of
-  previous EPG scans.
diff --git a/HISTORY b/HISTORY
index 708f6d9da..cafa4c1dd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -529,7 +529,7 @@ Video Disk Recorder Revision History
 2001-06-26: Version 0.83
 
 - Avoiding "Device or resource busy" error message when setting PIDs.
-- Added Portugese language texts (thanks to Paulo Manuel Martins Lopes).
+- Added Portugese language texts (thanks to Paulo Lopes).
 - Recording and replaying Dolby Digital (AC3) sound.
 - No longer getting stuck when a channel doesn't sync while switching
   with the 'Up' and 'Down' keys.
@@ -1119,3 +1119,54 @@ Video Disk Recorder Revision History
   driver are wrapped into a mechanism that actually performs this action if VDR
   exits. The 'runvdr' script can be used for this purpose.
 - Refined texts of the "Setup" menu.
+
+2002-04-01: Version 1.0.0pre5
+
+- Fixed restoring CICAM setup values for a fourth DVB card (thanks to Klaus Wolf).
+- Completed internationalization of OSD texts (thanks to Hannu Savolainen,
+  Arnold Niessen, Paulo Lopes, Jean-Claude Repetto, Alberto Carraro, Matjaz
+  Thaler and Truls Slevigen).
+- Improved file I/O in case of EINTR, which may occur e.g. with heavy system
+  load (thanks to Werner Fink).
+- Now writing the title of a recording into the 'summary.vdr' file.
+- Workaround for displaying still frames with the unpatched LinuxDVB driver
+  (if anybody ever finds out why the unpatched driver doesn't display VDR's
+  still frames, please let me know).
+- When executing a command from the "Commands" menu, the title of that command
+  is now immediately shown in the status line (followed by "...") to give the
+  user some feedback that the command is being executed, which is especially
+  important if this takes some time.
+- Fixed scrolling the "Channels" menu in case the cursor ends up on a group
+  delimiter (thanks to Bernd Zierath for helping to debug this one).
+- Added manual pages vdr(1) and vdr(5) (which made the FORMATS file obsolete).
+- New command command line option '-V' to display the VDR version.
+- Adjusting column width for channel numbers in case there are more than 999
+  channels.
+- Checking the return value of '...FileRady...' calls in dvbapi.c for better
+  performance under heavy system load.
+- New 'make' target 'install', which copies the manual pages and executables
+  to their appropriate system locations and creates the /video directory if
+  it doesn't exist yet.
+- Automatic hotkey assignment is now suppressed if the first entry in
+  commands.conf starts with a digit in the range '1'...'9', followed by a blank.
+- Fixed a bug in switching back the replay mode display in time shift mode
+  (thanks to Achim Lange for reporting this one).
+- Fixed a bug in the 'First day' timer parameter for timers that record over
+  midnight.
+- Added units to Setup parameters.
+- Changed time entry in the 'Jump' command during replay, so that it is filled
+  up from right to left.
+- Now using statfs() to determine the amount of free disk space, which avoids
+  the use of an external 'df' command (thanks to Ruben Nunez Francisco).
+- Fixed skipping the next hit of a repeating timer (thanks to Rainer Zocholl
+  for reporting this one).
+- Fixed a bug when a timer records over midnight of a day that had a change in
+  Daylight Saving Time.
+- Added Polish language texts (thanks to Michael Rakowski).
+- Fixed a bug in parsing group separators in channels.conf (thanks to Henning
+  Holtschneider for reporting this one).
+- Changed the default 'Ok' key when using the PC keyboard from '5' (in the
+  numeric block) to 'Enter', because the '5' key didn't work on keyboards with
+  the F-keys on top.
+- Fixed a bug in the EPG bugfix mechanism if the extended description is shorter
+  than 3 characters (thanks to Andreas Schultz).
diff --git a/INSTALL b/INSTALL
index e87f7bea8..911285cee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -78,6 +78,8 @@ option to set the controlling terminal, as in
 
 vdr:123:respawn:/usr/local/bin/vdr --terminal=/dev/tty8 -w 60
 
+See the man page vdr(1) for complete information about all command line options.
+
 Locale
 ------
 
@@ -279,17 +281,15 @@ with the name of the basic directory when running 'vdr':
 Configuration files:
 --------------------
 
-There are three configuration files that hold information about
-channels, remote control keys and timers. By default these files are
+There are several configuration files that hold information about
+channels, remote control keys, timers etc. By default these files are
 assumed to be located in the video directory, but a different directory
 can be used with the '-c' option. For starters just copy all *.conf files from
 the VDR directory into your video directory.
 
 The configuration files can be edited with any text editor, or will be written
 by the 'vdr' program if any changes are made inside the on-screen menus.
-The meaning of the data entries may still vary in future releases, so for the
-moment please look at the source code (config.c) to see the meaning of the
-various fields.
+Take a look at man page vdr(5) for information about the file formats.
 
 The files that come with this package contain the author's selections,
 so please make sure you adapt these to your personal taste. Also make sure
@@ -350,7 +350,7 @@ The default PC key assignments are:
 
   Up, Down, Left, Right     Crsr keys in numeric block
   Menu                      'Home' in numeric block
-  Ok                        '5' in numeric block
+  Ok                        'Enter'
   Back                      'End' in numeric block
   Red, Green, Yellow, Blue  'F1'..'F4'
   0..9                      '0'..'9' in top row
diff --git a/Makefile b/Makefile
index ecb8f81fa..62fd8973b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,16 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.31 2002/02/24 12:29:54 kls Exp $
+# $Id: Makefile 1.33 2002/04/01 12:50:48 kls Exp $
 
 .DELETE_ON_ERROR:
 
 DVBDIR   = ../DVB
 DTVDIR   = ./libdtv
+MANDIR   = /usr/local/man
+BINDIR   = /usr/local/bin
+
+VIDEODIR = /video
 
 INCLUDES = -I$(DVBDIR)/ost/include
 
@@ -84,6 +88,17 @@ genfontfile: genfontfile.c
 $(DTVLIB) $(DTVDIR)/libdtv.h:
 	make -C $(DTVDIR) all
 
+# Install the files:
+
+install:
+	@cp vdr runvdr $(BINDIR)
+	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
+	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
+	@if [ ! -d $(VIDEODIR) ]; then\
+            mkdir $(VIDEODIR);\
+            cp *.conf $(VIDEODIR);\
+            fi
+
 # Housekeeping:
 
 clean:
diff --git a/README b/README
index 0dfc875ef..6b6e33e6d 100644
--- a/README
+++ b/README
@@ -31,11 +31,3 @@ file management and even "on disk editing". The menus
 of commercial set-top-boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
-
-What do you think?
-------------------
-
-So, what do you think about this project? Does it make sense? Were you
-able to use it? Do you have suggestions on how to improve it?
-Please send email to kls@cadsoft.de if you'd like to comment on this.
-
diff --git a/config.c b/config.c
index b89fe748d..7104dcc27 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.91 2002/03/17 14:24:09 kls Exp $
+ * $Id: config.c 1.96 2002/04/01 11:54:05 kls Exp $
  */
 
 #include "config.h"
@@ -248,6 +248,7 @@ bool cChannel::Parse(const char *s)
         strn0cpy(name, s, MaxChannelName);
         name[strlen(name) - 1] = 0; // strip the '\n'
         groupSep = true;
+        number = 0;
         }
      else
         return false;
@@ -439,6 +440,7 @@ int cTimer::ParseDay(const char *s, time_t *FirstDay)
                  tm_r.tm_year -= 1900;
                  tm_r.tm_mon--;
                  tm_r.tm_hour = tm_r.tm_min = tm_r.tm_sec = 0;
+                 tm_r.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
                  *FirstDay = mktime(&tm_r);
                  }
               }
@@ -560,6 +562,7 @@ time_t cTimer::IncDay(time_t t, int Days)
   tm tm = *localtime_r(&t, &tm_r);
   tm.tm_mday += Days; // now tm_mday may be out of its valid range
   int h = tm.tm_hour; // save original hour to compensate for DST change
+  tm.tm_isdst = -1;   // makes sure mktime() will determine the correct DST setting
   t = mktime(&tm);    // normalize all values
   tm.tm_hour = h;     // compensate for DST change
   return mktime(&tm); // calculate final result
@@ -572,6 +575,7 @@ time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
   tm.tm_hour = SecondsFromMidnight / 3600;
   tm.tm_min = (SecondsFromMidnight % 3600) / 60;
   tm.tm_sec =  SecondsFromMidnight % 60;
+  tm.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
   return mktime(&tm);
 }
 
@@ -602,7 +606,7 @@ bool cTimer::Matches(time_t t)
          if ((!firstday || a >= firstday) && t <= b) {
             startTime = a;
             stopTime = b;
-            if (t >= firstday)
+            if (t >= firstday + SECSINDAY)
                firstday = 0;
             break;
             }
@@ -638,9 +642,9 @@ void cTimer::SetPending(bool Pending)
   pending = Pending;
 }
 
-void cTimer::SkipToday(void)
+void cTimer::Skip(void)
 {
-  firstday = IncDay(SetTime(recording ? StartTime() : time(NULL), 0), 1);
+  firstday = IncDay(SetTime(StartTime(), 0), 1);
 }
 
 // --- cCommand -------------------------------------------------------------
@@ -980,7 +984,7 @@ bool cSetup::ParseCaCaps(const char *Value)
 {
   char *p;
   int d = strtol(Value, &p, 10);
-  if (d > 0 && d < MAXDVBAPI) {
+  if (d > 0 && d <= MAXDVBAPI) {
      d--;
      int i = 0;
      while (p != Value && p && *p) {
diff --git a/config.h b/config.h
index 4a216f139..e7c01eb2b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.105 2002/03/17 14:24:11 kls Exp $
+ * $Id: config.h 1.107 2002/03/31 21:17:30 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0pre4"
+#define VDRVERSION "1.0.0pre5"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -165,7 +165,7 @@ class cTimer : public cListObject {
   time_t StopTime(void);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
-  void SkipToday(void);
+  void Skip(void);
   const char *PrintFirstDay(void);
   static int TimeToInt(int t);
   static int ParseDay(const char *s, time_t *FirstDay = NULL);
diff --git a/dvbapi.c b/dvbapi.c
index 1ade142b0..d9906189d 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.163 2002/03/16 14:20:47 kls Exp $
+ * $Id: dvbapi.c 1.166 2002/03/29 11:32:47 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -98,7 +98,7 @@ class cIndexFile {
 private:
   struct tIndex { int offset; uchar type; uchar number; short reserved; };
   int f;
-  char *fileName, *pFileExt;
+  char *fileName;
   int size, last;
   tIndex *index;
   cResumeFile resumeFile;
@@ -120,7 +120,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
 :resumeFile(FileName)
 {
   f = -1;
-  fileName = pFileExt = NULL;
+  fileName = NULL;
   size = 0;
   last = -1;
   index = NULL;
@@ -128,7 +128,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
      fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + 1];
      if (fileName) {
         strcpy(fileName, FileName);
-        pFileExt = fileName + strlen(fileName);
+        char *pFileExt = fileName + strlen(fileName);
         strcpy(pFileExt, INDEXFILESUFFIX);
         int delta = 0;
         if (access(fileName, R_OK) == 0) {
@@ -177,8 +177,6 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
               }
            else
               LOG_ERROR_STR(fileName);
-           delete fileName;
-           fileName = pFileExt = NULL;
            }
         }
      else
@@ -223,14 +221,14 @@ bool cIndexFile::CatchUp(int Index)
                      last = newLast;
                      }
                   else
-                     LOG_ERROR;
+                     LOG_ERROR_STR(fileName);
                   }
                else
                   esyslog(LOG_ERR, "ERROR: can't realloc() index");
                }
             }
          else
-            LOG_ERROR;
+            LOG_ERROR_STR(fileName);
          if (Index >= last)
             sleep(1);
          else
@@ -244,8 +242,8 @@ bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 {
   if (f >= 0) {
      tIndex i = { FileOffset, PictureType, FileNumber, 0 };
-     if (safe_write(f, &i, sizeof(i)) != sizeof(i)) {
-        esyslog(LOG_ERR, "ERROR: can't write to index file");
+     if (safe_write(f, &i, sizeof(i)) < 0) {
+        LOG_ERROR_STR(fileName);
         close(f);
         f = -1;
         return false;
@@ -527,23 +525,25 @@ void cRecordBuffer::Input(void)
   time_t t = time(NULL);
   recording = true;
   for (;;) {
-      int r = read(videoDev, b, sizeof(b));
-      if (r > 0) {
-         uchar *p = b;
-         while (r > 0) {
-               int w = Put(p, r);
-               p += w;
-               r -= w;
-               }
-         t = time(NULL);
-         }
-      else if (r < 0) {
-         if (FATALERRNO) {
-            if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-               esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
-            else {
-               LOG_ERROR;
-               break;
+      if (cFile::FileReady(videoDev, 100)) {
+         int r = read(videoDev, b, sizeof(b));
+         if (r > 0) {
+            uchar *p = b;
+            while (r > 0) {
+                  int w = Put(p, r);
+                  p += w;
+                  r -= w;
+                  }
+            t = time(NULL);
+            }
+         else if (r < 0) {
+            if (FATALERRNO) {
+               if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
+                  esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
+               else {
+                  LOG_ERROR;
+                  break;
+                  }
                }
             }
          }
@@ -552,7 +552,6 @@ void cRecordBuffer::Input(void)
          cThread::EmergencyExit(true);
          t = time(NULL);
          }
-      cFile::FileReady(videoDev, 100);
       if (!recording)
          break;
       }
@@ -579,17 +578,12 @@ void cRecordBuffer::Output(void)
             if (NextFile()) {
                if (index && pictureType != NO_PICTURE)
                   index->Write(pictureType, fileName.Number(), fileSize);
-               while (Result > 0) {
-                     int w = safe_write(recordFile, p, Result);
-                     if (w < 0) {
-                        LOG_ERROR_STR(fileName.Name());
-                        recording = false;
-                        return;
-                        }
-                     p += w;
-                     Result -= w;
-                     fileSize += w;
-                     }
+               if (safe_write(recordFile, p, Result) < 0) {
+                  LOG_ERROR_STR(fileName.Name());
+                  recording = false;
+                  return;
+                  }
+               fileSize += Result;
                }
             else
                break;
@@ -797,16 +791,17 @@ void cPlayBuffer::Output(void)
               const uchar *p = frame->Data();
               int r = frame->Count();
               while (r > 0 && Busy() && !blockOutput) {
-                    cFile::FileReadyForWriting(videoDev, 100);
-                    int w = write(videoDev, p, r);
-                    if (w > 0) {
-                       p += w;
-                       r -= w;
-                       }
-                    else if (w < 0 && FATALERRNO) {
-                       LOG_ERROR;
-                       Stop();
-                       return;
+                    if (cFile::FileReadyForWriting(videoDev, 100)) {
+                       int w = write(videoDev, p, r);
+                       if (w > 0) {
+                          p += w;
+                          r -= w;
+                          }
+                       else if (w < 0 && FATALERRNO) {
+                          LOG_ERROR;
+                          Stop();
+                          return;
+                          }
                        }
                     }
               writeIndex = frame->Index();
@@ -1182,10 +1177,26 @@ void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
 void cReplayBuffer::DisplayFrame(uchar *b, int Length)
 {
   StripAudioPackets(b, Length);
-  videoDisplayStillPicture sp = { (char *)b, Length };
   CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
   CHECK(ioctl(audioDev, AUDIO_SET_MUTE, true));
+/* Using the VIDEO_STILLPICTURE ioctl call would be the
+   correct way to display a still frame, but unfortunately this
+   doesn't work with frames from VDR. So let's do pretty much the
+   same here as in DVB/driver/dvb.c's play_iframe() - I have absolutely
+   no idea why it works this way, but doesn't work with VIDEO_STILLPICTURE.
+   If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
+   could be used, please let me know!
+   kls 2002-03-23
+*/
+//#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+#ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+  videoDisplayStillPicture sp = { (char *)b, Length };
   CHECK(ioctl(videoDev, VIDEO_STILLPICTURE, &sp));
+#else
+#define MIN_IFRAME 400000
+  for (int i = MIN_IFRAME / Length + 1; i > 0; i--)
+      safe_write(videoDev, b, Length);
+#endif
 }
 
 void cReplayBuffer::Close(void)
@@ -1361,31 +1372,32 @@ void cTransferBuffer::Input(void)
   uchar b[MINVIDEODATA];
   int n = 0;
   while (Busy()) {
-        cFile::FileReady(fromDevice, 100);
-        int r = read(fromDevice, b + n, sizeof(b) - n);
-        if (r > 0) {
-           n += r;
-           int Count = n, Result;
-           const uchar *p = remux.Process(b, Count, Result);
-           if (p) {
-              while (Result > 0 && Busy()) {
-                    int w = Put(p, Result);
-                    p += w;
-                    Result -= w;
-                    }
-              }
-           if (Count > 0) {
-              n -= Count;
-              memmove(b, b + Count, n);
+        if (cFile::FileReady(fromDevice, 100)) {
+           int r = read(fromDevice, b + n, sizeof(b) - n);
+           if (r > 0) {
+              n += r;
+              int Count = n, Result;
+              const uchar *p = remux.Process(b, Count, Result);
+              if (p) {
+                 while (Result > 0 && Busy()) {
+                       int w = Put(p, Result);
+                       p += w;
+                       Result -= w;
+                       }
+                 }
+              if (Count > 0) {
+                 n -= Count;
+                 memmove(b, b + Count, n);
+                 }
               }
-           }
-        else if (r < 0) {
-           if (FATALERRNO) {
-              if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-                 esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
-              else {
-                 LOG_ERROR;
-                 break;
+           else if (r < 0) {
+              if (FATALERRNO) {
+                 if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
+                    esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
+                 else {
+                    LOG_ERROR;
+                    break;
+                    }
                  }
               }
            }
@@ -1541,7 +1553,7 @@ void cCuttingBuffer::Action(void)
                  }
               LastIFrame = 0;
               }
-           if (safe_write(toFile, buffer, Length) != Length) {
+           if (safe_write(toFile, buffer, Length) < 0) {
               error = "safe_write";
               break;
               }
diff --git a/eit.c b/eit.c
index 011000b70..4fc749bfa 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.41 2002/03/17 14:23:41 kls Exp $
+ * $Id: eit.c 1.42 2002/04/01 12:58:20 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -560,8 +560,8 @@ void cEventInfo::FixEpgBugs(void)
      pExtendedDescription = compactspace(pExtendedDescription);
      // Remove superfluous hyphens:
      if (pExtendedDescription) {
-        char *p = pExtendedDescription + 1;
-        while (*p) {
+        char *p = pExtendedDescription;
+        while (*p && *(p + 1) && *(p + 2)) {
               if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
                  if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
                     memmove(p, p + 2, strlen(p + 2) + 1);
diff --git a/eit.diff b/eit.diff
new file mode 100644
index 000000000..57584b966
--- /dev/null
+++ b/eit.diff
@@ -0,0 +1,25 @@
+# This is a BitKeeper generated patch for the following project:
+# Project Name: Linux VDR
+# This patch format is intended for GNU patch command version 2.5 or higher.
+# This patch includes the following deltas:
+#	           ChangeSet	1.21    -> 1.22   
+#	               eit.c	1.6     -> 1.7    
+#
+# The following is the BitKeeper ChangeSet Log
+# --------------------------------------------
+# 02/04/01	aschultz@warp10.net	1.22
+# fix segfault in eit.c
+# --------------------------------------------
+#
+diff -Nru a/eit.c b/eit.c
+--- a/eit.c	Mon Apr  1 14:38:00 2002
++++ b/eit.c	Mon Apr  1 14:38:00 2002
+@@ -559,7 +559,7 @@
+      pSubtitle = compactspace(pSubtitle);
+      pExtendedDescription = compactspace(pExtendedDescription);
+      // Remove superfluous hyphens:
+-     if (pExtendedDescription) {
++     if (pExtendedDescription && strlen(pExtendedDescription) >= 3) {
+         char *p = pExtendedDescription + 1;
+         while (*p) {
+               if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
diff --git a/i18n.c b/i18n.c
index a7d63059b..0ffbf4528 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,15 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.66 2002/03/17 13:50:43 kls Exp $
+ * $Id: i18n.c 1.78 2002/04/01 11:37:08 kls Exp $
  *
- * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
- * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
- * Dutch     translations provided by Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
- * Portugese translations provided by Paulo Manuel Martins Lopes <pmml@netvita.pt>
- * French    translations provided by Jean-Claude Repetto <jc@repetto.org>
- * Norwegian translations provided by J�rgen Tvedt <pjtvedt@online.no>
- * Finnish   translations provided by Hannu Savolainen <hannu@opensound.com>
+ * Slovenian  translations provided by Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
+ * Italian    translations provided by Alberto Carraro <bertocar@tin.it>
+ * Dutch      translations provided by Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
+ * Portuguese translations provided by Paulo Lopes <pmml@netvita.pt>
+ * French     translations provided by Jean-Claude Repetto <jc@repetto.org>
+ * Norwegian  translations provided by J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
+ * Finnish    translations provided by Hannu Savolainen <hannu@opensound.com>
+ * Polish     translations provided by Michael Rakowski <mrak@gmx.de>
  *
  */
 
@@ -61,7 +62,7 @@
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 9;
+const int NumLanguages = 10;
 
 typedef const char *tPhrase[NumLanguages];
 
@@ -72,10 +73,11 @@ const tPhrase Phrases[] = {
     "Slovenski",
     "Italiano",
     "Nederlands",
-    "Portugues",
+    "Portugu�s",
     "Fran�ais",
     "Norsk",
     "Suomi",
+    "Polski",
   },
   // Menu titles:
   { "VDR",
@@ -87,46 +89,51 @@ const tPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
     "Urnik",
     "Programmi",
     "Gids",
-    "Programa",
+    "Programa��o",
     "Programmes",
     "Programmer",
     "Ohjelmat",
+    "Program",
   },
   { "Channels",
     "Kan�le",
     "Kanali",
     "Canali",
     "Kanalen",
-    "Canal",
+    "Canais",
     "Cha�nes",
     "Kanaler",
     "Kanavat",
+    "Kanaly",
   },
   { "Timers",
     "Timer",
     "Termini",
     "Timer",
     "Timers",
-    "Alarmes",
+    "Timers",
     "Programmation",
-    "Timer",
+    "Timere",
     "Ajastin",
+    "Timery",
   },
   { "Recordings",
     "Aufzeichnungen",
     "Posnetki",
     "Registrazioni",
     "Opnames",
-    "Gravacoes",
+    "Grava��es",
     "Enregistrements",
     "Opptak",
     "Nauhoitteet",
+    "Nagrania",
   },
   { "Setup",
     "Einstellungen",
@@ -137,6 +144,7 @@ const tPhrase Phrases[] = {
     "Configuration",
     "Konfigurasjon",
     "Asetukset",
+    "Nastawy",
   },
   { "Commands",
     "Befehle",
@@ -147,6 +155,7 @@ const tPhrase Phrases[] = {
     "Commandes",
     "Kommandoer",
     "Komennot",
+    "Rozkazy",
   },
   { "Edit Channel",
     "Kanal Editieren",
@@ -157,16 +166,18 @@ const tPhrase Phrases[] = {
     "Modifier une cha�ne",
     "Editer Kanal",
     "Muokkaa kanavaa",
+    "Ustawienie Kanalu",
   },
   { "Edit Timer",
     "Timer Editieren",
     "Uredi termin",
     "Modifica Timer",
     "Timer veranderen",
-    "Modificar Alarme",
+    "Modificar Timer",
     "Changer la programmation",
     "Editer Timer",
     "Muokkaa ajastusta",
+    "Ustawienie Timerow",
   },
   { "Event",
     "Sendung",
@@ -177,6 +188,7 @@ const tPhrase Phrases[] = {
     "Ev�nement",
     "Hendelse",
     "Tapahtuma",
+    "Audycja",
   },
   { "Summary",
     "Inhalt",
@@ -187,6 +199,7 @@ const tPhrase Phrases[] = {
     "R�sum�",
     "Sammendrag",
     "Yhteenveto",
+    "Zawartosc",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -197,26 +210,29 @@ const tPhrase Phrases[] = {
     "Programmes - %s",
     "Program Guide - %s",
     "Ohjelma - %s",
+    "Program - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
     "Kaj je na sporedu?",
     "In programmazione",
     "Wat is er nu?",
-    "O que ver agora?",
+    "Programa actual?",
     "Programmes en cours",
     "Hvilket program sendes n�?",
     "Nykyinen ohjelma",
+    "Program biezacy",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
     "Kaj sledi?",
     "Prossimi programmi",
     "Wat komt er hierna?",
-    "O que ver depois?",
+    "Pr�ximo Programa?",
     "Prochains programmes",
     "Hvilket program er neste?",
     "Seuraava ohjelma",
+    "Program nastepny",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -228,6 +244,7 @@ const tPhrase Phrases[] = {
     "Modifier",
     "Editer",
     "Muuta",
+    "Edycja",
   },
   { "New",
     "Neu",
@@ -238,6 +255,7 @@ const tPhrase Phrases[] = {
     "Nouveau",
     "Ny",
     "Uusi",
+    "Nowy",
   },
   { "Delete",
     "L�schen",
@@ -248,6 +266,7 @@ const tPhrase Phrases[] = {
     "Supprimer",
     "Slett",
     "Poista",
+    "Usunac",
   },
   { "Mark",
     "Markieren",
@@ -258,16 +277,18 @@ const tPhrase Phrases[] = {
     "Marquer",
     "Marker",
     "Merkitse",
+    "Zaznaczyc",
   },
   { "On/Off",
     "Ein/Aus",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Vklop/Izklop",
+    "On/Off",
+    "Aan/Uit",
+    "On/Off",
     "Marche/Arr",
-    "", // TODO
-    "", // TODO
+    "Av/P�",
+    "P��ll�/Pois",
+    "Zal./ Wyl.",
   },
   { "Record",
     "Aufnehmen",
@@ -278,6 +299,7 @@ const tPhrase Phrases[] = {
     "Enregistre",
     "Ta opp",
     "Nauhoita",
+    "Nagrywac",
   },
   { "Play",
     "Wiedergabe",
@@ -288,26 +310,29 @@ const tPhrase Phrases[] = {
     "Lire",
     "Spill av",
     "Toista",
+    "Odtwarzac",
   },
   { "Rewind",
     "Anfang",
     "Zacetek",
     "Da inizio",
-    "Spoel terug",
+    "Naar begin",
     "Rebobinar",
     "Retour",
     "Spol tilbake",
     "Takaisinkel.",
+    "Poczatek",
   },
   { "Button$Stop",
     "Beenden",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Ustavi",
+    "Stop",
+    "Eindigen",
+    "Parar",
+    "Arr�t",
+    "Stopp",
+    "Pys�yt�",
+    "Zakonczyc",
   },
   { "Resume",
     "Weiter",
@@ -318,6 +343,7 @@ const tPhrase Phrases[] = {
     "Reprendre",
     "Fortsett",
     "Jatka",
+    "Dalej",
   },
   { "Summary",
     "Inhalt",
@@ -328,16 +354,18 @@ const tPhrase Phrases[] = {
     "R�sum�",
     "Sammendrag",
     "Yhteenveto",
+    "Zawartosc",
   },
   { "Open",
     "�ffnen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Odpri",
+    "Apri",
+    "Openen",
+    "Abrir",
     "Ouvrir",
-    "", // TODO
+    "�pne",
     "Avaa",
+    "Otworzyc",
   },
   { "Switch",
     "Umschalten",
@@ -348,6 +376,7 @@ const tPhrase Phrases[] = {
     "Regarder",
     "Skift til",
     "Valitse",
+    "Przelaczyc",
   },
   { "Now",
     "Jetzt",
@@ -358,6 +387,7 @@ const tPhrase Phrases[] = {
     "Maintenant",
     "N�",
     "Nyt",
+    "Teraz",
   },
   { "Next",
     "N�chste",
@@ -368,36 +398,40 @@ const tPhrase Phrases[] = {
     "Apr�s",
     "Neste",
     "Seuraava",
+    "Nastepny",
   },
   { "Button$Schedule",
     "Programm",
     "Urnik",
     "Programma",
     "Programma",
-    "Programa",
+    "Programa��o",
     "Programme",
     "Programmer",
     "Ohjelmisto",
+    "Program",
   },
   { "Language",
     "Sprache",
     "Jezik",
     "Linguaggio",
     "Taal",
-    "Linguagem", // TODO (correct?)
+    "Linguagem",
     "Langue",
     "Spr�k",
     "Kieli",
+    "Jezyk",
   },
   { "Eject",
     "Auswerfen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Izvrzi",
+    "Eject",
+    "Eject",
+    "Ejectar",
     "Ejection",
-    "", // TODO
+    "Eject",
     "Avaa",
+    "Wyrzucenie",
   },
   // Confirmations:
   { "Delete channel?",
@@ -405,120 +439,132 @@ const tPhrase Phrases[] = {
     "Odstrani kanal?",
     "Cancello il canale?",
     "Kanaal verwijderen?",
-    "Apagar o Canal?",
+    "Apagar o canal?",
     "Supprimer la cha�ne?",
     "Slette kanal?",
     "Poistetaanko kanava?",
+    "Usunac kanal?",
   },
   { "Delete timer?",
     "Timer l�schen?",
     "Odstani termin?",
     "Cancello il timer?",
     "Timer verwijderen?",
-    "Apagar o Alarme?",
+    "Apagar o timer?",
     "Supprimer la programmation?",
     "Slette timer?",
     "Poistetaanko ajastus?",
+    "Usunac timer?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
     "Odstrani posnetek?",
     "Cancello la registrazione?",
     "Opname verwijderen?",
-    "Apagar Gravac�o?",
+    "Apagar a grava��o?",
     "Supprimer l'enregistrement?",
     "Slette opptak?",
     "Poistetaanko nauhoitus?",
+    "Usunac nagranie?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Snemanje po terminu - zares odstrani?",
+    "Timer in regestazione - cancello?",
+    "Timer neemt nog op - toch verwijderen?"
+    "Timer activo - t�m a certeza que quer apagar?",
     "Enregistrement en cours - confirmez la suppression",
-    "", // TODO
-    "", // TODO
+    "Timer gj�r opptak - vil du slette likevel?",
+    "Ajastin nauhoittaa - poistetaanko silti?",
+    "Nagrywanie w trakcie - napewno usunac?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
     "Koncaj snemanje?",
     "Fermo la registrazione?",
     "Opname stoppen?",
-    "Parar Gravac�o?",
+    "Parar Grava��o?",
     "Arr�ter l'enregistrement?",
     "Stoppe opptak?",
     "Pys�ytet��nk� nauhoitus?",
+    "Zakonczyc nagranie?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "sur la carte principale",
-    "", // TODO
+    "na primarni napravi",
+    "su interfaccia primaria",
+    "op eerste interface",
+    "no interface prim�rio",
+    "sur la carte primaire",
+    "p� f�rste enhet",
     "p��vastaanottimella",
+    "na pierwszym interfejsie",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
     "Zelite prekiniti urejanje?",
     "Annullo la modifica?",
     "Bewerken afbreken?",
-    "Cancelar Modificar?",
+    "Cancelar Modifica��es?",
     "Annuler les modifications?",
     "Avbryte redigering?",
     "Peruutetaanko muokkaus?",
+    "Zakonczyc montaz?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Zares ponoven zagon",
+    "Eseguo un restart?",
+    "Werkelijk opnieuw starten?",
+    "Tem a certeza que quer reiniciar?",
+    "Red�marrer?",
+    "Vil du virkelig starte p� nytt?",
+    "Aloitetaanko varmasti alusta?",
+    "Rzeczywiscie nowy start?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Snemanje - zares ponoven zagon",
+    "In registrazione - restart comunque?",
+    "Opname loopt - toch opnieuw starten?",
+    "Em grava��o - quer mesmo reiniciar?",
+    "Enregistrement en cours - red�marrer?",
+    "Gj�r opptak - starte p� nytt likevel?",
+    "Nauhoitus k�ynniss� - aloitetaanko alusta?",
+    "Nagrywanie w trakcie - rzeczywiscie nowy start?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Snemanje - zares izklopi?",
+    "In registrazione - spengo comunque?",
+    "Opname loopt - toch uitschakelen?",
+    "Em grava��o - quer mesmo desligar?",
     "Enregistrement en cours - confirmez l'arr�t",
-    "", // TODO
+    "Gj�r opptak - sl� av likevel?",
     "Nauhoitus kesken - lopetetaanko se?",
+    "Nagrywanie w trakcie - mimo to wylaczyc?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Enregistrement dans %d minutes - confirmez l'arr�t", // TODO
-    "", // TODO
-    "", // TODO
+    "Snemanje cez %d minut, zares izklopi?",
+    "Registrazione fra %d minuti - spengo comunque?",
+    "Opname in %d minuten - toch uitschakelen?",
+    "Em grava��o dentro de %d minutos - quer mesmo desligar?",
+    "Enregistrement dans %d minutes - confirmez l'arr�t",
+    "Skal gj�re opptak om %d minutter - sl� av likevel?",
+    "Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
+    "Nagrywanie za %d minut - mimo to wylaczyc?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Pritisni katerikoli gumb za preklic izklopa",
+    "Un tasto per annullare lo spegnimento",
+    "Druk een toets om shutdown af te breken",
+    "Pressione qualquer tecla para cancelar",
     "Appuyez sur une touche pour annuler l'arr�t",
-    "", // TODO
+    "Trykk en tast for ikke � sl� av",
     "Peruuta pys�ytys painamalla jotakin n�pp�int�",
+    "Dowolny przycisk zatrzyma wylaczanie",
   },
   // Channel parameters:
   { "Name",
@@ -530,26 +576,29 @@ const tPhrase Phrases[] = {
     "Nom",
     "Navn",
     "Nimi",
+    "Nazwa",
   },
   { "Frequency",
     "Frequenz",
     "Frekvenca",
     "Frequenza",
     "Frequentie",
-    "Frequencia",
+    "Frequ�ncia",
     "Fr�quence",
     "Frekvens",
     "Taajuus",
+    "Czestotliwosc",
   },
   { "Polarization",
     "Polarisation",
     "Polarizacija",
     "Polarizzazione",
     "Polarisatie",
-    "Polarizacao",
+    "Polariza��o",
     "Polarisation",
-    "Polaritet",
+    "Polarisasjon",
     "Polarisaatio",
+    "Polaryzacja",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -560,6 +609,7 @@ const tPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -568,7 +618,8 @@ const tPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Fr�q. Symbole",
-    "Symbolrate",
+    "Srate",
+    "Srate",
     "Srate",
   },
   { "Vpid",
@@ -576,20 +627,22 @@ const tPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "Vpid",
-    "Vpid",
+    "PID de V�deo",
     "PID Vid�o",
-    "Video pid",
+    "Vpid",
     "Kuva PID",
+    "Vpid",
   },
   { "Apid1",
     "Apid1",
     "Apid1",
     "Apid1",
     "Apid1",
-    "Apid1",
+    "PID �udio (1)",
     "PID Audio (1)",
-    "Audio pid1",
+    "Apid1",
     "��ni PID1",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -597,59 +650,65 @@ const tPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "Apid2",
-    "PID Audio (2)",
-    "Audio pid2",
+    "PID �udio (2)",
+    "Apid2",
     "��ni PID2",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
     "Dpid1",
     "Dpid1",
     "Dpid1",
-    "Dpid1",
     "PID AC3 (1)",
-    "AC3 pid1",
+    "PID AC3 (1)",
+    "AC3pid1",
     "AC3 PID1",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
     "Dpid2",
     "Dpid2",
     "Dpid2",
-    "Dpid2",
     "PID AC3 (2)",
-    "AC3 pid2",
+    "PID AC3 (2)",
+    "AC3pid2",
     "AC3 PID2",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
     "Tpid",
     "Tpid",
     "Tpid",
-    "Tpid",
+    "PID Teletexto",
     "PID T�l�texte",
-    "Teletext pid",
+    "Tekst-TV pid",
     "TekstiTV PID",
+    "Tpid",
   },
   { "CA",
     "CA",
     "CA",
     "CA",
     "CA",
-    "CA",
+    "Encripta��o",
     "Cryptage",
     "Kortleser",
     "Salauskortti",
+    "CA",
   },
   { "Pnr",
     "Pnr",
     "Pnr",
     "Pnr",
     "Pnr",
-    "Pnr",
+    "N�m. Progr.",
     "Num. Progr.",
     "Program Id",
     "Ohjelmatunnus",
+    "Pnr",
   },
   // Timer parameters:
   { "Active",
@@ -661,6 +720,7 @@ const tPhrase Phrases[] = {
     "Actif",
     "Aktiv",
     "Aktiivinen",
+    "Aktywny",
   },
   { "Channel",
     "Kanal",
@@ -671,6 +731,7 @@ const tPhrase Phrases[] = {
     "Cha�ne",
     "Kanal",
     "Kanava",
+    "Kanal",
   },
   { "Day",
     "Tag",
@@ -681,6 +742,7 @@ const tPhrase Phrases[] = {
     "Jour",
     "Dag",
     "P�iv�",
+    "Dzien",
   },
   { "Start",
     "Anfang",
@@ -691,6 +753,7 @@ const tPhrase Phrases[] = {
     "D�but",
     "Start",
     "Aloitus",
+    "Poczatek",
   },
   { "Stop",
     "Ende",
@@ -701,6 +764,7 @@ const tPhrase Phrases[] = {
     "Fin",
     "Slutt",
     "Lopetus",
+    "Koniec",
   },
   { "Priority",
     "Priorit�t",
@@ -711,16 +775,18 @@ const tPhrase Phrases[] = {
     "Priorit�",
     "Prioritet",
     "Prioriteetti",
+    "Priorytet",
   },
   { "Lifetime",
     "Lebensdauer",
     "Veljavnost",
     "Durata",
     "Bewaarduur",
-    "Duracao",
+    "Dura��o",
     "Dur�e de vie",
     "Levetid",
     "Voimassaolo",
+    "Trwalosc dni",
   },
   { "File",
     "Datei",
@@ -731,16 +797,18 @@ const tPhrase Phrases[] = {
     "Fichier",
     "Filnavn",
     "Tiedosto",
+    "Plik",
   },
   { "First day",
     "Erster Tag",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Prvi dan",
+    "Primo giorno",
+    "Eerste dag",
+    "Primeiro dia",
     "Premier jour",
-    "", // TODO
-    "", // TODO
+    "F�rste dag",
+    "1. p�iv�",
+    "Pierwszy dzien",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -748,60 +816,66 @@ const tPhrase Phrases[] = {
     "Urnik zaseda kanal!",
     "Canale occupato da un timer!",
     "Kanaal wordt gebruikt door een timer!",
-    "Canal a ser utilizador por um alarme!",
+    "Canal a ser utilizador por um timer!",
     "Cette cha�ne est en cours d'utilisation!",
     "Kanalen er i bruk av en timer!",
     "Kanava on ajastimen k�yt�ss�!",
+    "Kanal jest zajety przez timer nagran",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
     "Ne morem preklopiti kanala!",
     "Impossibile cambiare canale!",
     "Kan geen kanaal wisselen!",
-    "Nao pode mudar de canal!",
+    "N�o pode mudar de canal!",
     "Impossible de changer de cha�ne!",
     "Ikke mulig � skifte kanal!",
     "Kanavan vaihtaminen ei mahdollista!",
+    "Kanal nie moze byc teraz przelaczony!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
     "Snemanje po urniku!",
     "Registrazione di un timer in corso!",
     "Timer is aan het opnemen!",
-    "Alarme a gravar!",
+    "Timer a gravar!",
     "Enregistrement en cours!",
     "Timer gj�r opptak!",
     "Ajastinnauhoitus k�ynniss�!",
+    "Timer nagrywa!",
   },
   { "Error while accessing recording!",
     "Fehler beim ansprechen der Aufzeichnung!",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Napaka pri dostopu do posnetka",
+    "Errore nel tentativo di acc alla registrazione",
+    "Fout bij lezen opname!",
+    "Erro ao aceder � grava��o",
     "Impossible d'acc�der � l'enregistrement",
-    "", // TODO
+    "Feil under lesing av opptak!",
     "Nauhoituksen toistaminen ep�onnistui!",
+    "Blad - brak dostepu do nagrania!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
     "Napaka pri odstranjevanju posnetka!",
     "Errore durante la canc del filmato!",
     "Fout bij verwijderen opname!",
-    "Erro enquanto apagava uma gravacao!",
+    "Erro enquanto apagava uma grava��o!",
     "Erreur de suppression de l'enregistrement!",
     "Feil under sletting av opptak!",
     "Nauhoituksen poistaminen ep�onnistui!",
+    "Blad przy usuwaniu nagrania!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
     "*** Neznan kanal ***",
     "*** CANALE INVALIDO ***",
     "*** Ongeldig kanaal ***",
-    "*** Canal Invalido! ***",
+    "*** Canal Inv�lido! ***",
     "*** Cha�ne invalide! ***",
     "*** Ugyldig Kanal! ***",
     "*** Virheellinen kanavavalinta! ***",
+    "*** Niewazny kanal ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -812,6 +886,7 @@ const tPhrase Phrases[] = {
     "Pas de carte DVB disponible pour l'enregistrement!",
     "Ingen ledige DVB enheter for opptak!",
     "Ei vapaata vastaanotinta nauhoitusta varten!",
+    "Brak wolnej karty DVB do nagrywania!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -822,147 +897,162 @@ const tPhrase Phrases[] = {
     "Cha�ne verrouill�e (enregistrement en cours)!",
     "Kanalen er l�st (opptak)!",
     "Kanava lukittu (nauhoitusta varten)!",
+    "Kanal zablokowany (nagrywanie w toku)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Ne morem zaceti z prenosnim nacinom",
+    "Impossibile iniziare la modalita' di trasferimento!",
+    "Kan Transfer-Mode niet starten",
+    "Imposs�vel iniciar modo de transfer�ncia!",
     "Impossible d'utiliser le mode transfert!",
-    "", // TODO
+    "Kan ikke starte transfer modus!",
     "K�sitt�m�tt�mi� teknisi� ongelmia!",
+    "Tryb transferowy jest niemozliwy!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
     "Ne morem zaceti urejanja!",
     "Imposs iniziare processo di modifica",
     "Kan niet beginnen met bewerken!",
-    "Nao pode iniciar a modificacao!",
+    "N�o pode iniciar a modifica��o!",
     "Impossible de commencer le montage!",
     "Kan ikke starte redigeringsprosessen!",
     "Muokkauksen aloittaminen ei onnistu!",
+    "Uruchamianie montazu jest niemozliwe!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
     "Urejanje je ze aktivno!",
     "Processo di modifica gia` attivo",
     "Bewerken is al actief!",
-    "Processo de modificacao ja activo!",
+    "Processo de modifica��o j� activo!",
     "Montage d�j� en cours!",
     "Redigeringsprosessen er allerede aktiv!",
     "Muokkaus on jo k�ynniss�!",
+    "Montaz w toku!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Zaustavitev ni mogoca - opcija '-s' ni podana!",
+    "Impossibile spegnere - parametro '-s' non passato",
+    "Shutdown onmogelijk - Optie '-s' ontbreekt!",
+    "Imposs�vel desligar - falta a op��o '-s'!",
     "Arr�t impossible - option '-s' absente!",
-    "", // TODO
+    "Kan ikke sl� av - startet uten parameteret '-s'!",
     "Ei voida sammuttaa '-s' parametria ei annettu!",
+    "Wylaczenie niemozliwe - brak opcji '-s' !",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Zmanjkuje prostora na disku",
+    "Poco spazio su disco!",
+    "Disk bijna vol!",
+    "Espa�o em disco reduzido!",
     "Disque presque plein!",
-    "", // TODO
+    "Lite ledig diskplass!",
     "Kovalevy l�hes t�ynn�!",
+    "Dysk wkrotce pelny!",
   },
   // Setup pages:
   { "OSD",
     "OSD",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "OSD",
+    "OSD",
+    "OSD",
+    "OSD",
+    "Affichage des menus",
+    "OSD",
+    "Tekstin�ytt�",
+    "OSD",
   },
   { "EPG",
     "EPG",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "EPG",
+    "EPG",
+    "EPG",
+    "EPG",
+    "Guide des programmes",
+    "Programoversikt",
+    "Ohjelmaopas",
+    "EPG",
   },
   { "DVB",
     "DVB",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "DVB",
+    "Scheda DVB",
+    "DVB",
+    "DVB",
+    "Cartes DVB",
+    "DVB-enheter",
+    "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "LNB",
+    "LNB",
+    "LNB",
+    "LNB",
+    "LNB",
+    "LNB",
+    "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "CICAM",
+    "CICAM",
+    "CICAM",
+    "CICAM",
+    "Acc�s conditionnel",
+    "CICAM",
+    "CICAM",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Snemanje",
+    "Registrazione",
+    "Opname",
+    "A gravar",
+    "Enregistrement",
+    "Opptak",
+    "Nauhoita",
+    "Nagranie",
   },
   { "Replay",
     "Wiedergabe",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Predvajanje",
+    "Replay",
+    "Afspelen",
+    "Replay",
+    "Lecture",
+    "Spill av",
+    "Toista",
+    "Odtwarzanie",
   },
   { "Miscellaneous",
     "Sonstiges",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Ostalo",
+    "Generici",
+    "Overig",
+    "Outros",
+    "Divers",
+    "Forskjellig",
+    "Sekalaista",
+    "Pozostale",
   },
   { "Restart",
     "Neustart",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Ponoven zagon",
+    "Restart",
+    "Herstart",
+    "Reiniciar",
+    "Red�marrer",
+    "Start p� nytt",
+    "Aloita uudelleen",
+    "Zastartowac",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -970,50 +1060,55 @@ const tPhrase Phrases[] = {
     "Jezik",
     "Linguaggio",
     "Taal",
-    "Linguagem", // TODO (correct?)
+    "Linguagem",
     "Langue",
     "Spr�k",
     "Kieli",
+    "Jezyk",
   },
   { "Setup.OSD$Width",
     "Breite",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Largeur", //TODO (correct?)
-    "", // TODO
-    "Leveys", //TODO (correct?)
+    "Sirina",
+    "Largh OSD",
+    "Breedte",
+    "Largura",
+    "Largeur",
+    "Bredde",
+    "Leveys",
+    "Szerokosc",
   },
   { "Setup.OSD$Height",
     "H�he",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Hauteur", //TODO (correct?)
-    "", // TODO
-    "Korkeus", //TODO (correct?)
-  },
-  { "Setup.OSD$Message time",
-    "Anzeigedauer f�r Nachrichten",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Dur�e affichage �cran",
-    "", // TODO
-    "Ilmoitusten n�kymisaika",
+    "Visina",
+    "Altezz OSD",
+    "Hoogte",
+    "Altura",
+    "Hauteur",
+    "H�yde",
+    "Korkeus",
+    "Wysokosc",
+  },
+  { "Setup.OSD$Message time (s)",
+    "Anzeigedauer f�r Nachrichten (s)",
+    "Cas sporocila (s)",
+    "Tempo del messaggio (s)",
+    "Weergave duur van berichten (s)",
+    "Mostrar contador (s)",
+    "Dur�e affichage �cran (s)",
+    "Tid meldinger skal vises (s)",
+    "Ilmoitusten n�kymisaika (s)",
+    "Czas wyswietlania wiadomosci (s)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Pozicija informacije o kanalu",
+    "Posizione info canale",
+    "Kanaal info positie",
+    "Posi��o de info dos canais",
     "Position infos cha�nes",
-    "", // TODO
+    "Posisjon p� kanalinformasjon",
     "Kanavainfon sijainti",
+    "Lokalizacja informacji o kanale",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -1024,136 +1119,150 @@ const tPhrase Phrases[] = {
     "Affichage progr. en cours",
     "Info ved kanalskifte",
     "N�yt� kanavainfo",
+    "Informacja przy zmianie kanalu",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
     "Drsni meni",
     "Scrolla pagina nel menu",
     "Scrollen per pagina",
-    "Scroll da pagina no menu",
+    "Scroll da p�gina no menu",
     "Affichage progr. suivant",
     "Rask rulling i menyer",
     "Valikkojen rullaus",
+    "Przesuwac stronami",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Sortiraj termine",
+    "Ordinamento timer",
+    "Timers sorteren",
+    "Ordenar os timers",
     "Trier les programmations",
-    "", // TODO
+    "Sorter timere",
     "J�rjest� ajastimet",
+    "Sortowanie timerow",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahme Verzeichnisse",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Direktoriji za posnetke",
+    "Directory di registrazione",
+    "Opname directories",
+    "Directorias de grava��o",
     "Dossiers d'enregistrements",
-    "", // TODO
+    "Kataloger til opptak",
     "Nauhoitushakemistot",
-  },
-  { "Setup.EPG$EPG scan timeout",
-    "Zeit bis EPG Scan",
-    "Cas do EPG pregleda",
-    "Timeout EPG",
-    "EPG-scan Timeout",
-    "Timeout EPG",
-    "Temps maxi EPG",
-    "Ledig tid f�r EPG-s�k",
-    "Ohjelmatied. odotusaika",
+    "Wykaz nagran",
+  },
+  { "Setup.EPG$EPG scan timeout (h)",
+    "Zeit bis EPG Scan (h)",
+    "Cas do EPG pregleda (h)",
+    "Timeout EPG (h)",
+    "EPG-scan Timeout (h)",
+    "Expirou o EPG (h)",
+    "Temps maxi EPG (h)",
+    "Ledig tid f�r EPG-s�k (h)",
+    "Ohjelmatied. odotusaika (h)",
+    "Czas do skanu EPG (h)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Nivo za popravilo EPG napak",
+    "EPG livello corr",
+    "EPG foutcorrectieniveau",
+    "N�vel de correct��o EPG",
     "Niveau de correction EPG",
-    "", // TODO
+    "Niv� for EPG-feilretting",
     "EPG Bugfix Level",
+    "Poziom bledow EPG",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
-    "Sistemski cas",
-    "Setta orario auto",
+    "Nastavi sistemski cas",
+    "Settaggio orario auto",
     "Systeem klok instellen",
-    "Ajustar relogio do sistema",
+    "Ajustar rel�gio do sistema",
     "Ajuster l'heure du syst�me",
     "Juster system-klokken",
     "Vastaanota kellonaika",
+    "Ustawianie czasu",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Transponder za nastavitev casa",
+    "Utilizza orario da transponder",
+    "Gebruik transponder tijd voor systeem",
+    "Usar rel�gio do transponder",
+    "Utiliser l'heure de la cha�ne",
+    "Bruk klokke fra transponder",
+    "Vastaanota kellonaika l�hettimelt�",
+    "Transponder do ustawiania czasu",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
     "Primarna naprava",
     "Scheda DVB primaria",
     "Eerste DVB kaart",
-    "DVB primario",
-    "Premi�re carte DVB",
+    "Interface DVB prim�rio",
+    "Carte DVB primaire",
     "Hoved DVB-enhet",
     "Ensisij. vast.otin",
+    "Pierwotny interfejs DVB",
   },
   { "Setup.DVB$Video format",
     "Video Format",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Video format",
+    "Formato video",
+    "Videoformaat",
+    "Formato v�deo",
     "Format vid�o",
-    "TV Format",
+    "TV-Format",
     "Kuvamuoto",
-  },
-  { "Setup.LNB$SLOF",
-    "SLOF",
-    "SLOF",
-    "SLOF",
-    "SLOF",
-    "SLOF",
-    "Limite de bandes LNB",
-    "LO-grensefrekvens",
-    "SLOF",
-  },
-  { "Setup.LNB$Low LNB frequency",
-    "Untere LNB-Frequenz",
-    "Spodnja LNB-frek.",
-    "Freq LO LNB",
-    "Laagste LNB frequentie",
-    "Freq LO LNB",
-    "Fr�quence basse LNB",
-    "LO-frekvens i lavb�ndet",
-    "LO LNB taajuus",
-  },
-  { "Setup.LNB$High LNB frequency",
-    "Obere LNB-Frequenz",
-    "Zgornja LNB-frek.",
-    "Freq HI LNB",
-    "Hoogste LNB frequentie",
-    "Freq HI LNB",
-    "Fr�quence haute LNB",
-    "LO-frekvens i h�yb�ndet",
-    "HI LNB taajuus",
+    "Format telewizyjny",
+  },
+  { "Setup.LNB$SLOF (MHz)",
+    "SLOF (MHz)",
+    "Frekvenca preklopa (MHz)",
+    "SLOF (MHz)",
+    "SLOF (MHz)",
+    "Limite de bandas LNB (MHz)",
+    "Limite de bandes LNB (MHz)",
+    "LO-grensefrekvens (MHz)",
+    "SLOF (MHz)",
+    "SLOF (MHz)",
+  },
+  { "Setup.LNB$Low LNB frequency (MHz)",
+    "Untere LNB-Frequenz (MHz)",
+    "Spodnja LNB-frek. (MHz)",
+    "Freq LO LNB (MHz)",
+    "Laagste LNB frequentie (MHz)",
+    "Frequ�ncia base LNB (MHz)",
+    "Fr�quence basse LNB (MHz)",
+    "LO-frekvens i lavb�ndet (MHz)",
+    "LO LNB taajuus (MHz)",
+    "Dolna czestotliwosc LNB (MHz)",
+  },
+  { "Setup.LNB$High LNB frequency (MHz)",
+    "Obere LNB-Frequenz (MHz)",
+    "Zgornja LNB-frek. (MHz)",
+    "Freq HI LNB (MHz)",
+    "Hoogste LNB frequentie (MHz)",
+    "Frequ�ncia alta LNB (MHz)",
+    "Fr�quence haute LNB (MHz)",
+    "LO-frekvens i h�yb�ndet (MHz)",
+    "HI LNB taajuus (MHz)",
+    "Gorna czestotliwosc LNB (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
-    "DiSEqC", // TODO
-    "DiSEqC", // TODO
-    "DiSEqC", // TODO
-    "DiSEqC", // TODO
-    "DiSEqC", // TODO
-    "DiSEqC", // TODO
-    "DiSEqC", // TODO
+    "Uporabi DiSEqC",
+    "Utilizza DiSEqC",
+    "DiSEqC gebruiken",
+    "Utilizar DiSEqC",
+    "Utiliser le DiSEqC",
+    "Bruk DiSEqC",
+    "K�yt� DiSEqC",
+    "Uzywac DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -1161,169 +1270,186 @@ const tPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
+    "Acc�s conditionnel",
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
   },
-  { "Setup.Recording$Margin at start",
-    "Zeitpuffer bei Anfang",
-    "Premor pred zacetkom",
-    "Min margine inizio",
-    "Tijd marge (begin)",
-    "Margem de inicio",
-    "Marge ant�rieure",
-    "Opptaks margin (start)",
-    "Aloitusmarginaali",
-  },
-  { "Setup.Recording$Margin at stop",
-    "Zeitpuffer bei Ende",
-    "Premor za koncem",
-    "Min margine fine",
-    "Tijd marge (eind)",
-    "Margem de fim",
-    "Marge post�rieure",
-    "Opptaks margin (slutt)",
-    "Lopetusmarginaali",
+  { "Setup.Recording$Margin at start (min)",
+    "Zeitpuffer bei Anfang (min)",
+    "Premor pred zacetkom (min)",
+    "Min margine inizio (min)",
+    "Tijd marge begin (min)",
+    "Margem inicial (min)",
+    "Marge ant�rieure (min)",
+    "Opptaksmargin start (min)",
+    "Aloitusmarginaali (min)",
+    "Poczatkowy czas buforowy (min)",
+  },
+  { "Setup.Recording$Margin at stop (min)",
+    "Zeitpuffer bei Ende (min)",
+    "Premor za koncem (min)",
+    "Min margine fine (min)",
+    "Tijd marge eind (min)",
+    "Margem final (min)",
+    "Marge post�rieure (min)",
+    "Opptaksmargin slutt (min)",
+    "Lopetusmarginaali (min)",
+    "Koncowy czas buforowy (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Limite Primario",
+    "Osnovna meja",
+    "Limite primario",
+    "Eerste grens",
+    "Limite Prim�rio",
     "Premi�re limite",
-    "Prioritets grense HovedDVB",
+    "Prioritetsgrense HovedDVB",
     "PrimaryLimit",
+    "Pierwotny limit",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Osnovna prioriteta",
+    "Priorita' predefinita",
+    "Standaard prioriteit",
     "Prioridade por defeito",
     "Priorit� par d�faut",
     "Normal prioritet (Timer)",
     "Oletusprioriteetti",
-  },
-  { "Setup.Recording$Default lifetime",
-    "Default Lebensdauer",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Validade por defeito",
-    "Dur�e de vie par d�faut",
-    "Normal levetid (Timer)",
-    "Oletus voimassaoloaika",
+    "Priorytet pierwotny",
+  },
+  { "Setup.Recording$Default lifetime (d)",
+    "Default Lebensdauer (d)",
+    "Osnovni zivljenski cas (d)",
+    "Durata predefinita (d)",
+    "Standaard levensduur (d)",
+    "Validade por defeito (d)",
+    "Dur�e de vie par d�faut (d)",
+    "Normal levetid timer (d)",
+    "Oletus voimassaoloaika (d)",
+    "Pierwotna trwalosc (d)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Utiliser les sous-titres", // TODO (episode name!)
-    "", // TODO
-    "Tekstitys k�yt�ss�", // TODO (episode name!)
+    "Uporabi ime epizode",
+    "Utilizza il nome dell'episodio",
+    "Gebruik episode naam",
+    "Utilizar o nome do epis�dio",
+    "Utiliser le nom de l'�pisode",
+    "Bruk episodenavn",
+    "K�yt� jakson nime�",
+    "Czy uzywac nazwe epizodu",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
     "Oznaci direktno snemanje",
     "Marca la registrazione",
     "Direkte opnamen markeren",
-    "Marca de gravacao",
+    "Marca de grava��o r�pida",
     "Enregistrement imm�diat",
     "Markere direkteopptak",
     "Merkitse v�lit�n nauh.",
+    "Zaznaczyc natychm. nagranie",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Ime za direktno snemanje",
+    "Nome registrazione istantanea",
+    "Naam direkt-opname",
+    "Nome de grava��o r�pida",
     "Noms enregistr. imm�diats",
-    "", // TODO
+    "Navngi direkteopptak",
     "Nime� v�lit�n nauh.",
+    "Nazwac natychm. nagranie",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Enregistrer en Dolby Digital", 
-    "", // TODO
-    "", // TODO
-  },
-  { "Setup.Recording$Max. video file size",
-    "Max. Video Dateigr��e",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Taille maxi des fichiers",
-    "", // TODO
-    "Maksimi tiedoston koko",
+    "Posnemi dolby digital",
+    "Registra dolby digital",
+    "Dolby Digital geluid opnamen",
+    "Gravar em Dolby Digital",
+    "Enregistrer en Dolby Digital",
+    "Ta opp Dolby Digital lyd",
+    "Dolby Digital nauhoitus",
+    "Nagrywac Dolby Digital",
+  },
+  { "Setup.Recording$Max. video file size (MB)",
+    "Max. Video Dateigr��e (MB)",
+    "Najvecja velikost datoteke (MB)",
+    "Dimensione massima file video (MB)",
+    "Maximale omvang video file (MB)",
+    "Tamanho m�ximo dos ficheiros (MB)",
+    "Taille maxi des fichiers (MB)",
+    "Maksimal st�rrelse p� videofiler (MB)",
+    "Maksimi tiedoston koko (MB)",
+    "Maks. wielkosc pliku (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Razdeli urejene datoteke",
+    "Dividi i file modificati",
+    "Bewerkte files opdelen",
+    "Quebrar ficheiros",
     "S�parer les s�quences",
-    "", // TODO
+    "Splitt redigerte filer",
     "Paloittele muokatut",
+    "Dzielic montowane pliki",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Rezim z vec hitrostmi",
+    "Modalita' multispeed",
+    "Multi-speed mode",
+    "Modo de multi-speed",
     "Mode multi-vitesses",
-    "", // TODO
+    "Multispeed modus",
     "Moninopeustila",
+    "Tryb wielopredkosciowy",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Prikazi rezim predvajanja",
+    "Modalita' di visualizz su replay",
+    "Weergave mode aangeven",
+    "Mostrar modo de replay",
     "Affichage mode de lecture",
-    "", // TODO
+    "Vis avspillingsmodus",
     "N�yt� toiston tila",
-  },
-  { "Setup.Miscellaneous$Min. event timeout",
-    "Mindest Event Pause",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-        "", // TODO
-    "MinEventTimeout", // Too difficult to translate - read the manual!
-    "", // TODO
-    "Minimi tapahtuman odotus",
-  },
-  { "Setup.Miscellaneous$Min. user inactivity",
-    "Mindest Benutzer-Inaktivit�t",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Dur�e minimale d'inactivit�",
-    "", // TODO
-    "Minimi k�ytt�j�n odotus",
-  },
-  { "Setup.Miscellaneous$SVDRP timeout",
-    "SVDRP Timeout",
-    "", // TODO
-    "Timeout SVDRP",
-    "SVDRP Timeout",
-    "Timeout SVDRP",
-    "Temps maxi SVDRP",
-    "Ubrukt SVDRP-levetid",
-    "SVDRP odotusaika",
+    "Wyswietlac status odtwarzania",
+  },
+  { "Setup.Miscellaneous$Min. event timeout (min)",
+    "Mindest Event Pause (min)",
+    "Najmanjsi cas dogodka (min)",
+    "Tempo minimo di pausa (min)", // ??? i don't know...
+    "Minimale event time-out (min)",
+    "Per�odo m�nimo de pausa (min)",
+    "MinEventTimeout (min)", // Too difficult to translate - read the manual!
+    "Minste hendelsespause (min)",
+    "Minimi tapahtuman odotus (min)",
+    "Min. czas do nast. akcji (Event) (min)",
+  },
+  { "Setup.Miscellaneous$Min. user inactivity (min)",
+    "Mindest Benutzer-Inaktivit�t (min)",
+    "Najmanjsi cas neaktivnosti (min)",
+    "Tempo minimo di inattivita' (min)",
+    "Minimum gebruikers inactiviteit (min)",
+    "Per�odo m�nimo de inactividade (min)",
+    "Dur�e minimale d'inactivit� (min)",
+    "Minimumstid med inaktivitet (min)",
+    "Minimi k�ytt�j�n odotus (min)",
+    "Min. brak aktywnosci uzytkownika (min)",
+  },
+  { "Setup.Miscellaneous$SVDRP timeout (min)",
+    "SVDRP Timeout (min)",
+    "SVDRP Timeout (min)",
+    "Timeout SVDRP (min)",
+    "SVDRP Timeout (min)",
+    "Timeout SVDRP (min)",
+    "Temps maxi SVDRP (min)",
+    "Ubrukt SVDRP-levetid (min)",
+    "SVDRP odotusaika (min)",
+    "Min. brak aktywnosci SVDRP (min)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -1335,16 +1461,18 @@ const tPhrase Phrases[] = {
     "LMMJVSD",
     "MTOTFLS",
     "MTKTPLS",
+    "PWSCPSN",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "PonTorSreCetPetSobNed",
+    "LunMarMerGioVenSabDom",
+    "MaaDinWoeDonVryZatZon",
+    "SegTerQuaQuiSexSabDom",
     "LunMarMerJeuVenSamDim",
-    "", // TODO
+    "ManTirOnsTorFreL�rS�n",
     "MaaTiiKesTorPerLauSun",
+    "PonWtoSroCzwPiaSobNie",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -1356,6 +1484,7 @@ const tPhrase Phrases[] = {
     "Apprentissage des codes de t�l�commande",
     "L�re fjernkontrolltaster",
     "Kaukos��timen n�pp�inten opettelu",
+    "Nauka kodu pilota",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -1366,46 +1495,51 @@ const tPhrase Phrases[] = {
     "Phase 1: D�tection du type de code",
     "Fase 1: Finne fjernkontroll-kodetype",
     "Vaihe 1: L�hetystavan selvitt�minen",
+    "Faza 1: Detekcja typu kodu",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
     "Pritisnite tipko na upravljalcu",
     "Premere un tasto nell'unita` RC",
     "Druk op een willekeurige knop",
-    "Pressione qualquer tecla do telecomando", 
+    "Pressione qualquer tecla do telecomando",
     "Appuyer sur une touche de la t�l�commande",
     "Trykk en av tastene p� fjernkontrollen",
     "Paina mit� tahansa kaukos��timen n�pp�int�",
+    "Nacisnac klawisz pilota",
   },
   { "RC code detected!",
     "FB Code erkannt!",
     "IR koda sprejeta!",
     "Codice RC rilevato!",
     "Afstandsbediening code herkend!",
-    "Codigo do telecomando detectado!",
+    "C�digo do telecomando detectado!",
     "Code de la t�l�commande d�tect�!",
     "Fjernkontroll-kodetype funnet!",
     "N�pp�inpainallus vastaanotettu!",
+    "Kod pilota zostal poznany!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
     "Ne pritiskajte tipk...",
     "Non premere alcun tasto...",
     "Druk niet op een knop...",
-    "Nao pressione nada...",
-    "Ne pas appuyer sur une touche ...",
+    "N�o pressione nada...",
+    "N'appuyer sur aucune touche ...",
     "Ikke trykk p� noen av tastene...",
     "�l� paina mit��n n�pp�int�...",
+    "Nie naciskac klawiszy...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
     "Faza 2: Ucenje posebnih kod",
     "Fase 2: Codici specifici dei tasti",
     "Fase 2: Leren specifieke toets-codes",
-    "Fase 2: A aprender codigos especificos",
+    "Fase 2: A aprender c�digos especificos",
     "Phase 2: Apprentissage des codes des touches",
     "Fase 2: L�re spesifikke tastekoder",
     "Vaihe 2: N�pp�inkoodien opettelu",
+    "Faza 2: Nauka pojedynczych klawiszy",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -1416,6 +1550,7 @@ const tPhrase Phrases[] = {
     "Appuyer sur la touche '%s'",
     "Trykk tasten for '%s'",
     "Paina n�pp�int� toiminnolle '%s'",
+    "Nacisnac klawisz dla '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -1426,6 +1561,7 @@ const tPhrase Phrases[] = {
     "Appuyer sur 'Haut' pour confirmer",
     "Trykk 'Opp' for � bekrefte",
     "Paina 'Yl�s' hyv�ksy�ksesi",
+    "Nacisnac 'Gora' do potwierdzenia",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -1436,6 +1572,7 @@ const tPhrase Phrases[] = {
     "Appuyer sur 'Bas' pour continuer",
     "Trykk Ned' for � fortsette",
     "Paina 'Alas' jatkaaksesi",
+    "Nacisnac 'Dol' zeby kontynuowac",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -1446,26 +1583,29 @@ const tPhrase Phrases[] = {
     "(Appuyer sur 'Haut' pour revenir en arri�re)",
     "(trykk 'Opp' for � g� tilbake)",
     "(paina 'Yl�s' palataksesi takaisin)",
+    "(Nacisnac 'Gora' cofa)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
     "(pritisnite 'Dol' za konec)",
     "('Giu' per finire la definiz tasti)",
     "(Druk 'Omlaag' om te beeindigen)",
-    "(Pressione 'Baixo' para terminar a definicao)",
+    "(Pressione 'Baixo' para terminar a defini��o)",
     "(Appuyer sur 'Bas' pour terminer)",
     "(trykk 'Ned' for � avslutte innl�ring)",
     "(paina 'Alas' lopettaaksesi n�pp�inten opettelun)",
+    "(Nacisnac 'Dol' by zakonczyc)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
     "Faza 3: Shranjujem kodo",
     "Fase 3: Salvataggio key codes",
     "Fase 3: Opslaan toets codes",
-    "Fase 3: A Salvar os codigos das teclas",
+    "Fase 3: A salvar os c�digos das teclas",
     "Phase 3: Sauvegarde des codes des touches",
     "Fase 3: Lagre tastekoder",
     "Vaihe 3: N�pp�inkoodien tallettaminen",
+    "Faza 3: Zapamietac Kod",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -1476,6 +1616,7 @@ const tPhrase Phrases[] = {
     "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler",
     "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
     "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
+    "'Gora' zapamietuje, 'Dol' przerywa",
   },
   // Key names:
   { "Up",
@@ -1487,6 +1628,7 @@ const tPhrase Phrases[] = {
     "Haut",
     "Opp",
     "Yl�s",
+    "Gora",
   },
   { "Down",
     "Ab",
@@ -1497,6 +1639,7 @@ const tPhrase Phrases[] = {
     "Bas",
     "Ned",
     "Alas",
+    "Dol",
   },
   { "Menu",
     "Men�",
@@ -1507,6 +1650,7 @@ const tPhrase Phrases[] = {
     "Menu",
     "Meny",
     "Valikko",
+    "Menu",
   },
   { "Ok",
     "Ok",
@@ -1517,6 +1661,7 @@ const tPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -1527,6 +1672,7 @@ const tPhrase Phrases[] = {
     "Retour",
     "Tilbake",
     "Takaisin",
+    "Wstecz",
   },
   { "Left",
     "Links",
@@ -1537,6 +1683,7 @@ const tPhrase Phrases[] = {
     "Gauche",
     "Venstre",
     "Vasemmalle",
+    "Lewo",
   },
   { "Right",
     "Rechts",
@@ -1547,6 +1694,7 @@ const tPhrase Phrases[] = {
     "Droite",
     "H�yre",
     "Oikealle",
+    "Prawo",
   },
   { "Red",
     "Rot",
@@ -1557,6 +1705,7 @@ const tPhrase Phrases[] = {
     "Rouge",
     "R�d",
     "Punainen",
+    "Czerwony",
   },
   { "Green",
     "Gr�n",
@@ -1567,6 +1716,7 @@ const tPhrase Phrases[] = {
     "Vert",
     "Gr�nn",
     "Vihre�",
+    "Zielony",
   },
   { "Yellow",
     "Gelb",
@@ -1577,6 +1727,7 @@ const tPhrase Phrases[] = {
     "Jaune",
     "Gul",
     "Keltainen",
+    "Zolty",
   },
   { "Blue",
     "Blau",
@@ -1587,46 +1738,51 @@ const tPhrase Phrases[] = {
     "Bleu",
     "Bl�",
     "Sininen",
+    "Niebieski",
   },
   { "Power",
     "Ausschalten",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Izklop",
+    "Power",
+    "Uitschakelen",
+    "Ligar",
     "Arr�t",
-    "", // TODO
+    "Power",
     "Virtakytkin",
+    "Wylaczyc",
   },
   { "Volume+",
     "Lautst�rke+",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Glasnost+",
     "Volume+",
-    "", // TODO
+    "Volume+",
+    "Volume+",
+    "Volume+",
+    "Volum+",
     "��nenvoimakkuus+",
+    "Glosnej",
   },
   { "Volume-",
     "Lautst�rke-",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Glasnost-",
+    "Volume-",
+    "Volume-",
     "Volume-",
-    "", // TODO
+    "Volume-",
+    "Volum-",
     "��nenvoimakkuus-",
+    "Ciszej",
   },
   { "Mute",
     "Stumm",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Izklop zvoka",
+    "Mute",
+    "Geluid onderbreken",
+    "Sem som",
     "Coupure du son",
-    "", // TODO
+    "Lyd av",
     "��nen vaimennus",
+    "Cisza",
   },
   // Miscellaneous:
   { "yes",
@@ -1638,156 +1794,183 @@ const tPhrase Phrases[] = {
     "oui",
     "ja",
     "kyll�",
+    "tak",
   },
   { "no",
     "nein",
     "ne",
     "no",
     "nee",
-    "nao",
+    "n�o",
     "non",
     "nei",
     "ei",
+    "nie",
   },
   { "top",
     "oben",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "zgoraj",
+    "limite sup",
+    "boven",
+    "topo",
     "haut",
-    "", // TODO
+    "�vre",
     "yl�",
+    "gora",
   },
   { "bottom",
     "unten",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "spodaj",
+    "limite inf",
+    "onder",
+    "fundo",
     "bas",
-    "", // TODO
+    "nedre",
     "ala",
+    "dol",
+  },
+  { "Disk",
+    "Disk",
+    "Disk",
+    "Disk",
+    "Disk",
+    "Disk",
+    "Disque",
+    "Disk",
+    "Disk",
+    "Disk",
   },
   { "free",
     "frei",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "prosto",
+    "liberi",
+    "vrij",
+    "livre",
     "restant",
-    "", // TODO
+    "ledig",
     "vapaa",
+    "pozostalo",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Skoci: ",
+    "Vai a: ",
+    "Springen: ",
+    "Saltar: ",
     "Acc�s direct: ",
-    "", // TODO
-    "Hypp��:",
+    "Hopp: ",
+    "Hypp��: ",
+    "Skok: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Glasnost ",
+    "Volume ",
+    "Volume ",
+    "Volume ",
     "Volume ",
-    "", // TODO
+    "Volum ",
     "��nenvoimakkuus ",
+    "Glosnosc ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
     " Prekini ponavljanje",
     " Interrompi riproduzione",
     " Stop afspelen",
-    " Parar reproducao",
+    " Parar reprodu��o",
     " Arr�ter la lecture",
     " Stopp avspilling",
     " Pys�yt� toisto",
+    " Zatrzymac odtwarzanie",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
     " Prekini shranjevanje ",
     " Interrompi registrazione ",
     " Stop opnemen ",
-    " Parar gravacao ",
+    " Parar grava��o ",
     " Arr�ter l'enregistrement ",
     " Stopp opptak fra ",
     " Pys�yt� nauhoitus ",
+    " Zatrzymac nagrywanie ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
     " Prekini urejanje",
     " Annulla modifiche",
     " Bewerken afbreken",
-    " Anular modificacao",
+    " Anular modifica��o",
     " Annuler le montage",
-    " Avbryt editering",
+    " Avbryt redigering",
     " Peruuta muokkaus",
+    " Przerwac montaz ",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
     "Preklapljanje primarne naprave...",
     "Cambio su card DVB primaria...",
     "Eerste DVB-kaart wordt omgeschakeld...",
-    "A mudar placa DVB primaria...",
-    "Changement de carte DVB principale...",
-    "Bytter hoved DVB-enhet...",
+    "A mudar interface DVB prim�rio...",
+    "Changement de carte DVB primaire...",
+    "Bytter f�rste DVB-enhet..."
     "Vaihdetaan ensisijainen vastaanotin...",
+    "Pierwszy interfejs DVB przelacza...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
     "Gor/Dol za novo poz. - Ok za premik",
     "Su/Giu per nuova posizione - OK per muovere",
     "Gebruik Omhoog/Omlaag - daarna Ok",
-    "Cima/Baixo para nova localizacao - Ok para mudar",
+    "Cima/Baixo para nova localiza��o - Ok para mover",
     "Haut/Bas -> nouvelle place - OK -> d�placer",
     "Opp/Ned for ny plass - OK for � flytte",
     "Yl�s/Alas = liiku, OK = siirr�",
+    "Gora/Dol na nowa pozycje - Ok zmienia",
   },
   { "Editing process started",
     "Schnitt gestartet",
     "Urejanje se je zacelo",
     "Processo di modifica iniziato",
     "Bewerken is gestart",
-    "Processo de modificacao iniciado",
+    "Processo de modifica��o iniciado",
     "Op�ration de montage lanc�e",
     "Redigeringsprosess startet",
     "Muokkaus aloitettu",
+    "Uruchomiony proces montazu",
   },
   { "Editing process finished",
     "Schnitt beendet",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Proces urejanja koncan",
+    "Processo di modifica terminato",
+    "Bewerken is klaar",
+    "Processo de modifica��o terminado",
     "Montage termin�",
-    "", // TODO
+    "Redigeringsprosess avsluttet",
     "Muokkaus lopetettu",
+    "Proces montazu zakonczony",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "Echec du montage",
-    "", // TODO
-    "Muokkaus ep�onnistui",
+    "Napaka pri procesu urejenja!",
+    "Processo di modifica fallito!",
+    "Bewerken is mislukt!",
+    "Falha no processo de modifica��o",
+    "Echec du montage!",
+    "Feil under redigering!",
+    "Muokkaus ep�onnistui!",
+    "Bledny proces montazu!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
-    "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "iskanje posnetkov...",
+    "scansione registrazioni...",
+    "Doorzoeken opnames...",
+    "A pesquisar grava��es...",
     "Recherche des enregistrements...",
-    "", // TODO
+    "G�r igjennom opptakene...",
     "haetaan nauhoituksia...",
+    "Skan nagran...",
   },
   { NULL }
   };
diff --git a/keys-pc.conf b/keys-pc.conf
index d727712d3..d9a390f7c 100644
--- a/keys-pc.conf
+++ b/keys-pc.conf
@@ -3,7 +3,7 @@ Address	0000
 Up	00000103
 Down	00000102
 Menu	00000106
-Ok	0000015E
+Ok	0000000D
 Back	00000168
 Left	00000104
 Right	00000105
diff --git a/menu.c b/menu.c
index 93f1ff7d4..03dbcea34 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.172 2002/03/17 14:23:44 kls Exp $
+ * $Id: menu.c 1.180 2002/03/31 21:17:42 kls Exp $
  */
 
 #include "menu.h"
@@ -21,6 +21,8 @@
 #define MAXWAIT4EPGINFO  10 // seconds
 #define MODETIMEOUT       3 // seconds
 
+#define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
+
 const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#~^";
 
 // --- cMenuEditItem ---------------------------------------------------------
@@ -780,7 +782,7 @@ class cMenuChannels : public cOsdMenu {
   };
 
 cMenuChannels::cMenuChannels(void)
-:cOsdMenu(tr("Channels"), 4)
+:cOsdMenu(tr("Channels"), CHNUMWIDTH)
 {
   //TODO
   int i = 0;
@@ -1186,7 +1188,7 @@ class cMenuTimers : public cOsdMenu {
   };
 
 cMenuTimers::cMenuTimers(void)
-:cOsdMenu(tr("Timers"), 2, 4, 10, 6, 6)
+:cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
 {
   int i = 0;
   cTimer *timer;
@@ -1217,7 +1219,7 @@ eOSState cMenuTimers::OnOff(void)
         timer->active = false;
         }
      else if (timer->active)
-        timer->SkipToday();
+        timer->Skip();
      else
         timer->active = true;
      timer->Matches(); // refresh start and end time
@@ -1412,7 +1414,7 @@ static int CompareEventChannel(const void *p1, const void *p2)
 }
 
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
-:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), 4, 7, 6)
+:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6)
 {
   const cSchedule *Schedule = Schedules->First();
   const cEventInfo **pArray = NULL;
@@ -1854,7 +1856,7 @@ eOSState cMenuRecordings::Del(void)
            if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
               cTimer *timer = rc->Timer();
               if (timer) {
-                 timer->SkipToday();
+                 timer->Skip();
                  cRecordControls::Process(time(NULL));
                  Timers.Save();
                  }
@@ -1935,7 +1937,7 @@ class cMenuSetupPage : public cOsdMenu {
   };
 
 cMenuSetupPage::cMenuSetupPage(void)
-:cOsdMenu("", 30)
+:cOsdMenu("", 33)
 {
   data = Setup;
   osdLanguage = Setup.OSDLanguage;
@@ -1991,7 +1993,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, NumLanguages, Languages()));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Message time"),           &data.OSDMessageTime, 1, 60));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
@@ -2012,7 +2014,7 @@ void cMenuSetupEPG::Set(void)
 {
   Clear();
   SetupTitle("EPG");
-  Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout"),          &data.EPGScanTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"),      &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"),          &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
   Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
@@ -2048,10 +2050,10 @@ void cMenuSetupLNB::Set(void)
 {
   Clear();
   SetupTitle("LNB");
-  Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF"),               &data.LnbSLOF));
-  Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency"),  &data.LnbFrequLo));
-  Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency"), &data.LnbFrequHi));
-  Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"),         &data.DiSEqC));
+  Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF (MHz)"),               &data.LnbSLOF));
+  Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency (MHz)"),  &data.LnbFrequLo));
+  Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi));
+  Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"),               &data.DiSEqC));
 }
 
 // --- cMenuSetupCICAM -------------------------------------------------------
@@ -2089,17 +2091,17 @@ void cMenuSetupRecord::Set(void)
 {
   Clear();
   SetupTitle("Recording");
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start"),        &data.MarginStart));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop"),         &data.MarginStop));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),          &data.PrimaryLimit, 0, MAXPRIORITY));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),       &data.DefaultPriority, 0, MAXPRIORITY));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime"),       &data.DefaultLifetime, 0, MAXLIFETIME));
-  Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),       &data.UseSubtitle));
-  Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord));
-  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),  data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
-  Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"),   &data.RecordDolbyDigital));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size"),   &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
-  Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),     &data.SplitEditedFiles));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"),     &data.MarginStart));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"),      &data.MarginStop));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),             &data.PrimaryLimit, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),          &data.DefaultPriority, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"),      &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
+  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"),      &data.RecordDolbyDigital));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
 }
 
 // --- cMenuSetupReplay ------------------------------------------------------
@@ -2132,9 +2134,9 @@ void cMenuSetupMisc::Set(void)
 {
   Clear();
   SetupTitle("Miscellaneous");
-  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout"),   &data.MinEventTimeout));
-  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity"), &data.MinUserInactivity));
-  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout"),        &data.SVDRPTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (min)"),        &data.SVDRPTimeout));
 }
 
 // --- cMenuSetup ------------------------------------------------------------
@@ -2231,6 +2233,11 @@ eOSState cMenuCommands::Execute(void)
 {
   cCommand *command = Commands.Get(Current());
   if (command) {
+     char *buffer = NULL;
+     asprintf(&buffer, "%s...", command->Title());
+     Interface->Status(buffer);
+     Interface->Flush();
+     delete buffer;
      const char *Result = command->Execute();
      if (Result)
         return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
@@ -2286,7 +2293,7 @@ void cMenuMain::Set(void)
   int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
   int Hours = Minutes / 60;
   Minutes %= 60;
-  snprintf(buffer, sizeof(buffer), "%s  -  Disk %d%%  -  %2d:%02d %s", tr("VDR"), Percent, Hours, Minutes, tr("free"));
+  snprintf(buffer, sizeof(buffer), "%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free"));
   SetTitle(buffer);
 
   // Basic menu items:
@@ -2310,6 +2317,7 @@ void cMenuMain::Set(void)
      char *buffer = NULL;
      asprintf(&buffer, "%s%s", STOP_RECORDING, ON_PRIMARY_INTERFACE);
      Add(new cOsdItem(buffer, osStopRecord));
+     delete buffer;
      }
 
   const char *s = NULL;
@@ -3100,64 +3108,47 @@ bool cReplayControl::ShowProgress(bool Initial)
 void cReplayControl::TimeSearchDisplay(void)
 {
   char buf[64];
-  int len;
-  
   strcpy(buf, tr("Jump: "));
-  len = strlen(buf);
-  
-  switch (timeSearchPos) {
-    case 1:  sprintf(buf + len, "%01d-:--", timeSearchHH / 10); break;
-    case 2:  sprintf(buf + len, "%02d:--", timeSearchHH); break;
-    case 3:  sprintf(buf + len, "%02d:%01d-", timeSearchHH, timeSearchMM / 10); break;
-    case 4:  sprintf(buf + len, "%02d:%02d", timeSearchHH, timeSearchMM); break;
-    default: sprintf(buf + len, "--:--"); break;
-    }
-
+  int len = strlen(buf);
+  char h10 = '0' + (timeSearchTime >> 24);
+  char h1  = '0' + ((timeSearchTime & 0x00FF0000) >> 16);
+  char m10 = '0' + ((timeSearchTime & 0x0000FF00) >> 8);
+  char m1  = '0' + (timeSearchTime & 0x000000FF);
+  char ch10 = timeSearchPos > 3 ? h10 : '-';
+  char ch1  = timeSearchPos > 2 ? h1  : '-';
+  char cm10 = timeSearchPos > 1 ? m10 : '-';
+  char cm1  = timeSearchPos > 0 ? m1  : '-';
+  sprintf(buf + len, "%c%c:%c%c", ch10, ch1, cm10, cm1);
   DisplayAtBottom(buf);
 }
 
 void cReplayControl::TimeSearchProcess(eKeys Key)
 {
-  int Seconds = timeSearchHH * 3600 + timeSearchMM * 60;
+#define STAY_SECONDS_OFF_END 10
+  int Seconds = (timeSearchTime >> 24) * 36000 + ((timeSearchTime & 0x00FF0000) >> 16) * 3600 + ((timeSearchTime & 0x0000FF00) >> 8) * 600 + (timeSearchTime & 0x000000FF) * 60;
+  int Current = (lastCurrent / FRAMESPERSEC);
+  int Total = (lastTotal / FRAMESPERSEC);
   switch (Key) {
     case k0 ... k9:
-         {
-           int n = Key - k0;
-           int s = (lastTotal / FRAMESPERSEC);
-           int m = s / 60 % 60;
-           int h = s / 3600;
-           switch (timeSearchPos) {
-             case 0: if (n * 10 <= h) {
-                        timeSearchHH = n * 10;
-                        timeSearchPos++;
-                        }
-                     break;
-             case 1: if (timeSearchHH + n <= h) {
-                        timeSearchHH += n;
-                        timeSearchPos++;
-                        }
-                     break;
-             case 2: if (n <= 5 && timeSearchHH * 60 + n * 10 <= h * 60 + m) {
-                        timeSearchMM += n * 10;
-                        timeSearchPos++;
-                        }
-                     break;
-             case 3: if (timeSearchHH * 60 + timeSearchMM + n <= h * 60 + m) {
-                        timeSearchMM += n;
-                        timeSearchPos++;
-                        }
-                     break;
-             }
-           TimeSearchDisplay();
-         }
+         if (timeSearchPos < 4) {
+            timeSearchTime <<= 8;
+            timeSearchTime |= Key - k0;
+            timeSearchPos++;
+            TimeSearchDisplay();
+            }
          break;
     case kLeft:
-    case kRight:
-         dvbApi->SkipSeconds(Seconds * (Key == kRight ? 1 : -1));
+    case kRight: {
+         int dir = (Key == kRight ? 1 : -1);
+         if (dir > 0)
+            Seconds = min(Total - Current - STAY_SECONDS_OFF_END, Seconds);
+         dvbApi->SkipSeconds(Seconds * dir);
          timeSearchActive = false;
+         }
          break;
     case kUp:
     case kDown:
+         Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
          dvbApi->Goto(Seconds * FRAMESPERSEC, Key == kDown);
          timeSearchActive = false;
          break;
@@ -3177,7 +3168,7 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
 
 void cReplayControl::TimeSearch(void)
 {
-  timeSearchHH = timeSearchMM = timeSearchPos = 0;
+  timeSearchTime = timeSearchPos = 0;
   timeSearchHide = false;
   if (modeOnly)
      Hide();
@@ -3288,7 +3279,9 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         ShowMode();
         timeoutShow = 0;
         }
-     else if (!modeOnly)
+     else if (modeOnly)
+        ShowMode();
+     else 
         shown = ShowProgress(!shown) || shown;
      }
   bool DisplayedFrames = displayFrames;
diff --git a/menu.h b/menu.h
index ae46d02f2..88930167e 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.40 2002/03/16 09:51:10 kls Exp $
+ * $Id: menu.h 1.41 2002/03/31 13:53:23 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -116,7 +116,7 @@ class cReplayControl : public cOsdBase {
   int lastCurrent, lastTotal;
   time_t timeoutShow;
   bool timeSearchActive, timeSearchHide;  
-  int timeSearchHH, timeSearchMM, timeSearchPos;
+  int timeSearchTime, timeSearchPos;
   void TimeSearchDisplay(void);
   void TimeSearchProcess(eKeys Key);
   void TimeSearch(void);
diff --git a/mpatrol.diff b/mpatrol.diff
new file mode 100644
index 000000000..59497c44c
--- /dev/null
+++ b/mpatrol.diff
@@ -0,0 +1,56 @@
+# This is a BitKeeper generated patch for the following project:
+# Project Name: Linux VDR
+# This patch format is intended for GNU patch command version 2.5 or higher.
+# This patch includes the following deltas:
+#	           ChangeSet	1.20    -> 1.21   
+#	            config.c	1.4     -> 1.5    
+#	             tools.c	1.2     -> 1.3    
+#
+# The following is the BitKeeper ChangeSet Log
+# --------------------------------------------
+# 02/04/01	aschultz@warp10.net	1.21
+# fix memory management due to MPatrol
+# --------------------------------------------
+#
+diff -Nru a/config.c b/config.c
+--- a/config.c	Mon Apr  1 14:37:48 2002
++++ b/config.c	Mon Apr  1 14:37:48 2002
+@@ -265,7 +265,7 @@
+         sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
+         if (p)
+            sscanf(p, "%d ,%d ", &dpid1, &dpid2);
+-        delete apidbuf;
++        free(apidbuf);
+         }
+      else
+         return false;
+@@ -277,7 +277,7 @@
+            tpid = 0;
+            }
+         strn0cpy(name, buffer, MaxChannelName);
+-        delete buffer;
++        free(buffer);
+         }
+      else
+         return false;
+diff -Nru a/tools.c b/tools.c
+--- a/tools.c	Mon Apr  1 14:37:48 2002
++++ b/tools.c	Mon Apr  1 14:37:48 2002
+@@ -71,7 +71,7 @@
+         esyslog(LOG_ERR, "ERROR: out of memory");
+      }
+   else {
+-     delete dest;
++     free(dest);
+      dest = NULL;
+      }
+   return dest;
+@@ -230,7 +230,7 @@
+ const char *AddDirectory(const char *DirName, const char *FileName)
+ {
+   static char *buf = NULL;
+-  delete buf;
++  free(buf);
+   asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
+   return buf;
+ }
diff --git a/osd.c b/osd.c
index e404a6f8a..56ba9b5c1 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.21 2002/03/10 16:18:06 kls Exp $
+ * $Id: osd.c 1.23 2002/03/29 16:34:03 kls Exp $
  */
 
 #include "osd.h"
@@ -76,6 +76,7 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
 
 cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
+  digit = 0;
   hasHotkeys = false;
   visible = false;
   title = NULL;
@@ -105,12 +106,15 @@ cOsdMenu::~cOsdMenu()
 const char *cOsdMenu::hk(const char *s)
 {
   static char buffer[32];
-  if (digit < 9) {
-     snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
-     return buffer;
+  if (s && hasHotkeys) {
+     if (digit == 0 && '1' <= *s && *s <= '9' && *(s + 1) == ' ')
+        digit = 10; // prevents automatic hotkeys - input already has them
+     if (digit < 9) {
+        snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
+        s = buffer;
+        }
      }
-  else
-     return s;
+  return s;
 }
 
 void cOsdMenu::SetHasHotkeys(void)
@@ -288,6 +292,10 @@ void cOsdMenu::PageUp(void)
   first -= MAXOSDITEMS;
   if (first < 0)
      first = current = 0;
+  if (SpecialItem(current)) {
+     current -= (current > 0) ? 1 : -1;
+     first = min(first, current - 1);
+     }
   Display();
   DisplayCurrent(true);
 }
@@ -302,6 +310,10 @@ void cOsdMenu::PageDown(void)
      current = Count() - 1;
      first = Count() - MAXOSDITEMS;
      }
+  if (SpecialItem(current)) {
+     current += (current < Count() - 1) ? 1 : -1;
+     first = max(first, current - MAXOSDITEMS);
+     }
   Display();
   DisplayCurrent(true);
 }
diff --git a/recording.c b/recording.c
index 56ea05653..b19e8b73f 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.57 2002/03/16 12:17:44 kls Exp $
+ * $Id: recording.c 1.60 2002/04/01 10:51:23 kls Exp $
  */
 
 #include "recording.h"
@@ -172,7 +172,7 @@ bool cResumeFile::Save(int Index)
   if (fileName) {
      int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
      if (f >= 0) {
-        if (safe_write(f, &Index, sizeof(Index)) != sizeof(Index))
+        if (safe_write(f, &Index, sizeof(Index)) < 0)
            LOG_ERROR_STR(fileName);
         close(f);
         return true;
@@ -324,7 +324,7 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
      if (isempty(Summary))
         Summary = "";
      if (*Subtitle || *Summary)
-        asprintf(&summary, "%s%s%s", Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
+        asprintf(&summary, "%s\n\n%s%s%s", Title, Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
      }
 }
 
@@ -343,7 +343,7 @@ cRecording::cRecording(const char *FileName)
      time_t now = time(NULL);
      struct tm tm_r;
      struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
-     t.tm_isdst = -1; // makes sure mktime() will determine the correct dst setting
+     t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
      if (7 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
         t.tm_year -= 1900;
         t.tm_mon--;
diff --git a/svdrp.c b/svdrp.c
index 06f8ebbc5..751a5c54c 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.34 2002/03/08 17:17:05 kls Exp $
+ * $Id: svdrp.c 1.35 2002/03/23 16:17:39 kls Exp $
  */
 
 #include "svdrp.h"
@@ -340,16 +340,12 @@ bool cSVDRP::Send(const char *s, int length)
 {
   if (length < 0)
      length = strlen(s);
-  int wbytes = safe_write(file, s, length);
-  if (wbytes == length)
-     return true;
-  if (wbytes < 0) {
+  if (safe_write(file, s, length) < 0) {
      LOG_ERROR;
      file.Close();
+     return false;
      }
-  else //XXX while...???
-     esyslog(LOG_ERR, "Wrote %d bytes to client while expecting %d\n", wbytes, length);
-  return false;
+  return true;
 }
 
 void cSVDRP::Reply(int Code, const char *fmt, ...)
diff --git a/tools.c b/tools.c
index 3764a6441..099fb7d94 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.59 2002/02/17 12:57:23 kls Exp $
+ * $Id: tools.c 1.62 2002/03/31 20:51:06 kls Exp $
  */
 
 #include "tools.h"
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <sys/vfs.h>
 #include <time.h>
 #include <unistd.h>
 #include "i18n.h"
@@ -33,14 +34,22 @@ ssize_t safe_read(int filedes, void *buffer, size_t size)
 
 ssize_t safe_write(int filedes, const void *buffer, size_t size)
 {
-  for (;;) {
-      ssize_t p = write(filedes, buffer, size);
-      if (p < 0 && errno == EINTR) {
-         dsyslog(LOG_INFO, "EINTR while writing to file handle %d - retrying", filedes);
-         continue;
-         }
-      return p;
-      }
+  ssize_t p = 0;
+  ssize_t written = size;
+  const unsigned char *ptr = (const unsigned char *)buffer;
+  while (size > 0) {
+        p = write(filedes, ptr, size);
+        if (p < 0) {
+           if (errno == EINTR) {
+              dsyslog(LOG_INFO, "EINTR while writing to file handle %d - retrying", filedes);
+              continue;
+              }
+           break;
+           }
+        ptr  += p;
+        size -= p;
+        }
+  return p < 0 ? p : written;
 }
 
 void writechar(int filedes, char c)
@@ -235,34 +244,20 @@ const char *AddDirectory(const char *DirName, const char *FileName)
   return buf;
 }
 
-#define DFCMD  "df -m -P '%s'"
-
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB)
 {
-  //TODO Find a simpler way to determine the amount of free disk space!
   if (UsedMB)
      *UsedMB = 0;
   int Free = 0;
-  char *cmd = NULL;
-  asprintf(&cmd, DFCMD, Directory);
-  FILE *p = popen(cmd, "r");
-  if (p) {
-     char *s;
-     while ((s = readline(p)) != NULL) {
-           if (strchr(s, '/')) {
-              int used, available;
-              sscanf(s, "%*s %*d %d %d", &used, &available);
-              if (UsedMB)
-                 *UsedMB = used;
-              Free = available;
-              break;
-              }
-           }
-     pclose(p);
+  struct statfs statFs;
+  if (statfs(Directory, &statFs) == 0) {
+     int blocksPerMeg = 1024 * 1024 / statFs.f_bsize;
+     if (UsedMB)
+        *UsedMB = (statFs.f_blocks - statFs.f_bfree) / blocksPerMeg;
+     Free = statFs.f_bavail / blocksPerMeg;
      }
   else
-     esyslog(LOG_ERR, "ERROR: can't open pipe for cmd '%s'", cmd);
-  delete cmd;
+     LOG_ERROR_STR(Directory);
   return Free;
 }
 
diff --git a/vdr.1 b/vdr.1
new file mode 100644
index 000000000..1fd39df6e
--- /dev/null
+++ b/vdr.1
@@ -0,0 +1,164 @@
+'\" t
+.\" ** The above line should force tbl to be a preprocessor **
+.\" Man page for vdr
+.\"
+.\" Copyright (C) 2002 Klaus Schmidinger
+.\"
+.\" You may distribute under the terms of the GNU General Public
+.\" License as specified in the file COPYING that comes with the
+.\" vdr distribution.
+.\"
+.\" $Id: vdr.1 1.2 2002/03/29 10:10:04 kls Exp $
+.\"
+.TH vdr 1 "29 Mar 2002" "1.0.0" "Video Disk Recorder"
+.SH NAME
+vdr - the Video Disk Recorder
+.SH SYNOPSIS
+.B vdr
+[options]
+.SH DESCRIPTION
+.B vdr
+implements a complete digital Set-Top-Box and Video Recorder.
+It can work with signals received from satellites (DVB-S) as
+well as cable (DVB-C) and terrestrial (DVB-T) signals.
+
+At least one DVB card is required to run \fBvdr\fR, but in order
+to watch one broadcast while recording another, or to start watching
+a recorded programme before the live broadcast has ended (\fBtime shifting\fR),
+two DVB cards are necessary. By default \fBvdr\fR can support up to four
+DVB cards. The primary DVB card (the one your tv set is connected to) has
+to be a "full featured" card, which means it must contain an MPEG decoder
+and provide audio and video signal outputs.
+
+\fBvdr\fR uses the On Screen Display of the DVB card to display its menus.
+It can be controlled by the PC keyboard, a home built "Remote Control Unit"
+(RCU) or the "Linux Infrared Remote Control" (LIRC).
+
+Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP),
+which can be accessed on port 2001, for instance by \fBtelnet\fR.
+.SH OPTIONS
+.TP
+.BI -a\  cmd ,\ --audio= cmd
+Send Dolby Digital audio to stdin of command \fIcmd\fR.
+.TP
+.BI -c\  dir ,\ --config= dir
+Read config files from directory \fIdir\fR
+(default is to read them from the video directory).
+.TP
+.B -d, --daemon
+Run in daemon mode.
+.TP
+.BI -D\  num ,\ --device= num
+Use only the given DVB device (\fInum\fR = 0, 1, 2...).
+There may be several \fB-D\fR options (by default all DVB devices will be used).
+.TP
+.BI -E\  file ,\ --epgfile= file
+Write the EPG data into the given \fIfile\fR
+(default is \fI/video/epg.data\fR).
+Use \fB-E-\fR to disable this.
+If \fIfile\fR is a directory, the file \fIepg.data\fR
+will be created in that directory.
+.TP
+.B -h, --help
+Print a help message and exit.
+.TP
+.BI -l\  level ,\ --log= level
+Set logging to \fIlevel\fR.
+\fB0\fR\ =\ no logging, \fB1\fR\ =\ errors only,
+\fB2\fR\ =\ errors and info, \fB3\fR\ =\ errors, info and debug.
+The default logging level is \fB3\fR.
+.TP
+.B -m, --mute
+Mute audio of the primary DVB device at startup.
+.TP
+.BI -p\  port ,\ --port= port
+Use \fIport\fR for SVDRP. A value of \fB0\fR turns off SVDRP.
+The default SVDRP port is \fB2001\fR.
+You need to edit the file \fIsvdrphosts.conf\fR in order to enable
+access to the SVDRP port.
+.TP
+.BI -r\  cmd ,\ --record= cmd
+Call \fIcmd\fR before and after a recording.
+.TP
+.BI -s\  cmd ,\ --shutdown= cmd
+Call \fIcmd\fR to shutdown the computer.
+.TP
+.BI -t\  tty ,\ --terminal= tty
+Set the controlling terminal.
+.TP
+.BI -v\  dir ,\ --video= dir
+Use \fIdir\fR as video directory.
+The default is \fI/video\fR.
+.TP
+.B -V, --version
+Print version information and exit.
+.TP
+.BI -w\  sec ,\ --watchdog= sec
+Activate the watchdog timer with a timeout of \fIsec\fR seconds.
+A value of \fB0\fR (default) disables the watchdog.
+.SH EXIT STATUS
+.TP
+.B 0
+Successful program execution.
+.TP
+.B 1
+An error has been detected which requires the DVB driver and \fBvdr\fR
+to be re-loaded.
+.SH FILES
+.TP
+.I channels.conf
+Channel configuration.
+.TP
+.I ca.conf
+Conditional access configuration.
+.TP
+.I timers.conf
+Timer configuration.
+.TP
+.I setup.conf
+User definable setup.
+.TP
+.I commands.conf
+User definable commands (executed from the \fBCommands\fR menu).
+.TP
+.I svdrphosts.conf
+SVDRP host configuration, defining which hosts or networks are given
+access to the SVDRP port.
+.TP
+.I marks.vdr
+Contains the editing marks defined for a recording.
+.TP
+.I summary.vdr
+Contains a description of the recording.
+.TP
+.I resume.vdr
+Contains the index into the recording where the last replay session left off.
+.TP
+.I index.vdr
+Contains the file number, offset and type of each frame of the recording.
+.TP
+.I keys.conf
+Contains the key assignments for the remote control.
+.TP
+.I keys-pc.conf
+Contains the key assignments for the PC keyboard (used if the program
+was compiled with DEBUG_OSD=1).
+.TP
+.IR 001.vdr\  ...\  255.vdr
+The actual data files of a recording.
+.TP
+.I epg.data
+Contains all current EPG data. Can be used for external processing and will
+also be read at program startup to have the full EPG data available immediately.
+.SH SEE ALSO
+.BR vdr (5)
+.SH AUTHOR
+Written by Klaus Schmidinger, with contributions from many others.
+See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
+.SH REPORTING BUGS
+Report bugs to <vdr-bugs@cadsoft.de>.
+.SH COPYRIGHT
+Copyright \(co 2002 Klaus Schmidinger.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
new file mode 100644
index 000000000..483e15ffe
--- /dev/null
+++ b/vdr.5
@@ -0,0 +1,382 @@
+'\" t
+.\" ** The above line should force tbl to be a preprocessor **
+.\" Man page for vdr file formats
+.\"
+.\" Copyright (C) 2002 Klaus Schmidinger
+.\"
+.\" You may distribute under the terms of the GNU General Public
+.\" License as specified in the file COPYING that comes with the
+.\" vdr distribution.
+.\"
+.\" $Id: vdr.5 1.3 2002/04/01 12:32:59 kls Exp $
+.\"
+.TH vdr 5 "29 Mar 2002" "1.0.0" "Video Disk Recorder Files"
+.SH NAME
+vdr file formats - the Video Disk Recorder Files
+.SH DESCRIPTION
+This page describes the formats of the various files \fBvdr\fR uses to
+store configuration data and recordings.
+.SH SYNTAX
+.SS CHANNELS
+The file \fIchannels.conf\fR contains the channel configuration.
+Each line defines either a \fBgroup delimiter\fR or a \fBchannel\fR.
+
+A \fBgroup delimiter\fR is a line starting with a ':' as the very first
+character, followed by arbitrary text. Example:
+
+\fB:First group\fR
+
+A \fBchannel definition\fR is a line with channel data, where the fields
+are separated by ':' characters. Example:
+
+\fBRTL:12188:h:1:27500:163:104:105:0:12003\fR
+
+The line number of a channel definition (not counting group separators!)
+defines the channel's number in OSD menus and the \fItimers.conf\fR file.
+
+The fields in a channel definition have the following meaning (from left
+to right):
+.TP
+.B Name
+The channel's name (if the name originally contains a ':' character
+it has to be replaced by '|').
+.TP
+.B Frequency
+The transponder frequency in MHz for DVB-S and DVB-C, kHz for DVB-T (as an integer).
+.TP
+.B Polarization
+The polarization of the satellite signal. 'h' or 'H' for horizontal, 'v' or 'V'
+for vertical (DVB-S only).
+.TP
+.B
+DiSEqC
+The DiSEqC code to use for this channel (integer, DVB-S only).
+.TP
+.B
+Srate
+The symbol rate of this channel (DVB-S and DVB-C only).
+.TP
+.B VPID
+The video PID (set to '0' for radio channels, '1' for encrypted radio channels).
+.TP
+.B APID
+The audio PID (either one number, or two, separated by a comma).
+If this channel also carries Dolby Digital sound, the Dolby PIDs follow
+the audio PIDs, separated by a semicolon, as in
+.B ...:101,102;103,104:...
+.TP
+.B TPID
+The teletext PID.
+.TP
+.B Conditional access
+An integer defining how this channel can be accessed:
+.TS
+tab (@);
+l l.
+\fB0\fR@Free To Air
+\fB1...4\fR@explicitly requires the DVB card with the given number
+\fB>=100\fR@requires a specific decryption method defined in \fIca.conf\fR
+.TE
+.TP
+.B PNR
+The program number (aka service ID) of this channel.
+.SS TIMERS
+The file \fItimers.conf\fR contains the timer setup.
+Each line contains one timer definition, with individual fields
+separated by ':' characters. Example:
+
+\fB1:10:-T-----:2058:2150:50:5:Quarks & Co:\fR
+
+The fields in a timer definition have the following meaning (from left
+to right):
+.TP
+.B Status
+Defines whether this timer is \fBinactive\fR (0) or \fBactive\fR (1).
+The value 3 is used for instant recordings.
+Values other than these can be used by external programs to mark active timers
+and recognize if the user has modified them. When a user modifes an active
+timer the \fBstatus\fR field will be explicitly set to '1' (or '0', respectively,
+if the user deactivates the timer).
+
+Note: in order to allow future extensibility, external programs using the
+\fBstatus\fR parameter should only use the upper 16 bit of this 32 bit parameter
+and leave the lower 16 bit untouched.
+.TP
+.B Channel
+The number of the channel to record.
+.TP
+.B Day
+The day when this timer shall record.
+
+If this is a `single-shot' timer, this is the day of month on which this
+timer shall record. This must be in the range \fB1...31\fR.
+
+In case of a `repeating' timer this is a string consisting of exactly seven
+characters, where each character position corresponds to one day of the week
+(with Monday being the first day). The character '-' at a certain position
+means that the timer shall not record on that day. Any other character will
+cause the timer to record on that day. Example:
+
+.B MTWTF--
+
+will define a timer that records on Monday thru Friday and does not record
+on weekends. The same result could be achieved with \fBABCDE--\fR (this is
+used to allow setting the days with language specific characters).
+
+The day definition of a `repeating' timer may be followed by the date when that
+timer shall hit for the first time. The format for this is \fB@YYYY-MM-DD\fR,
+so a complete definition could look like this:
+
+\fBMTWTF--@2002-02-18\fR
+
+which would implement a timer that records Moday thru Friday, and will hit
+for the first time on or after February 18, 2002.
+This \fBfirst day\fR feature can be used to disable a repeating timer for a couple
+of days, or for instance to define a new Mon...Fri timer on wednesday, which
+actually starts "monday next week". The \fBfirst day\fR date given need not be
+that of a day when the timer would actually hit.
+.TP
+.B Start
+A four digit integer defining when this timer shall \fBstart\fR recording.
+The format is \fBhhmm\fR, so \fB1430\fR would mean "half past two" in the
+afternoon.
+.TP
+.B Stop
+A four digit integer defining when this timer shall \fBstop\fR recording.
+The format is the same as for the \fBstart\fR time.
+.TP
+.B Priority
+An integer in the range \fB0...99\fR, defining the \fBpriority\fR
+of this timer and of recordings created by this timer.
+\fB0\fR represents the lowest value, \fB99\fR the highest.
+The priority is used to decide which timer shall be
+started in case there are two or more timers with the exact same
+\fBstart\fR time. The first timer in the list with the highest priority
+will be used.
+
+This value is also stored with the recording and is
+later used to decide which recording to remove from disk in order
+to free space for a new recording. If the disk runs full and a new
+recording needs more space, an existing recording with the lowest
+priority (and which has exceeded its guaranteed \fBlifetime\fR) will be
+removed.
+
+If all available DVB cards are currently occupied, a
+timer with a higher priority will interrupt the timer with the
+lowest priority in order to start recording.
+.TP
+.B Lifetime
+The \fBguaranteed lifetime\fR (in days) of a recording created by this timer.
+\fB0\fR means that this recording may be automatically deleted at any time
+by a new recording with higher priority. \fB99\fR means that this recording
+will never be automatically deleted. Any number in the range \fB1...98\fR
+means that this recording may not be automatically deleted in favour of a
+new recording, until the given number of days since the \fBstart\fR time of
+the recording has passed by.
+.TP
+.B File
+The \fBfile name\fR this timer will give to a recording.
+If the name contains any ':' characters, these have to be replaced by '|'.
+If the name shall contain subdirectories, these have to be delimited by '~'
+(since the '/' character may be part of a regular programme name).
+
+The special keywords \fBTITLE\fR and \fBEPISODE\fR, if present, will be replaced
+by the title and episode information from the EPG data at the time of
+recording (if that data is available). If at the time of recording either
+of these cannot be determined, \fBTITLE\fR will default to the channel name, and
+\fBEPISODE\fR will default to a blank.
+.TP
+.B Summary
+Arbitrary text that describes the recording made by this timer.
+Any newline characters in the summary have to be replaced by '|', and
+the summary may contain ':' characters. If this field is not empty, its
+contents will be written into the \fIsummary.vdr\fR file of the recording.
+.SS CONDITIONAL ACCESS
+The file \fIca.conf\fR defines the numbers to be used in the \fBConditional access\fR
+field of channels in \fIchannels.conf\fR and assigns descriptive texts to them.
+Example:
+
+\fB101    Premiere World\fR
+
+Anything after (and including) a '#' character is comment.
+
+Value lines consist of an integer number, followed by a text describing
+this decryption method (typically the name of the pay tv service using this
+decryption method).
+
+The special value \fB0\fR means \fBFree To Air\fR, which can be used for
+channels that don't require additional decryption hardware.
+
+The values \fB1...4\fR can be used for channels that for some reason explicitly
+need a given DVB card (for backward compatibility).
+.SS KEYS
+The file \fIkeys.conf\fR contains the key assignments for the remote control
+unit (RCU). If \fBvdr\fR has been built with REMOTE=KBD, the file \fIkeys-pc.conf\fR
+will be used instead. If you are using \fBvdr\fR together with \fBLIRC\fR, no
+such file will be used. In that case you need to consult the \fBLIRC\fR
+documentation to see how to set up the remote control key assignments there.
+.SS COMMANDS
+The file \fIcommands.conf\fR contains the definitions of commands that can
+be executed from the \fBvdr\fR main menu's "Commands" option.
+Each line contains one command definition in the following format:
+
+\fBtitle : command\fR
+
+where \fBtitle\fR is the string that will be displayed in the "Commands" menu,
+and \fBcommand\fR is the actual command string that will be executed when this
+option is selected. The delimiting ':' may be surrounded by any number of
+white space characters.
+
+By default the menu entries in the "Commands" menu will be numbered '1'...'9'
+to make them selectable by pressing the corresponding number key. If you want
+to use your own numbering scheme (maybe to skip certain numbers), just precede
+the \fBtitle\fRs with the numbers of your choice. \fBvdr\fR will suppress its
+automatic numbering if the first entry in \fIcommands.conf\fR starts with a
+digit in the range '1'...'9', followed by a blank.
+
+In order to avoid error messages to the console, every command should have
+\fIstderr\fR redirected to \fIstdout\fR. Everything the command prints to
+\fIstdout\fR will be displayed in a result window, with \fBtitle\fR as its title.
+
+Examples:
+
+Check for new mail: /usr/local/bin/checkmail 2>&1
+.br
+CPU status        : /usr/local/bin/cpustatus 2>&1
+.br
+Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+.br
+Calendar          : date;echo;cal
+
+Note that the commands 'checkmail' and 'cpustatus' are only \fBexamples\fR!
+Don't send emails to the author asking where to find these ;-)
+.SS SVDRP HOSTS
+The file \fIsvdrphosts.conf\fR contains the IP numbers of all hosts that are
+allowed to access the SVDRP port.
+Each line contains one IP number in the format
+
+\fBIP-Address[/Netmask]\fR
+
+where \fBIP-Address\fR is the address of a host or a network in the usual dot
+separated notation (as in 192.168.100.1). If the optional \fBNetmask\fR is given
+only the given number of bits of \fBIP-Address\fR are taken into account. This
+allows you to grant SVDRP access to all hosts of an entire network. \fBNetmask\fR
+can be any integer from 1 to 32. The special value of 0 is only accepted if
+the \fBIP-Address\fR is 0.0.0.0, because this will give access to any host
+(\fBUSE THIS WITH CARE!\fR).
+
+Everything following (and including) a '#' character is considered to be comment.
+
+Examples:
+
+127.0.0.1        # always accept localhost
+.br
+192.168.100.0/24 # any host on the local net
+.br
+204.152.189.113  # a specific host
+.br
+0.0.0.0/0        # any host on any net (\fBUSE WITH CARE!\fR)
+.SS SETUP
+The file \fIsetup.conf\fR contains the basic configuration options for \fBvdr\fR.
+Each line contains one option in the format "Name = Value".
+See the MANUAL file for a description of the available options.
+.SS AUDIO/VIDEO DATA
+The files \fI001.vdr\fR...\fI255.vdr\fR are the actual recorded MPEG data
+files. In order to keep the size of an individual file below a given limit,
+a recording is split into several files. The contents of these files is
+\fBPacketized Elementary Stream\fR (PES) and contains ES packets with ids
+0xE0 for video, 0xC0 for audio 1 and 0xC1 for audio 2 (if available).
+Dolby Digital data is stored in packets with ids 0xBD.
+.SS INDEX
+The file \fIindex.vdr\fR (if present in a recording directory) contains
+the (binary) index data into each of the the recording files
+\fI001.vdr\fR...\fI255.vdr\fR. It is used during replay to determine
+the current position within the recording, and to implement skipping
+and fast forward/back functions.
+See the definition of the \fBcIndexFile\fR class for details about the
+actual contents of this file.
+.SS SUMMARY
+The file \fIsummary.vdr\fR (if present in a recording directory) contains
+a description of the recording, derived from the EPG data at recording time
+(if such data was available) or the \fBSummary\fR field of the corresponding
+timer. This is a plain ASCII file and can contain arbitrary text.
+.SS RESUME
+The file \fIresume.vdr\fR (if present in a recording directory) contains
+the position within the recording where the last replay session left off.
+The data is a four byte (binary) integer value and defines an offset into
+the file \fIindex.vdr\fR.
+.SS MARKS
+The file \fImarks.vdr\fR (if present in a recording directory) contains
+the editing marks defined for this recording.
+Each line contains the definition of one mark in the following format:
+
+\fBhh:mm:ss.ff comment\fR
+
+where \fBhh:mm:ss.ff\fR is a frame position within the recording, given as
+"hours, minutes, seconds and (optional) frame number".
+\fBcomment\fR can be any string and may be used to describe this mark.
+If present, \fBcomment\fR must be separated from the frame position by at
+least one blank.
+
+The lines in this file need not necessarily appear in the correct temporal
+sequence, they will be automatically sorted by time index.
+
+\fBCURRENT RESTRICTIONS:\fR
+
+-\ the comment is currently not used by VDR
+.br
+-\ marks must have a frame number, and that frame MUST be an I-frame (this
+means that only marks generated by VDR itself can be used, since they
+will always be guaranteed to mark I-frames).
+.SS EPG DATA
+The file \fIepg.data\fR contains the EPG data in an easily parsable format.
+The first character of each line defines what kind of data this line contains.
+
+The following tag characters are defined:
+.TS
+tab (@);
+l l.
+\fBC\fR@<service id> <channel name>
+\fBE\fR@<event id> <start time> <duration> <table id>
+\fBT\fR@<title>
+\fBS\fR@<subtitle>
+\fBD\fR@<description>
+\fBe\fR@
+\fBc\fR@
+.TE
+
+Lowercase characters mark the end of a sequence that was started by the
+corresponding uppercase character. The outer frame consists of a sequence
+of one or more \fBC\fR...\fBc\fR (Channel) entries. Inside these any number of
+\fBE\fR...\fBe\fR (Event) entries are allowed.
+The \fBT\fR, \fBS\fR and \fBD\fR entries are optional (although every event
+should at least have a \fBT\fR entry).
+
+.TS
+tab (@);
+l l.
+<service id>   @is the "program number" as defined in 'channels.conf'
+<channel name> @is the "name" as in 'channels.conf' (for information only)
+<start time>   @is the time (as a time_t integer) in UTC when this event starts
+<duration>     @is the time (in seconds) that this event will take
+<table id>     @is a hex number that indicates the table this event is contained\
+in (if this is left empty or 0 this event will not be overwritten\
+or modified by data that comes from the DVB stream)
+<title>        @is the title of the event
+<subtitle>     @is the subtitle (typically the name of the episode etc.)
+<description>  @is the description of the event
+.TE
+
+This file will be read at program startup in order to restore the results of
+previous EPG scans.
+.SH SEE ALSO
+.BR vdr (1)
+.SH AUTHOR
+Written by Klaus Schmidinger.
+.SH REPORTING BUGS
+Report bugs to <vdr-bugs@cadsoft.de>.
+.SH COPYRIGHT
+Copyright \(co 2002 Klaus Schmidinger.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index 17ae1488e..874e8264b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.101 2002/03/09 17:10:16 kls Exp $
+ * $Id: vdr.c 1.102 2002/03/29 10:09:20 kls Exp $
  */
 
 #include <getopt.h>
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
+      { "version",  no_argument,       NULL, 'V' },
       { "video",    required_argument, NULL, 'v' },
       { "watchdog", required_argument, NULL, 'w' },
       { NULL }
@@ -108,7 +109,7 @@ int main(int argc, char *argv[])
 
   int c;
   int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:mp:r:s:t:v:w:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:mp:r:s:t:v:Vw:", long_options, &option_index)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -139,7 +140,7 @@ int main(int argc, char *argv[])
                            "                           %s); use '-E-' to disable this\n"
                            "                           if FILE is a directory, the default EPG file will be\n"
                            "                           created in that directory\n"
-                           "  -h,       --help         display this help and exit\n"
+                           "  -h,       --help         print this help and exit\n"
                            "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                            "                           0 = no logging, 1 = errors only,\n"
                            "                           2 = errors and info, 3 = errors, info and debug\n"
@@ -149,6 +150,7 @@ int main(int argc, char *argv[])
                            "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                            "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                            "  -t TTY,   --terminal=TTY controlling tty\n"
+                           "  -V,       --version      print version information and exit\n"
                            "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                            "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                            "                           seconds (default: %d); '0' disables the watchdog\n"
@@ -186,6 +188,9 @@ int main(int argc, char *argv[])
                     break;
           case 't': Terminal = optarg;
                     break;
+          case 'V': printf("vdr, version %s\n", VDRVERSION);
+                    return 0;
+                    break;
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;

From c9a5d8ea5328e4a8bcb0c3423b825c02cb0c3b27 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 7 Apr 2002 18:00:00 +0200
Subject: [PATCH 040/307] Version 1.0.0 - Fixed a problem with wrong EPG data
 in the Schedules menu (thanks to Tobias   Kerner, problem was initially
 reported by Michel Moster, but somehow I had   misplaced his message...). -
 Added Spanish language texts (thanks to Ruben Nunez Francisco). - Fixed
 resetting the "First day" timer parameter once the timer actually starts  
 recording. - Fixed the still picture workaround in case the progress display
 is active   (thanks to Gerald Raaf). - Fixed a problem with accessing the
 epg.data file before it is fully written   (thanks to Thilo Wunderlich for
 reporting this one). - Now the EPG scan skips channels that have their 'Ca'
 parameter explicitly set   to an other DVB card (suggested by Sergei Haller).
 - Fixed a possible hangup when reading a broken epg.data file (thanks to
 Henning   Holtschneider for pointing this one out). - Fixed a bug in the
 editing process in case a previously edited file with the   same name was
 manually deleted on a system with more than one video directory   (thanks to
 Dirk Wiebel for reporting this one).

---
 CONTRIBUTORS |  25 +++++++
 HISTORY      |  24 +++++-
 config.c     |   6 +-
 config.h     |   4 +-
 dvbapi.c     |  34 +++++++--
 eit.c        |  16 ++--
 eit.diff     |  25 -------
 i18n.c       | 203 +++++++++++++++++++++++++++++++++++++++++++++++----
 menu.c       |  12 ++-
 mpatrol.diff |  56 --------------
 vdr.1        |   4 +-
 vdr.5        |   4 +-
 12 files changed, 287 insertions(+), 126 deletions(-)
 delete mode 100644 eit.diff
 delete mode 100644 mpatrol.diff

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6a126c9fb..ec742b188 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -88,6 +88,7 @@ Benjamin Reichardt <reichard@math.uni-goettingen.de>
 Henning Holtschneider <hh@holtschneider.com>
  for patching 'runvdr' to check whether the driver is already loaded
  for reporting a bug in parsing group separators in channels.conf
+ for pointing out a possible hangup when reading a broken epg.data file
 
 Paulo Lopes <pmml@netvita.pt>
  for translating OSD texts to the Portugese language
@@ -186,6 +187,7 @@ Norbert Schmidt <nschmidt-nrw@t-online.de>
 
 Thilo Wunderlich <tw@ubcom.net>
  for his help in keeping 'channels.conf' up to date
+ for reporting a problem with accessing the epg.data file before it is fully written
 
 Stephan Schreiber <stephan@sschreiber.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
@@ -198,6 +200,8 @@ Sergei Haller <Sergei.Haller@math.uni-giessen.de>
  for fixing the LastActivity timestamp after a shutdown prompt
  for fixing the "Low disk space!" message
  for adding the TPID to Hessen-3 in 'channels.conf'
+ for suggesting that the EPG scan should skip channels with their 'Ca' parameter
+ explicitly set to an other DVB card
 
 Andreas Gebel <andreas@xcapenet.de>
  for his help in keeping 'channels.conf' up to date
@@ -252,6 +256,27 @@ Truls Slevigen <truls@slevigen.no>
 
 Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  for implementing FreeDiskSpaceMB() without external 'df' command
+ for translating OSD texts to the Spanish language
+
+Mirko D�lle <mdoelle@linux-user.de>
+  for reporting a bug when a timer records over midnight of a day that had a
+  change in Daylight Saving Time
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
+
+Michael Moster <dvb@juelich-gmbh.de>
+ for initally reporting the problem with wrong EPG data in the Schedules menu
+ (somehow I had misplaced his message...)
+
+Tobias Kerner <tobschle@gmx.de>
+ for helping to debug a problem with wrong EPG data in the Schedules menu
+
+Dirk Wiebel <dirk@wiebel.de>
+ for reporting a bug in the editing process in case a previously edited file
+ with the same name was manually deleted on a system with more than one video
+ directory
+
+Gerald Raaf <graaf@attglobal.net>
+ for helping to fix the still picture workaround in case the progress display
+ is active
diff --git a/HISTORY b/HISTORY
index cafa4c1dd..af15667af 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1151,7 +1151,7 @@ Video Disk Recorder Revision History
   commands.conf starts with a digit in the range '1'...'9', followed by a blank.
 - Fixed a bug in switching back the replay mode display in time shift mode
   (thanks to Achim Lange for reporting this one).
-- Fixed a bug in the 'First day' timer parameter for timers that record over
+- Fixed a bug in the "First day" timer parameter for timers that record over
   midnight.
 - Added units to Setup parameters.
 - Changed time entry in the 'Jump' command during replay, so that it is filled
@@ -1161,7 +1161,7 @@ Video Disk Recorder Revision History
 - Fixed skipping the next hit of a repeating timer (thanks to Rainer Zocholl
   for reporting this one).
 - Fixed a bug when a timer records over midnight of a day that had a change in
-  Daylight Saving Time.
+  Daylight Saving Time (thanks to Mirko D�lle for reporting this one).
 - Added Polish language texts (thanks to Michael Rakowski).
 - Fixed a bug in parsing group separators in channels.conf (thanks to Henning
   Holtschneider for reporting this one).
@@ -1170,3 +1170,23 @@ Video Disk Recorder Revision History
   the F-keys on top.
 - Fixed a bug in the EPG bugfix mechanism if the extended description is shorter
   than 3 characters (thanks to Andreas Schultz).
+
+2002-04-07: Version 1.0.0
+
+- Fixed a problem with wrong EPG data in the Schedules menu (thanks to Tobias
+  Kerner, problem was initially reported by Michel Moster, but somehow I had
+  misplaced his message...).
+- Added Spanish language texts (thanks to Ruben Nunez Francisco).
+- Fixed resetting the "First day" timer parameter once the timer actually starts
+  recording.
+- Fixed the still picture workaround in case the progress display is active
+  (thanks to Gerald Raaf).
+- Fixed a problem with accessing the epg.data file before it is fully written
+  (thanks to Thilo Wunderlich for reporting this one).
+- Now the EPG scan skips channels that have their 'Ca' parameter explicitly set
+  to an other DVB card (suggested by Sergei Haller).
+- Fixed a possible hangup when reading a broken epg.data file (thanks to Henning
+  Holtschneider for pointing this one out).
+- Fixed a bug in the editing process in case a previously edited file with the
+  same name was manually deleted on a system with more than one video directory
+  (thanks to Dirk Wiebel for reporting this one).
diff --git a/config.c b/config.c
index 7104dcc27..76e138b7e 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.96 2002/04/01 11:54:05 kls Exp $
+ * $Id: config.c 1.97 2002/04/02 21:56:51 kls Exp $
  */
 
 #include "config.h"
@@ -606,14 +606,14 @@ bool cTimer::Matches(time_t t)
          if ((!firstday || a >= firstday) && t <= b) {
             startTime = a;
             stopTime = b;
-            if (t >= firstday + SECSINDAY)
-               firstday = 0;
             break;
             }
          }
       }
   if (!startTime)
      startTime = firstday; // just to have something that's more than a week in the future
+  else if (t > startTime || t > firstday + SECSINDAY + 3600) // +3600 in case of DST change
+     firstday = 0;
   return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
 }
 
diff --git a/config.h b/config.h
index e7c01eb2b..00774b08f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.107 2002/03/31 21:17:30 kls Exp $
+ * $Id: config.h 1.109 2002/04/07 13:08:12 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0pre5"
+#define VDRVERSION "1.0.0"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbapi.c b/dvbapi.c
index d9906189d..9d59d900e 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.166 2002/03/29 11:32:47 kls Exp $
+ * $Id: dvbapi.c 1.170 2002/04/07 09:35:51 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -1194,8 +1194,10 @@ void cReplayBuffer::DisplayFrame(uchar *b, int Length)
   CHECK(ioctl(videoDev, VIDEO_STILLPICTURE, &sp));
 #else
 #define MIN_IFRAME 400000
-  for (int i = MIN_IFRAME / Length + 1; i > 0; i--)
+  for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
       safe_write(videoDev, b, Length);
+      usleep(1); // allows the buffer to be displayed in case the progress display is active
+      }
 #endif
 }
 
@@ -1612,6 +1614,18 @@ bool cVideoCutter::Start(const char *FileName)
      cRecording Recording(FileName);
      const char *evn = Recording.PrefixFileName('%');
      if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
+        // XXX this can be removed once RenameVideoFile() follows symlinks (see videodir.c)
+        // remove a possible deleted recording with the same name to avoid symlink mixups:
+        char *s = strdup(evn);
+        char *e = strrchr(s, '.');
+        if (e) {
+           if (strcmp(e, ".rec") == 0) {
+              strcpy(e, ".del");
+              RemoveVideoFile(s);
+              }
+           }
+        delete s;
+        // XXX
         editedVersionName = strdup(evn);
         Recording.WriteSummary();
         cuttingBuffer = new cCuttingBuffer(FileName, editedVersionName);
@@ -2803,12 +2817,16 @@ void cEITScanner::Process(void)
                               numTransponders = 0;
                               }
                            cChannel *Channel = Channels.GetByNumber(ch);
-                           if (Channel && Channel->pnr && !TransponderScanned(Channel)) {
-                              if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
-                                 currentChannel = DvbApi->Channel();
-                              Channel->Switch(DvbApi, false);
-                              lastChannel = ch;
-                              break;
+                           if (Channel) {
+                              if (Channel->ca <= MAXDVBAPI && !DvbApi->ProvidesCa(Channel->ca))
+                                 break; // the channel says it explicitly needs a different card
+                              if (Channel->pnr && !TransponderScanned(Channel)) {
+                                 if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
+                                    currentChannel = DvbApi->Channel();
+                                 Channel->Switch(DvbApi, false);
+                                 lastChannel = ch;
+                                 break;
+                                 }
                               }
                            ch++;
                            }
diff --git a/eit.c b/eit.c
index 4fc749bfa..b27fbc7a1 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.42 2002/04/01 12:58:20 kls Exp $
+ * $Id: eit.c 1.44 2002/04/06 13:58:59 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -390,12 +390,12 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
              case 'e': pEvent = NULL;
                        break;
              case 'c': // to keep things simple we react on 'c' here
-                       return false;
+                       return true;
              default:  esyslog(LOG_ERR, "ERROR: unexpected tag while reading EPG data: %s", s);
                        return false;
              }
            }
-     return true;
+     esyslog(LOG_ERR, "ERROR: unexpected end of file while reading EPG data");
      }
   return false;
 }
@@ -754,8 +754,8 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
               if (1 == sscanf(s + 1, "%u", &uServiceID)) {
                  cSchedule *p = (cSchedule *)Schedules->SetCurrentServiceID(uServiceID);
                  if (p) {
-                    while (cEventInfo::Read(f, p))
-                          ; // loop stops after having read the closing 'c'
+                    if (!cEventInfo::Read(f, p))
+                       return false;
                     }
                  }
               }
@@ -1090,10 +1090,10 @@ void cSIProcessor::Action()
          if (epgDataFileName && now - lastDump > 600)
          {
             cMutexLock MutexLock(&schedulesMutex);
-            FILE *f = fopen(GetEpgDataFileName(), "w");
-            if (f) {
+            cSafeFile f(GetEpgDataFileName());
+            if (f.Open()) {
                schedules->Dump(f);
-               fclose(f);
+               f.Close();
                }
             else
                LOG_ERROR;
diff --git a/eit.diff b/eit.diff
deleted file mode 100644
index 57584b966..000000000
--- a/eit.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is a BitKeeper generated patch for the following project:
-# Project Name: Linux VDR
-# This patch format is intended for GNU patch command version 2.5 or higher.
-# This patch includes the following deltas:
-#	           ChangeSet	1.21    -> 1.22   
-#	               eit.c	1.6     -> 1.7    
-#
-# The following is the BitKeeper ChangeSet Log
-# --------------------------------------------
-# 02/04/01	aschultz@warp10.net	1.22
-# fix segfault in eit.c
-# --------------------------------------------
-#
-diff -Nru a/eit.c b/eit.c
---- a/eit.c	Mon Apr  1 14:38:00 2002
-+++ b/eit.c	Mon Apr  1 14:38:00 2002
-@@ -559,7 +559,7 @@
-      pSubtitle = compactspace(pSubtitle);
-      pExtendedDescription = compactspace(pExtendedDescription);
-      // Remove superfluous hyphens:
--     if (pExtendedDescription) {
-+     if (pExtendedDescription && strlen(pExtendedDescription) >= 3) {
-         char *p = pExtendedDescription + 1;
-         while (*p) {
-               if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
diff --git a/i18n.c b/i18n.c
index 0ffbf4528..0b22f1ddc 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.78 2002/04/01 11:37:08 kls Exp $
+ * $Id: i18n.c 1.79 2002/04/06 09:49:19 kls Exp $
  *
  * Slovenian  translations provided by Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  * Italian    translations provided by Alberto Carraro <bertocar@tin.it>
@@ -14,6 +14,7 @@
  * Norwegian  translations provided by J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
  * Finnish    translations provided by Hannu Savolainen <hannu@opensound.com>
  * Polish     translations provided by Michael Rakowski <mrak@gmx.de>
+ * Spanish    translations provided by Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  *
  */
 
@@ -62,7 +63,7 @@
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 10;
+const int NumLanguages = 11;
 
 typedef const char *tPhrase[NumLanguages];
 
@@ -78,6 +79,7 @@ const tPhrase Phrases[] = {
     "Norsk",
     "Suomi",
     "Polski",
+    "Espa�ol",
   },
   // Menu titles:
   { "VDR",
@@ -90,6 +92,7 @@ const tPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -101,6 +104,7 @@ const tPhrase Phrases[] = {
     "Programmer",
     "Ohjelmat",
     "Program",
+    "Programa",
   },
   { "Channels",
     "Kan�le",
@@ -112,6 +116,7 @@ const tPhrase Phrases[] = {
     "Kanaler",
     "Kanavat",
     "Kanaly",
+    "Canales",
   },
   { "Timers",
     "Timer",
@@ -123,6 +128,7 @@ const tPhrase Phrases[] = {
     "Timere",
     "Ajastin",
     "Timery",
+    "Timer",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -134,6 +140,7 @@ const tPhrase Phrases[] = {
     "Opptak",
     "Nauhoitteet",
     "Nagrania",
+    "Grabaciones",
   },
   { "Setup",
     "Einstellungen",
@@ -145,6 +152,7 @@ const tPhrase Phrases[] = {
     "Konfigurasjon",
     "Asetukset",
     "Nastawy",
+    "Configuraci�n",
   },
   { "Commands",
     "Befehle",
@@ -156,28 +164,31 @@ const tPhrase Phrases[] = {
     "Kommandoer",
     "Komennot",
     "Rozkazy",
+    "�rdenes",
   },
-  { "Edit Channel",
-    "Kanal Editieren",
+  { "Edit channel",
+    "Kanal editieren",
     "Uredi kanal",
     "Modifica canale",
     "Kanaal aanpassen",
-    "Modificar Canal",
+    "Modificar canal",
     "Modifier une cha�ne",
-    "Editer Kanal",
+    "Editer kanal",
     "Muokkaa kanavaa",
-    "Ustawienie Kanalu",
+    "Ustawienie kanalu",
+    "Modificar canal",
   },
-  { "Edit Timer",
-    "Timer Editieren",
+  { "Edit timer",
+    "Timer editieren",
     "Uredi termin",
-    "Modifica Timer",
+    "Modifica timer",
     "Timer veranderen",
-    "Modificar Timer",
+    "Modificar timer",
     "Changer la programmation",
-    "Editer Timer",
+    "Editer timer",
     "Muokkaa ajastusta",
-    "Ustawienie Timerow",
+    "Ustawienie timerow",
+    "Modificar timer",
   },
   { "Event",
     "Sendung",
@@ -189,6 +200,7 @@ const tPhrase Phrases[] = {
     "Hendelse",
     "Tapahtuma",
     "Audycja",
+    "Evento",
   },
   { "Summary",
     "Inhalt",
@@ -200,6 +212,7 @@ const tPhrase Phrases[] = {
     "Sammendrag",
     "Yhteenveto",
     "Zawartosc",
+    "Res�men",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -211,6 +224,7 @@ const tPhrase Phrases[] = {
     "Program Guide - %s",
     "Ohjelma - %s",
     "Program - %s",
+    "Programa - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -222,6 +236,7 @@ const tPhrase Phrases[] = {
     "Hvilket program sendes n�?",
     "Nykyinen ohjelma",
     "Program biezacy",
+    "�Qu� hay ahora?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -233,6 +248,7 @@ const tPhrase Phrases[] = {
     "Hvilket program er neste?",
     "Seuraava ohjelma",
     "Program nastepny",
+    "�Qu� hay proximo?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -245,6 +261,7 @@ const tPhrase Phrases[] = {
     "Editer",
     "Muuta",
     "Edycja",
+    "Modificar",
   },
   { "New",
     "Neu",
@@ -256,6 +273,7 @@ const tPhrase Phrases[] = {
     "Ny",
     "Uusi",
     "Nowy",
+    "Nuevo",
   },
   { "Delete",
     "L�schen",
@@ -267,6 +285,7 @@ const tPhrase Phrases[] = {
     "Slett",
     "Poista",
     "Usunac",
+    "Borrar",
   },
   { "Mark",
     "Markieren",
@@ -278,6 +297,7 @@ const tPhrase Phrases[] = {
     "Marker",
     "Merkitse",
     "Zaznaczyc",
+    "Marcar",
   },
   { "On/Off",
     "Ein/Aus",
@@ -289,6 +309,7 @@ const tPhrase Phrases[] = {
     "Av/P�",
     "P��ll�/Pois",
     "Zal./ Wyl.",
+    "On/Off",
   },
   { "Record",
     "Aufnehmen",
@@ -300,6 +321,7 @@ const tPhrase Phrases[] = {
     "Ta opp",
     "Nauhoita",
     "Nagrywac",
+    "Grabar",
   },
   { "Play",
     "Wiedergabe",
@@ -311,6 +333,7 @@ const tPhrase Phrases[] = {
     "Spill av",
     "Toista",
     "Odtwarzac",
+    "Play",
   },
   { "Rewind",
     "Anfang",
@@ -322,6 +345,7 @@ const tPhrase Phrases[] = {
     "Spol tilbake",
     "Takaisinkel.",
     "Poczatek",
+    "Rebobinar",
   },
   { "Button$Stop",
     "Beenden",
@@ -333,6 +357,7 @@ const tPhrase Phrases[] = {
     "Stopp",
     "Pys�yt�",
     "Zakonczyc",
+    "Parar",
   },
   { "Resume",
     "Weiter",
@@ -344,6 +369,7 @@ const tPhrase Phrases[] = {
     "Fortsett",
     "Jatka",
     "Dalej",
+    "Continuar",
   },
   { "Summary",
     "Inhalt",
@@ -355,6 +381,7 @@ const tPhrase Phrases[] = {
     "Sammendrag",
     "Yhteenveto",
     "Zawartosc",
+    "Resumen",
   },
   { "Open",
     "�ffnen",
@@ -366,6 +393,7 @@ const tPhrase Phrases[] = {
     "�pne",
     "Avaa",
     "Otworzyc",
+    "Abrir",
   },
   { "Switch",
     "Umschalten",
@@ -377,6 +405,7 @@ const tPhrase Phrases[] = {
     "Skift til",
     "Valitse",
     "Przelaczyc",
+    "Cambiar",
   },
   { "Now",
     "Jetzt",
@@ -388,6 +417,7 @@ const tPhrase Phrases[] = {
     "N�",
     "Nyt",
     "Teraz",
+    "Ahora",
   },
   { "Next",
     "N�chste",
@@ -399,6 +429,7 @@ const tPhrase Phrases[] = {
     "Neste",
     "Seuraava",
     "Nastepny",
+    "Siguiente",
   },
   { "Button$Schedule",
     "Programm",
@@ -410,6 +441,7 @@ const tPhrase Phrases[] = {
     "Programmer",
     "Ohjelmisto",
     "Program",
+    "Programa",
   },
   { "Language",
     "Sprache",
@@ -421,6 +453,7 @@ const tPhrase Phrases[] = {
     "Spr�k",
     "Kieli",
     "Jezyk",
+    "Lengua",
   },
   { "Eject",
     "Auswerfen",
@@ -432,6 +465,7 @@ const tPhrase Phrases[] = {
     "Eject",
     "Avaa",
     "Wyrzucenie",
+    "Eyectar",
   },
   // Confirmations:
   { "Delete channel?",
@@ -444,6 +478,7 @@ const tPhrase Phrases[] = {
     "Slette kanal?",
     "Poistetaanko kanava?",
     "Usunac kanal?",
+    "�Eliminar canal?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -455,6 +490,7 @@ const tPhrase Phrases[] = {
     "Slette timer?",
     "Poistetaanko ajastus?",
     "Usunac timer?",
+    "�Eliminar timer?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -466,6 +502,7 @@ const tPhrase Phrases[] = {
     "Slette opptak?",
     "Poistetaanko nauhoitus?",
     "Usunac nagranie?",
+    "�Eliminar grabacion?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -477,6 +514,7 @@ const tPhrase Phrases[] = {
     "Timer gj�r opptak - vil du slette likevel?",
     "Ajastin nauhoittaa - poistetaanko silti?",
     "Nagrywanie w trakcie - napewno usunac?",
+    "�Timer activo - de verdad eliminarlo?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -488,6 +526,7 @@ const tPhrase Phrases[] = {
     "Stoppe opptak?",
     "Pys�ytet��nk� nauhoitus?",
     "Zakonczyc nagranie?",
+    "�Parar grabaci�n?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -499,6 +538,7 @@ const tPhrase Phrases[] = {
     "p� f�rste enhet",
     "p��vastaanottimella",
     "na pierwszym interfejsie",
+    "en interface primario",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -510,6 +550,7 @@ const tPhrase Phrases[] = {
     "Avbryte redigering?",
     "Peruutetaanko muokkaus?",
     "Zakonczyc montaz?",
+    "�Cancelar modificaci�n?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -521,6 +562,7 @@ const tPhrase Phrases[] = {
     "Vil du virkelig starte p� nytt?",
     "Aloitetaanko varmasti alusta?",
     "Rzeczywiscie nowy start?",
+    "�De verdad reiniciar?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -532,6 +574,7 @@ const tPhrase Phrases[] = {
     "Gj�r opptak - starte p� nytt likevel?",
     "Nauhoitus k�ynniss� - aloitetaanko alusta?",
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
+    "�Grabando - reiniciar?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -543,6 +586,7 @@ const tPhrase Phrases[] = {
     "Gj�r opptak - sl� av likevel?",
     "Nauhoitus kesken - lopetetaanko se?",
     "Nagrywanie w trakcie - mimo to wylaczyc?",
+    "�Grabando - apagar?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -554,6 +598,7 @@ const tPhrase Phrases[] = {
     "Skal gj�re opptak om %d minutter - sl� av likevel?",
     "Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
+    "�Grabando en %d minutos, de verdad cortar?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -565,6 +610,7 @@ const tPhrase Phrases[] = {
     "Trykk en tast for ikke � sl� av",
     "Peruuta pys�ytys painamalla jotakin n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
+    "Pulse una tecla para interrumpir corte",
   },
   // Channel parameters:
   { "Name",
@@ -577,6 +623,7 @@ const tPhrase Phrases[] = {
     "Navn",
     "Nimi",
     "Nazwa",
+    "Nombre",
   },
   { "Frequency",
     "Frequenz",
@@ -588,6 +635,7 @@ const tPhrase Phrases[] = {
     "Frekvens",
     "Taajuus",
     "Czestotliwosc",
+    "Frecuencia",
   },
   { "Polarization",
     "Polarisation",
@@ -599,6 +647,7 @@ const tPhrase Phrases[] = {
     "Polarisasjon",
     "Polarisaatio",
     "Polaryzacja",
+    "Polarizaci�n",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -610,6 +659,7 @@ const tPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -621,6 +671,7 @@ const tPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -632,6 +683,7 @@ const tPhrase Phrases[] = {
     "Vpid",
     "Kuva PID",
     "Vpid",
+    "Vpid",
   },
   { "Apid1",
     "Apid1",
@@ -643,6 +695,7 @@ const tPhrase Phrases[] = {
     "Apid1",
     "��ni PID1",
     "Apid1",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -654,6 +707,7 @@ const tPhrase Phrases[] = {
     "Apid2",
     "��ni PID2",
     "Apid2",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -665,6 +719,7 @@ const tPhrase Phrases[] = {
     "AC3pid1",
     "AC3 PID1",
     "Dpid1",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -676,6 +731,7 @@ const tPhrase Phrases[] = {
     "AC3pid2",
     "AC3 PID2",
     "Dpid2",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -687,6 +743,7 @@ const tPhrase Phrases[] = {
     "Tekst-TV pid",
     "TekstiTV PID",
     "Tpid",
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -698,6 +755,7 @@ const tPhrase Phrases[] = {
     "Kortleser",
     "Salauskortti",
     "CA",
+    "CA",
   },
   { "Pnr",
     "Pnr",
@@ -709,6 +767,7 @@ const tPhrase Phrases[] = {
     "Program Id",
     "Ohjelmatunnus",
     "Pnr",
+    "Pnr",
   },
   // Timer parameters:
   { "Active",
@@ -721,6 +780,7 @@ const tPhrase Phrases[] = {
     "Aktiv",
     "Aktiivinen",
     "Aktywny",
+    "Activo",
   },
   { "Channel",
     "Kanal",
@@ -732,6 +792,7 @@ const tPhrase Phrases[] = {
     "Kanal",
     "Kanava",
     "Kanal",
+    "Canal",
   },
   { "Day",
     "Tag",
@@ -743,6 +804,7 @@ const tPhrase Phrases[] = {
     "Dag",
     "P�iv�",
     "Dzien",
+    "D�a",
   },
   { "Start",
     "Anfang",
@@ -754,6 +816,7 @@ const tPhrase Phrases[] = {
     "Start",
     "Aloitus",
     "Poczatek",
+    "Comienzo",
   },
   { "Stop",
     "Ende",
@@ -765,6 +828,7 @@ const tPhrase Phrases[] = {
     "Slutt",
     "Lopetus",
     "Koniec",
+    "Fin",
   },
   { "Priority",
     "Priorit�t",
@@ -776,6 +840,7 @@ const tPhrase Phrases[] = {
     "Prioritet",
     "Prioriteetti",
     "Priorytet",
+    "Prioridad",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -787,6 +852,7 @@ const tPhrase Phrases[] = {
     "Levetid",
     "Voimassaolo",
     "Trwalosc dni",
+    "Durabilidad",
   },
   { "File",
     "Datei",
@@ -798,6 +864,7 @@ const tPhrase Phrases[] = {
     "Filnavn",
     "Tiedosto",
     "Plik",
+    "Fichero",
   },
   { "First day",
     "Erster Tag",
@@ -809,6 +876,7 @@ const tPhrase Phrases[] = {
     "F�rste dag",
     "1. p�iv�",
     "Pierwszy dzien",
+    "Primer d�a",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -821,6 +889,7 @@ const tPhrase Phrases[] = {
     "Kanalen er i bruk av en timer!",
     "Kanava on ajastimen k�yt�ss�!",
     "Kanal jest zajety przez timer nagran",
+    "�Canal est� ocupado por un timer!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -832,6 +901,7 @@ const tPhrase Phrases[] = {
     "Ikke mulig � skifte kanal!",
     "Kanavan vaihtaminen ei mahdollista!",
     "Kanal nie moze byc teraz przelaczony!",
+    "�No puedo cambiar canal!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -843,9 +913,10 @@ const tPhrase Phrases[] = {
     "Timer gj�r opptak!",
     "Ajastinnauhoitus k�ynniss�!",
     "Timer nagrywa!",
+    "�Timer esta grabando!",
   },
   { "Error while accessing recording!",
-    "Fehler beim ansprechen der Aufzeichnung!",
+    "Fehler beim Ansprechen der Aufzeichnung!",
     "Napaka pri dostopu do posnetka",
     "Errore nel tentativo di acc alla registrazione",
     "Fout bij lezen opname!",
@@ -854,6 +925,7 @@ const tPhrase Phrases[] = {
     "Feil under lesing av opptak!",
     "Nauhoituksen toistaminen ep�onnistui!",
     "Blad - brak dostepu do nagrania!",
+    "�Error al accesar la grabaci�n!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -865,6 +937,7 @@ const tPhrase Phrases[] = {
     "Feil under sletting av opptak!",
     "Nauhoituksen poistaminen ep�onnistui!",
     "Blad przy usuwaniu nagrania!",
+    "�Error al borrar la grabaci�n!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -876,6 +949,7 @@ const tPhrase Phrases[] = {
     "*** Ugyldig Kanal! ***",
     "*** Virheellinen kanavavalinta! ***",
     "*** Niewazny kanal ***",
+    "*** Canal inv�lido ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -887,6 +961,7 @@ const tPhrase Phrases[] = {
     "Ingen ledige DVB enheter for opptak!",
     "Ei vapaata vastaanotinta nauhoitusta varten!",
     "Brak wolnej karty DVB do nagrywania!",
+    "�No hay dispositivo DVB disponible para grabar!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -898,6 +973,7 @@ const tPhrase Phrases[] = {
     "Kanalen er l�st (opptak)!",
     "Kanava lukittu (nauhoitusta varten)!",
     "Kanal zablokowany (nagrywanie w toku)!",
+    "�Canal bloqueado (grabando)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -909,6 +985,7 @@ const tPhrase Phrases[] = {
     "Kan ikke starte transfer modus!",
     "K�sitt�m�tt�mi� teknisi� ongelmia!",
     "Tryb transferowy jest niemozliwy!",
+    "�No puedo iniciar modo de transferencia!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -920,6 +997,7 @@ const tPhrase Phrases[] = {
     "Kan ikke starte redigeringsprosessen!",
     "Muokkauksen aloittaminen ei onnistu!",
     "Uruchamianie montazu jest niemozliwe!",
+    "�No puedo iniciar proceso de modificaci�n!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -931,6 +1009,7 @@ const tPhrase Phrases[] = {
     "Redigeringsprosessen er allerede aktiv!",
     "Muokkaus on jo k�ynniss�!",
     "Montaz w toku!",
+    "�Proceso de modificaci�n ya fue iniciado!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -942,6 +1021,7 @@ const tPhrase Phrases[] = {
     "Kan ikke sl� av - startet uten parameteret '-s'!",
     "Ei voida sammuttaa '-s' parametria ei annettu!",
     "Wylaczenie niemozliwe - brak opcji '-s' !",
+    "�No puedo cortar - opci�n '-s' absente!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -953,6 +1033,7 @@ const tPhrase Phrases[] = {
     "Lite ledig diskplass!",
     "Kovalevy l�hes t�ynn�!",
     "Dysk wkrotce pelny!",
+    "�Disco casi lleno",
   },
   // Setup pages:
   { "OSD",
@@ -965,6 +1046,7 @@ const tPhrase Phrases[] = {
     "OSD",
     "Tekstin�ytt�",
     "OSD",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -976,6 +1058,7 @@ const tPhrase Phrases[] = {
     "Programoversikt",
     "Ohjelmaopas",
     "EPG",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -987,6 +1070,7 @@ const tPhrase Phrases[] = {
     "DVB-enheter",
     "DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -998,6 +1082,7 @@ const tPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -1009,6 +1094,7 @@ const tPhrase Phrases[] = {
     "CICAM",
     "CICAM",
     "CICAM",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -1020,6 +1106,7 @@ const tPhrase Phrases[] = {
     "Opptak",
     "Nauhoita",
     "Nagranie",
+    "Grabaci�n",
   },
   { "Replay",
     "Wiedergabe",
@@ -1031,6 +1118,7 @@ const tPhrase Phrases[] = {
     "Spill av",
     "Toista",
     "Odtwarzanie",
+    "Poner",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -1042,6 +1130,7 @@ const tPhrase Phrases[] = {
     "Forskjellig",
     "Sekalaista",
     "Pozostale",
+    "Varios",
   },
   { "Restart",
     "Neustart",
@@ -1053,6 +1142,7 @@ const tPhrase Phrases[] = {
     "Start p� nytt",
     "Aloita uudelleen",
     "Zastartowac",
+    "Reiniciar",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -1065,6 +1155,7 @@ const tPhrase Phrases[] = {
     "Spr�k",
     "Kieli",
     "Jezyk",
+    "Lengua",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -1076,6 +1167,7 @@ const tPhrase Phrases[] = {
     "Bredde",
     "Leveys",
     "Szerokosc",
+    "Anchura",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -1087,6 +1179,7 @@ const tPhrase Phrases[] = {
     "H�yde",
     "Korkeus",
     "Wysokosc",
+    "Altura",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -1098,6 +1191,7 @@ const tPhrase Phrases[] = {
     "Tid meldinger skal vises (s)",
     "Ilmoitusten n�kymisaika (s)",
     "Czas wyswietlania wiadomosci (s)",
+    "Duraci�n muestra mensajes (s)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -1109,6 +1203,7 @@ const tPhrase Phrases[] = {
     "Posisjon p� kanalinformasjon",
     "Kanavainfon sijainti",
     "Lokalizacja informacji o kanale",
+    "Posici�n para informaci�n canal",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -1120,6 +1215,7 @@ const tPhrase Phrases[] = {
     "Info ved kanalskifte",
     "N�yt� kanavainfo",
     "Informacja przy zmianie kanalu",
+    "Informaci�n para cambio de canal",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -1131,6 +1227,7 @@ const tPhrase Phrases[] = {
     "Rask rulling i menyer",
     "Valikkojen rullaus",
     "Przesuwac stronami",
+    "Desplazar p�gina entera",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -1142,9 +1239,10 @@ const tPhrase Phrases[] = {
     "Sorter timere",
     "J�rjest� ajastimet",
     "Sortowanie timerow",
+    "Ordenar timer",
   },
   { "Setup.OSD$Recording directories",
-    "Aufnahme Verzeichnisse",
+    "Aufnahmeverzeichnisse",
     "Direktoriji za posnetke",
     "Directory di registrazione",
     "Opname directories",
@@ -1153,6 +1251,7 @@ const tPhrase Phrases[] = {
     "Kataloger til opptak",
     "Nauhoitushakemistot",
     "Wykaz nagran",
+    "Directorios para grabaci�n",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -1164,6 +1263,7 @@ const tPhrase Phrases[] = {
     "Ledig tid f�r EPG-s�k (h)",
     "Ohjelmatied. odotusaika (h)",
     "Czas do skanu EPG (h)",
+    "Tiempo hasta exploraci�n EPG (h)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -1175,6 +1275,7 @@ const tPhrase Phrases[] = {
     "Niv� for EPG-feilretting",
     "EPG Bugfix Level",
     "Poziom bledow EPG",
+    "Nivel para arreglar EPG",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -1186,6 +1287,7 @@ const tPhrase Phrases[] = {
     "Juster system-klokken",
     "Vastaanota kellonaika",
     "Ustawianie czasu",
+    "Ajustar reloj de sistema",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -1197,6 +1299,7 @@ const tPhrase Phrases[] = {
     "Bruk klokke fra transponder",
     "Vastaanota kellonaika l�hettimelt�",
     "Transponder do ustawiania czasu",
+    "Transponder para reloj de sistema",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -1208,6 +1311,7 @@ const tPhrase Phrases[] = {
     "Hoved DVB-enhet",
     "Ensisij. vast.otin",
     "Pierwotny interfejs DVB",
+    "Primer interface DVB",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -1219,6 +1323,7 @@ const tPhrase Phrases[] = {
     "TV-Format",
     "Kuvamuoto",
     "Format telewizyjny",
+    "Formato V�deo",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -1230,6 +1335,7 @@ const tPhrase Phrases[] = {
     "LO-grensefrekvens (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -1241,6 +1347,7 @@ const tPhrase Phrases[] = {
     "LO-frekvens i lavb�ndet (MHz)",
     "LO LNB taajuus (MHz)",
     "Dolna czestotliwosc LNB (MHz)",
+    "Frecuencia baja LNB (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -1252,6 +1359,7 @@ const tPhrase Phrases[] = {
     "LO-frekvens i h�yb�ndet (MHz)",
     "HI LNB taajuus (MHz)",
     "Gorna czestotliwosc LNB (MHz)",
+    "Frecuencia alta LNB (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -1263,6 +1371,7 @@ const tPhrase Phrases[] = {
     "Bruk DiSEqC",
     "K�yt� DiSEqC",
     "Uzywac DiSEqC",
+    "Utilizar DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -1274,6 +1383,7 @@ const tPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -1285,6 +1395,7 @@ const tPhrase Phrases[] = {
     "Opptaksmargin start (min)",
     "Aloitusmarginaali (min)",
     "Poczatkowy czas buforowy (min)",
+    "Comenzar grabaci�n antes (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -1296,6 +1407,7 @@ const tPhrase Phrases[] = {
     "Opptaksmargin slutt (min)",
     "Lopetusmarginaali (min)",
     "Koncowy czas buforowy (min)",
+    "Cortar grabaci�n despu�s (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -1307,6 +1419,7 @@ const tPhrase Phrases[] = {
     "Prioritetsgrense HovedDVB",
     "PrimaryLimit",
     "Pierwotny limit",
+    "L'mite primario",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -1318,6 +1431,7 @@ const tPhrase Phrases[] = {
     "Normal prioritet (Timer)",
     "Oletusprioriteetti",
     "Priorytet pierwotny",
+    "Prioridad predefinida",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -1329,6 +1443,7 @@ const tPhrase Phrases[] = {
     "Normal levetid timer (d)",
     "Oletus voimassaoloaika (d)",
     "Pierwotna trwalosc (d)",
+    "Duraci�n predefinida",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -1340,6 +1455,7 @@ const tPhrase Phrases[] = {
     "Bruk episodenavn",
     "K�yt� jakson nime�",
     "Czy uzywac nazwe epizodu",
+    "Utilizar nombre de episodo",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -1351,6 +1467,7 @@ const tPhrase Phrases[] = {
     "Markere direkteopptak",
     "Merkitse v�lit�n nauh.",
     "Zaznaczyc natychm. nagranie",
+    "Marcar grabaciones instant�neas",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -1362,6 +1479,7 @@ const tPhrase Phrases[] = {
     "Navngi direkteopptak",
     "Nime� v�lit�n nauh.",
     "Nazwac natychm. nagranie",
+    "Nombrar grabaciones instant�neas",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -1373,6 +1491,7 @@ const tPhrase Phrases[] = {
     "Ta opp Dolby Digital lyd",
     "Dolby Digital nauhoitus",
     "Nagrywac Dolby Digital",
+    "Grabar sonido Dolby Digital",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -1384,6 +1503,7 @@ const tPhrase Phrases[] = {
     "Maksimal st�rrelse p� videofiler (MB)",
     "Maksimi tiedoston koko (MB)",
     "Maks. wielkosc pliku (MB)",
+    "Tama�o m�x. ficheros (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -1395,6 +1515,7 @@ const tPhrase Phrases[] = {
     "Splitt redigerte filer",
     "Paloittele muokatut",
     "Dzielic montowane pliki",
+    "Quebrar ficheros",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -1406,6 +1527,7 @@ const tPhrase Phrases[] = {
     "Multispeed modus",
     "Moninopeustila",
     "Tryb wielopredkosciowy",
+    "Modo multi-velocidad",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -1417,6 +1539,7 @@ const tPhrase Phrases[] = {
     "Vis avspillingsmodus",
     "N�yt� toiston tila",
     "Wyswietlac status odtwarzania",
+    "Mostrar modo de replay",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -1428,6 +1551,7 @@ const tPhrase Phrases[] = {
     "Minste hendelsespause (min)",
     "Minimi tapahtuman odotus (min)",
     "Min. czas do nast. akcji (Event) (min)",
+    "Tiempo m�nimo pausa (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -1439,6 +1563,7 @@ const tPhrase Phrases[] = {
     "Minimumstid med inaktivitet (min)",
     "Minimi k�ytt�j�n odotus (min)",
     "Min. brak aktywnosci uzytkownika (min)",
+    "Tiempo m�nimo inactividad (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (min)",
     "SVDRP Timeout (min)",
@@ -1450,6 +1575,7 @@ const tPhrase Phrases[] = {
     "Ubrukt SVDRP-levetid (min)",
     "SVDRP odotusaika (min)",
     "Min. brak aktywnosci SVDRP (min)",
+    "SVDRP interrupci�n (min)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -1462,6 +1588,7 @@ const tPhrase Phrases[] = {
     "MTOTFLS",
     "MTKTPLS",
     "PWSCPSN",
+    "LMMJVSD",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -1473,6 +1600,7 @@ const tPhrase Phrases[] = {
     "ManTirOnsTorFreL�rS�n",
     "MaaTiiKesTorPerLauSun",
     "PonWtoSroCzwPiaSobNie",
+    "LunMarMieJueVieSabDom",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -1485,6 +1613,7 @@ const tPhrase Phrases[] = {
     "L�re fjernkontrolltaster",
     "Kaukos��timen n�pp�inten opettelu",
     "Nauka kodu pilota",
+    "Aprendiendo teclas del telemando",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -1496,6 +1625,7 @@ const tPhrase Phrases[] = {
     "Fase 1: Finne fjernkontroll-kodetype",
     "Vaihe 1: L�hetystavan selvitt�minen",
     "Faza 1: Detekcja typu kodu",
+    "Fase 1: Detectando tipo de receptor",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -1507,6 +1637,7 @@ const tPhrase Phrases[] = {
     "Trykk en av tastene p� fjernkontrollen",
     "Paina mit� tahansa kaukos��timen n�pp�int�",
     "Nacisnac klawisz pilota",
+    "Pulse una tecla en el telemando",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -1518,6 +1649,7 @@ const tPhrase Phrases[] = {
     "Fjernkontroll-kodetype funnet!",
     "N�pp�inpainallus vastaanotettu!",
     "Kod pilota zostal poznany!",
+    "�C�digo detectado!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -1529,6 +1661,7 @@ const tPhrase Phrases[] = {
     "Ikke trykk p� noen av tastene...",
     "�l� paina mit��n n�pp�int�...",
     "Nie naciskac klawiszy...",
+    "No pulse tecla...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -1540,6 +1673,7 @@ const tPhrase Phrases[] = {
     "Fase 2: L�re spesifikke tastekoder",
     "Vaihe 2: N�pp�inkoodien opettelu",
     "Faza 2: Nauka pojedynczych klawiszy",
+    "Fase 2: Aprendiendo c�digos espec�ficos",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -1551,6 +1685,7 @@ const tPhrase Phrases[] = {
     "Trykk tasten for '%s'",
     "Paina n�pp�int� toiminnolle '%s'",
     "Nacisnac klawisz dla '%s'",
+    "Pulsar tecla para '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -1562,6 +1697,7 @@ const tPhrase Phrases[] = {
     "Trykk 'Opp' for � bekrefte",
     "Paina 'Yl�s' hyv�ksy�ksesi",
     "Nacisnac 'Gora' do potwierdzenia",
+    "Pulse 'Arriba' para confirmar",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -1573,6 +1709,7 @@ const tPhrase Phrases[] = {
     "Trykk Ned' for � fortsette",
     "Paina 'Alas' jatkaaksesi",
     "Nacisnac 'Dol' zeby kontynuowac",
+    "Pulse 'Abajo' para confirmar",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -1584,6 +1721,7 @@ const tPhrase Phrases[] = {
     "(trykk 'Opp' for � g� tilbake)",
     "(paina 'Yl�s' palataksesi takaisin)",
     "(Nacisnac 'Gora' cofa)",
+    "(Pulse 'Arriba' para retornar)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -1595,6 +1733,7 @@ const tPhrase Phrases[] = {
     "(trykk 'Ned' for � avslutte innl�ring)",
     "(paina 'Alas' lopettaaksesi n�pp�inten opettelun)",
     "(Nacisnac 'Dol' by zakonczyc)",
+    "(Pulse 'Abajo' para terminar programaci�n teclas)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -1606,6 +1745,7 @@ const tPhrase Phrases[] = {
     "Fase 3: Lagre tastekoder",
     "Vaihe 3: N�pp�inkoodien tallettaminen",
     "Faza 3: Zapamietac Kod",
+    "Fase 3: Guardar c�digos de teclas",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -1617,6 +1757,7 @@ const tPhrase Phrases[] = {
     "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
     "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
+    "Pulse 'Arriba' para guarder, 'Abajo' para anular",
   },
   // Key names:
   { "Up",
@@ -1629,6 +1770,7 @@ const tPhrase Phrases[] = {
     "Opp",
     "Yl�s",
     "Gora",
+    "Arriba",
   },
   { "Down",
     "Ab",
@@ -1640,6 +1782,7 @@ const tPhrase Phrases[] = {
     "Ned",
     "Alas",
     "Dol",
+    "Abajo",
   },
   { "Menu",
     "Men�",
@@ -1651,6 +1794,7 @@ const tPhrase Phrases[] = {
     "Meny",
     "Valikko",
     "Menu",
+    "Menu",
   },
   { "Ok",
     "Ok",
@@ -1662,6 +1806,7 @@ const tPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -1673,6 +1818,7 @@ const tPhrase Phrases[] = {
     "Tilbake",
     "Takaisin",
     "Wstecz",
+    "Retornar",
   },
   { "Left",
     "Links",
@@ -1684,6 +1830,7 @@ const tPhrase Phrases[] = {
     "Venstre",
     "Vasemmalle",
     "Lewo",
+    "Izquierda",
   },
   { "Right",
     "Rechts",
@@ -1695,6 +1842,7 @@ const tPhrase Phrases[] = {
     "H�yre",
     "Oikealle",
     "Prawo",
+    "Derecha",
   },
   { "Red",
     "Rot",
@@ -1706,6 +1854,7 @@ const tPhrase Phrases[] = {
     "R�d",
     "Punainen",
     "Czerwony",
+    "Rojo",
   },
   { "Green",
     "Gr�n",
@@ -1717,6 +1866,7 @@ const tPhrase Phrases[] = {
     "Gr�nn",
     "Vihre�",
     "Zielony",
+    "Verde",
   },
   { "Yellow",
     "Gelb",
@@ -1728,6 +1878,7 @@ const tPhrase Phrases[] = {
     "Gul",
     "Keltainen",
     "Zolty",
+    "Amarillo",
   },
   { "Blue",
     "Blau",
@@ -1739,6 +1890,7 @@ const tPhrase Phrases[] = {
     "Bl�",
     "Sininen",
     "Niebieski",
+    "Azul",
   },
   { "Power",
     "Ausschalten",
@@ -1750,6 +1902,7 @@ const tPhrase Phrases[] = {
     "Power",
     "Virtakytkin",
     "Wylaczyc",
+    "Corriente",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -1761,6 +1914,7 @@ const tPhrase Phrases[] = {
     "Volum+",
     "��nenvoimakkuus+",
     "Glosnej",
+    "Volumen+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -1772,6 +1926,7 @@ const tPhrase Phrases[] = {
     "Volum-",
     "��nenvoimakkuus-",
     "Ciszej",
+    "Volumen-",
   },
   { "Mute",
     "Stumm",
@@ -1783,6 +1938,7 @@ const tPhrase Phrases[] = {
     "Lyd av",
     "��nen vaimennus",
     "Cisza",
+    "Mudo",
   },
   // Miscellaneous:
   { "yes",
@@ -1795,6 +1951,7 @@ const tPhrase Phrases[] = {
     "ja",
     "kyll�",
     "tak",
+    "s�",
   },
   { "no",
     "nein",
@@ -1806,6 +1963,7 @@ const tPhrase Phrases[] = {
     "nei",
     "ei",
     "nie",
+    "no",
   },
   { "top",
     "oben",
@@ -1817,6 +1975,7 @@ const tPhrase Phrases[] = {
     "�vre",
     "yl�",
     "gora",
+    "parte sup.",
   },
   { "bottom",
     "unten",
@@ -1828,6 +1987,7 @@ const tPhrase Phrases[] = {
     "nedre",
     "ala",
     "dol",
+    "fondo",
   },
   { "Disk",
     "Disk",
@@ -1839,6 +1999,7 @@ const tPhrase Phrases[] = {
     "Disk",
     "Disk",
     "Disk",
+    "Disco",
   },
   { "free",
     "frei",
@@ -1850,6 +2011,7 @@ const tPhrase Phrases[] = {
     "ledig",
     "vapaa",
     "pozostalo",
+    "libre",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -1861,6 +2023,7 @@ const tPhrase Phrases[] = {
     "Hopp: ",
     "Hypp��: ",
     "Skok: ",
+    "Saltar: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -1872,6 +2035,7 @@ const tPhrase Phrases[] = {
     "Volum ",
     "��nenvoimakkuus ",
     "Glosnosc ",
+    "Volumen ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -1883,6 +2047,7 @@ const tPhrase Phrases[] = {
     " Stopp avspilling",
     " Pys�yt� toisto",
     " Zatrzymac odtwarzanie",
+    " Parar reproduci�n",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -1894,6 +2059,7 @@ const tPhrase Phrases[] = {
     " Stopp opptak fra ",
     " Pys�yt� nauhoitus ",
     " Zatrzymac nagrywanie ",
+    " Parar grabaci�n ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -1905,6 +2071,7 @@ const tPhrase Phrases[] = {
     " Avbryt redigering",
     " Peruuta muokkaus",
     " Przerwac montaz ",
+    " Anular modificaci�n ",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -1916,6 +2083,7 @@ const tPhrase Phrases[] = {
     "Bytter f�rste DVB-enhet..."
     "Vaihdetaan ensisijainen vastaanotin...",
     "Pierwszy interfejs DVB przelacza...",
+    "Cambio interface primario...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -1927,6 +2095,7 @@ const tPhrase Phrases[] = {
     "Opp/Ned for ny plass - OK for � flytte",
     "Yl�s/Alas = liiku, OK = siirr�",
     "Gora/Dol na nowa pozycje - Ok zmienia",
+    "Arriba/Abajo para nuevo lugar - OK para mover",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -1938,6 +2107,7 @@ const tPhrase Phrases[] = {
     "Redigeringsprosess startet",
     "Muokkaus aloitettu",
     "Uruchomiony proces montazu",
+    "Proceso modificaci�n iniciado",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -1949,6 +2119,7 @@ const tPhrase Phrases[] = {
     "Redigeringsprosess avsluttet",
     "Muokkaus lopetettu",
     "Proces montazu zakonczony",
+    "Proceso modificacion terminado",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -1960,6 +2131,7 @@ const tPhrase Phrases[] = {
     "Feil under redigering!",
     "Muokkaus ep�onnistui!",
     "Bledny proces montazu!",
+    "Modificaci�n ha fallado!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -1971,6 +2143,7 @@ const tPhrase Phrases[] = {
     "G�r igjennom opptakene...",
     "haetaan nauhoituksia...",
     "Skan nagran...",
+    "buscando grabaciones...",
   },
   { NULL }
   };
diff --git a/menu.c b/menu.c
index 03dbcea34..bc3aeb6e5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.180 2002/03/31 21:17:42 kls Exp $
+ * $Id: menu.c 1.182 2002/04/06 09:41:59 kls Exp $
  */
 
 #include "menu.h"
@@ -694,7 +694,7 @@ class cMenuEditChannel : public cOsdMenu {
   };
 
 cMenuEditChannel::cMenuEditChannel(int Index)
-:cOsdMenu(tr("Edit Channel"), 14)
+:cOsdMenu(tr("Edit channel"), 14)
 {
   channel = Channels.Get(Index);
   if (channel) {
@@ -1070,7 +1070,7 @@ class cMenuEditTimer : public cOsdMenu {
   };
 
 cMenuEditTimer::cMenuEditTimer(int Index, bool New)
-:cOsdMenu(tr("Edit Timer"), 12)
+:cOsdMenu(tr("Edit timer"), 12)
 {
   firstday = NULL;
   timer = Timers.Get(Index);
@@ -1539,6 +1539,7 @@ class cMenuSchedule : public cOsdMenu {
   void PrepareSchedule(cChannel *Channel);
 public:
   cMenuSchedule(void);
+  virtual ~cMenuSchedule();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -1556,6 +1557,11 @@ cMenuSchedule::cMenuSchedule(void)
      }
 }
 
+cMenuSchedule::~cMenuSchedule()
+{
+  cMenuWhatsOn::ScheduleEventInfo(); // makes sure any posted data is cleared
+}
+
 static int CompareEventTime(const void *p1, const void *p2)
 {
   return (int)((*(cEventInfo **)p1)->GetTime() - (*(cEventInfo **)p2)->GetTime());
diff --git a/mpatrol.diff b/mpatrol.diff
deleted file mode 100644
index 59497c44c..000000000
--- a/mpatrol.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is a BitKeeper generated patch for the following project:
-# Project Name: Linux VDR
-# This patch format is intended for GNU patch command version 2.5 or higher.
-# This patch includes the following deltas:
-#	           ChangeSet	1.20    -> 1.21   
-#	            config.c	1.4     -> 1.5    
-#	             tools.c	1.2     -> 1.3    
-#
-# The following is the BitKeeper ChangeSet Log
-# --------------------------------------------
-# 02/04/01	aschultz@warp10.net	1.21
-# fix memory management due to MPatrol
-# --------------------------------------------
-#
-diff -Nru a/config.c b/config.c
---- a/config.c	Mon Apr  1 14:37:48 2002
-+++ b/config.c	Mon Apr  1 14:37:48 2002
-@@ -265,7 +265,7 @@
-         sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
-         if (p)
-            sscanf(p, "%d ,%d ", &dpid1, &dpid2);
--        delete apidbuf;
-+        free(apidbuf);
-         }
-      else
-         return false;
-@@ -277,7 +277,7 @@
-            tpid = 0;
-            }
-         strn0cpy(name, buffer, MaxChannelName);
--        delete buffer;
-+        free(buffer);
-         }
-      else
-         return false;
-diff -Nru a/tools.c b/tools.c
---- a/tools.c	Mon Apr  1 14:37:48 2002
-+++ b/tools.c	Mon Apr  1 14:37:48 2002
-@@ -71,7 +71,7 @@
-         esyslog(LOG_ERR, "ERROR: out of memory");
-      }
-   else {
--     delete dest;
-+     free(dest);
-      dest = NULL;
-      }
-   return dest;
-@@ -230,7 +230,7 @@
- const char *AddDirectory(const char *DirName, const char *FileName)
- {
-   static char *buf = NULL;
--  delete buf;
-+  free(buf);
-   asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
-   return buf;
- }
diff --git a/vdr.1 b/vdr.1
index 1fd39df6e..b26a9dff5 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.2 2002/03/29 10:10:04 kls Exp $
+.\" $Id: vdr.1 1.3 2002/04/07 13:11:43 kls Exp $
 .\"
-.TH vdr 1 "29 Mar 2002" "1.0.0" "Video Disk Recorder"
+.TH vdr 1 "7 Apr 2002" "1.0.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
diff --git a/vdr.5 b/vdr.5
index 483e15ffe..b440f12be 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.3 2002/04/01 12:32:59 kls Exp $
+.\" $Id: vdr.5 1.4 2002/04/07 13:12:04 kls Exp $
 .\"
-.TH vdr 5 "29 Mar 2002" "1.0.0" "Video Disk Recorder Files"
+.TH vdr 5 "7 Apr 2002" "1.0.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION

From ae8a947367b4be57c9b0ca7bbf0032de0e2018d3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Thu, 9 May 2002 18:00:00 +0200
Subject: [PATCH 041/307] Version 1.1.0 - Begin of the 1.1 development branch.
 THIS IS NOT A STABLE VERSION!   The current stable version for every day use
 is still the 1.0 branch. - First step towards a universal plugin interface.
 See the file PLUGINS.html   for a detailed description. The man page vdr(1)
 describes the new options '-L'   and '-P' used to load plugins. This first
 step implements the complete "outer"   shell for plugins. The "inner" access
 to VDR data structures will follow. - The VDR version number is now displayed
 in the title line of the "Setup" menu.

---
 CONTRIBUTORS               |  55 +++-
 HISTORY                    |  66 +++-
 MANUAL                     |  21 +-
 Makefile                   |  28 +-
 PLUGINS.html               | 620 +++++++++++++++++++++++++++++++++++++
 PLUGINS/SRC/hello/COPYING  | 340 ++++++++++++++++++++
 PLUGINS/SRC/hello/HISTORY  |   6 +
 PLUGINS/SRC/hello/Makefile |  78 +++++
 PLUGINS/SRC/hello/README   |  11 +
 PLUGINS/SRC/hello/hello.c  | 105 +++++++
 PLUGINS/SRC/hello/i18n.c   |  52 ++++
 PLUGINS/SRC/hello/i18n.h   |  11 +
 channels.conf              | 125 ++++----
 channels.conf.cable        | 291 ++++++++---------
 channels.conf.terr         |   9 +
 config.c                   | 377 +++++++++++++---------
 config.h                   |  43 ++-
 dvbapi.c                   |  33 +-
 dvbapi.h                   |   4 +-
 dvbosd.c                   |   5 +-
 i18n.c                     | 414 ++++++++++++++++++++++---
 i18n.h                     |  20 +-
 interface.h                |   3 +-
 menu.c                     | 611 ++++++++----------------------------
 menu.h                     |   8 +-
 menuitems.c                | 476 ++++++++++++++++++++++++++++
 menuitems.h                | 110 +++++++
 newplugin                  | 250 +++++++++++++++
 osd.c                      |  11 +-
 osd.h                      |   4 +-
 plugin.c                   | 319 +++++++++++++++++++
 plugin.h                   |  81 +++++
 recording.c                |   6 +-
 remote.h                   |   4 +-
 ringbuffer.c               |  66 ++--
 tools.c                    |   8 +-
 vdr.1                      |  24 +-
 vdr.c                      | 133 +++++---
 38 files changed, 3797 insertions(+), 1031 deletions(-)
 create mode 100644 PLUGINS.html
 create mode 100644 PLUGINS/SRC/hello/COPYING
 create mode 100644 PLUGINS/SRC/hello/HISTORY
 create mode 100644 PLUGINS/SRC/hello/Makefile
 create mode 100644 PLUGINS/SRC/hello/README
 create mode 100644 PLUGINS/SRC/hello/hello.c
 create mode 100644 PLUGINS/SRC/hello/i18n.c
 create mode 100644 PLUGINS/SRC/hello/i18n.h
 create mode 100644 menuitems.c
 create mode 100644 menuitems.h
 create mode 100755 newplugin
 create mode 100644 plugin.c
 create mode 100644 plugin.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ec742b188..b6bd60ae0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,4 +1,7 @@
-Thanks go to the following people for patches and contributions:
+Tons of suggestions, bugreports, patches and other contributions have been
+provided by the people on the 'linux-dvb' and 'vdr' mailing lists.
+Special thanks go to the following individuals (if your name is missing here,
+please send an email to kls@cadsoft.de):
 
 Carsten Koch <Carsten.Koch@icem.de>
  for adding LIRC support
@@ -9,6 +12,7 @@ Carsten Koch <Carsten.Koch@icem.de>
  for implementing the 'new recording' indicator
  for suggesting that the "Back" button in replay mode should bring up the "Recordings" menu
  for fixing the watchdog timer if the program hangs in OSD activities
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -28,7 +32,7 @@ Guido Fiala <gfiala@s.netic.de>
  now does these things itself)
  for making the replay progress display avoid unnecessary code execution
 
-Robert Schneider <Robert.Schneider@lotus.com>
+Robert Schneider <Robert.Schneider@de.ibm.com>
  for implementing EIT support for displaying the current/next info
  for extending EIT support to implement a complete EPG
 
@@ -117,6 +121,13 @@ Stefan Huelswitt <huels@iname.com>
  for implementing backtracing for fast forward/rewind
  for implementing the replay mode display
  for fixing a crash when replaying with DEBUG_OSD=1
+ for fixing a crash when selecting the "Jump" function directly after setting
+ an editing mark
+ for reporting a possible endless loop in shifting recordings between DVB cards
+ for making it no longer setting PIDs 0x1FFF, which apparently fixes problems
+ with CAMs and AC3 sound only working the first time
+ for making the main loop take an active video cutting process into account when
+ doing shutdown or housekeeping
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -157,6 +168,8 @@ Werner Fink <werner@suse.de>
  for helping to debug leftover 'zombie' processes when closing a pipe
  for making the Dolby Digital thread start only if the recording actually
  contains Dolby Digital data
+ for improving thread locking in the ring buffer to avoid possible race conditions
+ under heavy load
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -185,7 +198,7 @@ Thomas Heiligenmann <thomas@heiligenmann.de>
 Norbert Schmidt <nschmidt-nrw@t-online.de>
  for filling in some missing teletext PIDs
 
-Thilo Wunderlich <tw@ubcom.net>
+Thilo Wunderlich <wunderlich@speedway.org>
  for his help in keeping 'channels.conf' up to date
  for reporting a problem with accessing the epg.data file before it is fully written
 
@@ -202,6 +215,8 @@ Sergei Haller <Sergei.Haller@math.uni-giessen.de>
  for adding the TPID to Hessen-3 in 'channels.conf'
  for suggesting that the EPG scan should skip channels with their 'Ca' parameter
  explicitly set to an other DVB card
+ for implementing enhanced string editing with upper-/lowercase, insert/overwrite
+ and delete
 
 Andreas Gebel <andreas@xcapenet.de>
  for his help in keeping 'channels.conf' up to date
@@ -280,3 +295,37 @@ Dirk Wiebel <dirk@wiebel.de>
 Gerald Raaf <graaf@attglobal.net>
  for helping to fix the still picture workaround in case the progress display
  is active
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Andreas Roedl <flood@flood-net.de>
+ for adding some DVB-T channels for Berlin (Germany) to channels.conf.terr
+
+Jean Martin <mac_j_fr@hotmail.com>
+ for pointing out a problem with OSD color palette handling on "big endian" systems
+
+Steffen Koch <Steffen.Koch@koch-enterprises.de>
+ for reporting a crash when selecting the "Jump" function directly after setting
+ an editing mark
+
+Matthias Hilbig <hilbig@upb.de>
+ for fixing some missing ',' in i18n.c
+
+Simon Dean <linux-dvb@sickhack.com>
+ for reporting a problem with '.' at the end of a directory name in case of VFAT=1
+ (Windows can't handle these)
+
+Dimitrios Dimitrakos <mail@dimitrios.de>
+ for translating OSD texts to the Greek language
+
+Marcus Kuba <marcus@kuba4u.de>
+ for reporting a bug in the unit of the "SVDRP timeout" setup parameter
+
+Ulrich Petri <ulope@gmx.de>
+ for his help in debugging a crash on systems with disks that have a block size
+ larger than 1MB
+
+Oliver Lorei <oliverlorei@cityweb.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
+
+Andreas B�ttger <fboettger@t-online.de>
+ for reporting a bug in skipping forward in time shift mode near the end of the recording
diff --git a/HISTORY b/HISTORY
index af15667af..6599534e8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,7 +1,9 @@
 Video Disk Recorder Revision History
 ------------------------------------
 
-2000-02-19: Version 0.01 (Initial revision).
+2000-02-19: Version 0.01
+
+- Initial revision.
 
 2000-03-11: Version 0.02
 
@@ -1190,3 +1192,65 @@ Video Disk Recorder Revision History
 - Fixed a bug in the editing process in case a previously edited file with the
   same name was manually deleted on a system with more than one video directory
   (thanks to Dirk Wiebel for reporting this one).
+
+2002-04-21: Version 1.0.1
+
+- Added some DVB-T channels for Berlin (Germany) to channels.conf.terr (thanks to
+  Andreas Roedl).
+- Implemented enhanced string editing with upper-/lowercase, insert/overwrite
+  and delete (thanks to Sergei Haller).
+- Fixed color palette handling on "big endian" systems (thanks to Jean Martin
+  for pointing out this one).
+- Updated the "Blue Movie" channels to the new "Premiere Erotik" (thanks to
+  Thilo Wunderlich). NOTE: this adds a new channel to 'channels.conf', so that
+  any timers referencing a channel with a number higher than 102 should be
+  checked and adapted if necessary (this only applies if you are using the default
+  'channels.conf').
+- Improved thread locking in the ring buffer to avoid possible race conditions
+  under heavy load (thanks to Werner Fink).
+- Fixed a crash when selecting the "Jump" function directly after setting an
+  editing mark (thanks to Steffen Koch for reporting and Stefan Huelswitt for
+  fixing this one).
+- Fixed some missing ',' in i18n.c (thanks to Matthias Hilbig).
+- Fixed a possible endless loop in shifting recordings between DVB cards (thanks
+  to Stefan Huelswitt for reporting this one).
+- Updated the Premiere World Formula 1 channels in 'channels.conf' (thanks to Mel
+  Sch�chner).
+- No longer setting PIDs 0x1FFF, which apparently fixes problems with CAMs and
+  AC3 sound only working the first time (thanks to Stefan Huelswitt).
+- Now encoding '.' at the end of a directory name in case of VFAT=1, since Windows
+  can't handle these (thanks to Simon Dean for reporting this one).
+
+2002-05-05: Version 1.0.2
+
+- Now taking an active video cutting process into account when doing shutdown or
+  housekeeping (thanks to Stefan Huelswitt).
+- The default duration of an instant recording has been increased to 3 hours and
+  is now configurable in the "Setup/Recording" menu.
+- Added Greek language texts (thanks to Dimitrios Dimitrakos).
+- Fixed the unit of the "SVDRP timeout" setup parameter (thanks to Marcus Kuba
+  for reporting this one).
+- Fixed a crash on systems with disks that have a block size larger than 1MB
+  (thanks to Ulrich Petri for helping to debug this one).
+- Updated 'channels.conf' for the new PW settings (thanks to Andreas Share,
+  Carsten Koch, Gerald Raaf and Mel Sch�chner). Note that all channels with numbers
+  over 50 may have moved, so you should carefully check any timers you have set!
+- Updated 'channels.conf.cable' for the new PW settings (thanks to Oliver Lorei
+  Stephan Schreiber and Uwe Scheffler). Note that all channels may have moved, so
+  you should carefully check any timers you have set!
+  For future updates of this file somebody with digital cable should take the role
+  of the "maintainer" and send me updated versions based on the file that comes
+  with the most recent version of VDR. I will then simply replace the entire file
+  'channels.conf.cable' whenever a new version is sent to me.
+- Fixed skipping forward in time shift mode near the end of the recording (thanks
+  to Andreas B�ttger for reporting this one).
+
+2002-05-09: Version 1.1.0
+
+- Begin of the 1.1 development branch. THIS IS NOT A STABLE VERSION!
+  The current stable version for every day use is still the 1.0 branch.
+- First step towards a universal plugin interface. See the file PLUGINS.html
+  for a detailed description. The man page vdr(1) describes the new options '-L'
+  and '-P' used to load plugins. This first step implements the complete "outer"
+  shell for plugins. The "inner" access to VDR data structures will follow.
+- The VDR version number is now displayed in the title line of the "Setup" menu.
diff --git a/MANUAL b/MANUAL
index b94050512..978713180 100644
--- a/MANUAL
+++ b/MANUAL
@@ -17,9 +17,9 @@ Video Disk Recorder User's Manual
   Ok      Ch display  Select       Switch     Edit       Accept        Play        Progress disp.
   Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off    Menu on
   Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu    Recordings menu
-  Red     -           Record       Edit       Edit       -             Play        Jump
-  Green   -           Language     New        New        -             Rewind      Skip -60s
-  Yellow  -           -            Delete     Delete     -             Delete      Skip +60s
+  Red     -           Record       Edit       Edit       ABC/abc       Play        Jump
+  Green   -           Language     New        New        Ins/Ovr       Rewind      Skip -60s
+  Yellow  -           -            Delete     Delete     Delete        Delete      Skip +60s
   Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary     Stop
   0..9    Ch select   -            -          -          Numeric inp.  -           Editing
 
@@ -58,11 +58,10 @@ Video Disk Recorder User's Manual
   by pressing the "Right" button (which puts brackets around the current
   character as in "[R]TL"), selecting the desired character position with
   "Left" and "Right", and changing the character with the "Up" and "Down"
-  keys. "Ok" then confirms the changes. The special character '^' can be used
-  to "cut off" a string at this position. When this character is visible in the
-  brackets (as in abc[^]), the next press to the "Left" or "Ok" button will
-  actually cut off the string. Using "Up" and/or "Down" brings back the
-  original rest of the string (unless you have pressed "Left" or "Ok").
+  keys. "Ok" then confirms the changes. The "Red" key toggles between
+  upper- and lowercase characters, while the "Green" key switches between
+  insert and overwrite mode. The "Yellow" key deletes the current character
+  (or the one to the right of the cursor in insert mode).
 
   The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
   in various menus and are listed at the bottom of the on-screen-display.
@@ -519,6 +518,12 @@ Video Disk Recorder User's Manual
                          If this parameter is empty, the channel name will be used
                          by default.
 
+  Instant rec. time = 180
+                         Defines the duration of an instant recording in minutes.
+                         Default is 180 minutes (3 hours). The stop time of an
+                         instant recording can be modified at any time by editing
+                         the respective timer in the "Timers" menu.
+
   Record Dolby Digital = yes
                          Turns recording of the Dolby Digital audio channels on
                          or off. This may be useful if you don't have the equipment
diff --git a/Makefile b/Makefile
index 62fd8973b..55a01e875 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.33 2002/04/01 12:50:48 kls Exp $
+# $Id: Makefile 1.34 2002/05/09 09:35:05 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -13,15 +13,17 @@ DTVDIR   = ./libdtv
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
+PLUGINDIR= ./PLUGINS
+
 VIDEODIR = /video
 
 INCLUDES = -I$(DVBDIR)/ost/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o osd.o\
-       recording.o remote.o remux.o ringbuffer.o svdrp.o thread.o tools.o vdr.o\
-       videodir.o
+OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o\
+       menuitems.o osd.o plugin.o recording.o remote.o remux.o ringbuffer.o\
+       svdrp.o thread.o tools.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
@@ -69,7 +71,7 @@ include $(DEPFILE)
 # The main program:
 
 vdr: $(OBJS) $(DTVLIB)
-	g++ -g -O2 $(OBJS) $(NCURSESLIB) -ljpeg -lpthread $(LIBDIRS) $(DTVLIB) -o vdr
+	g++ -g -O2 -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
 
 # The font files:
 
@@ -88,6 +90,21 @@ genfontfile: genfontfile.c
 $(DTVLIB) $(DTVDIR)/libdtv.h:
 	make -C $(DTVDIR) all
 
+# The 'include' directory (for plugins):
+
+include-dir:
+	@mkdir -p include/vdr
+	@(cd include/vdr; for i in ../../*.h; do ln -fs $$i .; done)
+
+# Plugins:
+
+plugins: include-dir
+	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do make -C "$(PLUGINDIR)/SRC/$$i" all; done
+
+plugins-clean:
+	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do make -C "$(PLUGINDIR)/SRC/$$i" clean; done
+	@-rm -f $(PLUGINDIR)/lib/*
+
 # Install the files:
 
 install:
@@ -104,6 +121,7 @@ install:
 clean:
 	make -C $(DTVDIR) clean
 	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
+	-rm -rf include
 fontclean:
 	-rm -f fontfix.c fontosd.c
 CLEAN: clean fontclean
diff --git a/PLUGINS.html b/PLUGINS.html
new file mode 100644
index 000000000..b903f040d
--- /dev/null
+++ b/PLUGINS.html
@@ -0,0 +1,620 @@
+<html>
+<head>
+<title>The VDR Plugin System</title>
+</head>
+<body bgcolor="white">
+
+<h1>The VDR Plugin System</h1>
+
+VDR provides an easy to use plugin interface that allows additional functionality
+to be added to the program by implementing a dynamically loadable library file.
+This interface allows programmers to develop additional functionality for VDR completely
+separate from the core VDR source, without the need of patching the original
+VDR code (and all the problems of correlating various patches).
+<p>
+This document describes the "outside" interface of the plugin system.
+It handles everything necessary for a plugin to get hooked into the core
+VDR program and present itself to the user.
+
+<!--<p>TODO: Link to the document about VDR base classes to use when implementing actual functionality (yet to be written).-->
+
+<hr><h2>Quick start</h2>
+
+<center><i><b>Can't wait, can't wait!</b></i></center><p>
+
+Actually you should read this entire document before starting to work with VDR plugins,
+but you probably want to see something happening right away <tt>;-)</tt>
+<p>
+So, for a quick demonstration of the plugin system, there is a demo plugin called
+"hello" that comes with the VDR source. To test drive this one, do the following:
+<ul>
+<li>change into the VDR source directory
+<li><b><tt>make</tt></b> the VDR program with your usual <tt>REMOTE=...</tt> (and maybe other) options
+<li>do <b><tt>make plugins</tt></b> to build the demo plugin
+<li>run VDR with <b><tt>vdr -V</tt></b> to see the version information
+<li>run VDR with <b><tt>vdr -h</tt></b> to see the command line options
+<li>run VDR with <b><tt>vdr -Phello</tt></b>
+<li>open VDR's main menu and select the <i>Hello</i> item
+<li>open the <i>Setup</i> menu from VDR's main menu and select <i>Plugins</i>
+</ul>
+If you enjoyed this brief glimpse into VDR plugin handling, read through the rest of
+this document and eventually write your own VDR plugin.
+
+<hr><h2>The name of the plugin</h2>
+
+<center><i><b>Give me some I.D.!</b></i></center><p>
+
+One of the first things to consider when writing a VDR plugin is giving the thing
+a proper name. This name will be used in the VDR command line in order to load
+the plugin, and will also be the name of the plugin's source directory, as well
+as part of the final library name.
+<p>
+The plugin's name should typically be as short as possible. Three letter
+abbreviations like <b><tt>dvd</tt></b> (for a DVD player) or <b><tt>mp3</tt></b>
+(for an MP3 player) would be good choices. It is also recommended that the name
+consists of only lowercase letters and digits.
+No other characters should be used here.
+<p>
+A plugin can access its name through the (non virtual) member function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *Name(void);
+</pre></td></tr></table><p>
+
+The actual name is derived from the plugin's library file name, as defined in the
+next chapter.
+
+<a name="The plugin directory structure"><hr><h2>The plugin directory structure</h2>
+
+<center><i><b>Where is everybody?</b></i></center><p>
+
+By default plugins are located in a directory named <tt>PLUGINS</tt> below the
+VDR source directory. Inside this directory the following subdirectory structure
+is used:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+VDR/PLUGINS/SRC
+VDR/PLUGINS/SRC/demo
+VDR/PLUGINS/SRC/hello
+VDR/PLUGINS/lib
+VDR/PLUGINS/lib/libvdr-demo.so.1.1.0
+VDR/PLUGINS/lib/libvdr-hello.so.1.1.0
+</pre></td></tr></table><p>
+
+The <tt>SRC</tt> directory contains one subdirectory for each plugin, which carries
+the name of that plugin (in the above example that would be <tt>demo</tt> and
+<tt>hello</tt>, respectively). What's inside the individual source directory of a
+plugin is entirely up to the author of that plugin. The only prerequisites are
+that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt> and
+<tt>clean</tt>, and that a call to <tt>make all</tt> actually produces a dynamically
+loadable library file for that plugin (we'll get to the details later).
+<p>
+The <tt>lib</tt> directory contains the dynamically loadable libraries of all
+available plugins. Note that the names of these files are created by concatenating
+<p>
+<table border=2>
+<tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>demo</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
+<tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>VDR version number<br>this plugin was<br>compiled for</font></td></tr>
+</table>
+<p>
+The plugin library files can be stored in any directory. If the default organization
+is not used, the path to the plugin directory has be be given to VDR through the
+<b><tt>-L</tt></b> option.
+<p>
+The VDR <tt>Makefile</tt> contains the target <tt>plugins</tt>, which calls
+<tt>make all</tt> in every directory found under <tt>VDR/PLUGINS/SRC</tt>,
+plus the target <tt>plugins-clean</tt>, which calls <tt>make clean</tt> in
+each of these directories.
+<p>
+If you download a plugin <a href="#Building the distribution package">package</a>
+from the web, it will typically have a name like
+<p>
+<tt>vdr-demo-0.0.1.tgz</tt>
+<p>
+and will unpack into a directory named
+<p>
+<tt>vdr-demo-0.0.1</tt>
+<p>
+To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
+you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
+create a symbolic link with the basic plugin name, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+ln -s vdr-demo-0.0.1 demo
+</pre></td></tr></table><p>
+
+Since the VDR <tt>Makefile</tt> only searches for directories with names consisting
+of only lowercase characters and digits, it will only follow the symbolic links, which
+should lead to the current version of the plugin you want to use. This way you can
+have several different versions of a plugin source (like <tt>vdr-demo-0.0.1</tt> and
+<tt>vdr-demo-0.0.2</tt>) and define which one to actually use through the symbolic link.
+
+<a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
+
+<center><i><b>A room with a view</b></i></center><p>
+
+Call the Perl script <tt>newplugin</tt> from the VDR source directory to create
+a new plugin directory with a <tt>Makefile</tt> and a main source file implementing
+the basic derived plugin class.
+You will also find a <tt>README</tt> file there with some inital text, where you
+should fill in actual information about your project.
+A <tt>HISTORY</tt> file is set up with an "Initial revision" entry. As your project
+evolves, you should add the changes here with date and version number.
+<p>
+<tt>newplugin</tt> also creates a copy of the GPL license file <tt>COPYING</tt>,
+assuming that you will release your work under that license. Change this if you
+have other plans.
+<p>
+Add further files and maybe subdirectories to your plugin source directory as
+necessary. Don't forget to adapt the <tt>Makefile</tt> appropriately.
+
+<hr><h2>The actual implementation</h2>
+
+<center><i><b>Use the source, Luke!</b></i></center><p>
+
+A newly initialized plugin doesn't really do very much yet.
+If you <a href="#Loading plugins into VDR">load it into VDR</a> you will find a new
+entry in the main menu, with the same name as your plugin (where the first character
+has been converted to uppercase). There will also be a new entry named "Plugins" in
+the "Setup" menu, which will bring up a list of all loaded plugins, through which you
+can access each plugin's own setup parameters (if it provides any).
+<p>
+To implement actual functionality into your plugin you need to edit the source file
+that was generated as <tt>PLUGINS/SRC/name.c</tt>. Read the comments in that file
+to see where you can bring in your own code. The following sections of this document
+will walk you through the individual member functions of the plugin class.
+<p>
+Depending on what your plugin shall do, you may or may not need all of the given
+member functions. Except for the <tt>MainMenuEntry()</tt> function they all by default
+return values that will result in no actual functionality. You can either completely
+delete unused functions from your source file, or just leave them as they are.
+If your plugin shall not be accessible through VDR's main menu, simply remove
+(or comment out) the line implementing the <tt>MainMenuEntry()</tt> function.
+<p>
+At the end of the plugin's source file you will find a line that looks like this:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+VDRPLUGINCREATOR(cPluginDemo);
+</pre></td></tr></table><p>
+
+This is the "magic" hook that allows VDR to actually load the plugin into
+its memory. You don't need to worry about the details behind all this.
+<p>
+If your plugin requires additional source files, simply add them to your plugin's
+source directory and adjust the <tt>Makefile</tt> accordingly.
+
+<hr><h2>Construction and Destruction</h2>
+
+<center><i><b>What goes up, must come down...</b></i></center><p>
+
+The constructor and destructor of a plugin are defined as
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cPlugin(void);
+virtual ~cPlugin();
+</pre></td></tr></table><p>
+
+The <b>constructor</b> shall initialize any member variables the plugin defines, but
+<b>must not access any global structures of VDR</b>.
+It also must not create any threads or other large data structures. These things
+are done in the <a href="#Getting started"><tt>Start()</tt></a> function later.
+Constructing a plugin object shall not have any side effects or produce any output,
+since VDR, for instance, has to create the plugin objects in order to get their
+command line help - and after that immediately destroys them again.
+<p>
+The <b>destructor</b> has to clean up any data created by the plugin, and has to
+take care that any threads the plugin may have created will be stopped.
+<p>
+Of course, if your plugin doesn't define any member variables that need to be
+initialized (and deleted), you don't need to implement either of these functions.
+
+<hr><h2>Version number</h2>
+
+<center><i><b>Which incarnation is this?</b></i></center><p>
+
+Every plugin must have a version number of its own, which does not necessarily
+have to be in any way related to the VDR version number.
+VDR requests a plugin's version number through a call to the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual const char *Version(void) = 0;
+</pre></td></tr></table><p>
+
+Since this is a "pure" virtual function, any derived plugin class <b>must</b>
+implement it. The returned string should identify this version of the plugin.
+Typically this would be something like "0.0.1", but it may also contain other
+information, like for instance "0.0.1pre2" or the like. The string should only
+be as long as really necessary, and shall not contain the plugin's name itself.
+Here's an example:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+static const char *VERSION = "0.0.1";
+
+...
+
+const char *cPluginDemo::Version(void)
+{
+  return VERSION;
+}
+</pre></td></tr></table><p>
+
+Note that the definition of the version number is expected to be located in the
+main source file, and must be written as
+<pre>
+static const char *VERSION = ...
+</pre>
+just like shown in the above example. This is a convention that allows the <tt>Makefile</tt>
+to extract the version number when generating the file name for the distribution archive.
+<p>
+A new plugin project should start with version number <tt>0.0.1</tt> and should reach
+version <tt>1.0.0</tt> once it is completely operative and well tested. Following the
+Linux kernel version numbering scheme, versions with <i>even</i> release numbers
+(like <tt>1.0.x</tt>, <tt>1.2.x</tt>, <tt>1.4.x</tt>...) should be stable releases,
+while those with <i>odd</i> release numbers (like <tt>1.1.x</tt>, <tt>1.3.x</tt>,
+<tt>1.5.x</tt>...) are usually considered "under development". The three parts of
+a version number are not limited to single digits, so a version number of <tt>1.2.15</tt>
+would be acceptable.
+
+<hr><h2>Description</h2>
+
+<center><i><b>What is it that you do?</b></i></center><p>
+
+In order to tell the user what exactly a plugin does, it must implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual const char *Description(void) = 0;
+</pre></td></tr></table><p>
+
+which returns a short, one line description of the plugin's purpose.
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual const char *Description(void)
+{
+  return "A simple demo plugin";
+}
+</pre></td></tr></table><p>
+
+<hr><h2>Command line arguments</h2>
+
+<center><i><b>Taking orders</b></i></center><p>
+
+A VDR plugin can have command line arguments just like any normal program.
+If a plugin wants to react on command line arguments, it needs to implement
+the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool ProcessArgs(int argc, char *argv[]);
+</pre></td></tr></table><p>
+
+The parameters <tt>argc</tt> and <tt>argv</tt> have exactly the same meaning
+as in a normal C program's <tt>main()</tt> function.
+<tt>argv[0]</tt> contains the name of the plugin (as given in the <b><tt>-P</tt></b>
+option of the <tt>vdr</tt> call).
+<p>
+Each plugin has its own set of command line options, which are totally independent
+from those of any other plugin or VDR itself.
+<p>
+You can use the <tt>getopt()</tt> or <tt>getopt_long()</tt> function to process
+these arguments. As with any normal C program, the strings pointed to by <tt>argv</tt>
+will survive the entire lifetime of the plugin, so it is safe to store pointers to
+these values inside the plugin. Here's an example:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+bool cPluginDemo::ProcessArgs(int argc, char *argv[])
+{
+  static struct option long_options[] = {
+      { "aaa",      required_argument, NULL, 'a' },
+      { "bbb",      no_argument,       NULL, 'b' },
+      { NULL }
+    };
+
+  int c;
+  while ((c = getopt_long(argc, argv, "a:b", long_options, NULL)) != -1) {
+        switch (c) {
+          case 'a': fprintf(stderr, "option -a = %s\n", optarg);
+                    break;
+          case 'b': fprintf(stderr, "option -b\n");
+                    break;
+          default:  return false;
+          }
+        }
+  return true;
+}
+</pre></td></tr></table><p>
+
+The return value must be <i>true</i> if all options have been processed
+correctly, or <i>false</i> in case of an error. The first plugin that returns
+<i>false</i> from a call to its <tt>ProcessArgs()</tt> function will cause VDR
+to exit.
+
+<hr><h2>Command line help</h2>
+
+<center><i><b>Tell me about it...</b></i></center><p>
+
+If a plugin accepts command line options, it should implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual const char *CommandLineHelp(void);
+</pre></td></tr></table><p>
+
+which will be called if the user enters the <b><tt>-h</tt></b> option when starting VDR.
+The returned string should contain the command line help for this plugin, formatted
+in the same way as done by VDR itself:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *cPluginDemo::CommandLineHelp(void)
+{
+  return "  -a ABC,   --aaa=ABC      do something nice with ABC\n"
+         "  -b,       --bbb          activate 'plan B'\n";
+}
+</pre></td></tr></table><p>
+
+This command line help will be printed directly below VDR's help texts (separated
+by a line indicating the plugin's name, version and description), so if you use the
+same formatting as shown here it will line up nicely.
+Note that all lines should be terminated with a newline character, and should
+be shorter than 80 characters.
+
+<a name="Getting started"><hr><h2>Getting started</h2>
+
+<center><i><b>Let's get ready to rumble!</b></i></center><p>
+
+If a plugin implements a function that runs in the background (presumably in a
+thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
+it needs to implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual void Start(void);
+</pre></td></tr></table><p>
+
+which is called once for each plugin at program startup.
+Inside this function the plugin must set up everything necessary to perform
+its task. This may, for instance, be a thread that collects data from the DVB
+stream, which is later presented to the user via a function that is available
+from the main menu.
+<p>
+If the plugin doesn't implement any background functionality or internationalized
+texts, it doesn't need to implement this function.
+
+<hr><h2>Main menu entry</h2>
+
+<center><i><b>Today's special is...</b></i></center><p>
+
+If the plugin implements a feature that the user shall be able to access
+from VDR's main menu, it needs to implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual const char *MainMenuEntry(void);
+</pre></td></tr></table><p>
+
+The default implementation returns a <tt>NULL</tt> pointer, which means that
+this plugin will not have an item in the main menu. Here's an example of a
+plugin that will have a main menu item:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *cPluginDemo::MainMenuEntry(void)
+{
+  return "Demo";
+}
+</pre></td></tr></table><p>
+
+The menu entries of all plugins will be inserted into VDR's main menu right
+after the <i>Recordings</i> item, in the same sequence as they were given
+in the call to VDR.
+
+<hr><h2>User interaction</h2>
+
+<center><i><b>It's showtime!</b></i></center><p>
+
+If the user selects the main menu entry of a plugin, VDR calls the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual cOsdMenu *MainMenuAction(void);
+</pre></td></tr></table><p>
+
+which can do one of two things:
+<ul>
+<li>Return a pointer to a <tt>cOsdMenu</tt> object which will be displayed
+    as a submenu of the main menu (just like the <i>Recordings</i> menu, for instance).
+    That menu can then implement further functionality and, for instance, could
+    eventually start a custom player to replay a file other than a VDR recording.
+<li>Perform a specific action and return <tt>NULL</tt>. In that case the main menu
+    will be closed after calling <tt>MainMenuAction()</tt>.
+</ul>
+<b>
+It is very important that a call to <tt>MainMenuAction()</tt> returns as soon
+as possible! As long as the program stays inside this function, no other user
+interaction is possible. If a specific action takes longer than a few seconds,
+the plugin should launch a separate thread to do this.
+</b>
+
+<hr><h2>Setup parameters</h2>
+
+<center><i><b>Remember me...</b></i></center><p>
+
+If a plugin requires its own setup parameters, it needs to implement the following
+functions to handle these parameters:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual cMenuSetupPage *SetupMenu(void);
+virtual bool SetupParse(const char *Name, const char *Value);
+</pre></td></tr></table><p>
+
+The <tt>SetupMenu()</tt> function shall return the plugin's "Setup" menu
+page, where the user can adjust all the parameters known to this plugin.
+<p>
+<tt>SetupParse()</tt> will be called for each parameter the plugin has
+previously stored in the global setup data (see below). It shall return
+<i>true</i> if the parameter was parsed correctly, <i>false</i> in case of
+an error. If <i>false</i> is returned, an error message will be written to
+the log file (and program execution will continue).
+<p>
+The plugin's setup parameters are stored in the same file as VDR's parameters.
+In order to allow each plugin (and VDR itself) to have its own set of parameters,
+the <tt>Name</tt> of each parameter will be preceeded with the plugin's
+name, as in
+<p>
+<tt>demo.SomeParameter = 123</tt>
+<p>
+The prefix will be handled by the core VDR setup code, so the individual
+plugins need not worry about this.
+<p>
+To store its values in the global setup, a plugin has to call the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+void SetupStore(const char *Name, <i>type</i> Value);
+</pre></td></tr></table><p>
+
+where <tt>Name</tt> is the name of the parameter (<tt>"SomeParameter"</tt> in the above
+example, without the prefix <tt>"demo."</tt>) and <tt>Value</tt> is a simple data type (like
+<tt>char&nbsp;*</tt>, <tt>int</tt> etc).
+Note that this is not a function that the individual plugin class needs to implement!
+<tt>SetupStore()</tt> is a non-virtual member function of the <tt>cPlugin</tt> class.
+<p>
+To remove a parameter from the setup data, call <tt>SetupStore()</tt> with the appropriate
+name and without any value, as in
+<p>
+<tt>SetupStore("SomeParameter");</tt>
+<p>
+The VDR menu "Setup/Plugins" will list all loaded plugins with their name,
+version number and description. Selecting an item in this list will bring up
+the plugin's "Setup" menu if that plugin has implemented the <tt>SetupMenu()</tt>
+function.
+<p>
+Finally, a plugin doesn't have to implement the <tt>SetupMenu()</tt> if it only
+needs setup parameters that are not directly user adjustable. It can use
+<tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
+parameters to the user.
+
+<a name="Internationalization"><hr><h2>Internationalization</h2>
+
+<center><i><b>Welcome to Babylon!</b></i></center><p>
+
+If a plugin displays texts to the user, it should implement internationalized
+versions of these texts and call the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+void RegisterI18n(const tI18nPhrase * const Phrases);
+</pre></td></tr></table><p>
+
+to register them with VDR's internationalization mechanism.
+<p>
+The call to this function must be done in the <a href="#Getting started"><tt>Start()</tt></a> function of the plugin:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const tI18nPhrase Phrases[] = {
+  { "Hello world!",
+    "Hallo Welt!",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { NULL }
+  };
+
+void cPluginDemo::Start(void)
+{
+  RegisterI18n(Phrases);
+}
+</pre></td></tr></table><p>
+
+Each entry of type <tt>tI18nPhrase</tt> must have exactly as many members as defined
+by the constant <tt>I18nNumLanguages</tt> in the file <tt>VDR/i18n.h</tt>, and the
+sequence of the various languages must be the same as defined in <tt>VDR/i18n.c</tt>.<br>
+<b>It is very important that the array is terminated with a <tt>{&nbsp;NULL&nbsp;}</tt>
+entry!</b>.
+<p>
+Usually you won't be able to fill in all the different translations by yourself, so
+you may want to contact the maintainers of these languages (listed in the file
+<tt>VDR/i18n.c</tt>) and ask them to provide the additional translations.
+<p>
+The actual runtime selection of the texts corresponding to the selected language
+is done by wrapping each internationalized text with the <tt>tr()</tt> macro:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *s = tr("Hello world!");
+</pre></td></tr></table><p>
+
+The text given here must be the first one defined in the related <i>Phrases</i>
+entry (which is the English version), and the returned pointer is either a translated
+version (if available) or the original string. In the latter case a message will be
+written to the log file, indicating that a translation is missing.
+Texts are first searched for in the <i>Phrases</i> registered for this plugin (if any)
+and then in the global VDR texts. So a plugin can make use of texts defined by the
+core VDR code.
+
+<a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2>
+
+<center><i><b>Saddling up!</b></i></center><p>
+
+Plugins are loaded into VDR using the command line option <b><tt>-P</tt></b>, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+vdr -Pdemo
+</pre></td></tr></table><p>
+
+If the plugin accepts command line options, they are given as part of the argument
+to the <b><tt>-P</tt></b> option, which then has to be enclosed in quotes:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+vdr -P"demo -a abc -b"
+</pre></td></tr></table><p>
+
+Any number of plugins can be loaded this way, each with its own <b><tt>-P</tt></b> option:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+vdr -P"demo -a abc -b" -Pdvd -Pmp3
+</pre></td></tr></table><p>
+
+If you are not starting VDR from the VDR source directory (and thus your plugins
+cannot be found at their default location) you need to tell VDR the location of
+the plugins through the <b><tt>-L</tt></b> option:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+vdr -L/usr/lib/vdr -Pdemo
+</pre></td></tr></table><p>
+
+There can be any number of <b><tt>-L</tt></b> options, and each of them will apply to the
+<b><tt>-P</tt></b> options following it.
+<p>
+When started with the <b><tt>-h</tt></b> or <b><tt>-V</tt></b> option (for <i>help</i>
+or <i>version</i> information, respectively), VDR will automatically load all plugins
+in the default or given directory that match the VDR plugin
+<a href="#The plugin directory structure">naming convention</a>,
+and display their help and/or version information in addition to its own output.
+
+<a name="Building the distribution package"><hr><h2>Building the distribution package</h2>
+
+<center><i><b>Let's get this show on the road!</b></i></center><p>
+
+If you want to make your plugin available to other VDR users, you'll need to
+make a package that can be easily distributed.
+The <tt>Makefile</tt> that has been created by the call to
+<a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
+provides the target <tt>package</tt>, which does this for you.
+<p>
+Simply change into your source directory and execute <tt>make package</tt>:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cd VDR/PLUGINS/SRC/demo
+make package
+</pre></td></tr></table><p>
+
+After this you should find a file named like
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+vdr-demo-0.0.1.tgz
+</pre></td></tr></table><p>
+
+in your source directory, where <tt>demo</tt> will be replaced with your actual
+plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
+
+</body>
+</html>
diff --git a/PLUGINS/SRC/hello/COPYING b/PLUGINS/SRC/hello/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/SRC/hello/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
new file mode 100644
index 000000000..b35760cac
--- /dev/null
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'hello' Revision History
+-----------------------------------
+
+2002-05-09: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
new file mode 100644
index 000000000..fb764cdca
--- /dev/null
+++ b/PLUGINS/SRC/hello/Makefile
@@ -0,0 +1,78 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2002/05/09 15:17:44 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = hello
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = `grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g'`
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB/ost/include
+VDRDIR = ../../..
+VDRINC = $(VDRDIR)/include
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = `grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g'`
+
+### The name of the distribution archive:
+
+ARCHIVE = vdr-$(PLUGIN)-$(VERSION)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+
+DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o i18n.o
+
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual -m486
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+package: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(ARCHIVE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution archive created as $(ARCHIVE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/SRC/hello/README b/PLUGINS/SRC/hello/README
new file mode 100644
index 000000000..fd844ca61
--- /dev/null
+++ b/PLUGINS/SRC/hello/README
@@ -0,0 +1,11 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          www.cadsoft.de/people/kls/vdr
+
+Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
+
+See the file COPYING for license information.
+
+Description: This is a small demo of the VDR plugin interface.
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
new file mode 100644
index 000000000..5db4f2a27
--- /dev/null
+++ b/PLUGINS/SRC/hello/hello.c
@@ -0,0 +1,105 @@
+/*
+ * hello.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: hello.c 1.1 2002/05/09 15:28:51 kls Exp $
+ */
+
+#include <getopt.h>
+#include <vdr/interface.h>
+#include <vdr/plugin.h>
+#include "i18n.h"
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "A friendly greeting";
+static const char *MAINMENUENTRY  = "Hello";
+
+class cPluginHello : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+  const char *option_a;
+  bool option_b;
+public:
+  cPluginHello(void);
+  virtual ~cPluginHello();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return tr(DESCRIPTION); }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual void Start(void);
+  virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
+  virtual cOsdMenu *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginHello::cPluginHello(void)
+{
+  // Initialize any member varaiables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+  option_a = NULL;
+  option_b = false;
+}
+
+cPluginHello::~cPluginHello()
+{
+  // Clean up after yourself!
+}
+
+const char *cPluginHello::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return "  -a ABC,   --aaa=ABC      do something nice with ABC\n"
+         "  -b,       --bbb          activate 'plan B'\n";
+}
+
+bool cPluginHello::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  static struct option long_options[] = {
+       { "aaa",      required_argument, NULL, 'a' },
+       { "bbb",      no_argument,       NULL, 'b' },
+       { NULL }
+     };
+
+  int c;
+  while ((c = getopt_long(argc, argv, "a:b", long_options, NULL)) != -1) {
+        switch (c) {
+          case 'a': option_a = optarg;
+                    break;
+          case 'b': option_b = true;
+                    break;
+          default:  return false;
+          }
+        }
+  return true;
+}
+
+void cPluginHello::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  RegisterI18n(Phrases);
+}
+
+cOsdMenu *cPluginHello::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  Interface->Info(tr("Hello world!"));
+  return NULL;
+}
+
+cMenuSetupPage *cPluginHello::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPluginHello::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginHello); // Don't touch this!
diff --git a/PLUGINS/SRC/hello/i18n.c b/PLUGINS/SRC/hello/i18n.c
new file mode 100644
index 000000000..70617421b
--- /dev/null
+++ b/PLUGINS/SRC/hello/i18n.c
@@ -0,0 +1,52 @@
+/*
+ * i18n.c: Internationalization
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: i18n.c 1.1 2002/05/09 15:13:31 kls Exp $
+ */
+
+#include "i18n.h"
+
+const tI18nPhrase Phrases[] = {
+  { "Hello",
+    "Hallo",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Hello world!",
+    "Hallo Welt!",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "A friendly greeting",
+    "Ein freundlicher Gru�",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { NULL }
+  };
diff --git a/PLUGINS/SRC/hello/i18n.h b/PLUGINS/SRC/hello/i18n.h
new file mode 100644
index 000000000..2976fe888
--- /dev/null
+++ b/PLUGINS/SRC/hello/i18n.h
@@ -0,0 +1,11 @@
+/*
+ * i18n.h: Internationalization
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: i18n.h 1.1 2002/05/09 15:15:49 kls Exp $
+ */
+
+#include <vdr/i18n.h>
+
+extern const tI18nPhrase Phrases[];
diff --git a/channels.conf b/channels.conf
index db1cbf41b..fef477489 100644
--- a/channels.conf
+++ b/channels.conf
@@ -48,83 +48,68 @@ ORB:12110:h:0:27500:501:502:504:0:28205
 B1:12110:h:0:27500:601:602:604:0:28206
 ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
-Premiere World:11797:h:0:27500:255:256:32:0:8
-Premiere 1:11797:h:0:27500:511:512:0:101:10
-Premiere 2:11797:h:0:27500:1791:1792:0:101:11
+Premiere Start:11797:h:0:27500:255:256:0:101:8
+Premiere 1:11797:h:0:27500:511:512,513;515:0:101:10
+Premiere 2:11797:h:0:27500:1791:1792,1793;1795:0:101:11
 Premiere 3:11797:h:0:27500:2303:2304:0:101:43
-Premiere One:12032:h:0:27500:3071:3072:0:101:51
-Premiere Star:11797:h:0:27500:767:768:0:101:9
-Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:101:41
-Premiere Action:11797:h:0:27500:1023:1024:0:101:20
-Premiere X-Action:11798:h:0:27500:2047:2048:0:101:50
-Premiere Comedy:11797:h:0:27500:1279:1280:0:101:29
-13th Street:12031:h:0:27500:2303:2304:0:101:42
+Premiere 4:11797:h:0:27500:767:768:0:101:9
+Premiere 5:11797:h:0:27500:1279:1280:0:101:29
+Premiere 6:11797:h:0:27500:1535:1536:0:101:41
+Premiere 7:11797:h:0:27500:1023:1024:0:101:20
+13th Street:11758:h:0:27500:2303:2304:0:101:42
 Studio Universal:12090:V:0:27500:255:256:0:101:36
-Filmpalast:12031:h:0:27500:2559:2560:0:101:516
-Heimatkanal:12031:h:0:27500:2815:2816:0:101:517
-Discovery Channel:12031:h:0:27500:1791:1792:0:101:14
-Planet:12090:V:0:27500:1279:1280:0:101:13
-Fox Kids:12031:h:0:27500:1279:1280:0:101:28
-Fox Kids T�rkce:11914:H:0:27500:767:768:8191:101:54
-Junior:12031:h:0:27500:255:256:0:101:19
-K-Toon:12031:h:0:27500:511:512:0:101:12
+Premiere Serie:12031:h:0:27500:1023:1024:0:101:16
 Disney Channel:12090:V:0:27500:767:768:0:101:34
-Sunset:12031:h:0:27500:1023:1024:0:101:16
+Premiere Nostalgie:12031:h:0:27500:2559:2560:0:101:516
+Discovery Channel:12031:h:0:27500:1791:1792:0:101:14
+Planet:12090:v:0:27500:1279:1280:0:101:13
+Fox Kids:11758:h:0:27500:1279:1280:0:101:28
+Junior:11758:h:0:27500:255:256:0:101:19
+K-Toon:11758:h:0:27500:511:512:0:101:12
 Krimi&Co:12031:h:0:27500:1535:1536:0:101:23
-Goldstar TV:12031:h:0:27500:3839:3840:0:101:518
-Classica:12031:h:0:27500:767:768:0:101:15
-Seasons:12090:V:0:27500:511:512:0:101:33
-:Cinedom
-Cinedom Deluxe:11758:h:0:27500:255:256,257;259:0:101:189
-Cinedom 1A:11758:h:0:27500:511:512,513:0:101:190
-Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:101:178
-Cinedom 1C:11720:h:0:27500:511:512,513:0:101:180
-Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:101:176
-Cinedom 2A:11758:h:0:27500:1023:1024,1025:0:101:193
-Cinedom 2B:11720:h:0:27500:1279:1280:0:101:183
-Cinedom 2C:12070:h:0:27500:1791:1792:0:101:179
-Cinedom 2D:12070:h:0:27500:511:512:0:101:184
-Cinedom 2E:12070:h:0:27500:1279:1280:0:101:188
-Cinedom 3A:11758:h:0:27500:2559:2560:0:101:192
-Cinedom 3B:11758:h:0:27500:1535:1536:0:101:195
-Cinedom 3C:12070:h:0:27500:767:768:0:101:185
-Cinedom 3D:11720:h:0:27500:1023:1024:0:101:182
-Cinedom 4A:11758:h:0:27500:767:768:0:101:191
-Cinedom 4B:11720:h:0:27500:767:768:0:101:181
-Cinedom 4C:12070:h:0:27500:2047:2048:0:101:187
-Cinedom 5A:11758:h:0:27500:1279:1280:0:101:194
-Cinedom 5B:11720:h:0:27500:1791:1792:0:101:177
-Cinedom 5C:12070:h:0:27500:1023:1024:0:101:186
-:Beta Digital
-N24:12480:v:0:27500:2047:2048:0:0:47
-CNBC:11954:h:0:27500:510:520:0:0:28010
-Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
+Goldstar TV:11758:h:0:27500:3839:3840:0:101:518
+Classica:11758:h:0:27500:767:768:0:101:15
+Sonnenklar TV:12090:V:0:27500:1023:1024:0:0:32
+:Premiere Direkt
+Premiere Direkt 1A:12031:h:0:27500:511:512,513;515:0:101:177
+Premiere Direkt 1B:11719:h:0:27500:1023:1024,1025;1027:0:101:182
+Premiere Direkt 2A:12031:h:0:27500:255:256;259:0:101:176
+Premiere Direkt 2B:11719:h:0:27500:767:768;769:0:101:181
+Premiere Direkt 3A:11719:h:0:27500:511:512;515:0:101:180
+Premiere Direkt 3B:11719:h:0:27500:1279:1280;1283:0:101:183
+Premiere Direkt 4A:12031:h:0:27500:2815:2816:0:101:18
+Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
 :PW Erotic
-Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:101:21
-Blue Movie 1:11758:h:0:27500:1791:1792:0:101:513
-Blue Movie 2:11758:h:0:27500:2047:2048:0:101:514
-Blue Movie 3:11758:h:0:27500:2303:2304:0:101:515
+Beate-Uhse.TV:11758:h:0:27500:1023:1024:0:101:21
+Premiere Erotik 1:12031:h:0:27500:1279:1280:0:101:513
+Premiere Erotik 2:11719:h:0:27500:1535:1536:0:101:778
+Premiere Erotik 3:11719:h:0:27500:1791:1792:0:101:779
+Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
 :Sportsworld
 Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
-Premiere Sport 2:12070:h:0:27500:3839:3840:0:101:27
-Premiere Sport 3:12070:h:0:27500:255:256:0:101:26
+Premiere Sport 2:12031:h:0:27500:3839:3840:0:101:27
 :Formel 1
-Infokanal:11720:h:0:27500:3071:3072:0:101:244
-Multikanal:11720:h:0:27500:2815:2816:0:101:243
-Supersignal:11720:h:0:27500:255:256:0:101:17
-Verfolgerfeld:11720:h:0:27500:2303:2304:0:101:241
-Cockpitkanal:11720:h:0:27500:2559:2560:0:101:242
-Boxengasse:11720:h:0:27500:2047:2048:0:101:240
-:Premiere World Bundesliga
-Superdom:11758:h:0:27500:2815:8192:0:101:18
-BuLi-Konferenz:11758:h:0:27500:3327:3328,3329:0:101:215
-BuLi-Spiel 1:11720:h:0:27500:255:256,257:0:101:17
-BuLi-Spiel 2:11720:h:0:27500:2047:2048,2049:0:101:240
-BuLi-Spiel 3:11720:h:0:27500:2303:2304,2305:0:101:241
-BuLi-Spiel 4:11720:h:0:27500:2559:2560,2561:0:101:242
-BuLi-Spiel 5:11720:h:0:27500:2815:2816,2817:0:101:243
-BuLi-Spiel 6:11720:h:0:27500:3071:3072,3073:0:101:244
-BuLi-Spiel 7:11758:h:0:27500:3071:3072,3073:0:101:214
+Supersignal:12070:h:0:27500:255:256:0:101:211
+Cockpitkanal:12070:h:0:27500:511:512:0:101:212
+Boxengasse:12070:h:0:27500:767:768:0:101:213
+Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
+Infokanal:12070:h:0:27500:1279:1280:0:101:215
+Multikanal:11720:h:0:27500:255:256:0:101:17
+:Beta Digital
+N24:12480:v:0:27500:2047:2048:0:0:47
+CNBC:11954:h:0:27500:510:520:0:0:28010
+Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
+:Premiere Bundesliga
+BL-Konferenz:12031:h:0:27500:2303:2304,2305:0:101:210
+BuLi 1:11719:h:0:27500:255:256,257:0:101:17
+BuLi 2:11719:h:0:27500:2047:2048,2049:0:101:240
+BuLi 3:11719:h:0:27500:2303:2304,2305:0:101:241
+BuLi 4:11719:h:0:27500:2559:2560,2561:0:101:242
+BuLi 5:11719:h:0:27500:2815:2816,2817:0:101:243
+BuLi 6:11719:h:0:27500:3071:3072,3073:0:101:244
+BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
+BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
+BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
@@ -168,7 +153,7 @@ ESC 1:12363:v:0:27500:163:104:0:0:0
 TV5 Europe:12363:v:0:27500:164:112:0:0:0
 TV7 Tunisia:12363:v:0:27500:166:128:0:0:0
 ARTE:12363:v:0:27500:167:137:0:0:0
-RAI Uno:12363:v:0:27500:289:290:0:0:8904
+RAI Uno:10788:v:0:22000:289:290:0:0:9004
 RTP International:12363:v:0:27500:300:301:0:0:0
 Fashion TV:12402:v:0:27500:163:92:0:0:0
 VideoService:12422:h:0:27500:255:256:0:0:0
diff --git a/channels.conf.cable b/channels.conf.cable
index b6d5c050a..3987fd82e 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,184 +1,165 @@
-:verschl�sselte Fernsehprogramm
-PREMIERE ONE:378:h:0:6900:3071:3072:0:1:51
-PREMIERE MOVIE 1:370:h:0:6900:511:512;515:0:1:10
-PREMIERE MOVIE 2:370:h:0:6900:1791:1792:0:1:11
-PREMIERE MOVIE 3:370:h:0:6900:2303:2304:0:1:43
-PREMIERE ACTION:370:h:0:6900:1023:1024,1025:0:1:20
-PREMIERE X-ACTION:370:h:0:6900:2047:2048,2049:0:1:50
-PREMIERE SCI-FI:370:h:0:6900:1535:1536:0:1:41
-PREMIERE STAR:370:h:0:6900:767:768:0:1:9
-PREMIERE COMEDY:370:h:0:6900:1279:1280:0:1:29
-13 TH STREET:378:h:0:6900:2303:2304,2305:0:1:42
-KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
-STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
-DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
-FILMPALAST:378:h:0:6900:2559:2560:0:1:516
-DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
-SUNSET:378:h:0:6900:1023:1024:0:1:16
-PLANET:402:h:0:6900:1100:1104:0:1:13
-CLASSICA:378:h:0:6900:767:768:0:1:15
-GOLDSTAR TV:378:h:0:6900:3839:3840:0:1:518
-HEIMATKANAL:378:h:0:6900:2815:2816:0:1:517
-K-TOON:378:h:0:6900:511:512:0:1:12
-FOX KIDS:378:h:0:6900:1279:1280:0:1:28
-KiKa:394:h:0:6900:310:320:330:0:28008
-JUNIOR:378:h:0:6900:255:256:0:1:19
 :Fernsehprogramme
-Das Erste:410:h:0:6900:101:102,88:104:0:28106
-ZDF:394:h:0:6900:110:120,121:130:0:28006
+Das Erste:410:h:0:6900:101:102:111:0:28106
+ZDF:394:h:0:6900:110:120:130:0:28006
+3sat:394:h:0:6900:210:220:230:0:28007
+arte:410:h:0:6900:401:402:404:0:28109
+EuroNews:394:h:0:6900:2221:2233:768:0:28015
 ZDF.info:394:h:0:6900:610:620:0:0:28011
 ZDF.doku:394:h:0:6900:660:670:0:0:28014
 ZDF Theaterkanal:394:h:0:6900:1110:1120:130:0:28016
 EinsExtra:426:h:0:6900:101:102:0:0:28201
 EinsFestival:426:h:0:6900:201:202:0:0:28202
 EinsMuXx:426:h:0:6900:301:302:0:0:28203
-3sat:394:h:0:6900:210:220:230:0:28007
-arte:410:h:0:6900:401:402:404:0:28109
-EuroNews:394:h:0:6900:2221:2233:768:0:28015
 Phoenix:410:h:0:6900:901:902:0:0:28114
 Eurosport:394:h:0:6900:410:420:430:0:28009
 DW-tv:610:h:0:6900:634:632:0:0:6101
 CNBC:394:h:0:6900:510:520:530:0:28010
+:Regionalprogramme
 WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
+B1 Berlin:426:h:0:6900:601:602,603:604:0:28206
+ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
 MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
 SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
 SuedWest BW:410:h:0:6900:801:802:804:0:28113
 SuedWest RP:426:h:0:6900:3101:3102:3104:0:28231
 BR-alpha:410:h:0:6900:701:702:704:0:28112
-B1 Berlin:426:h:0:6900:601:602:604:0:28206
 N3:426:h:0:6900:2401:2402:2404:0:28224
-ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
 hessen fernsehen:410:h:0:6900:301:302:304:0:28108
 Bayerisches FS:410:h:0:6900:201:202:204:0:28107
 Test-R:410:h:0:6900:901:902:104:0:28130
+:Premiere Hauptprogramme
+Premiere START:370:C:0:6900:255:256:32:101:8
+Premiere 1:370:C:0:6900:511:512:0:101:10
+Premiere 2:370:C:0:6900:1791:1792:0:101:11
+Premiere 3:370:C:0:6900:2303:2304:0:101:43
+Premiere 4:370:C:0:6900:767:768:0:101:9
+Premiere 5:370:C:0:6900:1279:1280:0:101:29
+Premiere 6:370:C:0:6900:1535:1536:0:101:41
+Premiere 7:370:C:0:6900:1023:1024:0:101:20
+Premiere SERIE:378:C:0:6900:1023:1024:0:101:16
+Premiere Nostalgie:378:C:0:6900:2559:2560:0:101:516
+13 TH STREET:354:C:0:6900:2303:2304:0:101:42
+Stundio Universal:402:C:0:6900:1050:1054:0:101:36
+Krimi &Co:378:C:0:6900:1535:1536:0:101:23
+Disney Channel:402:C:0:6900:1030:1034:0:101:34
+Discovery Channel:378:C:0:6900:1791:1792:0:101:14
+Fox Kids:354:C:0:6900:1279:1280:0:101:28
+Junior:354:C:0:6900:255:256:0:101:19
+K-TOON:354:C:0:6900:0:0:0:101:12
+GOLDSTAR TV:354:C:0:6900:3839:3840:0:101:518
+CLASSICA:354:C:0:6900:767:768:0:101:15
 :Mediavision
-Extreme Sport:346:h:0:6900:801:802:0:1:50700
-Bloomberg:346:h:0:6900:811:812:0:1:50701
-Single TV:346:h:0:6900:621:622:0:1:50706
-Fashion TV:346:h:0:6900:821:822:0:1:50702
-BET ON JAZZ:346:h:0:6900:841:842:0:1:50704
-LANDSCAPE:346:h:0:6900:831:832:0:1:50703
-Einstein:346:h:0:6900:623:624:0:1:50719
+Bloomberg:346:h:0:6900:811:812:0:101:50701
+Fashion TV:346:h:0:6900:821:822:0:101:50702
+Einstein:346:h:0:6900:623:624:0:101:50719
+Extreme Sport:346:h:0:6900:801:802:0:101:50700
+LANDSCAPE:346:h:0:6900:831:832:0:101:50703
+Single TV:346:h:0:6900:621:622:0:101:50706
 Leitseite:346:h:0:6900:2254:0:0:0:5004
-Via 1 - Sch�ner Reisen:346:h:0:6900:611:612:0:0:50705
-Parlamentsfernsehen:610:h:0:6900:33:36:47:0:6100
-Vh1 - Classic:610:h:0:6900:604:603:0:0:6106
+BET ON JAZZ:346:h:0:6900:841:842:0:101:50704
+:Digit. Bouquet"Kabel Berlin"
+Parlamentsfernsehen:610:C:0:6900:33:36:47:0:6100
+DW-tv:610:C:0:6900:634:632:0:0:6101
+Kanal 7:610:C:0:6900:49:52:0:101:6103
+Euronews:610:C:0:6900:597:592,591:0:101:6104
+Vh1 - Classic:610:h:0:6900:604:603:0:101:6106
+Travel:610:C:0:6900:595:594:0:101:6105
+Nuvolari:618:C:0:6900:1011:1012:0:101:50101
+Marco Polo:618:C:0:6900:1021:1022:0:101:50102
+Alice:618:C:0:6900:1031:1032:0:101:50103
+Leonardo:618:C:0:6900:1041:1042:0:101:50104
+Club:618:C:0:6900:1051:1052:0:101:50105
+Avante:618:C:0:6900:1061:1062:0:101:50106
+Expo 24*7:618:C:0:6900:1071:1072:0:101:50107
+Innergy:618:C:0:6900:0:0:0:101:50108
+BBC Prime:618:C:0:6900:1091:1092:0:101:50109
+Eurosport News:618:C:0:6900:1101:1102:0:101:50110
 :Diverse TV-Sender
-TV Polonia:434:h:0:6900:641:642:0:1:53204
-Kanal D:434:h:0:6900:651:652:0:1:53205
-RTP international:434:h:0:6900:661:662:0:1:53206
-ERT-Sat:434:h:0:6900:691:692:0:1:53209
-CNE:434:h:0:6900:4056:4057:0:1:53208
-ZEE TV:442:h:0:6900:517:773:0:1:53301
-NTV i:442:h:0:6900:514:515:0:1:53302
+TV Polonia:434:h:0:6900:641:642:0:101:53204
+Kanal D:434:h:0:6900:651:652:0:101:53205
+RTP international:434:h:0:6900:661:662:0:101:53206
+ERT-Sat:434:h:0:6900:691:692:0:101:53209
+CNE:434:h:0:6900:4056:4057:0:101:53208
+ZEE TV:442:h:0:6900:517:773:0:101:53301
+NTV i:442:h:0:6900:514:515:0:101:53302
 ATV:434:h:0:6900:631:632:0:0:53203
 TW1:610:h:0:6900:6106:6107:0:0:6106
-PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
-:Premiere World Bundesliga
-Superdom:362:h:0:6900:255:256:0:1:26
-Spiel 1:362:h:0:6900:255:256,257:0:1:17
-Spiel 2:362:h:0:6900:2047:2048,2049:0:1:240
-BuLi-Konferenz:362:h:0:6900:3071:3072,3073:0:1:208
-BuLi-Spiel 1:362:h:0:6900:3327:3328,3329:0:1:209
-BuLi-Spiel 2:362:h:0:6900:2303:2304,2305:0:1:210
-BuLi-Spiel 3:362:h:0:6900:3583:3584,3585:0:1:211
-BuLi-Spiel 4:362:h:0:6900:2559:2560,2561:0:1:212
-BuLi-Spiel 5:362:h:0:6900:2815:2816,2817:0:1:213
 :Premiere Sport
-PREMIERE SPORT 1:362:h:0:6900:255:256:0:1:17
-PREMIERE SPORT 2:362:h:0:6900:3327:3328:0:1:27
-PREMIERE SPORT 3:354:h:0:6900:2815:2816:0:1:18
-:Premiere Formel 1
-F1 Studio:362:h:0:6900:255:256:0:1:17
-F1 Box:362:h:0:6900:2047:2048:0:1:240
-F1 Verfolger:362:h:0:6900:2303:2304:0:1:241
-F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
-F1 Multi:362:h:0:6900:2815:2816:0:1:243
-F1 Info:362:h:0:6900:3071:3072:0:1:244
-:Premiere Cinedom 1
-Cinedom 1A:362:h:0:6900:1535:1536,1537:0:1:176
-Cinedom 1B:386:h:0:6900:1535:1536,1537:0:1:178
-Cinedom 1C:362:h:0:6900:511:512,513:0:1:180
-Cinedom 1D:354:h:0:6900:511:512,513:0:1:190
-:Premiere Cinedom 2
-Cinedom 2A:386:h:0:6900:1791:1792,1793:0:1:179
-Cinedom 2B:362:h:0:6900:1279:1280,1281:0:1:183
-Cinedom 2C:386:h:0:6900:511:512:0:1:184
-Cinedom 2D:386:h:0:6900:1279:1280:0:1:188
-Cinedom 2E:354:h:0:6900:1023:1024:0:1:193
-: Premiere Cinedom 3
-Cinedom 3A:362:h:0:6900:1023:1024,1025:0:1:182
-Cinedom 3B:386:h:0:6900:767:768:0:1:185
-Cinedom 3C:354:h:0:6900:2559:2560:0:1:192
-Cinedom 3D:354:h:0:6900:1535:1536:0:1:195
-: Premiere Cinedom 4
-Cinedom 4A:362:h:0:6900:767:768,769:0:1:181
-Cinedom 4B:386:h:0:6900:2047:2048:0:1:187
-Cinedom 4C:354:h:0:6900:767:768:0:1:191
-: Premiere Cinedom 5
-Cinedom 5A:386:h:0:6900:1023:1024,1025:0:1:186
-Cinedom 5B:354:h:0:6900:1279:1280,1281:0:1:194
-: Premiere Cinedom Deluxe
-CINEDOM DELUXE:354:h:0:6900:255:256,257:0:1:189
-:Premiere Erotic
-BEATE-UHSE.TV:354:h:0:6900:3839:3840:0:1:21
-BLUE MOVIE 1:354:h:0:6900:1791:1792:0:1:513
-BLUE MOVIE 2:354:h:0:6900:2047:2048:0:1:514
-BLUE MOVIE 3:354:h:0:6900:2303:2304:0:1:515
+PREMIERE SPORT 1:362:C:0:6900:255:256,257:0:101:17
+PREMIERE SPORT 2:378:C:0:6900:3839:3840,3841:0:101:27
+:Premiere Direkt 1
+PREMIERE DIREKT 1A:362:C:0:6900:1023:1024,1025:0:101:182
+PREMIERE DIREKT 1B:378:C:0:6900:511:512,513:0:101:177
+:Premiere Direkt 2
+PREMIERE DIREKT 2A:378:C:0:6900:255:256,257:0:101:176
+PREMIERE DIREKT 2B:362:C:0:6900:767:768,769:0:101:181
+:Premiere Direkt 3
+PREMIERE DIREKT 3A:362:C:0:6900:511:512,513:0:101:180
+PREMIERE DIREKT 3B:362:C:0:6900:1279:1280,1281:0:101:183
+:Premiere Direkt 4
+PREMIERE DIREKT 4A:378:C:0:6900:2815:2816,2817:0:101:18
+PREMIERE DIREKT 4B:386:C:0:6900:1535:1536,1537:0:101:216
+:Premiere Erotik
+BEATE-UHSE.TV:354:C:0:6900:1023:1024:0:101:21
+PREMIERE EROTIK 1:378:C:0:6900:1279:1280:0:101:513
+PREMIERE EROTIK 2:362:C:0:6900:1535:1536:0:101:778
+PREMIERE EROTIK 3:362:C:0:6900:1791:1792:0:101:779
+PREMIERE EROTIK 4:362:C:0:6900:3583:3584:0:101:780
 :Radioprogramme
-Fritz:426:h:0:6900:0:901:0:0:28209
-HR XXL:410:h:0:6900:0:3501:0:0:28125
-JUMP:426:h:0:6900:0:1001:0:0:28210
-SPUTNIK:426:h:0:6900:0:1201:0:0:28212
-RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
-DLR-Berlin:394:h:0:6900:0:710:0:0:28012
-DLF-K�ln:394:h:0:6900:0:810:0:0:28013
-�sterreich 1:394:h:0:6900:0:169:0:0:28017
-100,6:354:h:0:6900:0:1312:0:0:161
-Bayern 4 Klassik:410:h:0:6900:0:3001:0:0:28120
-B5 aktuell:410:h:0:6900:0:3101:0:0:28121
-Bremen 2:410:h:0:6900:0:3801:0:0:28128
-Bayern 1:410:h:0:6900:0:3601:0:0:28126
-NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
-SR 1:410:h:0:6900:0:3901:0:0:28129
-hr-klassik:410:h:0:6900:0:3401:0:0:28124
-hr2:410:h:0:6900:0:3301:0:0:28123
-hr-chronos:410:h:0:6900:0:3201:0:0:28122
-Radio 3:426:h:0:6900:0:701:0:0:28207
-MDR KULTUR:426:h:0:6900:0:801:0:0:28208
-MDR info:426:h:0:6900:0:1101:0:0:28211
-SWR-2:426:h:0:6900:0:1401:0:0:28214
-WDR3:426:h:0:6900:0:1501:0:0:28215
-WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
+Fritz:426:h:0:6900:1:901:0:0:28209
+HR XXL:410:h:0:6900:1:3501:0:0:28125
+JUMP:426:h:0:6900:1:1001:0:0:28210
+SPUTNIK:426:h:0:6900:1:1201:0:0:28212
+RADIOmultikulti:426:h:0:6900:1:1301:0:0:28213
+DLR-Berlin:394:h:0:6900:1:710:0:0:28012
+DLF-K�ln:394:h:0:6900:1:810:0:0:28013
+�sterreich 1:394:h:0:6900:1:169:0:0:28017
+100,6:354:h:0:6900:1:1312:0:0:161
+Bayern 4 Klassik:410:h:0:6900:1:3001:0:0:28120
+B5 aktuell:410:h:0:6900:1:3101:0:0:28121
+Bremen 2:410:h:0:6900:1:3801:0:0:28128
+Bayern 1:410:h:0:6900:1:3601:0:0:28126
+NDR 4 Info:410:h:0:6900:1:3701:0:0:28127
+SR 1:410:h:0:6900:1:3901:0:0:28129
+hr-klassik:410:h:0:6900:1:3401:0:0:28124
+hr2:410:h:0:6900:1:3301:0:0:28123
+hr-chronos:410:h:0:6900:1:3201:0:0:28122
+Radio 3:426:h:0:6900:1:701:0:0:28207
+MDR KULTUR:426:h:0:6900:1:801:0:0:28208
+MDR info:426:h:0:6900:1:1101:0:0:28211
+SWR-2:426:h:0:6900:1:1401:0:0:28214
+WDR3:426:h:0:6900:1:1501:0:0:28215
+WDR Radio 5:426:h:0:6900:1:1601:0:0:28216
 :verschl�sselte Radioprogramme
-ALTERNATIVE ROCK:378:h:0:6900:1:800:0:1:151
-HITLISTE:378:h:0:6900:1:784:0:1:150
-DANCE:378:h:0:6900:1:816:0:1:152
-EASY LISTENING:402:h:0:6900:1:1201:0:1:162
-CLASSIC ROCK:378:h:0:6900:1:544:0:1:154
-Cristal New Age:442:h:0:6900:1:536:0:0:53351
-Movie Sounds:442:h:0:6900:1:537:0:1:53352
-LOVE SONGS:402:h:0:6900:1:1191:0:1:163
-KLASSIK POPUL�R:378:h:0:6900:1:592:0:1:145
-KLASS. SYMPHONIEN:378:h:0:6900:1:608:0:1:146
-OPER & VOKALMUSIK:378:h:0:6900:1:624:0:1:147
-BAROCKMUSIK:378:h:0:6900:1:640:0:1:148
-JAZZ:378:h:0:6900:1:656:0:1:149
-COUNTRY:378:h:0:6900:1:352:0:1:153
-FILMMUSIK:378:h:0:6900:1:368:0:1:155
-DEUTSCHE HITS:402:h:0:6900:1:1156:0:1:156
-SOUL CLASSICS:402:h:0:6900:1:1161:0:1:157
-T�RK M�ZIGI:402:h:0:6900:1:1166:0:1:158
-GOLD:402:h:0:6900:1:1171:0:1:159
-MUSICALS:402:h:0:6900:1:1196:0:1:164
-OLD GOLD:402:h:0:6900:1:1186:0:1:165
-SCHLAGER:402:h:0:6900:1:1176:0:1:166
-VOLKSMUSIK:402:h:0:6900:1:1181:0:1:167
-All Jazz:442:h:0:6900:1:535:0:1:53350
-Sinfonica:442:h:0:6900:1:538:0:1:53353
-Opernfestival:442:h:0:6900:1:539:0:1:53354
-Barock Fantasie:442:h:0:6900:1:540:0:1:53355
-Musica Camerata:442:h:0:6900:1:541:0:1:53356
-Musica Antica:442:h:0:6900:1:542:0:1:53357
-Adagio:442:h:0:6900:1:543:0:1:53358
-Jazz Legends:442:h:0:6900:1:544:0:1:53359
+ALTERNATIVE ROCK:370:C:0:6900:1:800:0:101:151
+CLASSIC ROCK:370:C:0:6900:1:544:0:101:154
+DANCE:370:C:0:6900:1:816:0:101:152
+LOVE SONGS:370:C:0:6900:1:352:0:101:163
+GOLD:370:C:0:6900:1:576:0:101:159
+OLD GOLD:370:C:0:6900:1:304:0:101:165
+SOUL CLASSICS:370:C:0:6900:1:400:0:101:157
+EASY LISTENING:370:C:0:6900:1:384:0:101:162
+DEUTSCHE HITS:370:C:0:6900:1:592:0:101:156
+SCHLAGER:370:C:0:6900:1:320:0:101:166
+VOLKSMUSIK:362:C:0:6900:1:336:0:101:167
+COUNTRY:362:C:0:6900:1:352:0:101:153
+FILMMUSIK:362:C:0:6900:1:368:0:101:155
+MUSICALS:362:C:0:6900:1:384:0:101:164
+JAZZ:362:C:0:6900:1:656:0:101:149
+KLASSIK POPUL04R:378:C:0:6900:1:592:0:101:145
+ORCHESTRALE WERKE:378:C:0:6900:1:608:0:101:146
+BAROCK:378:C:0:6900:1:640:0:101:148
+OPER:378:C:0:6900:1:624:0:101:147
+T�RK M�ZIGI:378:C:0:6900:1:560:0:101:158
+HITLISTE:370:C:0:6900:1:784:0:101:150
+Radio GoldStar:354:C:0:6900:1:368:0:101:171
+All Jazz:442:C:0:6900:1:535:0:101:53350
+Cristal New Age:442:C:0:6900:1:536:0:101:53351
+Movie Sounds:442:C:0:6900:1:537:0:101:53352
+Sinfonica:442:C:0:6900:1:538:0:101:53353
+Opernfestival:442:C:0:6900:1:539:0:101:53354
+Barock Fantasie:442:C:0:6900:1:540:0:101:53355
+Musica Camerata:442:C:0:6900:1:541:0:101:53356
+Musica Antica:442:C:0:6900:1:542:0:101:53357
+Adagio:442:C:0:6900:1:543:0:101:53358
+Jazz legends:442:C:0:6900:1:544:0:101:53359
diff --git a/channels.conf.terr b/channels.conf.terr
index bed1be8c4..81c058168 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -9,3 +9,12 @@ BBC CHOICE:505833:0:0:0:620:621:0:0:4351
 BBC NEWS 24:505833:0:0:0:640:641:0:0:4415
 BBC Knowledge:505833:0:0:0:630:631:0:0:4607
 Shop!:561833:0:0:0:6049:6050:0:0:13120
+: DVB-T Berlin Germany
+RTL 1:778000:V:0:27500:160:80:0:1:1
+RTL 2:778000:V:0:27500:161:82:0:1:2
+Super RTL:778000:V:0:27500:162:84:0:1:3
+VOX:778000:V:0:27500:165:81:0:1:4
+SAT 1:714000:V:0:27500:160:80:0:1:18
+PRO 7:714000:V:0:27500:161:82:0:1:19
+KABEL 1:714000:V:0:27500:162:84:0:1:20
+N24:714000:V:0:27500:163:86:0:1:21
diff --git a/config.c b/config.c
index 76e138b7e..8290e735e 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.97 2002/04/02 21:56:51 kls Exp $
+ * $Id: config.c 1.99 2002/05/05 09:10:00 kls Exp $
  */
 
 #include "config.h"
@@ -13,6 +13,7 @@
 #include "dvbapi.h"
 #include "i18n.h"
 #include "interface.h"
+#include "plugin.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -332,7 +333,8 @@ cTimer::cTimer(bool Instant)
   struct tm *now = localtime_r(&t, &tm_r);
   day = now->tm_mday;
   start = now->tm_hour * 100 + now->tm_min;
-  stop = start + 200; // "instant recording" records 2 hours by default
+  stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
+  stop = (stop / 60) * 100 + (stop % 60);
   if (stop >= 2400)
      stop -= 2400;
 //TODO VPS???
@@ -386,11 +388,12 @@ cTimer& cTimer::operator= (const cTimer &Timer)
   return *this;
 }
 
-bool cTimer::operator< (const cTimer &Timer)
+bool cTimer::operator< (const cListObject &ListObject)
 {
+  cTimer *ti = (cTimer *)&ListObject;
   time_t t1 = StartTime();
-  time_t t2 = (*(cTimer *)&Timer).StartTime();
-  return t1 < t2 || (t1 == t2 && priority > Timer.priority);
+  time_t t2 = ti->StartTime();
+  return t1 < t2 || (t1 == t2 && priority > ti->priority);
 }
 
 const char *cTimer::ToText(cTimer *Timer)
@@ -916,12 +919,76 @@ const cCaDefinition *cCaDefinitions::Get(int Number)
   return NULL;
 }
 
+// -- cSetupLine -------------------------------------------------------------
+
+cSetupLine::cSetupLine(void)
+{
+  plugin = name = value = NULL;
+}
+
+cSetupLine::cSetupLine(const char *Name, const char *Value, const char *Plugin)
+{
+  name = strdup(Name);
+  value = strdup(Value);
+  plugin = Plugin ? strdup(Plugin) : NULL;
+}
+
+cSetupLine::~cSetupLine()
+{
+  delete plugin;
+  delete name;
+  delete value;
+}
+
+bool cSetupLine::operator< (const cListObject &ListObject)
+{
+  const cSetupLine *sl = (cSetupLine *)&ListObject;
+  if (!plugin && !sl->plugin)
+     return strcasecmp(name, sl->name) < 0; 
+  if (!plugin)
+     return true;
+  if (!sl->plugin)
+     return false;
+  int result = strcasecmp(plugin, sl->plugin);
+  if (result == 0)
+     result = strcasecmp(name, sl->name);
+  return result < 0;
+}
+
+bool cSetupLine::Parse(char *s)
+{
+  char *p = strchr(s, '=');
+  if (p) {
+     *p = 0;
+     char *Name  = compactspace(s);
+     char *Value = compactspace(p + 1);
+     if (*Name && *Value) {
+        p = strchr(Name, '.');
+        if (p) {
+           *p = 0;
+           char *Plugin = compactspace(Name);
+           Name = compactspace(p + 1);
+           if (!(*Plugin && *Name))
+              return false;
+           plugin = strdup(Plugin);
+           }
+        name = strdup(Name);
+        value = strdup(Value);
+        return true;
+        }
+     }
+  return false;
+}
+
+bool cSetupLine::Save(FILE *f)
+{
+  return fprintf(f, "%s%s%s = %s\n", plugin ? plugin : "", plugin ? "." : "", name, value) > 0;
+}
+
 // -- cSetup -----------------------------------------------------------------
 
 cSetup Setup;
 
-char *cSetup::fileName = NULL;
-
 cSetup::cSetup(void)
 {
   OSDLanguage = 0;
@@ -930,6 +997,7 @@ cSetup::cSetup(void)
   MenuScrollPage = 1;
   MarkInstantRecord = 1;
   strcpy(NameInstantRecord, "TITLE EPISODE");
+  InstantRecordTime = 180;
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
@@ -964,19 +1032,77 @@ cSetup::cSetup(void)
   CurrentVolume = MAXVOLUME;
 }
 
-void cSetup::PrintCaCaps(FILE *f, const char *Name)
+cSetup& cSetup::operator= (const cSetup &s)
+{
+  memcpy(&__BeginData__, &s.__BeginData__, (char *)&s.__EndData__ - (char *)&s.__BeginData__);
+  return *this;
+}
+
+cSetupLine *cSetup::Get(const char *Name, const char *Plugin)
+{
+  for (cSetupLine *l = First(); l; l = Next(l)) {
+      if ((l->Plugin() == NULL) == (Plugin == NULL)) {
+         if ((!Plugin || strcasecmp(l->Plugin(), Plugin) == 0) && strcasecmp(l->Name(), Name) == 0)
+            return l;
+         }
+      }
+  return NULL;
+}
+
+void cSetup::Store(const char *Name, const char *Value, const char *Plugin)
+{
+  if (Name && *Name) {
+     cSetupLine *l = Get(Name, Plugin);
+     if (l)
+        Del(l);
+     if (Value)
+        Add(new cSetupLine(Name, Value, Plugin));
+     }
+}
+
+void cSetup::Store(const char *Name, int Value, const char *Plugin)
+{
+  char *buffer = NULL;
+  asprintf(&buffer, "%d", Value);
+  Store(Name, buffer, Plugin);
+  delete buffer;
+}
+
+bool cSetup::Load(const char *FileName)
+{
+  if (cConfig<cSetupLine>::Load(FileName, true)) {
+     bool result = true;
+     for (cSetupLine *l = First(); l; l = Next(l)) {
+         if (l->Plugin()) {
+            cPlugin *p = cPluginManager::GetPlugin(l->Plugin());
+            if (p && !p->SetupParse(l->Name(), l->Value()))
+               result = false;
+            }
+         else {
+            if (!Parse(l->Name(), l->Value()))
+               result = false;
+            }
+         }
+     return result;
+     }
+  return false;
+}
+
+void cSetup::StoreCaCaps(const char *Name)
 {
   for (int d = 0; d < MAXDVBAPI; d++) {
-      int written = 0;
+      char buffer[MAXPARSEBUFFER];
+      char *q = buffer;
+      *buffer = 0;
       for (int i = 0; i < MAXCACAPS; i++) {
           if (CaCaps[d][i]) {
-             if (!written++)
-                fprintf(f, "CaCaps             = %d", d + 1);
-             fprintf(f, " %d", CaCaps[d][i]);
+             if (!*buffer)
+                q += snprintf(buffer, sizeof(buffer), "%d", d + 1);
+             q += snprintf(q, sizeof(buffer) - (q - buffer), " %d", CaCaps[d][i]);
              }
           }
-      if (written)
-         fprintf(f, "\n");
+      if (*buffer)
+         Store(Name, buffer);
       }
 }
 
@@ -1003,142 +1129,99 @@ bool cSetup::ParseCaCaps(const char *Value)
   return false;
 }
 
-bool cSetup::Parse(char *s)
-{
-  char *p = strchr(s, '=');
-  if (p) {
-     *p = 0;
-     char *Name  = compactspace(s);
-     char *Value = compactspace(p + 1);
-     if (*Name && *Value) {
-        if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
-        else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
-        else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
-        else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
-        else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
-        else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
-        else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
-        else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
-        else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
-        else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
-        else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
-        else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
-        else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
-        else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
-        else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
-        else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
-        else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
-        else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
-        else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
-        else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
-        else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
-        else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
-        else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
-        else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
-        else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
-        else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
-        else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
-        else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
-        else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
-        else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
-        else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
-        else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
-        else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
-        else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
-        else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
-        else if (!strcasecmp(Name, "CaCaps"))              return ParseCaCaps(Value);
-        else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
-        else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
-        else
-           return false;
-        return true;
-        }
-     }
-  return false;
-}
-
-bool cSetup::Load(const char *FileName)
-{
-  isyslog(LOG_INFO, "loading %s", FileName);
-  delete fileName;
-  fileName = strdup(FileName);
-  FILE *f = fopen(fileName, "r");
-  if (f) {
-     int line = 0;
-     char buffer[MAXPARSEBUFFER];
-     bool result = true;
-     while (fgets(buffer, sizeof(buffer), f) > 0) {
-           line++;
-           stripspace(buffer);
-           if (!isempty(buffer)) {
-              if (*buffer != '#' && !Parse(buffer)) {
-                 esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
-                 result = false;
-                 }
-              }
-           }
-     fclose(f);
-     return result;
-     }
+bool cSetup::Parse(const char *Name, const char *Value)
+{
+  if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
+  else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
+  else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
+  else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
+  else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
+  else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
+  else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
+  else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
+  else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
+  else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
+  else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
+  else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
+  else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
+  else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
+  else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
+  else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
+  else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
+  else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
+  else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
+  else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
+  else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
+  else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+  else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
+  else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
+  else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
+  else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
+  else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
+  else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
+  else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
+  else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
+  else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
+  else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
+  else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
+  else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
+  else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
+  else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
+  else if (!strcasecmp(Name, "CaCaps"))              return ParseCaCaps(Value);
+  else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
+  else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
   else
-     LOG_ERROR_STR(FileName);
-  return false;
+     return false;
+  return true;
 }
 
-bool cSetup::Save(const char *FileName)
-{
-  if (!FileName)
-     FileName = fileName;
-  if (FileName) {
-     cSafeFile f(FileName);
-     if (f.Open()) {
-        fprintf(f, "# VDR Setup\n");
-        fprintf(f, "OSDLanguage        = %d\n", OSDLanguage);
-        fprintf(f, "PrimaryDVB         = %d\n", PrimaryDVB);
-        fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
-        fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
-        fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
-        fprintf(f, "NameInstantRecord  = %s\n", NameInstantRecord);
-        fprintf(f, "LnbSLOF            = %d\n", LnbSLOF);
-        fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
-        fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
-        fprintf(f, "DiSEqC             = %d\n", DiSEqC);
-        fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
-        fprintf(f, "TimeTransponder    = %d\n", TimeTransponder);
-        fprintf(f, "MarginStart        = %d\n", MarginStart);
-        fprintf(f, "MarginStop         = %d\n", MarginStop);
-        fprintf(f, "EPGScanTimeout     = %d\n", EPGScanTimeout);
-        fprintf(f, "EPGBugfixLevel     = %d\n", EPGBugfixLevel);
-        fprintf(f, "SVDRPTimeout       = %d\n", SVDRPTimeout);
-        fprintf(f, "SortTimers         = %d\n", SortTimers);
-        fprintf(f, "PrimaryLimit       = %d\n", PrimaryLimit);
-        fprintf(f, "DefaultPriority    = %d\n", DefaultPriority);
-        fprintf(f, "DefaultLifetime    = %d\n", DefaultLifetime);
-        fprintf(f, "UseSubtitle        = %d\n", UseSubtitle);
-        fprintf(f, "RecordingDirs      = %d\n", RecordingDirs);
-        fprintf(f, "VideoFormat        = %d\n", VideoFormat);
-        fprintf(f, "RecordDolbyDigital = %d\n", RecordDolbyDigital);
-        fprintf(f, "ChannelInfoPos     = %d\n", ChannelInfoPos);
-        fprintf(f, "OSDwidth           = %d\n", OSDwidth);
-        fprintf(f, "OSDheight          = %d\n", OSDheight);
-        fprintf(f, "OSDMessageTime     = %d\n", OSDMessageTime);
-        fprintf(f, "MaxVideoFileSize   = %d\n", MaxVideoFileSize);
-        fprintf(f, "SplitEditedFiles   = %d\n", SplitEditedFiles);
-        fprintf(f, "MinEventTimeout    = %d\n", MinEventTimeout);
-        fprintf(f, "MinUserInactivity  = %d\n", MinUserInactivity);
-        fprintf(f, "MultiSpeedMode     = %d\n", MultiSpeedMode);
-        fprintf(f, "ShowReplayMode     = %d\n", ShowReplayMode);
-        PrintCaCaps(f, "CaCaps");
-        fprintf(f, "CurrentChannel     = %d\n", CurrentChannel);
-        fprintf(f, "CurrentVolume      = %d\n", CurrentVolume);
-        if (f.Close()) {
-           isyslog(LOG_INFO, "saved setup to %s", FileName);
-           return true;
-           }
-        }
+bool cSetup::Save(void)
+{
+  Store("OSDLanguage",        OSDLanguage);
+  Store("PrimaryDVB",         PrimaryDVB);
+  Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch);
+  Store("MenuScrollPage",     MenuScrollPage);
+  Store("MarkInstantRecord",  MarkInstantRecord);
+  Store("NameInstantRecord",  NameInstantRecord);
+  Store("InstantRecordTime",  InstantRecordTime);
+  Store("LnbSLOF",            LnbSLOF);
+  Store("LnbFrequLo",         LnbFrequLo);
+  Store("LnbFrequHi",         LnbFrequHi);
+  Store("DiSEqC",             DiSEqC);
+  Store("SetSystemTime",      SetSystemTime);
+  Store("TimeTransponder",    TimeTransponder);
+  Store("MarginStart",        MarginStart);
+  Store("MarginStop",         MarginStop);
+  Store("EPGScanTimeout",     EPGScanTimeout);
+  Store("EPGBugfixLevel",     EPGBugfixLevel);
+  Store("SVDRPTimeout",       SVDRPTimeout);
+  Store("SortTimers",         SortTimers);
+  Store("PrimaryLimit",       PrimaryLimit);
+  Store("DefaultPriority",    DefaultPriority);
+  Store("DefaultLifetime",    DefaultLifetime);
+  Store("UseSubtitle",        UseSubtitle);
+  Store("RecordingDirs",      RecordingDirs);
+  Store("VideoFormat",        VideoFormat);
+  Store("RecordDolbyDigital", RecordDolbyDigital);
+  Store("ChannelInfoPos",     ChannelInfoPos);
+  Store("OSDwidth",           OSDwidth);
+  Store("OSDheight",          OSDheight);
+  Store("OSDMessageTime",     OSDMessageTime);
+  Store("MaxVideoFileSize",   MaxVideoFileSize);
+  Store("SplitEditedFiles",   SplitEditedFiles);
+  Store("MinEventTimeout",    MinEventTimeout);
+  Store("MinUserInactivity",  MinUserInactivity);
+  Store("MultiSpeedMode",     MultiSpeedMode);
+  Store("ShowReplayMode",     ShowReplayMode);
+  StoreCaCaps("CaCaps");
+  Store("CurrentChannel",     CurrentChannel);
+  Store("CurrentVolume",      CurrentVolume);
+
+  Sort();
+
+  if (cConfig<cSetupLine>::Save()) {
+     isyslog(LOG_INFO, "saved setup to %s", FileName());
+     return true;
      }
-  else
-     esyslog(LOG_ERR, "attempt to save setup without file name");
   return false;
 }
-
diff --git a/config.h b/config.h
index 00774b08f..3949dde7e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.109 2002/04/07 13:08:12 kls Exp $
+ * $Id: config.h 1.113 2002/05/04 14:29:29 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.0.0"
+#define VDRVERSION "1.1.0"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -149,7 +149,7 @@ class cTimer : public cListObject {
   cTimer(const cEventInfo *EventInfo);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
-  bool operator< (const cTimer &Timer);
+  virtual bool operator< (const cListObject &ListObject);
   const char *ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
@@ -220,7 +220,8 @@ template<class T> class cConfig : public cList<T> {
 public:
   cConfig(void) { fileName = NULL; }
   virtual ~cConfig() { delete fileName; }
-  virtual bool Load(const char *FileName, bool AllowComments = false)
+  const char *FileName(void) { return fileName; }
+  bool Load(const char *FileName, bool AllowComments = false)
   {
     Clear();
     fileName = strdup(FileName);
@@ -323,20 +324,42 @@ extern cCommands Commands;
 extern cSVDRPhosts SVDRPhosts;
 extern cCaDefinitions CaDefinitions;
 
-class cSetup {
+class cSetupLine : public cListObject {
 private:
-  static char *fileName;
-  void PrintCaCaps(FILE *f, const char *Name);
-  bool ParseCaCaps(const char *Value);
+  char *plugin;
+  char *name;
+  char *value;
+public:
+  cSetupLine(void);
+  cSetupLine(const char *Name, const char *Value, const char *Plugin = NULL);
+  virtual ~cSetupLine();
+  virtual bool operator< (const cListObject &ListObject);
+  const char *Plugin(void) { return plugin; }
+  const char *Name(void) { return name; }
+  const char *Value(void) { return value; }
   bool Parse(char *s);
+  bool Save(FILE *f);
+  };
+
+class cSetup : public cConfig<cSetupLine> {
+  friend class cPlugin; // needs to be able to call Store()
+private:
+  void StoreCaCaps(const char *Name);
+  bool ParseCaCaps(const char *Value);
+  bool Parse(const char *Name, const char *Value);
+  cSetupLine *Get(const char *Name, const char *Plugin = NULL);
+  void Store(const char *Name, const char *Value, const char *Plugin = NULL);
+  void Store(const char *Name, int Value, const char *Plugin = NULL);
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
+  int __BeginData__;
   int OSDLanguage;
   int PrimaryDVB;
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
   int MarkInstantRecord;
   char NameInstantRecord[MaxFileName];
+  int InstantRecordTime;
   int LnbSLOF;
   int LnbFrequLo;
   int LnbFrequHi;
@@ -365,9 +388,11 @@ class cSetup {
   int CaCaps[MAXDVBAPI][MAXCACAPS];
   int CurrentChannel;
   int CurrentVolume;
+  int __EndData__;
   cSetup(void);
+  cSetup& operator= (const cSetup &s);
   bool Load(const char *FileName);
-  bool Save(const char *FileName = NULL);
+  bool Save(void);
   };
 
 extern cSetup Setup;
diff --git a/dvbapi.c b/dvbapi.c
index 9d59d900e..77e537269 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.170 2002/04/07 09:35:51 kls Exp $
+ * $Id: dvbapi.c 1.174 2002/05/03 15:59:32 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -279,8 +279,7 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
 int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
 {
   if (index) {
-     if (Forward)
-        CatchUp();
+     CatchUp();
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
@@ -533,6 +532,8 @@ void cRecordBuffer::Input(void)
                   int w = Put(p, r);
                   p += w;
                   r -= w;
+                  if (r > 0)
+                     usleep(1); // this keeps the CPU load low
                   }
             t = time(NULL);
             }
@@ -1810,21 +1811,24 @@ bool cDvbApi::SetPrimaryDvbApi(int n)
   return false;
 }
 
-int cDvbApi::CanShift(int Ca, int Priority)
+int cDvbApi::CanShift(int Ca, int Priority, int UsedCards)
 {
   // Test whether a recording on this DVB device can be shifted to another one
   // in order to perform a new recording with the given Ca and Priority on this device:
   int ShiftLevel = -1; // default means this device can't be shifted
+  if (UsedCards & (1 << CardIndex()) != 0)
+     return ShiftLevel; // otherwise we would get into a loop
   if (Recording()) {
      if (ProvidesCa(Ca) // this device provides the requested Ca
         && (Ca != this->Ca() // the requested Ca is different from the one currently used...
            || Priority > this->Priority())) { // ...or the request comes from a higher priority
         cDvbApi *d = NULL;
         int Provides[MAXDVBAPI];
+        UsedCards |= (1 << CardIndex());
         for (int i = 0; i < NumDvbApis; i++) {
             if ((Provides[i] = dvbApi[i]->ProvidesCa(this->Ca())) != 0) { // this device is basicly able to do the job
                if (dvbApi[i] != this) { // it is not _this_ device
-                  int sl = dvbApi[i]->CanShift(this->Ca(), Priority); // this is the original Priority!
+                  int sl = dvbApi[i]->CanShift(this->Ca(), Priority, UsedCards); // this is the original Priority!
                   if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
                      d = dvbApi[i];
                      ShiftLevel = sl;
@@ -2301,16 +2305,17 @@ bool cDvbApi::SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output)
 {
   if (Pid) {
      CHECK(ioctl(fd, DMX_STOP));
-     dmxPesFilterParams pesFilterParams;
-     pesFilterParams.pid     = Pid;
-     pesFilterParams.input   = DMX_IN_FRONTEND;
-     pesFilterParams.output  = Output;
-     pesFilterParams.pesType = PesType;
-     pesFilterParams.flags   = DMX_IMMEDIATE_START;
-     if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-        if (Pid != 0x1FFF)
+     if (Pid != 0x1FFF) {
+        dmxPesFilterParams pesFilterParams;
+        pesFilterParams.pid     = Pid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = Output;
+        pesFilterParams.pesType = PesType;
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
            LOG_ERROR;
-        return false;
+           return false;
+           }
         }
      }
   return true;
diff --git a/dvbapi.h b/dvbapi.h
index e9cf8c83a..7e638786b 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.68 2002/03/10 10:50:00 kls Exp $
+ * $Id: dvbapi.h 1.69 2002/04/21 09:49:22 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -104,7 +104,7 @@ class cDvbApi {
   static int useDvbApi;
   int cardIndex;
   int caCaps[MAXCACAPS];
-  int CanShift(int Ca, int Priority);
+  int CanShift(int Ca, int Priority, int UsedCards = 0);
 public:
   static cDvbApi *PrimaryDvbApi;
   static void SetUseDvbApi(int n);
diff --git a/dvbosd.c b/dvbosd.c
index c34843005..eb962613b 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.12 2002/01/13 16:25:18 kls Exp $
+ * $Id: dvbosd.c 1.13 2002/04/13 11:34:48 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -25,6 +25,9 @@ cPalette::cPalette(int Bpp)
 
 int cPalette::Index(eDvbColor Color)
 {
+#if __BYTE_ORDER == __BIG_ENDIAN
+  Color = eDvbColor(((Color & 0xFF) << 24) | ((Color & 0xFF00) << 8) | ((Color & 0xFF0000) >> 8) | ((Color & 0xFF000000) >> 24));
+#endif
   for (int i = 0; i < numColors; i++) {
       if (color[i] == Color) {
          used[i] = true;
diff --git a/i18n.c b/i18n.c
index 0b22f1ddc..4129cf7ae 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,26 +4,29 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.79 2002/04/06 09:49:19 kls Exp $
+ * $Id: i18n.c 1.87 2002/05/09 13:40:51 kls Exp $
  *
- * Slovenian  translations provided by Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
- * Italian    translations provided by Alberto Carraro <bertocar@tin.it>
- * Dutch      translations provided by Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
- * Portuguese translations provided by Paulo Lopes <pmml@netvita.pt>
- * French     translations provided by Jean-Claude Repetto <jc@repetto.org>
- * Norwegian  translations provided by J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
- * Finnish    translations provided by Hannu Savolainen <hannu@opensound.com>
- * Polish     translations provided by Michael Rakowski <mrak@gmx.de>
- * Spanish    translations provided by Ruben Nunez Francisco <ruben.nunez@tang-it.com>
+ * Translations provided by:
+ *
+ * Slovenian   Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
+ * Italian     Alberto Carraro <bertocar@tin.it>
+ * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
+ * Portuguese  Paulo Lopes <pmml@netvita.pt>
+ * French      Jean-Claude Repetto <jc@repetto.org>
+ * Norwegian   J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
+ * Finnish     Hannu Savolainen <hannu@opensound.com>
+ * Polish      Michael Rakowski <mrak@gmx.de>
+ * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
+ * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
  *
  */
 
 /*
  * How to add a new language:
  *
- * 1. Announce your translation action on the Linux-DVB mailing
+ * 1. Announce your translation action on the VDR mailing
  *    list to avoid duplicate work.
- * 2. Increase the value of 'NumLanguages'.
+ * 2. Increase the value of 'I18nNumLanguages' in 'i18n.h'.
  * 3. Insert a new line in every member of the 'Phrases[]' array,
  *    containing the translated text for the new language.
  *    For example, assuming you want to add the Italian language,
@@ -45,7 +48,7 @@
  *    Note that only the characters defined in 'fontosd.c' will
  *    be available!
  * 4. Compile VDR and test the new language by switching to it
- *    in the "Setup" menu.
+ *    in the "Setup/OSD" menu.
  * 5. Send the modified 'i18n.c' file to <kls@cadsoft.de> to have
  *    it included in the next version of VDR.
  *
@@ -59,15 +62,10 @@
  */
 
 #include "i18n.h"
-#include <stdio.h>
 #include "config.h"
 #include "tools.h"
 
-const int NumLanguages = 11;
-
-typedef const char *tPhrase[NumLanguages];
-
-const tPhrase Phrases[] = {
+const tI18nPhrase Phrases[] = {
   // The name of the language (this MUST be the first phrase!):
   { "English",
     "Deutsch",
@@ -80,6 +78,7 @@ const tPhrase Phrases[] = {
     "Suomi",
     "Polski",
     "Espa�ol",
+    "Ellinika",
   },
   // Menu titles:
   { "VDR",
@@ -93,6 +92,7 @@ const tPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -105,6 +105,7 @@ const tPhrase Phrases[] = {
     "Ohjelmat",
     "Program",
     "Programa",
+    "Programma",
   },
   { "Channels",
     "Kan�le",
@@ -117,6 +118,7 @@ const tPhrase Phrases[] = {
     "Kanavat",
     "Kanaly",
     "Canales",
+    "Kanalia",
   },
   { "Timers",
     "Timer",
@@ -129,6 +131,7 @@ const tPhrase Phrases[] = {
     "Ajastin",
     "Timery",
     "Timer",
+    "Programmatismos",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -141,6 +144,7 @@ const tPhrase Phrases[] = {
     "Nauhoitteet",
     "Nagrania",
     "Grabaciones",
+    "Egrafes",
   },
   { "Setup",
     "Einstellungen",
@@ -153,6 +157,7 @@ const tPhrase Phrases[] = {
     "Asetukset",
     "Nastawy",
     "Configuraci�n",
+    "Rithmisis",
   },
   { "Commands",
     "Befehle",
@@ -165,6 +170,7 @@ const tPhrase Phrases[] = {
     "Komennot",
     "Rozkazy",
     "�rdenes",
+    "Entoles",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -177,6 +183,7 @@ const tPhrase Phrases[] = {
     "Muokkaa kanavaa",
     "Ustawienie kanalu",
     "Modificar canal",
+    "Prosarmoges kanaliou",
   },
   { "Edit timer",
     "Timer editieren",
@@ -189,6 +196,7 @@ const tPhrase Phrases[] = {
     "Muokkaa ajastusta",
     "Ustawienie timerow",
     "Modificar timer",
+    "Prosarmoges programmatismou",
   },
   { "Event",
     "Sendung",
@@ -201,6 +209,7 @@ const tPhrase Phrases[] = {
     "Tapahtuma",
     "Audycja",
     "Evento",
+    "Ekpompi",
   },
   { "Summary",
     "Inhalt",
@@ -213,6 +222,7 @@ const tPhrase Phrases[] = {
     "Yhteenveto",
     "Zawartosc",
     "Res�men",
+    "Periexomeno",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -225,6 +235,7 @@ const tPhrase Phrases[] = {
     "Ohjelma - %s",
     "Program - %s",
     "Programa - %s",
+    "Programma - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -237,6 +248,7 @@ const tPhrase Phrases[] = {
     "Nykyinen ohjelma",
     "Program biezacy",
     "�Qu� hay ahora?",
+    "Ti pezi tora",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -249,6 +261,7 @@ const tPhrase Phrases[] = {
     "Seuraava ohjelma",
     "Program nastepny",
     "�Qu� hay proximo?",
+    "Ti tha peksi meta",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -262,6 +275,7 @@ const tPhrase Phrases[] = {
     "Muuta",
     "Edycja",
     "Modificar",
+    "Prosarmogi",
   },
   { "New",
     "Neu",
@@ -274,6 +288,7 @@ const tPhrase Phrases[] = {
     "Uusi",
     "Nowy",
     "Nuevo",
+    "Neo",
   },
   { "Delete",
     "L�schen",
@@ -286,6 +301,7 @@ const tPhrase Phrases[] = {
     "Poista",
     "Usunac",
     "Borrar",
+    "Swisimo",
   },
   { "Mark",
     "Markieren",
@@ -298,6 +314,7 @@ const tPhrase Phrases[] = {
     "Merkitse",
     "Zaznaczyc",
     "Marcar",
+    "Markarisma",
   },
   { "On/Off",
     "Ein/Aus",
@@ -310,6 +327,7 @@ const tPhrase Phrases[] = {
     "P��ll�/Pois",
     "Zal./ Wyl.",
     "On/Off",
+    "Energo/Klisto",
   },
   { "Record",
     "Aufnehmen",
@@ -322,6 +340,7 @@ const tPhrase Phrases[] = {
     "Nauhoita",
     "Nagrywac",
     "Grabar",
+    "Egrafi",
   },
   { "Play",
     "Wiedergabe",
@@ -334,6 +353,7 @@ const tPhrase Phrases[] = {
     "Toista",
     "Odtwarzac",
     "Play",
+    "Anametadosi",
   },
   { "Rewind",
     "Anfang",
@@ -346,6 +366,7 @@ const tPhrase Phrases[] = {
     "Takaisinkel.",
     "Poczatek",
     "Rebobinar",
+    "Arxi",
   },
   { "Button$Stop",
     "Beenden",
@@ -358,6 +379,7 @@ const tPhrase Phrases[] = {
     "Pys�yt�",
     "Zakonczyc",
     "Parar",
+    "Terma",
   },
   { "Resume",
     "Weiter",
@@ -370,6 +392,7 @@ const tPhrase Phrases[] = {
     "Jatka",
     "Dalej",
     "Continuar",
+    "Sinexia",
   },
   { "Summary",
     "Inhalt",
@@ -382,6 +405,7 @@ const tPhrase Phrases[] = {
     "Yhteenveto",
     "Zawartosc",
     "Resumen",
+    "Periexomeno",
   },
   { "Open",
     "�ffnen",
@@ -394,6 +418,7 @@ const tPhrase Phrases[] = {
     "Avaa",
     "Otworzyc",
     "Abrir",
+    "Anigma",
   },
   { "Switch",
     "Umschalten",
@@ -406,6 +431,7 @@ const tPhrase Phrases[] = {
     "Valitse",
     "Przelaczyc",
     "Cambiar",
+    "Alagi",
   },
   { "Now",
     "Jetzt",
@@ -418,6 +444,7 @@ const tPhrase Phrases[] = {
     "Nyt",
     "Teraz",
     "Ahora",
+    "Tora",
   },
   { "Next",
     "N�chste",
@@ -430,6 +457,7 @@ const tPhrase Phrases[] = {
     "Seuraava",
     "Nastepny",
     "Siguiente",
+    "Epomeno",
   },
   { "Button$Schedule",
     "Programm",
@@ -442,6 +470,7 @@ const tPhrase Phrases[] = {
     "Ohjelmisto",
     "Program",
     "Programa",
+    "Programma",
   },
   { "Language",
     "Sprache",
@@ -454,6 +483,7 @@ const tPhrase Phrases[] = {
     "Kieli",
     "Jezyk",
     "Lengua",
+    "Glosa",
   },
   { "Eject",
     "Auswerfen",
@@ -466,6 +496,46 @@ const tPhrase Phrases[] = {
     "Avaa",
     "Wyrzucenie",
     "Eyectar",
+    "Apovoli",
+  },
+  { "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
+  },
+  { "Insert",
+    "Einf�gen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Isodos",
+  },
+  { "Overwrite",
+    "�berschreiben",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Epanagrafi",
   },
   // Confirmations:
   { "Delete channel?",
@@ -479,6 +549,7 @@ const tPhrase Phrases[] = {
     "Poistetaanko kanava?",
     "Usunac kanal?",
     "�Eliminar canal?",
+    "Na sviso to kanali?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -491,6 +562,7 @@ const tPhrase Phrases[] = {
     "Poistetaanko ajastus?",
     "Usunac timer?",
     "�Eliminar timer?",
+    "Svisimo tou programmitismou?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -503,18 +575,20 @@ const tPhrase Phrases[] = {
     "Poistetaanko nauhoitus?",
     "Usunac nagranie?",
     "�Eliminar grabacion?",
+    "Svisimo tis egrafis?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
     "Snemanje po terminu - zares odstrani?",
     "Timer in regestazione - cancello?",
-    "Timer neemt nog op - toch verwijderen?"
+    "Timer neemt nog op - toch verwijderen?",
     "Timer activo - t�m a certeza que quer apagar?",
     "Enregistrement en cours - confirmez la suppression",
     "Timer gj�r opptak - vil du slette likevel?",
     "Ajastin nauhoittaa - poistetaanko silti?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
+    "Ginete akoma programmatismeni egrafi - na svisti sigoura?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -527,6 +601,7 @@ const tPhrase Phrases[] = {
     "Pys�ytet��nk� nauhoitus?",
     "Zakonczyc nagranie?",
     "�Parar grabaci�n?",
+    "Akirosi egrafis?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -539,6 +614,7 @@ const tPhrase Phrases[] = {
     "p��vastaanottimella",
     "na pierwszym interfejsie",
     "en interface primario",
+    "stin protevon karta",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -551,6 +627,7 @@ const tPhrase Phrases[] = {
     "Peruutetaanko muokkaus?",
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
+    "Akirosi alagon?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -563,6 +640,7 @@ const tPhrase Phrases[] = {
     "Aloitetaanko varmasti alusta?",
     "Rzeczywiscie nowy start?",
     "�De verdad reiniciar?",
+    "Na gini sigoura epanekinisi?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -575,6 +653,7 @@ const tPhrase Phrases[] = {
     "Nauhoitus k�ynniss� - aloitetaanko alusta?",
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
     "�Grabando - reiniciar?",
+    "Ginete egrafi - na gini epanekinisi sigoura?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -587,6 +666,7 @@ const tPhrase Phrases[] = {
     "Nauhoitus kesken - lopetetaanko se?",
     "Nagrywanie w trakcie - mimo to wylaczyc?",
     "�Grabando - apagar?",
+    "Ginete egrafi - na stamatisi i litourgia sigoura?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -599,6 +679,7 @@ const tPhrase Phrases[] = {
     "Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
     "�Grabando en %d minutos, de verdad cortar?",
+    "Anamenete egrafi se %d lepta - na stamatisi i litourgia sigoura?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -611,6 +692,7 @@ const tPhrase Phrases[] = {
     "Peruuta pys�ytys painamalla jotakin n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
     "Pulse una tecla para interrumpir corte",
+    "Piese ena pliktro na stamatisi to katevasma",
   },
   // Channel parameters:
   { "Name",
@@ -624,6 +706,7 @@ const tPhrase Phrases[] = {
     "Nimi",
     "Nazwa",
     "Nombre",
+    "Onoma",
   },
   { "Frequency",
     "Frequenz",
@@ -636,6 +719,7 @@ const tPhrase Phrases[] = {
     "Taajuus",
     "Czestotliwosc",
     "Frecuencia",
+    "Sixnotita",
   },
   { "Polarization",
     "Polarisation",
@@ -648,6 +732,7 @@ const tPhrase Phrases[] = {
     "Polarisaatio",
     "Polaryzacja",
     "Polarizaci�n",
+    "Polosi",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -660,6 +745,7 @@ const tPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -672,6 +758,7 @@ const tPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -684,6 +771,7 @@ const tPhrase Phrases[] = {
     "Kuva PID",
     "Vpid",
     "Vpid",
+    "Vpid",
   },
   { "Apid1",
     "Apid1",
@@ -696,6 +784,7 @@ const tPhrase Phrases[] = {
     "��ni PID1",
     "Apid1",
     "Apid1",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -708,6 +797,7 @@ const tPhrase Phrases[] = {
     "��ni PID2",
     "Apid2",
     "Apid2",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -720,6 +810,7 @@ const tPhrase Phrases[] = {
     "AC3 PID1",
     "Dpid1",
     "Dpid1",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -732,6 +823,7 @@ const tPhrase Phrases[] = {
     "AC3 PID2",
     "Dpid2",
     "Dpid2",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -744,6 +836,7 @@ const tPhrase Phrases[] = {
     "TekstiTV PID",
     "Tpid",
     "Tpid",
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -756,6 +849,7 @@ const tPhrase Phrases[] = {
     "Salauskortti",
     "CA",
     "CA",
+    "CA",
   },
   { "Pnr",
     "Pnr",
@@ -768,6 +862,7 @@ const tPhrase Phrases[] = {
     "Ohjelmatunnus",
     "Pnr",
     "Pnr",
+    "Pnr",
   },
   // Timer parameters:
   { "Active",
@@ -781,6 +876,7 @@ const tPhrase Phrases[] = {
     "Aktiivinen",
     "Aktywny",
     "Activo",
+    "Energo",
   },
   { "Channel",
     "Kanal",
@@ -793,6 +889,7 @@ const tPhrase Phrases[] = {
     "Kanava",
     "Kanal",
     "Canal",
+    "Kanali",
   },
   { "Day",
     "Tag",
@@ -805,6 +902,7 @@ const tPhrase Phrases[] = {
     "P�iv�",
     "Dzien",
     "D�a",
+    "Imera",
   },
   { "Start",
     "Anfang",
@@ -817,6 +915,7 @@ const tPhrase Phrases[] = {
     "Aloitus",
     "Poczatek",
     "Comienzo",
+    "Arxi",
   },
   { "Stop",
     "Ende",
@@ -829,6 +928,7 @@ const tPhrase Phrases[] = {
     "Lopetus",
     "Koniec",
     "Fin",
+    "Telos",
   },
   { "Priority",
     "Priorit�t",
@@ -841,6 +941,7 @@ const tPhrase Phrases[] = {
     "Prioriteetti",
     "Priorytet",
     "Prioridad",
+    "Protereotita",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -853,6 +954,7 @@ const tPhrase Phrases[] = {
     "Voimassaolo",
     "Trwalosc dni",
     "Durabilidad",
+    "Xronos Zois",
   },
   { "File",
     "Datei",
@@ -865,6 +967,7 @@ const tPhrase Phrases[] = {
     "Tiedosto",
     "Plik",
     "Fichero",
+    "Arxeio",
   },
   { "First day",
     "Erster Tag",
@@ -877,6 +980,7 @@ const tPhrase Phrases[] = {
     "1. p�iv�",
     "Pierwszy dzien",
     "Primer d�a",
+    "Proti mera",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -890,6 +994,7 @@ const tPhrase Phrases[] = {
     "Kanava on ajastimen k�yt�ss�!",
     "Kanal jest zajety przez timer nagran",
     "�Canal est� ocupado por un timer!",
+    "To kanali xrisimopiite apo programmatismeni thesi",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -902,6 +1007,7 @@ const tPhrase Phrases[] = {
     "Kanavan vaihtaminen ei mahdollista!",
     "Kanal nie moze byc teraz przelaczony!",
     "�No puedo cambiar canal!",
+    "Den mporo na pao sto kanali!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -914,6 +1020,7 @@ const tPhrase Phrases[] = {
     "Ajastinnauhoitus k�ynniss�!",
     "Timer nagrywa!",
     "�Timer esta grabando!",
+    "Ginete progrmamatismeni egrafi!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -926,6 +1033,7 @@ const tPhrase Phrases[] = {
     "Nauhoituksen toistaminen ep�onnistui!",
     "Blad - brak dostepu do nagrania!",
     "�Error al accesar la grabaci�n!",
+    "Lathos stin evresi tis egrafis!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -938,6 +1046,7 @@ const tPhrase Phrases[] = {
     "Nauhoituksen poistaminen ep�onnistui!",
     "Blad przy usuwaniu nagrania!",
     "�Error al borrar la grabaci�n!",
+    "Lathos stin prospathia na svisti i egrafi!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -950,6 +1059,7 @@ const tPhrase Phrases[] = {
     "*** Virheellinen kanavavalinta! ***",
     "*** Niewazny kanal ***",
     "*** Canal inv�lido ***",
+    "*** Kanali akiro ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -962,6 +1072,7 @@ const tPhrase Phrases[] = {
     "Ei vapaata vastaanotinta nauhoitusta varten!",
     "Brak wolnej karty DVB do nagrywania!",
     "�No hay dispositivo DVB disponible para grabar!",
+    "Den iparxi elevteri DVB Karta gia egrafi!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -974,6 +1085,7 @@ const tPhrase Phrases[] = {
     "Kanava lukittu (nauhoitusta varten)!",
     "Kanal zablokowany (nagrywanie w toku)!",
     "�Canal bloqueado (grabando)!",
+    "To kanali ine mplokarismeno (Ginete egrafi)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -986,6 +1098,7 @@ const tPhrase Phrases[] = {
     "K�sitt�m�tt�mi� teknisi� ongelmia!",
     "Tryb transferowy jest niemozliwy!",
     "�No puedo iniciar modo de transferencia!",
+    "Den mpori na arxisi to Transfer-Mode!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -998,6 +1111,7 @@ const tPhrase Phrases[] = {
     "Muokkauksen aloittaminen ei onnistu!",
     "Uruchamianie montazu jest niemozliwe!",
     "�No puedo iniciar proceso de modificaci�n!",
+    "Den mpori na arxisi to kopsimo tis tenias!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1010,6 +1124,7 @@ const tPhrase Phrases[] = {
     "Muokkaus on jo k�ynniss�!",
     "Montaz w toku!",
     "�Proceso de modificaci�n ya fue iniciado!",
+    "To kopsimo ti tenias ini idi se litourgia!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -1020,8 +1135,9 @@ const tPhrase Phrases[] = {
     "Arr�t impossible - option '-s' absente!",
     "Kan ikke sl� av - startet uten parameteret '-s'!",
     "Ei voida sammuttaa '-s' parametria ei annettu!",
-    "Wylaczenie niemozliwe - brak opcji '-s' !",
+    "Wylaczenie niemozliwe - brak opcji '-s'!",
     "�No puedo cortar - opci�n '-s' absente!",
+    "Den mporo na kliso ton ipologisti. Lipi i parametros '-s'!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1034,6 +1150,7 @@ const tPhrase Phrases[] = {
     "Kovalevy l�hes t�ynn�!",
     "Dysk wkrotce pelny!",
     "�Disco casi lleno",
+    "O Skliros kontevi na gemisi!",
   },
   // Setup pages:
   { "OSD",
@@ -1047,6 +1164,7 @@ const tPhrase Phrases[] = {
     "Tekstin�ytt�",
     "OSD",
     "OSD",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -1059,6 +1177,7 @@ const tPhrase Phrases[] = {
     "Ohjelmaopas",
     "EPG",
     "EPG",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -1071,6 +1190,7 @@ const tPhrase Phrases[] = {
     "DVB",
     "DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -1083,6 +1203,7 @@ const tPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -1095,6 +1216,7 @@ const tPhrase Phrases[] = {
     "CICAM",
     "CICAM",
     "CICAM",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -1107,6 +1229,7 @@ const tPhrase Phrases[] = {
     "Nauhoita",
     "Nagranie",
     "Grabaci�n",
+    "Egrafi",
   },
   { "Replay",
     "Wiedergabe",
@@ -1119,6 +1242,7 @@ const tPhrase Phrases[] = {
     "Toista",
     "Odtwarzanie",
     "Poner",
+    "Anametadosi",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -1131,6 +1255,20 @@ const tPhrase Phrases[] = {
     "Sekalaista",
     "Pozostale",
     "Varios",
+    "Diafora",
+  },
+  { "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
   },
   { "Restart",
     "Neustart",
@@ -1143,6 +1281,7 @@ const tPhrase Phrases[] = {
     "Aloita uudelleen",
     "Zastartowac",
     "Reiniciar",
+    "Epanekinisi",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -1156,6 +1295,7 @@ const tPhrase Phrases[] = {
     "Kieli",
     "Jezyk",
     "Lengua",
+    "Glosa",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -1168,6 +1308,7 @@ const tPhrase Phrases[] = {
     "Leveys",
     "Szerokosc",
     "Anchura",
+    "Makros",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -1180,6 +1321,7 @@ const tPhrase Phrases[] = {
     "Korkeus",
     "Wysokosc",
     "Altura",
+    "Ipsos",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -1192,6 +1334,7 @@ const tPhrase Phrases[] = {
     "Ilmoitusten n�kymisaika (s)",
     "Czas wyswietlania wiadomosci (s)",
     "Duraci�n muestra mensajes (s)",
+    "Xronos endiksis minimaton (d)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -1204,6 +1347,7 @@ const tPhrase Phrases[] = {
     "Kanavainfon sijainti",
     "Lokalizacja informacji o kanale",
     "Posici�n para informaci�n canal",
+    "Thesi Pliroforias kanalion",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -1216,6 +1360,7 @@ const tPhrase Phrases[] = {
     "N�yt� kanavainfo",
     "Informacja przy zmianie kanalu",
     "Informaci�n para cambio de canal",
+    "Plirofories stin alagi kanaliou",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -1228,6 +1373,7 @@ const tPhrase Phrases[] = {
     "Valikkojen rullaus",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
+    "Scroll selidas",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -1240,6 +1386,7 @@ const tPhrase Phrases[] = {
     "J�rjest� ajastimet",
     "Sortowanie timerow",
     "Ordenar timer",
+    "Organosi programmatismenon",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -1252,6 +1399,7 @@ const tPhrase Phrases[] = {
     "Nauhoitushakemistot",
     "Wykaz nagran",
     "Directorios para grabaci�n",
+    "Fakeli egrafon",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -1264,6 +1412,7 @@ const tPhrase Phrases[] = {
     "Ohjelmatied. odotusaika (h)",
     "Czas do skanu EPG (h)",
     "Tiempo hasta exploraci�n EPG (h)",
+    "Xronos mexri sarosi EPG se Ores",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -1276,6 +1425,7 @@ const tPhrase Phrases[] = {
     "EPG Bugfix Level",
     "Poziom bledow EPG",
     "Nivel para arreglar EPG",
+    "EPG Bugfix Vathmos",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -1288,6 +1438,7 @@ const tPhrase Phrases[] = {
     "Vastaanota kellonaika",
     "Ustawianie czasu",
     "Ajustar reloj de sistema",
+    "Sintonismos Oras ipologosti",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -1300,6 +1451,7 @@ const tPhrase Phrases[] = {
     "Vastaanota kellonaika l�hettimelt�",
     "Transponder do ustawiania czasu",
     "Transponder para reloj de sistema",
+    "Transponder gia sintonismo tis oras",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -1312,6 +1464,7 @@ const tPhrase Phrases[] = {
     "Ensisij. vast.otin",
     "Pierwotny interfejs DVB",
     "Primer interface DVB",
+    "Protevon DVB karta",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -1324,6 +1477,7 @@ const tPhrase Phrases[] = {
     "Kuvamuoto",
     "Format telewizyjny",
     "Formato V�deo",
+    "Video Format",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -1336,6 +1490,7 @@ const tPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -1348,6 +1503,7 @@ const tPhrase Phrases[] = {
     "LO LNB taajuus (MHz)",
     "Dolna czestotliwosc LNB (MHz)",
     "Frecuencia baja LNB (MHz)",
+    "Kato LNB-Sixnotita (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -1360,6 +1516,7 @@ const tPhrase Phrases[] = {
     "HI LNB taajuus (MHz)",
     "Gorna czestotliwosc LNB (MHz)",
     "Frecuencia alta LNB (MHz)",
+    "Ano LNB-Sixnotita (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -1372,6 +1529,7 @@ const tPhrase Phrases[] = {
     "K�yt� DiSEqC",
     "Uzywac DiSEqC",
     "Utilizar DiSEqC",
+    "Energopiisi DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -1384,6 +1542,7 @@ const tPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -1396,6 +1555,7 @@ const tPhrase Phrases[] = {
     "Aloitusmarginaali (min)",
     "Poczatkowy czas buforowy (min)",
     "Comenzar grabaci�n antes (min)",
+    "Prosthetos xronos prin arxi (lepta)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -1408,6 +1568,7 @@ const tPhrase Phrases[] = {
     "Lopetusmarginaali (min)",
     "Koncowy czas buforowy (min)",
     "Cortar grabaci�n despu�s (min)",
+    "Prosthetos xronos sto telos (lepta)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -1420,6 +1581,7 @@ const tPhrase Phrases[] = {
     "PrimaryLimit",
     "Pierwotny limit",
     "L'mite primario",
+    "Protevon limit",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -1432,6 +1594,7 @@ const tPhrase Phrases[] = {
     "Oletusprioriteetti",
     "Priorytet pierwotny",
     "Prioridad predefinida",
+    "Protereotita",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -1444,6 +1607,7 @@ const tPhrase Phrases[] = {
     "Oletus voimassaoloaika (d)",
     "Pierwotna trwalosc (d)",
     "Duraci�n predefinida",
+    "Xronos zois",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -1456,6 +1620,7 @@ const tPhrase Phrases[] = {
     "K�yt� jakson nime�",
     "Czy uzywac nazwe epizodu",
     "Utilizar nombre de episodo",
+    "Xrisimopiisi onomatos episodiou",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -1468,6 +1633,7 @@ const tPhrase Phrases[] = {
     "Merkitse v�lit�n nauh.",
     "Zaznaczyc natychm. nagranie",
     "Marcar grabaciones instant�neas",
+    "Markarisma apevthias egrafis",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -1480,6 +1646,20 @@ const tPhrase Phrases[] = {
     "Nime� v�lit�n nauh.",
     "Nazwac natychm. nagranie",
     "Nombrar grabaciones instant�neas",
+    "eponomasi apevthias egrafis",
+  },
+  { "Setup.Recording$Instant rec. time (min)",
+    "Dauer der Direktaufzeichnung (min)",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -1492,6 +1672,7 @@ const tPhrase Phrases[] = {
     "Dolby Digital nauhoitus",
     "Nagrywac Dolby Digital",
     "Grabar sonido Dolby Digital",
+    "Egrafi tou Dolby Digital ixou",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -1504,6 +1685,7 @@ const tPhrase Phrases[] = {
     "Maksimi tiedoston koko (MB)",
     "Maks. wielkosc pliku (MB)",
     "Tama�o m�x. ficheros (MB)",
+    "Megisto megethos arxeiou (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -1516,6 +1698,7 @@ const tPhrase Phrases[] = {
     "Paloittele muokatut",
     "Dzielic montowane pliki",
     "Quebrar ficheros",
+    "Diamelisma epeksergasm. arxeion",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -1528,6 +1711,7 @@ const tPhrase Phrases[] = {
     "Moninopeustila",
     "Tryb wielopredkosciowy",
     "Modo multi-velocidad",
+    "Multispeed modus",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -1540,6 +1724,7 @@ const tPhrase Phrases[] = {
     "N�yt� toiston tila",
     "Wyswietlac status odtwarzania",
     "Mostrar modo de replay",
+    "Endiksi  status anametadosis",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -1552,6 +1737,7 @@ const tPhrase Phrases[] = {
     "Minimi tapahtuman odotus (min)",
     "Min. czas do nast. akcji (Event) (min)",
     "Tiempo m�nimo pausa (min)",
+    "Elaxistos Xronos paremvolis (lepta)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -1564,18 +1750,20 @@ const tPhrase Phrases[] = {
     "Minimi k�ytt�j�n odotus (min)",
     "Min. brak aktywnosci uzytkownika (min)",
     "Tiempo m�nimo inactividad (min)",
-  },
-  { "Setup.Miscellaneous$SVDRP timeout (min)",
-    "SVDRP Timeout (min)",
-    "SVDRP Timeout (min)",
-    "Timeout SVDRP (min)",
-    "SVDRP Timeout (min)",
-    "Timeout SVDRP (min)",
-    "Temps maxi SVDRP (min)",
-    "Ubrukt SVDRP-levetid (min)",
-    "SVDRP odotusaika (min)",
-    "Min. brak aktywnosci SVDRP (min)",
-    "SVDRP interrupci�n (min)",
+    "Elaxistos xronos mi xrisis (lepta)",
+  },
+  { "Setup.Miscellaneous$SVDRP timeout (s)",
+    "SVDRP Timeout (s)",
+    "SVDRP Timeout (s)",
+    "Timeout SVDRP (s)",
+    "SVDRP Timeout (s)",
+    "Timeout SVDRP (s)",
+    "Temps maxi SVDRP (s)",
+    "Ubrukt SVDRP-levetid (s)",
+    "SVDRP odotusaika (s)",
+    "Min. brak aktywnosci SVDRP (s)",
+    "SVDRP interrupci�n (s)",
+    "SVDRP Timeout (d)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -1589,6 +1777,7 @@ const tPhrase Phrases[] = {
     "MTKTPLS",
     "PWSCPSN",
     "LMMJVSD",
+    "DTTPPSK",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -1601,6 +1790,21 @@ const tPhrase Phrases[] = {
     "MaaTiiKesTorPerLauSun",
     "PonWtoSroCzwPiaSobNie",
     "LunMarMieJueVieSabDom",
+    "DevTriTetPemParSavKir",
+  },
+  // The allowed characters in strings:
+  { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
+    " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
+    "",// TODO
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -1614,6 +1818,7 @@ const tPhrase Phrases[] = {
     "Kaukos��timen n�pp�inten opettelu",
     "Nauka kodu pilota",
     "Aprendiendo teclas del telemando",
+    "Ekmathisi Remote Control",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -1626,6 +1831,7 @@ const tPhrase Phrases[] = {
     "Vaihe 1: L�hetystavan selvitt�minen",
     "Faza 1: Detekcja typu kodu",
     "Fase 1: Detectando tipo de receptor",
+    "Phasi 1: Dilosi RC Code",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -1638,6 +1844,7 @@ const tPhrase Phrases[] = {
     "Paina mit� tahansa kaukos��timen n�pp�int�",
     "Nacisnac klawisz pilota",
     "Pulse una tecla en el telemando",
+    "Pata ena pliktro sto RC",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -1650,6 +1857,7 @@ const tPhrase Phrases[] = {
     "N�pp�inpainallus vastaanotettu!",
     "Kod pilota zostal poznany!",
     "�C�digo detectado!",
+    "Evresi RC Code!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -1662,6 +1870,7 @@ const tPhrase Phrases[] = {
     "�l� paina mit��n n�pp�int�...",
     "Nie naciskac klawiszy...",
     "No pulse tecla...",
+    "Min patas Pliktra...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -1674,6 +1883,7 @@ const tPhrase Phrases[] = {
     "Vaihe 2: N�pp�inkoodien opettelu",
     "Faza 2: Nauka pojedynczych klawiszy",
     "Fase 2: Aprendiendo c�digos espec�ficos",
+    "Fasi 2: Ekmathisi memonomenon kodikon pliktron",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -1686,6 +1896,7 @@ const tPhrase Phrases[] = {
     "Paina n�pp�int� toiminnolle '%s'",
     "Nacisnac klawisz dla '%s'",
     "Pulsar tecla para '%s'",
+    "Pata to pliktro gia '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -1698,6 +1909,7 @@ const tPhrase Phrases[] = {
     "Paina 'Yl�s' hyv�ksy�ksesi",
     "Nacisnac 'Gora' do potwierdzenia",
     "Pulse 'Arriba' para confirmar",
+    "Pata 'pano' gia apodoxi",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -1710,6 +1922,7 @@ const tPhrase Phrases[] = {
     "Paina 'Alas' jatkaaksesi",
     "Nacisnac 'Dol' zeby kontynuowac",
     "Pulse 'Abajo' para confirmar",
+    "Pata 'kato' gia sinexia",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -1722,6 +1935,7 @@ const tPhrase Phrases[] = {
     "(paina 'Yl�s' palataksesi takaisin)",
     "(Nacisnac 'Gora' cofa)",
     "(Pulse 'Arriba' para retornar)",
+    "(Pata 'pano' gia na pas piso)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -1734,6 +1948,7 @@ const tPhrase Phrases[] = {
     "(paina 'Alas' lopettaaksesi n�pp�inten opettelun)",
     "(Nacisnac 'Dol' by zakonczyc)",
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
+    "(Pata 'Kato' gia termatismo)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -1746,6 +1961,7 @@ const tPhrase Phrases[] = {
     "Vaihe 3: N�pp�inkoodien tallettaminen",
     "Faza 3: Zapamietac Kod",
     "Fase 3: Guardar c�digos de teclas",
+    "Fasi 3: Apothikevsi kodikon",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -1758,6 +1974,7 @@ const tPhrase Phrases[] = {
     "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guarder, 'Abajo' para anular",
+    "'kato' apothikevsi, 'Pano' akirosi",
   },
   // Key names:
   { "Up",
@@ -1771,6 +1988,7 @@ const tPhrase Phrases[] = {
     "Yl�s",
     "Gora",
     "Arriba",
+    "Pano",
   },
   { "Down",
     "Ab",
@@ -1783,6 +2001,7 @@ const tPhrase Phrases[] = {
     "Alas",
     "Dol",
     "Abajo",
+    "Kato",
   },
   { "Menu",
     "Men�",
@@ -1795,6 +2014,7 @@ const tPhrase Phrases[] = {
     "Valikko",
     "Menu",
     "Menu",
+    "Menou",
   },
   { "Ok",
     "Ok",
@@ -1807,6 +2027,7 @@ const tPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -1819,6 +2040,7 @@ const tPhrase Phrases[] = {
     "Takaisin",
     "Wstecz",
     "Retornar",
+    "Piso",
   },
   { "Left",
     "Links",
@@ -1831,6 +2053,7 @@ const tPhrase Phrases[] = {
     "Vasemmalle",
     "Lewo",
     "Izquierda",
+    "Aristera",
   },
   { "Right",
     "Rechts",
@@ -1843,6 +2066,7 @@ const tPhrase Phrases[] = {
     "Oikealle",
     "Prawo",
     "Derecha",
+    "Deksia",
   },
   { "Red",
     "Rot",
@@ -1855,6 +2079,7 @@ const tPhrase Phrases[] = {
     "Punainen",
     "Czerwony",
     "Rojo",
+    "Kokino",
   },
   { "Green",
     "Gr�n",
@@ -1867,6 +2092,7 @@ const tPhrase Phrases[] = {
     "Vihre�",
     "Zielony",
     "Verde",
+    "Prasino",
   },
   { "Yellow",
     "Gelb",
@@ -1879,6 +2105,7 @@ const tPhrase Phrases[] = {
     "Keltainen",
     "Zolty",
     "Amarillo",
+    "Kitrino",
   },
   { "Blue",
     "Blau",
@@ -1891,6 +2118,7 @@ const tPhrase Phrases[] = {
     "Sininen",
     "Niebieski",
     "Azul",
+    "Mple",
   },
   { "Power",
     "Ausschalten",
@@ -1903,6 +2131,7 @@ const tPhrase Phrases[] = {
     "Virtakytkin",
     "Wylaczyc",
     "Corriente",
+    "Klisimo",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -1915,6 +2144,7 @@ const tPhrase Phrases[] = {
     "��nenvoimakkuus+",
     "Glosnej",
     "Volumen+",
+    "Entasi+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -1927,6 +2157,7 @@ const tPhrase Phrases[] = {
     "��nenvoimakkuus-",
     "Ciszej",
     "Volumen-",
+    "Entasi-",
   },
   { "Mute",
     "Stumm",
@@ -1939,6 +2170,7 @@ const tPhrase Phrases[] = {
     "��nen vaimennus",
     "Cisza",
     "Mudo",
+    "Mougko",
   },
   // Miscellaneous:
   { "yes",
@@ -1952,6 +2184,7 @@ const tPhrase Phrases[] = {
     "kyll�",
     "tak",
     "s�",
+    "nai",
   },
   { "no",
     "nein",
@@ -1964,6 +2197,7 @@ const tPhrase Phrases[] = {
     "ei",
     "nie",
     "no",
+    "oxi",
   },
   { "top",
     "oben",
@@ -1976,6 +2210,7 @@ const tPhrase Phrases[] = {
     "yl�",
     "gora",
     "parte sup.",
+    "pano",
   },
   { "bottom",
     "unten",
@@ -1988,6 +2223,7 @@ const tPhrase Phrases[] = {
     "ala",
     "dol",
     "fondo",
+    "kato",
   },
   { "Disk",
     "Disk",
@@ -2000,6 +2236,7 @@ const tPhrase Phrases[] = {
     "Disk",
     "Disk",
     "Disco",
+    "Disk",
   },
   { "free",
     "frei",
@@ -2012,6 +2249,7 @@ const tPhrase Phrases[] = {
     "vapaa",
     "pozostalo",
     "libre",
+    "akoma",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -2024,6 +2262,7 @@ const tPhrase Phrases[] = {
     "Hypp��: ",
     "Skok: ",
     "Saltar: ",
+    "Pidima: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -2036,6 +2275,7 @@ const tPhrase Phrases[] = {
     "��nenvoimakkuus ",
     "Glosnosc ",
     "Volumen ",
+    "Entasi ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -2048,6 +2288,7 @@ const tPhrase Phrases[] = {
     " Pys�yt� toisto",
     " Zatrzymac odtwarzanie",
     " Parar reproduci�n",
+    " Telos anametadosis",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -2060,6 +2301,7 @@ const tPhrase Phrases[] = {
     " Pys�yt� nauhoitus ",
     " Zatrzymac nagrywanie ",
     " Parar grabaci�n ",
+    " Telos egrafis ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -2070,8 +2312,9 @@ const tPhrase Phrases[] = {
     " Annuler le montage",
     " Avbryt redigering",
     " Peruuta muokkaus",
-    " Przerwac montaz ",
-    " Anular modificaci�n ",
+    " Przerwac montaz",
+    " Anular modificaci�n",
+    " Diakopi kopsimatos",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -2080,10 +2323,11 @@ const tPhrase Phrases[] = {
     "Eerste DVB-kaart wordt omgeschakeld...",
     "A mudar interface DVB prim�rio...",
     "Changement de carte DVB primaire...",
-    "Bytter f�rste DVB-enhet..."
+    "Bytter f�rste DVB-enhet...",
     "Vaihdetaan ensisijainen vastaanotin...",
     "Pierwszy interfejs DVB przelacza...",
     "Cambio interface primario...",
+    "I protevon DVB Karta alazi...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -2096,6 +2340,7 @@ const tPhrase Phrases[] = {
     "Yl�s/Alas = liiku, OK = siirr�",
     "Gora/Dol na nowa pozycje - Ok zmienia",
     "Arriba/Abajo para nuevo lugar - OK para mover",
+    "Pano/Kato gia nea thesi. meta OK",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -2108,6 +2353,7 @@ const tPhrase Phrases[] = {
     "Muokkaus aloitettu",
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
+    "Arxi kopsimatos",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -2120,6 +2366,7 @@ const tPhrase Phrases[] = {
     "Muokkaus lopetettu",
     "Proces montazu zakonczony",
     "Proceso modificacion terminado",
+    "To kopsimo termatistike",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -2132,6 +2379,7 @@ const tPhrase Phrases[] = {
     "Muokkaus ep�onnistui!",
     "Bledny proces montazu!",
     "Modificaci�n ha fallado!",
+    "Kopsimo apetixe!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -2144,27 +2392,103 @@ const tPhrase Phrases[] = {
     "haetaan nauhoituksia...",
     "Skan nagran...",
     "buscando grabaciones...",
+    "Ginete sarosi egrafon...",
+  },
+  { "This plugin has no setup parameters!",
+    "Dieses Plugin hat keine Setup-Parameter!",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { NULL }
   };
 
-const char *tr(const char *s)
+// --- cI18nEntry ------------------------------------------------------------
+
+class cI18nEntry : public cListObject {
+private:
+  const tI18nPhrase *phrases;
+  const char *plugin;
+public:
+  cI18nEntry(const tI18nPhrase * const Phrases, const char *Plugin);
+  const tI18nPhrase *Phrases(void) { return phrases; }
+  const char *Plugin(void) { return plugin; }
+  };
+
+cI18nEntry::cI18nEntry(const tI18nPhrase * const Phrases, const char *Plugin)
+{
+  phrases = Phrases;
+  plugin = Plugin;
+}
+
+// --- cI18nList -------------------------------------------------------------
+
+class cI18nList : public cList<cI18nEntry> {
+public:
+  cI18nEntry *Get(const char *Plugin);
+  const tI18nPhrase *GetPhrases(const char *Plugin);
+  };
+
+cI18nEntry *cI18nList::Get(const char *Plugin)
+{
+  if (Plugin) {
+     for (cI18nEntry *p = First(); p; p = Next(p)) {
+         if (strcmp(p->Plugin(), Plugin) == 0)
+            return p;
+         }
+     }
+  return NULL;
+}
+
+const tI18nPhrase *cI18nList::GetPhrases(const char *Plugin)
+{
+  cI18nEntry *p = Get(Plugin);
+  return p ? p->Phrases() : NULL;
+}
+
+cI18nList I18nList;
+
+// ---
+
+void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin)
+{
+  cI18nEntry *p = I18nList.Get(Plugin);
+  if (p)
+     I18nList.Del(p);
+  if (Phrases)
+     I18nList.Add(new cI18nEntry(Phrases, Plugin));
+}
+
+const char *I18nTranslate(const char *s, const char *Plugin)
 {
   if (Setup.OSDLanguage) {
-     for (const tPhrase *p = Phrases; **p; p++) {
-         if (strcmp(s, **p) == 0) {
-            const char *t = (*p)[Setup.OSDLanguage];
-            if (t && *t)
-               return t;
-            }
+     const tI18nPhrase *p = Plugin ? I18nList.GetPhrases(Plugin) : Phrases;
+     if (!p)
+        p = Phrases;
+     for (int i = ((p == Phrases) ? 1 : 2); i--; ) {
+         for (; **p; p++) {
+             if (strcmp(s, **p) == 0) {
+                const char *t = (*p)[Setup.OSDLanguage];
+                if (t && *t)
+                   return t;
+                }
+             }
+         p = Phrases;
          }
-     esyslog(LOG_ERR, "no translation found for '%s' in language %d (%s)\n", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
+     esyslog(LOG_ERR, "%s%sno translation found for '%s' in language %d (%s)\n", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
      }
   const char *p = strchr(s, '$');
   return p ? p + 1 : s;
 }
 
-const char * const * Languages(void)
+const char * const * I18nLanguages(void)
 {
   return &Phrases[0][0];
 }
diff --git a/i18n.h b/i18n.h
index c94241a54..68fe7364c 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,16 +4,28 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.1 2000/11/11 09:27:25 kls Exp $
+ * $Id: i18n.h 1.2 2002/05/05 13:42:31 kls Exp $
  */
 
 #ifndef __I18N_H
 #define __I18N_H
 
-extern const int NumLanguages;
+#include <stdio.h>
 
-const char *tr(const char *s);
+const int I18nNumLanguages = 12;
 
-const char * const * Languages(void);
+typedef const char *tI18nPhrase[I18nNumLanguages];
+
+void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin);
+
+const char *I18nTranslate(const char *s, const char *Plugin = NULL);
+
+const char * const * I18nLanguages(void);
+
+#ifdef PLUGIN_NAME_I18N
+#define tr(s)  I18nTranslate(s, PLUGIN_NAME_I18N)
+#else
+#define tr(s)  I18nTranslate(s)
+#endif
 
 #endif //__I18N_H
diff --git a/interface.h b/interface.h
index dbfa1bca7..914a38346 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.24 2001/09/01 15:14:50 kls Exp $
+ * $Id: interface.h 1.25 2002/04/19 13:17:15 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -46,6 +46,7 @@ class cInterface {
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   void Flush(void);
   void SetCols(int *c);
+  const int *GetCols(void) { return cols; }
   eDvbFont SetFont(eDvbFont Font);
   char *WrapText(const char *Text, int Width, int *Height);
   void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
diff --git a/menu.c b/menu.c
index bc3aeb6e5..ef7581957 100644
--- a/menu.c
+++ b/menu.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.182 2002/04/06 09:41:59 kls Exp $
+ * $Id: menu.c 1.190 2002/05/09 10:13:47 kls Exp $
  */
 
 #include "menu.h"
+#include <ctype.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,134 +16,19 @@
 #include "config.h"
 #include "eit.h"
 #include "i18n.h"
+#include "menuitems.h"
+#include "plugin.h"
 #include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
 #define MAXWAIT4EPGINFO  10 // seconds
 #define MODETIMEOUT       3 // seconds
 
-#define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
-
-const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#~^";
-
-// --- cMenuEditItem ---------------------------------------------------------
-
-class cMenuEditItem : public cOsdItem {
-private:
-  const char *name;
-  const char *value;
-public:
-  cMenuEditItem(const char *Name);
-  ~cMenuEditItem();
-  void SetValue(const char *Value);
-  };
-
-cMenuEditItem::cMenuEditItem(const char *Name)
-{
-  name = strdup(Name);
-  value = NULL;
-}
-
-cMenuEditItem::~cMenuEditItem()
-{
-  delete name;
-  delete value;
-}
-
-void cMenuEditItem::SetValue(const char *Value)
-{
-  delete value;
-  value = strdup(Value);
-  char *buffer = NULL;
-  asprintf(&buffer, "%s:\t%s", name, value);
-  SetText(buffer, false);
-  Display();
-}
-
-// --- cMenuEditIntItem ------------------------------------------------------
-
-class cMenuEditIntItem : public cMenuEditItem {
-protected:
-  int *value;
-  int min, max;
-  virtual void Set(void);
-public:
-  cMenuEditIntItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  min = Min;
-  max = Max;
-  Set();
-}
-
-void cMenuEditIntItem::Set(void)
-{
-  char buf[16];
-  snprintf(buf, sizeof(buf), "%d", *value);
-  SetValue(buf);
-}
+#define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
 
-eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     int newValue;
-     if (k0 <= Key && Key <= k9) {
-        if (fresh) {
-           *value = 0;
-           fresh = false;
-           }
-        newValue = *value  * 10 + (Key - k0);
-        }
-     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        newValue = *value - 1;
-        fresh = true;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        newValue = *value + 1;
-        fresh = true;
-        }
-     else
-        return state;
-     if ((!fresh || min <= newValue) && newValue <= max) {
-        *value = newValue;
-        Set();
-        }
-     state = osContinue;
-     }
-  return state;
-}
-
-// --- cMenuEditBoolItem -----------------------------------------------------
-
-class cMenuEditBoolItem : public cMenuEditIntItem {
-protected:
-  const char *falseString, *trueString;
-  virtual void Set(void);
-public:
-  cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString = NULL, const char *TrueString = NULL);
-  };
+#define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
 
-cMenuEditBoolItem::cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString, const char *TrueString)
-:cMenuEditIntItem(Name, Value, 0, 1)
-{
-  falseString = FalseString ? FalseString : tr("no");
-  trueString = TrueString ? TrueString : tr("yes");
-  Set();
-}
-
-void cMenuEditBoolItem::Set(void)
-{
-  char buf[16];
-  snprintf(buf, sizeof(buf), "%s", *value ? trueString : falseString);
-  SetValue(buf);
-}
+const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
 
 // --- cMenuEditChanItem -----------------------------------------------------
 
@@ -448,186 +334,6 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuEditChrItem ------------------------------------------------------
-
-class cMenuEditChrItem : public cMenuEditItem {
-private:
-  char *value;
-  const char *allowed;
-  const char *current;
-  virtual void Set(void);
-public:
-  cMenuEditChrItem(const char *Name, char *Value, const char *Allowed);
-  ~cMenuEditChrItem();
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Allowed)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  allowed = strdup(Allowed);
-  current = strchr(allowed, *Value);
-  if (!current)
-     current = allowed;
-  Set();
-}
-
-cMenuEditChrItem::~cMenuEditChrItem()
-{
-  delete allowed;
-}
-
-void cMenuEditChrItem::Set(void)
-{
-  char buf[2];
-  snprintf(buf, sizeof(buf), "%c", *value);
-  SetValue(buf);
-}
-
-eOSState cMenuEditChrItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     if (NORMALKEY(Key) == kLeft) {
-        if (current > allowed)
-           current--;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (*(current + 1))
-           current++;
-        }
-     else
-        return state;
-     *value = *current;
-     Set();
-     state = osContinue;
-     }
-  return state;
-}
-
-// --- cMenuEditStrItem ------------------------------------------------------
-
-class cMenuEditStrItem : public cMenuEditItem {
-private:
-  char *value;
-  int length;
-  const char *allowed;
-  int pos;
-  virtual void Set(void);
-  char Inc(char c, bool Up);
-public:
-  cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
-  ~cMenuEditStrItem();
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  length = Length;
-  allowed = strdup(Allowed);
-  pos = -1;
-  Set();
-}
-
-cMenuEditStrItem::~cMenuEditStrItem()
-{
-  delete allowed;
-}
-
-void cMenuEditStrItem::Set(void)
-{
-  char buf[1000];
-  if (pos >= 0) {
-     strncpy(buf, value, pos);
-     const char *s = value[pos] != '^' ? value + pos + 1 : "";
-     snprintf(buf + pos, sizeof(buf) - pos - 2, "[%c]%s", *(value + pos), s);
-     SetValue(buf);
-     }
-  else
-     SetValue(value);
-}
-
-char cMenuEditStrItem::Inc(char c, bool Up)
-{
-  const char *p = strchr(allowed, c);
-  if (!p)
-     p = allowed;
-  if (Up) {
-     if (!*++p)
-        p = allowed;
-     }
-  else if (--p < allowed)
-     p = allowed + strlen(allowed) - 1;
-  return *p;
-}
-
-eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
-{
-  switch (Key) {
-    case kLeft|k_Repeat:
-    case kLeft:  if (pos > 0) {
-                    if (value[pos] == '^')
-                       value[pos] = 0;
-                    pos--;
-                    }
-                 break;
-    case kRight|k_Repeat:
-    case kRight: if (pos < length && value[pos] != '^' && (pos < int(strlen(value) - 1) || value[pos] != ' ')) {
-                    if (++pos >= int(strlen(value))) {
-                       value[pos] = ' ';
-                       value[pos + 1] = 0;
-                       }
-                    }
-                 break;
-    case kUp|k_Repeat:
-    case kUp:
-    case kDown|k_Repeat:
-    case kDown:  if (pos >= 0)
-                    value[pos] = Inc(value[pos], NORMALKEY(Key) == kUp);
-                 else
-                    return cMenuEditItem::ProcessKey(Key);
-                 break;
-    case kOk:    if (pos >= 0) {
-                    if (value[pos] == '^')
-                       value[pos] = 0;
-                    pos = -1;
-                    stripspace(value);
-                    break;
-                    }
-                 // run into default
-    default:     return cMenuEditItem::ProcessKey(Key);
-    }
-  Set();
-  return osContinue;
-}
-
-// --- cMenuEditStraItem -----------------------------------------------------
-
-class cMenuEditStraItem : public cMenuEditIntItem {
-private:
-  const char * const *strings;
-protected:
-  virtual void Set(void);
-public:
-  cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings);
-  };
-
-cMenuEditStraItem::cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings)
-:cMenuEditIntItem(Name, Value, 0, NumStrings - 1)
-{
-  strings = Strings;
-  Set();
-}
-
-void cMenuEditStraItem::Set(void)
-{
-  SetValue(strings[*value]);
-}
-
 // --- cMenuEditCaItem -------------------------------------------------------
 
 class cMenuEditCaItem : public cMenuEditIntItem {
@@ -699,7 +405,7 @@ cMenuEditChannel::cMenuEditChannel(int Index)
   channel = Channels.Get(Index);
   if (channel) {
      data = *channel;
-     Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), FileNameChars));
+     Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), tr(FileNameChars)));
      Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
      Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
      Add(new cMenuEditIntItem( tr("DiSEqC"),       &data.diseqc, 0, 10)); //TODO exact limits???
@@ -919,116 +625,6 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuTextItem ---------------------------------------------------------
-
-class cMenuTextItem : public cOsdItem {
-private:
-  char *text;
-  int x, y, w, h, lines, offset;
-  eDvbColor fgColor, bgColor;
-  eDvbFont font;
-public:
-  cMenuTextItem(const char *Text, int X, int Y, int W, int H = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground, eDvbFont Font = fontOsd);
-  ~cMenuTextItem();
-  int Height(void) { return h; }
-  void Clear(void);
-  virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  bool CanScrollUp(void) { return offset > 0; }
-  bool CanScrollDown(void) { return h + offset < lines; }
-  void ScrollUp(bool Page);
-  void ScrollDown(bool Page);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbColor FgColor, eDvbColor BgColor, eDvbFont Font)
-{
-  x = X;
-  y = Y;
-  w = W;
-  h = H;
-  fgColor = FgColor;
-  bgColor = BgColor;
-  font = Font;
-  offset = 0;
-  eDvbFont oldFont = Interface->SetFont(font);
-  text = Interface->WrapText(Text, w - 1, &lines);
-  Interface->SetFont(oldFont);
-  if (h < 0)
-     h = lines;
-}
-
-cMenuTextItem::~cMenuTextItem()
-{
-  delete text;
-}
-
-void cMenuTextItem::Clear(void)
-{
-  Interface->Fill(x, y, w, h, bgColor);
-}
-
-void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
-{
-  int l = 0;
-  char *t = text;
-  eDvbFont oldFont = Interface->SetFont(font);
-  while (*t) {
-        char *n = strchr(t, '\n');
-        if (l >= offset) {
-           if (n)
-              *n = 0;
-           Interface->Write(x, y + l - offset, t, fgColor, bgColor);
-           if (n)
-              *n = '\n';
-           else
-              break;
-           }
-        if (!n)
-           break;
-        t = n + 1;
-        if (++l >= h + offset)
-           break;
-        }
-  Interface->SetFont(oldFont);
-  // scroll indicators use inverted color scheme!
-  if (CanScrollUp())   Interface->Write(x + w - 1, y,         "^", bgColor, fgColor);
-  if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
-}
-
-void cMenuTextItem::ScrollUp(bool Page)
-{
-  if (CanScrollUp()) {
-     Clear();
-     offset = max(offset - (Page ? h : 1), 0);
-     Display();
-     }
-}
-
-void cMenuTextItem::ScrollDown(bool Page)
-{
-  if (CanScrollDown()) {
-     Clear();
-     offset = min(offset + (Page ? h : 1), lines - h);
-     Display();
-     }
-}
-
-eOSState cMenuTextItem::ProcessKey(eKeys Key)
-{
-  switch (Key) {
-    case kLeft|k_Repeat:
-    case kLeft:
-    case kUp|k_Repeat:
-    case kUp:            ScrollUp(NORMALKEY(Key) == kLeft);    break;
-    case kRight|k_Repeat:
-    case kRight:
-    case kDown|k_Repeat:
-    case kDown:          ScrollDown(NORMALKEY(Key) == kRight); break;
-    default:             return osUnknown;
-    }
-  return osContinue;
-}
-
 // --- cMenuText -------------------------------------------------------------
 
 class cMenuText : public cOsdMenu {
@@ -1086,7 +682,7 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
 //TODO VPS???
      Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
-     Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), FileNameChars));
+     Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), tr(FileNameChars)));
      SetFirstDayItem();
      }
 }
@@ -1929,60 +1525,6 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuSetupPage --------------------------------------------------------
-
-class cMenuSetupPage : public cOsdMenu {
-protected:
-  cSetup data;
-  int osdLanguage;
-  void SetupTitle(const char *s);
-  virtual void Set(void) = 0;
-public:
-  cMenuSetupPage(void);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuSetupPage::cMenuSetupPage(void)
-:cOsdMenu("", 33)
-{
-  data = Setup;
-  osdLanguage = Setup.OSDLanguage;
-}
-
-void cMenuSetupPage::SetupTitle(const char *s)
-{
-  char buf[40]; // can't call tr() for more than one string at a time!
-  char *q = buf + snprintf(buf, sizeof(buf), "%s - ", tr("Setup"));
-  snprintf(q, sizeof(buf) - strlen(buf), "%s", tr(s));
-  SetTitle(buf);
-}
-
-eOSState cMenuSetupPage::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
-                 cDvbApi::PrimaryDvbApi->SetVideoFormat(data.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
-                 Setup = data;
-                 Setup.Save();
-                 cDvbApi::SetCaCaps();
-                 break;
-       default: break;
-       }
-     }
-  if (data.OSDLanguage != osdLanguage) {
-     int OriginalOSDLanguage = Setup.OSDLanguage;
-     Setup.OSDLanguage = data.OSDLanguage;
-     Set();
-     Display();
-     osdLanguage = data.OSDLanguage;
-     Setup.OSDLanguage = OriginalOSDLanguage;
-     }
-  return state;
-}
-
 // --- cMenuSetupOSD ---------------------------------------------------------
 
 class cMenuSetupOSD : public cMenuSetupPage {
@@ -1996,7 +1538,7 @@ void cMenuSetupOSD::Set(void)
 {
   Clear();
   SetupTitle("OSD");
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, NumLanguages, Languages()));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, I18nNumLanguages, I18nLanguages()));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
@@ -2104,7 +1646,8 @@ void cMenuSetupRecord::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"),      &data.DefaultLifetime, 0, MAXLIFETIME));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
-  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars));
+  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"),      &data.RecordDolbyDigital));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
@@ -2142,7 +1685,76 @@ void cMenuSetupMisc::Set(void)
   SetupTitle("Miscellaneous");
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
-  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (min)"),        &data.SVDRPTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
+}
+
+// --- cMenuSetupPluginItem --------------------------------------------------
+
+class cMenuSetupPluginItem : public cOsdItem {
+private:
+  int pluginIndex;
+public:
+  cMenuSetupPluginItem(const char *Name, int Index);
+  int PluginIndex(void) { return pluginIndex; }
+  };
+
+cMenuSetupPluginItem::cMenuSetupPluginItem(const char *Name, int Index)
+:cOsdItem(Name)
+{
+  pluginIndex = Index;
+}
+
+// --- cMenuSetupPlugins -----------------------------------------------------
+
+class cMenuSetupPlugins : public cMenuSetupPage {
+private:
+  virtual void Set(void);
+public:
+  cMenuSetupPlugins(void) { Set(); }
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+void cMenuSetupPlugins::Set(void)
+{
+  Clear();
+  SetupTitle("Plugins");
+  SetHasHotkeys();
+  for (int i = 0; ; i++) {
+      cPlugin *p = cPluginManager::GetPlugin(i);
+      if (p) {
+         char *buffer = NULL;
+         asprintf(&buffer, "%s (%s) - %s", p->Name(), p->Version(), p->Description());
+         Add(new cMenuSetupPluginItem(hk(buffer), i));
+         delete buffer;
+         }
+      else
+         break;
+      }
+}
+
+eOSState cMenuSetupPlugins::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key); // not cMenuSetupPage::ProcessKey()!
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk: {
+                   cMenuSetupPluginItem *item = (cMenuSetupPluginItem *)Get(Current());
+                   if (item) {
+                      cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
+                      if (p) {
+                         cOsdMenu *menu = p->SetupMenu();
+                         if (menu)
+                            return AddSubMenu(menu);
+                         Interface->Info(tr("This plugin has no setup parameters!"));
+                         }
+                      }
+                  }
+                  break;
+       default:   break;
+       }
+     }
+  return state;
 }
 
 // --- cMenuSetup ------------------------------------------------------------
@@ -2165,7 +1777,9 @@ cMenuSetup::cMenuSetup(void)
 void cMenuSetup::Set(void)
 {
   Clear();
-  SetTitle(tr("Setup"));
+  char buffer[64];
+  snprintf(buffer, sizeof(buffer), "%s - VDR %s", tr("Setup"), VDRVERSION);
+  SetTitle(buffer);
   SetHasHotkeys();
   Add(new cOsdItem(hk(tr("OSD")),           osUser1));
   Add(new cOsdItem(hk(tr("EPG")),           osUser2));
@@ -2175,7 +1789,9 @@ void cMenuSetup::Set(void)
   Add(new cOsdItem(hk(tr("Recording")),     osUser6));
   Add(new cOsdItem(hk(tr("Replay")),        osUser7));
   Add(new cOsdItem(hk(tr("Miscellaneous")), osUser8));
-  Add(new cOsdItem(hk(tr("Restart")),       osUser9));
+  if (cPluginManager::HasPlugins())
+  Add(new cOsdItem(hk(tr("Plugins")),       osUser9));
+  Add(new cOsdItem(hk(tr("Restart")),       osUser10));
 }
 
 eOSState cMenuSetup::Restart(void)
@@ -2201,7 +1817,8 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
     case osUser6: return AddSubMenu(new cMenuSetupRecord);
     case osUser7: return AddSubMenu(new cMenuSetupReplay);
     case osUser8: return AddSubMenu(new cMenuSetupMisc);
-    case osUser9: return Restart();
+    case osUser9: return AddSubMenu(new cMenuSetupPlugins);
+    case osUser10: return Restart();
     default: ;
     }
   if (Setup.OSDLanguage != osdLanguage) {
@@ -2264,6 +1881,22 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuPluginItem -------------------------------------------------------
+
+class cMenuPluginItem : public cOsdItem {
+private:
+  int pluginIndex;
+public:
+  cMenuPluginItem(const char *Name, int Index);
+  int PluginIndex(void) { return pluginIndex; }
+  };
+
+cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
+:cOsdItem(Name, osPlugin)
+{
+  pluginIndex = Index;
+}
+
 // --- cMenuMain -------------------------------------------------------------
 
 #define STOP_RECORDING tr(" Stop recording ")
@@ -2308,6 +1941,22 @@ void cMenuMain::Set(void)
   Add(new cOsdItem(hk(tr("Channels")),   osChannels));
   Add(new cOsdItem(hk(tr("Timers")),     osTimers));
   Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
+
+  // Plugins:
+
+  for (int i = 0; ; i++) {
+      cPlugin *p = cPluginManager::GetPlugin(i);
+      if (p) {
+         const char *item = p->MainMenuEntry();
+         if (item)
+            Add(new cMenuPluginItem(hk(item), i));
+         }
+      else
+         break;
+      }
+
+  // More basic menu items:
+
   Add(new cOsdItem(hk(tr("Setup")),      osSetup));
   if (Commands.Count())
      Add(new cOsdItem(hk(tr("Commands")),  osCommands));
@@ -2375,6 +2024,19 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                           return osEnd;
                           }
                        break;
+    case osPlugin:     {
+                         cMenuPluginItem *item = (cMenuPluginItem *)Get(Current());
+                         if (item) {
+                            cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
+                            if (p) {
+                               cOsdMenu *menu = p->MainMenuAction();
+                               if (menu)
+                                  return AddSubMenu(menu);
+                               }
+                            }
+                         state = osEnd;
+                       }
+                       break;
     default: switch (Key) {
                case kMenu:   state = osEnd;    break;
                case kRed:    if (!HasSubMenu())
@@ -3185,6 +2847,7 @@ void cReplayControl::TimeSearch(void)
      else
         return;
      }
+  timeoutShow = 0;
   TimeSearchDisplay();
   timeSearchActive = true;
 }
@@ -3287,7 +2950,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         }
      else if (modeOnly)
         ShowMode();
-     else 
+     else
         shown = ShowProgress(!shown) || shown;
      }
   bool DisplayedFrames = displayFrames;
diff --git a/menu.h b/menu.h
index 88930167e..a0e0851e2 100644
--- a/menu.h
+++ b/menu.h
@@ -4,11 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.41 2002/03/31 13:53:23 kls Exp $
+ * $Id: menu.h 1.42 2002/04/13 15:31:41 kls Exp $
  */
 
-#ifndef _MENU_H
-#define _MENU_H
+#ifndef __MENU_H
+#define __MENU_H
 
 #include "dvbapi.h"
 #include "osd.h"
@@ -142,4 +142,4 @@ class cReplayControl : public cOsdBase {
   static void ClearLastReplayed(const char *FileName);
   };
 
-#endif //_MENU_H
+#endif //__MENU_H
diff --git a/menuitems.c b/menuitems.c
new file mode 100644
index 000000000..d09f5b703
--- /dev/null
+++ b/menuitems.c
@@ -0,0 +1,476 @@
+/*
+ * menuitems.c: General purpose menu items
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: menuitems.c 1.1 2002/05/09 10:10:12 kls Exp $
+ */
+
+#include "menuitems.h"
+#include <ctype.h>
+#include "i18n.h"
+
+// --- cMenuEditItem ---------------------------------------------------------
+
+cMenuEditItem::cMenuEditItem(const char *Name)
+{
+  name = strdup(Name);
+  value = NULL;
+}
+
+cMenuEditItem::~cMenuEditItem()
+{
+  delete name;
+  delete value;
+}
+
+void cMenuEditItem::SetValue(const char *Value)
+{
+  delete value;
+  value = strdup(Value);
+  char *buffer = NULL;
+  asprintf(&buffer, "%s:\t%s", name, value);
+  SetText(buffer, false);
+  Display();
+}
+
+// --- cMenuEditIntItem ------------------------------------------------------
+
+cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  min = Min;
+  max = Max;
+  Set();
+}
+
+void cMenuEditIntItem::Set(void)
+{
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%d", *value);
+  SetValue(buf);
+}
+
+eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     int newValue;
+     if (k0 <= Key && Key <= k9) {
+        if (fresh) {
+           *value = 0;
+           fresh = false;
+           }
+        newValue = *value  * 10 + (Key - k0);
+        }
+     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        newValue = *value - 1;
+        fresh = true;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        newValue = *value + 1;
+        fresh = true;
+        }
+     else
+        return state;
+     if ((!fresh || min <= newValue) && newValue <= max) {
+        *value = newValue;
+        Set();
+        }
+     state = osContinue;
+     }
+  return state;
+}
+
+// --- cMenuEditBoolItem -----------------------------------------------------
+
+cMenuEditBoolItem::cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString, const char *TrueString)
+:cMenuEditIntItem(Name, Value, 0, 1)
+{
+  falseString = FalseString ? FalseString : tr("no");
+  trueString = TrueString ? TrueString : tr("yes");
+  Set();
+}
+
+void cMenuEditBoolItem::Set(void)
+{
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%s", *value ? trueString : falseString);
+  SetValue(buf);
+}
+
+// --- cMenuEditChrItem ------------------------------------------------------
+
+cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Allowed)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  allowed = strdup(Allowed);
+  current = strchr(allowed, *Value);
+  if (!current)
+     current = allowed;
+  Set();
+}
+
+cMenuEditChrItem::~cMenuEditChrItem()
+{
+  delete allowed;
+}
+
+void cMenuEditChrItem::Set(void)
+{
+  char buf[2];
+  snprintf(buf, sizeof(buf), "%c", *value);
+  SetValue(buf);
+}
+
+eOSState cMenuEditChrItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     if (NORMALKEY(Key) == kLeft) {
+        if (current > allowed)
+           current--;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (*(current + 1))
+           current++;
+        }
+     else
+        return state;
+     *value = *current;
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
+// --- cMenuEditStrItem ------------------------------------------------------
+
+cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  length = Length;
+  allowed = strdup(Allowed);
+  pos = -1;
+  insert = uppercase = false;
+  newchar = true;
+  Set();
+}
+
+cMenuEditStrItem::~cMenuEditStrItem()
+{
+  delete allowed;
+}
+
+void cMenuEditStrItem::SetHelpKeys(void)
+{
+  if (pos >= 0)
+     Interface->Help(tr("ABC/abc"), tr(insert ? "Overwrite" : "Insert"), tr("Delete"));
+  else
+     Interface->Help(NULL);
+}
+
+void cMenuEditStrItem::Set(void)
+{
+  char buf[1000];
+  const char *fmt = insert && newchar ? "[]%c%s" : "[%c]%s";
+
+  if (pos >= 0) {
+     strncpy(buf, value, pos);
+     snprintf(buf + pos, sizeof(buf) - pos - 2, fmt, *(value + pos), value + pos + 1);
+     int width = Interface->Width() - Interface->GetCols()[0];
+     if (cDvbApi::PrimaryDvbApi->WidthInCells(buf) <= width) {
+        // the whole buffer fits on the screen
+        SetValue(buf);
+        return;
+        }
+     width *= cDvbApi::PrimaryDvbApi->CellWidth();
+     width -= cDvbApi::PrimaryDvbApi->Width('>'); // assuming '<' and '>' have the same with
+     int w = 0;
+     int i = 0;
+     int l = strlen(buf);
+     while (i < l && w <= width)
+           w += cDvbApi::PrimaryDvbApi->Width(buf[i++]);
+     if (i >= pos + 4) {
+        // the cursor fits on the screen
+        buf[i - 1] = '>';
+        buf[i] = 0;
+        SetValue(buf);
+        return;
+        }
+     // the cursor doesn't fit on the screen
+     w = 0;
+     if (buf[i = pos + 3]) {
+        buf[i] = '>';
+        buf[i + 1] = 0;
+        }
+     else
+        i--;
+     while (i >= 0 && w <= width)
+           w += cDvbApi::PrimaryDvbApi->Width(buf[i--]);
+     buf[++i] = '<';
+     SetValue(buf + i);
+     }
+  else
+     SetValue(value);
+}
+
+char cMenuEditStrItem::Inc(char c, bool Up)
+{
+  const char *p = strchr(allowed, c);
+  if (!p)
+     p = allowed;
+  if (Up) {
+     if (!*++p)
+        p = allowed;
+     }
+  else if (--p < allowed)
+     p = allowed + strlen(allowed) - 1;
+  return *p;
+}
+
+eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kRed:   // Switch between upper- and lowercase characters
+                 if (pos >= 0 && (!insert || !newchar)) {
+                    uppercase = !uppercase;
+                    value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]);
+                    }
+                 break;
+    case kGreen: // Toggle insert/overwrite modes
+                 if (pos >= 0) {
+                    insert = !insert;
+                    newchar = true;
+                    }
+                 SetHelpKeys();
+                 break;
+    case kYellow|k_Repeat:
+    case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
+                 if (pos >= 0) {
+                    if (strlen(value) > 1) {
+                       memmove(value + pos, value + pos + 1, strlen(value) - pos);
+                       // reduce position, if we removed the last character
+                       if (pos == int(strlen(value)))
+                          pos--;
+                       }
+                    else if (strlen(value) == 1)
+                       value[0] = ' '; // This is the last character in the string, replace it with a blank
+                    if (isalpha(value[pos]))
+                       uppercase = isupper(value[pos]);
+                    newchar = true;
+                    }
+                 break;
+    case kLeft|k_Repeat:
+    case kLeft:  if (pos > 0) {
+                    if (!insert || newchar)
+                       pos--;
+                    newchar = true;
+                    }
+                 if (!insert && isalpha(value[pos]))
+                    uppercase = isupper(value[pos]);
+                 break;
+    case kRight|k_Repeat:
+    case kRight: if (pos < length && pos < int(strlen(value)) ) {
+                    if (++pos >= int(strlen(value))) {
+                       if (pos >= 2 && value[pos - 1] == ' ' && value[pos - 2] == ' ')
+                          pos--; // allow only two blanks at the end
+                       else {
+                          value[pos] = ' ';
+                          value[pos + 1] = 0;
+                          }
+                       }
+                    }
+                 newchar = true;
+                 if (!insert && isalpha(value[pos]))
+                    uppercase = isupper(value[pos]);
+                 if (pos == 0)
+                    SetHelpKeys();
+                 break;
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:  if (pos >= 0) {
+                    if (insert && newchar) {
+                       // create a new character in insert mode
+                       if (int(strlen(value)) < length) {
+                          memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
+                          value[pos] = ' ';
+                          }
+                       }
+                    if (uppercase)
+                       value[pos] = toupper(Inc(tolower(value[pos]), NORMALKEY(Key) == kUp));
+                    else
+                       value[pos] =         Inc(        value[pos],  NORMALKEY(Key) == kUp);
+                    newchar = false;
+                    }
+                 else
+                    return cMenuEditItem::ProcessKey(Key);
+                 break;
+    case kOk:    if (pos >= 0) {
+                    pos = -1;
+                    newchar = true;
+                    stripspace(value);
+                    SetHelpKeys();
+                    break;
+                    }
+                 // run into default
+    default:     return cMenuEditItem::ProcessKey(Key);
+    }
+  Set();
+  return osContinue;
+}
+
+// --- cMenuEditStraItem -----------------------------------------------------
+
+cMenuEditStraItem::cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings)
+:cMenuEditIntItem(Name, Value, 0, NumStrings - 1)
+{
+  strings = Strings;
+  Set();
+}
+
+void cMenuEditStraItem::Set(void)
+{
+  SetValue(strings[*value]);
+}
+
+// --- cMenuTextItem ---------------------------------------------------------
+
+cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbColor FgColor, eDvbColor BgColor, eDvbFont Font)
+{
+  x = X;
+  y = Y;
+  w = W;
+  h = H;
+  fgColor = FgColor;
+  bgColor = BgColor;
+  font = Font;
+  offset = 0;
+  eDvbFont oldFont = Interface->SetFont(font);
+  text = Interface->WrapText(Text, w - 1, &lines);
+  Interface->SetFont(oldFont);
+  if (h < 0)
+     h = lines;
+}
+
+cMenuTextItem::~cMenuTextItem()
+{
+  delete text;
+}
+
+void cMenuTextItem::Clear(void)
+{
+  Interface->Fill(x, y, w, h, bgColor);
+}
+
+void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
+{
+  int l = 0;
+  char *t = text;
+  eDvbFont oldFont = Interface->SetFont(font);
+  while (*t) {
+        char *n = strchr(t, '\n');
+        if (l >= offset) {
+           if (n)
+              *n = 0;
+           Interface->Write(x, y + l - offset, t, fgColor, bgColor);
+           if (n)
+              *n = '\n';
+           else
+              break;
+           }
+        if (!n)
+           break;
+        t = n + 1;
+        if (++l >= h + offset)
+           break;
+        }
+  Interface->SetFont(oldFont);
+  // scroll indicators use inverted color scheme!
+  if (CanScrollUp())   Interface->Write(x + w - 1, y,         "^", bgColor, fgColor);
+  if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
+}
+
+void cMenuTextItem::ScrollUp(bool Page)
+{
+  if (CanScrollUp()) {
+     Clear();
+     offset = max(offset - (Page ? h : 1), 0);
+     Display();
+     }
+}
+
+void cMenuTextItem::ScrollDown(bool Page)
+{
+  if (CanScrollDown()) {
+     Clear();
+     offset = min(offset + (Page ? h : 1), lines - h);
+     Display();
+     }
+}
+
+eOSState cMenuTextItem::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kLeft|k_Repeat:
+    case kLeft:
+    case kUp|k_Repeat:
+    case kUp:            ScrollUp(NORMALKEY(Key) == kLeft);    break;
+    case kRight|k_Repeat:
+    case kRight:
+    case kDown|k_Repeat:
+    case kDown:          ScrollDown(NORMALKEY(Key) == kRight); break;
+    default:             return osUnknown;
+    }
+  return osContinue;
+}
+
+// --- cMenuSetupPage --------------------------------------------------------
+
+cMenuSetupPage::cMenuSetupPage(void)
+:cOsdMenu("", 33)
+{
+  data = Setup;
+  osdLanguage = Setup.OSDLanguage;
+}
+
+void cMenuSetupPage::SetupTitle(const char *s)
+{
+  char buf[40]; // can't call tr() for more than one string at a time!
+  char *q = buf + snprintf(buf, sizeof(buf), "%s - ", tr("Setup"));
+  snprintf(q, sizeof(buf) - strlen(buf), "%s", tr(s));
+  SetTitle(buf);
+}
+
+eOSState cMenuSetupPage::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
+                 cDvbApi::PrimaryDvbApi->SetVideoFormat(data.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+                 Setup = data;
+                 Setup.Save();
+                 cDvbApi::SetCaCaps();
+                 break;
+       default: break;
+       }
+     }
+  if (data.OSDLanguage != osdLanguage) {
+     int OriginalOSDLanguage = Setup.OSDLanguage;
+     Setup.OSDLanguage = data.OSDLanguage;
+     Set();
+     Display();
+     osdLanguage = data.OSDLanguage;
+     Setup.OSDLanguage = OriginalOSDLanguage;
+     }
+  return state;
+}
diff --git a/menuitems.h b/menuitems.h
new file mode 100644
index 000000000..a08a71488
--- /dev/null
+++ b/menuitems.h
@@ -0,0 +1,110 @@
+/*
+ * menuitems.h: General purpose menu items
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: menuitems.h 1.1 2002/05/09 09:41:06 kls Exp $
+ */
+
+#ifndef __MENUITEMS_H
+#define __MENUITEMS_H
+
+#include "osd.h"
+
+class cMenuEditItem : public cOsdItem {
+private:
+  const char *name;
+  const char *value;
+public:
+  cMenuEditItem(const char *Name);
+  ~cMenuEditItem();
+  void SetValue(const char *Value);
+  };
+
+class cMenuEditIntItem : public cMenuEditItem {
+protected:
+  int *value;
+  int min, max;
+  virtual void Set(void);
+public:
+  cMenuEditIntItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditBoolItem : public cMenuEditIntItem {
+protected:
+  const char *falseString, *trueString;
+  virtual void Set(void);
+public:
+  cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString = NULL, const char *TrueString = NULL);
+  };
+
+class cMenuEditChrItem : public cMenuEditItem {
+private:
+  char *value;
+  const char *allowed;
+  const char *current;
+  virtual void Set(void);
+public:
+  cMenuEditChrItem(const char *Name, char *Value, const char *Allowed);
+  ~cMenuEditChrItem();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditStrItem : public cMenuEditItem {
+private:
+  char *value;
+  int length;
+  const char *allowed;
+  int pos;
+  bool insert, newchar, uppercase;
+  void SetHelpKeys(void);
+  virtual void Set(void);
+  char Inc(char c, bool Up);
+public:
+  cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
+  ~cMenuEditStrItem();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditStraItem : public cMenuEditIntItem {
+private:
+  const char * const *strings;
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings);
+  };
+
+class cMenuTextItem : public cOsdItem {
+private:
+  char *text;
+  int x, y, w, h, lines, offset;
+  eDvbColor fgColor, bgColor;
+  eDvbFont font;
+public:
+  cMenuTextItem(const char *Text, int X, int Y, int W, int H = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground, eDvbFont Font = fontOsd);
+  ~cMenuTextItem();
+  int Height(void) { return h; }
+  void Clear(void);
+  virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
+  bool CanScrollUp(void) { return offset > 0; }
+  bool CanScrollDown(void) { return h + offset < lines; }
+  void ScrollUp(bool Page);
+  void ScrollDown(bool Page);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuSetupPage : public cOsdMenu {
+protected:
+  cSetup data;
+  int osdLanguage;
+  void SetupTitle(const char *s);
+  virtual void Set(void) = 0;
+public:
+  cMenuSetupPage(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+#endif //__MENUITEMS_H
diff --git a/newplugin b/newplugin
new file mode 100755
index 000000000..22d18f418
--- /dev/null
+++ b/newplugin
@@ -0,0 +1,250 @@
+#!/usr/bin/perl -w
+
+# newplugin: Initializing a new plugin source directory
+#
+# Creates a new plugin source directory from which to start implementing
+# a plugin for VDR.
+# See the file PLUGINS.html for detailed instructions on how to
+# write a plugin.
+#
+# Usage: newplugin <name>
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: newplugin 1.1 2002/05/09 15:12:26 kls Exp $
+
+$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
+
+die "Please use only lowercase letters and digits in the plugin name\n" if ($PLUGIN_NAME =~ tr/a-z0-9//c);
+
+$PLUGIN_CLASS   = ucfirst($PLUGIN_NAME);
+
+$PLUGIN_VERSION = "0.0.1";
+$PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
+$PLUGIN_MAINENTRY = $PLUGIN_CLASS;
+
+$PLUGINS_SRC = "PLUGINS/SRC";
+
+$README = qq
+{This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Your Name <email\@host.dom>
+
+Project's homepage:          URL
+
+Latest version available at: URL
+
+See the file COPYING for license information.
+
+Description:
+};
+
+$HISTORY_TITLE = "VDR Plugin '$PLUGIN_NAME' Revision History";
+$HISTORY_LINE = '-' x length($HISTORY_TITLE);
+$HISTORY_DATE = sprintf("%4d-%02d-%02d", (localtime)[5] + 1900, (localtime)[4] + 1, (localtime)[3]);
+$HISTORY = qq
+{$HISTORY_TITLE
+$HISTORY_LINE
+
+$HISTORY_DATE: Version $PLUGIN_VERSION
+
+- Initial revision.
+};
+
+$MAKEFILE = qq
+{#
+# Makefile for a Video Disk Recorder plugin
+#
+# \$Id\$
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = $PLUGIN_NAME
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = `grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ print \$\$6 }' | sed -e 's/[";]//g'`
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB/ost/include
+VDRDIR = ../../..
+VDRINC = \$(VDRDIR)/include
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = `grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g'`
+
+### The name of the distribution archive:
+
+ARCHIVE = vdr-\$(PLUGIN)-\$(VERSION)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES = -I\$(VDRINC) -I\$(DVBDIR)
+
+DEFINES = -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = \$(PLUGIN).o
+
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual -m486
+
+### Implicit rules:
+
+%.o: %.c
+	\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) \$<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+\$(DEPFILE): Makefile
+	\@\$(MAKEDEP) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@
+
+include \$(DEPFILE)
+
+### Targets:
+
+all: libvdr-\$(PLUGIN).so
+
+libvdr-\$(PLUGIN).so: \$(OBJS)
+	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
+	\@cp \$\@ \$(LIBDIR)/\$\@.\$(VDRVERSION)
+
+package: clean
+	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
+	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
+	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
+	\@tar czf \$(ARCHIVE).tgz -C \$(TMPDIR) \$(ARCHIVE)
+	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
+	\@echo Distribution archive created as \$(ARCHIVE).tgz
+
+clean:
+	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~
+};
+
+$MAIN = qq
+{/*
+ * $PLUGIN_NAME.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * \$Id\$
+ */
+
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "$PLUGIN_VERSION";
+static const char *DESCRIPTION    = "$PLUGIN_DESCRIPTION";
+static const char *MAINMENUENTRY  = "$PLUGIN_MAINENTRY";
+
+class cPlugin$PLUGIN_CLASS : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  cPlugin$PLUGIN_CLASS(void);
+  virtual ~cPlugin$PLUGIN_CLASS();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual void Start(void);
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdMenu *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPlugin${PLUGIN_CLASS}::cPlugin$PLUGIN_CLASS(void)
+{
+  // Initialize any member varaiables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+}
+
+cPlugin${PLUGIN_CLASS}::~cPlugin$PLUGIN_CLASS()
+{
+  // Clean up after yourself!
+}
+
+const char *cPlugin${PLUGIN_CLASS}::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return NULL;
+}
+
+bool cPlugin${PLUGIN_CLASS}::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  return true;
+}
+
+void cPlugin${PLUGIN_CLASS}::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+}
+
+cOsdMenu *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  return NULL;
+}
+
+cMenuSetupPage *cPlugin${PLUGIN_CLASS}::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPlugin${PLUGIN_CLASS}::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
+};
+
+$PLUGINDIR = "$PLUGINS_SRC/$PLUGIN_NAME";
+
+die "The directory $PLUGINS_SRC doesn't exist!\n" unless (-d "$PLUGINS_SRC");
+die "A plugin named '$PLUGIN_NAME' already exists in $PLUGINS_SRC!\n" if (-e "$PLUGINDIR");
+mkdir("$PLUGINDIR") || die "$!";
+
+CreateFile("README", $README);
+CreateFile("HISTORY", $HISTORY);
+CreateFile("Makefile", $MAKEFILE);
+CreateFile("$PLUGIN_NAME.c", $MAIN);
+`cp COPYING "$PLUGINDIR"` if (-e "COPYING");
+
+print qq{
+The new plugin source directory has been created in "$PLUGINDIR".
+
+The next steps you should perform now are:
+
+* edit the file "README" to adjust it to your specific implementation
+* fill in the code skeleton in "$PLUGIN_NAME.c" to implement your plugin function
+* add further source files if necessary
+* adapt the "Makefile" if necessary
+* do "make plugins" from the VDR source directory to build your plugin
+
+};
+
+sub CreateFile
+{
+  my ($Name, $Content) = @_;
+  open(FILE, ">$PLUGINDIR/$Name") || die "$Name:  $!\n";
+  print FILE $Content;
+  close(FILE);
+}
+
diff --git a/osd.c b/osd.c
index 56ba9b5c1..111678471 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.23 2002/03/29 16:34:03 kls Exp $
+ * $Id: osd.c 1.24 2002/05/01 11:53:24 kls Exp $
  */
 
 #include "osd.h"
@@ -105,12 +105,13 @@ cOsdMenu::~cOsdMenu()
 
 const char *cOsdMenu::hk(const char *s)
 {
-  static char buffer[32];
+  static char buffer[64];
   if (s && hasHotkeys) {
      if (digit == 0 && '1' <= *s && *s <= '9' && *(s + 1) == ' ')
-        digit = 10; // prevents automatic hotkeys - input already has them
-     if (digit < 9) {
-        snprintf(buffer, sizeof(buffer), " %d %s", ++digit, s);
+        digit = -1; // prevents automatic hotkeys - input already has them
+     if (digit >= 0) {
+        digit++;
+        snprintf(buffer, sizeof(buffer), " %c %s", (digit < 10) ? '0' + digit : ' ' , s);
         s = buffer;
         }
      }
diff --git a/osd.h b/osd.h
index 8e825869d..6f0532972 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.27 2002/03/10 16:18:11 kls Exp $
+ * $Id: osd.h 1.28 2002/05/01 11:17:42 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -23,6 +23,7 @@ enum eOSState { osUnknown,
                 osChannels,
                 osTimers,
                 osRecordings,
+                osPlugin,
                 osSetup,
                 osCommands,
                 osRecord,
@@ -43,6 +44,7 @@ enum eOSState { osUnknown,
                 osUser7,
                 osUser8,
                 osUser9,
+                osUser10,
               };
 
 class cOsdItem : public cListObject {
diff --git a/plugin.c b/plugin.c
new file mode 100644
index 000000000..ecae317e4
--- /dev/null
+++ b/plugin.c
@@ -0,0 +1,319 @@
+/*
+ * plugin.c: The VDR plugin interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: plugin.c 1.1 2002/05/09 16:26:56 kls Exp $
+ */
+
+#include "plugin.h"
+#include <ctype.h>
+#include <dirent.h>
+#include <dlfcn.h>
+#include "config.h"
+
+#define LIBVDR_PREFIX  "libvdr-"
+#define SO_INDICATOR   ".so."
+
+#define MAXPLUGINARGS  1024
+
+// --- cPlugin ---------------------------------------------------------------
+
+cPlugin::cPlugin(void) 
+{
+  name = NULL;
+}
+
+cPlugin::~cPlugin()
+{
+  I18nRegister(NULL, Name());
+}
+
+void cPlugin::SetName(const char *s)
+{
+  name = s;
+}
+
+const char *cPlugin::CommandLineHelp(void)
+{
+  return NULL;
+}
+
+bool cPlugin::ProcessArgs(int argc, char *argv[])
+{
+  return true;
+}
+
+void cPlugin::Start(void)
+{
+}
+
+const char *cPlugin::MainMenuEntry(void)
+{
+  return NULL;
+}
+
+cOsdMenu *cPlugin::MainMenuAction(void)
+{
+  return NULL;
+}
+
+cMenuSetupPage *cPlugin::SetupMenu(void)
+{
+  return NULL;
+}
+
+bool cPlugin::SetupParse(const char *Name, const char *Value)
+{
+  return false;
+}
+
+void cPlugin::SetupStore(const char *Name, const char *Value)
+{
+  Setup.Store(Name, Value, this->Name());
+}
+
+void cPlugin::SetupStore(const char *Name, int Value)
+{
+  Setup.Store(Name, Value, this->Name());
+}
+
+void cPlugin::RegisterI18n(const tI18nPhrase * const Phrases)
+{
+  I18nRegister(Phrases, Name());
+}
+
+// --- cDll ------------------------------------------------------------------
+
+cDll::cDll(const char *FileName, const char *Args)
+{
+  fileName = strdup(FileName);
+  args = Args ? strdup(Args) : NULL;
+  handle = NULL;
+  plugin = NULL;
+}
+
+cDll::~cDll()
+{
+  delete plugin;
+  if (handle)
+     dlclose(handle);
+  delete args;
+  delete fileName;
+}
+
+static char *SkipQuote(char *s)
+{
+  char c = *s;
+  strcpy(s, s + 1);
+  while (*s && *s != c) {
+        if (*s == '\\')
+           strcpy(s, s + 1);
+        if (*s)
+           s++;
+        }
+  if (*s) {
+     strcpy(s, s + 1);
+     return s;
+     }
+  esyslog(LOG_ERR, "ERROR: missing closing %c", c);
+  fprintf(stderr, "vdr: missing closing %c\n", c);
+  return NULL;
+}
+
+bool cDll::Load(bool Log)
+{
+  if (Log)
+     isyslog(LOG_INFO, "loading plugin: %s", fileName);
+  if (handle) {
+     esyslog(LOG_ERR, "attempt to load plugin '%s' twice!", fileName);
+     return false;
+     }
+  handle = dlopen(fileName, RTLD_NOW);
+  const char *error = dlerror();
+  if (!error) {
+     void *(*creator)(void);
+     (void *)creator = dlsym(handle, "VDRPluginCreator");
+     if (!(error = dlerror()))
+        plugin = (cPlugin *)creator();
+     }
+  if (!error) {
+     if (plugin && args) {
+        int argc = 0;
+        char *argv[MAXPLUGINARGS];
+        char *p = args;
+        char *q = NULL;
+        bool done = false;
+        while (!done) {
+              if (!q)
+                 q = p;
+              switch (*p) {
+                case '\\': strcpy(p, p + 1);
+                           if (*p)
+                              p++;
+                           else {
+                              esyslog(LOG_ERR, "ERROR: missing character after \\");
+                              fprintf(stderr, "vdr: missing character after \\\n");
+                              return false;
+                              }
+                           break;
+                case '"':
+                case '\'': if ((p = SkipQuote(p)) == NULL)
+                              return false;
+                           break;
+                default: if (!*p || isspace(*p)) {
+                            done = !*p;
+                            *p = 0;
+                            if (q) {
+                               if (argc < MAXPLUGINARGS - 1)
+                                  argv[argc++] = q;
+                               else {
+                                  esyslog(LOG_ERR, "ERROR: plugin argument list too long");
+                                  fprintf(stderr, "vdr: plugin argument list too long\n");
+                                  return false;
+                                  }
+                               q = NULL;
+                               }
+                            }
+                         if (!done)
+                            p++;
+                }
+              }
+        argv[argc] = NULL;
+        if (argc)
+           plugin->SetName(argv[0]);
+        optind = 0; // to reset the getopt() data
+        return !argc || plugin->ProcessArgs(argc, argv);
+        }
+     }
+  else {
+     esyslog(LOG_ERR, "ERROR: %s", error);
+     fprintf(stderr, "vdr: %s\n", error);
+     }
+  return !error && plugin;
+}
+
+// --- cPluginManager --------------------------------------------------------
+
+cPluginManager *cPluginManager::pluginManager = NULL;
+
+cPluginManager::cPluginManager(const char *Directory)
+{
+  directory = NULL;
+  if (pluginManager) {
+     fprintf(stderr, "vdr: attempt to create more than one plugin manager - exiting!\n");
+     exit(2);
+     }
+  SetDirectory(Directory);
+  pluginManager = this;
+}
+
+cPluginManager::~cPluginManager()
+{
+  Shutdown();
+  delete directory;
+  if (pluginManager == this)
+     pluginManager = NULL;
+}
+
+void cPluginManager::SetDirectory(const char *Directory)
+{
+  delete directory;
+  directory = Directory ? strdup(Directory) : NULL;
+}
+
+void cPluginManager::AddPlugin(const char *Args)
+{
+  if (strcmp(Args, "*") == 0) {
+     DIR *d = opendir(directory);
+     if (d) {
+        struct dirent *e;
+        while ((e = readdir(d)) != NULL) {
+              if (strstr(e->d_name, LIBVDR_PREFIX) == e->d_name) {
+                 char *p = strstr(e->d_name, SO_INDICATOR);
+                 if (p) {
+                    *p = 0;
+                    p += strlen(SO_INDICATOR);
+                    if (strcmp(p, VDRVERSION) == 0) {
+                       char *name = e->d_name + strlen(LIBVDR_PREFIX);
+                       if (strcmp(name, "*") != 0) { // let's not get into a loop!
+                          AddPlugin(e->d_name + strlen(LIBVDR_PREFIX));
+                          }
+                       }
+                    }
+                 }
+              }
+        closedir(d);
+        }
+     return;
+     }
+  char *s = strdup(Args);
+  char *p = strchr(s, ' ');
+  if (p)
+     *p = 0;
+  char *buffer = NULL;
+  asprintf(&buffer, "%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, VDRVERSION);
+  dlls.Add(new cDll(buffer, Args));
+  delete buffer;
+  delete s;
+}
+
+bool cPluginManager::LoadPlugins(bool Log)
+{
+  for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
+      if (!dll->Load(Log))
+         return false;
+      }
+  return true;
+}
+
+void cPluginManager::StartPlugins(void)
+{
+  for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
+      cPlugin *p = dll->Plugin();
+      if (p) {
+         int Language = Setup.OSDLanguage;
+         Setup.OSDLanguage = 0; // the i18n texts are only available _after_ Start()
+         isyslog(LOG_INFO, "starting plugin: %s (%s): %s", p->Name(), p->Version(), p->Description());
+         Setup.OSDLanguage = Language;
+         dll->Plugin()->Start();
+         }
+      }
+}
+
+bool cPluginManager::HasPlugins(void)
+{
+  return pluginManager && pluginManager->dlls.Count();
+}
+
+cPlugin *cPluginManager::GetPlugin(int Index)
+{
+  cDll *dll = pluginManager ? pluginManager->dlls.Get(Index) : NULL;
+  return dll ? dll->Plugin() : NULL;
+}
+
+cPlugin *cPluginManager::GetPlugin(const char *Name)
+{
+  if (pluginManager) {
+     for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
+         cPlugin *p = dll->Plugin();
+         if (p && strcmp(p->Name(), Name) == 0)
+            return p;
+         }
+     }
+  return NULL;
+}
+
+void cPluginManager::Shutdown(bool Log)
+{
+  cDll *dll;
+  while ((dll = dlls.Last()) != NULL) {
+        if (Log) {
+           cPlugin *p = dll->Plugin();
+           if (p)
+              isyslog(LOG_INFO, "stopping plugin: %s", p->Name());
+           }
+        dlls.Del(dll);
+        }
+}
diff --git a/plugin.h b/plugin.h
new file mode 100644
index 000000000..99f330d4f
--- /dev/null
+++ b/plugin.h
@@ -0,0 +1,81 @@
+/*
+ * plugin.h: The VDR plugin interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: plugin.h 1.1 2002/05/09 10:16:09 kls Exp $
+ */
+
+#ifndef __PLUGIN_H
+#define __PLUGIN_H
+
+#include "i18n.h"
+#include "menuitems.h"
+#include "osd.h"
+#include "tools.h"
+
+#define VDRPLUGINCREATOR(PluginClass) extern "C" void *VDRPluginCreator(void) { return new PluginClass; }
+
+class cPlugin {
+  friend class cDll;
+private:
+  const char *name;
+  void SetName(const char *s);
+public:
+  cPlugin(void);
+  virtual ~cPlugin();
+
+  const char *Name(void) { return name; }
+  virtual const char *Version(void) = 0;
+  virtual const char *Description(void) = 0;
+  virtual const char *CommandLineHelp(void);
+
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual void Start(void);
+
+  virtual const char *MainMenuEntry(void);
+  virtual cOsdMenu *MainMenuAction(void);
+
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  void SetupStore(const char *Name, const char *Value = NULL);
+  void SetupStore(const char *Name, int Value);
+
+  void RegisterI18n(const tI18nPhrase * const Phrases);
+  };
+
+class cDll : public cListObject {
+private:
+  char *fileName;
+  char *args;
+  void *handle;
+  cPlugin *plugin;
+public:
+  cDll(const char *FileName, const char *Args);
+  virtual ~cDll();
+  bool Load(bool Log = false);
+  cPlugin *Plugin(void) { return plugin; }
+  };
+
+class cDlls : public cList<cDll> {};
+
+class cPluginManager {
+private:
+  static cPluginManager *pluginManager;
+  char *directory;
+  cDlls dlls;
+public:
+  cPluginManager(const char *Directory);
+  virtual ~cPluginManager();
+  void SetDirectory(const char *Directory);
+  void AddPlugin(const char *Args);
+  bool LoadPlugins(bool Log = false);
+  void StartPlugins(void);
+  static bool HasPlugins(void);
+  static cPlugin *GetPlugin(int Index);
+  static cPlugin *GetPlugin(const char *Name);
+  void Shutdown(bool Log = false);
+  };
+
+#endif //__PLUGIN_H
diff --git a/recording.c b/recording.c
index b19e8b73f..e63704535 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.60 2002/04/01 10:51:23 kls Exp $
+ * $Id: recording.c 1.61 2002/04/21 14:02:55 kls Exp $
  */
 
 #include "recording.h"
@@ -222,7 +222,6 @@ static char *ExchangeChars(char *s, bool ToFileSystem)
                   case '+':
                   case ',':
                   case '-':
-                  case '.':
                   case ';':
                   case '=':
                   case '0' ... '9':
@@ -237,7 +236,8 @@ static char *ExchangeChars(char *s, bool ToFileSystem)
                   case ' ': *p = '_'; break;
                   case '~': *p = '/'; break;
                   // characters that have to be encoded:
-                  default: {
+                  default:
+                    if (*p != '.' || !*(p + 1) || *(p + 1) == '~') { // Windows can't handle '.' at the end of directory names
                        int l = p - s;
                        s = (char *)realloc(s, strlen(s) + 10);
                        p = s + l;
diff --git a/remote.h b/remote.h
index bbdf2facc..184a42e9c 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.15 2001/07/22 14:42:59 kls Exp $
+ * $Id: remote.h 1.16 2002/05/09 11:43:04 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -95,7 +95,7 @@ class cRcIoLIRC : public cRcIoBase, private cThread {
 
 #elif !defined REMOTE_NONE
 
-#error Please define a remote control mode!
+// #error Please define a remote control mode!
 
 #endif
 
diff --git a/ringbuffer.c b/ringbuffer.c
index 8b8420c16..a52683d53 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.5 2001/11/03 09:50:46 kls Exp $
+ * $Id: ringbuffer.c 1.6 2002/04/18 15:46:36 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -154,7 +154,6 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
      Lock();
      int rest = Size() - head;
      int diff = tail - head;
-     Unlock();
      int free = (diff > 0) ? diff - 1 : Size() + diff - 1;
      if (statistics) {
         int fill = Size() - free - 1 + Count;
@@ -167,22 +166,25 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
               dsyslog(LOG_INFO, "buffer usage: %d%%", percent);
            }
         }
-     if (free <= 0)
-        return 0;
-     if (free < Count)
-        Count = free;
-     if (Count > maxFill)
-        maxFill = Count;
-     if (Count >= rest) {
-        memcpy(buffer + head, Data, rest);
-        if (Count - rest)
-           memcpy(buffer, Data + rest, Count - rest);
-        head = Count - rest;
-        }
-     else {
-        memcpy(buffer + head, Data, Count);
-        head += Count;
+     if (free > 0) {
+        if (free < Count)
+           Count = free;
+        if (Count > maxFill)
+           maxFill = Count;
+        if (Count >= rest) {
+           memcpy(buffer + head, Data, rest);
+           if (Count - rest)
+              memcpy(buffer, Data + rest, Count - rest);
+           head = Count - rest;
+           }
+        else {
+           memcpy(buffer + head, Data, Count);
+           head += Count;
+           }
         }
+     else
+        Count = 0;
+     Unlock();
      }
   return Count;
 }
@@ -193,22 +195,24 @@ int cRingBufferLinear::Get(uchar *Data, int Count)
      Lock();
      int rest = Size() - tail;
      int diff = head - tail;
-     Unlock();
      int cont = (diff >= 0) ? diff : Size() + diff;
-     if (rest <= 0)
-        return 0;
-     if (cont < Count)
-        Count = cont;
-     if (Count >= rest) {
-        memcpy(Data, buffer + tail, rest);
-        if (Count - rest)
-           memcpy(Data + rest, buffer, Count - rest);
-        tail = Count - rest;
-        }
-     else {
-        memcpy(Data, buffer + tail, Count);
-        tail += Count;
+     if (rest > 0) {
+        if (cont < Count)
+           Count = cont;
+        if (Count >= rest) {
+           memcpy(Data, buffer + tail, rest);
+           if (Count - rest)
+              memcpy(Data + rest, buffer, Count - rest);
+           tail = Count - rest;
+           }
+        else {
+           memcpy(Data, buffer + tail, Count);
+           tail += Count;
+           }
         }
+     else
+        Count = 0;
+     Unlock();
      }
   return Count;
 }
diff --git a/tools.c b/tools.c
index 099fb7d94..6f99ef095 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.62 2002/03/31 20:51:06 kls Exp $
+ * $Id: tools.c 1.63 2002/05/01 16:20:30 kls Exp $
  */
 
 #include "tools.h"
@@ -251,10 +251,10 @@ int FreeDiskSpaceMB(const char *Directory, int *UsedMB)
   int Free = 0;
   struct statfs statFs;
   if (statfs(Directory, &statFs) == 0) {
-     int blocksPerMeg = 1024 * 1024 / statFs.f_bsize;
+     double blocksPerMeg = 1024.0 * 1024.0 / statFs.f_bsize;
      if (UsedMB)
-        *UsedMB = (statFs.f_blocks - statFs.f_bfree) / blocksPerMeg;
-     Free = statFs.f_bavail / blocksPerMeg;
+        *UsedMB = int((statFs.f_blocks - statFs.f_bfree) / blocksPerMeg);
+     Free = int(statFs.f_bavail / blocksPerMeg);
      }
   else
      LOG_ERROR_STR(Directory);
diff --git a/vdr.1 b/vdr.1
index b26a9dff5..06c0b84d3 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.3 2002/04/07 13:11:43 kls Exp $
+.\" $Id: vdr.1 1.4 2002/05/09 16:04:17 kls Exp $
 .\"
-.TH vdr 1 "7 Apr 2002" "1.0.0" "Video Disk Recorder"
+.TH vdr 1 "9 May 2002" "1.1.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -68,6 +68,11 @@ Set logging to \fIlevel\fR.
 \fB2\fR\ =\ errors and info, \fB3\fR\ =\ errors, info and debug.
 The default logging level is \fB3\fR.
 .TP
+.BI -L\  dir ,\ --lib= dir
+Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
+There can be several \fB-L\fR options with different \fIdir\fR values.
+Each of them will apply to the \fB-P\fR options following it.
+.TP
 .B -m, --mute
 Mute audio of the primary DVB device at startup.
 .TP
@@ -77,6 +82,18 @@ The default SVDRP port is \fB2001\fR.
 You need to edit the file \fIsvdrphosts.conf\fR in order to enable
 access to the SVDRP port.
 .TP
+.BI -P\  options ,\ --plugin= options
+Load a plugin, defined by the given \fIoptions\fR.
+The first word in \fIoptions\fR must be the name of an existing \fBvdr\fR
+plugin, optionally followed by a blank separated list of command line options
+for that plugin. If \fIoptions\fR contains any blanks, you need to enclose it
+in quotes, like for example
+
+\fBvdr -P "abc -a -b xyz"\fR
+
+which would load a plugin named \fBabc\fR, giving it the command line options
+\fB-a\ -b\ xyz\fR.
+.TP
 .BI -r\  cmd ,\ --record= cmd
 Call \fIcmd\fR before and after a recording.
 .TP
@@ -104,6 +121,9 @@ Successful program execution.
 .B 1
 An error has been detected which requires the DVB driver and \fBvdr\fR
 to be re-loaded.
+.TP
+.B 2
+An non-recoverable error has been detected, \fBvdr\fR has given up.
 .SH FILES
 .TP
 .I channels.conf
diff --git a/vdr.c b/vdr.c
index 874e8264b..7bb1f9bb5 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.102 2002/03/29 10:09:20 kls Exp $
+ * $Id: vdr.c 1.104 2002/05/05 10:34:31 kls Exp $
  */
 
 #include <getopt.h>
@@ -36,6 +36,7 @@
 #include "i18n.h"
 #include "interface.h"
 #include "menu.h"
+#include "plugin.h"
 #include "recording.h"
 #include "tools.h"
 #include "videodir.h"
@@ -79,14 +80,18 @@ int main(int argc, char *argv[])
 
 #define DEFAULTSVDRPPORT 2001
 #define DEFAULTWATCHDOG     0 // seconds
+#define DEFAULTPLUGINDIR "./PLUGINS/lib"
 
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *ConfigDirectory = NULL;
+  bool DisplayHelp = false;
+  bool DisplayVersion = false;
   bool DaemonMode = false;
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
   const char *Shutdown = NULL;
+  cPluginManager PluginManager(DEFAULTPLUGINDIR);
 
   static struct option long_options[] = {
       { "audio",    required_argument, NULL, 'a' },
@@ -95,8 +100,10 @@ int main(int argc, char *argv[])
       { "device",   required_argument, NULL, 'D' },
       { "epgfile",  required_argument, NULL, 'E' },
       { "help",     no_argument,       NULL, 'h' },
+      { "lib",      required_argument, NULL, 'L' },
       { "log",      required_argument, NULL, 'l' },
       { "mute",     no_argument,       NULL, 'm' },
+      { "plugin",   required_argument, NULL, 'P' },
       { "port",     required_argument, NULL, 'p' },
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
@@ -108,8 +115,7 @@ int main(int argc, char *argv[])
     };
 
   int c;
-  int option_index = 0;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:mp:r:s:t:v:Vw:", long_options, &option_index)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:L:mp:P:r:s:t:v:Vw:", long_options, NULL)) != -1) {
         switch (c) {
           case 'a': cDvbApi::SetAudioCommand(optarg);
                     break;
@@ -128,40 +134,7 @@ int main(int argc, char *argv[])
                     break;
           case 'E': cSIProcessor::SetEpgDataFileName(*optarg != '-' ? optarg : NULL);
                     break;
-          case 'h': printf("Usage: vdr [OPTION]\n\n"           // for easier orientation, this is column 80|
-                           "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
-                           "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
-                           "                           from the video directory)\n"
-                           "  -d,       --daemon       run in daemon mode\n"
-                           "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
-                           "                           there may be several -D options (default: all DVB\n"
-                           "                           devices will be used)\n"
-                           "  -E FILE   --epgfile=FILE write the EPG data into the given FILE (default is\n"
-                           "                           %s); use '-E-' to disable this\n"
-                           "                           if FILE is a directory, the default EPG file will be\n"
-                           "                           created in that directory\n"
-                           "  -h,       --help         print this help and exit\n"
-                           "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
-                           "                           0 = no logging, 1 = errors only,\n"
-                           "                           2 = errors and info, 3 = errors, info and debug\n"
-                           "  -m,       --mute         mute audio of the primary DVB device at startup\n"
-                           "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
-                           "                           0 turns off SVDRP\n"
-                           "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
-                           "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
-                           "  -t TTY,   --terminal=TTY controlling tty\n"
-                           "  -V,       --version      print version information and exit\n"
-                           "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
-                           "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
-                           "                           seconds (default: %d); '0' disables the watchdog\n"
-                           "\n"
-                           "Report bugs to <vdr-bugs@cadsoft.de>\n",
-                           cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
-                           DEFAULTSVDRPPORT,
-                           VideoDirectory,
-                           DEFAULTWATCHDOG
-                           );
-                    return 0;
+          case 'h': DisplayHelp = true;
                     break;
           case 'l': if (isnumber(optarg)) {
                        int l = atoi(optarg);
@@ -173,6 +146,8 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
                     return 2;
                     break;
+          case 'L': PluginManager.SetDirectory(optarg);
+                    break;
           case 'm': MuteAudio = true;
                     break;
           case 'p': if (isnumber(optarg))
@@ -182,14 +157,15 @@ int main(int argc, char *argv[])
                        return 2;
                        }
                     break;
+          case 'P': PluginManager.AddPlugin(optarg);
+                    break;
           case 'r': cRecordingUserCommand::SetCommand(optarg);
                     break;
           case 's': Shutdown = optarg;
                     break;
           case 't': Terminal = optarg;
                     break;
-          case 'V': printf("vdr, version %s\n", VDRVERSION);
-                    return 0;
+          case 'V': DisplayVersion = true;
                     break;
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
@@ -209,6 +185,71 @@ int main(int argc, char *argv[])
           }
         }
 
+  // Help and version info:
+
+  if (DisplayHelp || DisplayVersion) {
+     if (!PluginManager.HasPlugins())
+        PluginManager.AddPlugin("*"); // adds all available plugins
+     PluginManager.LoadPlugins();
+     if (DisplayHelp) {
+        printf("Usage: vdr [OPTIONS]\n\n"          // for easier orientation, this is column 80|
+               "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
+               "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
+               "                           from the video directory)\n"
+               "  -d,       --daemon       run in daemon mode\n"
+               "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
+               "                           there may be several -D options (default: all DVB\n"
+               "                           devices will be used)\n"
+               "  -E FILE   --epgfile=FILE write the EPG data into the given FILE (default is\n"
+               "                           %s); use '-E-' to disable this\n"
+               "                           if FILE is a directory, the default EPG file will be\n"
+               "                           created in that directory\n"
+               "  -h,       --help         print this help and exit\n"
+               "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
+               "                           0 = no logging, 1 = errors only,\n"
+               "                           2 = errors and info, 3 = errors, info and debug\n"
+               "  -L DIR,   --lib=DIR      search for plugins in DIR (default is %s)\n"
+               "  -m,       --mute         mute audio of the primary DVB device at startup\n"
+               "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
+               "                           0 turns off SVDRP\n"
+               "  -P OPT,   --plugin=OPT   load a plugin defined by the given options\n"
+               "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
+               "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
+               "  -t TTY,   --terminal=TTY controlling tty\n"
+               "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
+               "  -V,       --version      print version information and exit\n"
+               "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
+               "                           seconds (default: %d); '0' disables the watchdog\n"
+               "\n",
+               cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
+               DEFAULTPLUGINDIR,
+               DEFAULTSVDRPPORT,
+               VideoDirectory,
+               DEFAULTWATCHDOG
+               );
+        }
+     if (DisplayVersion)
+        printf("vdr (%s) - The Video Disk Recorder\n", VDRVERSION);
+     if (PluginManager.HasPlugins()) {
+        if (DisplayHelp)
+           printf("Plugins: vdr -P\"name [OPTIONS]\"\n\n");
+        for (int i = 0; ; i++) {
+            cPlugin *p = PluginManager.GetPlugin(i);
+            if (p) {
+               const char *help = p->CommandLineHelp();
+               printf("%s (%s) - %s\n", p->Name(), p->Version(), p->Description());
+               if (DisplayHelp && help) {
+                  printf("\n");
+                  puts(help);
+                  }
+               }
+            else
+               break;
+            }
+        }
+     return 0;
+     }
+
   // Log file:
 
   if (SysLogLevel > 0)
@@ -250,6 +291,11 @@ int main(int argc, char *argv[])
 
   isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
 
+  // Load plugins:
+
+  if (!PluginManager.LoadPlugins(true))
+     return 2;
+
   // Configuration data:
 
   if (!ConfigDirectory)
@@ -276,6 +322,12 @@ int main(int argc, char *argv[])
 
   cSIProcessor::Read();
 
+  // Start plugins:
+
+  PluginManager.StartPlugins();
+
+  // Channel:
+
   Channels.SwitchTo(Setup.CurrentChannel);
   if (MuteAudio)
      cDvbApi::PrimaryDvbApi->ToggleMute();
@@ -469,7 +521,7 @@ int main(int argc, char *argv[])
                  Interface->Info(tr("Editing process finished"));
               }
            }
-        if (!*Interact && (!cRecordControls::Active() || ForceShutdown)) {
+        if (!*Interact && ((!cRecordControls::Active() && !cVideoCutter::Active()) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
@@ -529,6 +581,7 @@ int main(int argc, char *argv[])
   Setup.CurrentChannel = cDvbApi::CurrentChannel();
   Setup.CurrentVolume  = cDvbApi::CurrentVolume();
   Setup.Save();
+  PluginManager.Shutdown(true);
   cVideoCutter::Stop();
   delete Menu;
   delete ReplayControl;

From 803c6c6bf6340302f78171892bef599aa272c266 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 11 May 2002 18:00:00 +0200
Subject: [PATCH 042/307] Version 1.1.1 - Separated the actual DVB hardware OSD
 implementation from the abstract OSD   interface. 'osdbase.c/.h' now
 implements the abstract OSD, while 'dvbosd.c/.h'   is the actual
 implementation for the DVB hardware. This is in preparation for   allowing
 additional kinds of OSD hardware implementations. - Fixed leftover references
 to the file FORMATS in MANUAL and svdrp.c. - Avoiding ambiguities in the
 cList template class in case one defines a "list of   lists" (thanks to
 Stefan Huelswitt). - Simplified the basic cMenuSetupPage class for easier use
 in plugins. - Added setup parameters and a Setup menu to the 'hello' plugin
 example. - Fixed logging error message for unknown config parameters in
 plugins. - Rearranged cleanup sequence at the end of the main program. -
 Adapted PLUGINS.html to use the actual code examples from the 'hello' plugin.

---
 CONTRIBUTORS              |   2 +
 HISTORY                   |  15 ++
 MANUAL                    |   4 +-
 Makefile                  |   4 +-
 PLUGINS.html              | 207 ++++++++++++---
 PLUGINS/SRC/hello/HISTORY |   4 +
 PLUGINS/SRC/hello/hello.c |  47 +++-
 PLUGINS/SRC/hello/i18n.c  |  41 ++-
 PLUGINS/SRC/hello/i18n.h  |   7 +-
 config.c                  |  11 +-
 config.h                  |   4 +-
 dvbosd.c                  | 545 ++++----------------------------------
 dvbosd.h                  | 171 +-----------
 i18n.c                    |  15 +-
 menu.c                    | 194 ++++++++------
 menuitems.c               |  48 ++--
 menuitems.h               |  15 +-
 osdbase.c                 | 482 +++++++++++++++++++++++++++++++++
 osdbase.h                 | 211 +++++++++++++++
 svdrp.c                   |   4 +-
 tools.h                   |   6 +-
 vdr.c                     |  10 +-
 22 files changed, 1216 insertions(+), 831 deletions(-)
 create mode 100644 osdbase.c
 create mode 100644 osdbase.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b6bd60ae0..ce0ffaa51 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -128,6 +128,8 @@ Stefan Huelswitt <huels@iname.com>
  with CAMs and AC3 sound only working the first time
  for making the main loop take an active video cutting process into account when
  doing shutdown or housekeeping
+ for making the cList template class avoid ambiguities in case one defines a "list of
+ lists"
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index 6599534e8..1da14fdb6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1254,3 +1254,18 @@ Video Disk Recorder Revision History
   and '-P' used to load plugins. This first step implements the complete "outer"
   shell for plugins. The "inner" access to VDR data structures will follow.
 - The VDR version number is now displayed in the title line of the "Setup" menu.
+
+2002-05-11: Version 1.1.1
+
+- Separated the actual DVB hardware OSD implementation from the abstract OSD
+  interface. 'osdbase.c/.h' now implements the abstract OSD, while 'dvbosd.c/.h'
+  is the actual implementation for the DVB hardware. This is in preparation for
+  allowing additional kinds of OSD hardware implementations.
+- Fixed leftover references to the file FORMATS in MANUAL and svdrp.c.
+- Avoiding ambiguities in the cList template class in case one defines a "list of
+  lists" (thanks to Stefan Huelswitt).
+- Simplified the basic cMenuSetupPage class for easier use in plugins.
+- Added setup parameters and a Setup menu to the 'hello' plugin example.
+- Fixed logging error message for unknown config parameters in plugins.
+- Rearranged cleanup sequence at the end of the main program.
+- Adapted PLUGINS.html to use the actual code examples from the 'hello' plugin.
diff --git a/MANUAL b/MANUAL
index 978713180..2dc75a34b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -571,7 +571,7 @@ Video Disk Recorder User's Manual
 * Executing system commands
 
   The "VDR" menu option "Commands" allows you to execute any system commands
-  defined in the configuration file 'commands.conf' (see FORMATS for details).
+  defined in the configuration file 'commands.conf' (see vdr(5) for details).
   The "Commands" option will only be present in the "VDR" menu if a valid
   'commands.conf' file containing at least one command definition has been
   found at program start.
@@ -584,7 +584,7 @@ Video Disk Recorder User's Manual
   be displayed on a result screen after executing the command. This screen will
   use a 'fixed' font so that you can generate formatted output. In order to
   avoid error messages going to stderr, command definitions should redirect
-  stderr to stdout (see FORMATS).
+  stderr to stdout (see vdr(5)).
 
   WARNING: THE COMMANDS DEFINED IN 'commands.conf' WILL BE EXECUTED UNDER THE
   =======  SAME USER ID THAT VDR IS RUNNING WITH. BE VERY CAREFUL WHEN
diff --git a/Makefile b/Makefile
index 55a01e875..d6f788729 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.34 2002/05/09 09:35:05 kls Exp $
+# $Id: Makefile 1.35 2002/05/10 10:24:46 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -22,7 +22,7 @@ INCLUDES = -I$(DVBDIR)/ost/include
 DTVLIB   = $(DTVDIR)/libdtv.a
 
 OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o\
-       menuitems.o osd.o plugin.o recording.o remote.o remux.o ringbuffer.o\
+       menuitems.o osdbase.o osd.o plugin.o recording.o remote.o remux.o ringbuffer.o\
        svdrp.o thread.o tools.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
diff --git a/PLUGINS.html b/PLUGINS.html
index b903f040d..70d6f468a 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -15,7 +15,10 @@ <h1>The VDR Plugin System</h1>
 This document describes the "outside" interface of the plugin system.
 It handles everything necessary for a plugin to get hooked into the core
 VDR program and present itself to the user.
-
+<p>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.1 are marked like this.
+<!--X1.1.1--></td></tr></table>
 <!--<p>TODO: Link to the document about VDR base classes to use when implementing actual functionality (yet to be written).-->
 
 <hr><h2>Quick start</h2>
@@ -25,12 +28,12 @@ <h1>The VDR Plugin System</h1>
 Actually you should read this entire document before starting to work with VDR plugins,
 but you probably want to see something happening right away <tt>;-)</tt>
 <p>
-So, for a quick demonstration of the plugin system, there is a demo plugin called
+So, for a quick demonstration of the plugin system, there is a sample plugin called
 "hello" that comes with the VDR source. To test drive this one, do the following:
 <ul>
 <li>change into the VDR source directory
 <li><b><tt>make</tt></b> the VDR program with your usual <tt>REMOTE=...</tt> (and maybe other) options
-<li>do <b><tt>make plugins</tt></b> to build the demo plugin
+<li>do <b><tt>make plugins</tt></b> to build the plugin
 <li>run VDR with <b><tt>vdr -V</tt></b> to see the version information
 <li>run VDR with <b><tt>vdr -h</tt></b> to see the command line options
 <li>run VDR with <b><tt>vdr -Phello</tt></b>
@@ -74,16 +77,14 @@ <h1>The VDR Plugin System</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 VDR/PLUGINS/SRC
-VDR/PLUGINS/SRC/demo
 VDR/PLUGINS/SRC/hello
 VDR/PLUGINS/lib
-VDR/PLUGINS/lib/libvdr-demo.so.1.1.0
 VDR/PLUGINS/lib/libvdr-hello.so.1.1.0
 </pre></td></tr></table><p>
 
 The <tt>SRC</tt> directory contains one subdirectory for each plugin, which carries
-the name of that plugin (in the above example that would be <tt>demo</tt> and
-<tt>hello</tt>, respectively). What's inside the individual source directory of a
+the name of that plugin (in the above example that would be <tt>hello</tt>).
+What's inside the individual source directory of a
 plugin is entirely up to the author of that plugin. The only prerequisites are
 that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt> and
 <tt>clean</tt>, and that a call to <tt>make all</tt> actually produces a dynamically
@@ -93,7 +94,7 @@ <h1>The VDR Plugin System</h1>
 available plugins. Note that the names of these files are created by concatenating
 <p>
 <table border=2>
-<tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>demo</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
+<tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>hello</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
 <tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>VDR version number<br>this plugin was<br>compiled for</font></td></tr>
 </table>
 <p>
@@ -109,25 +110,25 @@ <h1>The VDR Plugin System</h1>
 If you download a plugin <a href="#Building the distribution package">package</a>
 from the web, it will typically have a name like
 <p>
-<tt>vdr-demo-0.0.1.tgz</tt>
+<tt>vdr-hello-0.0.1.tgz</tt>
 <p>
 and will unpack into a directory named
 <p>
-<tt>vdr-demo-0.0.1</tt>
+<tt>vdr-hello-0.0.1</tt>
 <p>
 To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-ln -s vdr-demo-0.0.1 demo
+ln -s vdr-hello-0.0.1 hello
 </pre></td></tr></table><p>
 
 Since the VDR <tt>Makefile</tt> only searches for directories with names consisting
 of only lowercase characters and digits, it will only follow the symbolic links, which
 should lead to the current version of the plugin you want to use. This way you can
-have several different versions of a plugin source (like <tt>vdr-demo-0.0.1</tt> and
-<tt>vdr-demo-0.0.2</tt>) and define which one to actually use through the symbolic link.
+have several different versions of a plugin source (like <tt>vdr-hello-0.0.1</tt> and
+<tt>vdr-hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
 
 <a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
 
@@ -174,7 +175,7 @@ <h1>The VDR Plugin System</h1>
 At the end of the plugin's source file you will find a line that looks like this:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-VDRPLUGINCREATOR(cPluginDemo);
+VDRPLUGINCREATOR(cPluginHello);
 </pre></td></tr></table><p>
 
 This is the "magic" hook that allows VDR to actually load the plugin into
@@ -182,6 +183,40 @@ <h1>The VDR Plugin System</h1>
 <p>
 If your plugin requires additional source files, simply add them to your plugin's
 source directory and adjust the <tt>Makefile</tt> accordingly.
+<p>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+Header files usually contain preprocessor statements that prevent the same
+file (or rather its contents, to be precise) from being included more than once, like
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#ifndef __I18N_H
+#define __I18N_H
+
+...
+
+#endif //__I18N_H
+</pre></td></tr></table><p>
+
+The example shown here is the way VDR does this in its core source files.
+It takes the header file's name, converts it to all uppercase, replaces the
+dot with an underline and preceedes the whole thing with two underlines.
+The GNU library header files do this pretty much the same way, except that they
+usually precede the name with only one underline (there are exceptions, though).
+<p>
+As long as you make shure that none of your plugin's header files will be named
+like one of VDR's header files, you can use the same method as VDR. However,
+if you want to name a header file like one that is already existing in VDR's
+source (<tt>i18n.h</tt> would be a possible candidate for this), you may want
+to make sure that the macros used here don't clash. How you do this is completely
+up to you. You could, for instance, prepend the macro with a <tt>'P'</tt>, as in
+<tt>P__I18N_H</tt>, or leave out the trailing <tt>_H</tt>, as in <tt>__I18N</tt>,
+or use a completely different way to make sure a header file is included only once.
+<p>
+The 'hello' example that comes with VDR makes use of <a href="#Internationalization">internationalization</a>
+and implements a file named <tt>i18n.h</tt>. To make sure it won't clash with VDR's
+<tt>i18n.h</tt> it uses the macro <tt>_I18N__H</tt> (one underline at the beginning
+and two replacing the dot).
+<!--X1.1.1--></td></tr></table>
 
 <hr><h2>Construction and Destruction</h2>
 
@@ -230,9 +265,7 @@ <h1>The VDR Plugin System</h1>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 static const char *VERSION = "0.0.1";
 
-...
-
-const char *cPluginDemo::Version(void)
+const char *cPluginHello::Version(void)
 {
   return VERSION;
 }
@@ -265,15 +298,20 @@ <h1>The VDR Plugin System</h1>
 virtual const char *Description(void) = 0;
 </pre></td></tr></table><p>
 
-which returns a short, one line description of the plugin's purpose.
+which returns a short, one line description of the plugin's purpose:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
+static const char *DESCRIPTION = "A friendly greeting";
+
 virtual const char *Description(void)
 {
-  return "A simple demo plugin";
+  return tr(DESCRIPTION);
 }
 </pre></td></tr></table><p>
 
+Note the <tt>tr()</tt> around the <tt>DESCRIPTION</tt>, which allows the description
+to be <a href="#Internationalization">internationalized</a>.
+
 <hr><h2>Command line arguments</h2>
 
 <center><i><b>Taking orders</b></i></center><p>
@@ -300,20 +338,21 @@ <h1>The VDR Plugin System</h1>
 these values inside the plugin. Here's an example:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-bool cPluginDemo::ProcessArgs(int argc, char *argv[])
-{
+bool cPluginHello::ProcessArgs(int argc, char *argv[])
+{ 
+  // Implement command line argument processing here if applicable.
   static struct option long_options[] = {
-      { "aaa",      required_argument, NULL, 'a' },
-      { "bbb",      no_argument,       NULL, 'b' },
-      { NULL }
-    };
-
+       { "aaa",      required_argument, NULL, 'a' },
+       { "bbb",      no_argument,       NULL, 'b' },
+       { NULL }
+     };
+  
   int c;
   while ((c = getopt_long(argc, argv, "a:b", long_options, NULL)) != -1) {
         switch (c) {
-          case 'a': fprintf(stderr, "option -a = %s\n", optarg);
+          case 'a': option_a = optarg;
                     break;
-          case 'b': fprintf(stderr, "option -b\n");
+          case 'b': option_b = true; 
                     break;
           default:  return false;
           }
@@ -342,8 +381,9 @@ <h1>The VDR Plugin System</h1>
 in the same way as done by VDR itself:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-const char *cPluginDemo::CommandLineHelp(void)
+const char *cPluginHello::CommandLineHelp(void)
 {
+  // Return a string that describes all known command line options.
   return "  -a ABC,   --aaa=ABC      do something nice with ABC\n"
          "  -b,       --bbb          activate 'plan B'\n";
 }
@@ -392,9 +432,11 @@ <h1>The VDR Plugin System</h1>
 plugin that will have a main menu item:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-const char *cPluginDemo::MainMenuEntry(void)
+static const char *MAINMENUENTRY = "Hello";
+
+const char *cPluginHello::MainMenuEntry(void)
 {
-  return "Demo";
+  return tr(MAINMENUENTRY);
 }
 </pre></td></tr></table><p>
 
@@ -440,7 +482,7 @@ <h1>The VDR Plugin System</h1>
 virtual bool SetupParse(const char *Name, const char *Value);
 </pre></td></tr></table><p>
 
-The <tt>SetupMenu()</tt> function shall return the plugin's "Setup" menu
+The <tt>SetupMenu()</tt> function shall return the plugin's <a href="#The Setup menu"><i>Setup</i> menu</a>
 page, where the user can adjust all the parameters known to this plugin.
 <p>
 <tt>SetupParse()</tt> will be called for each parameter the plugin has
@@ -448,13 +490,30 @@ <h1>The VDR Plugin System</h1>
 <i>true</i> if the parameter was parsed correctly, <i>false</i> in case of
 an error. If <i>false</i> is returned, an error message will be written to
 the log file (and program execution will continue).
+<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+A possible implementation of <tt>SetupParse()</tt> could look like this:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+bool cPluginHello::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  if      (!strcasecmp(Name, "GreetingTime"))         GreetingTime = atoi(Value);
+  else if (!strcasecmp(Name, "UseAlternateGreeting")) UseAlternateGreeting = atoi(Value);
+  else
+     return false;
+  return true;
+</pre></td></tr></table><p>
+
+It is important to make sure that the parameter names are exactly the same as
+used in the <a href="#The Setup menu"><i>Setup</i> menu</a>'s <tt>Store()</tt> function.
+<!--X1.1.1--></td></tr></table>
 <p>
 The plugin's setup parameters are stored in the same file as VDR's parameters.
 In order to allow each plugin (and VDR itself) to have its own set of parameters,
 the <tt>Name</tt> of each parameter will be preceeded with the plugin's
 name, as in
 <p>
-<tt>demo.SomeParameter = 123</tt>
+<tt>hello.GreetingTime = 3</tt>
 <p>
 The prefix will be handled by the core VDR setup code, so the individual
 plugins need not worry about this.
@@ -465,8 +524,8 @@ <h1>The VDR Plugin System</h1>
 void SetupStore(const char *Name, <i>type</i> Value);
 </pre></td></tr></table><p>
 
-where <tt>Name</tt> is the name of the parameter (<tt>"SomeParameter"</tt> in the above
-example, without the prefix <tt>"demo."</tt>) and <tt>Value</tt> is a simple data type (like
+where <tt>Name</tt> is the name of the parameter (<tt>"GreetingTime"</tt> in the above
+example, without the prefix <tt>"hello."</tt>) and <tt>Value</tt> is a simple data type (like
 <tt>char&nbsp;*</tt>, <tt>int</tt> etc).
 Note that this is not a function that the individual plugin class needs to implement!
 <tt>SetupStore()</tt> is a non-virtual member function of the <tt>cPlugin</tt> class.
@@ -474,7 +533,7 @@ <h1>The VDR Plugin System</h1>
 To remove a parameter from the setup data, call <tt>SetupStore()</tt> with the appropriate
 name and without any value, as in
 <p>
-<tt>SetupStore("SomeParameter");</tt>
+<tt>SetupStore("GreetingTime");</tt>
 <p>
 The VDR menu "Setup/Plugins" will list all loaded plugins with their name,
 version number and description. Selecting an item in this list will bring up
@@ -486,6 +545,66 @@ <h1>The VDR Plugin System</h1>
 <tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
 parameters to the user.
 
+<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<a name="The Setup menu"><hr><h2>The Setup menu</h2>
+
+<center><i><b>Have it your way!</b></i></center><p>
+
+To implement a <i>Setup</i> menu, a plugin needs to derive a class from
+<tt>cMenuSetupPage</tt> and implement its constructor and the pure virtual
+<tt>Store()</tt> member function:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+int GreetingTime = 3;
+int UseAlternateGreeting = false;
+
+class cMenuSetupHello : public cMenuSetupPage {
+private:
+  int newGreetingTime;
+  int newUseAlternateGreeting;
+protected:
+  virtual void Store(void);
+public:
+  cMenuSetupHello(void);
+  };
+
+cMenuSetupHello::cMenuSetupHello(void)
+{ 
+  newGreetingTime = GreetingTime;
+  newUseAlternateGreeting = UseAlternateGreeting;
+  Add(new cMenuEditIntItem( tr("Greeting time (s)"),      &amp;newGreetingTime));
+  Add(new cMenuEditBoolItem(tr("Use alternate greeting"), &amp;newUseAlternateGreeting));
+}
+
+void cMenuSetupHello::Store(void)
+{ 
+  SetupStore("GreetingTime", GreetingTime = newGreetingTime);
+  SetupStore("UseAlternateGreeting", UseAlternateGreeting = newUseAlternateGreeting);
+}
+</pre></td></tr></table><p>
+
+In this example we have two global setup parameters (<tt>GreetingTime</tt> and <tt>UseAlternateGreeting</tt>).
+The constructor initializes two private members with the values of these parameters, so
+that the <i>Setup</i> menu can work with temporary copies (in order to discard any changes
+if the user doesn't confirm them by pressing the "Ok" button).
+After this the constructor adds the appropriate menu items, using internationalized texts
+and the addresses of the temporary variables. That's all there is to inizialize a <i>Setup</i>
+menu - the rest will be done by the core VDR code.
+<p>
+Once the user has pressed the "Ok" button to confirm the changes, the <tt>Store()</tt> function will
+be called, in which all setup parameters must be actually stored in VDR's global setup data.
+This is done by calling the <tt>SetupStore()</tt> function for each of the parameters.
+The <i>Name</i> string given here will be used to identify the parameter in VDR's
+<tt>setup.conf</tt> file, and will be automatically prepended with the plugin's name.
+<p>
+Note that in this small example the new values of the parameters are copied into the
+global variables within each <tt>SetupStore()</tt> call. This is not mandatory, however.
+You can first assign the temporary values to the global variables and then do the
+<tt>SetupStore()</tt> calls, or you can define a class or struct that contains all
+your setup parameters and use that one to copy all parameters with one single statement
+(like VDR does with its cSetup class).
+<!--X1.1.1--></td></tr></table>
+
 <a name="Internationalization"><hr><h2>Internationalization</h2>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
@@ -519,7 +638,7 @@ <h1>The VDR Plugin System</h1>
   { NULL }
   };
 
-void cPluginDemo::Start(void)
+void cPluginHello::Start(void)
 {
   RegisterI18n(Phrases);
 }
@@ -557,20 +676,20 @@ <h1>The VDR Plugin System</h1>
 Plugins are loaded into VDR using the command line option <b><tt>-P</tt></b>, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-vdr -Pdemo
+vdr -Phello
 </pre></td></tr></table><p>
 
 If the plugin accepts command line options, they are given as part of the argument
 to the <b><tt>-P</tt></b> option, which then has to be enclosed in quotes:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-vdr -P"demo -a abc -b"
+vdr -P"hello -a abc -b"
 </pre></td></tr></table><p>
 
 Any number of plugins can be loaded this way, each with its own <b><tt>-P</tt></b> option:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-vdr -P"demo -a abc -b" -Pdvd -Pmp3
+vdr -P"hello -a abc -b" -Pdvd -Pmp3
 </pre></td></tr></table><p>
 
 If you are not starting VDR from the VDR source directory (and thus your plugins
@@ -578,7 +697,7 @@ <h1>The VDR Plugin System</h1>
 the plugins through the <b><tt>-L</tt></b> option:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-vdr -L/usr/lib/vdr -Pdemo
+vdr -L/usr/lib/vdr -Phello
 </pre></td></tr></table><p>
 
 There can be any number of <b><tt>-L</tt></b> options, and each of them will apply to the
@@ -603,17 +722,17 @@ <h1>The VDR Plugin System</h1>
 Simply change into your source directory and execute <tt>make package</tt>:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-cd VDR/PLUGINS/SRC/demo
+cd VDR/PLUGINS/SRC/hello
 make package
 </pre></td></tr></table><p>
 
 After this you should find a file named like
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-vdr-demo-0.0.1.tgz
+vdr-hello-0.0.1.tgz
 </pre></td></tr></table><p>
 
-in your source directory, where <tt>demo</tt> will be replaced with your actual
+in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
 </body>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index b35760cac..dff114d5f 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'hello' Revision History
 2002-05-09: Version 0.0.1
 
 - Initial revision.
+
+2002-05-11: Version 0.0.2
+
+- Added setup parameters and a Setup menu to adjust them.
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 5db4f2a27..65d03c8b6 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.1 2002/05/09 15:28:51 kls Exp $
+ * $Id: hello.c 1.2 2002/05/11 14:17:20 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
@@ -34,6 +34,39 @@ class cPluginHello : public cPlugin {
   virtual bool SetupParse(const char *Name, const char *Value);
   };
 
+// Global variables that control the overall behaviour:
+
+int GreetingTime = 3;
+int UseAlternateGreeting = false;
+
+// --- cMenuSetupHello -------------------------------------------------------
+
+class cMenuSetupHello : public cMenuSetupPage {
+private:
+  int newGreetingTime;
+  int newUseAlternateGreeting;
+protected:
+  virtual void Store(void);
+public:
+  cMenuSetupHello(void);
+  };
+
+cMenuSetupHello::cMenuSetupHello(void)
+{
+  newGreetingTime = GreetingTime;
+  newUseAlternateGreeting = UseAlternateGreeting;
+  Add(new cMenuEditIntItem( tr("Greeting time (s)"),      &newGreetingTime));
+  Add(new cMenuEditBoolItem(tr("Use alternate greeting"), &newUseAlternateGreeting));
+}
+
+void cMenuSetupHello::Store(void)
+{
+  SetupStore("GreetingTime", GreetingTime = newGreetingTime);
+  SetupStore("UseAlternateGreeting", UseAlternateGreeting = newUseAlternateGreeting);
+}
+
+// --- cPluginHello ----------------------------------------------------------
+
 cPluginHello::cPluginHello(void)
 {
   // Initialize any member varaiables here.
@@ -86,20 +119,24 @@ void cPluginHello::Start(void)
 cOsdMenu *cPluginHello::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
-  Interface->Info(tr("Hello world!"));
+  Interface->Confirm(UseAlternateGreeting ? tr("Howdy folks!") : tr("Hello world!"), GreetingTime);
   return NULL;
 }
 
 cMenuSetupPage *cPluginHello::SetupMenu(void)
 {
   // Return a setup menu in case the plugin supports one.
-  return NULL;
+  return new cMenuSetupHello;
 }
 
 bool cPluginHello::SetupParse(const char *Name, const char *Value)
 {
   // Parse your own setup parameters and store their values.
-  return false;
+  if      (!strcasecmp(Name, "GreetingTime"))         GreetingTime = atoi(Value);
+  else if (!strcasecmp(Name, "UseAlternateGreeting")) UseAlternateGreeting = atoi(Value);
+  else
+     return false;
+  return true;
 }
 
 VDRPLUGINCREATOR(cPluginHello); // Don't touch this!
diff --git a/PLUGINS/SRC/hello/i18n.c b/PLUGINS/SRC/hello/i18n.c
index 70617421b..9bb6fbf56 100644
--- a/PLUGINS/SRC/hello/i18n.c
+++ b/PLUGINS/SRC/hello/i18n.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.c 1.1 2002/05/09 15:13:31 kls Exp $
+ * $Id: i18n.c 1.2 2002/05/11 12:27:00 kls Exp $
  */
 
 #include "i18n.h"
@@ -35,6 +35,19 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
+  { "Howdy folks!",
+    "Tach zusammen!",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "A friendly greeting",
     "Ein freundlicher Gru�",
     "",// TODO
@@ -48,5 +61,31 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
+  { "Greeting time (s)",
+    "Dauer des Gru�es (s)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Use alternate greeting",
+    "Alternativen Gru� verwenden",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { NULL }
   };
diff --git a/PLUGINS/SRC/hello/i18n.h b/PLUGINS/SRC/hello/i18n.h
index 2976fe888..577628a9f 100644
--- a/PLUGINS/SRC/hello/i18n.h
+++ b/PLUGINS/SRC/hello/i18n.h
@@ -3,9 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.h 1.1 2002/05/09 15:15:49 kls Exp $
+ * $Id: i18n.h 1.2 2002/05/11 14:48:16 kls Exp $
  */
 
+#ifndef _I18N__H
+#define _I18N__H
+
 #include <vdr/i18n.h>
 
 extern const tI18nPhrase Phrases[];
+
+#endif //_I18N__H
diff --git a/config.c b/config.c
index 8290e735e..eeb96eb59 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.99 2002/05/05 09:10:00 kls Exp $
+ * $Id: config.c 1.100 2002/05/11 12:05:22 kls Exp $
  */
 
 #include "config.h"
@@ -1073,14 +1073,19 @@ bool cSetup::Load(const char *FileName)
   if (cConfig<cSetupLine>::Load(FileName, true)) {
      bool result = true;
      for (cSetupLine *l = First(); l; l = Next(l)) {
+         bool error = false;
          if (l->Plugin()) {
             cPlugin *p = cPluginManager::GetPlugin(l->Plugin());
             if (p && !p->SetupParse(l->Name(), l->Value()))
-               result = false;
+               error = true;
             }
          else {
             if (!Parse(l->Name(), l->Value()))
-               result = false;
+               error = true;
+            }
+         if (error) {
+            esyslog(LOG_ERR, "ERROR: unknown config parameter: %s%s%s = %s", l->Plugin() ? l->Plugin() : "", l->Plugin() ? "." : "", l->Name(), l->Value());
+            result = false;
             }
          }
      return result;
diff --git a/config.h b/config.h
index 3949dde7e..a11f1fa3c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.113 2002/05/04 14:29:29 kls Exp $
+ * $Id: config.h 1.114 2002/05/10 13:48:00 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.0"
+#define VDRVERSION "1.1.1"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbosd.c b/dvbosd.c
index eb962613b..227d1ff96 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -1,383 +1,45 @@
 /*
- * dvbosd.c: Interface to the DVB On Screen Display
+ * dvbosd.c: Implementation of the DVB On Screen Display
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.13 2002/04/13 11:34:48 kls Exp $
+ * $Id: dvbosd.c 1.14 2002/05/10 14:22:04 kls Exp $
  */
 
 #include "dvbosd.h"
 #include <signal.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
 #include <sys/unistd.h>
 #include "tools.h"
 
-// --- cPalette --------------------------------------------------------------
-
-cPalette::cPalette(int Bpp)
-{
-  maxColors = 1 << Bpp;
-  numColors = 0;
-  full = false;
-}
-
-int cPalette::Index(eDvbColor Color)
-{
-#if __BYTE_ORDER == __BIG_ENDIAN
-  Color = eDvbColor(((Color & 0xFF) << 24) | ((Color & 0xFF00) << 8) | ((Color & 0xFF0000) >> 8) | ((Color & 0xFF000000) >> 24));
-#endif
-  for (int i = 0; i < numColors; i++) {
-      if (color[i] == Color) {
-         used[i] = true;
-         return i;
-         }
-      }
-  if (!full) {
-     if (numColors < maxColors) {
-        color[numColors++] = Color;
-        used[numColors - 1] = true;
-        fetched[numColors - 1] = false;
-        return numColors - 1;
-        }
-     for (int i = maxColors; --i >= 0; ) {
-         if (!used[i]) {
-            color[i] = Color;
-            used[i] = true;
-            fetched[i] = false;
-            return i;
-            }
-         }
-     esyslog(LOG_ERR, "ERROR: too many different colors used in palette");
-     full = true;
-     }
-  return 0;
-}
-
-void cPalette::Reset(void)
-{
-  for (int i = 0; i < numColors; i++)
-      used[i] = false;
-  full = false;
-}
-
-const eDvbColor *cPalette::Colors(int &FirstColor, int &LastColor)
-{
-  for (FirstColor = 0; FirstColor < numColors; FirstColor++) {
-      if (!fetched[FirstColor]) {
-         for (LastColor = FirstColor; LastColor < numColors && !fetched[LastColor]; LastColor++)
-             fetched[LastColor] = true;
-         LastColor--; // the loop ended one past the last one!
-         return &color[FirstColor];
-         }
-      }
-  return NULL;
-}
-
-void cPalette::Take(const cPalette &Palette, tIndexes *Indexes)
-{
-  for (int i = 0; i < Palette.numColors; i++) {
-      if (Palette.used[i]) {
-         int n = Index(Palette.color[i]);
-         if (Indexes)
-            (*Indexes)[i] = n;
-         }
-      }
-}
-
-// --- cBitmap ---------------------------------------------------------------
-
-cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
-:cPalette(Bpp)
-{
-  width = Width;
-  height = Height;
-  clearWithBackground = ClearWithBackground;
-  bitmap = NULL;
-  fontType = fontOsd;
-  font = NULL;
-  if (width > 0 && height > 0) {
-     bitmap = new char[width * height];
-     if (bitmap) {
-        Clean();
-        memset(bitmap, 0x00, width * height);
-        SetFont(fontOsd);
-        }
-     else
-        esyslog(LOG_ERR, "ERROR: can't allocate bitmap!");
-     }
-  else
-     esyslog(LOG_ERR, "ERROR: illegal bitmap parameters (%d, %d)!", width, height);
-}
-
-cBitmap::~cBitmap()
-{
-  delete font;
-  delete bitmap;
-}
-
-eDvbFont cBitmap::SetFont(eDvbFont Font)
-{
-  eDvbFont oldFont = fontType;
-  if (fontType != Font || !font) {
-     delete font;
-     font = new cFont(Font);
-     fontType = Font;
-     }
-  return oldFont;
-}
-
-bool cBitmap::Dirty(int &x1, int &y1, int &x2, int &y2)
-{
-  if (dirtyX2 >= 0) {
-     //XXX Workaround: apparently the bitmap sent to the driver always has to be a multiple
-     //XXX of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
-     //TODO Fix driver (should be able to handle any size bitmaps!)
-     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && ((dirtyX2 - dirtyX1) & 7) != 7) {
-           if (dirtyX2 < width - 1)
-              dirtyX2++;
-           else if (dirtyX1 > 0)
-              dirtyX1--;
-           }
-     //XXX "... / 2" <==> Bpp???
-     while ((dirtyY1 > 0 || dirtyY2 < height - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
-           if (dirtyY2 < height - 1)
-              dirtyY2++;
-           else if (dirtyY1 > 0)
-              dirtyY1--;
-           }
-     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
-           if (dirtyX2 < width - 1)
-              dirtyX2++;
-           else if (dirtyX1 > 0)
-              dirtyX1--;
-           }
-     x1 = dirtyX1;
-     y1 = dirtyY1;
-     x2 = dirtyX2;
-     y2 = dirtyY2;
-     return true;
-     }
-  return false;
-}
-
-void cBitmap::Clean(void)
-{
-  dirtyX1 = width;
-  dirtyY1 = height;
-  dirtyX2 = -1;
-  dirtyY2 = -1;
-}
-
-void cBitmap::SetIndex(int x, int y, char Index)
-{
-  if (bitmap) {
-     if (0 <= x && x < width && 0 <= y && y < height) {
-        if (bitmap[width * y + x] != Index) {
-           bitmap[width * y + x] = Index;
-           if (dirtyX1 > x)  dirtyX1 = x;
-           if (dirtyY1 > y)  dirtyY1 = y;
-           if (dirtyX2 < x)  dirtyX2 = x;
-           if (dirtyY2 < y)  dirtyY2 = y;
-           }
-        }
-     }
-}
-
-void cBitmap::SetPixel(int x, int y, eDvbColor Color)
-{
-  SetIndex(x, y, Index(Color));
-}
-
-void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
-{
-  if (bitmap && Bitmap.bitmap) {
-     tIndexes Indexes;
-     Take(Bitmap, &Indexes);
-     for (int ix = 0; ix < Bitmap.width; ix++) {
-         for (int iy = 0; iy < Bitmap.height; iy++)
-             SetIndex(x + ix, y + iy, Indexes[Bitmap.bitmap[Bitmap.width * iy + ix]]);
-         }
-     }
-}
-
-int cBitmap::Width(unsigned char c)
-{
-  return font ? font->Width(c) : -1;
-}
-
-int cBitmap::Width(const char *s)
-{
-  return font ? font->Width(s) : -1;
-}
-
-void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
-{
-  if (bitmap) {
-     char fg = Index(ColorFg);
-     char bg = Index(ColorBg);
-     int h = font->Height(s);
-     while (s && *s) {
-           const cFont::tCharData *CharData = font->CharData(*s++);
-           if (int(x + CharData->width) > width)
-              break;
-           for (int row = 0; row < h; row++) {
-               cFont::tPixelData PixelData = CharData->lines[row];
-               for (int col = CharData->width; col-- > 0; ) {
-                   SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
-                   PixelData >>= 1;
-                   }
-               }
-           x += CharData->width;
-           }
-     }
-}
-
-void cBitmap::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
-{
-  if (bitmap) {
-     char c = Index(Color);
-     for (int y = y1; y <= y2; y++)
-         for (int x = x1; x <= x2; x++)
-             SetIndex(x, y, c);
-     }
-}
-
-void cBitmap::Clear(void)
-{
-  Reset();
-  if (clearWithBackground)
-     Fill(0, 0, width - 1, height - 1, clrBackground);
-}
-
-const char *cBitmap::Data(int x, int y)
-{
-  return &bitmap[y * width + x];
-}
-
-// --- cWindow ---------------------------------------------------------------
-
-class cWindow : public cBitmap {
-private:
-  int handle;  // the index within the OSD's window array (0...MAXNUMWINDOWS - 1)
-  int x0, y0;
-  int bpp;
-  bool tiled;
-  bool shown;
-public:
-  cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled);
-  int X0(void) { return x0; }
-  int Y0(void) { return y0; }
-  int Bpp(void) { return bpp; }
-  bool Tiled(void) { return tiled; }
-  bool Shown(void) { bool s = shown; shown = true; return s; }
-  int Handle(void) { return handle; }
-  bool Contains(int x, int y);
-  void Relocate(int x, int y);
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
-  const char *Data(int x, int y);
-  };
-
-cWindow::cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
-:cBitmap(w, h, Bpp, ClearWithBackground)
-{
-  handle = Handle;
-  x0 = x;
-  y0 = y;
-  bpp = Bpp;
-  tiled = Tiled;
-  shown = false;
-}
-
-bool cWindow::Contains(int x, int y)
-{
-  x -= x0;
-  y -= y0;
-  return x >= 0 && y >= 0 && x < width && y < height;
-}
-
-void cWindow::Relocate(int x, int y)
-{
-  x0 = x;
-  y0 = y;
-}
-
-void cWindow::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
-{
-  if (tiled) {
-     x1 -= x0;
-     y1 -= y0;
-     x2 -= x0;
-     y2 -= y0;
-     }
-  cBitmap::Fill(x1, y1, x2, y2, Color);
-}
-
-void cWindow::SetBitmap(int x, int y, const cBitmap &Bitmap)
-{
-  if (tiled) {
-     x -= x0;
-     y -= y0;
-     }
-  cBitmap::SetBitmap(x, y, Bitmap);
-}
-
-void cWindow::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
-{
-  if (tiled) {
-     x -= x0;
-     y -= y0;
-     }
-  cBitmap::Text(x, y, s, ColorFg, ColorBg);
-}
-
-const char *cWindow::Data(int x, int y)
-{
-  return cBitmap::Data(x, y);
-}
-
-// --- cDvbOsd ---------------------------------------------------------------
-
-cDvbOsd::cDvbOsd(int VideoDev, int x, int y, int w, int h, int Bpp)
+cDvbOsd::cDvbOsd(int VideoDev, int x, int y)
+:cOsd(x, y)
 {
   videoDev = VideoDev;
-  numWindows = 0;
-  x0 = x;
-  y0 = y;
-  if (videoDev >= 0) {
-     if (w > 0 && h > 0)
-        Create(0, 0, w, h, Bpp);
-     }
-  else
+  if (videoDev < 0)
      esyslog(LOG_ERR, "ERROR: illegal video device handle (%d)!", videoDev);
 }
 
 cDvbOsd::~cDvbOsd()
 {
-  if (videoDev >= 0) {
-     for (int i = 0; i < numWindows; i++) {
-         SetWindow(window[i]);
-         Cmd(OSD_Close);
-         delete window[i];
-         }
-     numWindows = 0;
-     }
+  for (int i = 0; i < NumWindows(); i++)
+      CloseWindow(GetWindowNr(i));
 }
 
 bool cDvbOsd::SetWindow(cWindow *Window)
 {
-  // Window handles are counted 0...(MAXNUMWINDOWS - 1), but the actual window
-  // numbers in the driver are used from 1...MAXNUMWINDOWS.
-  int Handle = Window->Handle();
-  if (0 <= Handle && Handle < MAXNUMWINDOWS) {
-     Cmd(OSD_SetWindow, 0, Handle + 1);
-     return true;
+  if (Window) {
+     // Window handles are counted 0...(MAXNUMWINDOWS - 1), but the actual window
+     // numbers in the driver are used from 1...MAXNUMWINDOWS.
+     int Handle = Window->Handle();
+     if (0 <= Handle && Handle < MAXNUMWINDOWS) {
+        Cmd(OSD_SetWindow, 0, Handle + 1);
+        return true;
+        }
+     esyslog(LOG_ERR, "ERROR: illegal window handle: %d", Handle);
      }
-  esyslog(LOG_ERR, "ERROR: illegal window handle: %d", Handle);
-  return -1;
+  return false;
 }
 
 void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
@@ -406,166 +68,51 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      }
 }
 
-tWindowHandle cDvbOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
+bool cDvbOsd::OpenWindow(cWindow *Window)
 {
-  if (numWindows < MAXNUMWINDOWS) {
-     if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
-        if ((w & 0x03) != 0) {
-           w += 4 - (w & 0x03);
-           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
-           }
-        cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
-        if (SetWindow(win)) {
-           window[win->Handle()] = win;
-           Cmd(OSD_Open, Bpp, x0 + x, y0 + y, x0 + x + w - 1, y0 + y + h - 1, (void *)1); // initially hidden!
-           numWindows++;
-           return win->Handle();
-           }
-        else
-           delete win;
-        }
-     else
-        esyslog(LOG_ERR, "ERROR: illegal OSD parameters");
-     }
-  else
-     esyslog(LOG_ERR, "ERROR: too many OSD windows");
-  return -1;
-}
-
-void cDvbOsd::AddColor(eDvbColor Color, tWindowHandle Window)
-{
-  cWindow *w = GetWindow(Window);
-  if (w) {
-     w->Index(Color);
-     w->Reset();
+  if (SetWindow(Window)) {
+     Cmd(OSD_Open, Window->Bpp(), X0() + Window->X0(), Y0() + Window->Y0(), X0() + Window->X0() + Window->Width() - 1, Y0() + Window->Y0() + Window->Height() - 1, (void *)1); // initially hidden!
+     return true;
      }
+  return false;
 }
 
-cWindow *cDvbOsd::GetWindow(int x, int y)
-{
-  for (int i = 0; i < numWindows; i++) {
-      if (window[i]->Tiled() && window[i]->Contains(x, y))
-         return window[i];
-      }
-  return NULL;
-}
-
-cWindow *cDvbOsd::GetWindow(tWindowHandle Window)
-{
-  if (0 <= Window && Window < numWindows)
-     return window[Window];
-  if (Window == LAST_CREATED_WINDOW && numWindows > 0)
-     return window[numWindows - 1];
-  return NULL;
-}
-
-void cDvbOsd::Flush(void)
-{
-  for (int i = 0; i < numWindows; i++) {
-      int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-      if (window[i]->Dirty(x1, y1, x2, y2)) {
-         SetWindow(window[i]);
-         int FirstColor = 0, LastColor = 0;
-         const eDvbColor *pal;
-         while ((pal = window[i]->Colors(FirstColor, LastColor)) != NULL)
-               Cmd(OSD_SetPalette, FirstColor, LastColor, 0, 0, 0, pal);
-         Cmd(OSD_SetBlock, window[i]->Width(), x1, y1, x2, y2, window[i]->Data(x1, y1));
-         window[i]->Clean();
-         }
-      }
-  // Showing the windows in a separate loop to avoid seeing them come up one after another
-  for (int i = 0; i < numWindows; i++) {
-      if (!window[i]->Shown()) {
-         SetWindow(window[i]);
-         Cmd(OSD_MoveWindow, 0, x0 + window[i]->X0(), y0 + window[i]->Y0());
-         }
-      }
-}
-
-void cDvbOsd::Clear(tWindowHandle Window)
+void cDvbOsd::CommitWindow(cWindow *Window)
 {
-  if (Window == ALL_TILED_WINDOWS || Window == ALL_WINDOWS) {
-     for (int i = 0; i < numWindows; i++)
-         if (Window == ALL_WINDOWS || window[i]->Tiled())
-            window[i]->Clear();
-     }
-  else {
-     cWindow *w = GetWindow(Window);
-     if (w)
-        w->Clear();
+  if (SetWindow(Window)) {
+     int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+     if (Window->Dirty(x1, y1, x2, y2)) {
+        // commit colors:
+        int FirstColor = 0, LastColor = 0;
+        const eDvbColor *pal;
+        while ((pal = Window->Colors(FirstColor, LastColor)) != NULL)
+              Cmd(OSD_SetPalette, FirstColor, LastColor, 0, 0, 0, pal);
+        // commit modified data:
+        Cmd(OSD_SetBlock, Window->Width(), x1, y1, x2, y2, Window->Data(x1, y1));
+        }
      }
 }
 
-void cDvbOsd::Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window)
+void cDvbOsd::ShowWindow(cWindow *Window)
 {
-  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x1, y1) : GetWindow(Window);
-  if (w)
-     w->Fill(x1, y1, x2, y2, Color);
+  if (SetWindow(Window))
+     Cmd(OSD_MoveWindow, 0, X0() + Window->X0(), Y0() + Window->Y0());
 }
 
-void cDvbOsd::SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window)
+void cDvbOsd::HideWindow(cWindow *Window, bool Hide)
 {
-  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
-  if (w)
-     w->SetBitmap(x, y, Bitmap);
+  if (SetWindow(Window))
+     Cmd(Hide ? OSD_Hide : OSD_Show, 0);
 }
 
-int cDvbOsd::Width(unsigned char c)
+void cDvbOsd::MoveWindow(cWindow *Window, int x, int y)
 {
-  return numWindows ? window[0]->Width(c) : 0;
+  if (SetWindow(Window))
+     Cmd(OSD_MoveWindow, 0, X0() + x, Y0() + y);
 }
 
-int cDvbOsd::Width(const char *s)
+void cDvbOsd::CloseWindow(cWindow *Window)
 {
-  return numWindows ? window[0]->Width(s) : 0;
+  if (SetWindow(Window))
+     Cmd(OSD_Close);
 }
-
-eDvbFont cDvbOsd::SetFont(eDvbFont Font)
-{
-  eDvbFont oldFont = Font;
-  for (int i = 0; i < numWindows; i++)
-      oldFont = window[i]->SetFont(Font);
-  return oldFont;
-}
-
-void cDvbOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
-{
-  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
-  if (w)
-     w->Text(x, y, s, ColorFg, ColorBg);
-}
-
-void cDvbOsd::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHeight)
-{
-  cWindow *w = GetWindow(Window);
-  if (w) {
-     SetWindow(w);
-     if (NewWidth > 0 && NewHeight > 0) {
-        if ((NewWidth & 0x03) != 0) {
-           NewWidth += 4 - (NewWidth & 0x03);
-           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
-           }
-        Cmd(OSD_Close);
-        window[w->Handle()] = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());
-        delete w;
-        Cmd(OSD_Open, 2, x0 + x, y0 + y, x0 + x + NewWidth - 1, y0 + y + NewHeight - 1, (void *)1); // initially hidden!
-        }
-     else {
-        w->Relocate(x, y);
-        Cmd(OSD_MoveWindow, 0, x0 + x, y0 + y);
-        }
-     }
-}
-
-void cDvbOsd::Hide(tWindowHandle Window)
-{
-  if (SetWindow(GetWindow(Window)))
-     Cmd(OSD_Hide, 0);
-}
-
-void cDvbOsd::Show(tWindowHandle Window)
-{
-  if (SetWindow(GetWindow(Window)))
-     Cmd(OSD_Show, 0);
-}
-
diff --git a/dvbosd.h b/dvbosd.h
index 0e90414cc..ff26bcff4 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -1,178 +1,33 @@
 /*
- * dvbosd.h: Interface to the DVB On Screen Display
+ * dvbosd.h: Implementation of the DVB On Screen Display
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.10 2002/02/03 16:43:50 kls Exp $
+ * $Id: dvbosd.h 1.11 2002/05/10 14:22:07 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
-#include <ncurses.h>
-#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
-#endif
 #include <ost/osd.h>
-#include <stdio.h>
-#include "font.h"
+#include "osdbase.h"
 
-#define MAXNUMCOLORS 16
-
-enum eDvbColor {
-#ifdef DEBUG_OSD
-  clrBackground,
-  clrTransparent = clrBackground,
-  clrBlack = clrBackground,
-  clrRed,
-  clrGreen,
-  clrYellow,
-  clrBlue,
-  clrMagenta,
-  clrCyan,
-  clrWhite,
-#else
-  clrTransparent = 0x00000000,
-  clrBackground  = 0x7F000000, // 50% gray
-  clrBlack       = 0xFF000000,
-  clrRed         = 0xFF1414FC,
-  clrGreen       = 0xFF24FC24,
-  clrYellow      = 0xFF24C0FC,
-  clrMagenta     = 0xFFFC00B0,
-  clrBlue        = 0xFFFC0000,
-  clrCyan        = 0xFFFCFC00,
-  clrWhite       = 0xFFFCFCFC,
-#endif
-  };
-
-class cPalette {
-private:
-  eDvbColor color[MAXNUMCOLORS];
-  int maxColors, numColors;
-  bool used[MAXNUMCOLORS];
-  bool fetched[MAXNUMCOLORS];
-  bool full;
-protected:
-  typedef unsigned char tIndexes[MAXNUMCOLORS];
-public:
-  cPalette(int Bpp);
-  int Index(eDvbColor Color);
-  void Reset(void);
-  const eDvbColor *Colors(int &FirstColor, int &LastColor);
-  void Take(const cPalette &Palette, tIndexes *Indexes = NULL);
-  };
-
-class cBitmap : public cPalette {
-private:
-  cFont *font;
-  eDvbFont fontType;
-  void SetIndex(int x, int y, char Index);
-  char *bitmap;
-  bool clearWithBackground;
-protected:
-  int width, height;
-  int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
-public:
-  cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground = true);
-  virtual ~cBitmap();
-  bool ClearWithBackground(void) { return clearWithBackground; }
-  eDvbFont SetFont(eDvbFont Font);
-  bool Dirty(int &x1, int &y1, int &x2, int &y2);
-  void SetPixel(int x, int y, eDvbColor Color);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  int Width(void) { return width; }
-  int Width(unsigned char c);
-  int Width(const char *s);
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
-  void Clean(void);
-  void Clear(void);
-  const char *Data(int x, int y);
-  };
-
-#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
-
-class cWindow;
-
-typedef int tWindowHandle;
-
-// '-1' is used as an error return value!
-#define ALL_WINDOWS         (-2)
-#define ALL_TILED_WINDOWS   (-3)
-#define LAST_CREATED_WINDOW (-4)
-
-class cDvbOsd {
+class cDvbOsd : public cOsd {
 private:
   int videoDev;
-  int numWindows;
-  int x0, y0;
-  cWindow *window[MAXNUMWINDOWS];
   bool SetWindow(cWindow *Window);
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
-  cWindow *GetWindow(int x, int y);
-  cWindow *GetWindow(tWindowHandle Window);
+protected:
+  virtual bool OpenWindow(cWindow *Window);
+  virtual void CommitWindow(cWindow *Window);
+  virtual void ShowWindow(cWindow *Window);
+  virtual void HideWindow(cWindow *Window, bool Hide);
+  virtual void MoveWindow(cWindow *Window, int x, int y);
+  virtual void CloseWindow(cWindow *Window);
 public:
-  cDvbOsd(int VideoDev, int x, int y, int w = -1, int h = -1, int Bpp = -1);
-       // Initializes the OSD on the given VideoDev, starting at screen coordinates
-       // (x, y). If w, h and Bpp are given, one window with that width, height and
-       // color depth will be created - otherwise the actual windows will have to
-       // be created by separate calls to Create().
-  ~cDvbOsd();
-       // Destroys all windows and shuts down the OSD.
-  tWindowHandle Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, bool Tiled = true);
-       // Creates a window at coordinates (x, y), which are relative to the OSD's
-       // origin given in the constructor, with the given width, height and color
-       // depth. ClearWithBackground controls whether the window will be filled with
-       // clrBackground when it is cleared. Setting this to 'false' may be useful
-       // for windows that don't need clrBackground but want to save this color
-       // palette entry for a different color. Tiled controls whether this will
-       // be part of a multi section OSD (with several windows that all have
-       // different color depths and palettes and form one large OSD area), or
-       // whether this is a "standalone" window that will be drawn "in front"
-       // of any windows defined *after* this one (this can be used for highlighting
-       // certain parts of the OSD, as would be done in a 'cursor').
-       // Returns a handle that can be used to identify this window.
-  void AddColor(eDvbColor Color, tWindowHandle Window = LAST_CREATED_WINDOW);
-       // Adds the Color to the color palette of the given window if it is not
-       // already contained in the palette (and if the palette still has free
-       // slots for new colors). The default value LAST_CREATED_WINDOW will
-       // access the most recently created window, without the need of explicitly
-       // using a window handle.
-  void Flush(void);
-       // Actually commits all data of all windows to the OSD.
-  void Clear(tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Clears the given window. If ALL_TILED_WINDOWS is given, only the tiled
-       // windows will be cleared, leaving the standalone windows untouched. If
-       // ALL_WINDOWS is given, the standalone windows will also be cleared.
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Fills the rectangle defined by the upper left (x1, y2) and lower right
-       // (x2, y2) corners with the given Color. If a specific window is given,
-       // the coordinates are relative to that window's upper left corner.
-       // Otherwise they are relative to the upper left corner of the entire OSD.
-       // If all tiled windows are selected, only that window which contains the
-       // point (x1, y1) will actually be filled.
-  void SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Sets the pixels within the given window with the data from the given
-       // Bitmap. See Fill() for details about the coordinates.
-  int Width(unsigned char c);
-       // Returns the width (in pixels) of the given character in the current font.
-  int Width(const char *s);
-       // Returns the width (in pixels) of the given string in the current font.
-  eDvbFont SetFont(eDvbFont Font);
-       // Sets the current font for subsequent Width() and Text() operations.
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Writes the given string at coordinates (x, y) with the given foreground
-       // and background color into the given window (see Fill() for details
-       // about the coordinates).
-  void Relocate(tWindowHandle Window, int x, int y, int NewWidth = -1, int NewHeight = -1);
-       // Moves the given window to the new location at (x, y). If NewWidth and
-       // NewHeight are also given, the window will also be resized to the new
-       // width and height.
-  void Hide(tWindowHandle Window);
-       // Hides the given window.
-  void Show(tWindowHandle Window);
-       // Shows the given window.
+  cDvbOsd(int VideoDev, int x, int y);
+  virtual ~cDvbOsd();
   };
 
 #endif //__DVBOSD_H
diff --git a/i18n.c b/i18n.c
index 4129cf7ae..39ddea363 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.87 2002/05/09 13:40:51 kls Exp $
+ * $Id: i18n.c 1.88 2002/05/11 11:43:38 kls Exp $
  *
  * Translations provided by:
  *
@@ -1270,6 +1270,19 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
   },
+  { "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
+  },
   { "Restart",
     "Neustart",
     "Ponoven zagon",
diff --git a/menu.c b/menu.c
index ef7581957..abcd72270 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.190 2002/05/09 10:13:47 kls Exp $
+ * $Id: menu.c 1.191 2002/05/11 11:16:32 kls Exp $
  */
 
 #include "menu.h"
@@ -1525,19 +1525,41 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuSetupBase --------------------------------------------------------
+
+class cMenuSetupBase : public cMenuSetupPage {
+protected:
+  cSetup data;
+  virtual void Store(void);
+public:
+  cMenuSetupBase(void);
+  };
+
+cMenuSetupBase::cMenuSetupBase(void)
+{
+  data = Setup;
+}
+
+void cMenuSetupBase::Store(void)
+{
+  Setup = data;
+  Setup.Save();
+}
+
 // --- cMenuSetupOSD ---------------------------------------------------------
 
-class cMenuSetupOSD : public cMenuSetupPage {
+class cMenuSetupOSD : public cMenuSetupBase {
 private:
   virtual void Set(void);
 public:
   cMenuSetupOSD(void) { Set(); }
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 void cMenuSetupOSD::Set(void)
 {
   Clear();
-  SetupTitle("OSD");
+  SetSection(tr("OSD"));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, I18nNumLanguages, I18nLanguages()));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
@@ -1549,19 +1571,31 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
 }
 
+eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
+{
+  int osdLanguage = data.OSDLanguage;
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+
+  if (data.OSDLanguage != osdLanguage) {
+     int OriginalOSDLanguage = Setup.OSDLanguage;
+     Setup.OSDLanguage = data.OSDLanguage;
+     Set();
+     Display();
+     Setup.OSDLanguage = OriginalOSDLanguage;
+     }
+  return state;
+}
+
 // --- cMenuSetupEPG ---------------------------------------------------------
 
-class cMenuSetupEPG : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupEPG : public cMenuSetupBase {
 public:
-  cMenuSetupEPG(void) { Set(); }
+  cMenuSetupEPG(void);
   };
 
-void cMenuSetupEPG::Set(void)
+cMenuSetupEPG::cMenuSetupEPG(void)
 {
-  Clear();
-  SetupTitle("EPG");
+  SetSection(tr("EPG"));
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"),      &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"),          &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
@@ -1570,34 +1604,43 @@ void cMenuSetupEPG::Set(void)
 
 // --- cMenuSetupDVB ---------------------------------------------------------
 
-class cMenuSetupDVB : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupDVB : public cMenuSetupBase {
 public:
-  cMenuSetupDVB(void) { Set(); }
+  cMenuSetupDVB(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
-void cMenuSetupDVB::Set(void)
+cMenuSetupDVB::cMenuSetupDVB(void)
 {
-  Clear();
-  SetupTitle("DVB");
+  SetSection(tr("DVB"));
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
 }
 
+eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
+{
+  int oldPrimaryDVB = Setup.PrimaryDVB;
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+
+  if (state == osBack && Key == kOk) {
+     if (Setup.PrimaryDVB != oldPrimaryDVB) {
+        state = osSwitchDvb;
+        cDvbApi::PrimaryDvbApi->SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+        }
+     }
+  return state;
+}
+
 // --- cMenuSetupLNB ---------------------------------------------------------
 
-class cMenuSetupLNB : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupLNB : public cMenuSetupBase {
 public:
-  cMenuSetupLNB(void) { Set(); }
+  cMenuSetupLNB(void);
   };
 
-void cMenuSetupLNB::Set(void)
+cMenuSetupLNB::cMenuSetupLNB(void)
 {
-  Clear();
-  SetupTitle("LNB");
+  SetSection(tr("LNB"));
   Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF (MHz)"),               &data.LnbSLOF));
   Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency (MHz)"),  &data.LnbFrequLo));
   Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi));
@@ -1606,17 +1649,15 @@ void cMenuSetupLNB::Set(void)
 
 // --- cMenuSetupCICAM -------------------------------------------------------
 
-class cMenuSetupCICAM : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupCICAM : public cMenuSetupBase {
 public:
-  cMenuSetupCICAM(void) { Set(); }
+  cMenuSetupCICAM(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
-void cMenuSetupCICAM::Set(void)
+cMenuSetupCICAM::cMenuSetupCICAM(void)
 {
-  Clear();
-  SetupTitle("CICAM");
+  SetSection(tr("CICAM"));
   for (int d = 0; d < cDvbApi::NumDvbApis; d++) {
       for (int i = 0; i < 2; i++) {
           char buffer[32];
@@ -1626,19 +1667,25 @@ void cMenuSetupCICAM::Set(void)
       }
 }
 
+eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+
+  if (state == osBack && Key == kOk)
+     cDvbApi::SetCaCaps();
+  return state;
+}
+
 // --- cMenuSetupRecord ------------------------------------------------------
 
-class cMenuSetupRecord : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupRecord : public cMenuSetupBase {
 public:
-  cMenuSetupRecord(void) { Set(); }
+  cMenuSetupRecord(void);
   };
 
-void cMenuSetupRecord::Set(void)
+cMenuSetupRecord::cMenuSetupRecord(void)
 {
-  Clear();
-  SetupTitle("Recording");
+  SetSection(tr("Recording"));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"),     &data.MarginStart));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"),      &data.MarginStop));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),             &data.PrimaryLimit, 0, MAXPRIORITY));
@@ -1655,34 +1702,28 @@ void cMenuSetupRecord::Set(void)
 
 // --- cMenuSetupReplay ------------------------------------------------------
 
-class cMenuSetupReplay : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupReplay : public cMenuSetupBase {
 public:
-  cMenuSetupReplay(void) { Set(); }
+  cMenuSetupReplay(void);
   };
 
-void cMenuSetupReplay::Set(void)
+cMenuSetupReplay::cMenuSetupReplay(void)
 {
-  Clear();
-  SetupTitle("Replay");
+  SetSection(tr("Replay"));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
 }
 
 // --- cMenuSetupMisc --------------------------------------------------------
 
-class cMenuSetupMisc : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupMisc : public cMenuSetupBase {
 public:
-  cMenuSetupMisc(void) { Set(); }
+  cMenuSetupMisc(void);
   };
 
-void cMenuSetupMisc::Set(void)
+cMenuSetupMisc::cMenuSetupMisc(void)
 {
-  Clear();
-  SetupTitle("Miscellaneous");
+  SetSection(tr("Miscellaneous"));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
@@ -1706,18 +1747,15 @@ cMenuSetupPluginItem::cMenuSetupPluginItem(const char *Name, int Index)
 
 // --- cMenuSetupPlugins -----------------------------------------------------
 
-class cMenuSetupPlugins : public cMenuSetupPage {
-private:
-  virtual void Set(void);
+class cMenuSetupPlugins : public cMenuSetupBase {
 public:
-  cMenuSetupPlugins(void) { Set(); }
+  cMenuSetupPlugins(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-void cMenuSetupPlugins::Set(void)
+cMenuSetupPlugins::cMenuSetupPlugins(void)
 {
-  Clear();
-  SetupTitle("Plugins");
+  SetSection(tr("Plugins"));
   SetHasHotkeys();
   for (int i = 0; ; i++) {
       cPlugin *p = cPluginManager::GetPlugin(i);
@@ -1734,25 +1772,25 @@ void cMenuSetupPlugins::Set(void)
 
 eOSState cMenuSetupPlugins::ProcessKey(eKeys Key)
 {
-  eOSState state = cOsdMenu::ProcessKey(Key); // not cMenuSetupPage::ProcessKey()!
-
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk: {
-                   cMenuSetupPluginItem *item = (cMenuSetupPluginItem *)Get(Current());
-                   if (item) {
-                      cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
-                      if (p) {
-                         cOsdMenu *menu = p->SetupMenu();
-                         if (menu)
-                            return AddSubMenu(menu);
-                         Interface->Info(tr("This plugin has no setup parameters!"));
-                         }
-                      }
-                  }
-                  break;
-       default:   break;
-       }
+  eOSState state = HasSubMenu() ? cMenuSetupBase::ProcessKey(Key) : cOsdMenu::ProcessKey(Key);
+
+  if (Key == kOk) {
+     if (state == osUnknown) {
+        cMenuSetupPluginItem *item = (cMenuSetupPluginItem *)Get(Current());
+        if (item) {
+           cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
+           if (p) {
+              cMenuSetupPage *menu = p->SetupMenu();
+              if (menu) {
+                 menu->SetPlugin(p);
+                 return AddSubMenu(menu);
+                 }
+              Interface->Info(tr("This plugin has no setup parameters!"));
+              }
+           }
+        }
+     else if (state == osContinue)
+        Store();
      }
   return state;
 }
diff --git a/menuitems.c b/menuitems.c
index d09f5b703..3a6f94ea3 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.1 2002/05/09 10:10:12 kls Exp $
+ * $Id: menuitems.c 1.2 2002/05/11 10:49:45 kls Exp $
  */
 
 #include "menuitems.h"
 #include <ctype.h>
 #include "i18n.h"
+#include "plugin.h"
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -437,15 +438,13 @@ eOSState cMenuTextItem::ProcessKey(eKeys Key)
 cMenuSetupPage::cMenuSetupPage(void)
 :cOsdMenu("", 33)
 {
-  data = Setup;
-  osdLanguage = Setup.OSDLanguage;
+  plugin = NULL;
 }
 
-void cMenuSetupPage::SetupTitle(const char *s)
+void cMenuSetupPage::SetSection(const char *Section)
 {
-  char buf[40]; // can't call tr() for more than one string at a time!
-  char *q = buf + snprintf(buf, sizeof(buf), "%s - ", tr("Setup"));
-  snprintf(q, sizeof(buf) - strlen(buf), "%s", tr(s));
+  char buf[40];
+  snprintf(buf, sizeof(buf), "%s - %s", tr("Setup"), Section);
   SetTitle(buf);
 }
 
@@ -455,22 +454,31 @@ eOSState cMenuSetupPage::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk: state = (Setup.PrimaryDVB != data.PrimaryDVB) ? osSwitchDvb : osBack;
-                 cDvbApi::PrimaryDvbApi->SetVideoFormat(data.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
-                 Setup = data;
-                 Setup.Save();
-                 cDvbApi::SetCaCaps();
+       case kOk: Store();
+                 state = osBack;
                  break;
        default: break;
        }
      }
-  if (data.OSDLanguage != osdLanguage) {
-     int OriginalOSDLanguage = Setup.OSDLanguage;
-     Setup.OSDLanguage = data.OSDLanguage;
-     Set();
-     Display();
-     osdLanguage = data.OSDLanguage;
-     Setup.OSDLanguage = OriginalOSDLanguage;
-     }
   return state;
 }
+
+void cMenuSetupPage::SetPlugin(cPlugin *Plugin)
+{
+  plugin = Plugin;
+  char buf[40];
+  snprintf(buf, sizeof(buf), "%s '%s'", tr("Plugin"), plugin->Name());
+  SetSection(buf);
+}
+
+void cMenuSetupPage::SetupStore(const char *Name, const char *Value = NULL)
+{
+  if (plugin)
+     plugin->SetupStore(Name, Value);
+}
+
+void cMenuSetupPage::SetupStore(const char *Name, int Value)
+{
+  if (plugin)
+     plugin->SetupStore(Name, Value);
+}
diff --git a/menuitems.h b/menuitems.h
index a08a71488..ef25d0de5 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.1 2002/05/09 09:41:06 kls Exp $
+ * $Id: menuitems.h 1.2 2002/05/11 10:48:28 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -96,15 +96,20 @@ class cMenuTextItem : public cOsdItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cPlugin;
+
 class cMenuSetupPage : public cOsdMenu {
+private:
+  cPlugin *plugin;
 protected:
-  cSetup data;
-  int osdLanguage;
-  void SetupTitle(const char *s);
-  virtual void Set(void) = 0;
+  void SetSection(const char *Section);
+  virtual void Store(void) = 0;
+  void SetupStore(const char *Name, const char *Value = NULL);
+  void SetupStore(const char *Name, int Value);
 public:
   cMenuSetupPage(void);
   virtual eOSState ProcessKey(eKeys Key);
+  void SetPlugin(cPlugin *Plugin);
   };
 
 #endif //__MENUITEMS_H
diff --git a/osdbase.c b/osdbase.c
new file mode 100644
index 000000000..31e86def7
--- /dev/null
+++ b/osdbase.c
@@ -0,0 +1,482 @@
+/*
+ * osdbase.c: Basic interface to the On Screen Display
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: osdbase.c 1.1 2002/05/10 14:55:53 kls Exp $
+ */
+
+#include "osdbase.h"
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/unistd.h>
+#include "tools.h"
+
+// --- cPalette --------------------------------------------------------------
+
+cPalette::cPalette(int Bpp)
+{
+  maxColors = 1 << Bpp;
+  numColors = 0;
+  full = false;
+}
+
+int cPalette::Index(eDvbColor Color)
+{
+#if __BYTE_ORDER == __BIG_ENDIAN
+  Color = eDvbColor(((Color & 0xFF) << 24) | ((Color & 0xFF00) << 8) | ((Color & 0xFF0000) >> 8) | ((Color & 0xFF000000) >> 24));
+#endif
+  for (int i = 0; i < numColors; i++) {
+      if (color[i] == Color) {
+         used[i] = true;
+         return i;
+         }
+      }
+  if (!full) {
+     if (numColors < maxColors) {
+        color[numColors++] = Color;
+        used[numColors - 1] = true;
+        fetched[numColors - 1] = false;
+        return numColors - 1;
+        }
+     for (int i = maxColors; --i >= 0; ) {
+         if (!used[i]) {
+            color[i] = Color;
+            used[i] = true;
+            fetched[i] = false;
+            return i;
+            }
+         }
+     esyslog(LOG_ERR, "ERROR: too many different colors used in palette");
+     full = true;
+     }
+  return 0;
+}
+
+void cPalette::Reset(void)
+{
+  for (int i = 0; i < numColors; i++)
+      used[i] = false;
+  full = false;
+}
+
+const eDvbColor *cPalette::Colors(int &FirstColor, int &LastColor)
+{
+  for (FirstColor = 0; FirstColor < numColors; FirstColor++) {
+      if (!fetched[FirstColor]) {
+         for (LastColor = FirstColor; LastColor < numColors && !fetched[LastColor]; LastColor++)
+             fetched[LastColor] = true;
+         LastColor--; // the loop ended one past the last one!
+         return &color[FirstColor];
+         }
+      }
+  return NULL;
+}
+
+void cPalette::Take(const cPalette &Palette, tIndexes *Indexes)
+{
+  for (int i = 0; i < Palette.numColors; i++) {
+      if (Palette.used[i]) {
+         int n = Index(Palette.color[i]);
+         if (Indexes)
+            (*Indexes)[i] = n;
+         }
+      }
+}
+
+// --- cBitmap ---------------------------------------------------------------
+
+cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
+:cPalette(Bpp)
+{
+  width = Width;
+  height = Height;
+  clearWithBackground = ClearWithBackground;
+  bitmap = NULL;
+  fontType = fontOsd;
+  font = NULL;
+  if (width > 0 && height > 0) {
+     bitmap = new char[width * height];
+     if (bitmap) {
+        Clean();
+        memset(bitmap, 0x00, width * height);
+        SetFont(fontOsd);
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: can't allocate bitmap!");
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: illegal bitmap parameters (%d, %d)!", width, height);
+}
+
+cBitmap::~cBitmap()
+{
+  delete font;
+  delete bitmap;
+}
+
+eDvbFont cBitmap::SetFont(eDvbFont Font)
+{
+  eDvbFont oldFont = fontType;
+  if (fontType != Font || !font) {
+     delete font;
+     font = new cFont(Font);
+     fontType = Font;
+     }
+  return oldFont;
+}
+
+bool cBitmap::Dirty(int &x1, int &y1, int &x2, int &y2)
+{
+  if (dirtyX2 >= 0) {
+     //XXX Workaround: apparently the bitmap sent to the driver always has to be a multiple
+     //XXX of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
+     //TODO Fix driver (should be able to handle any size bitmaps!)
+     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && ((dirtyX2 - dirtyX1) & 7) != 7) {
+           if (dirtyX2 < width - 1)
+              dirtyX2++;
+           else if (dirtyX1 > 0)
+              dirtyX1--;
+           }
+     //XXX "... / 2" <==> Bpp???
+     while ((dirtyY1 > 0 || dirtyY2 < height - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
+           if (dirtyY2 < height - 1)
+              dirtyY2++;
+           else if (dirtyY1 > 0)
+              dirtyY1--;
+           }
+     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
+           if (dirtyX2 < width - 1)
+              dirtyX2++;
+           else if (dirtyX1 > 0)
+              dirtyX1--;
+           }
+     x1 = dirtyX1;
+     y1 = dirtyY1;
+     x2 = dirtyX2;
+     y2 = dirtyY2;
+     return true;
+     }
+  return false;
+}
+
+void cBitmap::Clean(void)
+{
+  dirtyX1 = width;
+  dirtyY1 = height;
+  dirtyX2 = -1;
+  dirtyY2 = -1;
+}
+
+void cBitmap::SetIndex(int x, int y, char Index)
+{
+  if (bitmap) {
+     if (0 <= x && x < width && 0 <= y && y < height) {
+        if (bitmap[width * y + x] != Index) {
+           bitmap[width * y + x] = Index;
+           if (dirtyX1 > x)  dirtyX1 = x;
+           if (dirtyY1 > y)  dirtyY1 = y;
+           if (dirtyX2 < x)  dirtyX2 = x;
+           if (dirtyY2 < y)  dirtyY2 = y;
+           }
+        }
+     }
+}
+
+void cBitmap::SetPixel(int x, int y, eDvbColor Color)
+{
+  SetIndex(x, y, Index(Color));
+}
+
+void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+  if (bitmap && Bitmap.bitmap) {
+     tIndexes Indexes;
+     Take(Bitmap, &Indexes);
+     for (int ix = 0; ix < Bitmap.width; ix++) {
+         for (int iy = 0; iy < Bitmap.height; iy++)
+             SetIndex(x + ix, y + iy, Indexes[Bitmap.bitmap[Bitmap.width * iy + ix]]);
+         }
+     }
+}
+
+int cBitmap::Width(unsigned char c)
+{
+  return font ? font->Width(c) : -1;
+}
+
+int cBitmap::Width(const char *s)
+{
+  return font ? font->Width(s) : -1;
+}
+
+void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
+{
+  if (bitmap) {
+     char fg = Index(ColorFg);
+     char bg = Index(ColorBg);
+     int h = font->Height(s);
+     while (s && *s) {
+           const cFont::tCharData *CharData = font->CharData(*s++);
+           if (int(x + CharData->width) > width)
+              break;
+           for (int row = 0; row < h; row++) {
+               cFont::tPixelData PixelData = CharData->lines[row];
+               for (int col = CharData->width; col-- > 0; ) {
+                   SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
+                   PixelData >>= 1;
+                   }
+               }
+           x += CharData->width;
+           }
+     }
+}
+
+void cBitmap::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+{
+  if (bitmap) {
+     char c = Index(Color);
+     for (int y = y1; y <= y2; y++)
+         for (int x = x1; x <= x2; x++)
+             SetIndex(x, y, c);
+     }
+}
+
+void cBitmap::Clear(void)
+{
+  Reset();
+  if (clearWithBackground)
+     Fill(0, 0, width - 1, height - 1, clrBackground);
+}
+
+const char *cBitmap::Data(int x, int y)
+{
+  return &bitmap[y * width + x];
+}
+
+// --- cWindow ---------------------------------------------------------------
+
+cWindow::cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
+:cBitmap(w, h, Bpp, ClearWithBackground)
+{
+  handle = Handle;
+  x0 = x;
+  y0 = y;
+  bpp = Bpp;
+  tiled = Tiled;
+  shown = false;
+}
+
+bool cWindow::Contains(int x, int y)
+{
+  x -= x0;
+  y -= y0;
+  return x >= 0 && y >= 0 && x < width && y < height;
+}
+
+void cWindow::Relocate(int x, int y)
+{
+  x0 = x;
+  y0 = y;
+}
+
+void cWindow::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+{
+  if (tiled) {
+     x1 -= x0;
+     y1 -= y0;
+     x2 -= x0;
+     y2 -= y0;
+     }
+  cBitmap::Fill(x1, y1, x2, y2, Color);
+}
+
+void cWindow::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+  if (tiled) {
+     x -= x0;
+     y -= y0;
+     }
+  cBitmap::SetBitmap(x, y, Bitmap);
+}
+
+void cWindow::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
+{
+  if (tiled) {
+     x -= x0;
+     y -= y0;
+     }
+  cBitmap::Text(x, y, s, ColorFg, ColorBg);
+}
+
+const char *cWindow::Data(int x, int y)
+{
+  return cBitmap::Data(x, y);
+}
+
+// --- cOsd ------------------------------------------------------------------
+
+cOsd::cOsd(int x, int y)
+{
+  numWindows = 0;
+  x0 = x;
+  y0 = y;
+}
+
+cOsd::~cOsd()
+{
+  for (int i = 0; i < numWindows; i++)
+      delete window[i];
+}
+
+tWindowHandle cOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
+{
+  if (numWindows < MAXNUMWINDOWS) {
+     if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
+        if ((w & 0x03) != 0) {
+           w += 4 - (w & 0x03);
+           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
+           }
+        cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
+        if (OpenWindow(win)) {
+           window[win->Handle()] = win;
+           numWindows++;
+           return win->Handle();
+           }
+        else
+           delete win;
+        }
+     else
+        esyslog(LOG_ERR, "ERROR: illegal OSD parameters");
+     }
+  else
+     esyslog(LOG_ERR, "ERROR: too many OSD windows");
+  return -1;
+}
+
+void cOsd::AddColor(eDvbColor Color, tWindowHandle Window)
+{
+  cWindow *w = GetWindow(Window);
+  if (w) {
+     w->Index(Color);
+     w->Reset();
+     }
+}
+
+cWindow *cOsd::GetWindow(int x, int y)
+{
+  for (int i = 0; i < numWindows; i++) {
+      if (window[i]->Tiled() && window[i]->Contains(x, y))
+         return window[i];
+      }
+  return NULL;
+}
+
+cWindow *cOsd::GetWindow(tWindowHandle Window)
+{
+  if (0 <= Window && Window < numWindows)
+     return window[Window];
+  if (Window == LAST_CREATED_WINDOW && numWindows > 0)
+     return window[numWindows - 1];
+  return NULL;
+}
+
+void cOsd::Flush(void)
+{
+  for (int i = 0; i < numWindows; i++) {
+      CommitWindow(window[i]);
+      window[i]->Clean();
+      }
+  // Showing the windows in a separate loop to avoid seeing them come up one after another
+  for (int i = 0; i < numWindows; i++) {
+      if (!window[i]->Shown())
+         ShowWindow(window[i]);
+      }
+}
+
+void cOsd::Clear(tWindowHandle Window)
+{
+  if (Window == ALL_TILED_WINDOWS || Window == ALL_WINDOWS) {
+     for (int i = 0; i < numWindows; i++)
+         if (Window == ALL_WINDOWS || window[i]->Tiled())
+            window[i]->Clear();
+     }
+  else {
+     cWindow *w = GetWindow(Window);
+     if (w)
+        w->Clear();
+     }
+}
+
+void cOsd::Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window)
+{
+  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x1, y1) : GetWindow(Window);
+  if (w)
+     w->Fill(x1, y1, x2, y2, Color);
+}
+
+void cOsd::SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window)
+{
+  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
+  if (w)
+     w->SetBitmap(x, y, Bitmap);
+}
+
+int cOsd::Width(unsigned char c)
+{
+  return numWindows ? window[0]->Width(c) : 0;
+}
+
+int cOsd::Width(const char *s)
+{
+  return numWindows ? window[0]->Width(s) : 0;
+}
+
+eDvbFont cOsd::SetFont(eDvbFont Font)
+{
+  eDvbFont oldFont = Font;
+  for (int i = 0; i < numWindows; i++)
+      oldFont = window[i]->SetFont(Font);
+  return oldFont;
+}
+
+void cOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
+{
+  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
+  if (w)
+     w->Text(x, y, s, ColorFg, ColorBg);
+}
+
+void cOsd::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHeight)
+{
+  cWindow *w = GetWindow(Window);
+  if (w) {
+     if (NewWidth > 0 && NewHeight > 0) {
+        if ((NewWidth & 0x03) != 0) {
+           NewWidth += 4 - (NewWidth & 0x03);
+           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
+           }
+        CloseWindow(w);
+        cWindow *NewWindow = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());
+        window[w->Handle()] = NewWindow;
+        delete w;
+        OpenWindow(NewWindow);
+        }
+     else {
+        MoveWindow(w, x, y);
+        w->Relocate(x, y);
+        }
+     }
+}
+
+void cOsd::Hide(tWindowHandle Window)
+{
+  HideWindow(GetWindow(Window), true);
+}
+
+void cOsd::Show(tWindowHandle Window)
+{
+  HideWindow(GetWindow(Window), false);
+}
diff --git a/osdbase.h b/osdbase.h
new file mode 100644
index 000000000..859939bd0
--- /dev/null
+++ b/osdbase.h
@@ -0,0 +1,211 @@
+/*
+ * osdbase.h: Basic interface to the On Screen Display
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: osdbase.h 1.1 2002/05/10 14:26:09 kls Exp $
+ */
+
+#ifndef __OSDBASE_H
+#define __OSDBASE_H
+
+#include <stdio.h>
+#include "font.h"
+
+#define MAXNUMCOLORS 16
+
+enum eDvbColor {
+#ifdef DEBUG_OSD
+  clrBackground,
+  clrTransparent = clrBackground,
+  clrBlack = clrBackground,
+  clrRed,
+  clrGreen,
+  clrYellow,
+  clrBlue,
+  clrMagenta,
+  clrCyan,
+  clrWhite,
+#else
+  clrTransparent = 0x00000000,
+  clrBackground  = 0x7F000000, // 50% gray
+  clrBlack       = 0xFF000000,
+  clrRed         = 0xFF1414FC,
+  clrGreen       = 0xFF24FC24,
+  clrYellow      = 0xFF24C0FC,
+  clrMagenta     = 0xFFFC00B0,
+  clrBlue        = 0xFFFC0000,
+  clrCyan        = 0xFFFCFC00,
+  clrWhite       = 0xFFFCFCFC,
+#endif
+  };
+
+class cPalette {
+private:
+  eDvbColor color[MAXNUMCOLORS];
+  int maxColors, numColors;
+  bool used[MAXNUMCOLORS];
+  bool fetched[MAXNUMCOLORS];
+  bool full;
+protected:
+  typedef unsigned char tIndexes[MAXNUMCOLORS];
+public:
+  cPalette(int Bpp);
+  int Index(eDvbColor Color);
+  void Reset(void);
+  const eDvbColor *Colors(int &FirstColor, int &LastColor);
+  void Take(const cPalette &Palette, tIndexes *Indexes = NULL);
+  };
+
+class cBitmap : public cPalette {
+private:
+  cFont *font;
+  eDvbFont fontType;
+  void SetIndex(int x, int y, char Index);
+  char *bitmap;
+  bool clearWithBackground;
+protected:
+  int width, height;
+  int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
+public:
+  cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground = true);
+  virtual ~cBitmap();
+  bool ClearWithBackground(void) { return clearWithBackground; }
+  eDvbFont SetFont(eDvbFont Font);
+  bool Dirty(int &x1, int &y1, int &x2, int &y2);
+  void SetPixel(int x, int y, eDvbColor Color);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  int Width(void) { return width; }
+  int Width(unsigned char c);
+  int Width(const char *s);
+  int Height(void) { return height; }
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void Clean(void);
+  void Clear(void);
+  const char *Data(int x, int y);
+  };
+
+#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
+
+class cWindow : public cBitmap {
+private:
+  int handle;  // the index within the OSD's window array (0...MAXNUMWINDOWS - 1)
+  int x0, y0;
+  int bpp;
+  bool tiled;
+  bool shown;
+public:
+  cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled);
+  int X0(void) { return x0; }
+  int Y0(void) { return y0; }
+  int Bpp(void) { return bpp; }
+  bool Tiled(void) { return tiled; }
+  bool Shown(void) { bool s = shown; shown = true; return s; }
+  int Handle(void) { return handle; }
+  bool Contains(int x, int y);
+  void Relocate(int x, int y);
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
+  const char *Data(int x, int y);
+  };
+
+typedef int tWindowHandle;
+
+// '-1' is used as an error return value!
+#define ALL_WINDOWS         (-2)
+#define ALL_TILED_WINDOWS   (-3)
+#define LAST_CREATED_WINDOW (-4)
+
+class cOsd {
+private:
+  int numWindows;
+  int x0, y0;
+  cWindow *window[MAXNUMWINDOWS];
+  cWindow *GetWindow(int x, int y);
+  cWindow *GetWindow(tWindowHandle Window);
+protected:
+  cWindow *GetWindowNr(int i) { return i < MAXNUMWINDOWS ? window[i] : NULL; }
+  int NumWindows(void) { return numWindows; }
+  int X0(void) { return x0; }
+  int Y0(void) { return y0; }
+  virtual bool OpenWindow(cWindow *Window) = 0;
+       // Opens the window on the OSD hardware, without actually showing it (the
+       // initial state shall be "hidden").
+  virtual void CommitWindow(cWindow *Window) = 0;
+       // Write any modified data and color definitions to the OSD hardware.
+       // Use the window's Dirty() function to find out which area of data
+       // actually needs to be transferred. If the window has not yet been explicitly
+       // shown through a call to ShowWindow(), no visible activity shall take place.
+  virtual void ShowWindow(cWindow *Window) = 0;
+       // Make the window actually visible on the OSD hardware.
+  virtual void HideWindow(cWindow *Window, bool Hide) = 0;
+       // Temporarily hide the window (if 'Hide' is 'true') or make a previously
+       // hidden window visible again (if 'Hide' is 'false').
+  virtual void MoveWindow(cWindow *Window, int x, int y) = 0;
+       // Move the window to a new location.
+  virtual void CloseWindow(cWindow *Window) = 0;
+       // Close the window and release any OSD hardware resources allocated for it.
+public:
+  cOsd(int x, int y);
+       // Initializes the OSD, starting at screen coordinates (x, y).
+  virtual ~cOsd();
+       // Destroys all windows and shuts down the OSD.
+  tWindowHandle Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, bool Tiled = true);
+       // Creates a window at coordinates (x, y), which are relative to the OSD's
+       // origin given in the constructor, with the given width, height and color
+       // depth. ClearWithBackground controls whether the window will be filled with
+       // clrBackground when it is cleared. Setting this to 'false' may be useful
+       // for windows that don't need clrBackground but want to save this color
+       // palette entry for a different color. Tiled controls whether this will
+       // be part of a multi section OSD (with several windows that all have
+       // different color depths and palettes and form one large OSD area), or
+       // whether this is a "standalone" window that will be drawn "in front"
+       // of any windows defined *after* this one (this can be used for highlighting
+       // certain parts of the OSD, as would be done in a 'cursor').
+       // Returns a handle that can be used to identify this window.
+  void AddColor(eDvbColor Color, tWindowHandle Window = LAST_CREATED_WINDOW);
+       // Adds the Color to the color palette of the given window if it is not
+       // already contained in the palette (and if the palette still has free
+       // slots for new colors). The default value LAST_CREATED_WINDOW will
+       // access the most recently created window, without the need of explicitly
+       // using a window handle.
+  void Flush(void);
+       // Actually commits all data of all windows to the OSD.
+  void Clear(tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Clears the given window. If ALL_TILED_WINDOWS is given, only the tiled
+       // windows will be cleared, leaving the standalone windows untouched. If
+       // ALL_WINDOWS is given, the standalone windows will also be cleared.
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Fills the rectangle defined by the upper left (x1, y2) and lower right
+       // (x2, y2) corners with the given Color. If a specific window is given,
+       // the coordinates are relative to that window's upper left corner.
+       // Otherwise they are relative to the upper left corner of the entire OSD.
+       // If all tiled windows are selected, only that window which contains the
+       // point (x1, y1) will actually be filled.
+  void SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Sets the pixels within the given window with the data from the given
+       // Bitmap. See Fill() for details about the coordinates.
+  int Width(unsigned char c);
+       // Returns the width (in pixels) of the given character in the current font.
+  int Width(const char *s);
+       // Returns the width (in pixels) of the given string in the current font.
+  eDvbFont SetFont(eDvbFont Font);
+       // Sets the current font for subsequent Width() and Text() operations.
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window = ALL_TILED_WINDOWS);
+       // Writes the given string at coordinates (x, y) with the given foreground
+       // and background color into the given window (see Fill() for details
+       // about the coordinates).
+  void Relocate(tWindowHandle Window, int x, int y, int NewWidth = -1, int NewHeight = -1);
+       // Moves the given window to the new location at (x, y). If NewWidth and
+       // NewHeight are also given, the window will also be resized to the new
+       // width and height.
+  void Hide(tWindowHandle Window);
+       // Hides the given window.
+  void Show(tWindowHandle Window);
+       // Shows the given window.
+  };
+
+#endif //__OSDBASE_H
diff --git a/svdrp.c b/svdrp.c
index 751a5c54c..c37654245 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.35 2002/03/23 16:17:39 kls Exp $
+ * $Id: svdrp.c 1.36 2002/05/10 15:05:57 kls Exp $
  */
 
 #include "svdrp.h"
@@ -240,7 +240,7 @@ const char *HelpPages[] = {
   "    of the timer.",
   "PUTE\n"
   "    Put data into the EPG list. The data entered has to strictly follow the\n"
-  "    format defined in VDR/FORMATS for the 'epg.data' file.  A '.' on a line\n"
+  "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
   "    by itself terminates the input and starts processing of the data (all\n"
   "    entered data is buffered until the terminating '.' is seen).",
   "UPDT <settings>\n"
diff --git a/tools.h b/tools.h
index 08a567234..bf064ce7a 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.42 2002/02/17 12:57:44 kls Exp $
+ * $Id: tools.h 1.43 2002/05/11 08:35:47 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -147,8 +147,8 @@ template<class T> class cList : public cListBase {
   T *Get(int Index) const { return (T *)cListBase::Get(Index); }
   T *First(void) const { return (T *)objects; }
   T *Last(void) const { return (T *)lastObject; }
-  T *Prev(const T *object) const { return (T *)object->Prev(); }
-  T *Next(const T *object) const { return (T *)object->Next(); }
+  T *Prev(const T *object) const { return (T *)object->cListObject::Prev(); } // need to call cListObject's members to
+  T *Next(const T *object) const { return (T *)object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
   };
 
 #endif //__TOOLS_H
diff --git a/vdr.c b/vdr.c
index 7bb1f9bb5..cd3e528c7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.104 2002/05/05 10:34:31 kls Exp $
+ * $Id: vdr.c 1.105 2002/05/11 11:46:40 kls Exp $
  */
 
 #include <getopt.h>
@@ -578,14 +578,14 @@ int main(int argc, char *argv[])
         }
   if (Interrupted)
      isyslog(LOG_INFO, "caught signal %d", Interrupted);
-  Setup.CurrentChannel = cDvbApi::CurrentChannel();
-  Setup.CurrentVolume  = cDvbApi::CurrentVolume();
-  Setup.Save();
-  PluginManager.Shutdown(true);
   cVideoCutter::Stop();
   delete Menu;
   delete ReplayControl;
   delete Interface;
+  PluginManager.Shutdown(true);
+  Setup.CurrentChannel = cDvbApi::CurrentChannel();
+  Setup.CurrentVolume  = cDvbApi::CurrentVolume();
+  Setup.Save();
   cDvbApi::Cleanup();
   if (WatchdogTimeout > 0)
      dsyslog(LOG_INFO, "max. latency time %d seconds", MaxLatencyTime);

From d07e3829f7c44d713b2677ef73f864af80b3dea3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 13 May 2002 18:00:00 +0200
Subject: [PATCH 043/307] Version 1.1.2 - Changed the cPlugin::Start() function
 to return a boolean value that indicates   if the plugin will not be able to
 perform its task (suggested by Stefan Huelswitt). - Added the
 cPlugin::Housekeeping() function (suggested by Stefan Huelswitt). - Updated
 channels.conf.cable (thanks to Uwe Scheffler). - Added 'insert' capabilities
 to cList (suggested by Stefan Huelswitt). - Changed the 'package' target in
 the plugin's Makefile to produce a package that   expands to a directory with
 just the plugin name and version number (suggested   by Stefan Huelswitt). -
 Made the config directory available to plugins (suggested by Stefan
 Huelswitt).   See PLUGINS.html, section "Configuration files" for details. -
 Improved the [eid]syslog() macros, so that the LOG_... macros don't need to
 be   given any more.

---
 CONTRIBUTORS               |   7 +++
 HISTORY                    |  15 +++++
 PLUGINS.html               | 120 ++++++++++++++++++++++++++++++++---
 PLUGINS/SRC/hello/HISTORY  |   6 ++
 PLUGINS/SRC/hello/Makefile |   9 +--
 PLUGINS/SRC/hello/hello.c  |  15 +++--
 channels.conf.cable        |  23 ++++++-
 config.c                   |  26 ++++----
 config.h                   |   8 +--
 dvbapi.c                   | 126 ++++++++++++++++++-------------------
 dvbosd.c                   |   6 +-
 eit.c                      |  62 +++++++++---------
 i18n.c                     |   4 +-
 interface.c                |  12 ++--
 menu.c                     |  48 +++++++-------
 newplugin                  |  20 ++++--
 osd.c                      |  13 +++-
 osd.h                      |   5 +-
 osdbase.c                  |  16 ++---
 plugin.c                   |  66 +++++++++++++++----
 plugin.h                   |  14 ++++-
 recording.c                |  24 +++----
 remote.c                   |   6 +-
 remux.c                    |  14 ++---
 ringbuffer.c               |  14 ++---
 svdrp.c                    |  32 +++++-----
 thread.c                   |  10 +--
 tools.c                    |  79 +++++++++++++++--------
 tools.h                    |  16 ++---
 vdr.c                      |  37 ++++++-----
 videodir.c                 |   4 +-
 31 files changed, 556 insertions(+), 301 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ce0ffaa51..22e72a798 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -130,6 +130,13 @@ Stefan Huelswitt <huels@iname.com>
  doing shutdown or housekeeping
  for making the cList template class avoid ambiguities in case one defines a "list of
  lists"
+ for suggesting to make the cPlugin::Start() function return a boolean value that
+ indicates if the plugin will not be able to perform its task
+ for suggesting to add the cPlugin::Housekeeping() function
+ for suggesting to add 'insert' capabilities to cList
+ for suggesting to make 'package' target in the plugin's Makefile produce a package that
+ expands to a directory with just the plugin name and version number
+ for suggesting to make the config directory available to plugins
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index 1da14fdb6..6af3acbe8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1269,3 +1269,18 @@ Video Disk Recorder Revision History
 - Fixed logging error message for unknown config parameters in plugins.
 - Rearranged cleanup sequence at the end of the main program.
 - Adapted PLUGINS.html to use the actual code examples from the 'hello' plugin.
+
+2002-05-13: Version 1.1.2
+
+- Changed the cPlugin::Start() function to return a boolean value that indicates
+  if the plugin will not be able to perform its task (suggested by Stefan Huelswitt).
+- Added the cPlugin::Housekeeping() function (suggested by Stefan Huelswitt).
+- Updated channels.conf.cable (thanks to Uwe Scheffler).
+- Added 'insert' capabilities to cList (suggested by Stefan Huelswitt).
+- Changed the 'package' target in the plugin's Makefile to produce a package that
+  expands to a directory with just the plugin name and version number (suggested
+  by Stefan Huelswitt).
+- Made the config directory available to plugins (suggested by Stefan Huelswitt).
+  See PLUGINS.html, section "Configuration files" for details.
+- Improved the [eid]syslog() macros, so that the LOG_... macros don't need to be
+  given any more.
diff --git a/PLUGINS.html b/PLUGINS.html
index 70d6f468a..4cc27da1e 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -16,9 +16,12 @@ <h1>The VDR Plugin System</h1>
 It handles everything necessary for a plugin to get hooked into the core
 VDR program and present itself to the user.
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.1 are marked like this.
 <!--X1.1.1--></td></tr></table>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.2 are marked like this.
+<!--X1.1.2--></td></tr></table>
 <!--<p>TODO: Link to the document about VDR base classes to use when implementing actual functionality (yet to be written).-->
 
 <hr><h2>Quick start</h2>
@@ -114,21 +117,25 @@ <h1>The VDR Plugin System</h1>
 <p>
 and will unpack into a directory named
 <p>
-<tt>vdr-hello-0.0.1</tt>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<tt>hello-0.0.1</tt>
+<!--X1.1.2--></td></tr></table>
 <p>
 To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-ln -s vdr-hello-0.0.1 hello
+ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
 
 Since the VDR <tt>Makefile</tt> only searches for directories with names consisting
 of only lowercase characters and digits, it will only follow the symbolic links, which
 should lead to the current version of the plugin you want to use. This way you can
-have several different versions of a plugin source (like <tt>vdr-hello-0.0.1</tt> and
-<tt>vdr-hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
+have several different versions of a plugin source (like <tt>hello-0.0.1</tt> and
+<tt>hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
+<!--X1.1.2--></td></tr></table>
 
 <a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
 
@@ -184,7 +191,7 @@ <h1>The VDR Plugin System</h1>
 If your plugin requires additional source files, simply add them to your plugin's
 source directory and adjust the <tt>Makefile</tt> accordingly.
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 Header files usually contain preprocessor statements that prevent the same
 file (or rather its contents, to be precise) from being included more than once, like
 
@@ -403,9 +410,11 @@ <h1>The VDR Plugin System</h1>
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement the function
 
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-virtual void Start(void);
+virtual bool Start(void);
 </pre></td></tr></table><p>
+<!--X1.1.2--></td></tr></table>
 
 which is called once for each plugin at program startup.
 Inside this function the plugin must set up everything necessary to perform
@@ -413,6 +422,13 @@ <h1>The VDR Plugin System</h1>
 stream, which is later presented to the user via a function that is available
 from the main menu.
 <p>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+A return value of <i>false</i> indicates that something has gone wrong and the
+plugin will not be able to perform its task. In that case, the plugin should
+write a proper error message to the log file. The first plugin that returns
+<i>false</i> from its <tt>Start()</tt> function will cause VDR to exit.
+<!--X1.1.2--></td></tr></table>
+<p>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement this function.
 
@@ -470,7 +486,34 @@ <h1>The VDR Plugin System</h1>
 the plugin should launch a separate thread to do this.
 </b>
 
-<hr><h2>Setup parameters</h2>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<hr><h2>Housekeeping</h2>
+
+<center><i><b>Chores, chores...</b></i></center><p>
+
+From time to time a plugin may want to do some regular tasks, like cleaning
+up some files or other things. In order to do this it can implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual void Housekeeping(void);
+</pre></td></tr></table><p>
+
+which gets called when VDR is otherwise idle. The intervals between subsequent
+calls to this function are not defined. There may be several hours between two
+calls (if, for instance, there are recordings or replays going on) or they may
+be as close as ten seconds. The only thing that is guaranteed is that there are
+at least ten seconds between two subsequent calls to the <tt>Housekeeping()</tt>
+function of the same plugin.
+<p>
+<b>
+It is very important that a call to <tt>Housekeeping()</tt> returns as soon
+as possible! As long as the program stays inside this function, no other user
+interaction is possible. If a specific action takes longer than a few seconds,
+the plugin should launch a separate thread to do this.
+</b>
+<!--X1.1.2--></td></tr></table>
+
+<a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
 <center><i><b>Remember me...</b></i></center><p>
 
@@ -490,7 +533,7 @@ <h1>The VDR Plugin System</h1>
 <i>true</i> if the parameter was parsed correctly, <i>false</i> in case of
 an error. If <i>false</i> is returned, an error message will be written to
 the log file (and program execution will continue).
-<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 A possible implementation of <tt>SetupParse()</tt> could look like this:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -545,7 +588,7 @@ <h1>The VDR Plugin System</h1>
 <tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
 parameters to the user.
 
-<!--X1.1.1--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 <a name="The Setup menu"><hr><h2>The Setup menu</h2>
 
 <center><i><b>Have it your way!</b></i></center><p>
@@ -605,6 +648,63 @@ <h1>The VDR Plugin System</h1>
 (like VDR does with its cSetup class).
 <!--X1.1.1--></td></tr></table>
 
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<hr><h2>Configuration files</h2>
+
+<center><i><b>I want my own stuff!</b></i></center><p>
+
+There may be situations where a plugin requires configuration files of its own, maybe
+for data that can't be stored in the simple <a href="#Setup parameters">setup parameters</a>
+of VDR, or maybe because it needs to launch other programs that simply need a separate
+configuration file. While the plugin is free to store such files anywhere it
+sees fit, it might be a good idea to put them in a common place, preferably
+where other configuration data already exists. VDR provides the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *ConfigDirectory(const char *PluginName = NULL);
+</pre></td></tr></table><p>
+
+which returns a string containing the directory that VDR uses for its own configuration
+files (defined through the <tt><b>-c</b></tt> option in the call to VDR), extended by
+<tt>"/plugins"</tt>. So assuming the VDR configuration directory is <tt>/video</tt>
+(the default if no <tt><b>-c</b></tt> or <tt><b>-v</b></tt> option is given),
+a call to <tt>ConfigDirectory()</tt> will return <tt>/video/plugins</tt>. The first
+call to <tt>ConfigDirectory()</tt> will automatically make sure that the <tt>plugins</tt>
+subdirectory will exist. If, for some reason, this cannot be achieved, <tt>NULL</tt>
+will be returned.
+<p>
+The additional <tt>plugins</tt> directory is used to keep files from plugins apart
+from those of VDR itself, making sure there will be no name clashes. If a plugin
+needs only one extra configuration file, it is suggested that this file be named
+<tt>name.conf</tt>, where <i>name</i> shall be the name of the plugin.
+<p>
+If a plugin needs more than one such file, it is suggested that the plugin stores
+these in a subdirectory of its own, named after the plugin. To easily get such a name
+the <tt>ConfigDirectory()</tt> function can be given an additional string that will
+be appended to the returned directory name, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *MyConfigDir = ConfigDirectory(Name());
+</pre></td></tr></table><p>
+
+where <tt>Name()</tt> is the member function of the plugin class that returns the
+plugin's name. Again, VDR will make sure that the requested directory will exist
+(or return <tt>NULL</tt> in case of an error).
+<p>
+<b>
+The returned string is statically allocated and will be overwritten by subsequent
+calls to ConfigDirectory()!
+</b>
+<p>
+The <tt>ConfigDirectory()</tt> function is a static member function of the <tt>cPlugin</tt>
+class. This allows it to be called even from outside any member function of the derived
+plugin class, by writing
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+const char *MyConfigDir = cPlugin::ConfigDirectory();
+</pre></td></tr></table><p>
+<!--X1.1.2--></td></tr></table>
+
 <a name="Internationalization"><hr><h2>Internationalization</h2>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index dff114d5f..4df316fdf 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -8,3 +8,9 @@ VDR Plugin 'hello' Revision History
 2002-05-11: Version 0.0.2
 
 - Added setup parameters and a Setup menu to adjust them.
+
+2002-05-12: Version 0.0.3
+
+- Changed return type of cPluginHello::Start().
+- Added cPluginHello::Housekeeping().
+- Modified package generation.
diff --git a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
index fb764cdca..fbd745088 100644
--- a/PLUGINS/SRC/hello/Makefile
+++ b/PLUGINS/SRC/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2002/05/09 15:17:44 kls Exp $
+# $Id: Makefile 1.2 2002/05/12 15:09:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -27,7 +27,8 @@ VDRVERSION = `grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }'
 
 ### The name of the distribution archive:
 
-ARCHIVE = vdr-$(PLUGIN)-$(VERSION)
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
@@ -70,9 +71,9 @@ package: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(ARCHIVE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution archive created as $(ARCHIVE).tgz
+	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 65d03c8b6..9a6c6e317 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.2 2002/05/11 14:17:20 kls Exp $
+ * $Id: hello.c 1.4 2002/05/12 10:18:59 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
@@ -27,7 +27,8 @@ class cPluginHello : public cPlugin {
   virtual const char *Description(void) { return tr(DESCRIPTION); }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual void Start(void);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
   virtual cOsdMenu *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
@@ -110,10 +111,16 @@ bool cPluginHello::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
-void cPluginHello::Start(void)
+bool cPluginHello::Start(void)
 {
   // Start any background activities the plugin shall perform.
   RegisterI18n(Phrases);
+  return true;
+}
+
+void cPluginHello::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
 }
 
 cOsdMenu *cPluginHello::MainMenuAction(void)
diff --git a/channels.conf.cable b/channels.conf.cable
index 3987fd82e..5b147fe6d 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -45,7 +45,7 @@ Disney Channel:402:C:0:6900:1030:1034:0:101:34
 Discovery Channel:378:C:0:6900:1791:1792:0:101:14
 Fox Kids:354:C:0:6900:1279:1280:0:101:28
 Junior:354:C:0:6900:255:256:0:101:19
-K-TOON:354:C:0:6900:0:0:0:101:12
+K-TOON:354:C:0:6900:511:512:0:101:12
 GOLDSTAR TV:354:C:0:6900:3839:3840:0:101:518
 CLASSICA:354:C:0:6900:767:768:0:101:15
 :Mediavision
@@ -54,7 +54,7 @@ Fashion TV:346:h:0:6900:821:822:0:101:50702
 Einstein:346:h:0:6900:623:624:0:101:50719
 Extreme Sport:346:h:0:6900:801:802:0:101:50700
 LANDSCAPE:346:h:0:6900:831:832:0:101:50703
-Single TV:346:h:0:6900:621:622:0:101:50706
+Single TV:346:h:0:6900:525:526:0:101:50706
 Leitseite:346:h:0:6900:2254:0:0:0:5004
 BET ON JAZZ:346:h:0:6900:841:842:0:101:50704
 :Digit. Bouquet"Kabel Berlin"
@@ -84,9 +84,28 @@ ZEE TV:442:h:0:6900:517:773:0:101:53301
 NTV i:442:h:0:6900:514:515:0:101:53302
 ATV:434:h:0:6900:631:632:0:0:53203
 TW1:610:h:0:6900:6106:6107:0:0:6106
+Channel71:386:C:0:6900:1791:1792:0:101:33
 :Premiere Sport
 PREMIERE SPORT 1:362:C:0:6900:255:256,257:0:101:17
 PREMIERE SPORT 2:378:C:0:6900:3839:3840,3841:0:101:27
+:Premiere Bundesliga
+Bundesliga Konferenz:378:C:0:6900:2303:2304,2305:0:101:210
+Bundesliga Spiel 1:362:C:0:6900:255:256,257:0:101:17
+Bundesliga Spiel 2:362:C:0:6900:2047:2048,2049:0:101:240
+Bundesliga Spiel 3:362:C:0:6900:2303:2304,2305:0:101:241
+Bundesliga Spiel 4:362:C:0:6900:2559:2560,2561:0:101:242
+Bundesliga Spiel 5:362:C:0:6900:2815:2816,2817:0:101:243
+Bundesliga Spiel 6:362:C:0:6900:3071:3072,3073:0:101:244
+Bundesliga Spiel 7:362:C:0:6900:3327:3328,3329:0:101:245
+Bundesliga Spiel 8:378:C:0:6900:3071:3072,3073:0:101:208
+Bundesliga Spiel 9:378:C:0:6900:3327:3328,3329:0:101:209
+:Premiere Formel 1
+F1 Multi:362:h:0:6900:255:256,257:0:101:17
+F1 Supersignal:386:h:0:6900:255:256,257:0:101:211
+F1 Cockpit:386:h:0:6900:511:512,513:0:101:212
+F1 Boxen:386:h:0:6900:767:768,769:0:101:213
+F1 Verfolger:386:h:0:6900:1023:1024,1025:0:101:214
+F1 Info:386:h:0:6900:1279:1280,1281:0:101:215
 :Premiere Direkt 1
 PREMIERE DIREKT 1A:362:C:0:6900:1023:1024,1025:0:101:182
 PREMIERE DIREKT 1B:378:C:0:6900:511:512,513:0:101:177
diff --git a/config.c b/config.c
index eeb96eb59..f28d1a546 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.100 2002/05/11 12:05:22 kls Exp $
+ * $Id: config.c 1.101 2002/05/13 16:28:12 kls Exp $
  */
 
 #include "config.h"
@@ -72,7 +72,7 @@ void cKeys::SetDummyValues(void)
 
 bool cKeys::Load(const char *FileName)
 {
-  isyslog(LOG_INFO, "loading %s", FileName);
+  isyslog("loading %s", FileName);
   bool result = false;
   if (FileName)
      fileName = strdup(FileName);
@@ -105,7 +105,7 @@ bool cKeys::Load(const char *FileName)
                                  }
                               }
                            if (Name) {
-                              esyslog(LOG_ERR, "unknown key in %s, line %d\n", fileName, line);
+                              esyslog("unknown key in %s, line %d\n", fileName, line);
                               result = false;
                               break;
                               }
@@ -113,7 +113,7 @@ bool cKeys::Load(const char *FileName)
                        }
                     continue;
                     }
-                 esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+                 esyslog("error in %s, line %d\n", fileName, line);
                  result = false;
                  break;
                  }
@@ -121,10 +121,10 @@ bool cKeys::Load(const char *FileName)
         fclose(f);
         }
      else
-        esyslog(LOG_ERR, "can't open '%s'\n", fileName);
+        esyslog("can't open '%s'\n", fileName);
      }
   else
-     esyslog(LOG_ERR, "no key configuration file name supplied!\n");
+     esyslog("no key configuration file name supplied!\n");
   return result;
 }
 
@@ -299,7 +299,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
      DvbApi = cDvbApi::PrimaryDvbApi;
   if (!DvbApi->Recording() && !groupSep) {
      if (Log)
-        isyslog(LOG_INFO, "switching to channel %d", number);
+        isyslog("switching to channel %d", number);
      for (int i = 3; i--;) {
          switch (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr)) {
            case scrOk:         return true;
@@ -308,7 +308,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
                                return false;
            case scrFailed:     break; // loop will retry
            }
-         esyslog(LOG_ERR, "retrying");
+         esyslog("retrying");
          }
      return false;
      }
@@ -637,7 +637,7 @@ time_t cTimer::StopTime(void)
 void cTimer::SetRecording(bool Recording)
 {
   recording = Recording;
-  isyslog(LOG_INFO, "timer %d %s", Index() + 1, recording ? "start" : "stop");
+  isyslog("timer %d %s", Index() + 1, recording ? "start" : "stop");
 }
 
 void cTimer::SetPending(bool Pending)
@@ -684,7 +684,7 @@ bool cCommand::Parse(const char *s)
 
 const char *cCommand::Execute(void)
 {
-  dsyslog(LOG_INFO, "executing command '%s'", command);
+  dsyslog("executing command '%s'", command);
   delete result;
   result = NULL;
   FILE *p = popen(command, "r");
@@ -701,7 +701,7 @@ const char *cCommand::Execute(void)
      pclose(p);
      }
   else
-     esyslog(LOG_ERR, "ERROR: can't open pipe for command '%s'", command);
+     esyslog("ERROR: can't open pipe for command '%s'", command);
   return result;
 }
 
@@ -1084,7 +1084,7 @@ bool cSetup::Load(const char *FileName)
                error = true;
             }
          if (error) {
-            esyslog(LOG_ERR, "ERROR: unknown config parameter: %s%s%s = %s", l->Plugin() ? l->Plugin() : "", l->Plugin() ? "." : "", l->Name(), l->Value());
+            esyslog("ERROR: unknown config parameter: %s%s%s = %s", l->Plugin() ? l->Plugin() : "", l->Plugin() ? "." : "", l->Name(), l->Value());
             result = false;
             }
          }
@@ -1225,7 +1225,7 @@ bool cSetup::Save(void)
   Sort();
 
   if (cConfig<cSetupLine>::Save()) {
-     isyslog(LOG_INFO, "saved setup to %s", FileName());
+     isyslog("saved setup to %s", FileName());
      return true;
      }
   return false;
diff --git a/config.h b/config.h
index a11f1fa3c..cb21745de 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.114 2002/05/10 13:48:00 kls Exp $
+ * $Id: config.h 1.116 2002/05/13 16:28:16 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.1"
+#define VDRVERSION "1.1.2"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -227,7 +227,7 @@ template<class T> class cConfig : public cList<T> {
     fileName = strdup(FileName);
     bool result = false;
     if (access(FileName, F_OK) == 0) {
-       isyslog(LOG_INFO, "loading %s", FileName);
+       isyslog("loading %s", FileName);
        FILE *f = fopen(fileName, "r");
        if (f) {
           int line = 0;
@@ -245,7 +245,7 @@ template<class T> class cConfig : public cList<T> {
                    if (l->Parse(buffer))
                       Add(l);
                    else {
-                      esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
+                      esyslog("error in %s, line %d\n", fileName, line);
                       delete l;
                       result = false;
                       break;
diff --git a/dvbapi.c b/dvbapi.c
index 77e537269..0b14a871f 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.174 2002/05/03 15:59:32 kls Exp $
+ * $Id: dvbapi.c 1.175 2002/05/13 16:29:17 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -137,7 +137,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
               delta = buf.st_size % sizeof(tIndex);
               if (delta) {
                  delta = sizeof(tIndex) - delta;
-                 esyslog(LOG_ERR, "ERROR: invalid file size (%ld) in '%s'", buf.st_size, fileName);
+                 esyslog("ERROR: invalid file size (%ld) in '%s'", buf.st_size, fileName);
                  }
               last = (buf.st_size + delta) / sizeof(tIndex) - 1;
               if (!Record && last >= 0) {
@@ -147,7 +147,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
                     f = open(fileName, O_RDONLY);
                     if (f >= 0) {
                        if ((int)safe_read(f, index, buf.st_size) != buf.st_size) {
-                          esyslog(LOG_ERR, "ERROR: can't read from file '%s'", fileName);
+                          esyslog("ERROR: can't read from file '%s'", fileName);
                           delete index;
                           index = NULL;
                           close(f);
@@ -159,18 +159,18 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
                        LOG_ERROR_STR(fileName);
                     }
                  else
-                    esyslog(LOG_ERR, "ERROR: can't allocate %d bytes for index '%s'", size * sizeof(tIndex), fileName);
+                    esyslog("ERROR: can't allocate %d bytes for index '%s'", size * sizeof(tIndex), fileName);
                  }
               }
            else
               LOG_ERROR;
            }
         else if (!Record)
-           isyslog(LOG_INFO, "missing index file %s", fileName);
+           isyslog("missing index file %s", fileName);
         if (Record) {
            if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
               if (delta) {
-                 esyslog(LOG_ERR, "ERROR: padding index file with %d '0' bytes", delta);
+                 esyslog("ERROR: padding index file with %d '0' bytes", delta);
                  while (delta--)
                        writechar(f, 0);
                  }
@@ -180,7 +180,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
            }
         }
      else
-        esyslog(LOG_ERR, "ERROR: can't copy file name '%s'", FileName);
+        esyslog("ERROR: can't copy file name '%s'", FileName);
      }
 }
 
@@ -211,7 +211,7 @@ bool cIndexFile::CatchUp(int Index)
                   int delta = (newLast - last) * sizeof(tIndex);
                   if (lseek(f, offset, SEEK_SET) == offset) {
                      if (safe_read(f, &index[last + 1], delta) != delta) {
-                        esyslog(LOG_ERR, "ERROR: can't read from index");
+                        esyslog("ERROR: can't read from index");
                         delete index;
                         index = NULL;
                         close(f);
@@ -224,7 +224,7 @@ bool cIndexFile::CatchUp(int Index)
                      LOG_ERROR_STR(fileName);
                   }
                else
-                  esyslog(LOG_ERR, "ERROR: can't realloc() index");
+                  esyslog("ERROR: can't realloc() index");
                }
             }
          else
@@ -300,7 +300,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
                   if (fn == *FileNumber)
                      *Length = fo - *FileOffset;
                   else {
-                     esyslog(LOG_ERR, "ERROR: 'I' frame at end of file #%d", *FileNumber);
+                     esyslog("ERROR: 'I' frame at end of file #%d", *FileNumber);
                      *Length = -1;
                      }
                   }
@@ -358,7 +358,7 @@ cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
   // Prepare the file name:
   fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
   if (!fileName) {
-     esyslog(LOG_ERR, "ERROR: can't copy file name '%s'", fileName);
+     esyslog("ERROR: can't copy file name '%s'", fileName);
      return;
      }
   strcpy(fileName, FileName);
@@ -377,14 +377,14 @@ int cFileName::Open(void)
   if (file < 0) {
      int BlockingFlag = blocking ? 0 : O_NONBLOCK;
      if (record) {
-        dsyslog(LOG_INFO, "recording to '%s'", fileName);
+        dsyslog("recording to '%s'", fileName);
         file = OpenVideoFile(fileName, O_RDWR | O_CREAT | BlockingFlag);
         if (file < 0)
            LOG_ERROR_STR(fileName);
         }
      else {
         if (access(fileName, R_OK) == 0) {
-           dsyslog(LOG_INFO, "playing '%s'", fileName);
+           dsyslog("playing '%s'", fileName);
            file = open(fileName, O_RDONLY | BlockingFlag);
            if (file < 0)
               LOG_ERROR_STR(fileName);
@@ -429,7 +429,7 @@ int cFileName::SetOffset(int Number, int Offset)
         }
      return file;
      }
-  esyslog(LOG_ERR, "ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+  esyslog("ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
   return -1;
 }
 
@@ -479,7 +479,7 @@ cRecordBuffer::cRecordBuffer(cDvbApi *DvbApi, const char *FileName, int VPid, in
   // Create the index file:
   index = new cIndexFile(FileName, true);
   if (!index)
-     esyslog(LOG_ERR, "ERROR: can't allocate index");
+     esyslog("ERROR: can't allocate index");
      // let's continue without index, so we'll at least have the recording
   videoDev = dvbApi->SetModeRecord();
   Start();
@@ -498,7 +498,7 @@ bool cRecordBuffer::RunningLowOnDiskSpace(void)
      int Free = FreeDiskSpaceMB(fileName.Name());
      lastDiskSpaceCheck = time(NULL);
      if (Free < MINFREEDISKSPACE) {
-        dsyslog(LOG_INFO, "low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
+        dsyslog("low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
         return true;
         }
      }
@@ -518,7 +518,7 @@ bool cRecordBuffer::NextFile(void)
 
 void cRecordBuffer::Input(void)
 {
-  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
+  dsyslog("input thread started (pid=%d)", getpid());
 
   uchar b[MINVIDEODATA];
   time_t t = time(NULL);
@@ -540,7 +540,7 @@ void cRecordBuffer::Input(void)
          else if (r < 0) {
             if (FATALERRNO) {
                if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-                  esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
+                  esyslog("ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
                else {
                   LOG_ERROR;
                   break;
@@ -549,7 +549,7 @@ void cRecordBuffer::Input(void)
             }
          }
       if (time(NULL) - t > MAXBROKENTIMEOUT) {
-         esyslog(LOG_ERR, "ERROR: video data stream broken");
+         esyslog("ERROR: video data stream broken");
          cThread::EmergencyExit(true);
          t = time(NULL);
          }
@@ -557,12 +557,12 @@ void cRecordBuffer::Input(void)
          break;
       }
 
-  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
+  dsyslog("input thread ended (pid=%d)", getpid());
 }
 
 void cRecordBuffer::Output(void)
 {
-  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+  dsyslog("output thread started (pid=%d)", getpid());
 
   uchar b[MINVIDEODATA];
   int r = 0;
@@ -601,7 +601,7 @@ void cRecordBuffer::Output(void)
       }
   recording = false;
 
-  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
+  dsyslog("output thread ended (pid=%d)", getpid());
 }
 
 // --- ReadFrame -------------------------------------------------------------
@@ -611,7 +611,7 @@ int ReadFrame(int f, uchar *b, int Length, int Max)
   if (Length == -1)
      Length = Max; // this means we read up to EOF (see cIndex)
   else if (Length > Max) {
-     esyslog(LOG_ERR, "ERROR: frame larger than buffer (%d > %d)", Length, Max);
+     esyslog("ERROR: frame larger than buffer (%d > %d)", Length, Max);
      Length = Max;
      }
   int r = safe_read(f, b, Length);
@@ -751,7 +751,7 @@ void cPlayBuffer::PlayExternalDolby(const uchar *b, int MaxLength)
 {
   if (cDvbApi::AudioCommand()) {
      if (!dolbyDev && !dolbyDev.Open(cDvbApi::AudioCommand(), "w")) {
-        esyslog(LOG_ERR, "ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
+        esyslog("ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
         return;
         }
      if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01) {
@@ -775,7 +775,7 @@ void cPlayBuffer::PlayExternalDolby(const uchar *b, int MaxLength)
 
 void cPlayBuffer::Output(void)
 {
-  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+  dsyslog("output thread started (pid=%d)", getpid());
 
   while (Busy()) {
         if (blockOutput) {
@@ -812,7 +812,7 @@ void cPlayBuffer::Output(void)
            }
         }
 
-  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
+  dsyslog("output thread ended (pid=%d)", getpid());
 }
 
 void cPlayBuffer::putFrame(cFrame *Frame)
@@ -1051,7 +1051,7 @@ cReplayBuffer::cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const
   // Create the index file:
   index = new cIndexFile(FileName, false);
   if (!index)
-     esyslog(LOG_ERR, "ERROR: can't allocate index");
+     esyslog("ERROR: can't allocate index");
   else if (!index->Ok()) {
      delete index;
      index = NULL;
@@ -1072,11 +1072,11 @@ cReplayBuffer::~cReplayBuffer()
 
 void cReplayBuffer::Input(void)
 {
-  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
+  dsyslog("input thread started (pid=%d)", getpid());
 
   readIndex = Resume();
   if (readIndex >= 0)
-     isyslog(LOG_INFO, "resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
+     isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
   uchar b[MAXFRAMESIZE];
   while (Busy() && (blockInput || NextFile())) {
@@ -1134,7 +1134,7 @@ void cReplayBuffer::Input(void)
            usleep(1); // this keeps the CPU load low
         }
 
-  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
+  dsyslog("input thread ended (pid=%d)", getpid());
 }
 
 void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
@@ -1161,7 +1161,7 @@ void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
               case 0xE0 ... 0xEF: // video
                    break;
               default:
-                   //esyslog(LOG_ERR, "ERROR: unexpected packet id %02X", c);
+                   //esyslog("ERROR: unexpected packet id %02X", c);
                    l = 0;
               }
             if (l)
@@ -1169,7 +1169,7 @@ void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
             }
          /*XXX
          else
-            esyslog(LOG_ERR, "ERROR: broken packet header");
+            esyslog("ERROR: broken packet header");
             XXX*/
          }
      }
@@ -1370,7 +1370,7 @@ void cTransferBuffer::SetAudioPid(int APid)
 
 void cTransferBuffer::Input(void)
 {
-  dsyslog(LOG_INFO, "input thread started (pid=%d)", getpid());
+  dsyslog("input thread started (pid=%d)", getpid());
 
   uchar b[MINVIDEODATA];
   int n = 0;
@@ -1396,7 +1396,7 @@ void cTransferBuffer::Input(void)
            else if (r < 0) {
               if (FATALERRNO) {
                  if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-                    esyslog(LOG_ERR, "ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
+                    esyslog("ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
                  else {
                     LOG_ERROR;
                     break;
@@ -1406,12 +1406,12 @@ void cTransferBuffer::Input(void)
            }
         }
 
-  dsyslog(LOG_INFO, "input thread ended (pid=%d)", getpid());
+  dsyslog("input thread ended (pid=%d)", getpid());
 }
 
 void cTransferBuffer::Output(void)
 {
-  dsyslog(LOG_INFO, "output thread started (pid=%d)", getpid());
+  dsyslog("output thread started (pid=%d)", getpid());
 
   uchar b[MINVIDEODATA];
   while (Busy()) {
@@ -1443,7 +1443,7 @@ void cTransferBuffer::Output(void)
            usleep(1); // this keeps the CPU load low
         }
 
-  dsyslog(LOG_INFO, "output thread ended (pid=%d)", getpid());
+  dsyslog("output thread ended (pid=%d)", getpid());
 }
 
 // --- cCuttingBuffer --------------------------------------------------------
@@ -1480,7 +1480,7 @@ cCuttingBuffer::cCuttingBuffer(const char *FromFileName, const char *ToFileName)
      Start();
      }
   else
-     esyslog(LOG_ERR, "no editing marks found for %s", FromFileName);
+     esyslog("no editing marks found for %s", FromFileName);
 }
 
 cCuttingBuffer::~cCuttingBuffer()
@@ -1495,7 +1495,7 @@ cCuttingBuffer::~cCuttingBuffer()
 
 void cCuttingBuffer::Action(void)
 {
-  dsyslog(LOG_INFO, "video cutting thread started (pid=%d)", getpid());
+  dsyslog("video cutting thread started (pid=%d)", getpid());
 
   cMark *Mark = fromMarks.First();
   if (Mark) {
@@ -1596,8 +1596,8 @@ void cCuttingBuffer::Action(void)
            }
      }
   else
-     esyslog(LOG_ERR, "no editing marks found!");
-  dsyslog(LOG_INFO, "end video cutting thread");
+     esyslog("no editing marks found!");
+  dsyslog("end video cutting thread");
 }
 
 // --- cVideoCutter ----------------------------------------------------------
@@ -1644,9 +1644,9 @@ void cVideoCutter::Stop(void)
   cuttingBuffer = NULL;
   if ((Interrupted || Error) && editedVersionName) {
      if (Interrupted)
-        isyslog(LOG_INFO, "editing process has been interrupted");
+        isyslog("editing process has been interrupted");
      if (Error)
-        esyslog(LOG_ERR, "ERROR: '%s' during editing process", Error);
+        esyslog("ERROR: '%s' during editing process", Error);
      RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed?
      }
 }
@@ -1755,7 +1755,7 @@ cDvbApi::cDvbApi(int n)
      frontendType = feinfo.type;
      }
   else
-     esyslog(LOG_ERR, "ERROR: can't open video device %d", n);
+     esyslog("ERROR: can't open video device %d", n);
   cols = rows = 0;
 
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
@@ -1803,11 +1803,11 @@ bool cDvbApi::SetPrimaryDvbApi(int n)
 {
   n--;
   if (0 <= n && n < NumDvbApis && dvbApi[n]) {
-     isyslog(LOG_INFO, "setting primary DVB to %d", n + 1);
+     isyslog("setting primary DVB to %d", n + 1);
      PrimaryDvbApi = dvbApi[n];
      return true;
      }
-  esyslog(LOG_ERR, "invalid DVB interface: %d", n + 1);
+  esyslog("invalid DVB interface: %d", n + 1);
   return false;
 }
 
@@ -1906,7 +1906,7 @@ int cDvbApi::ProvidesCa(int Ca)
 bool cDvbApi::Probe(const char *FileName)
 {
   if (access(FileName, F_OK) == 0) {
-     dsyslog(LOG_INFO, "probing %s", FileName);
+     dsyslog("probing %s", FileName);
      int f = open(FileName, O_RDONLY);
      if (f >= 0) {
         close(f);
@@ -1933,9 +1933,9 @@ bool cDvbApi::Init(void)
       }
   PrimaryDvbApi = dvbApi[0];
   if (NumDvbApis > 0)
-     isyslog(LOG_INFO, "found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
+     isyslog("found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
   else
-     esyslog(LOG_ERR, "ERROR: no video device found, giving up!");
+     esyslog("ERROR: no video device found, giving up!");
   SetCaCaps();
   return NumDvbApis > 0;
 }
@@ -1990,7 +1990,7 @@ bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX,
            if (Quality < 0)
               Quality = 255; //XXX is this 'best'???
          
-           isyslog(LOG_INFO, "grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+           isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
            FILE *f = fopen(FileName, "wb");
            if (f) {
               if (Jpeg) {
@@ -2446,7 +2446,7 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Pol
             }
             break;
        default:
-            esyslog(LOG_ERR, "ERROR: attempt to set channel with unknown DVB frontend type");
+            esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
             return scrFailed;
        }
 
@@ -2461,22 +2461,22 @@ eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Pol
         int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
         if (res >= 0) {
            if (event.type != FE_COMPLETION_EV) {
-              esyslog(LOG_ERR, "ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
+              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
               if (this == PrimaryDvbApi)
                  cThread::RaisePanic();
               return scrFailed;
               }
            }
         else
-           esyslog(LOG_ERR, "ERROR %d in frontend get event (channel %d, card %d)", res, ChannelNumber, CardIndex() + 1);
+           esyslog("ERROR %d in frontend get event (channel %d, card %d)", res, ChannelNumber, CardIndex() + 1);
         }
      else
-        esyslog(LOG_ERR, "ERROR: timeout while tuning");
+        esyslog("ERROR: timeout while tuning");
 
      // PID settings:
 
      if (!SetPids(false)) {
-        esyslog(LOG_ERR, "ERROR: failed to set PIDs for channel %d", ChannelNumber);
+        esyslog("ERROR: failed to set PIDs for channel %d", ChannelNumber);
         return scrFailed;
         }
      SetTpid(Tpid, DMX_OUT_DECODER);
@@ -2563,7 +2563,7 @@ bool cDvbApi::Replaying(void)
 bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
 {
   if (Recording()) {
-     esyslog(LOG_ERR, "ERROR: StartRecord() called while recording - ignored!");
+     esyslog("ERROR: StartRecord() called while recording - ignored!");
      return false;
      }
 
@@ -2574,10 +2574,10 @@ bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
   // Check FileName:
 
   if (!FileName) {
-     esyslog(LOG_ERR, "ERROR: StartRecord: file name is (null)");
+     esyslog("ERROR: StartRecord: file name is (null)");
      return false;
      }
-  isyslog(LOG_INFO, "record %s", FileName);
+  isyslog("record %s", FileName);
 
   // Create directories if necessary:
 
@@ -2598,7 +2598,7 @@ bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
      return true;
      }
   else
-     esyslog(LOG_ERR, "ERROR: can't allocate recording buffer");
+     esyslog("ERROR: can't allocate recording buffer");
 
   return false;
 }
@@ -2616,7 +2616,7 @@ void cDvbApi::StopRecord(void)
 bool cDvbApi::StartReplay(const char *FileName)
 {
   if (Recording()) {
-     esyslog(LOG_ERR, "ERROR: StartReplay() called while recording - ignored!");
+     esyslog("ERROR: StartReplay() called while recording - ignored!");
      return false;
      }
   StopTransfer();
@@ -2626,10 +2626,10 @@ bool cDvbApi::StartReplay(const char *FileName)
      // Check FileName:
 
      if (!FileName) {
-        esyslog(LOG_ERR, "ERROR: StartReplay: file name is (null)");
+        esyslog("ERROR: StartReplay: file name is (null)");
         return false;
         }
-     isyslog(LOG_INFO, "replay %s", FileName);
+     isyslog("replay %s", FileName);
 
      // Create replay buffer:
 
@@ -2637,7 +2637,7 @@ bool cDvbApi::StartReplay(const char *FileName)
      if (replayBuffer)
         return true;
      else
-        esyslog(LOG_ERR, "ERROR: can't allocate replaying buffer");
+        esyslog("ERROR: can't allocate replaying buffer");
      }
   return false;
 }
diff --git a/dvbosd.c b/dvbosd.c
index 227d1ff96..294ee90d6 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.14 2002/05/10 14:22:04 kls Exp $
+ * $Id: dvbosd.c 1.15 2002/05/13 16:29:20 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -18,7 +18,7 @@ cDvbOsd::cDvbOsd(int VideoDev, int x, int y)
 {
   videoDev = VideoDev;
   if (videoDev < 0)
-     esyslog(LOG_ERR, "ERROR: illegal video device handle (%d)!", videoDev);
+     esyslog("ERROR: illegal video device handle (%d)!", videoDev);
 }
 
 cDvbOsd::~cDvbOsd()
@@ -37,7 +37,7 @@ bool cDvbOsd::SetWindow(cWindow *Window)
         Cmd(OSD_SetWindow, 0, Handle + 1);
         return true;
         }
-     esyslog(LOG_ERR, "ERROR: illegal window handle: %d", Handle);
+     esyslog("ERROR: illegal window handle: %d", Handle);
      }
   return false;
 }
diff --git a/eit.c b/eit.c
index b27fbc7a1..7f1bacf40 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.44 2002/04/06 13:58:59 kls Exp $
+ * $Id: eit.c 1.45 2002/05/13 16:35:49 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -117,7 +117,7 @@ void cMJD::ConvertToTime()
 
    mjdtime = timegm(&t);
 
-   //isyslog(LOG_INFO, "Time parsed = %s\n", ctime(&mjdtime));
+   //isyslog("Time parsed = %s\n", ctime(&mjdtime));
 }
 
 /**  */
@@ -132,10 +132,10 @@ bool cMJD::SetSystemTime()
 
    if (abs(mjdtime - loctim) > 2)
    {
-      isyslog(LOG_INFO, "System Time = %s (%ld)\n", ctime(&loctim), loctim);
-      isyslog(LOG_INFO, "Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
+      isyslog("System Time = %s (%ld)\n", ctime(&loctim), loctim);
+      isyslog("Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
       if (stime(&mjdtime) < 0)
-         esyslog(LOG_ERR, "ERROR while setting system time: %m");
+         esyslog("ERROR while setting system time: %m");
       return true;
    }
 
@@ -391,11 +391,11 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
                        break;
              case 'c': // to keep things simple we react on 'c' here
                        return true;
-             default:  esyslog(LOG_ERR, "ERROR: unexpected tag while reading EPG data: %s", s);
+             default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
                        return false;
              }
            }
-     esyslog(LOG_ERR, "ERROR: unexpected end of file while reading EPG data");
+     esyslog("ERROR: unexpected end of file while reading EPG data");
      }
   return false;
 }
@@ -436,14 +436,14 @@ static void ReportEpgBugFixStats(bool Reset = false)
          tEpgBugFixStats *p = &EpgBugFixStats[i];
          if (p->hits) {
             if (!GotHits) {
-               dsyslog(LOG_INFO, "=====================");
-               dsyslog(LOG_INFO, "EPG bugfix statistics");
-               dsyslog(LOG_INFO, "=====================");
-               dsyslog(LOG_INFO, "IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
-               dsyslog(LOG_INFO, "CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
-               dsyslog(LOG_INFO, "IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
-               dsyslog(LOG_INFO, "=====================");
-               dsyslog(LOG_INFO, "Fix\tHits\tChannels");
+               dsyslog("=====================");
+               dsyslog("EPG bugfix statistics");
+               dsyslog("=====================");
+               dsyslog("IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
+               dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
+               dsyslog("IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
+               dsyslog("=====================");
+               dsyslog("Fix\tHits\tChannels");
                GotHits = true;
                }
             char *q = buffer;
@@ -455,13 +455,13 @@ static void ReportEpgBugFixStats(bool Reset = false)
                    delim = ", ";
                    }
                 }
-            dsyslog(LOG_INFO, "%s", buffer);
+            dsyslog("%s", buffer);
             }
          if (Reset)
             p->hits = p->n = 0;
          }
      if (GotHits)
-        dsyslog(LOG_INFO, "=====================");
+        dsyslog("=====================");
      }
 }
 
@@ -760,7 +760,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
                  }
               }
            else {
-              esyslog(LOG_ERR, "ERROR: unexpected tag while reading EPG data: %s", s);
+              esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
               return false;
               }
            }
@@ -1015,7 +1015,7 @@ bool cSIProcessor::Read(FILE *f)
   if (OwnFile) {
      const char *FileName = GetEpgDataFileName();
      if (access(FileName, R_OK) == 0) {
-        dsyslog(LOG_INFO, "reading EPG data from %s", FileName);
+        dsyslog("reading EPG data from %s", FileName);
         if ((f = fopen(FileName, "r")) == NULL) {
            LOG_ERROR;
            return false;
@@ -1065,7 +1065,7 @@ information and let the classes corresponding
 to the tables write their information to the disk */
 void cSIProcessor::Action()
 {
-   dsyslog(LOG_INFO, "EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
+   dsyslog("EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 
    time_t lastCleanup = time(NULL);
    time_t lastDump = time(NULL);
@@ -1082,7 +1082,7 @@ void cSIProcessor::Action()
          if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
          {
             cMutexLock MutexLock(&schedulesMutex);
-            isyslog(LOG_INFO, "cleaning up schedules data");
+            isyslog("cleaning up schedules data");
             schedules->Cleanup();
             lastCleanup = now;
             ReportEpgBugFixStats(true);
@@ -1131,7 +1131,7 @@ void cSIProcessor::Action()
                   if (n == seclen)
                   {
                      seclen += 3;
-                     //dsyslog(LOG_INFO, "Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
+                     //dsyslog("Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
                      switch (pid)
                      {
                         case 0x14:
@@ -1145,7 +1145,7 @@ void cSIProcessor::Action()
                            }
                               /*XXX this comes pretty often:
                            else
-                              dsyslog(LOG_INFO, "Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
+                              dsyslog("Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
                               XXX*/
                            break;
 
@@ -1157,7 +1157,7 @@ void cSIProcessor::Action()
                               ceit.ProcessEIT(buf);
                            }
                            else
-                              dsyslog(LOG_INFO, "Received stuffing section in EIT\n");
+                              dsyslog("Received stuffing section in EIT\n");
                            break;
 
                         default:
@@ -1166,7 +1166,7 @@ void cSIProcessor::Action()
                   }
                   /*XXX this just fills up the log file - shouldn't we rather try to re-sync?
                   else
-                     dsyslog(LOG_INFO, "read incomplete section - seclen = %d, n = %d", seclen, n);
+                     dsyslog("read incomplete section - seclen = %d, n = %d", seclen, n);
                   XXX*/
                }
             }
@@ -1174,7 +1174,7 @@ void cSIProcessor::Action()
       }
    }
 
-   dsyslog(LOG_INFO, "EIT processing thread ended (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
+   dsyslog("EIT processing thread ended (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 }
 
 /** Add a filter with packet identifier pid and
@@ -1202,21 +1202,21 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
                filters[a].inuse = true;
             else
             {
-               esyslog(LOG_ERR, "ERROR: can't set filter");
+               esyslog("ERROR: can't set filter");
                close(filters[a].handle);
                return false;
             }
-            // dsyslog(LOG_INFO, "  Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+            // dsyslog("Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
          }
          else
          {
-            esyslog(LOG_ERR, "ERROR: can't open filter handle");
+            esyslog("ERROR: can't open filter handle");
             return false;
          }
          return true;
       }
    }
-   esyslog(LOG_ERR, "ERROR: too many filters");
+   esyslog("ERROR: too many filters");
 
    return false;
 }
@@ -1229,7 +1229,7 @@ bool cSIProcessor::ShutDownFilters(void)
       if (filters[a].inuse)
       {
          close(filters[a].handle);
-         // dsyslog(LOG_INFO, "Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+         // dsyslog("Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
          filters[a].inuse = false;
       }
    }
diff --git a/i18n.c b/i18n.c
index 39ddea363..664b8ecd8 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.88 2002/05/11 11:43:38 kls Exp $
+ * $Id: i18n.c 1.89 2002/05/13 16:30:00 kls Exp $
  *
  * Translations provided by:
  *
@@ -2495,7 +2495,7 @@ const char *I18nTranslate(const char *s, const char *Plugin)
              }
          p = Phrases;
          }
-     esyslog(LOG_ERR, "%s%sno translation found for '%s' in language %d (%s)\n", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
+     esyslog("%s%sno translation found for '%s' in language %d (%s)\n", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
      }
   const char *p = strchr(s, '$');
   return p ? p + 1 : s;
diff --git a/interface.c b/interface.c
index b86fb141d..0731f0d42 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.47 2002/01/27 15:48:46 kls Exp $
+ * $Id: interface.c 1.48 2002/05/13 16:30:22 kls Exp $
  */
 
 #include "interface.h"
@@ -303,7 +303,7 @@ void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
 void cInterface::Info(const char *s)
 {
   Open(Setup.OSDwidth, -1);
-  isyslog(LOG_INFO, "info: %s", s);
+  isyslog("info: %s", s);
   Status(s, clrBlack, clrGreen);
   Wait();
   Status(NULL);
@@ -313,7 +313,7 @@ void cInterface::Info(const char *s)
 void cInterface::Error(const char *s)
 {
   Open(Setup.OSDwidth, -1);
-  esyslog(LOG_ERR, "ERROR: %s", s);
+  esyslog("ERROR: %s", s);
   Status(s, clrWhite, clrRed);
   Wait();
   Status(NULL);
@@ -323,13 +323,13 @@ void cInterface::Error(const char *s)
 bool cInterface::Confirm(const char *s, int Seconds, bool WaitForTimeout)
 {
   Open(Setup.OSDwidth, -1);
-  isyslog(LOG_INFO, "confirm: %s", s);
+  isyslog("confirm: %s", s);
   Status(s, clrBlack, clrYellow);
   eKeys k = Wait(Seconds);
   bool result = WaitForTimeout ? k == kNone : k == kOk;
   Status(NULL);
   Close();
-  isyslog(LOG_INFO, "%sconfirmed", result ? "" : "not ");
+  isyslog("%sconfirmed", result ? "" : "not ");
   return result;
 }
 
@@ -441,7 +441,7 @@ void cInterface::QueryKeys(void)
 
 void cInterface::LearnKeys(void)
 {
-  isyslog(LOG_INFO, "learning keys");
+  isyslog("learning keys");
   Open();
   for (;;) {
       Clear();
diff --git a/menu.c b/menu.c
index abcd72270..e149a72d5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.191 2002/05/11 11:16:32 kls Exp $
+ * $Id: menu.c 1.192 2002/05/13 16:30:50 kls Exp $
  */
 
 #include "menu.h"
@@ -514,7 +514,7 @@ eOSState cMenuChannels::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog(LOG_INFO, "editing channel %d", Current() + 1);
+  isyslog("editing channel %d", Current() + 1);
   return AddSubMenu(new cMenuEditChannel(Current()));
 }
 
@@ -527,7 +527,7 @@ eOSState cMenuChannels::New(void)
   Channels.ReNumber();
   Add(new cMenuChannelItem(channel->Index()/*XXX*/, channel), true);
   Channels.Save();
-  isyslog(LOG_INFO, "channel %d added", channel->number);
+  isyslog("channel %d added", channel->number);
   return AddSubMenu(new cMenuEditChannel(Current()));
 }
 
@@ -553,7 +553,7 @@ eOSState cMenuChannels::Del(void)
         for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
             ci->SetIndex(i++);
         Channels.Save();
-        isyslog(LOG_INFO, "channel %d deleted", DeletedChannel);
+        isyslog("channel %d deleted", DeletedChannel);
         // Fix the timers:
         bool TimersModified = false;
         for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
@@ -562,7 +562,7 @@ eOSState cMenuChannels::Del(void)
                ti->channel--;
             if (ti->channel != OldChannel) {
                TimersModified = true;
-               isyslog(LOG_INFO, "timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
+               isyslog("timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
                }
             }
         if (TimersModified)
@@ -585,7 +585,7 @@ void cMenuChannels::Move(int From, int To)
   for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
       ci->SetIndex(i++);
   Channels.Save();
-  isyslog(LOG_INFO, "channel %d moved to %d", FromNumber, ToNumber);
+  isyslog("channel %d moved to %d", FromNumber, ToNumber);
   // Fix the timers:
   bool TimersModified = false;
   From++; // user visible channel numbers start with '1'
@@ -600,7 +600,7 @@ void cMenuChannels::Move(int From, int To)
          ti->channel++;
       if (ti->channel != OldChannel) {
          TimersModified = true;
-         isyslog(LOG_INFO, "timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
+         isyslog("timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
          }
       }
   if (TimersModified)
@@ -714,7 +714,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                         if (timer->active)
                            timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
                         Timers.Save();
-                        isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+                        isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
                         }
                      return osBack;
        case kRed:
@@ -822,9 +822,9 @@ eOSState cMenuTimers::OnOff(void)
      RefreshCurrent();
      DisplayCurrent(true);
      if (timer->firstday)
-        isyslog(LOG_INFO, "timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
+        isyslog("timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
      else
-        isyslog(LOG_INFO, "timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
+        isyslog("timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
      Timers.Save();
      }
   return osContinue;
@@ -834,7 +834,7 @@ eOSState cMenuTimers::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog(LOG_INFO, "editing timer %d", CurrentTimer()->Index() + 1);
+  isyslog("editing timer %d", CurrentTimer()->Index() + 1);
   return AddSubMenu(new cMenuEditTimer(CurrentTimer()->Index()));
 }
 
@@ -846,7 +846,7 @@ eOSState cMenuTimers::New(void)
   Timers.Add(timer);
   Add(new cMenuTimerItem(timer), true);
   Timers.Save();
-  isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+  isyslog("timer %d added", timer->Index() + 1);
   return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
 }
 
@@ -862,7 +862,7 @@ eOSState cMenuTimers::Del(void)
            cOsdMenu::Del(Current());
            Timers.Save();
            Display();
-           isyslog(LOG_INFO, "timer %d deleted", Index + 1);
+           isyslog("timer %d deleted", Index + 1);
            }
         }
      else
@@ -877,7 +877,7 @@ void cMenuTimers::Move(int From, int To)
   cOsdMenu::Move(From, To);
   Timers.Save();
   Display();
-  isyslog(LOG_INFO, "timer %d moved to %d", From + 1, To + 1);
+  isyslog("timer %d moved to %d", From + 1, To + 1);
 }
 
 eOSState cMenuTimers::Summary(void)
@@ -1068,7 +1068,7 @@ eOSState cMenuWhatsOn::Record(void)
      if (!t) {
         Timers.Add(timer);
         Timers.Save();
-        isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+        isyslog("timer %d added", timer->Index() + 1);
         }
      else {
         delete timer;
@@ -1201,7 +1201,7 @@ eOSState cMenuSchedule::Record(void)
      if (!t) {
         Timers.Add(timer);
         Timers.Save();
-        isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+        isyslog("timer %d added", timer->Index() + 1);
         }
      else {
         delete timer;
@@ -2426,7 +2426,7 @@ cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
         Title = eventInfo->GetTitle();
         Subtitle = eventInfo->GetSubtitle();
         Summary = eventInfo->GetExtendedDescription();
-        dsyslog(LOG_INFO, "Title: '%s' Subtitle: '%s'", Title, Subtitle);
+        dsyslog("Title: '%s' Subtitle: '%s'", Title, Subtitle);
         }
      cRecording Recording(timer, Title, Subtitle, Summary);
      fileName = strdup(Recording.FileName());
@@ -2462,17 +2462,17 @@ bool cRecordControl::GetEventInfo(void)
               eventInfo = Schedule->GetEventAround(Time);
               if (eventInfo) {
                  if (seconds > 0)
-                    dsyslog(LOG_INFO, "got EPG info after %d seconds", seconds);
+                    dsyslog("got EPG info after %d seconds", seconds);
                  return true;
                  }
               }
            }
       }
       if (seconds == 0)
-         dsyslog(LOG_INFO, "waiting for EPG info...");
+         dsyslog("waiting for EPG info...");
       sleep(1);
       }
-  dsyslog(LOG_INFO, "no EPG info available");
+  dsyslog("no EPG info available");
   return false;
 }
 
@@ -2484,7 +2484,7 @@ void cRecordControl::Stop(bool KeepInstant)
      if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && !timer->Matches())) {
         // checking timer->Matches() to make sure we don't delete the timer
         // if the program was cancelled before the timer's stop time!
-        isyslog(LOG_INFO, "deleting timer %d", timer->Index() + 1);
+        isyslog("deleting timer %d", timer->Index() + 1);
         Timers.Del(timer);
         Timers.Save();
         }
@@ -2523,10 +2523,10 @@ bool cRecordControls::Start(cTimer *Timer)
             }
         }
      else if (!Timer || (Timer->priority >= Setup.PrimaryLimit && !Timer->pending))
-        isyslog(LOG_ERR, "no free DVB device to record channel %d!", ch);
+        isyslog("no free DVB device to record channel %d!", ch);
      }
   else
-     esyslog(LOG_ERR, "ERROR: channel %d not defined!", ch);
+     esyslog("ERROR: channel %d not defined!", ch);
   return false;
 }
 
@@ -2546,7 +2546,7 @@ void cRecordControls::Stop(cDvbApi *DvbApi)
   for (int i = 0; i < MAXDVBAPI; i++) {
       if (RecordControls[i]) {
          if (RecordControls[i]->Uses(DvbApi)) {
-            isyslog(LOG_INFO, "stopping recording on DVB device %d due to higher priority", DvbApi->CardIndex() + 1);
+            isyslog("stopping recording on DVB device %d due to higher priority", DvbApi->CardIndex() + 1);
             RecordControls[i]->Stop(true);
             }
          }
diff --git a/newplugin b/newplugin
index 22d18f418..c25efb121 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.1 2002/05/09 15:12:26 kls Exp $
+# $Id: newplugin 1.4 2002/05/12 15:02:13 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -82,7 +82,8 @@ VDRVERSION = `grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3
 
 ### The name of the distribution archive:
 
-ARCHIVE = vdr-\$(PLUGIN)-\$(VERSION)
+ARCHIVE = \$(PLUGIN)-\$(VERSION)
+PACKAGE = vdr-\$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
@@ -125,9 +126,9 @@ package: clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
 	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
 	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
-	\@tar czf \$(ARCHIVE).tgz -C \$(TMPDIR) \$(ARCHIVE)
+	\@tar czf \$(PACKAGE).tgz -C \$(TMPDIR) \$(ARCHIVE)
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
-	\@echo Distribution archive created as \$(ARCHIVE).tgz
+	\@echo Distribution package created as \$(PACKAGE).tgz
 
 clean:
 	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~
@@ -158,7 +159,8 @@ public:
   virtual const char *Description(void) { return DESCRIPTION; }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual void Start(void);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
   virtual cOsdMenu *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
@@ -189,9 +191,15 @@ bool cPlugin${PLUGIN_CLASS}::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
-void cPlugin${PLUGIN_CLASS}::Start(void)
+bool cPlugin${PLUGIN_CLASS}::Start(void)
 {
   // Start any background activities the plugin shall perform.
+  return true;
+}
+
+void cPlugin${PLUGIN_CLASS}::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
 }
 
 cOsdMenu *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
diff --git a/osd.c b/osd.c
index 111678471..6feeaa875 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.24 2002/05/01 11:53:24 kls Exp $
+ * $Id: osd.c 1.25 2002/05/12 11:38:39 kls Exp $
  */
 
 #include "osd.h"
@@ -161,9 +161,16 @@ void cOsdMenu::Del(int Index)
      first--;
 }
 
-void cOsdMenu::Add(cOsdItem *Item, bool Current)
+void cOsdMenu::Add(cOsdItem *Item, bool Current, cOsdItem *After)
 {
-  cList<cOsdItem>::Add(Item);
+  cList<cOsdItem>::Add(Item, After);
+  if (Current)
+     current = Item->Index();
+}
+
+void cOsdMenu::Ins(cOsdItem *Item, bool Current, cOsdItem *Before)
+{
+  cList<cOsdItem>::Ins(Item, Before);
   if (Current)
      current = Item->Index();
 }
diff --git a/osd.h b/osd.h
index 6f0532972..afd448594 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.28 2002/05/01 11:17:42 kls Exp $
+ * $Id: osd.h 1.29 2002/05/12 11:19:22 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -116,7 +116,8 @@ class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
   int Current(void) { return current; }
-  void Add(cOsdItem *Item, bool Current = false);
+  void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
+  void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
   void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
diff --git a/osdbase.c b/osdbase.c
index 31e86def7..1e51940dc 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.1 2002/05/10 14:55:53 kls Exp $
+ * $Id: osdbase.c 1.2 2002/05/13 16:30:59 kls Exp $
  */
 
 #include "osdbase.h"
@@ -49,7 +49,7 @@ int cPalette::Index(eDvbColor Color)
             return i;
             }
          }
-     esyslog(LOG_ERR, "ERROR: too many different colors used in palette");
+     esyslog("ERROR: too many different colors used in palette");
      full = true;
      }
   return 0;
@@ -105,10 +105,10 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
         SetFont(fontOsd);
         }
      else
-        esyslog(LOG_ERR, "ERROR: can't allocate bitmap!");
+        esyslog("ERROR: can't allocate bitmap!");
      }
   else
-     esyslog(LOG_ERR, "ERROR: illegal bitmap parameters (%d, %d)!", width, height);
+     esyslog("ERROR: illegal bitmap parameters (%d, %d)!", width, height);
 }
 
 cBitmap::~cBitmap()
@@ -337,7 +337,7 @@ tWindowHandle cOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBa
      if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
         if ((w & 0x03) != 0) {
            w += 4 - (w & 0x03);
-           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
+           esyslog("ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
            }
         cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
         if (OpenWindow(win)) {
@@ -349,10 +349,10 @@ tWindowHandle cOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBa
            delete win;
         }
      else
-        esyslog(LOG_ERR, "ERROR: illegal OSD parameters");
+        esyslog("ERROR: illegal OSD parameters");
      }
   else
-     esyslog(LOG_ERR, "ERROR: too many OSD windows");
+     esyslog("ERROR: too many OSD windows");
   return -1;
 }
 
@@ -456,7 +456,7 @@ void cOsd::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHei
      if (NewWidth > 0 && NewHeight > 0) {
         if ((NewWidth & 0x03) != 0) {
            NewWidth += 4 - (NewWidth & 0x03);
-           esyslog(LOG_ERR, "ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
+           esyslog("ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
            }
         CloseWindow(w);
         cWindow *NewWindow = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());
diff --git a/plugin.c b/plugin.c
index ecae317e4..bd519596f 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,22 +4,26 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.1 2002/05/09 16:26:56 kls Exp $
+ * $Id: plugin.c 1.5 2002/05/13 16:31:09 kls Exp $
  */
 
 #include "plugin.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <dlfcn.h>
+#include <time.h>
 #include "config.h"
 
 #define LIBVDR_PREFIX  "libvdr-"
 #define SO_INDICATOR   ".so."
 
 #define MAXPLUGINARGS  1024
+#define HOUSEKEEPINGDELTA 10 // seconds
 
 // --- cPlugin ---------------------------------------------------------------
 
+char *cPlugin::configDirectory = NULL;
+
 cPlugin::cPlugin(void) 
 {
   name = NULL;
@@ -45,7 +49,12 @@ bool cPlugin::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
-void cPlugin::Start(void)
+bool cPlugin::Start(void)
+{
+  return true;
+}
+
+void cPlugin::Housekeeping(void)
 {
 }
 
@@ -84,6 +93,19 @@ void cPlugin::RegisterI18n(const tI18nPhrase * const Phrases)
   I18nRegister(Phrases, Name());
 }
 
+void cPlugin::SetConfigDirectory(const char *Dir)
+{
+  configDirectory = strdup(Dir);
+}
+
+const char *cPlugin::ConfigDirectory(const char *PluginName)
+{
+  static char *buffer = NULL;
+  delete buffer;
+  asprintf(&buffer, "%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+  return MakeDirs(buffer, true) ? buffer : NULL;
+}
+
 // --- cDll ------------------------------------------------------------------
 
 cDll::cDll(const char *FileName, const char *Args)
@@ -117,7 +139,7 @@ static char *SkipQuote(char *s)
      strcpy(s, s + 1);
      return s;
      }
-  esyslog(LOG_ERR, "ERROR: missing closing %c", c);
+  esyslog("ERROR: missing closing %c", c);
   fprintf(stderr, "vdr: missing closing %c\n", c);
   return NULL;
 }
@@ -125,9 +147,9 @@ static char *SkipQuote(char *s)
 bool cDll::Load(bool Log)
 {
   if (Log)
-     isyslog(LOG_INFO, "loading plugin: %s", fileName);
+     isyslog("loading plugin: %s", fileName);
   if (handle) {
-     esyslog(LOG_ERR, "attempt to load plugin '%s' twice!", fileName);
+     esyslog("attempt to load plugin '%s' twice!", fileName);
      return false;
      }
   handle = dlopen(fileName, RTLD_NOW);
@@ -153,7 +175,7 @@ bool cDll::Load(bool Log)
                            if (*p)
                               p++;
                            else {
-                              esyslog(LOG_ERR, "ERROR: missing character after \\");
+                              esyslog("ERROR: missing character after \\");
                               fprintf(stderr, "vdr: missing character after \\\n");
                               return false;
                               }
@@ -169,7 +191,7 @@ bool cDll::Load(bool Log)
                                if (argc < MAXPLUGINARGS - 1)
                                   argv[argc++] = q;
                                else {
-                                  esyslog(LOG_ERR, "ERROR: plugin argument list too long");
+                                  esyslog("ERROR: plugin argument list too long");
                                   fprintf(stderr, "vdr: plugin argument list too long\n");
                                   return false;
                                   }
@@ -188,7 +210,7 @@ bool cDll::Load(bool Log)
         }
      }
   else {
-     esyslog(LOG_ERR, "ERROR: %s", error);
+     esyslog("ERROR: %s", error);
      fprintf(stderr, "vdr: %s\n", error);
      }
   return !error && plugin;
@@ -201,6 +223,8 @@ cPluginManager *cPluginManager::pluginManager = NULL;
 cPluginManager::cPluginManager(const char *Directory)
 {
   directory = NULL;
+  lastHousekeeping = time(NULL);
+  nextHousekeeping = -1;
   if (pluginManager) {
      fprintf(stderr, "vdr: attempt to create more than one plugin manager - exiting!\n");
      exit(2);
@@ -268,18 +292,36 @@ bool cPluginManager::LoadPlugins(bool Log)
   return true;
 }
 
-void cPluginManager::StartPlugins(void)
+bool cPluginManager::StartPlugins(void)
 {
   for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
       cPlugin *p = dll->Plugin();
       if (p) {
          int Language = Setup.OSDLanguage;
          Setup.OSDLanguage = 0; // the i18n texts are only available _after_ Start()
-         isyslog(LOG_INFO, "starting plugin: %s (%s): %s", p->Name(), p->Version(), p->Description());
+         isyslog("starting plugin: %s (%s): %s", p->Name(), p->Version(), p->Description());
          Setup.OSDLanguage = Language;
-         dll->Plugin()->Start();
+         if (!p->Start())
+            return false;
          }
       }
+  return true;
+}
+
+void cPluginManager::Housekeeping(void)
+{
+  if (time(NULL) - lastHousekeeping > HOUSEKEEPINGDELTA) {
+     if (++nextHousekeeping >= dlls.Count())
+        nextHousekeeping = 0;
+     cDll *dll = dlls.Get(nextHousekeeping);
+     if (dll) {
+        cPlugin *p = dll->Plugin();
+        if (p) {
+           p->Housekeeping();
+           }
+        }
+     lastHousekeeping = time(NULL);
+     }
 }
 
 bool cPluginManager::HasPlugins(void)
@@ -312,7 +354,7 @@ void cPluginManager::Shutdown(bool Log)
         if (Log) {
            cPlugin *p = dll->Plugin();
            if (p)
-              isyslog(LOG_INFO, "stopping plugin: %s", p->Name());
+              isyslog("stopping plugin: %s", p->Name());
            }
         dlls.Del(dll);
         }
diff --git a/plugin.h b/plugin.h
index 99f330d4f..0b62e8bde 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.1 2002/05/09 10:16:09 kls Exp $
+ * $Id: plugin.h 1.4 2002/05/13 15:32:14 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -20,6 +20,7 @@
 class cPlugin {
   friend class cDll;
 private:
+  static char *configDirectory;
   const char *name;
   void SetName(const char *s);
 public:
@@ -32,7 +33,8 @@ class cPlugin {
   virtual const char *CommandLineHelp(void);
 
   virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual void Start(void);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
 
   virtual const char *MainMenuEntry(void);
   virtual cOsdMenu *MainMenuAction(void);
@@ -43,6 +45,9 @@ class cPlugin {
   void SetupStore(const char *Name, int Value);
 
   void RegisterI18n(const tI18nPhrase * const Phrases);
+
+  static void SetConfigDirectory(const char *Dir);
+  static const char *ConfigDirectory(const char *PluginName = NULL);
   };
 
 class cDll : public cListObject {
@@ -64,6 +69,8 @@ class cPluginManager {
 private:
   static cPluginManager *pluginManager;
   char *directory;
+  time_t lastHousekeeping;
+  int nextHousekeeping;
   cDlls dlls;
 public:
   cPluginManager(const char *Directory);
@@ -71,7 +78,8 @@ class cPluginManager {
   void SetDirectory(const char *Directory);
   void AddPlugin(const char *Args);
   bool LoadPlugins(bool Log = false);
-  void StartPlugins(void);
+  bool StartPlugins(void);
+  void Housekeeping(void);
   static bool HasPlugins(void);
   static cPlugin *GetPlugin(int Index);
   static cPlugin *GetPlugin(const char *Name);
diff --git a/recording.c b/recording.c
index e63704535..c65aaaf96 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.61 2002/04/21 14:02:55 kls Exp $
+ * $Id: recording.c 1.62 2002/05/13 16:31:21 kls Exp $
  */
 
 #include "recording.h"
@@ -86,7 +86,7 @@ void AssertFreeDiskSpace(int Priority)
         if (!LockFile.Lock())
            return;
         // Remove the oldest file that has been "deleted":
-        isyslog(LOG_INFO, "low disk space while recording, trying to remove a deleted recording...");
+        isyslog("low disk space while recording, trying to remove a deleted recording...");
         cRecordings Recordings;
         if (Recordings.Load(true)) {
            cRecording *r = Recordings.First();
@@ -102,7 +102,7 @@ void AssertFreeDiskSpace(int Priority)
               }
            }
         // No "deleted" files to remove, so let's see if we can delete a recording:
-        isyslog(LOG_INFO, "...no deleted recording found, trying to delete an old recording...");
+        isyslog("...no deleted recording found, trying to delete an old recording...");
         if (Recordings.Load(false)) {
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
@@ -124,7 +124,7 @@ void AssertFreeDiskSpace(int Priority)
               return;
            }
         // Unable to free disk space, but there's nothing we can do about that...
-        isyslog(LOG_INFO, "...no old recording found, giving up");
+        isyslog("...no old recording found, giving up");
         Interface->Confirm(tr("Low disk space!"), 30);
         }
      LastFreeDiskCheck = time(NULL);
@@ -141,7 +141,7 @@ cResumeFile::cResumeFile(const char *FileName)
      strcat(fileName, RESUMEFILESUFFIX);
      }
   else
-     esyslog(LOG_ERR, "ERROR: can't allocate memory for resume file name");
+     esyslog("ERROR: can't allocate memory for resume file name");
 }
 
 cResumeFile::~cResumeFile()
@@ -368,7 +368,7 @@ cRecording::cRecording(const char *FileName)
               if (rbytes >= 0) {
                  summary[rbytes] = 0;
                  if (rbytes != size)
-                    esyslog(LOG_ERR, "%s: expected %d bytes but read %d", SummaryFileName, size, rbytes);
+                    esyslog("%s: expected %d bytes but read %d", SummaryFileName, size, rbytes);
                  }
               else {
                  LOG_ERROR_STR(SummaryFileName);
@@ -378,7 +378,7 @@ cRecording::cRecording(const char *FileName)
 
               }
            else
-              esyslog(LOG_ERR, "can't allocate %d byte of memory for summary file '%s'", size + 1, SummaryFileName);
+              esyslog("can't allocate %d byte of memory for summary file '%s'", size + 1, SummaryFileName);
            close(f);
            }
         else
@@ -556,10 +556,10 @@ bool cRecording::Delete(void)
      strncpy(ext, DELEXT, strlen(ext));
      if (access(NewName, F_OK) == 0) {
         // the new name already exists, so let's remove that one first:
-        isyslog(LOG_INFO, "removing recording %s", NewName);
+        isyslog("removing recording %s", NewName);
         RemoveVideoFile(NewName);
         }
-     isyslog(LOG_INFO, "deleting recording %s", FileName());
+     isyslog("deleting recording %s", FileName());
      result = RenameVideoFile(FileName(), NewName);
      }
   delete NewName;
@@ -570,10 +570,10 @@ bool cRecording::Remove(void)
 {
   // let's do a final safety check here:
   if (!endswith(FileName(), DELEXT)) {
-     esyslog(LOG_ERR, "attempt to remove recording %s", FileName());
+     esyslog("attempt to remove recording %s", FileName());
      return false;
      }
-  isyslog(LOG_INFO, "removing recording %s", FileName());
+  isyslog("removing recording %s", FileName());
   return RemoveVideoFile(FileName());
 }
 
@@ -727,7 +727,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
   if (command) {
      char *cmd;
      asprintf(&cmd, "%s %s \"%s\"", command, State, strescape(RecordingFileName, "\"$"));
-     isyslog(LOG_INFO, "executing '%s'", cmd);
+     isyslog("executing '%s'", cmd);
      SystemExec(cmd);
      delete cmd;
      }
diff --git a/remote.c b/remote.c
index 26d7acbf7..a9fee37c0 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.25 2001/09/30 11:39:49 kls Exp $
+ * $Id: remote.c 1.26 2002/05/13 16:31:27 kls Exp $
  */
 
 #include "remote.h"
@@ -130,7 +130,7 @@ void cRcIoRCU::Action(void)
     } buffer;
 #pragma pack()
 
-  dsyslog(LOG_INFO, "RCU remote control thread started (pid=%d)", getpid());
+  dsyslog("RCU remote control thread started (pid=%d)", getpid());
 
   int FirstTime = 0;
   unsigned int LastCommand = 0;
@@ -425,7 +425,7 @@ cRcIoLIRC::~cRcIoLIRC()
 
 void cRcIoLIRC::Action(void)
 {
-  dsyslog(LOG_INFO, "LIRC remote control thread started (pid=%d)", getpid());
+  dsyslog("LIRC remote control thread started (pid=%d)", getpid());
 
   int FirstTime = 0;
   int LastTime = 0;
diff --git a/remux.c b/remux.c
index 99a644081..08d632ce5 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.8 2002/02/03 16:20:37 kls Exp $
+ * $Id: remux.c 1.9 2002/05/13 16:31:38 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -154,7 +154,7 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
   audioCid = AudioCid;
 
   if (!(buf = new uint8_t[size]))
-     esyslog(LOG_ERR, "Not enough memory for ts_transform");
+     esyslog("Not enough memory for ts_transform");
 
   reset_ipack();
 }
@@ -172,7 +172,7 @@ void cTS2PES::Clear(void)
 void cTS2PES::store(uint8_t *Data, int Count)
 {
   if (*resultCount + Count > RESULTBUFFERSIZE) {
-     esyslog(LOG_ERR, "ERROR: result buffer overflow (%d + %d > %d)", *resultCount, Count, RESULTBUFFERSIZE);
+     esyslog("ERROR: result buffer overflow (%d + %d > %d)", *resultCount, Count, RESULTBUFFERSIZE);
      Count = RESULTBUFFERSIZE - *resultCount;
      }
   memcpy(resultBuffer + *resultCount, Data, Count);
@@ -309,7 +309,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                      if ((flag1 & 0xC0) == 0x80 )
                         mpeg = 2;
                      else {
-                        esyslog(LOG_INFO, "ERROR: can't record MPEG1!");
+                        esyslog("ERROR: can't record MPEG1!");
                         hlength = 0;
                         which = 0;
                         mpeg = 1;
@@ -525,7 +525,7 @@ XXX*/
         used++;
         }
   if (used)
-     esyslog(LOG_ERR, "ERROR: skipped %d byte to sync on TS packet", used);
+     esyslog("ERROR: skipped %d byte to sync on TS packet", used);
 
   // Convert incoming TS data into multiplexed PES:
 
@@ -570,7 +570,7 @@ XXX*/
 
   if (!synced && skipped >= 0) {
      if (skipped > MAXNONUSEFULDATA) {
-        esyslog(LOG_ERR, "ERROR: no useful data seen within %d byte of video stream", skipped);
+        esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
         skipped = -1;
         if (exitOnFailure)
            cThread::EmergencyExit(true);
@@ -595,7 +595,7 @@ XXX*/
                         return NULL; // no useful data found, wait for more
                      if (pt != NO_PICTURE) {
                         if (pt < I_FRAME || B_FRAME < pt)
-                           esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
+                           esyslog("ERROR: unknown picture type '%d'", pt);
                         else if (!synced) {
                            if (pt == I_FRAME) {
                               resultDelivered = i; // will drop everything before this position
diff --git a/ringbuffer.c b/ringbuffer.c
index a52683d53..3918297d0 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.6 2002/04/18 15:46:36 kls Exp $
+ * $Id: ringbuffer.c 1.7 2002/05/13 16:31:46 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -52,7 +52,7 @@ cRingBuffer::~cRingBuffer()
   delete inputThread;
   delete outputThread;
   if (statistics)
-     dsyslog(LOG_INFO, "buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
+     dsyslog("buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
 
 void cRingBuffer::WaitForPut(void)
@@ -121,11 +121,11 @@ cRingBufferLinear::cRingBufferLinear(int Size, bool Statistics)
   if (Size > 1) { // 'Size - 1' must not be 0!
      buffer = new uchar[Size];
      if (!buffer)
-        esyslog(LOG_ERR, "ERROR: can't allocate ring buffer (size=%d)", Size);
+        esyslog("ERROR: can't allocate ring buffer (size=%d)", Size);
      Clear();
      }
   else
-     esyslog(LOG_ERR, "ERROR: illegal size for ring buffer (%d)", Size);
+     esyslog("ERROR: illegal size for ring buffer (%d)", Size);
 }
 
 cRingBufferLinear::~cRingBufferLinear()
@@ -163,7 +163,7 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
            maxFill = fill;
            int percent = maxFill * 100 / (Size() - 1);
            if (percent > 75)
-              dsyslog(LOG_INFO, "buffer usage: %d%%", percent);
+              dsyslog("buffer usage: %d%%", percent);
            }
         }
      if (free > 0) {
@@ -228,7 +228,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
   if (data)
      memcpy(data, Data, count);
   else
-     esyslog(LOG_ERR, "ERROR: can't allocate frame buffer (count=%d)", count);
+     esyslog("ERROR: can't allocate frame buffer (count=%d)", count);
   next = NULL;
 }
 
@@ -314,7 +314,7 @@ void cRingBufferFrame::Drop(const cFrame *Frame)
            }
         }
      else
-        esyslog(LOG_ERR, "ERROR: attempt to drop wrong frame from ring buffer!");
+        esyslog("ERROR: attempt to drop wrong frame from ring buffer!");
      }
   Unlock();
   EnablePut();
diff --git a/svdrp.c b/svdrp.c
index c37654245..ff3a775ae 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.36 2002/05/10 15:05:57 kls Exp $
+ * $Id: svdrp.c 1.37 2002/05/13 16:32:05 kls Exp $
  */
 
 #include "svdrp.h"
@@ -109,7 +109,7 @@ int cSocket::Accept(void)
            close(newsock);
            newsock = -1;
            }
-        isyslog(LOG_INFO, "connect from %s, port %hd - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
+        isyslog("connect from %s, port %hd - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
         }
      else if (errno != EINTR && errno != EAGAIN)
         LOG_ERROR;
@@ -314,7 +314,7 @@ cSVDRP::cSVDRP(int Port)
   numChars = 0;
   message = NULL;
   lastActivity = 0;
-  isyslog(LOG_INFO, "SVDRP listening on port %d", Port);
+  isyslog("SVDRP listening on port %d", Port);
 }
 
 cSVDRP::~cSVDRP()
@@ -330,7 +330,7 @@ void cSVDRP::Close(bool Timeout)
      char buffer[BUFSIZ];
      gethostname(buffer, sizeof(buffer));
      Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
-     isyslog(LOG_INFO, "closing SVDRP connection"); //TODO store IP#???
+     isyslog("closing SVDRP connection"); //TODO store IP#???
      file.Close();
      DELETENULL(PUTEhandler);
      }
@@ -375,7 +375,7 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
         }
      else {
         Reply(451, "Zero return code - looks like a programming error!");
-        esyslog(LOG_ERR, "SVDRP: zero return code!");
+        esyslog("SVDRP: zero return code!");
         }
      }
 }
@@ -473,7 +473,7 @@ void cSVDRP::CmdDELT(const char *Option)
            if (!timer->recording) {
               Timers.Del(timer);
               Timers.Save();
-              isyslog(LOG_INFO, "timer %s deleted", Option);
+              isyslog("timer %s deleted", Option);
               Reply(250, "Timer \"%s\" deleted", Option);
               }
            else
@@ -738,7 +738,7 @@ void cSVDRP::CmdMESG(const char *Option)
   if (*Option) {
      delete message;
      message = strdup(Option);
-     isyslog(LOG_INFO, "SVDRP message: '%s'", message);
+     isyslog("SVDRP message: '%s'", message);
      Reply(250, "Message stored");
      }
   else if (message)
@@ -763,7 +763,7 @@ void cSVDRP::CmdMODC(const char *Option)
               }
            *channel = c;
            Channels.Save();
-           isyslog(LOG_INFO, "channel %d modified", channel->number);
+           isyslog("channel %d modified", channel->number);
            Reply(250, "%d %s", channel->number, channel->ToText());
            }
         else
@@ -796,7 +796,7 @@ void cSVDRP::CmdMODT(const char *Option)
               }
            *timer = t;
            Timers.Save();
-           isyslog(LOG_INFO, "timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
            Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
            }
         else
@@ -829,7 +829,7 @@ void cSVDRP::CmdNEWC(const char *Option)
         Channels.Add(channel);
         Channels.ReNumber();
         Channels.Save();
-        isyslog(LOG_INFO, "channel %d added", channel->number);
+        isyslog("channel %d added", channel->number);
         Reply(250, "%d %s", channel->number, channel->ToText());
         }
      else
@@ -848,7 +848,7 @@ void cSVDRP::CmdNEWT(const char *Option)
         if (!t) {
            Timers.Add(timer);
            Timers.Save();
-           isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+           isyslog("timer %d added", timer->Index() + 1);
            Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
            return;
            }
@@ -904,11 +904,11 @@ void cSVDRP::CmdUPDT(const char *Option)
            t->Parse(Option);
            delete timer;
            timer = t;
-           isyslog(LOG_INFO, "timer %d updated", timer->Index() + 1);
+           isyslog("timer %d updated", timer->Index() + 1);
            }
         else {
            Timers.Add(timer);
-           isyslog(LOG_INFO, "timer %d added", timer->Index() + 1);
+           isyslog("timer %d added", timer->Index() + 1);
            }
         Timers.Save();
         Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
@@ -1038,18 +1038,18 @@ void cSVDRP::Process(void)
                  }
               else {
                  Reply(501, "Command line too long");
-                 esyslog(LOG_ERR, "SVDRP: command line too long: '%s'", cmdLine);
+                 esyslog("SVDRP: command line too long: '%s'", cmdLine);
                  numChars = 0;
                  }
               lastActivity = time(NULL);
               }
            else if (r <= 0) {
-              isyslog(LOG_INFO, "lost connection to SVDRP client");
+              isyslog("lost connection to SVDRP client");
               Close();
               }
            }
      if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
-        isyslog(LOG_INFO, "timeout on SVDRP connection");
+        isyslog("timeout on SVDRP connection");
         Close(true);
         }
      }
diff --git a/thread.c b/thread.c
index a7e77f1b4..925fc4d9d 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.19 2002/03/09 12:05:44 kls Exp $
+ * $Id: thread.c 1.20 2002/05/13 16:32:09 kls Exp $
  */
 
 #include "thread.h"
@@ -153,7 +153,7 @@ void cThread::Cancel(int WaitSeconds)
             return;
          usleep(10000);
          }
-     esyslog(LOG_ERR, "ERROR: thread %d won't end (waited %d seconds) - cancelling it...", threadPid, WaitSeconds);
+     esyslog("ERROR: thread %d won't end (waited %d seconds) - cancelling it...", threadPid, WaitSeconds);
      }
   pthread_cancel(thread);
 }
@@ -175,18 +175,18 @@ void cThread::RaisePanic(void)
      }
   lastPanic = time(NULL);
   if (panicLevel > MAXPANICLEVEL) {
-     esyslog(LOG_ERR, "ERROR: max. panic level exceeded");
+     esyslog("ERROR: max. panic level exceeded");
      EmergencyExit(true);
      }
   else
-     dsyslog(LOG_INFO, "panic level: %d", panicLevel);
+     dsyslog("panic level: %d", panicLevel);
 }
 
 bool cThread::EmergencyExit(bool Request)
 {
   if (!Request)
      return emergencyExitRequested;
-  esyslog(LOG_ERR, "initiating emergency exit");
+  esyslog("initiating emergency exit");
   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
 }
 
diff --git a/tools.c b/tools.c
index 6f99ef095..440ddd19f 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.63 2002/05/01 16:20:30 kls Exp $
+ * $Id: tools.c 1.66 2002/05/13 17:56:17 kls Exp $
  */
 
 #include "tools.h"
@@ -25,7 +25,7 @@ ssize_t safe_read(int filedes, void *buffer, size_t size)
   for (;;) {
       ssize_t p = read(filedes, buffer, size);
       if (p < 0 && errno == EINTR) {
-         dsyslog(LOG_INFO, "EINTR while reading from file handle %d - retrying", filedes);
+         dsyslog("EINTR while reading from file handle %d - retrying", filedes);
          continue;
          }
       return p;
@@ -41,7 +41,7 @@ ssize_t safe_write(int filedes, const void *buffer, size_t size)
         p = write(filedes, ptr, size);
         if (p < 0) {
            if (errno == EINTR) {
-              dsyslog(LOG_INFO, "EINTR while writing to file handle %d - retrying", filedes);
+              dsyslog("EINTR while writing to file handle %d - retrying", filedes);
               continue;
               }
            break;
@@ -77,7 +77,7 @@ char *strcpyrealloc(char *dest, const char *src)
      if (dest)
         strcpy(dest, src);
      else
-        esyslog(LOG_ERR, "ERROR: out of memory");
+        esyslog("ERROR: out of memory");
      }
   else {
      delete dest;
@@ -269,10 +269,10 @@ bool DirectoryOk(const char *DirName, bool LogErrors)
         if (access(DirName, R_OK | W_OK | X_OK) == 0)
            return true;
         else if (LogErrors)
-           esyslog(LOG_ERR, "ERROR: can't access %s", DirName);
+           esyslog("ERROR: can't access %s", DirName);
         }
      else if (LogErrors)
-        esyslog(LOG_ERR, "ERROR: %s is not a directory", DirName);
+        esyslog("ERROR: %s is not a directory", DirName);
      }
   else if (LogErrors)
      LOG_ERROR_STR(DirName);
@@ -291,7 +291,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory)
            *p = 0;
         struct stat fs;
         if (stat(s, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
-           dsyslog(LOG_INFO, "creating directory %s", s);
+           dsyslog("creating directory %s", s);
            if (mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {
               LOG_ERROR_STR(s);
               result = false;
@@ -329,15 +329,15 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                           }
                        else if (n < size) {
                           l[n] = 0;
-                          dsyslog(LOG_INFO, "removing %s", l);
+                          dsyslog("removing %s", l);
                           if (remove(l) < 0)
                              LOG_ERROR_STR(l);
                           }
                        else
-                          esyslog(LOG_ERR, "ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
+                          esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
                        delete l;
                        }
-                    dsyslog(LOG_INFO, "removing %s", buffer);
+                    dsyslog("removing %s", buffer);
                     if (remove(buffer) < 0)
                        LOG_ERROR_STR(buffer);
                     delete buffer;
@@ -350,7 +350,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
            return false;
            }
         }
-     dsyslog(LOG_INFO, "removing %s", FileName);
+     dsyslog("removing %s", FileName);
      if (remove(FileName) < 0) {
         LOG_ERROR_STR(FileName);
         return false;
@@ -392,7 +392,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
            }
      closedir(d);
      if (RemoveThis && empty) {
-        dsyslog(LOG_INFO, "removing %s", DirName);
+        dsyslog("removing %s", DirName);
         if (remove(DirName) < 0) {
            LOG_ERROR_STR(DirName);
            return false;
@@ -421,7 +421,7 @@ char *ReadLink(const char *FileName)
      TargetName = RealName;
      }
   else
-     esyslog(LOG_ERR, "ERROR: symlink's target name too long: %s", FileName);
+     esyslog("ERROR: symlink's target name too long: %s", FileName);
   return TargetName ? strdup(TargetName) : NULL;
 }
 
@@ -446,14 +446,14 @@ bool SpinUpDisk(const char *FileName)
             gettimeofday(&tp2, NULL);
             double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0;
             if (seconds > 0.5)
-               dsyslog(LOG_INFO, "SpinUpDisk took %.2f seconds\n", seconds);
+               dsyslog("SpinUpDisk took %.2f seconds\n", seconds);
             return true;
             }
          else
             LOG_ERROR_STR(buf);
          }
       }
-  esyslog(LOG_ERR, "ERROR: SpinUpDisk failed");
+  esyslog("ERROR: SpinUpDisk failed");
   return false;
 }
 
@@ -501,7 +501,7 @@ bool cFile::Open(const char *FileName, int Flags, mode_t Mode)
 {
   if (!IsOpen())
      return Open(open(FileName, Flags, Mode));
-  esyslog(LOG_ERR, "ERROR: attempt to re-open %s", FileName);
+  esyslog("ERROR: attempt to re-open %s", FileName);
   return false;
 }
 
@@ -517,15 +517,15 @@ bool cFile::Open(int FileDes)
               if (!files[f])
                  files[f] = true;
               else
-                 esyslog(LOG_ERR, "ERROR: file descriptor %d already in files[]", f);
+                 esyslog("ERROR: file descriptor %d already in files[]", f);
               return true;
               }
            else
-              esyslog(LOG_ERR, "ERROR: file descriptor %d is larger than FD_SETSIZE (%d)", f, FD_SETSIZE);
+              esyslog("ERROR: file descriptor %d is larger than FD_SETSIZE (%d)", f, FD_SETSIZE);
            }
         }
      else
-        esyslog(LOG_ERR, "ERROR: attempt to re-open file descriptor %d", FileDes);
+        esyslog("ERROR: attempt to re-open file descriptor %d", FileDes);
      }
   return false;
 }
@@ -671,7 +671,7 @@ bool cLockFile::Lock(int WaitSeconds)
               struct stat fs;
               if (stat(fileName, &fs) == 0) {
                  if (time(NULL) - fs.st_mtime > LOCKFILESTALETIME) {
-                    esyslog(LOG_ERR, "ERROR: removing stale lock file '%s'", fileName);
+                    esyslog("ERROR: removing stale lock file '%s'", fileName);
                     if (remove(fileName) < 0) {
                        LOG_ERROR_STR(fileName);
                        break;
@@ -704,7 +704,7 @@ void cLockFile::Unlock(void)
      f = -1;
      }
   else
-     esyslog(LOG_ERR, "ERROR: attempt to unlock %s without holding a lock!", fileName);
+     esyslog("ERROR: attempt to unlock %s without holding a lock!", fileName);
 }
 
 // --- cListObject -----------------------------------------------------------
@@ -724,6 +724,12 @@ void cListObject::Append(cListObject *Object)
   Object->prev = this;
 }
 
+void cListObject::Insert(cListObject *Object)
+{
+  prev = Object;
+  Object->next = this;
+}
+
 void cListObject::Unlink(void)
 {
   if (next)
@@ -757,13 +763,34 @@ cListBase::~cListBase()
   Clear();
 }
 
-void cListBase::Add(cListObject *Object) 
+void cListBase::Add(cListObject *Object, cListObject *After)
 { 
-  if (lastObject)
-     lastObject->Append(Object);
-  else
+  if (After && After != lastObject) {
+     After->Next()->Insert(Object);
+     After->Append(Object);
+     }
+  else {
+     if (lastObject)
+        lastObject->Append(Object);
+     else
+        objects = Object;
+     lastObject = Object;
+     }
+}
+
+void cListBase::Ins(cListObject *Object, cListObject *Before)
+{ 
+  if (Before && Before != objects) {
+     Before->Prev()->Append(Object);
+     Before->Insert(Object);
+     }
+  else {
+     if (objects)
+        objects->Insert(Object);
+     else
+        lastObject = Object;
      objects = Object;
-  lastObject = Object;
+     }
 }
 
 void cListBase::Del(cListObject *Object)
diff --git a/tools.h b/tools.h
index bf064ce7a..d98dfb6ef 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.43 2002/05/11 08:35:47 kls Exp $
+ * $Id: tools.h 1.45 2002/05/13 16:21:55 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -20,12 +20,12 @@
 
 extern int SysLogLevel;
 
-#define esyslog(a...) void( (SysLogLevel > 0) ? syslog(a) : void() )
-#define isyslog(a...) void( (SysLogLevel > 1) ? syslog(a) : void() )
-#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog(a) : void() )
+#define esyslog(a...) void( (SysLogLevel > 0) ? syslog(LOG_ERR,   a) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? syslog(LOG_INFO,  a) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog(LOG_DEBUG, a) : void() )
 
-#define LOG_ERROR         esyslog(LOG_ERR, "ERROR (%s,%d): %m", __FILE__, __LINE__)
-#define LOG_ERROR_STR(s)  esyslog(LOG_ERR, "ERROR: %s: %m", s)
+#define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
+#define LOG_ERROR_STR(s)  esyslog("ERROR: %s: %m", s)
 
 #define SECSINDAY  86400
 
@@ -120,6 +120,7 @@ class cListObject {
   virtual ~cListObject();
   virtual bool operator< (const cListObject &ListObject) { return false; }
   void Append(cListObject *Object);
+  void Insert(cListObject *Object);
   void Unlink(void);
   int Index(void);
   cListObject *Prev(void) const { return prev; }
@@ -132,7 +133,8 @@ class cListBase {
   cListBase(void);
 public:
   virtual ~cListBase();
-  void Add(cListObject *Object);
+  void Add(cListObject *Object, cListObject *After = NULL);
+  void Ins(cListObject *Object, cListObject *Before = NULL);
   void Del(cListObject *Object);
   virtual void Move(int From, int To);
   void Move(cListObject *From, cListObject *To);
diff --git a/vdr.c b/vdr.c
index cd3e528c7..7fffa6fad 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.105 2002/05/11 11:46:40 kls Exp $
+ * $Id: vdr.c 1.109 2002/05/13 16:32:49 kls Exp $
  */
 
 #include <getopt.h>
@@ -66,7 +66,7 @@ static void Watchdog(int signum)
 {
   // Something terrible must have happened that prevented the 'alarm()' from
   // being called in time, so let's get out of here:
-  esyslog(LOG_ERR, "PANIC: watchdog timer expired - exiting!");
+  esyslog("PANIC: watchdog timer expired - exiting!");
   exit(1);
 }
 
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
      pid_t pid = fork();
      if (pid < 0) {
         fprintf(stderr, "%m\n");
-        esyslog(LOG_ERR, "ERROR: %m");
+        esyslog("ERROR: %m");
         return 2;
         }
      if (pid != 0)
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
      stderr = freopen(Terminal, "w", stderr);
      }
 
-  isyslog(LOG_INFO, "VDR version %s started", VDRVERSION);
+  isyslog("VDR version %s started", VDRVERSION);
 
   // Load plugins:
 
@@ -301,6 +301,8 @@ int main(int argc, char *argv[])
   if (!ConfigDirectory)
      ConfigDirectory = VideoDirectory;
 
+  cPlugin::SetConfigDirectory(ConfigDirectory);
+
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
@@ -324,7 +326,8 @@ int main(int argc, char *argv[])
 
   // Start plugins:
 
-  PluginManager.StartPlugins();
+  if (!PluginManager.StartPlugins())
+     return 2;
 
   // Channel:
 
@@ -364,14 +367,14 @@ int main(int argc, char *argv[])
   bool ForceShutdown = false;
 
   if (WatchdogTimeout > 0) {
-     dsyslog(LOG_INFO, "setting watchdog timer to %d seconds", WatchdogTimeout);
+     dsyslog("setting watchdog timer to %d seconds", WatchdogTimeout);
      alarm(WatchdogTimeout); // Initial watchdog timer start
      }
 
   while (!Interrupted) {
         // Handle emergency exits:
         if (cThread::EmergencyExit()) {
-           esyslog(LOG_ERR, "emergency exit requested - shutting down");
+           esyslog("emergency exit requested - shutting down");
            break;
            }
         // Restart the Watchdog timer:
@@ -379,7 +382,7 @@ int main(int argc, char *argv[])
            int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);
            if (LatencyTime > MaxLatencyTime) {
               MaxLatencyTime = LatencyTime;
-              dsyslog(LOG_INFO, "max. latency time %d seconds", MaxLatencyTime);
+              dsyslog("max. latency time %d seconds", MaxLatencyTime);
               }
            }
         // Channel display:
@@ -426,7 +429,7 @@ int main(int argc, char *argv[])
                cDisplayVolume::Process(key);
                break;
           // Power off:
-          case kPower: isyslog(LOG_INFO, "Power button pressed");
+          case kPower: isyslog("Power button pressed");
                        DELETENULL(*Interact);
                        if (!Shutdown) {
                           Interface->Error(tr("Can't shutdown - option '-s' not given!"));
@@ -532,7 +535,7 @@ int main(int argc, char *argv[])
                  if (!LastActivity) {
                     if (!timer || Delta > MANUALSTART) {
                        // Apparently the user started VDR manually
-                       dsyslog(LOG_INFO, "assuming manual start of VDR");
+                       dsyslog("assuming manual start of VDR");
                        LastActivity = Now;
                        continue; // don't run into the actual shutdown procedure below
                        }
@@ -550,7 +553,7 @@ int main(int argc, char *argv[])
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
                     if (timer)
-                       dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next));
+                       dsyslog("next timer event at %s", ctime(&Next));
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
@@ -558,7 +561,7 @@ int main(int argc, char *argv[])
                        const char *File = timer ? timer->file : "";
                        char *cmd;
                        asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
-                       isyslog(LOG_INFO, "executing '%s'", cmd);
+                       isyslog("executing '%s'", cmd);
                        SystemExec(cmd);
                        delete cmd;
                        }
@@ -573,11 +576,13 @@ int main(int argc, char *argv[])
                  }
               // Disk housekeeping:
               RemoveDeletedRecordings();
+              // Plugins housekeeping:
+              PluginManager.Housekeeping();
               }
            }
         }
   if (Interrupted)
-     isyslog(LOG_INFO, "caught signal %d", Interrupted);
+     isyslog("caught signal %d", Interrupted);
   cVideoCutter::Stop();
   delete Menu;
   delete ReplayControl;
@@ -588,12 +593,12 @@ int main(int argc, char *argv[])
   Setup.Save();
   cDvbApi::Cleanup();
   if (WatchdogTimeout > 0)
-     dsyslog(LOG_INFO, "max. latency time %d seconds", MaxLatencyTime);
-  isyslog(LOG_INFO, "exiting");
+     dsyslog("max. latency time %d seconds", MaxLatencyTime);
+  isyslog("exiting");
   if (SysLogLevel > 0)
      closelog();
   if (cThread::EmergencyExit()) {
-     esyslog(LOG_ERR, "emergency exit!");
+     esyslog("emergency exit!");
      return 1;
      }
   return 0;
diff --git a/videodir.c b/videodir.c
index dbb1bd197..a6c1b1130 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.7 2002/01/27 12:37:26 kls Exp $
+ * $Id: videodir.c 1.8 2002/05/13 16:32:52 kls Exp $
  */
 
 #include "videodir.h"
@@ -108,7 +108,7 @@ int OpenVideoFile(const char *FileName, int Flags)
 
   // Incoming name must be in base video directory:
   if (strstr(FileName, VideoDirectory) != FileName) {
-     esyslog(LOG_ERR, "ERROR: %s not in %s", FileName, VideoDirectory);
+     esyslog("ERROR: %s not in %s", FileName, VideoDirectory);
      errno = ENOENT; // must set 'errno' - any ideas for a better value?
      return -1;
      }

From f06d2c27fca449148d9d8fac19d81c668744f170 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 16 Jun 2002 18:00:00 +0200
Subject: [PATCH 044/307] Version 1.1.3 - Improved the VDR Makefile to avoid a
 warning if the '.dependencies' file does   not exist, and also using $(MAKE)
 to call recursive makes. - Changed the name of the 'package' target in the
 plugin Makefiles to 'dist'   (following the suggestions in the "GNU Make"
 manual). If you already have started   a plugin project, you may want to
 change this in your Makefile accordingly. - Improved the plugin Makefile to
 avoid a warning if the '.dependencies' file does   not exist, and also using
 $(shell...) to get the version numbers. If you already have   started a
 plugin project, you may want to change this in your Makefile accordingly. -
 Fixed some function headers to make them compile with gcc 3.x (thanks to  
 Gregoire Favre). - Fixed the cutting mechanism to make it re-sync in case a
 frame is larger than the   buffer (thanks to Sven Grothklags). - Added an
 error message if the directory specified in the '-L' option can't be  
 accessed (suggested by Stefan Huelswitt). - Rearranged OSD class names to
 make 'cOsd' available for the main OSD interface. - Completely moved OSD
 handling out of the cDvbApi class, into the new cOsd. - Implemented cStatus
 to allow plugins to set up a status monitor.   See PLUGINS.html for details.
 - Moved the cEITScanner out of dvbapi.h/.c, into the new eitscan.h/.c. -
 Added Swedish language texts (thanks to Tomas Prybil). - Fixed parsing 'E'
 records in epg2html.pl (thanks to Matthias Fechner for pointing   out this
 one). - Removed compiler option '-m486' to make it work on non-Intel
 platforms. If you   have already started a plugin project, you may want to
 make sure you remove this   option from your existing Makefile. - Completely
 rearranged the recording and replay functions to make them available   to
 plugins. - Replay is now done in a single thread (no more syncing between
 input and output   thread necessary). - It is now possible to record several
 channels on the same transponder with "budget   cards". VDR automatically
 attaches a recording timer to a card that already   records on the
 appropriate transponder. How many parallel recordings can actually   be done
 depends on the computer's performance. Currently any number of recordings  
 gets attached to a card, so you should carefully plan your timers to not
 exceed   the limit. On a K6-II/450 it was possible to record three channels
 from transponder   12480 with a single WinTV NOVA-S. - Timers that record two
 successive shows on the same channel may now overlap and   will use the same
 DVB card. During the time where both timers record the data   is simply saved
 to both files. - The following limitations apply to this version:   +
 Transfer mode doesn't work yet.   + The '-a' option (for Dolby Digital audio)
 doesn't work yet.   + Switching between different language tracks doesn't
 work yet.   + Cutting doesn't work yet.

---
 CONTRIBUTORS                |   24 +
 HISTORY                     |   71 +-
 Makefile                    |   21 +-
 PLUGINS.html                |  125 +-
 PLUGINS/SRC/hello/HISTORY   |    4 +
 PLUGINS/SRC/hello/Makefile  |   12 +-
 PLUGINS/SRC/hello/hello.c   |    4 +-
 PLUGINS/SRC/status/COPYING  |  340 +++++
 PLUGINS/SRC/status/HISTORY  |    6 +
 PLUGINS/SRC/status/Makefile |   79 +
 PLUGINS/SRC/status/README   |   11 +
 PLUGINS/SRC/status/status.c |  179 +++
 audio.c                     |   11 +
 audio.h                     |   13 +
 config.c                    |   29 +-
 config.h                    |   12 +-
 device.c                    | 1017 +++++++++++++
 device.h                    |  199 +++
 dmxdev.c.diff               |   12 +
 dvbapi.c                    | 2846 -----------------------------------
 dvbapi.h                    |  335 -----
 dvbosd.c                    |   16 +-
 dvbosd.h                    |    8 +-
 dvbplayer.c                 |  733 +++++++++
 dvbplayer.h                 |   60 +
 eit.c                       |    3 +-
 eitscan.c                   |   84 ++
 eitscan.h                   |   33 +
 epg2html.pl                 |    4 +-
 i18n.c                      |  361 ++++-
 i18n.h                      |    4 +-
 interface.c                 |   40 +-
 interface.h                 |    4 +-
 menu.c                      |  225 +--
 menu.h                      |   25 +-
 menuitems.c                 |   18 +-
 newplugin                   |   12 +-
 osd.c                       |  243 ++-
 osd.h                       |   47 +-
 osdbase.c                   |   38 +-
 osdbase.h                   |    8 +-
 player.c                    |   55 +
 player.h                    |   51 +
 receiver.c                  |   55 +
 receiver.h                  |   48 +
 recorder.c                  |  149 ++
 recorder.h                  |   43 +
 recording.c                 |  350 ++++-
 recording.h                 |   61 +-
 remote.c                    |    6 +-
 ringbuffer.c                |   95 +-
 ringbuffer.h                |   42 +-
 status.c                    |   96 ++
 status.h                    |   75 +
 svdrp.c                     |   26 +-
 thread.c                    |    3 +-
 thread.h                    |    4 +-
 tmp.dif                     |  118 ++
 tools.c                     |    7 +-
 tools.h                     |   11 +-
 vdr.c                       |   70 +-
 61 files changed, 5097 insertions(+), 3584 deletions(-)
 create mode 100644 PLUGINS/SRC/status/COPYING
 create mode 100644 PLUGINS/SRC/status/HISTORY
 create mode 100644 PLUGINS/SRC/status/Makefile
 create mode 100644 PLUGINS/SRC/status/README
 create mode 100644 PLUGINS/SRC/status/status.c
 create mode 100644 audio.c
 create mode 100644 audio.h
 create mode 100644 device.c
 create mode 100644 device.h
 create mode 100644 dmxdev.c.diff
 delete mode 100644 dvbapi.c
 delete mode 100644 dvbapi.h
 create mode 100644 dvbplayer.c
 create mode 100644 dvbplayer.h
 create mode 100644 eitscan.c
 create mode 100644 eitscan.h
 create mode 100644 player.c
 create mode 100644 player.h
 create mode 100644 receiver.c
 create mode 100644 receiver.h
 create mode 100644 recorder.c
 create mode 100644 recorder.h
 create mode 100644 status.c
 create mode 100644 status.h
 create mode 100644 tmp.dif

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 22e72a798..22bbc704c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -137,6 +137,8 @@ Stefan Huelswitt <huels@iname.com>
  for suggesting to make 'package' target in the plugin's Makefile produce a package that
  expands to a directory with just the plugin name and version number
  for suggesting to make the config directory available to plugins
+ for suggesting to add an error message if the directory specified in the '-L'
+ option can't be accessed
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -338,3 +340,25 @@ Oliver Lorei <oliverlorei@cityweb.de>
 
 Andreas B�ttger <fboettger@t-online.de>
  for reporting a bug in skipping forward in time shift mode near the end of the recording
+
+Onno Kreuzinger <ok@solutas.net>
+ for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
+
+Rudi Hofer (Rudi.Hofer@cadsoft.de)
+ for his help in keeping 'channels.conf' up to date
+
+Gregoire Favre <greg@ulima.unil.ch>
+ for fixing some function headers to make them compile with gcc 3.x
+
+Sven Grothklags <sven@uni-paderborn.de>
+ for fixing the cutting mechanism to make it re-sync in case a frame is larger
+ than the buffer
+
+Tomas Prybil <tomas.prybil@copper.se>
+ for translating OSD texts to the Swedish language
+
+Matthias Fechner <matthiasfechner@web.de>
+ for pointing out a bug in parsing 'E' records in epg2html.pl
+
+Paul Lacatus <paul@campina.iiruc.ro>
+ for translating OSD texts to the Romanian language
diff --git a/HISTORY b/HISTORY
index 6af3acbe8..b15541c59 100644
--- a/HISTORY
+++ b/HISTORY
@@ -951,7 +951,7 @@ Video Disk Recorder Revision History
 - Changed the [dei]syslog macros in tools.h to use a variable number of args,
   thus making it safe to use them in nested 'if/else' statements.
 - Fixed error handling in establishing an SVDRP connection (thanks to Davide
-  Achilli) for pointing this out).
+  Achilli for pointing out this one).
 - The new configuration file 'svdrphosts.conf' is now used to define which
   hosts may access the SVDRP port (by default only 'localhost' has access).
   See FORMATS for details.
@@ -1144,7 +1144,7 @@ Video Disk Recorder Revision History
 - New command command line option '-V' to display the VDR version.
 - Adjusting column width for channel numbers in case there are more than 999
   channels.
-- Checking the return value of '...FileRady...' calls in dvbapi.c for better
+- Checking the return value of '...FileReady...' calls in dvbapi.c for better
   performance under heavy system load.
 - New 'make' target 'install', which copies the manual pages and executables
   to their appropriate system locations and creates the /video directory if
@@ -1188,7 +1188,7 @@ Video Disk Recorder Revision History
 - Now the EPG scan skips channels that have their 'Ca' parameter explicitly set
   to an other DVB card (suggested by Sergei Haller).
 - Fixed a possible hangup when reading a broken epg.data file (thanks to Henning
-  Holtschneider for pointing this one out).
+  Holtschneider for pointing out this one).
 - Fixed a bug in the editing process in case a previously edited file with the
   same name was manually deleted on a system with more than one video directory
   (thanks to Dirk Wiebel for reporting this one).
@@ -1261,7 +1261,8 @@ Video Disk Recorder Revision History
   interface. 'osdbase.c/.h' now implements the abstract OSD, while 'dvbosd.c/.h'
   is the actual implementation for the DVB hardware. This is in preparation for
   allowing additional kinds of OSD hardware implementations.
-- Fixed leftover references to the file FORMATS in MANUAL and svdrp.c.
+- Fixed leftover references to the file FORMATS in MANUAL and svdrp.c (thanks to
+  Onno Kreuzinger for reporting this one).
 - Avoiding ambiguities in the cList template class in case one defines a "list of
   lists" (thanks to Stefan Huelswitt).
 - Simplified the basic cMenuSetupPage class for easier use in plugins.
@@ -1284,3 +1285,65 @@ Video Disk Recorder Revision History
   See PLUGINS.html, section "Configuration files" for details.
 - Improved the [eid]syslog() macros, so that the LOG_... macros don't need to be
   given any more.
+
+2002-05-26: Version 1.0.3
+
+- Updated 'Premiere Sport 2' in channels.conf (thanks to Rudi Hofer).
+- Fixed some function headers to make them compile with gcc 3.x (thanks to
+  Gregoire Favre).
+- Fixed the cutting mechanism to make it re-sync in case a frame is larger than the
+  buffer (thanks to Sven Grothklags).
+- Added Swedish language texts (thanks to Tomas Prybil).
+
+2002-06-10: Version 1.0.4
+
+- Added Romanian language texts (thanks to Paul Lacatus).
+- Removed compiler option '-m486' to make it work on non-Intel platforms (thanks
+  to Alastair McKinstry for pointing this out).
+
+2002-06-16: Version 1.1.3
+
+- Improved the VDR Makefile to avoid a warning if the '.dependencies' file does
+  not exist, and also using $(MAKE) to call recursive makes.
+- Changed the name of the 'package' target in the plugin Makefiles to 'dist'
+  (following the suggestions in the "GNU Make" manual). If you already have started
+  a plugin project, you may want to change this in your Makefile accordingly.
+- Improved the plugin Makefile to avoid a warning if the '.dependencies' file does
+  not exist, and also using $(shell...) to get the version numbers. If you already have
+  started a plugin project, you may want to change this in your Makefile accordingly.
+- Fixed some function headers to make them compile with gcc 3.x (thanks to
+  Gregoire Favre).
+- Fixed the cutting mechanism to make it re-sync in case a frame is larger than the
+  buffer (thanks to Sven Grothklags).
+- Added an error message if the directory specified in the '-L' option can't be
+  accessed (suggested by Stefan Huelswitt).
+- Rearranged OSD class names to make 'cOsd' available for the main OSD interface.
+- Completely moved OSD handling out of the cDvbApi class, into the new cOsd.
+- Implemented cStatus to allow plugins to set up a status monitor.
+  See PLUGINS.html for details.
+- Moved the cEITScanner out of dvbapi.h/.c, into the new eitscan.h/.c.
+- Added Swedish language texts (thanks to Tomas Prybil).
+- Fixed parsing 'E' records in epg2html.pl (thanks to Matthias Fechner for pointing
+  out this one).
+- Removed compiler option '-m486' to make it work on non-Intel platforms. If you
+  have already started a plugin project, you may want to make sure you remove this
+  option from your existing Makefile.
+- Completely rearranged the recording and replay functions to make them available
+  to plugins.
+- Replay is now done in a single thread (no more syncing between input and output
+  thread necessary).
+- It is now possible to record several channels on the same transponder with "budget
+  cards". VDR automatically attaches a recording timer to a card that already
+  records on the appropriate transponder. How many parallel recordings can actually
+  be done depends on the computer's performance. Currently any number of recordings
+  gets attached to a card, so you should carefully plan your timers to not exceed
+  the limit. On a K6-II/450 it was possible to record three channels from transponder
+  12480 with a single WinTV NOVA-S.
+- Timers that record two successive shows on the same channel may now overlap and
+  will use the same DVB card. During the time where both timers record the data
+  is simply saved to both files.
+- The following limitations apply to this version:
+  + Transfer mode doesn't work yet.
+  + The '-a' option (for Dolby Digital audio) doesn't work yet.
+  + Switching between different language tracks doesn't work yet.
+  + Cutting doesn't work yet.
diff --git a/Makefile b/Makefile
index d6f788729..3cc655f21 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.35 2002/05/10 10:24:46 kls Exp $
+# $Id: Makefile 1.40 2002/06/10 16:31:34 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -21,9 +21,10 @@ INCLUDES = -I$(DVBDIR)/ost/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = config.o dvbapi.o dvbosd.o eit.o font.o i18n.o interface.o menu.o\
-       menuitems.o osdbase.o osd.o plugin.o recording.o remote.o remux.o ringbuffer.o\
-       svdrp.o thread.o tools.o vdr.o videodir.o
+OBJS = audio.o config.o device.o dvbplayer.o dvbosd.o eit.o eitscan.o font.o i18n.o\
+       interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
+       recorder.o recording.o remote.o remux.o ringbuffer.o status.o svdrp.o thread.o\
+       tools.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
@@ -57,7 +58,7 @@ font: genfontfile fontfix.c fontosd.c
 # Implicit rules:
 
 %.o: %.c
-	g++ -g -O2 -Wall -Woverloaded-virtual -m486 -c $(DEFINES) $(INCLUDES) $<
+	g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
@@ -66,7 +67,7 @@ DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
-include $(DEPFILE)
+-include $(DEPFILE)
 
 # The main program:
 
@@ -88,7 +89,7 @@ genfontfile: genfontfile.c
 # The libdtv library:
 
 $(DTVLIB) $(DTVDIR)/libdtv.h:
-	make -C $(DTVDIR) all
+	$(MAKE) -C $(DTVDIR) all
 
 # The 'include' directory (for plugins):
 
@@ -99,10 +100,10 @@ include-dir:
 # Plugins:
 
 plugins: include-dir
-	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do make -C "$(PLUGINDIR)/SRC/$$i" all; done
+	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/SRC/$$i" all; done
 
 plugins-clean:
-	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do make -C "$(PLUGINDIR)/SRC/$$i" clean; done
+	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/SRC/$$i" clean; done
 	@-rm -f $(PLUGINDIR)/lib/*
 
 # Install the files:
@@ -119,7 +120,7 @@ install:
 # Housekeeping:
 
 clean:
-	make -C $(DTVDIR) clean
+	$(MAKE) -C $(DTVDIR) clean
 	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
 	-rm -rf include
 fontclean:
diff --git a/PLUGINS.html b/PLUGINS.html
index 4cc27da1e..9b5a496ca 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -4,7 +4,7 @@
 </head>
 <body bgcolor="white">
 
-<h1>The VDR Plugin System</h1>
+<center><h1>The VDR Plugin System</h1></center>
 
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -12,18 +12,30 @@ <h1>The VDR Plugin System</h1>
 separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
-This document describes the "outside" interface of the plugin system.
-It handles everything necessary for a plugin to get hooked into the core
+<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+This document is divided into two parts, the first one describing the
+<a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
+of the plugin system, and the second one describing the
+<a href="#Part II - The Inside Interface"><i>inside</i> interface</a>.
+The <i>outside</i> interface handles everything necessary for a plugin to get hooked into the core
 VDR program and present itself to the user.
+The <i>inside</i> interface provides the plugin code access to VDR's internal data
+structures and allows it to hook itself into specific areas to perform special actions.
+<!--X1.1.3--></td></tr></table>
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.1 are marked like this.
 <!--X1.1.1--></td></tr></table>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.2 are marked like this.
 <!--X1.1.2--></td></tr></table>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.3 are marked like this.
+<!--X1.1.3--></td></tr></table>
 <!--<p>TODO: Link to the document about VDR base classes to use when implementing actual functionality (yet to be written).-->
 
+<a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
+
 <hr><h2>Quick start</h2>
 
 <center><i><b>Can't wait, can't wait!</b></i></center><p>
@@ -117,7 +129,7 @@ <h1>The VDR Plugin System</h1>
 <p>
 and will unpack into a directory named
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 <tt>hello-0.0.1</tt>
 <!--X1.1.2--></td></tr></table>
 <p>
@@ -125,7 +137,7 @@ <h1>The VDR Plugin System</h1>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
@@ -191,7 +203,7 @@ <h1>The VDR Plugin System</h1>
 If your plugin requires additional source files, simply add them to your plugin's
 source directory and adjust the <tt>Makefile</tt> accordingly.
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
 Header files usually contain preprocessor statements that prevent the same
 file (or rather its contents, to be precise) from being included more than once, like
 
@@ -410,7 +422,7 @@ <h1>The VDR Plugin System</h1>
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement the function
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool Start(void);
 </pre></td></tr></table><p>
@@ -422,7 +434,7 @@ <h1>The VDR Plugin System</h1>
 stream, which is later presented to the user via a function that is available
 from the main menu.
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 A return value of <i>false</i> indicates that something has gone wrong and the
 plugin will not be able to perform its task. In that case, the plugin should
 write a proper error message to the log file. The first plugin that returns
@@ -486,7 +498,7 @@ <h1>The VDR Plugin System</h1>
 the plugin should launch a separate thread to do this.
 </b>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 <hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
@@ -533,7 +545,7 @@ <h1>The VDR Plugin System</h1>
 <i>true</i> if the parameter was parsed correctly, <i>false</i> in case of
 an error. If <i>false</i> is returned, an error message will be written to
 the log file (and program execution will continue).
-<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
 A possible implementation of <tt>SetupParse()</tt> could look like this:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -588,7 +600,7 @@ <h1>The VDR Plugin System</h1>
 <tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
 parameters to the user.
 
-<!--X1.1.1--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
 <a name="The Setup menu"><hr><h2>The Setup menu</h2>
 
 <center><i><b>Have it your way!</b></i></center><p>
@@ -648,7 +660,7 @@ <h1>The VDR Plugin System</h1>
 (like VDR does with its cSetup class).
 <!--X1.1.1--></td></tr></table>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
 <hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
@@ -815,16 +827,18 @@ <h1>The VDR Plugin System</h1>
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
+<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
 The <tt>Makefile</tt> that has been created by the call to
 <a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
-provides the target <tt>package</tt>, which does this for you.
+provides the target <tt>dist</tt>, which does this for you.
 <p>
-Simply change into your source directory and execute <tt>make package</tt>:
+Simply change into your source directory and execute <tt>make dist</tt>:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 cd VDR/PLUGINS/SRC/hello
-make package
+make dist
 </pre></td></tr></table><p>
+<!--X1.1.3--></td></tr></table>
 
 After this you should find a file named like
 
@@ -835,5 +849,82 @@ <h1>The VDR Plugin System</h1>
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
+<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
+
+<hr><h2>Status monitor</h2>
+
+<center><i><b>A piece of the action</b></i></center><p>
+
+If a plugin wants to get informed on various events in VDR, it can derive a class from
+<tt>cStatus</tt>, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/status.h&gt;
+
+class cMyStatusMonitor : public cStatus {
+protected:
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  };
+
+void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+{
+  if (ChannelNumber)
+     dsyslog("channel switched to %d on DVB %d", ChannelNumber, Device-&gt;CardIndex());
+  else
+     dsyslog("about to switch channel on DVB %d", Device-&gt;CardIndex());
+}
+</pre></td></tr></table><p>
+
+An object of this class will be informed whenever the channel is switched on one of
+the DVB devices. It could be used in a plugin like this:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/plugin.h&gt;
+
+class cPluginStatus : public cPlugin {
+private:
+  cMyStatusMonitor *statusMonitor;
+public:
+  cPluginStatus(void);
+  virtual ~cPluginStatus();
+  ...
+  virtual bool Start(void);
+  ...
+  };
+
+cPluginStatus::cPluginStatus(void)
+{
+  statusMonitor = NULL;
+}
+
+cPluginStatus::~cPluginStatus()
+{
+  delete statusMonitor;
+}
+
+bool cPluginStatus::Start(void)
+{
+  statusMonitor = new cMyStatusMonitor;
+  return true;
+}
+</pre></td></tr></table><p>
+
+Note that the actual object is created in the <tt>Start()</tt> function, not in the
+constructor! It is also important to delete the object in the destructor, in order to
+avoid memory leaks.
+<p>
+A Plugin can implement any number of <tt>cStatus</tt> derived objects, and once
+the plugin has been started it may create and delete them as necessary.
+No further action apart from creating an object derived from <tt>cStatus</tt>
+is necessary. VDR will automatically hook it into a list of status monitors, with
+their individual virtual member functions being called in the same sequence as the
+objects were created.
+<p>
+See the file <tt>status.h</tt> for detailed information on which status monitor
+member functions are available in <tt>cStatus</tt>. You only need to implement
+the functions you actually want to use.
+<!--X1.1.3--></td></tr></table>
+
 </body>
 </html>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index 4df316fdf..f4cc74311 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -14,3 +14,7 @@ VDR Plugin 'hello' Revision History
 - Changed return type of cPluginHello::Start().
 - Added cPluginHello::Housekeeping().
 - Modified package generation.
+
+2002-05-17: Version 0.0.4
+
+- Makefile improvements.
diff --git a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
index fbd745088..b9d911ab4 100644
--- a/PLUGINS/SRC/hello/Makefile
+++ b/PLUGINS/SRC/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2002/05/12 15:09:07 kls Exp $
+# $Id: Makefile 1.4 2002/06/10 16:24:06 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -11,7 +11,7 @@ PLUGIN = hello
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = `grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g'`
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 ### The directory environment:
 
@@ -23,7 +23,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION = `grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g'`
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -43,7 +43,7 @@ OBJS = $(PLUGIN).o i18n.o
 ### The C++ compiler and options:
 
 CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual -m486
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules:
 
@@ -57,7 +57,7 @@ DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
-include $(DEPFILE)
+-include $(DEPFILE)
 
 ### Targets:
 
@@ -67,7 +67,7 @@ libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 
-package: clean
+dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 9a6c6e317..50aeeb3c3 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.4 2002/05/12 10:18:59 kls Exp $
+ * $Id: hello.c 1.5 2002/05/14 21:23:25 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
diff --git a/PLUGINS/SRC/status/COPYING b/PLUGINS/SRC/status/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/SRC/status/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
new file mode 100644
index 000000000..279293628
--- /dev/null
+++ b/PLUGINS/SRC/status/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'status' Revision History
+------------------------------------
+
+2002-05-18: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/SRC/status/Makefile b/PLUGINS/SRC/status/Makefile
new file mode 100644
index 000000000..a0dbbc0c8
--- /dev/null
+++ b/PLUGINS/SRC/status/Makefile
@@ -0,0 +1,79 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id$
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = status
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB/ost/include
+VDRDIR = ../../..
+VDRINC = $(VDRDIR)/include
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+
+DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+package: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/SRC/status/README b/PLUGINS/SRC/status/README
new file mode 100644
index 000000000..356f1f8d1
--- /dev/null
+++ b/PLUGINS/SRC/status/README
@@ -0,0 +1,11 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          www.cadsoft.de/people/kls/vdr
+
+Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
+
+See the file COPYING for license information.
+
+Description: This is an example that shows the use of cStatus.
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
new file mode 100644
index 000000000..c9c494a8f
--- /dev/null
+++ b/PLUGINS/SRC/status/status.c
@@ -0,0 +1,179 @@
+/*
+ * status.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
+#include <vdr/plugin.h>
+#include <vdr/status.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "Status monitor test";
+static const char *MAINMENUENTRY  = NULL;
+
+// ---
+
+class cStatusTest : public cStatus {
+protected:
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  virtual void Recording(const cDevice *Device, const char *Name);
+  virtual void Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name);
+  virtual void SetVolume(int Volume, bool Absolute);
+  virtual void OsdClear(void);
+  virtual void OsdTitle(const char *Title);
+  virtual void OsdStatusMessage(const char *Message);
+  virtual void OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue);
+  virtual void OsdCurrentItem(const char *Text);
+  virtual void OsdTextItem(const char *Text, bool Scroll);
+  virtual void OsdChannel(const char *Text);
+  virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle);
+  };
+
+void cStatusTest::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+{
+  dsyslog("status: cStatusTest::ChannelSwitch  %d %d", Device->CardIndex(), ChannelNumber);
+}
+
+void cStatusTest::Recording(const cDevice *Device, const char *Name)
+{
+  dsyslog("status: cStatusTest::Recording  %d %s", Device->CardIndex(), Name);
+}
+
+void cStatusTest::Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name)
+{
+  dsyslog("status: cStatusTest::Replaying  %s", Name);
+}
+
+void cStatusTest::SetVolume(int Volume, bool Absolute)
+{
+  dsyslog("status: cStatusTest::SetVolume  %d %d", Volume, Absolute);
+}
+
+void cStatusTest::OsdClear(void)
+{
+  dsyslog("status: cStatusTest::OsdClear");
+}
+
+void cStatusTest::OsdTitle(const char *Title)
+{
+  dsyslog("status: cStatusTest::OsdTitle '%s'", Title);
+}
+
+void cStatusTest::OsdStatusMessage(const char *Message)
+{
+  dsyslog("status: cStatusTest::OsdStatusMessage '%s'", Message);
+}
+
+void cStatusTest::OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  dsyslog("status: cStatusTest::OsdHelpKeys %s - %s - %s - %s", Red, Green, Yellow, Blue);
+}
+
+void cStatusTest::OsdCurrentItem(const char *Text)
+{
+  dsyslog("status: cStatusTest::OsdCurrentItem %s", Text);
+}
+
+void cStatusTest::OsdTextItem(const char *Text, bool Scroll)
+{
+  dsyslog("status: cStatusTest::OsdTextItem %s %d", Text, Scroll);
+}
+
+void cStatusTest::OsdChannel(const char *Text)
+{
+  dsyslog("status: cStatusTest::OsdChannel %s", Text);
+}
+
+void cStatusTest::OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle)
+{
+  char buffer[25];
+  struct tm tm_r;
+  dsyslog("status: cStatusTest::OsdProgramme");
+  strftime(buffer, sizeof(buffer), "%R", localtime_r(&PresentTime, &tm_r));
+  dsyslog("%5s %s", buffer, PresentTitle);
+  dsyslog("%5s %s", "", PresentSubtitle);
+  strftime(buffer, sizeof(buffer), "%R", localtime_r(&FollowingTime, &tm_r));
+  dsyslog("%5s %s", buffer, FollowingTitle);
+  dsyslog("%5s %s", "", FollowingSubtitle);
+}
+
+// ---
+
+class cPluginStatus : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+  cStatusTest *statusTest;
+public:
+  cPluginStatus(void);
+  virtual ~cPluginStatus();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdMenu *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginStatus::cPluginStatus(void)
+{
+  // Initialize any member varaiables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+  statusTest = NULL;
+}
+
+cPluginStatus::~cPluginStatus()
+{
+  // Clean up after yourself!
+  delete statusTest;
+}
+
+const char *cPluginStatus::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return NULL;
+}
+
+bool cPluginStatus::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  return true;
+}
+
+bool cPluginStatus::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  statusTest = new cStatusTest;
+  return true;
+}
+
+void cPluginStatus::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
+}
+
+cOsdMenu *cPluginStatus::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  return NULL;
+}
+
+cMenuSetupPage *cPluginStatus::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPluginStatus::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginStatus); // Don't touch this!
diff --git a/audio.c b/audio.c
new file mode 100644
index 000000000..226505b4f
--- /dev/null
+++ b/audio.c
@@ -0,0 +1,11 @@
+/*
+ * audio.c: The basic audio interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: audio.c 1.1 2002/05/30 11:08:54 kls Exp $
+ */
+
+#include "audio.h"
+
diff --git a/audio.h b/audio.h
new file mode 100644
index 000000000..545a0afdc
--- /dev/null
+++ b/audio.h
@@ -0,0 +1,13 @@
+/*
+ * audio.h: The basic audio interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: audio.h 1.1 2002/05/30 11:07:28 kls Exp $
+ */
+
+#ifndef __AUDIO_H
+#define __AUDIO_H
+
+#endif //__AUDIO_H
diff --git a/config.c b/config.c
index f28d1a546..6753ce8d0 100644
--- a/config.c
+++ b/config.c
@@ -4,16 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.101 2002/05/13 16:28:12 kls Exp $
+ * $Id: config.c 1.102 2002/06/16 12:57:31 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
-#include "dvbapi.h"
 #include "i18n.h"
 #include "interface.h"
 #include "plugin.h"
+#include "recording.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -293,15 +293,15 @@ bool cChannel::Save(FILE *f)
   return fprintf(f, ToText()) > 0;
 }
 
-bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
+bool cChannel::Switch(cDevice *Device, bool Log)
 {
-  if (!DvbApi)
-     DvbApi = cDvbApi::PrimaryDvbApi;
-  if (!DvbApi->Recording() && !groupSep) {
+  if (!Device)
+     Device = cDevice::PrimaryDevice();
+  if (!(Device->IsPrimaryDevice() && Device->Receiving()) && !groupSep) {
      if (Log)
         isyslog("switching to channel %d", number);
      for (int i = 3; i--;) {
-         switch (DvbApi->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, apid2, dpid1, dpid2, tpid, ca, pnr)) {
+         switch (Device->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, tpid, ca, pnr)) {
            case scrOk:         return true;
            case scrNoTransfer: if (Interface)
                                   Interface->Error(tr("Can't start Transfer Mode!"));
@@ -312,7 +312,7 @@ bool cChannel::Switch(cDvbApi *DvbApi, bool Log)
          }
      return false;
      }
-  if (DvbApi->Recording())
+  if (Device->IsPrimaryDevice() && Device->Receiving())
      Interface->Error(tr("Channel locked (recording)!"));
   return false;
 }
@@ -326,7 +326,7 @@ cTimer::cTimer(bool Instant)
   startTime = stopTime = 0;
   recording = pending = false;
   active = Instant ? taActInst : taInactive;
-  cChannel *ch = Channels.GetByNumber(cDvbApi::CurrentChannel());
+  cChannel *ch = Channels.GetByNumber(cDevice::CurrentChannel());
   channel = ch ? ch->number : 0;
   time_t t = time(NULL);
   struct tm tm_r;
@@ -836,10 +836,10 @@ cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
   return NULL;
 }
 
-bool cChannels::SwitchTo(int Number, cDvbApi *DvbApi)
+bool cChannels::SwitchTo(int Number, cDevice *Device)
 {
   cChannel *channel = GetByNumber(Number);
-  return channel && channel->Switch(DvbApi);
+  return channel && channel->Switch(Device);
 }
 
 const char *cChannels::GetChannelNameByNumber(int Number)
@@ -957,6 +957,7 @@ bool cSetupLine::operator< (const cListObject &ListObject)
 
 bool cSetupLine::Parse(char *s)
 {
+  //dsyslog("cSetupLine::Parse '%s'", s);//XXX-
   char *p = strchr(s, '=');
   if (p) {
      *p = 0;
@@ -974,6 +975,7 @@ bool cSetupLine::Parse(char *s)
            }
         name = strdup(Name);
         value = strdup(Value);
+        //dsyslog("cSetupLine::Parse '%s' = '%s'", name, value);//XXX-
         return true;
         }
      }
@@ -982,6 +984,7 @@ bool cSetupLine::Parse(char *s)
 
 bool cSetupLine::Save(FILE *f)
 {
+  //dsyslog("cSetupLine::Save '%s' = '%s'", name, value);//XXX-
   return fprintf(f, "%s%s%s = %s\n", plugin ? plugin : "", plugin ? "." : "", name, value) > 0;
 }
 
@@ -1095,7 +1098,7 @@ bool cSetup::Load(const char *FileName)
 
 void cSetup::StoreCaCaps(const char *Name)
 {
-  for (int d = 0; d < MAXDVBAPI; d++) {
+  for (int d = 0; d < MAXDEVICES; d++) {
       char buffer[MAXPARSEBUFFER];
       char *q = buffer;
       *buffer = 0;
@@ -1115,7 +1118,7 @@ bool cSetup::ParseCaCaps(const char *Value)
 {
   char *p;
   int d = strtol(Value, &p, 10);
-  if (d > 0 && d <= MAXDVBAPI) {
+  if (d > 0 && d <= MAXDEVICES) {
      d--;
      int i = 0;
      while (p != Value && p && *p) {
diff --git a/config.h b/config.h
index cb21745de..577d02df5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.116 2002/05/13 16:28:16 kls Exp $
+ * $Id: config.h 1.118 2002/05/31 10:20:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -15,11 +15,11 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include "dvbapi.h"
+#include "device.h"
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.2"
+#define VDRVERSION "1.1.3"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -118,7 +118,7 @@ class cChannel : public cListObject {
   const char *ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
-  bool Switch(cDvbApi *DvbApi = NULL, bool Log = true);
+  bool Switch(cDevice *Device = NULL, bool Log = true);
   };
 
 enum eTimerActive { taInactive = 0,
@@ -294,7 +294,7 @@ class cChannels : public cConfig<cChannel> {
   cChannel *GetByNumber(int Number);
   cChannel *GetByServiceID(unsigned short ServiceId);
   const char *GetChannelNameByNumber(int Number);
-  bool SwitchTo(int Number, cDvbApi *DvbApi = NULL);
+  bool SwitchTo(int Number, cDevice *Device = NULL);
   int MaxNumber(void) { return maxNumber; }
   };
 
@@ -385,7 +385,7 @@ class cSetup : public cConfig<cSetupLine> {
   int MinEventTimeout, MinUserInactivity;
   int MultiSpeedMode;
   int ShowReplayMode;
-  int CaCaps[MAXDVBAPI][MAXCACAPS];
+  int CaCaps[MAXDEVICES][MAXCACAPS];
   int CurrentChannel;
   int CurrentVolume;
   int __EndData__;
diff --git a/device.c b/device.c
new file mode 100644
index 000000000..fe756592e
--- /dev/null
+++ b/device.c
@@ -0,0 +1,1017 @@
+/*
+ * device.c: The basic device interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: device.c 1.2 2002/06/16 13:23:31 kls Exp $
+ */
+
+#include "device.h"
+#include <errno.h>
+extern "C" {
+#define HAVE_BOOLEAN
+#include <jpeglib.h>
+}
+#include <linux/videodev.h>
+#include <ost/sec.h>
+#include <poll.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include "player.h"
+#include "receiver.h"
+#include "status.h"
+
+#define DEV_VIDEO         "/dev/video"
+#define DEV_OST_OSD       "/dev/ost/osd"
+#define DEV_OST_FRONTEND  "/dev/ost/frontend"
+#define DEV_OST_SEC       "/dev/ost/sec"
+#define DEV_OST_DVR       "/dev/ost/dvr"
+#define DEV_OST_DEMUX     "/dev/ost/demux"
+#define DEV_OST_VIDEO     "/dev/ost/video"
+#define DEV_OST_AUDIO     "/dev/ost/audio"
+
+// The default priority for non-primary DVB cards:
+#define DEFAULTPRIORITY  -2
+
+#define TS_SIZE          188
+#define TS_SYNC_BYTE     0x47
+#define PID_MASK_HI      0x1F
+
+// The maximum time we wait before assuming that a recorded video data stream
+// is broken:
+#define MAXBROKENTIMEOUT 30 // seconds
+
+static const char *OstName(const char *Name, int n)
+{
+  static char buffer[_POSIX_PATH_MAX];
+  snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
+  return buffer;
+}
+
+static int OstOpen(const char *Name, int n, int Mode, bool ReportError = false)
+{
+  const char *FileName = OstName(Name, n);
+  int fd = open(FileName, Mode);
+  if (fd < 0 && ReportError)
+     LOG_ERROR_STR(FileName);
+  return fd;
+}
+
+int cDevice::numDevices = 0;
+int cDevice::useDevice = 0;
+cDevice *cDevice::device[MAXDEVICES] = { NULL };
+cDevice *cDevice::primaryDevice = NULL;
+
+cDevice::cDevice(int n)
+{
+  frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
+  siProcessor = NULL;
+  cardIndex = n;
+
+  // Devices that are present on all card types:
+
+  fd_frontend = OstOpen(DEV_OST_FRONTEND, n, O_RDWR);
+
+  // Devices that are only present on DVB-S cards:
+
+  fd_sec      = OstOpen(DEV_OST_SEC,      n, O_RDWR);
+
+  // Devices that are only present on cards with decoders:
+
+  fd_osd      = OstOpen(DEV_OST_OSD,    n, O_RDWR);
+  fd_video    = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
+  fd_audio    = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
+
+  // Video format:
+
+  SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+
+  // We only check the devices that must be present - the others will be checked before accessing them://XXX
+
+  if (fd_frontend >= 0) {
+     siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
+     FrontendInfo feinfo;
+     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0)
+        frontendType = feinfo.type;
+     else
+        LOG_ERROR;
+     }
+  else
+     esyslog("ERROR: can't open video device %d", n);
+
+  dvrFileName = strdup(OstName(DEV_OST_DVR, CardIndex()));
+  active = false;
+
+  currentChannel = 0;
+  frequency = 0;
+
+  mute = false;
+  volume = Setup.CurrentVolume;
+
+  player = NULL;
+
+  for (int i = 0; i < MAXRECEIVERS; i++)
+      receiver[i] = NULL;
+  ca = -1;
+}
+
+cDevice::~cDevice()
+{
+  delete dvrFileName;
+  delete siProcessor;
+  Detach(player);
+  for (int i = 0; i < MAXRECEIVERS; i++)
+      Detach(receiver[i]);
+  // We're not explicitly closing any device files here, since this sometimes
+  // caused segfaults. Besides, the program is about to terminate anyway...
+}
+
+void cDevice::SetUseDevice(int n)
+{
+  if (n < MAXDEVICES)
+     useDevice |= (1 << n);
+}
+
+bool cDevice::SetPrimaryDevice(int n)
+{
+  n--;
+  if (0 <= n && n < numDevices && device[n]) {
+     isyslog("setting primary device to %d", n + 1);
+     primaryDevice = device[n];
+     return true;
+     }
+  esyslog("invalid devive number: %d", n + 1);
+  return false;
+}
+
+cDevice *cDevice::GetDevice(int Ca, int Priority, int Frequency, int Vpid, bool *ReUse)
+{
+  if (ReUse)
+     *ReUse = false;
+  cDevice *d = NULL;
+  int Provides[MAXDEVICES];
+  // Check which devices provide Ca:
+  for (int i = 0; i < numDevices; i++) {
+      if ((Provides[i] = device[i]->ProvidesCa(Ca)) != 0) { // this device is basicly able to do the job
+         //XXX+ dsyslog("GetDevice: %d %d %d %5d %5d", i, device[i]->HasDecoder(), device[i]->Receiving(), Frequency, device[i]->frequency);//XXX
+         if (  (!device[i]->HasDecoder() // it's a "budget card" which can receive multiple channels...
+               && device[i]->frequency == Frequency // ...and it is tuned to the requested frequency...
+               && device[i]->Receiving() // ...and is already receiving
+               // need not check priority - if a budget card is already receiving on the requested
+               // frequency, we can attach another receiver regardless of priority
+               )
+            || (device[i]->HasDecoder() // it's a "full featured card" which can receive only one channel...
+               && device[i]->frequency == Frequency // ...and it is tuned to the requested frequency...
+               && device[i]->pidHandles[ptVideo].pid == Vpid // ...and the requested video PID...
+               && device[i]->Receiving() // ...and is already receiving
+               // need not check priority - if a full featured card is already receiving the requested
+               // frequency and video PID, we can attach another receiver regardless of priority
+               )
+            ) {
+            d = device[i];
+            if (ReUse)
+               *ReUse = true;
+            break;
+            }
+         if (Priority > device[i]->Priority() // Priority is high enough to use this device
+            && (!d // we don't have a device yet, or...
+               || device[i]->Priority() < d->Priority() // ...this one has an even lower Priority
+               || (device[i]->Priority() == d->Priority() // ...same Priority...
+                  && Provides[i] < Provides[d->CardIndex()] // ...but this one provides fewer Ca values
+                  )
+               )
+            )
+            d = device[i];
+         }
+      }
+  /*XXX+ too complex with multiple recordings per device
+  if (!d && Ca > MAXDEVICES) {
+     // We didn't find one the easy way, so now we have to try harder:
+     int ShiftLevel = -1;
+     for (int i = 0; i < numDevices; i++) {
+         if (Provides[i]) { // this device is basicly able to do the job, but for some reason we didn't get it above
+            int sl = device[i]->CanShift(Ca, Priority); // asks this device to shift its job to another device
+            if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
+               d = device[i]; // found one that can be shifted with the fewest number of subsequent shifts
+               ShiftLevel = sl;
+               }
+            }
+         }
+     }
+  XXX*/
+  return d;
+}
+
+void cDevice::SetCaCaps(void)
+{
+  for (int d = 0; d < numDevices; d++) {
+      for (int i = 0; i < MAXCACAPS; i++)
+          device[d]->caCaps[i] = Setup.CaCaps[device[d]->CardIndex()][i];
+      }
+}
+
+bool cDevice::Probe(const char *FileName)
+{
+  if (access(FileName, F_OK) == 0) {
+     dsyslog("probing %s", FileName);
+     int f = open(FileName, O_RDONLY);
+     if (f >= 0) {
+        close(f);
+        return true;
+        }
+     else if (errno != ENODEV && errno != EINVAL)
+        LOG_ERROR_STR(FileName);
+     }
+  else if (errno != ENOENT)
+     LOG_ERROR_STR(FileName);
+  return false;
+}
+
+bool cDevice::Initialize(void)
+{
+  numDevices = 0;
+  for (int i = 0; i < MAXDEVICES; i++) {
+      if (useDevice == 0 || (useDevice & (1 << i)) != 0) {
+         if (Probe(OstName(DEV_OST_FRONTEND, i)))
+            device[numDevices++] = new cDevice(i);
+         else
+            break;
+         }
+      }
+  primaryDevice = device[0];
+  if (numDevices > 0) {
+     isyslog("found %d video device%s", numDevices, numDevices > 1 ? "s" : "");
+     SetCaCaps();
+     }
+  else
+     esyslog("ERROR: no video device found, giving up!");
+  return numDevices > 0;
+}
+
+void cDevice::Shutdown(void)
+{
+  for (int i = 0; i < numDevices; i++) {
+      delete device[i];
+      device[i] = NULL;
+      }
+  primaryDevice = NULL;
+}
+
+bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
+{
+  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
+  if (videoDev >= 0) {
+     int result = 0;
+     struct video_mbuf mbuf;
+     result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
+     if (result == 0) {
+        int msize = mbuf.size;
+        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
+        if (mem && mem != (unsigned char *)-1) {
+           // set up the size and RGB
+           struct video_capability vc;
+           result |= ioctl(videoDev, VIDIOCGCAP, &vc);
+           struct video_mmap vm;
+           vm.frame = 0;
+           if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
+               (SizeY > 0) && (SizeY <= vc.maxheight)) {
+              vm.width = SizeX;
+              vm.height = SizeY;
+              }
+           else {
+              vm.width = vc.maxwidth;
+              vm.height = vc.maxheight;
+              }
+           vm.format = VIDEO_PALETTE_RGB24;
+           result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
+           result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
+           // make RGB out of BGR:
+           int memsize = vm.width * vm.height;
+           unsigned char *mem1 = mem;
+           for (int i = 0; i < memsize; i++) {
+               unsigned char tmp = mem1[2];
+               mem1[2] = mem1[0];
+               mem1[0] = tmp;
+               mem1 += 3;
+               }
+         
+           if (Quality < 0)
+              Quality = 255; //XXX is this 'best'???
+         
+           isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+           FILE *f = fopen(FileName, "wb");
+           if (f) {
+              if (Jpeg) {
+                 // write JPEG file:
+                 struct jpeg_compress_struct cinfo;
+                 struct jpeg_error_mgr jerr;
+                 cinfo.err = jpeg_std_error(&jerr);
+                 jpeg_create_compress(&cinfo);
+                 jpeg_stdio_dest(&cinfo, f);
+                 cinfo.image_width = vm.width;
+                 cinfo.image_height = vm.height;
+                 cinfo.input_components = 3;
+                 cinfo.in_color_space = JCS_RGB;
+         
+                 jpeg_set_defaults(&cinfo);
+                 jpeg_set_quality(&cinfo, Quality, true);
+                 jpeg_start_compress(&cinfo, true);
+         
+                 int rs = vm.width * 3;
+                 JSAMPROW rp[vm.height];
+                 for (int k = 0; k < vm.height; k++)
+                     rp[k] = &mem[rs * k];
+                 jpeg_write_scanlines(&cinfo, rp, vm.height);
+                 jpeg_finish_compress(&cinfo);
+                 jpeg_destroy_compress(&cinfo);
+                 }
+              else {
+                 // write PNM file:
+                 if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
+                     fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
+                    LOG_ERROR_STR(FileName);
+                    result |= 1;
+                    }
+                 }
+              fclose(f);
+              }
+           else {
+              LOG_ERROR_STR(FileName);
+              result |= 1;
+              }
+           munmap(mem, msize);
+           }
+        else
+           result |= 1;
+        }
+     close(videoDev);
+     return result == 0;
+     }
+  return false;
+}
+
+void cDevice::SetVideoFormat(videoFormat_t Format)
+{
+  if (HasDecoder())
+     CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, Format));
+}
+
+//                          ptVideo        ptAudio        ptTeletext        ptDolby        ptOther
+dmxPesType_t PesTypes[] = { DMX_PES_VIDEO, DMX_PES_AUDIO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+
+//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); } //XXX+
+#define PRINTPIDS(s)
+
+bool cDevice::AddPid(int Pid, ePidType PidType)
+{
+  if (Pid) {
+     int n = -1;
+     int a = -1;
+     for (int i = 0; i < MAXPIDHANDLES; i++) {
+         if (pidHandles[i].pid == Pid)
+            n = i;
+         else if (a < 0 && i >= ptOther && !pidHandles[i].used)
+            a = i;
+         }
+     dmxPesType_t PesType = PesTypes[ptOther];
+     if (n >= 0) {
+        // The Pid is already in use
+        if (++pidHandles[n].used == 2 && n <= ptTeletext) {
+           // It's a special PID that has to be switched into "tap" mode
+           PRINTPIDS("A");//XXX+
+           return SetPid(pidHandles[n].fd, PesTypes[n], Pid, DMX_OUT_TS_TAP);
+           }
+        PRINTPIDS("a");//XXX+
+        return true;
+        }
+     else if (PidType < ptOther) {
+        // The Pid is not yet in use and it is a special one
+        n = PidType;
+        PesType = PesTypes[PidType];
+        PRINTPIDS("B");//XXX+
+        }
+     else if (a >= 0) {
+        // The Pid is not yet in use and we have a free slot
+        n = a;
+        }
+     else
+        esyslog("ERROR: no free slot for PID %d", Pid);
+     if (n >= 0) {
+        pidHandles[n].pid = Pid;
+        pidHandles[n].fd = OstOpen(DEV_OST_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
+        pidHandles[n].used = 1;
+        PRINTPIDS("C");//XXX+
+        return SetPid(pidHandles[n].fd, PesType, Pid, PidType <= ptTeletext ? DMX_OUT_DECODER : DMX_OUT_TS_TAP);
+        }
+     }
+  return true;
+}
+
+bool cDevice::DelPid(int Pid)
+{
+  if (Pid) {
+     for (int i = 0; i < MAXPIDHANDLES; i++) {
+         if (pidHandles[i].pid == Pid) {
+            switch (--pidHandles[i].used) {
+              case 0: CHECK(ioctl(pidHandles[i].fd, DMX_STOP));//XXX+ is this necessary???
+                      close(pidHandles[i].fd);
+                      pidHandles[i].fd = -1;
+                      pidHandles[i].pid = 0;
+                      break;
+              case 1: if (i <= ptTeletext)
+                         SetPid(pidHandles[i].fd, PesTypes[i], Pid, DMX_OUT_DECODER);
+                      break;
+              }
+            PRINTPIDS("D");//XXX+
+            return pidHandles[i].used;
+            }
+         }
+     }
+  return false;
+}
+
+bool cDevice::SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output)
+{
+  if (Pid) {
+     CHECK(ioctl(fd, DMX_STOP));
+     if (Pid != 0x1FFF) {
+        dmxPesFilterParams pesFilterParams;
+        pesFilterParams.pid     = Pid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = Output;
+        pesFilterParams.pesType = PesType;
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        //XXX+ pesFilterParams.flags   = DMX_CHECK_CRC;//XXX
+        if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+           LOG_ERROR;
+           return false;
+           }
+        //XXX+ CHECK(ioctl(fd, DMX_SET_BUFFER_SIZE, KILOBYTE(32)));//XXX
+        //XXX+ CHECK(ioctl(fd, DMX_START));//XXX
+        }
+     }
+  return true;
+}
+
+eSetChannelResult cDevice::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr)
+{
+  //XXX+StopTransfer();
+  //XXX+StopReplay();
+
+  cStatus::MsgChannelSwitch(this, 0);
+
+  // Must set this anyway to avoid getting stuck when switching through
+  // channels with 'Up' and 'Down' keys:
+  currentChannel = ChannelNumber;
+
+  // Avoid noise while switching:
+
+  if (HasDecoder()) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     }
+
+  // Stop setting system time:
+
+  if (siProcessor)
+     siProcessor->SetCurrentTransponder(0);
+
+  // If this card can't receive this channel, we must not actually switch
+  // the channel here, because that would irritate the driver when we
+  // start replaying in Transfer Mode immediately after switching the channel:
+  bool NeedsTransferMode = (IsPrimaryDevice() && !ProvidesCa(Ca));
+
+  if (!NeedsTransferMode) {
+
+     // Turn off current PIDs:
+
+     if (HasDecoder()) {
+        DelPid(pidHandles[ptVideo].pid);
+        DelPid(pidHandles[ptAudio].pid);
+        DelPid(pidHandles[ptTeletext].pid);
+        DelPid(pidHandles[ptDolby].pid);
+        }
+
+     FrontendParameters Frontend;
+
+     switch (frontendType) {
+       case FE_QPSK: { // DVB-S
+
+            // Frequency offsets:
+
+            unsigned int freq = Frequency;
+            int tone = SEC_TONE_OFF;
+
+            if (freq < (unsigned int)Setup.LnbSLOF) {
+               freq -= Setup.LnbFrequLo;
+               tone = SEC_TONE_OFF;
+               }
+            else {
+               freq -= Setup.LnbFrequHi;
+               tone = SEC_TONE_ON;
+               }
+
+            Frontend.Frequency = freq * 1000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
+            Frontend.u.qpsk.FEC_inner = FEC_AUTO;
+
+            int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+
+            // DiseqC:
+
+            secCommand scmd;
+            scmd.type = 0;
+            scmd.u.diseqc.addr = 0x10;
+            scmd.u.diseqc.cmd = 0x38;
+            scmd.u.diseqc.numParams = 1;
+            scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
+
+            secCmdSequence scmds;
+            scmds.voltage = volt;
+            scmds.miniCommand = SEC_MINI_NONE;
+            scmds.continuousTone = tone;
+            scmds.numCommands = Setup.DiSEqC ? 1 : 0;
+            scmds.commands = &scmd;
+
+            CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+            }
+            break;
+       case FE_QAM: { // DVB-C
+
+            // Frequency and symbol rate:
+
+            Frontend.Frequency = Frequency * 1000000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.qam.SymbolRate = Srate * 1000UL;
+            Frontend.u.qam.FEC_inner = FEC_AUTO;
+            Frontend.u.qam.QAM = QAM_64;
+            }
+            break;
+       case FE_OFDM: { // DVB-T
+
+            // Frequency and OFDM paramaters:
+
+            Frontend.Frequency = Frequency * 1000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
+            Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
+            Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
+            Frontend.u.ofdm.Constellation=QAM_64;
+            Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
+            Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
+            Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
+            }
+            break;
+       default:
+            esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+            return scrFailed;
+       }
+
+     // Tuning:
+
+     CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
+
+     // Wait for channel sync:
+
+     if (cFile::FileReady(fd_frontend, 5000)) {
+        FrontendEvent event;
+        int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
+        if (res >= 0) {
+           if (event.type != FE_COMPLETION_EV) {
+              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
+              if (IsPrimaryDevice())
+                 cThread::RaisePanic();
+              return scrFailed;
+              }
+           }
+        else
+           esyslog("ERROR %d in frontend get event (channel %d, card %d)", res, ChannelNumber, CardIndex() + 1);
+        }
+     else
+        esyslog("ERROR: timeout while tuning");
+
+     frequency = Frequency;
+
+     // PID settings:
+
+     if (HasDecoder()) {
+        if (!(AddPid(Vpid, ptVideo) && AddPid(Apid, ptAudio))) {//XXX+ dolby Dpid1!!! (if audio plugins are attached)
+           esyslog("ERROR: failed to set PIDs for channel %d", ChannelNumber);
+           return scrFailed;
+           }
+        if (IsPrimaryDevice())
+           AddPid(Tpid, ptTeletext);
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+        }
+     }
+
+  if (IsPrimaryDevice() && siProcessor)
+     siProcessor->SetCurrentServiceID(Pnr);
+
+  eSetChannelResult Result = scrOk;
+
+  // If this DVB card can't receive this channel, let's see if we can
+  // use the card that actually can receive it and transfer data from there:
+
+  if (NeedsTransferMode) {
+     cDevice *CaDevice = GetDevice(Ca, 0);
+     if (CaDevice && !CaDevice->Receiving()) {
+        if ((Result = CaDevice->SetChannel(ChannelNumber, Frequency, Polarization, Diseqc, Srate, Vpid, Apid, Tpid, Ca, Pnr)) == scrOk) {
+           //XXX+SetModeReplay();
+           //XXX+transferringFromDevice = CaDevice->StartTransfer(fd_video);
+           }
+        }
+     else
+        Result = scrNoTransfer;
+     }
+
+  if (HasDecoder()) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+     }
+
+  // Start setting system time:
+
+  if (Result == scrOk && siProcessor)
+     siProcessor->SetCurrentTransponder(Frequency);
+
+  cStatus::MsgChannelSwitch(this, ChannelNumber);
+
+  return Result;
+}
+
+bool cDevice::ToggleMute(void)
+{
+  int OldVolume = volume;
+  mute = !mute;
+  SetVolume(0, mute);
+  volume = OldVolume;
+  return mute;
+}
+
+void cDevice::SetVolume(int Volume, bool Absolute)
+{
+  if (HasDecoder()) {
+     volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
+     audioMixer_t am;
+     am.volume_left = am.volume_right = volume;
+     CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
+     cStatus::MsgSetVolume(volume, Absolute);
+     if (volume > 0)
+        mute = false;
+     }
+}
+
+void cDevice::TrickSpeed(int Speed)
+{
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
+}
+
+void cDevice::Clear(void)
+{
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+}
+
+void cDevice::Play(void)
+{
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_CONTINUE));
+}
+
+void cDevice::Freeze(void)
+{
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_FREEZE));
+}
+
+void cDevice::Mute(void)
+{
+  if (fd_audio >= 0) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     }
+}
+
+void cDevice::StillPicture(const uchar *Data, int Length)
+{
+  Mute();
+/* Using the VIDEO_STILLPICTURE ioctl call would be the
+   correct way to display a still frame, but unfortunately this
+   doesn't work with frames from VDR. So let's do pretty much the
+   same here as in DVB/driver/dvb.c's play_iframe() - I have absolutely
+   no idea why it works this way, but doesn't work with VIDEO_STILLPICTURE.
+   If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
+   could be used, please let me know!
+   kls 2002-03-23
+*/
+//#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+#ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+  videoDisplayStillPicture sp = { (char *)Data, Length };
+  CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+#else
+#define MIN_IFRAME 400000
+  for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
+      safe_write(fd_video, Data, Length);
+      usleep(1); // allows the buffer to be displayed in case the progress display is active
+      }
+#endif
+}
+
+bool cDevice::Replaying(void)
+{
+  /*XXX+
+  if (replayBuffer && !replayBuffer->Active())
+     StopReplay();
+  return replayBuffer != NULL;
+  XXX*/
+  return player != NULL;
+}
+
+bool cDevice::Attach(cPlayer *Player)
+{
+  if (Receiving()) {
+     esyslog("ERROR: attempt to attach a cPlayer while receiving on device %d - ignored", CardIndex() + 1);
+     return false;
+     }
+  if (HasDecoder()) {
+     if (player)
+        Detach(player);
+
+     if (siProcessor)
+        siProcessor->SetStatus(false);
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_PLAY));
+     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+     CHECK(ioctl(fd_video, VIDEO_PLAY));
+
+     player = Player;
+     player->device = this;
+     player->deviceFileHandle = fd_video;
+     player->Activate(true);
+     return true;
+     }
+  return false;
+}
+
+void cDevice::Detach(cPlayer *Player)
+{
+  if (Player && player == Player) {
+     player->Activate(false);
+     player->deviceFileHandle = -1;
+     player->device = NULL;
+     player = NULL;
+
+     CHECK(ioctl(fd_video, VIDEO_STOP, true));
+     CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
+     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     if (siProcessor)
+        siProcessor->SetStatus(true);
+     }
+}
+
+void cDevice::StopReplay(void)
+{
+  if (player) {
+     Detach(player);
+     /*XXX+
+     if (IsPrimaryDevice()) {
+        // let's explicitly switch the channel back in case it was in Transfer Mode:
+        cChannel *Channel = Channels.GetByNumber(currentChannel);
+        if (Channel) {
+           Channel->Switch(this, false);
+           usleep(100000); // allow driver to sync in case a new replay will start immediately
+           }
+        }
+        XXX*/
+     }
+}
+
+int cDevice::PlayVideo(const uchar *Data, int Length)
+{
+  if (fd_video >= 0)
+     return write(fd_video, Data, Length);
+  return -1;
+}
+
+int cDevice::PlayAudio(const uchar *Data, int Length)
+{
+  //XXX+
+  return -1;
+}
+
+int cDevice::Priority(void)
+{
+  if (IsPrimaryDevice() && !Receiving())
+     return Setup.PrimaryLimit - 1;
+  int priority = DEFAULTPRIORITY;
+  for (int i = 0; i < MAXRECEIVERS; i++) {
+      if (receiver[i])
+         priority = max(receiver[i]->priority, priority);
+      }
+  return priority;
+}
+
+int cDevice::CanShift(int Ca, int Priority, int UsedCards)
+{
+  return -1;//XXX+ too complex with multiple recordings per device
+  // Test whether a receiving on this DVB device can be shifted to another one
+  // in order to perform a new receiving with the given Ca and Priority on this device:
+  int ShiftLevel = -1; // default means this device can't be shifted
+  if (UsedCards & (1 << CardIndex()) != 0)
+     return ShiftLevel; // otherwise we would get into a loop
+  if (Receiving()) {
+     if (ProvidesCa(Ca) // this device provides the requested Ca
+        && (Ca != this->Ca() // the requested Ca is different from the one currently used...
+           || Priority > this->Priority())) { // ...or the request comes from a higher priority
+        cDevice *d = NULL;
+        int Provides[MAXDEVICES];
+        UsedCards |= (1 << CardIndex());
+        for (int i = 0; i < numDevices; i++) {
+            if ((Provides[i] = device[i]->ProvidesCa(this->Ca())) != 0) { // this device is basicly able to do the job
+               if (device[i] != this) { // it is not _this_ device
+                  int sl = device[i]->CanShift(this->Ca(), Priority, UsedCards); // this is the original Priority!
+                  if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
+                     d = device[i];
+                     ShiftLevel = sl;
+                     }
+                  }
+               }
+            }
+        if (ShiftLevel >= 0)
+           ShiftLevel++; // adds the device's own shift
+        }
+     }
+  else if (Priority > this->Priority())
+     ShiftLevel = 0; // no shifting necessary, this device can do the job
+  return ShiftLevel;
+}
+
+int cDevice::ProvidesCa(int Ca)
+{
+  if (Ca == CardIndex() + 1)
+     return 1; // exactly _this_ card was requested
+  if (Ca && Ca <= MAXDEVICES)
+     return 0; // a specific card was requested, but not _this_ one
+  int result = Ca ? 0 : 1; // by default every card can provide FTA
+  int others = Ca ? 1 : 0;
+  for (int i = 0; i < MAXCACAPS; i++) {
+      if (caCaps[i]) {
+         if (caCaps[i] == Ca)
+            result = 1;
+         else
+            others++;
+         }
+      }
+  return result ? result + others : 0;
+}
+
+bool cDevice::Receiving(void)
+{
+  for (int i = 0; i < MAXRECEIVERS; i++) {
+      if (receiver[i])
+         return true;
+      }
+  return false;
+}
+
+void cDevice::Action(void)
+{
+  dsyslog("receiver thread started on device %d (pid=%d)", CardIndex() + 1, getpid());
+
+  int fd_dvr = open(dvrFileName, O_RDONLY | O_NONBLOCK);
+  if (fd_dvr >= 0) {
+     pollfd pfd;
+     pfd.fd = fd_dvr;
+     pfd.events = pfd.revents = POLLIN;
+     uchar b[TS_SIZE];
+     time_t t = time(NULL);
+     active = true;
+     for (; active;) {
+
+         // Read data from the DVR device:
+
+         if (pfd.revents & POLLIN != 0) {
+            int r = read(fd_dvr, b, sizeof(b));
+            if (r == TS_SIZE) {
+               if (*b == TS_SYNC_BYTE) {
+                  // We're locked on to a TS packet
+                  int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
+                  // Distribute the packet to all attached receivers:
+                  Lock();
+                  for (int i = 0; i < MAXRECEIVERS; i++) {
+                      if (receiver[i] && receiver[i]->WantsPid(Pid))
+                         receiver[i]->Receive(b, TS_SIZE);
+                      }
+                  Unlock();
+                  }
+               t = time(NULL);
+               }
+            else if (r > 0)
+               esyslog("ERROR: got incomplete TS packet (%d bytes)", r);//XXX+ TODO do we have to read the rest???
+            else if (r < 0) {
+               if (FATALERRNO) {
+                  if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
+                     esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
+                  else {
+                     LOG_ERROR;
+                     break;
+                     }
+                  }
+               }
+            }
+
+         // Wait for more data to become available:
+
+         poll(&pfd, 1, 100);
+
+         //XXX+ put this into the recorder??? or give the receiver a flag whether it wants this?
+         if (time(NULL) - t > MAXBROKENTIMEOUT) {
+            esyslog("ERROR: video data stream broken on device %d", CardIndex() + 1);
+            cThread::EmergencyExit(true);
+            t = time(NULL);
+            }
+         }
+     close(fd_dvr);
+     }
+  else
+     LOG_ERROR_STR(dvrFileName);
+
+  dsyslog("receiver thread ended on device %d (pid=%d)", CardIndex() + 1, getpid());
+}
+
+bool cDevice::Attach(cReceiver *Receiver)
+{
+  //XXX+ check for same transponder???
+  if (!Receiver)
+     return false;
+  if (Receiver->device == this)
+     return true;
+  StopReplay();
+  for (int i = 0; i < MAXRECEIVERS; i++) {
+      if (!receiver[i]) {
+         //siProcessor->SetStatus(false);//XXX+
+         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
+             if (Receiver->pids[n])
+                AddPid(Receiver->pids[n]);//XXX+ retval!
+             else
+                break;
+             }
+         Receiver->Activate(true);
+         Lock();
+         Receiver->device = this;
+         receiver[i] = Receiver;
+         Unlock();
+         Start();
+         return true;
+         }
+      }
+  esyslog("ERROR: no free receiver slot!");
+  return false;
+}
+
+void cDevice::Detach(cReceiver *Receiver)
+{
+  if (!Receiver || Receiver->device != this)
+     return;
+  bool receiversLeft = false;
+  for (int i = 0; i < MAXRECEIVERS; i++) {
+      if (receiver[i] == Receiver) {
+         Receiver->Activate(false);
+         Lock();
+         receiver[i] = NULL;
+         Receiver->device = NULL;
+         Unlock();
+         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
+             if (Receiver->pids[n])
+                DelPid(Receiver->pids[n]);
+             else
+                break;
+             }
+         }
+      else if (receiver[i])
+         receiversLeft = true;
+      }
+  if (!receiversLeft) {
+     active = false;
+     Cancel(3);
+     }
+}
diff --git a/device.h b/device.h
new file mode 100644
index 000000000..a25ff94ff
--- /dev/null
+++ b/device.h
@@ -0,0 +1,199 @@
+/*
+ * device.h: The basic device interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: device.h 1.1 2002/06/09 15:48:32 kls Exp $
+ */
+
+#ifndef __DEVICE_H
+#define __DEVICE_H
+
+#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
+                    // FIXME: shouldn't every header file include ALL the other header
+                    // FIXME: files it depends on? The sequence in which header files
+                    // FIXME: are included here should not matter - and it should NOT
+                    // FIXME: be necessary to include <stdlib.h> here!
+#include <ost/dmx.h>
+#include <ost/frontend.h>
+#include <ost/audio.h>
+#include <ost/video.h>
+#include "eit.h"
+#include "thread.h"
+
+enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
+
+#define MAXDEVICES          4 // the maximum number of devices in the system
+#define MAXCACAPS          16 // the maximum number of different CA values per DVB device
+#define MAXPIDHANDLES      16 // the maximum number of different PIDs per DVB device
+#define MAXRECEIVERS       16 // the maximum number of receivers per DVB device
+#define MAXVOLUME         255
+#define VOLUMEDELTA         5 // used to increase/decrease the volume
+
+class cPlayer;
+class cReceiver;
+
+class cDevice : cThread {
+  friend class cOsd;//XXX
+private:
+  static int numDevices;
+  static int useDevice;
+  static cDevice *device[MAXDEVICES];
+  static cDevice *primaryDevice;
+public:
+  static int NumDevices(void) { return numDevices; }
+         // Returns the total number of DVB devices.
+  static void SetUseDevice(int n);
+         // Sets the 'useDevice' flag of the given DVB device.
+         // If this function is not called before Initialize(), all DVB devices
+         // will be used.
+  static bool SetPrimaryDevice(int n);
+         // Sets the primary DVB device to 'n' (which must be in the range
+         // 1...numDevices) and returns true if this was possible.
+  static cDevice *PrimaryDevice(void) { return primaryDevice; }
+         // Returns the primary DVB device.
+  static cDevice *GetDevice(int Ca, int Priority, int Frequency = 0, int Vpid = 0, bool *ReUse = NULL);
+         // Selects a free DVB device, avoiding the primaryDevice if possible.
+         // If Ca is not 0, the device with the given number will be returned
+         // in case Ca is <= MAXDEVICES, or the device that provides the given
+         // value in its caCaps.
+         // If there is a device that is already tuned to the given Frequency,
+         // and that device is able to receive multiple channels ("budget" cards),
+         // that device will be returned. Else if a ("full featured") device is
+         // tuned to Frequency and Vpid, that one will be returned.
+         // If all DVB devices are currently receiving, the one receiving the
+         // lowest priority timer (if any) that is lower than the given Priority
+         // will be returned.
+         // If ReUse is given, the caller will be informed whether the device can be re-used
+         // for a new recording. If ReUse returns 'true', the caller must NOT switch the channel
+         // (the device is already properly tuned). Otherwise the caller MUST switch the channel.
+  static void SetCaCaps(void);
+         // Sets the CaCaps of all DVB devices according to the Setup data.
+  static bool Probe(const char *FileName);
+         // Probes for existing DVB devices.
+  static bool Initialize(void);
+         // Initializes the DVB devices.
+         // Must be called before accessing any DVB functions.
+  static void Shutdown(void);
+         // Closes down all DVB devices.
+         // Must be called at the end of the program.
+private:
+  int cardIndex;
+  int caCaps[MAXCACAPS];
+  FrontendType frontendType;
+  char *dvrFileName;
+  bool active;
+  int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video;
+  int OsdDeviceHandle(void) { return fd_osd; }
+public:
+  cDevice(int n);
+  virtual ~cDevice();
+  bool IsPrimaryDevice(void) { return this == primaryDevice; }
+  int CardIndex(void) const { return cardIndex; }
+         // Returns the card index of this device (0 ... MAXDEVICES - 1).
+  int ProvidesCa(int Ca);
+         // Checks whether this DVB device provides the given value in its
+         // caCaps. Returns 0 if the value is not provided, 1 if only this
+         // value is provided, and > 1 if this and other values are provided.
+         // If the given value is equal to the number of this DVB device,
+         // 1 is returned. If it is 0 (FTA), 1 plus the number of other values
+         // in caCaps is returned.
+  bool HasDecoder(void) const { return fd_video >= 0 && fd_audio >= 0; }
+
+// Channel facilities
+
+private:
+  int currentChannel;
+  int frequency;
+public:
+  eSetChannelResult SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr);
+  static int CurrentChannel(void) { return primaryDevice ? primaryDevice->currentChannel : 0; }
+  int Channel(void) { return currentChannel; }
+
+// PID handle facilities
+
+private:
+  enum ePidType { ptVideo, ptAudio, ptTeletext, ptDolby, ptOther };
+  class cPidHandle {
+  public:
+    int pid;
+    int fd;
+    int used;
+    cPidHandle(void) { pid = used = 0; fd = -1; }
+    };
+  cPidHandle pidHandles[MAXPIDHANDLES];
+  bool AddPid(int Pid, ePidType PidType = ptOther);
+  bool DelPid(int Pid);
+  bool SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output);
+  virtual void Action(void);
+
+// Image Grab facilities
+
+public:
+  bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+
+// Video format facilities
+
+public:
+  virtual void SetVideoFormat(videoFormat_t Format);
+
+// Volume facilities
+
+private:
+  bool mute;
+  int volume;
+public:
+  bool IsMute(void) { return mute; }
+  bool ToggleMute(void);
+       // Turns the volume off or on and returns the new mute state.
+  void SetVolume(int Volume, bool Absolute = false);
+       // Sets the volume to the given value, either absolutely or relative to
+       // the current volume.
+  static int CurrentVolume(void) { return primaryDevice ? primaryDevice->volume : 0; }//XXX???
+
+  // EIT facilities
+
+private:
+  cSIProcessor *siProcessor;
+
+// Player facilities
+
+private:
+  cPlayer *player;
+public:
+  void TrickSpeed(int Speed);
+  void Clear(void);
+  void Play(void);
+  void Freeze(void);
+  void Mute(void);
+  void StillPicture(const uchar *Data, int Length);
+  bool Replaying(void);
+       // Returns true if we are currently replaying.
+  void StopReplay(void);
+       // Stops the current replay session (if any).
+  bool Attach(cPlayer *Player);
+  void Detach(cPlayer *Player);
+  virtual int PlayVideo(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length);
+
+// Receiver facilities
+
+private:
+  cReceiver *receiver[MAXRECEIVERS];
+  int ca;
+  int Priority(void);
+      // Returns the priority of the current receiving session (0..MAXPRIORITY),
+      // or -1 if no receiver is currently active. The primary DVB device will
+      // always return at least Setup.PrimaryLimit-1.
+  int CanShift(int Ca, int Priority, int UsedCards = 0);
+public:
+  int  Ca(void) { return ca; }
+       // Returns the ca of the current receiving session.
+  bool Receiving(void);
+       // Returns true if we are currently receiving.
+  bool Attach(cReceiver *Receiver);
+  void Detach(cReceiver *Receiver);
+  };
+
+#endif //__DEVICE_H
diff --git a/dmxdev.c.diff b/dmxdev.c.diff
new file mode 100644
index 000000000..85672c0fc
--- /dev/null
+++ b/dmxdev.c.diff
@@ -0,0 +1,12 @@
+--- dmxdev.c	Mon Apr  1 10:59:46 2002
++++ dmxdev.c	Sun Jun 16 11:02:38 2002
+@@ -1048,6 +1048,9 @@
+ 		if (dmxdev->dvr_buffer.pread!=dmxdev->dvr_buffer.pwrite)
+ 			return (POLLIN | POLLRDNORM | POLLPRI);
+ 		
++                if (dmxdev->dvr_buffer.error)
++	                return (POLLIN | POLLRDNORM | POLLPRI | POLLERR);
++
+ 		return 0;
+ 	} else 
+ 	        return (POLLOUT | POLLWRNORM | POLLPRI);
diff --git a/dvbapi.c b/dvbapi.c
deleted file mode 100644
index 0b14a871f..000000000
--- a/dvbapi.c
+++ /dev/null
@@ -1,2846 +0,0 @@
-/*
- * dvbapi.c: Interface to the DVB driver
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: dvbapi.c 1.175 2002/05/13 16:29:17 kls Exp $
- */
-
-#include "dvbapi.h"
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-extern "C" {
-#define HAVE_BOOLEAN
-#include <jpeglib.h>
-}
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include "config.h"
-#include "recording.h"
-#include "remux.h"
-#include "ringbuffer.h"
-#include "tools.h"
-#include "videodir.h"
-
-#define DEV_VIDEO         "/dev/video"
-#define DEV_OST_OSD       "/dev/ost/osd"
-#define DEV_OST_FRONTEND  "/dev/ost/frontend"
-#define DEV_OST_SEC       "/dev/ost/sec"
-#define DEV_OST_DVR       "/dev/ost/dvr"
-#define DEV_OST_DEMUX     "/dev/ost/demux"
-#define DEV_OST_VIDEO     "/dev/ost/video"
-#define DEV_OST_AUDIO     "/dev/ost/audio"
-
-// The size of the array used to buffer video data:
-// (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE  MEGABYTE(1)
-
-// The maximum size of a single frame:
-#define MAXFRAMESIZE  KILOBYTE(192)
-
-#define MAXFILESPERRECORDING 255
-
-#define MINFREEDISKSPACE    (512) // MB
-#define DISKCHECKINTERVAL   100 // seconds
-
-#define INDEXFILESUFFIX     "/index.vdr"
-#define RECORDFILESUFFIX    "/%03d.vdr"
-#define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
-
-// The number of frames to back up when resuming an interrupted replay session:
-#define RESUMEBACKUP (10 * FRAMESPERSEC)
-
-// The maximum time we wait before assuming that a recorded video data stream
-// is broken:
-#define MAXBROKENTIMEOUT 30 // seconds
-
-// The maximum time to wait before giving up while catching up on an index file:
-#define MAXINDEXCATCHUP   2 // seconds
-
-// The default priority for non-primary DVB cards:
-#define DEFAULTPRIORITY  -2
-
-#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
-
-#define FATALERRNO (errno != EAGAIN && errno != EINTR)
-
-typedef unsigned char uchar;
-
-const char *IndexToHMSF(int Index, bool WithFrame)
-{
-  static char buffer[16];
-  int f = (Index % FRAMESPERSEC) + 1;
-  int s = (Index / FRAMESPERSEC);
-  int m = s / 60 % 60;
-  int h = s / 3600;
-  s %= 60;
-  snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
-  return buffer;
-}
-
-int HMSFToIndex(const char *HMSF)
-{
-  int h, m, s, f = 0;
-  if (3 <= sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f))
-     return (h * 3600 + m * 60 + s) * FRAMESPERSEC + f - 1;
-  return 0;
-}
-
-// --- cIndexFile ------------------------------------------------------------
-
-class cIndexFile {
-private:
-  struct tIndex { int offset; uchar type; uchar number; short reserved; };
-  int f;
-  char *fileName;
-  int size, last;
-  tIndex *index;
-  cResumeFile resumeFile;
-  bool CatchUp(int Index = -1);
-public:
-  cIndexFile(const char *FileName, bool Record);
-  ~cIndexFile();
-  bool Ok(void) { return index != NULL; }
-  bool Write(uchar PictureType, uchar FileNumber, int FileOffset);
-  bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
-  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
-  int Get(uchar FileNumber, int FileOffset);
-  int Last(void) { CatchUp(); return last; }
-  int GetResume(void) { return resumeFile.Read(); }
-  bool StoreResume(int Index) { return resumeFile.Save(Index); }
-  };
-
-cIndexFile::cIndexFile(const char *FileName, bool Record)
-:resumeFile(FileName)
-{
-  f = -1;
-  fileName = NULL;
-  size = 0;
-  last = -1;
-  index = NULL;
-  if (FileName) {
-     fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + 1];
-     if (fileName) {
-        strcpy(fileName, FileName);
-        char *pFileExt = fileName + strlen(fileName);
-        strcpy(pFileExt, INDEXFILESUFFIX);
-        int delta = 0;
-        if (access(fileName, R_OK) == 0) {
-           struct stat buf;
-           if (stat(fileName, &buf) == 0) {
-              delta = buf.st_size % sizeof(tIndex);
-              if (delta) {
-                 delta = sizeof(tIndex) - delta;
-                 esyslog("ERROR: invalid file size (%ld) in '%s'", buf.st_size, fileName);
-                 }
-              last = (buf.st_size + delta) / sizeof(tIndex) - 1;
-              if (!Record && last >= 0) {
-                 size = last + 1;
-                 index = new tIndex[size];
-                 if (index) {
-                    f = open(fileName, O_RDONLY);
-                    if (f >= 0) {
-                       if ((int)safe_read(f, index, buf.st_size) != buf.st_size) {
-                          esyslog("ERROR: can't read from file '%s'", fileName);
-                          delete index;
-                          index = NULL;
-                          close(f);
-                          f = -1;
-                          }
-                       // we don't close f here, see CatchUp()!
-                       }
-                    else
-                       LOG_ERROR_STR(fileName);
-                    }
-                 else
-                    esyslog("ERROR: can't allocate %d bytes for index '%s'", size * sizeof(tIndex), fileName);
-                 }
-              }
-           else
-              LOG_ERROR;
-           }
-        else if (!Record)
-           isyslog("missing index file %s", fileName);
-        if (Record) {
-           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
-              if (delta) {
-                 esyslog("ERROR: padding index file with %d '0' bytes", delta);
-                 while (delta--)
-                       writechar(f, 0);
-                 }
-              }
-           else
-              LOG_ERROR_STR(fileName);
-           }
-        }
-     else
-        esyslog("ERROR: can't copy file name '%s'", FileName);
-     }
-}
-
-cIndexFile::~cIndexFile()
-{
-  if (f >= 0)
-     close(f);
-  delete fileName;
-  delete index;
-}
-
-bool cIndexFile::CatchUp(int Index)
-{
-  if (index && f >= 0) {
-     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
-         struct stat buf;
-         if (fstat(f, &buf) == 0) {
-            int newLast = buf.st_size / sizeof(tIndex) - 1;
-            if (newLast > last) {
-               if (size <= newLast) {
-                  size *= 2;
-                  if (size <= newLast)
-                     size = newLast + 1;
-                  }
-               index = (tIndex *)realloc(index, size * sizeof(tIndex));
-               if (index) {
-                  int offset = (last + 1) * sizeof(tIndex);
-                  int delta = (newLast - last) * sizeof(tIndex);
-                  if (lseek(f, offset, SEEK_SET) == offset) {
-                     if (safe_read(f, &index[last + 1], delta) != delta) {
-                        esyslog("ERROR: can't read from index");
-                        delete index;
-                        index = NULL;
-                        close(f);
-                        f = -1;
-                        break;
-                        }
-                     last = newLast;
-                     }
-                  else
-                     LOG_ERROR_STR(fileName);
-                  }
-               else
-                  esyslog("ERROR: can't realloc() index");
-               }
-            }
-         else
-            LOG_ERROR_STR(fileName);
-         if (Index >= last)
-            sleep(1);
-         else
-            return true;
-         }
-     }
-  return false;
-}
-
-bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
-{
-  if (f >= 0) {
-     tIndex i = { FileOffset, PictureType, FileNumber, 0 };
-     if (safe_write(f, &i, sizeof(i)) < 0) {
-        LOG_ERROR_STR(fileName);
-        close(f);
-        f = -1;
-        return false;
-        }
-     last++;
-     }
-  return f >= 0;
-}
-
-bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
-{
-  if (index) {
-     CatchUp(Index);
-     if (Index >= 0 && Index <= last) {
-        *FileNumber = index[Index].number;
-        *FileOffset = index[Index].offset;
-        if (PictureType)
-           *PictureType = index[Index].type;
-        if (Length) {
-           int fn = index[Index + 1].number;
-           int fo = index[Index + 1].offset;
-           if (fn == *FileNumber)
-              *Length = fo - *FileOffset;
-           else
-              *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
-           }
-        return true;
-        }
-     }
-  return false;
-}
-
-int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
-{
-  if (index) {
-     CatchUp();
-     int d = Forward ? 1 : -1;
-     for (;;) {
-         Index += d;
-         if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? 100 : 0)) {
-            if (index[Index].type == I_FRAME) {
-               if (FileNumber)
-                  *FileNumber = index[Index].number;
-               else
-                  FileNumber = &index[Index].number;
-               if (FileOffset)
-                  *FileOffset = index[Index].offset;
-               else
-                  FileOffset = &index[Index].offset;
-               if (Length) {
-                  // all recordings end with a non-I_FRAME, so the following should be safe:
-                  int fn = index[Index + 1].number;
-                  int fo = index[Index + 1].offset;
-                  if (fn == *FileNumber)
-                     *Length = fo - *FileOffset;
-                  else {
-                     esyslog("ERROR: 'I' frame at end of file #%d", *FileNumber);
-                     *Length = -1;
-                     }
-                  }
-               return Index;
-               }
-            }
-         else
-            break;
-         }
-     }
-  return -1;
-}
-
-int cIndexFile::Get(uchar FileNumber, int FileOffset)
-{
-  if (index) {
-     CatchUp();
-     //TODO implement binary search!
-     int i;
-     for (i = 0; i < last; i++) {
-         if (index[i].number > FileNumber || (index[i].number == FileNumber) && index[i].offset >= FileOffset)
-            break;
-         }
-     return i;
-     }
-  return -1;
-}
-
-// --- cFileName -------------------------------------------------------------
-
-class cFileName {
-private:
-  int file;
-  int fileNumber;
-  char *fileName, *pFileNumber;
-  bool record;
-  bool blocking;
-public:
-  cFileName(const char *FileName, bool Record, bool Blocking = false);
-  ~cFileName();
-  const char *Name(void) { return fileName; }
-  int Number(void) { return fileNumber; }
-  int Open(void);
-  void Close(void);
-  int SetOffset(int Number, int Offset = 0);
-  int NextFile(void);
-  };
-
-cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
-{
-  file = -1;
-  fileNumber = 0;
-  record = Record;
-  blocking = Blocking;
-  // Prepare the file name:
-  fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
-  if (!fileName) {
-     esyslog("ERROR: can't copy file name '%s'", fileName);
-     return;
-     }
-  strcpy(fileName, FileName);
-  pFileNumber = fileName + strlen(fileName);
-  SetOffset(1);
-}
-
-cFileName::~cFileName()
-{
-  Close();
-  delete fileName;
-}
-
-int cFileName::Open(void)
-{
-  if (file < 0) {
-     int BlockingFlag = blocking ? 0 : O_NONBLOCK;
-     if (record) {
-        dsyslog("recording to '%s'", fileName);
-        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | BlockingFlag);
-        if (file < 0)
-           LOG_ERROR_STR(fileName);
-        }
-     else {
-        if (access(fileName, R_OK) == 0) {
-           dsyslog("playing '%s'", fileName);
-           file = open(fileName, O_RDONLY | BlockingFlag);
-           if (file < 0)
-              LOG_ERROR_STR(fileName);
-           }
-        else if (errno != ENOENT)
-           LOG_ERROR_STR(fileName);
-        }
-     }
-  return file;
-}
-
-void cFileName::Close(void)
-{
-  if (file >= 0) {
-     if ((record && CloseVideoFile(file) < 0) || (!record && close(file) < 0))
-        LOG_ERROR_STR(fileName);
-     file = -1;
-     }
-}
-
-int cFileName::SetOffset(int Number, int Offset)
-{
-  if (fileNumber != Number)
-     Close();
-  if (0 < Number && Number <= MAXFILESPERRECORDING) {
-     fileNumber = Number;
-     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
-     if (record) {
-        if (access(fileName, F_OK) == 0) // file exists, let's try next suffix
-           return SetOffset(Number + 1);
-        else if (errno != ENOENT) { // something serious has happened
-           LOG_ERROR_STR(fileName);
-           return -1;
-           }
-        // found a non existing file suffix
-        }
-     if (Open() >= 0) {
-        if (!record && Offset >= 0 && lseek(file, Offset, SEEK_SET) != Offset) {
-           LOG_ERROR_STR(fileName);
-           return -1;
-           }
-        }
-     return file;
-     }
-  esyslog("ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
-  return -1;
-}
-
-int cFileName::NextFile(void)
-{
-  return SetOffset(fileNumber + 1);
-}
-
-// --- cRecordBuffer ---------------------------------------------------------
-
-class cRecordBuffer : public cRingBufferLinear {
-private:
-  cDvbApi *dvbApi;
-  cFileName fileName;
-  cIndexFile *index;
-  cRemux remux;
-  uchar pictureType;
-  int fileSize;
-  int videoDev;
-  int recordFile;
-  bool recording;
-  time_t lastDiskSpaceCheck;
-  bool RunningLowOnDiskSpace(void);
-  bool NextFile(void);
-protected:
-  virtual void Input(void);
-  virtual void Output(void);
-public:
-  cRecordBuffer(cDvbApi *DvbApi, const char *FileName, int VPid, int APid1, int APid2, int DPid1, int DPid2);
-  virtual ~cRecordBuffer();
-  };
-
-cRecordBuffer::cRecordBuffer(cDvbApi *DvbApi, const char *FileName, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cRingBufferLinear(VIDEOBUFSIZE, true)
-,fileName(FileName, true)
-,remux(VPid, APid1, APid2, DPid1, DPid2, true)
-{
-  dvbApi = DvbApi;
-  index = NULL;
-  pictureType = NO_PICTURE;
-  fileSize = 0;
-  recordFile = fileName.Open();
-  recording = false;
-  lastDiskSpaceCheck = time(NULL);
-  if (!fileName.Name())
-     return;
-  // Create the index file:
-  index = new cIndexFile(FileName, true);
-  if (!index)
-     esyslog("ERROR: can't allocate index");
-     // let's continue without index, so we'll at least have the recording
-  videoDev = dvbApi->SetModeRecord();
-  Start();
-}
-
-cRecordBuffer::~cRecordBuffer()
-{
-  Stop();
-  dvbApi->SetModeNormal(true);
-  delete index;
-}
-
-bool cRecordBuffer::RunningLowOnDiskSpace(void)
-{
-  if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
-     int Free = FreeDiskSpaceMB(fileName.Name());
-     lastDiskSpaceCheck = time(NULL);
-     if (Free < MINFREEDISKSPACE) {
-        dsyslog("low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
-        return true;
-        }
-     }
-  return false;
-}
-
-bool cRecordBuffer::NextFile(void)
-{
-  if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
-     if (fileSize > MEGABYTE(Setup.MaxVideoFileSize) || RunningLowOnDiskSpace()) {
-        recordFile = fileName.NextFile();
-        fileSize = 0;
-        }
-     }
-  return recordFile >= 0;
-}
-
-void cRecordBuffer::Input(void)
-{
-  dsyslog("input thread started (pid=%d)", getpid());
-
-  uchar b[MINVIDEODATA];
-  time_t t = time(NULL);
-  recording = true;
-  for (;;) {
-      if (cFile::FileReady(videoDev, 100)) {
-         int r = read(videoDev, b, sizeof(b));
-         if (r > 0) {
-            uchar *p = b;
-            while (r > 0) {
-                  int w = Put(p, r);
-                  p += w;
-                  r -= w;
-                  if (r > 0)
-                     usleep(1); // this keeps the CPU load low
-                  }
-            t = time(NULL);
-            }
-         else if (r < 0) {
-            if (FATALERRNO) {
-               if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-                  esyslog("ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
-               else {
-                  LOG_ERROR;
-                  break;
-                  }
-               }
-            }
-         }
-      if (time(NULL) - t > MAXBROKENTIMEOUT) {
-         esyslog("ERROR: video data stream broken");
-         cThread::EmergencyExit(true);
-         t = time(NULL);
-         }
-      if (!recording)
-         break;
-      }
-
-  dsyslog("input thread ended (pid=%d)", getpid());
-}
-
-void cRecordBuffer::Output(void)
-{
-  dsyslog("output thread started (pid=%d)", getpid());
-
-  uchar b[MINVIDEODATA];
-  int r = 0;
-  for (;;) {
-      int g = Get(b + r, sizeof(b) - r);
-      if (g > 0)
-         r += g;
-      if (r > 0) {
-         int Count = r, Result;
-         const uchar *p = remux.Process(b, Count, Result, &pictureType);
-         if (p) {
-            if (!Busy() && pictureType == I_FRAME) // finish the recording before the next 'I' frame
-               break;
-            if (NextFile()) {
-               if (index && pictureType != NO_PICTURE)
-                  index->Write(pictureType, fileName.Number(), fileSize);
-               if (safe_write(recordFile, p, Result) < 0) {
-                  LOG_ERROR_STR(fileName.Name());
-                  recording = false;
-                  return;
-                  }
-               fileSize += Result;
-               }
-            else
-               break;
-            }
-         if (Count > 0) {
-            r -= Count;
-            memmove(b, b + Count, r);
-            }
-         if (!recording)
-            break;
-         }
-      else
-         usleep(1); // this keeps the CPU load low
-      }
-  recording = false;
-
-  dsyslog("output thread ended (pid=%d)", getpid());
-}
-
-// --- ReadFrame -------------------------------------------------------------
-
-int ReadFrame(int f, uchar *b, int Length, int Max)
-{
-  if (Length == -1)
-     Length = Max; // this means we read up to EOF (see cIndex)
-  else if (Length > Max) {
-     esyslog("ERROR: frame larger than buffer (%d > %d)", Length, Max);
-     Length = Max;
-     }
-  int r = safe_read(f, b, Length);
-  if (r < 0)
-     LOG_ERROR;
-  return r;
-}
-
-// --- cBackTrace ----------------------------------------------------------
-
-#define AVG_FRAME_SIZE 15000         // an assumption about the average frame size
-#define DVB_BUF_SIZE   (256 * 1024)  // an assumption about the dvb firmware buffer size
-#define BACKTRACE_ENTRIES (DVB_BUF_SIZE / AVG_FRAME_SIZE + 20) // how many entries are needed to backtrace buffer contents
-
-class cBackTrace {
-private:
-  int index[BACKTRACE_ENTRIES];
-  int length[BACKTRACE_ENTRIES];
-  int pos, num;
-public:
-  cBackTrace(void);
-  void Clear(void);
-  void Add(int Index, int Length);
-  int Get(bool Forward);
-  };
-
-cBackTrace::cBackTrace(void)
-{
-  Clear();
-}
-
-void cBackTrace::Clear(void)
-{
-  pos = num = 0;
-}
-
-void cBackTrace::Add(int Index, int Length)
-{
-  index[pos] = Index;
-  length[pos] = Length;
-  if (++pos >= BACKTRACE_ENTRIES)
-     pos = 0;
-  if (num < BACKTRACE_ENTRIES)
-     num++;
-}
-
-int cBackTrace::Get(bool Forward)
-{
-  int p = pos;
-  int n = num;
-  int l = DVB_BUF_SIZE + (Forward ? 0 : 256 * 1024); //XXX (256 * 1024) == DVB_BUF_SIZE ???
-  int i = -1;
-
-  while (n && l > 0) {
-        if (--p < 0)
-           p = BACKTRACE_ENTRIES - 1;
-        i = index[p] - 1;
-        l -= length[p];
-        n--; 
-        }
-  return i;
-}
-
-// --- cPlayBuffer ---------------------------------------------------------
-
-#define MAX_VIDEO_SLOWMOTION 63 // max. arg to pass to VIDEO_SLOWMOTION // TODO is this value correct?
-
-class cPlayBuffer : public cRingBufferFrame {
-private:
-  cBackTrace backTrace;
-protected:
-  enum ePlayModes { pmPlay, pmPause, pmSlow, pmFast, pmStill };
-  enum ePlayDirs { pdForward, pdBackward };
-  static int Speeds[];
-  cDvbApi *dvbApi;
-  int videoDev, audioDev;
-  cPipe dolbyDev;
-  int blockInput, blockOutput;
-  ePlayModes playMode;
-  ePlayDirs playDir;
-  int trickSpeed;
-  int readIndex, writeIndex;
-  bool canDoTrickMode;
-  bool canToggleAudioTrack;
-  bool skipAC3bytes;
-  uchar audioTrack;
-  void TrickSpeed(int Increment);
-  virtual void Empty(bool Block = false);
-  virtual void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00) {}
-  virtual void PlayExternalDolby(const uchar *b, int MaxLength);
-  virtual void Output(void);
-  void putFrame(cFrame *Frame);
-  void putFrame(unsigned char *Data, int Length, eFrameType Type = ftUnknown);
-public:
-  cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev);
-  virtual ~cPlayBuffer();
-  virtual void Pause(void);
-  virtual void Play(void);
-  virtual void Forward(void);
-  virtual void Backward(void);
-  virtual int SkipFrames(int Frames) { return -1; }
-  virtual void SkipSeconds(int Seconds) {}
-  virtual void Goto(int Position, bool Still = false) {}
-  virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { Current = Total = -1; }
-  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
-  bool CanToggleAudioTrack(void) { return canToggleAudioTrack; };
-  virtual void ToggleAudioTrack(void);
-  };
-
-#define NORMAL_SPEED  4 // the index of the '1' entry in the following array
-#define MAX_SPEEDS    3 // the offset of the maximum speed from normal speed in either direction
-#define SPEED_MULT   12 // the speed multiplier
-int cPlayBuffer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
-
-cPlayBuffer::cPlayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev)
-:cRingBufferFrame(VIDEOBUFSIZE)
-{
-  dvbApi = DvbApi;
-  videoDev = VideoDev;
-  audioDev = AudioDev;
-  blockInput = blockOutput = false;
-  playMode = pmPlay;
-  playDir = pdForward;
-  trickSpeed = NORMAL_SPEED;
-  readIndex = writeIndex = -1;
-  canDoTrickMode = false;
-  canToggleAudioTrack = false;
-  skipAC3bytes = false;
-  audioTrack = 0xC0;
-}
-
-cPlayBuffer::~cPlayBuffer()
-{
-}
-
-void cPlayBuffer::PlayExternalDolby(const uchar *b, int MaxLength)
-{
-  if (cDvbApi::AudioCommand()) {
-     if (!dolbyDev && !dolbyDev.Open(cDvbApi::AudioCommand(), "w")) {
-        esyslog("ERROR: can't open pipe to audio command '%s'", cDvbApi::AudioCommand());
-        return;
-        }
-     if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01) {
-        if (b[3] == 0xBD) { // dolby
-           int l = b[4] * 256 + b[5] + 6;
-           int written = b[8] + (skipAC3bytes ? 13 : 9); // skips the PES header
-           int n = min(l - written, MaxLength);
-           while (n > 0) {
-                 int w = fwrite(&b[written], 1, n, dolbyDev);
-                 if (w < 0) {
-                    LOG_ERROR;
-                    break;
-                    }
-                 n -= w;
-                 written += w;
-                 }
-           }
-        }
-     }
-}
-
-void cPlayBuffer::Output(void)
-{
-  dsyslog("output thread started (pid=%d)", getpid());
-
-  while (Busy()) {
-        if (blockOutput) {
-           if (blockOutput > 1)
-              blockOutput = 1;
-           continue;
-           }
-        const cFrame *frame = Get();
-        if (frame) {
-           if (frame->Type() == ftDolby)
-              PlayExternalDolby(frame->Data(), frame->Count());
-           else {
-              StripAudioPackets((uchar *)frame->Data(), frame->Count(), (playMode == pmFast || playMode == pmSlow) ? 0x00 : audioTrack);//XXX
-              const uchar *p = frame->Data();
-              int r = frame->Count();
-              while (r > 0 && Busy() && !blockOutput) {
-                    if (cFile::FileReadyForWriting(videoDev, 100)) {
-                       int w = write(videoDev, p, r);
-                       if (w > 0) {
-                          p += w;
-                          r -= w;
-                          }
-                       else if (w < 0 && FATALERRNO) {
-                          LOG_ERROR;
-                          Stop();
-                          return;
-                          }
-                       }
-                    }
-              writeIndex = frame->Index();
-              backTrace.Add(frame->Index(), frame->Count());
-              }
-           Drop(frame);
-           }
-        }
-
-  dsyslog("output thread ended (pid=%d)", getpid());
-}
-
-void cPlayBuffer::putFrame(cFrame *Frame)
-{
-  while (Busy() && !blockInput) {
-        if (Put(Frame))
-           return;
-        }
-  delete Frame; // caller relies on frame being put, otherwise this would be a memory leak!
-}
-
-void cPlayBuffer::putFrame(unsigned char *Data, int Length, eFrameType Type)
-{
-  putFrame(new cFrame(Data, Length, Type));
-}
-
-void cPlayBuffer::TrickSpeed(int Increment)
-{
-  int nts = trickSpeed + Increment;
-  if (Speeds[nts] == 1) {
-     trickSpeed = nts;
-     if (playMode == pmFast)
-        Play();
-     else
-        Pause();
-     }
-  else if (Speeds[nts]) {
-     trickSpeed = nts;
-     int Mult = (playMode == pmSlow && playDir == pdForward) ? 1 : SPEED_MULT;
-     int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
-     if (sp > MAX_VIDEO_SLOWMOTION)
-        sp = MAX_VIDEO_SLOWMOTION;
-     CHECK(ioctl(videoDev, VIDEO_SLOWMOTION, sp));
-     }
-}
-
-void cPlayBuffer::Empty(bool Block)
-{
-  if (!(blockInput || blockOutput)) {
-     blockInput = blockOutput = 2;
-     EnablePut();
-     EnableGet();
-     time_t t0 = time(NULL);
-     while ((blockInput > 1 || blockOutput > 1) && time(NULL) - t0 < 2)
-           usleep(1);
-     Lock();
-     if ((readIndex = backTrace.Get(playDir == pdForward)) < 0)
-        readIndex = writeIndex;
-     cRingBufferFrame::Clear();
-     CHECK(ioctl(videoDev, VIDEO_CLEAR_BUFFER));
-     CHECK(ioctl(audioDev, AUDIO_CLEAR_BUFFER));
-     }
-  if (!Block) {
-     blockInput = blockOutput = 0;
-     backTrace.Clear();
-     Unlock();
-     }
-}
-
-void cPlayBuffer::Pause(void)
-{
-  if (playMode == pmPause || playMode == pmStill)
-     Play();
-  else {
-     bool empty = (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
-     if (empty)
-        Empty(true);
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
-     CHECK(ioctl(videoDev, VIDEO_FREEZE));
-     playMode = pmPause;
-     if (empty)
-        Empty(false);
-     }
-}
-
-void cPlayBuffer::Play(void)
-{
-  if (playMode != pmPlay) {
-     bool empty = (playMode == pmStill || playMode == pmFast || (playMode == pmSlow && playDir == pdBackward));
-     if (empty)
-        Empty(true);
-     CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(videoDev, VIDEO_CONTINUE));
-     playMode = pmPlay;
-     playDir = pdForward;
-     if (empty)
-        Empty(false);
-    }
-}
-
-void cPlayBuffer::Forward(void)
-{
-  if (canDoTrickMode) {
-     switch (playMode) {
-       case pmFast:
-            if (Setup.MultiSpeedMode) {
-               TrickSpeed(playDir == pdForward ? 1 : -1);
-               break;
-               }
-            else if (playDir == pdForward) {
-               Play();
-               break;
-               }
-            // run into pmPlay
-       case pmPlay:
-            Empty(true);
-            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
-            playMode = pmFast;
-            playDir = pdForward;
-            trickSpeed = NORMAL_SPEED;
-            TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
-            Empty(false);
-            break;
-       case pmSlow:
-            if (Setup.MultiSpeedMode) {
-               TrickSpeed(playDir == pdForward ? -1 : 1);
-               break;
-               }
-            else if (playDir == pdForward) {
-               Pause();
-               break;
-               }
-            // run into pmPause
-       case pmStill:
-       case pmPause:
-            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
-            playMode = pmSlow;
-            playDir = pdForward;
-            trickSpeed = NORMAL_SPEED;
-            TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
-            break;
-       }
-     }
-}
-
-void cPlayBuffer::Backward(void)
-{
-  if (canDoTrickMode) {
-     switch (playMode) {
-       case pmFast:
-            if (Setup.MultiSpeedMode) {
-               TrickSpeed(playDir == pdBackward ? 1 : -1);
-               break;
-               }
-            else if (playDir == pdBackward) {
-               Play();
-               break;
-               }
-            // run into pmPlay
-       case pmPlay:
-            Empty(true);
-            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
-            playMode = pmFast;
-            playDir = pdBackward;
-            trickSpeed = NORMAL_SPEED;
-            TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
-            Empty(false);
-            break;
-       case pmSlow:
-            if (Setup.MultiSpeedMode) {
-               TrickSpeed(playDir == pdBackward ? -1 : 1);
-               break;
-               }
-            else if (playDir == pdBackward) {
-               Pause();
-               break;
-               }
-            // run into pmPause
-       case pmStill:
-       case pmPause:
-            Empty(true);
-            CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
-            playMode = pmSlow;
-            playDir = pdBackward;
-            trickSpeed = NORMAL_SPEED;
-            TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
-            Empty(false);
-            break;
-       }
-     }
-}
-
-bool cPlayBuffer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
-{
-  Play = (playMode == pmPlay || playMode == pmFast);
-  Forward = (playDir == pdForward);
-  if (playMode == pmFast || playMode == pmSlow)
-     Speed = Setup.MultiSpeedMode ? abs(trickSpeed - NORMAL_SPEED) : 0;
-  else
-     Speed = -1;
-  return true;
-}
-
-void cPlayBuffer::ToggleAudioTrack(void)
-{
-  if (CanToggleAudioTrack()) {
-     audioTrack = (audioTrack == 0xC0) ? 0xC1 : 0xC0;
-     Empty();
-     }
-}
-
-// --- cReplayBuffer ---------------------------------------------------------
-
-class cReplayBuffer : public cPlayBuffer {
-private:
-  cIndexFile *index;
-  cFileName fileName;
-  int replayFile;
-  bool eof;
-  bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
-  void Close(void);
-  virtual void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
-  void DisplayFrame(uchar *b, int Length);
-  int Resume(void);
-  bool Save(void);
-protected:
-  virtual void Input(void);
-public:
-  cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const char *FileName);
-  virtual ~cReplayBuffer();
-  virtual int SkipFrames(int Frames);
-  virtual void SkipSeconds(int Seconds);
-  virtual void Goto(int Position, bool Still = false);
-  virtual void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
-  };
-
-cReplayBuffer::cReplayBuffer(cDvbApi *DvbApi, int VideoDev, int AudioDev, const char *FileName)
-:cPlayBuffer(DvbApi, VideoDev, AudioDev)
-,fileName(FileName, false)
-{
-  index = NULL;
-  replayFile = fileName.Open();
-  eof = false;
-  if (!fileName.Name())
-     return;
-  // Create the index file:
-  index = new cIndexFile(FileName, false);
-  if (!index)
-     esyslog("ERROR: can't allocate index");
-  else if (!index->Ok()) {
-     delete index;
-     index = NULL;
-     }
-  canDoTrickMode = index != NULL;
-  dvbApi->SetModeReplay();
-  Start();
-}
-
-cReplayBuffer::~cReplayBuffer()
-{
-  Stop();
-  Save();
-  Close();
-  dvbApi->SetModeNormal(false);
-  delete index;
-}
-
-void cReplayBuffer::Input(void)
-{
-  dsyslog("input thread started (pid=%d)", getpid());
-
-  readIndex = Resume();
-  if (readIndex >= 0)
-     isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
-
-  uchar b[MAXFRAMESIZE];
-  while (Busy() && (blockInput || NextFile())) {
-        if (blockInput) {
-           if (blockInput > 1)
-              blockInput = 1;
-           continue;
-           }
-        if (playMode != pmStill) {
-           int r = 0;
-           if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
-              uchar FileNumber;
-              int FileOffset, Length;
-              int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
-              if (Index >= 0) {
-                 if (!NextFile(FileNumber, FileOffset))
-                    break;
-                 }
-              else {
-                 // can't call Play() here, because those functions may only be
-                 // called from the foreground thread - and we also don't need
-                 // to empty the buffer here
-                 CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, true));
-                 CHECK(ioctl(videoDev, VIDEO_CONTINUE));
-                 playMode = pmPlay;
-                 playDir = pdForward;
-                 continue;
-                 }
-              readIndex = Index;
-              r = ReadFrame(replayFile, b, Length, sizeof(b));
-              // must call StripAudioPackets() here because the buffer is not emptied
-              // when falling back from "fast forward" to "play" (see above)
-              StripAudioPackets(b, r);
-              }
-           else if (index) {
-              uchar FileNumber;
-              int FileOffset, Length;
-              readIndex++;
-              if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
-                 break;
-              r = ReadFrame(replayFile, b, Length, sizeof(b));
-              }
-           else // allows replay even if the index file is missing
-              r = read(replayFile, b, sizeof(b));
-           if (r > 0)
-              putFrame(new cFrame(b, r, ftUnknown, readIndex));
-           else if (r == 0)
-              eof = true;
-           else if (r < 0 && FATALERRNO) {
-              LOG_ERROR;
-              break;
-              }
-           }
-        else//XXX
-           usleep(1); // this keeps the CPU load low
-        }
-
-  dsyslog("input thread ended (pid=%d)", getpid());
-}
-
-void cReplayBuffer::StripAudioPackets(uchar *b, int Length, uchar Except)
-{
-  if (canDoTrickMode) {
-     for (int i = 0; i < Length - 6; i++) {
-         if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
-            uchar c = b[i + 3];
-            int l = b[i + 4] * 256 + b[i + 5] + 6;
-            switch (c) {
-              case 0xBD: // dolby
-                   if (Except)
-                      PlayExternalDolby(&b[i], Length - i);
-                   // continue with deleting the data - otherwise it disturbs DVB replay
-              case 0xC0 ... 0xC1: // audio
-                   if (c == 0xC1)
-                      canToggleAudioTrack = true;
-                   if (!Except || c != Except) {
-                      int n = l;
-                      for (int j = i; j < Length && n--; j++)
-                          b[j] = 0x00;
-                      }
-                   break;
-              case 0xE0 ... 0xEF: // video
-                   break;
-              default:
-                   //esyslog("ERROR: unexpected packet id %02X", c);
-                   l = 0;
-              }
-            if (l)
-               i += l - 1; // the loop increments, too!
-            }
-         /*XXX
-         else
-            esyslog("ERROR: broken packet header");
-            XXX*/
-         }
-     }
-}
-
-void cReplayBuffer::DisplayFrame(uchar *b, int Length)
-{
-  StripAudioPackets(b, Length);
-  CHECK(ioctl(audioDev, AUDIO_SET_AV_SYNC, false));
-  CHECK(ioctl(audioDev, AUDIO_SET_MUTE, true));
-/* Using the VIDEO_STILLPICTURE ioctl call would be the
-   correct way to display a still frame, but unfortunately this
-   doesn't work with frames from VDR. So let's do pretty much the
-   same here as in DVB/driver/dvb.c's play_iframe() - I have absolutely
-   no idea why it works this way, but doesn't work with VIDEO_STILLPICTURE.
-   If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
-   could be used, please let me know!
-   kls 2002-03-23
-*/
-//#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-#ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-  videoDisplayStillPicture sp = { (char *)b, Length };
-  CHECK(ioctl(videoDev, VIDEO_STILLPICTURE, &sp));
-#else
-#define MIN_IFRAME 400000
-  for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
-      safe_write(videoDev, b, Length);
-      usleep(1); // allows the buffer to be displayed in case the progress display is active
-      }
-#endif
-}
-
-void cReplayBuffer::Close(void)
-{
-  if (replayFile >= 0) {
-     fileName.Close();
-     replayFile = -1;
-     }
-}
-
-int cReplayBuffer::Resume(void)
-{
-  if (index) {
-     int Index = index->GetResume();
-     if (Index >= 0) {
-        uchar FileNumber;
-        int FileOffset;
-        if (index->Get(Index, &FileNumber, &FileOffset) && NextFile(FileNumber, FileOffset))
-           return Index;
-        }
-     }
-  return -1;
-}
-
-bool cReplayBuffer::Save(void)
-{
-  if (index) {
-     int Index = writeIndex;
-     if (Index >= 0) {
-        Index -= RESUMEBACKUP;
-        if (Index > 0)
-           Index = index->GetNextIFrame(Index, false);
-        else
-           Index = 0;
-        if (Index >= 0)
-           return index->StoreResume(Index);
-        }
-     }
-  return false;
-}
-
-int cReplayBuffer::SkipFrames(int Frames)
-{
-  if (index && Frames) {
-     int Current, Total;
-     GetIndex(Current, Total, true);
-     int OldCurrent = Current;
-     Current = index->GetNextIFrame(Current + Frames, Frames > 0);
-     return Current >= 0 ? Current : OldCurrent;
-     }
-  return -1;
-}
-
-void cReplayBuffer::SkipSeconds(int Seconds)
-{
-  if (index && Seconds) {
-     Empty(true);
-     int Index = writeIndex;
-     if (Index >= 0) {
-        Index = max(Index + Seconds * FRAMESPERSEC, 0);
-        if (Index > 0)
-           Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
-        if (Index >= 0)
-           readIndex = writeIndex = Index - 1; // Input() will first increment it!
-        }
-     Empty(false);
-     Play();
-     }
-}
-
-void cReplayBuffer::Goto(int Index, bool Still)
-{
-  if (index) {
-     Empty(true);
-     if (++Index <= 0)
-        Index = 1; // not '0', to allow GetNextIFrame() below to work!
-     uchar FileNumber;
-     int FileOffset, Length;
-     Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
-     if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
-        uchar b[MAXFRAMESIZE];
-        int r = ReadFrame(replayFile, b, Length, sizeof(b));
-        if (r > 0) {
-           if (playMode == pmPause)
-              CHECK(ioctl(videoDev, VIDEO_CONTINUE));
-           DisplayFrame(b, r);
-           }
-        playMode = pmStill;
-        }
-     readIndex = writeIndex = Index;
-     Empty(false);
-     }
-}
-
-void cReplayBuffer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
-{
-  if (index) {
-     if (playMode == pmStill)
-        Current = max(readIndex, 0);
-     else {
-        Current = max(writeIndex, 0);
-        if (SnapToIFrame) {
-           int i1 = index->GetNextIFrame(Current + 1, false);
-           int i2 = index->GetNextIFrame(Current, true);
-           Current = (abs(Current - i1) <= abs(Current - i2)) ? i1 : i2;
-           }
-        }
-     Total = index->Last();
-     }
-  else
-     Current = Total = -1;
-}
-
-bool cReplayBuffer::NextFile(uchar FileNumber, int FileOffset)
-{
-  if (FileNumber > 0)
-     replayFile = fileName.SetOffset(FileNumber, FileOffset);
-  else if (replayFile >= 0 && eof) {
-     Close();
-     replayFile = fileName.NextFile();
-     }
-  eof = false;
-  return replayFile >= 0;
-}
-
-// --- cTransferBuffer -------------------------------------------------------
-
-class cTransferBuffer : public cRingBufferLinear {
-private:
-  cDvbApi *dvbApi;
-  int fromDevice, toDevice;
-  bool gotBufferReserve;
-  cRemux remux;
-protected:
-  virtual void Input(void);
-  virtual void Output(void);
-public:
-  cTransferBuffer(cDvbApi *DvbApi, int ToDevice, int VPid, int APid);
-  virtual ~cTransferBuffer();
-  void SetAudioPid(int APid);
-  };
-
-cTransferBuffer::cTransferBuffer(cDvbApi *DvbApi, int ToDevice, int VPid, int APid)
-:cRingBufferLinear(VIDEOBUFSIZE, true)
-,remux(VPid, APid, 0, 0, 0)
-{
-  dvbApi = DvbApi;
-  fromDevice = dvbApi->SetModeRecord();
-  toDevice = ToDevice;
-  gotBufferReserve = false;
-  Start();
-}
-
-cTransferBuffer::~cTransferBuffer()
-{
-  Stop();
-  dvbApi->SetModeNormal(true);
-}
-
-void cTransferBuffer::SetAudioPid(int APid)
-{
-  Clear();
-  //XXX we may need to have access to the audio device, too, in order to clear it
-  CHECK(ioctl(toDevice, VIDEO_CLEAR_BUFFER));
-  gotBufferReserve = false;
-  remux.SetAudioPid(APid);
-}
-
-void cTransferBuffer::Input(void)
-{
-  dsyslog("input thread started (pid=%d)", getpid());
-
-  uchar b[MINVIDEODATA];
-  int n = 0;
-  while (Busy()) {
-        if (cFile::FileReady(fromDevice, 100)) {
-           int r = read(fromDevice, b + n, sizeof(b) - n);
-           if (r > 0) {
-              n += r;
-              int Count = n, Result;
-              const uchar *p = remux.Process(b, Count, Result);
-              if (p) {
-                 while (Result > 0 && Busy()) {
-                       int w = Put(p, Result);
-                       p += w;
-                       Result -= w;
-                       }
-                 }
-              if (Count > 0) {
-                 n -= Count;
-                 memmove(b, b + Count, n);
-                 }
-              }
-           else if (r < 0) {
-              if (FATALERRNO) {
-                 if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-                    esyslog("ERROR (%s,%d): DVB driver buffer overflow", __FILE__, __LINE__);
-                 else {
-                    LOG_ERROR;
-                    break;
-                    }
-                 }
-              }
-           }
-        }
-
-  dsyslog("input thread ended (pid=%d)", getpid());
-}
-
-void cTransferBuffer::Output(void)
-{
-  dsyslog("output thread started (pid=%d)", getpid());
-
-  uchar b[MINVIDEODATA];
-  while (Busy()) {
-        if (!gotBufferReserve) {
-           if (Available() < MAXFRAMESIZE) {
-              usleep(100000); // allow the buffer to collect some reserve
-              continue;
-              }
-           else
-              gotBufferReserve = true;
-           }
-        int r = Get(b, sizeof(b));
-        if (r > 0) {
-           uchar *p = b;
-           while (r > 0 && Busy() && cFile::FileReadyForWriting(toDevice, 100)) {
-                 int w = write(toDevice, p, r);
-                 if (w > 0) {
-                    p += w;
-                    r -= w;
-                    }
-                 else if (w < 0 && FATALERRNO) {
-                    LOG_ERROR;
-                    Stop();
-                    return;
-                    }
-                 }
-           }
-        else
-           usleep(1); // this keeps the CPU load low
-        }
-
-  dsyslog("output thread ended (pid=%d)", getpid());
-}
-
-// --- cCuttingBuffer --------------------------------------------------------
-
-class cCuttingBuffer : public cThread {
-private:
-  const char *error;
-  bool active;
-  int fromFile, toFile;
-  cFileName *fromFileName, *toFileName;
-  cIndexFile *fromIndex, *toIndex;
-  cMarks fromMarks, toMarks;
-protected:
-  virtual void Action(void);
-public:
-  cCuttingBuffer(const char *FromFileName, const char *ToFileName);
-  virtual ~cCuttingBuffer();
-  const char *Error(void) { return error; }
-  };
-
-cCuttingBuffer::cCuttingBuffer(const char *FromFileName, const char *ToFileName)
-{
-  error = NULL;
-  active = false;
-  fromFile = toFile = -1;
-  fromFileName = toFileName = NULL;
-  fromIndex = toIndex = NULL;
-  if (fromMarks.Load(FromFileName) && fromMarks.Count()) {
-     fromFileName = new cFileName(FromFileName, false, true);
-     toFileName = new cFileName(ToFileName, true, true);
-     fromIndex = new cIndexFile(FromFileName, false);
-     toIndex = new cIndexFile(ToFileName, true);
-     toMarks.Load(ToFileName); // doesn't actually load marks, just sets the file name
-     Start();
-     }
-  else
-     esyslog("no editing marks found for %s", FromFileName);
-}
-
-cCuttingBuffer::~cCuttingBuffer()
-{
-  active = false;
-  Cancel(3);
-  delete fromFileName;
-  delete toFileName;
-  delete fromIndex;
-  delete toIndex;
-}
-
-void cCuttingBuffer::Action(void)
-{
-  dsyslog("video cutting thread started (pid=%d)", getpid());
-
-  cMark *Mark = fromMarks.First();
-  if (Mark) {
-     fromFile = fromFileName->Open();
-     toFile = toFileName->Open();
-     active = fromFile >= 0 && toFile >= 0;
-     int Index = Mark->position;
-     Mark = fromMarks.Next(Mark);
-     int FileSize = 0;
-     int CurrentFileNumber = 0;
-     int LastIFrame = 0;
-     toMarks.Add(0);
-     toMarks.Save();
-     uchar buffer[MAXFRAMESIZE];
-     while (active) {
-           uchar FileNumber;
-           int FileOffset, Length;
-           uchar PictureType;
-
-           // Make sure there is enough disk space:
-
-           AssertFreeDiskSpace();
-
-           // Read one frame:
-
-           if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
-              if (FileNumber != CurrentFileNumber) {
-                 fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
-                 CurrentFileNumber = FileNumber;
-                 }
-              if (fromFile >= 0) {
-                 Length = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
-                 if (Length < 0) {
-                    error = "ReadFrame";
-                    break;
-                    }
-                 }
-              else {
-                 error = "fromFile";
-                 break;
-                 }
-              }
-           else
-              break;
-
-           // Write one frame:
-
-           if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
-              if (!Mark) // edited version shall end before next I-frame
-                 break;
-              if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
-                 toFile = toFileName->NextFile();
-                 if (toFile < 0) {
-                    error = "toFile 1";
-                    break;
-                    }
-                 FileSize = 0;
-                 }
-              LastIFrame = 0;
-              }
-           if (safe_write(toFile, buffer, Length) < 0) {
-              error = "safe_write";
-              break;
-              }
-           if (!toIndex->Write(PictureType, toFileName->Number(), FileSize)) {
-              error = "toIndex";
-              break;
-              }
-           FileSize += Length;
-           if (!LastIFrame)
-              LastIFrame = toIndex->Last();
-
-           // Check editing marks:
-
-           if (Mark && Index >= Mark->position) {
-              Mark = fromMarks.Next(Mark);
-              toMarks.Add(LastIFrame);
-              if (Mark)
-                 toMarks.Add(toIndex->Last() + 1);
-              toMarks.Save();
-              if (Mark) {
-                 Index = Mark->position;
-                 Mark = fromMarks.Next(Mark);
-                 CurrentFileNumber = 0; // triggers SetOffset before reading next frame
-                 if (Setup.SplitEditedFiles) {
-                    toFile = toFileName->NextFile();
-                    if (toFile < 0) {
-                       error = "toFile 2";
-                       break;
-                       }
-                    FileSize = 0;
-                    }
-                 }
-              // the 'else' case (i.e. 'final end mark reached') is handled above
-              // in 'Write one frame', so that the edited version will end right
-              // before the next I-frame.
-              }
-           }
-     }
-  else
-     esyslog("no editing marks found!");
-  dsyslog("end video cutting thread");
-}
-
-// --- cVideoCutter ----------------------------------------------------------
-
-char *cVideoCutter::editedVersionName = NULL;
-cCuttingBuffer *cVideoCutter::cuttingBuffer = NULL;
-bool cVideoCutter::error = false;
-bool cVideoCutter::ended = false;
-
-bool cVideoCutter::Start(const char *FileName)
-{
-  if (!cuttingBuffer) {
-     error = false;
-     ended = false;
-     cRecording Recording(FileName);
-     const char *evn = Recording.PrefixFileName('%');
-     if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
-        // XXX this can be removed once RenameVideoFile() follows symlinks (see videodir.c)
-        // remove a possible deleted recording with the same name to avoid symlink mixups:
-        char *s = strdup(evn);
-        char *e = strrchr(s, '.');
-        if (e) {
-           if (strcmp(e, ".rec") == 0) {
-              strcpy(e, ".del");
-              RemoveVideoFile(s);
-              }
-           }
-        delete s;
-        // XXX
-        editedVersionName = strdup(evn);
-        Recording.WriteSummary();
-        cuttingBuffer = new cCuttingBuffer(FileName, editedVersionName);
-        return true;
-        }
-     }
-  return false;
-}
-
-void cVideoCutter::Stop(void)
-{
-  bool Interrupted = cuttingBuffer && cuttingBuffer->Active();
-  const char *Error = cuttingBuffer ? cuttingBuffer->Error() : NULL;
-  delete cuttingBuffer;
-  cuttingBuffer = NULL;
-  if ((Interrupted || Error) && editedVersionName) {
-     if (Interrupted)
-        isyslog("editing process has been interrupted");
-     if (Error)
-        esyslog("ERROR: '%s' during editing process", Error);
-     RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed?
-     }
-}
-
-bool cVideoCutter::Active(void)
-{
-  if (cuttingBuffer) {
-     if (cuttingBuffer->Active())
-        return true;
-     error = cuttingBuffer->Error();
-     Stop();
-     if (!error)
-        cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
-     delete editedVersionName;
-     editedVersionName = NULL;
-     ended = true;
-     }
-  return false;
-}
-
-bool cVideoCutter::Error(void)
-{
-  bool result = error;
-  error = false;
-  return result;
-}
-
-bool cVideoCutter::Ended(void)
-{
-  bool result = ended;
-  ended = false;
-  return result;
-}
-
-// --- cDvbApi ---------------------------------------------------------------
-
-static const char *OstName(const char *Name, int n)
-{
-  static char buffer[_POSIX_PATH_MAX];
-  snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
-  return buffer;
-}
-
-static int OstOpen(const char *Name, int n, int Mode, bool ReportError = false)
-{
-  const char *FileName = OstName(Name, n);
-  int fd = open(FileName, Mode);
-  if (fd < 0 && ReportError)
-     LOG_ERROR_STR(FileName);
-  return fd;
-}
-
-int cDvbApi::NumDvbApis = 0;
-int cDvbApi::useDvbApi = 0;
-cDvbApi *cDvbApi::dvbApi[MAXDVBAPI] = { NULL };
-cDvbApi *cDvbApi::PrimaryDvbApi = NULL;
-char *cDvbApi::audioCommand = NULL;
-
-cDvbApi::cDvbApi(int n)
-{
-  frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
-  vPid = aPid1 = aPid2 = dPid1 = dPid2 = 0;
-  siProcessor = NULL;
-  recordBuffer = NULL;
-  replayBuffer = NULL;
-  transferBuffer = NULL;
-  transferringFromDvbApi = NULL;
-  ca = -1;
-  priority = DEFAULTPRIORITY;
-  cardIndex = n;
-
-  // Devices that are only present on DVB-C or DVB-S cards:
-
-  fd_frontend = OstOpen(DEV_OST_FRONTEND, n, O_RDWR);
-  fd_sec      = OstOpen(DEV_OST_SEC,      n, O_RDWR);
-
-  // Devices that all DVB cards must have:
-
-  fd_demuxv  = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
-  fd_demuxa1 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
-  fd_demuxa2 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
-  fd_demuxd1 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
-  fd_demuxd2 = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
-  fd_demuxt  = OstOpen(DEV_OST_DEMUX,  n, O_RDWR | O_NONBLOCK, true);
-
-  // Devices not present on "budget" cards:
-
-  fd_osd     = OstOpen(DEV_OST_OSD,    n, O_RDWR);
-  fd_video   = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
-  fd_audio   = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
-
-  // Devices that will be dynamically opened and closed when necessary:
-
-  fd_dvr     = -1;
-
-  // Video format:
-
-  SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
-
-  // We only check the devices that must be present - the others will be checked before accessing them:
-
-  if (fd_frontend >= 0 && fd_demuxv >= 0 && fd_demuxa1 >= 0 && fd_demuxa2 >= 0 && fd_demuxd1 >= 0 && fd_demuxd2 >= 0 && fd_demuxt >= 0) {
-     siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
-     FrontendInfo feinfo;
-     CHECK(ioctl(fd_frontend, FE_GET_INFO, &feinfo));
-     frontendType = feinfo.type;
-     }
-  else
-     esyslog("ERROR: can't open video device %d", n);
-  cols = rows = 0;
-
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
-  initscr();
-  keypad(stdscr, true);
-  nonl();
-  cbreak();
-  noecho();
-  timeout(10);
-#endif
-#if defined(DEBUG_OSD)
-  memset(&colorPairs, 0, sizeof(colorPairs));
-  start_color();
-  leaveok(stdscr, true);
-  window = NULL;
-#else
-  osd = NULL;
-#endif
-  currentChannel = 1;
-  mute = false;
-  volume = Setup.CurrentVolume;
-}
-
-cDvbApi::~cDvbApi()
-{
-  delete siProcessor;
-  Close();
-  StopReplay();
-  StopRecord();
-  StopTransfer();
-  // We're not explicitly closing any device files here, since this sometimes
-  // caused segfaults. Besides, the program is about to terminate anyway...
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
-  endwin();
-#endif
-}
-
-void cDvbApi::SetUseDvbApi(int n)
-{
-  if (n < MAXDVBAPI)
-     useDvbApi |= (1 << n);
-}
-
-bool cDvbApi::SetPrimaryDvbApi(int n)
-{
-  n--;
-  if (0 <= n && n < NumDvbApis && dvbApi[n]) {
-     isyslog("setting primary DVB to %d", n + 1);
-     PrimaryDvbApi = dvbApi[n];
-     return true;
-     }
-  esyslog("invalid DVB interface: %d", n + 1);
-  return false;
-}
-
-int cDvbApi::CanShift(int Ca, int Priority, int UsedCards)
-{
-  // Test whether a recording on this DVB device can be shifted to another one
-  // in order to perform a new recording with the given Ca and Priority on this device:
-  int ShiftLevel = -1; // default means this device can't be shifted
-  if (UsedCards & (1 << CardIndex()) != 0)
-     return ShiftLevel; // otherwise we would get into a loop
-  if (Recording()) {
-     if (ProvidesCa(Ca) // this device provides the requested Ca
-        && (Ca != this->Ca() // the requested Ca is different from the one currently used...
-           || Priority > this->Priority())) { // ...or the request comes from a higher priority
-        cDvbApi *d = NULL;
-        int Provides[MAXDVBAPI];
-        UsedCards |= (1 << CardIndex());
-        for (int i = 0; i < NumDvbApis; i++) {
-            if ((Provides[i] = dvbApi[i]->ProvidesCa(this->Ca())) != 0) { // this device is basicly able to do the job
-               if (dvbApi[i] != this) { // it is not _this_ device
-                  int sl = dvbApi[i]->CanShift(this->Ca(), Priority, UsedCards); // this is the original Priority!
-                  if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
-                     d = dvbApi[i];
-                     ShiftLevel = sl;
-                     }
-                  }
-               }
-            }
-        if (ShiftLevel >= 0)
-           ShiftLevel++; // adds the device's own shift
-        }
-     }
-  else if (Priority > this->Priority())
-     ShiftLevel = 0; // no shifting necessary, this device can do the job
-  return ShiftLevel;
-}
-
-cDvbApi *cDvbApi::GetDvbApi(int Ca, int Priority)
-{
-  cDvbApi *d = NULL;
-  int Provides[MAXDVBAPI];
-  // Check which devices provide Ca:
-  for (int i = 0; i < NumDvbApis; i++) {
-      if ((Provides[i] = dvbApi[i]->ProvidesCa(Ca)) != 0) { // this device is basicly able to do the job
-         if (Priority > dvbApi[i]->Priority() // Priority is high enough to use this device
-            && (!d // we don't have a device yet, or...
-               || dvbApi[i]->Priority() < d->Priority() // ...this one has an even lower Priority
-               || (dvbApi[i]->Priority() == d->Priority() // ...same Priority...
-                  && Provides[i] < Provides[d->CardIndex()]))) // ...but this one provides fewer Ca values
-            d = dvbApi[i];
-         }
-      }
-  if (!d && Ca > MAXDVBAPI) {
-     // We didn't find one the easy way, so now we have to try harder:
-     int ShiftLevel = -1;
-     for (int i = 0; i < NumDvbApis; i++) {
-         if (Provides[i]) { // this device is basicly able to do the job, but for some reason we didn't get it above
-            int sl = dvbApi[i]->CanShift(Ca, Priority); // asks this device to shift its job to another device
-            if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
-               d = dvbApi[i]; // found one that can be shifted with the fewest number of subsequent shifts
-               ShiftLevel = sl;
-               }
-            }
-         }
-     }
-  return d;
-}
-
-void cDvbApi::SetCaCaps(void)
-{
-  for (int d = 0; d < NumDvbApis; d++) {
-      for (int i = 0; i < MAXCACAPS; i++)
-          dvbApi[d]->caCaps[i] = Setup.CaCaps[dvbApi[d]->CardIndex()][i];
-      }
-}
-
-int cDvbApi::ProvidesCa(int Ca)
-{
-  if (Ca == CardIndex() + 1)
-     return 1; // exactly _this_ card was requested
-  if (Ca && Ca <= MAXDVBAPI)
-     return 0; // a specific card was requested, but not _this_ one
-  int result = Ca ? 0 : 1; // by default every card can provide FTA
-  int others = Ca ? 1 : 0;
-  for (int i = 0; i < MAXCACAPS; i++) {
-      if (caCaps[i]) {
-         if (caCaps[i] == Ca)
-            result = 1;
-         else
-            others++;
-         }
-      }
-  return result ? result + others : 0;
-}
-
-bool cDvbApi::Probe(const char *FileName)
-{
-  if (access(FileName, F_OK) == 0) {
-     dsyslog("probing %s", FileName);
-     int f = open(FileName, O_RDONLY);
-     if (f >= 0) {
-        close(f);
-        return true;
-        }
-     else if (errno != ENODEV && errno != EINVAL)
-        LOG_ERROR_STR(FileName);
-     }
-  else if (errno != ENOENT)
-     LOG_ERROR_STR(FileName);
-  return false;
-}
-
-bool cDvbApi::Init(void)
-{
-  NumDvbApis = 0;
-  for (int i = 0; i < MAXDVBAPI; i++) {
-      if (useDvbApi == 0 || (useDvbApi & (1 << i)) != 0) {
-         if (Probe(OstName(DEV_OST_FRONTEND, i)))
-            dvbApi[NumDvbApis++] = new cDvbApi(i);
-         else
-            break;
-         }
-      }
-  PrimaryDvbApi = dvbApi[0];
-  if (NumDvbApis > 0)
-     isyslog("found %d video device%s", NumDvbApis, NumDvbApis > 1 ? "s" : "");
-  else
-     esyslog("ERROR: no video device found, giving up!");
-  SetCaCaps();
-  return NumDvbApis > 0;
-}
-
-void cDvbApi::Cleanup(void)
-{
-  for (int i = 0; i < NumDvbApis; i++) {
-      delete dvbApi[i];
-      dvbApi[i] = NULL;
-      }
-  PrimaryDvbApi = NULL;
-}
-
-bool cDvbApi::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
-{
-  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
-  if (videoDev >= 0) {
-     int result = 0;
-     struct video_mbuf mbuf;
-     result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
-     if (result == 0) {
-        int msize = mbuf.size;
-        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-        if (mem && mem != (unsigned char *)-1) {
-           // set up the size and RGB
-           struct video_capability vc;
-           result |= ioctl(videoDev, VIDIOCGCAP, &vc);
-           struct video_mmap vm;
-           vm.frame = 0;
-           if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
-               (SizeY > 0) && (SizeY <= vc.maxheight)) {
-              vm.width = SizeX;
-              vm.height = SizeY;
-              }
-           else {
-              vm.width = vc.maxwidth;
-              vm.height = vc.maxheight;
-              }
-           vm.format = VIDEO_PALETTE_RGB24;
-           result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
-           result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
-           // make RGB out of BGR:
-           int memsize = vm.width * vm.height;
-           unsigned char *mem1 = mem;
-           for (int i = 0; i < memsize; i++) {
-               unsigned char tmp = mem1[2];
-               mem1[2] = mem1[0];
-               mem1[0] = tmp;
-               mem1 += 3;
-               }
-         
-           if (Quality < 0)
-              Quality = 255; //XXX is this 'best'???
-         
-           isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
-           FILE *f = fopen(FileName, "wb");
-           if (f) {
-              if (Jpeg) {
-                 // write JPEG file:
-                 struct jpeg_compress_struct cinfo;
-                 struct jpeg_error_mgr jerr;
-                 cinfo.err = jpeg_std_error(&jerr);
-                 jpeg_create_compress(&cinfo);
-                 jpeg_stdio_dest(&cinfo, f);
-                 cinfo.image_width = vm.width;
-                 cinfo.image_height = vm.height;
-                 cinfo.input_components = 3;
-                 cinfo.in_color_space = JCS_RGB;
-         
-                 jpeg_set_defaults(&cinfo);
-                 jpeg_set_quality(&cinfo, Quality, true);
-                 jpeg_start_compress(&cinfo, true);
-         
-                 int rs = vm.width * 3;
-                 JSAMPROW rp[vm.height];
-                 for (int k = 0; k < vm.height; k++)
-                     rp[k] = &mem[rs * k];
-                 jpeg_write_scanlines(&cinfo, rp, vm.height);
-                 jpeg_finish_compress(&cinfo);
-                 jpeg_destroy_compress(&cinfo);
-                 }
-              else {
-                 // write PNM file:
-                 if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
-                     fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
-                    LOG_ERROR_STR(FileName);
-                    result |= 1;
-                    }
-                 }
-              fclose(f);
-              }
-           else {
-              LOG_ERROR_STR(FileName);
-              result |= 1;
-              }
-           munmap(mem, msize);
-           }
-        else
-           result |= 1;
-        }
-     close(videoDev);
-     return result == 0;
-     }
-  return false;
-}
-
-#ifdef DEBUG_OSD
-void cDvbApi::SetColor(eDvbColor colorFg, eDvbColor colorBg)
-{
-  int color = (colorBg << 16) | colorFg | 0x80000000;
-  for (int i = 0; i < MaxColorPairs; i++) {
-      if (!colorPairs[i]) {
-         colorPairs[i] = color;
-         init_pair(i + 1, colorFg, colorBg);
-         wattrset(window, COLOR_PAIR(i + 1));
-         break;
-         }
-      else if (color == colorPairs[i]) {
-         wattrset(window, COLOR_PAIR(i + 1));
-         break;
-         }
-      }
-}
-#endif
-
-void cDvbApi::Open(int w, int h)
-{
-  int d = (h < 0) ? Setup.OSDheight + h : 0;
-  h = abs(h);
-  cols = w;
-  rows = h;
-#ifdef DEBUG_OSD
-  window = subwin(stdscr, h, w, d, (Setup.OSDwidth - w) / 2);
-  syncok(window, true);
-  #define B2C(b) (((b) * 1000) / 255)
-  #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
-  //XXX
-  SETCOLOR(clrBackground,  0x00, 0x00, 0x00, 127); // background 50% gray
-  SETCOLOR(clrBlack,       0x00, 0x00, 0x00, 255);
-  SETCOLOR(clrRed,         0xFC, 0x14, 0x14, 255);
-  SETCOLOR(clrGreen,       0x24, 0xFC, 0x24, 255);
-  SETCOLOR(clrYellow,      0xFC, 0xC0, 0x24, 255);
-  SETCOLOR(clrBlue,        0x00, 0x00, 0xFC, 255);
-  SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
-  SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
-  SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
-#else
-  w *= charWidth;
-  h *= lineHeight;
-  d *= lineHeight;
-  int x = (720 - w + charWidth) / 2; //TODO PAL vs. NTSC???
-  int y = (576 - Setup.OSDheight * lineHeight) / 2 + d;
-  //XXX
-  osd = new cDvbOsd(fd_osd, x, y);
-  //XXX TODO this should be transferred to the places where the individual windows are requested (there's too much detailed knowledge here!)
-  if (h / lineHeight == 5) { //XXX channel display
-     osd->Create(0,              0, w, h, 4);
-     }
-  else if (h / lineHeight == 1) { //XXX info display
-     osd->Create(0,              0, w, h, 4);
-     }
-  else if (d == 0) { //XXX full menu
-     osd->Create(0,                            0, w,                         lineHeight, 2);
-     osd->Create(0,                   lineHeight, w, (Setup.OSDheight - 3) * lineHeight, 2);
-     osd->AddColor(clrBackground);
-     osd->AddColor(clrCyan);
-     osd->AddColor(clrWhite);
-     osd->AddColor(clrBlack);
-     osd->Create(0, (Setup.OSDheight - 2) * lineHeight, w,               2 * lineHeight, 4);
-     }
-  else { //XXX progress display
-     /*XXX
-     osd->Create(0,              0, w, lineHeight, 1);
-     osd->Create(0,     lineHeight, w, lineHeight, 2, false);
-     osd->Create(0, 2 * lineHeight, w, lineHeight, 1);
-     XXX*///XXX some pixels are not drawn correctly with lower bpp values
-     osd->Create(0,              0, w, 3*lineHeight, 4);
-     }
-#endif
-}
-
-void cDvbApi::Close(void)
-{
-#ifdef DEBUG_OSD
-  if (window) {
-     delwin(window);
-     window = 0;
-     }
-#else
-  delete osd;
-  osd = NULL;
-#endif
-}
-
-void cDvbApi::Clear(void)
-{
-#ifdef DEBUG_OSD
-  SetColor(clrBackground, clrBackground);
-  Fill(0, 0, cols, rows, clrBackground);
-#else
-  osd->Clear();
-#endif
-}
-
-void cDvbApi::Fill(int x, int y, int w, int h, eDvbColor color)
-{
-  if (x < 0) x = cols + x;
-  if (y < 0) y = rows + y;
-#ifdef DEBUG_OSD
-  SetColor(color, color);
-  for (int r = 0; r < h; r++) {
-      wmove(window, y + r, x); // ncurses wants 'y' before 'x'!
-      whline(window, ' ', w);
-      }
-  wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
-#else
-  osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
-#endif
-}
-
-void cDvbApi::SetBitmap(int x, int y, const cBitmap &Bitmap)
-{
-#ifndef DEBUG_OSD
-  osd->SetBitmap(x, y, Bitmap);
-#endif
-}
-
-void cDvbApi::ClrEol(int x, int y, eDvbColor color)
-{
-  Fill(x, y, cols - x, 1, color);
-}
-
-int cDvbApi::CellWidth(void)
-{
-#ifdef DEBUG_OSD
-  return 1;
-#else
-  return charWidth;
-#endif
-}
-
-int cDvbApi::LineHeight(void)
-{
-#ifdef DEBUG_OSD
-  return 1;
-#else
-  return lineHeight;
-#endif
-}
-
-int cDvbApi::Width(unsigned char c)
-{
-#ifdef DEBUG_OSD
-  return 1;
-#else
-  return osd->Width(c);
-#endif
-}
-
-int cDvbApi::WidthInCells(const char *s)
-{
-#ifdef DEBUG_OSD
-  return strlen(s);
-#else
-  return (osd->Width(s) + charWidth - 1) / charWidth;
-#endif
-}
-
-eDvbFont cDvbApi::SetFont(eDvbFont Font)
-{
-#ifdef DEBUG_OSD
-  return Font;
-#else
-  return osd->SetFont(Font);
-#endif
-}
-
-void cDvbApi::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
-{
-  if (x < 0) x = cols + x;
-  if (y < 0) y = rows + y;
-#ifdef DEBUG_OSD
-  SetColor(colorFg, colorBg);
-  wmove(window, y, x); // ncurses wants 'y' before 'x'!
-  waddnstr(window, s, cols - x);
-#else
-  osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
-#endif
-}
-
-void cDvbApi::Flush(void)
-{
-#ifdef DEBUG_OSD
-  refresh();
-#else
-  if (osd)
-     osd->Flush();
-#endif
-}
-
-int cDvbApi::Priority(void)
-{
-  return (this == PrimaryDvbApi && !Recording()) ? Setup.PrimaryLimit - 1 : priority;
-}
-
-int cDvbApi::SetModeRecord(void)
-{
-  // Sets up the DVB device for recording
-
-  SetPids(true);
-  if (fd_dvr >= 0)
-     close(fd_dvr);
-  fd_dvr = OstOpen(DEV_OST_DVR, CardIndex(), O_RDONLY | O_NONBLOCK);
-  if (fd_dvr < 0)
-     LOG_ERROR;
-  return fd_dvr;
-}
-
-void cDvbApi::SetModeReplay(void)
-{
-  // Sets up the DVB device for replay
-
-  if (fd_video >= 0 && fd_audio >= 0) {
-     if (siProcessor)
-        siProcessor->SetStatus(false);
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_PLAY));
-     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-     CHECK(ioctl(fd_video, VIDEO_PLAY));
-     }
-}
-
-void cDvbApi::SetModeNormal(bool FromRecording)
-{
-  // Puts the DVB device back into "normal" viewing mode (after replay or recording)
-
-  if (FromRecording) {
-     close(fd_dvr);
-     fd_dvr = -1;
-     SetPids(false);
-     }
-  else {
-     if (fd_video >= 0 && fd_audio >= 0) {
-        CHECK(ioctl(fd_video, VIDEO_STOP, true));
-        CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-        CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-        CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-        CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
-        CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-        CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-        if (siProcessor)
-           siProcessor->SetStatus(true);
-        }
-     }
-}
-
-void cDvbApi::SetVideoFormat(videoFormat_t Format)
-{
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, Format));
-}
-
-bool cDvbApi::SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output)
-{
-  if (Pid) {
-     CHECK(ioctl(fd, DMX_STOP));
-     if (Pid != 0x1FFF) {
-        dmxPesFilterParams pesFilterParams;
-        pesFilterParams.pid     = Pid;
-        pesFilterParams.input   = DMX_IN_FRONTEND;
-        pesFilterParams.output  = Output;
-        pesFilterParams.pesType = PesType;
-        pesFilterParams.flags   = DMX_IMMEDIATE_START;
-        if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-           LOG_ERROR;
-           return false;
-           }
-        }
-     }
-  return true;
-}
-
-bool cDvbApi::SetPids(bool ForRecording)
-{
-  return SetVpid(vPid,   ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
-         SetApid1(aPid1, ForRecording ? DMX_OUT_TS_TAP : DMX_OUT_DECODER) &&
-         SetApid2(ForRecording ? aPid2 : 0, DMX_OUT_TS_TAP) && (!Setup.RecordDolbyDigital ||
-         SetDpid1(ForRecording ? dPid1 : 0, DMX_OUT_TS_TAP) &&
-         SetDpid2(ForRecording ? dPid2 : 0, DMX_OUT_TS_TAP));
-}
-
-eSetChannelResult cDvbApi::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr)
-{
-  StopTransfer();
-  StopReplay();
-
-  // Must set this anyway to avoid getting stuck when switching through
-  // channels with 'Up' and 'Down' keys:
-  currentChannel = ChannelNumber;
-  vPid = Vpid;
-  aPid1 = Apid1;
-  aPid2 = Apid2;
-  dPid1 = Dpid1;
-  dPid2 = Dpid2;
-
-  // Avoid noise while switching:
-
-  if (fd_video >= 0 && fd_audio >= 0) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     }
-
-  // Stop setting system time:
-
-  if (siProcessor)
-     siProcessor->SetCurrentTransponder(0);
-
-  // If this card can't receive this channel, we must not actually switch
-  // the channel here, because that would irritate the driver when we
-  // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (this == PrimaryDvbApi && !ProvidesCa(Ca));
-
-  if (!NeedsTransferMode) {
-
-     // Turn off current PIDs:
-
-     SetVpid( 0x1FFF, DMX_OUT_DECODER);
-     SetApid1(0x1FFF, DMX_OUT_DECODER);
-     SetApid2(0x1FFF, DMX_OUT_DECODER);
-     SetDpid1(0x1FFF, DMX_OUT_DECODER);
-     SetDpid2(0x1FFF, DMX_OUT_DECODER);
-     SetTpid( 0x1FFF, DMX_OUT_DECODER);
-
-     FrontendParameters Frontend;
-
-     switch (frontendType) {
-       case FE_QPSK: { // DVB-S
-
-            // Frequency offsets:
-
-            unsigned int freq = Frequency;
-            int tone = SEC_TONE_OFF;
-
-            if (freq < (unsigned int)Setup.LnbSLOF) {
-               freq -= Setup.LnbFrequLo;
-               tone = SEC_TONE_OFF;
-               }
-            else {
-               freq -= Setup.LnbFrequHi;
-               tone = SEC_TONE_ON;
-               }
-
-            Frontend.Frequency = freq * 1000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
-            Frontend.u.qpsk.FEC_inner = FEC_AUTO;
-
-            int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-
-            // DiseqC:
-
-            secCommand scmd;
-            scmd.type = 0;
-            scmd.u.diseqc.addr = 0x10;
-            scmd.u.diseqc.cmd = 0x38;
-            scmd.u.diseqc.numParams = 1;
-            scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
-
-            secCmdSequence scmds;
-            scmds.voltage = volt;
-            scmds.miniCommand = SEC_MINI_NONE;
-            scmds.continuousTone = tone;
-            scmds.numCommands = Setup.DiSEqC ? 1 : 0;
-            scmds.commands = &scmd;
-
-            CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
-            }
-            break;
-       case FE_QAM: { // DVB-C
-
-            // Frequency and symbol rate:
-
-            Frontend.Frequency = Frequency * 1000000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.qam.SymbolRate = Srate * 1000UL;
-            Frontend.u.qam.FEC_inner = FEC_AUTO;
-            Frontend.u.qam.QAM = QAM_64;
-            }
-            break;
-       case FE_OFDM: { // DVB-T
-
-            // Frequency and OFDM paramaters:
-
-            Frontend.Frequency = Frequency * 1000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
-            Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
-            Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
-            Frontend.u.ofdm.Constellation=QAM_64;
-            Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
-            Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
-            Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
-            }
-            break;
-       default:
-            esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-            return scrFailed;
-       }
-
-     // Tuning:
-
-     CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
-
-     // Wait for channel sync:
-
-     if (cFile::FileReady(fd_frontend, 5000)) {
-        FrontendEvent event;
-        int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-        if (res >= 0) {
-           if (event.type != FE_COMPLETION_EV) {
-              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
-              if (this == PrimaryDvbApi)
-                 cThread::RaisePanic();
-              return scrFailed;
-              }
-           }
-        else
-           esyslog("ERROR %d in frontend get event (channel %d, card %d)", res, ChannelNumber, CardIndex() + 1);
-        }
-     else
-        esyslog("ERROR: timeout while tuning");
-
-     // PID settings:
-
-     if (!SetPids(false)) {
-        esyslog("ERROR: failed to set PIDs for channel %d", ChannelNumber);
-        return scrFailed;
-        }
-     SetTpid(Tpid, DMX_OUT_DECODER);
-     if (fd_audio >= 0)
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     }
-
-  if (this == PrimaryDvbApi && siProcessor)
-     siProcessor->SetCurrentServiceID(Pnr);
-
-  eSetChannelResult Result = scrOk;
-
-  // If this DVB card can't receive this channel, let's see if we can
-  // use the card that actually can receive it and transfer data from there:
-
-  if (NeedsTransferMode) {
-     cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
-     if (CaDvbApi && !CaDvbApi->Recording()) {
-        if ((Result = CaDvbApi->SetChannel(ChannelNumber, Frequency, Polarization, Diseqc, Srate, Vpid, Apid1, Apid2, Dpid1, Dpid2, Tpid, Ca, Pnr)) == scrOk) {
-           SetModeReplay();
-           transferringFromDvbApi = CaDvbApi->StartTransfer(fd_video);
-           }
-        }
-     else
-        Result = scrNoTransfer;
-     }
-
-  if (fd_video >= 0 && fd_audio >= 0) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
-     }
-
-  // Start setting system time:
-
-  if (Result == scrOk && siProcessor)
-     siProcessor->SetCurrentTransponder(Frequency);
-
-  return Result;
-}
-
-bool cDvbApi::Transferring(void)
-{
-  return transferBuffer;
-}
-
-cDvbApi *cDvbApi::StartTransfer(int TransferToVideoDev)
-{
-  StopTransfer();
-  transferBuffer = new cTransferBuffer(this, TransferToVideoDev, vPid, aPid1);
-  return this;
-}
-
-void cDvbApi::StopTransfer(void)
-{
-  if (transferBuffer) {
-     delete transferBuffer;
-     transferBuffer = NULL;
-     }
-  if (transferringFromDvbApi) {
-     transferringFromDvbApi->StopTransfer();
-     transferringFromDvbApi = NULL;
-     }
-}
-
-int cDvbApi::SecondsToFrames(int Seconds)
-{
-  return Seconds * FRAMESPERSEC;
-}
-
-bool cDvbApi::Recording(void)
-{
-  if (recordBuffer && !recordBuffer->Active())
-     StopRecord();
-  return recordBuffer != NULL;
-}
-
-bool cDvbApi::Replaying(void)
-{
-  if (replayBuffer && !replayBuffer->Active())
-     StopReplay();
-  return replayBuffer != NULL;
-}
-
-bool cDvbApi::StartRecord(const char *FileName, int Ca, int Priority)
-{
-  if (Recording()) {
-     esyslog("ERROR: StartRecord() called while recording - ignored!");
-     return false;
-     }
-
-  StopTransfer();
-
-  StopReplay(); // TODO: remove this if the driver is able to do record and replay at the same time
-
-  // Check FileName:
-
-  if (!FileName) {
-     esyslog("ERROR: StartRecord: file name is (null)");
-     return false;
-     }
-  isyslog("record %s", FileName);
-
-  // Create directories if necessary:
-
-  if (!MakeDirs(FileName, true))
-     return false;
-
-  // Make sure the disk is up and running:
-
-  SpinUpDisk(FileName);
-
-  // Create recording buffer:
-
-  recordBuffer = new cRecordBuffer(this, FileName, vPid, aPid1, aPid2, dPid1, dPid2);
-
-  if (recordBuffer) {
-     ca = Ca;
-     priority = Priority;
-     return true;
-     }
-  else
-     esyslog("ERROR: can't allocate recording buffer");
-
-  return false;
-}
-
-void cDvbApi::StopRecord(void)
-{
-  if (recordBuffer) {
-     delete recordBuffer;
-     recordBuffer = NULL;
-     ca = -1;
-     priority = DEFAULTPRIORITY;
-     }
-}
-
-bool cDvbApi::StartReplay(const char *FileName)
-{
-  if (Recording()) {
-     esyslog("ERROR: StartReplay() called while recording - ignored!");
-     return false;
-     }
-  StopTransfer();
-  StopReplay();
-  if (fd_video >= 0 && fd_audio >= 0) {
-
-     // Check FileName:
-
-     if (!FileName) {
-        esyslog("ERROR: StartReplay: file name is (null)");
-        return false;
-        }
-     isyslog("replay %s", FileName);
-
-     // Create replay buffer:
-
-     replayBuffer = new cReplayBuffer(this, fd_video, fd_audio, FileName);
-     if (replayBuffer)
-        return true;
-     else
-        esyslog("ERROR: can't allocate replaying buffer");
-     }
-  return false;
-}
-
-void cDvbApi::StopReplay(void)
-{
-  if (replayBuffer) {
-     delete replayBuffer;
-     replayBuffer = NULL;
-     if (this == PrimaryDvbApi) {
-        // let's explicitly switch the channel back in case it was in Transfer Mode:
-        cChannel *Channel = Channels.GetByNumber(currentChannel);
-        if (Channel) {
-           Channel->Switch(this, false);
-           usleep(100000); // allow driver to sync in case a new replay will start immediately
-           }
-        }
-     }
-}
-
-void cDvbApi::Pause(void)
-{
-  if (replayBuffer)
-     replayBuffer->Pause();
-}
-
-void cDvbApi::Play(void)
-{
-  if (replayBuffer)
-     replayBuffer->Play();
-}
-
-void cDvbApi::Forward(void)
-{
-  if (replayBuffer)
-     replayBuffer->Forward();
-}
-
-void cDvbApi::Backward(void)
-{
-  if (replayBuffer)
-     replayBuffer->Backward();
-}
-
-void cDvbApi::SkipSeconds(int Seconds)
-{
-  if (replayBuffer)
-     replayBuffer->SkipSeconds(Seconds);
-}
-
-int cDvbApi::SkipFrames(int Frames)
-{
-  if (replayBuffer)
-     return replayBuffer->SkipFrames(Frames);
-  return -1;
-}
-
-bool cDvbApi::GetIndex(int &Current, int &Total, bool SnapToIFrame)
-{
-  if (replayBuffer) {
-     replayBuffer->GetIndex(Current, Total, SnapToIFrame);
-     return true;
-     }
-  return false;
-}
-
-bool cDvbApi::GetReplayMode(bool &Play, bool &Forward, int &Speed)
-{
-  return replayBuffer && replayBuffer->GetReplayMode(Play, Forward, Speed);
-}
-
-void cDvbApi::Goto(int Position, bool Still)
-{
-  if (replayBuffer)
-     replayBuffer->Goto(Position, Still);
-}
-
-bool cDvbApi::CanToggleAudioTrack(void)
-{
-  return replayBuffer ? replayBuffer->CanToggleAudioTrack() : (aPid1 && aPid2 && aPid1 != aPid2);
-}
-
-bool cDvbApi::ToggleAudioTrack(void)
-{
-  if (replayBuffer) {
-     replayBuffer->ToggleAudioTrack();
-     return true;
-     }
-  else {
-     int a = aPid2;
-     aPid2 = aPid1;
-     aPid1 = a;
-     if (transferringFromDvbApi)
-        return transferringFromDvbApi->ToggleAudioTrack();
-     else {
-        if (transferBuffer)
-           transferBuffer->SetAudioPid(aPid1);
-        return SetPids(transferBuffer != NULL);
-        }
-     }
-  return false;
-}
-
-bool cDvbApi::ToggleMute(void)
-{
-  int OldVolume = volume;
-  mute = !mute;
-  SetVolume(0, mute);
-  volume = OldVolume;
-  return mute;
-}
-
-void cDvbApi::SetVolume(int Volume, bool Absolute)
-{
-  if (fd_audio >= 0) {
-     volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
-     audioMixer_t am;
-     am.volume_left = am.volume_right = volume;
-     CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
-     if (volume > 0)
-        mute = false;
-     }
-}
-
-void cDvbApi::SetAudioCommand(const char *Command)
-{
-  delete audioCommand;
-  audioCommand = strdup(Command);
-}
-
-// --- cEITScanner -----------------------------------------------------------
-
-cEITScanner::cEITScanner(void)
-{
-  lastScan = lastActivity = time(NULL);
-  currentChannel = 0;
-  lastChannel = 0;
-  numTransponders = 0;
-  transponders = NULL;
-}
-
-cEITScanner::~cEITScanner()
-{
-  delete transponders;
-}
-
-bool cEITScanner::TransponderScanned(cChannel *Channel)
-{
-  for (int i = 0; i < numTransponders; i++) {
-      if (transponders[i] == Channel->frequency)
-         return true;
-      }
-  transponders = (int *)realloc(transponders, ++numTransponders * sizeof(int));
-  transponders[numTransponders - 1] = Channel->frequency;
-  return false;
-}
-
-void cEITScanner::Activity(void)
-{
-  if (currentChannel) {
-     Channels.SwitchTo(currentChannel);
-     currentChannel = 0;
-     }
-  lastActivity = time(NULL);
-}
-
-void cEITScanner::Process(void)
-{
-  if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
-     time_t now = time(NULL);
-     if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        for (int i = 0; i < MAXDVBAPI; i++) {
-            cDvbApi *DvbApi = cDvbApi::GetDvbApi(i + 1, MAXPRIORITY + 1);
-            if (DvbApi) {
-               if (DvbApi != cDvbApi::PrimaryDvbApi || (cDvbApi::NumDvbApis == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                  if (!(DvbApi->Recording() || DvbApi->Replaying() || DvbApi->Transferring())) {
-                     int oldCh = lastChannel;
-                     int ch = oldCh + 1;
-                     while (ch != oldCh) {
-                           if (ch > Channels.MaxNumber()) {
-                              ch = 1;
-                              numTransponders = 0;
-                              }
-                           cChannel *Channel = Channels.GetByNumber(ch);
-                           if (Channel) {
-                              if (Channel->ca <= MAXDVBAPI && !DvbApi->ProvidesCa(Channel->ca))
-                                 break; // the channel says it explicitly needs a different card
-                              if (Channel->pnr && !TransponderScanned(Channel)) {
-                                 if (DvbApi == cDvbApi::PrimaryDvbApi && !currentChannel)
-                                    currentChannel = DvbApi->Channel();
-                                 Channel->Switch(DvbApi, false);
-                                 lastChannel = ch;
-                                 break;
-                                 }
-                              }
-                           ch++;
-                           }
-                     }
-                  }
-               }
-            }
-        lastScan = time(NULL);
-        }
-     }
-}
-
diff --git a/dvbapi.h b/dvbapi.h
deleted file mode 100644
index 7e638786b..000000000
--- a/dvbapi.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * dvbapi.h: Interface to the DVB driver
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: dvbapi.h 1.69 2002/04/21 09:49:22 kls Exp $
- */
-
-#ifndef __DVBAPI_H
-#define __DVBAPI_H
-
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
-#include <ncurses.h>
-#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
-#endif
-#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
-                    // FIXME: shouldn't every header file include ALL the other header
-                    // FIXME: files it depends on? The sequence in which header files
-                    // FIXME: are included here should not matter - and it should NOT
-                    // FIXME: be necessary to include <stdlib.h> here!
-#include <linux/videodev.h>
-#include <ost/dmx.h>
-#include <ost/sec.h>
-#include <ost/frontend.h>
-#include <ost/video.h>
-#include <ost/audio.h>
-#include <ost/osd.h>
-#include <stdio.h>
-
-#include "dvbosd.h"
-#include "eit.h"
-#include "thread.h"
-
-#define FRAMESPERSEC 25
-
-// The maximum file size is limited by the range that can be covered
-// with 'int'. 4GB might be possible (if the range is considered
-// 'unsigned'), 2GB should be possible (even if the range is considered
-// 'signed'), so let's use 2000MB for absolute safety (the actual file size
-// may be slightly higher because we stop recording only before the next
-// 'I' frame, to have a complete Group Of Pictures):
-#define MAXVIDEOFILESIZE 2000 // MB
-#define MINVIDEOFILESIZE  100 // MB
-
-#define MAXVOLUME         255
-#define VOLUMEDELTA         5 // used to increase/decrease the volume
-
-const char *IndexToHMSF(int Index, bool WithFrame = false);
-      // Converts the given index to a string, optionally containing the frame number.
-int HMSFToIndex(const char *HMSF);
-      // Converts the given string (format: "hh:mm:ss.ff") to an index.
-
-enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
-
-class cChannel;
-
-class cRecordBuffer;
-class cPlayBuffer;
-class cReplayBuffer;
-class cTransferBuffer;
-class cCuttingBuffer;
-
-class cVideoCutter {
-private:
-  static char *editedVersionName;
-  static cCuttingBuffer *cuttingBuffer;
-  static bool error;
-  static bool ended;
-public:
-  static bool Start(const char *FileName);
-  static void Stop(void);
-  static bool Active(void);
-  static bool Error(void);
-  static bool Ended(void);
-  };
-
-class cDvbApi {
-  friend class cRecordBuffer;
-  friend class cReplayBuffer;
-  friend class cTransferBuffer;
-private:
-  FrontendType frontendType;
-  int fd_osd, fd_frontend, fd_sec, fd_dvr, fd_audio, fd_video, fd_demuxa1, fd_demuxa2, fd_demuxd1, fd_demuxd2, fd_demuxv, fd_demuxt;
-  int vPid, aPid1, aPid2, dPid1, dPid2;
-  bool SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output);
-  bool SetVpid(int Vpid, dmxOutput_t Output)  { return SetPid(fd_demuxv,  DMX_PES_VIDEO,    Vpid, Output); }
-  bool SetApid1(int Apid, dmxOutput_t Output) { return SetPid(fd_demuxa1, DMX_PES_AUDIO,    Apid, Output); }
-  bool SetApid2(int Apid, dmxOutput_t Output) { return SetPid(fd_demuxa2, DMX_PES_OTHER,    Apid, Output); }
-  bool SetDpid1(int Dpid, dmxOutput_t Output) { return SetPid(fd_demuxd1, DMX_PES_OTHER,    Dpid, Output); }
-  bool SetDpid2(int Dpid, dmxOutput_t Output) { return SetPid(fd_demuxd2, DMX_PES_OTHER,    Dpid, Output); }
-  bool SetTpid(int Tpid, dmxOutput_t Output)  { return SetPid(fd_demuxt,  DMX_PES_TELETEXT, Tpid, Output); }
-  bool SetPids(bool ForRecording);
-  cDvbApi(int n);
-public:
-  ~cDvbApi();
-
-#define MAXDVBAPI  4 // the maximum number of DVB cards in the system
-#define MAXCACAPS 16 // the maximum number of different CA values per DVB card
-
-  static int NumDvbApis;
-private:
-  static cDvbApi *dvbApi[MAXDVBAPI];
-  static int useDvbApi;
-  int cardIndex;
-  int caCaps[MAXCACAPS];
-  int CanShift(int Ca, int Priority, int UsedCards = 0);
-public:
-  static cDvbApi *PrimaryDvbApi;
-  static void SetUseDvbApi(int n);
-         // Sets the 'useDvbApi' flag of the given DVB device.
-         // If this function is not called before Init(), all DVB devices
-         // will be used.
-  static bool SetPrimaryDvbApi(int n);
-         // Sets the primary DVB device to 'n' (which must be in the range
-         // 1...NumDvbApis) and returns true if this was possible.
-  static cDvbApi *GetDvbApi(int Ca, int Priority);
-         // Selects a free DVB device, avoiding the PrimaryDvbApi if possible.
-         // If Ca is not 0, the device with the given number will be returned
-         // in case Ca is <= MAXDVBAPI, or the device that provides the given
-         // value in its caCaps.
-         // If all DVB devices are currently recording, the one recording the
-         // lowest priority timer (if any) that is lower than the given Priority
-         // will be returned.
-         // The caller must check whether the returned DVB device is actually
-         // recording and stop recording if necessary.
-  int CardIndex(void) { return cardIndex; }
-         // Returns the card index of this DvbApi (0 ... MAXDVBAPI - 1).
-  static void SetCaCaps(void);
-         // Sets the CaCaps of all DVB devices according to the Setup data.
-  int ProvidesCa(int Ca);
-         // Checks whether this DVB device provides the given value in its
-         // caCaps. Returns 0 if the value is not provided, 1 if only this
-         // value is provided, and > 1 if this and other values are provided.
-         // If the given value is equal to the number of this DVB device,
-         // 1 is returned. If it is 0 (FTA), 1 plus the number of other values
-         // in caCaps is returned.
-  static bool Probe(const char *FileName);
-         // Probes for existing DVB devices.
-  static bool Init(void);
-         // Initializes the DVB API.
-         // Must be called before accessing any DVB functions.
-  static void Cleanup(void);
-         // Closes down all DVB devices.
-         // Must be called at the end of the program.
-
-  // EIT facilities
-
-private:
-  cSIProcessor *siProcessor;
-public:
-  // Image Grab facilities
-
-  bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-
-  // On Screen Display facilities
-
-private:
-  enum { charWidth  = 12, // average character width
-         lineHeight = 27  // smallest text height
-       };
-#ifdef DEBUG_OSD
-  WINDOW *window;
-  enum { MaxColorPairs = 16 };
-  int colorPairs[MaxColorPairs];
-  void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
-#else
-  cDvbOsd *osd;
-#endif
-  int cols, rows;
-public:
-  void Open(int w, int h);
-  void Close(void);
-  void Clear(void);
-  void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  void ClrEol(int x, int y, eDvbColor color = clrBackground);
-  int CellWidth(void);
-  int LineHeight(void);
-  int Width(unsigned char c);
-  int WidthInCells(const char *s);
-  eDvbFont SetFont(eDvbFont Font);
-  void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
-  void Flush(void);
-
-  // Video format facilities:
-
-  void SetVideoFormat(videoFormat_t Format);
-
-  // Channel facilities
-
-private:
-  int currentChannel;
-public:
-  eSetChannelResult SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid, int Ca, int Pnr);
-  static int CurrentChannel(void) { return PrimaryDvbApi ? PrimaryDvbApi->currentChannel : 0; }
-  int Channel(void) { return currentChannel; }
-
-  // Transfer facilities
-
-private:
-  cTransferBuffer *transferBuffer;
-  cDvbApi *transferringFromDvbApi;
-public:
-  bool Transferring(void);
-       // Returns true if we are currently transferring video data.
-private:
-  cDvbApi *StartTransfer(int TransferToVideoDev);
-       // Starts transferring video data from this DVB device to TransferToVideoDev.
-  void StopTransfer(void);
-       // Stops transferring video data (in case a transfer is currently active).
-
-  // Record/Replay facilities
-
-private:
-  cRecordBuffer *recordBuffer;
-  cPlayBuffer *replayBuffer;
-  int ca;
-  int priority;
-  int  Priority(void);
-       // Returns the priority of the current recording session (0..MAXPRIORITY),
-       // or -1 if no recording is currently active. The primary DVB device will
-       // always return at least Setup.PrimaryLimit-1.
-  int  SetModeRecord(void);
-       // Initiates recording mode and returns the file handle to read from.
-  void SetModeReplay(void);
-  void SetModeNormal(bool FromRecording);
-public:
-  int  Ca(void) { return ca; }
-       // Returns the ca of the current recording session.
-  int  SecondsToFrames(int Seconds);
-       // Returns the number of frames corresponding to the given number of seconds.
-  bool Recording(void);
-       // Returns true if we are currently recording.
-  bool Replaying(void);
-       // Returns true if we are currently replaying.
-  bool StartRecord(const char *FileName, int Ca, int Priority);
-       // Starts recording the current channel into the given file, with
-       // the given ca and priority.
-       // In order to be able to record longer movies,
-       // a numerical suffix will be appended to the file name. The inital
-       // value of that suffix will be larger than any existing file under
-       // the given name, thus allowing an interrupted recording to continue
-       // gracefully.
-       // Returns true if recording was started successfully.
-       // If there is already a recording session active, false will be
-       // returned.
-  void StopRecord(void);
-       // Stops the current recording session (if any).
-  bool StartReplay(const char *FileName);
-       // Starts replaying the given file.
-       // If there is already a replay session active, it will be stopped
-       // and the new file will be played back.
-  void StopReplay(void);
-       // Stops the current replay session (if any).
-  void Pause(void);
-       // Pauses the current replay session, or resumes a paused session.
-  void Play(void);
-       // Resumes normal replay mode.
-  void Forward(void);
-       // Runs the current replay session forward at a higher speed.
-  void Backward(void);
-       // Runs the current replay session backwards at a higher speed.
-  void SkipSeconds(int Seconds);
-       // Skips the given number of seconds in the current replay session.
-       // The sign of 'Seconds' determines the direction in which to skip.
-       // Use a very large negative value to go all the way back to the
-       // beginning of the recording.
-  int  SkipFrames(int Frames);
-       // Returns the new index into the current replay session after skipping
-       // the given number of frames (no actual repositioning is done!).
-       // The sign of 'Frames' determines the direction in which to skip.
-  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
-       // Returns the current and total frame index, optionally snapped to the
-       // nearest I-frame.
-  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
-       // Returns the current replay mode (if applicable).
-       // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
-       // we are going forward or backward and 'Speed' is -1 if this is normal
-       // play/pause mode, 0 if it is single speed fast/slow forward/back mode
-       // and >0 if this is multi speed mode.
-  void Goto(int Index, bool Still = false);
-       // Positions to the given index and displays that frame as a still picture
-       // if Still is true.
-
-  // Audio track facilities
-
-public:
-  bool CanToggleAudioTrack(void);
-       // Returns true if we are currently replaying and this recording has two
-       // audio tracks, or if the current channel has two audio PIDs.
-  bool ToggleAudioTrack(void);
-       // Toggles the audio track if possible.
-
-  // Dolby Digital audio facilities
-
-private:
-  static char *audioCommand;
-public:
-  static void SetAudioCommand(const char *Command);
-  static const char *AudioCommand(void) { return audioCommand; }
-
-  // Volume facilities:
-
-private:
-  bool mute;
-  int volume;
-public:
-  bool IsMute(void) { return mute; }
-  bool ToggleMute(void);
-       // Turns the volume off or on and returns the new mute state.
-  void SetVolume(int Volume, bool Absolute = false);
-       // Sets the volume to the given value, either absolutely or relative to
-       // the current volume.
-  static int CurrentVolume(void) { return PrimaryDvbApi ? PrimaryDvbApi->volume : 0; }
-  };
-
-class cEITScanner {
-private:
-  enum { ActivityTimeout = 60,
-         ScanTimeout = 20
-       };
-  time_t lastScan, lastActivity;
-  int currentChannel, lastChannel;
-  int numTransponders, *transponders;
-  bool TransponderScanned(cChannel *Channel);
-public:
-  cEITScanner(void);
-  ~cEITScanner();
-  bool Active(void) { return currentChannel; }
-  void Activity(void);
-  void Process(void);
-  };
-
-#endif //__DVBAPI_H
diff --git a/dvbosd.c b/dvbosd.c
index 294ee90d6..ad51966f1 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.15 2002/05/13 16:29:20 kls Exp $
+ * $Id: dvbosd.c 1.17 2002/05/18 13:39:02 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -13,12 +13,12 @@
 #include <sys/unistd.h>
 #include "tools.h"
 
-cDvbOsd::cDvbOsd(int VideoDev, int x, int y)
-:cOsd(x, y)
+cDvbOsd::cDvbOsd(int OsdDev, int x, int y)
+:cOsdBase(x, y)
 {
-  videoDev = VideoDev;
-  if (videoDev < 0)
-     esyslog("ERROR: illegal video device handle (%d)!", videoDev);
+  osdDev = OsdDev;
+  if (osdDev < 0)
+     esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
 }
 
 cDvbOsd::~cDvbOsd()
@@ -44,7 +44,7 @@ bool cDvbOsd::SetWindow(cWindow *Window)
 
 void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
-  if (videoDev >= 0) {
+  if (osdDev >= 0) {
      osd_cmd_t dc;
      dc.cmd   = cmd;
      dc.color = color;
@@ -58,7 +58,7 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      sigfillset(&set);
      sigdelset(&set, SIGALRM);
      sigprocmask(SIG_BLOCK, &set, &oldset);
-     ioctl(videoDev, OSD_SEND_CMD, &dc);
+     ioctl(osdDev, OSD_SEND_CMD, &dc);
      if (cmd == OSD_SetBlock) // XXX this is the only command that takes longer
         usleep(5000); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
                       // XXX and sometimes the OSD was no longer displayed).
diff --git a/dvbosd.h b/dvbosd.h
index ff26bcff4..0bc6079f8 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.11 2002/05/10 14:22:07 kls Exp $
+ * $Id: dvbosd.h 1.13 2002/05/18 13:38:09 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -13,9 +13,9 @@
 #include <ost/osd.h>
 #include "osdbase.h"
 
-class cDvbOsd : public cOsd {
+class cDvbOsd : public cOsdBase {
 private:
-  int videoDev;
+  int osdDev;
   bool SetWindow(cWindow *Window);
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
 protected:
@@ -26,7 +26,7 @@ class cDvbOsd : public cOsd {
   virtual void MoveWindow(cWindow *Window, int x, int y);
   virtual void CloseWindow(cWindow *Window);
 public:
-  cDvbOsd(int VideoDev, int x, int y);
+  cDvbOsd(int OsdDev, int x, int y);
   virtual ~cDvbOsd();
   };
 
diff --git a/dvbplayer.c b/dvbplayer.c
new file mode 100644
index 000000000..10fdf4b57
--- /dev/null
+++ b/dvbplayer.c
@@ -0,0 +1,733 @@
+/*
+ * dvbplayer.c: The DVB player
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbplayer.c 1.1 2002/06/16 10:59:45 kls Exp $
+ */
+
+#include "dvbplayer.h"
+#include <poll.h>
+#include "recording.h"
+#include "ringbuffer.h"
+#include "thread.h"
+
+// --- ReadFrame -------------------------------------------------------------
+
+int ReadFrame(int f, uchar *b, int Length, int Max)
+{
+  if (Length == -1)
+     Length = Max; // this means we read up to EOF (see cIndex)
+  else if (Length > Max) {
+     esyslog("ERROR: frame larger than buffer (%d > %d)", Length, Max);
+     Length = Max;
+     }
+  int r = safe_read(f, b, Length);
+  if (r < 0)
+     LOG_ERROR;
+  return r;
+}
+
+// --- cBackTrace ----------------------------------------------------------
+
+#define AVG_FRAME_SIZE 15000         // an assumption about the average frame size
+#define DVB_BUF_SIZE   (256 * 1024)  // an assumption about the dvb firmware buffer size
+#define BACKTRACE_ENTRIES (DVB_BUF_SIZE / AVG_FRAME_SIZE + 20) // how many entries are needed to backtrace buffer contents
+
+class cBackTrace {
+private:
+  int index[BACKTRACE_ENTRIES];
+  int length[BACKTRACE_ENTRIES];
+  int pos, num;
+public:
+  cBackTrace(void);
+  void Clear(void);
+  void Add(int Index, int Length);
+  int Get(bool Forward);
+  };
+
+cBackTrace::cBackTrace(void)
+{
+  Clear();
+}
+
+void cBackTrace::Clear(void)
+{
+  pos = num = 0;
+}
+
+void cBackTrace::Add(int Index, int Length)
+{
+  index[pos] = Index;
+  length[pos] = Length;
+  if (++pos >= BACKTRACE_ENTRIES)
+     pos = 0;
+  if (num < BACKTRACE_ENTRIES)
+     num++;
+}
+
+int cBackTrace::Get(bool Forward)
+{
+  int p = pos;
+  int n = num;
+  int l = DVB_BUF_SIZE + (Forward ? 0 : 256 * 1024); //XXX (256 * 1024) == DVB_BUF_SIZE ???
+  int i = -1;
+
+  while (n && l > 0) {
+        if (--p < 0)
+           p = BACKTRACE_ENTRIES - 1;
+        i = index[p] - 1;
+        l -= length[p];
+        n--; 
+        }
+  return i;
+}
+
+// --- cDvbPlayer ------------------------------------------------------------
+
+//XXX+ also used in recorder.c - find a better place???
+// The size of the array used to buffer video data:
+// (must be larger than MINVIDEODATA - see remux.h)
+#define VIDEOBUFSIZE  MEGABYTE(1)
+
+// The maximum size of a single frame:
+#define MAXFRAMESIZE  KILOBYTE(192)
+
+// The number of frames to back up when resuming an interrupted replay session:
+#define RESUMEBACKUP (10 * FRAMESPERSEC)
+
+class cDvbPlayer : public cPlayer, cThread {
+private:
+  enum ePlayModes { pmPlay, pmPause, pmSlow, pmFast, pmStill };
+  enum ePlayDirs { pdForward, pdBackward };
+  static int Speeds[];
+  cRingBufferFrame *ringBuffer;
+  cBackTrace *backTrace;
+  cFileName *fileName;
+  cIndexFile *index;
+  int replayFile;
+  bool eof;
+  bool active;
+  ePlayModes playMode;
+  ePlayDirs playDir;
+  int trickSpeed;
+  int readIndex, writeIndex;
+  cFrame *readFrame;
+  const cFrame *playFrame;
+  void TrickSpeed(int Increment);
+  void Empty(void);
+  void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
+  bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
+  int Resume(void);
+  bool Save(void);
+protected:
+  virtual void Activate(bool On);
+  virtual void Action(void);
+public:
+  cDvbPlayer(const char *FileName);
+  virtual ~cDvbPlayer();
+  bool Active(void) { return active; }
+  void Pause(void);
+  void Play(void);
+  void Forward(void);
+  void Backward(void);
+  int SkipFrames(int Frames);
+  void SkipSeconds(int Seconds);
+  void Goto(int Position, bool Still = false);
+  void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
+  };
+
+#define MAX_VIDEO_SLOWMOTION 63 // max. arg to pass to VIDEO_SLOWMOTION // TODO is this value correct?
+#define NORMAL_SPEED  4 // the index of the '1' entry in the following array
+#define MAX_SPEEDS    3 // the offset of the maximum speed from normal speed in either direction
+#define SPEED_MULT   12 // the speed multiplier
+int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
+
+cDvbPlayer::cDvbPlayer(const char *FileName)
+{
+  ringBuffer = NULL;
+  backTrace = NULL;
+  index = NULL;
+  eof = false;
+  active = false;
+  playMode = pmPlay;
+  playDir = pdForward;
+  trickSpeed = NORMAL_SPEED;
+  readIndex = writeIndex = -1;
+  readFrame = NULL;
+  playFrame = NULL;
+  isyslog("replay %s", FileName);
+  fileName = new cFileName(FileName, false);
+  replayFile = fileName->Open();
+  if (replayFile < 0)
+     return;
+  ringBuffer = new cRingBufferFrame(VIDEOBUFSIZE);
+  // Create the index file:
+  index = new cIndexFile(FileName, false);
+  if (!index)
+     esyslog("ERROR: can't allocate index");
+  else if (!index->Ok()) {
+     delete index;
+     index = NULL;
+     }
+  backTrace = new cBackTrace;
+}
+
+cDvbPlayer::~cDvbPlayer()
+{
+  Detach();
+  Save();
+  delete index;
+  delete fileName;
+  delete backTrace;
+  delete ringBuffer;
+}
+
+void cDvbPlayer::TrickSpeed(int Increment)
+{
+  int nts = trickSpeed + Increment;
+  if (Speeds[nts] == 1) {
+     trickSpeed = nts;
+     if (playMode == pmFast)
+        Play();
+     else
+        Pause();
+     }
+  else if (Speeds[nts]) {
+     trickSpeed = nts;
+     int Mult = (playMode == pmSlow && playDir == pdForward) ? 1 : SPEED_MULT;
+     int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
+     if (sp > MAX_VIDEO_SLOWMOTION)
+        sp = MAX_VIDEO_SLOWMOTION;
+     DeviceTrickSpeed(sp);
+     }
+}
+
+void cDvbPlayer::Empty(void)
+{
+  Lock();
+  if ((readIndex = backTrace->Get(playDir == pdForward)) < 0)
+     readIndex = writeIndex;
+  readFrame = NULL;
+  playFrame = NULL;
+  ringBuffer->Clear();
+  backTrace->Clear();
+  DeviceClear();
+  Unlock();
+}
+
+void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
+{
+  if (index) {
+     for (int i = 0; i < Length - 6; i++) {
+         if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
+            uchar c = b[i + 3];
+            int l = b[i + 4] * 256 + b[i + 5] + 6;
+            switch (c) {
+              case 0xBD: // dolby
+                   if (Except)
+                      ;//XXX+ PlayExternalDolby(&b[i], Length - i);
+                   // continue with deleting the data - otherwise it disturbs DVB replay
+              case 0xC0 ... 0xC1: // audio
+                   if (c == 0xC1)
+                      ;//XXX+ canToggleAudioTrack = true;
+                   if (!Except || c != Except) {
+                      int n = l;
+                      for (int j = i; j < Length && n--; j++)
+                          b[j] = 0x00;
+                      }
+                   break;
+              case 0xE0 ... 0xEF: // video
+                   break;
+              default:
+                   //esyslog("ERROR: unexpected packet id %02X", c);
+                   l = 0;
+              }
+            if (l)
+               i += l - 1; // the loop increments, too!
+            }
+         /*XXX
+         else
+            esyslog("ERROR: broken packet header");
+            XXX*/
+         }
+     }
+}
+
+bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset)
+{
+  if (FileNumber > 0)
+     replayFile = fileName->SetOffset(FileNumber, FileOffset);
+  else if (replayFile >= 0 && eof)
+     replayFile = fileName->NextFile();
+  eof = false;
+  return replayFile >= 0;
+}
+
+int cDvbPlayer::Resume(void)
+{
+  if (index) {
+     int Index = index->GetResume();
+     if (Index >= 0) {
+        uchar FileNumber;
+        int FileOffset;
+        if (index->Get(Index, &FileNumber, &FileOffset) && NextFile(FileNumber, FileOffset))
+           return Index;
+        }
+     }
+  return -1;
+}
+
+bool cDvbPlayer::Save(void)
+{
+  if (index) {
+     int Index = writeIndex;
+     if (Index >= 0) {
+        Index -= RESUMEBACKUP;
+        if (Index > 0)
+           Index = index->GetNextIFrame(Index, false);
+        else
+           Index = 0;
+        if (Index >= 0)
+           return index->StoreResume(Index);
+        }
+     }
+  return false;
+}
+
+void cDvbPlayer::Activate(bool On)
+{
+  if (On) {
+     if (replayFile >= 0)
+        Start();
+     }
+  else if (active) {
+     active = false;
+     Cancel(3);
+     }
+}
+
+void cDvbPlayer::Action(void)
+{
+  active = true;
+  dsyslog("dvbplayer thread started (pid=%d)", getpid());
+
+  uchar b[MAXFRAMESIZE];
+  const uchar *p = NULL;
+  int pc = 0;
+
+  pollfd pfd[2];
+  pfd[0].fd = DeviceFileHandle();
+  pfd[0].events = pfd[0].revents = POLLOUT;
+  pfd[1].fd = replayFile;
+  pfd[1].events = pfd[1].revents = POLLIN;
+
+  readIndex = Resume();
+  if (readIndex >= 0)
+     isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
+
+  while (active && NextFile()) {
+        {
+          LOCK_THREAD;
+
+          // Read the next frame from the file:
+
+          if (!readFrame && (pfd[1].revents & POLLIN)) {
+             if (playMode != pmStill) {
+                int r = 0;
+                if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
+                   uchar FileNumber;
+                   int FileOffset, Length;
+                   int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
+                   if (Index >= 0) {
+                      if (!NextFile(FileNumber, FileOffset))
+                         break;
+                      }
+                   else {
+                      // can't call Play() here, because those functions may only be
+                      // called from the foreground thread - and we also don't need
+                      // to empty the buffer here
+                      DevicePlay();
+                      playMode = pmPlay;
+                      playDir = pdForward;
+                      continue;
+                      }
+                   readIndex = Index;
+                   r = ReadFrame(replayFile, b, Length, sizeof(b));
+                   // must call StripAudioPackets() here because the buffer is not emptied
+                   // when falling back from "fast forward" to "play" (see above)
+                   StripAudioPackets(b, r);
+                   }
+                else if (index) {
+                   uchar FileNumber;
+                   int FileOffset, Length;
+                   readIndex++;
+                   if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
+                      break;
+                   r = ReadFrame(replayFile, b, Length, sizeof(b));
+                   }
+                else // allows replay even if the index file is missing
+                   r = read(replayFile, b, sizeof(b));
+                if (r > 0)
+                   readFrame = new cFrame(b, r, ftUnknown, readIndex);
+                else if (r == 0)
+                   eof = true;
+                else if (r < 0 && FATALERRNO) {
+                   LOG_ERROR;
+                   break;
+                   }
+                }
+             else//XXX
+                usleep(1); // this keeps the CPU load low
+             }
+
+          // Store the frame in the buffer:
+
+          if (readFrame) {
+             if (ringBuffer->Put(readFrame))
+                readFrame = NULL;
+             }
+
+          // Get the next frame from the buffer:
+        
+          if (!playFrame) {
+             playFrame = ringBuffer->Get();
+             p = NULL;
+             pc = 0;
+             }
+
+          // Play the frame:
+
+          if (playFrame && (pfd[0].revents & POLLOUT)) {
+             if (!p) {
+                p = playFrame->Data();
+                pc = playFrame->Count();
+                }
+             if (p) {
+                int w = PlayVideo(p, pc);
+                if (w > 0) {
+                   p += w;
+                   pc -= w;
+                   }
+                else if (w < 0 && FATALERRNO) {
+                   LOG_ERROR;
+                   break;
+                   }
+                }
+             if (pc == 0) {
+                writeIndex = playFrame->Index();
+                backTrace->Add(playFrame->Index(), playFrame->Count());
+                ringBuffer->Drop(playFrame);
+                playFrame = NULL;
+                p = 0;
+                }
+             }
+        }
+
+        // Wait for input or output to become ready:
+
+        if (poll(pfd, readFrame ? 1 : 2, 10) < 0 && FATALERRNO) {
+           LOG_ERROR;
+           break;
+           }
+        }
+
+  dsyslog("dvbplayer thread ended (pid=%d)", getpid());
+  active = false;
+}
+
+void cDvbPlayer::Pause(void)
+{
+  if (playMode == pmPause || playMode == pmStill)
+     Play();
+  else {
+     LOCK_THREAD;
+     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))
+        Empty();
+     DeviceFreeze();
+     playMode = pmPause;
+     }
+}
+
+void cDvbPlayer::Play(void)
+{
+  if (playMode != pmPlay) {
+     LOCK_THREAD;
+     if (playMode == pmStill || playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))
+        Empty();
+     DevicePlay();
+     playMode = pmPlay;
+     playDir = pdForward;
+    }
+}
+
+void cDvbPlayer::Forward(void)
+{
+  if (index) {
+     switch (playMode) {
+       case pmFast:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdForward ? 1 : -1);
+               break;
+               }
+            else if (playDir == pdForward) {
+               Play();
+               break;
+               }
+            // run into pmPlay
+       case pmPlay: {
+            LOCK_THREAD;
+            Empty();
+            DeviceMute();
+            playMode = pmFast;
+            playDir = pdForward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
+            }
+            break;
+       case pmSlow:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdForward ? -1 : 1);
+               break;
+               }
+            else if (playDir == pdForward) {
+               Pause();
+               break;
+               }
+            // run into pmPause
+       case pmStill:
+       case pmPause:
+            DeviceMute();
+            playMode = pmSlow;
+            playDir = pdForward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
+            break;
+       }
+     }
+}
+
+void cDvbPlayer::Backward(void)
+{
+  if (index) {
+     switch (playMode) {
+       case pmFast:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdBackward ? 1 : -1);
+               break;
+               }
+            else if (playDir == pdBackward) {
+               Play();
+               break;
+               }
+            // run into pmPlay
+       case pmPlay: {
+            LOCK_THREAD;
+            Empty();
+            DeviceMute();
+            playMode = pmFast;
+            playDir = pdBackward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? 1 : MAX_SPEEDS);
+            }
+            break;
+       case pmSlow:
+            if (Setup.MultiSpeedMode) {
+               TrickSpeed(playDir == pdBackward ? -1 : 1);
+               break;
+               }
+            else if (playDir == pdBackward) {
+               Pause();
+               break;
+               }
+            // run into pmPause
+       case pmStill:
+       case pmPause: {
+            LOCK_THREAD;
+            Empty();
+            DeviceMute();
+            playMode = pmSlow;
+            playDir = pdBackward;
+            trickSpeed = NORMAL_SPEED;
+            TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
+            }
+            break;
+       }
+     }
+}
+
+int cDvbPlayer::SkipFrames(int Frames)
+{
+  if (index && Frames) {
+     int Current, Total;
+     GetIndex(Current, Total, true);
+     int OldCurrent = Current;
+     Current = index->GetNextIFrame(Current + Frames, Frames > 0);
+     return Current >= 0 ? Current : OldCurrent;
+     }
+  return -1;
+}
+
+void cDvbPlayer::SkipSeconds(int Seconds)
+{
+  if (index && Seconds) {
+     LOCK_THREAD;
+     Empty();
+     int Index = writeIndex;
+     if (Index >= 0) {
+        Index = max(Index + Seconds * FRAMESPERSEC, 0);
+        if (Index > 0)
+           Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
+        if (Index >= 0)
+           readIndex = writeIndex = Index - 1; // Input() will first increment it!
+        }
+     Play();
+     }
+}
+
+void cDvbPlayer::Goto(int Index, bool Still)
+{
+  if (index) {
+     LOCK_THREAD;
+     Empty();
+     if (++Index <= 0)
+        Index = 1; // not '0', to allow GetNextIFrame() below to work!
+     uchar FileNumber;
+     int FileOffset, Length;
+     Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
+     if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
+        uchar b[MAXFRAMESIZE];
+        int r = ReadFrame(replayFile, b, Length, sizeof(b));
+        if (r > 0) {
+           if (playMode == pmPause)
+              DevicePlay();
+           StripAudioPackets(b, r);
+           DeviceStillPicture(b, r);
+           }
+        playMode = pmStill;
+        }
+     readIndex = writeIndex = Index;
+     }
+}
+
+void cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
+{
+  if (index) {
+     if (playMode == pmStill)
+        Current = max(readIndex, 0);
+     else {
+        Current = max(writeIndex, 0);
+        if (SnapToIFrame) {
+           int i1 = index->GetNextIFrame(Current + 1, false);
+           int i2 = index->GetNextIFrame(Current, true);
+           Current = (abs(Current - i1) <= abs(Current - i2)) ? i1 : i2;
+           }
+        }
+     Total = index->Last();
+     }
+  else
+     Current = Total = -1;
+}
+
+bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
+{
+  Play = (playMode == pmPlay || playMode == pmFast);
+  Forward = (playDir == pdForward);
+  if (playMode == pmFast || playMode == pmSlow)
+     Speed = Setup.MultiSpeedMode ? abs(trickSpeed - NORMAL_SPEED) : 0;
+  else
+     Speed = -1;
+  return true;
+}
+
+// --- cDvbPlayerControl -----------------------------------------------------
+
+cDvbPlayerControl::cDvbPlayerControl(void)
+{
+  player = NULL;
+}
+
+cDvbPlayerControl::~cDvbPlayerControl()
+{
+  Stop();
+}
+
+bool cDvbPlayerControl::Active(void)
+{
+  return player && player->Active();
+}
+
+bool cDvbPlayerControl::Start(const char *FileName)
+{
+  delete player;
+  player = new cDvbPlayer(FileName);
+  if (cDevice::PrimaryDevice()->Attach(player))
+     return true;
+  Stop();
+  return false;
+}
+
+void cDvbPlayerControl::Stop(void)
+{
+  delete player;
+  player = NULL;
+}
+
+void cDvbPlayerControl::Pause(void)
+{
+  if (player)
+     player->Pause();
+}
+
+void cDvbPlayerControl::Play(void)
+{
+  if (player)
+     player->Play();
+}
+
+void cDvbPlayerControl::Forward(void)
+{
+  if (player)
+     player->Forward();
+}
+
+void cDvbPlayerControl::Backward(void)
+{
+  if (player)
+     player->Backward();
+}
+
+void cDvbPlayerControl::SkipSeconds(int Seconds)
+{
+  if (player)
+     player->SkipSeconds(Seconds);
+}
+
+int cDvbPlayerControl::SkipFrames(int Frames)
+{
+  if (player)
+     return player->SkipFrames(Frames);
+  return -1;
+}
+
+bool cDvbPlayerControl::GetIndex(int &Current, int &Total, bool SnapToIFrame)
+{
+  if (player) {
+     player->GetIndex(Current, Total, SnapToIFrame);
+     return true;
+     }
+  return false;
+}
+
+bool cDvbPlayerControl::GetReplayMode(bool &Play, bool &Forward, int &Speed)
+{
+  return player && player->GetReplayMode(Play, Forward, Speed);
+}
+
+void cDvbPlayerControl::Goto(int Position, bool Still)
+{
+  if (player)
+     player->Goto(Position, Still);
+}
diff --git a/dvbplayer.h b/dvbplayer.h
new file mode 100644
index 000000000..b05bcdfab
--- /dev/null
+++ b/dvbplayer.h
@@ -0,0 +1,60 @@
+/*
+ * dvbplayer.h: The DVB player
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbplayer.h 1.1 2002/06/16 10:59:14 kls Exp $
+ */
+
+#ifndef __DVBPLAYER_H
+#define __DVBPLAYER_H
+
+#include "player.h"
+#include "thread.h"
+
+class cDvbPlayer;
+
+class cDvbPlayerControl : public cControl {
+private:
+  cDvbPlayer *player;
+public:
+  cDvbPlayerControl(void);
+  virtual ~cDvbPlayerControl();
+  bool Active(void);
+  bool Start(const char *FileName);
+       // Starts replaying the given file.
+  void Stop(void);
+       // Stops the current replay session (if any).
+  void Pause(void);
+       // Pauses the current replay session, or resumes a paused session.
+  void Play(void);
+       // Resumes normal replay mode.
+  void Forward(void);
+       // Runs the current replay session forward at a higher speed.
+  void Backward(void);
+       // Runs the current replay session backwards at a higher speed.
+  int  SkipFrames(int Frames);
+       // Returns the new index into the current replay session after skipping
+       // the given number of frames (no actual repositioning is done!).
+       // The sign of 'Frames' determines the direction in which to skip.
+  void SkipSeconds(int Seconds);
+       // Skips the given number of seconds in the current replay session.
+       // The sign of 'Seconds' determines the direction in which to skip.
+       // Use a very large negative value to go all the way back to the
+       // beginning of the recording.
+  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+       // Returns the current and total frame index, optionally snapped to the
+       // nearest I-frame.
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
+       // Returns the current replay mode (if applicable).
+       // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
+       // we are going forward or backward and 'Speed' is -1 if this is normal
+       // play/pause mode, 0 if it is single speed fast/slow forward/back mode
+       // and >0 if this is multi speed mode.
+  void Goto(int Index, bool Still = false);
+       // Positions to the given index and displays that frame as a still picture
+       // if Still is true.
+  };
+
+#endif //__DVBPLAYER_H
diff --git a/eit.c b/eit.c
index 7f1bacf40..f5d98f547 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.45 2002/05/13 16:35:49 kls Exp $
+ * $Id: eit.c 1.46 2002/05/31 10:26:56 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -26,6 +26,7 @@
 #include <iomanip.h>
 #include <iostream.h>
 #include <limits.h>
+#include <ost/dmx.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/eitscan.c b/eitscan.c
new file mode 100644
index 000000000..f620b096f
--- /dev/null
+++ b/eitscan.c
@@ -0,0 +1,84 @@
+/*
+ * eitscan.c: EIT scanner
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: eitscan.c 1.2 2002/06/02 09:02:05 kls Exp $
+ */
+
+#include "eitscan.h"
+
+cEITScanner::cEITScanner(void)
+{
+  lastScan = lastActivity = time(NULL);
+  currentChannel = 0;
+  lastChannel = 0;
+  numTransponders = 0;
+  transponders = NULL;
+}
+
+cEITScanner::~cEITScanner()
+{
+  delete transponders;
+}
+
+bool cEITScanner::TransponderScanned(cChannel *Channel)
+{
+  for (int i = 0; i < numTransponders; i++) {
+      if (transponders[i] == Channel->frequency)
+         return true;
+      }
+  transponders = (int *)realloc(transponders, ++numTransponders * sizeof(int));
+  transponders[numTransponders - 1] = Channel->frequency;
+  return false;
+}
+
+void cEITScanner::Activity(void)
+{
+  if (currentChannel) {
+     Channels.SwitchTo(currentChannel);
+     currentChannel = 0;
+     }
+  lastActivity = time(NULL);
+}
+
+void cEITScanner::Process(void)
+{
+  if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
+     time_t now = time(NULL);
+     if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
+        for (int i = 0; i < MAXDEVICES; i++) {
+            cDevice *Device = cDevice::GetDevice(i + 1, MAXPRIORITY + 1);
+            if (Device) {
+               if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                  if (!(Device->Receiving() || Device->Replaying()/*XXX+ || Device->Transferring()XXX*/)) {
+                     int oldCh = lastChannel;
+                     int ch = oldCh + 1;
+                     while (ch != oldCh) {
+                           if (ch > Channels.MaxNumber()) {
+                              ch = 1;
+                              numTransponders = 0;
+                              }
+                           cChannel *Channel = Channels.GetByNumber(ch);
+                           if (Channel) {
+                              if (Channel->ca <= MAXDEVICES && !Device->ProvidesCa(Channel->ca))
+                                 break; // the channel says it explicitly needs a different card
+                              if (Channel->pnr && !TransponderScanned(Channel)) {
+                                 if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                                    currentChannel = Device->Channel();
+                                 Channel->Switch(Device, false);
+                                 lastChannel = ch;
+                                 break;
+                                 }
+                              }
+                           ch++;
+                           }
+                     }
+                  }
+               }
+            }
+        lastScan = time(NULL);
+        }
+     }
+}
diff --git a/eitscan.h b/eitscan.h
new file mode 100644
index 000000000..7dacb8228
--- /dev/null
+++ b/eitscan.h
@@ -0,0 +1,33 @@
+/*
+ * eitscan.h: EIT scanner
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: eitscan.h 1.1 2002/05/20 11:00:05 kls Exp $
+ */
+
+#ifndef __EITSCAN_H
+#define __EITSCAN_H
+
+#include <time.h>
+#include "config.h"
+
+class cEITScanner {
+private:
+  enum { ActivityTimeout = 60,
+         ScanTimeout = 20
+       };
+  time_t lastScan, lastActivity;
+  int currentChannel, lastChannel;
+  int numTransponders, *transponders;
+  bool TransponderScanned(cChannel *Channel);
+public:
+  cEITScanner(void);
+  ~cEITScanner();
+  bool Active(void) { return currentChannel; }
+  void Activity(void);
+  void Process(void);
+  };
+
+#endif //__EITSCAN_H
diff --git a/epg2html.pl b/epg2html.pl
index cdeb63841..6b7b8c942 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.3 2002/02/26 22:10:47 kls Exp $
+# $Id: epg2html.pl 1.4 2002/05/30 09:46:46 kls Exp $
 
 @Index = ();
 
@@ -45,7 +45,7 @@ sub Tags
          push(@Index, qq{<a href="$Page">$Channel</a><br>\n});
          my %Events = ();
          while (<>) {
-               if (/^E (.*?) (.*?) (.*?)/) {
+               if (/^E (.*?) (.*?) ([^ ]*)/) {
                   (my $Time, $Duration) = ($2, $3);
                   my $Title = "", $Subtitle = "", $Description = "";
                   while (<>) {
diff --git a/i18n.c b/i18n.c
index 664b8ecd8..84164a30b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.89 2002/05/13 16:30:00 kls Exp $
+ * $Id: i18n.c 1.91 2002/06/10 16:16:08 kls Exp $
  *
  * Translations provided by:
  *
@@ -18,6 +18,8 @@
  * Polish      Michael Rakowski <mrak@gmx.de>
  * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
+ * Swedish     Tomas Prybil <tomas@prybil.se>
+ * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
  *
  */
 
@@ -79,6 +81,8 @@ const tI18nPhrase Phrases[] = {
     "Polski",
     "Espa�ol",
     "Ellinika",
+    "Svenska",
+    "Romaneste",
   },
   // Menu titles:
   { "VDR",
@@ -93,6 +97,8 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -106,6 +112,8 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Programa",
     "Programma",
+    "Program",
+    "Program",
   },
   { "Channels",
     "Kan�le",
@@ -119,6 +127,8 @@ const tI18nPhrase Phrases[] = {
     "Kanaly",
     "Canales",
     "Kanalia",
+    "Kanaler",
+    "Canale",
   },
   { "Timers",
     "Timer",
@@ -132,6 +142,8 @@ const tI18nPhrase Phrases[] = {
     "Timery",
     "Timer",
     "Programmatismos",
+    "Timers",
+    "Timere",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -145,6 +157,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrania",
     "Grabaciones",
     "Egrafes",
+    "Inspelningar",
+    "Inregistrari",
   },
   { "Setup",
     "Einstellungen",
@@ -158,6 +172,8 @@ const tI18nPhrase Phrases[] = {
     "Nastawy",
     "Configuraci�n",
     "Rithmisis",
+    "Inst�llningar",
+    "Setari",
   },
   { "Commands",
     "Befehle",
@@ -171,6 +187,8 @@ const tI18nPhrase Phrases[] = {
     "Rozkazy",
     "�rdenes",
     "Entoles",
+    "Kommandon",
+    "Comenzi",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -184,6 +202,8 @@ const tI18nPhrase Phrases[] = {
     "Ustawienie kanalu",
     "Modificar canal",
     "Prosarmoges kanaliou",
+    "�ndra kanal",
+    "Editare canale",
   },
   { "Edit timer",
     "Timer editieren",
@@ -197,6 +217,8 @@ const tI18nPhrase Phrases[] = {
     "Ustawienie timerow",
     "Modificar timer",
     "Prosarmoges programmatismou",
+    "�ndra timer",
+    "Editare timere",
   },
   { "Event",
     "Sendung",
@@ -210,6 +232,8 @@ const tI18nPhrase Phrases[] = {
     "Audycja",
     "Evento",
     "Ekpompi",
+    "S�ndning",
+    "Evenimente",
   },
   { "Summary",
     "Inhalt",
@@ -223,6 +247,8 @@ const tI18nPhrase Phrases[] = {
     "Zawartosc",
     "Res�men",
     "Periexomeno",
+    "Sammandrag",
+    "Cuprins",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -236,6 +262,8 @@ const tI18nPhrase Phrases[] = {
     "Program - %s",
     "Programa - %s",
     "Programma - %s",
+    "Program - %s",
+    "Program - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -249,6 +277,8 @@ const tI18nPhrase Phrases[] = {
     "Program biezacy",
     "�Qu� hay ahora?",
     "Ti pezi tora",
+    "Vilket program s�nds nu?",
+    "Programul actual?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -262,6 +292,8 @@ const tI18nPhrase Phrases[] = {
     "Program nastepny",
     "�Qu� hay proximo?",
     "Ti tha peksi meta",
+    "Vilket �r n�sta program?",
+    "Programul urmator?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -276,6 +308,8 @@ const tI18nPhrase Phrases[] = {
     "Edycja",
     "Modificar",
     "Prosarmogi",
+    "�ndra",
+    "Modificare",
   },
   { "New",
     "Neu",
@@ -289,6 +323,8 @@ const tI18nPhrase Phrases[] = {
     "Nowy",
     "Nuevo",
     "Neo",
+    "Ny",
+    "Nou",
   },
   { "Delete",
     "L�schen",
@@ -302,6 +338,8 @@ const tI18nPhrase Phrases[] = {
     "Usunac",
     "Borrar",
     "Swisimo",
+    "Ta bort",
+    "Sterge",
   },
   { "Mark",
     "Markieren",
@@ -315,6 +353,8 @@ const tI18nPhrase Phrases[] = {
     "Zaznaczyc",
     "Marcar",
     "Markarisma",
+    "M�rk",
+    "Marcheaza",
   },
   { "On/Off",
     "Ein/Aus",
@@ -328,6 +368,8 @@ const tI18nPhrase Phrases[] = {
     "Zal./ Wyl.",
     "On/Off",
     "Energo/Klisto",
+    "P�/Av",
+    "Pornit/Oprit",
   },
   { "Record",
     "Aufnehmen",
@@ -341,6 +383,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrywac",
     "Grabar",
     "Egrafi",
+    "Inspelning",
+    "Inregistrare",
   },
   { "Play",
     "Wiedergabe",
@@ -354,6 +398,8 @@ const tI18nPhrase Phrases[] = {
     "Odtwarzac",
     "Play",
     "Anametadosi",
+    "Spela upp",
+    "Redare",
   },
   { "Rewind",
     "Anfang",
@@ -367,6 +413,8 @@ const tI18nPhrase Phrases[] = {
     "Poczatek",
     "Rebobinar",
     "Arxi",
+    "�terspolning",
+    "Inapoi",
   },
   { "Button$Stop",
     "Beenden",
@@ -380,6 +428,8 @@ const tI18nPhrase Phrases[] = {
     "Zakonczyc",
     "Parar",
     "Terma",
+    "Stopp",
+    "Stop",
   },
   { "Resume",
     "Weiter",
@@ -393,6 +443,8 @@ const tI18nPhrase Phrases[] = {
     "Dalej",
     "Continuar",
     "Sinexia",
+    "Forts�tt",
+    "Reia",
   },
   { "Summary",
     "Inhalt",
@@ -406,6 +458,8 @@ const tI18nPhrase Phrases[] = {
     "Zawartosc",
     "Resumen",
     "Periexomeno",
+    "Sammandrag",
+    "Cuprins",
   },
   { "Open",
     "�ffnen",
@@ -419,6 +473,8 @@ const tI18nPhrase Phrases[] = {
     "Otworzyc",
     "Abrir",
     "Anigma",
+    "�ppna",
+    "Deschide",
   },
   { "Switch",
     "Umschalten",
@@ -432,6 +488,8 @@ const tI18nPhrase Phrases[] = {
     "Przelaczyc",
     "Cambiar",
     "Alagi",
+    "Byt",
+    "Schimba",
   },
   { "Now",
     "Jetzt",
@@ -445,6 +503,8 @@ const tI18nPhrase Phrases[] = {
     "Teraz",
     "Ahora",
     "Tora",
+    "Nu",
+    "Acum",
   },
   { "Next",
     "N�chste",
@@ -458,6 +518,8 @@ const tI18nPhrase Phrases[] = {
     "Nastepny",
     "Siguiente",
     "Epomeno",
+    "N�sta",
+    "Urmator",
   },
   { "Button$Schedule",
     "Programm",
@@ -471,6 +533,8 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Programa",
     "Programma",
+    "Program",
+    "Program",
   },
   { "Language",
     "Sprache",
@@ -484,6 +548,8 @@ const tI18nPhrase Phrases[] = {
     "Jezyk",
     "Lengua",
     "Glosa",
+    "Spr�k",
+    "Limba",
   },
   { "Eject",
     "Auswerfen",
@@ -497,6 +563,8 @@ const tI18nPhrase Phrases[] = {
     "Wyrzucenie",
     "Eyectar",
     "Apovoli",
+    "Mata ut",
+    "Ejecteaza",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -510,6 +578,8 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
+    "ABC/abc",
+    "ABC/abc",
   },
   { "Insert",
     "Einf�gen",
@@ -523,6 +593,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Isodos",
+    "Infoga",
+    "Insereaza",
   },
   { "Overwrite",
     "�berschreiben",
@@ -536,6 +608,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Epanagrafi",
+    "Skriv �ver",
+    "Suprascrie",
   },
   // Confirmations:
   { "Delete channel?",
@@ -550,6 +624,8 @@ const tI18nPhrase Phrases[] = {
     "Usunac kanal?",
     "�Eliminar canal?",
     "Na sviso to kanali?",
+    "Ta bort kanalen?",
+    "Sterg canalul?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -563,6 +639,8 @@ const tI18nPhrase Phrases[] = {
     "Usunac timer?",
     "�Eliminar timer?",
     "Svisimo tou programmitismou?",
+    "Ta bort timern?",
+    "Sterg timer-ul?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -576,6 +654,8 @@ const tI18nPhrase Phrases[] = {
     "Usunac nagranie?",
     "�Eliminar grabacion?",
     "Svisimo tis egrafis?",
+    "Ta bort inspelningen?",
+    "Sterg inregistrarea?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -589,6 +669,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
     "Ginete akoma programmatismeni egrafi - na svisti sigoura?",
+    "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
+    "Timer-ul in inregistrare - sterg?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -602,6 +684,8 @@ const tI18nPhrase Phrases[] = {
     "Zakonczyc nagranie?",
     "�Parar grabaci�n?",
     "Akirosi egrafis?",
+    "Stanna inspelning?",
+    "Opresc inregistrarea?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -615,6 +699,8 @@ const tI18nPhrase Phrases[] = {
     "na pierwszym interfejsie",
     "en interface primario",
     "stin protevon karta",
+    "fr�n det f�rsta enheten?",
+    "pe prima interfata",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -628,6 +714,8 @@ const tI18nPhrase Phrases[] = {
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
     "Akirosi alagon?",
+    "Avbryta editeringen?",
+    "Opresc editarea?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -641,6 +729,8 @@ const tI18nPhrase Phrases[] = {
     "Rzeczywiscie nowy start?",
     "�De verdad reiniciar?",
     "Na gini sigoura epanekinisi?",
+    "Vill du verkligen starta om?",
+    "Esti sigur de repornire?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -654,6 +744,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
     "�Grabando - reiniciar?",
     "Ginete egrafi - na gini epanekinisi sigoura?",
+    "Inspelning p�g�r, vill du starta om i alla fall?",
+    "In inregistrare - repornesc?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -667,6 +759,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrywanie w trakcie - mimo to wylaczyc?",
     "�Grabando - apagar?",
     "Ginete egrafi - na stamatisi i litourgia sigoura?",
+    "Inspelning p�g�r, vill du avbryta i alla fall?",
+    "In inregistrare - opresc?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -680,6 +774,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrywanie za %d minut - mimo to wylaczyc?",
     "�Grabando en %d minutos, de verdad cortar?",
     "Anamenete egrafi se %d lepta - na stamatisi i litourgia sigoura?",
+    "Inspelning startar om %d minuter, vill du avsluta?",
+    "Inregistrez in %d minute, opresc?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -693,6 +789,8 @@ const tI18nPhrase Phrases[] = {
     "Dowolny przycisk zatrzyma wylaczanie",
     "Pulse una tecla para interrumpir corte",
     "Piese ena pliktro na stamatisi to katevasma",
+    "Tryck valfri knapp f�r att avbryta nedst�ngning",
+    "Apasa orice tasta pentru a anula inchiderea",
   },
   // Channel parameters:
   { "Name",
@@ -707,6 +805,8 @@ const tI18nPhrase Phrases[] = {
     "Nazwa",
     "Nombre",
     "Onoma",
+    "Namn",
+    "Nume",
   },
   { "Frequency",
     "Frequenz",
@@ -720,6 +820,8 @@ const tI18nPhrase Phrases[] = {
     "Czestotliwosc",
     "Frecuencia",
     "Sixnotita",
+    "Frekvens",
+    "Frecventa",
   },
   { "Polarization",
     "Polarisation",
@@ -733,6 +835,8 @@ const tI18nPhrase Phrases[] = {
     "Polaryzacja",
     "Polarizaci�n",
     "Polosi",
+    "Polarisation",
+    "Polarizare",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -746,6 +850,8 @@ const tI18nPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -759,6 +865,8 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Srate",
+    "Srate",
+    "Rata simboluri",
   },
   { "Vpid",
     "Vpid",
@@ -772,6 +880,8 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "Vpid",
+    "Vpid",
+    "PID Video",
   },
   { "Apid1",
     "Apid1",
@@ -785,6 +895,8 @@ const tI18nPhrase Phrases[] = {
     "Apid1",
     "Apid1",
     "Apid1",
+    "Apid1",
+    "PID Audio (1)",
   },
   { "Apid2",
     "Apid2",
@@ -798,6 +910,8 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "Apid2",
+    "Apid2",
+    "PID Audio (2)",
   },
   { "Dpid1",
     "Dpid1",
@@ -811,6 +925,8 @@ const tI18nPhrase Phrases[] = {
     "Dpid1",
     "Dpid1",
     "Dpid1",
+    "Dpid1",
+    "PID AC3 (1)",
   },
   { "Dpid2",
     "Dpid2",
@@ -824,6 +940,8 @@ const tI18nPhrase Phrases[] = {
     "Dpid2",
     "Dpid2",
     "Dpid2",
+    "Dpid2",
+    "PID AC3 (2)",
   },
   { "Tpid",
     "Tpid",
@@ -837,6 +955,8 @@ const tI18nPhrase Phrases[] = {
     "Tpid",
     "Tpid",
     "Tpid",
+    "Tpid",
+    "PID Teletext",
   },
   { "CA",
     "CA",
@@ -850,6 +970,8 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "CA",
     "CA",
+    "CA",
+    "Criptare",
   },
   { "Pnr",
     "Pnr",
@@ -863,6 +985,8 @@ const tI18nPhrase Phrases[] = {
     "Pnr",
     "Pnr",
     "Pnr",
+    "Pnr",
+    "Nr. Prog.",
   },
   // Timer parameters:
   { "Active",
@@ -877,6 +1001,8 @@ const tI18nPhrase Phrases[] = {
     "Aktywny",
     "Activo",
     "Energo",
+    "Aktiv",
+    "Activ",
   },
   { "Channel",
     "Kanal",
@@ -890,6 +1016,8 @@ const tI18nPhrase Phrases[] = {
     "Kanal",
     "Canal",
     "Kanali",
+    "Kanal",
+    "Canal",
   },
   { "Day",
     "Tag",
@@ -903,6 +1031,8 @@ const tI18nPhrase Phrases[] = {
     "Dzien",
     "D�a",
     "Imera",
+    "Dag",
+    "Ziua",
   },
   { "Start",
     "Anfang",
@@ -916,6 +1046,8 @@ const tI18nPhrase Phrases[] = {
     "Poczatek",
     "Comienzo",
     "Arxi",
+    "B�rjar",
+    "Start",
   },
   { "Stop",
     "Ende",
@@ -929,6 +1061,8 @@ const tI18nPhrase Phrases[] = {
     "Koniec",
     "Fin",
     "Telos",
+    "Slutar",
+    "Stop",
   },
   { "Priority",
     "Priorit�t",
@@ -942,6 +1076,8 @@ const tI18nPhrase Phrases[] = {
     "Priorytet",
     "Prioridad",
     "Protereotita",
+    "Prioritet",
+    "Prioritate",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -955,6 +1091,8 @@ const tI18nPhrase Phrases[] = {
     "Trwalosc dni",
     "Durabilidad",
     "Xronos Zois",
+    "Speltid",
+    "Durata",
   },
   { "File",
     "Datei",
@@ -968,6 +1106,8 @@ const tI18nPhrase Phrases[] = {
     "Plik",
     "Fichero",
     "Arxeio",
+    "Filnamn",
+    "Fisier",
   },
   { "First day",
     "Erster Tag",
@@ -981,6 +1121,8 @@ const tI18nPhrase Phrases[] = {
     "Pierwszy dzien",
     "Primer d�a",
     "Proti mera",
+    "F�rsta dag",
+    "Prima zi",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -995,6 +1137,8 @@ const tI18nPhrase Phrases[] = {
     "Kanal jest zajety przez timer nagran",
     "�Canal est� ocupado por un timer!",
     "To kanali xrisimopiite apo programmatismeni thesi",
+    "Kanalen anv�nds av en timer!",
+    "Canalul este utilizat de un timer!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1008,6 +1152,8 @@ const tI18nPhrase Phrases[] = {
     "Kanal nie moze byc teraz przelaczony!",
     "�No puedo cambiar canal!",
     "Den mporo na pao sto kanali!",
+    "Om�jligt att byta kanal!",
+    "Nu pot comuta canalul!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1021,6 +1167,8 @@ const tI18nPhrase Phrases[] = {
     "Timer nagrywa!",
     "�Timer esta grabando!",
     "Ginete progrmamatismeni egrafi!",
+    "Timerstyrd inspelning p�g�r!",
+    "Timer-ul este in inregistrare!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1034,6 +1182,8 @@ const tI18nPhrase Phrases[] = {
     "Blad - brak dostepu do nagrania!",
     "�Error al accesar la grabaci�n!",
     "Lathos stin evresi tis egrafis!",
+    "Det g�r inte att l�sa inspelningen",
+    "Eroare in timpul accesarii inregistrarii",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1047,6 +1197,8 @@ const tI18nPhrase Phrases[] = {
     "Blad przy usuwaniu nagrania!",
     "�Error al borrar la grabaci�n!",
     "Lathos stin prospathia na svisti i egrafi!",
+    "Det g�r inte att ta bort inspelningen",
+    "Eroare in timpul stergerii inregistrarii!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1060,6 +1212,8 @@ const tI18nPhrase Phrases[] = {
     "*** Niewazny kanal ***",
     "*** Canal inv�lido ***",
     "*** Kanali akiro ***",
+    "*** Felaktig kanal ***",
+    "*** Canal invalid ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1073,6 +1227,8 @@ const tI18nPhrase Phrases[] = {
     "Brak wolnej karty DVB do nagrywania!",
     "�No hay dispositivo DVB disponible para grabar!",
     "Den iparxi elevteri DVB Karta gia egrafi!",
+    "Det finns ingen ledig DVB enhet f�r inspelning!",
+    "Nu mai sunt dispozitive DVB pentru inregistrare!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -1086,6 +1242,8 @@ const tI18nPhrase Phrases[] = {
     "Kanal zablokowany (nagrywanie w toku)!",
     "�Canal bloqueado (grabando)!",
     "To kanali ine mplokarismeno (Ginete egrafi)!",
+    "Kanalen �r l�st (inspelning p�g�r)!",
+    "Canal blocat (inregistrare)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -1099,6 +1257,8 @@ const tI18nPhrase Phrases[] = {
     "Tryb transferowy jest niemozliwy!",
     "�No puedo iniciar modo de transferencia!",
     "Den mpori na arxisi to Transfer-Mode!",
+    "Kan inte starta Transfer Mode!",
+    "Nu pot porni Modul de Transfer!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -1112,6 +1272,8 @@ const tI18nPhrase Phrases[] = {
     "Uruchamianie montazu jest niemozliwe!",
     "�No puedo iniciar proceso de modificaci�n!",
     "Den mpori na arxisi to kopsimo tis tenias!",
+    "Kan inte starta editering!",
+    "Nu pot porni procesul de editare!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1125,6 +1287,8 @@ const tI18nPhrase Phrases[] = {
     "Montaz w toku!",
     "�Proceso de modificaci�n ya fue iniciado!",
     "To kopsimo ti tenias ini idi se litourgia!",
+    "Editering �r redan aktiv!",
+    "Procesul de editare este activ!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -1138,6 +1302,8 @@ const tI18nPhrase Phrases[] = {
     "Wylaczenie niemozliwe - brak opcji '-s'!",
     "�No puedo cortar - opci�n '-s' absente!",
     "Den mporo na kliso ton ipologisti. Lipi i parametros '-s'!",
+    "Kan inte avsluta, m�ste anv�nda flagga '-s'",
+    "Nu pot opri calculatorul - vezi optiunea '-s'",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1151,6 +1317,8 @@ const tI18nPhrase Phrases[] = {
     "Dysk wkrotce pelny!",
     "�Disco casi lleno",
     "O Skliros kontevi na gemisi!",
+    "L�gt diskutrymme!",
+    "Spatiu scazut pe disc!",
   },
   // Setup pages:
   { "OSD",
@@ -1165,6 +1333,8 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "OSD",
     "OSD",
+    "OSD",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -1178,6 +1348,8 @@ const tI18nPhrase Phrases[] = {
     "EPG",
     "EPG",
     "EPG",
+    "Elektronisk programguide",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -1191,6 +1363,8 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "DVB",
     "DVB",
+    "DVB",
+    "Placa DVB",
   },
   { "LNB",
     "LNB",
@@ -1204,6 +1378,8 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -1217,6 +1393,8 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "CICAM",
     "CICAM",
+    "CICAM",
+    "Acces conditionat",
   },
   { "Recording",
     "Aufnahme",
@@ -1230,6 +1408,8 @@ const tI18nPhrase Phrases[] = {
     "Nagranie",
     "Grabaci�n",
     "Egrafi",
+    "Inspelning",
+    "Inregistrare",
   },
   { "Replay",
     "Wiedergabe",
@@ -1243,6 +1423,8 @@ const tI18nPhrase Phrases[] = {
     "Odtwarzanie",
     "Poner",
     "Anametadosi",
+    "Repris",
+    "Redare",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -1256,6 +1438,8 @@ const tI18nPhrase Phrases[] = {
     "Pozostale",
     "Varios",
     "Diafora",
+    "Diverse",
+    "Diverse",
   },
   { "Plugins",
     "Plugins",
@@ -1295,6 +1479,8 @@ const tI18nPhrase Phrases[] = {
     "Zastartowac",
     "Reiniciar",
     "Epanekinisi",
+    "Omstart",
+    "Restart",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -1309,6 +1495,8 @@ const tI18nPhrase Phrases[] = {
     "Jezyk",
     "Lengua",
     "Glosa",
+    "Spr�k",
+    "Limba OSD",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -1322,6 +1510,8 @@ const tI18nPhrase Phrases[] = {
     "Szerokosc",
     "Anchura",
     "Makros",
+    "Bredd",
+    "Latime OSD",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -1335,6 +1525,8 @@ const tI18nPhrase Phrases[] = {
     "Wysokosc",
     "Altura",
     "Ipsos",
+    "H�jd",
+    "Inaltime OSD",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -1348,6 +1540,8 @@ const tI18nPhrase Phrases[] = {
     "Czas wyswietlania wiadomosci (s)",
     "Duraci�n muestra mensajes (s)",
     "Xronos endiksis minimaton (d)",
+    "Tid f�r meddelanden (sek)",
+    "Timp afisare mesaj (sec)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -1361,6 +1555,8 @@ const tI18nPhrase Phrases[] = {
     "Lokalizacja informacji o kanale",
     "Posici�n para informaci�n canal",
     "Thesi Pliroforias kanalion",
+    "Placering av kanalinformation",
+    "Pozitie info canal",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -1374,6 +1570,8 @@ const tI18nPhrase Phrases[] = {
     "Informacja przy zmianie kanalu",
     "Informaci�n para cambio de canal",
     "Plirofories stin alagi kanaliou",
+    "Information vid kanalbyte",
+    "Info despre comutare canal",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -1387,6 +1585,8 @@ const tI18nPhrase Phrases[] = {
     "Przesuwac stronami",
     "Desplazar p�gina entera",
     "Scroll selidas",
+    "Bl�ddra sidor",
+    "Deruleaza pagini",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -1400,6 +1600,8 @@ const tI18nPhrase Phrases[] = {
     "Sortowanie timerow",
     "Ordenar timer",
     "Organosi programmatismenon",
+    "Sortera timers",
+    "Sortare timere",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -1413,6 +1615,8 @@ const tI18nPhrase Phrases[] = {
     "Wykaz nagran",
     "Directorios para grabaci�n",
     "Fakeli egrafon",
+    "Kataloger f�r inspelningar",
+    "Directoare inregistrari",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -1426,6 +1630,8 @@ const tI18nPhrase Phrases[] = {
     "Czas do skanu EPG (h)",
     "Tiempo hasta exploraci�n EPG (h)",
     "Xronos mexri sarosi EPG se Ores",
+    "EPG s�kning timeout",
+    "Timeout EPG",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -1439,6 +1645,8 @@ const tI18nPhrase Phrases[] = {
     "Poziom bledow EPG",
     "Nivel para arreglar EPG",
     "EPG Bugfix Vathmos",
+    "Niv� f�r EPG bugfix",
+    "Nivel corectie EPG",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -1452,6 +1660,8 @@ const tI18nPhrase Phrases[] = {
     "Ustawianie czasu",
     "Ajustar reloj de sistema",
     "Sintonismos Oras ipologosti",
+    "St�ll in systemtid",
+    "Seteaza ceasul sistem",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -1465,6 +1675,8 @@ const tI18nPhrase Phrases[] = {
     "Transponder do ustawiania czasu",
     "Transponder para reloj de sistema",
     "Transponder gia sintonismo tis oras",
+    "Anv�nd klockan fr�n fransponder",
+    "Preia ceasul din transponder",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -1478,6 +1690,8 @@ const tI18nPhrase Phrases[] = {
     "Pierwotny interfejs DVB",
     "Primer interface DVB",
     "Protevon DVB karta",
+    "Prim�r DVB enhet",
+    "Placa DVB primara",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -1491,6 +1705,8 @@ const tI18nPhrase Phrases[] = {
     "Format telewizyjny",
     "Formato V�deo",
     "Video Format",
+    "Video format",
+    "Format Video",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -1504,6 +1720,8 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -1517,6 +1735,8 @@ const tI18nPhrase Phrases[] = {
     "Dolna czestotliwosc LNB (MHz)",
     "Frecuencia baja LNB (MHz)",
     "Kato LNB-Sixnotita (MHz)",
+    "Undre LNB frekvens (MHz)",
+    "Frecvnta LO LNB (Mhz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -1530,6 +1750,8 @@ const tI18nPhrase Phrases[] = {
     "Gorna czestotliwosc LNB (MHz)",
     "Frecuencia alta LNB (MHz)",
     "Ano LNB-Sixnotita (MHz)",
+    "�vre LNB frekvens (MHz)",
+    "Feecventa HI LNB (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -1543,6 +1765,8 @@ const tI18nPhrase Phrases[] = {
     "Uzywac DiSEqC",
     "Utilizar DiSEqC",
     "Energopiisi DiSEqC",
+    "Anv�nd DiSEqC",
+    "Utilizez DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -1556,6 +1780,8 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
+    "CICAM DVB",
+    "Setare acces conditional",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -1569,6 +1795,8 @@ const tI18nPhrase Phrases[] = {
     "Poczatkowy czas buforowy (min)",
     "Comenzar grabaci�n antes (min)",
     "Prosthetos xronos prin arxi (lepta)",
+    "Marginal f�r start (min)",
+    "Margine la pornire (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -1582,6 +1810,8 @@ const tI18nPhrase Phrases[] = {
     "Koncowy czas buforowy (min)",
     "Cortar grabaci�n despu�s (min)",
     "Prosthetos xronos sto telos (lepta)",
+    "Marginal f�r stopp (min)",
+    "Margine la oprire (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -1595,6 +1825,8 @@ const tI18nPhrase Phrases[] = {
     "Pierwotny limit",
     "L'mite primario",
     "Protevon limit",
+    "Prim�r gr�ns",
+    "Limita Primara",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -1608,6 +1840,8 @@ const tI18nPhrase Phrases[] = {
     "Priorytet pierwotny",
     "Prioridad predefinida",
     "Protereotita",
+    "Normal prioritet",
+    "Prioritate implicita",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -1621,6 +1855,8 @@ const tI18nPhrase Phrases[] = {
     "Pierwotna trwalosc (d)",
     "Duraci�n predefinida",
     "Xronos zois",
+    "Normal livstid",
+    "Durata predefinita",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -1634,6 +1870,8 @@ const tI18nPhrase Phrases[] = {
     "Czy uzywac nazwe epizodu",
     "Utilizar nombre de episodo",
     "Xrisimopiisi onomatos episodiou",
+    "Anv�nd episodnamn",
+    "Utilizeaza numele episodului",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -1647,6 +1885,8 @@ const tI18nPhrase Phrases[] = {
     "Zaznaczyc natychm. nagranie",
     "Marcar grabaciones instant�neas",
     "Markarisma apevthias egrafis",
+    "M�rk direktinspelning",
+    "Inregistrare imediata",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -1660,6 +1900,8 @@ const tI18nPhrase Phrases[] = {
     "Nazwac natychm. nagranie",
     "Nombrar grabaciones instant�neas",
     "eponomasi apevthias egrafis",
+    "Namnge direktinspelning",
+    "Nume inregistrare imediata",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -1673,6 +1915,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Direktinspelning l�ngd (min)",
+    "Timpul de inregistarea imediata (min)",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -1686,6 +1930,8 @@ const tI18nPhrase Phrases[] = {
     "Nagrywac Dolby Digital",
     "Grabar sonido Dolby Digital",
     "Egrafi tou Dolby Digital ixou",
+    "Spela in ljud med Dolby Digital",
+    "Inregistreaza Dolby Digital",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -1699,6 +1945,8 @@ const tI18nPhrase Phrases[] = {
     "Maks. wielkosc pliku (MB)",
     "Tama�o m�x. ficheros (MB)",
     "Megisto megethos arxeiou (MB)",
+    "Maximal filstorlek f�r inspelning (MB)",
+    "Dimensiune maxima a fisierului video (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -1712,6 +1960,8 @@ const tI18nPhrase Phrases[] = {
     "Dzielic montowane pliki",
     "Quebrar ficheros",
     "Diamelisma epeksergasm. arxeion",
+    "Dela upp editerade filer",
+    "Separare fisiere editate",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -1725,6 +1975,8 @@ const tI18nPhrase Phrases[] = {
     "Tryb wielopredkosciowy",
     "Modo multi-velocidad",
     "Multispeed modus",
+    "Multispeed mode",
+    "Mod multi-rata",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -1738,6 +1990,8 @@ const tI18nPhrase Phrases[] = {
     "Wyswietlac status odtwarzania",
     "Mostrar modo de replay",
     "Endiksi  status anametadosis",
+    "Visa uppspelnings mode",
+    "Afiseaza modul de redare",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -1751,6 +2005,8 @@ const tI18nPhrase Phrases[] = {
     "Min. czas do nast. akcji (Event) (min)",
     "Tiempo m�nimo pausa (min)",
     "Elaxistos Xronos paremvolis (lepta)",
+    "Minsta h�ndelse-pause (min)",
+    "MinEventTimeout (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -1764,6 +2020,8 @@ const tI18nPhrase Phrases[] = {
     "Min. brak aktywnosci uzytkownika (min)",
     "Tiempo m�nimo inactividad (min)",
     "Elaxistos xronos mi xrisis (lepta)",
+    "Minsta an�ndar-inaktivitet (min)",
+    "Durata minima de inactivitate (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -1777,6 +2035,8 @@ const tI18nPhrase Phrases[] = {
     "Min. brak aktywnosci SVDRP (s)",
     "SVDRP interrupci�n (s)",
     "SVDRP Timeout (d)",
+    "SVDRP Timeout (d)",
+    "Timeout SVDRP (sec)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -1791,6 +2051,8 @@ const tI18nPhrase Phrases[] = {
     "PWSCPSN",
     "LMMJVSD",
     "DTTPPSK",
+    "MTOTFLS",
+    "LMMJVSD",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -1804,6 +2066,8 @@ const tI18nPhrase Phrases[] = {
     "PonWtoSroCzwPiaSobNie",
     "LunMarMieJueVieSabDom",
     "DevTriTetPemParSavKir",
+    "M�nTisOnsTorFreL�rS�n",
+    "LunMarMieJoiVinSimDum",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -1818,6 +2082,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
     "",// TODO
+    " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
+    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -1832,6 +2098,8 @@ const tI18nPhrase Phrases[] = {
     "Nauka kodu pilota",
     "Aprendiendo teclas del telemando",
     "Ekmathisi Remote Control",
+    "Inl�rning av fj�rrkontrollsknappar",
+    "Invatare taste telecomanda",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -1845,6 +2113,8 @@ const tI18nPhrase Phrases[] = {
     "Faza 1: Detekcja typu kodu",
     "Fase 1: Detectando tipo de receptor",
     "Phasi 1: Dilosi RC Code",
+    "Steg1: identifiering av RC kod",
+    "Faza 1: Detectie tip telecomanda",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -1858,6 +2128,8 @@ const tI18nPhrase Phrases[] = {
     "Nacisnac klawisz pilota",
     "Pulse una tecla en el telemando",
     "Pata ena pliktro sto RC",
+    "Tryck valfri tangent p� fj�rrkontrollen",
+    "Apasati o tasta pe telecomanda",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -1871,6 +2143,8 @@ const tI18nPhrase Phrases[] = {
     "Kod pilota zostal poznany!",
     "�C�digo detectado!",
     "Evresi RC Code!",
+    "RC koden detekterad!",
+    "S-a detectat tipul telecomenzii!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -1884,6 +2158,8 @@ const tI18nPhrase Phrases[] = {
     "Nie naciskac klawiszy...",
     "No pulse tecla...",
     "Min patas Pliktra...",
+    "Tryck inte p� n�gon knapp...",
+    "Nu apasati nicio tasta...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -1897,6 +2173,8 @@ const tI18nPhrase Phrases[] = {
     "Faza 2: Nauka pojedynczych klawiszy",
     "Fase 2: Aprendiendo c�digos espec�ficos",
     "Fasi 2: Ekmathisi memonomenon kodikon pliktron",
+    "Fas 2: Inl�rning av specifika knapp koder",
+    "Faza 2: Invatarea codurilor specifice tastelor",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -1910,6 +2188,8 @@ const tI18nPhrase Phrases[] = {
     "Nacisnac klawisz dla '%s'",
     "Pulsar tecla para '%s'",
     "Pata to pliktro gia '%s'",
+    "Tryck p� knappen f�r '%s'",
+    "Apasati tasta pentru '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -1923,6 +2203,8 @@ const tI18nPhrase Phrases[] = {
     "Nacisnac 'Gora' do potwierdzenia",
     "Pulse 'Arriba' para confirmar",
     "Pata 'pano' gia apodoxi",
+    "Tryck 'Upp' f�r att bekr�fta",
+    "Apsati 'Sus' pentru confirmare",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -1936,6 +2218,8 @@ const tI18nPhrase Phrases[] = {
     "Nacisnac 'Dol' zeby kontynuowac",
     "Pulse 'Abajo' para confirmar",
     "Pata 'kato' gia sinexia",
+    "Tryck 'Ner' f�r att bekr�fta",
+    "Apasati jos pentru continuare",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -1949,6 +2233,8 @@ const tI18nPhrase Phrases[] = {
     "(Nacisnac 'Gora' cofa)",
     "(Pulse 'Arriba' para retornar)",
     "(Pata 'pano' gia na pas piso)",
+    "(Tryck 'Upp' f�r att backa)",
+    "(Apsati 'Sus' pentru revenire)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -1962,6 +2248,8 @@ const tI18nPhrase Phrases[] = {
     "(Nacisnac 'Dol' by zakonczyc)",
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
     "(Pata 'Kato' gia termatismo)",
+    "(Tryck 'Ner' f�r att avsluta knapp definition)",
+    "(Apasati 'Jos' pentru terminare)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -1975,6 +2263,8 @@ const tI18nPhrase Phrases[] = {
     "Faza 3: Zapamietac Kod",
     "Fase 3: Guardar c�digos de teclas",
     "Fasi 3: Apothikevsi kodikon",
+    "Fas 3: Spara knappkoder",
+    "Faza 3: Salvarea codurilor de taste",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -1988,6 +2278,8 @@ const tI18nPhrase Phrases[] = {
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guarder, 'Abajo' para anular",
     "'kato' apothikevsi, 'Pano' akirosi",
+    "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
+    "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
   },
   // Key names:
   { "Up",
@@ -2002,6 +2294,8 @@ const tI18nPhrase Phrases[] = {
     "Gora",
     "Arriba",
     "Pano",
+    "Upp",
+    "Sus",
   },
   { "Down",
     "Ab",
@@ -2015,6 +2309,8 @@ const tI18nPhrase Phrases[] = {
     "Dol",
     "Abajo",
     "Kato",
+    "Ner",
+    "Jos",
   },
   { "Menu",
     "Men�",
@@ -2028,6 +2324,8 @@ const tI18nPhrase Phrases[] = {
     "Menu",
     "Menu",
     "Menou",
+    "Meny",
+    "Meniu",
   },
   { "Ok",
     "Ok",
@@ -2041,6 +2339,8 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -2054,6 +2354,8 @@ const tI18nPhrase Phrases[] = {
     "Wstecz",
     "Retornar",
     "Piso",
+    "Tillbaka",
+    "Inapoi",
   },
   { "Left",
     "Links",
@@ -2067,6 +2369,8 @@ const tI18nPhrase Phrases[] = {
     "Lewo",
     "Izquierda",
     "Aristera",
+    "V�nster",
+    "Stinga",
   },
   { "Right",
     "Rechts",
@@ -2080,6 +2384,8 @@ const tI18nPhrase Phrases[] = {
     "Prawo",
     "Derecha",
     "Deksia",
+    "H�ger",
+    "Dreapta",
   },
   { "Red",
     "Rot",
@@ -2093,6 +2399,8 @@ const tI18nPhrase Phrases[] = {
     "Czerwony",
     "Rojo",
     "Kokino",
+    "R�d",
+    "Rosu",
   },
   { "Green",
     "Gr�n",
@@ -2106,6 +2414,8 @@ const tI18nPhrase Phrases[] = {
     "Zielony",
     "Verde",
     "Prasino",
+    "Gr�n",
+    "Verde",
   },
   { "Yellow",
     "Gelb",
@@ -2119,6 +2429,8 @@ const tI18nPhrase Phrases[] = {
     "Zolty",
     "Amarillo",
     "Kitrino",
+    "Gul",
+    "Galben",
   },
   { "Blue",
     "Blau",
@@ -2132,6 +2444,8 @@ const tI18nPhrase Phrases[] = {
     "Niebieski",
     "Azul",
     "Mple",
+    "Bl�",
+    "Albastru",
   },
   { "Power",
     "Ausschalten",
@@ -2145,6 +2459,8 @@ const tI18nPhrase Phrases[] = {
     "Wylaczyc",
     "Corriente",
     "Klisimo",
+    "P�/Av",
+    "Pornit",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -2158,6 +2474,8 @@ const tI18nPhrase Phrases[] = {
     "Glosnej",
     "Volumen+",
     "Entasi+",
+    "Volym+",
+    "Volum+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -2171,6 +2489,8 @@ const tI18nPhrase Phrases[] = {
     "Ciszej",
     "Volumen-",
     "Entasi-",
+    "Volym-",
+    "Volum-",
   },
   { "Mute",
     "Stumm",
@@ -2184,6 +2504,8 @@ const tI18nPhrase Phrases[] = {
     "Cisza",
     "Mudo",
     "Mougko",
+    "Ljud Av",
+    "Mut(e)",
   },
   // Miscellaneous:
   { "yes",
@@ -2198,6 +2520,8 @@ const tI18nPhrase Phrases[] = {
     "tak",
     "s�",
     "nai",
+    "ja",
+    "da",
   },
   { "no",
     "nein",
@@ -2211,6 +2535,8 @@ const tI18nPhrase Phrases[] = {
     "nie",
     "no",
     "oxi",
+    "nej",
+    "nu",
   },
   { "top",
     "oben",
@@ -2224,6 +2550,8 @@ const tI18nPhrase Phrases[] = {
     "gora",
     "parte sup.",
     "pano",
+    "�vre",
+    "sus",
   },
   { "bottom",
     "unten",
@@ -2237,6 +2565,8 @@ const tI18nPhrase Phrases[] = {
     "dol",
     "fondo",
     "kato",
+    "nedre",
+    "jos",
   },
   { "Disk",
     "Disk",
@@ -2250,6 +2580,8 @@ const tI18nPhrase Phrases[] = {
     "Disk",
     "Disco",
     "Disk",
+    "Disk",
+    "Disc",
   },
   { "free",
     "frei",
@@ -2263,6 +2595,8 @@ const tI18nPhrase Phrases[] = {
     "pozostalo",
     "libre",
     "akoma",
+    "ledigt",
+    "liber",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -2276,6 +2610,8 @@ const tI18nPhrase Phrases[] = {
     "Skok: ",
     "Saltar: ",
     "Pidima: ",
+    "Hopp: ",
+    "Salt: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -2289,6 +2625,8 @@ const tI18nPhrase Phrases[] = {
     "Glosnosc ",
     "Volumen ",
     "Entasi ",
+    "Volym ",
+    "Volum ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -2302,6 +2640,8 @@ const tI18nPhrase Phrases[] = {
     " Zatrzymac odtwarzanie",
     " Parar reproduci�n",
     " Telos anametadosis",
+    " Avsluta uppspelning",
+    " Opreste redare",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -2315,6 +2655,8 @@ const tI18nPhrase Phrases[] = {
     " Zatrzymac nagrywanie ",
     " Parar grabaci�n ",
     " Telos egrafis ",
+    " Avsluta inspelning ",
+    " Opreste inregistrarea ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -2328,6 +2670,8 @@ const tI18nPhrase Phrases[] = {
     " Przerwac montaz",
     " Anular modificaci�n",
     " Diakopi kopsimatos",
+    " Avbryt editering",
+    " Opreste editare",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -2341,6 +2685,8 @@ const tI18nPhrase Phrases[] = {
     "Pierwszy interfejs DVB przelacza...",
     "Cambio interface primario...",
     "I protevon DVB Karta alazi...",
+    "Byter prim�r DVB enhet...",
+    "Comuta interfata primara DVB...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -2354,6 +2700,8 @@ const tI18nPhrase Phrases[] = {
     "Gora/Dol na nowa pozycje - Ok zmienia",
     "Arriba/Abajo para nuevo lugar - OK para mover",
     "Pano/Kato gia nea thesi. meta OK",
+    "Upp/Ner f�r ny plats - OK f�r att flytta",
+    "Sus/Jos pentru noua locatie - OK pentru a muta",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -2367,6 +2715,8 @@ const tI18nPhrase Phrases[] = {
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
     "Arxi kopsimatos",
+    "Editering startad",
+    "Procesul de editare a inceput",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -2380,6 +2730,8 @@ const tI18nPhrase Phrases[] = {
     "Proces montazu zakonczony",
     "Proceso modificacion terminado",
     "To kopsimo termatistike",
+    "Editering avslutad",
+    "Procesul de editare s-a terminat",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -2393,6 +2745,8 @@ const tI18nPhrase Phrases[] = {
     "Bledny proces montazu!",
     "Modificaci�n ha fallado!",
     "Kopsimo apetixe!",
+    "Editeringsprocessen misslyckades",
+    "Proces de editare nereusit",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -2406,6 +2760,8 @@ const tI18nPhrase Phrases[] = {
     "Skan nagran...",
     "buscando grabaciones...",
     "Ginete sarosi egrafon...",
+    "S�ker igenom inspelningarna...",
+    "Caut inregistrari...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -2419,7 +2775,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-  },
+    "",// TODO
+   },
   { NULL }
   };
 
diff --git a/i18n.h b/i18n.h
index 68fe7364c..2b0ae50ed 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.2 2002/05/05 13:42:31 kls Exp $
+ * $Id: i18n.h 1.4 2002/06/10 16:14:02 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 12;
+const int I18nNumLanguages = 14;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/interface.c b/interface.c
index 0731f0d42..fa36b4cbf 100644
--- a/interface.c
+++ b/interface.c
@@ -4,13 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.48 2002/05/13 16:30:22 kls Exp $
+ * $Id: interface.c 1.52 2002/06/16 13:23:40 kls Exp $
  */
 
 #include "interface.h"
 #include <ctype.h>
 #include <unistd.h>
 #include "i18n.h"
+#include "osd.h"
+#include "status.h"
 
 cInterface *Interface = NULL;
 
@@ -50,7 +52,7 @@ void cInterface::Open(int NumCols, int NumLines)
         NumCols = Setup.OSDwidth;
      if (NumLines == 0)
         NumLines = Setup.OSDheight;
-     cDvbApi::PrimaryDvbApi->Open(width = NumCols, height = NumLines);
+     cOsd::Open(width = NumCols, height = NumLines);
      }
 }
 
@@ -59,7 +61,7 @@ void cInterface::Close(void)
   if (open == 1)
      Clear();
   if (!--open) {
-     cDvbApi::PrimaryDvbApi->Close();
+     cOsd::Close();
      width = height = 0;
      }
 }
@@ -125,31 +127,32 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
 void cInterface::Clear(void)
 {
   if (open)
-     cDvbApi::PrimaryDvbApi->Clear();
+     cOsd::Clear();
+  cStatus::MsgOsdClear();
 }
 
 void cInterface::ClearEol(int x, int y, eDvbColor Color)
 {
   if (open)
-     cDvbApi::PrimaryDvbApi->ClrEol(x, y, Color);
+     cOsd::ClrEol(x, y, Color);
 }
 
 void cInterface::Fill(int x, int y, int w, int h, eDvbColor Color)
 {
   if (open)
-     cDvbApi::PrimaryDvbApi->Fill(x, y, w, h, Color);
+     cOsd::Fill(x, y, w, h, Color);
 }
 
 void cInterface::SetBitmap(int x, int y, const cBitmap &Bitmap)
 {
   if (open)
-     cDvbApi::PrimaryDvbApi->SetBitmap(x, y, Bitmap);
+     cOsd::SetBitmap(x, y, Bitmap);
 }
 
 void cInterface::Flush(void)
 {
   if (open)
-     cDvbApi::PrimaryDvbApi->Flush();
+     cOsd::Flush();
 }
 
 void cInterface::SetCols(int *c)
@@ -163,7 +166,7 @@ void cInterface::SetCols(int *c)
 
 eDvbFont cInterface::SetFont(eDvbFont Font)
 {
-  return cDvbApi::PrimaryDvbApi->SetFont(Font);
+  return cOsd::SetFont(Font);
 }
 
 char *cInterface::WrapText(const char *Text, int Width, int *Height)
@@ -183,7 +186,7 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
   char *Delim = NULL;
   int w = 0;
 
-  Width *= cDvbApi::PrimaryDvbApi->CellWidth();
+  Width *= cOsd::CellWidth();
 
   while (*t && t[strlen(t) - 1] == '\n')
         t[strlen(t) - 1] = 0; // skips trailing newlines
@@ -198,7 +201,7 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
          }
       else if (isspace(*p))
          Blank = p;
-      int cw = cDvbApi::PrimaryDvbApi->Width(*p);
+      int cw = cOsd::Width(*p);
       if (w + cw > Width) {
          if (Blank) {
             *Blank = '\n';
@@ -237,7 +240,7 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
 void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
   if (open)
-     cDvbApi::PrimaryDvbApi->Text(x, y, s, FgColor, BgColor);
+     cOsd::Text(x, y, s, FgColor, BgColor);
 }
 
 void cInterface::WriteText(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
@@ -278,7 +281,7 @@ void cInterface::Title(const char *s)
      strn0cpy(buffer, s, n + 1);
      Write(1, 0, buffer, clrBlack, clrCyan);
      t++;
-     Write(-(cDvbApi::PrimaryDvbApi->WidthInCells(t) + 1), 0, t, clrBlack, clrCyan);
+     Write(-(cOsd::WidthInCells(t) + 1), 0, t, clrBlack, clrCyan);
      }
   else {
      int x = (Width() - strlen(s)) / 2;
@@ -286,6 +289,7 @@ void cInterface::Title(const char *s)
         x = 0;
      Write(x, 0, s, clrBlack, clrCyan);
      }
+  cStatus::MsgOsdTitle(s);
 }
 
 void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
@@ -298,6 +302,7 @@ void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
         x = 0;
      Write(x, Line, s, FgColor, BgColor);
      }
+  cStatus::MsgOsdStatusMessage(s);
 }
 
 void cInterface::Info(const char *s)
@@ -337,12 +342,12 @@ void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvb
 {
   if (open) {
      const int w = Width() / 4;
-     cDvbApi::PrimaryDvbApi->Fill(Index * w, -1, w, 1, Text ? BgColor : clrBackground);
+     cOsd::Fill(Index * w, -1, w, 1, Text ? BgColor : clrBackground);
      if (Text) {
         int l = (w - int(strlen(Text))) / 2;
         if (l < 0)
            l = 0;
-        cDvbApi::PrimaryDvbApi->Text(Index * w + l, -1, Text, FgColor, BgColor);
+        cOsd::Text(Index * w + l, -1, Text, FgColor, BgColor);
         }
      }
 }
@@ -353,6 +358,7 @@ void cInterface::Help(const char *Red, const char *Green, const char *Yellow, co
   HelpButton(1, Green,  clrBlack, clrGreen);
   HelpButton(2, Yellow, clrBlack, clrYellow);
   HelpButton(3, Blue,   clrWhite, clrBlue);
+  cStatus::MsgOsdHelpKeys(Red, Green, Yellow, Blue);
 }
 
 void cInterface::QueryKeys(void)
@@ -478,6 +484,6 @@ void cInterface::DisplayRecording(int Index, bool On)
 
 bool cInterface::Recording(void)
 {
-  // This is located here because the Interface has to do with the "PrimaryDvbApi" anyway
-  return cDvbApi::PrimaryDvbApi->Recording();
+  // This is located here because the Interface has to do with the "PrimaryDevice" anyway
+  return cDevice::PrimaryDevice()->Receiving();
 }
diff --git a/interface.h b/interface.h
index 914a38346..240db631f 100644
--- a/interface.h
+++ b/interface.h
@@ -4,14 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.25 2002/04/19 13:17:15 kls Exp $
+ * $Id: interface.h 1.26 2002/05/18 13:43:20 kls Exp $
  */
 
 #ifndef __INTERFACE_H
 #define __INTERFACE_H
 
 #include "config.h"
-#include "dvbapi.h"
+#include "osdbase.h"
 #include "remote.h"
 #include "svdrp.h"
 
diff --git a/menu.c b/menu.c
index e149a72d5..ff63fbcd3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.192 2002/05/13 16:30:50 kls Exp $
+ * $Id: menu.c 1.197 2002/06/16 13:23:51 kls Exp $
  */
 
 #include "menu.h"
@@ -18,12 +18,15 @@
 #include "i18n.h"
 #include "menuitems.h"
 #include "plugin.h"
+#include "recording.h"
+#include "status.h"
 #include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
 #define MAXWAIT4EPGINFO  10 // seconds
 #define MODETIMEOUT       3 // seconds
 
+#define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
 
 #define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
@@ -375,7 +378,7 @@ eOSState cMenuEditCaItem::ProcessKey(eKeys Key)
            }
         }
      else if (NORMALKEY(Key) == kRight) {
-        if (ca && ca->Next() && (allowCardNr || ((cCaDefinition *)ca->Next())->Number() > MAXDVBAPI)) {
+        if (ca && ca->Next() && (allowCardNr || ((cCaDefinition *)ca->Next())->Number() > MAXDEVICES)) {
            ca = (cCaDefinition *)ca->Next();
            *value = ca->Number();
            }
@@ -493,7 +496,7 @@ cMenuChannels::cMenuChannels(void)
   //TODO
   int i = 0;
   cChannel *channel;
-  int curr = ((channel = Channels.GetByNumber(cDvbApi::CurrentChannel())) != NULL) ? channel->Index() : -1;
+  int curr = ((channel = Channels.GetByNumber(cDevice::CurrentChannel())) != NULL) ? channel->Index() : -1;
 
   while ((channel = Channels.Get(i)) != NULL) {
         Add(new cMenuChannelItem(i, channel), i == curr);
@@ -1144,7 +1147,7 @@ cMenuSchedule::cMenuSchedule(void)
 {
   now = next = false;
   otherChannel = 0;
-  cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel) {
      cMenuWhatsOn::SetCurrentChannel(channel->number);
      schedules = cSIProcessor::Schedules(mutexLock);
@@ -1263,7 +1266,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
         cChannel *channel = Channels.GetByServiceID(ei->GetServiceID());
         if (channel) {
            PrepareSchedule(channel);
-           if (channel->number != cDvbApi::CurrentChannel()) {
+           if (channel->number != cDevice::CurrentChannel()) {
               otherChannel = channel->number;
               SetHelp(tr("Record"), tr("Now"), tr("Next"), tr("Switch"));
               }
@@ -1440,7 +1443,7 @@ eOSState cMenuRecordings::Rewind(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
-     cDvbApi::PrimaryDvbApi->StopReplay(); // must do this first to be able to rewind the currently replayed recording
+     cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
      cResumeFile ResumeFile(ri->FileName());
      ResumeFile.Delete();
      return Play();
@@ -1613,7 +1616,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
 cMenuSetupDVB::cMenuSetupDVB(void)
 {
   SetSection(tr("DVB"));
-  Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
+  Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
 }
 
@@ -1625,7 +1628,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
   if (state == osBack && Key == kOk) {
      if (Setup.PrimaryDVB != oldPrimaryDVB) {
         state = osSwitchDvb;
-        cDvbApi::PrimaryDvbApi->SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+        cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
         }
      }
   return state;
@@ -1658,7 +1661,7 @@ class cMenuSetupCICAM : public cMenuSetupBase {
 cMenuSetupCICAM::cMenuSetupCICAM(void)
 {
   SetSection(tr("CICAM"));
-  for (int d = 0; d < cDvbApi::NumDvbApis; d++) {
+  for (int d = 0; d < cDevice::NumDevices(); d++) {
       for (int i = 0; i < 2; i++) {
           char buffer[32];
           snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), d + 1, i + 1);
@@ -1672,7 +1675,7 @@ eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (state == osBack && Key == kOk)
-     cDvbApi::SetCaCaps();
+     cDevice::SetCaCaps();
   return state;
 }
 
@@ -2023,12 +2026,14 @@ void cMenuMain::Set(void)
 
   // Editing control:
 
+  /*XXX+
   if (cVideoCutter::Active())
      Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
+     XXX*/
 
   // Color buttons:
 
-  SetHelp(tr("Record"), cDvbApi::PrimaryDvbApi->CanToggleAudioTrack() ? tr("Language") : NULL, NULL, replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(tr("Record"), /*XXX+ cDevice::PrimaryDevice()->CanToggleAudioTrack() ? tr("Language") :XXX*/ NULL, NULL, replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -2058,7 +2063,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                           }
                        break;
     case osCancelEdit: if (Interface->Confirm(tr("Cancel editing?"))) {
-                          cVideoCutter::Stop();
+                          //XXX+cVideoCutter::Stop();
                           return osEnd;
                           }
                        break;
@@ -2081,11 +2086,13 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 state = osRecord;
                              break;
                case kGreen:  if (!HasSubMenu()) {
-                                if (cDvbApi::PrimaryDvbApi->CanToggleAudioTrack()) {
+                                /*XXX+
+                                if (cDevice::PrimaryDevice()->CanToggleAudioTrack()) {
                                    Interface->Clear();
-                                   cDvbApi::PrimaryDvbApi->ToggleAudioTrack();
+                                   cDevice::PrimaryDevice()->ToggleAudioTrack();
                                    state = osEnd;
                                    }
+                                   XXX*/
                                 }
                              break;
                case kBlue:   if (!HasSubMenu())
@@ -2113,7 +2120,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 #define INFOTIMEOUT          5000 //ms
 
 cDisplayChannel::cDisplayChannel(int Number, bool Switched)
-:cOsdBase(true)
+:cOsdObject(true)
 {
   group = -1;
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
@@ -2130,10 +2137,10 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 }
 
 cDisplayChannel::cDisplayChannel(eKeys FirstKey)
-:cOsdBase(true)
+:cOsdObject(true)
 {
   group = -1;
-  oldNumber = cDvbApi::CurrentChannel();
+  oldNumber = cDevice::CurrentChannel();
   number = 0;
   lastTime = time_ms();
   int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
@@ -2162,6 +2169,7 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
   Interface->Write(0, 0, buffer);
   const char *date = DayDateTime();
   Interface->Write(-strlen(date), 0, date);
+  cStatus::MsgOsdChannel(buffer);
 }
 
 void cDisplayChannel::DisplayInfo(void)
@@ -2215,6 +2223,7 @@ void cDisplayChannel::DisplayInfo(void)
               Interface->Flush();
               lines = Lines;
               lastTime = time_ms();
+              cStatus::MsgOsdProgramme(Present ? Present->GetTime() : 0, PresentTitle, PresentSubtitle, Following ? Following->GetTime() : 0, FollowingTitle, FollowingSubtitle);
               }
            }
         }
@@ -2250,7 +2259,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kRight:
          withInfo = false;
          if (group < 0) {
-            cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
+            cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
             if (channel)
                group = channel->Index();
             }
@@ -2322,10 +2331,10 @@ cVolumeBar::cVolumeBar(int Width, int Height, int Current, int Total, const char
 cDisplayVolume *cDisplayVolume::displayVolume = NULL;
 
 cDisplayVolume::cDisplayVolume(void)
-:cOsdBase(true)
+:cOsdObject(true)
 {
   displayVolume = this;
-  timeout = time_ms() + (cDvbApi::PrimaryDvbApi->IsMute() ? MUTETIMEOUT : VOLUMETIMEOUT);
+  timeout = time_ms() + (cDevice::PrimaryDevice()->IsMute() ? MUTETIMEOUT : VOLUMETIMEOUT);
   Interface->Open(Setup.OSDwidth, -1);
   Show();
 }
@@ -2338,13 +2347,13 @@ cDisplayVolume::~cDisplayVolume()
 
 void cDisplayVolume::Show(void)
 {
-  cDvbApi *dvbApi = cDvbApi::PrimaryDvbApi;
-  if (dvbApi->IsMute()) {
+  cDevice *device = cDevice::PrimaryDevice();
+  if (device->IsMute()) {
      Interface->Fill(0, 0, Width(), 1, clrTransparent);
      Interface->Write(0, 0, tr("Mute"), clrGreen);
      }
   else {
-     int Current = cDvbApi::CurrentVolume();
+     int Current = cDevice::CurrentVolume();
      int Total = MAXVOLUME;
      const char *Prompt = tr("Volume ");
 #ifdef DEBUG_OSD
@@ -2354,7 +2363,7 @@ void cDisplayVolume::Show(void)
      Interface->Fill(l, 0, p, 1, clrGreen);
      Interface->Fill(l + p, 0, Width() - l - p, 1, clrWhite);
 #else
-     cVolumeBar VolumeBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, Prompt);
+     cVolumeBar VolumeBar(Width() * cOsd::CellWidth(), cOsd::LineHeight(), Current, Total, Prompt);
      Interface->SetBitmap(0, 0, VolumeBar);
 #endif
      }
@@ -2384,7 +2393,7 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
          timeout = time_ms() + VOLUMETIMEOUT;
          break;
     case kMute:
-         if (cDvbApi::PrimaryDvbApi->IsMute()) {
+         if (cDevice::PrimaryDevice()->IsMute()) {
             Show();
             timeout = time_ms() + MUTETIMEOUT;
             }
@@ -2402,41 +2411,45 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
 
 // --- cRecordControl --------------------------------------------------------
 
-cRecordControl::cRecordControl(cDvbApi *DvbApi, cTimer *Timer)
+cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
 {
   eventInfo = NULL;
   instantId = NULL;
   fileName = NULL;
-  dvbApi = DvbApi;
-  if (!dvbApi) dvbApi = cDvbApi::PrimaryDvbApi;//XXX
+  recorder = NULL;
+  device = Device;
+  if (!device) device = cDevice::PrimaryDevice();//XXX
   timer = Timer;
   if (!timer) {
      timer = new cTimer(true);
      Timers.Add(timer);
      Timers.Save();
-     asprintf(&instantId, cDvbApi::NumDvbApis > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), dvbApi->CardIndex() + 1);
+     asprintf(&instantId, cDevice::NumDevices() > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), device->CardIndex() + 1);
      }
   timer->SetPending(true);
   timer->SetRecording(true);
-  if (Channels.SwitchTo(timer->channel, dvbApi)) {
-     const char *Title = NULL;
-     const char *Subtitle = NULL;
-     const char *Summary = NULL;
-     if (GetEventInfo()) {
-        Title = eventInfo->GetTitle();
-        Subtitle = eventInfo->GetSubtitle();
-        Summary = eventInfo->GetExtendedDescription();
-        dsyslog("Title: '%s' Subtitle: '%s'", Title, Subtitle);
-        }
-     cRecording Recording(timer, Title, Subtitle, Summary);
-     fileName = strdup(Recording.FileName());
-     cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
-     if (dvbApi->StartRecord(fileName, Channels.GetByNumber(timer->channel)->ca, timer->priority))
-        Recording.WriteSummary();
-     Interface->DisplayRecording(dvbApi->CardIndex(), true);
+
+  const char *Title = NULL;
+  const char *Subtitle = NULL;
+  const char *Summary = NULL;
+  if (GetEventInfo()) {
+     Title = eventInfo->GetTitle();
+     Subtitle = eventInfo->GetSubtitle();
+     Summary = eventInfo->GetExtendedDescription();
+     dsyslog("Title: '%s' Subtitle: '%s'", Title, Subtitle);
+     }
+  cRecording Recording(timer, Title, Subtitle, Summary);
+  fileName = strdup(Recording.FileName());
+  cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
+  cChannel *ch = Channels.GetByNumber(timer->channel);
+  recorder = new cRecorder(fileName, ch->ca, timer->priority, ch->vpid, ch->apid1, ch->apid2, ch->dpid1, ch->dpid2);
+  if (device->Attach(recorder)) {
+     Recording.WriteSummary();
+     cStatus::MsgRecording(device, fileName);
+     Interface->DisplayRecording(device->CardIndex(), true);
      }
   else
-     cThread::EmergencyExit(true);
+     DELETENULL(recorder);
 }
 
 cRecordControl::~cRecordControl()
@@ -2479,7 +2492,8 @@ bool cRecordControl::GetEventInfo(void)
 void cRecordControl::Stop(bool KeepInstant)
 {
   if (timer) {
-     dvbApi->StopRecord();
+     cStatus::MsgRecording(device, NULL);
+     DELETENULL(recorder);
      timer->SetRecording(false);
      if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && !timer->Matches())) {
         // checking timer->Matches() to make sure we don't delete the timer
@@ -2489,14 +2503,14 @@ void cRecordControl::Stop(bool KeepInstant)
         Timers.Save();
         }
      timer = NULL;
-     Interface->DisplayRecording(dvbApi->CardIndex(), false);
+     Interface->DisplayRecording(device->CardIndex(), false);
      cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
      }
 }
 
 bool cRecordControl::Process(time_t t)
 {
-  if (!timer || !timer->Matches(t))
+  if (!recorder || !timer || !timer->Matches(t))
      return false;
   AssertFreeDiskSpace(timer->priority);
   return true;
@@ -2504,20 +2518,27 @@ bool cRecordControl::Process(time_t t)
 
 // --- cRecordControls -------------------------------------------------------
 
-cRecordControl *cRecordControls::RecordControls[MAXDVBAPI] = { NULL };
+cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL };
 
 bool cRecordControls::Start(cTimer *Timer)
 {
-  int ch = Timer ? Timer->channel : cDvbApi::CurrentChannel();
+  int ch = Timer ? Timer->channel : cDevice::CurrentChannel();
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
-     cDvbApi *dvbApi = cDvbApi::GetDvbApi(channel->ca, Timer ? Timer->priority : Setup.DefaultPriority);
-     if (dvbApi) {
-        Stop(dvbApi);
-        for (int i = 0; i < MAXDVBAPI; i++) {
+     bool ReUse = false;
+     cDevice *device = cDevice::GetDevice(channel->ca, Timer ? Timer->priority : Setup.DefaultPriority, channel->frequency, channel->vpid, &ReUse);
+     if (device) {
+        if (!ReUse) {
+           Stop(device);
+           if (!channel->Switch(device)) {
+              cThread::EmergencyExit(true);
+              return false;
+              }
+           }
+        for (int i = 0; i < MAXRECORDCONTROLS; i++) {
             if (!RecordControls[i]) {
-               RecordControls[i] = new cRecordControl(dvbApi, Timer);
+               RecordControls[i] = new cRecordControl(device, Timer);
                return true;
                }
             }
@@ -2532,7 +2553,7 @@ bool cRecordControls::Start(cTimer *Timer)
 
 void cRecordControls::Stop(const char *InstantId)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          const char *id = RecordControls[i]->InstantId();
          if (id && strcmp(id, InstantId) == 0)
@@ -2541,12 +2562,12 @@ void cRecordControls::Stop(const char *InstantId)
       }
 }
 
-void cRecordControls::Stop(cDvbApi *DvbApi)
+void cRecordControls::Stop(cDevice *Device)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
-         if (RecordControls[i]->Uses(DvbApi)) {
-            isyslog("stopping recording on DVB device %d due to higher priority", DvbApi->CardIndex() + 1);
+         if (RecordControls[i]->Uses(Device)) {
+            isyslog("stopping recording on DVB device %d due to higher priority", Device->CardIndex() + 1);
             RecordControls[i]->Stop(true);
             }
          }
@@ -2555,11 +2576,11 @@ void cRecordControls::Stop(cDvbApi *DvbApi)
 
 bool cRecordControls::StopPrimary(bool DoIt)
 {
-  if (cDvbApi::PrimaryDvbApi->Recording()) {
-     cDvbApi *dvbApi = cDvbApi::GetDvbApi(cDvbApi::PrimaryDvbApi->Ca(), 0);
-     if (dvbApi) {
+  if (cDevice::PrimaryDevice()->Receiving()) {
+     cDevice *device = cDevice::GetDevice(cDevice::PrimaryDevice()->Ca(), 0);
+     if (device) {
         if (DoIt)
-           Stop(cDvbApi::PrimaryDvbApi);
+           Stop(cDevice::PrimaryDevice());
         return true;
         }
      }
@@ -2568,7 +2589,7 @@ bool cRecordControls::StopPrimary(bool DoIt)
 
 const char *cRecordControls::GetInstantId(const char *LastInstantId)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          if (!LastInstantId && RecordControls[i]->InstantId())
             return RecordControls[i]->InstantId();
@@ -2581,7 +2602,7 @@ const char *cRecordControls::GetInstantId(const char *LastInstantId)
 
 cRecordControl *cRecordControls::GetRecordControl(const char *FileName)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i] && strcmp(RecordControls[i]->FileName(), FileName) == 0)
          return RecordControls[i];
       }
@@ -2590,7 +2611,7 @@ cRecordControl *cRecordControls::GetRecordControl(const char *FileName)
 
 void cRecordControls::Process(time_t t)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          if (!RecordControls[i]->Process(t))
             DELETENULL(RecordControls[i]);
@@ -2600,13 +2621,19 @@ void cRecordControls::Process(time_t t)
 
 bool cRecordControls::Active(void)
 {
-  for (int i = 0; i < MAXDVBAPI; i++) {
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i])
          return true;
       }
   return false;
 }
 
+void cRecordControls::Shutdown(void)
+{
+  for (int i = 0; i < MAXRECORDCONTROLS; i++)
+      DELETENULL(RecordControls[i]);
+}
+
 // --- cProgressBar ----------------------------------------------------------
 
 class cProgressBar : public cBitmap {
@@ -2658,22 +2685,24 @@ char *cReplayControl::title = NULL;
 
 cReplayControl::cReplayControl(void)
 {
-  dvbApi = cDvbApi::PrimaryDvbApi;
   visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
   timeoutShow = 0;
   timeSearchActive = false;
   if (fileName) {
      marks.Load(fileName);
-     if (!dvbApi->StartReplay(fileName))
-        Interface->Error(tr("Channel locked (recording)!"));
+     if (!Start(fileName))
+        Interface->Error(tr("Channel locked (recording)!"));//XXX+
+     else
+        cStatus::MsgReplaying(this, fileName);
      }
 }
 
 cReplayControl::~cReplayControl()
 {
   Hide();
-  dvbApi->StopReplay();
+  cStatus::MsgReplaying(this, NULL);
+  Stop();
 }
 
 void cReplayControl::SetRecording(const char *FileName, const char *Title)
@@ -2719,7 +2748,7 @@ void cReplayControl::Hide(void)
 void cReplayControl::DisplayAtBottom(const char *s)
 {
   if (s) {
-     int w = dvbApi->WidthInCells(s);
+     int w = cOsd::WidthInCells(s);
      int d = max(Width() - w, 0) / 2;
      if (modeOnly) //XXX remove when displaying replay mode differently
         Interface->Fill(0, -1, Interface->Width(), 1, clrTransparent); //XXX remove when displaying replay mode differently
@@ -2735,7 +2764,7 @@ void cReplayControl::ShowMode(void)
   if (Setup.ShowReplayMode && !timeSearchActive) {
      bool Play, Forward;
      int Speed;
-     if (dvbApi->GetReplayMode(Play, Forward, Speed)) {
+     if (GetReplayMode(Play, Forward, Speed)) {
         bool NormalPlay = (Play && Speed == -1);
 
         if (!visible) {
@@ -2773,7 +2802,7 @@ bool cReplayControl::ShowProgress(bool Initial)
 {
   int Current, Total;
 
-  if (dvbApi->GetIndex(Current, Total) && Total > 0) {
+  if (GetIndex(Current, Total) && Total > 0) {
      if (!visible) {
         Interface->Open(Setup.OSDwidth, -3);
         needsFastResponse = visible = true;
@@ -2795,8 +2824,8 @@ bool cReplayControl::ShowProgress(bool Initial)
         Interface->Fill(0, 1, p, 1, clrGreen);
         Interface->Fill(p, 1, Width() - p, 1, clrWhite);
 #else
-        cProgressBar ProgressBar(Width() * dvbApi->CellWidth(), dvbApi->LineHeight(), Current, Total, marks);
-        Interface->SetBitmap(0, dvbApi->LineHeight(), ProgressBar);
+        cProgressBar ProgressBar(Width() * cOsd::CellWidth(), cOsd::LineHeight(), Current, Total, marks);
+        Interface->SetBitmap(0, cOsd::LineHeight(), ProgressBar);
         if (!Initial)
            Interface->Flush();
 #endif
@@ -2848,14 +2877,14 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
          int dir = (Key == kRight ? 1 : -1);
          if (dir > 0)
             Seconds = min(Total - Current - STAY_SECONDS_OFF_END, Seconds);
-         dvbApi->SkipSeconds(Seconds * dir);
+         SkipSeconds(Seconds * dir);
          timeSearchActive = false;
          }
          break;
     case kUp:
     case kDown:
          Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
-         dvbApi->Goto(Seconds * FRAMESPERSEC, Key == kDown);
+         Goto(Seconds * FRAMESPERSEC, Key == kDown);
          timeSearchActive = false;
          break;
     default:
@@ -2893,7 +2922,7 @@ void cReplayControl::TimeSearch(void)
 void cReplayControl::MarkToggle(void)
 {
   int Current, Total;
-  if (dvbApi->GetIndex(Current, Total, true)) {
+  if (GetIndex(Current, Total, true)) {
      cMark *m = marks.Get(Current);
      lastCurrent = -1; // triggers redisplay
      if (m)
@@ -2910,10 +2939,10 @@ void cReplayControl::MarkJump(bool Forward)
 {
   if (marks.Count()) {
      int Current, Total;
-     if (dvbApi->GetIndex(Current, Total)) {
+     if (GetIndex(Current, Total)) {
         cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
         if (m)
-           dvbApi->Goto(m->position, true);
+           Goto(m->position, true);
         }
      displayFrames = true;
      }
@@ -2922,11 +2951,11 @@ void cReplayControl::MarkJump(bool Forward)
 void cReplayControl::MarkMove(bool Forward)
 {
   int Current, Total;
-  if (dvbApi->GetIndex(Current, Total)) {
+  if (GetIndex(Current, Total)) {
      cMark *m = marks.Get(Current);
      if (m) {
         displayFrames = true;
-        int p = dvbApi->SkipFrames(Forward ? 1 : -1);
+        int p = SkipFrames(Forward ? 1 : -1);
         cMark *m2;
         if (Forward) {
            if ((m2 = marks.Next(m)) != NULL && m2->position <= p)
@@ -2936,7 +2965,7 @@ void cReplayControl::MarkMove(bool Forward)
            if ((m2 = marks.Prev(m)) != NULL && m2->position >= p)
               return;
            }
-        dvbApi->Goto(m->position = p, true);
+        Goto(m->position = p, true);
         marks.Save();
         }
      }
@@ -2944,6 +2973,7 @@ void cReplayControl::MarkMove(bool Forward)
 
 void cReplayControl::EditCut(void)
 {
+  /*XXX+
   if (fileName) {
      Hide();
      if (!cVideoCutter::Active()) {
@@ -2956,12 +2986,13 @@ void cReplayControl::EditCut(void)
         Interface->Error(tr("Editing process already active!"));
      ShowMode();
      }
+     XXX*/
 }
 
 void cReplayControl::EditTest(void)
 {
   int Current, Total;
-  if (dvbApi->GetIndex(Current, Total)) {
+  if (GetIndex(Current, Total)) {
      cMark *m = marks.Get(Current);
      if (!m)
         m = marks.GetNext(Current);
@@ -2969,8 +3000,8 @@ void cReplayControl::EditTest(void)
         if ((m->Index() & 0x01) != 0)
            m = marks.Next(m);
         if (m) {
-           dvbApi->Goto(m->position - dvbApi->SecondsToFrames(3));
-           dvbApi->Play();
+           Goto(m->position - SecondsToFrames(3));
+           Play();
            }
         }
      }
@@ -2978,7 +3009,7 @@ void cReplayControl::EditTest(void)
 
 eOSState cReplayControl::ProcessKey(eKeys Key)
 {
-  if (!dvbApi->Replaying())
+  if (!Active())
      return osEnd;
   if (visible) {
      if (timeoutShow && time(NULL) > timeoutShow) {
@@ -3000,21 +3031,21 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
   bool DoShowMode = true;
   switch (Key) {
     // Positioning:
-    case kUp:      dvbApi->Play(); break;
-    case kDown:    dvbApi->Pause(); break;
+    case kUp:      Play(); break;
+    case kDown:    Pause(); break;
     case kLeft|k_Release:
                    if (Setup.MultiSpeedMode) break;
-    case kLeft:    dvbApi->Backward(); break;
+    case kLeft:    Backward(); break;
     case kRight|k_Release:
                    if (Setup.MultiSpeedMode) break;
-    case kRight:   dvbApi->Forward(); break;
+    case kRight:   Forward(); break;
     case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
-    case kGreen:   dvbApi->SkipSeconds(-60); break;
+    case kGreen:   SkipSeconds(-60); break;
     case kYellow|k_Repeat:
-    case kYellow:  dvbApi->SkipSeconds( 60); break;
+    case kYellow:  SkipSeconds( 60); break;
     case kBlue:    Hide();
-                   dvbApi->StopReplay();
+                   Stop();
                    return osEnd;
     default: {
       DoShowMode = false;
diff --git a/menu.h b/menu.h
index a0e0851e2..9dfe1a40a 100644
--- a/menu.h
+++ b/menu.h
@@ -4,14 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.42 2002/04/13 15:31:41 kls Exp $
+ * $Id: menu.h 1.44 2002/06/14 12:33:35 kls Exp $
  */
 
 #ifndef __MENU_H
 #define __MENU_H
 
-#include "dvbapi.h"
+#include "device.h"
 #include "osd.h"
+#include "dvbplayer.h"
+#include "recorder.h"
 #include "recording.h"
 
 class cMenuMain : public cOsdMenu {
@@ -24,7 +26,7 @@ class cMenuMain : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-class cDisplayChannel : public cOsdBase {
+class cDisplayChannel : public cOsdObject {
 private:
   int group;
   bool withInfo;
@@ -40,7 +42,7 @@ class cDisplayChannel : public cOsdBase {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-class cDisplayVolume : public cOsdBase {
+class cDisplayVolume : public cOsdObject {
 private:
   int timeout;
   static cDisplayVolume *displayVolume;
@@ -76,17 +78,18 @@ class cMenuRecordings : public cOsdMenu {
 
 class cRecordControl {
 private:
-  cDvbApi *dvbApi;
+  cDevice *device;
   cTimer *timer;
+  cRecorder *recorder;
   const cEventInfo *eventInfo;
   char *instantId;
   char *fileName;
   bool GetEventInfo(void);
 public:
-  cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
+  cRecordControl(cDevice *Device, cTimer *Timer = NULL);
   virtual ~cRecordControl();
   bool Process(time_t t);
-  bool Uses(cDvbApi *DvbApi) { return DvbApi == dvbApi; }
+  bool Uses(cDevice *Device) { return Device == device; }
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
   const char *InstantId(void) { return instantId; }
@@ -96,21 +99,21 @@ class cRecordControl {
 
 class cRecordControls {
 private:
-  static cRecordControl *RecordControls[MAXDVBAPI];
+  static cRecordControl *RecordControls[];
 public:
   static bool Start(cTimer *Timer = NULL);
   static void Stop(const char *InstantId);
-  static void Stop(cDvbApi *DvbApi);
+  static void Stop(cDevice *Device);
   static bool StopPrimary(bool DoIt = false);
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
   static void Process(time_t t);
   static bool Active(void);
+  static void Shutdown(void);
   };
 
-class cReplayControl : public cOsdBase {
+class cReplayControl : public cDvbPlayerControl {
 private:
-  cDvbApi *dvbApi;
   cMarks marks;
   bool visible, modeOnly, shown, displayFrames;
   int lastCurrent, lastTotal;
diff --git a/menuitems.c b/menuitems.c
index 3a6f94ea3..6a54a86d3 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.2 2002/05/11 10:49:45 kls Exp $
+ * $Id: menuitems.c 1.6 2002/06/16 13:23:56 kls Exp $
  */
 
 #include "menuitems.h"
 #include <ctype.h>
 #include "i18n.h"
 #include "plugin.h"
+#include "status.h"
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -186,18 +187,18 @@ void cMenuEditStrItem::Set(void)
      strncpy(buf, value, pos);
      snprintf(buf + pos, sizeof(buf) - pos - 2, fmt, *(value + pos), value + pos + 1);
      int width = Interface->Width() - Interface->GetCols()[0];
-     if (cDvbApi::PrimaryDvbApi->WidthInCells(buf) <= width) {
+     if (cOsd::WidthInCells(buf) <= width) {
         // the whole buffer fits on the screen
         SetValue(buf);
         return;
         }
-     width *= cDvbApi::PrimaryDvbApi->CellWidth();
-     width -= cDvbApi::PrimaryDvbApi->Width('>'); // assuming '<' and '>' have the same with
+     width *= cOsd::CellWidth();
+     width -= cOsd::Width('>'); // assuming '<' and '>' have the same with
      int w = 0;
      int i = 0;
      int l = strlen(buf);
      while (i < l && w <= width)
-           w += cDvbApi::PrimaryDvbApi->Width(buf[i++]);
+           w += cOsd::Width(buf[i++]);
      if (i >= pos + 4) {
         // the cursor fits on the screen
         buf[i - 1] = '>';
@@ -214,7 +215,7 @@ void cMenuEditStrItem::Set(void)
      else
         i--;
      while (i >= 0 && w <= width)
-           w += cDvbApi::PrimaryDvbApi->Width(buf[i--]);
+           w += cOsd::Width(buf[i--]);
      buf[++i] = '<';
      SetValue(buf + i);
      }
@@ -397,6 +398,7 @@ void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
   // scroll indicators use inverted color scheme!
   if (CanScrollUp())   Interface->Write(x + w - 1, y,         "^", bgColor, fgColor);
   if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
+  cStatus::MsgOsdTextItem(text);
 }
 
 void cMenuTextItem::ScrollUp(bool Page)
@@ -406,6 +408,7 @@ void cMenuTextItem::ScrollUp(bool Page)
      offset = max(offset - (Page ? h : 1), 0);
      Display();
      }
+  cStatus::MsgOsdTextItem(NULL, true);
 }
 
 void cMenuTextItem::ScrollDown(bool Page)
@@ -415,6 +418,7 @@ void cMenuTextItem::ScrollDown(bool Page)
      offset = min(offset + (Page ? h : 1), lines - h);
      Display();
      }
+  cStatus::MsgOsdTextItem(NULL, false);
 }
 
 eOSState cMenuTextItem::ProcessKey(eKeys Key)
@@ -471,7 +475,7 @@ void cMenuSetupPage::SetPlugin(cPlugin *Plugin)
   SetSection(buf);
 }
 
-void cMenuSetupPage::SetupStore(const char *Name, const char *Value = NULL)
+void cMenuSetupPage::SetupStore(const char *Name, const char *Value)
 {
   if (plugin)
      plugin->SetupStore(Name, Value);
diff --git a/newplugin b/newplugin
index c25efb121..2612c8506 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.4 2002/05/12 15:02:13 kls Exp $
+# $Id: newplugin 1.6 2002/06/10 16:24:34 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -66,7 +66,7 @@ PLUGIN = $PLUGIN_NAME
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = `grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ print \$\$6 }' | sed -e 's/[";]//g'`
+VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ print \$\$6 }' | sed -e 's/[";]//g')
 
 ### The directory environment:
 
@@ -78,7 +78,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION = `grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g'`
+VDRVERSION = \$(shell grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -98,7 +98,7 @@ OBJS = \$(PLUGIN).o
 ### The C++ compiler and options:
 
 CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual -m486
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules:
 
@@ -112,7 +112,7 @@ DEPFILE = .dependencies
 \$(DEPFILE): Makefile
 	\@\$(MAKEDEP) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@
 
-include \$(DEPFILE)
+-include \$(DEPFILE)
 
 ### Targets:
 
@@ -251,7 +251,7 @@ The next steps you should perform now are:
 sub CreateFile
 {
   my ($Name, $Content) = @_;
-  open(FILE, ">$PLUGINDIR/$Name") || die "$Name:  $!\n";
+  open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V113 $!\n";
   print FILE $Content;
   close(FILE);
 }
diff --git a/osd.c b/osd.c
index 6feeaa875..1092187bb 100644
--- a/osd.c
+++ b/osd.c
@@ -4,12 +4,243 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.25 2002/05/12 11:38:39 kls Exp $
+ * $Id: osd.c 1.29 2002/06/16 13:24:00 kls Exp $
  */
 
 #include "osd.h"
 #include <string.h>
+#include "device.h"
 #include "i18n.h"
+#include "status.h"
+
+// --- cOsd ------------------------------------------------------------------
+
+#ifdef DEBUG_OSD
+  WINDOW *cOsd::window = NULL;
+  int cOsd::colorPairs[MaxColorPairs] = { 0 };
+#else
+  cDvbOsd *cOsd::osd = NULL;
+#endif
+  int cOsd::cols = 0;
+  int cOsd::rows = 0;
+
+void cOsd::Initialize(void)
+{
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
+  initscr();
+  keypad(stdscr, true);
+  nonl();
+  cbreak();
+  noecho();
+  timeout(10);
+#endif
+#if defined(DEBUG_OSD)
+  start_color();
+  leaveok(stdscr, true);
+#endif
+}
+
+void cOsd::Shutdown(void)
+{
+  Close();
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
+  endwin();
+#endif
+}
+
+#ifdef DEBUG_OSD
+void cOsd::SetColor(eDvbColor colorFg, eDvbColor colorBg)
+{
+  int color = (colorBg << 16) | colorFg | 0x80000000;
+  for (int i = 0; i < MaxColorPairs; i++) {
+      if (!colorPairs[i]) {
+         colorPairs[i] = color;
+         init_pair(i + 1, colorFg, colorBg);
+         wattrset(window, COLOR_PAIR(i + 1));
+         break;
+         }
+      else if (color == colorPairs[i]) {
+         wattrset(window, COLOR_PAIR(i + 1));
+         break;
+         }
+      }
+}
+#endif
+
+void cOsd::Open(int w, int h)
+{
+  int d = (h < 0) ? Setup.OSDheight + h : 0;
+  h = abs(h);
+  cols = w;
+  rows = h;
+#ifdef DEBUG_OSD
+  window = subwin(stdscr, h, w, d, (Setup.OSDwidth - w) / 2);
+  syncok(window, true);
+  #define B2C(b) (((b) * 1000) / 255)
+  #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
+  //XXX
+  SETCOLOR(clrBackground,  0x00, 0x00, 0x00, 127); // background 50% gray
+  SETCOLOR(clrBlack,       0x00, 0x00, 0x00, 255);
+  SETCOLOR(clrRed,         0xFC, 0x14, 0x14, 255);
+  SETCOLOR(clrGreen,       0x24, 0xFC, 0x24, 255);
+  SETCOLOR(clrYellow,      0xFC, 0xC0, 0x24, 255);
+  SETCOLOR(clrBlue,        0x00, 0x00, 0xFC, 255);
+  SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
+  SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
+  SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
+#else
+  w *= charWidth;
+  h *= lineHeight;
+  d *= lineHeight;
+  int x = (720 - w + charWidth) / 2; //TODO PAL vs. NTSC???
+  int y = (576 - Setup.OSDheight * lineHeight) / 2 + d;
+  //XXX
+  osd = new cDvbOsd(cDevice::PrimaryDevice()->OsdDeviceHandle(), x, y);
+  //XXX TODO this should be transferred to the places where the individual windows are requested (there's too much detailed knowledge here!)
+  if (h / lineHeight == 5) { //XXX channel display
+     osd->Create(0,              0, w, h, 4);
+     }
+  else if (h / lineHeight == 1) { //XXX info display
+     osd->Create(0,              0, w, h, 4);
+     }
+  else if (d == 0) { //XXX full menu
+     osd->Create(0,                            0, w,                         lineHeight, 2);
+     osd->Create(0,                   lineHeight, w, (Setup.OSDheight - 3) * lineHeight, 2);
+     osd->AddColor(clrBackground);
+     osd->AddColor(clrCyan);
+     osd->AddColor(clrWhite);
+     osd->AddColor(clrBlack);
+     osd->Create(0, (Setup.OSDheight - 2) * lineHeight, w,               2 * lineHeight, 4);
+     }
+  else { //XXX progress display
+     /*XXX
+     osd->Create(0,              0, w, lineHeight, 1);
+     osd->Create(0,     lineHeight, w, lineHeight, 2, false);
+     osd->Create(0, 2 * lineHeight, w, lineHeight, 1);
+     XXX*///XXX some pixels are not drawn correctly with lower bpp values
+     osd->Create(0,              0, w, 3*lineHeight, 4);
+     }
+#endif
+}
+
+void cOsd::Close(void)
+{
+#ifdef DEBUG_OSD
+  if (window) {
+     delwin(window);
+     window = 0;
+     }
+#else
+  delete osd;
+  osd = NULL;
+#endif
+}
+
+void cOsd::Clear(void)
+{
+#ifdef DEBUG_OSD
+  SetColor(clrBackground, clrBackground);
+  Fill(0, 0, cols, rows, clrBackground);
+#else
+  osd->Clear();
+#endif
+}
+
+void cOsd::Fill(int x, int y, int w, int h, eDvbColor color)
+{
+  if (x < 0) x = cols + x;
+  if (y < 0) y = rows + y;
+#ifdef DEBUG_OSD
+  SetColor(color, color);
+  for (int r = 0; r < h; r++) {
+      wmove(window, y + r, x); // ncurses wants 'y' before 'x'!
+      whline(window, ' ', w);
+      }
+  wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
+#else
+  osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
+#endif
+}
+
+void cOsd::SetBitmap(int x, int y, const cBitmap &Bitmap)
+{
+#ifndef DEBUG_OSD
+  osd->SetBitmap(x, y, Bitmap);
+#endif
+}
+
+void cOsd::ClrEol(int x, int y, eDvbColor color)
+{
+  Fill(x, y, cols - x, 1, color);
+}
+
+int cOsd::CellWidth(void)
+{
+#ifdef DEBUG_OSD
+  return 1;
+#else
+  return charWidth;
+#endif
+}
+
+int cOsd::LineHeight(void)
+{
+#ifdef DEBUG_OSD
+  return 1;
+#else
+  return lineHeight;
+#endif
+}
+
+int cOsd::Width(unsigned char c)
+{
+#ifdef DEBUG_OSD
+  return 1;
+#else
+  return osd->Width(c);
+#endif
+}
+
+int cOsd::WidthInCells(const char *s)
+{
+#ifdef DEBUG_OSD
+  return strlen(s);
+#else
+  return (osd->Width(s) + charWidth - 1) / charWidth;
+#endif
+}
+
+eDvbFont cOsd::SetFont(eDvbFont Font)
+{
+#ifdef DEBUG_OSD
+  return Font;
+#else
+  return osd->SetFont(Font);
+#endif
+}
+
+void cOsd::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
+{
+  if (x < 0) x = cols + x;
+  if (y < 0) y = rows + y;
+#ifdef DEBUG_OSD
+  SetColor(colorFg, colorBg);
+  wmove(window, y, x); // ncurses wants 'y' before 'x'!
+  waddnstr(window, s, cols - x);
+#else
+  osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
+#endif
+}
+
+void cOsd::Flush(void)
+{
+#ifdef DEBUG_OSD
+  refresh();
+#else
+  if (osd)
+     osd->Flush();
+#endif
+}
 
 // --- cOsdItem --------------------------------------------------------------
 
@@ -200,8 +431,11 @@ void cOsdMenu::Display(void)
         }
      for (int i = first; i < count; i++) {
          cOsdItem *item = Get(i);
-         if (item)
+         if (item) {
             item->Display(i - first, i == current ? clrBlack : clrWhite, i == current ? clrCyan : clrBackground);
+            if (i == current)
+               cStatus::MsgOsdCurrentItem(item->Text());
+            }
          if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
             break;
          }
@@ -225,8 +459,11 @@ void cOsdMenu::RefreshCurrent(void)
 void cOsdMenu::DisplayCurrent(bool Current)
 {
   cOsdItem *item = Get(current);
-  if (item)
+  if (item) {
      item->Display(current - first, Current ? clrBlack : clrWhite, Current ? clrCyan : clrBackground);
+     if (Current)
+        cStatus::MsgOsdCurrentItem(item->Text());
+     }
 }
 
 void cOsdMenu::Clear(void)
diff --git a/osd.h b/osd.h
index afd448594..88c986c86 100644
--- a/osd.h
+++ b/osd.h
@@ -4,14 +4,19 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.29 2002/05/12 11:19:22 kls Exp $
+ * $Id: osd.h 1.31 2002/05/18 14:00:15 kls Exp $
  */
 
 #ifndef __OSD_H
 #define __OSD_H
 
+#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
+#include <ncurses.h>
+#endif
 #include "config.h"
+#include "dvbosd.h"
 #include "interface.h"
+#include "osdbase.h"
 #include "tools.h"
 
 #define MAXOSDITEMS (Setup.OSDheight - 4)
@@ -47,6 +52,38 @@ enum eOSState { osUnknown,
                 osUser10,
               };
 
+class cOsd {
+private:
+  enum { charWidth  = 12, // average character width
+         lineHeight = 27  // smallest text height
+       };
+#ifdef DEBUG_OSD
+  static WINDOW *window;
+  enum { MaxColorPairs = 16 };
+  static int colorPairs[MaxColorPairs];
+  static void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
+#else
+  static cDvbOsd *osd;
+#endif
+  static int cols, rows;
+public:
+  static void Initialize(void);
+  static void Shutdown(void);
+  static void Open(int w, int h);
+  static void Close(void);
+  static void Clear(void);
+  static void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
+  static void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  static void ClrEol(int x, int y, eDvbColor color = clrBackground);
+  static int CellWidth(void);
+  static int LineHeight(void);
+  static int Width(unsigned char c);
+  static int WidthInCells(const char *s);
+  static eDvbFont SetFont(eDvbFont Font);
+  static void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
+  static void Flush(void);
+  };
+
 class cOsdItem : public cListObject {
 private:
   const char *text;
@@ -69,19 +106,19 @@ class cOsdItem : public cListObject {
   virtual eOSState ProcessKey(eKeys Key);
 };
 
-class cOsdBase {
+class cOsdObject {
 protected:
   bool needsFastResponse;
 public:
-  cOsdBase(bool FastResponse = false) { needsFastResponse = FastResponse; }
-  virtual ~cOsdBase() {}
+  cOsdObject(bool FastResponse = false) { needsFastResponse = FastResponse; }
+  virtual ~cOsdObject() {}
   int Width(void) { return Interface->Width(); }
   int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
   virtual eOSState ProcessKey(eKeys Key) = 0;
 };
 
-class cOsdMenu : public cOsdBase, public cList<cOsdItem> {
+class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 private:
   char *title;
   int cols[cInterface::MaxCols];
diff --git a/osdbase.c b/osdbase.c
index 1e51940dc..e7486a742 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.2 2002/05/13 16:30:59 kls Exp $
+ * $Id: osdbase.c 1.4 2002/05/18 12:39:16 kls Exp $
  */
 
 #include "osdbase.h"
@@ -316,22 +316,22 @@ const char *cWindow::Data(int x, int y)
   return cBitmap::Data(x, y);
 }
 
-// --- cOsd ------------------------------------------------------------------
+// --- cOsdBase --------------------------------------------------------------
 
-cOsd::cOsd(int x, int y)
+cOsdBase::cOsdBase(int x, int y)
 {
   numWindows = 0;
   x0 = x;
   y0 = y;
 }
 
-cOsd::~cOsd()
+cOsdBase::~cOsdBase()
 {
   for (int i = 0; i < numWindows; i++)
       delete window[i];
 }
 
-tWindowHandle cOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
+tWindowHandle cOsdBase::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
 {
   if (numWindows < MAXNUMWINDOWS) {
      if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
@@ -356,7 +356,7 @@ tWindowHandle cOsd::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBa
   return -1;
 }
 
-void cOsd::AddColor(eDvbColor Color, tWindowHandle Window)
+void cOsdBase::AddColor(eDvbColor Color, tWindowHandle Window)
 {
   cWindow *w = GetWindow(Window);
   if (w) {
@@ -365,7 +365,7 @@ void cOsd::AddColor(eDvbColor Color, tWindowHandle Window)
      }
 }
 
-cWindow *cOsd::GetWindow(int x, int y)
+cWindow *cOsdBase::GetWindow(int x, int y)
 {
   for (int i = 0; i < numWindows; i++) {
       if (window[i]->Tiled() && window[i]->Contains(x, y))
@@ -374,7 +374,7 @@ cWindow *cOsd::GetWindow(int x, int y)
   return NULL;
 }
 
-cWindow *cOsd::GetWindow(tWindowHandle Window)
+cWindow *cOsdBase::GetWindow(tWindowHandle Window)
 {
   if (0 <= Window && Window < numWindows)
      return window[Window];
@@ -383,7 +383,7 @@ cWindow *cOsd::GetWindow(tWindowHandle Window)
   return NULL;
 }
 
-void cOsd::Flush(void)
+void cOsdBase::Flush(void)
 {
   for (int i = 0; i < numWindows; i++) {
       CommitWindow(window[i]);
@@ -396,7 +396,7 @@ void cOsd::Flush(void)
       }
 }
 
-void cOsd::Clear(tWindowHandle Window)
+void cOsdBase::Clear(tWindowHandle Window)
 {
   if (Window == ALL_TILED_WINDOWS || Window == ALL_WINDOWS) {
      for (int i = 0; i < numWindows; i++)
@@ -410,31 +410,31 @@ void cOsd::Clear(tWindowHandle Window)
      }
 }
 
-void cOsd::Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window)
+void cOsdBase::Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window)
 {
   cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x1, y1) : GetWindow(Window);
   if (w)
      w->Fill(x1, y1, x2, y2, Color);
 }
 
-void cOsd::SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window)
+void cOsdBase::SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window)
 {
   cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
   if (w)
      w->SetBitmap(x, y, Bitmap);
 }
 
-int cOsd::Width(unsigned char c)
+int cOsdBase::Width(unsigned char c)
 {
   return numWindows ? window[0]->Width(c) : 0;
 }
 
-int cOsd::Width(const char *s)
+int cOsdBase::Width(const char *s)
 {
   return numWindows ? window[0]->Width(s) : 0;
 }
 
-eDvbFont cOsd::SetFont(eDvbFont Font)
+eDvbFont cOsdBase::SetFont(eDvbFont Font)
 {
   eDvbFont oldFont = Font;
   for (int i = 0; i < numWindows; i++)
@@ -442,14 +442,14 @@ eDvbFont cOsd::SetFont(eDvbFont Font)
   return oldFont;
 }
 
-void cOsd::Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window)
+void cOsdBase::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg, tWindowHandle Window)
 {
   cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
   if (w)
      w->Text(x, y, s, ColorFg, ColorBg);
 }
 
-void cOsd::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHeight)
+void cOsdBase::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHeight)
 {
   cWindow *w = GetWindow(Window);
   if (w) {
@@ -471,12 +471,12 @@ void cOsd::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHei
      }
 }
 
-void cOsd::Hide(tWindowHandle Window)
+void cOsdBase::Hide(tWindowHandle Window)
 {
   HideWindow(GetWindow(Window), true);
 }
 
-void cOsd::Show(tWindowHandle Window)
+void cOsdBase::Show(tWindowHandle Window)
 {
   HideWindow(GetWindow(Window), false);
 }
diff --git a/osdbase.h b/osdbase.h
index 859939bd0..a20dfc46b 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.1 2002/05/10 14:26:09 kls Exp $
+ * $Id: osdbase.h 1.2 2002/05/18 12:38:17 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -119,7 +119,7 @@ typedef int tWindowHandle;
 #define ALL_TILED_WINDOWS   (-3)
 #define LAST_CREATED_WINDOW (-4)
 
-class cOsd {
+class cOsdBase {
 private:
   int numWindows;
   int x0, y0;
@@ -149,9 +149,9 @@ class cOsd {
   virtual void CloseWindow(cWindow *Window) = 0;
        // Close the window and release any OSD hardware resources allocated for it.
 public:
-  cOsd(int x, int y);
+  cOsdBase(int x, int y);
        // Initializes the OSD, starting at screen coordinates (x, y).
-  virtual ~cOsd();
+  virtual ~cOsdBase();
        // Destroys all windows and shuts down the OSD.
   tWindowHandle Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, bool Tiled = true);
        // Creates a window at coordinates (x, y), which are relative to the OSD's
diff --git a/player.c b/player.c
new file mode 100644
index 000000000..fe0a2771a
--- /dev/null
+++ b/player.c
@@ -0,0 +1,55 @@
+/*
+ * player.c: The basic player interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: player.c 1.1 2002/06/16 10:34:50 kls Exp $
+ */
+
+#include "player.h"
+
+// --- cPlayer ---------------------------------------------------------------
+
+cPlayer::cPlayer(void)
+{
+  device = NULL;
+  deviceFileHandle = -1;
+}
+
+cPlayer::~cPlayer()
+{
+  Detach();
+}
+
+int cPlayer::PlayVideo(const uchar *Data, int Length)
+{
+  if (device)
+     return device->PlayVideo(Data, Length);
+  esyslog("ERROR: attempt to use cPlayer::PlayVideo() without attaching to a cDevice!");
+  return -1;
+}
+
+int cPlayer::PlayAudio(const uchar *Data, int Length)
+{
+  if (device)
+     return device->PlayAudio(Data, Length);
+  esyslog("ERROR: attempt to use cPlayer::PlayAudio() without attaching to a cDevice!");
+  return -1;
+}
+
+void cPlayer::Detach(void)
+{
+  if (device)
+     device->Detach(this);
+}
+
+// --- cControl --------------------------------------------------------------
+
+cControl::cControl(void)
+{
+}
+
+cControl::~cControl()
+{
+}
diff --git a/player.h b/player.h
new file mode 100644
index 000000000..1221c2448
--- /dev/null
+++ b/player.h
@@ -0,0 +1,51 @@
+/*
+ * player.h: The basic player interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: player.h 1.1 2002/06/16 11:52:45 kls Exp $
+ */
+
+#ifndef __PLAYER_H
+#define __PLAYER_H
+
+#include "device.h"
+#include "osd.h"
+
+class cPlayer {
+  friend class cDevice;
+private:
+  cDevice *device;
+  int deviceFileHandle;
+protected:
+  int DeviceFileHandle(void) { return deviceFileHandle; } //XXX+ needed for polling
+  void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
+  void DeviceClear(void) { if (device) device->Clear(); }
+  void DevicePlay(void) { if (device) device->Play(); }
+  void DeviceFreeze(void) { if (device) device->Freeze(); }
+  void DeviceMute(void) { if (device) device->Mute(); }
+  void DeviceStillPicture(const uchar *Data, int Length) { if (device) device->StillPicture(Data, Length); }
+  void Detach(void);
+  virtual void Activate(bool On) {}
+               // This function is called right after the cPlayer has been attached to
+               // (On == true) or before it gets detached from (On == false) a cDevice.
+               // It can be used to do things like starting/stopping a thread.
+  int PlayVideo(const uchar *Data, int Length);
+               // Sends the given Data to the video device and returns the number of
+               // bytes that have actually been accepted by the video device (or a
+               // negative value in case of an error).
+  int PlayAudio(const uchar *Data, int Length);
+               // XXX+ TODO
+public:
+  cPlayer(void);
+  virtual ~cPlayer();
+  };
+
+class cControl : public cOsdObject {
+public:
+  cControl(void);
+  virtual ~cControl();
+  };
+
+#endif //__PLAYER_H
diff --git a/receiver.c b/receiver.c
new file mode 100644
index 000000000..04f984720
--- /dev/null
+++ b/receiver.c
@@ -0,0 +1,55 @@
+/*
+ * receiver.c: The basic receiver interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: receiver.c 1.1 2002/06/08 09:58:29 kls Exp $
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include "receiver.h"
+
+cReceiver::cReceiver(int Ca, int Priority, int NumPids, ...)
+{
+  device = NULL;
+  ca = Ca;
+  priority = Priority;
+  if (NumPids) {
+     va_list ap;
+     va_start(ap, NumPids);
+     int n = 0;
+     while (n < MAXRECEIVEPIDS && NumPids--) {
+           if ((pids[n] = va_arg(ap, int)) != 0)
+              n++;
+           }
+     va_end(ap);
+     }
+  else
+     esyslog("ERROR: cReceiver called without a PID!");
+}
+
+cReceiver::~cReceiver()
+{
+  Detach();
+}
+
+bool cReceiver::WantsPid(int Pid)
+{
+  if (Pid) {
+     for (int i = 0; i < MAXRECEIVEPIDS; i++) {
+         if (pids[i] == Pid)
+            return true;
+         if (!pids[i])
+            break;
+         }
+     }
+  return false;
+}
+
+void cReceiver::Detach(void)
+{
+  if (device)
+     device->Detach(this);
+}
diff --git a/receiver.h b/receiver.h
new file mode 100644
index 000000000..aa3b9d11c
--- /dev/null
+++ b/receiver.h
@@ -0,0 +1,48 @@
+/*
+ * receiver.h: The basic receiver interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: receiver.h 1.1 2002/06/08 15:32:51 kls Exp $
+ */
+
+#ifndef __RECEIVER_H
+#define __RECEIVER_H
+
+#include "device.h"
+
+#define MAXRECEIVEPIDS  16 // the maximum number of PIDs per receiver
+
+class cReceiver {
+  friend class cDevice;
+private:
+  cDevice *device;
+  int ca;
+  int priority;
+  int pids[MAXRECEIVEPIDS];
+  bool WantsPid(int Pid);
+protected:
+  void Detach(void);
+  virtual void Activate(bool On) {}
+               // This function is called just before the cReceiver gets attached to
+               // (On == true) or detached from (On == false) a cDevice. It can be used
+               // to do things like starting/stopping a thread.
+               // It is guaranteed that Receive() will not be called before Activate(true).
+  virtual void Receive(uchar *Data, int Length) = 0;
+               // This function is called from the cDevice we are attached to, and
+               // delivers one TS packet from the set of PIDs the cReceiver has requested.
+               // The data packet must be accepted immediately, and the call must return
+               // as soon as possible, without any unnecessary delay. Each TS packet
+               // will be delivered only ONCE, so the cReceiver must make sure that
+               // it will be able to buffer the data if necessary.
+public:
+  cReceiver(int Ca, int Priority, int NumPids, ...);
+               // Creates a new receiver that requires conditional access Ca and has
+               // the given Priority. NumPids defines the number of PIDs that follow
+               // this parameter. If any of these PIDs are 0, they will be silently ignored.
+               // The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
+  virtual ~cReceiver();
+  };
+
+#endif //__RECEIVER_H
diff --git a/recorder.c b/recorder.c
new file mode 100644
index 000000000..3a0941bb8
--- /dev/null
+++ b/recorder.c
@@ -0,0 +1,149 @@
+/*
+ * recorder.h: The actual DVB recorder
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: recorder.c 1.1 2002/06/16 10:03:25 kls Exp $
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <unistd.h>
+#include "recorder.h"
+
+// The size of the array used to buffer video data:
+// (must be larger than MINVIDEODATA - see remux.h)
+#define VIDEOBUFSIZE  MEGABYTE(1)
+
+#define MINFREEDISKSPACE    (512) // MB
+#define DISKCHECKINTERVAL   100 // seconds
+
+cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
+:cReceiver(Ca, Priority, 5, VPid, APid1, APid2, DPid1, DPid2)
+{
+  ringBuffer = NULL;
+  remux = NULL;
+  fileName = NULL;
+  index = NULL;
+  pictureType = NO_PICTURE;
+  fileSize = 0;
+  active = false;
+  lastDiskSpaceCheck = time(NULL);
+  isyslog("record %s", FileName);
+
+  // Create directories if necessary:
+
+  if (!MakeDirs(FileName, true))
+     return;
+
+  // Make sure the disk is up and running:
+
+  SpinUpDisk(FileName);
+
+  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
+  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2, true);
+  fileName = new cFileName(FileName, true);
+  recordFile = fileName->Open();
+  if (recordFile < 0)
+     return;
+  // Create the index file:
+  index = new cIndexFile(FileName, true);
+  if (!index)
+     esyslog("ERROR: can't allocate index");
+     // let's continue without index, so we'll at least have the recording
+}
+
+cRecorder::~cRecorder()
+{
+  Detach();
+  delete index;
+  delete fileName;
+  delete remux;
+  delete ringBuffer;
+}
+
+void cRecorder::Activate(bool On)
+{
+  if (On) {
+     if (recordFile >= 0)
+        Start();
+     }
+  else if (active) {
+     active = false;
+     Cancel(3);
+     }
+}
+
+bool cRecorder::RunningLowOnDiskSpace(void)
+{
+  if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
+     int Free = FreeDiskSpaceMB(fileName->Name());
+     lastDiskSpaceCheck = time(NULL);
+     if (Free < MINFREEDISKSPACE) {
+        dsyslog("low disk space (%d MB, limit is %d MB)", Free, MINFREEDISKSPACE);
+        return true;
+        }
+     }
+  return false;
+}
+
+bool cRecorder::NextFile(void)
+{
+  if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
+     if (fileSize > MEGABYTE(Setup.MaxVideoFileSize) || RunningLowOnDiskSpace()) {
+        recordFile = fileName->NextFile();
+        fileSize = 0;
+        }
+     }
+  return recordFile >= 0;
+}
+
+void cRecorder::Receive(uchar *Data, int Length)
+{
+  int p = ringBuffer->Put(Data, Length);
+  if (p != Length && active)
+     esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length - p);
+}
+
+void cRecorder::Action(void)
+{
+  dsyslog("recording thread started (pid=%d)", getpid());
+
+  uchar b[MINVIDEODATA];
+  int r = 0;
+  active = true;
+  while (active) {
+        int g = ringBuffer->Get(b + r, sizeof(b) - r);
+        if (g > 0)
+           r += g;
+        if (r > 0) {
+           int Count = r, Result;
+           const uchar *p = remux->Process(b, Count, Result, &pictureType);
+           if (p) {
+              //XXX+ active??? see old version (Busy)
+              if (!active && pictureType == I_FRAME) // finish the recording before the next 'I' frame
+                 break;
+              if (NextFile()) {
+                 if (index && pictureType != NO_PICTURE)
+                    index->Write(pictureType, fileName->Number(), fileSize);
+                 if (safe_write(recordFile, p, Result) < 0) {
+                    LOG_ERROR_STR(fileName->Name());
+                    break;
+                    }
+                 fileSize += Result;
+                 }
+              else
+                 break;
+              }
+           if (Count > 0) {
+              r -= Count;
+              memmove(b, b + Count, r);
+              }
+           }
+        else
+           usleep(1); // this keeps the CPU load low
+        }
+
+  dsyslog("recording thread ended (pid=%d)", getpid());
+}
diff --git a/recorder.h b/recorder.h
new file mode 100644
index 000000000..e19148a6b
--- /dev/null
+++ b/recorder.h
@@ -0,0 +1,43 @@
+/*
+ * recorder.h: The actual DVB recorder
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: recorder.h 1.1 2002/06/08 09:35:03 kls Exp $
+ */
+
+#ifndef __RECORDER_H
+#define __RECORDER_H
+
+#include "receiver.h"
+#include "recording.h"
+#include "remux.h"
+#include "ringbuffer.h"
+#include "thread.h"
+
+class cRecorder : public cReceiver, cThread {
+private:
+  cRingBufferLinear *ringBuffer;
+  cRemux *remux;
+  cFileName *fileName;
+  cIndexFile *index;
+  uchar pictureType;
+  int fileSize;
+  int recordFile;
+  bool active;
+  time_t lastDiskSpaceCheck;
+  bool RunningLowOnDiskSpace(void);
+  bool NextFile(void);
+protected:
+  virtual void Activate(bool On);
+  virtual void Receive(uchar *Data, int Length);
+  virtual void Action(void);
+public:
+  cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2);
+               // Creates a new recorder that requires conditional access Ca, has
+               // the given Priority and will record the given PIDs into the file FileName.
+  virtual ~cRecorder();
+  };
+
+#endif //__RECORDER_H
diff --git a/recording.c b/recording.c
index c65aaaf96..7bc896c59 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.62 2002/05/13 16:31:21 kls Exp $
+ * $Id: recording.c 1.63 2002/06/16 11:29:27 kls Exp $
  */
 
 #include "recording.h"
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include "i18n.h"
 #include "interface.h"
+#include "remux.h" //XXX+ I_FRAME
 #include "tools.h"
 #include "videodir.h"
 
@@ -732,3 +733,350 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
      delete cmd;
      }
 }
+
+// --- XXX+
+
+//XXX+ somewhere else???
+// --- cIndexFile ------------------------------------------------------------
+
+#define INDEXFILESUFFIX     "/index.vdr"
+
+// The maximum time to wait before giving up while catching up on an index file:
+#define MAXINDEXCATCHUP   2 // seconds
+
+cIndexFile::cIndexFile(const char *FileName, bool Record)
+:resumeFile(FileName)
+{
+  f = -1;
+  fileName = NULL;
+  size = 0;
+  last = -1;
+  index = NULL;
+  if (FileName) {
+     fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + 1];
+     if (fileName) {
+        strcpy(fileName, FileName);
+        char *pFileExt = fileName + strlen(fileName);
+        strcpy(pFileExt, INDEXFILESUFFIX);
+        int delta = 0;
+        if (access(fileName, R_OK) == 0) {
+           struct stat buf;
+           if (stat(fileName, &buf) == 0) {
+              delta = buf.st_size % sizeof(tIndex);
+              if (delta) {
+                 delta = sizeof(tIndex) - delta;
+                 esyslog("ERROR: invalid file size (%ld) in '%s'", buf.st_size, fileName);
+                 }
+              last = (buf.st_size + delta) / sizeof(tIndex) - 1;
+              if (!Record && last >= 0) {
+                 size = last + 1;
+                 index = new tIndex[size];
+                 if (index) {
+                    f = open(fileName, O_RDONLY);
+                    if (f >= 0) {
+                       if ((int)safe_read(f, index, buf.st_size) != buf.st_size) {
+                          esyslog("ERROR: can't read from file '%s'", fileName);
+                          delete index;
+                          index = NULL;
+                          close(f);
+                          f = -1;
+                          }
+                       // we don't close f here, see CatchUp()!
+                       }
+                    else
+                       LOG_ERROR_STR(fileName);
+                    }
+                 else
+                    esyslog("ERROR: can't allocate %d bytes for index '%s'", size * sizeof(tIndex), fileName);
+                 }
+              }
+           else
+              LOG_ERROR;
+           }
+        else if (!Record)
+           isyslog("missing index file %s", fileName);
+        if (Record) {
+           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
+              if (delta) {
+                 esyslog("ERROR: padding index file with %d '0' bytes", delta);
+                 while (delta--)
+                       writechar(f, 0);
+                 }
+              }
+           else
+              LOG_ERROR_STR(fileName);
+           }
+        }
+     else
+        esyslog("ERROR: can't copy file name '%s'", FileName);
+     }
+}
+
+cIndexFile::~cIndexFile()
+{
+  if (f >= 0)
+     close(f);
+  delete fileName;
+  delete index;
+}
+
+bool cIndexFile::CatchUp(int Index)
+{
+  if (index && f >= 0) {
+     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
+         struct stat buf;
+         if (fstat(f, &buf) == 0) {
+            int newLast = buf.st_size / sizeof(tIndex) - 1;
+            if (newLast > last) {
+               if (size <= newLast) {
+                  size *= 2;
+                  if (size <= newLast)
+                     size = newLast + 1;
+                  }
+               index = (tIndex *)realloc(index, size * sizeof(tIndex));
+               if (index) {
+                  int offset = (last + 1) * sizeof(tIndex);
+                  int delta = (newLast - last) * sizeof(tIndex);
+                  if (lseek(f, offset, SEEK_SET) == offset) {
+                     if (safe_read(f, &index[last + 1], delta) != delta) {
+                        esyslog("ERROR: can't read from index");
+                        delete index;
+                        index = NULL;
+                        close(f);
+                        f = -1;
+                        break;
+                        }
+                     last = newLast;
+                     }
+                  else
+                     LOG_ERROR_STR(fileName);
+                  }
+               else
+                  esyslog("ERROR: can't realloc() index");
+               }
+            }
+         else
+            LOG_ERROR_STR(fileName);
+         if (Index >= last)
+            sleep(1);
+         else
+            return true;
+         }
+     }
+  return false;
+}
+
+bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
+{
+  if (f >= 0) {
+     tIndex i = { FileOffset, PictureType, FileNumber, 0 };
+     if (safe_write(f, &i, sizeof(i)) < 0) {
+        LOG_ERROR_STR(fileName);
+        close(f);
+        f = -1;
+        return false;
+        }
+     last++;
+     }
+  return f >= 0;
+}
+
+bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
+{
+  if (index) {
+     CatchUp(Index);
+     if (Index >= 0 && Index <= last) {
+        *FileNumber = index[Index].number;
+        *FileOffset = index[Index].offset;
+        if (PictureType)
+           *PictureType = index[Index].type;
+        if (Length) {
+           int fn = index[Index + 1].number;
+           int fo = index[Index + 1].offset;
+           if (fn == *FileNumber)
+              *Length = fo - *FileOffset;
+           else
+              *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
+           }
+        return true;
+        }
+     }
+  return false;
+}
+
+int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
+{
+  if (index) {
+     CatchUp();
+     int d = Forward ? 1 : -1;
+     for (;;) {
+         Index += d;
+         if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? 100 : 0)) {
+            if (index[Index].type == I_FRAME) {
+               if (FileNumber)
+                  *FileNumber = index[Index].number;
+               else
+                  FileNumber = &index[Index].number;
+               if (FileOffset)
+                  *FileOffset = index[Index].offset;
+               else
+                  FileOffset = &index[Index].offset;
+               if (Length) {
+                  // all recordings end with a non-I_FRAME, so the following should be safe:
+                  int fn = index[Index + 1].number;
+                  int fo = index[Index + 1].offset;
+                  if (fn == *FileNumber)
+                     *Length = fo - *FileOffset;
+                  else {
+                     esyslog("ERROR: 'I' frame at end of file #%d", *FileNumber);
+                     *Length = -1;
+                     }
+                  }
+               return Index;
+               }
+            }
+         else
+            break;
+         }
+     }
+  return -1;
+}
+
+int cIndexFile::Get(uchar FileNumber, int FileOffset)
+{
+  if (index) {
+     CatchUp();
+     //TODO implement binary search!
+     int i;
+     for (i = 0; i < last; i++) {
+         if (index[i].number > FileNumber || (index[i].number == FileNumber) && index[i].offset >= FileOffset)
+            break;
+         }
+     return i;
+     }
+  return -1;
+}
+
+// --- cFileName -------------------------------------------------------------
+
+#include <errno.h>
+#include <unistd.h>
+#include "videodir.h"
+
+#define MAXFILESPERRECORDING 255
+#define RECORDFILESUFFIX    "/%03d.vdr"
+#define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
+
+cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
+{
+  file = -1;
+  fileNumber = 0;
+  record = Record;
+  blocking = Blocking;
+  // Prepare the file name:
+  fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
+  if (!fileName) {
+     esyslog("ERROR: can't copy file name '%s'", fileName);
+     return;
+     }
+  strcpy(fileName, FileName);
+  pFileNumber = fileName + strlen(fileName);
+  SetOffset(1);
+}
+
+cFileName::~cFileName()
+{
+  Close();
+  delete fileName;
+}
+
+int cFileName::Open(void)
+{
+  if (file < 0) {
+     int BlockingFlag = blocking ? 0 : O_NONBLOCK;
+     if (record) {
+        dsyslog("recording to '%s'", fileName);
+        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | BlockingFlag);
+        if (file < 0)
+           LOG_ERROR_STR(fileName);
+        }
+     else {
+        if (access(fileName, R_OK) == 0) {
+           dsyslog("playing '%s'", fileName);
+           file = open(fileName, O_RDONLY | BlockingFlag);
+           if (file < 0)
+              LOG_ERROR_STR(fileName);
+           }
+        else if (errno != ENOENT)
+           LOG_ERROR_STR(fileName);
+        }
+     }
+  return file;
+}
+
+void cFileName::Close(void)
+{
+  if (file >= 0) {
+     if ((record && CloseVideoFile(file) < 0) || (!record && close(file) < 0))
+        LOG_ERROR_STR(fileName);
+     file = -1;
+     }
+}
+
+int cFileName::SetOffset(int Number, int Offset)
+{
+  if (fileNumber != Number)
+     Close();
+  if (0 < Number && Number <= MAXFILESPERRECORDING) {
+     fileNumber = Number;
+     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
+     if (record) {
+        if (access(fileName, F_OK) == 0) // file exists, let's try next suffix
+           return SetOffset(Number + 1);
+        else if (errno != ENOENT) { // something serious has happened
+           LOG_ERROR_STR(fileName);
+           return -1;
+           }
+        // found a non existing file suffix
+        }
+     if (Open() >= 0) {
+        if (!record && Offset >= 0 && lseek(file, Offset, SEEK_SET) != Offset) {
+           LOG_ERROR_STR(fileName);
+           return -1;
+           }
+        }
+     return file;
+     }
+  esyslog("ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+  return -1;
+}
+
+int cFileName::NextFile(void)
+{
+  return SetOffset(fileNumber + 1);
+}
+
+const char *IndexToHMSF(int Index, bool WithFrame)
+{
+  static char buffer[16];
+  int f = (Index % FRAMESPERSEC) + 1;
+  int s = (Index / FRAMESPERSEC);
+  int m = s / 60 % 60;
+  int h = s / 3600;
+  s %= 60;
+  snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
+  return buffer;
+}
+
+int HMSFToIndex(const char *HMSF)
+{
+  int h, m, s, f = 0;
+  if (3 <= sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f))
+     return (h * 3600 + m * 60 + s) * FRAMESPERSEC + f - 1;
+  return 0;
+}
+
+int SecondsToFrames(int Seconds)
+{
+  return Seconds * FRAMESPERSEC;
+}
diff --git a/recording.h b/recording.h
index 38626f859..16c6506f7 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.22 2002/02/03 11:59:49 kls Exp $
+ * $Id: recording.h 1.23 2002/06/16 11:29:47 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -104,4 +104,63 @@ class cRecordingUserCommand {
   static void InvokeCommand(const char *State, const char *RecordingFileName);
   };
 
+//XXX+
+#define FRAMESPERSEC 25
+
+// The maximum file size is limited by the range that can be covered
+// with 'int'. 4GB might be possible (if the range is considered
+// 'unsigned'), 2GB should be possible (even if the range is considered
+// 'signed'), so let's use 2000MB for absolute safety (the actual file size
+// may be slightly higher because we stop recording only before the next
+// 'I' frame, to have a complete Group Of Pictures):
+#define MAXVIDEOFILESIZE 2000 // MB
+#define MINVIDEOFILESIZE  100 // MB
+
+class cIndexFile {
+private:
+  struct tIndex { int offset; uchar type; uchar number; short reserved; };
+  int f;
+  char *fileName;
+  int size, last;
+  tIndex *index;
+  cResumeFile resumeFile;
+  bool CatchUp(int Index = -1);
+public:
+  cIndexFile(const char *FileName, bool Record);
+  ~cIndexFile();
+  bool Ok(void) { return index != NULL; }
+  bool Write(uchar PictureType, uchar FileNumber, int FileOffset);
+  bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
+  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
+  int Get(uchar FileNumber, int FileOffset);
+  int Last(void) { CatchUp(); return last; }
+  int GetResume(void) { return resumeFile.Read(); }
+  bool StoreResume(int Index) { return resumeFile.Save(Index); }
+  };
+
+class cFileName {
+private:
+  int file;
+  int fileNumber;
+  char *fileName, *pFileNumber;
+  bool record;
+  bool blocking;
+public:
+  cFileName(const char *FileName, bool Record, bool Blocking = false);
+  ~cFileName();
+  const char *Name(void) { return fileName; }
+  int Number(void) { return fileNumber; }
+  int Open(void);
+  void Close(void);
+  int SetOffset(int Number, int Offset = 0);
+  int NextFile(void);
+  };
+
+const char *IndexToHMSF(int Index, bool WithFrame = false);
+      // Converts the given index to a string, optionally containing the frame number.
+int HMSFToIndex(const char *HMSF);
+      // Converts the given string (format: "hh:mm:ss.ff") to an index.
+int SecondsToFrames(int Seconds); //XXX+ ->player???
+      // Returns the number of frames corresponding to the given number of seconds.
+
 #endif //__RECORDING_H
diff --git a/remote.c b/remote.c
index a9fee37c0..0ee42a79b 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.26 2002/05/13 16:31:27 kls Exp $
+ * $Id: remote.c 1.27 2002/05/18 12:55:39 kls Exp $
  */
 
 #include "remote.h"
@@ -24,6 +24,10 @@
 #include <sys/un.h>
 #endif
 
+#if defined REMOTE_KBD
+#include <ncurses.h>
+#endif
+
 #include "config.h"
 #include "tools.h"
 
diff --git a/ringbuffer.c b/ringbuffer.c
index 3918297d0..421f19f00 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -1,5 +1,5 @@
 /*
- * ringbuffer.c: A threaded ring buffer
+ * ringbuffer.c: A ring buffer
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
@@ -7,50 +7,25 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.7 2002/05/13 16:31:46 kls Exp $
+ * $Id: ringbuffer.c 1.9 2002/06/16 11:24:40 kls Exp $
  */
 
 #include "ringbuffer.h"
+#include <unistd.h>
 #include "tools.h"
 
-// --- cRingBufferInputThread -------------------------------------------------
-
-class cRingBufferInputThread : public cThread {
-private:
-  cRingBuffer *ringBuffer;
-protected:
-  virtual void Action(void) { ringBuffer->Input(); }
-public:
-  cRingBufferInputThread(cRingBuffer *RingBuffer) { ringBuffer = RingBuffer; }
-  };
-
-// --- cRingBufferOutputThread ------------------------------------------------
-
-class cRingBufferOutputThread : public cThread {
-private:
-  cRingBuffer *ringBuffer;
-protected:
-  virtual void Action(void) { ringBuffer->Output(); }
-public:
-  cRingBufferOutputThread(cRingBuffer *RingBuffer) { ringBuffer = RingBuffer; }
-  };
-
-// --- cRingBuffer ------------------------------------------------------------
+// --- cRingBuffer -----------------------------------------------------------
 
 cRingBuffer::cRingBuffer(int Size, bool Statistics)
 {
   size = Size;
   statistics = Statistics;
-  inputThread = NULL;
-  outputThread = NULL;
-  busy = false;
   maxFill = 0;
+  lastPercent = 0;
 }
 
 cRingBuffer::~cRingBuffer()
 {
-  delete inputThread;
-  delete outputThread;
   if (statistics)
      dsyslog("buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
@@ -79,45 +54,13 @@ void cRingBuffer::EnableGet(void)
   readyForGet.Broadcast();
 }
 
-bool cRingBuffer::Start(void)
-{
-  if (!busy) {
-     busy = true;
-     outputThread = new cRingBufferOutputThread(this);
-     if (!outputThread->Start())
-        DELETENULL(outputThread);
-     inputThread = new cRingBufferInputThread(this);
-     if (!inputThread->Start()) {
-        DELETENULL(inputThread);
-        DELETENULL(outputThread);
-        }
-     busy = outputThread && inputThread;
-     }
-  return busy;
-}
-
-bool cRingBuffer::Active(void)
-{
-  return outputThread && outputThread->Active() && inputThread && inputThread->Active();
-}
-
-void cRingBuffer::Stop(void)
-{
-  busy = false;
-  for (time_t t0 = time(NULL) + 3; time(NULL) < t0; ) {
-      if (!((outputThread && outputThread->Active()) || (inputThread && inputThread->Active())))
-         break;
-      }
-  DELETENULL(inputThread);
-  DELETENULL(outputThread);
-}
-
-// --- cRingBufferLinear ----------------------------------------------------
+// --- cRingBufferLinear -----------------------------------------------------
 
 cRingBufferLinear::cRingBufferLinear(int Size, bool Statistics)
 :cRingBuffer(Size, Statistics)
 {
   buffer = NULL;
+  getThreadPid = -1;
   if (Size > 1) { // 'Size - 1' must not be 0!
      buffer = new uchar[Size];
      if (!buffer)
@@ -146,6 +89,8 @@ void cRingBufferLinear::Clear(void)
   Lock();
   head = tail = 0;
   Unlock();
+  EnablePut();
+  EnableGet();
 }
 
 int cRingBufferLinear::Put(const uchar *Data, int Count)
@@ -159,11 +104,13 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
         int fill = Size() - free - 1 + Count;
         if (fill >= Size())
            fill = Size() - 1;
-        if (fill > maxFill) {
+        if (fill > maxFill)
            maxFill = fill;
-           int percent = maxFill * 100 / (Size() - 1);
+        int percent = maxFill * 100 / (Size() - 1) / 5 * 5;
+        if (abs(lastPercent - percent) >= 5) {
            if (percent > 75)
-              dsyslog("buffer usage: %d%%", percent);
+              dsyslog("buffer usage: %d%% (pid=%d)", percent, getThreadPid);
+           lastPercent = percent;
            }
         }
      if (free > 0) {
@@ -185,6 +132,7 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
      else
         Count = 0;
      Unlock();
+     EnableGet();
      }
   return Count;
 }
@@ -193,6 +141,8 @@ int cRingBufferLinear::Get(uchar *Data, int Count)
 {
   if (Count > 0) {
      Lock();
+     if (getThreadPid < 0)
+        getThreadPid = getpid();
      int rest = Size() - tail;
      int diff = head - tail;
      int cont = (diff >= 0) ? diff : Size() + diff;
@@ -213,6 +163,8 @@ int cRingBufferLinear::Get(uchar *Data, int Count)
      else
         Count = 0;
      Unlock();
+     if (Count == 0)
+        WaitForGet();
      }
   return Count;
 }
@@ -239,7 +191,7 @@ cFrame::~cFrame()
 
 // --- cRingBufferFrame ------------------------------------------------------
 
-cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics = false)
+cRingBufferFrame::cRingBufferFrame(int Size, bool Statistics)
 :cRingBuffer(Size, Statistics)
 {
   head = NULL;
@@ -255,7 +207,7 @@ void cRingBufferFrame::Clear(void)
 {
   Lock();
   const cFrame *p;
-  while ((p = Get(false)) != NULL)
+  while ((p = Get()) != NULL)
         Drop(p);
   Unlock();
   EnablePut();
@@ -279,17 +231,14 @@ bool cRingBufferFrame::Put(cFrame *Frame)
      EnableGet();
      return true;
      }
-  WaitForPut();
   return false;
 }
 
-const cFrame *cRingBufferFrame::Get(bool Wait)
+const cFrame *cRingBufferFrame::Get(void)
 {
   Lock();
   cFrame *p = head ? head->next : NULL;
   Unlock();
-  if (!p && Wait)
-     WaitForGet();
   return p;
 }
 
diff --git a/ringbuffer.h b/ringbuffer.h
index 7e1025b1e..43176bde5 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -1,10 +1,10 @@
 /*
- * ringbuffer.h: A threaded ring buffer
+ * ringbuffer.h: A ring buffer
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.5 2001/11/03 10:41:33 kls Exp $
+ * $Id: ringbuffer.h 1.6 2002/06/16 11:30:07 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -12,24 +12,17 @@
 
 #include "thread.h"
 
-typedef unsigned char uchar;
-
-class cRingBufferInputThread;
-class cRingBufferOutputThread;
+typedef unsigned char uchar;//XXX+
 
 class cRingBuffer {
-  friend class cRingBufferInputThread;
-  friend class cRingBufferOutputThread;
 private:
-  cRingBufferInputThread *inputThread;
-  cRingBufferOutputThread *outputThread;
   cMutex mutex;
   cCondVar readyForPut, readyForGet;
   cMutex putMutex, getMutex;
   int size;
-  bool busy;
 protected:
   int maxFill;//XXX
+  int lastPercent;
   bool statistics;//XXX
   void WaitForPut(void);
   void WaitForGet(void);
@@ -41,26 +34,19 @@ class cRingBuffer {
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
   int Size(void) { return size; }
-  bool Busy(void) { return busy; }
-  virtual void Input(void) = 0;
-    // Runs as a separate thread and shall continuously read data from
-    // a source and call Put() to store the data in the ring buffer.
-  virtual void Output(void) = 0;
-    // Runs as a separate thread and shall continuously call Get() to
-    // retrieve data from the ring buffer and write it to a destination.
 public:
   cRingBuffer(int Size, bool Statistics = false);
   virtual ~cRingBuffer();
-  bool Start(void);
-  bool Active(void);
-  void Stop(void);
   };
 
 class cRingBufferLinear : public cRingBuffer {
 private:
   int head, tail;
   uchar *buffer;
-protected:
+  pid_t getThreadPid;
+public:
+  cRingBufferLinear(int Size, bool Statistics = false);
+  virtual ~cRingBufferLinear();
   virtual int Available(void);
   virtual void Clear(void);
     // Immediately clears the ring buffer.
@@ -70,9 +56,6 @@ class cRingBufferLinear : public cRingBuffer {
   int Get(uchar *Data, int Count);
     // Gets at most Count bytes of Data from the ring buffer.
     // Returns the number of bytes actually retrieved.
-public:
-  cRingBufferLinear(int Size, bool Statistics = false);
-  virtual ~cRingBufferLinear();
   };
 
 enum eFrameType { ftUnknown, ftVideo, ftAudio, ftDolby };
@@ -99,21 +82,20 @@ class cRingBufferFrame : public cRingBuffer {
   cFrame *head;
   int currentFill;
   void Delete(const cFrame *Frame);
-protected:
+public:
+  cRingBufferFrame(int Size, bool Statistics = false);
+  virtual ~cRingBufferFrame();
   virtual int Available(void);
   virtual void Clear(void);
     // Immediately clears the ring buffer.
   bool Put(cFrame *Frame);
     // Puts the Frame into the ring buffer.
     // Returns true if this was possible.
-  const cFrame *Get(bool Wait = true);
+  const cFrame *Get(void);
     // Gets the next frame from the ring buffer.
     // The actual data still remains in the buffer until Drop() is called.
   void Drop(const cFrame *Frame);
     // Drops the Frame that has just been fetched with Get().
-public:
-  cRingBufferFrame(int Size, bool Statistics = false);
-  virtual ~cRingBufferFrame();
   };
 
 #endif // __RINGBUFFER_H
diff --git a/status.c b/status.c
new file mode 100644
index 000000000..76dc8404a
--- /dev/null
+++ b/status.c
@@ -0,0 +1,96 @@
+/*
+ * status.c: Status monitoring
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: status.c 1.3 2002/06/16 13:24:36 kls Exp $
+ */
+
+#include "status.h"
+
+// --- cStatus ---------------------------------------------------------------
+
+cList<cStatus> cStatus::statusMonitors;
+
+cStatus::cStatus(void)
+{
+  statusMonitors.Add(this);
+}
+
+cStatus::~cStatus()
+{
+  statusMonitors.Del(this, false);
+}
+
+void cStatus::MsgChannelSwitch(const cDevice *Device, int ChannelNumber)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->ChannelSwitch(Device, ChannelNumber);
+}
+
+void cStatus::MsgRecording(const cDevice *Device, const char *Name)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->Recording(Device, Name);
+}
+
+void cStatus::MsgReplaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->Replaying(DvbPlayerControl, Name);
+}
+
+void cStatus::MsgSetVolume(int Volume, bool Absolute)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->SetVolume(Volume, Absolute);
+}
+
+void cStatus::MsgOsdClear(void)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdClear();
+}
+
+void cStatus::MsgOsdTitle(const char *Title)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdTitle(Title);
+}
+
+void cStatus::MsgOsdStatusMessage(const char *Message)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdStatusMessage(Message);
+}
+
+void cStatus::MsgOsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdHelpKeys(Red, Green, Yellow, Blue);
+}
+
+void cStatus::MsgOsdCurrentItem(const char *Text)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdCurrentItem(Text);
+}
+
+void cStatus::MsgOsdTextItem(const char *Text, bool Scroll)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdTextItem(Text, Scroll);
+}
+
+void cStatus::MsgOsdChannel(const char *Text)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdChannel(Text);
+}
+
+void cStatus::MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle);
+}
diff --git a/status.h b/status.h
new file mode 100644
index 000000000..d68f23ad8
--- /dev/null
+++ b/status.h
@@ -0,0 +1,75 @@
+/*
+ * status.h: Status monitoring
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: status.h 1.3 2002/06/16 13:24:50 kls Exp $
+ */
+
+#ifndef __STATUS_H
+#define __STATUS_H
+
+#include "config.h"
+#include "device.h"
+#include "dvbplayer.h"
+#include "tools.h"
+
+class cStatus : public cListObject {
+private:
+  static cList<cStatus> statusMonitors;
+protected:
+  // These functions can be implemented by derived classes to receive status information:
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber) {}
+               // Indicates a channel switch on the given DVB device.
+               // If ChannelNumber is 0, this is before the channel is being switched,
+               // otherwise ChannelNumber is the number of the channel that has been switched to.
+  virtual void Recording(const cDevice *Device, const char *Name) {}
+               // The given DVB device has started recording Name. Name is the full directory
+               // name of the recording. If Name is NULL, the recording has ended. 
+  virtual void Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name) {}
+               // The given player control has started replaying Name. Name is the full directory
+               // name of the recording. If Name is NULL, the replay has ended. 
+  virtual void SetVolume(int Volume, bool Absolute) {}
+               // The volume has been set to the given value, either
+               // absolutely or relative to the current volume.
+  virtual void OsdClear(void) {}
+               // The OSD has been cleared.
+  virtual void OsdTitle(const char *Title) {}
+               // Title has been displayed in the title line of the menu.
+  virtual void OsdStatusMessage(const char *Message) {}
+               // Message has been displayed in the status line of the menu.
+               // If Message is NULL, the status line has been cleared.
+  virtual void OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue) {}
+               // The help keys have been set to the given values (may be NULL).
+  virtual void OsdCurrentItem(const char *Text) {}
+               // The OSD displays the given single line Text as the current menu item.
+  virtual void OsdTextItem(const char *Text, bool Scroll) {}
+               // The OSD displays the given multi line text. If Text points to an
+               // actual string, that text shall be displayed and Scroll has no
+               // meaning. If Text is NULL, Scroll defines whether the previously
+               // received text shall be scrolled up (true) or down (false) and
+               // the text shall be redisplayed with the new offset.
+  virtual void OsdChannel(const char *Text) {}
+               // The OSD displays the single line Text with the current channel information.
+  virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {}
+               // The OSD displays the given programme information.
+public:
+  cStatus(void);
+  virtual ~cStatus();
+  // These functions are called whenever the related status information changes:
+  static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber);
+  static void MsgRecording(const cDevice *Device, const char *Name);
+  static void MsgReplaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name);
+  static void MsgSetVolume(int Volume, bool Absolute);
+  static void MsgOsdClear(void);
+  static void MsgOsdTitle(const char *Title);
+  static void MsgOsdStatusMessage(const char *Message);
+  static void MsgOsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue);
+  static void MsgOsdCurrentItem(const char *Text);
+  static void MsgOsdTextItem(const char *Text,  bool Scroll = false);
+  static void MsgOsdChannel(const char *Text);
+  static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle);
+  };
+
+#endif //__STATUS_H
diff --git a/svdrp.c b/svdrp.c
index ff3a775ae..9d70732ec 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.37 2002/05/13 16:32:05 kls Exp $
+ * $Id: svdrp.c 1.38 2002/06/09 15:56:54 kls Exp $
  */
 
 #include "svdrp.h"
@@ -27,7 +27,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include "config.h"
-#include "dvbapi.h"
+#include "device.h"
 #include "interface.h"
 #include "tools.h"
 
@@ -390,12 +390,12 @@ void cSVDRP::CmdCHAN(const char *Option)
            n = o;
         }
      else if (strcmp(Option, "-") == 0) {
-        n = cDvbApi::CurrentChannel();
+        n = cDevice::CurrentChannel();
         if (n > 1)
            n--;
         }
      else if (strcmp(Option, "+") == 0) {
-        n = cDvbApi::CurrentChannel();
+        n = cDevice::CurrentChannel();
         if (n < Channels.MaxNumber())
            n++;
         }
@@ -430,11 +430,11 @@ void cSVDRP::CmdCHAN(const char *Option)
         return;
         }
      }
-  cChannel *channel = Channels.GetByNumber(cDvbApi::CurrentChannel());
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel)
      Reply(250, "%d %s", channel->number, channel->name);
   else
-     Reply(550, "Unable to find channel \"%d\"", cDvbApi::CurrentChannel());
+     Reply(550, "Unable to find channel \"%d\"", cDevice::CurrentChannel());
 }
 
 void cSVDRP::CmdDELC(const char *Option)
@@ -541,7 +541,7 @@ void cSVDRP::CmdGRAB(const char *Option)
         Reply(501, "Unexpected parameter \"%s\"", p);
         return;
         }
-     if (cDvbApi::PrimaryDvbApi->GrabImage(FileName, Jpeg, Quality, SizeX, SizeY))
+     if (cDevice::PrimaryDevice()->GrabImage(FileName, Jpeg, Quality, SizeX, SizeY))
         Reply(250, "Grabbed image %s", Option);
      else
         Reply(451, "Grab image failed");
@@ -926,22 +926,22 @@ void cSVDRP::CmdVOLU(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option))
-        cDvbApi::PrimaryDvbApi->SetVolume(strtol(Option, NULL, 10), true);
+        cDevice::PrimaryDevice()->SetVolume(strtol(Option, NULL, 10), true);
      else if (strcmp(Option, "+") == 0)
-        cDvbApi::PrimaryDvbApi->SetVolume(VOLUMEDELTA);
+        cDevice::PrimaryDevice()->SetVolume(VOLUMEDELTA);
      else if (strcmp(Option, "-") == 0)
-        cDvbApi::PrimaryDvbApi->SetVolume(-VOLUMEDELTA);
+        cDevice::PrimaryDevice()->SetVolume(-VOLUMEDELTA);
      else if (strcasecmp(Option, "MUTE") == 0)
-        cDvbApi::PrimaryDvbApi->ToggleMute();
+        cDevice::PrimaryDevice()->ToggleMute();
      else {
         Reply(501, "Unknown option: \"%s\"", Option);
         return;
         }
      }
-  if (cDvbApi::PrimaryDvbApi->IsMute())
+  if (cDevice::PrimaryDevice()->IsMute())
      Reply(250, "Audio is mute");
   else
-     Reply(250, "Audio volume is %d", cDvbApi::CurrentVolume());
+     Reply(250, "Audio volume is %d", cDevice::CurrentVolume());
 }
 
 #define CMD(c) (strcasecmp(Cmd, c) == 0)
diff --git a/thread.c b/thread.c
index 925fc4d9d..1448cd8ac 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.20 2002/05/13 16:32:09 kls Exp $
+ * $Id: thread.c 1.21 2002/06/01 15:28:46 kls Exp $
  */
 
 #include "thread.h"
@@ -147,6 +147,7 @@ bool cThread::Active(void)
 
 void cThread::Cancel(int WaitSeconds)
 {
+  running = false;
   if (WaitSeconds > 0) {
      for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
          if (!Active())
diff --git a/thread.h b/thread.h
index 3ac398a2c..d23814e57 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.12 2002/02/23 13:53:38 kls Exp $
+ * $Id: thread.h 1.13 2002/06/01 14:55:31 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -54,9 +54,9 @@ class cThread {
   static bool signalHandlerInstalled;
   static void SignalHandler(int signum);
   static void *StartThread(cThread *Thread);
+protected:
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
-protected:
   void WakeUp(void);
   virtual void Action(void) = 0;
   void Cancel(int WaitSeconds = 0);
diff --git a/tmp.dif b/tmp.dif
new file mode 100644
index 000000000..87c57b71f
--- /dev/null
+++ b/tmp.dif
@@ -0,0 +1,118 @@
+--- dvb.c
++++ dvb.c	Wed May 29 17:41:53 2002
+@@ -444,6 +444,8 @@
+ 			break;
+                 if (!dvb->arm_ready)
+                         continue;
++		if (down_interruptible(&dvb->dcomlock))
++			continue;
+                 newloops=rdebi(dvb, DEBINOSWAP, STATUS_LOOPS, 0, 2);
+                 if (newloops==dvb->arm_loops) {
+                         printk("dvb%d: ARM crashed!\n", dvb->num);
+@@ -451,6 +453,7 @@
+                         newloops=rdebi(dvb, DEBINOSWAP, STATUS_LOOPS, 0, 2)-1;
+                 }
+                 dvb->arm_loops=newloops;
++		up(&dvb->dcomlock);
+ 	}
+ 	dvb->arm_thread = NULL;
+ 	return 0;
+@@ -1158,6 +1161,31 @@
+         return blen;
+ }
+ 
++/* Timer to avoid broken data transfer in gpioirq() */
++
++#define GPIO_RXTIME_FRAME	((32*HZ)/1000)
++
++static void gpio_receive_timeout(unsigned long data)
++{
++	struct dvb_struct *dvb = (struct dvb_struct *)data;
++	dvb->debitimer.expires = 0;
++}
++
++static void gpio_receive_timer(struct dvb_struct *dvb, unsigned long ticks)
++{
++	dvb_demux_filter_t *dvbdmxfilter = dvb->handle2filter[((dvb->debitype)>>8)&0x1f];
++
++	if (!dvbdmxfilter || dvbdmxfilter->type != DMX_TYPE_TS)
++		return;
++	mod_timer(&dvb->debitimer, jiffies + ticks);
++}
++
++static inline int gpio_rx_pending(struct dvb_struct *dvb)
++{
++	return !timer_pending(&dvb->debitimer) && \
++		dvb->debitimer.expires == 0;
++}
++
+ static void 
+ gpioirq(struct saa7146* saa, void *data)
+ {
+@@ -1313,6 +1341,7 @@
+                         iwdebi(dvb, DEBINOSWAP, RX_BUFF, 0, 2);
+                         break;
+                 }                  /* yes, fall through */
++		gpio_receive_timer(dvb, GPIO_RXTIME_FRAME);
+         case DATA_TS_RECORD:
+         case DATA_PES_RECORD:
+                 saa7146_write(dvb->saa_mem, IER, 
+@@ -1843,7 +1872,7 @@
+         bpp=dvb->osdbpp[dvb->osdwin]+1; 
+         bpl=((w*bpp+7)&~7)/8; 
+         size=h*bpl;
+-        lpb=(32*1024)/bpl; 
++        lpb=(16*1024)/bpl; 
+         bnum=size/(lpb*bpl);
+         brest=size-bnum*lpb*bpl;
+ 
+@@ -1851,6 +1880,10 @@
+                 LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, lpb, inc, data); 
+                 BlitBitmap(dvb, dvb->osdwin, x0, y0+i*lpb, 0);
+                 data+=lpb*inc; 
++		if (gpio_rx_pending(dvb)) {
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(GPIO_RXTIME_FRAME);
++		}
+         }
+         if (brest) {
+                 LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, brest/bpl, inc, data); 
+@@ -3819,6 +3852,7 @@
+                 return TTBStop(dvb); 
+ 
+         if (dvbdmxfeed->type == DMX_TYPE_TS) {
++		del_timer(&dvb->debitimer);
+                 if (dvbdmxfeed->ts_type & TS_DECODER) {
+                         if (dvbdmxfeed->pes_type>=DMX_TS_PES_OTHER ||
+                             !dvbdmx->pesfilter[dvbdmxfeed->pes_type]) 
+@@ -5472,8 +5506,12 @@
+         spin_lock_init (&dvb->debilock);
+         sema_init(&dvb->dcomlock, 1);
+         init_waitqueue_head(&dvb->debiq);
++	init_timer(&dvb->debitimer);
+         dvb->debilock=SPIN_LOCK_UNLOCKED;
+         dvb->debitype=-1;
++	dvb->debitimer.function = gpio_receive_timeout;
++	dvb->debitimer.data = (unsigned long) dvb;
++	dvb->debitimer.expires = jiffies;
+ 
+         dvb->num=num;
+         dvb->i2cbus=adap;
+@@ -5741,6 +5779,7 @@
+ 
+ 	/* release the saa7146s */
+ 	for( i = 0; i < num_dvb; i++) {
++		del_timer_sync(&(dvbs[i].debitimer));
+ 		dvbs[i].arm_rmmod=1;
+ 		wake_up_interruptible(&dvbs[i].arm_wait);
+                 while (dvbs[i].arm_thread)
+--- dvb.h
++++ dvb.h	Wed May 29 17:41:08 2002
+@@ -566,6 +566,7 @@
+         spinlock_t              debilock;
+         struct semaphore        dcomlock;
+         WAIT_QUEUE              debiq;
++	struct timer_list	debitimer;
+         int                     debitype;
+         int                     debilen;
+         int                     debibuf;
diff --git a/tools.c b/tools.c
index 440ddd19f..08aa8ae5c 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.66 2002/05/13 17:56:17 kls Exp $
+ * $Id: tools.c 1.67 2002/05/18 15:10:45 kls Exp $
  */
 
 #include "tools.h"
@@ -793,14 +793,15 @@ void cListBase::Ins(cListObject *Object, cListObject *Before)
      }
 }
 
-void cListBase::Del(cListObject *Object)
+void cListBase::Del(cListObject *Object, bool DeleteObject)
 {
   if (Object == objects)
      objects = Object->Next();
   if (Object == lastObject)
      lastObject = Object->Prev();
   Object->Unlink();
-  delete Object;
+  if (DeleteObject)
+     delete Object;
 }
 
 void cListBase::Move(int From, int To)
diff --git a/tools.h b/tools.h
index d98dfb6ef..5f09edbea 100644
--- a/tools.h
+++ b/tools.h
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.45 2002/05/13 16:21:55 kls Exp $
+ * $Id: tools.h 1.47 2002/06/09 11:09:10 kls Exp $
  */
 
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
-//#include <errno.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,6 +18,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+typedef unsigned char uchar;
+
 extern int SysLogLevel;
 
 #define esyslog(a...) void( (SysLogLevel > 0) ? syslog(LOG_ERR,   a) : void() )
@@ -36,6 +38,9 @@ extern int SysLogLevel;
 
 #define DELETENULL(p) (delete (p), p = NULL)
 
+#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
+#define FATALERRNO (errno != EAGAIN && errno != EINTR)
+
 template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
 template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
@@ -135,7 +140,7 @@ class cListBase {
   virtual ~cListBase();
   void Add(cListObject *Object, cListObject *After = NULL);
   void Ins(cListObject *Object, cListObject *Before = NULL);
-  void Del(cListObject *Object);
+  void Del(cListObject *Object, bool DeleteObject = true);
   virtual void Move(int From, int To);
   void Move(cListObject *From, cListObject *To);
   virtual void Clear(void);
diff --git a/vdr.c b/vdr.c
index 7fffa6fad..bef3919ff 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.109 2002/05/13 16:32:49 kls Exp $
+ * $Id: vdr.c 1.114 2002/06/16 11:30:28 kls Exp $
  */
 
 #include <getopt.h>
@@ -31,11 +31,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "config.h"
-#include "dvbapi.h"
-#include "eit.h"
+#include "device.h"
+#include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
 #include "menu.h"
+#include "osd.h"
 #include "plugin.h"
 #include "recording.h"
 #include "tools.h"
@@ -117,15 +118,17 @@ int main(int argc, char *argv[])
   int c;
   while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:L:mp:P:r:s:t:v:Vw:", long_options, NULL)) != -1) {
         switch (c) {
-          case 'a': cDvbApi::SetAudioCommand(optarg);
+          /*XXX+
+          case 'a': cDevice::SetAudioCommand(optarg);
                     break;
+                    XXX*/
           case 'c': ConfigDirectory = optarg;
                     break;
           case 'd': DaemonMode = true; break;
           case 'D': if (isnumber(optarg)) {
                        int n = atoi(optarg);
-                       if (0 <= n && n < MAXDVBAPI) {
-                          cDvbApi::SetUseDvbApi(n);
+                       if (0 <= n && n < MAXDEVICES) {
+                          cDevice::SetUseDevice(n);
                           break;
                           }
                        }
@@ -146,7 +149,12 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
                     return 2;
                     break;
-          case 'L': PluginManager.SetDirectory(optarg);
+          case 'L': if (access(optarg, R_OK | X_OK) == 0)
+                       PluginManager.SetDirectory(optarg);
+                    else {
+                       fprintf(stderr, "vdr: can't access plugin directory: %s\n", optarg);
+                       return 2;
+                       }
                     break;
           case 'm': MuteAudio = true;
                     break;
@@ -317,10 +325,10 @@ int main(int argc, char *argv[])
 
   // DVB interfaces:
 
-  if (!cDvbApi::Init())
+  if (!cDevice::Initialize())
      return 2;
 
-  cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
+  cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
 
   cSIProcessor::Read();
 
@@ -329,13 +337,17 @@ int main(int argc, char *argv[])
   if (!PluginManager.StartPlugins())
      return 2;
 
+  // OSD:
+
+  cOsd::Initialize();
+
   // Channel:
 
   Channels.SwitchTo(Setup.CurrentChannel);
   if (MuteAudio)
-     cDvbApi::PrimaryDvbApi->ToggleMute();
+     cDevice::PrimaryDevice()->ToggleMute();
   else
-     cDvbApi::PrimaryDvbApi->SetVolume(Setup.CurrentVolume, true);
+     cDevice::PrimaryDevice()->SetVolume(Setup.CurrentVolume, true);
 
   cEITScanner EITScanner;
 
@@ -358,10 +370,10 @@ int main(int argc, char *argv[])
 
   // Main program loop:
 
-  cOsdBase *Menu = NULL;
+  cOsdObject *Menu = NULL;
   cReplayControl *ReplayControl = NULL;
   int LastChannel = -1;
-  int PreviousChannel = cDvbApi::CurrentChannel();
+  int PreviousChannel = cDevice::CurrentChannel();
   time_t LastActivity = 0;
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
@@ -386,12 +398,12 @@ int main(int argc, char *argv[])
               }
            }
         // Channel display:
-        if (!EITScanner.Active() && cDvbApi::CurrentChannel() != LastChannel) {
+        if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
            if (!Menu)
-              Menu = new cDisplayChannel(cDvbApi::CurrentChannel(), LastChannel > 0);
+              Menu = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel > 0);
            if (LastChannel > 0)
               PreviousChannel = LastChannel;
-           LastChannel = cDvbApi::CurrentChannel();
+           LastChannel = cDevice::CurrentChannel();
            }
         // Timers and Recordings:
         if (!Menu) {
@@ -404,7 +416,7 @@ int main(int argc, char *argv[])
               }
            }
         // User Input:
-        cOsdBase **Interact = Menu ? &Menu : (cOsdBase **)&ReplayControl;
+        cOsdObject **Interact = Menu ? &Menu : (cOsdObject **)&ReplayControl;
         eKeys key = Interface->GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
         if (NORMALKEY(key) != kNone) {
            EITScanner.Activity();
@@ -419,11 +431,11 @@ int main(int argc, char *argv[])
           case kVolDn:
           case kMute:
                if (key == kMute) {
-                  if (!cDvbApi::PrimaryDvbApi->ToggleMute() && !Menu)
+                  if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu)
                      break; // no need to display "mute off"
                   }
                else
-                  cDvbApi::PrimaryDvbApi->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
+                  cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
                if (!Menu && (!ReplayControl || !ReplayControl->Visible()))
                   Menu = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
@@ -467,7 +479,7 @@ int main(int argc, char *argv[])
                  case osSwitchDvb:
                                 DELETENULL(*Interact);
                                 Interface->Info(tr("Switching primary DVB..."));
-                                cDvbApi::SetPrimaryDvbApi(Setup.PrimaryDVB);
+                                cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                                 break;
                  case osBack:
                  case osEnd:    DELETENULL(*Interact);
@@ -480,7 +492,7 @@ int main(int argc, char *argv[])
                switch (key) {
                  // Toggle channels:
                  case k0: {
-                      int CurrentChannel = cDvbApi::CurrentChannel();
+                      int CurrentChannel = cDevice::CurrentChannel();
                       Channels.SwitchTo(PreviousChannel);
                       PreviousChannel = CurrentChannel;
                       break;
@@ -501,7 +513,7 @@ int main(int argc, char *argv[])
                  case kUp:
                  case kDown|k_Repeat:
                  case kDown: {
-                      int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
+                      int n = cDevice::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
                       cChannel *channel = Channels.GetByNumber(n);
                       if (channel)
                          channel->Switch();
@@ -517,14 +529,16 @@ int main(int argc, char *argv[])
           }
         if (!Menu) {
            EITScanner.Process();
+           /*XXX+
            if (!cVideoCutter::Active() && cVideoCutter::Ended()) {
               if (cVideoCutter::Error())
                  Interface->Error(tr("Editing process failed!"));
               else
                  Interface->Info(tr("Editing process finished"));
               }
+              XXX*/
            }
-        if (!*Interact && ((!cRecordControls::Active() && !cVideoCutter::Active()) || ForceShutdown)) {
+        if (!*Interact && ((!cRecordControls::Active() /*XXX+&& !cVideoCutter::Active()XXX*/) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
@@ -583,15 +597,17 @@ int main(int argc, char *argv[])
         }
   if (Interrupted)
      isyslog("caught signal %d", Interrupted);
-  cVideoCutter::Stop();
+  cRecordControls::Shutdown();
+  //XXX+cVideoCutter::Stop();
   delete Menu;
   delete ReplayControl;
   delete Interface;
+  cOsd::Shutdown();
   PluginManager.Shutdown(true);
-  Setup.CurrentChannel = cDvbApi::CurrentChannel();
-  Setup.CurrentVolume  = cDvbApi::CurrentVolume();
+  Setup.CurrentChannel = cDevice::CurrentChannel();
+  Setup.CurrentVolume  = cDevice::CurrentVolume();
   Setup.Save();
-  cDvbApi::Cleanup();
+  cDevice::Shutdown();
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
   isyslog("exiting");

From 54d069c95c546d6b12f6effc1af7a0274b7c31e4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Jun 2002 18:00:00 +0200
Subject: [PATCH 045/307] Version 1.1.4 - Added Hungarian language texts
 (thanks to Istvan Koenigsberger and Guido Josten). - Activated cutting. -
 Activated 'Transfer Mode'. - Moved handling of the Menu key entirely into
 vdr.c. - Switched VDR's own player to the new cPlayer/cControl structures. -
 Switched handling 'Transfer Mode' to the new cPlayer/cControl structures. -
 The following limitations apply to this version:   + The '-a' option (for
 Dolby Digital audio) doesn't work yet.   + Switching between different
 language tracks doesn't work yet.

---
 CONTRIBUTORS             |   3 +
 HISTORY                  |  18 ++-
 Makefile                 |   6 +-
 PLUGINS.html             | 188 ++++++++++++++++++++++++++---
 PLUGINS/SRC/hello/i18n.c |  20 +++-
 config.h                 |   4 +-
 cutter.c                 | 253 +++++++++++++++++++++++++++++++++++++++
 cutter.h                 |  29 +++++
 device.c                 |  23 ++--
 device.h                 |   6 +-
 dmxdev.c.diff            |  12 --
 dvbplayer.c              |  35 +-----
 dvbplayer.h              |   7 +-
 eitscan.c                |   4 +-
 i18n.c                   | 188 ++++++++++++++++++++++++++++-
 i18n.h                   |   4 +-
 interface.h              |   3 +-
 menu.c                   |  30 ++---
 menu.h                   |   4 +-
 osd.h                    |   5 +-
 player.c                 |  41 ++++++-
 player.h                 |  16 ++-
 recording.c              |  22 +++-
 recording.h              |   7 +-
 transfer.c               | 135 +++++++++++++++++++++
 transfer.h               |  44 +++++++
 vdr.c                    |  80 ++++++++-----
 27 files changed, 1030 insertions(+), 157 deletions(-)
 create mode 100644 cutter.c
 create mode 100644 cutter.h
 delete mode 100644 dmxdev.c.diff
 create mode 100644 transfer.c
 create mode 100644 transfer.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 22bbc704c..f886624e7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -362,3 +362,6 @@ Matthias Fechner <matthiasfechner@web.de>
 
 Paul Lacatus <paul@campina.iiruc.ro>
  for translating OSD texts to the Romanian language
+
+Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
+ for translating OSD texts to the Hungarian language
diff --git a/HISTORY b/HISTORY
index b15541c59..4b4eee989 100644
--- a/HISTORY
+++ b/HISTORY
@@ -724,7 +724,7 @@ Video Disk Recorder Revision History
   "next timer event at..." messages in that case).
 - Reduced the default value for MinEventTimeout to 30 minutes.
 - Fixed detecting manual start in shutdown feature.
-- An error message is now displayed in case the Transfer Mode can't be
+- An error message is now displayed in case the 'Transfer Mode' can't be
   started because the necessary DVB card is currently recording (or there
   is no DVB card that can access this channel).
 - Fixed toggling channels with the '0' key in case the "Ok" button has been
@@ -1108,7 +1108,7 @@ Video Disk Recorder Revision History
 - The "Left" and "Right" keys are now used to page up and down in text displays
   (like the EPG descriptions or the results of commands executed from the
   "Commands" menu).
-- Fixed high CPU usage in transfer mode.
+- Fixed high CPU usage in 'Transfer Mode'.
 - Replaced 'killproc' with 'killall' in 'runvdr', since apparently 'killproc'
   is not available by default on some Linux distributions, whereas 'killall' is.
   Please check if your system provides 'killall' - if it doesn't, please change
@@ -1343,7 +1343,19 @@ Video Disk Recorder Revision History
   will use the same DVB card. During the time where both timers record the data
   is simply saved to both files.
 - The following limitations apply to this version:
-  + Transfer mode doesn't work yet.
+  + 'Transfer Mode' doesn't work yet.
   + The '-a' option (for Dolby Digital audio) doesn't work yet.
   + Switching between different language tracks doesn't work yet.
   + Cutting doesn't work yet.
+
+2002-06-23: Version 1.1.4
+
+- Added Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten).
+- Activated cutting.
+- Activated 'Transfer Mode'.
+- Moved handling of the Menu key entirely into vdr.c.
+- Switched VDR's own player to the new cPlayer/cControl structures.
+- Switched handling 'Transfer Mode' to the new cPlayer/cControl structures.
+- The following limitations apply to this version:
+  + The '-a' option (for Dolby Digital audio) doesn't work yet.
+  + Switching between different language tracks doesn't work yet.
diff --git a/Makefile b/Makefile
index 3cc655f21..dd9741d15 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.40 2002/06/10 16:31:34 kls Exp $
+# $Id: Makefile 1.42 2002/06/22 10:21:56 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -21,10 +21,10 @@ INCLUDES = -I$(DVBDIR)/ost/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = audio.o config.o device.o dvbplayer.o dvbosd.o eit.o eitscan.o font.o i18n.o\
+OBJS = audio.o config.o cutter.o device.o dvbplayer.o dvbosd.o eit.o eitscan.o font.o i18n.o\
        interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
        recorder.o recording.o remote.o remux.o ringbuffer.o status.o svdrp.o thread.o\
-       tools.o vdr.o videodir.o
+       tools.o transfer.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
diff --git a/PLUGINS.html b/PLUGINS.html
index 9b5a496ca..59a2f18d7 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -12,7 +12,7 @@
 separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 This document is divided into two parts, the first one describing the
 <a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
 of the plugin system, and the second one describing the
@@ -23,16 +23,18 @@
 structures and allows it to hook itself into specific areas to perform special actions.
 <!--X1.1.3--></td></tr></table>
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.1 are marked like this.
 <!--X1.1.1--></td></tr></table>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.2 are marked like this.
 <!--X1.1.2--></td></tr></table>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.3 are marked like this.
 <!--X1.1.3--></td></tr></table>
-<!--<p>TODO: Link to the document about VDR base classes to use when implementing actual functionality (yet to be written).-->
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.4 are marked like this.
+<!--X1.1.4--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -129,7 +131,7 @@
 <p>
 and will unpack into a directory named
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <tt>hello-0.0.1</tt>
 <!--X1.1.2--></td></tr></table>
 <p>
@@ -137,7 +139,7 @@
 you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
@@ -203,7 +205,7 @@
 If your plugin requires additional source files, simply add them to your plugin's
 source directory and adjust the <tt>Makefile</tt> accordingly.
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Header files usually contain preprocessor statements that prevent the same
 file (or rather its contents, to be precise) from being included more than once, like
 
@@ -422,7 +424,7 @@
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement the function
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool Start(void);
 </pre></td></tr></table><p>
@@ -434,7 +436,7 @@
 stream, which is later presented to the user via a function that is available
 from the main menu.
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 A return value of <i>false</i> indicates that something has gone wrong and the
 plugin will not be able to perform its task. In that case, the plugin should
 write a proper error message to the log file. The first plugin that returns
@@ -498,7 +500,7 @@
 the plugin should launch a separate thread to do this.
 </b>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
@@ -545,7 +547,7 @@
 <i>true</i> if the parameter was parsed correctly, <i>false</i> in case of
 an error. If <i>false</i> is returned, an error message will be written to
 the log file (and program execution will continue).
-<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 A possible implementation of <tt>SetupParse()</tt> could look like this:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -600,7 +602,7 @@
 <tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
 parameters to the user.
 
-<!--X1.1.1--><table width=100%><tr><td bgcolor=lime>&nbsp;</td><td width=100%>
+<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="The Setup menu"><hr><h2>The Setup menu</h2>
 
 <center><i><b>Have it your way!</b></i></center><p>
@@ -660,7 +662,7 @@
 (like VDR does with its cSetup class).
 <!--X1.1.1--></td></tr></table>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=cyan>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
@@ -746,6 +748,9 @@
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { NULL }
   };
@@ -827,7 +832,7 @@
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
-<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 The <tt>Makefile</tt> that has been created by the call to
 <a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
 provides the target <tt>dist</tt>, which does this for you.
@@ -849,7 +854,7 @@
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<!--X1.1.3--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
 
 <hr><h2>Status monitor</h2>
@@ -926,5 +931,156 @@
 the functions you actually want to use.
 <!--X1.1.3--></td></tr></table>
 
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>Players</h2>
+
+<center><i><b>Play it again, Sam!</b></i></center><p>
+
+Implementing a player is a two step process.
+First you need the actual player class, which is derived from the abstract <tt>cPlayer</tt>:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/player.h&gt;
+
+class cMyPlayer : public cPlayer {
+protected:
+  virtual void Activate(bool On);
+public:
+  cMyPlayer(void);
+  virtual ~cMyPlayer();
+  };
+</pre></td></tr></table><p>
+
+What exactly you do in this class is entirely up to you. If you want to run a separate
+thread which, e.g.,  reads data from a file, you can additionally derive your class from
+<tt>cThread</tt> and implement the necessary functionality:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/player.h&gt;
+
+class cMyPlayer : public cPlayer, cThread {
+protected:
+  virtual void Activate(bool On);
+  virtual void Action(void);
+public:
+  cMyPlayer(void);
+  virtual ~cMyPlayer();
+  };
+</pre></td></tr></table><p>
+
+Take a look at the files <tt>player.h</tt> and <tt>dvbplayer.c</tt> to see how VDR implements
+its own player for the VDR recordings.
+<p>
+To play the video data, the player needs to call its member function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+int PlayVideo(const uchar *Data, int Length);
+</pre></td></tr></table><p>
+
+where <tt>Data</tt> point to a block of <tt>Length</tt> bytes of a PES data
+stream. There are no prerequisites regarding the length or alignment of an
+individual block of data. The sum of all blocks must simply result in the
+desired video data stream, and it must be delivered fast enough so that the
+DVB device doesn't run out of data.
+<p>
+TODO: PlayAudio()???
+<p>
+The second part needed here is a control object that receives user input from the main
+program loop and reacts on this by telling the player what to do:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/player.h&gt;
+
+class cMyControl : public cControl {
+private:
+  cMyPlayer *player;
+public:
+  cMyControl(void);
+  virtual ~cMyControl();
+  virtual void Hide(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+</pre></td></tr></table><p>
+
+<tt>cMyControl</tt> shall create an object of type <tt>cMyPlayer</tt> and
+hand over a pointer to it to the <tt>cControl</tt> base class, so that it
+can be later attached to the primary DVB device:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cMyControl::cMyControl(void)
+:cControl(player = new cMyPlayer)
+{
+}
+</pre></td></tr></table><p>
+
+<tt>cMyControl</tt> will receive the user's key presses through the <tt>ProcessKey()</tt>
+function. It will get all button presses, except for the volume control buttons
+(<tt>kVolUp</tt>, <tt>kVolDn</tt>, <tt>kMute</tt>), the power button (<tt>kPower</tt>)
+and the menu button (<tt>kMenu</tt>). If the user has not pressed a button for a while
+(which is typically in the area of about one second), <tt>ProcessKey()</tt> will be called
+with <tt>kNone</tt>, so that the <tt>cMyControl</tt> gets a chance to check whether its
+player is still active. Once the player has become inactive (because the user has decided
+to stop it or the DVB device has detached it), <tt>ProcessKey()</tt> must return <tt>osEnd</tt>
+to make the main program loop shut down the player control.
+<p>
+A derived <tt>cControl</tt> <b>must</b> implement the <tt>Hide()</tt> function, in which
+it has to hide itself from the OSD, in case it uses it. <tt>Hide()</tt> may be called at
+any time, and it may be called even if the <tt>cControl</tt> is not visible at the moment.
+The reason for this is that the <tt>Menu</tt> button shall always bring up the main VDR
+menu, so any active <tt>cControl</tt> needs to be hidden when that button is pressed.
+<p>
+Finally, to get things going, a plugin that implements a player (and the surrounding
+infrastructure like displaying a list of playable stuff etc) simply has to call the
+static function <tt>cControl::Launch()</tt> with the player control object, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cControl::Launch(new cMyControl);
+</pre></td></tr></table><p>
+
+Ownership of the <tt>MyControl</tt> object is handed over to the VDR core code,
+so the plugin should not keep a pointer to it, because VDR will destroy the object
+whenever it sees fit (for instance because a recording shall start that needs to
+use the primary DVB device, or the user decides to start a different replay).
+<p>
+The <tt>cPlayer</tt> class has a member function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+void DeviceStillPicture(const uchar *Data, int Length);
+</pre></td></tr></table><p>
+
+which can be called to display a still picture. VDR uses this function when handling
+its editing marks. A special case of a "player" might use this function to implement
+a "picture viewer". 
+<p>
+For detailed information on how to implement your own player, please take a look
+at VDR's <tt>cDvbPlayer</tt> and <tt>cDvbPlayerControl</tt> classes.
+<p>
+<b>User interface</b>
+<p>
+In order for a new player to nicely "blend in" to the overall VDR appearance it
+is recommended that it implements the same functionality with the same keys as the
+VDR player does (as far as this is possible and makes sense). The main points to
+consider here are
+<ul>
+<li>The <i>Ok</i> button shall bring up some display that indicates what is currently
+    being played, and what the status of this replay session is. As an alternative (for
+    instance with a DVD player) it may display a player specific menu, from which the
+    user can select certain options.
+<li>The <i>Up</i>, <i>Down</i>, <i>Left</i> and <i>Right</i> buttons shall control
+    <i>Play</i>, <i>Pause</i>, <i>Fast Rewind</i> and <i>Fast Forward</i>, respectively
+    (provided that this particular player can implement these functions) if the player
+    is not currently showing any menu. If there is a menu, they shall allow the user
+    to navigate in the menu.
+<li>The <i>Green</i> and <i>Yellow</i> buttons shall skip back- and forward by an
+    amount of time suitable for this player (provided that this particular player can
+    implement these functions).
+<li>The <i>Blue</i> button shall immediately stop the replay session.
+</ul>
+Of course, these are only suggestions which should make it easier for VDR users to
+enjoy additional players, since they will be able to control them with actions
+that they already know. If you absolutely want to do things differently, just go
+ahead - it's your show...
+<!--X1.1.4--></td></tr></table>
+
 </body>
 </html>
diff --git a/PLUGINS/SRC/hello/i18n.c b/PLUGINS/SRC/hello/i18n.c
index 9bb6fbf56..644bb50aa 100644
--- a/PLUGINS/SRC/hello/i18n.c
+++ b/PLUGINS/SRC/hello/i18n.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.c 1.2 2002/05/11 12:27:00 kls Exp $
+ * $Id: i18n.c 1.3 2002/06/23 13:05:59 kls Exp $
  */
 
 #include "i18n.h"
@@ -21,6 +21,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "Hello world!",
     "Hallo Welt!",
@@ -34,6 +37,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "Howdy folks!",
     "Tach zusammen!",
@@ -47,6 +53,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "A friendly greeting",
     "Ein freundlicher Gru�",
@@ -60,6 +69,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "Greeting time (s)",
     "Dauer des Gru�es (s)",
@@ -73,6 +85,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "Use alternate greeting",
     "Alternativen Gru� verwenden",
@@ -86,6 +101,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { NULL }
   };
diff --git a/config.h b/config.h
index 577d02df5..601b6fdd8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.118 2002/05/31 10:20:56 kls Exp $
+ * $Id: config.h 1.119 2002/06/16 14:49:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.3"
+#define VDRVERSION "1.1.4"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
new file mode 100644
index 000000000..2b623ed8e
--- /dev/null
+++ b/cutter.c
@@ -0,0 +1,253 @@
+/*
+ * cutter.c: The video cutting facilities
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: cutter.c 1.1 2002/06/22 10:09:34 kls Exp $
+ */
+
+#include "cutter.h"
+#include "recording.h"
+#include "remux.h"
+#include "thread.h"
+#include "videodir.h"
+
+// --- cCuttingThread --------------------------------------------------------
+
+class cCuttingThread : public cThread {
+private:
+  const char *error;
+  bool active;
+  int fromFile, toFile;
+  cFileName *fromFileName, *toFileName;
+  cIndexFile *fromIndex, *toIndex;
+  cMarks fromMarks, toMarks;
+protected:
+  virtual void Action(void);
+public:
+  cCuttingThread(const char *FromFileName, const char *ToFileName);
+  virtual ~cCuttingThread();
+  const char *Error(void) { return error; }
+  };
+
+cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
+{
+  error = NULL;
+  active = false;
+  fromFile = toFile = -1;
+  fromFileName = toFileName = NULL;
+  fromIndex = toIndex = NULL;
+  if (fromMarks.Load(FromFileName) && fromMarks.Count()) {
+     fromFileName = new cFileName(FromFileName, false, true);
+     toFileName = new cFileName(ToFileName, true, true);
+     fromIndex = new cIndexFile(FromFileName, false);
+     toIndex = new cIndexFile(ToFileName, true);
+     toMarks.Load(ToFileName); // doesn't actually load marks, just sets the file name
+     Start();
+     }
+  else
+     esyslog("no editing marks found for %s", FromFileName);
+}
+
+cCuttingThread::~cCuttingThread()
+{
+  active = false;
+  Cancel(3);
+  delete fromFileName;
+  delete toFileName;
+  delete fromIndex;
+  delete toIndex;
+}
+
+void cCuttingThread::Action(void)
+{
+  dsyslog("video cutting thread started (pid=%d)", getpid());
+
+  cMark *Mark = fromMarks.First();
+  if (Mark) {
+     fromFile = fromFileName->Open();
+     toFile = toFileName->Open();
+     active = fromFile >= 0 && toFile >= 0;
+     int Index = Mark->position;
+     Mark = fromMarks.Next(Mark);
+     int FileSize = 0;
+     int CurrentFileNumber = 0;
+     int LastIFrame = 0;
+     toMarks.Add(0);
+     toMarks.Save();
+     uchar buffer[MAXFRAMESIZE];
+     while (active) {
+           uchar FileNumber;
+           int FileOffset, Length;
+           uchar PictureType;
+
+           // Make sure there is enough disk space:
+
+           AssertFreeDiskSpace();
+
+           // Read one frame:
+
+           if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
+              if (FileNumber != CurrentFileNumber) {
+                 fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
+                 CurrentFileNumber = FileNumber;
+                 }
+              if (fromFile >= 0) {
+                 int len = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
+                 if (len < 0) {
+                    error = "ReadFrame";
+                    break;
+                    }
+                 if (len != Length) {
+                    CurrentFileNumber = 0; // this re-syncs in case the frame was larger than the buffer
+                    Length = len;
+                    }
+                 }
+              else {
+                 error = "fromFile";
+                 break;
+                 }
+              }
+           else
+              break;
+
+           // Write one frame:
+
+           if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
+              if (!Mark) // edited version shall end before next I-frame
+                 break;
+              if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
+                 toFile = toFileName->NextFile();
+                 if (toFile < 0) {
+                    error = "toFile 1";
+                    break;
+                    }
+                 FileSize = 0;
+                 }
+              LastIFrame = 0;
+              }
+           if (safe_write(toFile, buffer, Length) < 0) {
+              error = "safe_write";
+              break;
+              }
+           if (!toIndex->Write(PictureType, toFileName->Number(), FileSize)) {
+              error = "toIndex";
+              break;
+              }
+           FileSize += Length;
+           if (!LastIFrame)
+              LastIFrame = toIndex->Last();
+
+           // Check editing marks:
+
+           if (Mark && Index >= Mark->position) {
+              Mark = fromMarks.Next(Mark);
+              toMarks.Add(LastIFrame);
+              if (Mark)
+                 toMarks.Add(toIndex->Last() + 1);
+              toMarks.Save();
+              if (Mark) {
+                 Index = Mark->position;
+                 Mark = fromMarks.Next(Mark);
+                 CurrentFileNumber = 0; // triggers SetOffset before reading next frame
+                 if (Setup.SplitEditedFiles) {
+                    toFile = toFileName->NextFile();
+                    if (toFile < 0) {
+                       error = "toFile 2";
+                       break;
+                       }
+                    FileSize = 0;
+                    }
+                 }
+              // the 'else' case (i.e. 'final end mark reached') is handled above
+              // in 'Write one frame', so that the edited version will end right
+              // before the next I-frame.
+              }
+           }
+     }
+  else
+     esyslog("no editing marks found!");
+  dsyslog("end video cutting thread");
+}
+
+// --- cCutter ---------------------------------------------------------------
+
+char *cCutter::editedVersionName = NULL;
+cCuttingThread *cCutter::cuttingThread = NULL;
+bool cCutter::error = false;
+bool cCutter::ended = false;
+
+bool cCutter::Start(const char *FileName)
+{
+  if (!cuttingThread) {
+     error = false;
+     ended = false;
+     cRecording Recording(FileName);
+     const char *evn = Recording.PrefixFileName('%');
+     if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
+        // XXX this can be removed once RenameVideoFile() follows symlinks (see videodir.c)
+        // remove a possible deleted recording with the same name to avoid symlink mixups:
+        char *s = strdup(evn);
+        char *e = strrchr(s, '.');
+        if (e) {
+           if (strcmp(e, ".rec") == 0) {
+              strcpy(e, ".del");
+              RemoveVideoFile(s);
+              }
+           }
+        delete s;
+        // XXX
+        editedVersionName = strdup(evn);
+        Recording.WriteSummary();
+        cuttingThread = new cCuttingThread(FileName, editedVersionName);
+        return true;
+        }
+     }
+  return false;
+}
+
+void cCutter::Stop(void)
+{
+  bool Interrupted = cuttingThread && cuttingThread->Active();
+  const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
+  delete cuttingThread;
+  cuttingThread = NULL;
+  if ((Interrupted || Error) && editedVersionName) {
+     if (Interrupted)
+        isyslog("editing process has been interrupted");
+     if (Error)
+        esyslog("ERROR: '%s' during editing process", Error);
+     RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed?
+     }
+}
+
+bool cCutter::Active(void)
+{
+  if (cuttingThread) {
+     if (cuttingThread->Active())
+        return true;
+     error = cuttingThread->Error();
+     Stop();
+     if (!error)
+        cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
+     delete editedVersionName;
+     editedVersionName = NULL;
+     ended = true;
+     }
+  return false;
+}
+
+bool cCutter::Error(void)
+{
+  bool result = error;
+  error = false;
+  return result;
+}
+
+bool cCutter::Ended(void)
+{
+  bool result = ended;
+  ended = false;
+  return result;
+}
diff --git a/cutter.h b/cutter.h
new file mode 100644
index 000000000..8275281fc
--- /dev/null
+++ b/cutter.h
@@ -0,0 +1,29 @@
+/*
+ * cutter.h: The video cutting facilities
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: cutter.h 1.1 2002/06/22 10:03:15 kls Exp $
+ */
+
+#ifndef __CUTTER_H
+#define __CUTTER_H
+
+class cCuttingThread;
+
+class cCutter {
+private:
+  static char *editedVersionName;
+  static cCuttingThread *cuttingThread;
+  static bool error;
+  static bool ended;
+public:
+  static bool Start(const char *FileName);
+  static void Stop(void);
+  static bool Active(void);
+  static bool Error(void);
+  static bool Ended(void);
+  };
+
+#endif //__CUTTER_H
diff --git a/device.c b/device.c
index fe756592e..c85cd450a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.2 2002/06/16 13:23:31 kls Exp $
+ * $Id: device.c 1.5 2002/06/23 12:51:24 kls Exp $
  */
 
 #include "device.h"
@@ -21,6 +21,7 @@ extern "C" {
 #include "player.h"
 #include "receiver.h"
 #include "status.h"
+#include "transfer.h"
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_OST_OSD       "/dev/ost/osd"
@@ -456,8 +457,7 @@ bool cDevice::SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output)
 
 eSetChannelResult cDevice::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr)
 {
-  //XXX+StopTransfer();
-  //XXX+StopReplay();
+  StopReplay();
 
   cStatus::MsgChannelSwitch(this, 0);
 
@@ -620,10 +620,8 @@ eSetChannelResult cDevice::SetChannel(int ChannelNumber, int Frequency, char Pol
   if (NeedsTransferMode) {
      cDevice *CaDevice = GetDevice(Ca, 0);
      if (CaDevice && !CaDevice->Receiving()) {
-        if ((Result = CaDevice->SetChannel(ChannelNumber, Frequency, Polarization, Diseqc, Srate, Vpid, Apid, Tpid, Ca, Pnr)) == scrOk) {
-           //XXX+SetModeReplay();
-           //XXX+transferringFromDevice = CaDevice->StartTransfer(fd_video);
-           }
+        if ((Result = CaDevice->SetChannel(ChannelNumber, Frequency, Polarization, Diseqc, Srate, Vpid, Apid, Tpid, Ca, Pnr)) == scrOk)
+           cControl::Launch(new cTransferControl(CaDevice, Vpid, Apid, 0, 0, 0));//XXX+
         }
      else
         Result = scrNoTransfer;
@@ -731,15 +729,10 @@ void cDevice::StillPicture(const uchar *Data, int Length)
 
 bool cDevice::Replaying(void)
 {
-  /*XXX+
-  if (replayBuffer && !replayBuffer->Active())
-     StopReplay();
-  return replayBuffer != NULL;
-  XXX*/
   return player != NULL;
 }
 
-bool cDevice::Attach(cPlayer *Player)
+bool cDevice::AttachPlayer(cPlayer *Player)
 {
   if (Receiving()) {
      esyslog("ERROR: attempt to attach a cPlayer while receiving on device %d - ignored", CardIndex() + 1);
@@ -792,6 +785,8 @@ void cDevice::StopReplay(void)
 {
   if (player) {
      Detach(player);
+     if (IsPrimaryDevice())
+        cControl::Shutdown();
      /*XXX+
      if (IsPrimaryDevice()) {
         // let's explicitly switch the channel back in case it was in Transfer Mode:
@@ -958,7 +953,7 @@ void cDevice::Action(void)
   dsyslog("receiver thread ended on device %d (pid=%d)", CardIndex() + 1, getpid());
 }
 
-bool cDevice::Attach(cReceiver *Receiver)
+bool cDevice::AttachReceiver(cReceiver *Receiver)
 {
   //XXX+ check for same transponder???
   if (!Receiver)
diff --git a/device.h b/device.h
index a25ff94ff..6f2a34fd0 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.1 2002/06/09 15:48:32 kls Exp $
+ * $Id: device.h 1.3 2002/06/23 11:50:24 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -172,7 +172,7 @@ class cDevice : cThread {
        // Returns true if we are currently replaying.
   void StopReplay(void);
        // Stops the current replay session (if any).
-  bool Attach(cPlayer *Player);
+  bool AttachPlayer(cPlayer *Player);
   void Detach(cPlayer *Player);
   virtual int PlayVideo(const uchar *Data, int Length);
   virtual int PlayAudio(const uchar *Data, int Length);
@@ -192,7 +192,7 @@ class cDevice : cThread {
        // Returns the ca of the current receiving session.
   bool Receiving(void);
        // Returns true if we are currently receiving.
-  bool Attach(cReceiver *Receiver);
+  bool AttachReceiver(cReceiver *Receiver);
   void Detach(cReceiver *Receiver);
   };
 
diff --git a/dmxdev.c.diff b/dmxdev.c.diff
deleted file mode 100644
index 85672c0fc..000000000
--- a/dmxdev.c.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- dmxdev.c	Mon Apr  1 10:59:46 2002
-+++ dmxdev.c	Sun Jun 16 11:02:38 2002
-@@ -1048,6 +1048,9 @@
- 		if (dmxdev->dvr_buffer.pread!=dmxdev->dvr_buffer.pwrite)
- 			return (POLLIN | POLLRDNORM | POLLPRI);
- 		
-+                if (dmxdev->dvr_buffer.error)
-+	                return (POLLIN | POLLRDNORM | POLLPRI | POLLERR);
-+
- 		return 0;
- 	} else 
- 	        return (POLLOUT | POLLWRNORM | POLLPRI);
diff --git a/dvbplayer.c b/dvbplayer.c
index 10fdf4b57..9ea8eb138 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.1 2002/06/16 10:59:45 kls Exp $
+ * $Id: dvbplayer.c 1.4 2002/06/23 10:52:51 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -13,22 +13,6 @@
 #include "ringbuffer.h"
 #include "thread.h"
 
-// --- ReadFrame -------------------------------------------------------------
-
-int ReadFrame(int f, uchar *b, int Length, int Max)
-{
-  if (Length == -1)
-     Length = Max; // this means we read up to EOF (see cIndex)
-  else if (Length > Max) {
-     esyslog("ERROR: frame larger than buffer (%d > %d)", Length, Max);
-     Length = Max;
-     }
-  int r = safe_read(f, b, Length);
-  if (r < 0)
-     LOG_ERROR;
-  return r;
-}
-
 // --- cBackTrace ----------------------------------------------------------
 
 #define AVG_FRAME_SIZE 15000         // an assumption about the average frame size
@@ -91,9 +75,6 @@ int cBackTrace::Get(bool Forward)
 // (must be larger than MINVIDEODATA - see remux.h)
 #define VIDEOBUFSIZE  MEGABYTE(1)
 
-// The maximum size of a single frame:
-#define MAXFRAMESIZE  KILOBYTE(192)
-
 // The number of frames to back up when resuming an interrupted replay session:
 #define RESUMEBACKUP (10 * FRAMESPERSEC)
 
@@ -644,9 +625,9 @@ bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
 
 // --- cDvbPlayerControl -----------------------------------------------------
 
-cDvbPlayerControl::cDvbPlayerControl(void)
+cDvbPlayerControl::cDvbPlayerControl(const char *FileName)
+:cControl(player = new cDvbPlayer(FileName))
 {
-  player = NULL;
 }
 
 cDvbPlayerControl::~cDvbPlayerControl()
@@ -659,16 +640,6 @@ bool cDvbPlayerControl::Active(void)
   return player && player->Active();
 }
 
-bool cDvbPlayerControl::Start(const char *FileName)
-{
-  delete player;
-  player = new cDvbPlayer(FileName);
-  if (cDevice::PrimaryDevice()->Attach(player))
-     return true;
-  Stop();
-  return false;
-}
-
 void cDvbPlayerControl::Stop(void)
 {
   delete player;
diff --git a/dvbplayer.h b/dvbplayer.h
index b05bcdfab..41590257b 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 1.1 2002/06/16 10:59:14 kls Exp $
+ * $Id: dvbplayer.h 1.2 2002/06/23 10:13:51 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
@@ -19,11 +19,10 @@ class cDvbPlayerControl : public cControl {
 private:
   cDvbPlayer *player;
 public:
-  cDvbPlayerControl(void);
+  cDvbPlayerControl(const char *FileName);
+       // Sets up a player for the given file.
   virtual ~cDvbPlayerControl();
   bool Active(void);
-  bool Start(const char *FileName);
-       // Starts replaying the given file.
   void Stop(void);
        // Stops the current replay session (if any).
   void Pause(void);
diff --git a/eitscan.c b/eitscan.c
index f620b096f..a275abe00 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.2 2002/06/02 09:02:05 kls Exp $
+ * $Id: eitscan.c 1.3 2002/06/22 13:02:40 kls Exp $
  */
 
 #include "eitscan.h"
@@ -52,7 +52,7 @@ void cEITScanner::Process(void)
             cDevice *Device = cDevice::GetDevice(i + 1, MAXPRIORITY + 1);
             if (Device) {
                if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                  if (!(Device->Receiving() || Device->Replaying()/*XXX+ || Device->Transferring()XXX*/)) {
+                  if (!(Device->Receiving() || Device->Replaying())) {
                      int oldCh = lastChannel;
                      int ch = oldCh + 1;
                      while (ch != oldCh) {
diff --git a/i18n.c b/i18n.c
index 84164a30b..39948c2a6 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.91 2002/06/10 16:16:08 kls Exp $
+ * $Id: i18n.c 1.92 2002/06/22 09:26:36 kls Exp $
  *
  * Translations provided by:
  *
@@ -20,6 +20,7 @@
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
  * Swedish     Tomas Prybil <tomas@prybil.se>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
+ * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  *
  */
 
@@ -83,6 +84,7 @@ const tI18nPhrase Phrases[] = {
     "Ellinika",
     "Svenska",
     "Romaneste",
+    "Magyar",
   },
   // Menu titles:
   { "VDR",
@@ -99,6 +101,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -114,6 +117,7 @@ const tI18nPhrase Phrases[] = {
     "Programma",
     "Program",
     "Program",
+    "Program",
   },
   { "Channels",
     "Kan�le",
@@ -129,6 +133,7 @@ const tI18nPhrase Phrases[] = {
     "Kanalia",
     "Kanaler",
     "Canale",
+    "Csatorn�k",
   },
   { "Timers",
     "Timer",
@@ -144,6 +149,7 @@ const tI18nPhrase Phrases[] = {
     "Programmatismos",
     "Timers",
     "Timere",
+    "Felv�tel beprogramoz�sa",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -159,6 +165,7 @@ const tI18nPhrase Phrases[] = {
     "Egrafes",
     "Inspelningar",
     "Inregistrari",
+    "Felvett ad�sok",
   },
   { "Setup",
     "Einstellungen",
@@ -174,6 +181,7 @@ const tI18nPhrase Phrases[] = {
     "Rithmisis",
     "Inst�llningar",
     "Setari",
+    "Be�ll�t�sok",
   },
   { "Commands",
     "Befehle",
@@ -189,6 +197,7 @@ const tI18nPhrase Phrases[] = {
     "Entoles",
     "Kommandon",
     "Comenzi",
+    "Parancsok",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -204,6 +213,7 @@ const tI18nPhrase Phrases[] = {
     "Prosarmoges kanaliou",
     "�ndra kanal",
     "Editare canale",
+    "Csatorn�k be�ll�t�sa",
   },
   { "Edit timer",
     "Timer editieren",
@@ -219,6 +229,7 @@ const tI18nPhrase Phrases[] = {
     "Prosarmoges programmatismou",
     "�ndra timer",
     "Editare timere",
+    "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
   },
   { "Event",
     "Sendung",
@@ -234,6 +245,7 @@ const tI18nPhrase Phrases[] = {
     "Ekpompi",
     "S�ndning",
     "Evenimente",
+    "Ad�s",
   },
   { "Summary",
     "Inhalt",
@@ -249,6 +261,7 @@ const tI18nPhrase Phrases[] = {
     "Periexomeno",
     "Sammandrag",
     "Cuprins",
+    "Tartalom",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -264,6 +277,7 @@ const tI18nPhrase Phrases[] = {
     "Programma - %s",
     "Program - %s",
     "Program - %s",
+    "Program - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -279,6 +293,7 @@ const tI18nPhrase Phrases[] = {
     "Ti pezi tora",
     "Vilket program s�nds nu?",
     "Programul actual?",
+    "Mi megy most?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -294,6 +309,7 @@ const tI18nPhrase Phrases[] = {
     "Ti tha peksi meta",
     "Vilket �r n�sta program?",
     "Programul urmator?",
+    "Mi k�vetkezik?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -310,6 +326,7 @@ const tI18nPhrase Phrases[] = {
     "Prosarmogi",
     "�ndra",
     "Modificare",
+    "Be�ll�tani",
   },
   { "New",
     "Neu",
@@ -325,6 +342,7 @@ const tI18nPhrase Phrases[] = {
     "Neo",
     "Ny",
     "Nou",
+    "�j",
   },
   { "Delete",
     "L�schen",
@@ -340,6 +358,7 @@ const tI18nPhrase Phrases[] = {
     "Swisimo",
     "Ta bort",
     "Sterge",
+    "T�r�lni",
   },
   { "Mark",
     "Markieren",
@@ -355,6 +374,7 @@ const tI18nPhrase Phrases[] = {
     "Markarisma",
     "M�rk",
     "Marcheaza",
+    "Megjel�lni",
   },
   { "On/Off",
     "Ein/Aus",
@@ -370,6 +390,7 @@ const tI18nPhrase Phrases[] = {
     "Energo/Klisto",
     "P�/Av",
     "Pornit/Oprit",
+    "Be/Ki",
   },
   { "Record",
     "Aufnehmen",
@@ -385,6 +406,7 @@ const tI18nPhrase Phrases[] = {
     "Egrafi",
     "Inspelning",
     "Inregistrare",
+    "Felvenni",
   },
   { "Play",
     "Wiedergabe",
@@ -400,6 +422,7 @@ const tI18nPhrase Phrases[] = {
     "Anametadosi",
     "Spela upp",
     "Redare",
+    "Lej�tszani",
   },
   { "Rewind",
     "Anfang",
@@ -415,6 +438,7 @@ const tI18nPhrase Phrases[] = {
     "Arxi",
     "�terspolning",
     "Inapoi",
+    "Vissza az elej�re",
   },
   { "Button$Stop",
     "Beenden",
@@ -430,6 +454,7 @@ const tI18nPhrase Phrases[] = {
     "Terma",
     "Stopp",
     "Stop",
+    "Stop",
   },
   { "Resume",
     "Weiter",
@@ -445,6 +470,7 @@ const tI18nPhrase Phrases[] = {
     "Sinexia",
     "Forts�tt",
     "Reia",
+    "Tov�bb",
   },
   { "Summary",
     "Inhalt",
@@ -460,6 +486,7 @@ const tI18nPhrase Phrases[] = {
     "Periexomeno",
     "Sammandrag",
     "Cuprins",
+    "Tartalom",
   },
   { "Open",
     "�ffnen",
@@ -475,6 +502,7 @@ const tI18nPhrase Phrases[] = {
     "Anigma",
     "�ppna",
     "Deschide",
+    "Kinyitni",
   },
   { "Switch",
     "Umschalten",
@@ -490,6 +518,7 @@ const tI18nPhrase Phrases[] = {
     "Alagi",
     "Byt",
     "Schimba",
+    "�tkapcsolni",
   },
   { "Now",
     "Jetzt",
@@ -505,6 +534,7 @@ const tI18nPhrase Phrases[] = {
     "Tora",
     "Nu",
     "Acum",
+    "Most",
   },
   { "Next",
     "N�chste",
@@ -520,6 +550,7 @@ const tI18nPhrase Phrases[] = {
     "Epomeno",
     "N�sta",
     "Urmator",
+    "K�vetkez�",
   },
   { "Button$Schedule",
     "Programm",
@@ -535,6 +566,7 @@ const tI18nPhrase Phrases[] = {
     "Programma",
     "Program",
     "Program",
+    "Program",
   },
   { "Language",
     "Sprache",
@@ -550,6 +582,7 @@ const tI18nPhrase Phrases[] = {
     "Glosa",
     "Spr�k",
     "Limba",
+    "Nyelv",
   },
   { "Eject",
     "Auswerfen",
@@ -565,6 +598,7 @@ const tI18nPhrase Phrases[] = {
     "Apovoli",
     "Mata ut",
     "Ejecteaza",
+    "Kidobni",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -580,6 +614,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
+    "ABC/abc",
   },
   { "Insert",
     "Einf�gen",
@@ -595,6 +630,7 @@ const tI18nPhrase Phrases[] = {
     "Isodos",
     "Infoga",
     "Insereaza",
+    "Beilleszteni",
   },
   { "Overwrite",
     "�berschreiben",
@@ -610,6 +646,7 @@ const tI18nPhrase Phrases[] = {
     "Epanagrafi",
     "Skriv �ver",
     "Suprascrie",
+    "�t�rni",
   },
   // Confirmations:
   { "Delete channel?",
@@ -626,6 +663,7 @@ const tI18nPhrase Phrases[] = {
     "Na sviso to kanali?",
     "Ta bort kanalen?",
     "Sterg canalul?",
+    "Csatorna t�rl�se?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -641,6 +679,7 @@ const tI18nPhrase Phrases[] = {
     "Svisimo tou programmitismou?",
     "Ta bort timern?",
     "Sterg timer-ul?",
+    "Felv�tel beprogramoz�s�nak t�rl�se?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -656,6 +695,7 @@ const tI18nPhrase Phrases[] = {
     "Svisimo tis egrafis?",
     "Ta bort inspelningen?",
     "Sterg inregistrarea?",
+    "Felv�tel t�rl�se?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -671,6 +711,7 @@ const tI18nPhrase Phrases[] = {
     "Ginete akoma programmatismeni egrafi - na svisti sigoura?",
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
     "Timer-ul in inregistrare - sterg?",
+    "Felv�tel folyamatban van - m�gis t�r�lni?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -686,6 +727,7 @@ const tI18nPhrase Phrases[] = {
     "Akirosi egrafis?",
     "Stanna inspelning?",
     "Opresc inregistrarea?",
+    "Felv�tel befejezni?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -701,6 +743,7 @@ const tI18nPhrase Phrases[] = {
     "stin protevon karta",
     "fr�n det f�rsta enheten?",
     "pe prima interfata",
+    "az els� k�rty�n",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -716,6 +759,7 @@ const tI18nPhrase Phrases[] = {
     "Akirosi alagon?",
     "Avbryta editeringen?",
     "Opresc editarea?",
+    "V�g�st befejezni?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -731,6 +775,7 @@ const tI18nPhrase Phrases[] = {
     "Na gini sigoura epanekinisi?",
     "Vill du verkligen starta om?",
     "Esti sigur de repornire?",
+    "T�nyleg �jraind�tani?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -746,6 +791,7 @@ const tI18nPhrase Phrases[] = {
     "Ginete egrafi - na gini epanekinisi sigoura?",
     "Inspelning p�g�r, vill du starta om i alla fall?",
     "In inregistrare - repornesc?",
+    "Felv�tel folyamatban van - m�gis �jraind�tani?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -761,6 +807,7 @@ const tI18nPhrase Phrases[] = {
     "Ginete egrafi - na stamatisi i litourgia sigoura?",
     "Inspelning p�g�r, vill du avbryta i alla fall?",
     "In inregistrare - opresc?",
+    "Felv�tel folyamatban van - m�gis kikapcsolni?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -776,6 +823,7 @@ const tI18nPhrase Phrases[] = {
     "Anamenete egrafi se %d lepta - na stamatisi i litourgia sigoura?",
     "Inspelning startar om %d minuter, vill du avsluta?",
     "Inregistrez in %d minute, opresc?",
+    "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -791,6 +839,7 @@ const tI18nPhrase Phrases[] = {
     "Piese ena pliktro na stamatisi to katevasma",
     "Tryck valfri knapp f�r att avbryta nedst�ngning",
     "Apasa orice tasta pentru a anula inchiderea",
+    "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
   },
   // Channel parameters:
   { "Name",
@@ -807,6 +856,7 @@ const tI18nPhrase Phrases[] = {
     "Onoma",
     "Namn",
     "Nume",
+    "N�v",
   },
   { "Frequency",
     "Frequenz",
@@ -822,6 +872,7 @@ const tI18nPhrase Phrases[] = {
     "Sixnotita",
     "Frekvens",
     "Frecventa",
+    "Frekvencia",
   },
   { "Polarization",
     "Polarisation",
@@ -837,6 +888,7 @@ const tI18nPhrase Phrases[] = {
     "Polosi",
     "Polarisation",
     "Polarizare",
+    "Polariz�ci�",
   },
   { "DiSEqC",
     "DiSEqC",
@@ -852,6 +904,7 @@ const tI18nPhrase Phrases[] = {
     "DiSEqC",
     "DiSEqC",
     "DiSEqC",
+    "DiSEqC",
   },
   { "Srate",
     "Srate",
@@ -867,6 +920,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Rata simboluri",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -882,6 +936,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "PID Video",
+    "Vpid",
   },
   { "Apid1",
     "Apid1",
@@ -897,6 +952,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1",
     "Apid1",
     "PID Audio (1)",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -912,6 +968,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "PID Audio (2)",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -927,6 +984,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1",
     "Dpid1",
     "PID AC3 (1)",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -942,6 +1000,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2",
     "Dpid2",
     "PID AC3 (2)",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -957,6 +1016,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid",
     "Tpid",
     "PID Teletext",
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -972,6 +1032,7 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "CA",
     "Criptare",
+    "CA",
   },
   { "Pnr",
     "Pnr",
@@ -987,6 +1048,7 @@ const tI18nPhrase Phrases[] = {
     "Pnr",
     "Pnr",
     "Nr. Prog.",
+    "Pnr",
   },
   // Timer parameters:
   { "Active",
@@ -1003,6 +1065,7 @@ const tI18nPhrase Phrases[] = {
     "Energo",
     "Aktiv",
     "Activ",
+    "Aktiv",
   },
   { "Channel",
     "Kanal",
@@ -1018,6 +1081,7 @@ const tI18nPhrase Phrases[] = {
     "Kanali",
     "Kanal",
     "Canal",
+    "Csatorna",
   },
   { "Day",
     "Tag",
@@ -1033,6 +1097,7 @@ const tI18nPhrase Phrases[] = {
     "Imera",
     "Dag",
     "Ziua",
+    "Nap",
   },
   { "Start",
     "Anfang",
@@ -1048,6 +1113,7 @@ const tI18nPhrase Phrases[] = {
     "Arxi",
     "B�rjar",
     "Start",
+    "Kezdet",
   },
   { "Stop",
     "Ende",
@@ -1063,6 +1129,7 @@ const tI18nPhrase Phrases[] = {
     "Telos",
     "Slutar",
     "Stop",
+    "V�ge",
   },
   { "Priority",
     "Priorit�t",
@@ -1078,6 +1145,7 @@ const tI18nPhrase Phrases[] = {
     "Protereotita",
     "Prioritet",
     "Prioritate",
+    "Priorit�s",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1093,6 +1161,7 @@ const tI18nPhrase Phrases[] = {
     "Xronos Zois",
     "Speltid",
     "Durata",
+    "�lettartam",
   },
   { "File",
     "Datei",
@@ -1108,6 +1177,7 @@ const tI18nPhrase Phrases[] = {
     "Arxeio",
     "Filnamn",
     "Fisier",
+    "File",
   },
   { "First day",
     "Erster Tag",
@@ -1123,6 +1193,7 @@ const tI18nPhrase Phrases[] = {
     "Proti mera",
     "F�rsta dag",
     "Prima zi",
+    "Els� nap",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -1139,6 +1210,7 @@ const tI18nPhrase Phrases[] = {
     "To kanali xrisimopiite apo programmatismeni thesi",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
+    "Csatorn�t m�s haszn�lja!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1154,6 +1226,7 @@ const tI18nPhrase Phrases[] = {
     "Den mporo na pao sto kanali!",
     "Om�jligt att byta kanal!",
     "Nu pot comuta canalul!",
+    "Csatorn�t nem lehet �tkapcsolni!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1169,6 +1242,7 @@ const tI18nPhrase Phrases[] = {
     "Ginete progrmamatismeni egrafi!",
     "Timerstyrd inspelning p�g�r!",
     "Timer-ul este in inregistrare!",
+    "Felv�tel folyamatban van!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1184,6 +1258,7 @@ const tI18nPhrase Phrases[] = {
     "Lathos stin evresi tis egrafis!",
     "Det g�r inte att l�sa inspelningen",
     "Eroare in timpul accesarii inregistrarii",
+    "Hiba a felv�tel hozz�f�r�s�n�l",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1199,6 +1274,7 @@ const tI18nPhrase Phrases[] = {
     "Lathos stin prospathia na svisti i egrafi!",
     "Det g�r inte att ta bort inspelningen",
     "Eroare in timpul stergerii inregistrarii!",
+    "Hiba a felv�tel t�rl�s�n�l!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1214,6 +1290,7 @@ const tI18nPhrase Phrases[] = {
     "*** Kanali akiro ***",
     "*** Felaktig kanal ***",
     "*** Canal invalid ***",
+    "*** �rv�nytelen csatorna ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1229,6 +1306,7 @@ const tI18nPhrase Phrases[] = {
     "Den iparxi elevteri DVB Karta gia egrafi!",
     "Det finns ingen ledig DVB enhet f�r inspelning!",
     "Nu mai sunt dispozitive DVB pentru inregistrare!",
+    "Nincs szabad DVB k�rtya a felv�telhez!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -1244,6 +1322,7 @@ const tI18nPhrase Phrases[] = {
     "To kanali ine mplokarismeno (Ginete egrafi)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
     "Canal blocat (inregistrare)!",
+    "Csatorna hozz�f�rhetetlen (felv�tel)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -1259,6 +1338,7 @@ const tI18nPhrase Phrases[] = {
     "Den mpori na arxisi to Transfer-Mode!",
     "Kan inte starta Transfer Mode!",
     "Nu pot porni Modul de Transfer!",
+    "Transfer-Mode nem ind�that�!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -1274,6 +1354,7 @@ const tI18nPhrase Phrases[] = {
     "Den mpori na arxisi to kopsimo tis tenias!",
     "Kan inte starta editering!",
     "Nu pot porni procesul de editare!",
+    "A v�g�s nem ind�that�!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1289,6 +1370,7 @@ const tI18nPhrase Phrases[] = {
     "To kopsimo ti tenias ini idi se litourgia!",
     "Editering �r redan aktiv!",
     "Procesul de editare este activ!",
+    "A v�g�s m�r aktiv�lt!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -1304,6 +1386,7 @@ const tI18nPhrase Phrases[] = {
     "Den mporo na kliso ton ipologisti. Lipi i parametros '-s'!",
     "Kan inte avsluta, m�ste anv�nda flagga '-s'",
     "Nu pot opri calculatorul - vezi optiunea '-s'",
+    "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1319,6 +1402,7 @@ const tI18nPhrase Phrases[] = {
     "O Skliros kontevi na gemisi!",
     "L�gt diskutrymme!",
     "Spatiu scazut pe disc!",
+    "A merev lemez majdnem tele!",
   },
   // Setup pages:
   { "OSD",
@@ -1335,6 +1419,7 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "OSD",
     "OSD",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -1350,6 +1435,7 @@ const tI18nPhrase Phrases[] = {
     "EPG",
     "Elektronisk programguide",
     "EPG",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -1365,6 +1451,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "DVB",
     "Placa DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -1380,6 +1467,7 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -1395,6 +1483,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "CICAM",
     "Acces conditionat",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -1410,6 +1499,7 @@ const tI18nPhrase Phrases[] = {
     "Egrafi",
     "Inspelning",
     "Inregistrare",
+    "Felv�tel",
   },
   { "Replay",
     "Wiedergabe",
@@ -1425,6 +1515,7 @@ const tI18nPhrase Phrases[] = {
     "Anametadosi",
     "Repris",
     "Redare",
+    "Lej�tsz�s",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -1440,6 +1531,7 @@ const tI18nPhrase Phrases[] = {
     "Diafora",
     "Diverse",
     "Diverse",
+    "Egy�b",
   },
   { "Plugins",
     "Plugins",
@@ -1453,6 +1545,9 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Plugins",
+    "Plugins",
+    "Plugins",
+    "Plugins",
   },
   { "Plugin",
     "Plugin",
@@ -1466,6 +1561,9 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Plugin",
+    "Plugin",
+    "Plugin",
+    "Plugin",
   },
   { "Restart",
     "Neustart",
@@ -1481,6 +1579,7 @@ const tI18nPhrase Phrases[] = {
     "Epanekinisi",
     "Omstart",
     "Restart",
+    "�jraind�t�s",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -1497,6 +1596,7 @@ const tI18nPhrase Phrases[] = {
     "Glosa",
     "Spr�k",
     "Limba OSD",
+    "Nyelv",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -1512,6 +1612,7 @@ const tI18nPhrase Phrases[] = {
     "Makros",
     "Bredd",
     "Latime OSD",
+    "Sz�less�g",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -1527,6 +1628,7 @@ const tI18nPhrase Phrases[] = {
     "Ipsos",
     "H�jd",
     "Inaltime OSD",
+    "Magass�g",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -1542,6 +1644,7 @@ const tI18nPhrase Phrases[] = {
     "Xronos endiksis minimaton (d)",
     "Tid f�r meddelanden (sek)",
     "Timp afisare mesaj (sec)",
+    "Inform�ci� felt�ntet�s�nek id�tartama",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -1557,6 +1660,7 @@ const tI18nPhrase Phrases[] = {
     "Thesi Pliroforias kanalion",
     "Placering av kanalinformation",
     "Pozitie info canal",
+    "Csatorna-Inf� pozici�ja",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -1572,6 +1676,7 @@ const tI18nPhrase Phrases[] = {
     "Plirofories stin alagi kanaliou",
     "Information vid kanalbyte",
     "Info despre comutare canal",
+    "Inf� a csatorna v�lt�s�n�l",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -1587,6 +1692,7 @@ const tI18nPhrase Phrases[] = {
     "Scroll selidas",
     "Bl�ddra sidor",
     "Deruleaza pagini",
+    "Oldalank�nt l�ptetmi",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -1602,6 +1708,7 @@ const tI18nPhrase Phrases[] = {
     "Organosi programmatismenon",
     "Sortera timers",
     "Sortare timere",
+    "A beprogramozott felv�telek elrendez�se",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -1617,6 +1724,7 @@ const tI18nPhrase Phrases[] = {
     "Fakeli egrafon",
     "Kataloger f�r inspelningar",
     "Directoare inregistrari",
+    "Felv�telek list�ja",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -1632,6 +1740,7 @@ const tI18nPhrase Phrases[] = {
     "Xronos mexri sarosi EPG se Ores",
     "EPG s�kning timeout",
     "Timeout EPG",
+    "Fennmaradt id� az EPG-g (h)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -1647,6 +1756,7 @@ const tI18nPhrase Phrases[] = {
     "EPG Bugfix Vathmos",
     "Niv� f�r EPG bugfix",
     "Nivel corectie EPG",
+    "EPG hibaelh�r�t�s",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -1662,6 +1772,7 @@ const tI18nPhrase Phrases[] = {
     "Sintonismos Oras ipologosti",
     "St�ll in systemtid",
     "Seteaza ceasul sistem",
+    "Az id� be�ll�t�sa",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -1677,6 +1788,7 @@ const tI18nPhrase Phrases[] = {
     "Transponder gia sintonismo tis oras",
     "Anv�nd klockan fr�n fransponder",
     "Preia ceasul din transponder",
+    "Id�h�z tartoz� Transponder",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -1692,6 +1804,7 @@ const tI18nPhrase Phrases[] = {
     "Protevon DVB karta",
     "Prim�r DVB enhet",
     "Placa DVB primara",
+    "Els� DVB interface",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -1707,6 +1820,7 @@ const tI18nPhrase Phrases[] = {
     "Video Format",
     "Video format",
     "Format Video",
+    "Video form�tum",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -1722,6 +1836,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -1737,6 +1852,7 @@ const tI18nPhrase Phrases[] = {
     "Kato LNB-Sixnotita (MHz)",
     "Undre LNB frekvens (MHz)",
     "Frecvnta LO LNB (Mhz)",
+    "Als� LNB-frekvencia (MHZ)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -1752,6 +1868,7 @@ const tI18nPhrase Phrases[] = {
     "Ano LNB-Sixnotita (MHz)",
     "�vre LNB frekvens (MHz)",
     "Feecventa HI LNB (MHz)",
+    "Fels� LNB-frekvencia (MHZ)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -1767,6 +1884,7 @@ const tI18nPhrase Phrases[] = {
     "Energopiisi DiSEqC",
     "Anv�nd DiSEqC",
     "Utilizez DiSEqC",
+    "DiSEqC haszn�lata",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -1782,6 +1900,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "Setare acces conditional",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -1797,6 +1916,7 @@ const tI18nPhrase Phrases[] = {
     "Prosthetos xronos prin arxi (lepta)",
     "Marginal f�r start (min)",
     "Margine la pornire (min)",
+    "Id�eltol�d�s a kezd�sn�l (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -1812,6 +1932,7 @@ const tI18nPhrase Phrases[] = {
     "Prosthetos xronos sto telos (lepta)",
     "Marginal f�r stopp (min)",
     "Margine la oprire (min)",
+    "Id�eltol�d�s a befejez�sn�l",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -1827,6 +1948,7 @@ const tI18nPhrase Phrases[] = {
     "Protevon limit",
     "Prim�r gr�ns",
     "Limita Primara",
+    "Prim�r-hat�r",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -1842,6 +1964,7 @@ const tI18nPhrase Phrases[] = {
     "Protereotita",
     "Normal prioritet",
     "Prioritate implicita",
+    "Default priority",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -1857,6 +1980,7 @@ const tI18nPhrase Phrases[] = {
     "Xronos zois",
     "Normal livstid",
     "Durata predefinita",
+    "Default �lettartam",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -1872,6 +1996,7 @@ const tI18nPhrase Phrases[] = {
     "Xrisimopiisi onomatos episodiou",
     "Anv�nd episodnamn",
     "Utilizeaza numele episodului",
+    "Epiz�dn�v felhaszn�l�sa",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -1887,6 +2012,7 @@ const tI18nPhrase Phrases[] = {
     "Markarisma apevthias egrafis",
     "M�rk direktinspelning",
     "Inregistrare imediata",
+    "Direktfelv�tel megjel�l�se",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -1902,6 +2028,7 @@ const tI18nPhrase Phrases[] = {
     "eponomasi apevthias egrafis",
     "Namnge direktinspelning",
     "Nume inregistrare imediata",
+    "Direktfelv�tel megnevez�se",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -1917,6 +2044,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Direktinspelning l�ngd (min)",
     "Timpul de inregistarea imediata (min)",
+    "Felv�tel id�tartama",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -1932,6 +2060,7 @@ const tI18nPhrase Phrases[] = {
     "Egrafi tou Dolby Digital ixou",
     "Spela in ljud med Dolby Digital",
     "Inregistreaza Dolby Digital",
+    "Dolby Digit�l felv�tel",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -1947,6 +2076,7 @@ const tI18nPhrase Phrases[] = {
     "Megisto megethos arxeiou (MB)",
     "Maximal filstorlek f�r inspelning (MB)",
     "Dimensiune maxima a fisierului video (MB)",
+    "Max. video File-terjedelem (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -1962,6 +2092,7 @@ const tI18nPhrase Phrases[] = {
     "Diamelisma epeksergasm. arxeion",
     "Dela upp editerade filer",
     "Separare fisiere editate",
+    "Feldolgozott File-k feloszt�sa",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -1977,6 +2108,7 @@ const tI18nPhrase Phrases[] = {
     "Multispeed modus",
     "Multispeed mode",
     "Mod multi-rata",
+    "MultiSpeed funkci�",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -1992,6 +2124,7 @@ const tI18nPhrase Phrases[] = {
     "Endiksi  status anametadosis",
     "Visa uppspelnings mode",
     "Afiseaza modul de redare",
+    "Lej�tsz�s felt�ntet�se",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -2007,6 +2140,7 @@ const tI18nPhrase Phrases[] = {
     "Elaxistos Xronos paremvolis (lepta)",
     "Minsta h�ndelse-pause (min)",
     "MinEventTimeout (min)",
+    "Min. esem�ny sz�net (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -2022,6 +2156,7 @@ const tI18nPhrase Phrases[] = {
     "Elaxistos xronos mi xrisis (lepta)",
     "Minsta an�ndar-inaktivitet (min)",
     "Durata minima de inactivitate (min)",
+    "Min. kezel�si aktivit�s (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -2037,6 +2172,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP Timeout (d)",
     "SVDRP Timeout (d)",
     "Timeout SVDRP (sec)",
+    "SVDRP Timeout (s)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -2053,6 +2189,7 @@ const tI18nPhrase Phrases[] = {
     "DTTPPSK",
     "MTOTFLS",
     "LMMJVSD",
+    "HKSCPSV",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -2068,6 +2205,7 @@ const tI18nPhrase Phrases[] = {
     "DevTriTetPemParSavKir",
     "M�nTisOnsTorFreL�rS�n",
     "LunMarMieJoiVinSimDum",
+    "H�tKedSzeCs�P�nSzoVas",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -2084,6 +2222,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
+    " a�bcde�fghijklmno��pqrstu��vwxyz0123456789-.,#~",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -2100,6 +2239,7 @@ const tI18nPhrase Phrases[] = {
     "Ekmathisi Remote Control",
     "Inl�rning av fj�rrkontrollsknappar",
     "Invatare taste telecomanda",
+    "T�vir�ny�t� betan�t�sa",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -2115,6 +2255,7 @@ const tI18nPhrase Phrases[] = {
     "Phasi 1: Dilosi RC Code",
     "Steg1: identifiering av RC kod",
     "Faza 1: Detectie tip telecomanda",
+    "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -2130,6 +2271,7 @@ const tI18nPhrase Phrases[] = {
     "Pata ena pliktro sto RC",
     "Tryck valfri tangent p� fj�rrkontrollen",
     "Apasati o tasta pe telecomanda",
+    "Nyomjon meg egy gombot a t�vir�ny�t�n",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -2145,6 +2287,7 @@ const tI18nPhrase Phrases[] = {
     "Evresi RC Code!",
     "RC koden detekterad!",
     "S-a detectat tipul telecomenzii!",
+    "T�vir�ny�t� k�dja felismerve!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -2160,6 +2303,7 @@ const tI18nPhrase Phrases[] = {
     "Min patas Pliktra...",
     "Tryck inte p� n�gon knapp...",
     "Nu apasati nicio tasta...",
+    "Ne nyomjon meg gombot...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -2175,6 +2319,7 @@ const tI18nPhrase Phrases[] = {
     "Fasi 2: Ekmathisi memonomenon kodikon pliktron",
     "Fas 2: Inl�rning av specifika knapp koder",
     "Faza 2: Invatarea codurilor specifice tastelor",
+    "M�sodik l�p�s: az egyes gombok betan�t�sa",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -2190,6 +2335,7 @@ const tI18nPhrase Phrases[] = {
     "Pata to pliktro gia '%s'",
     "Tryck p� knappen f�r '%s'",
     "Apasati tasta pentru '%s'",
+    "'%s' gomb megnyom�sa",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -2205,6 +2351,7 @@ const tI18nPhrase Phrases[] = {
     "Pata 'pano' gia apodoxi",
     "Tryck 'Upp' f�r att bekr�fta",
     "Apsati 'Sus' pentru confirmare",
+    "'Fel' megnyom�sa az elfogad�shoz",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -2220,6 +2367,7 @@ const tI18nPhrase Phrases[] = {
     "Pata 'kato' gia sinexia",
     "Tryck 'Ner' f�r att bekr�fta",
     "Apasati jos pentru continuare",
+    "'Le' megnyom�sa a folytat�shoz",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -2235,6 +2383,7 @@ const tI18nPhrase Phrases[] = {
     "(Pata 'pano' gia na pas piso)",
     "(Tryck 'Upp' f�r att backa)",
     "(Apsati 'Sus' pentru revenire)",
+    "(�Fel' megnyom�sa a visszat�r�shez)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -2250,6 +2399,7 @@ const tI18nPhrase Phrases[] = {
     "(Pata 'Kato' gia termatismo)",
     "(Tryck 'Ner' f�r att avsluta knapp definition)",
     "(Apasati 'Jos' pentru terminare)",
+    "('Le' megnyom�sa a befejez�shez)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -2265,6 +2415,7 @@ const tI18nPhrase Phrases[] = {
     "Fasi 3: Apothikevsi kodikon",
     "Fas 3: Spara knappkoder",
     "Faza 3: Salvarea codurilor de taste",
+    "Harmadik l�p�s: k�d ment�se",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -2280,6 +2431,7 @@ const tI18nPhrase Phrases[] = {
     "'kato' apothikevsi, 'Pano' akirosi",
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
+    "'Fel' ment�s, 'Le� m�gse",
   },
   // Key names:
   { "Up",
@@ -2296,6 +2448,7 @@ const tI18nPhrase Phrases[] = {
     "Pano",
     "Upp",
     "Sus",
+    "Fel",
   },
   { "Down",
     "Ab",
@@ -2311,6 +2464,7 @@ const tI18nPhrase Phrases[] = {
     "Kato",
     "Ner",
     "Jos",
+    "Le",
   },
   { "Menu",
     "Men�",
@@ -2326,6 +2480,7 @@ const tI18nPhrase Phrases[] = {
     "Menou",
     "Meny",
     "Meniu",
+    "Men�",
   },
   { "Ok",
     "Ok",
@@ -2341,6 +2496,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -2356,6 +2512,7 @@ const tI18nPhrase Phrases[] = {
     "Piso",
     "Tillbaka",
     "Inapoi",
+    "Vissza",
   },
   { "Left",
     "Links",
@@ -2371,6 +2528,7 @@ const tI18nPhrase Phrases[] = {
     "Aristera",
     "V�nster",
     "Stinga",
+    "Balra",
   },
   { "Right",
     "Rechts",
@@ -2386,6 +2544,7 @@ const tI18nPhrase Phrases[] = {
     "Deksia",
     "H�ger",
     "Dreapta",
+    "Jobbra",
   },
   { "Red",
     "Rot",
@@ -2401,6 +2560,7 @@ const tI18nPhrase Phrases[] = {
     "Kokino",
     "R�d",
     "Rosu",
+    "Piros",
   },
   { "Green",
     "Gr�n",
@@ -2416,6 +2576,7 @@ const tI18nPhrase Phrases[] = {
     "Prasino",
     "Gr�n",
     "Verde",
+    "Z�ld",
   },
   { "Yellow",
     "Gelb",
@@ -2431,6 +2592,7 @@ const tI18nPhrase Phrases[] = {
     "Kitrino",
     "Gul",
     "Galben",
+    "S�rga",
   },
   { "Blue",
     "Blau",
@@ -2446,6 +2608,7 @@ const tI18nPhrase Phrases[] = {
     "Mple",
     "Bl�",
     "Albastru",
+    "K�k",
   },
   { "Power",
     "Ausschalten",
@@ -2461,6 +2624,7 @@ const tI18nPhrase Phrases[] = {
     "Klisimo",
     "P�/Av",
     "Pornit",
+    "Kikapcsolni",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -2476,6 +2640,7 @@ const tI18nPhrase Phrases[] = {
     "Entasi+",
     "Volym+",
     "Volum+",
+    "Hanger�+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -2491,6 +2656,7 @@ const tI18nPhrase Phrases[] = {
     "Entasi-",
     "Volym-",
     "Volum-",
+    "Hanger�-",
   },
   { "Mute",
     "Stumm",
@@ -2506,6 +2672,7 @@ const tI18nPhrase Phrases[] = {
     "Mougko",
     "Ljud Av",
     "Mut(e)",
+    "Csend",
   },
   // Miscellaneous:
   { "yes",
@@ -2522,6 +2689,7 @@ const tI18nPhrase Phrases[] = {
     "nai",
     "ja",
     "da",
+    "igen",
   },
   { "no",
     "nein",
@@ -2537,6 +2705,7 @@ const tI18nPhrase Phrases[] = {
     "oxi",
     "nej",
     "nu",
+    "nem",
   },
   { "top",
     "oben",
@@ -2552,6 +2721,7 @@ const tI18nPhrase Phrases[] = {
     "pano",
     "�vre",
     "sus",
+    "Fent",
   },
   { "bottom",
     "unten",
@@ -2567,6 +2737,7 @@ const tI18nPhrase Phrases[] = {
     "kato",
     "nedre",
     "jos",
+    "lent",
   },
   { "Disk",
     "Disk",
@@ -2582,6 +2753,7 @@ const tI18nPhrase Phrases[] = {
     "Disk",
     "Disk",
     "Disc",
+    "Lemez",
   },
   { "free",
     "frei",
@@ -2597,6 +2769,7 @@ const tI18nPhrase Phrases[] = {
     "akoma",
     "ledigt",
     "liber",
+    "szabad",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -2612,6 +2785,7 @@ const tI18nPhrase Phrases[] = {
     "Pidima: ",
     "Hopp: ",
     "Salt: ",
+    "Ugr�s: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -2627,6 +2801,7 @@ const tI18nPhrase Phrases[] = {
     "Entasi ",
     "Volym ",
     "Volum ",
+    "Hanger� ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -2642,6 +2817,7 @@ const tI18nPhrase Phrases[] = {
     " Telos anametadosis",
     " Avsluta uppspelning",
     " Opreste redare",
+    " Lej�tsz�st befejzni",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -2657,6 +2833,7 @@ const tI18nPhrase Phrases[] = {
     " Telos egrafis ",
     " Avsluta inspelning ",
     " Opreste inregistrarea ",
+    " Felv�telt befejezni ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -2672,6 +2849,7 @@ const tI18nPhrase Phrases[] = {
     " Diakopi kopsimatos",
     " Avbryt editering",
     " Opreste editare",
+    " V�g�st megszak�tani",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -2687,6 +2865,7 @@ const tI18nPhrase Phrases[] = {
     "I protevon DVB Karta alazi...",
     "Byter prim�r DVB enhet...",
     "Comuta interfata primara DVB...",
+    "Prim�r Interface �tkapcsolva...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -2702,6 +2881,7 @@ const tI18nPhrase Phrases[] = {
     "Pano/Kato gia nea thesi. meta OK",
     "Upp/Ner f�r ny plats - OK f�r att flytta",
     "Sus/Jos pentru noua locatie - OK pentru a muta",
+    "Fel/Le egy uj opci��rt - azt�n OK",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -2717,6 +2897,7 @@ const tI18nPhrase Phrases[] = {
     "Arxi kopsimatos",
     "Editering startad",
     "Procesul de editare a inceput",
+    "V�g�s elind�tva",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -2732,6 +2913,7 @@ const tI18nPhrase Phrases[] = {
     "To kopsimo termatistike",
     "Editering avslutad",
     "Procesul de editare s-a terminat",
+    "V�g�s befejezve",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -2747,6 +2929,7 @@ const tI18nPhrase Phrases[] = {
     "Kopsimo apetixe!",
     "Editeringsprocessen misslyckades",
     "Proces de editare nereusit",
+    "V�g�s sikertelen!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -2762,6 +2945,7 @@ const tI18nPhrase Phrases[] = {
     "Ginete sarosi egrafon...",
     "S�ker igenom inspelningarna...",
     "Caut inregistrari...",
+    "Felvett ad�sok b�ng�sz�se...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -2776,6 +2960,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "",// TODO
    },
   { NULL }
   };
diff --git a/i18n.h b/i18n.h
index 2b0ae50ed..f7ff26837 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.4 2002/06/10 16:14:02 kls Exp $
+ * $Id: i18n.h 1.5 2002/06/22 09:12:21 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 14;
+const int I18nNumLanguages = 15;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/interface.h b/interface.h
index 240db631f..137c7d489 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.26 2002/05/18 13:43:20 kls Exp $
+ * $Id: interface.h 1.27 2002/06/22 14:39:48 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -33,6 +33,7 @@ class cInterface {
 public:
   cInterface(int SVDRPport = 0);
   ~cInterface();
+  bool IsOpen(void) { return open > 0; }
   void Open(int NumCols = 0, int NumLines = 0);
   void Close(void);
   void Interrupt(void) { interrupted = true; }
diff --git a/menu.c b/menu.c
index ff63fbcd3..2a5f2fee0 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.197 2002/06/16 13:23:51 kls Exp $
+ * $Id: menu.c 1.201 2002/06/23 11:07:19 kls Exp $
  */
 
 #include "menu.h"
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
+#include "cutter.h"
 #include "eit.h"
 #include "i18n.h"
 #include "menuitems.h"
@@ -1512,7 +1513,6 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kGreen:  return Rewind();
        case kYellow: return Del();
        case kBlue:   return Summary();
-       case kMenu:   return osEnd;
        default: break;
        }
      }
@@ -2026,10 +2026,8 @@ void cMenuMain::Set(void)
 
   // Editing control:
 
-  /*XXX+
-  if (cVideoCutter::Active())
+  if (cCutter::Active())
      Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
-     XXX*/
 
   // Color buttons:
 
@@ -2063,7 +2061,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                           }
                        break;
     case osCancelEdit: if (Interface->Confirm(tr("Cancel editing?"))) {
-                          //XXX+cVideoCutter::Stop();
+                          cCutter::Stop();
                           return osEnd;
                           }
                        break;
@@ -2081,7 +2079,6 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                        }
                        break;
     default: switch (Key) {
-               case kMenu:   state = osEnd;    break;
                case kRed:    if (!HasSubMenu())
                                 state = osRecord;
                              break;
@@ -2443,7 +2440,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
   cChannel *ch = Channels.GetByNumber(timer->channel);
   recorder = new cRecorder(fileName, ch->ca, timer->priority, ch->vpid, ch->apid1, ch->apid2, ch->dpid1, ch->dpid2);
-  if (device->Attach(recorder)) {
+  if (device->AttachReceiver(recorder)) {
      Recording.WriteSummary();
      cStatus::MsgRecording(device, fileName);
      Interface->DisplayRecording(device->CardIndex(), true);
@@ -2684,18 +2681,14 @@ char *cReplayControl::fileName = NULL;
 char *cReplayControl::title = NULL;
 
 cReplayControl::cReplayControl(void)
+:cDvbPlayerControl(fileName)
 {
   visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
   timeoutShow = 0;
   timeSearchActive = false;
-  if (fileName) {
-     marks.Load(fileName);
-     if (!Start(fileName))
-        Interface->Error(tr("Channel locked (recording)!"));//XXX+
-     else
-        cStatus::MsgReplaying(this, fileName);
-     }
+  marks.Load(fileName);
+  cStatus::MsgReplaying(this, fileName);
 }
 
 cReplayControl::~cReplayControl()
@@ -2973,11 +2966,10 @@ void cReplayControl::MarkMove(bool Forward)
 
 void cReplayControl::EditCut(void)
 {
-  /*XXX+
   if (fileName) {
      Hide();
-     if (!cVideoCutter::Active()) {
-        if (!cVideoCutter::Start(fileName))
+     if (!cCutter::Active()) {
+        if (!cCutter::Start(fileName))
            Interface->Error(tr("Can't start editing process!"));
         else
            Interface->Info(tr("Editing process started"));
@@ -2986,7 +2978,6 @@ void cReplayControl::EditCut(void)
         Interface->Error(tr("Editing process already active!"));
      ShowMode();
      }
-     XXX*/
 }
 
 void cReplayControl::EditTest(void)
@@ -3065,7 +3056,6 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
           displayFrames = DisplayedFrames;
           switch (Key) {
             // Menu control:
-            case kMenu:    Hide(); return osMenu; // allow direct switching to menu
             case kOk:      if (visible && !modeOnly) {
                               Hide();
                               DoShowMode = true;
diff --git a/menu.h b/menu.h
index 9dfe1a40a..c03e627ef 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.44 2002/06/14 12:33:35 kls Exp $
+ * $Id: menu.h 1.45 2002/06/22 14:49:15 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -124,7 +124,6 @@ class cReplayControl : public cDvbPlayerControl {
   void TimeSearchProcess(eKeys Key);
   void TimeSearch(void);
   void Show(int Seconds = 0);
-  void Hide(void);
   static char *fileName;
   static char *title;
   void DisplayAtBottom(const char *s = NULL);
@@ -139,6 +138,7 @@ class cReplayControl : public cDvbPlayerControl {
   cReplayControl(void);
   virtual ~cReplayControl();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual void Hide(void);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
   static const char *LastReplayed(void);
diff --git a/osd.h b/osd.h
index 88c986c86..c0621577b 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.31 2002/05/18 14:00:15 kls Exp $
+ * $Id: osd.h 1.32 2002/06/23 09:13:17 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -22,7 +22,6 @@
 #define MAXOSDITEMS (Setup.OSDheight - 4)
 
 enum eOSState { osUnknown,
-                osMenu,
                 osContinue,
                 osSchedule,
                 osChannels,
@@ -115,7 +114,7 @@ class cOsdObject {
   int Width(void) { return Interface->Width(); }
   int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
-  virtual eOSState ProcessKey(eKeys Key) = 0;
+  virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
 };
 
 class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
diff --git a/player.c b/player.c
index fe0a2771a..ca182dfa9 100644
--- a/player.c
+++ b/player.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.1 2002/06/16 10:34:50 kls Exp $
+ * $Id: player.c 1.3 2002/06/23 12:56:25 kls Exp $
  */
 
 #include "player.h"
+#include "i18n.h"
 
 // --- cPlayer ---------------------------------------------------------------
 
@@ -46,10 +47,46 @@ void cPlayer::Detach(void)
 
 // --- cControl --------------------------------------------------------------
 
-cControl::cControl(void)
+cControl *cControl::control = NULL;
+
+cControl::cControl(cPlayer *Player, bool Hidden)
 {
+  attached = false;
+  hidden = Hidden;
+  player = Player;
 }
 
 cControl::~cControl()
 {
+  if (this == control)
+     control = NULL;
+}
+
+cControl *cControl::Control(void)
+{
+  return (control && !control->hidden) ? control : NULL;
+}
+
+void cControl::Launch(cControl *Control)
+{
+  delete control;
+  control = Control;
+}
+
+void cControl::Attach(void)
+{
+  if (control && !control->attached && control->player && !control->player->IsAttached()) {
+     if (cDevice::PrimaryDevice()->AttachPlayer(control->player))
+        control->attached = true;
+     else {
+        Interface->Error(tr("Channel locked (recording)!"));
+        Shutdown();
+        }
+     }
+}
+
+void cControl::Shutdown(void)
+{
+  delete control;
+  control = NULL;
 }
diff --git a/player.h b/player.h
index 1221c2448..51265f323 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.1 2002/06/16 11:52:45 kls Exp $
+ * $Id: player.h 1.4 2002/06/23 12:56:38 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -40,12 +40,24 @@ class cPlayer {
 public:
   cPlayer(void);
   virtual ~cPlayer();
+  bool IsAttached(void) { return device != NULL; }
   };
 
 class cControl : public cOsdObject {
+private:
+  static cControl *control;
+  bool attached;
+  bool hidden;
+protected:
+  cPlayer *player;
 public:
-  cControl(void);
+  cControl(cPlayer *Player, bool Hidden = false);
   virtual ~cControl();
+  virtual void Hide(void) = 0;
+  static void Launch(cControl *Control);
+  static void Attach(void);
+  static void Shutdown(void);
+  static cControl *Control(void);
   };
 
 #endif //__PLAYER_H
diff --git a/recording.c b/recording.c
index 7bc896c59..7ebec5c93 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.63 2002/06/16 11:29:27 kls Exp $
+ * $Id: recording.c 1.64 2002/06/22 10:11:49 kls Exp $
  */
 
 #include "recording.h"
@@ -1056,6 +1056,8 @@ int cFileName::NextFile(void)
   return SetOffset(fileNumber + 1);
 }
 
+// --- Index stuff -----------------------------------------------------------
+
 const char *IndexToHMSF(int Index, bool WithFrame)
 {
   static char buffer[16];
@@ -1080,3 +1082,21 @@ int SecondsToFrames(int Seconds)
 {
   return Seconds * FRAMESPERSEC;
 }
+
+// --- ReadFrame -------------------------------------------------------------
+
+int ReadFrame(int f, uchar *b, int Length, int Max)
+{
+  if (Length == -1)
+     Length = Max; // this means we read up to EOF (see cIndex)
+  else if (Length > Max) {
+     esyslog("ERROR: frame larger than buffer (%d > %d)", Length, Max);
+     Length = Max;
+     }
+  int r = safe_read(f, b, Length);
+  if (r < 0)
+     LOG_ERROR;
+  return r;
+}
+
+
diff --git a/recording.h b/recording.h
index 16c6506f7..2fae49ee6 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.23 2002/06/16 11:29:47 kls Exp $
+ * $Id: recording.h 1.24 2002/06/22 10:09:27 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -107,6 +107,9 @@ class cRecordingUserCommand {
 //XXX+
 #define FRAMESPERSEC 25
 
+// The maximum size of a single frame:
+#define MAXFRAMESIZE  KILOBYTE(192)
+
 // The maximum file size is limited by the range that can be covered
 // with 'int'. 4GB might be possible (if the range is considered
 // 'unsigned'), 2GB should be possible (even if the range is considered
@@ -163,4 +166,6 @@ int HMSFToIndex(const char *HMSF);
 int SecondsToFrames(int Seconds); //XXX+ ->player???
       // Returns the number of frames corresponding to the given number of seconds.
 
+int ReadFrame(int f, uchar *b, int Length, int Max);
+
 #endif //__RECORDING_H
diff --git a/transfer.c b/transfer.c
new file mode 100644
index 000000000..3b0b63601
--- /dev/null
+++ b/transfer.c
@@ -0,0 +1,135 @@
+/*
+ * transfer.c: Transfer mode
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: transfer.c 1.2 2002/06/23 12:56:49 kls Exp $
+ */
+
+#include "transfer.h"
+
+//XXX+ also used in recorder.c - find a better place???
+// The size of the array used to buffer video data:
+// (must be larger than MINVIDEODATA - see remux.h)
+#define VIDEOBUFSIZE  MEGABYTE(1)
+
+// --- cTransfer -------------------------------------------------------------
+
+cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
+:cReceiver(0, 0, 5, VPid, APid1, APid2, DPid1, DPid2)
+{
+  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
+  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
+  gotBufferReserve = false;
+  active = false;
+}
+
+cTransfer::~cTransfer()
+{
+  cReceiver::Detach();
+  cPlayer::Detach();
+  delete remux;
+  delete ringBuffer;
+}
+
+void cTransfer::Activate(bool On)
+{
+  if (On) {
+     if (!active)
+        Start();
+     }
+  else if (active) {
+     active = false;
+     Cancel(3);
+     }
+}
+
+void cTransfer::Receive(uchar *Data, int Length)
+{
+  int p = ringBuffer->Put(Data, Length);
+  if (p != Length && active)
+     esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length - p);
+}
+
+void cTransfer::Action(void)
+{
+  dsyslog("transfer thread started (pid=%d)", getpid());
+
+  uchar b[MINVIDEODATA];
+  int r = 0;
+  active = true;
+  while (active) {
+
+        //XXX+ Maybe we need this to avoid "buffer empty" log messages from the driver.
+        //XXX+ But then again, it appears to play just fine without this...
+        /*
+        if (!gotBufferReserve) {
+           if (ringBuffer->Available() < 4 * MAXFRAMESIZE) {
+              usleep(100000); // allow the buffer to collect some reserve
+              continue;
+              }
+           else
+              gotBufferReserve = true;
+           }
+           */
+
+        // Get data from the buffer:
+
+        int g = ringBuffer->Get(b + r, sizeof(b) - r);
+        if (g > 0)
+           r += g;
+
+        // Play the data:
+
+        if (r > 0) {
+           int Count = r, Result;
+           const uchar *p = remux->Process(b, Count, Result);
+           if (p) {
+              //XXX+ StripAudio???
+              while (Result > 0 && active) {
+                    int w = PlayVideo(p, Result);
+                    if (w > 0) {
+                       p += w;
+                       Result -= w;
+                       }
+                    else if (w < 0 && FATALERRNO) {
+                       LOG_ERROR;
+                       break;
+                       }
+                    }
+              }
+           if (Count > 0) {
+              r -= Count;
+              if (r > 0)
+                 memmove(b, b + Count, r);
+              }
+           }
+        }
+
+  dsyslog("transfer thread ended (pid=%d)", getpid());
+}
+
+void cTransfer::SetAudioPid(int APid)
+{
+  /*XXX+
+  Clear();
+  //XXX we may need to have access to the audio device, too, in order to clear it
+  CHECK(ioctl(toDevice, VIDEO_CLEAR_BUFFER));
+  gotBufferReserve = false;
+  remux.SetAudioPid(APid);
+  XXX*/
+}
+
+// --- cTransferControl ------------------------------------------------------
+
+cTransferControl::cTransferControl(cDevice *ReceiverDevice, int VPid, int APid1, int APid2, int DPid1, int DPid2)
+:cControl(transfer = new cTransfer(VPid, APid1, APid2, DPid1, DPid2), true)
+{
+  ReceiverDevice->AttachReceiver(transfer);
+}
+
+cTransferControl::~cTransferControl()
+{
+  delete transfer;
+}
diff --git a/transfer.h b/transfer.h
new file mode 100644
index 000000000..567f21aba
--- /dev/null
+++ b/transfer.h
@@ -0,0 +1,44 @@
+/*
+ * transfer.h: Transfer mode
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: transfer.h 1.2 2002/06/23 12:26:24 kls Exp $
+ */
+
+#ifndef __TRANSFER_H
+#define __TRANSFER_H
+
+#include "player.h"
+#include "receiver.h"
+#include "remux.h"
+#include "ringbuffer.h"
+#include "thread.h"
+
+class cTransfer : public cReceiver, public cPlayer, public cThread {
+private:
+  cRingBufferLinear *ringBuffer;
+  cRemux *remux;
+  bool gotBufferReserve;
+  bool active;
+protected:
+  virtual void Activate(bool On);
+  virtual void Receive(uchar *Data, int Length);
+  virtual void Action(void);
+public:
+  cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2);
+  virtual ~cTransfer();
+  void SetAudioPid(int APid);
+  };
+
+class cTransferControl : public cControl {
+private:
+  cTransfer *transfer;
+public:
+  cTransferControl(cDevice *ReceiverDevice, int VPid, int APid1, int APid2, int DPid1, int DPid2);
+  ~cTransferControl();
+  virtual void Hide(void) {}
+  };
+
+#endif //__TRANSFER_H
diff --git a/vdr.c b/vdr.c
index bef3919ff..10c54f74f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.114 2002/06/16 11:30:28 kls Exp $
+ * $Id: vdr.c 1.117 2002/06/23 11:23:34 kls Exp $
  */
 
 #include <getopt.h>
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "config.h"
+#include "cutter.h"
 #include "device.h"
 #include "eitscan.h"
 #include "i18n.h"
@@ -371,7 +372,7 @@ int main(int argc, char *argv[])
   // Main program loop:
 
   cOsdObject *Menu = NULL;
-  cReplayControl *ReplayControl = NULL;
+  cOsdObject *Temp = NULL;
   int LastChannel = -1;
   int PreviousChannel = cDevice::CurrentChannel();
   time_t LastActivity = 0;
@@ -389,6 +390,8 @@ int main(int argc, char *argv[])
            esyslog("emergency exit requested - shutting down");
            break;
            }
+        // Attach launched player control:
+        cControl::Attach();
         // Restart the Watchdog timer:
         if (WatchdogTimeout > 0) {
            int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);
@@ -400,7 +403,7 @@ int main(int argc, char *argv[])
         // Channel display:
         if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
            if (!Menu)
-              Menu = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel > 0);
+              Menu = Temp = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel > 0);
            if (LastChannel > 0)
               PreviousChannel = LastChannel;
            LastChannel = cDevice::CurrentChannel();
@@ -416,14 +419,26 @@ int main(int argc, char *argv[])
               }
            }
         // User Input:
-        cOsdObject **Interact = Menu ? &Menu : (cOsdObject **)&ReplayControl;
-        eKeys key = Interface->GetKey(!*Interact || !(*Interact)->NeedsFastResponse());
+        cOsdObject *Interact = Menu ? Menu : cControl::Control();
+        eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
         if (NORMALKEY(key) != kNone) {
            EITScanner.Activity();
            LastActivity = time(NULL);
            }
         // Keys that must work independent of any interactive mode:
         switch (key) {
+          // Menu control:
+          case kMenu:
+               if (Menu) {
+                  DELETENULL(Menu);
+                  if (!Temp)
+                     break;
+                  }
+               if (cControl::Control())
+                  cControl::Control()->Hide();
+               Menu = new cMenuMain(cControl::Control());
+               Temp = NULL;
+               break;
           // Volume Control:
           case kVolUp|k_Repeat:
           case kVolUp:
@@ -436,13 +451,15 @@ int main(int argc, char *argv[])
                   }
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
-               if (!Menu && (!ReplayControl || !ReplayControl->Visible()))
-                  Menu = cDisplayVolume::Create();
+               if (!Interface->IsOpen())
+                  Menu = Temp = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
                break;
           // Power off:
           case kPower: isyslog("Power button pressed");
-                       DELETENULL(*Interact);
+                       DELETENULL(Menu);
+                       cControl::Shutdown();
+                       Temp = NULL;
                        if (!Shutdown) {
                           Interface->Error(tr("Can't shutdown - option '-s' not given!"));
                           break;
@@ -454,35 +471,42 @@ int main(int argc, char *argv[])
                        LastActivity = 1; // not 0, see below!
                        break;
           default:
-            if (*Interact) {
-               switch ((*Interact)->ProcessKey(key)) {
-                 case osMenu:   DELETENULL(Menu);
-                                Menu = new cMenuMain(ReplayControl);
-                                break;
+            if (Interact) {
+               switch (Interact->ProcessKey(key)) {
                  case osRecord: DELETENULL(Menu);
+                                Temp = NULL;
                                 if (!cRecordControls::Start())
                                    Interface->Error(tr("No free DVB device to record!"));
                                 break;
                  case osRecordings:
                                 DELETENULL(Menu);
-                                DELETENULL(ReplayControl);
-                                Menu = new cMenuMain(ReplayControl, osRecordings);
+                                cControl::Shutdown();
+                                Temp = NULL;
+                                Menu = new cMenuMain(false, osRecordings);
                                 break;
                  case osReplay: DELETENULL(Menu);
-                                DELETENULL(ReplayControl);
-                                ReplayControl = new cReplayControl;
+                                cControl::Shutdown();
+                                Temp = NULL;
+                                cControl::Launch(new cReplayControl);
                                 break;
                  case osStopReplay:
-                                DELETENULL(*Interact);
-                                DELETENULL(ReplayControl);
+                                DELETENULL(Menu);
+                                cControl::Shutdown();
+                                Temp = NULL;
                                 break;
                  case osSwitchDvb:
-                                DELETENULL(*Interact);
+                                DELETENULL(Menu);
+                                cControl::Shutdown();
+                                Temp = NULL;
                                 Interface->Info(tr("Switching primary DVB..."));
                                 cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                                 break;
                  case osBack:
-                 case osEnd:    DELETENULL(*Interact);
+                 case osEnd:    if (Interact == Menu)
+                                   DELETENULL(Menu);
+                                else
+                                   cControl::Shutdown();
+                                Temp = NULL;
                                 break;
                  default:       ;
                  }
@@ -519,8 +543,6 @@ int main(int argc, char *argv[])
                          channel->Switch();
                       break;
                       }
-                 // Menu Control:
-                 case kMenu: Menu = new cMenuMain(ReplayControl); break;
                  // Viewing Control:
                  case kOk:   LastChannel = -1; break; // forces channel display
                  default:    break;
@@ -529,16 +551,14 @@ int main(int argc, char *argv[])
           }
         if (!Menu) {
            EITScanner.Process();
-           /*XXX+
-           if (!cVideoCutter::Active() && cVideoCutter::Ended()) {
-              if (cVideoCutter::Error())
+           if (!cCutter::Active() && cCutter::Ended()) {
+              if (cCutter::Error())
                  Interface->Error(tr("Editing process failed!"));
               else
                  Interface->Info(tr("Editing process finished"));
               }
-              XXX*/
            }
-        if (!*Interact && ((!cRecordControls::Active() /*XXX+&& !cVideoCutter::Active()XXX*/) || ForceShutdown)) {
+        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active()) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
@@ -598,9 +618,9 @@ int main(int argc, char *argv[])
   if (Interrupted)
      isyslog("caught signal %d", Interrupted);
   cRecordControls::Shutdown();
-  //XXX+cVideoCutter::Stop();
+  cCutter::Stop();
   delete Menu;
-  delete ReplayControl;
+  cControl::Shutdown();
   delete Interface;
   cOsd::Shutdown();
   PluginManager.Shutdown(true);

From a4112a96a67dbeb1cd6a63d2b4fa4b837462f467 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 21 Jul 2002 18:00:00 +0200
Subject: [PATCH 046/307] Version 1.1.5 - Added direct access to the index data
 of cPalette (needed for displaying SPUs,   thanks to Andreas Schultz). - The
 status monitor function cStatus::Replaying() now gets a 'cControl *' argument
 instead   of a 'cDvbPlayerControl *' in order to allow additional players to
 call this function.   cPlayer and cControl have been given the functions
 GetIndex() and GetReplayMode() to   allow access to the player's status. -
 Added cOsd::OpenRaw() to create a raw OSD (needed for displaying SPUs). -
 Changed the symantics of the Name parameter in cStatus::Recording() and  
 cStatus::Replaying(). It is no longer the full directory name of the
 recording,   but rather just the basic name. This has been changed to allow
 players that can't   provide a name to simply use a string that describes the
 player type (like, e.g.,   "DVD"). - Fixed a hangup when switching to the
 next file during replay. - Fixed a possible race condition in the cDvbPlayer
 (thanks to Andreas Schultz   for pointing out this one). - Disabled channels
 on Transponder 12070 in 'channels.conf', which apparently no longer
 transmits.

---
 CONTRIBUTORS                |   2 +
 HISTORY                     |  19 ++++++
 PLUGINS.html                |  70 ++++++++++++++-------
 PLUGINS/SRC/status/HISTORY  |   4 ++
 PLUGINS/SRC/status/Makefile |   2 +-
 PLUGINS/SRC/status/status.c |   8 +--
 channels.conf               |  12 ++--
 config.h                    |   4 +-
 dvbplayer.c                 |  17 +++---
 menu.c                      |   7 ++-
 osd.c                       |  16 ++++-
 osd.h                       |  10 ++-
 osdbase.c                   |  13 +++-
 osdbase.h                   |   6 +-
 player.h                    |  13 +++-
 status.c                    |   6 +-
 status.h                    |  19 +++---
 tmp.dif                     | 118 ------------------------------------
 18 files changed, 161 insertions(+), 185 deletions(-)
 delete mode 100644 tmp.dif

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f886624e7..58fc67610 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -155,6 +155,8 @@ Andreas Schultz <aschultz@warp10.net>
  for fixing a crash in case there is no 'epg.data' at program start
  for fixing a bug in the EPG bugfix mechanism if the extended description is shorter
  than 3 characters
+ for adding direct access to the index data of cPalette (needed for displaying SPUs)
+ for pointing out a possible race condition in the cDvbPlayer
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index 4b4eee989..225e8d8b5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1359,3 +1359,22 @@ Video Disk Recorder Revision History
 - The following limitations apply to this version:
   + The '-a' option (for Dolby Digital audio) doesn't work yet.
   + Switching between different language tracks doesn't work yet.
+
+2002-07-21: Version 1.1.5
+
+- Added direct access to the index data of cPalette (needed for displaying SPUs,
+  thanks to Andreas Schultz).
+- The status monitor function cStatus::Replaying() now gets a 'cControl *' argument instead
+  of a 'cDvbPlayerControl *' in order to allow additional players to call this function.
+  cPlayer and cControl have been given the functions GetIndex() and GetReplayMode() to
+  allow access to the player's status.
+- Added cOsd::OpenRaw() to create a raw OSD (needed for displaying SPUs).
+- Changed the symantics of the Name parameter in cStatus::Recording() and
+  cStatus::Replaying(). It is no longer the full directory name of the recording,
+  but rather just the basic name. This has been changed to allow players that can't
+  provide a name to simply use a string that describes the player type (like, e.g.,
+  "DVD").
+- Fixed a hangup when switching to the next file during replay.
+- Fixed a possible race condition in the cDvbPlayer (thanks to Andreas Schultz
+  for pointing out this one).
+- Disabled channels on Transponder 12070 in 'channels.conf', which apparently no longer transmits.
diff --git a/PLUGINS.html b/PLUGINS.html
index 59a2f18d7..2535c68e3 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -12,7 +12,7 @@
 separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 This document is divided into two parts, the first one describing the
 <a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
 of the plugin system, and the second one describing the
@@ -23,18 +23,18 @@
 structures and allows it to hook itself into specific areas to perform special actions.
 <!--X1.1.3--></td></tr></table>
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.1 are marked like this.
-<!--X1.1.1--></td></tr></table>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.2 are marked like this.
 <!--X1.1.2--></td></tr></table>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.3 are marked like this.
 <!--X1.1.3--></td></tr></table>
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.4 are marked like this.
 <!--X1.1.4--></td></tr></table>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.5 are marked like this.
+<!--X1.1.5--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -131,7 +131,7 @@
 <p>
 and will unpack into a directory named
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <tt>hello-0.0.1</tt>
 <!--X1.1.2--></td></tr></table>
 <p>
@@ -139,7 +139,7 @@
 you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
@@ -205,7 +205,6 @@
 If your plugin requires additional source files, simply add them to your plugin's
 source directory and adjust the <tt>Makefile</tt> accordingly.
 <p>
-<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Header files usually contain preprocessor statements that prevent the same
 file (or rather its contents, to be precise) from being included more than once, like
 
@@ -237,7 +236,6 @@
 and implements a file named <tt>i18n.h</tt>. To make sure it won't clash with VDR's
 <tt>i18n.h</tt> it uses the macro <tt>_I18N__H</tt> (one underline at the beginning
 and two replacing the dot).
-<!--X1.1.1--></td></tr></table>
 
 <hr><h2>Construction and Destruction</h2>
 
@@ -424,7 +422,7 @@
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement the function
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool Start(void);
 </pre></td></tr></table><p>
@@ -436,7 +434,7 @@
 stream, which is later presented to the user via a function that is available
 from the main menu.
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 A return value of <i>false</i> indicates that something has gone wrong and the
 plugin will not be able to perform its task. In that case, the plugin should
 write a proper error message to the log file. The first plugin that returns
@@ -500,7 +498,7 @@
 the plugin should launch a separate thread to do this.
 </b>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
@@ -547,7 +545,6 @@
 <i>true</i> if the parameter was parsed correctly, <i>false</i> in case of
 an error. If <i>false</i> is returned, an error message will be written to
 the log file (and program execution will continue).
-<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 A possible implementation of <tt>SetupParse()</tt> could look like this:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -563,7 +560,6 @@
 
 It is important to make sure that the parameter names are exactly the same as
 used in the <a href="#The Setup menu"><i>Setup</i> menu</a>'s <tt>Store()</tt> function.
-<!--X1.1.1--></td></tr></table>
 <p>
 The plugin's setup parameters are stored in the same file as VDR's parameters.
 In order to allow each plugin (and VDR itself) to have its own set of parameters,
@@ -602,7 +598,6 @@
 <tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
 parameters to the user.
 
-<!--X1.1.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="The Setup menu"><hr><h2>The Setup menu</h2>
 
 <center><i><b>Have it your way!</b></i></center><p>
@@ -660,9 +655,8 @@
 <tt>SetupStore()</tt> calls, or you can define a class or struct that contains all
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
-<!--X1.1.1--></td></tr></table>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
@@ -832,7 +826,7 @@
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 The <tt>Makefile</tt> that has been created by the call to
 <a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
 provides the target <tt>dist</tt>, which does this for you.
@@ -854,7 +848,7 @@
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
 
 <hr><h2>Status monitor</h2>
@@ -931,7 +925,7 @@
 the functions you actually want to use.
 <!--X1.1.3--></td></tr></table>
 
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
@@ -1082,5 +1076,37 @@
 ahead - it's your show...
 <!--X1.1.4--></td></tr></table>
 
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>The On Screen Display</h2>
+
+<center><i><b>Express yourself</b></i></center><p>
+
+Most of the time a plugin should be able to access the OSD through the
+standard mechanisms also used by VDR itself. However, these set up the OSD in
+a manner of textual rows and columns, and automatically set the various
+windows and color depths.
+<p>
+If a plugin needs to have total control over the OSD, it can call the
+static function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/osd.h&gt;
+
+cOsdBase *MyOsd = cOsd::OpenRaw(x, y);
+</pre></td></tr></table><p>
+
+where <tt>x</tt> and <tt>y</tt> are the coordinates of the upper left corner
+of the OSD area on the screen. Such a "raw" OSD doesn't display anything
+yet, so you need to at least call the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+MyOsd-&gt;Create(...);
+</pre></td></tr></table><p>
+
+to define an actual OSD drawing area (see VDR/osdbase.h for the declarations
+of these functions, and VDR/osd.c to see how VDR opens the OSD and sets up
+its windows and color depths).
+<!--X1.1.5--></td></tr></table>
+
 </body>
 </html>
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
index 279293628..f0c208f12 100644
--- a/PLUGINS/SRC/status/HISTORY
+++ b/PLUGINS/SRC/status/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'status' Revision History
 2002-05-18: Version 0.0.1
 
 - Initial revision.
+
+2002-07-13: Version 0.0.2
+
+- Changed the interface of cStatus::Replaying().
diff --git a/PLUGINS/SRC/status/Makefile b/PLUGINS/SRC/status/Makefile
index a0dbbc0c8..2d5a0e7c1 100644
--- a/PLUGINS/SRC/status/Makefile
+++ b/PLUGINS/SRC/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id$
+# $Id: Makefile 1.1 2002/06/10 16:24:09 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
index c9c494a8f..dc274e81d 100644
--- a/PLUGINS/SRC/status/status.c
+++ b/PLUGINS/SRC/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
+ * $Id: status.c 1.2 2002/07/13 10:55:55 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -19,7 +19,7 @@ class cStatusTest : public cStatus {
 protected:
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
   virtual void Recording(const cDevice *Device, const char *Name);
-  virtual void Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name);
+  virtual void Replaying(const cControl *Control, const char *Name);
   virtual void SetVolume(int Volume, bool Absolute);
   virtual void OsdClear(void);
   virtual void OsdTitle(const char *Title);
@@ -41,7 +41,7 @@ void cStatusTest::Recording(const cDevice *Device, const char *Name)
   dsyslog("status: cStatusTest::Recording  %d %s", Device->CardIndex(), Name);
 }
 
-void cStatusTest::Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name)
+void cStatusTest::Replaying(const cControl *Control, const char *Name)
 {
   dsyslog("status: cStatusTest::Replaying  %s", Name);
 }
diff --git a/channels.conf b/channels.conf
index fef477489..bd47e04dd 100644
--- a/channels.conf
+++ b/channels.conf
@@ -78,7 +78,7 @@ Premiere Direkt 2B:11719:h:0:27500:767:768;769:0:101:181
 Premiere Direkt 3A:11719:h:0:27500:511:512;515:0:101:180
 Premiere Direkt 3B:11719:h:0:27500:1279:1280;1283:0:101:183
 Premiere Direkt 4A:12031:h:0:27500:2815:2816:0:101:18
-Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
+:#Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
 :PW Erotic
 Beate-Uhse.TV:11758:h:0:27500:1023:1024:0:101:21
 Premiere Erotik 1:12031:h:0:27500:1279:1280:0:101:513
@@ -89,11 +89,11 @@ Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
 Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
 Premiere Sport 2:12031:h:0:27500:3839:3840:0:101:27
 :Formel 1
-Supersignal:12070:h:0:27500:255:256:0:101:211
-Cockpitkanal:12070:h:0:27500:511:512:0:101:212
-Boxengasse:12070:h:0:27500:767:768:0:101:213
-Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
-Infokanal:12070:h:0:27500:1279:1280:0:101:215
+:#Supersignal:12070:h:0:27500:255:256:0:101:211
+:#Cockpitkanal:12070:h:0:27500:511:512:0:101:212
+:#Boxengasse:12070:h:0:27500:767:768:0:101:213
+:#Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
+:#Infokanal:12070:h:0:27500:1279:1280:0:101:215
 Multikanal:11720:h:0:27500:255:256:0:101:17
 :Beta Digital
 N24:12480:v:0:27500:2047:2048:0:0:47
diff --git a/config.h b/config.h
index 601b6fdd8..f10b83d4d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.119 2002/06/16 14:49:52 kls Exp $
+ * $Id: config.h 1.120 2002/07/13 09:46:59 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.4"
+#define VDRVERSION "1.1.5"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbplayer.c b/dvbplayer.c
index 9ea8eb138..af6b28dae 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.4 2002/06/23 10:52:51 kls Exp $
+ * $Id: dvbplayer.c 1.7 2002/07/14 14:30:36 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -116,8 +116,8 @@ class cDvbPlayer : public cPlayer, cThread {
   int SkipFrames(int Frames);
   void SkipSeconds(int Seconds);
   void Goto(int Position, bool Still = false);
-  void GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
-  bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
+  virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+  virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
   };
 
 #define MAX_VIDEO_SLOWMOTION 63 // max. arg to pass to VIDEO_SLOWMOTION // TODO is this value correct?
@@ -132,7 +132,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   backTrace = NULL;
   index = NULL;
   eof = false;
-  active = false;
+  active = true;
   playMode = pmPlay;
   playDir = pdForward;
   trickSpeed = NORMAL_SPEED;
@@ -292,7 +292,6 @@ void cDvbPlayer::Activate(bool On)
 
 void cDvbPlayer::Action(void)
 {
-  active = true;
   dsyslog("dvbplayer thread started (pid=%d)", getpid());
 
   uchar b[MAXFRAMESIZE];
@@ -310,6 +309,7 @@ void cDvbPlayer::Action(void)
      isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
   while (active && NextFile()) {
+        pfd[1].fd = replayFile; // NextFile() may have returned a new file handle!
         {
           LOCK_THREAD;
 
@@ -593,7 +593,7 @@ void cDvbPlayer::Goto(int Index, bool Still)
      }
 }
 
-void cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
+bool cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
      if (playMode == pmStill)
@@ -607,9 +607,10 @@ void cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
            }
         }
      Total = index->Last();
+     return true;
      }
-  else
-     Current = Total = -1;
+  Current = Total = -1;
+  return false;
 }
 
 bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
diff --git a/menu.c b/menu.c
index 2a5f2fee0..0404b8735 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.201 2002/06/23 11:07:19 kls Exp $
+ * $Id: menu.c 1.202 2002/07/14 10:55:37 kls Exp $
  */
 
 #include "menu.h"
@@ -2442,7 +2442,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   recorder = new cRecorder(fileName, ch->ca, timer->priority, ch->vpid, ch->apid1, ch->apid2, ch->dpid1, ch->dpid2);
   if (device->AttachReceiver(recorder)) {
      Recording.WriteSummary();
-     cStatus::MsgRecording(device, fileName);
+     cStatus::MsgRecording(device, Recording.Name());
      Interface->DisplayRecording(device->CardIndex(), true);
      }
   else
@@ -2688,7 +2688,8 @@ cReplayControl::cReplayControl(void)
   timeoutShow = 0;
   timeSearchActive = false;
   marks.Load(fileName);
-  cStatus::MsgReplaying(this, fileName);
+  cRecording Recording(fileName);
+  cStatus::MsgReplaying(this, Recording.Name());
 }
 
 cReplayControl::~cReplayControl()
diff --git a/osd.c b/osd.c
index 1092187bb..4bf992702 100644
--- a/osd.c
+++ b/osd.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.29 2002/06/16 13:24:00 kls Exp $
+ * $Id: osd.c 1.31 2002/07/14 10:57:45 kls Exp $
  */
 
 #include "osd.h"
 #include <string.h>
 #include "device.h"
+#include "dvbosd.h"
 #include "i18n.h"
 #include "status.h"
 
@@ -19,7 +20,7 @@
   WINDOW *cOsd::window = NULL;
   int cOsd::colorPairs[MaxColorPairs] = { 0 };
 #else
-  cDvbOsd *cOsd::osd = NULL;
+  cOsdBase *cOsd::osd = NULL;
 #endif
   int cOsd::cols = 0;
   int cOsd::rows = 0;
@@ -67,6 +68,15 @@ void cOsd::SetColor(eDvbColor colorFg, eDvbColor colorBg)
 }
 #endif
 
+cOsdBase *cOsd::OpenRaw(int x, int y)
+{
+#ifdef DEBUG_OSD
+  return NULL;
+#else
+  return osd ? NULL : new cDvbOsd(cDevice::PrimaryDevice()->OsdDeviceHandle(), x, y);
+#endif
+}
+
 void cOsd::Open(int w, int h)
 {
   int d = (h < 0) ? Setup.OSDheight + h : 0;
@@ -95,7 +105,7 @@ void cOsd::Open(int w, int h)
   int x = (720 - w + charWidth) / 2; //TODO PAL vs. NTSC???
   int y = (576 - Setup.OSDheight * lineHeight) / 2 + d;
   //XXX
-  osd = new cDvbOsd(cDevice::PrimaryDevice()->OsdDeviceHandle(), x, y);
+  osd = OpenRaw(x, y);
   //XXX TODO this should be transferred to the places where the individual windows are requested (there's too much detailed knowledge here!)
   if (h / lineHeight == 5) { //XXX channel display
      osd->Create(0,              0, w, h, 4);
diff --git a/osd.h b/osd.h
index c0621577b..dac4b27e3 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.32 2002/06/23 09:13:17 kls Exp $
+ * $Id: osd.h 1.33 2002/07/13 12:47:06 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -14,7 +14,7 @@
 #include <ncurses.h>
 #endif
 #include "config.h"
-#include "dvbosd.h"
+#include "osdbase.h"
 #include "interface.h"
 #include "osdbase.h"
 #include "tools.h"
@@ -62,12 +62,16 @@ class cOsd {
   static int colorPairs[MaxColorPairs];
   static void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
 #else
-  static cDvbOsd *osd;
+  static cOsdBase *osd;
 #endif
   static int cols, rows;
 public:
   static void Initialize(void);
   static void Shutdown(void);
+  static cOsdBase *OpenRaw(int x, int y);
+       // Returns a raw OSD without any predefined windows or colors.
+       // If the "normal" OSD is currently in use, NULL will be returned.
+       // The caller must delete this object before the "normal" OSD is used again!
   static void Open(int w, int h);
   static void Close(void);
   static void Clear(void);
diff --git a/osdbase.c b/osdbase.c
index e7486a742..0d6e2a3a4 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.4 2002/05/18 12:39:16 kls Exp $
+ * $Id: osdbase.c 1.5 2002/07/13 14:42:47 kls Exp $
  */
 
 #include "osdbase.h"
@@ -23,6 +23,17 @@ cPalette::cPalette(int Bpp)
   full = false;
 }
 
+void cPalette::SetColor(int Index, eDvbColor Color)
+{
+  if (Index < maxColors) {
+     if (numColors < Index)
+        numColors = Index + 1;
+     used[Index] = true;
+     color[Index] = Color;
+     fetched[Index] = false;
+     }
+}
+
 int cPalette::Index(eDvbColor Color)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/osdbase.h b/osdbase.h
index a20dfc46b..1800482f8 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.2 2002/05/18 12:38:17 kls Exp $
+ * $Id: osdbase.h 1.4 2002/07/13 14:45:55 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -50,6 +50,8 @@ class cPalette {
   bool full;
 protected:
   typedef unsigned char tIndexes[MAXNUMCOLORS];
+  void SetColor(int Index, eDvbColor Color);
+  eDvbColor GetColor(int Index) { return color[Index]; }
 public:
   cPalette(int Bpp);
   int Index(eDvbColor Color);
@@ -62,7 +64,6 @@ class cBitmap : public cPalette {
 private:
   cFont *font;
   eDvbFont fontType;
-  void SetIndex(int x, int y, char Index);
   char *bitmap;
   bool clearWithBackground;
 protected:
@@ -74,6 +75,7 @@ class cBitmap : public cPalette {
   bool ClearWithBackground(void) { return clearWithBackground; }
   eDvbFont SetFont(eDvbFont Font);
   bool Dirty(int &x1, int &y1, int &x2, int &y2);
+  void SetIndex(int x, int y, char Index);
   void SetPixel(int x, int y, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   int Width(void) { return width; }
diff --git a/player.h b/player.h
index 51265f323..1bf6d371e 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.4 2002/06/23 12:56:38 kls Exp $
+ * $Id: player.h 1.5 2002/07/13 11:12:26 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -41,6 +41,15 @@ class cPlayer {
   cPlayer(void);
   virtual ~cPlayer();
   bool IsAttached(void) { return device != NULL; }
+  virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return false; }
+       // Returns the current and total frame index, optionally snapped to the
+       // nearest I-frame.
+  virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return false; }
+       // Returns the current replay mode (if applicable).
+       // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
+       // we are going forward or backward and 'Speed' is -1 if this is normal
+       // play/pause mode, 0 if it is single speed fast/slow forward/back mode
+       // and >0 if this is multi speed mode.
   };
 
 class cControl : public cOsdObject {
@@ -54,6 +63,8 @@ class cControl : public cOsdObject {
   cControl(cPlayer *Player, bool Hidden = false);
   virtual ~cControl();
   virtual void Hide(void) = 0;
+  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
   static void Launch(cControl *Control);
   static void Attach(void);
   static void Shutdown(void);
diff --git a/status.c b/status.c
index 76dc8404a..0bc4dd8e0 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 1.3 2002/06/16 13:24:36 kls Exp $
+ * $Id: status.c 1.4 2002/07/13 10:49:34 kls Exp $
  */
 
 #include "status.h"
@@ -35,10 +35,10 @@ void cStatus::MsgRecording(const cDevice *Device, const char *Name)
       sm->Recording(Device, Name);
 }
 
-void cStatus::MsgReplaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name)
+void cStatus::MsgReplaying(const cControl *Control, const char *Name)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
-      sm->Replaying(DvbPlayerControl, Name);
+      sm->Replaying(Control, Name);
 }
 
 void cStatus::MsgSetVolume(int Volume, bool Absolute)
diff --git a/status.h b/status.h
index d68f23ad8..8041f8cd3 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.3 2002/06/16 13:24:50 kls Exp $
+ * $Id: status.h 1.5 2002/07/14 10:54:39 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -12,7 +12,7 @@
 
 #include "config.h"
 #include "device.h"
-#include "dvbplayer.h"
+#include "player.h"
 #include "tools.h"
 
 class cStatus : public cListObject {
@@ -25,11 +25,14 @@ class cStatus : public cListObject {
                // If ChannelNumber is 0, this is before the channel is being switched,
                // otherwise ChannelNumber is the number of the channel that has been switched to.
   virtual void Recording(const cDevice *Device, const char *Name) {}
-               // The given DVB device has started recording Name. Name is the full directory
-               // name of the recording. If Name is NULL, the recording has ended. 
-  virtual void Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name) {}
-               // The given player control has started replaying Name. Name is the full directory
-               // name of the recording. If Name is NULL, the replay has ended. 
+               // The given DVB device has started recording Name. Name is the name of the
+               // recording, without any directory path.
+               // If Name is NULL, the recording has ended. 
+  virtual void Replaying(const cControl *Control, const char *Name) {}
+               // The given player control has started replaying Name. Name is the name of the
+               // recording, without any directory path. In case of a player that can't provide
+               // a name, Name can be a string that identifies the player type (like, e.g., "DVD").
+               // If Name is NULL, the replay has ended. 
   virtual void SetVolume(int Volume, bool Absolute) {}
                // The volume has been set to the given value, either
                // absolutely or relative to the current volume.
@@ -60,7 +63,7 @@ class cStatus : public cListObject {
   // These functions are called whenever the related status information changes:
   static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber);
   static void MsgRecording(const cDevice *Device, const char *Name);
-  static void MsgReplaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name);
+  static void MsgReplaying(const cControl *Control, const char *Name);
   static void MsgSetVolume(int Volume, bool Absolute);
   static void MsgOsdClear(void);
   static void MsgOsdTitle(const char *Title);
diff --git a/tmp.dif b/tmp.dif
deleted file mode 100644
index 87c57b71f..000000000
--- a/tmp.dif
+++ /dev/null
@@ -1,118 +0,0 @@
---- dvb.c
-+++ dvb.c	Wed May 29 17:41:53 2002
-@@ -444,6 +444,8 @@
- 			break;
-                 if (!dvb->arm_ready)
-                         continue;
-+		if (down_interruptible(&dvb->dcomlock))
-+			continue;
-                 newloops=rdebi(dvb, DEBINOSWAP, STATUS_LOOPS, 0, 2);
-                 if (newloops==dvb->arm_loops) {
-                         printk("dvb%d: ARM crashed!\n", dvb->num);
-@@ -451,6 +453,7 @@
-                         newloops=rdebi(dvb, DEBINOSWAP, STATUS_LOOPS, 0, 2)-1;
-                 }
-                 dvb->arm_loops=newloops;
-+		up(&dvb->dcomlock);
- 	}
- 	dvb->arm_thread = NULL;
- 	return 0;
-@@ -1158,6 +1161,31 @@
-         return blen;
- }
- 
-+/* Timer to avoid broken data transfer in gpioirq() */
-+
-+#define GPIO_RXTIME_FRAME	((32*HZ)/1000)
-+
-+static void gpio_receive_timeout(unsigned long data)
-+{
-+	struct dvb_struct *dvb = (struct dvb_struct *)data;
-+	dvb->debitimer.expires = 0;
-+}
-+
-+static void gpio_receive_timer(struct dvb_struct *dvb, unsigned long ticks)
-+{
-+	dvb_demux_filter_t *dvbdmxfilter = dvb->handle2filter[((dvb->debitype)>>8)&0x1f];
-+
-+	if (!dvbdmxfilter || dvbdmxfilter->type != DMX_TYPE_TS)
-+		return;
-+	mod_timer(&dvb->debitimer, jiffies + ticks);
-+}
-+
-+static inline int gpio_rx_pending(struct dvb_struct *dvb)
-+{
-+	return !timer_pending(&dvb->debitimer) && \
-+		dvb->debitimer.expires == 0;
-+}
-+
- static void 
- gpioirq(struct saa7146* saa, void *data)
- {
-@@ -1313,6 +1341,7 @@
-                         iwdebi(dvb, DEBINOSWAP, RX_BUFF, 0, 2);
-                         break;
-                 }                  /* yes, fall through */
-+		gpio_receive_timer(dvb, GPIO_RXTIME_FRAME);
-         case DATA_TS_RECORD:
-         case DATA_PES_RECORD:
-                 saa7146_write(dvb->saa_mem, IER, 
-@@ -1843,7 +1872,7 @@
-         bpp=dvb->osdbpp[dvb->osdwin]+1; 
-         bpl=((w*bpp+7)&~7)/8; 
-         size=h*bpl;
--        lpb=(32*1024)/bpl; 
-+        lpb=(16*1024)/bpl; 
-         bnum=size/(lpb*bpl);
-         brest=size-bnum*lpb*bpl;
- 
-@@ -1851,6 +1880,10 @@
-                 LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, lpb, inc, data); 
-                 BlitBitmap(dvb, dvb->osdwin, x0, y0+i*lpb, 0);
-                 data+=lpb*inc; 
-+		if (gpio_rx_pending(dvb)) {
-+			set_current_state(TASK_INTERRUPTIBLE);
-+			schedule_timeout(GPIO_RXTIME_FRAME);
-+		}
-         }
-         if (brest) {
-                 LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, brest/bpl, inc, data); 
-@@ -3819,6 +3852,7 @@
-                 return TTBStop(dvb); 
- 
-         if (dvbdmxfeed->type == DMX_TYPE_TS) {
-+		del_timer(&dvb->debitimer);
-                 if (dvbdmxfeed->ts_type & TS_DECODER) {
-                         if (dvbdmxfeed->pes_type>=DMX_TS_PES_OTHER ||
-                             !dvbdmx->pesfilter[dvbdmxfeed->pes_type]) 
-@@ -5472,8 +5506,12 @@
-         spin_lock_init (&dvb->debilock);
-         sema_init(&dvb->dcomlock, 1);
-         init_waitqueue_head(&dvb->debiq);
-+	init_timer(&dvb->debitimer);
-         dvb->debilock=SPIN_LOCK_UNLOCKED;
-         dvb->debitype=-1;
-+	dvb->debitimer.function = gpio_receive_timeout;
-+	dvb->debitimer.data = (unsigned long) dvb;
-+	dvb->debitimer.expires = jiffies;
- 
-         dvb->num=num;
-         dvb->i2cbus=adap;
-@@ -5741,6 +5779,7 @@
- 
- 	/* release the saa7146s */
- 	for( i = 0; i < num_dvb; i++) {
-+		del_timer_sync(&(dvbs[i].debitimer));
- 		dvbs[i].arm_rmmod=1;
- 		wake_up_interruptible(&dvbs[i].arm_wait);
-                 while (dvbs[i].arm_thread)
---- dvb.h
-+++ dvb.h	Wed May 29 17:41:08 2002
-@@ -566,6 +566,7 @@
-         spinlock_t              debilock;
-         struct semaphore        dcomlock;
-         WAIT_QUEUE              debiq;
-+	struct timer_list	debitimer;
-         int                     debitype;
-         int                     debilen;
-         int                     debibuf;

From 527748826c8d3cfacff8a7ab3fda9551c1182590 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 Aug 2002 18:00:00 +0200
Subject: [PATCH 047/307] Version 1.1.6 - Re-visited the race condition fix in
 the cDvbPlayer (thanks again to Andreas   Schultz). - Changed the VFAT
 handling to allow users who normally use it but have forgotten   to set it
 when compiling a new version of VDR to at least see their recordings   made
 with VFAT enabled (thanks to Christian Rienecker). - Added some missing
 teletext PIDs (thanks to Joerg Riechardt). - Fixed PID handling for
 cReceiver. - Added a missing #include to ringbuffer.c (thanks to Martin
 Hammerschmid). - Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile. -
 Changed the cDevice class to allow plugins to implement their own devices
 (see   PLUGINS.html for details).

---
 CONTRIBUTORS              |   7 +
 HISTORY                   |  14 +
 Makefile                  |  18 +-
 PLUGINS.html              | 207 ++++++++++--
 PLUGINS/SRC/hello/HISTORY |   4 +
 PLUGINS/SRC/hello/hello.c |   5 +-
 channels.conf             |   6 +-
 config.c                  |   6 +-
 config.h                  |   4 +-
 device.c                  | 691 ++++++++------------------------------
 device.h                  | 207 ++++++++----
 dvbdevice.c               | 615 +++++++++++++++++++++++++++++++++
 dvbdevice.h               |  97 ++++++
 dvbosd.c                  |  13 +-
 dvbosd.h                  |   7 +-
 dvbplayer.c               |  12 +-
 eit.h                     |   4 +-
 eitscan.c                 |   3 +-
 menu.c                    |   4 +-
 osd.c                     |   4 +-
 receiver.c                |   5 +-
 receiver.h                |   5 +-
 recording.c               |  20 +-
 remux.h                   |   4 +-
 ringbuffer.c              |   3 +-
 ringbuffer.h              |   5 +-
 tools.c                   |   4 +-
 vdr.c                     |  11 +-
 28 files changed, 1283 insertions(+), 702 deletions(-)
 create mode 100644 dvbdevice.c
 create mode 100644 dvbdevice.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 58fc67610..716d88d9f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -44,6 +44,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for suggesting to use the "Blue" button in the main menu to resume replay
  for implementing pege up/down with the "Left" and "Right" keys
  for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
+ for adding a missing #include to ringbuffer.c
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
@@ -367,3 +368,9 @@ Paul Lacatus <paul@campina.iiruc.ro>
 
 Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  for translating OSD texts to the Hungarian language
+
+Christian Rienecker <C.Rienecker@deutschepost.de>
+ for making the VFAT handling more tolerant for users who forget to turn it on
+
+Joerg Riechardt <J.Riechardt@gmx.de>
+ for filling in some missing teletext PIDs
diff --git a/HISTORY b/HISTORY
index 225e8d8b5..8ba62a5c2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1378,3 +1378,17 @@ Video Disk Recorder Revision History
 - Fixed a possible race condition in the cDvbPlayer (thanks to Andreas Schultz
   for pointing out this one).
 - Disabled channels on Transponder 12070 in 'channels.conf', which apparently no longer transmits.
+
+2002-08-04: Version 1.1.6
+
+- Re-visited the race condition fix in the cDvbPlayer (thanks again to Andreas
+  Schultz).
+- Changed the VFAT handling to allow users who normally use it but have forgotten
+  to set it when compiling a new version of VDR to at least see their recordings
+  made with VFAT enabled (thanks to Christian Rienecker).
+- Added some missing teletext PIDs (thanks to Joerg Riechardt).
+- Fixed PID handling for cReceiver.
+- Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid).
+- Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile.
+- Changed the cDevice class to allow plugins to implement their own devices (see
+  PLUGINS.html for details).
diff --git a/Makefile b/Makefile
index dd9741d15..4764d8f99 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,16 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.42 2002/06/22 10:21:56 kls Exp $
+# $Id: Makefile 1.44 2002/07/28 15:20:47 kls Exp $
 
 .DELETE_ON_ERROR:
 
+CC       = gcc
+CFLAGS   = -O2
+
+CXX      = g++
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+
 DVBDIR   = ../DVB
 DTVDIR   = ./libdtv
 MANDIR   = /usr/local/man
@@ -21,7 +27,7 @@ INCLUDES = -I$(DVBDIR)/ost/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = audio.o config.o cutter.o device.o dvbplayer.o dvbosd.o eit.o eitscan.o font.o i18n.o\
+OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o eit.o eitscan.o font.o i18n.o\
        interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
        recorder.o recording.o remote.o remux.o ringbuffer.o status.o svdrp.o thread.o\
        tools.o transfer.o vdr.o videodir.o
@@ -58,11 +64,11 @@ font: genfontfile fontfix.c fontosd.c
 # Implicit rules:
 
 %.o: %.c
-	g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
@@ -72,7 +78,7 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(DTVLIB)
-	g++ -g -O2 -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
 
 # The font files:
 
@@ -84,7 +90,7 @@ fontosd.c:
 # The font file generator:
 
 genfontfile: genfontfile.c
-	gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
+	$(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
 
 # The libdtv library:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 2535c68e3..2002d60aa 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -12,7 +12,7 @@
 separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 This document is divided into two parts, the first one describing the
 <a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
 of the plugin system, and the second one describing the
@@ -23,18 +23,18 @@
 structures and allows it to hook itself into specific areas to perform special actions.
 <!--X1.1.3--></td></tr></table>
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.2 are marked like this.
-<!--X1.1.2--></td></tr></table>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.3 are marked like this.
 <!--X1.1.3--></td></tr></table>
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.4 are marked like this.
 <!--X1.1.4--></td></tr></table>
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.5 are marked like this.
 <!--X1.1.5--></td></tr></table>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.6 are marked like this.
+<!--X1.1.6--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -131,15 +131,12 @@
 <p>
 and will unpack into a directory named
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <tt>hello-0.0.1</tt>
-<!--X1.1.2--></td></tr></table>
 <p>
 To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
@@ -149,7 +146,6 @@
 should lead to the current version of the plugin you want to use. This way you can
 have several different versions of a plugin source (like <tt>hello-0.0.1</tt> and
 <tt>hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
-<!--X1.1.2--></td></tr></table>
 
 <a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
 
@@ -422,11 +418,9 @@
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement the function
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool Start(void);
 </pre></td></tr></table><p>
-<!--X1.1.2--></td></tr></table>
 
 which is called once for each plugin at program startup.
 Inside this function the plugin must set up everything necessary to perform
@@ -434,12 +428,10 @@
 stream, which is later presented to the user via a function that is available
 from the main menu.
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 A return value of <i>false</i> indicates that something has gone wrong and the
 plugin will not be able to perform its task. In that case, the plugin should
 write a proper error message to the log file. The first plugin that returns
 <i>false</i> from its <tt>Start()</tt> function will cause VDR to exit.
-<!--X1.1.2--></td></tr></table>
 <p>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement this function.
@@ -498,7 +490,6 @@
 the plugin should launch a separate thread to do this.
 </b>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
@@ -523,7 +514,6 @@
 interaction is possible. If a specific action takes longer than a few seconds,
 the plugin should launch a separate thread to do this.
 </b>
-<!--X1.1.2--></td></tr></table>
 
 <a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
@@ -656,7 +646,6 @@
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
@@ -711,7 +700,6 @@
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 const char *MyConfigDir = cPlugin::ConfigDirectory();
 </pre></td></tr></table><p>
-<!--X1.1.2--></td></tr></table>
 
 <a name="Internationalization"><hr><h2>Internationalization</h2>
 
@@ -826,7 +814,7 @@
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 The <tt>Makefile</tt> that has been created by the call to
 <a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
 provides the target <tt>dist</tt>, which does this for you.
@@ -848,7 +836,7 @@
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
 
 <hr><h2>Status monitor</h2>
@@ -925,7 +913,7 @@
 the functions you actually want to use.
 <!--X1.1.3--></td></tr></table>
 
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
@@ -1076,7 +1064,63 @@
 ahead - it's your show...
 <!--X1.1.4--></td></tr></table>
 
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>Receivers</h2>
+
+<center><i><b>Tapping into the stream...</b></i></center><p>
+
+In order to receive any kind of data from a <tt>cDevice</tt>, a plugin must set up an
+object derived from the <tt>cReceiver</tt> class:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/receiver.h&gt;
+
+class cMyReceiver : public cReceiver, cThread {
+protected:
+  virtual void Activate(bool On);
+  virtual void Receive(uchar *Data, int Length);
+public:
+  cMyReceiver(int Pid);
+  };
+
+cMyReceiver::cMyReceiver(int Pid)
+:cReceiver(0, -1, 1, Pid)
+{
+}
+
+void cMyReceiver::Activate(bool On)
+{
+  // start your own thread for processing the received data
+}
+
+void cMyReceiver::Receive(uchar *Data, int Length)
+{
+  // buffer the data for processing in a separate thread
+}
+</pre></td></tr></table><p>
+
+See the comments in <tt>VDR/receiver.h</tt> for details about the various
+member functions of <tt>cReceiver</tt>.
+<p>
+The above example sets up a receiver that wants to receive data from only one
+PID (for example the Teletext PID). In order to not interfere with other recording
+operations, it sets its priority to <tt>-1</tt> (any negative value will allow
+a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time.
+<p>
+Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
+a <tt>cDevice</tt>:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cMyReceiver *Receiver = new cMyReceiver(123);
+
+cDevice::PrimaryDevice()-&gt;AttachReceiver(Receiver);
+</pre></td></tr></table><p>
+
+If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
+and will automatically detach itself from the <tt>cDevice</tt>.
+<!--X1.1.6--></td></tr></table>
+
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
@@ -1108,5 +1152,122 @@
 its windows and color depths).
 <!--X1.1.5--></td></tr></table>
 
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>Devices</h2>
+
+<center><i><b>Expanding the possibilities</b></i></center><p>
+
+By default VDR is based on using DVB PCI cards that are supported by the
+LinuxDVB driver. However, a plugin can implement additional devices that
+can be used as sources of MPEG data for viewing or recording, and also
+as output devices for replaying. Such a device can be a physical card
+that is installed in the PC (like, for instance, an MPEG encoder card that
+allows the analog signal of a proprietary set-top box to be integrated
+into a VDR system; or an analog TV receiver card, which does the MPEG encoding
+"on the fly" - assuming your machine is fast enough), or just a software program that takes an MPEG data
+stream and displays it, for instance, on an existing graphics adapter.
+<p>
+To implement an additional device, a plugin must derive a class from cDevice:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/device.h&gt;
+
+class cMyDevice : public cDevice {
+  ...
+  };
+</pre></td></tr></table><p>
+
+The derived class must implement several virtual functions, according to
+the abilities this new class of devices can provide. See the comments in the
+file <tt>VDR/device.h</tt> for more information on the various functions,
+and also <tt>VDR/dvbdevice.[hc]</tt> for details on the implementation of
+the <tt>cDvbDevice</tt>, which is used to access the DVB PCI cards.
+<p>
+<b>Channel selection</b>
+<p>
+If the new device can receive, it most likely needs to provide a way of
+selecting which channel it shall tune to:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool SetChannelDevice(const cChannel *Channel);
+</pre></td></tr></table><p>
+
+This function will be called with the desired channel and shall return whether
+tuning to it was successful.
+<p>
+<b>Recording</b>
+<p>
+A device that can be used for recording must implement the functions
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
+virtual bool OpenDvr(void);
+virtual void CloseDvr(void);
+virtual int GetTSPacket(uchar *Data);
+</pre></td></tr></table><p>
+
+which allow VDR to set the PIDs that shall be recorded, set up the device fro
+recording (and shut it down again), and receive the MPEG data stream. The data
+must be delivered in the form of a Transport Stream (TS), which consists of
+packets that are all 188 bytes in size. Each call to <tt>GetTSPacket()</tt>
+must deliver exactly one such packet (if one is currently available).
+<p>
+If this device allows receiving several different data streams, it can
+implement
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool CanBeReUsed(int Frequency, int Vpid);
+</pre></td></tr></table><p>
+
+to indicate this to VDR.
+<p>
+<b>Replaying</b>
+<p>
+The functions to implement replaying capabilites are
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool HasDecoder(void) const;
+virtual int SetPlayMode(bool On);
+virtual void TrickSpeed(int Speed);
+virtual void Clear(void);
+virtual void Play(void);
+virtual void Freeze(void);
+virtual void Mute(void);
+virtual void StillPicture(const uchar *Data, int Length);
+virtual int PlayVideo(const uchar *Data, int Length);
+</pre></td></tr></table><p>
+
+In addition, the following functions may be implemented to provide further
+functionality:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int Si
+virtual void SetVideoFormat(bool VideoFormat16_9);
+virtual void SetVolumeDevice(int Volume);
+</pre></td></tr></table><p>
+
+<b>Initializing new devices</b>
+<p>
+A derived cDevice class shall implement a static function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+static bool Initialize(void);
+</pre></td></tr></table><p>
+
+in which it determines whether the necessary hardware to run this sort of
+device is actually present in this machine (or whatever other prerequisites
+might be important), and then creates as many device objects as necessary.
+See <tt>VDR/dvbdevice.c</tt> for the implementation of the <tt>cDvbDevice</tt>
+initialize function.
+<p>
+A plugin that adds devices to a VDR instance shall call this initializing
+function from its <a href="#Getting started"><tt>Start()</tt></a> function.
+<p>
+Nothing needs to be done to shut down the devices. VDR will automatically
+shut down (delete) all devices when the program terminates. It is therefore
+important that the devices are created on the heap, using the <tt>new</tt>
+operator!
+<!--X1.1.6--></td></tr></table>
+
 </body>
 </html>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index f4cc74311..9778a81f9 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -18,3 +18,7 @@ VDR Plugin 'hello' Revision History
 2002-05-17: Version 0.0.4
 
 - Makefile improvements.
+
+2002-08-04: Version 0.0.5
+
+- Added a missing #include.
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 50aeeb3c3..d14f369c5 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,15 +3,16 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.5 2002/05/14 21:23:25 kls Exp $
+ * $Id: hello.c 1.6 2002/08/04 15:13:35 kls Exp $
  */
 
 #include <getopt.h>
+#include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "0.0.5";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
diff --git a/channels.conf b/channels.conf
index bd47e04dd..ba58bc686 100644
--- a/channels.conf
+++ b/channels.conf
@@ -7,7 +7,7 @@ BR3:11837:h:0:27500:201:202:204:0:28107
 Hessen-3:11837:h:0:27500:301:302:304:0:28108
 N3:12110:h:0:27500:2401:2402:2404:0:28224
 SR3:11837:h:0:27500:501:502:504:0:28110
-WDR:11837:h:0:27500:601:602:0:0:28111
+WDR:11837:h:0:27500:601:602:604:0:28111
 BR-alpha:11837:h:0:27500:701:702:704:0:28112
 SWR BW:11837:h:0:27500:801:802:804:0:28113
 Phoenix:11837:h:0:27500:901:902:904:0:28114
@@ -24,7 +24,7 @@ Super RTL:12188:h:0:27500:165:120:65:0:12040
 VOX:12188:h:0:27500:167:136:0:0:12060
 DW TV:10788:v:0:22000:305:306:0:0:8905
 Kabel 1:12480:v:0:27500:511:512:33:0:899
-Neun Live:12480:v:0:27500:767:768:0:0:897
+Neun Live:12480:v:0:27500:767:768:35:0:897
 DSF:12480:v:0:27500:1023:1024:0:0:900
 HOT:12480:v:0:27500:1279:1280:0:0:40
 Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
@@ -111,7 +111,7 @@ BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
 BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
 BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
 :
-TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
+:#TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
 Andalucia TV:11934:v:0:27500:166:104:0:0:29011
 TVC Internacional:11934:v:0:27500:167:108:0:0:0
diff --git a/config.c b/config.c
index 6753ce8d0..376985f09 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.102 2002/06/16 12:57:31 kls Exp $
+ * $Id: config.c 1.103 2002/08/04 12:03:11 kls Exp $
  */
 
 #include "config.h"
@@ -301,7 +301,7 @@ bool cChannel::Switch(cDevice *Device, bool Log)
      if (Log)
         isyslog("switching to channel %d", number);
      for (int i = 3; i--;) {
-         switch (Device->SetChannel(number, frequency, polarization, diseqc, srate, vpid, apid1, tpid, ca, pnr)) {
+         switch (Device->SetChannel(this)) {
            case scrOk:         return true;
            case scrNoTransfer: if (Interface)
                                   Interface->Error(tr("Can't start Transfer Mode!"));
@@ -1018,7 +1018,7 @@ cSetup::cSetup(void)
   DefaultLifetime = 50;
   UseSubtitle = 1;
   RecordingDirs = 1;
-  VideoFormat = VIDEO_FORMAT_4_3;
+  VideoFormat = 0;
   RecordDolbyDigital = 1;
   ChannelInfoPos = 0;
   OSDwidth = 52;
diff --git a/config.h b/config.h
index f10b83d4d..abfbe95d5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.120 2002/07/13 09:46:59 kls Exp $
+ * $Id: config.h 1.121 2002/07/27 12:00:30 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.5"
+#define VDRVERSION "1.1.6"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index c85cd450a..f70ca045d 100644
--- a/device.c
+++ b/device.c
@@ -4,108 +4,42 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.5 2002/06/23 12:51:24 kls Exp $
+ * $Id: device.c 1.8 2002/08/04 15:18:05 kls Exp $
  */
 
 #include "device.h"
 #include <errno.h>
-extern "C" {
-#define HAVE_BOOLEAN
-#include <jpeglib.h>
-}
-#include <linux/videodev.h>
-#include <ost/sec.h>
 #include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include "eit.h"
 #include "player.h"
 #include "receiver.h"
 #include "status.h"
 #include "transfer.h"
 
-#define DEV_VIDEO         "/dev/video"
-#define DEV_OST_OSD       "/dev/ost/osd"
-#define DEV_OST_FRONTEND  "/dev/ost/frontend"
-#define DEV_OST_SEC       "/dev/ost/sec"
-#define DEV_OST_DVR       "/dev/ost/dvr"
-#define DEV_OST_DEMUX     "/dev/ost/demux"
-#define DEV_OST_VIDEO     "/dev/ost/video"
-#define DEV_OST_AUDIO     "/dev/ost/audio"
-
-// The default priority for non-primary DVB cards:
+// The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -2
 
-#define TS_SIZE          188
-#define TS_SYNC_BYTE     0x47
-#define PID_MASK_HI      0x1F
-
 // The maximum time we wait before assuming that a recorded video data stream
 // is broken:
 #define MAXBROKENTIMEOUT 30 // seconds
 
-static const char *OstName(const char *Name, int n)
-{
-  static char buffer[_POSIX_PATH_MAX];
-  snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
-  return buffer;
-}
-
-static int OstOpen(const char *Name, int n, int Mode, bool ReportError = false)
-{
-  const char *FileName = OstName(Name, n);
-  int fd = open(FileName, Mode);
-  if (fd < 0 && ReportError)
-     LOG_ERROR_STR(FileName);
-  return fd;
-}
-
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
+int cDevice::nextCardIndex = 0;
 cDevice *cDevice::device[MAXDEVICES] = { NULL };
 cDevice *cDevice::primaryDevice = NULL;
 
-cDevice::cDevice(int n)
+cDevice::cDevice(void)
 {
-  frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
-  siProcessor = NULL;
-  cardIndex = n;
-
-  // Devices that are present on all card types:
+  cardIndex = nextCardIndex++;
 
-  fd_frontend = OstOpen(DEV_OST_FRONTEND, n, O_RDWR);
-
-  // Devices that are only present on DVB-S cards:
-
-  fd_sec      = OstOpen(DEV_OST_SEC,      n, O_RDWR);
-
-  // Devices that are only present on cards with decoders:
-
-  fd_osd      = OstOpen(DEV_OST_OSD,    n, O_RDWR);
-  fd_video    = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
-  fd_audio    = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
-
-  // Video format:
-
-  SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
-
-  // We only check the devices that must be present - the others will be checked before accessing them://XXX
-
-  if (fd_frontend >= 0) {
-     siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
-     FrontendInfo feinfo;
-     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0)
-        frontendType = feinfo.type;
-     else
-        LOG_ERROR;
-     }
-  else
-     esyslog("ERROR: can't open video device %d", n);
+  SetVideoFormat(Setup.VideoFormat);
 
-  dvrFileName = strdup(OstName(DEV_OST_DVR, CardIndex()));
   active = false;
 
   currentChannel = 0;
-  frequency = 0;
 
   mute = false;
   volume = Setup.CurrentVolume;
@@ -115,17 +49,20 @@ cDevice::cDevice(int n)
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
   ca = -1;
+
+  if (numDevices < MAXDEVICES) {
+     device[numDevices++] = this;
+     SetCaCaps(cardIndex);
+     }
+  else
+     esyslog("ERROR: too many devices!");
 }
 
 cDevice::~cDevice()
 {
-  delete dvrFileName;
-  delete siProcessor;
   Detach(player);
   for (int i = 0; i < MAXRECEIVERS; i++)
       Detach(receiver[i]);
-  // We're not explicitly closing any device files here, since this sometimes
-  // caused segfaults. Besides, the program is about to terminate anyway...
 }
 
 void cDevice::SetUseDevice(int n)
@@ -134,15 +71,44 @@ void cDevice::SetUseDevice(int n)
      useDevice |= (1 << n);
 }
 
+int cDevice::NextCardIndex(int n)
+{
+  if (n > 0) {
+     nextCardIndex += n;
+     if (nextCardIndex >= MAXDEVICES)
+        esyslog("ERROR: nextCardIndex too big (%d)", nextCardIndex);
+     }
+  else if (n < 0)
+     esyslog("ERROR: illegal value in IncCardIndex(%d)", n);
+  return nextCardIndex;
+}
+
+void cDevice::MakePrimaryDevice(bool On)
+{
+}
+
 bool cDevice::SetPrimaryDevice(int n)
 {
   n--;
   if (0 <= n && n < numDevices && device[n]) {
      isyslog("setting primary device to %d", n + 1);
+     if (primaryDevice)
+        primaryDevice->MakePrimaryDevice(false);
      primaryDevice = device[n];
+     primaryDevice->MakePrimaryDevice(true);
      return true;
      }
-  esyslog("invalid devive number: %d", n + 1);
+  esyslog("invalid device number: %d", n + 1);
+  return false;
+}
+
+bool cDevice::CanBeReUsed(int Frequency, int Vpid)
+{
+  return false;
+}
+
+bool cDevice::HasDecoder(void) const
+{
   return false;
 }
 
@@ -156,20 +122,7 @@ cDevice *cDevice::GetDevice(int Ca, int Priority, int Frequency, int Vpid, bool
   for (int i = 0; i < numDevices; i++) {
       if ((Provides[i] = device[i]->ProvidesCa(Ca)) != 0) { // this device is basicly able to do the job
          //XXX+ dsyslog("GetDevice: %d %d %d %5d %5d", i, device[i]->HasDecoder(), device[i]->Receiving(), Frequency, device[i]->frequency);//XXX
-         if (  (!device[i]->HasDecoder() // it's a "budget card" which can receive multiple channels...
-               && device[i]->frequency == Frequency // ...and it is tuned to the requested frequency...
-               && device[i]->Receiving() // ...and is already receiving
-               // need not check priority - if a budget card is already receiving on the requested
-               // frequency, we can attach another receiver regardless of priority
-               )
-            || (device[i]->HasDecoder() // it's a "full featured card" which can receive only one channel...
-               && device[i]->frequency == Frequency // ...and it is tuned to the requested frequency...
-               && device[i]->pidHandles[ptVideo].pid == Vpid // ...and the requested video PID...
-               && device[i]->Receiving() // ...and is already receiving
-               // need not check priority - if a full featured card is already receiving the requested
-               // frequency and video PID, we can attach another receiver regardless of priority
-               )
-            ) {
+         if (device[i]->CanBeReUsed(Frequency, Vpid)) {
             d = device[i];
             if (ReUse)
                *ReUse = true;
@@ -204,50 +157,14 @@ cDevice *cDevice::GetDevice(int Ca, int Priority, int Frequency, int Vpid, bool
   return d;
 }
 
-void cDevice::SetCaCaps(void)
+void cDevice::SetCaCaps(int Index)
 {
   for (int d = 0; d < numDevices; d++) {
-      for (int i = 0; i < MAXCACAPS; i++)
-          device[d]->caCaps[i] = Setup.CaCaps[device[d]->CardIndex()][i];
-      }
-}
-
-bool cDevice::Probe(const char *FileName)
-{
-  if (access(FileName, F_OK) == 0) {
-     dsyslog("probing %s", FileName);
-     int f = open(FileName, O_RDONLY);
-     if (f >= 0) {
-        close(f);
-        return true;
-        }
-     else if (errno != ENODEV && errno != EINVAL)
-        LOG_ERROR_STR(FileName);
-     }
-  else if (errno != ENOENT)
-     LOG_ERROR_STR(FileName);
-  return false;
-}
-
-bool cDevice::Initialize(void)
-{
-  numDevices = 0;
-  for (int i = 0; i < MAXDEVICES; i++) {
-      if (useDevice == 0 || (useDevice & (1 << i)) != 0) {
-         if (Probe(OstName(DEV_OST_FRONTEND, i)))
-            device[numDevices++] = new cDevice(i);
-         else
-            break;
+      if (Index < 0 || Index == device[d]->CardIndex()) {
+         for (int i = 0; i < MAXCACAPS; i++)
+             device[d]->caCaps[i] = Setup.CaCaps[device[d]->CardIndex()][i];
          }
       }
-  primaryDevice = device[0];
-  if (numDevices > 0) {
-     isyslog("found %d video device%s", numDevices, numDevices > 1 ? "s" : "");
-     SetCaCaps();
-     }
-  else
-     esyslog("ERROR: no video device found, giving up!");
-  return numDevices > 0;
 }
 
 void cDevice::Shutdown(void)
@@ -261,106 +178,13 @@ void cDevice::Shutdown(void)
 
 bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
-  if (videoDev >= 0) {
-     int result = 0;
-     struct video_mbuf mbuf;
-     result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
-     if (result == 0) {
-        int msize = mbuf.size;
-        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-        if (mem && mem != (unsigned char *)-1) {
-           // set up the size and RGB
-           struct video_capability vc;
-           result |= ioctl(videoDev, VIDIOCGCAP, &vc);
-           struct video_mmap vm;
-           vm.frame = 0;
-           if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
-               (SizeY > 0) && (SizeY <= vc.maxheight)) {
-              vm.width = SizeX;
-              vm.height = SizeY;
-              }
-           else {
-              vm.width = vc.maxwidth;
-              vm.height = vc.maxheight;
-              }
-           vm.format = VIDEO_PALETTE_RGB24;
-           result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
-           result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
-           // make RGB out of BGR:
-           int memsize = vm.width * vm.height;
-           unsigned char *mem1 = mem;
-           for (int i = 0; i < memsize; i++) {
-               unsigned char tmp = mem1[2];
-               mem1[2] = mem1[0];
-               mem1[0] = tmp;
-               mem1 += 3;
-               }
-         
-           if (Quality < 0)
-              Quality = 255; //XXX is this 'best'???
-         
-           isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
-           FILE *f = fopen(FileName, "wb");
-           if (f) {
-              if (Jpeg) {
-                 // write JPEG file:
-                 struct jpeg_compress_struct cinfo;
-                 struct jpeg_error_mgr jerr;
-                 cinfo.err = jpeg_std_error(&jerr);
-                 jpeg_create_compress(&cinfo);
-                 jpeg_stdio_dest(&cinfo, f);
-                 cinfo.image_width = vm.width;
-                 cinfo.image_height = vm.height;
-                 cinfo.input_components = 3;
-                 cinfo.in_color_space = JCS_RGB;
-         
-                 jpeg_set_defaults(&cinfo);
-                 jpeg_set_quality(&cinfo, Quality, true);
-                 jpeg_start_compress(&cinfo, true);
-         
-                 int rs = vm.width * 3;
-                 JSAMPROW rp[vm.height];
-                 for (int k = 0; k < vm.height; k++)
-                     rp[k] = &mem[rs * k];
-                 jpeg_write_scanlines(&cinfo, rp, vm.height);
-                 jpeg_finish_compress(&cinfo);
-                 jpeg_destroy_compress(&cinfo);
-                 }
-              else {
-                 // write PNM file:
-                 if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
-                     fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
-                    LOG_ERROR_STR(FileName);
-                    result |= 1;
-                    }
-                 }
-              fclose(f);
-              }
-           else {
-              LOG_ERROR_STR(FileName);
-              result |= 1;
-              }
-           munmap(mem, msize);
-           }
-        else
-           result |= 1;
-        }
-     close(videoDev);
-     return result == 0;
-     }
   return false;
 }
 
-void cDevice::SetVideoFormat(videoFormat_t Format)
+void cDevice::SetVideoFormat(bool VideoFormat16_9)
 {
-  if (HasDecoder())
-     CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, Format));
 }
 
-//                          ptVideo        ptAudio        ptTeletext        ptDolby        ptOther
-dmxPesType_t PesTypes[] = { DMX_PES_VIDEO, DMX_PES_AUDIO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
-
 //#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); } //XXX+
 #define PRINTPIDS(s)
 
@@ -375,13 +199,12 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
          else if (a < 0 && i >= ptOther && !pidHandles[i].used)
             a = i;
          }
-     dmxPesType_t PesType = PesTypes[ptOther];
      if (n >= 0) {
         // The Pid is already in use
         if (++pidHandles[n].used == 2 && n <= ptTeletext) {
-           // It's a special PID that has to be switched into "tap" mode
+           // It's a special PID that may have to be switched into "tap" mode
            PRINTPIDS("A");//XXX+
-           return SetPid(pidHandles[n].fd, PesTypes[n], Pid, DMX_OUT_TS_TAP);
+           return SetPid(&pidHandles[n], n, true);
            }
         PRINTPIDS("a");//XXX+
         return true;
@@ -389,8 +212,6 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
      else if (PidType < ptOther) {
         // The Pid is not yet in use and it is a special one
         n = PidType;
-        PesType = PesTypes[PidType];
-        PRINTPIDS("B");//XXX+
         }
      else if (a >= 0) {
         // The Pid is not yet in use and we have a free slot
@@ -400,217 +221,51 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
         esyslog("ERROR: no free slot for PID %d", Pid);
      if (n >= 0) {
         pidHandles[n].pid = Pid;
-        pidHandles[n].fd = OstOpen(DEV_OST_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
         pidHandles[n].used = 1;
         PRINTPIDS("C");//XXX+
-        return SetPid(pidHandles[n].fd, PesType, Pid, PidType <= ptTeletext ? DMX_OUT_DECODER : DMX_OUT_TS_TAP);
+        return SetPid(&pidHandles[n], n, true);
         }
      }
   return true;
 }
 
-bool cDevice::DelPid(int Pid)
+void cDevice::DelPid(int Pid)
 {
   if (Pid) {
      for (int i = 0; i < MAXPIDHANDLES; i++) {
          if (pidHandles[i].pid == Pid) {
-            switch (--pidHandles[i].used) {
-              case 0: CHECK(ioctl(pidHandles[i].fd, DMX_STOP));//XXX+ is this necessary???
-                      close(pidHandles[i].fd);
-                      pidHandles[i].fd = -1;
-                      pidHandles[i].pid = 0;
-                      break;
-              case 1: if (i <= ptTeletext)
-                         SetPid(pidHandles[i].fd, PesTypes[i], Pid, DMX_OUT_DECODER);
-                      break;
-              }
+            if (--pidHandles[i].used < 2) {
+               SetPid(&pidHandles[i], i, false);
+               if (pidHandles[i].used == 0) {
+                   pidHandles[i].handle = -1;
+                   pidHandles[i].pid = 0;
+                   }
+               }
             PRINTPIDS("D");//XXX+
-            return pidHandles[i].used;
             }
          }
      }
-  return false;
 }
 
-bool cDevice::SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output)
+bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
-  if (Pid) {
-     CHECK(ioctl(fd, DMX_STOP));
-     if (Pid != 0x1FFF) {
-        dmxPesFilterParams pesFilterParams;
-        pesFilterParams.pid     = Pid;
-        pesFilterParams.input   = DMX_IN_FRONTEND;
-        pesFilterParams.output  = Output;
-        pesFilterParams.pesType = PesType;
-        pesFilterParams.flags   = DMX_IMMEDIATE_START;
-        //XXX+ pesFilterParams.flags   = DMX_CHECK_CRC;//XXX
-        if (ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-           LOG_ERROR;
-           return false;
-           }
-        //XXX+ CHECK(ioctl(fd, DMX_SET_BUFFER_SIZE, KILOBYTE(32)));//XXX
-        //XXX+ CHECK(ioctl(fd, DMX_START));//XXX
-        }
-     }
-  return true;
+  return false;
 }
 
-eSetChannelResult cDevice::SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr)
+eSetChannelResult cDevice::SetChannel(const cChannel *Channel)
 {
-  StopReplay();
-
   cStatus::MsgChannelSwitch(this, 0);
 
+  StopReplay();
+
   // Must set this anyway to avoid getting stuck when switching through
   // channels with 'Up' and 'Down' keys:
-  currentChannel = ChannelNumber;
-
-  // Avoid noise while switching:
-
-  if (HasDecoder()) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     }
-
-  // Stop setting system time:
-
-  if (siProcessor)
-     siProcessor->SetCurrentTransponder(0);
+  currentChannel = Channel->number;
 
   // If this card can't receive this channel, we must not actually switch
   // the channel here, because that would irritate the driver when we
   // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (IsPrimaryDevice() && !ProvidesCa(Ca));
-
-  if (!NeedsTransferMode) {
-
-     // Turn off current PIDs:
-
-     if (HasDecoder()) {
-        DelPid(pidHandles[ptVideo].pid);
-        DelPid(pidHandles[ptAudio].pid);
-        DelPid(pidHandles[ptTeletext].pid);
-        DelPid(pidHandles[ptDolby].pid);
-        }
-
-     FrontendParameters Frontend;
-
-     switch (frontendType) {
-       case FE_QPSK: { // DVB-S
-
-            // Frequency offsets:
-
-            unsigned int freq = Frequency;
-            int tone = SEC_TONE_OFF;
-
-            if (freq < (unsigned int)Setup.LnbSLOF) {
-               freq -= Setup.LnbFrequLo;
-               tone = SEC_TONE_OFF;
-               }
-            else {
-               freq -= Setup.LnbFrequHi;
-               tone = SEC_TONE_ON;
-               }
-
-            Frontend.Frequency = freq * 1000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.qpsk.SymbolRate = Srate * 1000UL;
-            Frontend.u.qpsk.FEC_inner = FEC_AUTO;
-
-            int volt = (Polarization == 'v' || Polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-
-            // DiseqC:
-
-            secCommand scmd;
-            scmd.type = 0;
-            scmd.u.diseqc.addr = 0x10;
-            scmd.u.diseqc.cmd = 0x38;
-            scmd.u.diseqc.numParams = 1;
-            scmd.u.diseqc.params[0] = 0xF0 | ((Diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
-
-            secCmdSequence scmds;
-            scmds.voltage = volt;
-            scmds.miniCommand = SEC_MINI_NONE;
-            scmds.continuousTone = tone;
-            scmds.numCommands = Setup.DiSEqC ? 1 : 0;
-            scmds.commands = &scmd;
-
-            CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
-            }
-            break;
-       case FE_QAM: { // DVB-C
-
-            // Frequency and symbol rate:
-
-            Frontend.Frequency = Frequency * 1000000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.qam.SymbolRate = Srate * 1000UL;
-            Frontend.u.qam.FEC_inner = FEC_AUTO;
-            Frontend.u.qam.QAM = QAM_64;
-            }
-            break;
-       case FE_OFDM: { // DVB-T
-
-            // Frequency and OFDM paramaters:
-
-            Frontend.Frequency = Frequency * 1000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
-            Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
-            Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
-            Frontend.u.ofdm.Constellation=QAM_64;
-            Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
-            Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
-            Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
-            }
-            break;
-       default:
-            esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-            return scrFailed;
-       }
-
-     // Tuning:
-
-     CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
-
-     // Wait for channel sync:
-
-     if (cFile::FileReady(fd_frontend, 5000)) {
-        FrontendEvent event;
-        int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-        if (res >= 0) {
-           if (event.type != FE_COMPLETION_EV) {
-              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", ChannelNumber, CardIndex() + 1);
-              if (IsPrimaryDevice())
-                 cThread::RaisePanic();
-              return scrFailed;
-              }
-           }
-        else
-           esyslog("ERROR %d in frontend get event (channel %d, card %d)", res, ChannelNumber, CardIndex() + 1);
-        }
-     else
-        esyslog("ERROR: timeout while tuning");
-
-     frequency = Frequency;
-
-     // PID settings:
-
-     if (HasDecoder()) {
-        if (!(AddPid(Vpid, ptVideo) && AddPid(Apid, ptAudio))) {//XXX+ dolby Dpid1!!! (if audio plugins are attached)
-           esyslog("ERROR: failed to set PIDs for channel %d", ChannelNumber);
-           return scrFailed;
-           }
-        if (IsPrimaryDevice())
-           AddPid(Tpid, ptTeletext);
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-        }
-     }
-
-  if (IsPrimaryDevice() && siProcessor)
-     siProcessor->SetCurrentServiceID(Pnr);
+  bool NeedsTransferMode = (IsPrimaryDevice() && !ProvidesCa(Channel->ca));
 
   eSetChannelResult Result = scrOk;
 
@@ -618,28 +273,30 @@ eSetChannelResult cDevice::SetChannel(int ChannelNumber, int Frequency, char Pol
   // use the card that actually can receive it and transfer data from there:
 
   if (NeedsTransferMode) {
-     cDevice *CaDevice = GetDevice(Ca, 0);
-     if (CaDevice && !CaDevice->Receiving()) {
-        if ((Result = CaDevice->SetChannel(ChannelNumber, Frequency, Polarization, Diseqc, Srate, Vpid, Apid, Tpid, Ca, Pnr)) == scrOk)
-           cControl::Launch(new cTransferControl(CaDevice, Vpid, Apid, 0, 0, 0));//XXX+
-        }
+     cDevice *CaDevice = GetDevice(Channel->ca, 0);
+     if (CaDevice && !CaDevice->Receiving() && CaDevice->SetChannel(Channel) == scrOk)
+        cControl::Launch(new cTransferControl(CaDevice, Channel->vpid, Channel->apid1, 0, 0, 0));//XXX+
      else
         Result = scrNoTransfer;
      }
+  else if (!SetChannelDevice(Channel))
+     Result = scrFailed;
 
-  if (HasDecoder()) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
-     }
+  if (IsPrimaryDevice())
+     cSIProcessor::SetCurrentServiceID(Channel->pnr);
 
-  // Start setting system time:
+  cStatus::MsgChannelSwitch(this, Channel->number);
 
-  if (Result == scrOk && siProcessor)
-     siProcessor->SetCurrentTransponder(Frequency);
+  return Result;
+}
 
-  cStatus::MsgChannelSwitch(this, ChannelNumber);
+bool cDevice::SetChannelDevice(const cChannel *Channel)
+{
+  return false;
+}
 
-  return Result;
+void cDevice::SetVolumeDevice(int Volume)
+{
 }
 
 bool cDevice::ToggleMute(void)
@@ -653,78 +310,40 @@ bool cDevice::ToggleMute(void)
 
 void cDevice::SetVolume(int Volume, bool Absolute)
 {
-  if (HasDecoder()) {
-     volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
-     audioMixer_t am;
-     am.volume_left = am.volume_right = volume;
-     CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
-     cStatus::MsgSetVolume(volume, Absolute);
-     if (volume > 0)
-        mute = false;
-     }
+  volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
+  SetVolumeDevice(volume);
+  cStatus::MsgSetVolume(volume, Absolute);
+  if (volume > 0)
+     mute = false;
+}
+
+int cDevice::SetPlayMode(bool On)
+{
+  return -1;
 }
 
 void cDevice::TrickSpeed(int Speed)
 {
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
 }
 
 void cDevice::Clear(void)
 {
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
 }
 
 void cDevice::Play(void)
 {
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_CONTINUE));
 }
 
 void cDevice::Freeze(void)
 {
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_FREEZE));
 }
 
 void cDevice::Mute(void)
 {
-  if (fd_audio >= 0) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     }
 }
 
 void cDevice::StillPicture(const uchar *Data, int Length)
 {
-  Mute();
-/* Using the VIDEO_STILLPICTURE ioctl call would be the
-   correct way to display a still frame, but unfortunately this
-   doesn't work with frames from VDR. So let's do pretty much the
-   same here as in DVB/driver/dvb.c's play_iframe() - I have absolutely
-   no idea why it works this way, but doesn't work with VIDEO_STILLPICTURE.
-   If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
-   could be used, please let me know!
-   kls 2002-03-23
-*/
-//#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-#ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-  videoDisplayStillPicture sp = { (char *)Data, Length };
-  CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
-#else
-#define MIN_IFRAME 400000
-  for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
-      safe_write(fd_video, Data, Length);
-      usleep(1); // allows the buffer to be displayed in case the progress display is active
-      }
-#endif
 }
 
 bool cDevice::Replaying(void)
@@ -741,19 +360,9 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (HasDecoder()) {
      if (player)
         Detach(player);
-
-     if (siProcessor)
-        siProcessor->SetStatus(false);
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_PLAY));
-     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-     CHECK(ioctl(fd_video, VIDEO_PLAY));
-
      player = Player;
      player->device = this;
-     player->deviceFileHandle = fd_video;
+     player->deviceFileHandle = SetPlayMode(true);
      player->Activate(true);
      return true;
      }
@@ -767,17 +376,7 @@ void cDevice::Detach(cPlayer *Player)
      player->deviceFileHandle = -1;
      player->device = NULL;
      player = NULL;
-
-     CHECK(ioctl(fd_video, VIDEO_STOP, true));
-     CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
-     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     if (siProcessor)
-        siProcessor->SetStatus(true);
+     SetPlayMode(false);
      }
 }
 
@@ -802,14 +401,11 @@ void cDevice::StopReplay(void)
 
 int cDevice::PlayVideo(const uchar *Data, int Length)
 {
-  if (fd_video >= 0)
-     return write(fd_video, Data, Length);
   return -1;
 }
 
 int cDevice::PlayAudio(const uchar *Data, int Length)
 {
-  //XXX+
   return -1;
 }
 
@@ -828,7 +424,7 @@ int cDevice::Priority(void)
 int cDevice::CanShift(int Ca, int Priority, int UsedCards)
 {
   return -1;//XXX+ too complex with multiple recordings per device
-  // Test whether a receiving on this DVB device can be shifted to another one
+  // Test whether a receiver on this device can be shifted to another one
   // in order to perform a new receiving with the given Ca and Priority on this device:
   int ShiftLevel = -1; // default means this device can't be shifted
   if (UsedCards & (1 << CardIndex()) != 0)
@@ -882,7 +478,7 @@ int cDevice::ProvidesCa(int Ca)
 bool cDevice::Receiving(void)
 {
   for (int i = 0; i < MAXRECEIVERS; i++) {
-      if (receiver[i])
+      if (receiver[i] && receiver[i]->priority >= 0) // cReceiver with priority < 0 doesn't count
          return true;
       }
   return false;
@@ -892,51 +488,31 @@ void cDevice::Action(void)
 {
   dsyslog("receiver thread started on device %d (pid=%d)", CardIndex() + 1, getpid());
 
-  int fd_dvr = open(dvrFileName, O_RDONLY | O_NONBLOCK);
-  if (fd_dvr >= 0) {
-     pollfd pfd;
-     pfd.fd = fd_dvr;
-     pfd.events = pfd.revents = POLLIN;
+  if (OpenDvr()) {
      uchar b[TS_SIZE];
      time_t t = time(NULL);
      active = true;
      for (; active;) {
-
          // Read data from the DVR device:
-
-         if (pfd.revents & POLLIN != 0) {
-            int r = read(fd_dvr, b, sizeof(b));
-            if (r == TS_SIZE) {
-               if (*b == TS_SYNC_BYTE) {
-                  // We're locked on to a TS packet
-                  int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
-                  // Distribute the packet to all attached receivers:
-                  Lock();
-                  for (int i = 0; i < MAXRECEIVERS; i++) {
-                      if (receiver[i] && receiver[i]->WantsPid(Pid))
-                         receiver[i]->Receive(b, TS_SIZE);
-                      }
-                  Unlock();
-                  }
-               t = time(NULL);
-               }
-            else if (r > 0)
-               esyslog("ERROR: got incomplete TS packet (%d bytes)", r);//XXX+ TODO do we have to read the rest???
-            else if (r < 0) {
-               if (FATALERRNO) {
-                  if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-                     esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
-                  else {
-                     LOG_ERROR;
-                     break;
-                     }
-                  }
+         int r = GetTSPacket(b);
+         if (r == TS_SIZE) {
+            if (*b == TS_SYNC_BYTE) {
+               // We're locked on to a TS packet
+               int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
+               // Distribute the packet to all attached receivers:
+               Lock();
+               for (int i = 0; i < MAXRECEIVERS; i++) {
+                   if (receiver[i] && receiver[i]->WantsPid(Pid))
+                      receiver[i]->Receive(b, TS_SIZE);
+                   }
+               Unlock();
                }
+            t = time(NULL);
             }
-
-         // Wait for more data to become available:
-
-         poll(&pfd, 1, 100);
+         else if (r > 0)
+            esyslog("ERROR: got incomplete TS packet (%d bytes) on device %d", r, CardIndex() + 1);//XXX+ TODO do we have to read the rest???
+         else if (r < 0)
+            break;
 
          //XXX+ put this into the recorder??? or give the receiver a flag whether it wants this?
          if (time(NULL) - t > MAXBROKENTIMEOUT) {
@@ -945,14 +521,26 @@ void cDevice::Action(void)
             t = time(NULL);
             }
          }
-     close(fd_dvr);
+     CloseDvr();
      }
-  else
-     LOG_ERROR_STR(dvrFileName);
 
   dsyslog("receiver thread ended on device %d (pid=%d)", CardIndex() + 1, getpid());
 }
 
+bool cDevice::OpenDvr(void)
+{
+  return false;
+}
+
+void cDevice::CloseDvr(void)
+{
+}
+
+int cDevice::GetTSPacket(uchar *Data)
+{
+  return -1;
+}
+
 bool cDevice::AttachReceiver(cReceiver *Receiver)
 {
   //XXX+ check for same transponder???
@@ -963,13 +551,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
   StopReplay();
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
-         //siProcessor->SetStatus(false);//XXX+
-         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
-             if (Receiver->pids[n])
-                AddPid(Receiver->pids[n]);//XXX+ retval!
-             else
-                break;
-             }
+         for (int n = 0; n < MAXRECEIVEPIDS; n++)
+             AddPid(Receiver->pids[n]);//XXX+ retval!
          Receiver->Activate(true);
          Lock();
          Receiver->device = this;
@@ -995,12 +578,8 @@ void cDevice::Detach(cReceiver *Receiver)
          receiver[i] = NULL;
          Receiver->device = NULL;
          Unlock();
-         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
-             if (Receiver->pids[n])
-                DelPid(Receiver->pids[n]);
-             else
-                break;
-             }
+         for (int n = 0; n < MAXRECEIVEPIDS; n++)
+             DelPid(Receiver->pids[n]);
          }
       else if (receiver[i])
          receiversLeft = true;
diff --git a/device.h b/device.h
index 6f2a34fd0..4610988dd 100644
--- a/device.h
+++ b/device.h
@@ -4,38 +4,33 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.3 2002/06/23 11:50:24 kls Exp $
+ * $Id: device.h 1.5 2002/08/04 14:02:19 kls Exp $
  */
 
 #ifndef __DEVICE_H
 #define __DEVICE_H
 
-#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
-                    // FIXME: shouldn't every header file include ALL the other header
-                    // FIXME: files it depends on? The sequence in which header files
-                    // FIXME: are included here should not matter - and it should NOT
-                    // FIXME: be necessary to include <stdlib.h> here!
-#include <ost/dmx.h>
-#include <ost/frontend.h>
-#include <ost/audio.h>
-#include <ost/video.h>
-#include "eit.h"
 #include "thread.h"
+#include "tools.h"
 
-enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
-
-#define MAXDEVICES          4 // the maximum number of devices in the system
-#define MAXCACAPS          16 // the maximum number of different CA values per DVB device
-#define MAXPIDHANDLES      16 // the maximum number of different PIDs per DVB device
-#define MAXRECEIVERS       16 // the maximum number of receivers per DVB device
+#define MAXDEVICES         16 // the maximum number of devices in the system
+#define MAXCACAPS          16 // the maximum number of different CA values per device
+#define MAXPIDHANDLES      16 // the maximum number of different PIDs per device
+#define MAXRECEIVERS       16 // the maximum number of receivers per device
 #define MAXVOLUME         255
 #define VOLUMEDELTA         5 // used to increase/decrease the volume
 
+#define TS_SIZE          188
+#define TS_SYNC_BYTE     0x47
+#define PID_MASK_HI      0x1F
+
+enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
+
+class cChannel;
 class cPlayer;
 class cReceiver;
 
 class cDevice : cThread {
-  friend class cOsd;//XXX
 private:
   static int numDevices;
   static int useDevice;
@@ -43,106 +38,142 @@ class cDevice : cThread {
   static cDevice *primaryDevice;
 public:
   static int NumDevices(void) { return numDevices; }
-         // Returns the total number of DVB devices.
+         // Returns the total number of devices.
   static void SetUseDevice(int n);
-         // Sets the 'useDevice' flag of the given DVB device.
-         // If this function is not called before Initialize(), all DVB devices
+         // Sets the 'useDevice' flag of the given device.
+         // If this function is not called before initializing, all devices
          // will be used.
+  static bool UseDevice(int n) { return useDevice == 0 || (useDevice & (1 << n)) != 0; }
+         // Tells whether the device with the given card index shall be used in
+         // this instance of VDR.
   static bool SetPrimaryDevice(int n);
-         // Sets the primary DVB device to 'n' (which must be in the range
+         // Sets the primary device to 'n' (which must be in the range
          // 1...numDevices) and returns true if this was possible.
   static cDevice *PrimaryDevice(void) { return primaryDevice; }
-         // Returns the primary DVB device.
+         // Returns the primary device.
   static cDevice *GetDevice(int Ca, int Priority, int Frequency = 0, int Vpid = 0, bool *ReUse = NULL);
-         // Selects a free DVB device, avoiding the primaryDevice if possible.
+         // Selects a free device, avoiding the primaryDevice if possible.
          // If Ca is not 0, the device with the given number will be returned
          // in case Ca is <= MAXDEVICES, or the device that provides the given
          // value in its caCaps.
-         // If there is a device that is already tuned to the given Frequency,
-         // and that device is able to receive multiple channels ("budget" cards),
-         // that device will be returned. Else if a ("full featured") device is
-         // tuned to Frequency and Vpid, that one will be returned.
-         // If all DVB devices are currently receiving, the one receiving the
-         // lowest priority timer (if any) that is lower than the given Priority
+         // If there is a device that is already receiving and can be re-used to
+         // receive another data stream, that device will be returned.
+         // If all devices are currently receiving, the one receiving with the
+         // lowest priority (if any) that is lower than the given Priority
          // will be returned.
          // If ReUse is given, the caller will be informed whether the device can be re-used
          // for a new recording. If ReUse returns 'true', the caller must NOT switch the channel
          // (the device is already properly tuned). Otherwise the caller MUST switch the channel.
-  static void SetCaCaps(void);
-         // Sets the CaCaps of all DVB devices according to the Setup data.
-  static bool Probe(const char *FileName);
-         // Probes for existing DVB devices.
-  static bool Initialize(void);
-         // Initializes the DVB devices.
-         // Must be called before accessing any DVB functions.
+  static void SetCaCaps(int Index = -1);
+         // Sets the CaCaps of the given device according to the Setup data.
+         // By default the CaCaps of all devices are set.
   static void Shutdown(void);
-         // Closes down all DVB devices.
+         // Closes down all devices.
          // Must be called at the end of the program.
 private:
+  static int nextCardIndex;
   int cardIndex;
   int caCaps[MAXCACAPS];
-  FrontendType frontendType;
-  char *dvrFileName;
-  bool active;
-  int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video;
-  int OsdDeviceHandle(void) { return fd_osd; }
-public:
-  cDevice(int n);
+protected:
+  cDevice(void);
   virtual ~cDevice();
-  bool IsPrimaryDevice(void) { return this == primaryDevice; }
+  static int NextCardIndex(int n = 0);
+         // Each device in a given machine must have a unique card index, which
+         // will be used to identify the device for assigning Ca parameters and
+         // deciding whether to actually use that device in this particular
+         // instance of VDR. Every time a new cDevice is created, it will be
+         // given the current nextCardIndex, and then nextCardIndex will be
+         // automatically incremented by 1. A derived class can determine whether
+         // a given device shall be used by checking UseDevice(NextCardIndex()).
+         // If a device is skipped, or if there are possible device indexes left
+         // after a derived class has set up all its devices, NextCardIndex(n)
+         // must be called, where n is the number of card indexes to skip.
+  virtual void MakePrimaryDevice(bool On);
+         // Informs a device that it will be the primary device. If there is
+         // anything the device needs to set up when it becomes the primary
+         // device (On = true) or to shut down when it no longer is the primary
+         // device (On = false), it should do so in this function.
+public:
+  bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
   int ProvidesCa(int Ca);
-         // Checks whether this DVB device provides the given value in its
+         // Checks whether this device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
          // value is provided, and > 1 if this and other values are provided.
-         // If the given value is equal to the number of this DVB device,
+         // If the given value is equal to the number of this device,
          // 1 is returned. If it is 0 (FTA), 1 plus the number of other values
          // in caCaps is returned.
-  bool HasDecoder(void) const { return fd_video >= 0 && fd_audio >= 0; }
+  virtual bool CanBeReUsed(int Frequency, int Vpid);//XXX TODO make it more abstract
+         // Tells whether this device is already receiving and allows another
+         // receiver with the given settings to be attached to it.
+  virtual bool HasDecoder(void) const;
+         // Tells whether this device has an MPEG decoder.
 
 // Channel facilities
 
-private:
+protected:
   int currentChannel;
-  int frequency;
 public:
-  eSetChannelResult SetChannel(int ChannelNumber, int Frequency, char Polarization, int Diseqc, int Srate, int Vpid, int Apid, int Tpid, int Ca, int Pnr);
+  eSetChannelResult SetChannel(const cChannel *Channel);
+         // Sets the device to the given channel (general setup).
+  virtual bool SetChannelDevice(const cChannel *Channel);
+         // Sets the device to the given channel (actual physical setup).
   static int CurrentChannel(void) { return primaryDevice ? primaryDevice->currentChannel : 0; }
+         // Returns the number of the current channel on the primary device.
   int Channel(void) { return currentChannel; }
+         // Returns the number of the current channel on this device.
 
 // PID handle facilities
 
 private:
+  bool active;
+  virtual void Action(void);
+protected:
   enum ePidType { ptVideo, ptAudio, ptTeletext, ptDolby, ptOther };
   class cPidHandle {
   public:
     int pid;
-    int fd;
+    int handle;
     int used;
-    cPidHandle(void) { pid = used = 0; fd = -1; }
+    cPidHandle(void) { pid = used = 0; handle = -1; }
     };
   cPidHandle pidHandles[MAXPIDHANDLES];
   bool AddPid(int Pid, ePidType PidType = ptOther);
-  bool DelPid(int Pid);
-  bool SetPid(int fd, dmxPesType_t PesType, int Pid, dmxOutput_t Output);
-  virtual void Action(void);
+         // Adds a PID to the set of PIDs this device shall receive.
+  void DelPid(int Pid);
+         // Deletes a PID from the set of PIDs this device shall receive.
+  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
+         // Does the actual PID setting on this device.
+         // On indicates whether the PID shall be added or deleted.
+         // Handle->handle can be used by the device to store information it
+         // needs to receive this PID (for instance a file handle).
+         // Handle->used indicated how many receivers are using this PID.
+         // Type indicates some special types of PIDs, which the device may
+         // need to set in a specific way.
 
 // Image Grab facilities
 
 public:
-  bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+  virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+         // Grabs the currently visible screen image into the given file, with the
+         // given parameters.
 
 // Video format facilities
 
 public:
-  virtual void SetVideoFormat(videoFormat_t Format);
+  virtual void SetVideoFormat(bool VideoFormat16_9);
+         // Sets the output video format to either 16:9 or 4:3 (only useful
+         // if this device has an MPEG decoder).
 
 // Volume facilities
 
 private:
   bool mute;
   int volume;
+protected:
+  virtual void SetVolumeDevice(int Volume);
+       // Sets the audio volume on this device (Volume = 0...255).
 public:
   bool IsMute(void) { return mute; }
   bool ToggleMute(void);
@@ -152,30 +183,46 @@ class cDevice : cThread {
        // the current volume.
   static int CurrentVolume(void) { return primaryDevice ? primaryDevice->volume : 0; }//XXX???
 
-  // EIT facilities
-
-private:
-  cSIProcessor *siProcessor;
-
 // Player facilities
 
 private:
   cPlayer *player;
+protected:
+  virtual int SetPlayMode(bool On);
+       // Sets the device into play mode (On = true) or normal
+       // viewing mode (On = false). If On is true, it may return a file
+       // handle that a player can use to poll this device when replaying.
+       //XXX TODO should be implemented differently
 public:
-  void TrickSpeed(int Speed);
-  void Clear(void);
-  void Play(void);
-  void Freeze(void);
-  void Mute(void);
-  void StillPicture(const uchar *Data, int Length);
+  virtual void TrickSpeed(int Speed);
+       // Sets the device into a mode where replay is done slower.
+       // Every single frame shall then be displayed the given number of
+       // times.
+  virtual void Clear(void);
+       // Clears all video and audio data from the device.
+  virtual void Play(void);
+       // Sets the device into play mode (after a previous trick
+       // mode).
+  virtual void Freeze(void);
+       // Puts the device into "freeze frame" mode.
+  virtual void Mute(void);
+       // Turns off audio while replaying.
+  virtual void StillPicture(const uchar *Data, int Length);
+       // Displays the given I-frame as a still picture.
+  virtual int PlayVideo(const uchar *Data, int Length);
+       // Actually plays the given data block as video. The data must be
+       // part of a PES (Packetized Elementary Stream) which can contain
+       // one video and one audio strem.
+  virtual int PlayAudio(const uchar *Data, int Length);
+       // Plays additional audio streams, like Dolby Digital.
   bool Replaying(void);
        // Returns true if we are currently replaying.
   void StopReplay(void);
        // Stops the current replay session (if any).
   bool AttachPlayer(cPlayer *Player);
+       // Attaches the given player to this device.
   void Detach(cPlayer *Player);
-  virtual int PlayVideo(const uchar *Data, int Length);
-  virtual int PlayAudio(const uchar *Data, int Length);
+       // Detaches the given player from this device.
 
 // Receiver facilities
 
@@ -184,16 +231,30 @@ class cDevice : cThread {
   int ca;
   int Priority(void);
       // Returns the priority of the current receiving session (0..MAXPRIORITY),
-      // or -1 if no receiver is currently active. The primary DVB device will
+      // or -1 if no receiver is currently active. The primary device will
       // always return at least Setup.PrimaryLimit-1.
   int CanShift(int Ca, int Priority, int UsedCards = 0);
+protected:
+  virtual bool OpenDvr(void);
+      // Opens the DVR of this device and prepares it to deliver a Transport
+      // Stream for use in a cReceiver.
+  virtual void CloseDvr(void);
+      // Shuts down the DVR.
+  virtual int GetTSPacket(uchar *Data);
+      // Gets exactly one TS packet from the DVR of this device and copies it
+      // into the given memory area (which is exactly 188 bytes in size).
+      // Returns the number of bytes copied into Data (which must be 188).
+      // If there is currently no TS packet available, 0 should be returned.
+      // In case of a non recoverable error, returns -1.
 public:
   int  Ca(void) { return ca; }
        // Returns the ca of the current receiving session.
   bool Receiving(void);
        // Returns true if we are currently receiving.
   bool AttachReceiver(cReceiver *Receiver);
+       // Attaches the given receiver to this device.
   void Detach(cReceiver *Receiver);
+       // Detaches the given receiver from this device.
   };
 
 #endif //__DEVICE_H
diff --git a/dvbdevice.c b/dvbdevice.c
new file mode 100644
index 000000000..be765005a
--- /dev/null
+++ b/dvbdevice.c
@@ -0,0 +1,615 @@
+/*
+ * dvbdevice.c: The DVB device interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbdevice.c 1.1 2002/08/04 12:24:25 kls Exp $
+ */
+
+#include "dvbdevice.h"
+#include <errno.h>
+extern "C" {
+#ifdef boolean
+#define HAVE_BOOLEAN
+#endif
+#include <jpeglib.h>
+#undef boolean
+}
+#include <limits.h>
+#include <linux/videodev.h>
+#include <ost/audio.h>
+#include <ost/sec.h>
+#include <ost/video.h>
+#include <poll.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include "dvbosd.h"
+#include "player.h"
+#include "receiver.h"
+#include "status.h"
+#include "transfer.h"
+
+#define MAXDVBDEVICES     4
+
+#define DEV_VIDEO         "/dev/video"
+#define DEV_OST_OSD       "/dev/ost/osd"
+#define DEV_OST_FRONTEND  "/dev/ost/frontend"
+#define DEV_OST_SEC       "/dev/ost/sec"
+#define DEV_OST_DVR       "/dev/ost/dvr"
+#define DEV_OST_DEMUX     "/dev/ost/demux"
+#define DEV_OST_VIDEO     "/dev/ost/video"
+#define DEV_OST_AUDIO     "/dev/ost/audio"
+
+static const char *OstName(const char *Name, int n)
+{
+  static char buffer[PATH_MAX];
+  snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
+  return buffer;
+}
+
+static int OstOpen(const char *Name, int n, int Mode, bool ReportError = false)
+{
+  const char *FileName = OstName(Name, n);
+  int fd = open(FileName, Mode);
+  if (fd < 0 && ReportError)
+     LOG_ERROR_STR(FileName);
+  return fd;
+}
+
+cDvbDevice::cDvbDevice(int n)
+{
+  frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
+  siProcessor = NULL;
+
+  // Devices that are present on all card types:
+
+  fd_frontend = OstOpen(DEV_OST_FRONTEND, n, O_RDWR);
+
+  // Devices that are only present on DVB-S cards:
+
+  fd_sec      = OstOpen(DEV_OST_SEC,      n, O_RDWR);
+
+  // Devices that are only present on cards with decoders:
+
+  fd_osd      = OstOpen(DEV_OST_OSD,    n, O_RDWR);
+  fd_video    = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
+  fd_audio    = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
+
+  // The DVR device (will be opened and closed as needed):
+
+  fd_dvr = -1;
+
+  // Video format:
+
+  SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+
+  // We only check the devices that must be present - the others will be checked before accessing them://XXX
+
+  if (fd_frontend >= 0) {
+     siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
+     FrontendInfo feinfo;
+     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0)
+        frontendType = feinfo.type;
+     else
+        LOG_ERROR;
+     }
+  else
+     esyslog("ERROR: can't open DVB device %d", n);
+
+  frequency = 0;
+}
+
+cDvbDevice::~cDvbDevice()
+{
+  delete siProcessor;
+  // We're not explicitly closing any device files here, since this sometimes
+  // caused segfaults. Besides, the program is about to terminate anyway...
+}
+
+bool cDvbDevice::Probe(const char *FileName)
+{
+  if (access(FileName, F_OK) == 0) {
+     dsyslog("probing %s", FileName);
+     int f = open(FileName, O_RDONLY);
+     if (f >= 0) {
+        close(f);
+        return true;
+        }
+     else if (errno != ENODEV && errno != EINVAL)
+        LOG_ERROR_STR(FileName);
+     }
+  else if (errno != ENOENT)
+     LOG_ERROR_STR(FileName);
+  return false;
+}
+
+bool cDvbDevice::Initialize(void)
+{
+  int found = 0;
+  int i;
+  for (i = 0; i < MAXDVBDEVICES; i++) {
+      if (UseDevice(NextCardIndex())) {
+         if (Probe(OstName(DEV_OST_FRONTEND, i))) {
+            new cDvbDevice(i);
+            found++;
+            }
+         else
+            break;
+         }
+      else
+         NextCardIndex(1); // skips this one
+      }
+  NextCardIndex(MAXDVBDEVICES - i); // skips the rest
+  if (found > 0)
+     isyslog("found %d video device%s", found, found > 1 ? "s" : "");
+  else
+     isyslog("no DVB device found");
+  return found > 0;
+}
+
+void cDvbDevice::MakePrimaryDevice(bool On)
+{
+  cDvbOsd::SetDvbDevice(On ? this : NULL);
+}
+
+bool cDvbDevice::CanBeReUsed(int Frequency, int Vpid)
+{
+  return Receiving() // to be reused the DVB device must already be receiving...
+      && frequency == Frequency // ...and tuned to the requested frequency...
+      && (!HasDecoder() // ...and either be a "budget card" which can receive multiple channels...
+          || pidHandles[ptVideo].pid == Vpid // ...or be a "full featured card" that's already tuned to the requested video PID
+         );
+}
+
+bool cDvbDevice::HasDecoder(void) const
+{
+  return fd_video >= 0 && fd_audio >= 0;
+}
+
+bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
+{
+  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
+  if (videoDev >= 0) {
+     int result = 0;
+     struct video_mbuf mbuf;
+     result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
+     if (result == 0) {
+        int msize = mbuf.size;
+        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
+        if (mem && mem != (unsigned char *)-1) {
+           // set up the size and RGB
+           struct video_capability vc;
+           result |= ioctl(videoDev, VIDIOCGCAP, &vc);
+           struct video_mmap vm;
+           vm.frame = 0;
+           if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
+               (SizeY > 0) && (SizeY <= vc.maxheight)) {
+              vm.width = SizeX;
+              vm.height = SizeY;
+              }
+           else {
+              vm.width = vc.maxwidth;
+              vm.height = vc.maxheight;
+              }
+           vm.format = VIDEO_PALETTE_RGB24;
+           result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
+           result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
+           // make RGB out of BGR:
+           int memsize = vm.width * vm.height;
+           unsigned char *mem1 = mem;
+           for (int i = 0; i < memsize; i++) {
+               unsigned char tmp = mem1[2];
+               mem1[2] = mem1[0];
+               mem1[0] = tmp;
+               mem1 += 3;
+               }
+         
+           if (Quality < 0)
+              Quality = 255; //XXX is this 'best'???
+         
+           isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+           FILE *f = fopen(FileName, "wb");
+           if (f) {
+              if (Jpeg) {
+                 // write JPEG file:
+                 struct jpeg_compress_struct cinfo;
+                 struct jpeg_error_mgr jerr;
+                 cinfo.err = jpeg_std_error(&jerr);
+                 jpeg_create_compress(&cinfo);
+                 jpeg_stdio_dest(&cinfo, f);
+                 cinfo.image_width = vm.width;
+                 cinfo.image_height = vm.height;
+                 cinfo.input_components = 3;
+                 cinfo.in_color_space = JCS_RGB;
+         
+                 jpeg_set_defaults(&cinfo);
+                 jpeg_set_quality(&cinfo, Quality, true);
+                 jpeg_start_compress(&cinfo, true);
+         
+                 int rs = vm.width * 3;
+                 JSAMPROW rp[vm.height];
+                 for (int k = 0; k < vm.height; k++)
+                     rp[k] = &mem[rs * k];
+                 jpeg_write_scanlines(&cinfo, rp, vm.height);
+                 jpeg_finish_compress(&cinfo);
+                 jpeg_destroy_compress(&cinfo);
+                 }
+              else {
+                 // write PNM file:
+                 if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
+                     fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
+                    LOG_ERROR_STR(FileName);
+                    result |= 1;
+                    }
+                 }
+              fclose(f);
+              }
+           else {
+              LOG_ERROR_STR(FileName);
+              result |= 1;
+              }
+           munmap(mem, msize);
+           }
+        else
+           result |= 1;
+        }
+     close(videoDev);
+     return result == 0;
+     }
+  return false;
+}
+
+void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
+{
+  if (HasDecoder())
+     CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
+}
+
+//                          ptVideo        ptAudio        ptTeletext        ptDolby        ptOther
+dmxPesType_t PesTypes[] = { DMX_PES_VIDEO, DMX_PES_AUDIO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+
+bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
+{
+  if (Handle->pid) {
+     if (On) {
+        if (Handle->handle < 0) {
+           Handle->handle = OstOpen(DEV_OST_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
+           if (Handle->handle < 0)
+              return false;
+           }
+        }
+     else {
+        CHECK(ioctl(Handle->handle, DMX_STOP));
+        if (Handle->used == 0) {
+           close(Handle->handle);
+           Handle->handle = -1;
+           return true;
+           }
+        }
+
+     if (Handle->pid != 0x1FFF) {
+        dmxPesFilterParams pesFilterParams;
+        pesFilterParams.pid     = Handle->pid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
+        pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        //XXX+ pesFilterParams.flags   = DMX_CHECK_CRC;//XXX
+        if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+           LOG_ERROR;
+           return false;
+           }
+        //XXX+ CHECK(ioctl(Handle->handle, DMX_SET_BUFFER_SIZE, KILOBYTE(32)));//XXX
+        //XXX+ CHECK(ioctl(Handle->handle, DMX_START));//XXX
+        }
+     }
+  return true;
+}
+
+bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
+{
+  // Avoid noise while switching:
+
+  if (HasDecoder()) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     }
+
+  // Stop setting system time:
+
+  if (siProcessor)
+     siProcessor->SetCurrentTransponder(0);
+
+  // Turn off current PIDs:
+
+  if (HasDecoder()) {
+     DelPid(pidHandles[ptVideo].pid);
+     DelPid(pidHandles[ptAudio].pid);
+     DelPid(pidHandles[ptTeletext].pid);
+     DelPid(pidHandles[ptDolby].pid);
+     }
+
+  FrontendParameters Frontend;
+
+  switch (frontendType) {
+    case FE_QPSK: { // DVB-S
+
+         // Frequency offsets:
+
+         unsigned int freq = Channel->frequency;
+         int tone = SEC_TONE_OFF;
+
+         if (freq < (unsigned int)Setup.LnbSLOF) {
+            freq -= Setup.LnbFrequLo;
+            tone = SEC_TONE_OFF;
+            }
+         else {
+            freq -= Setup.LnbFrequHi;
+            tone = SEC_TONE_ON;
+            }
+
+         Frontend.Frequency = freq * 1000UL;
+         Frontend.Inversion = INVERSION_AUTO;
+         Frontend.u.qpsk.SymbolRate = Channel->srate * 1000UL;
+         Frontend.u.qpsk.FEC_inner = FEC_AUTO;
+
+         int volt = (Channel->polarization == 'v' || Channel->polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+
+         // DiseqC:
+
+         secCommand scmd;
+         scmd.type = 0;
+         scmd.u.diseqc.addr = 0x10;
+         scmd.u.diseqc.cmd = 0x38;
+         scmd.u.diseqc.numParams = 1;
+         scmd.u.diseqc.params[0] = 0xF0 | ((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
+
+         secCmdSequence scmds;
+         scmds.voltage = volt;
+         scmds.miniCommand = SEC_MINI_NONE;
+         scmds.continuousTone = tone;
+         scmds.numCommands = Setup.DiSEqC ? 1 : 0;
+         scmds.commands = &scmd;
+
+         CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+         }
+         break;
+    case FE_QAM: { // DVB-C
+
+         // Frequency and symbol rate:
+
+         Frontend.Frequency = Channel->frequency * 1000000UL;
+         Frontend.Inversion = INVERSION_AUTO;
+         Frontend.u.qam.SymbolRate = Channel->srate * 1000UL;
+         Frontend.u.qam.FEC_inner = FEC_AUTO;
+         Frontend.u.qam.QAM = QAM_64;
+         }
+         break;
+    case FE_OFDM: { // DVB-T
+
+         // Frequency and OFDM paramaters:
+
+         Frontend.Frequency = Channel->frequency * 1000UL;
+         Frontend.Inversion = INVERSION_AUTO;
+         Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
+         Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
+         Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
+         Frontend.u.ofdm.Constellation=QAM_64;
+         Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
+         Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
+         Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
+         }
+         break;
+    default:
+         esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+         return false;
+    }
+
+  // Tuning:
+
+  CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
+
+  // Wait for channel sync:
+
+  if (cFile::FileReady(fd_frontend, 5000)) {
+     FrontendEvent event;
+     int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
+     if (res >= 0) {
+        if (event.type != FE_COMPLETION_EV) {
+           esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1);
+           if (IsPrimaryDevice())
+              cThread::RaisePanic();
+           return false;
+           }
+        }
+     else
+        esyslog("ERROR %d in frontend get event (channel %d, card %d)", res, Channel->number, CardIndex() + 1);
+     }
+  else
+     esyslog("ERROR: timeout while tuning");
+
+  frequency = Channel->frequency;
+
+  // PID settings:
+
+  if (HasDecoder()) {
+     if (!(AddPid(Channel->vpid, ptVideo) && AddPid(Channel->apid1, ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+        esyslog("ERROR: failed to set PIDs for channel %d", Channel->number);
+        return false;
+        }
+     if (IsPrimaryDevice())
+        AddPid(Channel->tpid, ptTeletext);
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     }
+
+  if (HasDecoder()) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+     }
+
+  // Start setting system time:
+
+  if (siProcessor)
+     siProcessor->SetCurrentTransponder(Channel->frequency);
+
+  return true;
+}
+
+void cDvbDevice::SetVolumeDevice(int Volume)
+{
+  if (HasDecoder()) {
+     audioMixer_t am;
+     am.volume_left = am.volume_right = Volume;
+     CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
+     }
+}
+
+int cDvbDevice::SetPlayMode(bool On)
+{
+  if (On) {
+     if (siProcessor)
+        siProcessor->SetStatus(false);
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_PLAY));
+     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+     CHECK(ioctl(fd_video, VIDEO_PLAY));
+     return fd_video;
+     }
+  else {
+     CHECK(ioctl(fd_video, VIDEO_STOP, true));
+     CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
+     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     if (siProcessor)
+        siProcessor->SetStatus(true);
+     return -1;
+     }
+}
+
+void cDvbDevice::TrickSpeed(int Speed)
+{
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
+}
+
+void cDvbDevice::Clear(void)
+{
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+}
+
+void cDvbDevice::Play(void)
+{
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_CONTINUE));
+}
+
+void cDvbDevice::Freeze(void)
+{
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_FREEZE));
+}
+
+void cDvbDevice::Mute(void)
+{
+  if (fd_audio >= 0) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     }
+}
+
+void cDvbDevice::StillPicture(const uchar *Data, int Length)
+{
+  Mute();
+/* Using the VIDEO_STILLPICTURE ioctl call would be the
+   correct way to display a still frame, but unfortunately this
+   doesn't work with frames from VDR. So let's do pretty much the
+   same here as in DVB/driver/dvb.c's play_iframe() - I have absolutely
+   no idea why it works this way, but doesn't work with VIDEO_STILLPICTURE.
+   If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
+   could be used, please let me know!
+   kls 2002-03-23
+*/
+//#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+#ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+  videoDisplayStillPicture sp = { (char *)Data, Length };
+  CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+#else
+#define MIN_IFRAME 400000
+  for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
+      safe_write(fd_video, Data, Length);
+      usleep(1); // allows the buffer to be displayed in case the progress display is active
+      }
+#endif
+}
+
+int cDvbDevice::PlayVideo(const uchar *Data, int Length)
+{
+  if (fd_video >= 0)
+     return write(fd_video, Data, Length);
+  return -1;
+}
+
+int cDvbDevice::PlayAudio(const uchar *Data, int Length)
+{
+  //XXX+
+  return -1;
+}
+
+bool cDvbDevice::OpenDvr(void)
+{
+  CloseDvr();
+  fd_dvr = OstOpen(DEV_OST_DVR, CardIndex(), O_RDONLY | O_NONBLOCK, true);
+  return fd_dvr >= 0;
+}
+
+void cDvbDevice::CloseDvr(void)
+{
+  if (fd_dvr >= 0) {
+     close(fd_dvr);
+     fd_dvr = -1;
+     }
+}
+
+int cDvbDevice::GetTSPacket(uchar *Data)
+{
+  if (fd_dvr >= 0) {
+     pollfd pfd;
+     pfd.fd = fd_dvr;
+     pfd.events = POLLIN;
+
+     poll(&pfd, 1, 100);
+
+     if (pfd.revents & POLLIN != 0) {
+        int r = read(fd_dvr, Data, TS_SIZE);
+        if (r >= 0)
+           return r;
+        else if (FATALERRNO) {
+           if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
+              esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
+           else {
+              LOG_ERROR;
+              return -1;
+              }
+           }
+        }
+     return 0;
+     }
+  else
+     return -1;
+}
diff --git a/dvbdevice.h b/dvbdevice.h
new file mode 100644
index 000000000..25777f06a
--- /dev/null
+++ b/dvbdevice.h
@@ -0,0 +1,97 @@
+/*
+ * dvbdevice.h: The DVB device interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbdevice.h 1.1 2002/08/04 12:19:10 kls Exp $
+ */
+
+#ifndef __DVBDEVICE_H
+#define __DVBDEVICE_H
+
+#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
+                    // FIXME: shouldn't every header file include ALL the other header
+                    // FIXME: files it depends on? The sequence in which header files
+                    // FIXME: are included here should not matter - and it should NOT
+                    // FIXME: be necessary to include <stdlib.h> here!
+#include <ost/frontend.h>
+#include "device.h"
+#include "eit.h"
+
+class cDvbDevice : public cDevice {
+  friend class cDvbOsd;
+private:
+  static bool Probe(const char *FileName);
+         // Probes for existing DVB devices.
+public:
+  static bool Initialize(void);
+         // Initializes the DVB devices.
+         // Must be called before accessing any DVB functions.
+private:
+  FrontendType frontendType;
+  int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video, fd_dvr;
+  int OsdDeviceHandle(void) const { return fd_osd; }
+protected:
+  virtual void MakePrimaryDevice(bool On);
+public:
+  cDvbDevice(int n);
+  virtual ~cDvbDevice();
+  virtual bool CanBeReUsed(int Frequency, int Vpid);
+  virtual bool HasDecoder(void) const;
+
+// Channel facilities
+
+private:
+  int frequency;
+public:
+  virtual bool SetChannelDevice(const cChannel *Channel);
+
+// PID handle facilities
+
+protected:
+  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
+
+// Image Grab facilities
+
+public:
+  virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+
+// Video format facilities
+
+public:
+  virtual void SetVideoFormat(bool VideoFormat16_9);
+
+// Volume facilities
+
+protected:
+  virtual void SetVolumeDevice(int Volume);
+
+// EIT facilities
+
+private:
+  cSIProcessor *siProcessor;
+
+// Player facilities
+
+protected:
+  virtual int SetPlayMode(bool On);
+public:
+  virtual void TrickSpeed(int Speed);
+  virtual void Clear(void);
+  virtual void Play(void);
+  virtual void Freeze(void);
+  virtual void Mute(void);
+  virtual void StillPicture(const uchar *Data, int Length);
+  virtual int PlayVideo(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length);
+
+// Receiver facilities
+
+protected:
+  virtual bool OpenDvr(void);
+  virtual void CloseDvr(void);
+  virtual int GetTSPacket(uchar *Data);
+  };
+
+#endif //__DVBDEVICE_H
diff --git a/dvbosd.c b/dvbosd.c
index ad51966f1..ca5cf4900 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.17 2002/05/18 13:39:02 kls Exp $
+ * $Id: dvbosd.c 1.18 2002/08/04 10:13:21 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -13,10 +13,12 @@
 #include <sys/unistd.h>
 #include "tools.h"
 
-cDvbOsd::cDvbOsd(int OsdDev, int x, int y)
+const cDvbDevice *cDvbOsd::dvbDevice = NULL;
+
+cDvbOsd::cDvbOsd(int x, int y)
 :cOsdBase(x, y)
 {
-  osdDev = OsdDev;
+  osdDev = dvbDevice ? dvbDevice->OsdDeviceHandle() : -1;
   if (osdDev < 0)
      esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
 }
@@ -27,6 +29,11 @@ cDvbOsd::~cDvbOsd()
       CloseWindow(GetWindowNr(i));
 }
 
+void cDvbOsd::SetDvbDevice(const cDvbDevice *DvbDevice)
+{
+  dvbDevice = DvbDevice;
+}
+
 bool cDvbOsd::SetWindow(cWindow *Window)
 {
   if (Window) {
diff --git a/dvbosd.h b/dvbosd.h
index 0bc6079f8..69838f6dc 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,17 +4,19 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.13 2002/05/18 13:38:09 kls Exp $
+ * $Id: dvbosd.h 1.14 2002/08/04 10:12:14 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
 #include <ost/osd.h>
+#include "dvbdevice.h"
 #include "osdbase.h"
 
 class cDvbOsd : public cOsdBase {
 private:
+  static const cDvbDevice *dvbDevice;
   int osdDev;
   bool SetWindow(cWindow *Window);
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
@@ -26,8 +28,9 @@ class cDvbOsd : public cOsdBase {
   virtual void MoveWindow(cWindow *Window, int x, int y);
   virtual void CloseWindow(cWindow *Window);
 public:
-  cDvbOsd(int OsdDev, int x, int y);
+  cDvbOsd(int x, int y);
   virtual ~cDvbOsd();
+  static void SetDvbDevice(const cDvbDevice *DvbDevice);
   };
 
 #endif //__DVBOSD_H
diff --git a/dvbplayer.c b/dvbplayer.c
index af6b28dae..1b608dda6 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.7 2002/07/14 14:30:36 kls Exp $
+ * $Id: dvbplayer.c 1.8 2002/07/27 11:57:48 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -90,6 +90,7 @@ class cDvbPlayer : public cPlayer, cThread {
   int replayFile;
   bool eof;
   bool active;
+  bool running;
   ePlayModes playMode;
   ePlayDirs playDir;
   int trickSpeed;
@@ -133,6 +134,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   index = NULL;
   eof = false;
   active = true;
+  running = false;
   playMode = pmPlay;
   playDir = pdForward;
   trickSpeed = NORMAL_SPEED;
@@ -285,8 +287,9 @@ void cDvbPlayer::Activate(bool On)
         Start();
      }
   else if (active) {
-     active = false;
+     running = false;
      Cancel(3);
+     active = false;
      }
 }
 
@@ -308,7 +311,8 @@ void cDvbPlayer::Action(void)
   if (readIndex >= 0)
      isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
-  while (active && NextFile()) {
+  running = true;
+  while (running && NextFile()) {
         pfd[1].fd = replayFile; // NextFile() may have returned a new file handle!
         {
           LOCK_THREAD;
@@ -414,9 +418,9 @@ void cDvbPlayer::Action(void)
            break;
            }
         }
+  active = running = false;
 
   dsyslog("dvbplayer thread ended (pid=%d)", getpid());
-  active = false;
 }
 
 void cDvbPlayer::Pause(void)
diff --git a/eit.h b/eit.h
index 5221c403d..981f4e59f 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.16 2002/03/10 10:56:57 kls Exp $
+ * $Id: eit.h 1.17 2002/08/04 11:30:24 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -158,7 +158,7 @@ class cSIProcessor : public cThread {
   static bool Read(FILE *f = NULL);
   void SetStatus(bool On);
   void SetCurrentTransponder(int CurrentTransponder);
-  bool SetCurrentServiceID(unsigned short servid);
+  static bool SetCurrentServiceID(unsigned short servid);
   };
 
 #endif
diff --git a/eitscan.c b/eitscan.c
index a275abe00..08c91c619 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.3 2002/06/22 13:02:40 kls Exp $
+ * $Id: eitscan.c 1.4 2002/07/28 15:10:23 kls Exp $
  */
 
 #include "eitscan.h"
+#include <stdlib.h>
 
 cEITScanner::cEITScanner(void)
 {
diff --git a/menu.c b/menu.c
index 0404b8735..bb2538599 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.202 2002/07/14 10:55:37 kls Exp $
+ * $Id: menu.c 1.203 2002/08/03 09:55:44 kls Exp $
  */
 
 #include "menu.h"
@@ -1628,7 +1628,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
   if (state == osBack && Key == kOk) {
      if (Setup.PrimaryDVB != oldPrimaryDVB) {
         state = osSwitchDvb;
-        cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+        cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat);
         }
      }
   return state;
diff --git a/osd.c b/osd.c
index 4bf992702..30eecae52 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.31 2002/07/14 10:57:45 kls Exp $
+ * $Id: osd.c 1.32 2002/08/04 10:11:26 kls Exp $
  */
 
 #include "osd.h"
@@ -73,7 +73,7 @@ cOsdBase *cOsd::OpenRaw(int x, int y)
 #ifdef DEBUG_OSD
   return NULL;
 #else
-  return osd ? NULL : new cDvbOsd(cDevice::PrimaryDevice()->OsdDeviceHandle(), x, y);
+  return osd ? NULL : new cDvbOsd(x, y);
 #endif
 }
 
diff --git a/receiver.c b/receiver.c
index 04f984720..e9efac155 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,18 +4,21 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.1 2002/06/08 09:58:29 kls Exp $
+ * $Id: receiver.c 1.3 2002/07/28 15:14:49 kls Exp $
  */
 
 #include <stdarg.h>
 #include <stdio.h>
 #include "receiver.h"
+#include "tools.h"
 
 cReceiver::cReceiver(int Ca, int Priority, int NumPids, ...)
 {
   device = NULL;
   ca = Ca;
   priority = Priority;
+  for (int i = 0; i < MAXRECEIVEPIDS; i++)
+      pids[i] = 0;
   if (NumPids) {
      va_list ap;
      va_start(ap, NumPids);
diff --git a/receiver.h b/receiver.h
index aa3b9d11c..8ad8bc065 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 1.1 2002/06/08 15:32:51 kls Exp $
+ * $Id: receiver.h 1.2 2002/07/28 11:22:01 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -42,6 +42,9 @@ class cReceiver {
                // the given Priority. NumPids defines the number of PIDs that follow
                // this parameter. If any of these PIDs are 0, they will be silently ignored.
                // The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
+               // Priority may be any value in the range 0..99. Negative values indicate
+               // that this cReceiver may be detached at any time (without blocking the
+               // cDevice it is attached to).
   virtual ~cReceiver();
   };
 
diff --git a/recording.c b/recording.c
index 7ebec5c93..afa0e7f6d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.64 2002/06/22 10:11:49 kls Exp $
+ * $Id: recording.c 1.65 2002/07/27 12:55:14 kls Exp $
  */
 
 #include "recording.h"
@@ -22,12 +22,24 @@
 
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
+/* This was the original code, which works fine in a Linux only environment.
+   Unfortunately, because of windows and its brain dead file system, we have
+   to use a more complicated approach, in order to allow users who have enabled
+   the VFAT compile time option to see their recordings even if they forget to
+   enable VFAT when compiling a new version of VDR... Gee, do I hate Windows.
+   (kls 2002-07-27)
+#define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
+#define NAMEFORMAT   "%s/%s/" DATAFORMAT
+*/
+// start of implementation for brain dead systems
+#define DATAFORMAT   "%4d-%02d-%02d.%02d%*c%02d.%02d.%02d" RECEXT
 #ifdef VFAT
-#define DATAFORMAT   "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
+#define nameFORMAT   "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
 #else
-#define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
+#define nameFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
 #endif
-#define NAMEFORMAT   "%s/%s/" DATAFORMAT
+#define NAMEFORMAT   "%s/%s/" nameFORMAT
+// end of implementation for brain dead systems
 
 #define RESUMEFILESUFFIX  "/resume.vdr"
 #define SUMMARYFILESUFFIX "/summary.vdr"
diff --git a/remux.h b/remux.h
index 792469e5c..7d81ee033 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.5 2001/06/23 14:06:59 kls Exp $
+ * $Id: remux.h 1.6 2002/08/04 10:27:07 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -12,6 +12,7 @@
 
 #include <time.h> //XXX FIXME: DVB/ost/include/ost/dmx.h should include <time.h> itself!!!
 #include <ost/dmx.h>
+#include "tools.h"
 
 // Picture types:
 #define NO_PICTURE 0
@@ -24,7 +25,6 @@
 
 #define RESULTBUFFERSIZE (MINVIDEODATA * 4)
 
-typedef unsigned char uchar;
 class cTS2PES;
 
 class cRemux {
diff --git a/ringbuffer.c b/ringbuffer.c
index 421f19f00..b57b23e26 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,10 +7,11 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.9 2002/06/16 11:24:40 kls Exp $
+ * $Id: ringbuffer.c 1.10 2002/07/28 12:47:32 kls Exp $
  */
 
 #include "ringbuffer.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include "tools.h"
 
diff --git a/ringbuffer.h b/ringbuffer.h
index 43176bde5..660a08b04 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,15 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.6 2002/06/16 11:30:07 kls Exp $
+ * $Id: ringbuffer.h 1.7 2002/08/04 10:27:30 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
 #define __RINGBUFFER_H
 
 #include "thread.h"
-
-typedef unsigned char uchar;//XXX+
+#include "tools.h"
 
 class cRingBuffer {
 private:
diff --git a/tools.c b/tools.c
index 08aa8ae5c..6449a1be1 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.67 2002/05/18 15:10:45 kls Exp $
+ * $Id: tools.c 1.68 2002/08/03 15:44:53 kls Exp $
  */
 
 #include "tools.h"
@@ -407,7 +407,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
 
 char *ReadLink(const char *FileName)
 {
-  char RealName[_POSIX_PATH_MAX];
+  char RealName[PATH_MAX];
   const char *TargetName = NULL;
   int n = readlink(FileName, RealName, sizeof(RealName) - 1);
   if (n < 0) {
diff --git a/vdr.c b/vdr.c
index 10c54f74f..fa7429c13 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.117 2002/06/23 11:23:34 kls Exp $
+ * $Id: vdr.c 1.118 2002/08/04 09:56:30 kls Exp $
  */
 
 #include <getopt.h>
@@ -33,6 +33,7 @@
 #include "config.h"
 #include "cutter.h"
 #include "device.h"
+#include "dvbdevice.h"
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
@@ -326,11 +327,9 @@ int main(int argc, char *argv[])
 
   // DVB interfaces:
 
-  if (!cDevice::Initialize())
+  if (!cDvbDevice::Initialize())
      return 2;
 
-  cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
-
   cSIProcessor::Read();
 
   // Start plugins:
@@ -338,6 +337,10 @@ int main(int argc, char *argv[])
   if (!PluginManager.StartPlugins())
      return 2;
 
+  // Primary device:
+
+  cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
+
   // OSD:
 
   cOsd::Initialize();

From ed643353b100bee75459c4ef2d0330e7a04e1f2a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 16 Aug 2002 18:00:00 +0200
Subject: [PATCH 048/307] =?UTF-8?q?Version=201.1.7=20-=20Adapted=20VDR=20t?=
 =?UTF-8?q?o=20the=20NEWSTRUCT=20driver.=20To=20use=20the=20new=20driver,?=
 =?UTF-8?q?=20compile=20VDR=20with=20=20=20'make=20NEWSTRUCT=3D1'=20(thank?=
 =?UTF-8?q?s=20to=20Holger=20W=C3=A4chtler=20for=20some=20valuable=20advic?=
 =?UTF-8?q?e).=20=20=20By=20default=20it=20currently=20still=20uses=20the?=
 =?UTF-8?q?=20old=20driver.=20-=20Added=20some=20missing=20#includes=20(th?=
 =?UTF-8?q?anks=20to=20Martin=20Hammerschmid).=20-=20Changed=20the=20log?=
 =?UTF-8?q?=20error=20message=20"can't=20record=20MPEG1!"=20to=20"error=20?=
 =?UTF-8?q?in=20data=20stream!",=20=20=20since=20the=20mentioning=20of=20M?=
 =?UTF-8?q?PEG1=20has=20irritated=20many=20people.=20-=20Consistently=20us?=
 =?UTF-8?q?ing=20malloc/free=20and=20new/delete=20(thanks=20to=20Andreas?=
 =?UTF-8?q?=20Schultz).=20-=20Temporarily=20made=20cDevice::ProvidesCa()?=
 =?UTF-8?q?=20virtual=20(Andreas=20Schultz=20needs=20this=20=20=20in=20his?=
 =?UTF-8?q?=20DXR3=20plugin).=20-=20cDevice=20no=20longer=20exposes=20a=20?=
 =?UTF-8?q?file=20handle=20to=20cPlayer.=20A=20derived=20cPlayer=20class?=
 =?UTF-8?q?=20=20=20can=20now=20call=20DevicePoll()=20to=20see=20whether?=
 =?UTF-8?q?=20the=20replay=20device=20is=20ready=20for=20=20=20further=20d?=
 =?UTF-8?q?ata.=20A=20derived=20cDevice=20class=20must=20implement=20Poll(?=
 =?UTF-8?q?)=20and=20shall=20=20=20check=20if=20any=20of=20its=20file=20ha?=
 =?UTF-8?q?ndles=20is=20ready=20for=20data.=20-=20Implemented=20several=20?=
 =?UTF-8?q?replay=20modes=20to=20allow=20players=20that=20play=20only=20au?=
 =?UTF-8?q?dio=20(thanks=20=20=20to=20Stefan=20Huelswitt).=20-=20Improved?=
 =?UTF-8?q?=20cCondVar::Wait()=20and=20implemented=20cCondVar::TimedWait()?=
 =?UTF-8?q?=20(thanks=20to=20=20=20Stefan=20Huelswitt).=20-=20VDR=20no=20l?=
 =?UTF-8?q?onger=20gives=20up=20if=20there=20is=20no=20DVB=20device.=20It?=
 =?UTF-8?q?=20continues=20to=20work=20if=20=20=20there=20is=20at=20least?=
 =?UTF-8?q?=20one=20device,=20either=20a=20DVB=20device=20found=20by=20the?=
 =?UTF-8?q?=20core=20VDR=20code=20=20=20itself,=20or=20a=20device=20implem?=
 =?UTF-8?q?ented=20by=20a=20plugin.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |   8 +-
 HISTORY      |  23 +++++
 Makefile     |   7 +-
 PLUGINS.html |  42 ++++----
 config.c     |  42 ++++----
 config.h     |  10 +-
 cutter.c     |   6 +-
 device.c     |  19 ++--
 device.h     |  37 +++++--
 dvbdevice.c  | 268 ++++++++++++++++++++++++++++++++++++++-------------
 dvbdevice.h  |  14 ++-
 dvbosd.h     |   6 +-
 dvbplayer.c  | 211 +++++++++++++++++++---------------------
 eit.c        |  22 +++--
 eitscan.c    |   4 +-
 interface.c  |  11 ++-
 menu.c       |  44 ++++-----
 menuitems.c  |  16 +--
 menuitems.h  |  12 ++-
 osd.c        |  18 ++--
 osd.h        |   6 +-
 osdbase.c    |   7 +-
 player.c     |   6 +-
 player.h     |  20 ++--
 plugin.c     |  17 ++--
 recording.c  |  56 +++++------
 remux.c      |   9 +-
 remux.h      |   8 +-
 svdrp.c      |  11 ++-
 thread.c     |  42 ++++++--
 thread.h     |   6 +-
 tools.c      |  64 +++++++++---
 tools.h      |  16 ++-
 vdr.c        |  15 ++-
 videodir.c   |  14 +--
 35 files changed, 711 insertions(+), 406 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 716d88d9f..39dcde139 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -140,6 +140,8 @@ Stefan Huelswitt <huels@iname.com>
  for suggesting to make the config directory available to plugins
  for suggesting to add an error message if the directory specified in the '-L'
  option can't be accessed
+ for implementing several replay modes to allow players that play only audio
+ for improving cCondVar::Wait() and implementing cCondVar::TimedWait()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -158,6 +160,7 @@ Andreas Schultz <aschultz@warp10.net>
  than 3 characters
  for adding direct access to the index data of cPalette (needed for displaying SPUs)
  for pointing out a possible race condition in the cDvbPlayer
+ for making the use of malloc/free and new/delete consistent
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -369,8 +372,11 @@ Paul Lacatus <paul@campina.iiruc.ro>
 Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  for translating OSD texts to the Hungarian language
 
-Christian Rienecker <C.Rienecker@deutschepost.de>
+Christian Rienecker <C.Rienecker@gmx.net>
  for making the VFAT handling more tolerant for users who forget to turn it on
 
 Joerg Riechardt <J.Riechardt@gmx.de>
  for filling in some missing teletext PIDs
+
+Holger W�chtler <holger@convergence.de>
+ for some valuable advice during adapting to the NEWSTRUCT driver
diff --git a/HISTORY b/HISTORY
index 8ba62a5c2..c7269cda6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1392,3 +1392,26 @@ Video Disk Recorder Revision History
 - Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile.
 - Changed the cDevice class to allow plugins to implement their own devices (see
   PLUGINS.html for details).
+
+2002-08-16: Version 1.1.7
+
+- Adapted VDR to the NEWSTRUCT driver. To use the new driver, compile VDR with
+  'make NEWSTRUCT=1' (thanks to Holger W�chtler for some valuable advice).
+  By default it currently still uses the old driver.
+- Added some missing #includes (thanks to Martin Hammerschmid).
+- Changed the log error message "can't record MPEG1!" to "error in data stream!",
+  since the mentioning of MPEG1 has irritated many people.
+- Consistently using malloc/free and new/delete (thanks to Andreas Schultz).
+- Temporarily made cDevice::ProvidesCa() virtual (Andreas Schultz needs this
+  in his DXR3 plugin).
+- cDevice no longer exposes a file handle to cPlayer. A derived cPlayer class
+  can now call DevicePoll() to see whether the replay device is ready for
+  further data. A derived cDevice class must implement Poll() and shall
+  check if any of its file handles is ready for data.
+- Implemented several replay modes to allow players that play only audio (thanks
+  to Stefan Huelswitt).
+- Improved cCondVar::Wait() and implemented cCondVar::TimedWait() (thanks to
+  Stefan Huelswitt).
+- VDR no longer gives up if there is no DVB device. It continues to work if
+  there is at least one device, either a DVB device found by the core VDR code
+  itself, or a device implemented by a plugin.
diff --git a/Makefile b/Makefile
index 4764d8f99..ddacbd4b8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.44 2002/07/28 15:20:47 kls Exp $
+# $Id: Makefile 1.45 2002/08/09 16:02:02 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -23,7 +23,12 @@ PLUGINDIR= ./PLUGINS
 
 VIDEODIR = /video
 
+ifdef NEWSTRUCT
+INCLUDES = -I$(DVBDIR)/include
+DEFINES += -DNEWSTRUCT
+else
 INCLUDES = -I$(DVBDIR)/ost/include
+endif
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 2002d60aa..ae164e1d1 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -12,7 +12,6 @@
 separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 This document is divided into two parts, the first one describing the
 <a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
 of the plugin system, and the second one describing the
@@ -21,20 +20,19 @@
 VDR program and present itself to the user.
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
-<!--X1.1.3--></td></tr></table>
 <p>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.3 are marked like this.
-<!--X1.1.3--></td></tr></table>
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.4 are marked like this.
 <!--X1.1.4--></td></tr></table>
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.5 are marked like this.
 <!--X1.1.5--></td></tr></table>
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.6 are marked like this.
 <!--X1.1.6--></td></tr></table>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.7 are marked like this.
+<!--X1.1.7--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -814,7 +812,6 @@
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 The <tt>Makefile</tt> that has been created by the call to
 <a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
 provides the target <tt>dist</tt>, which does this for you.
@@ -825,7 +822,6 @@
 cd VDR/PLUGINS/SRC/hello
 make dist
 </pre></td></tr></table><p>
-<!--X1.1.3--></td></tr></table>
 
 After this you should find a file named like
 
@@ -836,7 +832,6 @@
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
 
 <hr><h2>Status monitor</h2>
@@ -911,9 +906,8 @@
 See the file <tt>status.h</tt> for detailed information on which status monitor
 member functions are available in <tt>cStatus</tt>. You only need to implement
 the functions you actually want to use.
-<!--X1.1.3--></td></tr></table>
 
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
@@ -959,11 +953,20 @@
 int PlayVideo(const uchar *Data, int Length);
 </pre></td></tr></table><p>
 
-where <tt>Data</tt> point to a block of <tt>Length</tt> bytes of a PES data
+where <tt>Data</tt> points to a block of <tt>Length</tt> bytes of a PES data
 stream. There are no prerequisites regarding the length or alignment of an
 individual block of data. The sum of all blocks must simply result in the
 desired video data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+To avoid busy loops the player should call its member function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+bool DevicePoll(cPoller &amp;Poller, int TimeoutMs = 0);
+</pre></td></tr></table><p>
+
+to determine whether the device is ready for further data.
+<!--X1.1.7--></td></tr></table>
 <p>
 TODO: PlayAudio()???
 <p>
@@ -1064,7 +1067,7 @@
 ahead - it's your show...
 <!--X1.1.4--></td></tr></table>
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <hr><h2>Receivers</h2>
 
 <center><i><b>Tapping into the stream...</b></i></center><p>
@@ -1120,7 +1123,7 @@
 and will automatically detach itself from the <tt>cDevice</tt>.
 <!--X1.1.6--></td></tr></table>
 
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
@@ -1152,7 +1155,7 @@
 its windows and color depths).
 <!--X1.1.5--></td></tr></table>
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <hr><h2>Devices</h2>
 
 <center><i><b>Expanding the possibilities</b></i></center><p>
@@ -1225,17 +1228,20 @@
 <p>
 The functions to implement replaying capabilites are
 
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
-virtual int SetPlayMode(bool On);
+virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
 virtual void Play(void);
 virtual void Freeze(void);
 virtual void Mute(void);
 virtual void StillPicture(const uchar *Data, int Length);
+virtual bool Poll(cPoller &amp;Poller, int TimeoutMs = 0);
 virtual int PlayVideo(const uchar *Data, int Length);
 </pre></td></tr></table><p>
+<!--X1.1.7--></td></tr></table>
 
 In addition, the following functions may be implemented to provide further
 functionality:
diff --git a/config.c b/config.c
index 376985f09..5929b506c 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.103 2002/08/04 12:03:11 kls Exp $
+ * $Id: config.c 1.104 2002/08/11 11:35:18 kls Exp $
  */
 
 #include "config.h"
@@ -217,7 +217,7 @@ const char *cChannel::ToText(cChannel *Channel)
      s = strcpy(buf, s);
      strreplace(s, ':', '|');
      }
-  delete buffer;
+  free(buffer);
   if (Channel->groupSep)
      asprintf(&buffer, ":%s\n", s);
   else {
@@ -267,7 +267,7 @@ bool cChannel::Parse(const char *s)
         sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
         if (p)
            sscanf(p, "%d ,%d ", &dpid1, &dpid2);
-        delete apidbuf;
+        free(apidbuf);
         }
      else
         return false;
@@ -279,7 +279,7 @@ bool cChannel::Parse(const char *s)
            tpid = 0;
            }
         strn0cpy(name, buffer, MaxChannelName);
-        delete buffer;
+        free(buffer);
         }
      else
         return false;
@@ -377,7 +377,7 @@ cTimer::cTimer(const cEventInfo *EventInfo)
 
 cTimer::~cTimer()
 {
-  delete summary;
+  free(summary);
 }
 
 cTimer& cTimer::operator= (const cTimer &Timer)
@@ -398,7 +398,7 @@ bool cTimer::operator< (const cListObject &ListObject)
 
 const char *cTimer::ToText(cTimer *Timer)
 {
-  delete buffer;
+  free(buffer);
   strreplace(Timer->file, ':', '|');
   strreplace(Timer->summary, '\n', '|');
   asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day, Timer->firstday), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
@@ -495,7 +495,7 @@ bool cTimer::Parse(const char *s)
 {
   char *buffer1 = NULL;
   char *buffer2 = NULL;
-  delete summary;
+  free(summary);
   summary = NULL;
   //XXX Apparently sscanf() doesn't work correctly if the last %a argument
   //XXX results in an empty string (this first occured when the EIT gathering
@@ -508,13 +508,13 @@ bool cTimer::Parse(const char *s)
   while (l2 > 0 && isspace(s[l2 - 1]))
         l2--;
   if (s[l2 - 1] == ':') {
-     s2 = (char *)malloc(l2 + 3);
+     s2 = MALLOC(char, l2 + 3);
      strcat(strn0cpy(s2, s, l2 + 1), " \n");
      s = s2;
      }
   if (8 <= sscanf(s, "%d :%d :%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
      if (summary && !*skipspace(summary)) {
-        delete summary;
+        free(summary);
         summary = NULL;
         }
      //TODO add more plausibility checks
@@ -522,12 +522,12 @@ bool cTimer::Parse(const char *s)
      strn0cpy(file, buffer2, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
-     delete buffer1;
-     delete buffer2;
-     delete s2;
+     free(buffer1);
+     free(buffer2);
+     free(s2);
      return day != 0;
      }
-  delete s2;
+  free(s2);
   return false;
 }
 
@@ -661,8 +661,8 @@ cCommand::cCommand(void)
 
 cCommand::~cCommand()
 {
-  delete title;
-  delete command;
+  free(title);
+  free(command);
 }
 
 bool cCommand::Parse(const char *s)
@@ -685,7 +685,7 @@ bool cCommand::Parse(const char *s)
 const char *cCommand::Execute(void)
 {
   dsyslog("executing command '%s'", command);
-  delete result;
+  free(result);
   result = NULL;
   FILE *p = popen(command, "r");
   if (p) {
@@ -749,7 +749,7 @@ cCaDefinition::cCaDefinition(void)
 
 cCaDefinition::~cCaDefinition()
 {
-  delete description;
+  free(description);
 }
 
 bool cCaDefinition::Parse(const char *s)
@@ -935,9 +935,9 @@ cSetupLine::cSetupLine(const char *Name, const char *Value, const char *Plugin)
 
 cSetupLine::~cSetupLine()
 {
-  delete plugin;
-  delete name;
-  delete value;
+  free(plugin);
+  free(name);
+  free(value);
 }
 
 bool cSetupLine::operator< (const cListObject &ListObject)
@@ -1068,7 +1068,7 @@ void cSetup::Store(const char *Name, int Value, const char *Plugin)
   char *buffer = NULL;
   asprintf(&buffer, "%d", Value);
   Store(Name, buffer, Plugin);
-  delete buffer;
+  free(buffer);
 }
 
 bool cSetup::Load(const char *FileName)
diff --git a/config.h b/config.h
index abfbe95d5..ef7f70e61 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.121 2002/07/27 12:00:30 kls Exp $
+ * $Id: config.h 1.123 2002/08/11 11:36:36 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -12,6 +12,7 @@
 
 #include <arpa/inet.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
@@ -19,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.6"
+#define VDRVERSION "1.1.7"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -214,12 +215,13 @@ template<class T> class cConfig : public cList<T> {
   char *fileName;
   void Clear(void)
   {
-    delete fileName;
+    free(fileName);
+    fileName = NULL;
     cList<T>::Clear();
   }
 public:
   cConfig(void) { fileName = NULL; }
-  virtual ~cConfig() { delete fileName; }
+  virtual ~cConfig() { free(fileName); }
   const char *FileName(void) { return fileName; }
   bool Load(const char *FileName, bool AllowComments = false)
   {
diff --git a/cutter.c b/cutter.c
index 2b623ed8e..234201cd5 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.1 2002/06/22 10:09:34 kls Exp $
+ * $Id: cutter.c 1.2 2002/08/11 11:09:23 kls Exp $
  */
 
 #include "cutter.h"
@@ -196,7 +196,7 @@ bool cCutter::Start(const char *FileName)
               RemoveVideoFile(s);
               }
            }
-        delete s;
+        free(s);
         // XXX
         editedVersionName = strdup(evn);
         Recording.WriteSummary();
@@ -231,7 +231,7 @@ bool cCutter::Active(void)
      Stop();
      if (!error)
         cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
-     delete editedVersionName;
+     free(editedVersionName);
      editedVersionName = NULL;
      ended = true;
      }
diff --git a/device.c b/device.c
index f70ca045d..6a3103775 100644
--- a/device.c
+++ b/device.c
@@ -4,12 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.8 2002/08/04 15:18:05 kls Exp $
+ * $Id: device.c 1.12 2002/08/16 09:50:43 kls Exp $
  */
 
 #include "device.h"
 #include <errno.h>
-#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include "eit.h"
@@ -98,7 +97,7 @@ bool cDevice::SetPrimaryDevice(int n)
      primaryDevice->MakePrimaryDevice(true);
      return true;
      }
-  esyslog("invalid device number: %d", n + 1);
+  esyslog("invalid primary device number: %d", n + 1);
   return false;
 }
 
@@ -317,9 +316,9 @@ void cDevice::SetVolume(int Volume, bool Absolute)
      mute = false;
 }
 
-int cDevice::SetPlayMode(bool On)
+bool cDevice::SetPlayMode(ePlayMode PlayMode)
 {
-  return -1;
+  return false;
 }
 
 void cDevice::TrickSpeed(int Speed)
@@ -362,7 +361,7 @@ bool cDevice::AttachPlayer(cPlayer *Player)
         Detach(player);
      player = Player;
      player->device = this;
-     player->deviceFileHandle = SetPlayMode(true);
+     SetPlayMode(player->playMode);
      player->Activate(true);
      return true;
      }
@@ -373,10 +372,9 @@ void cDevice::Detach(cPlayer *Player)
 {
   if (Player && player == Player) {
      player->Activate(false);
-     player->deviceFileHandle = -1;
      player->device = NULL;
      player = NULL;
-     SetPlayMode(false);
+     SetPlayMode(pmNone);
      }
 }
 
@@ -399,6 +397,11 @@ void cDevice::StopReplay(void)
      }
 }
 
+bool cDevice::Poll(cPoller &Poller, int TimeoutMs)
+{
+  return false;
+}
+
 int cDevice::PlayVideo(const uchar *Data, int Length)
 {
   return -1;
diff --git a/device.h b/device.h
index 4610988dd..14d8ec50b 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.5 2002/08/04 14:02:19 kls Exp $
+ * $Id: device.h 1.9 2002/08/16 08:52:27 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -26,6 +26,23 @@
 
 enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
 
+enum ePlayMode { pmNone,       // audio/video from decoder
+                 pmAudioVideo, // audio/video from player
+                 pmAudioOnly,  // audio only from player, video from decoder
+                 pmExtern_THIS_SHOULD_BE_AVOIDED
+                 // external player (e.g. MPlayer), release the device
+                 // WARNING: USE THIS MODE ONLY AS A LAST RESORT, IF YOU
+                 // ABSOLUTELY, POSITIVELY CAN'T IMPLEMENT YOUR PLAYER
+                 // THE WAY IT IS SUPPOSED TO WORK. FORCING THE DEVICE
+                 // TO RELEASE ITS FILES HANDLES (OR WHATEVER RESOURCES
+                 // IT MAY USE) TO ALLOW AN EXTERNAL PLAYER TO ACCESS
+                 // THEM MEANS THAT SUCH A PLAYER WILL NEED TO HAVE
+                 // DETAILED KNOWLEDGE ABOUT THE INTERNALS OF THE DEVICE
+                 // IN USE. AS A CONSEQUENCE, YOUR PLAYER MAY NOT WORK
+                 // IF A PARTICULAR VDR INSTALLATION USES A DEVICE NOT
+                 // KNOWN TO YOUR PLAYER.
+               };
+
 class cChannel;
 class cPlayer;
 class cReceiver;
@@ -97,7 +114,9 @@ class cDevice : cThread {
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
-  int ProvidesCa(int Ca);
+  virtual int ProvidesCa(int Ca);
+         //XXX TODO temporarily made this function virtual - until a general
+         //XXX      mechanism has been implemented
          // Checks whether this device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
          // value is provided, and > 1 if this and other values are provided.
@@ -188,11 +207,9 @@ class cDevice : cThread {
 private:
   cPlayer *player;
 protected:
-  virtual int SetPlayMode(bool On);
-       // Sets the device into play mode (On = true) or normal
-       // viewing mode (On = false). If On is true, it may return a file
-       // handle that a player can use to poll this device when replaying.
-       //XXX TODO should be implemented differently
+  virtual bool SetPlayMode(ePlayMode PlayMode);
+       // Sets the device into the given play mode.
+       // Returns true if the operation was successful.
 public:
   virtual void TrickSpeed(int Speed);
        // Sets the device into a mode where replay is done slower.
@@ -209,6 +226,12 @@ class cDevice : cThread {
        // Turns off audio while replaying.
   virtual void StillPicture(const uchar *Data, int Length);
        // Displays the given I-frame as a still picture.
+  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
+       // Returns true if the device itself or any of the file handles in
+       // Poller is ready for further action.
+       // If TimeoutMs is not zero, the device will wait up to the given number
+       // of milleseconds before returning in case there is no immediate
+       // need for data.
   virtual int PlayVideo(const uchar *Data, int Length);
        // Actually plays the given data block as video. The data must be
        // part of a PES (Packetized Elementary Stream) which can contain
diff --git a/dvbdevice.c b/dvbdevice.c
index be765005a..6be882fa7 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.1 2002/08/04 12:24:25 kls Exp $
+ * $Id: dvbdevice.c 1.7 2002/08/16 09:27:53 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -18,10 +18,15 @@ extern "C" {
 }
 #include <limits.h>
 #include <linux/videodev.h>
+#ifdef NEWSTRUCT
+#include <linux/dvb/audio.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/video.h>
+#else
 #include <ost/audio.h>
 #include <ost/sec.h>
 #include <ost/video.h>
-#include <poll.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include "dvbosd.h"
@@ -33,24 +38,38 @@ extern "C" {
 #define MAXDVBDEVICES     4
 
 #define DEV_VIDEO         "/dev/video"
-#define DEV_OST_OSD       "/dev/ost/osd"
-#define DEV_OST_FRONTEND  "/dev/ost/frontend"
-#define DEV_OST_SEC       "/dev/ost/sec"
-#define DEV_OST_DVR       "/dev/ost/dvr"
-#define DEV_OST_DEMUX     "/dev/ost/demux"
-#define DEV_OST_VIDEO     "/dev/ost/video"
-#define DEV_OST_AUDIO     "/dev/ost/audio"
-
-static const char *OstName(const char *Name, int n)
+#ifdef NEWSTRUCT
+#define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
+#define DEV_DVB_OSD       "osd"
+#define DEV_DVB_FRONTEND  "frontend"
+#define DEV_DVB_DVR       "dvr"
+#define DEV_DVB_DEMUX     "demux"
+#define DEV_DVB_VIDEO     "video"
+#define DEV_DVB_AUDIO     "audio"
+#else
+#define DEV_DVB_OSD       "/dev/ost/osd"
+#define DEV_DVB_FRONTEND  "/dev/ost/frontend"
+#define DEV_DVB_SEC       "/dev/ost/sec"
+#define DEV_DVB_DVR       "/dev/ost/dvr"
+#define DEV_DVB_DEMUX     "/dev/ost/demux"
+#define DEV_DVB_VIDEO     "/dev/ost/video"
+#define DEV_DVB_AUDIO     "/dev/ost/audio"
+#endif
+
+static const char *DvbName(const char *Name, int n)
 {
   static char buffer[PATH_MAX];
+#ifdef NEWSTRUCT
+  snprintf(buffer, sizeof(buffer), "%s%d/%s%d", DEV_DVB_ADAPTER, n, Name, 0);
+#else
   snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
+#endif
   return buffer;
 }
 
-static int OstOpen(const char *Name, int n, int Mode, bool ReportError = false)
+static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
 {
-  const char *FileName = OstName(Name, n);
+  const char *FileName = DvbName(Name, n);
   int fd = open(FileName, Mode);
   if (fd < 0 && ReportError)
      LOG_ERROR_STR(FileName);
@@ -61,20 +80,23 @@ cDvbDevice::cDvbDevice(int n)
 {
   frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   siProcessor = NULL;
+  playMode = pmNone;
 
   // Devices that are present on all card types:
 
-  fd_frontend = OstOpen(DEV_OST_FRONTEND, n, O_RDWR);
-
-  // Devices that are only present on DVB-S cards:
-
-  fd_sec      = OstOpen(DEV_OST_SEC,      n, O_RDWR);
+  fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK);
 
   // Devices that are only present on cards with decoders:
 
-  fd_osd      = OstOpen(DEV_OST_OSD,    n, O_RDWR);
-  fd_video    = OstOpen(DEV_OST_VIDEO,  n, O_RDWR | O_NONBLOCK);
-  fd_audio    = OstOpen(DEV_OST_AUDIO,  n, O_RDWR | O_NONBLOCK);
+  fd_osd      = DvbOpen(DEV_DVB_OSD,    n, O_RDWR);
+  fd_video    = DvbOpen(DEV_DVB_VIDEO,  n, O_RDWR | O_NONBLOCK);
+  fd_audio    = DvbOpen(DEV_DVB_AUDIO,  n, O_RDWR | O_NONBLOCK);
+  
+#ifndef NEWSTRUCT
+  // Devices that are only present on DVB-S cards:
+ 
+  fd_sec      = DvbOpen(DEV_DVB_SEC,      n, O_RDWR);
+#endif
 
   // The DVR device (will be opened and closed as needed):
 
@@ -87,8 +109,12 @@ cDvbDevice::cDvbDevice(int n)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-     siProcessor = new cSIProcessor(OstName(DEV_OST_DEMUX, n));
+#ifdef NEWSTRUCT
+     dvb_frontend_info feinfo;
+#else
      FrontendInfo feinfo;
+#endif
+     siProcessor = new cSIProcessor(DvbName(DEV_DVB_DEMUX, n));
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0)
         frontendType = feinfo.type;
      else
@@ -130,7 +156,7 @@ bool cDvbDevice::Initialize(void)
   int i;
   for (i = 0; i < MAXDVBDEVICES; i++) {
       if (UseDevice(NextCardIndex())) {
-         if (Probe(OstName(DEV_OST_FRONTEND, i))) {
+         if (Probe(DvbName(DEV_DVB_FRONTEND, i))) {
             new cDvbDevice(i);
             found++;
             }
@@ -169,7 +195,7 @@ bool cDvbDevice::HasDecoder(void) const
 
 bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  int videoDev = OstOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
+  int videoDev = DvbOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
   if (videoDev >= 0) {
      int result = 0;
      struct video_mbuf mbuf;
@@ -274,7 +300,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   if (Handle->pid) {
      if (On) {
         if (Handle->handle < 0) {
-           Handle->handle = OstOpen(DEV_OST_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
+           Handle->handle = DvbOpen(DEV_DVB_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
            if (Handle->handle < 0)
               return false;
            }
@@ -290,6 +316,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 
      if (Handle->pid != 0x1FFF) {
         dmxPesFilterParams pesFilterParams;
+        memset(&pesFilterParams, 0, sizeof(pesFilterParams));
         pesFilterParams.pid     = Handle->pid;
         pesFilterParams.input   = DMX_IN_FRONTEND;
         pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
@@ -332,7 +359,13 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
      DelPid(pidHandles[ptDolby].pid);
      }
 
+#ifdef NEWSTRUCT
+  dvb_frontend_parameters Frontend;
+#else
   FrontendParameters Frontend;
+#endif
+
+  memset(&Frontend, 0, sizeof(Frontend));
 
   switch (frontendType) {
     case FE_QPSK: { // DVB-S
@@ -351,15 +384,38 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
             tone = SEC_TONE_ON;
             }
 
+#ifdef NEWSTRUCT
+         Frontend.frequency = freq * 1000UL;
+         Frontend.inversion = INVERSION_AUTO;
+         Frontend.u.qpsk.symbol_rate = Channel->srate * 1000UL;
+         Frontend.u.qpsk.fec_inner = FEC_AUTO;
+#else
          Frontend.Frequency = freq * 1000UL;
          Frontend.Inversion = INVERSION_AUTO;
          Frontend.u.qpsk.SymbolRate = Channel->srate * 1000UL;
          Frontend.u.qpsk.FEC_inner = FEC_AUTO;
+#endif
 
          int volt = (Channel->polarization == 'v' || Channel->polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
 
-         // DiseqC:
-
+         // DiSEqC:
+
+#ifdef NEWSTRUCT
+         struct dvb_diseqc_master_cmd cmd = { {0xE0, 0x10, 0x38, 0xF0, 0x00, 0x00}, 4};
+         cmd.msg[3] = 0xF0 | (((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0));
+
+         if (Setup.DiSEqC)
+            CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
+         CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+         if (Setup.DiSEqC) {
+            usleep(15 * 1000);
+            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+            usleep(15 * 1000);
+            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, (Channel->diseqc / 4) % 2 ? SEC_MINI_B : SEC_MINI_A));
+            usleep(15 * 1000);
+            }
+         CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+#else
          secCommand scmd;
          scmd.type = 0;
          scmd.u.diseqc.addr = 0x10;
@@ -375,23 +431,43 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
          scmds.commands = &scmd;
 
          CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+#endif
          }
          break;
     case FE_QAM: { // DVB-C
 
          // Frequency and symbol rate:
 
+#ifdef NEWSTRUCT
+         Frontend.frequency = Channel->frequency * 1000000UL;
+         Frontend.inversion = INVERSION_AUTO;
+         Frontend.u.qam.symbol_rate = Channel->srate * 1000UL;
+         Frontend.u.qam.fec_inner = FEC_AUTO;
+         Frontend.u.qam.modulation = QAM_64;
+#else
          Frontend.Frequency = Channel->frequency * 1000000UL;
          Frontend.Inversion = INVERSION_AUTO;
          Frontend.u.qam.SymbolRate = Channel->srate * 1000UL;
          Frontend.u.qam.FEC_inner = FEC_AUTO;
          Frontend.u.qam.QAM = QAM_64;
+#endif
          }
          break;
     case FE_OFDM: { // DVB-T
 
          // Frequency and OFDM paramaters:
 
+#ifdef NEWSTRUCT
+         Frontend.frequency = Channel->frequency * 1000UL;
+         Frontend.inversion = INVERSION_AUTO;
+         Frontend.u.ofdm.bandwidth=BANDWIDTH_8_MHZ;
+         Frontend.u.ofdm.code_rate_HP = FEC_2_3;
+         Frontend.u.ofdm.code_rate_LP = FEC_1_2;
+         Frontend.u.ofdm.constellation = QAM_64;
+         Frontend.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
+         Frontend.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
+         Frontend.u.ofdm.hierarchy_information = HIERARCHY_NONE;
+#else
          Frontend.Frequency = Channel->frequency * 1000UL;
          Frontend.Inversion = INVERSION_AUTO;
          Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
@@ -401,6 +477,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
          Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
          Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
          Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
+#endif
          }
          break;
     default:
@@ -408,16 +485,40 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
          return false;
     }
 
+#ifdef NEWSTRUCT
+  // Discard stale events:
+
+  for (;;) {
+      dvb_frontend_event event;
+      if (ioctl(fd_frontend, FE_GET_EVENT, &event) < 0)
+         break;
+      }
+#endif
+
   // Tuning:
 
   CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
 
-  // Wait for channel sync:
+  // Wait for channel lock:
 
+#ifdef NEWSTRUCT
+  FrontendStatus status = FrontendStatus(0);
+  for (int i = 0; i < 100; i++) {
+      CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
+      if (status & FE_HAS_LOCK)
+         break;
+      usleep(10 * 1000);
+      }
+  if (!(status & FE_HAS_LOCK)) {
+     esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->number, CardIndex() + 1);
+     if (IsPrimaryDevice())
+        cThread::RaisePanic();
+     return false;
+     }
+#else
   if (cFile::FileReady(fd_frontend, 5000)) {
      FrontendEvent event;
-     int res = ioctl(fd_frontend, FE_GET_EVENT, &event);
-     if (res >= 0) {
+     if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) {
         if (event.type != FE_COMPLETION_EV) {
            esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1);
            if (IsPrimaryDevice())
@@ -426,10 +527,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
            }
         }
      else
-        esyslog("ERROR %d in frontend get event (channel %d, card %d)", res, Channel->number, CardIndex() + 1);
+        esyslog("ERROR in frontend get event (channel %d, card %d): %m", Channel->number, CardIndex() + 1);
      }
   else
-     esyslog("ERROR: timeout while tuning");
+     esyslog("ERROR: timeout while tuning on DVB card %d", CardIndex() + 1);
+#endif
 
   frequency = Channel->frequency;
 
@@ -467,32 +569,64 @@ void cDvbDevice::SetVolumeDevice(int Volume)
      }
 }
 
-int cDvbDevice::SetPlayMode(bool On)
+bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
 {
-  if (On) {
-     if (siProcessor)
-        siProcessor->SetStatus(false);
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_PLAY));
-     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-     CHECK(ioctl(fd_video, VIDEO_PLAY));
-     return fd_video;
-     }
-  else {
-     CHECK(ioctl(fd_video, VIDEO_STOP, true));
-     CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
-     CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     if (siProcessor)
-        siProcessor->SetStatus(true);
-     return -1;
+  if (PlayMode != pmExtern_THIS_SHOULD_BE_AVOIDED && fd_video < 0 && fd_audio < 0) {
+     // reopen the devices
+     fd_video = DvbOpen(DEV_DVB_VIDEO,  CardIndex(), O_RDWR | O_NONBLOCK);
+     fd_audio = DvbOpen(DEV_DVB_AUDIO,  CardIndex(), O_RDWR | O_NONBLOCK);
+     SetVideoFormat(Setup.VideoFormat);
      }
+
+  switch (PlayMode) {
+    case pmNone:
+         // special handling to return from PCM replay:
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_video, VIDEO_PLAY));
+
+         CHECK(ioctl(fd_video, VIDEO_STOP, true));
+         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+         CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+         if (siProcessor)
+            siProcessor->SetStatus(true);
+         break;
+    case pmAudioVideo:
+         if (siProcessor)
+            siProcessor->SetStatus(false);
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+         CHECK(ioctl(fd_audio, AUDIO_PLAY));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_video, VIDEO_PLAY));
+         break;
+    case pmAudioOnly:
+         if (siProcessor)
+            siProcessor->SetStatus(false);
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+         CHECK(ioctl(fd_audio, AUDIO_PLAY));
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+         break;
+    case pmExtern_THIS_SHOULD_BE_AVOIDED:
+         if (siProcessor)
+            siProcessor->SetStatus(false);
+         close(fd_video);
+         close(fd_audio);
+         fd_video = fd_audio = -1;
+         break;
+    }
+  playMode = PlayMode;
+  return true;
 }
 
 void cDvbDevice::TrickSpeed(int Speed)
@@ -558,10 +692,17 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
 #endif
 }
 
+bool cDvbDevice::Poll(cPoller &Poller, int TimeoutMs)
+{
+  Poller.Add(playMode == pmAudioOnly ? fd_audio : fd_video, true);
+  return Poller.Poll(TimeoutMs);
+}
+
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
-  if (fd_video >= 0)
-     return write(fd_video, Data, Length);
+  int fd = playMode == pmAudioOnly ? fd_audio : fd_video;
+  if (fd >= 0)
+     return write(fd, Data, Length);
   return -1;
 }
 
@@ -574,7 +715,7 @@ int cDvbDevice::PlayAudio(const uchar *Data, int Length)
 bool cDvbDevice::OpenDvr(void)
 {
   CloseDvr();
-  fd_dvr = OstOpen(DEV_OST_DVR, CardIndex(), O_RDONLY | O_NONBLOCK, true);
+  fd_dvr = DvbOpen(DEV_DVB_DVR, CardIndex(), O_RDONLY | O_NONBLOCK, true);
   return fd_dvr >= 0;
 }
 
@@ -589,13 +730,8 @@ void cDvbDevice::CloseDvr(void)
 int cDvbDevice::GetTSPacket(uchar *Data)
 {
   if (fd_dvr >= 0) {
-     pollfd pfd;
-     pfd.fd = fd_dvr;
-     pfd.events = POLLIN;
-
-     poll(&pfd, 1, 100);
-
-     if (pfd.revents & POLLIN != 0) {
+     cPoller Poller(fd_dvr, false);
+     if (Poller.Poll(100)) {
         int r = read(fd_dvr, Data, TS_SIZE);
         if (r >= 0)
            return r;
diff --git a/dvbdevice.h b/dvbdevice.h
index 25777f06a..ece1b4546 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,18 +4,22 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.1 2002/08/04 12:19:10 kls Exp $
+ * $Id: dvbdevice.h 1.5 2002/08/16 08:53:30 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
 #define __DVBDEVICE_H
 
+#ifdef NEWSTRUCT
+#include <linux/dvb/frontend.h>
+#else
 #include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
                     // FIXME: shouldn't every header file include ALL the other header
                     // FIXME: files it depends on? The sequence in which header files
                     // FIXME: are included here should not matter - and it should NOT
                     // FIXME: be necessary to include <stdlib.h> here!
 #include <ost/frontend.h>
+#endif
 #include "device.h"
 #include "eit.h"
 
@@ -30,7 +34,11 @@ class cDvbDevice : public cDevice {
          // Must be called before accessing any DVB functions.
 private:
   FrontendType frontendType;
+#ifdef NEWSTRUCT
+  int fd_osd, fd_frontend, fd_audio, fd_video, fd_dvr;
+#else
   int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video, fd_dvr;
+#endif
   int OsdDeviceHandle(void) const { return fd_osd; }
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -75,7 +83,8 @@ class cDvbDevice : public cDevice {
 // Player facilities
 
 protected:
-  virtual int SetPlayMode(bool On);
+  ePlayMode playMode;
+  virtual bool SetPlayMode(ePlayMode PlayMode);
 public:
   virtual void TrickSpeed(int Speed);
   virtual void Clear(void);
@@ -83,6 +92,7 @@ class cDvbDevice : public cDevice {
   virtual void Freeze(void);
   virtual void Mute(void);
   virtual void StillPicture(const uchar *Data, int Length);
+  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
   virtual int PlayVideo(const uchar *Data, int Length);
   virtual int PlayAudio(const uchar *Data, int Length);
 
diff --git a/dvbosd.h b/dvbosd.h
index 69838f6dc..e35aab6df 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,13 +4,17 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.14 2002/08/04 10:12:14 kls Exp $
+ * $Id: dvbosd.h 1.15 2002/08/09 16:16:48 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
+#ifdef NEWSTRUCT
+#include <linux/dvb/osd.h>
+#else
 #include <ost/osd.h>
+#endif
 #include "dvbdevice.h"
 #include "osdbase.h"
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 1b608dda6..2ca5a62d0 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,14 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.8 2002/07/27 11:57:48 kls Exp $
+ * $Id: dvbplayer.c 1.11 2002/08/16 09:16:38 kls Exp $
  */
 
 #include "dvbplayer.h"
-#include <poll.h>
+#include <stdlib.h>
 #include "recording.h"
 #include "ringbuffer.h"
 #include "thread.h"
+#include "tools.h"
 
 // --- cBackTrace ----------------------------------------------------------
 
@@ -63,7 +64,7 @@ int cBackTrace::Get(bool Forward)
            p = BACKTRACE_ENTRIES - 1;
         i = index[p] - 1;
         l -= length[p];
-        n--; 
+        n--;
         }
   return i;
 }
@@ -301,121 +302,111 @@ void cDvbPlayer::Action(void)
   const uchar *p = NULL;
   int pc = 0;
 
-  pollfd pfd[2];
-  pfd[0].fd = DeviceFileHandle();
-  pfd[0].events = pfd[0].revents = POLLOUT;
-  pfd[1].fd = replayFile;
-  pfd[1].events = pfd[1].revents = POLLIN;
-
   readIndex = Resume();
   if (readIndex >= 0)
      isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
   running = true;
   while (running && NextFile()) {
-        pfd[1].fd = replayFile; // NextFile() may have returned a new file handle!
-        {
-          LOCK_THREAD;
-
-          // Read the next frame from the file:
-
-          if (!readFrame && (pfd[1].revents & POLLIN)) {
-             if (playMode != pmStill) {
-                int r = 0;
-                if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
-                   uchar FileNumber;
-                   int FileOffset, Length;
-                   int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
-                   if (Index >= 0) {
-                      if (!NextFile(FileNumber, FileOffset))
-                         break;
-                      }
-                   else {
-                      // can't call Play() here, because those functions may only be
-                      // called from the foreground thread - and we also don't need
-                      // to empty the buffer here
-                      DevicePlay();
-                      playMode = pmPlay;
-                      playDir = pdForward;
-                      continue;
-                      }
-                   readIndex = Index;
-                   r = ReadFrame(replayFile, b, Length, sizeof(b));
-                   // must call StripAudioPackets() here because the buffer is not emptied
-                   // when falling back from "fast forward" to "play" (see above)
-                   StripAudioPackets(b, r);
-                   }
-                else if (index) {
-                   uchar FileNumber;
-                   int FileOffset, Length;
-                   readIndex++;
-                   if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
-                      break;
-                   r = ReadFrame(replayFile, b, Length, sizeof(b));
-                   }
-                else // allows replay even if the index file is missing
-                   r = read(replayFile, b, sizeof(b));
-                if (r > 0)
-                   readFrame = new cFrame(b, r, ftUnknown, readIndex);
-                else if (r == 0)
-                   eof = true;
-                else if (r < 0 && FATALERRNO) {
-                   LOG_ERROR;
-                   break;
-                   }
-                }
-             else//XXX
-                usleep(1); // this keeps the CPU load low
-             }
-
-          // Store the frame in the buffer:
-
-          if (readFrame) {
-             if (ringBuffer->Put(readFrame))
-                readFrame = NULL;
-             }
-
-          // Get the next frame from the buffer:
-        
-          if (!playFrame) {
-             playFrame = ringBuffer->Get();
-             p = NULL;
-             pc = 0;
-             }
-
-          // Play the frame:
-
-          if (playFrame && (pfd[0].revents & POLLOUT)) {
-             if (!p) {
-                p = playFrame->Data();
-                pc = playFrame->Count();
-                }
-             if (p) {
-                int w = PlayVideo(p, pc);
-                if (w > 0) {
-                   p += w;
-                   pc -= w;
-                   }
-                else if (w < 0 && FATALERRNO) {
-                   LOG_ERROR;
-                   break;
-                   }
-                }
-             if (pc == 0) {
-                writeIndex = playFrame->Index();
-                backTrace->Add(playFrame->Index(), playFrame->Count());
-                ringBuffer->Drop(playFrame);
-                playFrame = NULL;
-                p = 0;
-                }
-             }
-        }
+        cPoller Poller;
+        if (!readFrame)
+           Poller.Add(replayFile, false);
+        if (DevicePoll(Poller, 100)) {
+
+           LOCK_THREAD;
+
+           // Read the next frame from the file:
+
+           if (!readFrame) {
+              if (playMode != pmStill) {
+                 int r = 0;
+                 if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
+                    uchar FileNumber;
+                    int FileOffset, Length;
+                    int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
+                    if (Index >= 0) {
+                       if (!NextFile(FileNumber, FileOffset))
+                          break;
+                       }
+                    else {
+                       // can't call Play() here, because those functions may only be
+                       // called from the foreground thread - and we also don't need
+                       // to empty the buffer here
+                       DevicePlay();
+                       playMode = pmPlay;
+                       playDir = pdForward;
+                       continue;
+                       }
+                    readIndex = Index;
+                    r = ReadFrame(replayFile, b, Length, sizeof(b));
+                    // must call StripAudioPackets() here because the buffer is not emptied
+                    // when falling back from "fast forward" to "play" (see above)
+                    StripAudioPackets(b, r);
+                    }
+                 else if (index) {
+                    uchar FileNumber;
+                    int FileOffset, Length;
+                    readIndex++;
+                    if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
+                       break;
+                    r = ReadFrame(replayFile, b, Length, sizeof(b));
+                    }
+                 else // allows replay even if the index file is missing
+                    r = read(replayFile, b, sizeof(b));
+                 if (r > 0)
+                    readFrame = new cFrame(b, r, ftUnknown, readIndex);
+                 else if (r == 0)
+                    eof = true;
+                 else if (r < 0 && FATALERRNO) {
+                    LOG_ERROR;
+                    break;
+                    }
+                 }
+              else//XXX
+                 usleep(1); // this keeps the CPU load low
+              }
 
-        // Wait for input or output to become ready:
+           // Store the frame in the buffer:
 
-        if (poll(pfd, readFrame ? 1 : 2, 10) < 0 && FATALERRNO) {
-           LOG_ERROR;
-           break;
+           if (readFrame) {
+              if (ringBuffer->Put(readFrame))
+                 readFrame = NULL;
+              }
+
+           // Get the next frame from the buffer:
+
+           if (!playFrame) {
+              playFrame = ringBuffer->Get();
+              p = NULL;
+              pc = 0;
+              }
+
+           // Play the frame:
+
+           if (playFrame) {
+              if (!p) {
+                 p = playFrame->Data();
+                 pc = playFrame->Count();
+                 }
+              if (p) {
+                 int w = PlayVideo(p, pc);
+                 if (w > 0) {
+                    p += w;
+                    pc -= w;
+                    }
+                 else if (w < 0 && FATALERRNO) {
+                    LOG_ERROR;
+                    break;
+                    }
+                 }
+              if (pc == 0) {
+                 writeIndex = playFrame->Index();
+                 backTrace->Add(playFrame->Index(), playFrame->Count());
+                 ringBuffer->Drop(playFrame);
+                 playFrame = NULL;
+                 p = 0;
+                 }
+              }
            }
         }
   active = running = false;
diff --git a/eit.c b/eit.c
index f5d98f547..ca3191384 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.46 2002/05/31 10:26:56 kls Exp $
+ * $Id: eit.c 1.48 2002/08/11 11:11:12 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -26,7 +26,11 @@
 #include <iomanip.h>
 #include <iostream.h>
 #include <limits.h>
+#ifdef NEWSTRUCT
+#include <linux/dvb/dmx.h>
+#else
 #include <ost/dmx.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -198,9 +202,9 @@ cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
 
 cEventInfo::~cEventInfo()
 {
-   delete pTitle;
-   delete pSubtitle;
-   delete pExtendedDescription;
+   free(pTitle);
+   free(pSubtitle);
+   free(pExtendedDescription);
 }
 
 /**  */
@@ -496,8 +500,8 @@ void cEventInfo::FixEpgBugs(void)
               *e = 0;
               char *s = strdup(p + 1);
               char *d = strdup(e + strlen(delim));
-              delete pSubtitle;
-              delete pExtendedDescription;
+              free(pSubtitle);
+              free(pExtendedDescription);
               pSubtitle = s;
               pExtendedDescription = d;
               EpgBugFixStat(0, GetServiceID());
@@ -527,7 +531,7 @@ void cEventInfo::FixEpgBugs(void)
      // Title
      //
      if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
-        delete pSubtitle;
+        free(pSubtitle);
         pSubtitle = NULL;
         EpgBugFixStat(2, GetServiceID());
         }
@@ -997,10 +1001,10 @@ cSIProcessor::~cSIProcessor()
    active = false;
    Cancel(3);
    ShutDownFilters();
-   delete filters;
+   free(filters);
    if (!--numSIProcessors) // the last one deletes it
       delete schedules;
-   delete fileName;
+   free(fileName);
 }
 
 const cSchedules *cSIProcessor::Schedules(cMutexLock &MutexLock)
diff --git a/eitscan.c b/eitscan.c
index 08c91c619..7a2000def 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.4 2002/07/28 15:10:23 kls Exp $
+ * $Id: eitscan.c 1.5 2002/08/11 11:11:39 kls Exp $
  */
 
 #include "eitscan.h"
@@ -21,7 +21,7 @@ cEITScanner::cEITScanner(void)
 
 cEITScanner::~cEITScanner()
 {
-  delete transponders;
+  free(transponders);
 }
 
 bool cEITScanner::TransponderScanned(cChannel *Channel)
diff --git a/interface.c b/interface.c
index fa36b4cbf..8d4da216b 100644
--- a/interface.c
+++ b/interface.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.52 2002/06/16 13:23:40 kls Exp $
+ * $Id: interface.c 1.54 2002/08/11 11:46:47 kls Exp $
  */
 
 #include "interface.h"
 #include <ctype.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include "i18n.h"
 #include "osd.h"
@@ -84,7 +85,7 @@ eKeys cInterface::GetKey(bool Wait)
         char *message = SVDRP->GetMessage();
         if (message) {
            Info(message);
-           delete message;
+           free(message);
            }
         }
      }
@@ -213,12 +214,12 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
             // punch in a newline, so we need to make room for it:
             if (Delim)
                p = Delim + 1; // let's fall back to the most recent delimiter
-            char *s = new char[strlen(t) + 2]; // The additional '\n' plus the terminating '\0'
+            char *s = MALLOC(char, strlen(t) + 2); // The additional '\n' plus the terminating '\0'
             int l = p - t;
             strncpy(s, t, l);
             s[l] = '\n';
             strcpy(s + l + 1, p);
-            delete t;
+            free(t);
             t = s;
             p = t + l;
             continue;
@@ -399,7 +400,7 @@ void cInterface::QueryKeys(void)
         char *Prompt;
         asprintf(&Prompt, tr("Press key for '%s'"), tr(k->name));
         WriteText(1, 5, Prompt);
-        delete Prompt;
+        free(Prompt);
         for (;;) {
             unsigned int ch = GetCh();
             if (ch != 0) {
diff --git a/menu.c b/menu.c
index bb2538599..5b56b3ab0 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.203 2002/08/03 09:55:44 kls Exp $
+ * $Id: menu.c 1.205 2002/08/15 11:28:08 kls Exp $
  */
 
 #include "menu.h"
@@ -32,8 +32,6 @@
 
 #define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
 
-const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
-
 // --- cMenuEditChanItem -----------------------------------------------------
 
 class cMenuEditChanItem : public cMenuEditIntItem {
@@ -936,7 +934,7 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
         char *buffer;
         asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->name, 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
         SetTitle(buffer, false);
-        delete buffer;
+        free(buffer);
         int Line = 2;
         cMenuTextItem *item;
         const char *Title = eventInfo->GetTitle();
@@ -1040,7 +1038,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
       Add(new cMenuWhatsOnItem(pArray[a]), pArray[a]->GetChannelNumber() == CurrentChannelNr);
 
   currentChannel = CurrentChannelNr;
-  delete pArray;
+  free(pArray);
   SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
 }
 
@@ -1173,11 +1171,11 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
   char *buffer = NULL;
   asprintf(&buffer, tr("Schedule - %s"), Channel->name);
   SetTitle(buffer);
-  delete buffer;
+  free(buffer);
   if (schedules) {
      const cSchedule *Schedule = Channel->pnr ? schedules->GetSchedule(Channel->pnr) : schedules->GetSchedule();
      int num = Schedule->NumEvents();
-     const cEventInfo **pArray = (const cEventInfo **)malloc(num * sizeof(cEventInfo *));
+     const cEventInfo **pArray = MALLOC(const cEventInfo *, num);
      if (pArray) {
         time_t now = time(NULL);
         int numreal = 0;
@@ -1191,7 +1189,7 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
 
         for (int a = 0; a < numreal; a++)
             Add(new cMenuScheduleItem(pArray[a]));
-        delete pArray;
+        free(pArray);
         }
      }
 }
@@ -1306,8 +1304,8 @@ cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
 
 cMenuRecordingItem::~cMenuRecordingItem()
 {
-  delete fileName;
-  delete name;
+  free(fileName);
+  free(name);
 }
 
 void cMenuRecordingItem::IncrementCounter(bool New)
@@ -1344,7 +1342,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
             if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
                Add(Item);
                LastItem = Item;
-               delete LastItemText;
+               free(LastItemText);
                LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
                }
             else
@@ -1357,7 +1355,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
                }
             }
          }
-     delete LastItemText;
+     free(LastItemText);
      if (Current() < 0)
         SetCurrent(First());
      else if (OpenSubMenus && Open(true))
@@ -1370,7 +1368,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 cMenuRecordings::~cMenuRecordings()
 {
   helpKeys = -1;
-  delete base;
+  free(base);
 }
 
 void cMenuRecordings::SetHelpKeys(void)
@@ -1417,7 +1415,7 @@ bool cMenuRecordings::Open(bool OpenSubMenus)
         t = buffer;
         }
      AddSubMenu(new cMenuRecordings(t, level + 1, OpenSubMenus));
-     delete buffer;
+     free(buffer);
      return true;
      }
   return false;
@@ -1766,7 +1764,7 @@ cMenuSetupPlugins::cMenuSetupPlugins(void)
          char *buffer = NULL;
          asprintf(&buffer, "%s (%s) - %s", p->Name(), p->Version(), p->Description());
          Add(new cMenuSetupPluginItem(hk(buffer), i));
-         delete buffer;
+         free(buffer);
          }
       else
          break;
@@ -1901,7 +1899,7 @@ eOSState cMenuCommands::Execute(void)
      asprintf(&buffer, "%s...", command->Title());
      Interface->Status(buffer);
      Interface->Flush();
-     delete buffer;
+     free(buffer);
      const char *Result = command->Execute();
      if (Result)
         return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
@@ -2013,7 +2011,7 @@ void cMenuMain::Set(void)
      char *buffer = NULL;
      asprintf(&buffer, "%s%s", STOP_RECORDING, ON_PRIMARY_INTERFACE);
      Add(new cOsdItem(buffer, osStopRecord));
-     delete buffer;
+     free(buffer);
      }
 
   const char *s = NULL;
@@ -2021,7 +2019,7 @@ void cMenuMain::Set(void)
         char *buffer = NULL;
         asprintf(&buffer, "%s%s", STOP_RECORDING, s);
         Add(new cOsdItem(buffer, osStopRecord));
-        delete buffer;
+        free(buffer);
         }
 
   // Editing control:
@@ -2452,8 +2450,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
 cRecordControl::~cRecordControl()
 {
   Stop(true);
-  delete instantId;
-  delete fileName;
+  free(instantId);
+  free(fileName);
 }
 
 #define INSTANT_REC_EPG_LOOKAHEAD 300 // seconds to look into the EPG data for an instant recording
@@ -2701,8 +2699,8 @@ cReplayControl::~cReplayControl()
 
 void cReplayControl::SetRecording(const char *FileName, const char *Title)
 {
-  delete fileName;
-  delete title;
+  free(fileName);
+  free(title);
   fileName = FileName ? strdup(FileName) : NULL;
   title = Title ? strdup(Title) : NULL;
 }
@@ -2715,7 +2713,7 @@ const char *cReplayControl::LastReplayed(void)
 void cReplayControl::ClearLastReplayed(const char *FileName)
 {
   if (fileName && FileName && strcmp(fileName, FileName) == 0) {
-     delete fileName;
+     free(fileName);
      fileName = NULL;
      }
 }
diff --git a/menuitems.c b/menuitems.c
index 6a54a86d3..8c7848f5d 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.6 2002/06/16 13:23:56 kls Exp $
+ * $Id: menuitems.c 1.8 2002/08/15 11:27:57 kls Exp $
  */
 
 #include "menuitems.h"
@@ -13,6 +13,8 @@
 #include "plugin.h"
 #include "status.h"
 
+const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
+
 // --- cMenuEditItem ---------------------------------------------------------
 
 cMenuEditItem::cMenuEditItem(const char *Name)
@@ -23,13 +25,13 @@ cMenuEditItem::cMenuEditItem(const char *Name)
 
 cMenuEditItem::~cMenuEditItem()
 {
-  delete name;
-  delete value;
+  free(name);
+  free(value);
 }
 
 void cMenuEditItem::SetValue(const char *Value)
 {
-  delete value;
+  free(value);
   value = strdup(Value);
   char *buffer = NULL;
   asprintf(&buffer, "%s:\t%s", name, value);
@@ -119,7 +121,7 @@ cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Al
 
 cMenuEditChrItem::~cMenuEditChrItem()
 {
-  delete allowed;
+  free(allowed);
 }
 
 void cMenuEditChrItem::Set(void)
@@ -167,7 +169,7 @@ cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, co
 
 cMenuEditStrItem::~cMenuEditStrItem()
 {
-  delete allowed;
+  free(allowed);
 }
 
 void cMenuEditStrItem::SetHelpKeys(void)
@@ -364,7 +366,7 @@ cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbC
 
 cMenuTextItem::~cMenuTextItem()
 {
-  delete text;
+  free(text);
 }
 
 void cMenuTextItem::Clear(void)
diff --git a/menuitems.h b/menuitems.h
index ef25d0de5..4752d4bb8 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.2 2002/05/11 10:48:28 kls Exp $
+ * $Id: menuitems.h 1.4 2002/08/15 11:28:26 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -12,10 +12,12 @@
 
 #include "osd.h"
 
+extern const char *FileNameChars;
+
 class cMenuEditItem : public cOsdItem {
 private:
-  const char *name;
-  const char *value;
+  char *name;
+  char *value;
 public:
   cMenuEditItem(const char *Name);
   ~cMenuEditItem();
@@ -43,7 +45,7 @@ class cMenuEditBoolItem : public cMenuEditIntItem {
 class cMenuEditChrItem : public cMenuEditItem {
 private:
   char *value;
-  const char *allowed;
+  char *allowed;
   const char *current;
   virtual void Set(void);
 public:
@@ -56,7 +58,7 @@ class cMenuEditStrItem : public cMenuEditItem {
 private:
   char *value;
   int length;
-  const char *allowed;
+  char *allowed;
   int pos;
   bool insert, newchar, uppercase;
   void SetHelpKeys(void);
diff --git a/osd.c b/osd.c
index 30eecae52..58caf68cd 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.32 2002/08/04 10:11:26 kls Exp $
+ * $Id: osd.c 1.34 2002/08/15 11:20:44 kls Exp $
  */
 
 #include "osd.h"
@@ -128,7 +128,7 @@ void cOsd::Open(int w, int h)
      osd->Create(0,     lineHeight, w, lineHeight, 2, false);
      osd->Create(0, 2 * lineHeight, w, lineHeight, 1);
      XXX*///XXX some pixels are not drawn correctly with lower bpp values
-     osd->Create(0,              0, w, 3*lineHeight, 4);
+     osd->Create(0,              0, w, h, 4);
      }
 #endif
 }
@@ -279,13 +279,13 @@ cOsdItem::cOsdItem(const char *Text, eOSState State)
 
 cOsdItem::~cOsdItem()
 {
-  delete text;
+  free(text);
 }
 
 void cOsdItem::SetText(const char *Text, bool Copy)
 {
-  delete text;
-  text = Copy ? strdup(Text) : Text;
+  free(text);
+  text = Copy ? strdup(Text) : (char *)Text; // text assumes ownership!
 }
 
 void cOsdItem::SetColor(eDvbColor FgColor, eDvbColor BgColor)
@@ -337,9 +337,9 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 
 cOsdMenu::~cOsdMenu()
 {
-  delete title;
+  free(title);
   delete subMenu;
-  delete status;
+  free(status);
   Interface->Clear();
   Interface->Close();
 }
@@ -367,7 +367,7 @@ void cOsdMenu::SetHasHotkeys(void)
 
 void cOsdMenu::SetStatus(const char *s)
 {
-  delete status;
+  free(status);
   status = s ? strdup(s) : NULL;
   if (visible)
      Interface->Status(status);
@@ -375,7 +375,7 @@ void cOsdMenu::SetStatus(const char *s)
 
 void cOsdMenu::SetTitle(const char *Title, bool ShowDate)
 {
-  delete title;
+  free(title);
   if (ShowDate)
      asprintf(&title, "%s\t%s", Title, DayDateTime(time(NULL)));
   else
diff --git a/osd.h b/osd.h
index dac4b27e3..861b04ee8 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.33 2002/07/13 12:47:06 kls Exp $
+ * $Id: osd.h 1.34 2002/08/11 11:42:15 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -89,7 +89,7 @@ class cOsd {
 
 class cOsdItem : public cListObject {
 private:
-  const char *text;
+  char *text;
   int offset;
   eOSState state;
 protected:
@@ -128,7 +128,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   int first, current, marked;
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
-  const char *status;
+  char *status;
   int digit;
   bool hasHotkeys;
 protected:
diff --git a/osdbase.c b/osdbase.c
index 0d6e2a3a4..70e11bfa2 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.5 2002/07/13 14:42:47 kls Exp $
+ * $Id: osdbase.c 1.6 2002/08/11 11:47:21 kls Exp $
  */
 
 #include "osdbase.h"
 #include <signal.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
@@ -109,7 +110,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
   fontType = fontOsd;
   font = NULL;
   if (width > 0 && height > 0) {
-     bitmap = new char[width * height];
+     bitmap = MALLOC(char, width * height);
      if (bitmap) {
         Clean();
         memset(bitmap, 0x00, width * height);
@@ -125,7 +126,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
 cBitmap::~cBitmap()
 {
   delete font;
-  delete bitmap;
+  free(bitmap);
 }
 
 eDvbFont cBitmap::SetFont(eDvbFont Font)
diff --git a/player.c b/player.c
index ca182dfa9..3eecc2d4a 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.3 2002/06/23 12:56:25 kls Exp $
+ * $Id: player.c 1.5 2002/08/15 10:29:17 kls Exp $
  */
 
 #include "player.h"
@@ -12,10 +12,10 @@
 
 // --- cPlayer ---------------------------------------------------------------
 
-cPlayer::cPlayer(void)
+cPlayer::cPlayer(ePlayMode PlayMode)
 {
   device = NULL;
-  deviceFileHandle = -1;
+  playMode = PlayMode;
 }
 
 cPlayer::~cPlayer()
diff --git a/player.h b/player.h
index 1bf6d371e..12cc2a376 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.5 2002/07/13 11:12:26 kls Exp $
+ * $Id: player.h 1.8 2002/08/16 09:14:12 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -17,9 +17,9 @@ class cPlayer {
   friend class cDevice;
 private:
   cDevice *device;
-  int deviceFileHandle;
+  ePlayMode playMode;
 protected:
-  int DeviceFileHandle(void) { return deviceFileHandle; } //XXX+ needed for polling
+  bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
   void DeviceClear(void) { if (device) device->Clear(); }
   void DevicePlay(void) { if (device) device->Play(); }
@@ -28,17 +28,17 @@ class cPlayer {
   void DeviceStillPicture(const uchar *Data, int Length) { if (device) device->StillPicture(Data, Length); }
   void Detach(void);
   virtual void Activate(bool On) {}
-               // This function is called right after the cPlayer has been attached to
-               // (On == true) or before it gets detached from (On == false) a cDevice.
-               // It can be used to do things like starting/stopping a thread.
+       // This function is called right after the cPlayer has been attached to
+       // (On == true) or before it gets detached from (On == false) a cDevice.
+       // It can be used to do things like starting/stopping a thread.
   int PlayVideo(const uchar *Data, int Length);
-               // Sends the given Data to the video device and returns the number of
-               // bytes that have actually been accepted by the video device (or a
-               // negative value in case of an error).
+       // Sends the given Data to the video device and returns the number of
+       // bytes that have actually been accepted by the video device (or a
+       // negative value in case of an error).
   int PlayAudio(const uchar *Data, int Length);
                // XXX+ TODO
 public:
-  cPlayer(void);
+  cPlayer(ePlayMode PlayMode = pmAudioVideo);
   virtual ~cPlayer();
   bool IsAttached(void) { return device != NULL; }
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return false; }
diff --git a/plugin.c b/plugin.c
index bd519596f..8d4d4cb5c 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.5 2002/05/13 16:31:09 kls Exp $
+ * $Id: plugin.c 1.7 2002/08/11 11:21:00 kls Exp $
  */
 
 #include "plugin.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <dlfcn.h>
+#include <stdlib.h>
 #include <time.h>
 #include "config.h"
 
@@ -101,7 +102,7 @@ void cPlugin::SetConfigDirectory(const char *Dir)
 const char *cPlugin::ConfigDirectory(const char *PluginName)
 {
   static char *buffer = NULL;
-  delete buffer;
+  free(buffer);
   asprintf(&buffer, "%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
   return MakeDirs(buffer, true) ? buffer : NULL;
 }
@@ -121,8 +122,8 @@ cDll::~cDll()
   delete plugin;
   if (handle)
      dlclose(handle);
-  delete args;
-  delete fileName;
+  free(args);
+  free(fileName);
 }
 
 static char *SkipQuote(char *s)
@@ -236,14 +237,14 @@ cPluginManager::cPluginManager(const char *Directory)
 cPluginManager::~cPluginManager()
 {
   Shutdown();
-  delete directory;
+  free(directory);
   if (pluginManager == this)
      pluginManager = NULL;
 }
 
 void cPluginManager::SetDirectory(const char *Directory)
 {
-  delete directory;
+  free(directory);
   directory = Directory ? strdup(Directory) : NULL;
 }
 
@@ -279,8 +280,8 @@ void cPluginManager::AddPlugin(const char *Args)
   char *buffer = NULL;
   asprintf(&buffer, "%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, VDRVERSION);
   dlls.Add(new cDll(buffer, Args));
-  delete buffer;
-  delete s;
+  free(buffer);
+  free(s);
 }
 
 bool cPluginManager::LoadPlugins(bool Log)
diff --git a/recording.c b/recording.c
index afa0e7f6d..be9154006 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.65 2002/07/27 12:55:14 kls Exp $
+ * $Id: recording.c 1.66 2002/08/11 11:48:11 kls Exp $
  */
 
 #include "recording.h"
@@ -148,7 +148,7 @@ void AssertFreeDiskSpace(int Priority)
 
 cResumeFile::cResumeFile(const char *FileName)
 {
-  fileName = new char[strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1];
+  fileName = MALLOC(char, strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1);
   if (fileName) {
      strcpy(fileName, FileName);
      strcat(fileName, RESUMEFILESUFFIX);
@@ -159,7 +159,7 @@ cResumeFile::cResumeFile(const char *FileName)
 
 cResumeFile::~cResumeFile()
 {
-  delete fileName;
+  free(fileName);
 }
 
 int cResumeFile::Read(void)
@@ -375,7 +375,7 @@ cRecording::cRecording(const char *FileName)
         struct stat buf;
         if (fstat(f, &buf) == 0) {
            int size = buf.st_size;
-           summary = new char[size + 1]; // +1 for terminating 0
+           summary = MALLOC(char, size + 1); // +1 for terminating 0
            if (summary) {
               int rbytes = safe_read(f, summary, size);
               if (rbytes >= 0) {
@@ -385,7 +385,7 @@ cRecording::cRecording(const char *FileName)
                  }
               else {
                  LOG_ERROR_STR(SummaryFileName);
-                 delete summary;
+                 free(summary);
                  summary = NULL;
                  }
 
@@ -399,17 +399,17 @@ cRecording::cRecording(const char *FileName)
         }
      else if (errno != ENOENT)
         LOG_ERROR_STR(SummaryFileName);
-     delete SummaryFileName;
+     free(SummaryFileName);
      }
 }
 
 cRecording::~cRecording()
 {
-  delete titleBuffer;
-  delete sortBuffer;
-  delete fileName;
-  delete name;
-  delete summary;
+  free(titleBuffer);
+  free(sortBuffer);
+  free(fileName);
+  free(name);
+  free(summary);
 }
 
 char *cRecording::StripEpisodeName(char *s)
@@ -437,9 +437,9 @@ char *cRecording::SortName(void)
   if (!sortBuffer) {
      char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
      int l = strxfrm(NULL, s, 0);
-     sortBuffer = new char[l];
+     sortBuffer = MALLOC(char, l);
      strxfrm(sortBuffer, s, l);
-     delete s;
+     free(s);
      }
   return sortBuffer;
 }
@@ -474,7 +474,7 @@ const char *cRecording::FileName(void)
 const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
 {
   char New = NewIndicator && IsNew() ? '*' : ' ';
-  delete titleBuffer;
+  free(titleBuffer);
   titleBuffer = NULL;
   if (Level < 0 || Level == HierarchyLevels()) {
      struct tm tm_r;
@@ -524,7 +524,7 @@ const char *cRecording::PrefixFileName(char Prefix)
 {
   const char *p = PrefixVideoFileName(FileName(), Prefix);
   if (p) {
-     delete fileName;
+     free(fileName);
      fileName = strdup(p);
      return fileName;
      }
@@ -555,7 +555,7 @@ bool cRecording::WriteSummary(void)
         }
      else
         LOG_ERROR_STR(SummaryFileName);
-     delete SummaryFileName;
+     free(SummaryFileName);
      }
   return true;
 }
@@ -575,7 +575,7 @@ bool cRecording::Delete(void)
      isyslog("deleting recording %s", FileName());
      result = RenameVideoFile(FileName(), NewName);
      }
-  delete NewName;
+  free(NewName);
   return result;
 }
 
@@ -614,7 +614,7 @@ bool cRecordings::Load(bool Deleted)
      }
   else
      Interface->Error("Error while opening pipe!");
-  delete cmd;
+  free(cmd);
   return result;
 }
 
@@ -639,19 +639,19 @@ cMark::cMark(int Position, const char *Comment)
 
 cMark::~cMark()
 {
-  delete comment;
+  free(comment);
 }
 
 const char *cMark::ToText(void)
 {
-  delete buffer;
+  free(buffer);
   asprintf(&buffer, "%s%s%s\n", IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
   return buffer;
 }
 
 bool cMark::Parse(const char *s)
 {
-  delete comment;
+  free(comment);
   comment = NULL;
   position = HMSFToIndex(s);
   const char *p = strchr(s, ' ');
@@ -742,7 +742,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
      asprintf(&cmd, "%s %s \"%s\"", command, State, strescape(RecordingFileName, "\"$"));
      isyslog("executing '%s'", cmd);
      SystemExec(cmd);
-     delete cmd;
+     free(cmd);
      }
 }
 
@@ -782,13 +782,13 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
               last = (buf.st_size + delta) / sizeof(tIndex) - 1;
               if (!Record && last >= 0) {
                  size = last + 1;
-                 index = new tIndex[size];
+                 index = MALLOC(tIndex, size);
                  if (index) {
                     f = open(fileName, O_RDONLY);
                     if (f >= 0) {
                        if ((int)safe_read(f, index, buf.st_size) != buf.st_size) {
                           esyslog("ERROR: can't read from file '%s'", fileName);
-                          delete index;
+                          free(index);
                           index = NULL;
                           close(f);
                           f = -1;
@@ -828,8 +828,8 @@ cIndexFile::~cIndexFile()
 {
   if (f >= 0)
      close(f);
-  delete fileName;
-  delete index;
+  free(fileName);
+  free(index);
 }
 
 bool cIndexFile::CatchUp(int Index)
@@ -852,7 +852,7 @@ bool cIndexFile::CatchUp(int Index)
                   if (lseek(f, offset, SEEK_SET) == offset) {
                      if (safe_read(f, &index[last + 1], delta) != delta) {
                         esyslog("ERROR: can't read from index");
-                        delete index;
+                        free(index);
                         index = NULL;
                         close(f);
                         f = -1;
@@ -999,7 +999,7 @@ cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
 cFileName::~cFileName()
 {
   Close();
-  delete fileName;
+  free(fileName);
 }
 
 int cFileName::Open(void)
diff --git a/remux.c b/remux.c
index 08d632ce5..6a2753b1f 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.9 2002/05/13 16:31:38 kls Exp $
+ * $Id: remux.c 1.11 2002/08/11 11:48:34 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -66,6 +66,7 @@
 */
 
 #include "remux.h"
+#include <stdlib.h>
 #include "thread.h"
 #include "tools.h"
 
@@ -153,7 +154,7 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
   size = Size;
   audioCid = AudioCid;
 
-  if (!(buf = new uint8_t[size]))
+  if (!(buf = MALLOC(uint8_t, size)))
      esyslog("Not enough memory for ts_transform");
 
   reset_ipack();
@@ -161,7 +162,7 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
 
 cTS2PES::~cTS2PES()
 {
-  delete buf;
+  free(buf);
 }
 
 void cTS2PES::Clear(void)
@@ -309,7 +310,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                      if ((flag1 & 0xC0) == 0x80 )
                         mpeg = 2;
                      else {
-                        esyslog("ERROR: can't record MPEG1!");
+                        esyslog("ERROR: error in data stream!");
                         hlength = 0;
                         which = 0;
                         mpeg = 1;
diff --git a/remux.h b/remux.h
index 7d81ee033..feb11767b 100644
--- a/remux.h
+++ b/remux.h
@@ -4,14 +4,18 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.6 2002/08/04 10:27:07 kls Exp $
+ * $Id: remux.h 1.7 2002/08/09 16:18:02 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
-#include <time.h> //XXX FIXME: DVB/ost/include/ost/dmx.h should include <time.h> itself!!!
+#include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
+#ifdef NEWSTRUCT
+#include <linux/dvb/dmx.h>
+#else
 #include <ost/dmx.h>
+#endif
 #include "tools.h"
 
 // Picture types:
diff --git a/svdrp.c b/svdrp.c
index 9d70732ec..b59cb3931 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.38 2002/06/09 15:56:54 kls Exp $
+ * $Id: svdrp.c 1.39 2002/08/11 12:01:28 kls Exp $
  */
 
 #include "svdrp.h"
@@ -37,6 +37,7 @@ cSocket::cSocket(int Port, int Queue)
 {
   port = Port;
   sock = -1;
+  queue = Queue;
 }
 
 cSocket::~cSocket()
@@ -320,7 +321,7 @@ cSVDRP::cSVDRP(int Port)
 cSVDRP::~cSVDRP()
 {
   Close();
-  delete message;
+  free(message);
 }
 
 void cSVDRP::Close(bool Timeout)
@@ -370,7 +371,7 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
                  }
               s = n ? n + 1 : NULL;
               }
-        delete buffer;
+        free(buffer);
         va_end(ap);
         }
      else {
@@ -685,7 +686,7 @@ void cSVDRP::CmdLSTR(const char *Option)
            if (recording->Summary()) {
               char *summary = strdup(recording->Summary());
               Reply(250, "%s", strreplace(summary,'\n','|'));
-              delete summary;
+              free(summary);
               }
            else
               Reply(550, "No summary availabe");
@@ -736,7 +737,7 @@ void cSVDRP::CmdLSTT(const char *Option)
 void cSVDRP::CmdMESG(const char *Option)
 {
   if (*Option) {
-     delete message;
+     free(message);
      message = strdup(Option);
      isyslog("SVDRP message: '%s'", message);
      Reply(250, "Message stored");
diff --git a/thread.c b/thread.c
index 1448cd8ac..0f42e56c0 100644
--- a/thread.c
+++ b/thread.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.21 2002/06/01 15:28:46 kls Exp $
+ * $Id: thread.c 1.22 2002/08/15 11:44:48 kls Exp $
  */
 
 #include "thread.h"
 #include <errno.h>
 #include <signal.h>
 #include <sys/resource.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include "tools.h"
@@ -27,17 +28,43 @@ cCondVar::~cCondVar()
   pthread_cond_destroy(&cond);
 }
 
-bool cCondVar::Wait(cMutex &Mutex)
+void cCondVar::Wait(cMutex &Mutex)
 {
-  return pthread_cond_wait(&cond, &Mutex.mutex);
+  if (Mutex.locked && Mutex.lockingPid == getpid()) {
+     int locked = Mutex.locked;
+     Mutex.locked = 0; // have to clear the locked count here, as pthread_cond_wait
+                       // does an implizit unlock of the mutex
+     pthread_cond_wait(&cond, &Mutex.mutex);
+     Mutex.locked = locked;
+     }
 }
 
-/*
-bool cCondVar::TimedWait(cMutex &Mutex, unsigned long tmout)
+bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
 {
-  return pthread_cond_timedwait(&cond, &Mutex.mutex, tmout);
+  bool r = true; // true = condition signaled false = timeout
+
+  if (Mutex.locked && Mutex.lockingPid == getpid()) {
+     struct timeval now;                   // unfortunately timedwait needs the absolute time, not the delta :-(
+     if (gettimeofday(&now, NULL) == 0) {  // get current time
+        now.tv_usec += TimeoutMs * 1000;   // add the timeout
+        while (now.tv_usec >= 1000000) {   // take care of an overflow
+              now.tv_sec++;
+              now.tv_usec -= 1000000;
+              }
+        struct timespec abstime;              // build timespec for timedwait
+        abstime.tv_sec = now.tv_sec;          // seconds
+        abstime.tv_nsec = now.tv_usec * 1000; // nano seconds
+
+        int locked = Mutex.locked;
+        Mutex.locked = 0; // have to clear the locked count here, as pthread_cond_timedwait
+                          // does an implizit unlock of the mutex.
+        if (pthread_cond_timedwait(&cond, &Mutex.mutex, &abstime) == ETIMEDOUT)
+           r = false;
+        Mutex.locked = locked;
+        }
+     }
+  return r;
 }
-*/
 
 void cCondVar::Broadcast(void)
 {
@@ -344,7 +371,6 @@ int cPipe::Close(void)
            i--;
            usleep(100000);
            }
-   
      if (!i) {
         kill(pid, SIGKILL);
         ret = -1;
diff --git a/thread.h b/thread.h
index d23814e57..9fc48b64f 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.13 2002/06/01 14:55:31 kls Exp $
+ * $Id: thread.h 1.14 2002/08/15 11:40:06 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -22,8 +22,8 @@ class cCondVar {
 public:
   cCondVar(void);
   ~cCondVar();
-  bool Wait(cMutex &Mutex);
-  //bool TimedWait(cMutex &Mutex, unsigned long tmout);
+  void Wait(cMutex &Mutex);
+  bool TimedWait(cMutex &Mutex, int TimeoutMs);
   void Broadcast(void);
   //void Signal(void);
   };
diff --git a/tools.c b/tools.c
index 6449a1be1..29c5f2d61 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.68 2002/08/03 15:44:53 kls Exp $
+ * $Id: tools.c 1.70 2002/08/16 13:43:40 kls Exp $
  */
 
 #include "tools.h"
@@ -80,7 +80,7 @@ char *strcpyrealloc(char *dest, const char *src)
         esyslog("ERROR: out of memory");
      }
   else {
-     delete dest;
+     free(dest);
      dest = NULL;
      }
   return dest;
@@ -239,7 +239,7 @@ bool isnumber(const char *s)
 const char *AddDirectory(const char *DirName, const char *FileName)
 {
   static char *buf = NULL;
-  delete buf;
+  free(buf);
   asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
   return buf;
 }
@@ -303,7 +303,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory)
         else
            break;
         }
-  delete s;
+  free(s);
   return result;
 }
 
@@ -321,7 +321,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                     asprintf(&buffer, "%s/%s", FileName, e->d_name);
                     if (FollowSymlinks) {
                        int size = strlen(buffer) * 2; // should be large enough
-                       char *l = new char[size];
+                       char *l = MALLOC(char, size);
                        int n = readlink(buffer, l, size);
                        if (n < 0) {
                           if (errno != EINVAL)
@@ -335,12 +335,12 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                           }
                        else
                           esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
-                       delete l;
+                       free(l);
                        }
                     dsyslog("removing %s", buffer);
                     if (remove(buffer) < 0)
                        LOG_ERROR_STR(buffer);
-                    delete buffer;
+                    free(buffer);
                     }
                  }
            closedir(d);
@@ -384,10 +384,10 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
                  }
               else {
                  LOG_ERROR_STR(buffer);
-                 delete buffer;
+                 free(buffer);
                  return false;
                  }
-              delete buffer;
+              free(buffer);
               }
            }
      closedir(d);
@@ -429,7 +429,7 @@ bool SpinUpDisk(const char *FileName)
 {
   static char *buf = NULL;
   for (int n = 0; n < 10; n++) {
-      delete buf;
+      free(buf);
       if (DirectoryOk(FileName))
          asprintf(&buf, "%s/vdr-%06d", *FileName ? FileName : ".", n);
       else
@@ -482,6 +482,42 @@ const char *DayDateTime(time_t t)
   return buffer;
 }
 
+// --- cPoller ---------------------------------------------------------------
+
+cPoller::cPoller(int FileHandle, bool Out)
+{
+  numFileHandles = 0;
+  Add(FileHandle, Out);
+}
+
+bool cPoller::Add(int FileHandle, bool Out)
+{
+  if (FileHandle >= 0) {
+     for (int i = 0; i < numFileHandles; i++) {
+         if (pfd[i].fd == FileHandle)
+            return true;
+         }
+     if (numFileHandles < MaxPollFiles) {
+        pfd[numFileHandles].fd = FileHandle;
+        pfd[numFileHandles].events = Out ? POLLOUT : POLLIN;
+        numFileHandles++;
+        return true;
+        }
+     esyslog("ERROR: too many file handles in cPoller");
+     }
+  return false;
+}
+
+bool cPoller::Poll(int TimeoutMs)
+{
+  if (numFileHandles) {
+     if (poll(pfd, numFileHandles, TimeoutMs) != 0)
+        return true; // returns true even in case of an error, to let the caller
+                     // access the file and thus see the error code
+     }
+  return false;
+}
+
 // --- cFile -----------------------------------------------------------------
 
 bool cFile::files[FD_SETSIZE] = { false };
@@ -594,7 +630,7 @@ cSafeFile::cSafeFile(const char *FileName)
 {
   f = NULL;
   fileName = ReadLink(FileName);
-  tempName = fileName ? new char[strlen(fileName) + 5] : NULL;
+  tempName = fileName ? MALLOC(char, strlen(fileName) + 5) : NULL;
   if (tempName)
      strcat(strcpy(tempName, fileName), ".$$$");
 }
@@ -604,8 +640,8 @@ cSafeFile::~cSafeFile()
   if (f)
      fclose(f);
   unlink(tempName);
-  delete fileName;
-  delete tempName;
+  free(fileName);
+  free(tempName);
 }
 
 bool cSafeFile::Open(void)
@@ -657,7 +693,7 @@ cLockFile::cLockFile(const char *Directory)
 cLockFile::~cLockFile()
 {
   Unlock();
-  delete fileName;
+  free(fileName);
 }
 
 bool cLockFile::Lock(int WaitSeconds)
diff --git a/tools.h b/tools.h
index 5f09edbea..ebabb470c 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.47 2002/06/09 11:09:10 kls Exp $
+ * $Id: tools.h 1.49 2002/08/16 08:52:01 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -12,6 +12,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
@@ -36,6 +37,8 @@ extern int SysLogLevel;
 
 #define MAXPARSEBUFFER KILOBYTE(10)
 
+#define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
+
 #define DELETENULL(p) (delete (p), p = NULL)
 
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
@@ -74,6 +77,17 @@ bool SpinUpDisk(const char *FileName);
 const char *WeekDayName(int WeekDay); // returns a statically allocated string!
 const char *DayDateTime(time_t t = 0); // returns a statically allocated string!
 
+class cPoller {
+private:
+  enum { MaxPollFiles = 16 };
+  pollfd pfd[MaxPollFiles];
+  int numFileHandles;
+public:
+  cPoller(int FileHandle = -1, bool Out = false);
+  bool Add(int FileHandle, bool Out);
+  bool Poll(int TimeoutMs = 0);
+  };
+  
 class cFile {
 private:
   static bool files[];
diff --git a/vdr.c b/vdr.c
index fa7429c13..9da5b5ee2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.118 2002/08/04 09:56:30 kls Exp $
+ * $Id: vdr.c 1.120 2002/08/16 09:54:03 kls Exp $
  */
 
 #include <getopt.h>
@@ -327,8 +327,7 @@ int main(int argc, char *argv[])
 
   // DVB interfaces:
 
-  if (!cDvbDevice::Initialize())
-     return 2;
+  cDvbDevice::Initialize();
 
   cSIProcessor::Read();
 
@@ -340,6 +339,12 @@ int main(int argc, char *argv[])
   // Primary device:
 
   cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
+  if (!cDevice::PrimaryDevice()) {
+     const char *msg = "no primary device found - giving up!";
+     fprintf(stderr, "vdr: %s\n", msg);
+     esyslog("ERROR: %s", msg);
+     return 2;
+     }
 
   // OSD:
 
@@ -585,7 +590,7 @@ int main(int argc, char *argv[])
                     asprintf(&buf, tr("Recording in %d minutes, shut down anyway?"), Delta / 60);
                     if (Interface->Confirm(buf))
                        ForceShutdown = true;
-                    delete buf;
+                    free(buf);
                     }
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
@@ -600,7 +605,7 @@ int main(int argc, char *argv[])
                        asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
                        isyslog("executing '%s'", cmd);
                        SystemExec(cmd);
-                       delete cmd;
+                       free(cmd);
                        }
                     else if (WatchdogTimeout > 0) {
                        alarm(WatchdogTimeout);
diff --git a/videodir.c b/videodir.c
index a6c1b1130..4078fdff2 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.8 2002/05/13 16:32:52 kls Exp $
+ * $Id: videodir.c 1.9 2002/08/11 13:31:02 kls Exp $
  */
 
 #include "videodir.h"
@@ -48,9 +48,9 @@ cVideoDirectory::cVideoDirectory(void)
 
 cVideoDirectory::~cVideoDirectory()
 {
-  delete name;
-  delete stored;
-  delete adjusted;
+  free(name);
+  free(stored);
+  free(adjusted);
 }
 
 int cVideoDirectory::FreeMB(int *UsedMB)
@@ -87,7 +87,7 @@ bool cVideoDirectory::Next(void)
 void cVideoDirectory::Store(void)
 {
   if (name) {
-     delete stored;
+     free(stored);
      stored = strdup(name);
      }
 }
@@ -95,7 +95,7 @@ void cVideoDirectory::Store(void)
 const char *cVideoDirectory::Adjust(const char *FileName)
 {
   if (stored) {
-     delete adjusted;
+     free(adjusted);
      adjusted = strdup(FileName);
      return strncpy(adjusted, stored, length);
      }
@@ -139,7 +139,7 @@ int OpenVideoFile(const char *FileName, int Flags)
      }
   int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
   if (ActualFileName != FileName)
-     delete ActualFileName;
+     free((char *)ActualFileName);
   return Result;
 }
 

From a2a215d5e12ad35df8d0731dd00b6e41d5dd77fa Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 Aug 2002 18:00:00 +0200
Subject: [PATCH 049/307] =?UTF-8?q?Version=201.1.8=20-=20Fixed=20replaying?=
 =?UTF-8?q?=20the=20last=20few=20seconds=20of=20a=20recording.=20-=20Added?=
 =?UTF-8?q?=20some=20missing=20#includes=20to=20files=20in=20libdtv=20for?=
 =?UTF-8?q?=20gcc=203.2=20(thanks=20to=20J=C3=BCrgen=20=20=20Zimmermann).?=
 =?UTF-8?q?=20-=20Added=20cDevice::NewOsd()=20to=20allow=20a=20derived=20c?=
 =?UTF-8?q?Device=20class=20to=20implement=20its=20own=20=20=20OSD=20capab?=
 =?UTF-8?q?ilities=20(thanks=20to=20Andreas=20Schultz).=20-=20Added=20cPal?=
 =?UTF-8?q?ette::AllColors()=20for=20plugins=20that=20need=20to=20get=20th?=
 =?UTF-8?q?e=20color=20entries=20of=20=20=20a=20cPalette=20(see=20osdbase.?=
 =?UTF-8?q?h).=20-=20The=20new=20SVDRP=20command=20CLRE=20can=20be=20used?=
 =?UTF-8?q?=20to=20clear=20the=20entire=20EPG=20data=20(suggested=20=20=20?=
 =?UTF-8?q?by=20Matthias=20Schniedermeyer).=20-=20Fixed=20handling=20one-s?=
 =?UTF-8?q?hot=20timers=20that=20were=20already=20recording=20and=20had=20?=
 =?UTF-8?q?their=20start=20=20=20time=20changed=20into=20the=20future=20(t?=
 =?UTF-8?q?hanks=20to=20Matthias=20Schniedermeyer=20for=20reporting=20=20?=
 =?UTF-8?q?=20this=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS              |  8 ++++++++
 HISTORY                   | 15 ++++++++++++++
 PLUGINS.html              | 43 +++++++++++++++++++++++++++------------
 config.h                  |  4 ++--
 device.c                  |  7 ++++++-
 device.h                  | 13 +++++++++++-
 dvbdevice.c               |  7 ++++++-
 dvbdevice.h               |  7 ++++++-
 dvbosd.c                  |  4 ++--
 dvbplayer.c               | 17 +++++++++-------
 eit.c                     |  9 +++++++-
 eit.h                     |  3 ++-
 libdtv/liblx/xListFuncs.c |  1 +
 libdtv/liblx/xMemMgt.c    |  2 ++
 libdtv/libsi/si_parser.c  |  1 +
 menu.c                    |  6 ++----
 osd.c                     |  5 ++---
 osdbase.c                 | 10 +++++++--
 osdbase.h                 | 15 ++++++++++++--
 recording.c               | 13 ++++++++++--
 svdrp.c                   | 11 +++++++++-
 svdrp.h                   |  3 ++-
 xd                        |  1 +
 23 files changed, 160 insertions(+), 45 deletions(-)
 create mode 100644 xd

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 39dcde139..ca9a31aeb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -54,6 +54,9 @@ Matthias Schniedermeyer <ms@citd.de>
  for his "schnitt" tools
  for his "master-timer" tool
  for helping to debug the "move to last position in list" bug
+ for suggesting the SVDRP command CLRE
+ for reporting a bug in handling one-shot timers that were already recording
+ and had their start time changed into the future
 
 Miha Setina <mihasetina@softhome.net>
  for translating OSD texts to the Slovenian language
@@ -161,6 +164,8 @@ Andreas Schultz <aschultz@warp10.net>
  for adding direct access to the index data of cPalette (needed for displaying SPUs)
  for pointing out a possible race condition in the cDvbPlayer
  for making the use of malloc/free and new/delete consistent
+ for adding cDevice::NewOsd() to allow a derived cDevice class to implement its own
+ OSD capabilities
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -380,3 +385,6 @@ Joerg Riechardt <J.Riechardt@gmx.de>
 
 Holger W�chtler <holger@convergence.de>
  for some valuable advice during adapting to the NEWSTRUCT driver
+
+J�rgen Zimmermann <jnzimmer@informatik.uni-kl.de>
+ for adding some missing #includes to files in libdtv for gcc 3.2
diff --git a/HISTORY b/HISTORY
index c7269cda6..fd1757669 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1415,3 +1415,18 @@ Video Disk Recorder Revision History
 - VDR no longer gives up if there is no DVB device. It continues to work if
   there is at least one device, either a DVB device found by the core VDR code
   itself, or a device implemented by a plugin.
+
+2002-08-25: Version 1.1.8
+
+- Fixed replaying the last few seconds of a recording.
+- Added some missing #includes to files in libdtv for gcc 3.2 (thanks to J�rgen
+  Zimmermann).
+- Added cDevice::NewOsd() to allow a derived cDevice class to implement its own
+  OSD capabilities (thanks to Andreas Schultz).
+- Added cPalette::AllColors() for plugins that need to get the color entries of
+  a cPalette (see osdbase.h).
+- The new SVDRP command CLRE can be used to clear the entire EPG data (suggested
+  by Matthias Schniedermeyer).
+- Fixed handling one-shot timers that were already recording and had their start
+  time changed into the future (thanks to Matthias Schniedermeyer for reporting
+  this one).
diff --git a/PLUGINS.html b/PLUGINS.html
index ae164e1d1..186316de3 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.4 are marked like this.
-<!--X1.1.4--></td></tr></table>
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.5 are marked like this.
 <!--X1.1.5--></td></tr></table>
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.6 are marked like this.
 <!--X1.1.6--></td></tr></table>
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.7 are marked like this.
 <!--X1.1.7--></td></tr></table>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.8 are marked like this.
+<!--X1.1.8--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -907,7 +907,6 @@
 member functions are available in <tt>cStatus</tt>. You only need to implement
 the functions you actually want to use.
 
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
@@ -958,7 +957,7 @@
 individual block of data. The sum of all blocks must simply result in the
 desired video data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 To avoid busy loops the player should call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -1065,9 +1064,8 @@
 enjoy additional players, since they will be able to control them with actions
 that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
-<!--X1.1.4--></td></tr></table>
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Receivers</h2>
 
 <center><i><b>Tapping into the stream...</b></i></center><p>
@@ -1123,7 +1121,7 @@
 and will automatically detach itself from the <tt>cDevice</tt>.
 <!--X1.1.6--></td></tr></table>
 
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
@@ -1155,7 +1153,7 @@
 its windows and color depths).
 <!--X1.1.5--></td></tr></table>
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Devices</h2>
 
 <center><i><b>Expanding the possibilities</b></i></center><p>
@@ -1228,7 +1226,7 @@
 <p>
 The functions to implement replaying capabilites are
 
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1252,6 +1250,25 @@
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<p>
+<b>On Screen Display</b>
+<p>
+If your device provides On Screen Display (OSD) capabilities (which every device
+that is supposed to be used as a primary device should do), it can implement
+the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual cOsdBase *NewOsd(int x, int y);
+</pre></td></tr></table><p>
+
+which must return a newly created object of a derived cOsdBase class that
+implements the functions necessary to display OSD information on your device.
+The caller of this function will delete the object as soon as it is no longer
+needed.
+<!--X1.1.8--></td></tr></table>
+
+<p>
 <b>Initializing new devices</b>
 <p>
 A derived cDevice class shall implement a static function
diff --git a/config.h b/config.h
index ef7f70e61..fe8a1155b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.123 2002/08/11 11:36:36 kls Exp $
+ * $Id: config.h 1.124 2002/08/24 10:23:48 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.7"
+#define VDRVERSION "1.1.8"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 6a3103775..48f5d40fb 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.12 2002/08/16 09:50:43 kls Exp $
+ * $Id: device.c 1.13 2002/08/25 09:16:51 kls Exp $
  */
 
 #include "device.h"
@@ -111,6 +111,11 @@ bool cDevice::HasDecoder(void) const
   return false;
 }
 
+cOsdBase *cDevice::NewOsd(int x, int y)
+{
+  return NULL;
+}
+
 cDevice *cDevice::GetDevice(int Ca, int Priority, int Frequency, int Vpid, bool *ReUse)
 {
   if (ReUse)
diff --git a/device.h b/device.h
index 14d8ec50b..5f62417a0 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.9 2002/08/16 08:52:27 kls Exp $
+ * $Id: device.h 1.10 2002/08/25 09:16:34 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -43,6 +43,7 @@ enum ePlayMode { pmNone,       // audio/video from decoder
                  // KNOWN TO YOUR PLAYER.
                };
 
+class cOsdBase;
 class cChannel;
 class cPlayer;
 class cReceiver;
@@ -129,6 +130,16 @@ class cDevice : cThread {
   virtual bool HasDecoder(void) const;
          // Tells whether this device has an MPEG decoder.
 
+// OSD facilities
+
+public:
+  virtual cOsdBase *NewOsd(int x, int y);
+         // Creates a new cOsdBase object that can be used by the cOsd class
+         // to display information on the screen, with the upper left corner
+         // of the OSD at the given coordinates. If a derived cDevice doesn't
+         // implement this function, NULL will be returned by default (which
+         // means the device has no OSD capabilities).
+
 // Channel facilities
 
 protected:
diff --git a/dvbdevice.c b/dvbdevice.c
index 6be882fa7..52c7c3ba2 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.7 2002/08/16 09:27:53 kls Exp $
+ * $Id: dvbdevice.c 1.8 2002/08/25 09:20:53 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -193,6 +193,11 @@ bool cDvbDevice::HasDecoder(void) const
   return fd_video >= 0 && fd_audio >= 0;
 }
 
+cOsdBase *cDvbDevice::NewOsd(int x, int y)
+{
+  return new cDvbOsd(x, y);
+}
+
 bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
   int videoDev = DvbOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
diff --git a/dvbdevice.h b/dvbdevice.h
index ece1b4546..a338399be 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.5 2002/08/16 08:53:30 kls Exp $
+ * $Id: dvbdevice.h 1.6 2002/08/25 09:19:34 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -48,6 +48,11 @@ class cDvbDevice : public cDevice {
   virtual bool CanBeReUsed(int Frequency, int Vpid);
   virtual bool HasDecoder(void) const;
 
+// OSD facilities
+
+public:
+  cOsdBase *NewOsd(int x, int y);
+
 // Channel facilities
 
 private:
diff --git a/dvbosd.c b/dvbosd.c
index ca5cf4900..4b0c1ea8c 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.18 2002/08/04 10:13:21 kls Exp $
+ * $Id: dvbosd.c 1.19 2002/08/25 09:53:51 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -92,7 +92,7 @@ void cDvbOsd::CommitWindow(cWindow *Window)
         // commit colors:
         int FirstColor = 0, LastColor = 0;
         const eDvbColor *pal;
-        while ((pal = Window->Colors(FirstColor, LastColor)) != NULL)
+        while ((pal = Window->NewColors(FirstColor, LastColor)) != NULL)
               Cmd(OSD_SetPalette, FirstColor, LastColor, 0, 0, 0, pal);
         // commit modified data:
         Cmd(OSD_SetBlock, Window->Width(), x1, y1, x2, y2, Window->Data(x1, y1));
diff --git a/dvbplayer.c b/dvbplayer.c
index 2ca5a62d0..7a6d76d31 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.11 2002/08/16 09:16:38 kls Exp $
+ * $Id: dvbplayer.c 1.12 2002/08/24 14:59:35 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -307,7 +307,7 @@ void cDvbPlayer::Action(void)
      isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
   running = true;
-  while (running && NextFile()) {
+  while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
         cPoller Poller;
         if (!readFrame)
            Poller.Add(replayFile, false);
@@ -317,7 +317,7 @@ void cDvbPlayer::Action(void)
 
            // Read the next frame from the file:
 
-           if (!readFrame) {
+           if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
               if (playMode != pmStill) {
                  int r = 0;
                  if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
@@ -326,7 +326,7 @@ void cDvbPlayer::Action(void)
                     int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
                     if (Index >= 0) {
                        if (!NextFile(FileNumber, FileOffset))
-                          break;
+                          continue;
                        }
                     else {
                        // can't call Play() here, because those functions may only be
@@ -347,8 +347,11 @@ void cDvbPlayer::Action(void)
                     uchar FileNumber;
                     int FileOffset, Length;
                     readIndex++;
-                    if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset)))
-                       break;
+                    if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
+                       readIndex = -1;
+                       eof = true;
+                       continue;
+                       }
                     r = ReadFrame(replayFile, b, Length, sizeof(b));
                     }
                  else // allows replay even if the index file is missing
@@ -557,7 +560,7 @@ void cDvbPlayer::SkipSeconds(int Seconds)
         if (Index > 0)
            Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
         if (Index >= 0)
-           readIndex = writeIndex = Index - 1; // Input() will first increment it!
+           readIndex = writeIndex = Index - 1; // Action() will first increment it!
         }
      Play();
      }
diff --git a/eit.c b/eit.c
index ca3191384..865904900 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.48 2002/08/11 11:11:12 kls Exp $
+ * $Id: eit.c 1.49 2002/08/25 10:43:36 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1035,6 +1035,13 @@ bool cSIProcessor::Read(FILE *f)
   return result;
 }
 
+void cSIProcessor::Clear(void)
+{
+  cMutexLock MutexLock(&schedulesMutex);
+  delete schedules;
+  schedules = new cSchedules;
+}
+
 void cSIProcessor::SetEpgDataFileName(const char *FileName)
 {
   epgDataFileName = NULL;
diff --git a/eit.h b/eit.h
index 981f4e59f..33a49a0e3 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.17 2002/08/04 11:30:24 kls Exp $
+ * $Id: eit.h 1.18 2002/08/25 10:38:34 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -156,6 +156,7 @@ class cSIProcessor : public cThread {
          // time the returned cSchedules is accessed. Once the cSchedules is no
          // longer used, the cMutexLock must be destroyed.
   static bool Read(FILE *f = NULL);
+  static void Clear(void);
   void SetStatus(bool On);
   void SetCurrentTransponder(int CurrentTransponder);
   static bool SetCurrentServiceID(unsigned short servid);
diff --git a/libdtv/liblx/xListFuncs.c b/libdtv/liblx/xListFuncs.c
index 7457170eb..01b85b856 100644
--- a/libdtv/liblx/xListFuncs.c
+++ b/libdtv/liblx/xListFuncs.c
@@ -25,6 +25,7 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+#include <string.h>
 #include "liblx.h"
 
 
diff --git a/libdtv/liblx/xMemMgt.c b/libdtv/liblx/xMemMgt.c
index 8f619bc8b..c93713b00 100644
--- a/libdtv/liblx/xMemMgt.c
+++ b/libdtv/liblx/xMemMgt.c
@@ -26,6 +26,8 @@
 // Boston, MA 02111-1307, USA.
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <malloc.h>
 
 #include "liblx.h"
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index 063d93e6a..be0d2549c 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -26,6 +26,7 @@
 // Boston, MA 02111-1307, USA.
 
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include <time.h>
 
diff --git a/menu.c b/menu.c
index 5b56b3ab0..ea10a3619 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.205 2002/08/15 11:28:08 kls Exp $
+ * $Id: menu.c 1.206 2002/08/25 10:56:09 kls Exp $
  */
 
 #include "menu.h"
@@ -2490,9 +2490,7 @@ void cRecordControl::Stop(bool KeepInstant)
      cStatus::MsgRecording(device, NULL);
      DELETENULL(recorder);
      timer->SetRecording(false);
-     if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && !timer->Matches())) {
-        // checking timer->Matches() to make sure we don't delete the timer
-        // if the program was cancelled before the timer's stop time!
+     if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && timer->StopTime() <= time(NULL))) {
         isyslog("deleting timer %d", timer->Index() + 1);
         Timers.Del(timer);
         Timers.Save();
diff --git a/osd.c b/osd.c
index 58caf68cd..a2daf6033 100644
--- a/osd.c
+++ b/osd.c
@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.34 2002/08/15 11:20:44 kls Exp $
+ * $Id: osd.c 1.35 2002/08/25 09:18:31 kls Exp $
  */
 
 #include "osd.h"
 #include <string.h>
 #include "device.h"
-#include "dvbosd.h"
 #include "i18n.h"
 #include "status.h"
 
@@ -73,7 +72,7 @@ cOsdBase *cOsd::OpenRaw(int x, int y)
 #ifdef DEBUG_OSD
   return NULL;
 #else
-  return osd ? NULL : new cDvbOsd(x, y);
+  return osd ? NULL : cDevice::PrimaryDevice()->NewOsd(x, y);
 #endif
 }
 
diff --git a/osdbase.c b/osdbase.c
index 70e11bfa2..e16b27b04 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.6 2002/08/11 11:47:21 kls Exp $
+ * $Id: osdbase.c 1.7 2002/08/25 10:02:36 kls Exp $
  */
 
 #include "osdbase.h"
@@ -74,7 +74,7 @@ void cPalette::Reset(void)
   full = false;
 }
 
-const eDvbColor *cPalette::Colors(int &FirstColor, int &LastColor)
+const eDvbColor *cPalette::NewColors(int &FirstColor, int &LastColor)
 {
   for (FirstColor = 0; FirstColor < numColors; FirstColor++) {
       if (!fetched[FirstColor]) {
@@ -87,6 +87,12 @@ const eDvbColor *cPalette::Colors(int &FirstColor, int &LastColor)
   return NULL;
 }
 
+const eDvbColor *cPalette::AllColors(int &NumColors)
+{
+  NumColors = numColors;
+  return numColors ? color : NULL;
+}
+
 void cPalette::Take(const cPalette &Palette, tIndexes *Indexes)
 {
   for (int i = 0; i < Palette.numColors; i++) {
diff --git a/osdbase.h b/osdbase.h
index 1800482f8..392212616 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.4 2002/07/13 14:45:55 kls Exp $
+ * $Id: osdbase.h 1.5 2002/08/25 10:01:00 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -56,7 +56,18 @@ class cPalette {
   cPalette(int Bpp);
   int Index(eDvbColor Color);
   void Reset(void);
-  const eDvbColor *Colors(int &FirstColor, int &LastColor);
+  const eDvbColor *NewColors(int &FirstColor, int &LastColor);
+        // With every call this function returns a consecutive range of
+        // color entries that have been added since the last call. The
+        // return value is the address of the first new color, and the
+        // index of the first and last new color are returned in the given
+        // int parameters. If there are no new color entries, NULL will
+        // be returned.
+  const eDvbColor *AllColors(int &NumColors);
+        // Returns a pointer to the complete color table and stores the
+        // number of valid entries in NumColors. If no colors have been
+        // stored yet, NumColors will be set to 0 and the function will
+        // return NULL.
   void Take(const cPalette &Palette, tIndexes *Indexes = NULL);
   };
 
diff --git a/recording.c b/recording.c
index be9154006..c92344683 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.66 2002/08/11 11:48:11 kls Exp $
+ * $Id: recording.c 1.67 2002/08/24 14:09:49 kls Exp $
  */
 
 #include "recording.h"
@@ -756,6 +756,9 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 // The maximum time to wait before giving up while catching up on an index file:
 #define MAXINDEXCATCHUP   2 // seconds
 
+// The minimum age of an index file for considering it no longer to be written:
+#define MININDEXAGE      10 // seconds
+
 cIndexFile::cIndexFile(const char *FileName, bool Record)
 :resumeFile(FileName)
 {
@@ -838,6 +841,12 @@ bool cIndexFile::CatchUp(int Index)
      for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
          struct stat buf;
          if (fstat(f, &buf) == 0) {
+            if (time(NULL) - buf.st_mtime > MININDEXAGE) {
+               // apparently the index file is not being written any more
+               close(f);
+               f = -1;
+               return false;
+               }
             int newLast = buf.st_size / sizeof(tIndex) - 1;
             if (newLast > last) {
                if (size <= newLast) {
@@ -897,7 +906,7 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
 {
   if (index) {
      CatchUp(Index);
-     if (Index >= 0 && Index <= last) {
+     if (Index >= 0 && Index < last) {
         *FileNumber = index[Index].number;
         *FileOffset = index[Index].offset;
         if (PictureType)
diff --git a/svdrp.c b/svdrp.c
index b59cb3931..92365e726 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.39 2002/08/11 12:01:28 kls Exp $
+ * $Id: svdrp.c 1.40 2002/08/25 10:40:46 kls Exp $
  */
 
 #include "svdrp.h"
@@ -174,6 +174,8 @@ const char *HelpPages[] = {
   "    Switch channel up, down or to the given channel number or name.\n"
   "    Without option (or after successfully switching to the channel)\n"
   "    it returns the current channel number and name.",
+  "CLRE\n"
+  "    Clear the entire EPG list.",
   "DELC <number>\n"
   "    Delete channel.",
   "DELR <number>\n"
@@ -438,6 +440,12 @@ void cSVDRP::CmdCHAN(const char *Option)
      Reply(550, "Unable to find channel \"%d\"", cDevice::CurrentChannel());
 }
 
+void cSVDRP::CmdCLRE(const char *Option)
+{
+  cSIProcessor::Clear();
+  Reply(250, "EPG data cleared");
+}
+
 void cSVDRP::CmdDELC(const char *Option)
 {
   //TODO combine this with menu action (timers must be updated)
@@ -967,6 +975,7 @@ void cSVDRP::Execute(char *Cmd)
      *s++ = 0;
   s = skipspace(s);
   if      (CMD("CHAN"))  CmdCHAN(s);
+  else if (CMD("CLRE"))  CmdCLRE(s);
   else if (CMD("DELC"))  CmdDELC(s);
   else if (CMD("DELR"))  CmdDELR(s);
   else if (CMD("DELT"))  CmdDELT(s);
diff --git a/svdrp.h b/svdrp.h
index 29ef83cd6..879fb6496 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.15 2002/03/08 16:40:23 kls Exp $
+ * $Id: svdrp.h 1.16 2002/08/25 10:35:25 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -53,6 +53,7 @@ class cSVDRP {
   bool Send(const char *s, int length = -1);
   void Reply(int Code, const char *fmt, ...);
   void CmdCHAN(const char *Option);
+  void CmdCLRE(const char *Option);
   void CmdDELC(const char *Option);
   void CmdDELR(const char *Option);
   void CmdDELT(const char *Option);
diff --git a/xd b/xd
new file mode 100644
index 000000000..a2cff6f6d
--- /dev/null
+++ b/xd
@@ -0,0 +1 @@
+rm x.diff

From 523c4a07aa9112841743fca2ebcce957fde03bc8 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Sep 2002 18:00:00 +0200
Subject: [PATCH 050/307] Version 1.1.9 - Fixed the 'newplugin' script to make
 it name the target for creating the   distribution package 'dist', as stated
 in the PLUGINS.html documentation.   If you have already created a plugin
 source directory and Makefile you may   want to check it and replace the
 'package' target with 'dist' if necessary. - Changed device handling for
 being able to do simultaneous recording and   replay on the same device (Time
 Shifting). In order for this to work you need   to use a driver with a
 firmware version that has this feature implemented. - cDevice::ProvidesCa()
 is no longer virtual. The new function   cDevice::ProvidesChannel() is now
 used to determine whether a device can   receive a given channel, and by
 default this function returns false. So a   device that is a pure replaying
 device doesn't need to do anything here. - Increased the recorder buffer size
 to 5MB in order to be able to better handle   multiple recordings. -
 Implemented cTSBuffer for better handling TS packet buffering in derived  
 cDevice classes. - Changed the interface if cDevice::GetTSPacket() to avoid
 unnecessary copying   of data. - Removed cDevice::Channel(), since this makes
 no more sense with devices   receiving multiple channels. - Switching through
 channels with the 'Up' and 'Down' keys now skips channels   that are
 currently not available (for instance because all devices are   recording and
 these channels are on different transponders). - Implemented an SPU decoder
 (thanks to Andreas Schultz). - Fixed a crash when entering an integer value
 outside the limits (thanks to   Stefan Huelswitt for reporting this one). -
 Added play mode pmAudioOnlyBlack (thanks to Stefan Huelswitt).

---
 CONTRIBUTORS                |   3 +
 HISTORY                     |  29 +++
 Makefile                    |   6 +-
 PLUGINS.html                |  52 ++--
 PLUGINS/SRC/status/Makefile |   4 +-
 channels.conf               |  20 +-
 config.c                    |  32 +--
 config.h                    |   9 +-
 device.c                    | 270 ++++++++++++++-----
 device.h                    | 121 ++++++---
 dvbdevice.c                 | 460 ++++++++++++++++++--------------
 dvbdevice.h                 |  17 +-
 dvbspu.c                    | 505 ++++++++++++++++++++++++++++++++++++
 dvbspu.h                    | 204 +++++++++++++++
 eitscan.c                   |  19 +-
 menu.c                      |  22 +-
 menuitems.c                 |   9 +-
 newplugin                   |   6 +-
 osdbase.h                   |   6 +-
 recorder.c                  |   4 +-
 spu.c                       |  23 ++
 spu.h                       |  38 +++
 svdrp.c                     |  35 +--
 tools.h                     |   3 +-
 vdr.c                       |  10 +-
 xd                          |   1 -
 26 files changed, 1480 insertions(+), 428 deletions(-)
 create mode 100644 dvbspu.c
 create mode 100644 dvbspu.h
 create mode 100644 spu.c
 create mode 100644 spu.h
 delete mode 100644 xd

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ca9a31aeb..1431bf7c6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -145,6 +145,8 @@ Stefan Huelswitt <huels@iname.com>
  option can't be accessed
  for implementing several replay modes to allow players that play only audio
  for improving cCondVar::Wait() and implementing cCondVar::TimedWait()
+ for reporting a bug when entering an integer value outside the limit
+ for adding play mode pmAudioOnlyBlack
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -166,6 +168,7 @@ Andreas Schultz <aschultz@warp10.net>
  for making the use of malloc/free and new/delete consistent
  for adding cDevice::NewOsd() to allow a derived cDevice class to implement its own
  OSD capabilities
+ for implementing an SPU decoder
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index fd1757669..bfecec8fa 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1430,3 +1430,32 @@ Video Disk Recorder Revision History
 - Fixed handling one-shot timers that were already recording and had their start
   time changed into the future (thanks to Matthias Schniedermeyer for reporting
   this one).
+
+2002-09-08: Version 1.1.9
+
+- Fixed the 'newplugin' script to make it name the target for creating the
+  distribution package 'dist', as stated in the PLUGINS.html documentation.
+  If you have already created a plugin source directory and Makefile you may
+  want to check it and replace the 'package' target with 'dist' if necessary.
+- Changed device handling for being able to do simultaneous recording and
+  replay on the same device (Time Shifting). In order for this to work you need
+  to use a driver with a firmware version that has this feature implemented.
+- cDevice::ProvidesCa() is no longer virtual. The new function
+  cDevice::ProvidesChannel() is now used to determine whether a device can
+  receive a given channel, and by default this function returns false. So a
+  device that is a pure replaying device doesn't need to do anything here.
+- Increased the recorder buffer size to 5MB in order to be able to better handle
+  multiple recordings.
+- Implemented cTSBuffer for better handling TS packet buffering in derived
+  cDevice classes.
+- Changed the interface if cDevice::GetTSPacket() to avoid unnecessary copying
+  of data.
+- Removed cDevice::Channel(), since this makes no more sense with devices
+  receiving multiple channels.
+- Switching through channels with the 'Up' and 'Down' keys now skips channels
+  that are currently not available (for instance because all devices are
+  recording and these channels are on different transponders).
+- Implemented an SPU decoder (thanks to Andreas Schultz).
+- Fixed a crash when entering an integer value outside the limits (thanks to
+  Stefan Huelswitt for reporting this one).
+- Added play mode pmAudioOnlyBlack (thanks to Stefan Huelswitt).
diff --git a/Makefile b/Makefile
index ddacbd4b8..7686b916b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.45 2002/08/09 16:02:02 kls Exp $
+# $Id: Makefile 1.46 2002/09/08 14:00:48 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -32,9 +32,9 @@ endif
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o eit.o eitscan.o font.o i18n.o\
+OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o\
        interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
-       recorder.o recording.o remote.o remux.o ringbuffer.o status.o svdrp.o thread.o\
+       recorder.o recording.o remote.o remux.o ringbuffer.o spu.o status.o svdrp.o thread.o\
        tools.o transfer.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
diff --git a/PLUGINS.html b/PLUGINS.html
index 186316de3..02fd59a6f 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.5 are marked like this.
-<!--X1.1.5--></td></tr></table>
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.6 are marked like this.
 <!--X1.1.6--></td></tr></table>
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.7 are marked like this.
 <!--X1.1.7--></td></tr></table>
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.8 are marked like this.
 <!--X1.1.8--></td></tr></table>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.9 are marked like this.
+<!--X1.1.9--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -352,20 +352,20 @@
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 bool cPluginHello::ProcessArgs(int argc, char *argv[])
-{ 
+{
   // Implement command line argument processing here if applicable.
   static struct option long_options[] = {
        { "aaa",      required_argument, NULL, 'a' },
        { "bbb",      no_argument,       NULL, 'b' },
        { NULL }
      };
-  
+
   int c;
   while ((c = getopt_long(argc, argv, "a:b", long_options, NULL)) != -1) {
         switch (c) {
           case 'a': option_a = optarg;
                     break;
-          case 'b': option_b = true; 
+          case 'b': option_b = true;
                     break;
           default:  return false;
           }
@@ -609,7 +609,7 @@
   };
 
 cMenuSetupHello::cMenuSetupHello(void)
-{ 
+{
   newGreetingTime = GreetingTime;
   newUseAlternateGreeting = UseAlternateGreeting;
   Add(new cMenuEditIntItem( tr("Greeting time (s)"),      &amp;newGreetingTime));
@@ -617,7 +617,7 @@
 }
 
 void cMenuSetupHello::Store(void)
-{ 
+{
   SetupStore("GreetingTime", GreetingTime = newGreetingTime);
   SetupStore("UseAlternateGreeting", UseAlternateGreeting = newUseAlternateGreeting);
 }
@@ -957,7 +957,7 @@
 individual block of data. The sum of all blocks must simply result in the
 desired video data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 To avoid busy loops the player should call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -1034,7 +1034,7 @@
 
 which can be called to display a still picture. VDR uses this function when handling
 its editing marks. A special case of a "player" might use this function to implement
-a "picture viewer". 
+a "picture viewer".
 <p>
 For detailed information on how to implement your own player, please take a look
 at VDR's <tt>cDvbPlayer</tt> and <tt>cDvbPlayerControl</tt> classes.
@@ -1065,7 +1065,7 @@
 that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Receivers</h2>
 
 <center><i><b>Tapping into the stream...</b></i></center><p>
@@ -1121,7 +1121,6 @@
 and will automatically detach itself from the <tt>cDevice</tt>.
 <!--X1.1.6--></td></tr></table>
 
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
@@ -1151,9 +1150,8 @@
 to define an actual OSD drawing area (see VDR/osdbase.h for the declarations
 of these functions, and VDR/osd.c to see how VDR opens the OSD and sets up
 its windows and color depths).
-<!--X1.1.5--></td></tr></table>
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Devices</h2>
 
 <center><i><b>Expanding the possibilities</b></i></center><p>
@@ -1189,12 +1187,16 @@
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-virtual bool SetChannelDevice(const cChannel *Channel);
+virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 </pre></td></tr></table><p>
 
-This function will be called with the desired channel and shall return whether
-tuning to it was successful.
+These functions will be called with the desired channel and shall return whether
+this device can provide the requested channel and whether tuning to it was successful,
+repectively.
+<!--X1.1.9--></td></tr></table>
 <p>
 <b>Recording</b>
 <p>
@@ -1204,10 +1206,12 @@
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
-virtual int GetTSPacket(uchar *Data);
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+virtual bool GetTSPacket(uchar *&amp;Data);
+<!--X1.1.9--></td></tr></table>
 </pre></td></tr></table><p>
 
-which allow VDR to set the PIDs that shall be recorded, set up the device fro
+which allow VDR to set the PIDs that shall be recorded, set up the device for
 recording (and shut it down again), and receive the MPEG data stream. The data
 must be delivered in the form of a Transport Stream (TS), which consists of
 packets that are all 188 bytes in size. Each call to <tt>GetTSPacket()</tt>
@@ -1226,7 +1230,7 @@
 <p>
 The functions to implement replaying capabilites are
 
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1250,7 +1254,7 @@
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p>
 <b>On Screen Display</b>
 <p>
diff --git a/PLUGINS/SRC/status/Makefile b/PLUGINS/SRC/status/Makefile
index 2d5a0e7c1..8cdb9fca5 100644
--- a/PLUGINS/SRC/status/Makefile
+++ b/PLUGINS/SRC/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2002/06/10 16:24:09 kls Exp $
+# $Id: Makefile 1.2 2002/08/28 19:30:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 
-package: clean
+dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/channels.conf b/channels.conf
index ba58bc686..09cf433b0 100644
--- a/channels.conf
+++ b/channels.conf
@@ -7,7 +7,7 @@ BR3:11837:h:0:27500:201:202:204:0:28107
 Hessen-3:11837:h:0:27500:301:302:304:0:28108
 N3:12110:h:0:27500:2401:2402:2404:0:28224
 SR3:11837:h:0:27500:501:502:504:0:28110
-WDR:11837:h:0:27500:601:602:604:0:28111
+WDR:11837:h:0:27500:601:602:0:0:28111
 BR-alpha:11837:h:0:27500:701:702:704:0:28112
 SWR BW:11837:h:0:27500:801:802:804:0:28113
 Phoenix:11837:h:0:27500:901:902:904:0:28114
@@ -24,7 +24,7 @@ Super RTL:12188:h:0:27500:165:120:65:0:12040
 VOX:12188:h:0:27500:167:136:0:0:12060
 DW TV:10788:v:0:22000:305:306:0:0:8905
 Kabel 1:12480:v:0:27500:511:512:33:0:899
-Neun Live:12480:v:0:27500:767:768:35:0:897
+Neun Live:12480:v:0:27500:767:768:0:0:897
 DSF:12480:v:0:27500:1023:1024:0:0:900
 HOT:12480:v:0:27500:1279:1280:0:0:40
 Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
@@ -46,7 +46,7 @@ MDR:12110:h:0:27500:401:402:404:0:28204
 NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
 ORB:12110:h:0:27500:501:502:504:0:28205
 B1:12110:h:0:27500:601:602:604:0:28206
-ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
+ARD Online-Kanal:12722:h:0:22000:700:701:0:0:0
 :Premiere World
 Premiere Start:11797:h:0:27500:255:256:0:101:8
 Premiere 1:11797:h:0:27500:511:512,513;515:0:101:10
@@ -78,7 +78,7 @@ Premiere Direkt 2B:11719:h:0:27500:767:768;769:0:101:181
 Premiere Direkt 3A:11719:h:0:27500:511:512;515:0:101:180
 Premiere Direkt 3B:11719:h:0:27500:1279:1280;1283:0:101:183
 Premiere Direkt 4A:12031:h:0:27500:2815:2816:0:101:18
-:#Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
+Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
 :PW Erotic
 Beate-Uhse.TV:11758:h:0:27500:1023:1024:0:101:21
 Premiere Erotik 1:12031:h:0:27500:1279:1280:0:101:513
@@ -89,11 +89,11 @@ Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
 Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
 Premiere Sport 2:12031:h:0:27500:3839:3840:0:101:27
 :Formel 1
-:#Supersignal:12070:h:0:27500:255:256:0:101:211
-:#Cockpitkanal:12070:h:0:27500:511:512:0:101:212
-:#Boxengasse:12070:h:0:27500:767:768:0:101:213
-:#Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
-:#Infokanal:12070:h:0:27500:1279:1280:0:101:215
+Supersignal:12070:h:0:27500:255:256:0:101:211
+Cockpitkanal:12070:h:0:27500:511:512:0:101:212
+Boxengasse:12070:h:0:27500:767:768:0:101:213
+Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
+Infokanal:12070:h:0:27500:1279:1280:0:101:215
 Multikanal:11720:h:0:27500:255:256:0:101:17
 :Beta Digital
 N24:12480:v:0:27500:2047:2048:0:0:47
@@ -111,7 +111,7 @@ BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
 BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
 BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
 :
-:#TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
+TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
 Andalucia TV:11934:v:0:27500:166:104:0:0:29011
 TVC Internacional:11934:v:0:27500:167:108:0:0:0
diff --git a/config.c b/config.c
index 5929b506c..15d645d03 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.104 2002/08/11 11:35:18 kls Exp $
+ * $Id: config.c 1.105 2002/09/04 13:45:56 kls Exp $
  */
 
 #include "config.h"
@@ -293,30 +293,6 @@ bool cChannel::Save(FILE *f)
   return fprintf(f, ToText()) > 0;
 }
 
-bool cChannel::Switch(cDevice *Device, bool Log)
-{
-  if (!Device)
-     Device = cDevice::PrimaryDevice();
-  if (!(Device->IsPrimaryDevice() && Device->Receiving()) && !groupSep) {
-     if (Log)
-        isyslog("switching to channel %d", number);
-     for (int i = 3; i--;) {
-         switch (Device->SetChannel(this)) {
-           case scrOk:         return true;
-           case scrNoTransfer: if (Interface)
-                                  Interface->Error(tr("Can't start Transfer Mode!"));
-                               return false;
-           case scrFailed:     break; // loop will retry
-           }
-         esyslog("retrying");
-         }
-     return false;
-     }
-  if (Device->IsPrimaryDevice() && Device->Receiving())
-     Interface->Error(tr("Channel locked (recording)!"));
-  return false;
-}
-
 // -- cTimer -----------------------------------------------------------------
 
 char *cTimer::buffer = NULL;
@@ -836,10 +812,10 @@ cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
   return NULL;
 }
 
-bool cChannels::SwitchTo(int Number, cDevice *Device)
+bool cChannels::SwitchTo(int Number)
 {
   cChannel *channel = GetByNumber(Number);
-  return channel && channel->Switch(Device);
+  return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
 }
 
 const char *cChannels::GetChannelNameByNumber(int Number)
@@ -944,7 +920,7 @@ bool cSetupLine::operator< (const cListObject &ListObject)
 {
   const cSetupLine *sl = (cSetupLine *)&ListObject;
   if (!plugin && !sl->plugin)
-     return strcasecmp(name, sl->name) < 0; 
+     return strcasecmp(name, sl->name) < 0;
   if (!plugin)
      return true;
   if (!sl->plugin)
diff --git a/config.h b/config.h
index fe8a1155b..bbc006ba4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.124 2002/08/24 10:23:48 kls Exp $
+ * $Id: config.h 1.126 2002/09/04 11:04:55 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.8"
+#define VDRVERSION "1.1.9"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -119,7 +119,6 @@ class cChannel : public cListObject {
   const char *ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
-  bool Switch(cDevice *Device = NULL, bool Log = true);
   };
 
 enum eTimerActive { taInactive = 0,
@@ -198,6 +197,8 @@ class cSVDRPhost : public cListObject {
   bool Accepts(in_addr_t Address);
   };
 
+#define CACONFBASE 100
+
 class cCaDefinition : public cListObject {
 private:
   int number;
@@ -296,7 +297,7 @@ class cChannels : public cConfig<cChannel> {
   cChannel *GetByNumber(int Number);
   cChannel *GetByServiceID(unsigned short ServiceId);
   const char *GetChannelNameByNumber(int Number);
-  bool SwitchTo(int Number, cDevice *Device = NULL);
+  bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
   };
 
diff --git a/device.c b/device.c
index 48f5d40fb..72f1fc632 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.13 2002/08/25 09:16:51 kls Exp $
+ * $Id: device.c 1.19 2002/09/08 14:03:43 kls Exp $
  */
 
 #include "device.h"
@@ -12,11 +12,14 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include "eit.h"
+#include "i18n.h"
 #include "player.h"
 #include "receiver.h"
 #include "status.h"
 #include "transfer.h"
 
+// --- cDevice ---------------------------------------------------------------
+
 // The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -2
 
@@ -27,6 +30,7 @@
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
 int cDevice::nextCardIndex = 0;
+int cDevice::currentChannel = 0;
 cDevice *cDevice::device[MAXDEVICES] = { NULL };
 cDevice *cDevice::primaryDevice = NULL;
 
@@ -38,8 +42,6 @@ cDevice::cDevice(void)
 
   active = false;
 
-  currentChannel = 0;
-
   mute = false;
   volume = Setup.CurrentVolume;
 
@@ -101,46 +103,44 @@ bool cDevice::SetPrimaryDevice(int n)
   return false;
 }
 
-bool cDevice::CanBeReUsed(int Frequency, int Vpid)
+bool cDevice::HasDecoder(void) const
 {
   return false;
 }
 
-bool cDevice::HasDecoder(void) const
+cOsdBase *cDevice::NewOsd(int x, int y)
 {
-  return false;
+  return NULL;
 }
 
-cOsdBase *cDevice::NewOsd(int x, int y)
+cSpuDecoder *cDevice::GetSpuDecoder(void)
 {
   return NULL;
 }
 
-cDevice *cDevice::GetDevice(int Ca, int Priority, int Frequency, int Vpid, bool *ReUse)
+cDevice *cDevice::GetDevice(int Index)
+{
+  return (0 <= Index && Index < numDevices) ? device[Index] : NULL;
+}
+
+cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
-  if (ReUse)
-     *ReUse = false;
   cDevice *d = NULL;
-  int Provides[MAXDEVICES];
-  // Check which devices provide Ca:
   for (int i = 0; i < numDevices; i++) {
-      if ((Provides[i] = device[i]->ProvidesCa(Ca)) != 0) { // this device is basicly able to do the job
-         //XXX+ dsyslog("GetDevice: %d %d %d %5d %5d", i, device[i]->HasDecoder(), device[i]->Receiving(), Frequency, device[i]->frequency);//XXX
-         if (device[i]->CanBeReUsed(Frequency, Vpid)) {
-            d = device[i];
-            if (ReUse)
-               *ReUse = true;
-            break;
-            }
-         if (Priority > device[i]->Priority() // Priority is high enough to use this device
-            && (!d // we don't have a device yet, or...
-               || device[i]->Priority() < d->Priority() // ...this one has an even lower Priority
-               || (device[i]->Priority() == d->Priority() // ...same Priority...
-                  && Provides[i] < Provides[d->CardIndex()] // ...but this one provides fewer Ca values
+      bool ndr;
+      if (device[i]->ProvidesChannel(Channel, Priority, &ndr) // this device is basicly able to do the job
+         && (!d // we don't have a device yet, or...
+            || (device[i]->Receiving() && !ndr) // ...this one is already receiving and allows additional receivers, or...
+            || !d->Receiving() // ...the one we have is not receiving...
+               && (device[i]->Priority() < d->Priority() // ...this one has an even lower Priority, or...
+                  || device[i]->Priority() == d->Priority() // ...same Priority...
+                     && device[i]->ProvidesCa(Channel->ca) < d->ProvidesCa(Channel->ca) // ...but this one provides fewer Ca values
                   )
-               )
             )
-            d = device[i];
+         ) {
+         d = device[i];
+         if (NeedsDetachReceivers)
+            *NeedsDetachReceivers = ndr;
          }
       }
   /*XXX+ too complex with multiple recordings per device
@@ -189,9 +189,18 @@ void cDevice::SetVideoFormat(bool VideoFormat16_9)
 {
 }
 
-//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); } //XXX+
+//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
 #define PRINTPIDS(s)
 
+bool cDevice::HasPid(int Pid)
+{
+  for (int i = 0; i < MAXPIDHANDLES; i++) {
+      if (pidHandles[i].pid == Pid)
+         return true;
+      }
+  return false;
+}
+
 bool cDevice::AddPid(int Pid, ePidType PidType)
 {
   if (Pid) {
@@ -207,10 +216,10 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
         // The Pid is already in use
         if (++pidHandles[n].used == 2 && n <= ptTeletext) {
            // It's a special PID that may have to be switched into "tap" mode
-           PRINTPIDS("A");//XXX+
+           PRINTPIDS("A");
            return SetPid(&pidHandles[n], n, true);
            }
-        PRINTPIDS("a");//XXX+
+        PRINTPIDS("a");
         return true;
         }
      else if (PidType < ptOther) {
@@ -226,7 +235,7 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
      if (n >= 0) {
         pidHandles[n].pid = Pid;
         pidHandles[n].used = 1;
-        PRINTPIDS("C");//XXX+
+        PRINTPIDS("C");
         return SetPid(&pidHandles[n], n, true);
         }
      }
@@ -238,14 +247,15 @@ void cDevice::DelPid(int Pid)
   if (Pid) {
      for (int i = 0; i < MAXPIDHANDLES; i++) {
          if (pidHandles[i].pid == Pid) {
+            PRINTPIDS("D");
             if (--pidHandles[i].used < 2) {
                SetPid(&pidHandles[i], i, false);
                if (pidHandles[i].used == 0) {
-                   pidHandles[i].handle = -1;
-                   pidHandles[i].pid = 0;
-                   }
+                  pidHandles[i].handle = -1;
+                  pidHandles[i].pid = 0;
+                  }
                }
-            PRINTPIDS("D");//XXX+
+            PRINTPIDS("E");
             }
          }
      }
@@ -256,20 +266,66 @@ bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return false;
 }
 
-eSetChannelResult cDevice::SetChannel(const cChannel *Channel)
+bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
-  cStatus::MsgChannelSwitch(this, 0);
+  return false;
+}
 
-  StopReplay();
+bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
+{
+  if (LiveView)
+     isyslog("switching to channel %d", Channel->number);
+  for (int i = 3; i--;) {
+      switch (SetChannel(Channel, LiveView)) {
+        case scrOk:           return true;
+        case scrNotAvailable: return false;
+        case scrNoTransfer:   if (Interface)
+                                 Interface->Error(tr("Can't start Transfer Mode!"));
+                              return false;
+        case scrFailed:       break; // loop will retry
+        }
+      esyslog("retrying");
+      }
+  return false;
+}
 
-  // Must set this anyway to avoid getting stuck when switching through
-  // channels with 'Up' and 'Down' keys:
-  currentChannel = Channel->number;
+bool cDevice::SwitchChannel(int Direction)
+{
+  bool result = false;
+  Direction = sgn(Direction);
+  if (Direction) {
+     int n = CurrentChannel() + Direction;
+     int first = n;
+     for (;;) {
+         cChannel *channel = Channels.GetByNumber(n);
+         if (!channel)
+            break;
+         if (PrimaryDevice()->SwitchChannel(channel, true)) {
+            result = true;
+            break;
+            }
+         n += Direction;
+         }
+     int d = n - first;
+     if (abs(d) == 1)
+        dsyslog("skipped channel %d", first);
+     else if (d)
+        dsyslog("skipped channels %d..%d", first, n - sgn(d));
+     }
+  return result;
+}
+
+eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
+{
+  cStatus::MsgChannelSwitch(this, 0);
+
+  if (LiveView)
+     StopReplay();
 
   // If this card can't receive this channel, we must not actually switch
   // the channel here, because that would irritate the driver when we
   // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (IsPrimaryDevice() && !ProvidesCa(Channel->ca));
+  bool NeedsTransferMode = (LiveView && IsPrimaryDevice() && !ProvidesChannel(Channel, Setup.PrimaryLimit));
 
   eSetChannelResult Result = scrOk;
 
@@ -277,24 +333,30 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel)
   // use the card that actually can receive it and transfer data from there:
 
   if (NeedsTransferMode) {
-     cDevice *CaDevice = GetDevice(Channel->ca, 0);
-     if (CaDevice && !CaDevice->Receiving() && CaDevice->SetChannel(Channel) == scrOk)
-        cControl::Launch(new cTransferControl(CaDevice, Channel->vpid, Channel->apid1, 0, 0, 0));//XXX+
+     cDevice *CaDevice = GetDevice(Channel, 0);
+     if (CaDevice) {
+        if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
+           cControl::Launch(new cTransferControl(CaDevice, Channel->vpid, Channel->apid1, 0, 0, 0));//XXX+
+        else
+           Result = scrNoTransfer;
+        }
      else
-        Result = scrNoTransfer;
+        Result = scrNotAvailable;
      }
-  else if (!SetChannelDevice(Channel))
+  else if (!SetChannelDevice(Channel, LiveView))
      Result = scrFailed;
 
-  if (IsPrimaryDevice())
+  if (Result == scrOk && LiveView && IsPrimaryDevice()) {
      cSIProcessor::SetCurrentServiceID(Channel->pnr);
+     currentChannel = Channel->number;
+     }
 
   cStatus::MsgChannelSwitch(this, Channel->number);
 
   return Result;
 }
 
-bool cDevice::SetChannelDevice(const cChannel *Channel)
+bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
   return false;
 }
@@ -357,10 +419,6 @@ bool cDevice::Replaying(void)
 
 bool cDevice::AttachPlayer(cPlayer *Player)
 {
-  if (Receiving()) {
-     esyslog("ERROR: attempt to attach a cPlayer while receiving on device %d - ignored", CardIndex() + 1);
-     return false;
-     }
   if (HasDecoder()) {
      if (player)
         Detach(player);
@@ -419,9 +477,7 @@ int cDevice::PlayAudio(const uchar *Data, int Length)
 
 int cDevice::Priority(void)
 {
-  if (IsPrimaryDevice() && !Receiving())
-     return Setup.PrimaryLimit - 1;
-  int priority = DEFAULTPRIORITY;
+  int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i])
          priority = max(receiver[i]->priority, priority);
@@ -497,15 +553,13 @@ void cDevice::Action(void)
   dsyslog("receiver thread started on device %d (pid=%d)", CardIndex() + 1, getpid());
 
   if (OpenDvr()) {
-     uchar b[TS_SIZE];
      time_t t = time(NULL);
      active = true;
      for (; active;) {
          // Read data from the DVR device:
-         int r = GetTSPacket(b);
-         if (r == TS_SIZE) {
-            if (*b == TS_SYNC_BYTE) {
-               // We're locked on to a TS packet
+         uchar *b = NULL;
+         if (GetTSPacket(b)) {
+            if (b) {
                int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
                // Distribute the packet to all attached receivers:
                Lock();
@@ -514,12 +568,10 @@ void cDevice::Action(void)
                       receiver[i]->Receive(b, TS_SIZE);
                    }
                Unlock();
+               t = time(NULL);
                }
-            t = time(NULL);
             }
-         else if (r > 0)
-            esyslog("ERROR: got incomplete TS packet (%d bytes) on device %d", r, CardIndex() + 1);//XXX+ TODO do we have to read the rest???
-         else if (r < 0)
+         else
             break;
 
          //XXX+ put this into the recorder??? or give the receiver a flag whether it wants this?
@@ -544,19 +596,17 @@ void cDevice::CloseDvr(void)
 {
 }
 
-int cDevice::GetTSPacket(uchar *Data)
+bool cDevice::GetTSPacket(uchar *&Data)
 {
-  return -1;
+  return false;
 }
 
 bool cDevice::AttachReceiver(cReceiver *Receiver)
 {
-  //XXX+ check for same transponder???
   if (!Receiver)
      return false;
   if (Receiver->device == this)
      return true;
-  StopReplay();
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
          for (int n = 0; n < MAXRECEIVEPIDS; n++)
@@ -597,3 +647,85 @@ void cDevice::Detach(cReceiver *Receiver)
      Cancel(3);
      }
 }
+
+// --- cTSBuffer -------------------------------------------------------------
+
+cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
+{
+  f = File;
+  size = Size / TS_SIZE * TS_SIZE;
+  cardIndex = CardIndex;
+  tsRead = tsWrite = 0;
+  buf = (f >= 0 && size >= TS_SIZE) ? MALLOC(uchar, size + TS_SIZE) : NULL;
+  // the '+ TS_SIZE' allocates some extra space for handling packets that got split by a buffer roll-over
+  firstRead = true;
+}
+
+cTSBuffer::~cTSBuffer()
+{
+  free(buf);
+}
+
+int cTSBuffer::Read(void)
+{
+  if (buf) {
+     cPoller Poller(f, false);
+     bool repeat;
+     int total = 0;
+     do {
+        repeat = false;
+        if (firstRead || Used() > TS_SIZE || Poller.Poll(100)) { // only wait if there's not enough data in the buffer
+           firstRead = false;
+           if (tsRead == tsWrite)
+              tsRead = tsWrite = 0; // keep the maximum buffer space available
+           if (tsWrite >= size && tsRead > 0)
+              tsWrite = 0;
+           int free = tsRead <= tsWrite ? size - tsWrite : tsRead - tsWrite - 1;
+           if (free > 0) {
+              int r = read(f, buf + tsWrite, free);
+              if (r > 0) {
+                 total += r;
+                 tsWrite += r;
+                 if (tsWrite >= size && tsRead > 0) {
+                    tsWrite = 0;
+                    repeat = true; // read again after a boundary roll-over
+                    }
+                 }
+              }
+           }
+        } while (repeat);
+     return total;
+     }
+  return -1;
+}
+
+uchar *cTSBuffer::Get(void)
+{
+  if (Used() >= TS_SIZE) {
+     uchar *p = buf + tsRead;
+     if (*p != TS_SYNC_BYTE) {
+        esyslog("ERROR: not sync'ed to TS packet on device %d", cardIndex);
+        int tsMax = tsRead < tsWrite ? tsWrite : size;
+        for (int i = tsRead; i < tsMax; i++) {
+            if (buf[i] == TS_SYNC_BYTE) {
+               esyslog("ERROR: skipped %d bytes to sync on TS packet on device %d", i - tsRead, cardIndex);
+               tsRead = i;
+               return NULL;
+               }
+            }
+        if ((tsRead = tsMax) >= size)
+           tsRead = 0;
+        return NULL;
+        }
+     if (tsRead + TS_SIZE > size) {
+        // the packet rolled over the buffer boundary, so let's fetch the rest from the beginning (which MUST be there, since Used() >= TS_SIZE)
+        int rest = TS_SIZE - (size - tsRead);
+        memcpy(buf + size, buf, rest);
+        tsRead = rest;
+        }
+     else if ((tsRead += TS_SIZE) >= size)
+        tsRead = 0;
+     return p;
+     }
+  return NULL;
+}
diff --git a/device.h b/device.h
index 5f62417a0..0d10793f1 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.10 2002/08/25 09:16:34 kls Exp $
+ * $Id: device.h 1.16 2002/09/08 14:56:21 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -24,11 +24,12 @@
 #define TS_SYNC_BYTE     0x47
 #define PID_MASK_HI      0x1F
 
-enum eSetChannelResult { scrOk, scrNoTransfer, scrFailed };
+enum eSetChannelResult { scrOk, scrNotAvailable, scrNoTransfer, scrFailed };
 
-enum ePlayMode { pmNone,       // audio/video from decoder
-                 pmAudioVideo, // audio/video from player
-                 pmAudioOnly,  // audio only from player, video from decoder
+enum ePlayMode { pmNone,           // audio/video from decoder
+                 pmAudioVideo,     // audio/video from player
+                 pmAudioOnly,      // audio only from player, video from decoder
+                 pmAudioOnlyBlack, // audio only from player, no video (black screen)
                  pmExtern_THIS_SHOULD_BE_AVOIDED
                  // external player (e.g. MPlayer), release the device
                  // WARNING: USE THIS MODE ONLY AS A LAST RESORT, IF YOU
@@ -47,6 +48,7 @@ class cOsdBase;
 class cChannel;
 class cPlayer;
 class cReceiver;
+class cSpuDecoder;
 
 class cDevice : cThread {
 private:
@@ -69,19 +71,13 @@ class cDevice : cThread {
          // 1...numDevices) and returns true if this was possible.
   static cDevice *PrimaryDevice(void) { return primaryDevice; }
          // Returns the primary device.
-  static cDevice *GetDevice(int Ca, int Priority, int Frequency = 0, int Vpid = 0, bool *ReUse = NULL);
-         // Selects a free device, avoiding the primaryDevice if possible.
-         // If Ca is not 0, the device with the given number will be returned
-         // in case Ca is <= MAXDEVICES, or the device that provides the given
-         // value in its caCaps.
-         // If there is a device that is already receiving and can be re-used to
-         // receive another data stream, that device will be returned.
-         // If all devices are currently receiving, the one receiving with the
-         // lowest priority (if any) that is lower than the given Priority
-         // will be returned.
-         // If ReUse is given, the caller will be informed whether the device can be re-used
-         // for a new recording. If ReUse returns 'true', the caller must NOT switch the channel
-         // (the device is already properly tuned). Otherwise the caller MUST switch the channel.
+  static cDevice *GetDevice(int Index);
+         // Returns the device with the Index (if Index is in the range
+         // 0..numDevices-1, NULL otherwise).
+  static cDevice *GetDevice(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+         // Returns a device that is able to receive the given Channel at the
+         // given Priority (see ProvidesChannel() for more information on how
+         // priorities are handled, and the meaning of NeedsDetachReceivers).
   static void SetCaCaps(int Index = -1);
          // Sets the CaCaps of the given device according to the Setup data.
          // By default the CaCaps of all devices are set.
@@ -115,18 +111,13 @@ class cDevice : cThread {
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
-  virtual int ProvidesCa(int Ca);
-         //XXX TODO temporarily made this function virtual - until a general
-         //XXX      mechanism has been implemented
+  int ProvidesCa(int Ca);
          // Checks whether this device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
          // value is provided, and > 1 if this and other values are provided.
          // If the given value is equal to the number of this device,
          // 1 is returned. If it is 0 (FTA), 1 plus the number of other values
          // in caCaps is returned.
-  virtual bool CanBeReUsed(int Frequency, int Vpid);//XXX TODO make it more abstract
-         // Tells whether this device is already receiving and allows another
-         // receiver with the given settings to be attached to it.
   virtual bool HasDecoder(void) const;
          // Tells whether this device has an MPEG decoder.
 
@@ -139,20 +130,46 @@ class cDevice : cThread {
          // of the OSD at the given coordinates. If a derived cDevice doesn't
          // implement this function, NULL will be returned by default (which
          // means the device has no OSD capabilities).
+  virtual cSpuDecoder *GetSpuDecoder(void);
+         // Returns a pointer to the device's SPU decoder (or NULL, if this
+         // device doesn't have an SPU decoder).
 
 // Channel facilities
 
 protected:
-  int currentChannel;
+  static int currentChannel;
 public:
-  eSetChannelResult SetChannel(const cChannel *Channel);
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+         // Returns true if this device can provide the given channel.
+         // In case the device has cReceivers attached to it or it is the primary
+         // device, Priority is used to decide whether the caller's request can
+         // be honored.
+         // The special Priority value -1 will tell the caller whether this device
+         // is principally able to provide the given Channel, regardless of any
+         // attached cReceivers.
+         // If NeedsDetachReceivers is given, the resulting value in it will tell the
+         // caller whether or not it will have to detach any currently attached
+         // receivers from this device before calling SwitchChannel. Note
+         // that the return value in NeedsDetachReceivers is only meaningful if the
+         // function itself actually returns true.
+         // The default implementation always returns false, so a derived cDevice
+         // class that can provide channels must implement this function.
+  bool SwitchChannel(const cChannel *Channel, bool LiveView);
+         // Switches the device to the given Channel, initiating transfer mode
+         // if necessary.
+  static bool SwitchChannel(int Direction);
+         // Switches the primary device to the next available channel in the given
+         // Direction (only the sign of Direction is evaluated, positive values
+         // switch to higher channel numbers).
+private:
+  eSetChannelResult SetChannel(const cChannel *Channel, bool LiveView);
          // Sets the device to the given channel (general setup).
-  virtual bool SetChannelDevice(const cChannel *Channel);
+protected:
+  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
          // Sets the device to the given channel (actual physical setup).
-  static int CurrentChannel(void) { return primaryDevice ? primaryDevice->currentChannel : 0; }
+public:
+  static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          // Returns the number of the current channel on the primary device.
-  int Channel(void) { return currentChannel; }
-         // Returns the number of the current channel on this device.
 
 // PID handle facilities
 
@@ -169,6 +186,8 @@ class cDevice : cThread {
     cPidHandle(void) { pid = used = 0; handle = -1; }
     };
   cPidHandle pidHandles[MAXPIDHANDLES];
+  bool HasPid(int Pid);
+         // Returns true if this device is currently receiving the given PID.
   bool AddPid(int Pid, ePidType PidType = ptOther);
          // Adds a PID to the set of PIDs this device shall receive.
   void DelPid(int Pid);
@@ -263,23 +282,24 @@ class cDevice : cThread {
 private:
   cReceiver *receiver[MAXRECEIVERS];
   int ca;
+  int CanShift(int Ca, int Priority, int UsedCards = 0);
+protected:
   int Priority(void);
       // Returns the priority of the current receiving session (0..MAXPRIORITY),
       // or -1 if no receiver is currently active. The primary device will
       // always return at least Setup.PrimaryLimit-1.
-  int CanShift(int Ca, int Priority, int UsedCards = 0);
-protected:
   virtual bool OpenDvr(void);
       // Opens the DVR of this device and prepares it to deliver a Transport
       // Stream for use in a cReceiver.
   virtual void CloseDvr(void);
       // Shuts down the DVR.
-  virtual int GetTSPacket(uchar *Data);
-      // Gets exactly one TS packet from the DVR of this device and copies it
-      // into the given memory area (which is exactly 188 bytes in size).
-      // Returns the number of bytes copied into Data (which must be 188).
-      // If there is currently no TS packet available, 0 should be returned.
-      // In case of a non recoverable error, returns -1.
+  virtual bool GetTSPacket(uchar *&Data);
+      // Gets exactly one TS packet from the DVR of this device and returns
+      // a pointer to it in Data. Only the first 188 bytes (TS_SIZE) Data
+      // points to are valid and may be accessed. If there is currently no
+      // new data available, Data will be set to NULL. The function returns
+      // false in case of a non recoverable error, otherwise it returns true,
+      // even if Data is NULL.
 public:
   int  Ca(void) { return ca; }
        // Returns the ca of the current receiving session.
@@ -291,4 +311,29 @@ class cDevice : cThread {
        // Detaches the given receiver from this device.
   };
 
+// Derived cDevice classes that can receive channels will have to provide
+// Transport Stream (TS) packets one at a time. cTSBuffer implements a
+// simple buffer that allows the device to read a larger amount of data
+// from the driver with each call to Read(), thus avoiding the overhead
+// of getting each TS packet separately from the driver. It also makes
+// sure the returned data points to a TS packet and automatically
+// re-synchronizes after broken packet.
+
+class cTSBuffer {
+private:
+  int f;
+  int size;
+  int cardIndex;
+  int tsRead;
+  int tsWrite;
+  uchar *buf;
+  bool firstRead;
+  int Used(void) { return tsRead <= tsWrite ? tsWrite - tsRead : size - tsRead + tsWrite; }
+public:
+  cTSBuffer(int File, int Size, int CardIndex);
+  ~cTSBuffer();
+  int Read(void);
+  uchar *Get(void);
+  };
+
 #endif //__DEVICE_H
diff --git a/dvbdevice.c b/dvbdevice.c
index 52c7c3ba2..a13011248 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.8 2002/08/25 09:20:53 kls Exp $
+ * $Id: dvbdevice.c 1.13 2002/09/08 15:00:46 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -20,10 +20,12 @@ extern "C" {
 #include <linux/videodev.h>
 #ifdef NEWSTRUCT
 #include <linux/dvb/audio.h>
+#include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
 #else
 #include <ost/audio.h>
+#include <ost/dmx.h>
 #include <ost/sec.h>
 #include <ost/video.h>
 #endif
@@ -35,8 +37,6 @@ extern "C" {
 #include "status.h"
 #include "transfer.h"
 
-#define MAXDVBDEVICES     4
-
 #define DEV_VIDEO         "/dev/video"
 #ifdef NEWSTRUCT
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -80,6 +80,7 @@ cDvbDevice::cDvbDevice(int n)
 {
   frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   siProcessor = NULL;
+  spuDecoder = NULL;
   playMode = pmNone;
 
   // Devices that are present on all card types:
@@ -91,10 +92,10 @@ cDvbDevice::cDvbDevice(int n)
   fd_osd      = DvbOpen(DEV_DVB_OSD,    n, O_RDWR);
   fd_video    = DvbOpen(DEV_DVB_VIDEO,  n, O_RDWR | O_NONBLOCK);
   fd_audio    = DvbOpen(DEV_DVB_AUDIO,  n, O_RDWR | O_NONBLOCK);
-  
+
 #ifndef NEWSTRUCT
   // Devices that are only present on DVB-S cards:
- 
+
   fd_sec      = DvbOpen(DEV_DVB_SEC,      n, O_RDWR);
 #endif
 
@@ -128,6 +129,7 @@ cDvbDevice::cDvbDevice(int n)
 
 cDvbDevice::~cDvbDevice()
 {
+  delete spuDecoder;
   delete siProcessor;
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
@@ -179,15 +181,6 @@ void cDvbDevice::MakePrimaryDevice(bool On)
   cDvbOsd::SetDvbDevice(On ? this : NULL);
 }
 
-bool cDvbDevice::CanBeReUsed(int Frequency, int Vpid)
-{
-  return Receiving() // to be reused the DVB device must already be receiving...
-      && frequency == Frequency // ...and tuned to the requested frequency...
-      && (!HasDecoder() // ...and either be a "budget card" which can receive multiple channels...
-          || pidHandles[ptVideo].pid == Vpid // ...or be a "full featured card" that's already tuned to the requested video PID
-         );
-}
-
 bool cDvbDevice::HasDecoder(void) const
 {
   return fd_video >= 0 && fd_audio >= 0;
@@ -198,6 +191,13 @@ cOsdBase *cDvbDevice::NewOsd(int x, int y)
   return new cDvbOsd(x, y);
 }
 
+cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
+{
+  if (!spuDecoder && IsPrimaryDevice())
+     spuDecoder = new cDvbSpuDecoder();
+  return spuDecoder;
+}
+
 bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
   int videoDev = DvbOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
@@ -235,10 +235,10 @@ bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int Siz
                mem1[0] = tmp;
                mem1 += 3;
                }
-         
+
            if (Quality < 0)
               Quality = 255; //XXX is this 'best'???
-         
+
            isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
            FILE *f = fopen(FileName, "wb");
            if (f) {
@@ -253,11 +253,11 @@ bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int Siz
                  cinfo.image_height = vm.height;
                  cinfo.input_components = 3;
                  cinfo.in_color_space = JCS_RGB;
-         
+
                  jpeg_set_defaults(&cinfo);
                  jpeg_set_quality(&cinfo, Quality, true);
                  jpeg_start_compress(&cinfo, true);
-         
+
                  int rs = vm.width * 3;
                  JSAMPROW rp[vm.height];
                  for (int k = 0; k < vm.height; k++)
@@ -313,6 +313,14 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
      else {
         CHECK(ioctl(Handle->handle, DMX_STOP));
         if (Handle->used == 0) {
+           dmxPesFilterParams pesFilterParams;
+           memset(&pesFilterParams, 0, sizeof(pesFilterParams));
+           pesFilterParams.pid     = 0x1FFF;
+           pesFilterParams.input   = DMX_IN_FRONTEND;
+           pesFilterParams.output  = DMX_OUT_DECODER;
+           pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
+           pesFilterParams.flags   = DMX_IMMEDIATE_START;
+           CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
            close(Handle->handle);
            Handle->handle = -1;
            return true;
@@ -339,8 +347,56 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
-bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
+bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
+  bool result = false;
+  bool hasPriority = Priority < 0 || Priority > this->Priority();
+  bool needsDetachReceivers = true;
+
+  if (ProvidesCa(Channel->ca)) {
+     if (Receiving()) {
+        if (frequency == Channel->frequency) {
+           needsDetachReceivers = false;
+           if (!HasPid(Channel->vpid)) {
+              if (Channel->ca > CACONFBASE) {
+                 needsDetachReceivers = true;
+                 result = hasPriority;
+                 }
+              else if (!HasDecoder())
+                 result = true; // if it has no decoder it can't be the primary device
+              else {
+#define DVB_DRIVER_VERSION 2002090101 //XXX+
+#define MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT 2002090101
+#ifdef DVB_DRIVER_VERSION
+#if (DVB_DRIVER_VERSION >= MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT)
+                 result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
+#endif
+#else
+#warning "DVB_DRIVER_VERSION not defined - time shift with only one DVB device disabled!"
+#endif
+                 }
+              }
+           else
+              result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
+           }
+        else
+           result = hasPriority;
+        }
+     else
+        result = hasPriority;
+     }
+  if (NeedsDetachReceivers)
+     *NeedsDetachReceivers = needsDetachReceivers;
+  return result;
+}
+
+bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
+{
+#if (DVB_DRIVER_VERSION < MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT)
+  if (HasDecoder())
+     LiveView = true;
+#endif
+
   // Avoid noise while switching:
 
   if (HasDecoder()) {
@@ -357,204 +413,209 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel)
 
   // Turn off current PIDs:
 
-  if (HasDecoder()) {
+  if (HasDecoder() && (LiveView || pidHandles[ptVideo].pid == Channel->vpid)) {
      DelPid(pidHandles[ptVideo].pid);
      DelPid(pidHandles[ptAudio].pid);
      DelPid(pidHandles[ptTeletext].pid);
      DelPid(pidHandles[ptDolby].pid);
      }
 
+  if (frequency != Channel->frequency || Channel->ca > CACONFBASE) { // CA channels can only be decrypted in "live" mode
+
 #ifdef NEWSTRUCT
-  dvb_frontend_parameters Frontend;
+     dvb_frontend_parameters Frontend;
 #else
-  FrontendParameters Frontend;
+     FrontendParameters Frontend;
 #endif
 
-  memset(&Frontend, 0, sizeof(Frontend));
+     memset(&Frontend, 0, sizeof(Frontend));
 
-  switch (frontendType) {
-    case FE_QPSK: { // DVB-S
+     switch (frontendType) {
+       case FE_QPSK: { // DVB-S
 
-         // Frequency offsets:
+            // Frequency offsets:
 
-         unsigned int freq = Channel->frequency;
-         int tone = SEC_TONE_OFF;
+            unsigned int freq = Channel->frequency;
+            int tone = SEC_TONE_OFF;
 
-         if (freq < (unsigned int)Setup.LnbSLOF) {
-            freq -= Setup.LnbFrequLo;
-            tone = SEC_TONE_OFF;
-            }
-         else {
-            freq -= Setup.LnbFrequHi;
-            tone = SEC_TONE_ON;
-            }
+            if (freq < (unsigned int)Setup.LnbSLOF) {
+               freq -= Setup.LnbFrequLo;
+               tone = SEC_TONE_OFF;
+               }
+            else {
+               freq -= Setup.LnbFrequHi;
+               tone = SEC_TONE_ON;
+               }
 
 #ifdef NEWSTRUCT
-         Frontend.frequency = freq * 1000UL;
-         Frontend.inversion = INVERSION_AUTO;
-         Frontend.u.qpsk.symbol_rate = Channel->srate * 1000UL;
-         Frontend.u.qpsk.fec_inner = FEC_AUTO;
+            Frontend.frequency = freq * 1000UL;
+            Frontend.inversion = INVERSION_AUTO;
+            Frontend.u.qpsk.symbol_rate = Channel->srate * 1000UL;
+            Frontend.u.qpsk.fec_inner = FEC_AUTO;
 #else
-         Frontend.Frequency = freq * 1000UL;
-         Frontend.Inversion = INVERSION_AUTO;
-         Frontend.u.qpsk.SymbolRate = Channel->srate * 1000UL;
-         Frontend.u.qpsk.FEC_inner = FEC_AUTO;
+            Frontend.Frequency = freq * 1000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.qpsk.SymbolRate = Channel->srate * 1000UL;
+            Frontend.u.qpsk.FEC_inner = FEC_AUTO;
 #endif
 
-         int volt = (Channel->polarization == 'v' || Channel->polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+            int volt = (Channel->polarization == 'v' || Channel->polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
 
-         // DiSEqC:
+            // DiSEqC:
 
 #ifdef NEWSTRUCT
-         struct dvb_diseqc_master_cmd cmd = { {0xE0, 0x10, 0x38, 0xF0, 0x00, 0x00}, 4};
-         cmd.msg[3] = 0xF0 | (((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0));
-
-         if (Setup.DiSEqC)
-            CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
-         CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
-         if (Setup.DiSEqC) {
-            usleep(15 * 1000);
-            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-            usleep(15 * 1000);
-            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, (Channel->diseqc / 4) % 2 ? SEC_MINI_B : SEC_MINI_A));
-            usleep(15 * 1000);
-            }
-         CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+            struct dvb_diseqc_master_cmd cmd = { {0xE0, 0x10, 0x38, 0xF0, 0x00, 0x00}, 4};
+            cmd.msg[3] = 0xF0 | (((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0));
+
+            if (Setup.DiSEqC)
+               CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
+            CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+            if (Setup.DiSEqC) {
+               usleep(15 * 1000);
+               CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+               usleep(15 * 1000);
+               CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, (Channel->diseqc / 4) % 2 ? SEC_MINI_B : SEC_MINI_A));
+               usleep(15 * 1000);
+               }
+            CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
 #else
-         secCommand scmd;
-         scmd.type = 0;
-         scmd.u.diseqc.addr = 0x10;
-         scmd.u.diseqc.cmd = 0x38;
-         scmd.u.diseqc.numParams = 1;
-         scmd.u.diseqc.params[0] = 0xF0 | ((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
-
-         secCmdSequence scmds;
-         scmds.voltage = volt;
-         scmds.miniCommand = SEC_MINI_NONE;
-         scmds.continuousTone = tone;
-         scmds.numCommands = Setup.DiSEqC ? 1 : 0;
-         scmds.commands = &scmd;
-
-         CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+            secCommand scmd;
+            scmd.type = 0;
+            scmd.u.diseqc.addr = 0x10;
+            scmd.u.diseqc.cmd = 0x38;
+            scmd.u.diseqc.numParams = 1;
+            scmd.u.diseqc.params[0] = 0xF0 | ((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
+
+            secCmdSequence scmds;
+            scmds.voltage = volt;
+            scmds.miniCommand = SEC_MINI_NONE;
+            scmds.continuousTone = tone;
+            scmds.numCommands = Setup.DiSEqC ? 1 : 0;
+            scmds.commands = &scmd;
+
+            CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
 #endif
-         }
-         break;
-    case FE_QAM: { // DVB-C
+            }
+            break;
+       case FE_QAM: { // DVB-C
 
-         // Frequency and symbol rate:
+            // Frequency and symbol rate:
 
 #ifdef NEWSTRUCT
-         Frontend.frequency = Channel->frequency * 1000000UL;
-         Frontend.inversion = INVERSION_AUTO;
-         Frontend.u.qam.symbol_rate = Channel->srate * 1000UL;
-         Frontend.u.qam.fec_inner = FEC_AUTO;
-         Frontend.u.qam.modulation = QAM_64;
+            Frontend.frequency = Channel->frequency * 1000000UL;
+            Frontend.inversion = INVERSION_AUTO;
+            Frontend.u.qam.symbol_rate = Channel->srate * 1000UL;
+            Frontend.u.qam.fec_inner = FEC_AUTO;
+            Frontend.u.qam.modulation = QAM_64;
 #else
-         Frontend.Frequency = Channel->frequency * 1000000UL;
-         Frontend.Inversion = INVERSION_AUTO;
-         Frontend.u.qam.SymbolRate = Channel->srate * 1000UL;
-         Frontend.u.qam.FEC_inner = FEC_AUTO;
-         Frontend.u.qam.QAM = QAM_64;
+            Frontend.Frequency = Channel->frequency * 1000000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.qam.SymbolRate = Channel->srate * 1000UL;
+            Frontend.u.qam.FEC_inner = FEC_AUTO;
+            Frontend.u.qam.QAM = QAM_64;
 #endif
-         }
-         break;
-    case FE_OFDM: { // DVB-T
+            }
+            break;
+       case FE_OFDM: { // DVB-T
 
-         // Frequency and OFDM paramaters:
+            // Frequency and OFDM paramaters:
 
 #ifdef NEWSTRUCT
-         Frontend.frequency = Channel->frequency * 1000UL;
-         Frontend.inversion = INVERSION_AUTO;
-         Frontend.u.ofdm.bandwidth=BANDWIDTH_8_MHZ;
-         Frontend.u.ofdm.code_rate_HP = FEC_2_3;
-         Frontend.u.ofdm.code_rate_LP = FEC_1_2;
-         Frontend.u.ofdm.constellation = QAM_64;
-         Frontend.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
-         Frontend.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
-         Frontend.u.ofdm.hierarchy_information = HIERARCHY_NONE;
+            Frontend.frequency = Channel->frequency * 1000UL;
+            Frontend.inversion = INVERSION_AUTO;
+            Frontend.u.ofdm.bandwidth=BANDWIDTH_8_MHZ;
+            Frontend.u.ofdm.code_rate_HP = FEC_2_3;
+            Frontend.u.ofdm.code_rate_LP = FEC_1_2;
+            Frontend.u.ofdm.constellation = QAM_64;
+            Frontend.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
+            Frontend.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
+            Frontend.u.ofdm.hierarchy_information = HIERARCHY_NONE;
 #else
-         Frontend.Frequency = Channel->frequency * 1000UL;
-         Frontend.Inversion = INVERSION_AUTO;
-         Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
-         Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
-         Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
-         Frontend.u.ofdm.Constellation=QAM_64;
-         Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
-         Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
-         Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
+            Frontend.Frequency = Channel->frequency * 1000UL;
+            Frontend.Inversion = INVERSION_AUTO;
+            Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
+            Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
+            Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
+            Frontend.u.ofdm.Constellation=QAM_64;
+            Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
+            Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
+            Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
 #endif
-         }
-         break;
-    default:
-         esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-         return false;
-    }
+            }
+            break;
+       default:
+            esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+            return false;
+       }
 
 #ifdef NEWSTRUCT
-  // Discard stale events:
+     // Discard stale events:
 
-  for (;;) {
-      dvb_frontend_event event;
-      if (ioctl(fd_frontend, FE_GET_EVENT, &event) < 0)
-         break;
-      }
+     for (;;) {
+         dvb_frontend_event event;
+         if (ioctl(fd_frontend, FE_GET_EVENT, &event) < 0)
+            break;
+         }
 #endif
 
-  // Tuning:
+     // Tuning:
 
-  CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
+     CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
 
-  // Wait for channel lock:
+     // Wait for channel lock:
 
 #ifdef NEWSTRUCT
-  FrontendStatus status = FrontendStatus(0);
-  for (int i = 0; i < 100; i++) {
-      CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
-      if (status & FE_HAS_LOCK)
-         break;
-      usleep(10 * 1000);
-      }
-  if (!(status & FE_HAS_LOCK)) {
-     esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->number, CardIndex() + 1);
-     if (IsPrimaryDevice())
-        cThread::RaisePanic();
-     return false;
-     }
+     FrontendStatus status = FrontendStatus(0);
+     for (int i = 0; i < 100; i++) {
+         CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
+         if (status & FE_HAS_LOCK)
+            break;
+         usleep(10 * 1000);
+         }
+     if (!(status & FE_HAS_LOCK)) {
+        esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->number, CardIndex() + 1);
+        if (IsPrimaryDevice())
+           cThread::RaisePanic();
+        return false;
+        }
 #else
-  if (cFile::FileReady(fd_frontend, 5000)) {
-     FrontendEvent event;
-     if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) {
-        if (event.type != FE_COMPLETION_EV) {
-           esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1);
-           if (IsPrimaryDevice())
-              cThread::RaisePanic();
-           return false;
+     if (cFile::FileReady(fd_frontend, 5000)) {
+        FrontendEvent event;
+        if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) {
+           if (event.type != FE_COMPLETION_EV) {
+              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1);
+              if (IsPrimaryDevice())
+                 cThread::RaisePanic();
+              return false;
+              }
            }
+        else
+           esyslog("ERROR in frontend get event (channel %d, card %d): %m", Channel->number, CardIndex() + 1);
         }
      else
-        esyslog("ERROR in frontend get event (channel %d, card %d): %m", Channel->number, CardIndex() + 1);
-     }
-  else
-     esyslog("ERROR: timeout while tuning on DVB card %d", CardIndex() + 1);
+        esyslog("ERROR: timeout while tuning on DVB card %d", CardIndex() + 1);
 #endif
 
-  frequency = Channel->frequency;
+     frequency = Channel->frequency;
+
+     }
 
   // PID settings:
 
-  if (HasDecoder()) {
-     if (!(AddPid(Channel->vpid, ptVideo) && AddPid(Channel->apid1, ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
-        esyslog("ERROR: failed to set PIDs for channel %d", Channel->number);
-        return false;
+  if (HasDecoder() && (LiveView || Channel->ca > CACONFBASE)) { // CA channels can only be decrypted in "live" mode
+     if (!HasPid(Channel->vpid)) {
+        if (!(AddPid(Channel->vpid, ptVideo) && AddPid(Channel->apid1, ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+           esyslog("ERROR: failed to set PIDs for channel %d", Channel->number);
+           return false;
+           }
+        if (IsPrimaryDevice())
+           AddPid(Channel->tpid, ptTeletext);
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+        CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+        CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
         }
-     if (IsPrimaryDevice())
-        AddPid(Channel->tpid, ptTeletext);
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     }
-
-  if (HasDecoder()) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+     else
+        cControl::Launch(new cTransferControl(this, Channel->vpid, Channel->apid1, 0, 0, 0));
      }
 
   // Start setting system time:
@@ -602,11 +663,12 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
             siProcessor->SetStatus(true);
          break;
     case pmAudioVideo:
+    case pmAudioOnlyBlack:
          if (siProcessor)
             siProcessor->SetStatus(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
          CHECK(ioctl(fd_audio, AUDIO_PLAY));
          CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
          CHECK(ioctl(fd_video, VIDEO_PLAY));
@@ -650,18 +712,30 @@ void cDvbDevice::Clear(void)
 
 void cDvbDevice::Play(void)
 {
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_CONTINUE));
+  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
+     }
+  else {
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     if (fd_video >= 0)
+        CHECK(ioctl(fd_video, VIDEO_CONTINUE));
+     }
 }
 
 void cDvbDevice::Freeze(void)
 {
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_FREEZE));
+  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
+     }
+  else {
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+     if (fd_video >= 0)
+        CHECK(ioctl(fd_video, VIDEO_FREEZE));
+     }
 }
 
 void cDvbDevice::Mute(void)
@@ -699,13 +773,13 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
 
 bool cDvbDevice::Poll(cPoller &Poller, int TimeoutMs)
 {
-  Poller.Add(playMode == pmAudioOnly ? fd_audio : fd_video, true);
+  Poller.Add((playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video, true);
   return Poller.Poll(TimeoutMs);
 }
 
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
-  int fd = playMode == pmAudioOnly ? fd_audio : fd_video;
+  int fd = (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video;
   if (fd >= 0)
      return write(fd, Data, Length);
   return -1;
@@ -721,6 +795,8 @@ bool cDvbDevice::OpenDvr(void)
 {
   CloseDvr();
   fd_dvr = DvbOpen(DEV_DVB_DVR, CardIndex(), O_RDONLY | O_NONBLOCK, true);
+  if (fd_dvr >= 0)
+     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1);
   return fd_dvr >= 0;
 }
 
@@ -729,28 +805,28 @@ void cDvbDevice::CloseDvr(void)
   if (fd_dvr >= 0) {
      close(fd_dvr);
      fd_dvr = -1;
+     delete tsBuffer;
+     tsBuffer = NULL;
      }
 }
 
-int cDvbDevice::GetTSPacket(uchar *Data)
+bool cDvbDevice::GetTSPacket(uchar *&Data)
 {
-  if (fd_dvr >= 0) {
-     cPoller Poller(fd_dvr, false);
-     if (Poller.Poll(100)) {
-        int r = read(fd_dvr, Data, TS_SIZE);
-        if (r >= 0)
-           return r;
-        else if (FATALERRNO) {
-           if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-              esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
-           else {
-              LOG_ERROR;
-              return -1;
-              }
+  if (tsBuffer) {
+     int r = tsBuffer->Read();
+     if (r >= 0) {
+        Data = tsBuffer->Get();
+        return true;
+        }
+     else if (FATALERRNO) {
+        if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
+           esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
+        else {
+           LOG_ERROR;
+           return false;
            }
         }
-     return 0;
+     return true;
      }
-  else
-     return -1;
+  return false;
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index a338399be..b135ff660 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.6 2002/08/25 09:19:34 kls Exp $
+ * $Id: dvbdevice.h 1.10 2002/09/08 14:05:29 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -21,8 +21,11 @@
 #include <ost/frontend.h>
 #endif
 #include "device.h"
+#include "dvbspu.h"
 #include "eit.h"
 
+#define MAXDVBDEVICES  4
+
 class cDvbDevice : public cDevice {
   friend class cDvbOsd;
 private:
@@ -45,20 +48,24 @@ class cDvbDevice : public cDevice {
 public:
   cDvbDevice(int n);
   virtual ~cDvbDevice();
-  virtual bool CanBeReUsed(int Frequency, int Vpid);
   virtual bool HasDecoder(void) const;
 
 // OSD facilities
 
+private:
+  cDvbSpuDecoder *spuDecoder;
 public:
   cOsdBase *NewOsd(int x, int y);
+  virtual cSpuDecoder *GetSpuDecoder(void);
 
 // Channel facilities
 
 private:
   int frequency;
 public:
-  virtual bool SetChannelDevice(const cChannel *Channel);
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+protected:
+  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 
 // PID handle facilities
 
@@ -103,10 +110,12 @@ class cDvbDevice : public cDevice {
 
 // Receiver facilities
 
+private:
+  cTSBuffer *tsBuffer;
 protected:
   virtual bool OpenDvr(void);
   virtual void CloseDvr(void);
-  virtual int GetTSPacket(uchar *Data);
+  virtual bool GetTSPacket(uchar *&Data);
   };
 
 #endif //__DVBDEVICE_H
diff --git a/dvbspu.c b/dvbspu.c
new file mode 100644
index 000000000..1e2985900
--- /dev/null
+++ b/dvbspu.c
@@ -0,0 +1,505 @@
+/*
+ * SPU decoder for DVB devices
+ *
+ * Copyright (C) 2001.2002 Andreas Schultz <aschultz@warp10.net>
+ *
+ * This code is distributed under the terms and conditions of the
+ * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
+ *
+ * parts of this file are derived from the OMS program.
+ *
+ * $Id: dvbspu.c 1.1 2002/09/08 14:17:35 kls Exp $
+ */
+
+#include <assert.h>
+#include <string.h>
+#include <inttypes.h>
+#include <math.h>
+
+#include "osd.h"
+#include "osdbase.h"
+#include "device.h"
+#include "dvbspu.h"
+
+/*
+ * cDvbSpubitmap:
+ *
+ * this is a bitmap of the full screen and two palettes
+ * the normal palette for the background and the highlight palette
+ *
+ * Inputs:
+ *  - a SPU rle encoded image on creation, which will be decoded into
+ *    the full screen indexed bitmap
+ *  
+ * Output:
+ *  - a minimal sized cDvbSpuBitmap a given palette, the indexed bitmap
+ *    will be scanned to get the smallest possible resulting bitmap considering
+ *    transparencies
+ */
+
+// #define SPUDEBUG
+
+#ifdef SPUDEBUG
+#define DEBUG(format, args...) printf (format, ## args)
+#else
+#define DEBUG(format, args...)
+#endif
+
+// --- cDvbSpuPalette----------------------------------
+
+void cDvbSpuPalette::setPalette(const uint32_t * pal)
+{
+    for (int i = 0; i < 16; i++)
+        palette[i] = yuv2rgb(pal[i]);
+}
+
+// --- cDvbSpuBitmap --------------------------------------------
+
+#define setMin(a, b) if (a > b) a = b
+#define setMax(a, b) if (a < b) a = b
+
+#define spuXres   720
+#define spuYres   576
+
+#define revRect(r1, r2) { r1.x1 = r2.x2; r1.y1 = r2.y2; r1.x2 = r2.x1; r1.y2 = r2.y1; }
+
+cDvbSpuBitmap::cDvbSpuBitmap(sDvbSpuRect size,
+                             uint8_t * fodd, uint8_t * eodd,
+                             uint8_t * feven, uint8_t * eeven)
+{
+    if (size.x1 < 0 || size.y1 < 0 || size.x2 >= spuXres
+        || size.y2 >= spuYres)
+        throw;
+
+    bmpsize = size;
+    revRect(minsize[0], size);
+    revRect(minsize[1], size);
+    revRect(minsize[2], size);
+    revRect(minsize[3], size);
+
+    if (!(bmp = new uint8_t[spuXres * spuYres * sizeof(uint8_t)]))
+        throw;
+
+    memset(bmp, 0, spuXres * spuYres * sizeof(uint8_t));
+    putFieldData(0, fodd, eodd);
+    putFieldData(1, feven, eeven);
+}
+
+cDvbSpuBitmap::~cDvbSpuBitmap()
+{
+    delete[]bmp;
+}
+
+cBitmap *cDvbSpuBitmap::getBitmap(const aDvbSpuPalDescr paldescr,
+                                  const cDvbSpuPalette & pal,
+                                  sDvbSpuRect & size) const
+{
+    int h = size.height();
+    int w = size.width();
+
+    if (size.y1 + h >= spuYres)
+        h = spuYres - size.y1 - 1;
+    if (size.x1 + w >= spuXres)
+        w = spuXres - size.x1 - 1;
+
+    if (w & 0x03)
+        w += 4 - (w & 0x03);
+
+    cBitmap *ret = new cBitmap(w, h, 2, true);
+
+    // set the palette
+    for (int i = 0; i < 4; i++) {
+        uint32_t color =
+            pal.getColor(paldescr[i].index, paldescr[i].trans);
+        ret->SetColor(i, (eDvbColor) color);
+    }
+
+    // set the content
+    for (int yp = 0; yp < h; yp++) {
+        for (int xp = 0; xp < w; xp++) {
+            uint8_t idx = bmp[(size.y1 + yp) * spuXres + size.x1 + xp];
+            ret->SetIndex(xp, yp, idx);
+        }
+    }
+    return ret;
+}
+
+// find the minimum non-transparent area
+bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
+                               sDvbSpuRect & size) const
+{
+    bool ret = false;
+    for (int i = 0; i < 4; i++) {
+        if (paldescr[i].trans != 0) {
+            if (!ret)
+                size = minsize[i];
+            else {
+                setMin(size.x1, minsize[i].x1);
+                setMin(size.y1, minsize[i].y1);
+                setMax(size.x2, minsize[i].x2);
+                setMax(size.y2, minsize[i].y2);
+                ret = true;
+            }
+        }
+    }
+    if (ret)
+        DEBUG("MinSize: (%d, %d) x (%d, %d)\n",
+              size.x1, size.y1, size.x2, size.y2);
+
+    return ret;
+}
+
+void cDvbSpuBitmap::putPixel(int xp, int yp, int len, uint8_t colorid)
+{
+    memset(bmp + spuXres * yp + xp, colorid, len);
+    setMin(minsize[colorid].x1, xp);
+    setMin(minsize[colorid].y1, yp);
+    setMax(minsize[colorid].x2, xp + len - 1);
+    setMax(minsize[colorid].y2, yp + len - 1);
+}
+
+static uint8_t getBits(uint8_t * &data, uint8_t & bitf)
+{
+    uint8_t ret = *data;
+    if (bitf)
+        ret >>= 4;
+    else
+        data++;
+    bitf ^= 1;
+
+    return (ret & 0xf);
+}
+
+void cDvbSpuBitmap::putFieldData(int field, uint8_t * data, uint8_t * endp)
+{
+    int xp = bmpsize.x1;
+    int yp = bmpsize.y1 + field;
+    uint8_t bitf = 1;
+
+    while (data < endp) {
+        uint16_t vlc = getBits(data, bitf);
+        if (vlc < 0x0004) {
+            vlc = (vlc << 4) | getBits(data, bitf);
+            if (vlc < 0x0010) {
+                vlc = (vlc << 4) | getBits(data, bitf);
+                if (vlc < 0x0040) {
+                    vlc = (vlc << 4) | getBits(data, bitf);
+                }
+            }
+        }
+
+        uint8_t color = vlc & 0x03;
+        int len = vlc >> 2;
+
+        // if len == 0 -> end sequence - fill to end of line
+        len = len ? : bmpsize.x2 - xp + 1;
+        putPixel(xp, yp, len, color);
+        xp += len;
+
+        if (xp > bmpsize.x2) {
+            // nextLine
+            if (!bitf)
+                data++;
+            bitf = 1;
+            xp = bmpsize.x1;
+            yp += 2;
+            if (yp > bmpsize.y2)
+                return;
+        }
+    }
+}
+
+// --- cDvbSpuDecoder-----------------------------
+
+#define CMD_SPU_MENU            0x00
+#define CMD_SPU_SHOW            0x01
+#define CMD_SPU_HIDE            0x02
+#define CMD_SPU_SET_PALETTE     0x03
+#define CMD_SPU_SET_ALPHA       0x04
+#define CMD_SPU_SET_SIZE        0x05
+#define CMD_SPU_SET_PXD_OFFSET  0x06
+#define CMD_SPU_EOF             0xff
+
+#define spuU32(i)  ((spu[i] << 8) + spu[i+1])
+
+cDvbSpuDecoder::cDvbSpuDecoder()
+{
+    clean = true;
+    scaleMode = eSpuNormal;
+    spu = NULL;
+    osd = NULL;
+    spubmp = NULL;
+}
+
+cDvbSpuDecoder::~cDvbSpuDecoder()
+{
+    delete spubmp;
+    delete spu;
+    delete osd;
+}
+
+void cDvbSpuDecoder::processSPU(uint32_t pts, uint8_t * buf)
+{
+    setTime(pts);
+
+    DEBUG("SPU pushData: pts: %d\n", pts);
+
+    delete spubmp;
+    spubmp = NULL;
+    delete[]spu;
+    spu = buf;
+
+    DCSQ_offset = cmdOffs();
+    prev_DCSQ_offset = 0;
+
+    clean = true;
+}
+
+void cDvbSpuDecoder::setScaleMode(cSpuDecoder::eScaleMode ScaleMode)
+{
+    scaleMode = ScaleMode;
+}
+
+void cDvbSpuDecoder::setPalette(uint32_t * pal)
+{
+    palette.setPalette(pal);
+}
+
+void cDvbSpuDecoder::setHighlight(uint16_t sx, uint16_t sy,
+                                  uint16_t ex, uint16_t ey,
+                                  uint32_t palette)
+{
+    aDvbSpuPalDescr pld;
+    for (int i = 0; i < 4; i++) {
+        pld[i].index = 0xf & (palette >> (16 + 4 * i));
+        pld[i].trans = 0xf & (palette >> (4 * i));
+    }
+
+    bool ne = hlpsize.x1 != sx || hlpsize.y1 != sy ||
+        hlpsize.x2 != ex || hlpsize.y2 != ey ||
+        pld[0] != hlpDescr[0] || pld[1] != hlpDescr[1] ||
+        pld[2] != hlpDescr[2] || pld[3] != hlpDescr[3];
+
+    if (ne) {
+        DEBUG("setHighlight: %d,%d x %d,%d\n", sx, sy, ex, ey);
+        hlpsize.x1 = sx;
+        hlpsize.y1 = sy;
+        hlpsize.x2 = ex;
+        hlpsize.y2 = ey;
+        memcpy(hlpDescr, pld, sizeof(aDvbSpuPalDescr));
+        highlight = true;
+        clean = false;
+    }
+}
+
+void cDvbSpuDecoder::clearHighlight(void)
+{
+    clean &= !highlight;
+    highlight = false;
+}
+
+int cDvbSpuDecoder::ScaleYcoord(int value)
+{
+    if (scaleMode == eSpuLetterBox)
+        return lround((value * 3.0) / 4.0 + 72.0);
+    else
+        return value;
+}
+
+int cDvbSpuDecoder::ScaleYres(int value)
+{
+    if (scaleMode == eSpuLetterBox)
+        return lround((value * 3.0) / 4.0);
+    else
+        return value;
+}
+
+void cDvbSpuDecoder::DrawBmp(sDvbSpuRect & size, cBitmap * bmp)
+{
+    osd->Create(size.x1, size.y1, size.width(), size.height(), 2, false);
+    osd->SetBitmap(size.x1, size.y1, *bmp);
+    delete bmp;
+}
+
+void cDvbSpuDecoder::Draw(void)
+{
+    Hide();
+
+    if (!spubmp)
+        return;
+
+    cBitmap *fg = NULL;
+    cBitmap *bg = NULL;
+    sDvbSpuRect bgsize;
+    sDvbSpuRect hlsize;
+
+    hlsize.x1 = hlpsize.x1;
+    hlsize.y1 = ScaleYcoord(hlpsize.y1);
+    hlsize.x2 = hlpsize.x2;
+    hlsize.y2 = ScaleYcoord(hlpsize.y2);
+
+    if (highlight)
+        fg = spubmp->getBitmap(hlpDescr, palette, hlsize);
+
+    if (spubmp->getMinSize(palDescr, bgsize)) {
+        bg = spubmp->getBitmap(palDescr, palette, bgsize);
+        if (scaleMode == eSpuLetterBox) {
+            // the coordinates have to be modified for letterbox
+            int y1 = ScaleYres(bgsize.y1) + bgsize.height();
+            bgsize.y2 = y1 + bgsize.height();
+            bgsize.y1 = y1;
+        }
+    }
+
+    if (bg || fg) {
+        if (osd == NULL)
+            if ((osd = cOsd::OpenRaw(0, 0)) == NULL) {
+                dsyslog("OpenRaw failed\n");
+                return;
+            }
+
+        if (fg)
+            DrawBmp(hlsize, fg);
+
+        if (bg)
+            DrawBmp(bgsize, bg);
+
+        osd->Flush();
+    }
+
+    clean = true;
+}
+
+void cDvbSpuDecoder::Hide(void)
+{
+    delete osd;
+    osd = NULL;
+}
+
+void cDvbSpuDecoder::Empty(void)
+{
+    Hide();
+
+    delete spubmp;
+    spubmp = NULL;
+
+    delete[]spu;
+    spu = NULL;
+
+    clearHighlight();
+    clean = true;
+}
+
+int cDvbSpuDecoder::setTime(uint32_t pts)
+{
+    if (!spu)
+        return 0;
+
+    if (spu && !clean)
+        Draw();
+
+    while (DCSQ_offset != prev_DCSQ_offset) {   /* Display Control Sequences */
+        int i = DCSQ_offset;
+        state = spNONE;
+
+        uint32_t exec_time = pts + spuU32(i) * 1024;
+        if ((pts != 0) && (exec_time > pts))
+            return 0;
+        DEBUG("offs = %d, rel = %d, time = %d, pts = %d, diff = %d\n",
+              i, spuU32(i) * 1024, exec_time, pts, exec_time - pts);
+
+        if (pts != 0) {
+            uint16_t feven = 0;
+            uint16_t fodd = 0;
+
+            i += 2;
+
+            prev_DCSQ_offset = DCSQ_offset;
+            DCSQ_offset = spuU32(i);
+            DEBUG("offs = %d, DCSQ = %d\n", i, DCSQ_offset);
+            i += 2;
+
+            while (spu[i] != CMD_SPU_EOF) {     // Command Sequence
+                switch (spu[i]) {
+                case CMD_SPU_SHOW:     // show subpicture
+                    DEBUG("\tshow subpicture\n");
+                    state = spSHOW;
+                    i++;
+                    break;
+
+                case CMD_SPU_HIDE:     // hide subpicture
+                    DEBUG("\thide subpicture\n");
+                    state = spHIDE;
+                    i++;
+                    break;
+
+                case CMD_SPU_SET_PALETTE:      // CLUT
+                    palDescr[0].index = spu[i + 2] & 0xf;
+                    palDescr[1].index = spu[i + 2] >> 4;
+                    palDescr[2].index = spu[i + 1] & 0xf;
+                    palDescr[3].index = spu[i + 1] >> 4;
+                    i += 3;
+                    break;
+
+                case CMD_SPU_SET_ALPHA:        // transparency palette
+                    palDescr[0].trans = spu[i + 2] & 0xf;
+                    palDescr[1].trans = spu[i + 2] >> 4;
+                    palDescr[2].trans = spu[i + 1] & 0xf;
+                    palDescr[3].trans = spu[i + 1] >> 4;
+                    i += 3;
+                    break;
+
+                case CMD_SPU_SET_SIZE: // image coordinates
+                    size.x1 = (spu[i + 1] << 4) | (spu[i + 2] >> 4);
+                    size.x2 = ((spu[i + 2] & 0x0f) << 8) | spu[i + 3];
+
+                    size.y1 = (spu[i + 4] << 4) | (spu[i + 5] >> 4);
+                    size.y2 = ((spu[i + 5] & 0x0f) << 8) | spu[i + 6];
+
+                    DEBUG("\t(%d, %d) x (%d, %d)\n",
+                          size.x1, size.y1, size.x2, size.y2);
+                    i += 7;
+                    break;
+
+                case CMD_SPU_SET_PXD_OFFSET:   // image 1 / image 2 offsets
+                    fodd = spuU32(i + 1);
+                    feven = spuU32(i + 3);
+                    DEBUG("\todd = %d even = %d\n", fodd, feven);
+                    i += 5;
+                    break;
+
+                case CMD_SPU_MENU:
+                    DEBUG("\tspu menu\n");
+                    state = spMENU;
+
+                    i++;
+                    break;
+
+                default:
+                    esyslog("invalid sequence in control header (%.2x)\n",
+                            spu[i]);
+                    assert(0);
+                    i++;
+                    break;
+                }
+            }
+            if (fodd != 0 && feven != 0) {
+                delete spubmp;
+                spubmp = new cDvbSpuBitmap(size, spu + fodd, spu + feven,
+                                           spu + feven, spu + cmdOffs());
+            }
+        } else if (!clean)
+            state = spSHOW;
+
+        if (state == spSHOW || state == spMENU)
+            Draw();
+
+        if (state == spHIDE)
+            Hide();
+
+        if (pts == 0)
+            return 0;
+    }
+
+    return 1;
+}
diff --git a/dvbspu.h b/dvbspu.h
new file mode 100644
index 000000000..5ac2d0ac7
--- /dev/null
+++ b/dvbspu.h
@@ -0,0 +1,204 @@
+/*
+ * SPU decoder for DVB devices
+ *
+ * Copyright (C) 2001.2002 Andreas Schultz <aschultz@warp10.net>
+ *
+ * This code is distributed under the terms and conditions of the
+ * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
+ *
+ * parts of this file are derived from the OMS program.
+ *
+ * $Id: dvbspu.h 1.1 2002/09/08 14:17:38 kls Exp $
+ */
+
+#ifndef __DVBSPU_H
+#define __DVBSPU_H
+
+#include <inttypes.h>
+
+#include "osdbase.h"
+#include "spu.h"
+
+typedef struct sDvbSpuPalDescr {
+    uint8_t index;
+    uint8_t trans;
+
+    bool operator != (const sDvbSpuPalDescr pd) const {
+        return index != pd.index && trans != pd.trans;
+    };
+} aDvbSpuPalDescr[4];
+
+typedef struct sDvbSpuRect {
+    int x1, y1;
+    int x2, y2;
+
+    int width() {
+        return x2 - x1 + 1;
+    };
+    int height() {
+        return y2 - y1 + 1;
+    };
+
+    bool operator != (const sDvbSpuRect r) const {
+        return r.x1 != x1 || r.y1 != y1 || r.x2 != x2 || r.y2 != y2;
+    };
+}
+
+sDvbSpuRect;
+
+// --- cDvbSpuPalette----------------------------------
+
+class cDvbSpuPalette {
+  private:
+    uint32_t palette[16];
+
+  private:
+    uint32_t yuv2rgb(uint32_t yuv_color);
+
+  public:
+    void setPalette(const uint32_t * pal);
+    uint32_t getColor(uint8_t idx, uint8_t trans) const;
+};
+
+// --- cDvbSpuBitmap----------------------------------
+
+class cDvbSpuBitmap {
+
+  public:
+  private:
+    sDvbSpuRect bmpsize;
+    sDvbSpuRect minsize[4];
+    uint8_t *bmp;
+
+  private:
+    void putPixel(int xp, int yp, int len, uint8_t colorid);
+    void putFieldData(int field, uint8_t * data, uint8_t * endp);
+
+  public:
+     cDvbSpuBitmap(sDvbSpuRect size,
+                   uint8_t * fodd, uint8_t * eodd,
+                   uint8_t * feven, uint8_t * eeven);
+    ~cDvbSpuBitmap();
+
+    bool getMinSize(const aDvbSpuPalDescr paldescr,
+                    sDvbSpuRect & size) const;
+    cBitmap *getBitmap(const aDvbSpuPalDescr paldescr,
+                       const cDvbSpuPalette & pal,
+                       sDvbSpuRect & size) const;
+};
+
+// --- cDvbSpuDecoder------------------------------------
+
+class cDvbSpuDecoder:public cSpuDecoder {
+  private:
+    cOsdBase * osd;
+
+    // processing state
+    uint8_t *spu;
+    bool clean;
+    bool ready;
+
+    enum spFlag { spNONE, spHIDE, spSHOW, spMENU };
+    spFlag state;
+
+     cSpuDecoder::eScaleMode scaleMode;
+
+    //highligh area
+    bool highlight;
+    sDvbSpuRect hlpsize;
+    aDvbSpuPalDescr hlpDescr;
+
+    //palette
+    cDvbSpuPalette palette;
+
+    // spu info's
+    sDvbSpuRect size;
+    aDvbSpuPalDescr palDescr;
+
+    uint16_t DCSQ_offset;
+    uint16_t prev_DCSQ_offset;
+
+    cDvbSpuBitmap *spubmp;
+  private:
+    int cmdOffs(void) {
+        return ((spu[2] << 8) | spu[3]);
+    };
+    int spuSize(void) {
+        return ((spu[0] << 8) | spu[1]);
+    };
+
+    int ScaleYcoord(int value);
+    int ScaleYres(int value);
+    void DrawBmp(sDvbSpuRect & size, cBitmap * bmp);
+
+    void Draw();
+    void Hide();
+
+  public:
+    cDvbSpuDecoder();
+    ~cDvbSpuDecoder();
+
+    int setTime(uint32_t pts);
+
+    void setScaleMode(cSpuDecoder::eScaleMode ScaleMode);
+    void setPalette(uint32_t * pal);
+    void setHighlight(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey,
+                      uint32_t palette);
+    void clearHighlight(void);
+    void Empty(void);
+    void processSPU(uint32_t pts, uint8_t * buf);
+};
+
+// --- cDvbSpuPalette -------------------------------------------
+
+inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
+{
+    int Y, Cb, Cr;
+    int Ey, Epb, Epr;
+    int Eg, Eb, Er;
+    uint32_t result;
+
+    Y = (yuv_color >> 16) & 0xff;
+    Cb = (yuv_color) & 0xff;
+    Cr = (yuv_color >> 8) & 0xff;
+
+    Ey = (Y - 16);
+    Epb = (Cb - 128);
+    Epr = (Cr - 128);
+    /* ITU-R 709
+       Eg = (298*Ey - 55*Epb - 137*Epr)/256;
+       Eb = (298*Ey + 543*Epb)/256;
+       Er = (298*Ey + 460*Epr)/256;
+     */
+    /* FCC ~= mediaLib */
+    Eg = (298 * Ey - 100 * Epb - 208 * Epr) / 256;
+    Eb = (298 * Ey + 516 * Epb) / 256;
+    Er = (298 * Ey + 408 * Epr) / 256;
+
+    if (Eg > 255)
+        Eg = 255;
+    if (Eg < 0)
+        Eg = 0;
+
+    if (Eb > 255)
+        Eb = 255;
+    if (Eb < 0)
+        Eb = 0;
+
+    if (Er > 255)
+        Er = 255;
+    if (Er < 0)
+        Er = 0;
+
+    result = (Eb << 16) | (Eg << 8) | Er;
+
+    return result;
+}
+
+inline uint32_t cDvbSpuPalette::getColor(uint8_t idx, uint8_t trans) const
+{
+    uint8_t t = trans == 0x0f ? 0xff : trans << 4;
+    return palette[idx] | (t << 24);
+}
+
+#endif                          // __DVBSPU_H
diff --git a/eitscan.c b/eitscan.c
index 7a2000def..069a133d3 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.5 2002/08/11 11:11:39 kls Exp $
+ * $Id: eitscan.c 1.7 2002/09/08 11:08:52 kls Exp $
  */
 
 #include "eitscan.h"
 #include <stdlib.h>
+#include "dvbdevice.h"
 
 cEITScanner::cEITScanner(void)
 {
@@ -49,9 +50,9 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        for (int i = 0; i < MAXDEVICES; i++) {
-            cDevice *Device = cDevice::GetDevice(i + 1, MAXPRIORITY + 1);
-            if (Device) {
+        for (int i = 0; i < cDevice::NumDevices(); i++) {
+            cDevice *Device = cDevice::GetDevice(i);
+            if (Device && Device->CardIndex() < MAXDVBDEVICES) {
                if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
                   if (!(Device->Receiving() || Device->Replaying())) {
                      int oldCh = lastChannel;
@@ -63,12 +64,12 @@ void cEITScanner::Process(void)
                               }
                            cChannel *Channel = Channels.GetByNumber(ch);
                            if (Channel) {
-                              if (Channel->ca <= MAXDEVICES && !Device->ProvidesCa(Channel->ca))
-                                 break; // the channel says it explicitly needs a different card
+                              if (!Device->ProvidesChannel(Channel))
+                                 break;
                               if (Channel->pnr && !TransponderScanned(Channel)) {
                                  if (Device == cDevice::PrimaryDevice() && !currentChannel)
-                                    currentChannel = Device->Channel();
-                                 Channel->Switch(Device, false);
+                                    currentChannel = Device->CurrentChannel();
+                                 Device->SwitchChannel(Channel, false);
                                  lastChannel = ch;
                                  break;
                                  }
@@ -78,6 +79,8 @@ void cEITScanner::Process(void)
                      }
                   }
                }
+            else
+               lastChannel++; // avoid hangup in case the last channel in the list is not provided by a DVB card
             }
         lastScan = time(NULL);
         }
diff --git a/menu.c b/menu.c
index ea10a3619..7d13055d8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.206 2002/08/25 10:56:09 kls Exp $
+ * $Id: menu.c 1.208 2002/09/06 14:07:58 kls Exp $
  */
 
 #include "menu.h"
@@ -508,7 +508,7 @@ eOSState cMenuChannels::Switch(void)
 {
   cChannel *ch = Channels.Get(Current());
   if (ch)
-     ch->Switch();
+     cDevice::PrimaryDevice()->SwitchChannel(ch, true);
   return osEnd;
 }
 
@@ -1054,7 +1054,7 @@ eOSState cMenuWhatsOn::Switch(void)
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {
      cChannel *channel = Channels.GetByServiceID(item->eventInfo->GetServiceID());
-     if (channel && channel->Switch())
+     if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
         return osEnd;
      }
   Interface->Error(tr("Can't switch channel!"));
@@ -2519,15 +2519,14 @@ bool cRecordControls::Start(cTimer *Timer)
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
-     bool ReUse = false;
-     cDevice *device = cDevice::GetDevice(channel->ca, Timer ? Timer->priority : Setup.DefaultPriority, channel->frequency, channel->vpid, &ReUse);
+     bool NeedsDetachReceivers = false;
+     cDevice *device = cDevice::GetDevice(channel, Timer ? Timer->priority : Setup.DefaultPriority, &NeedsDetachReceivers);
      if (device) {
-        if (!ReUse) {
+        if (NeedsDetachReceivers)
            Stop(device);
-           if (!channel->Switch(device)) {
-              cThread::EmergencyExit(true);
-              return false;
-              }
+        if (!device->SwitchChannel(channel, false)) {
+           cThread::EmergencyExit(true);
+           return false;
            }
         for (int i = 0; i < MAXRECORDCONTROLS; i++) {
             if (!RecordControls[i]) {
@@ -2570,7 +2569,8 @@ void cRecordControls::Stop(cDevice *Device)
 bool cRecordControls::StopPrimary(bool DoIt)
 {
   if (cDevice::PrimaryDevice()->Receiving()) {
-     cDevice *device = cDevice::GetDevice(cDevice::PrimaryDevice()->Ca(), 0);
+     //XXX+ disabled for the moment - might become obsolete with DVB_DRIVER_VERSION >= 2002090101
+     cDevice *device = NULL;//XXX cDevice::GetDevice(cDevice::PrimaryDevice()->Ca(), 0);
      if (device) {
         if (DoIt)
            Stop(cDevice::PrimaryDevice());
diff --git a/menuitems.c b/menuitems.c
index 8c7848f5d..97d81ad14 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.8 2002/08/15 11:27:57 kls Exp $
+ * $Id: menuitems.c 1.9 2002/09/08 14:51:28 kls Exp $
  */
 
 #include "menuitems.h"
@@ -68,7 +68,7 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
            *value = 0;
            fresh = false;
            }
-        newValue = *value  * 10 + (Key - k0);
+        newValue = *value * 10 + (Key - k0);
         }
      else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
         newValue = *value - 1;
@@ -78,8 +78,11 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
         newValue = *value + 1;
         fresh = true;
         }
-     else
+     else {
+        if (*value < min) { *value = min; Set(); }
+        if (*value > max) { *value = max; Set(); }
         return state;
+        }
      if ((!fresh || min <= newValue) && newValue <= max) {
         *value = newValue;
         Set();
diff --git a/newplugin b/newplugin
index 2612c8506..55d425f16 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.6 2002/06/10 16:24:34 kls Exp $
+# $Id: newplugin 1.7 2002/08/28 19:26:27 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -122,7 +122,7 @@ libvdr-\$(PLUGIN).so: \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
 	\@cp \$\@ \$(LIBDIR)/\$\@.\$(VDRVERSION)
 
-package: clean
+dist: clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
 	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
 	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
@@ -251,7 +251,7 @@ The next steps you should perform now are:
 sub CreateFile
 {
   my ($Name, $Content) = @_;
-  open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V113 $!\n";
+  open(FILE, ">$PLUGINDIR/$Name") || die "$Name:  $!\n";
   print FILE $Content;
   close(FILE);
 }
diff --git a/osdbase.h b/osdbase.h
index 392212616..605bd8e90 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.5 2002/08/25 10:01:00 kls Exp $
+ * $Id: osdbase.h 1.6 2002/09/08 14:12:41 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -50,12 +50,12 @@ class cPalette {
   bool full;
 protected:
   typedef unsigned char tIndexes[MAXNUMCOLORS];
-  void SetColor(int Index, eDvbColor Color);
-  eDvbColor GetColor(int Index) { return color[Index]; }
 public:
   cPalette(int Bpp);
   int Index(eDvbColor Color);
   void Reset(void);
+  void SetColor(int Index, eDvbColor Color);
+  eDvbColor GetColor(int Index) { return Index < maxColors ? color[Index] : clrBlack; }
   const eDvbColor *NewColors(int &FirstColor, int &LastColor);
         // With every call this function returns a consecutive range of
         // color entries that have been added since the last call. The
diff --git a/recorder.c b/recorder.c
index 3a0941bb8..ba7dc06d3 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.1 2002/06/16 10:03:25 kls Exp $
+ * $Id: recorder.c 1.2 2002/09/07 13:40:23 kls Exp $
  */
 
 #include <stdarg.h>
@@ -14,7 +14,7 @@
 
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE  MEGABYTE(1)
+#define VIDEOBUFSIZE  MEGABYTE(5)
 
 #define MINFREEDISKSPACE    (512) // MB
 #define DISKCHECKINTERVAL   100 // seconds
diff --git a/spu.c b/spu.c
new file mode 100644
index 000000000..ccdcc3908
--- /dev/null
+++ b/spu.c
@@ -0,0 +1,23 @@
+/*
+ * SPU Decoder Prototype
+ *
+ * Copyright (C) 2001.2002 Andreas Schultz <aschultz@warp10.net>
+ *
+ * This code is distributed under the terms and conditions of the
+ * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
+ *
+ * $Id: spu.c 1.1 2002/09/08 14:17:41 kls Exp $
+ */
+
+#include <inttypes.h>
+#include "spu.h"
+
+// -- cSpuDecoder ----------------
+/*
+cSpuDecoder::cSpuDecoder()
+{};
+*/
+
+cSpuDecoder::~cSpuDecoder()
+{
+};
diff --git a/spu.h b/spu.h
new file mode 100644
index 000000000..1ccc74b99
--- /dev/null
+++ b/spu.h
@@ -0,0 +1,38 @@
+/*
+ * SPU Decoder Prototype
+ *
+ * Copyright (C) 2001.2002 Andreas Schultz <aschultz@warp10.net>
+ *
+ * This code is distributed under the terms and conditions of the
+ * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
+ *
+ * $Id: spu.h 1.1 2002/09/08 14:17:51 kls Exp $
+ */
+
+#ifndef __SPU_VDR_H
+#define __SPU_VDR_H
+
+#include <inttypes.h>
+
+// --- cSpuDecoder -------------------------------------------
+
+class cSpuDecoder {
+  public:
+    typedef enum { eSpuNormal, eSpuLetterBox, eSpuPanAndScan } eScaleMode;
+  public:
+    //    cSpuDecoder();
+     virtual ~ cSpuDecoder();
+
+    virtual int setTime(uint32_t pts) = 0;
+
+    virtual void setScaleMode(cSpuDecoder::eScaleMode ScaleMode) = 0;
+    virtual void setPalette(uint32_t * pal) = 0;
+    virtual void setHighlight(uint16_t sx, uint16_t sy,
+                              uint16_t ex, uint16_t ey,
+                              uint32_t palette) = 0;
+    virtual void clearHighlight(void) = 0;
+    virtual void Empty(void) = 0;
+    virtual void processSPU(uint32_t pts, uint8_t * buf) = 0;
+};
+
+#endif                          // __SPU_VDR_H
diff --git a/svdrp.c b/svdrp.c
index 92365e726..3115349c6 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.40 2002/08/25 10:40:46 kls Exp $
+ * $Id: svdrp.c 1.42 2002/09/08 11:22:57 kls Exp $
  */
 
 #include "svdrp.h"
@@ -387,6 +387,7 @@ void cSVDRP::CmdCHAN(const char *Option)
 {
   if (*Option) {
      int n = -1;
+     int d = 0;
      if (isnumber(Option)) {
         int o = strtol(Option, NULL, 10);
         if (o >= 1 && o <= Channels.MaxNumber())
@@ -394,13 +395,17 @@ void cSVDRP::CmdCHAN(const char *Option)
         }
      else if (strcmp(Option, "-") == 0) {
         n = cDevice::CurrentChannel();
-        if (n > 1)
+        if (n > 1) {
            n--;
+           d = -1;
+           }
         }
      else if (strcmp(Option, "+") == 0) {
         n = cDevice::CurrentChannel();
-        if (n < Channels.MaxNumber())
+        if (n < Channels.MaxNumber()) {
            n++;
+           d = 1;
+           }
         }
      else {
         int i = 1;
@@ -417,21 +422,21 @@ void cSVDRP::CmdCHAN(const char *Option)
         Reply(501, "Undefined channel \"%s\"", Option);
         return;
         }
-     if (Interface->Recording()) {
-        Reply(550, "Can't switch channel, interface is recording");
-        return;
-        }
-     cChannel *channel = Channels.GetByNumber(n);
-     if (channel) {
-        if (!channel->Switch()) {
-           Reply(554, "Error switching to channel \"%d\"", channel->number);
+     if (!d) {
+        cChannel *channel = Channels.GetByNumber(n);
+        if (channel) {
+           if (!cDevice::PrimaryDevice()->SwitchChannel(channel, true)) {
+              Reply(554, "Error switching to channel \"%d\"", channel->number);
+              return;
+              }
+           }
+        else {
+           Reply(550, "Unable to find channel \"%s\"", Option);
            return;
            }
         }
-     else {
-        Reply(550, "Unable to find channel \"%s\"", Option);
-        return;
-        }
+     else
+        cDevice::SwitchChannel(d);
      }
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel)
diff --git a/tools.h b/tools.h
index ebabb470c..f8bf43f28 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.49 2002/08/16 08:52:01 kls Exp $
+ * $Id: tools.h 1.50 2002/09/08 10:22:29 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -46,6 +46,7 @@ extern int SysLogLevel;
 
 template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
 template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
+template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);
diff --git a/vdr.c b/vdr.c
index 9da5b5ee2..355a5158d 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.120 2002/08/16 09:54:03 kls Exp $
+ * $Id: vdr.c 1.122 2002/09/08 11:19:01 kls Exp $
  */
 
 #include <getopt.h>
@@ -544,13 +544,9 @@ int main(int argc, char *argv[])
                  case kUp|k_Repeat:
                  case kUp:
                  case kDown|k_Repeat:
-                 case kDown: {
-                      int n = cDevice::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
-                      cChannel *channel = Channels.GetByNumber(n);
-                      if (channel)
-                         channel->Switch();
+                 case kDown:
+                      cDevice::SwitchChannel(NORMALKEY(key) == kUp ? 1 : -1);
                       break;
-                      }
                  // Viewing Control:
                  case kOk:   LastChannel = -1; break; // forces channel display
                  default:    break;
diff --git a/xd b/xd
deleted file mode 100644
index a2cff6f6d..000000000
--- a/xd
+++ /dev/null
@@ -1 +0,0 @@
-rm x.diff

From 346f4cd1420bb02bd9cec4059385c9922d64fc3f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 15 Sep 2002 18:00:00 +0200
Subject: [PATCH 051/307] Version 1.1.10 - Removed a superfluous error message
 from cLockFile::Unlock() (reported by   Helmut Auer). - Fixed starting a
 recording of the current channel with only one DVB card   (thanks to Stefan
 Huelswitt for his help). - A previous 'Transfer Mode' is now automatically
 re-started after a replay   stops. - Only calling cStatus::MsgChannelSwitch()
 if a channel is actually going to   be switched or has actually been switched
 successfully (thanks to Stefan   Huelswitt). - The EPG now drops events from
 "other" streams that have a duration of 86400   seconds or more (this avoids
 bogus entries like "PROGRAMMES ALLEMANDS"). - Fixed opening /dev/video in
 cDvbDevice::GrabImage() in case of NEWSTRUCT   driver (thanks to Andreas
 Schultz). - Added a missing StripAudioPackets() to cDvbPlayer::Action()
 (thanks to   Stefan Huelswitt). - Added an EPG bugfix for the latest VOX EPG
 data format.

---
 CONTRIBUTORS  |   8 ++++
 HISTORY       |  19 ++++++++
 channels.conf |  22 ++++-----
 config.h      |   4 +-
 device.c      |  43 ++++++++++--------
 device.h      |   7 ++-
 dvbdevice.c   | 123 ++++++++++++++++++++++++++++----------------------
 dvbplayer.c   |   3 +-
 eit.c         |  43 +++++++++++++++---
 tools.c       |   4 +-
 vdr.c         |   5 +-
 11 files changed, 181 insertions(+), 100 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1431bf7c6..642d445a4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -147,6 +147,10 @@ Stefan Huelswitt <huels@iname.com>
  for improving cCondVar::Wait() and implementing cCondVar::TimedWait()
  for reporting a bug when entering an integer value outside the limit
  for adding play mode pmAudioOnlyBlack
+ for helping to fix starting a recording of the current channel with only one DVB card
+ for making cStatus::MsgChannelSwitch() only be called if a channel is actually going to
+ be switched or has actually been switched successfully
+ for adding a missing StripAudioPackets() to cDvbPlayer::Action()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -169,6 +173,7 @@ Andreas Schultz <aschultz@warp10.net>
  for adding cDevice::NewOsd() to allow a derived cDevice class to implement its own
  OSD capabilities
  for implementing an SPU decoder
+ for fixing opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT driver
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -391,3 +396,6 @@ Holger W
 
 J�rgen Zimmermann <jnzimmer@informatik.uni-kl.de>
  for adding some missing #includes to files in libdtv for gcc 3.2
+
+Helmut Auer <vdr@helmutauer.de>
+ for reporting a superfluous error message in cLockFile.
diff --git a/HISTORY b/HISTORY
index bfecec8fa..d464a222f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1459,3 +1459,22 @@ Video Disk Recorder Revision History
 - Fixed a crash when entering an integer value outside the limits (thanks to
   Stefan Huelswitt for reporting this one).
 - Added play mode pmAudioOnlyBlack (thanks to Stefan Huelswitt).
+
+2002-09-15: Version 1.1.10
+
+- Removed a superfluous error message from cLockFile::Unlock() (reported by
+  Helmut Auer).
+- Fixed starting a recording of the current channel with only one DVB card
+  (thanks to Stefan Huelswitt for his help).
+- A previous 'Transfer Mode' is now automatically re-started after a replay
+  stops.
+- Only calling cStatus::MsgChannelSwitch() if a channel is actually going to
+  be switched or has actually been switched successfully (thanks to Stefan
+  Huelswitt).
+- The EPG now drops events from "other" streams that have a duration of 86400
+  seconds or more (this avoids bogus entries like "PROGRAMMES ALLEMANDS").
+- Fixed opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT
+  driver (thanks to Andreas Schultz).
+- Added a missing StripAudioPackets() to cDvbPlayer::Action() (thanks to
+  Stefan Huelswitt).
+- Added an EPG bugfix for the latest VOX EPG data format.
diff --git a/channels.conf b/channels.conf
index 09cf433b0..ad868d944 100644
--- a/channels.conf
+++ b/channels.conf
@@ -7,7 +7,7 @@ BR3:11837:h:0:27500:201:202:204:0:28107
 Hessen-3:11837:h:0:27500:301:302:304:0:28108
 N3:12110:h:0:27500:2401:2402:2404:0:28224
 SR3:11837:h:0:27500:501:502:504:0:28110
-WDR:11837:h:0:27500:601:602:0:0:28111
+WDR:11837:h:0:27500:601:602:604:0:28111
 BR-alpha:11837:h:0:27500:701:702:704:0:28112
 SWR BW:11837:h:0:27500:801:802:804:0:28113
 Phoenix:11837:h:0:27500:901:902:904:0:28114
@@ -21,10 +21,10 @@ ORF Sat:11954:h:0:27500:506:507:0:0:28010
 ZDF.info:11954:h:0:27500:610:620:0:0:28011
 CNN:12168:v:0:27500:165:100:0:0:28512
 Super RTL:12188:h:0:27500:165:120:65:0:12040
-VOX:12188:h:0:27500:167:136:0:0:12060
+VOX:12188:h:0:27500:167:136:71:0:12060
 DW TV:10788:v:0:22000:305:306:0:0:8905
 Kabel 1:12480:v:0:27500:511:512:33:0:899
-Neun Live:12480:v:0:27500:767:768:0:0:897
+Neun Live:12480:v:0:27500:767:768:35:0:897
 DSF:12480:v:0:27500:1023:1024:0:0:900
 HOT:12480:v:0:27500:1279:1280:0:0:40
 Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
@@ -46,7 +46,7 @@ MDR:12110:h:0:27500:401:402:404:0:28204
 NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
 ORB:12110:h:0:27500:501:502:504:0:28205
 B1:12110:h:0:27500:601:602:604:0:28206
-ARD Online-Kanal:12722:h:0:22000:700:701:0:0:0
+ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
 Premiere Start:11797:h:0:27500:255:256:0:101:8
 Premiere 1:11797:h:0:27500:511:512,513;515:0:101:10
@@ -78,7 +78,7 @@ Premiere Direkt 2B:11719:h:0:27500:767:768;769:0:101:181
 Premiere Direkt 3A:11719:h:0:27500:511:512;515:0:101:180
 Premiere Direkt 3B:11719:h:0:27500:1279:1280;1283:0:101:183
 Premiere Direkt 4A:12031:h:0:27500:2815:2816:0:101:18
-Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
+:#Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
 :PW Erotic
 Beate-Uhse.TV:11758:h:0:27500:1023:1024:0:101:21
 Premiere Erotik 1:12031:h:0:27500:1279:1280:0:101:513
@@ -89,11 +89,11 @@ Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
 Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
 Premiere Sport 2:12031:h:0:27500:3839:3840:0:101:27
 :Formel 1
-Supersignal:12070:h:0:27500:255:256:0:101:211
-Cockpitkanal:12070:h:0:27500:511:512:0:101:212
-Boxengasse:12070:h:0:27500:767:768:0:101:213
-Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
-Infokanal:12070:h:0:27500:1279:1280:0:101:215
+:#Supersignal:12070:h:0:27500:255:256:0:101:211
+:#Cockpitkanal:12070:h:0:27500:511:512:0:101:212
+:#Boxengasse:12070:h:0:27500:767:768:0:101:213
+:#Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
+:#Infokanal:12070:h:0:27500:1279:1280:0:101:215
 Multikanal:11720:h:0:27500:255:256:0:101:17
 :Beta Digital
 N24:12480:v:0:27500:2047:2048:0:0:47
@@ -111,7 +111,7 @@ BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
 BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
 BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
 :
-TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
+:#TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
 Andalucia TV:11934:v:0:27500:166:104:0:0:29011
 TVC Internacional:11934:v:0:27500:167:108:0:0:0
diff --git a/config.h b/config.h
index bbc006ba4..85e14ddd1 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.126 2002/09/04 11:04:55 kls Exp $
+ * $Id: config.h 1.127 2002/09/09 21:35:55 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.9"
+#define VDRVERSION "1.1.10"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 72f1fc632..830c3ef36 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.19 2002/09/08 14:03:43 kls Exp $
+ * $Id: device.c 1.21 2002/09/15 11:50:19 kls Exp $
  */
 
 #include "device.h"
@@ -47,6 +47,8 @@ cDevice::cDevice(void)
 
   player = NULL;
 
+  playerDetached = false;
+
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
   ca = -1;
@@ -108,6 +110,13 @@ bool cDevice::HasDecoder(void) const
   return false;
 }
 
+bool cDevice::PlayerDetached(void)
+{
+  bool result = playerDetached;
+  playerDetached = false;
+  return result;
+}
+
 cOsdBase *cDevice::NewOsd(int x, int y)
 {
   return NULL;
@@ -317,8 +326,6 @@ bool cDevice::SwitchChannel(int Direction)
 
 eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 {
-  cStatus::MsgChannelSwitch(this, 0);
-
   if (LiveView)
      StopReplay();
 
@@ -335,6 +342,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   if (NeedsTransferMode) {
      cDevice *CaDevice = GetDevice(Channel, 0);
      if (CaDevice) {
+        cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
            cControl::Launch(new cTransferControl(CaDevice, Channel->vpid, Channel->apid1, 0, 0, 0));//XXX+
         else
@@ -343,15 +351,19 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      else
         Result = scrNotAvailable;
      }
-  else if (!SetChannelDevice(Channel, LiveView))
-     Result = scrFailed;
-
-  if (Result == scrOk && LiveView && IsPrimaryDevice()) {
-     cSIProcessor::SetCurrentServiceID(Channel->pnr);
-     currentChannel = Channel->number;
+  else {
+     cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
+     if (!SetChannelDevice(Channel, LiveView))
+        Result = scrFailed;
      }
 
-  cStatus::MsgChannelSwitch(this, Channel->number);
+  if (Result == scrOk) {
+     if (LiveView && IsPrimaryDevice()) {
+        cSIProcessor::SetCurrentServiceID(Channel->pnr);
+        currentChannel = Channel->number;
+        }
+     cStatus::MsgChannelSwitch(this, Channel->number); // only report status if channel switch successfull
+     }
 
   return Result;
 }
@@ -438,6 +450,7 @@ void cDevice::Detach(cPlayer *Player)
      player->device = NULL;
      player = NULL;
      SetPlayMode(pmNone);
+     playerDetached = true;
      }
 }
 
@@ -447,16 +460,6 @@ void cDevice::StopReplay(void)
      Detach(player);
      if (IsPrimaryDevice())
         cControl::Shutdown();
-     /*XXX+
-     if (IsPrimaryDevice()) {
-        // let's explicitly switch the channel back in case it was in Transfer Mode:
-        cChannel *Channel = Channels.GetByNumber(currentChannel);
-        if (Channel) {
-           Channel->Switch(this, false);
-           usleep(100000); // allow driver to sync in case a new replay will start immediately
-           }
-        }
-        XXX*/
      }
 }
 
diff --git a/device.h b/device.h
index 0d10793f1..23662377a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.16 2002/09/08 14:56:21 kls Exp $
+ * $Id: device.h 1.18 2002/09/14 15:24:47 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -177,7 +177,7 @@ class cDevice : cThread {
   bool active;
   virtual void Action(void);
 protected:
-  enum ePidType { ptVideo, ptAudio, ptTeletext, ptDolby, ptOther };
+  enum ePidType { ptAudio, ptVideo, ptTeletext, ptDolby, ptOther };
   class cPidHandle {
   public:
     int pid;
@@ -236,6 +236,7 @@ class cDevice : cThread {
 
 private:
   cPlayer *player;
+  bool playerDetached;
 protected:
   virtual bool SetPlayMode(ePlayMode PlayMode);
        // Sets the device into the given play mode.
@@ -276,6 +277,8 @@ class cDevice : cThread {
        // Attaches the given player to this device.
   void Detach(cPlayer *Player);
        // Detaches the given player from this device.
+  bool PlayerDetached(void);
+       // Returns true if a player has been detached and resets the 'playerDetached' flag.
 
 // Receiver facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index a13011248..0ba7c25d7 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.13 2002/09/08 15:00:46 kls Exp $
+ * $Id: dvbdevice.c 1.19 2002/09/15 13:12:25 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -200,7 +200,11 @@ cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
 
 bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  int videoDev = DvbOpen(DEV_VIDEO, CardIndex(), O_RDWR, true);
+  char buffer[PATH_MAX];
+  snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, CardIndex());
+  int videoDev = open(buffer, O_RDWR);
+  if (videoDev < 0)
+     LOG_ERROR_STR(buffer);
   if (videoDev >= 0) {
      int result = 0;
      struct video_mbuf mbuf;
@@ -297,51 +301,44 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
      CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
 }
 
-//                          ptVideo        ptAudio        ptTeletext        ptDolby        ptOther
-dmxPesType_t PesTypes[] = { DMX_PES_VIDEO, DMX_PES_AUDIO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+//                          ptAudio        ptVideo        ptTeletext        ptDolby        ptOther
+dmxPesType_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
 
 bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
   if (Handle->pid) {
+     dmxPesFilterParams pesFilterParams;
+     memset(&pesFilterParams, 0, sizeof(pesFilterParams));
      if (On) {
         if (Handle->handle < 0) {
            Handle->handle = DvbOpen(DEV_DVB_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
            if (Handle->handle < 0)
               return false;
            }
+        pesFilterParams.pid     = Handle->pid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
+        pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+           LOG_ERROR;
+           return false;
+           }
         }
-     else {
+     else if (!Handle->used) {
         CHECK(ioctl(Handle->handle, DMX_STOP));
-        if (Handle->used == 0) {
-           dmxPesFilterParams pesFilterParams;
-           memset(&pesFilterParams, 0, sizeof(pesFilterParams));
+        if (Type <= ptTeletext) {
            pesFilterParams.pid     = 0x1FFF;
            pesFilterParams.input   = DMX_IN_FRONTEND;
            pesFilterParams.output  = DMX_OUT_DECODER;
-           pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
+           pesFilterParams.pesType = PesTypes[Type];
            pesFilterParams.flags   = DMX_IMMEDIATE_START;
            CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
            close(Handle->handle);
            Handle->handle = -1;
-           return true;
-           }
-        }
-
-     if (Handle->pid != 0x1FFF) {
-        dmxPesFilterParams pesFilterParams;
-        memset(&pesFilterParams, 0, sizeof(pesFilterParams));
-        pesFilterParams.pid     = Handle->pid;
-        pesFilterParams.input   = DMX_IN_FRONTEND;
-        pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
-        pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
-        pesFilterParams.flags   = DMX_IMMEDIATE_START;
-        //XXX+ pesFilterParams.flags   = DMX_CHECK_CRC;//XXX
-        if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-           LOG_ERROR;
-           return false;
+           if (PesTypes[Type] == DMX_PES_VIDEO) // let's only do this once
+              SetPlayMode(pmNone); // necessary to switch a PID from DMX_PES_VIDEO/AUDIO to DMX_PES_OTHER
            }
-        //XXX+ CHECK(ioctl(Handle->handle, DMX_SET_BUFFER_SIZE, KILOBYTE(32)));//XXX
-        //XXX+ CHECK(ioctl(Handle->handle, DMX_START));//XXX
         }
      }
   return true;
@@ -362,8 +359,8 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                  needsDetachReceivers = true;
                  result = hasPriority;
                  }
-              else if (!HasDecoder())
-                 result = true; // if it has no decoder it can't be the primary device
+              else if (!IsPrimaryDevice())
+                 result = true;
               else {
 #define DVB_DRIVER_VERSION 2002090101 //XXX+
 #define MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT 2002090101
@@ -397,30 +394,52 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      LiveView = true;
 #endif
 
-  // Avoid noise while switching:
+  bool DoTune = frequency != Channel->frequency; // TODO will be changed when DiSEqC handling is revised
 
-  if (HasDecoder()) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     }
+  bool TurnOffLivePIDs = HasDecoder()
+                         && (DoTune
+                            || Channel->ca > CACONFBASE && pidHandles[ptVideo].pid != Channel->vpid // CA channels can only be decrypted in "live" mode
+                            || IsPrimaryDevice()
+                               && (LiveView // for a new live view the old PIDs need to be turned off
+                                  || pidHandles[ptVideo].pid == Channel->vpid // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                                  )
+                            );
+
+  bool StartTransferMode = IsPrimaryDevice() && !DoTune
+                           && (LiveView && HasPid(Channel->vpid) && pidHandles[ptVideo].pid != Channel->vpid // the PID is already set as DMX_PES_OTHER
+                              || !LiveView && pidHandles[ptVideo].pid == Channel->vpid // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                              );
+
+  bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode
+                        && (Channel->ca > CACONFBASE // CA channels can only be decrypted in "live" mode
+                           || LiveView
+                           );
 
   // Stop setting system time:
 
   if (siProcessor)
      siProcessor->SetCurrentTransponder(0);
 
-  // Turn off current PIDs:
+  // Turn off live PIDs if necessary:
+
+  if (TurnOffLivePIDs) {
+
+     // Avoid noise while switching:
+
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+
+     // Turn off live PIDs:
 
-  if (HasDecoder() && (LiveView || pidHandles[ptVideo].pid == Channel->vpid)) {
-     DelPid(pidHandles[ptVideo].pid);
      DelPid(pidHandles[ptAudio].pid);
+     DelPid(pidHandles[ptVideo].pid);
      DelPid(pidHandles[ptTeletext].pid);
      DelPid(pidHandles[ptDolby].pid);
      }
 
-  if (frequency != Channel->frequency || Channel->ca > CACONFBASE) { // CA channels can only be decrypted in "live" mode
+  if (DoTune) {
 
 #ifdef NEWSTRUCT
      dvb_frontend_parameters Frontend;
@@ -602,21 +621,19 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   // PID settings:
 
-  if (HasDecoder() && (LiveView || Channel->ca > CACONFBASE)) { // CA channels can only be decrypted in "live" mode
-     if (!HasPid(Channel->vpid)) {
-        if (!(AddPid(Channel->vpid, ptVideo) && AddPid(Channel->apid1, ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
-           esyslog("ERROR: failed to set PIDs for channel %d", Channel->number);
-           return false;
-           }
-        if (IsPrimaryDevice())
-           AddPid(Channel->tpid, ptTeletext);
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-        CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-        CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+  if (TurnOnLivePIDs) {
+     if (!(AddPid(Channel->apid1, ptAudio) && AddPid(Channel->vpid, ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->number, CardIndex() + 1);
+        return false;
         }
-     else
-        cControl::Launch(new cTransferControl(this, Channel->vpid, Channel->apid1, 0, 0, 0));
+     if (IsPrimaryDevice())
+        AddPid(Channel->tpid, ptTeletext);
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
+  else if (StartTransferMode)
+     cControl::Launch(new cTransferControl(this, Channel->vpid, Channel->apid1, 0, 0, 0));
 
   // Start setting system time:
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 7a6d76d31..7edadfbcc 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.12 2002/08/24 14:59:35 kls Exp $
+ * $Id: dvbplayer.c 1.13 2002/09/15 13:33:31 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -353,6 +353,7 @@ void cDvbPlayer::Action(void)
                        continue;
                        }
                     r = ReadFrame(replayFile, b, Length, sizeof(b));
+                    StripAudioPackets(b, r, 0xC0); //XXX+ audioTrack
                     }
                  else // allows replay even if the index file is missing
                     r = read(replayFile, b, sizeof(b));
diff --git a/eit.c b/eit.c
index 865904900..d4912c291 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.49 2002/08/25 10:43:36 kls Exp $
+ * $Id: eit.c 1.51 2002/09/15 14:35:32 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -405,7 +405,7 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 5
+#define MAXEPGBUGFIXSTATS 6
 #define MAXEPGBUGFIXCHANS 50
 struct tEpgBugFixStats {
   int hits;
@@ -485,6 +485,32 @@ void cEventInfo::FixEpgBugs(void)
   // EPG data. Let's fix their bugs as good as we can:
   if (pTitle) {
 
+     // VOX puts too much information into the Subtitle and leaves the Extended
+     // Description empty:
+     //
+     // Title
+     // (NAT, Year Min')[ ["Subtitle". ]Extended Description]
+     //
+     if (pSubtitle && !pExtendedDescription) {
+        if (*pSubtitle == '(') {
+           char *e = strchr(pSubtitle + 1, ')');
+           if (e) {
+              if (*(e + 1)) {
+                 if (*++e == ' ')
+                    if (*(e + 1) == '"')
+                       e++;
+                 }
+              else
+                 e = NULL;
+              char *s = e ? strdup(e) : NULL;
+              free(pSubtitle);
+              pSubtitle = s;
+              EpgBugFixStat(0, GetServiceID());
+              // now the fixes #1 and #2 below will handle the rest
+              }
+           }
+        }
+
      // VOX and VIVA put the Subtitle in quotes and use either the Subtitle
      // or the Extended Description field, depending on how long the string is:
      //
@@ -504,7 +530,7 @@ void cEventInfo::FixEpgBugs(void)
               free(pExtendedDescription);
               pSubtitle = s;
               pExtendedDescription = d;
-              EpgBugFixStat(0, GetServiceID());
+              EpgBugFixStat(1, GetServiceID());
               }
            }
         }
@@ -521,7 +547,7 @@ void cEventInfo::FixEpgBugs(void)
            memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle));
            pExtendedDescription = pSubtitle;
            pSubtitle = NULL;
-           EpgBugFixStat(1, GetServiceID());
+           EpgBugFixStat(2, GetServiceID());
            }
         }
 
@@ -533,7 +559,7 @@ void cEventInfo::FixEpgBugs(void)
      if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
         free(pSubtitle);
         pSubtitle = NULL;
-        EpgBugFixStat(2, GetServiceID());
+        EpgBugFixStat(3, GetServiceID());
         }
 
      // ZDF.info puts the Subtitle between double quotes, which is nothing
@@ -549,7 +575,7 @@ void cEventInfo::FixEpgBugs(void)
            char *p = strrchr(pSubtitle, '"');
            if (p)
               *p = 0;
-           EpgBugFixStat(3, GetServiceID());
+           EpgBugFixStat(4, GetServiceID());
            }
         }
 
@@ -570,7 +596,7 @@ void cEventInfo::FixEpgBugs(void)
               if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
                  if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
                     memmove(p, p + 2, strlen(p + 2) + 1);
-                    EpgBugFixStat(4, GetServiceID());
+                    EpgBugFixStat(5, GetServiceID());
                     }
                  }
               p++;
@@ -895,6 +921,9 @@ int cEIT::ProcessEIT(unsigned char *buffer)
 
    if (VdrProgramInfos) {
       for (VdrProgramInfo = (struct VdrProgramInfo *) VdrProgramInfos->Head; VdrProgramInfo; VdrProgramInfo = (struct VdrProgramInfo *) xSucc (VdrProgramInfo)) {
+          // Drop events that belong to an "other TS" and are very long (some stations broadcast bogus data for "other" channels):
+          if (VdrProgramInfo->Duration >= 86400 && (tid == 0x4F || tid == 0x60 || tid == 0x61))
+             continue;
           pSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ServiceID);
           if (!pSchedule) {
              schedules->Add(new cSchedule(VdrProgramInfo->ServiceID));
diff --git a/tools.c b/tools.c
index 29c5f2d61..b3b64fc9c 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.70 2002/08/16 13:43:40 kls Exp $
+ * $Id: tools.c 1.71 2002/09/09 21:35:49 kls Exp $
  */
 
 #include "tools.h"
@@ -739,8 +739,6 @@ void cLockFile::Unlock(void)
      remove(fileName);
      f = -1;
      }
-  else
-     esyslog("ERROR: attempt to unlock %s without holding a lock!", fileName);
 }
 
 // --- cListObject -----------------------------------------------------------
diff --git a/vdr.c b/vdr.c
index 355a5158d..1f38af41d 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.122 2002/09/08 11:19:01 kls Exp $
+ * $Id: vdr.c 1.123 2002/09/15 11:08:35 kls Exp $
  */
 
 #include <getopt.h>
@@ -400,6 +400,9 @@ int main(int argc, char *argv[])
            }
         // Attach launched player control:
         cControl::Attach();
+        // Make sure Transfer-Mode is re-started after detaching a player:
+        if (cDevice::PrimaryDevice()->PlayerDetached() && !cDevice::PrimaryDevice()->Replaying())
+           Channels.SwitchTo(cDevice::CurrentChannel());
         // Restart the Watchdog timer:
         if (WatchdogTimeout > 0) {
            int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);

From d08073815d6d9132f7fb5cd9f82877967dc6b0e4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 29 Sep 2002 18:00:00 +0200
Subject: [PATCH 052/307] Version 1.1.11 - Fixed an incomplete initialization
 of the filter parameters in eit.c (thanks   to Jeremy Hall). - Fixed the
 'newplugin' script for use with the NEWSTRUCT driver (thanks to   Andreas
 Schultz for reporting this one). If you have already created a plugin  
 directory and Makefile with 'newplugin', please apply the following patch to
 it:

  -------------------------------------------------------
  --- Makefile    2002/06/10 16:24:06     1.4
  +++ Makefile    2002/09/17 15:36:36     1.5
  @@ -15,7 +15,12 @@

   ### The directory environment:

  +ifdef NEWSTRUCT
  +DVBDIR = ../../../../DVB/include
  +DEFINES += -DNEWSTRUCT
  +else
   DVBDIR = ../../../../DVB/ost/include
  +endif
   VDRDIR = ../../..
   VDRINC = $(VDRDIR)/include
   LIBDIR = ../../lib
  @@ -34,7 +39,7 @@

   INCLUDES = -I$(VDRINC) -I$(DVBDIR)

  -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

   ### The object files (add further files here):
  -------------------------------------------------------

  This is the diff for the 'setup' example that comes with VDR, so your line
  numbers may be different.
- Added a missing 'public' keyword in device.h (thanks to Martin Hammerschmid).
- Fixed a race condition when starting 'Transfer Mode'.
- Rearranged the remote control key handling to allow plugins to implement
  additional types of remote controls (see PLUGINS.html, section "Remote Control").
  The previously used files 'keys.conf' and 'keys-pc.conf' have been replaced
  by the file 'remote.conf', which holds the key definitions of all remote controls.
- The LIRC remote control keys are now handled just like the keyboard and RCU keys.
  This means that you can use the lircd.conf file as is for your remote control,
  without the need of editing it to make the key names the same as used in VDR.
  When first starting VDR it will go into the "Learning keys" mode and ask you
  to press the various keys. The resulting key assignment will be stored in
  the file 'remote.conf'.
  Since I have no way of testing the LIRC support, I hope I didn't break it in
  the process...
- While learning the remote control keys it is now possible to press the 'Menu'
  key to skip the definition of keys that are not available on your particular
  RC unit.
- Fixed handling DVD subtitles in the SPU decoder (thanks to Andreas Schultz).
- Avoiding restarts due to 'panic level' when switching channels on the primary
  device during EPG scan.
---
 CONTRIBUTORS                |   5 +
 HISTORY                     |  57 ++++
 INSTALL                     |  14 +-
 Makefile                    |   4 +-
 PLUGINS.html                | 140 ++++++++--
 PLUGINS/SRC/hello/HISTORY   |   4 +
 PLUGINS/SRC/hello/Makefile  |   9 +-
 PLUGINS/SRC/hello/hello.c   |   4 +-
 PLUGINS/SRC/status/HISTORY  |   4 +
 PLUGINS/SRC/status/Makefile |  11 +-
 PLUGINS/SRC/status/status.c |   4 +-
 channels.conf               |   4 +-
 config.c                    | 172 +-----------
 config.h                    |  82 +-----
 device.c                    |  16 +-
 device.h                    |  22 +-
 dvbdevice.c                 |   8 +-
 dvbdevice.h                 |   4 +-
 dvbspu.c                    |  10 +-
 dvbspu.h                    |   3 +-
 eit.c                       |   5 +-
 i18n.c                      |  18 +-
 interface.c                 | 248 +++++++----------
 interface.h                 |  11 +-
 keys-pc.conf                |  27 --
 keys.c                      | 154 +++++++++++
 keys.h                      |  87 ++++++
 lirc.c                      |  84 ++++++
 lirc.h                      |  26 ++
 menu.c                      |  20 +-
 menu.h                      |   4 +-
 newplugin                   |   9 +-
 rcu.c                       | 312 ++++++++++++++++++++++
 rcu.h                       |  44 +++
 remote.c                    | 519 +++++++-----------------------------
 remote.h                    | 104 +++-----
 svdrp.c                     |  11 +-
 transfer.c                  |  10 +-
 vdr.5                       |  22 +-
 vdr.c                       |  39 ++-
 40 files changed, 1280 insertions(+), 1051 deletions(-)
 delete mode 100644 keys-pc.conf
 create mode 100644 keys.c
 create mode 100644 keys.h
 create mode 100644 lirc.c
 create mode 100644 lirc.h
 create mode 100644 rcu.c
 create mode 100644 rcu.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 642d445a4..260cb592b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -45,6 +45,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for implementing pege up/down with the "Left" and "Right" keys
  for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
  for adding a missing #include to ringbuffer.c
+ for adding a missing 'public' keyword in device.h
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
@@ -174,6 +175,7 @@ Andreas Schultz <aschultz@warp10.net>
  OSD capabilities
  for implementing an SPU decoder
  for fixing opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT driver
+ for reporting a problem with plugin Makefiles and the NEWSTRUCT driver
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -399,3 +401,6 @@ J
 
 Helmut Auer <vdr@helmutauer.de>
  for reporting a superfluous error message in cLockFile.
+
+Jeremy Hall <jhall@UU.NET>
+ for fixing an incomplete initialization of the filter parameters in eit.c
diff --git a/HISTORY b/HISTORY
index d464a222f..12146a02d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1478,3 +1478,60 @@ Video Disk Recorder Revision History
 - Added a missing StripAudioPackets() to cDvbPlayer::Action() (thanks to
   Stefan Huelswitt).
 - Added an EPG bugfix for the latest VOX EPG data format.
+
+2002-09-29: Version 1.1.11
+
+- Fixed an incomplete initialization of the filter parameters in eit.c (thanks
+  to Jeremy Hall).
+- Fixed the 'newplugin' script for use with the NEWSTRUCT driver (thanks to
+  Andreas Schultz for reporting this one). If you have already created a plugin
+  directory and Makefile with 'newplugin', please apply the following patch to it:
+
+  -------------------------------------------------------
+  --- Makefile    2002/06/10 16:24:06     1.4
+  +++ Makefile    2002/09/17 15:36:36     1.5
+  @@ -15,7 +15,12 @@
+ 
+   ### The directory environment:
+ 
+  +ifdef NEWSTRUCT
+  +DVBDIR = ../../../../DVB/include
+  +DEFINES += -DNEWSTRUCT
+  +else
+   DVBDIR = ../../../../DVB/ost/include
+  +endif
+   VDRDIR = ../../..
+   VDRINC = $(VDRDIR)/include
+   LIBDIR = ../../lib
+  @@ -34,7 +39,7 @@
+ 
+   INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+ 
+  -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+  +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+   ### The object files (add further files here):
+  -------------------------------------------------------
+
+  This is the diff for the 'setup' example that comes with VDR, so your line
+  numbers may be different.
+- Added a missing 'public' keyword in device.h (thanks to Martin Hammerschmid).
+- Fixed a race condition when starting 'Transfer Mode'.
+- Rearranged the remote control key handling to allow plugins to implement
+  additional types of remote controls (see PLUGINS.html, section "Remote Control").
+  The previously used files 'keys.conf' and 'keys-pc.conf' have been replaced
+  by the file 'remote.conf', which holds the key definitions of all remote controls.
+- The LIRC remote control keys are now handled just like the keyboard and RCU keys.
+  This means that you can use the lircd.conf file as is for your remote control,
+  without the need of editing it to make the key names the same as used in VDR.
+  When first starting VDR it will go into the "Learning keys" mode and ask you
+  to press the various keys. The resulting key assignment will be stored in
+  the file 'remote.conf'.
+  Since I have no way of testing the LIRC support, I hope I didn't break it in
+  the process...
+- While learning the remote control keys it is now possible to press the 'Menu'
+  key to skip the definition of keys that are not available on your particular
+  RC unit.
+- Fixed handling DVD subtitles in the SPU decoder (thanks to Andreas Schultz).
+- Avoiding restarts due to 'panic level' when switching channels on the primary
+  device during EPG scan.
diff --git a/INSTALL b/INSTALL
index 911285cee..2ceda924f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -330,8 +330,7 @@ of the card that can receive it.
 Learning the remote control keys:
 ---------------------------------
 
-There is no default 'keys.conf' file, so if you compile the program
-with 'REMOTE=RCU' you will have to go through a "teach-in"
+There is no default 'remote.conf' file, so you will have to go through a "teach-in"
 session that allows the program to learn your remote control codes.
 It will first attempt to determine the basic data transfer mode and
 timing of your remote control unit, and then will ask you to press one
@@ -342,11 +341,8 @@ you define, the more you will be able to navigate through the menus and
 control recording/replaying. The program uses only a very small number
 of keys which have multiple meanings in the various modes (see MANUAL
 for a detailed description).
-If the program has been built with "REMOTE=KBD", it will use the
-key configuration file 'keys-pc.conf', so that you won't loose data
-when switching between remote control and keyboard mode.
 
-The default PC key assignments are:
+The recommended PC key assignments are:
 
   Up, Down, Left, Right     Crsr keys in numeric block
   Menu                      'Home' in numeric block
@@ -359,10 +355,6 @@ The default PC key assignments are:
   Mute                      'm'
 
 If you prefer different key assignments, or if the default doesn't work for
-your keyboard, simply delete the file 'keys-pc.conf' and restart 'vdr' to get
+your keyboard, simply delete the file 'remote.conf' and restart 'vdr' to get
 into learning mode.
 
-If the program has been compiled with 'REMOTE=LIRC', no 'keys.conf' file
-will be used. Instead, the key names as listed in the source file 'config.c'
-must be used when setting up LIRC. See http://www.lirc.org for more about LIRC.
-
diff --git a/Makefile b/Makefile
index 7686b916b..3902b39ea 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.46 2002/09/08 14:00:48 kls Exp $
+# $Id: Makefile 1.47 2002/09/28 14:12:43 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -33,7 +33,7 @@ endif
 DTVLIB   = $(DTVDIR)/libdtv.a
 
 OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o\
-       interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
+       interface.o keys.o lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o receiver.o\
        recorder.o recording.o remote.o remux.o ringbuffer.o spu.o status.o svdrp.o thread.o\
        tools.o transfer.o vdr.o videodir.o
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 02fd59a6f..55e935b57 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.6 are marked like this.
-<!--X1.1.6--></td></tr></table>
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.7 are marked like this.
 <!--X1.1.7--></td></tr></table>
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.8 are marked like this.
 <!--X1.1.8--></td></tr></table>
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.9 are marked like this.
 <!--X1.1.9--></td></tr></table>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.11 are marked like this.
+<!--X1.1.11--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -957,7 +957,7 @@
 individual block of data. The sum of all blocks must simply result in the
 desired video data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 To avoid busy loops the player should call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -1065,7 +1065,6 @@
 that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Receivers</h2>
 
 <center><i><b>Tapping into the stream...</b></i></center><p>
@@ -1119,7 +1118,6 @@
 
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
-<!--X1.1.6--></td></tr></table>
 
 <hr><h2>The On Screen Display</h2>
 
@@ -1151,7 +1149,6 @@
 of these functions, and VDR/osd.c to see how VDR opens the OSD and sets up
 its windows and color depths).
 
-<!--X1.1.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Devices</h2>
 
 <center><i><b>Expanding the possibilities</b></i></center><p>
@@ -1187,7 +1184,7 @@
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
@@ -1206,7 +1203,7 @@
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual bool GetTSPacket(uchar *&amp;Data);
 <!--X1.1.9--></td></tr></table>
 </pre></td></tr></table><p>
@@ -1230,7 +1227,7 @@
 <p>
 The functions to implement replaying capabilites are
 
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1254,7 +1251,7 @@
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p>
 <b>On Screen Display</b>
 <p>
@@ -1294,7 +1291,120 @@
 shut down (delete) all devices when the program terminates. It is therefore
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
-<!--X1.1.6--></td></tr></table>
+
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>Remote Control</h2>
+
+<center><i><b>The joy of zapping!</b></i></center><p>
+
+There are several ways to control the operation of VDR. The builtin methods
+are using the PC keyboard, a homebuilt RCU unit or the LIRC interface.
+Of course there may be many more ways you might think of to implement a
+remote control, so a plugin can use the <tt>cRemote</tt> class to do that.
+<p>
+The simplest method for a plugin to issue commands to VDR is to call the
+static function <tt>cRemote::Put(eKeys Key)</tt>, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cRemote::Put(kUp);
+</pre></td></tr></table><p>
+
+In this case the plugin must do the mapping of whatever incoming signal or code
+it processes to the <tt>eKeys</tt> values itself. This makes sense if the incoming
+codes are well known and won't ever change.
+<p>
+In cases where the incoming codes are not known, or not all available keys may
+be supported by the actual remote control in use, you may want to derive your
+own remote control class from <tt>cRemote</tt>, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/remote.h&gt;
+#include &lt;vdr/thread.h&gt;
+
+class cMyRemote : public cRemote, private cThread {
+private:
+  virtual void Action(void);
+public:
+  cMyRemote(const char *Name);
+  virtual bool Initialize(void);
+  };
+</pre></td></tr></table><p>
+
+Note that deriving from <tt>cThread</tt> is not required for a remote control
+class to work, but typically you may want to have a separate thread running that
+collects the input and delivers it to the <tt>cRemote</tt> base class.
+<p>
+You should create your derived remote control object in the
+<a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
+Note that the object has to be created on the heap (using <tt>new</tt>),
+and you shall not delete it at any point (it will be deleted automatically
+when the program ends).
+<p>
+The constructor of your remote control class should look like this
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cMyRemote::cMyRemote(const char *Name)
+:cRemote(Name)
+{
+  Start();
+}
+</pre></td></tr></table><p>
+
+The <tt>Name</tt> is important in order for the <tt>cRemote</tt> base class
+to be able to distinguish the codes for the various remote controls.
+When creating your <tt>cMyRemote</tt> object you should use the value returned
+by the <tt>Name()</tt> member function of the plugin class, which returns the
+plugin's name. Calling <tt>Start()</tt> will start the thread that collects
+the incoming data (by calling your <tt>Action()</tt> function).
+In case you need to do any other setup steps, like opening a file or initializing
+member variables, you should do so before calling <tt>Start()</tt>.
+<p>
+VDR will handle everything necessary to learn the key mappings of your remote
+control. In order to do so, it will first call the virtual function <tt>Initialize()</tt>,
+in which you should take all necessary steps to make sure your remote control
+can be accessed. This may, for instance, include trying various communications
+protocols. <tt>Initialize()</tt>, if implemented, shall only return after it has
+made sure data can be received from the remote control. Before calling this
+function, VDR will prompt the user on the OSD to press any key on the remote control.
+As soon as your derived <tt>cRemote</tt> class has detected useful incoming data,
+<tt>Initialize()</tt> should return <i>true</i>. If any fatal error occurs, <i>false</i>
+should be returned.
+<p>
+If your remote control class needs some setup data that shall be
+readily available next time VDR starts (without having to go through the initialization
+procedure again) it can use the <tt>cRemote</tt> member functions
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+void PutSetup(const char *Setup);
+const char *GetSetup(void);
+</pre></td></tr></table><p>
+
+to store and retrieve a character string containing whatever data is needed.
+Note that the <tt>Initialize()</tt> function will only be called if there are
+no key mappings known for this remote control. Once the key mappings have been
+learned, <tt>Initialize()</tt> will never be called again.
+<p>
+The <tt>cRemote</tt> class assumes that any incoming remote control code can be
+expressed as a character string. So whatever data your remote control provides
+needs to be given to the base class by calling
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+Put(const char *Code, bool Repeat = false, bool Release = false);
+</pre></td></tr></table><p>
+
+where <tt>Code</tt> is the string representation of the remote control's
+incoming data. <tt>Repeat</tt> and <tt>Release</tt> are boolean flags that
+indicate whether this is a repeated keypress, or the key has been released.
+Since a common case for remote control data is to be given as a numerical
+value, there is another <tt>Put()</tt> function available for your convenience,
+which takes a 64 bit unsigned integer value instead of a character string:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+Put(uint64 Code, bool Repeat = false, bool Release = false);
+</pre></td></tr></table><p>
+
+The other parameters have the same meaning as in the first version of this function.
+<!--X1.1.11--></td></tr></table>
 
 </body>
 </html>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index 9778a81f9..3507baf71 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -22,3 +22,7 @@ VDR Plugin 'hello' Revision History
 2002-08-04: Version 0.0.5
 
 - Added a missing #include.
+
+2002-09-21: Version 0.0.6
+
+- Fixed Makefile for NEWSTRUCT driver.
diff --git a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
index b9d911ab4..802889bee 100644
--- a/PLUGINS/SRC/hello/Makefile
+++ b/PLUGINS/SRC/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.4 2002/06/10 16:24:06 kls Exp $
+# $Id: Makefile 1.5 2002/09/17 15:36:36 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,7 +15,12 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 ### The directory environment:
 
+ifdef NEWSTRUCT
+DVBDIR = ../../../../DVB/include
+DEFINES += -DNEWSTRUCT
+else
 DVBDIR = ../../../../DVB/ost/include
+endif
 VDRDIR = ../../..
 VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
@@ -34,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES = -I$(VDRINC) -I$(DVBDIR)
 
-DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index d14f369c5..3d1b22fdd 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.6 2002/08/04 15:13:35 kls Exp $
+ * $Id: hello.c 1.7 2002/09/21 08:44:56 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
index f0c208f12..f8e529708 100644
--- a/PLUGINS/SRC/status/HISTORY
+++ b/PLUGINS/SRC/status/HISTORY
@@ -8,3 +8,7 @@ VDR Plugin 'status' Revision History
 2002-07-13: Version 0.0.2
 
 - Changed the interface of cStatus::Replaying().
+
+2002-09-21: Version 0.0.3
+
+- Fixed Makefile for NEWSTRUCT driver.
diff --git a/PLUGINS/SRC/status/Makefile b/PLUGINS/SRC/status/Makefile
index 8cdb9fca5..f08f22cca 100644
--- a/PLUGINS/SRC/status/Makefile
+++ b/PLUGINS/SRC/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2002/08/28 19:30:35 kls Exp $
+# $Id: Makefile 1.3 2002/09/21 08:38:39 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,7 +15,12 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 ### The directory environment:
 
+ifdef NEWSTRUCT
+DVBDIR = ../../../../DVB/include
+DEFINES += -DNEWSTRUCT
+else
 DVBDIR = ../../../../DVB/ost/include
+endif
 VDRDIR = ../../..
 VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
@@ -34,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES = -I$(VDRINC) -I$(DVBDIR)
 
-DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -43,7 +48,7 @@ OBJS = $(PLUGIN).o
 ### The C++ compiler and options:
 
 CXX      = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules:
 
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
index dc274e81d..562493676 100644
--- a/PLUGINS/SRC/status/status.c
+++ b/PLUGINS/SRC/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.2 2002/07/13 10:55:55 kls Exp $
+ * $Id: status.c 1.3 2002/09/21 08:46:01 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/channels.conf b/channels.conf
index ad868d944..e1e89c33f 100644
--- a/channels.conf
+++ b/channels.conf
@@ -43,7 +43,6 @@ EinsMuXx:12110:h:0:27500:301:302:0:0:28203
 ZDF Theaterkanal:11954:h:0:27500:1110:1120:0:0:28016
 ZDF.doku:11954:h:0:27500:660:670:0:0:28014
 MDR:12110:h:0:27500:401:402:404:0:28204
-NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
 ORB:12110:h:0:27500:501:502:504:0:28205
 B1:12110:h:0:27500:601:602:604:0:28206
 ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
@@ -110,7 +109,7 @@ BuLi 6:11719:h:0:27500:3071:3072,3073:0:101:244
 BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
 BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
 BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
-:
+:-
 :#TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
 Andalucia TV:11934:v:0:27500:166:104:0:0:29011
@@ -159,7 +158,6 @@ Fashion TV:12402:v:0:27500:163:92:0:0:0
 VideoService:12422:h:0:27500:255:256:0:0:0
 Beta Research promo:12422:h:0:27500:1023:1024:0:0:0
 Canal Canarias:12441:v:0:27500:160:80:0:0:0
-TVC International:12441:v:0:27500:512:660:0:0:29701
 Fitur:12441:v:0:27500:514:662:0:0:0
 Astra Info 1:12552:v:0:22000:164:112:0:0:0
 Astra Info 2:12552:v:0:22000:165:120:0:0:0
diff --git a/config.c b/config.c
index 15d645d03..e5a560904 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.105 2002/09/04 13:45:56 kls Exp $
+ * $Id: config.c 1.106 2002/09/28 09:43:41 kls Exp $
  */
 
 #include "config.h"
@@ -19,169 +19,6 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// -- cKeys ------------------------------------------------------------------
-
-tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
-                    { kUp,            "Up",            0 },
-                    { kDown,          "Down",          0 },
-                    { kMenu,          "Menu",          0 },
-                    { kOk,            "Ok",            0 },
-                    { kBack,          "Back",          0 },
-                    { kLeft,          "Left",          0 },
-                    { kRight,         "Right",         0 },
-                    { kRed,           "Red",           0 },
-                    { kGreen,         "Green",         0 },
-                    { kYellow,        "Yellow",        0 },
-                    { kBlue,          "Blue",          0 },
-                    { k0,             "0",             0 },
-                    { k1,             "1",             0 },
-                    { k2,             "2",             0 },
-                    { k3,             "3",             0 },
-                    { k4,             "4",             0 },
-                    { k5,             "5",             0 },
-                    { k6,             "6",             0 },
-                    { k7,             "7",             0 },
-                    { k8,             "8",             0 },
-                    { k9,             "9",             0 },
-                    { kPower,         "Power",         0 },
-                    { kVolUp,         "Volume+",       0 },
-                    { kVolDn,         "Volume-",       0 },
-                    { kMute,          "Mute",          0 },
-                    { kNone,          "",              0 },
-                  };
-
-cKeys::cKeys(void)
-{
-  fileName = NULL;
-  code = 0;
-  address = 0;
-  keys = keyTable;
-}
-
-void cKeys::Clear(void)
-{
-  for (tKey *k = keys; k->type != kNone; k++)
-      k->code = 0;
-}
-
-void cKeys::SetDummyValues(void)
-{
-  for (tKey *k = keys; k->type != kNone; k++)
-      k->code = k->type + 1; // '+1' to avoid 0
-}
-
-bool cKeys::Load(const char *FileName)
-{
-  isyslog("loading %s", FileName);
-  bool result = false;
-  if (FileName)
-     fileName = strdup(FileName);
-  if (fileName) {
-     FILE *f = fopen(fileName, "r");
-     if (f) {
-        int line = 0;
-        char buffer[MAXPARSEBUFFER];
-        result = true;
-        while (fgets(buffer, sizeof(buffer), f) > 0) {
-              line++;
-              if (!isempty(buffer)) {
-                 char *Name = buffer;
-                 char *p = strpbrk(Name, " \t");
-                 if (p) {
-                    *p = 0; // terminates 'Name'
-                    while (*++p && isspace(*p))
-                          ;
-                    if (*p) {
-                       if (strcasecmp(Name, "Code") == 0)
-                          code = *p;
-                       else if (strcasecmp(Name, "Address") == 0)
-                          address = strtol(p, NULL, 16);
-                       else {
-                          for (tKey *k = keys; k->type != kNone; k++) {
-                              if (strcasecmp(Name, k->name) == 0) {
-                                 k->code = strtol(p, NULL, 16);
-                                 Name = NULL; // to indicate that we found it
-                                 break;
-                                 }
-                              }
-                           if (Name) {
-                              esyslog("unknown key in %s, line %d\n", fileName, line);
-                              result = false;
-                              break;
-                              }
-                           }
-                       }
-                    continue;
-                    }
-                 esyslog("error in %s, line %d\n", fileName, line);
-                 result = false;
-                 break;
-                 }
-              }
-        fclose(f);
-        }
-     else
-        esyslog("can't open '%s'\n", fileName);
-     }
-  else
-     esyslog("no key configuration file name supplied!\n");
-  return result;
-}
-
-bool cKeys::Save(void)
-{
-  cSafeFile f(fileName);
-  if (f.Open()) {
-     fprintf(f, "Code\t%c\nAddress\t%04X\n", code, address);
-     for (tKey *k = keys; k->type != kNone; k++)
-         fprintf(f, "%s\t%08X\n", k->name, k->code);
-     return f.Close();
-     }
-  return false;
-}
-
-eKeys cKeys::Get(unsigned int Code)
-{
-  if (Code != 0) {
-     tKey *k;
-     for (k = keys; k->type != kNone; k++) {
-         if (k->code == Code)
-            break;
-         }
-     return k->type;
-     }
-  return kNone;
-}
-
-eKeys cKeys::Translate(const char *Command)
-{
-  if (Command) {
-     const tKey *k = keys;
-     while ((k->type != kNone) && strcasecmp(k->name, Command) != 0)
-           k++;
-     return k->type;
-     }
-  return kNone;
-}
-
-unsigned int cKeys::Encode(const char *Command)
-{
-  eKeys k = Translate(Command);
-  if (k != kNone)
-     return keys[k].code;
-  return 0;
-}
-
-void cKeys::Set(eKeys Key, unsigned int Code)
-{
-  for (tKey *k = keys; k->type != kNone; k++) {
-      if (k->type == Key) {
-         k->code = Code;
-         break;
-         }
-      }
-}
-
 // -- cChannel ---------------------------------------------------------------
 
 char *cChannel::buffer = NULL;
@@ -247,7 +84,6 @@ bool cChannel::Parse(const char *s)
   if (*s == ':') {
      if (*++s) {
         strn0cpy(name, s, MaxChannelName);
-        name[strlen(name) - 1] = 0; // strip the '\n'
         groupSep = true;
         number = 0;
         }
@@ -696,7 +532,7 @@ bool cSVDRPhost::Parse(const char *s)
   if (p) {
      char *error = NULL;
      int m = strtoul(p + 1, &error, 10);
-     if (error && !isspace(*error) || m > 32)
+     if (error && *error && !isspace(*error) || m > 32)
         return false;
      *(char *)p = 0; // yes, we know it's 'const' - will be restored!
      if (m == 0)
@@ -733,10 +569,6 @@ bool cCaDefinition::Parse(const char *s)
   return 2 == sscanf(s, "%d %a[^\n]", &number, &description) && description && *description;
 }
 
-// -- cKeys ------------------------------------------------------------------
-
-cKeys Keys;
-
 // -- cCommands --------------------------------------------------------------
 
 cCommands Commands;
diff --git a/config.h b/config.h
index 85e14ddd1..dc0430542 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.127 2002/09/09 21:35:55 kls Exp $
+ * $Id: config.h 1.129 2002/09/29 10:42:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.10"
+#define VDRVERSION "1.1.11"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -30,69 +30,8 @@
 #define MINOSDHEIGHT 12
 #define MAXOSDHEIGHT 21
 
-enum eKeys { // "Up" and "Down" must be the first two keys!
-             kUp,
-             kDown,
-             kMenu,
-             kOk,
-             kBack,
-             kLeft,
-             kRight,
-             kRed,
-             kGreen,
-             kYellow,
-             kBlue,
-             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
-             kPower,
-             kVolUp,
-             kVolDn,
-             kMute,
-             kNone,
-             // The following flags are OR'd with the above codes:
-             k_Repeat  = 0x8000,
-             k_Release = 0x4000,
-             k_Flags   = k_Repeat | k_Release,
-           };
-
-// This is in preparation for having more key codes:
-#define kMarkToggle      k0
-#define kMarkMoveBack    k4
-#define kMarkMoveForward k6
-#define kMarkJumpBack    k7
-#define kMarkJumpForward k9
-#define kEditCut         k2
-#define kEditTest        k8
-
-#define RAWKEY(k)    (eKeys((k) & ~k_Flags))
-#define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
-#define NORMALKEY(k) (eKeys((k) & ~k_Repeat))
-
 #define MaxFileName 256
 
-struct tKey {
-  eKeys type;
-  char *name;
-  unsigned int code;
-  };
-
-class cKeys {
-private:
-  char *fileName;
-public:
-  unsigned char code;
-  unsigned short address;
-  tKey *keys;
-  cKeys(void);
-  void Clear(void);
-  void SetDummyValues(void);
-  bool Load(const char *FileName = NULL);
-  bool Save(void);
-  eKeys Translate(const char *Command);
-  unsigned int Encode(const char *Command);
-  eKeys Get(unsigned int Code);
-  void Set(eKeys Key, unsigned int Code);
-  };
-
 #define ISTRANSPONDER(f1, f2)  (abs((f1) - (f2)) < 4)
 
 class cChannel : public cListObject {
@@ -214,6 +153,7 @@ class cCaDefinition : public cListObject {
 template<class T> class cConfig : public cList<T> {
 private:
   char *fileName;
+  bool allowComments;
   void Clear(void)
   {
     free(fileName);
@@ -224,13 +164,17 @@ template<class T> class cConfig : public cList<T> {
   cConfig(void) { fileName = NULL; }
   virtual ~cConfig() { free(fileName); }
   const char *FileName(void) { return fileName; }
-  bool Load(const char *FileName, bool AllowComments = false)
+  bool Load(const char *FileName = NULL, bool AllowComments = false)
   {
     Clear();
-    fileName = strdup(FileName);
+    if (FileName) {
+       free(fileName);
+       fileName = strdup(FileName);
+       allowComments = AllowComments;
+       }
     bool result = false;
-    if (access(FileName, F_OK) == 0) {
-       isyslog("loading %s", FileName);
+    if (fileName && access(fileName, F_OK) == 0) {
+       isyslog("loading %s", fileName);
        FILE *f = fopen(fileName, "r");
        if (f) {
           int line = 0;
@@ -238,11 +182,12 @@ template<class T> class cConfig : public cList<T> {
           result = true;
           while (fgets(buffer, sizeof(buffer), f) > 0) {
                 line++;
-                if (AllowComments) {
+                if (allowComments) {
                    char *p = strchr(buffer, '#');
                    if (p)
                       *p = 0;
                    }
+                stripspace(buffer);
                 if (!isempty(buffer)) {
                    T *l = new T;
                    if (l->Parse(buffer))
@@ -322,7 +267,6 @@ class cCaDefinitions : public cConfig<cCaDefinition> {
 
 extern cChannels Channels;
 extern cTimers Timers;
-extern cKeys Keys;
 extern cCommands Commands;
 extern cSVDRPhosts SVDRPhosts;
 extern cCaDefinitions CaDefinitions;
diff --git a/device.c b/device.c
index 830c3ef36..12166a8a2 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.21 2002/09/15 11:50:19 kls Exp $
+ * $Id: device.c 1.22 2002/09/28 12:20:22 kls Exp $
  */
 
 #include "device.h"
@@ -201,7 +201,7 @@ void cDevice::SetVideoFormat(bool VideoFormat16_9)
 //#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
 #define PRINTPIDS(s)
 
-bool cDevice::HasPid(int Pid)
+bool cDevice::HasPid(int Pid) const
 {
   for (int i = 0; i < MAXPIDHANDLES; i++) {
       if (pidHandles[i].pid == Pid)
@@ -275,7 +275,7 @@ bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return false;
 }
 
-bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
+bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   return false;
 }
@@ -424,7 +424,7 @@ void cDevice::StillPicture(const uchar *Data, int Length)
 {
 }
 
-bool cDevice::Replaying(void)
+bool cDevice::Replaying(void) const
 {
   return player != NULL;
 }
@@ -478,7 +478,7 @@ int cDevice::PlayAudio(const uchar *Data, int Length)
   return -1;
 }
 
-int cDevice::Priority(void)
+int cDevice::Priority(void) const
 {
   int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
   for (int i = 0; i < MAXRECEIVERS; i++) {
@@ -488,7 +488,7 @@ int cDevice::Priority(void)
   return priority;
 }
 
-int cDevice::CanShift(int Ca, int Priority, int UsedCards)
+int cDevice::CanShift(int Ca, int Priority, int UsedCards) const
 {
   return -1;//XXX+ too complex with multiple recordings per device
   // Test whether a receiver on this device can be shifted to another one
@@ -523,7 +523,7 @@ int cDevice::CanShift(int Ca, int Priority, int UsedCards)
   return ShiftLevel;
 }
 
-int cDevice::ProvidesCa(int Ca)
+int cDevice::ProvidesCa(int Ca) const
 {
   if (Ca == CardIndex() + 1)
      return 1; // exactly _this_ card was requested
@@ -542,7 +542,7 @@ int cDevice::ProvidesCa(int Ca)
   return result ? result + others : 0;
 }
 
-bool cDevice::Receiving(void)
+bool cDevice::Receiving(void) const
 {
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i] && receiver[i]->priority >= 0) // cReceiver with priority < 0 doesn't count
diff --git a/device.h b/device.h
index 23662377a..b6f442730 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.18 2002/09/14 15:24:47 kls Exp $
+ * $Id: device.h 1.20 2002/09/28 12:20:34 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -50,7 +50,7 @@ class cPlayer;
 class cReceiver;
 class cSpuDecoder;
 
-class cDevice : cThread {
+class cDevice : public cThread {
 private:
   static int numDevices;
   static int useDevice;
@@ -111,7 +111,7 @@ class cDevice : cThread {
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
-  int ProvidesCa(int Ca);
+  int ProvidesCa(int Ca) const;
          // Checks whether this device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
          // value is provided, and > 1 if this and other values are provided.
@@ -139,7 +139,7 @@ class cDevice : cThread {
 protected:
   static int currentChannel;
 public:
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
          // Returns true if this device can provide the given channel.
          // In case the device has cReceivers attached to it or it is the primary
          // device, Priority is used to decide whether the caller's request can
@@ -186,7 +186,7 @@ class cDevice : cThread {
     cPidHandle(void) { pid = used = 0; handle = -1; }
     };
   cPidHandle pidHandles[MAXPIDHANDLES];
-  bool HasPid(int Pid);
+  bool HasPid(int Pid) const;
          // Returns true if this device is currently receiving the given PID.
   bool AddPid(int Pid, ePidType PidType = ptOther);
          // Adds a PID to the set of PIDs this device shall receive.
@@ -224,7 +224,7 @@ class cDevice : cThread {
   virtual void SetVolumeDevice(int Volume);
        // Sets the audio volume on this device (Volume = 0...255).
 public:
-  bool IsMute(void) { return mute; }
+  bool IsMute(void) const { return mute; }
   bool ToggleMute(void);
        // Turns the volume off or on and returns the new mute state.
   void SetVolume(int Volume, bool Absolute = false);
@@ -269,7 +269,7 @@ class cDevice : cThread {
        // one video and one audio strem.
   virtual int PlayAudio(const uchar *Data, int Length);
        // Plays additional audio streams, like Dolby Digital.
-  bool Replaying(void);
+  bool Replaying(void) const;
        // Returns true if we are currently replaying.
   void StopReplay(void);
        // Stops the current replay session (if any).
@@ -285,9 +285,9 @@ class cDevice : cThread {
 private:
   cReceiver *receiver[MAXRECEIVERS];
   int ca;
-  int CanShift(int Ca, int Priority, int UsedCards = 0);
+  int CanShift(int Ca, int Priority, int UsedCards = 0) const;
 protected:
-  int Priority(void);
+  int Priority(void) const;
       // Returns the priority of the current receiving session (0..MAXPRIORITY),
       // or -1 if no receiver is currently active. The primary device will
       // always return at least Setup.PrimaryLimit-1.
@@ -304,9 +304,9 @@ class cDevice : cThread {
       // false in case of a non recoverable error, otherwise it returns true,
       // even if Data is NULL.
 public:
-  int  Ca(void) { return ca; }
+  int  Ca(void) const { return ca; }
        // Returns the ca of the current receiving session.
-  bool Receiving(void);
+  bool Receiving(void) const;
        // Returns true if we are currently receiving.
   bool AttachReceiver(cReceiver *Receiver);
        // Attaches the given receiver to this device.
diff --git a/dvbdevice.c b/dvbdevice.c
index 0ba7c25d7..f337e3574 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.19 2002/09/15 13:12:25 kls Exp $
+ * $Id: dvbdevice.c 1.21 2002/09/29 13:53:26 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -344,7 +344,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
-bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
+bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
@@ -593,7 +593,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
          }
      if (!(status & FE_HAS_LOCK)) {
         esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->number, CardIndex() + 1);
-        if (IsPrimaryDevice())
+        if (LiveView && IsPrimaryDevice())
            cThread::RaisePanic();
         return false;
         }
@@ -603,7 +603,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
         if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) {
            if (event.type != FE_COMPLETION_EV) {
               esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1);
-              if (IsPrimaryDevice())
+              if (LiveView && IsPrimaryDevice())
                  cThread::RaisePanic();
               return false;
               }
diff --git a/dvbdevice.h b/dvbdevice.h
index b135ff660..acf569e01 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.10 2002/09/08 14:05:29 kls Exp $
+ * $Id: dvbdevice.h 1.11 2002/09/28 12:21:36 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -63,7 +63,7 @@ class cDvbDevice : public cDevice {
 private:
   int frequency;
 public:
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 
diff --git a/dvbspu.c b/dvbspu.c
index 1e2985900..95edb1bc1 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.1 2002/09/08 14:17:35 kls Exp $
+ * $Id: dvbspu.c 1.2 2002/09/29 13:48:39 kls Exp $
  */
 
 #include <assert.h>
@@ -138,8 +138,8 @@ bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
                 setMin(size.y1, minsize[i].y1);
                 setMax(size.x2, minsize[i].x2);
                 setMax(size.y2, minsize[i].y2);
-                ret = true;
             }
+            ret = true;
         }
     }
     if (ret)
@@ -248,6 +248,7 @@ void cDvbSpuDecoder::processSPU(uint32_t pts, uint8_t * buf)
     spubmp = NULL;
     delete[]spu;
     spu = buf;
+    spupts = pts;
 
     DCSQ_offset = cmdOffs();
     prev_DCSQ_offset = 0;
@@ -402,7 +403,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
         int i = DCSQ_offset;
         state = spNONE;
 
-        uint32_t exec_time = pts + spuU32(i) * 1024;
+        uint32_t exec_time = spupts + spuU32(i) * 1024;
         if ((pts != 0) && (exec_time > pts))
             return 0;
         DEBUG("offs = %d, rel = %d, time = %d, pts = %d, diff = %d\n",
@@ -416,7 +417,8 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
 
             prev_DCSQ_offset = DCSQ_offset;
             DCSQ_offset = spuU32(i);
-            DEBUG("offs = %d, DCSQ = %d\n", i, DCSQ_offset);
+            DEBUG("offs = %d, DCSQ = %d, prev_DCSQ = %d\n", 
+                           i, DCSQ_offset, prev_DCSQ_offset);
             i += 2;
 
             while (spu[i] != CMD_SPU_EOF) {     // Command Sequence
diff --git a/dvbspu.h b/dvbspu.h
index 5ac2d0ac7..11bf7207f 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.1 2002/09/08 14:17:38 kls Exp $
+ * $Id: dvbspu.h 1.2 2002/09/29 13:49:01 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -95,6 +95,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
 
     // processing state
     uint8_t *spu;
+    uint32_t spupts;
     bool clean;
     bool ready;
 
diff --git a/eit.c b/eit.c
index d4912c291..1e6993005 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.51 2002/09/15 14:35:32 kls Exp $
+ * $Id: eit.c 1.52 2002/09/20 16:24:17 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1223,9 +1223,8 @@ table identifer tid */
 bool cSIProcessor::AddFilter(u_char pid, u_char tid)
 {
    dmxSctFilterParams sctFilterParams;
+   memset(&sctFilterParams, 0, sizeof(sctFilterParams));
    sctFilterParams.pid = pid;
-   memset(&sctFilterParams.filter.filter, 0, DMX_FILTER_SIZE);
-   memset(&sctFilterParams.filter.mask, 0, DMX_FILTER_SIZE);
    sctFilterParams.timeout = 0;
    sctFilterParams.flags = DMX_IMMEDIATE_START;
    sctFilterParams.filter.filter[0] = tid;
diff --git a/i18n.c b/i18n.c
index 39948c2a6..81b771784 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.92 2002/06/22 09:26:36 kls Exp $
+ * $Id: i18n.c 1.93 2002/09/29 12:32:46 kls Exp $
  *
  * Translations provided by:
  *
@@ -2401,6 +2401,22 @@ const tI18nPhrase Phrases[] = {
     "(Apasati 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
   },
+  { "(press 'Menu' to skip this key)",
+    "('Men�' dr�cken zum �berspringen)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
     "Faza 3: Shranjujem kodo",
diff --git a/interface.c b/interface.c
index 8d4da216b..3f1fba8f1 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.54 2002/08/11 11:46:47 kls Exp $
+ * $Id: interface.c 1.55 2002/09/29 12:50:22 kls Exp $
  */
 
 #include "interface.h"
@@ -22,27 +22,14 @@ cInterface::cInterface(int SVDRPport)
   open = 0;
   cols[0] = 0;
   width = height = 0;
-  keyFromWait = kNone;
   interrupted = false;
-  rcIo = NULL;
   SVDRP = NULL;
-#if defined(REMOTE_RCU)
-  rcIo = new cRcIoRCU("/dev/ttyS1");
-#elif defined(REMOTE_LIRC)
-  rcIo = new cRcIoLIRC("/dev/lircd");
-#elif defined(REMOTE_KBD)
-  rcIo = new cRcIoKBD;
-#else
-  rcIo = new cRcIoBase; // acts as a dummy device
-#endif
-  rcIo->SetCode(Keys.code, Keys.address);
   if (SVDRPport)
      SVDRP = new cSVDRP(SVDRPport);
 }
 
 cInterface::~cInterface()
 {
-  delete rcIo;
   delete SVDRP;
 }
 
@@ -67,15 +54,6 @@ void cInterface::Close(void)
      }
 }
 
-unsigned int cInterface::GetCh(bool Wait, bool *Repeat, bool *Release)
-{
-  Flush();
-  if (!rcIo->InputAvailable())
-     cFile::AnyFileReady(-1, Wait ? 1000 : 0);
-  unsigned int Command;
-  return rcIo->GetCommand(&Command, Repeat, Release) ? Command : 0;
-}
-
 eKeys cInterface::GetKey(bool Wait)
 {
   Flush();
@@ -89,22 +67,7 @@ eKeys cInterface::GetKey(bool Wait)
            }
         }
      }
-  eKeys Key = keyFromWait;
-  if (Key == kNone) {
-     bool Repeat = false, Release = false;
-     Key = Keys.Get(GetCh(Wait, &Repeat, &Release));
-     if (Repeat)
-        Key = eKeys(Key | k_Repeat);
-     if (Release)
-        Key = eKeys(Key | k_Release);
-     }
-  keyFromWait = kNone;
-  return Key;
-}
-
-void cInterface::PutKey(eKeys Key)
-{
-  keyFromWait = Key;
+  return cRemote::Get(Wait ? 1000 : 10);
 }
 
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
@@ -120,7 +83,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
          break;
       }
   if (KeepChar && ISRAWKEY(Key))
-     keyFromWait = Key;
+     cRemote::Put(Key);
   interrupted = false;
   return Key;
 }
@@ -362,129 +325,118 @@ void cInterface::Help(const char *Red, const char *Green, const char *Yellow, co
   cStatus::MsgOsdHelpKeys(Red, Green, Yellow, Blue);
 }
 
-void cInterface::QueryKeys(void)
+void cInterface::QueryKeys(cRemote *Remote)
 {
-  Keys.Clear();
+  cRemote::Clear();
   Clear();
-  WriteText(1, 1, tr("Learning Remote Control Keys"));
+  WriteText(1, 1, tr("Learning Remote Control Keys"));//XXX Remote->name()!!!
   WriteText(1, 3, tr("Phase 1: Detecting RC code type"));
   WriteText(1, 5, tr("Press any key on the RC unit"));
   Flush();
-#ifndef REMOTE_KBD
-  unsigned char Code = '0';
-  unsigned short Address;
-#endif
-  for (;;) {
-#ifdef REMOTE_KBD
-      if (GetCh())
-         break;
-#else
-      //TODO on screen display...
-      if (rcIo->DetectCode(&Code, &Address)) {
-         Keys.code = Code;
-         Keys.address = Address;
-         WriteText(1, 5, tr("RC code detected!"));
-         WriteText(1, 6, tr("Do not press any key..."));
-         Flush();
-         rcIo->Flush(3000);
-         ClearEol(0, 5);
-         ClearEol(0, 6);
-         Flush();
-         break;
-         }
-#endif
-      }
-  WriteText(1, 3, tr("Phase 2: Learning specific key codes"));
-  tKey *k = Keys.keys;
-  while (k->type != kNone) {
-        char *Prompt;
-        asprintf(&Prompt, tr("Press key for '%s'"), tr(k->name));
-        WriteText(1, 5, Prompt);
-        free(Prompt);
-        for (;;) {
-            unsigned int ch = GetCh();
-            if (ch != 0) {
-               switch (Keys.Get(ch)) {
-                 case kUp:   if (k > Keys.keys) {
-                                k--;
-                                break;
-                                }
-                 case kDown: if (k > Keys.keys + 1) {
-                                WriteText(1, 5, tr("Press 'Up' to confirm"));
-                                WriteText(1, 6, tr("Press 'Down' to continue"));
-                                ClearEol(0, 7);
-                                ClearEol(0, 8);
-                                for (;;) {
-                                    eKeys key = GetKey();
-                                    if (key == kUp) {
-                                       Clear();
-                                       return;
-                                       }
-                                    else if (key == kDown) {
-                                       ClearEol(0, 6);
-                                       break;
-                                       }
+  if (Remote->Initialize()) {
+     WriteText(1, 5, tr("RC code detected!"));
+     WriteText(1, 6, tr("Do not press any key..."));
+     Flush();
+     sleep(3);
+     ClearEol(0, 5);
+     ClearEol(0, 6);
+
+     WriteText(1, 3, tr("Phase 2: Learning specific key codes"));
+     eKeys NewKey = kUp;
+     while (NewKey != kNone) {
+           char *Prompt;
+           asprintf(&Prompt, tr("Press key for '%s'"), tr(cKey::ToString(NewKey)));
+           WriteText(1, 5, Prompt);
+           free(Prompt);
+           cRemote::Clear();
+           Flush();
+           for (eKeys k = NewKey; k == NewKey; ) {
+               char *NewCode = NULL;
+               eKeys Key = cRemote::Get(100, &NewCode);
+               switch (Key) {
+                 case kUp:   {
+                               NewKey = eKeys(NewKey - 1);
+                               cKey *last = Keys.Last();
+                               if (last && last->Key() == NewKey)
+                                  Keys.Del(last);
+                             }
+                             break;
+                 case kDown: WriteText(1, 5, tr("Press 'Up' to confirm"));
+                             WriteText(1, 6, tr("Press 'Down' to continue"));
+                             ClearEol(0, 7);
+                             ClearEol(0, 8);
+                             ClearEol(0, 9);
+                             for (;;) {
+                                 Key = cRemote::Get(100);
+                                 if (Key == kUp) {
+                                    Clear();
+                                    return;
                                     }
-                                break;
+                                 else if (Key == kDown) {
+                                    ClearEol(0, 6);
+                                    k = kNone; // breaks the outer for() loop
+                                    break;
+                                    }
+                                 }
+                             break;
+                 case kMenu: NewKey = eKeys(NewKey + 1);
+                             break;
+                 case kNone: if (NewCode) {
+                                dsyslog("new %s code: %s = %s", Remote->Name(), NewCode, cKey::ToString(NewKey));
+                                Keys.Add(new cKey(Remote->Name(), NewCode, NewKey));
+                                NewKey = eKeys(NewKey + 1);
+                                free(NewCode);
                                 }
-                 case kNone: k->code = ch;
-                             k++;
                              break;
                  default:    break;
                  }
-               break;
                }
-            }
-        if (k > Keys.keys)
-           WriteText(1, 7, tr("(press 'Up' to go back)"));
-        else
-           ClearEol(0, 7);
-        if (k > Keys.keys + 1)
-           WriteText(1, 8, tr("(press 'Down' to end key definition)"));
-        else
-           ClearEol(0, 8);
-        }
+           if (NewKey > kUp)
+              WriteText(1, 7, tr("(press 'Up' to go back)"));
+           else
+              ClearEol(0, 7);
+           if (NewKey > kDown)
+              WriteText(1, 8, tr("(press 'Down' to end key definition)"));
+           else
+              ClearEol(0, 8);
+           if (NewKey > kMenu)
+              WriteText(1, 9, tr("(press 'Menu' to skip this key)"));
+           else
+              ClearEol(0, 9);
+           }
+     }
 }
 
 void cInterface::LearnKeys(void)
 {
-  isyslog("learning keys");
-  Open();
-  for (;;) {
-      Clear();
-      QueryKeys();
-      Clear();
-      WriteText(1, 1, tr("Learning Remote Control Keys"));
-      WriteText(1, 3, tr("Phase 3: Saving key codes"));
-      WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
-      for (;;) {
-          eKeys key = GetKey();
-          if (key == kUp) {
-             Keys.Save();
-             Close();
-             return;
-             }
-          else if (key == kDown) {
-             Keys.Load();
-             Close();
-             return;
+  for (cRemote *Remote = Remotes.First(); Remote; Remote = Remotes.Next(Remote)) {
+      bool known = Keys.KnowsRemote(Remote->Name());
+      dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
+      if (!known) {
+         Open();
+         for (;;) {
+             Clear();
+             cRemote::SetLearning(true);
+             QueryKeys(Remote);
+             cRemote::SetLearning(false);
+             Clear();
+             WriteText(1, 1, tr("Learning Remote Control Keys"));//XXX Remote->name()!!!
+             WriteText(1, 3, tr("Phase 3: Saving key codes"));
+             WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
+             for (;;) {
+                 eKeys key = GetKey();
+                 if (key == kUp) {
+                    Keys.Save();
+                    Close();
+                    return;
+                    }
+                 else if (key == kDown) {
+                    Keys.Load();
+                    Close();
+                    return;
+                    }
+                 }
              }
-          }
+         }
       }
 }
-
-void cInterface::DisplayChannelNumber(int Number)
-{
-  rcIo->Number(Number);
-}
-
-void cInterface::DisplayRecording(int Index, bool On)
-{
-  rcIo->SetPoints(1 << Index, On);
-}
-
-bool cInterface::Recording(void)
-{
-  // This is located here because the Interface has to do with the "PrimaryDevice" anyway
-  return cDevice::PrimaryDevice()->Receiving();
-}
diff --git a/interface.h b/interface.h
index 137c7d489..6344c5bd4 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.27 2002/06/22 14:39:48 kls Exp $
+ * $Id: interface.h 1.28 2002/09/29 10:46:50 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -22,12 +22,9 @@ class cInterface {
   int width, height;
   int open;
   int cols[MaxCols];
-  eKeys keyFromWait;
   bool interrupted;
   cSVDRP *SVDRP;
-  cRcIoBase *rcIo;
-  unsigned int GetCh(bool Wait = true, bool *Repeat = NULL, bool *Release = NULL);
-  void QueryKeys(void);
+  void QueryKeys(cRemote *Remote);
   void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
   eKeys Wait(int Seconds = 0, bool KeepChar = false);
 public:
@@ -40,7 +37,6 @@ class cInterface {
   int Width(void) { return width; }
   int Height(void) { return height; }
   eKeys GetKey(bool Wait = true);
-  void PutKey(eKeys Key);
   void Clear(void);
   void ClearEol(int x, int y, eDvbColor Color = clrBackground);
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
@@ -59,9 +55,6 @@ class cInterface {
   bool Confirm(const char *s, int Seconds = 10, bool WaitForTimeout = false);
   void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
-  void DisplayChannelNumber(int Number);
-  void DisplayRecording(int Index, bool On);
-  bool Recording(void);
   };
 
 extern cInterface *Interface;
diff --git a/keys-pc.conf b/keys-pc.conf
deleted file mode 100644
index d9a390f7c..000000000
--- a/keys-pc.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-Code	0
-Address	0000
-Up	00000103
-Down	00000102
-Menu	00000106
-Ok	0000000D
-Back	00000168
-Left	00000104
-Right	00000105
-Red	00000109
-Green	0000010A
-Yellow	0000010B
-Blue	0000010C
-0	00000030
-1	00000031
-2	00000032
-3	00000033
-4	00000034
-5	00000035
-6	00000036
-7	00000037
-8	00000038
-9	00000039
-Power   00000050
-Volume+	0000002B
-Volume-	0000002D
-Mute	0000006D
diff --git a/keys.c b/keys.c
new file mode 100644
index 000000000..0d91d6730
--- /dev/null
+++ b/keys.c
@@ -0,0 +1,154 @@
+/*
+ * keys.c: Remote control Key handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: keys.c 1.1 2002/09/29 09:56:51 kls Exp $
+ */
+
+#include "keys.h"
+
+static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
+                    { kUp,            "Up"      },
+                    { kDown,          "Down"    },
+                    { kMenu,          "Menu"    },
+                    { kOk,            "Ok"      },
+                    { kBack,          "Back"    },
+                    { kLeft,          "Left"    },
+                    { kRight,         "Right"   },
+                    { kRed,           "Red"     },
+                    { kGreen,         "Green"   },
+                    { kYellow,        "Yellow"  },
+                    { kBlue,          "Blue"    },
+                    { k0,             "0"       },
+                    { k1,             "1"       },
+                    { k2,             "2"       },
+                    { k3,             "3"       },
+                    { k4,             "4"       },
+                    { k5,             "5"       },
+                    { k6,             "6"       },
+                    { k7,             "7"       },
+                    { k8,             "8"       },
+                    { k9,             "9"       },
+                    { kPower,         "Power"   },
+                    { kVolUp,         "Volume+" },
+                    { kVolDn,         "Volume-" },
+                    { kMute,          "Mute"    },
+                    { kNone,          ""        },
+                    { k_Setup,        "_Setup"  },
+                    { kNone,          NULL      },
+                  };
+
+// -- cKey -------------------------------------------------------------------
+
+cKey::cKey(void)
+{
+  remote = code = NULL;
+  key = kNone;
+}
+
+cKey::cKey(const char *Remote, const char *Code, eKeys Key)
+{
+  remote = strdup(Remote);
+  code = strdup(Code);
+  key = Key;
+}
+
+cKey::~cKey()
+{
+  free(remote);
+  free(code);
+}
+
+bool cKey::Parse(char *s)
+{
+  char *p = strchr(s, '.');
+  if (p) {
+     *p++ = 0;
+     remote = strdup(s);
+     char *q = strpbrk(p, " \t");
+     if (q) {
+        *q++ = 0;
+        key = FromString(p);
+        if (key != kNone) {
+           q = skipspace(q);
+           if (*q) {
+              code = strdup(q);
+              return true;
+              }
+           }
+        }
+     }
+  return false;
+}
+
+bool cKey::Save(FILE *f)
+{
+  return fprintf(f, "%s.%-10s %s\n", remote, ToString(key), code) > 0;
+}
+
+eKeys cKey::FromString(const char *Name)
+{
+  if (Name) {
+     for (tKey *k = keyTable; k->name; k++) {
+         if (strcasecmp(k->name, Name) == 0)
+            return k->type;
+         }
+     }
+  return kNone;
+}
+
+const char *cKey::ToString(eKeys Key)
+{
+  for (tKey *k = keyTable; k->name; k++) {
+      if (k->type == Key)
+         return k->name;
+      }
+  return NULL;
+}
+
+// -- cKeys ------------------------------------------------------------------
+
+cKeys Keys;
+
+bool cKeys::KnowsRemote(const char *Remote)
+{
+  if (Remote) {
+     for (cKey *k = First(); k; k = Next(k)) {
+         if (strcmp(Remote, k->Remote()) == 0)
+            return true;
+         }
+     }
+  return false;
+}
+
+eKeys cKeys::Get(const char *Remote, const char *Code)
+{
+  if (Remote && Code) {
+     for (cKey *k = First(); k; k = Next(k)) {
+         if (strcmp(Remote, k->Remote()) == 0 && strcmp(Code, k->Code()) == 0)
+            return k->Key();
+         }
+     }
+  return kNone;
+}
+
+const char *cKeys::GetSetup(const char *Remote)
+{
+  if (Remote) {
+     for (cKey *k = First(); k; k = Next(k)) {
+         if (strcmp(Remote, k->Remote()) == 0 && k->Key() == k_Setup)
+            return k->Code();
+         }
+     }
+  return NULL;
+}
+
+void cKeys::PutSetup(const char *Remote, const char *Setup)
+{
+  if (!GetSetup(Remote))
+     Add(new cKey(Remote, Setup, k_Setup));
+  else
+     esyslog("ERROR: called PutSetup() for %s, but setup has already been defined!", Remote);
+}
diff --git a/keys.h b/keys.h
new file mode 100644
index 000000000..d5ecbbc46
--- /dev/null
+++ b/keys.h
@@ -0,0 +1,87 @@
+/*
+ * keys.h: Remote control Key handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: keys.h 1.1 2002/09/29 09:55:52 kls Exp $
+ */
+
+#ifndef __KEYS_H
+#define __KEYS_H
+
+#include "config.h"
+#include "tools.h"
+
+enum eKeys { // "Up" and "Down" must be the first two keys!
+             kUp,
+             kDown,
+             kMenu,
+             kOk,
+             kBack,
+             kLeft,
+             kRight,
+             kRed,
+             kGreen,
+             kYellow,
+             kBlue,
+             k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+             kPower,
+             kVolUp,
+             kVolDn,
+             kMute,
+             kNone,
+             k_Setup,
+             // The following flags are OR'd with the above codes:
+             k_Repeat  = 0x8000,
+             k_Release = 0x4000,
+             k_Flags   = k_Repeat | k_Release,
+           };
+
+// This is in preparation for having more key codes:
+#define kMarkToggle      k0
+#define kMarkMoveBack    k4
+#define kMarkMoveForward k6
+#define kMarkJumpBack    k7
+#define kMarkJumpForward k9
+#define kEditCut         k2
+#define kEditTest        k8
+
+#define RAWKEY(k)    (eKeys((k) & ~k_Flags))
+#define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
+#define NORMALKEY(k) (eKeys((k) & ~k_Repeat))
+
+struct tKey {
+  eKeys type;
+  char *name;
+  };
+
+class cKey : public cListObject {
+private:
+  char *remote;
+  char *code;
+  eKeys key;
+public:
+  cKey(void);
+  cKey(const char *Remote, const char *Code, eKeys Key);
+  ~cKey();
+  const char *Remote(void) { return remote; }
+  const char *Code(void) { return code; }
+  eKeys Key(void) { return key; }
+  bool Parse(char *s);
+  bool Save(FILE *f);
+  static eKeys FromString(const char *Name);
+  static const char *ToString(eKeys Key);
+  };
+
+class cKeys : public cConfig<cKey> {
+public:
+  bool KnowsRemote(const char *Remote);
+  eKeys Get(const char *Remote, const char *Code);
+  const char *GetSetup(const char *Remote);
+  void PutSetup(const char *Remote, const char *Setup);
+  };
+
+extern cKeys Keys;
+
+#endif //__KEYS_H
diff --git a/lirc.c b/lirc.c
new file mode 100644
index 000000000..f120743be
--- /dev/null
+++ b/lirc.c
@@ -0,0 +1,84 @@
+/*
+ * lirc.c: LIRC remote control
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
+ *
+ * $Id: lirc.c 1.1 2002/09/29 13:16:33 kls Exp $
+ */
+
+#include "lirc.h"
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#define REPEATLIMIT  20 // ms
+#define REPEATDELAY 350 // ms
+
+cLircRemote::cLircRemote(char *DeviceName)
+:cRemote("LIRC")
+{
+  struct sockaddr_un addr;
+  addr.sun_family = AF_UNIX;
+  strcpy(addr.sun_path, DeviceName);
+  if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
+     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
+        Start();
+        return;
+        }
+     LOG_ERROR_STR(DeviceName);
+     close(f);
+     }
+  else
+     LOG_ERROR_STR(DeviceName);
+  f = -1;
+}
+
+cLircRemote::~cLircRemote()
+{
+  Cancel();
+}
+
+void cLircRemote::Action(void)
+{
+  dsyslog("LIRC remote control thread started (pid=%d)", getpid());
+
+  int FirstTime = 0;
+  int LastTime = 0;
+  char buf[LIRC_BUFFER_SIZE];
+  char LastKeyName[LIRC_KEY_BUF] = "";
+  bool repeat = false;
+
+  for (; f >= 0;) {
+
+      LOCK_THREAD;
+
+      if (cFile::FileReady(f, REPEATLIMIT) && safe_read(f, buf, sizeof(buf)) > 21) {
+         int count;
+         char KeyName[LIRC_KEY_BUF];
+         sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
+         int Now = time_ms();
+         if (count == 0) {
+            strcpy(LastKeyName, KeyName);
+            repeat = false;
+            FirstTime = Now;
+            }
+         else {
+            if (Now - FirstTime < REPEATDELAY)
+               continue; // repeat function kicks in after a short delay
+            repeat = true;
+            }
+         LastTime = Now;
+         Put(KeyName, repeat);
+         }
+      else if (repeat) { // the last one was a repeat, so let's generate a release
+         if (time_ms() - LastTime > REPEATDELAY) {
+            Put(LastKeyName, false, true);
+            repeat = false;
+            *LastKeyName = 0;
+            }
+         }
+      }
+}
diff --git a/lirc.h b/lirc.h
new file mode 100644
index 000000000..ff58f3154
--- /dev/null
+++ b/lirc.h
@@ -0,0 +1,26 @@
+/*
+ * lirc.h: LIRC remote control
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: lirc.h 1.1 2002/09/28 14:11:04 kls Exp $
+ */
+
+#ifndef __LIRC_H
+#define __LIRC_H
+
+#include "remote.h"
+#include "thread.h"
+
+class cLircRemote : public cRemote, private cThread {
+private:
+  enum { LIRC_KEY_BUF = 30, LIRC_BUFFER_SIZE = 128 };
+  int f;
+  virtual void Action(void);
+public:
+  cLircRemote(char *DeviceName);
+  virtual ~cLircRemote();
+  };
+
+#endif //__LIRC_H
diff --git a/menu.c b/menu.c
index 7d13055d8..eaf260f4e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.208 2002/09/06 14:07:58 kls Exp $
+ * $Id: menu.c 1.209 2002/09/29 12:50:47 kls Exp $
  */
 
 #include "menu.h"
@@ -20,6 +20,7 @@
 #include "menuitems.h"
 #include "plugin.h"
 #include "recording.h"
+#include "remote.h"
 #include "status.h"
 #include "videodir.h"
 
@@ -2121,7 +2122,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
   int EpgLines = withInfo ? 5 : 1;
   lines = 0;
-  oldNumber = number = 0;
+  number = 0;
   cChannel *channel = Channels.GetByNumber(Number);
   Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   if (channel) {
@@ -2135,7 +2136,6 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdObject(true)
 {
   group = -1;
-  oldNumber = cDevice::CurrentChannel();
   number = 0;
   lastTime = time_ms();
   int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
@@ -2145,15 +2145,11 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 
 cDisplayChannel::~cDisplayChannel()
 {
-  if (number < 0)
-     Interface->DisplayChannelNumber(oldNumber);
   Interface->Close();
 }
 
 void cDisplayChannel::DisplayChannel(const cChannel *Channel)
 {
-  if (Channel && Channel->number > 0)
-     Interface->DisplayChannelNumber(Channel->number);
   int BufSize = Width() + 1;
   char buffer[BufSize];
   if (Channel && Channel->number > 0)
@@ -2231,7 +2227,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case k0:
          if (number == 0) {
             // keep the "Toggle channels" function working
-            Interface->PutKey(Key);
+            cRemote::Put(Key);
             return osEnd;
             }
     case k1 ... k9:
@@ -2290,7 +2286,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->number);
                   return osEnd;
     default:      if (NORMALKEY(Key) == kUp || NORMALKEY(Key) == kDown || (Key & (k_Repeat | k_Release)) == 0) {
-                     Interface->PutKey(Key);
+                     cRemote::Put(Key);
                      return osEnd;
                      }
     };
@@ -2397,7 +2393,7 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
          break;
     case kNone: break;
     default: if ((Key & k_Release) == 0) {
-                Interface->PutKey(Key);
+                cRemote::Put(Key);
                 return osEnd;
                 }
     }
@@ -2441,7 +2437,6 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   if (device->AttachReceiver(recorder)) {
      Recording.WriteSummary();
      cStatus::MsgRecording(device, Recording.Name());
-     Interface->DisplayRecording(device->CardIndex(), true);
      }
   else
      DELETENULL(recorder);
@@ -2487,7 +2482,6 @@ bool cRecordControl::GetEventInfo(void)
 void cRecordControl::Stop(bool KeepInstant)
 {
   if (timer) {
-     cStatus::MsgRecording(device, NULL);
      DELETENULL(recorder);
      timer->SetRecording(false);
      if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && timer->StopTime() <= time(NULL))) {
@@ -2496,7 +2490,7 @@ void cRecordControl::Stop(bool KeepInstant)
         Timers.Save();
         }
      timer = NULL;
-     Interface->DisplayRecording(device->CardIndex(), false);
+     cStatus::MsgRecording(device, NULL);
      cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
      }
 }
diff --git a/menu.h b/menu.h
index c03e627ef..247057b8e 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.45 2002/06/22 14:49:15 kls Exp $
+ * $Id: menu.h 1.46 2002/09/29 08:16:31 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -32,7 +32,7 @@ class cDisplayChannel : public cOsdObject {
   bool withInfo;
   int lines;
   int lastTime;
-  int oldNumber, number;
+  int number;
   void DisplayChannel(const cChannel *Channel);
   void DisplayInfo(void);
 public:
diff --git a/newplugin b/newplugin
index 55d425f16..e9bfc85bd 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.7 2002/08/28 19:26:27 kls Exp $
+# $Id: newplugin 1.8 2002/09/17 15:24:23 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -70,7 +70,12 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 
 ### The directory environment:
 
+ifdef NEWSTRUCT
+DVBDIR = ../../../../DVB/include
+DEFINES += -DNEWSTRUCT
+else
 DVBDIR = ../../../../DVB/ost/include
+endif
 VDRDIR = ../../..
 VDRINC = \$(VDRDIR)/include
 LIBDIR = ../../lib
@@ -89,7 +94,7 @@ PACKAGE = vdr-\$(ARCHIVE)
 
 INCLUDES = -I\$(VDRINC) -I\$(DVBDIR)
 
-DEFINES = -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/rcu.c b/rcu.c
new file mode 100644
index 000000000..6b7c4f978
--- /dev/null
+++ b/rcu.c
@@ -0,0 +1,312 @@
+/*
+ * rcu.c: RCU remote control
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: rcu.c 1.1 2002/09/29 13:16:44 kls Exp $
+ */
+
+#include "rcu.h"
+#include <netinet/in.h>
+#include <termios.h>
+#include <unistd.h>
+#include "tools.h"
+
+#define REPEATLIMIT  20 // ms
+#define REPEATDELAY 350 // ms
+
+cRcuRemote::cRcuRemote(char *DeviceName)
+:cRemote("RCU")
+{
+  dp = 0;
+  mode = modeB;
+  code = 0;
+  lastNumber = 0;
+  receivedCommand = false;
+  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
+     struct termios t;
+     if (tcgetattr(f, &t) == 0) {
+        cfsetspeed(&t, B9600);
+        cfmakeraw(&t);
+        if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
+           Number(0);//XXX 8888???
+           const char *Setup = GetSetup();
+           if (Setup) {
+              code = *Setup;
+              SetCode(code);
+              isyslog("connecting to %s remote control using code %c", Name(), code);
+              }
+           Start();
+           return;
+           }
+        }
+     LOG_ERROR_STR(DeviceName);
+     close(f);
+     }
+  else
+     LOG_ERROR_STR(DeviceName);
+  f = -1;
+}
+
+cRcuRemote::~cRcuRemote()
+{
+  Cancel();
+}
+
+bool cRcuRemote::Initialize(void)
+{
+  if (f >= 0) {
+     unsigned char Code = '0';
+     isyslog("trying codes for %s remote control...", Name());
+     for (;;) {
+         if (DetectCode(&Code)) {
+            code = Code;
+            break;
+            }
+         }
+     isyslog("established connection to %s remote control using code %c", Name(), code);
+     char buffer[16];
+     snprintf(buffer, sizeof(buffer), "%c", code);
+     PutSetup(buffer);
+     return true;
+     }
+  return false;
+}
+
+void cRcuRemote::Action(void)
+{
+#pragma pack(1)
+  union {
+    struct {
+      unsigned short address;
+      unsigned int command;
+      } data;
+    unsigned char raw[6];
+    } buffer;
+#pragma pack()
+
+  dsyslog("RCU remote control thread started (pid=%d)", getpid());
+
+  time_t LastCodeRefresh = 0;
+  int FirstTime = 0;
+  uint64 LastCommand = 0;
+  bool repeat = false;
+
+  //XXX
+  for (; f >= 0;) {
+
+      LOCK_THREAD;
+
+      if (ReceiveByte(REPEATLIMIT) == 'X') {
+         for (int i = 0; i < 6; i++) {
+             int b = ReceiveByte();
+             if (b >= 0) {
+                buffer.raw[i] = b;
+                if (i == 5) {
+                   unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
+                   uint64         Command = ntohl(buffer.data.command);
+                   if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
+                      // Well, well, if it isn't the "d-box"...
+                      // This remote control sends the above command before and after
+                      // each keypress - let's just drop this:
+                      break;
+                   int Now = time_ms();
+                   Command |= uint64(Address) << 32;
+                   if (Command != LastCommand) {
+                      LastCommand = Command;
+                      repeat = false;
+                      FirstTime = Now;
+                      }
+                   else {
+                      if (Now - FirstTime < REPEATDELAY)
+                         break; // repeat function kicks in after a short delay
+                      repeat = true;
+                      }
+                   Put(Command, repeat);
+                   receivedCommand = true;
+                   }
+                }
+             else
+                break;
+             }
+         }
+      else if (repeat) { // the last one was a repeat, so let's generate a release
+         Put(LastCommand, false, true);
+         repeat = false;
+         LastCommand = 0;
+         }
+      else
+         LastCommand = 0;
+      if (code && time(NULL) - LastCodeRefresh > 60) {
+         SendCommand(code); // in case the PIC listens to the wrong code
+         LastCodeRefresh = time(NULL);
+         }
+      }
+}
+
+int cRcuRemote::ReceiveByte(int TimeoutMs)
+{
+  // Returns the byte if one was received within a timeout, -1 otherwise
+  if (cFile::FileReady(f, TimeoutMs)) {
+     unsigned char b;
+     if (safe_read(f, &b, 1) == 1)
+        return b;
+     else
+        LOG_ERROR;
+     }
+  return -1;
+}
+
+bool cRcuRemote::SendByteHandshake(unsigned char c)
+{
+  if (f >= 0) {
+     int w = write(f, &c, 1);
+     if (w == 1) {
+        for (int reply = ReceiveByte(REPEATLIMIT); reply >= 0;) {
+            if (reply == c)
+               return true;
+            else if (reply == 'X') {
+               // skip any incoming RC code - it will come again
+               for (int i = 6; i--;) {
+                   if (ReceiveByte() < 0)
+                      return false;
+                   }
+               }
+            else
+               return false;
+            }
+        }
+     LOG_ERROR;
+     }
+  return false;
+}
+
+bool cRcuRemote::SendByte(unsigned char c)
+{
+  LOCK_THREAD;
+
+  for (int retry = 5; retry--;) {
+      if (SendByteHandshake(c))
+         return true;
+      }
+  return false;
+}
+
+bool cRcuRemote::SetCode(unsigned char Code)
+{
+  code = Code;
+  return SendCommand(code);
+}
+
+bool cRcuRemote::SetMode(unsigned char Mode)
+{
+  mode = Mode;
+  return SendCommand(mode);
+}
+
+bool cRcuRemote::SendCommand(unsigned char Cmd)
+{ 
+  return SendByte(Cmd | 0x80);
+}
+
+bool cRcuRemote::Digit(int n, int v)
+{ 
+  return SendByte(((n & 0x03) << 5) | (v & 0x0F) | (((dp >> n) & 0x01) << 4));
+}
+
+bool cRcuRemote::Number(int n, bool Hex)
+{
+  LOCK_THREAD;
+
+  if (!Hex) {
+     char buf[8];
+     sprintf(buf, "%4d", n & 0xFFFF);
+     n = 0;
+     for (char *d = buf; *d; d++) {
+         if (*d == ' ')
+            *d = 0xF;
+         n = (n << 4) | ((*d - '0') & 0x0F);
+         }
+     }
+  lastNumber = n;
+  for (int i = 0; i < 4; i++) {
+      if (!Digit(i, n))
+         return false;
+      n >>= 4;
+      }
+  return SendCommand(mode);
+}
+
+bool cRcuRemote::String(char *s)
+{
+  LOCK_THREAD;
+
+  const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
+  int n = 0;
+
+  for (int i = 0; *s && i < 4; s++, i++) {
+      n <<= 4;
+      for (const char *c = chars; *c; c++) {
+          if (*c == *s) {
+             n |= c - chars;
+             break;
+             }
+          }
+      }
+  return Number(n, true);
+}
+
+void cRcuRemote::SetPoints(unsigned char Dp, bool On)
+{ 
+  if (On)
+     dp |= Dp;
+  else
+     dp &= ~Dp;
+  Number(lastNumber, true);
+}
+
+bool cRcuRemote::DetectCode(unsigned char *Code)
+{
+  // Caller should initialize 'Code' to 0 and call DetectCode()
+  // until it returns true. Whenever DetectCode() returns false
+  // and 'Code' is not 0, the caller can use 'Code' to display
+  // a message like "Trying code '%c'". If false is returned and
+  // 'Code' is 0, all possible codes have been tried and the caller
+  // can either stop calling DetectCode() (and give some error
+  // message), or start all over again.
+  if (*Code < 'A' || *Code > 'D') {
+     *Code = 'A';
+     return false;
+     }
+  if (*Code <= 'D') {
+     SetMode(modeH);
+     char buf[5];
+     sprintf(buf, "C0D%c", *Code);
+     String(buf);
+     SetCode(*Code);
+     delay_ms(2 * REPEATDELAY);
+     if (receivedCommand) {
+        SetMode(modeB);
+        String("----");
+        return true;
+        }
+     if (*Code < 'D') {
+        (*Code)++;
+        return false;
+        }
+     }
+  *Code = 0;
+  return false;
+}
+
+void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+{
+  if (ChannelNumber && Device->IsPrimaryDevice())
+     Number(ChannelNumber);
+}
+
+void cRcuRemote::Recording(const cDevice *Device, const char *Name)
+{
+  SetPoints(1 << Device->CardIndex(), Device->Receiving()); //XXX CardNumber()!!!
+}
diff --git a/rcu.h b/rcu.h
new file mode 100644
index 000000000..1c54999c6
--- /dev/null
+++ b/rcu.h
@@ -0,0 +1,44 @@
+/*
+ * rcu.h: RCU remote control
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: rcu.h 1.1 2002/09/29 08:56:15 kls Exp $
+ */
+
+#ifndef __RCU_H
+#define __RCU_H
+
+#include "remote.h"
+#include "status.h"
+#include "thread.h"
+
+class cRcuRemote : public cRemote, private cThread, private cStatus {
+private:
+  enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  int f;
+  unsigned char dp, code, mode;
+  int lastNumber;
+  bool receivedCommand;
+  bool SendCommand(unsigned char Cmd);
+  int ReceiveByte(int TimeoutMs = 0);
+  bool SendByteHandshake(unsigned char c);
+  bool SendByte(unsigned char c);
+  bool Digit(int n, int v);
+  bool SetCode(unsigned char Code);
+  bool SetMode(unsigned char Mode);
+  bool Number(int n, bool Hex = false);
+  void SetPoints(unsigned char Dp, bool On);
+  bool String(char *s);
+  bool DetectCode(unsigned char *Code);
+  virtual void Action(void);
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  virtual void Recording(const cDevice *Device, const char *Name);
+public:
+  cRcuRemote(char *DeviceName);
+  virtual ~cRcuRemote();
+  virtual bool Initialize(void);
+  };
+
+#endif //__RCU_H
diff --git a/remote.c b/remote.c
index 0ee42a79b..ffdfa18ad 100644
--- a/remote.c
+++ b/remote.c
@@ -1,12 +1,10 @@
 /*
- * remote.c: Interface to the Remote Control Unit
+ * remote.c: General Remote Control handling
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
- *
- * $Id: remote.c 1.27 2002/05/18 12:55:39 kls Exp $
+ * $Id: remote.c 1.28 2002/09/29 12:51:26 kls Exp $
  */
 
 #include "remote.h"
@@ -18,487 +16,150 @@
 #include <termios.h>
 #include <unistd.h>
 
-#if defined REMOTE_LIRC
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
-#endif
-
 #if defined REMOTE_KBD
 #include <ncurses.h>
 #endif
 
-#include "config.h"
 #include "tools.h"
 
-// --- cRcIoBase -------------------------------------------------------------
+// --- cRemote ---------------------------------------------------------------
 
-cRcIoBase::cRcIoBase(void)
-{
-  t = 0;
-}
+eKeys cRemote::keys[MaxKeys];
+int cRemote::in = 0;
+int cRemote::out = 0;
+bool cRemote::learning = false;
+char *cRemote::unknownCode = NULL;
+cMutex cRemote::mutex;
+cCondVar cRemote::keyPressed;
 
-cRcIoBase::~cRcIoBase()
+cRemote::cRemote(const char *Name)
 {
+  if (Name)
+     name = strdup(Name);
+  Remotes.Add(this);
 }
 
-// --- cRcIoKBD --------------------------------------------------------------
-
-#if defined REMOTE_KBD
-
-cRcIoKBD::cRcIoKBD(void)
+cRemote::~cRemote()
 {
-  f.Open(0); // stdin
+  free(name);
 }
 
-cRcIoKBD::~cRcIoKBD()
+const char *cRemote::GetSetup(void)
 {
+  return Keys.GetSetup(Name());
 }
 
-void cRcIoKBD::Flush(int WaitMs)
+void cRemote::PutSetup(const char *Setup)
 {
-  int t0 = time_ms();
-
-  timeout(10);
-  for (;;) {
-      while (getch() > 0)
-            t0 = time_ms();
-      if (time_ms() - t0 >= WaitMs)
-         break;
-      }
+  Keys.PutSetup(Name(), Setup);
 }
 
-bool cRcIoKBD::InputAvailable(void)
+void cRemote::Clear(void)
 {
-  return f.Ready(false);
-}
-
-bool cRcIoKBD::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
-{
-  if (Command) {
-     *Command = getch();
-     return int(*Command) > 0;
+  cMutexLock MutexLock(&mutex);
+  in = out = 0;
+  if (learning) {
+     free(unknownCode);
+     unknownCode = NULL;
      }
-  return false;
 }
 
-// --- cRcIoRCU --------------------------------------------------------------
-
-#elif defined REMOTE_RCU
-
-#define REPEATLIMIT  20 // ms
-#define REPEATDELAY 350 // ms
-
-cRcIoRCU::cRcIoRCU(char *DeviceName)
-{
-  dp = 0;
-  mode = modeB;
-  code = 0;
-  address = 0xFFFF;
-  receivedAddress = 0;
-  receivedCommand = 0;
-  receivedData = receivedRepeat = receivedRelease = false;
-  lastNumber = 0;
-  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
-     struct termios t;
-     if (tcgetattr(f, &t) == 0) {
-        cfsetspeed(&t, B9600);
-        cfmakeraw(&t);
-        if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
-           Start();
-           return;
-           }
+bool cRemote::Put(eKeys Key)
+{
+  if (Key != kNone) {
+     cMutexLock MutexLock(&mutex);
+     if ((Key & k_Release) != 0)
+        Clear();
+     int d = out - in;
+     if (d <= 0)
+        d = MaxKeys + d;
+     if (d - 1 > 0) {
+        keys[in] = Key;
+        if (++in >= MaxKeys)
+           in = 0;
+        keyPressed.Broadcast();
+        return true;
         }
-     LOG_ERROR_STR(DeviceName);
-     close(f);
+     return false;
      }
-  else
-     LOG_ERROR_STR(DeviceName);
-  f = -1;
-}
-
-cRcIoRCU::~cRcIoRCU()
-{
-  Cancel();
+  return true; // only a real key shall report an overflow!
 }
 
-void cRcIoRCU::Action(void)
+bool cRemote::Put(uint64 Code, bool Repeat, bool Release)
 {
-#pragma pack(1)
-  union {
-    struct {
-      unsigned short address;
-      unsigned int command;
-      } data;
-    unsigned char raw[6];
-    } buffer;
-#pragma pack()
-
-  dsyslog("RCU remote control thread started (pid=%d)", getpid());
-
-  int FirstTime = 0;
-  unsigned int LastCommand = 0;
-
-  for (; f >= 0;) {
-
-      LOCK_THREAD;
-
-      if (ReceiveByte(REPEATLIMIT) == 'X') {
-         for (int i = 0; i < 6; i++) {
-             int b = ReceiveByte();
-             if (b >= 0) {
-                buffer.raw[i] = b;
-                if (i == 5) {
-                   unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
-                   unsigned int   Command = ntohl(buffer.data.command);
-                   if (code == 'B' && address == 0x0000 && Command == 0x00004000)
-                      // Well, well, if it isn't the "d-box"...
-                      // This remote control sends the above command before and after
-                      // each keypress - let's just drop this:
-                      break;
-                   if (!receivedData) { // only accept new data the previous data has been fetched
-                      int Now = time_ms();
-                      if (Command != LastCommand) {
-                         receivedAddress = Address;
-                         receivedCommand = Command;
-                         receivedData = true;
-                         receivedRepeat = receivedRelease = false;
-                         FirstTime = Now;
-                         }
-                      else {
-                         if (Now - FirstTime < REPEATDELAY)
-                            break; // repeat function kicks in after a short delay
-                         receivedData = receivedRepeat = true;
-                         }
-                      LastCommand = Command;
-                      WakeUp();
-                      }
-                   }
-                }
-             else
-                break;
-             }
-         }
-      else if (receivedData) { // the last data before releasing the key hasn't been fetched yet
-         if (receivedRepeat) { // it was a repeat, so let's make it a release
-            receivedRepeat = false;
-            receivedRelease = true;
-            LastCommand = 0;
-            WakeUp();
-            }
-         }
-      else if (receivedRepeat) { // all data has already been fetched, but the last one was a repeat, so let's generate a release
-         receivedData = receivedRelease = true;
-         receivedRepeat = false;
-         LastCommand = 0;
-         WakeUp();
-         }
-      else
-         LastCommand = 0;
-      }
+  char buffer[32];
+  snprintf(buffer, sizeof(buffer), "%016LX", Code);
+  return Put(buffer, Repeat, Release);
 }
 
-int cRcIoRCU::ReceiveByte(int TimeoutMs)
+bool cRemote::Put(const char *Code, bool Repeat, bool Release)
 {
-  // Returns the byte if one was received within a timeout, -1 otherwise
-  if (cFile::FileReady(f, TimeoutMs)) {
-     unsigned char b;
-     if (safe_read(f, &b, 1) == 1)
-        return b;
-     else
-        LOG_ERROR;
+  eKeys Key = Keys.Get(Name(), Code);
+  if (Key != kNone) {
+     if (Repeat)
+        Key = eKeys(Key | k_Repeat);
+     if (Release)
+        Key = eKeys(Key | k_Release);
+     return Put(Key);
      }
-  return -1;
-}
-
-bool cRcIoRCU::SendByteHandshake(unsigned char c)
-{
-  if (f >= 0) {
-     int w = write(f, &c, 1);
-     if (w == 1) {
-        for (int reply = ReceiveByte(REPEATLIMIT); reply >= 0;) {
-            if (reply == c)
-               return true;
-            else if (reply == 'X') {
-               // skip any incoming RC code - it will come again
-               for (int i = 6; i--;) {
-                   if (ReceiveByte() < 0)
-                      return false;
-                   }
-               }
-            else
-               return false;
-            }
-        }
-     LOG_ERROR;
+  if (learning) {
+     free(unknownCode);
+     unknownCode = strdup(Code);
+     keyPressed.Broadcast();
      }
   return false;
 }
 
-bool cRcIoRCU::SendByte(unsigned char c)
+eKeys cRemote::Get(int WaitMs, char **UnknownCode)
 {
-  LOCK_THREAD;
-
-  for (int retry = 5; retry--;) {
-      if (SendByteHandshake(c))
-         return true;
-      }
-  return false;
-}
-
-bool cRcIoRCU::SetCode(unsigned char Code, unsigned short Address)
-{
-  code = Code;
-  address = Address;
-  return SendCommand(code);
-}
-
-bool cRcIoRCU::SetMode(unsigned char Mode)
-{
-  mode = Mode;
-  return SendCommand(mode);
-}
-
-void cRcIoRCU::Flush(int WaitMs)
-{
-  LOCK_THREAD;
-
-  int t0 = time_ms();
   for (;;) {
-      while (ReceiveByte() >= 0)
-            t0 = time_ms();
-      if (time_ms() - t0 >= WaitMs)
-         break;
-      }
-  receivedData = receivedRepeat = false;
-}
-
-bool cRcIoRCU::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
-{
-  if (receivedData) { // first we check the boolean flag without a lock, to avoid delays
-
-     LOCK_THREAD;
-
-     if (receivedData) { // need to check again, since the status might have changed while waiting for the lock
-        if (Command)
-           *Command = receivedCommand;
-        if (Repeat)
-           *Repeat = receivedRepeat;
-        if (Release)
-           *Release = receivedRelease;
-        receivedData = false;
-        return true;
-        }
-     }
-  if (time(NULL) - t > 60) {
-     SendCommand(code); // in case the PIC listens to the wrong code
-     t = time(NULL);
-     }
-  return false;
-}
-
-bool cRcIoRCU::SendCommand(unsigned char Cmd)
-{ 
-  return SendByte(Cmd | 0x80);
-}
-
-bool cRcIoRCU::Digit(int n, int v)
-{ 
-  return SendByte(((n & 0x03) << 5) | (v & 0x0F) | (((dp >> n) & 0x01) << 4));
-}
-
-bool cRcIoRCU::Number(int n, bool Hex)
-{
-  LOCK_THREAD;
-
-  if (!Hex) {
-     char buf[8];
-     sprintf(buf, "%4d", n & 0xFFFF);
-     n = 0;
-     for (char *d = buf; *d; d++) {
-         if (*d == ' ')
-            *d = 0xF;
-         n = (n << 4) | ((*d - '0') & 0x0F);
+      cMutexLock MutexLock(&mutex);
+      if (in != out) {
+         eKeys k = keys[out];
+         if (++out >= MaxKeys)
+            out = 0;
+         return k;
+         }
+      else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs)) {
+         if (learning && UnknownCode) {
+            *UnknownCode = unknownCode;
+            unknownCode = NULL;
+            }
+         return kNone;
          }
-     }
-  lastNumber = n;
-  for (int i = 0; i < 4; i++) {
-      if (!Digit(i, n))
-         return false;
-      n >>= 4;
       }
-  return SendCommand(mode);
 }
 
-bool cRcIoRCU::String(char *s)
-{
-  LOCK_THREAD;
+// --- cRemotes --------------------------------------------------------------
 
-  const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
-  int n = 0;
+cRemotes Remotes;
 
-  for (int i = 0; *s && i < 4; s++, i++) {
-      n <<= 4;
-      for (const char *c = chars; *c; c++) {
-          if (*c == *s) {
-             n |= c - chars;
-             break;
-             }
-          }
-      }
-  return Number(n, true);
-}
-
-void cRcIoRCU::SetPoints(unsigned char Dp, bool On)
-{ 
-  if (On)
-     dp |= Dp;
-  else
-     dp &= ~Dp;
-  Number(lastNumber, true);
-}
+// --- cKbdRemote ------------------------------------------------------------
 
-bool cRcIoRCU::DetectCode(unsigned char *Code, unsigned short *Address)
-{
-  // Caller should initialize 'Code' to 0 and call DetectCode()
-  // until it returns true. Whenever DetectCode() returns false
-  // and 'Code' is not 0, the caller can use 'Code' to display
-  // a message like "Trying code '%c'". If false is returned and
-  // 'Code' is 0, all possible codes have been tried and the caller
-  // can either stop calling DetectCode() (and give some error
-  // message), or start all over again.
-  if (*Code < 'A' || *Code > 'D') {
-     *Code = 'A';
-     return false;
-     }
-  if (*Code <= 'D') {
-     SetMode(modeH);
-     char buf[5];
-     sprintf(buf, "C0D%c", *Code);
-     String(buf);
-     SetCode(*Code, 0);
-     delay_ms(REPEATDELAY);
-     receivedData = receivedRepeat = 0;
-     delay_ms(REPEATDELAY);
-     if (GetCommand()) {
-        *Address = receivedAddress;
-        SetMode(modeB);
-        String("----");
-        return true;
-        }
-     if (*Code < 'D') {
-        (*Code)++;
-        return false;
-        }
-     }
-  *Code = 0;
-  return false;
-}
-
-// --- cRcIoLIRC -------------------------------------------------------------
-
-#elif defined REMOTE_LIRC
-
-#define REPEATLIMIT  20 // ms
-#define REPEATDELAY 350 // ms
+#if defined REMOTE_KBD
 
-cRcIoLIRC::cRcIoLIRC(char *DeviceName)
+cKbdRemote::cKbdRemote(void)
+:cRemote("KBD")
 {
-  *keyName = 0;
-  receivedData = receivedRepeat = false;
-  struct sockaddr_un addr;
-  addr.sun_family = AF_UNIX;
-  strcpy(addr.sun_path, DeviceName);
-  if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
-     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
-        Start();
-        return;
-        }
-     LOG_ERROR_STR(DeviceName);
-     close(f);
-     }
-  else
-     LOG_ERROR_STR(DeviceName);
-  f = -1;
+  Start();
 }
 
-cRcIoLIRC::~cRcIoLIRC()
+cKbdRemote::~cKbdRemote()
 {
   Cancel();
 }
 
-void cRcIoLIRC::Action(void)
+void cKbdRemote::Action(void)
 {
-  dsyslog("LIRC remote control thread started (pid=%d)", getpid());
-
-  int FirstTime = 0;
-  int LastTime = 0;
-  char buf[LIRC_BUFFER_SIZE];
-  char LastKeyName[LIRC_KEY_BUF];
-
-  for (; f >= 0;) {
-
-      LOCK_THREAD;
-
-      if (cFile::FileReady(f, REPEATLIMIT) && safe_read(f, buf, sizeof(buf)) > 21) {
-         if (!receivedData) { // only accept new data the previous data has been fetched
-            int count;
-            sscanf(buf, "%*x %x %29s", &count, LastKeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
-            int Now = time_ms();
-            if (count == 0) {
-               strcpy(keyName, LastKeyName);
-               receivedData = true;
-               receivedRepeat = receivedRelease = false;
-               FirstTime = Now;
-               }
-            else {
-               if (Now - FirstTime < REPEATDELAY)
-                  continue; // repeat function kicks in after a short delay
-               receivedData = receivedRepeat = true;
-               receivedRelease = false;
-               }
-            LastTime = Now;
-            WakeUp();
-            }
-         }
-      else if (receivedData) { // the last data before releasing the key hasn't been fetched yet
-         if (receivedRepeat) { // it was a repeat, so let's make it a release
-            if (time_ms() - LastTime > REPEATDELAY) {
-               receivedRepeat = false;
-               receivedRelease = true;
-               WakeUp();
-               }
-            }
-         }
-      else if (receivedRepeat) { // all data has already been fetched, but the last one was a repeat, so let's generate a release
-         if (time_ms() - LastTime > REPEATDELAY) {
-            receivedData = receivedRelease = true;
-            receivedRepeat = false;
-            WakeUp();
-            }
-         }
+  dsyslog("KBD remote control thread started (pid=%d)", getpid());
+  cPoller Poller(STDIN_FILENO);
+  for (;;) {//XXX
+      int Command = getch();
+      if (Command != EOF)
+         Put(Command);
+      Poller.Poll(100);
       }
-}
-
-bool cRcIoLIRC::GetCommand(unsigned int *Command, bool *Repeat, bool *Release)
-{
-  if (receivedData) { // first we check the boolean flag without a lock, to avoid delays
-
-     LOCK_THREAD;
-
-     if (receivedData) { // need to check again, since the status might have changed while waiting for the lock
-        if (Command)
-           *Command = Keys.Encode(keyName);
-        if (Repeat)
-           *Repeat = receivedRepeat;
-        if (Release)
-           *Release = receivedRelease;
-        receivedData = false;
-        return true;
-        }
-     }
-  return false;
+  dsyslog("KBD remote control thread ended (pid=%d)", getpid());
 }
 
 #endif
-
diff --git a/remote.h b/remote.h
index 184a42e9c..f715ade7d 100644
--- a/remote.h
+++ b/remote.h
@@ -1,10 +1,10 @@
 /*
- * remote.h: Interface to the Remote Control Unit
+ * remote.h: General Remote Control handling
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.16 2002/05/09 11:43:04 kls Exp $
+ * $Id: remote.h 1.17 2002/09/29 11:26:45 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -12,91 +12,53 @@
 
 #include <stdio.h>
 #include <time.h>
+#include "keys.h"
 #include "thread.h"
 #include "tools.h"
 
-class cRcIoBase {
-protected:
-  time_t t;
-public:
-  enum { modeH = 'h', modeB = 'b', modeS = 's' };
-  cRcIoBase(void);
-  virtual ~cRcIoBase();
-  virtual bool SetCode(unsigned char Code, unsigned short Address) { return true; }
-  virtual bool SetMode(unsigned char Mode) { return true; }
-  virtual bool Number(int n, bool Hex = false) { return true; }
-  virtual void SetPoints(unsigned char Dp, bool On) {}
-  virtual bool String(char *s) { return true; }
-  virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
-  virtual void Flush(int WaitMs = 0) {}
-  virtual bool InputAvailable(void) { return false; }
-  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL) { return false; }
-  };
+typedef unsigned long long int uint64;
 
-#if defined REMOTE_KBD
-
-class cRcIoKBD : public cRcIoBase {
+class cRemote : public cListObject {
 private:
-  cFile f;
+  enum { MaxKeys = 16 };
+  static eKeys keys[MaxKeys];
+  static int in;
+  static int out;
+  static bool learning;
+  static char *unknownCode;
+  static cMutex mutex;
+  static cCondVar keyPressed;
+  char *name;
+protected:
+  cRemote(const char *Name);
+  const char *GetSetup(void);
+  void PutSetup(const char *Setup);
+  bool Put(uint64 Code, bool Repeat = false, bool Release = false);
+  bool Put(const char *Code, bool Repeat = false, bool Release = false);
 public:
-  cRcIoKBD(void);
-  virtual ~cRcIoKBD();
-  virtual void Flush(int WaitMs = 0);
-  virtual bool InputAvailable(void);
-  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
+  virtual ~cRemote();
+  virtual bool Initialize(void) { return true; }
+  const char *Name(void) { return name; }
+  static void SetLearning(bool On) { learning = On; }
+  static void Clear(void);
+  static bool Put(eKeys Key);
+  static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   };
 
-#elif defined REMOTE_RCU
+class cRemotes : public cList<cRemote> {};
 
-class cRcIoRCU : public cRcIoBase, private cThread {
-private:
-  int f;
-  unsigned char dp, code, mode;
-  unsigned short address;
-  unsigned short receivedAddress;
-  unsigned int receivedCommand;
-  bool receivedData, receivedRepeat, receivedRelease;
-  int lastNumber;
-  bool SendCommand(unsigned char Cmd);
-  int ReceiveByte(int TimeoutMs = 0);
-  bool SendByteHandshake(unsigned char c);
-  bool SendByte(unsigned char c);
-  bool Digit(int n, int v);
-  virtual void Action(void);
-public:
-  cRcIoRCU(char *DeviceName);
-  virtual ~cRcIoRCU();
-  virtual bool SetCode(unsigned char Code, unsigned short Address);
-  virtual bool SetMode(unsigned char Mode);
-  virtual bool Number(int n, bool Hex = false);
-  virtual void SetPoints(unsigned char Dp, bool On);
-  virtual bool String(char *s);
-  virtual bool DetectCode(unsigned char *Code, unsigned short *Address);
-  virtual void Flush(int WaitMs = 0);
-  virtual bool InputAvailable(void) { return receivedData; }
-  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
-  };
+extern cRemotes Remotes;
 
-#elif defined REMOTE_LIRC
+#if defined REMOTE_KBD
 
-class cRcIoLIRC : public cRcIoBase, private cThread {
+class cKbdRemote : public cRemote, private cThread {
 private:
-  enum { LIRC_KEY_BUF = 30, LIRC_BUFFER_SIZE = 128 };
-  int f;
-  char keyName[LIRC_KEY_BUF];
-  bool receivedData, receivedRepeat, receivedRelease;
   virtual void Action(void);
 public:
-  cRcIoLIRC(char *DeviceName);
-  virtual ~cRcIoLIRC();
-  virtual bool InputAvailable(void) { return receivedData; }
-  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
+  cKbdRemote(void);
+  virtual ~cKbdRemote();
   };
 
-#elif !defined REMOTE_NONE
-
-// #error Please define a remote control mode!
-
 #endif
 
 #endif //__REMOTE_H
diff --git a/svdrp.c b/svdrp.c
index 3115349c6..325b7dabc 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.42 2002/09/08 11:22:57 kls Exp $
+ * $Id: svdrp.c 1.43 2002/09/28 15:50:19 kls Exp $
  */
 
 #include "svdrp.h"
@@ -28,7 +28,8 @@
 #include <unistd.h>
 #include "config.h"
 #include "device.h"
-#include "interface.h"
+#include "keys.h"
+#include "remote.h"
 #include "tools.h"
 
 // --- cSocket ---------------------------------------------------------------
@@ -606,9 +607,9 @@ void cSVDRP::CmdHELP(const char *Option)
 void cSVDRP::CmdHITK(const char *Option)
 {
   if (*Option) {
-     eKeys k = Keys.Translate(Option);
+     eKeys k = cKey::FromString(Option);
      if (k != kNone) {
-        Interface->PutKey(k);
+        cRemote::Put(k);
         Reply(250, "Key \"%s\" accepted", Option);
         }
      else
@@ -617,7 +618,7 @@ void cSVDRP::CmdHITK(const char *Option)
   else {
      Reply(-214, "Valid <key> names for the HITK command:");
      for (int i = 0; i < kNone; i++) {
-         Reply(-214, "    %s", Keys.keys[i].name);
+         Reply(-214, "    %s", cKey::ToString(eKeys(i)));
          }
      Reply(214, "End of key list");
      }
diff --git a/transfer.c b/transfer.c
index 3b0b63601..bd4390bcb 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.2 2002/06/23 12:56:49 kls Exp $
+ * $Id: transfer.c 1.3 2002/09/22 09:50:48 kls Exp $
  */
 
 #include "transfer.h"
@@ -47,9 +47,11 @@ void cTransfer::Activate(bool On)
 
 void cTransfer::Receive(uchar *Data, int Length)
 {
-  int p = ringBuffer->Put(Data, Length);
-  if (p != Length && active)
-     esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length - p);
+  if (IsAttached()) {
+     int p = ringBuffer->Put(Data, Length);
+     if (p != Length && active)
+        esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length - p);
+     }
 }
 
 void cTransfer::Action(void)
diff --git a/vdr.5 b/vdr.5
index b440f12be..00c58edb7 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.4 2002/04/07 13:12:04 kls Exp $
+.\" $Id: vdr.5 1.5 2002/09/29 13:06:40 kls Exp $
 .\"
-.TH vdr 5 "7 Apr 2002" "1.0.0" "Video Disk Recorder Files"
+.TH vdr 5 "7 Sep 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -209,12 +209,18 @@ channels that don't require additional decryption hardware.
 
 The values \fB1...4\fR can be used for channels that for some reason explicitly
 need a given DVB card (for backward compatibility).
-.SS KEYS
-The file \fIkeys.conf\fR contains the key assignments for the remote control
-unit (RCU). If \fBvdr\fR has been built with REMOTE=KBD, the file \fIkeys-pc.conf\fR
-will be used instead. If you are using \fBvdr\fR together with \fBLIRC\fR, no
-such file will be used. In that case you need to consult the \fBLIRC\fR
-documentation to see how to set up the remote control key assignments there.
+.SS REMOTE CONTROL KEYS
+The file \fIremote.conf\fR contains the key assignments for all remote control
+units. Each line consists of one key assignment in the following format:
+
+\fBname.key  code\fR
+
+where \fBname\fR is the name of the remote control (for instance KBD for the
+PC keyboard, RCU for the home-built "Remote Control Unit", or LIRC for the
+"Linux Infrared Remote Control"), \fBkey\fR is the name of the key that is
+defined (like Up, Down, Menu etc.), and \fBcode\fR is a character string that
+this remote control delivers when the given key is pressed.
+
 .SS COMMANDS
 The file \fIcommands.conf\fR contains the definitions of commands that can
 be executed from the \fBvdr\fR main menu's "Commands" option.
diff --git a/vdr.c b/vdr.c
index 1f38af41d..fd23ae1e6 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.123 2002/09/15 11:08:35 kls Exp $
+ * $Id: vdr.c 1.124 2002/09/29 12:55:03 kls Exp $
  */
 
 #include <getopt.h>
@@ -37,19 +37,16 @@
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
+#include "keys.h"
+#include "lirc.h"
 #include "menu.h"
 #include "osd.h"
 #include "plugin.h"
+#include "rcu.h"
 #include "recording.h"
 #include "tools.h"
 #include "videodir.h"
 
-#ifdef REMOTE_KBD
-#define KEYS_CONF "keys-pc.conf"
-#else
-#define KEYS_CONF "keys.conf"
-#endif
-
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
@@ -319,11 +316,7 @@ int main(int argc, char *argv[])
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
   CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
-#if defined(REMOTE_LIRC)
-  Keys.SetDummyValues();
-#elif !defined(REMOTE_NONE)
-  bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
-#endif
+  Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
 
   // DVB interfaces:
 
@@ -350,6 +343,20 @@ int main(int argc, char *argv[])
 
   cOsd::Initialize();
 
+  // User interface:
+
+  Interface = new cInterface(SVDRPport);
+
+  // Remote Controls:
+#if defined(REMOTE_RCU)
+  new cRcuRemote("/dev/ttyS1");
+#elif defined(REMOTE_LIRC)
+  new cLircRemote("/dev/lircd");
+#elif defined(REMOTE_KBD)
+  new cKbdRemote;
+#endif
+  Interface->LearnKeys();
+
   // Channel:
 
   Channels.SwitchTo(Setup.CurrentChannel);
@@ -360,14 +367,6 @@ int main(int argc, char *argv[])
 
   cEITScanner EITScanner;
 
-  // User interface:
-
-  Interface = new cInterface(SVDRPport);
-#if !defined(REMOTE_LIRC) && !defined(REMOTE_NONE)
-  if (!KeysLoaded)
-     Interface->LearnKeys();
-#endif
-
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);

From 313e33539cd22fd571fc9a0f9f841173e9faebc4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Oct 2002 18:00:00 +0200
Subject: [PATCH 053/307] Version 1.1.12 - Fixed a missing Flush() call in the
 remote control learning procedure (thanks   to Oliver Endriss). - Modified
 channel handling to cover all parameters necessary for DVB-C and DVB-T   (see
 man vdr(5) for the meaning of the additional parameters stored in the field  
 previously named 'polarisation'). Thanks to Uwe Scheffler and Andy Carter for
 testing.   If you have a system with different kinds of DVB cards, like DVB-T
 and DVB-C,   for instance, there is no more need to distinguish the channels
 through the   'Ca' parameter in order to assign them to the various DVB
 cards. This is now   taken care of by the "source" parameter. So a channel
 marked as "terrestrial",   for example, will only be received on DVB-T cards.
   Note that the cChannel class has been moved into a separate file
 (channels.[ch]),   and that all data members have been made private and are
 now only accessible   through member functions. You may have to change any
 plugin code that accesses   cChannel data accordingly. - The new
 configuration file 'sources.conf' contains the various signal sources  
 (satellites, cable and terrestrial) which are used in 'channels.conf' and  
 'diseqc.conf' (thanks to Reinhard Walter Buchner for adding some satellites
 to   'sources.conf' and Oliver Endriss and Lauri Tischler for testing and
 debugging). - The 'diseqc' parameter in the channel definitions has been
 redefined to hold the   "source" of the given channel (which can be either a
 satellite, cable or terrestrial).   For compatibility with channels.conf
 files from older versions, numeric values in   this parameter will be
 tolerated, but they have no meaning. If you want to use   DiSEqC you will
 need to replace these old values with the proper source identifiers   defined
 in the new configuration file 'sources.conf'. See how this is done in the  
 'channels.conf' file that comes with the VDR package. - The new configuration
 file 'diseqc.conf' can be used to set up the individual   diseqc
 configuration (see man vdr(5) for a description of the file format). - The
 "Edit channel" menu has a new entry "Source:" in which the source of this  
 channel can be selected (either a satellite, cable or terrestrial). The set
 of   parameters at the end of this menu will change according to the type of
 source. - The "Use DiSEqC" parameter in the "Setup/LNB" menu has been moved
 to the beginning   of the list and disables the rest of the parameters when
 set to "yes", since these   are now only meaningful if DiSEqC is _not_ used.
 - Removed some unnecessary #includes from eit.c and changed
 cMenuRecordings::Del()   to cMenuRecordings::Delete() to avoid warnings in
 gcc-3.2 (thanks to Andreas   Schultz for pointing this out). - Improved
 skipping channels that are (currently) not available (thanks to Stefan  
 Huelswitt). - Updated channels.conf.terr and channels.conf.cable (thanks to
 Uwe Scheffler). - Fixed a bug when pressing the "Blue" button in the main
 menu without having   displayed it (thanks to Oliver Endriss for reporting
 this one).

---
 CONTRIBUTORS        |  23 ++-
 HISTORY             |  46 ++++-
 Makefile            |  11 +-
 PLUGINS.html        |  31 ++-
 channels.c          | 445 ++++++++++++++++++++++++++++++++++++++++++++
 channels.conf       | 356 +++++++++++++++++------------------
 channels.conf.cable | 371 +++++++++++++++++++-----------------
 channels.conf.terr  |  27 ++-
 channels.h          | 124 ++++++++++++
 config.c            | 202 +-------------------
 config.h            |  52 +-----
 device.c            |  58 +++---
 device.h            |   4 +-
 diseqc.c            | 136 ++++++++++++++
 diseqc.conf         |  30 +++
 diseqc.h            |  60 ++++++
 dvbdevice.c         | 282 ++++++++++++++++++----------
 dvbdevice.h         |   6 +-
 eit.c               |  10 +-
 eitscan.c           |   9 +-
 i18n.c              | 254 ++++++++++++++++++++++---
 interface.c         |   3 +-
 menu.c              | 277 ++++++++++++++++++++++-----
 menu.h              |   4 +-
 params.txt          |   4 +
 recording.c         |   3 +-
 sources.c           | 104 +++++++++++
 sources.conf        |  50 +++++
 sources.h           |  45 +++++
 svdrp.c             |  27 +--
 vdr.5               | 115 ++++++++++--
 vdr.c               |   9 +-
 32 files changed, 2303 insertions(+), 875 deletions(-)
 create mode 100644 channels.c
 create mode 100644 channels.h
 create mode 100644 diseqc.c
 create mode 100644 diseqc.conf
 create mode 100644 diseqc.h
 create mode 100644 params.txt
 create mode 100644 sources.c
 create mode 100644 sources.conf
 create mode 100644 sources.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 260cb592b..6b8de525c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -152,6 +152,7 @@ Stefan Huelswitt <huels@iname.com>
  for making cStatus::MsgChannelSwitch() only be called if a channel is actually going to
  be switched or has actually been switched successfully
  for adding a missing StripAudioPackets() to cDvbPlayer::Action()
+ for improving skipping channels that are (currently) not available
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -176,6 +177,8 @@ Andreas Schultz <aschultz@warp10.net>
  for implementing an SPU decoder
  for fixing opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT driver
  for reporting a problem with plugin Makefiles and the NEWSTRUCT driver
+ for pointing out some unnecessary #includes in eit.c and a problem with
+ cMenuRecordings::Del(), which caused warnings with gcc-3.2
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -184,7 +187,8 @@ Wolfgang Henselmann-Weiss <Wolfgang_Henselmann@betaresearch.de>
  for fixing calculating the timeout value in cFile::FileReady()
 
 Uwe Scheffler <UweScheffler@t-online.de>
- for his help in keeping 'channels.conf.cable' up to date
+ for his help in keeping 'channels.conf.cable' and 'channels.conf.terr' up to date
+ for helping to test new DVB-T handling
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
@@ -400,7 +404,22 @@ J
  for adding some missing #includes to files in libdtv for gcc 3.2
 
 Helmut Auer <vdr@helmutauer.de>
- for reporting a superfluous error message in cLockFile.
+ for reporting a superfluous error message in cLockFile
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
+
+Oliver Endriss <o.endriss@gmx.de>
+ for fixing a missing Flush() call in the remote control learning procedure
+ for helping to test and debug the new channel source and DiSEqC handling
+ for reporting a bug when pressing the "Blue" button in the main menu without
+ having displayed it
+
+Reinhard Walter Buchner <rw.buchner@freenet.de>
+ for adding some satellites to 'sources.conf'
+
+Lauri Tischler <lauri.tischler@efore.fi>
+ for helping to test and debug the new channel source and DiSEqC handling
+
+Andy Carter <fruit@ukgateway.net>
+ for helping to test new DVB-T handling
diff --git a/HISTORY b/HISTORY
index 12146a02d..b9140feec 100644
--- a/HISTORY
+++ b/HISTORY
@@ -93,7 +93,7 @@ Video Disk Recorder Revision History
 - The program can now run in full background mode by using the --daemon option.
 - Added a "summary" field to the timers (thanks to Carsten Koch!).
   This field can contain a descriptive text of the programme and will be
-  displayed when the "Blue" key is pressed on a recording that was created by
+  displayed when the "Blue" button is pressed on a recording that was created by
   this timer. If the text contains the special character '|', a newline will
   be inserted at that place.  When pressing "Ok" on a timer that contains a
   summary field, the summary will be displayed. To edit such a timer the "Red"
@@ -1535,3 +1535,47 @@ Video Disk Recorder Revision History
 - Fixed handling DVD subtitles in the SPU decoder (thanks to Andreas Schultz).
 - Avoiding restarts due to 'panic level' when switching channels on the primary
   device during EPG scan.
+
+2002-10-06: Version 1.1.12
+
+- Fixed a missing Flush() call in the remote control learning procedure (thanks
+  to Oliver Endriss).
+- Modified channel handling to cover all parameters necessary for DVB-C and DVB-T
+  (see man vdr(5) for the meaning of the additional parameters stored in the field
+  previously named 'polarisation'). Thanks to Uwe Scheffler and Andy Carter for testing.
+  If you have a system with different kinds of DVB cards, like DVB-T and DVB-C,
+  for instance, there is no more need to distinguish the channels through the
+  'Ca' parameter in order to assign them to the various DVB cards. This is now
+  taken care of by the "source" parameter. So a channel marked as "terrestrial",
+  for example, will only be received on DVB-T cards.
+  Note that the cChannel class has been moved into a separate file (channels.[ch]),
+  and that all data members have been made private and are now only accessible
+  through member functions. You may have to change any plugin code that accesses
+  cChannel data accordingly.
+- The new configuration file 'sources.conf' contains the various signal sources
+  (satellites, cable and terrestrial) which are used in 'channels.conf' and
+  'diseqc.conf' (thanks to Reinhard Walter Buchner for adding some satellites to
+  'sources.conf' and Oliver Endriss and Lauri Tischler for testing and debugging).
+- The 'diseqc' parameter in the channel definitions has been redefined to hold the
+  "source" of the given channel (which can be either a satellite, cable or terrestrial).
+  For compatibility with channels.conf files from older versions, numeric values in
+  this parameter will be tolerated, but they have no meaning. If you want to use
+  DiSEqC you will need to replace these old values with the proper source identifiers
+  defined in the new configuration file 'sources.conf'. See how this is done in the
+  'channels.conf' file that comes with the VDR package.
+- The new configuration file 'diseqc.conf' can be used to set up the individual
+  diseqc configuration (see man vdr(5) for a description of the file format).
+- The "Edit channel" menu has a new entry "Source:" in which the source of this
+  channel can be selected (either a satellite, cable or terrestrial). The set of
+  parameters at the end of this menu will change according to the type of source.
+- The "Use DiSEqC" parameter in the "Setup/LNB" menu has been moved to the beginning
+  of the list and disables the rest of the parameters when set to "yes", since these
+  are now only meaningful if DiSEqC is _not_ used.
+- Removed some unnecessary #includes from eit.c and changed cMenuRecordings::Del()
+  to cMenuRecordings::Delete() to avoid warnings in gcc-3.2 (thanks to Andreas
+  Schultz for pointing this out).
+- Improved skipping channels that are (currently) not available (thanks to Stefan
+  Huelswitt).
+- Updated channels.conf.terr and channels.conf.cable (thanks to Uwe Scheffler).
+- Fixed a bug when pressing the "Blue" button in the main menu without having
+  displayed it (thanks to Oliver Endriss for reporting this one).
diff --git a/Makefile b/Makefile
index 3902b39ea..cfb6f3a34 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.47 2002/09/28 14:12:43 kls Exp $
+# $Id: Makefile 1.48 2002/10/04 14:29:14 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -32,10 +32,11 @@ endif
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o\
-       interface.o keys.o lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o receiver.o\
-       recorder.o recording.o remote.o remux.o ringbuffer.o spu.o status.o svdrp.o thread.o\
-       tools.o transfer.o vdr.o videodir.o
+OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
+       dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
+       lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
+       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\
+       spu.o status.o svdrp.o thread.o tools.o transfer.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
diff --git a/PLUGINS.html b/PLUGINS.html
index 55e935b57..4c4592de7 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.7 are marked like this.
-<!--X1.1.7--></td></tr></table>
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.8 are marked like this.
 <!--X1.1.8--></td></tr></table>
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.9 are marked like this.
 <!--X1.1.9--></td></tr></table>
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.11 are marked like this.
 <!--X1.1.11--></td></tr></table>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.12 are marked like this.
+<!--X1.1.12--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -957,7 +957,6 @@
 individual block of data. The sum of all blocks must simply result in the
 desired video data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 To avoid busy loops the player should call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -965,7 +964,6 @@
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
-<!--X1.1.7--></td></tr></table>
 <p>
 TODO: PlayAudio()???
 <p>
@@ -1184,14 +1182,17 @@
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+virtual bool ProvidesSource(int Source) const;
+<!--X1.1.12--></td></tr></table>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 </pre></td></tr></table><p>
 
-These functions will be called with the desired channel and shall return whether
-this device can provide the requested channel and whether tuning to it was successful,
+These functions will be called with the desired source or channel and shall return whether
+this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
 <!--X1.1.9--></td></tr></table>
 <p>
@@ -1203,7 +1204,7 @@
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 virtual bool GetTSPacket(uchar *&amp;Data);
 <!--X1.1.9--></td></tr></table>
 </pre></td></tr></table><p>
@@ -1227,7 +1228,6 @@
 <p>
 The functions to implement replaying capabilites are
 
-<!--X1.1.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1240,7 +1240,6 @@
 virtual bool Poll(cPoller &amp;Poller, int TimeoutMs = 0);
 virtual int PlayVideo(const uchar *Data, int Length);
 </pre></td></tr></table><p>
-<!--X1.1.7--></td></tr></table>
 
 In addition, the following functions may be implemented to provide further
 functionality:
@@ -1251,7 +1250,7 @@
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>On Screen Display</b>
 <p>
@@ -1292,7 +1291,7 @@
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <hr><h2>Remote Control</h2>
 
 <center><i><b>The joy of zapping!</b></i></center><p>
diff --git a/channels.c b/channels.c
new file mode 100644
index 000000000..f86f8efb2
--- /dev/null
+++ b/channels.c
@@ -0,0 +1,445 @@
+/*
+ * channels.c: Channel handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: channels.c 1.3 2002/10/06 12:41:49 kls Exp $
+ */
+
+#include "channels.h"
+#ifdef NEWSTRUCT
+#include <linux/dvb/frontend.h>
+#else
+#include <ost/frontend.h>
+#endif
+#include <ctype.h>
+
+// IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
+// format characters in order to allow any number of blanks after a numeric
+// value!
+
+// -- Channel Parameter Maps -------------------------------------------------
+
+const tChannelParameterMap InversionValues[] = {
+  {   0, INVERSION_OFF },
+  {   1, INVERSION_ON },
+  { 999, INVERSION_AUTO },
+  { -1 }
+  };
+
+const tChannelParameterMap BandwidthValues[] = {
+  {   6, BANDWIDTH_6_MHZ },
+  {   7, BANDWIDTH_7_MHZ },
+  {   8, BANDWIDTH_8_MHZ },
+#ifdef NEWSTRUCT
+  { 999, BANDWIDTH_AUTO },
+#endif
+  { -1 }
+  };
+
+const tChannelParameterMap CoderateValues[] = {
+  {   0, FEC_NONE },
+  {  12, FEC_1_2 },
+  {  23, FEC_2_3 },
+  {  34, FEC_3_4 },
+#ifdef NEWSTRUCT
+  {  45, FEC_4_5 },
+#endif
+  {  56, FEC_5_6 },
+#ifdef NEWSTRUCT
+  {  67, FEC_6_7 },
+#endif
+  {  78, FEC_7_8 },
+#ifdef NEWSTRUCT
+  {  89, FEC_8_9 },
+#endif
+  { 999, FEC_AUTO },
+  { -1 }
+  };
+
+const tChannelParameterMap ModulationValues[] = {
+  {   0, QPSK },
+  {  16, QAM_16 },
+  {  32, QAM_32 },
+  {  64, QAM_64 },
+  { 128, QAM_128 },
+  { 256, QAM_256 },
+#ifdef NEWSTRUCT
+  { 999, QAM_AUTO },
+#endif
+  { -1 }
+  };
+
+const tChannelParameterMap TransmissionValues[] = {
+  {   2, TRANSMISSION_MODE_2K },
+  {   8, TRANSMISSION_MODE_8K },
+#ifdef NEWSTRUCT
+  { 999, TRANSMISSION_MODE_AUTO },
+#endif
+  { -1 }
+  };
+
+const tChannelParameterMap GuardValues[] = {
+  {   4, GUARD_INTERVAL_1_4 },
+  {   8, GUARD_INTERVAL_1_8 },
+  {  16, GUARD_INTERVAL_1_16 },
+  {  32, GUARD_INTERVAL_1_32 },
+#ifdef NEWSTRUCT
+  { 999, GUARD_INTERVAL_AUTO },
+#endif
+  { -1 }
+  };
+
+const tChannelParameterMap HierarchyValues[] = {
+  {   0, HIERARCHY_NONE },
+  {   1, HIERARCHY_1 },
+  {   2, HIERARCHY_2 },
+  {   4, HIERARCHY_4 },
+#ifdef NEWSTRUCT
+  { 999, HIERARCHY_AUTO },
+#endif
+  { -1 }
+  };
+
+int UserIndex(int Value, const tChannelParameterMap *Map)
+{
+  const tChannelParameterMap *map = Map;
+  while (map && map->userValue != -1) {
+        if (map->userValue == Value)
+           return map - Map;
+        map++;
+        }
+  return -1;
+}
+
+int DriverIndex(int Value, const tChannelParameterMap *Map)
+{
+  const tChannelParameterMap *map = Map;
+  while (map && map->userValue != -1) {
+        if (map->driverValue == Value)
+           return map - Map;
+        map++;
+        }
+  return -1;
+}
+
+int MapToUser(int Value, const tChannelParameterMap *Map)
+{
+  int n = DriverIndex(Value, Map);
+  if (n >= 0)
+     return Map[n].userValue;
+  return -1;
+}
+
+int MapToDriver(int Value, const tChannelParameterMap *Map)
+{
+  int n = UserIndex(Value, Map);
+  if (n >= 0)
+     return Map[n].driverValue;
+  return -1;
+}
+
+// -- cChannel ---------------------------------------------------------------
+
+char *cChannel::buffer = NULL;
+
+cChannel::cChannel(void)
+{
+  *name = 0;
+  frequency    = 0;
+  source       = 0;
+  srate        = 0;
+  vpid         = 0;
+  apid1        = 0;
+  apid2        = 0;
+  dpid1        = 0;
+  dpid2        = 0;
+  tpid         = 0;
+  ca           = 0;
+  sid          = 0;
+  groupSep     = false;
+  //XXX
+  polarization = 'v';
+  inversion    = INVERSION_AUTO;
+  bandwidth    = BANDWIDTH_8_MHZ;
+  coderateH    = FEC_AUTO;//XXX FEC_2_3
+  coderateL    = FEC_1_2;//XXX
+  modulation   = QAM_64;
+  transmission = TRANSMISSION_MODE_2K;
+  guard        = GUARD_INTERVAL_1_32;
+  hierarchy    = HIERARCHY_NONE;
+}
+
+cChannel::cChannel(const cChannel *Channel)
+{
+  strcpy(name,   Channel ? Channel->name         : "Pro7");
+  frequency    = Channel ? Channel->frequency    : 12480;
+  source       = Channel ? Channel->source       : 0;
+  srate        = Channel ? Channel->srate        : 27500;
+  vpid         = Channel ? Channel->vpid         : 255;
+  apid1        = Channel ? Channel->apid1        : 256;
+  apid2        = Channel ? Channel->apid2        : 0;
+  dpid1        = Channel ? Channel->dpid1        : 257;
+  dpid2        = Channel ? Channel->dpid2        : 0;
+  tpid         = Channel ? Channel->tpid         : 32;
+  ca           = Channel ? Channel->ca           : 0;
+  sid          = Channel ? Channel->sid          : 0;
+  groupSep     = Channel ? Channel->groupSep     : false;
+  //XXX
+  polarization = Channel ? Channel->polarization : 'v';
+  inversion    = Channel ? Channel->inversion    : INVERSION_AUTO;
+  bandwidth    = Channel ? Channel->bandwidth    : BANDWIDTH_8_MHZ;
+  coderateH    = Channel ? Channel->coderateH    : FEC_AUTO;//XXX FEC_2_3
+  coderateL    = Channel ? Channel->coderateL    : FEC_1_2;//XXX
+  modulation   = Channel ? Channel->modulation   : QAM_64;
+  transmission = Channel ? Channel->transmission : TRANSMISSION_MODE_2K;
+  guard        = Channel ? Channel->guard        : GUARD_INTERVAL_1_32;
+  hierarchy    = Channel ? Channel->hierarchy    : HIERARCHY_NONE;
+}
+
+static int PrintParameter(char *p, char Name, int Value)
+{
+  //XXX return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
+  //XXX let's store 999 for the moment, until we generally switch to the NEWSTRUCT
+  //XXX driver (where the defaults will all be AUTO)
+  return Value >= 0 && (Value != 999 || (Name != 'I' && Name != 'C')) ? sprintf(p, "%c%d", Name, Value) : 0;
+}
+
+const char *cChannel::ParametersToString(void)
+{
+  char type = *cSource::ToString(source);
+#define ST(s) if (strchr(s, type))
+  static char buffer[64];
+  char *q = buffer;
+  *q = 0;
+  ST(" S ")  q += sprintf(q, "%c", polarization);
+  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
+  ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
+  ST("C T")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
+  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+  ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+  ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
+  return buffer;
+}
+
+static const char *ParseParameter(const char *s, int &Value, const tChannelParameterMap *Map)
+{
+  if (*++s) {
+     char *p = NULL;
+     errno = 0;
+     int n = strtol(s, &p, 10);
+     if (!errno && p != s) {
+        //XXX let's tolerate 999 for the moment, until we generally switch to the NEWSTRUCT
+        //XXX driver (where the defaults will all be AUTO)
+        //XXX Value = MapToDriver(n, Map);
+        //XXX if (Value >= 0)
+        //XXX return p;
+        int v = MapToDriver(n, Map);
+        if (v >= 0) {
+           Value = v;
+           return p;
+           }
+        else if (v == 999)
+           return p;
+        }
+     }
+  esyslog("ERROR: illegal value for parameter '%c'", *(s - 1));
+  return NULL;
+}
+
+bool cChannel::StringToParameters(const char *s)
+{
+  while (s && *s) {
+        switch (toupper(*s)) {
+          case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
+          case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
+          case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
+          case 'G': s = ParseParameter(s, guard, GuardValues); break;
+          case 'H': polarization = *s++; break;
+          case 'I': s = ParseParameter(s, inversion, InversionValues); break;
+          // 'L' reserved for possible circular polarization
+          case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
+          // 'R' reserved for possible circular polarization
+          case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
+          case 'V': polarization = *s++; break;
+          case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
+          default: esyslog("ERROR: unknown parameter key '%c'", *s);
+                   return false;
+          }
+        }
+  return true;
+}
+
+const char *cChannel::ToText(cChannel *Channel)
+{
+  char buf[MaxChannelName * 2];
+  char *s = Channel->name;
+  if (strchr(s, ':')) {
+     s = strcpy(buf, s);
+     strreplace(s, ':', '|');
+     }
+  free(buffer);
+  if (Channel->groupSep)
+     asprintf(&buffer, ":%s\n", s);
+  else {
+     char apidbuf[32];
+     char *q = apidbuf;
+     q += snprintf(q, sizeof(apidbuf), "%d", Channel->apid1);
+     if (Channel->apid2)
+        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->apid2);
+     if (Channel->dpid1 || Channel->dpid2)
+        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ";%d", Channel->dpid1);
+     if (Channel->dpid2)
+        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
+     *q = 0;
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%d:%s:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->sid);
+     }
+  return buffer;
+}
+
+const char *cChannel::ToText(void)
+{
+  return ToText(this);
+}
+
+bool cChannel::Parse(const char *s)
+{
+  if (*s == ':') {
+     if (*++s) {
+        strn0cpy(name, s, MaxChannelName);
+        groupSep = true;
+        number = 0;
+        }
+     else
+        return false;
+     }
+  else {
+     groupSep = false;
+     char *namebuf = NULL;
+     char *sourcebuf = NULL;
+     char *parambuf = NULL;
+     char *apidbuf = NULL;
+     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%d :%a[^:]:%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpid, &apidbuf, &tpid, &ca, &sid);
+     if (fields >= 9) {
+        if (fields == 9) {
+           // allow reading of old format
+           sid = ca;
+           ca = tpid;
+           tpid = 0;
+           }
+        apid1 = apid2 = 0;
+        dpid1 = dpid2 = 0;
+        bool ok = false;
+        if (parambuf && sourcebuf && apidbuf) {
+           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
+           char *p = strchr(apidbuf, ';');
+           if (p)
+              *p++ = 0;
+           sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
+           if (p)
+              sscanf(p, "%d ,%d ", &dpid1, &dpid2);
+           }
+        strn0cpy(name, namebuf, MaxChannelName);
+        free(parambuf);
+        free(sourcebuf);
+        free(apidbuf);
+        free(namebuf);
+        return ok;
+        }
+     else
+        return false;
+     }
+  strreplace(name, '|', ':');
+  return true;
+}
+
+bool cChannel::Save(FILE *f)
+{
+  return fprintf(f, ToText()) > 0;
+}
+
+// -- cChannels --------------------------------------------------------------
+
+cChannels Channels;
+
+bool cChannels::Load(const char *FileName, bool AllowComments)
+{
+  if (cConfig<cChannel>::Load(FileName, AllowComments)) {
+     ReNumber();
+     return true;
+     }
+  return false;
+}
+
+int cChannels::GetNextGroup(int Idx)
+{
+  cChannel *channel = Get(++Idx);
+  while (channel && !channel->GroupSep())
+        channel = Get(++Idx);
+  return channel ? Idx : -1;
+}
+
+int cChannels::GetPrevGroup(int Idx)
+{
+  cChannel *channel = Get(--Idx);
+  while (channel && !channel->GroupSep())
+        channel = Get(--Idx);
+  return channel ? Idx : -1;
+}
+
+int cChannels::GetNextNormal(int Idx)
+{
+  cChannel *channel = Get(++Idx);
+  while (channel && channel->GroupSep())
+        channel = Get(++Idx);
+  return channel ? Idx : -1;
+}
+
+void cChannels::ReNumber( void )
+{
+  int Number = 0;
+  cChannel *ch = (cChannel *)First();
+  while (ch) {
+        if (!ch->GroupSep())
+           ch->SetNumber(++Number);
+        ch = (cChannel *)ch->Next();
+        }
+  maxNumber = Number;
+}
+
+cChannel *cChannels::GetByNumber(int Number)
+{
+  cChannel *channel = (cChannel *)First();
+  while (channel) {
+        if (!channel->GroupSep() && channel->Number() == Number)
+           return channel;
+        channel = (cChannel *)channel->Next();
+        }
+  return NULL;
+}
+
+cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
+{
+  cChannel *channel = (cChannel *)First();
+  while (channel) {
+        if (!channel->GroupSep() && channel->Sid() == ServiceId)
+           return channel;
+        channel = (cChannel *)channel->Next();
+        }
+  return NULL;
+}
+
+bool cChannels::SwitchTo(int Number)
+{
+  cChannel *channel = GetByNumber(Number);
+  return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
+}
+
+const char *cChannels::GetChannelNameByNumber(int Number)
+{
+  cChannel *channel = GetByNumber(Number);
+  return channel ? channel->Name() : NULL;
+}
diff --git a/channels.conf b/channels.conf
index e1e89c33f..3d272147c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,186 +1,186 @@
-RTL:12188:h:0:27500:163:104:105:0:12003
-Sat.1:12480:v:0:27500:1791:1792:34:0:46
-Pro-7:12480:v:0:27500:255:256;257:32:0:898
-RTL2:12188:h:0:27500:166:128:68:0:12020
-ARD:11837:h:0:27500:101:102:104:0:28106
-BR3:11837:h:0:27500:201:202:204:0:28107
-Hessen-3:11837:h:0:27500:301:302:304:0:28108
-N3:12110:h:0:27500:2401:2402:2404:0:28224
-SR3:11837:h:0:27500:501:502:504:0:28110
-WDR:11837:h:0:27500:601:602:604:0:28111
-BR-alpha:11837:h:0:27500:701:702:704:0:28112
-SWR BW:11837:h:0:27500:801:802:804:0:28113
-Phoenix:11837:h:0:27500:901:902:904:0:28114
-ZDF:11954:h:0:27500:110:120:130:0:28006
-3sat:11954:h:0:27500:210:220:230:0:28007
-KiKa:11954:h:0:27500:310:320:330:0:28008
-arte:11836:h:0:27500:401:402:404:0:28109
-ORF1:12692:h:0:22000:160:161:165:102:13001
-ORF2:12692:h:0:22000:500:501:505:102:13002
-ORF Sat:11954:h:0:27500:506:507:0:0:28010
-ZDF.info:11954:h:0:27500:610:620:0:0:28011
-CNN:12168:v:0:27500:165:100:0:0:28512
-Super RTL:12188:h:0:27500:165:120:65:0:12040
-VOX:12188:h:0:27500:167:136:71:0:12060
-DW TV:10788:v:0:22000:305:306:0:0:8905
-Kabel 1:12480:v:0:27500:511:512:33:0:899
-Neun Live:12480:v:0:27500:767:768:35:0:897
-DSF:12480:v:0:27500:1023:1024:0:0:900
-HOT:12480:v:0:27500:1279:1280:0:0:40
-Bloomberg TV Germany:12551:v:0:22000:162:99:0:0:12160
-Bloomberg TV France:11817:v:0:27500:163:92:0:0:8004
-Bloomberg TV Spain:12168:v:0:27500:167:112:0:0:12721
-Sky News:12552:v:0:22000:305:306:0:0:3995
-Fox Kids Netherlands:12574:h:0:22000:163:92:0:0:5020
-Alice:12610:v:0:22000:162:96:0:0:12200
-n-tv:12669:v:0:22000:162:96:55:0:12730
-Grand Tourisme:12670:v:0:22000:289:290:0:0:17300
-TW1:12692:h:0:22000:166:167:0:0:13013
-Eurosport:11954:h:0:27500:410:420:0:0:28009
-EinsExtra:12110:h:0:27500:101:102:0:0:28201
-EinsFestival:12110:h:0:27500:201:202:0:0:28202
-EinsMuXx:12110:h:0:27500:301:302:0:0:28203
-ZDF Theaterkanal:11954:h:0:27500:1110:1120:0:0:28016
-ZDF.doku:11954:h:0:27500:660:670:0:0:28014
-MDR:12110:h:0:27500:401:402:404:0:28204
-ORB:12110:h:0:27500:501:502:504:0:28205
-B1:12110:h:0:27500:601:602:604:0:28206
-ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
+RTL:12188:h:S19.2E:27500:163:104:105:0:12003
+Sat.1:12480:v:S19.2E:27500:1791:1792:34:0:46
+Pro-7:12480:v:S19.2E:27500:255:256;257:32:0:898
+RTL2:12188:h:S19.2E:27500:166:128:68:0:12020
+ARD:11837:h:S19.2E:27500:101:102:104:0:28106
+BR3:11837:h:S19.2E:27500:201:202:204:0:28107
+Hessen-3:11837:h:S19.2E:27500:301:302:304:0:28108
+N3:12110:h:S19.2E:27500:2401:2402:2404:0:28224
+SR3:11837:h:S19.2E:27500:501:502:504:0:28110
+WDR:11837:h:S19.2E:27500:601:602:604:0:28111
+BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112
+SWR BW:11837:h:S19.2E:27500:801:802:804:0:28113
+Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114
+ZDF:11954:h:S19.2E:27500:110:120:130:0:28006
+3sat:11954:h:S19.2E:27500:210:220:230:0:28007
+KiKa:11954:h:S19.2E:27500:310:320:330:0:28008
+arte:11836:h:S19.2E:27500:401:402:404:0:28109
+ORF1:12692:h:S19.2E:22000:160:161:165:102:13001
+ORF2:12692:h:S19.2E:22000:500:501:505:102:13002
+ORF Sat:11954:h:S19.2E:27500:506:507:0:0:28010
+ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011
+CNN:12168:v:S19.2E:27500:165:100:0:0:28512
+Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040
+VOX:12188:h:S19.2E:27500:167:136:71:0:12060
+DW TV:10788:v:S19.2E:22000:305:306:0:0:8905
+Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899
+Neun Live:12480:v:S19.2E:27500:767:768:35:0:897
+DSF:12480:v:S19.2E:27500:1023:1024:0:0:900
+HOT:12480:v:S19.2E:27500:1279:1280:0:0:40
+Bloomberg TV Germany:12551:v:S19.2E:22000:162:99:0:0:12160
+Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004
+Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721
+Sky News:12552:v:S19.2E:22000:305:306:0:0:3995
+Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020
+Alice:12610:v:S19.2E:22000:162:96:0:0:12200
+n-tv:12669:v:S19.2E:22000:162:96:55:0:12730
+Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300
+TW1:12692:h:S19.2E:22000:166:167:0:0:13013
+Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009
+EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201
+EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202
+EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203
+ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016
+ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014
+MDR:12110:h:S19.2E:27500:401:402:404:0:28204
+ORB:12110:h:S19.2E:27500:501:502:504:0:28205
+B1:12110:h:S19.2E:27500:601:602:604:0:28206
+ARD Online-Kanal:12722:h:S19.2E:22000:0:701:0:0:0
 :Premiere World
-Premiere Start:11797:h:0:27500:255:256:0:101:8
-Premiere 1:11797:h:0:27500:511:512,513;515:0:101:10
-Premiere 2:11797:h:0:27500:1791:1792,1793;1795:0:101:11
-Premiere 3:11797:h:0:27500:2303:2304:0:101:43
-Premiere 4:11797:h:0:27500:767:768:0:101:9
-Premiere 5:11797:h:0:27500:1279:1280:0:101:29
-Premiere 6:11797:h:0:27500:1535:1536:0:101:41
-Premiere 7:11797:h:0:27500:1023:1024:0:101:20
-13th Street:11758:h:0:27500:2303:2304:0:101:42
-Studio Universal:12090:V:0:27500:255:256:0:101:36
-Premiere Serie:12031:h:0:27500:1023:1024:0:101:16
-Disney Channel:12090:V:0:27500:767:768:0:101:34
-Premiere Nostalgie:12031:h:0:27500:2559:2560:0:101:516
-Discovery Channel:12031:h:0:27500:1791:1792:0:101:14
-Planet:12090:v:0:27500:1279:1280:0:101:13
-Fox Kids:11758:h:0:27500:1279:1280:0:101:28
-Junior:11758:h:0:27500:255:256:0:101:19
-K-Toon:11758:h:0:27500:511:512:0:101:12
-Krimi&Co:12031:h:0:27500:1535:1536:0:101:23
-Goldstar TV:11758:h:0:27500:3839:3840:0:101:518
-Classica:11758:h:0:27500:767:768:0:101:15
-Sonnenklar TV:12090:V:0:27500:1023:1024:0:0:32
+Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8
+Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10
+Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11
+Premiere 3:11797:h:S19.2E:27500:2303:2304:0:101:43
+Premiere 4:11797:h:S19.2E:27500:767:768:0:101:9
+Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29
+Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41
+Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20
+13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42
+Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36
+Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16
+Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34
+Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516
+Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14
+Planet:12090:v:S19.2E:27500:1279:1280:0:101:13
+Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28
+Junior:11758:h:S19.2E:27500:255:256:0:101:19
+K-Toon:11758:h:S19.2E:27500:511:512:0:101:12
+Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23
+Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518
+Classica:11758:h:S19.2E:27500:767:768:0:101:15
+Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32
 :Premiere Direkt
-Premiere Direkt 1A:12031:h:0:27500:511:512,513;515:0:101:177
-Premiere Direkt 1B:11719:h:0:27500:1023:1024,1025;1027:0:101:182
-Premiere Direkt 2A:12031:h:0:27500:255:256;259:0:101:176
-Premiere Direkt 2B:11719:h:0:27500:767:768;769:0:101:181
-Premiere Direkt 3A:11719:h:0:27500:511:512;515:0:101:180
-Premiere Direkt 3B:11719:h:0:27500:1279:1280;1283:0:101:183
-Premiere Direkt 4A:12031:h:0:27500:2815:2816:0:101:18
-:#Premiere Direkt 4B:12070:h:0:27500:1535:1536:0:101:216
+Premiere Direkt 1A:12031:h:S19.2E:27500:511:512,513;515:0:101:177
+Premiere Direkt 1B:11719:h:S19.2E:27500:1023:1024,1025;1027:0:101:182
+Premiere Direkt 2A:12031:h:S19.2E:27500:255:256;259:0:101:176
+Premiere Direkt 2B:11719:h:S19.2E:27500:767:768;769:0:101:181
+Premiere Direkt 3A:11719:h:S19.2E:27500:511:512;515:0:101:180
+Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183
+Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18
+:#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216
 :PW Erotic
-Beate-Uhse.TV:11758:h:0:27500:1023:1024:0:101:21
-Premiere Erotik 1:12031:h:0:27500:1279:1280:0:101:513
-Premiere Erotik 2:11719:h:0:27500:1535:1536:0:101:778
-Premiere Erotik 3:11719:h:0:27500:1791:1792:0:101:779
-Premiere Erotik 4:11719:h:0:27500:3583:3584:0:101:780
+Beate-Uhse.TV:11758:h:S19.2E:27500:1023:1024:0:101:21
+Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513
+Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778
+Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779
+Premiere Erotik 4:11719:h:S19.2E:27500:3583:3584:0:101:780
 :Sportsworld
-Premiere Sport 1:11720:h:0:27500:255:256,257:0:101:17
-Premiere Sport 2:12031:h:0:27500:3839:3840:0:101:27
+Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17
+Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27
 :Formel 1
-:#Supersignal:12070:h:0:27500:255:256:0:101:211
-:#Cockpitkanal:12070:h:0:27500:511:512:0:101:212
-:#Boxengasse:12070:h:0:27500:767:768:0:101:213
-:#Verfolgerfeld:12070:h:0:27500:1023:1024:0:101:214
-:#Infokanal:12070:h:0:27500:1279:1280:0:101:215
-Multikanal:11720:h:0:27500:255:256:0:101:17
+:#Supersignal:12070:h:S19.2E:27500:255:256:0:101:211
+:#Cockpitkanal:12070:h:S19.2E:27500:511:512:0:101:212
+:#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213
+:#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214
+:#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215
+Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
 :Beta Digital
-N24:12480:v:0:27500:2047:2048:0:0:47
-CNBC:11954:h:0:27500:510:520:0:0:28010
-Liberty TV.com:12610:V:0:22000:941:943,942:0:0:12199
+N24:12480:v:S19.2E:27500:2047:2048:0:0:47
+CNBC:11954:h:S19.2E:27500:510:520:0:0:28010
+Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199
 :Premiere Bundesliga
-BL-Konferenz:12031:h:0:27500:2303:2304,2305:0:101:210
-BuLi 1:11719:h:0:27500:255:256,257:0:101:17
-BuLi 2:11719:h:0:27500:2047:2048,2049:0:101:240
-BuLi 3:11719:h:0:27500:2303:2304,2305:0:101:241
-BuLi 4:11719:h:0:27500:2559:2560,2561:0:101:242
-BuLi 5:11719:h:0:27500:2815:2816,2817:0:101:243
-BuLi 6:11719:h:0:27500:3071:3072,3073:0:101:244
-BuLi 7:11719:h:0:27500:3327:3328,3329:0:101:245
-BuLi 8:12031:h:0:27500:3071:3072,3073:0:101:208
-BuLi 9:12031:h:0:27500:3327:3328,3329:0:101:209
+BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210
+BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17
+BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240
+BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241
+BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242
+BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243
+BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244
+BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245
+BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208
+BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209
 :-
-:#TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
-Mosaico:11934:v:0:27500:165:100:0:0:29010
-Andalucia TV:11934:v:0:27500:166:104:0:0:29011
-TVC Internacional:11934:v:0:27500:167:108:0:0:0
-Nasza TV:11992:h:0:27500:165:98:0:0:0
-WishLine test:12012:v:0:27500:163:90:0:0:0
-Pro 7 Austria:12051:v:0:27500:161:84:0:0:20002
-Kabel 1 Schweiz:12051:v:0:27500:162:163:0:0:20003
-Kabel 1 Austria:12051:v:0:27500:166:167:0:0:20004
-Pro 7 Schweiz:12051:v:0:27500:289:290:0:0:20001
-Kiosque:12129:v:0:27500:160:80:0:0:0
-KTO:11739:v:0:27500:163:90:0:0:8304
-TCM:12168:v:0:27500:160:80:0:0:0
-Cartoon Network France & Spain:12168:v:0:27500:161:84:0:0:0
-TVBS Europe:12168:v:0:27500:162:88:0:0:0
-TVBS Europe:12168:v:0:27500:162:89:0:0:0
-Travel:12168:v:0:27500:163:92:0:0:0
-TCM Espania:12168:v:0:27500:164:96:0:0:0
-MTV Spain:12168:v:0:27500:167:112:0:0:0
-TCM France:12168:v:0:27500:169:64:0:0:0
-RTL2 CH:12188:h:0:27500:164:112:0:0:0
-La Cinquieme:12207:v:0:27500:160:80:0:0:8501
-LCP:12207:v:0:27500:165:100:0:0:8506
-Post Filial TV:12226:h:0:27500:255:256:0:0:0
-Canal Canaris:12246:v:0:27500:160:80:0:0:0
-Canal Canaris:12246:v:0:27500:160:81:0:0:0
-Canal Canaris:12246:v:0:27500:160:82:0:0:0
-Canal Canaris:12246:v:0:27500:160:83:0:0:0
-AB Moteurs:12266:h:0:27500:160:80:0:0:17000
-AB Channel 1:12266:h:0:27500:161:84:0:0:0
-Taquilla 0:12285:v:0:27500:165:100:0:0:0
-CSAT:12324:v:0:27500:160:80:0:0:0
-Mosaique:12324:v:0:27500:162:88:0:0:0
-Mosaique 2:12324:v:0:27500:163:92:0:0:0
-Mosaique 3:12324:v:0:27500:164:96:0:0:0
-Le Sesame C+:12324:v:0:27500:165:1965:0:0:0
-FEED:12344:h:0:27500:163:92:0:0:0
-RTM 1:12363:v:0:27500:162:96:0:0:0
-ESC 1:12363:v:0:27500:163:104:0:0:0
-TV5 Europe:12363:v:0:27500:164:112:0:0:0
-TV7 Tunisia:12363:v:0:27500:166:128:0:0:0
-ARTE:12363:v:0:27500:167:137:0:0:0
-RAI Uno:10788:v:0:22000:289:290:0:0:9004
-RTP International:12363:v:0:27500:300:301:0:0:0
-Fashion TV:12402:v:0:27500:163:92:0:0:0
-VideoService:12422:h:0:27500:255:256:0:0:0
-Beta Research promo:12422:h:0:27500:1023:1024:0:0:0
-Canal Canarias:12441:v:0:27500:160:80:0:0:0
-Fitur:12441:v:0:27500:514:662:0:0:0
-Astra Info 1:12552:v:0:22000:164:112:0:0:0
-Astra Info 2:12552:v:0:22000:165:120:0:0:0
-Astra Vision 1:12552:v:0:22000:168:144:0:0:0
-Astra Vision 1:12552:v:0:22000:168:145:0:0:0
-Astra Vision 1:12552:v:0:22000:168:146:0:0:0
-Astra Vision 1:12552:v:0:22000:168:147:0:0:0
-Astra Vision 1:12552:v:0:22000:168:148:0:0:0
-Astra Vision 1:12552:v:0:22000:168:149:0:0:0
-Astra Vision 1:12552:v:0:22000:168:150:0:0:0
-RTL Tele Letzebuerg:12552:v:0:22000:168:144,146:0:0:3994
-Astra Mosaic:12552:v:0:22000:175:176:0:0:0
-MHP test:12604:h:0:22000:5632:0:0:0:0
-VERONICA:12574:h:0:22000:161:84:0:0:5010
-VH1 Classic:12699:v:0:22000:3071:3072:0:0:28647
-MTV 2 Pop:12699:v:0:22000:3081:3082:0:0:28648
-Via 1 - Sch�ner Reisen:12148:h:0:27500:511:512:0:0:44
-Video Italia:12610:v:0:22000:121:122:0:0:12220
-AC 3 promo:12670:v:0:22000:308:256:0:0:0
-ORF/ZDF:12699:h:0:22000:506:507:0:0:13012
-VIVA:12670:v:0:22000:309:310:0:0:12732
-VIVA2:12552:v:0:22000:171:172:0:0:12120
-MTV German:12699:v:0:22000:3031:3032:0:0:28643
-IFA-TV:10832:h:0:22000:132:133:32:0:7251
-QVC Germany:12552:v:0:22000:165:166:0:0:12100
-TANGOTV:10832:h:1:22000:61:62:0:0:61920
+:#TV Niepokalanow:11876:h:S19.2E:27500:305:321:0:0:20601
+Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010
+Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011
+TVC Internacional:11934:v:S19.2E:27500:167:108:0:0:0
+Nasza TV:11992:h:S19.2E:27500:165:98:0:0:0
+WishLine test:12012:v:S19.2E:27500:163:90:0:0:0
+Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002
+Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003
+Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004
+Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001
+Kiosque:12129:v:S19.2E:27500:160:80:0:0:0
+KTO:11739:v:S19.2E:27500:163:90:0:0:8304
+TCM:12168:v:S19.2E:27500:160:80:0:0:0
+Cartoon Network France & Spain:12168:v:S19.2E:27500:161:84:0:0:0
+TVBS Europe:12168:v:S19.2E:27500:162:88:0:0:0
+TVBS Europe:12168:v:S19.2E:27500:162:89:0:0:0
+Travel:12168:v:S19.2E:27500:163:92:0:0:0
+TCM Espania:12168:v:S19.2E:27500:164:96:0:0:0
+MTV Spain:12168:v:S19.2E:27500:167:112:0:0:0
+TCM France:12168:v:S19.2E:27500:169:64:0:0:0
+RTL2 CH:12188:h:S19.2E:27500:164:112:0:0:0
+La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501
+LCP:12207:v:S19.2E:27500:165:100:0:0:8506
+Post Filial TV:12226:h:S19.2E:27500:255:256:0:0:0
+Canal Canaris:12246:v:S19.2E:27500:160:80:0:0:0
+Canal Canaris:12246:v:S19.2E:27500:160:81:0:0:0
+Canal Canaris:12246:v:S19.2E:27500:160:82:0:0:0
+Canal Canaris:12246:v:S19.2E:27500:160:83:0:0:0
+AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000
+AB Channel 1:12266:h:S19.2E:27500:161:84:0:0:0
+Taquilla 0:12285:v:S19.2E:27500:165:100:0:0:0
+CSAT:12324:v:S19.2E:27500:160:80:0:0:0
+Mosaique:12324:v:S19.2E:27500:162:88:0:0:0
+Mosaique 2:12324:v:S19.2E:27500:163:92:0:0:0
+Mosaique 3:12324:v:S19.2E:27500:164:96:0:0:0
+Le Sesame C+:12324:v:S19.2E:27500:165:1965:0:0:0
+FEED:12344:h:S19.2E:27500:163:92:0:0:0
+RTM 1:12363:v:S19.2E:27500:162:96:0:0:0
+ESC 1:12363:v:S19.2E:27500:163:104:0:0:0
+TV5 Europe:12363:v:S19.2E:27500:164:112:0:0:0
+TV7 Tunisia:12363:v:S19.2E:27500:166:128:0:0:0
+ARTE:12363:v:S19.2E:27500:167:137:0:0:0
+RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004
+RTP International:12363:v:S19.2E:27500:300:301:0:0:0
+Fashion TV:12402:v:S19.2E:27500:163:92:0:0:0
+VideoService:12422:h:S19.2E:27500:255:256:0:0:0
+Beta Research promo:12422:h:S19.2E:27500:1023:1024:0:0:0
+Canal Canarias:12441:v:S19.2E:27500:160:80:0:0:0
+Fitur:12441:v:S19.2E:27500:514:662:0:0:0
+Astra Info 1:12552:v:S19.2E:22000:164:112:0:0:0
+Astra Info 2:12552:v:S19.2E:22000:165:120:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:144:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:145:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:146:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:147:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:148:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:149:0:0:0
+Astra Vision 1:12552:v:S19.2E:22000:168:150:0:0:0
+RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994
+Astra Mosaic:12552:v:S19.2E:22000:175:176:0:0:0
+MHP test:12604:h:S19.2E:22000:5632:0:0:0:0
+VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010
+VH1 Classic:12699:v:S19.2E:22000:3071:3072:0:0:28647
+MTV 2 Pop:12699:v:S19.2E:22000:3081:3082:0:0:28648
+Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44
+Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220
+AC 3 promo:12670:v:S19.2E:22000:308:256:0:0:0
+ORF/ZDF:12699:h:S19.2E:22000:506:507:0:0:13012
+VIVA:12670:v:S19.2E:22000:309:310:0:0:12732
+VIVA2:12552:v:S19.2E:22000:171:172:0:0:12120
+MTV German:12699:v:S19.2E:22000:3031:3032:0:0:28643
+IFA-TV:10832:h:S19.2E:22000:132:133:32:0:7251
+QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
+TANGOTV:10832:h:S19.2E:22000:61:62:0:0:61920
diff --git a/channels.conf.cable b/channels.conf.cable
index 5b147fe6d..e96cd6a72 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,184 +1,209 @@
-:Fernsehprogramme
-Das Erste:410:h:0:6900:101:102:111:0:28106
-ZDF:394:h:0:6900:110:120:130:0:28006
-3sat:394:h:0:6900:210:220:230:0:28007
-arte:410:h:0:6900:401:402:404:0:28109
-EuroNews:394:h:0:6900:2221:2233:768:0:28015
-ZDF.info:394:h:0:6900:610:620:0:0:28011
-ZDF.doku:394:h:0:6900:660:670:0:0:28014
-ZDF Theaterkanal:394:h:0:6900:1110:1120:130:0:28016
-EinsExtra:426:h:0:6900:101:102:0:0:28201
-EinsFestival:426:h:0:6900:201:202:0:0:28202
-EinsMuXx:426:h:0:6900:301:302:0:0:28203
-Phoenix:410:h:0:6900:901:902:0:0:28114
-Eurosport:394:h:0:6900:410:420:430:0:28009
-DW-tv:610:h:0:6900:634:632:0:0:6101
-CNBC:394:h:0:6900:510:520:530:0:28010
+Das Erste:410:M64:C:6900:101:102:104:0:28106
+ZDF:394:M64:C:6900:110:120:130:0:28006
+3sat:394:M64:C:6900:210:220:230:0:28007
+arte:410:M64:C:6900:401:402:404:0:28109
+ZDF.info:394:M64:C:6900:610:620:0:0:28011
+ZDF.doku:394:M64:C:6900:660:670:0:0:28014
+ZDF Theaterkanal:394:M64:C:6900:1110:1120:130:0:28016
+EinsExtra:426:M64:C:6900:101:102:0:0:28201
+EinsFestival:426:M64:C:6900:201:202:0:0:28202
+EinsMuXx:426:M64:C:6900:301:302:0:0:28203
+Phoenix:410:M64:C:6900:901:902:904:0:28114
+EuroNews:394:M64:C:6900:2221:2233:768:0:28015
+CNBC:394:M64:C:6900:510:520:530:0:28010
+Eurosport:394:M64:C:6900:410:420:430:0:28009
 :Regionalprogramme
-WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
-B1 Berlin:426:h:0:6900:601:602,603:604:0:28206
-ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
-MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
-SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
-SuedWest BW:410:h:0:6900:801:802:804:0:28113
-SuedWest RP:426:h:0:6900:3101:3102:3104:0:28231
-BR-alpha:410:h:0:6900:701:702:704:0:28112
-N3:426:h:0:6900:2401:2402:2404:0:28224
-hessen fernsehen:410:h:0:6900:301:302:304:0:28108
-Bayerisches FS:410:h:0:6900:201:202:204:0:28107
-Test-R:410:h:0:6900:901:902:104:0:28130
-:Premiere Hauptprogramme
-Premiere START:370:C:0:6900:255:256:32:101:8
-Premiere 1:370:C:0:6900:511:512:0:101:10
-Premiere 2:370:C:0:6900:1791:1792:0:101:11
-Premiere 3:370:C:0:6900:2303:2304:0:101:43
-Premiere 4:370:C:0:6900:767:768:0:101:9
-Premiere 5:370:C:0:6900:1279:1280:0:101:29
-Premiere 6:370:C:0:6900:1535:1536:0:101:41
-Premiere 7:370:C:0:6900:1023:1024:0:101:20
-Premiere SERIE:378:C:0:6900:1023:1024:0:101:16
-Premiere Nostalgie:378:C:0:6900:2559:2560:0:101:516
-13 TH STREET:354:C:0:6900:2303:2304:0:101:42
-Stundio Universal:402:C:0:6900:1050:1054:0:101:36
-Krimi &Co:378:C:0:6900:1535:1536:0:101:23
-Disney Channel:402:C:0:6900:1030:1034:0:101:34
-Discovery Channel:378:C:0:6900:1791:1792:0:101:14
-Fox Kids:354:C:0:6900:1279:1280:0:101:28
-Junior:354:C:0:6900:255:256:0:101:19
-K-TOON:354:C:0:6900:511:512:0:101:12
-GOLDSTAR TV:354:C:0:6900:3839:3840:0:101:518
-CLASSICA:354:C:0:6900:767:768:0:101:15
+B1 Berlin:426:M64:C:6900:601:602:604:0:28206
+ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205
+N3:426:M64:C:6900:2401:2402:2404:0:28224
+MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204
+WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111
+hessen fernsehen:410:M64:C:6900:301:302:304:0:28108
+BR-alpha:410:M64:C:6900:701:702:704:0:28112
+Bayerisches FS:410:M64:C:6900:201:202:204:0:28107
+SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110
+SuedWest BW:410:M64:C:6900:801:802:804:0:28113
+SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231
+:Hauptprogramme Premiere
+Premiere START:370:M64:C:6900:255:256:32:101:8
+Premiere 1:370:M64:C:6900:511:512;515:0:101:10
+Premiere 2:370:M64:C:6900:1791:1792;1795:0:101:11
+Premiere 3:370:M64:C:6900:2303:2304:0:101:43
+Premiere 4:370:M64:C:6900:767:768:0:101:9
+Premiere 5:370:M64:C:6900:1279:1280:0:101:29
+Premiere 6:370:M64:C:6900:1535:1536:0:101:41
+Premiere 7:370:M64:C:6900:1023:1024:0:101:20
+Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16
+Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516
+13 TH STREET:354:M64:C:6900:2303:2304:0:101:42
+Stundio Universal:402:M64:C:6900:1050:1054:0:101:36
+Krimi &Co:378:M64:C:6900:1535:1536:0:101:23
+Disney Channel:402:M64:C:6900:1030:1034:0:101:34
+Discovery Channel:378:M64:C:6900:1791:1792:0:101:14
+PLANET:354:M64:C:6900:1791:1792:0:101:13
+Fox Kids:354:M64:C:6900:1279:1280:0:101:28
+Junior:354:M64:C:6900:255:256:0:101:19
+K-TOON:354:M64:C:6900:511:512:0:101:12
+HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22
+GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518
+CLASSICA:354:M64:C:6900:767:768:0:101:15
 :Mediavision
-Bloomberg:346:h:0:6900:811:812:0:101:50701
-Fashion TV:346:h:0:6900:821:822:0:101:50702
-Einstein:346:h:0:6900:623:624:0:101:50719
-Extreme Sport:346:h:0:6900:801:802:0:101:50700
-LANDSCAPE:346:h:0:6900:831:832:0:101:50703
-Single TV:346:h:0:6900:525:526:0:101:50706
-Leitseite:346:h:0:6900:2254:0:0:0:5004
-BET ON JAZZ:346:h:0:6900:841:842:0:101:50704
-:Digit. Bouquet"Kabel Berlin"
-Parlamentsfernsehen:610:C:0:6900:33:36:47:0:6100
-DW-tv:610:C:0:6900:634:632:0:0:6101
-Kanal 7:610:C:0:6900:49:52:0:101:6103
-Euronews:610:C:0:6900:597:592,591:0:101:6104
-Vh1 - Classic:610:h:0:6900:604:603:0:101:6106
-Travel:610:C:0:6900:595:594:0:101:6105
-Nuvolari:618:C:0:6900:1011:1012:0:101:50101
-Marco Polo:618:C:0:6900:1021:1022:0:101:50102
-Alice:618:C:0:6900:1031:1032:0:101:50103
-Leonardo:618:C:0:6900:1041:1042:0:101:50104
-Club:618:C:0:6900:1051:1052:0:101:50105
-Avante:618:C:0:6900:1061:1062:0:101:50106
-Expo 24*7:618:C:0:6900:1071:1072:0:101:50107
-Innergy:618:C:0:6900:0:0:0:101:50108
-BBC Prime:618:C:0:6900:1091:1092:0:101:50109
-Eurosport News:618:C:0:6900:1101:1102:0:101:50110
+Bloomberg:346:M64:C:6900:811:812:0:101:50701
+Fashion TV:346:M64:C:6900:821:822:0:101:50702
+Einstein:346:M64:C:6900:623:624:0:101:50719
+Extreme Sport:346:M64:C:6900:801:802:0:101:50700
+LANDSCAPE:346:M64:C:6900:831:832:0:101:50703
+:DIGIKABEL D
+Avante:113:M64:C:6900:741:742,743:0:101:53404
+BBC Prime:113:M64:C:6900:761:762:763:101:53406
+Club:113:M64:C:6900:711:712,713:0:101:53401
+Eurosport News:113:M64:C:6900:771:772:0:101:53407
+BibelTV:113:M64:C:6900:731:732:0:1:53403
+Liberty TV:113:M64:C:6900:721:722,723:0:101:53402
+TW1:113:M64:C:6900:751:752:0:101:53405
+MTV Base:113:M64:C:6900:781:782:0:101:53408
+:DIGIKABEL INT
+Canal 24 Horas:121:M64:C:6900:991:992:0:101:53509
+Gala TV:121:M64:C:6900:931:932:0:101:53503
+Kanal 7:121:M64:C:6900:941:942:0:101:53504
+Rai 1:121:M64:C:6900:951:952:0:101:53505
+Rai 2:121:M64:C:6900:961:962:0:101:53506
+Rai 3:121:M64:C:6900:971:972:0:101:53507
+Show TV:121:M64:C:6900:911:912:0:101:53501
+TGRT:121:M64:C:6900:921:922:0:101:53502
+TVEi:121:M64:C:6900:981:982:0:101:53508
+:DIGIKABEL SO
+Fox Kids:121:M64:C:6900:931:932,933:0:101:53523
+Kanal 7:121:M64:C:6900:941:942:0:101:53524
+Show TV:121:M64:C:6900:911:912:0:101:53521
+TGRT:121:M64:C:6900:921:922:0:101:53522
+:DIGIKABEL SW
+Canal 24 Horas:121:M64:C:6900:991:992:0:101:53535
+Rai 1:121:M64:C:6900:951:952:0:101:53531
+Rai 2:121:M64:C:6900:961:962:0:101:53532
+Rai 3:121:M64:C:6900:971:972:0:101:53533
+TVEi:121:M64:C:6900:981:982:0:101:53534
 :Diverse TV-Sender
-TV Polonia:434:h:0:6900:641:642:0:101:53204
-Kanal D:434:h:0:6900:651:652:0:101:53205
-RTP international:434:h:0:6900:661:662:0:101:53206
-ERT-Sat:434:h:0:6900:691:692:0:101:53209
-CNE:434:h:0:6900:4056:4057:0:101:53208
-ZEE TV:442:h:0:6900:517:773:0:101:53301
-NTV i:442:h:0:6900:514:515:0:101:53302
-ATV:434:h:0:6900:631:632:0:0:53203
-TW1:610:h:0:6900:6106:6107:0:0:6106
-Channel71:386:C:0:6900:1791:1792:0:101:33
+Sonnenklar TV:402:M64:C:6900:0:0:0:101:32
+TV Polonia:434:M64:C:6900:641:642:0:101:53204
+Kanal D:434:M64:C:6900:651:652:0:101:53205
+RTP international:434:M64:C:6900:661:662:0:101:53206
+ERT-Sat:434:M64:C:6900:691:692:0:101:53209
+CNE:434:M64:C:6900:4056:4057:0:101:53208
+ZEE TV:442:M64:C:6900:517:773:0:101:53301
+NTV i:442:M64:C:6900:514:515:0:101:53302
+ATV:434:M64:C:6900:631:632:0:101:53203
+TW1:610:M64:C:6900:6106:6107:0:101:6106
+:Digit. Bouquet "Kabel Berlin"
+Parlamentsfernsehen:610:M64:C:6900:33:36:47:0:6100
+DW-tv:610:M64:C:6900:634:632:0:0:6101
+Kanal 7:610:M64:C:6900:49:52:0:101:6103
+Euronews:610:M64:C:6900:597:592:0:101:6104
+Travel:610:M64:C:6900:595:594:0:101:6105
+VH1 Classic:610:M64:C:6900:604:603:0:101:6106
+Nuvolari:618:M64:C:6900:1011:1012:0:101:50101
+Alice:618:M64:C:6900:1031:1032:0:101:50103
+Leonardo:618:M64:C:6900:1041:1042:0:101:50104
+Club:618:M64:C:6900:1051:1052:0:101:50105
+Avante:618:M64:C:6900:1061:1062:0:101:50106
+BBC Prime:618:M64:C:6900:1091:1092:0:101:50109
+Eurosport News:618:M64:C:6900:1101:1102:0:101:50110
 :Premiere Sport
-PREMIERE SPORT 1:362:C:0:6900:255:256,257:0:101:17
-PREMIERE SPORT 2:378:C:0:6900:3839:3840,3841:0:101:27
+PREMIERE SPORT 1:362:M64:C:6900:255:256,258:0:101:17
+PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27
 :Premiere Bundesliga
-Bundesliga Konferenz:378:C:0:6900:2303:2304,2305:0:101:210
-Bundesliga Spiel 1:362:C:0:6900:255:256,257:0:101:17
-Bundesliga Spiel 2:362:C:0:6900:2047:2048,2049:0:101:240
-Bundesliga Spiel 3:362:C:0:6900:2303:2304,2305:0:101:241
-Bundesliga Spiel 4:362:C:0:6900:2559:2560,2561:0:101:242
-Bundesliga Spiel 5:362:C:0:6900:2815:2816,2817:0:101:243
-Bundesliga Spiel 6:362:C:0:6900:3071:3072,3073:0:101:244
-Bundesliga Spiel 7:362:C:0:6900:3327:3328,3329:0:101:245
-Bundesliga Spiel 8:378:C:0:6900:3071:3072,3073:0:101:208
-Bundesliga Spiel 9:378:C:0:6900:3327:3328,3329:0:101:209
+BuLi Opt 1:362:M64:C:6900:255:256:0:101:17
+BuLi Opt 2:362:M64:C:6900:2047:2048:0:101:240
+BuLi Opt 3:362:M64:C:6900:2303:2304:0:101:241
+BuLi Opt 4:362:M64:C:6900:2559:2560:0:101:242
+BuLi Opt 5:362:M64:C:6900:2815:2816:0:101:243
+BuLi Opt 6:362:M64:C:6900:3071:3072:0:101:244
+BuLi Opt 7:362:M64:C:6900:3327:3328:0:101:245
+BuLi Opt 8:378:M64:C:6900:3071:3072:0:101:208
+BuLi Opt 9:378:M64:C:6900:3327:3328:0:101:209
+BuLi Opt 10:378:M64:C:6900:2303:2304:0:101:210
+:Premiere CL
+UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17
+UEFA CL 2:386:M64:C:6900:255:256:0:101:211
 :Premiere Formel 1
-F1 Multi:362:h:0:6900:255:256,257:0:101:17
-F1 Supersignal:386:h:0:6900:255:256,257:0:101:211
-F1 Cockpit:386:h:0:6900:511:512,513:0:101:212
-F1 Boxen:386:h:0:6900:767:768,769:0:101:213
-F1 Verfolger:386:h:0:6900:1023:1024,1025:0:101:214
-F1 Info:386:h:0:6900:1279:1280,1281:0:101:215
+F1 Portal 1:362:M64:C:6900:255:256:0:101:17
+F1 Supersignal:362:M64:C:6900:2047:2048:0:101:240
+F1 Cockpit Kanal:362:M64:C:6900:2303:2304:0:101:241
+F1 Boxengasse:362:M64:C:6900:2559:2560:0:101:242
+F1 Verfolgerfeld:362:M64:C:6900:2815:2816:0:101:243
+F1 Infokanal:362:M64:C:6900:3071:3072:0:101:244
 :Premiere Direkt 1
-PREMIERE DIREKT 1A:362:C:0:6900:1023:1024,1025:0:101:182
-PREMIERE DIREKT 1B:378:C:0:6900:511:512,513:0:101:177
+PREMIERE DIREKT 1A:378:M64:C:6900:511:512,513;515:0:101:177
+PREMIERE DIREKT 1B:362:M64:C:6900:1023:1024,1025;1027:0:101:182
 :Premiere Direkt 2
-PREMIERE DIREKT 2A:378:C:0:6900:255:256,257:0:101:176
-PREMIERE DIREKT 2B:362:C:0:6900:767:768,769:0:101:181
+PREMIERE DIREKT 2A:378:M64:C:6900:255:256,257;259:0:101:176
+PREMIERE DIREKT 2B:362:M64:C:6900:767:768,769;771:0:101:181
 :Premiere Direkt 3
-PREMIERE DIREKT 3A:362:C:0:6900:511:512,513:0:101:180
-PREMIERE DIREKT 3B:362:C:0:6900:1279:1280,1281:0:101:183
+PREMIERE DIREKT 3A:362:M64:C:6900:1279:1280,1281;1283:0:101:183
+PREMIERE DIREKT 3B:362:M64:C:6900:511:512,513;515:0:101:180
 :Premiere Direkt 4
-PREMIERE DIREKT 4A:378:C:0:6900:2815:2816,2817:0:101:18
-PREMIERE DIREKT 4B:386:C:0:6900:1535:1536,1537:0:101:216
+PREMIERE DIREKT 4A:378:M64:C:6900:2815:2816,2817:0:101:18
+PREMIERE DIREKT 4B:386:M64:C:6900:1535:1536,1537:0:101:216
 :Premiere Erotik
-BEATE-UHSE.TV:354:C:0:6900:1023:1024:0:101:21
-PREMIERE EROTIK 1:378:C:0:6900:1279:1280:0:101:513
-PREMIERE EROTIK 2:362:C:0:6900:1535:1536:0:101:778
-PREMIERE EROTIK 3:362:C:0:6900:1791:1792:0:101:779
-PREMIERE EROTIK 4:362:C:0:6900:3583:3584:0:101:780
-:Radioprogramme
-Fritz:426:h:0:6900:1:901:0:0:28209
-HR XXL:410:h:0:6900:1:3501:0:0:28125
-JUMP:426:h:0:6900:1:1001:0:0:28210
-SPUTNIK:426:h:0:6900:1:1201:0:0:28212
-RADIOmultikulti:426:h:0:6900:1:1301:0:0:28213
-DLR-Berlin:394:h:0:6900:1:710:0:0:28012
-DLF-K�ln:394:h:0:6900:1:810:0:0:28013
-�sterreich 1:394:h:0:6900:1:169:0:0:28017
-100,6:354:h:0:6900:1:1312:0:0:161
-Bayern 4 Klassik:410:h:0:6900:1:3001:0:0:28120
-B5 aktuell:410:h:0:6900:1:3101:0:0:28121
-Bremen 2:410:h:0:6900:1:3801:0:0:28128
-Bayern 1:410:h:0:6900:1:3601:0:0:28126
-NDR 4 Info:410:h:0:6900:1:3701:0:0:28127
-SR 1:410:h:0:6900:1:3901:0:0:28129
-hr-klassik:410:h:0:6900:1:3401:0:0:28124
-hr2:410:h:0:6900:1:3301:0:0:28123
-hr-chronos:410:h:0:6900:1:3201:0:0:28122
-Radio 3:426:h:0:6900:1:701:0:0:28207
-MDR KULTUR:426:h:0:6900:1:801:0:0:28208
-MDR info:426:h:0:6900:1:1101:0:0:28211
-SWR-2:426:h:0:6900:1:1401:0:0:28214
-WDR3:426:h:0:6900:1:1501:0:0:28215
-WDR Radio 5:426:h:0:6900:1:1601:0:0:28216
-:verschl�sselte Radioprogramme
-ALTERNATIVE ROCK:370:C:0:6900:1:800:0:101:151
-CLASSIC ROCK:370:C:0:6900:1:544:0:101:154
-DANCE:370:C:0:6900:1:816:0:101:152
-LOVE SONGS:370:C:0:6900:1:352:0:101:163
-GOLD:370:C:0:6900:1:576:0:101:159
-OLD GOLD:370:C:0:6900:1:304:0:101:165
-SOUL CLASSICS:370:C:0:6900:1:400:0:101:157
-EASY LISTENING:370:C:0:6900:1:384:0:101:162
-DEUTSCHE HITS:370:C:0:6900:1:592:0:101:156
-SCHLAGER:370:C:0:6900:1:320:0:101:166
-VOLKSMUSIK:362:C:0:6900:1:336:0:101:167
-COUNTRY:362:C:0:6900:1:352:0:101:153
-FILMMUSIK:362:C:0:6900:1:368:0:101:155
-MUSICALS:362:C:0:6900:1:384:0:101:164
-JAZZ:362:C:0:6900:1:656:0:101:149
-KLASSIK POPUL04R:378:C:0:6900:1:592:0:101:145
-ORCHESTRALE WERKE:378:C:0:6900:1:608:0:101:146
-BAROCK:378:C:0:6900:1:640:0:101:148
-OPER:378:C:0:6900:1:624:0:101:147
-T�RK M�ZIGI:378:C:0:6900:1:560:0:101:158
-HITLISTE:370:C:0:6900:1:784:0:101:150
-Radio GoldStar:354:C:0:6900:1:368:0:101:171
-All Jazz:442:C:0:6900:1:535:0:101:53350
-Cristal New Age:442:C:0:6900:1:536:0:101:53351
-Movie Sounds:442:C:0:6900:1:537:0:101:53352
-Sinfonica:442:C:0:6900:1:538:0:101:53353
-Opernfestival:442:C:0:6900:1:539:0:101:53354
-Barock Fantasie:442:C:0:6900:1:540:0:101:53355
-Musica Camerata:442:C:0:6900:1:541:0:101:53356
-Musica Antica:442:C:0:6900:1:542:0:101:53357
-Adagio:442:C:0:6900:1:543:0:101:53358
-Jazz legends:442:C:0:6900:1:544:0:101:53359
+BEATE-UHSE.TV:354:M64:C:6900:1023:1024:0:101:21
+PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513
+PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778
+PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779
+PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780
+:Radio-Sender (FTV)
+Fritz:426:M64:C:6900:8191:901:0:0:28209
+SPUTNIK:426:M64:C:6900:8191:1201:0:0:28212
+HR XXL:410:M64:C:6900:8191:3501:0:0:28125
+JUMP:426:M64:C:6900:8191:1001:0:0:28210
+MDR info:426:M64:C:6900:8191:1101:0:0:28211
+MDR KULTUR:426:M64:C:6900:8191:801:0:0:28208
+Radio 3:426:M64:C:6900:8191:701:0:0:28207
+RADIOmultikulti:426:M64:C:6900:8191:1301:0:0:28213
+SWR2:426:M64:C:6900:8191:1401:0:0:28214
+WDR 3:426:M64:C:6900:8191:1501:0:0:28215
+WDR Radio 5:426:M64:C:6900:8191:1601:0:0:28216
+Bayern 4 Klassik:410:M64:C:6900:8191:3001:0:0:28120
+B5 aktuell:410:M64:C:6900:8191:3101:0:0:28121
+NordwestRadio:410:M64:C:6900:8191:3801:0:0:28128
+Bayern 1:410:M64:C:6900:8191:3601:0:0:28126
+NDR Info:410:M64:C:6900:8191:3701:0:0:28127
+SR 1:410:M64:C:6900:8191:3901:0:0:28129
+hr-klassik:410:M64:C:6900:8191:3401:0:0:28124
+hr2:410:M64:C:6900:8191:3301:0:0:28123
+hr-chronos:410:M64:C:6900:8191:3201:0:0:28122
+DLF-K�ln:394:M64:C:6900:8191:810:0:0:28013
+DLR-Berlin:394:M64:C:6900:8191:710:0:0:28012
+�sterreich 1:394:M64:C:6900:8191:169:0:0:28017
+Radio GoldStar:354:M64:C:6900:8191:368:0:0:171
+:Radio-Sender (PPV)
+ALTERNATIVE ROCK:370:M64:C:6900:8191:544:0:101:154
+DEUTSCHE HITS:370:M64:C:6900:8191:800:0:101:151
+HITLISTE:370:M64:C:6900:8191:784:0:101:150
+HIP HOP/R&B:370:M64:C:6900:8191:576:0:101:159
+DANCE:370:M64:C:6900:8191:304:0:101:165
+HARD ROCK:370:M64:C:6900:8191:816:0:101:152
+LOVE SONGS:370:M64:C:6900:8191:592:0:101:156
+FILM & MUSICAL:378:M64:C:6900:8191:592:0:101:145
+EASY LISTENING:378:M64:C:6900:8191:608:0:101:146
+JAZZ:378:M64:C:6900:8191:640:0:101:148
+KLASSIK POPUL�R:378:M64:C:6900:8191:624:0:101:147
+ORCHESTRALE WERKE:378:M64:C:6900:8191:560:0:101:158
+CLASSIC ROCK:370:M64:C:6900:8191:352:0:101:163
+VOLKSMUSIK:370:M64:C:6900:8191:400:0:101:157
+SCHLAGER:370:M64:C:6900:8191:384:0:101:162
+GOLD:370:M64:C:6900:8191:320:0:101:166
+OLD GOLD:362:M64:C:6900:8191:336:0:101:167
+SOUL CLASSICS:362:M64:C:6900:8191:352:0:101:153
+LATIN:362:M64:C:6900:8191:368:0:101:155
+NEW COUNTRY:362:M64:C:6900:8191:384:0:101:164
+COUNTRY:362:M64:C:6900:8191:656:0:101:149
+All Jazz:442:M64:C:6900:8191:535:0:101:53350
+Cristal New Age:442:M64:C:6900:8191:536:0:101:53351
+Movie Sounds:442:M64:C:6900:8191:537:0:101:53352
+Sinfonica:442:M64:C:6900:8191:538:0:101:53353
+Opernfestival:442:M64:C:6900:8191:539:0:101:53354
+Barock Fantasie:442:M64:C:6900:8191:540:0:101:53355
+Musica Camerata:442:M64:C:6900:8191:541:0:101:53356
+Musica Antica:442:M64:C:6900:8191:542:0:101:53357
+Adagio:442:M64:C:6900:8191:543:0:101:53358
+Jazz legends:442:M64:C:6900:8191:544:0:101:53359
diff --git a/channels.conf.terr b/channels.conf.terr
index 81c058168..14362a1bb 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -10,11 +10,22 @@ BBC NEWS 24:505833:0:0:0:640:641:0:0:4415
 BBC Knowledge:505833:0:0:0:630:631:0:0:4607
 Shop!:561833:0:0:0:6049:6050:0:0:13120
 : DVB-T Berlin Germany
-RTL 1:778000:V:0:27500:160:80:0:1:1
-RTL 2:778000:V:0:27500:161:82:0:1:2
-Super RTL:778000:V:0:27500:162:84:0:1:3
-VOX:778000:V:0:27500:165:81:0:1:4
-SAT 1:714000:V:0:27500:160:80:0:1:18
-PRO 7:714000:V:0:27500:161:82:0:1:19
-KABEL 1:714000:V:0:27500:162:84:0:1:20
-N24:714000:V:0:27500:163:86:0:1:21
+PRO 7:714000:I0C23D0M16B8T8G8Y0:T:27500:161:82:83:0:19
+SAT 1:714000:I0C23D0M16B8T8G8Y0:T:27500:160:80:81:0:18
+RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:160:80:0:0:1
+RTL 2:778000:I0C23D0M16B8T8G8Y0:T:27500:161:82:0:0:2
+Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:162:84:0:0:3
+VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:163:86:0:0:4
+KABEL 1:714000:I0C23D0M16B8T8G8Y0:T:27500:162:84:0:0:20
+MTV:674000:I0C23D0M16B8T2G8Y0:T:27500:161:82:83:0:27
+VIVA/arte:674000:I0C23D0M16B8T2G8Y0:T:27500:163:86:87:0:29
+N-TV:650000:I0C12D0M16B8T2G8Y0:T:27500:160:80:81:0:6
+N24:714000:I0C23D0M16B8T8G8Y0:T:27500:163:86:0:0:21
+Eurosport:674000:I0C23D0M16B8T2G8Y0:T:27500:160:80:81:0:26
+FAB:674000:I0C23D0M16B8T2G8Y0:T:27500:162:84:84:0:28
+ARD:602000:I0C23D0M16B8T8G8Y0:T:27500:208:209:667:0:4
+ZDF:730000:I0C23D0M16B8T2G8Y0:T:27500:110:120:130:0:22
+ZDF-docukanal:730000:I0C23D0M16B8T2G8Y0:T:27500:660:670:130:0:24
+ZDF-info:730000:I0C23D0M16B8T2G8Y0:T:27500:610:620:130:0:23
+EinsMuXx:650000:I0C12D0M16B8T2G8Y0:T:27500:161:82:0:0:7
+EinsFestival:602000:I0C23D0M16B8T8G8Y0:T:27500:80:81:0:0:2
diff --git a/channels.h b/channels.h
new file mode 100644
index 000000000..8a784f75f
--- /dev/null
+++ b/channels.h
@@ -0,0 +1,124 @@
+/*
+ * channels.h: Channel handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: channels.h 1.1 2002/10/05 13:53:15 kls Exp $
+ */
+
+#ifndef __CHANNELS_H
+#define __CHANNELS_H
+
+#include "config.h"
+#include "sources.h"
+#include "tools.h"
+
+#define ISTRANSPONDER(f1, f2)  (abs((f1) - (f2)) < 4) //XXX
+
+struct tChannelParameterMap {
+  int userValue;
+  int driverValue;
+  };
+
+//XXX into cChannel???
+int MapToUser(int Value, const tChannelParameterMap *Map);
+int MapToDriver(int Value, const tChannelParameterMap *Map);
+int UserIndex(int Value, const tChannelParameterMap *Map);
+int DriverIndex(int Value, const tChannelParameterMap *Map);
+
+extern const tChannelParameterMap InversionValues[];
+extern const tChannelParameterMap BandwidthValues[];
+extern const tChannelParameterMap CoderateValues[];
+extern const tChannelParameterMap ModulationValues[];
+extern const tChannelParameterMap TransmissionValues[];
+extern const tChannelParameterMap GuardValues[];
+extern const tChannelParameterMap HierarchyValues[];
+
+class cChannel : public cListObject {
+  friend class cMenuEditChannel;
+private:
+  static char *buffer;
+  static const char *ToText(cChannel *Channel);
+  enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
+  char name[MaxChannelName];
+  int frequency; // MHz
+  int source;
+  int srate;
+  int vpid;
+  int apid1, apid2;
+  int dpid1, dpid2;
+  int tpid;
+  int ca;
+  int sid;
+  int number;    // Sequence number assigned on load
+  bool groupSep;
+  //XXX
+  char polarization;
+  int inversion;
+  int bandwidth;
+  int coderateH;
+  int coderateL;
+  int modulation;
+  int transmission;
+  int guard;
+  int hierarchy;
+  const char *ParametersToString(void);
+  bool StringToParameters(const char *s);
+public:
+  cChannel(void);
+  cChannel(const cChannel *Channel);
+  const char *ToText(void);
+  bool Parse(const char *s);
+  bool Save(FILE *f);
+  const char *Name(void) const { return name; }
+  int Frequency(void) const { return frequency; }
+  int Source(void) const { return source; }
+  int Srate(void) const { return srate; }
+  int Vpid(void) const { return vpid; }
+  int Apid1(void) const { return apid1; }
+  int Apid2(void) const { return apid2; }
+  int Dpid1(void) const { return dpid1; }
+  int Dpid2(void) const { return dpid2; }
+  int Tpid(void) const { return tpid; }
+  int Ca(void) const { return ca; }
+  int Sid(void) const { return sid; }
+  int Number(void) const { return number; }
+  void SetNumber(int Number) { number = Number; }
+  bool GroupSep(void) const { return groupSep; }
+  //XXX
+  char Polarization(void) const { return polarization; }
+  int Inversion(void) const { return inversion; }
+  int Bandwidth(void) const { return bandwidth; }
+  int CoderateH(void) const { return coderateH; }
+  int CoderateL(void) const { return coderateL; }
+  int Modulation(void) const { return modulation; }
+  int Transmission(void) const { return transmission; }
+  int Guard(void) const { return guard; }
+  int Hierarchy(void) const { return hierarchy; }
+  //XXX
+  bool IsCable(void) { return (source & cSource::st_Mask) == cSource::stCable; }
+  bool IsSat(void) { return (source & cSource::st_Mask) == cSource::stSat; }
+  bool IsTerr(void) { return (source & cSource::st_Mask) == cSource::stTerr; }
+  };
+
+class cChannels : public cConfig<cChannel> {
+protected:
+  int maxNumber;
+public:
+  cChannels(void) { maxNumber = 0; }
+  virtual bool Load(const char *FileName, bool AllowComments = false);
+  int GetNextGroup(int Idx);   // Get next channel group
+  int GetPrevGroup(int Idx);   // Get previous channel group
+  int GetNextNormal(int Idx);  // Get next normal channel (not group)
+  void ReNumber(void);         // Recalculate 'number' based on channel type
+  cChannel *GetByNumber(int Number);
+  cChannel *GetByServiceID(unsigned short ServiceId);
+  const char *GetChannelNameByNumber(int Number);
+  bool SwitchTo(int Number);
+  int MaxNumber(void) { return maxNumber; }
+  };
+
+extern cChannels Channels;
+
+#endif //__CHANNELS_H
diff --git a/config.c b/config.c
index e5a560904..24c143896 100644
--- a/config.c
+++ b/config.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.106 2002/09/28 09:43:41 kls Exp $
+ * $Id: config.c 1.107 2002/10/03 10:06:55 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
+#include "channels.h" //XXX timers!
 #include "i18n.h"
 #include "interface.h"
 #include "plugin.h"
@@ -19,116 +20,6 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// -- cChannel ---------------------------------------------------------------
-
-char *cChannel::buffer = NULL;
-
-cChannel::cChannel(void)
-{
-  *name = 0;
-}
-
-cChannel::cChannel(const cChannel *Channel)
-{
-  strcpy(name,   Channel ? Channel->name         : "Pro7");
-  frequency    = Channel ? Channel->frequency    : 12480;
-  polarization = Channel ? Channel->polarization : 'v';
-  diseqc       = Channel ? Channel->diseqc       : 0;
-  srate        = Channel ? Channel->srate        : 27500;
-  vpid         = Channel ? Channel->vpid         : 255;
-  apid1        = Channel ? Channel->apid1        : 256;
-  apid2        = Channel ? Channel->apid2        : 0;
-  dpid1        = Channel ? Channel->dpid1        : 257;
-  dpid2        = Channel ? Channel->dpid2        : 0;
-  tpid         = Channel ? Channel->tpid         : 32;
-  ca           = Channel ? Channel->ca           : 0;
-  pnr          = Channel ? Channel->pnr          : 0;
-  groupSep     = Channel ? Channel->groupSep     : false;
-}
-
-const char *cChannel::ToText(cChannel *Channel)
-{
-  char buf[MaxChannelName * 2];
-  char *s = Channel->name;
-  if (strchr(s, ':')) {
-     s = strcpy(buf, s);
-     strreplace(s, ':', '|');
-     }
-  free(buffer);
-  if (Channel->groupSep)
-     asprintf(&buffer, ":%s\n", s);
-  else {
-     char apidbuf[32];
-     char *q = apidbuf;
-     q += snprintf(q, sizeof(apidbuf), "%d", Channel->apid1);
-     if (Channel->apid2)
-        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->apid2);
-     if (Channel->dpid1 || Channel->dpid2)
-        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ";%d", Channel->dpid1);
-     if (Channel->dpid2)
-        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
-     *q = 0;
-     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%s:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->pnr);
-     }
-  return buffer;
-}
-
-const char *cChannel::ToText(void)
-{
-  return ToText(this);
-}
-
-bool cChannel::Parse(const char *s)
-{
-  char *buffer = NULL;
-  if (*s == ':') {
-     if (*++s) {
-        strn0cpy(name, s, MaxChannelName);
-        groupSep = true;
-        number = 0;
-        }
-     else
-        return false;
-     }
-  else {
-     groupSep = false;
-     char *apidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%c:%d :%d :%d :%a[^:]:%d :%d :%d ", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apidbuf, &tpid, &ca, &pnr);
-     apid1 = apid2 = 0;
-     dpid1 = dpid2 = 0;
-     if (apidbuf) {
-        char *p = strchr(apidbuf, ';');
-        if (p)
-           *p++ = 0;
-        sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
-        if (p)
-           sscanf(p, "%d ,%d ", &dpid1, &dpid2);
-        free(apidbuf);
-        }
-     else
-        return false;
-     if (fields >= 9) {
-        if (fields == 9) {
-           // allow reading of old format
-           pnr = ca;
-           ca = tpid;
-           tpid = 0;
-           }
-        strn0cpy(name, buffer, MaxChannelName);
-        free(buffer);
-        }
-     else
-        return false;
-     }
-  strreplace(name, '|', ':');
-  return true;
-}
-
-bool cChannel::Save(FILE *f)
-{
-  return fprintf(f, ToText()) > 0;
-}
-
 // -- cTimer -----------------------------------------------------------------
 
 char *cTimer::buffer = NULL;
@@ -139,7 +30,7 @@ cTimer::cTimer(bool Instant)
   recording = pending = false;
   active = Instant ? taActInst : taInactive;
   cChannel *ch = Channels.GetByNumber(cDevice::CurrentChannel());
-  channel = ch ? ch->number : 0;
+  channel = ch ? ch->Number() : 0;
   time_t t = time(NULL);
   struct tm tm_r;
   struct tm *now = localtime_r(&t, &tm_r);
@@ -156,7 +47,7 @@ cTimer::cTimer(bool Instant)
   firstday = 0;
   summary = NULL;
   if (Instant && ch)
-     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : ch->name);
+     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : ch->Name());
 }
 
 cTimer::cTimer(const cEventInfo *EventInfo)
@@ -165,7 +56,7 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   recording = pending = false;
   active = true;
   cChannel *ch = Channels.GetByServiceID(EventInfo->GetServiceID());
-  channel = ch ? ch->number : 0;
+  channel = ch ? ch->Number() : 0;
   time_t tstart = EventInfo->GetTime();
   time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
   tstart -= Setup.MarginStart * 60;
@@ -573,89 +464,6 @@ bool cCaDefinition::Parse(const char *s)
 
 cCommands Commands;
 
-// -- cChannels --------------------------------------------------------------
-
-cChannels Channels;
-
-bool cChannels::Load(const char *FileName, bool AllowComments)
-{
-  if (cConfig<cChannel>::Load(FileName, AllowComments)) {
-     ReNumber();
-     return true;
-     }
-  return false;
-}
-
-int cChannels::GetNextGroup(int Idx)
-{
-  cChannel *channel = Get(++Idx);
-  while (channel && !channel->groupSep)
-        channel = Get(++Idx);
-  return channel ? Idx : -1;
-}
-
-int cChannels::GetPrevGroup(int Idx)
-{
-  cChannel *channel = Get(--Idx);
-  while (channel && !channel->groupSep)
-        channel = Get(--Idx);
-  return channel ? Idx : -1;
-}
-
-int cChannels::GetNextNormal(int Idx)
-{
-  cChannel *channel = Get(++Idx);
-  while (channel && channel->groupSep)
-        channel = Get(++Idx);
-  return channel ? Idx : -1;
-}
-
-void cChannels::ReNumber( void )
-{
-  int Number = 0;
-  cChannel *ch = (cChannel *)First();
-  while (ch) {
-        if (!ch->groupSep)
-           ch->number = ++Number;
-        ch = (cChannel *)ch->Next();
-        }
-  maxNumber = Number;
-}
-
-cChannel *cChannels::GetByNumber(int Number)
-{
-  cChannel *channel = (cChannel *)First();
-  while (channel) {
-        if (!channel->groupSep && channel->number == Number)
-           return channel;
-        channel = (cChannel *)channel->Next();
-        }
-  return NULL;
-}
-
-cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
-{
-  cChannel *channel = (cChannel *)First();
-  while (channel) {
-        if (!channel->groupSep && channel->pnr == ServiceId)
-           return channel;
-        channel = (cChannel *)channel->Next();
-        }
-  return NULL;
-}
-
-bool cChannels::SwitchTo(int Number)
-{
-  cChannel *channel = GetByNumber(Number);
-  return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
-}
-
-const char *cChannels::GetChannelNameByNumber(int Number)
-{
-  cChannel *channel = GetByNumber(Number);
-  return channel ? channel->name : NULL;
-}
-
 // -- cTimers ----------------------------------------------------------------
 
 cTimers Timers;
diff --git a/config.h b/config.h
index dc0430542..2da1420b7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.129 2002/09/29 10:42:17 kls Exp $
+ * $Id: config.h 1.131 2002/10/05 09:58:58 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.11"
+#define VDRVERSION "1.1.12"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -32,34 +32,6 @@
 
 #define MaxFileName 256
 
-#define ISTRANSPONDER(f1, f2)  (abs((f1) - (f2)) < 4)
-
-class cChannel : public cListObject {
-private:
-  static char *buffer;
-  static const char *ToText(cChannel *Channel);
-public:
-  enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
-  char name[MaxChannelName];
-  int frequency; // MHz
-  char polarization;
-  int diseqc;
-  int srate;
-  int vpid;
-  int apid1, apid2;
-  int dpid1, dpid2;
-  int tpid;
-  int ca;
-  int pnr;
-  int number;    // Sequence number assigned on load
-  bool groupSep;
-  cChannel(void);
-  cChannel(const cChannel *Channel);
-  const char *ToText(void);
-  bool Parse(const char *s);
-  bool Save(FILE *f);
-  };
-
 enum eTimerActive { taInactive = 0,
                     taActive   = 1,
                     taInstant  = 2,
@@ -193,7 +165,7 @@ template<class T> class cConfig : public cList<T> {
                    if (l->Parse(buffer))
                       Add(l);
                    else {
-                      esyslog("error in %s, line %d\n", fileName, line);
+                      esyslog("ERROR: error in %s, line %d\n", fileName, line);
                       delete l;
                       result = false;
                       break;
@@ -229,23 +201,6 @@ template<class T> class cConfig : public cList<T> {
   }
   };
 
-class cChannels : public cConfig<cChannel> {
-protected:
-  int maxNumber;
-public:
-  cChannels(void) { maxNumber = 0; }
-  virtual bool Load(const char *FileName, bool AllowComments = false);
-  int GetNextGroup(int Idx);   // Get next channel group
-  int GetPrevGroup(int Idx);   // Get previous channel group
-  int GetNextNormal(int Idx);  // Get next normal channel (not group)
-  void ReNumber(void);         // Recalculate 'number' based on channel type
-  cChannel *GetByNumber(int Number);
-  cChannel *GetByServiceID(unsigned short ServiceId);
-  const char *GetChannelNameByNumber(int Number);
-  bool SwitchTo(int Number);
-  int MaxNumber(void) { return maxNumber; }
-  };
-
 class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
@@ -265,7 +220,6 @@ class cCaDefinitions : public cConfig<cCaDefinition> {
   const cCaDefinition *Get(int Number);
   };
 
-extern cChannels Channels;
 extern cTimers Timers;
 extern cCommands Commands;
 extern cSVDRPhosts SVDRPhosts;
diff --git a/device.c b/device.c
index 12166a8a2..473b178e8 100644
--- a/device.c
+++ b/device.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.22 2002/09/28 12:20:22 kls Exp $
+ * $Id: device.c 1.25 2002/10/06 13:49:38 kls Exp $
  */
 
 #include "device.h"
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include "channels.h"
 #include "eit.h"
 #include "i18n.h"
 #include "player.h"
@@ -143,7 +144,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
             || !d->Receiving() // ...the one we have is not receiving...
                && (device[i]->Priority() < d->Priority() // ...this one has an even lower Priority, or...
                   || device[i]->Priority() == d->Priority() // ...same Priority...
-                     && device[i]->ProvidesCa(Channel->ca) < d->ProvidesCa(Channel->ca) // ...but this one provides fewer Ca values
+                     && device[i]->ProvidesCa(Channel->Ca()) < d->ProvidesCa(Channel->Ca()) // ...but this one provides fewer Ca values
                   )
             )
          ) {
@@ -275,6 +276,11 @@ bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return false;
 }
 
+bool cDevice::ProvidesSource(int Source) const
+{
+  return false;
+}
+
 bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   return false;
@@ -283,11 +289,13 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
 {
   if (LiveView)
-     isyslog("switching to channel %d", Channel->number);
+     isyslog("switching to channel %d", Channel->Number());
   for (int i = 3; i--;) {
       switch (SetChannel(Channel, LiveView)) {
         case scrOk:           return true;
-        case scrNotAvailable: return false;
+        case scrNotAvailable: if (Interface)
+                                 Interface->Error(tr("Channel not available!"));
+                              return false;
         case scrNoTransfer:   if (Interface)
                                  Interface->Error(tr("Can't start Transfer Mode!"));
                               return false;
@@ -305,21 +313,25 @@ bool cDevice::SwitchChannel(int Direction)
   if (Direction) {
      int n = CurrentChannel() + Direction;
      int first = n;
-     for (;;) {
-         cChannel *channel = Channels.GetByNumber(n);
-         if (!channel)
-            break;
-         if (PrimaryDevice()->SwitchChannel(channel, true)) {
-            result = true;
-            break;
-            }
-         n += Direction;
-         }
-     int d = n - first;
-     if (abs(d) == 1)
-        dsyslog("skipped channel %d", first);
-     else if (d)
-        dsyslog("skipped channels %d..%d", first, n - sgn(d));
+     PrimaryDevice()->StopReplay(); // otherwise a running Transfer Mode would block channels
+     cChannel *channel;
+     while ((channel = Channels.GetByNumber(n)) != NULL) {
+           // try only channels which are currently available
+           if (PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit) || GetDevice(channel, 0))
+              break;
+           n += Direction;
+           }
+     if (channel) {
+        int d = n - first;
+        if (abs(d) == 1)
+           dsyslog("skipped channel %d", first);
+        else if (d)
+           dsyslog("skipped channels %d..%d", first, n - sgn(d));
+        if (PrimaryDevice()->SwitchChannel(channel, true))
+           result = true;
+        }
+     else if (n != first && Interface)
+        Interface->Error(tr("Channel not available!"));
      }
   return result;
 }
@@ -344,7 +356,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (CaDevice) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
-           cControl::Launch(new cTransferControl(CaDevice, Channel->vpid, Channel->apid1, 0, 0, 0));//XXX+
+           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid1(), 0, 0, 0));//XXX+
         else
            Result = scrNoTransfer;
         }
@@ -359,10 +371,10 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 
   if (Result == scrOk) {
      if (LiveView && IsPrimaryDevice()) {
-        cSIProcessor::SetCurrentServiceID(Channel->pnr);
-        currentChannel = Channel->number;
+        cSIProcessor::SetCurrentServiceID(Channel->Sid());
+        currentChannel = Channel->Number();
         }
-     cStatus::MsgChannelSwitch(this, Channel->number); // only report status if channel switch successfull
+     cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
 
   return Result;
diff --git a/device.h b/device.h
index b6f442730..9dcf16ce9 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.20 2002/09/28 12:20:34 kls Exp $
+ * $Id: device.h 1.21 2002/10/05 15:18:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -139,6 +139,8 @@ class cDevice : public cThread {
 protected:
   static int currentChannel;
 public:
+  virtual bool ProvidesSource(int Source) const;
+         // Returns true if this device can provide the given source.
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
          // Returns true if this device can provide the given channel.
          // In case the device has cReceivers attached to it or it is the primary
diff --git a/diseqc.c b/diseqc.c
new file mode 100644
index 000000000..92b92cbbb
--- /dev/null
+++ b/diseqc.c
@@ -0,0 +1,136 @@
+/*
+ * diseqc.c: DiSEqC handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: diseqc.c 1.1 2002/10/05 13:54:32 kls Exp $
+ */
+
+#include "diseqc.h"
+#include <ctype.h>
+#include "sources.h"
+
+// -- cDiseqc ----------------------------------------------------------------
+
+cDiseqc::cDiseqc(void)
+{
+  commands = NULL;
+  currentAction = NULL;;
+  parsing = false;
+  numCodes = 0;
+}
+
+cDiseqc::~cDiseqc()
+{
+  free(commands);
+}
+
+bool cDiseqc::Parse(const char *s)
+{
+  bool result = false;
+  char *sourcebuf = NULL;
+  int fields = sscanf(s, "%a[^ ] %d %c %d %a[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
+  if (fields == 4)
+     commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument results in an empty string
+  if (4 <= fields && fields <= 5) {
+     source = cSource::FromString(sourcebuf);
+     if (Sources.Get(source)) {
+        polarization = toupper(polarization);
+        if (polarization == 'V' || polarization == 'H') {
+           parsing = true;
+           bool Start = true;
+           while (Execute(Start) != daNone)
+                 Start = false;
+           parsing = false;
+           result = !commands || currentAction && !*currentAction;
+           }
+        else
+           esyslog("ERROR: unknown polarization '%c'", polarization);
+        }
+     else
+        esyslog("ERROR: unknown source '%s'", sourcebuf);
+     }
+  free(sourcebuf);
+  return result;
+}
+
+char *cDiseqc::Wait(char *s)
+{
+  char *p = NULL;
+  errno = 0;
+  int n = strtol(s, &p, 10);
+  if (!errno && p != s && n >= 0) {
+     if (!parsing)
+        usleep(n * 1000);
+     return p;
+     }
+  esyslog("ERROR: illegal value for wait time in '%s'", s - 1);
+  return NULL;
+}
+
+char *cDiseqc::Codes(char *s)
+{
+  char *e = strchr(s, ']');
+  if (e) {
+     numCodes = 0;
+     char *t = s;
+     char *p = s;
+     while (t < e) {
+           if (numCodes < MaxDiseqcCodes) {
+              errno = 0;
+              int n = strtol(t, &p, 16);
+              if (!errno && p != t && 0 <= n && n <= 255) {
+                 codes[numCodes++] = n;
+                 t = skipspace(p);
+                 }
+              else {
+                 esyslog("ERROR: illegal code at '%s'", t);
+                 return NULL;
+                 }
+              }
+           else {
+              esyslog("ERROR: too many codes in code sequence '%s'", s - 1);
+              return NULL;
+              }
+           }
+     return e + 1;
+     }
+  else
+     esyslog("ERROR: missing closing ']' in code sequence '%s'", s - 1);
+  return NULL;
+}
+
+cDiseqc::eDiseqcActions cDiseqc::Execute(bool Start)
+{
+  if (Start)
+     currentAction = commands;
+  while (currentAction && *currentAction) {
+        switch (*currentAction++) {
+          case ' ': break;
+          case 't': return daToneOff;
+          case 'T': return daToneOn;
+          case 'v': return daVoltage13;
+          case 'V': return daVoltage18;
+          case 'A': return daMiniA;
+          case 'B': return daMiniB;
+          case 'W': currentAction = Wait(currentAction); break;
+          case '[': currentAction = Codes(currentAction); return currentAction ? daCodes : daNone;
+          default: return daNone;
+          }
+        }
+  return daNone;
+}
+
+// -- cDiseqcs ---------------------------------------------------------------
+
+cDiseqcs Diseqcs;
+
+cDiseqc *cDiseqcs::Get(int Source, int Frequency, char Polarization)
+{
+  for (cDiseqc *p = First(); p; p = Next(p)) {
+      if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization))
+        return p;
+      }
+  return NULL;
+}
diff --git a/diseqc.conf b/diseqc.conf
new file mode 100644
index 000000000..52222f3dd
--- /dev/null
+++ b/diseqc.conf
@@ -0,0 +1,30 @@
+# DiSEqC configuration for VDR
+#
+# Format:
+#
+# satellite slof polarization lof command...
+#
+# satellite:      one of the 'S' codes defined in sources.conf
+# slof:           switch frequency of LNB; the first entry with
+#                 an slof greater than the actual transponder
+#                 frequency will be used
+# polarization:   V = vertical, H = horizontal
+# lof:            the local oscillator frequency to subtract from
+#                 the actual transponder frequency
+# command:
+#   t         tone off
+#   T         tone on
+#   v         voltage low (13V)
+#   V         voltage high (18V)
+#   A         mini A
+#   B         mini B
+#   Wnn       wait nn milliseconds (nn may be any positive integer number)
+#   [xx ...]  hex code sequence (max. 6)
+#
+# The 'command...' part is optional.
+
+S19.2E  11700 V  9750  t v W15 [E0 10 38 F0] W15 A W15 t
+S19.2E  99999 V 10600  t v W15 [E0 10 38 F1] W15 A W15 T
+S19.2E  11700 H  9750  t V W15 [E0 10 38 F2] W15 A W15 t
+S19.2E  99999 H 10600  t V W15 [E0 10 38 F3] W15 A W15 T
+
diff --git a/diseqc.h b/diseqc.h
new file mode 100644
index 000000000..f2b0e99cd
--- /dev/null
+++ b/diseqc.h
@@ -0,0 +1,60 @@
+/*
+ * diseqc.h: DiSEqC handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: diseqc.h 1.1 2002/10/05 13:02:52 kls Exp $
+ */
+
+#ifndef __DISEQC_H
+#define __DISEQC_H
+
+#include "config.h"
+
+class cDiseqc : public cListObject {
+public:
+  enum eDiseqcActions {
+    daNone,
+    daToneOff,
+    daToneOn,
+    daVoltage13,
+    daVoltage18,
+    daMiniA,
+    daMiniB,
+    daCodes,
+    };
+  enum { MaxDiseqcCodes = 6 };
+private:
+  int source;
+  int slof;
+  char polarization;
+  int lof;
+  char *commands;
+  char *currentAction;
+  bool parsing;
+  uchar codes[MaxDiseqcCodes];
+  int numCodes;
+  char *Wait(char *s);
+  char *Codes(char *s);
+public:
+  cDiseqc(void);
+  ~cDiseqc();
+  bool Parse(const char *s);
+  eDiseqcActions Execute(bool Start = false);
+  int Source(void) const { return source; }
+  int Slof(void) const { return slof; }
+  char Polarization(void) const { return polarization; }
+  int Lof(void) const { return lof; }
+  const char *Commands(void) const { return commands; }
+  uchar *Codes(int &NumCodes) { NumCodes = numCodes; return numCodes ? codes : NULL; }
+  };
+
+class cDiseqcs : public cConfig<cDiseqc> {
+public:
+  cDiseqc *Get(int Source, int Frequency, char Polarization);
+  };
+
+extern cDiseqcs Diseqcs;
+
+#endif //__DISEQC_H
diff --git a/dvbdevice.c b/dvbdevice.c
index f337e3574..eeaa7b071 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.21 2002/09/29 13:53:26 kls Exp $
+ * $Id: dvbdevice.c 1.22 2002/10/06 09:07:45 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -31,6 +31,8 @@ extern "C" {
 #endif
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include "channels.h"
+#include "diseqc.h"
 #include "dvbosd.h"
 #include "player.h"
 #include "receiver.h"
@@ -124,7 +126,9 @@ cDvbDevice::cDvbDevice(int n)
   else
      esyslog("ERROR: can't open DVB device %d", n);
 
-  frequency = 0;
+  source = -1;
+  frequency = -1;
+  diseqcCommands = NULL;
 }
 
 cDvbDevice::~cDvbDevice()
@@ -344,18 +348,33 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
+bool cDvbDevice::IsTunedTo(const cChannel *Channel) const
+{
+  return source == Channel->Source() && frequency == Channel->Frequency();
+}
+
+bool cDvbDevice::ProvidesSource(int Source) const
+{
+  int type = Source & cSource::st_Mask;
+  return type == cSource::stNone
+      || type == cSource::stCable && frontendType == FE_QAM
+      || type == cSource::stSat   && frontendType == FE_QPSK
+      || type == cSource::stTerr  && frontendType == FE_OFDM;
+  return true;
+}
+
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = true;
 
-  if (ProvidesCa(Channel->ca)) {
+  if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
      if (Receiving()) {
-        if (frequency == Channel->frequency) {
+        if (IsTunedTo(Channel)) {
            needsDetachReceivers = false;
-           if (!HasPid(Channel->vpid)) {
-              if (Channel->ca > CACONFBASE) {
+           if (!HasPid(Channel->Vpid())) {
+              if (Channel->Ca() > CACONFBASE) {
                  needsDetachReceivers = true;
                  result = hasPriority;
                  }
@@ -394,24 +413,24 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      LiveView = true;
 #endif
 
-  bool DoTune = frequency != Channel->frequency; // TODO will be changed when DiSEqC handling is revised
+  bool DoTune = !IsTunedTo(Channel);
 
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
-                            || Channel->ca > CACONFBASE && pidHandles[ptVideo].pid != Channel->vpid // CA channels can only be decrypted in "live" mode
+                            || Channel->Ca() > CACONFBASE && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode
                             || IsPrimaryDevice()
                                && (LiveView // for a new live view the old PIDs need to be turned off
-                                  || pidHandles[ptVideo].pid == Channel->vpid // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                                  || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                                   )
                             );
 
   bool StartTransferMode = IsPrimaryDevice() && !DoTune
-                           && (LiveView && HasPid(Channel->vpid) && pidHandles[ptVideo].pid != Channel->vpid // the PID is already set as DMX_PES_OTHER
-                              || !LiveView && pidHandles[ptVideo].pid == Channel->vpid // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                           && (LiveView && HasPid(Channel->Vpid()) && pidHandles[ptVideo].pid != Channel->Vpid() // the PID is already set as DMX_PES_OTHER
+                              || !LiveView && pidHandles[ptVideo].pid == Channel->Vpid() // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
 
   bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode
-                        && (Channel->ca > CACONFBASE // CA channels can only be decrypted in "live" mode
+                        && (Channel->Ca() > CACONFBASE // CA channels can only be decrypted in "live" mode
                            || LiveView
                            );
 
@@ -452,67 +471,127 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      switch (frontendType) {
        case FE_QPSK: { // DVB-S
 
-            // Frequency offsets:
-
-            unsigned int freq = Channel->frequency;
-            int tone = SEC_TONE_OFF;
+            unsigned int frequency = Channel->Frequency();
 
-            if (freq < (unsigned int)Setup.LnbSLOF) {
-               freq -= Setup.LnbFrequLo;
-               tone = SEC_TONE_OFF;
+            if (Setup.DiSEqC) {
+               cDiseqc *diseqc = Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
+               if (diseqc) {
+                  if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
+#ifndef NEWSTRUCT
+                     int SecTone = SEC_TONE_OFF;
+                     int SecVolt = SEC_VOLTAGE_13;
+#endif
+                     cDiseqc::eDiseqcActions da;
+                     for (bool Start = true; (da = diseqc->Execute(Start)) != cDiseqc::daNone; Start = false) {
+                         switch (da) {
+#ifdef NEWSTRUCT
+                           case cDiseqc::daNone:      break;
+                           case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+                           case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+                           case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+                           case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+                           case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+                           case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+                           case cDiseqc::daCodes: {
+                                int n = 0;
+                                uchar *codes = diseqc->Codes(n);
+                                if (codes) {
+                                   struct dvb_diseqc_master_cmd cmd;
+                                   memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
+                                   cmd.msg_len = n;
+                                   CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+                                   }
+                                }
+                                break;
+#else
+                           // This may not work very good with the old driver.
+                           // Let's try to emulate the NEWSTRUCT driver's behaviour as good as possible...
+                           case cDiseqc::daNone:      break;
+                           case cDiseqc::daToneOff:   CHECK(ioctl(fd_sec, SEC_SET_TONE, SecTone = SEC_TONE_OFF)); break;
+                           case cDiseqc::daToneOn:    CHECK(ioctl(fd_sec, SEC_SET_TONE, SecTone = SEC_TONE_ON)); break;
+                           case cDiseqc::daVoltage13: CHECK(ioctl(fd_sec, SEC_SET_VOLTAGE, SecVolt = SEC_VOLTAGE_13)); break;
+                           case cDiseqc::daVoltage18: CHECK(ioctl(fd_sec, SEC_SET_VOLTAGE, SecVolt = SEC_VOLTAGE_18)); break;
+                           case cDiseqc::daMiniA:
+                           case cDiseqc::daMiniB: {
+                                secCmdSequence scmds;
+                                memset(&scmds, 0, sizeof(scmds));
+                                scmds.voltage = SecVolt;
+                                scmds.miniCommand = (da == cDiseqc::daMiniA) ? SEC_MINI_A : SEC_MINI_B;
+                                scmds.continuousTone = SecTone;
+                                CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+                                }
+                                break;
+                           case cDiseqc::daCodes: {
+                                int n = 0;
+                                uchar *codes = diseqc->Codes(n);
+                                if (codes && n >= 3 && codes[0] == 0xE0) {
+                                   secCommand scmd;
+                                   memset(&scmd, 0, sizeof(scmd));
+                                   scmd.type = SEC_CMDTYPE_DISEQC;
+                                   scmd.u.diseqc.addr = codes[1];
+                                   scmd.u.diseqc.cmd = codes[2];
+                                   scmd.u.diseqc.numParams = n - 3;
+                                   memcpy(scmd.u.diseqc.params, &codes[3], min(n - 3, int(sizeof(scmd.u.diseqc.params))));
+   
+                                   secCmdSequence scmds;
+                                   memset(&scmds, 0, sizeof(scmds));
+                                   scmds.voltage = SecVolt;
+                                   scmds.miniCommand = SEC_MINI_NONE;
+                                   scmds.continuousTone = SecTone;
+                                   scmds.numCommands = 1;
+                                   scmds.commands = &scmd;
+
+                                   CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+                                   }
+                                }
+                                break;
+#endif
+                           }
+                         }
+                     diseqcCommands = diseqc->Commands();
+                     }
+                  frequency -= diseqc->Lof();
+                  }
+               else {
+                  esyslog("ERROR: no DiSEqC parameters found for channel %d", Channel->Number());
+                  return false;
+                  }
                }
             else {
-               freq -= Setup.LnbFrequHi;
-               tone = SEC_TONE_ON;
-               }
-
+               int tone = SEC_TONE_OFF;
+
+               if (frequency < (unsigned int)Setup.LnbSLOF) {
+                  frequency -= Setup.LnbFrequLo;
+                  tone = SEC_TONE_OFF;
+                  }
+               else {
+                  frequency -= Setup.LnbFrequHi;
+                  tone = SEC_TONE_ON;
+                  }
+               int volt = (Channel->Polarization() == 'v' || Channel->Polarization() == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
 #ifdef NEWSTRUCT
-            Frontend.frequency = freq * 1000UL;
-            Frontend.inversion = INVERSION_AUTO;
-            Frontend.u.qpsk.symbol_rate = Channel->srate * 1000UL;
-            Frontend.u.qpsk.fec_inner = FEC_AUTO;
+               CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+               CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
 #else
-            Frontend.Frequency = freq * 1000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.qpsk.SymbolRate = Channel->srate * 1000UL;
-            Frontend.u.qpsk.FEC_inner = FEC_AUTO;
+               secCmdSequence scmds;
+               memset(&scmds, 0, sizeof(scmds));
+               scmds.voltage = volt;
+               scmds.miniCommand = SEC_MINI_NONE;
+               scmds.continuousTone = tone;
+               CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
 #endif
-
-            int volt = (Channel->polarization == 'v' || Channel->polarization == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-
-            // DiSEqC:
+               }
 
 #ifdef NEWSTRUCT
-            struct dvb_diseqc_master_cmd cmd = { {0xE0, 0x10, 0x38, 0xF0, 0x00, 0x00}, 4};
-            cmd.msg[3] = 0xF0 | (((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0));
-
-            if (Setup.DiSEqC)
-               CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
-            CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
-            if (Setup.DiSEqC) {
-               usleep(15 * 1000);
-               CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-               usleep(15 * 1000);
-               CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, (Channel->diseqc / 4) % 2 ? SEC_MINI_B : SEC_MINI_A));
-               usleep(15 * 1000);
-               }
-            CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+            Frontend.frequency = frequency * 1000UL;
+            Frontend.inversion = SpectralInversion(Channel->Inversion());
+            Frontend.u.qpsk.symbol_rate = Channel->Srate() * 1000UL;
+            Frontend.u.qpsk.fec_inner = CodeRate(Channel->CoderateH());
 #else
-            secCommand scmd;
-            scmd.type = 0;
-            scmd.u.diseqc.addr = 0x10;
-            scmd.u.diseqc.cmd = 0x38;
-            scmd.u.diseqc.numParams = 1;
-            scmd.u.diseqc.params[0] = 0xF0 | ((Channel->diseqc * 4) & 0x0F) | (tone == SEC_TONE_ON ? 1 : 0) | (volt == SEC_VOLTAGE_18 ? 2 : 0);
-
-            secCmdSequence scmds;
-            scmds.voltage = volt;
-            scmds.miniCommand = SEC_MINI_NONE;
-            scmds.continuousTone = tone;
-            scmds.numCommands = Setup.DiSEqC ? 1 : 0;
-            scmds.commands = &scmd;
-
-            CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
+            Frontend.Frequency = frequency * 1000UL;
+            Frontend.Inversion = SpectralInversion(Channel->Inversion());
+            Frontend.u.qpsk.SymbolRate = Channel->Srate() * 1000UL;
+            Frontend.u.qpsk.FEC_inner = CodeRate(Channel->CoderateH());
 #endif
             }
             break;
@@ -521,17 +600,17 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             // Frequency and symbol rate:
 
 #ifdef NEWSTRUCT
-            Frontend.frequency = Channel->frequency * 1000000UL;
-            Frontend.inversion = INVERSION_AUTO;
-            Frontend.u.qam.symbol_rate = Channel->srate * 1000UL;
-            Frontend.u.qam.fec_inner = FEC_AUTO;
-            Frontend.u.qam.modulation = QAM_64;
+            Frontend.frequency = Channel->Frequency() * 1000000UL;
+            Frontend.inversion = SpectralInversion(Channel->Inversion());
+            Frontend.u.qam.symbol_rate = Channel->Srate() * 1000UL;
+            Frontend.u.qam.fec_inner = CodeRate(Channel->CoderateH());
+            Frontend.u.qam.modulation = Modulation(Channel->Modulation());
 #else
-            Frontend.Frequency = Channel->frequency * 1000000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.qam.SymbolRate = Channel->srate * 1000UL;
-            Frontend.u.qam.FEC_inner = FEC_AUTO;
-            Frontend.u.qam.QAM = QAM_64;
+            Frontend.Frequency = Channel->Frequency() * 1000000UL;
+            Frontend.Inversion = SpectralInversion(Channel->Inversion());
+            Frontend.u.qam.SymbolRate = Channel->Srate() * 1000UL;
+            Frontend.u.qam.FEC_inner = CodeRate(Channel->CoderateH());
+            Frontend.u.qam.QAM = Modulation(Channel->Modulation());
 #endif
             }
             break;
@@ -540,25 +619,25 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             // Frequency and OFDM paramaters:
 
 #ifdef NEWSTRUCT
-            Frontend.frequency = Channel->frequency * 1000UL;
-            Frontend.inversion = INVERSION_AUTO;
-            Frontend.u.ofdm.bandwidth=BANDWIDTH_8_MHZ;
-            Frontend.u.ofdm.code_rate_HP = FEC_2_3;
-            Frontend.u.ofdm.code_rate_LP = FEC_1_2;
-            Frontend.u.ofdm.constellation = QAM_64;
-            Frontend.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
-            Frontend.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
-            Frontend.u.ofdm.hierarchy_information = HIERARCHY_NONE;
+            Frontend.frequency = Channel->Frequency() * 1000UL;
+            Frontend.inversion = SpectralInversion(Channel->Inversion());
+            Frontend.u.ofdm.bandwidth = BandWidth(Channel->Bandwidth());
+            Frontend.u.ofdm.code_rate_HP = CodeRate(Channel->CoderateH());
+            Frontend.u.ofdm.code_rate_LP = CodeRate(Channel->CoderateL());
+            Frontend.u.ofdm.constellation = Modulation(Channel->Modulation());
+            Frontend.u.ofdm.transmission_mode = TransmitMode(Channel->Transmission());
+            Frontend.u.ofdm.guard_interval = GuardInterval(Channel->Guard());
+            Frontend.u.ofdm.hierarchy_information = Hierarchy(Channel->Hierarchy());
 #else
-            Frontend.Frequency = Channel->frequency * 1000UL;
-            Frontend.Inversion = INVERSION_AUTO;
-            Frontend.u.ofdm.bandWidth=BANDWIDTH_8_MHZ;
-            Frontend.u.ofdm.HP_CodeRate=FEC_2_3;
-            Frontend.u.ofdm.LP_CodeRate=FEC_1_2;
-            Frontend.u.ofdm.Constellation=QAM_64;
-            Frontend.u.ofdm.TransmissionMode=TRANSMISSION_MODE_2K;
-            Frontend.u.ofdm.guardInterval=GUARD_INTERVAL_1_32;
-            Frontend.u.ofdm.HierarchyInformation=HIERARCHY_NONE;
+            Frontend.Frequency = Channel->Frequency() * 1000UL;
+            Frontend.Inversion = SpectralInversion(Channel->Inversion());
+            Frontend.u.ofdm.bandWidth = BandWidth(Channel->Bandwidth());
+            Frontend.u.ofdm.HP_CodeRate = CodeRate(Channel->CoderateH());
+            Frontend.u.ofdm.LP_CodeRate = CodeRate(Channel->CoderateL());
+            Frontend.u.ofdm.Constellation = Modulation(Channel->Modulation());
+            Frontend.u.ofdm.TransmissionMode = TransmitMode(Channel->Transmission());
+            Frontend.u.ofdm.guardInterval = GuardInterval(Channel->Guard());
+            Frontend.u.ofdm.HierarchyInformation = Hierarchy(Channel->Hierarchy());
 #endif
             }
             break;
@@ -592,7 +671,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
          usleep(10 * 1000);
          }
      if (!(status & FE_HAS_LOCK)) {
-        esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->number, CardIndex() + 1);
+        esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->Number(), CardIndex() + 1);
         if (LiveView && IsPrimaryDevice())
            cThread::RaisePanic();
         return false;
@@ -602,43 +681,44 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
         FrontendEvent event;
         if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) {
            if (event.type != FE_COMPLETION_EV) {
-              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->number, CardIndex() + 1);
+              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->Number(), CardIndex() + 1);
               if (LiveView && IsPrimaryDevice())
                  cThread::RaisePanic();
               return false;
               }
            }
         else
-           esyslog("ERROR in frontend get event (channel %d, card %d): %m", Channel->number, CardIndex() + 1);
+           esyslog("ERROR in frontend get event (channel %d, card %d): %m", Channel->Number(), CardIndex() + 1);
         }
      else
         esyslog("ERROR: timeout while tuning on DVB card %d", CardIndex() + 1);
 #endif
 
-     frequency = Channel->frequency;
+     source = Channel->Source();
+     frequency = Channel->Frequency();
 
      }
 
   // PID settings:
 
   if (TurnOnLivePIDs) {
-     if (!(AddPid(Channel->apid1, ptAudio) && AddPid(Channel->vpid, ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
-        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->number, CardIndex() + 1);
+     if (!(AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
      if (IsPrimaryDevice())
-        AddPid(Channel->tpid, ptTeletext);
+        AddPid(Channel->Tpid(), ptTeletext);
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
      CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
      CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->vpid, Channel->apid1, 0, 0, 0));
+     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), 0, 0, 0));
 
   // Start setting system time:
 
   if (siProcessor)
-     siProcessor->SetCurrentTransponder(Channel->frequency);
+     siProcessor->SetCurrentTransponder(Channel->Frequency());
 
   return true;
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index acf569e01..df7aa0354 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.11 2002/09/28 12:21:36 kls Exp $
+ * $Id: dvbdevice.h 1.12 2002/10/06 08:57:24 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -61,8 +61,12 @@ class cDvbDevice : public cDevice {
 // Channel facilities
 
 private:
+  int source;
   int frequency;
+  const char *diseqcCommands;
+  bool IsTunedTo(const cChannel *Channel) const;
 public:
+  virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
diff --git a/eit.c b/eit.c
index 1e6993005..48735df62 100644
--- a/eit.c
+++ b/eit.c
@@ -16,15 +16,12 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.52 2002/09/20 16:24:17 kls Exp $
+ * $Id: eit.c 1.54 2002/10/06 10:31:38 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
 #include <ctype.h>
 #include <fcntl.h>
-#include <fstream.h>
-#include <iomanip.h>
-#include <iostream.h>
 #include <limits.h>
 #ifdef NEWSTRUCT
 #include <linux/dvb/dmx.h>
@@ -40,6 +37,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include "channels.h"
 #include "config.h"
 #include "libdtv/libdtv.h"
 #include "videodir.h"
@@ -456,7 +454,7 @@ static void ReportEpgBugFixStats(bool Reset = false)
             for (int c = 0; c < p->n; c++) {
                 cChannel *channel = Channels.GetByServiceID(p->serviceIDs[c]);
                 if (channel) {
-                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->name);
+                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
                    delim = ", ";
                    }
                 }
@@ -768,7 +766,7 @@ void cSchedule::Dump(FILE *f, const char *Prefix) const
    cChannel *channel = Channels.GetByServiceID(uServiceID);
    if (channel)
    {
-      fprintf(f, "%sC %u %s\n", Prefix, uServiceID, channel->name);
+      fprintf(f, "%sC %u %s\n", Prefix, uServiceID, channel->Name());
       for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
          p->Dump(f, Prefix);
       fprintf(f, "%sc\n", Prefix);
diff --git a/eitscan.c b/eitscan.c
index 069a133d3..c29b6b578 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.7 2002/09/08 11:08:52 kls Exp $
+ * $Id: eitscan.c 1.8 2002/10/05 13:44:35 kls Exp $
  */
 
 #include "eitscan.h"
 #include <stdlib.h>
+#include "channels.h"
 #include "dvbdevice.h"
 
 cEITScanner::cEITScanner(void)
@@ -28,11 +29,11 @@ cEITScanner::~cEITScanner()
 bool cEITScanner::TransponderScanned(cChannel *Channel)
 {
   for (int i = 0; i < numTransponders; i++) {
-      if (transponders[i] == Channel->frequency)
+      if (transponders[i] == Channel->Frequency())
          return true;
       }
   transponders = (int *)realloc(transponders, ++numTransponders * sizeof(int));
-  transponders[numTransponders - 1] = Channel->frequency;
+  transponders[numTransponders - 1] = Channel->Frequency();
   return false;
 }
 
@@ -66,7 +67,7 @@ void cEITScanner::Process(void)
                            if (Channel) {
                               if (!Device->ProvidesChannel(Channel))
                                  break;
-                              if (Channel->pnr && !TransponderScanned(Channel)) {
+                              if (Channel->Sid() && !TransponderScanned(Channel)) {
                                  if (Device == cDevice::PrimaryDevice() && !currentChannel)
                                     currentChannel = Device->CurrentChannel();
                                  Device->SwitchChannel(Channel, false);
diff --git a/i18n.c b/i18n.c
index 81b771784..d8dc3b7b7 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.93 2002/09/29 12:32:46 kls Exp $
+ * $Id: i18n.c 1.95 2002/10/06 11:31:18 kls Exp $
  *
  * Translations provided by:
  *
@@ -890,21 +890,21 @@ const tI18nPhrase Phrases[] = {
     "Polarizare",
     "Polariz�ci�",
   },
-  { "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
-    "DiSEqC",
+  { "Source",
+    "Quelle",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   { "Srate",
     "Srate",
@@ -1034,21 +1034,149 @@ const tI18nPhrase Phrases[] = {
     "Criptare",
     "CA",
   },
-  { "Pnr",
-    "Pnr",
-    "Pnr",
-    "Pnr",
-    "Pnr",
-    "N�m. Progr.",
-    "Num. Progr.",
-    "Program Id",
-    "Ohjelmatunnus",
-    "Pnr",
-    "Pnr",
-    "Pnr",
-    "Pnr",
-    "Nr. Prog.",
-    "Pnr",
+  { "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+    "Sid",
+  },
+  { "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+    "Inversion",
+  },
+  { "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+    "Bandwidth",
+  },
+  { "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+    "CoderateH",
+  },
+  { "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+    "CoderateL",
+  },
+  { "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+    "Modulation",
+  },
+  { "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+    "Transmission",
+  },
+  { "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+    "Guard",
+  },
+  { "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
+    "Hierarchy",
   },
   // Timer parameters:
   { "Active",
@@ -1308,6 +1436,22 @@ const tI18nPhrase Phrases[] = {
     "Nu mai sunt dispozitive DVB pentru inregistrare!",
     "Nincs szabad DVB k�rtya a felv�telhez!",
   },
+  { "Channel not available!",
+    "Kanal nicht verf�gbar!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
     "Zaklenjen kanal (snemanje)!",
@@ -2723,6 +2867,54 @@ const tI18nPhrase Phrases[] = {
     "nu",
     "nem",
   },
+  { "off",
+    "aus",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "none",
+    "keine",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "auto",
+    "auto",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "top",
     "oben",
     "zgoraj",
diff --git a/interface.c b/interface.c
index 3f1fba8f1..64c748944 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.55 2002/09/29 12:50:22 kls Exp $
+ * $Id: interface.c 1.56 2002/09/30 15:32:10 kls Exp $
  */
 
 #include "interface.h"
@@ -366,6 +366,7 @@ void cInterface::QueryKeys(cRemote *Remote)
                              ClearEol(0, 7);
                              ClearEol(0, 8);
                              ClearEol(0, 9);
+                             Flush();
                              for (;;) {
                                  Key = cRemote::Get(100);
                                  if (Key == kUp) {
diff --git a/menu.c b/menu.c
index eaf260f4e..fcd9ba43c 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.209 2002/09/29 12:50:47 kls Exp $
+ * $Id: menu.c 1.212 2002/10/06 14:08:44 kls Exp $
  */
 
 #include "menu.h"
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "channels.h"
 #include "config.h"
 #include "cutter.h"
 #include "eit.h"
@@ -21,6 +22,7 @@
 #include "plugin.h"
 #include "recording.h"
 #include "remote.h"
+#include "sources.h"
 #include "status.h"
 #include "videodir.h"
 
@@ -53,7 +55,7 @@ void cMenuEditChanItem::Set(void)
   char buf[255];
   cChannel *channel = Channels.GetByNumber(*value);
   if (channel)
-     snprintf(buf, sizeof(buf), "%d %s", *value, channel->name);
+     snprintf(buf, sizeof(buf), "%d %s", *value, channel->Name());
   else
      *buf = 0;
   SetValue(buf);
@@ -77,8 +79,8 @@ cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value)
   transponder = *Value;
   cChannel *channel = Channels.First();
   while (channel) {
-        if (!channel->groupSep && ISTRANSPONDER(channel->frequency, *Value)) {
-           number = channel->number;
+        if (!channel->GroupSep() && ISTRANSPONDER(channel->Frequency(), *Value)) {
+           number = channel->Number();
            break;
            }
         channel = (cChannel *)channel->Next();
@@ -95,7 +97,7 @@ eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
   number = *value;
   cChannel *channel = Channels.GetByNumber(*value);
   if (channel)
-     transponder = channel->frequency;
+     transponder = channel->Frequency();
   *value = transponder;
   return state;
 }
@@ -391,12 +393,137 @@ eOSState cMenuEditCaItem::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEditSrcItem ------------------------------------------------------
+
+class cMenuEditSrcItem : public cMenuEditIntItem {
+private:
+  const cSource *source;
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditSrcItem(const char *Name, int *Value);
+  eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditSrcItem::cMenuEditSrcItem(const char *Name, int *Value)
+:cMenuEditIntItem(Name, Value, 0)
+{
+  source = Sources.Get(*Value);
+  Set();
+}
+
+void cMenuEditSrcItem::Set(void)
+{
+  if (source) {
+     char *buffer = NULL;
+     asprintf(&buffer, "%s - %s", cSource::ToString(source->Code()), source->Description());
+     SetValue(buffer);
+     free(buffer);
+     }
+  else
+     cMenuEditIntItem::Set();
+}
+
+eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (source && source->Prev()) {
+           source = (cSource *)source->Prev();
+           *value = source->Code();
+           }
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (source) { 
+           if (source->Next())
+              source = (cSource *)source->Next();
+           }
+        else
+           source = Sources.First();
+        if (source)
+           *value = source->Code();
+        }
+     else
+        return state; // we don't call cMenuEditIntItem::ProcessKey(Key) here since we don't accept numerical input
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
+// --- cMenuEditMapItem ------------------------------------------------------
+
+class cMenuEditMapItem : public cMenuEditItem {
+protected:
+  int *value;
+  const tChannelParameterMap *map;
+  const char *zeroString;
+  virtual void Set(void);
+public:
+  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  map = Map;
+  zeroString = ZeroString;
+  Set();
+}
+
+void cMenuEditMapItem::Set(void)
+{
+  int n = MapToUser(*value, map);
+  if (n == 999)
+     SetValue(tr("auto"));
+  else if (n == 0 && zeroString)
+     SetValue(zeroString);
+  else if (n >= 0) {
+     char buf[16];
+     snprintf(buf, sizeof(buf), "%d", n);
+     SetValue(buf);
+     }
+  else
+     SetValue("???");
+}
+
+eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     int newValue = *value;
+     int n = DriverIndex(*value, map);
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (n-- > 0)
+           newValue = map[n].driverValue;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (map[++n].userValue >= 0)
+           newValue = map[n].driverValue;
+        }
+     else
+        return state;
+     if (newValue != *value) {
+        *value = newValue;
+        Set();
+        }
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuEditChannel ------------------------------------------------------
 
 class cMenuEditChannel : public cOsdMenu {
 private:
   cChannel *channel;
   cChannel data;
+  void Setup(void);
 public:
   cMenuEditChannel(int Index);
   virtual eOSState ProcessKey(eKeys Key);
@@ -408,24 +535,49 @@ cMenuEditChannel::cMenuEditChannel(int Index)
   channel = Channels.Get(Index);
   if (channel) {
      data = *channel;
-     Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), tr(FileNameChars)));
-     Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
-     Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
-     Add(new cMenuEditIntItem( tr("DiSEqC"),       &data.diseqc, 0, 10)); //TODO exact limits???
-     Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
-     Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
-     Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0x1FFF));
-     Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0x1FFF));
-     Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
-     Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0x1FFF));
-     Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
-     Add(new cMenuEditCaItem(  tr("CA"),           &data.ca, true));
-     Add(new cMenuEditIntItem( tr("Pnr"),          &data.pnr, 0));
+     Setup();
      }
 }
 
+void cMenuEditChannel::Setup(void)
+{
+  int current = Current();
+  char type = *cSource::ToString(data.source);
+#define ST(s) if (strchr(s, type))
+
+  Clear();
+
+  // Parameters for all types of sources:
+  Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), tr(FileNameChars)));
+  Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
+  Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
+  Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
+  Add(new cMenuEditCaItem(  tr("CA"),           &data.ca, true));
+  Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 0));
+  // Parameters for specific types of sources:
+  ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
+  ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
+  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues, tr("off")));
+  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues, tr("none")));
+  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues, tr("none")));
+  ST("C T")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues, "QPSK"));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Bandwidth"),    &data.bandwidth,    BandwidthValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
+
+  SetCurrent(Get(current));
+  Display();
+}
+
 eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 {
+  int oldSource = data.source;
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -436,6 +588,8 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
         state = osBack;
         }
      }
+  if (Key != kNone && (data.source & cSource::st_Mask) != (oldSource & cSource::st_Mask))
+     Setup();
   return state;
 }
 
@@ -455,7 +609,7 @@ cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
 {
   index = Index;
   channel = Channel;
-  if (channel->groupSep)
+  if (channel->GroupSep())
      SetColor(clrCyan, clrBackground);
   Set();
 }
@@ -463,10 +617,10 @@ cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
 void cMenuChannelItem::Set(void)
 {
   char *buffer = NULL;
-  if (!channel->groupSep)
-     asprintf(&buffer, "%d\t%s", channel->number, channel->name );
+  if (!channel->GroupSep())
+     asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
   else
-     asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->name);
+     asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->Name());
   SetText(buffer, false);
 }
 
@@ -530,7 +684,7 @@ eOSState cMenuChannels::New(void)
   Channels.ReNumber();
   Add(new cMenuChannelItem(channel->Index()/*XXX*/, channel), true);
   Channels.Save();
-  isyslog("channel %d added", channel->number);
+  isyslog("channel %d added", channel->Number());
   return AddSubMenu(new cMenuEditChannel(Current()));
 }
 
@@ -539,7 +693,7 @@ eOSState cMenuChannels::Del(void)
   if (Count() > 0) {
      int Index = Current();
      cChannel *channel = Channels.Get(Index);
-     int DeletedChannel = channel->number;
+     int DeletedChannel = channel->Number();
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
          if (ti->channel == DeletedChannel) {
@@ -578,8 +732,8 @@ eOSState cMenuChannels::Del(void)
 
 void cMenuChannels::Move(int From, int To)
 {
-  int FromNumber = Channels.Get(From)->number;
-  int ToNumber = Channels.Get(To)->number;
+  int FromNumber = Channels.Get(From)->Number();
+  int ToNumber = Channels.Get(To)->Number();
   // Move and renumber the channels:
   Channels.Move(From, To);
   Channels.ReNumber();
@@ -933,7 +1087,7 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
      cChannel *channel = Channels.GetByServiceID(eventInfo->GetServiceID());
      if (channel) {
         char *buffer;
-        asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->name, 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
+        asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
         SetTitle(buffer, false);
         free(buffer);
         int Line = 2;
@@ -984,7 +1138,7 @@ cMenuWhatsOnItem::cMenuWhatsOnItem(const cEventInfo *EventInfo)
   eventInfo = EventInfo;
   char *buffer = NULL;
   cChannel *channel = Channels.GetByNumber(eventInfo->GetChannelNumber());
-  asprintf(&buffer, "%d\t%.*s\t%.*s\t%s", eventInfo->GetChannelNumber(), 6, channel ? channel->name : "???", 5, eventInfo->GetTimeString(), eventInfo->GetTitle());
+  asprintf(&buffer, "%d\t%.*s\t%.*s\t%s", eventInfo->GetChannelNumber(), 6, channel ? channel->Name() : "???", 5, eventInfo->GetTimeString(), eventInfo->GetTitle());
   SetText(buffer, false);
 }
 
@@ -1026,7 +1180,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
         if (pArray[num]) {
            cChannel *channel = Channels.GetByServiceID(pArray[num]->GetServiceID());
            if (channel) {
-              pArray[num]->SetChannelNumber(channel->number);
+              pArray[num]->SetChannelNumber(channel->Number());
               num++;
               }
            }
@@ -1149,7 +1303,7 @@ cMenuSchedule::cMenuSchedule(void)
   otherChannel = 0;
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel) {
-     cMenuWhatsOn::SetCurrentChannel(channel->number);
+     cMenuWhatsOn::SetCurrentChannel(channel->Number());
      schedules = cSIProcessor::Schedules(mutexLock);
      PrepareSchedule(channel);
      SetHelp(tr("Record"), tr("Now"), tr("Next"));
@@ -1170,11 +1324,11 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
 {
   Clear();
   char *buffer = NULL;
-  asprintf(&buffer, tr("Schedule - %s"), Channel->name);
+  asprintf(&buffer, tr("Schedule - %s"), Channel->Name());
   SetTitle(buffer);
   free(buffer);
   if (schedules) {
-     const cSchedule *Schedule = Channel->pnr ? schedules->GetSchedule(Channel->pnr) : schedules->GetSchedule();
+     const cSchedule *Schedule = Channel->Sid() ? schedules->GetSchedule(Channel->Sid()) : schedules->GetSchedule();
      int num = Schedule->NumEvents();
      const cEventInfo **pArray = MALLOC(const cEventInfo *, num);
      if (pArray) {
@@ -1238,7 +1392,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                            if (Count()) {
                               cChannel *channel = Channels.GetByServiceID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetServiceID());
                               if (channel)
-                                 ChannelNr = channel->number;
+                                 ChannelNr = channel->Number();
                               }
                            now = true;
                            return AddSubMenu(new cMenuWhatsOn(schedules, true, ChannelNr));
@@ -1266,8 +1420,8 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
         cChannel *channel = Channels.GetByServiceID(ei->GetServiceID());
         if (channel) {
            PrepareSchedule(channel);
-           if (channel->number != cDevice::CurrentChannel()) {
-              otherChannel = channel->number;
+           if (channel->Number() != cDevice::CurrentChannel()) {
+              otherChannel = channel->Number();
               SetHelp(tr("Record"), tr("Now"), tr("Next"), tr("Switch"));
               }
            Display();
@@ -1451,7 +1605,7 @@ eOSState cMenuRecordings::Rewind(void)
   return osContinue;
 }
 
-eOSState cMenuRecordings::Del(void)
+eOSState cMenuRecordings::Delete(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
@@ -1510,7 +1664,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kOk:
        case kRed:    return Play();
        case kGreen:  return Rewind();
-       case kYellow: return Del();
+       case kYellow: return Delete();
        case kBlue:   return Summary();
        default: break;
        }
@@ -1636,17 +1790,44 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 // --- cMenuSetupLNB ---------------------------------------------------------
 
 class cMenuSetupLNB : public cMenuSetupBase {
+private:
+  void Setup(void);
 public:
   cMenuSetupLNB(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuSetupLNB::cMenuSetupLNB(void)
 {
   SetSection(tr("LNB"));
-  Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF (MHz)"),               &data.LnbSLOF));
-  Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency (MHz)"),  &data.LnbFrequLo));
-  Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi));
+  Setup();
+}
+
+void cMenuSetupLNB::Setup(void)
+{
+  int current = Current();
+
+  Clear();
+
   Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"),               &data.DiSEqC));
+  if (!data.DiSEqC) {
+     Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF (MHz)"),               &data.LnbSLOF));
+     Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency (MHz)"),  &data.LnbFrequLo));
+     Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi));
+     }
+
+  SetCurrent(Get(current));
+  Display();
+}
+
+eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
+{
+  int oldDiSEqC = data.DiSEqC;
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+
+  if (Key != kNone && data.DiSEqC != oldDiSEqC)
+     Setup();
+  return state;
 }
 
 // --- cMenuSetupCICAM -------------------------------------------------------
@@ -2092,7 +2273,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 }
                              break;
                case kBlue:   if (!HasSubMenu())
-                                state = replaying ? osStopReplay : osReplay;
+                                state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
                              break;
                default:      break;
                }
@@ -2152,10 +2333,10 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
 {
   int BufSize = Width() + 1;
   char buffer[BufSize];
-  if (Channel && Channel->number > 0)
-     snprintf(buffer, BufSize, "%d%s  %s", Channel->number, number ? "-" : "", Channel->name);
+  if (Channel && Channel->Number() > 0)
+     snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
   else
-     snprintf(buffer, BufSize, "%s", Channel ? Channel->name : tr("*** Invalid Channel ***"));
+     snprintf(buffer, BufSize, "%s", Channel ? Channel->Name() : tr("*** Invalid Channel ***"));
   Interface->Fill(0, 0, Setup.OSDwidth, 1, clrBackground);
   Interface->Write(0, 0, buffer);
   const char *date = DayDateTime();
@@ -2266,7 +2447,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             if (channel) {
                Interface->Clear();
                DisplayChannel(channel);
-               if (!channel->groupSep)
+               if (!channel->GroupSep())
                   group = -1;
                }
             }
@@ -2283,7 +2464,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     //XXX case kGreen:  return osEventNow;
     //XXX case kYellow: return osEventNext;
     case kOk:     if (group >= 0)
-                     Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->number);
+                     Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->Number());
                   return osEnd;
     default:      if (NORMALKEY(Key) == kUp || NORMALKEY(Key) == kDown || (Key & (k_Repeat | k_Release)) == 0) {
                      cRemote::Put(Key);
@@ -2433,7 +2614,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   fileName = strdup(Recording.FileName());
   cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
   cChannel *ch = Channels.GetByNumber(timer->channel);
-  recorder = new cRecorder(fileName, ch->ca, timer->priority, ch->vpid, ch->apid1, ch->apid2, ch->dpid1, ch->dpid2);
+  recorder = new cRecorder(fileName, ch->Ca(), timer->priority, ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
   if (device->AttachReceiver(recorder)) {
      Recording.WriteSummary();
      cStatus::MsgRecording(device, Recording.Name());
@@ -2460,7 +2641,7 @@ bool cRecordControl::GetEventInfo(void)
         cMutexLock MutexLock;
         const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
         if (Schedules) {
-           const cSchedule *Schedule = Schedules->GetSchedule(channel->pnr);
+           const cSchedule *Schedule = Schedules->GetSchedule(channel->Sid());
            if (Schedule) {
               eventInfo = Schedule->GetEventAround(Time);
               if (eventInfo) {
diff --git a/menu.h b/menu.h
index 247057b8e..325a29f38 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.46 2002/09/29 08:16:31 kls Exp $
+ * $Id: menu.h 1.47 2002/10/06 10:35:49 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -68,7 +68,7 @@ class cMenuRecordings : public cOsdMenu {
   bool Open(bool OpenSubMenus = false);
   eOSState Play(void);
   eOSState Rewind(void);
-  eOSState Del(void);
+  eOSState Delete(void);
   eOSState Summary(void);
 public:
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
diff --git a/params.txt b/params.txt
new file mode 100644
index 000000000..480a1a600
--- /dev/null
+++ b/params.txt
@@ -0,0 +1,4 @@
+Are the parameter names well chosen?
+
+  "Coderate"  <-->  FEC
+
diff --git a/recording.c b/recording.c
index c92344683..544bbbdbf 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.67 2002/08/24 14:09:49 kls Exp $
+ * $Id: recording.c 1.68 2002/10/05 13:44:56 kls Exp $
  */
 
 #include "recording.h"
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "channels.h"
 #include "i18n.h"
 #include "interface.h"
 #include "remux.h" //XXX+ I_FRAME
diff --git a/sources.c b/sources.c
new file mode 100644
index 000000000..fc660a5cc
--- /dev/null
+++ b/sources.c
@@ -0,0 +1,104 @@
+/*
+ * sources.c: Source handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sources.c 1.1 2002/10/06 09:27:10 kls Exp $
+ */
+
+#include "sources.h"
+#include <ctype.h>
+
+// -- cSource ----------------------------------------------------------------
+
+cSource::cSource(void)
+{
+  code = stNone;
+  description = NULL;
+}
+
+cSource::~cSource()
+{
+  free(description);
+}
+
+bool cSource::Parse(const char *s)
+{
+  char *codeBuf = NULL;
+  if (2 == sscanf(s, "%a[^ ] %a[^\n]", &codeBuf, &description))
+     code = FromString(codeBuf);
+  free(codeBuf);
+  return code != stNone && description && *description;
+}
+
+const char *cSource::ToString(int Code)
+{
+  static char buffer[16];
+  char *q = buffer;
+  switch (Code & st_Mask) {
+    case stCable: *q++ = 'C'; break;
+    case stSat:   *q++ = 'S';
+                  {
+                    int pos = Code & ~st_Mask;
+                    q += snprintf(q, sizeof(buffer) - 2, "%u.%u", (pos & ~st_Neg) / 10, (pos & ~st_Neg) % 10); // can't simply use "%g" here since the silly 'locale' messes up the decimal point
+                    *q++ = (Code & st_Neg) ? 'E' : 'W';
+                  }
+                  break;
+    case stTerr:  *q++ = 'T'; break;
+    default:      *q++ = Code + '0'; // backward compatibility
+    }
+  *q = 0;
+  return buffer;
+}
+
+int cSource::FromString(const char *s)
+{
+  int type = stNone;
+  switch (toupper(*s)) {
+    case 'C': type = stCable; break;
+    case 'S': type = stSat;   break;
+    case 'T': type = stTerr;  break;
+    case '0' ... '9': type = *s - '0'; break; // backward compatibility
+    default: esyslog("ERROR: unknown source key '%c'", *s);
+             return stNone;
+    }
+  int code = type;
+  if (type == stSat) {
+     int pos = 0;
+     bool dot = false;
+     bool neg = false;
+     while (*++s) {
+           switch (toupper(*s)) {
+             case '0' ... '9': pos *= 10;
+                               pos += *s - '0';
+                               break;
+             case '.':         dot = true;
+                               break;
+             case 'E':         neg = true; // fall through to 'W'
+             case 'W':         if (!dot)
+                                  pos *= 10;
+                               break;
+             default: esyslog("ERROR: unknown source character '%c'", *s);
+                      return stNone;
+             }
+           }
+     if (neg)
+        pos |= st_Neg;
+     code |= pos;
+     }
+  return code;
+}
+
+// -- cSources ---------------------------------------------------------------
+
+cSources Sources;
+
+cSource *cSources::Get(int Code)
+{
+  for (cSource *p = First(); p; p = Next(p)) {
+      if (p->Code() == Code)
+         return p;
+      }
+  return NULL;
+}
diff --git a/sources.conf b/sources.conf
new file mode 100644
index 000000000..f30e52f75
--- /dev/null
+++ b/sources.conf
@@ -0,0 +1,50 @@
+# Sources configuration for VDR
+#
+# Format:
+#
+# code  description
+#
+# Please contact kls@cadsoft.de before assigning a new code
+# to a description, in order to keep them unique.
+
+# Satellites
+
+S5E     Sirius 2/3
+S7E     Eutelsat W3
+S10E    Eutelsat W1R
+S13E    Hotbird 1-5
+S16E    Eutelsat W2
+S19.2E  Astra 1
+S23.5E  Astra 3
+S26E    Arabsat 2A/3A
+S28.2E  Astra 2
+S28.5E  Eurobird
+S30.E   Arabsat 30.5E
+S31.3   T�rksat 1B
+S36E    Eutelsat W4 / Sesat
+S42E    Turksat 1C / Eurasiasat
+
+S1W     Thor 2/3 / Intelsat 707
+S4W     Amos 1
+S5W     Telecom 2C
+S7W     Nilesat 101/102
+S8W     Atlantic bird 2 / Telecom 2D
+S11W    Express 3A
+S14W    Express 2
+S15W    Telstar 12
+S18W    Intelsat
+S21W    NSS 803
+S27.W   Intelsat 27.5W
+S30W    Hispasat 1
+S31.5W  Intelsat 31.5W
+S34.5W  Intelsat 34.5W
+S37.5W  Telstar 11
+S43W    PAS
+
+# Cable
+
+C       Cable
+
+# Terrestrial
+
+T       Terrestrial
diff --git a/sources.h b/sources.h
new file mode 100644
index 000000000..65d1bd6e2
--- /dev/null
+++ b/sources.h
@@ -0,0 +1,45 @@
+/*
+ * sources.h: Source handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sources.h 1.1 2002/10/04 14:25:03 kls Exp $
+ */
+
+#ifndef __SOURCES_H
+#define __SOURCES_H
+
+#include "config.h"
+
+class cSource : public cListObject {
+public:
+  enum eSourceType {
+    stNone  = 0x0000,
+    stCable = 0x4000,
+    stSat   = 0x8000,
+    stTerr  = 0xC000,
+    st_Mask = 0xC000,
+    st_Neg  = 0x0800,
+    };
+private:
+  int code;
+  char *description;
+public:
+  cSource(void);
+  ~cSource();
+  int Code(void) const { return code; }
+  const char *Description(void) const { return description; }
+  bool Parse(const char *s);
+  static const char *ToString(int Code);
+  static int FromString(const char *s);
+  };
+
+class cSources : public cConfig<cSource> {
+public:
+  cSource *Get(int Code);
+  };
+
+extern cSources Sources;
+
+#endif //__SOURCES_H
diff --git a/svdrp.c b/svdrp.c
index 325b7dabc..81906b48e 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.43 2002/09/28 15:50:19 kls Exp $
+ * $Id: svdrp.c 1.44 2002/10/05 13:45:05 kls Exp $
  */
 
 #include "svdrp.h"
@@ -26,6 +26,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <unistd.h>
+#include "channels.h"
 #include "config.h"
 #include "device.h"
 #include "keys.h"
@@ -412,7 +413,7 @@ void cSVDRP::CmdCHAN(const char *Option)
         int i = 1;
         cChannel *channel;
         while ((channel = Channels.GetByNumber(i)) != NULL) {
-              if (strcasecmp(channel->name, Option) == 0) {
+              if (strcasecmp(channel->Name(), Option) == 0) {
                  n = i;
                  break;
                  }
@@ -427,7 +428,7 @@ void cSVDRP::CmdCHAN(const char *Option)
         cChannel *channel = Channels.GetByNumber(n);
         if (channel) {
            if (!cDevice::PrimaryDevice()->SwitchChannel(channel, true)) {
-              Reply(554, "Error switching to channel \"%d\"", channel->number);
+              Reply(554, "Error switching to channel \"%d\"", channel->Number());
               return;
               }
            }
@@ -441,7 +442,7 @@ void cSVDRP::CmdCHAN(const char *Option)
      }
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel)
-     Reply(250, "%d %s", channel->number, channel->name);
+     Reply(250, "%d %s", channel->Number(), channel->Name());
   else
      Reply(550, "Unable to find channel \"%d\"", cDevice::CurrentChannel());
 }
@@ -630,7 +631,7 @@ void cSVDRP::CmdLSTC(const char *Option)
      if (isnumber(Option)) {
         cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
         if (channel)
-           Reply(250, "%d %s", channel->number, channel->ToText());
+           Reply(250, "%d %s", channel->Number(), channel->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
@@ -640,9 +641,9 @@ void cSVDRP::CmdLSTC(const char *Option)
         while (i <= Channels.MaxNumber()) {
               cChannel *channel = Channels.GetByNumber(i);
               if (channel) {
-                 if (strcasestr(channel->name, Option)) {
+                 if (strcasestr(channel->Name(), Option)) {
                     if (next)
-                       Reply(-250, "%d %s", next->number, next->ToText());
+                       Reply(-250, "%d %s", next->Number(), next->ToText());
                     next = channel;
                     }
                  }
@@ -653,7 +654,7 @@ void cSVDRP::CmdLSTC(const char *Option)
               i++;
               }
         if (next)
-           Reply(250, "%d %s", next->number, next->ToText());
+           Reply(250, "%d %s", next->Number(), next->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
@@ -662,7 +663,7 @@ void cSVDRP::CmdLSTC(const char *Option)
      for (int i = 1; i <= Channels.MaxNumber(); i++) {
          cChannel *channel = Channels.GetByNumber(i);
         if (channel)
-           Reply(i < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->number, channel->ToText());
+           Reply(i < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), channel->ToText());
         else
            Reply(501, "Channel \"%d\" not found", i);
          }
@@ -778,8 +779,8 @@ void cSVDRP::CmdMODC(const char *Option)
               }
            *channel = c;
            Channels.Save();
-           isyslog("channel %d modified", channel->number);
-           Reply(250, "%d %s", channel->number, channel->ToText());
+           isyslog("channel %d modified", channel->Number());
+           Reply(250, "%d %s", channel->Number(), channel->ToText());
            }
         else
            Reply(501, "Channel \"%d\" not defined", n);
@@ -844,8 +845,8 @@ void cSVDRP::CmdNEWC(const char *Option)
         Channels.Add(channel);
         Channels.ReNumber();
         Channels.Save();
-        isyslog("channel %d added", channel->number);
-        Reply(250, "%d %s", channel->number, channel->ToText());
+        isyslog("channel %d added", channel->Number());
+        Reply(250, "%d %s", channel->Number(), channel->ToText());
         }
      else
         Reply(501, "Error in channel settings");
diff --git a/vdr.5 b/vdr.5
index 00c58edb7..8d6acfbc2 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.5 2002/09/29 13:06:40 kls Exp $
+.\" $Id: vdr.5 1.6 2002/10/06 08:56:01 kls Exp $
 .\"
 .TH vdr 5 "7 Sep 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -29,7 +29,7 @@ character, followed by arbitrary text. Example:
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
-\fBRTL:12188:h:1:27500:163:104:105:0:12003\fR
+\fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003\fR
 
 The line number of a channel definition (not counting group separators!)
 defines the channel's number in OSD menus and the \fItimers.conf\fR file.
@@ -44,16 +44,44 @@ it has to be replaced by '|').
 .B Frequency
 The transponder frequency in MHz for DVB-S and DVB-C, kHz for DVB-T (as an integer).
 .TP
-.B Polarization
-The polarization of the satellite signal. 'h' or 'H' for horizontal, 'v' or 'V'
-for vertical (DVB-S only).
+.B Parameters
+Various parameters, depending on whether this is a DVB-S, DVB-C or DVB-T channel.
+Each parameter consist of a key character, followed by an integer number that
+represents the actual setting of that parameter. The valid key characters, their
+meaning (and allowed values) are
+.TS
+tab (@);
+l l.
+\fBB\fR@Bandwidth (6, 7, 8)
+\fBC\fR@Code rate high priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
+\fBD\fR@Code rate low priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
+\fBG\fR@Guard interval (4, 8, 16, 32)
+\fBH\fR@Horizontal polarization
+\fBI\fR@Inversion (0, 1)
+\fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
+\fBT\fR@Transmission mode (2, 8)
+\fBV\fR@Vertical polarization
+\fBY\fR@Hierarchy (0, 1, 2, 4)
+.TE
+The polarization parameters have no integer numbers following them. This is for
+compatibility with files from older versions and also to keep the DVB-S entries
+as simple as possible.
+
+The special value \fB999\fR is used for "automatic", which means the driver
+will automatically determine the proper value (if possible).
+
+An example of a parameter field for a DVB-T channel might look like this:
+
+\fBB8C23D12M64T2G32Y0\fR
 .TP
-.B
-DiSEqC
-The DiSEqC code to use for this channel (integer, DVB-S only).
+.B Source
+The signal source of this channel, as defined in the file \fIsources.conf\fR.
+For compatibility with files from older versions numeric values will be accepted
+and also written back correctly, but they will have no meaning for the \fBDiSEqC\fR
+settings. You should replace the numerical values with the proper source identifiers
+defined in \fIsources.conf\fR.
 .TP
-.B
-Srate
+.B Srate
 The symbol rate of this channel (DVB-S and DVB-C only).
 .TP
 .B VPID
@@ -78,8 +106,8 @@ l l.
 \fB>=100\fR@requires a specific decryption method defined in \fIca.conf\fR
 .TE
 .TP
-.B PNR
-The program number (aka service ID) of this channel.
+.B SID
+The service ID of this channel.
 .SS TIMERS
 The file \fItimers.conf\fR contains the timer setup.
 Each line contains one timer definition, with individual fields
@@ -191,6 +219,69 @@ Arbitrary text that describes the recording made by this timer.
 Any newline characters in the summary have to be replaced by '|', and
 the summary may contain ':' characters. If this field is not empty, its
 contents will be written into the \fIsummary.vdr\fR file of the recording.
+.SS SOURCES
+The file \fIsources.conf\fR defines the codes to be used in the \fBSource\fR field
+of channels in \fIchannels.conf\fR and assigns descriptive texts to them.
+Example:
+
+\fBS19.2E  Astra 1\fR
+
+Anything after (and including) a '#' character is comment.
+
+The first character of the \fBcode\fR must be one of
+.TS
+tab (@);
+l l.
+\fBS\fR@Satellite
+\fBC\fR@Cable
+\fBT\fR@Terrestrial
+.TE
+and is followed by further data pertaining to that particular source. In case of
+\fBS\fRatellite this is the orbital position in degrees, followed by \fBE\fR for
+east or \fBW\fR for west.
+.SS DISEQC
+The file \fIdiseqc.conf\fR defines the \fBDiSEqC\fR control sequences to be sent
+to the DVB-S card in order to access a given satellite position and/or band.
+Example:
+
+\fBS19.2E  11700 V  9750  t v W15 [E0 10 38 F0] W15 A W15 t\fR
+
+Anything after (and including) a '#' character is comment.
+
+The first word in a parameter line must be one of the codes defined in the
+file \fIsources.conf\fR and tells which satellite this line applies to.
+
+Following is the "switch frequency" of the LNB (slof), which is the transponder
+frequency up to which this entry shall be used; the first entry with an slof greater
+than the actual transponder frequency will be used. Typically there is only one slof
+per LNB, but the syntax allows any number of frequency ranges to be defined.
+Note that there should be a last entry with the value \fB99999\fR for each satellite,
+which covers the upper frequency range.
+
+The third parameter defines the polarization to which this entry applies. It can
+be either \fBH\fR for horizontal or \fBV\fR for vertical.
+
+The fourth parameter specifies the "local oscillator frequency" (lof) of the LNB
+to use for the given frequency range. This number will be subtracted from the
+actual transponder frequency when tuning to the channel.
+
+The rest of the line holds the actual sequence of DiSEqC actions to be taken.
+The code letters used here are
+.TS
+tab (@);
+l l.
+\fBt\fR@22kHz tone off
+\fBT\fR@22kHz tone on
+\fBv\fR@voltage low (13V)
+\fBV\fR@voltage high (18V)
+\fBA\fR@mini A
+\fBB\fR@mini B
+\fBWnn\fR@wait nn milliseconds (nn may be any positive integer number)
+\fB[xx ...]\fR@hex code sequence (max. 6)
+.TE
+There can be any number of actions in a line, including none at all - in which case
+the entry would be used only to set the LOF to use for the given frequency range
+and polarization.
 .SS CONDITIONAL ACCESS
 The file \fIca.conf\fR defines the numbers to be used in the \fBConditional access\fR
 field of channels in \fIchannels.conf\fR and assigns descriptive texts to them.
diff --git a/vdr.c b/vdr.c
index fd23ae1e6..7e22477bd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.124 2002/09/29 12:55:03 kls Exp $
+ * $Id: vdr.c 1.125 2002/10/06 10:25:04 kls Exp $
  */
 
 #include <getopt.h>
@@ -30,9 +30,11 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "channels.h"
 #include "config.h"
 #include "cutter.h"
 #include "device.h"
+#include "diseqc.h"
 #include "dvbdevice.h"
 #include "eitscan.h"
 #include "i18n.h"
@@ -44,6 +46,7 @@
 #include "plugin.h"
 #include "rcu.h"
 #include "recording.h"
+#include "sources.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -311,9 +314,11 @@ int main(int argc, char *argv[])
   cPlugin::SetConfigDirectory(ConfigDirectory);
 
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
+  Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true);
+  Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true);
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
-  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
+  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true);
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
   CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
   Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));

From cd7ccd64fd51b77b8b75b6e85ef6891b1917aa59 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Oct 2002 18:00:00 +0200
Subject: [PATCH 054/307] Version 1.1.13 - Added cDevice::DeviceNumber() to get
 the number of a device, not counting any   gaps that might be in the index
 count. - Fixed fetching the current/next information to handle cases where
 the duration   of an event is set wrongly and would last beyond the start
 time of the next   event. - Adapted type names to the new HEAD version of the
 driver (which the previous   NEWSTRUCT branch has been merged into). Note
 that to use this driver version   you still need to add NEWSTRUCT=1 to the
 make call when building VDR. You   need a HEAD version of the LinuxDVB driver
 dated 2002-10-11 or later to compile   VDR with NEWSTRUCT=1. - Fixed radio
 channels in channels.conf.cable (thanks to Robert Schiele and Uwe  
 Scheffler). - Fixed switching the video format in the Setup/DVB menu (thanks
 to Uwe Scheffler   for reporting this one). - Reactivated full handling of
 second audio PID (even in 'Transfer Mode'). - Fixed a crash when closing down
 with remote control plugins (thanks to Oliver   Endriss helping to debug this
 one). - Commands in the file 'commands.conf' can now have a '?' at the end of
 their   title, which will result in a confirmation prompt before executing
 the   command. - Changed a few leftover 'new char[...]' to MALLOC(char, ...).
 - If a command executed from the "Commands" menu doesn't return any output,
 the   OSD will now be closed automatically. - The SVDRP command PUTE now
 triggers an immediate write of the 'epg.data' file   (suggested by Gerhard
 Steiner). - The new configuration file 'reccmds.conf' can be used to define
 commands that   shall be executed from the "Recordings" menu; see MANUAL and
 'man vdr(5)' for   details (suggested by Gerhard Steiner).

---
 CONTRIBUTORS        |  13 +++-
 HISTORY             |  33 +++++++-
 MANUAL              |  38 ++++++----
 PLUGINS.html        |  48 +++++++++---
 channels.conf       |   5 ++
 channels.conf.cable | 110 +++++++++++++--------------
 config.c            |  26 +++++--
 config.h            |   9 ++-
 device.c            |  45 ++++++++++-
 device.h            |  42 ++++++++++-
 dvbdevice.c         |  92 +++++++++++++++++++----
 dvbdevice.h         |  17 +++--
 dvbplayer.c         |  38 +++++++++-
 eit.c               |  92 ++++++++++-------------
 eit.h               |   4 +-
 i18n.c              |  18 ++++-
 menu.c              | 178 ++++++++++++++++++++++++++++----------------
 menu.h              |   3 +-
 osd.c               |   6 +-
 player.h            |  23 +++++-
 rcu.c               |   4 +-
 recorder.c          |   4 +-
 recording.c         |  10 +--
 remote.c            |   5 +-
 remux.c             |  16 +---
 remux.h             |   5 +-
 svdrp.c             |   3 +-
 transfer.c          |  74 +++++++++++++++---
 transfer.h          |   9 ++-
 vdr.5               |  27 +++++--
 vdr.c               |   6 +-
 31 files changed, 705 insertions(+), 298 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6b8de525c..33d89d7ba 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -186,9 +186,10 @@ Aaron Holtzman
 Wolfgang Henselmann-Weiss <Wolfgang_Henselmann@betaresearch.de>
  for fixing calculating the timeout value in cFile::FileReady()
 
-Uwe Scheffler <UweScheffler@t-online.de>
+Uwe Scheffler <linux_dvb@uni.de>
  for his help in keeping 'channels.conf.cable' and 'channels.conf.terr' up to date
  for helping to test new DVB-T handling
+ for reporting a bug in switching the video format in the Setup/DVB menu
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
@@ -414,6 +415,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for helping to test and debug the new channel source and DiSEqC handling
  for reporting a bug when pressing the "Blue" button in the main menu without
  having displayed it
+ for helping to debug a crash when closing down with remote control plugins
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -423,3 +425,12 @@ Lauri Tischler <lauri.tischler@efore.fi>
 
 Andy Carter <fruit@ukgateway.net>
  for helping to test new DVB-T handling
+
+Robert Schiele <rschiele@uni-mannheim.de>
+ for his help in keeping 'channels.conf.cable' up to date
+
+Gerhard Steiner <steiner@mail.austria.com>
+ for suggesting that the SVDRP command PUTE shall trigger an immediate write of
+ the 'epg.data' file
+ for suggesting the new configuration file 'reccmds.conf' to define commands that
+ shall be executed from the "Recordings" menu
diff --git a/HISTORY b/HISTORY
index b9140feec..37afb3508 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1150,7 +1150,7 @@ Video Disk Recorder Revision History
   to their appropriate system locations and creates the /video directory if
   it doesn't exist yet.
 - Automatic hotkey assignment is now suppressed if the first entry in
-  commands.conf starts with a digit in the range '1'...'9', followed by a blank.
+  'commands.conf' starts with a digit in the range '1'...'9', followed by a blank.
 - Fixed a bug in switching back the replay mode display in time shift mode
   (thanks to Achim Lange for reporting this one).
 - Fixed a bug in the "First day" timer parameter for timers that record over
@@ -1579,3 +1579,34 @@ Video Disk Recorder Revision History
 - Updated channels.conf.terr and channels.conf.cable (thanks to Uwe Scheffler).
 - Fixed a bug when pressing the "Blue" button in the main menu without having
   displayed it (thanks to Oliver Endriss for reporting this one).
+
+2002-10-13: Version 1.1.13
+
+- Added cDevice::DeviceNumber() to get the number of a device, not counting any
+  gaps that might be in the index count.
+- Fixed fetching the current/next information to handle cases where the duration
+  of an event is set wrongly and would last beyond the start time of the next
+  event.
+- Adapted type names to the new HEAD version of the driver (which the previous
+  NEWSTRUCT branch has been merged into). Note that to use this driver version
+  you still need to add NEWSTRUCT=1 to the make call when building VDR. You
+  need a HEAD version of the LinuxDVB driver dated 2002-10-11 or later to compile
+  VDR with NEWSTRUCT=1.
+- Fixed radio channels in channels.conf.cable (thanks to Robert Schiele and Uwe
+  Scheffler).
+- Fixed switching the video format in the Setup/DVB menu (thanks to Uwe Scheffler
+  for reporting this one).
+- Reactivated full handling of second audio PID (even in 'Transfer Mode').
+- Fixed a crash when closing down with remote control plugins (thanks to Oliver
+  Endriss helping to debug this one).
+- Commands in the file 'commands.conf' can now have a '?' at the end of their
+  title, which will result in a confirmation prompt before executing the
+  command.
+- Changed a few leftover 'new char[...]' to MALLOC(char, ...).
+- If a command executed from the "Commands" menu doesn't return any output, the
+  OSD will now be closed automatically.
+- The SVDRP command PUTE now triggers an immediate write of the 'epg.data' file
+  (suggested by Gerhard Steiner).
+- The new configuration file 'reccmds.conf' can be used to define commands that
+  shall be executed from the "Recordings" menu; see MANUAL and 'man vdr(5)' for
+  details (suggested by Gerhard Steiner).
diff --git a/MANUAL b/MANUAL
index 2dc75a34b..79e80d038 100644
--- a/MANUAL
+++ b/MANUAL
@@ -8,20 +8,20 @@ Video Disk Recorder User's Manual
   possible, several keys have different meanings in the various
   modes:
 
-  Key     Normal      VDR          Channels   Timers     Edit/New      Recordings  Replay
-
-  Up      Ch up       Crsr up      Crsr up    Crsr up    Crsr up       Crsr up     Play
-  Down    Ch down     Crsr down    Crsr down  Crsr down  Crsr down     Crsr down   Pause
-  Left    Prev group  -            Page up    Page up    Decrement     Page up     Search back
-  Right   Next group  -            Page down  Page down  Increment     Page down   Search forward
-  Ok      Ch display  Select       Switch     Edit       Accept        Play        Progress disp.
-  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off    Menu on
-  Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu    Recordings menu
-  Red     -           Record       Edit       Edit       ABC/abc       Play        Jump
-  Green   -           Language     New        New        Ins/Ovr       Rewind      Skip -60s
-  Yellow  -           -            Delete     Delete     Delete        Delete      Skip +60s
-  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary     Stop
-  0..9    Ch select   -            -          -          Numeric inp.  -           Editing
+  Key     Normal      VDR          Channels   Timers     Edit/New      Recordings        Replay
+
+  Up      Ch up       Crsr up      Crsr up    Crsr up    Crsr up       Crsr up           Play
+  Down    Ch down     Crsr down    Crsr down  Crsr down  Crsr down     Crsr down         Pause
+  Left    Prev group  -            Page up    Page up    Decrement     Page up           Search back
+  Right   Next group  -            Page down  Page down  Increment     Page down         Search forward
+  Ok      Ch display  Select       Switch     Edit       Accept        Play              Progress disp.
+  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu on
+  Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu
+  Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump
+  Green   -           Language     New        New        Ins/Ovr       Rewind            Skip -60s
+  Yellow  -           -            Delete     Delete     Delete        Delete            Skip +60s
+  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
+  0..9    Ch select   -            -          -          Numeric inp.  Exec cmd(2)       Editing
 
   Power   Shutdown
   Volume+ Volume up
@@ -31,6 +31,7 @@ Video Disk Recorder User's Manual
   (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
       has been enabled in the "Setup" menu. Otherwise the Blue button is used
       to "mark" a timer for moving.
+  (2) See "Processing Recordings" below.
 
 * Navigating through the On Screen Menus
 
@@ -187,6 +188,15 @@ Video Disk Recorder User's Manual
   A previously stopped playback session can be resumed by pressing the "Blue"
   button in the "VDR" menu.
 
+* Processing Recordings
+
+  The configuration file 'reccmds.conf' can be used to define system commands
+  that can be applied to the recording that is currently highlighted in the
+  "Recordings" menu. The "Red" button in the "Recordings" menu opens the "Recording
+  commands" menu if there are commands defined in the file 'reccmds.conf'. Pressing
+  one of the keys '1'..'9' in the "Recordings" menu executes the corresponding
+  command from 'reccmds.conf' (see also "Executing system commands" below).
+
 * Replay Control
 
   The following keys have the listed meaning in Replay mode:
diff --git a/PLUGINS.html b/PLUGINS.html
index 4c4592de7..5cec85703 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.8 are marked like this.
-<!--X1.1.8--></td></tr></table>
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.9 are marked like this.
 <!--X1.1.9--></td></tr></table>
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.11 are marked like this.
 <!--X1.1.11--></td></tr></table>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.12 are marked like this.
 <!--X1.1.12--></td></tr></table>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.13 are marked like this.
+<!--X1.1.13--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -964,6 +964,18 @@
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<p>
+If the player can provide more than a single audio track, it can implement the
+following functions to make them available:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual int NumAudioTracks(void) const;
+virtual const char **GetAudioTracks(int *CurrentTrack = NULL);
+virtual void SetAudioTrack(int Index);
+</pre></td></tr></table><p>
+
+<!--X1.1.13--></td></tr></table>
 <p>
 TODO: PlayAudio()???
 <p>
@@ -1182,9 +1194,9 @@
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual bool ProvidesSource(int Source) const;
 <!--X1.1.12--></td></tr></table>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
@@ -1195,6 +1207,20 @@
 this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
 <!--X1.1.9--></td></tr></table>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<p>
+<b>Audio selection</b>
+<p>
+If the device can provide more than a single audio track, it can implement the
+following functions to make them available:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual int NumAudioTracksDevice(void) const;
+virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
+virtual void SetAudioTrackDevice(int Index);
+</pre></td></tr></table><p>
+
+<!--X1.1.13--></td></tr></table>
 <p>
 <b>Recording</b>
 <p>
@@ -1204,7 +1230,7 @@
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.9--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool GetTSPacket(uchar *&amp;Data);
 <!--X1.1.9--></td></tr></table>
 </pre></td></tr></table><p>
@@ -1250,7 +1276,6 @@
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.1.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>On Screen Display</b>
 <p>
@@ -1266,7 +1291,6 @@
 implements the functions necessary to display OSD information on your device.
 The caller of this function will delete the object as soon as it is no longer
 needed.
-<!--X1.1.8--></td></tr></table>
 
 <p>
 <b>Initializing new devices</b>
@@ -1291,7 +1315,7 @@
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Remote Control</h2>
 
 <center><i><b>The joy of zapping!</b></i></center><p>
diff --git a/channels.conf b/channels.conf
index 3d272147c..9288c4028 100644
--- a/channels.conf
+++ b/channels.conf
@@ -184,3 +184,8 @@ MTV German:12699:v:S19.2E:22000:3031:3032:0:0:28643
 IFA-TV:10832:h:S19.2E:22000:132:133:32:0:7251
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
 TANGOTV:10832:h:S19.2E:22000:61:62:0:0:61920
+:Sky
+Sky One:0:h:S28.2E:0:160:80:0:5:106
+itv2:0:h:S28.2E:0:160:80:0:5:226
+sci-fi:0:h:S28.2E:0:160:80:0:5:130
+Paramount Comedy:0:h:S28.2E:0:160:80:0:5:127
diff --git a/channels.conf.cable b/channels.conf.cable
index e96cd6a72..65321fc28 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -151,59 +151,59 @@ PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778
 PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779
 PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780
 :Radio-Sender (FTV)
-Fritz:426:M64:C:6900:8191:901:0:0:28209
-SPUTNIK:426:M64:C:6900:8191:1201:0:0:28212
-HR XXL:410:M64:C:6900:8191:3501:0:0:28125
-JUMP:426:M64:C:6900:8191:1001:0:0:28210
-MDR info:426:M64:C:6900:8191:1101:0:0:28211
-MDR KULTUR:426:M64:C:6900:8191:801:0:0:28208
-Radio 3:426:M64:C:6900:8191:701:0:0:28207
-RADIOmultikulti:426:M64:C:6900:8191:1301:0:0:28213
-SWR2:426:M64:C:6900:8191:1401:0:0:28214
-WDR 3:426:M64:C:6900:8191:1501:0:0:28215
-WDR Radio 5:426:M64:C:6900:8191:1601:0:0:28216
-Bayern 4 Klassik:410:M64:C:6900:8191:3001:0:0:28120
-B5 aktuell:410:M64:C:6900:8191:3101:0:0:28121
-NordwestRadio:410:M64:C:6900:8191:3801:0:0:28128
-Bayern 1:410:M64:C:6900:8191:3601:0:0:28126
-NDR Info:410:M64:C:6900:8191:3701:0:0:28127
-SR 1:410:M64:C:6900:8191:3901:0:0:28129
-hr-klassik:410:M64:C:6900:8191:3401:0:0:28124
-hr2:410:M64:C:6900:8191:3301:0:0:28123
-hr-chronos:410:M64:C:6900:8191:3201:0:0:28122
-DLF-K�ln:394:M64:C:6900:8191:810:0:0:28013
-DLR-Berlin:394:M64:C:6900:8191:710:0:0:28012
-�sterreich 1:394:M64:C:6900:8191:169:0:0:28017
-Radio GoldStar:354:M64:C:6900:8191:368:0:0:171
+Fritz:426:M64:C:6900:0:901:0:0:28209
+SPUTNIK:426:M64:C:6900:0:1201:0:0:28212
+HR XXL:410:M64:C:6900:0:3501:0:0:28125
+JUMP:426:M64:C:6900:0:1001:0:0:28210
+MDR info:426:M64:C:6900:0:1101:0:0:28211
+MDR KULTUR:426:M64:C:6900:0:801:0:0:28208
+Radio 3:426:M64:C:6900:0:701:0:0:28207
+RADIOmultikulti:426:M64:C:6900:0:1301:0:0:28213
+SWR2:426:M64:C:6900:0:1401:0:0:28214
+WDR 3:426:M64:C:6900:0:1501:0:0:28215
+WDR Radio 5:426:M64:C:6900:0:1601:0:0:28216
+Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120
+B5 aktuell:410:M64:C:6900:0:3101:0:0:28121
+NordwestRadio:410:M64:C:6900:0:3801:0:0:28128
+Bayern 1:410:M64:C:6900:0:3601:0:0:28126
+NDR Info:410:M64:C:6900:0:3701:0:0:28127
+SR 1:410:M64:C:6900:0:3901:0:0:28129
+hr-klassik:410:M64:C:6900:0:3401:0:0:28124
+hr2:410:M64:C:6900:0:3301:0:0:28123
+hr-chronos:410:M64:C:6900:0:3201:0:0:28122
+DLF-K�ln:394:M64:C:6900:0:810:0:0:28013
+DLR-Berlin:394:M64:C:6900:0:710:0:0:28012
+�sterreich 1:394:M64:C:6900:0:169:0:0:28017
+Radio GoldStar:354:M64:C:6900:0:368:0:0:171
 :Radio-Sender (PPV)
-ALTERNATIVE ROCK:370:M64:C:6900:8191:544:0:101:154
-DEUTSCHE HITS:370:M64:C:6900:8191:800:0:101:151
-HITLISTE:370:M64:C:6900:8191:784:0:101:150
-HIP HOP/R&B:370:M64:C:6900:8191:576:0:101:159
-DANCE:370:M64:C:6900:8191:304:0:101:165
-HARD ROCK:370:M64:C:6900:8191:816:0:101:152
-LOVE SONGS:370:M64:C:6900:8191:592:0:101:156
-FILM & MUSICAL:378:M64:C:6900:8191:592:0:101:145
-EASY LISTENING:378:M64:C:6900:8191:608:0:101:146
-JAZZ:378:M64:C:6900:8191:640:0:101:148
-KLASSIK POPUL�R:378:M64:C:6900:8191:624:0:101:147
-ORCHESTRALE WERKE:378:M64:C:6900:8191:560:0:101:158
-CLASSIC ROCK:370:M64:C:6900:8191:352:0:101:163
-VOLKSMUSIK:370:M64:C:6900:8191:400:0:101:157
-SCHLAGER:370:M64:C:6900:8191:384:0:101:162
-GOLD:370:M64:C:6900:8191:320:0:101:166
-OLD GOLD:362:M64:C:6900:8191:336:0:101:167
-SOUL CLASSICS:362:M64:C:6900:8191:352:0:101:153
-LATIN:362:M64:C:6900:8191:368:0:101:155
-NEW COUNTRY:362:M64:C:6900:8191:384:0:101:164
-COUNTRY:362:M64:C:6900:8191:656:0:101:149
-All Jazz:442:M64:C:6900:8191:535:0:101:53350
-Cristal New Age:442:M64:C:6900:8191:536:0:101:53351
-Movie Sounds:442:M64:C:6900:8191:537:0:101:53352
-Sinfonica:442:M64:C:6900:8191:538:0:101:53353
-Opernfestival:442:M64:C:6900:8191:539:0:101:53354
-Barock Fantasie:442:M64:C:6900:8191:540:0:101:53355
-Musica Camerata:442:M64:C:6900:8191:541:0:101:53356
-Musica Antica:442:M64:C:6900:8191:542:0:101:53357
-Adagio:442:M64:C:6900:8191:543:0:101:53358
-Jazz legends:442:M64:C:6900:8191:544:0:101:53359
+ALTERNATIVE ROCK:370:M64:C:6900:1:544:0:101:154
+DEUTSCHE HITS:370:M64:C:6900:1:800:0:101:151
+HITLISTE:370:M64:C:6900:1:784:0:101:150
+HIP HOP/R&B:370:M64:C:6900:1:576:0:101:159
+DANCE:370:M64:C:6900:1:304:0:101:165
+HARD ROCK:370:M64:C:6900:1:816:0:101:152
+LOVE SONGS:370:M64:C:6900:1:592:0:101:156
+FILM & MUSICAL:378:M64:C:6900:1:592:0:101:145
+EASY LISTENING:378:M64:C:6900:1:608:0:101:146
+JAZZ:378:M64:C:6900:1:640:0:101:148
+KLASSIK POPUL�R:378:M64:C:6900:1:624:0:101:147
+ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158
+CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163
+VOLKSMUSIK:370:M64:C:6900:1:400:0:101:157
+SCHLAGER:370:M64:C:6900:1:384:0:101:162
+GOLD:370:M64:C:6900:1:320:0:101:166
+OLD GOLD:362:M64:C:6900:1:336:0:101:167
+SOUL CLASSICS:362:M64:C:6900:1:352:0:101:153
+LATIN:362:M64:C:6900:1:368:0:101:155
+NEW COUNTRY:362:M64:C:6900:1:384:0:101:164
+COUNTRY:362:M64:C:6900:1:656:0:101:149
+All Jazz:442:M64:C:6900:1:535:0:101:53350
+Cristal New Age:442:M64:C:6900:1:536:0:101:53351
+Movie Sounds:442:M64:C:6900:1:537:0:101:53352
+Sinfonica:442:M64:C:6900:1:538:0:101:53353
+Opernfestival:442:M64:C:6900:1:539:0:101:53354
+Barock Fantasie:442:M64:C:6900:1:540:0:101:53355
+Musica Camerata:442:M64:C:6900:1:541:0:101:53356
+Musica Antica:442:M64:C:6900:1:542:0:101:53357
+Adagio:442:M64:C:6900:1:543:0:101:53358
+Jazz legends:442:M64:C:6900:1:544:0:101:53359
diff --git a/config.c b/config.c
index 24c143896..d9cdb43c6 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.107 2002/10/03 10:06:55 kls Exp $
+ * $Id: config.c 1.109 2002/10/13 10:03:49 kls Exp $
  */
 
 #include "config.h"
@@ -360,6 +360,7 @@ char *cCommand::result = NULL;
 cCommand::cCommand(void)
 {
   title = command = NULL;
+  confirm = false;
 }
 
 cCommand::~cCommand()
@@ -374,9 +375,14 @@ bool cCommand::Parse(const char *s)
   if (p) {
      int l = p - s;
      if (l > 0) {
-        title = new char[l + 1];
-        strn0cpy(title, s, l + 1);
+        title = MALLOC(char, l + 1);
+        stripspace(strn0cpy(title, s, l + 1));
         if (!isempty(title)) {
+           int l = strlen(title);
+           if (l > 1 && title[l - 1] == '?') {
+              confirm = true;
+              title[l - 1] = 0;
+              }
            command = stripspace(strdup(skipspace(p + 1)));
            return !isempty(command);
            }
@@ -385,12 +391,16 @@ bool cCommand::Parse(const char *s)
   return false;
 }
 
-const char *cCommand::Execute(void)
+const char *cCommand::Execute(const char *Parameters)
 {
-  dsyslog("executing command '%s'", command);
   free(result);
   result = NULL;
-  FILE *p = popen(command, "r");
+  char *cmdbuf = NULL;
+  if (Parameters)
+     asprintf(&cmdbuf, "%s %s", command, Parameters);
+  const char *cmd = cmdbuf ? cmdbuf : command;
+  dsyslog("executing command '%s'", cmd);
+  FILE *p = popen(cmd, "r");
   if (p) {
      int l = 0;
      int c;
@@ -404,7 +414,8 @@ const char *cCommand::Execute(void)
      pclose(p);
      }
   else
-     esyslog("ERROR: can't open pipe for command '%s'", command);
+     esyslog("ERROR: can't open pipe for command '%s'", cmd);
+  free(cmdbuf);
   return result;
 }
 
@@ -463,6 +474,7 @@ bool cCaDefinition::Parse(const char *s)
 // -- cCommands --------------------------------------------------------------
 
 cCommands Commands;
+cCommands RecordingCommands;
 
 // -- cTimers ----------------------------------------------------------------
 
diff --git a/config.h b/config.h
index 2da1420b7..1f043c4aa 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.131 2002/10/05 09:58:58 kls Exp $
+ * $Id: config.h 1.134 2002/10/13 10:03:09 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.12"
+#define VDRVERSION "1.1.13"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -87,13 +87,15 @@ class cCommand : public cListObject {
 private:
   char *title;
   char *command;
+  bool confirm;
   static char *result;
 public:
   cCommand(void);
   virtual ~cCommand();
   bool Parse(const char *s);
   const char *Title(void) { return title; }
-  const char *Execute(void);
+  bool Confirm(void) { return confirm; }
+  const char *Execute(const char *Parameters = NULL);
   };
 
 typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
@@ -222,6 +224,7 @@ class cCaDefinitions : public cConfig<cCaDefinition> {
 
 extern cTimers Timers;
 extern cCommands Commands;
+extern cCommands RecordingCommands;
 extern cSVDRPhosts SVDRPhosts;
 extern cCaDefinitions CaDefinitions;
 
diff --git a/device.c b/device.c
index 473b178e8..637632b40 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.25 2002/10/06 13:49:38 kls Exp $
+ * $Id: device.c 1.27 2002/10/12 13:24:37 kls Exp $
  */
 
 #include "device.h"
@@ -87,6 +87,15 @@ int cDevice::NextCardIndex(int n)
   return nextCardIndex;
 }
 
+int cDevice::DeviceNumber(void) const
+{
+  for (int i = 0; i < numDevices; i++) {
+      if (device[i] == this)
+         return i;
+      }
+  return -1;
+}
+
 void cDevice::MakePrimaryDevice(bool On)
 {
 }
@@ -356,7 +365,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (CaDevice) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
-           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid1(), 0, 0, 0));//XXX+
+           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));//XXX+
         else
            Result = scrNoTransfer;
         }
@@ -389,6 +398,20 @@ void cDevice::SetVolumeDevice(int Volume)
 {
 }
 
+int cDevice::NumAudioTracksDevice(void) const
+{
+  return 0;
+}
+
+const char **cDevice::GetAudioTracksDevice(int *CurrentTrack) const
+{
+  return NULL;
+}
+
+void cDevice::SetAudioTrackDevice(int Index)
+{
+}
+
 bool cDevice::ToggleMute(void)
 {
   int OldVolume = volume;
@@ -407,6 +430,24 @@ void cDevice::SetVolume(int Volume, bool Absolute)
      mute = false;
 }
 
+int cDevice::NumAudioTracks(void) const
+{
+  return player ? player->NumAudioTracks() : NumAudioTracksDevice();
+}
+
+const char **cDevice::GetAudioTracks(int *CurrentTrack) const
+{
+  return player ? player->GetAudioTracks(CurrentTrack) : GetAudioTracksDevice(CurrentTrack);
+}
+
+void cDevice::SetAudioTrack(int Index)
+{
+  if (player)
+     player->SetAudioTrack(Index);
+  else
+     SetAudioTrackDevice(Index);
+}
+
 bool cDevice::SetPlayMode(ePlayMode PlayMode)
 {
   return false;
diff --git a/device.h b/device.h
index 9dcf16ce9..54dc41e06 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.21 2002/10/05 15:18:13 kls Exp $
+ * $Id: device.h 1.23 2002/10/12 11:15:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -111,6 +111,8 @@ class cDevice : public cThread {
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
+  int DeviceNumber(void) const;
+         // Returns number of this device (0 ... MAXDEVICES - 1).
   int ProvidesCa(int Ca) const;
          // Checks whether this device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
@@ -217,7 +219,7 @@ class cDevice : public cThread {
          // Sets the output video format to either 16:9 or 4:3 (only useful
          // if this device has an MPEG decoder).
 
-// Volume facilities
+// Audio facilities
 
 private:
   bool mute;
@@ -225,6 +227,27 @@ class cDevice : public cThread {
 protected:
   virtual void SetVolumeDevice(int Volume);
        // Sets the audio volume on this device (Volume = 0...255).
+  virtual int NumAudioTracksDevice(void) const;
+       // Returns the number of audio tracks that are currently available on this
+       // device. The default return value is 0, meaning that this device
+       // doesn't have multiple audio track capabilities. The return value may
+       // change with every call and need not necessarily be the number of list
+       // entries returned by GetAudioTracksDevice(). This function is mainly called to
+       // decide whether there should be an "Audio" button in a menu.
+  virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
+       // Returns a list of currently available audio tracks. The last entry in the
+       // list must be NULL. The number of entries does not necessarily have to be
+       // the same as returned by a previous call to NumAudioTracksDevice().
+       // If CurrentTrack is given, it will be set to the index of the current track
+       // in the returned list. Note that the list must not be changed after it has
+       // been returned by a call to GetAudioTracksDevice()! The only time the list may
+       // change is *inside* the GetAudioTracksDevice() function.
+       // By default the return value is NULL and CurrentTrack, if given, will not
+       // have any meaning.
+  virtual void SetAudioTrackDevice(int Index);
+       // Sets the current audio track to the given value, which should be within the
+       // range of the list returned by a previous call to GetAudioTracksDevice()
+       // (otherwise nothing will happen).
 public:
   bool IsMute(void) const { return mute; }
   bool ToggleMute(void);
@@ -233,6 +256,21 @@ class cDevice : public cThread {
        // Sets the volume to the given value, either absolutely or relative to
        // the current volume.
   static int CurrentVolume(void) { return primaryDevice ? primaryDevice->volume : 0; }//XXX???
+  int NumAudioTracks(void) const;
+       // Returns the number of audio tracks that are currently available on this
+       // device or a player attached to it.
+  const char **GetAudioTracks(int *CurrentTrack = NULL) const;
+       // Returns a list of currently available audio tracks. The last entry in the
+       // list is NULL. The number of entries does not necessarily have to be
+       // the same as returned by a previous call to NumAudioTracks().
+       // If CurrentTrack is given, it will be set to the index of the current track
+       // in the returned list.
+       // By default the return value is NULL and CurrentTrack, if given, will not
+       // have any meaning.
+  void SetAudioTrack(int Index);
+       // Sets the current audio track to the given value, which should be within the
+       // range of the list returned by a previous call to GetAudioTracks() (otherwise
+       // nothing will happen).
 
 // Player facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index eeaa7b071..a4a4308d9 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.22 2002/10/06 09:07:45 kls Exp $
+ * $Id: dvbdevice.c 1.24 2002/10/12 11:15:45 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -80,7 +80,11 @@ static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
 
 cDvbDevice::cDvbDevice(int n)
 {
+#ifdef NEWSTRUCT
+  frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
+#else
   frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
+#endif
   siProcessor = NULL;
   spuDecoder = NULL;
   playMode = pmNone;
@@ -126,6 +130,8 @@ cDvbDevice::cDvbDevice(int n)
   else
      esyslog("ERROR: can't open DVB device %d", n);
 
+  aPid1 = aPid2 = 0;
+
   source = -1;
   frequency = -1;
   diseqcCommands = NULL;
@@ -306,12 +312,20 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
 }
 
 //                          ptAudio        ptVideo        ptTeletext        ptDolby        ptOther
+#ifdef NEWSTRUCT
+dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+#else
 dmxPesType_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+#endif
 
 bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
   if (Handle->pid) {
+#ifdef NEWSTRUCT
+     dmx_pes_filter_params pesFilterParams;
+#else
      dmxPesFilterParams pesFilterParams;
+#endif
      memset(&pesFilterParams, 0, sizeof(pesFilterParams));
      if (On) {
         if (Handle->handle < 0) {
@@ -322,7 +336,11 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
         pesFilterParams.pid     = Handle->pid;
         pesFilterParams.input   = DMX_IN_FRONTEND;
         pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
+#ifdef NEWSTRUCT
+        pesFilterParams.pes_type= PesTypes[Type < ptOther ? Type : ptOther];
+#else
         pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
+#endif
         pesFilterParams.flags   = DMX_IMMEDIATE_START;
         if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
            LOG_ERROR;
@@ -335,7 +353,11 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            pesFilterParams.pid     = 0x1FFF;
            pesFilterParams.input   = DMX_IN_FRONTEND;
            pesFilterParams.output  = DMX_OUT_DECODER;
+#ifdef NEWSTRUCT
+           pesFilterParams.pes_type= PesTypes[Type];
+#else
            pesFilterParams.pesType = PesTypes[Type];
+#endif
            pesFilterParams.flags   = DMX_IMMEDIATE_START;
            CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
            close(Handle->handle);
@@ -584,9 +606,9 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
 #ifdef NEWSTRUCT
             Frontend.frequency = frequency * 1000UL;
-            Frontend.inversion = SpectralInversion(Channel->Inversion());
+            Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.qpsk.symbol_rate = Channel->Srate() * 1000UL;
-            Frontend.u.qpsk.fec_inner = CodeRate(Channel->CoderateH());
+            Frontend.u.qpsk.fec_inner = fe_code_rate_t(Channel->CoderateH());
 #else
             Frontend.Frequency = frequency * 1000UL;
             Frontend.Inversion = SpectralInversion(Channel->Inversion());
@@ -601,10 +623,10 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
 #ifdef NEWSTRUCT
             Frontend.frequency = Channel->Frequency() * 1000000UL;
-            Frontend.inversion = SpectralInversion(Channel->Inversion());
+            Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.qam.symbol_rate = Channel->Srate() * 1000UL;
-            Frontend.u.qam.fec_inner = CodeRate(Channel->CoderateH());
-            Frontend.u.qam.modulation = Modulation(Channel->Modulation());
+            Frontend.u.qam.fec_inner = fe_code_rate_t(Channel->CoderateH());
+            Frontend.u.qam.modulation = fe_modulation_t(Channel->Modulation());
 #else
             Frontend.Frequency = Channel->Frequency() * 1000000UL;
             Frontend.Inversion = SpectralInversion(Channel->Inversion());
@@ -620,14 +642,14 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
 #ifdef NEWSTRUCT
             Frontend.frequency = Channel->Frequency() * 1000UL;
-            Frontend.inversion = SpectralInversion(Channel->Inversion());
-            Frontend.u.ofdm.bandwidth = BandWidth(Channel->Bandwidth());
-            Frontend.u.ofdm.code_rate_HP = CodeRate(Channel->CoderateH());
-            Frontend.u.ofdm.code_rate_LP = CodeRate(Channel->CoderateL());
-            Frontend.u.ofdm.constellation = Modulation(Channel->Modulation());
-            Frontend.u.ofdm.transmission_mode = TransmitMode(Channel->Transmission());
-            Frontend.u.ofdm.guard_interval = GuardInterval(Channel->Guard());
-            Frontend.u.ofdm.hierarchy_information = Hierarchy(Channel->Hierarchy());
+            Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
+            Frontend.u.ofdm.bandwidth = fe_bandwidth_t(Channel->Bandwidth());
+            Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(Channel->CoderateH());
+            Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(Channel->CoderateL());
+            Frontend.u.ofdm.constellation = fe_modulation_t(Channel->Modulation());
+            Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(Channel->Transmission());
+            Frontend.u.ofdm.guard_interval = fe_guard_interval_t(Channel->Guard());
+            Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(Channel->Hierarchy());
 #else
             Frontend.Frequency = Channel->Frequency() * 1000UL;
             Frontend.Inversion = SpectralInversion(Channel->Inversion());
@@ -663,7 +685,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      // Wait for channel lock:
 
 #ifdef NEWSTRUCT
-     FrontendStatus status = FrontendStatus(0);
+     fe_status_t status = fe_status_t(0);
      for (int i = 0; i < 100; i++) {
          CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
          if (status & FE_HAS_LOCK)
@@ -702,6 +724,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // PID settings:
 
   if (TurnOnLivePIDs) {
+     aPid1 = Channel->Apid1();
+     aPid2 = Channel->Apid2();
      if (!(AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
@@ -726,12 +750,46 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 void cDvbDevice::SetVolumeDevice(int Volume)
 {
   if (HasDecoder()) {
+#ifdef NEWSTRUCT
+     audio_mixer_t am;
+#else
      audioMixer_t am;
+#endif
      am.volume_left = am.volume_right = Volume;
      CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
      }
 }
 
+int cDvbDevice::NumAudioTracksDevice(void) const
+{
+  int n = 0;
+  if (aPid1)
+     n++;
+  if (aPid2 && aPid1 != aPid2)
+     n++;
+  return n;
+}
+
+const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
+{
+  if (NumAudioTracks()) {
+     if (CurrentTrack)
+        *CurrentTrack = (pidHandles[ptAudio].pid == aPid1) ? 0 : 1;
+     static const char *audioTracks1[] = { "Audio 1", NULL };
+     static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
+     return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1;
+     }
+  return NULL;
+}
+
+void cDvbDevice::SetAudioTrackDevice(int Index)
+{
+  if (0 <= Index && Index < NumAudioTracks()) {
+     DelPid(pidHandles[ptAudio].pid);
+     AddPid(Index ? aPid2 : aPid1, ptAudio);
+     }
+}
+
 bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
 {
   if (PlayMode != pmExtern_THIS_SHOULD_BE_AVOIDED && fd_video < 0 && fd_audio < 0) {
@@ -916,7 +974,11 @@ bool cDvbDevice::GetTSPacket(uchar *&Data)
         return true;
         }
      else if (FATALERRNO) {
+#ifdef NEWSTRUCT
+        if (errno == EOVERFLOW)
+#else
         if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
+#endif
            esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
         else {
            LOG_ERROR;
diff --git a/dvbdevice.h b/dvbdevice.h
index df7aa0354..b5484dc7a 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.12 2002/10/06 08:57:24 kls Exp $
+ * $Id: dvbdevice.h 1.14 2002/10/12 11:15:39 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -13,11 +13,6 @@
 #ifdef NEWSTRUCT
 #include <linux/dvb/frontend.h>
 #else
-#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
-                    // FIXME: shouldn't every header file include ALL the other header
-                    // FIXME: files it depends on? The sequence in which header files
-                    // FIXME: are included here should not matter - and it should NOT
-                    // FIXME: be necessary to include <stdlib.h> here!
 #include <ost/frontend.h>
 #endif
 #include "device.h"
@@ -36,10 +31,11 @@ class cDvbDevice : public cDevice {
          // Initializes the DVB devices.
          // Must be called before accessing any DVB functions.
 private:
-  FrontendType frontendType;
 #ifdef NEWSTRUCT
+  fe_type_t frontendType;
   int fd_osd, fd_frontend, fd_audio, fd_video, fd_dvr;
 #else
+  FrontendType frontendType;
   int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video, fd_dvr;
 #endif
   int OsdDeviceHandle(void) const { return fd_osd; }
@@ -86,10 +82,15 @@ class cDvbDevice : public cDevice {
 public:
   virtual void SetVideoFormat(bool VideoFormat16_9);
 
-// Volume facilities
+// Audio facilities
 
+private:
+  int aPid1, aPid2;
 protected:
   virtual void SetVolumeDevice(int Volume);
+  virtual int NumAudioTracksDevice(void) const;
+  virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
+  virtual void SetAudioTrackDevice(int Index);
 
 // EIT facilities
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 7edadfbcc..927fde4e1 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.13 2002/09/15 13:33:31 kls Exp $
+ * $Id: dvbplayer.c 1.14 2002/10/12 12:29:31 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -96,6 +96,8 @@ class cDvbPlayer : public cPlayer, cThread {
   ePlayDirs playDir;
   int trickSpeed;
   int readIndex, writeIndex;
+  bool canToggleAudioTrack;
+  uchar audioTrack;
   cFrame *readFrame;
   const cFrame *playFrame;
   void TrickSpeed(int Increment);
@@ -120,6 +122,9 @@ class cDvbPlayer : public cPlayer, cThread {
   void Goto(int Position, bool Still = false);
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
+  virtual int NumAudioTracks(void) const;
+  virtual const char **GetAudioTracks(int *CurrentTrack = NULL) const;
+  virtual void SetAudioTrack(int Index);
   };
 
 #define MAX_VIDEO_SLOWMOTION 63 // max. arg to pass to VIDEO_SLOWMOTION // TODO is this value correct?
@@ -139,6 +144,8 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   playMode = pmPlay;
   playDir = pdForward;
   trickSpeed = NORMAL_SPEED;
+  canToggleAudioTrack = false;
+  audioTrack = 0xC0;
   readIndex = writeIndex = -1;
   readFrame = NULL;
   playFrame = NULL;
@@ -216,7 +223,7 @@ void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
                    // continue with deleting the data - otherwise it disturbs DVB replay
               case 0xC0 ... 0xC1: // audio
                    if (c == 0xC1)
-                      ;//XXX+ canToggleAudioTrack = true;
+                      canToggleAudioTrack = true;
                    if (!Except || c != Except) {
                       int n = l;
                       for (int j = i; j < Length && n--; j++)
@@ -353,7 +360,7 @@ void cDvbPlayer::Action(void)
                        continue;
                        }
                     r = ReadFrame(replayFile, b, Length, sizeof(b));
-                    StripAudioPackets(b, r, 0xC0); //XXX+ audioTrack
+                    StripAudioPackets(b, r, audioTrack);
                     }
                  else // allows replay even if the index file is missing
                     r = read(replayFile, b, sizeof(b));
@@ -623,6 +630,31 @@ bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
   return true;
 }
 
+int cDvbPlayer::NumAudioTracks(void) const
+{
+  return canToggleAudioTrack ? 2 : 1;
+}
+
+const char **cDvbPlayer::GetAudioTracks(int *CurrentTrack = NULL) const
+{
+  if (NumAudioTracks()) {
+     if (CurrentTrack)
+        *CurrentTrack = (audioTrack == 0xC0) ? 0 : 1;
+     static const char *audioTracks1[] = { "Audio 1", NULL };
+     static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
+     return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1;
+     }
+  return NULL;
+}
+
+void cDvbPlayer::SetAudioTrack(int Index)
+{
+  if ((audioTrack == 0xC0) != (Index == 0)) {
+     audioTrack = (Index == 1) ? 0xC1 : 0xC0;
+     Empty();
+     }
+}
+
 // --- cDvbPlayerControl -----------------------------------------------------
 
 cDvbPlayerControl::cDvbPlayerControl(const char *FileName)
diff --git a/eit.c b/eit.c
index 48735df62..40ae87416 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.54 2002/10/06 10:31:38 kls Exp $
+ * $Id: eit.c 1.57 2002/10/13 09:29:05 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -629,50 +629,26 @@ cEventInfo *cSchedule::AddEvent(cEventInfo *EventInfo)
   return EventInfo;
 }
 
-/**  */
-const cEventInfo * cSchedule::GetPresentEvent() const
+const cEventInfo *cSchedule::GetPresentEvent(void) const
 {
-   // checking temporal sanity of present event (kls 2000-11-01)
-   time_t now = time(NULL);
-//XXX   if (pPresent && !(pPresent->GetTime() <= now && now <= pPresent->GetTime() + pPresent->GetDuration()))
-   {
-      cEventInfo *pe = Events.First();
-      while (pe != NULL)
-      {
-         if (pe->GetTime() <= now && now <= pe->GetTime() + pe->GetDuration())
-            return pe;
-         pe = Events.Next(pe);
-      }
-   }
-   return NULL;//XXX
-   return pPresent;
+  return GetEventAround(time(NULL));
 }
-/**  */
-const cEventInfo * cSchedule::GetFollowingEvent() const
+
+const cEventInfo *cSchedule::GetFollowingEvent(void) const
 {
-   // checking temporal sanity of following event (kls 2000-11-01)
-   time_t now = time(NULL);
-   const cEventInfo *pr = GetPresentEvent(); // must have it verified!
-if (pr)//XXX   if (pFollowing && !(pr && pr->GetTime() + pr->GetDuration() <= pFollowing->GetTime()))
-   {
-      int minDt = INT_MAX;
-      cEventInfo *pe = Events.First(), *pf = NULL;
-      while (pe != NULL)
-      {
-         int dt = pe->GetTime() - now;
-         if (dt > 0 && dt < minDt)
-         {
-            minDt = dt;
-            pf = pe;
+  const cEventInfo *pe = NULL;
+  time_t now = time(NULL);
+  time_t delta = INT_MAX;
+  for (cEventInfo *p = Events.First(); p; p = Events.Next(p)) {
+      time_t dt = p->GetTime() - now;
+      if (dt > 0 && dt < delta) {
+         delta = dt;
+         pe = p;
          }
-         pe = Events.Next(pe);
       }
-      return pf;
-   }
-   return NULL;//XXX
-   return pFollowing;
+  return pe;
 }
-/**  */
+
 void cSchedule::SetServiceID(unsigned short servid)
 {
    uServiceID = servid;
@@ -701,21 +677,21 @@ const cEventInfo * cSchedule::GetEvent(unsigned short uEventID, time_t tTime) co
 
    return pt;
 }
-/**  */
-const cEventInfo * cSchedule::GetEventAround(time_t tTime) const
-{
-   cEventInfo *pe = Events.First();
-   while (pe != NULL)
-   {
-      if (pe->GetTime() <= tTime && tTime <= pe->GetTime() + pe->GetDuration())
-         return pe;
 
-      pe = Events.Next(pe);
-   }
-
-   return NULL;
+const cEventInfo *cSchedule::GetEventAround(time_t Time) const
+{
+  const cEventInfo *pe = NULL;
+  time_t delta = INT_MAX;
+  for (cEventInfo *p = Events.First(); p; p = Events.Next(p)) {
+      time_t dt = Time - p->GetTime();
+      if (dt >= 0 && dt < delta && p->GetTime() + p->GetDuration() >= Time) {
+         delta = dt;
+         pe = p;
+         }
+      }
+  return pe;
 }
-/**  */
+
 bool cSchedule::SetPresentEvent(cEventInfo *pEvent)
 {
    if (pPresent != NULL)
@@ -1007,6 +983,7 @@ int cSIProcessor::numSIProcessors = 0;
 cSchedules *cSIProcessor::schedules = NULL;
 cMutex cSIProcessor::schedulesMutex;
 const char *cSIProcessor::epgDataFileName = EPGDATAFILENAME;
+time_t cSIProcessor::lastDump = time(NULL);
 
 /**  */
 cSIProcessor::cSIProcessor(const char *FileName)
@@ -1107,7 +1084,6 @@ void cSIProcessor::Action()
    dsyslog("EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 
    time_t lastCleanup = time(NULL);
-   time_t lastDump = time(NULL);
 
    active = true;
 
@@ -1220,7 +1196,11 @@ void cSIProcessor::Action()
 table identifer tid */
 bool cSIProcessor::AddFilter(u_char pid, u_char tid)
 {
+#ifdef NEWSTRUCT
+   dmx_sct_filter_params sctFilterParams;
+#else
    dmxSctFilterParams sctFilterParams;
+#endif
    memset(&sctFilterParams, 0, sizeof(sctFilterParams));
    sctFilterParams.pid = pid;
    sctFilterParams.timeout = 0;
@@ -1287,3 +1267,9 @@ bool cSIProcessor::SetCurrentServiceID(unsigned short servid)
   cMutexLock MutexLock(&schedulesMutex);
   return schedules ? schedules->SetCurrentServiceID(servid) : false;
 }
+
+void cSIProcessor::TriggerDump(void)
+{
+  cMutexLock MutexLock(&schedulesMutex);
+  lastDump = 0;
+}
diff --git a/eit.h b/eit.h
index 33a49a0e3..6ebd48f35 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.18 2002/08/25 10:38:34 kls Exp $
+ * $Id: eit.h 1.19 2002/10/13 09:28:06 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -138,6 +138,7 @@ class cSIProcessor : public cThread {
   static cSchedules *schedules;
   static cMutex schedulesMutex;
   static const char *epgDataFileName;
+  static time_t lastDump;
   bool masterSIProcessor;
   int currentTransponder;
   SIP_FILTER *filters;
@@ -160,6 +161,7 @@ class cSIProcessor : public cThread {
   void SetStatus(bool On);
   void SetCurrentTransponder(int CurrentTransponder);
   static bool SetCurrentServiceID(unsigned short servid);
+  static void TriggerDump(void);
   };
 
 #endif
diff --git a/i18n.c b/i18n.c
index d8dc3b7b7..311378c54 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.95 2002/10/06 11:31:18 kls Exp $
+ * $Id: i18n.c 1.96 2002/10/13 11:03:39 kls Exp $
  *
  * Translations provided by:
  *
@@ -199,6 +199,22 @@ const tI18nPhrase Phrases[] = {
     "Comenzi",
     "Parancsok",
   },
+  { "Recording commands",
+    "Befehle f�r Aufzeichnungen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Edit channel",
     "Kanal editieren",
     "Uredi kanal",
diff --git a/menu.c b/menu.c
index fcd9ba43c..077922a14 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.212 2002/10/06 14:08:44 kls Exp $
+ * $Id: menu.c 1.217 2002/10/13 12:10:54 kls Exp $
  */
 
 #include "menu.h"
@@ -1431,6 +1431,77 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuCommands ---------------------------------------------------------
+
+class cMenuCommands : public cOsdMenu {
+private:
+  cCommands *commands;
+  char *parameters;
+  eOSState Execute(void);
+public:
+  cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
+  virtual ~cMenuCommands();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters)
+:cOsdMenu(Title)
+{
+  SetHasHotkeys();
+  commands = Commands;
+  parameters = Parameters ? strdup(Parameters) : NULL;
+  int i = 0;
+  cCommand *command;
+
+  while ((command = commands->Get(i)) != NULL) {
+        Add(new cOsdItem(hk(command->Title())));
+        i++;
+        }
+}
+
+cMenuCommands::~cMenuCommands()
+{
+  free(parameters);
+}
+
+eOSState cMenuCommands::Execute(void)
+{
+  cCommand *command = commands->Get(Current());
+  if (command) {
+     char *buffer = NULL;
+     bool confirmed = true;
+     if (command->Confirm()) {
+        asprintf(&buffer, "%s?", command->Title());
+        confirmed = Interface->Confirm(buffer);
+        free(buffer);
+        }
+     if (confirmed) {
+        asprintf(&buffer, "%s...", command->Title());
+        Interface->Status(buffer);
+        Interface->Flush();
+        free(buffer);
+        const char *Result = command->Execute(parameters);
+        if (Result)
+           return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
+        return osEnd;
+        }
+     }
+  return osContinue;
+}
+
+eOSState cMenuCommands::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:  return Execute();
+       default:   break;
+       }
+     }
+  return state;
+}
+
 // --- cMenuRecordingItem ----------------------------------------------------
 
 class cMenuRecordingItem : public cOsdItem {
@@ -1545,7 +1616,7 @@ void cMenuRecordings::SetHelpKeys(void)
        case 0: SetHelp(NULL); break;
        case 1: SetHelp(tr("Open")); break;
        case 2:
-       case 3: SetHelp(tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Summary") : NULL);
+       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Summary") : NULL);
        }
      helpKeys = NewHelpKeys;
      }
@@ -1595,6 +1666,8 @@ eOSState cMenuRecordings::Play(void)
 
 eOSState cMenuRecordings::Rewind(void)
 {
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
      cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
@@ -1607,6 +1680,8 @@ eOSState cMenuRecordings::Rewind(void)
 
 eOSState cMenuRecordings::Delete(void)
 {
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
      if (Interface->Confirm(tr("Delete recording?"))) {
@@ -1654,6 +1729,27 @@ eOSState cMenuRecordings::Summary(void)
   return osContinue;
 }
 
+eOSState cMenuRecordings::Commands(eKeys Key)
+{
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri && !ri->IsDirectory()) {
+     cRecording *recording = GetRecording(ri);
+     if (recording) {
+        char *parameter = NULL;
+        asprintf(&parameter, "'%s'", recording->FileName());
+        cMenuCommands *menu;
+        eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, parameter));
+        free(parameter);
+        if (Key != kNone)
+           state = menu->ProcessKey(Key);
+        return state;
+        }
+     }
+  return osContinue;
+}
+
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
   bool HadSubMenu = HasSubMenu();
@@ -1661,11 +1757,12 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:
-       case kRed:    return Play();
+       case kOk:     return Play();
+       case kRed:    return (helpKeys > 1 && RecordingCommands.Count()) ? Commands() : Play();
        case kGreen:  return Rewind();
        case kYellow: return Delete();
        case kBlue:   return Summary();
+       case k1...k9: return Commands(Key);
        default: break;
        }
      }
@@ -1776,13 +1873,14 @@ cMenuSetupDVB::cMenuSetupDVB(void)
 eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 {
   int oldPrimaryDVB = Setup.PrimaryDVB;
+  bool oldVideoFormat = Setup.VideoFormat;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (state == osBack && Key == kOk) {
-     if (Setup.PrimaryDVB != oldPrimaryDVB) {
+     if (Setup.PrimaryDVB != oldPrimaryDVB)
         state = osSwitchDvb;
+     if (Setup.VideoFormat != oldVideoFormat)
         cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat);
-        }
      }
   return state;
 }
@@ -2050,58 +2148,6 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuCommands ---------------------------------------------------------
-
-class cMenuCommands : public cOsdMenu {
-private:
-  eOSState Execute(void);
-public:
-  cMenuCommands(void);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuCommands::cMenuCommands(void)
-:cOsdMenu(tr("Commands"))
-{
-  SetHasHotkeys();
-  int i = 0;
-  cCommand *command;
-
-  while ((command = Commands.Get(i)) != NULL) {
-        Add(new cOsdItem(hk(command->Title())));
-        i++;
-        }
-}
-
-eOSState cMenuCommands::Execute(void)
-{
-  cCommand *command = Commands.Get(Current());
-  if (command) {
-     char *buffer = NULL;
-     asprintf(&buffer, "%s...", command->Title());
-     Interface->Status(buffer);
-     Interface->Flush();
-     free(buffer);
-     const char *Result = command->Execute();
-     if (Result)
-        return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
-     }
-  return osContinue;
-}
-
-eOSState cMenuCommands::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk:  return Execute();
-       default:   break;
-       }
-     }
-  return state;
-}
-
 // --- cMenuPluginItem -------------------------------------------------------
 
 class cMenuPluginItem : public cOsdItem {
@@ -2211,7 +2257,7 @@ void cMenuMain::Set(void)
 
   // Color buttons:
 
-  SetHelp(tr("Record"), /*XXX+ cDevice::PrimaryDevice()->CanToggleAudioTrack() ? tr("Language") :XXX*/ NULL, NULL, replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(tr("Record"), cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, NULL, replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -2227,7 +2273,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osTimers:     return AddSubMenu(new cMenuTimers);
     case osRecordings: return AddSubMenu(new cMenuRecordings);
     case osSetup:      return AddSubMenu(new cMenuSetup);
-    case osCommands:   return AddSubMenu(new cMenuCommands);
+    case osCommands:   return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands));
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
                           cOsdItem *item = Get(Current());
                           if (item) {
@@ -2263,13 +2309,17 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 state = osRecord;
                              break;
                case kGreen:  if (!HasSubMenu()) {
-                                /*XXX+
-                                if (cDevice::PrimaryDevice()->CanToggleAudioTrack()) {
+                                int CurrentAudioTrack = -1;
+                                const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&CurrentAudioTrack);
+                                if (AudioTracks) {
+                                   const char **at = &AudioTracks[CurrentAudioTrack];
+                                   if (!*++at)
+                                      at = AudioTracks;
                                    Interface->Clear();
-                                   cDevice::PrimaryDevice()->ToggleAudioTrack();
+                                   cDevice::PrimaryDevice()->SetAudioTrack(at - AudioTracks);
+                                   //XXX Interface->Info(*at);
                                    state = osEnd;
                                    }
-                                   XXX*/
                                 }
                              break;
                case kBlue:   if (!HasSubMenu())
diff --git a/menu.h b/menu.h
index 325a29f38..ba3c3d552 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.47 2002/10/06 10:35:49 kls Exp $
+ * $Id: menu.h 1.48 2002/10/13 10:34:09 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -70,6 +70,7 @@ class cMenuRecordings : public cOsdMenu {
   eOSState Rewind(void);
   eOSState Delete(void);
   eOSState Summary(void);
+  eOSState Commands(eKeys Key = kNone);
 public:
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
   ~cMenuRecordings();
diff --git a/osd.c b/osd.c
index a2daf6033..acd9aec4f 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.35 2002/08/25 09:18:31 kls Exp $
+ * $Id: osd.c 1.36 2002/10/13 10:31:28 kls Exp $
  */
 
 #include "osd.h"
@@ -623,9 +623,7 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
         return state;
      }
   switch (Key) {
-    case k1...k9: if (hasHotkeys)
-                     return HotKey(Key);
-                  break;
+    case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
     case kUp|k_Repeat:
     case kUp:   CursorUp();   break;
     case kDown|k_Repeat:
diff --git a/player.h b/player.h
index 12cc2a376..1e1fabfab 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.8 2002/08/16 09:14:12 kls Exp $
+ * $Id: player.h 1.9 2002/10/12 11:17:02 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -50,6 +50,27 @@ class cPlayer {
        // we are going forward or backward and 'Speed' is -1 if this is normal
        // play/pause mode, 0 if it is single speed fast/slow forward/back mode
        // and >0 if this is multi speed mode.
+  virtual int NumAudioTracks(void) const { return 0; }
+       // Returns the number of audio tracks that are currently available on this
+       // player. The default return value is 0, meaning that this player
+       // doesn't have multiple audio track capabilities. The return value may
+       // change with every call and need not necessarily be the number of list
+       // entries returned by GetAudioTracks(). This function is mainly called to
+       // decide whether there should be an "Audio" button in a menu.
+  virtual const char **GetAudioTracks(int *CurrentTrack = NULL) const { return NULL; }
+       // Returns a list of currently available audio tracks. The last entry in the
+       // list must be NULL. The number of entries does not necessarily have to be
+       // the same as returned by a previous call to NumAudioTracks().
+       // If CurrentTrack is given, it will be set to the index of the current track
+       // in the returned list. Note that the list must not be changed after it has
+       // been returned by a call to GetAudioTracks()! The only time the list may
+       // change is *inside* the GetAudioTracks() function.
+       // By default the return value is NULL and CurrentTrack, if given, will not
+       // have any meaning.
+  virtual void SetAudioTrack(int Index) {}
+       // Sets the current audio track to the given value, which should be within the
+       // range of the list returned by a previous call to GetAudioTracks()
+       // (otherwise nothing will happen).
   };
 
 class cControl : public cOsdObject {
diff --git a/rcu.c b/rcu.c
index 6b7c4f978..6345bea73 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.1 2002/09/29 13:16:44 kls Exp $
+ * $Id: rcu.c 1.2 2002/10/06 15:49:03 kls Exp $
  */
 
 #include "rcu.h"
@@ -308,5 +308,5 @@ void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
 
 void cRcuRemote::Recording(const cDevice *Device, const char *Name)
 {
-  SetPoints(1 << Device->CardIndex(), Device->Receiving()); //XXX CardNumber()!!!
+  SetPoints(1 << Device->DeviceNumber(), Device->Receiving());
 }
diff --git a/recorder.c b/recorder.c
index ba7dc06d3..4904014fc 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.2 2002/09/07 13:40:23 kls Exp $
+ * $Id: recorder.c 1.3 2002/10/12 13:34:29 kls Exp $
  */
 
 #include <stdarg.h>
@@ -119,7 +119,7 @@ void cRecorder::Action(void)
            r += g;
         if (r > 0) {
            int Count = r, Result;
-           const uchar *p = remux->Process(b, Count, Result, &pictureType);
+           uchar *p = remux->Process(b, Count, Result, &pictureType);
            if (p) {
               //XXX+ active??? see old version (Busy)
               if (!active && pictureType == I_FRAME) // finish the recording before the next 'I' frame
diff --git a/recording.c b/recording.c
index 544bbbdbf..1be6623b5 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.68 2002/10/05 13:44:56 kls Exp $
+ * $Id: recording.c 1.69 2002/10/13 09:08:45 kls Exp $
  */
 
 #include "recording.h"
@@ -363,7 +363,7 @@ cRecording::cRecording(const char *FileName)
         t.tm_mon--;
         t.tm_sec = 0;
         start = mktime(&t);
-        name = new char[p - FileName + 1];
+        name = MALLOC(char, p - FileName + 1);
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
         name = ExchangeChars(name, false);
@@ -511,7 +511,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
                  break;
               }
            }
-     titleBuffer = new char[s - p + 3];
+     titleBuffer = MALLOC(char, s - p + 3);
      *titleBuffer = Delimiter;
      *(titleBuffer + 1) = Delimiter;
      strn0cpy(titleBuffer + 2, p, s - p + 1);
@@ -769,7 +769,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
   last = -1;
   index = NULL;
   if (FileName) {
-     fileName = new char[strlen(FileName) + strlen(INDEXFILESUFFIX) + 1];
+     fileName = MALLOC(char, strlen(FileName) + strlen(INDEXFILESUFFIX) + 1);
      if (fileName) {
         strcpy(fileName, FileName);
         char *pFileExt = fileName + strlen(fileName);
@@ -996,7 +996,7 @@ cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
   record = Record;
   blocking = Blocking;
   // Prepare the file name:
-  fileName = new char[strlen(FileName) + RECORDFILESUFFIXLEN];
+  fileName = MALLOC(char, strlen(FileName) + RECORDFILESUFFIXLEN);
   if (!fileName) {
      esyslog("ERROR: can't copy file name '%s'", fileName);
      return;
diff --git a/remote.c b/remote.c
index ffdfa18ad..05ce6063c 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.28 2002/09/29 12:51:26 kls Exp $
+ * $Id: remote.c 1.29 2002/10/12 15:22:08 kls Exp $
  */
 
 #include "remote.h"
@@ -34,8 +34,7 @@ cCondVar cRemote::keyPressed;
 
 cRemote::cRemote(const char *Name)
 {
-  if (Name)
-     name = strdup(Name);
+  name = Name ? strdup(Name) : NULL;
   Remotes.Add(this);
 }
 
diff --git a/remux.c b/remux.c
index 6a2753b1f..786bb8feb 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.11 2002/08/11 11:48:34 kls Exp $
+ * $Id: remux.c 1.12 2002/10/12 13:33:54 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -482,17 +482,9 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
   return -1;
 }
 
-void cRemux::SetAudioPid(int APid)
-{
-  aPid1 = APid;
-  vTS2PES->Clear();
-  aTS2PES1->Clear();
-  resultCount = resultDelivered = 0;
-}
-
 #define TS_SYNC_BYTE 0x47
 
-const uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar *PictureType)
+uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar *PictureType)
 {
   uchar dummyPictureType;
   if (!PictureType)
@@ -611,7 +603,7 @@ XXX*/
                      if (synced) {
                         *PictureType = pt;
                         Result = l;
-                        const uchar *p = resultBuffer + resultDelivered;
+                        uchar *p = resultBuffer + resultDelivered;
                         resultDelivered += l;
                         return p;
                         }
@@ -629,7 +621,7 @@ XXX*/
                         return NULL; // no useful data found, wait for more
                      if (synced) {
                         Result = l;
-                        const uchar *p = resultBuffer + resultDelivered;
+                        uchar *p = resultBuffer + resultDelivered;
                         resultDelivered += l;
                         return p;
                         }
diff --git a/remux.h b/remux.h
index feb11767b..83126187d 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.7 2002/08/09 16:18:02 kls Exp $
+ * $Id: remux.h 1.8 2002/10/12 13:30:24 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -47,8 +47,7 @@ class cRemux {
 public:
   cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
   ~cRemux();
-  void SetAudioPid(int APid);
-  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
+  uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
   };
 
 #endif // __REMUX_H
diff --git a/svdrp.c b/svdrp.c
index 81906b48e..411714930 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.44 2002/10/05 13:45:05 kls Exp $
+ * $Id: svdrp.c 1.45 2002/10/13 09:31:31 kls Exp $
  */
 
 #include "svdrp.h"
@@ -153,6 +153,7 @@ bool cPUTEhandler::Process(const char *s)
      else {
         rewind(f);
         if (cSchedules::Read(f)) {
+           cSIProcessor::TriggerDump();
            status = 250;
            message = "EPG data processed";
            }
diff --git a/transfer.c b/transfer.c
index bd4390bcb..adb726059 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.3 2002/09/22 09:50:48 kls Exp $
+ * $Id: transfer.c 1.4 2002/10/12 13:32:48 kls Exp $
  */
 
 #include "transfer.h"
@@ -21,6 +21,8 @@ cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
 {
   ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
+  canToggleAudioTrack = false;
+  audioTrack = 0xC0;
   gotBufferReserve = false;
   active = false;
 }
@@ -86,9 +88,9 @@ void cTransfer::Action(void)
 
         if (r > 0) {
            int Count = r, Result;
-           const uchar *p = remux->Process(b, Count, Result);
+           uchar *p = remux->Process(b, Count, Result);
            if (p) {
-              //XXX+ StripAudio???
+              StripAudioPackets(p, Result, audioTrack);
               while (Result > 0 && active) {
                     int w = PlayVideo(p, Result);
                     if (w > 0) {
@@ -112,15 +114,65 @@ void cTransfer::Action(void)
   dsyslog("transfer thread ended (pid=%d)", getpid());
 }
 
-void cTransfer::SetAudioPid(int APid)
+void cTransfer::StripAudioPackets(uchar *b, int Length, uchar Except)
 {
-  /*XXX+
-  Clear();
-  //XXX we may need to have access to the audio device, too, in order to clear it
-  CHECK(ioctl(toDevice, VIDEO_CLEAR_BUFFER));
-  gotBufferReserve = false;
-  remux.SetAudioPid(APid);
-  XXX*/
+  for (int i = 0; i < Length - 6; i++) {
+      if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
+         uchar c = b[i + 3];
+         int l = b[i + 4] * 256 + b[i + 5] + 6;
+         switch (c) {
+           case 0xBD: // dolby
+                if (Except)
+                   ;//XXX+ PlayExternalDolby(&b[i], Length - i);
+                // continue with deleting the data - otherwise it disturbs DVB replay
+           case 0xC0 ... 0xC1: // audio
+                if (c == 0xC1)
+                   canToggleAudioTrack = true;
+                if (!Except || c != Except) {
+                   int n = l;
+                   for (int j = i; j < Length && n--; j++)
+                       b[j] = 0x00;
+                   }
+                break;
+           case 0xE0 ... 0xEF: // video
+                break;
+           default:
+                //esyslog("ERROR: unexpected packet id %02X", c);
+                l = 0;
+           }
+         if (l)
+            i += l - 1; // the loop increments, too!
+         }
+      /*XXX
+      else
+         esyslog("ERROR: broken packet header");
+         XXX*/
+      }
+}
+
+int cTransfer::NumAudioTracks(void) const
+{
+  return canToggleAudioTrack ? 2 : 1;
+}
+
+const char **cTransfer::GetAudioTracks(int *CurrentTrack = NULL) const
+{
+  if (NumAudioTracks()) {
+     if (CurrentTrack)
+        *CurrentTrack = (audioTrack == 0xC0) ? 0 : 1;
+     static const char *audioTracks1[] = { "Audio 1", NULL };
+     static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
+     return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1;
+     }
+  return NULL;
+}
+
+void cTransfer::SetAudioTrack(int Index)
+{
+  if ((audioTrack == 0xC0) != (Index == 0)) {
+     audioTrack = (Index == 1) ? 0xC1 : 0xC0;
+     DeviceClear();
+     }
 }
 
 // --- cTransferControl ------------------------------------------------------
diff --git a/transfer.h b/transfer.h
index 567f21aba..d94c85ab6 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.2 2002/06/23 12:26:24 kls Exp $
+ * $Id: transfer.h 1.3 2002/10/12 12:59:05 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -20,8 +20,11 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
 private:
   cRingBufferLinear *ringBuffer;
   cRemux *remux;
+  bool canToggleAudioTrack;
+  uchar audioTrack;
   bool gotBufferReserve;
   bool active;
+  void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
@@ -29,7 +32,9 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
 public:
   cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2);
   virtual ~cTransfer();
-  void SetAudioPid(int APid);
+  virtual int NumAudioTracks(void) const;
+  virtual const char **GetAudioTracks(int *CurrentTrack = NULL) const;
+  virtual void SetAudioTrack(int Index);
   };
 
 class cTransferControl : public cControl {
diff --git a/vdr.5 b/vdr.5
index 8d6acfbc2..ccb7b924e 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.6 2002/10/06 08:56:01 kls Exp $
+.\" $Id: vdr.5 1.8 2002/10/13 12:14:49 kls Exp $
 .\"
 .TH vdr 5 "7 Sep 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -311,7 +311,6 @@ PC keyboard, RCU for the home-built "Remote Control Unit", or LIRC for the
 "Linux Infrared Remote Control"), \fBkey\fR is the name of the key that is
 defined (like Up, Down, Menu etc.), and \fBcode\fR is a character string that
 this remote control delivers when the given key is pressed.
-
 .SS COMMANDS
 The file \fIcommands.conf\fR contains the definitions of commands that can
 be executed from the \fBvdr\fR main menu's "Commands" option.
@@ -322,7 +321,12 @@ Each line contains one command definition in the following format:
 where \fBtitle\fR is the string that will be displayed in the "Commands" menu,
 and \fBcommand\fR is the actual command string that will be executed when this
 option is selected. The delimiting ':' may be surrounded by any number of
-white space characters.
+white space characters. If \fBtitle\fR ends with the character '?', there will
+be a confirmation prompt before actually executing the command. This can be
+used for commands that might have serious results (like deleting files etc)
+to make sure they are not executed inadvertently.
+
+Everything following (and including) a '#' character is considered to be comment.
 
 By default the menu entries in the "Commands" menu will be numbered '1'...'9'
 to make them selectable by pressing the corresponding number key. If you want
@@ -337,16 +341,25 @@ In order to avoid error messages to the console, every command should have
 
 Examples:
 
-Check for new mail: /usr/local/bin/checkmail 2>&1
+Check for new mail?: /usr/local/bin/checkmail 2>&1
 .br
-CPU status        : /usr/local/bin/cpustatus 2>&1
+CPU status: /usr/local/bin/cpustatus 2>&1
 .br
-Disk space        : df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+Disk space: df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
 .br
-Calendar          : date;echo;cal
+Calendar: date;echo;cal
 
 Note that the commands 'checkmail' and 'cpustatus' are only \fBexamples\fR!
 Don't send emails to the author asking where to find these ;-)
+.br
+The '?' at the end of the "Check for new mail?" entry will prompt the user
+whether this command shall really be executed.
+.SS RECORDING COMMANDS
+The file \fIreccmds.conf\fR can be used to define commands that can be applied
+to the currently highlighted recording in the "Recordings" menu. The syntax is
+exactly the same as described for the file \fIcommands.conf\fR. When executing
+a command, the directory name of the recording will be appended to the command
+string, separated by a blank and enclosed in single quotes.
 .SS SVDRP HOSTS
 The file \fIsvdrphosts.conf\fR contains the IP numbers of all hosts that are
 allowed to access the SVDRP port.
diff --git a/vdr.c b/vdr.c
index 7e22477bd..beeee8894 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.125 2002/10/06 10:25:04 kls Exp $
+ * $Id: vdr.c 1.127 2002/10/13 12:13:19 kls Exp $
  */
 
 #include <getopt.h>
@@ -319,6 +319,7 @@ int main(int argc, char *argv[])
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true);
+  RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true);
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
   CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
   Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
@@ -634,11 +635,12 @@ int main(int argc, char *argv[])
   cControl::Shutdown();
   delete Interface;
   cOsd::Shutdown();
-  PluginManager.Shutdown(true);
+  Remotes.Clear();
   Setup.CurrentChannel = cDevice::CurrentChannel();
   Setup.CurrentVolume  = cDevice::CurrentVolume();
   Setup.Save();
   cDevice::Shutdown();
+  PluginManager.Shutdown(true);
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
   isyslog("exiting");

From 57bd7eeed1c1aa84316f8299e1528b3bc63d7623 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Oct 2002 17:00:00 +0100
Subject: [PATCH 055/307] =?UTF-8?q?Version=201.1.14=20-=20Fixed=20some=20f?=
 =?UTF-8?q?aulty=20default=20parameter=20initializations=20(thanks=20to=20?=
 =?UTF-8?q?Robert=20Schiele).=20-=20Added=20further=20satellites=20to=20's?=
 =?UTF-8?q?ources.conf'=20(thanks=20to=20Reinhard=20Walter=20Buchner=20=20?=
 =?UTF-8?q?=20and=20Oliver=20Endriss).=20-=20Updated=20Finnish=20OSD=20tex?=
 =?UTF-8?q?ts=20(thanks=20to=20Jaakko=20Hyv=C3=A4tti).=20-=20Fixed=20a=20s?=
 =?UTF-8?q?mall=20glitch=20when=20switching=20channels=20(thanks=20to=20De?=
 =?UTF-8?q?nnis=20Noordsij=20for=20=20=20reporting=20this=20one).=20-=20Fi?=
 =?UTF-8?q?xed=20handling=20multiple=20'CaCaps'=20entries=20in=20'setup.co?=
 =?UTF-8?q?nf'.=20-=20Group=20separators=20in=20'channels.conf'=20may=20no?=
 =?UTF-8?q?w=20be=20given=20like=20':@201=20My=20Channels',=20=20=20where?=
 =?UTF-8?q?=20'@201'=20indicates=20the=20number=20to=20be=20given=20to=20t?=
 =?UTF-8?q?he=20next=20channel.=20This=20can=20be=20=20=20used=20to=20crea?=
 =?UTF-8?q?te=20'gaps'=20in=20the=20channel=20numbering=20(see=20'man=205?=
 =?UTF-8?q?=20vdr').=20BE=20CAREFUL=20=20=20TO=20UPDATE=20YOUR=20'timers.c?=
 =?UTF-8?q?onf'=20ACCORDINGLY=20IF=20INSERTING=20THIS=20NEW=20FEATURE=20IN?=
 =?UTF-8?q?TO=20YOUR=20=20=20'channels.conf'=20FILE!=20-=20Timers=20now=20?=
 =?UTF-8?q?internally=20have=20a=20pointer=20to=20their=20channel=20(this?=
 =?UTF-8?q?=20is=20necessary=20to=20=20=20handle=20gaps=20in=20channel=20n?=
 =?UTF-8?q?umbers,=20and=20in=20preparation=20for=20unique=20channel=20ids?=
 =?UTF-8?q?).=20-=20Fixed=20slow=20reaction=20on=20SVDRP=20input=20(thanks?=
 =?UTF-8?q?=20to=20Guido=20Fiala=20for=20reporting=20this=20one).=20-=20Ad?=
 =?UTF-8?q?ded=20KI.KA=20to=20channels.conf.cable=20(thanks=20to=20Robert?=
 =?UTF-8?q?=20Schiele).=20-=20Frequency=20values=20for=20cable=20and=20ter?=
 =?UTF-8?q?restrial=20channels=20in=20'channels.conf'=20can=20=20=20now=20?=
 =?UTF-8?q?be=20given=20either=20in=20MHz,=20kHz=20or=20Hz.=20The=20actual?=
 =?UTF-8?q?=20value=20given=20will=20be=20multiplied=20=20=20by=201000=20u?=
 =?UTF-8?q?ntil=20it=20is=20larger=20than=201000000.=20-=20Fixed=20skippin?=
 =?UTF-8?q?g=20unavailable=20channels=20when=20zapping=20downwards.=20-=20?=
 =?UTF-8?q?Fixed=20checking=20the=20Ca()=20status=20of=20a=20cDevice=20(th?=
 =?UTF-8?q?anks=20to=20Stefan=20Huelswitt).=20-=20Fixed=20switching=20audi?=
 =?UTF-8?q?o=20tracks=20in=20'Transfer=20Mode'=20on=20the=20primary=20DVB?=
 =?UTF-8?q?=20device=20=20=20(thanks=20to=20Steffen=20Barszus=20and=20Stef?=
 =?UTF-8?q?an=20Huelswitt=20for=20reporting=20this=20one=20and=20=20=20hel?=
 =?UTF-8?q?ping=20to=20fix=20it).=20-=20Fixed=20channel=20switching=20in?=
 =?UTF-8?q?=20case=20of=20an=20active=20'Transfer=20Mode'=20on=20the=20pri?=
 =?UTF-8?q?mary=20=20=20device=20('Transfer=20Mode'=20is=20now=20launched?=
 =?UTF-8?q?=20with=20priority=20'-1').=20-=20Fixed=20a=20ternary=20express?=
 =?UTF-8?q?ion=20in=20dvbspu.c.=20-=20Fixed=20handling=20'Transfer=20Mode'?=
 =?UTF-8?q?=20on=20single=20device=20systems=20when=20recording=20an=20=20?=
 =?UTF-8?q?=20encrypted=20channel=20(thanks=20to=20Stefan=20Huelswitt).=20?=
 =?UTF-8?q?-=20Fixed=20blocking=20replaying=20in=20case=20an=20encrypted?=
 =?UTF-8?q?=20channel=20is=20being=20recorded=20on=20=20=20the=20primary?=
 =?UTF-8?q?=20device.=20-=20Now=20the=20name=20of=20the=20remote=20control?=
 =?UTF-8?q?=20is=20displayed=20when=20learning=20the=20keys.=20-=20Fixed?=
 =?UTF-8?q?=20learning=20remote=20control=20keys=20in=20case=20there=20is?=
 =?UTF-8?q?=20more=20than=20one=20remote=20=20=20control=20(thanks=20to=20?=
 =?UTF-8?q?Oliver=20Endriss=20for=20reporting=20this=20one).=20-=20Impleme?=
 =?UTF-8?q?nted=20additional=20dedicated=20keys=20for=20"Play",=20"Pause",?=
 =?UTF-8?q?=20"Stop",=20"Record",=20=20=20"FastFwd",=20"FastRew",=20"Chann?=
 =?UTF-8?q?el+"=20and=20"Channel-".=20If=20your=20remote=20control=20suppo?=
 =?UTF-8?q?rts=20=20=20any=20of=20these=20keys=20you=20can=20delete=20your?=
 =?UTF-8?q?=20'remote.conf'=20file=20and=20restart=20VDR=20to=20=20=20go?=
 =?UTF-8?q?=20through=20the=20key=20learning=20procedure=20again=20in=20or?=
 =?UTF-8?q?der=20to=20assign=20these=20new=20keys.=20=20=20See=20MANUAL=20?=
 =?UTF-8?q?for=20more=20information.=20=20=20Authors=20of=20player=20plugi?=
 =?UTF-8?q?ns=20should=20update=20their=20ProcessKey()=20functions=20so=20?=
 =?UTF-8?q?that=20=20=20the=20new=20player=20keys=20have=20the=20same=20fu?=
 =?UTF-8?q?nctionality=20as=20the=20"Up",=20"Down",=20"Left",=20=20=20"Rig?=
 =?UTF-8?q?ht"=20and=20"Blue"=20keys,=20respectively.=20Note=20that=20the?=
 =?UTF-8?q?=20existing=20functionality=20=20=20of=20these=20keys=20should?=
 =?UTF-8?q?=20by=20all=20means=20be=20retained,=20since=20VDR=20(and=20any?=
 =?UTF-8?q?=20plugins)=20=20=20shall=20be=20fully=20usable=20with=20just?=
 =?UTF-8?q?=20the=20basic=20set=20of=20keys.=20These=20new=20keys=20are=20?=
 =?UTF-8?q?only=20=20=20for=20additional=20comfort=20in=20case=20the=20rem?=
 =?UTF-8?q?ote=20control=20in=20use=20supports=20them.=20-=20Implemented?=
 =?UTF-8?q?=20new=20keys=20to=20directly=20access=20the=20VDR=20main=20men?=
 =?UTF-8?q?u=20functions=20"Schedule",=20=20=20"Channels",=20"Timers",=20"?=
 =?UTF-8?q?Recordings",=20"Setup"=20and=20"Commands".=20If=20your=20remote?=
 =?UTF-8?q?=20=20=20control=20provides=20keys=20you=20want=20to=20assign?=
 =?UTF-8?q?=20these=20functions=20to,=20you=20can=20delete=20=20=20your=20?=
 =?UTF-8?q?'remote.cof'=20file=20and=20restart=20VDR=20to=20=20go=20throug?=
 =?UTF-8?q?h=20the=20key=20learning=20procedure=20=20=20again=20in=20order?=
 =?UTF-8?q?=20to=20assign=20these=20new=20keys.=20See=20MANUAL=20for=20mor?=
 =?UTF-8?q?e=20information.=20-=20The=20new=20configuration=20file=20'keym?=
 =?UTF-8?q?acros.conf'=20can=20be=20used=20to=20assign=20macros=20to=20=20?=
 =?UTF-8?q?=20the=20color=20buttons=20in=20normal=20viewing=20mode,=20as?=
 =?UTF-8?q?=20well=20as=20to=20up=20to=209=20user=20defined=20=20=20keys.?=
 =?UTF-8?q?=20See=20MANUAL=20and=20man=20vdr(5)=20for=20more=20information?=
 =?UTF-8?q?.=20The=20default=20'keymacros.conf'=20=20=20implements=20the?=
 =?UTF-8?q?=20functionality=20of=20the=20"color=20button=20patch".=20-=20F?=
 =?UTF-8?q?ixed=20a=20crash=20when=20learning=20the=20keys=20of=20several?=
 =?UTF-8?q?=20remote=20controls=20and=20pressing=20=20=20buttons=20of=20th?=
 =?UTF-8?q?ose=20that=20have=20already=20been=20learned=20(thanks=20to=20O?=
 =?UTF-8?q?liver=20Endriss=20for=20=20=20reporting=20this=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                |  20 ++
 HISTORY                     |  60 ++++++
 MANUAL                      |  32 ++-
 Makefile                    |   4 +-
 PLUGINS.html                |  32 +--
 PLUGINS/SRC/hello/HISTORY   |   4 +
 PLUGINS/SRC/hello/hello.c   |   6 +-
 PLUGINS/SRC/status/HISTORY  |   4 +
 PLUGINS/SRC/status/status.c |   6 +-
 channels.c                  |  79 +++----
 channels.conf               |   9 +-
 channels.conf.cable         |   1 +
 channels.h                  |   5 +-
 config.c                    | 386 +---------------------------------
 config.h                    |  65 +-----
 device.c                    |  29 ++-
 device.h                    |   9 +-
 dvbdevice.c                 |  41 ++--
 dvbdevice.h                 |   3 +-
 dvbplayer.c                 |   4 +-
 dvbspu.c                    |   4 +-
 eitscan.c                   |   6 +-
 i18n.c                      | 190 ++++++++++++++---
 interface.c                 |  64 +++---
 keymacros.conf              |  11 +
 keys.c                      | 127 ++++++++---
 keys.h                      |  42 +++-
 menu.c                      | 283 ++++++++++++++-----------
 menu.h                      |   3 +-
 newplugin                   |   4 +-
 recording.c                 |  20 +-
 recording.h                 |   3 +-
 remote.c                    |  18 +-
 remote.h                    |   5 +-
 sources.conf                |  78 +++++--
 svdrp.c                     |  39 ++--
 svdrp.h                     |   4 +-
 timers.c                    | 408 ++++++++++++++++++++++++++++++++++++
 timers.h                    |  91 ++++++++
 tools.c                     |   9 +-
 tools.h                     |   3 +-
 transfer.c                  |   6 +-
 vdr.5                       |  34 ++-
 vdr.c                       | 194 ++++++++++-------
 44 files changed, 1536 insertions(+), 909 deletions(-)
 create mode 100644 keymacros.conf
 create mode 100644 timers.c
 create mode 100644 timers.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 33d89d7ba..7b75ac85a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -31,6 +31,7 @@ Guido Fiala <gfiala@s.netic.de>
  (overlay capabilities have been removed again in VDR 0.98, since kvdr version 0.4
  now does these things itself)
  for making the replay progress display avoid unnecessary code execution
+ for reporting a problem with slow reaction on SVDRP input
 
 Robert Schneider <Robert.Schneider@de.ibm.com>
  for implementing EIT support for displaying the current/next info
@@ -153,6 +154,10 @@ Stefan Huelswitt <huels@iname.com>
  be switched or has actually been switched successfully
  for adding a missing StripAudioPackets() to cDvbPlayer::Action()
  for improving skipping channels that are (currently) not available
+ for fixing checking the Ca() status of a cDevice
+ for helping to fix switching audio tracks in 'Transfer Mode' on the primary DVB device
+ for fixing handling 'Transfer Mode' on single device systems when recording an
+ encrypted channel
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -416,6 +421,11 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting a bug when pressing the "Blue" button in the main menu without
  having displayed it
  for helping to debug a crash when closing down with remote control plugins
+ for adding some satellites to 'sources.conf'
+ for reporting a bug in learning remote control keys in case there is more than
+ one remote control
+ for reporting a crash when learning the keys of several remote controls and
+ pressing buttons of those that have already been learned
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -428,9 +438,19 @@ Andy Carter <fruit@ukgateway.net>
 
 Robert Schiele <rschiele@uni-mannheim.de>
  for his help in keeping 'channels.conf.cable' up to date
+ for reporting some faulty default parameter initializations
 
 Gerhard Steiner <steiner@mail.austria.com>
  for suggesting that the SVDRP command PUTE shall trigger an immediate write of
  the 'epg.data' file
  for suggesting the new configuration file 'reccmds.conf' to define commands that
  shall be executed from the "Recordings" menu
+
+Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
+ for translating OSD texts to the Finnish language
+
+Dennis Noordsij <dennis.noordsij@wiral.com>
+ for reporting a small glitch when switching channels
+
+Steffen Barszus <st_barszus@gmx.de>
+ for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
diff --git a/HISTORY b/HISTORY
index 37afb3508..536ea2890 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1610,3 +1610,63 @@ Video Disk Recorder Revision History
 - The new configuration file 'reccmds.conf' can be used to define commands that
   shall be executed from the "Recordings" menu; see MANUAL and 'man vdr(5)' for
   details (suggested by Gerhard Steiner).
+
+2002-10-27: Version 1.1.14
+
+- Fixed some faulty default parameter initializations (thanks to Robert Schiele).
+- Added further satellites to 'sources.conf' (thanks to Reinhard Walter Buchner
+  and Oliver Endriss).
+- Updated Finnish OSD texts (thanks to Jaakko Hyv�tti).
+- Fixed a small glitch when switching channels (thanks to Dennis Noordsij for
+  reporting this one).
+- Fixed handling multiple 'CaCaps' entries in 'setup.conf'.
+- Group separators in 'channels.conf' may now be given like ':@201 My Channels',
+  where '@201' indicates the number to be given to the next channel. This can be
+  used to create 'gaps' in the channel numbering (see 'man 5 vdr'). BE CAREFUL
+  TO UPDATE YOUR 'timers.conf' ACCORDINGLY IF INSERTING THIS NEW FEATURE INTO YOUR
+  'channels.conf' FILE!
+- Timers now internally have a pointer to their channel (this is necessary to
+  handle gaps in channel numbers, and in preparation for unique channel ids).
+- Fixed slow reaction on SVDRP input (thanks to Guido Fiala for reporting this one).
+- Added KI.KA to channels.conf.cable (thanks to Robert Schiele).
+- Frequency values for cable and terrestrial channels in 'channels.conf' can
+  now be given either in MHz, kHz or Hz. The actual value given will be multiplied
+  by 1000 until it is larger than 1000000.
+- Fixed skipping unavailable channels when zapping downwards.
+- Fixed checking the Ca() status of a cDevice (thanks to Stefan Huelswitt).
+- Fixed switching audio tracks in 'Transfer Mode' on the primary DVB device
+  (thanks to Steffen Barszus and Stefan Huelswitt for reporting this one and
+  helping to fix it).
+- Fixed channel switching in case of an active 'Transfer Mode' on the primary
+  device ('Transfer Mode' is now launched with priority '-1').
+- Fixed a ternary expression in dvbspu.c.
+- Fixed handling 'Transfer Mode' on single device systems when recording an
+  encrypted channel (thanks to Stefan Huelswitt).
+- Fixed blocking replaying in case an encrypted channel is being recorded on
+  the primary device.
+- Now the name of the remote control is displayed when learning the keys.
+- Fixed learning remote control keys in case there is more than one remote
+  control (thanks to Oliver Endriss for reporting this one).
+- Implemented additional dedicated keys for "Play", "Pause", "Stop", "Record",
+  "FastFwd", "FastRew", "Channel+" and "Channel-". If your remote control supports
+  any of these keys you can delete your 'remote.conf' file and restart VDR to
+  go through the key learning procedure again in order to assign these new keys.
+  See MANUAL for more information.
+  Authors of player plugins should update their ProcessKey() functions so that
+  the new player keys have the same functionality as the "Up", "Down", "Left",
+  "Right" and "Blue" keys, respectively. Note that the existing functionality
+  of these keys should by all means be retained, since VDR (and any plugins)
+  shall be fully usable with just the basic set of keys. These new keys are only
+  for additional comfort in case the remote control in use supports them.
+- Implemented new keys to directly access the VDR main menu functions "Schedule",
+  "Channels", "Timers", "Recordings", "Setup" and "Commands". If your remote
+  control provides keys you want to assign these functions to, you can delete
+  your 'remote.cof' file and restart VDR to  go through the key learning procedure
+  again in order to assign these new keys. See MANUAL for more information.
+- The new configuration file 'keymacros.conf' can be used to assign macros to
+  the color buttons in normal viewing mode, as well as to up to 9 user defined
+  keys. See MANUAL and man vdr(5) for more information. The default 'keymacros.conf'
+  implements the functionality of the "color button patch".
+- Fixed a crash when learning the keys of several remote controls and pressing
+  buttons of those that have already been learned (thanks to Oliver Endriss for
+  reporting this one).
diff --git a/MANUAL b/MANUAL
index 79e80d038..3c0504e7b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -23,10 +23,34 @@ Video Disk Recorder User's Manual
   Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
   0..9    Ch select   -            -          -          Numeric inp.  Exec cmd(2)       Editing
 
-  Power   Shutdown
-  Volume+ Volume up
-  Volume- Volume down
-  Mute    Mute
+  If your remote control provides additional keys, they can be used for the
+  following functions:
+
+  Play        resume normal replay
+  Pause       pause replay
+  Stop        stop replay
+  Record      instant recording
+  FastFwd     fast forward
+  FastRew     fast rewind
+
+  Channel+    channel up
+  Channel-    channel down
+
+  Power       shutdown
+
+  Volume+     volume up
+  Volume-     volume down
+  Mute        mute
+
+  Schedule    \
+  Channels    |
+  Timers      | directly access the VDR
+  Recordings  | main menu functions
+  Setup       |
+  Commands    /
+
+  User1...9   additional user defined keys for macro functions
+              (defined in 'keymacros.conf')
 
   (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
       has been enabled in the "Setup" menu. Otherwise the Blue button is used
diff --git a/Makefile b/Makefile
index cfb6f3a34..6b88356b2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.48 2002/10/04 14:29:14 kls Exp $
+# $Id: Makefile 1.49 2002/10/19 15:46:08 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -36,7 +36,7 @@ OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd
        dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\
-       spu.o status.o svdrp.o thread.o tools.o transfer.o vdr.o videodir.o
+       spu.o status.o svdrp.o thread.o timers.o tools.o transfer.o vdr.o videodir.o
 
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
diff --git a/PLUGINS.html b/PLUGINS.html
index 5cec85703..3a26783b1 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.9 are marked like this.
-<!--X1.1.9--></td></tr></table>
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.11 are marked like this.
 <!--X1.1.11--></td></tr></table>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.12 are marked like this.
 <!--X1.1.12--></td></tr></table>
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.13 are marked like this.
 <!--X1.1.13--></td></tr></table>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.14 are marked like this.
+<!--X1.1.14--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -964,7 +964,7 @@
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p>
 If the player can provide more than a single audio track, it can implement the
 following functions to make them available:
@@ -1064,11 +1064,12 @@
     <i>Play</i>, <i>Pause</i>, <i>Fast Rewind</i> and <i>Fast Forward</i>, respectively
     (provided that this particular player can implement these functions) if the player
     is not currently showing any menu. If there is a menu, they shall allow the user
-    to navigate in the menu.
+    to navigate in the menu. The dedicated <i>Play</i>, <i>Pause</i>, <i>FastRew</i>
+    and <i>FastFwd</i> keys shall always result in their specific functionality.
 <li>The <i>Green</i> and <i>Yellow</i> buttons shall skip back- and forward by an
     amount of time suitable for this player (provided that this particular player can
     implement these functions).
-<li>The <i>Blue</i> button shall immediately stop the replay session.
+<li>The <i>Blue</i> and <i>Stop</i> button shall immediately stop the replay session.
 </ul>
 Of course, these are only suggestions which should make it easier for VDR users to
 enjoy additional players, since they will be able to control them with actions
@@ -1194,9 +1195,8 @@
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 virtual bool ProvidesSource(int Source) const;
 <!--X1.1.12--></td></tr></table>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
@@ -1206,8 +1206,7 @@
 These functions will be called with the desired source or channel and shall return whether
 this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
-<!--X1.1.9--></td></tr></table>
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p>
 <b>Audio selection</b>
 <p>
@@ -1230,9 +1229,7 @@
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
-<!--X1.1.9--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool GetTSPacket(uchar *&amp;Data);
-<!--X1.1.9--></td></tr></table>
 </pre></td></tr></table><p>
 
 which allow VDR to set the PIDs that shall be recorded, set up the device for
@@ -1256,6 +1253,9 @@
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+virtual bool CanReplay(void) const;
+<!--X1.1.14--></td></tr></table>
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
@@ -1315,7 +1315,7 @@
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.11--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Remote Control</h2>
 
 <center><i><b>The joy of zapping!</b></i></center><p>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index 3507baf71..10d905e24 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -26,3 +26,7 @@ VDR Plugin 'hello' Revision History
 2002-09-21: Version 0.0.6
 
 - Fixed Makefile for NEWSTRUCT driver.
+
+2002-10-26: Version 0.0.7
+
+- Fixed a typo.
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 3d1b22fdd..5073e3000 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.7 2002/09/21 08:44:56 kls Exp $
+ * $Id: hello.c 1.8 2002/10/26 14:34:48 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.6";
+static const char *VERSION        = "0.0.7";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
@@ -71,7 +71,7 @@ void cMenuSetupHello::Store(void)
 
 cPluginHello::cPluginHello(void)
 {
-  // Initialize any member varaiables here.
+  // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
   option_a = NULL;
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
index f8e529708..b66f6540f 100644
--- a/PLUGINS/SRC/status/HISTORY
+++ b/PLUGINS/SRC/status/HISTORY
@@ -12,3 +12,7 @@ VDR Plugin 'status' Revision History
 2002-09-21: Version 0.0.3
 
 - Fixed Makefile for NEWSTRUCT driver.
+
+2002-10-26: Version 0.0.4
+
+- Fixed a typo.
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
index 562493676..15a3ee96e 100644
--- a/PLUGINS/SRC/status/status.c
+++ b/PLUGINS/SRC/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.3 2002/09/21 08:46:01 kls Exp $
+ * $Id: status.c 1.4 2002/10/26 14:34:53 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -122,7 +122,7 @@ class cPluginStatus : public cPlugin {
 
 cPluginStatus::cPluginStatus(void)
 {
-  // Initialize any member varaiables here.
+  // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
   statusTest = NULL;
diff --git a/channels.c b/channels.c
index f86f8efb2..e142a28fa 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.3 2002/10/06 12:41:49 kls Exp $
+ * $Id: channels.c 1.5 2002/10/20 11:50:47 kls Exp $
  */
 
 #include "channels.h"
@@ -158,6 +158,7 @@ cChannel::cChannel(void)
   tpid         = 0;
   ca           = 0;
   sid          = 0;
+  number       = 0;
   groupSep     = false;
   //XXX
   polarization = 'v';
@@ -282,8 +283,12 @@ const char *cChannel::ToText(cChannel *Channel)
      strreplace(s, ':', '|');
      }
   free(buffer);
-  if (Channel->groupSep)
-     asprintf(&buffer, ":%s\n", s);
+  if (Channel->groupSep) {
+     if (Channel->number)
+        asprintf(&buffer, ":@%d %s\n", Channel->number, s);
+     else
+        asprintf(&buffer, ":%s\n", s);
+     }
   else {
      char apidbuf[32];
      char *q = apidbuf;
@@ -308,13 +313,17 @@ const char *cChannel::ToText(void)
 bool cChannel::Parse(const char *s)
 {
   if (*s == ':') {
-     if (*++s) {
-        strn0cpy(name, s, MaxChannelName);
-        groupSep = true;
-        number = 0;
+     groupSep = true;
+     if (*++s == '@' && *++s) {
+        char *p = NULL;
+        errno = 0;
+        int n = strtol(s, &p, 10);
+        if (!errno && p != s && n > 0) {
+           number = n;
+           s = p;
+           }
         }
-     else
-        return false;
+     strn0cpy(name, skipspace(s), MaxChannelName);
      }
   else {
      groupSep = false;
@@ -400,35 +409,39 @@ int cChannels::GetNextNormal(int Idx)
 
 void cChannels::ReNumber( void )
 {
-  int Number = 0;
-  cChannel *ch = (cChannel *)First();
-  while (ch) {
-        if (!ch->GroupSep())
-           ch->SetNumber(++Number);
-        ch = (cChannel *)ch->Next();
-        }
-  maxNumber = Number;
+  int Number = 1;
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (channel->GroupSep()) {
+         if (channel->Number() > Number)
+            Number = channel->Number();
+         }
+      else
+         channel->SetNumber(Number++);
+      }
+  maxNumber = Number - 1;
 }
 
-cChannel *cChannels::GetByNumber(int Number)
+cChannel *cChannels::GetByNumber(int Number, int SkipGap)
 {
-  cChannel *channel = (cChannel *)First();
-  while (channel) {
-        if (!channel->GroupSep() && channel->Number() == Number)
-           return channel;
-        channel = (cChannel *)channel->Next();
-        }
+  cChannel *previous = NULL;
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (!channel->GroupSep()) {
+         if (channel->Number() == Number)
+            return channel;
+         else if (SkipGap && channel->Number() > Number)
+            return SkipGap > 0 ? channel : previous;
+         previous = channel;
+         }
+      }
   return NULL;
 }
 
 cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
 {
-  cChannel *channel = (cChannel *)First();
-  while (channel) {
-        if (!channel->GroupSep() && channel->Sid() == ServiceId)
-           return channel;
-        channel = (cChannel *)channel->Next();
-        }
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (!channel->GroupSep() && channel->Sid() == ServiceId)
+         return channel;
+      }
   return NULL;
 }
 
@@ -437,9 +450,3 @@ bool cChannels::SwitchTo(int Number)
   cChannel *channel = GetByNumber(Number);
   return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
 }
-
-const char *cChannels::GetChannelNameByNumber(int Number)
-{
-  cChannel *channel = GetByNumber(Number);
-  return channel ? channel->Name() : NULL;
-}
diff --git a/channels.conf b/channels.conf
index 9288c4028..da014a8ac 100644
--- a/channels.conf
+++ b/channels.conf
@@ -181,11 +181,6 @@ ORF/ZDF:12699:h:S19.2E:22000:506:507:0:0:13012
 VIVA:12670:v:S19.2E:22000:309:310:0:0:12732
 VIVA2:12552:v:S19.2E:22000:171:172:0:0:12120
 MTV German:12699:v:S19.2E:22000:3031:3032:0:0:28643
-IFA-TV:10832:h:S19.2E:22000:132:133:32:0:7251
+:#IFA-TV:10832:h:S19.2E:22000:132:133:32:0:7251
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
-TANGOTV:10832:h:S19.2E:22000:61:62:0:0:61920
-:Sky
-Sky One:0:h:S28.2E:0:160:80:0:5:106
-itv2:0:h:S28.2E:0:160:80:0:5:226
-sci-fi:0:h:S28.2E:0:160:80:0:5:130
-Paramount Comedy:0:h:S28.2E:0:160:80:0:5:127
+:#TANGOTV:10832:h:S19.2E:22000:61:62:0:0:61920
diff --git a/channels.conf.cable b/channels.conf.cable
index 65321fc28..14d920011 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -9,6 +9,7 @@ EinsExtra:426:M64:C:6900:101:102:0:0:28201
 EinsFestival:426:M64:C:6900:201:202:0:0:28202
 EinsMuXx:426:M64:C:6900:301:302:0:0:28203
 Phoenix:410:M64:C:6900:901:902:904:0:28114
+KI.KA:394:M64:C:6900:310:320:330:0:28008
 EuroNews:394:M64:C:6900:2221:2233:768:0:28015
 CNBC:394:M64:C:6900:510:520:530:0:28010
 Eurosport:394:M64:C:6900:410:420:430:0:28009
diff --git a/channels.h b/channels.h
index 8a784f75f..7eb818c34 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.1 2002/10/05 13:53:15 kls Exp $
+ * $Id: channels.h 1.3 2002/10/20 11:50:36 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -112,9 +112,8 @@ class cChannels : public cConfig<cChannel> {
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
   void ReNumber(void);         // Recalculate 'number' based on channel type
-  cChannel *GetByNumber(int Number);
+  cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(unsigned short ServiceId);
-  const char *GetChannelNameByNumber(int Number);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
   };
diff --git a/config.c b/config.c
index d9cdb43c6..7cea98ed5 100644
--- a/config.c
+++ b/config.c
@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.109 2002/10/13 10:03:49 kls Exp $
+ * $Id: config.c 1.111 2002/10/19 15:49:51 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
-#include "channels.h" //XXX timers!
 #include "i18n.h"
 #include "interface.h"
 #include "plugin.h"
@@ -20,339 +19,6 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// -- cTimer -----------------------------------------------------------------
-
-char *cTimer::buffer = NULL;
-
-cTimer::cTimer(bool Instant)
-{
-  startTime = stopTime = 0;
-  recording = pending = false;
-  active = Instant ? taActInst : taInactive;
-  cChannel *ch = Channels.GetByNumber(cDevice::CurrentChannel());
-  channel = ch ? ch->Number() : 0;
-  time_t t = time(NULL);
-  struct tm tm_r;
-  struct tm *now = localtime_r(&t, &tm_r);
-  day = now->tm_mday;
-  start = now->tm_hour * 100 + now->tm_min;
-  stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
-  stop = (stop / 60) * 100 + (stop % 60);
-  if (stop >= 2400)
-     stop -= 2400;
-//TODO VPS???
-  priority = Setup.DefaultPriority;
-  lifetime = Setup.DefaultLifetime;
-  *file = 0;
-  firstday = 0;
-  summary = NULL;
-  if (Instant && ch)
-     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : ch->Name());
-}
-
-cTimer::cTimer(const cEventInfo *EventInfo)
-{
-  startTime = stopTime = 0;
-  recording = pending = false;
-  active = true;
-  cChannel *ch = Channels.GetByServiceID(EventInfo->GetServiceID());
-  channel = ch ? ch->Number() : 0;
-  time_t tstart = EventInfo->GetTime();
-  time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
-  tstart -= Setup.MarginStart * 60;
-  struct tm tm_r;
-  struct tm *time = localtime_r(&tstart, &tm_r);
-  day = time->tm_mday;
-  start = time->tm_hour * 100 + time->tm_min;
-  time = localtime_r(&tstop, &tm_r);
-  stop = time->tm_hour * 100 + time->tm_min;
-  if (stop >= 2400)
-     stop -= 2400;
-  priority = Setup.DefaultPriority;
-  lifetime = Setup.DefaultLifetime;
-  *file = 0;
-  const char *Title = EventInfo->GetTitle();
-  if (!isempty(Title))
-     strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
-  firstday = 0;
-  summary = NULL;
-}
-
-cTimer::~cTimer()
-{
-  free(summary);
-}
-
-cTimer& cTimer::operator= (const cTimer &Timer)
-{
-  memcpy(this, &Timer, sizeof(*this));
-  if (summary)
-     summary = strdup(summary);
-  return *this;
-}
-
-bool cTimer::operator< (const cListObject &ListObject)
-{
-  cTimer *ti = (cTimer *)&ListObject;
-  time_t t1 = StartTime();
-  time_t t2 = ti->StartTime();
-  return t1 < t2 || (t1 == t2 && priority > ti->priority);
-}
-
-const char *cTimer::ToText(cTimer *Timer)
-{
-  free(buffer);
-  strreplace(Timer->file, ':', '|');
-  strreplace(Timer->summary, '\n', '|');
-  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day, Timer->firstday), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
-  strreplace(Timer->summary, '|', '\n');
-  strreplace(Timer->file, '|', ':');
-  return buffer;
-}
-
-const char *cTimer::ToText(void)
-{
-  return ToText(this);
-}
-
-int cTimer::TimeToInt(int t)
-{
-  return (t / 100 * 60 + t % 100) * 60;
-}
-
-int cTimer::ParseDay(const char *s, time_t *FirstDay)
-{
-  char *tail;
-  int d = strtol(s, &tail, 10);
-  if (FirstDay)
-     *FirstDay = 0;
-  if (tail && *tail) {
-     d = 0;
-     if (tail == s) {
-        const char *first = strchr(s, '@');
-        int l = first ? first - s : strlen(s);
-        if (l == 7) {
-           for (const char *p = s + 6; p >= s; p--) {
-               d <<= 1;
-               d |= (*p != '-');
-               }
-           d |= 0x80000000;
-           }
-        if (FirstDay && first) {
-           ++first;
-           if (strlen(first) == 10) {
-              struct tm tm_r;
-              if (3 == sscanf(first, "%d-%d-%d", &tm_r.tm_year, &tm_r.tm_mon, &tm_r.tm_mday)) {
-                 tm_r.tm_year -= 1900;
-                 tm_r.tm_mon--;
-                 tm_r.tm_hour = tm_r.tm_min = tm_r.tm_sec = 0;
-                 tm_r.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
-                 *FirstDay = mktime(&tm_r);
-                 }
-              }
-           else
-              d = 0;
-           }
-        }
-     }
-  else if (d < 1 || d > 31)
-     d = 0;
-  return d;
-}
-
-const char *cTimer::PrintDay(int d, time_t FirstDay)
-{
-#define DAYBUFFERSIZE 32
-  static char buffer[DAYBUFFERSIZE];
-  if ((d & 0x80000000) != 0) {
-     char *b = buffer;
-     const char *w = tr("MTWTFSS");
-     while (*w) {
-           *b++ = (d & 1) ? *w : '-';
-           d >>= 1;
-           w++;
-           }
-     if (FirstDay) {
-        struct tm tm_r;
-        localtime_r(&FirstDay, &tm_r);
-        b += strftime(b, DAYBUFFERSIZE - (b - buffer), "@%Y-%m-%d", &tm_r);
-        }
-     *b = 0;
-     }
-  else
-     sprintf(buffer, "%d", d);
-  return buffer;
-}
-
-const char *cTimer::PrintFirstDay(void)
-{
-  if (firstday) {
-     const char *s = PrintDay(day, firstday);
-     if (strlen(s) == 18)
-        return s + 8;
-     }
-  return ""; // not NULL, so the caller can always use the result
-}
-
-bool cTimer::Parse(const char *s)
-{
-  char *buffer1 = NULL;
-  char *buffer2 = NULL;
-  free(summary);
-  summary = NULL;
-  //XXX Apparently sscanf() doesn't work correctly if the last %a argument
-  //XXX results in an empty string (this first occured when the EIT gathering
-  //XXX was put into a separate thread - don't know why this happens...
-  //XXX As a cure we copy the original string and add a blank.
-  //XXX If anybody can shed some light on why sscanf() failes here, I'd love
-  //XXX to hear about that!
-  char *s2 = NULL;
-  int l2 = strlen(s);
-  while (l2 > 0 && isspace(s[l2 - 1]))
-        l2--;
-  if (s[l2 - 1] == ':') {
-     s2 = MALLOC(char, l2 + 3);
-     strcat(strn0cpy(s2, s, l2 + 1), " \n");
-     s = s2;
-     }
-  if (8 <= sscanf(s, "%d :%d :%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
-     if (summary && !*skipspace(summary)) {
-        free(summary);
-        summary = NULL;
-        }
-     //TODO add more plausibility checks
-     day = ParseDay(buffer1, &firstday);
-     strn0cpy(file, buffer2, MaxFileName);
-     strreplace(file, '|', ':');
-     strreplace(summary, '|', '\n');
-     free(buffer1);
-     free(buffer2);
-     free(s2);
-     return day != 0;
-     }
-  free(s2);
-  return false;
-}
-
-bool cTimer::Save(FILE *f)
-{
-  return fprintf(f, ToText()) > 0;
-}
-
-bool cTimer::IsSingleEvent(void)
-{
-  return (day & 0x80000000) == 0;
-}
-
-int cTimer::GetMDay(time_t t)
-{
-  struct tm tm_r;
-  return localtime_r(&t, &tm_r)->tm_mday;
-}
-
-int cTimer::GetWDay(time_t t)
-{
-  struct tm tm_r;
-  int weekday = localtime_r(&t, &tm_r)->tm_wday;
-  return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
-}
-
-bool cTimer::DayMatches(time_t t)
-{
-  return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
-}
-
-time_t cTimer::IncDay(time_t t, int Days)
-{
-  struct tm tm_r;
-  tm tm = *localtime_r(&t, &tm_r);
-  tm.tm_mday += Days; // now tm_mday may be out of its valid range
-  int h = tm.tm_hour; // save original hour to compensate for DST change
-  tm.tm_isdst = -1;   // makes sure mktime() will determine the correct DST setting
-  t = mktime(&tm);    // normalize all values
-  tm.tm_hour = h;     // compensate for DST change
-  return mktime(&tm); // calculate final result
-}
-
-time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
-{
-  struct tm tm_r;
-  tm tm = *localtime_r(&t, &tm_r);
-  tm.tm_hour = SecondsFromMidnight / 3600;
-  tm.tm_min = (SecondsFromMidnight % 3600) / 60;
-  tm.tm_sec =  SecondsFromMidnight % 60;
-  tm.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
-  return mktime(&tm);
-}
-
-char *cTimer::SetFile(const char *File)
-{
-  if (!isempty(File))
-     strn0cpy(file, File, sizeof(file));
-  return file;
-}
-
-bool cTimer::Matches(time_t t)
-{
-  startTime = stopTime = 0;
-  if (t == 0)
-     t = time(NULL);
-
-  int begin  = TimeToInt(start); // seconds from midnight
-  int length = TimeToInt(stop) - begin;
-  if (length < 0)
-     length += SECSINDAY;
-
-  int DaysToCheck = IsSingleEvent() ? 61 : 7; // 61 to handle months with 31/30/31
-  for (int i = -1; i <= DaysToCheck; i++) {
-      time_t t0 = IncDay(t, i);
-      if (DayMatches(t0)) {
-         time_t a = SetTime(t0, begin);
-         time_t b = a + length;
-         if ((!firstday || a >= firstday) && t <= b) {
-            startTime = a;
-            stopTime = b;
-            break;
-            }
-         }
-      }
-  if (!startTime)
-     startTime = firstday; // just to have something that's more than a week in the future
-  else if (t > startTime || t > firstday + SECSINDAY + 3600) // +3600 in case of DST change
-     firstday = 0;
-  return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
-}
-
-time_t cTimer::StartTime(void)
-{
-  if (!startTime)
-     Matches();
-  return startTime;
-}
-
-time_t cTimer::StopTime(void)
-{
-  if (!stopTime)
-     Matches();
-  return stopTime;
-}
-
-void cTimer::SetRecording(bool Recording)
-{
-  recording = Recording;
-  isyslog("timer %d %s", Index() + 1, recording ? "start" : "stop");
-}
-
-void cTimer::SetPending(bool Pending)
-{
-  pending = Pending;
-}
-
-void cTimer::Skip(void)
-{
-  firstday = IncDay(SetTime(StartTime(), 0), 1);
-}
-
 // --- cCommand -------------------------------------------------------------
 
 char *cCommand::result = NULL;
@@ -476,47 +142,6 @@ bool cCaDefinition::Parse(const char *s)
 cCommands Commands;
 cCommands RecordingCommands;
 
-// -- cTimers ----------------------------------------------------------------
-
-cTimers Timers;
-
-cTimer *cTimers::GetTimer(cTimer *Timer)
-{
-  cTimer *ti = (cTimer *)First();
-  while (ti) {
-        if (ti->channel == Timer->channel && ti->day == Timer->day && ti->start == Timer->start && ti->stop == Timer->stop)
-           return ti;
-        ti = (cTimer *)ti->Next();
-        }
-  return NULL;
-}
-
-cTimer *cTimers::GetMatch(time_t t)
-{
-  cTimer *t0 = NULL;
-  cTimer *ti = First();
-  while (ti) {
-        if (!ti->recording && ti->Matches(t)) {
-           if (!t0 || ti->priority > t0->priority)
-              t0 = ti;
-           }
-        ti = (cTimer *)ti->Next();
-        }
-  return t0;
-}
-
-cTimer *cTimers::GetNextActiveTimer(void)
-{
-  cTimer *t0 = NULL;
-  cTimer *ti = First();
-  while (ti) {
-        if (ti->active && (!t0 || *ti < *t0))
-           t0 = ti;
-        ti = (cTimer *)ti->Next();
-        }
-  return t0;
-}
-
 // -- cSVDRPhosts ------------------------------------------------------------
 
 cSVDRPhosts SVDRPhosts;
@@ -680,11 +305,11 @@ cSetupLine *cSetup::Get(const char *Name, const char *Plugin)
   return NULL;
 }
 
-void cSetup::Store(const char *Name, const char *Value, const char *Plugin)
+void cSetup::Store(const char *Name, const char *Value, const char *Plugin, bool AllowMultiple)
 {
   if (Name && *Name) {
      cSetupLine *l = Get(Name, Plugin);
-     if (l)
+     if (l && !AllowMultiple)
         Del(l);
      if (Value)
         Add(new cSetupLine(Name, Value, Plugin));
@@ -726,6 +351,9 @@ bool cSetup::Load(const char *FileName)
 
 void cSetup::StoreCaCaps(const char *Name)
 {
+  cSetupLine *l;
+  while ((l = Get(Name)) != NULL)
+        Del(l);
   for (int d = 0; d < MAXDEVICES; d++) {
       char buffer[MAXPARSEBUFFER];
       char *q = buffer;
@@ -738,7 +366,7 @@ void cSetup::StoreCaCaps(const char *Name)
              }
           }
       if (*buffer)
-         Store(Name, buffer);
+         Store(Name, buffer, NULL, true);
       }
 }
 
diff --git a/config.h b/config.h
index 1f043c4aa..0cac7b9d7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.134 2002/10/13 10:03:09 kls Exp $
+ * $Id: config.h 1.137 2002/10/19 15:43:31 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.13"
+#define VDRVERSION "1.1.14"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -32,57 +32,6 @@
 
 #define MaxFileName 256
 
-enum eTimerActive { taInactive = 0,
-                    taActive   = 1,
-                    taInstant  = 2,
-                    taActInst  = (taActive | taInstant)
-                  };
-
-class cTimer : public cListObject {
-private:
-  time_t startTime, stopTime;
-  static char *buffer;
-  static const char *ToText(cTimer *Timer);
-public:
-  bool recording, pending;
-  int active;
-  int channel;
-  int day;
-  int start;
-  int stop;
-//TODO VPS???
-  int priority;
-  int lifetime;
-  char file[MaxFileName];
-  time_t firstday;
-  char *summary;
-  cTimer(bool Instant = false);
-  cTimer(const cEventInfo *EventInfo);
-  virtual ~cTimer();
-  cTimer& operator= (const cTimer &Timer);
-  virtual bool operator< (const cListObject &ListObject);
-  const char *ToText(void);
-  bool Parse(const char *s);
-  bool Save(FILE *f);
-  bool IsSingleEvent(void);
-  int GetMDay(time_t t);
-  int GetWDay(time_t t);
-  bool DayMatches(time_t t);
-  static time_t IncDay(time_t t, int Days);
-  static time_t SetTime(time_t t, int SecondsFromMidnight);
-  char *SetFile(const char *File);
-  bool Matches(time_t t = 0);
-  time_t StartTime(void);
-  time_t StopTime(void);
-  void SetRecording(bool Recording);
-  void SetPending(bool Pending);
-  void Skip(void);
-  const char *PrintFirstDay(void);
-  static int TimeToInt(int t);
-  static int ParseDay(const char *s, time_t *FirstDay = NULL);
-  static const char *PrintDay(int d, time_t FirstDay = 0);
-  };
-
 class cCommand : public cListObject {
 private:
   char *title;
@@ -203,13 +152,6 @@ template<class T> class cConfig : public cList<T> {
   }
   };
 
-class cTimers : public cConfig<cTimer> {
-public:
-  cTimer *GetTimer(cTimer *Timer);
-  cTimer *GetMatch(time_t t);
-  cTimer *GetNextActiveTimer(void);
-  };
-
 class cCommands : public cConfig<cCommand> {};
 
 class cSVDRPhosts : public cConfig<cSVDRPhost> {
@@ -222,7 +164,6 @@ class cCaDefinitions : public cConfig<cCaDefinition> {
   const cCaDefinition *Get(int Number);
   };
 
-extern cTimers Timers;
 extern cCommands Commands;
 extern cCommands RecordingCommands;
 extern cSVDRPhosts SVDRPhosts;
@@ -252,7 +193,7 @@ class cSetup : public cConfig<cSetupLine> {
   bool ParseCaCaps(const char *Value);
   bool Parse(const char *Name, const char *Value);
   cSetupLine *Get(const char *Name, const char *Plugin = NULL);
-  void Store(const char *Name, const char *Value, const char *Plugin = NULL);
+  void Store(const char *Name, const char *Value, const char *Plugin = NULL, bool AllowMultiple = false);
   void Store(const char *Name, int Value, const char *Plugin = NULL);
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
diff --git a/device.c b/device.c
index 637632b40..2d3d1d9e3 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.27 2002/10/12 13:24:37 kls Exp $
+ * $Id: device.c 1.32 2002/10/26 11:43:52 kls Exp $
  */
 
 #include "device.h"
@@ -52,7 +52,6 @@ cDevice::cDevice(void)
 
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
-  ca = -1;
 
   if (numDevices < MAXDEVICES) {
      device[numDevices++] = this;
@@ -322,13 +321,12 @@ bool cDevice::SwitchChannel(int Direction)
   if (Direction) {
      int n = CurrentChannel() + Direction;
      int first = n;
-     PrimaryDevice()->StopReplay(); // otherwise a running Transfer Mode would block channels
      cChannel *channel;
-     while ((channel = Channels.GetByNumber(n)) != NULL) {
+     while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
            // try only channels which are currently available
-           if (PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit) || GetDevice(channel, 0))
+           if (PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit) || PrimaryDevice()->CanReplay() && GetDevice(channel, 0))
               break;
-           n += Direction;
+           n = channel->Number() + Direction;
            }
      if (channel) {
         int d = n - first;
@@ -362,7 +360,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 
   if (NeedsTransferMode) {
      cDevice *CaDevice = GetDevice(Channel, 0);
-     if (CaDevice) {
+     if (CaDevice && CanReplay()) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
            cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));//XXX+
@@ -448,6 +446,11 @@ void cDevice::SetAudioTrack(int Index)
      SetAudioTrackDevice(Index);
 }
 
+bool cDevice::CanReplay(void) const
+{
+  return HasDecoder();
+}
+
 bool cDevice::SetPlayMode(ePlayMode PlayMode)
 {
   return false;
@@ -484,7 +487,7 @@ bool cDevice::Replaying(void) const
 
 bool cDevice::AttachPlayer(cPlayer *Player)
 {
-  if (HasDecoder()) {
+  if (CanReplay()) {
      if (player)
         Detach(player);
      player = Player;
@@ -531,6 +534,16 @@ int cDevice::PlayAudio(const uchar *Data, int Length)
   return -1;
 }
 
+int cDevice::Ca(void) const
+{
+  int ca = 0;
+  for (int i = 0; i < MAXRECEIVERS; i++) {
+      if (receiver[i] && (ca = receiver[i]->ca) != 0)
+         break; // all receivers have the same ca
+      }
+  return ca;
+}
+
 int cDevice::Priority(void) const
 {
   int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
diff --git a/device.h b/device.h
index 54dc41e06..1070c52fa 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.23 2002/10/12 11:15:13 kls Exp $
+ * $Id: device.h 1.25 2002/10/26 11:33:42 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -278,6 +278,8 @@ class cDevice : public cThread {
   cPlayer *player;
   bool playerDetached;
 protected:
+  virtual bool CanReplay(void) const;
+       // Returns true if this device can currently start a replay session.
   virtual bool SetPlayMode(ePlayMode PlayMode);
        // Sets the device into the given play mode.
        // Returns true if the operation was successful.
@@ -324,7 +326,6 @@ class cDevice : public cThread {
 
 private:
   cReceiver *receiver[MAXRECEIVERS];
-  int ca;
   int CanShift(int Ca, int Priority, int UsedCards = 0) const;
 protected:
   int Priority(void) const;
@@ -344,8 +345,8 @@ class cDevice : public cThread {
       // false in case of a non recoverable error, otherwise it returns true,
       // even if Data is NULL.
 public:
-  int  Ca(void) const { return ca; }
-       // Returns the ca of the current receiving session.
+  int  Ca(void) const;
+       // Returns the ca of the current receiving session(s).
   bool Receiving(void) const;
        // Returns true if we are currently receiving.
   bool AttachReceiver(cReceiver *Receiver);
diff --git a/dvbdevice.c b/dvbdevice.c
index a4a4308d9..a1a8913da 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.24 2002/10/12 11:15:45 kls Exp $
+ * $Id: dvbdevice.c 1.30 2002/10/26 11:37:03 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -428,6 +428,13 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
+static unsigned int FrequencyToHz(unsigned int f)
+{
+  while (f && f < 1000000)
+        f *= 1000;
+  return f;
+}
+
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
 #if (DVB_DRIVER_VERSION < MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT)
@@ -435,24 +442,26 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      LiveView = true;
 #endif
 
+  bool IsEncrypted = Channel->Ca() > CACONFBASE;
+
   bool DoTune = !IsTunedTo(Channel);
 
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
-                            || Channel->Ca() > CACONFBASE && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode
+                            || IsEncrypted && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode
                             || IsPrimaryDevice()
                                && (LiveView // for a new live view the old PIDs need to be turned off
                                   || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                                   )
                             );
 
-  bool StartTransferMode = IsPrimaryDevice() && !DoTune
+  bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune
                            && (LiveView && HasPid(Channel->Vpid()) && pidHandles[ptVideo].pid != Channel->Vpid() // the PID is already set as DMX_PES_OTHER
                               || !LiveView && pidHandles[ptVideo].pid == Channel->Vpid() // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
 
   bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode
-                        && (Channel->Ca() > CACONFBASE // CA channels can only be decrypted in "live" mode
+                        && (IsEncrypted // CA channels can only be decrypted in "live" mode
                            || LiveView
                            );
 
@@ -622,13 +631,13 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             // Frequency and symbol rate:
 
 #ifdef NEWSTRUCT
-            Frontend.frequency = Channel->Frequency() * 1000000UL;
+            Frontend.frequency = FrequencyToHz(Channel->Frequency());
             Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.qam.symbol_rate = Channel->Srate() * 1000UL;
             Frontend.u.qam.fec_inner = fe_code_rate_t(Channel->CoderateH());
             Frontend.u.qam.modulation = fe_modulation_t(Channel->Modulation());
 #else
-            Frontend.Frequency = Channel->Frequency() * 1000000UL;
+            Frontend.Frequency = FrequencyToHz(Channel->Frequency());
             Frontend.Inversion = SpectralInversion(Channel->Inversion());
             Frontend.u.qam.SymbolRate = Channel->Srate() * 1000UL;
             Frontend.u.qam.FEC_inner = CodeRate(Channel->CoderateH());
@@ -641,7 +650,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             // Frequency and OFDM paramaters:
 
 #ifdef NEWSTRUCT
-            Frontend.frequency = Channel->Frequency() * 1000UL;
+            Frontend.frequency = FrequencyToHz(Channel->Frequency());
             Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.ofdm.bandwidth = fe_bandwidth_t(Channel->Bandwidth());
             Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(Channel->CoderateH());
@@ -651,7 +660,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             Frontend.u.ofdm.guard_interval = fe_guard_interval_t(Channel->Guard());
             Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(Channel->Hierarchy());
 #else
-            Frontend.Frequency = Channel->Frequency() * 1000UL;
+            Frontend.Frequency = FrequencyToHz(Channel->Frequency());
             Frontend.Inversion = SpectralInversion(Channel->Inversion());
             Frontend.u.ofdm.bandWidth = BandWidth(Channel->Bandwidth());
             Frontend.u.ofdm.HP_CodeRate = CodeRate(Channel->CoderateH());
@@ -733,11 +742,9 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      if (IsPrimaryDevice())
         AddPid(Channel->Tpid(), ptTeletext);
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), 0, 0, 0));
+     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));
 
   // Start setting system time:
 
@@ -765,13 +772,15 @@ int cDvbDevice::NumAudioTracksDevice(void) const
   int n = 0;
   if (aPid1)
      n++;
-  if (aPid2 && aPid1 != aPid2)
+  if (!Ca() && aPid2 && aPid1 != aPid2) // a Ca recording session blocks switching live audio tracks
      n++;
   return n;
 }
 
 const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
 {
+  if (Ca())
+     return NULL; // a Ca recording session blocks switching live audio tracks
   if (NumAudioTracks()) {
      if (CurrentTrack)
         *CurrentTrack = (pidHandles[ptAudio].pid == aPid1) ? 0 : 1;
@@ -785,11 +794,19 @@ const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
 void cDvbDevice::SetAudioTrackDevice(int Index)
 {
   if (0 <= Index && Index < NumAudioTracks()) {
+     int vpid = pidHandles[ptVideo].pid; // need to turn video PID off/on to restart demux
+     DelPid(vpid);
      DelPid(pidHandles[ptAudio].pid);
      AddPid(Index ? aPid2 : aPid1, ptAudio);
+     AddPid(vpid, ptVideo);
      }
 }
 
+bool cDvbDevice::CanReplay(void) const
+{
+  return cDevice::CanReplay() && !Ca(); // we can only replay if there is no Ca recording going on
+}
+
 bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
 {
   if (PlayMode != pmExtern_THIS_SHOULD_BE_AVOIDED && fd_video < 0 && fd_audio < 0) {
diff --git a/dvbdevice.h b/dvbdevice.h
index b5484dc7a..8784c74e9 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.14 2002/10/12 11:15:39 kls Exp $
+ * $Id: dvbdevice.h 1.15 2002/10/26 11:35:04 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -101,6 +101,7 @@ class cDvbDevice : public cDevice {
 
 protected:
   ePlayMode playMode;
+  virtual bool CanReplay(void) const;
   virtual bool SetPlayMode(ePlayMode PlayMode);
 public:
   virtual void TrickSpeed(int Speed);
diff --git a/dvbplayer.c b/dvbplayer.c
index 927fde4e1..0bc75c0da 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.14 2002/10/12 12:29:31 kls Exp $
+ * $Id: dvbplayer.c 1.15 2002/10/13 16:08:40 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -635,7 +635,7 @@ int cDvbPlayer::NumAudioTracks(void) const
   return canToggleAudioTrack ? 2 : 1;
 }
 
-const char **cDvbPlayer::GetAudioTracks(int *CurrentTrack = NULL) const
+const char **cDvbPlayer::GetAudioTracks(int *CurrentTrack) const
 {
   if (NumAudioTracks()) {
      if (CurrentTrack)
diff --git a/dvbspu.c b/dvbspu.c
index 95edb1bc1..4b31401ae 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.2 2002/09/29 13:48:39 kls Exp $
+ * $Id: dvbspu.c 1.3 2002/10/26 10:46:49 kls Exp $
  */
 
 #include <assert.h>
@@ -192,7 +192,7 @@ void cDvbSpuBitmap::putFieldData(int field, uint8_t * data, uint8_t * endp)
         int len = vlc >> 2;
 
         // if len == 0 -> end sequence - fill to end of line
-        len = len ? : bmpsize.x2 - xp + 1;
+        len = len ? len : bmpsize.x2 - xp + 1;
         putPixel(xp, yp, len, color);
         xp += len;
 
diff --git a/eitscan.c b/eitscan.c
index c29b6b578..2a89cec9d 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.8 2002/10/05 13:44:35 kls Exp $
+ * $Id: eitscan.c 1.9 2002/10/19 11:48:02 kls Exp $
  */
 
 #include "eitscan.h"
@@ -63,7 +63,7 @@ void cEITScanner::Process(void)
                               ch = 1;
                               numTransponders = 0;
                               }
-                           cChannel *Channel = Channels.GetByNumber(ch);
+                           cChannel *Channel = Channels.GetByNumber(ch, 1);
                            if (Channel) {
                               if (!Device->ProvidesChannel(Channel))
                                  break;
@@ -75,7 +75,7 @@ void cEITScanner::Process(void)
                                  break;
                                  }
                               }
-                           ch++;
+                           ch = Channel->Number() + 1;
                            }
                      }
                   }
diff --git a/i18n.c b/i18n.c
index 311378c54..08b276509 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.96 2002/10/13 11:03:39 kls Exp $
+ * $Id: i18n.c 1.99 2002/10/27 14:24:00 kls Exp $
  *
  * Translations provided by:
  *
@@ -14,7 +14,7 @@
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
  * French      Jean-Claude Repetto <jc@repetto.org>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
- * Finnish     Hannu Savolainen <hannu@opensound.com>
+ * Finnish     Hannu Savolainen <hannu@opensound.com> and Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  * Polish      Michael Rakowski <mrak@gmx.de>
  * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
@@ -207,7 +207,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Nauhoituskomennot",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -640,7 +640,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Lis��",
     "",// TODO
     "",// TODO
     "Isodos",
@@ -656,7 +656,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Korvaa",
     "",// TODO
     "",// TODO
     "Epanagrafi",
@@ -914,7 +914,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "L�hde",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1074,7 +1074,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
     "Inversion",
     "Inversion",
-    "Inversion",
+    "Inversio",
     "Inversion",
     "Inversion",
     "Inversion",
@@ -1138,7 +1138,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulation",
     "Modulation",
-    "Modulation",
+    "Modulaatio",
     "Modulation",
     "Modulation",
     "Modulation",
@@ -1460,7 +1460,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Kanavaa ei voi katsoa nyt!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1701,7 +1701,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Plugins",
-    "Plugins",
+    "Laajennokset",
     "Plugins",
     "Plugins",
     "Plugins",
@@ -1717,7 +1717,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Plugin",
-    "Plugin",
+    "Laajennos",
     "Plugin",
     "Plugin",
     "Plugin",
@@ -2198,7 +2198,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Pikanauhoituksen pituus (min)",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2359,7 +2359,7 @@ const tI18nPhrase Phrases[] = {
     "SegTerQuaQuiSexSabDom",
     "LunMarMerJeuVenSamDim",
     "ManTirOnsTorFreL�rS�n",
-    "MaaTiiKesTorPerLauSun",
+    "Ma Ti Ke To Pe La Su ",
     "PonWtoSroCzwPiaSobNie",
     "LunMarMieJueVieSabDom",
     "DevTriTetPemParSavKir",
@@ -2376,7 +2376,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
     "",// TODO
     " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
     "",// TODO
@@ -2385,21 +2385,21 @@ const tI18nPhrase Phrases[] = {
     " a�bcde�fghijklmno��pqrstu��vwxyz0123456789-.,#~",
   },
   // Learning keys:
-  { "Learning Remote Control Keys",
-    "Fernbedienungs-Codes lernen",
-    "Ucim se kod upravljalca",
-    "Apprendimento tasti unita` remota",
-    "Leren toetsen afstandsbediening",
-    "Aprender as teclas do telecomando",
-    "Apprentissage des codes de t�l�commande",
-    "L�re fjernkontrolltaster",
-    "Kaukos��timen n�pp�inten opettelu",
-    "Nauka kodu pilota",
-    "Aprendiendo teclas del telemando",
-    "Ekmathisi Remote Control",
-    "Inl�rning av fj�rrkontrollsknappar",
-    "Invatare taste telecomanda",
-    "T�vir�ny�t� betan�t�sa",
+  { "Learning Remote Control Keys (%s)",
+    "Fernbedienungs-Codes lernen (%s)",
+    "Ucim se kod upravljalca (%s)",
+    "Apprendimento tasti unita` remota (%s)",
+    "Leren toetsen afstandsbediening (%s)",
+    "Aprender as teclas do telecomando (%s)",
+    "Apprentissage des codes de t�l�commande (%s)",
+    "L�re fjernkontrolltaster (%s)",
+    "Kaukos��timen n�pp�inten opettelu (%s)",
+    "Nauka kodu pilota (%s)",
+    "Aprendiendo teclas del telemando (%s)",
+    "Ekmathisi Remote Control (%s)",
+    "Inl�rning av fj�rrkontrollsknappar (%s)",
+    "Invatare taste telecomanda (%s)",
+    "T�vir�ny�t� betan�t�sa (%s)",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -2569,7 +2569,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "(Paina 'Valikko' jos n�pp�int� ei ole)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2786,6 +2786,102 @@ const tI18nPhrase Phrases[] = {
     "Albastru",
     "K�k",
   },
+  { "Play",
+    "Wiedergabe",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Pause",
+    "Pause",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Stop",
+    "Stop",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Record",
+    "Aufnehmen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "FastFwd",
+    "Vorlauf",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "FastRew",
+    "R�cklauf",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Power",
     "Ausschalten",
     "Izklop",
@@ -2802,6 +2898,38 @@ const tI18nPhrase Phrases[] = {
     "Pornit",
     "Kikapcsolni",
   },
+  { "Channel+",
+    "Kanal+",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Channel-",
+    "Kanal-",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Volume+",
     "Lautst�rke+",
     "Glasnost+",
@@ -3179,7 +3307,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "T�ll� laajennoksella ei ole asetuksia!",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/interface.c b/interface.c
index 64c748944..a9f0d9a98 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.56 2002/09/30 15:32:10 kls Exp $
+ * $Id: interface.c 1.59 2002/10/27 15:54:05 kls Exp $
  */
 
 #include "interface.h"
@@ -58,7 +58,8 @@ eKeys cInterface::GetKey(bool Wait)
 {
   Flush();
   if (SVDRP) {
-     SVDRP->Process();
+     if (SVDRP->Process())
+        Wait = false;
      if (!open) {
         char *message = SVDRP->GetMessage();
         if (message) {
@@ -327,9 +328,6 @@ void cInterface::Help(const char *Red, const char *Green, const char *Yellow, co
 
 void cInterface::QueryKeys(cRemote *Remote)
 {
-  cRemote::Clear();
-  Clear();
-  WriteText(1, 1, tr("Learning Remote Control Keys"));//XXX Remote->name()!!!
   WriteText(1, 3, tr("Phase 1: Detecting RC code type"));
   WriteText(1, 5, tr("Press any key on the RC unit"));
   Flush();
@@ -354,12 +352,12 @@ void cInterface::QueryKeys(cRemote *Remote)
                char *NewCode = NULL;
                eKeys Key = cRemote::Get(100, &NewCode);
                switch (Key) {
-                 case kUp:   {
-                               NewKey = eKeys(NewKey - 1);
-                               cKey *last = Keys.Last();
-                               if (last && last->Key() == NewKey)
-                                  Keys.Del(last);
-                             }
+                 case kUp:   if (NewKey > kUp) {
+                                NewKey = eKeys(NewKey - 1);
+                                cKey *last = Keys.Last();
+                                if (last && last->Key() == NewKey)
+                                   Keys.Del(last);
+                                }
                              break;
                  case kDown: WriteText(1, 5, tr("Press 'Up' to confirm"));
                              WriteText(1, 6, tr("Press 'Down' to continue"));
@@ -415,28 +413,30 @@ void cInterface::LearnKeys(void)
       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
       if (!known) {
          Open();
+         char Headline[Width()];
+         snprintf(Headline, sizeof(Headline), tr("Learning Remote Control Keys (%s)"), Remote->Name());
+         Clear();
+         cRemote::Clear();
+         WriteText(1, 1, Headline);
+         cRemote::SetLearning(true);
+         QueryKeys(Remote);
+         cRemote::SetLearning(false);
+         Clear();
+         WriteText(1, 1, Headline);
+         WriteText(1, 3, tr("Phase 3: Saving key codes"));
+         WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
          for (;;) {
-             Clear();
-             cRemote::SetLearning(true);
-             QueryKeys(Remote);
-             cRemote::SetLearning(false);
-             Clear();
-             WriteText(1, 1, tr("Learning Remote Control Keys"));//XXX Remote->name()!!!
-             WriteText(1, 3, tr("Phase 3: Saving key codes"));
-             WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
-             for (;;) {
-                 eKeys key = GetKey();
-                 if (key == kUp) {
-                    Keys.Save();
-                    Close();
-                    return;
-                    }
-                 else if (key == kDown) {
-                    Keys.Load();
-                    Close();
-                    return;
-                    }
-                 }
+             eKeys key = GetKey();
+             if (key == kUp) {
+                Keys.Save();
+                Close();
+                break;
+                }
+             else if (key == kDown) {
+                Keys.Load();
+                Close();
+                break;
+                }
              }
          }
       }
diff --git a/keymacros.conf b/keymacros.conf
new file mode 100644
index 000000000..767d49d34
--- /dev/null
+++ b/keymacros.conf
@@ -0,0 +1,11 @@
+# Remote control key macros for VDR
+#
+# Format:
+#
+# macrokey  key1 key2 key3...
+#
+# See man vdr(5)
+
+Red       Recordings
+Green     Schedule
+Blue      Timers
diff --git a/keys.c b/keys.c
index 0d91d6730..4647f3aeb 100644
--- a/keys.c
+++ b/keys.c
@@ -4,40 +4,63 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.1 2002/09/29 09:56:51 kls Exp $
+ * $Id: keys.c 1.3 2002/10/27 15:19:40 kls Exp $
  */
 
 #include "keys.h"
 
 static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
-                    { kUp,            "Up"      },
-                    { kDown,          "Down"    },
-                    { kMenu,          "Menu"    },
-                    { kOk,            "Ok"      },
-                    { kBack,          "Back"    },
-                    { kLeft,          "Left"    },
-                    { kRight,         "Right"   },
-                    { kRed,           "Red"     },
-                    { kGreen,         "Green"   },
-                    { kYellow,        "Yellow"  },
-                    { kBlue,          "Blue"    },
-                    { k0,             "0"       },
-                    { k1,             "1"       },
-                    { k2,             "2"       },
-                    { k3,             "3"       },
-                    { k4,             "4"       },
-                    { k5,             "5"       },
-                    { k6,             "6"       },
-                    { k7,             "7"       },
-                    { k8,             "8"       },
-                    { k9,             "9"       },
-                    { kPower,         "Power"   },
-                    { kVolUp,         "Volume+" },
-                    { kVolDn,         "Volume-" },
-                    { kMute,          "Mute"    },
-                    { kNone,          ""        },
-                    { k_Setup,        "_Setup"  },
-                    { kNone,          NULL      },
+                    { kUp,            "Up"         },
+                    { kDown,          "Down"       },
+                    { kMenu,          "Menu"       },
+                    { kOk,            "Ok"         },
+                    { kBack,          "Back"       },
+                    { kLeft,          "Left"       },
+                    { kRight,         "Right"      },
+                    { kRed,           "Red"        },
+                    { kGreen,         "Green"      },
+                    { kYellow,        "Yellow"     },
+                    { kBlue,          "Blue"       },
+                    { k0,             "0"          },
+                    { k1,             "1"          },
+                    { k2,             "2"          },
+                    { k3,             "3"          },
+                    { k4,             "4"          },
+                    { k5,             "5"          },
+                    { k6,             "6"          },
+                    { k7,             "7"          },
+                    { k8,             "8"          },
+                    { k9,             "9"          },
+                    { kPlay,          "Play"       },
+                    { kPause,         "Pause"      },
+                    { kStop,          "Stop"       },
+                    { kRecord,        "Record"     },
+                    { kFastFwd,       "FastFwd"    },
+                    { kFastRew,       "FastRew"    },
+                    { kPower,         "Power"      },
+                    { kChanUp,        "Channel+"   },
+                    { kChanDn,        "Channel-"   },
+                    { kVolUp,         "Volume+"    },
+                    { kVolDn,         "Volume-"    },
+                    { kMute,          "Mute"       },
+                    { kSchedule,      "Schedule"   },
+                    { kChannels,      "Channels"   },
+                    { kTimers,        "Timers"     },
+                    { kRecordings,    "Recordings" },
+                    { kSetup,         "Setup"      },
+                    { kCommands,      "Commands"   },
+                    { kUser1,         "User1"      },
+                    { kUser2,         "User2"      },
+                    { kUser3,         "User3"      },
+                    { kUser4,         "User4"      },
+                    { kUser5,         "User5"      },
+                    { kUser6,         "User6"      },
+                    { kUser7,         "User7"      },
+                    { kUser8,         "User8"      },
+                    { kUser9,         "User9"      },
+                    { kNone,          ""           },
+                    { k_Setup,        "_Setup"     },
+                    { kNone,          NULL         },
                   };
 
 // -- cKey -------------------------------------------------------------------
@@ -152,3 +175,49 @@ void cKeys::PutSetup(const char *Remote, const char *Setup)
   else
      esyslog("ERROR: called PutSetup() for %s, but setup has already been defined!", Remote);
 }
+
+// -- cKeyMacro --------------------------------------------------------------
+
+cKeyMacro::cKeyMacro(void)
+{
+  for (int i = 0; i < MAXKEYSINMACRO; i++)
+      macro[i] = kNone;
+}
+
+bool cKeyMacro::Parse(char *s)
+{
+  int n = 0;
+  char *p;
+  while ((p = strtok(s, " \t")) != NULL) {
+        if (n < MAXKEYSINMACRO) {
+           macro[n] = cKey::FromString(p);
+           if (macro[n] == kNone) {
+              esyslog("ERROR: unknown key '%s'", p);
+              return false;
+              }
+           n++;
+           s = NULL;
+           }
+        else {
+           esyslog("ERROR: key macro too long");
+           return false;
+           }
+        }
+  if (n < 2) {
+     esyslog("ERROR: empty key macro");
+     }
+  return true;
+}
+
+// -- cKeyMacros -------------------------------------------------------------
+
+cKeyMacros KeyMacros;
+
+const cKeyMacro *cKeyMacros::Get(eKeys Key)
+{
+  for (cKeyMacro *k = First(); k; k = Next(k)) {
+      if (*k->Macro() == Key)
+         return k;
+      }
+  return NULL;
+}
diff --git a/keys.h b/keys.h
index d5ecbbc46..ceb2d1c8f 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.1 2002/09/29 09:55:52 kls Exp $
+ * $Id: keys.h 1.3 2002/10/27 15:18:21 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -26,10 +26,25 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kYellow,
              kBlue,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+             kPlay,
+             kPause,
+             kStop,
+             kRecord,
+             kFastFwd,
+             kFastRew,
              kPower,
+             kChanUp,
+             kChanDn,
              kVolUp,
              kVolDn,
              kMute,
+             kSchedule,
+             kChannels,
+             kTimers,
+             kRecordings,
+             kSetup,
+             kCommands,
+             kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9,
              kNone,
              k_Setup,
              // The following flags are OR'd with the above codes:
@@ -47,9 +62,10 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 #define kEditCut         k2
 #define kEditTest        k8
 
-#define RAWKEY(k)    (eKeys((k) & ~k_Flags))
-#define ISRAWKEY(k)  ((k) != kNone && ((k) & k_Flags) == 0)
-#define NORMALKEY(k) (eKeys((k) & ~k_Repeat))
+#define RAWKEY(k)        (eKeys((k) & ~k_Flags))
+#define ISRAWKEY(k)      ((k) != kNone && ((k) & k_Flags) == 0)
+#define NORMALKEY(k)     (eKeys((k) & ~k_Repeat))
+#define ISMODELESSKEY(k) (RAWKEY(k) > k9)
 
 struct tKey {
   eKeys type;
@@ -84,4 +100,22 @@ class cKeys : public cConfig<cKey> {
 
 extern cKeys Keys;
 
+#define MAXKEYSINMACRO 16
+
+class cKeyMacro : public cListObject {
+private:
+  eKeys macro[MAXKEYSINMACRO];
+public:
+  cKeyMacro(void);
+  bool Parse(char *s);
+  const eKeys *Macro(void) const { return macro; }
+  };
+
+class cKeyMacros : public cConfig<cKeyMacro> {
+public:
+  const cKeyMacro *Get(eKeys Key);
+  };
+
+extern cKeyMacros KeyMacros;
+
 #endif //__KEYS_H
diff --git a/menu.c b/menu.c
index 077922a14..0bd24be87 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.217 2002/10/13 12:10:54 kls Exp $
+ * $Id: menu.c 1.221 2002/10/27 14:06:02 kls Exp $
  */
 
 #include "menu.h"
@@ -24,6 +24,7 @@
 #include "remote.h"
 #include "sources.h"
 #include "status.h"
+#include "timers.h"
 #include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
@@ -33,7 +34,7 @@
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
 
-#define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
+#define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
 // --- cMenuEditChanItem -----------------------------------------------------
 
@@ -42,6 +43,7 @@ class cMenuEditChanItem : public cMenuEditIntItem {
   virtual void Set(void);
 public:
   cMenuEditChanItem(const char *Name, int *Value);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
@@ -54,13 +56,32 @@ void cMenuEditChanItem::Set(void)
 {
   char buf[255];
   cChannel *channel = Channels.GetByNumber(*value);
-  if (channel)
-     snprintf(buf, sizeof(buf), "%d %s", *value, channel->Name());
-  else
-     *buf = 0;
+  snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
   SetValue(buf);
 }
 
+eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
+{
+  int delta = 1;
+
+  switch (Key) {
+    case kLeft|k_Repeat:
+    case kLeft:  delta = -1;
+    case kRight|k_Repeat:
+    case kRight: 
+                 {
+                   cChannel *channel = Channels.GetByNumber(*value + delta, delta);
+                   if (channel) {
+                      *value = channel->Number();
+                      Set();
+                      }
+                 }
+                 break;
+    default : return cMenuEditIntItem::ProcessKey(Key);
+    }
+  return osContinue;
+}
+
 // --- cMenuEditTranItem -----------------------------------------------------
 
 class cMenuEditTranItem : public cMenuEditChanItem {
@@ -597,17 +618,14 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 
 class cMenuChannelItem : public cOsdItem {
 private:
-  int index;
   cChannel *channel;
 public:
-  cMenuChannelItem(int Index, cChannel *Channel);
+  cMenuChannelItem(cChannel *Channel);
   virtual void Set(void);
-  void SetIndex(int Index);
   };
 
-cMenuChannelItem::cMenuChannelItem(int Index, cChannel *Channel)
+cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
 {
-  index = Index;
   channel = Channel;
   if (channel->GroupSep())
      SetColor(clrCyan, clrBackground);
@@ -624,15 +642,11 @@ void cMenuChannelItem::Set(void)
   SetText(buffer, false);
 }
 
-void cMenuChannelItem::SetIndex(int Index)
-{
-  index = Index;
-  Set();
-}
-
 // --- cMenuChannels ---------------------------------------------------------
 
 class cMenuChannels : public cOsdMenu {
+private:
+  void Propagate(void);
 protected:
   eOSState Switch(void);
   eOSState Edit(void);
@@ -653,12 +667,22 @@ cMenuChannels::cMenuChannels(void)
   int curr = ((channel = Channels.GetByNumber(cDevice::CurrentChannel())) != NULL) ? channel->Index() : -1;
 
   while ((channel = Channels.Get(i)) != NULL) {
-        Add(new cMenuChannelItem(i, channel), i == curr);
+        Add(new cMenuChannelItem(channel), i == curr);
         i++;
         }
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
 }
 
+void cMenuChannels::Propagate(void)
+{
+  Channels.ReNumber();
+  Channels.Save();
+  for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
+      ci->Set();
+  Timers.Save(); // channel numbering has changed!
+  Display();
+}
+
 eOSState cMenuChannels::Switch(void)
 {
   cChannel *ch = Channels.Get(Current());
@@ -671,8 +695,12 @@ eOSState cMenuChannels::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog("editing channel %d", Current() + 1);
-  return AddSubMenu(new cMenuEditChannel(Current()));
+  cChannel *ch = Channels.Get(Current());
+  if (ch) {
+     isyslog("editing channel %d", ch->Number());
+     return AddSubMenu(new cMenuEditChannel(Current()));
+     }
+  return osContinue;
 }
 
 eOSState cMenuChannels::New(void)
@@ -682,7 +710,7 @@ eOSState cMenuChannels::New(void)
   cChannel *channel = new cChannel(Channels.Get(Current()));
   Channels.Add(channel);
   Channels.ReNumber();
-  Add(new cMenuChannelItem(channel->Index()/*XXX*/, channel), true);
+  Add(new cMenuChannelItem(channel), true);
   Channels.Save();
   isyslog("channel %d added", channel->Number());
   return AddSubMenu(new cMenuEditChannel(Current()));
@@ -695,36 +723,17 @@ eOSState cMenuChannels::Del(void)
      cChannel *channel = Channels.Get(Index);
      int DeletedChannel = channel->Number();
      // Check if there is a timer using this channel:
-     for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
-         if (ti->channel == DeletedChannel) {
+     for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) {
+         if (ti->Channel() == channel) {
             Interface->Error(tr("Channel is being used by a timer!"));
             return osContinue;
             }
          }
      if (Interface->Confirm(tr("Delete channel?"))) {
-        // Move and renumber the channels:
         Channels.Del(channel);
-        Channels.ReNumber();
         cOsdMenu::Del(Index);
-        int i = 0;
-        for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
-            ci->SetIndex(i++);
-        Channels.Save();
+        Propagate();
         isyslog("channel %d deleted", DeletedChannel);
-        // Fix the timers:
-        bool TimersModified = false;
-        for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
-            int OldChannel = ti->channel;
-            if (ti->channel > DeletedChannel)
-               ti->channel--;
-            if (ti->channel != OldChannel) {
-               TimersModified = true;
-               isyslog("timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
-               }
-            }
-        if (TimersModified)
-           Timers.Save();
-        Display();
         }
      }
   return osContinue;
@@ -734,35 +743,10 @@ void cMenuChannels::Move(int From, int To)
 {
   int FromNumber = Channels.Get(From)->Number();
   int ToNumber = Channels.Get(To)->Number();
-  // Move and renumber the channels:
   Channels.Move(From, To);
-  Channels.ReNumber();
   cOsdMenu::Move(From, To);
-  int i = 0;
-  for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
-      ci->SetIndex(i++);
-  Channels.Save();
+  Propagate();
   isyslog("channel %d moved to %d", FromNumber, ToNumber);
-  // Fix the timers:
-  bool TimersModified = false;
-  From++; // user visible channel numbers start with '1'
-  To++;
-  for (cTimer *ti = Timers.First(); ti; ti = (cTimer *)ti->Next()) {
-      int OldChannel = ti->channel;
-      if (ti->channel == FromNumber)
-         ti->channel = ToNumber;
-      else if (ti->channel > FromNumber && ti->channel <= ToNumber)
-         ti->channel--;
-      else if (ti->channel < FromNumber && ti->channel >= ToNumber)
-         ti->channel++;
-      if (ti->channel != OldChannel) {
-         TimersModified = true;
-         isyslog("timer %d: channel changed from %d to %d", ti->Index() + 1, OldChannel, ti->channel);
-         }
-      }
-  if (TimersModified)
-     Timers.Save();
-  Display();
 }
 
 eOSState cMenuChannels::ProcessKey(eKeys Key)
@@ -815,6 +799,7 @@ class cMenuEditTimer : public cOsdMenu {
 private:
   cTimer *timer;
   cTimer data;
+  int channel;
   cMenuEditDateItem *firstday;
   void SetFirstDayItem(void);
 public:
@@ -831,12 +816,12 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
      data = *timer;
      if (New)
         data.active = 1;
+     channel = data.Channel()->Number();
      Add(new cMenuEditBoolItem(tr("Active"),       &data.active));
-     Add(new cMenuEditChanItem(tr("Channel"),      &data.channel));
+     Add(new cMenuEditChanItem(tr("Channel"),      &channel));
      Add(new cMenuEditDayItem( tr("Day"),          &data.day));
      Add(new cMenuEditTimeItem(tr("Start"),        &data.start));
      Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop));
-//TODO VPS???
      Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
      Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), tr(FileNameChars)));
@@ -864,15 +849,24 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:     if (!*data.file)
-                        strcpy(data.file, Channels.GetChannelNameByNumber(data.channel));
-                     if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
-                        *timer = data;
-                        if (timer->active)
-                           timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
-                        Timers.Save();
-                        isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
-                        }
+       case kOk:     {  
+                       cChannel *ch = Channels.GetByNumber(channel);
+                       if (ch)
+                          data.channel = ch;
+                       else {
+                          Interface->Error(tr("*** Invalid Channel ***"));
+                          break;
+                          }
+                       if (!*data.file)
+                          strcpy(data.file, data.Channel()->Name());
+                       if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
+                          *timer = data;
+                          if (timer->active)
+                             timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
+                          Timers.Save();
+                          isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+                          }
+                     }
                      return osBack;
        case kRed:
        case kGreen:
@@ -913,14 +907,14 @@ void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
-                    !timer->active ? ' ' : timer->firstday ? '!' : timer->recording ? '#' : '>',
-                    timer->channel,
-                    timer->PrintDay(timer->day),
-                    timer->start / 100,
-                    timer->start % 100,
-                    timer->stop / 100,
-                    timer->stop % 100,
-                    timer->file);
+                    !timer->Active() ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
+                    timer->Channel()->Number(),
+                    timer->PrintDay(timer->Day()),
+                    timer->Start() / 100,
+                    timer->Start() % 100,
+                    timer->Stop() / 100,
+                    timer->Stop() % 100,
+                    timer->File());
   SetText(buffer, false);
 }
 
@@ -965,23 +959,13 @@ eOSState cMenuTimers::OnOff(void)
 {
   cTimer *timer = CurrentTimer();
   if (timer) {
-     if (timer->IsSingleEvent())
-        timer->active = !timer->active;
-     else if (timer->firstday) {
-        timer->firstday = 0;
-        timer->active = false;
-        }
-     else if (timer->active)
-        timer->Skip();
-     else
-        timer->active = true;
-     timer->Matches(); // refresh start and end time
+     timer->OnOff();
      RefreshCurrent();
      DisplayCurrent(true);
-     if (timer->firstday)
+     if (timer->FirstDay())
         isyslog("timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
      else
-        isyslog("timer %d %sactivated", timer->Index() + 1, timer->active ? "" : "de");
+        isyslog("timer %d %sactivated", timer->Index() + 1, timer->Active() ? "" : "de");
      Timers.Save();
      }
   return osContinue;
@@ -1012,7 +996,7 @@ eOSState cMenuTimers::Del(void)
   // Check if this timer is active:
   cTimer *ti = CurrentTimer();
   if (ti) {
-     if (!ti->recording) {
+     if (!ti->Recording()) {
         if (Interface->Confirm(tr("Delete timer?"))) {
            int Index = ti->Index();
            Timers.Del(ti);
@@ -1042,8 +1026,8 @@ eOSState cMenuTimers::Summary(void)
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   cTimer *ti = CurrentTimer();
-  if (ti && ti->summary && *ti->summary)
-     return AddSubMenu(new cMenuText(tr("Summary"), ti->summary));
+  if (ti && !isempty(ti->Summary()))
+     return AddSubMenu(new cMenuText(tr("Summary"), ti->Summary()));
   return Edit(); // convenience for people not using the Summary feature ;-)
 }
 
@@ -1242,6 +1226,7 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
+       case kRecord:
        case kRed:    return Record();
        case kYellow: state = osBack;
                      // continue with kGreen
@@ -1385,6 +1370,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
+       case kRecord:
        case kRed:    return Record();
        case kGreen:  if (schedules) {
                         if (!now && !next) {
@@ -2178,7 +2164,12 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
   // Initial submenus:
 
   switch (State) {
+    case osSchedule:   AddSubMenu(new cMenuSchedule); break;
+    case osChannels:   AddSubMenu(new cMenuChannels); break;
+    case osTimers:     AddSubMenu(new cMenuTimers); break;
     case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
+    case osSetup:      AddSubMenu(new cMenuSetup); break;
+    case osCommands:   AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
     default: break;
     }
 }
@@ -2305,6 +2296,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                        }
                        break;
     default: switch (Key) {
+               case kRecord:
                case kRed:    if (!HasSubMenu())
                                 state = osRecord;
                              break;
@@ -2367,6 +2359,7 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdObject(true)
 {
   group = -1;
+  lines = 0;
   number = 0;
   lastTime = time_ms();
   int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
@@ -2383,10 +2376,17 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
 {
   int BufSize = Width() + 1;
   char buffer[BufSize];
-  if (Channel && Channel->Number() > 0)
-     snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
+  *buffer = 0;
+  if (Channel) {
+     if (Channel->Number() > 0)
+        snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
+     else if (Channel->Name())
+        snprintf(buffer, BufSize, "%s", Channel->Name());
+     }
+  else if (number)
+     snprintf(buffer, BufSize, "%d-", number);
   else
-     snprintf(buffer, BufSize, "%s", Channel ? Channel->Name() : tr("*** Invalid Channel ***"));
+     snprintf(buffer, BufSize, "%s", tr("*** Invalid Channel ***"));
   Interface->Fill(0, 0, Setup.OSDwidth, 1, clrBackground);
   Interface->Write(0, 0, buffer);
   const char *date = DayDateTime();
@@ -2452,6 +2452,14 @@ void cDisplayChannel::DisplayInfo(void)
      }
 }
 
+void cDisplayChannel::Refresh(void)
+{
+  Interface->Clear();
+  DisplayChannel(Channels.GetByNumber(cDevice::CurrentChannel()));
+  lastTime = time_ms();
+  lines = 0;
+}
+
 eOSState cDisplayChannel::ProcessKey(eKeys Key)
 {
   switch (Key) {
@@ -2468,10 +2476,6 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                cChannel *channel = Channels.GetByNumber(number);
                DisplayChannel(channel);
                lastTime = time_ms();
-               if (!channel) {
-                  number = -1;
-                  lastTime += 1000;
-                  }
                }
             }
          break;
@@ -2503,10 +2507,28 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             }
          lastTime = time_ms();
          break;
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:
+         cDevice::SwitchChannel(NORMALKEY(Key) == kUp ? 1 : -1);
+         // no break here
+    case kChanUp|k_Repeat:
+    case kChanUp:
+    case kChanDn|k_Repeat:
+    case kChanDn:
+         Refresh();
+         break;
     case kNone:
          if (number && time_ms() - lastTime > DIRECTCHANNELTIMEOUT) {
-            if (number > 0 && !Channels.SwitchTo(number))
-               number = -1;
+            if (Channels.GetByNumber(number))
+               Channels.SwitchTo(number);
+            else {
+               number = 0;
+               DisplayChannel(NULL);
+               lastTime = time_ms();
+               return osContinue;
+               }
             return osEnd;
             }
          break;
@@ -2516,7 +2538,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kOk:     if (group >= 0)
                      Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->Number());
                   return osEnd;
-    default:      if (NORMALKEY(Key) == kUp || NORMALKEY(Key) == kDown || (Key & (k_Repeat | k_Release)) == 0) {
+    default:      if ((Key & (k_Repeat | k_Release)) == 0) {
                      cRemote::Put(Key);
                      return osEnd;
                      }
@@ -2646,7 +2668,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
      timer = new cTimer(true);
      Timers.Add(timer);
      Timers.Save();
-     asprintf(&instantId, cDevice::NumDevices() > 1 ? "%s - %d" : "%s", Channels.GetChannelNameByNumber(timer->channel), device->CardIndex() + 1);
+     asprintf(&instantId, cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
      }
   timer->SetPending(true);
   timer->SetRecording(true);
@@ -2663,8 +2685,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   cRecording Recording(timer, Title, Subtitle, Summary);
   fileName = strdup(Recording.FileName());
   cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
-  cChannel *ch = Channels.GetByNumber(timer->channel);
-  recorder = new cRecorder(fileName, ch->Ca(), timer->priority, ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
+  const cChannel *ch = timer->Channel();
+  recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
   if (device->AttachReceiver(recorder)) {
      Recording.WriteSummary();
      cStatus::MsgRecording(device, Recording.Name());
@@ -2684,8 +2706,8 @@ cRecordControl::~cRecordControl()
 
 bool cRecordControl::GetEventInfo(void)
 {
-  cChannel *channel = Channels.GetByNumber(timer->channel);
-  time_t Time = timer->active == taActInst ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
+  const cChannel *channel = timer->Channel();
+  time_t Time = timer->Active() == taActInst ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
         cMutexLock MutexLock;
@@ -2730,7 +2752,7 @@ bool cRecordControl::Process(time_t t)
 {
   if (!recorder || !timer || !timer->Matches(t))
      return false;
-  AssertFreeDiskSpace(timer->priority);
+  AssertFreeDiskSpace(timer->Priority());
   return true;
 }
 
@@ -2740,12 +2762,12 @@ cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL };
 
 bool cRecordControls::Start(cTimer *Timer)
 {
-  int ch = Timer ? Timer->channel : cDevice::CurrentChannel();
+  int ch = Timer ? Timer->Channel()->Number() : cDevice::CurrentChannel();
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
      bool NeedsDetachReceivers = false;
-     cDevice *device = cDevice::GetDevice(channel, Timer ? Timer->priority : Setup.DefaultPriority, &NeedsDetachReceivers);
+     cDevice *device = cDevice::GetDevice(channel, Timer ? Timer->Priority() : Setup.DefaultPriority, &NeedsDetachReceivers);
      if (device) {
         if (NeedsDetachReceivers)
            Stop(device);
@@ -2760,7 +2782,7 @@ bool cRecordControls::Start(cTimer *Timer)
                }
             }
         }
-     else if (!Timer || (Timer->priority >= Setup.PrimaryLimit && !Timer->pending))
+     else if (!Timer || (Timer->Priority() >= Setup.PrimaryLimit && !Timer->Pending()))
         isyslog("no free DVB device to record channel %d!", ch);
      }
   else
@@ -3087,19 +3109,23 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
             TimeSearchDisplay();
             }
          break;
+    case kFastRew:
     case kLeft:
+    case kFastFwd:
     case kRight: {
-         int dir = (Key == kRight ? 1 : -1);
+         int dir = ((Key == kRight || Key == kFastFwd) ? 1 : -1);
          if (dir > 0)
             Seconds = min(Total - Current - STAY_SECONDS_OFF_END, Seconds);
          SkipSeconds(Seconds * dir);
          timeSearchActive = false;
          }
          break;
+    case kPlay:
     case kUp:
+    case kPause:
     case kDown:
          Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
-         Goto(Seconds * FRAMESPERSEC, Key == kDown);
+         Goto(Seconds * FRAMESPERSEC, Key == kDown || Key == kPause);
          timeSearchActive = false;
          break;
     default:
@@ -3244,19 +3270,26 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
   bool DoShowMode = true;
   switch (Key) {
     // Positioning:
+    case kPlay:
     case kUp:      Play(); break;
+    case kPause:
     case kDown:    Pause(); break;
+    case kFastRew|k_Release:
     case kLeft|k_Release:
                    if (Setup.MultiSpeedMode) break;
+    case kFastRew:
     case kLeft:    Backward(); break;
+    case kFastFwd|k_Release:
     case kRight|k_Release:
                    if (Setup.MultiSpeedMode) break;
+    case kFastFwd:
     case kRight:   Forward(); break;
     case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
     case kGreen:   SkipSeconds(-60); break;
     case kYellow|k_Repeat:
     case kYellow:  SkipSeconds( 60); break;
+    case kStop:
     case kBlue:    Hide();
                    Stop();
                    return osEnd;
diff --git a/menu.h b/menu.h
index ba3c3d552..be70e53ab 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.48 2002/10/13 10:34:09 kls Exp $
+ * $Id: menu.h 1.49 2002/10/27 12:04:49 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -35,6 +35,7 @@ class cDisplayChannel : public cOsdObject {
   int number;
   void DisplayChannel(const cChannel *Channel);
   void DisplayInfo(void);
+  void Refresh(void);
 public:
   cDisplayChannel(int Number, bool Switched);
   cDisplayChannel(eKeys FirstKey);
diff --git a/newplugin b/newplugin
index e9bfc85bd..3a4586c85 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.8 2002/09/17 15:24:23 kls Exp $
+# $Id: newplugin 1.9 2002/10/26 14:32:12 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -174,7 +174,7 @@ public:
 
 cPlugin${PLUGIN_CLASS}::cPlugin$PLUGIN_CLASS(void)
 {
-  // Initialize any member varaiables here.
+  // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
 }
diff --git a/recording.c b/recording.c
index 1be6623b5..ba85ded15 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.69 2002/10/13 09:08:45 kls Exp $
+ * $Id: recording.c 1.70 2002/10/20 11:54:29 kls Exp $
  */
 
 #include "recording.h"
@@ -307,13 +307,13 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   name = NULL;
   // set up the actual name:
   if (isempty(Title))
-     Title = Channels.GetChannelNameByNumber(Timer->channel);
+     Title = Timer->Channel()->Name();
   if (isempty(Subtitle))
      Subtitle = " ";
-  char *macroTITLE   = strstr(Timer->file, TIMERMACRO_TITLE);
-  char *macroEPISODE = strstr(Timer->file, TIMERMACRO_EPISODE);
+  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
+  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
-     name = strdup(Timer->file);
+     name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
      name = strreplace(name, TIMERMACRO_EPISODE, Subtitle);
      if (Timer->IsSingleEvent()) {
@@ -322,16 +322,16 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
         }
      }
   else if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
-     name = strdup(Timer->file);
+     name = strdup(Timer->File());
   else
-     asprintf(&name, "%s~%s", Timer->file, Subtitle);
+     asprintf(&name, "%s~%s", Timer->File(), Subtitle);
   // substitute characters that would cause problems in file names:
   strreplace(name, '\n', ' ');
   start = Timer->StartTime();
-  priority = Timer->priority;
-  lifetime = Timer->lifetime;
+  priority = Timer->Priority();
+  lifetime = Timer->Lifetime();
   // handle summary:
-  summary = !isempty(Timer->summary) ? strdup(Timer->summary) : NULL;
+  summary = !isempty(Timer->Summary()) ? strdup(Timer->Summary()) : NULL;
   if (!summary) {
      if (isempty(Subtitle))
         Subtitle = "";
diff --git a/recording.h b/recording.h
index 2fae49ee6..82f2fccaf 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.24 2002/06/22 10:09:27 kls Exp $
+ * $Id: recording.h 1.25 2002/10/19 15:48:52 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -12,6 +12,7 @@
 
 #include <time.h>
 #include "config.h"
+#include "timers.h"
 #include "tools.h"
 
 void RemoveDeletedRecordings(void);
diff --git a/remote.c b/remote.c
index 05ce6063c..6078c26ba 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.29 2002/10/12 15:22:08 kls Exp $
+ * $Id: remote.c 1.30 2002/10/27 15:15:58 kls Exp $
  */
 
 #include "remote.h"
@@ -84,6 +84,22 @@ bool cRemote::Put(eKeys Key)
   return true; // only a real key shall report an overflow!
 }
 
+bool cRemote::PutMacro(eKeys Key)
+{
+  const cKeyMacro *km = KeyMacros.Get(Key);
+  if (km) {
+     for (int i = 1; i < MAXKEYSINMACRO; i++) {
+         if (km->Macro()[i] != kNone) {
+            if (!Put(km->Macro()[i]))
+               return false;
+            }
+         else
+            break;
+         }
+     }
+  return true;
+}
+
 bool cRemote::Put(uint64 Code, bool Repeat, bool Release)
 {
   char buffer[32];
diff --git a/remote.h b/remote.h
index f715ade7d..2bb9ea530 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.17 2002/09/29 11:26:45 kls Exp $
+ * $Id: remote.h 1.18 2002/10/27 15:16:50 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -20,7 +20,7 @@ typedef unsigned long long int uint64;
 
 class cRemote : public cListObject {
 private:
-  enum { MaxKeys = 16 };
+  enum { MaxKeys = MAXKEYSINMACRO };
   static eKeys keys[MaxKeys];
   static int in;
   static int out;
@@ -42,6 +42,7 @@ class cRemote : public cListObject {
   static void SetLearning(bool On) { learning = On; }
   static void Clear(void);
   static bool Put(eKeys Key);
+  static bool PutMacro(eKeys Key);
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   };
 
diff --git a/sources.conf b/sources.conf
index f30e52f75..90a757364 100644
--- a/sources.conf
+++ b/sources.conf
@@ -4,6 +4,14 @@
 #
 # code  description
 #
+# S (satellite) xy.z (orbital position in degrees) E or W (east or west)
+# Note: only the first part is actually used by VDR. The description part
+# is for the "human" interface for clarity.
+#
+# '&' means same orbital position but different host company.
+# '/' means same (or very little deviation) orbital position & host.
+# A value in () means this satellite is still in it's test phase.
+#
 # Please contact kls@cadsoft.de before assigning a new code
 # to a description, in order to keep them unique.
 
@@ -12,34 +20,66 @@
 S5E     Sirius 2/3
 S7E     Eutelsat W3
 S10E    Eutelsat W1R
-S13E    Hotbird 1-5
+S13E    Hotbird 1-(5)-6
 S16E    Eutelsat W2
-S19.2E  Astra 1
-S23.5E  Astra 3
+S19.2E  Astra 1B/C/E/F/G/H/2C
+S21.5E  Eutelsat II F3
+S23.5E  Astra 3A
+S24.2E  Astra 1D
 S26E    Arabsat 2A/3A
-S28.2E  Astra 2
+S28.2E  Astra 2D/A/B 
 S28.5E  Eurobird
-S30.E   Arabsat 30.5E
-S31.3   T�rksat 1B
-S36E    Eutelsat W4 / Sesat
-S42E    Turksat 1C / Eurasiasat
+S30.5E  Arabsat 2B
+S31.3E  T�rksat 1B
+S36E    Eutelsat W4 & Sesat
+S39E    Hellas Sat
+S40E    Express A1R
+S42E    Turksat 1C & EurAsiaSat 1 & NewSat 1
+S45E    Europe*Star 1
+S47E    Telecom 2B
+S48E    Eutelsat II F1 
+S50E    Anatolia 1
+S53E    Gorizont 32
+S55.1E  Insat 2DT
+S56E    Most 1
+S57E    NSS 703
+S60E    Intelsat 904
+S62E    Intelsat 902
+S64E    Intelsat 906 
+S66E    Intelsat 704
+S68.5E  PAS 7/10
+S72E    PAS 4 
+S74E    Insat 3C
+S75E    LMI 1
+S76.5E  Apstar
+S78.5E  Thaicom 2/3
+S80E    Express 6A
+S83E    Insat 2E/3B
 
-S1W     Thor 2/3 / Intelsat 707
+S1W     Thor 2/3 & Intelsat 707
 S4W     Amos 1
-S5W     Telecom 2C
-S7W     Nilesat 101/102
-S8W     Atlantic bird 2 / Telecom 2D
+S5W     Telecom 2C & Atlantic Bird 3
+S7W     Nilesat 101 & 102
+S8W     Telecom 2A/2D & Atlantic Bird 2
 S11W    Express 3A
-S14W    Express 2
+S12.5W  Eutelsat II F2
+S14W    Gorizont 26
 S15W    Telstar 12
-S18W    Intelsat
-S21W    NSS 803
-S27.W   Intelsat 27.5W
+S18W    Intelsat 901
+S21.5W  NSS 7
+S27.5W  Intelsat 605
 S30W    Hispasat 1
-S31.5W  Intelsat 31.5W
-S34.5W  Intelsat 34.5W
+S31.5W  Intelsat 801
+S34.5W  Intelsat 903
 S37.5W  Telstar 11
-S43W    PAS
+S40.5W  NSS 806
+S43W    PAS 3R/6/6B
+S45W    PAS 1/5R
+S47W    TDRS 6
+S53W    Intelsat 706
+S55.5W  Intelsat 805
+S58W    PAS 9
+S61.5W  Echostar 3
 
 # Cable
 
diff --git a/svdrp.c b/svdrp.c
index 411714930..2859fb9de 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.45 2002/10/13 09:31:31 kls Exp $
+ * $Id: svdrp.c 1.48 2002/10/20 12:45:03 kls Exp $
  */
 
 #include "svdrp.h"
@@ -31,6 +31,7 @@
 #include "device.h"
 #include "keys.h"
 #include "remote.h"
+#include "timers.h"
 #include "tools.h"
 
 // --- cSocket ---------------------------------------------------------------
@@ -413,12 +414,12 @@ void cSVDRP::CmdCHAN(const char *Option)
      else {
         int i = 1;
         cChannel *channel;
-        while ((channel = Channels.GetByNumber(i)) != NULL) {
+        while ((channel = Channels.GetByNumber(i, 1)) != NULL) {
               if (strcasecmp(channel->Name(), Option) == 0) {
                  n = i;
                  break;
                  }
-              i++;
+              i = channel->Number() + 1;
               }
         }
      if (n < 0) {
@@ -487,7 +488,7 @@ void cSVDRP::CmdDELT(const char *Option)
      if (isnumber(Option)) {
         cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
         if (timer) {
-           if (!timer->recording) {
+           if (!timer->Recording()) {
               Timers.Del(timer);
               Timers.Save();
               isyslog("timer %s deleted", Option);
@@ -640,7 +641,7 @@ void cSVDRP::CmdLSTC(const char *Option)
         int i = 1;
         cChannel *next = NULL;
         while (i <= Channels.MaxNumber()) {
-              cChannel *channel = Channels.GetByNumber(i);
+              cChannel *channel = Channels.GetByNumber(i, 1);
               if (channel) {
                  if (strcasestr(channel->Name(), Option)) {
                     if (next)
@@ -652,7 +653,7 @@ void cSVDRP::CmdLSTC(const char *Option)
                  Reply(501, "Channel \"%d\" not found", i);
                  return;
                  }
-              i++;
+              i = channel->Number() + 1;
               }
         if (next)
            Reply(250, "%d %s", next->Number(), next->ToText());
@@ -661,13 +662,15 @@ void cSVDRP::CmdLSTC(const char *Option)
         }
      }
   else if (Channels.MaxNumber() >= 1) {
-     for (int i = 1; i <= Channels.MaxNumber(); i++) {
-         cChannel *channel = Channels.GetByNumber(i);
-        if (channel)
-           Reply(i < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), channel->ToText());
-        else
-           Reply(501, "Channel \"%d\" not found", i);
-         }
+     int i = 1;
+     while (i <= Channels.MaxNumber()) {
+           cChannel *channel = Channels.GetByNumber(i, 1);
+           if (channel)
+              Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), channel->ToText());
+           else
+              Reply(501, "Channel \"%d\" not found", i);
+           i = channel->Number() + 1;
+           }
      }
   else
      Reply(550, "No channels defined");
@@ -804,16 +807,16 @@ void cSVDRP::CmdMODT(const char *Option)
         if (timer) {
            cTimer t = *timer;
            if (strcasecmp(tail, "ON") == 0)
-              t.active = 1;
+              t.SetActive(taActive);
            else if (strcasecmp(tail, "OFF") == 0)
-              t.active = 0;
+              t.SetActive(taInactive);
            else if (!t.Parse(tail)) {
               Reply(501, "Error in timer settings");
               return;
               }
            *timer = t;
            Timers.Save();
-           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->Active() ? "active" : "inactive");
            Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
            }
         else
@@ -1009,7 +1012,7 @@ void cSVDRP::Execute(char *Cmd)
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
 }
 
-void cSVDRP::Process(void)
+bool cSVDRP::Process(void)
 {
   bool NewConnection = !file.IsOpen();
   bool SendGreeting = NewConnection;
@@ -1070,7 +1073,9 @@ void cSVDRP::Process(void)
         isyslog("timeout on SVDRP connection");
         Close(true);
         }
+     return true;
      }
+  return false;
 }
 
 char *cSVDRP::GetMessage(void)
diff --git a/svdrp.h b/svdrp.h
index 879fb6496..8b673df6b 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.16 2002/08/25 10:35:25 kls Exp $
+ * $Id: svdrp.h 1.17 2002/10/20 12:44:42 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -79,7 +79,7 @@ class cSVDRP {
 public:
   cSVDRP(int Port);
   ~cSVDRP();
-  void Process(void);
+  bool Process(void);
   char *GetMessage(void);
   };
 
diff --git a/timers.c b/timers.c
new file mode 100644
index 000000000..76f86a5eb
--- /dev/null
+++ b/timers.c
@@ -0,0 +1,408 @@
+/*
+ * timers.c: Timer handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: timers.c 1.1 2002/10/20 12:28:55 kls Exp $
+ */
+
+#include "timers.h"
+#include <ctype.h>
+#include "channels.h"
+#include "i18n.h"
+
+// IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
+// format characters in order to allow any number of blanks after a numeric
+// value!
+
+// -- cTimer -----------------------------------------------------------------
+
+char *cTimer::buffer = NULL;
+
+cTimer::cTimer(bool Instant)
+{
+  startTime = stopTime = 0;
+  recording = pending = false;
+  active = Instant ? taActInst : taInactive;
+  channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  time_t t = time(NULL);
+  struct tm tm_r;
+  struct tm *now = localtime_r(&t, &tm_r);
+  day = now->tm_mday;
+  start = now->tm_hour * 100 + now->tm_min;
+  stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
+  stop = (stop / 60) * 100 + (stop % 60);
+  if (stop >= 2400)
+     stop -= 2400;
+  priority = Setup.DefaultPriority;
+  lifetime = Setup.DefaultLifetime;
+  *file = 0;
+  firstday = 0;
+  summary = NULL;
+  if (Instant && channel)
+     snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
+}
+
+cTimer::cTimer(const cEventInfo *EventInfo)
+{
+  startTime = stopTime = 0;
+  recording = pending = false;
+  active = true;
+  channel = Channels.GetByServiceID(EventInfo->GetServiceID());
+  time_t tstart = EventInfo->GetTime();
+  time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
+  tstart -= Setup.MarginStart * 60;
+  struct tm tm_r;
+  struct tm *time = localtime_r(&tstart, &tm_r);
+  day = time->tm_mday;
+  start = time->tm_hour * 100 + time->tm_min;
+  time = localtime_r(&tstop, &tm_r);
+  stop = time->tm_hour * 100 + time->tm_min;
+  if (stop >= 2400)
+     stop -= 2400;
+  priority = Setup.DefaultPriority;
+  lifetime = Setup.DefaultLifetime;
+  *file = 0;
+  const char *Title = EventInfo->GetTitle();
+  if (!isempty(Title))
+     strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
+  firstday = 0;
+  summary = NULL;
+}
+
+cTimer::~cTimer()
+{
+  free(summary);
+}
+
+cTimer& cTimer::operator= (const cTimer &Timer)
+{
+  memcpy(this, &Timer, sizeof(*this));
+  if (summary)
+     summary = strdup(summary);
+  return *this;
+}
+
+bool cTimer::operator< (const cListObject &ListObject)
+{
+  cTimer *ti = (cTimer *)&ListObject;
+  time_t t1 = StartTime();
+  time_t t2 = ti->StartTime();
+  return t1 < t2 || (t1 == t2 && priority > ti->priority);
+}
+
+const char *cTimer::ToText(cTimer *Timer)
+{
+  free(buffer);
+  strreplace(Timer->file, ':', '|');
+  strreplace(Timer->summary, '\n', '|');
+  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->Channel()->Number(), PrintDay(Timer->day, Timer->firstday), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
+  strreplace(Timer->summary, '|', '\n');
+  strreplace(Timer->file, '|', ':');
+  return buffer;
+}
+
+const char *cTimer::ToText(void)
+{
+  return ToText(this);
+}
+
+int cTimer::TimeToInt(int t)
+{
+  return (t / 100 * 60 + t % 100) * 60;
+}
+
+int cTimer::ParseDay(const char *s, time_t *FirstDay)
+{
+  char *tail;
+  int d = strtol(s, &tail, 10);
+  if (FirstDay)
+     *FirstDay = 0;
+  if (tail && *tail) {
+     d = 0;
+     if (tail == s) {
+        const char *first = strchr(s, '@');
+        int l = first ? first - s : strlen(s);
+        if (l == 7) {
+           for (const char *p = s + 6; p >= s; p--) {
+               d <<= 1;
+               d |= (*p != '-');
+               }
+           d |= 0x80000000;
+           }
+        if (FirstDay && first) {
+           ++first;
+           if (strlen(first) == 10) {
+              struct tm tm_r;
+              if (3 == sscanf(first, "%d-%d-%d", &tm_r.tm_year, &tm_r.tm_mon, &tm_r.tm_mday)) {
+                 tm_r.tm_year -= 1900;
+                 tm_r.tm_mon--;
+                 tm_r.tm_hour = tm_r.tm_min = tm_r.tm_sec = 0;
+                 tm_r.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+                 *FirstDay = mktime(&tm_r);
+                 }
+              }
+           else
+              d = 0;
+           }
+        }
+     }
+  else if (d < 1 || d > 31)
+     d = 0;
+  return d;
+}
+
+const char *cTimer::PrintDay(int d, time_t FirstDay)
+{
+#define DAYBUFFERSIZE 32
+  static char buffer[DAYBUFFERSIZE];
+  if ((d & 0x80000000) != 0) {
+     char *b = buffer;
+     const char *w = tr("MTWTFSS");
+     while (*w) {
+           *b++ = (d & 1) ? *w : '-';
+           d >>= 1;
+           w++;
+           }
+     if (FirstDay) {
+        struct tm tm_r;
+        localtime_r(&FirstDay, &tm_r);
+        b += strftime(b, DAYBUFFERSIZE - (b - buffer), "@%Y-%m-%d", &tm_r);
+        }
+     *b = 0;
+     }
+  else
+     sprintf(buffer, "%d", d);
+  return buffer;
+}
+
+const char *cTimer::PrintFirstDay(void)
+{
+  if (firstday) {
+     const char *s = PrintDay(day, firstday);
+     if (strlen(s) == 18)
+        return s + 8;
+     }
+  return ""; // not NULL, so the caller can always use the result
+}
+
+bool cTimer::Parse(const char *s)
+{
+  char *buffer1 = NULL;
+  char *buffer2 = NULL;
+  free(summary);
+  summary = NULL;
+  //XXX Apparently sscanf() doesn't work correctly if the last %a argument
+  //XXX results in an empty string (this first occured when the EIT gathering
+  //XXX was put into a separate thread - don't know why this happens...
+  //XXX As a cure we copy the original string and add a blank.
+  //XXX If anybody can shed some light on why sscanf() failes here, I'd love
+  //XXX to hear about that!
+  char *s2 = NULL;
+  int l2 = strlen(s);
+  while (l2 > 0 && isspace(s[l2 - 1]))
+        l2--;
+  if (s[l2 - 1] == ':') {
+     s2 = MALLOC(char, l2 + 3);
+     strcat(strn0cpy(s2, s, l2 + 1), " \n");
+     s = s2;
+     }
+  int ch = 0;
+  if (8 <= sscanf(s, "%d :%d :%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &ch, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
+     if (summary && !*skipspace(summary)) {
+        free(summary);
+        summary = NULL;
+        }
+     //TODO add more plausibility checks
+     day = ParseDay(buffer1, &firstday);
+     strn0cpy(file, buffer2, MaxFileName);
+     strreplace(file, '|', ':');
+     strreplace(summary, '|', '\n');
+     free(buffer1);
+     free(buffer2);
+     free(s2);
+     channel = Channels.GetByNumber(ch);
+     if (!channel) {
+        esyslog("ERROR: channel %d not defined", ch);
+        return false;
+        }
+     return day != 0;
+     }
+  free(s2);
+  return false;
+}
+
+bool cTimer::Save(FILE *f)
+{
+  return fprintf(f, ToText()) > 0;
+}
+
+bool cTimer::IsSingleEvent(void)
+{
+  return (day & 0x80000000) == 0;
+}
+
+int cTimer::GetMDay(time_t t)
+{
+  struct tm tm_r;
+  return localtime_r(&t, &tm_r)->tm_mday;
+}
+
+int cTimer::GetWDay(time_t t)
+{
+  struct tm tm_r;
+  int weekday = localtime_r(&t, &tm_r)->tm_wday;
+  return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
+}
+
+bool cTimer::DayMatches(time_t t)
+{
+  return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
+}
+
+time_t cTimer::IncDay(time_t t, int Days)
+{
+  struct tm tm_r;
+  tm tm = *localtime_r(&t, &tm_r);
+  tm.tm_mday += Days; // now tm_mday may be out of its valid range
+  int h = tm.tm_hour; // save original hour to compensate for DST change
+  tm.tm_isdst = -1;   // makes sure mktime() will determine the correct DST setting
+  t = mktime(&tm);    // normalize all values
+  tm.tm_hour = h;     // compensate for DST change
+  return mktime(&tm); // calculate final result
+}
+
+time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
+{
+  struct tm tm_r;
+  tm tm = *localtime_r(&t, &tm_r);
+  tm.tm_hour = SecondsFromMidnight / 3600;
+  tm.tm_min = (SecondsFromMidnight % 3600) / 60;
+  tm.tm_sec =  SecondsFromMidnight % 60;
+  tm.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+  return mktime(&tm);
+}
+
+char *cTimer::SetFile(const char *File)
+{
+  if (!isempty(File))
+     strn0cpy(file, File, sizeof(file));
+  return file;
+}
+
+bool cTimer::Matches(time_t t)
+{
+  startTime = stopTime = 0;
+  if (t == 0)
+     t = time(NULL);
+
+  int begin  = TimeToInt(start); // seconds from midnight
+  int length = TimeToInt(stop) - begin;
+  if (length < 0)
+     length += SECSINDAY;
+
+  int DaysToCheck = IsSingleEvent() ? 61 : 7; // 61 to handle months with 31/30/31
+  for (int i = -1; i <= DaysToCheck; i++) {
+      time_t t0 = IncDay(t, i);
+      if (DayMatches(t0)) {
+         time_t a = SetTime(t0, begin);
+         time_t b = a + length;
+         if ((!firstday || a >= firstday) && t <= b) {
+            startTime = a;
+            stopTime = b;
+            break;
+            }
+         }
+      }
+  if (!startTime)
+     startTime = firstday; // just to have something that's more than a week in the future
+  else if (t > startTime || t > firstday + SECSINDAY + 3600) // +3600 in case of DST change
+     firstday = 0;
+  return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
+}
+
+time_t cTimer::StartTime(void)
+{
+  if (!startTime)
+     Matches();
+  return startTime;
+}
+
+time_t cTimer::StopTime(void)
+{
+  if (!stopTime)
+     Matches();
+  return stopTime;
+}
+
+void cTimer::SetRecording(bool Recording)
+{
+  recording = Recording;
+  isyslog("timer %d %s", Index() + 1, recording ? "start" : "stop");
+}
+
+void cTimer::SetPending(bool Pending)
+{
+  pending = Pending;
+}
+
+void cTimer::SetActive(int Active)
+{
+  active = Active;
+}
+
+void cTimer::Skip(void)
+{
+  firstday = IncDay(SetTime(StartTime(), 0), 1);
+}
+
+void cTimer::OnOff(void)
+{
+  if (IsSingleEvent())
+     active = !active;
+  else if (firstday) {
+     firstday = 0;
+     active = false;
+     }
+  else if (active)
+     Skip();
+  else
+     active = true;
+  Matches(); // refresh start and end time
+}
+
+// -- cTimers ----------------------------------------------------------------
+
+cTimers Timers;
+
+cTimer *cTimers::GetTimer(cTimer *Timer)
+{
+  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (ti->Channel() == Timer->Channel() && ti->Day() == Timer->Day() && ti->Start() == Timer->Start() && ti->Stop() == Timer->Stop())
+         return ti;
+      }
+  return NULL;
+}
+
+cTimer *cTimers::GetMatch(time_t t)
+{
+  cTimer *t0 = NULL;
+  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (!ti->Recording() && ti->Matches(t)) {
+         if (!t0 || ti->Priority() > t0->Priority())
+            t0 = ti;
+         }
+      }
+  return t0;
+}
+
+cTimer *cTimers::GetNextActiveTimer(void)
+{
+  cTimer *t0 = NULL;
+  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (ti->Active() && (!t0 || *ti < *t0))
+         t0 = ti;
+      }
+  return t0;
+}
diff --git a/timers.h b/timers.h
new file mode 100644
index 000000000..8dc762e3d
--- /dev/null
+++ b/timers.h
@@ -0,0 +1,91 @@
+/*
+ * timers.h: Timer handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: timers.h 1.1 2002/10/20 11:52:23 kls Exp $
+ */
+
+#ifndef __TIMERS_H
+#define __TIMERS_H
+
+#include "channels.h"
+#include "config.h"
+#include "tools.h"
+
+enum eTimerActive { taInactive = 0,
+                    taActive   = 1,
+                    taInstant  = 2,
+                    taActInst  = (taActive | taInstant)
+                  };
+
+class cTimer : public cListObject {
+  friend class cMenuEditTimer;
+private:
+  time_t startTime, stopTime;
+  static char *buffer;
+  bool recording, pending;
+  int active;
+  cChannel *channel;
+  int day;
+  int start;
+  int stop;
+  int priority;
+  int lifetime;
+  char file[MaxFileName];
+  time_t firstday;
+  char *summary;
+  static const char *ToText(cTimer *Timer);
+public:
+  cTimer(bool Instant = false);
+  cTimer(const cEventInfo *EventInfo);
+  virtual ~cTimer();
+  cTimer& operator= (const cTimer &Timer);
+  virtual bool operator< (const cListObject &ListObject);
+  bool Recording(void) { return recording; }
+  bool Pending(void) { return pending; }
+  int Active(void) { return active; }
+  const cChannel *Channel(void) { return channel; }
+  int Day(void) { return day; }
+  int Start(void) { return start; }
+  int Stop(void) { return stop; }
+  int Priority(void) { return priority; }
+  int Lifetime(void) { return lifetime; }
+  const char *File(void) { return file; }
+  time_t FirstDay(void) { return firstday; }
+  const char *Summary(void) { return summary; }
+  const char *ToText(void);
+  bool Parse(const char *s);
+  bool Save(FILE *f);
+  bool IsSingleEvent(void);
+  int GetMDay(time_t t);
+  int GetWDay(time_t t);
+  bool DayMatches(time_t t);
+  static time_t IncDay(time_t t, int Days);
+  static time_t SetTime(time_t t, int SecondsFromMidnight);
+  char *SetFile(const char *File);
+  bool Matches(time_t t = 0);
+  time_t StartTime(void);
+  time_t StopTime(void);
+  void SetRecording(bool Recording);
+  void SetPending(bool Pending);
+  void SetActive(int Active);
+  void Skip(void);
+  void OnOff(void);
+  const char *PrintFirstDay(void);
+  static int TimeToInt(int t);
+  static int ParseDay(const char *s, time_t *FirstDay = NULL);
+  static const char *PrintDay(int d, time_t FirstDay = 0);
+  };
+
+class cTimers : public cConfig<cTimer> {
+public:
+  cTimer *GetTimer(cTimer *Timer);
+  cTimer *GetMatch(time_t t);
+  cTimer *GetNextActiveTimer(void);
+  };
+
+extern cTimers Timers;
+
+#endif //__TIMERS_H
diff --git a/tools.c b/tools.c
index b3b64fc9c..df2d57051 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.71 2002/09/09 21:35:49 kls Exp $
+ * $Id: tools.c 1.72 2002/10/19 12:32:53 kls Exp $
  */
 
 #include "tools.h"
@@ -207,6 +207,13 @@ bool isempty(const char *s)
   return !(s && *skipspace(s));
 }
 
+int numdigits(int n)
+{
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%d", n);
+  return strlen(buf);
+}
+
 int time_ms(void)
 {
   static time_t t0 = 0;
diff --git a/tools.h b/tools.h
index f8bf43f28..08f2429b4 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.50 2002/09/08 10:22:29 kls Exp $
+ * $Id: tools.h 1.51 2002/10/19 12:31:50 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -64,6 +64,7 @@ const char *strescape(const char *s, const char *chars); // returns a statically
 bool startswith(const char *s, const char *p);
 bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
+int numdigits(int n);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
diff --git a/transfer.c b/transfer.c
index adb726059..ddfb28cb0 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.4 2002/10/12 13:32:48 kls Exp $
+ * $Id: transfer.c 1.6 2002/10/26 10:17:17 kls Exp $
  */
 
 #include "transfer.h"
@@ -17,7 +17,7 @@
 // --- cTransfer -------------------------------------------------------------
 
 cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cReceiver(0, 0, 5, VPid, APid1, APid2, DPid1, DPid2)
+:cReceiver(0, -1, 5, VPid, APid1, APid2, DPid1, DPid2)
 {
   ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
@@ -155,7 +155,7 @@ int cTransfer::NumAudioTracks(void) const
   return canToggleAudioTrack ? 2 : 1;
 }
 
-const char **cTransfer::GetAudioTracks(int *CurrentTrack = NULL) const
+const char **cTransfer::GetAudioTracks(int *CurrentTrack) const
 {
   if (NumAudioTracks()) {
      if (CurrentTrack)
diff --git a/vdr.5 b/vdr.5
index ccb7b924e..2db8a7b6c 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.8 2002/10/13 12:14:49 kls Exp $
+.\" $Id: vdr.5 1.11 2002/10/27 15:36:44 kls Exp $
 .\"
-.TH vdr 5 "7 Sep 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "7 Oct 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -26,12 +26,22 @@ character, followed by arbitrary text. Example:
 
 \fB:First group\fR
 
+Group delimiters may also be used to specify the number of the next channel.
+To do this, the character '@' and a number must immediately follow the ':',
+as in
+
+\fB:@201 First group\fR
+
+The given number must be larger than the number of any previous channel
+(otherwise it is silently ignored).
+
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
 \fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003\fR
 
-The line number of a channel definition (not counting group separators!)
+The line number of a channel definition (not counting group separators,
+and based on a possible previous '@...' parameter)
 defines the channel's number in OSD menus and the \fItimers.conf\fR file.
 
 The fields in a channel definition have the following meaning (from left
@@ -42,7 +52,9 @@ The channel's name (if the name originally contains a ':' character
 it has to be replaced by '|').
 .TP
 .B Frequency
-The transponder frequency in MHz for DVB-S and DVB-C, kHz for DVB-T (as an integer).
+The transponder frequency (as an integer). For DVB-S this value is in MHz. For DVB-C
+and DVB-T it can be given either in MHz, kHz or Hz (the actual value given will be
+multiplied by 1000 until it is larger than 1000000).
 .TP
 .B Parameters
 Various parameters, depending on whether this is a DVB-S, DVB-C or DVB-T channel.
@@ -311,6 +323,20 @@ PC keyboard, RCU for the home-built "Remote Control Unit", or LIRC for the
 "Linux Infrared Remote Control"), \fBkey\fR is the name of the key that is
 defined (like Up, Down, Menu etc.), and \fBcode\fR is a character string that
 this remote control delivers when the given key is pressed.
+.SS KEY MACROS
+The file \fIkeymacros.conf\fR contains user defined macros that will be executed
+whenever the given key is pressed. The format is
+
+\fBmacrokey  key1 key2 key3...\fR
+
+where \fBmacrokey\fR is the key that shall initiate execution of this macro
+and can be one of \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR or
+\fIUser1\fR...\fIUser9\fR. The rest of the line consists of a set of
+keys, which will be executed just as if they had been pressed in the given
+sequence. Note that the color keys will only execute their macro function
+in "normal viewing" mode (i.e. when no other menu or player is active). The
+\fIUser1\fR...\fIUser9\fR keys will always execute their macro function.
+There may be up to 15 keys in such a key sequence.
 .SS COMMANDS
 The file \fIcommands.conf\fR contains the definitions of commands that can
 be executed from the \fBvdr\fR main menu's "Commands" option.
diff --git a/vdr.c b/vdr.c
index beeee8894..41d204776 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.127 2002/10/13 12:13:19 kls Exp $
+ * $Id: vdr.c 1.130 2002/10/27 15:20:56 kls Exp $
  */
 
 #include <getopt.h>
@@ -47,6 +47,7 @@
 #include "rcu.h"
 #include "recording.h"
 #include "sources.h"
+#include "timers.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -323,6 +324,7 @@ int main(int argc, char *argv[])
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
   CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
   Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
+  KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
 
   // DVB interfaces:
 
@@ -455,6 +457,26 @@ int main(int argc, char *argv[])
                Menu = new cMenuMain(cControl::Control());
                Temp = NULL;
                break;
+          #define DirectMainFunction(function)\
+            DELETENULL(Menu);\
+            if (cControl::Control())\
+               cControl::Control()->Hide();\
+            Menu = new cMenuMain(cControl::Control(), function);\
+            Temp = NULL;
+          case kSchedule:   DirectMainFunction(osSchedule); break;
+          case kChannels:   DirectMainFunction(osChannels); break;
+          case kTimers:     DirectMainFunction(osTimers); break;
+          case kRecordings: DirectMainFunction(osRecordings); break;
+          case kSetup:      DirectMainFunction(osSetup); break;
+          case kCommands:   DirectMainFunction(osCommands); break;
+          case kUser1 ... kUser9: cRemote::PutMacro(key); break;
+          // Channel up/down:
+          case kChanUp|k_Repeat:
+          case kChanUp:
+          case kChanDn|k_Repeat:
+          case kChanDn:
+               cDevice::SwitchChannel(NORMALKEY(key) == kChanUp ? 1 : -1);
+               break;
           // Volume Control:
           case kVolUp|k_Repeat:
           case kVolUp:
@@ -486,81 +508,99 @@ int main(int argc, char *argv[])
                           }
                        LastActivity = 1; // not 0, see below!
                        break;
-          default:
-            if (Interact) {
-               switch (Interact->ProcessKey(key)) {
-                 case osRecord: DELETENULL(Menu);
-                                Temp = NULL;
-                                if (!cRecordControls::Start())
-                                   Interface->Error(tr("No free DVB device to record!"));
-                                break;
-                 case osRecordings:
-                                DELETENULL(Menu);
-                                cControl::Shutdown();
-                                Temp = NULL;
-                                Menu = new cMenuMain(false, osRecordings);
-                                break;
-                 case osReplay: DELETENULL(Menu);
-                                cControl::Shutdown();
-                                Temp = NULL;
-                                cControl::Launch(new cReplayControl);
-                                break;
-                 case osStopReplay:
-                                DELETENULL(Menu);
-                                cControl::Shutdown();
-                                Temp = NULL;
-                                break;
-                 case osSwitchDvb:
-                                DELETENULL(Menu);
-                                cControl::Shutdown();
-                                Temp = NULL;
-                                Interface->Info(tr("Switching primary DVB..."));
-                                cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
-                                break;
-                 case osBack:
-                 case osEnd:    if (Interact == Menu)
-                                   DELETENULL(Menu);
-                                else
-                                   cControl::Shutdown();
-                                Temp = NULL;
-                                break;
-                 default:       ;
-                 }
-               }
-            else {
-               // Key functions in "normal" viewing mode:
-               switch (key) {
-                 // Toggle channels:
-                 case k0: {
-                      int CurrentChannel = cDevice::CurrentChannel();
-                      Channels.SwitchTo(PreviousChannel);
-                      PreviousChannel = CurrentChannel;
-                      break;
-                      }
-                 // Direct Channel Select:
-                 case k1 ... k9:
-                      Menu = new cDisplayChannel(key);
-                      break;
-                 // Left/Right rotates trough channel groups:
-                 case kLeft|k_Repeat:
-                 case kLeft:
-                 case kRight|k_Repeat:
-                 case kRight:
-                      Menu = new cDisplayChannel(NORMALKEY(key));
-                      break;
-                 // Up/Down Channel Select:
-                 case kUp|k_Repeat:
-                 case kUp:
-                 case kDown|k_Repeat:
-                 case kDown:
-                      cDevice::SwitchChannel(NORMALKEY(key) == kUp ? 1 : -1);
-                      break;
-                 // Viewing Control:
-                 case kOk:   LastChannel = -1; break; // forces channel display
-                 default:    break;
-                 }
-               }
+          default: break;
           }
+        Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
+        if (Interact) {
+           eOSState state = Interact->ProcessKey(key);
+           if (state == osUnknown && ISMODELESSKEY(key) && cControl::Control() && Interact != cControl::Control())
+              state = cControl::Control()->ProcessKey(key);
+           switch (state) {
+             case osRecord: DELETENULL(Menu);
+                            Temp = NULL;
+                            if (cRecordControls::Start())
+                               Interface->Info(tr("Recording"));
+                            else
+                               Interface->Error(tr("No free DVB device to record!"));
+                            break;
+             case osRecordings:
+                            DELETENULL(Menu);
+                            cControl::Shutdown();
+                            Temp = NULL;
+                            Menu = new cMenuMain(false, osRecordings);
+                            break;
+             case osReplay: DELETENULL(Menu);
+                            cControl::Shutdown();
+                            Temp = NULL;
+                            cControl::Launch(new cReplayControl);
+                            break;
+             case osStopReplay:
+                            DELETENULL(Menu);
+                            cControl::Shutdown();
+                            Temp = NULL;
+                            break;
+             case osSwitchDvb:
+                            DELETENULL(Menu);
+                            cControl::Shutdown();
+                            Temp = NULL;
+                            Interface->Info(tr("Switching primary DVB..."));
+                            cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
+                            break;
+             case osBack:
+             case osEnd:    if (Interact == Menu)
+                               DELETENULL(Menu);
+                            else
+                               cControl::Shutdown();
+                            Temp = NULL;
+                            break;
+             default:       ;
+             }
+           }
+        else {
+           // Key functions in "normal" viewing mode:
+           switch (key) {
+             // Toggle channels:
+             case k0: {
+                  int CurrentChannel = cDevice::CurrentChannel();
+                  Channels.SwitchTo(PreviousChannel);
+                  PreviousChannel = CurrentChannel;
+                  break;
+                  }
+             // Direct Channel Select:
+             case k1 ... k9:
+                  Menu = new cDisplayChannel(key);
+                  break;
+             // Left/Right rotates trough channel groups:
+             case kLeft|k_Repeat:
+             case kLeft:
+             case kRight|k_Repeat:
+             case kRight:
+                  Menu = new cDisplayChannel(NORMALKEY(key));
+                  break;
+             // Up/Down Channel Select:
+             case kUp|k_Repeat:
+             case kUp:
+             case kDown|k_Repeat:
+             case kDown:
+                  cDevice::SwitchChannel(NORMALKEY(key) == kUp ? 1 : -1);
+                  break;
+             // Viewing Control:
+             case kOk:   LastChannel = -1; break; // forces channel display
+             // Instant recording:
+             case kRecord:
+                  if (cRecordControls::Start())
+                     Interface->Info(tr("Recording"));
+                  else
+                     Interface->Error(tr("No free DVB device to record!"));
+                  break;
+             // Key macros:
+             case kRed:
+             case kGreen:
+             case kYellow:
+             case kBlue: cRemote::PutMacro(key); break;
+             default:    break;
+             }
+           }
         if (!Menu) {
            EITScanner.Process();
            if (!cCutter::Active() && cCutter::Ended()) {
@@ -603,8 +643,8 @@ int main(int argc, char *argv[])
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
-                       int Channel = timer ? timer->channel : 0;
-                       const char *File = timer ? timer->file : "";
+                       int Channel = timer ? timer->Channel()->Number() : 0;
+                       const char *File = timer ? timer->File() : "";
                        char *cmd;
                        asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
                        isyslog("executing '%s'", cmd);

From 1a8a081629b736572a8f6489428975cf54448e67 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Nov 2002 18:00:00 +0100
Subject: [PATCH 056/307] Version 1.1.15 - Completely switched to the new CVS
 HEAD version of the linux-dvb driver.   The NEWSTRUCT compile time switch is
 now obsolete. The required driver is now   the CVS HEAD version dated
 2002-11-01 or later. - Adjusted the INSTALL file to the 1.1.x version. - Only
 accepting key presses from the current remote control when learning (thanks
 to   Oliver Endriss). - Fixed the EPG scanner, which broke 'Transfer Mode' as
 soon as it kicked in   (thanks to Oliver Endriss for reporting this one). -
 Fixed handling audio tracks in cDvbDevice. - Updated channels.conf.terr
 (thanks to Uwe Scheffler). - Fixed displaying the group separators in the
 channel display (thanks to Martin   Hammerschmid for pointing out this one).
 - The Makefile now includes the file Make.config (if present in the VDR
 source   directory), which allows the user to overwrite several settings with
 individual   values (suggested by Andreas Schultz). The VDR distribution
 archive does not   contain this file in order to not overwrite a user defined
 file. There is a   Make.config.template which contains the default values of
 the macros the user   can overwrite. - Since there have been changes to the
 'newplugin' script authors of plugins   may want to newly create their
 plugins' Makefiles with the new version of this   script, and adapt them to
 their individual needs (make sure you don't overwrite   your existing plugin
 directory - make a backup copy first!). - Fixed reading EPG data via the
 SVDRP command PUTE (it changed the current   service ID). - Fixed closing all
 dup'ed file descriptors in cPipe. - Implemented a plugin interface for
 additional audio processing (see PLUGINS.html   under "Dolby Digital").   The
 functionality of the '-a' command line option has been reactivated.   Since
 the author doesn't have any Dolby Digital equipment this may or may not  
 work as expected. There may still be some places where a call to
 cAudios::Clear()   or cAudios::Mute() is necessary. Those with Dolby Digital
 equipment should please   take a look at this and maybe send patches.  
 Replaying Dolby Digital in ways other than through VDR's '-a' option will
 have to   be implemented as plugins. Those who have written patches for VDR
 version 1.0.x   should convert their work into the proper plugins for version
 1.1.x.   Note to authors of cPlayer derived plugins: please read the modified
 comments   in device.h regarding the member functions cDevice::Clear(),
 cDevice::Mute() and   cDevice::PlayAudio(). Derived classes must call these
 base class member functions   to make sure all registered cAudio objects are
 properly handled. Also note that   the return type of cDevice::PlayAudio()
 has been changed to 'void', since this   function always has to accept the
 entire data block immediately and there is   nothing that could be reasonably
 done in case an error occurs in one of the   cAudio objects. - Now checking
 the driver's DVB_API_VERSION in dvbdevice.h. Since VDR now requires   a
 driver dated 2002-11-01 or later the MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT and
   DVB_DRIVER_VERSION stuff has been replaced with
 DO_REC_AND_PLAY_ON_PRIMARY_DEVICE,   which can be used to disable
 simultaneous recording and replaying on the primary   DVB device in case
 there are problems with this.

---
 CONTRIBUTORS                |   6 ++
 HISTORY                     |  51 +++++++++
 INSTALL                     |  17 ++-
 Make.config.template        |  25 +++++
 Makefile                    |   9 +-
 PLUGINS.html                |  78 +++++++++++---
 PLUGINS/SRC/hello/HISTORY   |   7 ++
 PLUGINS/SRC/hello/Makefile  |  26 +++--
 PLUGINS/SRC/hello/hello.c   |   4 +-
 PLUGINS/SRC/status/HISTORY  |   7 ++
 PLUGINS/SRC/status/Makefile |  26 +++--
 PLUGINS/SRC/status/status.c |   4 +-
 audio.c                     |  89 +++++++++++++++-
 audio.h                     |  44 +++++++-
 channels.c                  |  70 ++++---------
 channels.conf.terr          |  30 ++----
 config.c                    |   5 +-
 config.h                    |   4 +-
 device.c                    |  18 ++--
 device.h                    |  12 ++-
 dvbdevice.c                 | 200 +++---------------------------------
 dvbdevice.h                 |  18 ++--
 dvbosd.h                    |   6 +-
 dvbplayer.c                 |   4 +-
 eit.c                       |  38 +++----
 eit.h                       |   3 +-
 eitscan.c                   |   4 +-
 interface.c                 |   6 +-
 menu.c                      |   8 +-
 newplugin                   |  26 +++--
 player.c                    |  11 +-
 player.h                    |   6 +-
 remote.c                    |   6 +-
 remote.h                    |   6 +-
 remux.h                     |   6 +-
 thread.c                    |  10 +-
 transfer.c                  |   4 +-
 vdr.c                       |  18 ++--
 38 files changed, 481 insertions(+), 431 deletions(-)
 create mode 100644 Make.config.template

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7b75ac85a..399ba30d7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -47,6 +47,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
  for adding a missing #include to ringbuffer.c
  for adding a missing 'public' keyword in device.h
+ for pointing out a bug in displaying the group separators in the channel display
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
@@ -184,6 +185,7 @@ Andreas Schultz <aschultz@warp10.net>
  for reporting a problem with plugin Makefiles and the NEWSTRUCT driver
  for pointing out some unnecessary #includes in eit.c and a problem with
  cMenuRecordings::Del(), which caused warnings with gcc-3.2
+ for suggesting a Make.config file
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -426,6 +428,10 @@ Oliver Endriss <o.endriss@gmx.de>
  one remote control
  for reporting a crash when learning the keys of several remote controls and
  pressing buttons of those that have already been learned
+ for making the remote control learn procedure accept key presses only from the
+ current remote control
+ for reporting a bug in the EPG scanner, which broke 'Transfer Mode' as soon as
+ it kicked in
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 536ea2890..dc276f519 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1670,3 +1670,54 @@ Video Disk Recorder Revision History
 - Fixed a crash when learning the keys of several remote controls and pressing
   buttons of those that have already been learned (thanks to Oliver Endriss for
   reporting this one).
+
+2002-11-03: Version 1.1.15
+
+- Completely switched to the new CVS HEAD version of the linux-dvb driver.
+  The NEWSTRUCT compile time switch is now obsolete. The required driver is now
+  the CVS HEAD version dated 2002-11-01 or later.
+- Adjusted the INSTALL file to the 1.1.x version.
+- Only accepting key presses from the current remote control when learning (thanks to
+  Oliver Endriss).
+- Fixed the EPG scanner, which broke 'Transfer Mode' as soon as it kicked in
+  (thanks to Oliver Endriss for reporting this one).
+- Fixed handling audio tracks in cDvbDevice.
+- Updated channels.conf.terr (thanks to Uwe Scheffler).
+- Fixed displaying the group separators in the channel display (thanks to Martin
+  Hammerschmid for pointing out this one).
+- The Makefile now includes the file Make.config (if present in the VDR source
+  directory), which allows the user to overwrite several settings with individual
+  values (suggested by Andreas Schultz). The VDR distribution archive does not
+  contain this file in order to not overwrite a user defined file. There is a
+  Make.config.template which contains the default values of the macros the user
+  can overwrite.
+- Since there have been changes to the 'newplugin' script authors of plugins
+  may want to newly create their plugins' Makefiles with the new version of this
+  script, and adapt them to their individual needs (make sure you don't overwrite
+  your existing plugin directory - make a backup copy first!).
+- Fixed reading EPG data via the SVDRP command PUTE (it changed the current
+  service ID).
+- Fixed closing all dup'ed file descriptors in cPipe.
+- Implemented a plugin interface for additional audio processing (see PLUGINS.html
+  under "Dolby Digital").
+  The functionality of the '-a' command line option has been reactivated.
+  Since the author doesn't have any Dolby Digital equipment this may or may not
+  work as expected. There may still be some places where a call to cAudios::Clear()
+  or cAudios::Mute() is necessary. Those with Dolby Digital equipment should please
+  take a look at this and maybe send patches.
+  Replaying Dolby Digital in ways other than through VDR's '-a' option will have to
+  be implemented as plugins. Those who have written patches for VDR version 1.0.x
+  should convert their work into the proper plugins for version 1.1.x.
+  Note to authors of cPlayer derived plugins: please read the modified comments
+  in device.h regarding the member functions cDevice::Clear(), cDevice::Mute() and
+  cDevice::PlayAudio(). Derived classes must call these base class member functions
+  to make sure all registered cAudio objects are properly handled. Also note that
+  the return type of cDevice::PlayAudio() has been changed to 'void', since this
+  function always has to accept the entire data block immediately and there is
+  nothing that could be reasonably done in case an error occurs in one of the
+  cAudio objects.
+- Now checking the driver's DVB_API_VERSION in dvbdevice.h. Since VDR now requires
+  a driver dated 2002-11-01 or later the MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT and
+  DVB_DRIVER_VERSION stuff has been replaced with DO_REC_AND_PLAY_ON_PRIMARY_DEVICE,
+  which can be used to disable simultaneous recording and replaying on the primary
+  DVB device in case there are problems with this.
diff --git a/INSTALL b/INSTALL
index 2ceda924f..da99593c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,9 +13,9 @@ extracted into the directory /home/kls/vdr/DVB, then this
 package should be extracted into /home/kls/vdr/VDR.
 If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
-Makefile.
+Makefile (see the file Make.config.template).
 
-VDR requires the Linux-DVB card driver version dated 2001-09-14 or higher
+VDR requires the Linux-DVB card driver version dated 2002-11-01 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
@@ -306,8 +306,8 @@ Setting up DiSEqC:
 
 If you are using a DVB-S card with a satellite equipment that needs to be
 accessed using DiSEqC, you have to go to the "Setup" menu and set the "DiSEqC"
-parameter to "on". Also check the "DiSEqC" parameters for the various channels
-and set them to the necessary values.
+parameter to "on". You also need to set up the file 'diseqc.conf' to properly
+access your DiSEqC equipment (see man vdr(5) for details).
 
 Running VDR with DVB-C (cable) or DVB-T (terrestrial):
 ------------------------------------------------------
@@ -318,14 +318,13 @@ cable or terrestrial reception is the 'channels.conf' file. The distribution
 archive contains a default 'channels.conf.cable' and 'channels.conf.terr',
 respectively, which users of such cards can rename or copy to 'channels.conf'
 in order to receive digital cable or terrestrial channels. The format of these
-files is exactly the same as for satellite channels (the fields containing
-"Polarization" and "Diseqc" data are ignored in case of DVB-C and DVB-T, and
-the "Frequency" is in kHz in case of DVB-T).
+files is mostly the same as for satellite channels, however, some fields have
+different or extended meanings (see man vdr(5) for details).
 
 You can even use a mixture of DVB-S, DVB-C and DVB-T cards in the same system.
 All you need to do is to put all the channel definitions into one big
-'channels.conf' file and set the 'Ca' parameter of each channel to the number
-of the card that can receive it.
+'channels.conf' file. VDR will automatically know which channels can be
+received with which card(s) by evaluating the 'source' parameter.
 
 Learning the remote control keys:
 ---------------------------------
diff --git a/Make.config.template b/Make.config.template
new file mode 100644
index 000000000..774abbf7e
--- /dev/null
+++ b/Make.config.template
@@ -0,0 +1,25 @@
+#
+# User defined Makefile options for the Video Disk Recorder
+#
+# Copy this file to 'Make.config' and change the parameters as necessary.
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: Make.config.template 1.1 2002/11/01 14:05:36 kls Exp $
+
+### The C compiler and options:
+
+CC       = gcc
+CFLAGS   = -O2
+
+CXX      = g++
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR   = ../DVB
+MANDIR   = /usr/local/man
+BINDIR   = /usr/local/bin
+
+VIDEODIR = /video
diff --git a/Makefile b/Makefile
index 6b88356b2..c6e891f40 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.49 2002/10/19 15:46:08 kls Exp $
+# $Id: Makefile 1.51 2002/11/01 13:11:53 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -23,12 +23,9 @@ PLUGINDIR= ./PLUGINS
 
 VIDEODIR = /video
 
-ifdef NEWSTRUCT
+-include Make.config
+
 INCLUDES = -I$(DVBDIR)/include
-DEFINES += -DNEWSTRUCT
-else
-INCLUDES = -I$(DVBDIR)/ost/include
-endif
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 3a26783b1..ccd3fcf6c 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>inside</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.11 are marked like this.
-<!--X1.1.11--></td></tr></table>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.12 are marked like this.
 <!--X1.1.12--></td></tr></table>
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.13 are marked like this.
 <!--X1.1.13--></td></tr></table>
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.14 are marked like this.
 <!--X1.1.14--></td></tr></table>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.15 are marked like this.
+<!--X1.1.15--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -964,7 +964,7 @@
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p>
 If the player can provide more than a single audio track, it can implement the
 following functions to make them available:
@@ -977,7 +977,16 @@
 
 <!--X1.1.13--></td></tr></table>
 <p>
-TODO: PlayAudio()???
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+If there is an additional audio track that has to be replayed with external hardware,
+the player shall call its member function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+void PlayAudio(const uchar *Data, int Length);
+</pre></td></tr></table><p>
+
+where <tt>Data</tt> points to a complete audio PES packet of <tt>Length</tt> bytes.
+<!--X1.1.15--></td></tr></table>
 <p>
 The second part needed here is a control object that receives user input from the main
 program loop and reacts on this by telling the player what to do:
@@ -1196,7 +1205,7 @@
 selecting which channel it shall tune to:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.12--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool ProvidesSource(int Source) const;
 <!--X1.1.12--></td></tr></table>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
@@ -1206,7 +1215,7 @@
 These functions will be called with the desired source or channel and shall return whether
 this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p>
 <b>Audio selection</b>
 <p>
@@ -1253,7 +1262,7 @@
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual bool CanReplay(void) const;
 <!--X1.1.14--></td></tr></table>
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1315,7 +1324,51 @@
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.11--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>Dolby Digital</h2>
+
+<center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
+
+There are many different ways to replay additional audio tracks, like Dolby Digital.
+So VDR offers a plugin interface that allows for the implementation of any kind of
+audio replay facility.
+<p>
+To implement a new audio output facility, simply derive a class from <tt>cAudio</tt>,
+as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/audio.h&gt;
+#include &lt;vdr/thread.h&gt;
+
+class cMyAudio : public cAudio, private cThread {
+private:
+  virtual void Action(void);
+public:
+  cMyAudio(void);
+  virtual void Play(const uchar *Data, int Length);
+  virtual void Mute(bool On);
+  virtual void Clear(void);
+  };
+</pre></td></tr></table><p>
+
+You should create your derived audio object in the
+<a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
+Note that the object has to be created on the heap (using <tt>new</tt>),
+and you shall not delete it at any point (it will be deleted automatically
+when the program ends).
+<p>
+The <tt>Play()</tt> function will be offered complete audio PES packets
+and has to accept each packet immediately. It must return as soon as possible,
+in order to not delay the overall replay process. Therefore you may want to
+also derive your class from <tt>cThread</tt> and run the actual audio processing
+as a separate thread. Note that the offered data is only valid within the call
+to <tt>Play()</tt>, so if you can't process the entire block immediately, you
+will need to copy it for later processing in your thread.
+<p>
+The <tt>Mute()</tt> and <tt>Clear()</tt> functions will be called whenever the audio shall
+be muted, or any buffered data shall be cleared, respectively.
+<!--X1.1.15--></td></tr></table>
+
 <hr><h2>Remote Control</h2>
 
 <center><i><b>The joy of zapping!</b></i></center><p>
@@ -1427,7 +1480,6 @@
 </pre></td></tr></table><p>
 
 The other parameters have the same meaning as in the first version of this function.
-<!--X1.1.11--></td></tr></table>
 
 </body>
 </html>
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index 10d905e24..8639e056e 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -30,3 +30,10 @@ VDR Plugin 'hello' Revision History
 2002-10-26: Version 0.0.7
 
 - Fixed a typo.
+
+2002-11-01: Version 0.0.8
+
+- Completely switched to the new CVS HEAD version of the linux-dvb driver.
+  The NEWSTRUCT compile time switch is now obsolete. The required driver is now
+  the CVS HEAD version dated 2002-11-01 or later.
+- Introduced Make.config.
diff --git a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
index 802889bee..92ac45f82 100644
--- a/PLUGINS/SRC/hello/Makefile
+++ b/PLUGINS/SRC/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.5 2002/09/17 15:36:36 kls Exp $
+# $Id: Makefile 1.7 2002/11/01 13:44:11 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -13,19 +13,22 @@ PLUGIN = hello
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
+DVBDIR = ../../../../DVB
 VDRDIR = ../../..
-VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
 ### The version number of VDR (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
@@ -37,7 +40,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -45,11 +48,6 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o i18n.o
 
-### The C++ compiler and options:
-
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
-
 ### Implicit rules:
 
 %.o: %.c
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 5073e3000..6583285eb 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.8 2002/10/26 14:34:48 kls Exp $
+ * $Id: hello.c 1.9 2002/11/01 10:16:53 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.0.8";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
index b66f6540f..45d42fbff 100644
--- a/PLUGINS/SRC/status/HISTORY
+++ b/PLUGINS/SRC/status/HISTORY
@@ -16,3 +16,10 @@ VDR Plugin 'status' Revision History
 2002-10-26: Version 0.0.4
 
 - Fixed a typo.
+
+2002-11-01: Version 0.0.5
+
+- Completely switched to the new CVS HEAD version of the linux-dvb driver.
+  The NEWSTRUCT compile time switch is now obsolete. The required driver is now
+  the CVS HEAD version dated 2002-11-01 or later.
+- Introduced Make.config.
diff --git a/PLUGINS/SRC/status/Makefile b/PLUGINS/SRC/status/Makefile
index f08f22cca..00fd97b52 100644
--- a/PLUGINS/SRC/status/Makefile
+++ b/PLUGINS/SRC/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.3 2002/09/21 08:38:39 kls Exp $
+# $Id: Makefile 1.5 2002/11/01 13:44:25 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -13,19 +13,22 @@ PLUGIN = status
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
+DVBDIR = ../../../../DVB
 VDRDIR = ../../..
-VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
 ### The version number of VDR (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
@@ -37,7 +40,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -45,11 +48,6 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
-### The C++ compiler and options:
-
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
-
 ### Implicit rules:
 
 %.o: %.c
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
index 15a3ee96e..12e64b7be 100644
--- a/PLUGINS/SRC/status/status.c
+++ b/PLUGINS/SRC/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.4 2002/10/26 14:34:53 kls Exp $
+ * $Id: status.c 1.5 2002/11/01 10:16:59 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "0.0.5";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/audio.c b/audio.c
index 226505b4f..c958256d9 100644
--- a/audio.c
+++ b/audio.c
@@ -4,8 +4,95 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 1.1 2002/05/30 11:08:54 kls Exp $
+ * $Id: audio.c 1.2 2002/11/03 11:53:34 kls Exp $
  */
 
 #include "audio.h"
+#include "stdlib.h"
 
+// --- cAudio ----------------------------------------------------------------
+
+cAudio::cAudio(void)
+{
+  Audios.Add(this);
+}
+
+cAudio::~cAudio()
+{
+}
+
+// --- cAudios ---------------------------------------------------------------
+
+cAudios Audios;
+
+void cAudios::PlayAudio(const uchar *Data, int Length)
+{
+  for (cAudio *audio = First(); audio; audio = Next(audio))
+      audio->Play(Data, Length);
+}
+
+void cAudios::MuteAudio(bool On)
+{
+  for (cAudio *audio = First(); audio; audio = Next(audio))
+      audio->Mute(On);
+}
+
+void cAudios::ClearAudio(void)
+{
+  for (cAudio *audio = First(); audio; audio = Next(audio))
+      audio->Clear();
+}
+
+// --- cExternalAudio --------------------------------------------------------
+
+cExternalAudio::cExternalAudio(const char *Command)
+{
+  command = strdup(Command);
+  mute = false;
+}
+
+cExternalAudio::~cExternalAudio()
+{
+  free(command);
+}
+
+void cExternalAudio::Play(const uchar *Data, int Length)
+{
+  if (command && !mute) {
+     if (pipe || pipe.Open(command, "w")) {
+        if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01) {
+           if (Data[3] == 0xBD) { // dolby
+              //XXX??? int written = Data[8] + (skipAC3bytes ? 13 : 9); // skips the PES header
+              int written = Data[8] + 9; // skips the PES header
+              Length -= written;
+              while (Length > 0) {
+                    int w = fwrite(Data + written, 1, Length, pipe);
+                    if (w < 0) {
+                       LOG_ERROR;
+                       break;
+                       }
+                    Length -= w;
+                    written += w;
+                    }
+              }
+           }
+        }
+     else {
+        esyslog("ERROR: can't open pipe to audio command '%s'", command);
+        free(command);
+        command = NULL;
+        }
+     }
+}
+
+void cExternalAudio::Mute(bool On)
+{
+  mute = On;
+  if (mute)
+     Clear();
+}
+
+void cExternalAudio::Clear(void)
+{
+  pipe.Close();
+}
diff --git a/audio.h b/audio.h
index 545a0afdc..565bd9721 100644
--- a/audio.h
+++ b/audio.h
@@ -4,10 +4,52 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.h 1.1 2002/05/30 11:07:28 kls Exp $
+ * $Id: audio.h 1.2 2002/11/03 11:50:02 kls Exp $
  */
 
 #ifndef __AUDIO_H
 #define __AUDIO_H
 
+#include "thread.h"
+#include "tools.h"
+
+class cAudio : public cListObject {
+protected:
+  cAudio(void);
+public:
+  virtual ~cAudio();
+  virtual void Play(const uchar *Data, int Length) = 0;
+       // Plays the given block of audio Data. Must return as soon as possible.
+       // If the entire block of data can't be processed immediately, it must
+       // be copied and processed in a separate thread. The Data is always a
+       // complete PES audio packet.
+  virtual void Mute(bool On) = 0;
+       // Immediately sets the audio device to be silent (On==true) or to
+       // normal replay (On==false).
+  virtual void Clear(void) = 0;
+       // Clears all data that might still be awaiting processing.
+  };
+
+class cAudios : public cList<cAudio> {
+public:
+  void PlayAudio(const uchar *Data, int Length);
+  void MuteAudio(bool On);
+  void ClearAudio(void);
+  };
+
+extern cAudios Audios;
+
+class cExternalAudio : public cAudio {
+private:
+  char *command;
+  cPipe pipe;
+  bool mute;
+public:
+  cExternalAudio(const char *Command);
+  virtual ~cExternalAudio();
+  virtual void Play(const uchar *Data, int Length);
+  virtual void Mute(bool On);
+  virtual void Clear(void);
+  };
+
 #endif //__AUDIO_H
diff --git a/channels.c b/channels.c
index e142a28fa..4f1bcec39 100644
--- a/channels.c
+++ b/channels.c
@@ -4,15 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.5 2002/10/20 11:50:47 kls Exp $
+ * $Id: channels.c 1.6 2002/11/01 10:26:45 kls Exp $
  */
 
 #include "channels.h"
-#ifdef NEWSTRUCT
 #include <linux/dvb/frontend.h>
-#else
-#include <ost/frontend.h>
-#endif
 #include <ctype.h>
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
@@ -32,9 +28,7 @@ const tChannelParameterMap BandwidthValues[] = {
   {   6, BANDWIDTH_6_MHZ },
   {   7, BANDWIDTH_7_MHZ },
   {   8, BANDWIDTH_8_MHZ },
-#ifdef NEWSTRUCT
   { 999, BANDWIDTH_AUTO },
-#endif
   { -1 }
   };
 
@@ -43,17 +37,11 @@ const tChannelParameterMap CoderateValues[] = {
   {  12, FEC_1_2 },
   {  23, FEC_2_3 },
   {  34, FEC_3_4 },
-#ifdef NEWSTRUCT
   {  45, FEC_4_5 },
-#endif
   {  56, FEC_5_6 },
-#ifdef NEWSTRUCT
   {  67, FEC_6_7 },
-#endif
   {  78, FEC_7_8 },
-#ifdef NEWSTRUCT
   {  89, FEC_8_9 },
-#endif
   { 999, FEC_AUTO },
   { -1 }
   };
@@ -65,18 +53,14 @@ const tChannelParameterMap ModulationValues[] = {
   {  64, QAM_64 },
   { 128, QAM_128 },
   { 256, QAM_256 },
-#ifdef NEWSTRUCT
   { 999, QAM_AUTO },
-#endif
   { -1 }
   };
 
 const tChannelParameterMap TransmissionValues[] = {
   {   2, TRANSMISSION_MODE_2K },
   {   8, TRANSMISSION_MODE_8K },
-#ifdef NEWSTRUCT
   { 999, TRANSMISSION_MODE_AUTO },
-#endif
   { -1 }
   };
 
@@ -85,9 +69,7 @@ const tChannelParameterMap GuardValues[] = {
   {   8, GUARD_INTERVAL_1_8 },
   {  16, GUARD_INTERVAL_1_16 },
   {  32, GUARD_INTERVAL_1_32 },
-#ifdef NEWSTRUCT
   { 999, GUARD_INTERVAL_AUTO },
-#endif
   { -1 }
   };
 
@@ -96,9 +78,7 @@ const tChannelParameterMap HierarchyValues[] = {
   {   1, HIERARCHY_1 },
   {   2, HIERARCHY_2 },
   {   4, HIERARCHY_4 },
-#ifdef NEWSTRUCT
   { 999, HIERARCHY_AUTO },
-#endif
   { -1 }
   };
 
@@ -160,16 +140,15 @@ cChannel::cChannel(void)
   sid          = 0;
   number       = 0;
   groupSep     = false;
-  //XXX
   polarization = 'v';
   inversion    = INVERSION_AUTO;
-  bandwidth    = BANDWIDTH_8_MHZ;
-  coderateH    = FEC_AUTO;//XXX FEC_2_3
-  coderateL    = FEC_1_2;//XXX
-  modulation   = QAM_64;
-  transmission = TRANSMISSION_MODE_2K;
-  guard        = GUARD_INTERVAL_1_32;
-  hierarchy    = HIERARCHY_NONE;
+  bandwidth    = BANDWIDTH_AUTO;
+  coderateH    = FEC_AUTO;
+  coderateL    = FEC_AUTO;
+  modulation   = QAM_AUTO;
+  transmission = TRANSMISSION_MODE_AUTO;
+  guard        = GUARD_INTERVAL_AUTO;
+  hierarchy    = HIERARCHY_AUTO;
 }
 
 cChannel::cChannel(const cChannel *Channel)
@@ -187,24 +166,20 @@ cChannel::cChannel(const cChannel *Channel)
   ca           = Channel ? Channel->ca           : 0;
   sid          = Channel ? Channel->sid          : 0;
   groupSep     = Channel ? Channel->groupSep     : false;
-  //XXX
   polarization = Channel ? Channel->polarization : 'v';
   inversion    = Channel ? Channel->inversion    : INVERSION_AUTO;
-  bandwidth    = Channel ? Channel->bandwidth    : BANDWIDTH_8_MHZ;
-  coderateH    = Channel ? Channel->coderateH    : FEC_AUTO;//XXX FEC_2_3
-  coderateL    = Channel ? Channel->coderateL    : FEC_1_2;//XXX
-  modulation   = Channel ? Channel->modulation   : QAM_64;
-  transmission = Channel ? Channel->transmission : TRANSMISSION_MODE_2K;
-  guard        = Channel ? Channel->guard        : GUARD_INTERVAL_1_32;
-  hierarchy    = Channel ? Channel->hierarchy    : HIERARCHY_NONE;
+  bandwidth    = Channel ? Channel->bandwidth    : BANDWIDTH_AUTO;
+  coderateH    = Channel ? Channel->coderateH    : FEC_AUTO;
+  coderateL    = Channel ? Channel->coderateL    : FEC_AUTO;
+  modulation   = Channel ? Channel->modulation   : QAM_AUTO;
+  transmission = Channel ? Channel->transmission : TRANSMISSION_MODE_AUTO;
+  guard        = Channel ? Channel->guard        : GUARD_INTERVAL_AUTO;
+  hierarchy    = Channel ? Channel->hierarchy    : HIERARCHY_AUTO;
 }
 
 static int PrintParameter(char *p, char Name, int Value)
 {
-  //XXX return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
-  //XXX let's store 999 for the moment, until we generally switch to the NEWSTRUCT
-  //XXX driver (where the defaults will all be AUTO)
-  return Value >= 0 && (Value != 999 || (Name != 'I' && Name != 'C')) ? sprintf(p, "%c%d", Name, Value) : 0;
+  return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
 }
 
 const char *cChannel::ParametersToString(void)
@@ -233,17 +208,8 @@ static const char *ParseParameter(const char *s, int &Value, const tChannelParam
      errno = 0;
      int n = strtol(s, &p, 10);
      if (!errno && p != s) {
-        //XXX let's tolerate 999 for the moment, until we generally switch to the NEWSTRUCT
-        //XXX driver (where the defaults will all be AUTO)
-        //XXX Value = MapToDriver(n, Map);
-        //XXX if (Value >= 0)
-        //XXX return p;
-        int v = MapToDriver(n, Map);
-        if (v >= 0) {
-           Value = v;
-           return p;
-           }
-        else if (v == 999)
+        Value = MapToDriver(n, Map);
+        if (Value >= 0)
            return p;
         }
      }
diff --git a/channels.conf.terr b/channels.conf.terr
index 14362a1bb..62b110c91 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -10,22 +10,14 @@ BBC NEWS 24:505833:0:0:0:640:641:0:0:4415
 BBC Knowledge:505833:0:0:0:630:631:0:0:4607
 Shop!:561833:0:0:0:6049:6050:0:0:13120
 : DVB-T Berlin Germany
-PRO 7:714000:I0C23D0M16B8T8G8Y0:T:27500:161:82:83:0:19
-SAT 1:714000:I0C23D0M16B8T8G8Y0:T:27500:160:80:81:0:18
-RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:160:80:0:0:1
-RTL 2:778000:I0C23D0M16B8T8G8Y0:T:27500:161:82:0:0:2
-Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:162:84:0:0:3
-VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:163:86:0:0:4
-KABEL 1:714000:I0C23D0M16B8T8G8Y0:T:27500:162:84:0:0:20
-MTV:674000:I0C23D0M16B8T2G8Y0:T:27500:161:82:83:0:27
-VIVA/arte:674000:I0C23D0M16B8T2G8Y0:T:27500:163:86:87:0:29
-N-TV:650000:I0C12D0M16B8T2G8Y0:T:27500:160:80:81:0:6
-N24:714000:I0C23D0M16B8T8G8Y0:T:27500:163:86:0:0:21
-Eurosport:674000:I0C23D0M16B8T2G8Y0:T:27500:160:80:81:0:26
-FAB:674000:I0C23D0M16B8T2G8Y0:T:27500:162:84:84:0:28
-ARD:602000:I0C23D0M16B8T8G8Y0:T:27500:208:209:667:0:4
-ZDF:730000:I0C23D0M16B8T2G8Y0:T:27500:110:120:130:0:22
-ZDF-docukanal:730000:I0C23D0M16B8T2G8Y0:T:27500:660:670:130:0:24
-ZDF-info:730000:I0C23D0M16B8T2G8Y0:T:27500:610:620:130:0:23
-EinsMuXx:650000:I0C12D0M16B8T2G8Y0:T:27500:161:82:0:0:7
-EinsFestival:602000:I0C23D0M16B8T8G8Y0:T:27500:80:81:0:0:2
+PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403
+SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408
+RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405
+RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406
+Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411
+VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418
+KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394
+MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396
+N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401
+N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398
+FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576
diff --git a/config.c b/config.c
index 7cea98ed5..e1d982a85 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.111 2002/10/19 15:49:51 kls Exp $
+ * $Id: config.c 1.112 2002/11/02 13:13:49 kls Exp $
  */
 
 #include "config.h"
@@ -210,7 +210,6 @@ bool cSetupLine::operator< (const cListObject &ListObject)
 
 bool cSetupLine::Parse(char *s)
 {
-  //dsyslog("cSetupLine::Parse '%s'", s);//XXX-
   char *p = strchr(s, '=');
   if (p) {
      *p = 0;
@@ -228,7 +227,6 @@ bool cSetupLine::Parse(char *s)
            }
         name = strdup(Name);
         value = strdup(Value);
-        //dsyslog("cSetupLine::Parse '%s' = '%s'", name, value);//XXX-
         return true;
         }
      }
@@ -237,7 +235,6 @@ bool cSetupLine::Parse(char *s)
 
 bool cSetupLine::Save(FILE *f)
 {
-  //dsyslog("cSetupLine::Save '%s' = '%s'", name, value);//XXX-
   return fprintf(f, "%s%s%s = %s\n", plugin ? plugin : "", plugin ? "." : "", name, value) > 0;
 }
 
diff --git a/config.h b/config.h
index 0cac7b9d7..22eb9ecdb 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.137 2002/10/19 15:43:31 kls Exp $
+ * $Id: config.h 1.138 2002/11/01 09:27:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.14"
+#define VDRVERSION "1.1.15"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 2d3d1d9e3..69178a9e3 100644
--- a/device.c
+++ b/device.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.32 2002/10/26 11:43:52 kls Exp $
+ * $Id: device.c 1.34 2002/11/03 11:51:24 kls Exp $
  */
 
 #include "device.h"
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include "audio.h"
 #include "channels.h"
 #include "eit.h"
 #include "i18n.h"
@@ -416,6 +417,7 @@ bool cDevice::ToggleMute(void)
   mute = !mute;
   SetVolume(0, mute);
   volume = OldVolume;
+  Audios.MuteAudio(mute);
   return mute;
 }
 
@@ -424,8 +426,10 @@ void cDevice::SetVolume(int Volume, bool Absolute)
   volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
   SetVolumeDevice(volume);
   cStatus::MsgSetVolume(volume, Absolute);
-  if (volume > 0)
+  if (volume > 0) {
      mute = false;
+     Audios.MuteAudio(mute);
+     }
 }
 
 int cDevice::NumAudioTracks(void) const
@@ -462,6 +466,7 @@ void cDevice::TrickSpeed(int Speed)
 
 void cDevice::Clear(void)
 {
+  Audios.ClearAudio();
 }
 
 void cDevice::Play(void)
@@ -474,6 +479,7 @@ void cDevice::Freeze(void)
 
 void cDevice::Mute(void)
 {
+  Audios.MuteAudio(true);
 }
 
 void cDevice::StillPicture(const uchar *Data, int Length)
@@ -529,9 +535,9 @@ int cDevice::PlayVideo(const uchar *Data, int Length)
   return -1;
 }
 
-int cDevice::PlayAudio(const uchar *Data, int Length)
+void cDevice::PlayAudio(const uchar *Data, int Length)
 {
-  return -1;
+  Audios.PlayAudio(Data, Length);
 }
 
 int cDevice::Ca(void) const
@@ -608,10 +614,10 @@ int cDevice::ProvidesCa(int Ca) const
   return result ? result + others : 0;
 }
 
-bool cDevice::Receiving(void) const
+bool cDevice::Receiving(bool CheckAny) const
 {
   for (int i = 0; i < MAXRECEIVERS; i++) {
-      if (receiver[i] && receiver[i]->priority >= 0) // cReceiver with priority < 0 doesn't count
+      if (receiver[i] && (CheckAny || receiver[i]->priority >= 0)) // cReceiver with priority < 0 doesn't count
          return true;
       }
   return false;
diff --git a/device.h b/device.h
index 1070c52fa..cc2be7901 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.25 2002/10/26 11:33:42 kls Exp $
+ * $Id: device.h 1.27 2002/11/03 11:16:11 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -290,6 +290,8 @@ class cDevice : public cThread {
        // times.
   virtual void Clear(void);
        // Clears all video and audio data from the device.
+       // A derived class must call the base class function to make sure
+       // all registered cAudio objects are notified.
   virtual void Play(void);
        // Sets the device into play mode (after a previous trick
        // mode).
@@ -297,6 +299,8 @@ class cDevice : public cThread {
        // Puts the device into "freeze frame" mode.
   virtual void Mute(void);
        // Turns off audio while replaying.
+       // A derived class must call the base class function to make sure
+       // all registered cAudio objects are notified.
   virtual void StillPicture(const uchar *Data, int Length);
        // Displays the given I-frame as a still picture.
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
@@ -309,8 +313,10 @@ class cDevice : public cThread {
        // Actually plays the given data block as video. The data must be
        // part of a PES (Packetized Elementary Stream) which can contain
        // one video and one audio strem.
-  virtual int PlayAudio(const uchar *Data, int Length);
+  virtual void PlayAudio(const uchar *Data, int Length);
        // Plays additional audio streams, like Dolby Digital.
+       // A derived class must call the base class function to make sure data
+       // is distributed to all registered cAudio objects.
   bool Replaying(void) const;
        // Returns true if we are currently replaying.
   void StopReplay(void);
@@ -347,7 +353,7 @@ class cDevice : public cThread {
 public:
   int  Ca(void) const;
        // Returns the ca of the current receiving session(s).
-  bool Receiving(void) const;
+  bool Receiving(bool CheckAny = false) const;
        // Returns true if we are currently receiving.
   bool AttachReceiver(cReceiver *Receiver);
        // Attaches the given receiver to this device.
diff --git a/dvbdevice.c b/dvbdevice.c
index a1a8913da..30d56586d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.30 2002/10/26 11:37:03 kls Exp $
+ * $Id: dvbdevice.c 1.34 2002/11/03 12:31:11 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -18,17 +18,10 @@ extern "C" {
 }
 #include <limits.h>
 #include <linux/videodev.h>
-#ifdef NEWSTRUCT
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
-#else
-#include <ost/audio.h>
-#include <ost/dmx.h>
-#include <ost/sec.h>
-#include <ost/video.h>
-#endif
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include "channels.h"
@@ -39,8 +32,9 @@ extern "C" {
 #include "status.h"
 #include "transfer.h"
 
+#define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
+
 #define DEV_VIDEO         "/dev/video"
-#ifdef NEWSTRUCT
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
 #define DEV_DVB_OSD       "osd"
 #define DEV_DVB_FRONTEND  "frontend"
@@ -48,24 +42,11 @@ extern "C" {
 #define DEV_DVB_DEMUX     "demux"
 #define DEV_DVB_VIDEO     "video"
 #define DEV_DVB_AUDIO     "audio"
-#else
-#define DEV_DVB_OSD       "/dev/ost/osd"
-#define DEV_DVB_FRONTEND  "/dev/ost/frontend"
-#define DEV_DVB_SEC       "/dev/ost/sec"
-#define DEV_DVB_DVR       "/dev/ost/dvr"
-#define DEV_DVB_DEMUX     "/dev/ost/demux"
-#define DEV_DVB_VIDEO     "/dev/ost/video"
-#define DEV_DVB_AUDIO     "/dev/ost/audio"
-#endif
 
 static const char *DvbName(const char *Name, int n)
 {
   static char buffer[PATH_MAX];
-#ifdef NEWSTRUCT
   snprintf(buffer, sizeof(buffer), "%s%d/%s%d", DEV_DVB_ADAPTER, n, Name, 0);
-#else
-  snprintf(buffer, sizeof(buffer), "%s%d", Name, n);
-#endif
   return buffer;
 }
 
@@ -80,11 +61,7 @@ static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
 
 cDvbDevice::cDvbDevice(int n)
 {
-#ifdef NEWSTRUCT
   frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
-#else
-  frontendType = FrontendType(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
-#endif
   siProcessor = NULL;
   spuDecoder = NULL;
   playMode = pmNone;
@@ -99,12 +76,6 @@ cDvbDevice::cDvbDevice(int n)
   fd_video    = DvbOpen(DEV_DVB_VIDEO,  n, O_RDWR | O_NONBLOCK);
   fd_audio    = DvbOpen(DEV_DVB_AUDIO,  n, O_RDWR | O_NONBLOCK);
 
-#ifndef NEWSTRUCT
-  // Devices that are only present on DVB-S cards:
-
-  fd_sec      = DvbOpen(DEV_DVB_SEC,      n, O_RDWR);
-#endif
-
   // The DVR device (will be opened and closed as needed):
 
   fd_dvr = -1;
@@ -116,11 +87,7 @@ cDvbDevice::cDvbDevice(int n)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-#ifdef NEWSTRUCT
      dvb_frontend_info feinfo;
-#else
-     FrontendInfo feinfo;
-#endif
      siProcessor = new cSIProcessor(DvbName(DEV_DVB_DEMUX, n));
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0)
         frontendType = feinfo.type;
@@ -312,20 +279,12 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
 }
 
 //                          ptAudio        ptVideo        ptTeletext        ptDolby        ptOther
-#ifdef NEWSTRUCT
 dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
-#else
-dmxPesType_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
-#endif
 
 bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
   if (Handle->pid) {
-#ifdef NEWSTRUCT
      dmx_pes_filter_params pesFilterParams;
-#else
-     dmxPesFilterParams pesFilterParams;
-#endif
      memset(&pesFilterParams, 0, sizeof(pesFilterParams));
      if (On) {
         if (Handle->handle < 0) {
@@ -336,11 +295,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
         pesFilterParams.pid     = Handle->pid;
         pesFilterParams.input   = DMX_IN_FRONTEND;
         pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
-#ifdef NEWSTRUCT
         pesFilterParams.pes_type= PesTypes[Type < ptOther ? Type : ptOther];
-#else
-        pesFilterParams.pesType = PesTypes[Type < ptOther ? Type : ptOther];
-#endif
         pesFilterParams.flags   = DMX_IMMEDIATE_START;
         if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
            LOG_ERROR;
@@ -353,11 +308,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            pesFilterParams.pid     = 0x1FFF;
            pesFilterParams.input   = DMX_IN_FRONTEND;
            pesFilterParams.output  = DMX_OUT_DECODER;
-#ifdef NEWSTRUCT
            pesFilterParams.pes_type= PesTypes[Type];
-#else
-           pesFilterParams.pesType = PesTypes[Type];
-#endif
            pesFilterParams.flags   = DMX_IMMEDIATE_START;
            CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
            close(Handle->handle);
@@ -402,17 +353,10 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                  }
               else if (!IsPrimaryDevice())
                  result = true;
-              else {
-#define DVB_DRIVER_VERSION 2002090101 //XXX+
-#define MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT 2002090101
-#ifdef DVB_DRIVER_VERSION
-#if (DVB_DRIVER_VERSION >= MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT)
-                 result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
+#ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+              else
+                 result = Priority >= Setup.PrimaryLimit;
 #endif
-#else
-#warning "DVB_DRIVER_VERSION not defined - time shift with only one DVB device disabled!"
-#endif
-                 }
               }
            else
               result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
@@ -437,7 +381,7 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-#if (DVB_DRIVER_VERSION < MIN_DVB_DRIVER_VERSION_FOR_TIMESHIFT)
+#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
   if (HasDecoder())
      LiveView = true;
 #endif
@@ -491,11 +435,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   if (DoTune) {
 
-#ifdef NEWSTRUCT
      dvb_frontend_parameters Frontend;
-#else
-     FrontendParameters Frontend;
-#endif
 
      memset(&Frontend, 0, sizeof(Frontend));
 
@@ -508,14 +448,9 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                cDiseqc *diseqc = Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
                if (diseqc) {
                   if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
-#ifndef NEWSTRUCT
-                     int SecTone = SEC_TONE_OFF;
-                     int SecVolt = SEC_VOLTAGE_13;
-#endif
                      cDiseqc::eDiseqcActions da;
                      for (bool Start = true; (da = diseqc->Execute(Start)) != cDiseqc::daNone; Start = false) {
                          switch (da) {
-#ifdef NEWSTRUCT
                            case cDiseqc::daNone:      break;
                            case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
                            case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
@@ -534,49 +469,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                                    }
                                 }
                                 break;
-#else
-                           // This may not work very good with the old driver.
-                           // Let's try to emulate the NEWSTRUCT driver's behaviour as good as possible...
-                           case cDiseqc::daNone:      break;
-                           case cDiseqc::daToneOff:   CHECK(ioctl(fd_sec, SEC_SET_TONE, SecTone = SEC_TONE_OFF)); break;
-                           case cDiseqc::daToneOn:    CHECK(ioctl(fd_sec, SEC_SET_TONE, SecTone = SEC_TONE_ON)); break;
-                           case cDiseqc::daVoltage13: CHECK(ioctl(fd_sec, SEC_SET_VOLTAGE, SecVolt = SEC_VOLTAGE_13)); break;
-                           case cDiseqc::daVoltage18: CHECK(ioctl(fd_sec, SEC_SET_VOLTAGE, SecVolt = SEC_VOLTAGE_18)); break;
-                           case cDiseqc::daMiniA:
-                           case cDiseqc::daMiniB: {
-                                secCmdSequence scmds;
-                                memset(&scmds, 0, sizeof(scmds));
-                                scmds.voltage = SecVolt;
-                                scmds.miniCommand = (da == cDiseqc::daMiniA) ? SEC_MINI_A : SEC_MINI_B;
-                                scmds.continuousTone = SecTone;
-                                CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
-                                }
-                                break;
-                           case cDiseqc::daCodes: {
-                                int n = 0;
-                                uchar *codes = diseqc->Codes(n);
-                                if (codes && n >= 3 && codes[0] == 0xE0) {
-                                   secCommand scmd;
-                                   memset(&scmd, 0, sizeof(scmd));
-                                   scmd.type = SEC_CMDTYPE_DISEQC;
-                                   scmd.u.diseqc.addr = codes[1];
-                                   scmd.u.diseqc.cmd = codes[2];
-                                   scmd.u.diseqc.numParams = n - 3;
-                                   memcpy(scmd.u.diseqc.params, &codes[3], min(n - 3, int(sizeof(scmd.u.diseqc.params))));
-   
-                                   secCmdSequence scmds;
-                                   memset(&scmds, 0, sizeof(scmds));
-                                   scmds.voltage = SecVolt;
-                                   scmds.miniCommand = SEC_MINI_NONE;
-                                   scmds.continuousTone = SecTone;
-                                   scmds.numCommands = 1;
-                                   scmds.commands = &scmd;
-
-                                   CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
-                                   }
-                                }
-                                break;
-#endif
                            }
                          }
                      diseqcCommands = diseqc->Commands();
@@ -600,56 +492,31 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                   tone = SEC_TONE_ON;
                   }
                int volt = (Channel->Polarization() == 'v' || Channel->Polarization() == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-#ifdef NEWSTRUCT
                CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
                CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
-#else
-               secCmdSequence scmds;
-               memset(&scmds, 0, sizeof(scmds));
-               scmds.voltage = volt;
-               scmds.miniCommand = SEC_MINI_NONE;
-               scmds.continuousTone = tone;
-               CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
-#endif
                }
 
-#ifdef NEWSTRUCT
             Frontend.frequency = frequency * 1000UL;
             Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.qpsk.symbol_rate = Channel->Srate() * 1000UL;
             Frontend.u.qpsk.fec_inner = fe_code_rate_t(Channel->CoderateH());
-#else
-            Frontend.Frequency = frequency * 1000UL;
-            Frontend.Inversion = SpectralInversion(Channel->Inversion());
-            Frontend.u.qpsk.SymbolRate = Channel->Srate() * 1000UL;
-            Frontend.u.qpsk.FEC_inner = CodeRate(Channel->CoderateH());
-#endif
             }
             break;
        case FE_QAM: { // DVB-C
 
             // Frequency and symbol rate:
 
-#ifdef NEWSTRUCT
             Frontend.frequency = FrequencyToHz(Channel->Frequency());
             Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.qam.symbol_rate = Channel->Srate() * 1000UL;
             Frontend.u.qam.fec_inner = fe_code_rate_t(Channel->CoderateH());
             Frontend.u.qam.modulation = fe_modulation_t(Channel->Modulation());
-#else
-            Frontend.Frequency = FrequencyToHz(Channel->Frequency());
-            Frontend.Inversion = SpectralInversion(Channel->Inversion());
-            Frontend.u.qam.SymbolRate = Channel->Srate() * 1000UL;
-            Frontend.u.qam.FEC_inner = CodeRate(Channel->CoderateH());
-            Frontend.u.qam.QAM = Modulation(Channel->Modulation());
-#endif
             }
             break;
        case FE_OFDM: { // DVB-T
 
             // Frequency and OFDM paramaters:
 
-#ifdef NEWSTRUCT
             Frontend.frequency = FrequencyToHz(Channel->Frequency());
             Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
             Frontend.u.ofdm.bandwidth = fe_bandwidth_t(Channel->Bandwidth());
@@ -659,17 +526,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(Channel->Transmission());
             Frontend.u.ofdm.guard_interval = fe_guard_interval_t(Channel->Guard());
             Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(Channel->Hierarchy());
-#else
-            Frontend.Frequency = FrequencyToHz(Channel->Frequency());
-            Frontend.Inversion = SpectralInversion(Channel->Inversion());
-            Frontend.u.ofdm.bandWidth = BandWidth(Channel->Bandwidth());
-            Frontend.u.ofdm.HP_CodeRate = CodeRate(Channel->CoderateH());
-            Frontend.u.ofdm.LP_CodeRate = CodeRate(Channel->CoderateL());
-            Frontend.u.ofdm.Constellation = Modulation(Channel->Modulation());
-            Frontend.u.ofdm.TransmissionMode = TransmitMode(Channel->Transmission());
-            Frontend.u.ofdm.guardInterval = GuardInterval(Channel->Guard());
-            Frontend.u.ofdm.HierarchyInformation = Hierarchy(Channel->Hierarchy());
-#endif
             }
             break;
        default:
@@ -677,7 +533,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
             return false;
        }
 
-#ifdef NEWSTRUCT
      // Discard stale events:
 
      for (;;) {
@@ -685,7 +540,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
          if (ioctl(fd_frontend, FE_GET_EVENT, &event) < 0)
             break;
          }
-#endif
 
      // Tuning:
 
@@ -693,7 +547,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
      // Wait for channel lock:
 
-#ifdef NEWSTRUCT
      fe_status_t status = fe_status_t(0);
      for (int i = 0; i < 100; i++) {
          CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
@@ -707,23 +560,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
            cThread::RaisePanic();
         return false;
         }
-#else
-     if (cFile::FileReady(fd_frontend, 5000)) {
-        FrontendEvent event;
-        if (ioctl(fd_frontend, FE_GET_EVENT, &event) >= 0) {
-           if (event.type != FE_COMPLETION_EV) {
-              esyslog("ERROR: channel %d not sync'ed on DVB card %d!", Channel->Number(), CardIndex() + 1);
-              if (LiveView && IsPrimaryDevice())
-                 cThread::RaisePanic();
-              return false;
-              }
-           }
-        else
-           esyslog("ERROR in frontend get event (channel %d, card %d): %m", Channel->Number(), CardIndex() + 1);
-        }
-     else
-        esyslog("ERROR: timeout while tuning on DVB card %d", CardIndex() + 1);
-#endif
 
      source = Channel->Source();
      frequency = Channel->Frequency();
@@ -757,11 +593,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 void cDvbDevice::SetVolumeDevice(int Volume)
 {
   if (HasDecoder()) {
-#ifdef NEWSTRUCT
      audio_mixer_t am;
-#else
-     audioMixer_t am;
-#endif
      am.volume_left = am.volume_right = Volume;
      CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
      }
@@ -779,21 +611,19 @@ int cDvbDevice::NumAudioTracksDevice(void) const
 
 const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
 {
-  if (Ca())
-     return NULL; // a Ca recording session blocks switching live audio tracks
-  if (NumAudioTracks()) {
+  if (NumAudioTracksDevice()) {
      if (CurrentTrack)
         *CurrentTrack = (pidHandles[ptAudio].pid == aPid1) ? 0 : 1;
      static const char *audioTracks1[] = { "Audio 1", NULL };
      static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
-     return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1;
+     return NumAudioTracksDevice() > 1 ? audioTracks2 : audioTracks1;
      }
   return NULL;
 }
 
 void cDvbDevice::SetAudioTrackDevice(int Index)
 {
-  if (0 <= Index && Index < NumAudioTracks()) {
+  if (0 <= Index && Index < NumAudioTracksDevice()) {
      int vpid = pidHandles[ptVideo].pid; // need to turn video PID off/on to restart demux
      DelPid(vpid);
      DelPid(pidHandles[ptAudio].pid);
@@ -957,10 +787,10 @@ int cDvbDevice::PlayVideo(const uchar *Data, int Length)
   return -1;
 }
 
-int cDvbDevice::PlayAudio(const uchar *Data, int Length)
+void cDvbDevice::PlayAudio(const uchar *Data, int Length)
 {
-  //XXX+
-  return -1;
+  //XXX actually this function will only be needed to implement replaying AC3 over the DVB card's S/PDIF
+  cDevice::PlayAudio(Data, Length);
 }
 
 bool cDvbDevice::OpenDvr(void)
@@ -991,11 +821,7 @@ bool cDvbDevice::GetTSPacket(uchar *&Data)
         return true;
         }
      else if (FATALERRNO) {
-#ifdef NEWSTRUCT
         if (errno == EOVERFLOW)
-#else
-        if (errno == EBUFFEROVERFLOW) // this error code is not defined in the library
-#endif
            esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
         else {
            LOG_ERROR;
diff --git a/dvbdevice.h b/dvbdevice.h
index 8784c74e9..709790cdd 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,21 +4,22 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.15 2002/10/26 11:35:04 kls Exp $
+ * $Id: dvbdevice.h 1.18 2002/11/03 12:31:15 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
 #define __DVBDEVICE_H
 
-#ifdef NEWSTRUCT
 #include <linux/dvb/frontend.h>
-#else
-#include <ost/frontend.h>
-#endif
+#include <linux/dvb/version.h>
 #include "device.h"
 #include "dvbspu.h"
 #include "eit.h"
 
+#if DVB_API_VERSION != 3
+#error VDR requires Linux DVB driver API version 3!
+#endif
+
 #define MAXDVBDEVICES  4
 
 class cDvbDevice : public cDevice {
@@ -31,13 +32,8 @@ class cDvbDevice : public cDevice {
          // Initializes the DVB devices.
          // Must be called before accessing any DVB functions.
 private:
-#ifdef NEWSTRUCT
   fe_type_t frontendType;
   int fd_osd, fd_frontend, fd_audio, fd_video, fd_dvr;
-#else
-  FrontendType frontendType;
-  int fd_osd, fd_frontend, fd_sec, fd_audio, fd_video, fd_dvr;
-#endif
   int OsdDeviceHandle(void) const { return fd_osd; }
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -112,7 +108,7 @@ class cDvbDevice : public cDevice {
   virtual void StillPicture(const uchar *Data, int Length);
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
   virtual int PlayVideo(const uchar *Data, int Length);
-  virtual int PlayAudio(const uchar *Data, int Length);
+  virtual void PlayAudio(const uchar *Data, int Length);
 
 // Receiver facilities
 
diff --git a/dvbosd.h b/dvbosd.h
index e35aab6df..cbc7901f4 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,17 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.15 2002/08/09 16:16:48 kls Exp $
+ * $Id: dvbosd.h 1.16 2002/11/01 10:05:47 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
-#ifdef NEWSTRUCT
 #include <linux/dvb/osd.h>
-#else
-#include <ost/osd.h>
-#endif
 #include "dvbdevice.h"
 #include "osdbase.h"
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 0bc75c0da..2d9cc1ced 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.15 2002/10/13 16:08:40 kls Exp $
+ * $Id: dvbplayer.c 1.16 2002/11/03 11:23:47 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -219,7 +219,7 @@ void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
             switch (c) {
               case 0xBD: // dolby
                    if (Except)
-                      ;//XXX+ PlayExternalDolby(&b[i], Length - i);
+                      PlayAudio(&b[i], l);
                    // continue with deleting the data - otherwise it disturbs DVB replay
               case 0xC0 ... 0xC1: // audio
                    if (c == 0xC1)
diff --git a/eit.c b/eit.c
index 40ae87416..12045d63d 100644
--- a/eit.c
+++ b/eit.c
@@ -16,18 +16,14 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.57 2002/10/13 09:29:05 kls Exp $
+ * $Id: eit.c 1.59 2002/11/02 12:46:53 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
 #include <ctype.h>
 #include <fcntl.h>
 #include <limits.h>
-#ifdef NEWSTRUCT
 #include <linux/dvb/dmx.h>
-#else
-#include <ost/dmx.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -757,7 +753,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
            if (*s == 'C') {
               unsigned int uServiceID;
               if (1 == sscanf(s + 1, "%u", &uServiceID)) {
-                 cSchedule *p = (cSchedule *)Schedules->SetCurrentServiceID(uServiceID);
+                 cSchedule *p = (cSchedule *)Schedules->AddServiceID(uServiceID);
                  if (p) {
                     if (!cEventInfo::Read(f, p))
                        return false;
@@ -786,20 +782,22 @@ cSchedules::~cSchedules()
 {
 }
 /**  */
+const cSchedule *cSchedules::AddServiceID(unsigned short servid)
+{
+  const cSchedule *p = GetSchedule(servid);
+  if (!p) {
+     Add(new cSchedule(servid));
+     p = GetSchedule(servid);
+     }
+  return p;
+}
+/**  */
 const cSchedule *cSchedules::SetCurrentServiceID(unsigned short servid)
 {
-   pCurrentSchedule = GetSchedule(servid);
-   if (pCurrentSchedule == NULL)
-   {
-      Add(new cSchedule(servid));
-      pCurrentSchedule = GetSchedule(servid);
-      if (pCurrentSchedule == NULL)
-         return NULL;
-   }
-
-   uCurrentServiceID = servid;
-
-   return pCurrentSchedule;
+  pCurrentSchedule = AddServiceID(servid);
+  if (pCurrentSchedule)
+     uCurrentServiceID = servid;
+  return pCurrentSchedule;
 }
 /**  */
 const cSchedule * cSchedules::GetSchedule() const
@@ -1196,11 +1194,7 @@ void cSIProcessor::Action()
 table identifer tid */
 bool cSIProcessor::AddFilter(u_char pid, u_char tid)
 {
-#ifdef NEWSTRUCT
    dmx_sct_filter_params sctFilterParams;
-#else
-   dmxSctFilterParams sctFilterParams;
-#endif
    memset(&sctFilterParams, 0, sizeof(sctFilterParams));
    sctFilterParams.pid = pid;
    sctFilterParams.timeout = 0;
diff --git a/eit.h b/eit.h
index 6ebd48f35..537400322 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.19 2002/10/13 09:28:06 kls Exp $
+ * $Id: eit.h 1.20 2002/11/02 12:36:36 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -112,6 +112,7 @@ class cSchedules : public cList<cSchedule> {
   const cSchedule *pCurrentSchedule;
   unsigned short uCurrentServiceID;
 protected:
+  const cSchedule *AddServiceID(unsigned short servid);
   const cSchedule *SetCurrentServiceID(unsigned short servid);
   void Cleanup();
 public:
diff --git a/eitscan.c b/eitscan.c
index 2a89cec9d..fdcd8c3d8 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.9 2002/10/19 11:48:02 kls Exp $
+ * $Id: eitscan.c 1.10 2002/11/01 11:04:49 kls Exp $
  */
 
 #include "eitscan.h"
@@ -55,7 +55,7 @@ void cEITScanner::Process(void)
             cDevice *Device = cDevice::GetDevice(i);
             if (Device && Device->CardIndex() < MAXDVBDEVICES) {
                if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                  if (!(Device->Receiving() || Device->Replaying())) {
+                  if (!(Device->Receiving(true) || Device->Replaying())) {
                      int oldCh = lastChannel;
                      int ch = oldCh + 1;
                      while (ch != oldCh) {
diff --git a/interface.c b/interface.c
index a9f0d9a98..804747aef 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.59 2002/10/27 15:54:05 kls Exp $
+ * $Id: interface.c 1.60 2002/11/01 10:50:38 kls Exp $
  */
 
 #include "interface.h"
@@ -418,9 +418,9 @@ void cInterface::LearnKeys(void)
          Clear();
          cRemote::Clear();
          WriteText(1, 1, Headline);
-         cRemote::SetLearning(true);
+         cRemote::SetLearning(Remote);
          QueryKeys(Remote);
-         cRemote::SetLearning(false);
+         cRemote::SetLearning(NULL);
          Clear();
          WriteText(1, 1, Headline);
          WriteText(1, 3, tr("Phase 3: Saving key codes"));
diff --git a/menu.c b/menu.c
index 0bd24be87..47ad091b8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.221 2002/10/27 14:06:02 kls Exp $
+ * $Id: menu.c 1.222 2002/11/01 12:15:45 kls Exp $
  */
 
 #include "menu.h"
@@ -2378,10 +2378,10 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
   char buffer[BufSize];
   *buffer = 0;
   if (Channel) {
-     if (Channel->Number() > 0)
-        snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
-     else if (Channel->Name())
+     if (Channel->GroupSep())
         snprintf(buffer, BufSize, "%s", Channel->Name());
+     else
+        snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
      }
   else if (number)
      snprintf(buffer, BufSize, "%d-", number);
diff --git a/newplugin b/newplugin
index 3a4586c85..a5004dce4 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.9 2002/10/26 14:32:12 kls Exp $
+# $Id: newplugin 1.11 2002/11/01 13:43:50 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -68,19 +68,22 @@ PLUGIN = $PLUGIN_NAME
 
 VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ print \$\$6 }' | sed -e 's/[";]//g')
 
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
+DVBDIR = ../../../../DVB
 VDRDIR = ../../..
-VDRINC = \$(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Allow user defined options to overwrite defaults:
+
+-include \$(VDRDIR)/Make.config
+
 ### The version number of VDR (taken from VDR's "config.h"):
 
 VDRVERSION = \$(shell grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g')
@@ -92,7 +95,7 @@ PACKAGE = vdr-\$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I\$(VDRINC) -I\$(DVBDIR)
+INCLUDES += -I\$(VDRDIR)/include -I\$(DVBDIR)/include
 
 DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
@@ -100,11 +103,6 @@ DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
 OBJS = \$(PLUGIN).o
 
-### The C++ compiler and options:
-
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
-
 ### Implicit rules:
 
 %.o: %.c
diff --git a/player.c b/player.c
index 3eecc2d4a..a88c5010a 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.5 2002/08/15 10:29:17 kls Exp $
+ * $Id: player.c 1.6 2002/11/02 14:55:37 kls Exp $
  */
 
 #include "player.h"
@@ -31,12 +31,13 @@ int cPlayer::PlayVideo(const uchar *Data, int Length)
   return -1;
 }
 
-int cPlayer::PlayAudio(const uchar *Data, int Length)
+void cPlayer::PlayAudio(const uchar *Data, int Length)
 {
-  if (device)
-     return device->PlayAudio(Data, Length);
+  if (device) {
+     device->PlayAudio(Data, Length);
+     return;
+     }
   esyslog("ERROR: attempt to use cPlayer::PlayAudio() without attaching to a cDevice!");
-  return -1;
 }
 
 void cPlayer::Detach(void)
diff --git a/player.h b/player.h
index 1e1fabfab..faeab1a74 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.9 2002/10/12 11:17:02 kls Exp $
+ * $Id: player.h 1.10 2002/11/03 11:27:30 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -35,8 +35,8 @@ class cPlayer {
        // Sends the given Data to the video device and returns the number of
        // bytes that have actually been accepted by the video device (or a
        // negative value in case of an error).
-  int PlayAudio(const uchar *Data, int Length);
-               // XXX+ TODO
+  void PlayAudio(const uchar *Data, int Length);
+       // Plays additional audio streams, like Dolby Digital.
 public:
   cPlayer(ePlayMode PlayMode = pmAudioVideo);
   virtual ~cPlayer();
diff --git a/remote.c b/remote.c
index 6078c26ba..415e37ea1 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.30 2002/10/27 15:15:58 kls Exp $
+ * $Id: remote.c 1.31 2002/11/01 10:50:13 kls Exp $
  */
 
 #include "remote.h"
@@ -27,7 +27,7 @@
 eKeys cRemote::keys[MaxKeys];
 int cRemote::in = 0;
 int cRemote::out = 0;
-bool cRemote::learning = false;
+cRemote *cRemote::learning = NULL;
 char *cRemote::unknownCode = NULL;
 cMutex cRemote::mutex;
 cCondVar cRemote::keyPressed;
@@ -109,6 +109,8 @@ bool cRemote::Put(uint64 Code, bool Repeat, bool Release)
 
 bool cRemote::Put(const char *Code, bool Repeat, bool Release)
 {
+  if (learning && this != learning)
+     return false;
   eKeys Key = Keys.Get(Name(), Code);
   if (Key != kNone) {
      if (Repeat)
diff --git a/remote.h b/remote.h
index 2bb9ea530..35cf62e53 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.18 2002/10/27 15:16:50 kls Exp $
+ * $Id: remote.h 1.19 2002/11/01 10:48:11 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -24,7 +24,7 @@ class cRemote : public cListObject {
   static eKeys keys[MaxKeys];
   static int in;
   static int out;
-  static bool learning;
+  static cRemote *learning;
   static char *unknownCode;
   static cMutex mutex;
   static cCondVar keyPressed;
@@ -39,7 +39,7 @@ class cRemote : public cListObject {
   virtual ~cRemote();
   virtual bool Initialize(void) { return true; }
   const char *Name(void) { return name; }
-  static void SetLearning(bool On) { learning = On; }
+  static void SetLearning(cRemote *Learning) { learning = Learning; }
   static void Clear(void);
   static bool Put(eKeys Key);
   static bool PutMacro(eKeys Key);
diff --git a/remux.h b/remux.h
index 83126187d..638a3f9e7 100644
--- a/remux.h
+++ b/remux.h
@@ -4,18 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.8 2002/10/12 13:30:24 kls Exp $
+ * $Id: remux.h 1.9 2002/11/01 10:06:46 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
 #include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
-#ifdef NEWSTRUCT
 #include <linux/dvb/dmx.h>
-#else
-#include <ost/dmx.h>
-#endif
 #include "tools.h"
 
 // Picture types:
diff --git a/thread.c b/thread.c
index 0f42e56c0..e52771dad 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.22 2002/08/15 11:44:48 kls Exp $
+ * $Id: thread.c 1.23 2002/11/03 11:00:03 kls Exp $
  */
 
 #include "thread.h"
@@ -331,11 +331,9 @@ bool cPipe::Open(const char *Command, const char *Mode)
         _exit(-1);
         }
      else {
-        for (int i = 0; i <= fd[1]; i++) {
-            if (i == STDIN_FILENO || i == STDOUT_FILENO || i == STDERR_FILENO)
-               continue;
-            close(i); // close all dup'ed filedescriptors
-            }
+        int MaxPossibleFileDescriptors = getdtablesize();
+        for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
+            close(i); //close all dup'ed filedescriptors
         if (execl("/bin/sh", "sh", "-c", Command, NULL) == -1) {
            LOG_ERROR_STR(Command);
            close(fd[1 - iopipe]);
diff --git a/transfer.c b/transfer.c
index ddfb28cb0..6d3ed7807 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.6 2002/10/26 10:17:17 kls Exp $
+ * $Id: transfer.c 1.7 2002/11/03 11:24:02 kls Exp $
  */
 
 #include "transfer.h"
@@ -123,7 +123,7 @@ void cTransfer::StripAudioPackets(uchar *b, int Length, uchar Except)
          switch (c) {
            case 0xBD: // dolby
                 if (Except)
-                   ;//XXX+ PlayExternalDolby(&b[i], Length - i);
+                   PlayAudio(&b[i], l);
                 // continue with deleting the data - otherwise it disturbs DVB replay
            case 0xC0 ... 0xC1: // audio
                 if (c == 0xC1)
diff --git a/vdr.c b/vdr.c
index 41d204776..1285ae7ae 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.130 2002/10/27 15:20:56 kls Exp $
+ * $Id: vdr.c 1.132 2002/11/03 13:54:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -30,6 +30,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "audio.h"
 #include "channels.h"
 #include "config.h"
 #include "cutter.h"
@@ -87,6 +88,7 @@ int main(int argc, char *argv[])
 #define DEFAULTPLUGINDIR "./PLUGINS/lib"
 
   int SVDRPport = DEFAULTSVDRPPORT;
+  const char *AudioCommand = NULL;
   const char *ConfigDirectory = NULL;
   bool DisplayHelp = false;
   bool DisplayVersion = false;
@@ -121,10 +123,8 @@ int main(int argc, char *argv[])
   int c;
   while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:L:mp:P:r:s:t:v:Vw:", long_options, NULL)) != -1) {
         switch (c) {
-          /*XXX+
-          case 'a': cDevice::SetAudioCommand(optarg);
+          case 'a': AudioCommand = optarg;
                     break;
-                    XXX*/
           case 'c': ConfigDirectory = optarg;
                     break;
           case 'd': DaemonMode = true; break;
@@ -365,6 +365,11 @@ int main(int argc, char *argv[])
 #endif
   Interface->LearnKeys();
 
+  // External audio:
+
+  if (AudioCommand)
+     new cExternalAudio(AudioCommand);
+
   // Channel:
 
   Channels.SwitchTo(Setup.CurrentChannel);
@@ -519,7 +524,7 @@ int main(int argc, char *argv[])
              case osRecord: DELETENULL(Menu);
                             Temp = NULL;
                             if (cRecordControls::Start())
-                               Interface->Info(tr("Recording"));
+                               ;//XXX Interface->Info(tr("Recording"));
                             else
                                Interface->Error(tr("No free DVB device to record!"));
                             break;
@@ -589,7 +594,7 @@ int main(int argc, char *argv[])
              // Instant recording:
              case kRecord:
                   if (cRecordControls::Start())
-                     Interface->Info(tr("Recording"));
+                     ;//XXX Interface->Info(tr("Recording"));
                   else
                      Interface->Error(tr("No free DVB device to record!"));
                   break;
@@ -676,6 +681,7 @@ int main(int argc, char *argv[])
   delete Interface;
   cOsd::Shutdown();
   Remotes.Clear();
+  Audios.Clear();
   Setup.CurrentChannel = cDevice::CurrentChannel();
   Setup.CurrentVolume  = cDevice::CurrentVolume();
   Setup.Save();

From 8b5d4040832f9a11119002fef5144a7d6705f19c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 10 Nov 2002 18:00:00 +0100
Subject: [PATCH 057/307] Version 1.1.16 - Fixed saving the polarization
 parameter of channels that have a number in the   'source' parameter (thanks
 to Peter Seyringer for reporting this one). - Updated 'channels.conf.terr'
 (thanks to Andy Carter). - Updated 'channels.conf.cable' (thanks to Achim
 Lange). - First step towards a "unique channel ID". The channel ID is a human
 readable   string, made up from several parameters of the channel's
 definition in the file   'channels.conf' (see man vdr(5) for details).   In
 order for the "unique channel ID" to work, all channel definitions now must  
 be unique with respect to the combination of their Source, Frequency and SID 
  parameters. You may have to fix your 'channels.conf' manually if there are
 error   messages in the log file when loading it. BE SURE TO MAKE A BACKUP
 COPY OF YOUR   'channels.conf' AND 'timers.conf' FILE BEFORE SWITCHING TO
 THIS VERSION, AND CHECK   VERY CAREFULLY WHETHER YOUR TIMERS ARE STILL SET TO
 THE RIGHT CHANNELS!   When reading an existing 'timers.conf', the channels
 will be identified as before   by their numbers. As soon as this file is
 written back, the channel numbers will   be replaced by the channel IDs.
 After that it is possible to manually edit the   'channels.conf' file and
 rearrange the channels without breaking the timers.   Note that you can still
 define new timers manually by using the channel number.   VDR will correctly
 identify the 'channel' parameter in a timer definition and   use it as a
 channel number or a channel ID, respectively. Also, the SVDRP commands   that
 return timer definitions will list them with channel numbers in order to  
 stay compatible with existing applications.   The channel ID is also used in
 the 'epg.data' file to allow EPG information from   different sources to be
 stored, which would previously have been mixed up in case   they were using
 the same 'service ID'. Note that the contents of an existing   'epg.data'
 file from a previous version will be silently ignored, since it doesn't  
 contain the new channel IDs. When inserting EPG data into VDR via SVDRP you
 now also   need to use the channel IDs.   Currently the EPG data received
 from the DVB data stream only uses the 'Source'   and 'Service ID' part of
 the channel ID. This makes it work for channels with   the same service IDs
 on different sources (like satellites, cable or terrestrial).   However, it
 doesn't work yet if the service IDs are not unique within a specific  
 source. This will be fixed later. - Added missing SID parameters to
 'channels.conf'. Some channels have been removed   since they are apparently
 no longer broadcasted. - Removed dropping EPG events from "other" streams
 that have a duration of 86400   seconds or more (was introduced in version
 1.1.10). This has become obsolete by   the modification in version 1.1.13,
 which fixed fetching the current/next information   to handle cases where the
 duration of an event is set wrongly and would last beyond   the start time of
 the next event. Besides, the change in 1.1.10 broke handling EPG   data for
 NVOD channels. - Fixed a compiler warning regarding cMenuChannels::Del() and
 MenuTimers::Del() hiding   the base class virtual functions.

---
 CONTRIBUTORS        |   6 +++
 HISTORY             |  48 ++++++++++++++++-
 channels.c          | 110 ++++++++++++++++++++++++-------------
 channels.conf       |  87 +++++++++---------------------
 channels.conf.cable |   2 +-
 channels.conf.terr  |  51 ++++++++++++++----
 channels.h          |  18 ++++---
 config.h            |   4 +-
 device.c            |   4 +-
 dvbdevice.c         |   6 +--
 eit.c               | 128 ++++++++++++++++++++++++--------------------
 eit.h               |  31 +++++------
 i18n.c              |  18 ++++++-
 menu.c              | 103 +++++++++++++++++++++--------------
 osd.c               |  22 ++++----
 osd.h               |   7 +--
 remote.h            |   4 +-
 svdrp.c             |  43 +++++++++------
 timers.c            |  53 +++++++++---------
 timers.h            |   5 +-
 tools.c             |   9 +++-
 tools.h             |   4 +-
 vdr.5               |  30 ++++++++---
 23 files changed, 484 insertions(+), 309 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 399ba30d7..6463c5326 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -302,6 +302,7 @@ Mirko G
 Achim Lange <Achim_Lange@t-online.de>
  for replacing 'killproc' with 'killall' in 'runvdr' to make it work on Debian
  for reporting a bug in switching back the replay mode display in time shift mode
+ for his help in keeping 'channels.conf.cable' up to date
 
 Klaus Wolf <klaus@wolfsoft.de>
  for reporting a bug in restoring the CICAM values for a fourth DVB card
@@ -441,6 +442,7 @@ Lauri Tischler <lauri.tischler@efore.fi>
 
 Andy Carter <fruit@ukgateway.net>
  for helping to test new DVB-T handling
+ for his help in keeping 'channels.conf.terr' up to date
 
 Robert Schiele <rschiele@uni-mannheim.de>
  for his help in keeping 'channels.conf.cable' up to date
@@ -460,3 +462,7 @@ Dennis Noordsij <dennis.noordsij@wiral.com>
 
 Steffen Barszus <st_barszus@gmx.de>
  for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
+
+Peter Seyringer <e9425234@student.tuwien.ac.at>
+ for reporting a bug in saving the polarization parameter of channels that have a
+ number in the 'source' parameter
diff --git a/HISTORY b/HISTORY
index dc276f519..e0a5f1199 100644
--- a/HISTORY
+++ b/HISTORY
@@ -249,7 +249,7 @@ Video Disk Recorder Revision History
 - The EIT information is now gathered in a separate thread.
 - The sytem time can now be synchronized to the time broadcast in the DVB data
   stream. This can be enabled in the "Setup" menu by setting "SetSystemTime" to
-  1.  Note that this works only if VDR is running under a user id that has
+  1.  Note that this works only if VDR is running under a user ID that has
   permisson to set the system time.
 - The new item "Schedule" in the "Main" menu opens VDR's EPG (thanks to Robert
   Schneider). See the MANUAL file for a detailed description.
@@ -1721,3 +1721,49 @@ Video Disk Recorder Revision History
   DVB_DRIVER_VERSION stuff has been replaced with DO_REC_AND_PLAY_ON_PRIMARY_DEVICE,
   which can be used to disable simultaneous recording and replaying on the primary
   DVB device in case there are problems with this.
+
+2002-11-10: Version 1.1.16
+
+- Fixed saving the polarization parameter of channels that have a number in the
+  'source' parameter (thanks to Peter Seyringer for reporting this one).
+- Updated 'channels.conf.terr' (thanks to Andy Carter).
+- Updated 'channels.conf.cable' (thanks to Achim Lange).
+- First step towards a "unique channel ID". The channel ID is a human readable
+  string, made up from several parameters of the channel's definition in the file
+  'channels.conf' (see man vdr(5) for details).
+  In order for the "unique channel ID" to work, all channel definitions now must
+  be unique with respect to the combination of their Source, Frequency and SID
+  parameters. You may have to fix your 'channels.conf' manually if there are error
+  messages in the log file when loading it. BE SURE TO MAKE A BACKUP COPY OF YOUR
+  'channels.conf' AND 'timers.conf' FILE BEFORE SWITCHING TO THIS VERSION, AND CHECK
+  VERY CAREFULLY WHETHER YOUR TIMERS ARE STILL SET TO THE RIGHT CHANNELS!
+  When reading an existing 'timers.conf', the channels will be identified as before
+  by their numbers. As soon as this file is written back, the channel numbers will
+  be replaced by the channel IDs. After that it is possible to manually edit the
+  'channels.conf' file and rearrange the channels without breaking the timers.
+  Note that you can still define new timers manually by using the channel number.
+  VDR will correctly identify the 'channel' parameter in a timer definition and
+  use it as a channel number or a channel ID, respectively. Also, the SVDRP commands
+  that return timer definitions will list them with channel numbers in order to
+  stay compatible with existing applications.
+  The channel ID is also used in the 'epg.data' file to allow EPG information from
+  different sources to be stored, which would previously have been mixed up in case
+  they were using the same 'service ID'. Note that the contents of an existing
+  'epg.data' file from a previous version will be silently ignored, since it doesn't
+  contain the new channel IDs. When inserting EPG data into VDR via SVDRP you now also
+  need to use the channel IDs.
+  Currently the EPG data received from the DVB data stream only uses the 'Source'
+  and 'Service ID' part of the channel ID. This makes it work for channels with
+  the same service IDs on different sources (like satellites, cable or terrestrial).
+  However, it doesn't work yet if the service IDs are not unique within a specific
+  source. This will be fixed later.
+- Added missing SID parameters to 'channels.conf'. Some channels have been removed
+  since they are apparently no longer broadcasted.
+- Removed dropping EPG events from "other" streams that have a duration of 86400
+  seconds or more (was introduced in version 1.1.10). This has become obsolete by
+  the modification in version 1.1.13, which fixed fetching the current/next information
+  to handle cases where the duration of an event is set wrongly and would last beyond
+  the start time of the next event. Besides, the change in 1.1.10 broke handling EPG
+  data for NVOD channels.
+- Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del() hiding
+  the base class virtual functions.
diff --git a/channels.c b/channels.c
index 4f1bcec39..cb05e2ca7 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.6 2002/11/01 10:26:45 kls Exp $
+ * $Id: channels.c 1.8 2002/11/10 13:01:55 kls Exp $
  */
 
 #include "channels.h"
@@ -126,19 +126,18 @@ char *cChannel::buffer = NULL;
 
 cChannel::cChannel(void)
 {
-  *name = 0;
-  frequency    = 0;
-  source       = 0;
-  srate        = 0;
-  vpid         = 0;
-  apid1        = 0;
+  strcpy(name,   "Pro7");
+  frequency    = 12480;
+  source       = cSource::FromString("S19.2E");
+  srate        = 27500;
+  vpid         = 255;
+  apid1        = 256;
   apid2        = 0;
-  dpid1        = 0;
+  dpid1        = 257;
   dpid2        = 0;
-  tpid         = 0;
+  tpid         = 32;
   ca           = 0;
   sid          = 0;
-  number       = 0;
   groupSep     = false;
   polarization = 'v';
   inversion    = INVERSION_AUTO;
@@ -151,30 +150,44 @@ cChannel::cChannel(void)
   hierarchy    = HIERARCHY_AUTO;
 }
 
-cChannel::cChannel(const cChannel *Channel)
+cChannel& cChannel::operator= (const cChannel &Channel)
 {
-  strcpy(name,   Channel ? Channel->name         : "Pro7");
-  frequency    = Channel ? Channel->frequency    : 12480;
-  source       = Channel ? Channel->source       : 0;
-  srate        = Channel ? Channel->srate        : 27500;
-  vpid         = Channel ? Channel->vpid         : 255;
-  apid1        = Channel ? Channel->apid1        : 256;
-  apid2        = Channel ? Channel->apid2        : 0;
-  dpid1        = Channel ? Channel->dpid1        : 257;
-  dpid2        = Channel ? Channel->dpid2        : 0;
-  tpid         = Channel ? Channel->tpid         : 32;
-  ca           = Channel ? Channel->ca           : 0;
-  sid          = Channel ? Channel->sid          : 0;
-  groupSep     = Channel ? Channel->groupSep     : false;
-  polarization = Channel ? Channel->polarization : 'v';
-  inversion    = Channel ? Channel->inversion    : INVERSION_AUTO;
-  bandwidth    = Channel ? Channel->bandwidth    : BANDWIDTH_AUTO;
-  coderateH    = Channel ? Channel->coderateH    : FEC_AUTO;
-  coderateL    = Channel ? Channel->coderateL    : FEC_AUTO;
-  modulation   = Channel ? Channel->modulation   : QAM_AUTO;
-  transmission = Channel ? Channel->transmission : TRANSMISSION_MODE_AUTO;
-  guard        = Channel ? Channel->guard        : GUARD_INTERVAL_AUTO;
-  hierarchy    = Channel ? Channel->hierarchy    : HIERARCHY_AUTO;
+  memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
+  return *this;
+}
+
+static int MHz(int frequency)
+{
+  while (frequency > 20000) {
+        frequency /= 1000;
+        }
+  return frequency;
+}
+
+uint64 cChannel::GetChannelID(void) const
+{
+  return (uint64(source) << 48) | (uint64(0) << 32) | ((MHz(frequency)) << 16) | sid;
+}
+
+const char *cChannel::GetChannelIDStr(void) const
+{
+  static char buffer[256];
+  snprintf(buffer, sizeof(buffer), "%s-%d-%d-%d", cSource::ToString(source), 0, MHz(frequency), sid);
+  return buffer;
+}
+
+uint64 cChannel::StringToChannelID(const char *s)
+{
+  char *sourcebuf = NULL;
+  int reserved;
+  int frequency;
+  int sid;
+  if (4 == sscanf(s, "%a[^-]-%d-%d-%d", &sourcebuf, &reserved, &frequency, &sid)) {
+     int source = cSource::FromString(sourcebuf);
+     if (source >= 0)
+        return (uint64(source) << 48) | (uint64(reserved) << 32) | (frequency << 16) | sid;
+     }
+  return 0;
 }
 
 static int PrintParameter(char *p, char Name, int Value)
@@ -185,6 +198,8 @@ static int PrintParameter(char *p, char Name, int Value)
 const char *cChannel::ParametersToString(void)
 {
   char type = *cSource::ToString(source);
+  if (isdigit(type))
+     type = 'S';
 #define ST(s) if (strchr(s, type))
   static char buffer[64];
   char *q = buffer;
@@ -276,7 +291,7 @@ const char *cChannel::ToText(void)
   return ToText(this);
 }
 
-bool cChannel::Parse(const char *s)
+bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
 {
   if (*s == ':') {
      groupSep = true;
@@ -322,6 +337,10 @@ bool cChannel::Parse(const char *s)
         free(sourcebuf);
         free(apidbuf);
         free(namebuf);
+        if (!AllowNonUniqueID && Channels.GetByChannelID(GetChannelID())) {
+           esyslog("ERROR: channel data not unique!");
+           return false;
+           }
         return ok;
         }
      else
@@ -402,15 +421,34 @@ cChannel *cChannels::GetByNumber(int Number, int SkipGap)
   return NULL;
 }
 
-cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
+cChannel *cChannels::GetByServiceID(int Source, unsigned short ServiceID)
+{
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (!channel->GroupSep() && channel->Source() == Source && channel->Sid() == ServiceID)
+         return channel;
+      }
+  return NULL;
+}
+
+cChannel *cChannels::GetByChannelID(uint64 ChannelID)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep() && channel->Sid() == ServiceId)
+      if (!channel->GroupSep() && channel->GetChannelID() == ChannelID)
          return channel;
       }
   return NULL;
 }
 
+bool cChannels::HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel)
+{
+  uint64 NewChannelID = NewChannel->GetChannelID();
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (!channel->GroupSep() && channel != OldChannel && channel->GetChannelID() == NewChannelID)
+         return false;
+      }
+  return true;
+}
+
 bool cChannels::SwitchTo(int Number)
 {
   cChannel *channel = GetByNumber(Number);
diff --git a/channels.conf b/channels.conf
index da014a8ac..f440ca7e4 100644
--- a/channels.conf
+++ b/channels.conf
@@ -17,7 +17,6 @@ KiKa:11954:h:S19.2E:27500:310:320:330:0:28008
 arte:11836:h:S19.2E:27500:401:402:404:0:28109
 ORF1:12692:h:S19.2E:22000:160:161:165:102:13001
 ORF2:12692:h:S19.2E:22000:500:501:505:102:13002
-ORF Sat:11954:h:S19.2E:27500:506:507:0:0:28010
 ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011
 CNN:12168:v:S19.2E:27500:165:100:0:0:28512
 Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040
@@ -27,13 +26,13 @@ Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899
 Neun Live:12480:v:S19.2E:27500:767:768:35:0:897
 DSF:12480:v:S19.2E:27500:1023:1024:0:0:900
 HOT:12480:v:S19.2E:27500:1279:1280:0:0:40
-Bloomberg TV Germany:12551:v:S19.2E:22000:162:99:0:0:12160
+Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160
 Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004
 Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721
 Sky News:12552:v:S19.2E:22000:305:306:0:0:3995
 Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020
 Alice:12610:v:S19.2E:22000:162:96:0:0:12200
-n-tv:12669:v:S19.2E:22000:162:96:55:0:12730
+n-tv:12670:v:S19.2E:22000:162:96:55:0:12730
 Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300
 TW1:12692:h:S19.2E:22000:166:167:0:0:13013
 Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009
@@ -45,7 +44,6 @@ ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014
 MDR:12110:h:S19.2E:27500:401:402:404:0:28204
 ORB:12110:h:S19.2E:27500:501:502:504:0:28205
 B1:12110:h:S19.2E:27500:601:602:604:0:28206
-ARD Online-Kanal:12722:h:S19.2E:22000:0:701:0:0:0
 :Premiere World
 Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8
 Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10
@@ -93,7 +91,7 @@ Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27
 :#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213
 :#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214
 :#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215
-Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
+:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
 :Beta Digital
 N24:12480:v:S19.2E:27500:2047:2048:0:0:47
 CNBC:11954:h:S19.2E:27500:510:520:0:0:28010
@@ -110,77 +108,42 @@ BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245
 BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208
 BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209
 :-
-:#TV Niepokalanow:11876:h:S19.2E:27500:305:321:0:0:20601
 Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010
 Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011
-TVC Internacional:11934:v:S19.2E:27500:167:108:0:0:0
-Nasza TV:11992:h:S19.2E:27500:165:98:0:0:0
-WishLine test:12012:v:S19.2E:27500:163:90:0:0:0
+Canal J:11934:v:S19.2E:27500:167:108:0:0:8157
+Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365
 Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002
 Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003
 Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004
 Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001
-Kiosque:12129:v:S19.2E:27500:160:80:0:0:0
 KTO:11739:v:S19.2E:27500:163:90:0:0:8304
-TCM:12168:v:S19.2E:27500:160:80:0:0:0
-Cartoon Network France & Spain:12168:v:S19.2E:27500:161:84:0:0:0
-TVBS Europe:12168:v:S19.2E:27500:162:88:0:0:0
-TVBS Europe:12168:v:S19.2E:27500:162:89:0:0:0
-Travel:12168:v:S19.2E:27500:163:92:0:0:0
-TCM Espania:12168:v:S19.2E:27500:164:96:0:0:0
-MTV Spain:12168:v:S19.2E:27500:167:112:0:0:0
-TCM France:12168:v:S19.2E:27500:169:64:0:0:0
-RTL2 CH:12188:h:S19.2E:27500:164:112:0:0:0
+Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511
+TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631
+travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001
+TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516
+TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515
 La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501
 LCP:12207:v:S19.2E:27500:165:100:0:0:8506
-Post Filial TV:12226:h:S19.2E:27500:255:256:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:80:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:81:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:82:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:83:0:0:0
 AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000
-AB Channel 1:12266:h:S19.2E:27500:161:84:0:0:0
-Taquilla 0:12285:v:S19.2E:27500:165:100:0:0:0
-CSAT:12324:v:S19.2E:27500:160:80:0:0:0
-Mosaique:12324:v:S19.2E:27500:162:88:0:0:0
-Mosaique 2:12324:v:S19.2E:27500:163:92:0:0:0
-Mosaique 3:12324:v:S19.2E:27500:164:96:0:0:0
-Le Sesame C+:12324:v:S19.2E:27500:165:1965:0:0:0
-FEED:12344:h:S19.2E:27500:163:92:0:0:0
-RTM 1:12363:v:S19.2E:27500:162:96:0:0:0
-ESC 1:12363:v:S19.2E:27500:163:104:0:0:0
-TV5 Europe:12363:v:S19.2E:27500:164:112:0:0:0
-TV7 Tunisia:12363:v:S19.2E:27500:166:128:0:0:0
-ARTE:12363:v:S19.2E:27500:167:137:0:0:0
+AB 1:12266:h:S19.2E:27500:161:84:0:0:17001
+Escales:12285:v:S19.2E:27500:165:100:0:0:17025
+Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612
 RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004
-RTP International:12363:v:S19.2E:27500:300:301:0:0:0
-Fashion TV:12402:v:S19.2E:27500:163:92:0:0:0
-VideoService:12422:h:S19.2E:27500:255:256:0:0:0
-Beta Research promo:12422:h:S19.2E:27500:1023:1024:0:0:0
-Canal Canarias:12441:v:S19.2E:27500:160:80:0:0:0
-Fitur:12441:v:S19.2E:27500:514:662:0:0:0
-Astra Info 1:12552:v:S19.2E:22000:164:112:0:0:0
-Astra Info 2:12552:v:S19.2E:22000:165:120:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:144:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:145:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:146:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:147:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:148:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:149:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:150:0:0:0
+K13:12402:v:S19.2E:27500:163:92:0:0:8704
+Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988
+Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987
+Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986
+Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985
+Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984
+Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180
 RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994
-Astra Mosaic:12552:v:S19.2E:22000:175:176:0:0:0
-MHP test:12604:h:S19.2E:22000:5632:0:0:0:0
 VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010
-VH1 Classic:12699:v:S19.2E:22000:3071:3072:0:0:28647
-MTV 2 Pop:12699:v:S19.2E:22000:3081:3082:0:0:28648
+VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647
+MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44
 Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220
-AC 3 promo:12670:v:S19.2E:22000:308:256:0:0:0
-ORF/ZDF:12699:h:S19.2E:22000:506:507:0:0:13012
+ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012
 VIVA:12670:v:S19.2E:22000:309:310:0:0:12732
-VIVA2:12552:v:S19.2E:22000:171:172:0:0:12120
-MTV German:12699:v:S19.2E:22000:3031:3032:0:0:28643
-:#IFA-TV:10832:h:S19.2E:22000:132:133:32:0:7251
+VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120
+MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
-:#TANGOTV:10832:h:S19.2E:22000:61:62:0:0:61920
diff --git a/channels.conf.cable b/channels.conf.cable
index 14d920011..131208ff7 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -190,7 +190,7 @@ JAZZ:378:M64:C:6900:1:640:0:101:148
 KLASSIK POPUL�R:378:M64:C:6900:1:624:0:101:147
 ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158
 CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163
-VOLKSMUSIK:370:M64:C:6900:1:400:0:101:157
+CHILLOUT:370:M64:C:6900:1:400:0:101:157
 SCHLAGER:370:M64:C:6900:1:384:0:101:162
 GOLD:370:M64:C:6900:1:320:0:101:166
 OLD GOLD:362:M64:C:6900:1:336:0:101:167
diff --git a/channels.conf.terr b/channels.conf.terr
index 62b110c91..4187e1121 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -1,14 +1,43 @@
-: UK channels
-BBC ONE:505833:0:0:0:600:601:0:0:4164
-BBC TWO:505833:0:0:0:610:611:0:0:4228
-ITV 1:481833:0:0:0:512:650:0:0:8261
-Channel 4:481833:0:0:0:2827:2828:0:0:8384
-Channel 5:561833:0:0:0:6017:6018:0:0:12866
-ITV 2:481833:0:0:0:2818:2819:0:0:8325
-BBC CHOICE:505833:0:0:0:620:621:0:0:4351
-BBC NEWS 24:505833:0:0:0:640:641:0:0:4415
-BBC Knowledge:505833:0:0:0:630:631:0:0:4607
-Shop!:561833:0:0:0:6049:6050:0:0:13120
+: UK channels for Crystal Palace, London
+BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164
+BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228
+BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351
+BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415
+Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800
+ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325
+ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261
+Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384
+five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866
+QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120
+TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632
+ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760
+BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768
+BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832
+BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920
+BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984
+BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048
+BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112
+1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176
+BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240
+701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456
+702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520
+Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080
+Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144
+Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208
+UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272
+THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664
+TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728
+UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792
+f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856
+Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048
+Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240
+KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176
+Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304
+jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368
+oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432
+BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496
+Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048
+Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984
 : DVB-T Berlin Germany
 PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403
 SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408
diff --git a/channels.h b/channels.h
index 7eb818c34..52e79b4d3 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.3 2002/10/20 11:50:36 kls Exp $
+ * $Id: channels.h 1.4 2002/11/10 13:01:23 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -41,6 +41,7 @@ class cChannel : public cListObject {
   static char *buffer;
   static const char *ToText(cChannel *Channel);
   enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
+  int __BeginData__;
   char name[MaxChannelName];
   int frequency; // MHz
   int source;
@@ -53,7 +54,6 @@ class cChannel : public cListObject {
   int sid;
   int number;    // Sequence number assigned on load
   bool groupSep;
-  //XXX
   char polarization;
   int inversion;
   int bandwidth;
@@ -63,13 +63,14 @@ class cChannel : public cListObject {
   int transmission;
   int guard;
   int hierarchy;
+  int __EndData__;
   const char *ParametersToString(void);
   bool StringToParameters(const char *s);
 public:
   cChannel(void);
-  cChannel(const cChannel *Channel);
+  cChannel& operator= (const cChannel &Channel);
   const char *ToText(void);
-  bool Parse(const char *s);
+  bool Parse(const char *s, bool AllowNonUniqueID = false);
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
   int Frequency(void) const { return frequency; }
@@ -86,7 +87,6 @@ class cChannel : public cListObject {
   int Number(void) const { return number; }
   void SetNumber(int Number) { number = Number; }
   bool GroupSep(void) const { return groupSep; }
-  //XXX
   char Polarization(void) const { return polarization; }
   int Inversion(void) const { return inversion; }
   int Bandwidth(void) const { return bandwidth; }
@@ -96,10 +96,12 @@ class cChannel : public cListObject {
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
-  //XXX
   bool IsCable(void) { return (source & cSource::st_Mask) == cSource::stCable; }
   bool IsSat(void) { return (source & cSource::st_Mask) == cSource::stSat; }
   bool IsTerr(void) { return (source & cSource::st_Mask) == cSource::stTerr; }
+  uint64 GetChannelID(void) const;
+  const char *GetChannelIDStr(void) const;
+  static uint64 StringToChannelID(const char *s);
   };
 
 class cChannels : public cConfig<cChannel> {
@@ -113,7 +115,9 @@ class cChannels : public cConfig<cChannel> {
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
-  cChannel *GetByServiceID(unsigned short ServiceId);
+  cChannel *GetByServiceID(int Source, unsigned short ServiceID);
+  cChannel *GetByChannelID(uint64 ChannelID);
+  bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
   };
diff --git a/config.h b/config.h
index 22eb9ecdb..af8d92b95 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.138 2002/11/01 09:27:17 kls Exp $
+ * $Id: config.h 1.139 2002/11/08 13:16:12 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.15"
+#define VDRVERSION "1.1.16"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 69178a9e3..edbf5cae8 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.34 2002/11/03 11:51:24 kls Exp $
+ * $Id: device.c 1.35 2002/11/10 10:17:57 kls Exp $
  */
 
 #include "device.h"
@@ -379,7 +379,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 
   if (Result == scrOk) {
      if (LiveView && IsPrimaryDevice()) {
-        cSIProcessor::SetCurrentServiceID(Channel->Sid());
+        cSIProcessor::SetCurrentChannelID(Channel->GetChannelID());
         currentChannel = Channel->Number();
         }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
diff --git a/dvbdevice.c b/dvbdevice.c
index 30d56586d..119a28e68 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.34 2002/11/03 12:31:11 kls Exp $
+ * $Id: dvbdevice.c 1.35 2002/11/10 12:57:17 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -412,7 +412,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // Stop setting system time:
 
   if (siProcessor)
-     siProcessor->SetCurrentTransponder(0);
+     siProcessor->SetCurrentTransponder(0, 0);
 
   // Turn off live PIDs if necessary:
 
@@ -585,7 +585,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // Start setting system time:
 
   if (siProcessor)
-     siProcessor->SetCurrentTransponder(Channel->Frequency());
+     siProcessor->SetCurrentTransponder(Channel->Source(), Channel->Frequency());
 
   return true;
 }
diff --git a/eit.c b/eit.c
index 12045d63d..f8b436c0d 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.59 2002/11/02 12:46:53 kls Exp $
+ * $Id: eit.c 1.60 2002/11/10 15:50:21 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -180,7 +180,7 @@ bool cTDT::SetSystemTime()
 
 // --- cEventInfo ------------------------------------------------------------
 
-cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
+cEventInfo::cEventInfo(uint64 channelid, unsigned short eventid)
 {
    pTitle = NULL;
    pSubtitle = NULL;
@@ -190,7 +190,7 @@ cEventInfo::cEventInfo(unsigned short serviceid, unsigned short eventid)
    tTime = 0;
    uTableID = 0;
    uEventID = eventid;
-   uServiceID = serviceid;
+   uChannelID = channelid;
    nChannelNumber = 0;
 }
 
@@ -325,15 +325,15 @@ void cEventInfo::SetEventID(unsigned short evid)
    uEventID = evid;
 }
 /**  */
-void cEventInfo::SetServiceID(unsigned short servid)
+void cEventInfo::SetChannelID(uint64 channelid)
 {
-   uServiceID = servid;
+   uChannelID = channelid;
 }
 
 /**  */
-unsigned short cEventInfo::GetServiceID() const
+uint64 cEventInfo::GetChannelID() const
 {
-   return uServiceID;
+   return uChannelID;
 }
 
 /**  */
@@ -368,7 +368,7 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
                           if (n == 3 || n == 4) {
                              pEvent = (cEventInfo *)Schedule->GetEvent(uEventID, tTime);
                              if (!pEvent)
-                                pEvent = Schedule->AddEvent(new cEventInfo(Schedule->GetServiceID(), uEventID));
+                                pEvent = Schedule->AddEvent(new cEventInfo(Schedule->GetChannelID(), uEventID));
                              if (pEvent) {
                                 pEvent->SetTableID(uTableID);
                                 pEvent->SetTime(tTime);
@@ -404,24 +404,24 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
 struct tEpgBugFixStats {
   int hits;
   int n;
-  unsigned short serviceIDs[MAXEPGBUGFIXCHANS];
+  uint64 channelIDs[MAXEPGBUGFIXCHANS];
   tEpgBugFixStats(void) { hits = n = 0; }
   };
 
 tEpgBugFixStats EpgBugFixStats[MAXEPGBUGFIXSTATS];
 
-static void EpgBugFixStat(int Number, unsigned int ServiceID)
+static void EpgBugFixStat(int Number, uint64 ChannelID)
 {
   if (0 <= Number && Number < MAXEPGBUGFIXSTATS) {
      tEpgBugFixStats *p = &EpgBugFixStats[Number];
      p->hits++;
      int i = 0;
      for (; i < p->n; i++) {
-         if (p->serviceIDs[i] == ServiceID)
+         if (p->channelIDs[i] == ChannelID)
             break;
          }
      if (i == p->n && p->n < MAXEPGBUGFIXCHANS)
-        p->serviceIDs[p->n++] = ServiceID;
+        p->channelIDs[p->n++] = ChannelID;
      }
 }
 
@@ -448,7 +448,7 @@ static void ReportEpgBugFixStats(bool Reset = false)
             char *q = buffer;
             q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
             for (int c = 0; c < p->n; c++) {
-                cChannel *channel = Channels.GetByServiceID(p->serviceIDs[c]);
+                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c]);
                 if (channel) {
                    q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
                    delim = ", ";
@@ -499,7 +499,7 @@ void cEventInfo::FixEpgBugs(void)
               char *s = e ? strdup(e) : NULL;
               free(pSubtitle);
               pSubtitle = s;
-              EpgBugFixStat(0, GetServiceID());
+              EpgBugFixStat(0, GetChannelID());
               // now the fixes #1 and #2 below will handle the rest
               }
            }
@@ -524,7 +524,7 @@ void cEventInfo::FixEpgBugs(void)
               free(pExtendedDescription);
               pSubtitle = s;
               pExtendedDescription = d;
-              EpgBugFixStat(1, GetServiceID());
+              EpgBugFixStat(1, GetChannelID());
               }
            }
         }
@@ -541,7 +541,7 @@ void cEventInfo::FixEpgBugs(void)
            memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle));
            pExtendedDescription = pSubtitle;
            pSubtitle = NULL;
-           EpgBugFixStat(2, GetServiceID());
+           EpgBugFixStat(2, GetChannelID());
            }
         }
 
@@ -553,7 +553,7 @@ void cEventInfo::FixEpgBugs(void)
      if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
         free(pSubtitle);
         pSubtitle = NULL;
-        EpgBugFixStat(3, GetServiceID());
+        EpgBugFixStat(3, GetChannelID());
         }
 
      // ZDF.info puts the Subtitle between double quotes, which is nothing
@@ -569,7 +569,7 @@ void cEventInfo::FixEpgBugs(void)
            char *p = strrchr(pSubtitle, '"');
            if (p)
               *p = 0;
-           EpgBugFixStat(4, GetServiceID());
+           EpgBugFixStat(4, GetChannelID());
            }
         }
 
@@ -590,7 +590,7 @@ void cEventInfo::FixEpgBugs(void)
               if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
                  if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
                     memmove(p, p + 2, strlen(p + 2) + 1);
-                    EpgBugFixStat(5, GetServiceID());
+                    EpgBugFixStat(5, GetChannelID());
                     }
                  }
               p++;
@@ -608,10 +608,10 @@ void cEventInfo::FixEpgBugs(void)
 
 // --- cSchedule -------------------------------------------------------------
 
-cSchedule::cSchedule(unsigned short servid)
+cSchedule::cSchedule(uint64 channelid)
 {
    pPresent = pFollowing = NULL;
-   uServiceID = servid;
+   uChannelID = channelid;
 }
 
 
@@ -645,14 +645,14 @@ const cEventInfo *cSchedule::GetFollowingEvent(void) const
   return pe;
 }
 
-void cSchedule::SetServiceID(unsigned short servid)
+void cSchedule::SetChannelID(uint64 channelid)
 {
-   uServiceID = servid;
+   uChannelID = channelid;
 }
 /**  */
-unsigned short cSchedule::GetServiceID() const
+uint64 cSchedule::GetChannelID() const
 {
-   return uServiceID;
+   return uChannelID;
 }
 /**  */
 const cEventInfo * cSchedule::GetEvent(unsigned short uEventID, time_t tTime) const
@@ -735,10 +735,10 @@ void cSchedule::Cleanup(time_t tTime)
 /**  */
 void cSchedule::Dump(FILE *f, const char *Prefix) const
 {
-   cChannel *channel = Channels.GetByServiceID(uServiceID);
+   cChannel *channel = Channels.GetByChannelID(uChannelID);
    if (channel)
    {
-      fprintf(f, "%sC %u %s\n", Prefix, uServiceID, channel->Name());
+      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelIDStr(), channel->Name());
       for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
          p->Dump(f, Prefix);
       fprintf(f, "%sc\n", Prefix);
@@ -751,12 +751,22 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
      char *s;
      while ((s = readline(f)) != NULL) {
            if (*s == 'C') {
-              unsigned int uServiceID;
-              if (1 == sscanf(s + 1, "%u", &uServiceID)) {
-                 cSchedule *p = (cSchedule *)Schedules->AddServiceID(uServiceID);
-                 if (p) {
-                    if (!cEventInfo::Read(f, p))
-                       return false;
+              s = skipspace(s + 1);
+              char *p = strchr(s, ' ');
+              if (p)
+                 *p = 0; // strips optional channel name
+              if (*s) {
+                 uint64 uChannelID = cChannel::StringToChannelID(s);
+                 if (uChannelID) {
+                    cSchedule *p = (cSchedule *)Schedules->AddChannelID(uChannelID);
+                    if (p) {
+                       if (!cEventInfo::Read(f, p))
+                          return false;
+                       }
+                    }
+                 else {
+                    esyslog("ERROR: illegal channel ID: %s", s);
+                    return false;
                     }
                  }
               }
@@ -775,28 +785,28 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
 cSchedules::cSchedules()
 {
    pCurrentSchedule = NULL;
-   uCurrentServiceID = 0;
+   uCurrentChannelID = 0;
 }
 
 cSchedules::~cSchedules()
 {
 }
 /**  */
-const cSchedule *cSchedules::AddServiceID(unsigned short servid)
+const cSchedule *cSchedules::AddChannelID(uint64 channelid)
 {
-  const cSchedule *p = GetSchedule(servid);
+  const cSchedule *p = GetSchedule(channelid);
   if (!p) {
-     Add(new cSchedule(servid));
-     p = GetSchedule(servid);
+     Add(new cSchedule(channelid));
+     p = GetSchedule(channelid);
      }
   return p;
 }
 /**  */
-const cSchedule *cSchedules::SetCurrentServiceID(unsigned short servid)
+const cSchedule *cSchedules::SetCurrentChannelID(uint64 channelid)
 {
-  pCurrentSchedule = AddServiceID(servid);
+  pCurrentSchedule = AddChannelID(channelid);
   if (pCurrentSchedule)
-     uCurrentServiceID = servid;
+     uCurrentChannelID = channelid;
   return pCurrentSchedule;
 }
 /**  */
@@ -805,14 +815,14 @@ const cSchedule * cSchedules::GetSchedule() const
    return pCurrentSchedule;
 }
 /**  */
-const cSchedule * cSchedules::GetSchedule(unsigned short servid) const
+const cSchedule * cSchedules::GetSchedule(uint64 channelid) const
 {
    cSchedule *p;
 
    p = First();
    while (p != NULL)
    {
-      if (p->GetServiceID() == servid)
+      if (p->GetChannelID() == channelid)
          return p;
       p = Next(p);
    }
@@ -856,7 +866,7 @@ class cEIT {
    cEIT(unsigned char *buf, int length, cSchedules *Schedules);
    ~cEIT();
   /**  */
-  int ProcessEIT(unsigned char *buffer);
+  int ProcessEIT(unsigned char *buffer, int CurrentSource);
 
 protected: // Protected methods
   /** returns true if this EIT covers a
@@ -879,7 +889,7 @@ cEIT::~cEIT()
 }
 
 /**  */
-int cEIT::ProcessEIT(unsigned char *buffer)
+int cEIT::ProcessEIT(unsigned char *buffer, int CurrentSource)
 {
    cEventInfo *pEvent, *rEvent = NULL;
    cSchedule *pSchedule, *rSchedule = NULL;
@@ -893,18 +903,19 @@ int cEIT::ProcessEIT(unsigned char *buffer)
 
    if (VdrProgramInfos) {
       for (VdrProgramInfo = (struct VdrProgramInfo *) VdrProgramInfos->Head; VdrProgramInfo; VdrProgramInfo = (struct VdrProgramInfo *) xSucc (VdrProgramInfo)) {
-          // Drop events that belong to an "other TS" and are very long (some stations broadcast bogus data for "other" channels):
-          if (VdrProgramInfo->Duration >= 86400 && (tid == 0x4F || tid == 0x60 || tid == 0x61))
-             continue;
-          pSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ServiceID);
+          //XXX TODO use complete channel ID
+          cChannel *channel = Channels.GetByServiceID(CurrentSource, VdrProgramInfo->ServiceID);
+          uint64 channelID = channel ? channel->GetChannelID() : (uint64(CurrentSource) << 48) | VdrProgramInfo->ServiceID;
+          //XXX
+          pSchedule = (cSchedule *)schedules->GetSchedule(channelID);
           if (!pSchedule) {
-             schedules->Add(new cSchedule(VdrProgramInfo->ServiceID));
-             pSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ServiceID);
+             schedules->Add(new cSchedule(channelID));
+             pSchedule = (cSchedule *)schedules->GetSchedule(channelID);
              if (!pSchedule)
                 break;
              }
           if (VdrProgramInfo->ReferenceServiceID) {
-             rSchedule = (cSchedule *)schedules->GetSchedule(VdrProgramInfo->ReferenceServiceID);
+             rSchedule = (cSchedule *)schedules->GetSchedule((uint64(CurrentSource) << 48) | VdrProgramInfo->ReferenceServiceID);
              if (!rSchedule)
                 break;
              rEvent = (cEventInfo *)rSchedule->GetEvent((unsigned short)VdrProgramInfo->ReferenceEventID);
@@ -915,7 +926,7 @@ int cEIT::ProcessEIT(unsigned char *buffer)
           if (!pEvent) {
              // If we don't have that event ID yet, we create a new one.
              // Otherwise we copy the information into the existing event anyway, because the data might have changed.
-             pEvent = pSchedule->AddEvent(new cEventInfo(VdrProgramInfo->ServiceID, VdrProgramInfo->EventID));
+             pEvent = pSchedule->AddEvent(new cEventInfo(channelID, VdrProgramInfo->EventID));
              if (!pEvent)
                 break;
              pEvent->SetTableID(tid);
@@ -988,6 +999,8 @@ cSIProcessor::cSIProcessor(const char *FileName)
 {
    fileName = strdup(FileName);
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
+   currentSource = 0;
+   currentTransponder = 0;
    filters = NULL;
    if (!numSIProcessors++) // the first one creates it
       schedules = new cSchedules;
@@ -1167,7 +1180,7 @@ void cSIProcessor::Action()
                            {
                               cMutexLock MutexLock(&schedulesMutex);
                               cEIT ceit(buf, seclen, schedules);
-                              ceit.ProcessEIT(buf);
+                              ceit.ProcessEIT(buf, currentSource);
                            }
                            else
                               dsyslog("Received stuffing section in EIT\n");
@@ -1250,16 +1263,17 @@ bool cSIProcessor::ShutDownFilters(void)
 }
 
 /** */
-void cSIProcessor::SetCurrentTransponder(int CurrentTransponder)
+void cSIProcessor::SetCurrentTransponder(int CurrentSource, int CurrentTransponder)
 {
+  currentSource = CurrentSource;
   currentTransponder = CurrentTransponder;
 }
 
 /** */
-bool cSIProcessor::SetCurrentServiceID(unsigned short servid)
+bool cSIProcessor::SetCurrentChannelID(uint64 channelid)
 {
   cMutexLock MutexLock(&schedulesMutex);
-  return schedules ? schedules->SetCurrentServiceID(servid) : false;
+  return schedules ? schedules->SetCurrentChannelID(channelid) : false;
 }
 
 void cSIProcessor::TriggerDump(void)
diff --git a/eit.h b/eit.h
index 537400322..d906725e1 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.20 2002/11/02 12:36:36 kls Exp $
+ * $Id: eit.h 1.21 2002/11/10 12:58:27 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -32,7 +32,7 @@ class cEventInfo : public cListObject {
   friend class cEIT;
 private:
   unsigned char uTableID;           // Table ID this event came from
-  unsigned short uServiceID;        // Service ID of program for that event
+  uint64 uChannelID;                // Channel ID of program for that event
   bool bIsFollowing;                // true if this is the next event on this channel
   bool bIsPresent;                  // true if this is the present event running
   char *pExtendedDescription;       // Extended description of this event
@@ -47,13 +47,13 @@ class cEventInfo : public cListObject {
   void SetFollowing(bool foll);
   void SetPresent(bool pres);
   void SetTitle(const char *string);
-  void SetServiceID(unsigned short servid);
+  void SetChannelID(uint64 channelid);
   void SetEventID(unsigned short evid);
   void SetDuration(long l);
   void SetTime(time_t t);
   void SetExtendedDescription(const char *string);
   void SetSubtitle(const char *string);
-  cEventInfo(unsigned short serviceid, unsigned short eventid);
+  cEventInfo(uint64 channelid, unsigned short eventid);
 public:
   ~cEventInfo();
   const unsigned char GetTableID(void) const;
@@ -68,7 +68,7 @@ class cEventInfo : public cListObject {
   unsigned short GetEventID(void) const;
   long GetDuration(void) const;
   time_t GetTime(void) const;
-  unsigned short GetServiceID(void) const;
+  uint64 GetChannelID(void) const;
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
   void Dump(FILE *f, const char *Prefix = "") const;
@@ -82,21 +82,21 @@ class cSchedule : public cListObject  {
 private:
   cEventInfo *pPresent;
   cEventInfo *pFollowing;
-  unsigned short uServiceID;
+  uint64 uChannelID;
   cList<cEventInfo> Events;
 protected:
-  void SetServiceID(unsigned short servid);
+  void SetChannelID(uint64 channelid);
   bool SetFollowingEvent(cEventInfo *pEvent);
   bool SetPresentEvent(cEventInfo *pEvent);
   void Cleanup(time_t tTime);
   void Cleanup(void);
-  cSchedule(unsigned short servid = 0);
+  cSchedule(uint64 channelid = 0);
 public:
   ~cSchedule();
   cEventInfo *AddEvent(cEventInfo *EventInfo);
   const cEventInfo *GetPresentEvent(void) const;
   const cEventInfo *GetFollowingEvent(void) const;
-  unsigned short GetServiceID(void) const;
+  uint64 GetChannelID(void) const;
   const cEventInfo *GetEvent(unsigned short uEventID, time_t tTime = 0) const;
   const cEventInfo *GetEventAround(time_t tTime) const;
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
@@ -110,15 +110,15 @@ class cSchedules : public cList<cSchedule> {
   friend class cSIProcessor;
 private:
   const cSchedule *pCurrentSchedule;
-  unsigned short uCurrentServiceID;
+  uint64 uCurrentChannelID;
 protected:
-  const cSchedule *AddServiceID(unsigned short servid);
-  const cSchedule *SetCurrentServiceID(unsigned short servid);
+  const cSchedule *AddChannelID(uint64 channelid);
+  const cSchedule *SetCurrentChannelID(uint64 channelid);
   void Cleanup();
 public:
   cSchedules(void);
   ~cSchedules();
-  const cSchedule *GetSchedule(unsigned short servid) const;
+  const cSchedule *GetSchedule(uint64 channelid) const;
   const cSchedule *GetSchedule(void) const;
   void Dump(FILE *f, const char *Prefix = "") const;
   static bool Read(FILE *f);
@@ -141,6 +141,7 @@ class cSIProcessor : public cThread {
   static const char *epgDataFileName;
   static time_t lastDump;
   bool masterSIProcessor;
+  int currentSource;
   int currentTransponder;
   SIP_FILTER *filters;
   char *fileName;
@@ -160,8 +161,8 @@ class cSIProcessor : public cThread {
   static bool Read(FILE *f = NULL);
   static void Clear(void);
   void SetStatus(bool On);
-  void SetCurrentTransponder(int CurrentTransponder);
-  static bool SetCurrentServiceID(unsigned short servid);
+  void SetCurrentTransponder(int CurrentSource, int CurrentTransponder);
+  static bool SetCurrentChannelID(uint64 channelid);
   static void TriggerDump(void);
   };
 
diff --git a/i18n.c b/i18n.c
index 08b276509..79fa60793 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.99 2002/10/27 14:24:00 kls Exp $
+ * $Id: i18n.c 1.100 2002/11/10 12:32:30 kls Exp $
  *
  * Translations provided by:
  *
@@ -1468,6 +1468,22 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
   },
+  { "Channel settings are not unique!",
+    "Kanaleinstellungen sind nicht eindeutig!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
     "Zaklenjen kanal (snemanje)!",
diff --git a/menu.c b/menu.c
index 47ad091b8..2e29b02cb 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.222 2002/11/01 12:15:45 kls Exp $
+ * $Id: menu.c 1.224 2002/11/10 16:05:15 kls Exp $
  */
 
 #include "menu.h"
@@ -546,16 +546,18 @@ class cMenuEditChannel : public cOsdMenu {
   cChannel data;
   void Setup(void);
 public:
-  cMenuEditChannel(int Index);
+  cMenuEditChannel(cChannel *Channel, bool New = false);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuEditChannel::cMenuEditChannel(int Index)
+cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 :cOsdMenu(tr("Edit channel"), 14)
 {
-  channel = Channels.Get(Index);
+  channel = Channel;
   if (channel) {
      data = *channel;
+     if (New)
+        channel = NULL;
      Setup();
      }
 }
@@ -603,10 +605,26 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      if (Key == kOk) {
-        if (channel)
-           *channel = data;
-        Channels.Save();
-        state = osBack;
+        if (Channels.HasUniqueChannelID(&data, channel)) {
+           if (channel) {
+              *channel = data;
+              isyslog("edited channel %d %s", channel->Number(), data.ToText());
+              state = osBack;
+              }
+           else {
+              channel = new cChannel;
+              *channel = data;
+              Channels.Add(channel);
+              Channels.ReNumber();
+              isyslog("added channel %d %s", channel->Number(), data.ToText());
+              state = osUser1;
+              }
+           Channels.Save();
+           }
+        else {
+           Interface->Error(tr("Channel settings are not unique!"));
+           state = osContinue;
+           }
         }
      }
   if (Key != kNone && (data.source & cSource::st_Mask) != (oldSource & cSource::st_Mask))
@@ -651,7 +669,7 @@ class cMenuChannels : public cOsdMenu {
   eOSState Switch(void);
   eOSState Edit(void);
   eOSState New(void);
-  eOSState Del(void);
+  eOSState Delete(void);
   virtual void Move(int From, int To);
 public:
   cMenuChannels(void);
@@ -696,10 +714,8 @@ eOSState cMenuChannels::Edit(void)
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   cChannel *ch = Channels.Get(Current());
-  if (ch) {
-     isyslog("editing channel %d", ch->Number());
-     return AddSubMenu(new cMenuEditChannel(Current()));
-     }
+  if (ch)
+     return AddSubMenu(new cMenuEditChannel(ch));
   return osContinue;
 }
 
@@ -707,16 +723,10 @@ eOSState cMenuChannels::New(void)
 {
   if (HasSubMenu())
      return osContinue;
-  cChannel *channel = new cChannel(Channels.Get(Current()));
-  Channels.Add(channel);
-  Channels.ReNumber();
-  Add(new cMenuChannelItem(channel), true);
-  Channels.Save();
-  isyslog("channel %d added", channel->Number());
-  return AddSubMenu(new cMenuEditChannel(Current()));
+  return AddSubMenu(new cMenuEditChannel(Channels.Get(Current()), true));
 }
 
-eOSState cMenuChannels::Del(void)
+eOSState cMenuChannels::Delete(void)
 {
   if (Count() > 0) {
      int Index = Current();
@@ -753,16 +763,27 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
 
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk:     return Switch();
-       case kRed:    return Edit();
-       case kGreen:  return New();
-       case kYellow: return Del();
-       case kBlue:   Mark(); break;
-       default: break;
-       }
-     }
+  switch (state) {
+    case osUser1: {
+         cChannel *channel = Channels.Last();
+         if (channel) {
+            Add(new cMenuChannelItem(channel), true);
+            return CloseSubMenu();
+            }
+         }
+         break;
+    default:
+         if (state == osUnknown) {
+            switch (Key) {
+              case kOk:     return Switch();
+              case kRed:    return Edit();
+              case kGreen:  return New();
+              case kYellow: return Delete();
+              case kBlue:   Mark(); break;
+              default: break;
+              }
+            }
+    }
   return state;
 }
 
@@ -924,7 +945,7 @@ class cMenuTimers : public cOsdMenu {
 private:
   eOSState Edit(void);
   eOSState New(void);
-  eOSState Del(void);
+  eOSState Delete(void);
   eOSState OnOff(void);
   virtual void Move(int From, int To);
   eOSState Summary(void);
@@ -991,7 +1012,7 @@ eOSState cMenuTimers::New(void)
   return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
 }
 
-eOSState cMenuTimers::Del(void)
+eOSState cMenuTimers::Delete(void)
 {
   // Check if this timer is active:
   cTimer *ti = CurrentTimer();
@@ -1040,7 +1061,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        case kOk:     return Summary();
        case kRed:    return Edit();
        case kGreen:  return New();
-       case kYellow: return Del();
+       case kYellow: return Delete();
        case kBlue:   if (Setup.SortTimers)
                         OnOff();
                      else
@@ -1068,7 +1089,7 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
 {
   eventInfo = EventInfo;
   if (eventInfo) {
-     cChannel *channel = Channels.GetByServiceID(eventInfo->GetServiceID());
+     cChannel *channel = Channels.GetByChannelID(eventInfo->GetChannelID());
      if (channel) {
         char *buffer;
         asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
@@ -1162,7 +1183,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 
         pArray[num] = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
         if (pArray[num]) {
-           cChannel *channel = Channels.GetByServiceID(pArray[num]->GetServiceID());
+           cChannel *channel = Channels.GetByChannelID(pArray[num]->GetChannelID());
            if (channel) {
               pArray[num]->SetChannelNumber(channel->Number());
               num++;
@@ -1192,7 +1213,7 @@ eOSState cMenuWhatsOn::Switch(void)
 {
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {
-     cChannel *channel = Channels.GetByServiceID(item->eventInfo->GetServiceID());
+     cChannel *channel = Channels.GetByChannelID(item->eventInfo->GetChannelID());
      if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
         return osEnd;
      }
@@ -1313,7 +1334,7 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
   SetTitle(buffer);
   free(buffer);
   if (schedules) {
-     const cSchedule *Schedule = Channel->Sid() ? schedules->GetSchedule(Channel->Sid()) : schedules->GetSchedule();
+     const cSchedule *Schedule = schedules->GetSchedule(Channel->GetChannelID());
      int num = Schedule->NumEvents();
      const cEventInfo **pArray = MALLOC(const cEventInfo *, num);
      if (pArray) {
@@ -1376,7 +1397,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                         if (!now && !next) {
                            int ChannelNr = 0;
                            if (Count()) {
-                              cChannel *channel = Channels.GetByServiceID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetServiceID());
+                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetChannelID());
                               if (channel)
                                  ChannelNr = channel->Number();
                               }
@@ -1403,7 +1424,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
      now = next = false;
      const cEventInfo *ei = cMenuWhatsOn::ScheduleEventInfo();
      if (ei) {
-        cChannel *channel = Channels.GetByServiceID(ei->GetServiceID());
+        cChannel *channel = Channels.GetByChannelID(ei->GetChannelID());
         if (channel) {
            PrepareSchedule(channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
@@ -2713,7 +2734,7 @@ bool cRecordControl::GetEventInfo(void)
         cMutexLock MutexLock;
         const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
         if (Schedules) {
-           const cSchedule *Schedule = Schedules->GetSchedule(channel->Sid());
+           const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
            if (Schedule) {
               eventInfo = Schedule->GetEventAround(Time);
               if (eventInfo) {
diff --git a/osd.c b/osd.c
index acd9aec4f..8324874cb 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.36 2002/10/13 10:31:28 kls Exp $
+ * $Id: osd.c 1.37 2002/11/10 12:30:09 kls Exp $
  */
 
 #include "osd.h"
@@ -599,20 +599,24 @@ eOSState cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
   delete subMenu;
   subMenu = SubMenu;
   subMenu->Display();
-  return osContinue; // convenience return value (see cMenuMain)
+  return osContinue; // convenience return value
+}
+
+eOSState cOsdMenu::CloseSubMenu()
+{
+  delete subMenu;
+  subMenu = NULL;
+  RefreshCurrent();
+  Display();
+  return osContinue; // convenience return value
 }
 
 eOSState cOsdMenu::ProcessKey(eKeys Key)
 {
   if (subMenu) {
      eOSState state = subMenu->ProcessKey(Key);
-     if (state == osBack) {
-        delete subMenu;
-        subMenu = NULL;
-        RefreshCurrent();
-        Display();
-        state = osContinue;
-        }
+     if (state == osBack)
+        return CloseSubMenu();
      return state;
      }
 
diff --git a/osd.h b/osd.h
index 861b04ee8..9fb515b41 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.34 2002/08/11 11:42:15 kls Exp $
+ * $Id: osd.h 1.36 2002/11/10 12:28:57 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -107,7 +107,7 @@ class cOsdItem : public cListObject {
   virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
   virtual void Set(void) {}
   virtual eOSState ProcessKey(eKeys Key);
-};
+  };
 
 class cOsdObject {
 protected:
@@ -119,7 +119,7 @@ class cOsdObject {
   int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
   virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
-};
+  };
 
 class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 private:
@@ -147,6 +147,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   void Mark(void);
   eOSState HotKey(eKeys Key);
   eOSState AddSubMenu(cOsdMenu *SubMenu);
+  eOSState CloseSubMenu();
   bool HasSubMenu(void) { return subMenu; }
   void SetStatus(const char *s);
   void SetTitle(const char *Title, bool ShowDate = true);
diff --git a/remote.h b/remote.h
index 35cf62e53..b23b93354 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.19 2002/11/01 10:48:11 kls Exp $
+ * $Id: remote.h 1.20 2002/11/09 11:07:33 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -16,8 +16,6 @@
 #include "thread.h"
 #include "tools.h"
 
-typedef unsigned long long int uint64;
-
 class cRemote : public cListObject {
 private:
   enum { MaxKeys = MAXKEYSINMACRO };
diff --git a/svdrp.c b/svdrp.c
index 2859fb9de..66b420cff 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.48 2002/10/20 12:45:03 kls Exp $
+ * $Id: svdrp.c 1.49 2002/11/10 12:09:56 kls Exp $
  */
 
 #include "svdrp.h"
@@ -776,15 +776,20 @@ void cSVDRP::CmdMODC(const char *Option)
         tail = skipspace(tail);
         cChannel *channel = Channels.GetByNumber(n);
         if (channel) {
-           cChannel c = *channel;
-           if (!c.Parse(tail)) {
-              Reply(501, "Error in channel settings");
-              return;
+           cChannel ch;
+           if (ch.Parse(tail, true)) {
+              if (Channels.HasUniqueChannelID(&ch, channel)) {
+                 *channel = ch;
+                 Channels.ReNumber();
+                 Channels.Save();
+                 isyslog("modifed channel %d %s", channel->Number(), channel->ToText());
+                 Reply(250, "%d %s", channel->Number(), channel->ToText());
+                 }
+              else
+                 Reply(501, "Channel settings are not unique");
               }
-           *channel = c;
-           Channels.Save();
-           isyslog("channel %d modified", channel->Number());
-           Reply(250, "%d %s", channel->Number(), channel->ToText());
+           else
+              Reply(501, "Error in channel settings");
            }
         else
            Reply(501, "Channel \"%d\" not defined", n);
@@ -844,13 +849,19 @@ void cSVDRP::CmdMOVT(const char *Option)
 void cSVDRP::CmdNEWC(const char *Option)
 {
   if (*Option) {
-     cChannel *channel = new cChannel;
-     if (channel->Parse(Option)) {
-        Channels.Add(channel);
-        Channels.ReNumber();
-        Channels.Save();
-        isyslog("channel %d added", channel->Number());
-        Reply(250, "%d %s", channel->Number(), channel->ToText());
+     cChannel ch;
+     if (ch.Parse(Option, true)) {
+        if (Channels.HasUniqueChannelID(&ch)) {
+           cChannel *channel = new cChannel;
+           *channel = ch;
+           Channels.Add(channel);
+           Channels.ReNumber();
+           Channels.Save();
+           isyslog("new channel %d %s", channel->Number(), channel->ToText());
+           Reply(250, "%d %s", channel->Number(), channel->ToText());
+           }
+        else
+           Reply(501, "Channel settings are not unique");
         }
      else
         Reply(501, "Error in channel settings");
diff --git a/timers.c b/timers.c
index 76f86a5eb..604452221 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.1 2002/10/20 12:28:55 kls Exp $
+ * $Id: timers.c 1.2 2002/11/10 10:19:12 kls Exp $
  */
 
 #include "timers.h"
@@ -49,7 +49,7 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   startTime = stopTime = 0;
   recording = pending = false;
   active = true;
-  channel = Channels.GetByServiceID(EventInfo->GetServiceID());
+  channel = Channels.GetByChannelID(EventInfo->GetChannelID());
   time_t tstart = EventInfo->GetTime();
   time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
   tstart -= Setup.MarginStart * 60;
@@ -92,22 +92,17 @@ bool cTimer::operator< (const cListObject &ListObject)
   return t1 < t2 || (t1 == t2 && priority > ti->priority);
 }
 
-const char *cTimer::ToText(cTimer *Timer)
+const char *cTimer::ToText(bool UseChannelID)
 {
   free(buffer);
-  strreplace(Timer->file, ':', '|');
-  strreplace(Timer->summary, '\n', '|');
-  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->Channel()->Number(), PrintDay(Timer->day, Timer->firstday), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
-  strreplace(Timer->summary, '|', '\n');
-  strreplace(Timer->file, '|', ':');
+  strreplace(file, ':', '|');
+  strreplace(summary, '\n', '|');
+  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", active, UseChannelID ? Channel()->GetChannelIDStr() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
+  strreplace(summary, '|', '\n');
+  strreplace(file, '|', ':');
   return buffer;
 }
 
-const char *cTimer::ToText(void)
-{
-  return ToText(this);
-}
-
 int cTimer::TimeToInt(int t)
 {
   return (t / 100 * 60 + t % 100) * 60;
@@ -189,8 +184,9 @@ const char *cTimer::PrintFirstDay(void)
 
 bool cTimer::Parse(const char *s)
 {
-  char *buffer1 = NULL;
-  char *buffer2 = NULL;
+  char *channelbuffer = NULL;
+  char *daybuffer = NULL;
+  char *filebuffer = NULL;
   free(summary);
   summary = NULL;
   //XXX Apparently sscanf() doesn't work correctly if the last %a argument
@@ -208,34 +204,35 @@ bool cTimer::Parse(const char *s)
      strcat(strn0cpy(s2, s, l2 + 1), " \n");
      s = s2;
      }
-  int ch = 0;
-  if (8 <= sscanf(s, "%d :%d :%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &ch, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
+  bool result = false;
+  if (8 <= sscanf(s, "%d :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
      if (summary && !*skipspace(summary)) {
         free(summary);
         summary = NULL;
         }
      //TODO add more plausibility checks
-     day = ParseDay(buffer1, &firstday);
-     strn0cpy(file, buffer2, MaxFileName);
+     day = ParseDay(daybuffer, &firstday);
+     result = day != 0;
+     strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
-     free(buffer1);
-     free(buffer2);
-     free(s2);
-     channel = Channels.GetByNumber(ch);
+     uint64 cid = cChannel::StringToChannelID(channelbuffer);
+     channel = cid ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
      if (!channel) {
-        esyslog("ERROR: channel %d not defined", ch);
-        return false;
+        esyslog("ERROR: channel %s not defined", channelbuffer);
+        result = false;
         }
-     return day != 0;
      }
+  free(channelbuffer);
+  free(daybuffer);
+  free(filebuffer);
   free(s2);
-  return false;
+  return result;
 }
 
 bool cTimer::Save(FILE *f)
 {
-  return fprintf(f, ToText()) > 0;
+  return fprintf(f, ToText(true)) > 0;
 }
 
 bool cTimer::IsSingleEvent(void)
diff --git a/timers.h b/timers.h
index 8dc762e3d..933c88e9b 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.1 2002/10/20 11:52:23 kls Exp $
+ * $Id: timers.h 1.2 2002/11/10 10:17:05 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -36,7 +36,6 @@ class cTimer : public cListObject {
   char file[MaxFileName];
   time_t firstday;
   char *summary;
-  static const char *ToText(cTimer *Timer);
 public:
   cTimer(bool Instant = false);
   cTimer(const cEventInfo *EventInfo);
@@ -55,7 +54,7 @@ class cTimer : public cListObject {
   const char *File(void) { return file; }
   time_t FirstDay(void) { return firstday; }
   const char *Summary(void) { return summary; }
-  const char *ToText(void);
+  const char *ToText(bool UseChannelID = false);
   bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void);
diff --git a/tools.c b/tools.c
index df2d57051..68bfb7e4b 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.72 2002/10/19 12:32:53 kls Exp $
+ * $Id: tools.c 1.73 2002/11/09 15:33:47 kls Exp $
  */
 
 #include "tools.h"
@@ -243,6 +243,13 @@ bool isnumber(const char *s)
   return true;
 }
 
+const char *itoa(int n)
+{
+  static char buf[16];
+  snprintf(buf, sizeof(buf), "%d", n);
+  return buf;
+}
+
 const char *AddDirectory(const char *DirName, const char *FileName)
 {
   static char *buf = NULL;
diff --git a/tools.h b/tools.h
index 08f2429b4..efa2de6a5 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.51 2002/10/19 12:31:50 kls Exp $
+ * $Id: tools.h 1.52 2002/11/09 15:32:36 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 typedef unsigned char uchar;
+typedef unsigned long long int uint64;
 
 extern int SysLogLevel;
 
@@ -68,6 +69,7 @@ int numdigits(int n);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
+const char *itoa(int n); // returns a statically allocated string!
 const char *AddDirectory(const char *DirName, const char *FileName); // returns a statically allocated string!
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
diff --git a/vdr.5 b/vdr.5
index 2db8a7b6c..9720a6575 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.11 2002/10/27 15:36:44 kls Exp $
+.\" $Id: vdr.5 1.12 2002/11/10 10:10:15 kls Exp $
 .\"
-.TH vdr 5 "7 Oct 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "10 Nov 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -120,6 +120,18 @@ l l.
 .TP
 .B SID
 The service ID of this channel.
+.PP
+A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
+which is a string that looks like this:
+
+\fBS19.2E-0-12188-12003\fR
+
+The components of this string are the \fBSource\fR (S19.2E), \fBFrequency\fR
+(12188, MHz) and \fBSID\fR (12003) as defined above. The part that is currently
+\fB0\fR is reserved for future use.
+.br
+The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
+files to properly identify the channels.
 .SS TIMERS
 The file \fItimers.conf\fR contains the timer setup.
 Each line contains one timer definition, with individual fields
@@ -143,7 +155,13 @@ Note: in order to allow future extensibility, external programs using the
 and leave the lower 16 bit untouched.
 .TP
 .B Channel
-The number of the channel to record.
+The channel to record from. This is either the channel number as shown in the
+on-screen menus, or a complete channel ID. When reading \fItimers.conf\fR 
+any channel numbers will be mapped to the respective channel ids and when
+the file is written again, there will only be channel ids. Channel numbers
+are accepted as input in order to allow easier creation of timers when
+manually editing \fItimers.conf\fR. Also, when timers are listed via SVDRP
+commands, the channels are given as numbers.
 .TP
 .B Day
 The day when this timer shall record.
@@ -472,7 +490,7 @@ The following tag characters are defined:
 .TS
 tab (@);
 l l.
-\fBC\fR@<service id> <channel name>
+\fBC\fR@<channel id> <channel name>
 \fBE\fR@<event id> <start time> <duration> <table id>
 \fBT\fR@<title>
 \fBS\fR@<subtitle>
@@ -491,8 +509,8 @@ should at least have a \fBT\fR entry).
 .TS
 tab (@);
 l l.
-<service id>   @is the "program number" as defined in 'channels.conf'
-<channel name> @is the "name" as in 'channels.conf' (for information only)
+<channel id>   @is the "channel ID", made up from the parameters defined in 'channels.conf'
+<channel name> @is the "name" as in 'channels.conf' (for information only, may be left out)
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
 <table id>     @is a hex number that indicates the table this event is contained\

From fe9499ba901f5c32dd0b3841a2b6e599fefc144f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 24 Nov 2002 18:00:00 +0100
Subject: [PATCH 058/307] =?UTF-8?q?Version=201.1.17=20-=20Added=20new=20en?=
 =?UTF-8?q?tries=20to=20'ca.conf'.=20-=20Fixed=20closing=20unused=20PID=20?=
 =?UTF-8?q?handles=20(thanks=20to=20Stefan=20Schluenss=20for=20reporting?=
 =?UTF-8?q?=20this=20=20=20one).=20-=20Added=20more=20examples=20to=20'dis?=
 =?UTF-8?q?eqc.conf'=20(thanks=20to=20Oliver=20Endriss).=20-=20Fixed=20dis?=
 =?UTF-8?q?abling=20multiple=20recordings=20on=20a=20single=20DVB=20card?=
 =?UTF-8?q?=20(comment=20out=20the=20definition=20=20=20of=20the=20macros?=
 =?UTF-8?q?=20DO=5FREC=5FAND=5FPLAY=5FON=5FPRIMARY=5FDEVICE=20and=20DO=5FM?=
 =?UTF-8?q?ULTIPLE=5FRECORDINGS=20in=20=20=20dvbdevice.c).=20-=20Plugins?=
 =?UTF-8?q?=20can=20now=20have=20their=20very=20own=20OSD=20setup=20in=20t?=
 =?UTF-8?q?he=20object=20they=20return=20from=20=20=20a=20call=20to=20cPlu?=
 =?UTF-8?q?gin::MainMenuAction().=20In=20order=20to=20implement=20this,=20?=
 =?UTF-8?q?the=20return=20type=20=20=20of=20cPlugin::MainMenuAction()=20ha?=
 =?UTF-8?q?d=20to=20be=20changed=20from=20(cOsdMenu=20*)=20to=20(cOsdObjec?=
 =?UTF-8?q?t=20*).=20=20=20So=20in=20case=20you=20are=20compiling=20an=20e?=
 =?UTF-8?q?xisting=20plugin=20with=20this=20version=20of=20VDR=20and=20you?=
 =?UTF-8?q?=20=20=20get=20an=20error=20message,=20simply=20change=20cOsdMe?=
 =?UTF-8?q?nu=20to=20cOsdObject=20in=20the=20plugin's=20source=20=20=20for?=
 =?UTF-8?q?=20the=20MainMenuAction()=20function.=20=20=20Plugin=20authors?=
 =?UTF-8?q?=20who=20have=20so=20far=20(ab)used=20the=20cControl=20mechanis?=
 =?UTF-8?q?m=20to=20implement=20their=20=20=20own=20raw=20OSD=20should=20t?=
 =?UTF-8?q?ake=20a=20look=20at=20the=20new=20demo=20plugin=20'osddemo'.=20?=
 =?UTF-8?q?It=20implements=20=20=20a=20very=20primitive=20game=20that=20sh?=
 =?UTF-8?q?ows=20how=20a=20plugin=20can=20have=20its=20own=20raw=20OSD.=20?=
 =?UTF-8?q?Especially=20=20=20look=20into=20cLineGame=20and=20see=20how=20?=
 =?UTF-8?q?it=20implements=20the=20Show()=20function.=20See=20also=20=20?=
 =?UTF-8?q?=20the=20chapter=20on=20"User=20interaction"=20in=20PLUGINS.htm?=
 =?UTF-8?q?l.=20-=20Added=20three=20new=20fields=20to=20the=20lines=20in?=
 =?UTF-8?q?=20'channels.conf':=20NID,=20TID=20and=20RID.=20NID=20and=20=20?=
 =?UTF-8?q?=20TID=20are=20the=20Network=20and=20Transport=20Stream=20IDs,?=
 =?UTF-8?q?=20respectively.=20RID=20is=20an=20additional=20ID=20=20=20that?=
 =?UTF-8?q?=20can=20be=20used=20to=20tell=20apart=20channels=20that=20woul?=
 =?UTF-8?q?d=20otherwise=20be=20indistinguishable.=20=20=20This=20is=20typ?=
 =?UTF-8?q?ically=20the=20case=20with=20radio=20channels,=20which=20may=20?=
 =?UTF-8?q?have=20the=20same=20NID,=20TID=20=20=20and=20SID,=20but=20diffe?=
 =?UTF-8?q?rent=20"radio=20IDs".=20This=20new=20field=20is=20therefore=20c?=
 =?UTF-8?q?alled=20RID=20("radio=20=20=20ID").=20Currently=20NID=20and=20T?=
 =?UTF-8?q?ID=20are=20not=20yet=20used=20by=20VDR=20and=20should=20always?=
 =?UTF-8?q?=20be=200.=20The=20=20=20RID=20is=20actually=20used=20when=20bu?=
 =?UTF-8?q?ilding=20the=20"unique=20channel=20ID",=20so=20if=20you=20have?=
 =?UTF-8?q?=20channels=20=20=20in=20your=20'channels.conf'=20file=20that?=
 =?UTF-8?q?=20cause=20error=20messages=20when=20loading,=20you=20can=20set?=
 =?UTF-8?q?=20=20=20the=20RIDs=20of=20these=20channels=20to=20different=20?=
 =?UTF-8?q?values.=20=20=20When=20reading=20an=20old=20'channels.conf'=20t?=
 =?UTF-8?q?hese=20new=20fields=20will=20be=20automatically=20=20=20initial?=
 =?UTF-8?q?ized=20to=200=20and=20once=20the=20file=20is=20written=20back?=
 =?UTF-8?q?=20to=20disk=20they=20will=20be=20appended=20=20=20to=20the=20c?=
 =?UTF-8?q?hannel=20definitions.=20=20=20Thanks=20to=20R=C3=A9gis=20Bossut?=
 =?UTF-8?q?=20for=20pointing=20out=20that=20with=20some=20providers=20the?=
 =?UTF-8?q?=20channels=20can=20=20=20only=20be=20distinguished=20through?=
 =?UTF-8?q?=20the=20RID.=20-=20The=20"unique=20channel=20ID"=20now=20conta?=
 =?UTF-8?q?ins=20an=20optional=205th=20part=20(the=20RID).=20See=20man=20v?=
 =?UTF-8?q?dr(5).=20-=20Updated=20'channels.conf.cable'=20and=20made=20som?=
 =?UTF-8?q?e=20channels=20unique=20using=20the=20new=20RID=20=20=20(thanks?=
 =?UTF-8?q?=20to=20Andreas=20Kool=20for=20pointing=20out=20the=20problems)?=
 =?UTF-8?q?.=20-=20Made=20some=20channels=20unique=20in=20'channels.conf.t?=
 =?UTF-8?q?err'=20using=20the=20new=20RID.=20-=20Extended=20the=20'-l'=20o?=
 =?UTF-8?q?ption=20to=20allow=20logging=20to=20LOG=5FLOCALn=20(n=3D0..7)?=
 =?UTF-8?q?=20by=20writing,=20for=20=20=20instance,=20'-l=203.7'=20(sugges?=
 =?UTF-8?q?ted=20by=20J=C3=BCrgen=20Schmidt).=20-=20Now=20deleting=20stale?=
 =?UTF-8?q?=20lock=20files=20if=20they=20have=20a=20time=20stamp=20that=20?=
 =?UTF-8?q?is=20outside=20the=20window=20=20=20'now=20+/-=20LOCKFILESTALET?=
 =?UTF-8?q?IME'.=20This=20improves=20things=20in=20cases=20where=20the=20s?=
 =?UTF-8?q?ystem=20time=20=20=20makes=20far=20jumps,=20so=20that=20a=20loc?=
 =?UTF-8?q?k=20file=20might=20end=20up=20with=20a=20time=20stamp=20that=20?=
 =?UTF-8?q?lies=20=20=20in=20the=20distant=20future=20(thanks=20to=20Olive?=
 =?UTF-8?q?r=20Endriss).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                  |  13 ++
 HISTORY                       |  45 ++++
 INSTALL                       |   2 +-
 PLUGINS.html                  | 125 +++++++----
 PLUGINS/SRC/hello/HISTORY     |   4 +
 PLUGINS/SRC/hello/hello.c     |   8 +-
 PLUGINS/SRC/osddemo/COPYING   | 340 ++++++++++++++++++++++++++++++
 PLUGINS/SRC/osddemo/HISTORY   |   6 +
 PLUGINS/SRC/osddemo/Makefile  |  82 ++++++++
 PLUGINS/SRC/osddemo/README    |  18 ++
 PLUGINS/SRC/osddemo/osddemo.c | 153 ++++++++++++++
 PLUGINS/SRC/status/HISTORY    |   4 +
 PLUGINS/SRC/status/status.c   |   8 +-
 README                        |   2 +-
 ca.conf                       |  72 +++++++
 channels.c                    |  83 +++++---
 channels.conf                 | 282 ++++++++++++-------------
 channels.conf.cable           | 380 +++++++++++++++++-----------------
 channels.conf.terr            | 100 ++++-----
 channels.h                    |  29 ++-
 config.h                      |   5 +-
 diseqc.conf                   |  32 +++
 dvbdevice.c                   |  30 +--
 eit.c                         |  60 +++---
 eit.h                         |  29 +--
 menu.c                        |  38 +++-
 menu.h                        |   4 +-
 newplugin                     |   6 +-
 osd.c                         |   3 +-
 osd.h                         |   9 +-
 plugin.c                      |   4 +-
 plugin.h                      |   4 +-
 timers.c                      |  10 +-
 timers.h                      |   3 +-
 tools.c                       |   6 +-
 vdr.1                         |   6 +-
 vdr.5                         |  25 ++-
 vdr.c                         |  45 +++-
 38 files changed, 1502 insertions(+), 573 deletions(-)
 create mode 100644 PLUGINS/SRC/osddemo/COPYING
 create mode 100644 PLUGINS/SRC/osddemo/HISTORY
 create mode 100644 PLUGINS/SRC/osddemo/Makefile
 create mode 100644 PLUGINS/SRC/osddemo/README
 create mode 100644 PLUGINS/SRC/osddemo/osddemo.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6463c5326..d8ecbf35d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -276,6 +276,7 @@ Hannu Savolainen <hannu@opensound.com>
 
 J�rgen Schmidt <ju@ct.heise.de>
  for fixing a problem with 'in_addr_t' on systems with glibc < 2.2.
+ for suggesting to optionally allow logging to LOG_LOCALn (n=0..7)
 
 Uwe Freese <mail@uwe-freese.de>
  for suggesting to automatically close an empty recordings page after deleting
@@ -433,6 +434,8 @@ Oliver Endriss <o.endriss@gmx.de>
  current remote control
  for reporting a bug in the EPG scanner, which broke 'Transfer Mode' as soon as
  it kicked in
+ for providing examples for 'diseqc.conf'
+ for improving deleting stale lock files
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -466,3 +469,13 @@ Steffen Barszus <st_barszus@gmx.de>
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
  number in the 'source' parameter
+
+Stefan Schluenss <dxr3_osd@schluenss.de>
+ for reporting a bug where PID handles were not closed correctly
+
+R�gis Bossut <rbossut@auchan.com>
+  for pointing out that with some providers the channels can only be distinguished
+  through the RID
+
+Andreas Kool <akool@akool.de>
+  for pointing out problems with non-unique definitions in 'channels.conf.cable'
diff --git a/HISTORY b/HISTORY
index e0a5f1199..4d215082d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1767,3 +1767,48 @@ Video Disk Recorder Revision History
   data for NVOD channels.
 - Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del() hiding
   the base class virtual functions.
+
+2002-11-24: Version 1.1.17
+
+- Added new entries to 'ca.conf'.
+- Fixed closing unused PID handles (thanks to Stefan Schluenss for reporting this
+  one).
+- Added more examples to 'diseqc.conf' (thanks to Oliver Endriss).
+- Fixed disabling multiple recordings on a single DVB card (comment out the definition
+  of the macros DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and DO_MULTIPLE_RECORDINGS in
+  dvbdevice.c).
+- Plugins can now have their very own OSD setup in the object they return from
+  a call to cPlugin::MainMenuAction(). In order to implement this, the return type
+  of cPlugin::MainMenuAction() had to be changed from (cOsdMenu *) to (cOsdObject *).
+  So in case you are compiling an existing plugin with this version of VDR and you
+  get an error message, simply change cOsdMenu to cOsdObject in the plugin's source
+  for the MainMenuAction() function.
+  Plugin authors who have so far (ab)used the cControl mechanism to implement their
+  own raw OSD should take a look at the new demo plugin 'osddemo'. It implements
+  a very primitive game that shows how a plugin can have its own raw OSD. Especially
+  look into cLineGame and see how it implements the Show() function. See also
+  the chapter on "User interaction" in PLUGINS.html.
+- Added three new fields to the lines in 'channels.conf': NID, TID and RID. NID and
+  TID are the Network and Transport Stream IDs, respectively. RID is an additional ID
+  that can be used to tell apart channels that would otherwise be indistinguishable.
+  This is typically the case with radio channels, which may have the same NID, TID
+  and SID, but different "radio IDs". This new field is therefore called RID ("radio
+  ID"). Currently NID and TID are not yet used by VDR and should always be 0. The
+  RID is actually used when building the "unique channel ID", so if you have channels
+  in your 'channels.conf' file that cause error messages when loading, you can set
+  the RIDs of these channels to different values.
+  When reading an old 'channels.conf' these new fields will be automatically
+  initialized to 0 and once the file is written back to disk they will be appended
+  to the channel definitions.
+  Thanks to R�gis Bossut for pointing out that with some providers the channels can
+  only be distinguished through the RID.
+- The "unique channel ID" now contains an optional 5th part (the RID). See man vdr(5).
+- Updated 'channels.conf.cable' and made some channels unique using the new RID
+  (thanks to Andreas Kool for pointing out the problems).
+- Made some channels unique in 'channels.conf.terr' using the new RID.
+- Extended the '-l' option to allow logging to LOG_LOCALn (n=0..7) by writing, for
+  instance, '-l 3.7' (suggested by J�rgen Schmidt).
+- Now deleting stale lock files if they have a time stamp that is outside the window
+  'now +/- LOCKFILESTALETIME'. This improves things in cases where the system time
+  makes far jumps, so that a lock file might end up with a time stamp that lies
+  in the distant future (thanks to Oliver Endriss).
diff --git a/INSTALL b/INSTALL
index da99593c1..841575d49 100644
--- a/INSTALL
+++ b/INSTALL
@@ -32,7 +32,7 @@ following values 'make' call to activate the respective control mode:
 
   REMOTE=KBD    control via the PC keyboard (default)
   REMOTE=RCU    control via the "Remote Control Unit" receiver
-                (see http://www.cadsoft.de/people/kls/vdr/remote.htm)
+                (see http://www.cadsoft.de/vdr/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
   REMOTE=NONE   no remote control (in case only SVDRP shall be used)
diff --git a/PLUGINS.html b/PLUGINS.html
index ccd3fcf6c..8aa40f095 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -13,30 +13,68 @@
 VDR code (and all the problems of correlating various patches).
 <p>
 This document is divided into two parts, the first one describing the
-<a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
+<a href="#Part I - The External Interface"><i>external</i> interface</a>
 of the plugin system, and the second one describing the
-<a href="#Part II - The Inside Interface"><i>inside</i> interface</a>.
-The <i>outside</i> interface handles everything necessary for a plugin to get hooked into the core
+<a href="#Part II - The Internal Interface"><i>internal</i> interface</a>.
+The <i>external</i> interface handles everything necessary for a plugin to get hooked into the core
 VDR program and present itself to the user.
-The <i>inside</i> interface provides the plugin code access to VDR's internal data
+The <i>internal</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.12 are marked like this.
-<!--X1.1.12--></td></tr></table>
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.13 are marked like this.
 <!--X1.1.13--></td></tr></table>
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.14 are marked like this.
 <!--X1.1.14--></td></tr></table>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.15 are marked like this.
 <!--X1.1.15--></td></tr></table>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.17 are marked like this.
+<!--X1.1.17--></td></tr></table>
 
-<a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
+<hr>
+<h1>Table Of Contents</h1>
+<ul>
+<li><a href="#Part I - The External Interface">Part I - The External Interface</a>
+<ul>
+<li><a href="#Quick start">Quick start</a>
+<li><a href="#The name of the plugin">The name of the plugin</a>
+<li><a href="#The plugin directory structure">The plugin directory structure</a>
+<li><a href="#Initializing a new plugin directory">Initializing a new plugin directory</a>
+<li><a href="#The actual implementation">The actual implementation</a>
+<li><a href="#Construction and Destruction">Construction and Destruction</a>
+<li><a href="#Version number">Version number</a>
+<li><a href="#Description">Description</a>
+<li><a href="#Command line arguments">Command line arguments</a>
+<li><a href="#Command line help">Command line help</a>
+<li><a href="#Getting started">Getting started</a>
+<li><a href="#Main menu entry">Main menu entry</a>
+<li><a href="#User interaction">User interaction</a>
+<li><a href="#Housekeeping">Housekeeping</a>
+<li><a href="#Setup parameters">Setup parameters</a>
+<li><a href="#The Setup menu">The Setup menu</a>
+<li><a href="#Configuration files">Configuration files</a>
+<li><a href="#Internationalization">Internationalization</a>
+<li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
+<li><a href="#Building the distribution package">Building the distribution package</a>
+</ul>
+<li><a href="#Part II - The Internal Interface">Part II - The Internal Interface</a>
+<ul>
+<li><a href="#Status monitor">Status monitor</a>
+<li><a href="#Players">Players</a>
+<li><a href="#Receivers">Receivers</a>
+<li><a href="#The On Screen Display">The On Screen Display</a>
+<li><a href="#Devices">Devices</a>
+<li><a href="#Dolby Digital">Dolby Digital</a>
+<li><a href="#Remote Control">Remote Control</a>
+</ul>
+</ul>
+
+<a name="Part I - The External Interface"><hr><center><h1>Part I - The External Interface</h1></center>
 
-<hr><h2>Quick start</h2>
+<a name="Quick start"><hr><h2>Quick start</h2>
 
 <center><i><b>Can't wait, can't wait!</b></i></center><p>
 
@@ -58,7 +96,7 @@
 If you enjoyed this brief glimpse into VDR plugin handling, read through the rest of
 this document and eventually write your own VDR plugin.
 
-<hr><h2>The name of the plugin</h2>
+<a name="The name of the plugin"><hr><h2>The name of the plugin</h2>
 
 <center><i><b>Give me some I.D.!</b></i></center><p>
 
@@ -164,7 +202,7 @@
 Add further files and maybe subdirectories to your plugin source directory as
 necessary. Don't forget to adapt the <tt>Makefile</tt> appropriately.
 
-<hr><h2>The actual implementation</h2>
+<a name="The actual implementation"><hr><h2>The actual implementation</h2>
 
 <center><i><b>Use the source, Luke!</b></i></center><p>
 
@@ -231,7 +269,7 @@
 <tt>i18n.h</tt> it uses the macro <tt>_I18N__H</tt> (one underline at the beginning
 and two replacing the dot).
 
-<hr><h2>Construction and Destruction</h2>
+<a name="Construction and Destruction"><hr><h2>Construction and Destruction</h2>
 
 <center><i><b>What goes up, must come down...</b></i></center><p>
 
@@ -256,7 +294,7 @@
 Of course, if your plugin doesn't define any member variables that need to be
 initialized (and deleted), you don't need to implement either of these functions.
 
-<hr><h2>Version number</h2>
+<a name="Version number"><hr><h2>Version number</h2>
 
 <center><i><b>Which incarnation is this?</b></i></center><p>
 
@@ -301,7 +339,7 @@
 a version number are not limited to single digits, so a version number of <tt>1.2.15</tt>
 would be acceptable.
 
-<hr><h2>Description</h2>
+<a name="Description"><hr><h2>Description</h2>
 
 <center><i><b>What is it that you do?</b></i></center><p>
 
@@ -325,7 +363,7 @@
 Note the <tt>tr()</tt> around the <tt>DESCRIPTION</tt>, which allows the description
 to be <a href="#Internationalization">internationalized</a>.
 
-<hr><h2>Command line arguments</h2>
+<a name="Command line arguments"><hr><h2>Command line arguments</h2>
 
 <center><i><b>Taking orders</b></i></center><p>
 
@@ -379,7 +417,7 @@
 <i>false</i> from a call to its <tt>ProcessArgs()</tt> function will cause VDR
 to exit.
 
-<hr><h2>Command line help</h2>
+<a name="Command line help"><hr><h2>Command line help</h2>
 
 <center><i><b>Tell me about it...</b></i></center><p>
 
@@ -434,7 +472,7 @@
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement this function.
 
-<hr><h2>Main menu entry</h2>
+<a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
 <center><i><b>Today's special is...</b></i></center><p>
 
@@ -462,25 +500,34 @@
 after the <i>Recordings</i> item, in the same sequence as they were given
 in the call to VDR.
 
-<hr><h2>User interaction</h2>
+<a name="User interaction"><hr><h2>User interaction</h2>
 
 <center><i><b>It's showtime!</b></i></center><p>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-virtual cOsdMenu *MainMenuAction(void);
+virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
 
-which can do one of two things:
+which can do one of three things:
 <ul>
 <li>Return a pointer to a <tt>cOsdMenu</tt> object which will be displayed
     as a submenu of the main menu (just like the <i>Recordings</i> menu, for instance).
     That menu can then implement further functionality and, for instance, could
     eventually start a custom player to replay a file other than a VDR recording.
+<li>Return a pointer to a <tt>cOsdObject</tt> object which will be displayed
+    instead of the normal menu. The derived <tt>cOsdObject</tt> can open a
+    <a href="#The On Screen Display">raw OSD</a> from within its <tt>Show()</tt>
+    function (it should not attempt to do so from within its constructor, since
+    at that time the OSD is still in use by the main menu).
+    See the 'osddemo' example that comes with VDR for a demonstration of how this
+    is done.
 <li>Perform a specific action and return <tt>NULL</tt>. In that case the main menu
     will be closed after calling <tt>MainMenuAction()</tt>.
 </ul>
+<!--X1.1.17--></td></tr></table>
 <b>
 It is very important that a call to <tt>MainMenuAction()</tt> returns as soon
 as possible! As long as the program stays inside this function, no other user
@@ -488,7 +535,7 @@
 the plugin should launch a separate thread to do this.
 </b>
 
-<hr><h2>Housekeeping</h2>
+<a name="Housekeeping"><hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
 
@@ -644,7 +691,7 @@
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<hr><h2>Configuration files</h2>
+<a name="Configuration files"><hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
 
@@ -832,9 +879,9 @@
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
+<a name="Part II - The Internal Interface"><hr><center><h1>Part II - The Internal Interface</h1></center>
 
-<hr><h2>Status monitor</h2>
+<a name="Status monitor"><hr><h2>Status monitor</h2>
 
 <center><i><b>A piece of the action</b></i></center><p>
 
@@ -907,7 +954,7 @@
 member functions are available in <tt>cStatus</tt>. You only need to implement
 the functions you actually want to use.
 
-<hr><h2>Players</h2>
+<a name="Players"><hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
 
@@ -964,7 +1011,7 @@
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 If the player can provide more than a single audio track, it can implement the
 following functions to make them available:
@@ -977,7 +1024,7 @@
 
 <!--X1.1.13--></td></tr></table>
 <p>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 If there is an additional audio track that has to be replayed with external hardware,
 the player shall call its member function
 
@@ -1085,7 +1132,7 @@
 that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
 
-<hr><h2>Receivers</h2>
+<a name="Receivers"><hr><h2>Receivers</h2>
 
 <center><i><b>Tapping into the stream...</b></i></center><p>
 
@@ -1139,7 +1186,7 @@
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<hr><h2>The On Screen Display</h2>
+<a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
 
@@ -1169,7 +1216,7 @@
 of these functions, and VDR/osd.c to see how VDR opens the OSD and sets up
 its windows and color depths).
 
-<hr><h2>Devices</h2>
+<a name="Devices"><hr><h2>Devices</h2>
 
 <center><i><b>Expanding the possibilities</b></i></center><p>
 
@@ -1205,9 +1252,7 @@
 selecting which channel it shall tune to:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool ProvidesSource(int Source) const;
-<!--X1.1.12--></td></tr></table>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 </pre></td></tr></table><p>
@@ -1215,7 +1260,7 @@
 These functions will be called with the desired source or channel and shall return whether
 this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>Audio selection</b>
 <p>
@@ -1262,7 +1307,7 @@
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 virtual bool CanReplay(void) const;
 <!--X1.1.14--></td></tr></table>
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1324,8 +1369,8 @@
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
-<hr><h2>Dolby Digital</h2>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<a name="Dolby Digital"><hr><h2>Dolby Digital</h2>
 
 <center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
 
@@ -1369,7 +1414,7 @@
 be muted, or any buffered data shall be cleared, respectively.
 <!--X1.1.15--></td></tr></table>
 
-<hr><h2>Remote Control</h2>
+<a name="Remote Control"><hr><h2>Remote Control</h2>
 
 <center><i><b>The joy of zapping!</b></i></center><p>
 
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index 8639e056e..53b620e9d 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -37,3 +37,7 @@ VDR Plugin 'hello' Revision History
   The NEWSTRUCT compile time switch is now obsolete. The required driver is now
   the CVS HEAD version dated 2002-11-01 or later.
 - Introduced Make.config.
+
+2002-11-23: Version 0.0.9
+
+- Changed return type of MainMenuAction().
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 6583285eb..b72657865 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.9 2002/11/01 10:16:53 kls Exp $
+ * $Id: hello.c 1.10 2002/11/23 15:07:28 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.8";
+static const char *VERSION        = "0.0.9";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
@@ -31,7 +31,7 @@ class cPluginHello : public cPlugin {
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
@@ -124,7 +124,7 @@ void cPluginHello::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
-cOsdMenu *cPluginHello::MainMenuAction(void)
+cOsdObject *cPluginHello::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   Interface->Confirm(UseAlternateGreeting ? tr("Howdy folks!") : tr("Hello world!"), GreetingTime);
diff --git a/PLUGINS/SRC/osddemo/COPYING b/PLUGINS/SRC/osddemo/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/SRC/osddemo/HISTORY b/PLUGINS/SRC/osddemo/HISTORY
new file mode 100644
index 000000000..8c9d3e1a0
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'osddemo' Revision History
+-------------------------------------
+
+2002-11-23: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/SRC/osddemo/Makefile b/PLUGINS/SRC/osddemo/Makefile
new file mode 100644
index 000000000..ac56d1f7f
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2002/11/23 14:56:44 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = osddemo
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/SRC/osddemo/README b/PLUGINS/SRC/osddemo/README
new file mode 100644
index 000000000..cc150aba9
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/README
@@ -0,0 +1,18 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          http://www.cadsoft.de/vdr
+
+Latest version available at: http://www.cadsoft.de/vdr
+
+See the file COPYING for license information.
+
+Description:
+
+Demonstration of how a plugin can have its very own OSD setup.
+
+It's a very primitive game that opens a small window in which the
+user can draw lines with the Up, Down, Left and Right buttons.
+The color buttons are used to switch color.
+Press Ok to close the window.
diff --git a/PLUGINS/SRC/osddemo/osddemo.c b/PLUGINS/SRC/osddemo/osddemo.c
new file mode 100644
index 000000000..f806178d4
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/osddemo.c
@@ -0,0 +1,153 @@
+/*
+ * osddemo.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: osddemo.c 1.1 2002/11/24 10:32:59 kls Exp $
+ */
+
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
+static const char *MAINMENUENTRY  = "Osd Demo";
+
+// --- cLineGame -------------------------------------------------------------
+
+class cLineGame : public cOsdObject {
+private:
+  cOsdBase *osd;
+  int x;
+  int y;
+  eDvbColor color;
+public:
+  cLineGame(void);
+  ~cLineGame();
+  virtual void Show(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cLineGame::cLineGame(void)
+{
+  osd = NULL;
+  x = y = 50;
+  color = clrRed;
+}
+
+cLineGame::~cLineGame()
+{
+  delete osd;
+}
+
+void cLineGame::Show(void)
+{
+  osd = cOsd::OpenRaw(100, 50);
+  if (osd) {
+     osd->Create(0, 0, 100, 200, 4);
+     osd->AddColor(clrBackground);
+     osd->AddColor(clrRed);
+     osd->AddColor(clrGreen);
+     osd->AddColor(clrYellow);
+     osd->AddColor(clrBlue);
+     osd->Clear();
+     osd->Flush();
+     }
+}
+
+eOSState cLineGame::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdObject::ProcessKey(Key);
+  if (state == osUnknown) {
+     switch (Key & ~k_Repeat) {
+       case kUp:     if (y > 0)   y--; break;
+       case kDown:   if (y < 196) y++; break;
+       case kLeft:   if (x > 0)   x--; break;
+       case kRight:  if (x < 96)  x++; break;
+       case kRed:    color = clrRed; break;
+       case kGreen:  color = clrGreen; break;
+       case kYellow: color = clrYellow; break;
+       case kBlue:   color = clrBlue; break;
+       case kOk:     return osEnd;
+       default: return state;
+       }
+     osd->Fill(x, y, x + 3, y + 3, color);
+     osd->Flush();
+     state = osContinue;
+     }
+  return state;
+}
+
+// --- cPluginOsddemo --------------------------------------------------------
+
+class cPluginOsddemo : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  cPluginOsddemo(void);
+  virtual ~cPluginOsddemo();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdObject *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginOsddemo::cPluginOsddemo(void)
+{
+  // Initialize any member variables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+}
+
+cPluginOsddemo::~cPluginOsddemo()
+{
+  // Clean up after yourself!
+}
+
+const char *cPluginOsddemo::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return NULL;
+}
+
+bool cPluginOsddemo::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  return true;
+}
+
+bool cPluginOsddemo::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  return true;
+}
+
+void cPluginOsddemo::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
+}
+
+cOsdObject *cPluginOsddemo::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  return new cLineGame;
+}
+
+cMenuSetupPage *cPluginOsddemo::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPluginOsddemo::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginOsddemo); // Don't touch this!
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
index 45d42fbff..7d2829159 100644
--- a/PLUGINS/SRC/status/HISTORY
+++ b/PLUGINS/SRC/status/HISTORY
@@ -23,3 +23,7 @@ VDR Plugin 'status' Revision History
   The NEWSTRUCT compile time switch is now obsolete. The required driver is now
   the CVS HEAD version dated 2002-11-01 or later.
 - Introduced Make.config.
+
+2002-11-23: Version 0.0.6
+
+- Changed return type of MainMenuAction().
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
index 12e64b7be..f5ab5b9c4 100644
--- a/PLUGINS/SRC/status/status.c
+++ b/PLUGINS/SRC/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.5 2002/11/01 10:16:59 kls Exp $
+ * $Id: status.c 1.6 2002/11/23 15:07:40 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -115,7 +115,7 @@ class cPluginStatus : public cPlugin {
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
@@ -158,7 +158,7 @@ void cPluginStatus::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
-cOsdMenu *cPluginStatus::MainMenuAction(void)
+cOsdObject *cPluginStatus::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   return NULL;
diff --git a/README b/README
index 6b6e33e6d..809034ffb 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Video Disk Recorder ('VDR')
 These files contain the source code of the "Video Disk Recorder",
 which is based on the DVB driver of the LinuxTV project (http://linuxtv.org).
 For details about the "Video Disk Recorder" project please
-refer to http://www.cadsoft.de/people/kls/vdr.
+refer to http://www.cadsoft.de/vdr.
 
 There is also a remote control unit described on those
 Web pages, which can be used within this program.
diff --git a/ca.conf b/ca.conf
index ee2c9c53c..61f11890e 100644
--- a/ca.conf
+++ b/ca.conf
@@ -13,11 +13,83 @@
 
 101    Premiere World
 102    ORF
+103    DIGI-Kabel
 
 # Cryptoworks
 
 201    GOD-DIGITAL
 
+# Videoguard
+
+301    Sky Digital
+
+# Viaccess 1
+
+401    SRG Swiss
+402    NTV Plus
+403    Viasat
+404    Parabole Reunion
+
+# Viaccess 2
+
+501    Alpha Digital Greece
+
+# Cryptoworks
+
+601    UPC Direct
+602    DigiTurk
+
+# Mediaguard
+
+701    CanalSatellite Reunion
+
+# Mediaguard 2
+
+801    Orbit Network
+
+# Nagravision
+
+901    PolSat Cyfrowy
+
+# Irdeto 2
+
+1001   ADD
+1002   Nova Greece
+1003   Multichoice Africa
+
+# Conax
+
+1101 Canal Digital Scandinavia
+
+# Mediaguard, Viaccess 1, Viaccess 2
+
+10001  AB Sat France
+10002  TPS France
+
+# Videoguard, Mediaguard 2, Irdeto 1
+
+11001  Stream TV Italy
+
+# Videoguard, Mediaguard 2, Cryptoworks
+
+12001  Tele+ Digitale
+
+# Mediaguard 1, Irdeto 1
+
+13001  Canal Digitaal Satelliet NL
+
+# Mediaguard 1, Mediaguard 2, Viaccess 1
+
+14001  Canal Satellite France
+
+# Mediaguard 1, Mediaguard 2, Viaccess 1, Cryptoworks
+
+15001  Canal Satelite Digital Espana
+
+# Mediaguard 2, Cryptoworks
+
+16001  Cyfra+ Polska
+
 # Special values to "hard code" a channel to a specific DVB card:
 
 1      DVB 1
diff --git a/channels.c b/channels.c
index cb05e2ca7..6afa7b958 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.8 2002/11/10 13:01:55 kls Exp $
+ * $Id: channels.c 1.9 2002/11/24 14:28:48 kls Exp $
  */
 
 #include "channels.h"
@@ -120,6 +120,39 @@ int MapToDriver(int Value, const tChannelParameterMap *Map)
   return -1;
 }
 
+// -- tChannelID -------------------------------------------------------------
+
+const tChannelID tChannelID::InvalidID;
+
+bool tChannelID::operator== (const tChannelID &arg) const
+{
+  return source == arg.source && nid == arg.nid && tid == arg.tid && sid == arg.sid && rid == arg.rid;
+}
+
+tChannelID tChannelID::FromString(const char *s)
+{
+  char *sourcebuf = NULL;
+  int nid;
+  int tid;
+  int sid;
+  int rid = 0;
+  int fields = sscanf(s, "%a[^-]-%d-%d-%d-%d", &sourcebuf, &nid, &tid, &sid, &rid);
+  if (fields == 4 || fields == 5) {
+     int source = cSource::FromString(sourcebuf);
+     free(sourcebuf);
+     if (source >= 0)
+        return tChannelID(source, nid, tid, sid, rid);
+     }
+  return tChannelID::InvalidID;
+}
+
+const char *tChannelID::ToString(void)
+{
+  static char buffer[256];
+  snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", cSource::ToString(source), nid, tid, sid, rid);
+  return buffer;
+}
+
 // -- cChannel ---------------------------------------------------------------
 
 char *cChannel::buffer = NULL;
@@ -137,7 +170,10 @@ cChannel::cChannel(void)
   dpid2        = 0;
   tpid         = 32;
   ca           = 0;
-  sid          = 0;
+  nid          = 0;
+  tid          = 0;
+  sid          = 888;
+  rid          = 0;
   groupSep     = false;
   polarization = 'v';
   inversion    = INVERSION_AUTO;
@@ -158,36 +194,14 @@ cChannel& cChannel::operator= (const cChannel &Channel)
 
 static int MHz(int frequency)
 {
-  while (frequency > 20000) {
+  while (frequency > 20000)
         frequency /= 1000;
-        }
   return frequency;
 }
 
-uint64 cChannel::GetChannelID(void) const
+tChannelID cChannel::GetChannelID(void) const
 {
-  return (uint64(source) << 48) | (uint64(0) << 32) | ((MHz(frequency)) << 16) | sid;
-}
-
-const char *cChannel::GetChannelIDStr(void) const
-{
-  static char buffer[256];
-  snprintf(buffer, sizeof(buffer), "%s-%d-%d-%d", cSource::ToString(source), 0, MHz(frequency), sid);
-  return buffer;
-}
-
-uint64 cChannel::StringToChannelID(const char *s)
-{
-  char *sourcebuf = NULL;
-  int reserved;
-  int frequency;
-  int sid;
-  if (4 == sscanf(s, "%a[^-]-%d-%d-%d", &sourcebuf, &reserved, &frequency, &sid)) {
-     int source = cSource::FromString(sourcebuf);
-     if (source >= 0)
-        return (uint64(source) << 48) | (uint64(reserved) << 32) | (frequency << 16) | sid;
-     }
-  return 0;
+  return tChannelID(source, nid, nid ? tid : MHz(frequency), sid, rid);
 }
 
 static int PrintParameter(char *p, char Name, int Value)
@@ -281,7 +295,7 @@ const char *cChannel::ToText(cChannel *Channel)
      if (Channel->dpid2)
         q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%d:%s:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->sid);
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%d:%s:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -312,7 +326,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
      char *sourcebuf = NULL;
      char *parambuf = NULL;
      char *apidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%d :%a[^:]:%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpid, &apidbuf, &tpid, &ca, &sid);
+     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%d :%a[^:]:%d :%d :%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpid, &apidbuf, &tpid, &ca, &sid, &nid, &tid, &rid);
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
@@ -430,18 +444,25 @@ cChannel *cChannels::GetByServiceID(int Source, unsigned short ServiceID)
   return NULL;
 }
 
-cChannel *cChannels::GetByChannelID(uint64 ChannelID)
+cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (!channel->GroupSep() && channel->GetChannelID() == ChannelID)
          return channel;
       }
+  if (TryWithoutRid) {
+     ChannelID.ClrRid();
+     for (cChannel *channel = First(); channel; channel = Next(channel)) {
+         if (!channel->GroupSep() && channel->GetChannelID().ClrRid() == ChannelID)
+            return channel;
+         }
+     }
   return NULL;
 }
 
 bool cChannels::HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel)
 {
-  uint64 NewChannelID = NewChannel->GetChannelID();
+  tChannelID NewChannelID = NewChannel->GetChannelID();
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (!channel->GroupSep() && channel != OldChannel && channel->GetChannelID() == NewChannelID)
          return false;
diff --git a/channels.conf b/channels.conf
index f440ca7e4..ab6b4b846 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,149 +1,149 @@
-RTL:12188:h:S19.2E:27500:163:104:105:0:12003
-Sat.1:12480:v:S19.2E:27500:1791:1792:34:0:46
-Pro-7:12480:v:S19.2E:27500:255:256;257:32:0:898
-RTL2:12188:h:S19.2E:27500:166:128:68:0:12020
-ARD:11837:h:S19.2E:27500:101:102:104:0:28106
-BR3:11837:h:S19.2E:27500:201:202:204:0:28107
-Hessen-3:11837:h:S19.2E:27500:301:302:304:0:28108
-N3:12110:h:S19.2E:27500:2401:2402:2404:0:28224
-SR3:11837:h:S19.2E:27500:501:502:504:0:28110
-WDR:11837:h:S19.2E:27500:601:602:604:0:28111
-BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112
-SWR BW:11837:h:S19.2E:27500:801:802:804:0:28113
-Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114
-ZDF:11954:h:S19.2E:27500:110:120:130:0:28006
-3sat:11954:h:S19.2E:27500:210:220:230:0:28007
-KiKa:11954:h:S19.2E:27500:310:320:330:0:28008
-arte:11836:h:S19.2E:27500:401:402:404:0:28109
-ORF1:12692:h:S19.2E:22000:160:161:165:102:13001
-ORF2:12692:h:S19.2E:22000:500:501:505:102:13002
-ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011
-CNN:12168:v:S19.2E:27500:165:100:0:0:28512
-Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040
-VOX:12188:h:S19.2E:27500:167:136:71:0:12060
-DW TV:10788:v:S19.2E:22000:305:306:0:0:8905
-Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899
-Neun Live:12480:v:S19.2E:27500:767:768:35:0:897
-DSF:12480:v:S19.2E:27500:1023:1024:0:0:900
-HOT:12480:v:S19.2E:27500:1279:1280:0:0:40
-Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160
-Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004
-Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721
-Sky News:12552:v:S19.2E:22000:305:306:0:0:3995
-Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020
-Alice:12610:v:S19.2E:22000:162:96:0:0:12200
-n-tv:12670:v:S19.2E:22000:162:96:55:0:12730
-Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300
-TW1:12692:h:S19.2E:22000:166:167:0:0:13013
-Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009
-EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201
-EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202
-EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203
-ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016
-ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014
-MDR:12110:h:S19.2E:27500:401:402:404:0:28204
-ORB:12110:h:S19.2E:27500:501:502:504:0:28205
-B1:12110:h:S19.2E:27500:601:602:604:0:28206
+RTL:12188:h:S19.2E:27500:163:104:105:0:12003:0:0:0
+Sat.1:12480:v:S19.2E:27500:1791:1792:34:0:46:0:0:0
+Pro-7:12480:v:S19.2E:27500:255:256;257:32:0:898:0:0:0
+RTL2:12188:h:S19.2E:27500:166:128:68:0:12020:0:0:0
+ARD:11837:h:S19.2E:27500:101:102:104:0:28106:0:0:0
+BR3:11837:h:S19.2E:27500:201:202:204:0:28107:0:0:0
+Hessen-3:11837:h:S19.2E:27500:301:302:304:0:28108:0:0:0
+N3:12110:h:S19.2E:27500:2401:2402:2404:0:28224:0:0:0
+SR3:11837:h:S19.2E:27500:501:502:504:0:28110:0:0:0
+WDR:11837:h:S19.2E:27500:601:602:604:0:28111:0:0:0
+BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112:0:0:0
+SWR BW:11837:h:S19.2E:27500:801:802:804:0:28113:0:0:0
+Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114:0:0:0
+ZDF:11954:h:S19.2E:27500:110:120:130:0:28006:0:0:0
+3sat:11954:h:S19.2E:27500:210:220:230:0:28007:0:0:0
+KiKa:11954:h:S19.2E:27500:310:320:330:0:28008:0:0:0
+arte:11836:h:S19.2E:27500:401:402:404:0:28109:0:0:0
+ORF1:12692:h:S19.2E:22000:160:161:165:102:13001:0:0:0
+ORF2:12692:h:S19.2E:22000:500:501:505:102:13002:0:0:0
+ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011:0:0:0
+CNN:12168:v:S19.2E:27500:165:100:0:0:28512:0:0:0
+Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:0:0:0
+VOX:12188:h:S19.2E:27500:167:136:71:0:12060:0:0:0
+DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
+Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899:0:0:0
+Neun Live:12480:v:S19.2E:27500:767:768:35:0:897:0:0:0
+DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:0:0:0
+HOT:12480:v:S19.2E:27500:1279:1280:0:0:40:0:0:0
+Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:0:0:0
+Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004:0:0:0
+Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721:0:0:0
+Sky News:12552:v:S19.2E:22000:305:306:0:0:3995:0:0:0
+Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020:0:0:0
+Alice:12610:v:S19.2E:22000:162:96:0:0:12200:0:0:0
+n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:0:0:0
+Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300:0:0:0
+TW1:12692:h:S19.2E:22000:166:167:0:0:13013:0:0:0
+Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009:0:0:0
+EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201:0:0:0
+EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202:0:0:0
+EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:0:0:0
+ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016:0:0:0
+ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014:0:0:0
+MDR:12110:h:S19.2E:27500:401:402:404:0:28204:0:0:0
+ORB:12110:h:S19.2E:27500:501:502:504:0:28205:0:0:0
+B1:12110:h:S19.2E:27500:601:602:604:0:28206:0:0:0
 :Premiere World
-Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8
-Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10
-Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11
-Premiere 3:11797:h:S19.2E:27500:2303:2304:0:101:43
-Premiere 4:11797:h:S19.2E:27500:767:768:0:101:9
-Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29
-Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41
-Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20
-13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42
-Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36
-Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16
-Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34
-Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516
-Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14
-Planet:12090:v:S19.2E:27500:1279:1280:0:101:13
-Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28
-Junior:11758:h:S19.2E:27500:255:256:0:101:19
-K-Toon:11758:h:S19.2E:27500:511:512:0:101:12
-Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23
-Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518
-Classica:11758:h:S19.2E:27500:767:768:0:101:15
-Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32
+Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8:0:0:0
+Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10:0:0:0
+Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11:0:0:0
+Premiere 3:11797:h:S19.2E:27500:2303:2304:0:101:43:0:0:0
+Premiere 4:11797:h:S19.2E:27500:767:768:0:101:9:0:0:0
+Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29:0:0:0
+Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
+Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
+13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
+Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36:0:0:0
+Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
+Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34:0:0:0
+Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
+Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14:0:0:0
+Planet:12090:v:S19.2E:27500:1279:1280:0:101:13:0:0:0
+Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28:0:0:0
+Junior:11758:h:S19.2E:27500:255:256:0:101:19:0:0:0
+K-Toon:11758:h:S19.2E:27500:511:512:0:101:12:0:0:0
+Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23:0:0:0
+Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518:0:0:0
+Classica:11758:h:S19.2E:27500:767:768:0:101:15:0:0:0
+Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32:0:0:0
 :Premiere Direkt
-Premiere Direkt 1A:12031:h:S19.2E:27500:511:512,513;515:0:101:177
-Premiere Direkt 1B:11719:h:S19.2E:27500:1023:1024,1025;1027:0:101:182
-Premiere Direkt 2A:12031:h:S19.2E:27500:255:256;259:0:101:176
-Premiere Direkt 2B:11719:h:S19.2E:27500:767:768;769:0:101:181
-Premiere Direkt 3A:11719:h:S19.2E:27500:511:512;515:0:101:180
-Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183
-Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18
-:#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216
+Premiere Direkt 1A:12031:h:S19.2E:27500:511:512,513;515:0:101:177:0:0:0
+Premiere Direkt 1B:11719:h:S19.2E:27500:1023:1024,1025;1027:0:101:182:0:0:0
+Premiere Direkt 2A:12031:h:S19.2E:27500:255:256;259:0:101:176:0:0:0
+Premiere Direkt 2B:11719:h:S19.2E:27500:767:768;769:0:101:181:0:0:0
+Premiere Direkt 3A:11719:h:S19.2E:27500:511:512;515:0:101:180:0:0:0
+Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183:0:0:0
+Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
+:#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216:0:0:0
 :PW Erotic
-Beate-Uhse.TV:11758:h:S19.2E:27500:1023:1024:0:101:21
-Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513
-Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778
-Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779
-Premiere Erotik 4:11719:h:S19.2E:27500:3583:3584:0:101:780
+Beate-Uhse.TV:11758:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
+Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513:0:0:0
+Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778:0:0:0
+Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779:0:0:0
+Premiere Erotik 4:11719:h:S19.2E:27500:3583:3584:0:101:780:0:0:0
 :Sportsworld
-Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17
-Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27
+Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
+Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27:0:0:0
 :Formel 1
-:#Supersignal:12070:h:S19.2E:27500:255:256:0:101:211
-:#Cockpitkanal:12070:h:S19.2E:27500:511:512:0:101:212
-:#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213
-:#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214
-:#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215
-:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
+:#Supersignal:12070:h:S19.2E:27500:255:256:0:101:211:0:0:0
+:#Cockpitkanal:12070:h:S19.2E:27500:511:512:0:101:212:0:0:0
+:#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213:0:0:0
+:#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214:0:0:0
+:#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215:0:0:0
+:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17:0:0:0
 :Beta Digital
-N24:12480:v:S19.2E:27500:2047:2048:0:0:47
-CNBC:11954:h:S19.2E:27500:510:520:0:0:28010
-Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199
+N24:12480:v:S19.2E:27500:2047:2048:0:0:47:0:0:0
+CNBC:11954:h:S19.2E:27500:510:520:0:0:28010:0:0:0
+Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199:0:0:0
 :Premiere Bundesliga
-BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210
-BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17
-BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240
-BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241
-BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242
-BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243
-BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244
-BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245
-BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208
-BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209
+BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210:0:0:0
+BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
+BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240:0:0:0
+BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241:0:0:0
+BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242:0:0:0
+BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243:0:0:0
+BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244:0:0:0
+BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245:0:0:0
+BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208:0:0:0
+BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209:0:0:0
 :-
-Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010
-Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011
-Canal J:11934:v:S19.2E:27500:167:108:0:0:8157
-Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365
-Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002
-Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003
-Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004
-Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001
-KTO:11739:v:S19.2E:27500:163:90:0:0:8304
-Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511
-TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631
-travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001
-TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516
-TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515
-La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501
-LCP:12207:v:S19.2E:27500:165:100:0:0:8506
-AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000
-AB 1:12266:h:S19.2E:27500:161:84:0:0:17001
-Escales:12285:v:S19.2E:27500:165:100:0:0:17025
-Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612
-RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004
-K13:12402:v:S19.2E:27500:163:92:0:0:8704
-Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988
-Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987
-Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986
-Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985
-Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984
-Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180
-RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994
-VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010
-VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647
-MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648
-Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44
-Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220
-ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012
-VIVA:12670:v:S19.2E:22000:309:310:0:0:12732
-VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120
-MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643
-QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
+Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010:0:0:0
+Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011:0:0:0
+Canal J:11934:v:S19.2E:27500:167:108:0:0:8157:0:0:0
+Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365:0:0:0
+Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002:0:0:0
+Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003:0:0:0
+Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004:0:0:0
+Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001:0:0:0
+KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
+Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511:0:0:0
+TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631:0:0:0
+travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001:0:0:0
+TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516:0:0:0
+TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515:0:0:0
+La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501:0:0:0
+LCP:12207:v:S19.2E:27500:165:100:0:0:8506:0:0:0
+AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
+AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
+Escales:12285:v:S19.2E:27500:165:100:0:0:17025:0:0:0
+Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612:0:0:0
+RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
+K13:12402:v:S19.2E:27500:163:92:0:0:8704:0:0:0
+Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988:0:0:0
+Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:0:0:0
+Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986:0:0:0
+Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985:0:0:0
+Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984:0:0:0
+Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:0:0:0
+RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994:0:0:0
+VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010:0:0:0
+VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647:0:0:0
+MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648:0:0:0
+Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
+Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0
+ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012:0:0:0
+VIVA:12670:v:S19.2E:22000:309:310:0:0:12732:0:0:0
+VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120:0:0:0
+MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643:0:0:0
+QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
diff --git a/channels.conf.cable b/channels.conf.cable
index 131208ff7..1be4c538b 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,210 +1,210 @@
-Das Erste:410:M64:C:6900:101:102:104:0:28106
-ZDF:394:M64:C:6900:110:120:130:0:28006
-3sat:394:M64:C:6900:210:220:230:0:28007
-arte:410:M64:C:6900:401:402:404:0:28109
-ZDF.info:394:M64:C:6900:610:620:0:0:28011
-ZDF.doku:394:M64:C:6900:660:670:0:0:28014
-ZDF Theaterkanal:394:M64:C:6900:1110:1120:130:0:28016
-EinsExtra:426:M64:C:6900:101:102:0:0:28201
-EinsFestival:426:M64:C:6900:201:202:0:0:28202
-EinsMuXx:426:M64:C:6900:301:302:0:0:28203
-Phoenix:410:M64:C:6900:901:902:904:0:28114
-KI.KA:394:M64:C:6900:310:320:330:0:28008
-EuroNews:394:M64:C:6900:2221:2233:768:0:28015
-CNBC:394:M64:C:6900:510:520:530:0:28010
-Eurosport:394:M64:C:6900:410:420:430:0:28009
+Das Erste:410:M64:C:6900:101:102:104:0:28106:0:0:0
+ZDF:394:M64:C:6900:110:120:130:0:28006:0:0:0
+3sat:394:M64:C:6900:210:220:230:0:28007:0:0:0
+arte:410:M64:C:6900:401:402:404:0:28109:0:0:0
+ZDF.info:394:M64:C:6900:610:620:0:0:28011:0:0:0
+ZDF.doku:394:M64:C:6900:660:670:0:0:28014:0:0:0
+ZDF Theaterkanal:394:M64:C:6900:1110:1120:130:0:28016:0:0:0
+EinsExtra:426:M64:C:6900:101:102:0:0:28201:0:0:0
+EinsFestival:426:M64:C:6900:201:202:0:0:28202:0:0:0
+EinsMuXx:426:M64:C:6900:301:302:0:0:28203:0:0:0
+Phoenix:410:M64:C:6900:901:902:904:0:28114:0:0:0
+KI.KA:394:M64:C:6900:310:320:330:0:28008:0:0:0
+EuroNews:394:M64:C:6900:2221:2233:768:0:28015:0:0:0
+CNBC:394:M64:C:6900:510:520:530:0:28010:0:0:0
+Eurosport:394:M64:C:6900:410:420:430:0:28009:0:0:0
 :Regionalprogramme
-B1 Berlin:426:M64:C:6900:601:602:604:0:28206
-ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205
-N3:426:M64:C:6900:2401:2402:2404:0:28224
-MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204
-WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111
-hessen fernsehen:410:M64:C:6900:301:302:304:0:28108
-BR-alpha:410:M64:C:6900:701:702:704:0:28112
-Bayerisches FS:410:M64:C:6900:201:202:204:0:28107
-SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110
-SuedWest BW:410:M64:C:6900:801:802:804:0:28113
-SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231
+B1 Berlin:426:M64:C:6900:601:602:604:0:28206:0:0:0
+ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205:0:0:0
+N3:426:M64:C:6900:2401:2402:2404:0:28224:0:0:0
+MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204:0:0:0
+WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111:0:0:0
+hessen fernsehen:410:M64:C:6900:301:302:304:0:28108:0:0:0
+BR-alpha:410:M64:C:6900:701:702:704:0:28112:0:0:0
+Bayerisches FS:410:M64:C:6900:201:202:204:0:28107:0:0:0
+SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110:0:0:0
+SuedWest BW:410:M64:C:6900:801:802:804:0:28113:0:0:0
+SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231:0:0:0
 :Hauptprogramme Premiere
-Premiere START:370:M64:C:6900:255:256:32:101:8
-Premiere 1:370:M64:C:6900:511:512;515:0:101:10
-Premiere 2:370:M64:C:6900:1791:1792;1795:0:101:11
-Premiere 3:370:M64:C:6900:2303:2304:0:101:43
-Premiere 4:370:M64:C:6900:767:768:0:101:9
-Premiere 5:370:M64:C:6900:1279:1280:0:101:29
-Premiere 6:370:M64:C:6900:1535:1536:0:101:41
-Premiere 7:370:M64:C:6900:1023:1024:0:101:20
-Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16
-Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516
-13 TH STREET:354:M64:C:6900:2303:2304:0:101:42
-Stundio Universal:402:M64:C:6900:1050:1054:0:101:36
-Krimi &Co:378:M64:C:6900:1535:1536:0:101:23
-Disney Channel:402:M64:C:6900:1030:1034:0:101:34
-Discovery Channel:378:M64:C:6900:1791:1792:0:101:14
-PLANET:354:M64:C:6900:1791:1792:0:101:13
-Fox Kids:354:M64:C:6900:1279:1280:0:101:28
-Junior:354:M64:C:6900:255:256:0:101:19
-K-TOON:354:M64:C:6900:511:512:0:101:12
-HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22
-GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518
-CLASSICA:354:M64:C:6900:767:768:0:101:15
+Premiere START:370:M64:C:6900:255:256:32:101:8:0:0:0
+Premiere 1:370:M64:C:6900:511:512;515:0:101:10:0:0:0
+Premiere 2:370:M64:C:6900:1791:1792;1795:0:101:11:0:0:0
+Premiere 3:370:M64:C:6900:2303:2304:0:101:43:0:0:0
+Premiere 4:370:M64:C:6900:767:768:0:101:9:0:0:0
+Premiere 5:370:M64:C:6900:1279:1280:0:101:29:0:0:0
+Premiere 6:370:M64:C:6900:1535:1536:0:101:41:0:0:0
+Premiere 7:370:M64:C:6900:1023:1024:0:101:20:0:0:0
+Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16:0:0:0
+Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516:0:0:0
+13 TH STREET:354:M64:C:6900:2303:2304:0:101:42:0:0:0
+Studio Universal:402:M64:C:6900:1050:1054:0:101:36:0:0:0
+Krimi & Co:378:M64:C:6900:1535:1536:0:101:23:0:0:0
+Disney Channel:402:M64:C:6900:1030:1034:0:101:34:0:0:0
+Discovery Channel:378:M64:C:6900:1791:1792:0:101:14:0:0:0
+PLANET:354:M64:C:6900:1791:1792:0:101:13:0:0:0
+Fox Kids:354:M64:C:6900:1279:1280:0:101:28:0:0:0
+Junior:354:M64:C:6900:255:256:0:101:19:0:0:0
+K-TOON:354:M64:C:6900:511:512:0:101:12:0:0:0
+HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22:0:0:0
+GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518:0:0:0
+CLASSICA:354:M64:C:6900:767:768:0:101:15:0:0:0
 :Mediavision
-Bloomberg:346:M64:C:6900:811:812:0:101:50701
-Fashion TV:346:M64:C:6900:821:822:0:101:50702
-Einstein:346:M64:C:6900:623:624:0:101:50719
-Extreme Sport:346:M64:C:6900:801:802:0:101:50700
-LANDSCAPE:346:M64:C:6900:831:832:0:101:50703
+Bloomberg:346:M64:C:6900:811:812:0:101:50701:0:0:0
+Fashion TV:346:M64:C:6900:821:822:0:101:50702:0:0:0
+Einstein:346:M64:C:6900:623:624:0:101:50719:0:0:0
+Extreme Sport:346:M64:C:6900:801:802:0:101:50700:0:0:0
+LANDSCAPE:346:M64:C:6900:831:832:0:101:50703:0:0:0
 :DIGIKABEL D
-Avante:113:M64:C:6900:741:742,743:0:101:53404
-BBC Prime:113:M64:C:6900:761:762:763:101:53406
-Club:113:M64:C:6900:711:712,713:0:101:53401
-Eurosport News:113:M64:C:6900:771:772:0:101:53407
-BibelTV:113:M64:C:6900:731:732:0:1:53403
-Liberty TV:113:M64:C:6900:721:722,723:0:101:53402
-TW1:113:M64:C:6900:751:752:0:101:53405
-MTV Base:113:M64:C:6900:781:782:0:101:53408
+Avante:113:M64:C:6900:741:742,743:0:101:53404:0:0:0
+BBC Prime:113:M64:C:6900:761:762:763:101:53406:0:0:0
+Club:113:M64:C:6900:711:712,713:0:101:53401:0:0:0
+Eurosport News:113:M64:C:6900:771:772:0:101:53407:0:0:0
+BibelTV:113:M64:C:6900:731:732:0:1:53403:0:0:0
+Liberty TV:113:M64:C:6900:721:722,723:0:101:53402:0:0:0
+TW1:113:M64:C:6900:751:752:0:101:53405:0:0:0
+MTV Base:113:M64:C:6900:781:782:0:101:53408:0:0:0
 :DIGIKABEL INT
-Canal 24 Horas:121:M64:C:6900:991:992:0:101:53509
-Gala TV:121:M64:C:6900:931:932:0:101:53503
-Kanal 7:121:M64:C:6900:941:942:0:101:53504
-Rai 1:121:M64:C:6900:951:952:0:101:53505
-Rai 2:121:M64:C:6900:961:962:0:101:53506
-Rai 3:121:M64:C:6900:971:972:0:101:53507
-Show TV:121:M64:C:6900:911:912:0:101:53501
-TGRT:121:M64:C:6900:921:922:0:101:53502
-TVEi:121:M64:C:6900:981:982:0:101:53508
+Canal 24 Horas:121:M64:C:6900:991:992:0:101:53509:0:0:0
+Gala TV:121:M64:C:6900:931:932:0:101:53503:0:0:0
+Kanal 7:121:M64:C:6900:941:942:0:101:53504:0:0:0
+Rai 1:121:M64:C:6900:951:952:0:101:53505:0:0:0
+Rai 2:121:M64:C:6900:961:962:0:101:53506:0:0:0
+Rai 3:121:M64:C:6900:971:972:0:101:53507:0:0:0
+Show TV:121:M64:C:6900:911:912:0:101:53501:0:0:0
+TGRT:121:M64:C:6900:921:922:0:101:53502:0:0:0
+TVEi:121:M64:C:6900:981:982:0:101:53508:0:0:0
 :DIGIKABEL SO
-Fox Kids:121:M64:C:6900:931:932,933:0:101:53523
-Kanal 7:121:M64:C:6900:941:942:0:101:53524
-Show TV:121:M64:C:6900:911:912:0:101:53521
-TGRT:121:M64:C:6900:921:922:0:101:53522
+Fox Kids:121:M64:C:6900:931:932,933:0:101:53523:0:0:0
+Kanal 7:121:M64:C:6900:941:942:0:101:53524:0:0:0
+Show TV:121:M64:C:6900:911:912:0:101:53521:0:0:0
+TGRT:121:M64:C:6900:921:922:0:101:53522:0:0:0
 :DIGIKABEL SW
-Canal 24 Horas:121:M64:C:6900:991:992:0:101:53535
-Rai 1:121:M64:C:6900:951:952:0:101:53531
-Rai 2:121:M64:C:6900:961:962:0:101:53532
-Rai 3:121:M64:C:6900:971:972:0:101:53533
-TVEi:121:M64:C:6900:981:982:0:101:53534
+Canal 24 Horas:121:M64:C:6900:991:992:0:101:53535:0:0:0
+Rai 1:121:M64:C:6900:951:952:0:101:53531:0:0:0
+Rai 2:121:M64:C:6900:961:962:0:101:53532:0:0:0
+Rai 3:121:M64:C:6900:971:972:0:101:53533:0:0:0
+TVEi:121:M64:C:6900:981:982:0:101:53534:0:0:0
 :Diverse TV-Sender
-Sonnenklar TV:402:M64:C:6900:0:0:0:101:32
-TV Polonia:434:M64:C:6900:641:642:0:101:53204
-Kanal D:434:M64:C:6900:651:652:0:101:53205
-RTP international:434:M64:C:6900:661:662:0:101:53206
-ERT-Sat:434:M64:C:6900:691:692:0:101:53209
-CNE:434:M64:C:6900:4056:4057:0:101:53208
-ZEE TV:442:M64:C:6900:517:773:0:101:53301
-NTV i:442:M64:C:6900:514:515:0:101:53302
-ATV:434:M64:C:6900:631:632:0:101:53203
-TW1:610:M64:C:6900:6106:6107:0:101:6106
+Sonnenklar TV:402:M64:C:6900:0:0:0:101:32:0:0:0
+TV Polonia:434:M64:C:6900:641:642:0:101:53204:0:0:0
+Kanal D:434:M64:C:6900:651:652:0:101:53205:0:0:0
+RTP international:434:M64:C:6900:661:662:0:101:53206:0:0:0
+ERT-Sat:434:M64:C:6900:691:692:0:101:53209:0:0:0
+CNE:434:M64:C:6900:4056:4057:0:101:53208:0:0:0
+ZEE TV:442:M64:C:6900:517:773:0:101:53301:0:0:0
+NTV i:442:M64:C:6900:514:515:0:101:53302:0:0:0
+ATV:434:M64:C:6900:631:632:0:101:53203:0:0:0
+TW1:610:M64:C:6900:6106:6107:0:101:6106:0:0:0
 :Digit. Bouquet "Kabel Berlin"
-Parlamentsfernsehen:610:M64:C:6900:33:36:47:0:6100
-DW-tv:610:M64:C:6900:634:632:0:0:6101
-Kanal 7:610:M64:C:6900:49:52:0:101:6103
-Euronews:610:M64:C:6900:597:592:0:101:6104
-Travel:610:M64:C:6900:595:594:0:101:6105
-VH1 Classic:610:M64:C:6900:604:603:0:101:6106
-Nuvolari:618:M64:C:6900:1011:1012:0:101:50101
-Alice:618:M64:C:6900:1031:1032:0:101:50103
-Leonardo:618:M64:C:6900:1041:1042:0:101:50104
-Club:618:M64:C:6900:1051:1052:0:101:50105
-Avante:618:M64:C:6900:1061:1062:0:101:50106
-BBC Prime:618:M64:C:6900:1091:1092:0:101:50109
-Eurosport News:618:M64:C:6900:1101:1102:0:101:50110
+Parlamentsfernsehen:610:M64:C:6900:33:36:47:0:6100:0:0:0
+DW-tv:610:M64:C:6900:634:632:0:0:6101:0:0:0
+Kanal 7:610:M64:C:6900:49:52:0:101:6103:0:0:0
+Euronews:610:M64:C:6900:597:592:0:101:6104:0:0:0
+Travel:610:M64:C:6900:595:594:0:101:6105:0:0:0
+VH1 Classic:610:M64:C:6900:604:603:0:101:6106:0:0:1
+Nuvolari:618:M64:C:6900:1011:1012:0:101:50101:0:0:0
+Alice:618:M64:C:6900:1031:1032:0:101:50103:0:0:0
+Leonardo:618:M64:C:6900:1041:1042:0:101:50104:0:0:0
+Club:618:M64:C:6900:1051:1052:0:101:50105:0:0:0
+Avante:618:M64:C:6900:1061:1062:0:101:50106:0:0:0
+BBC Prime:618:M64:C:6900:1091:1092:0:101:50109:0:0:0
+Eurosport News:618:M64:C:6900:1101:1102:0:101:50110:0:0:0
 :Premiere Sport
-PREMIERE SPORT 1:362:M64:C:6900:255:256,258:0:101:17
-PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27
+PREMIERE SPORT 1:362:M64:C:6900:255:256,258:0:101:17:0:0:0
+PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27:0:0:0
 :Premiere Bundesliga
-BuLi Opt 1:362:M64:C:6900:255:256:0:101:17
-BuLi Opt 2:362:M64:C:6900:2047:2048:0:101:240
-BuLi Opt 3:362:M64:C:6900:2303:2304:0:101:241
-BuLi Opt 4:362:M64:C:6900:2559:2560:0:101:242
-BuLi Opt 5:362:M64:C:6900:2815:2816:0:101:243
-BuLi Opt 6:362:M64:C:6900:3071:3072:0:101:244
-BuLi Opt 7:362:M64:C:6900:3327:3328:0:101:245
-BuLi Opt 8:378:M64:C:6900:3071:3072:0:101:208
-BuLi Opt 9:378:M64:C:6900:3327:3328:0:101:209
-BuLi Opt 10:378:M64:C:6900:2303:2304:0:101:210
+BuLi Opt 1:362:M64:C:6900:255:256:0:101:17:0:0:1
+BuLi Opt 2:362:M64:C:6900:2047:2048:0:101:240:0:0:0
+BuLi Opt 3:362:M64:C:6900:2303:2304:0:101:241:0:0:0
+BuLi Opt 4:362:M64:C:6900:2559:2560:0:101:242:0:0:0
+BuLi Opt 5:362:M64:C:6900:2815:2816:0:101:243:0:0:0
+BuLi Opt 6:362:M64:C:6900:3071:3072:0:101:244:0:0:0
+BuLi Opt 7:362:M64:C:6900:3327:3328:0:101:245:0:0:0
+BuLi Opt 8:378:M64:C:6900:3071:3072:0:101:208:0:0:0
+BuLi Opt 9:378:M64:C:6900:3327:3328:0:101:209:0:0:0
+BuLi Opt 10:378:M64:C:6900:2303:2304:0:101:210:0:0:0
 :Premiere CL
-UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17
-UEFA CL 2:386:M64:C:6900:255:256:0:101:211
+UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17:0:0:2
+UEFA CL 2:386:M64:C:6900:255:256:0:101:211:0:0:0
 :Premiere Formel 1
-F1 Portal 1:362:M64:C:6900:255:256:0:101:17
-F1 Supersignal:362:M64:C:6900:2047:2048:0:101:240
-F1 Cockpit Kanal:362:M64:C:6900:2303:2304:0:101:241
-F1 Boxengasse:362:M64:C:6900:2559:2560:0:101:242
-F1 Verfolgerfeld:362:M64:C:6900:2815:2816:0:101:243
-F1 Infokanal:362:M64:C:6900:3071:3072:0:101:244
+F1 Portal 1:362:M64:C:6900:255:256:0:101:17:0:0:3
+F1 Supersignal:362:M64:C:6900:2047:2048:0:101:240:0:0:1
+F1 Cockpit Kanal:362:M64:C:6900:2303:2304:0:101:241:0:0:1
+F1 Boxengasse:362:M64:C:6900:2559:2560:0:101:242:0:0:1
+F1 Verfolgerfeld:362:M64:C:6900:2815:2816:0:101:243:0:0:1
+F1 Infokanal:362:M64:C:6900:3071:3072:0:101:244:0:0:1
 :Premiere Direkt 1
-PREMIERE DIREKT 1A:378:M64:C:6900:511:512,513;515:0:101:177
-PREMIERE DIREKT 1B:362:M64:C:6900:1023:1024,1025;1027:0:101:182
+PREMIERE DIREKT 1A:378:M64:C:6900:511:512,513;515:0:101:177:0:0:0
+PREMIERE DIREKT 1B:362:M64:C:6900:1023:1024,1025;1027:0:101:182:0:0:0
 :Premiere Direkt 2
-PREMIERE DIREKT 2A:378:M64:C:6900:255:256,257;259:0:101:176
-PREMIERE DIREKT 2B:362:M64:C:6900:767:768,769;771:0:101:181
+PREMIERE DIREKT 2A:378:M64:C:6900:255:256,257;259:0:101:176:0:0:0
+PREMIERE DIREKT 2B:362:M64:C:6900:767:768,769;771:0:101:181:0:0:0
 :Premiere Direkt 3
-PREMIERE DIREKT 3A:362:M64:C:6900:1279:1280,1281;1283:0:101:183
-PREMIERE DIREKT 3B:362:M64:C:6900:511:512,513;515:0:101:180
+PREMIERE DIREKT 3A:362:M64:C:6900:1279:1280,1281;1283:0:101:183:0:0:0
+PREMIERE DIREKT 3B:362:M64:C:6900:511:512,513;515:0:101:180:0:0:0
 :Premiere Direkt 4
-PREMIERE DIREKT 4A:378:M64:C:6900:2815:2816,2817:0:101:18
-PREMIERE DIREKT 4B:386:M64:C:6900:1535:1536,1537:0:101:216
+PREMIERE DIREKT 4A:378:M64:C:6900:2815:2816,2817:0:101:18:0:0:0
+PREMIERE DIREKT 4B:386:M64:C:6900:1535:1536,1537:0:101:216:0:0:0
 :Premiere Erotik
-BEATE-UHSE.TV:354:M64:C:6900:1023:1024:0:101:21
-PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513
-PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778
-PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779
-PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780
+BEATE-UHSE.TV:354:M64:C:6900:1023:1024:0:101:21:0:0:0
+PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513:0:0:0
+PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778:0:0:0
+PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779:0:0:0
+PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780:0:0:0
 :Radio-Sender (FTV)
-Fritz:426:M64:C:6900:0:901:0:0:28209
-SPUTNIK:426:M64:C:6900:0:1201:0:0:28212
-HR XXL:410:M64:C:6900:0:3501:0:0:28125
-JUMP:426:M64:C:6900:0:1001:0:0:28210
-MDR info:426:M64:C:6900:0:1101:0:0:28211
-MDR KULTUR:426:M64:C:6900:0:801:0:0:28208
-Radio 3:426:M64:C:6900:0:701:0:0:28207
-RADIOmultikulti:426:M64:C:6900:0:1301:0:0:28213
-SWR2:426:M64:C:6900:0:1401:0:0:28214
-WDR 3:426:M64:C:6900:0:1501:0:0:28215
-WDR Radio 5:426:M64:C:6900:0:1601:0:0:28216
-Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120
-B5 aktuell:410:M64:C:6900:0:3101:0:0:28121
-NordwestRadio:410:M64:C:6900:0:3801:0:0:28128
-Bayern 1:410:M64:C:6900:0:3601:0:0:28126
-NDR Info:410:M64:C:6900:0:3701:0:0:28127
-SR 1:410:M64:C:6900:0:3901:0:0:28129
-hr-klassik:410:M64:C:6900:0:3401:0:0:28124
-hr2:410:M64:C:6900:0:3301:0:0:28123
-hr-chronos:410:M64:C:6900:0:3201:0:0:28122
-DLF-K�ln:394:M64:C:6900:0:810:0:0:28013
-DLR-Berlin:394:M64:C:6900:0:710:0:0:28012
-�sterreich 1:394:M64:C:6900:0:169:0:0:28017
-Radio GoldStar:354:M64:C:6900:0:368:0:0:171
+Fritz:426:M64:C:6900:0:901:0:0:28209:0:0:0
+SPUTNIK:426:M64:C:6900:0:1201:0:0:28212:0:0:0
+HR XXL:410:M64:C:6900:0:3501:0:0:28125:0:0:0
+JUMP:426:M64:C:6900:0:1001:0:0:28210:0:0:0
+MDR info:426:M64:C:6900:0:1101:0:0:28211:0:0:0
+MDR KULTUR:426:M64:C:6900:0:801:0:0:28208:0:0:0
+Radio 3:426:M64:C:6900:0:701:0:0:28207:0:0:0
+RADIOmultikulti:426:M64:C:6900:0:1301:0:0:28213:0:0:0
+SWR2:426:M64:C:6900:0:1401:0:0:28214:0:0:0
+WDR 3:426:M64:C:6900:0:1501:0:0:28215:0:0:0
+WDR Radio 5:426:M64:C:6900:0:1601:0:0:28216:0:0:0
+Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120:0:0:0
+B5 aktuell:410:M64:C:6900:0:3101:0:0:28121:0:0:0
+NordwestRadio:410:M64:C:6900:0:3801:0:0:28128:0:0:0
+Bayern 1:410:M64:C:6900:0:3601:0:0:28126:0:0:0
+NDR Info:410:M64:C:6900:0:3701:0:0:28127:0:0:0
+SR 1:410:M64:C:6900:0:3901:0:0:28129:0:0:0
+hr-klassik:410:M64:C:6900:0:3401:0:0:28124:0:0:0
+hr2:410:M64:C:6900:0:3301:0:0:28123:0:0:0
+hr-chronos:410:M64:C:6900:0:3201:0:0:28122:0:0:0
+DLF-K�ln:394:M64:C:6900:0:810:0:0:28013:0:0:0
+DLR-Berlin:394:M64:C:6900:0:710:0:0:28012:0:0:0
+�sterreich 1:394:M64:C:6900:0:169:0:0:28017:0:0:0
+Radio GoldStar:354:M64:C:6900:0:368:0:0:171:0:0:0
 :Radio-Sender (PPV)
-ALTERNATIVE ROCK:370:M64:C:6900:1:544:0:101:154
-DEUTSCHE HITS:370:M64:C:6900:1:800:0:101:151
-HITLISTE:370:M64:C:6900:1:784:0:101:150
-HIP HOP/R&B:370:M64:C:6900:1:576:0:101:159
-DANCE:370:M64:C:6900:1:304:0:101:165
-HARD ROCK:370:M64:C:6900:1:816:0:101:152
-LOVE SONGS:370:M64:C:6900:1:592:0:101:156
-FILM & MUSICAL:378:M64:C:6900:1:592:0:101:145
-EASY LISTENING:378:M64:C:6900:1:608:0:101:146
-JAZZ:378:M64:C:6900:1:640:0:101:148
-KLASSIK POPUL�R:378:M64:C:6900:1:624:0:101:147
-ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158
-CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163
-CHILLOUT:370:M64:C:6900:1:400:0:101:157
-SCHLAGER:370:M64:C:6900:1:384:0:101:162
-GOLD:370:M64:C:6900:1:320:0:101:166
-OLD GOLD:362:M64:C:6900:1:336:0:101:167
-SOUL CLASSICS:362:M64:C:6900:1:352:0:101:153
-LATIN:362:M64:C:6900:1:368:0:101:155
-NEW COUNTRY:362:M64:C:6900:1:384:0:101:164
-COUNTRY:362:M64:C:6900:1:656:0:101:149
-All Jazz:442:M64:C:6900:1:535:0:101:53350
-Cristal New Age:442:M64:C:6900:1:536:0:101:53351
-Movie Sounds:442:M64:C:6900:1:537:0:101:53352
-Sinfonica:442:M64:C:6900:1:538:0:101:53353
-Opernfestival:442:M64:C:6900:1:539:0:101:53354
-Barock Fantasie:442:M64:C:6900:1:540:0:101:53355
-Musica Camerata:442:M64:C:6900:1:541:0:101:53356
-Musica Antica:442:M64:C:6900:1:542:0:101:53357
-Adagio:442:M64:C:6900:1:543:0:101:53358
-Jazz legends:442:M64:C:6900:1:544:0:101:53359
+ALTERNATIVE ROCK:370:M64:C:6900:1:544:0:101:154:0:0:0
+DEUTSCHE HITS:370:M64:C:6900:1:800:0:101:151:0:0:0
+HITLISTE:370:M64:C:6900:1:784:0:101:150:0:0:0
+HIP HOP/R&B:370:M64:C:6900:1:576:0:101:159:0:0:0
+DANCE:370:M64:C:6900:1:304:0:101:165:0:0:0
+HARD ROCK:370:M64:C:6900:1:816:0:101:152:0:0:0
+LOVE SONGS:370:M64:C:6900:1:592:0:101:156:0:0:0
+FILM & MUSICAL:378:M64:C:6900:1:592:0:101:145:0:0:0
+EASY LISTENING:378:M64:C:6900:1:608:0:101:146:0:0:0
+JAZZ:378:M64:C:6900:1:640:0:101:148:0:0:0
+KLASSIK POPUL�R:378:M64:C:6900:1:624:0:101:147:0:0:0
+ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158:0:0:0
+CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163:0:0:0
+CHILLOUT:370:M64:C:6900:1:400:0:101:157:0:0:0
+SCHLAGER:370:M64:C:6900:1:384:0:101:162:0:0:0
+GOLD:370:M64:C:6900:1:320:0:101:166:0:0:0
+OLD GOLD:362:M64:C:6900:1:336:0:101:167:0:0:0
+SOUL CLASSICS:362:M64:C:6900:1:352:0:101:153:0:0:0
+LATIN:362:M64:C:6900:1:368:0:101:155:0:0:0
+NEW COUNTRY:362:M64:C:6900:1:384:0:101:164:0:0:0
+COUNTRY:362:M64:C:6900:1:656:0:101:149:0:0:0
+All Jazz:442:M64:C:6900:1:535:0:101:53350:0:0:0
+Cristal New Age:442:M64:C:6900:1:536:0:101:53351:0:0:0
+Movie Sounds:442:M64:C:6900:1:537:0:101:53352:0:0:0
+Sinfonica:442:M64:C:6900:1:538:0:101:53353:0:0:0
+Opernfestival:442:M64:C:6900:1:539:0:101:53354:0:0:0
+Barock Fantasie:442:M64:C:6900:1:540:0:101:53355:0:0:0
+Musica Camerata:442:M64:C:6900:1:541:0:101:53356:0:0:0
+Musica Antica:442:M64:C:6900:1:542:0:101:53357:0:0:0
+Adagio:442:M64:C:6900:1:543:0:101:53358:0:0:0
+Jazz legends:442:M64:C:6900:1:544:0:101:53359:0:0:0
diff --git a/channels.conf.terr b/channels.conf.terr
index 4187e1121..f48d5663b 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -1,52 +1,52 @@
 : UK channels for Crystal Palace, London
-BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164
-BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228
-BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351
-BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415
-Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800
-ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325
-ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261
-Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384
-five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866
-QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120
-TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632
-ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760
-BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768
-BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832
-BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920
-BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984
-BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048
-BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112
-1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176
-BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240
-701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456
-702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520
-Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080
-Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144
-Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208
-UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272
-THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664
-TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728
-UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792
-f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856
-Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048
-Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240
-KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176
-Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304
-jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368
-oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432
-BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496
-Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048
-Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984
+BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164:0:0:0
+BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228:0:0:0
+BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351:0:0:0
+BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415:0:0:0
+Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800:0:0:0
+ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325:0:0:0
+ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261:0:0:0
+Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0
+five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866:0:0:0
+QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120:0:0:0
+TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632:0:0:0
+ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760:0:0:0
+BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768:0:0:0
+BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832:0:0:0
+BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920:0:0:0
+BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984:0:0:0
+BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048:0:0:0
+BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112:0:0:0
+1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176:0:0:0
+BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240:0:0:0
+701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456:0:0:0
+702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520:0:0:0
+Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080:0:0:0
+Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144:0:0:0
+Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208:0:0:0
+UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272:0:0:0
+THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664:0:0:0
+TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728:0:0:0
+UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792:0:0:0
+f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856:0:0:0
+Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
+Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
+KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
+Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304:0:0:0
+jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368:0:0:0
+oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0
+BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496:0:0:0
+Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:1
+Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
 : DVB-T Berlin Germany
-PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403
-SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408
-RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405
-RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406
-Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411
-VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418
-KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394
-MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396
-N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401
-N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398
-FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576
+PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403:0:0:0
+SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408:0:0:0
+RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405:0:0:0
+RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406:0:0:0
+Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411:0:0:0
+VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418:0:0:0
+KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394:0:0:0
+MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396:0:0:0
+N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401:0:0:0
+N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398:0:0:0
+FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576:0:0:0
diff --git a/channels.h b/channels.h
index 52e79b4d3..0f6feb101 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.4 2002/11/10 13:01:23 kls Exp $
+ * $Id: channels.h 1.5 2002/11/24 14:27:51 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -35,6 +35,24 @@ extern const tChannelParameterMap TransmissionValues[];
 extern const tChannelParameterMap GuardValues[];
 extern const tChannelParameterMap HierarchyValues[];
 
+struct tChannelID {
+private:
+  int source;
+  int nid;
+  int tid;
+  int sid;
+  int rid;
+public:
+  tChannelID(void) { source = nid = tid = sid = rid = 0; }
+  tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
+  bool operator== (const tChannelID &arg) const;
+  bool Valid(void) { return source && tid && sid; } // nid and rid are optional
+  tChannelID &ClrRid(void) { rid = 0; return *this; }
+  static tChannelID FromString(const char *s);
+  const char *ToString(void);
+  static const tChannelID InvalidID;
+  };
+
 class cChannel : public cListObject {
   friend class cMenuEditChannel;
 private:
@@ -51,7 +69,10 @@ class cChannel : public cListObject {
   int dpid1, dpid2;
   int tpid;
   int ca;
+  int nid;
+  int tid;
   int sid;
+  int rid;
   int number;    // Sequence number assigned on load
   bool groupSep;
   char polarization;
@@ -99,9 +120,7 @@ class cChannel : public cListObject {
   bool IsCable(void) { return (source & cSource::st_Mask) == cSource::stCable; }
   bool IsSat(void) { return (source & cSource::st_Mask) == cSource::stSat; }
   bool IsTerr(void) { return (source & cSource::st_Mask) == cSource::stTerr; }
-  uint64 GetChannelID(void) const;
-  const char *GetChannelIDStr(void) const;
-  static uint64 StringToChannelID(const char *s);
+  tChannelID GetChannelID(void) const;
   };
 
 class cChannels : public cConfig<cChannel> {
@@ -116,7 +135,7 @@ class cChannels : public cConfig<cChannel> {
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(int Source, unsigned short ServiceID);
-  cChannel *GetByChannelID(uint64 ChannelID);
+  cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false);
   bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
diff --git a/config.h b/config.h
index af8d92b95..0c84ad41e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.139 2002/11/08 13:16:12 kls Exp $
+ * $Id: config.h 1.141 2002/11/24 12:28:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,10 +17,9 @@
 #include <time.h>
 #include <unistd.h>
 #include "device.h"
-#include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.16"
+#define VDRVERSION "1.1.17"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/diseqc.conf b/diseqc.conf
index 52222f3dd..135089ed6 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -22,9 +22,41 @@
 #   [xx ...]  hex code sequence (max. 6)
 #
 # The 'command...' part is optional.
+#
+# Examples:
+
+# Full DiSEqC sequence:
 
 S19.2E  11700 V  9750  t v W15 [E0 10 38 F0] W15 A W15 t
 S19.2E  99999 V 10600  t v W15 [E0 10 38 F1] W15 A W15 T
 S19.2E  11700 H  9750  t V W15 [E0 10 38 F2] W15 A W15 t
 S19.2E  99999 H 10600  t V W15 [E0 10 38 F3] W15 A W15 T
 
+S21.5E  11700 V  9750  t v W15 [E0 10 38 F4] W15 B W15 t
+S21.5E  99999 V 10600  t v W15 [E0 10 38 F5] W15 B W15 T
+S21.5E  11700 H  9750  t V W15 [E0 10 38 F6] W15 B W15 t
+S21.5E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
+
+# Optimized for mini DiSEqC (aka toneburst):
+#
+# S19.2E  11700 V  9750  t v W15 A W15 t
+# S19.2E  99999 V 10600  t v W15 A W15 T
+# S19.2E  11700 H  9750  t V W15 A W15 t
+# S19.2E  99999 H 10600  t V W15 A W15 T
+#
+# S21.5E  11700 V  9750  t v W15 B W15 t
+# S21.5E  99999 V 10600  t v W15 B W15 T
+# S21.5E  11700 H  9750  t V W15 B W15 t
+# S21.5E  99999 H 10600  t V W15 B W15 T
+#
+# Optimized for full DiSEqC:
+#
+# S19.2E  11700 V  9750  [E0 10 38 F0]
+# S19.2E  99999 V 10600  [E0 10 38 F1]
+# S19.2E  11700 H  9750  [E0 10 38 F2]
+# S19.2E  99999 H 10600  [E0 10 38 F3]
+#
+# S21.5E  11700 V  9750  [E0 10 38 F4]
+# S21.5E  99999 V 10600  [E0 10 38 F5]
+# S21.5E  11700 H  9750  [E0 10 38 F6]
+# S21.5E  99999 H 10600  [E0 10 38 F7]
diff --git a/dvbdevice.c b/dvbdevice.c
index 119a28e68..3aa9f93fd 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.35 2002/11/10 12:57:17 kls Exp $
+ * $Id: dvbdevice.c 1.37 2002/11/15 15:17:30 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -33,6 +33,7 @@ extern "C" {
 #include "transfer.h"
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
+#define DO_MULTIPLE_RECORDINGS 1
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -311,11 +312,11 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            pesFilterParams.pes_type= PesTypes[Type];
            pesFilterParams.flags   = DMX_IMMEDIATE_START;
            CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
-           close(Handle->handle);
-           Handle->handle = -1;
            if (PesTypes[Type] == DMX_PES_VIDEO) // let's only do this once
               SetPlayMode(pmNone); // necessary to switch a PID from DMX_PES_VIDEO/AUDIO to DMX_PES_OTHER
            }
+        close(Handle->handle);
+        Handle->handle = -1;
         }
      }
   return true;
@@ -343,6 +344,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool needsDetachReceivers = true;
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
+#ifdef DO_MULTIPLE_RECORDINGS
      if (Receiving()) {
         if (IsTunedTo(Channel)) {
            needsDetachReceivers = false;
@@ -365,6 +367,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            result = hasPriority;
         }
      else
+#endif
         result = hasPriority;
      }
   if (NeedsDetachReceivers)
@@ -381,11 +384,6 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
-  if (HasDecoder())
-     LiveView = true;
-#endif
-
   bool IsEncrypted = Channel->Ca() > CACONFBASE;
 
   bool DoTune = !IsTunedTo(Channel);
@@ -393,10 +391,9 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
                             || IsEncrypted && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode
-                            || IsPrimaryDevice()
-                               && (LiveView // for a new live view the old PIDs need to be turned off
-                                  || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                                  )
+                            || !IsPrimaryDevice()
+                            || LiveView // for a new live view the old PIDs need to be turned off
+                            || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                             );
 
   bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune
@@ -409,6 +406,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                            || LiveView
                            );
 
+#ifndef DO_MULTIPLE_RECORDINGS
+  TurnOffLivePIDs = TurnOnLivePIDs = true;
+  StartTransferMode = false;
+#endif
+
   // Stop setting system time:
 
   if (siProcessor)
@@ -634,6 +636,10 @@ void cDvbDevice::SetAudioTrackDevice(int Index)
 
 bool cDvbDevice::CanReplay(void) const
 {
+#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+  if (Receiving())
+     return false;
+#endif
   return cDevice::CanReplay() && !Ca(); // we can only replay if there is no Ca recording going on
 }
 
diff --git a/eit.c b/eit.c
index f8b436c0d..dd51f0cf9 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.60 2002/11/10 15:50:21 kls Exp $
+ * $Id: eit.c 1.61 2002/11/24 14:37:38 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -180,7 +180,7 @@ bool cTDT::SetSystemTime()
 
 // --- cEventInfo ------------------------------------------------------------
 
-cEventInfo::cEventInfo(uint64 channelid, unsigned short eventid)
+cEventInfo::cEventInfo(tChannelID channelid, unsigned short eventid)
 {
    pTitle = NULL;
    pSubtitle = NULL;
@@ -190,7 +190,7 @@ cEventInfo::cEventInfo(uint64 channelid, unsigned short eventid)
    tTime = 0;
    uTableID = 0;
    uEventID = eventid;
-   uChannelID = channelid;
+   channelID = channelid;
    nChannelNumber = 0;
 }
 
@@ -325,15 +325,15 @@ void cEventInfo::SetEventID(unsigned short evid)
    uEventID = evid;
 }
 /**  */
-void cEventInfo::SetChannelID(uint64 channelid)
+void cEventInfo::SetChannelID(tChannelID channelid)
 {
-   uChannelID = channelid;
+   channelID = channelid;
 }
 
 /**  */
-uint64 cEventInfo::GetChannelID() const
+tChannelID cEventInfo::GetChannelID() const
 {
-   return uChannelID;
+   return channelID;
 }
 
 /**  */
@@ -404,13 +404,13 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
 struct tEpgBugFixStats {
   int hits;
   int n;
-  uint64 channelIDs[MAXEPGBUGFIXCHANS];
+  tChannelID channelIDs[MAXEPGBUGFIXCHANS];
   tEpgBugFixStats(void) { hits = n = 0; }
   };
 
 tEpgBugFixStats EpgBugFixStats[MAXEPGBUGFIXSTATS];
 
-static void EpgBugFixStat(int Number, uint64 ChannelID)
+static void EpgBugFixStat(int Number, tChannelID ChannelID)
 {
   if (0 <= Number && Number < MAXEPGBUGFIXSTATS) {
      tEpgBugFixStats *p = &EpgBugFixStats[Number];
@@ -448,7 +448,7 @@ static void ReportEpgBugFixStats(bool Reset = false)
             char *q = buffer;
             q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
             for (int c = 0; c < p->n; c++) {
-                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c]);
+                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c], true);
                 if (channel) {
                    q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
                    delim = ", ";
@@ -608,10 +608,10 @@ void cEventInfo::FixEpgBugs(void)
 
 // --- cSchedule -------------------------------------------------------------
 
-cSchedule::cSchedule(uint64 channelid)
+cSchedule::cSchedule(tChannelID channelid)
 {
    pPresent = pFollowing = NULL;
-   uChannelID = channelid;
+   channelID = channelid;
 }
 
 
@@ -645,14 +645,14 @@ const cEventInfo *cSchedule::GetFollowingEvent(void) const
   return pe;
 }
 
-void cSchedule::SetChannelID(uint64 channelid)
+void cSchedule::SetChannelID(tChannelID channelid)
 {
-   uChannelID = channelid;
+   channelID = channelid;
 }
 /**  */
-uint64 cSchedule::GetChannelID() const
+tChannelID cSchedule::GetChannelID() const
 {
-   return uChannelID;
+   return channelID;
 }
 /**  */
 const cEventInfo * cSchedule::GetEvent(unsigned short uEventID, time_t tTime) const
@@ -735,10 +735,10 @@ void cSchedule::Cleanup(time_t tTime)
 /**  */
 void cSchedule::Dump(FILE *f, const char *Prefix) const
 {
-   cChannel *channel = Channels.GetByChannelID(uChannelID);
+   cChannel *channel = Channels.GetByChannelID(channelID, true);
    if (channel)
    {
-      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelIDStr(), channel->Name());
+      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelID().ToString(), channel->Name());
       for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
          p->Dump(f, Prefix);
       fprintf(f, "%sc\n", Prefix);
@@ -756,9 +756,9 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
               if (p)
                  *p = 0; // strips optional channel name
               if (*s) {
-                 uint64 uChannelID = cChannel::StringToChannelID(s);
-                 if (uChannelID) {
-                    cSchedule *p = (cSchedule *)Schedules->AddChannelID(uChannelID);
+                 tChannelID channelID = tChannelID::FromString(s);
+                 if (channelID.Valid()) {
+                    cSchedule *p = (cSchedule *)Schedules->AddChannelID(channelID);
                     if (p) {
                        if (!cEventInfo::Read(f, p))
                           return false;
@@ -785,14 +785,13 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
 cSchedules::cSchedules()
 {
    pCurrentSchedule = NULL;
-   uCurrentChannelID = 0;
 }
 
 cSchedules::~cSchedules()
 {
 }
 /**  */
-const cSchedule *cSchedules::AddChannelID(uint64 channelid)
+const cSchedule *cSchedules::AddChannelID(tChannelID channelid)
 {
   const cSchedule *p = GetSchedule(channelid);
   if (!p) {
@@ -802,11 +801,12 @@ const cSchedule *cSchedules::AddChannelID(uint64 channelid)
   return p;
 }
 /**  */
-const cSchedule *cSchedules::SetCurrentChannelID(uint64 channelid)
+const cSchedule *cSchedules::SetCurrentChannelID(tChannelID channelid)
 {
+  channelid.ClrRid();
   pCurrentSchedule = AddChannelID(channelid);
   if (pCurrentSchedule)
-     uCurrentChannelID = channelid;
+     currentChannelID = channelid;
   return pCurrentSchedule;
 }
 /**  */
@@ -815,10 +815,11 @@ const cSchedule * cSchedules::GetSchedule() const
    return pCurrentSchedule;
 }
 /**  */
-const cSchedule * cSchedules::GetSchedule(uint64 channelid) const
+const cSchedule * cSchedules::GetSchedule(tChannelID channelid) const
 {
    cSchedule *p;
 
+   channelid.ClrRid();
    p = First();
    while (p != NULL)
    {
@@ -905,7 +906,8 @@ int cEIT::ProcessEIT(unsigned char *buffer, int CurrentSource)
       for (VdrProgramInfo = (struct VdrProgramInfo *) VdrProgramInfos->Head; VdrProgramInfo; VdrProgramInfo = (struct VdrProgramInfo *) xSucc (VdrProgramInfo)) {
           //XXX TODO use complete channel ID
           cChannel *channel = Channels.GetByServiceID(CurrentSource, VdrProgramInfo->ServiceID);
-          uint64 channelID = channel ? channel->GetChannelID() : (uint64(CurrentSource) << 48) | VdrProgramInfo->ServiceID;
+          tChannelID channelID = channel ? channel->GetChannelID() : tChannelID(CurrentSource, 0, 0, VdrProgramInfo->ServiceID);
+          channelID.ClrRid();
           //XXX
           pSchedule = (cSchedule *)schedules->GetSchedule(channelID);
           if (!pSchedule) {
@@ -915,7 +917,7 @@ int cEIT::ProcessEIT(unsigned char *buffer, int CurrentSource)
                 break;
              }
           if (VdrProgramInfo->ReferenceServiceID) {
-             rSchedule = (cSchedule *)schedules->GetSchedule((uint64(CurrentSource) << 48) | VdrProgramInfo->ReferenceServiceID);
+             rSchedule = (cSchedule *)schedules->GetSchedule(tChannelID(CurrentSource, 0, 0, VdrProgramInfo->ReferenceServiceID));
              if (!rSchedule)
                 break;
              rEvent = (cEventInfo *)rSchedule->GetEvent((unsigned short)VdrProgramInfo->ReferenceEventID);
@@ -1270,7 +1272,7 @@ void cSIProcessor::SetCurrentTransponder(int CurrentSource, int CurrentTranspond
 }
 
 /** */
-bool cSIProcessor::SetCurrentChannelID(uint64 channelid)
+bool cSIProcessor::SetCurrentChannelID(tChannelID channelid)
 {
   cMutexLock MutexLock(&schedulesMutex);
   return schedules ? schedules->SetCurrentChannelID(channelid) : false;
diff --git a/eit.h b/eit.h
index d906725e1..36c0a3e88 100644
--- a/eit.h
+++ b/eit.h
@@ -16,12 +16,13 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.21 2002/11/10 12:58:27 kls Exp $
+ * $Id: eit.h 1.22 2002/11/24 12:45:55 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
 #define __EIT_H
 
+#include "channels.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -32,7 +33,7 @@ class cEventInfo : public cListObject {
   friend class cEIT;
 private:
   unsigned char uTableID;           // Table ID this event came from
-  uint64 uChannelID;                // Channel ID of program for that event
+  tChannelID channelID;             // Channel ID of program for that event
   bool bIsFollowing;                // true if this is the next event on this channel
   bool bIsPresent;                  // true if this is the present event running
   char *pExtendedDescription;       // Extended description of this event
@@ -47,13 +48,13 @@ class cEventInfo : public cListObject {
   void SetFollowing(bool foll);
   void SetPresent(bool pres);
   void SetTitle(const char *string);
-  void SetChannelID(uint64 channelid);
+  void SetChannelID(tChannelID channelid);
   void SetEventID(unsigned short evid);
   void SetDuration(long l);
   void SetTime(time_t t);
   void SetExtendedDescription(const char *string);
   void SetSubtitle(const char *string);
-  cEventInfo(uint64 channelid, unsigned short eventid);
+  cEventInfo(tChannelID channelid, unsigned short eventid);
 public:
   ~cEventInfo();
   const unsigned char GetTableID(void) const;
@@ -68,7 +69,7 @@ class cEventInfo : public cListObject {
   unsigned short GetEventID(void) const;
   long GetDuration(void) const;
   time_t GetTime(void) const;
-  uint64 GetChannelID(void) const;
+  tChannelID GetChannelID(void) const;
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
   void Dump(FILE *f, const char *Prefix = "") const;
@@ -82,21 +83,21 @@ class cSchedule : public cListObject  {
 private:
   cEventInfo *pPresent;
   cEventInfo *pFollowing;
-  uint64 uChannelID;
+  tChannelID channelID;
   cList<cEventInfo> Events;
 protected:
-  void SetChannelID(uint64 channelid);
+  void SetChannelID(tChannelID channelid);
   bool SetFollowingEvent(cEventInfo *pEvent);
   bool SetPresentEvent(cEventInfo *pEvent);
   void Cleanup(time_t tTime);
   void Cleanup(void);
-  cSchedule(uint64 channelid = 0);
+  cSchedule(tChannelID channelid = tChannelID::InvalidID);
 public:
   ~cSchedule();
   cEventInfo *AddEvent(cEventInfo *EventInfo);
   const cEventInfo *GetPresentEvent(void) const;
   const cEventInfo *GetFollowingEvent(void) const;
-  uint64 GetChannelID(void) const;
+  tChannelID GetChannelID(void) const;
   const cEventInfo *GetEvent(unsigned short uEventID, time_t tTime = 0) const;
   const cEventInfo *GetEventAround(time_t tTime) const;
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
@@ -110,15 +111,15 @@ class cSchedules : public cList<cSchedule> {
   friend class cSIProcessor;
 private:
   const cSchedule *pCurrentSchedule;
-  uint64 uCurrentChannelID;
+  tChannelID currentChannelID;
 protected:
-  const cSchedule *AddChannelID(uint64 channelid);
-  const cSchedule *SetCurrentChannelID(uint64 channelid);
+  const cSchedule *AddChannelID(tChannelID channelid);
+  const cSchedule *SetCurrentChannelID(tChannelID channelid);
   void Cleanup();
 public:
   cSchedules(void);
   ~cSchedules();
-  const cSchedule *GetSchedule(uint64 channelid) const;
+  const cSchedule *GetSchedule(tChannelID channelid) const;
   const cSchedule *GetSchedule(void) const;
   void Dump(FILE *f, const char *Prefix = "") const;
   static bool Read(FILE *f);
@@ -162,7 +163,7 @@ class cSIProcessor : public cThread {
   static void Clear(void);
   void SetStatus(bool On);
   void SetCurrentTransponder(int CurrentSource, int CurrentTransponder);
-  static bool SetCurrentChannelID(uint64 channelid);
+  static bool SetCurrentChannelID(tChannelID channelid);
   static void TriggerDump(void);
   };
 
diff --git a/menu.c b/menu.c
index 2e29b02cb..0210e2d58 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.224 2002/11/10 16:05:15 kls Exp $
+ * $Id: menu.c 1.226 2002/11/24 14:34:41 kls Exp $
  */
 
 #include "menu.h"
@@ -582,6 +582,11 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
   Add(new cMenuEditCaItem(  tr("CA"),           &data.ca, true));
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 0));
+  /* XXX not yet used
+  Add(new cMenuEditIntItem( tr("Nid"),          &data.nid, 0));
+  Add(new cMenuEditIntItem( tr("Tid"),          &data.tid, 0));
+  Add(new cMenuEditIntItem( tr("Rid"),          &data.rid, 0));
+  XXX*/
   // Parameters for specific types of sources:
   ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
@@ -1089,7 +1094,7 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
 {
   eventInfo = EventInfo;
   if (eventInfo) {
-     cChannel *channel = Channels.GetByChannelID(eventInfo->GetChannelID());
+     cChannel *channel = Channels.GetByChannelID(eventInfo->GetChannelID(), true);
      if (channel) {
         char *buffer;
         asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
@@ -1183,7 +1188,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 
         pArray[num] = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
         if (pArray[num]) {
-           cChannel *channel = Channels.GetByChannelID(pArray[num]->GetChannelID());
+           cChannel *channel = Channels.GetByChannelID(pArray[num]->GetChannelID(), true);
            if (channel) {
               pArray[num]->SetChannelNumber(channel->Number());
               num++;
@@ -1213,7 +1218,7 @@ eOSState cMenuWhatsOn::Switch(void)
 {
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {
-     cChannel *channel = Channels.GetByChannelID(item->eventInfo->GetChannelID());
+     cChannel *channel = Channels.GetByChannelID(item->eventInfo->GetChannelID(), true);
      if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
         return osEnd;
      }
@@ -1397,7 +1402,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                         if (!now && !next) {
                            int ChannelNr = 0;
                            if (Count()) {
-                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetChannelID());
+                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetChannelID(), true);
                               if (channel)
                                  ChannelNr = channel->Number();
                               }
@@ -1424,7 +1429,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
      now = next = false;
      const cEventInfo *ei = cMenuWhatsOn::ScheduleEventInfo();
      if (ei) {
-        cChannel *channel = Channels.GetByChannelID(ei->GetChannelID());
+        cChannel *channel = Channels.GetByChannelID(ei->GetChannelID(), true);
         if (channel) {
            PrepareSchedule(channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
@@ -2176,6 +2181,8 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 #define STOP_RECORDING tr(" Stop recording ")
 #define ON_PRIMARY_INTERFACE tr("on primary interface")
 
+cOsdObject *cMenuMain::pluginOsdObject = NULL;
+
 cMenuMain::cMenuMain(bool Replaying, eOSState State)
 :cOsdMenu("")
 {
@@ -2195,6 +2202,13 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
     }
 }
 
+cOsdObject *cMenuMain::PluginOsdObject(void)
+{
+  cOsdObject *o = pluginOsdObject;
+  pluginOsdObject = NULL;
+  return o;
+}
+
 void cMenuMain::Set(void)
 {
   Clear();
@@ -2308,9 +2322,15 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                          if (item) {
                             cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
                             if (p) {
-                               cOsdMenu *menu = p->MainMenuAction();
-                               if (menu)
-                                  return AddSubMenu(menu);
+                               cOsdObject *menu = p->MainMenuAction();
+                               if (menu) {
+                                  if (menu->IsMenu())
+                                     return AddSubMenu((cOsdMenu *)menu);
+                                  else {
+                                     pluginOsdObject = menu;
+                                     return osPlugin;
+                                     }
+                                  }
                                }
                             }
                          state = osEnd;
diff --git a/menu.h b/menu.h
index be70e53ab..ae7d0a919 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.49 2002/10/27 12:04:49 kls Exp $
+ * $Id: menu.h 1.50 2002/11/23 14:51:32 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -20,10 +20,12 @@ class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
   bool replaying;
+  static cOsdObject *pluginOsdObject;
   void Set(void);
 public:
   cMenuMain(bool Replaying, eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
+  static cOsdObject *PluginOsdObject(void);
   };
 
 class cDisplayChannel : public cOsdObject {
diff --git a/newplugin b/newplugin
index a5004dce4..22830b790 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.11 2002/11/01 13:43:50 kls Exp $
+# $Id: newplugin 1.12 2002/11/23 15:00:35 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -165,7 +165,7 @@ public:
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
@@ -205,7 +205,7 @@ void cPlugin${PLUGIN_CLASS}::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
-cOsdMenu *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
+cOsdObject *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   return NULL;
diff --git a/osd.c b/osd.c
index 8324874cb..eb0d2dc5d 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.37 2002/11/10 12:30:09 kls Exp $
+ * $Id: osd.c 1.38 2002/11/16 14:20:26 kls Exp $
  */
 
 #include "osd.h"
@@ -316,6 +316,7 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
 
 cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
+  isMenu = true;
   digit = 0;
   hasHotkeys = false;
   visible = false;
diff --git a/osd.h b/osd.h
index 9fb515b41..2cd2f4bf9 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.36 2002/11/10 12:28:57 kls Exp $
+ * $Id: osd.h 1.37 2002/11/24 10:32:29 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -110,14 +110,19 @@ class cOsdItem : public cListObject {
   };
 
 class cOsdObject {
+  friend class cOsdMenu;
+private:
+  bool isMenu;
 protected:
   bool needsFastResponse;
 public:
-  cOsdObject(bool FastResponse = false) { needsFastResponse = FastResponse; }
+  cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
   virtual ~cOsdObject() {}
   int Width(void) { return Interface->Width(); }
   int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
+  bool IsMenu(void) { return isMenu; }
+  virtual void Show(void) {}
   virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
   };
 
diff --git a/plugin.c b/plugin.c
index 8d4d4cb5c..5b8bc5ff1 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.7 2002/08/11 11:21:00 kls Exp $
+ * $Id: plugin.c 1.8 2002/11/16 14:22:37 kls Exp $
  */
 
 #include "plugin.h"
@@ -64,7 +64,7 @@ const char *cPlugin::MainMenuEntry(void)
   return NULL;
 }
 
-cOsdMenu *cPlugin::MainMenuAction(void)
+cOsdObject *cPlugin::MainMenuAction(void)
 {
   return NULL;
 }
diff --git a/plugin.h b/plugin.h
index 0b62e8bde..d3e26d626 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.4 2002/05/13 15:32:14 kls Exp $
+ * $Id: plugin.h 1.5 2002/11/16 14:22:24 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -37,7 +37,7 @@ class cPlugin {
   virtual void Housekeeping(void);
 
   virtual const char *MainMenuEntry(void);
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
 
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
diff --git a/timers.c b/timers.c
index 604452221..8e2bead32 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.2 2002/11/10 10:19:12 kls Exp $
+ * $Id: timers.c 1.3 2002/11/24 14:29:21 kls Exp $
  */
 
 #include "timers.h"
@@ -49,7 +49,7 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   startTime = stopTime = 0;
   recording = pending = false;
   active = true;
-  channel = Channels.GetByChannelID(EventInfo->GetChannelID());
+  channel = Channels.GetByChannelID(EventInfo->GetChannelID(), true);
   time_t tstart = EventInfo->GetTime();
   time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
   tstart -= Setup.MarginStart * 60;
@@ -97,7 +97,7 @@ const char *cTimer::ToText(bool UseChannelID)
   free(buffer);
   strreplace(file, ':', '|');
   strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", active, UseChannelID ? Channel()->GetChannelIDStr() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
+  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", active, UseChannelID ? Channel()->GetChannelID().ToString() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
   return buffer;
@@ -216,8 +216,8 @@ bool cTimer::Parse(const char *s)
      strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
-     uint64 cid = cChannel::StringToChannelID(channelbuffer);
-     channel = cid ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
+     tChannelID cid = tChannelID::FromString(channelbuffer);
+     channel = cid.Valid() ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;
diff --git a/timers.h b/timers.h
index 933c88e9b..3d3088882 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.2 2002/11/10 10:17:05 kls Exp $
+ * $Id: timers.h 1.3 2002/11/24 11:50:56 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -12,6 +12,7 @@
 
 #include "channels.h"
 #include "config.h"
+#include "eit.h"
 #include "tools.h"
 
 enum eTimerActive { taInactive = 0,
diff --git a/tools.c b/tools.c
index 68bfb7e4b..c34a62175 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.73 2002/11/09 15:33:47 kls Exp $
+ * $Id: tools.c 1.75 2002/11/24 16:04:57 kls Exp $
  */
 
 #include "tools.h"
@@ -235,6 +235,8 @@ void delay_ms(int ms)
 
 bool isnumber(const char *s)
 {
+  if (!*s)
+     return false;
   while (*s) {
         if (!isdigit(*s))
            return false;
@@ -720,7 +722,7 @@ bool cLockFile::Lock(int WaitSeconds)
            if (errno == EEXIST) {
               struct stat fs;
               if (stat(fileName, &fs) == 0) {
-                 if (time(NULL) - fs.st_mtime > LOCKFILESTALETIME) {
+                 if (abs(time(NULL)) - fs.st_mtime > LOCKFILESTALETIME) {
                     esyslog("ERROR: removing stale lock file '%s'", fileName);
                     if (remove(fileName) < 0) {
                        LOG_ERROR_STR(fileName);
diff --git a/vdr.1 b/vdr.1
index 06c0b84d3..a1ad9b1fc 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.4 2002/05/09 16:04:17 kls Exp $
+.\" $Id: vdr.1 1.6 2002/11/24 16:36:37 kls Exp $
 .\"
-.TH vdr 1 "9 May 2002" "1.1.0" "Video Disk Recorder"
+.TH vdr 1 "24 Nov 2002" "1.1.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -67,6 +67,8 @@ Set logging to \fIlevel\fR.
 \fB0\fR\ =\ no logging, \fB1\fR\ =\ errors only,
 \fB2\fR\ =\ errors and info, \fB3\fR\ =\ errors, info and debug.
 The default logging level is \fB3\fR.
+If logging should be done to LOG_LOCALn instead of
+LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
 .TP
 .BI -L\  dir ,\ --lib= dir
 Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
diff --git a/vdr.5 b/vdr.5
index 9720a6575..02b5b6405 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.12 2002/11/10 10:10:15 kls Exp $
+.\" $Id: vdr.5 1.14 2002/11/24 16:36:48 kls Exp $
 .\"
-.TH vdr 5 "10 Nov 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "24 Nov 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -38,7 +38,7 @@ The given number must be larger than the number of any previous channel
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
-\fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003\fR
+\fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003:0:0:0\fR
 
 The line number of a channel definition (not counting group separators,
 and based on a possible previous '@...' parameter)
@@ -119,16 +119,27 @@ l l.
 .TE
 .TP
 .B SID
-The service ID of this channel.
+The Service ID of this channel.
+.TP
+.B NID
+The Network ID of this channel (for future use, currently always 0).
+.TP
+.B TID
+The Transport stream ID of this channel (for future use, currently always 0).
+.TP
+.B RID
+The Radio ID of this channel (typically 0, may be used to distinguish channels where
+NID, TID and SID are all equal).
 .PP
 A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
 which is a string that looks like this:
 
-\fBS19.2E-0-12188-12003\fR
+\fBS19.2E-0-12188-12003-0\fR
 
 The components of this string are the \fBSource\fR (S19.2E), \fBFrequency\fR
-(12188, MHz) and \fBSID\fR (12003) as defined above. The part that is currently
-\fB0\fR is reserved for future use.
+(12188, MHz) and \fBSID\fR (12003) as defined above. The parts that are currently
+\fB0\fR are reserved for future use (the last part can be omitted if it is \fB0\fR,
+so the above example could also be written as \fBS19.2E-0-12188-12003\fR).
 .br
 The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
 files to properly identify the channels.
diff --git a/vdr.c b/vdr.c
index 1285ae7ae..d27f302b8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.132 2002/11/03 13:54:39 kls Exp $
+ * $Id: vdr.c 1.134 2002/11/24 15:50:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -93,6 +93,7 @@ int main(int argc, char *argv[])
   bool DisplayHelp = false;
   bool DisplayVersion = false;
   bool DaemonMode = false;
+  int SysLogTarget = LOG_USER;
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
@@ -142,15 +143,31 @@ int main(int argc, char *argv[])
                     break;
           case 'h': DisplayHelp = true;
                     break;
-          case 'l': if (isnumber(optarg)) {
-                       int l = atoi(optarg);
-                       if (0 <= l && l <= 3) {
-                          SysLogLevel = l;
-                          break;
-                          }
-                       }
+          case 'l': {
+                      char *p = strchr(optarg, '.');
+                      if (p)
+                         *p = 0;
+                      if (isnumber(optarg)) {
+                         int l = atoi(optarg);
+                         if (0 <= l && l <= 3) {
+                            SysLogLevel = l;
+                            if (!p)
+                               break;
+                            if (isnumber(p + 1)) {
+                               int l = atoi(optarg);
+                               if (0 <= l && l <= 7) {
+                                  int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
+                                  SysLogTarget = targets[l];
+                                  break;
+                                  }
+                               }
+                            }
+                         }
+                    if (p)
+                       *p = '.';
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
                     return 2;
+                    }
                     break;
           case 'L': if (access(optarg, R_OK | X_OK) == 0)
                        PluginManager.SetDirectory(optarg);
@@ -182,8 +199,7 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
-          case 'w': if (isnumber(optarg)) {
-                       int t = atoi(optarg);
+          case 'w': if (isnumber(optarg)) { int t = atoi(optarg);
                        if (t >= 0) {
                           WatchdogTimeout = t;
                           break;
@@ -219,6 +235,8 @@ int main(int argc, char *argv[])
                "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                "                           0 = no logging, 1 = errors only,\n"
                "                           2 = errors and info, 3 = errors, info and debug\n"
+               "                           if logging should be done to LOG_LOCALn instead of\n"
+               "                           LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7)\n"
                "  -L DIR,   --lib=DIR      search for plugins in DIR (default is %s)\n"
                "  -m,       --mute         mute audio of the primary DVB device at startup\n"
                "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
@@ -264,7 +282,7 @@ int main(int argc, char *argv[])
   // Log file:
 
   if (SysLogLevel > 0)
-     openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+     openlog("vdr", LOG_PID | LOG_CONS, SysLogTarget);
 
   // Check the video directory:
 
@@ -551,6 +569,11 @@ int main(int argc, char *argv[])
                             Interface->Info(tr("Switching primary DVB..."));
                             cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                             break;
+             case osPlugin: DELETENULL(Menu);
+                            Menu = Temp = cMenuMain::PluginOsdObject();
+                            if (Menu)
+                               Menu->Show();
+                            break;
              case osBack:
              case osEnd:    if (Interact == Menu)
                                DELETENULL(Menu);

From 96ebdbf4b1e495d44f8f837068af7c2d925bab62 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 1 Dec 2002 18:00:00 +0100
Subject: [PATCH 059/307] Version 1.1.18 - Fixed missing initialization of
 'number' in cChannel (thanks to Martin Hammerschmid   for reporting this
 one). - Fixed a misplaced ')' in the fix about the stale lock files (thanks
 again to   Oliver Endriss for pointing this out - it was my fault). - Group
 delimiters in the 'channels.conf' file that have no text (like a simple ":"  
 or ":@201") no longer show up in the Channels menu (suggested by Guy
 Roussin). - Added "Tele 5" to 'channels.conf' (thanks to Georg Hitsch). -
 Changed the source directory name for plugins from 'SRC' to 'src' (suggested
 by   Clemens Kirchgatterer). - Removed transponders 10788, 11739 and 12266
 from 'channels.conf' (apparently they   are no longer active). - Deactivated
 some templates in tools.h in case some plugin needs to use the STL  
 (suggested by Gerald Berwolf). - Timers now accept channel IDs even if the
 'source' is 0 (thanks to Stefan Huelswitt   for reporting this one). - Now
 taking an active SVDRP connection into account when doing shutdown or  
 housekeeping (suggested by Emil Naepflein). - Macros in 'keymacros.conf' can
 now use "@plugin" to directly access the main menu   function of a given
 plugin (see man vdr(5) for details). - The new plugin 'sky' can be used to
 integrate a Sky Digibox into the VDR system,   using a Kfir MPEG2 encoder
 card (see PLUGINS/src/sky/README for details).

---
 CONTRIBUTORS                            |  19 ++
 HISTORY                                 |  24 ++
 Makefile                                |   6 +-
 PLUGINS.html                            |  14 +-
 PLUGINS/{SRC => src}/hello/COPYING      |   0
 PLUGINS/{SRC => src}/hello/HISTORY      |   0
 PLUGINS/{SRC => src}/hello/Makefile     |   0
 PLUGINS/{SRC => src}/hello/README       |   0
 PLUGINS/{SRC => src}/hello/hello.c      |   0
 PLUGINS/{SRC => src}/hello/i18n.c       |   0
 PLUGINS/{SRC => src}/hello/i18n.h       |   0
 PLUGINS/{SRC => src}/osddemo/COPYING    |   0
 PLUGINS/{SRC => src}/osddemo/HISTORY    |   0
 PLUGINS/{SRC => src}/osddemo/Makefile   |   0
 PLUGINS/{SRC => src}/osddemo/README     |   0
 PLUGINS/{SRC => src}/osddemo/osddemo.c  |   0
 PLUGINS/{SRC/status => src/sky}/COPYING |   0
 PLUGINS/src/sky/HISTORY                 |   6 +
 PLUGINS/src/sky/Makefile                |  82 ++++++
 PLUGINS/src/sky/README                  |  45 ++++
 PLUGINS/src/sky/channels.conf.sky       |   4 +
 PLUGINS/src/sky/getskyepg.pl            | 200 ++++++++++++++
 PLUGINS/src/sky/lircd.conf.sky          | 299 +++++++++++++++++++++
 PLUGINS/src/sky/sky.c                   | 243 +++++++++++++++++
 PLUGINS/src/status/COPYING              | 340 ++++++++++++++++++++++++
 PLUGINS/{SRC => src}/status/HISTORY     |   0
 PLUGINS/{SRC => src}/status/Makefile    |   0
 PLUGINS/{SRC => src}/status/README      |   0
 PLUGINS/{SRC => src}/status/status.c    |   0
 channels.c                              |   7 +-
 channels.conf                           |  16 +-
 channels.h                              |   4 +-
 config.h                                |   4 +-
 interface.h                             |   3 +-
 keymacros.conf                          |   1 +
 keys.c                                  |  42 ++-
 keys.h                                  |   7 +-
 menu.c                                  |  24 +-
 menu.h                                  |   6 +-
 newplugin                               |   4 +-
 remote.c                                |   4 +-
 remote.h                                |   4 +-
 svdrp.h                                 |   3 +-
 tools.c                                 |   4 +-
 tools.h                                 |   4 +-
 vdr.5                                   |  26 +-
 vdr.c                                   |   7 +-
 47 files changed, 1392 insertions(+), 60 deletions(-)
 rename PLUGINS/{SRC => src}/hello/COPYING (100%)
 rename PLUGINS/{SRC => src}/hello/HISTORY (100%)
 rename PLUGINS/{SRC => src}/hello/Makefile (100%)
 rename PLUGINS/{SRC => src}/hello/README (100%)
 rename PLUGINS/{SRC => src}/hello/hello.c (100%)
 rename PLUGINS/{SRC => src}/hello/i18n.c (100%)
 rename PLUGINS/{SRC => src}/hello/i18n.h (100%)
 rename PLUGINS/{SRC => src}/osddemo/COPYING (100%)
 rename PLUGINS/{SRC => src}/osddemo/HISTORY (100%)
 rename PLUGINS/{SRC => src}/osddemo/Makefile (100%)
 rename PLUGINS/{SRC => src}/osddemo/README (100%)
 rename PLUGINS/{SRC => src}/osddemo/osddemo.c (100%)
 rename PLUGINS/{SRC/status => src/sky}/COPYING (100%)
 create mode 100644 PLUGINS/src/sky/HISTORY
 create mode 100644 PLUGINS/src/sky/Makefile
 create mode 100644 PLUGINS/src/sky/README
 create mode 100644 PLUGINS/src/sky/channels.conf.sky
 create mode 100755 PLUGINS/src/sky/getskyepg.pl
 create mode 100644 PLUGINS/src/sky/lircd.conf.sky
 create mode 100644 PLUGINS/src/sky/sky.c
 create mode 100644 PLUGINS/src/status/COPYING
 rename PLUGINS/{SRC => src}/status/HISTORY (100%)
 rename PLUGINS/{SRC => src}/status/Makefile (100%)
 rename PLUGINS/{SRC => src}/status/README (100%)
 rename PLUGINS/{SRC => src}/status/status.c (100%)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d8ecbf35d..ef28cadfe 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -48,6 +48,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for adding a missing #include to ringbuffer.c
  for adding a missing 'public' keyword in device.h
  for pointing out a bug in displaying the group separators in the channel display
+ for reporting a problem with a missing initialization of 'number' in cChannel
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
@@ -159,6 +160,7 @@ Stefan Huelswitt <huels@iname.com>
  for helping to fix switching audio tracks in 'Transfer Mode' on the primary DVB device
  for fixing handling 'Transfer Mode' on single device systems when recording an
  encrypted channel
+ for reporting a problem with timers when channel IDs have a 'source' that is 0
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -479,3 +481,20 @@ R
 
 Andreas Kool <akool@akool.de>
   for pointing out problems with non-unique definitions in 'channels.conf.cable'
+
+Guy Roussin <guy.roussin@teledetection.fr>
+  for suggesting not to display channel group delimiters without text
+
+Georg Hitsch <georg@hitsch.at>
+ for his help in keeping 'channels.conf' up to date
+
+Clemens Kirchgatterer <clemens@thf.ath.cx>
+ for suggesting to change source directory name for plugins from 'SRC' to 'src'
+
+Emil Naepflein <Emil.Naepflein@philosys.de>
+ for suggesting to take an active SVDRP connection into account when doing shutdown or
+ housekeeping
+
+Gerald Berwolf <genka@genka.de>
+ for suggesting to deactivate some templates in tools.h in case some plugin needs to
+ use the STL
diff --git a/HISTORY b/HISTORY
index 4d215082d..6f9a02506 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1812,3 +1812,27 @@ Video Disk Recorder Revision History
   'now +/- LOCKFILESTALETIME'. This improves things in cases where the system time
   makes far jumps, so that a lock file might end up with a time stamp that lies
   in the distant future (thanks to Oliver Endriss).
+
+2002-12-01: Version 1.1.18
+
+- Fixed missing initialization of 'number' in cChannel (thanks to Martin Hammerschmid
+  for reporting this one).
+- Fixed a misplaced ')' in the fix about the stale lock files (thanks again to
+  Oliver Endriss for pointing this out - it was my fault).
+- Group delimiters in the 'channels.conf' file that have no text (like a simple ":"
+  or ":@201") no longer show up in the Channels menu (suggested by Guy Roussin).
+- Added "Tele 5" to 'channels.conf' (thanks to Georg Hitsch).
+- Changed the source directory name for plugins from 'SRC' to 'src' (suggested by
+  Clemens Kirchgatterer).
+- Removed transponders 10788, 11739 and 12266 from 'channels.conf' (apparently they
+  are no longer active).
+- Deactivated some templates in tools.h in case some plugin needs to use the STL
+  (suggested by Gerald Berwolf).
+- Timers now accept channel IDs even if the 'source' is 0 (thanks to Stefan Huelswitt
+  for reporting this one).
+- Now taking an active SVDRP connection into account when doing shutdown or
+  housekeeping (suggested by Emil Naepflein).
+- Macros in 'keymacros.conf' can now use "@plugin" to directly access the main menu
+  function of a given plugin (see man vdr(5) for details).
+- The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
+  using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).
diff --git a/Makefile b/Makefile
index c6e891f40..1494cd642 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.51 2002/11/01 13:11:53 kls Exp $
+# $Id: Makefile 1.52 2002/11/29 15:23:02 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -109,10 +109,10 @@ include-dir:
 # Plugins:
 
 plugins: include-dir
-	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/SRC/$$i" all; done
+	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" all; done
 
 plugins-clean:
-	@for i in `ls $(PLUGINDIR)/SRC | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/SRC/$$i" clean; done
+	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
 	@-rm -f $(PLUGINDIR)/lib/*
 
 # Install the files:
diff --git a/PLUGINS.html b/PLUGINS.html
index 8aa40f095..fe651303c 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -129,13 +129,13 @@ <h1>Table Of Contents</h1>
 is used:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-VDR/PLUGINS/SRC
-VDR/PLUGINS/SRC/hello
+VDR/PLUGINS/src
+VDR/PLUGINS/src/hello
 VDR/PLUGINS/lib
 VDR/PLUGINS/lib/libvdr-hello.so.1.1.0
 </pre></td></tr></table><p>
 
-The <tt>SRC</tt> directory contains one subdirectory for each plugin, which carries
+The <tt>src</tt> directory contains one subdirectory for each plugin, which carries
 the name of that plugin (in the above example that would be <tt>hello</tt>).
 What's inside the individual source directory of a
 plugin is entirely up to the author of that plugin. The only prerequisites are
@@ -156,7 +156,7 @@ <h1>Table Of Contents</h1>
 <b><tt>-L</tt></b> option.
 <p>
 The VDR <tt>Makefile</tt> contains the target <tt>plugins</tt>, which calls
-<tt>make all</tt> in every directory found under <tt>VDR/PLUGINS/SRC</tt>,
+<tt>make all</tt> in every directory found under <tt>VDR/PLUGINS/src</tt>,
 plus the target <tt>plugins-clean</tt>, which calls <tt>make clean</tt> in
 each of these directories.
 <p>
@@ -170,7 +170,7 @@ <h1>Table Of Contents</h1>
 <tt>hello-0.0.1</tt>
 <p>
 To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
-you need to unpack such an archive into the <tt>VDR/PLUGINS/SRC</tt> directory and
+you need to unpack such an archive into the <tt>VDR/PLUGINS/src</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
@@ -214,7 +214,7 @@ <h1>Table Of Contents</h1>
 can access each plugin's own setup parameters (if it provides any).
 <p>
 To implement actual functionality into your plugin you need to edit the source file
-that was generated as <tt>PLUGINS/SRC/name.c</tt>. Read the comments in that file
+that was generated as <tt>PLUGINS/src/name.c</tt>. Read the comments in that file
 to see where you can bring in your own code. The following sections of this document
 will walk you through the individual member functions of the plugin class.
 <p>
@@ -866,7 +866,7 @@ <h1>Table Of Contents</h1>
 Simply change into your source directory and execute <tt>make dist</tt>:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-cd VDR/PLUGINS/SRC/hello
+cd VDR/PLUGINS/src/hello
 make dist
 </pre></td></tr></table><p>
 
diff --git a/PLUGINS/SRC/hello/COPYING b/PLUGINS/src/hello/COPYING
similarity index 100%
rename from PLUGINS/SRC/hello/COPYING
rename to PLUGINS/src/hello/COPYING
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/src/hello/HISTORY
similarity index 100%
rename from PLUGINS/SRC/hello/HISTORY
rename to PLUGINS/src/hello/HISTORY
diff --git a/PLUGINS/SRC/hello/Makefile b/PLUGINS/src/hello/Makefile
similarity index 100%
rename from PLUGINS/SRC/hello/Makefile
rename to PLUGINS/src/hello/Makefile
diff --git a/PLUGINS/SRC/hello/README b/PLUGINS/src/hello/README
similarity index 100%
rename from PLUGINS/SRC/hello/README
rename to PLUGINS/src/hello/README
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/src/hello/hello.c
similarity index 100%
rename from PLUGINS/SRC/hello/hello.c
rename to PLUGINS/src/hello/hello.c
diff --git a/PLUGINS/SRC/hello/i18n.c b/PLUGINS/src/hello/i18n.c
similarity index 100%
rename from PLUGINS/SRC/hello/i18n.c
rename to PLUGINS/src/hello/i18n.c
diff --git a/PLUGINS/SRC/hello/i18n.h b/PLUGINS/src/hello/i18n.h
similarity index 100%
rename from PLUGINS/SRC/hello/i18n.h
rename to PLUGINS/src/hello/i18n.h
diff --git a/PLUGINS/SRC/osddemo/COPYING b/PLUGINS/src/osddemo/COPYING
similarity index 100%
rename from PLUGINS/SRC/osddemo/COPYING
rename to PLUGINS/src/osddemo/COPYING
diff --git a/PLUGINS/SRC/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
similarity index 100%
rename from PLUGINS/SRC/osddemo/HISTORY
rename to PLUGINS/src/osddemo/HISTORY
diff --git a/PLUGINS/SRC/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
similarity index 100%
rename from PLUGINS/SRC/osddemo/Makefile
rename to PLUGINS/src/osddemo/Makefile
diff --git a/PLUGINS/SRC/osddemo/README b/PLUGINS/src/osddemo/README
similarity index 100%
rename from PLUGINS/SRC/osddemo/README
rename to PLUGINS/src/osddemo/README
diff --git a/PLUGINS/SRC/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
similarity index 100%
rename from PLUGINS/SRC/osddemo/osddemo.c
rename to PLUGINS/src/osddemo/osddemo.c
diff --git a/PLUGINS/SRC/status/COPYING b/PLUGINS/src/sky/COPYING
similarity index 100%
rename from PLUGINS/SRC/status/COPYING
rename to PLUGINS/src/sky/COPYING
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
new file mode 100644
index 000000000..8be01f151
--- /dev/null
+++ b/PLUGINS/src/sky/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'sky' Revision History
+---------------------------------
+
+2002-12-01: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
new file mode 100644
index 000000000..c3d0e0fd7
--- /dev/null
+++ b/PLUGINS/src/sky/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2002/11/01 13:45:13 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = sky
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
new file mode 100644
index 000000000..e38327919
--- /dev/null
+++ b/PLUGINS/src/sky/README
@@ -0,0 +1,45 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          www.cadsoft.de/vdr
+
+Latest version available at: www.cadsoft.de/vdr
+
+See the file COPYING for license information.
+
+Description:
+
+The 'sky' plugin implements a new device for VDR, which is based on the
+MPEG2 encoder card described at linuxtv.org/mpeg2/kfir.xml. It
+allows you to connect the analog a/v output of your Sky Digibox to VDR,
+so that you can enjoy the full recording flexibility of VDR with your
+Sky subscription. Note that this is NOT something that does anything
+illegal, like decrypting the Sky programme without a subscription. You
+will need a Sky Digibox and a valid subscription in order to use this
+plugin.
+
+The Digibox is remotely controlled through VDR via LIRC (see lirc.org).
+The file lircd.conf.sky contains the remote control codes necessary to
+control the Digibox.
+
+In order to access the Sky channels VDR needs to know the channel number
+under which each channel is stored in the Sky Digibox. These numbers are
+used as 'frequency' parameters in the channels.conf definitions of the Sky
+channels (see the file 'channels.conf.sky'). Since these numbers are always
+less than 1000, they can be easily distinguished from normal satellite
+transponder frequencies. The VPID is 160 and the APID is 80 for all Sky
+channels. These are just fake PIDs, since the Kfir card always uses these
+fixed PIDs. The 'Ca' parameter of the Sky channels is set to 301, which
+is defined as "Videoguard, Sky Digital" in VDR's 'ca.conf' file. Again, please
+note that VDR doesn't do any decrypting here, this is just to mark these
+channels as "conditionally accessible" and have a way of setting the CICAM
+value for the Kfir device in VDR's Setup menu.
+
+The Sky EPG is available on the Internet at http://www.ananova.com.
+The Perl script getskyepg.pl extracts the EPG data from these pages
+and sends it to VDR via an SVDRP connection. The channel numbers Sky
+uses to generate the EPG pages are stored as the 'sid' parameter in
+the channels.conf definitions of the Sky channels. You can keep your
+EPG data up-to-date by entering a call to getskyepg.pl into your
+/etc/crontab. Call 'getskyepg.pl -h' for a list of options.
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
new file mode 100644
index 000000000..f4a437be5
--- /dev/null
+++ b/PLUGINS/src/sky/channels.conf.sky
@@ -0,0 +1,4 @@
+Sky One:106:h:S28.2E:0:160:80:0:301:222
+itv2:226:h:S28.2E:0:160:80:0:301:451
+sci-fi:130:h:S28.2E:0:160:80:0:301:161
+Paramount Comedy:127:h:S28.2E:0:160:80:0:301:185
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
new file mode 100755
index 000000000..7fd7bd015
--- /dev/null
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -0,0 +1,200 @@
+#!/usr/bin/perl
+
+# getskyepg.pl: Get EPG data from Sky's web pages
+#
+# Connects to a running VDR instance via SVDRP, gets the channel data
+# for the Sky channels and connects to Sky's web pages to extract the
+# EPG data for these channels. The result is sent to VDR via SVDRP.
+#
+# See the README file for copyright information and how to reach the author.
+#
+# $Id: getskyepg.pl 1.1 2002/11/10 10:05:17 kls Exp $
+
+use Getopt::Std;
+use Time::Local;
+
+$Usage = qq{
+Usage: $0 [options]
+
+Options: -d hostname        destination hostname (default: localhost)
+         -p port            SVDRP port number (default: 2001)
+         -S source          channel source (default: S28.2E)
+         -D days            days to get EPG for (1..7, default: 2)
+};
+
+die $Usage if (!getopts("d:D:hp:S:") || $opt_h);
+
+$Dest   = $opt_d || "localhost";
+$Port   = $opt_p || 2001;
+$Source = $opt_S || "S28.2E";
+$Days   = $opt_D || 2;
+
+$SkyWebPage = "www.ananova.com/tv/frontpage.html";
+$WGET = "/usr/bin/wget -q -O-";
+$LOGGER = "/usr/bin/logger -t SKYEPG";
+
+$DST = 0; ##XXX TODO find out whether DST is active!
+$SecsInDay = 86400;
+
+$MaxFrequency = 1000;
+$idxName = 0;
+$idxFrequency = 1;
+$idxSource = 3;
+$idxSid = 9;
+
+Error("days out of range: $Days") unless (1 <= $Days && $Days <= 7);
+
+sub Log
+{
+  system("$LOGGER '@_'");
+}
+
+sub Error
+{
+  Log(@_);
+  die "$0: @_\n";
+}
+
+sub GetChannels
+{
+  SVDRPsend("LSTC");
+  my @channels = ();
+  for (SVDRPreceive(250)) {
+      my @a = split(':', substr($_, 4));
+      if ($a[$idxSource] eq $Source && $a[$idxFrequency] < $MaxFrequency) {
+         push(@channels, [@a]);
+         }
+      }
+  return @channels;
+}
+
+sub GetPage
+{
+  my $channel = shift;
+  my $day = shift;
+  my $url = "$SkyWebPage?c=$channel&day=day$day";
+  Log("reading $url");
+  my @page = split("\n", `$WGET '$url'`);
+  Log("received " . ($#page + 1) . " lines");
+  return @page;
+}
+
+# In order to get the duration we need to buffer the last event:
+$Id = "";
+$Time = 0;
+$Title = "";
+$Episode = "";
+$Descr = "";
+
+sub GetEpgData
+{
+  my ($channel, $channelID) = @_;
+  my $numEvents = 0;
+  SVDRPsend("C $channelID");
+  $Time = 0;
+  for $day (1 .. $Days) {
+      my $dt = 0;
+      my $ap = "";
+      my @page = GetPage($channel, $day);
+      for $line (@page) {
+          if ($line =~ /^<\/tr><tr /) {
+             # extract information:
+             my ($time, $title, $episode, $descr) = ($line =~ /^.*?<b>(.*?)<\/b>.*?<b>(.*?)<\/b> *(<i>.*?<\/i>)? *(.*?) *<\/small>/);
+             my ($h, $m, $a) = ($time =~ /([0-9]+)\.([0-9]+)(.)m/);
+             # handle am/pm:
+             $dt = $SecsInDay if ($ap eq "p" && $a eq "a");
+             $ap = $a;
+             $h += 12 if ($a eq "p" && $h < 12);
+             $h -= 12 if ($a eq "a" && $h == 12);
+             # convert to time_t:
+             my @gmt = gmtime;
+             $gmt[0] = 0;  # seconds
+             $gmt[1] = $m; # minutes
+             $gmt[2] = $h; # hours
+             $time = timegm(@gmt) + ($day - 1) * $SecsInDay + $dt + $DST;
+             # create EPG data:
+             if ($Time) {
+                $duration = $time - $Time;
+                SVDRPsend("E $Id $Time $duration");
+                SVDRPsend("T $Title");
+                SVDRPsend("S $Episode");
+                SVDRPsend("D $Descr");
+                SVDRPsend("e");
+                $numEvents++;
+                }
+             # buffer the last event:
+             $Id = $time / 60 % 0xFFFF; # this gives us unique ids for every minute of over 6 weeks
+             $Time = $time;
+             ($Title = $title)     =~ s/<[^>]+>//g;
+             ($Episode = $episode) =~ s/<[^>]+>//g;
+             ($Descr = $descr)     =~ s/<[^>]+>//g;
+             }
+          }
+      }
+  SVDRPsend("c");
+  Log("generated $numEvents EPG events");
+}
+
+sub ProcessEpg
+{
+  Log("getting Sky channel definitions");
+  my @channels = GetChannels();
+  Error("no Sky channels found") unless @channels;
+  Log("found " . ($#channels + 1) . " channels");
+  for (@channels) {
+      my $channel = @$_[$idxSid];
+      my $channelID = "@$_[$idxSource]-0-@$_[$idxFrequency]-$channel";
+      Log("processing channel @$_[0]");
+      SVDRPsend("PUTE");
+      SVDRPreceive(354);
+      GetEpgData($channel, $channelID);
+      SVDRPsend(".");
+      SVDRPreceive(250);
+      }
+  Log("done");
+}
+
+#---------------------------------------------------------------------------
+# TODO: make this a Perl module??? What about Error()???
+
+use Socket;
+
+$Timeout = 300; # max. seconds to wait for response
+
+$SIG{ALRM} = sub { Error("timeout"); };
+alarm($Timeout);
+
+$iaddr = inet_aton($Dest)                   || Error("no host: $Dest");
+$paddr = sockaddr_in($Port, $iaddr);
+
+$proto = getprotobyname('tcp');
+socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
+connect(SOCK, $paddr)                       || Error("connect: $!");
+select(SOCK); $| = 1;
+SVDRPreceive(220);
+ProcessEpg();
+SVDRPsend("QUIT");
+
+sub SVDRPsend
+{
+  my $s = shift;
+  print SOCK "$s\r\n";
+}
+
+sub SVDRPreceive
+{
+  my $expect = shift | 0;
+  my @a = ();
+  while (<SOCK>) {
+        s/\s*$//; # 'chomp' wouldn't work with "\r\n"
+        push(@a, $_);
+        if (substr($_, 3, 1) ne "-") {
+           my $code = substr($_, 0, 3);
+           Error("expected SVDRP code $expect, but received $code") if ($code != $expect);
+           last;
+           }
+        }
+  return @a;
+}
+
+#---------------------------------------------------------------------------
diff --git a/PLUGINS/src/sky/lircd.conf.sky b/PLUGINS/src/sky/lircd.conf.sky
new file mode 100644
index 000000000..191dcb56c
--- /dev/null
+++ b/PLUGINS/src/sky/lircd.conf.sky
@@ -0,0 +1,299 @@
+# Copyright (C) 1999 Christoph Bartelmus
+#
+# You may only use this file if you make it available to others,
+# i.e. if you send it to <lirc@bartelmus.de>
+#
+# this config file was automatically generated
+# using lirc-0.6.4-CVS(serial) on Mon Jul  9 08:14:04 2001
+#
+# contributed by Steve Davies <steve@daviesfam.org>
+#
+# brand:                       sky
+# model no. of remote control: 
+# supported devices:              34000 20
+#
+#
+
+begin remote
+
+  name          SKY
+  flags         CONST_LENGTH|RAW_CODES
+  eps           30
+  aeps          100
+  ptrail        0
+  repeat        0     0
+  gap           149692
+  frequency     36000
+  duty_cycle    50
+
+  begin raw_codes
+
+    name 0
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444
+
+    name 1
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      888
+
+    name 2
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 888
+      444
+
+    name 3
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444
+      444
+
+    name 4
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 888 888 444 444
+      444
+
+    name 5
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 888 888 888
+
+    name 6
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 888
+      444
+
+    name 7
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444
+      444
+
+    name 8
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 888 888 444 444 444 444
+      444
+
+    name 9
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 888 888 444 444 888
+
+    name RED
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 444 444 888 888 444 444 888 888
+
+    name GREEN
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 444 444 888 888 444 444 444 444 888 444
+
+    name YELLOW
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 444 444 888 888 444 444 444 444 444 444
+
+    name BLUE
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 444 444 444 444 888 444 444 444 444 444 444
+      444
+
+    name TEXT
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 888 444 444 444 444 444 444 888 444 444
+      444
+
+    name BACKUP
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 888 888 444 444 444 444 444 444 444 444 888 444 444
+
+    name HELP
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 888 888 444 444 444 444 444 444 444 444 444 444 888
+
+    name CURSOR-LEFT
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 888 888 444 444 888 888 888 444
+
+    name CURSOR-DOWN
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 888 888 444 444 888 444 444 888
+
+    name CURSOR-RIGHT
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 888 888 444 444 888 888 444 444
+
+    name CURSOR-UP
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 888 888 444 444 888 444 444 444 444 444
+
+    name SELECT
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 888 888 888 444 444 444 444 888 444 444 444
+
+    name CHANNEL-DOWN
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 888 888 444 444 444 444 444 444 888
+
+    name CHANNEL-UP
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444
+      444
+
+    name I
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 888 444 444 888 444 444 888 888 888 444 444
+
+    name ONOFF
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 888 444 444 888 444 444
+      444
+
+    name SKY
+      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
+      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
+      444 444 888 888 444 444 444 444 444 444 444 444 444 444 444 444
+      444
+
+          name TV
+             2830     724     583     333     553     339
+              548     791     543     795     977     357
+              527     364     524     367     524     368
+              522     369     521     370     520     371
+              519     372     519     372     519     372
+              518     372     518     374     963     818
+              516     376     510     381     509     382
+              954     828     508     407     481
+
+          name SKY
+             2829     726     580     336     551     340
+              547     791     540     798     977     366
+              519     364     523     367     521     370
+              521     370     520     371     520     371
+              520     371     519     372     518     373
+              517     374     517     374     957     825
+              512     379     512     380     513     377
+              511     381     506     410     477     413
+              483
+
+          name MUTE
+             2567     429     751     447     743     456
+             1335     464     734     466    1325     496
+              697     504     693     506    1284     513
+              681     518     681     517     679     520
+              678   26288    2533     462     734     489
+              705     470    1323     501     695     503
+             1287     511     683     516     683     518
+             1277     522     676     521     678     521
+              675     523     675   26286    2533     465
+              731     491     702     499    1293     504
+              692     507    1280     518     683     516
+              679     524    1272     522     675     529
+              670     523     682     517     675   26286
+             2532     465     729     493     702     473
+             1318     506     688     509    1282     517
+              680     519     677     524    1274     523
+              676
+
+          name VOLUME-UP
+             2568     430     766     433    1342     456
+              734     489     708     466    1326     497
+              699     505     686     508    1286     512
+              688     510     683     516     682     516
+              681   26284    2540     481     711     488
+             1301     498     703     495     695     504
+             1284     516     682     516     684     515
+             1276     522     675     523     675     524
+              674     524     675   26286    2532     490
+              709     489    1300     500     689     509
+              695     517    1270     516     683     520
+              675     519    1274     529     668     525
+              675     524     673     526     672   26288
+             2532     466     731     491    1300     499
+              695     503     692     509    1277     520
+              681     518     679     519    1278     520
+              675
+
+          name VOLUME-DOWN
+             2562     434    1348     451    1332     465
+              733     489     704     496    1296     504
+              690     507     694     511    1281     511
+              683     523     677     515     679     520
+              680   25687    2533     464    1330     491
+             1295     505     693     506     689     510
+             1293     505     684     516     678     520
+             1276     523     677     520     675     524
+              673     526     674   25686    2531     467
+             1324     498    1292     506     691     509
+              683     515    1280     518     678     521
+              675     523    1273     525     674     527
+              672     525     673     527     671   25685
+             2531     467    1320     501    1288     511
+              687     511     688     512    1282     516
+              678     521     675     524    1273
+
+          name TVGUIDE
+             2834     720     586     330     554     338
+              548     794     539     796     975     360
+              528     363     521     371     519     371
+              520     371     519     375     514     374
+              517     374     516     375     513     379
+              511     380     510     381     949     387
+              500     836     505     387     945     391
+              493     868     469     422     468
+
+          name BOXOFFICE
+             2833     745     564     329     555     338
+              548     790     545     793     982     352
+              529     362     526     365     522     370
+              519     371     519     372     519     372
+              518     373     517     374     513     378
+              515     376     507     384     506     385
+              945     390     496     396     498     392
+              496     419     468     847     936
+
+          name SERVICES
+             2829     725     585     330     555     338
+              548     798     537     794     979     356
+              528     368     522     363     523     369
+              521     370     521     370     520     370
+              520     371     520     371     520     371
+              519     372     519     372     518     373
+              964     371     517     375     513     377
+              511     404     489     402     485     828
+              514
+
+          name INTERACTIVE
+             2829     726     591     324     553     340
+              550     788     542     796     981     354
+              532     359     522     369     522     369
+              520     372     518     373     518     373
+              516     375     515     375     513     379
+              515     375     510     381     948     389
+              498     392     504     412     470     867
+              916     866     913
+
+  end raw_codes
+
+end remote
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
new file mode 100644
index 000000000..41439be72
--- /dev/null
+++ b/PLUGINS/src/sky/sky.c
@@ -0,0 +1,243 @@
+/*
+ * sky.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: sky.c 1.1 2002/10/26 16:27:13 kls Exp $
+ */
+
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <vdr/plugin.h>
+#include <vdr/sources.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "Sky Digibox interface";
+
+// --- cDigiboxDevice --------------------------------------------------------
+
+class cDigiboxDevice : public cDevice {
+private:
+  int source;
+  int digiboxChannelNumber;
+  int fd_dvr;
+  cTSBuffer *tsBuffer;
+  int fd_lirc;
+  void LircSend(const char *s);
+  void LircSend(int n);
+protected:
+  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
+  virtual bool OpenDvr(void);
+  virtual void CloseDvr(void);
+  virtual bool GetTSPacket(uchar *&Data);
+public:
+  cDigiboxDevice(void);
+  virtual ~cDigiboxDevice();
+  virtual bool ProvidesSource(int Source) const;
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsSetChannel = NULL) const;
+  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+  };
+
+cDigiboxDevice::cDigiboxDevice(void)
+{
+  source = cSource::FromString("S28.2E");//XXX parameter???
+  digiboxChannelNumber = 0;
+  fd_dvr = -1;
+  struct sockaddr_un addr;
+  addr.sun_family = AF_UNIX;
+  strn0cpy(addr.sun_path, "/dev/lircd", sizeof(addr.sun_path));//XXX parameter???
+  fd_lirc = socket(AF_UNIX, SOCK_STREAM, 0);
+  if (fd_lirc >= 0) {
+     if (connect(fd_lirc, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+        LOG_ERROR;
+        close(fd_lirc);
+        }
+     }
+  else
+     LOG_ERROR;
+}
+
+cDigiboxDevice::~cDigiboxDevice()
+{
+  if (fd_lirc >= 0)
+     close(fd_lirc);
+}
+
+void cDigiboxDevice::LircSend(const char *s)
+{
+  const char *c = "SEND_ONCE SKY %s\n";
+  char buf[100];
+  sprintf(buf, c, s);
+  dsyslog(buf);//XXX
+  if (write(fd_lirc, buf, strlen(buf)) < 0)
+     LOG_ERROR;//XXX _STR
+  delay_ms(200);
+}
+
+void cDigiboxDevice::LircSend(int n)
+{
+  char buf[10];
+  snprintf(buf, sizeof(buf), "%d", n);
+  char *p = buf;
+  while (*p) {
+        char q[10];
+        sprintf(q, "%c", *p);
+        LircSend(q);
+        p++;
+        }
+}
+
+bool cDigiboxDevice::SetPid(cPidHandle *Handle, int Type, bool On)
+{
+  dsyslog("SetPid %d %d", Handle->pid, On);
+  return true;
+}
+
+bool cDigiboxDevice::OpenDvr(void)
+{
+  CloseDvr();
+  fd_dvr = open("/dev/video2", O_RDONLY | O_NONBLOCK);//XXX parameter???
+  if (fd_dvr >= 0)
+     tsBuffer = new cTSBuffer(fd_dvr, KILOBYTE(256), CardIndex() + 1);
+  return fd_dvr >= 0;
+}
+
+void cDigiboxDevice::CloseDvr(void)
+{
+  if (fd_dvr >= 0) {
+     close(fd_dvr);
+     fd_dvr = -1;
+     delete tsBuffer;
+     tsBuffer = NULL;
+     }
+}
+
+bool cDigiboxDevice::GetTSPacket(uchar *&Data)
+{
+  if (tsBuffer) {
+     int r = tsBuffer->Read();
+     if (r >= 0) {
+        Data = tsBuffer->Get();
+        return true;
+        }
+     else if (FATALERRNO) {
+        LOG_ERROR;
+        return false;
+        }
+     return true;
+     }
+  return false;
+}
+
+bool cDigiboxDevice::ProvidesSource(int Source) const
+{
+  return source == Source;
+}
+
+bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
+{
+  bool result = false;
+  bool hasPriority = Priority < 0 || Priority > this->Priority();
+  bool needsDetachReceivers = true;
+
+  if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
+     if (Receiving()) {
+        if (digiboxChannelNumber == Channel->Frequency()) {
+           needsDetachReceivers = false;
+           result = true;
+           }
+        else
+           result = hasPriority;
+        }
+     else
+        result = hasPriority;
+     }
+  if (NeedsDetachReceivers)
+     *NeedsDetachReceivers = needsDetachReceivers;
+  return result;
+}
+
+bool cDigiboxDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
+{
+  if (fd_lirc >= 0 && !Receiving()) { // if we are receiving the channel is already set!
+     digiboxChannelNumber = Channel->Frequency();
+     //XXX only when recording??? -> faster channel switching!
+     LircSend("SKY"); // makes sure the Digibox is "on"
+     //XXX lircprint(fd_lirc, "BACKUP");
+     //XXX lircprint(fd_lirc, "BACKUP");
+     //XXX lircprint(fd_lirc, "BACKUP");
+     LircSend(digiboxChannelNumber);
+     }
+return true;
+}
+
+// --- cPluginSky ------------------------------------------------------------
+
+class cPluginSky : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  cPluginSky(void);
+  virtual ~cPluginSky();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginSky::cPluginSky(void)
+{
+  // Initialize any member variables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+}
+
+cPluginSky::~cPluginSky()
+{
+  // Clean up after yourself!
+}
+
+const char *cPluginSky::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return NULL;
+}
+
+bool cPluginSky::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  return true;
+}
+
+bool cPluginSky::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  new cDigiboxDevice;
+  return true;
+}
+
+void cPluginSky::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
+}
+
+cMenuSetupPage *cPluginSky::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPluginSky::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginSky); // Don't touch this!
diff --git a/PLUGINS/src/status/COPYING b/PLUGINS/src/status/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/src/status/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/src/status/HISTORY
similarity index 100%
rename from PLUGINS/SRC/status/HISTORY
rename to PLUGINS/src/status/HISTORY
diff --git a/PLUGINS/SRC/status/Makefile b/PLUGINS/src/status/Makefile
similarity index 100%
rename from PLUGINS/SRC/status/Makefile
rename to PLUGINS/src/status/Makefile
diff --git a/PLUGINS/SRC/status/README b/PLUGINS/src/status/README
similarity index 100%
rename from PLUGINS/SRC/status/README
rename to PLUGINS/src/status/README
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/src/status/status.c
similarity index 100%
rename from PLUGINS/SRC/status/status.c
rename to PLUGINS/src/status/status.c
diff --git a/channels.c b/channels.c
index 6afa7b958..1e3d9c78b 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.9 2002/11/24 14:28:48 kls Exp $
+ * $Id: channels.c 1.11 2002/11/29 14:10:46 kls Exp $
  */
 
 #include "channels.h"
@@ -174,6 +174,7 @@ cChannel::cChannel(void)
   tid          = 0;
   sid          = 888;
   rid          = 0;
+  number       = 0;
   groupSep     = false;
   polarization = 'v';
   inversion    = INVERSION_AUTO;
@@ -385,7 +386,7 @@ bool cChannels::Load(const char *FileName, bool AllowComments)
 int cChannels::GetNextGroup(int Idx)
 {
   cChannel *channel = Get(++Idx);
-  while (channel && !channel->GroupSep())
+  while (channel && !(channel->GroupSep() && *channel->Name()))
         channel = Get(++Idx);
   return channel ? Idx : -1;
 }
@@ -393,7 +394,7 @@ int cChannels::GetNextGroup(int Idx)
 int cChannels::GetPrevGroup(int Idx)
 {
   cChannel *channel = Get(--Idx);
-  while (channel && !channel->GroupSep())
+  while (channel && !(channel->GroupSep() && *channel->Name()))
         channel = Get(--Idx);
   return channel ? Idx : -1;
 }
diff --git a/channels.conf b/channels.conf
index ab6b4b846..f6b273cc7 100644
--- a/channels.conf
+++ b/channels.conf
@@ -21,7 +21,7 @@ ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011:0:0:0
 CNN:12168:v:S19.2E:27500:165:100:0:0:28512:0:0:0
 Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:0:0:0
 VOX:12188:h:S19.2E:27500:167:136:71:0:12060:0:0:0
-DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
+:#DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
 Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899:0:0:0
 Neun Live:12480:v:S19.2E:27500:767:768:35:0:897:0:0:0
 DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:0:0:0
@@ -116,7 +116,7 @@ Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002:0:0:0
 Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003:0:0:0
 Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004:0:0:0
 Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001:0:0:0
-KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
+:#KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
 Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511:0:0:0
 TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631:0:0:0
 travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001:0:0:0
@@ -124,11 +124,11 @@ TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516:0:0:0
 TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515:0:0:0
 La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501:0:0:0
 LCP:12207:v:S19.2E:27500:165:100:0:0:8506:0:0:0
-AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
-AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
+:#AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
+:#AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
 Escales:12285:v:S19.2E:27500:165:100:0:0:17025:0:0:0
 Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612:0:0:0
-RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
+:#RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
 K13:12402:v:S19.2E:27500:163:92:0:0:8704:0:0:0
 Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988:0:0:0
 Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:0:0:0
@@ -147,3 +147,9 @@ VIVA:12670:v:S19.2E:22000:309:310:0:0:12732:0:0:0
 VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120:0:0:0
 MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643:0:0:0
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
+Tele 5:12480:v:S19.2E:27500:1535:1536:0:0:51:0:0:0
+:@201 Sky
+Sky One:106:h:S28.2E:0:160:80:0:301:222:0:0:0
+itv2:226:h:S28.2E:0:160:80:0:301:451:0:0:0
+sci-fi:130:h:S28.2E:0:160:80:0:301:161:0:0:0
+Paramount Comedy:127:h:S28.2E:0:160:80:0:301:185:0:0:0
diff --git a/channels.h b/channels.h
index 0f6feb101..b21ed3079 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.5 2002/11/24 14:27:51 kls Exp $
+ * $Id: channels.h 1.6 2002/11/30 12:59:05 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -46,7 +46,7 @@ struct tChannelID {
   tChannelID(void) { source = nid = tid = sid = rid = 0; }
   tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
   bool operator== (const tChannelID &arg) const;
-  bool Valid(void) { return source && tid && sid; } // nid and rid are optional
+  bool Valid(void) { return tid && sid; } // nid and rid are optional and source may be 0
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   static tChannelID FromString(const char *s);
   const char *ToString(void);
diff --git a/config.h b/config.h
index 0c84ad41e..43fbfbade 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.141 2002/11/24 12:28:20 kls Exp $
+ * $Id: config.h 1.142 2002/11/24 20:09:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.17"
+#define VDRVERSION "1.1.18"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/interface.h b/interface.h
index 6344c5bd4..e78b9ebc1 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.28 2002/09/29 10:46:50 kls Exp $
+ * $Id: interface.h 1.29 2002/11/30 14:37:04 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -33,6 +33,7 @@ class cInterface {
   bool IsOpen(void) { return open > 0; }
   void Open(int NumCols = 0, int NumLines = 0);
   void Close(void);
+  bool HasSVDRPConnection(void) { return SVDRP && SVDRP->HasConnection(); }
   void Interrupt(void) { interrupted = true; }
   int Width(void) { return width; }
   int Height(void) { return height; }
diff --git a/keymacros.conf b/keymacros.conf
index 767d49d34..42cddc26e 100644
--- a/keymacros.conf
+++ b/keymacros.conf
@@ -3,6 +3,7 @@
 # Format:
 #
 # macrokey  key1 key2 key3...
+# macrokey  @plugin key1 key2 key3...
 #
 # See man vdr(5)
 
diff --git a/keys.c b/keys.c
index 4647f3aeb..381b3189b 100644
--- a/keys.c
+++ b/keys.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.3 2002/10/27 15:19:40 kls Exp $
+ * $Id: keys.c 1.4 2002/11/30 16:01:37 kls Exp $
  */
 
 #include "keys.h"
+#include "plugin.h"
 
 static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kUp,            "Up"         },
@@ -182,6 +183,12 @@ cKeyMacro::cKeyMacro(void)
 {
   for (int i = 0; i < MAXKEYSINMACRO; i++)
       macro[i] = kNone;
+  plugin = NULL;
+}
+
+cKeyMacro::~cKeyMacro()
+{
+  free(plugin);
 }
 
 bool cKeyMacro::Parse(char *s)
@@ -190,10 +197,35 @@ bool cKeyMacro::Parse(char *s)
   char *p;
   while ((p = strtok(s, " \t")) != NULL) {
         if (n < MAXKEYSINMACRO) {
-           macro[n] = cKey::FromString(p);
-           if (macro[n] == kNone) {
-              esyslog("ERROR: unknown key '%s'", p);
-              return false;
+           if (*p == '@') {
+              if (plugin) {
+                 esyslog("ERROR: only one @plugin allowed per macro");
+                 return false;
+                 }
+              if (!n) {
+                 esyslog("ERROR: @plugin can't be first in macro");
+                 return false;
+                 }
+              macro[n++] = k_Plugin;
+              if (n < MAXKEYSINMACRO) {
+                 macro[n] = kOk;
+                 plugin = strdup(p + 1);
+                 if (!cPluginManager::GetPlugin(plugin)) {
+                    esyslog("ERROR: unknown plugin '%s'", plugin);
+                    return false;
+                    }
+                 }
+              else {
+                 esyslog("ERROR: key macro too long");
+                 return false;
+                 }
+              }
+           else {
+              macro[n] = cKey::FromString(p);
+              if (macro[n] == kNone) {
+                 esyslog("ERROR: unknown key '%s'", p);
+                 return false;
+                 }
               }
            n++;
            s = NULL;
diff --git a/keys.h b/keys.h
index ceb2d1c8f..02c513ae9 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.3 2002/10/27 15:18:21 kls Exp $
+ * $Id: keys.h 1.4 2002/12/01 10:43:26 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -46,6 +46,8 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kCommands,
              kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9,
              kNone,
+             // The following codes are used internally:
+             k_Plugin,
              k_Setup,
              // The following flags are OR'd with the above codes:
              k_Repeat  = 0x8000,
@@ -105,10 +107,13 @@ extern cKeys Keys;
 class cKeyMacro : public cListObject {
 private:
   eKeys macro[MAXKEYSINMACRO];
+  char *plugin;
 public:
   cKeyMacro(void);
+  ~cKeyMacro();
   bool Parse(char *s);
   const eKeys *Macro(void) const { return macro; }
+  const char *Plugin(void) const { return plugin; }
   };
 
 class cKeyMacros : public cConfig<cKeyMacro> {
diff --git a/menu.c b/menu.c
index 0210e2d58..a1c136faa 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.226 2002/11/24 14:34:41 kls Exp $
+ * $Id: menu.c 1.228 2002/12/01 10:31:55 kls Exp $
  */
 
 #include "menu.h"
@@ -684,15 +684,10 @@ class cMenuChannels : public cOsdMenu {
 cMenuChannels::cMenuChannels(void)
 :cOsdMenu(tr("Channels"), CHNUMWIDTH)
 {
-  //TODO
-  int i = 0;
-  cChannel *channel;
-  int curr = ((channel = Channels.GetByNumber(cDevice::CurrentChannel())) != NULL) ? channel->Index() : -1;
-
-  while ((channel = Channels.Get(i)) != NULL) {
-        Add(new cMenuChannelItem(channel), i == curr);
-        i++;
-        }
+  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+      if (!channel->GroupSep() || *channel->Name())
+         Add(new cMenuChannelItem(channel), channel->Number() == cDevice::CurrentChannel());
+      }
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
 }
 
@@ -2183,11 +2178,11 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 
 cOsdObject *cMenuMain::pluginOsdObject = NULL;
 
-cMenuMain::cMenuMain(bool Replaying, eOSState State)
+cMenuMain::cMenuMain(bool Replaying, eOSState State, const char *Plugin)
 :cOsdMenu("")
 {
   replaying = Replaying;
-  Set();
+  Set(Plugin);
 
   // Initial submenus:
 
@@ -2198,6 +2193,7 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
     case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
     case osSetup:      AddSubMenu(new cMenuSetup); break;
     case osCommands:   AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
+    case osPlugin:     break; // the actual work is done in Set()
     default: break;
     }
 }
@@ -2209,7 +2205,7 @@ cOsdObject *cMenuMain::PluginOsdObject(void)
   return o;
 }
 
-void cMenuMain::Set(void)
+void cMenuMain::Set(const char *Plugin)
 {
   Clear();
   //SetTitle("VDR"); // this is done below, including disk usage
@@ -2242,7 +2238,7 @@ void cMenuMain::Set(void)
       if (p) {
          const char *item = p->MainMenuEntry();
          if (item)
-            Add(new cMenuPluginItem(hk(item), i));
+            Add(new cMenuPluginItem(hk(item), i), Plugin && strcmp(Plugin, p->Name()) == 0);
          }
       else
          break;
diff --git a/menu.h b/menu.h
index ae7d0a919..7e7e4d661 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.50 2002/11/23 14:51:32 kls Exp $
+ * $Id: menu.h 1.51 2002/11/30 15:55:39 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -21,9 +21,9 @@ class cMenuMain : public cOsdMenu {
   time_t lastActivity;
   bool replaying;
   static cOsdObject *pluginOsdObject;
-  void Set(void);
+  void Set(const char *Plugin = NULL);
 public:
-  cMenuMain(bool Replaying, eOSState State = osUnknown);
+  cMenuMain(bool Replaying, eOSState State = osUnknown, const char *Plugin = NULL);
   virtual eOSState ProcessKey(eKeys Key);
   static cOsdObject *PluginOsdObject(void);
   };
diff --git a/newplugin b/newplugin
index 22830b790..532157e3e 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.12 2002/11/23 15:00:35 kls Exp $
+# $Id: newplugin 1.13 2002/11/29 15:23:54 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -24,7 +24,7 @@ $PLUGIN_VERSION = "0.0.1";
 $PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
 $PLUGIN_MAINENTRY = $PLUGIN_CLASS;
 
-$PLUGINS_SRC = "PLUGINS/SRC";
+$PLUGINS_SRC = "PLUGINS/src";
 
 $README = qq
 {This is a "plugin" for the Video Disk Recorder (VDR).
diff --git a/remote.c b/remote.c
index 415e37ea1..7157a5f5b 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.31 2002/11/01 10:50:13 kls Exp $
+ * $Id: remote.c 1.32 2002/12/01 10:40:04 kls Exp $
  */
 
 #include "remote.h"
@@ -31,6 +31,7 @@ cRemote *cRemote::learning = NULL;
 char *cRemote::unknownCode = NULL;
 cMutex cRemote::mutex;
 cCondVar cRemote::keyPressed;
+const char *cRemote::plugin = NULL;
 
 cRemote::cRemote(const char *Name)
 {
@@ -88,6 +89,7 @@ bool cRemote::PutMacro(eKeys Key)
 {
   const cKeyMacro *km = KeyMacros.Get(Key);
   if (km) {
+     plugin = km->Plugin();
      for (int i = 1; i < MAXKEYSINMACRO; i++) {
          if (km->Macro()[i] != kNone) {
             if (!Put(km->Macro()[i]))
diff --git a/remote.h b/remote.h
index b23b93354..2aeec78c3 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.20 2002/11/09 11:07:33 kls Exp $
+ * $Id: remote.h 1.21 2002/12/01 10:39:10 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -26,6 +26,7 @@ class cRemote : public cListObject {
   static char *unknownCode;
   static cMutex mutex;
   static cCondVar keyPressed;
+  static const char *plugin;
   char *name;
 protected:
   cRemote(const char *Name);
@@ -41,6 +42,7 @@ class cRemote : public cListObject {
   static void Clear(void);
   static bool Put(eKeys Key);
   static bool PutMacro(eKeys Key);
+  static const char *GetPlugin(void) { return plugin; }
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   };
 
diff --git a/svdrp.h b/svdrp.h
index 8b673df6b..1052d6337 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.17 2002/10/20 12:44:42 kls Exp $
+ * $Id: svdrp.h 1.18 2002/11/30 14:36:04 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -79,6 +79,7 @@ class cSVDRP {
 public:
   cSVDRP(int Port);
   ~cSVDRP();
+  bool HasConnection(void) { return file.IsOpen(); }
   bool Process(void);
   char *GetMessage(void);
   };
diff --git a/tools.c b/tools.c
index c34a62175..ff462ba84 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.75 2002/11/24 16:04:57 kls Exp $
+ * $Id: tools.c 1.76 2002/11/24 20:17:31 kls Exp $
  */
 
 #include "tools.h"
@@ -722,7 +722,7 @@ bool cLockFile::Lock(int WaitSeconds)
            if (errno == EEXIST) {
               struct stat fs;
               if (stat(fileName, &fs) == 0) {
-                 if (abs(time(NULL)) - fs.st_mtime > LOCKFILESTALETIME) {
+                 if (abs(time(NULL) - fs.st_mtime) > LOCKFILESTALETIME) {
                     esyslog("ERROR: removing stale lock file '%s'", fileName);
                     if (remove(fileName) < 0) {
                        LOG_ERROR_STR(fileName);
diff --git a/tools.h b/tools.h
index efa2de6a5..4e3e28208 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.52 2002/11/09 15:32:36 kls Exp $
+ * $Id: tools.h 1.53 2002/11/30 12:51:45 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -45,10 +45,12 @@ extern int SysLogLevel;
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 #define FATALERRNO (errno != EAGAIN && errno != EINTR)
 
+#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
 template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
 template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
 template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
+#endif
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);
 ssize_t safe_write(int filedes, const void *buffer, size_t size);
diff --git a/vdr.5 b/vdr.5
index 02b5b6405..8a76fdd91 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.14 2002/11/24 16:36:48 kls Exp $
+.\" $Id: vdr.5 1.16 2002/12/01 10:34:40 kls Exp $
 .\"
 .TH vdr 5 "24 Nov 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -35,6 +35,13 @@ as in
 The given number must be larger than the number of any previous channel
 (otherwise it is silently ignored).
 
+A group delimiter can also be used to just set the next channel's number,
+without an explicit delimiter text, as in
+
+\fB:@201\fR
+
+Such a delimiter will not appear in the Channels menu.
+
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
@@ -356,13 +363,26 @@ this remote control delivers when the given key is pressed.
 The file \fIkeymacros.conf\fR contains user defined macros that will be executed
 whenever the given key is pressed. The format is
 
-\fBmacrokey  key1 key2 key3...\fR
+\fBmacrokey  [@plugin] key1 key2 key3...\fR
 
 where \fBmacrokey\fR is the key that shall initiate execution of this macro
 and can be one of \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR or
 \fIUser1\fR...\fIUser9\fR. The rest of the line consists of a set of
 keys, which will be executed just as if they had been pressed in the given
-sequence. Note that the color keys will only execute their macro function
+sequence. The optional \fB@plugin\fR can be used to automatically select
+the given plugin from the main menu (provided that plugin has a main menu
+entry). \fBplugin\fR is the name of the plugin, exactly as given in the -P
+option when starting VDR. There can be only one \fB@plugin\fR per key macro,
+and it implicitly adds an \fIOk\fR key to the macro definition (in order to
+actually select the plugins main menu entry), which counts against the total
+number of keys in the macro. For instance
+
+\fBUser1 @abc Down Down Ok\fR
+
+would call the main menu function of the "abc" plugin and execute two "Down"
+key presses, followed by "Ok".
+.br
+Note that the color keys will only execute their macro function
 in "normal viewing" mode (i.e. when no other menu or player is active). The
 \fIUser1\fR...\fIUser9\fR keys will always execute their macro function.
 There may be up to 15 keys in such a key sequence.
diff --git a/vdr.c b/vdr.c
index d27f302b8..438f98fed 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.134 2002/11/24 15:50:16 kls Exp $
+ * $Id: vdr.c 1.136 2002/12/01 10:44:48 kls Exp $
  */
 
 #include <getopt.h>
@@ -480,7 +480,7 @@ int main(int argc, char *argv[])
                Menu = new cMenuMain(cControl::Control());
                Temp = NULL;
                break;
-          #define DirectMainFunction(function)\
+          #define DirectMainFunction(function...)\
             DELETENULL(Menu);\
             if (cControl::Control())\
                cControl::Control()->Hide();\
@@ -493,6 +493,7 @@ int main(int argc, char *argv[])
           case kSetup:      DirectMainFunction(osSetup); break;
           case kCommands:   DirectMainFunction(osCommands); break;
           case kUser1 ... kUser9: cRemote::PutMacro(key); break;
+          case k_Plugin:    DirectMainFunction(osPlugin, cRemote::GetPlugin()); break;
           // Channel up/down:
           case kChanUp|k_Repeat:
           case kChanUp:
@@ -638,7 +639,7 @@ int main(int argc, char *argv[])
                  Interface->Info(tr("Editing process finished"));
               }
            }
-        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active()) || ForceShutdown)) {
+        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection()) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:

From 2b15337b71d71c5e486efe738a507b550bb28843 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Dec 2002 18:00:00 +0100
Subject: [PATCH 060/307] Version 1.1.19 - The character '|' in description
 texts of EPG records is now interpreted as a   newline character (suggested
 by Gerhard Steiner). - Updated 'channels.conf.cable' (thanks to Andreas
 Kool). - Improved handling of repeated remote keys. - The RCU now only sets
 the channel number display when there are no incoming remote   control keys,
 which improves reaction on repeated keys. - The actual tuning is now done in
 a separate thread, which makes zapping through the   channels a lot faster
 and no longer gets stuck on channels that don't broadcast.   This also makes
 "Motor-DiSEqC" work (thanks to Reinhard Walter Buchner for his help   in
 testing this). Since switching channels now no longer explicitly waits for a 
  channel lock in the foreground thread, the "panic level" mechanism is no
 longer   used (maybe we don't need it any more, anyway). - The keyboard is
 now by default always active to control VDR. The 'make' option   REMOTE=KBD
 is therefore obsolete. When compiling VDR with REMOTE=RCU or REMOTE=LIRC,  
 the keyboard can thus now be active together with the remote control. If you
 want   to build VDR _without_ keyboard support you can set NO_KBD=1 in the
 'make' call.   Since the keyboard codes are now different from the ones used
 previously (which   were mapped by the 'ncurses' library) you will need to go
 through the "Learning   keys" procedure again. To do so, either delete the
 file /video/remote.conf or   remove the KBD.* entries from it before starting
 this version of VDR.   (Thanks to Thomas Sailer for pointing out how to set
 the terminal parameters to   read from the keyboard). - The 'ncurses' library
 is now only necessary when compiling VDR with DEBUG_OSD=1.

---
 CONTRIBUTORS           |  18 ++-
 HISTORY                |  26 +++
 INSTALL                |  10 +-
 Makefile               |  10 +-
 PLUGINS/src/sky/README |   5 +
 channels.conf.cable    |  10 +-
 config.h               |   4 +-
 diseqc.c               |  25 ++-
 diseqc.h               |  12 +-
 dvbdevice.c            | 355 ++++++++++++++++++++++++-----------------
 dvbdevice.h            |  11 +-
 interface.c            |   4 +-
 osd.c                  |  14 +-
 osd.h                  |   4 +-
 params.txt             |   4 -
 rcu.c                  |  16 +-
 rcu.h                  |   3 +-
 remote.c               |  67 +++++---
 remote.h               |   9 +-
 vdr.5                  |   6 +-
 vdr.c                  |  19 ++-
 21 files changed, 383 insertions(+), 249 deletions(-)
 delete mode 100644 params.txt

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ef28cadfe..970902652 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -322,8 +322,8 @@ Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  for translating OSD texts to the Spanish language
 
 Mirko D�lle <mdoelle@linux-user.de>
-  for reporting a bug when a timer records over midnight of a day that had a
-  change in Daylight Saving Time
+ for reporting a bug when a timer records over midnight of a day that had a
+ change in Daylight Saving Time
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -441,6 +441,7 @@ Oliver Endriss <o.endriss@gmx.de>
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
+ for his help in testing tuning with "Motor-DiSEqC"
 
 Lauri Tischler <lauri.tischler@efore.fi>
  for helping to test and debug the new channel source and DiSEqC handling
@@ -458,6 +459,8 @@ Gerhard Steiner <steiner@mail.austria.com>
  the 'epg.data' file
  for suggesting the new configuration file 'reccmds.conf' to define commands that
  shall be executed from the "Recordings" menu
+ for suggesting to interpret the character '|' in the description texts of EPG
+ records as a newline character
 
 Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
@@ -476,14 +479,14 @@ Stefan Schluenss <dxr3_osd@schluenss.de>
  for reporting a bug where PID handles were not closed correctly
 
 R�gis Bossut <rbossut@auchan.com>
-  for pointing out that with some providers the channels can only be distinguished
-  through the RID
+ for pointing out that with some providers the channels can only be distinguished
+ through the RID
 
 Andreas Kool <akool@akool.de>
-  for pointing out problems with non-unique definitions in 'channels.conf.cable'
+ for his help in keeping 'channels.conf.cable' up to date
 
 Guy Roussin <guy.roussin@teledetection.fr>
-  for suggesting not to display channel group delimiters without text
+ for suggesting not to display channel group delimiters without text
 
 Georg Hitsch <georg@hitsch.at>
  for his help in keeping 'channels.conf' up to date
@@ -498,3 +501,6 @@ Emil Naepflein <Emil.Naepflein@philosys.de>
 Gerald Berwolf <genka@genka.de>
  for suggesting to deactivate some templates in tools.h in case some plugin needs to
  use the STL
+
+Thomas Sailer <sailer@scs.ch>
+ for pointing out how to set the terminal parameters to read from the keyboard
diff --git a/HISTORY b/HISTORY
index 6f9a02506..d189379d3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1836,3 +1836,29 @@ Video Disk Recorder Revision History
   function of a given plugin (see man vdr(5) for details).
 - The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
   using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).
+
+2002-12-08: Version 1.1.19
+
+- The character '|' in description texts of EPG records is now interpreted as a
+  newline character (suggested by Gerhard Steiner).
+- Updated 'channels.conf.cable' (thanks to Andreas Kool).
+- Improved handling of repeated remote keys.
+- The RCU now only sets the channel number display when there are no incoming remote
+  control keys, which improves reaction on repeated keys.
+- The actual tuning is now done in a separate thread, which makes zapping through the
+  channels a lot faster and no longer gets stuck on channels that don't broadcast.
+  This also makes "Motor-DiSEqC" work (thanks to Reinhard Walter Buchner for his help
+  in testing this). Since switching channels now no longer explicitly waits for a
+  channel lock in the foreground thread, the "panic level" mechanism is no longer
+  used (maybe we don't need it nay more, anyway).
+- The keyboard is now by default always active to control VDR. The 'make' option
+  REMOTE=KBD is therefore obsolete. When compiling VDR with REMOTE=RCU or REMOTE=LIRC,
+  the keyboard can thus now be active together with the remote control. If you want
+  to build VDR _without_ keyboard support you can set NO_KBD=1 in the 'make' call.
+  Since the keyboard codes are now different from the ones used previously (which
+  were mapped by the 'ncurses' library) you will need to go through the "Learning
+  keys" procedure again. To do so, either delete the file /video/remote.conf or
+  remove the KBD.* entries from it before starting this version of VDR.
+  (Thanks to Thomas Sailer for pointing out how to set the terminal parameters to
+  read from the keyboard).
+- The 'ncurses' library is now only necessary when compiling VDR with DEBUG_OSD=1.
diff --git a/INSTALL b/INSTALL
index 841575d49..8e61605da 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,17 +26,17 @@ installed.
 IMPORTANT: See "Configuration files" below for information on how
 =========  to set up the configuration files at the proper location!
 
-The 'vdr' program can be controlled via the PC keyboard or
-an infrared remote control unit. Define the REMOTE macro to one of the
-following values 'make' call to activate the respective control mode:
+By default the 'vdr' program can be controlled via the PC keyboard. If you have
+an infrared remote control unit you can define the REMOTE macro to one of the
+following values in the 'make' call to activate the respective control mode:
 
-  REMOTE=KBD    control via the PC keyboard (default)
   REMOTE=RCU    control via the "Remote Control Unit" receiver
                 (see http://www.cadsoft.de/vdr/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
-  REMOTE=NONE   no remote control (in case only SVDRP shall be used)
 
+If you want to disable control via the PC keyboard, you can add NO_KBD=1
+to the 'make' call.
 Adding "DEBUG_OSD=1" will use the PC screen (or current window)
 to display texts instead of the DVB card's on-screen display
 interface. These modes are useful when testing new menus if you
diff --git a/Makefile b/Makefile
index 1494cd642..7d169ce6f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.52 2002/11/29 15:23:02 kls Exp $
+# $Id: Makefile 1.53 2002/12/08 12:20:37 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -38,12 +38,8 @@ OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd
 OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
 
-ifndef REMOTE
-REMOTE = KBD
-endif
-
-ifeq ($(REMOTE), KBD)
-NCURSESLIB = -lncurses
+ifndef NO_KBD
+DEFINES += -DREMOTE_KBD
 endif
 
 DEFINES += -DREMOTE_$(REMOTE)
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
index e38327919..bd089ccf3 100644
--- a/PLUGINS/src/sky/README
+++ b/PLUGINS/src/sky/README
@@ -19,6 +19,9 @@ illegal, like decrypting the Sky programme without a subscription. You
 will need a Sky Digibox and a valid subscription in order to use this
 plugin.
 
+The 'kfir' module must be loaded with the option 'streamtype=4' to make it
+produce a Transport Stream.
+
 The Digibox is remotely controlled through VDR via LIRC (see lirc.org).
 The file lircd.conf.sky contains the remote control codes necessary to
 control the Digibox.
@@ -43,3 +46,5 @@ uses to generate the EPG pages are stored as the 'sid' parameter in
 the channels.conf definitions of the Sky channels. You can keep your
 EPG data up-to-date by entering a call to getskyepg.pl into your
 /etc/crontab. Call 'getskyepg.pl -h' for a list of options.
+The getskyepg.pl script requires the programs /usr/bin/wget and /usr/bin/logger
+to be installed on your system.
diff --git a/channels.conf.cable b/channels.conf.cable
index 1be4c538b..58dc20dfc 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -37,9 +37,9 @@ Premiere 7:370:M64:C:6900:1023:1024:0:101:20:0:0:0
 Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16:0:0:0
 Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516:0:0:0
 13 TH STREET:354:M64:C:6900:2303:2304:0:101:42:0:0:0
-Studio Universal:402:M64:C:6900:1050:1054:0:101:36:0:0:0
+Studio Universal:354:M64:C:6900:2047:2048:0:101:36:0:0:0
 Krimi & Co:378:M64:C:6900:1535:1536:0:101:23:0:0:0
-Disney Channel:402:M64:C:6900:1030:1034:0:101:34:0:0:0
+Disney Channel:354:M64:C:6900:2559:2560:0:101:34:0:0:0
 Discovery Channel:378:M64:C:6900:1791:1792:0:101:14:0:0:0
 PLANET:354:M64:C:6900:1791:1792:0:101:13:0:0:0
 Fox Kids:354:M64:C:6900:1279:1280:0:101:28:0:0:0
@@ -48,12 +48,6 @@ K-TOON:354:M64:C:6900:511:512:0:101:12:0:0:0
 HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22:0:0:0
 GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518:0:0:0
 CLASSICA:354:M64:C:6900:767:768:0:101:15:0:0:0
-:Mediavision
-Bloomberg:346:M64:C:6900:811:812:0:101:50701:0:0:0
-Fashion TV:346:M64:C:6900:821:822:0:101:50702:0:0:0
-Einstein:346:M64:C:6900:623:624:0:101:50719:0:0:0
-Extreme Sport:346:M64:C:6900:801:802:0:101:50700:0:0:0
-LANDSCAPE:346:M64:C:6900:831:832:0:101:50703:0:0:0
 :DIGIKABEL D
 Avante:113:M64:C:6900:741:742,743:0:101:53404:0:0:0
 BBC Prime:113:M64:C:6900:761:762:763:101:53406:0:0:0
diff --git a/config.h b/config.h
index 43fbfbade..50e315641 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.142 2002/11/24 20:09:56 kls Exp $
+ * $Id: config.h 1.143 2002/12/06 14:17:55 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.18"
+#define VDRVERSION "1.1.19"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/diseqc.c b/diseqc.c
index 92b92cbbb..0766db8ac 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.1 2002/10/05 13:54:32 kls Exp $
+ * $Id: diseqc.c 1.2 2002/12/07 13:44:56 kls Exp $
  */
 
 #include "diseqc.h"
@@ -16,7 +16,6 @@
 cDiseqc::cDiseqc(void)
 {
   commands = NULL;
-  currentAction = NULL;;
   parsing = false;
   numCodes = 0;
 }
@@ -39,11 +38,11 @@ bool cDiseqc::Parse(const char *s)
         polarization = toupper(polarization);
         if (polarization == 'V' || polarization == 'H') {
            parsing = true;
-           bool Start = true;
-           while (Execute(Start) != daNone)
-                 Start = false;
+           char *CurrentAction = NULL;
+           while (Execute(&CurrentAction) != daNone)
+                 ;
            parsing = false;
-           result = !commands || currentAction && !*currentAction;
+           result = !commands || !*CurrentAction;
            }
         else
            esyslog("ERROR: unknown polarization '%c'", polarization);
@@ -101,12 +100,12 @@ char *cDiseqc::Codes(char *s)
   return NULL;
 }
 
-cDiseqc::eDiseqcActions cDiseqc::Execute(bool Start)
+cDiseqc::eDiseqcActions cDiseqc::Execute(char **CurrentAction)
 {
-  if (Start)
-     currentAction = commands;
-  while (currentAction && *currentAction) {
-        switch (*currentAction++) {
+  if (!*CurrentAction)
+     *CurrentAction = commands;
+  while (*CurrentAction && **CurrentAction) {
+        switch (*(*CurrentAction)++) {
           case ' ': break;
           case 't': return daToneOff;
           case 'T': return daToneOn;
@@ -114,8 +113,8 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(bool Start)
           case 'V': return daVoltage18;
           case 'A': return daMiniA;
           case 'B': return daMiniB;
-          case 'W': currentAction = Wait(currentAction); break;
-          case '[': currentAction = Codes(currentAction); return currentAction ? daCodes : daNone;
+          case 'W': *CurrentAction = Wait(*CurrentAction); break;
+          case '[': *CurrentAction = Codes(*CurrentAction); return *CurrentAction ? daCodes : daNone;
           default: return daNone;
           }
         }
diff --git a/diseqc.h b/diseqc.h
index f2b0e99cd..602bdecb6 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 1.1 2002/10/05 13:02:52 kls Exp $
+ * $Id: diseqc.h 1.2 2002/12/07 13:54:02 kls Exp $
  */
 
 #ifndef __DISEQC_H
@@ -31,7 +31,6 @@ class cDiseqc : public cListObject {
   char polarization;
   int lof;
   char *commands;
-  char *currentAction;
   bool parsing;
   uchar codes[MaxDiseqcCodes];
   int numCodes;
@@ -41,7 +40,14 @@ class cDiseqc : public cListObject {
   cDiseqc(void);
   ~cDiseqc();
   bool Parse(const char *s);
-  eDiseqcActions Execute(bool Start = false);
+  eDiseqcActions Execute(char **CurrentAction);
+      // Parses the DiSEqC commands and returns the appropriate action code
+      // with every call. CurrentAction must be the address of a character pointer,
+      // which is initialized to NULL. This pointer is used internally while parsing
+      // the commands and shall not be modified once Execute() has been called with
+      // it. Call Execute() repeatedly (always providing the same CurrentAction pointer)
+      // until it returns daNone. After a successful execution of all commands
+      // *CurrentAction points to the value 0x00.
   int Source(void) const { return source; }
   int Slof(void) const { return slof; }
   char Polarization(void) const { return polarization; }
diff --git a/dvbdevice.c b/dvbdevice.c
index 3aa9f93fd..a2b4ce97d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.37 2002/11/15 15:17:30 kls Exp $
+ * $Id: dvbdevice.c 1.38 2002/12/07 14:50:46 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -60,8 +60,207 @@ static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
   return fd;
 }
 
+// --- cDvbTuner -------------------------------------------------------------
+
+class cDvbTuner : public cThread {
+private:
+  enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
+  int fd_frontend;
+  int cardIndex;
+  fe_type_t frontendType;
+  cChannel channel;
+  const char *diseqcCommands;
+  bool active;
+  eTunerStatus tunerStatus;
+  cMutex mutex;
+  cCondVar newSet;
+  bool SetFrontend(void);
+  virtual void Action(void);
+public:
+  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
+  virtual ~cDvbTuner();
+  bool IsTunedTo(const cChannel *Channel) const;
+  void Set(const cChannel *Channel);
+  bool Locked(void) { return tunerStatus == tsLocked; }
+  };
+
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
+{
+  fd_frontend = Fd_Frontend;
+  cardIndex = CardIndex;
+  frontendType = FrontendType;
+  diseqcCommands = NULL;
+  active = false;
+  tunerStatus = tsIdle;
+  Start();
+}
+
+cDvbTuner::~cDvbTuner()
+{
+  active = false;
+  tunerStatus = tsIdle;
+  newSet.Broadcast();
+  Cancel(3);
+}
+
+bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
+{
+  return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Frequency() == Channel->Frequency();
+}
+
+void cDvbTuner::Set(const cChannel *Channel)
+{
+  cMutexLock MutexLock(&mutex);
+  channel = *Channel;
+  tunerStatus = tsSet;
+  newSet.Broadcast();
+}
+
+static unsigned int FrequencyToHz(unsigned int f)
+{
+  while (f && f < 1000000)
+        f *= 1000;
+  return f;
+}
+
+bool cDvbTuner::SetFrontend(void)
+{
+  dvb_frontend_parameters Frontend;
+
+  memset(&Frontend, 0, sizeof(Frontend));
+
+  switch (frontendType) {
+    case FE_QPSK: { // DVB-S
+
+         unsigned int frequency = channel.Frequency();
+
+         if (Setup.DiSEqC) {
+            cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
+            if (diseqc) {
+               if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
+                  cDiseqc::eDiseqcActions da;
+                  for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
+                      switch (da) {
+                        case cDiseqc::daNone:      break;
+                        case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+                        case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+                        case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+                        case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+                        case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+                        case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+                        case cDiseqc::daCodes: {
+                             int n = 0;
+                             uchar *codes = diseqc->Codes(n);
+                             if (codes) {
+                                struct dvb_diseqc_master_cmd cmd;
+                                memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
+                                cmd.msg_len = n;
+                                CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+                                }
+                             }
+                             break;
+                        }
+                      }
+                  diseqcCommands = diseqc->Commands();
+                  }
+               frequency -= diseqc->Lof();
+               }
+            else {
+               esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
+               return false;
+               }
+            }
+         else {
+            int tone = SEC_TONE_OFF;
+
+            if (frequency < (unsigned int)Setup.LnbSLOF) {
+               frequency -= Setup.LnbFrequLo;
+               tone = SEC_TONE_OFF;
+               }
+            else {
+               frequency -= Setup.LnbFrequHi;
+               tone = SEC_TONE_ON;
+               }
+            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+            CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+            CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+            }
+
+         Frontend.frequency = frequency * 1000UL;
+         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+         Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL;
+         Frontend.u.qpsk.fec_inner = fe_code_rate_t(channel.CoderateH());
+         }
+         break;
+    case FE_QAM: { // DVB-C
+
+         // Frequency and symbol rate:
+
+         Frontend.frequency = FrequencyToHz(channel.Frequency());
+         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+         Frontend.u.qam.symbol_rate = channel.Srate() * 1000UL;
+         Frontend.u.qam.fec_inner = fe_code_rate_t(channel.CoderateH());
+         Frontend.u.qam.modulation = fe_modulation_t(channel.Modulation());
+         }
+         break;
+    case FE_OFDM: { // DVB-T
+
+         // Frequency and OFDM paramaters:
+
+         Frontend.frequency = FrequencyToHz(channel.Frequency());
+         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+         Frontend.u.ofdm.bandwidth = fe_bandwidth_t(channel.Bandwidth());
+         Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(channel.CoderateH());
+         Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(channel.CoderateL());
+         Frontend.u.ofdm.constellation = fe_modulation_t(channel.Modulation());
+         Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(channel.Transmission());
+         Frontend.u.ofdm.guard_interval = fe_guard_interval_t(channel.Guard());
+         Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(channel.Hierarchy());
+         }
+         break;
+    default:
+         esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+         return false;
+    }
+  if (ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend) < 0) {
+     esyslog("ERROR: frontend %d: %m", cardIndex);
+     return false;
+     }
+  return true;
+}
+
+void cDvbTuner::Action(void)
+{
+  dsyslog("tuner thread started on device %d (pid=%d)", cardIndex + 1, getpid());
+  active = true;
+  while (active) {
+        cMutexLock MutexLock(&mutex);
+        if (tunerStatus == tsSet)
+           tunerStatus = SetFrontend() ? tsTuned : tsIdle;
+        if (tunerStatus == tsTuned) {
+           fe_status_t status = fe_status_t(0);
+           CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
+           if (status & FE_HAS_LOCK)
+              tunerStatus = tsLocked;
+           }
+        dvb_frontend_event event;
+        if (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0) {
+           if (tunerStatus != tsIdle && event.status & FE_REINIT) {
+              tunerStatus = tsSet;
+              esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
+              continue;
+              }
+           }
+        newSet.TimedWait(mutex, 1000);
+        }
+  dsyslog("tuner thread ended on device %d (pid=%d)", cardIndex + 1, getpid());
+}
+
+// --- cDvbDevice ------------------------------------------------------------
+
 cDvbDevice::cDvbDevice(int n)
 {
+  dvbTuner = NULL;
   frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   siProcessor = NULL;
   spuDecoder = NULL;
@@ -69,7 +268,7 @@ cDvbDevice::cDvbDevice(int n)
 
   // Devices that are present on all card types:
 
-  fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK);
+  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK);
 
   // Devices that are only present on cards with decoders:
 
@@ -90,8 +289,10 @@ cDvbDevice::cDvbDevice(int n)
   if (fd_frontend >= 0) {
      dvb_frontend_info feinfo;
      siProcessor = new cSIProcessor(DvbName(DEV_DVB_DEMUX, n));
-     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0)
+     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
         frontendType = feinfo.type;
+        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
+        }
      else
         LOG_ERROR;
      }
@@ -99,16 +300,13 @@ cDvbDevice::cDvbDevice(int n)
      esyslog("ERROR: can't open DVB device %d", n);
 
   aPid1 = aPid2 = 0;
-
-  source = -1;
-  frequency = -1;
-  diseqcCommands = NULL;
 }
 
 cDvbDevice::~cDvbDevice()
 {
   delete spuDecoder;
   delete siProcessor;
+  delete dvbTuner;
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
 }
@@ -322,11 +520,6 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
-bool cDvbDevice::IsTunedTo(const cChannel *Channel) const
-{
-  return source == Channel->Source() && frequency == Channel->Frequency();
-}
-
 bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
@@ -346,7 +539,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
 #ifdef DO_MULTIPLE_RECORDINGS
      if (Receiving()) {
-        if (IsTunedTo(Channel)) {
+        if (dvbTuner->IsTunedTo(Channel)) {
            needsDetachReceivers = false;
            if (!HasPid(Channel->Vpid())) {
               if (Channel->Ca() > CACONFBASE) {
@@ -375,18 +568,11 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
-static unsigned int FrequencyToHz(unsigned int f)
-{
-  while (f && f < 1000000)
-        f *= 1000;
-  return f;
-}
-
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
   bool IsEncrypted = Channel->Ca() > CACONFBASE;
 
-  bool DoTune = !IsTunedTo(Channel);
+  bool DoTune = !dvbTuner->IsTunedTo(Channel);
 
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
@@ -436,136 +622,15 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      }
 
   if (DoTune) {
-
-     dvb_frontend_parameters Frontend;
-
-     memset(&Frontend, 0, sizeof(Frontend));
-
-     switch (frontendType) {
-       case FE_QPSK: { // DVB-S
-
-            unsigned int frequency = Channel->Frequency();
-
-            if (Setup.DiSEqC) {
-               cDiseqc *diseqc = Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
-               if (diseqc) {
-                  if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
-                     cDiseqc::eDiseqcActions da;
-                     for (bool Start = true; (da = diseqc->Execute(Start)) != cDiseqc::daNone; Start = false) {
-                         switch (da) {
-                           case cDiseqc::daNone:      break;
-                           case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
-                           case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
-                           case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
-                           case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
-                           case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
-                           case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
-                           case cDiseqc::daCodes: {
-                                int n = 0;
-                                uchar *codes = diseqc->Codes(n);
-                                if (codes) {
-                                   struct dvb_diseqc_master_cmd cmd;
-                                   memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
-                                   cmd.msg_len = n;
-                                   CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-                                   }
-                                }
-                                break;
-                           }
-                         }
-                     diseqcCommands = diseqc->Commands();
-                     }
-                  frequency -= diseqc->Lof();
-                  }
-               else {
-                  esyslog("ERROR: no DiSEqC parameters found for channel %d", Channel->Number());
-                  return false;
-                  }
-               }
-            else {
-               int tone = SEC_TONE_OFF;
-
-               if (frequency < (unsigned int)Setup.LnbSLOF) {
-                  frequency -= Setup.LnbFrequLo;
-                  tone = SEC_TONE_OFF;
-                  }
-               else {
-                  frequency -= Setup.LnbFrequHi;
-                  tone = SEC_TONE_ON;
-                  }
-               int volt = (Channel->Polarization() == 'v' || Channel->Polarization() == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-               CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
-               CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
-               }
-
-            Frontend.frequency = frequency * 1000UL;
-            Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
-            Frontend.u.qpsk.symbol_rate = Channel->Srate() * 1000UL;
-            Frontend.u.qpsk.fec_inner = fe_code_rate_t(Channel->CoderateH());
-            }
-            break;
-       case FE_QAM: { // DVB-C
-
-            // Frequency and symbol rate:
-
-            Frontend.frequency = FrequencyToHz(Channel->Frequency());
-            Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
-            Frontend.u.qam.symbol_rate = Channel->Srate() * 1000UL;
-            Frontend.u.qam.fec_inner = fe_code_rate_t(Channel->CoderateH());
-            Frontend.u.qam.modulation = fe_modulation_t(Channel->Modulation());
-            }
-            break;
-       case FE_OFDM: { // DVB-T
-
-            // Frequency and OFDM paramaters:
-
-            Frontend.frequency = FrequencyToHz(Channel->Frequency());
-            Frontend.inversion = fe_spectral_inversion_t(Channel->Inversion());
-            Frontend.u.ofdm.bandwidth = fe_bandwidth_t(Channel->Bandwidth());
-            Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(Channel->CoderateH());
-            Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(Channel->CoderateL());
-            Frontend.u.ofdm.constellation = fe_modulation_t(Channel->Modulation());
-            Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(Channel->Transmission());
-            Frontend.u.ofdm.guard_interval = fe_guard_interval_t(Channel->Guard());
-            Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(Channel->Hierarchy());
-            }
-            break;
-       default:
-            esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-            return false;
-       }
-
-     // Discard stale events:
-
-     for (;;) {
-         dvb_frontend_event event;
-         if (ioctl(fd_frontend, FE_GET_EVENT, &event) < 0)
-            break;
-         }
-
-     // Tuning:
-
-     CHECK(ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend));
-
-     // Wait for channel lock:
-
-     fe_status_t status = fe_status_t(0);
-     for (int i = 0; i < 100; i++) {
-         CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
-         if (status & FE_HAS_LOCK)
-            break;
-         usleep(10 * 1000);
-         }
+     dvbTuner->Set(Channel);
+     /*XXX do we still need this???
      if (!(status & FE_HAS_LOCK)) {
         esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->Number(), CardIndex() + 1);
         if (LiveView && IsPrimaryDevice())
            cThread::RaisePanic();
         return false;
         }
-
-     source = Channel->Source();
-     frequency = Channel->Frequency();
-
+     XXX*/
      }
 
   // PID settings:
diff --git a/dvbdevice.h b/dvbdevice.h
index 709790cdd..d135a2981 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.18 2002/11/03 12:31:15 kls Exp $
+ * $Id: dvbdevice.h 1.19 2002/12/07 14:44:29 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -22,6 +22,8 @@
 
 #define MAXDVBDEVICES  4
 
+class cDvbTuner;
+
 class cDvbDevice : public cDevice {
   friend class cDvbOsd;
 private:
@@ -33,7 +35,7 @@ class cDvbDevice : public cDevice {
          // Must be called before accessing any DVB functions.
 private:
   fe_type_t frontendType;
-  int fd_osd, fd_frontend, fd_audio, fd_video, fd_dvr;
+  int fd_osd, fd_audio, fd_video, fd_dvr;
   int OsdDeviceHandle(void) const { return fd_osd; }
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -53,10 +55,7 @@ class cDvbDevice : public cDevice {
 // Channel facilities
 
 private:
-  int source;
-  int frequency;
-  const char *diseqcCommands;
-  bool IsTunedTo(const cChannel *Channel) const;
+  cDvbTuner *dvbTuner;
 public:
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
diff --git a/interface.c b/interface.c
index 804747aef..7466a9ae2 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.60 2002/11/01 10:50:38 kls Exp $
+ * $Id: interface.c 1.61 2002/12/06 14:13:16 kls Exp $
  */
 
 #include "interface.h"
@@ -157,6 +157,8 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
         t[strlen(t) - 1] = 0; // skips trailing newlines
 
   for (char *p = t; *p; ) {
+      if (*p == '|')
+         *p = '\n';
       if (*p == '\n') {
          Lines++;
          w = 0;
diff --git a/osd.c b/osd.c
index eb0d2dc5d..762295568 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.38 2002/11/16 14:20:26 kls Exp $
+ * $Id: osd.c 1.39 2002/12/08 13:17:13 kls Exp $
  */
 
 #include "osd.h"
@@ -26,15 +26,8 @@
 
 void cOsd::Initialize(void)
 {
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
-  initscr();
-  keypad(stdscr, true);
-  nonl();
-  cbreak();
-  noecho();
-  timeout(10);
-#endif
 #if defined(DEBUG_OSD)
+  initscr();
   start_color();
   leaveok(stdscr, true);
 #endif
@@ -43,7 +36,7 @@ void cOsd::Initialize(void)
 void cOsd::Shutdown(void)
 {
   Close();
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
+#if defined(DEBUG_OSD)
   endwin();
 #endif
 }
@@ -150,6 +143,7 @@ void cOsd::Clear(void)
 #ifdef DEBUG_OSD
   SetColor(clrBackground, clrBackground);
   Fill(0, 0, cols, rows, clrBackground);
+  refresh();
 #else
   osd->Clear();
 #endif
diff --git a/osd.h b/osd.h
index 2cd2f4bf9..5f1ec96fc 100644
--- a/osd.h
+++ b/osd.h
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.37 2002/11/24 10:32:29 kls Exp $
+ * $Id: osd.h 1.38 2002/12/08 12:21:26 kls Exp $
  */
 
 #ifndef __OSD_H
 #define __OSD_H
 
-#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
+#if defined(DEBUG_OSD)
 #include <ncurses.h>
 #endif
 #include "config.h"
diff --git a/params.txt b/params.txt
deleted file mode 100644
index 480a1a600..000000000
--- a/params.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Are the parameter names well chosen?
-
-  "Coderate"  <-->  FEC
-
diff --git a/rcu.c b/rcu.c
index 6345bea73..4157c0d2f 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.2 2002/10/06 15:49:03 kls Exp $
+ * $Id: rcu.c 1.3 2002/12/07 12:22:40 kls Exp $
  */
 
 #include "rcu.h"
@@ -22,6 +22,7 @@ cRcuRemote::cRcuRemote(char *DeviceName)
   dp = 0;
   mode = modeB;
   code = 0;
+  numberToSend = -1;
   lastNumber = 0;
   receivedCommand = false;
   if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
@@ -136,8 +137,13 @@ void cRcuRemote::Action(void)
          repeat = false;
          LastCommand = 0;
          }
-      else
+      else {
          LastCommand = 0;
+         if (numberToSend >= 0) {
+            Number(numberToSend);
+            numberToSend = -1;
+            }
+         }
       if (code && time(NULL) - LastCodeRefresh > 60) {
          SendCommand(code); // in case the PIC listens to the wrong code
          LastCodeRefresh = time(NULL);
@@ -302,8 +308,10 @@ bool cRcuRemote::DetectCode(unsigned char *Code)
 
 void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
 {
-  if (ChannelNumber && Device->IsPrimaryDevice())
-     Number(ChannelNumber);
+  if (ChannelNumber && Device->IsPrimaryDevice()) {
+     LOCK_THREAD;
+     numberToSend = ChannelNumber;
+     }
 }
 
 void cRcuRemote::Recording(const cDevice *Device, const char *Name)
diff --git a/rcu.h b/rcu.h
index 1c54999c6..d314275db 100644
--- a/rcu.h
+++ b/rcu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.h 1.1 2002/09/29 08:56:15 kls Exp $
+ * $Id: rcu.h 1.2 2002/12/07 12:21:25 kls Exp $
  */
 
 #ifndef __RCU_H
@@ -19,6 +19,7 @@ class cRcuRemote : public cRemote, private cThread, private cStatus {
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
   int f;
   unsigned char dp, code, mode;
+  int numberToSend;
   int lastNumber;
   bool receivedCommand;
   bool SendCommand(unsigned char Cmd);
diff --git a/remote.c b/remote.c
index 7157a5f5b..d4f1702b6 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.32 2002/12/01 10:40:04 kls Exp $
+ * $Id: remote.c 1.34 2002/12/08 13:37:13 kls Exp $
  */
 
 #include "remote.h"
@@ -13,13 +13,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <termios.h>
 #include <unistd.h>
-
-#if defined REMOTE_KBD
-#include <ncurses.h>
-#endif
-
 #include "tools.h"
 
 // --- cRemote ---------------------------------------------------------------
@@ -68,7 +62,7 @@ bool cRemote::Put(eKeys Key)
 {
   if (Key != kNone) {
      cMutexLock MutexLock(&mutex);
-     if ((Key & k_Release) != 0)
+     if (in != out && (keys[out] & k_Repeat) && (Key & k_Release))
         Clear();
      int d = out - in;
      if (d <= 0)
@@ -155,30 +149,65 @@ cRemotes Remotes;
 
 // --- cKbdRemote ------------------------------------------------------------
 
-#if defined REMOTE_KBD
-
 cKbdRemote::cKbdRemote(void)
 :cRemote("KBD")
 {
+  active = false;
+  tcgetattr(STDIN_FILENO, &savedTm);
+  struct termios tm;
+  if (tcgetattr(STDIN_FILENO, &tm) == 0) {
+     tm.c_iflag = 0;
+     tm.c_lflag &= ~(ICANON | ECHO);
+     tm.c_cc[VMIN] = 0;
+     tm.c_cc[VTIME] = 0;
+     tcsetattr(STDIN_FILENO, TCSANOW, &tm);
+     }
   Start();
 }
 
 cKbdRemote::~cKbdRemote()
 {
-  Cancel();
+  active = false;
+  Cancel(3);
+  tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
 }
 
 void cKbdRemote::Action(void)
 {
   dsyslog("KBD remote control thread started (pid=%d)", getpid());
   cPoller Poller(STDIN_FILENO);
-  for (;;) {//XXX
-      int Command = getch();
-      if (Command != EOF)
-         Put(Command);
-      Poller.Poll(100);
-      }
+  active = true;
+  while (active) {
+        if (Poller.Poll(100)) {
+           uint64 Command = 0;
+           uint i = 0;
+           int t0 = time_ms();
+           while (active && i < sizeof(Command)) {
+                 uchar ch;
+                 int r = read(STDIN_FILENO, &ch, 1);
+                 if (r == 1) {
+                    Command <<= 8;
+                    Command |= ch;
+                    i++;
+                    }
+                 else if (r == 0) {
+                    // don't know why, but sometimes special keys that start with
+                    // 0x1B ('ESC') cause a short gap between the 0x1B and the rest
+                    // of their codes, so we'll need to wait some 100ms to see if
+                    // there is more coming up - or whether this really is the 'ESC'
+                    // key (if somebody knows how to clean this up, please let me know):
+                    if (Command == 0x1B && time_ms() - t0 < 100)
+                       continue;
+                    if (Command)
+                       Put(Command);
+                    break;
+                    }
+                 else {
+                    LOG_ERROR;
+                    break;
+                    }
+                 }
+           }
+        }
   dsyslog("KBD remote control thread ended (pid=%d)", getpid());
 }
-
-#endif
diff --git a/remote.h b/remote.h
index 2aeec78c3..1c087d0fa 100644
--- a/remote.h
+++ b/remote.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.21 2002/12/01 10:39:10 kls Exp $
+ * $Id: remote.h 1.22 2002/12/08 13:37:02 kls Exp $
  */
 
 #ifndef __REMOTE_H
 #define __REMOTE_H
 
 #include <stdio.h>
+#include <termios.h>
 #include <time.h>
 #include "keys.h"
 #include "thread.h"
@@ -50,16 +51,14 @@ class cRemotes : public cList<cRemote> {};
 
 extern cRemotes Remotes;
 
-#if defined REMOTE_KBD
-
 class cKbdRemote : public cRemote, private cThread {
 private:
+  bool active;
+  struct termios savedTm;
   virtual void Action(void);
 public:
   cKbdRemote(void);
   virtual ~cKbdRemote();
   };
 
-#endif
-
 #endif //__REMOTE_H
diff --git a/vdr.5 b/vdr.5
index 8a76fdd91..8b833a23d 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.16 2002/12/01 10:34:40 kls Exp $
+.\" $Id: vdr.5 1.17 2002/12/08 14:35:12 kls Exp $
 .\"
-.TH vdr 5 "24 Nov 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "6 Dec 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -549,7 +549,7 @@ in (if this is left empty or 0 this event will not be overwritten\
 or modified by data that comes from the DVB stream)
 <title>        @is the title of the event
 <subtitle>     @is the subtitle (typically the name of the episode etc.)
-<description>  @is the description of the event
+<description>  @is the description of the event (any '|' characters will be interpreted as newlines)
 .TE
 
 This file will be read at program startup in order to restore the results of
diff --git a/vdr.c b/vdr.c
index 438f98fed..8f22f11b4 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,13 +22,14 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.136 2002/12/01 10:44:48 kls Exp $
+ * $Id: vdr.c 1.137 2002/12/08 13:34:39 kls Exp $
  */
 
 #include <getopt.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <termios.h>
 #include <unistd.h>
 #include "audio.h"
 #include "channels.h"
@@ -77,6 +78,11 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
+  // Save terminal settings:
+
+  struct termios savedTm;
+  tcgetattr(STDIN_FILENO, &savedTm);
+
   // Initiate locale:
 
   setlocale(LC_ALL, "");
@@ -294,7 +300,7 @@ int main(int argc, char *argv[])
   // Daemon mode:
 
   if (DaemonMode) {
-#if !defined(DEBUG_OSD) && !defined(REMOTE_KBD)
+#if !defined(DEBUG_OSD)
      pid_t pid = fork();
      if (pid < 0) {
         fprintf(stderr, "%m\n");
@@ -307,7 +313,7 @@ int main(int argc, char *argv[])
      fclose(stdout);
      fclose(stderr);
 #else
-     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD or REMOTE_KBD on!\n");
+     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD on!\n");
      return 2;
 #endif
      }
@@ -378,8 +384,10 @@ int main(int argc, char *argv[])
   new cRcuRemote("/dev/ttyS1");
 #elif defined(REMOTE_LIRC)
   new cLircRemote("/dev/lircd");
-#elif defined(REMOTE_KBD)
-  new cKbdRemote;
+#endif
+#if defined(REMOTE_KBD)
+  if (!DaemonMode)
+     new cKbdRemote;
 #endif
   Interface->LearnKeys();
 
@@ -716,6 +724,7 @@ int main(int argc, char *argv[])
   isyslog("exiting");
   if (SysLogLevel > 0)
      closelog();
+  tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
   if (cThread::EmergencyExit()) {
      esyslog("emergency exit!");
      return 1;

From 48fd2b04e9010bb67e19f33e8c7506a976b70e90 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 15 Dec 2002 18:00:00 +0100
Subject: [PATCH 061/307] =?UTF-8?q?Version=201.1.20=20-=20Now=20checking?=
 =?UTF-8?q?=20if=20there=20is=20a=20connection=20to=20the=20keyboard=20(th?=
 =?UTF-8?q?anks=20to=20Jaakko=20Hyv=C3=A4tti)=20=20=20and=20only=20creatin?=
 =?UTF-8?q?g=20the=20KBD=20remote=20control=20if=20VDR=20is=20running=20in?=
 =?UTF-8?q?=20the=20foreground.=20-=20Fixed=20taking=20an=20active=20SVDRP?=
 =?UTF-8?q?=20connection=20into=20account=20when=20doing=20shutdown=20(tha?=
 =?UTF-8?q?nks=20=20=20to=20Gregoire=20Favre=20for=20reporting=20this=20on?=
 =?UTF-8?q?e).=20-=20Changed=20setting=20of=20CXX=20and=20CXXFLAGS=20varia?=
 =?UTF-8?q?bles=20in=20Makefile,=20so=20that=20an=20externally=20=20=20def?=
 =?UTF-8?q?ined=20value=20will=20be=20taken=20if=20present=20(suggested=20?=
 =?UTF-8?q?by=20Robert=20Schiele).=20=20=20Plugin=20authors=20should=20ple?=
 =?UTF-8?q?ase=20change=20the=20lines?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  CXX      = g++
  CXXFLAGS = -O2 -Wall -Woverloaded-virtual

  in their Makefile to

  CXX      ?= g++
  CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual

- Fixed recording overlapping timers on the same channel in case
  DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and/or DO_MULTIPLE_RECORDINGS is not defined
  (thanks to Jaakko Hyvätti).
- No longer stopping/restarting the DMX when switching audio channels (thanks to
  Sven Goethel).
- Fixed high CPU load in 'Transfer Mode' (thanks to Oliver Endriss).
- If a PC keyboard is used as remote control, the string entry fields in the
  menus now accept character input directly (however, this works only for keys that
  are not otherwise defined as remote control keys). Also, plugins can switch the
  cKbdRemote class into "raw mode", where all keyboard input will be made available
  through the new 'kKbd' key code and none of it will be processed as normal remote
  control functions (thanks to Jan Rieger for suggestions and testing).
- Fixed deleting characters in string entry fields in 'insert' mode.
- Now using "Doxygen" to generate source documentation (thanks to Walter Stroebel
  for providing an initial 'Doxyfile' configuration and adjusting some comments).
  See INSTALL for information how to do this. Some function descriptions have
  already been adapted to Doxygen, more will follow.
---
 CONTRIBUTORS                  |  16 +
 Doxyfile                      | 899 ++++++++++++++++++++++++++++++++++
 HISTORY                       |  38 +-
 INSTALL                       |   8 +
 Makefile                      |  22 +-
 PLUGINS/src/hello/HISTORY     |   4 +
 PLUGINS/src/hello/Makefile    |   6 +-
 PLUGINS/src/hello/hello.c     |   4 +-
 PLUGINS/src/osddemo/HISTORY   |   4 +
 PLUGINS/src/osddemo/Makefile  |   6 +-
 PLUGINS/src/osddemo/osddemo.c |   4 +-
 PLUGINS/src/sky/HISTORY       |   4 +
 PLUGINS/src/sky/Makefile      |   6 +-
 PLUGINS/src/sky/sky.c         |   4 +-
 PLUGINS/src/status/HISTORY    |   4 +
 PLUGINS/src/status/Makefile   |   6 +-
 PLUGINS/src/status/status.c   |   4 +-
 config.h                      |   4 +-
 device.h                      | 366 +++++++-------
 dvbdevice.c                   |  23 +-
 dvbdevice.h                   |  11 +-
 keys.h                        |   7 +-
 libdtv/libsi/Makefile         |   4 +-
 libdtv/libvdr/Makefile        |   4 +-
 menuitems.c                   |  48 +-
 newplugin                     |   6 +-
 remote.c                      |  70 ++-
 remote.h                      |  34 +-
 tools.h                       |  14 +-
 transfer.c                    |   4 +-
 vdr.c                         |  17 +-
 31 files changed, 1398 insertions(+), 253 deletions(-)
 create mode 100644 Doxyfile

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 970902652..86ca1e709 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -386,6 +386,7 @@ Rudi Hofer (Rudi.Hofer@cadsoft.de)
 
 Gregoire Favre <greg@ulima.unil.ch>
  for fixing some function headers to make them compile with gcc 3.x
+ for reporting a bug in taking an active SVDRP connection into account when doing shutdown
 
 Sven Grothklags <sven@uni-paderborn.de>
  for fixing the cutting mechanism to make it re-sync in case a frame is larger
@@ -438,6 +439,7 @@ Oliver Endriss <o.endriss@gmx.de>
  it kicked in
  for providing examples for 'diseqc.conf'
  for improving deleting stale lock files
+ for fixing high CPU load in 'Transfer Mode'
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -453,6 +455,8 @@ Andy Carter <fruit@ukgateway.net>
 Robert Schiele <rschiele@uni-mannheim.de>
  for his help in keeping 'channels.conf.cable' up to date
  for reporting some faulty default parameter initializations
+ for suggesting to only set the Makefile variables CXX and CXXFLAGS if they are not
+ yet defined
 
 Gerhard Steiner <steiner@mail.austria.com>
  for suggesting that the SVDRP command PUTE shall trigger an immediate write of
@@ -464,6 +468,9 @@ Gerhard Steiner <steiner@mail.austria.com>
 
 Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
+ for adding a check if there is a connection to the keyboard
+ for fixing recording overlapping timers on the same channel in case
+ DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and/or DO_MULTIPLE_RECORDINGS is not defined
 
 Dennis Noordsij <dennis.noordsij@wiral.com>
  for reporting a small glitch when switching channels
@@ -504,3 +511,12 @@ Gerald Berwolf <genka@genka.de>
 
 Thomas Sailer <sailer@scs.ch>
  for pointing out how to set the terminal parameters to read from the keyboard
+
+Sven Goethel <sgoethel@jausoft.com>
+ for making switching audio channels work without stopping/restarting the DMX
+
+Jan Rieger <jan@ricomp.de>
+ for suggestions and testing raw keyboard input
+
+Walter Stroebel <walter.stroebel@lifeline.nl>
+ for introducing "Doxygen" to document the VDR source code
diff --git a/Doxyfile b/Doxyfile
new file mode 100644
index 000000000..b17231795
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,899 @@
+# Doxyfile 1.2.13.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = vdr
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = <will be set by the Makefile>
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = srcdoc
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, 
+# German, Greek, Hungarian, Italian, Japanese, Korean, Norwegian, Polish, 
+# Portuguese, Romanian, Russian, Slovak, Slovene, Spanish and Swedish.
+
+OUTPUT_LANGUAGE        = English
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these class will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = NO
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
+# members of a class in the documentation of that class as if those members were 
+# ordinary class members. Constructors, destructors and assignment operators of 
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. It is allowed to use relative paths in the argument list.
+
+STRIP_FROM_PATH        = 
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower case letters. If set to YES upper case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# users are adviced to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments  will behave just like the Qt-style comments (thus requiring an 
+# explict @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# reimplements.
+
+INHERIT_DOCS           = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consist of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+# only. Doxygen will then generate output that is more tailored for C. 
+# For instance some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+##kls
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text.
+
+WARN_FORMAT            = 
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = .
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# *.h++ *.idl
+
+FILE_PATTERNS          = *.c *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       = */RCS/* */OLD/*
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.
+
+INPUT_FILTER           = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse.
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = c
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = 
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the Html help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript and frames is required (for instance Mozilla, Netscape 4.0+, 
+# or Internet explorer 4.0+). Note that for large projects the tree generation 
+# can take a very long time. In such cases it is better to disable this feature. 
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = 
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimised for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = 
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assigments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = 
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = 
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_XML           = NO
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line and do not end with a semicolon. Such function macros are typically 
+# used for boiler-plate code, and will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tagfiles.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in Html, RTF and LaTeX) for classes with base or 
+# super classes. Setting the tag to NO turns the diagrams off. Note that this 
+# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
+# recommended to install and use dot, since it yield more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = NO
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermedate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
+
+# The CGI_NAME tag should be the name of the CGI script that 
+# starts the search engine (doxysearch) with the correct parameters. 
+# A script with this name will be generated by doxygen.
+
+CGI_NAME               = 
+
+# The CGI_URL tag should be the absolute URL to the directory where the 
+# cgi binaries are located. See the documentation of your http daemon for 
+# details.
+
+CGI_URL                = 
+
+# The DOC_URL tag should be the absolute URL to the directory where the 
+# documentation is located. If left blank the absolute path to the 
+# documentation, with file:// prepended to it, will be used.
+
+DOC_URL                = 
+
+# The DOC_ABSPATH tag should be the absolute path to the directory where the 
+# documentation is located. If left blank the directory on the local machine 
+# will be used.
+
+DOC_ABSPATH            = 
+
+# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
+# is installed.
+
+BIN_ABSPATH            = 
+
+# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
+# documentation generated for other projects. This allows doxysearch to search 
+# the documentation for these projects as well.
+
+EXT_DOC_PATHS          = 
diff --git a/HISTORY b/HISTORY
index d189379d3..1b76bf49a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1850,7 +1850,7 @@ Video Disk Recorder Revision History
   This also makes "Motor-DiSEqC" work (thanks to Reinhard Walter Buchner for his help
   in testing this). Since switching channels now no longer explicitly waits for a
   channel lock in the foreground thread, the "panic level" mechanism is no longer
-  used (maybe we don't need it nay more, anyway).
+  used (maybe we don't need it any more, anyway).
 - The keyboard is now by default always active to control VDR. The 'make' option
   REMOTE=KBD is therefore obsolete. When compiling VDR with REMOTE=RCU or REMOTE=LIRC,
   the keyboard can thus now be active together with the remote control. If you want
@@ -1862,3 +1862,39 @@ Video Disk Recorder Revision History
   (Thanks to Thomas Sailer for pointing out how to set the terminal parameters to
   read from the keyboard).
 - The 'ncurses' library is now only necessary when compiling VDR with DEBUG_OSD=1.
+
+2002-12-15: Version 1.1.20
+
+- Now checking if there is a connection to the keyboard (thanks to Jaakko Hyv�tti)
+  and only creating the KBD remote control if VDR is running in the foreground.
+- Fixed taking an active SVDRP connection into account when doing shutdown (thanks
+  to Gregoire Favre for reporting this one).
+- Changed setting of CXX and CXXFLAGS variables in Makefile, so that an externally
+  defined value will be taken if present (suggested by Robert Schiele).
+  Plugin authors should please change the lines
+
+  CXX      = g++
+  CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
+  in their Makefile to
+
+  CXX      ?= g++
+  CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+
+- Fixed recording overlapping timers on the same channel in case
+  DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and/or DO_MULTIPLE_RECORDINGS is not defined
+  (thanks to Jaakko Hyv�tti).
+- No longer stopping/restarting the DMX when switching audio channels (thanks to
+  Sven Goethel).
+- Fixed high CPU load in 'Transfer Mode' (thanks to Oliver Endriss).
+- If a PC keyboard is used as remote control, the string entry fields in the
+  menus now accept character input directly (however, this works only for keys that
+  are not otherwise defined as remote control keys). Also, plugins can switch the
+  cKbdRemote class into "raw mode", where all keyboard input will be made available
+  through the new 'kKbd' key code and none of it will be processed as normal remote
+  control functions (thanks to Jan Rieger for suggestions and testing).
+- Fixed deleting characters in string entry fields in 'insert' mode.
+- Now using "Doxygen" to generate source documentation (thanks to Walter Stroebel
+  for providing an initial 'Doxyfile' configuration and adjusting some comments).
+  See INSTALL for information how to do this. Some function descriptions have
+  already been adapted to Doxygen, more will follow.
diff --git a/INSTALL b/INSTALL
index 8e61605da..ce5420a3c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -357,3 +357,11 @@ If you prefer different key assignments, or if the default doesn't work for
 your keyboard, simply delete the file 'remote.conf' and restart 'vdr' to get
 into learning mode.
 
+Generating source code documentation:
+-------------------------------------
+
+You can do a 'make srcdoc' to generate source code documentation using the
+Doxygen tool. To do so you need the Doxygen package from http://www.doxygen.src
+and the Graphviz package from http://www.research.att.com/sw/tools/graphviz.
+After installing these two packages you can do 'make srcdoc' and then use your
+HTML browser to read srcdoc/html/index.html.
diff --git a/Makefile b/Makefile
index 7d169ce6f..d1e17a7df 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.53 2002/12/08 12:20:37 kls Exp $
+# $Id: Makefile 1.55 2002/12/15 15:15:55 kls Exp $
 
 .DELETE_ON_ERROR:
 
-CC       = gcc
-CFLAGS   = -O2
+CC       ?= gcc
+CFLAGS   ?= -O2
 
-CXX      = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+CXX      ?= g++
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 
 DVBDIR   = ../DVB
 DTVDIR   = ./libdtv
@@ -23,6 +23,9 @@ PLUGINDIR= ./PLUGINS
 
 VIDEODIR = /video
 
+DOXYGEN  = /usr/bin/doxygen
+DOXYFILE = Doxyfile
+
 -include Make.config
 
 INCLUDES = -I$(DVBDIR)/include
@@ -122,12 +125,21 @@ install:
             cp *.conf $(VIDEODIR);\
             fi
 
+# Source documentation:
+
+srcdoc:
+	@cp $(DOXYFILE) $(DOXYFILE).tmp
+	@echo PROJECT_NUMBER = `grep VDRVERSION config.h | awk '{ print $$3 }'` >> $(DOXYFILE).tmp
+	$(DOXYGEN) $(DOXYFILE).tmp
+	@rm $(DOXYFILE).tmp
+
 # Housekeeping:
 
 clean:
 	$(MAKE) -C $(DTVDIR) clean
 	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
 	-rm -rf include
+	-rm -rf srcdoc
 fontclean:
 	-rm -f fontfix.c fontosd.c
 CLEAN: clean fontclean
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 53b620e9d..f5e90bae8 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -41,3 +41,7 @@ VDR Plugin 'hello' Revision History
 2002-11-23: Version 0.0.9
 
 - Changed return type of MainMenuAction().
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 92ac45f82..068f6e9eb 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2002/11/01 13:44:11 kls Exp $
+# $Id: Makefile 1.8 2002/12/13 14:54:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 ### The C++ compiler and options:
 
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index b72657865..e3c45f2ba 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.10 2002/11/23 15:07:28 kls Exp $
+ * $Id: hello.c 1.11 2002/12/13 15:01:43 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.9";
+static const char *VERSION        = "0.1.0";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 8c9d3e1a0..c7d4ebcf6 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'osddemo' Revision History
 2002-11-23: Version 0.0.1
 
 - Initial revision.
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index ac56d1f7f..db871613d 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2002/11/23 14:56:44 kls Exp $
+# $Id: Makefile 1.2 2002/12/13 14:54:29 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 ### The C++ compiler and options:
 
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index f806178d4..3ac8a2d99 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 1.1 2002/11/24 10:32:59 kls Exp $
+ * $Id: osddemo.c 1.2 2002/12/13 15:02:01 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.1.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 8be01f151..bdb440b1e 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'sky' Revision History
 2002-12-01: Version 0.0.1
 
 - Initial revision.
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index c3d0e0fd7..3df93c18d 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2002/11/01 13:45:13 kls Exp $
+# $Id: Makefile 1.2 2002/12/13 14:54:24 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 ### The C++ compiler and options:
 
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 41439be72..d6e10c92d 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.1 2002/10/26 16:27:13 kls Exp $
+ * $Id: sky.c 1.2 2002/12/13 15:01:57 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -14,7 +14,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.1.0";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 7d2829159..1c399aaba 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -27,3 +27,7 @@ VDR Plugin 'status' Revision History
 2002-11-23: Version 0.0.6
 
 - Changed return type of MainMenuAction().
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 00fd97b52..18d5eeede 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.5 2002/11/01 13:44:25 kls Exp $
+# $Id: Makefile 1.6 2002/12/13 14:54:19 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 ### The C++ compiler and options:
 
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index f5ab5b9c4..a0346591b 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.6 2002/11/23 15:07:40 kls Exp $
+ * $Id: status.c 1.7 2002/12/13 15:01:53 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.6";
+static const char *VERSION        = "0.1.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/config.h b/config.h
index 50e315641..d09729e7a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.143 2002/12/06 14:17:55 kls Exp $
+ * $Id: config.h 1.144 2002/12/13 13:41:55 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.19"
+#define VDRVERSION "1.1.20"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.h b/device.h
index cc2be7901..f18699c46 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.27 2002/11/03 11:16:11 kls Exp $
+ * $Id: device.h 1.28 2002/12/15 14:40:11 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -50,6 +50,8 @@ class cPlayer;
 class cReceiver;
 class cSpuDecoder;
 
+/// The cDevice class is the base from which actual devices can be derived.
+
 class cDevice : public cThread {
 private:
   static int numDevices;
@@ -58,32 +60,35 @@ class cDevice : public cThread {
   static cDevice *primaryDevice;
 public:
   static int NumDevices(void) { return numDevices; }
-         // Returns the total number of devices.
+         ///< Returns the total number of devices.
   static void SetUseDevice(int n);
-         // Sets the 'useDevice' flag of the given device.
-         // If this function is not called before initializing, all devices
-         // will be used.
+         ///< Sets the 'useDevice' flag of the given device.
+         ///< If this function is not called before initializing, all devices
+         ///< will be used.
   static bool UseDevice(int n) { return useDevice == 0 || (useDevice & (1 << n)) != 0; }
-         // Tells whether the device with the given card index shall be used in
-         // this instance of VDR.
+         ///< Tells whether the device with the given card index shall be used in
+         ///< this instance of VDR.
   static bool SetPrimaryDevice(int n);
-         // Sets the primary device to 'n' (which must be in the range
-         // 1...numDevices) and returns true if this was possible.
+         ///< Sets the primary device to 'n'.
+         ///< \param n must be in the range 1...numDevices.
+         ///< \return true if this was possible.
   static cDevice *PrimaryDevice(void) { return primaryDevice; }
-         // Returns the primary device.
+         ///< Returns the primary device.
   static cDevice *GetDevice(int Index);
-         // Returns the device with the Index (if Index is in the range
-         // 0..numDevices-1, NULL otherwise).
+         ///< Gets the device with the given Index.
+         ///< \param Index must be in the range 0..numDevices-1.
+         ///< \return A pointer to the device, or NULL if the Index was invalid.
   static cDevice *GetDevice(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
-         // Returns a device that is able to receive the given Channel at the
-         // given Priority (see ProvidesChannel() for more information on how
-         // priorities are handled, and the meaning of NeedsDetachReceivers).
+         ///< Returns a device that is able to receive the given Channel at the
+         ///< given Priority.
+         ///< See ProvidesChannel() for more information on how
+         ///< priorities are handled, and the meaning of NeedsDetachReceivers.
   static void SetCaCaps(int Index = -1);
-         // Sets the CaCaps of the given device according to the Setup data.
-         // By default the CaCaps of all devices are set.
+         ///< Sets the CaCaps of the given device according to the Setup data.
+         ///< By default the CaCaps of all devices are set.
   static void Shutdown(void);
-         // Closes down all devices.
-         // Must be called at the end of the program.
+         ///< Closes down all devices.
+         ///< Must be called at the end of the program.
 private:
   static int nextCardIndex;
   int cardIndex;
@@ -92,49 +97,50 @@ class cDevice : public cThread {
   cDevice(void);
   virtual ~cDevice();
   static int NextCardIndex(int n = 0);
-         // Each device in a given machine must have a unique card index, which
-         // will be used to identify the device for assigning Ca parameters and
-         // deciding whether to actually use that device in this particular
-         // instance of VDR. Every time a new cDevice is created, it will be
-         // given the current nextCardIndex, and then nextCardIndex will be
-         // automatically incremented by 1. A derived class can determine whether
-         // a given device shall be used by checking UseDevice(NextCardIndex()).
-         // If a device is skipped, or if there are possible device indexes left
-         // after a derived class has set up all its devices, NextCardIndex(n)
-         // must be called, where n is the number of card indexes to skip.
+         ///< Calculates the next card index.
+         ///< Each device in a given machine must have a unique card index, which
+         ///< will be used to identify the device for assigning Ca parameters and
+         ///< deciding whether to actually use that device in this particular
+         ///< instance of VDR. Every time a new cDevice is created, it will be
+         ///< given the current nextCardIndex, and then nextCardIndex will be
+         ///< automatically incremented by 1. A derived class can determine whether
+         ///< a given device shall be used by checking UseDevice(NextCardIndex()).
+         ///< If a device is skipped, or if there are possible device indexes left
+         ///< after a derived class has set up all its devices, NextCardIndex(n)
+         ///< must be called, where n is the number of card indexes to skip.
   virtual void MakePrimaryDevice(bool On);
-         // Informs a device that it will be the primary device. If there is
-         // anything the device needs to set up when it becomes the primary
-         // device (On = true) or to shut down when it no longer is the primary
-         // device (On = false), it should do so in this function.
+         ///< Informs a device that it will be the primary device. If there is
+         ///< anything the device needs to set up when it becomes the primary
+         ///< device (On = true) or to shut down when it no longer is the primary
+         ///< device (On = false), it should do so in this function.
 public:
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
-         // Returns the card index of this device (0 ... MAXDEVICES - 1).
+         ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
-         // Returns number of this device (0 ... MAXDEVICES - 1).
+         ///< Returns the number of this device (0 ... MAXDEVICES - 1).
   int ProvidesCa(int Ca) const;
-         // Checks whether this device provides the given value in its
-         // caCaps. Returns 0 if the value is not provided, 1 if only this
-         // value is provided, and > 1 if this and other values are provided.
-         // If the given value is equal to the number of this device,
-         // 1 is returned. If it is 0 (FTA), 1 plus the number of other values
-         // in caCaps is returned.
+         ///< Checks whether this device provides the given value in its
+         ///< caCaps. Returns 0 if the value is not provided, 1 if only this
+         ///< value is provided, and > 1 if this and other values are provided.
+         ///< If the given value is equal to the number of this device,
+         ///< 1 is returned. If it is 0 (FTA), 1 plus the number of other values
+         ///< in caCaps is returned.
   virtual bool HasDecoder(void) const;
-         // Tells whether this device has an MPEG decoder.
+         ///< Tells whether this device has an MPEG decoder.
 
 // OSD facilities
 
 public:
   virtual cOsdBase *NewOsd(int x, int y);
-         // Creates a new cOsdBase object that can be used by the cOsd class
-         // to display information on the screen, with the upper left corner
-         // of the OSD at the given coordinates. If a derived cDevice doesn't
-         // implement this function, NULL will be returned by default (which
-         // means the device has no OSD capabilities).
+         ///< Creates a new cOsdBase object that can be used by the cOsd class
+         ///< to display information on the screen, with the upper left corner
+         ///< of the OSD at the given coordinates. If a derived cDevice doesn't
+         ///< implement this function, NULL will be returned by default (which
+         ///< means the device has no OSD capabilities).
   virtual cSpuDecoder *GetSpuDecoder(void);
-         // Returns a pointer to the device's SPU decoder (or NULL, if this
-         // device doesn't have an SPU decoder).
+         ///< Returns a pointer to the device's SPU decoder (or NULL, if this
+         ///< device doesn't have an SPU decoder).
 
 // Channel facilities
 
@@ -142,38 +148,38 @@ class cDevice : public cThread {
   static int currentChannel;
 public:
   virtual bool ProvidesSource(int Source) const;
-         // Returns true if this device can provide the given source.
+         ///< Returns true if this device can provide the given source.
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
-         // Returns true if this device can provide the given channel.
-         // In case the device has cReceivers attached to it or it is the primary
-         // device, Priority is used to decide whether the caller's request can
-         // be honored.
-         // The special Priority value -1 will tell the caller whether this device
-         // is principally able to provide the given Channel, regardless of any
-         // attached cReceivers.
-         // If NeedsDetachReceivers is given, the resulting value in it will tell the
-         // caller whether or not it will have to detach any currently attached
-         // receivers from this device before calling SwitchChannel. Note
-         // that the return value in NeedsDetachReceivers is only meaningful if the
-         // function itself actually returns true.
-         // The default implementation always returns false, so a derived cDevice
-         // class that can provide channels must implement this function.
+         ///< Returns true if this device can provide the given channel.
+         ///< In case the device has cReceivers attached to it or it is the primary
+         ///< device, Priority is used to decide whether the caller's request can
+         ///< be honored.
+         ///< The special Priority value -1 will tell the caller whether this device
+         ///< is principally able to provide the given Channel, regardless of any
+         ///< attached cReceivers.
+         ///< If NeedsDetachReceivers is given, the resulting value in it will tell the
+         ///< caller whether or not it will have to detach any currently attached
+         ///< receivers from this device before calling SwitchChannel. Note
+         ///< that the return value in NeedsDetachReceivers is only meaningful if the
+         ///< function itself actually returns true.
+         ///< The default implementation always returns false, so a derived cDevice
+         ///< class that can provide channels must implement this function.
   bool SwitchChannel(const cChannel *Channel, bool LiveView);
-         // Switches the device to the given Channel, initiating transfer mode
-         // if necessary.
+         ///< Switches the device to the given Channel, initiating transfer mode
+         ///< if necessary.
   static bool SwitchChannel(int Direction);
-         // Switches the primary device to the next available channel in the given
-         // Direction (only the sign of Direction is evaluated, positive values
-         // switch to higher channel numbers).
+         ///< Switches the primary device to the next available channel in the given
+         ///< Direction (only the sign of Direction is evaluated, positive values
+         ///< switch to higher channel numbers).
 private:
   eSetChannelResult SetChannel(const cChannel *Channel, bool LiveView);
-         // Sets the device to the given channel (general setup).
+         ///< Sets the device to the given channel (general setup).
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
-         // Sets the device to the given channel (actual physical setup).
+         ///< Sets the device to the given channel (actual physical setup).
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
-         // Returns the number of the current channel on the primary device.
+         ///< Returns the number of the current channel on the primary device.
 
 // PID handle facilities
 
@@ -191,33 +197,43 @@ class cDevice : public cThread {
     };
   cPidHandle pidHandles[MAXPIDHANDLES];
   bool HasPid(int Pid) const;
-         // Returns true if this device is currently receiving the given PID.
+         ///< Returns true if this device is currently receiving the given PID.
   bool AddPid(int Pid, ePidType PidType = ptOther);
-         // Adds a PID to the set of PIDs this device shall receive.
+         ///< Adds a PID to the set of PIDs this device shall receive.
   void DelPid(int Pid);
-         // Deletes a PID from the set of PIDs this device shall receive.
+         ///< Deletes a PID from the set of PIDs this device shall receive.
   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
-         // Does the actual PID setting on this device.
-         // On indicates whether the PID shall be added or deleted.
-         // Handle->handle can be used by the device to store information it
-         // needs to receive this PID (for instance a file handle).
-         // Handle->used indicated how many receivers are using this PID.
-         // Type indicates some special types of PIDs, which the device may
-         // need to set in a specific way.
+         ///< Does the actual PID setting on this device.
+         ///< On indicates whether the PID shall be added or deleted.
+         ///< Handle->handle can be used by the device to store information it
+         ///< needs to receive this PID (for instance a file handle).
+         ///< Handle->used indicated how many receivers are using this PID.
+         ///< Type indicates some special types of PIDs, which the device may
+         ///< need to set in a specific way.
 
 // Image Grab facilities
 
 public:
   virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-         // Grabs the currently visible screen image into the given file, with the
-         // given parameters.
+         ///< Capture a single frame as an image.
+         ///< Grabs the currently visible screen image into the given file, with the
+         ///< given parameters.
+         ///< \param FileName The name of the file to write. Should include the proper extension.
+         ///< \param Jpeg If true will write a JPEG file. Otherwise a PNM file will be written.
+         ///< \param Quality The compression factor for JPEG. 1 will create a very blocky
+         ///<        and small image, 70..80 will yield reasonable quality images while keeping the
+         ///<        image file size around 50 KB for a full frame. The default will create a big
+         ///<        but very high quality image.
+         ///< \param SizeX The number of horizontal pixels in the frame (default is the current screen width).
+         ///< \param SizeY The number of vertical pixels in the frame (default is the current screen height).
+         ///< \return True if all went well. */
 
 // Video format facilities
 
 public:
   virtual void SetVideoFormat(bool VideoFormat16_9);
-         // Sets the output video format to either 16:9 or 4:3 (only useful
-         // if this device has an MPEG decoder).
+         ///< Sets the output video format to either 16:9 or 4:3 (only useful
+         ///< if this device has an MPEG decoder).
 
 // Audio facilities
 
@@ -226,51 +242,51 @@ class cDevice : public cThread {
   int volume;
 protected:
   virtual void SetVolumeDevice(int Volume);
-       // Sets the audio volume on this device (Volume = 0...255).
+       ///< Sets the audio volume on this device (Volume = 0...255).
   virtual int NumAudioTracksDevice(void) const;
-       // Returns the number of audio tracks that are currently available on this
-       // device. The default return value is 0, meaning that this device
-       // doesn't have multiple audio track capabilities. The return value may
-       // change with every call and need not necessarily be the number of list
-       // entries returned by GetAudioTracksDevice(). This function is mainly called to
-       // decide whether there should be an "Audio" button in a menu.
+       ///< Returns the number of audio tracks that are currently available on this
+       ///< device. The default return value is 0, meaning that this device
+       ///< doesn't have multiple audio track capabilities. The return value may
+       ///< change with every call and need not necessarily be the number of list
+       ///< entries returned by GetAudioTracksDevice(). This function is mainly called to
+       ///< decide whether there should be an "Audio" button in a menu.
   virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
-       // Returns a list of currently available audio tracks. The last entry in the
-       // list must be NULL. The number of entries does not necessarily have to be
-       // the same as returned by a previous call to NumAudioTracksDevice().
-       // If CurrentTrack is given, it will be set to the index of the current track
-       // in the returned list. Note that the list must not be changed after it has
-       // been returned by a call to GetAudioTracksDevice()! The only time the list may
-       // change is *inside* the GetAudioTracksDevice() function.
-       // By default the return value is NULL and CurrentTrack, if given, will not
-       // have any meaning.
+       ///< Returns a list of currently available audio tracks. The last entry in the
+       ///< list must be NULL. The number of entries does not necessarily have to be
+       ///< the same as returned by a previous call to NumAudioTracksDevice().
+       ///< If CurrentTrack is given, it will be set to the index of the current track
+       ///< in the returned list. Note that the list must not be changed after it has
+       ///< been returned by a call to GetAudioTracksDevice()! The only time the list may
+       ///< change is *inside* the GetAudioTracksDevice() function.
+       ///< By default the return value is NULL and CurrentTrack, if given, will not
+       ///< have any meaning.
   virtual void SetAudioTrackDevice(int Index);
-       // Sets the current audio track to the given value, which should be within the
-       // range of the list returned by a previous call to GetAudioTracksDevice()
-       // (otherwise nothing will happen).
+       ///< Sets the current audio track to the given value, which should be within the
+       ///< range of the list returned by a previous call to GetAudioTracksDevice()
+       ///< (otherwise nothing will happen).
 public:
   bool IsMute(void) const { return mute; }
   bool ToggleMute(void);
-       // Turns the volume off or on and returns the new mute state.
+       ///< Turns the volume off or on and returns the new mute state.
   void SetVolume(int Volume, bool Absolute = false);
-       // Sets the volume to the given value, either absolutely or relative to
-       // the current volume.
+       ///< Sets the volume to the given value, either absolutely or relative to
+       ///< the current volume.
   static int CurrentVolume(void) { return primaryDevice ? primaryDevice->volume : 0; }//XXX???
   int NumAudioTracks(void) const;
-       // Returns the number of audio tracks that are currently available on this
-       // device or a player attached to it.
+       ///< Returns the number of audio tracks that are currently available on this
+       ///< device or a player attached to it.
   const char **GetAudioTracks(int *CurrentTrack = NULL) const;
-       // Returns a list of currently available audio tracks. The last entry in the
-       // list is NULL. The number of entries does not necessarily have to be
-       // the same as returned by a previous call to NumAudioTracks().
-       // If CurrentTrack is given, it will be set to the index of the current track
-       // in the returned list.
-       // By default the return value is NULL and CurrentTrack, if given, will not
-       // have any meaning.
+       ///< Returns a list of currently available audio tracks. The last entry in the
+       ///< list is NULL. The number of entries does not necessarily have to be
+       ///< the same as returned by a previous call to NumAudioTracks().
+       ///< If CurrentTrack is given, it will be set to the index of the current track
+       ///< in the returned list.
+       ///< By default the return value is NULL and CurrentTrack, if given, will not
+       ///< have any meaning.
   void SetAudioTrack(int Index);
-       // Sets the current audio track to the given value, which should be within the
-       // range of the list returned by a previous call to GetAudioTracks() (otherwise
-       // nothing will happen).
+       ///< Sets the current audio track to the given value, which should be within the
+       ///< range of the list returned by a previous call to GetAudioTracks() (otherwise
+       ///< nothing will happen).
 
 // Player facilities
 
@@ -279,54 +295,54 @@ class cDevice : public cThread {
   bool playerDetached;
 protected:
   virtual bool CanReplay(void) const;
-       // Returns true if this device can currently start a replay session.
+       ///< Returns true if this device can currently start a replay session.
   virtual bool SetPlayMode(ePlayMode PlayMode);
-       // Sets the device into the given play mode.
-       // Returns true if the operation was successful.
+       ///< Sets the device into the given play mode.
+       ///< \return true if the operation was successful.
 public:
   virtual void TrickSpeed(int Speed);
-       // Sets the device into a mode where replay is done slower.
-       // Every single frame shall then be displayed the given number of
-       // times.
+       ///< Sets the device into a mode where replay is done slower.
+       ///< Every single frame shall then be displayed the given number of
+       ///< times.
   virtual void Clear(void);
-       // Clears all video and audio data from the device.
-       // A derived class must call the base class function to make sure
-       // all registered cAudio objects are notified.
+       ///< Clears all video and audio data from the device.
+       ///< A derived class must call the base class function to make sure
+       ///< all registered cAudio objects are notified.
   virtual void Play(void);
-       // Sets the device into play mode (after a previous trick
-       // mode).
+       ///< Sets the device into play mode (after a previous trick
+       ///< mode).
   virtual void Freeze(void);
-       // Puts the device into "freeze frame" mode.
+       ///< Puts the device into "freeze frame" mode.
   virtual void Mute(void);
-       // Turns off audio while replaying.
-       // A derived class must call the base class function to make sure
-       // all registered cAudio objects are notified.
+       ///< Turns off audio while replaying.
+       ///< A derived class must call the base class function to make sure
+       ///< all registered cAudio objects are notified.
   virtual void StillPicture(const uchar *Data, int Length);
-       // Displays the given I-frame as a still picture.
+       ///< Displays the given I-frame as a still picture.
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
-       // Returns true if the device itself or any of the file handles in
-       // Poller is ready for further action.
-       // If TimeoutMs is not zero, the device will wait up to the given number
-       // of milleseconds before returning in case there is no immediate
-       // need for data.
+       ///< Returns true if the device itself or any of the file handles in
+       ///< Poller is ready for further action.
+       ///< If TimeoutMs is not zero, the device will wait up to the given number
+       ///< of milleseconds before returning in case there is no immediate
+       ///< need for data.
   virtual int PlayVideo(const uchar *Data, int Length);
-       // Actually plays the given data block as video. The data must be
-       // part of a PES (Packetized Elementary Stream) which can contain
-       // one video and one audio strem.
+       ///< Actually plays the given data block as video. The data must be
+       ///< part of a PES (Packetized Elementary Stream) which can contain
+       ///< one video and one audio strem.
   virtual void PlayAudio(const uchar *Data, int Length);
-       // Plays additional audio streams, like Dolby Digital.
-       // A derived class must call the base class function to make sure data
-       // is distributed to all registered cAudio objects.
+       ///< Plays additional audio streams, like Dolby Digital.
+       ///< A derived class must call the base class function to make sure data
+       ///< is distributed to all registered cAudio objects.
   bool Replaying(void) const;
-       // Returns true if we are currently replaying.
+       ///< Returns true if we are currently replaying.
   void StopReplay(void);
-       // Stops the current replay session (if any).
+       ///< Stops the current replay session (if any).
   bool AttachPlayer(cPlayer *Player);
-       // Attaches the given player to this device.
+       ///< Attaches the given player to this device.
   void Detach(cPlayer *Player);
-       // Detaches the given player from this device.
+       ///< Detaches the given player from this device.
   bool PlayerDetached(void);
-       // Returns true if a player has been detached and resets the 'playerDetached' flag.
+       ///< Returns true if a player has been detached and resets the 'playerDetached' flag.
 
 // Receiver facilities
 
@@ -335,39 +351,39 @@ class cDevice : public cThread {
   int CanShift(int Ca, int Priority, int UsedCards = 0) const;
 protected:
   int Priority(void) const;
-      // Returns the priority of the current receiving session (0..MAXPRIORITY),
-      // or -1 if no receiver is currently active. The primary device will
-      // always return at least Setup.PrimaryLimit-1.
+      ///< Returns the priority of the current receiving session (0..MAXPRIORITY),
+      ///< or -1 if no receiver is currently active. The primary device will
+      ///< always return at least Setup.PrimaryLimit-1.
   virtual bool OpenDvr(void);
-      // Opens the DVR of this device and prepares it to deliver a Transport
-      // Stream for use in a cReceiver.
+      ///< Opens the DVR of this device and prepares it to deliver a Transport
+      ///< Stream for use in a cReceiver.
   virtual void CloseDvr(void);
-      // Shuts down the DVR.
+      ///< Shuts down the DVR.
   virtual bool GetTSPacket(uchar *&Data);
-      // Gets exactly one TS packet from the DVR of this device and returns
-      // a pointer to it in Data. Only the first 188 bytes (TS_SIZE) Data
-      // points to are valid and may be accessed. If there is currently no
-      // new data available, Data will be set to NULL. The function returns
-      // false in case of a non recoverable error, otherwise it returns true,
-      // even if Data is NULL.
+      ///< Gets exactly one TS packet from the DVR of this device and returns
+      ///< a pointer to it in Data. Only the first 188 bytes (TS_SIZE) Data
+      ///< points to are valid and may be accessed. If there is currently no
+      ///< new data available, Data will be set to NULL. The function returns
+      ///< false in case of a non recoverable error, otherwise it returns true,
+      ///< even if Data is NULL.
 public:
   int  Ca(void) const;
-       // Returns the ca of the current receiving session(s).
+       ///< Returns the ca of the current receiving session(s).
   bool Receiving(bool CheckAny = false) const;
-       // Returns true if we are currently receiving.
+       ///< Returns true if we are currently receiving.
   bool AttachReceiver(cReceiver *Receiver);
-       // Attaches the given receiver to this device.
+       ///< Attaches the given receiver to this device.
   void Detach(cReceiver *Receiver);
-       // Detaches the given receiver from this device.
+       ///< Detaches the given receiver from this device.
   };
 
-// Derived cDevice classes that can receive channels will have to provide
-// Transport Stream (TS) packets one at a time. cTSBuffer implements a
-// simple buffer that allows the device to read a larger amount of data
-// from the driver with each call to Read(), thus avoiding the overhead
-// of getting each TS packet separately from the driver. It also makes
-// sure the returned data points to a TS packet and automatically
-// re-synchronizes after broken packet.
+/// Derived cDevice classes that can receive channels will have to provide
+/// Transport Stream (TS) packets one at a time. cTSBuffer implements a
+/// simple buffer that allows the device to read a larger amount of data
+/// from the driver with each call to Read(), thus avoiding the overhead
+/// of getting each TS packet separately from the driver. It also makes
+/// sure the returned data points to a TS packet and automatically
+/// re-synchronizes after broken packet.
 
 class cTSBuffer {
 private:
diff --git a/dvbdevice.c b/dvbdevice.c
index a2b4ce97d..adc900b6e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.38 2002/12/07 14:50:46 kls Exp $
+ * $Id: dvbdevice.c 1.40 2002/12/14 10:52:13 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -537,31 +537,26 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool needsDetachReceivers = true;
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
-#ifdef DO_MULTIPLE_RECORDINGS
+     result = hasPriority;
      if (Receiving()) {
         if (dvbTuner->IsTunedTo(Channel)) {
            needsDetachReceivers = false;
            if (!HasPid(Channel->Vpid())) {
-              if (Channel->Ca() > CACONFBASE) {
+#ifdef DO_MULTIPLE_RECORDINGS
+              if (Channel->Ca() > CACONFBASE)
                  needsDetachReceivers = true;
-                 result = hasPriority;
-                 }
               else if (!IsPrimaryDevice())
                  result = true;
 #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
               else
                  result = Priority >= Setup.PrimaryLimit;
+#endif
 #endif
               }
            else
               result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
            }
-        else
-           result = hasPriority;
         }
-     else
-#endif
-        result = hasPriority;
      }
   if (NeedsDetachReceivers)
      *NeedsDetachReceivers = needsDetachReceivers;
@@ -691,11 +686,9 @@ const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
 void cDvbDevice::SetAudioTrackDevice(int Index)
 {
   if (0 <= Index && Index < NumAudioTracksDevice()) {
-     int vpid = pidHandles[ptVideo].pid; // need to turn video PID off/on to restart demux
-     DelPid(vpid);
-     DelPid(pidHandles[ptAudio].pid);
-     AddPid(Index ? aPid2 : aPid1, ptAudio);
-     AddPid(vpid, ptVideo);
+     int Pid = Index ? aPid2 : aPid1;
+     pidHandles[ptAudio].pid = Pid;
+     SetPid(&pidHandles[ptAudio], ptAudio, true);
      }
 }
 
diff --git a/dvbdevice.h b/dvbdevice.h
index d135a2981..335a69436 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.19 2002/12/07 14:44:29 kls Exp $
+ * $Id: dvbdevice.h 1.20 2002/12/15 14:45:29 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -24,15 +24,18 @@
 
 class cDvbTuner;
 
+/// The cDvbDevice implements a DVB device which can be accessed through the Linux DVB driver API.
+
 class cDvbDevice : public cDevice {
   friend class cDvbOsd;
 private:
   static bool Probe(const char *FileName);
-         // Probes for existing DVB devices.
+         ///< Probes for existing DVB devices.
 public:
   static bool Initialize(void);
-         // Initializes the DVB devices.
-         // Must be called before accessing any DVB functions.
+         ///< Initializes the DVB devices.
+         ///< Must be called before accessing any DVB functions.
+         ///< \return True if any devices are available.
 private:
   fe_type_t frontendType;
   int fd_osd, fd_audio, fd_video, fd_dvr;
diff --git a/keys.h b/keys.h
index 02c513ae9..eb4b5b349 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.4 2002/12/01 10:43:26 kls Exp $
+ * $Id: keys.h 1.5 2002/12/14 15:49:42 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -46,6 +46,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kCommands,
              kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9,
              kNone,
+             kKbd,
              // The following codes are used internally:
              k_Plugin,
              k_Setup,
@@ -69,6 +70,10 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 #define NORMALKEY(k)     (eKeys((k) & ~k_Repeat))
 #define ISMODELESSKEY(k) (RAWKEY(k) > k9)
 
+#define BASICKEY(k)      (eKeys((k) & 0xFFFF))
+#define KBDKEY(k)        (eKeys(((k) << 16) | kKbd))
+#define KEYKBD(k)        (((k) >> 16) & 0xFFFF)
+
 struct tKey {
   eKeys type;
   char *name;
diff --git a/libdtv/libsi/Makefile b/libdtv/libsi/Makefile
index 38bff9351..4f278a09c 100644
--- a/libdtv/libsi/Makefile
+++ b/libdtv/libsi/Makefile
@@ -30,8 +30,8 @@
 
 .DELETE_ON_ERROR:
 
-CC = gcc
-CFLAGS = -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
+CC ?= gcc
+CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
          -DNAPI -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -ansi -pedantic 
 
 INCDIRS = -Iinclude -I../include
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
index 8bcab4cb1..0f2ad7219 100644
--- a/libdtv/libvdr/Makefile
+++ b/libdtv/libvdr/Makefile
@@ -27,8 +27,8 @@
 #
 #
 #
-CC = gcc
-CFLAGS = -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
+CC ?= gcc
+CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
          -Wimplicit -D__USE_FIXED_PROTOTYPES__ -I../include # -DDEBUG
 
 
diff --git a/menuitems.c b/menuitems.c
index 97d81ad14..c92d5318c 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.9 2002/09/08 14:51:28 kls Exp $
+ * $Id: menuitems.c 1.11 2002/12/15 11:05:19 kls Exp $
  */
 
 #include "menuitems.h"
@@ -262,7 +262,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
     case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
                  if (pos >= 0) {
                     if (strlen(value) > 1) {
-                       memmove(value + pos, value + pos + 1, strlen(value) - pos);
+                       if (!insert || pos < int(strlen(value)) - 1)
+                          memmove(value + pos, value + pos + 1, strlen(value) - pos);
                        // reduce position, if we removed the last character
                        if (pos == int(strlen(value)))
                           pos--;
@@ -284,7 +285,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     uppercase = isupper(value[pos]);
                  break;
     case kRight|k_Repeat:
-    case kRight: if (pos < length && pos < int(strlen(value)) ) {
+    case kRight: if (pos < length - 2 && pos < int(strlen(value)) ) {
                     if (++pos >= int(strlen(value))) {
                        if (pos >= 2 && value[pos - 1] == ' ' && value[pos - 2] == ' ')
                           pos--; // allow only two blanks at the end
@@ -306,7 +307,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
     case kDown:  if (pos >= 0) {
                     if (insert && newchar) {
                        // create a new character in insert mode
-                       if (int(strlen(value)) < length) {
+                       if (int(strlen(value)) < length - 1) {
                           memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
                           value[pos] = ' ';
                           }
@@ -328,7 +329,44 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     break;
                     }
                  // run into default
-    default:     return cMenuEditItem::ProcessKey(Key);
+    default:     if (pos >= 0 && BASICKEY(Key) == kKbd) {
+                    int c = KEYKBD(Key);
+                    if (c <= 0xFF) {
+                       const char *p = strchr(allowed, tolower(c));
+                       if (p) {
+                          int l = strlen(value);
+                          if (insert && l < length - 1)
+                             memmove(value + pos + 1, value + pos, l - pos + 1);
+                          value[pos] = c;
+                          if (pos < length - 2)
+                             pos++;
+                          if (pos >= l) {
+                             value[pos] = ' ';
+                             value[pos + 1] = 0;
+                             }
+                          }
+                       else {
+                          switch (c) {
+                            case 0x7F: // backspace
+                                       if (pos > 0) {
+                                          pos--;
+                                          return ProcessKey(kYellow);
+                                          }
+                                       break;
+                            }
+                          }
+                       }
+                    else {
+                       switch (c) {
+                         case kfHome: pos = 0; break;
+                         case kfEnd:  pos = strlen(value) - 1; break;
+                         case kfIns:  return ProcessKey(kGreen);
+                         case kfDel:  return ProcessKey(kYellow);
+                         }
+                       }
+                    }
+                 else
+                    return cMenuEditItem::ProcessKey(Key);
     }
   Set();
   return osContinue;
diff --git a/newplugin b/newplugin
index 532157e3e..1f4d5da18 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.13 2002/11/29 15:23:54 kls Exp $
+# $Id: newplugin 1.14 2002/12/13 14:51:46 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -70,8 +70,8 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 
 ### The C++ compiler and options:
 
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/remote.c b/remote.c
index d4f1702b6..29149e9d2 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.34 2002/12/08 13:37:13 kls Exp $
+ * $Id: remote.c 1.36 2002/12/15 15:58:59 kls Exp $
  */
 
 #include "remote.h"
@@ -149,6 +149,40 @@ cRemotes Remotes;
 
 // --- cKbdRemote ------------------------------------------------------------
 
+struct tKbdMap {
+  eKbdFunc func;
+  uint64 code;
+  };
+
+static tKbdMap KbdMap[] = {
+  { kfF1,     0x0000001B5B31317EULL },
+  { kfF2,     0x0000001B5B31327EULL },
+  { kfF3,     0x0000001B5B31337EULL },
+  { kfF4,     0x0000001B5B31347EULL },
+  { kfF5,     0x0000001B5B31357EULL },
+  { kfF6,     0x0000001B5B31377EULL },
+  { kfF7,     0x0000001B5B31387EULL },
+  { kfF8,     0x0000001B5B31397EULL },
+  { kfF9,     0x0000001B5B32307EULL },
+  { kfF10,    0x0000001B5B32317EULL },
+  { kfF11,    0x0000001B5B32327EULL },
+  { kfF12,    0x0000001B5B32337EULL },
+  { kfUp,     0x00000000001B5B41ULL },
+  { kfDown,   0x00000000001B5B42ULL },
+  { kfLeft,   0x00000000001B5B44ULL },
+  { kfRight,  0x00000000001B5B43ULL },
+  { kfHome,   0x00000000001B5B48ULL },
+  { kfEnd,    0x00000000001B5B46ULL },
+  { kfPgUp,   0x000000001B5B357EULL },
+  { kfPgDown, 0x000000001B5B367EULL },
+  { kfIns,    0x000000001B5B327EULL },
+  { kfDel,    0x000000001B5B337EULL },
+  { kfNone,   0x0000000000000000ULL }
+  };
+
+bool cKbdRemote::kbdAvailable = false;
+bool cKbdRemote::rawMode = false;
+
 cKbdRemote::cKbdRemote(void)
 :cRemote("KBD")
 {
@@ -162,16 +196,41 @@ cKbdRemote::cKbdRemote(void)
      tm.c_cc[VTIME] = 0;
      tcsetattr(STDIN_FILENO, TCSANOW, &tm);
      }
+  kbdAvailable = true;
   Start();
 }
 
 cKbdRemote::~cKbdRemote()
 {
+  kbdAvailable = false;
   active = false;
   Cancel(3);
   tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
 }
 
+void cKbdRemote::SetRawMode(bool RawMode)
+{
+  rawMode = RawMode;
+}
+
+uint64 cKbdRemote::MapFuncToCode(int Func)
+{
+  for (tKbdMap *p = KbdMap; p->func != kfNone; p++) {
+      if (p->func == Func)
+         return p->code;
+      }
+  return (Func <= 0xFF) ? Func : 0;
+}
+
+int cKbdRemote::MapCodeToFunc(uint64 Code)
+{
+  for (tKbdMap *p = KbdMap; p->func != kfNone; p++) {
+      if (p->code == Code)
+         return p->func;
+      }
+  return (Code <= 0xFF) ? Code : kfNone;
+}
+
 void cKbdRemote::Action(void)
 {
   dsyslog("KBD remote control thread started (pid=%d)", getpid());
@@ -198,8 +257,13 @@ void cKbdRemote::Action(void)
                     // key (if somebody knows how to clean this up, please let me know):
                     if (Command == 0x1B && time_ms() - t0 < 100)
                        continue;
-                    if (Command)
-                       Put(Command);
+                    if (Command) {
+                       if (rawMode || !Put(Command)) {
+                          int func = MapCodeToFunc(Command);
+                          if (func)
+                             Put(KBDKEY(func));
+                          }
+                       }
                     break;
                     }
                  else {
diff --git a/remote.h b/remote.h
index 1c087d0fa..7908b1db2 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.22 2002/12/08 13:37:02 kls Exp $
+ * $Id: remote.h 1.24 2002/12/15 15:49:06 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -51,14 +51,46 @@ class cRemotes : public cList<cRemote> {};
 
 extern cRemotes Remotes;
 
+enum eKbdFunc {
+  kfNone,
+  kfF1 = 0x100,
+  kfF2,
+  kfF3,
+  kfF4,
+  kfF5,
+  kfF6,
+  kfF7,
+  kfF8,
+  kfF9,
+  kfF10,
+  kfF11,
+  kfF12,
+  kfUp,
+  kfDown,
+  kfLeft,
+  kfRight,
+  kfHome,
+  kfEnd,
+  kfPgUp,
+  kfPgDown,
+  kfIns,
+  kfDel,
+  };
+
 class cKbdRemote : public cRemote, private cThread {
 private:
   bool active;
+  static bool kbdAvailable;
+  static bool rawMode;
   struct termios savedTm;
   virtual void Action(void);
+  int MapCodeToFunc(uint64 Code);
 public:
   cKbdRemote(void);
   virtual ~cKbdRemote();
+  static bool KbdAvailable(void) { return kbdAvailable; }
+  static uint64 MapFuncToCode(int Func);
+  static void SetRawMode(bool RawMode);
   };
 
 #endif //__REMOTE_H
diff --git a/tools.h b/tools.h
index 4e3e28208..a5a626c39 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.53 2002/11/30 12:51:45 kls Exp $
+ * $Id: tools.h 1.54 2002/12/15 14:59:53 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -59,11 +59,11 @@ char *readline(FILE *f);
 char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
-char *strreplace(char *s, const char *s1, const char *s2); // re-allocates 's' and deletes the original string if necessary!
+char *strreplace(char *s, const char *s1, const char *s2); ///< re-allocates 's' and deletes the original string if necessary!
 char *skipspace(const char *s);
 char *stripspace(char *s);
 char *compactspace(char *s);
-const char *strescape(const char *s, const char *chars); // returns a statically allocated string!
+const char *strescape(const char *s, const char *chars); ///< \warning returns a statically allocated string!
 bool startswith(const char *s, const char *p);
 bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
@@ -71,8 +71,8 @@ int numdigits(int n);
 int time_ms(void);
 void delay_ms(int ms);
 bool isnumber(const char *s);
-const char *itoa(int n); // returns a statically allocated string!
-const char *AddDirectory(const char *DirName, const char *FileName); // returns a statically allocated string!
+const char *itoa(int n); ///< \warning returns a statically allocated string!
+const char *AddDirectory(const char *DirName, const char *FileName); ///< \warning returns a statically allocated string!
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
@@ -80,8 +80,8 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
-const char *WeekDayName(int WeekDay); // returns a statically allocated string!
-const char *DayDateTime(time_t t = 0); // returns a statically allocated string!
+const char *WeekDayName(int WeekDay); ///< \warning returns a statically allocated string!
+const char *DayDateTime(time_t t = 0); ///< \warning returns a statically allocated string!
 
 class cPoller {
 private:
diff --git a/transfer.c b/transfer.c
index 6d3ed7807..d8975a922 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.7 2002/11/03 11:24:02 kls Exp $
+ * $Id: transfer.c 1.8 2002/12/14 13:14:53 kls Exp $
  */
 
 #include "transfer.h"
@@ -109,6 +109,8 @@ void cTransfer::Action(void)
                  memmove(b, b + Count, r);
               }
            }
+        else
+           usleep(1); // this keeps the CPU load low
         }
 
   dsyslog("transfer thread ended (pid=%d)", getpid());
diff --git a/vdr.c b/vdr.c
index 8f22f11b4..bec513382 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.137 2002/12/08 13:34:39 kls Exp $
+ * $Id: vdr.c 1.139 2002/12/13 16:01:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
   // Save terminal settings:
 
   struct termios savedTm;
-  tcgetattr(STDIN_FILENO, &savedTm);
+  bool HasStdin = tcgetpgrp(STDIN_FILENO) == getpid() && tcgetattr(STDIN_FILENO, &savedTm) == 0;
 
   // Initiate locale:
 
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
   new cLircRemote("/dev/lircd");
 #endif
 #if defined(REMOTE_KBD)
-  if (!DaemonMode)
+  if (!DaemonMode && HasStdin)
      new cKbdRemote;
 #endif
   Interface->LearnKeys();
@@ -424,6 +424,7 @@ int main(int argc, char *argv[])
   time_t LastActivity = 0;
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
+  bool UserShutdown = false;
 
   if (WatchdogTimeout > 0) {
      dsyslog("setting watchdog timer to %d seconds", WatchdogTimeout);
@@ -539,6 +540,7 @@ int main(int argc, char *argv[])
                              ForceShutdown = true;
                           }
                        LastActivity = 1; // not 0, see below!
+                       UserShutdown = true;
                        break;
           default: break;
           }
@@ -647,7 +649,7 @@ int main(int argc, char *argv[])
                  Interface->Info(tr("Editing process finished"));
               }
            }
-        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection()) || ForceShutdown)) {
+        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
@@ -665,12 +667,13 @@ int main(int argc, char *argv[])
                     else
                        LastActivity = 1;
                     }
-                 bool UserShutdown = key == kPower;
                  if (UserShutdown && Next && Delta <= Setup.MinEventTimeout * 60 && !ForceShutdown) {
                     char *buf;
                     asprintf(&buf, tr("Recording in %d minutes, shut down anyway?"), Delta / 60);
                     if (Interface->Confirm(buf))
                        ForceShutdown = true;
+                    else
+                       UserShutdown = false;
                     free(buf);
                     }
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
@@ -694,6 +697,7 @@ int main(int argc, char *argv[])
                           signal(SIGALRM, SIG_IGN);
                        }
                     LastActivity = time(NULL); // don't try again too soon
+                    UserShutdown = false;
                     continue; // skip the rest of the housekeeping for now
                     }
                  }
@@ -724,7 +728,8 @@ int main(int argc, char *argv[])
   isyslog("exiting");
   if (SysLogLevel > 0)
      closelog();
-  tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
+  if (HasStdin)
+     tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
   if (cThread::EmergencyExit()) {
      esyslog("emergency exit!");
      return 1;

From 3e1d34f392792bbcf1bda4884c58ca9cec445d1d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 10 Jan 2003 18:00:00 +0100
Subject: [PATCH 062/307] Version 1.1.21 - Fixed the 'channels.conf' entries
 for "Studio Universal" and "Disney Channel". - Fixed handling channels in the
 "Channels" menu in case there are ':@nnn' group   separators without names
 (thanks to Guy Roussin for reporting this one). - The SVDRP command CHAN now
 also accepts channel IDs. - Increased the timeout until an index file is
 considerd no longer to be written   (sometimes in time shift with heavy
 system load the index file was closed too   early by the replay thread). -
 Implemented "Link Layer" based CAM support, which hopefully will solve the  
 problems with CAMs we had in the past. To use this you need the driver
 version   2002-01-08 or higher (with the new firmware supporting the "Link
 Layer" protocol). - Added an EPG bugfix that moves the Subtitle data to the
 Extended Description in   case the latter is empty and the Subtitle exceeds
 some useful length. - Since several channels put very long strings into the
 Subtitle part of their   EPG data, that string is now limited in length when
 used in a recording's   file name.

---
 CONTRIBUTORS                 |    2 +
 HISTORY                      |   18 +
 Makefile                     |    4 +-
 channels.conf                |    4 +-
 ci.c                         | 1449 ++++++++++++++++++++++++++++++++++
 ci.h                         |  105 +++
 config.h                     |    4 +-
 device.c                     |    4 +-
 device.h                     |   10 +-
 dvbdevice.c                  |   48 +-
 eit.c                        |  195 ++++-
 eit.h                        |   16 +-
 i18n.c                       |   82 +-
 libdtv/libsi/include/libsi.h |   23 +
 libdtv/libsi/si_parser.c     |    7 +-
 menu.c                       |  202 ++++-
 menu.h                       |   27 +-
 recorder.c                   |    4 +-
 recording.c                  |   14 +-
 svdrp.c                      |   26 +-
 vdr.c                        |    5 +-
 21 files changed, 2196 insertions(+), 53 deletions(-)
 create mode 100644 ci.c
 create mode 100644 ci.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 86ca1e709..1454c7d49 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -494,6 +494,8 @@ Andreas Kool <akool@akool.de>
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
+ for reporting a bug in handling channels in the "Channels" menu in case there are
+ ':@nnn' group separators without names
 
 Georg Hitsch <georg@hitsch.at>
  for his help in keeping 'channels.conf' up to date
diff --git a/HISTORY b/HISTORY
index 1b76bf49a..e92eff1cc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1898,3 +1898,21 @@ Video Disk Recorder Revision History
   for providing an initial 'Doxyfile' configuration and adjusting some comments).
   See INSTALL for information how to do this. Some function descriptions have
   already been adapted to Doxygen, more will follow.
+
+2003-01-10: Version 1.1.21
+
+- Fixed the 'channels.conf' entries for "Studio Universal" and "Disney Channel".
+- Fixed handling channels in the "Channels" menu in case there are ':@nnn' group
+  separators without names (thanks to Guy Roussin for reporting this one).
+- The SVDRP command CHAN now also accepts channel IDs.
+- Increased the timeout until an index file is considerd no longer to be written
+  (sometimes in time shift with heavy system load the index file was closed too
+  early by the replay thread).
+- Implemented "Link Layer" based CAM support, which hopefully will solve the
+  problems with CAMs we had in the past. To use this you need the driver version
+  2002-01-08 or higher (with the new firmware supporting the "Link Layer" protocol).
+- Added an EPG bugfix that moves the Subtitle data to the Extended Description in
+  case the latter is empty and the Subtitle exceeds some useful length.
+- Since several channels put very long strings into the Subtitle part of their
+  EPG data, that string is now limited in length when used in a recording's
+  file name.
diff --git a/Makefile b/Makefile
index d1e17a7df..efeed0de3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.55 2002/12/15 15:15:55 kls Exp $
+# $Id: Makefile 1.56 2003/01/06 12:28:09 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -32,7 +32,7 @@ INCLUDES = -I$(DVBDIR)/include
 
 DTVLIB   = $(DTVDIR)/libdtv.a
 
-OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
+OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
        dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\
diff --git a/channels.conf b/channels.conf
index f6b273cc7..f01251e42 100644
--- a/channels.conf
+++ b/channels.conf
@@ -54,9 +54,9 @@ Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29:0:0:0
 Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
 Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
 13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
-Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36:0:0:0
+Studio Universal:11758:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
 Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
-Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34:0:0:0
+Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
 Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
 Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14:0:0:0
 Planet:12090:v:S19.2E:27500:1279:1280:0:101:13:0:0:0
diff --git a/ci.c b/ci.c
new file mode 100644
index 000000000..d3812d665
--- /dev/null
+++ b/ci.c
@@ -0,0 +1,1449 @@
+/*
+ * ci.c: Common Interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: ci.c 1.1 2003/01/06 13:56:17 kls Exp $
+ */
+
+/* XXX TODO
+- handle slots separately
+- use return values
+- update CA descriptors in case they change
+- dynamically react on CAM insert/remove
+- implement CAM reset (per slot)
+- implement a CA enquiry menu with actual user input
+XXX*/
+
+#include "ci.h"
+#include <ctype.h>
+#include <linux/dvb/ca.h>
+#include <malloc.h>
+#include <netinet/in.h>
+#include <poll.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <time.h>
+#include <unistd.h>
+#include "tools.h"
+
+/* these might come in handy in case you want to use this code without VDR's other files:
+#ifndef MALLOC
+#define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
+#endif
+
+#ifndef esyslog
+static int SysLogLevel = 3;
+#define esyslog(a...) void( (SysLogLevel > 0) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
+#endif
+*/
+
+// Set these to 'true' for debug output:
+static bool DumpTPDUDataTransfer = false;
+static bool DebugProtocol = false;
+
+#define dbgprotocol(a...) if (DebugProtocol) printf(a)
+
+#define OK       0
+#define TIMEOUT -1
+#define ERROR   -2
+
+// --- Workarounds -----------------------------------------------------------
+
+// The Irdeto AllCAM 4.7 (and maybe others, too) does not react on AOT_ENTER_MENU
+// during the first few seconds of a newly established connection
+#define WRKRND_TIME_BEFORE_ENTER_MENU  15 // seconds
+
+// --- Helper functions ------------------------------------------------------
+
+#define SIZE_INDICATOR 0x80
+
+static const uint8_t *GetLength(const uint8_t *Data, int &Length)
+///< Gets the length field from the beginning of Data.
+///< \return Returns a pointer to the first byte after the length and
+///< stores the length value in Length.
+{
+  Length = *Data++;
+  if ((Length & SIZE_INDICATOR) != 0) {
+     int l = Length & ~SIZE_INDICATOR;
+     Length = 0;
+     for (int i = 0; i < l; i++)
+         Length = (Length << 8) | *Data++;
+     }
+  return Data;
+}
+
+static uint8_t *SetLength(uint8_t *Data, int Length)
+///< Sets the length field at the beginning of Data.
+///< \return Returns a pointer to the first byte after the length.
+{
+  uint8_t *p = Data;
+  if (Length < 128)
+     *p++ = Length;
+  else {
+     int n = sizeof(Length);
+     for (int i = n - 1; i >= 0; i--) {
+         int b = (Length >> (8 * i)) & 0xFF;
+         if (p != Data || b)
+            *++p = b;
+         }
+     *Data = (p - Data) | SIZE_INDICATOR;
+     p++;
+     }
+  return p;
+}
+
+static char *CopyString(int Length, const uint8_t *Data)
+///< Copies the string at Data.
+///< \return Returns a pointer to a newly allocated string.
+{
+  char *s = MALLOC(char, Length + 1);
+  strncpy(s, (char *)Data, Length);
+  s[Length] = 0;
+  return s;
+}
+
+static char *GetString(int &Length, const uint8_t **Data)
+///< Gets the string at Data.
+///< \return Returns a pointer to a newly allocated string, or NULL in case of error.
+///< Upon return Length and Data represent the remaining data after the string has been skipped.
+{
+  if (Length > 0 && Data && *Data) {
+     int l = 0;
+     const uint8_t *d = GetLength(*Data, l);
+     char *s = CopyString(l, d);
+     Length -= d - *Data + l;
+     *Data = d + l;
+     return s;
+     }
+  return NULL;
+}
+
+// --- cTPDU -----------------------------------------------------------------
+
+#define MAX_TPDU_SIZE  2048
+#define MAX_TPDU_DATA  (MAX_TPDU_SIZE - 4)
+
+#define DATA_INDICATOR 0x80
+
+#define T_SB           0x80
+#define T_RCV          0x81
+#define T_CREATE_TC    0x82
+#define T_CTC_REPLY    0x83
+#define T_DELETE_TC    0x84
+#define T_DTC_REPLY    0x85
+#define T_REQUEST_TC   0x86
+#define T_NEW_TC       0x87
+#define T_TC_ERROR     0x88
+#define T_DATA_LAST    0xA0
+#define T_DATA_MORE    0xA1
+
+class cTPDU {
+private:
+  int size;
+  uint8_t data[MAX_TPDU_SIZE];
+  const uint8_t *GetData(const uint8_t *Data, int &Length);
+public:
+  cTPDU(void) { size = 0; }
+  cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
+  uint8_t Slot(void) { return data[0]; }
+  uint8_t Tcid(void) { return data[1]; }
+  uint8_t Tag(void)  { return data[2]; }
+  const uint8_t *Data(int &Length) { return GetData(data + 3, Length); }
+  uint8_t Status(void);
+  int Write(int fd);
+  int Read(int fd);
+  void Dump(bool Outgoing);
+  };
+
+cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t *Data)
+{
+  size = 0;
+  data[0] = Slot;
+  data[1] = Tcid;
+  data[2] = Tag;
+  switch (Tag) {
+    case T_RCV:
+    case T_CREATE_TC:
+    case T_CTC_REPLY:
+    case T_DELETE_TC:
+    case T_DTC_REPLY:
+    case T_REQUEST_TC:
+         data[3] = 1; // length
+         data[4] = Tcid;
+         size = 5;
+         break;
+    case T_NEW_TC:
+    case T_TC_ERROR:
+         if (Length == 1) {
+            data[3] = 2; // length
+            data[4] = Tcid;
+            data[5] = Data[0];
+            size = 6;
+            }
+         else
+            esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+         break;
+    case T_DATA_LAST:
+    case T_DATA_MORE:
+         if (Length <= MAX_TPDU_DATA) {
+            uint8_t *p = data + 3;
+            p = SetLength(p, Length + 1);
+            *p++ = Tcid;
+            if (Length)
+               memcpy(p, Data, Length);
+            size = Length + (p - data);
+            }
+         else
+            esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+         break;
+    default:
+         esyslog("ERROR: unknown TPDU tag: 0x%02X", Tag);
+    }
+ }
+
+int cTPDU::Write(int fd)
+{
+  Dump(true);
+  if (size)
+     return write(fd, data, size) == size ? OK : ERROR;
+  esyslog("ERROR: attemp to write TPDU with zero size");
+  return ERROR;
+}
+
+int cTPDU::Read(int fd)
+{
+  size = read(fd, data, sizeof(data));
+  if (size < 0) {
+     esyslog("ERROR: %m");
+     size = 0;
+     return ERROR;
+     }
+  Dump(false);
+  return OK;
+}
+
+void cTPDU::Dump(bool Outgoing)
+{
+  if (DumpTPDUDataTransfer) {
+#define MAX_DUMP 256
+     printf("%s ", Outgoing ? "-->" : "<--");
+     for (int i = 0; i < size && i < MAX_DUMP; i++)
+         printf("%02X ", data[i]);
+     printf("%s\n", size >= MAX_DUMP ? "..." : "");
+     if (!Outgoing) {
+        printf("   ");
+        for (int i = 0; i < size && i < MAX_DUMP; i++)
+            printf("%2c ", isprint(data[i]) ? data[i] : '.');
+        printf("%s\n", size >= MAX_DUMP ? "..." : "");
+        }
+     }
+}
+
+const uint8_t *cTPDU::GetData(const uint8_t *Data, int &Length)
+{
+  if (size) {
+     Data = GetLength(Data, Length);
+     if (Length) {
+        Length--; // the first byte is always the tcid
+        return Data + 1;
+        }
+     }
+  return NULL;
+}
+
+uint8_t cTPDU::Status(void)
+{
+  if (size >= 4 && data[size - 4] == T_SB && data[size - 3] == 2) {
+     //XXX test tcid???
+     return data[size - 1];
+     }
+  return 0;
+}
+
+// --- cCiTransportConnection ------------------------------------------------
+
+enum eState { stIDLE, stCREATION, stACTIVE, stDELETION };
+
+class cCiTransportConnection {
+  friend class cCiTransportLayer;
+private:
+  int fd;
+  uint8_t slot;
+  uint8_t tcid;
+  eState state;
+  cTPDU *tpdu;
+  int lastResponse;
+  bool dataAvailable;
+  void Init(int Fd, uint8_t Slot, uint8_t Tcid);
+  int SendTPDU(uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
+  int RecvTPDU(void);
+  int CreateConnection(void);
+  int Poll(void);
+  eState State(void) { return state; }
+  int LastResponse(void) { return lastResponse; }
+  bool DataAvailable(void) { return dataAvailable; }
+public:
+  cCiTransportConnection(void);
+  ~cCiTransportConnection();
+  int SendData(int Length, const uint8_t *Data);
+  int RecvData(void);
+  const uint8_t *Data(int &Length);
+  //XXX Close()
+  };
+
+cCiTransportConnection::cCiTransportConnection(void)
+{
+  tpdu = NULL;
+  Init(-1, 0, 0);
+}
+
+cCiTransportConnection::~cCiTransportConnection()
+{
+  delete tpdu;
+}
+
+void cCiTransportConnection::Init(int Fd, uint8_t Slot, uint8_t Tcid)
+{
+  fd = Fd;
+  slot = Slot;
+  tcid = Tcid;
+  state = stIDLE;
+  if (fd >= 0 && !tpdu)
+     tpdu = new cTPDU;
+  lastResponse = ERROR;
+  dataAvailable = false;
+//XXX Clear()???
+}
+
+int cCiTransportConnection::SendTPDU(uint8_t Tag, int Length, const uint8_t *Data)
+{
+  cTPDU TPDU(slot, tcid, Tag, Length, Data);
+  return TPDU.Write(fd);
+}
+
+int cCiTransportConnection::RecvTPDU(void)
+{
+  //XXX poll, timeout???
+  struct pollfd pfd[1];
+  pfd[0].fd = fd;
+  pfd[0].events = POLLIN;
+  if (poll(pfd, 1, 3500/*XXX*/) && (pfd[0].revents & POLLIN))//XXX
+  if (tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
+     switch (state) {
+       case stIDLE:     break;
+       case stCREATION: if (tpdu->Tag() == T_CTC_REPLY) {
+                           dataAvailable = tpdu->Status() & DATA_INDICATOR;
+                           state = stACTIVE;
+                           return tpdu->Tag();
+                           }
+                        break;
+       case stACTIVE:   switch (tpdu->Tag()) {
+                          case T_SB:
+                          case T_DATA_LAST:
+                          case T_DATA_MORE:
+                          case T_REQUEST_TC: break;
+                          case T_DELETE_TC:  if (SendTPDU(T_DTC_REPLY) != OK)
+                                                return ERROR;
+                                             Init(fd, slot, tcid);
+                                             break;
+                          default: return ERROR;
+                          }
+                        dataAvailable = tpdu->Status() & DATA_INDICATOR;
+                        return tpdu->Tag();
+                        break;
+       case stDELETION: if (tpdu->Tag() == T_DTC_REPLY) {
+                           Init(fd, slot, tcid);
+                           //XXX Status()???
+                           return tpdu->Tag();
+                           }
+                        break;
+       }
+     }
+  return ERROR;
+}
+
+int cCiTransportConnection::SendData(int Length, const uint8_t *Data)
+{
+  while (state == stACTIVE && Length > 0) {
+        uint8_t Tag = T_DATA_LAST;
+        int l = Length;
+        if (l > MAX_TPDU_DATA) {
+           Tag = T_DATA_MORE;
+           l = MAX_TPDU_DATA;
+           }
+        if (SendTPDU(Tag, l, Data) != OK || RecvTPDU() != T_SB)
+           break;
+        Length -= l;
+        Data += l;
+        }
+  return Length ? ERROR : OK;
+}
+
+int cCiTransportConnection::RecvData(void)
+{
+  if (SendTPDU(T_RCV) == OK) {
+     if (RecvTPDU() == OK) {
+        //XXX
+        }
+     }
+  return ERROR;
+}
+
+const uint8_t *cCiTransportConnection::Data(int &Length)
+{
+  return tpdu->Data(Length);
+}
+
+int cCiTransportConnection::CreateConnection(void)
+{
+  if (state == stIDLE) {
+     if (SendTPDU(T_CREATE_TC) == OK) {
+        state = stCREATION;
+        return OK;
+        }
+     }
+  return ERROR;
+}
+
+int cCiTransportConnection::Poll(void)
+{
+  if (state == stACTIVE) {
+     if (SendTPDU(T_DATA_LAST) == OK) {
+        return lastResponse = RecvTPDU();
+        }
+     }
+  return ERROR;
+}
+
+// --- cCiTransportLayer -----------------------------------------------------
+
+#define MAX_CI_CONNECT  16 // maximum possible value is 254
+
+class cCiTransportLayer {
+private:
+  int fd;
+  int numSlots;
+  cCiTransportConnection tc[MAX_CI_CONNECT];
+  bool ResetSlot(int Slot);
+public:
+  cCiTransportLayer(int Fd, int NumSlots);
+  cCiTransportConnection *NewConnection(void);
+  int Process(void);
+  };
+
+cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
+{
+  fd = Fd;
+  numSlots = NumSlots;
+  for (int s = 0; s < numSlots; s++)
+      ResetSlot(s);
+  for (int i = 0; i < MAX_CI_CONNECT; i++)
+      tc[i].Init(fd, 0/*XXX*/, i + 1);
+}
+
+cCiTransportConnection *cCiTransportLayer::NewConnection(void)
+{
+  for (int i = 0; i < MAX_CI_CONNECT; i++) {
+      if (tc[i].State() == stIDLE) {
+         if (tc[i].CreateConnection() == OK) {
+            if (tc[i].RecvTPDU() == T_CTC_REPLY)
+               return &tc[i];
+            }
+         break;
+         }
+      }
+  return NULL;
+}
+
+#define CA_RESET_TIMEOUT  2 // seconds
+
+bool cCiTransportLayer::ResetSlot(int Slot)
+{
+  ca_slot_info_t sinfo;
+  sinfo.num = Slot;
+  ioctl(fd, CA_RESET, Slot);
+  time_t t0 = time(NULL);
+  do {
+     ioctl(fd, CA_GET_SLOT_INFO, &sinfo);
+     if ((sinfo.flags & CA_CI_MODULE_READY) != 0)
+        return true;
+     } while (time(NULL) - t0 < CA_RESET_TIMEOUT);
+  return false;
+}
+
+int cCiTransportLayer::Process(void)
+{
+  for (int i = 0; i < MAX_CI_CONNECT; i++) {
+      cCiTransportConnection *Tc = &tc[i];
+      if (Tc->State() == stACTIVE) {
+         if (!Tc->DataAvailable()) {
+            if (Tc->Poll() != OK)
+               ;//XXX continue;
+            }
+         switch (Tc->LastResponse()) {
+           case T_REQUEST_TC:
+                //XXX
+                break;
+           case T_DATA_MORE:
+           case T_DATA_LAST:
+           case T_CTC_REPLY:
+           case T_SB:
+                if (Tc->DataAvailable())
+                   Tc->RecvData();
+                break;
+           case TIMEOUT:
+           case ERROR:
+           default:
+                //XXX Tc->state = stIDLE;//XXX Init()???
+                break;
+           }
+         }
+      }
+  return OK;
+}
+
+// -- cCiSession -------------------------------------------------------------
+
+// Session Tags:
+
+#define ST_SESSION_NUMBER           0x90
+#define ST_OPEN_SESSION_REQUEST     0x91
+#define ST_OPEN_SESSION_RESPONSE    0x92
+#define ST_CREATE_SESSION           0x93
+#define ST_CREATE_SESSION_RESPONSE  0x94
+#define ST_CLOSE_SESSION_REQUEST    0x95
+#define ST_CLOSE_SESSION_RESPONSE   0x96
+
+// Session Status:
+
+#define SS_OK             0x00
+#define SS_NOT_ALLOCATED  0xF0
+
+// Resource Identifiers:
+
+#define RI_RESOURCE_MANAGER            0x00010041
+#define RI_APPLICATION_INFORMATION     0x00020041
+#define RI_CONDITIONAL_ACCESS_SUPPORT  0x00030041
+#define RI_HOST_CONTROL                0x00200041
+#define RI_DATE_TIME                   0x00240041
+#define RI_MMI                         0x00400041
+
+// Application Object Tags:
+
+#define AOT_NONE                    0x000000
+#define AOT_PROFILE_ENQ             0x9F8010
+#define AOT_PROFILE                 0x9F8011
+#define AOT_PROFILE_CHANGE          0x9F8012
+#define AOT_APPLICATION_INFO_ENQ    0x9F8020
+#define AOT_APPLICATION_INFO        0x9F8021
+#define AOT_ENTER_MENU              0x9F8022
+#define AOT_CA_INFO_ENQ             0x9F8030
+#define AOT_CA_INFO                 0x9F8031
+#define AOT_CA_PMT                  0x9F8032
+#define AOT_CA_PMT_REPLY            0x9F8033
+#define AOT_TUNE                    0x9F8400
+#define AOT_REPLACE                 0x9F8401
+#define AOT_CLEAR_REPLACE           0x9F8402
+#define AOT_ASK_RELEASE             0x9F8403
+#define AOT_DATE_TIME_ENQ           0x9F8440
+#define AOT_DATE_TIME               0x9F8441
+#define AOT_CLOSE_MMI               0x9F8800
+#define AOT_DISPLAY_CONTROL         0x9F8801
+#define AOT_DISPLAY_REPLY           0x9F8802
+#define AOT_TEXT_LAST               0x9F8803
+#define AOT_TEXT_MORE               0x9F8804
+#define AOT_KEYPAD_CONTROL          0x9F8805
+#define AOT_KEYPRESS                0x9F8806
+#define AOT_ENQ                     0x9F8807
+#define AOT_ANSW                    0x9F8808
+#define AOT_MENU_LAST               0x9F8809
+#define AOT_MENU_MORE               0x9F880A
+#define AOT_MENU_ANSW               0x9F880B
+#define AOT_LIST_LAST               0x9F880C
+#define AOT_LIST_MORE               0x9F880D
+#define AOT_SUBTITLE_SEGMENT_LAST   0x9F880E
+#define AOT_SUBTITLE_SEGMENT_MORE   0x9F880F
+#define AOT_DISPLAY_MESSAGE         0x9F8810
+#define AOT_SCENE_END_MARK          0x9F8811
+#define AOT_SCENE_DONE              0x9F8812
+#define AOT_SCENE_CONTROL           0x9F8813
+#define AOT_SUBTITLE_DOWNLOAD_LAST  0x9F8814
+#define AOT_SUBTITLE_DOWNLOAD_MORE  0x9F8815
+#define AOT_FLUSH_DOWNLOAD          0x9F8816
+#define AOT_DOWNLOAD_REPLY          0x9F8817
+#define AOT_COMMS_CMD               0x9F8C00
+#define AOT_CONNECTION_DESCRIPTOR   0x9F8C01
+#define AOT_COMMS_REPLY             0x9F8C02
+#define AOT_COMMS_SEND_LAST         0x9F8C03
+#define AOT_COMMS_SEND_MORE         0x9F8C04
+#define AOT_COMMS_RCV_LAST          0x9F8C05
+#define AOT_COMMS_RCV_MORE          0x9F8C06
+
+class cCiSession {
+private:
+  int sessionId;
+  int resourceId;
+  cCiTransportConnection *tc;
+protected:
+  int GetTag(int &Length, const uint8_t **Data);
+  const uint8_t *GetData(const uint8_t *Data, int &Length);
+  int SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
+public:
+  cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc);
+  virtual ~cCiSession();
+  int SessionId(void) { return sessionId; }
+  int ResourceId(void) { return resourceId; }
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiSession::cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc)
+{
+  sessionId = SessionId;
+  resourceId = ResourceId;
+  tc = Tc;
+}
+
+cCiSession::~cCiSession()
+{
+}
+
+int cCiSession::GetTag(int &Length, const uint8_t **Data)
+///< Gets the tag at Data.
+///< \return Returns the actual tag, or AOT_NONE in case of error.
+///< Upon return Length and Data represent the remaining data after the tag has been skipped.
+{
+  if (Length >= 3 && Data && *Data) {
+     int t = 0;
+     for (int i = 0; i < 3; i++)
+         t = (t << 8) | *(*Data)++;
+     Length -= 3;
+     return t;
+     }
+  return AOT_NONE;
+}
+
+const uint8_t *cCiSession::GetData(const uint8_t *Data, int &Length)
+{
+  Data = GetLength(Data, Length);
+  return Length ? Data : NULL;
+}
+
+int cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
+{
+  uint8_t buffer[2048];
+  uint8_t *p = buffer;
+  *p++ = ST_SESSION_NUMBER;
+  *p++ = 0x02;
+  *p++ = (sessionId >> 8) & 0xFF;
+  *p++ =  sessionId       & 0xFF;
+  *p++ = (Tag >> 16) & 0xFF;
+  *p++ = (Tag >>  8) & 0xFF;
+  *p++ =  Tag        & 0xFF;
+  p = SetLength(p, Length);
+  if (p - buffer + Length < sizeof(buffer)) {
+     memcpy(p, Data, Length);
+     p += Length;
+     return tc->SendData(p - buffer, buffer);
+     }
+  esyslog("ERROR: CAM: data length (%d) exceeds buffer size", Length);
+  return ERROR;
+}
+
+bool cCiSession::Process(int Length, const uint8_t *Data)
+{
+  return true;
+}
+
+// -- cCiResourceManager -----------------------------------------------------
+
+class cCiResourceManager : public cCiSession {
+private:
+  int state;
+public:
+  cCiResourceManager(int SessionId, cCiTransportConnection *Tc);
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiResourceManager::cCiResourceManager(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_RESOURCE_MANAGER, Tc)
+{
+  dbgprotocol("New Resource Manager (session id %d)\n", SessionId);
+  state = 0;
+}
+
+bool cCiResourceManager::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_PROFILE_ENQ: {
+            dbgprotocol("%d: <== Profile Enquiry\n", SessionId());
+            int resources[] = { htonl(RI_RESOURCE_MANAGER),
+                                htonl(RI_APPLICATION_INFORMATION),
+                                htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
+                                htonl(RI_DATE_TIME),
+                                htonl(RI_MMI)
+                              };
+            dbgprotocol("%d: ==> Profile\n", SessionId());
+            SendData(AOT_PROFILE, sizeof(resources), (uint8_t*)resources);
+            state = 3;
+            }
+            break;
+       case AOT_PROFILE: {
+            dbgprotocol("%d: <== Profile\n", SessionId());
+            if (state == 1) {
+               int l = 0;
+               const uint8_t *d = GetData(Data, l);
+               if (l > 0 && d)
+                  esyslog("CI resource manager: unexpected data");
+               dbgprotocol("%d: ==> Profile Change\n", SessionId());
+               SendData(AOT_PROFILE_CHANGE);
+               state = 2;
+               }
+            else {
+               esyslog("ERROR: CI resource manager: unexpected tag %06X in state %d", Tag, state);
+               }
+            }
+            break;
+       default: esyslog("ERROR: CI resource manager: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (state == 0) {
+     dbgprotocol("%d: ==> Profile Enq\n", SessionId());
+     SendData(AOT_PROFILE_ENQ);
+     state = 1;
+     }
+  return true;
+}
+
+// --- cCiApplicationInformation ---------------------------------------------
+
+class cCiApplicationInformation : public cCiSession {
+private:
+  int state;
+  time_t creationTime;
+  uint8_t applicationType;
+  uint16_t applicationManufacturer;
+  uint16_t manufacturerCode;
+  char *menuString;
+public:
+  cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc);
+  virtual ~cCiApplicationInformation();
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  bool EnterMenu(void);
+  };
+
+cCiApplicationInformation::cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
+{
+  dbgprotocol("New Aplication Information (session id %d)\n", SessionId);
+  state = 0;
+  creationTime = time(NULL);
+  menuString = NULL;
+}
+
+cCiApplicationInformation::~cCiApplicationInformation()
+{
+  free(menuString);
+}
+
+bool cCiApplicationInformation::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_APPLICATION_INFO: {
+            dbgprotocol("%d: <== Application Info\n", SessionId());
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if ((l -= 1) < 0) break;
+            applicationType = *d++;
+            if ((l -= 2) < 0) break;
+            applicationManufacturer = ntohs(*(uint16_t *)d);
+            d += 2;
+            if ((l -= 2) < 0) break;
+            manufacturerCode = ntohs(*(uint16_t *)d);
+            d += 2;
+            free(menuString);
+            menuString = GetString(l, &d);
+            isyslog("CAM: %s, %02X, %04X, %04X", menuString, applicationType, applicationManufacturer, manufacturerCode);//XXX make externally accessible!
+            }
+            state = 2;
+            break;
+       default: esyslog("ERROR: CI application information: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (state == 0) {
+     dbgprotocol("%d: ==> Application Info Enq\n", SessionId());
+     SendData(AOT_APPLICATION_INFO_ENQ);
+     state = 1;
+     }
+  return true;
+}
+
+bool cCiApplicationInformation::EnterMenu(void)
+{
+  if (state == 2 && time(NULL) - creationTime > WRKRND_TIME_BEFORE_ENTER_MENU) {
+     dbgprotocol("%d: ==> Enter Menu\n", SessionId());
+     SendData(AOT_ENTER_MENU);
+     return true;//XXX
+     }
+  return false;
+}
+
+// --- cCiConditionalAccessSupport -------------------------------------------
+
+class cCiConditionalAccessSupport : public cCiSession {
+private:
+  int state;
+public:
+  cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc);
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  bool SendPMT(cCiCaPmt &CaPmt);
+  };
+
+cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_CONDITIONAL_ACCESS_SUPPORT, Tc)
+{
+  dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
+  state = 0;
+}
+
+bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
+{
+  if (state == 0) {
+     dbgprotocol("%d: ==> Ca Info Enq\n", SessionId());
+     SendData(AOT_CA_INFO_ENQ);
+     state = 1;
+     }
+  return true;
+}
+
+bool cCiConditionalAccessSupport::SendPMT(cCiCaPmt &CaPmt)
+{
+  if (state == 1) {
+     SendData(AOT_CA_PMT, CaPmt.length, CaPmt.capmt);
+     return true;
+     }
+  return false;
+}
+
+// --- cCiDateTime -----------------------------------------------------------
+
+class cCiDateTime : public cCiSession {
+private:
+  int interval;
+  time_t lastTime;
+  bool SendDateTime(void);
+public:
+  cCiDateTime(int SessionId, cCiTransportConnection *Tc);
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiDateTime::cCiDateTime(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_DATE_TIME, Tc)
+{
+  interval = 0;
+  lastTime = 0;
+  dbgprotocol("New Date Time (session id %d)\n", SessionId);
+}
+
+bool cCiDateTime::SendDateTime(void)
+{
+  time_t t = time(NULL);
+  struct tm tm_gmt;
+  struct tm tm_loc;
+  if (gmtime_r(&t, &tm_gmt) && localtime_r(&t, &tm_loc)) {
+     int Y = tm_gmt.tm_year;
+     int M = tm_gmt.tm_mon + 1;
+     int D = tm_gmt.tm_mday;
+     int L = (M == 1 || M == 2) ? 1 : 0;
+     int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
+#define DEC2BCD(d) (((d / 10) << 4) + (d % 10))
+     struct tTime { unsigned short mjd; uint8_t h, m, s; short offset; };
+     tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : htons(tm_loc.tm_gmtoff / 60) };
+     dbgprotocol("%d: ==> Date Time\n", SessionId());
+     SendData(AOT_DATE_TIME, 7, (uint8_t*)&T);
+     //XXX return value of all SendData() calls???
+     return true;
+     }
+  return false;
+}
+
+bool cCiDateTime::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_DATE_TIME_ENQ: {
+            interval = 0;
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0)
+               interval = *d;
+            dbgprotocol("%d: <== Date Time Enq, interval = %d\n", SessionId(), interval);
+            lastTime = time(NULL);
+            return SendDateTime();
+            }
+            break;
+       default: esyslog("ERROR: CI date time: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (interval && time(NULL) - lastTime > interval) {
+     lastTime = time(NULL);
+     return SendDateTime();
+     }
+  return true;
+}
+
+// --- cCiMMI ----------------------------------------------------------------
+
+// Display Control Commands:
+
+#define DCC_SET_MMI_MODE                          0x01
+#define DCC_DISPLAY_CHARACTER_TABLE_LIST          0x02
+#define DCC_INPUT_CHARACTER_TABLE_LIST            0x03
+#define DCC_OVERLAY_GRAPHICS_CHARACTERISTICS      0x04
+#define DCC_FULL_SCREEN_GRAPHICS_CHARACTERISTICS  0x05
+
+// MMI Modes:
+
+#define MM_HIGH_LEVEL                      0x01
+#define MM_LOW_LEVEL_OVERLAY_GRAPHICS      0x02
+#define MM_LOW_LEVEL_FULL_SCREEN_GRAPHICS  0x03
+
+// Display Reply IDs:
+
+#define DRI_MMI_MODE_ACK                              0x01
+#define DRI_LIST_DISPLAY_CHARACTER_TABLES             0x02
+#define DRI_LIST_INPUT_CHARACTER_TABLES               0x03
+#define DRI_LIST_GRAPHIC_OVERLAY_CHARACTERISTICS      0x04
+#define DRI_LIST_FULL_SCREEN_GRAPHIC_CHARACTERISTICS  0x05
+#define DRI_UNKNOWN_DISPLAY_CONTROL_CMD               0xF0
+#define DRI_UNKNOWN_MMI_MODE                          0xF1
+#define DRI_UNKNOWN_CHARACTER_TABLE                   0xF2
+
+// Enquiry Flags:
+
+#define EF_BLIND  0x01
+
+// Answer IDs:
+
+#define AI_CANCEL  0x00
+#define AI_ANSWER  0x01
+
+class cCiMMI : public cCiSession {
+private:
+  char *GetText(int &Length, const uint8_t **Data);
+  cCiMenu *menu;
+  cCiEnquiry *enquiry;
+public:
+  cCiMMI(int SessionId, cCiTransportConnection *Tc);
+  virtual ~cCiMMI();
+  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  cCiMenu *Menu(void);
+  cCiEnquiry *Enquiry(void);
+  bool SendMenuAnswer(uint8_t Selection);
+  bool SendAnswer(const char *Text);
+  };
+
+cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc)
+:cCiSession(SessionId, RI_MMI, Tc)
+{
+  dbgprotocol("New MMI (session id %d)\n", SessionId);
+  menu = NULL;
+  enquiry = NULL;
+}
+
+cCiMMI::~cCiMMI()
+{
+  delete menu;
+  delete enquiry;
+}
+
+char *cCiMMI::GetText(int &Length, const uint8_t **Data)
+///< Gets the text at Data.
+///< \return Returns a pointer to a newly allocated string, or NULL in case of error.
+///< Upon return Length and Data represent the remaining data after the text has been skipped.
+{
+  int Tag = GetTag(Length, Data);
+  if (Tag == AOT_TEXT_LAST) {
+     char *s = GetString(Length, Data);
+     dbgprotocol("%d: <== Text Last '%s'\n", SessionId(), s);
+     return s;
+     }
+  else
+     esyslog("CI MMI: unexpected text tag: %06X", Tag);
+  return NULL;
+}
+
+bool cCiMMI::Process(int Length, const uint8_t *Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_DISPLAY_CONTROL: {
+            dbgprotocol("%d: <== Display Control\n", SessionId());
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               switch (*d) {
+                 case DCC_SET_MMI_MODE:
+                      if (l == 2 && *++d == MM_HIGH_LEVEL) {
+                         struct tDisplayReply { uint8_t id; uint8_t mode; };
+                         tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
+                         dbgprotocol("%d: ==> Display Reply\n", SessionId());
+                         SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);
+                         }
+                      break;
+                 default: esyslog("CI MMI: unsupported display control command %02X", *d);
+                          return false;
+                 }
+               }
+            }
+            break;
+       case AOT_LIST_LAST:
+       case AOT_MENU_LAST: {
+            dbgprotocol("%d: <== Menu Last\n", SessionId());
+            delete menu;
+            menu = new cCiMenu(this, Tag == AOT_MENU_LAST);
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               // since the specification allows choiceNb to be undefined it is useless, so let's just skip it:
+               d++;
+               l--;
+               if (l > 0) menu->titleText = GetText(l, &d);
+               if (l > 0) menu->subTitleText = GetText(l, &d);
+               if (l > 0) menu->bottomText = GetText(l, &d);
+               while (l > 0) {
+                     char *s = GetText(l, &d);
+                     if (s) {
+                        if (!menu->AddEntry(s))
+                           free(s);
+                        }
+                     else
+                        break;
+                     }
+               }
+            }
+            break;
+       case AOT_ENQ: {
+            dbgprotocol("%d: <== Enq\n", SessionId());
+            delete enquiry;
+            enquiry = new cCiEnquiry(this);
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               uint8_t blind = *d++;
+               //XXX GetByte()???
+               l--;
+               enquiry->blind = blind & EF_BLIND;
+               enquiry->expectedLength = *d++;
+               l--;
+               // I really wonder why there is no text length field here...
+               enquiry->text = CopyString(l, d);
+               }
+            }
+            break;
+       default: esyslog("ERROR: CI MMI: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  return true;
+}
+
+cCiMenu *cCiMMI::Menu(void)
+{
+  cCiMenu *m = menu;
+  menu = NULL;
+  return m;
+}
+
+cCiEnquiry *cCiMMI::Enquiry(void)
+{
+  cCiEnquiry *e = enquiry;
+  enquiry = NULL;
+  return e;
+}
+
+bool cCiMMI::SendMenuAnswer(uint8_t Selection)
+{
+  dbgprotocol("%d: ==> Menu Answ\n", SessionId());
+  SendData(AOT_MENU_ANSW, 1, &Selection);
+  //XXX return value of all SendData() calls???
+  return true;
+}
+
+bool cCiMMI::SendAnswer(const char *Text)
+{
+  dbgprotocol("%d: ==> Answ\n", SessionId());
+  struct tAnswer { uint8_t id; char text[256]; };//XXX
+  tAnswer answer;
+  answer.id = Text ? AI_ANSWER : AI_CANCEL;
+  if (Text)
+     strncpy(answer.text, Text, sizeof(answer.text));
+  SendData(AOT_ANSW, Text ? strlen(Text) + 1 : 1, (uint8_t *)&answer);
+  //XXX return value of all SendData() calls???
+  return true;
+}
+
+// --- cCiMenu ---------------------------------------------------------------
+
+cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable)
+{
+  mmi = MMI;
+  selectable = Selectable;
+  titleText = subTitleText = bottomText = NULL;
+  numEntries = 0;
+}
+
+cCiMenu::~cCiMenu()
+{
+  free(titleText);
+  free(subTitleText);
+  free(bottomText);
+  for (int i = 0; i < numEntries; i++)
+      free(entries[i]);
+}
+
+bool cCiMenu::AddEntry(char *s)
+{
+  if (numEntries < MAX_CIMENU_ENTRIES) {
+     entries[numEntries++] = s;
+     return true;
+     }
+  return false;
+}
+
+bool cCiMenu::Select(int Index)
+{
+  if (mmi && -1 <= Index && Index < numEntries)
+     return mmi->SendMenuAnswer(Index + 1);
+  return false;
+}
+
+bool cCiMenu::Cancel(void)
+{
+  return Select(-1);
+}
+
+// --- cCiEnquiry ------------------------------------------------------------
+
+cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
+{
+  mmi = MMI;
+  text = NULL;
+  blind = false;;
+  expectedLength = 0;;
+}
+
+cCiEnquiry::~cCiEnquiry()
+{
+  free(text);
+}
+
+bool cCiEnquiry::Reply(const char *s)
+{
+  return mmi ? mmi->SendAnswer(s) : false;
+}
+
+bool cCiEnquiry::Cancel(void)
+{
+  return Reply(NULL);
+}
+
+// --- cCiCaPmt --------------------------------------------------------------
+
+// Ca Pmt List Management:
+
+#define CPLM_MORE    0x00
+#define CPLM_FIRST   0x01
+#define CPLM_LAST    0x02
+#define CPLM_ONLY    0x03
+#define CPLM_ADD     0x04
+#define CPLM_UPDATE  0x05
+
+// Ca Pmt Cmd Ids:
+
+#define CPCI_OK_DESCRAMBLING  0x01
+#define CPCI_OK_MMI           0x02
+#define CPCI_QUERY            0x03
+#define CPCI_NOT_SELECTED     0x04
+
+cCiCaPmt::cCiCaPmt(int ProgramNumber)
+{
+  length = 0;
+  capmt[length++] = CPLM_ONLY;
+  capmt[length++] = (ProgramNumber >> 8) & 0xFF;
+  capmt[length++] =  ProgramNumber       & 0xFF;
+  capmt[length++] = 0x00; //XXX version_number, current_next_indicator - apparently may be 0x00
+  capmt[length++] = 0x00; //XXX program_info_length H (at program level)
+  capmt[length++] = 0x00; //XXX program_info_length L
+  esInfoLengthPos = 0;
+}
+
+void cCiCaPmt::AddPid(int Pid)
+{
+  capmt[length++] = 0x00; //XXX stream_type (apparently doesn't matter)
+  capmt[length++] = (Pid >> 8) & 0xFF;
+  capmt[length++] =  Pid       & 0xFF;
+  esInfoLengthPos = length;
+}
+
+void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
+{
+  if (esInfoLengthPos) {
+     if (esInfoLengthPos == length) {
+        length += 2;
+        capmt[length++] = CPCI_OK_DESCRAMBLING;
+        }
+     if (length + Length < int(sizeof(capmt))) {
+        memcpy(capmt + length, Data, Length);
+        length += Length;
+        int l = length - esInfoLengthPos - 2;
+        capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
+        capmt[esInfoLengthPos + 1] =  l       & 0xFF;
+        }
+     else
+        esyslog("ERROR: buffer overflow in CA descriptor");
+     }
+  else
+     esyslog("ERROR: adding CA descriptor without Pid!");
+}
+
+// -- cCiHandler -------------------------------------------------------------
+
+cCiHandler::cCiHandler(int Fd, int NumSlots)
+{
+  numSlots = NumSlots;
+  for (int i = 0; i < MAX_CI_SESSION; i++)
+      sessions[i] = NULL;
+  tpl = new cCiTransportLayer(Fd, numSlots);
+  tc = tpl->NewConnection();
+  if (!tc)
+     isyslog("CAM: no CAM detected");
+}
+
+cCiHandler::~cCiHandler()
+{
+  for (int i = 0; i < MAX_CI_SESSION; i++)
+      delete sessions[i];
+  delete tpl;
+}
+
+cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
+{
+  int fd_ca = open(FileName, O_RDWR);
+  if (fd_ca >= 0) {
+     ca_caps_t Caps;
+     if (ioctl(fd_ca, CA_GET_CAP, &Caps) == 0) {
+        int NumSlots = Caps.slot_num;
+        if (NumSlots > 0) {
+           dsyslog("CAM: found %d CAM slots", NumSlots);
+           if (Caps.slot_type == CA_CI_LINK) {
+              cCiHandler *CiHandler = new cCiHandler(fd_ca, NumSlots);
+              // drive the initial data exchange:
+              for (int i = 0; i < 20; i++) //XXX make this dynamic???
+                  CiHandler->Process();
+              return CiHandler;
+              }
+           else
+              esyslog("ERROR: CAM doesn't support link layer interface");
+           }
+        esyslog("ERROR: no CAM slots found");
+        }
+     else
+        LOG_ERROR_STR(FileName);
+     }
+  return NULL;
+}
+
+int cCiHandler::ResourceIdToInt(const uint8_t *Data)
+{
+  return (ntohl(*(int *)Data));
+}
+
+bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
+{
+  uint8_t buffer[16];
+  uint8_t *p = buffer;
+  *p++ = Tag;
+  *p++ = 0x00; // will contain length
+  if (Status >= 0)
+     *p++ = Status;
+  if (ResourceId) {
+     *(int *)p = htonl(ResourceId);
+     p += 4;
+     }
+  *(short *)p = htons(SessionId);
+  p += 2;
+  buffer[1] = p - buffer - 2; // length
+  return tc->SendData(p - buffer, buffer) == OK;
+}
+
+cCiSession *cCiHandler::GetSessionBySessionId(int SessionId)
+{
+  for (int i = 0; i < MAX_CI_SESSION; i++) {
+      if (sessions[i] && sessions[i]->SessionId() == SessionId)
+         return sessions[i];
+      }
+  return NULL;
+}
+
+cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId)
+{
+  for (int i = 0; i < MAX_CI_SESSION; i++) {
+      if (sessions[i] && sessions[i]->ResourceId() == ResourceId)
+         return sessions[i];
+      }
+  return NULL;
+}
+
+cCiSession *cCiHandler::CreateSession(int ResourceId)
+{
+  if (!GetSessionByResourceId(ResourceId)) {
+     for (int i = 0; i < MAX_CI_SESSION; i++) {
+         if (!sessions[i]) {
+            switch (ResourceId) {
+              case RI_RESOURCE_MANAGER:           return sessions[i] = new cCiResourceManager(i + 1, tc);
+              case RI_APPLICATION_INFORMATION:    return sessions[i] = new cCiApplicationInformation(i + 1, tc);
+              case RI_CONDITIONAL_ACCESS_SUPPORT: return sessions[i] = new cCiConditionalAccessSupport(i + 1, tc);
+              case RI_HOST_CONTROL:               break; //XXX
+              case RI_DATE_TIME:                  return sessions[i] = new cCiDateTime(i + 1, tc);
+              case RI_MMI:                        return sessions[i] = new cCiMMI(i + 1, tc);
+              }
+            }
+         }
+     }
+  return NULL;
+}
+
+bool cCiHandler::OpenSession(int Length, const uint8_t *Data)
+{
+  if (Length == 6 && *(Data + 1) == 0x04) {
+     int ResourceId = ResourceIdToInt(Data + 2);
+     dbgprotocol("OpenSession %08X\n", ResourceId);
+     switch (ResourceId) {
+       case RI_RESOURCE_MANAGER:
+       case RI_APPLICATION_INFORMATION:
+       case RI_CONDITIONAL_ACCESS_SUPPORT:
+       case RI_HOST_CONTROL:
+       case RI_DATE_TIME:
+       case RI_MMI:
+            {
+              cCiSession *Session = CreateSession(ResourceId);
+              if (Session) {
+                 Send(ST_OPEN_SESSION_RESPONSE, Session->SessionId(), Session->ResourceId(), SS_OK);
+                 return true;
+                 }
+              esyslog("ERROR: can't create session for resource identifier: %08X", ResourceId);
+            }
+       default: esyslog("ERROR: unknown resource identifier: %08X", ResourceId);
+       }
+     }
+  return false;
+}
+
+bool cCiHandler::CloseSession(int SessionId)
+{
+  dbgprotocol("CloseSession %08X\n", SessionId);
+  cCiSession *Session = GetSessionBySessionId(SessionId);
+  if (Session && sessions[SessionId - 1] == Session) {
+     delete Session;
+     sessions[SessionId - 1] = NULL;
+     Send(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_OK);
+     return true;
+     }
+  else {
+     esyslog("ERROR: unknown session id: %d", SessionId);
+     Send(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_NOT_ALLOCATED);
+     }
+  return false;
+}
+
+bool cCiHandler::Process(void)
+{
+  if (tc) {
+     cMutexLock MutexLock(&mutex);
+     if (tpl->Process() == OK) {
+        int Length;
+        const uint8_t *Data = tc->Data(Length);
+        if (Data && Length > 1) {
+           switch (*Data) {
+             case ST_SESSION_NUMBER:          if (Length > 4) {
+                                                 int SessionId = ntohs(*(short *)&Data[2]);
+                                                 cCiSession *Session = GetSessionBySessionId(SessionId);
+                                                 if (Session)
+                                                    return Session->Process(Length - 4, Data + 4);
+                                                 else {
+                                                    esyslog("ERROR: unknown session id: %d", SessionId);
+                                                    return false;
+                                                    }
+                                                 }
+                                              break;
+             case ST_OPEN_SESSION_REQUEST:    return OpenSession(Length, Data);
+             case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
+                                                 return CloseSession(ntohs(*(short *)&Data[2]));
+                                              break;
+             case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
+             case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
+             default: esyslog("ERROR: unknown session tag: %02X", *Data);
+                      return false;
+             }
+           return true;
+           }
+        for (int i = 0; i < MAX_CI_SESSION; i++) {
+            if (sessions[i])
+               sessions[i]->Process();//XXX retval???
+            }
+        }
+     }
+  return false;
+}
+
+bool cCiHandler::EnterMenu(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiApplicationInformation *api = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION);
+  return api ? api->EnterMenu() : false;
+}
+
+cCiMenu *cCiHandler::GetMenu(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
+  return mmi ? mmi->Menu() : NULL;
+}
+
+cCiEnquiry *cCiHandler::GetEnquiry(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
+  return mmi ? mmi->Enquiry() : NULL;
+}
+
+bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  return cas ? cas->SendPMT(CaPmt) : false;
+}
+
+bool cCiHandler::Reset(void)
+{
+  cMutexLock MutexLock(&mutex);
+  //XXX slots???
+  return false;//XXX not yet implemented
+}
diff --git a/ci.h b/ci.h
new file mode 100644
index 000000000..c9cd6f54e
--- /dev/null
+++ b/ci.h
@@ -0,0 +1,105 @@
+/*
+ * ci.h: Common Interface
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: ci.h 1.1 2003/01/06 12:31:09 kls Exp $
+ */
+
+#ifndef __CI_H
+#define __CI_H
+
+#include <stdint.h>
+#include <stdio.h>
+#include "thread.h"
+
+class cCiMMI;
+
+class cCiMenu {
+  friend class cCiMMI;
+private:
+  enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum?
+  cCiMMI *mmi;
+  bool selectable;
+  char *titleText;
+  char *subTitleText;
+  char *bottomText;
+  char *entries[MAX_CIMENU_ENTRIES];
+  int numEntries;
+  bool AddEntry(char *s);
+  cCiMenu(cCiMMI *MMI, bool Selectable);
+public:
+  ~cCiMenu();
+  const char *TitleText(void) { return titleText; }
+  const char *SubTitleText(void) { return subTitleText; }
+  const char *BottomText(void) { return bottomText; }
+  const char *Entry(int n) { return n < numEntries ? entries[n] : NULL; }
+  int NumEntries(void) { return numEntries; }
+  bool Selectable(void) { return selectable; }
+  bool Select(int Index);
+  bool Cancel(void);
+  };
+
+class cCiEnquiry {
+  friend class cCiMMI;
+private:
+  cCiMMI *mmi;
+  char *text;
+  bool blind;
+  int expectedLength;
+  cCiEnquiry(cCiMMI *MMI);
+public:
+  ~cCiEnquiry();
+  const char *Text(void) { return text; }
+  bool Blind(void) { return blind; }
+  int ExpectedLength(void) { return expectedLength; }
+  bool Reply(const char *s);
+  bool Cancel(void);
+  };
+
+class cCiCaPmt {
+  friend class cCiConditionalAccessSupport;
+private:
+  int length;
+  int esInfoLengthPos;
+  uint8_t capmt[2048]; ///< XXX is there a specified maximum?
+public:
+  cCiCaPmt(int ProgramNumber);
+  void AddPid(int Pid);
+  void AddCaDescriptor(int Length, uint8_t *Data);
+  };
+
+#define MAX_CI_SESSION  16 //XXX
+
+class cCiSession;
+class cCiTransportLayer;
+class cCiTransportConnection;
+
+class cCiHandler {
+private:
+  cMutex mutex;
+  int numSlots;
+  cCiSession *sessions[MAX_CI_SESSION];
+  cCiTransportLayer *tpl;
+  cCiTransportConnection *tc;
+  int ResourceIdToInt(const uint8_t *Data);
+  bool Send(uint8_t Tag, int SessionId, int ResourceId = 0, int Status = -1);
+  cCiSession *GetSessionBySessionId(int SessionId);
+  cCiSession *GetSessionByResourceId(int ResourceId);
+  cCiSession *CreateSession(int ResourceId);
+  bool OpenSession(int Length, const uint8_t *Data);
+  bool CloseSession(int SessionId);
+  cCiHandler(int Fd, int NumSlots);
+public:
+  ~cCiHandler();
+  static cCiHandler *CreateCiHandler(const char *FileName);
+  bool Process(void);
+  bool EnterMenu(void);
+  cCiMenu *GetMenu(void);
+  cCiEnquiry *GetEnquiry(void);
+  bool SetCaPmt(cCiCaPmt &CaPmt);
+  bool Reset(void);
+  };
+
+#endif //__CI_H
diff --git a/config.h b/config.h
index d09729e7a..7cf7d917f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.144 2002/12/13 13:41:55 kls Exp $
+ * $Id: config.h 1.145 2002/12/22 15:29:45 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.20"
+#define VDRVERSION "1.1.21"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index edbf5cae8..15628cd36 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.35 2002/11/10 10:17:57 kls Exp $
+ * $Id: device.c 1.36 2003/01/03 15:41:14 kls Exp $
  */
 
 #include "device.h"
@@ -47,6 +47,7 @@ cDevice::cDevice(void)
   mute = false;
   volume = Setup.CurrentVolume;
 
+  ciHandler = NULL;
   player = NULL;
 
   playerDetached = false;
@@ -67,6 +68,7 @@ cDevice::~cDevice()
   Detach(player);
   for (int i = 0; i < MAXRECEIVERS; i++)
       Detach(receiver[i]);
+  delete ciHandler;
 }
 
 void cDevice::SetUseDevice(int n)
diff --git a/device.h b/device.h
index f18699c46..ad876ba86 100644
--- a/device.h
+++ b/device.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.28 2002/12/15 14:40:11 kls Exp $
+ * $Id: device.h 1.29 2003/01/03 15:43:48 kls Exp $
  */
 
 #ifndef __DEVICE_H
 #define __DEVICE_H
 
+#include "ci.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -211,6 +212,13 @@ class cDevice : public cThread {
          ///< Type indicates some special types of PIDs, which the device may
          ///< need to set in a specific way.
 
+// Common Interface facilities:
+
+protected:
+  cCiHandler *ciHandler;
+public:
+  cCiHandler *CiHandler(void) { return ciHandler; }
+
 // Image Grab facilities
 
 public:
diff --git a/dvbdevice.c b/dvbdevice.c
index adc900b6e..2e12f260e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.40 2002/12/14 10:52:13 kls Exp $
+ * $Id: dvbdevice.c 1.41 2003/01/06 14:44:27 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -43,6 +43,7 @@ extern "C" {
 #define DEV_DVB_DEMUX     "demux"
 #define DEV_DVB_VIDEO     "video"
 #define DEV_DVB_AUDIO     "audio"
+#define DEV_DVB_CA        "ca"
 
 static const char *DvbName(const char *Name, int n)
 {
@@ -68,30 +69,34 @@ class cDvbTuner : public cThread {
   int fd_frontend;
   int cardIndex;
   fe_type_t frontendType;
+  cCiHandler *ciHandler;
   cChannel channel;
   const char *diseqcCommands;
   bool active;
   eTunerStatus tunerStatus;
+  bool caSet;
   cMutex mutex;
   cCondVar newSet;
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
+  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
-  void Set(const cChannel *Channel);
+  void Set(const cChannel *Channel, bool Tune);
   bool Locked(void) { return tunerStatus == tsLocked; }
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
   frontendType = FrontendType;
+  ciHandler = CiHandler;
   diseqcCommands = NULL;
   active = false;
   tunerStatus = tsIdle;
+  caSet = false;
   Start();
 }
 
@@ -108,11 +113,13 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Frequency() == Channel->Frequency();
 }
 
-void cDvbTuner::Set(const cChannel *Channel)
+void cDvbTuner::Set(const cChannel *Channel, bool Tune)
 {
   cMutexLock MutexLock(&mutex);
   channel = *Channel;
-  tunerStatus = tsSet;
+  if (Tune)
+     tunerStatus = tsSet;
+  caSet = false;
   newSet.Broadcast();
 }
 
@@ -251,6 +258,30 @@ void cDvbTuner::Action(void)
               continue;
               }
            }
+        if (ciHandler && !caSet) {//XXX TODO update in case the CA descriptors have changed
+           uchar buffer[2048];
+           int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
+           if (length > 0) {
+              cCiCaPmt CaPmt(channel.Sid());
+              if (channel.Vpid()) {
+                 CaPmt.AddPid(channel.Vpid());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              if (channel.Apid1()) {
+                 CaPmt.AddPid(channel.Apid1());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              if (channel.Apid2()) {
+                 CaPmt.AddPid(channel.Apid2());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              if (channel.Dpid1()) {
+                 CaPmt.AddPid(channel.Dpid1());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 }
+              caSet = ciHandler->SetCaPmt(CaPmt);
+              }
+           }
         newSet.TimedWait(mutex, 1000);
         }
   dsyslog("tuner thread ended on device %d (pid=%d)", cardIndex + 1, getpid());
@@ -291,7 +322,8 @@ cDvbDevice::cDvbDevice(int n)
      siProcessor = new cSIProcessor(DvbName(DEV_DVB_DEMUX, n));
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
         frontendType = feinfo.type;
-        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
+        ciHandler = cCiHandler::CreateCiHandler(DvbName(DEV_DVB_CA, n));
+        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType, ciHandler);
         }
      else
         LOG_ERROR;
@@ -616,8 +648,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      DelPid(pidHandles[ptDolby].pid);
      }
 
+  dvbTuner->Set(Channel, DoTune);
   if (DoTune) {
-     dvbTuner->Set(Channel);
      /*XXX do we still need this???
      if (!(status & FE_HAS_LOCK)) {
         esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->Number(), CardIndex() + 1);
diff --git a/eit.c b/eit.c
index dd51f0cf9..e2e0fe72f 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.61 2002/11/24 14:37:38 kls Exp $
+ * $Id: eit.c 1.63 2003/01/06 15:05:46 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -399,8 +399,8 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 6
-#define MAXEPGBUGFIXCHANS 50
+#define MAXEPGBUGFIXSTATS 7
+#define MAXEPGBUGFIXCHANS 100
 struct tEpgBugFixStats {
   int hits;
   int n;
@@ -597,6 +597,20 @@ void cEventInfo::FixEpgBugs(void)
               }
         }
 
+#define MAX_USEFUL_SUBTITLE_LENGTH 40
+     // Some channels put a whole lot of information in the Subtitle and leave
+     // the Extended Description totally empty. So if the Subtitle length exceeds
+     // MAX_USEFUL_SUBTITLE_LENGTH, let's put this into the Extended Description
+     // instead:
+     if (!isempty(pSubtitle) && isempty(pExtendedDescription)) {
+        if (strlen(pSubtitle) > MAX_USEFUL_SUBTITLE_LENGTH) {
+           free(pExtendedDescription);
+           pExtendedDescription = pSubtitle;
+           pSubtitle = NULL;
+           EpgBugFixStat(5, GetChannelID());
+           }
+        }
+
      // Some channels use the ` ("backtick") character, where a ' (single quote)
      // would be normally used. Actually, "backticks" in normal text don't make
      // much sense, so let's replace them:
@@ -985,6 +999,68 @@ bool cEIT::IsPresentFollowing()
    return false;
 }
 
+// --- cCaDescriptor ---------------------------------------------------------
+
+class cCaDescriptor : public cListObject {
+  friend class cCaDescriptors;
+private:
+  int source;
+  int transponder;
+  int serviceId;
+  int caSystem;
+  int length;
+  uchar *data;
+public:
+  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int Length, uchar *Data);
+  virtual ~cCaDescriptor();
+  int Length(void) const { return length; }
+  const uchar *Data(void) const { return data; }
+  };
+
+cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int Length, uchar *Data)
+{
+  source = Source;
+  transponder = Transponder;
+  serviceId = ServiceId;
+  caSystem = CaSystem;
+  length = Length;
+  data = MALLOC(uchar, length);
+  memcpy(data, Data, length);
+  /*//XXX just while debugging...
+  char buffer[1024];
+  char *q = buffer;
+  q += sprintf(q, "CAM: %04X %5d %4d", source, transponder, serviceId);
+  for (int i = 0; i < length; i++)
+      q += sprintf(q, " %02X", data[i]);
+  dsyslog(buffer);
+  *///XXX
+}
+
+cCaDescriptor::~cCaDescriptor()
+{
+  free(data);
+}
+
+// --- cCaDescriptors --------------------------------------------------------
+
+class cCaDescriptors : public cList<cCaDescriptor> {
+public:
+  const cCaDescriptor *Get(int Source, int Transponder, int ServiceId, int CaSystem);
+  };
+
+const cCaDescriptor *cCaDescriptors::Get(int Source, int Transponder, int ServiceId, int CaSystem)
+{
+  for (cCaDescriptor *ca = First(); ca; ca = Next(ca)) {
+      if (ca->source == Source && ca->transponder == Transponder && ca->serviceId == ServiceId) {
+         if (CaSystem == -1 || ca->caSystem == CaSystem)
+            return ca;
+         if (CaSystem < 0)
+            CaSystem++;
+         }
+      }
+  return NULL;
+}
+
 // --- cSIProcessor ----------------------------------------------------------
 
 #define MAX_FILTERS 20
@@ -993,6 +1069,8 @@ bool cEIT::IsPresentFollowing()
 int cSIProcessor::numSIProcessors = 0;
 cSchedules *cSIProcessor::schedules = NULL;
 cMutex cSIProcessor::schedulesMutex;
+cCaDescriptors *cSIProcessor::caDescriptors = NULL;
+cMutex cSIProcessor::caDescriptorsMutex;
 const char *cSIProcessor::epgDataFileName = EPGDATAFILENAME;
 time_t cSIProcessor::lastDump = time(NULL);
 
@@ -1003,9 +1081,13 @@ cSIProcessor::cSIProcessor(const char *FileName)
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
    currentSource = 0;
    currentTransponder = 0;
+   pmtIndex = 0;
+   pmtPid = 0;
    filters = NULL;
-   if (!numSIProcessors++) // the first one creates it
+   if (!numSIProcessors++) { // the first one creates them
       schedules = new cSchedules;
+      caDescriptors = new cCaDescriptors;
+      }
    filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
    SetStatus(true);
    Start();
@@ -1019,8 +1101,10 @@ cSIProcessor::~cSIProcessor()
    Cancel(3);
    ShutDownFilters();
    free(filters);
-   if (!--numSIProcessors) // the last one deletes it
+   if (!--numSIProcessors) { // the last one deletes them
       delete schedules;
+      delete caDescriptors;
+      }
    free(fileName);
 }
 
@@ -1075,9 +1159,13 @@ const char *cSIProcessor::GetEpgDataFileName(void)
 
 void cSIProcessor::SetStatus(bool On)
 {
+   LOCK_THREAD;
    ShutDownFilters();
+   pmtIndex = 0;
+   pmtPid = 0;
    if (On)
    {
+      AddFilter(0x00, 0x00);  // PAT
       AddFilter(0x14, 0x70);  // TDT
       AddFilter(0x14, 0x73);  // TOT
       AddFilter(0x12, 0x4e);  // event info, actual TS, present/following
@@ -1089,6 +1177,8 @@ void cSIProcessor::SetStatus(bool On)
    }
 }
 
+#define PMT_SCAN_TIMEOUT  10 // seconds
+
 /** use the vbi device to parse all relevant SI
 information and let the classes corresponding
 to the tables write their information to the disk */
@@ -1097,6 +1187,7 @@ void cSIProcessor::Action()
    dsyslog("EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 
    time_t lastCleanup = time(NULL);
+   time_t lastPmtScan = time(NULL);
 
    active = true;
 
@@ -1162,6 +1253,37 @@ void cSIProcessor::Action()
                      //dsyslog("Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
                      switch (pid)
                      {
+                        case 0x00:
+                           if (buf[0] == 0x00)
+                           {
+                              LOCK_THREAD;
+                              if (pmtPid && time(NULL) - lastPmtScan > PMT_SCAN_TIMEOUT) {
+                                 DelFilter(pmtPid, 0x02);
+                                 pmtPid = 0;
+                                 pmtIndex++;
+                                 lastPmtScan = time(NULL);
+                                 }
+                              if (!pmtPid) {
+                                 cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
+                                 struct LIST *pat = siParsePAT(buf);
+                                 if (pat) {
+                                    int Index = 0;
+                                    for (struct Program *prg = (struct Program *)pat->Head; prg; prg = (struct Program *)xSucc(prg)) {
+                                        if (prg->ProgramID) {
+                                           if (Index++ == pmtIndex) {
+                                              pmtPid = prg->NetworkPID;
+                                              AddFilter(pmtPid, 0x02);
+                                              break;
+                                              }
+                                           }
+                                        }
+                                    if (!pmtPid)
+                                       pmtIndex = 0;
+                                    }
+                                 xMemFreeAll(NULL);
+                                 }
+                           }
+                           break;
                         case 0x14:
                            if (buf[0] == 0x70)
                            {
@@ -1188,7 +1310,28 @@ void cSIProcessor::Action()
                               dsyslog("Received stuffing section in EIT\n");
                            break;
 
-                        default:
+                        default: {
+                           LOCK_THREAD;
+                           if (pid == pmtPid && buf[0] == 0x02 && currentSource && currentTransponder) {
+                              cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
+                              struct Pid *pi = siParsePMT(buf);
+                              if (pi) {
+                                 for (struct LIST *d = (struct LIST *)pi->Descriptors; d; d = (struct LIST *)xSucc(d)) {
+                                     if (DescriptorTag(d) == DESCR_CA) {
+                                        uchar *Data = ((ConditionalAccessDescriptor *)d)->Data;
+                                        int CaSystem = (Data[2] << 8) | Data[3];
+                                        if (!caDescriptors->Get(currentSource, currentTransponder, pi->ProgramID, CaSystem)) {
+                                           cMutexLock MutexLock(&caDescriptorsMutex);
+                                           caDescriptors->Add(new cCaDescriptor(currentSource, currentTransponder, pi->ProgramID, CaSystem, ((ConditionalAccessDescriptor *)d)->Amount, Data));
+                                           }
+                                        //XXX update???
+                                        }
+                                     }
+                                 }
+                              xMemFreeAll(NULL);
+                              lastPmtScan = 0; // this triggers the next scan
+                              }
+                           }
                            break;
                      }
                   }
@@ -1229,7 +1372,7 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
                filters[a].inuse = true;
             else
             {
-               esyslog("ERROR: can't set filter");
+               esyslog("ERROR: can't set filter (pid=%d, tid=%02X)", pid, tid);
                close(filters[a].handle);
                return false;
             }
@@ -1248,6 +1391,21 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
    return false;
 }
 
+bool cSIProcessor::DelFilter(u_char pid, u_char tid)
+{
+   for (int a = 0; a < MAX_FILTERS; a++)
+   {
+      if (filters[a].inuse && filters[a].pid == pid && filters[a].tid == tid)
+      {
+         close(filters[a].handle);
+         // dsyslog("Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
+         filters[a].inuse = false;
+         return true;
+      }
+   }
+   return false;
+}
+
 /**  */
 bool cSIProcessor::ShutDownFilters(void)
 {
@@ -1283,3 +1441,26 @@ void cSIProcessor::TriggerDump(void)
   cMutexLock MutexLock(&schedulesMutex);
   lastDump = 0;
 }
+
+int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data)
+{
+  if (BufSize > 0 && Data) {
+     cMutexLock MutexLock(&caDescriptorsMutex);
+     int length = 0;
+     for (int i = -1; ; i--) {
+         const cCaDescriptor *d = caDescriptors->Get(Source, Transponder, ServiceId, i);
+         if (d) {
+            if (length + d->Length() <= BufSize) {
+               memcpy(Data + length, d->Data(), d->Length());
+               length += d->Length();
+               }
+            else
+               return -1;
+            }
+         else
+            break;
+         }
+     return length;
+     }
+  return -1;
+}
diff --git a/eit.h b/eit.h
index 36c0a3e88..ec203eae8 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.22 2002/11/24 12:45:55 kls Exp $
+ * $Id: eit.h 1.23 2003/01/04 10:12:54 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -134,21 +134,29 @@ typedef struct sip_filter {
 
 }SIP_FILTER;
 
+class cCaDescriptor;
+class cCaDescriptors;
+
 class cSIProcessor : public cThread {
 private:
   static int numSIProcessors;
   static cSchedules *schedules;
   static cMutex schedulesMutex;
+  static cCaDescriptors *caDescriptors;
+  static cMutex caDescriptorsMutex;
   static const char *epgDataFileName;
   static time_t lastDump;
   bool masterSIProcessor;
   int currentSource;
   int currentTransponder;
+  int pmtIndex;
+  int pmtPid;
   SIP_FILTER *filters;
   char *fileName;
   bool active;
   void Action(void);
   bool AddFilter(u_char pid, u_char tid);
+  bool DelFilter(u_char pid, u_char tid);
   bool ShutDownFilters(void);
 public:
   cSIProcessor(const char *FileName);
@@ -159,6 +167,12 @@ class cSIProcessor : public cThread {
          // Caller must provide a cMutexLock which has to survive the entire
          // time the returned cSchedules is accessed. Once the cSchedules is no
          // longer used, the cMutexLock must be destroyed.
+  static int GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data);
+         ///< Gets all CA descriptors for a given channel.
+         ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
+         ///< into the provided buffer at Data (at most BufSize bytes).
+         ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
+         ///< available), or -1 if BufSize was too small to hold all CA descriptors.
   static bool Read(FILE *f = NULL);
   static void Clear(void);
   void SetStatus(bool On);
diff --git a/i18n.c b/i18n.c
index 79fa60793..aafe0c155 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.100 2002/11/10 12:32:30 kls Exp $
+ * $Id: i18n.c 1.101 2003/01/06 12:16:28 kls Exp $
  *
  * Translations provided by:
  *
@@ -664,6 +664,38 @@ const tI18nPhrase Phrases[] = {
     "Suprascrie",
     "�t�rni",
   },
+  { "Menu",
+    "Men�",
+    "Meni",
+    "Menu",
+    "Menu",
+    "Menu",
+    "Menu",
+    "Meny",
+    "Valikko",
+    "Menu",
+    "Menu",
+    "Menou",
+    "Meny",
+    "Meniu",
+    "Men�",
+  },
+  { "Reset",
+    "Reset",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   // Confirmations:
   { "Delete channel?",
     "Kanal l�schen?",
@@ -1580,6 +1612,54 @@ const tI18nPhrase Phrases[] = {
     "Spatiu scazut pe disc!",
     "A merev lemez majdnem tele!",
   },
+  { "Can't open CAM menu!",
+    "CAM-Men� kann nicht ge�ffnet werden!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "Can't reset CAM!",
+    "CAM-Reset fehlgeschlagen!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "CAM has been reset",
+    "CAM wurde zur�ckgesetzt!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   // Setup pages:
   { "OSD",
     "OSD",
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index 366387a3f..8e9e26051 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -315,6 +315,29 @@ struct Descriptor {
 };
 
 
+/* ConditionalAccessDescriptor */
+
+struct ConditionalAccessDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       Amount;        /* Data */
+   unsigned char       *Data;
+};
+
+#define CreateConditionalAccessDescriptor(descr, amount, data) \
+   do \
+   { \
+      unsigned char *tmpptr; \
+      \
+      xMemAlloc (amount, &tmpptr); \
+      memcpy (tmpptr, data, amount); \
+      xCreateNode (((struct ConditionalAccessDescriptor *)descr), NULL); \
+      ((struct ConditionalAccessDescriptor *)descr)->Tag = DESCR_CA; \
+      ((struct ConditionalAccessDescriptor *)descr)->Amount = amount; \
+      ((struct ConditionalAccessDescriptor *)descr)->Data = tmpptr; \
+   } while (0)
+
+
 /* Iso639LanguageDescriptor */
 
 struct Iso639LanguageDescriptor {
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index be0d2549c..ccca6e5e3 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -705,6 +705,12 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
             HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_event_id));
       break;
 
+      case DESCR_CA:
+         CreateConditionalAccessDescriptor (Descriptor,
+            *(Ptr + 1) + 2, // we'll need the entire raw data!
+            Ptr);
+      break;
+
       case DESCR_ISO_639_LANGUAGE:
          CreateIso639LanguageDescriptor (Descriptor,
                    CastIso639LanguageDescriptor(Buffer)->lang_code1,
@@ -790,7 +796,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_DATA_STREAM_ALIGN:
       case DESCR_TARGET_BACKGRID:
       case DESCR_VIDEO_WINDOW:
-      case DESCR_CA:
       case DESCR_SYSTEM_CLOCK:
       case DESCR_MULTIPLEX_BUFFER_UTIL:
       case DESCR_COPYRIGHT:
diff --git a/menu.c b/menu.c
index a1c136faa..e3a4c1826 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.228 2002/12/01 10:31:55 kls Exp $
+ * $Id: menu.c 1.231 2003/01/06 16:13:53 kls Exp $
  */
 
 #include "menu.h"
@@ -645,6 +645,7 @@ class cMenuChannelItem : public cOsdItem {
 public:
   cMenuChannelItem(cChannel *Channel);
   virtual void Set(void);
+  cChannel *Channel(void) { return channel; }
   };
 
 cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
@@ -669,6 +670,7 @@ void cMenuChannelItem::Set(void)
 
 class cMenuChannels : public cOsdMenu {
 private:
+  cChannel *GetChannel(int Index);
   void Propagate(void);
 protected:
   eOSState Switch(void);
@@ -691,6 +693,12 @@ cMenuChannels::cMenuChannels(void)
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
 }
 
+cChannel *cMenuChannels::GetChannel(int Index)
+{
+  cMenuChannelItem *p = (cMenuChannelItem *)Get(Index);
+  return p ? (cChannel *)p->Channel() : NULL;
+}
+
 void cMenuChannels::Propagate(void)
 {
   Channels.ReNumber();
@@ -703,7 +711,7 @@ void cMenuChannels::Propagate(void)
 
 eOSState cMenuChannels::Switch(void)
 {
-  cChannel *ch = Channels.Get(Current());
+  cChannel *ch = GetChannel(Current());
   if (ch)
      cDevice::PrimaryDevice()->SwitchChannel(ch, true);
   return osEnd;
@@ -713,7 +721,7 @@ eOSState cMenuChannels::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  cChannel *ch = Channels.Get(Current());
+  cChannel *ch = GetChannel(Current());
   if (ch)
      return AddSubMenu(new cMenuEditChannel(ch));
   return osContinue;
@@ -730,7 +738,7 @@ eOSState cMenuChannels::Delete(void)
 {
   if (Count() > 0) {
      int Index = Current();
-     cChannel *channel = Channels.Get(Index);
+     cChannel *channel = GetChannel(Current());
      int DeletedChannel = channel->Number();
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) {
@@ -751,12 +759,16 @@ eOSState cMenuChannels::Delete(void)
 
 void cMenuChannels::Move(int From, int To)
 {
-  int FromNumber = Channels.Get(From)->Number();
-  int ToNumber = Channels.Get(To)->Number();
-  Channels.Move(From, To);
-  cOsdMenu::Move(From, To);
-  Propagate();
-  isyslog("channel %d moved to %d", FromNumber, ToNumber);
+  cChannel *FromChannel = GetChannel(From);
+  cChannel *ToChannel = GetChannel(To);
+  if (FromChannel && ToChannel) {
+     int FromNumber = FromChannel->Number();
+     int ToNumber = ToChannel->Number();
+     Channels.Move(FromChannel, ToChannel);
+     cOsdMenu::Move(From, To);
+     Propagate();
+     isyslog("channel %d moved to %d", FromNumber, ToNumber);
+     }
 }
 
 eOSState cMenuChannels::ProcessKey(eKeys Key)
@@ -1509,6 +1521,116 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuCam --------------------------------------------------------------
+
+cMenuCam::cMenuCam(cCiMenu *CiMenu)
+:cOsdMenu("")
+{
+  ciMenu = CiMenu;
+  selected = false;
+  if (ciMenu->Selectable())
+     SetHasHotkeys();
+  SetTitle(ciMenu->TitleText() ? ciMenu->TitleText() : "CAM");
+  for (int i = 0; i < ciMenu->NumEntries(); i++)
+      Add(new cOsdItem(hk(ciMenu->Entry(i))));
+  //XXX implement a clean way of displaying this:
+  Add(new cOsdItem(ciMenu->SubTitleText()));
+  Add(new cOsdItem(ciMenu->BottomText()));
+  Display();
+}
+
+cMenuCam::~cMenuCam()
+{
+  if (!selected)
+     ciMenu->Cancel();
+  delete ciMenu;
+}
+
+eOSState cMenuCam::Select(void)
+{
+  if (ciMenu->Selectable()) {
+     ciMenu->Select(Current());
+     selected = true;
+     }
+  return osEnd;
+}
+
+eOSState cMenuCam::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:     return Select();
+       default: break;
+       }
+     }
+  return state;
+}
+
+// --- cMenuCamEnquiry -------------------------------------------------------
+
+//XXX this is just quick and dirty - make this a separate display object
+cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
+:cOsdMenu("")
+{
+  ciEnquiry = CiEnquiry;
+  replied = false;
+  SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
+  Display();
+}
+
+cMenuCamEnquiry::~cMenuCamEnquiry()
+{
+  if (!replied)
+     ciEnquiry->Cancel();
+  delete ciEnquiry;
+}
+
+eOSState cMenuCamEnquiry::Reply(void)
+{
+  ciEnquiry->Reply("1234");//XXX implement actual user input
+  replied = true;
+  return osEnd;
+}
+
+eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:     return Reply();
+       default: break;
+       }
+     }
+  return state;
+}
+
+// --- CamControl ------------------------------------------------------------
+
+cOsdObject *CamControl(void)
+{
+  for (int d = 0; d < cDevice::NumDevices(); d++) {
+      cDevice *Device = cDevice::GetDevice(d);
+      if (Device) {
+         cCiHandler *CiHandler = Device->CiHandler();
+         if (CiHandler) {
+            CiHandler->Process();
+            cCiMenu *CiMenu = CiHandler->GetMenu();
+            if (CiMenu)
+               return new cMenuCam(CiMenu);
+            else {
+               cCiEnquiry *CiEnquiry = CiHandler->GetEnquiry();
+               if (CiEnquiry)
+                  return new cMenuCamEnquiry(CiEnquiry);
+               }
+            }
+         }
+      }
+  return NULL;
+}
+
 // --- cMenuRecordingItem ----------------------------------------------------
 
 class cMenuRecordingItem : public cOsdItem {
@@ -1938,6 +2060,12 @@ eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
 // --- cMenuSetupCICAM -------------------------------------------------------
 
 class cMenuSetupCICAM : public cMenuSetupBase {
+private:
+  int helpKeys;
+  void SetHelpKeys(void);
+  cCiHandler *GetCurrentCiHandler(void);
+  eOSState Menu(void);
+  eOSState Reset(void);
 public:
   cMenuSetupCICAM(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -1945,6 +2073,7 @@ class cMenuSetupCICAM : public cMenuSetupBase {
 
 cMenuSetupCICAM::cMenuSetupCICAM(void)
 {
+  helpKeys = -1;
   SetSection(tr("CICAM"));
   for (int d = 0; d < cDevice::NumDevices(); d++) {
       for (int i = 0; i < 2; i++) {
@@ -1953,6 +2082,46 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
           Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i]));
           }
       }
+  SetHelpKeys();
+}
+
+cCiHandler *cMenuSetupCICAM::GetCurrentCiHandler(void)
+{
+  cDevice *Device = cDevice::GetDevice(Current() / 2);
+  return Device ? Device->CiHandler() : NULL;
+}
+
+void cMenuSetupCICAM::SetHelpKeys(void)
+{
+  int NewHelpKeys = helpKeys;
+  NewHelpKeys = GetCurrentCiHandler() ? 1 : 0;
+  if (NewHelpKeys != helpKeys) {
+     switch (NewHelpKeys) {
+       case 0: SetHelp(NULL); break;
+       case 1: SetHelp(tr("Menu"), tr("Reset"));
+       }
+     helpKeys = NewHelpKeys;
+     }
+}
+
+eOSState cMenuSetupCICAM::Menu(void)
+{
+  cCiHandler *CiHandler = GetCurrentCiHandler();
+  if (CiHandler && CiHandler->EnterMenu())
+     return osEnd; // the CAM menu will be executed explicitly from the main loop
+  else
+     Interface->Error(tr("Can't open CAM menu!"));
+  return osContinue;
+}
+
+eOSState cMenuSetupCICAM::Reset(void)
+{
+  cCiHandler *CiHandler = GetCurrentCiHandler();
+  if (CiHandler && CiHandler->Reset())
+     Interface->Info(tr("CAM has been reset"));
+  else
+     Interface->Error(tr("Can't reset CAM!"));
+  return osContinue;
 }
 
 eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
@@ -1961,6 +2130,19 @@ eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
 
   if (state == osBack && Key == kOk)
      cDevice::SetCaCaps();
+  else if (state == osUnknown) {
+     switch (Key) {
+       case kRed:    if (helpKeys == 1)
+                        return Menu();
+                     break;
+       case kGreen:  if (helpKeys == 1)
+                        return Reset();
+                     break;
+       default: break;
+       }
+     }
+  if (Key != kNone)
+     SetHelpKeys();
   return state;
 }
 
diff --git a/menu.h b/menu.h
index 7e7e4d661..e886f1800 100644
--- a/menu.h
+++ b/menu.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.51 2002/11/30 15:55:39 kls Exp $
+ * $Id: menu.h 1.52 2003/01/06 10:04:05 kls Exp $
  */
 
 #ifndef __MENU_H
 #define __MENU_H
 
+#include "ci.h"
 #include "device.h"
 #include "osd.h"
 #include "dvbplayer.h"
@@ -58,6 +59,30 @@ class cDisplayVolume : public cOsdObject {
   eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuCam : public cOsdMenu {
+private:
+  cCiMenu *ciMenu;
+  bool selected;
+  eOSState Select(void);
+public:
+  cMenuCam(cCiMenu *CiMenu);
+  virtual ~cMenuCam();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuCamEnquiry : public cOsdMenu {
+private:
+  cCiEnquiry *ciEnquiry;
+  bool replied;
+  eOSState Reply(void);
+public:
+  cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
+  virtual ~cMenuCamEnquiry();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cOsdObject *CamControl(void);
+
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
diff --git a/recorder.c b/recorder.c
index 4904014fc..426b55513 100644
--- a/recorder.c
+++ b/recorder.c
@@ -1,10 +1,10 @@
 /*
- * recorder.h: The actual DVB recorder
+ * recorder.c: The actual DVB recorder
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.3 2002/10/12 13:34:29 kls Exp $
+ * $Id: recorder.c 1.4 2002/12/22 11:33:08 kls Exp $
  */
 
 #include <stdarg.h>
diff --git a/recording.c b/recording.c
index ba85ded15..e14bb437b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.70 2002/10/20 11:54:29 kls Exp $
+ * $Id: recording.c 1.72 2003/01/06 15:36:12 kls Exp $
  */
 
 #include "recording.h"
@@ -58,6 +58,8 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
+#define MAX_SUBTITLE_LENGTH  40
+
 void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
@@ -306,10 +308,17 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   fileName = NULL;
   name = NULL;
   // set up the actual name:
+  const char *OriginalSubtitle = Subtitle;
+  char SubtitleBuffer[MAX_SUBTITLE_LENGTH];
   if (isempty(Title))
      Title = Timer->Channel()->Name();
   if (isempty(Subtitle))
      Subtitle = " ";
+  else if (strlen(Subtitle) > MAX_SUBTITLE_LENGTH) {
+     // let's make sure the Subtitle doesn't produce too long a file name:
+     strn0cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
+     Subtitle = SubtitleBuffer;
+     }
   char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
   char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
@@ -333,6 +342,7 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   // handle summary:
   summary = !isempty(Timer->Summary()) ? strdup(Timer->Summary()) : NULL;
   if (!summary) {
+     Subtitle = OriginalSubtitle;
      if (isempty(Subtitle))
         Subtitle = "";
      if (isempty(Summary))
@@ -758,7 +768,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 #define MAXINDEXCATCHUP   2 // seconds
 
 // The minimum age of an index file for considering it no longer to be written:
-#define MININDEXAGE      10 // seconds
+#define MININDEXAGE      60 // seconds
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
 :resumeFile(FileName)
diff --git a/svdrp.c b/svdrp.c
index 66b420cff..102abe0dc 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.49 2002/11/10 12:09:56 kls Exp $
+ * $Id: svdrp.c 1.50 2002/12/22 14:04:08 kls Exp $
  */
 
 #include "svdrp.h"
@@ -174,8 +174,8 @@ bool cPUTEhandler::Process(const char *s)
 #define MAXHELPTOPIC 10
 
 const char *HelpPages[] = {
-  "CHAN [ + | - | <number> | <name> ]\n"
-  "    Switch channel up, down or to the given channel number or name.\n"
+  "CHAN [ + | - | <number> | <name> | <id> ]\n"
+  "    Switch channel up, down or to the given channel number, name or id.\n"
   "    Without option (or after successfully switching to the channel)\n"
   "    it returns the current channel number and name.",
   "CLRE\n"
@@ -412,15 +412,19 @@ void cSVDRP::CmdCHAN(const char *Option)
            }
         }
      else {
-        int i = 1;
-        cChannel *channel;
-        while ((channel = Channels.GetByNumber(i, 1)) != NULL) {
-              if (strcasecmp(channel->Name(), Option) == 0) {
-                 n = i;
-                 break;
+        cChannel *channel = Channels.GetByChannelID(tChannelID::FromString(Option));
+        if (channel)
+           n = channel->Number();
+        else {
+           int i = 1;
+           while ((channel = Channels.GetByNumber(i, 1)) != NULL) {
+                 if (strcasecmp(channel->Name(), Option) == 0) {
+                    n = channel->Number();
+                    break;
+                    }
+                 i = channel->Number() + 1;
                  }
-              i = channel->Number() + 1;
-              }
+           }
         }
      if (n < 0) {
         Reply(501, "Undefined channel \"%s\"", Option);
diff --git a/vdr.c b/vdr.c
index bec513382..44ed58f08 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.139 2002/12/13 16:01:09 kls Exp $
+ * $Id: vdr.c 1.140 2003/01/06 11:14:50 kls Exp $
  */
 
 #include <getopt.h>
@@ -468,6 +468,9 @@ int main(int argc, char *argv[])
                  Timer->SetPending(true);
               }
            }
+        // CAM control:
+        if (!Menu)
+           Menu = CamControl();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
         eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());

From a3942b4d17a3a7e1af82b1950c39db1f9c7ce250 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Jan 2003 18:00:00 +0100
Subject: [PATCH 063/307] Version 1.1.22 - Added 'Hrvatska radiotelevizija' and
 'RTV Slovenija' to ca.conf (thanks to   Paul Gohn). - Implemented actual user
 input for CAM enquiry menus. - Since disk file systems apparently don't honor
 the O_NONBLOCK flag to read from   a file in non-blocking mode the cDvbPlayer
 now uses a non blocking file reader   class to make sure replay remains
 smooth even under heavy system load. - Increased the maximum possible packet
 size in remux.c to avoid corrupted streams   with broadcasters that send
 extremely large PES packets (thanks to Teemu Rantanen). - Added TS error
 checking to remux.c (thanks to Teemu Rantanen). - Modified cRingBufferLinear
 to avoid excessive memmove() calls in 'Transfer Mode'   and during
 recordings, which dramatically reduces CPU load. Thanks to Teemu   Rantanen
 for pinpointing the problem with the excessive memmove() calls. - Updated
 'channels.conf' (thanks to Achim Lange). - Added/improved Swedish language
 texts (thanks to Jan Ekholm). - Fixed the description of the "Scroll pages"
 OSD setup parameter ('yes' and 'no'   were mixed up). - Fixed handling the
 LOG_LOCALn parameters in the -l option (thanks to Dimitrios   Dimitrakos). -
 Changed EIT processing to always read a full section. - Fixed handling user
 defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens   Kirchgatterer
 and Robert Schiele). - Fixed skipping unavailable channels in the EPG
 scanner.

---
 CONTRIBUTORS           |  17 +++-
 HISTORY                |  25 ++++++
 MANUAL                 |   8 +-
 ca.conf                |   2 +
 channels.conf          |   4 +-
 ci.c                   |  15 ++--
 config.h               |   4 +-
 dvbplayer.c            | 199 +++++++++++++++++++++++++++++++++--------
 eit.c                  |  23 +++--
 eitscan.c              |  60 +++++++------
 i18n.c                 |  36 ++++----
 libdtv/liblx/Makefile  |   4 +-
 libdtv/libvdr/Makefile |   3 +-
 menu.c                 |  12 ++-
 menu.h                 |   3 +-
 menuitems.c            |  56 +++++++++++-
 menuitems.h            |  13 ++-
 recorder.c             |  18 ++--
 remux.c                |  41 +++++++--
 ringbuffer.c           |  98 +++++++++++---------
 ringbuffer.h           |  31 +++++--
 transfer.c             |  19 ++--
 vdr.c                  |   4 +-
 23 files changed, 490 insertions(+), 205 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1454c7d49..fad747b92 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -305,7 +305,7 @@ Mirko G
 Achim Lange <Achim_Lange@t-online.de>
  for replacing 'killproc' with 'killall' in 'runvdr' to make it work on Debian
  for reporting a bug in switching back the replay mode display in time shift mode
- for his help in keeping 'channels.conf.cable' up to date
+ for his help in keeping 'channels.conf.cable' and 'channels.conf' up to date
 
 Klaus Wolf <klaus@wolfsoft.de>
  for reporting a bug in restoring the CICAM values for a fourth DVB card
@@ -364,6 +364,7 @@ Simon Dean <linux-dvb@sickhack.com>
 
 Dimitrios Dimitrakos <mail@dimitrios.de>
  for translating OSD texts to the Greek language
+ for fixing handling the LOG_LOCALn parameters in the -l option
 
 Marcus Kuba <marcus@kuba4u.de>
  for reporting a bug in the unit of the "SVDRP timeout" setup parameter
@@ -457,6 +458,7 @@ Robert Schiele <rschiele@uni-mannheim.de>
  for reporting some faulty default parameter initializations
  for suggesting to only set the Makefile variables CXX and CXXFLAGS if they are not
  yet defined
+ for fixing a problem with user defined CFLAGS in libdtv/libvdr/Makefile
 
 Gerhard Steiner <steiner@mail.austria.com>
  for suggesting that the SVDRP command PUTE shall trigger an immediate write of
@@ -502,6 +504,7 @@ Georg Hitsch <georg@hitsch.at>
 
 Clemens Kirchgatterer <clemens@thf.ath.cx>
  for suggesting to change source directory name for plugins from 'SRC' to 'src'
+ for reporting a problem with user defined CFLAGS in libdtv/libvdr/Makefile
 
 Emil Naepflein <Emil.Naepflein@philosys.de>
  for suggesting to take an active SVDRP connection into account when doing shutdown or
@@ -522,3 +525,15 @@ Jan Rieger <jan@ricomp.de>
 
 Walter Stroebel <walter.stroebel@lifeline.nl>
  for introducing "Doxygen" to document the VDR source code
+
+Paul Gohn <pgohn@nexgo.de>
+ for adding 'Hrvatska radiotelevizija' and 'RTV Slovenija' to ca.conf
+
+Teemu Rantanen <tvr@iki.fi>
+ for increased the maximum possible packet size in remux.c to avoid corrupted streams
+ with broadcasters that send extremely large PES packets
+ for adding TS error checking to remux.c
+ for pinpointing a problem with excessive memmove() calls in 'Transfer Mode'
+
+Jan Ekholm <chakie@infa.abo.fi>
+ for adding/improving some Swedish language OSD texts
diff --git a/HISTORY b/HISTORY
index e92eff1cc..90859361b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1916,3 +1916,28 @@ Video Disk Recorder Revision History
 - Since several channels put very long strings into the Subtitle part of their
   EPG data, that string is now limited in length when used in a recording's
   file name.
+
+2003-01-26: Version 1.1.22
+
+- Added 'Hrvatska radiotelevizija' and 'RTV Slovenija' to ca.conf (thanks to
+  Paul Gohn).
+- Implemented actual user input for CAM enquiry menus.
+- Since disk file systems apparently don't honor the O_NONBLOCK flag to read from
+  a file in non-blocking mode the cDvbPlayer now uses a non blocking file reader
+  class to make sure replay remains smooth even under heavy system load.
+- Increased the maximum possible packet size in remux.c to avoid corrupted streams
+  with broadcasters that send extremely large PES packets (thanks to Teemu Rantanen).
+- Added TS error checking to remux.c (thanks to Teemu Rantanen).
+- Modified cRingBufferLinear to avoid excessive memmove() calls in 'Transfer Mode'
+  and during recordings, which dramatically reduces CPU load. Thanks to Teemu
+  Rantanen for pinpointing the problem with the excessive memmove() calls.
+- Updated 'channels.conf' (thanks to Achim Lange).
+- Added/improved Swedish language texts (thanks to Jan Ekholm).
+- Fixed the description of the "Scroll pages" OSD setup parameter ('yes' and 'no'
+  were mixed up).
+- Fixed handling the LOG_LOCALn parameters in the -l option (thanks to Dimitrios
+  Dimitrakos).
+- Changed EIT processing to always read a full section.
+- Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens
+  Kirchgatterer and Robert Schiele).
+- Fixed skipping unavailable channels in the EPG scanner.
diff --git a/MANUAL b/MANUAL
index 3c0504e7b..73a1b6ecf 100644
--- a/MANUAL
+++ b/MANUAL
@@ -23,6 +23,10 @@ Video Disk Recorder User's Manual
   Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
   0..9    Ch select   -            -          -          Numeric inp.  Exec cmd(2)       Editing
 
+  In a numerical input field (like the response to a CAM enquiry) the keys 0..9
+  are used to enter the data, and the Left key can be used to delete the last
+  entered digit.
+
   If your remote control provides additional keys, they can be used for the
   following functions:
 
@@ -411,11 +415,11 @@ Video Disk Recorder User's Manual
                          always displayed when pressing the "Ok" button in
                          normal viewing mode.
 
-  Scroll pages = yes     yes = when pressing the "Down" ("Up") key while the cursor
+  Scroll pages = yes     no  = when pressing the "Down" ("Up") key while the cursor
                                is on the last (first) line of a list page, the
                                list is advanced by a full page and the cursor will
                                be at the top (bottom) of that page
-                         no  = dto., but the cursor remains at the bottom (top) of
+                         yes = dto., but the cursor remains at the bottom (top) of
                                the page (this mode allows for faster scrolling
                                through long lists).
 
diff --git a/ca.conf b/ca.conf
index 61f11890e..fe3d758b0 100644
--- a/ca.conf
+++ b/ca.conf
@@ -29,6 +29,8 @@
 402    NTV Plus
 403    Viasat
 404    Parabole Reunion
+405    Hrvatska radiotelevizija
+406    RTV Slovenija
 
 # Viaccess 2
 
diff --git a/channels.conf b/channels.conf
index f01251e42..8d7f567ad 100644
--- a/channels.conf
+++ b/channels.conf
@@ -54,7 +54,7 @@ Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29:0:0:0
 Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
 Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
 13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
-Studio Universal:11758:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
+Studio Universal:12071:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
 Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
 Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
 Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
@@ -77,7 +77,7 @@ Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183:0:0:0
 Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
 :#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216:0:0:0
 :PW Erotic
-Beate-Uhse.TV:11758:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
+Beate-Uhse.TV:12071:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
 Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513:0:0:0
 Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778:0:0:0
 Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779:0:0:0
diff --git a/ci.c b/ci.c
index d3812d665..61bc74820 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.1 2003/01/06 13:56:17 kls Exp $
+ * $Id: ci.c 1.2 2003/01/11 11:15:19 kls Exp $
  */
 
 /* XXX TODO
@@ -331,6 +331,7 @@ int cCiTransportConnection::RecvTPDU(void)
   struct pollfd pfd[1];
   pfd[0].fd = fd;
   pfd[0].events = POLLIN;
+  lastResponse = ERROR;
   if (poll(pfd, 1, 3500/*XXX*/) && (pfd[0].revents & POLLIN))//XXX
   if (tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
      switch (state) {
@@ -338,7 +339,7 @@ int cCiTransportConnection::RecvTPDU(void)
        case stCREATION: if (tpdu->Tag() == T_CTC_REPLY) {
                            dataAvailable = tpdu->Status() & DATA_INDICATOR;
                            state = stACTIVE;
-                           return tpdu->Tag();
+                           lastResponse = tpdu->Tag();
                            }
                         break;
        case stACTIVE:   switch (tpdu->Tag()) {
@@ -353,17 +354,17 @@ int cCiTransportConnection::RecvTPDU(void)
                           default: return ERROR;
                           }
                         dataAvailable = tpdu->Status() & DATA_INDICATOR;
-                        return tpdu->Tag();
+                        lastResponse = tpdu->Tag();
                         break;
        case stDELETION: if (tpdu->Tag() == T_DTC_REPLY) {
                            Init(fd, slot, tcid);
                            //XXX Status()???
-                           return tpdu->Tag();
+                           lastResponse = tpdu->Tag();
                            }
                         break;
        }
      }
-  return ERROR;
+  return lastResponse;
 }
 
 int cCiTransportConnection::SendData(int Length, const uint8_t *Data)
@@ -413,7 +414,7 @@ int cCiTransportConnection::Poll(void)
 {
   if (state == stACTIVE) {
      if (SendTPDU(T_DATA_LAST) == OK) {
-        return lastResponse = RecvTPDU();
+        return RecvTPDU();
         }
      }
   return ERROR;
@@ -644,7 +645,7 @@ int cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
   *p++ = (Tag >>  8) & 0xFF;
   *p++ =  Tag        & 0xFF;
   p = SetLength(p, Length);
-  if (p - buffer + Length < sizeof(buffer)) {
+  if (p - buffer + Length < int(sizeof(buffer))) {
      memcpy(p, Data, Length);
      p += Length;
      return tc->SendData(p - buffer, buffer);
diff --git a/config.h b/config.h
index 7cf7d917f..83045ae39 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.145 2002/12/22 15:29:45 kls Exp $
+ * $Id: config.h 1.146 2003/01/12 09:44:28 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.21"
+#define VDRVERSION "1.1.22"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbplayer.c b/dvbplayer.c
index 2d9cc1ced..1d140ea9d 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.16 2002/11/03 11:23:47 kls Exp $
+ * $Id: dvbplayer.c 1.17 2003/01/19 15:43:58 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -69,6 +69,103 @@ int cBackTrace::Get(bool Forward)
   return i;
 }
 
+// --- cNonBlockingFileReader ------------------------------------------------
+
+class cNonBlockingFileReader : public cThread {
+private:
+  int f;
+  uchar *buffer;
+  int wanted;
+  int length;
+  bool hasData;
+  bool active;
+  cMutex mutex; 
+  cCondVar newSet;
+protected:
+  void Action(void);
+public:
+  cNonBlockingFileReader(void);
+  ~cNonBlockingFileReader();
+  void Clear(void);
+  int Read(int FileHandle, uchar *Buffer, int Length);
+  bool Reading(void) { return buffer; }
+  };
+
+cNonBlockingFileReader::cNonBlockingFileReader(void)
+{
+  f = -1;
+  buffer = NULL;
+  wanted = length = 0;
+  hasData = false;
+  active = false;
+  Start();
+}
+
+cNonBlockingFileReader::~cNonBlockingFileReader()
+{
+  active = false;
+  newSet.Broadcast();
+  Cancel(3);
+  free(buffer);
+}
+
+void cNonBlockingFileReader::Clear(void)
+{
+  cMutexLock MutexLock(&mutex);
+  f = -1;
+  buffer = NULL;
+  wanted = length = 0;
+  hasData = false;
+  newSet.Broadcast();
+}
+
+int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
+{
+  if (hasData && buffer) {
+     if (buffer != Buffer) {
+        esyslog("ERROR: cNonBlockingFileReader::Read() called with different buffer!");
+        errno = EINVAL;
+        return -1;
+        }
+     buffer = NULL;
+     return length;
+     }
+  if (!buffer) {
+     f = FileHandle;
+     buffer = Buffer;
+     wanted = Length;
+     length = 0;
+     hasData = false;
+     newSet.Broadcast();
+     }
+  errno = EAGAIN;
+  return -1;
+}
+
+void cNonBlockingFileReader::Action(void)
+{
+  dsyslog("non blocking file reader thread started (pid=%d)", getpid());
+  active = true;
+  while (active) {
+        cMutexLock MutexLock(&mutex);
+        if (!hasData && f >= 0 && buffer) {
+           int r = safe_read(f, buffer + length, wanted - length);
+           if (r >= 0) {
+              length += r;
+              if (!r || length == wanted) // r == 0 means EOF
+                 hasData = true;
+              }
+           else if (r < 0 && FATALERRNO) {
+              LOG_ERROR;
+              length = r; // this will forward the error status to the caller
+              hasData = true;
+              }
+           }
+        newSet.TimedWait(mutex, 1000);
+        }
+  dsyslog("non blocking file reader thread ended (pid=%d)", getpid());
+}
+
 // --- cDvbPlayer ------------------------------------------------------------
 
 //XXX+ also used in recorder.c - find a better place???
@@ -84,6 +181,7 @@ class cDvbPlayer : public cPlayer, cThread {
   enum ePlayModes { pmPlay, pmPause, pmSlow, pmFast, pmStill };
   enum ePlayDirs { pdForward, pdBackward };
   static int Speeds[];
+  cNonBlockingFileReader *nonBlockingFileReader;
   cRingBufferFrame *ringBuffer;
   cBackTrace *backTrace;
   cFileName *fileName;
@@ -135,6 +233,7 @@ int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
 
 cDvbPlayer::cDvbPlayer(const char *FileName)
 {
+  nonBlockingFileReader = NULL;
   ringBuffer = NULL;
   backTrace = NULL;
   index = NULL;
@@ -198,7 +297,9 @@ void cDvbPlayer::TrickSpeed(int Increment)
 
 void cDvbPlayer::Empty(void)
 {
-  Lock();
+  LOCK_THREAD;
+  if (nonBlockingFileReader)
+     nonBlockingFileReader->Clear();
   if ((readIndex = backTrace->Get(playDir == pdForward)) < 0)
      readIndex = writeIndex;
   readFrame = NULL;
@@ -206,7 +307,6 @@ void cDvbPlayer::Empty(void)
   ringBuffer->Clear();
   backTrace->Clear();
   DeviceClear();
-  Unlock();
 }
 
 void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
@@ -305,7 +405,7 @@ void cDvbPlayer::Action(void)
 {
   dsyslog("dvbplayer thread started (pid=%d)", getpid());
 
-  uchar b[MAXFRAMESIZE];
+  uchar *b = NULL;
   const uchar *p = NULL;
   int pc = 0;
 
@@ -313,6 +413,10 @@ void cDvbPlayer::Action(void)
   if (readIndex >= 0)
      isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
 
+  nonBlockingFileReader = new cNonBlockingFileReader;
+  int Length = 0;
+  int AudioTrack = 0; // -1 = any, 0 = none, >0 = audioTrack
+
   running = true;
   while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
         cPoller Poller;
@@ -326,46 +430,59 @@ void cDvbPlayer::Action(void)
 
            if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
               if (playMode != pmStill) {
-                 int r = 0;
-                 if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
-                    uchar FileNumber;
-                    int FileOffset, Length;
-                    int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
-                    if (Index >= 0) {
-                       if (!NextFile(FileNumber, FileOffset))
+                 if (!nonBlockingFileReader->Reading()) {
+                    if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
+                       uchar FileNumber;
+                       int FileOffset;
+                       int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
+                       if (Index >= 0) {
+                          if (!NextFile(FileNumber, FileOffset))
+                             continue;
+                          }
+                       else {
+                          // can't call Play() here, because those functions may only be
+                          // called from the foreground thread - and we also don't need
+                          // to empty the buffer here
+                          DevicePlay();
+                          playMode = pmPlay;
+                          playDir = pdForward;
                           continue;
+                          }
+                       readIndex = Index;
+                       AudioTrack = 0;
+                       // must clear all audio packets because the buffer is not emptied
+                       // when falling back from "fast forward" to "play" (see above)
                        }
-                    else {
-                       // can't call Play() here, because those functions may only be
-                       // called from the foreground thread - and we also don't need
-                       // to empty the buffer here
-                       DevicePlay();
-                       playMode = pmPlay;
-                       playDir = pdForward;
-                       continue;
+                    else if (index) {
+                       uchar FileNumber;
+                       int FileOffset;
+                       readIndex++;
+                       if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
+                          readIndex = -1;
+                          eof = true;
+                          continue;
+                          }
+                       AudioTrack = audioTrack;
                        }
-                    readIndex = Index;
-                    r = ReadFrame(replayFile, b, Length, sizeof(b));
-                    // must call StripAudioPackets() here because the buffer is not emptied
-                    // when falling back from "fast forward" to "play" (see above)
-                    StripAudioPackets(b, r);
-                    }
-                 else if (index) {
-                    uchar FileNumber;
-                    int FileOffset, Length;
-                    readIndex++;
-                    if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
-                       readIndex = -1;
-                       eof = true;
-                       continue;
+                    else { // allows replay even if the index file is missing
+                       Length = MAXFRAMESIZE;
+                       AudioTrack = -1;
+                       }
+                    if (Length == -1)
+                       Length = MAXFRAMESIZE; // this means we read up to EOF (see cIndex)
+                    else if (Length > MAXFRAMESIZE) {
+                       esyslog("ERROR: frame larger than buffer (%d > %d)", Length, MAXFRAMESIZE);
+                       Length = MAXFRAMESIZE;
                        }
-                    r = ReadFrame(replayFile, b, Length, sizeof(b));
-                    StripAudioPackets(b, r, audioTrack);
+                    b = MALLOC(uchar, Length);
+                    }
+                 int r = nonBlockingFileReader->Read(replayFile, b, Length);
+                 if (r > 0) {
+                    if (AudioTrack >= 0)
+                       StripAudioPackets(b, r, AudioTrack);
+                    readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
+                    b = NULL;
                     }
-                 else // allows replay even if the index file is missing
-                    r = read(replayFile, b, sizeof(b));
-                 if (r > 0)
-                    readFrame = new cFrame(b, r, ftUnknown, readIndex);
                  else if (r == 0)
                     eof = true;
                  else if (r < 0 && FATALERRNO) {
@@ -422,6 +539,10 @@ void cDvbPlayer::Action(void)
         }
   active = running = false;
 
+  cNonBlockingFileReader *nbfr = nonBlockingFileReader;
+  nonBlockingFileReader = NULL;
+  delete nbfr;
+
   dsyslog("dvbplayer thread ended (pid=%d)", getpid());
 }
 
diff --git a/eit.c b/eit.c
index e2e0fe72f..174ad6d4d 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.63 2003/01/06 15:05:46 kls Exp $
+ * $Id: eit.c 1.64 2003/01/26 12:21:15 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1240,17 +1240,16 @@ void cSIProcessor::Action()
          {
             if (pfd[a].revents & POLLIN)
             {
-               /* read section */
-               unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
-               if (safe_read(filters[a].handle, buf, 3) == 3)
+               // read section
+               unsigned char buf[4096]; // max. allowed size for any EIT section
+               int r = safe_read(filters[a].handle, buf, sizeof(buf));
+               if (r > 3) // minimum number of bytes necessary to get section length
                {
-                  int seclen = ((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF);
+                  int seclen = ((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF) + 3;
                   int pid = filters[a].pid;
-                  int n = safe_read(filters[a].handle, buf + 3, seclen);
-                  if (n == seclen)
+                  if (seclen == r)
                   {
-                     seclen += 3;
-                     //dsyslog("Received pid 0x%02x with table ID 0x%02x and length of %04d\n", pid, buf[0], seclen);
+                     //dsyslog("Received pid 0x%04X with table ID 0x%02X and length of %4d\n", pid, buf[0], seclen);
                      switch (pid)
                      {
                         case 0x00:
@@ -1335,10 +1334,10 @@ void cSIProcessor::Action()
                            break;
                      }
                   }
-                  /*XXX this just fills up the log file - shouldn't we rather try to re-sync?
+                  /*
                   else
-                     dsyslog("read incomplete section - seclen = %d, n = %d", seclen, n);
-                  XXX*/
+                     dsyslog("read incomplete section - seclen = %d, r = %d", seclen, r);
+                  */
                }
             }
          }
diff --git a/eitscan.c b/eitscan.c
index fdcd8c3d8..5768a423e 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.10 2002/11/01 11:04:49 kls Exp $
+ * $Id: eitscan.c 1.11 2003/01/26 16:19:24 kls Exp $
  */
 
 #include "eitscan.h"
@@ -51,38 +51,42 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        for (int i = 0; i < cDevice::NumDevices(); i++) {
-            cDevice *Device = cDevice::GetDevice(i);
-            if (Device && Device->CardIndex() < MAXDVBDEVICES) {
-               if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                  if (!(Device->Receiving(true) || Device->Replaying())) {
-                     int oldCh = lastChannel;
-                     int ch = oldCh + 1;
-                     while (ch != oldCh) {
-                           if (ch > Channels.MaxNumber()) {
-                              ch = 1;
-                              numTransponders = 0;
-                              }
-                           cChannel *Channel = Channels.GetByNumber(ch, 1);
-                           if (Channel) {
-                              if (!Device->ProvidesChannel(Channel))
-                                 break;
-                              if (Channel->Sid() && !TransponderScanned(Channel)) {
-                                 if (Device == cDevice::PrimaryDevice() && !currentChannel)
-                                    currentChannel = Device->CurrentChannel();
-                                 Device->SwitchChannel(Channel, false);
-                                 lastChannel = ch;
-                                 break;
+        do {
+           int oldLastChannel = lastChannel;
+           for (int i = 0; i < cDevice::NumDevices(); i++) {
+               cDevice *Device = cDevice::GetDevice(i);
+               if (Device && Device->CardIndex() < MAXDVBDEVICES) {
+                  if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                     if (!(Device->Receiving(true) || Device->Replaying())) {
+                        int oldCh = lastChannel;
+                        int ch = oldCh + 1;
+                        while (ch != oldCh) {
+                              if (ch > Channels.MaxNumber()) {
+                                 ch = 1;
+                                 numTransponders = 0;
+                                 }
+                              cChannel *Channel = Channels.GetByNumber(ch, 1);
+                              if (Channel) {
+                                 if (!Device->ProvidesChannel(Channel))
+                                    break;
+                                 if (Channel->Sid() && !TransponderScanned(Channel)) {
+                                    if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                                       currentChannel = Device->CurrentChannel();
+                                    Device->SwitchChannel(Channel, false);
+                                    lastChannel = ch;
+                                    break;
+                                    }
                                  }
+                              ch = Channel->Number() + 1;
                               }
-                           ch = Channel->Number() + 1;
-                           }
+                        }
                      }
                   }
                }
-            else
-               lastChannel++; // avoid hangup in case the last channel in the list is not provided by a DVB card
-            }
+           if (lastChannel != oldLastChannel)
+              break;
+           lastChannel++;
+           } while (time(NULL) - now < 2);
         lastScan = time(NULL);
         }
      }
diff --git a/i18n.c b/i18n.c
index aafe0c155..3dc42b0de 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.101 2003/01/06 12:16:28 kls Exp $
+ * $Id: i18n.c 1.103 2003/01/26 11:46:46 kls Exp $
  *
  * Translations provided by:
  *
@@ -18,7 +18,7 @@
  * Polish      Michael Rakowski <mrak@gmx.de>
  * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
- * Swedish     Tomas Prybil <tomas@prybil.se>
+ * Swedish     Tomas Prybil <tomas@prybil.se> and Jan Ekholm <chakie@infa.abo.fi>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  *
@@ -211,7 +211,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Inspelningskommandon",
     "",// TODO
     "",// TODO
   },
@@ -950,7 +950,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "K�lla",
     "",//TODO
     "",//TODO
   },
@@ -1126,7 +1126,7 @@ const tI18nPhrase Phrases[] = {
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
-    "Bandwidth",
+    "Bandbredd",
     "Bandwidth",
     "Bandwidth",
   },
@@ -1496,7 +1496,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Kanalen ej tillg�nglig!",
     "",//TODO
     "",//TODO
   },
@@ -1512,7 +1512,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Kanalinst�llningarna �r ej unika!",
     "",//TODO
     "",//TODO
   },
@@ -2042,7 +2042,7 @@ const tI18nPhrase Phrases[] = {
     "Transponder do ustawiania czasu",
     "Transponder para reloj de sistema",
     "Transponder gia sintonismo tis oras",
-    "Anv�nd klockan fr�n fransponder",
+    "Anv�nd klockan fr�n transponder",
     "Preia ceasul din transponder",
     "Id�h�z tartoz� Transponder",
   },
@@ -2700,7 +2700,7 @@ const tI18nPhrase Phrases[] = {
     "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guarder, 'Abajo' para anular",
-    "'kato' apothikevsi, 'Pano' akirosi",
+    "'Kato' apothikevsi, 'Pano' akirosi",
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
@@ -2894,7 +2894,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Spela upp",
     "",// TODO
     "",// TODO
   },
@@ -2910,7 +2910,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pausa",
     "",// TODO
     "",// TODO
   },
@@ -2926,7 +2926,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Stoppa",
     "",// TODO
     "",// TODO
   },
@@ -2942,7 +2942,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Spela in",
     "",// TODO
     "",// TODO
   },
@@ -2958,7 +2958,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Spola fram�t",
     "",// TODO
     "",// TODO
   },
@@ -2974,7 +2974,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Spola bak�t",
     "",// TODO
     "",// TODO
   },
@@ -3006,7 +3006,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Kanal+",
     "",// TODO
     "",// TODO
   },
@@ -3022,7 +3022,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Kanal-",
     "",// TODO
     "",// TODO
   },
@@ -3119,7 +3119,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "av",
     "",// TODO
     "",// TODO
   },
diff --git a/libdtv/liblx/Makefile b/libdtv/liblx/Makefile
index 2531708ae..d06ee0915 100644
--- a/libdtv/liblx/Makefile
+++ b/libdtv/liblx/Makefile
@@ -27,8 +27,8 @@
 #
 #
 #
-CC = gcc
-CFLAGS = -O2 -g -pedantic -Wmissing-prototypes -Wstrict-prototypes \
+CC ?= gcc
+CFLAGS ?= -O2 -g -pedantic -Wmissing-prototypes -Wstrict-prototypes \
          -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
 
 
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
index 0f2ad7219..6eebedd4e 100644
--- a/libdtv/libvdr/Makefile
+++ b/libdtv/libvdr/Makefile
@@ -29,8 +29,9 @@
 #
 CC ?= gcc
 CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
-         -Wimplicit -D__USE_FIXED_PROTOTYPES__ -I../include # -DDEBUG
+         -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
 
+CFLAGS += -I../include
 
 AR = ar
 ARFLAGS = r
diff --git a/menu.c b/menu.c
index e3a4c1826..081a4ba14 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.231 2003/01/06 16:13:53 kls Exp $
+ * $Id: menu.c 1.232 2003/01/19 14:59:46 kls Exp $
  */
 
 #include "menu.h"
@@ -1572,11 +1572,15 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
 
 //XXX this is just quick and dirty - make this a separate display object
 cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
-:cOsdMenu("")
+:cOsdMenu("", 10)
 {
   ciEnquiry = CiEnquiry;
+  int Length = ciEnquiry->ExpectedLength();
+  input = MALLOC(char, Length + 1);
+  *input = 0;
   replied = false;
   SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
+  Add(new cMenuEditNumItem("Input", input, Length, ciEnquiry->Blind()));
   Display();
 }
 
@@ -1584,12 +1588,14 @@ cMenuCamEnquiry::~cMenuCamEnquiry()
 {
   if (!replied)
      ciEnquiry->Cancel();
+  free(input);
   delete ciEnquiry;
 }
 
 eOSState cMenuCamEnquiry::Reply(void)
 {
-  ciEnquiry->Reply("1234");//XXX implement actual user input
+  //XXX check length???
+  ciEnquiry->Reply(input);
   replied = true;
   return osEnd;
 }
diff --git a/menu.h b/menu.h
index e886f1800..43a0d8f92 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.52 2003/01/06 10:04:05 kls Exp $
+ * $Id: menu.h 1.53 2003/01/12 14:54:05 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -73,6 +73,7 @@ class cMenuCam : public cOsdMenu {
 class cMenuCamEnquiry : public cOsdMenu {
 private:
   cCiEnquiry *ciEnquiry;
+  char *input;
   bool replied;
   eOSState Reply(void);
 public:
diff --git a/menuitems.c b/menuitems.c
index c92d5318c..56b919955 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.11 2002/12/15 11:05:19 kls Exp $
+ * $Id: menuitems.c 1.12 2003/01/18 13:34:40 kls Exp $
  */
 
 #include "menuitems.h"
@@ -109,6 +109,60 @@ void cMenuEditBoolItem::Set(void)
   SetValue(buf);
 }
 
+// --- cMenuEditNumItem ------------------------------------------------------
+
+cMenuEditNumItem::cMenuEditNumItem(const char *Name, char *Value, int Length, bool Blind)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  length = Length;
+  blind = Blind;
+  Set();
+}
+
+void cMenuEditNumItem::Set(void)
+{
+  if (blind) {
+     char buf[length + 1];
+     int i;
+     for (i = 0; i < length && value[i]; i++)
+         buf[i] = '*';
+     buf[i] = 0;
+     SetValue(buf);
+     }
+  else
+     SetValue(value);
+}
+
+eOSState cMenuEditNumItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     Key = NORMALKEY(Key);
+     switch (Key) {
+       case kLeft: {
+            int l = strlen(value);
+            if (l > 0)
+               value[l - 1] = 0;
+            }
+            break;
+       case k0 ... k9: {
+            int l = strlen(value);
+            if (l < length) {
+               value[l] = Key - k0 + '0';
+               value[l + 1] = 0;
+               }
+            }
+            break;
+       default: return state;
+       }
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuEditChrItem ------------------------------------------------------
 
 cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Allowed)
diff --git a/menuitems.h b/menuitems.h
index 4752d4bb8..f9b2ff301 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.4 2002/08/15 11:28:26 kls Exp $
+ * $Id: menuitems.h 1.5 2003/01/12 15:06:23 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -42,6 +42,17 @@ class cMenuEditBoolItem : public cMenuEditIntItem {
   cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString = NULL, const char *TrueString = NULL);
   };
 
+class cMenuEditNumItem : public cMenuEditItem {
+protected:
+  char *value;
+  int length;
+  bool blind;
+  virtual void Set(void);
+public:
+  cMenuEditNumItem(const char *Name, char *Value, int Length, bool Blind = false);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuEditChrItem : public cMenuEditItem {
 private:
   char *value;
diff --git a/recorder.c b/recorder.c
index 426b55513..15e86463a 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.4 2002/12/22 11:33:08 kls Exp $
+ * $Id: recorder.c 1.5 2003/01/25 16:23:36 kls Exp $
  */
 
 #include <stdarg.h>
@@ -41,7 +41,7 @@ cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int A
 
   SpinUpDisk(FileName);
 
-  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
+  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, TS_SIZE * 2, true);
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2, true);
   fileName = new cFileName(FileName, true);
   recordFile = fileName->Open();
@@ -110,16 +110,14 @@ void cRecorder::Action(void)
 {
   dsyslog("recording thread started (pid=%d)", getpid());
 
-  uchar b[MINVIDEODATA];
-  int r = 0;
   active = true;
   while (active) {
-        int g = ringBuffer->Get(b + r, sizeof(b) - r);
-        if (g > 0)
-           r += g;
-        if (r > 0) {
+        int r;
+        const uchar *b = ringBuffer->Get(r);
+        if (b) {
            int Count = r, Result;
            uchar *p = remux->Process(b, Count, Result, &pictureType);
+           ringBuffer->Del(Count);
            if (p) {
               //XXX+ active??? see old version (Busy)
               if (!active && pictureType == I_FRAME) // finish the recording before the next 'I' frame
@@ -136,10 +134,6 @@ void cRecorder::Action(void)
               else
                  break;
               }
-           if (Count > 0) {
-              r -= Count;
-              memmove(b, b + Count, r);
-              }
            }
         else
            usleep(1); // this keeps the CPU load low
diff --git a/remux.c b/remux.c
index 786bb8feb..097b4a55f 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.12 2002/10/12 13:33:54 kls Exp $
+ * $Id: remux.c 1.14 2003/01/24 17:22:29 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -97,14 +97,16 @@
 #define PTS_ONLY         0x80
 
 #define TS_SIZE        188
-#define PAY_START      0x40
 #define PID_MASK_HI    0x1F
-//flags
+#define CONT_CNT_MASK  0x0F
+
+// Flags:
+#define PAY_START      0x40
+#define TS_ERROR       0x80
 #define ADAPT_FIELD    0x20
-//XXX TODO
 
-#define MAX_PLENGTH 0xFFFF
-#define MMAX_PLENGTH (4*MAX_PLENGTH)
+#define MAX_PLENGTH  0xFFFF          // the maximum PES packet length (theoretically)
+#define MMAX_PLENGTH (8*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland
 
 #define IPACKS 2048
 
@@ -132,6 +134,9 @@ class cTS2PES {
   bool done;
   uint8_t *resultBuffer;
   int *resultCount;
+  int tsErrors;
+  int ccErrors;
+  int ccCounter;
   static uint8_t headr[];
   void store(uint8_t *Data, int Count);
   void reset_ipack(void);
@@ -154,6 +159,10 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
   size = Size;
   audioCid = AudioCid;
 
+  tsErrors = 0;
+  ccErrors = 0;
+  ccCounter = -1;
+
   if (!(buf = MALLOC(uint8_t, size)))
      esyslog("Not enough memory for ts_transform");
 
@@ -162,6 +171,8 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
 
 cTS2PES::~cTS2PES()
 {
+  if (tsErrors || ccErrors)
+     dsyslog("cTS2PES got %d TS errors, %d TS continuity errors", tsErrors, ccErrors);
   free(buf);
 }
 
@@ -384,6 +395,8 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
         }
 
      if (plength && found == plength + 6) {
+        if (plength == MMAX_PLENGTH - 6)
+           esyslog("ERROR: PES packet length overflow in remuxer (stream corruption)");
         send_ipack();
         reset_ipack();
         if (c < Count)
@@ -398,6 +411,22 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
   if (!Buf)
      return;
 
+  if (Buf[1] & TS_ERROR)
+     tsErrors++;
+  if ((Buf[3] ^ ccCounter) & CONT_CNT_MASK) {
+     // This should check duplicates and packets which do not increase the counter.
+     // But as the errors usually come in bursts this should be enough to
+     // show you there is something wrong with signal quality.
+     if (ccCounter != -1 && ((Buf[3] ^ (ccCounter + 1)) & CONT_CNT_MASK)) {
+        ccErrors++;
+        // Enable this if you are having problems with signal quality.
+        // These are the errors I used to get with Nova-T when antenna
+        // was not positioned correcly (not transport errors). //tvr
+        //dsyslog("TS continuity error (%d)", ccCounter);
+        }
+     ccCounter = Buf[3] & CONT_CNT_MASK;
+     }
+
   if (Buf[1] & PAY_START) {
      if (plength == MMAX_PLENGTH - 6 && found > 6) {
         plength = found - 6;
diff --git a/ringbuffer.c b/ringbuffer.c
index b57b23e26..0734c28de 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.10 2002/07/28 12:47:32 kls Exp $
+ * $Id: ringbuffer.c 1.12 2003/01/26 09:39:24 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -57,13 +57,14 @@ void cRingBuffer::EnableGet(void)
 
 // --- cRingBufferLinear -----------------------------------------------------
 
-cRingBufferLinear::cRingBufferLinear(int Size, bool Statistics)
+cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics)
 :cRingBuffer(Size, Statistics)
 {
+  margin = Margin;
   buffer = NULL;
   getThreadPid = -1;
   if (Size > 1) { // 'Size - 1' must not be 0!
-     buffer = new uchar[Size];
+     buffer = MALLOC(uchar, Size);
      if (!buffer)
         esyslog("ERROR: can't allocate ring buffer (size=%d)", Size);
      Clear();
@@ -74,7 +75,7 @@ cRingBufferLinear::cRingBufferLinear(int Size, bool Statistics)
 
 cRingBufferLinear::~cRingBufferLinear()
 {
-  delete buffer;
+  free(buffer);
 }
 
 int cRingBufferLinear::Available(void)
@@ -82,13 +83,14 @@ int cRingBufferLinear::Available(void)
   Lock();
   int diff = head - tail;
   Unlock();
-  return (diff >= 0) ? diff : Size() + diff;
+  return (diff >= 0) ? diff : Size() + diff - margin;
 }
 
 void cRingBufferLinear::Clear(void)
 {
   Lock();
-  head = tail = 0;
+  head = tail = margin;
+  lastGet = -1;
   Unlock();
   EnablePut();
   EnableGet();
@@ -100,7 +102,7 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
      Lock();
      int rest = Size() - head;
      int diff = tail - head;
-     int free = (diff > 0) ? diff - 1 : Size() + diff - 1;
+     int free = (diff > 0) ? diff - 1 : Size() + diff - (tail < margin ? -(margin - tail) : margin) - 1;
      if (statistics) {
         int fill = Size() - free - 1 + Count;
         if (fill >= Size())
@@ -122,8 +124,8 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
         if (Count >= rest) {
            memcpy(buffer + head, Data, rest);
            if (Count - rest)
-              memcpy(buffer, Data + rest, Count - rest);
-           head = Count - rest;
+              memcpy(buffer + margin, Data + rest, Count - rest);
+           head = margin + Count - rest;
            }
         else {
            memcpy(buffer + head, Data, Count);
@@ -138,50 +140,60 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
   return Count;
 }
 
-int cRingBufferLinear::Get(uchar *Data, int Count)
+const uchar *cRingBufferLinear::Get(int &Count)
 {
-  if (Count > 0) {
-     Lock();
-     if (getThreadPid < 0)
-        getThreadPid = getpid();
-     int rest = Size() - tail;
-     int diff = head - tail;
-     int cont = (diff >= 0) ? diff : Size() + diff;
-     if (rest > 0) {
-        if (cont < Count)
-           Count = cont;
-        if (Count >= rest) {
-           memcpy(Data, buffer + tail, rest);
-           if (Count - rest)
-              memcpy(Data + rest, buffer, Count - rest);
-           tail = Count - rest;
-           }
-        else {
-           memcpy(Data, buffer + tail, Count);
-           tail += Count;
-           }
-        }
-     else
-        Count = 0;
-     Unlock();
-     if (Count == 0)
-        WaitForGet();
+  const uchar *p = NULL;
+  Lock();
+  if (getThreadPid < 0)
+     getThreadPid = getpid();
+  int rest = Size() - tail;
+  if (tail > Size() - margin && head < tail) {
+     int t = margin - rest;
+     memcpy(buffer + t, buffer + tail, rest);
+     tail = t;
      }
-  return Count;
+  int diff = head - tail;
+  int cont = (diff >= 0) ? diff : Size() + diff - margin;
+  if (cont > rest)
+     cont = rest;
+  if (cont >= margin) {
+     p = buffer + tail;
+     Count = lastGet = cont;
+     }
+  Unlock();
+  if (!p)
+     WaitForGet();
+  return p;
+}
+
+void cRingBufferLinear::Del(int Count)
+{
+  if (Count > 0 && Count <= lastGet) {
+     tail += Count;
+     lastGet -= Count;
+     if (tail >= Size())
+        tail = margin;
+     }
+  else
+     esyslog("ERROR: invalid Count in cRingBufferLinear::Del: %d", Count);
 }
 
 // --- cFrame ----------------------------------------------------------------
 
 cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
 {
-  count = Count;
+  count = abs(Count);
   type = Type;
   index = Index;
-  data = new uchar[count];
-  if (data)
-     memcpy(data, Data, count);
-  else
-     esyslog("ERROR: can't allocate frame buffer (count=%d)", count);
+  if (Count < 0)
+     data = (uchar *)Data;
+  else {
+     data = new uchar[count];
+     if (data)
+        memcpy(data, Data, count);
+     else
+        esyslog("ERROR: can't allocate frame buffer (count=%d)", count);
+     }
   next = NULL;
 }
 
diff --git a/ringbuffer.h b/ringbuffer.h
index 660a08b04..9205df7f7 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.7 2002/08/04 10:27:30 kls Exp $
+ * $Id: ringbuffer.h 1.9 2003/01/26 09:47:39 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -40,21 +40,31 @@ class cRingBuffer {
 
 class cRingBufferLinear : public cRingBuffer {
 private:
-  int head, tail;
+  int margin, head, tail;
+  int lastGet;
   uchar *buffer;
   pid_t getThreadPid;
 public:
-  cRingBufferLinear(int Size, bool Statistics = false);
+  cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false);
+    ///< Creates a linear ring buffer.
+    ///< The buffer will be able to hold at most Size bytes of data, and will
+    ///< be guaranteed to return at least Margin bytes in one consecutive block.
   virtual ~cRingBufferLinear();
   virtual int Available(void);
   virtual void Clear(void);
-    // Immediately clears the ring buffer.
+    ///< Immediately clears the ring buffer.
   int Put(const uchar *Data, int Count);
-    // Puts at most Count bytes of Data into the ring buffer.
-    // Returns the number of bytes actually stored.
-  int Get(uchar *Data, int Count);
-    // Gets at most Count bytes of Data from the ring buffer.
-    // Returns the number of bytes actually retrieved.
+    ///< Puts at most Count bytes of Data into the ring buffer.
+    ///< \return Returns the number of bytes actually stored.
+  const uchar *Get(int &Count);
+    ///< Gets data from the ring buffer.
+    ///< The data will remain in the buffer until a call to Del() deletes it.
+    ///< \return Returns a pointer to the data, and stores the number of bytes
+    ///< actually retrieved in Count. If the returned pointer is NULL, Count has no meaning.
+  void Del(int Count);
+    ///< Deletes at most Count bytes from the ring buffer.
+    ///< Count must be less or equal to the number that was returned by a previous
+    ///< call to Get().
   };
 
 enum eFrameType { ftUnknown, ftVideo, ftAudio, ftDolby };
@@ -69,6 +79,9 @@ class cFrame {
   int index;
 public:
   cFrame(const uchar *Data, int Count, eFrameType = ftUnknown, int Index = -1);
+    ///< Creates a new cFrame object.
+    ///< If Count is negative, the cFrame object will take ownership of the given
+    ///< Data. Otherwise it will allocate Count bytes of memory and copy Data.
   ~cFrame();
   const uchar *Data(void) const { return data; }
   int Count(void) const { return count; }
diff --git a/transfer.c b/transfer.c
index d8975a922..abcb9d085 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.8 2002/12/14 13:14:53 kls Exp $
+ * $Id: transfer.c 1.9 2003/01/26 09:59:35 kls Exp $
  */
 
 #include "transfer.h"
@@ -19,7 +19,7 @@
 cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
 :cReceiver(0, -1, 5, VPid, APid1, APid2, DPid1, DPid2)
 {
-  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
+  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, TS_SIZE * 2, true);
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
   canToggleAudioTrack = false;
   audioTrack = 0xC0;
@@ -60,8 +60,6 @@ void cTransfer::Action(void)
 {
   dsyslog("transfer thread started (pid=%d)", getpid());
 
-  uchar b[MINVIDEODATA];
-  int r = 0;
   active = true;
   while (active) {
 
@@ -80,15 +78,15 @@ void cTransfer::Action(void)
 
         // Get data from the buffer:
 
-        int g = ringBuffer->Get(b + r, sizeof(b) - r);
-        if (g > 0)
-           r += g;
+        int r;
+        const uchar *b = ringBuffer->Get(r);
 
         // Play the data:
 
-        if (r > 0) {
+        if (b) {
            int Count = r, Result;
            uchar *p = remux->Process(b, Count, Result);
+           ringBuffer->Del(Count);
            if (p) {
               StripAudioPackets(p, Result, audioTrack);
               while (Result > 0 && active) {
@@ -103,11 +101,6 @@ void cTransfer::Action(void)
                        }
                     }
               }
-           if (Count > 0) {
-              r -= Count;
-              if (r > 0)
-                 memmove(b, b + Count, r);
-              }
            }
         else
            usleep(1); // this keeps the CPU load low
diff --git a/vdr.c b/vdr.c
index 44ed58f08..87550ded0 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.140 2003/01/06 11:14:50 kls Exp $
+ * $Id: vdr.c 1.141 2003/01/26 11:56:31 kls Exp $
  */
 
 #include <getopt.h>
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
                             if (!p)
                                break;
                             if (isnumber(p + 1)) {
-                               int l = atoi(optarg);
+                               int l = atoi(p + 1);
                                if (0 <= l && l <= 7) {
                                   int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
                                   SysLogTarget = targets[l];

From 8c5d735d3279230f6471e474a946a5733054df43 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 2 Feb 2003 18:00:00 +0100
Subject: [PATCH 064/307] Version 1.1.23 - Fixed a new/delete malloc/free
 mismatch in ringbuffer.c (thanks to Stefan   Huelswitt for reporting this
 one). - Improved CAM handling.

---
 CONTRIBUTORS |  1 +
 HISTORY      |  6 +++++
 ci.c         | 73 ++++++++++++++++++++++++++++++++++++++--------------
 config.h     |  4 +--
 dvbdevice.c  | 19 +++++---------
 eit.c        |  6 ++---
 eit.h        |  8 +++---
 ringbuffer.c |  6 ++---
 8 files changed, 78 insertions(+), 45 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fad747b92..ae550b813 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -161,6 +161,7 @@ Stefan Huelswitt <huels@iname.com>
  for fixing handling 'Transfer Mode' on single device systems when recording an
  encrypted channel
  for reporting a problem with timers when channel IDs have a 'source' that is 0
+ for reporting a new/delete malloc/free mismatch in ringbuffer.c
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index 90859361b..8e770ee78 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1941,3 +1941,9 @@ Video Disk Recorder Revision History
 - Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens
   Kirchgatterer and Robert Schiele).
 - Fixed skipping unavailable channels in the EPG scanner.
+
+2003-02-02: Version 1.1.23
+
+- Fixed a new/delete malloc/free mismatch in ringbuffer.c (thanks to Stefan
+  Huelswitt for reporting this one).
+- Improved CAM handling.
diff --git a/ci.c b/ci.c
index 61bc74820..97de9b015 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.2 2003/01/11 11:15:19 kls Exp $
+ * $Id: ci.c 1.3 2003/02/02 15:49:52 kls Exp $
  */
 
 /* XXX TODO
@@ -13,7 +13,6 @@
 - update CA descriptors in case they change
 - dynamically react on CAM insert/remove
 - implement CAM reset (per slot)
-- implement a CA enquiry menu with actual user input
 XXX*/
 
 #include "ci.h"
@@ -45,7 +44,7 @@ static int SysLogLevel = 3;
 static bool DumpTPDUDataTransfer = false;
 static bool DebugProtocol = false;
 
-#define dbgprotocol(a...) if (DebugProtocol) printf(a)
+#define dbgprotocol(a...) if (DebugProtocol) fprintf(stderr, a)
 
 #define OK       0
 #define TIMEOUT -1
@@ -460,19 +459,32 @@ cCiTransportConnection *cCiTransportLayer::NewConnection(void)
   return NULL;
 }
 
-#define CA_RESET_TIMEOUT  2 // seconds
+#define CA_RESET_TIMEOUT  3 // seconds
 
 bool cCiTransportLayer::ResetSlot(int Slot)
 {
+  dbgprotocol("Resetting slot %d...", Slot);
   ca_slot_info_t sinfo;
   sinfo.num = Slot;
-  ioctl(fd, CA_RESET, Slot);
-  time_t t0 = time(NULL);
-  do {
-     ioctl(fd, CA_GET_SLOT_INFO, &sinfo);
-     if ((sinfo.flags & CA_CI_MODULE_READY) != 0)
-        return true;
-     } while (time(NULL) - t0 < CA_RESET_TIMEOUT);
+  if (ioctl(fd, CA_RESET, 1 << Slot) != -1) {
+     time_t t0 = time(NULL);
+     do {
+        if (ioctl(fd, CA_GET_SLOT_INFO, &sinfo) != -1) {
+           ioctl(fd, CA_GET_SLOT_INFO, &sinfo);
+           if ((sinfo.flags & CA_CI_MODULE_READY) != 0) {
+              dbgprotocol("ok.\n");
+              return true;
+              }
+           }
+        else {
+           esyslog("ERROR: can't get info on CAM slot %d: %m", Slot);
+           break;
+           }
+        } while (time(NULL) - t0 < CA_RESET_TIMEOUT);
+     }
+  else
+     esyslog("ERROR: can't reset CAM slot %d: %m", Slot);
+  dbgprotocol("failed!\n");
   return false;
 }
 
@@ -818,7 +830,27 @@ cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTrans
 
 bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
 {
-  if (state == 0) {
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_CA_INFO: {
+            dbgprotocol("%d: <== Ca Info", SessionId());
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            while (l > 1) {
+                  dbgprotocol(" %04X", ((unsigned int)(*d) << 8) | *(d + 1));
+                  d += 2;
+                  l -= 2;
+                  }
+            dbgprotocol("\n");
+            }
+            state = 2;
+            break;
+       default: esyslog("ERROR: CI conditional access support: unknown tag %06X", Tag);
+                return false;
+       }
+     }
+  else if (state == 0) {
      dbgprotocol("%d: ==> Ca Info Enq\n", SessionId());
      SendData(AOT_CA_INFO_ENQ);
      state = 1;
@@ -828,7 +860,7 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
 
 bool cCiConditionalAccessSupport::SendPMT(cCiCaPmt &CaPmt)
 {
-  if (state == 1) {
+  if (state == 2) {
      SendData(AOT_CA_PMT, CaPmt.length, CaPmt.capmt);
      return true;
      }
@@ -1186,27 +1218,27 @@ cCiCaPmt::cCiCaPmt(int ProgramNumber)
   capmt[length++] = (ProgramNumber >> 8) & 0xFF;
   capmt[length++] =  ProgramNumber       & 0xFF;
   capmt[length++] = 0x00; //XXX version_number, current_next_indicator - apparently may be 0x00
-  capmt[length++] = 0x00; //XXX program_info_length H (at program level)
-  capmt[length++] = 0x00; //XXX program_info_length L
-  esInfoLengthPos = 0;
+  esInfoLengthPos = length;
+  capmt[length++] = 0x00; // program_info_length H (at program level)
+  capmt[length++] = 0x00; // program_info_length L
 }
 
 void cCiCaPmt::AddPid(int Pid)
 {
+  //XXX buffer overflow check???
   capmt[length++] = 0x00; //XXX stream_type (apparently doesn't matter)
   capmt[length++] = (Pid >> 8) & 0xFF;
   capmt[length++] =  Pid       & 0xFF;
   esInfoLengthPos = length;
+  capmt[length++] = 0x00; // ES_info_length H (at ES level)
+  capmt[length++] = 0x00; // ES_info_length L
 }
 
 void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
 {
   if (esInfoLengthPos) {
-     if (esInfoLengthPos == length) {
-        length += 2;
-        capmt[length++] = CPCI_OK_DESCRAMBLING;
-        }
      if (length + Length < int(sizeof(capmt))) {
+        capmt[length++] = CPCI_OK_DESCRAMBLING;
         memcpy(capmt + length, Data, Length);
         length += Length;
         int l = length - esInfoLengthPos - 2;
@@ -1215,6 +1247,7 @@ void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
         }
      else
         esyslog("ERROR: buffer overflow in CA descriptor");
+     esInfoLengthPos = 0;
      }
   else
      esyslog("ERROR: adding CA descriptor without Pid!");
diff --git a/config.h b/config.h
index 83045ae39..8bf33f620 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.146 2003/01/12 09:44:28 kls Exp $
+ * $Id: config.h 1.147 2003/01/26 19:50:19 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.22"
+#define VDRVERSION "1.1.23"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 2e12f260e..1ffe067aa 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.41 2003/01/06 14:44:27 kls Exp $
+ * $Id: dvbdevice.c 1.42 2003/02/02 15:31:31 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -263,22 +263,15 @@ void cDvbTuner::Action(void)
            int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
            if (length > 0) {
               cCiCaPmt CaPmt(channel.Sid());
-              if (channel.Vpid()) {
+              CaPmt.AddCaDescriptor(length, buffer);
+              if (channel.Vpid())
                  CaPmt.AddPid(channel.Vpid());
-                 CaPmt.AddCaDescriptor(length, buffer);
-                 }
-              if (channel.Apid1()) {
+              if (channel.Apid1())
                  CaPmt.AddPid(channel.Apid1());
-                 CaPmt.AddCaDescriptor(length, buffer);
-                 }
-              if (channel.Apid2()) {
+              if (channel.Apid2())
                  CaPmt.AddPid(channel.Apid2());
-                 CaPmt.AddCaDescriptor(length, buffer);
-                 }
-              if (channel.Dpid1()) {
+              if (channel.Dpid1())
                  CaPmt.AddPid(channel.Dpid1());
-                 CaPmt.AddCaDescriptor(length, buffer);
-                 }
               caSet = ciHandler->SetCaPmt(CaPmt);
               }
            }
diff --git a/eit.c b/eit.c
index 174ad6d4d..eebe82c7e 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.64 2003/01/26 12:21:15 kls Exp $
+ * $Id: eit.c 1.65 2003/02/02 15:41:03 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1349,7 +1349,7 @@ void cSIProcessor::Action()
 
 /** Add a filter with packet identifier pid and
 table identifer tid */
-bool cSIProcessor::AddFilter(u_char pid, u_char tid)
+bool cSIProcessor::AddFilter(unsigned short pid, u_char tid)
 {
    dmx_sct_filter_params sctFilterParams;
    memset(&sctFilterParams, 0, sizeof(sctFilterParams));
@@ -1390,7 +1390,7 @@ bool cSIProcessor::AddFilter(u_char pid, u_char tid)
    return false;
 }
 
-bool cSIProcessor::DelFilter(u_char pid, u_char tid)
+bool cSIProcessor::DelFilter(unsigned short pid, u_char tid)
 {
    for (int a = 0; a < MAX_FILTERS; a++)
    {
diff --git a/eit.h b/eit.h
index ec203eae8..17fa90932 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.23 2003/01/04 10:12:54 kls Exp $
+ * $Id: eit.h 1.24 2003/02/02 14:07:39 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -127,7 +127,7 @@ class cSchedules : public cList<cSchedule> {
 
 typedef struct sip_filter {
 
-  u_char pid;
+  unsigned short pid;
   u_char tid;
   int handle;
   bool inuse;
@@ -155,8 +155,8 @@ class cSIProcessor : public cThread {
   char *fileName;
   bool active;
   void Action(void);
-  bool AddFilter(u_char pid, u_char tid);
-  bool DelFilter(u_char pid, u_char tid);
+  bool AddFilter(unsigned short pid, u_char tid);
+  bool DelFilter(unsigned short pid, u_char tid);
   bool ShutDownFilters(void);
 public:
   cSIProcessor(const char *FileName);
diff --git a/ringbuffer.c b/ringbuffer.c
index 0734c28de..48622f0cb 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.12 2003/01/26 09:39:24 kls Exp $
+ * $Id: ringbuffer.c 1.13 2003/01/26 19:47:10 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -188,7 +188,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
   if (Count < 0)
      data = (uchar *)Data;
   else {
-     data = new uchar[count];
+     data = MALLOC(uchar, count);
      if (data)
         memcpy(data, Data, count);
      else
@@ -199,7 +199,7 @@ cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
 
 cFrame::~cFrame()
 {
-  delete data;
+  free(data);
 }
 
 // --- cRingBufferFrame ------------------------------------------------------

From b09aaa00a58ec72d0331a01f31b3df16d43ce90b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 9 Feb 2003 18:00:00 +0100
Subject: [PATCH 065/307] Version 1.1.24 - Improved CAM handling (thanks to
 Reinhard Walter Buchner for a great deal of help   in debugging this). It is
 now possible to insert the CAM in any of the two slots,   to insert and
 remove it while VDR is running and even to have two CAMs inserted. - Turning
 SI filtering off and on when switching channels. - Timers are now processed
 even if an OSD menu is open (except for menus that   explicitly handle
 timers).

---
 CONTRIBUTORS  |   1 +
 HISTORY       |   9 ++
 channels.conf |   1 +
 ci.c          | 314 ++++++++++++++++++++++++++++----------------------
 ci.h          |  11 +-
 config.h      |   4 +-
 dvbdevice.c   |  51 ++++----
 menu.c        |  36 ++++--
 timers.h      |   7 +-
 vdr.c         |   6 +-
 10 files changed, 260 insertions(+), 180 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ae550b813..a6663d9a1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -446,6 +446,7 @@ Oliver Endriss <o.endriss@gmx.de>
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
  for his help in testing tuning with "Motor-DiSEqC"
+ for his help in debugging CAM support
 
 Lauri Tischler <lauri.tischler@efore.fi>
  for helping to test and debug the new channel source and DiSEqC handling
diff --git a/HISTORY b/HISTORY
index 8e770ee78..93693668b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1947,3 +1947,12 @@ Video Disk Recorder Revision History
 - Fixed a new/delete malloc/free mismatch in ringbuffer.c (thanks to Stefan
   Huelswitt for reporting this one).
 - Improved CAM handling.
+
+2003-02-09: Version 1.1.24
+
+- Improved CAM handling (thanks to Reinhard Walter Buchner for a great deal of help
+  in debugging this). It is now possible to insert the CAM in any of the two slots,
+  to insert and remove it while VDR is running and even to have two CAMs inserted.
+- Turning SI filtering off and on when switching channels.
+- Timers are now processed even if an OSD menu is open (except for menus that
+  explicitly handle timers).
diff --git a/channels.conf b/channels.conf
index 8d7f567ad..0dc0a2883 100644
--- a/channels.conf
+++ b/channels.conf
@@ -150,6 +150,7 @@ QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
 Tele 5:12480:v:S19.2E:27500:1535:1536:0:0:51:0:0:0
 :@201 Sky
 Sky One:106:h:S28.2E:0:160:80:0:301:222:0:0:0
+Sky One Mix:107:h:S28.2E:0:160:80:0:301:919:0:0:0
 itv2:226:h:S28.2E:0:160:80:0:301:451:0:0:0
 sci-fi:130:h:S28.2E:0:160:80:0:301:161:0:0:0
 Paramount Comedy:127:h:S28.2E:0:160:80:0:301:185:0:0:0
diff --git a/ci.c b/ci.c
index 97de9b015..c2e10fc7f 100644
--- a/ci.c
+++ b/ci.c
@@ -4,15 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.3 2003/02/02 15:49:52 kls Exp $
+ * $Id: ci.c 1.5 2003/02/09 14:47:57 kls Exp $
  */
 
 /* XXX TODO
-- handle slots separately
-- use return values
 - update CA descriptors in case they change
-- dynamically react on CAM insert/remove
-- implement CAM reset (per slot)
 XXX*/
 
 #include "ci.h"
@@ -215,7 +211,7 @@ int cTPDU::Write(int fd)
 
 int cTPDU::Read(int fd)
 {
-  size = read(fd, data, sizeof(data));
+  size = safe_read(fd, data, sizeof(data));
   if (size < 0) {
      esyslog("ERROR: %m");
      size = 0;
@@ -229,15 +225,15 @@ void cTPDU::Dump(bool Outgoing)
 {
   if (DumpTPDUDataTransfer) {
 #define MAX_DUMP 256
-     printf("%s ", Outgoing ? "-->" : "<--");
+     fprintf(stderr, "%s ", Outgoing ? "-->" : "<--");
      for (int i = 0; i < size && i < MAX_DUMP; i++)
-         printf("%02X ", data[i]);
-     printf("%s\n", size >= MAX_DUMP ? "..." : "");
+         fprintf(stderr, "%02X ", data[i]);
+     fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : "");
      if (!Outgoing) {
-        printf("   ");
+        fprintf(stderr, "   ");
         for (int i = 0; i < size && i < MAX_DUMP; i++)
-            printf("%2c ", isprint(data[i]) ? data[i] : '.');
-        printf("%s\n", size >= MAX_DUMP ? "..." : "");
+            fprintf(stderr, "%2c ", isprint(data[i]) ? data[i] : '.');
+        fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : "");
         }
      }
 }
@@ -288,6 +284,7 @@ class cCiTransportConnection {
 public:
   cCiTransportConnection(void);
   ~cCiTransportConnection();
+  int Slot(void) const { return slot; }
   int SendData(int Length, const uint8_t *Data);
   int RecvData(void);
   const uint8_t *Data(int &Length);
@@ -324,15 +321,15 @@ int cCiTransportConnection::SendTPDU(uint8_t Tag, int Length, const uint8_t *Dat
   return TPDU.Write(fd);
 }
 
+#define CAM_READ_TIMEOUT  3500 // ms
+
 int cCiTransportConnection::RecvTPDU(void)
 {
-  //XXX poll, timeout???
   struct pollfd pfd[1];
   pfd[0].fd = fd;
   pfd[0].events = POLLIN;
   lastResponse = ERROR;
-  if (poll(pfd, 1, 3500/*XXX*/) && (pfd[0].revents & POLLIN))//XXX
-  if (tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
+  if (poll(pfd, 1, CAM_READ_TIMEOUT) && (pfd[0].revents & POLLIN) && tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
      switch (state) {
        case stIDLE:     break;
        case stCREATION: if (tpdu->Tag() == T_CTC_REPLY) {
@@ -363,6 +360,10 @@ int cCiTransportConnection::RecvTPDU(void)
                         break;
        }
      }
+  else {
+     esyslog("ERROR: CAM: Read failed: slot %d, tcid %d\n", slot, tcid);
+     Init(-1, slot, tcid);
+     }
   return lastResponse;
 }
 
@@ -385,11 +386,8 @@ int cCiTransportConnection::SendData(int Length, const uint8_t *Data)
 
 int cCiTransportConnection::RecvData(void)
 {
-  if (SendTPDU(T_RCV) == OK) {
-     if (RecvTPDU() == OK) {
-        //XXX
-        }
-     }
+  if (SendTPDU(T_RCV) == OK)
+     return RecvTPDU();
   return ERROR;
 }
 
@@ -398,12 +396,26 @@ const uint8_t *cCiTransportConnection::Data(int &Length)
   return tpdu->Data(Length);
 }
 
+#define MAX_CONNECT_RETRIES  20
+
 int cCiTransportConnection::CreateConnection(void)
 {
   if (state == stIDLE) {
      if (SendTPDU(T_CREATE_TC) == OK) {
         state = stCREATION;
-        return OK;
+        if (RecvTPDU() == T_CTC_REPLY)
+           return OK;
+        // the following is a workaround for CAMs that don't quite follow the specs...
+        else {
+           for (int i = 0; i < MAX_CONNECT_RETRIES; i++) {
+               dsyslog("CAM: retrying to establish connection");
+               if (RecvTPDU() == T_CTC_REPLY) {
+                  dsyslog("CAM: connection established");
+                  return OK;
+                  }
+               }
+           return ERROR;
+           }
         }
      }
   return ERROR;
@@ -412,9 +424,8 @@ int cCiTransportConnection::CreateConnection(void)
 int cCiTransportConnection::Poll(void)
 {
   if (state == stACTIVE) {
-     if (SendTPDU(T_DATA_LAST) == OK) {
+     if (SendTPDU(T_DATA_LAST) == OK)
         return RecvTPDU();
-        }
      }
   return ERROR;
 }
@@ -428,11 +439,12 @@ class cCiTransportLayer {
   int fd;
   int numSlots;
   cCiTransportConnection tc[MAX_CI_CONNECT];
-  bool ResetSlot(int Slot);
 public:
   cCiTransportLayer(int Fd, int NumSlots);
-  cCiTransportConnection *NewConnection(void);
-  int Process(void);
+  cCiTransportConnection *NewConnection(int Slot);
+  bool ResetSlot(int Slot);
+  bool ModuleReady(int Slot);
+  cCiTransportConnection *Process(int Slot);
   };
 
 cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
@@ -441,46 +453,28 @@ cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
   numSlots = NumSlots;
   for (int s = 0; s < numSlots; s++)
       ResetSlot(s);
-  for (int i = 0; i < MAX_CI_CONNECT; i++)
-      tc[i].Init(fd, 0/*XXX*/, i + 1);
 }
 
-cCiTransportConnection *cCiTransportLayer::NewConnection(void)
+cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot)
 {
   for (int i = 0; i < MAX_CI_CONNECT; i++) {
       if (tc[i].State() == stIDLE) {
-         if (tc[i].CreateConnection() == OK) {
-            if (tc[i].RecvTPDU() == T_CTC_REPLY)
-               return &tc[i];
-            }
+         dbgprotocol("Creating connection: slot %d, tcid %d\n", Slot, i + 1);
+         tc[i].Init(fd, Slot, i + 1);
+         if (tc[i].CreateConnection() == OK)
+            return &tc[i];
          break;
          }
       }
   return NULL;
 }
 
-#define CA_RESET_TIMEOUT  3 // seconds
-
 bool cCiTransportLayer::ResetSlot(int Slot)
 {
   dbgprotocol("Resetting slot %d...", Slot);
-  ca_slot_info_t sinfo;
-  sinfo.num = Slot;
   if (ioctl(fd, CA_RESET, 1 << Slot) != -1) {
-     time_t t0 = time(NULL);
-     do {
-        if (ioctl(fd, CA_GET_SLOT_INFO, &sinfo) != -1) {
-           ioctl(fd, CA_GET_SLOT_INFO, &sinfo);
-           if ((sinfo.flags & CA_CI_MODULE_READY) != 0) {
-              dbgprotocol("ok.\n");
-              return true;
-              }
-           }
-        else {
-           esyslog("ERROR: can't get info on CAM slot %d: %m", Slot);
-           break;
-           }
-        } while (time(NULL) - t0 < CA_RESET_TIMEOUT);
+     dbgprotocol("ok.\n");
+     return true;
      }
   else
      esyslog("ERROR: can't reset CAM slot %d: %m", Slot);
@@ -488,35 +482,55 @@ bool cCiTransportLayer::ResetSlot(int Slot)
   return false;
 }
 
-int cCiTransportLayer::Process(void)
+bool cCiTransportLayer::ModuleReady(int Slot)
+{
+  ca_slot_info_t sinfo;
+  sinfo.num = Slot;
+  if (ioctl(fd, CA_GET_SLOT_INFO, &sinfo) != -1)
+     return sinfo.flags & CA_CI_MODULE_READY;
+  else
+     esyslog("ERROR: can't get info on CAM slot %d: %m", Slot);
+  return false;
+}
+
+cCiTransportConnection *cCiTransportLayer::Process(int Slot)
 {
   for (int i = 0; i < MAX_CI_CONNECT; i++) {
       cCiTransportConnection *Tc = &tc[i];
-      if (Tc->State() == stACTIVE) {
-         if (!Tc->DataAvailable()) {
-            if (Tc->Poll() != OK)
-               ;//XXX continue;
-            }
-         switch (Tc->LastResponse()) {
-           case T_REQUEST_TC:
-                //XXX
-                break;
-           case T_DATA_MORE:
-           case T_DATA_LAST:
-           case T_CTC_REPLY:
-           case T_SB:
-                if (Tc->DataAvailable())
-                   Tc->RecvData();
-                break;
-           case TIMEOUT:
-           case ERROR:
-           default:
-                //XXX Tc->state = stIDLE;//XXX Init()???
+      if (Tc->Slot() == Slot) {
+         switch (Tc->State()) {
+           case stCREATION:
+           case stACTIVE:
+                if (!Tc->DataAvailable()) {
+                   if (Tc->Poll() != OK)
+                      ;//XXX continue;
+                   }
+                switch (Tc->LastResponse()) {
+                  case T_REQUEST_TC:
+                       //XXX
+                       break;
+                  case T_DATA_MORE:
+                  case T_DATA_LAST:
+                  case T_CTC_REPLY:
+                  case T_SB:
+                       if (Tc->DataAvailable())
+                          Tc->RecvData();
+                       break;
+                  case TIMEOUT:
+                  case ERROR:
+                  default:
+                       //XXX Tc->state = stIDLE;//XXX Init()???
+                       return NULL;
+                       break;
+                  }
+                //XXX this will only work with _one_ transport connection per slot!
+                return Tc;
                 break;
+           default: ;
            }
          }
       }
-  return OK;
+  return NULL;
 }
 
 // -- cCiSession -------------------------------------------------------------
@@ -608,6 +622,7 @@ class cCiSession {
 public:
   cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc);
   virtual ~cCiSession();
+  const cCiTransportConnection *Tc(void) { return tc; }
   int SessionId(void) { return sessionId; }
   int ResourceId(void) { return resourceId; }
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
@@ -1261,9 +1276,7 @@ cCiHandler::cCiHandler(int Fd, int NumSlots)
   for (int i = 0; i < MAX_CI_SESSION; i++)
       sessions[i] = NULL;
   tpl = new cCiTransportLayer(Fd, numSlots);
-  tc = tpl->NewConnection();
-  if (!tc)
-     isyslog("CAM: no CAM detected");
+  tc = NULL;
 }
 
 cCiHandler::~cCiHandler()
@@ -1281,14 +1294,9 @@ cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
      if (ioctl(fd_ca, CA_GET_CAP, &Caps) == 0) {
         int NumSlots = Caps.slot_num;
         if (NumSlots > 0) {
-           dsyslog("CAM: found %d CAM slots", NumSlots);
-           if (Caps.slot_type == CA_CI_LINK) {
-              cCiHandler *CiHandler = new cCiHandler(fd_ca, NumSlots);
-              // drive the initial data exchange:
-              for (int i = 0; i < 20; i++) //XXX make this dynamic???
-                  CiHandler->Process();
-              return CiHandler;
-              }
+           //XXX dsyslog("CAM: found %d CAM slots", NumSlots); // TODO let's do this only once we can be sure that there _really_ is a CAM adapter!
+           if (Caps.slot_type == CA_CI_LINK)
+              return new cCiHandler(fd_ca, NumSlots);
            else
               esyslog("ERROR: CAM doesn't support link layer interface");
            }
@@ -1320,7 +1328,7 @@ bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
   *(short *)p = htons(SessionId);
   p += 2;
   buffer[1] = p - buffer - 2; // length
-  return tc->SendData(p - buffer, buffer) == OK;
+  return tc && tc->SendData(p - buffer, buffer) == OK;
 }
 
 cCiSession *cCiHandler::GetSessionBySessionId(int SessionId)
@@ -1332,10 +1340,10 @@ cCiSession *cCiHandler::GetSessionBySessionId(int SessionId)
   return NULL;
 }
 
-cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId)
+cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId, int Slot)
 {
   for (int i = 0; i < MAX_CI_SESSION; i++) {
-      if (sessions[i] && sessions[i]->ResourceId() == ResourceId)
+      if (sessions[i] && sessions[i]->Tc()->Slot() == Slot && sessions[i]->ResourceId() == ResourceId)
          return sessions[i];
       }
   return NULL;
@@ -1343,7 +1351,7 @@ cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId)
 
 cCiSession *cCiHandler::CreateSession(int ResourceId)
 {
-  if (!GetSessionByResourceId(ResourceId)) {
+  if (!GetSessionByResourceId(ResourceId, tc->Slot())) {
      for (int i = 0; i < MAX_CI_SESSION; i++) {
          if (!sessions[i]) {
             switch (ResourceId) {
@@ -1403,81 +1411,107 @@ bool cCiHandler::CloseSession(int SessionId)
   return false;
 }
 
-bool cCiHandler::Process(void)
-{
-  if (tc) {
-     cMutexLock MutexLock(&mutex);
-     if (tpl->Process() == OK) {
-        int Length;
-        const uint8_t *Data = tc->Data(Length);
-        if (Data && Length > 1) {
-           switch (*Data) {
-             case ST_SESSION_NUMBER:          if (Length > 4) {
-                                                 int SessionId = ntohs(*(short *)&Data[2]);
-                                                 cCiSession *Session = GetSessionBySessionId(SessionId);
-                                                 if (Session)
-                                                    return Session->Process(Length - 4, Data + 4);
-                                                 else {
-                                                    esyslog("ERROR: unknown session id: %d", SessionId);
-                                                    return false;
-                                                    }
-                                                 }
-                                              break;
-             case ST_OPEN_SESSION_REQUEST:    return OpenSession(Length, Data);
-             case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
-                                                 return CloseSession(ntohs(*(short *)&Data[2]));
-                                              break;
-             case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
-             case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
-             default: esyslog("ERROR: unknown session tag: %02X", *Data);
-                      return false;
-             }
-           return true;
-           }
-        for (int i = 0; i < MAX_CI_SESSION; i++) {
-            if (sessions[i])
-               sessions[i]->Process();//XXX retval???
+int cCiHandler::CloseAllSessions(int Slot)
+{
+  int result = 0;
+  for (int i = 0; i < MAX_CI_SESSION; i++) {
+      if (sessions[i] && sessions[i]->Tc()->Slot() == Slot) {
+         CloseSession(sessions[i]->SessionId());
+         result++;
+         }
+      }
+  return result;
+}
+
+void cCiHandler::Process(void)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      tc = tpl->Process(Slot);
+      if (tc) {
+         int Length;
+         const uint8_t *Data = tc->Data(Length);
+         if (Data && Length > 1) {
+            switch (*Data) {
+              case ST_SESSION_NUMBER:          if (Length > 4) {
+                                                  int SessionId = ntohs(*(short *)&Data[2]);
+                                                  cCiSession *Session = GetSessionBySessionId(SessionId);
+                                                  if (Session)
+                                                     Session->Process(Length - 4, Data + 4);
+                                                  else
+                                                     esyslog("ERROR: unknown session id: %d", SessionId);
+                                                  }
+                                               break;
+              case ST_OPEN_SESSION_REQUEST:    OpenSession(Length, Data);
+                                               break;
+              case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
+                                                  CloseSession(ntohs(*(short *)&Data[2]));
+                                               break;
+              case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
+              case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
+              default: esyslog("ERROR: unknown session tag: %02X", *Data);
+              }
             }
-        }
-     }
-  return false;
+         }
+      else {
+         if (!CloseAllSessions(Slot)) {
+            if (tpl->ModuleReady(Slot)) {
+               dbgprotocol("Module ready in slot %d\n", Slot);
+               tpl->NewConnection(Slot);
+               }
+            }
+         }
+      }
+  for (int i = 0; i < MAX_CI_SESSION; i++) {
+      if (sessions[i])
+         sessions[i]->Process();
+      }
 }
 
-bool cCiHandler::EnterMenu(void)
+bool cCiHandler::EnterMenu(int Slot)
 {
   cMutexLock MutexLock(&mutex);
-  //XXX slots???
-  cCiApplicationInformation *api = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION);
+  cCiApplicationInformation *api = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION, Slot);
   return api ? api->EnterMenu() : false;
 }
 
 cCiMenu *cCiHandler::GetMenu(void)
 {
   cMutexLock MutexLock(&mutex);
-  //XXX slots???
-  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
-  return mmi ? mmi->Menu() : NULL;
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot);
+      if (mmi)
+         return mmi->Menu();
+      }
+  return NULL;
 }
 
 cCiEnquiry *cCiHandler::GetEnquiry(void)
 {
   cMutexLock MutexLock(&mutex);
-  //XXX slots???
-  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
-  return mmi ? mmi->Enquiry() : NULL;
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot);
+      if (mmi)
+         return mmi->Enquiry();
+      }
+  return NULL;
 }
 
 bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt)
 {
   cMutexLock MutexLock(&mutex);
-  //XXX slots???
-  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
-  return cas ? cas->SendPMT(CaPmt) : false;
+  bool result = false;
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+      if (cas)
+         result |= cas->SendPMT(CaPmt);
+      }
+  return result;
 }
 
-bool cCiHandler::Reset(void)
+bool cCiHandler::Reset(int Slot)
 {
   cMutexLock MutexLock(&mutex);
-  //XXX slots???
-  return false;//XXX not yet implemented
+  CloseAllSessions(Slot);
+  return tpl->ResetSlot(Slot);
 }
diff --git a/ci.h b/ci.h
index c9cd6f54e..5d33b6112 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.1 2003/01/06 12:31:09 kls Exp $
+ * $Id: ci.h 1.2 2003/02/09 11:44:00 kls Exp $
  */
 
 #ifndef __CI_H
@@ -86,20 +86,21 @@ class cCiHandler {
   int ResourceIdToInt(const uint8_t *Data);
   bool Send(uint8_t Tag, int SessionId, int ResourceId = 0, int Status = -1);
   cCiSession *GetSessionBySessionId(int SessionId);
-  cCiSession *GetSessionByResourceId(int ResourceId);
+  cCiSession *GetSessionByResourceId(int ResourceId, int Slot);
   cCiSession *CreateSession(int ResourceId);
   bool OpenSession(int Length, const uint8_t *Data);
   bool CloseSession(int SessionId);
+  int CloseAllSessions(int Slot);
   cCiHandler(int Fd, int NumSlots);
 public:
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
-  bool Process(void);
-  bool EnterMenu(void);
+  void Process(void);
+  bool EnterMenu(int Slot);
   cCiMenu *GetMenu(void);
   cCiEnquiry *GetEnquiry(void);
   bool SetCaPmt(cCiCaPmt &CaPmt);
-  bool Reset(void);
+  bool Reset(int Slot);
   };
 
 #endif //__CI_H
diff --git a/config.h b/config.h
index 8bf33f620..1760eed97 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.147 2003/01/26 19:50:19 kls Exp $
+ * $Id: config.h 1.148 2003/02/08 10:25:44 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.23"
+#define VDRVERSION "1.1.24"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 1ffe067aa..e587f69bd 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.42 2003/02/02 15:31:31 kls Exp $
+ * $Id: dvbdevice.c 1.44 2003/02/09 12:41:14 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -238,6 +238,7 @@ bool cDvbTuner::SetFrontend(void)
 
 void cDvbTuner::Action(void)
 {
+  time_t StartTime = time(NULL);
   dsyslog("tuner thread started on device %d (pid=%d)", cardIndex + 1, getpid());
   active = true;
   while (active) {
@@ -258,24 +259,28 @@ void cDvbTuner::Action(void)
               continue;
               }
            }
-        if (ciHandler && !caSet) {//XXX TODO update in case the CA descriptors have changed
-           uchar buffer[2048];
-           int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
-           if (length > 0) {
-              cCiCaPmt CaPmt(channel.Sid());
-              CaPmt.AddCaDescriptor(length, buffer);
-              if (channel.Vpid())
-                 CaPmt.AddPid(channel.Vpid());
-              if (channel.Apid1())
-                 CaPmt.AddPid(channel.Apid1());
-              if (channel.Apid2())
-                 CaPmt.AddPid(channel.Apid2());
-              if (channel.Dpid1())
-                 CaPmt.AddPid(channel.Dpid1());
-              caSet = ciHandler->SetCaPmt(CaPmt);
+        if (ciHandler) {
+           ciHandler->Process();
+           if (!caSet) {//XXX TODO update in case the CA descriptors have changed
+              uchar buffer[2048];
+              int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
+              if (length > 0) {
+                 cCiCaPmt CaPmt(channel.Sid());
+                 CaPmt.AddCaDescriptor(length, buffer);
+                 if (channel.Vpid())
+                    CaPmt.AddPid(channel.Vpid());
+                 if (channel.Apid1())
+                    CaPmt.AddPid(channel.Apid1());
+                 if (channel.Apid2())
+                    CaPmt.AddPid(channel.Apid2());
+                 if (channel.Dpid1())
+                    CaPmt.AddPid(channel.Dpid1());
+                 caSet = ciHandler->SetCaPmt(CaPmt);
+                 }
               }
            }
-        newSet.TimedWait(mutex, 1000);
+        // in the beginning we loop more often to let the CAM connection start up fast
+        newSet.TimedWait(mutex, (ciHandler && (time(NULL) - StartTime < 20)) ? 100 : 1000);
         }
   dsyslog("tuner thread ended on device %d (pid=%d)", cardIndex + 1, getpid());
 }
@@ -617,10 +622,12 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   StartTransferMode = false;
 #endif
 
-  // Stop setting system time:
+  // Stop SI filtering:
 
-  if (siProcessor)
+  if (siProcessor) {
      siProcessor->SetCurrentTransponder(0, 0);
+     siProcessor->SetStatus(false);
+     }
 
   // Turn off live PIDs if necessary:
 
@@ -669,10 +676,12 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   else if (StartTransferMode)
      cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));
 
-  // Start setting system time:
+  // Start SI filtering:
 
-  if (siProcessor)
+  if (siProcessor) {
      siProcessor->SetCurrentTransponder(Channel->Source(), Channel->Frequency());
+     siProcessor->SetStatus(true);
+     }
 
   return true;
 }
diff --git a/menu.c b/menu.c
index 081a4ba14..1a34e42cf 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.232 2003/01/19 14:59:46 kls Exp $
+ * $Id: menu.c 1.234 2003/02/09 12:55:38 kls Exp $
  */
 
 #include "menu.h"
@@ -837,6 +837,7 @@ class cMenuEditTimer : public cOsdMenu {
   void SetFirstDayItem(void);
 public:
   cMenuEditTimer(int Index, bool New = false);
+  virtual ~cMenuEditTimer();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -860,6 +861,12 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
      Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), tr(FileNameChars)));
      SetFirstDayItem();
      }
+  Timers.IncBeingEdited();
+}
+
+cMenuEditTimer::~cMenuEditTimer()
+{
+  Timers.DecBeingEdited();
 }
 
 void cMenuEditTimer::SetFirstDayItem(void)
@@ -964,6 +971,7 @@ class cMenuTimers : public cOsdMenu {
   cTimer *CurrentTimer(void);
 public:
   cMenuTimers(void);
+  virtual ~cMenuTimers();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -980,6 +988,12 @@ cMenuTimers::cMenuTimers(void)
   if (Setup.SortTimers)
      Sort();
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? tr("On/Off") : tr("Mark"));
+  Timers.IncBeingEdited();
+}
+
+cMenuTimers::~cMenuTimers()
+{
+  Timers.DecBeingEdited();
 }
 
 cTimer *cMenuTimers::CurrentTimer(void)
@@ -1537,6 +1551,7 @@ cMenuCam::cMenuCam(cCiMenu *CiMenu)
   Add(new cOsdItem(ciMenu->SubTitleText()));
   Add(new cOsdItem(ciMenu->BottomText()));
   Display();
+  dsyslog("CAM: Menu - %s", ciMenu->TitleText());
 }
 
 cMenuCam::~cMenuCam()
@@ -1622,7 +1637,6 @@ cOsdObject *CamControl(void)
       if (Device) {
          cCiHandler *CiHandler = Device->CiHandler();
          if (CiHandler) {
-            CiHandler->Process();
             cCiMenu *CiMenu = CiHandler->GetMenu();
             if (CiMenu)
                return new cMenuCam(CiMenu);
@@ -2069,7 +2083,7 @@ class cMenuSetupCICAM : public cMenuSetupBase {
 private:
   int helpKeys;
   void SetHelpKeys(void);
-  cCiHandler *GetCurrentCiHandler(void);
+  cCiHandler *GetCurrentCiHandler(int *Slot = NULL);
   eOSState Menu(void);
   eOSState Reset(void);
 public:
@@ -2091,9 +2105,11 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
   SetHelpKeys();
 }
 
-cCiHandler *cMenuSetupCICAM::GetCurrentCiHandler(void)
+cCiHandler *cMenuSetupCICAM::GetCurrentCiHandler(int *Slot)
 {
   cDevice *Device = cDevice::GetDevice(Current() / 2);
+  if (Slot)
+     *Slot = Current() % 2;
   return Device ? Device->CiHandler() : NULL;
 }
 
@@ -2112,8 +2128,9 @@ void cMenuSetupCICAM::SetHelpKeys(void)
 
 eOSState cMenuSetupCICAM::Menu(void)
 {
-  cCiHandler *CiHandler = GetCurrentCiHandler();
-  if (CiHandler && CiHandler->EnterMenu())
+  int Slot = 0;
+  cCiHandler *CiHandler = GetCurrentCiHandler(&Slot);
+  if (CiHandler && CiHandler->EnterMenu(Slot))
      return osEnd; // the CAM menu will be executed explicitly from the main loop
   else
      Interface->Error(tr("Can't open CAM menu!"));
@@ -2122,9 +2139,12 @@ eOSState cMenuSetupCICAM::Menu(void)
 
 eOSState cMenuSetupCICAM::Reset(void)
 {
-  cCiHandler *CiHandler = GetCurrentCiHandler();
-  if (CiHandler && CiHandler->Reset())
+  int Slot = 0;
+  cCiHandler *CiHandler = GetCurrentCiHandler(&Slot);
+  if (CiHandler && CiHandler->Reset(Slot)) {
      Interface->Info(tr("CAM has been reset"));
+     return osEnd;
+     }
   else
      Interface->Error(tr("Can't reset CAM!"));
   return osContinue;
diff --git a/timers.h b/timers.h
index 3d3088882..a179e52cf 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.3 2002/11/24 11:50:56 kls Exp $
+ * $Id: timers.h 1.4 2003/02/09 12:49:45 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -80,10 +80,15 @@ class cTimer : public cListObject {
   };
 
 class cTimers : public cConfig<cTimer> {
+private:
+  int beingEdited;
 public:
   cTimer *GetTimer(cTimer *Timer);
   cTimer *GetMatch(time_t t);
   cTimer *GetNextActiveTimer(void);
+  int BeingEdited(void) { return beingEdited; }
+  void IncBeingEdited(void) { beingEdited++; }
+  void DecBeingEdited(void) { beingEdited--; }
   };
 
 extern cTimers Timers;
diff --git a/vdr.c b/vdr.c
index 87550ded0..dfaf5dcbb 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.141 2003/01/26 11:56:31 kls Exp $
+ * $Id: vdr.c 1.143 2003/02/09 13:13:42 kls Exp $
  */
 
 #include <getopt.h>
@@ -459,7 +459,7 @@ int main(int argc, char *argv[])
            LastChannel = cDevice::CurrentChannel();
            }
         // Timers and Recordings:
-        if (!Menu) {
+        if (!Timers.BeingEdited()) {
            time_t Now = time(NULL); // must do both following calls with the exact same time!
            cRecordControls::Process(Now);
            cTimer *Timer = Timers.GetMatch(Now);
@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
               }
            }
         // CAM control:
-        if (!Menu)
+        if (!Interface->IsOpen())
            Menu = CamControl();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();

From b6e4637356502e707fdfc4b97ed1856e08de3df1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 16 Feb 2003 18:00:00 +0100
Subject: [PATCH 066/307] Version 1.1.25 - Fixed high CPU load during replay
 (thanks to Marcel Wiesweg for pointing out this   one). - Fixed margin
 handling in cRingBufferLinear. - Now polling the output device in 'Transfer
 Mode' and retrying to put packets   into the ring buffer. - Resetting the CAM
 slot in case communication breaks down. - Improved keyboard detection (thanks
 to Werner Fink). - Updated 'channels.conf.terr' (thanks to Andy Carter). -
 Fixed broken support for raw OSDs of plugins (thanks to Marcel Wiesweg for  
 reporting this one). - Broken CAM connections are now restored automatically.

---
 CONTRIBUTORS       |  5 ++++
 HISTORY            | 14 +++++++++
 channels.conf.terr | 63 +++++++++++++++++++++------------------
 ci.c               | 20 +++++++------
 ci.h               |  4 +--
 config.h           |  4 +--
 dvbdevice.c        | 74 +++++++++++++++++++++++++++-------------------
 dvbplayer.c        |  6 ++--
 ringbuffer.c       | 15 ++++++----
 transfer.c         | 34 +++++++++++++--------
 vdr.c              |  6 ++--
 11 files changed, 149 insertions(+), 96 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a6663d9a1..fe70f1afc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -217,6 +217,7 @@ Werner Fink <werner@suse.de>
  contains Dolby Digital data
  for improving thread locking in the ring buffer to avoid possible race conditions
  under heavy load
+ for improving keyboard detection
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -539,3 +540,7 @@ Teemu Rantanen <tvr@iki.fi>
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
+
+Marcel Wiesweg <marcel.wiesweg@gmx.de>
+ for pointing out a problem with high CPU load during replay
+ for reporting broken support for raw OSDs of plugins
diff --git a/HISTORY b/HISTORY
index 93693668b..50e5bf563 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1956,3 +1956,17 @@ Video Disk Recorder Revision History
 - Turning SI filtering off and on when switching channels.
 - Timers are now processed even if an OSD menu is open (except for menus that
   explicitly handle timers).
+
+2003-02-16: Version 1.1.25
+
+- Fixed high CPU load during replay (thanks Marcel Wiesweg for pointing out this
+  one).
+- Fixed margin handling in cRingBufferLinear.
+- Now polling the output device in 'Transfer Mode' and retrying to put packets
+  into the ring buffer.
+- Resetting the CAM slot in case communication breaks down.
+- Improved keyboard detection (thanks to Werner Fink).
+- Updated 'channels.conf.terr' (thanks to Andy Carter).
+- Fixed broken support for raw OSDs of plugins (thanks to Marcel Wiesweg for
+  reporting this one).
+- Broken CAM connections are now restored automatically.
diff --git a/channels.conf.terr b/channels.conf.terr
index f48d5663b..b61831925 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -1,43 +1,50 @@
 : UK channels for Crystal Palace, London
-BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164:0:0:0
-BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228:0:0:0
-BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351:0:0:0
+701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456:0:0:0
+702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411,412:0:0:19520:0:0:0
+BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832:0:0:0
 BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415:0:0:0
-Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800:0:0:0
-ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325:0:0:0
-ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261:0:0:0
+BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:0:0:4164:0:0:0
+BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351:0:0:0
+BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228:0:0:0
+bid-up.tv (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6273:6274:0:0:14272:0:0:0
+CBBC (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4671:0:0:0
+Cbeebies (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16960:0:0:0
+Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841:2843:0:0:8800:0:0
+Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
+Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
 Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0
+f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856:0:0:0
 five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866:0:0:0
+ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261:0:0:0
+ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325:0:0:0
+ITV News (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2850:2851:0:0:8581:0:0:0
 QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120:0:0:0
-TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632:0:0:0
-ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760:0:0:0
-BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768:0:0:0
-BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832:0:0:0
-BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920:0:0:0
-BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984:0:0:0
-BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048:0:0:0
-BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112:0:0:0
-1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176:0:0:0
-BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240:0:0:0
-701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456:0:0:0
-702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520:0:0:0
 Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080:0:0:0
 Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144:0:0:0
 Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208:0:0:0
-UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272:0:0:0
 THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664:0:0:0
 TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728:0:0:0
-UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792:0:0:0
-f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856:0:0:0
-Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
-Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
-KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
-Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304:0:0:0
+TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632:0:0:0
+UKBrightIdeas (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25792:0:0:0
+UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272:0:0:0
+1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176:0:0:0
+BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984:0:0:0
+BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048:0:0:0
+BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112:0:0:0
+BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240:0:0:0
+BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768:0:0:0
+BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920:0:0:0
+BBC Radio 1 (RADIO):561833:I0C23D0M64B8T2G32Y0:T:27500:0:6210:0:0:14336:0:0:0
+BBC Radio 2 (RADIO):561833:I0C23D0M64B8T2G32Y0:T:27500:0:6226:0:0:14400:0:0:0
+BBC Radio 3 (RADIO):561833:I0C23D0M64B8T2G32Y0:T:27500:0:6242:0:0:14464:0:0:0
+BBC Radio 4 (RADIO):561833:I0C23D0M64B8T2G32Y0:T:27500:0:6258:0:0:14528:0:0:0
+BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496:0:0:0
+Ch 15 (RADIO):561833:I0C23D0M64B8T2G32Y0:T:27500:0:660:0:0:14208:0:0:0
 jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368:0:0:0
+Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304:0:0:0
+KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
 oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0
-BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496:0:0:0
-Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:1
-Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
+Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
 : DVB-T Berlin Germany
 PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403:0:0:0
 SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408:0:0:0
diff --git a/ci.c b/ci.c
index c2e10fc7f..d345a3ef4 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.5 2003/02/09 14:47:57 kls Exp $
+ * $Id: ci.c 1.7 2003/02/16 11:20:55 kls Exp $
  */
 
 /* XXX TODO
@@ -1423,8 +1423,9 @@ int cCiHandler::CloseAllSessions(int Slot)
   return result;
 }
 
-void cCiHandler::Process(void)
+bool cCiHandler::Process(void)
 {
+  bool result = true;
   cMutexLock MutexLock(&mutex);
   for (int Slot = 0; Slot < numSlots; Slot++) {
       tc = tpl->Process(Slot);
@@ -1453,19 +1454,20 @@ void cCiHandler::Process(void)
               }
             }
          }
-      else {
-         if (!CloseAllSessions(Slot)) {
-            if (tpl->ModuleReady(Slot)) {
-               dbgprotocol("Module ready in slot %d\n", Slot);
-               tpl->NewConnection(Slot);
-               }
-            }
+      else if (CloseAllSessions(Slot)) {
+         tpl->ResetSlot(Slot);
+         result = false;
+         }
+      else if (tpl->ModuleReady(Slot)) {
+         dbgprotocol("Module ready in slot %d\n", Slot);
+         tpl->NewConnection(Slot);
          }
       }
   for (int i = 0; i < MAX_CI_SESSION; i++) {
       if (sessions[i])
          sessions[i]->Process();
       }
+  return result;
 }
 
 bool cCiHandler::EnterMenu(int Slot)
diff --git a/ci.h b/ci.h
index 5d33b6112..255292a21 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.2 2003/02/09 11:44:00 kls Exp $
+ * $Id: ci.h 1.3 2003/02/16 10:55:21 kls Exp $
  */
 
 #ifndef __CI_H
@@ -95,7 +95,7 @@ class cCiHandler {
 public:
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
-  void Process(void);
+  bool Process(void);
   bool EnterMenu(int Slot);
   cCiMenu *GetMenu(void);
   cCiEnquiry *GetEnquiry(void);
diff --git a/config.h b/config.h
index 1760eed97..d050516c4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.148 2003/02/08 10:25:44 kls Exp $
+ * $Id: config.h 1.149 2003/02/15 11:01:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.24"
+#define VDRVERSION "1.1.25"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index e587f69bd..ba6087064 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.44 2003/02/09 12:41:14 kls Exp $
+ * $Id: dvbdevice.c 1.46 2003/02/16 15:10:39 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -65,7 +65,7 @@ static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
 
 class cDvbTuner : public cThread {
 private:
-  enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
+  enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked, tsCam };
   int fd_frontend;
   int cardIndex;
   fe_type_t frontendType;
@@ -73,8 +73,8 @@ class cDvbTuner : public cThread {
   cChannel channel;
   const char *diseqcCommands;
   bool active;
+  time_t startTime;
   eTunerStatus tunerStatus;
-  bool caSet;
   cMutex mutex;
   cCondVar newSet;
   bool SetFrontend(void);
@@ -96,7 +96,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   diseqcCommands = NULL;
   active = false;
   tunerStatus = tsIdle;
-  caSet = false;
+  startTime = time(NULL);
   Start();
 }
 
@@ -119,7 +119,10 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune)
   channel = *Channel;
   if (Tune)
      tunerStatus = tsSet;
-  caSet = false;
+  else if (tunerStatus == tsCam)
+     tunerStatus = tsTuned;
+  if (Channel->Ca())
+     startTime = time(NULL);
   newSet.Broadcast();
 }
 
@@ -238,7 +241,6 @@ bool cDvbTuner::SetFrontend(void)
 
 void cDvbTuner::Action(void)
 {
-  time_t StartTime = time(NULL);
   dsyslog("tuner thread started on device %d (pid=%d)", cardIndex + 1, getpid());
   active = true;
   while (active) {
@@ -251,36 +253,46 @@ void cDvbTuner::Action(void)
            if (status & FE_HAS_LOCK)
               tunerStatus = tsLocked;
            }
-        dvb_frontend_event event;
-        if (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0) {
-           if (tunerStatus != tsIdle && event.status & FE_REINIT) {
-              tunerStatus = tsSet;
-              esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
-              continue;
+        if (tunerStatus != tsIdle) {
+           dvb_frontend_event event;
+           if (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0) {
+              if (event.status & FE_REINIT) {
+                 tunerStatus = tsSet;
+                 esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
+                 continue;
+                 }
               }
-           }
-        if (ciHandler) {
-           ciHandler->Process();
-           if (!caSet) {//XXX TODO update in case the CA descriptors have changed
-              uchar buffer[2048];
-              int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
-              if (length > 0) {
-                 cCiCaPmt CaPmt(channel.Sid());
-                 CaPmt.AddCaDescriptor(length, buffer);
-                 if (channel.Vpid())
-                    CaPmt.AddPid(channel.Vpid());
-                 if (channel.Apid1())
-                    CaPmt.AddPid(channel.Apid1());
-                 if (channel.Apid2())
-                    CaPmt.AddPid(channel.Apid2());
-                 if (channel.Dpid1())
-                    CaPmt.AddPid(channel.Dpid1());
-                 caSet = ciHandler->SetCaPmt(CaPmt);
+           if (tunerStatus >= tsLocked) {
+              if (ciHandler) {
+                 if (ciHandler->Process()) {
+                    if (tunerStatus != tsCam) {//XXX TODO update in case the CA descriptors have changed
+                       uchar buffer[2048];
+                       int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
+                       if (length > 0) {
+                          cCiCaPmt CaPmt(channel.Sid());
+                          CaPmt.AddCaDescriptor(length, buffer);
+                          if (channel.Vpid())
+                             CaPmt.AddPid(channel.Vpid());
+                          if (channel.Apid1())
+                             CaPmt.AddPid(channel.Apid1());
+                          if (channel.Apid2())
+                             CaPmt.AddPid(channel.Apid2());
+                          if (channel.Dpid1())
+                             CaPmt.AddPid(channel.Dpid1());
+                          if (ciHandler->SetCaPmt(CaPmt)) {
+                             tunerStatus = tsCam;
+                             startTime = 0;
+                             }
+                          }
+                       }
+                    }
+                 else
+                    tunerStatus = tsLocked;
                  }
               }
            }
         // in the beginning we loop more often to let the CAM connection start up fast
-        newSet.TimedWait(mutex, (ciHandler && (time(NULL) - StartTime < 20)) ? 100 : 1000);
+        newSet.TimedWait(mutex, (ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
         }
   dsyslog("tuner thread ended on device %d (pid=%d)", cardIndex + 1, getpid());
 }
diff --git a/dvbplayer.c b/dvbplayer.c
index 1d140ea9d..5aff35119 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.17 2003/01/19 15:43:58 kls Exp $
+ * $Id: dvbplayer.c 1.18 2003/02/15 10:38:59 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -420,8 +420,6 @@ void cDvbPlayer::Action(void)
   running = true;
   while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
         cPoller Poller;
-        if (!readFrame)
-           Poller.Add(replayFile, false);
         if (DevicePoll(Poller, 100)) {
 
            LOCK_THREAD;
@@ -532,7 +530,7 @@ void cDvbPlayer::Action(void)
                  backTrace->Add(playFrame->Index(), playFrame->Count());
                  ringBuffer->Drop(playFrame);
                  playFrame = NULL;
-                 p = 0;
+                 p = NULL;
                  }
               }
            }
diff --git a/ringbuffer.c b/ringbuffer.c
index 48622f0cb..9eecbba12 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.13 2003/01/26 19:47:10 kls Exp $
+ * $Id: ringbuffer.c 1.14 2003/02/15 13:21:50 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -34,14 +34,14 @@ cRingBuffer::~cRingBuffer()
 void cRingBuffer::WaitForPut(void)
 {
   putMutex.Lock();
-  readyForPut.Wait(putMutex);
+  readyForPut.TimedWait(putMutex, 1000);
   putMutex.Unlock();
 }
 
 void cRingBuffer::WaitForGet(void)
 {
   getMutex.Lock();
-  readyForGet.Wait(getMutex);
+  readyForGet.TimedWait(getMutex, 10);
   getMutex.Unlock();
 }
 
@@ -102,7 +102,7 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
      Lock();
      int rest = Size() - head;
      int diff = tail - head;
-     int free = (diff > 0) ? diff - 1 : Size() + diff - (tail < margin ? -(margin - tail) : margin) - 1;
+     int free = ((tail < margin) ? rest : (diff > 0) ? diff : Size() + diff - margin) - 1;
      if (statistics) {
         int fill = Size() - free - 1 + Count;
         if (fill >= Size())
@@ -136,6 +136,8 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
         Count = 0;
      Unlock();
      EnableGet();
+     if (Count == 0)
+        WaitForPut();
      }
   return Count;
 }
@@ -147,7 +149,7 @@ const uchar *cRingBufferLinear::Get(int &Count)
   if (getThreadPid < 0)
      getThreadPid = getpid();
   int rest = Size() - tail;
-  if (tail > Size() - margin && head < tail) {
+  if (rest < margin && head < tail) {
      int t = margin - rest;
      memcpy(buffer + t, buffer + tail, rest);
      tail = t;
@@ -169,10 +171,13 @@ const uchar *cRingBufferLinear::Get(int &Count)
 void cRingBufferLinear::Del(int Count)
 {
   if (Count > 0 && Count <= lastGet) {
+     Lock();
      tail += Count;
      lastGet -= Count;
      if (tail >= Size())
         tail = margin;
+     Unlock();
+     EnablePut();
      }
   else
      esyslog("ERROR: invalid Count in cRingBufferLinear::Del: %d", Count);
diff --git a/transfer.c b/transfer.c
index abcb9d085..4e8c30313 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.9 2003/01/26 09:59:35 kls Exp $
+ * $Id: transfer.c 1.10 2003/02/15 14:12:41 kls Exp $
  */
 
 #include "transfer.h"
@@ -50,9 +50,16 @@ void cTransfer::Activate(bool On)
 void cTransfer::Receive(uchar *Data, int Length)
 {
   if (IsAttached()) {
-     int p = ringBuffer->Put(Data, Length);
-     if (p != Length && active)
-        esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length - p);
+     int i = 0;
+     while (active && Length > 0) {
+           if (i++ > 10) {
+              esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length);
+              break;
+              }
+           int p = ringBuffer->Put(Data, Length);
+           Length -= p;
+           Data += p;
+           }
      }
 }
 
@@ -90,14 +97,17 @@ void cTransfer::Action(void)
            if (p) {
               StripAudioPackets(p, Result, audioTrack);
               while (Result > 0 && active) {
-                    int w = PlayVideo(p, Result);
-                    if (w > 0) {
-                       p += w;
-                       Result -= w;
-                       }
-                    else if (w < 0 && FATALERRNO) {
-                       LOG_ERROR;
-                       break;
+                    cPoller Poller;
+                    if (DevicePoll(Poller, 100)) {
+                       int w = PlayVideo(p, Result);
+                       if (w > 0) {
+                          p += w;
+                          Result -= w;
+                          }
+                       else if (w < 0 && FATALERRNO) {
+                          LOG_ERROR;
+                          break;
+                          }
                        }
                     }
               }
diff --git a/vdr.c b/vdr.c
index dfaf5dcbb..3e6a9ed3e 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.143 2003/02/09 13:13:42 kls Exp $
+ * $Id: vdr.c 1.145 2003/02/16 10:34:24 kls Exp $
  */
 
 #include <getopt.h>
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
   // Save terminal settings:
 
   struct termios savedTm;
-  bool HasStdin = tcgetpgrp(STDIN_FILENO) == getpid() && tcgetattr(STDIN_FILENO, &savedTm) == 0;
+  bool HasStdin = (tcgetpgrp(STDIN_FILENO) == getpid() || getppid() != (pid_t)1) && tcgetattr(STDIN_FILENO, &savedTm) == 0;
 
   // Initiate locale:
 
@@ -469,7 +469,7 @@ int main(int argc, char *argv[])
               }
            }
         // CAM control:
-        if (!Interface->IsOpen())
+        if (!Menu && !Interface->IsOpen())
            Menu = CamControl();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();

From b60eda5a8e8a9b9b96a90016fd27c03cd3f1ec8b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Wed, 19 Mar 2003 18:00:00 +0100
Subject: [PATCH 067/307] Version 1.1.26 - Removed signal handling and
 usleep(5000) from cDvbOsd::Cmd() (apparently this   is no longer necessary
 with DVB driver 1.0.0pre2 or later). - If the primary device (as defined in
 setup.conf) doesn't have an MPEG decoder   (and thus can't be used as a
 primary device) VDR now scans all devices at   startup and uses the first one
 (if any) that actually has an MPEG decoder.   That way this will also work
 automatically if the primary device is implemented   by a plugin. - Fixed a
 possible deadlock when using the "Blue" button in the "Schedules" menu   to
 switch to an other channel (thanks to Torsten Herz). - Fixed the EPG bugfix
 code number for the MAX_USEFUL_SUBTITLE_LENGTH fix (thanks to   Torsten Herz
 for reporting this one). - Modified the EPG scanner to avoid CPU load peaks
 (thanks to Steffen Becker for   reporting this one). - Fixed support for
 Viaccess CAMs (thanks to Axel Gruber for helping to debug this).

---
 CONTRIBUTORS |  9 ++++++++
 HISTORY      | 19 +++++++++++++++-
 ci.c         |  4 ++--
 config.h     |  4 ++--
 device.c     | 21 +++++++++++-------
 dvbosd.c     | 13 +----------
 eit.c        | 11 ++++------
 eitscan.c    | 61 ++++++++++++++++++++++------------------------------
 eitscan.h    |  5 +++--
 vdr.c        | 12 ++++++++++-
 10 files changed, 89 insertions(+), 70 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fe70f1afc..09a2bd6b8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -87,6 +87,7 @@ Peter Hofmann <software@pxh.de>
 
 Axel Gruber <axel@agm.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+ for helping to debug support for Viaccess CAMs
 
 Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
  for translating OSD texts to the Dutch language
@@ -544,3 +545,11 @@ Jan Ekholm <chakie@infa.abo.fi>
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
  for reporting broken support for raw OSDs of plugins
+
+Torsten Herz <torsten.herz@web.de>
+ for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
+ to switch to an other channel
+ for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix
+
+Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
+ for reporting a problem with CPU load peaks (in the EPG scanner)
diff --git a/HISTORY b/HISTORY
index 50e5bf563..a5c70f0be 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1959,7 +1959,7 @@ Video Disk Recorder Revision History
 
 2003-02-16: Version 1.1.25
 
-- Fixed high CPU load during replay (thanks Marcel Wiesweg for pointing out this
+- Fixed high CPU load during replay (thanks to Marcel Wiesweg for pointing out this
   one).
 - Fixed margin handling in cRingBufferLinear.
 - Now polling the output device in 'Transfer Mode' and retrying to put packets
@@ -1970,3 +1970,20 @@ Video Disk Recorder Revision History
 - Fixed broken support for raw OSDs of plugins (thanks to Marcel Wiesweg for
   reporting this one).
 - Broken CAM connections are now restored automatically.
+
+2003-03-19: Version 1.1.26
+
+- Removed signal handling and usleep(5000) from cDvbOsd::Cmd() (apparently this
+  is no longer necessary with DVB driver 1.0.0pre2 or later).
+- If the primary device (as defined in setup.conf) doesn't have an MPEG decoder
+  (and thus can't be used as a primary device) VDR now scans all devices at
+  startup and uses the first one (if any) that actually has an MPEG decoder.
+  That way this will also work automatically if the primary device is implemented
+  by a plugin.
+- Fixed a possible deadlock when using the "Blue" button in the "Schedules" menu
+  to switch to an other channel (thanks to Torsten Herz).
+- Fixed the EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix (thanks to
+  Torsten Herz for reporting this one).
+- Modified the EPG scanner to avoid CPU load peaks (thanks to Steffen Becker for
+  reporting this one).
+- Fixed support for Viaccess CAMs (thanks to Axel Gruber for helping to debug this).
diff --git a/ci.c b/ci.c
index d345a3ef4..62bbed7eb 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.7 2003/02/16 11:20:55 kls Exp $
+ * $Id: ci.c 1.8 2003/03/16 22:32:47 kls Exp $
  */
 
 /* XXX TODO
@@ -1232,7 +1232,7 @@ cCiCaPmt::cCiCaPmt(int ProgramNumber)
   capmt[length++] = CPLM_ONLY;
   capmt[length++] = (ProgramNumber >> 8) & 0xFF;
   capmt[length++] =  ProgramNumber       & 0xFF;
-  capmt[length++] = 0x00; //XXX version_number, current_next_indicator - apparently may be 0x00
+  capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
   esInfoLengthPos = length;
   capmt[length++] = 0x00; // program_info_length H (at program level)
   capmt[length++] = 0x00; // program_info_length L
diff --git a/config.h b/config.h
index d050516c4..206045868 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.149 2003/02/15 11:01:04 kls Exp $
+ * $Id: config.h 1.150 2003/03/09 10:01:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.25"
+#define VDRVERSION "1.1.26"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 15628cd36..0f99e13bd 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.36 2003/01/03 15:41:14 kls Exp $
+ * $Id: device.c 1.37 2003/03/09 14:05:23 kls Exp $
  */
 
 #include "device.h"
@@ -106,14 +106,19 @@ bool cDevice::SetPrimaryDevice(int n)
 {
   n--;
   if (0 <= n && n < numDevices && device[n]) {
-     isyslog("setting primary device to %d", n + 1);
-     if (primaryDevice)
-        primaryDevice->MakePrimaryDevice(false);
-     primaryDevice = device[n];
-     primaryDevice->MakePrimaryDevice(true);
-     return true;
+     if (device[n]->HasDecoder()) {
+        isyslog("setting primary device to %d", n + 1);
+        if (primaryDevice)
+           primaryDevice->MakePrimaryDevice(false);
+        primaryDevice = device[n];
+        primaryDevice->MakePrimaryDevice(true);
+        return true;
+        }
+     else
+        esyslog("ERROR: device number %d has no MPEG decoder", n + 1);
      }
-  esyslog("invalid primary device number: %d", n + 1);
+  else
+     esyslog("ERROR: invalid primary device number: %d", n + 1);
   return false;
 }
 
diff --git a/dvbosd.c b/dvbosd.c
index 4b0c1ea8c..428a3f048 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.19 2002/08/25 09:53:51 kls Exp $
+ * $Id: dvbosd.c 1.20 2003/03/09 09:59:13 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -60,18 +60,7 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      dc.x1    = x1;
      dc.y1    = y1;
      dc.data  = (void *)data;
-     // must block all signals, otherwise the command might not be fully executed
-     sigset_t set, oldset;
-     sigfillset(&set);
-     sigdelset(&set, SIGALRM);
-     sigprocmask(SIG_BLOCK, &set, &oldset);
      ioctl(osdDev, OSD_SEND_CMD, &dc);
-     if (cmd == OSD_SetBlock) // XXX this is the only command that takes longer
-        usleep(5000); // XXX Workaround for a driver bug (cInterface::DisplayChannel() displayed texts at wrong places
-                      // XXX and sometimes the OSD was no longer displayed).
-                      // XXX Increase the value if the problem still persists on your particular system.
-                      // TODO Check if this is still necessary with driver versions after 0.7.
-     sigprocmask(SIG_SETMASK, &oldset, NULL);
      }
 }
 
diff --git a/eit.c b/eit.c
index eebe82c7e..42740852a 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.65 2003/02/02 15:41:03 kls Exp $
+ * $Id: eit.c 1.67 2003/03/16 11:20:05 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -607,7 +607,7 @@ void cEventInfo::FixEpgBugs(void)
            free(pExtendedDescription);
            pExtendedDescription = pSubtitle;
            pSubtitle = NULL;
-           EpgBugFixStat(5, GetChannelID());
+           EpgBugFixStat(6, GetChannelID());
            }
         }
 
@@ -1250,12 +1250,13 @@ void cSIProcessor::Action()
                   if (seclen == r)
                   {
                      //dsyslog("Received pid 0x%04X with table ID 0x%02X and length of %4d\n", pid, buf[0], seclen);
+                     cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
+                     LOCK_THREAD;
                      switch (pid)
                      {
                         case 0x00:
                            if (buf[0] == 0x00)
                            {
-                              LOCK_THREAD;
                               if (pmtPid && time(NULL) - lastPmtScan > PMT_SCAN_TIMEOUT) {
                                  DelFilter(pmtPid, 0x02);
                                  pmtPid = 0;
@@ -1263,7 +1264,6 @@ void cSIProcessor::Action()
                                  lastPmtScan = time(NULL);
                                  }
                               if (!pmtPid) {
-                                 cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
                                  struct LIST *pat = siParsePAT(buf);
                                  if (pat) {
                                     int Index = 0;
@@ -1301,7 +1301,6 @@ void cSIProcessor::Action()
                         case 0x12:
                            if (buf[0] != 0x72)
                            {
-                              cMutexLock MutexLock(&schedulesMutex);
                               cEIT ceit(buf, seclen, schedules);
                               ceit.ProcessEIT(buf, currentSource);
                            }
@@ -1310,9 +1309,7 @@ void cSIProcessor::Action()
                            break;
 
                         default: {
-                           LOCK_THREAD;
                            if (pid == pmtPid && buf[0] == 0x02 && currentSource && currentTransponder) {
-                              cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
                               struct Pid *pi = siParsePMT(buf);
                               if (pi) {
                                  for (struct LIST *d = (struct LIST *)pi->Descriptors; d; d = (struct LIST *)xSucc(d)) {
diff --git a/eitscan.c b/eitscan.c
index 5768a423e..a5c1a7b94 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.11 2003/01/26 16:19:24 kls Exp $
+ * $Id: eitscan.c 1.12 2003/03/16 13:29:55 kls Exp $
  */
 
 #include "eitscan.h"
@@ -16,7 +16,7 @@ cEITScanner::cEITScanner(void)
 {
   lastScan = lastActivity = time(NULL);
   currentChannel = 0;
-  lastChannel = 0;
+  memset(lastChannel, 0, sizeof(lastChannel));
   numTransponders = 0;
   transponders = NULL;
 }
@@ -51,42 +51,33 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        do {
-           int oldLastChannel = lastChannel;
-           for (int i = 0; i < cDevice::NumDevices(); i++) {
-               cDevice *Device = cDevice::GetDevice(i);
-               if (Device && Device->CardIndex() < MAXDVBDEVICES) {
-                  if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                     if (!(Device->Receiving(true) || Device->Replaying())) {
-                        int oldCh = lastChannel;
-                        int ch = oldCh + 1;
-                        while (ch != oldCh) {
-                              if (ch > Channels.MaxNumber()) {
-                                 ch = 1;
-                                 numTransponders = 0;
-                                 }
-                              cChannel *Channel = Channels.GetByNumber(ch, 1);
-                              if (Channel) {
-                                 if (!Device->ProvidesChannel(Channel))
-                                    break;
-                                 if (Channel->Sid() && !TransponderScanned(Channel)) {
-                                    if (Device == cDevice::PrimaryDevice() && !currentChannel)
-                                       currentChannel = Device->CurrentChannel();
-                                    Device->SwitchChannel(Channel, false);
-                                    lastChannel = ch;
-                                    break;
-                                    }
-                                 }
-                              ch = Channel->Number() + 1;
-                              }
-                        }
+        for (int i = 0; i < cDevice::NumDevices(); i++) {
+            cDevice *Device = cDevice::GetDevice(i);
+            if (Device && Device->CardIndex() < MAXDVBDEVICES) {
+               if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                  if (!(Device->Receiving(true) || Device->Replaying())) {
+                     for (;;) {
+                         cChannel *Channel = Channels.GetByNumber(lastChannel[Device->DeviceNumber()] + 1, 1);
+                         if (Channel) {
+                            lastChannel[Device->DeviceNumber()] = Channel->Number();
+                            if (Channel->Sid() && Device->ProvidesChannel(Channel) && !TransponderScanned(Channel)) {
+                               if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                                  currentChannel = Device->CurrentChannel();
+                               Device->SwitchChannel(Channel, false);
+                               break;
+                               }
+                            }
+                         else {
+                            if (lastChannel[Device->DeviceNumber()])
+                               numTransponders = 0;
+                            lastChannel[Device->DeviceNumber()] = 0;
+                            break;
+                            }
+                         }
                      }
                   }
                }
-           if (lastChannel != oldLastChannel)
-              break;
-           lastChannel++;
-           } while (time(NULL) - now < 2);
+            }
         lastScan = time(NULL);
         }
      }
diff --git a/eitscan.h b/eitscan.h
index 7dacb8228..5b40ddd6e 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.1 2002/05/20 11:00:05 kls Exp $
+ * $Id: eitscan.h 1.2 2003/03/16 13:20:40 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -19,7 +19,8 @@ class cEITScanner {
          ScanTimeout = 20
        };
   time_t lastScan, lastActivity;
-  int currentChannel, lastChannel;
+  int currentChannel;
+  int lastChannel[MAXDEVICES];
   int numTransponders, *transponders;
   bool TransponderScanned(cChannel *Channel);
 public:
diff --git a/vdr.c b/vdr.c
index 3e6a9ed3e..50b1a2903 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.145 2003/02/16 10:34:24 kls Exp $
+ * $Id: vdr.c 1.146 2003/03/09 14:07:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -364,6 +364,16 @@ int main(int argc, char *argv[])
   // Primary device:
 
   cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
+  if (!cDevice::PrimaryDevice()) {
+     for (int i = 0; i < cDevice::NumDevices(); i++) {
+         cDevice *d = cDevice::GetDevice(i);
+         if (d && d->HasDecoder()) {
+            isyslog("trying device number %d instead", i + 1);
+            if (cDevice::SetPrimaryDevice(i + 1))
+               Setup.PrimaryDVB = i + 1;
+            }
+         }
+     }
   if (!cDevice::PrimaryDevice()) {
      const char *msg = "no primary device found - giving up!";
      fprintf(stderr, "vdr: %s\n", msg);

From 9f919801465f49be6b2118f54bd54df846e2f865 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Apr 2003 18:00:00 +0200
Subject: [PATCH 068/307] =?UTF-8?q?Version=201.1.27=20-=20The=20CAM=20is?=
 =?UTF-8?q?=20now=20accessed=20only=20if=20the=20current=20channel=20actua?=
 =?UTF-8?q?lly=20has=20a=20non-zero=20Ca=20=20=20value,=20and=20CAM=20acce?=
 =?UTF-8?q?ss=20is=20completely=20suppressed=20during=20replay,=20which=20?=
 =?UTF-8?q?avoids=20=20=20problems=20in=20case=20the=20CAM=20is=20attached?=
 =?UTF-8?q?=20to=20the=20primary=20DVB=20device.=20-=20The=20"Left"=20and?=
 =?UTF-8?q?=20"Right"=20buttons=20now=20set=20the=20cursor=20to=20the=20fi?=
 =?UTF-8?q?rst=20or=20last=20list=20item=20=20=20even=20if=20the=20list=20?=
 =?UTF-8?q?consist=20only=20of=20a=20single=20page,=20like,=20for=20instan?=
 =?UTF-8?q?ce,=20the=20Main=20menu=20=20=20(thanks=20to=20Oliver=20Endriss?=
 =?UTF-8?q?).=20-=20Made=20the=20log=20message=20"OSD=20window=20width=20m?=
 =?UTF-8?q?ust=20be=20a=20multiple=20of=204..."=20a=20debug=20message=20?=
 =?UTF-8?q?=20=20instead=20of=20an=20error=20message,=20so=20it=20can=20be?=
 =?UTF-8?q?=20avoided=20by=20using=20a=20log=20level=20less=20than=203.=20?=
 =?UTF-8?q?-=20Updated=20Greek=20language=20texts=20(thanks=20to=20Dimitri?=
 =?UTF-8?q?os=20Dimitrakos).=20-=20Fixed=20faulty=20behaviour=20of=20the?=
 =?UTF-8?q?=20"Mute"=20key=20in=20case=20the=20channel=20display=20is=20vi?=
 =?UTF-8?q?sible=20=20=20(thanks=20to=20Florian=20Bartels=20for=20reportin?=
 =?UTF-8?q?g=20this=20one=20and=20Sascha=20Volkenandt=20for=20=20=20helpin?=
 =?UTF-8?q?g=20to=20fix=20it).=20-=20Modified=20LOF=20handling=20to=20allo?=
 =?UTF-8?q?w=20for=20C-band=20reception=20(thanks=20to=20Malcolm=20Caldwel?=
 =?UTF-8?q?l).=20-=20Added=20some=20missing=20cAudio=20handling=20calls=20?=
 =?UTF-8?q?(thanks=20to=20Werner=20Fink).=20-=20Replaced=20the=20'for'=20l?=
 =?UTF-8?q?oops=20in=20StripAudioPackets()=20with=20memset()=20calls=20(th?=
 =?UTF-8?q?anks=20to=20=20=20Werner=20Fink).=20-=20Further=20increased=20t?=
 =?UTF-8?q?he=20timeout=20until=20an=20index=20file=20is=20considerd=20no?=
 =?UTF-8?q?=20longer=20to=20be=20=20=20written.=20-=20Fixed=20a=20crash=20?=
 =?UTF-8?q?in=20case=20the=20index=20file=20can't=20be=20accessed=20any=20?=
 =?UTF-8?q?more=20during=20replay=20=20=20(thanks=20to=20Stefan=20Huelswit?=
 =?UTF-8?q?t=20for=20reporting=20this=20one).=20-=20Fixed=20displaying=20m?=
 =?UTF-8?q?essages=20in=20the=20status=20line=20in=20case=20they=20exceed?=
 =?UTF-8?q?=20the=20OSD=20width=20=20=20(thanks=20to=20Gerhard=20Steiner?=
 =?UTF-8?q?=20for=20reporting=20this=20one).=20-=20Avoiding=20high=20CPU?=
 =?UTF-8?q?=20load=20in=20case=20the=20connection=20to=20LIRC=20gets=20los?=
 =?UTF-8?q?t=20(thanks=20to=20=20=20Ludwig=20Nussel).=20-=20Fixed=20handli?=
 =?UTF-8?q?ng=20repeat=20function=20with=20LIRC=20(thanks=20to=20Ludwig=20?=
 =?UTF-8?q?Nussel).=20-=20Fixed=20handling=20min/max=20borders=20when=20en?=
 =?UTF-8?q?tering=20integer=20values=20(thanks=20to=20Andy=20=20=20Grobb?=
 =?UTF-8?q?=20for=20reporting=20this=20one).=20-=20Implemented=20a=20"resu?=
 =?UTF-8?q?me=20ID"=20which=20allows=20several=20users=20to=20each=20have?=
 =?UTF-8?q?=20their=20own=20=20=20resume.vdr=20files=20(thanks=20to=20Mart?=
 =?UTF-8?q?in=20Hammerschmid).=20This=20parameter=20can=20be=20set=20in=20?=
 =?UTF-8?q?=20=20the=20"Setup/Replay"=20menu=20(see=20MANUAL=20for=20detai?=
 =?UTF-8?q?ls).=20-=20Now=20using=20'libdtv'=20version=200.0.5=20(thanks?=
 =?UTF-8?q?=20to=20Rolf=20Hakenes=20for=20the=20new=20version=20=20=20and?=
 =?UTF-8?q?=20Stefan=20Huelswitt=20for=20adapting=20VDR=20to=20it).=20-=20?=
 =?UTF-8?q?If=20no=20device=20with=20an=20MPEG=20decoder=20can=20be=20foun?=
 =?UTF-8?q?d=20at=20startup,=20the=20first=20device=20=20=20is=20now=20use?=
 =?UTF-8?q?d=20as=20primary=20device=20(just=20to=20have=20some=20device).?=
 =?UTF-8?q?=20-=20Adjusted=20some=20Premiere=20channels=20in=20'channels.c?=
 =?UTF-8?q?onf'=20(thanks=20to=20Thomas=20Koch).=20-=20Updated=20'channels?=
 =?UTF-8?q?.conf.cable'=20(thanks=20to=20Stefan=20Hu=C3=9Ffeldt).=20-=20Th?=
 =?UTF-8?q?e=20'epg.data'=20file=20is=20now=20read=20after=20all=20plugins?=
 =?UTF-8?q?=20have=20been=20started=20(thanks=20=20=20to=20Sascha=20Volken?=
 =?UTF-8?q?andt).=20-=20The=20LIRC=20remote=20control=20no=20longer=20trie?=
 =?UTF-8?q?s=20to=20learn=20keys=20if=20it=20can't=20connect=20to=20=20=20?=
 =?UTF-8?q?the=20LIRC=20daemon=20(thanks=20to=20Ludwig=20Nussel=20for=20re?=
 =?UTF-8?q?porting=20this=20one).=20The=20same=20=20=20applies=20to=20the?=
 =?UTF-8?q?=20RCU=20remote=20control=20in=20case=20of=20errors=20during=20?=
 =?UTF-8?q?startup.=20-=20Fixed=20handling=20of=20Ca=20parameters=20with?=
 =?UTF-8?q?=20values=20<=3D=20MAXDEVICES,=20which=20don't=20indicate=20=20?=
 =?UTF-8?q?=20an=20actual=20encrypted=20channel=20(thanks=20to=20Stefan=20?=
 =?UTF-8?q?Huelswitt=20for=20reporting=20this=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     |  38 +++
 HISTORY                          |  46 ++++
 MANUAL                           |   6 +
 PLUGINS.html                     |  35 ++-
 PLUGINS/src/sky/getskyepg.pl     |   4 +-
 channels.conf                    |  53 ++--
 channels.conf.cable              | 277 +++++++++-----------
 ci.c                             |   5 +-
 ci.h                             |   4 +-
 config.c                         |   5 +-
 config.h                         |   5 +-
 device.c                         |  35 +--
 dvbdevice.c                      |  24 +-
 dvbosd.c                         |   4 +-
 dvbplayer.c                      |   9 +-
 eit.c                            |  51 ++--
 eit.h                            |   3 +-
 i18n.c                           | 175 +++++++------
 interface.c                      |   8 +-
 libdtv/libsi/include/libsi.h     | 248 +++++++++++++++---
 libdtv/libsi/include/si_tables.h | 156 +++++++++--
 libdtv/libsi/si_debug_services.c | 130 +++++++++-
 libdtv/libsi/si_debug_services.h |  34 ++-
 libdtv/libsi/si_parser.c         | 430 +++++++++++++++++++++++++++----
 lirc.c                           |  26 +-
 lirc.h                           |   3 +-
 menu.c                           |   3 +-
 menuitems.c                      |  47 ++--
 osd.c                            |   8 +-
 osdbase.c                        |   6 +-
 rcu.c                            |   7 +-
 rcu.h                            |   3 +-
 recording.c                      |  29 +--
 remote.h                         |   3 +-
 tools.c                          |  14 +-
 transfer.c                       |   9 +-
 vdr.c                            |  38 ++-
 37 files changed, 1464 insertions(+), 517 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 09a2bd6b8..fad8e0be0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -49,6 +49,8 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for adding a missing 'public' keyword in device.h
  for pointing out a bug in displaying the group separators in the channel display
  for reporting a problem with a missing initialization of 'number' in cChannel
+ for implementing a "resume ID" which allows several users to each have their own
+ resume.vdr files
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
@@ -163,6 +165,10 @@ Stefan Huelswitt <huels@iname.com>
  encrypted channel
  for reporting a problem with timers when channel IDs have a 'source' that is 0
  for reporting a new/delete malloc/free mismatch in ringbuffer.c
+ for reporting a crash in case the index file can't be accessed any more during replay
+ for adapting VDR to 'libdtv' version 0.0.5
+ for reporting a bug in handling of Ca parameters with values <= MAXDEVICES, which
+ don't indicate an actual encrypted channel
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -219,6 +225,8 @@ Werner Fink <werner@suse.de>
  for improving thread locking in the ring buffer to avoid possible race conditions
  under heavy load
  for improving keyboard detection
+ for adding some missing cAudio handling calls
+ for replacing the 'for' loops in StripAudioPackets() with memset() calls
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -240,6 +248,7 @@ Simon Bauschulte <SemiSchwabe@Brutzel.de>
 Andy Grobb <Charly98@01019freenet.de>
  for completing storing the current audio volume in the setup.conf file
  for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no"
+ for reporting a bug in handling min/max borders when entering integer values
 
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
@@ -444,6 +453,9 @@ Oliver Endriss <o.endriss@gmx.de>
  for providing examples for 'diseqc.conf'
  for improving deleting stale lock files
  for fixing high CPU load in 'Transfer Mode'
+ for making the "Left" and "Right" buttons set the cursor to the first or last
+ list item even if the list consist only of a single page, like, for instance,
+ the Main menu
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -471,6 +483,8 @@ Gerhard Steiner <steiner@mail.austria.com>
  shall be executed from the "Recordings" menu
  for suggesting to interpret the character '|' in the description texts of EPG
  records as a newline character
+ for reporting a bug in displaying messages in the status line in case they exceed
+ the OSD width
 
 Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
@@ -553,3 +567,27 @@ Torsten Herz <torsten.herz@web.de>
 
 Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
  for reporting a problem with CPU load peaks (in the EPG scanner)
+
+Florian Bartels <Florian.Bartels@envisage.de>
+ for reporting a faulty behaviour of the "Mute" key in case the channel display
+ is visible
+
+Sascha Volkenandt <sascha@akv-soft.de>
+ for helping to fix a faulty behaviour of the "Mute" key in case the channel display
+ is visible
+ for making the 'epg.data' file being read after all plugins have been started
+
+Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
+ for modifying LOF handling to allow for C-band reception
+
+Ludwig Nussel <ludwig.nussel@web.de>
+ for making the LIRC thread avoid high CPU load in case the connection to LIRC gets lost
+ for fixing handling repeat function with LIRC
+ for reporting a problem with the LIRC remote control trying to learn keys even if it
+ couldn't connect to the LIRC daemon
+
+Thomas Koch <tom@harhar.net>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
+
+Stefan Hu�feldt <vdr@marvin.on-luebeck.de>
+ for his help in keeping 'channels.conf.cable' up to date
diff --git a/HISTORY b/HISTORY
index a5c70f0be..7e695246c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1987,3 +1987,49 @@ Video Disk Recorder Revision History
 - Modified the EPG scanner to avoid CPU load peaks (thanks to Steffen Becker for
   reporting this one).
 - Fixed support for Viaccess CAMs (thanks to Axel Gruber for helping to debug this).
+
+2003-04-13: Version 1.1.27
+
+- The CAM is now accessed only if the current channel actually has a non-zero Ca
+  value, and CAM access is completely suppressed during replay, which avoids
+  problems in case the CAM is attached to the primary DVB device.
+- The "Left" and "Right" buttons now set the cursor to the first or last list item
+  even if the list consist only of a single page, like, for instance, the Main menu
+  (thanks to Oliver Endriss).
+- Made the log message "OSD window width must be a multiple of 4..." a debug message
+  instead of an error message, so it can be avoided by using a log level less than 3.
+- Updated Greek language texts (thanks to Dimitrios Dimitrakos).
+- Fixed faulty behaviour of the "Mute" key in case the channel display is visible
+  (thanks to Florian Bartels for reporting this one and Sascha Volkenandt for
+  helping to fix it).
+- Modified LOF handling to allow for C-band reception (thanks to Malcolm Caldwell).
+- Added some missing cAudio handling calls (thanks to Werner Fink).
+- Replaced the 'for' loops in StripAudioPackets() with memset() calls (thanks to
+  Werner Fink).
+- Further increased the timeout until an index file is considerd no longer to be
+  written.
+- Fixed a crash in case the index file can't be accessed any more during replay
+  (thanks to Stefan Huelswitt for reporting this one).
+- Fixed displaying messages in the status line in case they exceed the OSD width
+  (thanks to Gerhard Steiner for reporting this one).
+- Avoiding high CPU load in case the connection to LIRC gets lost (thanks to
+  Ludwig Nussel).
+- Fixed handling repeat function with LIRC (thanks to Ludwig Nussel).
+- Fixed handling min/max borders when entering integer values (thanks to Andy
+  Grobb for reporting this one).
+- Implemented a "resume ID" which allows several users to each have their own
+  resume.vdr files (thanks to Martin Hammerschmid). This parameter can be set in
+  the "Setup/Replay" menu (see MANUAL for details).
+- Now using 'libdtv' version 0.0.5 (thanks to Rolf Hakenes for the new version
+  and Stefan Huelswitt for adapting VDR to it).
+- If no device with an MPEG decoder can be found at startup, the first device
+  is now used as primary device (just to have some device).
+- Adjusted some Premiere channels in 'channels.conf' (thanks to Thomas Koch).
+- Updated 'channels.conf.cable' (thanks to Stefan Hu�feldt).
+- The 'epg.data' file is now read after all plugins have been started (thanks
+  to Sascha Volkenandt).
+- The LIRC remote control no longer tries to learn keys if it can't connect to
+  the LIRC daemon (thanks to Ludwig Nussel for reporting this one). The same
+  applies to the RCU remote control in case of errors during startup.
+- Fixed handling of Ca parameters with values <= MAXDEVICES, which don't indicate
+  an actual encrypted channel (thanks to Stefan Huelswitt for reporting this one).
diff --git a/MANUAL b/MANUAL
index 73a1b6ecf..b5f00d1c1 100644
--- a/MANUAL
+++ b/MANUAL
@@ -589,6 +589,12 @@ Video Disk Recorder User's Manual
 
   Show replay mode = no  Turns displaying the current replay mode on or off.
 
+  Resume ID = 0          Defines an additional ID that can be used in a multi user
+                         environment, so that every user has his/her own resume
+                         files for each recording. The valid range is 0...99, with
+                         0 resulting in a file named 'resume.vdr', and any other
+                         value resulting in 'resume.n.vdr'.
+
   Miscellaneous:
 
   Min. event timeout = 30
diff --git a/PLUGINS.html b/PLUGINS.html
index fe651303c..d6c377605 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>internal</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.13 are marked like this.
-<!--X1.1.13--></td></tr></table>
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.14 are marked like this.
 <!--X1.1.14--></td></tr></table>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.15 are marked like this.
 <!--X1.1.15--></td></tr></table>
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.17 are marked like this.
 <!--X1.1.17--></td></tr></table>
+<!--X1.1.27--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.27 are marked like this.
+<!--X1.1.27--></td></tr></table>
 
 <hr>
 <h1>Table Of Contents</h1>
@@ -506,7 +506,7 @@ <h1>Table Of Contents</h1>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
@@ -1011,7 +1011,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 If the player can provide more than a single audio track, it can implement the
 following functions to make them available:
@@ -1022,9 +1021,8 @@ <h1>Table Of Contents</h1>
 virtual void SetAudioTrack(int Index);
 </pre></td></tr></table><p>
 
-<!--X1.1.13--></td></tr></table>
 <p>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 If there is an additional audio track that has to be replayed with external hardware,
 the player shall call its member function
 
@@ -1260,7 +1258,6 @@ <h1>Table Of Contents</h1>
 These functions will be called with the desired source or channel and shall return whether
 this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>Audio selection</b>
 <p>
@@ -1273,7 +1270,6 @@ <h1>Table Of Contents</h1>
 virtual void SetAudioTrackDevice(int Index);
 </pre></td></tr></table><p>
 
-<!--X1.1.13--></td></tr></table>
 <p>
 <b>Recording</b>
 <p>
@@ -1307,7 +1303,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool CanReplay(void) const;
 <!--X1.1.14--></td></tr></table>
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1369,7 +1365,7 @@ <h1>Table Of Contents</h1>
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Dolby Digital"><hr><h2>Dolby Digital</h2>
 
 <center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
@@ -1480,6 +1476,17 @@ <h1>Table Of Contents</h1>
 In case you need to do any other setup steps, like opening a file or initializing
 member variables, you should do so before calling <tt>Start()</tt>.
 <p>
+<!--X1.1.27--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+If your remote control for some reason can't work (maybe because it was unable to
+open some file handle it requires) it can implement the virtual function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+virtual bool Ready(void);
+</pre></td></tr></table><p>
+
+and have it return <i>false</i>. In that case VDR will not try to learn keys from
+that remote control.
+<!--X1.1.27--></td></tr></table>
 VDR will handle everything necessary to learn the key mappings of your remote
 control. In order to do so, it will first call the virtual function <tt>Initialize()</tt>,
 in which you should take all necessary steps to make sure your remote control
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index 7fd7bd015..46c2d7ffe 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 1.1 2002/11/10 10:05:17 kls Exp $
+# $Id: getskyepg.pl 1.2 2003/04/02 16:21:47 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
@@ -33,7 +33,7 @@
 $WGET = "/usr/bin/wget -q -O-";
 $LOGGER = "/usr/bin/logger -t SKYEPG";
 
-$DST = 0; ##XXX TODO find out whether DST is active!
+$DST = -3600; ##XXX TODO find out whether DST is active!
 $SecsInDay = 86400;
 
 $MaxFrequency = 1000;
diff --git a/channels.conf b/channels.conf
index 0dc0a2883..2f0c7eb8b 100644
--- a/channels.conf
+++ b/channels.conf
@@ -18,7 +18,7 @@ arte:11836:h:S19.2E:27500:401:402:404:0:28109:0:0:0
 ORF1:12692:h:S19.2E:22000:160:161:165:102:13001:0:0:0
 ORF2:12692:h:S19.2E:22000:500:501:505:102:13002:0:0:0
 ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011:0:0:0
-CNN:12168:v:S19.2E:27500:165:100:0:0:28512:0:0:0
+CNN:11778:v:S19.2E:27500:165:100:0:0:28522:0:0:0
 Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:0:0:0
 VOX:12188:h:S19.2E:27500:167:136:71:0:12060:0:0:0
 :#DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
@@ -29,10 +29,11 @@ HOT:12480:v:S19.2E:27500:1279:1280:0:0:40:0:0:0
 Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:0:0:0
 Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004:0:0:0
 Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721:0:0:0
-Sky News:12552:v:S19.2E:22000:305:306:0:0:3995:0:0:0
+Sky News:11597:v:S19.2E:22000:305:306:0:0:28707:0:0:0
 Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020:0:0:0
 Alice:12610:v:S19.2E:22000:162:96:0:0:12200:0:0:0
 n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:0:0:0
+Al Jazeera:11568:v:S19.2E:22000:55:56:0:0:9021:0:0:0
 Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300:0:0:0
 TW1:12692:h:S19.2E:22000:166:167:0:0:13013:0:0:0
 Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009:0:0:0
@@ -68,20 +69,24 @@ Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518:0:0:0
 Classica:11758:h:S19.2E:27500:767:768:0:101:15:0:0:0
 Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32:0:0:0
 :Premiere Direkt
-Premiere Direkt 1A:12031:h:S19.2E:27500:511:512,513;515:0:101:177:0:0:0
-Premiere Direkt 1B:11719:h:S19.2E:27500:1023:1024,1025;1027:0:101:182:0:0:0
-Premiere Direkt 2A:12031:h:S19.2E:27500:255:256;259:0:101:176:0:0:0
-Premiere Direkt 2B:11719:h:S19.2E:27500:767:768;769:0:101:181:0:0:0
-Premiere Direkt 3A:11719:h:S19.2E:27500:511:512;515:0:101:180:0:0:0
-Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183:0:0:0
-Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
-:#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216:0:0:0
+Premiere Direkt Portal:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
+Premiere Direkt 1A:11719:h:S19.2E:27500:2047:2048:0:101:240:0:0:0
+Premiere Direkt 1B:11719:h:S19.2E:27500:2303:2304:0:101:241:0:0:0
+Premiere Direkt 1C:11719:h:S19.2E:27500:2559:2560:0:101:242:0:0:0
+Premiere Direkt 2A:11719:h:S19.2E:27500:2815:2816:0:101:243:0:0:0
+Premiere Direkt 2B:11719:h:S19.2E:27500:3071:3072:0:101:244:0:0:0
+Premiere Direkt 2C:12031:h:S19.2E:27500:3071:3072:0:101:208:0:0:0
+Premiere Direkt 2D:11719:h:S19.2E:27500:3327:3328:0:101:245:0:0:0
+Premiere Direkt 3A:12031:h:S19.2E:27500:3327:3328:0:101:209:0:0:0
+Premiere Direkt 3B:12031:h:S19.2E:27500:2303:2304:0:101:210:0:0:0
+Premiere Direkt 3C:11758:h:S19.2E:27500:511:512:0:101:211:0:0:0
+Premiere Direkt 3D:12070:h:S19.2E:27500:511:512:0:101:212:0:0:0
 :PW Erotic
 Beate-Uhse.TV:12071:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
-Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513:0:0:0
-Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778:0:0:0
-Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779:0:0:0
-Premiere Erotik 4:11719:h:S19.2E:27500:3583:3584:0:101:780:0:0:0
+Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:2:101:513:0:0:0
+Premiere Erotik 2:12070:h:0:27500:1535:1536:0:101:778:0:0:0
+Premiere Erotik 3:12070:h:0:27500:1791:1792:0:101:779:0:0:0
+Premiere Erotik 4:12070:h:0:27500:3583:3584:0:101:780:0:0:0
 :Sportsworld
 Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
 Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27:0:0:0
@@ -97,16 +102,16 @@ N24:12480:v:S19.2E:27500:2047:2048:0:0:47:0:0:0
 CNBC:11954:h:S19.2E:27500:510:520:0:0:28010:0:0:0
 Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199:0:0:0
 :Premiere Bundesliga
-BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210:0:0:0
-BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
-BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240:0:0:0
-BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241:0:0:0
-BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242:0:0:0
-BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243:0:0:0
-BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244:0:0:0
-BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245:0:0:0
-BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208:0:0:0
-BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209:0:0:0
+BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210:0:0:1
+BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17:0:0:1
+BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240:0:0:1
+BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241:0:0:1
+BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242:0:0:1
+BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243:0:0:1
+BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244:0:0:1
+BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245:0:0:1
+BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208:0:0:1
+BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209:0:0:1
 :-
 Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010:0:0:0
 Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011:0:0:0
diff --git a/channels.conf.cable b/channels.conf.cable
index 58dc20dfc..a5567d58a 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,204 +1,169 @@
 Das Erste:410:M64:C:6900:101:102:104:0:28106:0:0:0
 ZDF:394:M64:C:6900:110:120:130:0:28006:0:0:0
 3sat:394:M64:C:6900:210:220:230:0:28007:0:0:0
-arte:410:M64:C:6900:401:402:404:0:28109:0:0:0
-ZDF.info:394:M64:C:6900:610:620:0:0:28011:0:0:0
-ZDF.doku:394:M64:C:6900:660:670:0:0:28014:0:0:0
-ZDF Theaterkanal:394:M64:C:6900:1110:1120:130:0:28016:0:0:0
+arte:410:M64:C:6900:401:402,403:404:0:28109:0:0:0
+ZDFinfokanal:394:M64:C:6900:610:620:130:0:28011:0:0:0
+ZDFdokukanal:394:M64:C:6900:660:670:130:0:28014:0:0:0
+ZDFtheaterkanal:394:M64:C:6900:1110:1120:130:0:28016:0:0:0
 EinsExtra:426:M64:C:6900:101:102:0:0:28201:0:0:0
 EinsFestival:426:M64:C:6900:201:202:0:0:28202:0:0:0
 EinsMuXx:426:M64:C:6900:301:302:0:0:28203:0:0:0
 Phoenix:410:M64:C:6900:901:902:904:0:28114:0:0:0
-KI.KA:394:M64:C:6900:310:320:330:0:28008:0:0:0
+KiKa:394:M64:C:6900:310:320:330:0:28008:0:0:0
 EuroNews:394:M64:C:6900:2221:2233:768:0:28015:0:0:0
 CNBC:394:M64:C:6900:510:520:530:0:28010:0:0:0
 Eurosport:394:M64:C:6900:410:420:430:0:28009:0:0:0
 :Regionalprogramme
-B1 Berlin:426:M64:C:6900:601:602:604:0:28206:0:0:0
+SFB1:426:M64:C:6900:601:602:604:0:28206:0:0:0
 ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205:0:0:0
 N3:426:M64:C:6900:2401:2402:2404:0:28224:0:0:0
 MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204:0:0:0
 WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111:0:0:0
 hessen fernsehen:410:M64:C:6900:301:302:304:0:28108:0:0:0
 BR-alpha:410:M64:C:6900:701:702:704:0:28112:0:0:0
-Bayerisches FS:410:M64:C:6900:201:202:204:0:28107:0:0:0
+Bayerisches FS:410:M64:C:6900:201:202:125:0:28107:0:0:0
 SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110:0:0:0
 SuedWest BW:410:M64:C:6900:801:802:804:0:28113:0:0:0
 SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231:0:0:0
 :Hauptprogramme Premiere
-Premiere START:370:M64:C:6900:255:256:32:101:8:0:0:0
-Premiere 1:370:M64:C:6900:511:512;515:0:101:10:0:0:0
-Premiere 2:370:M64:C:6900:1791:1792;1795:0:101:11:0:0:0
-Premiere 3:370:M64:C:6900:2303:2304:0:101:43:0:0:0
-Premiere 4:370:M64:C:6900:767:768:0:101:9:0:0:0
-Premiere 5:370:M64:C:6900:1279:1280:0:101:29:0:0:0
-Premiere 6:370:M64:C:6900:1535:1536:0:101:41:0:0:0
-Premiere 7:370:M64:C:6900:1023:1024:0:101:20:0:0:0
-Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16:0:0:0
-Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516:0:0:0
+PREMIERE START:370:M64:C:6900:255:256:32:101:8:0:0:0
+PREMIERE 1:370:M64:C:6900:511:512;515:0:101:10:0:0:0
+PREMIERE 2:370:M64:C:6900:1791:1792,1793;1795:0:101:11:0:0:0
+PREMIERE 3:370:M64:C:6900:2303:2304,2305:0:101:43:0:0:0
+PREMIERE 4:370:M64:C:6900:767:768,769:0:101:9:0:0:0
+PREMIERE 5:370:M64:C:6900:1279:1280,1281:0:101:29:0:0:0
+PREMIERE 6:370:M64:C:6900:1535:1536:0:101:41:0:0:0
+PREMIERE 7:370:M64:C:6900:1023:1024:0:101:20:0:0:0
+PREMIERE SERIE:378:M64:C:6900:1023:1024:0:101:16:0:0:0
+PREMIERE Nostalgie:378:M64:C:6900:2559:2560:0:101:516:0:0:0
 13 TH STREET:354:M64:C:6900:2303:2304:0:101:42:0:0:0
-Studio Universal:354:M64:C:6900:2047:2048:0:101:36:0:0:0
-Krimi & Co:378:M64:C:6900:1535:1536:0:101:23:0:0:0
+STUDIO UNIVERSAL:354:M64:C:6900:2047:2048:0:101:36:0:0:0
+MGM:354:M64:C:6900:767:768,769:0:101:515:0:0:0
+PREMIERE KRIMI:378:M64:C:6900:1535:1536:0:101:23:0:0:0
 Disney Channel:354:M64:C:6900:2559:2560:0:101:34:0:0:0
-Discovery Channel:378:M64:C:6900:1791:1792:0:101:14:0:0:0
-PLANET:354:M64:C:6900:1791:1792:0:101:13:0:0:0
+DISCOVERY CHANNEL:354:M64:C:6900:1023:1024:0:101:14:0:0:0
+PLANET:354:M64:C:6900:1535:1536:0:101:13:0:0:0
 Fox Kids:354:M64:C:6900:1279:1280:0:101:28:0:0:0
 Junior:354:M64:C:6900:255:256:0:101:19:0:0:0
 K-TOON:354:M64:C:6900:511:512:0:101:12:0:0:0
-HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22:0:0:0
-GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518:0:0:0
-CLASSICA:354:M64:C:6900:767:768:0:101:15:0:0:0
-:DIGIKABEL D
-Avante:113:M64:C:6900:741:742,743:0:101:53404:0:0:0
-BBC Prime:113:M64:C:6900:761:762:763:101:53406:0:0:0
-Club:113:M64:C:6900:711:712,713:0:101:53401:0:0:0
-Eurosport News:113:M64:C:6900:771:772:0:101:53407:0:0:0
-BibelTV:113:M64:C:6900:731:732:0:1:53403:0:0:0
-Liberty TV:113:M64:C:6900:721:722,723:0:101:53402:0:0:0
-TW1:113:M64:C:6900:751:752:0:101:53405:0:0:0
-MTV Base:113:M64:C:6900:781:782:0:101:53408:0:0:0
-:DIGIKABEL INT
-Canal 24 Horas:121:M64:C:6900:991:992:0:101:53509:0:0:0
-Gala TV:121:M64:C:6900:931:932:0:101:53503:0:0:0
-Kanal 7:121:M64:C:6900:941:942:0:101:53504:0:0:0
-Rai 1:121:M64:C:6900:951:952:0:101:53505:0:0:0
-Rai 2:121:M64:C:6900:961:962:0:101:53506:0:0:0
-Rai 3:121:M64:C:6900:971:972:0:101:53507:0:0:0
-Show TV:121:M64:C:6900:911:912:0:101:53501:0:0:0
-TGRT:121:M64:C:6900:921:922:0:101:53502:0:0:0
-TVEi:121:M64:C:6900:981:982:0:101:53508:0:0:0
-:DIGIKABEL SO
-Fox Kids:121:M64:C:6900:931:932,933:0:101:53523:0:0:0
-Kanal 7:121:M64:C:6900:941:942:0:101:53524:0:0:0
-Show TV:121:M64:C:6900:911:912:0:101:53521:0:0:0
-TGRT:121:M64:C:6900:921:922:0:101:53522:0:0:0
-:DIGIKABEL SW
-Canal 24 Horas:121:M64:C:6900:991:992:0:101:53535:0:0:0
-Rai 1:121:M64:C:6900:951:952:0:101:53531:0:0:0
-Rai 2:121:M64:C:6900:961:962:0:101:53532:0:0:0
-Rai 3:121:M64:C:6900:971:972:0:101:53533:0:0:0
-TVEi:121:M64:C:6900:981:982:0:101:53534:0:0:0
-:Diverse TV-Sender
-Sonnenklar TV:402:M64:C:6900:0:0:0:101:32:0:0:0
-TV Polonia:434:M64:C:6900:641:642:0:101:53204:0:0:0
-Kanal D:434:M64:C:6900:651:652:0:101:53205:0:0:0
-RTP international:434:M64:C:6900:661:662:0:101:53206:0:0:0
-ERT-Sat:434:M64:C:6900:691:692:0:101:53209:0:0:0
-CNE:434:M64:C:6900:4056:4057:0:101:53208:0:0:0
-ZEE TV:442:M64:C:6900:517:773:0:101:53301:0:0:0
-NTV i:442:M64:C:6900:514:515:0:101:53302:0:0:0
-ATV:434:M64:C:6900:631:632:0:101:53203:0:0:0
-TW1:610:M64:C:6900:6106:6107:0:101:6106:0:0:0
-:Digit. Bouquet "Kabel Berlin"
-Parlamentsfernsehen:610:M64:C:6900:33:36:47:0:6100:0:0:0
-DW-tv:610:M64:C:6900:634:632:0:0:6101:0:0:0
-Kanal 7:610:M64:C:6900:49:52:0:101:6103:0:0:0
-Euronews:610:M64:C:6900:597:592:0:101:6104:0:0:0
-Travel:610:M64:C:6900:595:594:0:101:6105:0:0:0
-VH1 Classic:610:M64:C:6900:604:603:0:101:6106:0:0:1
-Nuvolari:618:M64:C:6900:1011:1012:0:101:50101:0:0:0
-Alice:618:M64:C:6900:1031:1032:0:101:50103:0:0:0
-Leonardo:618:M64:C:6900:1041:1042:0:101:50104:0:0:0
-Club:618:M64:C:6900:1051:1052:0:101:50105:0:0:0
-Avante:618:M64:C:6900:1061:1062:0:101:50106:0:0:0
-BBC Prime:618:M64:C:6900:1091:1092:0:101:50109:0:0:0
-Eurosport News:618:M64:C:6900:1101:1102:0:101:50110:0:0:0
+HEIMATKANAL:386:M64:C:6900:1279:1280:0:101:22:0:0:0
+GOLDSTAR TV:386:M64:C:6900:3839:3840:0:101:518:0:0:0
+CLASSICA:386:M64:C:6900:767:768:0:101:15:0:0:0
 :Premiere Sport
-PREMIERE SPORT 1:362:M64:C:6900:255:256,258:0:101:17:0:0:0
+PREMIERE SPORT 1:362:M64:C:6900:255:256,257:0:101:17:0:0:0
 PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27:0:0:0
 :Premiere Bundesliga
-BuLi Opt 1:362:M64:C:6900:255:256:0:101:17:0:0:1
-BuLi Opt 2:362:M64:C:6900:2047:2048:0:101:240:0:0:0
-BuLi Opt 3:362:M64:C:6900:2303:2304:0:101:241:0:0:0
-BuLi Opt 4:362:M64:C:6900:2559:2560:0:101:242:0:0:0
-BuLi Opt 5:362:M64:C:6900:2815:2816:0:101:243:0:0:0
-BuLi Opt 6:362:M64:C:6900:3071:3072:0:101:244:0:0:0
-BuLi Opt 7:362:M64:C:6900:3327:3328:0:101:245:0:0:0
-BuLi Opt 8:378:M64:C:6900:3071:3072:0:101:208:0:0:0
-BuLi Opt 9:378:M64:C:6900:3327:3328:0:101:209:0:0:0
-BuLi Opt 10:378:M64:C:6900:2303:2304:0:101:210:0:0:0
+Spiel 1:362:M64:C:6900:255:256:0:101:17:0:0:1
 :Premiere CL
 UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17:0:0:2
-UEFA CL 2:386:M64:C:6900:255:256:0:101:211:0:0:0
 :Premiere Formel 1
 F1 Portal 1:362:M64:C:6900:255:256:0:101:17:0:0:3
-F1 Supersignal:362:M64:C:6900:2047:2048:0:101:240:0:0:1
-F1 Cockpit Kanal:362:M64:C:6900:2303:2304:0:101:241:0:0:1
-F1 Boxengasse:362:M64:C:6900:2559:2560:0:101:242:0:0:1
-F1 Verfolgerfeld:362:M64:C:6900:2815:2816:0:101:243:0:0:1
-F1 Infokanal:362:M64:C:6900:3071:3072:0:101:244:0:0:1
+:Premiere Direkt
+PREMIERE DIREKT:378:M64:C:6900:2815:2816,2817;2819:0:101:18:0:0:0
 :Premiere Direkt 1
-PREMIERE DIREKT 1A:378:M64:C:6900:511:512,513;515:0:101:177:0:0:0
-PREMIERE DIREKT 1B:362:M64:C:6900:1023:1024,1025;1027:0:101:182:0:0:0
+PREMIERE DIREKT 1A:362:M64:C:6900:2047:2048,2049;2051:0:101:240:0:0:0
+PREMIERE DIREKT 1B:362:M64:C:6900:2303:2304,2305;2307:0:101:241:0:0:0
+PREMIERE DIREKT 1C:362:M64:C:6900:2559:2560,2561;2563:0:101:242:0:0:0
 :Premiere Direkt 2
-PREMIERE DIREKT 2A:378:M64:C:6900:255:256,257;259:0:101:176:0:0:0
-PREMIERE DIREKT 2B:362:M64:C:6900:767:768,769;771:0:101:181:0:0:0
+PREMIERE DIREKT 2A:362:M64:C:6900:2815:2816,2817;2819:0:101:243:0:0:0
+PREMIERE DIREKT 2B:362:M64:C:6900:3071:3072,3073;3075:0:101:244:0:0:0
+PREMIERE DIREKT 2C:362:M64:C:6900:3327:3328,3329;3331:0:101:245:0:0:0
+PREMIERE DIREKT 2D:378:M64:C:6900:3071:3072,3073;3075:0:101:208:0:0:0
 :Premiere Direkt 3
-PREMIERE DIREKT 3A:362:M64:C:6900:1279:1280,1281;1283:0:101:183:0:0:0
-PREMIERE DIREKT 3B:362:M64:C:6900:511:512,513;515:0:101:180:0:0:0
-:Premiere Direkt 4
-PREMIERE DIREKT 4A:378:M64:C:6900:2815:2816,2817:0:101:18:0:0:0
-PREMIERE DIREKT 4B:386:M64:C:6900:1535:1536,1537:0:101:216:0:0:0
+PREMIERE DIREKT 3A:378:M64:C:6900:3327:3328,3329;3331:0:101:209:0:0:0
+PREMIERE DIREKT 3B:378:M64:C:6900:2303:2304,2305;2307:0:101:210:0:0:0
+PREMIERE DIREKT 3C:354:M64:C:6900:511:512,513;515:0:101:211:0:0:0
+PREMIERE DIREKT 3D:386:M64:C:6900:511:512,513;515:0:101:212:0:0:0
 :Premiere Erotik
-BEATE-UHSE.TV:354:M64:C:6900:1023:1024:0:101:21:0:0:0
+BEATE-UHSE.TV:386:M64:C:6900:1023:1024:0:101:21:0:0:0
 PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513:0:0:0
-PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778:0:0:0
-PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779:0:0:0
-PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780:0:0:0
+PREMIERE EROTIK 2:386:M64:C:6900:1535:1536:0:101:778:0:0:0
+PREMIERE EROTIK 3:386:M64:C:6900:1791:1792:0:101:779:0:0:0
+PREMIERE EROTIK 4:386:M64:C:6900:3583:3584:0:101:780:0:0:0
+:NEU
+Test-R:410:M64:C:6900:701:702:125:0:28130:0:0:0
+Test-R:410:M64:C:6900:901:902:125:0:28130:0:0:1
+ARD-Online-Kanal:426:M64:C:6900:0:1801,1805:0:101:28218:0:0:0
+TestS33:402:M64:C:6900:1211:1212:0:101:53001:0:0:0
+Test S 38:442:M64:C:6900:513:514:0:101:53301:0:0:0
+:DIGIKABEL D
+Club:113:M64:C:6900:711:712,713:0:101:53401:0:0:0
+Liberty TV:113:M64:C:6900:721:722,723:0:101:53402:0:0:0
+Einstein TV:113:M64:C:6900:701:702:0:101:53410:0:0:0
+BibelTV:113:M64:C:6900:731:732:0:101:53403:0:0:0
+Avante:113:M64:C:6900:741:742,743:0:101:53404:0:0:0
+TW1:113:M64:C:6900:751:752:753:101:53405:0:0:0
+:DIGIKABEL INT
+Extreme Sports:113:M64:C:6900:791:792,793:0:101:53409:0:0:0
+BBC Prime:113:M64:C:6900:761:762:763:101:53406:0:0:0
+Eurosport News:113:M64:C:6900:771:772:774:101:53407:0:0:0
+MTV Base:113:M64:C:6900:781:782:0:101:53408:0:0:0
+ATV 2:434:M64:C:6900:631:632:633:101:53203:0:0:0
+Show TV:402:M64:C:6900:1111:1112:0:101:53501:0:0:0
+TGRT:402:M64:C:6900:1121:1122:0:101:53502:0:0:0
+Kanal D:434:M64:C:6900:651:652:653:101:53205:0:0:0
+Fox Kids - RUS:434:M64:C:6900:671:672:0:101:53207:0:0:0
+Kanal 7:402:M64:C:6900:1131:1132:0:101:53504:0:0:0
+ERT-Sat:434:M64:C:6900:691:692:693:101:53209:0:0:0
+PCNE:121:M64:C:6900:911:912:0:101:53208:0:0:0
+Rai 1:402:M64:C:6900:1141:1142:1143:101:53505:0:0:0
+Rai 2:402:M64:C:6900:1151:1152:1153:101:53506:0:0:0
+Rai 3:402:M64:C:6900:1161:1162:1163:101:53507:0:0:0
+Alice:121:M64:C:6900:961:962:0:101:53601:0:0:0
+Leonardo:121:M64:C:6900:951:952:0:101:53523:0:0:0
+Nuvolari:121:M64:C:6900:941:942:0:101:53211:0:0:0
+TV Polonia:434:M64:C:6900:641:642:643:101:53204:0:0:0
+TVEi:434:M64:C:6900:681:682:683:101:53508:0:0:0
+Canal 24 Horas:434:M64:C:6900:601:602:603:101:53509:0:0:0
+RTP Internacional:434:M64:C:6900:661:662:663:101:53206:0:0:0
+RTVi:434:M64:C:6900:611:612:0:101:53201:0:0:0
+Nashe Kino:434:M64:C:6900:621:622:0:101:53202:0:0:0
+Detski Mir:121:M64:C:6900:931:932:0:101:53503:0:0:0
+Fox Kids:434:M64:C:6900:671:673:0:101:53210:0:0:0
+RTR Planeta:121:M64:C:6900:921:922:0:101:53212:0:0:0
 :Radio-Sender (FTV)
+B5 aktuell:410:M64:C:6900:0:3101:0:0:28121:0:0:0
+Bayern 1:410:M64:C:6900:0:3601:0:0:28126:0:0:0
+Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120:0:0:0
+DLF-K�ln:394:M64:C:6900:0:810:0:0:28013:0:0:0
+DLR-Berlin:394:M64:C:6900:0:710:0:0:28012:0:0:0
 Fritz:426:M64:C:6900:0:901:0:0:28209:0:0:0
-SPUTNIK:426:M64:C:6900:0:1201:0:0:28212:0:0:0
+hr2:410:M64:C:6900:0:3301:0:0:28123:0:0:0
+hr-chronos:410:M64:C:6900:0:3201:0:0:28122:0:0:0
+hr-klassik:410:M64:C:6900:0:3401:0:0:28124:0:0:0
 HR XXL:410:M64:C:6900:0:3501:0:0:28125:0:0:0
 JUMP:426:M64:C:6900:0:1001:0:0:28210:0:0:0
 MDR info:426:M64:C:6900:0:1101:0:0:28211:0:0:0
 MDR KULTUR:426:M64:C:6900:0:801:0:0:28208:0:0:0
-Radio 3:426:M64:C:6900:0:701:0:0:28207:0:0:0
+NDR Info:410:M64:C:6900:0:3701:0:0:28127:0:0:0
+NDR Kultur:426:M64:C:6900:0:701:0:0:28207:0:0:0
+NordwestRadio:410:M64:C:6900:0:3801:0:0:28128:0:0:0
+�sterreich 1:394:M64:C:6900:0:169:0:0:28017:0:0:0
 RADIOmultikulti:426:M64:C:6900:0:1301:0:0:28213:0:0:0
+SPUTNIK:426:M64:C:6900:0:1201:0:0:28212:0:0:0
+SR 1:410:M64:C:6900:0:3901:0:0:28129:0:0:0
 SWR2:426:M64:C:6900:0:1401:0:0:28214:0:0:0
 WDR 3:426:M64:C:6900:0:1501:0:0:28215:0:0:0
-WDR Radio 5:426:M64:C:6900:0:1601:0:0:28216:0:0:0
-Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120:0:0:0
-B5 aktuell:410:M64:C:6900:0:3101:0:0:28121:0:0:0
-NordwestRadio:410:M64:C:6900:0:3801:0:0:28128:0:0:0
-Bayern 1:410:M64:C:6900:0:3601:0:0:28126:0:0:0
-NDR Info:410:M64:C:6900:0:3701:0:0:28127:0:0:0
-SR 1:410:M64:C:6900:0:3901:0:0:28129:0:0:0
-hr-klassik:410:M64:C:6900:0:3401:0:0:28124:0:0:0
-hr2:410:M64:C:6900:0:3301:0:0:28123:0:0:0
-hr-chronos:410:M64:C:6900:0:3201:0:0:28122:0:0:0
-DLF-K�ln:394:M64:C:6900:0:810:0:0:28013:0:0:0
-DLR-Berlin:394:M64:C:6900:0:710:0:0:28012:0:0:0
-�sterreich 1:394:M64:C:6900:0:169:0:0:28017:0:0:0
-Radio GoldStar:354:M64:C:6900:0:368:0:0:171:0:0:0
+WDR 5:426:M64:C:6900:0:1601:0:0:28216:0:0:0
 :Radio-Sender (PPV)
-ALTERNATIVE ROCK:370:M64:C:6900:1:544:0:101:154:0:0:0
-DEUTSCHE HITS:370:M64:C:6900:1:800:0:101:151:0:0:0
-HITLISTE:370:M64:C:6900:1:784:0:101:150:0:0:0
-HIP HOP/R&B:370:M64:C:6900:1:576:0:101:159:0:0:0
-DANCE:370:M64:C:6900:1:304:0:101:165:0:0:0
-HARD ROCK:370:M64:C:6900:1:816:0:101:152:0:0:0
-LOVE SONGS:370:M64:C:6900:1:592:0:101:156:0:0:0
-FILM & MUSICAL:378:M64:C:6900:1:592:0:101:145:0:0:0
-EASY LISTENING:378:M64:C:6900:1:608:0:101:146:0:0:0
-JAZZ:378:M64:C:6900:1:640:0:101:148:0:0:0
-KLASSIK POPUL�R:378:M64:C:6900:1:624:0:101:147:0:0:0
-ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158:0:0:0
-CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163:0:0:0
-CHILLOUT:370:M64:C:6900:1:400:0:101:157:0:0:0
-SCHLAGER:370:M64:C:6900:1:384:0:101:162:0:0:0
-GOLD:370:M64:C:6900:1:320:0:101:166:0:0:0
-OLD GOLD:362:M64:C:6900:1:336:0:101:167:0:0:0
-SOUL CLASSICS:362:M64:C:6900:1:352:0:101:153:0:0:0
-LATIN:362:M64:C:6900:1:368:0:101:155:0:0:0
-NEW COUNTRY:362:M64:C:6900:1:384:0:101:164:0:0:0
-COUNTRY:362:M64:C:6900:1:656:0:101:149:0:0:0
-All Jazz:442:M64:C:6900:1:535:0:101:53350:0:0:0
-Cristal New Age:442:M64:C:6900:1:536:0:101:53351:0:0:0
-Movie Sounds:442:M64:C:6900:1:537:0:101:53352:0:0:0
-Sinfonica:442:M64:C:6900:1:538:0:101:53353:0:0:0
-Opernfestival:442:M64:C:6900:1:539:0:101:53354:0:0:0
-Barock Fantasie:442:M64:C:6900:1:540:0:101:53355:0:0:0
-Musica Camerata:442:M64:C:6900:1:541:0:101:53356:0:0:0
-Musica Antica:442:M64:C:6900:1:542:0:101:53357:0:0:0
-Adagio:442:M64:C:6900:1:543:0:101:53358:0:0:0
-Jazz legends:442:M64:C:6900:1:544:0:101:53359:0:0:0
+ALTERNATIVE ROCK:370:M64:C:6900:0:544:0:101:154:0:0:0
+CLASSIC ROCK:370:M64:C:6900:0:352:0:101:163:0:0:0
+COOL & EASY:370:M64:C:6900:0:400:0:101:157:0:0:0
+COUNTRY:362:M64:C:6900:0:656:0:101:149:0:0:0
+DANCE:370:M64:C:6900:0:304:0:101:165:0:0:0
+DEUTSCHE HITS:370:M64:C:6900:0:800:0:101:151:0:0:0
+EASY LISTENING:378:M64:C:6900:0:608:0:101:146:0:0:0
+FILM & MUSICAL:378:M64:C:6900:0:592:0:101:145:0:0:0
+GOLD:370:M64:C:6900:0:320:0:101:166:0:0:0
+HARD ROCK:370:M64:C:6900:0:816:0:101:152:0:0:0
+HIP HOP/R&B:370:M64:C:6900:0:576:0:101:159:0:0:0
+HITLISTE:370:M64:C:6900:0:784:0:101:150:0:0:0
+JAZZ:378:M64:C:6900:0:640:0:101:148:0:0:0
+KLASSIK POPUL�R:378:M64:C:6900:0:624:0:101:147:0:0:0
+LATIN:362:M64:C:6900:0:368:0:101:155:0:0:0
+LOVE SONGS:370:M64:C:6900:0:592:0:101:156:0:0:0
+NEW COUNTRY:362:M64:C:6900:0:384:0:101:164:0:0:0
+OLD GOLD:362:M64:C:6900:0:336:0:101:167:0:0:0
+ORCHESTRALE WERKE:378:M64:C:6900:0:560:0:101:158:0:0:0
+SCHLAGER:370:M64:C:6900:0:384:0:101:162:0:0:0
+SOUL CLASSICS:362:M64:C:6900:0:352:0:101:153:0:0:0
diff --git a/ci.c b/ci.c
index 62bbed7eb..a3d64df3e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.8 2003/03/16 22:32:47 kls Exp $
+ * $Id: ci.c 1.9 2003/03/23 15:18:40 kls Exp $
  */
 
 /* XXX TODO
@@ -1273,6 +1273,7 @@ void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
 cCiHandler::cCiHandler(int Fd, int NumSlots)
 {
   numSlots = NumSlots;
+  enabled = true;
   for (int i = 0; i < MAX_CI_SESSION; i++)
       sessions[i] = NULL;
   tpl = new cCiTransportLayer(Fd, numSlots);
@@ -1425,6 +1426,8 @@ int cCiHandler::CloseAllSessions(int Slot)
 
 bool cCiHandler::Process(void)
 {
+  if (!enabled)
+     return false;
   bool result = true;
   cMutexLock MutexLock(&mutex);
   for (int Slot = 0; Slot < numSlots; Slot++) {
diff --git a/ci.h b/ci.h
index 255292a21..a9f27f1ea 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.3 2003/02/16 10:55:21 kls Exp $
+ * $Id: ci.h 1.4 2003/03/23 15:18:40 kls Exp $
  */
 
 #ifndef __CI_H
@@ -80,6 +80,7 @@ class cCiHandler {
 private:
   cMutex mutex;
   int numSlots;
+  bool enabled;
   cCiSession *sessions[MAX_CI_SESSION];
   cCiTransportLayer *tpl;
   cCiTransportConnection *tc;
@@ -95,6 +96,7 @@ class cCiHandler {
 public:
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
+  void SetEnabled(bool Enabled) { enabled = Enabled; }
   bool Process(void);
   bool EnterMenu(int Slot);
   cCiMenu *GetMenu(void);
diff --git a/config.c b/config.c
index e1d982a85..ff7a4c059 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.112 2002/11/02 13:13:49 kls Exp $
+ * $Id: config.c 1.113 2003/04/12 09:37:48 kls Exp $
  */
 
 #include "config.h"
@@ -280,6 +280,7 @@ cSetup::cSetup(void)
   MinUserInactivity = 120;
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
+  ResumeID = 0;
   memset(CaCaps, sizeof(CaCaps), 0);
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
@@ -428,6 +429,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
   else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
   else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
+  else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CaCaps"))              return ParseCaCaps(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
@@ -474,6 +476,7 @@ bool cSetup::Save(void)
   Store("MinUserInactivity",  MinUserInactivity);
   Store("MultiSpeedMode",     MultiSpeedMode);
   Store("ShowReplayMode",     ShowReplayMode);
+  Store("ResumeID",           ResumeID);
   StoreCaCaps("CaCaps");
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
diff --git a/config.h b/config.h
index 206045868..ac40ff47a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.150 2003/03/09 10:01:02 kls Exp $
+ * $Id: config.h 1.152 2003/04/12 09:35:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.26"
+#define VDRVERSION "1.1.27"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -229,6 +229,7 @@ class cSetup : public cConfig<cSetupLine> {
   int MinEventTimeout, MinUserInactivity;
   int MultiSpeedMode;
   int ShowReplayMode;
+  int ResumeID;
   int CaCaps[MAXDEVICES][MAXCACAPS];
   int CurrentChannel;
   int CurrentVolume;
diff --git a/device.c b/device.c
index 0f99e13bd..67da45715 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.37 2003/03/09 14:05:23 kls Exp $
+ * $Id: device.c 1.39 2003/04/12 11:51:04 kls Exp $
  */
 
 #include "device.h"
@@ -106,19 +106,14 @@ bool cDevice::SetPrimaryDevice(int n)
 {
   n--;
   if (0 <= n && n < numDevices && device[n]) {
-     if (device[n]->HasDecoder()) {
-        isyslog("setting primary device to %d", n + 1);
-        if (primaryDevice)
-           primaryDevice->MakePrimaryDevice(false);
-        primaryDevice = device[n];
-        primaryDevice->MakePrimaryDevice(true);
-        return true;
-        }
-     else
-        esyslog("ERROR: device number %d has no MPEG decoder", n + 1);
+     isyslog("setting primary device to %d", n + 1);
+     if (primaryDevice)
+        primaryDevice->MakePrimaryDevice(false);
+     primaryDevice = device[n];
+     primaryDevice->MakePrimaryDevice(true);
+     return true;
      }
-  else
-     esyslog("ERROR: invalid primary device number: %d", n + 1);
+  esyslog("ERROR: invalid primary device number: %d", n + 1);
   return false;
 }
 
@@ -422,9 +417,16 @@ bool cDevice::ToggleMute(void)
 {
   int OldVolume = volume;
   mute = !mute;
-  SetVolume(0, mute);
+  //XXX why is it necessary to use different sequences???
+  if (mute) {
+     SetVolume(0, mute);
+     Audios.MuteAudio(mute); // Mute external audio after analog audio
+     }
+  else {
+     Audios.MuteAudio(mute); // Enable external audio before analog audio
+     SetVolume(0, mute);
+     }
   volume = OldVolume;
-  Audios.MuteAudio(mute);
   return mute;
 }
 
@@ -478,10 +480,12 @@ void cDevice::Clear(void)
 
 void cDevice::Play(void)
 {
+  Audios.MuteAudio(mute);
 }
 
 void cDevice::Freeze(void)
 {
+  Audios.MuteAudio(true);
 }
 
 void cDevice::Mute(void)
@@ -520,6 +524,7 @@ void cDevice::Detach(cPlayer *Player)
      player = NULL;
      SetPlayMode(pmNone);
      playerDetached = true;
+     Audios.ClearAudio();
      }
 }
 
diff --git a/dvbdevice.c b/dvbdevice.c
index ba6087064..9bbac2d24 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.46 2003/02/16 15:10:39 kls Exp $
+ * $Id: dvbdevice.c 1.51 2003/04/12 15:06:11 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -196,6 +196,7 @@ bool cDvbTuner::SetFrontend(void)
             CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
             }
 
+         frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
          Frontend.frequency = frequency * 1000UL;
          Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
          Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL;
@@ -263,7 +264,7 @@ void cDvbTuner::Action(void)
                  }
               }
            if (tunerStatus >= tsLocked) {
-              if (ciHandler) {
+              if (ciHandler && channel.Ca()) {
                  if (ciHandler->Process()) {
                     if (tunerStatus != tsCam) {//XXX TODO update in case the CA descriptors have changed
                        uchar buffer[2048];
@@ -396,7 +397,8 @@ bool cDvbDevice::Initialize(void)
 
 void cDvbDevice::MakePrimaryDevice(bool On)
 {
-  cDvbOsd::SetDvbDevice(On ? this : NULL);
+  if (HasDecoder())
+     cDvbOsd::SetDvbDevice(On ? this : NULL);
 }
 
 bool cDvbDevice::HasDecoder(void) const
@@ -712,7 +714,7 @@ int cDvbDevice::NumAudioTracksDevice(void) const
   int n = 0;
   if (aPid1)
      n++;
-  if (!Ca() && aPid2 && aPid1 != aPid2) // a Ca recording session blocks switching live audio tracks
+  if (Ca() <= MAXDEVICES && aPid2 && aPid1 != aPid2) // a Ca recording session blocks switching live audio tracks
      n++;
   return n;
 }
@@ -744,7 +746,7 @@ bool cDvbDevice::CanReplay(void) const
   if (Receiving())
      return false;
 #endif
-  return cDevice::CanReplay() && !Ca(); // we can only replay if there is no Ca recording going on
+  return cDevice::CanReplay() && Ca() <= MAXDEVICES; // we can only replay if there is no Ca recording going on
 }
 
 bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
@@ -773,11 +775,15 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
          if (siProcessor)
             siProcessor->SetStatus(true);
+         if (ciHandler)
+            ciHandler->SetEnabled(true);
          break;
     case pmAudioVideo:
     case pmAudioOnlyBlack:
          if (siProcessor)
             siProcessor->SetStatus(false);
+         if (ciHandler)
+            ciHandler->SetEnabled(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
          CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
@@ -788,6 +794,8 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
     case pmAudioOnly:
          if (siProcessor)
             siProcessor->SetStatus(false);
+         if (ciHandler)
+            ciHandler->SetEnabled(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_STOP, true));
          CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
@@ -799,6 +807,8 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
     case pmExtern_THIS_SHOULD_BE_AVOIDED:
          if (siProcessor)
             siProcessor->SetStatus(false);
+         if (ciHandler)
+            ciHandler->SetEnabled(false);
          close(fd_video);
          close(fd_audio);
          fd_video = fd_audio = -1;
@@ -820,6 +830,7 @@ void cDvbDevice::Clear(void)
      CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
   if (fd_audio >= 0)
      CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+  cDevice::Clear();
 }
 
 void cDvbDevice::Play(void)
@@ -834,6 +845,7 @@ void cDvbDevice::Play(void)
      if (fd_video >= 0)
         CHECK(ioctl(fd_video, VIDEO_CONTINUE));
      }
+  cDevice::Play();
 }
 
 void cDvbDevice::Freeze(void)
@@ -848,6 +860,7 @@ void cDvbDevice::Freeze(void)
      if (fd_video >= 0)
         CHECK(ioctl(fd_video, VIDEO_FREEZE));
      }
+  cDevice::Freeze();
 }
 
 void cDvbDevice::Mute(void)
@@ -856,6 +869,7 @@ void cDvbDevice::Mute(void)
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
      CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
      }
+  cDevice::Mute();
 }
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
diff --git a/dvbosd.c b/dvbosd.c
index 428a3f048..3d57362df 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.20 2003/03/09 09:59:13 kls Exp $
+ * $Id: dvbosd.c 1.21 2003/04/12 12:10:12 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -19,7 +19,7 @@ cDvbOsd::cDvbOsd(int x, int y)
 :cOsdBase(x, y)
 {
   osdDev = dvbDevice ? dvbDevice->OsdDeviceHandle() : -1;
-  if (osdDev < 0)
+  if (dvbDevice && osdDev < 0)
      esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
 }
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 5aff35119..f71c69cc2 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.18 2003/02/15 10:38:59 kls Exp $
+ * $Id: dvbplayer.c 1.19 2003/03/30 12:51:51 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -324,11 +324,8 @@ void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
               case 0xC0 ... 0xC1: // audio
                    if (c == 0xC1)
                       canToggleAudioTrack = true;
-                   if (!Except || c != Except) {
-                      int n = l;
-                      for (int j = i; j < Length && n--; j++)
-                          b[j] = 0x00;
-                      }
+                   if (!Except || c != Except)
+                      memset(&b[i], 0x00, min(l, Length-i));
                    break;
               case 0xE0 ... 0xEF: // video
                    break;
diff --git a/eit.c b/eit.c
index 42740852a..ff5dd42fd 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.67 2003/03/16 11:20:05 kls Exp $
+ * $Id: eit.c 1.68 2003/04/12 11:27:31 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1011,29 +1011,37 @@ class cCaDescriptor : public cListObject {
   int length;
   uchar *data;
 public:
-  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int Length, uchar *Data);
+  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int CaPid, int Length, uchar *Data);
   virtual ~cCaDescriptor();
   int Length(void) const { return length; }
   const uchar *Data(void) const { return data; }
   };
 
-cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int Length, uchar *Data)
+cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int CaPid, int Length, uchar *Data)
 {
   source = Source;
   transponder = Transponder;
   serviceId = ServiceId;
   caSystem = CaSystem;
-  length = Length;
+  length = Length + 6;
   data = MALLOC(uchar, length);
-  memcpy(data, Data, length);
-  /*//XXX just while debugging...
+  data[0] = DESCR_CA;
+  data[1] = length - 2;
+  data[2] = (caSystem >> 8) & 0xFF;
+  data[3] =  caSystem       & 0xFF;
+  data[4] = ((CaPid   >> 8) & 0xFF) | 0xE0;
+  data[5] =   CaPid         & 0xFF;
+  if (Length)
+     memcpy(&data[6], Data, Length);
+//#define DEBUG_CA_DESCRIPTORS 1
+#ifdef DEBUG_CA_DESCRIPTORS
   char buffer[1024];
   char *q = buffer;
   q += sprintf(q, "CAM: %04X %5d %4d", source, transponder, serviceId);
   for (int i = 0; i < length; i++)
       q += sprintf(q, " %02X", data[i]);
   dsyslog(buffer);
-  *///XXX
+#endif
 }
 
 cCaDescriptor::~cCaDescriptor()
@@ -1312,16 +1320,13 @@ void cSIProcessor::Action()
                            if (pid == pmtPid && buf[0] == 0x02 && currentSource && currentTransponder) {
                               struct Pid *pi = siParsePMT(buf);
                               if (pi) {
-                                 for (struct LIST *d = (struct LIST *)pi->Descriptors; d; d = (struct LIST *)xSucc(d)) {
-                                     if (DescriptorTag(d) == DESCR_CA) {
-                                        uchar *Data = ((ConditionalAccessDescriptor *)d)->Data;
-                                        int CaSystem = (Data[2] << 8) | Data[3];
-                                        if (!caDescriptors->Get(currentSource, currentTransponder, pi->ProgramID, CaSystem)) {
-                                           cMutexLock MutexLock(&caDescriptorsMutex);
-                                           caDescriptors->Add(new cCaDescriptor(currentSource, currentTransponder, pi->ProgramID, CaSystem, ((ConditionalAccessDescriptor *)d)->Amount, Data));
-                                           }
-                                        //XXX update???
-                                        }
+                                 struct Descriptor *d;
+                                 for (d = (struct Descriptor *)pi->Descriptors->Head; d; d = (struct Descriptor *)xSucc(d))
+                                     NewCaDescriptor(d, pi->ProgramID);
+                                 // Also scan the PidInfo list for descriptors - some broadcasts send them only here.
+                                 for (struct PidInfo *p = (struct PidInfo *)pi->InfoList->Head; p; p = (struct PidInfo *)xSucc(p)) {
+                                     for (d = (struct Descriptor *)p->Descriptors->Head; d; d = (struct Descriptor *)xSucc(d))
+                                         NewCaDescriptor(d, pi->ProgramID);
                                      }
                                  }
                               xMemFreeAll(NULL);
@@ -1438,6 +1443,18 @@ void cSIProcessor::TriggerDump(void)
   lastDump = 0;
 }
 
+void cSIProcessor::NewCaDescriptor(struct Descriptor *d, int ProgramID)
+{
+  if (DescriptorTag(d) == DESCR_CA) {
+     struct CaDescriptor *cd = (struct CaDescriptor *)d;
+     if (!caDescriptors->Get(currentSource, currentTransponder, ProgramID, cd->CA_type)) {
+        cMutexLock MutexLock(&caDescriptorsMutex);
+        caDescriptors->Add(new cCaDescriptor(currentSource, currentTransponder, ProgramID, cd->CA_type, cd->CA_PID, cd->DataLength, cd->Data));
+        }
+     //XXX update???
+     }
+}
+
 int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data)
 {
   if (BufSize > 0 && Data) {
diff --git a/eit.h b/eit.h
index 17fa90932..e956b0139 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.24 2003/02/02 14:07:39 kls Exp $
+ * $Id: eit.h 1.25 2003/04/12 10:59:26 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -158,6 +158,7 @@ class cSIProcessor : public cThread {
   bool AddFilter(unsigned short pid, u_char tid);
   bool DelFilter(unsigned short pid, u_char tid);
   bool ShutDownFilters(void);
+  void NewCaDescriptor(struct Descriptor *d, int ProgramID);
 public:
   cSIProcessor(const char *FileName);
   ~cSIProcessor();
diff --git a/i18n.c b/i18n.c
index 3dc42b0de..506e0a57b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.103 2003/01/26 11:46:46 kls Exp $
+ * $Id: i18n.c 1.105 2003/04/12 09:39:35 kls Exp $
  *
  * Translations provided by:
  *
@@ -210,7 +210,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoituskomennot",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Entoles gia egrafes",// TODO
     "Inspelningskommandon",
     "",// TODO
     "",// TODO
@@ -226,7 +226,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa kanavaa",
     "Ustawienie kanalu",
     "Modificar canal",
-    "Prosarmoges kanaliou",
+    "Prosarmogi kanaliou",
     "�ndra kanal",
     "Editare canale",
     "Csatorn�k be�ll�t�sa",
@@ -242,7 +242,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa ajastusta",
     "Ustawienie timerow",
     "Modificar timer",
-    "Prosarmoges programmatismou",
+    "Prosarmogi Programmatismou",
     "�ndra timer",
     "Editare timere",
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
@@ -306,7 +306,7 @@ const tI18nPhrase Phrases[] = {
     "Nykyinen ohjelma",
     "Program biezacy",
     "�Qu� hay ahora?",
-    "Ti pezi tora",
+    "Trexon Programma",
     "Vilket program s�nds nu?",
     "Programul actual?",
     "Mi megy most?",
@@ -322,7 +322,7 @@ const tI18nPhrase Phrases[] = {
     "Seuraava ohjelma",
     "Program nastepny",
     "�Qu� hay proximo?",
-    "Ti tha peksi meta",
+    "Epomeno Programma",
     "Vilket �r n�sta program?",
     "Programul urmator?",
     "Mi k�vetkezik?",
@@ -371,7 +371,7 @@ const tI18nPhrase Phrases[] = {
     "Poista",
     "Usunac",
     "Borrar",
-    "Swisimo",
+    "Diagrafi",
     "Ta bort",
     "Sterge",
     "T�r�lni",
@@ -387,7 +387,7 @@ const tI18nPhrase Phrases[] = {
     "Merkitse",
     "Zaznaczyc",
     "Marcar",
-    "Markarisma",
+    "Epilogi",
     "M�rk",
     "Marcheaza",
     "Megjel�lni",
@@ -403,7 +403,7 @@ const tI18nPhrase Phrases[] = {
     "P��ll�/Pois",
     "Zal./ Wyl.",
     "On/Off",
-    "Energo/Klisto",
+    "Anoixto/Kleisto",
     "P�/Av",
     "Pornit/Oprit",
     "Be/Ki",
@@ -435,7 +435,7 @@ const tI18nPhrase Phrases[] = {
     "Toista",
     "Odtwarzac",
     "Play",
-    "Anametadosi",
+    "Anaparagogi",
     "Spela upp",
     "Redare",
     "Lej�tszani",
@@ -611,7 +611,7 @@ const tI18nPhrase Phrases[] = {
     "Avaa",
     "Wyrzucenie",
     "Eyectar",
-    "Apovoli",
+    "Exsagogi",
     "Mata ut",
     "Ejecteaza",
     "Kidobni",
@@ -691,7 +691,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Epanafora",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -708,7 +708,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko kanava?",
     "Usunac kanal?",
     "�Eliminar canal?",
-    "Na sviso to kanali?",
+    "Diagrafi Kanaliou?",
     "Ta bort kanalen?",
     "Sterg canalul?",
     "Csatorna t�rl�se?",
@@ -724,7 +724,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko ajastus?",
     "Usunac timer?",
     "�Eliminar timer?",
-    "Svisimo tou programmitismou?",
+    "Diagrafi programmitismou?",
     "Ta bort timern?",
     "Sterg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
@@ -740,7 +740,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko nauhoitus?",
     "Usunac nagranie?",
     "�Eliminar grabacion?",
-    "Svisimo tis egrafis?",
+    "Svisimo egrafis?",
     "Ta bort inspelningen?",
     "Sterg inregistrarea?",
     "Felv�tel t�rl�se?",
@@ -756,7 +756,7 @@ const tI18nPhrase Phrases[] = {
     "Ajastin nauhoittaa - poistetaanko silti?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
-    "Ginete akoma programmatismeni egrafi - na svisti sigoura?",
+    "Programmatismos se exselixsi - Diagrafi sigoura?",
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
     "Timer-ul in inregistrare - sterg?",
     "Felv�tel folyamatban van - m�gis t�r�lni?",
@@ -804,7 +804,7 @@ const tI18nPhrase Phrases[] = {
     "Peruutetaanko muokkaus?",
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
-    "Akirosi alagon?",
+    "Akirosi kopsimatos?",
     "Avbryta editeringen?",
     "Opresc editarea?",
     "V�g�st befejezni?",
@@ -836,7 +836,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoitus k�ynniss� - aloitetaanko alusta?",
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
     "�Grabando - reiniciar?",
-    "Ginete egrafi - na gini epanekinisi sigoura?",
+    "Ginete egrafi - Telika na ginei epanekinisi?",
     "Inspelning p�g�r, vill du starta om i alla fall?",
     "In inregistrare - repornesc?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
@@ -852,7 +852,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoitus kesken - lopetetaanko se?",
     "Nagrywanie w trakcie - mimo to wylaczyc?",
     "�Grabando - apagar?",
-    "Ginete egrafi - na stamatisi i litourgia sigoura?",
+    "Ginete egrafi - Telika na ginei termatismos?",
     "Inspelning p�g�r, vill du avbryta i alla fall?",
     "In inregistrare - opresc?",
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
@@ -868,7 +868,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
     "�Grabando en %d minutos, de verdad cortar?",
-    "Anamenete egrafi se %d lepta - na stamatisi i litourgia sigoura?",
+    "Anamenete egrafi se %d lepta - Telika na termatistei?",
     "Inspelning startar om %d minuter, vill du avsluta?",
     "Inregistrez in %d minute, opresc?",
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
@@ -884,7 +884,7 @@ const tI18nPhrase Phrases[] = {
     "Peruuta pys�ytys painamalla jotakin n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
     "Pulse una tecla para interrumpir corte",
-    "Piese ena pliktro na stamatisi to katevasma",
+    "Piese ena pliktro na akirothei o termatismos",
     "Tryck valfri knapp f�r att avbryta nedst�ngning",
     "Apasa orice tasta pentru a anula inchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
@@ -949,7 +949,7 @@ const tI18nPhrase Phrases[] = {
     "L�hde",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Pigi",//TODO
     "K�lla",
     "",//TODO
     "",//TODO
@@ -1383,7 +1383,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava on ajastimen k�yt�ss�!",
     "Kanal jest zajety przez timer nagran",
     "�Canal est� ocupado por un timer!",
-    "To kanali xrisimopiite apo programmatismeni thesi",
+    "To kanali xrisimopiite apo kapoion programmatismo!",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
     "Csatorn�t m�s haszn�lja!",
@@ -1399,7 +1399,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavan vaihtaminen ei mahdollista!",
     "Kanal nie moze byc teraz przelaczony!",
     "�No puedo cambiar canal!",
-    "Den mporo na pao sto kanali!",
+    "Adinati i allagi kanaliou!",
     "Om�jligt att byta kanal!",
     "Nu pot comuta canalul!",
     "Csatorn�t nem lehet �tkapcsolni!",
@@ -1431,7 +1431,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoituksen toistaminen ep�onnistui!",
     "Blad - brak dostepu do nagrania!",
     "�Error al accesar la grabaci�n!",
-    "Lathos stin evresi tis egrafis!",
+    "Provlima stin prospelasi egrafis!",
     "Det g�r inte att l�sa inspelningen",
     "Eroare in timpul accesarii inregistrarii",
     "Hiba a felv�tel hozz�f�r�s�n�l",
@@ -1447,7 +1447,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoituksen poistaminen ep�onnistui!",
     "Blad przy usuwaniu nagrania!",
     "�Error al borrar la grabaci�n!",
-    "Lathos stin prospathia na svisti i egrafi!",
+    "Provlima sto svisimo egrafis !",
     "Det g�r inte att ta bort inspelningen",
     "Eroare in timpul stergerii inregistrarii!",
     "Hiba a felv�tel t�rl�s�n�l!",
@@ -1463,7 +1463,7 @@ const tI18nPhrase Phrases[] = {
     "*** Virheellinen kanavavalinta! ***",
     "*** Niewazny kanal ***",
     "*** Canal inv�lido ***",
-    "*** Kanali akiro ***",
+    "*** Akiro Kanali ***",
     "*** Felaktig kanal ***",
     "*** Canal invalid ***",
     "*** �rv�nytelen csatorna ***",
@@ -1479,7 +1479,7 @@ const tI18nPhrase Phrases[] = {
     "Ei vapaata vastaanotinta nauhoitusta varten!",
     "Brak wolnej karty DVB do nagrywania!",
     "�No hay dispositivo DVB disponible para grabar!",
-    "Den iparxi elevteri DVB Karta gia egrafi!",
+    "Den periseuei DVB Karta gia egrafi!",
     "Det finns ingen ledig DVB enhet f�r inspelning!",
     "Nu mai sunt dispozitive DVB pentru inregistrare!",
     "Nincs szabad DVB k�rtya a felv�telhez!",
@@ -1495,7 +1495,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavaa ei voi katsoa nyt!",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "To kanali den ine diathesimo",
     "Kanalen ej tillg�nglig!",
     "",//TODO
     "",//TODO
@@ -1511,7 +1511,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Ta kanalia stin lista den ine monadika!",
     "Kanalinst�llningarna �r ej unika!",
     "",//TODO
     "",//TODO
@@ -1527,7 +1527,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava lukittu (nauhoitusta varten)!",
     "Kanal zablokowany (nagrywanie w toku)!",
     "�Canal bloqueado (grabando)!",
-    "To kanali ine mplokarismeno (Ginete egrafi)!",
+    "To kanali ine klidomeno (Ginete egrafi)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
     "Canal blocat (inregistrare)!",
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
@@ -1543,7 +1543,7 @@ const tI18nPhrase Phrases[] = {
     "K�sitt�m�tt�mi� teknisi� ongelmia!",
     "Tryb transferowy jest niemozliwy!",
     "�No puedo iniciar modo de transferencia!",
-    "Den mpori na arxisi to Transfer-Mode!",
+    "Adinamia ekinisis katastasis metaforas!",
     "Kan inte starta Transfer Mode!",
     "Nu pot porni Modul de Transfer!",
     "Transfer-Mode nem ind�that�!",
@@ -1559,7 +1559,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkauksen aloittaminen ei onnistu!",
     "Uruchamianie montazu jest niemozliwe!",
     "�No puedo iniciar proceso de modificaci�n!",
-    "Den mpori na arxisi to kopsimo tis tenias!",
+    "Adinamia ekinisis tis epexsergasias!",
     "Kan inte starta editering!",
     "Nu pot porni procesul de editare!",
     "A v�g�s nem ind�that�!",
@@ -1575,7 +1575,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus on jo k�ynniss�!",
     "Montaz w toku!",
     "�Proceso de modificaci�n ya fue iniciado!",
-    "To kopsimo ti tenias ini idi se litourgia!",
+    "Epexsergasia vriskete se exselixsi!",
     "Editering �r redan aktiv!",
     "Procesul de editare este activ!",
     "A v�g�s m�r aktiv�lt!",
@@ -1591,7 +1591,7 @@ const tI18nPhrase Phrases[] = {
     "Ei voida sammuttaa '-s' parametria ei annettu!",
     "Wylaczenie niemozliwe - brak opcji '-s'!",
     "�No puedo cortar - opci�n '-s' absente!",
-    "Den mporo na kliso ton ipologisti. Lipi i parametros '-s'!",
+    "Adinaton na ginei termatismos. Aniparkti i parametros '-s'!",
     "Kan inte avsluta, m�ste anv�nda flagga '-s'",
     "Nu pot opri calculatorul - vezi optiunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
@@ -1623,7 +1623,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Den mpori na aniksi to CAM menou!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1639,7 +1639,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Adinato na gini epanafora sto CAM",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1655,7 +1655,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Sto CAM egine apanafora",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1945,7 +1945,7 @@ const tI18nPhrase Phrases[] = {
     "Valikkojen rullaus",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
-    "Scroll selidas",
+    "Kilisi selidas",
     "Bl�ddra sidor",
     "Deruleaza pagini",
     "Oldalank�nt l�ptetmi",
@@ -1977,7 +1977,7 @@ const tI18nPhrase Phrases[] = {
     "Nauhoitushakemistot",
     "Wykaz nagran",
     "Directorios para grabaci�n",
-    "Fakeli egrafon",
+    "Fakeloi egrafon",
     "Kataloger f�r inspelningar",
     "Directoare inregistrari",
     "Felv�telek list�ja",
@@ -1993,7 +1993,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmatied. odotusaika (h)",
     "Czas do skanu EPG (h)",
     "Tiempo hasta exploraci�n EPG (h)",
-    "Xronos mexri sarosi EPG se Ores",
+    "Xronos mexri eksetasi EPG se Ores",
     "EPG s�kning timeout",
     "Timeout EPG",
     "Fennmaradt id� az EPG-g (h)",
@@ -2041,7 +2041,7 @@ const tI18nPhrase Phrases[] = {
     "Vastaanota kellonaika l�hettimelt�",
     "Transponder do ustawiania czasu",
     "Transponder para reloj de sistema",
-    "Transponder gia sintonismo tis oras",
+    "Anametadotis gia sintonismo tis oras",
     "Anv�nd klockan fr�n transponder",
     "Preia ceasul din transponder",
     "Id�h�z tartoz� Transponder",
@@ -2201,7 +2201,7 @@ const tI18nPhrase Phrases[] = {
     "PrimaryLimit",
     "Pierwotny limit",
     "L'mite primario",
-    "Protevon limit",
+    "Protevon orio",
     "Prim�r gr�ns",
     "Limita Primara",
     "Prim�r-hat�r",
@@ -2265,7 +2265,7 @@ const tI18nPhrase Phrases[] = {
     "Merkitse v�lit�n nauh.",
     "Zaznaczyc natychm. nagranie",
     "Marcar grabaciones instant�neas",
-    "Markarisma apevthias egrafis",
+    "Epilogi trexon egrafis",
     "M�rk direktinspelning",
     "Inregistrare imediata",
     "Direktfelv�tel megjel�l�se",
@@ -2281,7 +2281,7 @@ const tI18nPhrase Phrases[] = {
     "Nime� v�lit�n nauh.",
     "Nazwac natychm. nagranie",
     "Nombrar grabaciones instant�neas",
-    "eponomasi apevthias egrafis",
+    "eponomasi trexon egrafis",
     "Namnge direktinspelning",
     "Nume inregistrare imediata",
     "Direktfelv�tel megnevez�se",
@@ -2297,7 +2297,7 @@ const tI18nPhrase Phrases[] = {
     "Pikanauhoituksen pituus (min)",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Stigmiees egrafes xronos (lepta)",
     "Direktinspelning l�ngd (min)",
     "Timpul de inregistarea imediata (min)",
     "Felv�tel id�tartama",
@@ -2345,7 +2345,7 @@ const tI18nPhrase Phrases[] = {
     "Paloittele muokatut",
     "Dzielic montowane pliki",
     "Quebrar ficheros",
-    "Diamelisma epeksergasm. arxeion",
+    "Diamelisma epeksergasmenon arxeion",
     "Dela upp editerade filer",
     "Separare fisiere editate",
     "Feldolgozott File-k feloszt�sa",
@@ -2361,7 +2361,7 @@ const tI18nPhrase Phrases[] = {
     "Moninopeustila",
     "Tryb wielopredkosciowy",
     "Modo multi-velocidad",
-    "Multispeed modus",
+    "Multispeed mode",
     "Multispeed mode",
     "Mod multi-rata",
     "MultiSpeed funkci�",
@@ -2377,11 +2377,27 @@ const tI18nPhrase Phrases[] = {
     "N�yt� toiston tila",
     "Wyswietlac status odtwarzania",
     "Mostrar modo de replay",
-    "Endiksi  status anametadosis",
+    "Endiksi katastasis anametadosis",
     "Visa uppspelnings mode",
     "Afiseaza modul de redare",
     "Lej�tsz�s felt�ntet�se",
   },
+  { "Setup.Replay$Resume ID",
+    "Wiedergabe ID",
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+    "Resume ID",// TODO
+  },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
     "Najmanjsi cas dogodka (min)",
@@ -2492,7 +2508,7 @@ const tI18nPhrase Phrases[] = {
     "Kaukos��timen n�pp�inten opettelu (%s)",
     "Nauka kodu pilota (%s)",
     "Aprendiendo teclas del telemando (%s)",
-    "Ekmathisi Remote Control (%s)",
+    "Ekmathisi pliktron tilexirismou (%s)",
     "Inl�rning av fj�rrkontrollsknappar (%s)",
     "Invatare taste telecomanda (%s)",
     "T�vir�ny�t� betan�t�sa (%s)",
@@ -2508,7 +2524,7 @@ const tI18nPhrase Phrases[] = {
     "Vaihe 1: L�hetystavan selvitt�minen",
     "Faza 1: Detekcja typu kodu",
     "Fase 1: Detectando tipo de receptor",
-    "Phasi 1: Dilosi RC Code",
+    "Phasi 1: Anixneusi kodika RC",
     "Steg1: identifiering av RC kod",
     "Faza 1: Detectie tip telecomanda",
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
@@ -2524,7 +2540,7 @@ const tI18nPhrase Phrases[] = {
     "Paina mit� tahansa kaukos��timen n�pp�int�",
     "Nacisnac klawisz pilota",
     "Pulse una tecla en el telemando",
-    "Pata ena pliktro sto RC",
+    "Piese ena pliktro sto tilexiristirio",
     "Tryck valfri tangent p� fj�rrkontrollen",
     "Apasati o tasta pe telecomanda",
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
@@ -2540,7 +2556,7 @@ const tI18nPhrase Phrases[] = {
     "N�pp�inpainallus vastaanotettu!",
     "Kod pilota zostal poznany!",
     "�C�digo detectado!",
-    "Evresi RC Code!",
+    "Evrethike kodikas RC!",
     "RC koden detekterad!",
     "S-a detectat tipul telecomenzii!",
     "T�vir�ny�t� k�dja felismerve!",
@@ -2556,7 +2572,7 @@ const tI18nPhrase Phrases[] = {
     "�l� paina mit��n n�pp�int�...",
     "Nie naciskac klawiszy...",
     "No pulse tecla...",
-    "Min patas Pliktra...",
+    "Min piezeis pliktra...",
     "Tryck inte p� n�gon knapp...",
     "Nu apasati nicio tasta...",
     "Ne nyomjon meg gombot...",
@@ -2588,7 +2604,7 @@ const tI18nPhrase Phrases[] = {
     "Paina n�pp�int� toiminnolle '%s'",
     "Nacisnac klawisz dla '%s'",
     "Pulsar tecla para '%s'",
-    "Pata to pliktro gia '%s'",
+    "Piese to pliktro gia '%s'",
     "Tryck p� knappen f�r '%s'",
     "Apasati tasta pentru '%s'",
     "'%s' gomb megnyom�sa",
@@ -2604,7 +2620,7 @@ const tI18nPhrase Phrases[] = {
     "Paina 'Yl�s' hyv�ksy�ksesi",
     "Nacisnac 'Gora' do potwierdzenia",
     "Pulse 'Arriba' para confirmar",
-    "Pata 'pano' gia apodoxi",
+    "Piese 'pano' gia apodoxi",
     "Tryck 'Upp' f�r att bekr�fta",
     "Apsati 'Sus' pentru confirmare",
     "'Fel' megnyom�sa az elfogad�shoz",
@@ -2620,7 +2636,7 @@ const tI18nPhrase Phrases[] = {
     "Paina 'Alas' jatkaaksesi",
     "Nacisnac 'Dol' zeby kontynuowac",
     "Pulse 'Abajo' para confirmar",
-    "Pata 'kato' gia sinexia",
+    "Piese 'kato' gia sinexia",
     "Tryck 'Ner' f�r att bekr�fta",
     "Apasati jos pentru continuare",
     "'Le' megnyom�sa a folytat�shoz",
@@ -2636,7 +2652,7 @@ const tI18nPhrase Phrases[] = {
     "(paina 'Yl�s' palataksesi takaisin)",
     "(Nacisnac 'Gora' cofa)",
     "(Pulse 'Arriba' para retornar)",
-    "(Pata 'pano' gia na pas piso)",
+    "(Piese 'pano' gia epistrofi",
     "(Tryck 'Upp' f�r att backa)",
     "(Apsati 'Sus' pentru revenire)",
     "(�Fel' megnyom�sa a visszat�r�shez)",
@@ -2652,7 +2668,7 @@ const tI18nPhrase Phrases[] = {
     "(paina 'Alas' lopettaaksesi n�pp�inten opettelun)",
     "(Nacisnac 'Dol' by zakonczyc)",
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
-    "(Pata 'Kato' gia termatismo)",
+    "(Piese 'Kato' gia termatismo diloseon plktron)",
     "(Tryck 'Ner' f�r att avsluta knapp definition)",
     "(Apasati 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
@@ -2668,7 +2684,7 @@ const tI18nPhrase Phrases[] = {
     "(Paina 'Valikko' jos n�pp�int� ei ole)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pata 'Menou' gia prosperasi aftou tou pliktrou",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2700,7 +2716,7 @@ const tI18nPhrase Phrases[] = {
     "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guarder, 'Abajo' para anular",
-    "'Kato' apothikevsi, 'Pano' akirosi",
+    "'Pano' apothikevsi, 'Kato' akirosi",
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
@@ -2893,7 +2909,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Anametadosi",
     "Spela upp",
     "",// TODO
     "",// TODO
@@ -2909,7 +2925,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Dialima",
     "Pausa",
     "",// TODO
     "",// TODO
@@ -2925,7 +2941,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Terma",
     "Stoppa",
     "",// TODO
     "",// TODO
@@ -2941,7 +2957,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Egrafi",
     "Spela in",
     "",// TODO
     "",// TODO
@@ -2957,7 +2973,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Girisma mprosta",
     "Spola fram�t",
     "",// TODO
     "",// TODO
@@ -2973,7 +2989,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Girisma piso",
     "Spola bak�t",
     "",// TODO
     "",// TODO
@@ -3005,7 +3021,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Kanali+",
     "Kanal+",
     "",// TODO
     "",// TODO
@@ -3021,7 +3037,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Kanali-",
     "Kanal-",
     "",// TODO
     "",// TODO
@@ -3069,7 +3085,7 @@ const tI18nPhrase Phrases[] = {
     "��nen vaimennus",
     "Cisza",
     "Mudo",
-    "Mougko",
+    "Siopilo",
     "Ljud Av",
     "Mut(e)",
     "Csend",
@@ -3118,7 +3134,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "klisto",
     "av",
     "",// TODO
     "",// TODO
@@ -3134,7 +3150,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "kanena",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3150,7 +3166,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "aftomato",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3294,7 +3310,7 @@ const tI18nPhrase Phrases[] = {
     " Peruuta muokkaus",
     " Przerwac montaz",
     " Anular modificaci�n",
-    " Diakopi kopsimatos",
+    " Akirosi epexsergasias",
     " Avbryt editering",
     " Opreste editare",
     " V�g�st megszak�tani",
@@ -3342,7 +3358,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus aloitettu",
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
-    "Arxi kopsimatos",
+    "Arxi epexsergasias",
     "Editering startad",
     "Procesul de editare a inceput",
     "V�g�s elind�tva",
@@ -3358,7 +3374,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus lopetettu",
     "Proces montazu zakonczony",
     "Proceso modificacion terminado",
-    "To kopsimo termatistike",
+    "I epexsergasia teliose",
     "Editering avslutad",
     "Procesul de editare s-a terminat",
     "V�g�s befejezve",
@@ -3374,7 +3390,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus ep�onnistui!",
     "Bledny proces montazu!",
     "Modificaci�n ha fallado!",
-    "Kopsimo apetixe!",
+    "I epexsergasia apetixe!",
     "Editeringsprocessen misslyckades",
     "Proces de editare nereusit",
     "V�g�s sikertelen!",
@@ -3390,7 +3406,7 @@ const tI18nPhrase Phrases[] = {
     "haetaan nauhoituksia...",
     "Skan nagran...",
     "buscando grabaciones...",
-    "Ginete sarosi egrafon...",
+    "Eksetasi egrafon...",
     "S�ker igenom inspelningarna...",
     "Caut inregistrari...",
     "Felvett ad�sok b�ng�sz�se...",
@@ -3406,7 +3422,7 @@ const tI18nPhrase Phrases[] = {
     "T�ll� laajennoksella ei ole asetuksia!",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Afto to plugin den exi parametrous",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3496,4 +3512,3 @@ const char * const * I18nLanguages(void)
 {
   return &Phrases[0][0];
 }
-
diff --git a/interface.c b/interface.c
index 7466a9ae2..9245c85f2 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.61 2002/12/06 14:13:16 kls Exp $
+ * $Id: interface.c 1.63 2003/04/12 14:17:49 kls Exp $
  */
 
 #include "interface.h"
@@ -264,7 +264,7 @@ void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
   int Line = (abs(height) == 1) ? 0 : -2;
   ClearEol(0, Line, s ? BgColor : clrBackground);
   if (s) {
-     int x = (Width() - strlen(s)) / 2;
+     int x = (Width() - int(strlen(s))) / 2;
      if (x < 0)
         x = 0;
      Write(x, Line, s, FgColor, BgColor);
@@ -411,6 +411,10 @@ void cInterface::QueryKeys(cRemote *Remote)
 void cInterface::LearnKeys(void)
 {
   for (cRemote *Remote = Remotes.First(); Remote; Remote = Remotes.Next(Remote)) {
+      if (!Remote->Ready()) {
+         esyslog("ERROR: remote control %s not ready!", Remote->Name());
+         continue;
+         }
       bool known = Keys.KnowsRemote(Remote->Name());
       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
       if (!known) {
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index 8e9e26051..715d18b22 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -4,11 +4,13 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.6 $
-// $Date: 2002/01/30 17:04:13 $
+// $Revision: 1.7 $
+// $Date: 2003/02/04 18:45:36 $
 // $Author: hakenes $
 //
-//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
+//               GNU GPL with contribution of Oleg Assovski,
+//               www.satmania.com
 //
 // libsi is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -38,9 +40,9 @@
   /* Program Identifier */
 
 #define PID_PAT               0x00           /* Program Association Table */
-#define PID_BAT               0x01           /* Bouquet Association Table */
 #define PID_CAT               0x01           /* Conditional Access Table */
 #define PID_NIT               0x10           /* Network Information Table */
+#define PID_BAT               0x11           /* Bouquet Association Table */
 #define PID_SDT               0x11           /* Service Description Table */
 #define PID_EIT               0x12           /* Event Information Table */
 #define PID_RST               0x13           /* Running Status Table */
@@ -75,12 +77,13 @@
 #define TID_TOT               0x73           /* Time Offset Section */
 #define TID_CA_ECM_0          0x80
 #define TID_CA_ECM_1          0x81
+#define TID_CA_EMM            0x82
 
-#define TID_BAT               0x01           /* Bouquet Association Section */
+#define TID_BAT               0x4A           /* Bouquet Association Section */
 
 #define TID_EIT               0x12           /* Event Information Section */
-#define TID_RST               0x13           /* Running Status Section */
-#define TID_ST                0x14           /* Stuffung Section */
+#define TID_RST               0x71           /* Running Status Section */
+#define TID_ST                0x72           /* Stuffing Section */
                            /* 0xFF */        /* Reserved for future use */
 
   /* Descriptor Identifier */
@@ -160,6 +163,40 @@
 #define MAX_SECTION_BUFFER 4096
 
 
+/* NetworkInfo structure (used to store NIT/BAT information) */
+
+struct NetworkInfo {
+   struct NODE          Node;
+   unsigned short       ID; // NetworkID / BouquetID
+   struct LIST         *Descriptors;
+   struct LIST         *TransportStreams;
+};
+
+#define CreateNetworkInfo(ni, id) \
+   do { \
+      xCreateNode (ni, NULL); \
+      (ni)->ID = id; \
+      (ni)->Descriptors = xNewList(NULL); \
+      (ni)->TransportStreams = NULL; \
+   } while(0)
+
+/* TransportStream structure (NIT/BAT TS loop member) */
+
+struct TransportStream {
+   struct NODE          Node;
+   int                  TransportStreamID;
+   unsigned short       OriginalNetworkID;
+   struct LIST         *Descriptors;
+};
+
+#define CreateTransportStream(ts, tsid, onid) \
+   do { \
+      xCreateNode (ts, NULL); \
+      (ts)->TransportStreamID = tsid; \
+      (ts)->OriginalNetworkID = onid; \
+      (ts)->Descriptors = xNewList(NULL); \
+   } while(0)
+
 /* Strukturen zur Aufnahme der SDT und EIT Informationen */
 
 struct Service {
@@ -305,38 +342,32 @@ struct PidInfo {
 #define STREAMTYPE_13818_D                      13
 #define STREAMTYPE_13818_AUX                    14
 
-/* Descriptors */
-
-#define DescriptorTag(x) ((struct Descriptor *)(x))->Tag
 
-struct Descriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
+struct Tot {
+   time_t               UTC;
+   time_t               Bias;
+   struct LIST         *Descriptors;
 };
 
+#define CreateTot(tot, utc) \
+   do \
+   { \
+      xMemAlloc(sizeof(struct Tot), &tot); \
+      tot->UTC = utc; \
+      tot->Bias = ((utc - time(NULL) + 1800)/3600)*3600; \
+      tot->Descriptors = xNewList(NULL); \
+   } while (0)
 
-/* ConditionalAccessDescriptor */
 
-struct ConditionalAccessDescriptor {
+/* Descriptors */
+
+#define DescriptorTag(x) ((struct Descriptor *)(x))->Tag
+
+struct Descriptor {
    struct NODE          Node;
    unsigned short       Tag;
-   unsigned short       Amount;        /* Data */
-   unsigned char       *Data;
 };
 
-#define CreateConditionalAccessDescriptor(descr, amount, data) \
-   do \
-   { \
-      unsigned char *tmpptr; \
-      \
-      xMemAlloc (amount, &tmpptr); \
-      memcpy (tmpptr, data, amount); \
-      xCreateNode (((struct ConditionalAccessDescriptor *)descr), NULL); \
-      ((struct ConditionalAccessDescriptor *)descr)->Tag = DESCR_CA; \
-      ((struct ConditionalAccessDescriptor *)descr)->Amount = amount; \
-      ((struct ConditionalAccessDescriptor *)descr)->Data = tmpptr; \
-   } while (0)
-
 
 /* Iso639LanguageDescriptor */
 
@@ -434,19 +465,23 @@ struct AncillaryDataDescriptor {
 
 
 /* BouquetNameDescriptor */
+/* 
+   the same used instead of NetworkNameDescriptor because their structures
+   are identical. We pass 'tag' parameter to distinguish between them later
+*/
 
 struct BouquetNameDescriptor {
    struct NODE          Node;    /* Node enth�lt Namen */
    unsigned short       Tag;
 };
 
-#define CreateBouquetNameDescriptor(descr, text) \
+#define CreateBouquetNameDescriptor(descr, text, tag) \
    do \
    { \
       xCreateNode (((struct BouquetNameDescriptor *)descr), NULL); \
       ((struct NODE *)descr)->Name = text; \
       ((struct NODE *)descr)->HashKey = xHashKey (text); \
-      ((struct BouquetNameDescriptor *)descr)->Tag = DESCR_BOUQUET_NAME; \
+      ((struct BouquetNameDescriptor *)descr)->Tag = tag; \
    } while (0)
 
 
@@ -514,6 +549,33 @@ struct CaIdentifierDescriptor {
       ((struct CaIdentifierDescriptor *)descr)->SystemID[num] = id
 #define GetCaIdentifierID(descr, num) (((struct CaIdentifierDescriptor *)descr)->SystemID[num])
 
+/* CaDescriptor */
+
+struct CaDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   unsigned short       CA_type;
+   unsigned short       CA_PID;
+   unsigned int         ProviderID;
+   unsigned short       DataLength;
+   unsigned char       *Data;
+};
+
+#define CreateCaDescriptor(descr, typ, capid, len) \
+   do \
+   { \
+      xCreateNode (((struct CaDescriptor *)descr), NULL); \
+      ((struct CaDescriptor *)descr)->Tag = DESCR_CA; \
+      ((struct CaDescriptor *)descr)->CA_type = typ; \
+      ((struct CaDescriptor *)descr)->CA_PID = capid; \
+      ((struct CaDescriptor *)descr)->ProviderID = 0; \
+      ((struct CaDescriptor *)descr)->DataLength = len; \
+      xMemAlloc (len+1, &((struct CaDescriptor *)descr)->Data); \
+   } while (0)
+
+#define SetCaData(descr, num, id) \
+      ((struct CaDescriptor *)descr)->Data[num] = id
+#define GetCaData(descr, num) (((struct CaDescriptor *)descr)->Data[num])
 
 /* StreamIdentifierDescriptor */
 
@@ -968,6 +1030,122 @@ struct SubtitlingItem {
       xAddTail (((struct SubtitlingDescriptor *)desc)->Items, item); \
    } while (0)
 
+/* SatelliteDeliverySystemDescriptor */
+
+struct SatelliteDeliverySystemDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   long                 Frequency;
+   short                OrbitalPosition;
+   char                 Polarization;
+   long                 SymbolRate;
+   char                 FEC;
+};
+
+#define CreateSatelliteDeliverySystemDescriptor(descr, freq, orb, polar, sr, fec) \
+   do \
+   { \
+      xCreateNode (((struct SatelliteDeliverySystemDescriptor *)descr), NULL); \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->Tag = DESCR_SAT_DEL_SYS; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->Frequency = freq; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->OrbitalPosition = orb; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->Polarization = polar; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->FEC = fec; \
+   } while (0)
+
+/* ServiceListDescriptor */
+
+struct ServiceListDescriptor {
+   struct NODE          Node;     
+   unsigned short       Tag;
+   struct LIST         *ServiceList;
+};
+
+#define CreateServiceListDescriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct ServiceListDescriptor *)descr), NULL); \
+      ((struct ServiceListDescriptor *)descr)->Tag = DESCR_SERVICE_LIST; \
+      ((struct ServiceListDescriptor *)descr)->ServiceList = xNewList(NULL); \
+   } while (0)
+
+struct ServiceListEntry {
+   struct NODE          Node;     
+   int                  ServiceID;
+   unsigned short       ServiceType;
+};
+
+#define AddServiceListEntry(descr, id, typ) \
+   do \
+   { \
+      struct ServiceListEntry *newent; \
+      \
+      xCreateNode (newent, NULL); \
+      newent->ServiceID = id; \
+      newent->ServiceType = typ; \
+      xAddTail (((struct ServiceListDescriptor *)descr)->ServiceList, newent); \
+   } while (0)
+
+/* LocalTimeOffsetDescriptor */
+
+struct LocalTimeOffsetDescriptor {
+   struct NODE          Node;     
+   unsigned short       Tag;
+   struct LIST         *LocalTimeOffsets;
+};
+
+#define CreateLocalTimeOffsetDescriptor(descr) \
+   do \
+   { \
+      xCreateNode (((struct LocalTimeOffsetDescriptor *)descr), NULL); \
+      ((struct LocalTimeOffsetDescriptor *)descr)->Tag = DESCR_LOCAL_TIME_OFF; \
+      ((struct LocalTimeOffsetDescriptor *)descr)->LocalTimeOffsets = xNewList(NULL); \
+   } while (0)
+
+struct LocalTimeOffsetEntry {
+   struct NODE          Node;     
+   char                 CountryCode[4];
+   char                 RegionID;
+   time_t               CurrentOffset;
+   time_t               ChangeTime;
+   time_t               NextOffset;
+};
+
+#define CreateLocalTimeOffsetEntry(newent, code1, code2, code3, reg, co, ct, no) \
+   do \
+   { \
+      xCreateNode (newent, NULL); \
+      newent->CountryCode[0] = code1; \
+      newent->CountryCode[1] = code2; \
+      newent->CountryCode[2] = code3; \
+      newent->CountryCode[3] = '\0'; \
+      newent->RegionID = reg; \
+      newent->CurrentOffset = co; \
+      newent->ChangeTime = ct; \
+      newent->NextOffset = no; \
+   } while (0)
+
+#define AddLocalTimeOffsetEntry(descr, code1, code2, code3, reg, co, ct, no) \
+   do \
+   { \
+      struct LocalTimeOffsetEntry *newent; \
+      \
+      xCreateNode (newent, NULL); \
+      newent->CountryCode[0] = code1; \
+      newent->CountryCode[1] = code2; \
+      newent->CountryCode[2] = code3; \
+      newent->CountryCode[3] = '\0'; \
+      newent->RegionID = reg; \
+      newent->CurrentOffset = co; \
+      newent->ChangeTime = ct; \
+      newent->NextOffset = no; \
+      xAddTail (((struct LocalTimeOffsetDescriptor *)descr)->LocalTimeOffsets, newent); \
+   } while (0)
+
+#define timezonecmp(ptoe,cod,reg) \
+   (strncmp(ptoe->CountryCode, cod, 3) || (ptoe->RegionID != reg))
+
 
 
 /* Prototypes */
@@ -979,13 +1157,17 @@ extern "C" {
 /* si_parser.c */
 
 struct LIST *siParsePAT (u_char *);
+struct LIST *siParseCAT (u_char *);
 struct Pid *siParsePMT (u_char *);
 struct LIST *siParseSDT (u_char *);
+struct LIST *siParseNIT (u_char *);
 struct LIST *siParseEIT (u_char *);
 time_t siParseTDT (u_char *);
+struct Tot *siParseTOT (u_char *);
 void siParseDescriptors (struct LIST *, u_char *, int, u_char);
 void siParseDescriptor (struct LIST *, u_char *);
 char *siGetDescriptorText (u_char *, int);
+char *siGetDescriptorName (u_char *, int);
 u_long crc32 (char *data, int len);
 
 /* si_debug_services.c */
@@ -999,6 +1181,8 @@ void siDebugPids (char *, struct LIST *);
 void siDebugDescriptors (char *, struct LIST *);
 void siDebugEitServices (struct LIST *);
 void siDebugEitEvents (char *, struct LIST *);
+void siDumpDescriptor (void *);
+void siDumpSection (void *);
 
 #ifdef __cplusplus
 }
diff --git a/libdtv/libsi/include/si_tables.h b/libdtv/libsi/include/si_tables.h
index dfda3bf9d..b7cfea2a0 100644
--- a/libdtv/libsi/include/si_tables.h
+++ b/libdtv/libsi/include/si_tables.h
@@ -5,11 +5,13 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.3 $
-// $Date: 2001/10/07 10:24:46 $
+// $Revision: 1.4 $
+// $Date: 2003/02/04 18:45:36 $
 // $Author: hakenes $
 //
-//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
+//               GNU GPL with contribution of Oleg Assovski,
+//               www.satmania.com
 //
 // libsi is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -32,12 +34,22 @@
 #define BcdTimeToSeconds(x) ((3600 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
                              (60 * ((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))) + \
                              ((10*((x##_s & 0xF0)>>4)) + (x##_s & 0xF)))
+#define BcdTimeToMinutes(x) ((60 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
+                             (((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))))
+#define BcdCharToInt(x) (10*((x & 0xF0)>>4) + (x & 0xF))
+#define CheckBcdChar(x) ((((x & 0xF0)>>4) <= 9) && \
+                         ((x & 0x0F) <= 9))
+#define CheckBcdSignedChar(x) ((((x & 0xF0)>>4) >= 0) && (((x & 0xF0)>>4) <= 9) && \
+                         ((x & 0x0F) >= 0) && ((x & 0x0F) <= 9))
 
 #define TableHasMoreSections(x) (((pat_t *)(x))->last_section_number > ((pat_t *)(x))->section_number)
 #define GetTableId(x) ((pat_t *)(x))->table_id
 #define GetSectionNumber(x) ((pat_t *)(x))->section_number
 #define GetLastSectionNumber(x) ((pat_t *)(x))->last_section_number
 #define GetServiceId(x) (((eit_t *)(x))->service_id_hi << 8) | ((eit_t *)(x))->service_id_lo
+#define GetSegmentLastSectionNumber(x) ((eit_t *)(x))->segment_last_section_number
+#define GetLastTableId(x) ((eit_t *)(x))->segment_last_table_id
+#define GetSectionLength(x) HILO(((pat_t *)(x))->section_length)
 
 /*
  *
@@ -113,7 +125,37 @@ typedef struct {
  *         applicable.
  *
  */
-    /* TO BE DONE */
+#define CAT_LEN 8
+
+typedef struct {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char dummy                                  :1;        // has to be 0
+   u_char                                        :2;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :2;
+   u_char dummy                                  :1;        // has to be 0
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char reserved_1                             :8;
+   u_char reserved_2                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+} cat_t;
+
 /*
  *
  *    3) Program Map Table (PMT):
@@ -297,7 +339,7 @@ typedef struct {
  *         bouquet.
  *
  */
-    /* TO BE DONE */
+/* SEE NIT (It has the same structure but has different allowed descriptors) */
 /*
  *
  *    2) Service Description Table (SDT):
@@ -339,6 +381,9 @@ typedef struct {
    u_char                                        :8;
 } sdt_t;
 
+#define GetSDTTransportStreamId(x) (HILO(((sdt_t *) x)->transport_stream_id))
+#define GetSDTOriginalNetworkId(x) (HILO(((sdt_t *) x)->original_network_id))
+
 #define SDT_DESCR_LEN 5
 
 typedef struct {
@@ -483,7 +528,36 @@ typedef struct {
  *         to the frequent updating of the time information.
  *
  */
-    /* TO BE DONE */
+#define TOT_LEN 10
+
+typedef struct {
+   u_char table_id                               :8; 
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char utc_mjd_hi                             :8;
+   u_char utc_mjd_lo                             :8;
+   u_char utc_time_h                             :8;
+   u_char utc_time_m                             :8;
+   u_char utc_time_s                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char descriptors_loop_length_hi             :4;
+#else
+   u_char descriptors_loop_length_hi             :4;
+   u_char                                        :4;
+#endif
+   u_char descriptors_loop_length_lo             :8;
+} tot_t;
+
+
 /*
  *
  *    7) Stuffing Table (ST):
@@ -545,6 +619,25 @@ typedef struct descr_gen_struct {
 #define GetDescriptorLength(x) (((descr_gen_t *) x)->descriptor_length+DESCR_GEN_LEN)
 
 
+/* 0x09 ca_descriptor */
+
+#define DESCR_CA_LEN 6
+typedef struct descr_ca_struct {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char CA_type_hi                             :8;
+   u_char CA_type_lo                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char reserved                               :3;
+   u_char CA_PID_hi                              :5;
+#else
+   u_char CA_PID_hi                              :5;
+   u_char reserved                               :3;
+#endif
+   u_char CA_PID_lo                              :8;
+} descr_ca_t;
+#define CastCaDescriptor(x) ((descr_ca_t *)(x))
+
 /* 0x0A iso_639_language_descriptor */
 
 #define DESCR_ISO_639_LANGUAGE_LEN 5
@@ -560,25 +653,31 @@ typedef struct descr_iso_639_language_struct {
 
 /* 0x40 network_name_descriptor */
 
-#define DESCR_NETWORK_NAME_LEN XX
+#define DESCR_NETWORK_NAME_LEN 2
 typedef struct descr_network_name_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
 } descr_network_name_t;
 #define CastNetworkNameDescriptor(x) ((descr_network_name_t *)(x))
 
 
 /* 0x41 service_list_descriptor */
 
-#define DESCR_SERVICE_LIST_LEN XX
+#define DESCR_SERVICE_LIST_LEN 2
 typedef struct descr_service_list_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
 } descr_service_list_t;
 #define CastServiceListDescriptor(x) ((descr_service_list_t *)(x))
 
+#define DESCR_SERVICE_LIST_LOOP_LEN 3
+typedef struct descr_service_list_loop_struct {
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+   u_char service_type                           :8;
+} descr_service_list_loop_t;
+#define CastServiceListDescriptorLoop(x) ((descr_service_list_loop_t *)(x))
+
 
 /* 0x42 stuffing_descriptor */
 
@@ -604,13 +703,13 @@ typedef struct descr_satellite_delivery_system_struct {
    u_char orbital_position1                      :8;
    u_char orbital_position2                      :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char modulation                             :5;
-   u_char polarization                           :2;
-   u_char west_east_flag                         :1;
-#else
    u_char west_east_flag                         :1;
    u_char polarization                           :2;
    u_char modulation                             :5;
+#else
+   u_char modulation                             :5;
+   u_char polarization                           :2;
+   u_char west_east_flag                         :1;
 #endif
    u_char symbol_rate1                           :8;
    u_char symbol_rate2                           :8;
@@ -964,14 +1063,39 @@ typedef struct descr_telephone_struct {
 
 /* 0x58 local_time_offset_descriptor */
 
-#define DESCR_LOCAL_TIME_OFFSET_LEN XX
+#define DESCR_LOCAL_TIME_OFFSET_LEN 2
 typedef struct descr_local_time_offset_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
 } descr_local_time_offset_t;
 #define CastLocalTimeOffsetDescriptor(x) ((descr_local_time_offset_t *)(x))
 
+#define LOCAL_TIME_OFFSET_ENTRY_LEN 15
+typedef struct local_time_offset_entry_struct {
+   u_char country_code1                          :8;
+   u_char country_code2                          :8;
+   u_char country_code3                          :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char country_region_id                      :6;
+   u_char                                        :1;
+   u_char local_time_offset_polarity             :1;
+#else
+   u_char local_time_offset_polarity             :1;
+   u_char                                        :1;
+   u_char country_region_id                      :6;
+#endif
+   u_char local_time_offset_h                    :8;
+   u_char local_time_offset_m                    :8;
+   u_char time_of_change_mjd_hi                  :8;
+   u_char time_of_change_mjd_lo                  :8;
+   u_char time_of_change_time_h                  :8;
+   u_char time_of_change_time_m                  :8;
+   u_char time_of_change_time_s                  :8;
+   u_char next_time_offset_h                     :8;
+   u_char next_time_offset_m                     :8;
+} local_time_offset_entry_t ;
+#define CastLocalTimeOffsetEntry(x) ((local_time_offset_entry_t *)(x))
+
 
 /* 0x59 subtitling_descriptor */
 
diff --git a/libdtv/libsi/si_debug_services.c b/libdtv/libsi/si_debug_services.c
index ae2a92a6c..ac8de34cc 100644
--- a/libdtv/libsi/si_debug_services.c
+++ b/libdtv/libsi/si_debug_services.c
@@ -4,11 +4,13 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.4 $
-// $Date: 2001/10/07 10:24:46 $
+// $Revision: 1.5 $
+// $Date: 2003/02/04 18:45:35 $
 // $Author: hakenes $
 //
-//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
+//               GNU GPL with contribution of Oleg Assovski,
+//               www.satmania.com
 //
 // libsi is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -26,11 +28,13 @@
 // Boston, MA 02111-1307, USA.
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include "../liblx/liblx.h"
 #include "libsi.h"
+#include "si_tables.h"
 #include "si_debug_services.h"
 
 
@@ -208,6 +212,8 @@ void siDebugPids (char *Prepend, struct LIST *PidList)
       printf ("%s   ProgramID: %d\n", Prepend, Pid->ProgramID);
       printf ("%s   PcrPid: %d\n", Prepend, Pid->PcrPID);
       printf ("%s   PmtVersion: %d\n", Prepend, Pid->PmtVersion);
+      sprintf (NewPrepend, "%s      ", Prepend);
+      siDebugDescriptors (NewPrepend, Pid->Descriptors);
 
       xForeach (Pid->InfoList, PidInfo)
       {
@@ -256,6 +262,11 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
             printf ("\n");
          break;
 
+         case DESCR_NW_NAME:
+            printf ("%sDescriptor: Network Name\n", Prepend);
+            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
+         break;
+
          case DESCR_BOUQUET_NAME:
             printf ("%sDescriptor: Bouquet Name\n", Prepend);
             printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
@@ -336,12 +347,38 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
          case DESCR_CA_IDENT:
             printf ("%sDescriptor: Conditional Access Identity\n", Prepend);
             {
-               int j;
+               int j,k;
                for (j = 0; j < ((struct CaIdentifierDescriptor *)Descriptor)->Amount; j++)
-                  printf ("%s   SystemID: 0x%04x\n", Prepend, GetCaIdentifierID (Descriptor, j));
+               {
+                  printf ("%s   SystemID: 0x%04x", Prepend, GetCaIdentifierID (Descriptor, j));
+                  k = GetCaIdentifierID (Descriptor, j) >> 8;
+                  if (k < 0 || k > MAX_CA_IDENT) printf (" (unknown)\n");
+                  else printf (" (%s)\n", CaIdents[k]);
+               }
             }
          break;
 
+         case DESCR_CA:
+         {
+            int j,k;
+
+            printf ("%sDescriptor: Conditional Access\n", Prepend);
+            printf ("%s   CA type: 0x%04x", Prepend, (((struct CaDescriptor *)Descriptor)->CA_type));
+            k = (((struct CaDescriptor *)Descriptor)->CA_type) >> 8;
+            if (k < 0 || k > MAX_CA_IDENT) printf (" (unknown)\n");
+            else printf (" (%s)\n", CaIdents[k]);
+            printf ("%s   CA PID: %d\n", Prepend, (((struct CaDescriptor *)Descriptor)->CA_PID));
+            printf ("%s   ProviderID: 0x%04X\n", Prepend, (((struct CaDescriptor *)Descriptor)->ProviderID));
+            if (((struct CaDescriptor *)Descriptor)->DataLength > 0)
+            {
+               printf ("%s   CA data:", Prepend);
+               for (j = 0; j < ((struct CaDescriptor *)Descriptor)->DataLength; j++)
+                  printf (" 0x%02x", GetCaData (Descriptor, j));
+               printf ("\n");
+            }
+         }
+         break;
+
          case DESCR_CONTENT:
             printf ("%sDescriptor: Content\n", Prepend);
             {
@@ -489,16 +526,57 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
          }
          break;
 
-         case DESCR_NW_NAME:
+         case DESCR_SAT_DEL_SYS:
+         {
+            struct SatelliteDeliverySystemDescriptor *sds =
+                (struct SatelliteDeliverySystemDescriptor *)Descriptor;
+
+            printf ("%sDescriptor: Satellite Delivery System\n", Prepend);
+            printf ("%s   Frequency: %ld\n", Prepend, sds->Frequency);
+            printf ("%s   OrbitalPosition: %d\n", Prepend, sds->OrbitalPosition);
+            printf ("%s   Polarization: %c\n", Prepend, sds->Polarization);
+            printf ("%s   SymbolRate: %ld\n", Prepend, sds->SymbolRate);
+            printf ("%s   FEC: %c\n", Prepend, sds->FEC);
+         }
+         break;
+
          case DESCR_SERVICE_LIST:
+         {
+            struct ServiceListEntry *Entry;
+
+            printf ("%sDescriptor: Service List\n", Prepend);
+            xForeach (((struct ServiceListDescriptor *)Descriptor)->ServiceList, Entry)
+            {
+               printf ("%s   Entry:\n");
+               printf ("%s      ServiceID: %d\n", Prepend, Entry->ServiceID);
+               printf ("%s      ServiceType: %04x\n", Prepend, Entry->ServiceType);
+            }
+         }
+         break;
+
+         case DESCR_LOCAL_TIME_OFF:
+         {
+            struct LocalTimeOffsetEntry *Offset;
+
+            printf ("%sDescriptor: Local Time Offset\n", Prepend);
+            xForeach (((struct LocalTimeOffsetDescriptor *)Descriptor)->LocalTimeOffsets, Offset)
+            {
+               printf ("%s   Offset:\n");
+               printf ("%s      CountryCode: %s\n", Offset->CountryCode);
+               printf ("%s      RegionID: %c\n", Offset->RegionID);
+               printf ("%s      CurrentOffset: %ld\n", Offset->CurrentOffset);
+               printf ("%s      ChangeTime: %ld\n", Offset->ChangeTime);
+               printf ("%s      NextOffset: %ld\n", Offset->NextOffset);
+            }
+         }
+         break;
+
          case DESCR_STUFFING:
-         case DESCR_SAT_DEL_SYS:
          case DESCR_CABLE_DEL_SYS:
          case DESCR_VBI_DATA:
          case DESCR_VBI_TELETEXT:
          case DESCR_MOSAIC:
          case DESCR_TELEPHONE:
-         case DESCR_LOCAL_TIME_OFF:
          case DESCR_TERR_DEL_SYS:
          case DESCR_ML_NW_NAME:
          case DESCR_ML_BQ_NAME:
@@ -527,3 +605,39 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
    return;
 }
 
+void siDumpDescriptor (void * Descriptor)
+{
+   int Length, i;
+   unsigned char *ptr;
+
+   Length = GetDescriptorLength (Descriptor);
+   for (i = 0, ptr = (char*) Descriptor; i < Length; i++) {
+        if ((i % 8) == 0) 
+           printf ("\n");
+        printf ("0x%02X ", (unsigned int) ptr[i]);
+   }
+   printf ( "\n");
+}
+
+void siDumpSection (void *Section)
+{
+   int Length, i;
+   unsigned char *ptr;
+   char str[9];
+
+   Length = GetSectionLength (Section) + 3;
+   for (i = 0, ptr = (unsigned char*) Section, memset (str, 0, 9); i < Length; i++) {
+        if ((i % 8) == 0) 
+        {
+           printf ("  %s\n", str);
+           memset (str, 0, 8);
+        }
+        printf ("0x%02X ", (unsigned int) ptr[i]);
+        if (ptr[i] < 0x20 || (ptr[i] > 'z' && ptr[i] < ((unsigned char )'�')) )
+           str[i % 8] = '.';
+        else
+           str[i % 8] = ptr[i];
+   }
+   printf ("  %*s\n", (8 - ((abs(i - 1) % 8) ? (abs(i - 1) % 8) : 8)) * 5, str);
+}
+
diff --git a/libdtv/libsi/si_debug_services.h b/libdtv/libsi/si_debug_services.h
index cd4f196b7..404f3c7b8 100644
--- a/libdtv/libsi/si_debug_services.h
+++ b/libdtv/libsi/si_debug_services.h
@@ -4,8 +4,8 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.1 $
-// $Date: 2001/06/25 12:29:47 $
+// $Revision: 1.2 $
+// $Date: 2003/02/04 18:45:35 $
 // $Author: hakenes $
 //
 //   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
@@ -197,7 +197,7 @@ static struct content_type ContentTypes[] = {
 };
 #define CONTENT_TYPE_NUMBER 79
 
-static char StreamTypes[][70] = {
+static char *StreamTypes[] = {
    "ITU-T|ISO/IEC Reserved",
    "ISO/IEC Video",
    "13818-2 Video or 11172-2 constrained parameter video stream",
@@ -215,3 +215,31 @@ static char StreamTypes[][70] = {
    "ITU-T Rec. H.222.0 | ISO 13818-1 Reserved",
    "User private"
 };
+
+static char *CaIdents[] = {
+   "Standardized systems",
+   "Canal Plus",
+   "CCETT",
+   "Deutsche Telecom",
+   "Eurodec",
+   "France Telecom",
+   "Irdeto",
+   "Jerrold/GI",
+   "Matra Communication",
+   "News Datacom",
+   "Nokia",
+   "Norwegian Telekom",
+   "NTL",
+   "Philips",
+   "Scientific Atlanta",
+   "Sony",
+   "Tandberg Television",
+   "Thomson",
+   "TV/Com",
+   "HPT - Croatian Post and Telecommunications",
+   "HRT - Croatian Radio and Television",
+   "IBM",
+   "Nera",
+   "BetaTechnik"
+};
+#define MAX_CA_IDENT 24
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index ccca6e5e3..e8cf8b213 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -4,11 +4,13 @@
 ///                                                        ///
 //////////////////////////////////////////////////////////////
 
-// $Revision: 1.6 $
-// $Date: 2002/01/30 17:04:13 $
+// $Revision: 1.8 $
+// $Date: 2003/02/04 18:45:35 $
 // $Author: hakenes $
 //
-//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
+//               GNU GPL with contribution of Oleg Assovski,
+//               www.satmania.com
 //
 // libsi is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -52,7 +54,7 @@ struct LIST *siParsePAT (u_char *Buffer)
    Pat = (pat_t *) Buffer; Ptr = Buffer;
 
    if (Pat->table_id != TID_PAT) {
-//      fprintf (stderr, "PAT: wrong TID %d\n", Pat->table_id);
+      // fprintf (stderr, "PAT: wrong TID %d\n", Pat->table_id);
       return NULL;
    }
 
@@ -83,6 +85,43 @@ struct LIST *siParsePAT (u_char *Buffer)
 }
 
 
+struct LIST *siParseCAT (u_char *Buffer) 
+{
+   cat_t               *Cat;
+   u_char              *Ptr;
+   int                  SectionLength;
+   int                  TransportStreamID;
+   int                  CatVersion;
+   struct Descriptor   *Descriptor;
+   struct LIST         *DescriptorList = NULL;
+
+   if (!Buffer) return NULL;
+
+   Cat = (cat_t *) Buffer; Ptr = Buffer;
+
+   if (Cat->table_id != TID_CAT) {
+      // fprintf (stderr, "CAT: wrong TID %d\n", Cat->table_id);
+      return NULL;
+   }
+
+   SectionLength = HILO (Cat->section_length) + 3 - CAT_LEN - 4;
+
+   if (crc32 (Ptr, HILO (Cat->section_length) + 3)) return (NULL);
+
+   CatVersion = Cat->version_number;
+
+   Ptr += CAT_LEN;
+
+   if (SectionLength >= 0)
+   {
+      DescriptorList = xNewList (NULL);
+      siParseDescriptors (DescriptorList, Ptr, SectionLength, Cat->table_id);
+   }
+
+   return (DescriptorList);
+}
+
+
 struct Pid *siParsePMT (u_char *Buffer) 
 {
    pmt_t               *Pmt;
@@ -101,7 +140,7 @@ struct Pid *siParsePMT (u_char *Buffer)
    Pmt = (pmt_t *) Buffer; Ptr = Buffer;
 
    if (Pmt->table_id != TID_PMT) {
-//      fprintf (stderr, "PMT: wrong TID %d\n", Pmt->table_id);
+      // fprintf (stderr, "PMT: wrong TID %d\n", Pmt->table_id);
       return NULL;
    }
 
@@ -147,6 +186,89 @@ struct Pid *siParsePMT (u_char *Buffer)
 }
 
 
+struct LIST *siParseNIT (u_char *Buffer) 
+{
+   nit_t               *Nit;
+   nit_mid_t           *NitMid;
+   nit_ts_t            *TSDesc;
+   u_char              *Ptr;
+   int                  SectionLength, LoopLength, Loop2Length;
+   int                  TransportStreamID;
+   int                  NitVersion;
+   int                  NetworkID;
+   struct TransportStream *TransportStream;
+   struct LIST         *TSList = NULL;
+   struct LIST         *Networks;
+   struct NetworkInfo  *Network;  
+
+   if (!Buffer) return NULL;
+
+   Nit = (nit_t *) Buffer; 
+   Ptr = Buffer;
+
+   if (Nit->table_id != TID_NIT_ACT && Nit->table_id != TID_NIT_OTH && Nit->table_id != TID_BAT) {
+      return NULL;
+   }
+
+   SectionLength = HILO (Nit->section_length) + 3 - NIT_LEN - 4;
+
+   if (crc32 (Ptr, HILO (Nit->section_length) + 3)) return (NULL);
+
+   NitVersion = Nit->version_number;
+   NetworkID = HILO (Nit->network_id);
+   if (NetworkID == 65535)
+      NetworkID = 0;
+   CreateNetworkInfo (Network, NetworkID);
+   Networks = xNewList (NULL);
+   xAddTail (Networks, Network);
+
+   Ptr += NIT_LEN;
+
+   LoopLength = HILO (Nit->network_descriptor_length);
+//   fprintf (stderr, "table 0x%X, SectionLen = %d, LoopLen = %d\n",
+//                              Nit->table_id, SectionLength, LoopLength);
+   if (LoopLength > SectionLength - SDT_DESCR_LEN)
+      return (Networks);
+
+   if (LoopLength <= SectionLength) {
+      if (SectionLength >= 0) siParseDescriptors (Network->Descriptors, Ptr, LoopLength, Nit->table_id);
+      SectionLength -= LoopLength;
+      Ptr += LoopLength;
+      NitMid = (nit_mid_t *) Ptr; 
+      LoopLength = HILO (NitMid->transport_stream_loop_length);
+//      fprintf (stderr, "table 0x%X, TS LoopLen = %d\n",
+//                              Nit->table_id, LoopLength);
+      if ((SectionLength > 0) && (LoopLength <= SectionLength)) {
+         SectionLength -= SIZE_NIT_MID;
+         Ptr += SIZE_NIT_MID;
+         while (LoopLength > 0) {
+            TSDesc = (nit_ts_t *) Ptr;
+            CreateTransportStream (TransportStream, HILO(TSDesc->transport_stream_id), HILO(TSDesc->original_network_id));
+            if (TransportStream->TransportStreamID == 65535)
+               TransportStream->TransportStreamID = 0;
+            if (TransportStream->OriginalNetworkID == 65535)
+               TransportStream->OriginalNetworkID = 0;
+            Loop2Length = HILO (TSDesc->transport_descriptors_length);
+//            fprintf (stderr, "table 0x%X, TSdesc LoopLen  = %d\n",
+//                              Nit->table_id, Loop2Length);
+            Ptr += NIT_TS_LEN;
+            if (Loop2Length <= LoopLength) {
+               if (LoopLength >= 0) siParseDescriptors (TransportStream->Descriptors, Ptr, Loop2Length, Nit->table_id);
+            }
+            if (!Network->TransportStreams)
+               Network->TransportStreams = xNewList (NULL);
+            xAddTail (Network->TransportStreams, TransportStream);
+            LoopLength -= Loop2Length + NIT_TS_LEN;
+            SectionLength -= Loop2Length + NIT_TS_LEN;
+            Ptr += Loop2Length;
+         }
+      }
+   }
+
+   return (Networks);
+}
+
+
 struct LIST *siParseSDT (u_char *Buffer) 
 {
    sdt_t               *Sdt;
@@ -164,7 +286,7 @@ struct LIST *siParseSDT (u_char *Buffer)
    Sdt = (sdt_t *) Buffer; Ptr = Buffer;
 
    if (Sdt->table_id != TID_SDT_ACT && Sdt->table_id != TID_SDT_OTH) {
-//      fprintf (stderr, "SDT: wrong TID %d\n", Sdt->table_id);
+      // fprintf (stderr, "SDT: wrong TID %d\n", Sdt->table_id);
       return NULL;
    }
 
@@ -250,7 +372,7 @@ struct LIST *siParseEIT (u_char *Buffer)
          Eit->table_id <= TID_EIT_ACT_SCH + 0x0F) &&
        !(Eit->table_id >= TID_EIT_OTH_SCH &&
          Eit->table_id <= TID_EIT_OTH_SCH + 0x0F)) {
-//      fprintf (stderr, "EIT: wrong TID %d\n", Eit->table_id);
+      // fprintf (stderr, "EIT: wrong TID %d\n", Eit->table_id);
       return NULL;
    }
 
@@ -331,7 +453,7 @@ time_t siParseTDT (u_char *Buffer)
    Tdt = (tdt_t *) Buffer; Ptr = Buffer;
 
    if (Tdt->table_id != TID_TDT) {
-//      fprintf (stderr, "TDT: wrong TID %d\n", Tdt->table_id);
+      // fprintf (stderr, "TDT: wrong TID %d\n", Tdt->table_id);
       return 0;
    }
 
@@ -344,6 +466,44 @@ time_t siParseTDT (u_char *Buffer)
 }
 
 
+struct Tot *siParseTOT (u_char *Buffer) 
+{
+   tot_t               *Tot;
+   u_char              *Ptr;
+   int                  SectionLength, LoopLength;
+   struct Tot          *table;
+   time_t               CurrentTime;
+
+   if (!Buffer) return NULL;
+
+   Tot = (tot_t *) Buffer;
+   Ptr = Buffer;
+
+   if (Tot->table_id != TID_TOT) {
+      return NULL;
+   }
+
+   if (crc32 (Ptr, HILO (Tot->section_length) + 3)) return (NULL);
+//   SectionLength = HILO (Tot->section_length) + 3 - TOT_LEN - 4;
+
+   CurrentTime = MjdToEpochTime (Tot->utc_mjd) +
+                 BcdTimeToSeconds (Tot->utc_time);
+   LoopLength = HILO (Tot->descriptors_loop_length);
+   if (!LoopLength)
+      return NULL;
+
+   CreateTot (table, CurrentTime);
+
+   Ptr += TOT_LEN;
+
+   siParseDescriptors (table->Descriptors, Ptr, LoopLength, Tot->table_id);
+
+   // fprintf (stderr, "TOT Bias: %d\n", table->Bias);
+   return (table);
+}
+
+static u_char TempTableID = 0;
+
 void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                          int Length, u_char TableID)
 {
@@ -352,6 +512,7 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
 
    DescriptorLength = 0;
    Ptr = Buffer;
+   TempTableID = TableID;
 
    while (DescriptorLength < Length)
    {
@@ -362,15 +523,17 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
          case TID_NIT_ACT: case TID_NIT_OTH:
             switch (GetDescriptorTag(Ptr))
             {
-               case DESCR_NW_NAME:
-               case DESCR_SERVICE_LIST:
-               case DESCR_STUFFING:
                case DESCR_SAT_DEL_SYS:
                case DESCR_CABLE_DEL_SYS:
+               case DESCR_SERVICE_LIST:
+               case DESCR_PRIV_DATA_SPEC:
+//                  fprintf (stderr, "Got descriptor with tag = 0x%X\n", GetDescriptorTag(Ptr));
+//                  siDumpDescriptor (Ptr);
+               case DESCR_NW_NAME:
+               case DESCR_STUFFING:
                case DESCR_LINKAGE:
                case DESCR_TERR_DEL_SYS:
                case DESCR_ML_NW_NAME:
-               case DESCR_PRIV_DATA_SPEC:
                case DESCR_CELL_LIST:
                case DESCR_CELL_FREQ_LINK:
                case DESCR_ANNOUNCEMENT_SUPPORT:
@@ -378,8 +541,7 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                break;
 
                default:
-               /*   fprintf (stderr, "forbidden descriptor 0x%x in NIT\n",
-                              GetDescriptorTag(Ptr));*/
+                  // fprintf (stderr, "forbidden descriptor 0x%x in NIT\n", GetDescriptorTag(Ptr));
                break;
             }
          break;
@@ -396,12 +558,12 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                case DESCR_CA_IDENT:
                case DESCR_ML_BQ_NAME:
                case DESCR_PRIV_DATA_SPEC:
+ //                 fprintf (stderr, "Got descriptor with tag = 0x%X\n", GetDescriptorTag(Ptr));
                   siParseDescriptor (Descriptors, Ptr);
                break;
 
                default:
-                  /*fprintf (stderr, "forbidden descriptor 0x%x in BAT\n",
-                              GetDescriptorTag(Ptr));*/
+                  // fprintf (stderr, "forbidden descriptor 0x%x in BAT\n", GetDescriptorTag(Ptr));
                break;
             }
          break;
@@ -426,8 +588,7 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                break;
 
                default:
-                  /* fprintf (stderr, "forbidden descriptor 0x%x in SDT\n",
-                              GetDescriptorTag(Ptr)); */
+                  // fprintf (stderr, "forbidden descriptor 0x%x in SDT\n", GetDescriptorTag(Ptr));
                break;
             }
          break;
@@ -470,8 +631,7 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                break;
 
                default:
-                  /*fprintf (stderr, "forbidden descriptor 0x%x in EIT\n",
-                              GetDescriptorTag(Ptr));*/
+                  // fprintf (stderr, "forbidden descriptor 0x%x in EIT\n", GetDescriptorTag(Ptr));
                break;
             }
          break;
@@ -484,8 +644,7 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                break;
 
                default:
-                  /*fprintf (stderr, "forbidden descriptor 0x%x in TOT\n",
-                              GetDescriptorTag(Ptr));*/
+                  // fprintf (stderr, "forbidden descriptor 0x%x in TOT\n", GetDescriptorTag(Ptr));
                break;
             }
          break;
@@ -522,15 +681,28 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
                break;
 
                default:
-                  /* fprintf (stderr, "forbidden descriptor 0x%x in PMT\n",
-                              GetDescriptorTag(Ptr)); */
+                  // fprintf (stderr, "forbidden descriptor 0x%x in PMT\n", GetDescriptorTag(Ptr));
+               break;
+            }
+         break;
+
+         case TID_CAT:
+            switch (GetDescriptorTag(Ptr))
+            {
+               case DESCR_CA_SYSTEM:
+               case DESCR_CA:
+               case DESCR_CA_IDENT:
+                  siParseDescriptor (Descriptors, Ptr);
+               break;
+
+               default:
+                  // fprintf (stderr, "forbidden descriptor 0x%x in CAT\n", GetDescriptorTag(Ptr));
                break;
             }
          break;
 
          default:
-            fprintf (stderr, "descriptor 0x%x in unsupported table 0x%x\n",
-                         GetDescriptorTag(Ptr), TableID);
+            // fprintf (stderr, "descriptor 0x%x in unsupported table 0x%x\n", GetDescriptorTag(Ptr), TableID);
          break;
       }
       DescriptorLength += GetDescriptorLength (Ptr);
@@ -550,6 +722,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
    if (!Descriptors || !Buffer) return;
 
    Ptr = Buffer;
+//   fprintf (stderr, "Got descriptor with tag = 0x%X\n", GetDescriptorTag(Buffer));
 
    switch (GetDescriptorTag(Buffer))
    {
@@ -558,10 +731,12 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    CastAncillaryDataDescriptor(Buffer)->ancillary_data_identifier);
       break;
 
+      case DESCR_NW_NAME:
       case DESCR_BOUQUET_NAME:
-         Text = siGetDescriptorText (Buffer + DESCR_BOUQUET_NAME_LEN,
+         Text = siGetDescriptorName (Buffer + DESCR_BOUQUET_NAME_LEN,
                    GetDescriptorLength (Buffer) - DESCR_BOUQUET_NAME_LEN);
-         CreateBouquetNameDescriptor (Descriptor, Text);
+//         fprintf (stderr, "Got descriptor with tag = 0x%X, text = '%s'\n", GetDescriptorTag(Buffer), Text);
+         CreateBouquetNameDescriptor (Descriptor, Text, GetDescriptorTag(Buffer));
       break;
 
       case DESCR_COMPONENT:
@@ -577,9 +752,9 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       break;
 
       case DESCR_SERVICE:
-         Text = siGetDescriptorText (Buffer + DESCR_SERVICE_LEN,
+         Text = siGetDescriptorName (Buffer + DESCR_SERVICE_LEN,
                    CastServiceDescriptor(Buffer)->provider_name_length);
-         Text2 = siGetDescriptorText (Buffer + DESCR_SERVICE_LEN +
+         Text2 = siGetDescriptorName (Buffer + DESCR_SERVICE_LEN +
                    CastServiceDescriptor(Buffer)->provider_name_length + 1,
                    *((u_char *)(Buffer + DESCR_SERVICE_LEN +
                    CastServiceDescriptor(Buffer)->provider_name_length)));
@@ -598,7 +773,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       break;
 
       case DESCR_SHORT_EVENT:
-         Text = siGetDescriptorText (Buffer + DESCR_SHORT_EVENT_LEN,
+         Text = siGetDescriptorName (Buffer + DESCR_SHORT_EVENT_LEN,
                    CastShortEventDescriptor(Buffer)->event_name_length);
          Text2 = siGetDescriptorText (Buffer + DESCR_SHORT_EVENT_LEN +
                    CastShortEventDescriptor(Buffer)->event_name_length + 1,
@@ -623,6 +798,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                    CastExtendedEventDescriptor(Buffer)->lang_code3, Text);
          Length = CastExtendedEventDescriptor(Buffer)->length_of_items;
          Ptr += DESCR_EXTENDED_EVENT_LEN;
+//         printf ("EEDesc #%d, %s\n", CastExtendedEventDescriptor(Buffer)->descriptor_number, Text);
          while ((Length > 0) && (Length < GetDescriptorLength (Buffer)))
          {
             Text = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN,
@@ -631,6 +807,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
                       CastExtendedEventItem(Ptr)->item_description_length + 1,
                       *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
                       CastExtendedEventItem(Ptr)->item_description_length)));
+//            printf ("EEItem #%d, %s, %s\n", CastExtendedEventDescriptor(Buffer)->descriptor_number, Text, Text2);
             AddExtendedEventItem (Descriptor, Text2, Text);
             Length -= ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
                       *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
@@ -642,15 +819,85 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       break;
 
       case DESCR_CA_IDENT:
-         CreateCaIdentifierDescriptor (Descriptor,
-                   (GetDescriptorLength(Buffer) - DESCR_CA_IDENTIFIER_LEN) / 2);
          Length = GetDescriptorLength (Buffer) - DESCR_CA_IDENTIFIER_LEN;
+         CreateCaIdentifierDescriptor (Descriptor, Length / 2);
          Ptr += DESCR_CA_IDENTIFIER_LEN; i = 0;
          while (Length > 0)
-            { SetCaIdentifierID(Descriptor, i, *((u_short *) Ptr));
+            { SetCaIdentifierID(Descriptor, i, ((*((u_char *) Ptr)<<8) + *((u_char *) (Ptr+1))));
               Length -= 2; Ptr += 2; i++; }
       break;
 
+      case DESCR_CA:
+      {
+         struct CaDescriptor *CD;
+
+         Length = GetDescriptorLength (Buffer) - DESCR_CA_LEN;
+         CreateCaDescriptor (Descriptor,
+            HILO(CastCaDescriptor(Buffer)->CA_type),
+            HILO(CastCaDescriptor(Buffer)->CA_PID), Length);
+         Ptr += DESCR_CA_LEN; i = 0;
+         while (Length > 0)
+            { SetCaData(Descriptor, i, *Ptr);
+              Length --; Ptr ++; i++; }
+
+         /*
+          * The following analyses are more or less directly copied from
+          * MultiDec 8.4b Sources. Thanx to Espresso for his great work !!
+          */
+         CD = (struct CaDescriptor *) Descriptor;
+
+         // fprintf (stderr, "TableID: %02x - CA - Type: 0x%04x, PID: %d\n", TempTableID, CD->CA_type, CD->CA_PID);
+        
+         if ((CD->CA_type >> 8) == 0x01) /* SECA */
+         {
+            CD->ProviderID = (GetCaData (CD, 0) << 8) | GetCaData (CD, 1);
+         }
+         else if ((CD->CA_type >> 8) == 0x05) /* Viaccess ? (France Telecom) */
+         {
+            i=0;
+            while (i < CD->DataLength)
+            {
+               if ((GetCaData (CD, i) == 0x14) && (GetCaData (CD, i+1) == 0x03))
+               {
+                  CD->ProviderID = (GetCaData (CD, i+2) << 16) |
+                                   (GetCaData (CD, i+3) << 8) |
+                                   (GetCaData (CD, i+4) & 0xf0);
+                  i = CD->DataLength;
+               }
+               i++;
+            }
+         }
+         if (CD->CA_type==0x0100)  /* SECA 1 */
+         {
+         /*   bptr=MyPtr+19;
+
+            i=19;
+            while ( i+4 < ca_info->len ) {
+               if ( (*bptr&0xE0) == 0xE0 ) {
+                  CA_ECM=(( *bptr&0x1f)<<8)+*(bptr+1);
+                  Prov_Ident = ( *(bptr+2)<<8) | *(bptr+3);
+                  j=0;
+                  while ( j < ProgrammNeu[ProgrammNummer].CA_Anzahl ) {
+                     if (( ProgrammNeu[ProgrammNummer].CA_System[j].CA_Typ == CA_Typ )
+                            && ( ProgrammNeu[ProgrammNummer].CA_System[j].ECM == CA_ECM )) break;
+                     j++;
+                  };
+
+                  if ( j < MAX_CA_SYSTEMS ) {
+                     if ( j >= ProgrammNeu[ProgrammNummer].CA_Anzahl )
+                          ProgrammNeu[ProgrammNummer].CA_Anzahl++;
+                     ProgrammNeu[ProgrammNummer].CA_System[j].CA_Typ =CA_Typ;
+                     ProgrammNeu[ProgrammNummer].CA_System[j].ECM    =CA_ECM ;
+                     ProgrammNeu[ProgrammNummer].CA_System[j].Provider_Id = Prov_Ident;
+                  };
+               }
+               i+=0x0f;
+               bptr+=0x0f;
+            }; */
+         }
+      }
+      break;
+
       case DESCR_CONTENT:
          CreateContentDescriptor (Descriptor,
                    (GetDescriptorLength(Buffer) - DESCR_CONTENT_LEN) / 2);
@@ -705,12 +952,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
             HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_event_id));
       break;
 
-      case DESCR_CA:
-         CreateConditionalAccessDescriptor (Descriptor,
-            *(Ptr + 1) + 2, // we'll need the entire raw data!
-            Ptr);
-      break;
-
       case DESCR_ISO_639_LANGUAGE:
          CreateIso639LanguageDescriptor (Descriptor,
                    CastIso639LanguageDescriptor(Buffer)->lang_code1,
@@ -789,6 +1030,80 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
          }
       break;
 
+      case DESCR_SAT_DEL_SYS:
+//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
+      {
+         descr_satellite_delivery_system_t *sds;
+         sds = (descr_satellite_delivery_system_t *) Ptr;
+         if (CheckBcdChar (sds->frequency1) && CheckBcdChar (sds->frequency2) &&
+             CheckBcdChar (sds->frequency3) && CheckBcdChar (sds->frequency4) &&
+             CheckBcdChar (sds->orbital_position1) &&
+             CheckBcdChar (sds->orbital_position2) &&
+             CheckBcdChar (sds->symbol_rate1) && CheckBcdChar (sds->symbol_rate1) &&
+             CheckBcdChar (sds->symbol_rate3) && (sds->fec_inner != 0) && (sds->modulation == 1))
+         {
+           CreateSatelliteDeliverySystemDescriptor (Descriptor, 
+            BcdCharToInt (sds->frequency1) * 10 * 1000 * 1000 +
+            BcdCharToInt (sds->frequency2) * 100 * 1000 +
+            BcdCharToInt (sds->frequency3) * 1000 +
+            BcdCharToInt (sds->frequency4) * 10,
+            (sds->west_east_flag ? 1 : -1) *
+            (BcdCharToInt (sds->orbital_position1) * 100 +
+            BcdCharToInt (sds->orbital_position2)),
+            sds->polarization,
+            BcdCharToInt (sds->symbol_rate1) * 10 * 1000 +
+            BcdCharToInt (sds->symbol_rate2) * 100 +
+            BcdCharToInt (sds->symbol_rate3),
+            sds->fec_inner);
+         }
+         /* else
+         {
+            fprintf (stderr, "Illegal sds descriptor\n");
+            siDumpDescriptor (Buffer);
+         } */
+      }
+      break;
+
+      case DESCR_SERVICE_LIST:
+//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
+         CreateServiceListDescriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer) - DESCR_SERVICE_LIST_LEN;
+         Ptr += DESCR_SERVICE_LIST_LEN;
+         while (Length > 0)
+         {
+            AddServiceListEntry (Descriptor,
+                   HILO (CastServiceListDescriptorLoop(Ptr)->service_id),
+                   CastServiceListDescriptorLoop(Ptr)->service_type);
+            Length -= DESCR_SERVICE_LIST_LEN;
+            Ptr += DESCR_SERVICE_LIST_LEN;
+         }
+      break;
+
+      case DESCR_LOCAL_TIME_OFF:
+         CreateLocalTimeOffsetDescriptor (Descriptor);
+         Length = GetDescriptorLength (Buffer) - DESCR_LOCAL_TIME_OFFSET_LEN;
+         Ptr += DESCR_LOCAL_TIME_OFFSET_LEN;
+         while (Length > 0)
+         {
+            time_t ct, co, no;
+            ct = MjdToEpochTime (CastLocalTimeOffsetEntry(Ptr)->time_of_change_mjd) +
+                 BcdTimeToSeconds (CastLocalTimeOffsetEntry(Ptr)->time_of_change_time);
+            co = (BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->local_time_offset_h) * 3600 + 
+                 BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->local_time_offset_m) * 60) * 
+                 ((CastLocalTimeOffsetEntry(Ptr)->local_time_offset_polarity) ? -1 : 1); 
+            no = (BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->next_time_offset_h) * 3600 + 
+                 BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->next_time_offset_m) * 60) * 
+                 ((CastLocalTimeOffsetEntry(Ptr)->local_time_offset_polarity) ? -1 : 1); 
+            AddLocalTimeOffsetEntry (Descriptor,
+                   CastLocalTimeOffsetEntry(Ptr)->country_code1, 
+                   CastLocalTimeOffsetEntry(Ptr)->country_code2, 
+                   CastLocalTimeOffsetEntry(Ptr)->country_code3, 
+                   CastLocalTimeOffsetEntry(Ptr)->country_region_id, co, ct, no); 
+            Length -= LOCAL_TIME_OFFSET_ENTRY_LEN;
+            Ptr += LOCAL_TIME_OFFSET_ENTRY_LEN;
+         }
+      break;
+
       case DESCR_VIDEO_STREAM:
       case DESCR_AUDIO_STREAM:
       case DESCR_HIERARCHY:
@@ -804,15 +1119,11 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_SMOOTHING_BUFFER:
       case DESCR_STD:
       case DESCR_IBP:
-      case DESCR_NW_NAME:
-      case DESCR_SERVICE_LIST:
-      case DESCR_SAT_DEL_SYS:
       case DESCR_CABLE_DEL_SYS:
       case DESCR_VBI_DATA:
       case DESCR_VBI_TELETEXT:
       case DESCR_MOSAIC:
       case DESCR_TELEPHONE:
-      case DESCR_LOCAL_TIME_OFF:
       case DESCR_TERR_DEL_SYS:
       case DESCR_ML_NW_NAME:
       case DESCR_ML_BQ_NAME:
@@ -833,6 +1144,8 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_CELL_FREQ_LINK:
       case DESCR_ANNOUNCEMENT_SUPPORT:
       default:
+//         fprintf (stderr, "Unsupported descriptor with tag = 0x%02X\n", GetDescriptorTag(Ptr));
+//         siDumpDescriptor (Buffer);
          /* fprintf (stderr, "unsupported descriptor 0x%x\n",
                               GetDescriptorTag(Buffer)); */
       break;
@@ -845,14 +1158,19 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
 /*
  *  ToDo:  ETSI conformal text definition
  */
-char *siGetDescriptorText (u_char *Buffer, int Length)
+#define GDT_TEXT_DESCRIPTOR 0
+#define GDT_NAME_DESCRIPTOR 1
+char *siGetDescriptorTextHandler (u_char *, int , int );
+
+char *siGetDescriptorTextHandler (u_char *Buffer, int Length, int type)
 {
    char *tmp, *result;
    int i;
 
    if ((Length < 0) || (Length > 4095))
       return (xSetText ("text error"));
-   if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff))
+/* ASSENIZATION: removing coding detection - suppose they are all ANSI */
+   // if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff))
    {
       xMemAlloc (Length+1, &result);
       tmp = result;
@@ -860,15 +1178,16 @@ char *siGetDescriptorText (u_char *Buffer, int Length)
       {
          if (*Buffer == 0) break;
 
-         if ((*Buffer >= ' ' && *Buffer <= '~') ||
+         if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') ||
              (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer;
-         if (*Buffer == 0x8A || *Buffer == '\n') *tmp++ = '\n';
+         if (*Buffer == 0x8A) *tmp++ = '\n';
          if (*Buffer == 0x86 || *Buffer == 0x87) *tmp++ = ' ';
+         if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' ';
          Buffer++;
       }
       *tmp = '\0';
    }
-   else
+   /* else
    {
       switch (*Buffer)
       {
@@ -881,11 +1200,22 @@ char *siGetDescriptorText (u_char *Buffer, int Length)
          case 0x12: result = xSetText ("Coding according to KSC 5601"); break;
          default: result = xSetText ("Unknown coding"); break;
       }
-   }
+   } */
 
    return (result);
 }
 
+char *siGetDescriptorText (u_char *Buffer, int Length)
+{
+   return siGetDescriptorTextHandler (Buffer, Length, GDT_TEXT_DESCRIPTOR);
+}
+
+char *siGetDescriptorName (u_char *Buffer, int Length)
+{
+   return siGetDescriptorTextHandler (Buffer, Length, GDT_NAME_DESCRIPTOR);
+}
+
+
 // CRC32 lookup table for polynomial 0x04c11db7
 
 static u_long crc_table[256] = {
diff --git a/lirc.c b/lirc.c
index f120743be..b7f5b9367 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.1 2002/09/29 13:16:33 kls Exp $
+ * $Id: lirc.c 1.4 2003/04/12 14:37:17 kls Exp $
  */
 
 #include "lirc.h"
@@ -41,6 +41,11 @@ cLircRemote::~cLircRemote()
   Cancel();
 }
 
+bool cLircRemote::Ready(void)
+{
+  return f >= 0;
+}
+
 void cLircRemote::Action(void)
 {
   dsyslog("LIRC remote control thread started (pid=%d)", getpid());
@@ -50,34 +55,49 @@ void cLircRemote::Action(void)
   char buf[LIRC_BUFFER_SIZE];
   char LastKeyName[LIRC_KEY_BUF] = "";
   bool repeat = false;
+  int timeout = -1;
 
   for (; f >= 0;) {
 
       LOCK_THREAD;
 
-      if (cFile::FileReady(f, REPEATLIMIT) && safe_read(f, buf, sizeof(buf)) > 21) {
+      bool ready = cFile::FileReady(f, timeout);
+      int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
+
+      if (ready) {
+         if (ret <= 21) {
+            esyslog("ERROR: lircd connection lost");
+            close(f);
+            f = -1;
+            break;
+            }
          int count;
          char KeyName[LIRC_KEY_BUF];
          sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
          int Now = time_ms();
          if (count == 0) {
+            if (repeat)
+               Put(LastKeyName, false, true);
             strcpy(LastKeyName, KeyName);
             repeat = false;
             FirstTime = Now;
+            timeout = -1;
             }
          else {
             if (Now - FirstTime < REPEATDELAY)
                continue; // repeat function kicks in after a short delay
             repeat = true;
+            timeout = REPEATDELAY;
             }
          LastTime = Now;
          Put(KeyName, repeat);
          }
       else if (repeat) { // the last one was a repeat, so let's generate a release
-         if (time_ms() - LastTime > REPEATDELAY) {
+         if (time_ms() - LastTime >= REPEATDELAY) {
             Put(LastKeyName, false, true);
             repeat = false;
             *LastKeyName = 0;
+            timeout = -1;
             }
          }
       }
diff --git a/lirc.h b/lirc.h
index ff58f3154..cd3c780d0 100644
--- a/lirc.h
+++ b/lirc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 1.1 2002/09/28 14:11:04 kls Exp $
+ * $Id: lirc.h 1.2 2003/04/12 14:15:20 kls Exp $
  */
 
 #ifndef __LIRC_H
@@ -21,6 +21,7 @@ class cLircRemote : public cRemote, private cThread {
 public:
   cLircRemote(char *DeviceName);
   virtual ~cLircRemote();
+  virtual bool Ready(void);
   };
 
 #endif //__LIRC_H
diff --git a/menu.c b/menu.c
index 1a34e42cf..e63d70779 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.234 2003/02/09 12:55:38 kls Exp $
+ * $Id: menu.c 1.235 2003/04/12 09:40:48 kls Exp $
  */
 
 #include "menu.h"
@@ -2208,6 +2208,7 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   SetSection(tr("Replay"));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
+  Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
 // --- cMenuSetupMisc --------------------------------------------------------
diff --git a/menuitems.c b/menuitems.c
index 56b919955..d680ff9c6 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.12 2003/01/18 13:34:40 kls Exp $
+ * $Id: menuitems.c 1.13 2003/04/12 09:21:33 kls Exp $
  */
 
 #include "menuitems.h"
@@ -62,27 +62,30 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
   eOSState state = cMenuEditItem::ProcessKey(Key);
 
   if (state == osUnknown) {
-     int newValue;
-     if (k0 <= Key && Key <= k9) {
-        if (fresh) {
-           *value = 0;
-           fresh = false;
-           }
-        newValue = *value * 10 + (Key - k0);
-        }
-     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        newValue = *value - 1;
-        fresh = true;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        newValue = *value + 1;
-        fresh = true;
-        }
-     else {
-        if (*value < min) { *value = min; Set(); }
-        if (*value > max) { *value = max; Set(); }
-        return state;
-        }
+     int newValue = *value;
+     Key = NORMALKEY(Key);
+     switch (Key) {
+       case kNone: break;
+       case k0 ... k9:
+            if (fresh) {
+               *value = 0;
+               fresh = false;
+               }
+            newValue = *value * 10 + (Key - k0);
+            break;
+       case kLeft: // TODO might want to increase the delta if repeated quickly?
+            newValue = *value - 1;
+            fresh = true;
+            break;
+       case kRight:
+            newValue = *value + 1;
+            fresh = true;
+            break;
+       default:
+            if (*value < min) { *value = min; Set(); }
+            if (*value > max) { *value = max; Set(); }
+            return state;
+       }
      if ((!fresh || min <= newValue) && newValue <= max) {
         *value = newValue;
         Set();
diff --git a/osd.c b/osd.c
index 762295568..d048f5ca3 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.39 2002/12/08 13:17:13 kls Exp $
+ * $Id: osd.c 1.40 2003/03/23 15:41:54 kls Exp $
  */
 
 #include "osd.h"
@@ -535,8 +535,6 @@ void cOsdMenu::CursorDown(void)
 
 void cOsdMenu::PageUp(void)
 {
-  if (Count() <= MAXOSDITEMS)
-     return;
   current -= MAXOSDITEMS;
   first -= MAXOSDITEMS;
   if (first < 0)
@@ -551,13 +549,11 @@ void cOsdMenu::PageUp(void)
 
 void cOsdMenu::PageDown(void) 
 {
-  if (Count() <= MAXOSDITEMS)
-     return;
   current += MAXOSDITEMS;
   first += MAXOSDITEMS;
   if (current > Count() - 1) {
      current = Count() - 1;
-     first = Count() - MAXOSDITEMS;
+     first = max(0, Count() - MAXOSDITEMS);
      }
   if (SpecialItem(current)) {
      current += (current < Count() - 1) ? 1 : -1;
diff --git a/osdbase.c b/osdbase.c
index e16b27b04..8093b96a6 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.7 2002/08/25 10:02:36 kls Exp $
+ * $Id: osdbase.c 1.8 2003/03/23 15:53:29 kls Exp $
  */
 
 #include "osdbase.h"
@@ -355,7 +355,7 @@ tWindowHandle cOsdBase::Create(int x, int y, int w, int h, int Bpp, bool ClearWi
      if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
         if ((w & 0x03) != 0) {
            w += 4 - (w & 0x03);
-           esyslog("ERROR: OSD window width must be a multiple of 4 - increasing to %d", w);
+           dsyslog("OSD window width must be a multiple of 4 - increasing to %d", w);
            }
         cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
         if (OpenWindow(win)) {
@@ -474,7 +474,7 @@ void cOsdBase::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int Ne
      if (NewWidth > 0 && NewHeight > 0) {
         if ((NewWidth & 0x03) != 0) {
            NewWidth += 4 - (NewWidth & 0x03);
-           esyslog("ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
+           dsyslog("OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
            }
         CloseWindow(w);
         cWindow *NewWindow = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());
diff --git a/rcu.c b/rcu.c
index 4157c0d2f..5c76a35cc 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.3 2002/12/07 12:22:40 kls Exp $
+ * $Id: rcu.c 1.4 2003/04/12 14:37:13 kls Exp $
  */
 
 #include "rcu.h"
@@ -55,6 +55,11 @@ cRcuRemote::~cRcuRemote()
   Cancel();
 }
 
+bool cRcuRemote::Ready(void)
+{
+  return f >= 0;
+}
+
 bool cRcuRemote::Initialize(void)
 {
   if (f >= 0) {
diff --git a/rcu.h b/rcu.h
index d314275db..534ca3da5 100644
--- a/rcu.h
+++ b/rcu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.h 1.2 2002/12/07 12:21:25 kls Exp $
+ * $Id: rcu.h 1.3 2003/04/12 14:36:09 kls Exp $
  */
 
 #ifndef __RCU_H
@@ -39,6 +39,7 @@ class cRcuRemote : public cRemote, private cThread, private cStatus {
 public:
   cRcuRemote(char *DeviceName);
   virtual ~cRcuRemote();
+  virtual bool Ready(void);
   virtual bool Initialize(void);
   };
 
diff --git a/recording.c b/recording.c
index e14bb437b..261bee8bf 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.72 2003/01/06 15:36:12 kls Exp $
+ * $Id: recording.c 1.75 2003/04/12 09:51:44 kls Exp $
  */
 
 #include "recording.h"
@@ -42,7 +42,7 @@
 #define NAMEFORMAT   "%s/%s/" nameFORMAT
 // end of implementation for brain dead systems
 
-#define RESUMEFILESUFFIX  "/resume.vdr"
+#define RESUMEFILESUFFIX  "/resume%s%s.vdr"
 #define SUMMARYFILESUFFIX "/summary.vdr"
 #define MARKSFILESUFFIX   "/marks.vdr"
 
@@ -154,7 +154,7 @@ cResumeFile::cResumeFile(const char *FileName)
   fileName = MALLOC(char, strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1);
   if (fileName) {
      strcpy(fileName, FileName);
-     strcat(fileName, RESUMEFILESUFFIX);
+     sprintf(fileName + strlen(fileName), RESUMEFILESUFFIX, Setup.ResumeID ? "." : "", Setup.ResumeID ? itoa(Setup.ResumeID) : "");
      }
   else
      esyslog("ERROR: can't allocate memory for resume file name");
@@ -768,7 +768,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 #define MAXINDEXCATCHUP   2 // seconds
 
 // The minimum age of an index file for considering it no longer to be written:
-#define MININDEXAGE      60 // seconds
+#define MININDEXAGE     300 // seconds
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
 :resumeFile(FileName)
@@ -848,6 +848,7 @@ cIndexFile::~cIndexFile()
 
 bool cIndexFile::CatchUp(int Index)
 {
+  // returns true unless something really goes wrong, so that 'index' becomes NULL
   if (index && f >= 0) {
      for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
          struct stat buf;
@@ -856,7 +857,7 @@ bool cIndexFile::CatchUp(int Index)
                // apparently the index file is not being written any more
                close(f);
                f = -1;
-               return false;
+               break;
                }
             int newLast = buf.st_size / sizeof(tIndex) - 1;
             if (newLast > last) {
@@ -889,13 +890,12 @@ bool cIndexFile::CatchUp(int Index)
             }
          else
             LOG_ERROR_STR(fileName);
-         if (Index >= last)
-            sleep(1);
-         else
-            return true;
+         if (Index < last)
+            break;
+         sleep(1);
          }
      }
-  return false;
+  return index != NULL;
 }
 
 bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
@@ -915,8 +915,7 @@ bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
 
 bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
 {
-  if (index) {
-     CatchUp(Index);
+  if (CatchUp(Index)) {
      if (Index >= 0 && Index < last) {
         *FileNumber = index[Index].number;
         *FileOffset = index[Index].offset;
@@ -938,8 +937,7 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
 
 int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
 {
-  if (index) {
-     CatchUp();
+  if (CatchUp()) {
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
@@ -976,8 +974,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
 
 int cIndexFile::Get(uchar FileNumber, int FileOffset)
 {
-  if (index) {
-     CatchUp();
+  if (CatchUp()) {
      //TODO implement binary search!
      int i;
      for (i = 0; i < last; i++) {
diff --git a/remote.h b/remote.h
index 7908b1db2..f26be1692 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.24 2002/12/15 15:49:06 kls Exp $
+ * $Id: remote.h 1.25 2003/04/12 14:14:49 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -37,6 +37,7 @@ class cRemote : public cListObject {
   bool Put(const char *Code, bool Repeat = false, bool Release = false);
 public:
   virtual ~cRemote();
+  virtual bool Ready(void) { return true; }
   virtual bool Initialize(void) { return true; }
   const char *Name(void) { return name; }
   static void SetLearning(cRemote *Learning) { learning = Learning; }
diff --git a/tools.c b/tools.c
index ff462ba84..21ec526c4 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.76 2002/11/24 20:17:31 kls Exp $
+ * $Id: tools.c 1.77 2003/04/06 15:31:45 kls Exp $
  */
 
 #include "tools.h"
@@ -620,11 +620,13 @@ bool cFile::FileReady(int FileDes, int TimeoutMs)
   struct timeval timeout;
   FD_ZERO(&set);
   FD_SET(FileDes, &set);
-  if (TimeoutMs < 100)
-     TimeoutMs = 100;
-  timeout.tv_sec  = TimeoutMs / 1000;
-  timeout.tv_usec = (TimeoutMs % 1000) * 1000;
-  return select(FD_SETSIZE, &set, NULL, NULL, &timeout) > 0 && FD_ISSET(FileDes, &set);
+  if (TimeoutMs >= 0) {
+     if (TimeoutMs < 100)
+        TimeoutMs = 100;
+     timeout.tv_sec  = TimeoutMs / 1000;
+     timeout.tv_usec = (TimeoutMs % 1000) * 1000;
+     }
+  return select(FD_SETSIZE, &set, NULL, NULL, (TimeoutMs >= 0) ? &timeout : NULL) > 0 && FD_ISSET(FileDes, &set);
 }
 
 bool cFile::FileReadyForWriting(int FileDes, int TimeoutMs)
diff --git a/transfer.c b/transfer.c
index 4e8c30313..9354e58ff 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.10 2003/02/15 14:12:41 kls Exp $
+ * $Id: transfer.c 1.11 2003/03/30 12:52:11 kls Exp $
  */
 
 #include "transfer.h"
@@ -133,11 +133,8 @@ void cTransfer::StripAudioPackets(uchar *b, int Length, uchar Except)
            case 0xC0 ... 0xC1: // audio
                 if (c == 0xC1)
                    canToggleAudioTrack = true;
-                if (!Except || c != Except) {
-                   int n = l;
-                   for (int j = i; j < Length && n--; j++)
-                       b[j] = 0x00;
-                   }
+                if (!Except || c != Except)
+                   memset(&b[i], 0x00, min(l, Length-i));
                 break;
            case 0xE0 ... 0xEF: // video
                 break;
diff --git a/vdr.c b/vdr.c
index 50b1a2903..3f0a7f0d7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.146 2003/03/09 14:07:46 kls Exp $
+ * $Id: vdr.c 1.149 2003/04/12 13:57:45 kls Exp $
  */
 
 #include <getopt.h>
@@ -354,8 +354,6 @@ int main(int argc, char *argv[])
 
   cDvbDevice::Initialize();
 
-  cSIProcessor::Read();
-
   // Start plugins:
 
   if (!PluginManager.StartPlugins())
@@ -364,21 +362,32 @@ int main(int argc, char *argv[])
   // Primary device:
 
   cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
-  if (!cDevice::PrimaryDevice()) {
+  if (!cDevice::PrimaryDevice() || !cDevice::PrimaryDevice()->HasDecoder()) {
+     if (cDevice::PrimaryDevice() && !cDevice::PrimaryDevice()->HasDecoder())
+        isyslog("device %d has no MPEG decoder", cDevice::PrimaryDevice()->DeviceNumber() + 1);
      for (int i = 0; i < cDevice::NumDevices(); i++) {
          cDevice *d = cDevice::GetDevice(i);
          if (d && d->HasDecoder()) {
             isyslog("trying device number %d instead", i + 1);
-            if (cDevice::SetPrimaryDevice(i + 1))
+            if (cDevice::SetPrimaryDevice(i + 1)) {
                Setup.PrimaryDVB = i + 1;
+               break;
+               }
             }
          }
-     }
-  if (!cDevice::PrimaryDevice()) {
-     const char *msg = "no primary device found - giving up!";
-     fprintf(stderr, "vdr: %s\n", msg);
-     esyslog("ERROR: %s", msg);
-     return 2;
+     if (!cDevice::PrimaryDevice()) {
+        const char *msg = "no primary device found - using first device!";
+        fprintf(stderr, "vdr: %s\n", msg);
+        esyslog("ERROR: %s", msg);
+        if (!cDevice::SetPrimaryDevice(0))
+           return 2;
+        if (!cDevice::PrimaryDevice()) {
+           const char *msg = "no primary device found - giving up!";
+           fprintf(stderr, "vdr: %s\n", msg);
+           esyslog("ERROR: %s", msg);
+           return 2;
+           }
+        }
      }
 
   // OSD:
@@ -416,6 +425,8 @@ int main(int argc, char *argv[])
 
   cEITScanner EITScanner;
 
+  cSIProcessor::Read();
+
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
@@ -530,14 +541,17 @@ int main(int argc, char *argv[])
           case kVolDn:
           case kMute:
                if (key == kMute) {
-                  if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu)
+                  if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu) {
+                     key = kNone; // nobody else needs to see these keys
                      break; // no need to display "mute off"
+                     }
                   }
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
                if (!Interface->IsOpen())
                   Menu = Temp = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
+               key = kNone; // nobody else needs to see these keys
                break;
           // Power off:
           case kPower: isyslog("Power button pressed");

From 21a52ccb6d43cce35f7a381f55ea291195416f33 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 21 Apr 2003 18:00:00 +0200
Subject: [PATCH 069/307] Version 1.1.28 - Using masks in EIT filtering to
 reduce the number of filters (thanks to Andreas   Schultz). - Fixed handling
 Ca descriptors (thanks to Stefan Huelswitt). - Now only those Ca descriptors
 are sent to a CAM that are actually understood   by that CAM. - Re-enabled
 CAM communication during replay and on non-Ca channels. This requires   a DVB
 driver with firmware version 2613 or later. - It is now possible to do
 simultaneous recording and replay with a single DVB   card, even with
 encrypted channels. This requires the use of the Link Layer   firmware,
 version 2613 or higher; the -icam firmware is still limited to live  
 encrypted channels only. Finally we have time shift for encrypted channels on
   single card systems! - Enhanced detection of pending user I/O from CAMs to
 avoid sluggish reaction   to remote control keypresses. - Implemented "pause
 live video". You can now press "Menu/Yellow" or "Pause" on   your remote
 control while watching live video to start an instant recording   of the
 current programme and immediately start replaying that recording.

---
 CONTRIBUTORS  |  1 +
 HISTORY       | 20 +++++++++++
 MANUAL        | 18 ++++++++--
 channels.conf |  2 +-
 ci.c          | 61 +++++++++++++++++++++++-----------
 ci.h          | 11 ++++---
 config.h      |  4 +--
 dvbdevice.c   | 66 ++++++++++++++++++-------------------
 eit.c         | 91 +++++++++++++++++++++------------------------------
 eit.h         | 14 ++++----
 i18n.c        | 18 +++++++++-
 menu.c        | 31 ++++++++++++++++--
 menu.h        |  3 +-
 osd.h         |  3 +-
 vdr.c         | 35 +++++++++++++++-----
 15 files changed, 240 insertions(+), 138 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fad8e0be0..d05b9282a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -196,6 +196,7 @@ Andreas Schultz <aschultz@warp10.net>
  for pointing out some unnecessary #includes in eit.c and a problem with
  cMenuRecordings::Del(), which caused warnings with gcc-3.2
  for suggesting a Make.config file
+ for making EIT filtering use masks to reduce the number of filters
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index 7e695246c..439e064e1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2033,3 +2033,23 @@ Video Disk Recorder Revision History
   applies to the RCU remote control in case of errors during startup.
 - Fixed handling of Ca parameters with values <= MAXDEVICES, which don't indicate
   an actual encrypted channel (thanks to Stefan Huelswitt for reporting this one).
+
+2003-04-21: Version 1.1.28
+
+- Using masks in EIT filtering to reduce the number of filters (thanks to Andreas
+  Schultz).
+- Fixed handling Ca descriptors (thanks to Stefan Huelswitt).
+- Now only those Ca descriptors are sent to a CAM that are actually understood
+  by that CAM.
+- Re-enabled CAM communication during replay and on non-Ca channels. This requires
+  a DVB driver with firmware version 2613 or later.
+- It is now possible to do simultaneous recording and replay with a single DVB
+  card, even with encrypted channels. This requires the use of the Link Layer
+  firmware, version 2613 or higher; the -icam firmware is still limited to live
+  encrypted channels only. Finally we have time shift for encrypted channels on
+  single card systems!
+- Enhanced detection of pending user I/O from CAMs to avoid sluggish reaction
+  to remote control keypresses.
+- Implemented "pause live video". You can now press "Menu/Yellow" or "Pause" on
+  your remote control while watching live video to start an instant recording
+  of the current programme and immediately start replaying that recording.
diff --git a/MANUAL b/MANUAL
index b5f00d1c1..be9ac5268 100644
--- a/MANUAL
+++ b/MANUAL
@@ -19,7 +19,7 @@ Video Disk Recorder User's Manual
   Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu
   Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump
   Green   -           Language     New        New        Ins/Ovr       Rewind            Skip -60s
-  Yellow  -           -            Delete     Delete     Delete        Delete            Skip +60s
+  Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s
   Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
   0..9    Ch select   -            -          -          Numeric inp.  Exec cmd(2)       Editing
 
@@ -31,7 +31,7 @@ Video Disk Recorder User's Manual
   following functions:
 
   Play        resume normal replay
-  Pause       pause replay
+  Pause       pause replay or live video
   Stop        stop replay
   Record      instant recording
   FastFwd     fast forward
@@ -191,6 +191,20 @@ Video Disk Recorder User's Manual
   Stop instant recording by pressing the "Menu" button and selecting
   "Stop Recording", or by disabling the timer.
 
+* Pausing live video
+
+  If you want to pause the live programme you are just watching, simple press
+  "Menu/Yellow" or "Pause" on your remote control. VDR will start an instant
+  recording of the current channel (just as if you had pressed "Menu/Red" or
+  "Record") and immediately begin replaying that recording. Replay will be
+  put into "pause" mode, so you can attend to whatever it was that disturbed
+  your live viewing session. Once you're back, simply press the "Up" or "Play"
+  button and you'll be watching the current channel in time shift mode, right
+  from the point where you left off. The instant recording VDR has started
+  will use the same parameters for priority, lifetime and recording duration
+  as any other instant recording, so by default it will record 3 hours (which
+  should be enough for any normal broadcast).
+
 * Replaying a Recording
 
   All recordings are listed in the "Recordings" menu. Browse through the
diff --git a/channels.conf b/channels.conf
index 2f0c7eb8b..13bc7e789 100644
--- a/channels.conf
+++ b/channels.conf
@@ -59,7 +59,7 @@ Studio Universal:12071:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
 Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
 Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
 Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
-Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14:0:0:0
+Discovery Channel:11758:h:S19.2E:27500:1023:1024:8181:101:14:0:0:0
 Planet:12090:v:S19.2E:27500:1279:1280:0:101:13:0:0:0
 Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28:0:0:0
 Junior:11758:h:S19.2E:27500:255:256:0:101:19:0:0:0
diff --git a/ci.c b/ci.c
index a3d64df3e..91d9ede93 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.9 2003/03/23 15:18:40 kls Exp $
+ * $Id: ci.c 1.14 2003/04/20 09:52:45 kls Exp $
  */
 
 /* XXX TODO
@@ -625,6 +625,7 @@ class cCiSession {
   const cCiTransportConnection *Tc(void) { return tc; }
   int SessionId(void) { return sessionId; }
   int ResourceId(void) { return resourceId; }
+  virtual bool HasUserIO(void) { return false; }
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
@@ -769,7 +770,7 @@ class cCiApplicationInformation : public cCiSession {
 cCiApplicationInformation::cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
 {
-  dbgprotocol("New Aplication Information (session id %d)\n", SessionId);
+  dbgprotocol("New Application Information (session id %d)\n", SessionId);
   state = 0;
   creationTime = time(NULL);
   menuString = NULL;
@@ -827,12 +828,17 @@ bool cCiApplicationInformation::EnterMenu(void)
 
 // --- cCiConditionalAccessSupport -------------------------------------------
 
+#define MAXCASYSTEMIDS 16
+
 class cCiConditionalAccessSupport : public cCiSession {
 private:
   int state;
+  int numCaSystemIds;
+  unsigned short caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
 public:
   cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  const unsigned short *GetCaSystemIds(void) { return caSystemIds; }
   bool SendPMT(cCiCaPmt &CaPmt);
   };
 
@@ -841,6 +847,7 @@ cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTrans
 {
   dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
   state = 0;
+  caSystemIds[numCaSystemIds = 0] = 0;
 }
 
 bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
@@ -853,9 +860,16 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             while (l > 1) {
-                  dbgprotocol(" %04X", ((unsigned int)(*d) << 8) | *(d + 1));
+                  unsigned short id = ((unsigned short)(*d) << 8) | *(d + 1);
+                  dbgprotocol(" %04X", id);
                   d += 2;
                   l -= 2;
+                  if (numCaSystemIds < MAXCASYSTEMIDS) {
+                     caSystemIds[numCaSystemIds++] = id;
+                     caSystemIds[numCaSystemIds] = 0;
+                     }
+                  else
+                     esyslog("ERROR: too many CA system IDs!");
                   }
             dbgprotocol("\n");
             }
@@ -996,6 +1010,7 @@ class cCiMMI : public cCiSession {
   cCiMMI(int SessionId, cCiTransportConnection *Tc);
   virtual ~cCiMMI();
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual bool HasUserIO(void) { return menu || enquiry; }
   cCiMenu *Menu(void);
   cCiEnquiry *Enquiry(void);
   bool SendMenuAnswer(uint8_t Selection);
@@ -1273,7 +1288,8 @@ void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
 cCiHandler::cCiHandler(int Fd, int NumSlots)
 {
   numSlots = NumSlots;
-  enabled = true;
+  newCaSupport = false;
+  hasUserIO = false;
   for (int i = 0; i < MAX_CI_SESSION; i++)
       sessions[i] = NULL;
   tpl = new cCiTransportLayer(Fd, numSlots);
@@ -1299,12 +1315,14 @@ cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
            if (Caps.slot_type == CA_CI_LINK)
               return new cCiHandler(fd_ca, NumSlots);
            else
-              esyslog("ERROR: CAM doesn't support link layer interface");
+              isyslog("CAM doesn't support link layer interface");
            }
-        esyslog("ERROR: no CAM slots found");
+        else
+           esyslog("ERROR: no CAM slots found");
         }
      else
         LOG_ERROR_STR(FileName);
+     close(fd_ca);
      }
   return NULL;
 }
@@ -1358,7 +1376,8 @@ cCiSession *cCiHandler::CreateSession(int ResourceId)
             switch (ResourceId) {
               case RI_RESOURCE_MANAGER:           return sessions[i] = new cCiResourceManager(i + 1, tc);
               case RI_APPLICATION_INFORMATION:    return sessions[i] = new cCiApplicationInformation(i + 1, tc);
-              case RI_CONDITIONAL_ACCESS_SUPPORT: return sessions[i] = new cCiConditionalAccessSupport(i + 1, tc);
+              case RI_CONDITIONAL_ACCESS_SUPPORT: newCaSupport = true;
+                                                  return sessions[i] = new cCiConditionalAccessSupport(i + 1, tc);
               case RI_HOST_CONTROL:               break; //XXX
               case RI_DATE_TIME:                  return sessions[i] = new cCiDateTime(i + 1, tc);
               case RI_MMI:                        return sessions[i] = new cCiMMI(i + 1, tc);
@@ -1426,8 +1445,6 @@ int cCiHandler::CloseAllSessions(int Slot)
 
 bool cCiHandler::Process(void)
 {
-  if (!enabled)
-     return false;
   bool result = true;
   cMutexLock MutexLock(&mutex);
   for (int Slot = 0; Slot < numSlots; Slot++) {
@@ -1466,10 +1483,14 @@ bool cCiHandler::Process(void)
          tpl->NewConnection(Slot);
          }
       }
+  bool UserIO = false;
   for (int i = 0; i < MAX_CI_SESSION; i++) {
-      if (sessions[i])
-         sessions[i]->Process();
+      if (sessions[i] && sessions[i]->Process())
+         UserIO |= sessions[i]->HasUserIO();
       }
+  hasUserIO = UserIO;
+  if (newCaSupport)
+     newCaSupport = result = false; // triggers new SetCaPmt at caller!
   return result;
 }
 
@@ -1502,16 +1523,18 @@ cCiEnquiry *cCiHandler::GetEnquiry(void)
   return NULL;
 }
 
-bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt)
+const unsigned short *cCiHandler::GetCaSystemIds(int Slot)
 {
   cMutexLock MutexLock(&mutex);
-  bool result = false;
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-      if (cas)
-         result |= cas->SendPMT(CaPmt);
-      }
-  return result;
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+  return cas ? cas->GetCaSystemIds() : NULL;
+}
+
+bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt, int Slot)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+  return cas && cas->SendPMT(CaPmt);
 }
 
 bool cCiHandler::Reset(int Slot)
diff --git a/ci.h b/ci.h
index a9f27f1ea..79ed62f35 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.4 2003/03/23 15:18:40 kls Exp $
+ * $Id: ci.h 1.7 2003/04/20 09:21:23 kls Exp $
  */
 
 #ifndef __CI_H
@@ -80,7 +80,8 @@ class cCiHandler {
 private:
   cMutex mutex;
   int numSlots;
-  bool enabled;
+  bool newCaSupport;
+  bool hasUserIO;
   cCiSession *sessions[MAX_CI_SESSION];
   cCiTransportLayer *tpl;
   cCiTransportConnection *tc;
@@ -96,12 +97,14 @@ class cCiHandler {
 public:
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
-  void SetEnabled(bool Enabled) { enabled = Enabled; }
+  int NumSlots(void) { return numSlots; }
   bool Process(void);
+  bool HasUserIO(void) { return hasUserIO; }
   bool EnterMenu(int Slot);
   cCiMenu *GetMenu(void);
   cCiEnquiry *GetEnquiry(void);
-  bool SetCaPmt(cCiCaPmt &CaPmt);
+  const unsigned short *GetCaSystemIds(int Slot);
+  bool SetCaPmt(cCiCaPmt &CaPmt, int Slot);
   bool Reset(int Slot);
   };
 
diff --git a/config.h b/config.h
index ac40ff47a..94bdcd746 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.152 2003/04/12 09:35:50 kls Exp $
+ * $Id: config.h 1.153 2003/04/13 14:02:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.27"
+#define VDRVERSION "1.1.28"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 9bbac2d24..c25ebef46 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.51 2003/04/12 15:06:11 kls Exp $
+ * $Id: dvbdevice.c 1.54 2003/04/19 14:24:25 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -116,13 +116,14 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 void cDvbTuner::Set(const cChannel *Channel, bool Tune)
 {
   cMutexLock MutexLock(&mutex);
-  channel = *Channel;
+  bool CaChange = !(Channel->GetChannelID() == channel.GetChannelID());
   if (Tune)
      tunerStatus = tsSet;
-  else if (tunerStatus == tsCam)
+  else if (tunerStatus == tsCam && CaChange)
      tunerStatus = tsTuned;
-  if (Channel->Ca())
+  if (Channel->Ca() && CaChange)
      startTime = time(NULL);
+  channel = *Channel;
   newSet.Broadcast();
 }
 
@@ -264,27 +265,29 @@ void cDvbTuner::Action(void)
                  }
               }
            if (tunerStatus >= tsLocked) {
-              if (ciHandler && channel.Ca()) {
+              if (ciHandler) {
                  if (ciHandler->Process()) {
                     if (tunerStatus != tsCam) {//XXX TODO update in case the CA descriptors have changed
-                       uchar buffer[2048];
-                       int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer);
-                       if (length > 0) {
-                          cCiCaPmt CaPmt(channel.Sid());
-                          CaPmt.AddCaDescriptor(length, buffer);
-                          if (channel.Vpid())
-                             CaPmt.AddPid(channel.Vpid());
-                          if (channel.Apid1())
-                             CaPmt.AddPid(channel.Apid1());
-                          if (channel.Apid2())
-                             CaPmt.AddPid(channel.Apid2());
-                          if (channel.Dpid1())
-                             CaPmt.AddPid(channel.Dpid1());
-                          if (ciHandler->SetCaPmt(CaPmt)) {
-                             tunerStatus = tsCam;
-                             startTime = 0;
-                             }
-                          }
+                       for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) {
+                           uchar buffer[2048];
+                           int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), ciHandler->GetCaSystemIds(Slot), sizeof(buffer), buffer);
+                           if (length > 0) {
+                              cCiCaPmt CaPmt(channel.Sid());
+                              CaPmt.AddCaDescriptor(length, buffer);
+                              if (channel.Vpid())
+                                 CaPmt.AddPid(channel.Vpid());
+                              if (channel.Apid1())
+                                 CaPmt.AddPid(channel.Apid1());
+                              if (channel.Apid2())
+                                 CaPmt.AddPid(channel.Apid2());
+                              if (channel.Dpid1())
+                                 CaPmt.AddPid(channel.Dpid1());
+                              if (ciHandler->SetCaPmt(CaPmt, Slot)) {
+                                 tunerStatus = tsCam;
+                                 startTime = 0;
+                                 }
+                              }
+                           }
                        }
                     }
                  else
@@ -588,7 +591,8 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            if (!HasPid(Channel->Vpid())) {
 #ifdef DO_MULTIPLE_RECORDINGS
               if (Channel->Ca() > CACONFBASE)
-                 needsDetachReceivers = true;
+                 needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels
+                                        || Ca() != Channel->Ca();
               else if (!IsPrimaryDevice())
                  result = true;
 #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
@@ -609,7 +613,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  bool IsEncrypted = Channel->Ca() > CACONFBASE;
+  bool IsEncrypted = Channel->Ca() > CACONFBASE && !ciHandler; // only LL-firmware can do non-live CA channels
 
   bool DoTune = !dvbTuner->IsTunedTo(Channel);
 
@@ -714,7 +718,7 @@ int cDvbDevice::NumAudioTracksDevice(void) const
   int n = 0;
   if (aPid1)
      n++;
-  if (Ca() <= MAXDEVICES && aPid2 && aPid1 != aPid2) // a Ca recording session blocks switching live audio tracks
+  if (Ca() <= MAXDEVICES && aPid2 && aPid1 != aPid2) // a CA recording session blocks switching live audio tracks
      n++;
   return n;
 }
@@ -746,7 +750,7 @@ bool cDvbDevice::CanReplay(void) const
   if (Receiving())
      return false;
 #endif
-  return cDevice::CanReplay() && Ca() <= MAXDEVICES; // we can only replay if there is no Ca recording going on
+  return cDevice::CanReplay() && (Ca() <= MAXDEVICES || ciHandler); // with non-LL-firmware we can only replay if there is no CA recording going on
 }
 
 bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
@@ -775,15 +779,11 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
          if (siProcessor)
             siProcessor->SetStatus(true);
-         if (ciHandler)
-            ciHandler->SetEnabled(true);
          break;
     case pmAudioVideo:
     case pmAudioOnlyBlack:
          if (siProcessor)
             siProcessor->SetStatus(false);
-         if (ciHandler)
-            ciHandler->SetEnabled(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
          CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
@@ -794,8 +794,6 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
     case pmAudioOnly:
          if (siProcessor)
             siProcessor->SetStatus(false);
-         if (ciHandler)
-            ciHandler->SetEnabled(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_STOP, true));
          CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
@@ -807,8 +805,6 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
     case pmExtern_THIS_SHOULD_BE_AVOIDED:
          if (siProcessor)
             siProcessor->SetStatus(false);
-         if (ciHandler)
-            ciHandler->SetEnabled(false);
          close(fd_video);
          close(fd_audio);
          fd_video = fd_audio = -1;
diff --git a/eit.c b/eit.c
index ff5dd42fd..2bab1a51e 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.68 2003/04/12 11:27:31 kls Exp $
+ * $Id: eit.c 1.72 2003/04/21 13:21:54 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1002,34 +1002,38 @@ bool cEIT::IsPresentFollowing()
 // --- cCaDescriptor ---------------------------------------------------------
 
 class cCaDescriptor : public cListObject {
-  friend class cCaDescriptors;
+  friend class cSIProcessor;
 private:
   int source;
   int transponder;
   int serviceId;
   int caSystem;
+  unsigned int providerId;
+  int caPid;
   int length;
   uchar *data;
 public:
-  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int CaPid, int Length, uchar *Data);
+  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, unsigned int ProviderId, int CaPid, int Length, uchar *Data);
   virtual ~cCaDescriptor();
   int Length(void) const { return length; }
   const uchar *Data(void) const { return data; }
   };
 
-cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, int CaPid, int Length, uchar *Data)
+cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, unsigned int ProviderId, int CaPid, int Length, uchar *Data)
 {
   source = Source;
   transponder = Transponder;
   serviceId = ServiceId;
   caSystem = CaSystem;
+  providerId = ProviderId;
+  caPid = CaPid;
   length = Length + 6;
   data = MALLOC(uchar, length);
   data[0] = DESCR_CA;
   data[1] = length - 2;
   data[2] = (caSystem >> 8) & 0xFF;
   data[3] =  caSystem       & 0xFF;
-  data[4] = ((CaPid   >> 8) & 0xFF) | 0xE0;
+  data[4] = ((CaPid   >> 8) & 0x1F) | 0xE0;
   data[5] =   CaPid         & 0xFF;
   if (Length)
      memcpy(&data[6], Data, Length);
@@ -1037,7 +1041,7 @@ cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaS
 #ifdef DEBUG_CA_DESCRIPTORS
   char buffer[1024];
   char *q = buffer;
-  q += sprintf(q, "CAM: %04X %5d %4d", source, transponder, serviceId);
+  q += sprintf(q, "CAM: %04X %5d %5d %04X %6X %04X -", source, transponder, serviceId, caSystem, providerId, caPid);
   for (int i = 0; i < length; i++)
       q += sprintf(q, " %02X", data[i]);
   dsyslog(buffer);
@@ -1049,26 +1053,6 @@ cCaDescriptor::~cCaDescriptor()
   free(data);
 }
 
-// --- cCaDescriptors --------------------------------------------------------
-
-class cCaDescriptors : public cList<cCaDescriptor> {
-public:
-  const cCaDescriptor *Get(int Source, int Transponder, int ServiceId, int CaSystem);
-  };
-
-const cCaDescriptor *cCaDescriptors::Get(int Source, int Transponder, int ServiceId, int CaSystem)
-{
-  for (cCaDescriptor *ca = First(); ca; ca = Next(ca)) {
-      if (ca->source == Source && ca->transponder == Transponder && ca->serviceId == ServiceId) {
-         if (CaSystem == -1 || ca->caSystem == CaSystem)
-            return ca;
-         if (CaSystem < 0)
-            CaSystem++;
-         }
-      }
-  return NULL;
-}
-
 // --- cSIProcessor ----------------------------------------------------------
 
 #define MAX_FILTERS 20
@@ -1077,7 +1061,7 @@ const cCaDescriptor *cCaDescriptors::Get(int Source, int Transponder, int Servic
 int cSIProcessor::numSIProcessors = 0;
 cSchedules *cSIProcessor::schedules = NULL;
 cMutex cSIProcessor::schedulesMutex;
-cCaDescriptors *cSIProcessor::caDescriptors = NULL;
+cList<cCaDescriptor> cSIProcessor::caDescriptors;
 cMutex cSIProcessor::caDescriptorsMutex;
 const char *cSIProcessor::epgDataFileName = EPGDATAFILENAME;
 time_t cSIProcessor::lastDump = time(NULL);
@@ -1094,7 +1078,6 @@ cSIProcessor::cSIProcessor(const char *FileName)
    filters = NULL;
    if (!numSIProcessors++) { // the first one creates them
       schedules = new cSchedules;
-      caDescriptors = new cCaDescriptors;
       }
    filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
    SetStatus(true);
@@ -1111,7 +1094,6 @@ cSIProcessor::~cSIProcessor()
    free(filters);
    if (!--numSIProcessors) { // the last one deletes them
       delete schedules;
-      delete caDescriptors;
       }
    free(fileName);
 }
@@ -1176,12 +1158,9 @@ void cSIProcessor::SetStatus(bool On)
       AddFilter(0x00, 0x00);  // PAT
       AddFilter(0x14, 0x70);  // TDT
       AddFilter(0x14, 0x73);  // TOT
-      AddFilter(0x12, 0x4e);  // event info, actual TS, present/following
-      AddFilter(0x12, 0x4f);  // event info, other TS, present/following
-      AddFilter(0x12, 0x50);  // event info, actual TS, schedule
-      AddFilter(0x12, 0x60);  // event info, other TS, schedule
-      AddFilter(0x12, 0x51);  // event info, actual TS, schedule for another 4 days
-      AddFilter(0x12, 0x61);  // event info, other TS, schedule for another 4 days
+      AddFilter(0x12, 0x4e, 0xfe);  // event info, actual(0x4e)/other(0x4f) TS, present/following
+      AddFilter(0x12, 0x50, 0xfe);  // event info, actual TS, schedule(0x50)/schedule for another 4 days(0x51)
+      AddFilter(0x12, 0x60, 0xfe);  // event info, other  TS, schedule(0x60)/schedule for another 4 days(0x61)
    }
 }
 
@@ -1351,7 +1330,7 @@ void cSIProcessor::Action()
 
 /** Add a filter with packet identifier pid and
 table identifer tid */
-bool cSIProcessor::AddFilter(unsigned short pid, u_char tid)
+bool cSIProcessor::AddFilter(unsigned short pid, u_char tid, u_char mask)
 {
    dmx_sct_filter_params sctFilterParams;
    memset(&sctFilterParams, 0, sizeof(sctFilterParams));
@@ -1359,7 +1338,7 @@ bool cSIProcessor::AddFilter(unsigned short pid, u_char tid)
    sctFilterParams.timeout = 0;
    sctFilterParams.flags = DMX_IMMEDIATE_START;
    sctFilterParams.filter.filter[0] = tid;
-   sctFilterParams.filter.mask[0] = 0xFF;
+   sctFilterParams.filter.mask[0] = mask;
 
    for (int a = 0; a < MAX_FILTERS; a++)
    {
@@ -1443,36 +1422,40 @@ void cSIProcessor::TriggerDump(void)
   lastDump = 0;
 }
 
-void cSIProcessor::NewCaDescriptor(struct Descriptor *d, int ProgramID)
+void cSIProcessor::NewCaDescriptor(struct Descriptor *d, int ServiceId)
 {
   if (DescriptorTag(d) == DESCR_CA) {
      struct CaDescriptor *cd = (struct CaDescriptor *)d;
-     if (!caDescriptors->Get(currentSource, currentTransponder, ProgramID, cd->CA_type)) {
-        cMutexLock MutexLock(&caDescriptorsMutex);
-        caDescriptors->Add(new cCaDescriptor(currentSource, currentTransponder, ProgramID, cd->CA_type, cd->CA_PID, cd->DataLength, cd->Data));
-        }
+     cMutexLock MutexLock(&caDescriptorsMutex);
+
+     for (cCaDescriptor *ca = caDescriptors.First(); ca; ca = caDescriptors.Next(ca)) {
+         if (ca->source == currentSource && ca->transponder == currentTransponder && ca->serviceId == ServiceId && ca->caSystem == cd->CA_type && ca->providerId == cd->ProviderID && ca->caPid == cd->CA_PID)
+            return;
+         }
+     caDescriptors.Add(new cCaDescriptor(currentSource, currentTransponder, ServiceId, cd->CA_type, cd->ProviderID, cd->CA_PID, cd->DataLength, cd->Data));
      //XXX update???
      }
 }
 
-int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data)
+int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data)
 {
+  if (!CaSystemIds || !*CaSystemIds)
+     return 0;
   if (BufSize > 0 && Data) {
      cMutexLock MutexLock(&caDescriptorsMutex);
      int length = 0;
-     for (int i = -1; ; i--) {
-         const cCaDescriptor *d = caDescriptors->Get(Source, Transponder, ServiceId, i);
-         if (d) {
-            if (length + d->Length() <= BufSize) {
-               memcpy(Data + length, d->Data(), d->Length());
-               length += d->Length();
+     do {
+        for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+            if (d->source == Source && d->transponder == Transponder && d->serviceId == ServiceId && d->caSystem == *CaSystemIds) {
+               if (length + d->Length() <= BufSize) {
+                  memcpy(Data + length, d->Data(), d->Length());
+                  length += d->Length();
+                  }
+               else
+                  return -1;
                }
-            else
-               return -1;
             }
-         else
-            break;
-         }
+        } while (*++CaSystemIds);
      return length;
      }
   return -1;
diff --git a/eit.h b/eit.h
index e956b0139..37733340b 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.25 2003/04/12 10:59:26 kls Exp $
+ * $Id: eit.h 1.28 2003/04/21 13:22:06 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -135,14 +135,13 @@ typedef struct sip_filter {
 }SIP_FILTER;
 
 class cCaDescriptor;
-class cCaDescriptors;
 
 class cSIProcessor : public cThread {
 private:
   static int numSIProcessors;
   static cSchedules *schedules;
   static cMutex schedulesMutex;
-  static cCaDescriptors *caDescriptors;
+  static cList<cCaDescriptor> caDescriptors;
   static cMutex caDescriptorsMutex;
   static const char *epgDataFileName;
   static time_t lastDump;
@@ -155,10 +154,10 @@ class cSIProcessor : public cThread {
   char *fileName;
   bool active;
   void Action(void);
-  bool AddFilter(unsigned short pid, u_char tid);
+  bool AddFilter(unsigned short pid, u_char tid, u_char mask = 0xFF);
   bool DelFilter(unsigned short pid, u_char tid);
   bool ShutDownFilters(void);
-  void NewCaDescriptor(struct Descriptor *d, int ProgramID);
+  void NewCaDescriptor(struct Descriptor *d, int ServiceId);
 public:
   cSIProcessor(const char *FileName);
   ~cSIProcessor();
@@ -168,10 +167,11 @@ class cSIProcessor : public cThread {
          // Caller must provide a cMutexLock which has to survive the entire
          // time the returned cSchedules is accessed. Once the cSchedules is no
          // longer used, the cMutexLock must be destroyed.
-  static int GetCaDescriptors(int Source, int Transponder, int ServiceId, int BufSize, uchar *Data);
+  static int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data);
          ///< Gets all CA descriptors for a given channel.
          ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
-         ///< into the provided buffer at Data (at most BufSize bytes).
+         ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
+         ///< are copied that match one of the given CA system IDs.
          ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
          ///< available), or -1 if BufSize was too small to hold all CA descriptors.
   static bool Read(FILE *f = NULL);
diff --git a/i18n.c b/i18n.c
index 506e0a57b..efeb869bd 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.105 2003/04/12 09:39:35 kls Exp $
+ * $Id: i18n.c 1.106 2003/04/21 14:05:17 kls Exp $
  *
  * Translations provided by:
  *
@@ -3411,6 +3411,22 @@ const tI18nPhrase Phrases[] = {
     "Caut inregistrari...",
     "Felvett ad�sok b�ng�sz�se...",
   },
+  { "Pausing live video...",
+    "Live-Signal wird angehalten...",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
     "",// TODO
diff --git a/menu.c b/menu.c
index e63d70779..4b7136bc6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.235 2003/04/12 09:40:48 kls Exp $
+ * $Id: menu.c 1.237 2003/04/21 14:57:13 kls Exp $
  */
 
 #include "menu.h"
@@ -1636,7 +1636,7 @@ cOsdObject *CamControl(void)
       cDevice *Device = cDevice::GetDevice(d);
       if (Device) {
          cCiHandler *CiHandler = Device->CiHandler();
-         if (CiHandler) {
+         if (CiHandler && CiHandler->HasUserIO()) {
             cCiMenu *CiMenu = CiHandler->GetMenu();
             if (CiMenu)
                return new cMenuCam(CiMenu);
@@ -2488,7 +2488,7 @@ void cMenuMain::Set(const char *Plugin)
 
   // Color buttons:
 
-  SetHelp(tr("Record"), cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, NULL, replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(tr("Record"), cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -2560,6 +2560,9 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                    }
                                 }
                              break;
+               case kYellow: if (!HasSubMenu())
+                                state = osPause;
+                             break;
                case kBlue:   if (!HasSubMenu())
                                 state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
                              break;
@@ -2936,6 +2939,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   if (device->AttachReceiver(recorder)) {
      Recording.WriteSummary();
      cStatus::MsgRecording(device, Recording.Name());
+     if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
+        cReplayControl::SetRecording(fileName, Recording.Name());
      }
   else
      DELETENULL(recorder);
@@ -3073,6 +3078,26 @@ bool cRecordControls::StopPrimary(bool DoIt)
   return false;
 }
 
+bool cRecordControls::PauseLiveVideo(void)
+{
+  Interface->Open(Setup.OSDwidth, -1);
+  Interface->Status(tr("Pausing live video..."));
+  Interface->Flush();
+  cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
+  if (Start()) {
+     sleep(2); // allow recorded file to fill up enough to start replaying
+     cReplayControl *rc = new cReplayControl;
+     cControl::Launch(rc);
+     cControl::Attach();
+     sleep(1); // allow device to replay some frames, so we have a picture
+     Interface->Close();
+     rc->ProcessKey(kPause); // pause, allowing replay mode display
+     return true;
+     }
+  Interface->Close();
+  return false;
+}
+
 const char *cRecordControls::GetInstantId(const char *LastInstantId)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
diff --git a/menu.h b/menu.h
index 43a0d8f92..fab74a7f5 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.53 2003/01/12 14:54:05 kls Exp $
+ * $Id: menu.h 1.54 2003/04/21 13:40:45 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -135,6 +135,7 @@ class cRecordControls {
   static void Stop(const char *InstantId);
   static void Stop(cDevice *Device);
   static bool StopPrimary(bool DoIt = false);
+  static bool PauseLiveVideo(void);
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
   static void Process(time_t t);
diff --git a/osd.h b/osd.h
index 5f1ec96fc..ffce583f0 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.38 2002/12/08 12:21:26 kls Exp $
+ * $Id: osd.h 1.39 2003/04/21 10:27:41 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -30,6 +30,7 @@ enum eOSState { osUnknown,
                 osPlugin,
                 osSetup,
                 osCommands,
+                osPause,
                 osRecord,
                 osReplay,
                 osStopRecord,
diff --git a/vdr.c b/vdr.c
index 3f0a7f0d7..a160e4cf8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.149 2003/04/12 13:57:45 kls Exp $
+ * $Id: vdr.c 1.150 2003/04/21 14:41:41 kls Exp $
  */
 
 #include <getopt.h>
@@ -553,6 +553,26 @@ int main(int argc, char *argv[])
                cDisplayVolume::Process(key);
                key = kNone; // nobody else needs to see these keys
                break;
+          // Pausing live video:
+          case kPause:
+               if (!cControl::Control()) {
+                  DELETENULL(Menu);
+                  Temp = NULL;
+                  if (!cRecordControls::PauseLiveVideo())
+                     Interface->Error(tr("No free DVB device to record!"));
+                  key = kNone; // nobody else needs to see this key
+                  }
+               break;
+          // Instant recording:
+          case kRecord:
+               if (!cControl::Control()) {
+                  if (cRecordControls::Start())
+                     ;//XXX Interface->Info(tr("Recording"));
+                  else
+                     Interface->Error(tr("No free DVB device to record!"));
+                  key = kNone; // nobody else needs to see this key
+                  }
+               break;
           // Power off:
           case kPower: isyslog("Power button pressed");
                        DELETENULL(Menu);
@@ -577,6 +597,12 @@ int main(int argc, char *argv[])
            if (state == osUnknown && ISMODELESSKEY(key) && cControl::Control() && Interact != cControl::Control())
               state = cControl::Control()->ProcessKey(key);
            switch (state) {
+             case osPause:  DELETENULL(Menu);
+                            cControl::Shutdown(); // just in case
+                            Temp = NULL;
+                            if (!cRecordControls::PauseLiveVideo())
+                               Interface->Error(tr("No free DVB device to record!"));
+                            break;
              case osRecord: DELETENULL(Menu);
                             Temp = NULL;
                             if (cRecordControls::Start())
@@ -652,13 +678,6 @@ int main(int argc, char *argv[])
                   break;
              // Viewing Control:
              case kOk:   LastChannel = -1; break; // forces channel display
-             // Instant recording:
-             case kRecord:
-                  if (cRecordControls::Start())
-                     ;//XXX Interface->Info(tr("Recording"));
-                  else
-                     Interface->Error(tr("No free DVB device to record!"));
-                  break;
              // Key macros:
              case kRed:
              case kGreen:

From 0686038af36be65b666bce669957c4d94c13f409 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Apr 2003 18:00:00 +0200
Subject: [PATCH 070/307] Version 1.1.29 - Fixed detecting broken connection to
 the LIRC daemon (thanks to Ludwig Nussel). - Now sending CA descriptors to
 the CAM in the same sequence as they were originally   received (thanks to
 Stefan Huelswitt). - The PCR PID can now be set separately from the video
 PID. The syntax in the   'channels.conf' file is, for example,
 ...:164+17:..., where 164 is the video PID   and 17 is the PCR PID. The
 separator is a '+' sign, not a comma or semicolon as   with the audio PIDs,
 because this is not an alternate PID, but rather an   additional, necessary
 PID. In order to use this feature you need a driver version   dated
 2003-04-27 or higher (setting the PCR PID didn't work in earlier versions). -
 Fixed deleting the last recording in the "Recordings" menu, which started
 pausing   live video (thanks to Christoph Friederich for reporting this one).
 - Now setting the "broken link" flag for GOPs at the beginning of a new video
   sequence, which avoids artefacts when cutting (thanks to Stefan Huelswitt).
 - Removed the Mute() call from cDvbDevice::StillPicture() (suggested by
 Andreas   Schultz). - Updated 'channels.conf.terr' for Berlin (thanks to
 Andreas Brachold). - Extended logging info when starting/stopping timers to
 show the channel number,   start/stop time and the file name (suggested by
 Manuel Hartl). - Added a note regarding non-VDR files in the /videoX
 directories to INSTALL   (suggested by Benjamin Harling). - Skipping keys
 that come in too fast from LIRC (thanks to Christian Jacobsen). - Avoiding
 short display of the main menu if a plugin displays its own OSD and   is
 started through a user defined key macro (thanks to Andreas Mair for
 reporting   this one). - Reduced the time to wait for EPG data when starting
 a recording to 3 seconds. - The new SVDRP command STAT can be used to request
 information about the disk   usage (thanks to Thomas Koch). - Fixed faulty
 calculation of section length in eit.c (thanks to Teemu Rantanen).

---
 CONTRIBUTORS       | 28 +++++++++++++++++++++++++++-
 HISTORY            | 31 +++++++++++++++++++++++++++++++
 INSTALL            |  5 +++++
 channels.c         | 28 ++++++++++++++++++++++------
 channels.conf      |  1 +
 channels.conf.terr | 30 +++++++++++++++++++-----------
 channels.h         |  4 +++-
 config.h           |  4 ++--
 cutter.c           |  9 ++++++++-
 device.h           |  4 ++--
 dvbdevice.c        | 12 ++++++------
 dvbplayer.c        | 14 +++++++++++---
 eit.c              | 27 +++++++++++++++------------
 interface.c        |  5 +++--
 lirc.c             | 20 ++++++++++++--------
 menu.c             | 15 +++++++++------
 remote.h           |  3 ++-
 remux.c            | 18 +++++++++++++++++-
 remux.h            |  3 ++-
 ringbuffer.c       | 14 +++++++-------
 ringbuffer.h       | 12 ++++++------
 svdrp.c            | 22 +++++++++++++++++++++-
 svdrp.h            |  3 ++-
 timers.c           |  4 ++--
 vdr.5              |  5 ++++-
 25 files changed, 239 insertions(+), 82 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d05b9282a..37394db79 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -169,6 +169,8 @@ Stefan Huelswitt <huels@iname.com>
  for adapting VDR to 'libdtv' version 0.0.5
  for reporting a bug in handling of Ca parameters with values <= MAXDEVICES, which
  don't indicate an actual encrypted channel
+ for implementing setting the "broken link" flag for GOPs at the beginning of a new
+ video sequence, which avoids artefacts when cutting
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -197,6 +199,7 @@ Andreas Schultz <aschultz@warp10.net>
  cMenuRecordings::Del(), which caused warnings with gcc-3.2
  for suggesting a Make.config file
  for making EIT filtering use masks to reduce the number of filters
+ for suggesting to remove the Mute() call from cDvbDevice::StillPicture()
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -548,11 +551,12 @@ Walter Stroebel <walter.stroebel@lifeline.nl>
 Paul Gohn <pgohn@nexgo.de>
  for adding 'Hrvatska radiotelevizija' and 'RTV Slovenija' to ca.conf
 
-Teemu Rantanen <tvr@iki.fi>
+Teemu Rantanen <teemu.rantanen@tekla.com>
  for increased the maximum possible packet size in remux.c to avoid corrupted streams
  with broadcasters that send extremely large PES packets
  for adding TS error checking to remux.c
  for pinpointing a problem with excessive memmove() calls in 'Transfer Mode'
+ for fixing faulty calculation of section length in eit.c
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
@@ -589,6 +593,28 @@ Ludwig Nussel <ludwig.nussel@web.de>
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+ for implementing the SVDRP command STAT
 
 Stefan Hu�feldt <vdr@marvin.on-luebeck.de>
  for his help in keeping 'channels.conf.cable' up to date
+
+Christoph Friederich <christoph.friederich@gmx.de>
+ for reporting a bug in deleting the last recording in the "Recordings" menu, which
+ started pausing live video
+
+Andreas Brachold <andy03@deltab.de>
+ for his support in keeping 'channels.conf.terr' up to date
+
+Manuel Hartl <icecep@gmx.net>
+ for suggesting to extend the logging info when starting/stopping timers
+
+Benjamin Harling <benjamin.harling@web.de>
+ for suggesting to add a note regarding non-VDR files in the /videoX directories to
+ INSTALL
+
+Christian Jacobsen <christian.jacobsen@stageholding.de>
+ for making the LIRC interface skip keys that come in too fast
+
+Andreas Mair <Andreas.Mair@linogate.com>
+ for reporting a short display of the main menu if a plugin displays its own OSD and
+ is started through a user defined key macro
diff --git a/HISTORY b/HISTORY
index 439e064e1..16c744745 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2053,3 +2053,34 @@ Video Disk Recorder Revision History
 - Implemented "pause live video". You can now press "Menu/Yellow" or "Pause" on
   your remote control while watching live video to start an instant recording
   of the current programme and immediately start replaying that recording.
+
+2003-04-27: Version 1.1.29
+
+- Fixed detecting broken connection to the LIRC daemon (thanks to Ludwig Nussel).
+- Now sending CA descriptors to the CAM in the same sequence as they were originally
+  received (thanks to Stefan Huelswitt).
+- The PCR PID can now be set separately from the video PID. The syntax in the
+  'channels.conf' file is, for example, ...:164+17:..., where 164 is the video PID
+  and 17 is the PCR PID. The separator is a '+' sign, not a comma or semicolon as
+  with the audio PIDs, because this is not an alternate PID, but rather an
+  additional, necessary PID. In order to use this feature you need a driver version
+  dated 2003-04-27 or higher (setting the PCR PID didn't work in earlier versions).
+- Fixed deleting the last recording in the "Recordings" menu, which started pausing
+  live video (thanks to Christoph Friederich for reporting this one).
+- Now setting the "broken link" flag for GOPs at the beginning of a new video
+  sequence, which avoids artefacts when cutting (thanks to Stefan Huelswitt).
+- Removed the Mute() call from cDvbDevice::StillPicture() (suggested by Andreas
+  Schultz).
+- Updated 'channels.conf.terr' for Berlin (thanks to Andreas Brachold).
+- Extended logging info when starting/stopping timers to show the channel number,
+  start/stop time and the file name (suggested by Manuel Hartl).
+- Added a note regarding non-VDR files in the /videoX directories to INSTALL
+  (suggested by Benjamin Harling).
+- Skipping keys that come in too fast from LIRC (thanks to Christian Jacobsen).
+- Avoiding short display of the main menu if a plugin displays its own OSD and
+  is started through a user defined key macro (thanks to Andreas Mair for reporting
+  this one).
+- Reduced the time to wait for EPG data when starting a recording to 3 seconds.
+- The new SVDRP command STAT can be used to request information about the disk
+  usage (thanks to Thomas Koch).
+- Fixed faulty calculation of section length in eit.c (thanks to Teemu Rantanen).
diff --git a/INSTALL b/INSTALL
index ce5420a3c..11efa224b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -278,6 +278,11 @@ with the name of the basic directory when running 'vdr':
 
    vdr -v /video0
 
+Note that you should not copy any non-VDR files into the /videoX directories,
+since this might cause the watchdog timer to expire when VDR cleans up those
+directories and there is a large number of files and/or subdirectories in
+there.
+
 Configuration files:
 --------------------
 
diff --git a/channels.c b/channels.c
index 1e3d9c78b..c68b4ee3e 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.11 2002/11/29 14:10:46 kls Exp $
+ * $Id: channels.c 1.12 2003/04/26 09:57:48 kls Exp $
  */
 
 #include "channels.h"
@@ -164,6 +164,7 @@ cChannel::cChannel(void)
   source       = cSource::FromString("S19.2E");
   srate        = 27500;
   vpid         = 255;
+  ppid         = 0;
   apid1        = 256;
   apid2        = 0;
   dpid1        = 257;
@@ -286,8 +287,14 @@ const char *cChannel::ToText(cChannel *Channel)
         asprintf(&buffer, ":%s\n", s);
      }
   else {
+     char vpidbuf[32];
+     char *q = vpidbuf;
+     q += snprintf(q, sizeof(vpidbuf), "%d", Channel->vpid);
+     if (Channel->ppid)
+        q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
+     *q = 0;
      char apidbuf[32];
-     char *q = apidbuf;
+     q = apidbuf;
      q += snprintf(q, sizeof(apidbuf), "%d", Channel->apid1);
      if (Channel->apid2)
         q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->apid2);
@@ -296,7 +303,7 @@ const char *cChannel::ToText(cChannel *Channel)
      if (Channel->dpid2)
         q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%d:%s:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, Channel->ca, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -326,8 +333,9 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
      char *namebuf = NULL;
      char *sourcebuf = NULL;
      char *parambuf = NULL;
+     char *vpidbuf = NULL;
      char *apidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%d :%a[^:]:%d :%d :%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpid, &apidbuf, &tpid, &ca, &sid, &nid, &tid, &rid);
+     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%a[^:]:%a[^:]:%d :%d :%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpid, &ca, &sid, &nid, &tid, &rid);
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
@@ -335,12 +343,19 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            ca = tpid;
            tpid = 0;
            }
+        vpid  = ppid  = 0;
         apid1 = apid2 = 0;
         dpid1 = dpid2 = 0;
         bool ok = false;
-        if (parambuf && sourcebuf && apidbuf) {
+        if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
-           char *p = strchr(apidbuf, ';');
+           char *p = strchr(vpidbuf, '+');
+           if (p)
+              *p++ = 0;
+           sscanf(vpidbuf, "%d", &vpid);
+           if (p)
+              sscanf(p, "%d", &ppid);
+           p = strchr(apidbuf, ';');
            if (p)
               *p++ = 0;
            sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
@@ -350,6 +365,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
         strn0cpy(name, namebuf, MaxChannelName);
         free(parambuf);
         free(sourcebuf);
+        free(vpidbuf);
         free(apidbuf);
         free(namebuf);
         if (!AllowNonUniqueID && Channels.GetByChannelID(GetChannelID())) {
diff --git a/channels.conf b/channels.conf
index 13bc7e789..390975766 100644
--- a/channels.conf
+++ b/channels.conf
@@ -31,6 +31,7 @@ Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004:0:0:0
 Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721:0:0:0
 Sky News:11597:v:S19.2E:22000:305:306:0:0:28707:0:0:0
 Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020:0:0:0
+BVN:12574:h:S19.2E:22000:164+131:96:0:0:5025:0:0:0
 Alice:12610:v:S19.2E:22000:162:96:0:0:12200:0:0:0
 n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:0:0:0
 Al Jazeera:11568:v:S19.2E:22000:55:56:0:0:9021:0:0:0
diff --git a/channels.conf.terr b/channels.conf.terr
index b61831925..548f021cb 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -46,14 +46,22 @@ KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
 oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0
 Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
 : DVB-T Berlin Germany
-PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403:0:0:0
-SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408:0:0:0
-RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405:0:0:0
-RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406:0:0:0
-Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411:0:0:0
-VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418:0:0:0
-KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394:0:0:0
-MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396:0:0:0
-N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401:0:0:0
-N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398:0:0:0
-FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576:0:0:0
+RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:337:338:343:0:16405:0:0:0
+RTL2:506000:I0C23D0M16B8T8G8Y0:T:27500:353:354:359:0:16406:0:0:0
+Super RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:433:434:439:0:16411:0:0:0
+VOX:506000:I0C23D0M16B8T8G8Y0:T:27500:545:546:551:0:16418:0:0:0
+ORB-Fernsehen:522000:I0C23D0M16B8T8G8Y0:T:27500:1101:1102:1104:0:11:0:0:0
+SFB1:522000:I0C23D0M16B8T8G8Y0:T:27500:1201:1202:1204:0:12:0:0:0
+Phoenix:522000:I0C23D0M16B8T8G8Y0:T:27500:1301:1302:1304:0:13:0:0:0
+Das Erste:522000:I0C23D0M16B8T8G8Y0:T:27500:1401:1402:1404:0:14:0:0:0
+ZDF:570000:I0C23D0M16B8T8G8Y0:T:27500:545:546:551:0:514:0:0:0
+ZDFinfokanal:570000:I0C23D0M16B8T8G8Y0:T:27500:561:562:551:0:515:0:0:0
+ZDFdokukanal:570000:I0C23D0M16B8T8G8Y0:T:27500:577:578:551:0:516:0:0:0
+KiKa:570000:I0C23D0M16B8T8G8Y0:T:27500:593:594:599:0:517:0:0:0
+Kabel 1:658000:I0C23D0M16B8T8G8Y0:T:27500:161:162:163:0:16394:0:0:0
+N24:658000:I0C23D0M16B8T8G8Y0:T:27500:225:226:227:0:16398:0:0:0
+ProSieben:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:308:0:16403:0:0:0
+SAT.1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:387:0:16408:0:0:0
+MTV:778000:I0C23D0M16B8T8G8Y0:T:27500:193:194:199:0:16396:0:0:0
+n-tv:778000:I0C23D0M16B8T8G8Y0:T:27500:273:274:279:0:16401:0:0:0
+Eurosport:778000:I0C23D0M16B8T8G8Y0:T:27500:577:578:583:0:16420:0:0:0
diff --git a/channels.h b/channels.h
index b21ed3079..c82fc282a 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.6 2002/11/30 12:59:05 kls Exp $
+ * $Id: channels.h 1.7 2003/04/26 09:15:40 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -65,6 +65,7 @@ class cChannel : public cListObject {
   int source;
   int srate;
   int vpid;
+  int ppid;
   int apid1, apid2;
   int dpid1, dpid2;
   int tpid;
@@ -98,6 +99,7 @@ class cChannel : public cListObject {
   int Source(void) const { return source; }
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
+  int Ppid(void) const { return ppid; }
   int Apid1(void) const { return apid1; }
   int Apid2(void) const { return apid2; }
   int Dpid1(void) const { return dpid1; }
diff --git a/config.h b/config.h
index 94bdcd746..e56689fc2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.153 2003/04/13 14:02:02 kls Exp $
+ * $Id: config.h 1.154 2003/04/21 16:23:15 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.28"
+#define VDRVERSION "1.1.29"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index 234201cd5..5ce0a2c48 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.2 2002/08/11 11:09:23 kls Exp $
+ * $Id: cutter.c 1.3 2003/04/26 15:11:17 kls Exp $
  */
 
 #include "cutter.h"
@@ -77,6 +77,7 @@ void cCuttingThread::Action(void)
      toMarks.Add(0);
      toMarks.Save();
      uchar buffer[MAXFRAMESIZE];
+     bool cutIn = true;
      while (active) {
            uchar FileNumber;
            int FileOffset, Length;
@@ -126,6 +127,11 @@ void cCuttingThread::Action(void)
                  FileSize = 0;
                  }
               LastIFrame = 0;
+
+              if (cutIn) {
+                 cRemux::SetBrokenLink(buffer, Length);
+                 cutIn = false;
+                 }
               }
            if (safe_write(toFile, buffer, Length) < 0) {
               error = "safe_write";
@@ -151,6 +157,7 @@ void cCuttingThread::Action(void)
                  Index = Mark->position;
                  Mark = fromMarks.Next(Mark);
                  CurrentFileNumber = 0; // triggers SetOffset before reading next frame
+                 cutIn = true;
                  if (Setup.SplitEditedFiles) {
                     toFile = toFileName->NextFile();
                     if (toFile < 0) {
diff --git a/device.h b/device.h
index ad876ba86..8ffd49534 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.29 2003/01/03 15:43:48 kls Exp $
+ * $Id: device.h 1.30 2003/04/26 09:49:12 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -188,7 +188,7 @@ class cDevice : public cThread {
   bool active;
   virtual void Action(void);
 protected:
-  enum ePidType { ptAudio, ptVideo, ptTeletext, ptDolby, ptOther };
+  enum ePidType { ptAudio, ptVideo, ptPcr, ptTeletext, ptDolby, ptOther };
   class cPidHandle {
   public:
     int pid;
diff --git a/dvbdevice.c b/dvbdevice.c
index c25ebef46..d66cd767b 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.54 2003/04/19 14:24:25 kls Exp $
+ * $Id: dvbdevice.c 1.56 2003/04/27 09:44:17 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -524,8 +524,8 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
      CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
 }
 
-//                          ptAudio        ptVideo        ptTeletext        ptDolby        ptOther
-dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+//                            ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
+dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_PCR, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
 
 bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
@@ -662,6 +662,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
      DelPid(pidHandles[ptAudio].pid);
      DelPid(pidHandles[ptVideo].pid);
+     DelPid(pidHandles[ptPcr].pid);
      DelPid(pidHandles[ptTeletext].pid);
      DelPid(pidHandles[ptDolby].pid);
      }
@@ -683,7 +684,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (TurnOnLivePIDs) {
      aPid1 = Channel->Apid1();
      aPid2 = Channel->Apid2();
-     if (!(AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
@@ -870,7 +871,6 @@ void cDvbDevice::Mute(void)
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
 {
-  Mute();
 /* Using the VIDEO_STILLPICTURE ioctl call would be the
    correct way to display a still frame, but unfortunately this
    doesn't work with frames from VDR. So let's do pretty much the
@@ -882,7 +882,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
 */
 //#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
 #ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-  videoDisplayStillPicture sp = { (char *)Data, Length };
+  video_still_picture sp = { (char *)Data, Length };
   CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
 #else
 #define MIN_IFRAME 400000
diff --git a/dvbplayer.c b/dvbplayer.c
index f71c69cc2..afd427896 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.19 2003/03/30 12:51:51 kls Exp $
+ * $Id: dvbplayer.c 1.20 2003/04/27 09:55:53 kls Exp $
  */
 
 #include "dvbplayer.h"
 #include <stdlib.h>
 #include "recording.h"
+#include "remux.h"
 #include "ringbuffer.h"
 #include "thread.h"
 #include "tools.h"
@@ -190,6 +191,7 @@ class cDvbPlayer : public cPlayer, cThread {
   bool eof;
   bool active;
   bool running;
+  bool firstPacket;
   ePlayModes playMode;
   ePlayDirs playDir;
   int trickSpeed;
@@ -197,7 +199,7 @@ class cDvbPlayer : public cPlayer, cThread {
   bool canToggleAudioTrack;
   uchar audioTrack;
   cFrame *readFrame;
-  const cFrame *playFrame;
+  cFrame *playFrame;
   void TrickSpeed(int Increment);
   void Empty(void);
   void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
@@ -240,6 +242,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   eof = false;
   active = true;
   running = false;
+  firstPacket = true;
   playMode = pmPlay;
   playDir = pdForward;
   trickSpeed = NORMAL_SPEED;
@@ -307,6 +310,7 @@ void cDvbPlayer::Empty(void)
   ringBuffer->Clear();
   backTrace->Clear();
   DeviceClear();
+  firstPacket = true;
 }
 
 void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
@@ -403,7 +407,7 @@ void cDvbPlayer::Action(void)
   dsyslog("dvbplayer thread started (pid=%d)", getpid());
 
   uchar *b = NULL;
-  const uchar *p = NULL;
+  uchar *p = NULL;
   int pc = 0;
 
   readIndex = Resume();
@@ -510,6 +514,10 @@ void cDvbPlayer::Action(void)
               if (!p) {
                  p = playFrame->Data();
                  pc = playFrame->Count();
+                 if (firstPacket) {
+                    cRemux::SetBrokenLink(p, pc);
+                    firstPacket = false;
+                    }
                  }
               if (p) {
                  int w = PlayVideo(p, pc);
diff --git a/eit.c b/eit.c
index 2bab1a51e..9b2442ccb 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.72 2003/04/21 13:21:54 kls Exp $
+ * $Id: eit.c 1.74 2003/04/27 14:41:36 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1232,7 +1232,7 @@ void cSIProcessor::Action()
                int r = safe_read(filters[a].handle, buf, sizeof(buf));
                if (r > 3) // minimum number of bytes necessary to get section length
                {
-                  int seclen = ((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF) + 3;
+                  int seclen = (((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF)) + 3;
                   int pid = filters[a].pid;
                   if (seclen == r)
                   {
@@ -1444,18 +1444,21 @@ int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, c
   if (BufSize > 0 && Data) {
      cMutexLock MutexLock(&caDescriptorsMutex);
      int length = 0;
-     do {
-        for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
-            if (d->source == Source && d->transponder == Transponder && d->serviceId == ServiceId && d->caSystem == *CaSystemIds) {
-               if (length + d->Length() <= BufSize) {
-                  memcpy(Data + length, d->Data(), d->Length());
-                  length += d->Length();
+     for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+         if (d->source == Source && d->transponder == Transponder && d->serviceId == ServiceId) {
+            const unsigned short *caids = CaSystemIds;
+            do {
+               if (d->caSystem == *caids) {
+                  if (length + d->Length() <= BufSize) {
+                     memcpy(Data + length, d->Data(), d->Length());
+                     length += d->Length();
+                     }
+                  else
+                     return -1;
                   }
-               else
-                  return -1;
-               }
+               } while (*++caids);
             }
-        } while (*++CaSystemIds);
+         }
      return length;
      }
   return -1;
diff --git a/interface.c b/interface.c
index 9245c85f2..6431f911b 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.63 2003/04/12 14:17:49 kls Exp $
+ * $Id: interface.c 1.64 2003/04/27 12:08:52 kls Exp $
  */
 
 #include "interface.h"
@@ -56,7 +56,8 @@ void cInterface::Close(void)
 
 eKeys cInterface::GetKey(bool Wait)
 {
-  Flush();
+  if (!cRemote::HasKeys())
+     Flush();
   if (SVDRP) {
      if (SVDRP->Process())
         Wait = false;
diff --git a/lirc.c b/lirc.c
index b7f5b9367..0774cf812 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.4 2003/04/12 14:37:17 kls Exp $
+ * $Id: lirc.c 1.6 2003/04/27 11:39:47 kls Exp $
  */
 
 #include "lirc.h"
@@ -16,6 +16,7 @@
 
 #define REPEATLIMIT  20 // ms
 #define REPEATDELAY 350 // ms
+#define KEYPRESSDELAY 150 // ms
 
 cLircRemote::cLircRemote(char *DeviceName)
 :cRemote("LIRC")
@@ -64,18 +65,21 @@ void cLircRemote::Action(void)
       bool ready = cFile::FileReady(f, timeout);
       int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
 
-      if (ready) {
-         if (ret <= 21) {
-            esyslog("ERROR: lircd connection lost");
-            close(f);
-            f = -1;
-            break;
-            }
+      if (ready && ret <= 0 ) {
+         esyslog("ERROR: lircd connection lost");
+         close(f);
+         f = -1;
+         break;
+         }
+
+      if (ready && ret > 21) {
          int count;
          char KeyName[LIRC_KEY_BUF];
          sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
          int Now = time_ms();
          if (count == 0) {
+            if (strcmp(KeyName, LastKeyName) == 0 && Now - FirstTime < KEYPRESSDELAY)
+               continue; // skip keys coming in too fast
             if (repeat)
                Put(LastKeyName, false, true);
             strcpy(LastKeyName, KeyName);
diff --git a/menu.c b/menu.c
index 4b7136bc6..341480a58 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.237 2003/04/21 14:57:13 kls Exp $
+ * $Id: menu.c 1.240 2003/04/27 12:50:31 kls Exp $
  */
 
 #include "menu.h"
@@ -28,7 +28,7 @@
 #include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
-#define MAXWAIT4EPGINFO  10 // seconds
+#define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
@@ -575,6 +575,7 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
   Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Ppid"),         &data.ppid,  0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
@@ -2495,8 +2496,10 @@ void cMenuMain::Set(const char *Plugin)
 
 eOSState cMenuMain::ProcessKey(eKeys Key)
 {
+  bool HadSubMenu = HasSubMenu();
   int osdLanguage = Setup.OSDLanguage;
   eOSState state = cOsdMenu::ProcessKey(Key);
+  HadSubMenu |= HasSubMenu();
 
   switch (state) {
     case osSchedule:   return AddSubMenu(new cMenuSchedule);
@@ -2543,10 +2546,10 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                        break;
     default: switch (Key) {
                case kRecord:
-               case kRed:    if (!HasSubMenu())
+               case kRed:    if (!HadSubMenu)
                                 state = osRecord;
                              break;
-               case kGreen:  if (!HasSubMenu()) {
+               case kGreen:  if (!HadSubMenu) {
                                 int CurrentAudioTrack = -1;
                                 const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&CurrentAudioTrack);
                                 if (AudioTracks) {
@@ -2560,10 +2563,10 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                    }
                                 }
                              break;
-               case kYellow: if (!HasSubMenu())
+               case kYellow: if (!HadSubMenu)
                                 state = osPause;
                              break;
-               case kBlue:   if (!HasSubMenu())
+               case kBlue:   if (!HadSubMenu)
                                 state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
                              break;
                default:      break;
diff --git a/remote.h b/remote.h
index f26be1692..9ff95662b 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.25 2003/04/12 14:14:49 kls Exp $
+ * $Id: remote.h 1.26 2003/04/27 12:05:48 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -45,6 +45,7 @@ class cRemote : public cListObject {
   static bool Put(eKeys Key);
   static bool PutMacro(eKeys Key);
   static const char *GetPlugin(void) { return plugin; }
+  static bool HasKeys(void) { return in != out; }
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   };
 
diff --git a/remux.c b/remux.c
index 097b4a55f..c2ded246f 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.14 2003/01/24 17:22:29 kls Exp $
+ * $Id: remux.c 1.15 2003/04/26 15:07:41 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -621,6 +621,7 @@ XXX*/
                         else if (!synced) {
                            if (pt == I_FRAME) {
                               resultDelivered = i; // will drop everything before this position
+                              SetBrokenLink(resultBuffer + i, l);
                               synced = true;
                               }
                            else {
@@ -667,3 +668,18 @@ XXX*/
   return NULL; // no useful data found, wait for more
 }
 
+void cRemux::SetBrokenLink(uchar *Data, int Length)
+{
+  if (Length > 9 && Data[0] == 0 && Data[1] == 0 && Data[2] == 1 && (Data[3] & VIDEO_STREAM_S) == VIDEO_STREAM_S) {
+     for (int i = Data[8] + 9; i < Length - 7; i++) { // +9 to skip video packet header
+         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1 && Data[i + 3] == 0xB8) {
+            if (!(Data[i + 7] & 0x40)) // set flag only if GOP is not closed
+               Data[i + 7] |= 0x20;
+            return;
+            }
+         }
+     dsyslog("SetBrokenLink: no GOP header found in video packet");
+     }
+  else
+     dsyslog("SetBrokenLink: no video packet in frame");
+}
diff --git a/remux.h b/remux.h
index 638a3f9e7..e953001d6 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.9 2002/11/01 10:06:46 kls Exp $
+ * $Id: remux.h 1.10 2003/04/26 14:13:11 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -44,6 +44,7 @@ class cRemux {
   cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
   ~cRemux();
   uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
+  static void SetBrokenLink(uchar *Data, int Length);
   };
 
 #endif // __REMUX_H
diff --git a/ringbuffer.c b/ringbuffer.c
index 9eecbba12..6913c71fc 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.14 2003/02/15 13:21:50 kls Exp $
+ * $Id: ringbuffer.c 1.15 2003/04/27 09:54:32 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -142,9 +142,9 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
   return Count;
 }
 
-const uchar *cRingBufferLinear::Get(int &Count)
+uchar *cRingBufferLinear::Get(int &Count)
 {
-  const uchar *p = NULL;
+  uchar *p = NULL;
   Lock();
   if (getThreadPid < 0)
      getThreadPid = getpid();
@@ -224,7 +224,7 @@ cRingBufferFrame::~cRingBufferFrame()
 void cRingBufferFrame::Clear(void)
 {
   Lock();
-  const cFrame *p;
+  cFrame *p;
   while ((p = Get()) != NULL)
         Drop(p);
   Unlock();
@@ -252,7 +252,7 @@ bool cRingBufferFrame::Put(cFrame *Frame)
   return false;
 }
 
-const cFrame *cRingBufferFrame::Get(void)
+cFrame *cRingBufferFrame::Get(void)
 {
   Lock();
   cFrame *p = head ? head->next : NULL;
@@ -260,13 +260,13 @@ const cFrame *cRingBufferFrame::Get(void)
   return p;
 }
 
-void cRingBufferFrame::Delete(const cFrame *Frame)
+void cRingBufferFrame::Delete(cFrame *Frame)
 {
   currentFill -= Frame->Count();
   delete Frame;
 }
 
-void cRingBufferFrame::Drop(const cFrame *Frame)
+void cRingBufferFrame::Drop(cFrame *Frame)
 {
   Lock();
   if (head) {
diff --git a/ringbuffer.h b/ringbuffer.h
index 9205df7f7..0ce0a4858 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.9 2003/01/26 09:47:39 kls Exp $
+ * $Id: ringbuffer.h 1.10 2003/04/27 09:55:08 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -56,7 +56,7 @@ class cRingBufferLinear : public cRingBuffer {
   int Put(const uchar *Data, int Count);
     ///< Puts at most Count bytes of Data into the ring buffer.
     ///< \return Returns the number of bytes actually stored.
-  const uchar *Get(int &Count);
+  uchar *Get(int &Count);
     ///< Gets data from the ring buffer.
     ///< The data will remain in the buffer until a call to Del() deletes it.
     ///< \return Returns a pointer to the data, and stores the number of bytes
@@ -83,7 +83,7 @@ class cFrame {
     ///< If Count is negative, the cFrame object will take ownership of the given
     ///< Data. Otherwise it will allocate Count bytes of memory and copy Data.
   ~cFrame();
-  const uchar *Data(void) const { return data; }
+  uchar *Data(void) const { return data; }
   int Count(void) const { return count; }
   eFrameType Type(void) const { return type; }
   int Index(void) const { return index; }
@@ -93,7 +93,7 @@ class cRingBufferFrame : public cRingBuffer {
 private:
   cFrame *head;
   int currentFill;
-  void Delete(const cFrame *Frame);
+  void Delete(cFrame *Frame);
 public:
   cRingBufferFrame(int Size, bool Statistics = false);
   virtual ~cRingBufferFrame();
@@ -103,10 +103,10 @@ class cRingBufferFrame : public cRingBuffer {
   bool Put(cFrame *Frame);
     // Puts the Frame into the ring buffer.
     // Returns true if this was possible.
-  const cFrame *Get(void);
+  cFrame *Get(void);
     // Gets the next frame from the ring buffer.
     // The actual data still remains in the buffer until Drop() is called.
-  void Drop(const cFrame *Frame);
+  void Drop(cFrame *Frame);
     // Drops the Frame that has just been fetched with Get().
   };
 
diff --git a/svdrp.c b/svdrp.c
index 102abe0dc..6dafddd15 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.50 2002/12/22 14:04:08 kls Exp $
+ * $Id: svdrp.c 1.51 2003/04/27 14:21:07 kls Exp $
  */
 
 #include "svdrp.h"
@@ -33,6 +33,7 @@
 #include "remote.h"
 #include "timers.h"
 #include "tools.h"
+#include "videodir.h"
 
 // --- cSocket ---------------------------------------------------------------
 
@@ -250,6 +251,8 @@ const char *HelpPages[] = {
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
   "    by itself terminates the input and starts processing of the data (all\n"
   "    entered data is buffered until the terminating '.' is seen).",
+  "STAT disk\n"
+  "    Return information about disk usage (total, free, percent).",
   "UPDT <settings>\n"
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
@@ -929,6 +932,22 @@ void cSVDRP::CmdPUTE(const char *Option)
      DELETENULL(PUTEhandler);
 }
 
+void cSVDRP::CmdSTAT(const char *Option)
+{
+  if (*Option) {
+     if (strcasecmp(Option, "DISK") == 0) {
+        int FreeMB;
+        int Percent = VideoDiskSpace(&FreeMB);
+        int Total = (FreeMB / (100 - Percent)) * 100;
+        Reply(250, "%dMB %dMB %d%%", Total, FreeMB, Percent);
+        }
+     else
+        Reply(501, "Invalid Option \"%s\"", Option);
+     }
+  else
+     Reply(501, "No option given");
+}
+
 void cSVDRP::CmdUPDT(const char *Option)
 {
   if (*Option) {
@@ -1021,6 +1040,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
+  else if (CMD("STAT"))  CmdSTAT(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("VOLU"))  CmdVOLU(s);
   else if (CMD("QUIT"))  Close();
diff --git a/svdrp.h b/svdrp.h
index 1052d6337..67918ed5a 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.18 2002/11/30 14:36:04 kls Exp $
+ * $Id: svdrp.h 1.19 2003/04/27 14:09:59 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -73,6 +73,7 @@ class cSVDRP {
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
   void CmdPUTE(const char *Option);
+  void CmdSTAT(const char *Option);
   void CmdUPDT(const char *Option);
   void CmdVOLU(const char *Option);
   void Execute(char *Cmd);
diff --git a/timers.c b/timers.c
index 8e2bead32..8c982e2db 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.3 2002/11/24 14:29:21 kls Exp $
+ * $Id: timers.c 1.4 2003/04/27 11:11:45 kls Exp $
  */
 
 #include "timers.h"
@@ -336,7 +336,7 @@ time_t cTimer::StopTime(void)
 void cTimer::SetRecording(bool Recording)
 {
   recording = Recording;
-  isyslog("timer %d %s", Index() + 1, recording ? "start" : "stop");
+  isyslog("timer %d (%d %04d-%04d '%s') %s", Index() + 1, Channel()->Number(), start, stop, file, recording ? "start" : "stop");
 }
 
 void cTimer::SetPending(bool Pending)
diff --git a/vdr.5 b/vdr.5
index 8b833a23d..513bd5ddf 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.17 2002/12/08 14:35:12 kls Exp $
+.\" $Id: vdr.5 1.18 2003/04/26 11:54:35 kls Exp $
 .\"
 .TH vdr 5 "6 Dec 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -105,6 +105,9 @@ The symbol rate of this channel (DVB-S and DVB-C only).
 .TP
 .B VPID
 The video PID (set to '0' for radio channels, '1' for encrypted radio channels).
+If this channel uses a separate PCR PID, it follows the VPID, separated by a
+plus sign, as in
+.B ...:164+17:...
 .TP
 .B APID
 The audio PID (either one number, or two, separated by a comma).

From af2a135212088f0cba6bd8f98544b271c2f71bef Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 May 2003 18:00:00 +0200
Subject: [PATCH 071/307] =?UTF-8?q?Version=201.1.30=20-=20Fixed=20minimum?=
 =?UTF-8?q?=20lifespan=20of=20deleted=20recordings=20(thanks=20to=20Jaakko?=
 =?UTF-8?q?=20Hyv=C3=A4tti).=20-=20Updated=20French=20OSD=20texts=20(thank?=
 =?UTF-8?q?s=20to=20Olivier=20Jacques).=20-=20Fixed=20paging=20through=20l?=
 =?UTF-8?q?ists=20with=20repeated=20Left/Right=20keys.=20-=20Fixed=20setti?=
 =?UTF-8?q?ng=20the=20PCR-PID=20in=20case=20it=20is=20equal=20to=20one=20o?=
 =?UTF-8?q?f=20the=20other=20PIDs=20(thanks=20=20=20to=20Oliver=20Endriss?=
 =?UTF-8?q?=20for=20reporting=20this=20one).=20-=20Fixed=20double=20call?=
 =?UTF-8?q?=20to=20MainMenuAction()=20of=20a=20plugin=20if=20invoked=20via?=
 =?UTF-8?q?=20a=20hotkey=20(thanks=20=20=20to=20Kai=20Moeller=20for=20repo?=
 =?UTF-8?q?rting=20this=20one).=20-=20Fixed=20handling=20dedicated=20keys.?=
 =?UTF-8?q?=20-=20Now=20turning=20off=20live=20PIDs=20when=20replaying.=20?=
 =?UTF-8?q?This=20avoids=20short=20spikes=20from=20other=20=20=20channels?=
 =?UTF-8?q?=20when=20switching=20between=20Transfer=20Mode=20channels,=20a?=
 =?UTF-8?q?nd=20also=20lets=20an=20ongoing=20=20=20replay=20continue=20eve?=
 =?UTF-8?q?n=20if=20a=20recording=20is=20started=20on=20the=20primary=20de?=
 =?UTF-8?q?vice.=20-=20The=20RCU=20channel=20display=20no=20longer=20chang?=
 =?UTF-8?q?es=20when=20a=20recording=20on=20a=20different=20=20=20channel?=
 =?UTF-8?q?=20starts=20on=20the=20primary=20device.=20-=20Restoring=20the?=
 =?UTF-8?q?=20current=20channel=20in=20case=20a=20recording=20has=20switch?=
 =?UTF-8?q?ed=20the=20transponder.=20=20=20If=20all=20devices=20are=20busy?=
 =?UTF-8?q?=20and=20none=20of=20them=20can=20provide=20the=20current=20cha?=
 =?UTF-8?q?nnel,=20the=20=20=20message=20"Channel=20not=20available!"=20wi?=
 =?UTF-8?q?ll=20be=20displayed.=20-=20Removed=20the=20(no=20longer=20neces?=
 =?UTF-8?q?sary)=20'panic'=20stuff=20from=20cThread.=20-=20Added=20cStatus?=
 =?UTF-8?q?::OsdItem()=20to=20provide=20the=20entire=20list=20of=20menu=20?=
 =?UTF-8?q?items=20to=20a=20plugin=20=20=20(thanks=20to=20Carsten=20Siebho?=
 =?UTF-8?q?lz).=20-=20The=20red=20("Record")=20and=20yellow=20("Pause")=20?=
 =?UTF-8?q?button=20in=20the=20"Main"=20menu=20are=20no=20longer=20=20=20a?=
 =?UTF-8?q?vailable=20when=20replaying.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  | 14 ++++++++++-
 HISTORY       | 24 ++++++++++++++++++
 channels.conf | 10 ++++----
 config.h      |  4 +--
 device.c      | 70 ++++++++++++++++++++++++++++-----------------------
 device.h      | 10 ++++----
 dvbdevice.c   | 55 +++++++++++++++++++---------------------
 dvbdevice.h   |  3 ++-
 i18n.c        | 46 ++++++++++++++++-----------------
 menu.c        |  8 +++---
 osd.c         | 10 ++++++--
 rcu.c         |  4 +--
 recording.c   |  4 +--
 remote.c      | 22 ++++++++++++----
 remote.h      |  6 ++---
 status.c      |  8 +++++-
 status.h      |  5 +++-
 thread.c      | 23 +----------------
 thread.h      |  5 +---
 vdr.1         | 11 +++++---
 vdr.c         | 20 ++++++++++-----
 21 files changed, 210 insertions(+), 152 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 37394db79..f96e444f9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -460,6 +460,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for making the "Left" and "Right" buttons set the cursor to the first or last
  list item even if the list consist only of a single page, like, for instance,
  the Main menu
+ for reporting a bug in setting the PCR-PID in case it is equal to one of the other
+ PIDs
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -495,6 +497,7 @@ Jaakko Hyv
  for adding a check if there is a connection to the keyboard
  for fixing recording overlapping timers on the same channel in case
  DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and/or DO_MULTIPLE_RECORDINGS is not defined
+ for fixing the minimum lifespan of deleted recordings
 
 Dennis Noordsij <dennis.noordsij@wiral.com>
  for reporting a small glitch when switching channels
@@ -551,7 +554,7 @@ Walter Stroebel <walter.stroebel@lifeline.nl>
 Paul Gohn <pgohn@nexgo.de>
  for adding 'Hrvatska radiotelevizija' and 'RTV Slovenija' to ca.conf
 
-Teemu Rantanen <teemu.rantanen@tekla.com>
+Teemu Rantanen <tvr@iki.fi>
  for increased the maximum possible packet size in remux.c to avoid corrupted streams
  with broadcasters that send extremely large PES packets
  for adding TS error checking to remux.c
@@ -618,3 +621,12 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
  is started through a user defined key macro
+
+Olivier Jacques <jacquesolivier@hotmail.com>)
+ for translating OSD texts to the French language
+
+Kai Moeller <moeller.ki@gmx.de>
+ for reporting a double call to MainMenuAction() of a plugin if invoked via a hotkey
+
+Carsten Siebholz <c.siebholz@t-online.de>
+ for adding cStatus::OsdItem() to provide the entire list of menu items to a plugin
diff --git a/HISTORY b/HISTORY
index 16c744745..c436fdbe4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2084,3 +2084,27 @@ Video Disk Recorder Revision History
 - The new SVDRP command STAT can be used to request information about the disk
   usage (thanks to Thomas Koch).
 - Fixed faulty calculation of section length in eit.c (thanks to Teemu Rantanen).
+
+2003-05-04: Version 1.1.30
+
+- Fixed minimum lifespan of deleted recordings (thanks to Jaakko Hyv�tti).
+- Updated French OSD texts (thanks to Olivier Jacques).
+- Fixed paging through lists with repeated Left/Right keys.
+- Fixed setting the PCR-PID in case it is equal to one of the other PIDs (thanks
+  to Oliver Endriss for reporting this one).
+- Fixed double call to MainMenuAction() of a plugin if invoked via a hotkey (thanks
+  to Kai Moeller for reporting this one).
+- Fixed handling dedicated keys.
+- Now turning off live PIDs when replaying. This avoids short spikes from other
+  channels when switching between Transfer Mode channels, and also lets an ongoing
+  replay continue even if a recording is started on the primary device.
+- The RCU channel display no longer changes when a recording on a different
+  channel starts on the primary device.
+- Restoring the current channel in case a recording has switched the transponder.
+  If all devices are busy and none of them can provide the current channel, the
+  message "Channel not available!" will be displayed.
+- Removed the (no longer necessary) 'panic' stuff from cThread.
+- Added cStatus::OsdItem() to provide the entire list of menu items to a plugin
+  (thanks to Carsten Siebholz).
+- The red ("Record") and yellow ("Pause") button in the "Main" menu are no longer
+  available when replaying.
diff --git a/channels.conf b/channels.conf
index 390975766..fb73f5700 100644
--- a/channels.conf
+++ b/channels.conf
@@ -50,13 +50,13 @@ B1:12110:h:S19.2E:27500:601:602:604:0:28206:0:0:0
 Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8:0:0:0
 Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10:0:0:0
 Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11:0:0:0
-Premiere 3:11797:h:S19.2E:27500:2303:2304:0:101:43:0:0:0
-Premiere 4:11797:h:S19.2E:27500:767:768:0:101:9:0:0:0
-Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29:0:0:0
+Premiere 3:11797:h:S19.2E:27500:2303:2304,2305:0:101:43:0:0:0
+Premiere 4:11797:h:S19.2E:27500:767:768,769:0:101:9:0:0:0
+Premiere 5:11797:h:S19.2E:27500:1279:1280,1281:0:101:29:0:0:0
 Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
 Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
 13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
-Studio Universal:12071:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
+Studio Universal:11798:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
 Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
 Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
 Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
@@ -67,7 +67,7 @@ Junior:11758:h:S19.2E:27500:255:256:0:101:19:0:0:0
 K-Toon:11758:h:S19.2E:27500:511:512:0:101:12:0:0:0
 Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23:0:0:0
 Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518:0:0:0
-Classica:11758:h:S19.2E:27500:767:768:0:101:15:0:0:0
+MGM:11758:h:S19.2E:27500:767:768:2:101:515:0:0:0
 Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32:0:0:0
 :Premiere Direkt
 Premiere Direkt Portal:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
diff --git a/config.h b/config.h
index e56689fc2..343ed15f2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.154 2003/04/21 16:23:15 kls Exp $
+ * $Id: config.h 1.155 2003/04/27 15:56:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.29"
+#define VDRVERSION "1.1.30"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 67da45715..9346d3b5b 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.39 2003/04/12 11:51:04 kls Exp $
+ * $Id: device.c 1.41 2003/05/03 13:40:15 kls Exp $
  */
 
 #include "device.h"
@@ -50,8 +50,6 @@ cDevice::cDevice(void)
   ciHandler = NULL;
   player = NULL;
 
-  playerDetached = false;
-
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
 
@@ -122,13 +120,6 @@ bool cDevice::HasDecoder(void) const
   return false;
 }
 
-bool cDevice::PlayerDetached(void)
-{
-  bool result = playerDetached;
-  playerDetached = false;
-  return result;
-}
-
 cOsdBase *cDevice::NewOsd(int x, int y)
 {
   return NULL;
@@ -224,15 +215,19 @@ bool cDevice::HasPid(int Pid) const
 
 bool cDevice::AddPid(int Pid, ePidType PidType)
 {
-  if (Pid) {
+  if (Pid || PidType == ptPcr) {
      int n = -1;
      int a = -1;
-     for (int i = 0; i < MAXPIDHANDLES; i++) {
-         if (pidHandles[i].pid == Pid)
-            n = i;
-         else if (a < 0 && i >= ptOther && !pidHandles[i].used)
-            a = i;
-         }
+     if (PidType != ptPcr) { // PPID always has to be explicit
+        for (int i = 0; i < MAXPIDHANDLES; i++) {
+            if (i != ptPcr) {
+               if (pidHandles[i].pid == Pid)
+                  n = i;
+               else if (a < 0 && i >= ptOther && !pidHandles[i].used)
+                  a = i;
+               }
+            }
+        }
      if (n >= 0) {
         // The Pid is already in use
         if (++pidHandles[n].used == 2 && n <= ptTeletext) {
@@ -263,22 +258,31 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
   return true;
 }
 
-void cDevice::DelPid(int Pid)
+void cDevice::DelPid(int Pid, ePidType PidType)
 {
-  if (Pid) {
-     for (int i = 0; i < MAXPIDHANDLES; i++) {
-         if (pidHandles[i].pid == Pid) {
-            PRINTPIDS("D");
-            if (--pidHandles[i].used < 2) {
-               SetPid(&pidHandles[i], i, false);
-               if (pidHandles[i].used == 0) {
-                  pidHandles[i].handle = -1;
-                  pidHandles[i].pid = 0;
-                  }
+  if (Pid || PidType == ptPcr) {
+     int n = -1;
+     if (PidType == ptPcr)
+        n = PidType; // PPID always has to be explicit
+     else {
+        for (int i = 0; i < MAXPIDHANDLES; i++) {
+            if (pidHandles[i].pid == Pid) {
+               n = i;
+               break;
                }
-            PRINTPIDS("E");
             }
-         }
+        }
+     if (n >= 0 && pidHandles[n].used) {
+        PRINTPIDS("D");
+        if (--pidHandles[n].used < 2) {
+           SetPid(&pidHandles[n], n, false);
+           if (pidHandles[n].used == 0) {
+              pidHandles[n].handle = -1;
+              pidHandles[n].pid = 0;
+              }
+           }
+        PRINTPIDS("E");
+        }
      }
 }
 
@@ -395,6 +399,11 @@ bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   return false;
 }
 
+bool cDevice::HasProgramme(void)
+{
+  return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
+}
+
 void cDevice::SetVolumeDevice(int Volume)
 {
 }
@@ -523,7 +532,6 @@ void cDevice::Detach(cPlayer *Player)
      player->device = NULL;
      player = NULL;
      SetPlayMode(pmNone);
-     playerDetached = true;
      Audios.ClearAudio();
      }
 }
diff --git a/device.h b/device.h
index 8ffd49534..d2cc4f83d 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.30 2003/04/26 09:49:12 kls Exp $
+ * $Id: device.h 1.32 2003/05/03 13:35:55 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -181,6 +181,9 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+  virtual bool HasProgramme(void);
+         ///< Returns true if the device is currently showing any programme to
+         ///< the user, either through replaying or live.
 
 // PID handle facilities
 
@@ -201,7 +204,7 @@ class cDevice : public cThread {
          ///< Returns true if this device is currently receiving the given PID.
   bool AddPid(int Pid, ePidType PidType = ptOther);
          ///< Adds a PID to the set of PIDs this device shall receive.
-  void DelPid(int Pid);
+  void DelPid(int Pid, ePidType PidType = ptOther);
          ///< Deletes a PID from the set of PIDs this device shall receive.
   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
          ///< Does the actual PID setting on this device.
@@ -300,7 +303,6 @@ class cDevice : public cThread {
 
 private:
   cPlayer *player;
-  bool playerDetached;
 protected:
   virtual bool CanReplay(void) const;
        ///< Returns true if this device can currently start a replay session.
@@ -349,8 +351,6 @@ class cDevice : public cThread {
        ///< Attaches the given player to this device.
   void Detach(cPlayer *Player);
        ///< Detaches the given player from this device.
-  bool PlayerDetached(void);
-       ///< Returns true if a player has been detached and resets the 'playerDetached' flag.
 
 // Receiver facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index d66cd767b..8314ab60d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.56 2003/04/27 09:44:17 kls Exp $
+ * $Id: dvbdevice.c 1.59 2003/05/03 14:03:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -567,6 +567,24 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
+void cDvbDevice::TurnOffLiveMode(void)
+{
+  // Avoid noise while switching:
+
+  CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+  CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+  CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+  CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+
+  // Turn off live PIDs:
+
+  DelPid(pidHandles[ptAudio].pid);
+  DelPid(pidHandles[ptVideo].pid);
+  DelPid(pidHandles[ptPcr].pid, ptPcr);
+  DelPid(pidHandles[ptTeletext].pid);
+  DelPid(pidHandles[ptDolby].pid);
+}
+
 bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
@@ -649,42 +667,18 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   // Turn off live PIDs if necessary:
 
-  if (TurnOffLivePIDs) {
-
-     // Avoid noise while switching:
-
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-
-     // Turn off live PIDs:
-
-     DelPid(pidHandles[ptAudio].pid);
-     DelPid(pidHandles[ptVideo].pid);
-     DelPid(pidHandles[ptPcr].pid);
-     DelPid(pidHandles[ptTeletext].pid);
-     DelPid(pidHandles[ptDolby].pid);
-     }
+  if (TurnOffLivePIDs)
+     TurnOffLiveMode();
 
   dvbTuner->Set(Channel, DoTune);
-  if (DoTune) {
-     /*XXX do we still need this???
-     if (!(status & FE_HAS_LOCK)) {
-        esyslog("ERROR: channel %d not locked on DVB card %d!", Channel->Number(), CardIndex() + 1);
-        if (LiveView && IsPrimaryDevice())
-           cThread::RaisePanic();
-        return false;
-        }
-     XXX*/
-     }
 
   // PID settings:
 
   if (TurnOnLivePIDs) {
      aPid1 = Channel->Apid1();
      aPid2 = Channel->Apid2();
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+     int pPid = Channel->Ppid() ? Channel->Ppid() : Channel->Vpid();
+     if (!(AddPid(pPid, ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
@@ -782,6 +776,9 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
             siProcessor->SetStatus(true);
          break;
     case pmAudioVideo:
+         if (playMode == pmNone)
+            TurnOffLiveMode();
+         // continue with next...
     case pmAudioOnlyBlack:
          if (siProcessor)
             siProcessor->SetStatus(false);
diff --git a/dvbdevice.h b/dvbdevice.h
index 335a69436..6bcbc724f 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.20 2002/12/15 14:45:29 kls Exp $
+ * $Id: dvbdevice.h 1.21 2003/05/02 12:21:51 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -59,6 +59,7 @@ class cDvbDevice : public cDevice {
 
 private:
   cDvbTuner *dvbTuner;
+  void TurnOffLiveMode(void);
 public:
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
diff --git a/i18n.c b/i18n.c
index efeb869bd..734e01555 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.106 2003/04/21 14:05:17 kls Exp $
+ * $Id: i18n.c 1.107 2003/05/01 14:10:18 kls Exp $
  *
  * Translations provided by:
  *
@@ -12,7 +12,7 @@
  * Italian     Alberto Carraro <bertocar@tin.it>
  * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
- * French      Jean-Claude Repetto <jc@repetto.org>
+ * French      Jean-Claude Repetto <jc@repetto.org> and Olivier Jacques <jacquesolivier@hotmail.com>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
  * Finnish     Hannu Savolainen <hannu@opensound.com> and Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  * Polish      Michael Rakowski <mrak@gmx.de>
@@ -1940,7 +1940,7 @@ const tI18nPhrase Phrases[] = {
     "Scrolla pagina nel menu",
     "Scrollen per pagina",
     "Scroll da p�gina no menu",
-    "Affichage progr. suivant",
+    "Scrolling par pages",
     "Rask rulling i menyer",
     "Valikkojen rullaus",
     "Przesuwac stronami",
@@ -1988,7 +1988,7 @@ const tI18nPhrase Phrases[] = {
     "Timeout EPG (h)",
     "EPG-scan Timeout (h)",
     "Expirou o EPG (h)",
-    "Temps maxi EPG (h)",
+    "Inactivit� avant rech. EPG (h)",
     "Ledig tid f�r EPG-s�k (h)",
     "Ohjelmatied. odotusaika (h)",
     "Czas do skanu EPG (h)",
@@ -2228,7 +2228,7 @@ const tI18nPhrase Phrases[] = {
     "Durata predefinita (d)",
     "Standaard levensduur (d)",
     "Validade por defeito (d)",
-    "Dur�e de vie par d�faut (d)",
+    "Dur�e de vie par d�faut (j)",
     "Normal levetid timer (d)",
     "Oletus voimassaoloaika (d)",
     "Pierwotna trwalosc (d)",
@@ -2260,7 +2260,7 @@ const tI18nPhrase Phrases[] = {
     "Marca la registrazione",
     "Direkte opnamen markeren",
     "Marca de grava��o r�pida",
-    "Enregistrement imm�diat",
+    "Marquage enregistr. imm�diats",
     "Markere direkteopptak",
     "Merkitse v�lit�n nauh.",
     "Zaznaczyc natychm. nagranie",
@@ -2292,7 +2292,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Dur�e enregistr. imm�diat (min)",
     "",//TODO
     "Pikanauhoituksen pituus (min)",
     "",//TODO
@@ -2404,7 +2404,7 @@ const tI18nPhrase Phrases[] = {
     "Tempo minimo di pausa (min)", // ??? i don't know...
     "Minimale event time-out (min)",
     "Per�odo m�nimo de pausa (min)",
-    "MinEventTimeout (min)", // Too difficult to translate - read the manual!
+    "MinEventTimeout (min)",
     "Minste hendelsespause (min)",
     "Minimi tapahtuman odotus (min)",
     "Min. czas do nast. akcji (Event) (min)",
@@ -2420,7 +2420,7 @@ const tI18nPhrase Phrases[] = {
     "Tempo minimo di inattivita' (min)",
     "Minimum gebruikers inactiviteit (min)",
     "Per�odo m�nimo de inactividade (min)",
-    "Dur�e minimale d'inactivit� (min)",
+    "Dur�e minimale d'inact. (min)",
     "Minimumstid med inaktivitet (min)",
     "Minimi k�ytt�j�n odotus (min)",
     "Min. brak aktywnosci uzytkownika (min)",
@@ -2486,7 +2486,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    " a�bc�de���fghi�jklmno�pqrstu��vxyz0123456789-.#~",
     "",// TODO
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
     "",// TODO
@@ -2679,7 +2679,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "('Menu' pour passer cette touche)",
     "",// TODO
     "(Paina 'Valikko' jos n�pp�int� ei ole)",
     "",// TODO
@@ -2904,7 +2904,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Lecture",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2920,7 +2920,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pause",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2935,7 +2935,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Stop",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2952,7 +2952,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Enregistrement",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2968,7 +2968,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Avance rapide",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2984,7 +2984,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Retour rapide",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3016,7 +3016,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Cha�ne+",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3032,7 +3032,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Cha�ne-",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3145,7 +3145,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "aucun",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3161,7 +3161,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "auto",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3417,7 +3417,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pause de l'�mission en direct...",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3433,7 +3433,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Ce plugin n'a pas de param�tres !",
     "",// TODO
     "T�ll� laajennoksella ei ole asetuksia!",
     "",// TODO
diff --git a/menu.c b/menu.c
index 341480a58..7fc2f3660 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.240 2003/04/27 12:50:31 kls Exp $
+ * $Id: menu.c 1.241 2003/05/03 15:59:07 kls Exp $
  */
 
 #include "menu.h"
@@ -2489,7 +2489,7 @@ void cMenuMain::Set(const char *Plugin)
 
   // Color buttons:
 
-  SetHelp(tr("Record"), cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(!replaying ? tr("Record") : NULL, cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -2547,7 +2547,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     default: switch (Key) {
                case kRecord:
                case kRed:    if (!HadSubMenu)
-                                state = osRecord;
+                                state = replaying ? osContinue : osRecord;
                              break;
                case kGreen:  if (!HadSubMenu) {
                                 int CurrentAudioTrack = -1;
@@ -2564,7 +2564,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 }
                              break;
                case kYellow: if (!HadSubMenu)
-                                state = osPause;
+                                state = replaying ? osContinue : osPause;
                              break;
                case kBlue:   if (!HadSubMenu)
                                 state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
diff --git a/osd.c b/osd.c
index d048f5ca3..9d8b72db6 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.40 2003/03/23 15:41:54 kls Exp $
+ * $Id: osd.c 1.42 2003/05/03 14:46:38 kls Exp $
  */
 
 #include "osd.h"
@@ -423,6 +423,11 @@ void cOsdMenu::Display(void)
   Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
   int count = Count();
   if (count > 0) {
+     for (int i = 0; i < count; i++) {
+        cOsdItem *item = Get(i);
+        if (item)
+           cStatus::MsgOsdItem(item->Text(), i);
+        }
      if (current < 0)
         current = 0; // just for safety - there HAS to be a current item!
      int n = 0;
@@ -578,7 +583,8 @@ eOSState cOsdMenu::HotKey(eKeys Key)
       if (s && (s = skipspace(s)) != NULL) {
          if (*s == Key - k1 + '1') {
             current = item->Index();
-            return ProcessKey(kOk);
+            cRemote::Put(kOk, true);
+            break;
             }
          }
       }
diff --git a/rcu.c b/rcu.c
index 5c76a35cc..dae9b2a1d 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.4 2003/04/12 14:37:13 kls Exp $
+ * $Id: rcu.c 1.5 2003/05/02 14:42:40 kls Exp $
  */
 
 #include "rcu.h"
@@ -315,7 +315,7 @@ void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
 {
   if (ChannelNumber && Device->IsPrimaryDevice()) {
      LOCK_THREAD;
-     numberToSend = ChannelNumber;
+     numberToSend = cDevice::CurrentChannel();
      }
 }
 
diff --git a/recording.c b/recording.c
index 261bee8bf..23521a616 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.75 2003/04/12 09:51:44 kls Exp $
+ * $Id: recording.c 1.76 2003/04/27 15:52:17 kls Exp $
  */
 
 #include "recording.h"
@@ -78,7 +78,7 @@ void RemoveDeletedRecordings(void)
                  r0 = r;
               r = Recordings.Next(r);
               }
-        if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 60) {
+        if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 3600) {
            r0->Remove();
            RemoveEmptyVideoDirectories();
            LastRemoveCheck += REMOVELATENCY;
diff --git a/remote.c b/remote.c
index 29149e9d2..1b73d168a 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.36 2002/12/15 15:58:59 kls Exp $
+ * $Id: remote.c 1.38 2003/05/02 10:49:50 kls Exp $
  */
 
 #include "remote.h"
@@ -58,7 +58,7 @@ void cRemote::Clear(void)
      }
 }
 
-bool cRemote::Put(eKeys Key)
+bool cRemote::Put(eKeys Key, bool AtFront)
 {
   if (Key != kNone) {
      cMutexLock MutexLock(&mutex);
@@ -68,9 +68,16 @@ bool cRemote::Put(eKeys Key)
      if (d <= 0)
         d = MaxKeys + d;
      if (d - 1 > 0) {
-        keys[in] = Key;
-        if (++in >= MaxKeys)
-           in = 0;
+        if (AtFront) {
+           if (--out < 0)
+              out = MaxKeys - 1;
+           keys[out] = Key;
+           }
+        else {
+           keys[in] = Key;
+           if (++in >= MaxKeys)
+              in = 0;
+           }
         keyPressed.Broadcast();
         return true;
         }
@@ -123,6 +130,11 @@ bool cRemote::Put(const char *Code, bool Repeat, bool Release)
   return false;
 }
 
+bool cRemote::HasKeys(void)
+{
+  return in != out && !(keys[out] & k_Repeat);
+}
+
 eKeys cRemote::Get(int WaitMs, char **UnknownCode)
 {
   for (;;) {
diff --git a/remote.h b/remote.h
index 9ff95662b..64a209764 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.26 2003/04/27 12:05:48 kls Exp $
+ * $Id: remote.h 1.28 2003/05/02 10:41:35 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -42,10 +42,10 @@ class cRemote : public cListObject {
   const char *Name(void) { return name; }
   static void SetLearning(cRemote *Learning) { learning = Learning; }
   static void Clear(void);
-  static bool Put(eKeys Key);
+  static bool Put(eKeys Key, bool AtFront = false);
   static bool PutMacro(eKeys Key);
   static const char *GetPlugin(void) { return plugin; }
-  static bool HasKeys(void) { return in != out; }
+  static bool HasKeys(void);
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   };
 
diff --git a/status.c b/status.c
index 0bc4dd8e0..3dbe85432 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 1.4 2002/07/13 10:49:34 kls Exp $
+ * $Id: status.c 1.5 2003/05/03 14:47:44 kls Exp $
  */
 
 #include "status.h"
@@ -71,6 +71,12 @@ void cStatus::MsgOsdHelpKeys(const char *Red, const char *Green, const char *Yel
       sm->OsdHelpKeys(Red, Green, Yellow, Blue);
 }
 
+void cStatus::MsgOsdItem(const char *Text, int Index)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->OsdItem(Text, Index);
+}
+
 void cStatus::MsgOsdCurrentItem(const char *Text)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
diff --git a/status.h b/status.h
index 8041f8cd3..de0d9256a 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.5 2002/07/14 10:54:39 kls Exp $
+ * $Id: status.h 1.6 2003/05/03 14:43:18 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -45,6 +45,8 @@ class cStatus : public cListObject {
                // If Message is NULL, the status line has been cleared.
   virtual void OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue) {}
                // The help keys have been set to the given values (may be NULL).
+  virtual void OsdItem(const char *Text, int Index) {}
+               // The OSD displays the given single line Text as menu item at Index.
   virtual void OsdCurrentItem(const char *Text) {}
                // The OSD displays the given single line Text as the current menu item.
   virtual void OsdTextItem(const char *Text, bool Scroll) {}
@@ -69,6 +71,7 @@ class cStatus : public cListObject {
   static void MsgOsdTitle(const char *Title);
   static void MsgOsdStatusMessage(const char *Message);
   static void MsgOsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue);
+  static void MsgOsdItem(const char *Text, int Index);
   static void MsgOsdCurrentItem(const char *Text);
   static void MsgOsdTextItem(const char *Text,  bool Scroll = false);
   static void MsgOsdChannel(const char *Text);
diff --git a/thread.c b/thread.c
index e52771dad..07c8f79af 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.23 2002/11/03 11:00:03 kls Exp $
+ * $Id: thread.c 1.24 2003/05/03 14:03:32 kls Exp $
  */
 
 #include "thread.h"
@@ -114,8 +114,6 @@ void cMutex::Unlock(void)
 // The signal handler is necessary to be able to use SIGIO to wake up any
 // pending 'select()' call.
 
-time_t cThread::lastPanic = 0;
-int cThread::panicLevel = 0;
 bool cThread::signalHandlerInstalled = false;
 bool cThread::emergencyExitRequested = false;
 
@@ -191,25 +189,6 @@ void cThread::WakeUp(void)
   kill(parentPid, SIGIO); // makes any waiting 'select()' call return immediately
 }
 
-#define MAXPANICLEVEL 10
-
-void cThread::RaisePanic(void)
-{
-  if (lastPanic > 0) {
-     if (time(NULL) - lastPanic < 5)
-        panicLevel++;
-     else if (panicLevel > 0)
-        panicLevel--;
-     }
-  lastPanic = time(NULL);
-  if (panicLevel > MAXPANICLEVEL) {
-     esyslog("ERROR: max. panic level exceeded");
-     EmergencyExit(true);
-     }
-  else
-     dsyslog("panic level: %d", panicLevel);
-}
-
 bool cThread::EmergencyExit(bool Request)
 {
   if (!Request)
diff --git a/thread.h b/thread.h
index 9fc48b64f..059974249 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.14 2002/08/15 11:40:06 kls Exp $
+ * $Id: thread.h 1.15 2003/05/03 14:03:36 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -48,8 +48,6 @@ class cThread {
   cMutex mutex;
   pid_t parentPid, threadPid;
   bool running;
-  static time_t lastPanic;
-  static int panicLevel;
   static bool emergencyExitRequested;
   static bool signalHandlerInstalled;
   static void SignalHandler(int signum);
@@ -65,7 +63,6 @@ class cThread {
   virtual ~cThread();
   bool Start(void);
   bool Active(void);
-  static void RaisePanic(void);
   static bool EmergencyExit(bool Request = false);
   };
 
diff --git a/vdr.1 b/vdr.1
index a1ad9b1fc..86af51c6c 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.6 2002/11/24 16:36:37 kls Exp $
+.\" $Id: vdr.1 1.7 2003/05/03 16:16:05 kls Exp $
 .\"
-.TH vdr 1 "24 Nov 2002" "1.1.0" "Video Disk Recorder"
+.TH vdr 1 "3 May 2003" "1.1.30" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -94,7 +94,12 @@ in quotes, like for example
 \fBvdr -P "abc -a -b xyz"\fR
 
 which would load a plugin named \fBabc\fR, giving it the command line options
-\fB-a\ -b\ xyz\fR.
+\fB-a\ -b\ xyz\fR. If you want to load all available plugins (without any
+particular options) you can use
+
+\fBvdr -P "*"\fR
+
+(note the quotes around the asterisk to prevent wildcard expansion).
 .TP
 .BI -r\  cmd ,\ --record= cmd
 Call \fIcmd\fR before and after a recording.
diff --git a/vdr.c b/vdr.c
index a160e4cf8..ae4edd560 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.150 2003/04/21 14:41:41 kls Exp $
+ * $Id: vdr.c 1.152 2003/05/03 13:39:57 kls Exp $
  */
 
 #include <getopt.h>
@@ -53,6 +53,7 @@
 #include "tools.h"
 #include "videodir.h"
 
+#define MINCHANNELWAIT  10 // seconds to wait between failed channel switchings
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
@@ -460,9 +461,14 @@ int main(int argc, char *argv[])
            }
         // Attach launched player control:
         cControl::Attach();
-        // Make sure Transfer-Mode is re-started after detaching a player:
-        if (cDevice::PrimaryDevice()->PlayerDetached() && !cDevice::PrimaryDevice()->Replaying())
-           Channels.SwitchTo(cDevice::CurrentChannel());
+        // Make sure we have a visible programme in case device usage has changed:
+        if (!cDevice::PrimaryDevice()->HasProgramme()) {
+           static time_t lastTime = 0;
+           if (time(NULL) - lastTime > MINCHANNELWAIT) {
+              if (!Channels.SwitchTo(cDevice::CurrentChannel()))
+                 lastTime = time(NULL); // don't do this too often
+              }
+           }
         // Restart the Watchdog timer:
         if (WatchdogTimeout > 0) {
            int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);
@@ -503,6 +509,7 @@ int main(int argc, char *argv[])
         switch (key) {
           // Menu control:
           case kMenu:
+               key = kNone; // nobody else needs to see this key
                if (Menu) {
                   DELETENULL(Menu);
                   if (!Temp)
@@ -518,14 +525,15 @@ int main(int argc, char *argv[])
             if (cControl::Control())\
                cControl::Control()->Hide();\
             Menu = new cMenuMain(cControl::Control(), function);\
-            Temp = NULL;
+            Temp = NULL;\
+            key = kNone; // nobody else needs to see this key
           case kSchedule:   DirectMainFunction(osSchedule); break;
           case kChannels:   DirectMainFunction(osChannels); break;
           case kTimers:     DirectMainFunction(osTimers); break;
           case kRecordings: DirectMainFunction(osRecordings); break;
           case kSetup:      DirectMainFunction(osSetup); break;
           case kCommands:   DirectMainFunction(osCommands); break;
-          case kUser1 ... kUser9: cRemote::PutMacro(key); break;
+          case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
           case k_Plugin:    DirectMainFunction(osPlugin, cRemote::GetPlugin()); break;
           // Channel up/down:
           case kChanUp|k_Repeat:

From c84022554aaacc9b1c3d9627501cdbb8276871f6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 11 May 2003 18:00:00 +0200
Subject: [PATCH 072/307] Version 1.1.31 - Introduced the new function
 cPlugin::Initialize(), in order to be able to separate   the startup of a
 plugin into an "early" (Initialize()) and "late" (Start()) phase   (suggested
 by Andreas Schultz). Plugin authors should please read the section   about
 "Getting started" in PLUGINS.html and adapt their code if applicable. -
 Implemented the CableDeliverySystemDescriptor and
 TerrestrialDeliverySystemDescriptor   in libdtv (thanks to Sven Grothklags
 and Andreas Schultz). - Fixed keeping live video active in case the primary
 device doesn't have an MPEG   decoder (thanks to Wolfgang Goeller for
 reporting this one). - Implemented cDevice::ActualDevice(), which returns the
 actual receiving device in   case of 'Transfer Mode', or the primary device
 otherwise. This may be useful for   plugins that want to attach a cReceiver
 to the device where the current live video   is actually coming from. - Added
 VDRVERSNUM to config.h, which can be used by the preprocessor to check the  
 actual VDR version (suggested by Stefan Huelswitt). - Removed the
 WaitForPut/WaitForGet stuff from cRingBuffer, since it appears to   no longer
 be necessary due to the implementation of cNonBlockingFileReader in  
 dvbplayer.c. Also, the long timeout in WaitForPut caused problems with
 cReceivers   that use a ring buffer and didn't immediately return from their
 Receive() function   if the buffer runs full (thanks to Sascha Volkenandt for
 reporting this one). - Fixed handling EPG data where the "extended event
 descriptor" comes before the   "short event" or a "time shifted event"
 (thanks to Jonan Santiago). - Disabled the "Received stuffing section in EIT"
 log message. - Updated 'channels.conf.terr' for Berlin (thanks to Juri
 Haberland). - Avoiding short display of the "Main" menu when pressing the
 "Recordings" button   or the "Back" button during replay. - Further increased
 the timeout until an index file is considerd no longer to be   written. -
 Implemented separate PausePriority and PauseLifetime parameters for the
 recordings   created when pausing live video (suggested by Alfred Zastrow). -
 Changed C++ style comments in libdtv into C style to avoid warnings in gcc
 3.x   (thanks to Andreas Schultz).

---
 CONTRIBUTORS                     |  22 ++++++
 HISTORY                          |  34 +++++++++
 MANUAL                           |  13 ++--
 PLUGINS.html                     |  76 +++++++++++++-------
 PLUGINS/src/sky/HISTORY          |   4 ++
 PLUGINS/src/sky/sky.c            |  10 +--
 channels.conf.terr               |  17 +++--
 config.c                         |   8 ++-
 config.h                         |   6 +-
 device.c                         |  10 ++-
 device.h                         |   5 +-
 eit.c                            |   5 +-
 i18n.c                           |  34 ++++++++-
 libdtv/liblx/liblx.h             |  53 +++++++-------
 libdtv/liblx/xListFuncs.c        |  53 +++++++-------
 libdtv/liblx/xMemMgt.c           |  53 +++++++-------
 libdtv/libsi/include/libsi.h     |  60 +++++++++++++++-
 libdtv/libsi/include/si_tables.h |  36 +++++++++-
 libdtv/libsi/si_debug_services.c |  37 +++++++++-
 libdtv/libsi/si_parser.c         |  66 ++++++++++++++++-
 libdtv/libvdr/libvdr.c           | 120 ++++++++++++++-----------------
 menu.c                           |  19 ++---
 menu.h                           |   6 +-
 newplugin                        |   9 ++-
 plugin.c                         |  25 ++++++-
 plugin.h                         |   4 +-
 recording.c                      |   4 +-
 ringbuffer.c                     |  38 +---------
 ringbuffer.h                     |   8 +--
 timers.c                         |   8 +--
 timers.h                         |   4 +-
 transfer.c                       |   6 +-
 transfer.h                       |   4 +-
 vdr.c                            |  25 ++++---
 34 files changed, 602 insertions(+), 280 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f96e444f9..42b074d22 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -171,6 +171,7 @@ Stefan Huelswitt <huels@iname.com>
  don't indicate an actual encrypted channel
  for implementing setting the "broken link" flag for GOPs at the beginning of a new
  video sequence, which avoids artefacts when cutting
+ for suggesting to add VDRVERSNUM to config.h
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -200,6 +201,9 @@ Andreas Schultz <aschultz@warp10.net>
  for suggesting a Make.config file
  for making EIT filtering use masks to reduce the number of filters
  for suggesting to remove the Mute() call from cDvbDevice::StillPicture()
+ for suggesting to separate the startup of a plugin into an "early" and a "late" phase
+ for changing C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
+ for implementing the TerrestrialDeliverySystemDescriptor in libdtv
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -408,6 +412,7 @@ Gregoire Favre <greg@ulima.unil.ch>
 Sven Grothklags <sven@uni-paderborn.de>
  for fixing the cutting mechanism to make it re-sync in case a frame is larger
  than the buffer
+ for implementing the CableDeliverySystemDescriptor in libdtv
 
 Tomas Prybil <tomas.prybil@copper.se>
  for translating OSD texts to the Swedish language
@@ -584,6 +589,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for helping to fix a faulty behaviour of the "Mute" key in case the channel display
  is visible
  for making the 'epg.data' file being read after all plugins have been started
+ for reporting a problem with cReceivers that use a ring buffer and didn't immediately
+ return from their Receive() function if the buffer runs full
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -630,3 +637,18 @@ Kai Moeller <moeller.ki@gmx.de>
 
 Carsten Siebholz <c.siebholz@t-online.de>
  for adding cStatus::OsdItem() to provide the entire list of menu items to a plugin
+
+Wolfgang Goeller <wgoeller@heraklit.ch>
+ for reporting a bug in keeping live video active in case the primary device doesn't
+ have an MPEG decoder
+
+Jonan Santiago <jonan-lists-vdr@callisia.com>
+ for fixing handling EPG data where the "extended event descriptor" comes before the
+ "short event" or a "time shifted event"
+
+Juri Haberland <juri@koschikode.com>
+ for his help in keeping 'channels.conf.terr' up to date
+
+Alfred Zastrow <vdr@zastrow4u.de>
+ for suggesting to implement separate PausePriority and PauseLifetime parameters for
+ the recordings created when pausing live video
diff --git a/HISTORY b/HISTORY
index c436fdbe4..098c10dc5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2108,3 +2108,37 @@ Video Disk Recorder Revision History
   (thanks to Carsten Siebholz).
 - The red ("Record") and yellow ("Pause") button in the "Main" menu are no longer
   available when replaying.
+
+2003-05-11: Version 1.1.31
+
+- Introduced the new function cPlugin::Initialize(), in order to be able to separate
+  the startup of a plugin into an "early" (Initialize()) and "late" (Start()) phase
+  (suggested by Andreas Schultz). Plugin authors should please read the section
+  about "Getting started" in PLUGINS.html and adapt their code if applicable.
+- Implemented the CableDeliverySystemDescriptor and TerrestrialDeliverySystemDescriptor
+  in libdtv (thanks to Sven Grothklags and Andreas Schultz)
+- Fixed keeping live video active in case the primary device doesn't have an MPEG
+  decoder (thanks to Wolfgang Goeller for reporting this one).
+- Implemented cDevice::ActualDevice(), which returns the actual receiving device in
+  case of 'Transfer Mode', or the primary device otherwise. This may be useful for
+  plugins that want to attach a cReceiver to the device where the current live video
+  is actually coming from.
+- Added VDRVERSNUM to config.h, which can be used by the preprocessor to check the
+  actual VDR version (suggested by Stefan Huelswitt).
+- Removed the WaitForPut/WaitForGet stuff from cRingBuffer, since it appears to
+  no longer be necessary due to the implementation of cNonBlockingFileReader in
+  dvbplayer.c. Also, the long timeout in WaitForPut caused problems with cReceivers
+  that use a ring buffer and didn't immediately return from their Receive() function
+  if the buffer runs full (thanks to Sascha Volkenandt for reporting this one).
+- Fixed handling EPG data where the "extended event descriptor" comes before the
+  "short event" or a "time shifted event" (thanks to Jonan Santiago).
+- Disabled the "Received stuffing section in EIT" log message.
+- Updated 'channels.conf.terr' for Berlin (thanks to Juri Haberland).
+- Avoiding short display of the "Main" menu when pressing the "Recordings" button
+  or the "Back" button during replay.
+- Further increased the timeout until an index file is considerd no longer to be
+  written.
+- Implemented separate PausePriority and PauseLifetime parameters for the recordings
+  created when pausing live video (suggested by Alfred Zastrow).
+- Changed C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
+  (thanks to Andreas Schultz).
diff --git a/MANUAL b/MANUAL
index be9ac5268..a8ebee21b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -186,10 +186,11 @@ Video Disk Recorder User's Manual
 
   You can start recording the current channel by pressing the "Red" button
   in the "VDR" menu. This will create a timer event named "@channelname" that
-  starts at the current time and records for two hours.
+  starts at the current time and by default records for 3 hours.
   If you want to modify the recording time you need to edit the timer.
   Stop instant recording by pressing the "Menu" button and selecting
-  "Stop Recording", or by disabling the timer.
+  "Stop Recording", or by disabling the timer. The default priority, lifetime
+  and recording time can be defined in the "Setup/Recording" menu.
 
 * Pausing live video
 
@@ -201,8 +202,9 @@ Video Disk Recorder User's Manual
   your live viewing session. Once you're back, simply press the "Up" or "Play"
   button and you'll be watching the current channel in time shift mode, right
   from the point where you left off. The instant recording VDR has started
-  will use the same parameters for priority, lifetime and recording duration
-  as any other instant recording, so by default it will record 3 hours (which
+  will use the parameters for "Pause priority" and "Pause lifetime" as defined
+  in the "Setup/Recording" menu. Recording time will be the same as for
+  any other instant recording, so by default it will record 3 hours (which
   should be enough for any normal broadcast).
 
 * Replaying a Recording
@@ -548,6 +550,9 @@ Video Disk Recorder User's Manual
                          means that this recording will never be deleted
                          automatically.
 
+  Pause priority = 10    The Priority and Lifetime values used when pausing live
+  Pause lifetime = 1     video.
+
   Use episode name = yes Repeating timers use the EPG's 'Episode name' information
                          to create recording file names in a hierarchical structure
                          (for instance to gather all episodes of a series in a
diff --git a/PLUGINS.html b/PLUGINS.html
index d6c377605..bd1a0d0f3 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>internal</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.14 are marked like this.
-<!--X1.1.14--></td></tr></table>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.15 are marked like this.
 <!--X1.1.15--></td></tr></table>
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.17 are marked like this.
 <!--X1.1.17--></td></tr></table>
-<!--X1.1.27--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.27--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.27 are marked like this.
 <!--X1.1.27--></td></tr></table>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.31 are marked like this.
+<!--X1.1.31--></td></tr></table>
 
 <hr>
 <h1>Table Of Contents</h1>
@@ -283,7 +283,12 @@ <h1>Table Of Contents</h1>
 The <b>constructor</b> shall initialize any member variables the plugin defines, but
 <b>must not access any global structures of VDR</b>.
 It also must not create any threads or other large data structures. These things
-are done in the <a href="#Getting started"><tt>Start()</tt></a> function later.
+are done in the
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a href="#Getting started"><tt>Initialize()</tt></a> or
+<a href="#Getting started"><tt>Start()</tt></a>
+<!--X1.1.31--></td></tr></table>
+function later.
 Constructing a plugin object shall not have any side effects or produce any output,
 since VDR, for instance, has to create the plugin objects in order to get their
 command line help - and after that immediately destroys them again.
@@ -452,13 +457,28 @@ <h1>Table Of Contents</h1>
 
 If a plugin implements a function that runs in the background (presumably in a
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
-it needs to implement the function
+it needs to implement one of the functions
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%><pre>
+virtual bool Initialize(void);
+<!--X1.1.31--></pre></td></tr></table>
 virtual bool Start(void);
 </pre></td></tr></table><p>
 
-which is called once for each plugin at program startup.
+which are called once for each plugin at program startup.
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+The difference between these two functions is that <tt>Initialize()</tt> is
+called early at program startup, while <tt>Start()</tt> is called after everything
+else has been set up, right before the main program loop is entered. Inside the
+<tt>Start()</tt> function of any plugin it is guaranteed that the <tt>Initialize()</tt>
+functions of all plugins have  already been called. For many plugins it probably
+doesn't matter which of these functions they implement, but it may be of importance
+for, e.g., plugins that implement devices. Such plugins should create their cDevice
+derived objects in <tt>Initialize()</tt>, so that other plugins can use them in their
+<tt>Start()</tt> functions.
+<!--X1.1.31--></td></tr></table>
+<p>
 Inside this function the plugin must set up everything necessary to perform
 its task. This may, for instance, be a thread that collects data from the DVB
 stream, which is later presented to the user via a function that is available
@@ -467,10 +487,11 @@ <h1>Table Of Contents</h1>
 A return value of <i>false</i> indicates that something has gone wrong and the
 plugin will not be able to perform its task. In that case, the plugin should
 write a proper error message to the log file. The first plugin that returns
-<i>false</i> from its <tt>Start()</tt> function will cause VDR to exit.
+<i>false</i> from its <tt>Initialize()</tt> or <tt>Start()</tt> function will cause
+VDR to exit.
 <p>
 If the plugin doesn't implement any background functionality or internationalized
-texts, it doesn't need to implement this function.
+texts, it doesn't need to implement either of these functions.
 
 <a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
@@ -506,7 +527,7 @@ <h1>Table Of Contents</h1>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
@@ -759,7 +780,8 @@ <h1>Table Of Contents</h1>
 
 to register them with VDR's internationalization mechanism.
 <p>
-The call to this function must be done in the <a href="#Getting started"><tt>Start()</tt></a> function of the plugin:
+The call to this function must be done in the <a href="#Getting started"><tt>Initialize()</tt></a>
+or <a href="#Getting started"><tt>Start()</tt></a> function of the plugin:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 const tI18nPhrase Phrases[] = {
@@ -1022,7 +1044,7 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 <p>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 If there is an additional audio track that has to be replayed with external hardware,
 the player shall call its member function
 
@@ -1178,9 +1200,16 @@ <h1>Table Of Contents</h1>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 cMyReceiver *Receiver = new cMyReceiver(123);
 
-cDevice::PrimaryDevice()-&gt;AttachReceiver(Receiver);
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+cDevice::ActualDevice()-&gt;AttachReceiver(Receiver);
+<!--X1.1.31--></td></tr></table>
 </pre></td></tr></table><p>
 
+Noteh the use of <tt>cDevice::ActualDevice()</tt> here, which makes sure that
+the receiver is attached to the device that actually receives the current live
+video stream (this may be different from the primary device in case of <i>Transfer
+Mode</i>).
+<p>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
@@ -1303,9 +1332,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool CanReplay(void) const;
-<!--X1.1.14--></td></tr></table>
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
@@ -1345,20 +1372,19 @@ <h1>Table Of Contents</h1>
 <p>
 <b>Initializing new devices</b>
 <p>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 A derived cDevice class shall implement a static function
-
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
-static bool Initialize(void);
-</pre></td></tr></table><p>
-
 in which it determines whether the necessary hardware to run this sort of
 device is actually present in this machine (or whatever other prerequisites
 might be important), and then creates as many device objects as necessary.
 See <tt>VDR/dvbdevice.c</tt> for the implementation of the <tt>cDvbDevice</tt>
 initialize function.
 <p>
-A plugin that adds devices to a VDR instance shall call this initializing
-function from its <a href="#Getting started"><tt>Start()</tt></a> function.
+A plugin that adds devices to a VDR instance shall call this
+function from its <a href="#Getting started"><tt>Initialize()</tt></a> function
+to make sure other plugins that may need to have access to all available devices
+will see them in their <a href="#Getting started"><tt>Start()</tt></a> function.
+<!--X1.1.31--></td></tr></table>
 <p>
 Nothing needs to be done to shut down the devices. VDR will automatically
 shut down (delete) all devices when the program terminates. It is therefore
@@ -1476,7 +1502,7 @@ <h1>Table Of Contents</h1>
 In case you need to do any other setup steps, like opening a file or initializing
 member variables, you should do so before calling <tt>Start()</tt>.
 <p>
-<!--X1.1.27--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.27--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 If your remote control for some reason can't work (maybe because it was unable to
 open some file handle it requires) it can implement the virtual function
 
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index bdb440b1e..d41904e6f 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -8,3 +8,7 @@ VDR Plugin 'sky' Revision History
 2002-12-13: Version 0.1.0
 
 - Changed setting of CXX and CXXFLAGS variables in Makefile.
+
+2003-05-09: Version 0.1.1
+
+- Changed Start() to Initialize().
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index d6e10c92d..ae591378e 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.2 2002/12/13 15:01:57 kls Exp $
+ * $Id: sky.c 1.3 2003/05/09 15:27:16 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -14,7 +14,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
@@ -186,7 +186,7 @@ class cPluginSky : public cPlugin {
   virtual const char *Description(void) { return DESCRIPTION; }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual bool Start(void);
+  virtual bool Initialize(void);
   virtual void Housekeeping(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
@@ -216,9 +216,9 @@ bool cPluginSky::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
-bool cPluginSky::Start(void)
+bool cPluginSky::Initialize(void)
 {
-  // Start any background activities the plugin shall perform.
+  // Initialize any background activities the plugin shall perform.
   new cDigiboxDevice;
   return true;
 }
diff --git a/channels.conf.terr b/channels.conf.terr
index 548f021cb..79c59a103 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -50,18 +50,17 @@ RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:337:338:343:0:16405:0:0:0
 RTL2:506000:I0C23D0M16B8T8G8Y0:T:27500:353:354:359:0:16406:0:0:0
 Super RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:433:434:439:0:16411:0:0:0
 VOX:506000:I0C23D0M16B8T8G8Y0:T:27500:545:546:551:0:16418:0:0:0
-ORB-Fernsehen:522000:I0C23D0M16B8T8G8Y0:T:27500:1101:1102:1104:0:11:0:0:0
-SFB1:522000:I0C23D0M16B8T8G8Y0:T:27500:1201:1202:1204:0:12:0:0:0
+RBB Brandenburg:522000:I0C23D0M16B8T8G8Y0:T:27500:1101:1102:1104:0:11:0:0:0
+RBB Berlin:522000:I0C23D0M16B8T8G8Y0:T:27500:1201:1202:1204:0:12:0:0:0
 Phoenix:522000:I0C23D0M16B8T8G8Y0:T:27500:1301:1302:1304:0:13:0:0:0
 Das Erste:522000:I0C23D0M16B8T8G8Y0:T:27500:1401:1402:1404:0:14:0:0:0
 ZDF:570000:I0C23D0M16B8T8G8Y0:T:27500:545:546:551:0:514:0:0:0
-ZDFinfokanal:570000:I0C23D0M16B8T8G8Y0:T:27500:561:562:551:0:515:0:0:0
-ZDFdokukanal:570000:I0C23D0M16B8T8G8Y0:T:27500:577:578:551:0:516:0:0:0
-KiKa:570000:I0C23D0M16B8T8G8Y0:T:27500:593:594:599:0:517:0:0:0
-Kabel 1:658000:I0C23D0M16B8T8G8Y0:T:27500:161:162:163:0:16394:0:0:0
-N24:658000:I0C23D0M16B8T8G8Y0:T:27500:225:226:227:0:16398:0:0:0
-ProSieben:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:308:0:16403:0:0:0
-SAT.1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:387:0:16408:0:0:0
+Info/3sat:570000:I0C23D0M16B8T8G8Y0:T:27500:561:562:551:0:515:0:0:0
+Doku/KiKa:570000:I0C23D0M16B8T8G8Y0:T:27500:593:594:599:0:517:0:0:0
+Kabel 1:658000:I0C23D0M16B8T8G8Y0:T:27500:161:162:167:0:16394:0:0:0
+N24:658000:I0C23D0M16B8T8G8Y0:T:27500:225:226:231:0:16398:0:0:0
+ProSieben:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:311:0:16403:0:0:0
+SAT.1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:391:0:16408:0:0:0
 MTV:778000:I0C23D0M16B8T8G8Y0:T:27500:193:194:199:0:16396:0:0:0
 n-tv:778000:I0C23D0M16B8T8G8Y0:T:27500:273:274:279:0:16401:0:0:0
 Eurosport:778000:I0C23D0M16B8T8G8Y0:T:27500:577:578:583:0:16420:0:0:0
diff --git a/config.c b/config.c
index ff7a4c059..8a30d3c1b 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.113 2003/04/12 09:37:48 kls Exp $
+ * $Id: config.c 1.114 2003/05/11 13:50:02 kls Exp $
  */
 
 #include "config.h"
@@ -266,6 +266,8 @@ cSetup::cSetup(void)
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 50;
+  PausePriority = 10;
+  PauseLifetime = 1;
   UseSubtitle = 1;
   RecordingDirs = 1;
   VideoFormat = 0;
@@ -415,6 +417,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+  else if (!strcasecmp(Name, "PausePriority"))       PausePriority      = atoi(Value);
+  else if (!strcasecmp(Name, "PauseLifetime"))       PauseLifetime      = atoi(Value);
   else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
@@ -462,6 +466,8 @@ bool cSetup::Save(void)
   Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
+  Store("PausePriority",      PausePriority);
+  Store("PauseLifetime",      PauseLifetime);
   Store("UseSubtitle",        UseSubtitle);
   Store("RecordingDirs",      RecordingDirs);
   Store("VideoFormat",        VideoFormat);
diff --git a/config.h b/config.h
index 343ed15f2..f474ef9ca 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.155 2003/04/27 15:56:04 kls Exp $
+ * $Id: config.h 1.158 2003/05/11 13:45:44 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.30"
+#define VDRVERSION "1.1.31"
+#define VDRVERSNUM   10131  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -217,6 +218,7 @@ class cSetup : public cConfig<cSetupLine> {
   int SortTimers;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
+  int PausePriority, PauseLifetime;
   int UseSubtitle;
   int RecordingDirs;
   int VideoFormat;
diff --git a/device.c b/device.c
index 9346d3b5b..b248114a5 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.41 2003/05/03 13:40:15 kls Exp $
+ * $Id: device.c 1.42 2003/05/11 08:53:09 kls Exp $
  */
 
 #include "device.h"
@@ -130,6 +130,14 @@ cSpuDecoder *cDevice::GetSpuDecoder(void)
   return NULL;
 }
 
+cDevice *cDevice::ActualDevice(void)
+{
+  cDevice *d = cTransferControl::ReceiverDevice();
+  if (!d)
+     d = PrimaryDevice();
+  return d;
+}
+
 cDevice *cDevice::GetDevice(int Index)
 {
   return (0 <= Index && Index < numDevices) ? device[Index] : NULL;
diff --git a/device.h b/device.h
index d2cc4f83d..a41312a27 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.32 2003/05/03 13:35:55 kls Exp $
+ * $Id: device.h 1.33 2003/05/11 08:50:04 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -75,6 +75,9 @@ class cDevice : public cThread {
          ///< \return true if this was possible.
   static cDevice *PrimaryDevice(void) { return primaryDevice; }
          ///< Returns the primary device.
+  static cDevice *ActualDevice(void);
+         ///< Returns the actual receiving device in case of Transfer Mode, or the
+         ///< primary device otherwise.
   static cDevice *GetDevice(int Index);
          ///< Gets the device with the given Index.
          ///< \param Index must be in the range 0..numDevices-1.
diff --git a/eit.c b/eit.c
index 9b2442ccb..76da2669a 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.74 2003/04/27 14:41:36 kls Exp $
+ * $Id: eit.c 1.75 2003/05/11 11:25:04 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1291,8 +1291,9 @@ void cSIProcessor::Action()
                               cEIT ceit(buf, seclen, schedules);
                               ceit.ProcessEIT(buf, currentSource);
                            }
-                           else
+                           /*else
                               dsyslog("Received stuffing section in EIT\n");
+                           */
                            break;
 
                         default: {
diff --git a/i18n.c b/i18n.c
index 734e01555..34b242358 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.107 2003/05/01 14:10:18 kls Exp $
+ * $Id: i18n.c 1.108 2003/05/11 13:54:23 kls Exp $
  *
  * Translations provided by:
  *
@@ -2222,6 +2222,38 @@ const tI18nPhrase Phrases[] = {
     "Prioritate implicita",
     "Default priority",
   },
+  { "Setup.Recording$Pause lifetime (d)",
+    "Pause Lebensdauer (d)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.Recording$Pause priority",
+    "Pause Priorit�t",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
     "Osnovni zivljenski cas (d)",
diff --git a/libdtv/liblx/liblx.h b/libdtv/liblx/liblx.h
index 26ea664ac..2e122956a 100644
--- a/libdtv/liblx/liblx.h
+++ b/libdtv/liblx/liblx.h
@@ -1,29 +1,30 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// liblx.h: definitions necessary for the liblx package   ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.2 $
-// $Date: 2001/06/25 19:39:00 $
-// $Author: hakenes $
-//
-//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// liblx is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// liblx is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with liblx; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
+/*
+ *
+ * liblx.h: definitions necessary for the liblx package
+ *
+ *
+ * $Revision: 1.2 $
+ * $Date: 2001/06/25 19:39:00 $
+ * $Author: hakenes $
+ *
+ *   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+ *
+ * liblx is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * liblx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You may have received a copy of the GNU General Public License
+ * along with liblx; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
 
 #ifndef LIBLX_H
 #define LIBLX_H
diff --git a/libdtv/liblx/xListFuncs.c b/libdtv/liblx/xListFuncs.c
index 01b85b856..88a908be4 100644
--- a/libdtv/liblx/xListFuncs.c
+++ b/libdtv/liblx/xListFuncs.c
@@ -1,29 +1,30 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// xListFuncs.c: list handling functions of liblx         ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.1 $
-// $Date: 2001/06/25 12:29:47 $
-// $Author: hakenes $
-//
-//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// liblx is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// liblx is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with liblx; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
+/*
+ *
+ * xListFuncs.c: list handling functions of liblx
+ *
+ *
+ * $Revision: 1.1 $
+ * $Date: 2001/06/25 12:29:47 $
+ * $Author: hakenes $
+ *
+ *   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+ *
+ * liblx is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * liblx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You may have received a copy of the GNU General Public License
+ * along with liblx; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
 
 #include <string.h>
 #include "liblx.h"
diff --git a/libdtv/liblx/xMemMgt.c b/libdtv/liblx/xMemMgt.c
index c93713b00..b1b07dee6 100644
--- a/libdtv/liblx/xMemMgt.c
+++ b/libdtv/liblx/xMemMgt.c
@@ -1,29 +1,30 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// xMemMgt.c: memory management functions of liblx        ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.1 $
-// $Date: 2001/06/25 12:29:47 $
-// $Author: hakenes $
-//
-//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// liblx is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// liblx is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with liblx; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
+/*
+ *
+ * xMemMgt.c: memory management functions of liblx
+ *
+ *
+ * $Revision: 1.1 $
+ * $Date: 2001/06/25 12:29:47 $
+ * $Author: hakenes $
+ *
+ *   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
+ *
+ * liblx is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * liblx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You may have received a copy of the GNU General Public License
+ * along with liblx; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index 715d18b22..b2f8ba2ed 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -1037,23 +1037,81 @@ struct SatelliteDeliverySystemDescriptor {
    unsigned short       Tag;
    long                 Frequency;
    short                OrbitalPosition;
+   short                Modulation;
    char                 Polarization;
    long                 SymbolRate;
    char                 FEC;
 };
 
-#define CreateSatelliteDeliverySystemDescriptor(descr, freq, orb, polar, sr, fec) \
+#define CreateSatelliteDeliverySystemDescriptor(descr, freq, orb, mod, polar, sr, fec) \
    do \
    { \
       xCreateNode (((struct SatelliteDeliverySystemDescriptor *)descr), NULL); \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->Tag = DESCR_SAT_DEL_SYS; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->Frequency = freq; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->OrbitalPosition = orb; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->Modulation = mod; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->Polarization = polar; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->FEC = fec; \
    } while (0)
 
+/* CableDeliverySystemDescriptor */
+
+struct CableDeliverySystemDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   long                 Frequency;
+   long                 SymbolRate;
+   char                 FECouter;
+   char                 FECinner;
+   char                 Modulation;
+};
+
+#define CreateCableDeliverySystemDescriptor(descr, freq, sr, fec_o, fec_i, mod) \
+   do \
+   { \
+      xCreateNode (((struct CableDeliverySystemDescriptor *)descr), NULL); \
+      ((struct CableDeliverySystemDescriptor *)descr)->Tag = DESCR_CABLE_DEL_SYS; \
+      ((struct CableDeliverySystemDescriptor *)descr)->Frequency = freq; \
+      ((struct CableDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
+      ((struct CableDeliverySystemDescriptor *)descr)->FECouter = fec_o; \
+      ((struct CableDeliverySystemDescriptor *)descr)->FECinner = fec_i; \
+      ((struct CableDeliverySystemDescriptor *)descr)->Modulation = mod; \
+   } while (0)
+
+/* TerrestrialDeliverySystemDescriptor */
+
+struct TerrestrialDeliverySystemDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   long                 Frequency;
+   char                 Bandwidth;
+   char                 Constellation;
+   char                 Hierarchy;
+   char                 CodeRateHP;
+   char                 CodeRateLP;
+   char                 GuardInterval;
+   char                 TransmissionMode;
+   char                 OtherFrequencyFlag;
+};
+
+#define CreateTerrestrialDeliverySystemDescriptor(descr, freq, bw, cst, hr, crh, crl, gi, tm, ofm) \
+   do \
+   { \
+      xCreateNode (((struct CableDeliverySystemDescriptor *)descr), NULL); \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Tag = DESCR_TERR_DEL_SYS; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Frequency = freq; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Bandwidth = bw; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Constellation = cst; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Hierarchy = hr; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->CodeRateHP = crh; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->CodeRateLP = crl; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->GuardInterval = gi; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->TransmissionMode = tm; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->OtherFrequencyFlag = ofm; \
+   } while (0)
+
 /* ServiceListDescriptor */
 
 struct ServiceListDescriptor {
diff --git a/libdtv/libsi/include/si_tables.h b/libdtv/libsi/include/si_tables.h
index b7cfea2a0..24c316de6 100644
--- a/libdtv/libsi/include/si_tables.h
+++ b/libdtv/libsi/include/si_tables.h
@@ -1126,7 +1126,41 @@ typedef struct item_subtitling_struct {
 typedef struct descr_terrestrial_delivery_struct {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
+   u_char frequency1                             :8;
+   u_char frequency2                             :8;
+   u_char frequency3                             :8;
+   u_char frequency4                             :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char bandwidth                              :3;
+   u_char reserved1                              :5;
+#else
+   u_char reserved1                              :5;
+   u_char bandwidth                              :3;
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char constellation                          :2;
+   u_char hierarchy                              :3;
+   u_char code_rate_HP                           :3;
+#else
+   u_char code_rate_HP                           :3;
+   u_char hierarchy                              :3;
+   u_char constellation                          :2;
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char code_rate_LP                           :3;
+   u_char guard_interval                         :2;
+   u_char transmission_mode                      :2;
+   u_char other_frequency_flag                   :1;
+#else
+   u_char other_frequency_flag                   :1;
+   u_char transmission_mode                      :2;
+   u_char guard_interval                         :2;
+   u_char code_rate_LP                           :3;
+#endif
+   u_char reserver2                              :8;
+   u_char reserver3                              :8;
+   u_char reserver4                              :8;
+   u_char reserver5                              :8;
 } descr_terrestrial_delivery_system_t;
 #define CastTerrestrialDeliverySystemDescriptor(x) ((descr_terrestrial_delivery_system_t *)(x))
 
diff --git a/libdtv/libsi/si_debug_services.c b/libdtv/libsi/si_debug_services.c
index ac8de34cc..1ff740007 100644
--- a/libdtv/libsi/si_debug_services.c
+++ b/libdtv/libsi/si_debug_services.c
@@ -535,11 +535,44 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
             printf ("%s   Frequency: %ld\n", Prepend, sds->Frequency);
             printf ("%s   OrbitalPosition: %d\n", Prepend, sds->OrbitalPosition);
             printf ("%s   Polarization: %c\n", Prepend, sds->Polarization);
+            printf ("%s   Modulation: %c\n", Prepend, sds->Modulation);
             printf ("%s   SymbolRate: %ld\n", Prepend, sds->SymbolRate);
             printf ("%s   FEC: %c\n", Prepend, sds->FEC);
          }
          break;
 
+         case DESCR_CABLE_DEL_SYS:
+         {
+            struct CableDeliverySystemDescriptor *cds =
+                (struct CableDeliverySystemDescriptor *)Descriptor;
+
+            printf ("%sDescriptor: Cable Delivery System\n", Prepend);
+            printf ("%s   Frequency: %ld\n", Prepend, cds->Frequency);
+            printf ("%s   SymbolRate: %ld\n", Prepend, cds->SymbolRate);
+            printf ("%s   FEC outer: %d\n", Prepend, cds->FECouter);
+            printf ("%s   FEC inner: %d\n", Prepend, cds->FECinner);
+            printf ("%s   Modulation: %d\n", Prepend, cds->Modulation);
+         }
+         break;
+
+         case DESCR_TERR_DEL_SYS:
+         {
+            struct TerrestrialDeliverySystemDescriptor *tds =
+                (struct TerrestrialDeliverySystemDescriptor *)Descriptor;
+
+            printf ("%sDescriptor: Terrestrial Delivery System\n", Prepend);
+            printf ("%s   Frequency: %ld\n", Prepend, tds->Frequency);
+            printf ("%s   Bandwidth: %d\n", Prepend, tds->Bandwidth);
+            printf ("%s   Constellation: %d\n", Prepend, tds->Constellation);
+            printf ("%s   Hierarchy: %d\n", Prepend, tds->Hierarchy);
+            printf ("%s   CodeRateHP: %d\n", Prepend, tds->CodeRateHP);
+            printf ("%s   CodeRateLP: %d\n", Prepend, tds->CodeRateLP);
+            printf ("%s   GuardInterval: %d\n", Prepend, tds->GuardInterval);
+            printf ("%s   TransmissionMode: %d\n", Prepend, tds->TransmissionMode);
+            printf ("%s   OtherFrequencyFlag: %d\n", Prepend, tds->OtherFrequencyFlag);
+         }
+         break;
+
          case DESCR_SERVICE_LIST:
          {
             struct ServiceListEntry *Entry;
@@ -572,12 +605,10 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
          break;
 
          case DESCR_STUFFING:
-         case DESCR_CABLE_DEL_SYS:
          case DESCR_VBI_DATA:
          case DESCR_VBI_TELETEXT:
          case DESCR_MOSAIC:
          case DESCR_TELEPHONE:
-         case DESCR_TERR_DEL_SYS:
          case DESCR_ML_NW_NAME:
          case DESCR_ML_BQ_NAME:
          case DESCR_ML_SERVICE_NAME:
@@ -598,7 +629,7 @@ void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
          case DESCR_CELL_FREQ_LINK:
          case DESCR_ANNOUNCEMENT_SUPPORT:
          default:
-            printf ("%sDescriptor: (noch nicht unterst�tzt)\n", Prepend);
+            printf ("%sDescriptor: %02x (noch nicht unterst�tzt)\n", Prepend, DescriptorTag (Descriptor));
          break;
       }
    }
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index e8cf8b213..a922b7e3c 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -1050,6 +1050,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
             (sds->west_east_flag ? 1 : -1) *
             (BcdCharToInt (sds->orbital_position1) * 100 +
             BcdCharToInt (sds->orbital_position2)),
+            sds->modulation,
             sds->polarization,
             BcdCharToInt (sds->symbol_rate1) * 10 * 1000 +
             BcdCharToInt (sds->symbol_rate2) * 100 +
@@ -1064,6 +1065,68 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       }
       break;
 
+      case DESCR_CABLE_DEL_SYS:
+//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
+      {
+         descr_cable_delivery_system_t *cds;
+         cds = (descr_cable_delivery_system_t *) Ptr;
+         if (CheckBcdChar (cds->frequency1) && CheckBcdChar (cds->frequency2) &&
+             CheckBcdChar (cds->frequency3) && CheckBcdChar (cds->frequency4) &&
+             CheckBcdChar (cds->symbol_rate1) && CheckBcdChar (cds->symbol_rate1) &&
+             CheckBcdChar (cds->symbol_rate3) && (cds->fec_inner != 0))
+         {
+           CreateCableDeliverySystemDescriptor (Descriptor,
+            BcdCharToInt (cds->frequency1) * 100 * 1000 * 1000 +
+            BcdCharToInt (cds->frequency2) * 1000 * 1000 +
+            BcdCharToInt (cds->frequency3) * 10 * 1000 +
+            BcdCharToInt (cds->frequency4) * 100,
+            BcdCharToInt (cds->symbol_rate1) * 10 * 1000 +
+            BcdCharToInt (cds->symbol_rate2) * 100 +
+            BcdCharToInt (cds->symbol_rate3),
+            cds->fec_outer,
+            cds->fec_inner,
+            cds->modulation
+           );
+         }
+         /* else
+         {
+            fprintf (stderr, "Illegal cds descriptor\n");
+            siDumpDescriptor (Buffer);
+         } */
+      }
+      break;
+
+      case DESCR_TERR_DEL_SYS:
+//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
+      {
+         descr_terrestrial_delivery_system_t *tds;
+         tds = (descr_terrestrial_delivery_system_t *) Ptr;
+         if (CheckBcdChar (tds->frequency1) && CheckBcdChar (tds->frequency2) &&
+             CheckBcdChar (tds->frequency3) && CheckBcdChar (tds->frequency4))
+         {
+           CreateTerrestrialDeliverySystemDescriptor (Descriptor,
+            BcdCharToInt (tds->frequency1) * 100 * 1000 * 1000 +
+            BcdCharToInt (tds->frequency2) * 1000 * 1000 +
+            BcdCharToInt (tds->frequency3) * 10 * 1000 +
+            BcdCharToInt (tds->frequency4) * 100,
+            tds->bandwidth,
+            tds->constellation,
+          tds->hierarchy,
+          tds->code_rate_HP,
+          tds->code_rate_LP,
+            tds->guard_interval,
+            tds->transmission_mode,
+            tds->other_frequency_flag
+           );
+         }
+         /* else
+         {
+            fprintf (stderr, "Illegal cds descriptor\n");
+            siDumpDescriptor (Buffer);
+         } */
+      }
+      break;
+
       case DESCR_SERVICE_LIST:
 //         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
          CreateServiceListDescriptor (Descriptor);
@@ -1119,12 +1182,10 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
       case DESCR_SMOOTHING_BUFFER:
       case DESCR_STD:
       case DESCR_IBP:
-      case DESCR_CABLE_DEL_SYS:
       case DESCR_VBI_DATA:
       case DESCR_VBI_TELETEXT:
       case DESCR_MOSAIC:
       case DESCR_TELEPHONE:
-      case DESCR_TERR_DEL_SYS:
       case DESCR_ML_NW_NAME:
       case DESCR_ML_BQ_NAME:
       case DESCR_ML_SERVICE_NAME:
@@ -1181,7 +1242,6 @@ char *siGetDescriptorTextHandler (u_char *Buffer, int Length, int type)
          if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') ||
              (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer;
          if (*Buffer == 0x8A) *tmp++ = '\n';
-         if (*Buffer == 0x86 || *Buffer == 0x87) *tmp++ = ' ';
          if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' ';
          Buffer++;
       }
diff --git a/libdtv/libvdr/libvdr.c b/libdtv/libvdr/libvdr.c
index 0ade4d39d..e041fd82f 100644
--- a/libdtv/libvdr/libvdr.c
+++ b/libdtv/libvdr/libvdr.c
@@ -47,7 +47,8 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
    struct LIST                *Result, *EventList;
    struct Event               *Event;
    struct Descriptor          *Descriptor;
-
+   int GotVdrProgramInfo;
+   
    if (!siBuffer) return (NULL);
 
    if (!(EventList = siParseEIT (siBuffer))) return (NULL);
@@ -57,9 +58,18 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
    xForeach (EventList, Event)
    {
       VdrProgramInfo = NULL;
-
+      GotVdrProgramInfo = 0;
+      
       xForeach (Event->Descriptors, Descriptor)
       {
+         if (!VdrProgramInfo)
+         {
+            CreateVdrProgramInfo(VdrProgramInfo,
+               Event->EventID, Event->TransportStreamID,
+               Event->ServiceID, Event->StartTime,
+               Event->Duration, Event->Status);
+         }
+         
          switch (Descriptor->Tag)
          {
             case DESCR_SHORT_EVENT:
@@ -67,43 +77,29 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                if (!xName(Descriptor) || !xName(Descriptor)[0])
                   break;
 
-               if (!VdrProgramInfo)
-               {
-                  CreateVdrProgramInfo(VdrProgramInfo,
-                     Event->EventID, Event->TransportStreamID,
-                     Event->ServiceID, Event->StartTime,
-                     Event->Duration, Event->Status);
-
-                  VdrProgramInfo->ShortName =
-                     xSetText (xName (Descriptor));
-                  VdrProgramInfo->ShortText =
-                     xSetText (((struct ShortEventDescriptor
-                        *)Descriptor)->Text);
-                  memcpy (VdrProgramInfo->LanguageCode, ((struct
-                     ShortEventDescriptor *)Descriptor)->
-                     LanguageCode, 4);
-               }
-            }
+               VdrProgramInfo->ShortName =
+                  xSetText (xName (Descriptor));
+               VdrProgramInfo->ShortText =
+                  xSetText (((struct ShortEventDescriptor
+                     *)Descriptor)->Text);
+               memcpy (VdrProgramInfo->LanguageCode, ((struct
+                  ShortEventDescriptor *)Descriptor)->
+                  LanguageCode, 4);
+               GotVdrProgramInfo = 1;
+            }      
             break;
 
             case DESCR_TIME_SHIFTED_EVENT:
             {
                struct tm *StartTime;
 
-               if (!VdrProgramInfo)
-               {
-                  CreateVdrProgramInfo(VdrProgramInfo,
-                     Event->EventID, Event->TransportStreamID,
-                     Event->ServiceID, Event->StartTime,
-                     Event->Duration, Event->Status);
-
-                  VdrProgramInfo->ReferenceServiceID =
-                     ((struct TimeShiftedEventDescriptor
-                        *)Descriptor)->ReferenceServiceID;
-                  VdrProgramInfo->ReferenceEventID =
-                     ((struct TimeShiftedEventDescriptor
-                        *)Descriptor)->ReferenceEventID;
-               }
+               VdrProgramInfo->ReferenceServiceID =
+                  ((struct TimeShiftedEventDescriptor
+                     *)Descriptor)->ReferenceServiceID;
+               VdrProgramInfo->ReferenceEventID =
+                  ((struct TimeShiftedEventDescriptor
+                     *)Descriptor)->ReferenceEventID;
+               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -111,20 +107,18 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
             {
                struct ExtendedEventItem *Item;
 
-               if (VdrProgramInfo)
+               if (xName (Descriptor))
+                  AddToText (xName (Descriptor),
+                     VdrProgramInfo->ExtendedName);
+               xForeach (((struct ExtendedEventDescriptor*)
+                  Descriptor)->Items, Item)
                {
-                  if (xName (Descriptor))
-                     AddToText (xName (Descriptor),
-                        VdrProgramInfo->ExtendedName);
-                  xForeach (((struct ExtendedEventDescriptor*)
-                     Descriptor)->Items, Item)
-                  {
-                     AddItemToText (xName (Item),
-                        VdrProgramInfo->ExtendedText);
-                     AddItemToText (Item->Text,
-                        VdrProgramInfo->ExtendedText);
-                  }
+                  AddItemToText (xName (Item),
+                     VdrProgramInfo->ExtendedText);
+                  AddItemToText (Item->Text,
+                     VdrProgramInfo->ExtendedText);
                }
+               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -132,37 +126,33 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
             {
                int i, j;
 
-               if (VdrProgramInfo)
+               for (j = 0; j < ((struct ContentDescriptor*)
+                  Descriptor)->Amount; j++)
                {
-                  for (j = 0; j < ((struct ContentDescriptor*)
-                     Descriptor)->Amount; j++)
-                  {
-                     VdrProgramInfo->ContentNibble1 =
-                        GetContentContentNibble1(Descriptor, j);
-                     VdrProgramInfo->ContentNibble2 =
-                        GetContentContentNibble2(Descriptor, j);
-                  }
+                  VdrProgramInfo->ContentNibble1 =
+                     GetContentContentNibble1(Descriptor, j);
+                  VdrProgramInfo->ContentNibble2 =
+                     GetContentContentNibble2(Descriptor, j);
                }
+               GotVdrProgramInfo = 1;
             }
             break;
 
             case DESCR_PARENTAL_RATING:
             {
                struct ParentalRating *Rating;
-
-               if (VdrProgramInfo)
-               {
-                  xForeach (((struct ParentalRatingDescriptor *)
-                              Descriptor)->Ratings, Rating)
-                     if (!strncmp (VdrProgramInfo->LanguageCode,
-                             Rating->LanguageCode, 3))
-                        VdrProgramInfo->Rating = Rating->Rating;
-               }
+               
+               xForeach (((struct ParentalRatingDescriptor *)
+                           Descriptor)->Ratings, Rating)
+                  if (!strncmp (VdrProgramInfo->LanguageCode,
+                          Rating->LanguageCode, 3))
+                     VdrProgramInfo->Rating = Rating->Rating;
+               GotVdrProgramInfo = 1;
             }
             break;
          }
-      }
-      if (VdrProgramInfo) xAddTail (Result, VdrProgramInfo);
+      }      
+      if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo);
    }
 
    return (Result);
diff --git a/menu.c b/menu.c
index 7fc2f3660..b8dbf5b32 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.241 2003/05/03 15:59:07 kls Exp $
+ * $Id: menu.c 1.243 2003/05/11 13:58:13 kls Exp $
  */
 
 #include "menu.h"
@@ -1704,6 +1704,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
+  Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   if (!Base) {
      Interface->Status(tr("scanning recordings..."));
      Interface->Flush();
@@ -1737,7 +1738,6 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
      else if (OpenSubMenus && Open(true))
         return;
      }
-  Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   SetHelpKeys();
 }
 
@@ -2188,6 +2188,8 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),             &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),          &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"),      &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Pause priority"),            &data.PausePriority, 0, MAXPRIORITY));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Pause lifetime (d)"),        &data.PauseLifetime, 0, MAXLIFETIME));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
   Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
@@ -2907,7 +2909,7 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
 
 // --- cRecordControl --------------------------------------------------------
 
-cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
+cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause = false)
 {
   eventInfo = NULL;
   instantId = NULL;
@@ -2917,7 +2919,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer)
   if (!device) device = cDevice::PrimaryDevice();//XXX
   timer = Timer;
   if (!timer) {
-     timer = new cTimer(true);
+     timer = new cTimer(true, Pause);
      Timers.Add(timer);
      Timers.Save();
      asprintf(&instantId, cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
@@ -3014,14 +3016,15 @@ bool cRecordControl::Process(time_t t)
 
 cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL };
 
-bool cRecordControls::Start(cTimer *Timer)
+bool cRecordControls::Start(cTimer *Timer, bool Pause)
 {
   int ch = Timer ? Timer->Channel()->Number() : cDevice::CurrentChannel();
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
      bool NeedsDetachReceivers = false;
-     cDevice *device = cDevice::GetDevice(channel, Timer ? Timer->Priority() : Setup.DefaultPriority, &NeedsDetachReceivers);
+     int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority;
+     cDevice *device = cDevice::GetDevice(channel, Priority, &NeedsDetachReceivers);
      if (device) {
         if (NeedsDetachReceivers)
            Stop(device);
@@ -3031,7 +3034,7 @@ bool cRecordControls::Start(cTimer *Timer)
            }
         for (int i = 0; i < MAXRECORDCONTROLS; i++) {
             if (!RecordControls[i]) {
-               RecordControls[i] = new cRecordControl(device, Timer);
+               RecordControls[i] = new cRecordControl(device, Timer, Pause);
                return true;
                }
             }
@@ -3087,7 +3090,7 @@ bool cRecordControls::PauseLiveVideo(void)
   Interface->Status(tr("Pausing live video..."));
   Interface->Flush();
   cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
-  if (Start()) {
+  if (Start(NULL, true)) {
      sleep(2); // allow recorded file to fill up enough to start replaying
      cReplayControl *rc = new cReplayControl;
      cControl::Launch(rc);
diff --git a/menu.h b/menu.h
index fab74a7f5..a40450577 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.54 2003/04/21 13:40:45 kls Exp $
+ * $Id: menu.h 1.55 2003/05/11 13:43:58 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -116,7 +116,7 @@ class cRecordControl {
   char *fileName;
   bool GetEventInfo(void);
 public:
-  cRecordControl(cDevice *Device, cTimer *Timer = NULL);
+  cRecordControl(cDevice *Device, cTimer *Timer = NULL, bool Pause = false);
   virtual ~cRecordControl();
   bool Process(time_t t);
   bool Uses(cDevice *Device) { return Device == device; }
@@ -131,7 +131,7 @@ class cRecordControls {
 private:
   static cRecordControl *RecordControls[];
 public:
-  static bool Start(cTimer *Timer = NULL);
+  static bool Start(cTimer *Timer = NULL, bool Pause = false);
   static void Stop(const char *InstantId);
   static void Stop(cDevice *Device);
   static bool StopPrimary(bool DoIt = false);
diff --git a/newplugin b/newplugin
index 1f4d5da18..e47426630 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.14 2002/12/13 14:51:46 kls Exp $
+# $Id: newplugin 1.15 2003/05/09 14:59:28 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -162,6 +162,7 @@ public:
   virtual const char *Description(void) { return DESCRIPTION; }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Initialize(void);
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
@@ -194,6 +195,12 @@ bool cPlugin${PLUGIN_CLASS}::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
+bool cPlugin${PLUGIN_CLASS}::Initialize(void)
+{
+  // Initialize any background activities the plugin shall perform.
+  return true;
+}
+
 bool cPlugin${PLUGIN_CLASS}::Start(void)
 {
   // Start any background activities the plugin shall perform.
diff --git a/plugin.c b/plugin.c
index 5b8bc5ff1..743953480 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.8 2002/11/16 14:22:37 kls Exp $
+ * $Id: plugin.c 1.9 2003/05/09 15:01:26 kls Exp $
  */
 
 #include "plugin.h"
@@ -50,6 +50,11 @@ bool cPlugin::ProcessArgs(int argc, char *argv[])
   return true;
 }
 
+bool cPlugin::Initialize(void)
+{
+  return true;
+}
+
 bool cPlugin::Start(void)
 {
   return true;
@@ -293,6 +298,22 @@ bool cPluginManager::LoadPlugins(bool Log)
   return true;
 }
 
+bool cPluginManager::InitializePlugins(void)
+{
+  for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
+      cPlugin *p = dll->Plugin();
+      if (p) {
+         int Language = Setup.OSDLanguage;
+         Setup.OSDLanguage = 0; // the i18n texts are only available _after_ Start()
+         isyslog("initializing plugin: %s (%s): %s", p->Name(), p->Version(), p->Description());
+         Setup.OSDLanguage = Language;
+         if (!p->Initialize())
+            return false;
+         }
+      }
+  return true;
+}
+
 bool cPluginManager::StartPlugins(void)
 {
   for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
@@ -300,7 +321,7 @@ bool cPluginManager::StartPlugins(void)
       if (p) {
          int Language = Setup.OSDLanguage;
          Setup.OSDLanguage = 0; // the i18n texts are only available _after_ Start()
-         isyslog("starting plugin: %s (%s): %s", p->Name(), p->Version(), p->Description());
+         isyslog("starting plugin: %s", p->Name());
          Setup.OSDLanguage = Language;
          if (!p->Start())
             return false;
diff --git a/plugin.h b/plugin.h
index d3e26d626..0a753faaa 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.5 2002/11/16 14:22:24 kls Exp $
+ * $Id: plugin.h 1.6 2003/05/09 14:57:55 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -33,6 +33,7 @@ class cPlugin {
   virtual const char *CommandLineHelp(void);
 
   virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Initialize(void);
   virtual bool Start(void);
   virtual void Housekeeping(void);
 
@@ -78,6 +79,7 @@ class cPluginManager {
   void SetDirectory(const char *Directory);
   void AddPlugin(const char *Args);
   bool LoadPlugins(bool Log = false);
+  bool InitializePlugins(void);
   bool StartPlugins(void);
   void Housekeeping(void);
   static bool HasPlugins(void);
diff --git a/recording.c b/recording.c
index 23521a616..3610382e3 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.76 2003/04/27 15:52:17 kls Exp $
+ * $Id: recording.c 1.77 2003/05/11 13:09:08 kls Exp $
  */
 
 #include "recording.h"
@@ -768,7 +768,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 #define MAXINDEXCATCHUP   2 // seconds
 
 // The minimum age of an index file for considering it no longer to be written:
-#define MININDEXAGE     300 // seconds
+#define MININDEXAGE    3600 // seconds
 
 cIndexFile::cIndexFile(const char *FileName, bool Record)
 :resumeFile(FileName)
diff --git a/ringbuffer.c b/ringbuffer.c
index 6913c71fc..770b7c342 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.15 2003/04/27 09:54:32 kls Exp $
+ * $Id: ringbuffer.c 1.16 2003/05/11 09:47:56 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -31,30 +31,6 @@ cRingBuffer::~cRingBuffer()
      dsyslog("buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
 
-void cRingBuffer::WaitForPut(void)
-{
-  putMutex.Lock();
-  readyForPut.TimedWait(putMutex, 1000);
-  putMutex.Unlock();
-}
-
-void cRingBuffer::WaitForGet(void)
-{
-  getMutex.Lock();
-  readyForGet.TimedWait(getMutex, 10);
-  getMutex.Unlock();
-}
-
-void cRingBuffer::EnablePut(void)
-{
-  readyForPut.Broadcast();
-}
-
-void cRingBuffer::EnableGet(void)
-{
-  readyForGet.Broadcast();
-}
-
 // --- cRingBufferLinear -----------------------------------------------------
 
 cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics)
@@ -92,8 +68,6 @@ void cRingBufferLinear::Clear(void)
   head = tail = margin;
   lastGet = -1;
   Unlock();
-  EnablePut();
-  EnableGet();
 }
 
 int cRingBufferLinear::Put(const uchar *Data, int Count)
@@ -135,9 +109,6 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
      else
         Count = 0;
      Unlock();
-     EnableGet();
-     if (Count == 0)
-        WaitForPut();
      }
   return Count;
 }
@@ -163,8 +134,6 @@ uchar *cRingBufferLinear::Get(int &Count)
      Count = lastGet = cont;
      }
   Unlock();
-  if (!p)
-     WaitForGet();
   return p;
 }
 
@@ -177,7 +146,6 @@ void cRingBufferLinear::Del(int Count)
      if (tail >= Size())
         tail = margin;
      Unlock();
-     EnablePut();
      }
   else
      esyslog("ERROR: invalid Count in cRingBufferLinear::Del: %d", Count);
@@ -228,8 +196,6 @@ void cRingBufferFrame::Clear(void)
   while ((p = Get()) != NULL)
         Drop(p);
   Unlock();
-  EnablePut();
-  EnableGet();
 }
 
 bool cRingBufferFrame::Put(cFrame *Frame)
@@ -246,7 +212,6 @@ bool cRingBufferFrame::Put(cFrame *Frame)
         }
      currentFill += Frame->Count();
      Unlock();
-     EnableGet();
      return true;
      }
   return false;
@@ -284,7 +249,6 @@ void cRingBufferFrame::Drop(cFrame *Frame)
         esyslog("ERROR: attempt to drop wrong frame from ring buffer!");
      }
   Unlock();
-  EnablePut();
 }
 
 int cRingBufferFrame::Available(void)
diff --git a/ringbuffer.h b/ringbuffer.h
index 0ce0a4858..6b256627b 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.10 2003/04/27 09:55:08 kls Exp $
+ * $Id: ringbuffer.h 1.11 2003/05/11 09:48:23 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -16,17 +16,11 @@
 class cRingBuffer {
 private:
   cMutex mutex;
-  cCondVar readyForPut, readyForGet;
-  cMutex putMutex, getMutex;
   int size;
 protected:
   int maxFill;//XXX
   int lastPercent;
   bool statistics;//XXX
-  void WaitForPut(void);
-  void WaitForGet(void);
-  void EnablePut(void);
-  void EnableGet(void);
   virtual void Clear(void) = 0;
   virtual int Available(void) = 0;
   int Free(void) { return size - Available() - 1; }
diff --git a/timers.c b/timers.c
index 8c982e2db..154294275 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.4 2003/04/27 11:11:45 kls Exp $
+ * $Id: timers.c 1.5 2003/05/11 13:48:49 kls Exp $
  */
 
 #include "timers.h"
@@ -20,7 +20,7 @@
 
 char *cTimer::buffer = NULL;
 
-cTimer::cTimer(bool Instant)
+cTimer::cTimer(bool Instant, bool Pause)
 {
   startTime = stopTime = 0;
   recording = pending = false;
@@ -35,8 +35,8 @@ cTimer::cTimer(bool Instant)
   stop = (stop / 60) * 100 + (stop % 60);
   if (stop >= 2400)
      stop -= 2400;
-  priority = Setup.DefaultPriority;
-  lifetime = Setup.DefaultLifetime;
+  priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
+  lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
   *file = 0;
   firstday = 0;
   summary = NULL;
diff --git a/timers.h b/timers.h
index a179e52cf..3b1a3ca46 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.4 2003/02/09 12:49:45 kls Exp $
+ * $Id: timers.h 1.5 2003/05/11 13:35:53 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -38,7 +38,7 @@ class cTimer : public cListObject {
   time_t firstday;
   char *summary;
 public:
-  cTimer(bool Instant = false);
+  cTimer(bool Instant = false, bool Pause = false);
   cTimer(const cEventInfo *EventInfo);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
diff --git a/transfer.c b/transfer.c
index 9354e58ff..cdde55202 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.11 2003/03/30 12:52:11 kls Exp $
+ * $Id: transfer.c 1.12 2003/05/11 08:48:05 kls Exp $
  */
 
 #include "transfer.h"
@@ -179,13 +179,17 @@ void cTransfer::SetAudioTrack(int Index)
 
 // --- cTransferControl ------------------------------------------------------
 
+cDevice *cTransferControl::receiverDevice = NULL;
+
 cTransferControl::cTransferControl(cDevice *ReceiverDevice, int VPid, int APid1, int APid2, int DPid1, int DPid2)
 :cControl(transfer = new cTransfer(VPid, APid1, APid2, DPid1, DPid2), true)
 {
   ReceiverDevice->AttachReceiver(transfer);
+  receiverDevice = ReceiverDevice;
 }
 
 cTransferControl::~cTransferControl()
 {
+  receiverDevice = NULL;
   delete transfer;
 }
diff --git a/transfer.h b/transfer.h
index d94c85ab6..5ecb96ad8 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.3 2002/10/12 12:59:05 kls Exp $
+ * $Id: transfer.h 1.4 2003/05/11 08:48:36 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -40,10 +40,12 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
 class cTransferControl : public cControl {
 private:
   cTransfer *transfer;
+  static cDevice *receiverDevice;
 public:
   cTransferControl(cDevice *ReceiverDevice, int VPid, int APid1, int APid2, int DPid1, int DPid2);
   ~cTransferControl();
   virtual void Hide(void) {}
+  static cDevice *ReceiverDevice(void) { return receiverDevice; }
   };
 
 #endif //__TRANSFER_H
diff --git a/vdr.c b/vdr.c
index ae4edd560..c969e6eb8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.152 2003/05/03 13:39:57 kls Exp $
+ * $Id: vdr.c 1.154 2003/05/11 08:39:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -355,9 +355,9 @@ int main(int argc, char *argv[])
 
   cDvbDevice::Initialize();
 
-  // Start plugins:
+  // Initialize plugins:
 
-  if (!PluginManager.StartPlugins())
+  if (!PluginManager.InitializePlugins())
      return 2;
 
   // Primary device:
@@ -437,6 +437,18 @@ int main(int argc, char *argv[])
   if (WatchdogTimeout > 0)
      if (signal(SIGALRM, Watchdog)   == SIG_IGN) signal(SIGALRM, SIG_IGN);
 
+  // Watchdog:
+
+  if (WatchdogTimeout > 0) {
+     dsyslog("setting watchdog timer to %d seconds", WatchdogTimeout);
+     alarm(WatchdogTimeout); // Initial watchdog timer start
+     }
+
+  // Start plugins:
+
+  if (!PluginManager.StartPlugins())
+     return 2;
+
   // Main program loop:
 
   cOsdObject *Menu = NULL;
@@ -448,11 +460,6 @@ int main(int argc, char *argv[])
   bool ForceShutdown = false;
   bool UserShutdown = false;
 
-  if (WatchdogTimeout > 0) {
-     dsyslog("setting watchdog timer to %d seconds", WatchdogTimeout);
-     alarm(WatchdogTimeout); // Initial watchdog timer start
-     }
-
   while (!Interrupted) {
         // Handle emergency exits:
         if (cThread::EmergencyExit()) {
@@ -462,7 +469,7 @@ int main(int argc, char *argv[])
         // Attach launched player control:
         cControl::Attach();
         // Make sure we have a visible programme in case device usage has changed:
-        if (!cDevice::PrimaryDevice()->HasProgramme()) {
+        if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
            if (time(NULL) - lastTime > MINCHANNELWAIT) {
               if (!Channels.SwitchTo(cDevice::CurrentChannel()))

From 3bd9a7ccf355e445685ff115464a4e684a8c4211 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 18 May 2003 18:00:00 +0200
Subject: [PATCH 073/307] =?UTF-8?q?Version=201.1.32=20-=20Removed=20a=20fa?=
 =?UTF-8?q?ulty=20parameter=20initialization=20in=20menu.c=20(thanks=20to?=
 =?UTF-8?q?=20Lauri=20Tischler=20for=20=20=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Re-implemented=20the=20WaitForPut/WaitForGet=20stuff=20in=20?=
 =?UTF-8?q?cRingBuffer,=20since=20some=20plugins=20=20=20actually=20need?=
 =?UTF-8?q?=20this.=20By=20default=20the=20buffer=20does=20not=20wait;=20i?=
 =?UTF-8?q?f=20a=20plugin=20needs=20the=20=20=20waiting=20functionality=20?=
 =?UTF-8?q?it=20can=20call=20the=20new=20SetTimeouts()=20function.=20-=20M?=
 =?UTF-8?q?oved=20the=20call=20to=20cPlugin::Start()=20further=20up=20in?=
 =?UTF-8?q?=20vdr.c,=20to=20make=20sure=20it=20gets=20=20=20called=20befor?=
 =?UTF-8?q?e=20trying=20to=20learn=20the=20keys=20(problem=20reported=20by?=
 =?UTF-8?q?=20Oliver=20Endriss).=20-=20No=20longer=20starting=20the=20edit?=
 =?UTF-8?q?ing=20process=20if=20no=20marks=20have=20been=20set=20(thanks?=
 =?UTF-8?q?=20to=20=20=20Matthias=20Raus=20for=20reporting=20this=20one).?=
 =?UTF-8?q?=20-=20Added=20Catalanian=20language=20texts=20(thanks=20to=20M?=
 =?UTF-8?q?arc=20Rovira=20Vall=20and=20Ramon=20Roca).=20=20=20Plugin=20aut?=
 =?UTF-8?q?hors=20may=20want=20to=20add=20the=20new=20entries=20to=20their?=
 =?UTF-8?q?=20I18N=20texts=20and=20contact=20=20=20the=20translators=20to?=
 =?UTF-8?q?=20have=20their=20texts=20translated.=20Note=20that=20there=20a?=
 =?UTF-8?q?re=20now=2016=20=20=20different=20OSD=20languages,=20so=20pleas?=
 =?UTF-8?q?e=20make=20sure=20you=20have=2016=20versions=20for=20each=20of?=
 =?UTF-8?q?=20=20=20your=20texts.=20-=20Moved=20the=20detection=20of=20a?=
 =?UTF-8?q?=20broken=20video=20data=20stream=20from=20the=20cDevice=20into?=
 =?UTF-8?q?=20the=20=20=20cRecorder=20to=20avoid=20problems=20with=20cRece?=
 =?UTF-8?q?ivers=20that=20want=20to=20receive=20from=20PIDs=20=20=20that?=
 =?UTF-8?q?=20are=20currently=20not=20transmitting=20(thanks=20to=20Marcel?=
 =?UTF-8?q?=20Wiesweg=20for=20reporting=20=20=20this=20one).=20-=20Fixed?=
 =?UTF-8?q?=20setting=20the=20locking=20pid=20after=20a=20timed=20wait=20(?=
 =?UTF-8?q?thanks=20to=20Andreas=20Schultz).=20-=20Avoiding=20spurious=20s?=
 =?UTF-8?q?ection=20filter=20settings=20after=20a=20channel=20switch.=20-?=
 =?UTF-8?q?=20Updated=20'channels.conf.cable'=20(thanks=20to=20Stefan=20Hu?=
 =?UTF-8?q?=C3=9Ffeldt).=20-=20Fixed=20reading=20'epg.data'=20for=20channe?=
 =?UTF-8?q?ls=20with=20non-zero=20RID=20(thanks=20to=20Oliver=20=20=20Endr?=
 =?UTF-8?q?iss=20for=20reporting=20this=20one).=20-=20Fixed=20EPG=20bugfix?=
 =?UTF-8?q?=20statistics=20to=20avoid=20log=20entires=20for=20undefined=20?=
 =?UTF-8?q?channels=20(thanks=20=20=20to=20Lars=20Bl=C3=A4ser=20for=20repo?=
 =?UTF-8?q?rting=20this=20one).=20-=20No=20longer=20waiting=20inside=20cIn?=
 =?UTF-8?q?dexFile::CatchUp()=20to=20avoid=20shortly=20blocking=20replay?=
 =?UTF-8?q?=20=20=20at=20the=20end=20of=20a=20recording.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS        |  17 +++
 HISTORY             |  32 ++++-
 PLUGINS.html        |  38 +++--
 channels.conf       |   4 +-
 channels.conf.cable |  11 +-
 config.h            |   6 +-
 device.c            |  15 +-
 eit.c               |  43 ++++--
 eit.h               |   3 +-
 i18n.c              | 340 +++++++++++++++++++++++++++++++++++++-------
 i18n.h              |   4 +-
 menu.c              |   8 +-
 recorder.c          |  13 +-
 recording.c         |  90 ++++++------
 ringbuffer.c        |  51 ++++++-
 ringbuffer.h        |  11 +-
 thread.c            |   3 +-
 transfer.c          |   4 +-
 vdr.c               |  12 +-
 19 files changed, 521 insertions(+), 184 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 42b074d22..d31a118e3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -204,6 +204,7 @@ Andreas Schultz <aschultz@warp10.net>
  for suggesting to separate the startup of a plugin into an "early" and a "late" phase
  for changing C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
  for implementing the TerrestrialDeliverySystemDescriptor in libdtv
+ for fixing setting the locking pid after a timed wait
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -467,6 +468,9 @@ Oliver Endriss <o.endriss@gmx.de>
  the Main menu
  for reporting a bug in setting the PCR-PID in case it is equal to one of the other
  PIDs
+ for reporting a problem with cPlugin::Start() being called after trying to learn
+ the remote control keys
+ for reporting a bug in reading 'epg.data' for channels with non-zero RID
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -475,6 +479,7 @@ Reinhard Walter Buchner <rw.buchner@freenet.de>
 
 Lauri Tischler <lauri.tischler@efore.fi>
  for helping to test and debug the new channel source and DiSEqC handling
+ for reporting a faulty parameter initialization in menu.c
 
 Andy Carter <fruit@ukgateway.net>
  for helping to test new DVB-T handling
@@ -572,6 +577,8 @@ Jan Ekholm <chakie@infa.abo.fi>
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
  for reporting broken support for raw OSDs of plugins
+ for reporting a problem with cReceivers that want to receive from PIDs that are
+ currently not transmitting
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -652,3 +659,13 @@ Juri Haberland <juri@koschikode.com>
 Alfred Zastrow <vdr@zastrow4u.de>
  for suggesting to implement separate PausePriority and PauseLifetime parameters for
  the recordings created when pausing live video
+
+Matthias Raus <matthias-raus@web.de>
+ for reporting a problem with starting the editing process if no marks have been set
+
+Marc Rovira Vall <tm05462@salleURL.edu> and Ramon Roca <ramon.roca@xcombo.com>
+ for translating OSD texts to the Catalanian language
+
+Lars Bl�ser <LBlaeser@hofheim.de>
+ for reporting a bug in EPG bugfix statistics which made log entires for undefined
+ channels
diff --git a/HISTORY b/HISTORY
index 098c10dc5..0f46d7e59 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2116,7 +2116,7 @@ Video Disk Recorder Revision History
   (suggested by Andreas Schultz). Plugin authors should please read the section
   about "Getting started" in PLUGINS.html and adapt their code if applicable.
 - Implemented the CableDeliverySystemDescriptor and TerrestrialDeliverySystemDescriptor
-  in libdtv (thanks to Sven Grothklags and Andreas Schultz)
+  in libdtv (thanks to Sven Grothklags and Andreas Schultz).
 - Fixed keeping live video active in case the primary device doesn't have an MPEG
   decoder (thanks to Wolfgang Goeller for reporting this one).
 - Implemented cDevice::ActualDevice(), which returns the actual receiving device in
@@ -2142,3 +2142,33 @@ Video Disk Recorder Revision History
   created when pausing live video (suggested by Alfred Zastrow).
 - Changed C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
   (thanks to Andreas Schultz).
+
+2003-05-18: Version 1.1.32
+
+- Removed a faulty parameter initialization in menu.c (thanks to Lauri Tischler for
+  reporting this one).
+- Re-implemented the WaitForPut/WaitForGet stuff in cRingBuffer, since some plugins
+  actually need this. By default the buffer does not wait; if a plugin needs the
+  waiting functionality it can call the new SetTimeouts() function.
+- Moved the call to cPlugin::Start() further up in vdr.c, to make sure it gets
+  called before trying to learn the keys (problem reported by Oliver Endriss).
+- No longer starting the editing process if no marks have been set (thanks to
+  Matthias Raus for reporting this one).
+- Added Catalanian language texts (thanks to Marc Rovira Vall and Ramon Roca).
+  Plugin authors may want to add the new entries to their I18N texts and contact
+  the translators to have their texts translated. Note that there are now 16
+  different OSD languages, so please make sure you have 16 versions for each of
+  your texts.
+- Moved the detection of a broken video data stream from the cDevice into the
+  cRecorder to avoid problems with cReceivers that want to receive from PIDs
+  that are currently not transmitting (thanks to Marcel Wiesweg for reporting
+  this one).
+- Fixed setting the locking pid after a timed wait (thanks to Andreas Schultz).
+- Avoiding spurious section filter settings after a channel switch.
+- Updated 'channels.conf.cable' (thanks to Stefan Hu�feldt).
+- Fixed reading 'epg.data' for channels with non-zero RID (thanks to Oliver
+  Endriss for reporting this one).
+- Fixed EPG bugfix statistics to avoid log entires for undefined channels (thanks
+  to Lars Bl�ser for reporting this one).
+- No longer waiting inside cIndexFile::CatchUp() to avoid shortly blocking replay
+  at the end of a recording.
diff --git a/PLUGINS.html b/PLUGINS.html
index bd1a0d0f3..b632b61d1 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,18 +21,18 @@
 The <i>internal</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.15 are marked like this.
-<!--X1.1.15--></td></tr></table>
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.17 are marked like this.
 <!--X1.1.17--></td></tr></table>
-<!--X1.1.27--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.27--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.27 are marked like this.
 <!--X1.1.27--></td></tr></table>
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.31 are marked like this.
 <!--X1.1.31--></td></tr></table>
+<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.32 are marked like this.
+<!--X1.1.32--></td></tr></table>
 
 <hr>
 <h1>Table Of Contents</h1>
@@ -284,7 +284,7 @@ <h1>Table Of Contents</h1>
 <b>must not access any global structures of VDR</b>.
 It also must not create any threads or other large data structures. These things
 are done in the
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a href="#Getting started"><tt>Initialize()</tt></a> or
 <a href="#Getting started"><tt>Start()</tt></a>
 <!--X1.1.31--></td></tr></table>
@@ -460,18 +460,20 @@ <h1>Table Of Contents</h1>
 it needs to implement one of the functions
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%><pre>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%><pre>
 virtual bool Initialize(void);
 <!--X1.1.31--></pre></td></tr></table>
 virtual bool Start(void);
 </pre></td></tr></table><p>
 
 which are called once for each plugin at program startup.
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 The difference between these two functions is that <tt>Initialize()</tt> is
-called early at program startup, while <tt>Start()</tt> is called after everything
-else has been set up, right before the main program loop is entered. Inside the
-<tt>Start()</tt> function of any plugin it is guaranteed that the <tt>Initialize()</tt>
+called early at program startup, while <tt>Start()</tt> is called after the primary
+device and user interface has been set up, but before the main program loop is entered.
+<!--X1.1.32--></td></tr></table>
+Inside the <tt>Start()</tt> function of any plugin it is guaranteed that the <tt>Initialize()</tt>
 functions of all plugins have  already been called. For many plugins it probably
 doesn't matter which of these functions they implement, but it may be of importance
 for, e.g., plugins that implement devices. Such plugins should create their cDevice
@@ -527,7 +529,7 @@ <h1>Table Of Contents</h1>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
@@ -1044,7 +1046,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 <p>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 If there is an additional audio track that has to be replayed with external hardware,
 the player shall call its member function
 
@@ -1053,7 +1054,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 where <tt>Data</tt> points to a complete audio PES packet of <tt>Length</tt> bytes.
-<!--X1.1.15--></td></tr></table>
 <p>
 The second part needed here is a control object that receives user input from the main
 program loop and reacts on this by telling the player what to do:
@@ -1200,7 +1200,7 @@ <h1>Table Of Contents</h1>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 cMyReceiver *Receiver = new cMyReceiver(123);
 
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 cDevice::ActualDevice()-&gt;AttachReceiver(Receiver);
 <!--X1.1.31--></td></tr></table>
 </pre></td></tr></table><p>
@@ -1372,7 +1372,7 @@ <h1>Table Of Contents</h1>
 <p>
 <b>Initializing new devices</b>
 <p>
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 A derived cDevice class shall implement a static function
 in which it determines whether the necessary hardware to run this sort of
 device is actually present in this machine (or whatever other prerequisites
@@ -1391,7 +1391,6 @@ <h1>Table Of Contents</h1>
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Dolby Digital"><hr><h2>Dolby Digital</h2>
 
 <center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
@@ -1434,7 +1433,6 @@ <h1>Table Of Contents</h1>
 <p>
 The <tt>Mute()</tt> and <tt>Clear()</tt> functions will be called whenever the audio shall
 be muted, or any buffered data shall be cleared, respectively.
-<!--X1.1.15--></td></tr></table>
 
 <a name="Remote Control"><hr><h2>Remote Control</h2>
 
@@ -1502,7 +1500,7 @@ <h1>Table Of Contents</h1>
 In case you need to do any other setup steps, like opening a file or initializing
 member variables, you should do so before calling <tt>Start()</tt>.
 <p>
-<!--X1.1.27--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.27--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 If your remote control for some reason can't work (maybe because it was unable to
 open some file handle it requires) it can implement the virtual function
 
diff --git a/channels.conf b/channels.conf
index fb73f5700..03b71aabc 100644
--- a/channels.conf
+++ b/channels.conf
@@ -44,8 +44,8 @@ EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:0:0:0
 ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016:0:0:0
 ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014:0:0:0
 MDR:12110:h:S19.2E:27500:401:402:404:0:28204:0:0:0
-ORB:12110:h:S19.2E:27500:501:502:504:0:28205:0:0:0
-B1:12110:h:S19.2E:27500:601:602:604:0:28206:0:0:0
+RBB Brandenburg:12110:h:S19.2E:27500:501:502:504:0:28205:0:0:0
+RBB Berlin:12110:h:S19.2E:27500:601:602:604:0:28206:0:0:0
 :Premiere World
 Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8:0:0:0
 Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10:0:0:0
diff --git a/channels.conf.cable b/channels.conf.cable
index a5567d58a..aed98d11b 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -45,19 +45,12 @@ DISCOVERY CHANNEL:354:M64:C:6900:1023:1024:0:101:14:0:0:0
 PLANET:354:M64:C:6900:1535:1536:0:101:13:0:0:0
 Fox Kids:354:M64:C:6900:1279:1280:0:101:28:0:0:0
 Junior:354:M64:C:6900:255:256:0:101:19:0:0:0
-K-TOON:354:M64:C:6900:511:512:0:101:12:0:0:0
 HEIMATKANAL:386:M64:C:6900:1279:1280:0:101:22:0:0:0
 GOLDSTAR TV:386:M64:C:6900:3839:3840:0:101:518:0:0:0
 CLASSICA:386:M64:C:6900:767:768:0:101:15:0:0:0
 :Premiere Sport
 PREMIERE SPORT 1:362:M64:C:6900:255:256,257:0:101:17:0:0:0
 PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27:0:0:0
-:Premiere Bundesliga
-Spiel 1:362:M64:C:6900:255:256:0:101:17:0:0:1
-:Premiere CL
-UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17:0:0:2
-:Premiere Formel 1
-F1 Portal 1:362:M64:C:6900:255:256:0:101:17:0:0:3
 :Premiere Direkt
 PREMIERE DIREKT:378:M64:C:6900:2815:2816,2817;2819:0:101:18:0:0:0
 :Premiere Direkt 1
@@ -65,14 +58,14 @@ PREMIERE DIREKT 1A:362:M64:C:6900:2047:2048,2049;2051:0:101:240:0:0:0
 PREMIERE DIREKT 1B:362:M64:C:6900:2303:2304,2305;2307:0:101:241:0:0:0
 PREMIERE DIREKT 1C:362:M64:C:6900:2559:2560,2561;2563:0:101:242:0:0:0
 :Premiere Direkt 2
-PREMIERE DIREKT 2A:362:M64:C:6900:2815:2816,2817;2819:0:101:243:0:0:0
+PREMIERE DIREKT 2A:354:M64:C:6900:511:512,513;515:0:101:211:0:0:0
 PREMIERE DIREKT 2B:362:M64:C:6900:3071:3072,3073;3075:0:101:244:0:0:0
 PREMIERE DIREKT 2C:362:M64:C:6900:3327:3328,3329;3331:0:101:245:0:0:0
 PREMIERE DIREKT 2D:378:M64:C:6900:3071:3072,3073;3075:0:101:208:0:0:0
 :Premiere Direkt 3
 PREMIERE DIREKT 3A:378:M64:C:6900:3327:3328,3329;3331:0:101:209:0:0:0
 PREMIERE DIREKT 3B:378:M64:C:6900:2303:2304,2305;2307:0:101:210:0:0:0
-PREMIERE DIREKT 3C:354:M64:C:6900:511:512,513;515:0:101:211:0:0:0
+PREMIERE DIREKT 3C:362:M64:C:6900:2815:2816,2817;2819:0:101:243:0:0:0
 PREMIERE DIREKT 3D:386:M64:C:6900:511:512,513;515:0:101:212:0:0:0
 :Premiere Erotik
 BEATE-UHSE.TV:386:M64:C:6900:1023:1024:0:101:21:0:0:0
diff --git a/config.h b/config.h
index f474ef9ca..4d265ff77 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.158 2003/05/11 13:45:44 kls Exp $
+ * $Id: config.h 1.159 2003/05/16 12:27:58 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.31"
-#define VDRVERSNUM   10131  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.1.32"
+#define VDRVERSNUM   10132  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index b248114a5..7562a3284 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.42 2003/05/11 08:53:09 kls Exp $
+ * $Id: device.c 1.43 2003/05/16 13:26:43 kls Exp $
  */
 
 #include "device.h"
@@ -25,10 +25,6 @@
 // The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -2
 
-// The maximum time we wait before assuming that a recorded video data stream
-// is broken:
-#define MAXBROKENTIMEOUT 30 // seconds
-
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
 int cDevice::nextCardIndex = 0;
@@ -656,7 +652,6 @@ void cDevice::Action(void)
   dsyslog("receiver thread started on device %d (pid=%d)", CardIndex() + 1, getpid());
 
   if (OpenDvr()) {
-     time_t t = time(NULL);
      active = true;
      for (; active;) {
          // Read data from the DVR device:
@@ -671,18 +666,10 @@ void cDevice::Action(void)
                       receiver[i]->Receive(b, TS_SIZE);
                    }
                Unlock();
-               t = time(NULL);
                }
             }
          else
             break;
-
-         //XXX+ put this into the recorder??? or give the receiver a flag whether it wants this?
-         if (time(NULL) - t > MAXBROKENTIMEOUT) {
-            esyslog("ERROR: video data stream broken on device %d", CardIndex() + 1);
-            cThread::EmergencyExit(true);
-            t = time(NULL);
-            }
          }
      CloseDvr();
      }
diff --git a/eit.c b/eit.c
index 76da2669a..a5b14e76a 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.75 2003/05/11 11:25:04 kls Exp $
+ * $Id: eit.c 1.78 2003/05/18 14:10:25 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -434,27 +434,33 @@ static void ReportEpgBugFixStats(bool Reset = false)
          const char *delim = "\t";
          tEpgBugFixStats *p = &EpgBugFixStats[i];
          if (p->hits) {
-            if (!GotHits) {
-               dsyslog("=====================");
-               dsyslog("EPG bugfix statistics");
-               dsyslog("=====================");
-               dsyslog("IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
-               dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
-               dsyslog("IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
-               dsyslog("=====================");
-               dsyslog("Fix\tHits\tChannels");
-               GotHits = true;
-               }
+            bool PrintedStats = false;
             char *q = buffer;
-            q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
+            *buffer = 0;
             for (int c = 0; c < p->n; c++) {
                 cChannel *channel = Channels.GetByChannelID(p->channelIDs[c], true);
                 if (channel) {
+                   if (!GotHits) {
+                      dsyslog("=====================");
+                      dsyslog("EPG bugfix statistics");
+                      dsyslog("=====================");
+                      dsyslog("IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
+                      dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
+                      dsyslog("IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
+                      dsyslog("=====================");
+                      dsyslog("Fix\tHits\tChannels");
+                      GotHits = true;
+                      }
+                   if (!PrintedStats) {
+                      q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
+                      PrintedStats = true;
+                      }
                    q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
                    delim = ", ";
                    }
                 }
-            dsyslog("%s", buffer);
+            if (*buffer)
+               dsyslog("%s", buffer);
             }
          if (Reset)
             p->hits = p->n = 0;
@@ -807,6 +813,7 @@ cSchedules::~cSchedules()
 /**  */
 const cSchedule *cSchedules::AddChannelID(tChannelID channelid)
 {
+  channelid.ClrRid();
   const cSchedule *p = GetSchedule(channelid);
   if (!p) {
      Add(new cSchedule(channelid));
@@ -1073,6 +1080,7 @@ cSIProcessor::cSIProcessor(const char *FileName)
    masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
    currentSource = 0;
    currentTransponder = 0;
+   statusCount = 0;
    pmtIndex = 0;
    pmtPid = 0;
    filters = NULL;
@@ -1150,6 +1158,7 @@ const char *cSIProcessor::GetEpgDataFileName(void)
 void cSIProcessor::SetStatus(bool On)
 {
    LOCK_THREAD;
+   statusCount++;
    ShutDownFilters();
    pmtIndex = 0;
    pmtPid = 0;
@@ -1176,6 +1185,7 @@ void cSIProcessor::Action()
    time_t lastCleanup = time(NULL);
    time_t lastPmtScan = time(NULL);
 
+   int oldStatusCount = 0;
    active = true;
 
    while(active)
@@ -1208,6 +1218,7 @@ void cSIProcessor::Action()
       }
 
       // set up pfd structures for all active filter
+      Lock();
       pollfd pfd[MAX_FILTERS];
       int NumUsedFilters = 0;
       for (int a = 0; a < MAX_FILTERS ; a++)
@@ -1219,6 +1230,8 @@ void cSIProcessor::Action()
             NumUsedFilters++;
          }
       }
+      oldStatusCount = statusCount;
+      Unlock();
 
       // wait until data becomes ready from the bitfilter
       if (poll(pfd, NumUsedFilters, 1000) != 0)
@@ -1239,6 +1252,8 @@ void cSIProcessor::Action()
                      //dsyslog("Received pid 0x%04X with table ID 0x%02X and length of %4d\n", pid, buf[0], seclen);
                      cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
                      LOCK_THREAD;
+                     if (statusCount != oldStatusCount)
+                        break;
                      switch (pid)
                      {
                         case 0x00:
diff --git a/eit.h b/eit.h
index 37733340b..96bf1ff5c 100644
--- a/eit.h
+++ b/eit.h
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.28 2003/04/21 13:22:06 kls Exp $
+ * $Id: eit.h 1.29 2003/05/17 09:15:56 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -148,6 +148,7 @@ class cSIProcessor : public cThread {
   bool masterSIProcessor;
   int currentSource;
   int currentTransponder;
+  int statusCount;
   int pmtIndex;
   int pmtPid;
   SIP_FILTER *filters;
diff --git a/i18n.c b/i18n.c
index 34b242358..64194fc8e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.108 2003/05/11 13:54:23 kls Exp $
+ * $Id: i18n.c 1.110 2003/05/16 13:02:08 kls Exp $
  *
  * Translations provided by:
  *
@@ -21,6 +21,7 @@
  * Swedish     Tomas Prybil <tomas@prybil.se> and Jan Ekholm <chakie@infa.abo.fi>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
+ * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu> and Ramon Roca <ramon.roca@xcombo.com>
  *
  */
 
@@ -85,6 +86,7 @@ const tI18nPhrase Phrases[] = {
     "Svenska",
     "Romaneste",
     "Magyar",
+    "Catal�",
   },
   // Menu titles:
   { "VDR",
@@ -102,6 +104,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -113,11 +116,12 @@ const tI18nPhrase Phrases[] = {
     "Programmer",
     "Ohjelmat",
     "Program",
-    "Programa",
+    "Gu�a de Programaci�n",
     "Programma",
     "Program",
     "Program",
     "Program",
+    "Guia de Programaci�",
   },
   { "Channels",
     "Kan�le",
@@ -134,6 +138,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaler",
     "Canale",
     "Csatorn�k",
+    "Canals",
   },
   { "Timers",
     "Timer",
@@ -150,6 +155,7 @@ const tI18nPhrase Phrases[] = {
     "Timers",
     "Timere",
     "Felv�tel beprogramoz�sa",
+    "Temporitzadors",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -166,6 +172,7 @@ const tI18nPhrase Phrases[] = {
     "Inspelningar",
     "Inregistrari",
     "Felvett ad�sok",
+    "Veure programes gravats",
   },
   { "Setup",
     "Einstellungen",
@@ -182,6 +189,7 @@ const tI18nPhrase Phrases[] = {
     "Inst�llningar",
     "Setari",
     "Be�ll�t�sok",
+    "Configuraci�",
   },
   { "Commands",
     "Befehle",
@@ -198,6 +206,7 @@ const tI18nPhrase Phrases[] = {
     "Kommandon",
     "Comenzi",
     "Parancsok",
+    "Ordres",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -209,11 +218,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Nauhoituskomennot",
     "",// TODO
-    "",// TODO
+    "�rdenes de grabaci�n",
     "Entoles gia egrafes",// TODO
     "Inspelningskommandon",
     "",// TODO
     "",// TODO
+    "Ordres de gravaci�",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -230,6 +240,7 @@ const tI18nPhrase Phrases[] = {
     "�ndra kanal",
     "Editare canale",
     "Csatorn�k be�ll�t�sa",
+    "Editar canal",
   },
   { "Edit timer",
     "Timer editieren",
@@ -246,6 +257,7 @@ const tI18nPhrase Phrases[] = {
     "�ndra timer",
     "Editare timere",
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
+    "Editar temporitzador",
   },
   { "Event",
     "Sendung",
@@ -262,6 +274,7 @@ const tI18nPhrase Phrases[] = {
     "S�ndning",
     "Evenimente",
     "Ad�s",
+    "Event",
   },
   { "Summary",
     "Inhalt",
@@ -278,6 +291,7 @@ const tI18nPhrase Phrases[] = {
     "Sammandrag",
     "Cuprins",
     "Tartalom",
+    "Sinopsi",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -294,6 +308,7 @@ const tI18nPhrase Phrases[] = {
     "Program - %s",
     "Program - %s",
     "Program - %s",
+    "Guia de Programaci� - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -310,6 +325,7 @@ const tI18nPhrase Phrases[] = {
     "Vilket program s�nds nu?",
     "Programul actual?",
     "Mi megy most?",
+    "Que fan ara?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -326,6 +342,7 @@ const tI18nPhrase Phrases[] = {
     "Vilket �r n�sta program?",
     "Programul urmator?",
     "Mi k�vetkezik?",
+    "Que fan despr�s?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -343,6 +360,7 @@ const tI18nPhrase Phrases[] = {
     "�ndra",
     "Modificare",
     "Be�ll�tani",
+    "Editar",
   },
   { "New",
     "Neu",
@@ -359,6 +377,7 @@ const tI18nPhrase Phrases[] = {
     "Ny",
     "Nou",
     "�j",
+    "Nou",
   },
   { "Delete",
     "L�schen",
@@ -375,6 +394,7 @@ const tI18nPhrase Phrases[] = {
     "Ta bort",
     "Sterge",
     "T�r�lni",
+    "Esborrar",
   },
   { "Mark",
     "Markieren",
@@ -391,6 +411,7 @@ const tI18nPhrase Phrases[] = {
     "M�rk",
     "Marcheaza",
     "Megjel�lni",
+    "Marcar",
   },
   { "On/Off",
     "Ein/Aus",
@@ -407,6 +428,7 @@ const tI18nPhrase Phrases[] = {
     "P�/Av",
     "Pornit/Oprit",
     "Be/Ki",
+    "On/Off",
   },
   { "Record",
     "Aufnehmen",
@@ -423,6 +445,7 @@ const tI18nPhrase Phrases[] = {
     "Inspelning",
     "Inregistrare",
     "Felvenni",
+    "Gravar",
   },
   { "Play",
     "Wiedergabe",
@@ -439,6 +462,7 @@ const tI18nPhrase Phrases[] = {
     "Spela upp",
     "Redare",
     "Lej�tszani",
+    "Reproduir",
   },
   { "Rewind",
     "Anfang",
@@ -455,6 +479,7 @@ const tI18nPhrase Phrases[] = {
     "�terspolning",
     "Inapoi",
     "Vissza az elej�re",
+    "Enrera",
   },
   { "Button$Stop",
     "Beenden",
@@ -471,6 +496,7 @@ const tI18nPhrase Phrases[] = {
     "Stopp",
     "Stop",
     "Stop",
+    "Parar",
   },
   { "Resume",
     "Weiter",
@@ -487,6 +513,7 @@ const tI18nPhrase Phrases[] = {
     "Forts�tt",
     "Reia",
     "Tov�bb",
+    "Continuar",
   },
   { "Summary",
     "Inhalt",
@@ -503,6 +530,7 @@ const tI18nPhrase Phrases[] = {
     "Sammandrag",
     "Cuprins",
     "Tartalom",
+    "Resum",
   },
   { "Open",
     "�ffnen",
@@ -519,6 +547,7 @@ const tI18nPhrase Phrases[] = {
     "�ppna",
     "Deschide",
     "Kinyitni",
+    "Obrir",
   },
   { "Switch",
     "Umschalten",
@@ -535,6 +564,7 @@ const tI18nPhrase Phrases[] = {
     "Byt",
     "Schimba",
     "�tkapcsolni",
+    "Canviar",
   },
   { "Now",
     "Jetzt",
@@ -551,6 +581,7 @@ const tI18nPhrase Phrases[] = {
     "Nu",
     "Acum",
     "Most",
+    "Ara",
   },
   { "Next",
     "N�chste",
@@ -567,6 +598,7 @@ const tI18nPhrase Phrases[] = {
     "N�sta",
     "Urmator",
     "K�vetkez�",
+    "Seg�ent",
   },
   { "Button$Schedule",
     "Programm",
@@ -583,6 +615,7 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Program",
     "Program",
+    "Programar",
   },
   { "Language",
     "Sprache",
@@ -594,11 +627,12 @@ const tI18nPhrase Phrases[] = {
     "Spr�k",
     "Kieli",
     "Jezyk",
-    "Lengua",
+    "Idioma",
     "Glosa",
     "Spr�k",
     "Limba",
     "Nyelv",
+    "Idioma",
   },
   { "Eject",
     "Auswerfen",
@@ -610,11 +644,12 @@ const tI18nPhrase Phrases[] = {
     "Eject",
     "Avaa",
     "Wyrzucenie",
-    "Eyectar",
+    "Expulsar",
     "Exsagogi",
     "Mata ut",
     "Ejecteaza",
     "Kidobni",
+    "Expulsar",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -631,6 +666,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
+    "ABC/abc",
   },
   { "Insert",
     "Einf�gen",
@@ -642,11 +678,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Lis��",
     "",// TODO
-    "",// TODO
+    "Insertar",
     "Isodos",
     "Infoga",
     "Insereaza",
     "Beilleszteni",
+    "Insertar",
   },
   { "Overwrite",
     "�berschreiben",
@@ -658,11 +695,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Korvaa",
     "",// TODO
-    "",// TODO
+    "Sobreescribir",
     "Epanagrafi",
     "Skriv �ver",
     "Suprascrie",
     "�t�rni",
+    "Sobrescriure",
   },
   { "Menu",
     "Men�",
@@ -674,11 +712,12 @@ const tI18nPhrase Phrases[] = {
     "Meny",
     "Valikko",
     "Menu",
-    "Menu",
+    "Men�",
     "Menou",
     "Meny",
     "Meniu",
     "Men�",
+    "Men�",
   },
   { "Reset",
     "Reset",
@@ -690,11 +729,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Reiniciar",
     "Epanafora",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Reiniciar",
   },
   // Confirmations:
   { "Delete channel?",
@@ -712,6 +752,7 @@ const tI18nPhrase Phrases[] = {
     "Ta bort kanalen?",
     "Sterg canalul?",
     "Csatorna t�rl�se?",
+    "Esborrar el canal?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -728,6 +769,7 @@ const tI18nPhrase Phrases[] = {
     "Ta bort timern?",
     "Sterg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
+    "Esborrar el temporitzador?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -744,6 +786,7 @@ const tI18nPhrase Phrases[] = {
     "Ta bort inspelningen?",
     "Sterg inregistrarea?",
     "Felv�tel t�rl�se?",
+    "Esborrar gravaci�?"
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -760,6 +803,7 @@ const tI18nPhrase Phrases[] = {
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
     "Timer-ul in inregistrare - sterg?",
     "Felv�tel folyamatban van - m�gis t�r�lni?",
+    "Temporitzador activat - Esborrar de totes maneres?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -776,6 +820,7 @@ const tI18nPhrase Phrases[] = {
     "Stanna inspelning?",
     "Opresc inregistrarea?",
     "Felv�tel befejezni?",
+    "Parar la gravaci�?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -792,6 +837,7 @@ const tI18nPhrase Phrases[] = {
     "fr�n det f�rsta enheten?",
     "pe prima interfata",
     "az els� k�rty�n",
+    "a la interf�cie prim�ria",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -808,6 +854,7 @@ const tI18nPhrase Phrases[] = {
     "Avbryta editeringen?",
     "Opresc editarea?",
     "V�g�st befejezni?",
+    "Cancel.lar l'edici�?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -824,6 +871,7 @@ const tI18nPhrase Phrases[] = {
     "Vill du verkligen starta om?",
     "Esti sigur de repornire?",
     "T�nyleg �jraind�tani?",
+    "Segur que vols reiniciar?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -835,11 +883,12 @@ const tI18nPhrase Phrases[] = {
     "Gj�r opptak - starte p� nytt likevel?",
     "Nauhoitus k�ynniss� - aloitetaanko alusta?",
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
-    "�Grabando - reiniciar?",
+    "Grabando - �reiniciar?",
     "Ginete egrafi - Telika na ginei epanekinisi?",
     "Inspelning p�g�r, vill du starta om i alla fall?",
     "In inregistrare - repornesc?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
+    "Estic gravant - reiniciar de totes maneres?"
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -851,11 +900,12 @@ const tI18nPhrase Phrases[] = {
     "Gj�r opptak - sl� av likevel?",
     "Nauhoitus kesken - lopetetaanko se?",
     "Nagrywanie w trakcie - mimo to wylaczyc?",
-    "�Grabando - apagar?",
+    "Grabando - �apagar?",
     "Ginete egrafi - Telika na ginei termatismos?",
     "Inspelning p�g�r, vill du avbryta i alla fall?",
     "In inregistrare - opresc?",
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
+    "Gravant - Apagar de totes maneres?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -867,11 +917,12 @@ const tI18nPhrase Phrases[] = {
     "Skal gj�re opptak om %d minutter - sl� av likevel?",
     "Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
-    "�Grabando en %d minutos, de verdad cortar?",
+    "Grabando en %d minutos, �de verdad apagar?",
     "Anamenete egrafi se %d lepta - Telika na termatistei?",
     "Inspelning startar om %d minuter, vill du avsluta?",
     "Inregistrez in %d minute, opresc?",
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
+    "Hi ha una gravaci� en %d minuts - Apagar de totes maneres?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -883,11 +934,12 @@ const tI18nPhrase Phrases[] = {
     "Trykk en tast for ikke � sl� av",
     "Peruuta pys�ytys painamalla jotakin n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
-    "Pulse una tecla para interrumpir corte",
+    "Pulse una tecla para interrumpir apagar",
     "Piese ena pliktro na akirothei o termatismos",
     "Tryck valfri knapp f�r att avbryta nedst�ngning",
     "Apasa orice tasta pentru a anula inchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
+    "Prem qualsevol tecla per cancel.lar l'aturada",
   },
   // Channel parameters:
   { "Name",
@@ -905,6 +957,7 @@ const tI18nPhrase Phrases[] = {
     "Namn",
     "Nume",
     "N�v",
+    "Nom",
   },
   { "Frequency",
     "Frequenz",
@@ -921,6 +974,7 @@ const tI18nPhrase Phrases[] = {
     "Frekvens",
     "Frecventa",
     "Frekvencia",
+    "Freq��ncia",
   },
   { "Polarization",
     "Polarisation",
@@ -937,6 +991,7 @@ const tI18nPhrase Phrases[] = {
     "Polarisation",
     "Polarizare",
     "Polariz�ci�",
+    "Polaritzaci�",
   },
   { "Source",
     "Quelle",
@@ -953,6 +1008,7 @@ const tI18nPhrase Phrases[] = {
     "K�lla",
     "",//TODO
     "",//TODO
+    "Origen",
   },
   { "Srate",
     "Srate",
@@ -969,6 +1025,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Rata simboluri",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -985,6 +1042,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "PID Video",
     "Vpid",
+    "PID V�deo",
   },
   { "Apid1",
     "Apid1",
@@ -1001,6 +1059,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1",
     "PID Audio (1)",
     "Apid1",
+    "PID �udio (1)",
   },
   { "Apid2",
     "Apid2",
@@ -1017,6 +1076,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "PID Audio (2)",
     "Apid2",
+    "PID �udio (2)",
   },
   { "Dpid1",
     "Dpid1",
@@ -1033,6 +1093,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1",
     "PID AC3 (1)",
     "Dpid1",
+    "PID AC3 (1)",
   },
   { "Dpid2",
     "Dpid2",
@@ -1049,6 +1110,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2",
     "PID AC3 (2)",
     "Dpid2",
+    "PID AC3 (2)",
   },
   { "Tpid",
     "Tpid",
@@ -1065,6 +1127,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid",
     "PID Teletext",
     "Tpid",
+    "PID Teletext",
   },
   { "CA",
     "CA",
@@ -1081,6 +1144,7 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "Criptare",
     "CA",
+    "Acc�s Condicional",
   },
   { "Sid",
     "Sid",
@@ -1097,6 +1161,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid",
+    "Sid",
   },
   { "Inversion",
     "Inversion",
@@ -1113,6 +1178,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
     "Inversion",
     "Inversion",
+    "Inversi�",
   },
   { "Bandwidth",
     "Bandwidth",
@@ -1129,6 +1195,7 @@ const tI18nPhrase Phrases[] = {
     "Bandbredd",
     "Bandwidth",
     "Bandwidth",
+    "Ampla de banda",
   },
   { "CoderateH",
     "CoderateH",
@@ -1145,6 +1212,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
+    "CoderateH",
   },
   { "CoderateL",
     "CoderateL",
@@ -1161,6 +1229,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
+    "CoderateL",
   },
   { "Modulation",
     "Modulation",
@@ -1177,6 +1246,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulation",
     "Modulation",
+    "Modulaci�",
   },
   { "Transmission",
     "Transmission",
@@ -1193,6 +1263,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmission",
     "Transmission",
+    "Transmissi�",
   },
   { "Guard",
     "Guard",
@@ -1209,6 +1280,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
     "Guard",
     "Guard",
+    "Protegir",
   },
   { "Hierarchy",
     "Hierarchy",
@@ -1225,6 +1297,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
+    "Jerarquia",
   },
   // Timer parameters:
   { "Active",
@@ -1242,6 +1315,7 @@ const tI18nPhrase Phrases[] = {
     "Aktiv",
     "Activ",
     "Aktiv",
+    "Actiu",
   },
   { "Channel",
     "Kanal",
@@ -1258,6 +1332,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal",
     "Canal",
     "Csatorna",
+    "Canal",
   },
   { "Day",
     "Tag",
@@ -1274,6 +1349,7 @@ const tI18nPhrase Phrases[] = {
     "Dag",
     "Ziua",
     "Nap",
+    "Dia",
   },
   { "Start",
     "Anfang",
@@ -1290,6 +1366,7 @@ const tI18nPhrase Phrases[] = {
     "B�rjar",
     "Start",
     "Kezdet",
+    "Inici",
   },
   { "Stop",
     "Ende",
@@ -1306,6 +1383,7 @@ const tI18nPhrase Phrases[] = {
     "Slutar",
     "Stop",
     "V�ge",
+    "Final",
   },
   { "Priority",
     "Priorit�t",
@@ -1322,6 +1400,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritet",
     "Prioritate",
     "Priorit�s",
+    "Prioritat",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1338,6 +1417,7 @@ const tI18nPhrase Phrases[] = {
     "Speltid",
     "Durata",
     "�lettartam",
+    "Duraci�",
   },
   { "File",
     "Datei",
@@ -1354,6 +1434,7 @@ const tI18nPhrase Phrases[] = {
     "Filnamn",
     "Fisier",
     "File",
+    "Arxiu",
   },
   { "First day",
     "Erster Tag",
@@ -1370,6 +1451,7 @@ const tI18nPhrase Phrases[] = {
     "F�rsta dag",
     "Prima zi",
     "Els� nap",
+    "Primer dia",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -1387,6 +1469,7 @@ const tI18nPhrase Phrases[] = {
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
     "Csatorn�t m�s haszn�lja!",
+    "Canal en �s per un temporitzador!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1403,6 +1486,7 @@ const tI18nPhrase Phrases[] = {
     "Om�jligt att byta kanal!",
     "Nu pot comuta canalul!",
     "Csatorn�t nem lehet �tkapcsolni!",
+    "No puc canviar de canal!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1419,6 +1503,7 @@ const tI18nPhrase Phrases[] = {
     "Timerstyrd inspelning p�g�r!",
     "Timer-ul este in inregistrare!",
     "Felv�tel folyamatban van!",
+    "El temporitzador est� gravant!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1430,11 +1515,12 @@ const tI18nPhrase Phrases[] = {
     "Feil under lesing av opptak!",
     "Nauhoituksen toistaminen ep�onnistui!",
     "Blad - brak dostepu do nagrania!",
-    "�Error al accesar la grabaci�n!",
+    "�Error al acceder a la grabaci�n!",
     "Provlima stin prospelasi egrafis!",
     "Det g�r inte att l�sa inspelningen",
     "Eroare in timpul accesarii inregistrarii",
     "Hiba a felv�tel hozz�f�r�s�n�l",
+    "Error a l'accedir a la gravaci�!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1451,6 +1537,7 @@ const tI18nPhrase Phrases[] = {
     "Det g�r inte att ta bort inspelningen",
     "Eroare in timpul stergerii inregistrarii!",
     "Hiba a felv�tel t�rl�s�n�l!",
+    "Error a l'esborrar la gravaci�!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1467,6 +1554,7 @@ const tI18nPhrase Phrases[] = {
     "*** Felaktig kanal ***",
     "*** Canal invalid ***",
     "*** �rv�nytelen csatorna ***",
+    "*** Canal incorrecte ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1483,6 +1571,7 @@ const tI18nPhrase Phrases[] = {
     "Det finns ingen ledig DVB enhet f�r inspelning!",
     "Nu mai sunt dispozitive DVB pentru inregistrare!",
     "Nincs szabad DVB k�rtya a felv�telhez!",
+    "No hi ha cap dispositiu DVB lliure per gravar!",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -1494,11 +1583,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Kanavaa ei voi katsoa nyt!",
     "",//TODO
-    "",//TODO
+    "!Canal no disponible!",
     "To kanali den ine diathesimo",
     "Kanalen ej tillg�nglig!",
     "",//TODO
     "",//TODO
+    "Canal no disponible!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -1510,11 +1600,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "!Propiedades de canal duplicadas!",
     "Ta kanalia stin lista den ine monadika!",
     "Kanalinst�llningarna �r ej unika!",
     "",//TODO
     "",//TODO
+    "Propietats del canal duplicades!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -1531,6 +1622,7 @@ const tI18nPhrase Phrases[] = {
     "Kanalen �r l�st (inspelning p�g�r)!",
     "Canal blocat (inregistrare)!",
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
+    "Canal bloquejat (gravant)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -1547,6 +1639,24 @@ const tI18nPhrase Phrases[] = {
     "Kan inte starta Transfer Mode!",
     "Nu pot porni Modul de Transfer!",
     "Transfer-Mode nem ind�that�!",
+    "No puc iniciar el mode de transfer�ncia!",
+  },
+  { "No editing marks defined!",
+    "Keine Schnittmarken gesetzt!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -1563,6 +1673,7 @@ const tI18nPhrase Phrases[] = {
     "Kan inte starta editering!",
     "Nu pot porni procesul de editare!",
     "A v�g�s nem ind�that�!",
+    "No puc iniciar el proc�s d'edici�!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1579,6 +1690,7 @@ const tI18nPhrase Phrases[] = {
     "Editering �r redan aktiv!",
     "Procesul de editare este activ!",
     "A v�g�s m�r aktiv�lt!",
+    "Proc�s d'edici� iniciat anteriorment!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -1590,11 +1702,12 @@ const tI18nPhrase Phrases[] = {
     "Kan ikke sl� av - startet uten parameteret '-s'!",
     "Ei voida sammuttaa '-s' parametria ei annettu!",
     "Wylaczenie niemozliwe - brak opcji '-s'!",
-    "�No puedo cortar - opci�n '-s' absente!",
+    "�No puedo apagar - opci�n '-s' ausente!",
     "Adinaton na ginei termatismos. Aniparkti i parametros '-s'!",
     "Kan inte avsluta, m�ste anv�nda flagga '-s'",
     "Nu pot opri calculatorul - vezi optiunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
+    "No puc apagar, falta la opci� -s !"
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1611,6 +1724,7 @@ const tI18nPhrase Phrases[] = {
     "L�gt diskutrymme!",
     "Spatiu scazut pe disc!",
     "A merev lemez majdnem tele!",
+    "Disc gaireb� pl�!",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -1622,11 +1736,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "�No pudeo acceder al men� de la CAM!",
     "Den mpori na aniksi to CAM menou!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "No puc obrir el men� de la CAM!",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -1638,11 +1753,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "�No puedo reiniciar la CAM!",
     "Adinato na gini epanafora sto CAM",
     "",//TODO
     "",//TODO
     "",//TODO
+    "No puc reiniciar la CAM!",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
@@ -1654,11 +1770,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM reiniciada",
     "Sto CAM egine apanafora",
     "",//TODO
     "",//TODO
     "",//TODO
+    "CAM reiniciada",
   },
   // Setup pages:
   { "OSD",
@@ -1671,11 +1788,12 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "Tekstin�ytt�",
     "OSD",
+    "Men�s en pantalla",
     "OSD",
     "OSD",
     "OSD",
     "OSD",
-    "OSD",
+    "Informaci� en pantalla",
   },
   { "EPG",
     "EPG",
@@ -1687,11 +1805,12 @@ const tI18nPhrase Phrases[] = {
     "Programoversikt",
     "Ohjelmaopas",
     "EPG",
-    "EPG",
+    "Gu�a de Programaci�n",
     "EPG",
     "Elektronisk programguide",
     "EPG",
     "EPG",
+    "Guia de Programes",
   },
   { "DVB",
     "DVB",
@@ -1708,6 +1827,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "Placa DVB",
     "DVB",
+    "Tarja DVB",
   },
   { "LNB",
     "LNB",
@@ -1724,6 +1844,7 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "Configuraci� de l'LNB",
   },
   { "CICAM",
     "CICAM",
@@ -1740,6 +1861,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "Acces conditionat",
     "CICAM",
+    "CI Acc�s condicional",
   },
   { "Recording",
     "Aufnahme",
@@ -1751,11 +1873,12 @@ const tI18nPhrase Phrases[] = {
     "Opptak",
     "Nauhoita",
     "Nagranie",
-    "Grabaci�n",
+    "Opciones de Grabaci�n",
     "Egrafi",
     "Inspelning",
     "Inregistrare",
     "Felv�tel",
+    "Opcions de Gravaci�",
   },
   { "Replay",
     "Wiedergabe",
@@ -1767,11 +1890,12 @@ const tI18nPhrase Phrases[] = {
     "Spill av",
     "Toista",
     "Odtwarzanie",
-    "Poner",
+    "Opciones de Reproducci�n",
     "Anametadosi",
     "Repris",
     "Redare",
     "Lej�tsz�s",
+    "Opcions de Reproducci�",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -1788,6 +1912,7 @@ const tI18nPhrase Phrases[] = {
     "Diverse",
     "Diverse",
     "Egy�b",
+    "Miscel�l�nia",
   },
   { "Plugins",
     "Plugins",
@@ -1804,6 +1929,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Plugins",
+    "Plugins",
   },
   { "Plugin",
     "Plugin",
@@ -1820,6 +1946,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Plugin",
+    "Plugin",
   },
   { "Restart",
     "Neustart",
@@ -1836,6 +1963,7 @@ const tI18nPhrase Phrases[] = {
     "Omstart",
     "Restart",
     "�jraind�t�s",
+    "Reiniciar",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -1848,11 +1976,12 @@ const tI18nPhrase Phrases[] = {
     "Spr�k",
     "Kieli",
     "Jezyk",
-    "Lengua",
+    "Idioma",
     "Glosa",
     "Spr�k",
     "Limba OSD",
     "Nyelv",
+    "Idioma",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -1869,6 +1998,7 @@ const tI18nPhrase Phrases[] = {
     "Bredd",
     "Latime OSD",
     "Sz�less�g",
+    "Amplada",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -1885,6 +2015,7 @@ const tI18nPhrase Phrases[] = {
     "H�jd",
     "Inaltime OSD",
     "Magass�g",
+    "Al�ada",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -1901,6 +2032,7 @@ const tI18nPhrase Phrases[] = {
     "Tid f�r meddelanden (sek)",
     "Timp afisare mesaj (sec)",
     "Inform�ci� felt�ntet�s�nek id�tartama",
+    "Duraci� dels missatges (s)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -1917,6 +2049,7 @@ const tI18nPhrase Phrases[] = {
     "Placering av kanalinformation",
     "Pozitie info canal",
     "Csatorna-Inf� pozici�ja",
+    "Posici� de la informaci� del canal",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -1933,6 +2066,7 @@ const tI18nPhrase Phrases[] = {
     "Information vid kanalbyte",
     "Info despre comutare canal",
     "Inf� a csatorna v�lt�s�n�l",
+    "Informaci� del canvi de canal",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -1949,6 +2083,7 @@ const tI18nPhrase Phrases[] = {
     "Bl�ddra sidor",
     "Deruleaza pagini",
     "Oldalank�nt l�ptetmi",
+    "Despla�ar p�gina sencera",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -1960,11 +2095,12 @@ const tI18nPhrase Phrases[] = {
     "Sorter timere",
     "J�rjest� ajastimet",
     "Sortowanie timerow",
-    "Ordenar timer",
+    "Ordenar timers",
     "Organosi programmatismenon",
     "Sortera timers",
     "Sortare timere",
     "A beprogramozott felv�telek elrendez�se",
+    "Ordenar gravacions programades",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -1976,11 +2112,12 @@ const tI18nPhrase Phrases[] = {
     "Kataloger til opptak",
     "Nauhoitushakemistot",
     "Wykaz nagran",
-    "Directorios para grabaci�n",
+    "Gracaciones en directorios",
     "Fakeloi egrafon",
     "Kataloger f�r inspelningar",
     "Directoare inregistrari",
     "Felv�telek list�ja",
+    "Gravacions en sub-carpetes",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -1997,6 +2134,7 @@ const tI18nPhrase Phrases[] = {
     "EPG s�kning timeout",
     "Timeout EPG",
     "Fennmaradt id� az EPG-g (h)",
+    "M�xim d'Hores a cercar per la Guia",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -2013,6 +2151,7 @@ const tI18nPhrase Phrases[] = {
     "Niv� f�r EPG bugfix",
     "Nivel corectie EPG",
     "EPG hibaelh�r�t�s",
+    "Nivell de correcci� de la Guia",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2029,6 +2168,7 @@ const tI18nPhrase Phrases[] = {
     "St�ll in systemtid",
     "Seteaza ceasul sistem",
     "Az id� be�ll�t�sa",
+    "Ajustar l'hora del sistema",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -2045,6 +2185,7 @@ const tI18nPhrase Phrases[] = {
     "Anv�nd klockan fr�n transponder",
     "Preia ceasul din transponder",
     "Id�h�z tartoz� Transponder",
+    "Usar el temps del m�ltiplex",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -2061,6 +2202,7 @@ const tI18nPhrase Phrases[] = {
     "Prim�r DVB enhet",
     "Placa DVB primara",
     "Els� DVB interface",
+    "Tarja DVB prim�ria",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -2077,6 +2219,7 @@ const tI18nPhrase Phrases[] = {
     "Video format",
     "Format Video",
     "Video form�tum",
+    "Format del v�deo",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -2093,6 +2236,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -2109,6 +2253,7 @@ const tI18nPhrase Phrases[] = {
     "Undre LNB frekvens (MHz)",
     "Frecvnta LO LNB (Mhz)",
     "Als� LNB-frekvencia (MHZ)",
+    "Freq��ncia LNB baixa (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -2125,6 +2270,7 @@ const tI18nPhrase Phrases[] = {
     "�vre LNB frekvens (MHz)",
     "Feecventa HI LNB (MHz)",
     "Fels� LNB-frekvencia (MHZ)",
+    "Freq��ncia LNB alta (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -2141,6 +2287,7 @@ const tI18nPhrase Phrases[] = {
     "Anv�nd DiSEqC",
     "Utilizez DiSEqC",
     "DiSEqC haszn�lata",
+    "Utilitzar DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -2157,6 +2304,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "Setare acces conditional",
     "CICAM DVB",
+    "Acc�s condicional CICAM",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -2173,6 +2321,7 @@ const tI18nPhrase Phrases[] = {
     "Marginal f�r start (min)",
     "Margine la pornire (min)",
     "Id�eltol�d�s a kezd�sn�l (min)",
+    "Iniciar la gravaci� avans de (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -2189,6 +2338,7 @@ const tI18nPhrase Phrases[] = {
     "Marginal f�r stopp (min)",
     "Margine la oprire (min)",
     "Id�eltol�d�s a befejez�sn�l",
+    "Acavar la gravaci� despr�s de (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -2200,11 +2350,12 @@ const tI18nPhrase Phrases[] = {
     "Prioritetsgrense HovedDVB",
     "PrimaryLimit",
     "Pierwotny limit",
-    "L'mite primario",
+    "L�mite primario",
     "Protevon orio",
     "Prim�r gr�ns",
     "Limita Primara",
     "Prim�r-hat�r",
+    "L�mit primari",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -2221,6 +2372,7 @@ const tI18nPhrase Phrases[] = {
     "Normal prioritet",
     "Prioritate implicita",
     "Default priority",
+    "Prioritat per defecte",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
@@ -2237,6 +2389,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Duraci� de la pausa (d)",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
@@ -2253,6 +2406,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Prioritat de la pausa",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -2269,6 +2423,7 @@ const tI18nPhrase Phrases[] = {
     "Normal livstid",
     "Durata predefinita",
     "Default �lettartam",
+    "Duraci� predefinida",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -2285,6 +2440,7 @@ const tI18nPhrase Phrases[] = {
     "Anv�nd episodnamn",
     "Utilizeaza numele episodului",
     "Epiz�dn�v felhaszn�l�sa",
+    "Utilitzar el nom de l'episodi",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -2301,6 +2457,7 @@ const tI18nPhrase Phrases[] = {
     "M�rk direktinspelning",
     "Inregistrare imediata",
     "Direktfelv�tel megjel�l�se",
+    "Marcar gravaci� instant�nia",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -2317,6 +2474,7 @@ const tI18nPhrase Phrases[] = {
     "Namnge direktinspelning",
     "Nume inregistrare imediata",
     "Direktfelv�tel megnevez�se",
+    "Anomenar gravacions instant�nies",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -2328,11 +2486,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Pikanauhoituksen pituus (min)",
     "",//TODO
-    "",//TODO
+    "Tiempo de grabaci�n instant�nea (min)",
     "Stigmiees egrafes xronos (lepta)",
     "Direktinspelning l�ngd (min)",
     "Timpul de inregistarea imediata (min)",
     "Felv�tel id�tartama",
+    "Temps de gravaci� instant�nia (min)",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -2349,6 +2508,7 @@ const tI18nPhrase Phrases[] = {
     "Spela in ljud med Dolby Digital",
     "Inregistreaza Dolby Digital",
     "Dolby Digit�l felv�tel",
+    "Gravar el s� en Dolby Digital",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -2360,11 +2520,12 @@ const tI18nPhrase Phrases[] = {
     "Maksimal st�rrelse p� videofiler (MB)",
     "Maksimi tiedoston koko (MB)",
     "Maks. wielkosc pliku (MB)",
-    "Tama�o m�x. ficheros (MB)",
+    "Tama�o m�x. de fichero (MB)",
     "Megisto megethos arxeiou (MB)",
     "Maximal filstorlek f�r inspelning (MB)",
     "Dimensiune maxima a fisierului video (MB)",
     "Max. video File-terjedelem (MB)",
+    "Tamany m�xim de l'arxiu (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -2381,6 +2542,7 @@ const tI18nPhrase Phrases[] = {
     "Dela upp editerade filer",
     "Separare fisiere editate",
     "Feldolgozott File-k feloszt�sa",
+    "Separar arxius",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -2397,6 +2559,7 @@ const tI18nPhrase Phrases[] = {
     "Multispeed mode",
     "Mod multi-rata",
     "MultiSpeed funkci�",
+    "Mode de multi-velocitat",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -2413,6 +2576,7 @@ const tI18nPhrase Phrases[] = {
     "Visa uppspelnings mode",
     "Afiseaza modul de redare",
     "Lej�tsz�s felt�ntet�se",
+    "Mostrar mode de reproducci�",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
@@ -2424,11 +2588,12 @@ const tI18nPhrase Phrases[] = {
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
+    "Continuar ID",
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
-    "Resume ID",// TODO
+    "Continuar ID",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -2445,6 +2610,7 @@ const tI18nPhrase Phrases[] = {
     "Minsta h�ndelse-pause (min)",
     "MinEventTimeout (min)",
     "Min. esem�ny sz�net (min)",
+    "Temps m�nim en pausa (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -2461,6 +2627,7 @@ const tI18nPhrase Phrases[] = {
     "Minsta an�ndar-inaktivitet (min)",
     "Durata minima de inactivitate (min)",
     "Min. kezel�si aktivit�s (min)",
+    "Temps m�nim d'inactivitat (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -2472,11 +2639,12 @@ const tI18nPhrase Phrases[] = {
     "Ubrukt SVDRP-levetid (s)",
     "SVDRP odotusaika (s)",
     "Min. brak aktywnosci SVDRP (s)",
-    "SVDRP interrupci�n (s)",
+    "SVDRP Timeout (s)",
     "SVDRP Timeout (d)",
     "SVDRP Timeout (d)",
     "Timeout SVDRP (sec)",
     "SVDRP Timeout (s)",
+    "SVDRP Timeout (s)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -2494,6 +2662,7 @@ const tI18nPhrase Phrases[] = {
     "MTOTFLS",
     "LMMJVSD",
     "HKSCPSV",
+    "LMXJVSU",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -2510,6 +2679,7 @@ const tI18nPhrase Phrases[] = {
     "M�nTisOnsTorFreL�rS�n",
     "LunMarMieJoiVinSimDum",
     "H�tKedSzeCs�P�nSzoVas",
+    "DllDimDmcDijDivDisDiu",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -2527,6 +2697,7 @@ const tI18nPhrase Phrases[] = {
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghijklmno��pqrstu��vwxyz0123456789-.,#~",
+    " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
   },
   // Learning keys:
   { "Learning Remote Control Keys (%s)",
@@ -2544,6 +2715,7 @@ const tI18nPhrase Phrases[] = {
     "Inl�rning av fj�rrkontrollsknappar (%s)",
     "Invatare taste telecomanda (%s)",
     "T�vir�ny�t� betan�t�sa (%s)",
+    "Aprenent les tecles del comandament a dist�ncia (%s)",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -2560,6 +2732,7 @@ const tI18nPhrase Phrases[] = {
     "Steg1: identifiering av RC kod",
     "Faza 1: Detectie tip telecomanda",
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
+    "Fase 1: Detectant el tipus de receptor",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -2576,6 +2749,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck valfri tangent p� fj�rrkontrollen",
     "Apasati o tasta pe telecomanda",
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
+    "Premi qualsevol tecla del comandament",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -2592,6 +2766,7 @@ const tI18nPhrase Phrases[] = {
     "RC koden detekterad!",
     "S-a detectat tipul telecomenzii!",
     "T�vir�ny�t� k�dja felismerve!",
+    "Codi detectat!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -2603,11 +2778,12 @@ const tI18nPhrase Phrases[] = {
     "Ikke trykk p� noen av tastene...",
     "�l� paina mit��n n�pp�int�...",
     "Nie naciskac klawiszy...",
-    "No pulse tecla...",
+    "No pulse ninguna tecla...",
     "Min piezeis pliktra...",
     "Tryck inte p� n�gon knapp...",
     "Nu apasati nicio tasta...",
     "Ne nyomjon meg gombot...",
+    "No premi cap tecla...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -2624,6 +2800,7 @@ const tI18nPhrase Phrases[] = {
     "Fas 2: Inl�rning av specifika knapp koder",
     "Faza 2: Invatarea codurilor specifice tastelor",
     "M�sodik l�p�s: az egyes gombok betan�t�sa",
+    "Fase 2: Aprenentantge de les funcions",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -2640,6 +2817,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck p� knappen f�r '%s'",
     "Apasati tasta pentru '%s'",
     "'%s' gomb megnyom�sa",
+    "Premi una tecla per '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -2656,6 +2834,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck 'Upp' f�r att bekr�fta",
     "Apsati 'Sus' pentru confirmare",
     "'Fel' megnyom�sa az elfogad�shoz",
+    "Premi 'Amunt' per confirmar",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -2672,6 +2851,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck 'Ner' f�r att bekr�fta",
     "Apasati jos pentru continuare",
     "'Le' megnyom�sa a folytat�shoz",
+    "Premi 'Avall' per continuar",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -2688,6 +2868,7 @@ const tI18nPhrase Phrases[] = {
     "(Tryck 'Upp' f�r att backa)",
     "(Apsati 'Sus' pentru revenire)",
     "(�Fel' megnyom�sa a visszat�r�shez)",
+    "(Premi 'Amunt' per retornar)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -2704,6 +2885,7 @@ const tI18nPhrase Phrases[] = {
     "(Tryck 'Ner' f�r att avsluta knapp definition)",
     "(Apasati 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
+    "(Premi 'Avall' per finalitzar l'aprenentatge)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -2715,11 +2897,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "(Paina 'Valikko' jos n�pp�int� ei ole)",
     "",// TODO
-    "",// TODO
+    "Pulse 'Menu' para saltarse esta tecla",
     "Pata 'Menou' gia prosperasi aftou tou pliktrou",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Premi 'Menu' per obviar aquesta tecla",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -2736,6 +2919,7 @@ const tI18nPhrase Phrases[] = {
     "Fas 3: Spara knappkoder",
     "Faza 3: Salvarea codurilor de taste",
     "Harmadik l�p�s: k�d ment�se",
+    "Fase 3: Guardant els codis de les tecles",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -2747,11 +2931,12 @@ const tI18nPhrase Phrases[] = {
     "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
     "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
-    "Pulse 'Arriba' para guarder, 'Abajo' para anular",
+    "Pulse 'Arriba' para guardar, 'Abajo' para anular",
     "'Pano' apothikevsi, 'Kato' akirosi",
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
+    "Premi 'Amunt' per guardar, 'Avall' per anul.lar",
   },
   // Key names:
   { "Up",
@@ -2769,6 +2954,7 @@ const tI18nPhrase Phrases[] = {
     "Upp",
     "Sus",
     "Fel",
+    "Amunt",
   },
   { "Down",
     "Ab",
@@ -2785,6 +2971,7 @@ const tI18nPhrase Phrases[] = {
     "Ner",
     "Jos",
     "Le",
+    "Avall",
   },
   { "Menu",
     "Men�",
@@ -2801,6 +2988,7 @@ const tI18nPhrase Phrases[] = {
     "Meny",
     "Meniu",
     "Men�",
+    "Men�",
   },
   { "Ok",
     "Ok",
@@ -2817,6 +3005,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -2833,6 +3022,7 @@ const tI18nPhrase Phrases[] = {
     "Tillbaka",
     "Inapoi",
     "Vissza",
+    "Retornar",
   },
   { "Left",
     "Links",
@@ -2849,6 +3039,7 @@ const tI18nPhrase Phrases[] = {
     "V�nster",
     "Stinga",
     "Balra",
+    "Esquerra",
   },
   { "Right",
     "Rechts",
@@ -2865,6 +3056,7 @@ const tI18nPhrase Phrases[] = {
     "H�ger",
     "Dreapta",
     "Jobbra",
+    "Dreta"
   },
   { "Red",
     "Rot",
@@ -2881,6 +3073,7 @@ const tI18nPhrase Phrases[] = {
     "R�d",
     "Rosu",
     "Piros",
+    "Vermell"
   },
   { "Green",
     "Gr�n",
@@ -2897,6 +3090,7 @@ const tI18nPhrase Phrases[] = {
     "Gr�n",
     "Verde",
     "Z�ld",
+    "Verd",
   },
   { "Yellow",
     "Gelb",
@@ -2913,6 +3107,7 @@ const tI18nPhrase Phrases[] = {
     "Gul",
     "Galben",
     "S�rga",
+    "Groc",
   },
   { "Blue",
     "Blau",
@@ -2929,6 +3124,7 @@ const tI18nPhrase Phrases[] = {
     "Bl�",
     "Albastru",
     "K�k",
+    "Blau",
   },
   { "Play",
     "Wiedergabe",
@@ -2940,11 +3136,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Reproducir",
     "Anametadosi",
     "Spela upp",
     "",// TODO
     "",// TODO
+    "Reproduir",
   },
   { "Pause",
     "Pause",
@@ -2956,11 +3153,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pausa",
     "Dialima",
     "Pausa",
     "",// TODO
     "",// TODO
+    "Pausa",
   },
   { "Stop",
     "Stop",
@@ -2972,11 +3170,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Parar",
     "Terma",
     "Stoppa",
     "",// TODO
     "",// TODO
+    "Parar",
   },
   { "Record",
     "Aufnehmen",
@@ -2988,11 +3187,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Grabar",
     "Egrafi",
     "Spela in",
     "",// TODO
     "",// TODO
+    "Gravar",
   },
   { "FastFwd",
     "Vorlauf",
@@ -3004,11 +3204,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Adelante r�pido",
     "Girisma mprosta",
     "Spola fram�t",
     "",// TODO
     "",// TODO
+    "Endavant r�pidament",
   },
   { "FastRew",
     "R�cklauf",
@@ -3020,11 +3221,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Atr�s r�pido",
     "Girisma piso",
     "Spola bak�t",
     "",// TODO
     "",// TODO
+    "Enrera r�pidament",
   },
   { "Power",
     "Ausschalten",
@@ -3041,6 +3243,7 @@ const tI18nPhrase Phrases[] = {
     "P�/Av",
     "Pornit",
     "Kikapcsolni",
+    "Parar",
   },
   { "Channel+",
     "Kanal+",
@@ -3052,11 +3255,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Canal +",
     "Kanali+",
     "Kanal+",
     "",// TODO
     "",// TODO
+    "Canal +",
   },
   { "Channel-",
     "Kanal-",
@@ -3068,11 +3272,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Canal -",
     "Kanali-",
     "Kanal-",
     "",// TODO
     "",// TODO
+    "Canal -",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -3089,6 +3294,7 @@ const tI18nPhrase Phrases[] = {
     "Volym+",
     "Volum+",
     "Hanger�+",
+    "Volum +",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -3105,6 +3311,7 @@ const tI18nPhrase Phrases[] = {
     "Volym-",
     "Volum-",
     "Hanger�-",
+    "Volum -",
   },
   { "Mute",
     "Stumm",
@@ -3121,6 +3328,7 @@ const tI18nPhrase Phrases[] = {
     "Ljud Av",
     "Mut(e)",
     "Csend",
+    "En silenci",
   },
   // Miscellaneous:
   { "yes",
@@ -3138,6 +3346,7 @@ const tI18nPhrase Phrases[] = {
     "ja",
     "da",
     "igen",
+    "s�",
   },
   { "no",
     "nein",
@@ -3154,6 +3363,7 @@ const tI18nPhrase Phrases[] = {
     "nej",
     "nu",
     "nem",
+    "no",
   },
   { "off",
     "aus",
@@ -3165,11 +3375,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "off",
     "klisto",
     "av",
     "",// TODO
     "",// TODO
+    "off",
   },
   { "none",
     "keine",
@@ -3181,11 +3392,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ninguno"
     "kanena",
     "",// TODO
     "",// TODO
     "",// TODO
+    "cap",
   },
   { "auto",
     "auto",
@@ -3197,11 +3409,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "auto",
     "aftomato",
     "",// TODO
     "",// TODO
     "",// TODO
+    "auto",
   },
   { "top",
     "oben",
@@ -3213,11 +3426,12 @@ const tI18nPhrase Phrases[] = {
     "�vre",
     "yl�",
     "gora",
-    "parte sup.",
+    "parte superior",
     "pano",
     "�vre",
     "sus",
     "Fent",
+    "a dalt",
   },
   { "bottom",
     "unten",
@@ -3229,11 +3443,12 @@ const tI18nPhrase Phrases[] = {
     "nedre",
     "ala",
     "dol",
-    "fondo",
+    "parte inferior",
     "kato",
     "nedre",
     "jos",
     "lent",
+    "a baix",
   },
   { "Disk",
     "Disk",
@@ -3250,6 +3465,7 @@ const tI18nPhrase Phrases[] = {
     "Disk",
     "Disc",
     "Lemez",
+    "Disc"
   },
   { "free",
     "frei",
@@ -3266,6 +3482,7 @@ const tI18nPhrase Phrases[] = {
     "ledigt",
     "liber",
     "szabad",
+    "lliure"
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -3277,11 +3494,12 @@ const tI18nPhrase Phrases[] = {
     "Hopp: ",
     "Hypp��: ",
     "Skok: ",
-    "Saltar: ",
+    "Salta a: ",
     "Pidima: ",
     "Hopp: ",
     "Salt: ",
     "Ugr�s: ",
+    "Salta a:"
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -3298,6 +3516,7 @@ const tI18nPhrase Phrases[] = {
     "Volym ",
     "Volum ",
     "Hanger� ",
+    "Volum ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -3314,6 +3533,7 @@ const tI18nPhrase Phrases[] = {
     " Avsluta uppspelning",
     " Opreste redare",
     " Lej�tsz�st befejzni",
+    " Parar la reproducci�",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -3330,6 +3550,7 @@ const tI18nPhrase Phrases[] = {
     " Avsluta inspelning ",
     " Opreste inregistrarea ",
     " Felv�telt befejezni ",
+    " Parar la gravaci� ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -3341,11 +3562,12 @@ const tI18nPhrase Phrases[] = {
     " Avbryt redigering",
     " Peruuta muokkaus",
     " Przerwac montaz",
-    " Anular modificaci�n",
+    " Anular modificaci�n ",
     " Akirosi epexsergasias",
     " Avbryt editering",
     " Opreste editare",
     " V�g�st megszak�tani",
+    " Cancel�lar l'edici� ",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -3357,11 +3579,12 @@ const tI18nPhrase Phrases[] = {
     "Bytter f�rste DVB-enhet...",
     "Vaihdetaan ensisijainen vastaanotin...",
     "Pierwszy interfejs DVB przelacza...",
-    "Cambio interface primario...",
+    "Cambio al interface DVB primario...",
     "I protevon DVB Karta alazi...",
     "Byter prim�r DVB enhet...",
     "Comuta interfata primara DVB...",
     "Prim�r Interface �tkapcsolva...",
+    "Canviant a la interf�cie DVB prim�ria...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -3373,11 +3596,12 @@ const tI18nPhrase Phrases[] = {
     "Opp/Ned for ny plass - OK for � flytte",
     "Yl�s/Alas = liiku, OK = siirr�",
     "Gora/Dol na nowa pozycje - Ok zmienia",
-    "Arriba/Abajo para nuevo lugar - OK para mover",
+    "Arriba/Abajo para el nuevo lugar - OK para mover",
     "Pano/Kato gia nea thesi. meta OK",
     "Upp/Ner f�r ny plats - OK f�r att flytta",
     "Sus/Jos pentru noua locatie - OK pentru a muta",
     "Fel/Le egy uj opci��rt - azt�n OK",
+    "Amunt/Avall per una nova localitzaci� - OK per moure",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -3394,6 +3618,7 @@ const tI18nPhrase Phrases[] = {
     "Editering startad",
     "Procesul de editare a inceput",
     "V�g�s elind�tva",
+    "Proc�s d'edici� iniciat",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -3405,11 +3630,12 @@ const tI18nPhrase Phrases[] = {
     "Redigeringsprosess avsluttet",
     "Muokkaus lopetettu",
     "Proces montazu zakonczony",
-    "Proceso modificacion terminado",
+    "Proceso de modificaci�n terminado",
     "I epexsergasia teliose",
     "Editering avslutad",
     "Procesul de editare s-a terminat",
     "V�g�s befejezve",
+    "Proc�s d'edici� finalitzat",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -3426,6 +3652,7 @@ const tI18nPhrase Phrases[] = {
     "Editeringsprocessen misslyckades",
     "Proces de editare nereusit",
     "V�g�s sikertelen!",
+    "Proc�s d'edici� fallit!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -3442,6 +3669,7 @@ const tI18nPhrase Phrases[] = {
     "S�ker igenom inspelningarna...",
     "Caut inregistrari...",
     "Felvett ad�sok b�ng�sz�se...",
+    "cercant gravacions...",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -3453,11 +3681,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Emisi�n en directo parada...",
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pausa d'emissi� en directe..."
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -3469,11 +3698,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "T�ll� laajennoksella ei ole asetuksia!",
     "",// TODO
-    "",// TODO
+    "Este plugin no admite configuraci�n",
     "Afto to plugin den exi parametrous",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Aquest plugin no admet configuraci�!",
    },
   { NULL }
   };
diff --git a/i18n.h b/i18n.h
index f7ff26837..cb8a0887c 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.5 2002/06/22 09:12:21 kls Exp $
+ * $Id: i18n.h 1.6 2003/05/16 12:48:52 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 15;
+const int I18nNumLanguages = 16;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/menu.c b/menu.c
index b8dbf5b32..f4c58b35b 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.243 2003/05/11 13:58:13 kls Exp $
+ * $Id: menu.c 1.245 2003/05/16 12:40:12 kls Exp $
  */
 
 #include "menu.h"
@@ -2909,7 +2909,7 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
 
 // --- cRecordControl --------------------------------------------------------
 
-cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause = false)
+cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
 {
   eventInfo = NULL;
   instantId = NULL;
@@ -3494,7 +3494,9 @@ void cReplayControl::EditCut(void)
   if (fileName) {
      Hide();
      if (!cCutter::Active()) {
-        if (!cCutter::Start(fileName))
+        if (!marks.Count())
+           Interface->Error(tr("No editing marks defined!"));
+        else if (!cCutter::Start(fileName))
            Interface->Error(tr("Can't start editing process!"));
         else
            Interface->Info(tr("Editing process started"));
diff --git a/recorder.c b/recorder.c
index 15e86463a..d7cc9c315 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.5 2003/01/25 16:23:36 kls Exp $
+ * $Id: recorder.c 1.6 2003/05/16 13:33:04 kls Exp $
  */
 
 #include <stdarg.h>
@@ -16,6 +16,10 @@
 // (must be larger than MINVIDEODATA - see remux.h)
 #define VIDEOBUFSIZE  MEGABYTE(5)
 
+// The maximum time we wait before assuming that a recorded video data stream
+// is broken:
+#define MAXBROKENTIMEOUT 30 // seconds
+
 #define MINFREEDISKSPACE    (512) // MB
 #define DISKCHECKINTERVAL   100 // seconds
 
@@ -110,6 +114,7 @@ void cRecorder::Action(void)
 {
   dsyslog("recording thread started (pid=%d)", getpid());
 
+  time_t t = time(NULL);
   active = true;
   while (active) {
         int r;
@@ -134,6 +139,12 @@ void cRecorder::Action(void)
               else
                  break;
               }
+           t = time(NULL);
+           }
+        else if (time(NULL) - t > MAXBROKENTIMEOUT) {
+           esyslog("ERROR: video data stream broken");
+           cThread::EmergencyExit(true);
+           t = time(NULL);
            }
         else
            usleep(1); // this keeps the CPU load low
diff --git a/recording.c b/recording.c
index 3610382e3..9105157a8 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.77 2003/05/11 13:09:08 kls Exp $
+ * $Id: recording.c 1.78 2003/05/18 15:17:45 kls Exp $
  */
 
 #include "recording.h"
@@ -764,9 +764,6 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 
 #define INDEXFILESUFFIX     "/index.vdr"
 
-// The maximum time to wait before giving up while catching up on an index file:
-#define MAXINDEXCATCHUP   2 // seconds
-
 // The minimum age of an index file for considering it no longer to be written:
 #define MININDEXAGE    3600 // seconds
 
@@ -850,50 +847,47 @@ bool cIndexFile::CatchUp(int Index)
 {
   // returns true unless something really goes wrong, so that 'index' becomes NULL
   if (index && f >= 0) {
-     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
-         struct stat buf;
-         if (fstat(f, &buf) == 0) {
-            if (time(NULL) - buf.st_mtime > MININDEXAGE) {
-               // apparently the index file is not being written any more
-               close(f);
-               f = -1;
-               break;
-               }
-            int newLast = buf.st_size / sizeof(tIndex) - 1;
-            if (newLast > last) {
-               if (size <= newLast) {
-                  size *= 2;
-                  if (size <= newLast)
-                     size = newLast + 1;
-                  }
-               index = (tIndex *)realloc(index, size * sizeof(tIndex));
-               if (index) {
-                  int offset = (last + 1) * sizeof(tIndex);
-                  int delta = (newLast - last) * sizeof(tIndex);
-                  if (lseek(f, offset, SEEK_SET) == offset) {
-                     if (safe_read(f, &index[last + 1], delta) != delta) {
-                        esyslog("ERROR: can't read from index");
-                        free(index);
-                        index = NULL;
-                        close(f);
-                        f = -1;
-                        break;
-                        }
-                     last = newLast;
-                     }
-                  else
-                     LOG_ERROR_STR(fileName);
-                  }
-               else
-                  esyslog("ERROR: can't realloc() index");
-               }
-            }
-         else
-            LOG_ERROR_STR(fileName);
-         if (Index < last)
-            break;
-         sleep(1);
-         }
+     if (Index < 0 || Index >= last) {
+        struct stat buf;
+        if (fstat(f, &buf) == 0) {
+           if (time(NULL) - buf.st_mtime > MININDEXAGE) {
+              // apparently the index file is not being written any more
+              close(f);
+              f = -1;
+              return true;
+              }
+           int newLast = buf.st_size / sizeof(tIndex) - 1;
+           if (newLast > last) {
+              if (size <= newLast) {
+                 size *= 2;
+                 if (size <= newLast)
+                    size = newLast + 1;
+                 }
+              index = (tIndex *)realloc(index, size * sizeof(tIndex));
+              if (index) {
+                 int offset = (last + 1) * sizeof(tIndex);
+                 int delta = (newLast - last) * sizeof(tIndex);
+                 if (lseek(f, offset, SEEK_SET) == offset) {
+                    if (safe_read(f, &index[last + 1], delta) != delta) {
+                       esyslog("ERROR: can't read from index");
+                       free(index);
+                       index = NULL;
+                       close(f);
+                       f = -1;
+                       return true;
+                       }
+                    last = newLast;
+                    }
+                 else
+                    LOG_ERROR_STR(fileName);
+                 }
+              else
+                 esyslog("ERROR: can't realloc() index");
+              }
+           }
+        else
+           LOG_ERROR_STR(fileName);
+        }
      }
   return index != NULL;
 }
diff --git a/ringbuffer.c b/ringbuffer.c
index 770b7c342..2cf9d75d9 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.16 2003/05/11 09:47:56 kls Exp $
+ * $Id: ringbuffer.c 1.17 2003/05/12 17:38:11 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -23,6 +23,7 @@ cRingBuffer::cRingBuffer(int Size, bool Statistics)
   statistics = Statistics;
   maxFill = 0;
   lastPercent = 0;
+  putTimeout = getTimeout = 0;
 }
 
 cRingBuffer::~cRingBuffer()
@@ -31,6 +32,42 @@ cRingBuffer::~cRingBuffer()
      dsyslog("buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
 
+void cRingBuffer::WaitForPut(void)
+{
+  if (putTimeout) {
+     putMutex.Lock();
+     readyForPut.TimedWait(putMutex, putTimeout);
+     putMutex.Unlock();
+     }
+}
+
+void cRingBuffer::WaitForGet(void)
+{
+  if (getTimeout) {
+     getMutex.Lock();
+     readyForGet.TimedWait(getMutex, getTimeout);
+     getMutex.Unlock();
+     }
+}
+
+void cRingBuffer::EnablePut(void)
+{
+  if (putTimeout)
+     readyForPut.Broadcast();
+}
+
+void cRingBuffer::EnableGet(void)
+{
+  if (getTimeout)
+     readyForGet.Broadcast();
+}
+
+void cRingBuffer::SetTimeouts(int PutTimeout, int GetTimeout)
+{
+  putTimeout = PutTimeout;
+  getTimeout = GetTimeout;
+}
+
 // --- cRingBufferLinear -----------------------------------------------------
 
 cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics)
@@ -68,6 +105,8 @@ void cRingBufferLinear::Clear(void)
   head = tail = margin;
   lastGet = -1;
   Unlock();
+  EnablePut();
+  EnableGet();
 }
 
 int cRingBufferLinear::Put(const uchar *Data, int Count)
@@ -109,6 +148,9 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
      else
         Count = 0;
      Unlock();
+     EnableGet();
+     if (Count == 0)
+        WaitForPut();
      }
   return Count;
 }
@@ -134,6 +176,8 @@ uchar *cRingBufferLinear::Get(int &Count)
      Count = lastGet = cont;
      }
   Unlock();
+  if (!p)
+     WaitForGet();
   return p;
 }
 
@@ -146,6 +190,7 @@ void cRingBufferLinear::Del(int Count)
      if (tail >= Size())
         tail = margin;
      Unlock();
+     EnablePut();
      }
   else
      esyslog("ERROR: invalid Count in cRingBufferLinear::Del: %d", Count);
@@ -196,6 +241,8 @@ void cRingBufferFrame::Clear(void)
   while ((p = Get()) != NULL)
         Drop(p);
   Unlock();
+  EnablePut();
+  EnableGet();
 }
 
 bool cRingBufferFrame::Put(cFrame *Frame)
@@ -212,6 +259,7 @@ bool cRingBufferFrame::Put(cFrame *Frame)
         }
      currentFill += Frame->Count();
      Unlock();
+     EnableGet();
      return true;
      }
   return false;
@@ -249,6 +297,7 @@ void cRingBufferFrame::Drop(cFrame *Frame)
         esyslog("ERROR: attempt to drop wrong frame from ring buffer!");
      }
   Unlock();
+  EnablePut();
 }
 
 int cRingBufferFrame::Available(void)
diff --git a/ringbuffer.h b/ringbuffer.h
index 6b256627b..150634544 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.11 2003/05/11 09:48:23 kls Exp $
+ * $Id: ringbuffer.h 1.12 2003/05/12 17:35:10 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -16,11 +16,19 @@
 class cRingBuffer {
 private:
   cMutex mutex;
+  cCondVar readyForPut, readyForGet;
+  cMutex putMutex, getMutex;
+  int putTimeout;
+  int getTimeout;
   int size;
 protected:
   int maxFill;//XXX
   int lastPercent;
   bool statistics;//XXX
+  void WaitForPut(void);
+  void WaitForGet(void);
+  void EnablePut(void);
+  void EnableGet(void);
   virtual void Clear(void) = 0;
   virtual int Available(void) = 0;
   int Free(void) { return size - Available() - 1; }
@@ -30,6 +38,7 @@ class cRingBuffer {
 public:
   cRingBuffer(int Size, bool Statistics = false);
   virtual ~cRingBuffer();
+  void SetTimeouts(int PutTimeout, int GetTimeout);
   };
 
 class cRingBufferLinear : public cRingBuffer {
diff --git a/thread.c b/thread.c
index 07c8f79af..5fbcfd883 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.24 2003/05/03 14:03:32 kls Exp $
+ * $Id: thread.c 1.25 2003/05/18 12:45:13 kls Exp $
  */
 
 #include "thread.h"
@@ -61,6 +61,7 @@ bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
         if (pthread_cond_timedwait(&cond, &Mutex.mutex, &abstime) == ETIMEDOUT)
            r = false;
         Mutex.locked = locked;
+        Mutex.lockingPid = getpid();
         }
      }
   return r;
diff --git a/transfer.c b/transfer.c
index cdde55202..b0a8bba56 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.12 2003/05/11 08:48:05 kls Exp $
+ * $Id: transfer.c 1.13 2003/05/18 15:22:09 kls Exp $
  */
 
 #include "transfer.h"
@@ -70,7 +70,7 @@ void cTransfer::Action(void)
   active = true;
   while (active) {
 
-        //XXX+ Maybe we need this to avoid "buffer empty" log messages from the driver.
+        //XXX+ Maybe we need this to avoid buffer underruns in driver.
         //XXX+ But then again, it appears to play just fine without this...
         /*
         if (!gotBufferReserve) {
diff --git a/vdr.c b/vdr.c
index c969e6eb8..7962c0a45 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.154 2003/05/11 08:39:09 kls Exp $
+ * $Id: vdr.c 1.155 2003/05/16 12:11:45 kls Exp $
  */
 
 #include <getopt.h>
@@ -399,6 +399,11 @@ int main(int argc, char *argv[])
 
   Interface = new cInterface(SVDRPport);
 
+  // Start plugins:
+
+  if (!PluginManager.StartPlugins())
+     return 2;
+
   // Remote Controls:
 #if defined(REMOTE_RCU)
   new cRcuRemote("/dev/ttyS1");
@@ -444,11 +449,6 @@ int main(int argc, char *argv[])
      alarm(WatchdogTimeout); // Initial watchdog timer start
      }
 
-  // Start plugins:
-
-  if (!PluginManager.StartPlugins())
-     return 2;
-
   // Main program loop:
 
   cOsdObject *Menu = NULL;

From 8ab980e1d9be404a8842fad54aa9c2e34fa6f4ea Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 May 2003 18:00:00 +0200
Subject: [PATCH 074/307] Version 1.1.33 - Modified handling of audio packets
 in cDvbPlayer for better sync with external   AC3 replay (thanks to Werner
 Fink). - Fixed a memory leak in cNonBlockingFileReader (thanks to Stefan
 Huelswitt). - Completed the French OSD texts (thanks to Gregoire Favre). -
 Completed the Finnish OSD texts (thanks to Niko Tarnanen and Rolf Ahrenberg).
 - Fixed I/O handling in case an explicit controlling terminal is given
 (thanks   to Oliver Endriss). - Fixed resume file handling in case the
 resume.vdr file can't be written   (thanks to Gerhard Steiner). - Fixed
 cutting a recording if there is only a single editing mark (thanks to   Ralf
 Klueber for reporting this one). - Fixed volume display in case a plugin has
 its own OSD open (thanks to Marcel   Wiesweg). - Fixed channel switching in
 the EPG scanner on single device systems. - Completed the Swedish OSD texts
 (thanks to Tomas Prybil). - Now switching to the channel used by the most
 recently started timer in case   the original current channel becomes
 unavailable due to a recording on a   different transponder. If this fails, a
 channel up/down switch is attempted as   a fallback solution (thanks to Lauri
 Tischler for reporting this one, and to   Hermann Gausterer for suggesting to
 switch to the recording channel). - Fixed cReplayControl::Show() to avoid a
 compiler warning in g++ 3.2.3 (thanks   to Jan Ekholm for reporting this
 one). - Completed the Slovenian OSD texts (thanks to Matjaz Thaler). -
 Changed the DEFAULTPRIORITY in device.c to -1, so that the primary device  
 will be used for FTA recordings in case the CAM is connected to a non-primary
   device (thanks to Reinhard Walter Buchner for reporting this one). - The
 cCiHandler now closes its file handle when it gets destroyed. - Checking for
 duplicate recordings with the same file name and disabling the   second timer
 (thanks to Peter Bieringer for reporting this one). - Fixed handling newly
 created timers in case they are not confirmed with "Ok"   (thanks to Gerhard
 Steiner for reporting this one). - It is now possible to directly delete a
 timer that is currently recording   (thanks to Alexander Damhuis for
 reporting this one).

---
 CONTRIBUTORS |  30 +++
 HISTORY      |  36 ++++
 PLUGINS.html |  30 +--
 ci.c         |   4 +-
 ci.h         |   3 +-
 config.h     |   6 +-
 cutter.c     |  10 +-
 device.c     |   4 +-
 dvbdevice.c  |   8 +-
 dvbplayer.c  |  17 +-
 eitscan.c    |   7 +-
 eitscan.h    |   4 +-
 i18n.c       | 530 +++++++++++++++++++++++++--------------------------
 menu.c       |  72 +++++--
 menu.h       |   7 +-
 recording.c  |   7 +-
 vdr.c        |  18 +-
 17 files changed, 452 insertions(+), 341 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d31a118e3..b1f3a3d5e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -172,6 +172,7 @@ Stefan Huelswitt <huels@iname.com>
  for implementing setting the "broken link" flag for GOPs at the beginning of a new
  video sequence, which avoids artefacts when cutting
  for suggesting to add VDRVERSNUM to config.h
+ for fixing a memory leak in cNonBlockingFileReader
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -236,6 +237,8 @@ Werner Fink <werner@suse.de>
  for improving keyboard detection
  for adding some missing cAudio handling calls
  for replacing the 'for' loops in StripAudioPackets() with memset() calls
+ for modifying handling of audio packets in cDvbPlayer for better sync with external
+ AC3 replay
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -409,6 +412,7 @@ Rudi Hofer (Rudi.Hofer@cadsoft.de)
 Gregoire Favre <greg@ulima.unil.ch>
  for fixing some function headers to make them compile with gcc 3.x
  for reporting a bug in taking an active SVDRP connection into account when doing shutdown
+ for translating OSD texts to the French language
 
 Sven Grothklags <sven@uni-paderborn.de>
  for fixing the cutting mechanism to make it re-sync in case a frame is larger
@@ -471,15 +475,20 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting a problem with cPlugin::Start() being called after trying to learn
  the remote control keys
  for reporting a bug in reading 'epg.data' for channels with non-zero RID
+ for fixing I/O handling in case an explicit controlling terminal is given
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
  for his help in testing tuning with "Motor-DiSEqC"
  for his help in debugging CAM support
+ for reporting a problem with recording FTA channels on the CAM device in case
+ the CAM is not connected to the primary device
 
 Lauri Tischler <lauri.tischler@efore.fi>
  for helping to test and debug the new channel source and DiSEqC handling
  for reporting a faulty parameter initialization in menu.c
+ for reporting a problem in case the original current channel becomes
+ unavailable due to a recording on a different transponder
 
 Andy Carter <fruit@ukgateway.net>
  for helping to test new DVB-T handling
@@ -501,6 +510,9 @@ Gerhard Steiner <steiner@mail.austria.com>
  records as a newline character
  for reporting a bug in displaying messages in the status line in case they exceed
  the OSD width
+ for fixing resume file handling in case the resume.vdr file can't be written
+ for reporting a problem with newly created timers in case they are not confirmed
+ with "Ok"
 
 Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
@@ -573,12 +585,14 @@ Teemu Rantanen <tvr@iki.fi>
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
+ for reporting a compiler warning in g++ 3.2.3 regarding cReplayControl::Show()
 
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
  for reporting broken support for raw OSDs of plugins
  for reporting a problem with cReceivers that want to receive from PIDs that are
  currently not transmitting
+ for fixing volume display in case a plugin has its own OSD open
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -669,3 +683,19 @@ Marc Rovira Vall <tm05462@salleURL.edu> and Ramon Roca <ramon.roca@xcombo.com>
 Lars Bl�ser <LBlaeser@hofheim.de>
  for reporting a bug in EPG bugfix statistics which made log entires for undefined
  channels
+
+Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
+ for translating OSD texts to the Finnish language
+
+Ralf Klueber <ralf.klueber@vodafone.com>
+ for reporting a bug in cutting a recording if there is only a single editing mark
+
+Hermann Gausterer <mrq1@gmx.net>
+ for suggesting to switch to the recording channel in case the current channel
+ becomes unavailable
+
+Peter Bieringer <pb@bieringer.de>
+ for reporting a problem with duplicate recordings with the same file name
+
+Alexander Damhuis <ad@phonedation.de>
+ for reporting problems when deleting a timer that is currently recording
diff --git a/HISTORY b/HISTORY
index 0f46d7e59..65ca0feb0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2172,3 +2172,39 @@ Video Disk Recorder Revision History
   to Lars Bl�ser for reporting this one).
 - No longer waiting inside cIndexFile::CatchUp() to avoid shortly blocking replay
   at the end of a recording.
+
+2003-05-25: Version 1.1.33
+
+- Modified handling of audio packets in cDvbPlayer for better sync with external
+  AC3 replay (thanks to Werner Fink).
+- Fixed a memory leak in cNonBlockingFileReader (thanks to Stefan Huelswitt).
+- Completed the French OSD texts (thanks to Gregoire Favre).
+- Completed the Finnish OSD texts (thanks to Niko Tarnanen and Rolf Ahrenberg).
+- Fixed I/O handling in case an explicit controlling terminal is given (thanks
+  to Oliver Endriss).
+- Fixed resume file handling in case the resume.vdr file can't be written
+  (thanks to Gerhard Steiner).
+- Fixed cutting a recording if there is only a single editing mark (thanks to
+  Ralf Klueber for reporting this one).
+- Fixed volume display in case a plugin has its own OSD open (thanks to Marcel
+  Wiesweg).
+- Fixed channel switching in the EPG scanner on single device systems.
+- Completed the Swedish OSD texts (thanks to Tomas Prybil).
+- Now switching to the channel used by the most recently started timer in case
+  the original current channel becomes unavailable due to a recording on a
+  different transponder. If this fails, a channel up/down switch is attempted as
+  a fallback solution (thanks to Lauri Tischler for reporting this one, and to
+  Hermann Gausterer for suggesting to switch to the recording channel).
+- Fixed cReplayControl::Show() to avoid a compiler warning in g++ 3.2.3 (thanks
+  to Jan Ekholm for reporting this one).
+- Completed the Slovenian OSD texts (thanks to Matjaz Thaler).
+- Changed the DEFAULTPRIORITY in device.c to -1, so that the primary device
+  will be used for FTA recordings in case the CAM is connected to a non-primary
+  device (thanks to Reinhard Walter Buchner for reporting this one).
+- The cCiHandler now closes its file handle when it gets destroyed.
+- Checking for duplicate recordings with the same file name and disabling the
+  second timer (thanks to Peter Bieringer for reporting this one).
+- Fixed handling newly created timers in case they are not confirmed with "Ok"
+  (thanks to Gerhard Steiner for reporting this one).
+- It is now possible to directly delete a timer that is currently recording
+  (thanks to Alexander Damhuis for reporting this one).
diff --git a/PLUGINS.html b/PLUGINS.html
index b632b61d1..9a97b0000 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -20,19 +20,6 @@
 VDR program and present itself to the user.
 The <i>internal</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
-<p>
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.17 are marked like this.
-<!--X1.1.17--></td></tr></table>
-<!--X1.1.27--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.27 are marked like this.
-<!--X1.1.27--></td></tr></table>
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.31 are marked like this.
-<!--X1.1.31--></td></tr></table>
-<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.32 are marked like this.
-<!--X1.1.32--></td></tr></table>
 
 <hr>
 <h1>Table Of Contents</h1>
@@ -284,10 +271,8 @@ <h1>Table Of Contents</h1>
 <b>must not access any global structures of VDR</b>.
 It also must not create any threads or other large data structures. These things
 are done in the
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a href="#Getting started"><tt>Initialize()</tt></a> or
 <a href="#Getting started"><tt>Start()</tt></a>
-<!--X1.1.31--></td></tr></table>
 function later.
 Constructing a plugin object shall not have any side effects or produce any output,
 since VDR, for instance, has to create the plugin objects in order to get their
@@ -460,26 +445,20 @@ <h1>Table Of Contents</h1>
 it needs to implement one of the functions
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%><pre>
 virtual bool Initialize(void);
-<!--X1.1.31--></pre></td></tr></table>
 virtual bool Start(void);
 </pre></td></tr></table><p>
 
 which are called once for each plugin at program startup.
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
-<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 The difference between these two functions is that <tt>Initialize()</tt> is
 called early at program startup, while <tt>Start()</tt> is called after the primary
 device and user interface has been set up, but before the main program loop is entered.
-<!--X1.1.32--></td></tr></table>
 Inside the <tt>Start()</tt> function of any plugin it is guaranteed that the <tt>Initialize()</tt>
 functions of all plugins have  already been called. For many plugins it probably
 doesn't matter which of these functions they implement, but it may be of importance
 for, e.g., plugins that implement devices. Such plugins should create their cDevice
 derived objects in <tt>Initialize()</tt>, so that other plugins can use them in their
 <tt>Start()</tt> functions.
-<!--X1.1.31--></td></tr></table>
 <p>
 Inside this function the plugin must set up everything necessary to perform
 its task. This may, for instance, be a thread that collects data from the DVB
@@ -529,7 +508,6 @@ <h1>Table Of Contents</h1>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
-<!--X1.1.17--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
@@ -550,7 +528,6 @@ <h1>Table Of Contents</h1>
 <li>Perform a specific action and return <tt>NULL</tt>. In that case the main menu
     will be closed after calling <tt>MainMenuAction()</tt>.
 </ul>
-<!--X1.1.17--></td></tr></table>
 <b>
 It is very important that a call to <tt>MainMenuAction()</tt> returns as soon
 as possible! As long as the program stays inside this function, no other user
@@ -802,6 +779,7 @@ <h1>Table Of Contents</h1>
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
   },
   { NULL }
   };
@@ -1200,9 +1178,7 @@ <h1>Table Of Contents</h1>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 cMyReceiver *Receiver = new cMyReceiver(123);
 
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 cDevice::ActualDevice()-&gt;AttachReceiver(Receiver);
-<!--X1.1.31--></td></tr></table>
 </pre></td></tr></table><p>
 
 Noteh the use of <tt>cDevice::ActualDevice()</tt> here, which makes sure that
@@ -1372,7 +1348,6 @@ <h1>Table Of Contents</h1>
 <p>
 <b>Initializing new devices</b>
 <p>
-<!--X1.1.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 A derived cDevice class shall implement a static function
 in which it determines whether the necessary hardware to run this sort of
 device is actually present in this machine (or whatever other prerequisites
@@ -1384,7 +1359,6 @@ <h1>Table Of Contents</h1>
 function from its <a href="#Getting started"><tt>Initialize()</tt></a> function
 to make sure other plugins that may need to have access to all available devices
 will see them in their <a href="#Getting started"><tt>Start()</tt></a> function.
-<!--X1.1.31--></td></tr></table>
 <p>
 Nothing needs to be done to shut down the devices. VDR will automatically
 shut down (delete) all devices when the program terminates. It is therefore
@@ -1500,7 +1474,6 @@ <h1>Table Of Contents</h1>
 In case you need to do any other setup steps, like opening a file or initializing
 member variables, you should do so before calling <tt>Start()</tt>.
 <p>
-<!--X1.1.27--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 If your remote control for some reason can't work (maybe because it was unable to
 open some file handle it requires) it can implement the virtual function
 
@@ -1510,7 +1483,6 @@ <h1>Table Of Contents</h1>
 
 and have it return <i>false</i>. In that case VDR will not try to learn keys from
 that remote control.
-<!--X1.1.27--></td></tr></table>
 VDR will handle everything necessary to learn the key mappings of your remote
 control. In order to do so, it will first call the virtual function <tt>Initialize()</tt>,
 in which you should take all necessary steps to make sure your remote control
diff --git a/ci.c b/ci.c
index 91d9ede93..3575d142e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.14 2003/04/20 09:52:45 kls Exp $
+ * $Id: ci.c 1.15 2003/05/25 11:45:11 kls Exp $
  */
 
 /* XXX TODO
@@ -1287,6 +1287,7 @@ void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
 
 cCiHandler::cCiHandler(int Fd, int NumSlots)
 {
+  fd = Fd;
   numSlots = NumSlots;
   newCaSupport = false;
   hasUserIO = false;
@@ -1301,6 +1302,7 @@ cCiHandler::~cCiHandler()
   for (int i = 0; i < MAX_CI_SESSION; i++)
       delete sessions[i];
   delete tpl;
+  close(fd);
 }
 
 cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
diff --git a/ci.h b/ci.h
index 79ed62f35..62046e5ad 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.7 2003/04/20 09:21:23 kls Exp $
+ * $Id: ci.h 1.8 2003/05/25 11:44:47 kls Exp $
  */
 
 #ifndef __CI_H
@@ -79,6 +79,7 @@ class cCiTransportConnection;
 class cCiHandler {
 private:
   cMutex mutex;
+  int fd;
   int numSlots;
   bool newCaSupport;
   bool hasUserIO;
diff --git a/config.h b/config.h
index 4d265ff77..c7c301342 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.159 2003/05/16 12:27:58 kls Exp $
+ * $Id: config.h 1.160 2003/05/19 15:27:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.32"
-#define VDRVERSNUM   10132  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.1.33"
+#define VDRVERSNUM   10133  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index 5ce0a2c48..01e460d6b 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.3 2003/04/26 15:11:17 kls Exp $
+ * $Id: cutter.c 1.4 2003/05/24 11:59:33 kls Exp $
  */
 
 #include "cutter.h"
@@ -77,6 +77,7 @@ void cCuttingThread::Action(void)
      toMarks.Add(0);
      toMarks.Save();
      uchar buffer[MAXFRAMESIZE];
+     bool LastMark = false;
      bool cutIn = true;
      while (active) {
            uchar FileNumber;
@@ -116,7 +117,7 @@ void cCuttingThread::Action(void)
            // Write one frame:
 
            if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
-              if (!Mark) // edited version shall end before next I-frame
+              if (LastMark) // edited version shall end before next I-frame
                  break;
               if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
                  toFile = toFileName->NextFile();
@@ -167,9 +168,8 @@ void cCuttingThread::Action(void)
                     FileSize = 0;
                     }
                  }
-              // the 'else' case (i.e. 'final end mark reached') is handled above
-              // in 'Write one frame', so that the edited version will end right
-              // before the next I-frame.
+              else
+                 LastMark = true;
               }
            }
      }
diff --git a/device.c b/device.c
index 7562a3284..58f9bf0a9 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.43 2003/05/16 13:26:43 kls Exp $
+ * $Id: device.c 1.44 2003/05/25 10:57:59 kls Exp $
  */
 
 #include "device.h"
@@ -23,7 +23,7 @@
 // --- cDevice ---------------------------------------------------------------
 
 // The default priority for non-primary devices:
-#define DEFAULTPRIORITY  -2
+#define DEFAULTPRIORITY  -1
 
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
diff --git a/dvbdevice.c b/dvbdevice.c
index 8314ab60d..7fc50a713 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.59 2003/05/03 14:03:20 kls Exp $
+ * $Id: dvbdevice.c 1.60 2003/05/24 13:23:51 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -27,6 +27,7 @@ extern "C" {
 #include "channels.h"
 #include "diseqc.h"
 #include "dvbosd.h"
+#include "eitscan.h"
 #include "player.h"
 #include "receiver.h"
 #include "status.h"
@@ -658,6 +659,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   StartTransferMode = false;
 #endif
 
+  if (EITScanner.Active()) {
+     StartTransferMode = false;
+     TurnOnLivePIDs = false;
+     }
+
   // Stop SI filtering:
 
   if (siProcessor) {
diff --git a/dvbplayer.c b/dvbplayer.c
index afd427896..6b7fe076d 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.20 2003/04/27 09:55:53 kls Exp $
+ * $Id: dvbplayer.c 1.22 2003/05/24 09:04:26 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -114,6 +114,7 @@ void cNonBlockingFileReader::Clear(void)
 {
   cMutexLock MutexLock(&mutex);
   f = -1;
+  free(buffer);
   buffer = NULL;
   wanted = length = 0;
   hasData = false;
@@ -477,8 +478,8 @@ void cDvbPlayer::Action(void)
                     }
                  int r = nonBlockingFileReader->Read(replayFile, b, Length);
                  if (r > 0) {
-                    if (AudioTrack >= 0)
-                       StripAudioPackets(b, r, AudioTrack);
+                    if (AudioTrack == 0)
+                       StripAudioPackets(b, r);
                     readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
                     b = NULL;
                     }
@@ -514,9 +515,13 @@ void cDvbPlayer::Action(void)
               if (!p) {
                  p = playFrame->Data();
                  pc = playFrame->Count();
-                 if (firstPacket) {
-                    cRemux::SetBrokenLink(p, pc);
-                    firstPacket = false;
+                 if (p) {
+                    if (firstPacket) {
+                       cRemux::SetBrokenLink(p, pc);
+                       firstPacket = false;
+                       }
+                    if (AudioTrack > 0)
+                       StripAudioPackets(p, pc, AudioTrack);
                     }
                  }
               if (p) {
diff --git a/eitscan.c b/eitscan.c
index a5c1a7b94..f9058cf0c 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.12 2003/03/16 13:29:55 kls Exp $
+ * $Id: eitscan.c 1.13 2003/05/24 13:34:59 kls Exp $
  */
 
 #include "eitscan.h"
@@ -12,6 +12,8 @@
 #include "channels.h"
 #include "dvbdevice.h"
 
+cEITScanner EITScanner;
+
 cEITScanner::cEITScanner(void)
 {
   lastScan = lastActivity = time(NULL);
@@ -61,8 +63,9 @@ void cEITScanner::Process(void)
                          if (Channel) {
                             lastChannel[Device->DeviceNumber()] = Channel->Number();
                             if (Channel->Sid() && Device->ProvidesChannel(Channel) && !TransponderScanned(Channel)) {
-                               if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                               if (Device == cDevice::PrimaryDevice() && !currentChannel) {
                                   currentChannel = Device->CurrentChannel();
+                                  }
                                Device->SwitchChannel(Channel, false);
                                break;
                                }
diff --git a/eitscan.h b/eitscan.h
index 5b40ddd6e..609bf78fb 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.2 2003/03/16 13:20:40 kls Exp $
+ * $Id: eitscan.h 1.3 2003/05/24 13:21:36 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -31,4 +31,6 @@ class cEITScanner {
   void Process(void);
   };
 
+extern cEITScanner EITScanner;
+
 #endif //__EITSCAN_H
diff --git a/i18n.c b/i18n.c
index 64194fc8e..2e4c86ffd 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.110 2003/05/16 13:02:08 kls Exp $
+ * $Id: i18n.c 1.117 2003/05/25 14:20:27 kls Exp $
  *
  * Translations provided by:
  *
@@ -12,9 +12,9 @@
  * Italian     Alberto Carraro <bertocar@tin.it>
  * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
- * French      Jean-Claude Repetto <jc@repetto.org> and Olivier Jacques <jacquesolivier@hotmail.com>
+ * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com> and Gregoire Favre <greg@magma.unil.ch>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
- * Finnish     Hannu Savolainen <hannu@opensound.com> and Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
+ * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  * Polish      Michael Rakowski <mrak@gmx.de>
  * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
@@ -79,7 +79,7 @@ const tI18nPhrase Phrases[] = {
     "Portugu�s",
     "Fran�ais",
     "Norsk",
-    "Suomi",
+    "suomi",
     "Polski",
     "Espa�ol",
     "Ellinika",
@@ -108,13 +108,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Schedule",
     "Programm",
-    "Urnik",
+    "Program",
     "Programmi",
     "Gids",
     "Programa��o",
     "Programmes",
     "Programmer",
-    "Ohjelmat",
+    "Ohjelmisto",
     "Program",
     "Gu�a de Programaci�n",
     "Programma",
@@ -165,7 +165,7 @@ const tI18nPhrase Phrases[] = {
     "Grava��es",
     "Enregistrements",
     "Opptak",
-    "Nauhoitteet",
+    "Tallenteet",
     "Nagrania",
     "Grabaciones",
     "Egrafes",
@@ -210,13 +210,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
+    "Ukazi za snemanje",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Commandes d'enregistrement",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "Nauhoituskomennot",
+    "Tallennuskomennot",
     "",// TODO
     "�rdenes de grabaci�n",
     "Entoles gia egrafes",// TODO
@@ -250,7 +250,7 @@ const tI18nPhrase Phrases[] = {
     "Modificar timer",
     "Changer la programmation",
     "Editer timer",
-    "Muokkaa ajastusta",
+    "Muokkaa ajastinta",
     "Ustawienie timerow",
     "Modificar timer",
     "Prosarmogi Programmatismou",
@@ -288,20 +288,20 @@ const tI18nPhrase Phrases[] = {
     "Zawartosc",
     "Res�men",
     "Periexomeno",
-    "Sammandrag",
+    "Sammanfattning",
     "Cuprins",
     "Tartalom",
     "Sinopsi",
   },
   { "Schedule - %s",
     "Programm - %s",
-    "Urnik - %s",
+    "Program - %s",
     "Programma - %s",
     "Programma - %s",
     "Programa - %s",
     "Programmes - %s",
     "Program Guide - %s",
-    "Ohjelma - %s",
+    "Ohjelmisto - %s",
     "Program - %s",
     "Programa - %s",
     "Programma - %s",
@@ -318,7 +318,7 @@ const tI18nPhrase Phrases[] = {
     "Programa actual?",
     "Programmes en cours",
     "Hvilket program sendes n�?",
-    "Nykyinen ohjelma",
+    "Menossa nyt",
     "Program biezacy",
     "�Qu� hay ahora?",
     "Trexon Programma",
@@ -335,7 +335,7 @@ const tI18nPhrase Phrases[] = {
     "Pr�ximo Programa?",
     "Prochains programmes",
     "Hvilket program er neste?",
-    "Seuraava ohjelma",
+    "Tulossa seuraavaksi",
     "Program nastepny",
     "�Qu� hay proximo?",
     "Epomeno Programma",
@@ -353,7 +353,7 @@ const tI18nPhrase Phrases[] = {
     "Modificar",
     "Modifier",
     "Editer",
-    "Muuta",
+    "Muokkaa",
     "Edycja",
     "Modificar",
     "Prosarmogi",
@@ -381,7 +381,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Delete",
     "L�schen",
-    "Odstrani",
+    "Izbrisi",
     "Cancella",
     "Verwijder",
     "Apagar",
@@ -438,7 +438,7 @@ const tI18nPhrase Phrases[] = {
     "Gravar",
     "Enregistre",
     "Ta opp",
-    "Nauhoita",
+    "Tallenna",
     "Nagrywac",
     "Grabar",
     "Egrafi",
@@ -449,7 +449,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Play",
     "Wiedergabe",
-    "Predavajaj",
+    "Predvajaj",
     "Riproduci",
     "Afspelen",
     "Play",
@@ -466,13 +466,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Rewind",
     "Anfang",
-    "Zacetek",
+    "Na zacetek",
     "Da inizio",
     "Naar begin",
     "Rebobinar",
     "Retour",
     "Spol tilbake",
-    "Takaisinkel.",
+    "Alkuun",
     "Poczatek",
     "Rebobinar",
     "Arxi",
@@ -527,7 +527,7 @@ const tI18nPhrase Phrases[] = {
     "Zawartosc",
     "Resumen",
     "Periexomeno",
-    "Sammandrag",
+    "Sammanfattning",
     "Cuprins",
     "Tartalom",
     "Resum",
@@ -585,7 +585,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Next",
     "N�chste",
-    "Naslednji",
+    "Sledi",
     "Prossimo",
     "Hierna",
     "Proximo",
@@ -602,7 +602,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Button$Schedule",
     "Programm",
-    "Urnik",
+    "Program",
     "Programma",
     "Programma",
     "Programa��o",
@@ -670,11 +670,11 @@ const tI18nPhrase Phrases[] = {
   },
   { "Insert",
     "Einf�gen",
+    "Vstavi",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Ins�rt",
     "",// TODO
     "Lis��",
     "",// TODO
@@ -687,11 +687,11 @@ const tI18nPhrase Phrases[] = {
   },
   { "Overwrite",
     "�berschreiben",
+    "Prepisi",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "�craser",
     "",// TODO
     "Korvaa",
     "",// TODO
@@ -720,18 +720,18 @@ const tI18nPhrase Phrases[] = {
     "Men�",
   },
   { "Reset",
+    "Reset",
     "Reset",
     "",//TODO
     "",//TODO
     "",//TODO
+    "R�initialisation",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Nollaa",
     "",//TODO
     "Reiniciar",
     "Epanafora",
-    "",//TODO
+    "�terst�ll",
     "",//TODO
     "",//TODO
     "Reiniciar",
@@ -739,13 +739,13 @@ const tI18nPhrase Phrases[] = {
   // Confirmations:
   { "Delete channel?",
     "Kanal l�schen?",
-    "Odstrani kanal?",
+    "Izbrisi kanal?",
     "Cancello il canale?",
     "Kanaal verwijderen?",
     "Apagar o canal?",
     "Supprimer la cha�ne?",
     "Slette kanal?",
-    "Poistetaanko kanava?",
+    "Poista kanava?",
     "Usunac kanal?",
     "�Eliminar canal?",
     "Diagrafi Kanaliou?",
@@ -756,13 +756,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Delete timer?",
     "Timer l�schen?",
-    "Odstani termin?",
+    "Izbrisi termin?",
     "Cancello il timer?",
     "Timer verwijderen?",
     "Apagar o timer?",
     "Supprimer la programmation?",
     "Slette timer?",
-    "Poistetaanko ajastus?",
+    "Poista ajastin?",
     "Usunac timer?",
     "�Eliminar timer?",
     "Diagrafi programmitismou?",
@@ -773,13 +773,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
-    "Odstrani posnetek?",
+    "Izbrisi posnetek?",
     "Cancello la registrazione?",
     "Opname verwijderen?",
     "Apagar a grava��o?",
     "Supprimer l'enregistrement?",
     "Slette opptak?",
-    "Poistetaanko nauhoitus?",
+    "Poista tallenne?",
     "Usunac nagranie?",
     "�Eliminar grabacion?",
     "Svisimo egrafis?",
@@ -790,13 +790,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
-    "Snemanje po terminu - zares odstrani?",
+    "Snemanje po terminu - zares izbrisi?",
     "Timer in regestazione - cancello?",
     "Timer neemt nog op - toch verwijderen?",
     "Timer activo - t�m a certeza que quer apagar?",
     "Enregistrement en cours - confirmez la suppression",
     "Timer gj�r opptak - vil du slette likevel?",
-    "Ajastin nauhoittaa - poistetaanko silti?",
+    "Ajastin aktiivinen - poistetaanko?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
     "Programmatismos se exselixsi - Diagrafi sigoura?",
@@ -813,7 +813,7 @@ const tI18nPhrase Phrases[] = {
     "Parar Grava��o?",
     "Arr�ter l'enregistrement?",
     "Stoppe opptak?",
-    "Pys�ytet��nk� nauhoitus?",
+    "Keskeyt� tallennus?",
     "Zakonczyc nagranie?",
     "�Parar grabaci�n?",
     "Akirosi egrafis?",
@@ -834,7 +834,7 @@ const tI18nPhrase Phrases[] = {
     "na pierwszym interfejsie",
     "en interface primario",
     "stin protevon karta",
-    "fr�n det f�rsta enheten?",
+    "fr�n den f�rsta enheten?",
     "pe prima interfata",
     "az els� k�rty�n",
     "a la interf�cie prim�ria",
@@ -847,24 +847,24 @@ const tI18nPhrase Phrases[] = {
     "Cancelar Modifica��es?",
     "Annuler les modifications?",
     "Avbryte redigering?",
-    "Peruutetaanko muokkaus?",
+    "Peru muokkaus?",
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
     "Akirosi kopsimatos?",
-    "Avbryta editeringen?",
+    "Avbryta redigeringen?",
     "Opresc editarea?",
     "V�g�st befejezni?",
     "Cancel.lar l'edici�?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
-    "Zares ponoven zagon",
+    "Zares ponoven zagon?",
     "Eseguo un restart?",
     "Werkelijk opnieuw starten?",
     "Tem a certeza que quer reiniciar?",
     "Red�marrer?",
     "Vil du virkelig starte p� nytt?",
-    "Aloitetaanko varmasti alusta?",
+    "K�ynnist� uudelleen?",
     "Rzeczywiscie nowy start?",
     "�De verdad reiniciar?",
     "Na gini sigoura epanekinisi?",
@@ -875,17 +875,17 @@ const tI18nPhrase Phrases[] = {
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
-    "Snemanje - zares ponoven zagon",
+    "Snemanje - zares ponoven zagon?",
     "In registrazione - restart comunque?",
     "Opname loopt - toch opnieuw starten?",
     "Em grava��o - quer mesmo reiniciar?",
     "Enregistrement en cours - red�marrer?",
     "Gj�r opptak - starte p� nytt likevel?",
-    "Nauhoitus k�ynniss� - aloitetaanko alusta?",
+    "Tallennus kesken - k�ynnistet��nk� uudelleen?",
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
     "Grabando - �reiniciar?",
     "Ginete egrafi - Telika na ginei epanekinisi?",
-    "Inspelning p�g�r, vill du starta om i alla fall?",
+    "Inspelning p�g�r, vill du �nd� starta om?",
     "In inregistrare - repornesc?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
     "Estic gravant - reiniciar de totes maneres?"
@@ -898,11 +898,11 @@ const tI18nPhrase Phrases[] = {
     "Em grava��o - quer mesmo desligar?",
     "Enregistrement en cours - confirmez l'arr�t",
     "Gj�r opptak - sl� av likevel?",
-    "Nauhoitus kesken - lopetetaanko se?",
+    "Tallennus kesken - sammutetaanko?",
     "Nagrywanie w trakcie - mimo to wylaczyc?",
     "Grabando - �apagar?",
     "Ginete egrafi - Telika na ginei termatismos?",
-    "Inspelning p�g�r, vill du avbryta i alla fall?",
+    "Inspelning p�g�r, vill du �nd� avbryta?",
     "In inregistrare - opresc?",
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
     "Gravant - Apagar de totes maneres?",
@@ -915,7 +915,7 @@ const tI18nPhrase Phrases[] = {
     "Em grava��o dentro de %d minutos - quer mesmo desligar?",
     "Enregistrement dans %d minutes - confirmez l'arr�t",
     "Skal gj�re opptak om %d minutter - sl� av likevel?",
-    "Nauhoitus alkaisi %d min. kuluttua - sammutetaanko silti?",
+    "Tallennus alkaa %d min kuluttua - sammutetaanko?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
     "Grabando en %d minutos, �de verdad apagar?",
     "Anamenete egrafi se %d lepta - Telika na termatistei?",
@@ -932,11 +932,11 @@ const tI18nPhrase Phrases[] = {
     "Pressione qualquer tecla para cancelar",
     "Appuyez sur une touche pour annuler l'arr�t",
     "Trykk en tast for ikke � sl� av",
-    "Peruuta pys�ytys painamalla jotakin n�pp�int�",
+    "Peru sammutus painamalla jotain n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
     "Pulse una tecla para interrumpir apagar",
     "Piese ena pliktro na akirothei o termatismos",
-    "Tryck valfri knapp f�r att avbryta nedst�ngning",
+    "Tryck valfri knapp f�r att �terkalla avst�ngningen",
     "Apasa orice tasta pentru a anula inchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
     "Prem qualsevol tecla per cancel.lar l'aturada",
@@ -995,11 +995,11 @@ const tI18nPhrase Phrases[] = {
   },
   { "Source",
     "Quelle",
+    "Pozicija",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Source",
     "",//TODO
     "L�hde",
     "",//TODO
@@ -1018,11 +1018,11 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Fr�q. Symbole",
     "Srate",
+    "Symbolinopeus",
     "Srate",
     "Srate",
     "Srate",
-    "Srate",
-    "Srate",
+    "Symbolrate",
     "Rata simboluri",
     "Srate",
     "Srate",
@@ -1039,7 +1039,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "Vpid",
-    "Vpid",
+    "Video PID",
     "PID Video",
     "Vpid",
     "PID V�deo",
@@ -1052,11 +1052,11 @@ const tI18nPhrase Phrases[] = {
     "PID �udio (1)",
     "PID Audio (1)",
     "Apid1",
-    "��ni PID1",
-    "Apid1",
+    "��ni PID (1)",
     "Apid1",
     "Apid1",
     "Apid1",
+    "Audio PID1",
     "PID Audio (1)",
     "Apid1",
     "PID �udio (1)",
@@ -1069,11 +1069,11 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "PID �udio (2)",
     "Apid2",
-    "��ni PID2",
-    "Apid2",
+    "��ni PID (2)",
     "Apid2",
     "Apid2",
     "Apid2",
+    "Audio PID2",
     "PID Audio (2)",
     "Apid2",
     "PID �udio (2)",
@@ -1086,7 +1086,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (1)",
     "PID AC3 (1)",
     "AC3pid1",
-    "AC3 PID1",
+    "AC3 PID (1)",
     "Dpid1",
     "Dpid1",
     "Dpid1",
@@ -1103,7 +1103,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (2)",
     "PID AC3 (2)",
     "AC3pid2",
-    "AC3 PID2",
+    "AC3 PID (2)",
     "Dpid2",
     "Dpid2",
     "Dpid2",
@@ -1120,11 +1120,11 @@ const tI18nPhrase Phrases[] = {
     "PID Teletexto",
     "PID T�l�texte",
     "Tekst-TV pid",
-    "TekstiTV PID",
-    "Tpid",
+    "Teksti-TV PID",
     "Tpid",
     "Tpid",
     "Tpid",
+    "Teletext PID",
     "PID Teletext",
     "Tpid",
     "PID Teletext",
@@ -1141,7 +1141,7 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "CA",
     "CA",
-    "CA",
+    "Kortl�sare",
     "Criptare",
     "CA",
     "Acc�s Condicional",
@@ -1154,7 +1154,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid",
-    "Sid",
+    "Palvelu ID",
     "Sid",
     "Sid",
     "Sid",
@@ -1165,7 +1165,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Inversion",
     "Inversion",
-    "Inversion",
+    "Inverzija",
     "Inversion",
     "Inversion",
     "Inversion",
@@ -1182,13 +1182,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Bandwidth",
     "Bandwidth",
+    "Pasovna sirina",
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
-    "Bandwidth",
-    "Bandwidth",
+    "Kaistanleveys",
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
@@ -1205,7 +1205,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
-    "CoderateH",
+    "Yl�koodinopeus", //Finnish - unsure about this
     "CoderateH",
     "CoderateH",
     "CoderateH",
@@ -1222,7 +1222,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
-    "CoderateL",
+    "Alakoodinopeus", //Finnish - unsure about this
     "CoderateL",
     "CoderateL",
     "CoderateL",
@@ -1233,7 +1233,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Modulation",
     "Modulation",
-    "Modulation",
+    "Modulacija",
     "Modulation",
     "Modulation",
     "Modulation",
@@ -1250,13 +1250,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Transmission",
     "Transmission",
+    "Prenos",
     "Transmission",
     "Transmission",
     "Transmission",
     "Transmission",
     "Transmission",
-    "Transmission",
-    "Transmission",
+    "L�hetys", //Finnish - unsure about this
     "Transmission",
     "Transmission",
     "Transmission",
@@ -1267,13 +1267,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Guard",
     "Guard",
+    "Zascita",
     "Guard",
     "Guard",
     "Guard",
     "Guard",
     "Guard",
-    "Guard",
-    "Guard",
+    "Suoja", //Finnish - unsure about this
     "Guard",
     "Guard",
     "Guard",
@@ -1284,13 +1284,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Hierarchy",
     "Hierarchy",
+    "Hierarhija",
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
-    "Hierarchy",
-    "Hierarchy",
+    "Hierarkia",
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
@@ -1410,11 +1410,11 @@ const tI18nPhrase Phrases[] = {
     "Dura��o",
     "Dur�e de vie",
     "Levetid",
-    "Voimassaolo",
+    "Elinik�",
     "Trwalosc dni",
     "Durabilidad",
     "Xronos Zois",
-    "Speltid",
+    "Livstid",
     "Durata",
     "�lettartam",
     "Duraci�",
@@ -1456,7 +1456,7 @@ const tI18nPhrase Phrases[] = {
   // Error messages:
   { "Channel is being used by a timer!",
     "Kanal wird von einem Timer benutzt!",
-    "Urnik zaseda kanal!",
+    "Kanal uporablja termin za snemanje!",
     "Canale occupato da un timer!",
     "Kanaal wordt gebruikt door een timer!",
     "Canal a ser utilizador por um timer!",
@@ -1490,13 +1490,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
-    "Snemanje po urniku!",
+    "Snemanje po terminu!",
     "Registrazione di un timer in corso!",
     "Timer is aan het opnemen!",
     "Timer a gravar!",
     "Enregistrement en cours!",
     "Timer gj�r opptak!",
-    "Ajastinnauhoitus k�ynniss�!",
+    "Ajastintallennus k�ynniss�!",
     "Timer nagrywa!",
     "�Timer esta grabando!",
     "Ginete progrmamatismeni egrafi!",
@@ -1507,34 +1507,34 @@ const tI18nPhrase Phrases[] = {
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
-    "Napaka pri dostopu do posnetka",
+    "Napaka pri dostopu do posnetka!",
     "Errore nel tentativo di acc alla registrazione",
     "Fout bij lezen opname!",
     "Erro ao aceder � grava��o",
     "Impossible d'acc�der � l'enregistrement",
     "Feil under lesing av opptak!",
-    "Nauhoituksen toistaminen ep�onnistui!",
+    "Tallenteen toistaminen ep�onnistui!",
     "Blad - brak dostepu do nagrania!",
     "�Error al acceder a la grabaci�n!",
     "Provlima stin prospelasi egrafis!",
-    "Det g�r inte att l�sa inspelningen",
+    "Inspelningen g�r inte att l�sa!",
     "Eroare in timpul accesarii inregistrarii",
     "Hiba a felv�tel hozz�f�r�s�n�l",
     "Error a l'accedir a la gravaci�!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
-    "Napaka pri odstranjevanju posnetka!",
+    "Napaka pri brisanju posnetka!",
     "Errore durante la canc del filmato!",
     "Fout bij verwijderen opname!",
     "Erro enquanto apagava uma grava��o!",
     "Erreur de suppression de l'enregistrement!",
     "Feil under sletting av opptak!",
-    "Nauhoituksen poistaminen ep�onnistui!",
+    "Tallenteen poistaminen ep�onnistui!",
     "Blad przy usuwaniu nagrania!",
     "�Error al borrar la grabaci�n!",
     "Provlima sto svisimo egrafis !",
-    "Det g�r inte att ta bort inspelningen",
+    "Inspelningen g�r inte att ta bort!",
     "Eroare in timpul stergerii inregistrarii!",
     "Hiba a felv�tel t�rl�s�n�l!",
     "Error a l'esborrar la gravaci�!",
@@ -1564,7 +1564,7 @@ const tI18nPhrase Phrases[] = {
     "Nenhuma placa DVB disponivel para gravar!",
     "Pas de carte DVB disponible pour l'enregistrement!",
     "Ingen ledige DVB enheter for opptak!",
-    "Ei vapaata vastaanotinta nauhoitusta varten!",
+    "Ei vapaata vastaanotinta tallennukselle!",
     "Brak wolnej karty DVB do nagrywania!",
     "�No hay dispositivo DVB disponible para grabar!",
     "Den periseuei DVB Karta gia egrafi!",
@@ -1575,13 +1575,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
+    "Kanal ni razpolozljiv!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Cha�ne non disponible!",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "Kanavaa ei voi katsoa nyt!",
+    "Kanava ei ole k�ytett�viss�!",
     "",//TODO
     "!Canal no disponible!",
     "To kanali den ine diathesimo",
@@ -1592,13 +1592,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
+    "Nastavitve kanala niso edinstvene!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Caract�ristiques des cha�nes ne sont pas uniques",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Kanava-asetukset eiv�t ole yksil�lliset!",
     "",//TODO
     "!Propiedades de canal duplicadas!",
     "Ta kanalia stin lista den ine monadika!",
@@ -1615,7 +1615,7 @@ const tI18nPhrase Phrases[] = {
     "Canal bloqueado (a gravar)!",
     "Cha�ne verrouill�e (enregistrement en cours)!",
     "Kanalen er l�st (opptak)!",
-    "Kanava lukittu (nauhoitusta varten)!",
+    "Kanava lukittu (tallennus k�ynniss�)!",
     "Kanal zablokowany (nagrywanie w toku)!",
     "�Canal bloqueado (grabando)!",
     "To kanali ine klidomeno (Ginete egrafi)!",
@@ -1632,7 +1632,7 @@ const tI18nPhrase Phrases[] = {
     "Imposs�vel iniciar modo de transfer�ncia!",
     "Impossible d'utiliser le mode transfert!",
     "Kan ikke starte transfer modus!",
-    "K�sitt�m�tt�mi� teknisi� ongelmia!",
+    "K�sitt�m�tt�mi� teknisi� ongelmia!", //Finnish - unsure about this ;-)
     "Tryb transferowy jest niemozliwy!",
     "�No puedo iniciar modo de transferencia!",
     "Adinamia ekinisis katastasis metaforas!",
@@ -1643,17 +1643,17 @@ const tI18nPhrase Phrases[] = {
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
+    "Nobena tocka ni definirana!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Pas de marques d'�dition d�finies!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Muokkausmerkinn�t puuttuvat",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Det finns inga redigeringsm�rken",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1666,11 +1666,11 @@ const tI18nPhrase Phrases[] = {
     "N�o pode iniciar a modifica��o!",
     "Impossible de commencer le montage!",
     "Kan ikke starte redigeringsprosessen!",
-    "Muokkauksen aloittaminen ei onnistu!",
+    "Muokkauksen aloitus ep�onnistui!",
     "Uruchamianie montazu jest niemozliwe!",
     "�No puedo iniciar proceso de modificaci�n!",
     "Adinamia ekinisis tis epexsergasias!",
-    "Kan inte starta editering!",
+    "Kan inte starta redigering!",
     "Nu pot porni procesul de editare!",
     "A v�g�s nem ind�that�!",
     "No puc iniciar el proc�s d'edici�!",
@@ -1687,24 +1687,24 @@ const tI18nPhrase Phrases[] = {
     "Montaz w toku!",
     "�Proceso de modificaci�n ya fue iniciado!",
     "Epexsergasia vriskete se exselixsi!",
-    "Editering �r redan aktiv!",
+    "Redigeringen �r redan aktiv!",
     "Procesul de editare este activ!",
     "A v�g�s m�r aktiv�lt!",
     "Proc�s d'edici� iniciat anteriorment!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
-    "Zaustavitev ni mogoca - opcija '-s' ni podana!",
+    "Zaustavitev ni izvedljiva - opcija '-s' ni podana!",
     "Impossibile spegnere - parametro '-s' non passato",
     "Shutdown onmogelijk - Optie '-s' ontbreekt!",
     "Imposs�vel desligar - falta a op��o '-s'!",
     "Arr�t impossible - option '-s' absente!",
     "Kan ikke sl� av - startet uten parameteret '-s'!",
-    "Ei voida sammuttaa '-s' parametria ei annettu!",
+    "Sammutus ei onnistu - '-s' parametri puuttuu!",
     "Wylaczenie niemozliwe - brak opcji '-s'!",
     "�No puedo apagar - opci�n '-s' ausente!",
     "Adinaton na ginei termatismos. Aniparkti i parametros '-s'!",
-    "Kan inte avsluta, m�ste anv�nda flagga '-s'",
+    "Kan inte avsluta, m�ste anv�nda parameter '-s'",
     "Nu pot opri calculatorul - vezi optiunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
     "No puc apagar, falta la opci� -s !"
@@ -1728,51 +1728,51 @@ const tI18nPhrase Phrases[] = {
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
+    "Ne morem odpreti CAM menija!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Impossible d'ouvrir le menu CAM!",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Salausmoduuli ei valittavissa",
     "",//TODO
     "�No pudeo acceder al men� de la CAM!",
     "Den mpori na aniksi to CAM menou!",
-    "",//TODO
+    "Det g�r inte att �ppna CAM menyn!",
     "",//TODO
     "",//TODO
     "No puc obrir el men� de la CAM!",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
+    "Ne morem resetirati CAM-a",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Impossible de r�initialiser la CAM!",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Salausmoduulin alustus ep�onnistui!",
     "",//TODO
     "�No puedo reiniciar la CAM!",
     "Adinato na gini epanafora sto CAM",
-    "",//TODO
+    "Kan inte �terst�lla CAM!",
     "",//TODO
     "",//TODO
     "No puc reiniciar la CAM!",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
+    "CAM je resetiran!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "La CAM a �t� r�initialis�e",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Salausmoduuli alustettu",
     "",//TODO
     "CAM reiniciada",
     "Sto CAM egine apanafora",
-    "",//TODO
+    "CA modulen har �terst�llts",
     "",//TODO
     "",//TODO
     "CAM reiniciada",
@@ -1786,7 +1786,7 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "Affichage des menus",
     "OSD",
-    "Tekstin�ytt�",
+    "Kuvaruutun�ytt�",
     "OSD",
     "Men�s en pantalla",
     "OSD",
@@ -1797,7 +1797,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "EPG",
     "EPG",
-    "EPG",
+    "Programski vodnik",
     "EPG",
     "EPG",
     "EPG",
@@ -1871,7 +1871,7 @@ const tI18nPhrase Phrases[] = {
     "A gravar",
     "Enregistrement",
     "Opptak",
-    "Nauhoita",
+    "Tallennus",
     "Nagranie",
     "Opciones de Grabaci�n",
     "Egrafi",
@@ -1888,11 +1888,11 @@ const tI18nPhrase Phrases[] = {
     "Replay",
     "Lecture",
     "Spill av",
-    "Toista",
+    "Toisto",
     "Odtwarzanie",
     "Opciones de Reproducci�n",
     "Anametadosi",
-    "Repris",
+    "Uppspelning",
     "Redare",
     "Lej�tsz�s",
     "Opcions de Reproducci�",
@@ -1905,7 +1905,7 @@ const tI18nPhrase Phrases[] = {
     "Outros",
     "Divers",
     "Forskjellig",
-    "Sekalaista",
+    "Sekalaiset",
     "Pozostale",
     "Varios",
     "Diafora",
@@ -1922,11 +1922,11 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Plugins",
-    "Laajennokset",
-    "Plugins",
+    "Laajennukset",
     "Plugins",
     "Plugins",
     "Plugins",
+    "Moduler",
     "Plugins",
     "Plugins",
     "Plugins",
@@ -1939,11 +1939,11 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Plugin",
-    "Laajennos",
-    "Plugin",
+    "Laajennus",
     "Plugin",
     "Plugin",
     "Plugin",
+    "Modul",
     "Plugin",
     "Plugin",
     "Plugin",
@@ -1956,7 +1956,7 @@ const tI18nPhrase Phrases[] = {
     "Reiniciar",
     "Red�marrer",
     "Start p� nytt",
-    "Aloita uudelleen",
+    "Uudelleenk�ynnistys"
     "Zastartowac",
     "Reiniciar",
     "Epanekinisi",
@@ -2025,7 +2025,7 @@ const tI18nPhrase Phrases[] = {
     "Mostrar contador (s)",
     "Dur�e affichage �cran (s)",
     "Tid meldinger skal vises (s)",
-    "Ilmoitusten n�kymisaika (s)",
+    "Viestien esitysaika (s)",
     "Czas wyswietlania wiadomosci (s)",
     "Duraci�n muestra mensajes (s)",
     "Xronos endiksis minimaton (d)",
@@ -2042,7 +2042,7 @@ const tI18nPhrase Phrases[] = {
     "Posi��o de info dos canais",
     "Position infos cha�nes",
     "Posisjon p� kanalinformasjon",
-    "Kanavainfon sijainti",
+    "Kanavatiedon sijainti",
     "Lokalizacja informacji o kanale",
     "Posici�n para informaci�n canal",
     "Thesi Pliroforias kanalion",
@@ -2059,7 +2059,7 @@ const tI18nPhrase Phrases[] = {
     "Mostrar info ao mudar de Canal",
     "Affichage progr. en cours",
     "Info ved kanalskifte",
-    "N�yt� kanavainfo",
+    "N�yt� kanavatieto",
     "Informacja przy zmianie kanalu",
     "Informaci�n para cambio de canal",
     "Plirofories stin alagi kanaliou",
@@ -2076,7 +2076,7 @@ const tI18nPhrase Phrases[] = {
     "Scroll da p�gina no menu",
     "Scrolling par pages",
     "Rask rulling i menyer",
-    "Valikkojen rullaus",
+    "Valikkojen selaus",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
     "Kilisi selidas",
@@ -2110,7 +2110,7 @@ const tI18nPhrase Phrases[] = {
     "Directorias de grava��o",
     "Dossiers d'enregistrements",
     "Kataloger til opptak",
-    "Nauhoitushakemistot",
+    "Tallennehakemistot",
     "Wykaz nagran",
     "Gracaciones en directorios",
     "Fakeloi egrafon",
@@ -2127,7 +2127,7 @@ const tI18nPhrase Phrases[] = {
     "Expirou o EPG (h)",
     "Inactivit� avant rech. EPG (h)",
     "Ledig tid f�r EPG-s�k (h)",
-    "Ohjelmatied. odotusaika (h)",
+    "Ohjelmaoppaan taustap�ivitys (h)",
     "Czas do skanu EPG (h)",
     "Tiempo hasta exploraci�n EPG (h)",
     "Xronos mexri eksetasi EPG se Ores",
@@ -2144,7 +2144,7 @@ const tI18nPhrase Phrases[] = {
     "N�vel de correct��o EPG",
     "Niveau de correction EPG",
     "Niv� for EPG-feilretting",
-    "EPG Bugfix Level",
+    "Ohjelmaoppaan korjaustaso",
     "Poziom bledow EPG",
     "Nivel para arreglar EPG",
     "EPG Bugfix Vathmos",
@@ -2161,7 +2161,7 @@ const tI18nPhrase Phrases[] = {
     "Ajustar rel�gio do sistema",
     "Ajuster l'heure du syst�me",
     "Juster system-klokken",
-    "Vastaanota kellonaika",
+    "Aseta kellonaika",
     "Ustawianie czasu",
     "Ajustar reloj de sistema",
     "Sintonismos Oras ipologosti",
@@ -2195,7 +2195,7 @@ const tI18nPhrase Phrases[] = {
     "Interface DVB prim�rio",
     "Carte DVB primaire",
     "Hoved DVB-enhet",
-    "Ensisij. vast.otin",
+    "P��vastaanotin",
     "Pierwotny interfejs DVB",
     "Primer interface DVB",
     "Protevon DVB karta",
@@ -2212,7 +2212,7 @@ const tI18nPhrase Phrases[] = {
     "Formato v�deo",
     "Format vid�o",
     "TV-Format",
-    "Kuvamuoto",
+    "Kuvasuhde",
     "Format telewizyjny",
     "Formato V�deo",
     "Video Format",
@@ -2229,7 +2229,7 @@ const tI18nPhrase Phrases[] = {
     "Limite de bandas LNB (MHz)",
     "Limite de bandes LNB (MHz)",
     "LO-grensefrekvens (MHz)",
-    "SLOF (MHz)",
+    "SLOF (MHz)", //Finnish - unsure about this
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
@@ -2246,7 +2246,7 @@ const tI18nPhrase Phrases[] = {
     "Frequ�ncia base LNB (MHz)",
     "Fr�quence basse LNB (MHz)",
     "LO-frekvens i lavb�ndet (MHz)",
-    "LO LNB taajuus (MHz)",
+    "LNB alataajuus (MHz)",
     "Dolna czestotliwosc LNB (MHz)",
     "Frecuencia baja LNB (MHz)",
     "Kato LNB-Sixnotita (MHz)",
@@ -2263,7 +2263,7 @@ const tI18nPhrase Phrases[] = {
     "Frequ�ncia alta LNB (MHz)",
     "Fr�quence haute LNB (MHz)",
     "LO-frekvens i h�yb�ndet (MHz)",
-    "HI LNB taajuus (MHz)",
+    "LNB yl�taajuus (MHz)",
     "Gorna czestotliwosc LNB (MHz)",
     "Frecuencia alta LNB (MHz)",
     "Ano LNB-Sixnotita (MHz)",
@@ -2280,7 +2280,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizar DiSEqC",
     "Utiliser le DiSEqC",
     "Bruk DiSEqC",
-    "K�yt� DiSEqC",
+    "DiSEqC k�yt�ss�",
     "Uzywac DiSEqC",
     "Utilizar DiSEqC",
     "Energopiisi DiSEqC",
@@ -2297,7 +2297,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "Acc�s conditionnel",
     "CICAM DVB",
-    "CICAM DVB",
+    "CICAM DVB", //Finnish - unsure about this "Salausmoduuli"
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
@@ -2348,7 +2348,7 @@ const tI18nPhrase Phrases[] = {
     "Limite Prim�rio",
     "Premi�re limite",
     "Prioritetsgrense HovedDVB",
-    "PrimaryLimit",
+    "P��limitti", //Finnish - unsure about this ;-)
     "Pierwotny limit",
     "L�mite primario",
     "Protevon orio",
@@ -2374,56 +2374,56 @@ const tI18nPhrase Phrases[] = {
     "Default priority",
     "Prioritat per defecte",
   },
-  { "Setup.Recording$Pause lifetime (d)",
-    "Pause Lebensdauer (d)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+  { "Setup.Recording$Default lifetime (d)",
+    "Default Lebensdauer (d)",
+    "Osnovni zivljenski cas (d)",
+    "Durata predefinita (d)",
+    "Standaard levensduur (d)",
+    "Validade por defeito (d)",
+    "Dur�e de vie par d�faut (j)",
+    "Normal levetid timer (d)",
+    "Oletuselinik� (d)",
+    "Pierwotna trwalosc (d)",
+    "Duraci�n predefinida",
+    "Xronos zois",
+    "Normal livstid (dagar)",
+    "Durata predefinita",
+    "Default �lettartam",
+    "Duraci� predefinida",
+  },
+  { "Setup.Recording$Pause priority",
+    "Pause Priorit�t",
+    "Prioriteta pavze",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Priorit� des pauses",
     "",// TODO
+    "Keskeytyksen prioriteetti",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Prioritet f�r direktinspelning",
     "",// TODO
     "",// TODO
-    "Duraci� de la pausa (d)",
+    "Prioritat de la pausa",
   },
-  { "Setup.Recording$Pause priority",
-    "Pause Priorit�t",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+  { "Setup.Recording$Pause lifetime (d)",
+    "Pause Lebensdauer (d)",
+    "Cas pavze (d)",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Dur�e de vie des pauses (j)",
     "",// TODO
+    "Keskeytyksen elinik� (d)",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Livstid f�r direktinspelning (dagar)",
     "",// TODO
     "",// TODO
-    "Prioritat de la pausa",
-  },
-  { "Setup.Recording$Default lifetime (d)",
-    "Default Lebensdauer (d)",
-    "Osnovni zivljenski cas (d)",
-    "Durata predefinita (d)",
-    "Standaard levensduur (d)",
-    "Validade por defeito (d)",
-    "Dur�e de vie par d�faut (j)",
-    "Normal levetid timer (d)",
-    "Oletus voimassaoloaika (d)",
-    "Pierwotna trwalosc (d)",
-    "Duraci�n predefinida",
-    "Xronos zois",
-    "Normal livstid",
-    "Durata predefinita",
-    "Default �lettartam",
-    "Duraci� predefinida",
+    "Duraci� de la pausa (d)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -2450,7 +2450,7 @@ const tI18nPhrase Phrases[] = {
     "Marca de grava��o r�pida",
     "Marquage enregistr. imm�diats",
     "Markere direkteopptak",
-    "Merkitse v�lit�n nauh.",
+    "Merkitse pikatallenne",
     "Zaznaczyc natychm. nagranie",
     "Marcar grabaciones instant�neas",
     "Epilogi trexon egrafis",
@@ -2467,7 +2467,7 @@ const tI18nPhrase Phrases[] = {
     "Nome de grava��o r�pida",
     "Noms enregistr. imm�diats",
     "Navngi direkteopptak",
-    "Nime� v�lit�n nauh.",
+    "Nime� pikatallenne",
     "Nazwac natychm. nagranie",
     "Nombrar grabaciones instant�neas",
     "eponomasi trexon egrafis",
@@ -2478,13 +2478,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
-    "",//TODO
+    "Cas direktnega snemanja (min)",
     "",//TODO
     "",//TODO
     "",//TODO
     "Dur�e enregistr. imm�diat (min)",
     "",//TODO
-    "Pikanauhoituksen pituus (min)",
+    "Pikatallennuksen kesto (min)",
     "",//TODO
     "Tiempo de grabaci�n instant�nea (min)",
     "Stigmiees egrafes xronos (lepta)",
@@ -2501,11 +2501,11 @@ const tI18nPhrase Phrases[] = {
     "Gravar em Dolby Digital",
     "Enregistrer en Dolby Digital",
     "Ta opp Dolby Digital lyd",
-    "Dolby Digital nauhoitus",
+    "Dolby Digital tallennus",
     "Nagrywac Dolby Digital",
     "Grabar sonido Dolby Digital",
     "Egrafi tou Dolby Digital ixou",
-    "Spela in ljud med Dolby Digital",
+    "Spela in ljudet med Dolby Digital",
     "Inregistreaza Dolby Digital",
     "Dolby Digit�l felv�tel",
     "Gravar el s� en Dolby Digital",
@@ -2518,7 +2518,7 @@ const tI18nPhrase Phrases[] = {
     "Tamanho m�ximo dos ficheiros (MB)",
     "Taille maxi des fichiers (MB)",
     "Maksimal st�rrelse p� videofiler (MB)",
-    "Maksimi tiedoston koko (MB)",
+    "Suurin tiedostokoko (MB)",
     "Maks. wielkosc pliku (MB)",
     "Tama�o m�x. de fichero (MB)",
     "Megisto megethos arxeiou (MB)",
@@ -2535,11 +2535,11 @@ const tI18nPhrase Phrases[] = {
     "Quebrar ficheiros",
     "S�parer les s�quences",
     "Splitt redigerte filer",
-    "Paloittele muokatut",
+    "Jaottele muokatut tallenteet",
     "Dzielic montowane pliki",
     "Quebrar ficheros",
     "Diamelisma epeksergasmenon arxeion",
-    "Dela upp editerade filer",
+    "Dela upp redigerade filer",
     "Separare fisiere editate",
     "Feldolgozott File-k feloszt�sa",
     "Separar arxius",
@@ -2573,24 +2573,24 @@ const tI18nPhrase Phrases[] = {
     "Wyswietlac status odtwarzania",
     "Mostrar modo de replay",
     "Endiksi katastasis anametadosis",
-    "Visa uppspelnings mode",
+    "Visa uppspelnings l�ge",
     "Afiseaza modul de redare",
     "Lej�tsz�s felt�ntet�se",
     "Mostrar mode de reproducci�",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
+    "Predvajalni ID",
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
-    "Resume ID",// TODO
-    "Resume ID",// TODO
+    "Jatko ID", //Finnish - unsure about this
     "Resume ID",// TODO
     "Continuar ID",
     "Resume ID",// TODO
-    "Resume ID",// TODO
+    "�teruppta ID",
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Continuar ID",
@@ -2603,7 +2603,7 @@ const tI18nPhrase Phrases[] = {
     "Per�odo m�nimo de pausa (min)",
     "MinEventTimeout (min)",
     "Minste hendelsespause (min)",
-    "Minimi tapahtuman odotus (min)",
+    "Tapahtuman odotusaika (min)", //Finnish - unsure about this
     "Min. czas do nast. akcji (Event) (min)",
     "Tiempo m�nimo pausa (min)",
     "Elaxistos Xronos paremvolis (lepta)",
@@ -2620,7 +2620,7 @@ const tI18nPhrase Phrases[] = {
     "Per�odo m�nimo de inactividade (min)",
     "Dur�e minimale d'inact. (min)",
     "Minimumstid med inaktivitet (min)",
-    "Minimi k�ytt�j�n odotus (min)",
+    "K�ytt�j�toiminnon odotusaika (min)", //Finnish - unsure about this
     "Min. brak aktywnosci uzytkownika (min)",
     "Tiempo m�nimo inactividad (min)",
     "Elaxistos xronos mi xrisis (lepta)",
@@ -2631,7 +2631,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
-    "SVDRP Timeout (s)",
+    "SVDRP cas neaktivnosti (s)",
     "Timeout SVDRP (s)",
     "SVDRP Timeout (s)",
     "Timeout SVDRP (s)",
@@ -2684,7 +2684,7 @@ const tI18nPhrase Phrases[] = {
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~",
-    "",// TODO
+    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2702,13 +2702,13 @@ const tI18nPhrase Phrases[] = {
   // Learning keys:
   { "Learning Remote Control Keys (%s)",
     "Fernbedienungs-Codes lernen (%s)",
-    "Ucim se kod upravljalca (%s)",
+    "Ucenje kod upravljalca (%s)",
     "Apprendimento tasti unita` remota (%s)",
     "Leren toetsen afstandsbediening (%s)",
     "Aprender as teclas do telecomando (%s)",
     "Apprentissage des codes de t�l�commande (%s)",
     "L�re fjernkontrolltaster (%s)",
-    "Kaukos��timen n�pp�inten opettelu (%s)",
+    "Kaukos��timen opettaminen (%s)",
     "Nauka kodu pilota (%s)",
     "Aprendiendo teclas del telemando (%s)",
     "Ekmathisi pliktron tilexirismou (%s)",
@@ -2725,7 +2725,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 1: detectar tipo de receptor",
     "Phase 1: D�tection du type de code",
     "Fase 1: Finne fjernkontroll-kodetype",
-    "Vaihe 1: L�hetystavan selvitt�minen",
+    "Vaihe 1: Koodauksen tunnistaminen",
     "Faza 1: Detekcja typu kodu",
     "Fase 1: Detectando tipo de receptor",
     "Phasi 1: Anixneusi kodika RC",
@@ -2742,7 +2742,7 @@ const tI18nPhrase Phrases[] = {
     "Pressione qualquer tecla do telecomando",
     "Appuyer sur une touche de la t�l�commande",
     "Trykk en av tastene p� fjernkontrollen",
-    "Paina mit� tahansa kaukos��timen n�pp�int�",
+    "Paina jotain kaukos��timen n�pp�int�",
     "Nacisnac klawisz pilota",
     "Pulse una tecla en el telemando",
     "Piese ena pliktro sto tilexiristirio",
@@ -2776,7 +2776,7 @@ const tI18nPhrase Phrases[] = {
     "N�o pressione nada...",
     "N'appuyer sur aucune touche ...",
     "Ikke trykk p� noen av tastene...",
-    "�l� paina mit��n n�pp�int�...",
+    "�l� paina kaukos��timen n�pp�imi�...",
     "Nie naciskac klawiszy...",
     "No pulse ninguna tecla...",
     "Min piezeis pliktra...",
@@ -2827,7 +2827,7 @@ const tI18nPhrase Phrases[] = {
     "Pressione 'Cima' para confirmar",
     "Appuyer sur 'Haut' pour confirmer",
     "Trykk 'Opp' for � bekrefte",
-    "Paina 'Yl�s' hyv�ksy�ksesi",
+    "Hyv�ksy painamalla 'Yl�s'",
     "Nacisnac 'Gora' do potwierdzenia",
     "Pulse 'Arriba' para confirmar",
     "Piese 'pano' gia apodoxi",
@@ -2844,7 +2844,7 @@ const tI18nPhrase Phrases[] = {
     "Pressione 'Baixo' para continuar",
     "Appuyer sur 'Bas' pour continuer",
     "Trykk Ned' for � fortsette",
-    "Paina 'Alas' jatkaaksesi",
+    "Jatka painamalla 'Alas'",
     "Nacisnac 'Dol' zeby kontynuowac",
     "Pulse 'Abajo' para confirmar",
     "Piese 'kato' gia sinexia",
@@ -2861,7 +2861,7 @@ const tI18nPhrase Phrases[] = {
     "(Pressione 'Cima' para voltar)",
     "(Appuyer sur 'Haut' pour revenir en arri�re)",
     "(trykk 'Opp' for � g� tilbake)",
-    "(paina 'Yl�s' palataksesi takaisin)",
+    "(palaa takaisin painamalla 'Yl�s')",
     "(Nacisnac 'Gora' cofa)",
     "(Pulse 'Arriba' para retornar)",
     "(Piese 'pano' gia epistrofi",
@@ -2878,7 +2878,7 @@ const tI18nPhrase Phrases[] = {
     "(Pressione 'Baixo' para terminar a defini��o)",
     "(Appuyer sur 'Bas' pour terminer)",
     "(trykk 'Ned' for � avslutte innl�ring)",
-    "(paina 'Alas' lopettaaksesi n�pp�inten opettelun)",
+    "(lopeta opettaminen painamalla 'Alas')",
     "(Nacisnac 'Dol' by zakonczyc)",
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
     "(Piese 'Kato' gia termatismo diloseon plktron)",
@@ -2889,30 +2889,30 @@ const tI18nPhrase Phrases[] = {
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
-    "",// TODO
+    "pritisnite 'Meni' za preskok te tipke",
     "",// TODO
     "",// TODO
     "",// TODO
     "('Menu' pour passer cette touche)",
     "",// TODO
-    "(Paina 'Valikko' jos n�pp�int� ei ole)",
+    "n�pp�imen puuttuessa paina 'Valikko'",
     "",// TODO
     "Pulse 'Menu' para saltarse esta tecla",
     "Pata 'Menou' gia prosperasi aftou tou pliktrou",
-    "",// TODO
+    "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
     "",// TODO
     "",// TODO
     "Premi 'Menu' per obviar aquesta tecla",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
-    "Faza 3: Shranjujem kodo",
+    "Faza 3: Shranjevanje kod tipk",
     "Fase 3: Salvataggio key codes",
     "Fase 3: Opslaan toets codes",
     "Fase 3: A salvar os c�digos das teclas",
     "Phase 3: Sauvegarde des codes des touches",
     "Fase 3: Lagre tastekoder",
-    "Vaihe 3: N�pp�inkoodien tallettaminen",
+    "Vaihe 3: N�pp�inkoodien tallentaminen",
     "Faza 3: Zapamietac Kod",
     "Fase 3: Guardar c�digos de teclas",
     "Fasi 3: Apothikevsi kodikon",
@@ -2929,7 +2929,7 @@ const tI18nPhrase Phrases[] = {
     "'Cima' para Salvar, 'Baixo' para Cancelar",
     "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler",
     "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
-    "Paina 'Yl�s' tallettaaksesi ja 'Alas' peruuttaaksesi",
+    "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guardar, 'Abajo' para anular",
     "'Pano' apothikevsi, 'Kato' akirosi",
@@ -3128,13 +3128,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Play",
     "Wiedergabe",
-    "",// TODO
+    "Predvajaj",
     "",// TODO
     "",// TODO
     "",// TODO
     "Lecture",
     "",// TODO
-    "",// TODO
+    "Toista",
     "",// TODO
     "Reproducir",
     "Anametadosi",
@@ -3145,13 +3145,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Pause",
     "Pause",
-    "",// TODO
+    "Pavza",
     "",// TODO
     "",// TODO
     "",// TODO
     "Pause",
     "",// TODO
-    "",// TODO
+    "Keskeyt�",
     "",// TODO
     "Pausa",
     "Dialima",
@@ -3162,13 +3162,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Stop",
     "Stop",
-    "",// TODO
+    "Ustavi",
     "",// TODO
     "",// TODO
     "Stop",
+    "Arr�t",
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Pys�yt�",
     "",// TODO
     "Parar",
     "Terma",
@@ -3179,13 +3179,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Record",
     "Aufnehmen",
-    "",// TODO
+    "Snemaj",
     "",// TODO
     "",// TODO
     "",// TODO
     "Enregistrement",
     "",// TODO
-    "",// TODO
+    "Tallenna",
     "",// TODO
     "Grabar",
     "Egrafi",
@@ -3196,34 +3196,34 @@ const tI18nPhrase Phrases[] = {
   },
   { "FastFwd",
     "Vorlauf",
-    "",// TODO
+    "Hitro naprej",
     "",// TODO
     "",// TODO
     "",// TODO
     "Avance rapide",
     "",// TODO
-    "",// TODO
+    "Pikakelaus >>",
     "",// TODO
     "Adelante r�pido",
     "Girisma mprosta",
-    "Spola fram�t",
+    "Snabbspolning fram�t",
     "",// TODO
     "",// TODO
     "Endavant r�pidament",
   },
   { "FastRew",
     "R�cklauf",
-    "",// TODO
+    "Hitro nazaj",
     "",// TODO
     "",// TODO
     "",// TODO
     "Retour rapide",
     "",// TODO
-    "",// TODO
+    "Pikakelaus <<",
     "",// TODO
     "Atr�s r�pido",
     "Girisma piso",
-    "Spola bak�t",
+    "Snabbspolning bak�t",
     "",// TODO
     "",// TODO
     "Enrera r�pidament",
@@ -3247,13 +3247,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel+",
     "Kanal+",
-    "",// TODO
+    "Kanal+",
     "",// TODO
     "",// TODO
     "",// TODO
     "Cha�ne+",
     "",// TODO
-    "",// TODO
+    "Kanava +",
     "",// TODO
     "Canal +",
     "Kanali+",
@@ -3264,13 +3264,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel-",
     "Kanal-",
-    "",// TODO
+    "Kanal-",
     "",// TODO
     "",// TODO
     "",// TODO
     "Cha�ne-",
     "",// TODO
-    "",// TODO
+    "Kanava -",
     "",// TODO
     "Canal -",
     "Kanali-",
@@ -3287,7 +3287,7 @@ const tI18nPhrase Phrases[] = {
     "Volume+",
     "Volume+",
     "Volum+",
-    "��nenvoimakkuus+",
+    "��nenvoimakkuus +",
     "Glosnej",
     "Volumen+",
     "Entasi+",
@@ -3304,7 +3304,7 @@ const tI18nPhrase Phrases[] = {
     "Volume-",
     "Volume-",
     "Volum-",
-    "��nenvoimakkuus-",
+    "��nenvoimakkuus -",
     "Ciszej",
     "Volumen-",
     "Entasi-",
@@ -3321,7 +3321,7 @@ const tI18nPhrase Phrases[] = {
     "Sem som",
     "Coupure du son",
     "Lyd av",
-    "��nen vaimennus",
+    "Mykist�",
     "Cisza",
     "Mudo",
     "Siopilo",
@@ -3367,13 +3367,13 @@ const tI18nPhrase Phrases[] = {
   },
   { "off",
     "aus",
+    "izklop",
     "",// TODO
     "",// TODO
+    "off",
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "pois",
     "",// TODO
     "off",
     "klisto",
@@ -3384,34 +3384,34 @@ const tI18nPhrase Phrases[] = {
   },
   { "none",
     "keine",
-    "",// TODO
+    "nobeden",
     "",// TODO
     "",// TODO
     "",// TODO
     "aucun",
     "",// TODO
-    "",// TODO
+    "tyhj�",
     "",// TODO
     "ninguno"
     "kanena",
-    "",// TODO
+    "ingen",
     "",// TODO
     "",// TODO
     "cap",
   },
   { "auto",
     "auto",
-    "",// TODO
+    "avtomatsko",
     "",// TODO
     "",// TODO
     "",// TODO
     "auto",
     "",// TODO
-    "",// TODO
+    "auto",
     "",// TODO
     "auto",
     "aftomato",
-    "",// TODO
+    "automatisk",
     "",// TODO
     "",// TODO
     "auto",
@@ -3445,7 +3445,7 @@ const tI18nPhrase Phrases[] = {
     "dol",
     "parte inferior",
     "kato",
-    "nedre",
+    "undre",
     "jos",
     "lent",
     "a baix",
@@ -3458,7 +3458,7 @@ const tI18nPhrase Phrases[] = {
     "Disk",
     "Disque",
     "Disk",
-    "Disk",
+    "Levy",
     "Disk",
     "Disco",
     "Disk",
@@ -3492,7 +3492,7 @@ const tI18nPhrase Phrases[] = {
     "Saltar: ",
     "Acc�s direct: ",
     "Hopp: ",
-    "Hypp��: ",
+    "Siirry: ",
     "Skok: ",
     "Salta a: ",
     "Pidima: ",
@@ -3537,13 +3537,13 @@ const tI18nPhrase Phrases[] = {
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
-    " Prekini shranjevanje ",
+    " Prekini snemanje ",
     " Interrompi registrazione ",
     " Stop opnemen ",
     " Parar grava��o ",
     " Arr�ter l'enregistrement ",
     " Stopp opptak fra ",
-    " Pys�yt� nauhoitus ",
+    " Pys�yt� tallennus ",
     " Zatrzymac nagrywanie ",
     " Parar grabaci�n ",
     " Telos egrafis ",
@@ -3560,11 +3560,11 @@ const tI18nPhrase Phrases[] = {
     " Anular modifica��o",
     " Annuler le montage",
     " Avbryt redigering",
-    " Peruuta muokkaus",
+    " Peru muokkaus",
     " Przerwac montaz",
     " Anular modificaci�n ",
     " Akirosi epexsergasias",
-    " Avbryt editering",
+    " Avbryt redigering",
     " Opreste editare",
     " V�g�st megszak�tani",
     " Cancel�lar l'edici� ",
@@ -3577,7 +3577,7 @@ const tI18nPhrase Phrases[] = {
     "A mudar interface DVB prim�rio...",
     "Changement de carte DVB primaire...",
     "Bytter f�rste DVB-enhet...",
-    "Vaihdetaan ensisijainen vastaanotin...",
+    "Vaihdetaan p��vastaanottimelle...",
     "Pierwszy interfejs DVB przelacza...",
     "Cambio al interface DVB primario...",
     "I protevon DVB Karta alazi...",
@@ -3615,14 +3615,14 @@ const tI18nPhrase Phrases[] = {
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
     "Arxi epexsergasias",
-    "Editering startad",
+    "Redigering startad",
     "Procesul de editare a inceput",
     "V�g�s elind�tva",
     "Proc�s d'edici� iniciat",
   },
   { "Editing process finished",
     "Schnitt beendet",
-    "Proces urejanja koncan",
+    "Proces urejanja je koncan",
     "Processo di modifica terminato",
     "Bewerken is klaar",
     "Processo de modifica��o terminado",
@@ -3632,7 +3632,7 @@ const tI18nPhrase Phrases[] = {
     "Proces montazu zakonczony",
     "Proceso de modificaci�n terminado",
     "I epexsergasia teliose",
-    "Editering avslutad",
+    "Redigering avslutad",
     "Procesul de editare s-a terminat",
     "V�g�s befejezve",
     "Proc�s d'edici� finalitzat",
@@ -3649,7 +3649,7 @@ const tI18nPhrase Phrases[] = {
     "Bledny proces montazu!",
     "Modificaci�n ha fallado!",
     "I epexsergasia apetixe!",
-    "Editeringsprocessen misslyckades",
+    "Redigeringsprocessen misslyckades",
     "Proces de editare nereusit",
     "V�g�s sikertelen!",
     "Proc�s d'edici� fallit!",
@@ -3662,7 +3662,7 @@ const tI18nPhrase Phrases[] = {
     "A pesquisar grava��es...",
     "Recherche des enregistrements...",
     "G�r igjennom opptakene...",
-    "haetaan nauhoituksia...",
+    "haetaan tallenteita...",
     "Skan nagran...",
     "buscando grabaciones...",
     "Eksetasi egrafon...",
@@ -3673,34 +3673,34 @@ const tI18nPhrase Phrases[] = {
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
-    "",// TODO
+    "Ustavljanje predvajanja v zivo...",
     "",// TODO
     "",// TODO
     "",// TODO
     "Pause de l'�mission en direct...",
     "",// TODO
-    "",// TODO
+    "Keskeytet��n l�hetys...",
     "",// TODO
     "Emisi�n en directo parada...",
     "",// TODO
-    "",// TODO
+    "Pausar direktinspelningen",
     "",// TODO
     "",// TODO
     "Pausa d'emissi� en directe..."
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
+    "Ta plugin nima nastavitvenih parametrov!",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Ce plugin n'a pas de param�tres!",
     "",// TODO
-    "Ce plugin n'a pas de param�tres !",
-    "",// TODO
-    "T�ll� laajennoksella ei ole asetuksia!",
+    "T�ll� laajennuksella ei ole asetuksia!",
     "",// TODO
     "Este plugin no admite configuraci�n",
     "Afto to plugin den exi parametrous",
-    "",// TODO
+    "Den h�r modulen har inga parametrar",
     "",// TODO
     "",// TODO
     "Aquest plugin no admet configuraci�!",
diff --git a/menu.c b/menu.c
index f4c58b35b..9fb375036 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.245 2003/05/16 12:40:12 kls Exp $
+ * $Id: menu.c 1.249 2003/05/25 14:06:17 kls Exp $
  */
 
 #include "menu.h"
@@ -834,6 +834,7 @@ class cMenuEditTimer : public cOsdMenu {
   cTimer *timer;
   cTimer data;
   int channel;
+  bool deleteIfCancelled;
   cMenuEditDateItem *firstday;
   void SetFirstDayItem(void);
 public:
@@ -847,6 +848,7 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
 {
   firstday = NULL;
   timer = Timers.Get(Index);
+  deleteIfCancelled = New;
   if (timer) {
      data = *timer;
      if (New)
@@ -867,6 +869,12 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
 
 cMenuEditTimer::~cMenuEditTimer()
 {
+  if (timer && deleteIfCancelled) {
+     int Index = timer->Index();
+     Timers.Del(timer);
+     Timers.Save();
+     isyslog("timer %d deleted", Index + 1);
+     }
   Timers.DecBeingEdited();
 }
 
@@ -907,6 +915,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                           Timers.Save();
                           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
                           }
+                       deleteIfCancelled = false;
                      }
                      return osBack;
        case kRed:
@@ -1044,18 +1053,22 @@ eOSState cMenuTimers::Delete(void)
   // Check if this timer is active:
   cTimer *ti = CurrentTimer();
   if (ti) {
-     if (!ti->Recording()) {
-        if (Interface->Confirm(tr("Delete timer?"))) {
-           int Index = ti->Index();
-           Timers.Del(ti);
-           cOsdMenu::Del(Current());
-           Timers.Save();
-           Display();
-           isyslog("timer %d deleted", Index + 1);
+     if (Interface->Confirm(tr("Delete timer?"))) {
+        if (ti->Recording()) {
+           if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
+              ti->Skip();
+              cRecordControls::Process(time(NULL));
+              }
+           else
+              return osContinue;
            }
+        int Index = ti->Index();
+        Timers.Del(ti);
+        cOsdMenu::Del(Current());
+        Timers.Save();
+        Display();
+        isyslog("timer %d deleted", Index + 1);
         }
-     else
-        Interface->Error(tr("Timer is recording!"));
      }
   return osContinue;
 }
@@ -1081,6 +1094,8 @@ eOSState cMenuTimers::Summary(void)
 
 eOSState cMenuTimers::ProcessKey(eKeys Key)
 {
+  cTimer *ti = HasSubMenu() ? CurrentTimer() : NULL;
+  int TimerNumber = ti ? ti->Index() : -1;
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1097,6 +1112,11 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (TimerNumber >= 0 && !HasSubMenu() && !Timers.Get(TimerNumber)) {
+     // a newly created timer wasn't confirmed with Ok
+     cOsdMenu::Del(Current());
+     Display();
+     }
   return state;
 }
 
@@ -1263,7 +1283,7 @@ eOSState cMenuWhatsOn::Record(void)
         delete timer;
         timer = t;
         }
-     return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
+     return AddSubMenu(new cMenuEditTimer(timer->Index(), !t));
      }
   return osContinue;
 }
@@ -1397,7 +1417,7 @@ eOSState cMenuSchedule::Record(void)
         delete timer;
         timer = t;
         }
-     return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
+     return AddSubMenu(new cMenuEditTimer(timer->Index(), !t));
      }
   return osContinue;
 }
@@ -2938,6 +2958,23 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      }
   cRecording Recording(timer, Title, Subtitle, Summary);
   fileName = strdup(Recording.FileName());
+
+  // crude attempt to avoid duplicate recordings:
+  if (cRecordControls::GetRecordControl(fileName)) {
+     isyslog("already recording: '%s'", fileName);
+     if (Timer) {
+        timer->SetPending(false);
+        timer->SetRecording(false);
+        timer->OnOff();
+        }
+     else {
+        Timers.Del(timer);
+        Timers.Save();
+        }
+     timer = NULL;
+     return;
+     }
+
   cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
   const cChannel *ch = timer->Channel();
   recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
@@ -3240,7 +3277,7 @@ void cReplayControl::ClearLastReplayed(const char *FileName)
      }
 }
 
-void cReplayControl::Show(int Seconds)
+void cReplayControl::ShowTimed(int Seconds)
 {
   if (modeOnly)
      Hide();
@@ -3250,6 +3287,11 @@ void cReplayControl::Show(int Seconds)
      }
 }
 
+void cReplayControl::Show(void)
+{
+  ShowTimed();
+}
+
 void cReplayControl::Hide(void)
 {
   if (visible) {
@@ -3447,7 +3489,7 @@ void cReplayControl::MarkToggle(void)
         marks.Del(m);
      else {
         marks.Add(Current);
-        Show(2);
+        ShowTimed(2);
         }
      marks.Save();
      }
diff --git a/menu.h b/menu.h
index a40450577..5dd408069 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.55 2003/05/11 13:43:58 kls Exp $
+ * $Id: menu.h 1.56 2003/05/24 16:35:52 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -50,7 +50,7 @@ class cDisplayVolume : public cOsdObject {
 private:
   int timeout;
   static cDisplayVolume *displayVolume;
-  void Show(void);
+  virtual void Show(void);
   cDisplayVolume(void);
 public:
   virtual ~cDisplayVolume();
@@ -154,7 +154,7 @@ class cReplayControl : public cDvbPlayerControl {
   void TimeSearchDisplay(void);
   void TimeSearchProcess(eKeys Key);
   void TimeSearch(void);
-  void Show(int Seconds = 0);
+  void ShowTimed(int Seconds = 0);
   static char *fileName;
   static char *title;
   void DisplayAtBottom(const char *s = NULL);
@@ -169,6 +169,7 @@ class cReplayControl : public cDvbPlayerControl {
   cReplayControl(void);
   virtual ~cReplayControl();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual void Show(void);
   virtual void Hide(void);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
diff --git a/recording.c b/recording.c
index 9105157a8..7e68a7913 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.78 2003/05/18 15:17:45 kls Exp $
+ * $Id: recording.c 1.79 2003/05/24 11:22:34 kls Exp $
  */
 
 #include "recording.h"
@@ -169,6 +169,11 @@ int cResumeFile::Read(void)
 {
   int resume = -1;
   if (fileName) {
+     struct stat st;
+     if (stat(fileName, &st) == 0) {
+        if ((st.st_mode & S_IWUSR) == 0) // no write access, assume no resume
+           return -1;
+        }
      int f = open(fileName, O_RDONLY);
      if (f >= 0) {
         if (safe_read(f, &resume, sizeof(resume)) != sizeof(resume)) {
diff --git a/vdr.c b/vdr.c
index 7962c0a45..8bb907cf6 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.155 2003/05/16 12:11:45 kls Exp $
+ * $Id: vdr.c 1.159 2003/05/24 15:17:38 kls Exp $
  */
 
 #include <getopt.h>
@@ -323,6 +323,7 @@ int main(int argc, char *argv[])
      stdin  = freopen(Terminal, "r", stdin);
      stdout = freopen(Terminal, "w", stdout);
      stderr = freopen(Terminal, "w", stderr);
+     HasStdin = true;
      }
 
   isyslog("VDR version %s started", VDRVERSION);
@@ -429,8 +430,6 @@ int main(int argc, char *argv[])
   else
      cDevice::PrimaryDevice()->SetVolume(Setup.CurrentVolume, true);
 
-  cEITScanner EITScanner;
-
   cSIProcessor::Read();
 
   // Signal handlers:
@@ -454,6 +453,7 @@ int main(int argc, char *argv[])
   cOsdObject *Menu = NULL;
   cOsdObject *Temp = NULL;
   int LastChannel = -1;
+  int LastTimerChannel = -1;
   int PreviousChannel = cDevice::CurrentChannel();
   time_t LastActivity = 0;
   int MaxLatencyTime = 0;
@@ -469,11 +469,15 @@ int main(int argc, char *argv[])
         // Attach launched player control:
         cControl::Attach();
         // Make sure we have a visible programme in case device usage has changed:
-        if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
+        if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
            if (time(NULL) - lastTime > MINCHANNELWAIT) {
-              if (!Channels.SwitchTo(cDevice::CurrentChannel()))
+              if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
+                  && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
+                  && !cDevice::SwitchChannel(1) // ...or the next higher available one...
+                  && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
                  lastTime = time(NULL); // don't do this too often
+              LastTimerChannel = -1;
               }
            }
         // Restart the Watchdog timer:
@@ -500,6 +504,8 @@ int main(int argc, char *argv[])
            if (Timer) {
               if (!cRecordControls::Start(Timer))
                  Timer->SetPending(true);
+              else
+                 LastTimerChannel = Timer->Channel()->Number();
               }
            }
         // CAM control:
@@ -563,7 +569,7 @@ int main(int argc, char *argv[])
                   }
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
-               if (!Interface->IsOpen())
+               if (!Menu && !Interface->IsOpen())
                   Menu = Temp = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
                key = kNone; // nobody else needs to see these keys

From d072cc6da2e109d0dc6b98375a1bab3a2ac83948 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 30 May 2003 18:00:00 +0200
Subject: [PATCH 075/307] =?UTF-8?q?Version=201.2.0pre1=20-=20Some=20correc?=
 =?UTF-8?q?tions=20to=20the=20French=20OSD=20texts=20(thanks=20to=20Olivie?=
 =?UTF-8?q?r=20Jacques).=20-=20Fixed=20some=20missing=20commas=20in=20i18n?=
 =?UTF-8?q?.c=20(thanks=20to=20Dimitrios=20Dimitrakos=20for=20=20=20report?=
 =?UTF-8?q?ing=20this=20problem).=20-=20Some=20corrections=20to=20the=20Fi?=
 =?UTF-8?q?nnish=20OSD=20texts=20(thanks=20to=20Niko=20Tarnanen=20and=20Ro?=
 =?UTF-8?q?lf=20=20=20Ahrenberg).=20-=20Completed=20the=20Italian=20OSD=20?=
 =?UTF-8?q?texts=20(thanks=20to=20Antonio=20Ospite).=20-=20Fixed=20breakin?=
 =?UTF-8?q?g=20off=20replay=20in=20case=20the=20user=20hits=20"Play"=20or?=
 =?UTF-8?q?=20"Pause"=20too=20soon=20after=20=20=20going=20into=20"Pause?=
 =?UTF-8?q?=20live=20video"=20mode=20(thanks=20to=20Karim=20Afifi=20for=20?=
 =?UTF-8?q?reporting=20ths=20one).=20-=20Some=20corrections=20to=20the=20C?=
 =?UTF-8?q?atalanian=20OSD=20texts=20(thanks=20to=20Jordi=20Vil=C3=A0).=20?=
 =?UTF-8?q?-=20Single=20event=20timers=20are=20now=20deleted=20if=20the=20?=
 =?UTF-8?q?recording=20they=20are=20doing=20is=20=20=20deleted=20before=20?=
 =?UTF-8?q?the=20timer=20ends.=20-=20Fixed=20an=20uninitialized=20variable?=
 =?UTF-8?q?=20in=20cDisplayChannel=20(thanks=20to=20Stefan=20Huelswitt).?=
 =?UTF-8?q?=20-=20Fixed=20a=20possible=20access=20of=20invalid=20file=20ha?=
 =?UTF-8?q?ndles=20in=20cSIProcessor::Action()=20=20=20(thanks=20to=20Stef?=
 =?UTF-8?q?an=20Huelswitt).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  11 +-
 HISTORY       |  17 +++
 INSTALL       |   5 +-
 MANUAL        |   3 +
 PLUGINS.html  |   8 ++
 README        |   3 +
 UPDATE-1.2.0  | 274 +++++++++++++++++++++++++++++++++++++++++
 config.h      |   6 +-
 eit.c         |  13 +-
 genfontfile.c |   2 +-
 i18n.c        | 330 +++++++++++++++++++++++++-------------------------
 menu.c        |  10 +-
 recording.c   |  95 ++++++++-------
 vdr.1         |   8 +-
 vdr.5         |  12 +-
 vdr.c         |   6 +-
 16 files changed, 570 insertions(+), 233 deletions(-)
 create mode 100644 UPDATE-1.2.0

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b1f3a3d5e..085dcb163 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -173,6 +173,8 @@ Stefan Huelswitt <huels@iname.com>
  video sequence, which avoids artefacts when cutting
  for suggesting to add VDRVERSNUM to config.h
  for fixing a memory leak in cNonBlockingFileReader
+ for fixing an uninitialized variable in cDisplayChannel
+ for fixing a possible access of invalid file handles in cSIProcessor::Action()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -677,7 +679,7 @@ Alfred Zastrow <vdr@zastrow4u.de>
 Matthias Raus <matthias-raus@web.de>
  for reporting a problem with starting the editing process if no marks have been set
 
-Marc Rovira Vall <tm05462@salleURL.edu> and Ramon Roca <ramon.roca@xcombo.com>
+Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
  for translating OSD texts to the Catalanian language
 
 Lars Bl�ser <LBlaeser@hofheim.de>
@@ -699,3 +701,10 @@ Peter Bieringer <pb@bieringer.de>
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
+
+Antonio Ospite <ospite@studenti.unina.it>
+ for translating OSD texts to the Italian language
+
+Karim Afifi <karim.afifi@free.fr>
+ for reporting a problem with breaking off replay in case the user presses "Play"
+ or "Pause" too soon after going into "Pause live video" mode
diff --git a/HISTORY b/HISTORY
index 65ca0feb0..914b39a04 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2208,3 +2208,20 @@ Video Disk Recorder Revision History
   (thanks to Gerhard Steiner for reporting this one).
 - It is now possible to directly delete a timer that is currently recording
   (thanks to Alexander Damhuis for reporting this one).
+
+2003-05-30: Version 1.2.0pre1
+
+- Some corrections to the French OSD texts (thanks to Olivier Jacques).
+- Fixed some missing commas in i18n.c (thanks to Dimitrios Dimitrakos for
+  reporting this problem).
+- Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf
+  Ahrenberg).
+- Completed the Italian OSD texts (thanks to Antonio Ospite).
+- Fixed breaking off replay in case the user hits "Play" or "Pause" too soon after
+  going into "Pause live video" mode (thanks to Karim Afifi for reporting ths one).
+- Some corrections to the Catalanian OSD texts (thanks to Jordi Vil�).
+- Single event timers are now deleted if the recording they are doing is
+  deleted before the timer ends.
+- Fixed an uninitialized variable in cDisplayChannel (thanks to Stefan Huelswitt).
+- Fixed a possible access of invalid file handles in cSIProcessor::Action()
+  (thanks to Stefan Huelswitt).
diff --git a/INSTALL b/INSTALL
index 11efa224b..cf66c5d37 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,9 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
+Version 1.2
+-----------
+
 Compiling and running the program:
 ----------------------------------
 
@@ -15,7 +18,7 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile (see the file Make.config.template).
 
-VDR requires the Linux-DVB card driver version dated 2002-11-01 or higher
+VDR requires the Linux-DVB card driver version dated 2003-05-24 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
diff --git a/MANUAL b/MANUAL
index a8ebee21b..742b743bc 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,6 +1,9 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
+Version 1.2
+-----------
+
 * Remote Control Keys
 
   The following remote control keys are used to control the VDR
diff --git a/PLUGINS.html b/PLUGINS.html
index 9a97b0000..913a9914f 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,6 +6,14 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
+<center><b>Version 1.2</b></center>
+<p>
+<center>
+Copyright &copy; 2003 Klaus Schmidinger<br>
+<a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
+<a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
+</center>
+<p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
 This interface allows programmers to develop additional functionality for VDR completely
diff --git a/README b/README
index 809034ffb..738fe3de0 100644
--- a/README
+++ b/README
@@ -14,6 +14,9 @@ this program on your computer.
 
 The MANUAL file describes how to operate the VDR.
 
+The CONTRIBUTORS file lists all the people who have contributed to the
+development of VDR.
+
 The author can be contacted at kls@cadsoft.de.
 
 Yet another "set-top-box"?
diff --git a/UPDATE-1.2.0 b/UPDATE-1.2.0
new file mode 100644
index 000000000..8934196f6
--- /dev/null
+++ b/UPDATE-1.2.0
@@ -0,0 +1,274 @@
+This is a summary of the changes in VDR 1.2.0 since the last stable
+version 1.0.4. It only contains things that are of actual importance
+to the user and doesn't mention the many fixes and improvements that
+have been made "behind the scenes". 
+
+See the file HISTORY for a detailed list of all changes.
+
+Plugins:
+
+- Implemented a universal plugin interface. See the file PLUGINS.html
+  for a detailed description. The man page vdr(1) describes the new options '-L'
+  and '-P' used to load plugins.
+  See http://www.cadsoft.de/vdr/plugins.htm for a list of available plugins.
+- Rearranged the remote control key handling to allow plugins to implement
+  additional types of remote controls (see PLUGINS.html, section "Remote Control").
+  The previously used files 'keys.conf' and 'keys-pc.conf' have been replaced
+  by the file 'remote.conf', which holds the key definitions of all remote controls.
+- The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
+  using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).
+
+Remote control:
+
+- If a PC keyboard is used as remote control, the string entry fields in the
+  menus now accept character input directly (however, this works only for keys that
+  are not otherwise defined as remote control keys). Also, plugins can switch the
+  cKbdRemote class into "raw mode", where all keyboard input will be made available
+  through the new 'kKbd' key code and none of it will be processed as normal remote
+  control functions.
+- The LIRC remote control keys are now handled just like the keyboard and RCU keys.
+  This means that you can use the lircd.conf file as is for your remote control,
+  without the need of editing it to make the key names the same as used in VDR.
+  When first starting VDR it will go into the "Learning keys" mode and ask you
+  to press the various keys. The resulting key assignment will be stored in
+  the file 'remote.conf'.
+- While learning the remote control keys it is now possible to press the 'Menu'
+  key to skip the definition of keys that are not available on your particular
+  RC unit.
+- Implemented additional dedicated keys for "Play", "Pause", "Stop", "Record",
+  "FastFwd", "FastRew", "Channel+" and "Channel-". If your remote control supports
+  any of these keys you can delete your 'remote.conf' file and restart VDR to
+  go through the key learning procedure again in order to assign these new keys.
+  See MANUAL for more information.
+- Implemented new keys to directly access the VDR main menu functions "Schedule",
+  "Channels", "Timers", "Recordings", "Setup" and "Commands". If your remote
+  control provides keys you want to assign these functions to, you can delete
+  your 'remote.cof' file and restart VDR to go through the key learning procedure
+  again in order to assign these new keys. See MANUAL for more information.
+- The new configuration file 'keymacros.conf' can be used to assign macros to
+  the color buttons in normal viewing mode, as well as to up to 9 user defined
+  keys. See MANUAL and man vdr(5) for more information. The default 'keymacros.conf'
+  implements the functionality of the old "color button patch".
+- Macros in 'keymacros.conf' can now use "@plugin" to directly access the main menu
+  function of a given plugin (see man vdr(5) for details).
+- The keyboard is now by default always active to control VDR. The 'make' option
+  REMOTE=KBD is therefore obsolete. When compiling VDR with REMOTE=RCU or REMOTE=LIRC,
+  the keyboard can thus now be active together with the remote control. If you want
+  to build VDR without keyboard support you can set NO_KBD=1 in the 'make' call.
+  Since the keyboard codes are now different from the ones used previously (which
+  were mapped by the 'ncurses' library) you will need to go through the "Learning
+  keys" procedure again. To do so, either delete the file /video/remote.conf or
+  remove the KBD.* entries from it before starting this version of VDR.
+- The "Left" and "Right" buttons now set the cursor to the first or last list item
+  even if the list consist only of a single page, like, for instance, the Main menu.
+- The red ("Record") and yellow ("Pause") button in the "Main" menu are no longer
+  available when replaying.
+
+Devices:
+
+- If the primary device (as defined in setup.conf) doesn't have an MPEG decoder
+  (and thus can't be used as a primary device) VDR now scans all devices at
+  startup and uses the first one (if any) that actually has an MPEG decoder.
+  That way this will also work automatically if the primary device is implemented
+  by a plugin.
+- If no device with an MPEG decoder can be found at startup, the first device
+  is now used as primary device (just to have some device).
+- Now turning off live PIDs when replaying. This avoids short spikes from other
+  channels when switching between Transfer Mode channels, and also lets an ongoing
+  replay continue even if a recording is started on the primary device.
+- Now switching to the channel used by the most recently started timer in case
+  the original current channel becomes unavailable due to a recording on a
+  different transponder. If this fails, a channel up/down switch is attempted as
+  a fallback solution.
+- Changed the DEFAULTPRIORITY in device.c to -1, so that the primary device
+  will be used for FTA recordings in case the CAM is connected to a non-primary
+  device.
+- The actual tuning is now done in a separate thread, which makes zapping through the
+  channels a lot faster and no longer gets stuck on channels that don't broadcast.
+  This also makes "Motor-DiSEqC" work. Since switching channels now no longer
+  explicitly waits for a channel lock in the foreground thread, the "panic level"
+  mechanism is no longer used.
+
+Time Shifting:
+
+- Changed device handling for being able to do simultaneous recording and
+  replay on the same device (Time Shifting). In order for this to work you need
+  to use a driver with a firmware version that has this feature implemented.
+- It is now possible to do simultaneous recording and replay with a single DVB
+  card, even with encrypted channels. This requires the use of the Link Layer
+  firmware, version 2613 or higher; the -icam firmware is still limited to live
+  encrypted channels only. Finally we have time shift for encrypted channels on
+  single card systems!
+- Implemented "pause live video". You can now press "Menu/Yellow" or "Pause" on
+  your remote control while watching live video to start an instant recording
+  of the current programme and immediately start replaying that recording.
+- Implemented separate PausePriority and PauseLifetime parameters for the recordings
+  created when pausing live video.
+
+Channels:
+
+- Modified channel handling to cover all parameters necessary for DVB-C and DVB-T
+  (see man vdr(5) for the meaning of the additional parameters stored in the field
+  previously named 'polarisation').
+  If you have a system with different kinds of DVB cards, like DVB-T and DVB-C,
+  for instance, there is no more need to distinguish the channels through the
+  'Ca' parameter in order to assign them to the various DVB cards. This is now
+  taken care of by the "source" parameter. So a channel marked as "terrestrial",
+  for example, will only be received on DVB-T cards.
+- Updated channels.conf files.
+- Switching through channels with the 'Up' and 'Down' keys now skips channels
+  that are currently not available (for instance because all devices are
+  recording and these channels are on different transponders).
+- The new configuration file 'sources.conf' contains the various signal sources
+  (satellites, cable and terrestrial) which are used in 'channels.conf' and
+  'diseqc.conf'.
+- The 'diseqc' parameter in the channel definitions has been redefined to hold the
+  "source" of the given channel (which can be either a satellite, cable or terrestrial).
+  For compatibility with channels.conf files from older versions, numeric values in
+  this parameter will be tolerated, but they have no meaning. If you want to use
+  DiSEqC you will need to replace these old values with the proper source identifiers
+  defined in the new configuration file 'sources.conf'. See how this is done in the
+  'channels.conf' file that comes with the VDR package.
+- The new configuration file 'diseqc.conf' can be used to set up the individual
+  diseqc configuration (see man vdr(5) for a description of the file format).
+- The "Edit channel" menu has a new entry "Source:" in which the source of this
+  channel can be selected (either a satellite, cable or terrestrial). The set of
+  parameters at the end of this menu will change according to the type of source.
+- The "Use DiSEqC" parameter in the "Setup/LNB" menu has been moved to the beginning
+  of the list and disables the rest of the parameters when set to "yes", since these
+  are now only meaningful if DiSEqC is not used.
+- Group separators in 'channels.conf' may now be given like ':@201 My Channels',
+  where '@201' indicates the number to be given to the next channel. This can be
+  used to create 'gaps' in the channel numbering (see 'man 5 vdr'). BE CAREFUL
+  TO UPDATE YOUR 'timers.conf' ACCORDINGLY IF INSERTING THIS NEW FEATURE INTO YOUR
+  'channels.conf' FILE!
+- Frequency values for cable and terrestrial channels in 'channels.conf' can
+  now be given either in MHz, kHz or Hz. The actual value given will be multiplied
+  by 1000 until it is larger than 1000000.
+- First step towards a "unique channel ID". The channel ID is a human readable
+  string, made up from several parameters of the channel's definition in the file
+  'channels.conf' (see man vdr(5) for details).
+  In order for the "unique channel ID" to work, all channel definitions now must
+  be unique with respect to the combination of their Source, Frequency and SID
+  parameters. You may have to fix your 'channels.conf' manually if there are error
+  messages in the log file when loading it. BE SURE TO MAKE A BACKUP COPY OF YOUR
+  'channels.conf' AND 'timers.conf' FILE BEFORE SWITCHING TO THIS VERSION, AND CHECK
+  VERY CAREFULLY WHETHER YOUR TIMERS ARE STILL SET TO THE RIGHT CHANNELS!
+  When reading an existing 'timers.conf', the channels will be identified as before
+  by their numbers. As soon as this file is written back, the channel numbers will
+  be replaced by the channel IDs. After that it is possible to manually edit the
+  'channels.conf' file and rearrange the channels without breaking the timers.
+  Note that you can still define new timers manually by using the channel number.
+  VDR will correctly identify the 'channel' parameter in a timer definition and
+  use it as a channel number or a channel ID, respectively. Also, the SVDRP commands
+  that return timer definitions will list them with channel numbers in order to
+  stay compatible with existing applications.
+  The channel ID is also used in the 'epg.data' file to allow EPG information from
+  different sources to be stored, which would previously have been mixed up in case
+  they were using the same 'service ID'. Note that the contents of an existing
+  'epg.data' file from a previous version will be silently ignored, since it doesn't
+  contain the new channel IDs. When inserting EPG data into VDR via SVDRP you now also
+  need to use the channel IDs.
+  Currently the EPG data received from the DVB data stream only uses the 'Source'
+  and 'Service ID' part of the channel ID. This makes it work for channels with
+  the same service IDs on different sources (like satellites, cable or terrestrial).
+  However, it doesn't work yet if the service IDs are not unique within a specific
+  source. This will be fixed later.
+- Added three new fields to the lines in 'channels.conf': NID, TID and RID. NID and
+  TID are the Network and Transport Stream IDs, respectively. RID is an additional ID
+  that can be used to tell apart channels that would otherwise be indistinguishable.
+  This is typically the case with radio channels, which may have the same NID, TID
+  and SID, but different "radio IDs". This new field is therefore called RID ("radio
+  ID"). Currently NID and TID are not yet used by VDR and should always be 0. The
+  RID is actually used when building the "unique channel ID", so if you have channels
+  in your 'channels.conf' file that cause error messages when loading, you can set
+  the RIDs of these channels to different values.
+  When reading an old 'channels.conf' these new fields will be automatically
+  initialized to 0 and once the file is written back to disk they will be appended
+  to the channel definitions.
+- The "unique channel ID" now contains an optional 5th part (the RID). See man vdr(5).
+- Modified LOF handling to allow for C-band reception.
+- The PCR PID can now be set separately from the video PID. The syntax in the
+  'channels.conf' file is, for example, ...:164+17:..., where 164 is the video PID
+  and 17 is the PCR PID. The separator is a '+' sign, not a comma or semicolon as
+  with the audio PIDs, because this is not an alternate PID, but rather an
+  additional, necessary PID.
+
+Recording:
+
+- It is now possible to record several channels on the same transponder with "budget
+  cards". VDR automatically attaches a recording timer to a card that already
+  records on the appropriate transponder. How many parallel recordings can actually
+  be done depends on the computer's performance. Currently any number of recordings
+  gets attached to a card, so you should carefully plan your timers to not exceed
+  the limit. On a K6-II/450 it was possible to record three channels from transponder
+  12480 with a single WinTV NOVA-S.
+- Timers that record two successive shows on the same channel may now overlap and
+  will use the same DVB card. During the time where both timers record the data
+  is simply saved to both files.
+- Since several channels put very long strings into the Subtitle part of their
+  EPG data, that string is now limited in length when used in a recording's
+  file name.
+- Timers are now processed even if an OSD menu is open (except for menus that
+  explicitly handle timers).
+- Implemented a "resume ID" which allows several users to each have their own
+  resume.vdr files. This parameter can be set in the "Setup/Replay" menu (see
+  MANUAL for details).
+- Extended logging info when starting/stopping timers to show the channel number,
+  start/stop time and the file name.
+- Reduced the time to wait for EPG data when starting a recording to 3 seconds.
+- Checking for duplicate recordings with the same file name and disabling the
+  second timer.
+- It is now possible to directly delete a timer that is currently recording.
+
+SVDRP:
+
+- The new SVDRP command CLRE can be used to clear the entire EPG data.
+- The SVDRP command PUTE now triggers an immediate write of the 'epg.data' file.
+- The SVDRP command CHAN now also accepts channel IDs.
+- The new SVDRP command STAT can be used to request information about the disk
+  usage.
+- Now taking an active SVDRP connection into account when doing shutdown or
+  housekeeping.
+
+Conditional Access:
+
+- Implemented "Link Layer" based CAM support. This allows access to the CAM menu
+  and also to reset the CAM. Furthermore the CAM can now be in any slot of any
+  DVB card, and there can be more than one CAM.
+- If your particular CAM doesn't work with the Link Layer interface, you can
+  still use the old firmware version ("-icam"), which does all the CAM handling
+  by itself (see DVB/driver/av7110/README-firmware).
+
+Misc:
+
+- Removed compiler option '-m486' to make it work on non-Intel platforms.
+- Changed setting of CXX and CXXFLAGS variables in Makefile, so that an externally
+  defined value will be taken if present.
+- New and improved internationalized OSD texts.
+- The VDR version number is now displayed in the title line of the "Setup" menu.
+- Changed the VFAT handling to allow users who normally use it but have forgotten
+  to set it when compiling a new version of VDR to at least see their recordings
+  made with VFAT enabled.
+- Commands in the file 'commands.conf' can now have a '?' at the end of their
+  title, which will result in a confirmation prompt before executing the
+  command.
+- If a command executed from the "Commands" menu doesn't return any output, the
+  OSD will now be closed automatically.
+- The new configuration file 'reccmds.conf' can be used to define commands that
+  shall be executed from the "Recordings" menu; see MANUAL and 'man vdr(5)' for
+  details.
+- The Makefile now includes the file Make.config (if present in the VDR source
+  directory), which allows the user to overwrite several settings with individual
+  values. The VDR distribution archive does not contain this file in order to not
+  overwrite a user defined file. There is a Make.config.template which contains the
+  default values of the macros the user can overwrite.
+- Extended the '-l' option to allow logging to LOG_LOCALn (n=0..7) by writing, for
+  instance, '-l 3.7'.
+- The character '|' in description texts of EPG records is now interpreted as a
+  newline character.
+- Now using "Doxygen" to generate source documentation.
+  See INSTALL for information how to do this. Some function descriptions have
+  already been adapted to Doxygen, more will follow.
+- Added VDRVERSNUM to config.h, which can be used by the preprocessor to check the
+  actual VDR version.
diff --git a/config.h b/config.h
index c7c301342..e34534b77 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.160 2003/05/19 15:27:37 kls Exp $
+ * $Id: config.h 1.162 2003/05/29 12:17:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.33"
-#define VDRVERSNUM   10133  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.0pre1"
+#define VDRVERSNUM   10200  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/eit.c b/eit.c
index a5b14e76a..99eb405fa 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.78 2003/05/18 14:10:25 kls Exp $
+ * $Id: eit.c 1.79 2003/05/29 15:04:10 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1236,10 +1236,17 @@ void cSIProcessor::Action()
       // wait until data becomes ready from the bitfilter
       if (poll(pfd, NumUsedFilters, 1000) != 0)
       {
-         for (int a = 0; a < NumUsedFilters ; a++)
+         for (int aa = 0; aa < NumUsedFilters; aa++)
          {
-            if (pfd[a].revents & POLLIN)
+            if (pfd[aa].revents & POLLIN)
             {
+               int a;
+               for (a = 0; a < MAX_FILTERS; a++) {
+                   if (pfd[aa].fd == filters[a].handle)
+                      break;
+                   }
+               if (a >= MAX_FILTERS || !filters[a].inuse) // filter no longer available
+                  continue;
                // read section
                unsigned char buf[4096]; // max. allowed size for any EIT section
                int r = safe_read(filters[a].handle, buf, sizeof(buf));
diff --git a/genfontfile.c b/genfontfile.c
index a98f80124..41d87b795 100644
--- a/genfontfile.c
+++ b/genfontfile.c
@@ -7,7 +7,7 @@
 /* X compile line: cc -o gentexfont gentexfont.c -lX11 */
 
 /* 2000-10-01: Stripped down the original code to get a simple bitmap C-code generator  */
-/*             for use with the VDR project (see http://www.cadsoft.de/people/kls/vdr)  */
+/*             for use with the VDR project (see http://www.cadsoft.de/vdr)             */
 /*             Renamed the file 'genfontfile.c' since it no longer generates 'tex' data */
 /*             Klaus Schmidinger (kls@cadsoft.de)                                       */
 
diff --git a/i18n.c b/i18n.c
index 2e4c86ffd..f2fa3c583 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,12 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.117 2003/05/25 14:20:27 kls Exp $
+ * $Id: i18n.c 1.122 2003/05/29 10:38:51 kls Exp $
  *
  * Translations provided by:
  *
  * Slovenian   Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
- * Italian     Alberto Carraro <bertocar@tin.it>
+ * Italian     Alberto Carraro <bertocar@tin.it> and Antonio Ospite <ospite@studenti.unina.it>
  * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
  * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com> and Gregoire Favre <greg@magma.unil.ch>
@@ -21,7 +21,7 @@
  * Swedish     Tomas Prybil <tomas@prybil.se> and Jan Ekholm <chakie@infa.abo.fi>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
- * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu> and Ramon Roca <ramon.roca@xcombo.com>
+ * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
  *
  */
 
@@ -211,7 +211,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
     "Ukazi za snemanje",
-    "",// TODO
+    "Comandi di Registrazione",
     "",// TODO
     "",// TODO
     "Commandes d'enregistrement",
@@ -274,7 +274,7 @@ const tI18nPhrase Phrases[] = {
     "S�ndning",
     "Evenimente",
     "Ad�s",
-    "Event",
+    "Esdeveniment",
   },
   { "Summary",
     "Inhalt",
@@ -284,7 +284,7 @@ const tI18nPhrase Phrases[] = {
     "Resumo",
     "R�sum�",
     "Sammendrag",
-    "Yhteenveto",
+    "Tiedot",
     "Zawartosc",
     "Res�men",
     "Periexomeno",
@@ -325,7 +325,7 @@ const tI18nPhrase Phrases[] = {
     "Vilket program s�nds nu?",
     "Programul actual?",
     "Mi megy most?",
-    "Que fan ara?",
+    "Qu� fan ara?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -342,7 +342,7 @@ const tI18nPhrase Phrases[] = {
     "Vilket �r n�sta program?",
     "Programul urmator?",
     "Mi k�vetkezik?",
-    "Que fan despr�s?",
+    "Qu� fan despr�s?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -404,7 +404,7 @@ const tI18nPhrase Phrases[] = {
     "Marcar",
     "Marquer",
     "Marker",
-    "Merkitse",
+    "Siirr�",
     "Zaznaczyc",
     "Marcar",
     "Epilogi",
@@ -489,14 +489,14 @@ const tI18nPhrase Phrases[] = {
     "Parar",
     "Arr�t",
     "Stopp",
-    "Pys�yt�",
+    "Lopeta",
     "Zakonczyc",
     "Parar",
     "Terma",
     "Stopp",
     "Stop",
     "Stop",
-    "Parar",
+    "Aturar",
   },
   { "Resume",
     "Weiter",
@@ -591,7 +591,7 @@ const tI18nPhrase Phrases[] = {
     "Proximo",
     "Apr�s",
     "Neste",
-    "Seuraava",
+    "Seuraavaksi",
     "Nastepny",
     "Siguiente",
     "Epomeno",
@@ -671,7 +671,7 @@ const tI18nPhrase Phrases[] = {
   { "Insert",
     "Einf�gen",
     "Vstavi",
-    "",// TODO
+    "Inserisci",
     "",// TODO
     "",// TODO
     "Ins�rt",
@@ -683,12 +683,12 @@ const tI18nPhrase Phrases[] = {
     "Infoga",
     "Insereaza",
     "Beilleszteni",
-    "Insertar",
+    "Inserir",
   },
   { "Overwrite",
     "�berschreiben",
     "Prepisi",
-    "",// TODO
+    "Sovrascrivi",
     "",// TODO
     "",// TODO
     "�craser",
@@ -722,12 +722,12 @@ const tI18nPhrase Phrases[] = {
   { "Reset",
     "Reset",
     "Reset",
-    "",//TODO
+    "Reset",
     "",//TODO
     "",//TODO
     "R�initialisation",
     "",//TODO
-    "Nollaa",
+    "Alusta",
     "",//TODO
     "Reiniciar",
     "Epanafora",
@@ -745,7 +745,7 @@ const tI18nPhrase Phrases[] = {
     "Apagar o canal?",
     "Supprimer la cha�ne?",
     "Slette kanal?",
-    "Poista kanava?",
+    "Poistetaanko kanava?",
     "Usunac kanal?",
     "�Eliminar canal?",
     "Diagrafi Kanaliou?",
@@ -762,7 +762,7 @@ const tI18nPhrase Phrases[] = {
     "Apagar o timer?",
     "Supprimer la programmation?",
     "Slette timer?",
-    "Poista ajastin?",
+    "Poistetaanko ajastin?",
     "Usunac timer?",
     "�Eliminar timer?",
     "Diagrafi programmitismou?",
@@ -779,24 +779,24 @@ const tI18nPhrase Phrases[] = {
     "Apagar a grava��o?",
     "Supprimer l'enregistrement?",
     "Slette opptak?",
-    "Poista tallenne?",
+    "Poistetaanko tallenne?",
     "Usunac nagranie?",
     "�Eliminar grabacion?",
     "Svisimo egrafis?",
     "Ta bort inspelningen?",
     "Sterg inregistrarea?",
     "Felv�tel t�rl�se?",
-    "Esborrar gravaci�?"
+    "Esborrar gravaci�?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
     "Snemanje po terminu - zares izbrisi?",
-    "Timer in regestazione - cancello?",
+    "Timer in registrazione - cancello?",
     "Timer neemt nog op - toch verwijderen?",
     "Timer activo - t�m a certeza que quer apagar?",
     "Enregistrement en cours - confirmez la suppression",
     "Timer gj�r opptak - vil du slette likevel?",
-    "Ajastin aktiivinen - poistetaanko?",
+    "Ajastettu tallennus k�ynniss� - keskeytet��nk�?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
     "Programmatismos se exselixsi - Diagrafi sigoura?",
@@ -813,14 +813,14 @@ const tI18nPhrase Phrases[] = {
     "Parar Grava��o?",
     "Arr�ter l'enregistrement?",
     "Stoppe opptak?",
-    "Keskeyt� tallennus?",
+    "Lopetetaanko tallennus?",
     "Zakonczyc nagranie?",
     "�Parar grabaci�n?",
     "Akirosi egrafis?",
     "Stanna inspelning?",
     "Opresc inregistrarea?",
     "Felv�tel befejezni?",
-    "Parar la gravaci�?",
+    "Aturar la gravaci�?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -847,14 +847,14 @@ const tI18nPhrase Phrases[] = {
     "Cancelar Modifica��es?",
     "Annuler les modifications?",
     "Avbryte redigering?",
-    "Peru muokkaus?",
+    "Perutaanko muokkaus?",
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
     "Akirosi kopsimatos?",
     "Avbryta redigeringen?",
     "Opresc editarea?",
     "V�g�st befejezni?",
-    "Cancel.lar l'edici�?",
+    "Cancel�lar l'edici�?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -864,14 +864,14 @@ const tI18nPhrase Phrases[] = {
     "Tem a certeza que quer reiniciar?",
     "Red�marrer?",
     "Vil du virkelig starte p� nytt?",
-    "K�ynnist� uudelleen?",
+    "K�ynnistet��nk� uudelleen?",
     "Rzeczywiscie nowy start?",
     "�De verdad reiniciar?",
     "Na gini sigoura epanekinisi?",
     "Vill du verkligen starta om?",
     "Esti sigur de repornire?",
     "T�nyleg �jraind�tani?",
-    "Segur que vols reiniciar?",
+    "Segur que voleu reiniciar?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -888,7 +888,7 @@ const tI18nPhrase Phrases[] = {
     "Inspelning p�g�r, vill du �nd� starta om?",
     "In inregistrare - repornesc?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
-    "Estic gravant - reiniciar de totes maneres?"
+    "Gravant - Reiniciar de totes maneres?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -939,7 +939,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck valfri knapp f�r att �terkalla avst�ngningen",
     "Apasa orice tasta pentru a anula inchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
-    "Prem qualsevol tecla per cancel.lar l'aturada",
+    "Prem qualsevol tecla per cancel�lar l'aturada",
   },
   // Channel parameters:
   { "Name",
@@ -996,7 +996,7 @@ const tI18nPhrase Phrases[] = {
   { "Source",
     "Quelle",
     "Pozicija",
-    "",//TODO
+    "Sorgente",
     "",//TODO
     "",//TODO
     "Source",
@@ -1052,7 +1052,7 @@ const tI18nPhrase Phrases[] = {
     "PID �udio (1)",
     "PID Audio (1)",
     "Apid1",
-    "��ni PID (1)",
+    "��ni PID1",
     "Apid1",
     "Apid1",
     "Apid1",
@@ -1067,9 +1067,9 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "Apid2",
-    "PID �udio (2)",
+    "PID Audio (2)",
     "Apid2",
-    "��ni PID (2)",
+    "��ni PID2",
     "Apid2",
     "Apid2",
     "Apid2",
@@ -1086,7 +1086,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (1)",
     "PID AC3 (1)",
     "AC3pid1",
-    "AC3 PID (1)",
+    "Dolby PID1",
     "Dpid1",
     "Dpid1",
     "Dpid1",
@@ -1103,7 +1103,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (2)",
     "PID AC3 (2)",
     "AC3pid2",
-    "AC3 PID (2)",
+    "Dolby PID2",
     "Dpid2",
     "Dpid2",
     "Dpid2",
@@ -1137,7 +1137,7 @@ const tI18nPhrase Phrases[] = {
     "Encripta��o",
     "Cryptage",
     "Kortleser",
-    "Salauskortti",
+    "Salaus",
     "CA",
     "CA",
     "CA",
@@ -1186,7 +1186,7 @@ const tI18nPhrase Phrases[] = {
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
-    "Bandwidth",
+    "Bande passante",
     "Bandwidth",
     "Kaistanleveys",
     "Bandwidth",
@@ -1195,7 +1195,7 @@ const tI18nPhrase Phrases[] = {
     "Bandbredd",
     "Bandwidth",
     "Bandwidth",
-    "Ampla de banda",
+    "Amplada de banda",
   },
   { "CoderateH",
     "CoderateH",
@@ -1205,7 +1205,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
-    "Yl�koodinopeus", //Finnish - unsure about this
+    "Yl�suojaustaso",
     "CoderateH",
     "CoderateH",
     "CoderateH",
@@ -1222,7 +1222,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
-    "Alakoodinopeus", //Finnish - unsure about this
+    "Alasuojaustaso",
     "CoderateL",
     "CoderateL",
     "CoderateL",
@@ -1256,7 +1256,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmission",
     "Transmission",
-    "L�hetys", //Finnish - unsure about this
+    "L�hetystila",
     "Transmission",
     "Transmission",
     "Transmission",
@@ -1273,7 +1273,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
     "Guard",
     "Guard",
-    "Suoja", //Finnish - unsure about this
+    "Suojav�li",
     "Guard",
     "Guard",
     "Guard",
@@ -1288,7 +1288,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
-    "Hierarchy",
+    "Hierarchie",
     "Hierarchy",
     "Hierarkia",
     "Hierarchy",
@@ -1383,12 +1383,12 @@ const tI18nPhrase Phrases[] = {
     "Slutar",
     "Stop",
     "V�ge",
-    "Final",
+    "Fi",
   },
   { "Priority",
     "Priorit�t",
     "Prioriteta",
-    "Priorita",
+    "Priorita'",
     "Prioriteit",
     "Prioridade",
     "Priorit�",
@@ -1417,7 +1417,7 @@ const tI18nPhrase Phrases[] = {
     "Livstid",
     "Durata",
     "�lettartam",
-    "Duraci�",
+    "Durada",
   },
   { "File",
     "Datei",
@@ -1508,7 +1508,7 @@ const tI18nPhrase Phrases[] = {
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
     "Napaka pri dostopu do posnetka!",
-    "Errore nel tentativo di acc alla registrazione",
+    "Errore nell'accesso alla registrazione",
     "Fout bij lezen opname!",
     "Erro ao aceder � grava��o",
     "Impossible d'acc�der � l'enregistrement",
@@ -1525,7 +1525,7 @@ const tI18nPhrase Phrases[] = {
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
     "Napaka pri brisanju posnetka!",
-    "Errore durante la canc del filmato!",
+    "Errore nel cancellare la registrazione!",
     "Fout bij verwijderen opname!",
     "Erro enquanto apagava uma grava��o!",
     "Erreur de suppression de l'enregistrement!",
@@ -1559,7 +1559,7 @@ const tI18nPhrase Phrases[] = {
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
     "Ni proste DVB naprave za snemanje!",
-    "Nessuna card DVB disp per registrare!",
+    "Nessuna periferica DVB disponibile per registrare!",
     "Geen vrije DVB kaart om op te nemen!",
     "Nenhuma placa DVB disponivel para gravar!",
     "Pas de carte DVB disponible pour l'enregistrement!",
@@ -1576,7 +1576,7 @@ const tI18nPhrase Phrases[] = {
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
     "Kanal ni razpolozljiv!",
-    "",//TODO
+    "Canale non disponibile!",
     "",//TODO
     "",//TODO
     "Cha�ne non disponible!",
@@ -1593,7 +1593,7 @@ const tI18nPhrase Phrases[] = {
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
     "Nastavitve kanala niso edinstvene!",
-    "",//TODO
+    "Paramentri Canale non unici!",
     "",//TODO
     "",//TODO
     "Caract�ristiques des cha�nes ne sont pas uniques",
@@ -1632,7 +1632,7 @@ const tI18nPhrase Phrases[] = {
     "Imposs�vel iniciar modo de transfer�ncia!",
     "Impossible d'utiliser le mode transfert!",
     "Kan ikke starte transfer modus!",
-    "K�sitt�m�tt�mi� teknisi� ongelmia!", //Finnish - unsure about this ;-)
+    "Siirtotilan aloitus ep�onnistui!",
     "Tryb transferowy jest niemozliwy!",
     "�No puedo iniciar modo de transferencia!",
     "Adinamia ekinisis katastasis metaforas!",
@@ -1644,7 +1644,7 @@ const tI18nPhrase Phrases[] = {
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
     "Nobena tocka ni definirana!",
-    "",//TODO
+    "Nessun marcatore di modifica definito!",
     "",//TODO
     "",//TODO
     "Pas de marques d'�dition d�finies!",
@@ -1656,12 +1656,12 @@ const tI18nPhrase Phrases[] = {
     "Det finns inga redigeringsm�rken",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "No hi ha marques d'edici� definides",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
     "Ne morem zaceti urejanja!",
-    "Imposs iniziare processo di modifica",
+    "Impossibile iniziare processo di modifica!",
     "Kan niet beginnen met bewerken!",
     "N�o pode iniciar a modifica��o!",
     "Impossible de commencer le montage!",
@@ -1678,7 +1678,7 @@ const tI18nPhrase Phrases[] = {
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
     "Urejanje je ze aktivno!",
-    "Processo di modifica gia` attivo",
+    "Processo di modifica gia` attivo!",
     "Bewerken is al actief!",
     "Processo de modifica��o j� activo!",
     "Montage d�j� en cours!",
@@ -1695,7 +1695,7 @@ const tI18nPhrase Phrases[] = {
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
     "Zaustavitev ni izvedljiva - opcija '-s' ni podana!",
-    "Impossibile spegnere - parametro '-s' non passato",
+    "Impossibile spegnere - parametro '-s' non passato!",
     "Shutdown onmogelijk - Optie '-s' ontbreekt!",
     "Imposs�vel desligar - falta a op��o '-s'!",
     "Arr�t impossible - option '-s' absente!",
@@ -1707,7 +1707,7 @@ const tI18nPhrase Phrases[] = {
     "Kan inte avsluta, m�ste anv�nda parameter '-s'",
     "Nu pot opri calculatorul - vezi optiunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
-    "No puc apagar, falta la opci� -s !"
+    "No puc apagar, falta la opci� -s !",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1724,17 +1724,17 @@ const tI18nPhrase Phrases[] = {
     "L�gt diskutrymme!",
     "Spatiu scazut pe disc!",
     "A merev lemez majdnem tele!",
-    "Disc gaireb� pl�!",
+    "Disc gaireb� ple!",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
     "Ne morem odpreti CAM menija!",
-    "",//TODO
+    "Impossibile aprire il menu CAM!",
     "",//TODO
     "",//TODO
     "Impossible d'ouvrir le menu CAM!",
     "",//TODO
-    "Salausmoduuli ei valittavissa",
+    "Salausmoduulin valikko ei saatavilla",
     "",//TODO
     "�No pudeo acceder al men� de la CAM!",
     "Den mpori na aniksi to CAM menou!",
@@ -1746,7 +1746,7 @@ const tI18nPhrase Phrases[] = {
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
     "Ne morem resetirati CAM-a",
-    "",//TODO
+    "Impossibile reimpostare il modulo CAM!",
     "",//TODO
     "",//TODO
     "Impossible de r�initialiser la CAM!",
@@ -1763,7 +1763,7 @@ const tI18nPhrase Phrases[] = {
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
     "CAM je resetiran!",
-    "",//TODO
+    "Modulo CAM reimpostato!",
     "",//TODO
     "",//TODO
     "La CAM a �t� r�initialis�e",
@@ -1854,7 +1854,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "Acc�s conditionnel",
     "CICAM",
-    "CICAM",
+    "CI-moduuli",
     "CICAM",
     "CICAM",
     "CICAM",
@@ -1951,12 +1951,12 @@ const tI18nPhrase Phrases[] = {
   { "Restart",
     "Neustart",
     "Ponoven zagon",
-    "Restart",
+    "Riavvio",
     "Herstart",
     "Reiniciar",
     "Red�marrer",
     "Start p� nytt",
-    "Uudelleenk�ynnistys"
+    "K�ynnist� uudelleen",
     "Zastartowac",
     "Reiniciar",
     "Epanekinisi",
@@ -1986,7 +1986,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Width",
     "Breite",
     "Sirina",
-    "Largh OSD",
+    "Larghezza OSD",
     "Breedte",
     "Largura",
     "Largeur",
@@ -2003,7 +2003,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Height",
     "H�he",
     "Visina",
-    "Altezz OSD",
+    "Altezza OSD",
     "Hoogte",
     "Altura",
     "Hauteur",
@@ -2032,12 +2032,12 @@ const tI18nPhrase Phrases[] = {
     "Tid f�r meddelanden (sek)",
     "Timp afisare mesaj (sec)",
     "Inform�ci� felt�ntet�s�nek id�tartama",
-    "Duraci� dels missatges (s)",
+    "Durada dels missatges (s)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
     "Pozicija informacije o kanalu",
-    "Posizione info canale",
+    "Posizione informazioni canale",
     "Kanaal info positie",
     "Posi��o de info dos canais",
     "Position infos cha�nes",
@@ -2054,7 +2054,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
     "Pokazi naziv kanala",
-    "Vis info nel cambio canale",
+    "Mostra info al cambio canale",
     "Kanaal info tonen",
     "Mostrar info ao mudar de Canal",
     "Affichage progr. en cours",
@@ -2071,12 +2071,12 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
     "Drsni meni",
-    "Scrolla pagina nel menu",
+    "Scorri pagina nel menu",
     "Scrollen per pagina",
     "Scroll da p�gina no menu",
     "Scrolling par pages",
     "Rask rulling i menyer",
-    "Valikkojen selaus",
+    "Valikkojen sivutus",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
     "Kilisi selidas",
@@ -2117,12 +2117,12 @@ const tI18nPhrase Phrases[] = {
     "Kataloger f�r inspelningar",
     "Directoare inregistrari",
     "Felv�telek list�ja",
-    "Gravacions en sub-carpetes",
+    "Gravacions en subcarpetes",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
     "Cas do EPG pregleda (h)",
-    "Timeout EPG (h)",
+    "Timeout scansione EPG (h)",
     "EPG-scan Timeout (h)",
     "Expirou o EPG (h)",
     "Inactivit� avant rech. EPG (h)",
@@ -2139,7 +2139,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
     "Nivo za popravilo EPG napak",
-    "EPG livello corr",
+    "Livello correzione EPG",
     "EPG foutcorrectieniveau",
     "N�vel de correct��o EPG",
     "Niveau de correction EPG",
@@ -2156,7 +2156,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
     "Nastavi sistemski cas",
-    "Settaggio orario auto",
+    "Settaggio orario automatico",
     "Systeem klok instellen",
     "Ajustar rel�gio do sistema",
     "Ajuster l'heure du syst�me",
@@ -2229,7 +2229,7 @@ const tI18nPhrase Phrases[] = {
     "Limite de bandas LNB (MHz)",
     "Limite de bandes LNB (MHz)",
     "LO-grensefrekvens (MHz)",
-    "SLOF (MHz)", //Finnish - unsure about this
+    "LNB rajataajuus (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
@@ -2246,7 +2246,7 @@ const tI18nPhrase Phrases[] = {
     "Frequ�ncia base LNB (MHz)",
     "Fr�quence basse LNB (MHz)",
     "LO-frekvens i lavb�ndet (MHz)",
-    "LNB alataajuus (MHz)",
+    "LNB alempi taajuus (MHz)",
     "Dolna czestotliwosc LNB (MHz)",
     "Frecuencia baja LNB (MHz)",
     "Kato LNB-Sixnotita (MHz)",
@@ -2263,7 +2263,7 @@ const tI18nPhrase Phrases[] = {
     "Frequ�ncia alta LNB (MHz)",
     "Fr�quence haute LNB (MHz)",
     "LO-frekvens i h�yb�ndet (MHz)",
-    "LNB yl�taajuus (MHz)",
+    "LNB ylempi taajuus (MHz)",
     "Gorna czestotliwosc LNB (MHz)",
     "Frecuencia alta LNB (MHz)",
     "Ano LNB-Sixnotita (MHz)",
@@ -2297,7 +2297,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "Acc�s conditionnel",
     "CICAM DVB",
-    "CICAM DVB", //Finnish - unsure about this "Salausmoduuli"
+    "CI-moduuli DVB",
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
@@ -2309,7 +2309,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
     "Premor pred zacetkom (min)",
-    "Min margine inizio (min)",
+    "Margine iniziale (min)",
     "Tijd marge begin (min)",
     "Margem inicial (min)",
     "Marge ant�rieure (min)",
@@ -2321,12 +2321,12 @@ const tI18nPhrase Phrases[] = {
     "Marginal f�r start (min)",
     "Margine la pornire (min)",
     "Id�eltol�d�s a kezd�sn�l (min)",
-    "Iniciar la gravaci� avans de (min)",
+    "Marge d'inici de gravaci� (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
     "Premor za koncem (min)",
-    "Min margine fine (min)",
+    "Margine finale (min)",
     "Tijd marge eind (min)",
     "Margem final (min)",
     "Marge post�rieure (min)",
@@ -2338,7 +2338,7 @@ const tI18nPhrase Phrases[] = {
     "Marginal f�r stopp (min)",
     "Margine la oprire (min)",
     "Id�eltol�d�s a befejez�sn�l",
-    "Acavar la gravaci� despr�s de (min)",
+    "Marge de fi de gravaci� (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -2346,9 +2346,9 @@ const tI18nPhrase Phrases[] = {
     "Limite primario",
     "Eerste grens",
     "Limite Prim�rio",
-    "Premi�re limite",
+    "Limite primaire",
     "Prioritetsgrense HovedDVB",
-    "P��limitti", //Finnish - unsure about this ;-)
+    "P��vastaanottimen prioriteetti",
     "Pierwotny limit",
     "L�mite primario",
     "Protevon orio",
@@ -2365,7 +2365,7 @@ const tI18nPhrase Phrases[] = {
     "Prioridade por defeito",
     "Priorit� par d�faut",
     "Normal prioritet (Timer)",
-    "Oletusprioriteetti",
+    "Tallenteen oletusprioriteetti",
     "Priorytet pierwotny",
     "Prioridad predefinida",
     "Protereotita",
@@ -2377,24 +2377,24 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
     "Osnovni zivljenski cas (d)",
-    "Durata predefinita (d)",
+    "Durata predefinita (gg)",
     "Standaard levensduur (d)",
     "Validade por defeito (d)",
     "Dur�e de vie par d�faut (j)",
     "Normal levetid timer (d)",
-    "Oletuselinik� (d)",
+    "Tallenteen oletuselinik� (d)",
     "Pierwotna trwalosc (d)",
     "Duraci�n predefinida",
     "Xronos zois",
     "Normal livstid (dagar)",
     "Durata predefinita",
     "Default �lettartam",
-    "Duraci� predefinida",
+    "Durada predefinida",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
     "Prioriteta pavze",
-    "",// TODO
+    "Priorita' di pausa",
     "",// TODO
     "",// TODO
     "Priorit� des pauses",
@@ -2411,7 +2411,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
     "Cas pavze (d)",
-    "",// TODO
+    "Durata pausa (gg)",
     "",// TODO
     "",// TODO
     "Dur�e de vie des pauses (j)",
@@ -2423,7 +2423,7 @@ const tI18nPhrase Phrases[] = {
     "Livstid f�r direktinspelning (dagar)",
     "",// TODO
     "",// TODO
-    "Duraci� de la pausa (d)",
+    "Durada de la pausa (d)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -2479,7 +2479,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
     "Cas direktnega snemanja (min)",
-    "",//TODO
+    "Tempo registrazione istantanea (min)",
     "",//TODO
     "",//TODO
     "Dur�e enregistr. imm�diat (min)",
@@ -2496,7 +2496,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
     "Posnemi dolby digital",
-    "Registra dolby digital",
+    "Registra Dolby Digital",
     "Dolby Digital geluid opnamen",
     "Gravar em Dolby Digital",
     "Enregistrer en Dolby Digital",
@@ -2508,7 +2508,7 @@ const tI18nPhrase Phrases[] = {
     "Spela in ljudet med Dolby Digital",
     "Inregistreaza Dolby Digital",
     "Dolby Digit�l felv�tel",
-    "Gravar el s� en Dolby Digital",
+    "Gravar el so en Dolby Digital",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -2518,14 +2518,14 @@ const tI18nPhrase Phrases[] = {
     "Tamanho m�ximo dos ficheiros (MB)",
     "Taille maxi des fichiers (MB)",
     "Maksimal st�rrelse p� videofiler (MB)",
-    "Suurin tiedostokoko (MB)",
+    "Suurin tiedostokoko (Mt)",
     "Maks. wielkosc pliku (MB)",
     "Tama�o m�x. de fichero (MB)",
     "Megisto megethos arxeiou (MB)",
     "Maximal filstorlek f�r inspelning (MB)",
     "Dimensiune maxima a fisierului video (MB)",
     "Max. video File-terjedelem (MB)",
-    "Tamany m�xim de l'arxiu (MB)",
+    "Mida m�xima de l'arxiu (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -2533,7 +2533,7 @@ const tI18nPhrase Phrases[] = {
     "Dividi i file modificati",
     "Bewerkte files opdelen",
     "Quebrar ficheiros",
-    "S�parer les s�quences",
+    "S�parer les s�quences �dit�es",
     "Splitt redigerte filer",
     "Jaottele muokatut tallenteet",
     "Dzielic montowane pliki",
@@ -2559,7 +2559,7 @@ const tI18nPhrase Phrases[] = {
     "Multispeed mode",
     "Mod multi-rata",
     "MultiSpeed funkci�",
-    "Mode de multi-velocitat",
+    "Mode de multivelocitat",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -2584,16 +2584,16 @@ const tI18nPhrase Phrases[] = {
     "Resume ID",// TODO
     "Resume ID",// TODO
     "Resume ID",// TODO
+    "ID de reprise",
     "Resume ID",// TODO
-    "Resume ID",// TODO
-    "Jatko ID", //Finnish - unsure about this
+    "Tallenteen paluutunniste",
     "Resume ID",// TODO
     "Continuar ID",
     "Resume ID",// TODO
     "�teruppta ID",
     "Resume ID",// TODO
     "Resume ID",// TODO
-    "Continuar ID",
+    "ID de Continuar",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -2603,7 +2603,7 @@ const tI18nPhrase Phrases[] = {
     "Per�odo m�nimo de pausa (min)",
     "MinEventTimeout (min)",
     "Minste hendelsespause (min)",
-    "Tapahtuman odotusaika (min)", //Finnish - unsure about this
+    "Tapahtuman odotusaika (min)",
     "Min. czas do nast. akcji (Event) (min)",
     "Tiempo m�nimo pausa (min)",
     "Elaxistos Xronos paremvolis (lepta)",
@@ -2620,7 +2620,7 @@ const tI18nPhrase Phrases[] = {
     "Per�odo m�nimo de inactividade (min)",
     "Dur�e minimale d'inact. (min)",
     "Minimumstid med inaktivitet (min)",
-    "K�ytt�j�toiminnon odotusaika (min)", //Finnish - unsure about this
+    "K�ytt�j�toiminnon odotusaika (min)",
     "Min. brak aktywnosci uzytkownika (min)",
     "Tiempo m�nimo inactividad (min)",
     "Elaxistos xronos mi xrisis (lepta)",
@@ -2650,7 +2650,7 @@ const tI18nPhrase Phrases[] = {
   { "MTWTFSS",
     "MDMDFSS",
     "PTSCPSN",
-    "DLMMGVS",
+    "LMMGVSD",
     "MDWDVZZ",
     "STQQSSD",
     "LMMJVSD",
@@ -2662,7 +2662,7 @@ const tI18nPhrase Phrases[] = {
     "MTOTFLS",
     "LMMJVSD",
     "HKSCPSV",
-    "LMXJVSU",
+    "LMCJVSG",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -2679,16 +2679,16 @@ const tI18nPhrase Phrases[] = {
     "M�nTisOnsTorFreL�rS�n",
     "LunMarMieJoiVinSimDum",
     "H�tKedSzeCs�P�nSzoVas",
-    "DllDimDmcDijDivDisDiu",
+    "Dl Dm Dc Dj Dv Ds Dg ",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
+    " a�bcde��fghi�jklmnopqrstu�vwxyz0123456789-.#~",
     "",// TODO
     "",// TODO
-    "",// TODO
-    " a�bc�de���fghi�jklmno�pqrstu��vxyz0123456789-.#~",
+    " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~",
     "",// TODO
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
     "",// TODO
@@ -2737,7 +2737,7 @@ const tI18nPhrase Phrases[] = {
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
     "Pritisnite tipko na upravljalcu",
-    "Premere un tasto nell'unita` RC",
+    "Premere un tasto dell'unita` RC",
     "Druk op een willekeurige knop",
     "Pressione qualquer tecla do telecomando",
     "Appuyer sur une touche de la t�l�commande",
@@ -2749,7 +2749,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck valfri tangent p� fj�rrkontrollen",
     "Apasati o tasta pe telecomanda",
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
-    "Premi qualsevol tecla del comandament",
+    "Premeu qualsevol tecla del comandament",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -2783,7 +2783,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck inte p� n�gon knapp...",
     "Nu apasati nicio tasta...",
     "Ne nyomjon meg gombot...",
-    "No premi cap tecla...",
+    "No premeu cap tecla...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -2817,7 +2817,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck p� knappen f�r '%s'",
     "Apasati tasta pentru '%s'",
     "'%s' gomb megnyom�sa",
-    "Premi una tecla per '%s'",
+    "Premeu una tecla per '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -2834,12 +2834,12 @@ const tI18nPhrase Phrases[] = {
     "Tryck 'Upp' f�r att bekr�fta",
     "Apsati 'Sus' pentru confirmare",
     "'Fel' megnyom�sa az elfogad�shoz",
-    "Premi 'Amunt' per confirmar",
+    "Premeu 'Amunt' per confirmar",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
     "Pritisnite tipko 'Dol' za nadaljevanje",
-    "Premere 'Giu' per confermare",
+    "Premere 'Giu' per continuare",
     "Druk 'Omlaag' om verder te gaan",
     "Pressione 'Baixo' para continuar",
     "Appuyer sur 'Bas' pour continuer",
@@ -2851,7 +2851,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck 'Ner' f�r att bekr�fta",
     "Apasati jos pentru continuare",
     "'Le' megnyom�sa a folytat�shoz",
-    "Premi 'Avall' per continuar",
+    "Premeu 'Avall' per continuar",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -2868,12 +2868,12 @@ const tI18nPhrase Phrases[] = {
     "(Tryck 'Upp' f�r att backa)",
     "(Apsati 'Sus' pentru revenire)",
     "(�Fel' megnyom�sa a visszat�r�shez)",
-    "(Premi 'Amunt' per retornar)",
+    "(Premeu 'Amunt' per retornar)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
     "(pritisnite 'Dol' za konec)",
-    "('Giu' per finire la definiz tasti)",
+    "('Giu' per finire la definizione tasti)",
     "(Druk 'Omlaag' om te beeindigen)",
     "(Pressione 'Baixo' para terminar a defini��o)",
     "(Appuyer sur 'Bas' pour terminer)",
@@ -2885,12 +2885,12 @@ const tI18nPhrase Phrases[] = {
     "(Tryck 'Ner' f�r att avsluta knapp definition)",
     "(Apasati 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
-    "(Premi 'Avall' per finalitzar l'aprenentatge)",
+    "(Premeu 'Avall' per finalitzar l'aprenentatge)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
     "pritisnite 'Meni' za preskok te tipke",
-    "",// TODO
+    "(premere 'Menu' per saltare questo tasto)",
     "",// TODO
     "",// TODO
     "('Menu' pour passer cette touche)",
@@ -2902,12 +2902,12 @@ const tI18nPhrase Phrases[] = {
     "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
     "",// TODO
     "",// TODO
-    "Premi 'Menu' per obviar aquesta tecla",
+    "Premeu 'Men�' per obviar aquesta tecla",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
     "Faza 3: Shranjevanje kod tipk",
-    "Fase 3: Salvataggio key codes",
+    "Fase 3: Salvataggio codici tasti",
     "Fase 3: Opslaan toets codes",
     "Fase 3: A salvar os c�digos das teclas",
     "Phase 3: Sauvegarde des codes des touches",
@@ -2936,7 +2936,7 @@ const tI18nPhrase Phrases[] = {
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
-    "Premi 'Amunt' per guardar, 'Avall' per anul.lar",
+    "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
   },
   // Key names:
   { "Up",
@@ -3005,7 +3005,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
-    "Ok",
+    "D'acord",
   },
   { "Back",
     "Zur�ck",
@@ -3056,7 +3056,7 @@ const tI18nPhrase Phrases[] = {
     "H�ger",
     "Dreapta",
     "Jobbra",
-    "Dreta"
+    "Dreta",
   },
   { "Red",
     "Rot",
@@ -3073,7 +3073,7 @@ const tI18nPhrase Phrases[] = {
     "R�d",
     "Rosu",
     "Piros",
-    "Vermell"
+    "Vermell",
   },
   { "Green",
     "Gr�n",
@@ -3129,7 +3129,7 @@ const tI18nPhrase Phrases[] = {
   { "Play",
     "Wiedergabe",
     "Predvajaj",
-    "",// TODO
+    "Riproduci",
     "",// TODO
     "",// TODO
     "Lecture",
@@ -3146,7 +3146,7 @@ const tI18nPhrase Phrases[] = {
   { "Pause",
     "Pause",
     "Pavza",
-    "",// TODO
+    "Pausa",
     "",// TODO
     "",// TODO
     "Pause",
@@ -3163,24 +3163,24 @@ const tI18nPhrase Phrases[] = {
   { "Stop",
     "Stop",
     "Ustavi",
-    "",// TODO
+    "Stop",
     "",// TODO
     "Stop",
-    "Arr�t",
+    "Stop",
     "",// TODO
-    "Pys�yt�",
+    "Lopeta",
     "",// TODO
     "Parar",
     "Terma",
     "Stoppa",
     "",// TODO
     "",// TODO
-    "Parar",
+    "Aturar",
   },
   { "Record",
     "Aufnehmen",
     "Snemaj",
-    "",// TODO
+    "Registra",
     "",// TODO
     "",// TODO
     "Enregistrement",
@@ -3197,7 +3197,7 @@ const tI18nPhrase Phrases[] = {
   { "FastFwd",
     "Vorlauf",
     "Hitro naprej",
-    "",// TODO
+    "Avanti Veloce",
     "",// TODO
     "",// TODO
     "Avance rapide",
@@ -3214,7 +3214,7 @@ const tI18nPhrase Phrases[] = {
   { "FastRew",
     "R�cklauf",
     "Hitro nazaj",
-    "",// TODO
+    "Indietro Veloce",
     "",// TODO
     "",// TODO
     "Retour rapide",
@@ -3234,7 +3234,7 @@ const tI18nPhrase Phrases[] = {
     "Power",
     "Uitschakelen",
     "Ligar",
-    "Arr�t",
+    "Veille", // This one caused some bug reports ;)
     "Power",
     "Virtakytkin",
     "Wylaczyc",
@@ -3243,12 +3243,12 @@ const tI18nPhrase Phrases[] = {
     "P�/Av",
     "Pornit",
     "Kikapcsolni",
-    "Parar",
+    "Aturar",
   },
   { "Channel+",
     "Kanal+",
     "Kanal+",
-    "",// TODO
+    "Canale +",
     "",// TODO
     "",// TODO
     "Cha�ne+",
@@ -3265,7 +3265,7 @@ const tI18nPhrase Phrases[] = {
   { "Channel-",
     "Kanal-",
     "Kanal-",
-    "",// TODO
+    "Canale -",
     "",// TODO
     "",// TODO
     "Cha�ne-",
@@ -3282,7 +3282,7 @@ const tI18nPhrase Phrases[] = {
   { "Volume+",
     "Lautst�rke+",
     "Glasnost+",
-    "Volume+",
+    "Volume +",
     "Volume+",
     "Volume+",
     "Volume+",
@@ -3299,7 +3299,7 @@ const tI18nPhrase Phrases[] = {
   { "Volume-",
     "Lautst�rke-",
     "Glasnost-",
-    "Volume-",
+    "Volume -",
     "Volume-",
     "Volume-",
     "Volume-",
@@ -3321,7 +3321,7 @@ const tI18nPhrase Phrases[] = {
     "Sem som",
     "Coupure du son",
     "Lyd av",
-    "Mykist�",
+    "��net�n",
     "Cisza",
     "Mudo",
     "Siopilo",
@@ -3368,7 +3368,7 @@ const tI18nPhrase Phrases[] = {
   { "off",
     "aus",
     "izklop",
-    "",// TODO
+    "off",
     "",// TODO
     "off",
     "",// TODO
@@ -3385,14 +3385,14 @@ const tI18nPhrase Phrases[] = {
   { "none",
     "keine",
     "nobeden",
-    "",// TODO
+    "nessuno",
     "",// TODO
     "",// TODO
     "aucun",
     "",// TODO
     "tyhj�",
     "",// TODO
-    "ninguno"
+    "ninguno",
     "kanena",
     "ingen",
     "",// TODO
@@ -3402,7 +3402,7 @@ const tI18nPhrase Phrases[] = {
   { "auto",
     "auto",
     "avtomatsko",
-    "",// TODO
+    "auto",
     "",// TODO
     "",// TODO
     "auto",
@@ -3424,7 +3424,7 @@ const tI18nPhrase Phrases[] = {
     "topo",
     "haut",
     "�vre",
-    "yl�",
+    "yl�reuna",
     "gora",
     "parte superior",
     "pano",
@@ -3441,7 +3441,7 @@ const tI18nPhrase Phrases[] = {
     "fundo",
     "bas",
     "nedre",
-    "ala",
+    "alareuna",
     "dol",
     "parte inferior",
     "kato",
@@ -3453,7 +3453,7 @@ const tI18nPhrase Phrases[] = {
   { "Disk",
     "Disk",
     "Disk",
-    "Disk",
+    "Disco",
     "Disk",
     "Disk",
     "Disque",
@@ -3465,7 +3465,7 @@ const tI18nPhrase Phrases[] = {
     "Disk",
     "Disc",
     "Lemez",
-    "Disc"
+    "Disc",
   },
   { "free",
     "frei",
@@ -3475,14 +3475,14 @@ const tI18nPhrase Phrases[] = {
     "livre",
     "restant",
     "ledig",
-    "vapaa",
+    "vapaana",
     "pozostalo",
     "libre",
     "akoma",
     "ledigt",
     "liber",
     "szabad",
-    "lliure"
+    "lliure",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -3499,7 +3499,7 @@ const tI18nPhrase Phrases[] = {
     "Hopp: ",
     "Salt: ",
     "Ugr�s: ",
-    "Salta a:"
+    "Salta a:",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -3526,14 +3526,14 @@ const tI18nPhrase Phrases[] = {
     " Parar reprodu��o",
     " Arr�ter la lecture",
     " Stopp avspilling",
-    " Pys�yt� toisto",
+    " Lopeta toisto",
     " Zatrzymac odtwarzanie",
     " Parar reproduci�n",
     " Telos anametadosis",
     " Avsluta uppspelning",
     " Opreste redare",
     " Lej�tsz�st befejzni",
-    " Parar la reproducci�",
+    " Aturar la reproducci�",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -3543,14 +3543,14 @@ const tI18nPhrase Phrases[] = {
     " Parar grava��o ",
     " Arr�ter l'enregistrement ",
     " Stopp opptak fra ",
-    " Pys�yt� tallennus ",
+    " Lopeta tallennus ",
     " Zatrzymac nagrywanie ",
     " Parar grabaci�n ",
     " Telos egrafis ",
     " Avsluta inspelning ",
     " Opreste inregistrarea ",
     " Felv�telt befejezni ",
-    " Parar la gravaci� ",
+    " Aturar la gravaci� ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -3594,7 +3594,7 @@ const tI18nPhrase Phrases[] = {
     "Cima/Baixo para nova localiza��o - Ok para mover",
     "Haut/Bas -> nouvelle place - OK -> d�placer",
     "Opp/Ned for ny plass - OK for � flytte",
-    "Yl�s/Alas = liiku, OK = siirr�",
+    "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy",
     "Gora/Dol na nowa pozycje - Ok zmienia",
     "Arriba/Abajo para el nuevo lugar - OK para mover",
     "Pano/Kato gia nea thesi. meta OK",
@@ -3674,7 +3674,7 @@ const tI18nPhrase Phrases[] = {
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
     "Ustavljanje predvajanja v zivo...",
-    "",// TODO
+    "Pausa del canale in visione...",
     "",// TODO
     "",// TODO
     "Pause de l'�mission en direct...",
@@ -3686,12 +3686,12 @@ const tI18nPhrase Phrases[] = {
     "Pausar direktinspelningen",
     "",// TODO
     "",// TODO
-    "Pausa d'emissi� en directe..."
+    "Pausa d'emissi� en directe...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
     "Ta plugin nima nastavitvenih parametrov!",
-    "",// TODO
+    "Questo plugin non ha parametri di setup!",
     "",// TODO
     "",// TODO
     "Ce plugin n'a pas de param�tres!",
diff --git a/menu.c b/menu.c
index 9fb375036..ecf2493c4 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.249 2003/05/25 14:06:17 kls Exp $
+ * $Id: menu.c 1.253 2003/05/30 09:53:57 kls Exp $
  */
 
 #include "menu.h"
@@ -1862,6 +1862,11 @@ eOSState cMenuRecordings::Delete(void)
               if (timer) {
                  timer->Skip();
                  cRecordControls::Process(time(NULL));
+                 if (timer->IsSingleEvent()) {
+                    int Index = timer->Index();
+                    Timers.Del(timer);
+                    isyslog("timer %d deleted", Index + 1);
+                    }
                  Timers.Save();
                  }
               }
@@ -2636,7 +2641,8 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   lines = 0;
   number = 0;
   lastTime = time_ms();
-  int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
+  withInfo = Setup.ShowInfoOnChSwitch;
+  int EpgLines = withInfo ? 5 : 1;
   Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   ProcessKey(FirstKey);
 }
diff --git a/recording.c b/recording.c
index 7e68a7913..06f632553 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.79 2003/05/24 11:22:34 kls Exp $
+ * $Id: recording.c 1.80 2003/05/30 13:23:54 kls Exp $
  */
 
 #include "recording.h"
@@ -769,6 +769,12 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 
 #define INDEXFILESUFFIX     "/index.vdr"
 
+// The number of frames to stay off the end in case of time shift:
+#define INDEXSAFETYLIMIT 100 // frames
+
+// The maximum time to wait before giving up while catching up on an index file:
+#define MAXINDEXCATCHUP   8 // seconds
+
 // The minimum age of an index file for considering it no longer to be written:
 #define MININDEXAGE    3600 // seconds
 
@@ -852,47 +858,50 @@ bool cIndexFile::CatchUp(int Index)
 {
   // returns true unless something really goes wrong, so that 'index' becomes NULL
   if (index && f >= 0) {
-     if (Index < 0 || Index >= last) {
-        struct stat buf;
-        if (fstat(f, &buf) == 0) {
-           if (time(NULL) - buf.st_mtime > MININDEXAGE) {
-              // apparently the index file is not being written any more
-              close(f);
-              f = -1;
-              return true;
-              }
-           int newLast = buf.st_size / sizeof(tIndex) - 1;
-           if (newLast > last) {
-              if (size <= newLast) {
-                 size *= 2;
-                 if (size <= newLast)
-                    size = newLast + 1;
-                 }
-              index = (tIndex *)realloc(index, size * sizeof(tIndex));
-              if (index) {
-                 int offset = (last + 1) * sizeof(tIndex);
-                 int delta = (newLast - last) * sizeof(tIndex);
-                 if (lseek(f, offset, SEEK_SET) == offset) {
-                    if (safe_read(f, &index[last + 1], delta) != delta) {
-                       esyslog("ERROR: can't read from index");
-                       free(index);
-                       index = NULL;
-                       close(f);
-                       f = -1;
-                       return true;
-                       }
-                    last = newLast;
-                    }
-                 else
-                    LOG_ERROR_STR(fileName);
-                 }
-              else
-                 esyslog("ERROR: can't realloc() index");
-              }
-           }
-        else
-           LOG_ERROR_STR(fileName);
-        }
+     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
+         struct stat buf;
+         if (fstat(f, &buf) == 0) {
+            if (time(NULL) - buf.st_mtime > MININDEXAGE) {
+               // apparently the index file is not being written any more
+               close(f);
+               f = -1;
+               break;
+               }
+            int newLast = buf.st_size / sizeof(tIndex) - 1;
+            if (newLast > last) {
+               if (size <= newLast) {
+                  size *= 2;
+                  if (size <= newLast)
+                     size = newLast + 1;
+                  }
+               index = (tIndex *)realloc(index, size * sizeof(tIndex));
+               if (index) {
+                  int offset = (last + 1) * sizeof(tIndex);
+                  int delta = (newLast - last) * sizeof(tIndex);
+                  if (lseek(f, offset, SEEK_SET) == offset) {
+                     if (safe_read(f, &index[last + 1], delta) != delta) {
+                        esyslog("ERROR: can't read from index");
+                        free(index);
+                        index = NULL;
+                        close(f);
+                        f = -1;
+                        break;
+                        }
+                     last = newLast;
+                     }
+                  else
+                     LOG_ERROR_STR(fileName);
+                  }
+               else
+                  esyslog("ERROR: can't realloc() index");
+               }
+            }
+         else
+            LOG_ERROR_STR(fileName);
+         if (Index < last - (i ? 2 * INDEXSAFETYLIMIT : 0) || Index > 10 * INDEXSAFETYLIMIT) // keep off the end in case of "Pause live video"
+            break;
+         sleep(1);
+         }
      }
   return index != NULL;
 }
@@ -940,7 +949,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
-         if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? 100 : 0)) {
+         if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? INDEXSAFETYLIMIT : 0)) {
             if (index[Index].type == I_FRAME) {
                if (FileNumber)
                   *FileNumber = index[Index].number;
diff --git a/vdr.1 b/vdr.1
index 86af51c6c..ca49acdf3 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2002 Klaus Schmidinger
+.\" Copyright (C) 2003 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.7 2003/05/03 16:16:05 kls Exp $
+.\" $Id: vdr.1 1.8 2003/05/29 11:58:28 kls Exp $
 .\"
-.TH vdr 1 "3 May 2003" "1.1.30" "Video Disk Recorder"
+.TH vdr 1 "1 June 2003" "1.2.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -185,7 +185,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2002 Klaus Schmidinger.
+Copyright \(co 2003 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index 513bd5ddf..67bdc37bf 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2002 Klaus Schmidinger
+.\" Copyright (C) 2003 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.18 2003/04/26 11:54:35 kls Exp $
+.\" $Id: vdr.5 1.20 2003/05/29 11:58:57 kls Exp $
 .\"
-.TH vdr 5 "6 Dec 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -547,9 +547,7 @@ l l.
 <channel name> @is the "name" as in 'channels.conf' (for information only, may be left out)
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
-<table id>     @is a hex number that indicates the table this event is contained\
-in (if this is left empty or 0 this event will not be overwritten\
-or modified by data that comes from the DVB stream)
+<table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
 <title>        @is the title of the event
 <subtitle>     @is the subtitle (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
@@ -564,7 +562,7 @@ Written by Klaus Schmidinger.
 .SH REPORTING BUGS
 Report bugs to <vdr-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2002 Klaus Schmidinger.
+Copyright \(co 2003 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index 8bb907cf6..6a6c35dc1 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1,7 +1,7 @@
 /*
  * vdr.c: Video Disk Recorder main program
  *
- * Copyright (C) 2000 Klaus Schmidinger
+ * Copyright (C) 2000, 2003 Klaus Schmidinger
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,9 +20,9 @@
  *
  * The author can be reached at kls@cadsoft.de
  *
- * The project's page is at http://www.cadsoft.de/people/kls/vdr
+ * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.159 2003/05/24 15:17:38 kls Exp $
+ * $Id: vdr.c 1.160 2003/05/29 12:27:26 kls Exp $
  */
 
 #include <getopt.h>

From 40334f3e099de4faf87599c0511e003dbdc2ce80 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 1 Jun 2003 18:00:00 +0200
Subject: [PATCH 076/307] =?UTF-8?q?Version=201.2.0=20-=20Completed=20Greek?=
 =?UTF-8?q?=20language=20texts=20(thanks=20to=20Dimitrios=20Dimitrakos).?=
 =?UTF-8?q?=20-=20Completed=20Polish=20language=20texts=20(thanks=20to=20M?=
 =?UTF-8?q?ichael=20Rakowski).=20-=20Added=20a=20note=20about=20NPTL=20("N?=
 =?UTF-8?q?ative=20Posix=20Thread=20Library")=20to=20the=20INSTALL=20file?=
 =?UTF-8?q?=20=20=20(thanks=20to=20Jon=20Burgess=20for=20pointing=20this?=
 =?UTF-8?q?=20out).=20-=20Some=20corrections=20to=20the=20Finnish=20OSD=20?=
 =?UTF-8?q?texts=20(thanks=20to=20Jaakko=20Hyv=C3=A4tti).=20-=20Officially?=
 =?UTF-8?q?=20released=20as=20version=201.2.0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |  3 ++
 HISTORY      |  9 ++++++
 INSTALL      | 10 ++++++
 config.h     |  4 +--
 i18n.c       | 90 ++++++++++++++++++++++++++--------------------------
 5 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 085dcb163..ee0c0d4a7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -708,3 +708,6 @@ Antonio Ospite <ospite@studenti.unina.it>
 Karim Afifi <karim.afifi@free.fr>
  for reporting a problem with breaking off replay in case the user presses "Play"
  or "Pause" too soon after going into "Pause live video" mode
+
+Jon Burgess <mplayer@jburgess.uklinux.net>
+ for pointing out a problem with NPTL ("Native Posix Thread Library")
diff --git a/HISTORY b/HISTORY
index 914b39a04..4eca5f529 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2225,3 +2225,12 @@ Video Disk Recorder Revision History
 - Fixed an uninitialized variable in cDisplayChannel (thanks to Stefan Huelswitt).
 - Fixed a possible access of invalid file handles in cSIProcessor::Action()
   (thanks to Stefan Huelswitt).
+
+2003-06-01: Version 1.2.0
+
+- Completed Greek language texts (thanks to Dimitrios Dimitrakos).
+- Completed Polish language texts (thanks to Michael Rakowski).
+- Added a note about NPTL ("Native Posix Thread Library") to the INSTALL file
+  (thanks to Jon Burgess for pointing this out).
+- Some corrections to the Finnish OSD texts (thanks to Jaakko Hyv�tti).
+- Officially released as version 1.2.0.
diff --git a/INSTALL b/INSTALL
index cf66c5d37..2bae8e81f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,6 +4,16 @@ Installation of the Video Disk Recorder
 Version 1.2
 -----------
 
+IMPORTANT NOTE:
+---------------
+
+VDR currently doesn't work with NPTL ("Native Posix Thread Library").
+Either don't use NPTL, or set the environment variable
+
+  LD_ASSUME_KERNEL=2.4.1
+  
+before running VDR.
+
 Compiling and running the program:
 ----------------------------------
 
diff --git a/config.h b/config.h
index e34534b77..409e22fa6 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.162 2003/05/29 12:17:37 kls Exp $
+ * $Id: config.h 1.163 2003/05/31 09:10:58 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.0pre1"
+#define VDRVERSION  "1.2.0"
 #define VDRVERSNUM   10200  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/i18n.c b/i18n.c
index f2fa3c583..9b6c191d9 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.122 2003/05/29 10:38:51 kls Exp $
+ * $Id: i18n.c 1.125 2003/06/01 08:49:47 kls Exp $
  *
  * Translations provided by:
  *
@@ -217,9 +217,9 @@ const tI18nPhrase Phrases[] = {
     "Commandes d'enregistrement",
     "",// TODO
     "Tallennuskomennot",
-    "",// TODO
+    "Rozkazy Nagran",
     "�rdenes de grabaci�n",
-    "Entoles gia egrafes",// TODO
+    "Entoles gia egrafes",
     "Inspelningskommandon",
     "",// TODO
     "",// TODO
@@ -677,7 +677,7 @@ const tI18nPhrase Phrases[] = {
     "Ins�rt",
     "",// TODO
     "Lis��",
-    "",// TODO
+    "Wstawiac",
     "Insertar",
     "Isodos",
     "Infoga",
@@ -694,7 +694,7 @@ const tI18nPhrase Phrases[] = {
     "�craser",
     "",// TODO
     "Korvaa",
-    "",// TODO
+    "Przepisac",
     "Sobreescribir",
     "Epanagrafi",
     "Skriv �ver",
@@ -728,7 +728,7 @@ const tI18nPhrase Phrases[] = {
     "R�initialisation",
     "",//TODO
     "Alusta",
-    "",//TODO
+    "Reset",
     "Reiniciar",
     "Epanafora",
     "�terst�ll",
@@ -765,7 +765,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko ajastin?",
     "Usunac timer?",
     "�Eliminar timer?",
-    "Diagrafi programmitismou?",
+    "Diagrafi programmatismou?",
     "Ta bort timern?",
     "Sterg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
@@ -850,7 +850,7 @@ const tI18nPhrase Phrases[] = {
     "Perutaanko muokkaus?",
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
-    "Akirosi kopsimatos?",
+    "Akirosi epexsergasias?",
     "Avbryta redigeringen?",
     "Opresc editarea?",
     "V�g�st befejezni?",
@@ -1002,9 +1002,9 @@ const tI18nPhrase Phrases[] = {
     "Source",
     "",//TODO
     "L�hde",
+    "Zrodlo",
     "",//TODO
-    "",//TODO
-    "Pigi",//TODO
+    "Pigi",
     "K�lla",
     "",//TODO
     "",//TODO
@@ -1189,7 +1189,7 @@ const tI18nPhrase Phrases[] = {
     "Bande passante",
     "Bandwidth",
     "Kaistanleveys",
-    "Bandwidth",
+    "Szerokosc pasma",
     "Bandwidth",
     "Bandwidth",
     "Bandbredd",
@@ -1240,7 +1240,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulation",
     "Modulaatio",
-    "Modulation",
+    "Modulacja",
     "Modulation",
     "Modulation",
     "Modulation",
@@ -1257,7 +1257,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmission",
     "L�hetystila",
-    "Transmission",
+    "Transmisja",
     "Transmission",
     "Transmission",
     "Transmission",
@@ -1291,7 +1291,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchie",
     "Hierarchy",
     "Hierarkia",
-    "Hierarchy",
+    "Hierachia",
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
@@ -1582,7 +1582,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne non disponible!",
     "",//TODO
     "Kanava ei ole k�ytett�viss�!",
-    "",//TODO
+    "Kanal jest niedostepny!",
     "!Canal no disponible!",
     "To kanali den ine diathesimo",
     "Kanalen ej tillg�nglig!",
@@ -1599,9 +1599,9 @@ const tI18nPhrase Phrases[] = {
     "Caract�ristiques des cha�nes ne sont pas uniques",
     "",//TODO
     "Kanava-asetukset eiv�t ole yksil�lliset!",
-    "",//TODO
+    "Nastawy kanalu sa niejednoznaczne!",
     "!Propiedades de canal duplicadas!",
-    "Ta kanalia stin lista den ine monadika!",
+    "Oi rithmiseis tou kanaliou simpiptoun me allo!",
     "Kanalinst�llningarna �r ej unika!",
     "",//TODO
     "",//TODO
@@ -1618,7 +1618,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava lukittu (tallennus k�ynniss�)!",
     "Kanal zablokowany (nagrywanie w toku)!",
     "�Canal bloqueado (grabando)!",
-    "To kanali ine klidomeno (Ginete egrafi)!",
+    "To kanali ine apasxolimeno (Ginete egrafi)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
     "Canal blocat (inregistrare)!",
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
@@ -1650,9 +1650,9 @@ const tI18nPhrase Phrases[] = {
     "Pas de marques d'�dition d�finies!",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Brak znakow montazowych!",
     "Muokkausmerkinn�t puuttuvat",
-    "",//TODO
+    "Den exoun oristei simeia gia epexsergasia",
     "Det finns inga redigeringsm�rken",//TODO
     "",//TODO
     "",//TODO
@@ -1735,7 +1735,7 @@ const tI18nPhrase Phrases[] = {
     "Impossible d'ouvrir le menu CAM!",
     "",//TODO
     "Salausmoduulin valikko ei saatavilla",
-    "",//TODO
+    "CAM-Menu niedostepne!",
     "�No pudeo acceder al men� de la CAM!",
     "Den mpori na aniksi to CAM menou!",
     "Det g�r inte att �ppna CAM menyn!",
@@ -1752,7 +1752,7 @@ const tI18nPhrase Phrases[] = {
     "Impossible de r�initialiser la CAM!",
     "",//TODO
     "Salausmoduulin alustus ep�onnistui!",
-    "",//TODO
+    "Nieudany CAM-Reset!",
     "�No puedo reiniciar la CAM!",
     "Adinato na gini epanafora sto CAM",
     "Kan inte �terst�lla CAM!",
@@ -1769,7 +1769,7 @@ const tI18nPhrase Phrases[] = {
     "La CAM a �t� r�initialis�e",
     "",//TODO
     "Salausmoduuli alustettu",
-    "",//TODO
+    "CAM-Reset wykonany!",
     "CAM reiniciada",
     "Sto CAM egine apanafora",
     "CA modulen har �terst�llts",
@@ -1922,7 +1922,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Plugins",
-    "Laajennukset",
+    "Laajennokset",
     "Plugins",
     "Plugins",
     "Plugins",
@@ -1939,7 +1939,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Plugin",
-    "Laajennus",
+    "Laajennos",
     "Plugin",
     "Plugin",
     "Plugin",
@@ -2400,7 +2400,7 @@ const tI18nPhrase Phrases[] = {
     "Priorit� des pauses",
     "",// TODO
     "Keskeytyksen prioriteetti",
-    "",// TODO
+    "Priorytet przerwy",
     "",// TODO
     "",// TODO
     "Prioritet f�r direktinspelning",
@@ -2417,7 +2417,7 @@ const tI18nPhrase Phrases[] = {
     "Dur�e de vie des pauses (j)",
     "",// TODO
     "Keskeytyksen elinik� (d)",
-    "",// TODO
+    "Okres trwania przerwy (d)",
     "",// TODO
     "",// TODO
     "Livstid f�r direktinspelning (dagar)",
@@ -2485,7 +2485,7 @@ const tI18nPhrase Phrases[] = {
     "Dur�e enregistr. imm�diat (min)",
     "",//TODO
     "Pikatallennuksen kesto (min)",
-    "",//TODO
+    "Dlugosc bezposredniego nagrania (min)",
     "Tiempo de grabaci�n instant�nea (min)",
     "Stigmiees egrafes xronos (lepta)",
     "Direktinspelning l�ngd (min)",
@@ -2587,7 +2587,7 @@ const tI18nPhrase Phrases[] = {
     "ID de reprise",
     "Resume ID",// TODO
     "Tallenteen paluutunniste",
-    "Resume ID",// TODO
+    "ID odtwarzania",
     "Continuar ID",
     "Resume ID",// TODO
     "�teruppta ID",
@@ -2691,7 +2691,7 @@ const tI18nPhrase Phrases[] = {
     " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~",
     "",// TODO
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
-    "",// TODO
+    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
     "",// TODO
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
@@ -2896,7 +2896,7 @@ const tI18nPhrase Phrases[] = {
     "('Menu' pour passer cette touche)",
     "",// TODO
     "n�pp�imen puuttuessa paina 'Valikko'",
-    "",// TODO
+    "(Nacisnac 'Menu' by ominac klawisz)",
     "Pulse 'Menu' para saltarse esta tecla",
     "Pata 'Menou' gia prosperasi aftou tou pliktrou",
     "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
@@ -3135,7 +3135,7 @@ const tI18nPhrase Phrases[] = {
     "Lecture",
     "",// TODO
     "Toista",
-    "",// TODO
+    "Odtworzenie",
     "Reproducir",
     "Anametadosi",
     "Spela upp",
@@ -3152,7 +3152,7 @@ const tI18nPhrase Phrases[] = {
     "Pause",
     "",// TODO
     "Keskeyt�",
-    "",// TODO
+    "Przerwa",
     "Pausa",
     "Dialima",
     "Pausa",
@@ -3169,7 +3169,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "",// TODO
     "Lopeta",
-    "",// TODO
+    "Stop",
     "Parar",
     "Terma",
     "Stoppa",
@@ -3186,7 +3186,7 @@ const tI18nPhrase Phrases[] = {
     "Enregistrement",
     "",// TODO
     "Tallenna",
-    "",// TODO
+    "Nagrywac",
     "Grabar",
     "Egrafi",
     "Spela in",
@@ -3203,7 +3203,7 @@ const tI18nPhrase Phrases[] = {
     "Avance rapide",
     "",// TODO
     "Pikakelaus >>",
-    "",// TODO
+    "Naprzod",
     "Adelante r�pido",
     "Girisma mprosta",
     "Snabbspolning fram�t",
@@ -3220,7 +3220,7 @@ const tI18nPhrase Phrases[] = {
     "Retour rapide",
     "",// TODO
     "Pikakelaus <<",
-    "",// TODO
+    "Wstecz",
     "Atr�s r�pido",
     "Girisma piso",
     "Snabbspolning bak�t",
@@ -3254,7 +3254,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne+",
     "",// TODO
     "Kanava +",
-    "",// TODO
+    "Kanal+",
     "Canal +",
     "Kanali+",
     "Kanal+",
@@ -3271,7 +3271,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne-",
     "",// TODO
     "Kanava -",
-    "",// TODO
+    "Kanal-",
     "Canal -",
     "Kanali-",
     "Kanal-",
@@ -3374,7 +3374,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "pois",
-    "",// TODO
+    "wyl.",
     "off",
     "klisto",
     "av",
@@ -3391,7 +3391,7 @@ const tI18nPhrase Phrases[] = {
     "aucun",
     "",// TODO
     "tyhj�",
-    "",// TODO
+    "zaden",
     "ninguno",
     "kanena",
     "ingen",
@@ -3408,7 +3408,7 @@ const tI18nPhrase Phrases[] = {
     "auto",
     "",// TODO
     "auto",
-    "",// TODO
+    "auto",
     "auto",
     "aftomato",
     "automatisk",
@@ -3680,7 +3680,7 @@ const tI18nPhrase Phrases[] = {
     "Pause de l'�mission en direct...",
     "",// TODO
     "Keskeytet��n l�hetys...",
-    "",// TODO
+    "Zatrzymany program biezacy...",
     "Emisi�n en directo parada...",
     "",// TODO
     "Pausar direktinspelningen",
@@ -3696,8 +3696,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Ce plugin n'a pas de param�tres!",
     "",// TODO
-    "T�ll� laajennuksella ei ole asetuksia!",
-    "",// TODO
+    "T�ll� laajennoksella ei ole asetuksia!",
+    "Ten plugin niema parametrow!",
     "Este plugin no admite configuraci�n",
     "Afto to plugin den exi parametrous",
     "Den h�r modulen har inga parametrar",

From 64ddfca3b0e37d877bb3cb247fb8b2ad810dd47f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 9 Jun 2003 18:00:00 +0200
Subject: [PATCH 077/307] Version 1.2.1 - Fixed OSD access in case none of the
 devices provides one (thanks to Axel   Gruber for reporting this one). -
 Fixed editing channels ('timers.conf' was not written after a channel has  
 been modified, which could result in errors upon the next start of VDR). -
 Fixed a crash when canceling a newly created timer (thanks to Thomas Schmidt 
  for reporting this one). - Completed Hungarian language texts (thanks to
 Istvan Koenigsberger and Guido   Josten). - Fixed device handling in the
 CICAM menu in case a VDR instance was started   with a specific device using
 the -D option (thanks to Gerald Raaf for reporting   ths one). - Initializing
 the current channel to '1' to avoid a crash in creating a new   timer in case
 there is no device in the system that can actually receive any   channel
 (thanks to Malcolm Caldwell for reporting this one). - Some corrections to
 the Finnish OSD texts (thanks to Niko Tarnanen and Rolf   Ahrenberg).

---
 CONTRIBUTORS |  8 ++++++
 HISTORY      | 19 +++++++++++++
 config.h     |  6 ++--
 device.c     |  4 +--
 i18n.c       | 60 ++++++++++++++++++++--------------------
 menu.c       | 78 +++++++++++++++++++++-------------------------------
 osd.c        | 22 +++++++++------
 svdrp.c      |  3 +-
 8 files changed, 110 insertions(+), 90 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ee0c0d4a7..7e5886d23 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -90,6 +90,7 @@ Peter Hofmann <software@pxh.de>
 Axel Gruber <axel@agm.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
  for helping to debug support for Viaccess CAMs
+ for reporting a problem in case none of the devices provides an OSD
 
 Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
  for translating OSD texts to the Dutch language
@@ -370,6 +371,8 @@ Gerald Raaf <graaf@attglobal.net>
  for helping to fix the still picture workaround in case the progress display
  is active
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+ for reporting a problem in device handling in the CICAM menu in case a VDR
+ instance was started with a specific device using the -D option
 
 Andreas Roedl <flood@flood-net.de>
  for adding some DVB-T channels for Berlin (Germany) to channels.conf.terr
@@ -617,6 +620,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
+ for reporting a crash in creating a new timer in case there is no device in the
+ system that can actually receive any channel
 
 Ludwig Nussel <ludwig.nussel@web.de>
  for making the LIRC thread avoid high CPU load in case the connection to LIRC gets lost
@@ -711,3 +716,6 @@ Karim Afifi <karim.afifi@free.fr>
 
 Jon Burgess <mplayer@jburgess.uklinux.net>
  for pointing out a problem with NPTL ("Native Posix Thread Library")
+
+Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ for reporting a crash when cancelling a newly created timer
diff --git a/HISTORY b/HISTORY
index 4eca5f529..c1a82226b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2234,3 +2234,22 @@ Video Disk Recorder Revision History
   (thanks to Jon Burgess for pointing this out).
 - Some corrections to the Finnish OSD texts (thanks to Jaakko Hyv�tti).
 - Officially released as version 1.2.0.
+
+2003-06-09: Version 1.2.1
+
+- Fixed OSD access in case none of the devices provides one (thanks to Axel
+  Gruber for reporting this one).
+- Fixed editing channels ('timers.conf' was not written after a channel has
+  been modified, which could result in errors upon the next start of VDR).
+- Fixed a crash when cancelling a newly created timer (thanks to Thomas Schmidt
+  for reporting this one).
+- Completed Hungarian language texts (thanks to Istvan Koenigsberger and Guido
+  Josten).
+- Fixed device handling in the CICAM menu in case a VDR instance was started
+  with a specific device using the -D option (thanks to Gerald Raaf for reporting
+  ths one).
+- Initializing the current channel to '1' to avoid a crash in creating a new
+  timer in case there is no device in the system that can actually receive any
+  channel (thanks to Malcolm Caldwell for reporting this one).
+- Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf
+  Ahrenberg).
diff --git a/config.h b/config.h
index 409e22fa6..29c058efa 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.163 2003/05/31 09:10:58 kls Exp $
+ * $Id: config.h 1.164 2003/06/06 12:28:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.0"
-#define VDRVERSNUM   10200  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.1"
+#define VDRVERSNUM   10201  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 58f9bf0a9..f43870ad4 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.44 2003/05/25 10:57:59 kls Exp $
+ * $Id: device.c 1.45 2003/06/08 09:19:59 kls Exp $
  */
 
 #include "device.h"
@@ -28,7 +28,7 @@
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
 int cDevice::nextCardIndex = 0;
-int cDevice::currentChannel = 0;
+int cDevice::currentChannel = 1;
 cDevice *cDevice::device[MAXDEVICES] = { NULL };
 cDevice *cDevice::primaryDevice = NULL;
 
diff --git a/i18n.c b/i18n.c
index 9b6c191d9..f50a2301d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.125 2003/06/01 08:49:47 kls Exp $
+ * $Id: i18n.c 1.128 2003/06/09 09:49:29 kls Exp $
  *
  * Translations provided by:
  *
@@ -222,7 +222,7 @@ const tI18nPhrase Phrases[] = {
     "Entoles gia egrafes",
     "Inspelningskommandon",
     "",// TODO
-    "",// TODO
+    "Parancsok a felvett filmekhez",
     "Ordres de gravaci�",
   },
   { "Edit channel",
@@ -733,7 +733,7 @@ const tI18nPhrase Phrases[] = {
     "Epanafora",
     "�terst�ll",
     "",//TODO
-    "",//TODO
+    "Reset",
     "Reiniciar",
   },
   // Confirmations:
@@ -932,7 +932,7 @@ const tI18nPhrase Phrases[] = {
     "Pressione qualquer tecla para cancelar",
     "Appuyez sur une touche pour annuler l'arr�t",
     "Trykk en tast for ikke � sl� av",
-    "Peru sammutus painamalla jotain n�pp�int�",
+    "Peru sammutus painamalla mit� tahansa n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
     "Pulse una tecla para interrumpir apagar",
     "Piese ena pliktro na akirothei o termatismos",
@@ -1007,7 +1007,7 @@ const tI18nPhrase Phrases[] = {
     "Pigi",
     "K�lla",
     "",//TODO
-    "",//TODO
+    "Forr�s",
     "Origen",
   },
   { "Srate",
@@ -1587,7 +1587,7 @@ const tI18nPhrase Phrases[] = {
     "To kanali den ine diathesimo",
     "Kanalen ej tillg�nglig!",
     "",//TODO
-    "",//TODO
+    "A csatorna nem el�rhet�",
     "Canal no disponible!",
   },
   { "Channel settings are not unique!",
@@ -1604,7 +1604,7 @@ const tI18nPhrase Phrases[] = {
     "Oi rithmiseis tou kanaliou simpiptoun me allo!",
     "Kanalinst�llningarna �r ej unika!",
     "",//TODO
-    "",//TODO
+    "A csatornabe�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
   },
   { "Channel locked (recording)!",
@@ -1655,7 +1655,7 @@ const tI18nPhrase Phrases[] = {
     "Den exoun oristei simeia gia epexsergasia",
     "Det finns inga redigeringsm�rken",//TODO
     "",//TODO
-    "",//TODO
+    "A v�g�pont nincs kijel�lve",//TODO
     "No hi ha marques d'edici� definides",
   },
   { "Can't start editing process!",
@@ -1740,7 +1740,7 @@ const tI18nPhrase Phrases[] = {
     "Den mpori na aniksi to CAM menou!",
     "Det g�r inte att �ppna CAM menyn!",
     "",//TODO
-    "",//TODO
+    "A CAM-Men� nem nyithat�",
     "No puc obrir el men� de la CAM!",
   },
   { "Can't reset CAM!",
@@ -1757,7 +1757,7 @@ const tI18nPhrase Phrases[] = {
     "Adinato na gini epanafora sto CAM",
     "Kan inte �terst�lla CAM!",
     "",//TODO
-    "",//TODO
+    "A CAM-Reset nem siker�lt",
     "No puc reiniciar la CAM!",
   },
   { "CAM has been reset",
@@ -1774,7 +1774,7 @@ const tI18nPhrase Phrases[] = {
     "Sto CAM egine apanafora",
     "CA modulen har �terst�llts",
     "",//TODO
-    "",//TODO
+    "A CAM vissza lett �ll�tva",
     "CAM reiniciada",
   },
   // Setup pages:
@@ -2405,7 +2405,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Prioritet f�r direktinspelning",
     "",// TODO
-    "",// TODO
+    "Sz�net priorit�s",
     "Prioritat de la pausa",
   },
   { "Setup.Recording$Pause lifetime (d)",
@@ -2422,7 +2422,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Livstid f�r direktinspelning (dagar)",
     "",// TODO
-    "",// TODO
+    "Sz�net �lettartama",
     "Durada de la pausa (d)",
   },
   { "Setup.Recording$Use episode name",
@@ -2592,7 +2592,7 @@ const tI18nPhrase Phrases[] = {
     "Resume ID",// TODO
     "�teruppta ID",
     "Resume ID",// TODO
-    "Resume ID",// TODO
+    "Lej�tsz�s ID",
     "ID de Continuar",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
@@ -2696,7 +2696,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
-    " a�bcde�fghijklmno��pqrstu��vwxyz0123456789-.,#~",
+    " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
   },
   // Learning keys:
@@ -2742,7 +2742,7 @@ const tI18nPhrase Phrases[] = {
     "Pressione qualquer tecla do telecomando",
     "Appuyer sur une touche de la t�l�commande",
     "Trykk en av tastene p� fjernkontrollen",
-    "Paina jotain kaukos��timen n�pp�int�",
+    "Paina mit� tahansa kaukos��timen n�pp�int�",
     "Nacisnac klawisz pilota",
     "Pulse una tecla en el telemando",
     "Piese ena pliktro sto tilexiristirio",
@@ -2901,7 +2901,7 @@ const tI18nPhrase Phrases[] = {
     "Pata 'Menou' gia prosperasi aftou tou pliktrou",
     "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
     "",// TODO
-    "",// TODO
+    "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
     "Premeu 'Men�' per obviar aquesta tecla",
   },
   { "Phase 3: Saving key codes",
@@ -3140,7 +3140,7 @@ const tI18nPhrase Phrases[] = {
     "Anametadosi",
     "Spela upp",
     "",// TODO
-    "",// TODO
+    "Lej�tsz�s",
     "Reproduir",
   },
   { "Pause",
@@ -3157,7 +3157,7 @@ const tI18nPhrase Phrases[] = {
     "Dialima",
     "Pausa",
     "",// TODO
-    "",// TODO
+    "Sz�net",
     "Pausa",
   },
   { "Stop",
@@ -3174,7 +3174,7 @@ const tI18nPhrase Phrases[] = {
     "Terma",
     "Stoppa",
     "",// TODO
-    "",// TODO
+    "Stop",
     "Aturar",
   },
   { "Record",
@@ -3191,7 +3191,7 @@ const tI18nPhrase Phrases[] = {
     "Egrafi",
     "Spela in",
     "",// TODO
-    "",// TODO
+    "Felvenni",
     "Gravar",
   },
   { "FastFwd",
@@ -3208,7 +3208,7 @@ const tI18nPhrase Phrases[] = {
     "Girisma mprosta",
     "Snabbspolning fram�t",
     "",// TODO
-    "",// TODO
+    "El�re p�rgetni",
     "Endavant r�pidament",
   },
   { "FastRew",
@@ -3225,7 +3225,7 @@ const tI18nPhrase Phrases[] = {
     "Girisma piso",
     "Snabbspolning bak�t",
     "",// TODO
-    "",// TODO
+    "Vissza p�rgetni",
     "Enrera r�pidament",
   },
   { "Power",
@@ -3259,7 +3259,7 @@ const tI18nPhrase Phrases[] = {
     "Kanali+",
     "Kanal+",
     "",// TODO
-    "",// TODO
+    "Csatorna+",
     "Canal +",
   },
   { "Channel-",
@@ -3276,7 +3276,7 @@ const tI18nPhrase Phrases[] = {
     "Kanali-",
     "Kanal-",
     "",// TODO
-    "",// TODO
+    "Csatorna-",
     "Canal -",
   },
   { "Volume+",
@@ -3379,7 +3379,7 @@ const tI18nPhrase Phrases[] = {
     "klisto",
     "av",
     "",// TODO
-    "",// TODO
+    "ki",
     "off",
   },
   { "none",
@@ -3396,7 +3396,7 @@ const tI18nPhrase Phrases[] = {
     "kanena",
     "ingen",
     "",// TODO
-    "",// TODO
+    "semmi",
     "cap",
   },
   { "auto",
@@ -3413,7 +3413,7 @@ const tI18nPhrase Phrases[] = {
     "aftomato",
     "automatisk",
     "",// TODO
-    "",// TODO
+    "auto",
     "auto",
   },
   { "top",
@@ -3685,7 +3685,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Pausar direktinspelningen",
     "",// TODO
-    "",// TODO
+    "Az �l� ad�s meg�ll�tva...",
     "Pausa d'emissi� en directe...",
   },
   { "This plugin has no setup parameters!",
@@ -3702,7 +3702,7 @@ const tI18nPhrase Phrases[] = {
     "Afto to plugin den exi parametrous",
     "Den h�r modulen har inga parametrar",
     "",// TODO
-    "",// TODO
+    "Ennek a plugin-nak nincs setup-parametere!",
     "Aquest plugin no admet configuraci�!",
    },
   { NULL }
diff --git a/menu.c b/menu.c
index ecf2493c4..5a5093458 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.253 2003/05/30 09:53:57 kls Exp $
+ * $Id: menu.c 1.256 2003/06/07 12:31:57 kls Exp $
  */
 
 #include "menu.h"
@@ -615,6 +615,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
            if (channel) {
               *channel = data;
               isyslog("edited channel %d %s", channel->Number(), data.ToText());
+              Timers.Save();
               state = osBack;
               }
            else {
@@ -834,21 +835,21 @@ class cMenuEditTimer : public cOsdMenu {
   cTimer *timer;
   cTimer data;
   int channel;
-  bool deleteIfCancelled;
+  bool addIfConfirmed;
   cMenuEditDateItem *firstday;
   void SetFirstDayItem(void);
 public:
-  cMenuEditTimer(int Index, bool New = false);
+  cMenuEditTimer(cTimer *Timer, bool New = false);
   virtual ~cMenuEditTimer();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuEditTimer::cMenuEditTimer(int Index, bool New)
+cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
   firstday = NULL;
-  timer = Timers.Get(Index);
-  deleteIfCancelled = New;
+  timer = Timer;
+  addIfConfirmed = New;
   if (timer) {
      data = *timer;
      if (New)
@@ -869,12 +870,8 @@ cMenuEditTimer::cMenuEditTimer(int Index, bool New)
 
 cMenuEditTimer::~cMenuEditTimer()
 {
-  if (timer && deleteIfCancelled) {
-     int Index = timer->Index();
-     Timers.Del(timer);
-     Timers.Save();
-     isyslog("timer %d deleted", Index + 1);
-     }
+  if (timer && addIfConfirmed)
+     delete timer; // apparently it wasn't confirmed
   Timers.DecBeingEdited();
 }
 
@@ -908,14 +905,18 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                           }
                        if (!*data.file)
                           strcpy(data.file, data.Channel()->Name());
-                       if (timer && memcmp(timer, &data, sizeof(data)) != 0) {
-                          *timer = data;
-                          if (timer->active)
-                             timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
+                       if (timer) {
+                          if (memcmp(timer, &data, sizeof(data)) != 0) {
+                             *timer = data;
+                             if (timer->active)
+                                timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
+                             }
+                          if (addIfConfirmed)
+                             Timers.Add(timer);
                           Timers.Save();
-                          isyslog("timer %d modified (%s)", timer->Index() + 1, timer->active ? "active" : "inactive");
+                          isyslog("timer %d %s (%s)", timer->Index() + 1, addIfConfirmed ? "added" : "modified", timer->active ? "active" : "inactive");
+                          addIfConfirmed = false;
                           }
-                       deleteIfCancelled = false;
                      }
                      return osBack;
        case kRed:
@@ -1033,19 +1034,14 @@ eOSState cMenuTimers::Edit(void)
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   isyslog("editing timer %d", CurrentTimer()->Index() + 1);
-  return AddSubMenu(new cMenuEditTimer(CurrentTimer()->Index()));
+  return AddSubMenu(new cMenuEditTimer(CurrentTimer()));
 }
 
 eOSState cMenuTimers::New(void)
 {
   if (HasSubMenu())
      return osContinue;
-  cTimer *timer = new cTimer;
-  Timers.Add(timer);
-  Add(new cMenuTimerItem(timer), true);
-  Timers.Save();
-  isyslog("timer %d added", timer->Index() + 1);
-  return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
+  return AddSubMenu(new cMenuEditTimer(new cTimer, true));
 }
 
 eOSState cMenuTimers::Delete(void)
@@ -1094,8 +1090,7 @@ eOSState cMenuTimers::Summary(void)
 
 eOSState cMenuTimers::ProcessKey(eKeys Key)
 {
-  cTimer *ti = HasSubMenu() ? CurrentTimer() : NULL;
-  int TimerNumber = ti ? ti->Index() : -1;
+  int TimerNumber = HasSubMenu() ? Count() : -1;
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1112,9 +1107,9 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        default: break;
        }
      }
-  if (TimerNumber >= 0 && !HasSubMenu() && !Timers.Get(TimerNumber)) {
-     // a newly created timer wasn't confirmed with Ok
-     cOsdMenu::Del(Current());
+  if (TimerNumber >= 0 && !HasSubMenu() && Timers.Get(TimerNumber)) {
+     // a newly created timer was confirmed with Ok
+     Add(new cMenuTimerItem(Timers.Get(TimerNumber)), true);
      Display();
      }
   return state;
@@ -1274,16 +1269,11 @@ eOSState cMenuWhatsOn::Record(void)
   if (item) {
      cTimer *timer = new cTimer(item->eventInfo);
      cTimer *t = Timers.GetTimer(timer);
-     if (!t) {
-        Timers.Add(timer);
-        Timers.Save();
-        isyslog("timer %d added", timer->Index() + 1);
-        }
-     else {
+     if (t) {
         delete timer;
         timer = t;
         }
-     return AddSubMenu(new cMenuEditTimer(timer->Index(), !t));
+     return AddSubMenu(new cMenuEditTimer(timer, !t));
      }
   return osContinue;
 }
@@ -1408,16 +1398,11 @@ eOSState cMenuSchedule::Record(void)
   if (item) {
      cTimer *timer = new cTimer(item->eventInfo);
      cTimer *t = Timers.GetTimer(timer);
-     if (!t) {
-        Timers.Add(timer);
-        Timers.Save();
-        isyslog("timer %d added", timer->Index() + 1);
-        }
-     else {
+     if (t) {
         delete timer;
         timer = t;
         }
-     return AddSubMenu(new cMenuEditTimer(timer->Index(), !t));
+     return AddSubMenu(new cMenuEditTimer(timer, !t));
      }
   return osContinue;
 }
@@ -2124,8 +2109,9 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
   for (int d = 0; d < cDevice::NumDevices(); d++) {
       for (int i = 0; i < 2; i++) {
           char buffer[32];
-          snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), d + 1, i + 1);
-          Add(new cMenuEditCaItem(buffer, &data.CaCaps[d][i]));
+          int CardIndex = cDevice::GetDevice(d)->CardIndex();
+          snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, i + 1);
+          Add(new cMenuEditCaItem(buffer, &data.CaCaps[CardIndex][i]));
           }
       }
   SetHelpKeys();
diff --git a/osd.c b/osd.c
index 9d8b72db6..8f3343b83 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.42 2003/05/03 14:46:38 kls Exp $
+ * $Id: osd.c 1.43 2003/06/04 16:13:00 kls Exp $
  */
 
 #include "osd.h"
@@ -99,6 +99,8 @@ void cOsd::Open(int w, int h)
   //XXX
   osd = OpenRaw(x, y);
   //XXX TODO this should be transferred to the places where the individual windows are requested (there's too much detailed knowledge here!)
+  if (!osd)
+     return;
   if (h / lineHeight == 5) { //XXX channel display
      osd->Create(0,              0, w, h, 4);
      }
@@ -145,7 +147,8 @@ void cOsd::Clear(void)
   Fill(0, 0, cols, rows, clrBackground);
   refresh();
 #else
-  osd->Clear();
+  if (osd)
+     osd->Clear();
 #endif
 }
 
@@ -161,14 +164,16 @@ void cOsd::Fill(int x, int y, int w, int h, eDvbColor color)
       }
   wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
 #else
-  osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
+  if (osd)
+     osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
 #endif
 }
 
 void cOsd::SetBitmap(int x, int y, const cBitmap &Bitmap)
 {
 #ifndef DEBUG_OSD
-  osd->SetBitmap(x, y, Bitmap);
+  if (osd)
+     osd->SetBitmap(x, y, Bitmap);
 #endif
 }
 
@@ -200,7 +205,7 @@ int cOsd::Width(unsigned char c)
 #ifdef DEBUG_OSD
   return 1;
 #else
-  return osd->Width(c);
+  return osd ? osd->Width(c) : 1;
 #endif
 }
 
@@ -209,7 +214,7 @@ int cOsd::WidthInCells(const char *s)
 #ifdef DEBUG_OSD
   return strlen(s);
 #else
-  return (osd->Width(s) + charWidth - 1) / charWidth;
+  return osd ? (osd->Width(s) + charWidth - 1) / charWidth : strlen(s);
 #endif
 }
 
@@ -218,7 +223,7 @@ eDvbFont cOsd::SetFont(eDvbFont Font)
 #ifdef DEBUG_OSD
   return Font;
 #else
-  return osd->SetFont(Font);
+  return osd ? osd->SetFont(Font) : Font;
 #endif
 }
 
@@ -231,7 +236,8 @@ void cOsd::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorB
   wmove(window, y, x); // ncurses wants 'y' before 'x'!
   waddnstr(window, s, cols - x);
 #else
-  osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
+  if (osd)
+     osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
 #endif
 }
 
diff --git a/svdrp.c b/svdrp.c
index 6dafddd15..e9f22161a 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.51 2003/04/27 14:21:07 kls Exp $
+ * $Id: svdrp.c 1.52 2003/06/06 13:30:52 kls Exp $
  */
 
 #include "svdrp.h"
@@ -790,6 +790,7 @@ void cSVDRP::CmdMODC(const char *Option)
                  Channels.ReNumber();
                  Channels.Save();
                  isyslog("modifed channel %d %s", channel->Number(), channel->ToText());
+                 Timers.Save();
                  Reply(250, "%d %s", channel->Number(), channel->ToText());
                  }
               else

From 6c2c3ace8bfe8918b516cc155fbf1104baa107f9 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Aug 2003 18:00:00 +0200
Subject: [PATCH 078/307] =?UTF-8?q?Version=201.2.2=20-=20Fixed=20a=20bug?=
 =?UTF-8?q?=20in=20channel=20switching=20after=20Left/Right=20has=20been?=
 =?UTF-8?q?=20pressed=20(thanks=20to=20=20=20Michael=20Walle=20for=20repor?=
 =?UTF-8?q?ting=20this=20one).=20-=20Improved=20channel=20switching=20in?=
 =?UTF-8?q?=20case=20of=20numerical=20input=20by=20switching=20as=20soon?=
 =?UTF-8?q?=20as=20=20=20the=20channel=20is=20unique=20(suggested=20by=20J?=
 =?UTF-8?q?aakko=20Hyv=C3=A4tti).=20-=20Fixed=20creating=20a=20new=20chann?=
 =?UTF-8?q?el=20in=20the=20"Channels"=20menu=20in=20case=20the=20'channels?=
 =?UTF-8?q?.conf'=20=20=20contains=20':@nnn'=20lines=20with=20no=20text=20?=
 =?UTF-8?q?(thanks=20to=20Guy=20Roussin=20for=20reporting=20this=20=20=20o?=
 =?UTF-8?q?ne).=20-=20Changed=20the=20behaviour=20of=20the=20'0'=20key=20i?=
 =?UTF-8?q?n=20normal=20viewing=20mode=20so=20that=20a=20channel=20=20=20o?=
 =?UTF-8?q?nly=20qualifies=20as=20"previous"=20if=20it=20has=20been=20sele?=
 =?UTF-8?q?cted=20for=20at=20least=203=20seconds=20=20=20(suggested=20by?=
 =?UTF-8?q?=20Thomas=20Keil).=20-=20Now=20clearing=20the=20channel=20info?=
 =?UTF-8?q?=20display=20when=20entering=20numeric=20keys=20to=20switch=20?=
 =?UTF-8?q?=20=20channels=20(suggested=20by=20Guy=20Roussin).=20-=20Added?=
 =?UTF-8?q?=20missing=20I18N=20entry=20for=20"Ppid"=20(thanks=20to=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).=20-=20Fixed=20handling=20the=20color=20buttons?=
 =?UTF-8?q?=20in=20the=20"Edit=20channel"=20menu=20(thanks=20to=20Thomas?=
 =?UTF-8?q?=20=20=20Keil=20for=20reporting=20this=20one).=20-=20Fixed=20an?=
 =?UTF-8?q?=20occasional=20"Broken=20pipe"=20error=20in=20SVDRP=20connecti?=
 =?UTF-8?q?ons=20(thanks=20to=20Gerhard=20=20=20Steiner=20for=20reporting?=
 =?UTF-8?q?=20this=20one).=20-=20Fixed=20checking=20CA=20capabilities=20wi?=
 =?UTF-8?q?th=20the=20dvb-kernel=20driver=20(thanks=20to=20Kenneth=20=20?=
 =?UTF-8?q?=20Aafl=C3=B8y).=20-=20Fixed=20selecting=20the=20device,=20beca?=
 =?UTF-8?q?use=20sometimes=20an=20FTA=20recording=20terminated=20a=20=20?=
 =?UTF-8?q?=20CA=20recording=20(thanks=20to=20Emil=20Naepflein).=20-=20Fix?=
 =?UTF-8?q?ed=20a=20possible=20crash=20in=20case=20a=20VFAT=20file=20syste?=
 =?UTF-8?q?m=20is=20used=20without=20compiling=20VDR=20=20=20with=20VFAT?=
 =?UTF-8?q?=3D1=20(thanks=20to=20Ernst=20F=C3=BCrst=20for=20reporting=20th?=
 =?UTF-8?q?is=20one).=20-=20Now=20the=20program=20uses=20the=20values=20of?=
 =?UTF-8?q?=20VIDEODIR=20and=20PLUGINDIR=20defined=20in=20Makefile=20=20?=
 =?UTF-8?q?=20or=20Make.config=20as=20defaults=20(thanks=20to=20Steffen=20?=
 =?UTF-8?q?Barszus).=20-=20Added=20the=20usual=20menu=20timeout=20to=20the?=
 =?UTF-8?q?=20CAM=20menus.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         | 25 +++++++++++++++++
 HISTORY              | 29 ++++++++++++++++++++
 MANUAL               |  3 ++-
 Make.config.template |  3 ++-
 Makefile             |  5 +++-
 channels.conf        |  6 ++---
 ci.c                 |  4 +--
 config.h             |  6 ++---
 device.c             | 39 +++++++++++++++++----------
 i18n.c               | 19 ++++++++++++-
 menu.c               | 64 +++++++++++++++++++++++++++++++++++---------
 menu.h               |  4 ++-
 recorder.c           |  8 +-----
 svdrp.c              |  4 +--
 vdr.c                | 14 +++++++---
 videodir.c           |  4 +--
 16 files changed, 182 insertions(+), 55 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7e5886d23..6b199f258 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -518,6 +518,7 @@ Gerhard Steiner <steiner@mail.austria.com>
  for fixing resume file handling in case the resume.vdr file can't be written
  for reporting a problem with newly created timers in case they are not confirmed
  with "Ok"
+ for reporting an occasional "Broken pipe" error in SVDRP connections
 
 Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
@@ -525,12 +526,16 @@ Jaakko Hyv
  for fixing recording overlapping timers on the same channel in case
  DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and/or DO_MULTIPLE_RECORDINGS is not defined
  for fixing the minimum lifespan of deleted recordings
+ for suggesting to improve channel switching in case of numerical input by switching
+ as soon as the channel is unique
 
 Dennis Noordsij <dennis.noordsij@wiral.com>
  for reporting a small glitch when switching channels
 
 Steffen Barszus <st_barszus@gmx.de>
  for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
+ for making the program use the values of VIDEODIR and PLUGINDIR defined in Makefile
+ or Makefile.config as defaults
 
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
@@ -550,6 +555,8 @@ Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
  for reporting a bug in handling channels in the "Channels" menu in case there are
  ':@nnn' group separators without names
+ for suggesting to clear the channel info display when entering numeric keys to
+ switch channels
 
 Georg Hitsch <georg@hitsch.at>
  for his help in keeping 'channels.conf' up to date
@@ -561,6 +568,8 @@ Clemens Kirchgatterer <clemens@thf.ath.cx>
 Emil Naepflein <Emil.Naepflein@philosys.de>
  for suggesting to take an active SVDRP connection into account when doing shutdown or
  housekeeping
+ for fixing selecting the device, because sometimes an FTA recording terminated a
+ CA recording
 
 Gerald Berwolf <genka@genka.de>
  for suggesting to deactivate some templates in tools.h in case some plugin needs to
@@ -719,3 +728,19 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
 
 Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
  for reporting a crash when cancelling a newly created timer
+
+Michael Walle <michael.walle@web.de>
+ for reporting a bug in channel switching after Left/Right has been pressed
+
+Thomas Keil <tk@commedia-group.com>
+ for suggesting to change the behaviour of the '0' key in normal viewing mode so
+ that a channel only qualifies as "previous" if it has been selected for at least
+ 3 seconds
+ for reporting a bug in handling the color buttons in the "Edit channel" menu
+
+Kenneth Aafl�y <ke-aa@frisurf.no>
+ for fixing checking CA capabilities with the dvb-kernel driver
+
+Ernst F�rst <ernstfuerst@swissonline.ch>
+ for reporting a crash in case a VFAT file system is used without compiling VDR
+ with VFAT=1
diff --git a/HISTORY b/HISTORY
index c1a82226b..52a300590 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2253,3 +2253,32 @@ Video Disk Recorder Revision History
   channel (thanks to Malcolm Caldwell for reporting this one).
 - Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf
   Ahrenberg).
+
+2003-08-03: Version 1.2.2
+
+- Fixed a bug in channel switching after Left/Right has been pressed (thanks to
+  Michael Walle for reporting this one).
+- Improved channel switching in case of numerical input by switching as soon as
+  the channel is unique (suggested by Jaakko Hyv�tti).
+- Fixed creating a new channel in the "Channels" menu in case the 'channels.conf'
+  contains ':@nnn' lines with no text (thanks to Guy Roussin for reporting this
+  one).
+- Changed the behaviour of the '0' key in normal viewing mode so that a channel
+  only qualifies as "previous" if it has been selected for at least 3 seconds
+  (suggested by Thomas Keil).
+- Now clearing the channel info display when entering numeric keys to switch
+  channels (suggested by Guy Roussin).
+- Added missing I18N entry for "Ppid" (thanks to Rolf Ahrenberg).
+- Fixed handling the color buttons in the "Edit channel" menu (thanks to Thomas
+  Keil for reporting this one).
+- Fixed an occasional "Broken pipe" error in SVDRP connections (thanks to Gerhard
+  Steiner for reporting this one).
+- Fixed checking CA capabilities with the dvb-kernel driver (thanks to Kenneth
+  Aafl�y).
+- Fixed selecting the device, because sometimes an FTA recording terminated a
+  CA recording (thanks to Emil Naepflein).
+- Fixed a possible crash in case a VFAT file system is used without compiling VDR
+  with VFAT=1 (thanks to Ernst F�rst for reporting this one).
+- Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile
+  or Makefile.config as defaults (thanks to Steffen Barszus).
+- Added the usual menu timeout to the CAM menus.
diff --git a/MANUAL b/MANUAL
index 742b743bc..46389af80 100644
--- a/MANUAL
+++ b/MANUAL
@@ -154,7 +154,8 @@ Version 1.2
      menu) by pressing the "Blue" button.
 
   Pressing the '0' key in normal viewing mode toggles between the current and
-  the previous channel.
+  the previous channel. A channel is considered "previous" if it has been
+  selected for at least 3 seconds.
 
   After switching to a different channel the channel number and name, as well
   as the current time are displayed at the top of the screen. If available, the
diff --git a/Make.config.template b/Make.config.template
index 774abbf7e..ff5946ffe 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.1 2002/11/01 14:05:36 kls Exp $
+# $Id: Make.config.template 1.2 2003/08/02 14:25:53 kls Exp $
 
 ### The C compiler and options:
 
@@ -22,4 +22,5 @@ DVBDIR   = ../DVB
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
+PLUGINDIR= ./PLUGINS
 VIDEODIR = /video
diff --git a/Makefile b/Makefile
index efeed0de3..f27fb4102 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.56 2003/01/06 12:28:09 kls Exp $
+# $Id: Makefile 1.57 2003/08/02 14:27:21 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -49,6 +49,9 @@ DEFINES += -DREMOTE_$(REMOTE)
 
 DEFINES += -D_GNU_SOURCE
 
+DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+DEFINES += -DPLUGINDIR=\"$(PLUGINDIR)/lib\"
+
 ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 NCURSESLIB = -lncurses
diff --git a/channels.conf b/channels.conf
index 03b71aabc..5bc0e8aa0 100644
--- a/channels.conf
+++ b/channels.conf
@@ -85,9 +85,9 @@ Premiere Direkt 3D:12070:h:S19.2E:27500:511:512:0:101:212:0:0:0
 :PW Erotic
 Beate-Uhse.TV:12071:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
 Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:2:101:513:0:0:0
-Premiere Erotik 2:12070:h:0:27500:1535:1536:0:101:778:0:0:0
-Premiere Erotik 3:12070:h:0:27500:1791:1792:0:101:779:0:0:0
-Premiere Erotik 4:12070:h:0:27500:3583:3584:0:101:780:0:0:0
+Premiere Erotik 2:12070:h:S19.2E:27500:1535:1536:0:101:778:0:0:0
+Premiere Erotik 3:12070:h:S19.2E:27500:1791:1792:0:101:779:0:0:0
+Premiere Erotik 4:12070:h:S19.2E:27500:3583:3584:0:101:780:0:0:0
 :Sportsworld
 Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
 Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27:0:0:0
diff --git a/ci.c b/ci.c
index 3575d142e..e94c20a0e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.15 2003/05/25 11:45:11 kls Exp $
+ * $Id: ci.c 1.16 2003/08/02 10:00:01 kls Exp $
  */
 
 /* XXX TODO
@@ -1314,7 +1314,7 @@ cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
         int NumSlots = Caps.slot_num;
         if (NumSlots > 0) {
            //XXX dsyslog("CAM: found %d CAM slots", NumSlots); // TODO let's do this only once we can be sure that there _really_ is a CAM adapter!
-           if (Caps.slot_type == CA_CI_LINK)
+           if ((Caps.slot_type & CA_CI_LINK) != 0)
               return new cCiHandler(fd_ca, NumSlots);
            else
               isyslog("CAM doesn't support link layer interface");
diff --git a/config.h b/config.h
index 29c058efa..40aead20e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.164 2003/06/06 12:28:20 kls Exp $
+ * $Id: config.h 1.165 2003/06/12 20:37:14 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.1"
-#define VDRVERSNUM   10201  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.2"
+#define VDRVERSNUM   10202  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index f43870ad4..242f59c92 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.45 2003/06/08 09:19:59 kls Exp $
+ * $Id: device.c 1.46 2003/08/02 11:44:28 kls Exp $
  */
 
 #include "device.h"
@@ -142,23 +142,34 @@ cDevice *cDevice::GetDevice(int Index)
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
   cDevice *d = NULL;
+  int select = 7, pri;
+
   for (int i = 0; i < numDevices; i++) {
       bool ndr;
-      if (device[i]->ProvidesChannel(Channel, Priority, &ndr) // this device is basicly able to do the job
-         && (!d // we don't have a device yet, or...
-            || (device[i]->Receiving() && !ndr) // ...this one is already receiving and allows additional receivers, or...
-            || !d->Receiving() // ...the one we have is not receiving...
-               && (device[i]->Priority() < d->Priority() // ...this one has an even lower Priority, or...
-                  || device[i]->Priority() == d->Priority() // ...same Priority...
-                     && device[i]->ProvidesCa(Channel->Ca()) < d->ProvidesCa(Channel->Ca()) // ...but this one provides fewer Ca values
-                  )
-            )
-         ) {
-         d = device[i];
-         if (NeedsDetachReceivers)
-            *NeedsDetachReceivers = ndr;
+      if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
+         if (device[i]->Receiving() && !ndr)
+            pri = 0; // receiving and allows additional receivers
+         else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel->Ca()) < d->ProvidesCa(Channel->Ca()))
+            pri = 1; // free and fewer Ca's
+         else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice())
+            pri = 2; // free and not the primary device
+         else if (!device[i]->Receiving())
+            pri = 3; // free
+         else if (d && device[i]->Priority() < d->Priority())
+            pri = 4; // receiving but priority is lower
+         else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel->Ca()) < d->ProvidesCa(Channel->Ca()))
+            pri = 5; // receiving with same priority but fewer Ca's
+         else
+            pri = 6; // all others
+         if (pri < select) {
+            select = pri;
+            d = device[i];
+            if (NeedsDetachReceivers)
+               *NeedsDetachReceivers = ndr;
+            }
          }
       }
+
   /*XXX+ too complex with multiple recordings per device
   if (!d && Ca > MAXDEVICES) {
      // We didn't find one the easy way, so now we have to try harder:
diff --git a/i18n.c b/i18n.c
index f50a2301d..0363e9f15 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.128 2003/06/09 09:49:29 kls Exp $
+ * $Id: i18n.c 1.129 2003/07/13 15:03:07 kls Exp $
  *
  * Translations provided by:
  *
@@ -1044,6 +1044,23 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "PID V�deo",
   },
+  { "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Aikatieto PID",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+    "Ppid",
+  },
   { "Apid1",
     "Apid1",
     "Apid1",
diff --git a/menu.c b/menu.c
index 5a5093458..b29961e4c 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.256 2003/06/07 12:31:57 kls Exp $
+ * $Id: menu.c 1.264 2003/08/03 09:38:37 kls Exp $
  */
 
 #include "menu.h"
@@ -713,6 +713,8 @@ void cMenuChannels::Propagate(void)
 
 eOSState cMenuChannels::Switch(void)
 {
+  if (HasSubMenu())
+     return osContinue;
   cChannel *ch = GetChannel(Current());
   if (ch)
      cDevice::PrimaryDevice()->SwitchChannel(ch, true);
@@ -733,12 +735,12 @@ eOSState cMenuChannels::New(void)
 {
   if (HasSubMenu())
      return osContinue;
-  return AddSubMenu(new cMenuEditChannel(Channels.Get(Current()), true));
+  return AddSubMenu(new cMenuEditChannel(GetChannel(Current()), true));
 }
 
 eOSState cMenuChannels::Delete(void)
 {
-  if (Count() > 0) {
+  if (!HasSubMenu() && Count() > 0) {
      int Index = Current();
      cChannel *channel = GetChannel(Current());
      int DeletedChannel = channel->Number();
@@ -793,7 +795,9 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
               case kRed:    return Edit();
               case kGreen:  return New();
               case kYellow: return Delete();
-              case kBlue:   Mark(); break;
+              case kBlue:   if (!HasSubMenu())
+                               Mark();
+                            break;
               default: break;
               }
             }
@@ -1558,6 +1562,7 @@ cMenuCam::cMenuCam(cCiMenu *CiMenu)
   Add(new cOsdItem(ciMenu->BottomText()));
   Display();
   dsyslog("CAM: Menu - %s", ciMenu->TitleText());
+  lastActivity = time(NULL);
 }
 
 cMenuCam::~cMenuCam()
@@ -1586,6 +1591,10 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (Key != kNone)
+     lastActivity = time(NULL);
+  else if (time(NULL) - lastActivity > MENUTIMEOUT)
+     state = osEnd;
   return state;
 }
 
@@ -1603,6 +1612,7 @@ cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
   SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
   Add(new cMenuEditNumItem("Input", input, Length, ciEnquiry->Blind()));
   Display();
+  lastActivity = time(NULL);
 }
 
 cMenuCamEnquiry::~cMenuCamEnquiry()
@@ -1631,6 +1641,10 @@ eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  if (Key != kNone)
+     lastActivity = time(NULL);
+  else if (time(NULL) - lastActivity > MENUTIMEOUT)
+     state = osEnd;
   return state;
 }
 
@@ -2740,8 +2754,28 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             number = number * 10 + Key - k0;
             if (number > 0) {
                cChannel *channel = Channels.GetByNumber(number);
+               Interface->Clear();
+               withInfo = false;
                DisplayChannel(channel);
                lastTime = time_ms();
+               // Lets see if there can be any useful further input:
+               int n = channel ? number * 10 : 0;
+               while (channel && (channel = Channels.Next(channel)) != NULL) {
+                     if (!channel->GroupSep()) {
+                        if (n <= channel->Number() && channel->Number() <= n + 9) {
+                           n = 0;
+                           break;
+                           }
+                        if (channel->Number() > n)
+                           n *= 10;
+                        }
+                     }
+               if (n > 0) {
+                  // This channel is the only one that fits the input, so let's take it right away:
+                  Interface->Flush(); // makes sure the user sees his last input
+                  Channels.SwitchTo(number);
+                  return osEnd;
+                  }
                }
             }
          break;
@@ -2783,6 +2817,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kChanUp:
     case kChanDn|k_Repeat:
     case kChanDn:
+         group = -1;
          Refresh();
          break;
     case kNone:
@@ -2968,16 +3003,19 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      }
 
   cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
-  const cChannel *ch = timer->Channel();
-  recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
-  if (device->AttachReceiver(recorder)) {
-     Recording.WriteSummary();
-     cStatus::MsgRecording(device, Recording.Name());
-     if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
-        cReplayControl::SetRecording(fileName, Recording.Name());
+  isyslog("record %s", fileName);
+  if (MakeDirs(fileName, true)) {
+     const cChannel *ch = timer->Channel();
+     recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
+     if (device->AttachReceiver(recorder)) {
+        Recording.WriteSummary();
+        cStatus::MsgRecording(device, Recording.Name());
+        if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
+           cReplayControl::SetRecording(fileName, Recording.Name());
+        }
+     else
+        DELETENULL(recorder);
      }
-  else
-     DELETENULL(recorder);
 }
 
 cRecordControl::~cRecordControl()
diff --git a/menu.h b/menu.h
index 5dd408069..e304ea314 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.56 2003/05/24 16:35:52 kls Exp $
+ * $Id: menu.h 1.57 2003/08/03 09:37:18 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -62,6 +62,7 @@ class cDisplayVolume : public cOsdObject {
 class cMenuCam : public cOsdMenu {
 private:
   cCiMenu *ciMenu;
+  time_t lastActivity;
   bool selected;
   eOSState Select(void);
 public:
@@ -73,6 +74,7 @@ class cMenuCam : public cOsdMenu {
 class cMenuCamEnquiry : public cOsdMenu {
 private:
   cCiEnquiry *ciEnquiry;
+  time_t lastActivity;
   char *input;
   bool replied;
   eOSState Reply(void);
diff --git a/recorder.c b/recorder.c
index d7cc9c315..2583bae21 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.6 2003/05/16 13:33:04 kls Exp $
+ * $Id: recorder.c 1.7 2003/08/02 13:01:19 kls Exp $
  */
 
 #include <stdarg.h>
@@ -34,12 +34,6 @@ cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int A
   fileSize = 0;
   active = false;
   lastDiskSpaceCheck = time(NULL);
-  isyslog("record %s", FileName);
-
-  // Create directories if necessary:
-
-  if (!MakeDirs(FileName, true))
-     return;
 
   // Make sure the disk is up and running:
 
diff --git a/svdrp.c b/svdrp.c
index e9f22161a..625b7f832 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.52 2003/06/06 13:30:52 kls Exp $
+ * $Id: svdrp.c 1.53 2003/07/26 10:57:33 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1100,7 +1100,7 @@ bool cSVDRP::Process(void)
                  }
               lastActivity = time(NULL);
               }
-           else if (r <= 0) {
+           else if (r < 0) {
               isyslog("lost connection to SVDRP client");
               Close();
               }
diff --git a/vdr.c b/vdr.c
index 6a6c35dc1..16e8bdd4c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.160 2003/05/29 12:27:26 kls Exp $
+ * $Id: vdr.c 1.162 2003/08/02 14:01:32 kls Exp $
  */
 
 #include <getopt.h>
@@ -57,6 +57,7 @@
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
+#define ZAPTIMEOUT       3 // seconds until a channel counts as "previous" for switching with '0'
 
 static int Interrupted = 0;
 
@@ -92,7 +93,7 @@ int main(int argc, char *argv[])
 
 #define DEFAULTSVDRPPORT 2001
 #define DEFAULTWATCHDOG     0 // seconds
-#define DEFAULTPLUGINDIR "./PLUGINS/lib"
+#define DEFAULTPLUGINDIR PLUGINDIR
 
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *AudioCommand = NULL;
@@ -455,6 +456,8 @@ int main(int argc, char *argv[])
   int LastChannel = -1;
   int LastTimerChannel = -1;
   int PreviousChannel = cDevice::CurrentChannel();
+  int LastLastChannel = PreviousChannel;
+  time_t LastChannelChanged = time(NULL);
   time_t LastActivity = 0;
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
@@ -492,9 +495,12 @@ int main(int argc, char *argv[])
         if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
            if (!Menu)
               Menu = Temp = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel > 0);
-           if (LastChannel > 0)
-              PreviousChannel = LastChannel;
            LastChannel = cDevice::CurrentChannel();
+           LastChannelChanged = time(NULL);
+           }
+        if (LastLastChannel != LastChannel && time(NULL) - LastChannelChanged >= ZAPTIMEOUT) {
+           PreviousChannel = LastLastChannel;
+           LastLastChannel = LastChannel;
            }
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
diff --git a/videodir.c b/videodir.c
index 4078fdff2..94e7141ae 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.9 2002/08/11 13:31:02 kls Exp $
+ * $Id: videodir.c 1.10 2003/08/02 13:43:28 kls Exp $
  */
 
 #include "videodir.h"
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include "tools.h"
 
-const char *VideoDirectory = "/video";
+const char *VideoDirectory = VIDEODIR;
 
 class cVideoDirectory {
 private:

From 5f5dfd7f69963abcdcceed88e649c83e6ea5709e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Aug 2003 18:00:00 +0200
Subject: [PATCH 079/307] =?UTF-8?q?Version=201.2.3=20(not=20officially=20r?=
 =?UTF-8?q?eleased)=20-=20Fixed=20the=20TS=20to=20PES=20repacker=20so=20th?=
 =?UTF-8?q?at=20it=20works=20with=20MPEG1=20streams=20(thanks=20to=20=20?=
 =?UTF-8?q?=20Andreas=20Kool).=20-=20Fixed=20keeping=20track=20of=20the=20?=
 =?UTF-8?q?current=20channel=20number=20when=20moving=20channels=20in=20?=
 =?UTF-8?q?=20=20the=20"Channels"=20menu=20(thanks=20to=20Mirko=20G=C3=BCn?=
 =?UTF-8?q?ther=20for=20reporting=20this=20one).=20-=20Made=20the=20plugin?=
 =?UTF-8?q?=20library=20directory=20configurable=20via=20Make.config=20(th?=
 =?UTF-8?q?anks=20to=20=20=20Ludwig=20Nussel).=20-=20Fixed=20scaling=20SPU?=
 =?UTF-8?q?=20bitmaps=20in=20Letterbox=20mode=20when=20playing=20NTSC=20ma?=
 =?UTF-8?q?terial.=20=20=20In=20order=20to=20do=20this,=20the=20cDevice=20?=
 =?UTF-8?q?was=20given=20a=20new=20member=20function=20GetVideoSystem().?=
 =?UTF-8?q?=20-=20Fixed=20two=20warnings=20when=20compiling=20with=20gcc?=
 =?UTF-8?q?=203.3.1=20(thanks=20to=20Alfred=20Zastrow=20for=20=20=20report?=
 =?UTF-8?q?ing=20this).=20-=20Made=20crc32()=20a=20static=20function=20in?=
 =?UTF-8?q?=20libdtv/libsi/si=5Fparser.c=20to=20avoid=20a=20name=20clash?=
 =?UTF-8?q?=20=20=20when=20using=20other=20libraries=20that=20also=20imple?=
 =?UTF-8?q?ment=20a=20function=20by=20that=20name=20(thanks=20=20=20to=20R?=
 =?UTF-8?q?einhard=20Nissl=20for=20reporting=20this=20one).=20-=20Fixed=20?=
 =?UTF-8?q?staying=20off=20the=20end=20of=20an=20ongoing=20recording=20whi?=
 =?UTF-8?q?le=20replaying=20in=20time=20shift=20=20=20mode=20(thanks=20to?=
 =?UTF-8?q?=20Rainer=20Zocholl=20for=20reporting=20this=20one).=20-=20VDR?=
 =?UTF-8?q?=20now=20stops=20with=20exit=20status=202=20if=20one=20of=20the?=
 =?UTF-8?q?=20configuration=20files=20can't=20be=20=20=20read=20correctly?=
 =?UTF-8?q?=20at=20program=20startup=20(suggested=20by=20Rainer=20Zocholl)?=
 =?UTF-8?q?.=20-=20Fixed=20a=20crash=20when=20starting=20"Pause=20live=20v?=
 =?UTF-8?q?ideo"=20twice=20within=20the=20same=20minute=20on=20=20=20the?=
 =?UTF-8?q?=20same=20channel.=20-=20Fixed=20freezing=20replay=20if=20a=20t?=
 =?UTF-8?q?imer=20starts=20while=20in=20Transfer=20Mode=20from=20the=20dev?=
 =?UTF-8?q?ice=20=20=20used=20by=20the=20timer,=20and=20the=20timer=20need?=
 =?UTF-8?q?s=20a=20different=20transponder=20(thanks=20to=20=20=20Richard?=
 =?UTF-8?q?=20Robson=20for=20reporting=20this=20one).=20-=20Fixed=20toggli?=
 =?UTF-8?q?ng=20channels=20with=20the=20'0'=20key=20(thanks=20to=20Mirko?=
 =?UTF-8?q?=20G=C3=BCnther=20for=20reporting=20=20=20this=20one).=20-=20Ma?=
 =?UTF-8?q?de=20the=20"Zap=20timeout"=20(the=20time=20until=20a=20channel?=
 =?UTF-8?q?=20counts=20as=20"previous"=20for=20=20=20switching=20with=20'0?=
 =?UTF-8?q?')=20a=20setup=20variable,=20available=20in=20"Setup/Miscellane?=
 =?UTF-8?q?ous"=20=20=20(suggested=20by=20Helmut=20Auer).=20-=20Removing?=
 =?UTF-8?q?=20deleted=20recordings=20faster=20than=20normal=20when=20cutti?=
 =?UTF-8?q?ng,=20to=20avoid=20running=20=20=20out=20of=20disk=20space=20(t?=
 =?UTF-8?q?hanks=20to=20Manfred=20Schmidt-Voigt=20for=20reporting=20this?=
 =?UTF-8?q?=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                 | 23 +++++++++++++++++++
 HISTORY                      | 32 +++++++++++++++++++++++++++
 MANUAL                       |  3 +++
 Make.config.template         |  3 ++-
 Makefile                     |  7 +++---
 channels.c                   |  6 ++---
 channels.h                   |  4 ++--
 config.c                     |  5 ++++-
 config.h                     | 17 +++++++++-----
 cutter.c                     |  4 ++--
 device.c                     |  7 +++++-
 device.h                     |  9 +++++++-
 dvbdevice.c                  | 15 ++++++++++++-
 dvbdevice.h                  |  3 ++-
 dvbspu.c                     |  8 ++++---
 i18n.c                       | 19 +++++++++++++++-
 libdtv/libsi/include/libsi.h |  1 -
 libdtv/libsi/si_parser.c     |  6 ++---
 menu.c                       | 14 ++++++++++--
 osdbase.c                    |  4 ++--
 recording.c                  |  9 ++++----
 recording.h                  |  4 +++-
 remux.c                      |  6 +++--
 vdr.c                        | 43 ++++++++++++++++++------------------
 24 files changed, 189 insertions(+), 63 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6b199f258..aee413128 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -315,6 +315,10 @@ Rainer Zocholl <vdrcontrib@zocki.toppoint.de>
  for suggesting a confirmation prompt when the user presses the "Power" button
  and there is an upcoming timer event
  for reporting a bug in skipping the next hit of a repeating timer
+ for reporting a problem with staying off the end of an ongoing recording while
+ replaying in time shift mode
+ for suggesting that VDR should stop if one of the configuration files can't be
+ read correctly at program startup
 
 Oleg Assovski <assen@bitcom.msk.ru>
  for adding EPG scanning for another 4 days
@@ -328,6 +332,9 @@ Bernd Schweikert <bernd.schweikert@dit-gmbh.de>
 Mirko G�nther <mi.guenther@ib-helms.de>
  for suggesting the -m command line option
  for suggesting the SVDRP command VOLU
+ for reporting a bug in keeping track of the current channel number when moving
+ channels in the "Channels" menu
+ for reporting a bug in toggling channels with the '0' key
 
 Achim Lange <Achim_Lange@t-online.de>
  for replacing 'killproc' with 'killall' in 'runvdr' to make it work on Debian
@@ -450,6 +457,7 @@ J
 
 Helmut Auer <vdr@helmutauer.de>
  for reporting a superfluous error message in cLockFile
+ for suggesting to make the "Zap timeout" a setup variable
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -550,6 +558,7 @@ R
 
 Andreas Kool <akool@akool.de>
  for his help in keeping 'channels.conf.cable' up to date
+ for fixing the TS to PES repacker so that it works with MPEG1 streams
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
@@ -637,6 +646,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for fixing handling repeat function with LIRC
  for reporting a problem with the LIRC remote control trying to learn keys even if it
  couldn't connect to the LIRC daemon
+ for making the plugin library directory configurable via Make.config
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -689,6 +699,7 @@ Juri Haberland <juri@koschikode.com>
 Alfred Zastrow <vdr@zastrow4u.de>
  for suggesting to implement separate PausePriority and PauseLifetime parameters for
  the recordings created when pausing live video
+ for reporting two warnings when compiling with gcc 3.3.1
 
 Matthias Raus <matthias-raus@web.de>
  for reporting a problem with starting the editing process if no marks have been set
@@ -744,3 +755,15 @@ Kenneth Aafl
 Ernst F�rst <ernstfuerst@swissonline.ch>
  for reporting a crash in case a VFAT file system is used without compiling VDR
  with VFAT=1
+
+Reinhard Nissl <rnissl@gmx.de>
+ for reporting a name clash because of function crc32() in libdtv/libsi/si_parser.c
+ when using other libraries that also implement a function by that name
+
+Richard Robson <richard_robson@beeb.net>
+ for reporting freezing replay if a timer starts while in Transfer Mode from the
+ device used by the timer, and the timer needs a different transponder
+
+Manfred Schmidt-Voigt <manfred.schmidt-voigt@mannitec.de>
+ for reporting a problem with runnign out of disk space while cutting in case
+ there are still deleted recordings to remove
diff --git a/HISTORY b/HISTORY
index 52a300590..1f2b71206 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2282,3 +2282,35 @@ Video Disk Recorder Revision History
 - Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile
   or Makefile.config as defaults (thanks to Steffen Barszus).
 - Added the usual menu timeout to the CAM menus.
+
+2003-08-17: Version 1.2.3
+
+- Fixed the TS to PES repacker so that it works with MPEG1 streams (thanks to
+  Andreas Kool).
+- Fixed keeping track of the current channel number when moving channels in
+  the "Channels" menu (thanks to Mirko G�nther for reporting this one).
+- Made the plugin library directory configurable via Make.config (thanks to
+  Ludwig Nussel).
+- Fixed scaling SPU bitmaps in Letterbox mode when playing NTSC material.
+  In order to do this, the cDevice was given a new member function GetVideoSystem().
+- Fixed two warnings when compiling with gcc 3.3.1 (thanks to Alfred Zastrow for
+  reporting this).
+- Made crc32() a static function in libdtv/libsi/si_parser.c to avoid a name clash
+  when using other libraries that also implement a function by that name (thanks
+  to Reinhard Nissl for reporting this one).
+- Fixed staying off the end of an ongoing recording while replaying in time shift
+  mode (thanks to Rainer Zocholl for reporting this one).
+- VDR now stops with exit status 2 if one of the configuration files can't be
+  read correctly at program startup (suggested by Rainer Zocholl).
+- Fixed a crash when starting "Pause live video" twice within the same minute on
+  the same channel.
+- Fixed freezing replay if a timer starts while in Transfer Mode from the device
+  used by the timer, and the timer needs a different transponder (thanks to
+  Richard Robson for reporting this one).
+- Fixed toggling channels with the '0' key (thanks to Mirko G�nther for reporting
+  this one).
+- Made the "Zap timeout" (the time until a channel counts as "previous" for
+  switching with '0') a setup variable, available in "Setup/Miscellaneous"
+  (suggested by Helmut Auer).
+- Removing deleted recordings faster than normal when cutting, to avoid running
+  out of disk space (thanks to Manfred Schmidt-Voigt for reporting this one).
diff --git a/MANUAL b/MANUAL
index 46389af80..3abf7eef4 100644
--- a/MANUAL
+++ b/MANUAL
@@ -635,6 +635,9 @@ Version 1.2
                          connection after which the connection is automatically
                          closed. Default is 300, a value of 0 means no timeout.
 
+  Zap Timeout = 3        The time (in seconds) until a channel counts as "previous"
+                         for switching with '0'
+
 * Executing system commands
 
   The "VDR" menu option "Commands" allows you to execute any system commands
diff --git a/Make.config.template b/Make.config.template
index ff5946ffe..b39b1f4c1 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.2 2003/08/02 14:25:53 kls Exp $
+# $Id: Make.config.template 1.3 2003/08/09 11:03:25 kls Exp $
 
 ### The C compiler and options:
 
@@ -23,4 +23,5 @@ MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
 PLUGINDIR= ./PLUGINS
+PLUGINLIBDIR= $(PLUGINDIR)/lib
 VIDEODIR = /video
diff --git a/Makefile b/Makefile
index f27fb4102..1c009e836 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.57 2003/08/02 14:27:21 kls Exp $
+# $Id: Makefile 1.58 2003/08/09 11:09:45 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -20,6 +20,7 @@ MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
 PLUGINDIR= ./PLUGINS
+PLUGINLIBDIR= $(PLUGINDIR)/lib
 
 VIDEODIR = /video
 
@@ -50,7 +51,7 @@ DEFINES += -DREMOTE_$(REMOTE)
 DEFINES += -D_GNU_SOURCE
 
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
-DEFINES += -DPLUGINDIR=\"$(PLUGINDIR)/lib\"
+DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
 ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
@@ -115,7 +116,7 @@ plugins: include-dir
 
 plugins-clean:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
-	@-rm -f $(PLUGINDIR)/lib/*
+	@-rm -f $(PLUGINLIBDIR)/*
 
 # Install the files:
 
diff --git a/channels.c b/channels.c
index c68b4ee3e..585772968 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.12 2003/04/26 09:57:48 kls Exp $
+ * $Id: channels.c 1.13 2003/08/16 09:12:26 kls Exp $
  */
 
 #include "channels.h"
@@ -390,9 +390,9 @@ bool cChannel::Save(FILE *f)
 
 cChannels Channels;
 
-bool cChannels::Load(const char *FileName, bool AllowComments)
+bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
 {
-  if (cConfig<cChannel>::Load(FileName, AllowComments)) {
+  if (cConfig<cChannel>::Load(FileName, AllowComments, MustExist)) {
      ReNumber();
      return true;
      }
diff --git a/channels.h b/channels.h
index c82fc282a..ca76af16d 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.7 2003/04/26 09:15:40 kls Exp $
+ * $Id: channels.h 1.8 2003/08/16 09:12:15 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -130,7 +130,7 @@ class cChannels : public cConfig<cChannel> {
   int maxNumber;
 public:
   cChannels(void) { maxNumber = 0; }
-  virtual bool Load(const char *FileName, bool AllowComments = false);
+  virtual bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
diff --git a/config.c b/config.c
index 8a30d3c1b..924a70eda 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.114 2003/05/11 13:50:02 kls Exp $
+ * $Id: config.c 1.115 2003/08/17 08:47:41 kls Exp $
  */
 
 #include "config.h"
@@ -262,6 +262,7 @@ cSetup::cSetup(void)
   EPGScanTimeout = 5;
   EPGBugfixLevel = 2;
   SVDRPTimeout = 300;
+  ZapTimeout = 3;
   SortTimers = 1;
   PrimaryLimit = 0;
   DefaultPriority = 50;
@@ -413,6 +414,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
   else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
+  else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
   else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
@@ -462,6 +464,7 @@ bool cSetup::Save(void)
   Store("EPGScanTimeout",     EPGScanTimeout);
   Store("EPGBugfixLevel",     EPGBugfixLevel);
   Store("SVDRPTimeout",       SVDRPTimeout);
+  Store("ZapTimeout",         ZapTimeout);
   Store("SortTimers",         SortTimers);
   Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
diff --git a/config.h b/config.h
index 40aead20e..f7eb28eb8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.165 2003/06/12 20:37:14 kls Exp $
+ * $Id: config.h 1.168 2003/08/17 08:46:34 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.2"
-#define VDRVERSNUM   10202  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.3"
+#define VDRVERSNUM   10203  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -87,7 +87,7 @@ template<class T> class cConfig : public cList<T> {
   cConfig(void) { fileName = NULL; }
   virtual ~cConfig() { free(fileName); }
   const char *FileName(void) { return fileName; }
-  bool Load(const char *FileName = NULL, bool AllowComments = false)
+  bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
   {
     Clear();
     if (FileName) {
@@ -95,7 +95,7 @@ template<class T> class cConfig : public cList<T> {
        fileName = strdup(FileName);
        allowComments = AllowComments;
        }
-    bool result = false;
+    bool result = !MustExist;
     if (fileName && access(fileName, F_OK) == 0) {
        isyslog("loading %s", fileName);
        FILE *f = fopen(fileName, "r");
@@ -125,9 +125,13 @@ template<class T> class cConfig : public cList<T> {
                 }
           fclose(f);
           }
-       else
+       else {
           LOG_ERROR_STR(fileName);
+          result = false;
+          }
        }
+    if (!result)
+       fprintf(stderr, "vdr: error while reading '%s'\n", fileName);
     return result;
   }
   bool Save(void)
@@ -215,6 +219,7 @@ class cSetup : public cConfig<cSetupLine> {
   int EPGScanTimeout;
   int EPGBugfixLevel;
   int SVDRPTimeout;
+  int ZapTimeout;
   int SortTimers;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
diff --git a/cutter.c b/cutter.c
index 01e460d6b..dfad77e4c 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.4 2003/05/24 11:59:33 kls Exp $
+ * $Id: cutter.c 1.5 2003/08/17 09:04:04 kls Exp $
  */
 
 #include "cutter.h"
@@ -86,7 +86,7 @@ void cCuttingThread::Action(void)
 
            // Make sure there is enough disk space:
 
-           AssertFreeDiskSpace();
+           AssertFreeDiskSpace(-1);
 
            // Read one frame:
 
diff --git a/device.c b/device.c
index 242f59c92..b409ac0ef 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.46 2003/08/02 11:44:28 kls Exp $
+ * $Id: device.c 1.47 2003/08/15 12:34:36 kls Exp $
  */
 
 #include "device.h"
@@ -216,6 +216,11 @@ void cDevice::SetVideoFormat(bool VideoFormat16_9)
 {
 }
 
+eVideoSystem cDevice::GetVideoSystem(void)
+{
+  return vsPAL;
+}
+
 //#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
 #define PRINTPIDS(s)
 
diff --git a/device.h b/device.h
index a41312a27..144adfb6c 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.33 2003/05/11 08:50:04 kls Exp $
+ * $Id: device.h 1.34 2003/08/15 13:05:50 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -45,6 +45,10 @@ enum ePlayMode { pmNone,           // audio/video from decoder
                  // KNOWN TO YOUR PLAYER.
                };
 
+enum eVideoSystem { vsPAL,
+                    vsNTSC
+                  };
+
 class cOsdBase;
 class cChannel;
 class cPlayer;
@@ -248,6 +252,9 @@ class cDevice : public cThread {
   virtual void SetVideoFormat(bool VideoFormat16_9);
          ///< Sets the output video format to either 16:9 or 4:3 (only useful
          ///< if this device has an MPEG decoder).
+  virtual eVideoSystem GetVideoSystem(void);
+         ///< Returns the video system of the currently displayed material
+         ///< (default is PAL).
 
 // Audio facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index 7fc50a713..34d558298 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.60 2003/05/24 13:23:51 kls Exp $
+ * $Id: dvbdevice.c 1.61 2003/08/15 13:03:41 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -525,6 +525,19 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
      CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
 }
 
+eVideoSystem cDvbDevice::GetVideoSystem(void)
+{
+  eVideoSystem VideoSytem = vsPAL;
+  video_size_t vs;
+  if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+     if (vs.h == 480 || vs.h == 240)
+        VideoSytem = vsNTSC;
+     }
+  else
+     LOG_ERROR;
+  return VideoSytem;
+}
+
 //                            ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
 dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_PCR, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
 
diff --git a/dvbdevice.h b/dvbdevice.h
index 6bcbc724f..aab20fdd5 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.21 2003/05/02 12:21:51 kls Exp $
+ * $Id: dvbdevice.h 1.22 2003/08/15 12:34:55 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -80,6 +80,7 @@ class cDvbDevice : public cDevice {
 
 public:
   virtual void SetVideoFormat(bool VideoFormat16_9);
+  virtual eVideoSystem GetVideoSystem(void);
 
 // Audio facilities
 
diff --git a/dvbspu.c b/dvbspu.c
index 4b31401ae..27e0bed5b 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.3 2002/10/26 10:46:49 kls Exp $
+ * $Id: dvbspu.c 1.4 2003/08/15 13:04:39 kls Exp $
  */
 
 #include <assert.h>
@@ -301,8 +301,10 @@ void cDvbSpuDecoder::clearHighlight(void)
 
 int cDvbSpuDecoder::ScaleYcoord(int value)
 {
-    if (scaleMode == eSpuLetterBox)
-        return lround((value * 3.0) / 4.0 + 72.0);
+    if (scaleMode == eSpuLetterBox) {
+        int offset = cDevice::PrimaryDevice()->GetVideoSystem() == vsPAL ? 72 : 60;
+        return lround((value * 3.0) / 4.0) + offset;
+        }
     else
         return value;
 }
diff --git a/i18n.c b/i18n.c
index 0363e9f15..253e27833 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.129 2003/07/13 15:03:07 kls Exp $
+ * $Id: i18n.c 1.130 2003/08/17 08:53:24 kls Exp $
  *
  * Translations provided by:
  *
@@ -2663,6 +2663,23 @@ const tI18nPhrase Phrases[] = {
     "SVDRP Timeout (s)",
     "SVDRP Timeout (s)",
   },
+  { "Setup.Miscellaneous$Zap timeout (s)",
+    "Zap Timeout (s)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index b2f8ba2ed..ad7a16495 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -1226,7 +1226,6 @@ void siParseDescriptors (struct LIST *, u_char *, int, u_char);
 void siParseDescriptor (struct LIST *, u_char *);
 char *siGetDescriptorText (u_char *, int);
 char *siGetDescriptorName (u_char *, int);
-u_long crc32 (char *data, int len);
 
 /* si_debug_services.c */
 
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
index a922b7e3c..896c5ab98 100644
--- a/libdtv/libsi/si_parser.c
+++ b/libdtv/libsi/si_parser.c
@@ -36,7 +36,7 @@
 #include "libsi.h"
 #include "si_tables.h"
 
-
+static u_long crc32 (char *data, int len);
 
 struct LIST *siParsePAT (u_char *Buffer) 
 {
@@ -1240,7 +1240,7 @@ char *siGetDescriptorTextHandler (u_char *Buffer, int Length, int type)
          if (*Buffer == 0) break;
 
          if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') ||
-             (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer;
+             (*Buffer >= 0xa0)) *tmp++ = *Buffer;
          if (*Buffer == 0x8A) *tmp++ = '\n';
          if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' ';
          Buffer++;
@@ -1323,7 +1323,7 @@ static u_long crc_table[256] = {
 	0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
 	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
 
-u_long crc32 (char *data, int len)
+static u_long crc32 (char *data, int len)
 {
 	register int i;
 	u_long crc = 0xffffffff;
diff --git a/menu.c b/menu.c
index b29961e4c..e3b320728 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.264 2003/08/03 09:38:37 kls Exp $
+ * $Id: menu.c 1.268 2003/08/17 08:52:07 kls Exp $
  */
 
 #include "menu.h"
@@ -763,6 +763,8 @@ eOSState cMenuChannels::Delete(void)
 
 void cMenuChannels::Move(int From, int To)
 {
+  int CurrentChannelNr = cDevice::CurrentChannel();
+  cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
   cChannel *FromChannel = GetChannel(From);
   cChannel *ToChannel = GetChannel(To);
   if (FromChannel && ToChannel) {
@@ -772,6 +774,8 @@ void cMenuChannels::Move(int From, int To)
      cOsdMenu::Move(From, To);
      Propagate();
      isyslog("channel %d moved to %d", FromNumber, ToNumber);
+     if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr)
+        Channels.SwitchTo(CurrentChannel->Number());
      }
 }
 
@@ -2252,6 +2256,7 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"),            &data.ZapTimeout));
 }
 
 // --- cMenuSetupPluginItem --------------------------------------------------
@@ -2997,6 +3002,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      else {
         Timers.Del(timer);
         Timers.Save();
+        if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
+           cReplayControl::SetRecording(fileName, Recording.Name());
         }
      timer = NULL;
      return;
@@ -3093,8 +3100,11 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
      int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority;
      cDevice *device = cDevice::GetDevice(channel, Priority, &NeedsDetachReceivers);
      if (device) {
-        if (NeedsDetachReceivers)
+        if (NeedsDetachReceivers) {
            Stop(device);
+           if (device == cDevice::ActualDevice())
+              cControl::Shutdown(); // in case this device was used for Transfer Mode
+           }
         if (!device->SwitchChannel(channel, false)) {
            cThread::EmergencyExit(true);
            return false;
diff --git a/osdbase.c b/osdbase.c
index 8093b96a6..0c0e8981c 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.8 2003/03/23 15:53:29 kls Exp $
+ * $Id: osdbase.c 1.9 2003/08/15 13:47:51 kls Exp $
  */
 
 #include "osdbase.h"
@@ -215,7 +215,7 @@ void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
      Take(Bitmap, &Indexes);
      for (int ix = 0; ix < Bitmap.width; ix++) {
          for (int iy = 0; iy < Bitmap.height; iy++)
-             SetIndex(x + ix, y + iy, Indexes[Bitmap.bitmap[Bitmap.width * iy + ix]]);
+             SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
          }
      }
 }
diff --git a/recording.c b/recording.c
index 06f632553..bcbfd9f63 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.80 2003/05/30 13:23:54 kls Exp $
+ * $Id: recording.c 1.82 2003/08/17 09:10:46 kls Exp $
  */
 
 #include "recording.h"
@@ -95,7 +95,8 @@ void AssertFreeDiskSpace(int Priority)
   // a file, or mark a file for removal ("delete" it), so that
   // it will get removed during the next call.
   static time_t LastFreeDiskCheck = 0;
-  if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA) {
+  int Factor = (Priority == -1) ? 10 : 1;
+  if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA / Factor) {
      if (!VideoFileSpaceAvailable(MINDISKSPACE)) {
         // Make sure only one instance of VDR does this:
         cLockFile LockFile(VideoDirectory);
@@ -113,7 +114,7 @@ void AssertFreeDiskSpace(int Priority)
                  r = Recordings.Next(r);
                  }
            if (r0 && r0->Remove()) {
-              LastFreeDiskCheck += REMOVELATENCY;
+              LastFreeDiskCheck += REMOVELATENCY / Factor;
               return;
               }
            }
@@ -770,7 +771,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 #define INDEXFILESUFFIX     "/index.vdr"
 
 // The number of frames to stay off the end in case of time shift:
-#define INDEXSAFETYLIMIT 100 // frames
+#define INDEXSAFETYLIMIT 150 // frames
 
 // The maximum time to wait before giving up while catching up on an index file:
 #define MAXINDEXCATCHUP   8 // seconds
diff --git a/recording.h b/recording.h
index 82f2fccaf..677e354b2 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.25 2002/10/19 15:48:52 kls Exp $
+ * $Id: recording.h 1.26 2003/08/17 09:03:46 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -17,6 +17,8 @@
 
 void RemoveDeletedRecordings(void);
 void AssertFreeDiskSpace(int Priority = 0);
+     ///< The special Priority value -1 means that we shall get rid of any
+     ///< deleted recordings faster than normal (because we're cutting).
 
 class cResumeFile {
 private:
diff --git a/remux.c b/remux.c
index c2ded246f..6dc37e1b6 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.15 2003/04/26 15:07:41 kls Exp $
+ * $Id: remux.c 1.16 2003/08/06 14:44:03 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -321,7 +321,6 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                      if ((flag1 & 0xC0) == 0x80 )
                         mpeg = 2;
                      else {
-                        esyslog("ERROR: error in data stream!");
                         hlength = 0;
                         which = 0;
                         mpeg = 1;
@@ -361,6 +360,9 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                write_ipack(&hlength, 1);
                }
 
+            if (mpeg == 1 && found == 7)
+               write_ipack(&flag1, 1);
+
             if (mpeg == 2 && (flag2 & PTS_ONLY) && found < 14) {
                while (c < Count && found < 14) {
                      write_ipack(Buf + c, 1);
diff --git a/vdr.c b/vdr.c
index 16e8bdd4c..48ed62774 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.162 2003/08/02 14:01:32 kls Exp $
+ * $Id: vdr.c 1.165 2003/08/17 08:50:25 kls Exp $
  */
 
 #include <getopt.h>
@@ -57,7 +57,6 @@
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
-#define ZAPTIMEOUT       3 // seconds until a channel counts as "previous" for switching with '0'
 
 static int Interrupted = 0;
 
@@ -341,17 +340,19 @@ int main(int argc, char *argv[])
 
   cPlugin::SetConfigDirectory(ConfigDirectory);
 
-  Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
-  Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true);
-  Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true);
-  Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"));
-  Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
-  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true);
-  RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true);
-  SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
-  CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
-  Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
-  KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
+  if (!(Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")) &&
+        Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
+        Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) &&
+        Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
+        Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
+        Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&
+        RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true) &&
+        SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true) &&
+        CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true) &&
+        Keys.Load(AddDirectory(ConfigDirectory, "remote.conf")) &&
+        KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true)
+        ))
+     return 2;
 
   // DVB interfaces:
 
@@ -455,8 +456,8 @@ int main(int argc, char *argv[])
   cOsdObject *Temp = NULL;
   int LastChannel = -1;
   int LastTimerChannel = -1;
-  int PreviousChannel = cDevice::CurrentChannel();
-  int LastLastChannel = PreviousChannel;
+  int PreviousChannel[2] = { 1, 1 };
+  int PreviousChannelIndex = 0;
   time_t LastChannelChanged = time(NULL);
   time_t LastActivity = 0;
   int MaxLatencyTime = 0;
@@ -498,10 +499,8 @@ int main(int argc, char *argv[])
            LastChannel = cDevice::CurrentChannel();
            LastChannelChanged = time(NULL);
            }
-        if (LastLastChannel != LastChannel && time(NULL) - LastChannelChanged >= ZAPTIMEOUT) {
-           PreviousChannel = LastLastChannel;
-           LastLastChannel = LastChannel;
-           }
+        if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
+           PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
            time_t Now = time(NULL); // must do both following calls with the exact same time!
@@ -680,9 +679,9 @@ int main(int argc, char *argv[])
            switch (key) {
              // Toggle channels:
              case k0: {
-                  int CurrentChannel = cDevice::CurrentChannel();
-                  Channels.SwitchTo(PreviousChannel);
-                  PreviousChannel = CurrentChannel;
+                  if (PreviousChannel[PreviousChannelIndex ^ 1] == LastChannel || LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
+                     PreviousChannelIndex ^= 1;
+                  Channels.SwitchTo(PreviousChannel[PreviousChannelIndex ^= 1]);
                   break;
                   }
              // Direct Channel Select:

From fc9c149eb96f7a949c2f183693e4df15abe8dc4b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Tue, 26 Aug 2003 18:00:00 +0200
Subject: [PATCH 080/307] Version 1.2.4 (not officially released) - Fixed
 'runvdr' to stay in the loop only if VDR returns an exit status of '1'. -
 Completed the Finnish OSD texts (thanks to Rolf Ahrenberg). - Empty values in
 setup.conf are no longer treated as an error (thanks to Andreas   Kool for
 reporting this one). - Added a note about the config files of plugins to
 INSTALL (thanks to Thomas   Keil). - VDR now continues to start up, even if
 there is an error in setup.conf. - Fixed a bug in resetting OSD color
 palettes (thanks to Torsten Herz). - Fixed starting a recording on the
 primary device if there is a replay session   active (thanks to Javier Marcet
 for reporting this one). - Avoiding an unnecessary stop of an ongoing
 Transfer Mode when starting a   recording on the primary device.

---
 CONTRIBUTORS |  7 +++++++
 HISTORY      | 17 ++++++++++++++++-
 INSTALL      |  7 +++++--
 config.c     |  4 ++--
 config.h     |  6 +++---
 dvbdevice.c  |  7 ++++---
 i18n.c       |  6 +++---
 menu.c       |  5 +++--
 osdbase.c    |  4 ++--
 runvdr       |  4 ++--
 vdr.c        |  6 +++---
 11 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index aee413128..ea52b1f8f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -559,6 +559,7 @@ R
 Andreas Kool <akool@akool.de>
  for his help in keeping 'channels.conf.cable' up to date
  for fixing the TS to PES repacker so that it works with MPEG1 streams
+ for reporting a problem with empty values in setup.conf
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
@@ -621,6 +622,7 @@ Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
  to switch to an other channel
  for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix
+ for fixing a bug in resetting OSD color palettes
 
 Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
  for reporting a problem with CPU load peaks (in the EPG scanner)
@@ -748,6 +750,7 @@ Thomas Keil <tk@commedia-group.com>
  that a channel only qualifies as "previous" if it has been selected for at least
  3 seconds
  for reporting a bug in handling the color buttons in the "Edit channel" menu
+ for adding a note about the config files of plugins to INSTALL
 
 Kenneth Aafl�y <ke-aa@frisurf.no>
  for fixing checking CA capabilities with the dvb-kernel driver
@@ -767,3 +770,7 @@ Richard Robson <richard_robson@beeb.net>
 Manfred Schmidt-Voigt <manfred.schmidt-voigt@mannitec.de>
  for reporting a problem with runnign out of disk space while cutting in case
  there are still deleted recordings to remove
+
+Javier Marcet <lists@marcet.info>
+ for reporting a problem when starting a recording on the primary device if there
+ is a replay session active
diff --git a/HISTORY b/HISTORY
index 1f2b71206..048599853 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2283,7 +2283,7 @@ Video Disk Recorder Revision History
   or Makefile.config as defaults (thanks to Steffen Barszus).
 - Added the usual menu timeout to the CAM menus.
 
-2003-08-17: Version 1.2.3
+2003-08-17: Version 1.2.3 (not officially released)
 
 - Fixed the TS to PES repacker so that it works with MPEG1 streams (thanks to
   Andreas Kool).
@@ -2314,3 +2314,18 @@ Video Disk Recorder Revision History
   (suggested by Helmut Auer).
 - Removing deleted recordings faster than normal when cutting, to avoid running
   out of disk space (thanks to Manfred Schmidt-Voigt for reporting this one).
+
+2003-08-24: Version 1.2.4
+
+- Fixed 'runvdr' to stay in the loop only if VDR returns an exit status of '1'.
+- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Empty values in setup.conf are no longer treated as an error (thanks to Andreas
+  Kool for reporting this one).
+- Added a note about the config files of plugins to INSTALL (thanks to Thomas
+  Keil).
+- VDR now continues to start up, even if there is an error in setup.conf.
+- Fixed a bug in resetting OSD color palettes (thanks to Torsten Herz).
+- Fixed starting a recording on the primary device if there is a replay session
+  active (thanks to Javier Marcet for reporting this one).
+- Avoiding an unnecessary stop of an ongoing Transfer Mode when starting a
+  recording on the primary device.
diff --git a/INSTALL b/INSTALL
index 2bae8e81f..3143723f1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -302,8 +302,11 @@ Configuration files:
 There are several configuration files that hold information about
 channels, remote control keys, timers etc. By default these files are
 assumed to be located in the video directory, but a different directory
-can be used with the '-c' option. For starters just copy all *.conf files from
-the VDR directory into your video directory.
+can be used with the '-c' option. Plugins assume their configuration files
+in a subdirectory called "plugins" of this directory.
+
+For starters just copy all *.conf files from the VDR directory into your
+video directory.
 
 The configuration files can be edited with any text editor, or will be written
 by the 'vdr' program if any changes are made inside the on-screen menus.
diff --git a/config.c b/config.c
index 924a70eda..0ef2d57ff 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.115 2003/08/17 08:47:41 kls Exp $
+ * $Id: config.c 1.116 2003/08/24 11:00:24 kls Exp $
  */
 
 #include "config.h"
@@ -215,7 +215,7 @@ bool cSetupLine::Parse(char *s)
      *p = 0;
      char *Name  = compactspace(s);
      char *Value = compactspace(p + 1);
-     if (*Name && *Value) {
+     if (*Name) { // value may be an empty string
         p = strchr(Name, '.');
         if (p) {
            *p = 0;
diff --git a/config.h b/config.h
index f7eb28eb8..8df5929fe 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.168 2003/08/17 08:46:34 kls Exp $
+ * $Id: config.h 1.169 2003/08/24 10:52:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.3"
-#define VDRVERSNUM   10203  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.4"
+#define VDRVERSNUM   10204  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 34d558298..fe6c951fa 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.61 2003/08/15 13:03:41 kls Exp $
+ * $Id: dvbdevice.c 1.62 2003/08/24 14:23:12 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -613,13 +613,12 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 {
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
-  bool needsDetachReceivers = true;
+  bool needsDetachReceivers = false;
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
      result = hasPriority;
      if (Receiving()) {
         if (dvbTuner->IsTunedTo(Channel)) {
-           needsDetachReceivers = false;
            if (!HasPid(Channel->Vpid())) {
 #ifdef DO_MULTIPLE_RECORDINGS
               if (Channel->Ca() > CACONFBASE)
@@ -636,6 +635,8 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            else
               result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
            }
+        else
+           needsDetachReceivers = true;
         }
      }
   if (NeedsDetachReceivers)
diff --git a/i18n.c b/i18n.c
index 253e27833..4c9d6a3fd 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.130 2003/08/17 08:53:24 kls Exp $
+ * $Id: i18n.c 1.131 2003/08/24 10:52:08 kls Exp $
  *
  * Translations provided by:
  *
@@ -79,7 +79,7 @@ const tI18nPhrase Phrases[] = {
     "Portugu�s",
     "Fran�ais",
     "Norsk",
-    "suomi",
+    "Suomi",
     "Polski",
     "Espa�ol",
     "Ellinika",
@@ -2671,7 +2671,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Kanavavalinnan odotusaika (s)",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/menu.c b/menu.c
index e3b320728..9cfd7c8fb 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.268 2003/08/17 08:52:07 kls Exp $
+ * $Id: menu.c 1.269 2003/08/24 14:28:44 kls Exp $
  */
 
 #include "menu.h"
@@ -25,6 +25,7 @@
 #include "sources.h"
 #include "status.h"
 #include "timers.h"
+#include "transfer.h"
 #include "videodir.h"
 
 #define MENUTIMEOUT     120 // seconds
@@ -3102,7 +3103,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
      if (device) {
         if (NeedsDetachReceivers) {
            Stop(device);
-           if (device == cDevice::ActualDevice())
+           if (device == cTransferControl::ReceiverDevice())
               cControl::Shutdown(); // in case this device was used for Transfer Mode
            }
         if (!device->SwitchChannel(channel, false)) {
diff --git a/osdbase.c b/osdbase.c
index 0c0e8981c..98cae8240 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.9 2003/08/15 13:47:51 kls Exp $
+ * $Id: osdbase.c 1.10 2003/08/24 11:38:27 kls Exp $
  */
 
 #include "osdbase.h"
@@ -70,7 +70,7 @@ int cPalette::Index(eDvbColor Color)
 void cPalette::Reset(void)
 {
   for (int i = 0; i < numColors; i++)
-      used[i] = false;
+      used[i] = fetched[i] = false;
   full = false;
 }
 
diff --git a/runvdr b/runvdr
index 13ee73294..6fdd13e1a 100755
--- a/runvdr
+++ b/runvdr
@@ -18,7 +18,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.9 2002/03/16 16:22:12 kls Exp $
+# $Id: runvdr 1.10 2003/08/17 14:27:31 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
@@ -34,7 +34,7 @@ if [ $LSMOD -eq 0 ] ; then
 
 while (true) do
       su -c "$VDRCMD" $VDRUSR
-      if test $? -eq 0; then exit; fi
+      if test $? -ne 1; then exit; fi
       date
       echo "restarting VDR"
       $KILL $VDRPRG
diff --git a/vdr.c b/vdr.c
index 48ed62774..9c54e3a41 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.165 2003/08/17 08:50:25 kls Exp $
+ * $Id: vdr.c 1.166 2003/08/24 11:18:04 kls Exp $
  */
 
 #include <getopt.h>
@@ -340,8 +340,8 @@ int main(int argc, char *argv[])
 
   cPlugin::SetConfigDirectory(ConfigDirectory);
 
-  if (!(Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")) &&
-        Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
+  Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
+  if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
         Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) &&
         Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
         Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&

From e4b016980bb7c2f0bb369f64b2ac411500865b32 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 31 Aug 2003 18:00:00 +0200
Subject: [PATCH 081/307] Version 1.2.5pre1 - Now explicitly handling exit
 value 0 and 2 in 'runvdr'. - Added a missing 'w' to the allowed characters
 for Finnish and Swedish (thanks   to Lauri Tischler and Ragnar Sundblad). -
 Added channels for DVB-T Hannover (Germany) to channels.cont.terr (thanks to 
  Peter Waechtler). - Fixed a hangup in SVDRP when the client disappears
 without sending QUIT (thanks   to Robert Bartl for reporting this one). The
 problem was introduced in version   1.2.2 through the fix for an occasional
 "Broken pipe" error in SVDRP connections. - Updated 'channels.conf.terr' for
 Berlin. - Fixed displaying still pictures, now using the driver's
 VIDEO_STILLPICTURE call   directly (thanks to Oliver Endriss). This also
 improves navigating through DVD   menus with the DVD plugin. If this causes
 problems with your particular system   (maybe because you are using the
 'analogtv' plugin) you can reactivate the   previous behaviour by commenting
 out the line   #define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES   in
 VDR/dvbdevice.c.   Note that you need driver version 2003-08-23 or later for
 this to work! - Fixed handling extra blanks in plugin command lines. -
 Actually implemented the SVDRP command DELC. - Now clearing the player device
 if there are too many poll timeouts in 'Transfer   Mode', which avoids buffer
 overflows and black screens in such cases.

---
 CONTRIBUTORS       |  8 ++++++++
 HISTORY            | 25 ++++++++++++++++++++++++-
 channels.conf.terr | 24 ++++++++++++++++++++----
 config.h           |  6 +++---
 dvbdevice.c        | 46 ++++++++++++++++++++++++++++++++++++++++++----
 i18n.c             |  8 ++++----
 plugin.c           |  8 ++++----
 runvdr             |  4 ++--
 svdrp.c            | 30 +++++++++++++++++++++++++++---
 transfer.c         | 12 +++++++++++-
 10 files changed, 145 insertions(+), 26 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea52b1f8f..068a7b8ac 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -489,6 +489,8 @@ Oliver Endriss <o.endriss@gmx.de>
  the remote control keys
  for reporting a bug in reading 'epg.data' for channels with non-zero RID
  for fixing I/O handling in case an explicit controlling terminal is given
+ for fixing displaying still pictures, now using the driver's VIDEO_STILLPICTURE call
+ directly
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -774,3 +776,9 @@ Manfred Schmidt-Voigt <manfred.schmidt-voigt@mannitec.de>
 Javier Marcet <lists@marcet.info>
  for reporting a problem when starting a recording on the primary device if there
  is a replay session active
+
+Peter Waechtler <pwaechtler@mac.com>
+ for adding channels for DVB-T Hannover (Germany) to channels.cont.terr
+
+Robert Bartl <robert@bartl.priv.at>
+ for reporting a hangup in SVDRP when the client disappears without sending QUIT
diff --git a/HISTORY b/HISTORY
index 048599853..f246ab56e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2315,7 +2315,7 @@ Video Disk Recorder Revision History
 - Removing deleted recordings faster than normal when cutting, to avoid running
   out of disk space (thanks to Manfred Schmidt-Voigt for reporting this one).
 
-2003-08-24: Version 1.2.4
+2003-08-26: Version 1.2.4 (not officially released)
 
 - Fixed 'runvdr' to stay in the loop only if VDR returns an exit status of '1'.
 - Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
@@ -2329,3 +2329,26 @@ Video Disk Recorder Revision History
   active (thanks to Javier Marcet for reporting this one).
 - Avoiding an unnecessary stop of an ongoing Transfer Mode when starting a
   recording on the primary device.
+
+2003-08-31: Version 1.2.5pre1
+
+- Now explicitly handling exit value 0 and 2 in 'runvdr'.
+- Added a missing 'w' to the allowed characters for Finnish and Swedish (thanks
+  to Lauri Tischler and Ragnar Sundblad).
+- Added channels for DVB-T Hannover (Germany) to channels.cont.terr (thanks to
+  Peter Waechtler).
+- Fixed a hangup in SVDRP when the client disappears without sending QUIT (thanks
+  to Robert Bartl for reporting this one). The problem was introduced in version
+  1.2.2 through the fix for an occasional "Broken pipe" error in SVDRP connections.
+- Updated 'channels.conf.terr' for Berlin.
+- Fixed displaying still pictures, now using the driver's VIDEO_STILLPICTURE call
+  directly (thanks to Oliver Endriss). This also improves navigating through DVD
+  menus with the DVD plugin. If this causes problems with your particular system
+  (maybe because you are using the 'analogtv' plugin) you can reactivate the
+  previous behaviour by commenting out the line
+  #define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+  in VDR/dvbdevice.c.
+- Fixed handling extra blanks in plugin command lines.
+- Actually implemented the SVDRP command DELC.
+- Now clearing the player device if there are too many poll timeouts in 'Transfer
+  Mode', which avoids buffer overflows and black screens in such cases.
diff --git a/channels.conf.terr b/channels.conf.terr
index 79c59a103..038708c7e 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -45,7 +45,14 @@ Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304:0:0:0
 KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
 oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0
 Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
-: DVB-T Berlin Germany
+: DVB-T Berlin, Germany
+BBC World:177500:I0C23D0M16B8T8G8Y0:T:27500:49:50:55:0:16387:0:0:0
+FAB:177500:I0C23D0M16B8T8G8Y0:T:27500:3073:3074:3079:0:16576:0:0:0
+WDR:177500:I0C23D0M16B8T8G8Y0:T:27500:241:242:247:0:15:0:0:0
+SWR BW:177500:I0C23D0M16B8T8G8Y0:T:27500:257:258:263:0:16:0:0:0
+MDR Fernsehen:191500:I0C23D0M16B8T8G8Y0:T:27500:101:102:104:0:1:0:0:0
+arte:191500:I0C23D0M16B8T8G8Y0:T:27500:201:202,203:204:0:2:0:0:0
+NDR Fernsehen:191500:I0C23D0M16B8T8G8Y0:T:27500:301:302:304:0:3:0:0:0
 RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:337:338:343:0:16405:0:0:0
 RTL2:506000:I0C23D0M16B8T8G8Y0:T:27500:353:354:359:0:16406:0:0:0
 Super RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:433:434:439:0:16411:0:0:0
@@ -61,6 +68,15 @@ Kabel 1:658000:I0C23D0M16B8T8G8Y0:T:27500:161:162:167:0:16394:0:0:0
 N24:658000:I0C23D0M16B8T8G8Y0:T:27500:225:226:231:0:16398:0:0:0
 ProSieben:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:311:0:16403:0:0:0
 SAT.1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:391:0:16408:0:0:0
-MTV:778000:I0C23D0M16B8T8G8Y0:T:27500:193:194:199:0:16396:0:0:0
-n-tv:778000:I0C23D0M16B8T8G8Y0:T:27500:273:274:279:0:16401:0:0:0
-Eurosport:778000:I0C23D0M16B8T8G8Y0:T:27500:577:578:583:0:16420:0:0:0
+Testkanal 9live:754000:I0C23D0M16B8T8G8Y0:T:27500:273:274:279:0:16401:0:0:0
+Eurosport:754000:I0C23D0M16B8T8G8Y0:T:27500:577:578:583:0:16420:0:0:0
+DSF:754000:I0C23D0M16B8T8G8Y0:T:27500:129:130:135:0:16392:0:0:0
+VIVA Plus:754000:I0C23D0M16B8T8G8Y0:T:27500:529:530:535:0:16417:0:0:0
+Testkanal Pro7:778000:I0C23D0M16B8T8G8Y0:T:27500:305:306:311:0:16403:0:0:0
+: DVB-T Hannover, Germany
+ARD:554000:I0C12D0M16B8T8G32Y0:T:27500:512:650:513:0:28156:0:0:0
+ZDF:554000:I0C12D0M16B8T8G32Y0:T:27500:513:651:513:0:28160:0:0:0
+NDR:554000:I0C12D0M16B8T8G32Y0:T:27500:514:652:513:0:28162:0:0:0
+RTL:530500:I0C12D0M16B8T8G32Y0:T:27500:512:650:513:0:1:0:0:0
+SAT1:530500:I0C12D0M16B8T8G32Y0:T:27500:513:651:513:0:2:0:0:0
+9Live:530500:I0C12D0M16B8T8G32Y0:T:27500:514:652:513:0:3:0:0:0
diff --git a/config.h b/config.h
index 8df5929fe..7463aea47 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.169 2003/08/24 10:52:20 kls Exp $
+ * $Id: config.h 1.170 2003/08/30 08:39:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.4"
-#define VDRVERSNUM   10204  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.5pre1"
+#define VDRVERSNUM   10205  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index fe6c951fa..19be02235 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.62 2003/08/24 14:23:12 kls Exp $
+ * $Id: dvbdevice.c 1.63 2003/08/30 11:40:41 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -896,11 +896,49 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
    If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
    could be used, please let me know!
    kls 2002-03-23
+   2003-08-30: apparently the driver can't handle PES data, so Oliver Endriss
+               <o.endriss@gmx.de> has changed this to strip all PES headers
+               and send pure ES data to the driver. Seems to work just fine!
+               Let's drop the VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES stuff
+               once this has proven to work in all cases.
 */
-//#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
+#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
 #ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-  video_still_picture sp = { (char *)Data, Length };
-  CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+  if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
+     // PES data
+     char *buf = MALLOC(char, Length);
+     if (!buf)
+        return;
+     int i = 0;
+     int blen = 0;
+     while (i < Length - 4) {
+           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01 && (Data[i + 3] & 0xF0) == 0xE0) {
+              // skip PES header
+              int offs = i + 6;
+              int len = Data[i + 4] * 256 + Data[i + 5];
+              // skip header extension
+              if ((Data[i + 6] & 0xC0) == 0x80) {
+                 offs += 3;
+                 offs += Data[i + 8];
+                 len -= 3;
+                 len -= Data[i + 8];
+                 }
+              memcpy(&buf[blen], &Data[offs], len);
+              i = offs + len;
+              blen += len;
+              }
+           else
+              i++;
+           }
+     video_still_picture sp = { buf, blen };
+     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+     free(buf);
+     }
+  else {
+     // non-PES data
+     video_still_picture sp = { (char *)Data, Length };
+     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+     }
 #else
 #define MIN_IFRAME 400000
   for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
diff --git a/i18n.c b/i18n.c
index 4c9d6a3fd..512c948fb 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.131 2003/08/24 10:52:08 kls Exp $
+ * $Id: i18n.c 1.133 2003/08/26 15:27:25 kls Exp $
  *
  * Translations provided by:
  *
@@ -79,7 +79,7 @@ const tI18nPhrase Phrases[] = {
     "Portugu�s",
     "Fran�ais",
     "Norsk",
-    "Suomi",
+    "suomi", // this is not a typo - it's really lowercase!
     "Polski",
     "Espa�ol",
     "Ellinika",
@@ -2724,11 +2724,11 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~",
     "",// TODO
-    " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
+    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
     "",// TODO
-    " abcdefghijklmnopqrstuvxyz���0123456789-.#~",
+    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
diff --git a/plugin.c b/plugin.c
index 743953480..a0d270118 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.9 2003/05/09 15:01:26 kls Exp $
+ * $Id: plugin.c 1.10 2003/08/30 14:52:58 kls Exp $
  */
 
 #include "plugin.h"
@@ -170,7 +170,7 @@ bool cDll::Load(bool Log)
      if (plugin && args) {
         int argc = 0;
         char *argv[MAXPLUGINARGS];
-        char *p = args;
+        char *p = skipspace(stripspace(args));
         char *q = NULL;
         bool done = false;
         while (!done) {
@@ -205,7 +205,7 @@ bool cDll::Load(bool Log)
                                }
                             }
                          if (!done)
-                            p++;
+                            p = *p ? p + 1 : skipspace(p + 1);
                 }
               }
         argv[argc] = NULL;
@@ -278,7 +278,7 @@ void cPluginManager::AddPlugin(const char *Args)
         }
      return;
      }
-  char *s = strdup(Args);
+  char *s = strdup(skipspace(Args));
   char *p = strchr(s, ' ');
   if (p)
      *p = 0;
diff --git a/runvdr b/runvdr
index 6fdd13e1a..9c639914f 100755
--- a/runvdr
+++ b/runvdr
@@ -18,7 +18,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.10 2003/08/17 14:27:31 kls Exp $
+# $Id: runvdr 1.11 2003/08/26 16:15:41 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
@@ -34,7 +34,7 @@ if [ $LSMOD -eq 0 ] ; then
 
 while (true) do
       su -c "$VDRCMD" $VDRUSR
-      if test $? -ne 1; then exit; fi
+      if test $? -eq 0 -o $? -eq 2; then exit; fi
       date
       echo "restarting VDR"
       $KILL $VDRPRG
diff --git a/svdrp.c b/svdrp.c
index 625b7f832..228911e0c 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.53 2003/07/26 10:57:33 kls Exp $
+ * $Id: svdrp.c 1.55 2003/08/31 11:24:47 kls Exp $
  */
 
 #include "svdrp.h"
@@ -464,8 +464,30 @@ void cSVDRP::CmdCLRE(const char *Option)
 
 void cSVDRP::CmdDELC(const char *Option)
 {
-  //TODO combine this with menu action (timers must be updated)
-  Reply(502, "DELC not yet implemented");
+  if (*Option) {
+     if (isnumber(Option)) {
+        cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
+        if (channel) {
+           for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
+               if (timer->Channel() == channel) {
+                  Reply(550, "Channel \"%s\" is in use by timer %d", Option, timer->Index() + 1);
+                  return;
+                  }
+               }
+           Channels.Del(channel);
+           Channels.ReNumber();
+           Channels.Save();
+           isyslog("channel %s deleted", Option);
+           Reply(250, "Channel \"%s\" deleted", Option);
+           }
+        else
+           Reply(501, "Channel \"%s\" not defined", Option);
+        }
+     else
+        Reply(501, "Error in channel number \"%s\"", Option);
+     }
+  else
+     Reply(501, "Missing channel number");
 }
 
 void cSVDRP::CmdDELR(const char *Option)
@@ -1104,6 +1126,8 @@ bool cSVDRP::Process(void)
               isyslog("lost connection to SVDRP client");
               Close();
               }
+           else
+              break;
            }
      if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
         isyslog("timeout on SVDRP connection");
diff --git a/transfer.c b/transfer.c
index b0a8bba56..3e24dccde 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.13 2003/05/18 15:22:09 kls Exp $
+ * $Id: transfer.c 1.14 2003/08/31 12:19:16 kls Exp $
  */
 
 #include "transfer.h"
@@ -13,6 +13,7 @@
 // The size of the array used to buffer video data:
 // (must be larger than MINVIDEODATA - see remux.h)
 #define VIDEOBUFSIZE  MEGABYTE(1)
+#define POLLTIMEOUTS_BEFORE_DEVICECLEAR 3
 
 // --- cTransfer -------------------------------------------------------------
 
@@ -67,6 +68,7 @@ void cTransfer::Action(void)
 {
   dsyslog("transfer thread started (pid=%d)", getpid());
 
+  int PollTimeouts = 0;
   active = true;
   while (active) {
 
@@ -99,6 +101,7 @@ void cTransfer::Action(void)
               while (Result > 0 && active) {
                     cPoller Poller;
                     if (DevicePoll(Poller, 100)) {
+                       PollTimeouts = 0;
                        int w = PlayVideo(p, Result);
                        if (w > 0) {
                           p += w;
@@ -109,6 +112,13 @@ void cTransfer::Action(void)
                           break;
                           }
                        }
+                    else {
+                       PollTimeouts++;
+                       if (PollTimeouts == POLLTIMEOUTS_BEFORE_DEVICECLEAR) {
+                          dsyslog("clearing device because of consecutive poll timeouts");
+                          DeviceClear();
+                          }
+                       }
                     }
               }
            }

From bff4529f013605e0456fa12e4c0468ffafaa4289 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 7 Sep 2003 18:00:00 +0200
Subject: [PATCH 082/307] Version 1.2.5pre2 - Updated VIVA, VIVA Plus, MTV
 Central and MTV 2 in channels.conf (thanks to   Sebastian Frei). - Changed
 "Studio Universal" to "Sci-Fi" in channels.conf. - Fixed a crash when using
 the --terminal option without having access to the   given terminal (thanks
 to Steffen Barszus for helping to debug this one). - Added a note about the
 driver version needed for the still picture fix from   version 1.2.5pre1 to
 work properly (thanks to Oliver Endriss for pointing   this out). - Fixed
 setting the primary device in case none of the devices provides an MPEG  
 decoder (thanks to Rene Bartsch for reporting this one). - Fixed handling the
 "Red" button in the "Schedules" menu in case there are no   events listed for
 a particular channel (thanks to Christoph Hermanns for   reporting this one).
 - When setting an editing mark while in "Pause" mode, replay now immediately 
  jumps to the marked frame (thanks to Oskar Signell for pointing out this  
 problem). - The DVB devices no longer send CA descriptors to the CAM while
 the EPG scanner   is active (sometimes the CAMs got irritated when the device
 tuned to channels   they couldn't handle).

---
 CONTRIBUTORS  | 17 +++++++++++++++++
 HISTORY       | 23 +++++++++++++++++++++++
 channels.conf | 10 +++++-----
 config.h      |  4 ++--
 dvbdevice.c   | 14 +++++++++-----
 eitscan.c     |  5 ++++-
 eitscan.h     |  4 +++-
 menu.c        | 13 ++++++++-----
 vdr.c         |  8 ++++++--
 9 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 068a7b8ac..e6802474b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -546,6 +546,8 @@ Steffen Barszus <st_barszus@gmx.de>
  for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
  for making the program use the values of VIDEODIR and PLUGINDIR defined in Makefile
  or Makefile.config as defaults
+ for helping to debug a crash when using the --terminal option without having access
+ to the given terminal
 
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
@@ -782,3 +784,18 @@ Peter Waechtler <pwaechtler@mac.com>
 
 Robert Bartl <robert@bartl.priv.at>
  for reporting a hangup in SVDRP when the client disappears without sending QUIT
+
+Sebastian Frei <sebastian@schnapsleichen.de>
+ for his support in keeping 'channels.conf' up-to-date.
+
+Rene Bartsch <ml@bartschnet.de>
+ for reporting a bug in setting the primary device in case none of the devices
+ provides an MPEG decoder
+
+Christoph Hermanns <christoph.hermanns@gmx.de>
+ for reporting a bug in handling the "Red" button in the "Schedules" menu in case
+ there are no events listed for a particular channel
+
+Oskar Signell <oskar@signell.net>
+ for pointing out a problem with setting an editing mark while in "Pause" mode,
+ where replay was not immediately positioned to the marked frame
diff --git a/HISTORY b/HISTORY
index f246ab56e..3a6db48a2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2348,7 +2348,30 @@ Video Disk Recorder Revision History
   previous behaviour by commenting out the line
   #define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
   in VDR/dvbdevice.c.
+  Note that you need driver version 2003-08-23 or later for this to work!
 - Fixed handling extra blanks in plugin command lines.
 - Actually implemented the SVDRP command DELC.
 - Now clearing the player device if there are too many poll timeouts in 'Transfer
   Mode', which avoids buffer overflows and black screens in such cases.
+
+2003-09-07: Version 1.2.5pre2
+
+- Updated VIVA, VIVA Plus, MTV Central and MTV 2 in channels.conf (thanks to
+  Sebastian Frei).
+- Changed "Studio Universal" to "Sci-Fi" in channels.conf.
+- Fixed a crash when using the --terminal option without having access to the
+  given terminal (thanks to Steffen Barszus for helping to debug this one).
+- Added a note about the driver version needed for the still picture fix from
+  version 1.2.5pre1 to work properly (thanks to Oliver Endriss for pointing
+  this out).
+- Fixed setting the primary device in case none of the devices provides an MPEG
+  decoder (thanks to Rene Bartsch for reporting this one).
+- Fixed handling the "Red" button in the "Schedules" menu in case there are no
+  events listed for a particular channel (thanks to Christoph Hermanns for
+  reporting this one).
+- When setting an editing mark while in "Pause" mode, replay now immediately
+  jumps to the marked frame (thanks to Oskar Signell for pointing out this
+  problem).
+- The DVB devices no longer send CA descriptors to the CAM while the EPG scanner
+  is active (sometimes the CAMs got irritated when the device tuned to channels
+  they couldn't handle).
diff --git a/channels.conf b/channels.conf
index 5bc0e8aa0..f0ba58759 100644
--- a/channels.conf
+++ b/channels.conf
@@ -56,7 +56,7 @@ Premiere 5:11797:h:S19.2E:27500:1279:1280,1281:0:101:29:0:0:0
 Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
 Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
 13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
-Studio Universal:11798:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
+Sci-Fi:11758:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
 Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
 Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
 Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
@@ -145,13 +145,13 @@ Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:0:0:0
 RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994:0:0:0
 VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010:0:0:0
 VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647:0:0:0
-MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648:0:0:0
+MTV 2:12225:h:S19.2E:27500:513:661:577:0:28640:0:0:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
 Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0
 ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012:0:0:0
-VIVA:12670:v:S19.2E:22000:309:310:0:0:12732:0:0:0
-VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120:0:0:0
-MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643:0:0:0
+VIVA:12670:v:S19.2E:22000:309:310:311:0:12732:0:0:0
+VIVA PLUS:12552:v:S19.2E:22000:171:172:179:0:12120:0:0:0
+MTV Central:11739:v:S19.2E:27500:3031:3032:3034:0:28653:0:0:0
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
 Tele 5:12480:v:S19.2E:27500:1535:1536:0:0:51:0:0:0
 :@201 Sky
diff --git a/config.h b/config.h
index 7463aea47..b65b26579 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.170 2003/08/30 08:39:37 kls Exp $
+ * $Id: config.h 1.171 2003/09/05 13:18:38 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.5pre1"
+#define VDRVERSION  "1.2.5pre2"
 #define VDRVERSNUM   10205  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 19be02235..f29745b29 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.63 2003/08/30 11:40:41 kls Exp $
+ * $Id: dvbdevice.c 1.64 2003/09/06 13:19:33 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -74,6 +74,7 @@ class cDvbTuner : public cThread {
   cChannel channel;
   const char *diseqcCommands;
   bool active;
+  bool useCa;
   time_t startTime;
   eTunerStatus tunerStatus;
   cMutex mutex;
@@ -84,7 +85,7 @@ class cDvbTuner : public cThread {
   cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
-  void Set(const cChannel *Channel, bool Tune);
+  void Set(const cChannel *Channel, bool Tune, bool UseCa);
   bool Locked(void) { return tunerStatus == tsLocked; }
   };
 
@@ -96,6 +97,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   ciHandler = CiHandler;
   diseqcCommands = NULL;
   active = false;
+  useCa = false;
   tunerStatus = tsIdle;
   startTime = time(NULL);
   Start();
@@ -114,7 +116,7 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Frequency() == Channel->Frequency();
 }
 
-void cDvbTuner::Set(const cChannel *Channel, bool Tune)
+void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
 {
   cMutexLock MutexLock(&mutex);
   bool CaChange = !(Channel->GetChannelID() == channel.GetChannelID());
@@ -122,6 +124,7 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune)
      tunerStatus = tsSet;
   else if (tunerStatus == tsCam && CaChange)
      tunerStatus = tsTuned;
+  useCa = UseCa;
   if (Channel->Ca() && CaChange)
      startTime = time(NULL);
   channel = *Channel;
@@ -267,7 +270,7 @@ void cDvbTuner::Action(void)
               }
            if (tunerStatus >= tsLocked) {
               if (ciHandler) {
-                 if (ciHandler->Process()) {
+                 if (ciHandler->Process() && useCa) {
                     if (tunerStatus != tsCam) {//XXX TODO update in case the CA descriptors have changed
                        for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) {
                            uchar buffer[2048];
@@ -673,6 +676,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   StartTransferMode = false;
 #endif
 
+  // XXX 1.3: use the same mechanism as below (!EITScanner.UsesDevice(this))
   if (EITScanner.Active()) {
      StartTransferMode = false;
      TurnOnLivePIDs = false;
@@ -690,7 +694,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (TurnOffLivePIDs)
      TurnOffLiveMode();
 
-  dvbTuner->Set(Channel, DoTune);
+  dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution
 
   // PID settings:
 
diff --git a/eitscan.c b/eitscan.c
index f9058cf0c..a12bb44d3 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.13 2003/05/24 13:34:59 kls Exp $
+ * $Id: eitscan.c 1.14 2003/09/06 13:06:13 kls Exp $
  */
 
 #include "eitscan.h"
@@ -17,6 +17,7 @@ cEITScanner EITScanner;
 cEITScanner::cEITScanner(void)
 {
   lastScan = lastActivity = time(NULL);
+  currentDevice = NULL;
   currentChannel = 0;
   memset(lastChannel, 0, sizeof(lastChannel));
   numTransponders = 0;
@@ -66,7 +67,9 @@ void cEITScanner::Process(void)
                                if (Device == cDevice::PrimaryDevice() && !currentChannel) {
                                   currentChannel = Device->CurrentChannel();
                                   }
+                               currentDevice = Device;
                                Device->SwitchChannel(Channel, false);
+                               currentDevice = NULL;
                                break;
                                }
                             }
diff --git a/eitscan.h b/eitscan.h
index 609bf78fb..420f47d01 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.3 2003/05/24 13:21:36 kls Exp $
+ * $Id: eitscan.h 1.4 2003/09/06 13:05:51 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -19,6 +19,7 @@ class cEITScanner {
          ScanTimeout = 20
        };
   time_t lastScan, lastActivity;
+  cDevice *currentDevice;
   int currentChannel;
   int lastChannel[MAXDEVICES];
   int numTransponders, *transponders;
@@ -27,6 +28,7 @@ class cEITScanner {
   cEITScanner(void);
   ~cEITScanner();
   bool Active(void) { return currentChannel; }
+  bool UsesDevice(const cDevice *Device) { return currentDevice == Device; }
   void Activity(void);
   void Process(void);
   };
diff --git a/menu.c b/menu.c
index 9cfd7c8fb..54c07900b 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.269 2003/08/24 14:28:44 kls Exp $
+ * $Id: menu.c 1.271 2003/09/06 10:26:45 kls Exp $
  */
 
 #include "menu.h"
@@ -1250,7 +1250,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 
   currentChannel = CurrentChannelNr;
   free(pArray);
-  SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
+  SetHelp(Count() ? tr("Record") : NULL, Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
 }
 
 const cEventInfo *cMenuWhatsOn::ScheduleEventInfo(void)
@@ -1358,7 +1358,7 @@ cMenuSchedule::cMenuSchedule(void)
      cMenuWhatsOn::SetCurrentChannel(channel->Number());
      schedules = cSIProcessor::Schedules(mutexLock);
      PrepareSchedule(channel);
-     SetHelp(tr("Record"), tr("Now"), tr("Next"));
+     SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"));
      }
 }
 
@@ -1470,7 +1470,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
            PrepareSchedule(channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
               otherChannel = channel->Number();
-              SetHelp(tr("Record"), tr("Now"), tr("Next"), tr("Switch"));
+              SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"), tr("Switch"));
               }
            Display();
            }
@@ -3531,6 +3531,10 @@ void cReplayControl::MarkToggle(void)
      else {
         marks.Add(Current);
         ShowTimed(2);
+        bool Play, Forward;
+        int Speed;
+        if (GetReplayMode(Play, Forward, Speed) && !Play)
+           Goto(Current, true);
         }
      marks.Save();
      }
@@ -3659,7 +3663,6 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
       DoShowMode = false;
       switch (Key) {
         // Editing:
-        //XXX should we do this only when the ProgressDisplay is on???
         case kMarkToggle:      MarkToggle(); break;
         case kMarkJumpBack:    MarkJump(false); break;
         case kMarkJumpForward: MarkJump(true); break;
diff --git a/vdr.c b/vdr.c
index 9c54e3a41..cdc460ead 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.166 2003/08/24 11:18:04 kls Exp $
+ * $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -199,6 +199,10 @@ int main(int argc, char *argv[])
           case 's': Shutdown = optarg;
                     break;
           case 't': Terminal = optarg;
+                    if (access(Terminal, R_OK | W_OK) < 0) {
+                       fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
+                       return 2;
+                       }
                     break;
           case 'V': DisplayVersion = true;
                     break;
@@ -383,7 +387,7 @@ int main(int argc, char *argv[])
         const char *msg = "no primary device found - using first device!";
         fprintf(stderr, "vdr: %s\n", msg);
         esyslog("ERROR: %s", msg);
-        if (!cDevice::SetPrimaryDevice(0))
+        if (!cDevice::SetPrimaryDevice(1))
            return 2;
         if (!cDevice::PrimaryDevice()) {
            const char *msg = "no primary device found - giving up!";

From 3feeb907f73f0b8ebc067f4b5686dd543121c1f1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Sep 2003 18:00:00 +0200
Subject: [PATCH 083/307] Version 1.2.5pre3 - Fixed dropping out of replay mode
 while viewing a recording that is still   going on (thanks to Oliver Endriss
 for reporting and helping to debug this   one). - Fixed handling ':'
 characters in channel names when reading channels.conf   (thanks to Reinhard
 Nissl for reporting this one). - Fixed the URL to the 'Doxygen' tool in
 INSTALL (thanks to Dirk Essl). - Removed the obsolete chapter "Stopping a
 recording on the primary DVB interface"   from MANUAL. - Completed Dutch
 language texts (thanks to Hans Dingemans). - Made 'diseqc.conf' a required
 file only if Setup.DiSEqC is activated (thanks to   Thomas Schmidt). - VDR
 now starts up even if 'keymacros.conf' references a plugin that is currently 
  not loaded (suggested by Alexander Wetzel). - Fixed checking for
 VIDEO_STREAM_S in cRemux::SetBrokenLink() (thanks to Oliver   Endriss). -
 Added 'repeat' function to keys '7' and '9' ("jump to mark") in replay mode  
 (suggested by Oliver Endriss). - Made cOsdMenu::Display() virtual, which
 allows plugins to do some additional   processing after calling the base
 class function (suggested by Jan Rieger). - Updated 'ca.conf' (thanks to
 Marco Franceschetti).

---
 CONTRIBUTORS | 22 ++++++++++++++++++
 HISTORY      | 23 +++++++++++++++++++
 INSTALL      |  2 +-
 MANUAL       | 14 ------------
 ca.conf      | 14 +++++-------
 channels.c   |  8 +++----
 config.h     |  4 ++--
 i18n.c       | 64 ++++++++++++++++++++++++++--------------------------
 keys.c       |  5 ++--
 menu.c       |  4 +++-
 osd.h        |  4 ++--
 recording.c  |  3 ++-
 recording.h  |  4 +++-
 remux.c      |  4 ++--
 vdr.c        |  4 ++--
 15 files changed, 107 insertions(+), 72 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e6802474b..04e01a2fd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -491,6 +491,10 @@ Oliver Endriss <o.endriss@gmx.de>
  for fixing I/O handling in case an explicit controlling terminal is given
  for fixing displaying still pictures, now using the driver's VIDEO_STILLPICTURE call
  directly
+ for reporting and helping to debug dropping out of replay mode while viewing a
+ recording that is still going on
+ for fixing checking for VIDEO_STREAM_S in cRemux::SetBrokenLink()
+ for suggesting to add 'repeat' function keys '7' and '9'
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -597,6 +601,8 @@ Sven Goethel <sgoethel@jausoft.com>
 
 Jan Rieger <jan@ricomp.de>
  for suggestions and testing raw keyboard input
+ for suggesting to make cOsdMenu::Display() virtual, which allows plugins to do some
+ additional processing after calling the base class function
 
 Walter Stroebel <walter.stroebel@lifeline.nl>
  for introducing "Doxygen" to document the VDR source code
@@ -745,6 +751,7 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
 
 Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
  for reporting a crash when cancelling a newly created timer
+ for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated
 
 Michael Walle <michael.walle@web.de>
  for reporting a bug in channel switching after Left/Right has been pressed
@@ -766,6 +773,8 @@ Ernst F
 Reinhard Nissl <rnissl@gmx.de>
  for reporting a name clash because of function crc32() in libdtv/libsi/si_parser.c
  when using other libraries that also implement a function by that name
+ for reporting a bug in handling ':' characters in channel names when reading
+ channels.conf
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -799,3 +808,16 @@ Christoph Hermanns <christoph.hermanns@gmx.de>
 Oskar Signell <oskar@signell.net>
  for pointing out a problem with setting an editing mark while in "Pause" mode,
  where replay was not immediately positioned to the marked frame
+
+Dirk Essl <de@floydworld.de>
+ for reporting a wrong URL to the 'Doxygen' tool in INSTALL
+
+Hans Dingemans <hans.dingemans@tacticalops.nl>
+ for translating OSD texts to the Dutch language
+
+Alexander Wetzel <alexander.wetzel@web.de>
+ for suggesting to let VDR start up even if 'keymacros.conf' references a plugin
+ that is currently not loaded
+
+Marco Franceschetti <ordaz@quipo.it>
+ for updating 'ca.conf'
diff --git a/HISTORY b/HISTORY
index 3a6db48a2..2e21e14fd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2375,3 +2375,26 @@ Video Disk Recorder Revision History
 - The DVB devices no longer send CA descriptors to the CAM while the EPG scanner
   is active (sometimes the CAMs got irritated when the device tuned to channels
   they couldn't handle).
+
+2003-09-14: Version 1.2.5pre3
+
+- Fixed dropping out of replay mode while viewing a recording that is still
+  going on (thanks to Oliver Endriss for reporting and helping to debug this
+  one).
+- Fixed handling ':' characters in channel names when reading channels.conf
+  (thanks to Reinhard Nissl for reporting this one).
+- Fixed the URL to the 'Doxygen' tool in INSTALL (thanks to Dirk Essl).
+- Removed the obsolete chapter "Stopping a recording on the primary DVB interface"
+  from MANUAL.
+- Completed dutch language texts (thanks to Hans Dingemans).
+- Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated (thanks to
+  Thomas Schmidt).
+- VDR now starts up even if 'keymacros.conf' references a plugin that is currently
+  not loaded (suggested by Alexander Wetzel).
+- Fixed checking for VIDEO_STREAM_S in cRemux::SetBrokenLink() (thanks to Oliver
+  Endriss).
+- Added 'repeat' function keys '7' and '9' ("jump to mark") in replay mode
+  (suggested by Oliver Endriss).
+- Made cOsdMenu::Display() virtual, which allows plugins to do some additional
+  processing after calling the base class function (suggested by Jan Rieger).
+- Updated 'ca.conf' (thanks to Marco Franceschetti).
diff --git a/INSTALL b/INSTALL
index 3143723f1..a49acfcae 100644
--- a/INSTALL
+++ b/INSTALL
@@ -382,7 +382,7 @@ Generating source code documentation:
 -------------------------------------
 
 You can do a 'make srcdoc' to generate source code documentation using the
-Doxygen tool. To do so you need the Doxygen package from http://www.doxygen.src
+Doxygen tool. To do so you need the Doxygen package from http://www.doxygen.org
 and the Graphviz package from http://www.research.att.com/sw/tools/graphviz.
 After installing these two packages you can do 'make srcdoc' and then use your
 HTML browser to read srcdoc/html/index.html.
diff --git a/MANUAL b/MANUAL
index 3abf7eef4..29eb334e2 100644
--- a/MANUAL
+++ b/MANUAL
@@ -393,20 +393,6 @@ Version 1.2
   A timer can also be programmed by pressing the "Red" button on the "Schedule",
   "Now", "Next" or "Event" menus.
 
-* Stopping a recording on the primary DVB interface
-
-  If the primary DVB interface is currently recording, the user can't switch
-  the channel or replay another recording on that interface. However, if there
-  is an other DVB interface that is currently not recording and provides the
-  necessary conditional access facilities to continue the recording that is
-  currently being performed on the primary DVB interface, the "VDR" menu will
-  contain an option that allows you to stop recording on the primary DVB
-  interface. Select that option to stop the ongoing recording and thus free the
-  primary DVB interface to allow channel switching or replaying. The interrupted
-  recording will be continued on an other free DVB interface. There may be a
-  short discontinuity at that point when replaying that recording later, so you
-  may want to place such an action for instance in a commercial break.
-
 * Parameters in the "Setup" menu
 
   Select "Setup" from the "VDR" menu to enter the setup menu. From there you can
diff --git a/ca.conf b/ca.conf
index fe3d758b0..49bff1965 100644
--- a/ca.conf
+++ b/ca.conf
@@ -31,6 +31,7 @@
 404    Parabole Reunion
 405    Hrvatska radiotelevizija
 406    RTV Slovenija
+407    Visat
 
 # Viaccess 2
 
@@ -52,6 +53,7 @@
 # Nagravision
 
 901    PolSat Cyfrowy
+902    TV Cabo
 
 # Irdeto 2
 
@@ -68,13 +70,9 @@
 10001  AB Sat France
 10002  TPS France
 
-# Videoguard, Mediaguard 2, Irdeto 1
+# Videoguard, Mediaguard 2, Irdeto 2
 
-11001  Stream TV Italy
-
-# Videoguard, Mediaguard 2, Cryptoworks
-
-12001  Tele+ Digitale
+12001  Sky Italia
 
 # Mediaguard 1, Irdeto 1
 
@@ -84,9 +82,9 @@
 
 14001  Canal Satellite France
 
-# Mediaguard 1, Mediaguard 2, Viaccess 1, Cryptoworks
+# Mediaguard 2, Nagravision
 
-15001  Canal Satelite Digital Espana
+15001  Digital+ Espana
 
 # Mediaguard 2, Cryptoworks
 
diff --git a/channels.c b/channels.c
index 585772968..6ff71888f 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.13 2003/08/16 09:12:26 kls Exp $
+ * $Id: channels.c 1.14 2003/09/09 18:55:26 kls Exp $
  */
 
 #include "channels.h"
@@ -315,6 +315,7 @@ const char *cChannel::ToText(void)
 
 bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
 {
+  bool ok = true;
   if (*s == ':') {
      groupSep = true;
      if (*++s == '@' && *++s) {
@@ -346,7 +347,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
         vpid  = ppid  = 0;
         apid1 = apid2 = 0;
         dpid1 = dpid2 = 0;
-        bool ok = false;
+        ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
            char *p = strchr(vpidbuf, '+');
@@ -372,13 +373,12 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            esyslog("ERROR: channel data not unique!");
            return false;
            }
-        return ok;
         }
      else
         return false;
      }
   strreplace(name, '|', ':');
-  return true;
+  return ok;
 }
 
 bool cChannel::Save(FILE *f)
diff --git a/config.h b/config.h
index b65b26579..d09019d1e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.171 2003/09/05 13:18:38 kls Exp $
+ * $Id: config.h 1.173 2003/09/14 10:37:49 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.5pre2"
+#define VDRVERSION  "1.2.5pre3"
 #define VDRVERSNUM   10205  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/i18n.c b/i18n.c
index 512c948fb..fc0e9e3c3 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.133 2003/08/26 15:27:25 kls Exp $
+ * $Id: i18n.c 1.134 2003/09/11 13:51:56 kls Exp $
  *
  * Translations provided by:
  *
  * Slovenian   Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  * Italian     Alberto Carraro <bertocar@tin.it> and Antonio Ospite <ospite@studenti.unina.it>
- * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
+ * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com> and Hans Dingemans <hans.dingemans@tacticalops.nl>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
  * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com> and Gregoire Favre <greg@magma.unil.ch>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
@@ -212,7 +212,7 @@ const tI18nPhrase Phrases[] = {
     "Befehle f�r Aufzeichnungen",
     "Ukazi za snemanje",
     "Comandi di Registrazione",
-    "",// TODO
+    "Opname commando's",
     "",// TODO
     "Commandes d'enregistrement",
     "",// TODO
@@ -672,7 +672,7 @@ const tI18nPhrase Phrases[] = {
     "Einf�gen",
     "Vstavi",
     "Inserisci",
-    "",// TODO
+    "Invoegen",
     "",// TODO
     "Ins�rt",
     "",// TODO
@@ -689,7 +689,7 @@ const tI18nPhrase Phrases[] = {
     "�berschreiben",
     "Prepisi",
     "Sovrascrivi",
-    "",// TODO
+    "Overschrijven",
     "",// TODO
     "�craser",
     "",// TODO
@@ -723,7 +723,7 @@ const tI18nPhrase Phrases[] = {
     "Reset",
     "Reset",
     "Reset",
-    "",//TODO
+    "Herstart",
     "",//TODO
     "R�initialisation",
     "",//TODO
@@ -997,7 +997,7 @@ const tI18nPhrase Phrases[] = {
     "Quelle",
     "Pozicija",
     "Sorgente",
-    "",//TODO
+    "Bron",
     "",//TODO
     "Source",
     "",//TODO
@@ -1594,7 +1594,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal nicht verf�gbar!",
     "Kanal ni razpolozljiv!",
     "Canale non disponibile!",
-    "",//TODO
+    "Kanaal niet beschikbaar",
     "",//TODO
     "Cha�ne non disponible!",
     "",//TODO
@@ -1611,7 +1611,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaleinstellungen sind nicht eindeutig!",
     "Nastavitve kanala niso edinstvene!",
     "Paramentri Canale non unici!",
-    "",//TODO
+    "Kanaalinstellingen zijn niet uniek!",
     "",//TODO
     "Caract�ristiques des cha�nes ne sont pas uniques",
     "",//TODO
@@ -1662,7 +1662,7 @@ const tI18nPhrase Phrases[] = {
     "Keine Schnittmarken gesetzt!",
     "Nobena tocka ni definirana!",
     "Nessun marcatore di modifica definito!",
-    "",//TODO
+    "Geen bewerkingsmarkeringen gedefinieerd!",
     "",//TODO
     "Pas de marques d'�dition d�finies!",
     "",//TODO
@@ -1747,7 +1747,7 @@ const tI18nPhrase Phrases[] = {
     "CAM-Men� kann nicht ge�ffnet werden!",
     "Ne morem odpreti CAM menija!",
     "Impossibile aprire il menu CAM!",
-    "",//TODO
+    "Kan CAM-menu niet openen!",
     "",//TODO
     "Impossible d'ouvrir le menu CAM!",
     "",//TODO
@@ -1764,7 +1764,7 @@ const tI18nPhrase Phrases[] = {
     "CAM-Reset fehlgeschlagen!",
     "Ne morem resetirati CAM-a",
     "Impossibile reimpostare il modulo CAM!",
-    "",//TODO
+    "Kan CAM niet herstarten!",
     "",//TODO
     "Impossible de r�initialiser la CAM!",
     "",//TODO
@@ -1781,7 +1781,7 @@ const tI18nPhrase Phrases[] = {
     "CAM wurde zur�ckgesetzt!",
     "CAM je resetiran!",
     "Modulo CAM reimpostato!",
-    "",//TODO
+    "CAM is herstart!",
     "",//TODO
     "La CAM a �t� r�initialis�e",
     "",//TODO
@@ -2412,7 +2412,7 @@ const tI18nPhrase Phrases[] = {
     "Pause Priorit�t",
     "Prioriteta pavze",
     "Priorita' di pausa",
-    "",// TODO
+    "Pauze prioriteit",
     "",// TODO
     "Priorit� des pauses",
     "",// TODO
@@ -2429,7 +2429,7 @@ const tI18nPhrase Phrases[] = {
     "Pause Lebensdauer (d)",
     "Cas pavze (d)",
     "Durata pausa (gg)",
-    "",// TODO
+    "Pauze levensduur (d)",
     "",// TODO
     "Dur�e de vie des pauses (j)",
     "",// TODO
@@ -2497,7 +2497,7 @@ const tI18nPhrase Phrases[] = {
     "Dauer der Direktaufzeichnung (min)",
     "Cas direktnega snemanja (min)",
     "Tempo registrazione istantanea (min)",
-    "",//TODO
+    "Duur van de directe opname (min)",
     "",//TODO
     "Dur�e enregistr. imm�diat (min)",
     "",//TODO
@@ -2599,7 +2599,7 @@ const tI18nPhrase Phrases[] = {
     "Wiedergabe ID",
     "Predvajalni ID",
     "Resume ID",// TODO
-    "Resume ID",// TODO
+    "Hervattings ID",
     "Resume ID",// TODO
     "ID de reprise",
     "Resume ID",// TODO
@@ -2667,7 +2667,7 @@ const tI18nPhrase Phrases[] = {
     "Zap Timeout (s)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Zap timeout (s)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2925,7 +2925,7 @@ const tI18nPhrase Phrases[] = {
     "('Men�' dr�cken zum �berspringen)",
     "pritisnite 'Meni' za preskok te tipke",
     "(premere 'Menu' per saltare questo tasto)",
-    "",// TODO
+    "Druk 'Menu' om deze toets over te slaan",
     "",// TODO
     "('Menu' pour passer cette touche)",
     "",// TODO
@@ -3164,7 +3164,7 @@ const tI18nPhrase Phrases[] = {
     "Wiedergabe",
     "Predvajaj",
     "Riproduci",
-    "",// TODO
+    "Weergeven",
     "",// TODO
     "Lecture",
     "",// TODO
@@ -3181,7 +3181,7 @@ const tI18nPhrase Phrases[] = {
     "Pause",
     "Pavza",
     "Pausa",
-    "",// TODO
+    "Pauze",
     "",// TODO
     "Pause",
     "",// TODO
@@ -3198,7 +3198,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "Ustavi",
     "Stop",
-    "",// TODO
+    "Stop",
     "Stop",
     "Stop",
     "",// TODO
@@ -3215,7 +3215,7 @@ const tI18nPhrase Phrases[] = {
     "Aufnehmen",
     "Snemaj",
     "Registra",
-    "",// TODO
+    "Opnemen",
     "",// TODO
     "Enregistrement",
     "",// TODO
@@ -3232,7 +3232,7 @@ const tI18nPhrase Phrases[] = {
     "Vorlauf",
     "Hitro naprej",
     "Avanti Veloce",
-    "",// TODO
+    "Vooruitspoelen",
     "",// TODO
     "Avance rapide",
     "",// TODO
@@ -3249,7 +3249,7 @@ const tI18nPhrase Phrases[] = {
     "R�cklauf",
     "Hitro nazaj",
     "Indietro Veloce",
-    "",// TODO
+    "Terugspoelen",
     "",// TODO
     "Retour rapide",
     "",// TODO
@@ -3283,7 +3283,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal+",
     "Kanal+",
     "Canale +",
-    "",// TODO
+    "Kanaal+",
     "",// TODO
     "Cha�ne+",
     "",// TODO
@@ -3300,7 +3300,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal-",
     "Kanal-",
     "Canale -",
-    "",// TODO
+    "Kanaal-",
     "",// TODO
     "Cha�ne-",
     "",// TODO
@@ -3403,7 +3403,7 @@ const tI18nPhrase Phrases[] = {
     "aus",
     "izklop",
     "off",
-    "",// TODO
+    "uit",
     "off",
     "",// TODO
     "",// TODO
@@ -3420,7 +3420,7 @@ const tI18nPhrase Phrases[] = {
     "keine",
     "nobeden",
     "nessuno",
-    "",// TODO
+    "geen",
     "",// TODO
     "aucun",
     "",// TODO
@@ -3437,7 +3437,7 @@ const tI18nPhrase Phrases[] = {
     "auto",
     "avtomatsko",
     "auto",
-    "",// TODO
+    "auto",
     "",// TODO
     "auto",
     "",// TODO
@@ -3709,7 +3709,7 @@ const tI18nPhrase Phrases[] = {
     "Live-Signal wird angehalten...",
     "Ustavljanje predvajanja v zivo...",
     "Pausa del canale in visione...",
-    "",// TODO
+    "Pauzeren live uitzending...",
     "",// TODO
     "Pause de l'�mission en direct...",
     "",// TODO
@@ -3726,7 +3726,7 @@ const tI18nPhrase Phrases[] = {
     "Dieses Plugin hat keine Setup-Parameter!",
     "Ta plugin nima nastavitvenih parametrov!",
     "Questo plugin non ha parametri di setup!",
-    "",// TODO
+    "Deze plugin heeft geen instelparameters",
     "",// TODO
     "Ce plugin n'a pas de param�tres!",
     "",// TODO
diff --git a/keys.c b/keys.c
index 381b3189b..5529f3231 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.4 2002/11/30 16:01:37 kls Exp $
+ * $Id: keys.c 1.5 2003/09/14 10:07:47 kls Exp $
  */
 
 #include "keys.h"
@@ -212,7 +212,8 @@ bool cKeyMacro::Parse(char *s)
                  plugin = strdup(p + 1);
                  if (!cPluginManager::GetPlugin(plugin)) {
                     esyslog("ERROR: unknown plugin '%s'", plugin);
-                    return false;
+                    // this is not a fatal error - plugins may or may not be loaded
+                    macro[--n] = kNone; // makes sure the key doesn't cause any side effects
                     }
                  }
               else {
diff --git a/menu.c b/menu.c
index 54c07900b..9f8dea4dc 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.271 2003/09/06 10:26:45 kls Exp $
+ * $Id: menu.c 1.272 2003/09/14 10:49:28 kls Exp $
  */
 
 #include "menu.h"
@@ -3664,7 +3664,9 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
       switch (Key) {
         // Editing:
         case kMarkToggle:      MarkToggle(); break;
+        case kMarkJumpBack|k_Repeat:
         case kMarkJumpBack:    MarkJump(false); break;
+        case kMarkJumpForward|k_Repeat:
         case kMarkJumpForward: MarkJump(true); break;
         case kMarkMoveBack|k_Repeat:
         case kMarkMoveBack:    MarkMove(false); break;
diff --git a/osd.h b/osd.h
index ffce583f0..3835b093f 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.39 2003/04/21 10:27:41 kls Exp $
+ * $Id: osd.h 1.40 2003/09/14 10:59:22 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -165,7 +165,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   int Current(void) { return current; }
   void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
-  void Display(void);
+  virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/recording.c b/recording.c
index bcbfd9f63..6d01ffa42 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.82 2003/08/17 09:10:46 kls Exp $
+ * $Id: recording.c 1.83 2003/09/09 16:02:55 kls Exp $
  */
 
 #include "recording.h"
@@ -859,6 +859,7 @@ bool cIndexFile::CatchUp(int Index)
 {
   // returns true unless something really goes wrong, so that 'index' becomes NULL
   if (index && f >= 0) {
+     cMutexLock MutexLock(&mutex);
      for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
          struct stat buf;
          if (fstat(f, &buf) == 0) {
diff --git a/recording.h b/recording.h
index 677e354b2..42fc1a209 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.26 2003/08/17 09:03:46 kls Exp $
+ * $Id: recording.h 1.27 2003/09/09 16:00:56 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -12,6 +12,7 @@
 
 #include <time.h>
 #include "config.h"
+#include "thread.h"
 #include "timers.h"
 #include "tools.h"
 
@@ -130,6 +131,7 @@ class cIndexFile {
   int size, last;
   tIndex *index;
   cResumeFile resumeFile;
+  cMutex mutex;
   bool CatchUp(int Index = -1);
 public:
   cIndexFile(const char *FileName, bool Record);
diff --git a/remux.c b/remux.c
index 6dc37e1b6..5ea24bf9e 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.16 2003/08/06 14:44:03 kls Exp $
+ * $Id: remux.c 1.17 2003/09/14 10:34:39 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -672,7 +672,7 @@ XXX*/
 
 void cRemux::SetBrokenLink(uchar *Data, int Length)
 {
-  if (Length > 9 && Data[0] == 0 && Data[1] == 0 && Data[2] == 1 && (Data[3] & VIDEO_STREAM_S) == VIDEO_STREAM_S) {
+  if (Length > 9 && Data[0] == 0 && Data[1] == 0 && Data[2] == 1 && (Data[3] & 0xF0) == VIDEO_STREAM_S) {
      for (int i = Data[8] + 9; i < Length - 7; i++) { // +9 to skip video packet header
          if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1 && Data[i + 3] == 0xB8) {
             if (!(Data[i + 7] & 0x40)) // set flag only if GOP is not closed
diff --git a/vdr.c b/vdr.c
index cdc460ead..e4874afc0 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $
+ * $Id: vdr.c 1.169 2003/09/14 09:36:54 kls Exp $
  */
 
 #include <getopt.h>
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
 
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
   if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
-        Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) &&
+        Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC) &&
         Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
         Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
         Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&

From 59c9f24fbe2e9d78139c578dd8ce9da81ab1ca94 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Wed, 17 Sep 2003 18:00:00 +0200
Subject: [PATCH 084/307] =?UTF-8?q?Version=201.2.5=20-=20Updated=20'channe?=
 =?UTF-8?q?ls.conf.cable'=20(thanks=20to=20Stefan=20Hu=C3=9Ffeldt).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HISTORY             |  4 +++
 channels.conf.cable | 70 ++++++++++++++++++++++++---------------------
 config.h            |  4 +--
 3 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/HISTORY b/HISTORY
index 2e21e14fd..6ac90e7b9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2398,3 +2398,7 @@ Video Disk Recorder Revision History
 - Made cOsdMenu::Display() virtual, which allows plugins to do some additional
   processing after calling the base class function (suggested by Jan Rieger).
 - Updated 'ca.conf' (thanks to Marco Franceschetti).
+
+2003-09-17: Version 1.2.5
+
+- Updated 'channels.conf.cable' (thanks to Stefan Hu�feldt).
diff --git a/channels.conf.cable b/channels.conf.cable
index aed98d11b..4d60373f0 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -14,8 +14,8 @@ EuroNews:394:M64:C:6900:2221:2233:768:0:28015:0:0:0
 CNBC:394:M64:C:6900:510:520:530:0:28010:0:0:0
 Eurosport:394:M64:C:6900:410:420:430:0:28009:0:0:0
 :Regionalprogramme
-SFB1:426:M64:C:6900:601:602:604:0:28206:0:0:0
-ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205:0:0:0
+RBB Berlin:426:M64:C:6900:601:602:604:0:28206:0:0:0
+RBB Brandenburg:426:M64:C:6900:501:502:504:0:28205:0:0:0
 N3:426:M64:C:6900:2401:2402:2404:0:28224:0:0:0
 MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204:0:0:0
 WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111:0:0:0
@@ -23,8 +23,8 @@ hessen fernsehen:410:M64:C:6900:301:302:304:0:28108:0:0:0
 BR-alpha:410:M64:C:6900:701:702:704:0:28112:0:0:0
 Bayerisches FS:410:M64:C:6900:201:202:125:0:28107:0:0:0
 SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110:0:0:0
-SuedWest BW:410:M64:C:6900:801:802:804:0:28113:0:0:0
-SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231:0:0:0
+S�DWEST BW:410:M64:C:6900:801:802:804:0:28113:0:0:0
+S�DWEST RP:426:M64:C:6900:3101:3102:3104:0:28231:0:0:0
 :Hauptprogramme Premiere
 PREMIERE START:370:M64:C:6900:255:256:32:101:8:0:0:0
 PREMIERE 1:370:M64:C:6900:511:512;515:0:101:10:0:0:0
@@ -35,16 +35,16 @@ PREMIERE 5:370:M64:C:6900:1279:1280,1281:0:101:29:0:0:0
 PREMIERE 6:370:M64:C:6900:1535:1536:0:101:41:0:0:0
 PREMIERE 7:370:M64:C:6900:1023:1024:0:101:20:0:0:0
 PREMIERE SERIE:378:M64:C:6900:1023:1024:0:101:16:0:0:0
-PREMIERE Nostalgie:378:M64:C:6900:2559:2560:0:101:516:0:0:0
+PREMIERE NOSTALGIE:378:M64:C:6900:2559:2560:0:101:516:0:0:0
 13 TH STREET:354:M64:C:6900:2303:2304:0:101:42:0:0:0
-STUDIO UNIVERSAL:354:M64:C:6900:2047:2048:0:101:36:0:0:0
+SCI FI:354:M64:C:6900:2047:2048:0:101:36:0:0:0
 MGM:354:M64:C:6900:767:768,769:0:101:515:0:0:0
 PREMIERE KRIMI:378:M64:C:6900:1535:1536:0:101:23:0:0:0
-Disney Channel:354:M64:C:6900:2559:2560:0:101:34:0:0:0
+DISNEY CHANNEL:354:M64:C:6900:2559:2560:0:101:34:0:0:0
 DISCOVERY CHANNEL:354:M64:C:6900:1023:1024:0:101:14:0:0:0
 PLANET:354:M64:C:6900:1535:1536:0:101:13:0:0:0
-Fox Kids:354:M64:C:6900:1279:1280:0:101:28:0:0:0
-Junior:354:M64:C:6900:255:256:0:101:19:0:0:0
+FOX KIDS:354:M64:C:6900:1279:1280:0:101:28:0:0:0
+JUNIOR:354:M64:C:6900:255:256:0:101:19:0:0:0
 HEIMATKANAL:386:M64:C:6900:1279:1280:0:101:22:0:0:0
 GOLDSTAR TV:386:M64:C:6900:3839:3840:0:101:518:0:0:0
 CLASSICA:386:M64:C:6900:767:768:0:101:15:0:0:0
@@ -73,47 +73,53 @@ PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513:0:0:0
 PREMIERE EROTIK 2:386:M64:C:6900:1535:1536:0:101:778:0:0:0
 PREMIERE EROTIK 3:386:M64:C:6900:1791:1792:0:101:779:0:0:0
 PREMIERE EROTIK 4:386:M64:C:6900:3583:3584:0:101:780:0:0:0
-:NEU
-Test-R:410:M64:C:6900:701:702:125:0:28130:0:0:0
-Test-R:410:M64:C:6900:901:902:125:0:28130:0:0:1
-ARD-Online-Kanal:426:M64:C:6900:0:1801,1805:0:101:28218:0:0:0
-TestS33:402:M64:C:6900:1211:1212:0:101:53001:0:0:0
-Test S 38:442:M64:C:6900:513:514:0:101:53301:0:0:0
+:TESTS
+Test-R:410:M64:C:6900:201:202:204:0:28130:0:0:0
+Test-R:410:M64:C:6900:701:702:125:0:28130:0:0:1
+Test-R:410:M64:C:6900:901:902:125:0:28130:0:0:2
+Test S38 D442 TP B9:442:M64:C:6900:513:514:0:101:53301:0:0:0
+Test S 26:346:M64:C:6900:811:812:0:101:50701:0:0:0
+ARD-MHP-TEST-5:426:M64:C:6900:101:102:0:0:28221:0:0:0
+ARD-Online-Kanal:426:M64:C:6900:0:1801,1807:0:0:28218:0:0:0
+DPC.TV 1:346:M64:C:6900:821:822:0:101:658:0:0:0
+DPC.TV 2:346:M64:C:6900:831:832:0:101:659:0:0:0
+[00d5]:354:M64:C:6900:1791:0:0:0:213:0:0:0
+[0309]:386:M64:C:6900:255:256:0:0:777:0:0:0
 :DIGIKABEL D
 Club:113:M64:C:6900:711:712,713:0:101:53401:0:0:0
 Liberty TV:113:M64:C:6900:721:722,723:0:101:53402:0:0:0
 Einstein TV:113:M64:C:6900:701:702:0:101:53410:0:0:0
 BibelTV:113:M64:C:6900:731:732:0:101:53403:0:0:0
-Avante:113:M64:C:6900:741:742,743:0:101:53404:0:0:0
 TW1:113:M64:C:6900:751:752:753:101:53405:0:0:0
-:DIGIKABEL INT
 Extreme Sports:113:M64:C:6900:791:792,793:0:101:53409:0:0:0
+:DIGIKABEL INT
 BBC Prime:113:M64:C:6900:761:762:763:101:53406:0:0:0
 Eurosport News:113:M64:C:6900:771:772:774:101:53407:0:0:0
 MTV Base:113:M64:C:6900:781:782:0:101:53408:0:0:0
-ATV 2:434:M64:C:6900:631:632:633:101:53203:0:0:0
+ERT-Sat:434:M64:C:6900:691:692:693:101:53209:0:0:0
+PCNE:121:M64:C:6900:911:912:0:101:53208:0:0:0
+TV Polonia:434:M64:C:6900:641:642:643:101:53204:0:0:0
+:DIGIKABEL TR
 Show TV:402:M64:C:6900:1111:1112:0:101:53501:0:0:0
 TGRT:402:M64:C:6900:1121:1122:0:101:53502:0:0:0
-Kanal D:434:M64:C:6900:651:652:653:101:53205:0:0:0
-Fox Kids - RUS:434:M64:C:6900:671:672:0:101:53207:0:0:0
 Kanal 7:402:M64:C:6900:1131:1132:0:101:53504:0:0:0
-ERT-Sat:434:M64:C:6900:691:692:693:101:53209:0:0:0
-PCNE:121:M64:C:6900:911:912:0:101:53208:0:0:0
+ATV 2:434:M64:C:6900:631:632:633:101:53203:0:0:0
+Kanal D:434:M64:C:6900:651:652:653:101:53205:0:0:0
+Fox Kids:434:M64:C:6900:671:673:0:101:53210:0:0:0
+:DIGIKABEL I
 Rai 1:402:M64:C:6900:1141:1142:1143:101:53505:0:0:0
 Rai 2:402:M64:C:6900:1151:1152:1153:101:53506:0:0:0
 Rai 3:402:M64:C:6900:1161:1162:1163:101:53507:0:0:0
-Alice:121:M64:C:6900:961:962:0:101:53601:0:0:0
-Leonardo:121:M64:C:6900:951:952:0:101:53523:0:0:0
-Nuvolari:121:M64:C:6900:941:942:0:101:53211:0:0:0
-TV Polonia:434:M64:C:6900:641:642:643:101:53204:0:0:0
-TVEi:434:M64:C:6900:681:682:683:101:53508:0:0:0
-Canal 24 Horas:434:M64:C:6900:601:602:603:101:53509:0:0:0
-RTP Internacional:434:M64:C:6900:661:662:663:101:53206:0:0:0
+:DIGIKABEL RUS
 RTVi:434:M64:C:6900:611:612:0:101:53201:0:0:0
 Nashe Kino:434:M64:C:6900:621:622:0:101:53202:0:0:0
-Detski Mir:121:M64:C:6900:931:932:0:101:53503:0:0:0
-Fox Kids:434:M64:C:6900:671:673:0:101:53210:0:0:0
+Fox Kids:434:M64:C:6900:671:672:0:101:53207:0:0:0
+Detsky Mir:121:M64:C:6900:931:932:0:101:53503:0:0:0
 RTR Planeta:121:M64:C:6900:921:922:0:101:53212:0:0:0
+:DIGIKABEL ESP
+RTP Internacional:434:M64:C:6900:661:662:663:101:53206:0:0:0
+TVEi:434:M64:C:6900:681:682:683:101:53508:0:0:0
+Canal 24 Horas:434:M64:C:6900:601:602:603:101:53509:0:0:0
 :Radio-Sender (FTV)
 B5 aktuell:410:M64:C:6900:0:3101:0:0:28121:0:0:0
 Bayern 1:410:M64:C:6900:0:3601:0:0:28126:0:0:0
@@ -122,7 +128,7 @@ DLF-K
 DLR-Berlin:394:M64:C:6900:0:710:0:0:28012:0:0:0
 Fritz:426:M64:C:6900:0:901:0:0:28209:0:0:0
 hr2:410:M64:C:6900:0:3301:0:0:28123:0:0:0
-hr-chronos:410:M64:C:6900:0:3201:0:0:28122:0:0:0
+hr-skyline:410:M64:C:6900:0:3201:0:0:28122:0:0:0
 hr-klassik:410:M64:C:6900:0:3401:0:0:28124:0:0:0
 HR XXL:410:M64:C:6900:0:3501:0:0:28125:0:0:0
 JUMP:426:M64:C:6900:0:1001:0:0:28210:0:0:0
diff --git a/config.h b/config.h
index d09019d1e..9f5ab38d7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.173 2003/09/14 10:37:49 kls Exp $
+ * $Id: config.h 1.174 2003/09/17 16:08:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.5pre3"
+#define VDRVERSION  "1.2.5"
 #define VDRVERSNUM   10205  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99

From 162ed534b0cb1ffc481ac5a1b7eb4a2e3418aa4b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 17 Oct 2003 18:00:00 +0200
Subject: [PATCH 085/307] Version 1.2.6pre1 - Updated the required driver
 version in INSTALL (thanks to Jens Groth for   reporting this one). - Fixed
 missing channel info after an incomplete channel group switch (thanks   to
 Andreas Trauer). - Fixed handling a channels.conf that contains a ":@nnn"
 line as its last entry   (thanks to Ralf Klueber). - Fixed detecting the
 /dev/videoN devices for GRAB in case there are others   before the DVB
 devices (thanks to Andreas Kool). - Updated 'channels.conf.terr' for Berlin
 (thanks to Markus Hardt). - Fixed handling rc key learning in case
 cRemote::Initialize() returns 'false'   (thanks to Oliver Endriss). - Fixed
 initializing the highlight area in cDvbSpuDecoder (thanks to Sven Goethel). -
 Now trying to get a timer's channel without RID when loading 'timers.conf'  
 (thanks to Thomas Rausch). - Removed the unused 0x73 (TOT) filter in eit.c
 (thanks to Andreas Trauer). - Fixed extracting the ES data in
 cDvbDevice::StillPicture() (thanks to Stefan   Huelswitt). - Added MPEG1
 handling to cDvbDevice::StillPicture() (thanks to Thomas   Heiligenmann). -
 Changed the default "Lifetime" to 99, which means that recordings will  
 never be deleted automatically in case the disk runs full (suggested by  
 Oliver Endriss). Note that in an existing VDR installation the current  
 value as set in 'setup.conf' will still be used - this change only affects  
 new VDR installations. - Edited recordings will now never be deleted
 automatically if the disk runs   full (suggested by Emil Naepflein). -
 Channel IDs are now checked when reading 'channels.conf' to avoid later  
 problems with timers.

---
 CONTRIBUTORS       | 23 +++++++++++
 HISTORY            | 33 +++++++++++++++-
 INSTALL            |  2 +-
 MANUAL             |  5 ++-
 channels.c         | 11 ++++--
 channels.conf.terr | 16 ++++----
 config.c           |  4 +-
 config.h           |  6 +--
 dvbdevice.c        | 97 ++++++++++++++++++++++++++++++++++++++--------
 dvbdevice.h        |  5 ++-
 dvbspu.c           |  6 ++-
 eit.c              |  7 +---
 interface.c        | 14 +++++--
 interface.h        |  4 +-
 menu.c             |  3 +-
 recording.c        | 11 +++++-
 recording.h        |  3 +-
 timers.c           |  4 +-
 18 files changed, 199 insertions(+), 55 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 04e01a2fd..3c86eee6a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -176,6 +176,7 @@ Stefan Huelswitt <huels@iname.com>
  for fixing a memory leak in cNonBlockingFileReader
  for fixing an uninitialized variable in cDisplayChannel
  for fixing a possible access of invalid file handles in cSIProcessor::Action()
+ for fixing extracting the ES data in cDvbDevice::StillPicture()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -267,6 +268,7 @@ Andy Grobb <Charly98@01019freenet.de>
 
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
+ for adding MPEG1 handling to cDvbDevice::StillPicture()
 
 Norbert Schmidt <nschmidt-nrw@t-online.de>
  for filling in some missing teletext PIDs
@@ -495,6 +497,8 @@ Oliver Endriss <o.endriss@gmx.de>
  recording that is still going on
  for fixing checking for VIDEO_STREAM_S in cRemux::SetBrokenLink()
  for suggesting to add 'repeat' function keys '7' and '9'
+ for fixing handling rc key learning in case cRemote::Initialize() returns 'false'
+ for suggesting to change the default "Lifetime" to 99
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -568,6 +572,8 @@ Andreas Kool <akool@akool.de>
  for his help in keeping 'channels.conf.cable' up to date
  for fixing the TS to PES repacker so that it works with MPEG1 streams
  for reporting a problem with empty values in setup.conf
+ for fixing detecting the /dev/videoN devices for GRAB in case there are others
+ before the DVB devices
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
@@ -588,6 +594,7 @@ Emil Naepflein <Emil.Naepflein@philosys.de>
  housekeeping
  for fixing selecting the device, because sometimes an FTA recording terminated a
  CA recording
+ for suggesting to never delete edited recordings automatically if the disk runs full
 
 Gerald Berwolf <genka@genka.de>
  for suggesting to deactivate some templates in tools.h in case some plugin needs to
@@ -598,6 +605,7 @@ Thomas Sailer <sailer@scs.ch>
 
 Sven Goethel <sgoethel@jausoft.com>
  for making switching audio channels work without stopping/restarting the DMX
+ for fixing initializing the highlight area in cDvbSpuDecoder
 
 Jan Rieger <jan@ricomp.de>
  for suggestions and testing raw keyboard input
@@ -728,6 +736,8 @@ Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
+ for reporting a bug in handling a channels.conf that contains a ":@nnn" line as
+ its last entry
 
 Hermann Gausterer <mrq1@gmx.net>
  for suggesting to switch to the recording channel in case the current channel
@@ -821,3 +831,16 @@ Alexander Wetzel <alexander.wetzel@web.de>
 
 Marco Franceschetti <ordaz@quipo.it>
  for updating 'ca.conf'
+
+Jens Groth <Jens_Groth@t-online.de>
+ for reporting a an outdated driver version number in INSTALL
+
+Andreas Trauer <vdr@trauers.homelinux.net>
+ for fixing missing channel info after an incomplete channel group switch
+ for removing the unused 0x73 (TOT) filter in eit.c
+
+Markus Hardt <markus.hardt@gmx.net>
+ for his help in keeping 'channels.conf.terr' up to date
+
+Thomas Rausch <Thomas.Rausch@gmx.de>
+ for making VDR try to get a timer's channel without RID when loading 'timers.conf'
diff --git a/HISTORY b/HISTORY
index 6ac90e7b9..3ce2d0698 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2280,7 +2280,7 @@ Video Disk Recorder Revision History
 - Fixed a possible crash in case a VFAT file system is used without compiling VDR
   with VFAT=1 (thanks to Ernst F�rst for reporting this one).
 - Now the program uses the values of VIDEODIR and PLUGINDIR defined in Makefile
-  or Makefile.config as defaults (thanks to Steffen Barszus).
+  or Make.config as defaults (thanks to Steffen Barszus).
 - Added the usual menu timeout to the CAM menus.
 
 2003-08-17: Version 1.2.3 (not officially released)
@@ -2402,3 +2402,34 @@ Video Disk Recorder Revision History
 2003-09-17: Version 1.2.5
 
 - Updated 'channels.conf.cable' (thanks to Stefan Hu�feldt).
+
+2003-10-17: Version 1.2.6pre1
+
+- Updated the required driver version in INSTALL (thanks to Jens Groth for
+  reporting this one).
+- Fixed missing channel info after an incomplete channel group switch (thanks
+  to Andreas Trauer).
+- Fixed handling a channels.conf that contains a ":@nnn" line as its last entry
+  (thanks to Ralf Klueber).
+- Fixed detecting the /dev/videoN devices for GRAB in case there are others
+  before the DVB devices (thanks to Andreas Kool).
+- Updated 'channels.conf.terr' for Berlin (thanks to Markus Hardt).
+- Fixed handling rc key learning in case cRemote::Initialize() returns 'false'
+  (thanks to Oliver Endriss).
+- Fixed initializing the highlight area in cDvbSpuDecoder (thanks to Sven Goethel).
+- Now trying to get a timer's channel without RID when loading 'timers.conf'
+  (thanks to Thomas Rausch).
+- Removed the unused 0x73 (TOT) filter in eit.c (thanks to Andreas Trauer).
+- Fixed extracting the ES data in cDvbDevice::StillPicture() (thanks to Stefan
+  Huelswitt).
+- Added MPEG1 handling to cDvbDevice::StillPicture() (thanks to Thomas
+  Heiligenmann).
+- Changed the default "Lifetime" to 99, which means that recordings will
+  never be deleted automatically in case the disk runs full (suggested by
+  Oliver Endriss). Note that in an existing VDR installation the current
+  value as set in 'setup.conf' will still be used - this change only affects
+  new VDR installations.
+- Edited recordings will now never be deleted automatically if the disk runs
+  full (suggested by Emil Naepflein).
+- Channel IDs are now checked when reading 'channels.conf' to avoid later
+  problems with timers.
diff --git a/INSTALL b/INSTALL
index a49acfcae..987d5a5aa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -28,7 +28,7 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile (see the file Make.config.template).
 
-VDR requires the Linux-DVB card driver version dated 2003-05-24 or higher
+VDR requires the Linux-DVB card driver version dated 2003-08-23 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
diff --git a/MANUAL b/MANUAL
index 29eb334e2..8687e7046 100644
--- a/MANUAL
+++ b/MANUAL
@@ -327,6 +327,9 @@ Version 1.2
   a second. A "start" mark marks the first frame of a resulting video
   sequence, and an "end" mark marks the last frame of that sequence.
 
+  An edited recording (indicated by the '%' character) will never be deleted
+  automatically in case the disk runs full (no matter what "lifetime" it has).
+
 * Programming the Timer
 
   Use the "Timer" menu to maintain your list of timer controlled recordings.
@@ -536,7 +539,7 @@ Version 1.2
                          with a priority below PrimaryLimit will never execute.
 
   Default priority = 50  The default Priority and Lifetime values used when
-  Default lifetime = 50  creating a new timer event. A Lifetime value of 99
+  Default lifetime = 99  creating a new timer event. A Lifetime value of 99
                          means that this recording will never be deleted
                          automatically.
 
diff --git a/channels.c b/channels.c
index 6ff71888f..69ff3c913 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.14 2003/09/09 18:55:26 kls Exp $
+ * $Id: channels.c 1.16 2003/10/17 15:42:40 kls Exp $
  */
 
 #include "channels.h"
@@ -369,6 +369,10 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
         free(vpidbuf);
         free(apidbuf);
         free(namebuf);
+        if (!GetChannelID().Valid()) {
+           esyslog("ERROR: channel data results in invalid ID!");
+           return false;
+           }
         if (!AllowNonUniqueID && Channels.GetByChannelID(GetChannelID())) {
            esyslog("ERROR: channel data not unique!");
            return false;
@@ -431,10 +435,11 @@ void cChannels::ReNumber( void )
          if (channel->Number() > Number)
             Number = channel->Number();
          }
-      else
+      else {
+         maxNumber = Number;
          channel->SetNumber(Number++);
+         }
       }
-  maxNumber = Number - 1;
 }
 
 cChannel *cChannels::GetByNumber(int Number, int SkipGap)
diff --git a/channels.conf.terr b/channels.conf.terr
index 038708c7e..f6a84566b 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -46,13 +46,13 @@ KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
 oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0
 Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
 : DVB-T Berlin, Germany
-BBC World:177500:I0C23D0M16B8T8G8Y0:T:27500:49:50:55:0:16387:0:0:0
-FAB:177500:I0C23D0M16B8T8G8Y0:T:27500:3073:3074:3079:0:16576:0:0:0
-WDR:177500:I0C23D0M16B8T8G8Y0:T:27500:241:242:247:0:15:0:0:0
-SWR BW:177500:I0C23D0M16B8T8G8Y0:T:27500:257:258:263:0:16:0:0:0
-MDR Fernsehen:191500:I0C23D0M16B8T8G8Y0:T:27500:101:102:104:0:1:0:0:0
-arte:191500:I0C23D0M16B8T8G8Y0:T:27500:201:202,203:204:0:2:0:0:0
-NDR Fernsehen:191500:I0C23D0M16B8T8G8Y0:T:27500:301:302:304:0:3:0:0:0
+BBC World:177500:I0C23D0M16B7T8G8Y0:T:27500:49:50:55:0:16387:0:0:0
+FAB:177500:I0C23D0M16B7T8G8Y0:T:27500:3073:3074:3079:0:16576:0:0:0
+WDR:177500:I0C23D0M16B7T8G8Y0:T:27500:241:242:247:0:15:0:0:0
+S�dwest BW/RP:177500:I0C23D0M16B7T8G8Y0:T:27500:257:258:263:0:16:0:0:0
+MDR Fernsehen:191500:I0C23D0M16B7T8G8Y0:T:27500:101:102:104:0:1:0:0:0
+arte:191500:I0C23D0M16B7T8G8Y0:T:27500:201:202,203:204:0:2:0:0:0
+NDR Fernsehen:191500:I0C23D0M16B7T8G8Y0:T:27500:301:302:304:0:3:0:0:0
 RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:337:338:343:0:16405:0:0:0
 RTL2:506000:I0C23D0M16B8T8G8Y0:T:27500:353:354:359:0:16406:0:0:0
 Super RTL:506000:I0C23D0M16B8T8G8Y0:T:27500:433:434:439:0:16411:0:0:0
@@ -62,7 +62,7 @@ RBB Berlin:522000:I0C23D0M16B8T8G8Y0:T:27500:1201:1202:1204:0:12:0:0:0
 Phoenix:522000:I0C23D0M16B8T8G8Y0:T:27500:1301:1302:1304:0:13:0:0:0
 Das Erste:522000:I0C23D0M16B8T8G8Y0:T:27500:1401:1402:1404:0:14:0:0:0
 ZDF:570000:I0C23D0M16B8T8G8Y0:T:27500:545:546:551:0:514:0:0:0
-Info/3sat:570000:I0C23D0M16B8T8G8Y0:T:27500:561:562:551:0:515:0:0:0
+Info/3sat:570000:I0C23D0M16B8T8G8Y0:T:27500:561:562:567:0:515:0:0:0
 Doku/KiKa:570000:I0C23D0M16B8T8G8Y0:T:27500:593:594:599:0:517:0:0:0
 Kabel 1:658000:I0C23D0M16B8T8G8Y0:T:27500:161:162:167:0:16394:0:0:0
 N24:658000:I0C23D0M16B8T8G8Y0:T:27500:225:226:231:0:16398:0:0:0
diff --git a/config.c b/config.c
index 0ef2d57ff..d3f2db7d0 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.116 2003/08/24 11:00:24 kls Exp $
+ * $Id: config.c 1.117 2003/10/17 14:11:27 kls Exp $
  */
 
 #include "config.h"
@@ -266,7 +266,7 @@ cSetup::cSetup(void)
   SortTimers = 1;
   PrimaryLimit = 0;
   DefaultPriority = 50;
-  DefaultLifetime = 50;
+  DefaultLifetime = 99;
   PausePriority = 10;
   PauseLifetime = 1;
   UseSubtitle = 1;
diff --git a/config.h b/config.h
index 9f5ab38d7..a5b335414 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.174 2003/09/17 16:08:56 kls Exp $
+ * $Id: config.h 1.176 2003/10/17 12:35:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.5"
-#define VDRVERSNUM   10205  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.6pre1"
+#define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index f29745b29..fd0a0d0d3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.64 2003/09/06 13:19:33 kls Exp $
+ * $Id: dvbdevice.c 1.67 2003/10/17 15:36:13 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -307,6 +307,8 @@ void cDvbTuner::Action(void)
 
 // --- cDvbDevice ------------------------------------------------------------
 
+int cDvbDevice::devVideoOffset = -1;
+
 cDvbDevice::cDvbDevice(int n)
 {
   dvbTuner = NULL;
@@ -317,7 +319,7 @@ cDvbDevice::cDvbDevice(int n)
 
   // Devices that are present on all card types:
 
-  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK);
+  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK); 
 
   // Devices that are only present on cards with decoders:
 
@@ -329,6 +331,35 @@ cDvbDevice::cDvbDevice(int n)
 
   fd_dvr = -1;
 
+  // The offset of the /dev/video devices:
+
+  if (devVideoOffset < 0) { // the first one checks this
+     FILE *f = NULL;
+     char buffer[PATH_MAX];
+     for (int ofs = 0; ofs < 100; ofs++) {
+         snprintf(buffer, sizeof(buffer), "/proc/video/dev/video%d", ofs);
+         if ((f = fopen(buffer, "r")) != NULL) {
+            if (fgets(buffer, sizeof(buffer), f)) {
+               if (strstr(buffer, "DVB Board")) { // found the _first_ DVB card
+                  devVideoOffset = ofs;
+                  dsyslog("video device offset is %d", devVideoOffset);
+                  break;
+                  }
+               }
+            else
+               break;
+            fclose(f);
+            }
+         else
+            break;
+         }
+     if (devVideoOffset < 0)
+        devVideoOffset = 0;
+     if (f)
+        fclose(f);
+     }
+  devVideoIndex = (devVideoOffset >= 0 && HasDecoder()) ? devVideoOffset++ : -1;
+
   // Video format:
 
   SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
@@ -427,8 +458,10 @@ cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
 
 bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
+  if (devVideoIndex < 0)
+     return false;
   char buffer[PATH_MAX];
-  snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, CardIndex());
+  snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, devVideoIndex);
   int videoDev = open(buffer, O_RDWR);
   if (videoDev < 0)
      LOG_ERROR_STR(buffer);
@@ -915,21 +948,53 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
         return;
      int i = 0;
      int blen = 0;
-     while (i < Length - 4) {
-           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01 && (Data[i + 3] & 0xF0) == 0xE0) {
-              // skip PES header
-              int offs = i + 6;
+     while (i < Length - 6) {
+           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
               int len = Data[i + 4] * 256 + Data[i + 5];
-              // skip header extension
-              if ((Data[i + 6] & 0xC0) == 0x80) {
-                 offs += 3;
-                 offs += Data[i + 8];
-                 len -= 3;
-                 len -= Data[i + 8];
+              if ((Data[i + 3] & 0xF0) == 0xE0) { // video packet
+                 // skip PES header
+                 int offs = i + 6;
+                 // skip header extension
+                 if ((Data[i + 6] & 0xC0) == 0x80) {
+                    // MPEG-2 PES header
+                    offs += 3;
+                    offs += Data[i + 8];
+                    len -= 3;
+                    len -= Data[i + 8];
+                    }
+                 else {
+                    // MPEG-1 PES header
+                    while (offs < Length && len > 0 && Data[offs] == 0xFF) {
+                          offs++;
+                          len--;
+                          }
+                    if ((Data[offs] & 0xC0) == 0x40) {
+                       offs += 2;
+                       len -= 2;
+                       }
+                    if ((Data[offs] & 0xF0) == 0x20) {
+                       offs += 5;
+                       len -= 5;
+                       }
+                    else if ((Data[offs] & 0xF0) == 0x30) {
+                       offs += 10;
+                       len -= 10;
+                       }
+                    else if (Data[offs] == 0x0F) {
+                       offs++;
+                       len--;
+                       }
+                    }
+                 if (blen + len > Length) // invalid PES length field
+                    break;
+                 memcpy(&buf[blen], &Data[offs], len);
+                 i = offs + len;
+                 blen += len;
                  }
-              memcpy(&buf[blen], &Data[offs], len);
-              i = offs + len;
-              blen += len;
+              else if (Data[i + 3] >= 0xBD && Data[i + 3] <= 0xDF) // other PES packets
+                 i += len + 6;
+              else
+                 i++;
               }
            else
               i++;
diff --git a/dvbdevice.h b/dvbdevice.h
index aab20fdd5..78df221ba 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.22 2003/08/15 12:34:55 kls Exp $
+ * $Id: dvbdevice.h 1.23 2003/10/04 11:54:50 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -73,6 +73,9 @@ class cDvbDevice : public cDevice {
 
 // Image Grab facilities
 
+private:
+  static int devVideoOffset;
+  int devVideoIndex;
 public:
   virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
 
diff --git a/dvbspu.c b/dvbspu.c
index 27e0bed5b..74ace19a3 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.4 2003/08/15 13:04:39 kls Exp $
+ * $Id: dvbspu.c 1.5 2003/10/12 09:43:18 kls Exp $
  */
 
 #include <assert.h>
@@ -297,6 +297,10 @@ void cDvbSpuDecoder::clearHighlight(void)
 {
     clean &= !highlight;
     highlight = false;
+    hlpsize.x1 = -1;
+    hlpsize.y1 = -1;
+    hlpsize.x2 = -1;
+    hlpsize.y2 = -1;
 }
 
 int cDvbSpuDecoder::ScaleYcoord(int value)
diff --git a/eit.c b/eit.c
index 99eb405fa..8e0ade7c3 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.79 2003/05/29 15:04:10 kls Exp $
+ * $Id: eit.c 1.80 2003/10/12 11:05:42 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -1166,7 +1166,6 @@ void cSIProcessor::SetStatus(bool On)
    {
       AddFilter(0x00, 0x00);  // PAT
       AddFilter(0x14, 0x70);  // TDT
-      AddFilter(0x14, 0x73);  // TOT
       AddFilter(0x12, 0x4e, 0xfe);  // event info, actual(0x4e)/other(0x4f) TS, present/following
       AddFilter(0x12, 0x50, 0xfe);  // event info, actual TS, schedule(0x50)/schedule for another 4 days(0x51)
       AddFilter(0x12, 0x60, 0xfe);  // event info, other  TS, schedule(0x60)/schedule for another 4 days(0x61)
@@ -1301,10 +1300,6 @@ void cSIProcessor::Action()
                                  ctdt.SetSystemTime();
                               }
                            }
-                              /*XXX this comes pretty often:
-                           else
-                              dsyslog("Time packet was not 0x70 but 0x%02x\n", (int)buf[0]);
-                              XXX*/
                            break;
 
                         case 0x12:
diff --git a/interface.c b/interface.c
index 6431f911b..cff07744f 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.64 2003/04/27 12:08:52 kls Exp $
+ * $Id: interface.c 1.65 2003/10/05 09:48:13 kls Exp $
  */
 
 #include "interface.h"
@@ -329,7 +329,7 @@ void cInterface::Help(const char *Red, const char *Green, const char *Yellow, co
   cStatus::MsgOsdHelpKeys(Red, Green, Yellow, Blue);
 }
 
-void cInterface::QueryKeys(cRemote *Remote)
+bool cInterface::QueryKeys(cRemote *Remote)
 {
   WriteText(1, 3, tr("Phase 1: Detecting RC code type"));
   WriteText(1, 5, tr("Press any key on the RC unit"));
@@ -372,7 +372,7 @@ void cInterface::QueryKeys(cRemote *Remote)
                                  Key = cRemote::Get(100);
                                  if (Key == kUp) {
                                     Clear();
-                                    return;
+                                    return true;
                                     }
                                  else if (Key == kDown) {
                                     ClearEol(0, 6);
@@ -406,7 +406,9 @@ void cInterface::QueryKeys(cRemote *Remote)
            else
               ClearEol(0, 9);
            }
+     return true;
      }
+  return false;
 }
 
 void cInterface::LearnKeys(void)
@@ -426,9 +428,13 @@ void cInterface::LearnKeys(void)
          cRemote::Clear();
          WriteText(1, 1, Headline);
          cRemote::SetLearning(Remote);
-         QueryKeys(Remote);
+         bool rc = QueryKeys(Remote);
          cRemote::SetLearning(NULL);
          Clear();
+         if (!rc) {
+            Close();
+            return;
+            }
          WriteText(1, 1, Headline);
          WriteText(1, 3, tr("Phase 3: Saving key codes"));
          WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
diff --git a/interface.h b/interface.h
index e78b9ebc1..bcc29df09 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.29 2002/11/30 14:37:04 kls Exp $
+ * $Id: interface.h 1.30 2003/10/05 09:42:53 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -24,7 +24,7 @@ class cInterface {
   int cols[MaxCols];
   bool interrupted;
   cSVDRP *SVDRP;
-  void QueryKeys(cRemote *Remote);
+  bool QueryKeys(cRemote *Remote);
   void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
   eKeys Wait(int Seconds = 0, bool KeepChar = false);
 public:
diff --git a/menu.c b/menu.c
index 9f8dea4dc..72683c01f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.272 2003/09/14 10:49:28 kls Exp $
+ * $Id: menu.c 1.273 2003/10/03 14:36:20 kls Exp $
  */
 
 #include "menu.h"
@@ -2823,6 +2823,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kChanUp:
     case kChanDn|k_Repeat:
     case kChanDn:
+         withInfo = true;
          group = -1;
          Refresh();
          break;
diff --git a/recording.c b/recording.c
index 6d01ffa42..b6e47c55b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.83 2003/09/09 16:02:55 kls Exp $
+ * $Id: recording.c 1.84 2003/10/17 14:36:58 kls Exp $
  */
 
 #include "recording.h"
@@ -124,7 +124,7 @@ void AssertFreeDiskSpace(int Priority)
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
-                 if (r->lifetime < MAXLIFETIME) { // recordings with MAXLIFETIME live forever
+                 if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
                     if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
                         (time(NULL) - r->start) / SECSINDAY > r->lifetime) { // the recording's guaranteed lifetime has expired
                        if (r0) {
@@ -559,6 +559,13 @@ int cRecording::HierarchyLevels(void)
   return level;
 }
 
+bool cRecording::IsEdited(void)
+{
+  const char *s = strrchr(name, '~');
+  s = !s ? name : s + 1;
+  return *s == '%';
+}
+
 bool cRecording::WriteSummary(void)
 {
   if (summary) {
diff --git a/recording.h b/recording.h
index 42fc1a209..59a9dca0d 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.27 2003/09/09 16:00:56 kls Exp $
+ * $Id: recording.h 1.28 2003/10/17 14:27:36 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -58,6 +58,7 @@ class cRecording : public cListObject {
   const char *PrefixFileName(char Prefix);
   int HierarchyLevels(void);
   bool IsNew(void) { return GetResume() <= 0; }
+  bool IsEdited(void);
   bool WriteSummary(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
diff --git a/timers.c b/timers.c
index 154294275..a4ab3c163 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.5 2003/05/11 13:48:49 kls Exp $
+ * $Id: timers.c 1.6 2003/10/12 10:33:09 kls Exp $
  */
 
 #include "timers.h"
@@ -217,7 +217,7 @@ bool cTimer::Parse(const char *s)
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
      tChannelID cid = tChannelID::FromString(channelbuffer);
-     channel = cid.Valid() ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
+     channel = cid.Valid() ? Channels.GetByChannelID(cid, true) : Channels.GetByNumber(atoi(channelbuffer));
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;

From e2ac232795141f367d271b87585597493551a560 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 19 Oct 2003 18:00:00 +0200
Subject: [PATCH 086/307] Version 1.2.6pre2 - Improved
 cDvbDevice::StillPicture() (thanks to Thomas Heiligenmann).

---
 HISTORY     |  4 ++++
 config.h    |  4 ++--
 dvbdevice.c | 14 +++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 3ce2d0698..45137f6a7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2433,3 +2433,7 @@ Video Disk Recorder Revision History
   full (suggested by Emil Naepflein).
 - Channel IDs are now checked when reading 'channels.conf' to avoid later
   problems with timers.
+
+2003-10-19: Version 1.2.6pre2
+
+- Improved cDvbDevice::StillPicture() (thanks to Thomas Heiligenmann).
diff --git a/config.h b/config.h
index a5b335414..6faca7c5a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176 2003/10/17 12:35:23 kls Exp $
+ * $Id: config.h 1.176.1.1 2003/10/19 11:43:07 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre1"
+#define VDRVERSION  "1.2.6pre2"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index fd0a0d0d3..0dedfe81b 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.67 2003/10/17 15:36:13 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.1 2003/10/19 11:41:07 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -957,10 +957,14 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
                  // skip header extension
                  if ((Data[i + 6] & 0xC0) == 0x80) {
                     // MPEG-2 PES header
+                    if (Data[i + 8] >= Length)
+                       break;
                     offs += 3;
                     offs += Data[i + 8];
                     len -= 3;
                     len -= Data[i + 8];
+                    if (len < 0 || offs + len >= Length)
+                       break;
                     }
                  else {
                     // MPEG-1 PES header
@@ -968,19 +972,19 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
                           offs++;
                           len--;
                           }
-                    if ((Data[offs] & 0xC0) == 0x40) {
+                    if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
                        offs += 2;
                        len -= 2;
                        }
-                    if ((Data[offs] & 0xF0) == 0x20) {
+                    if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
                        offs += 5;
                        len -= 5;
                        }
-                    else if ((Data[offs] & 0xF0) == 0x30) {
+                    else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
                        offs += 10;
                        len -= 10;
                        }
-                    else if (Data[offs] == 0x0F) {
+                    else if (offs < Length && len > 0) {
                        offs++;
                        len--;
                        }

From 646369955d2e954edf8b5c78f9ba4dc7f501f292 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 24 Oct 2003 18:00:00 +0200
Subject: [PATCH 087/307] Version 1.2.6pre3 - Improved
 cDvbDevice::StillPicture() (thanks to Oliver Endriss). - Continuing learning
 remote control keys in case one rc fails (thanks to   Oliver Endriss). -
 Fixed handling comments in editing marks.

---
 HISTORY     | 7 +++++++
 config.h    | 4 ++--
 dvbdevice.c | 4 ++--
 interface.c | 4 ++--
 recording.c | 6 ++----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/HISTORY b/HISTORY
index 45137f6a7..d121437f4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2437,3 +2437,10 @@ Video Disk Recorder Revision History
 2003-10-19: Version 1.2.6pre2
 
 - Improved cDvbDevice::StillPicture() (thanks to Thomas Heiligenmann).
+
+2003-10-24: Version 1.2.6pre3
+
+- Improved cDvbDevice::StillPicture() (thanks to Oliver Endriss).
+- Continuing learning remote control keys in case one rc fails (thanks to
+  Oliver Endriss).
+- Fixed handling comments in editing marks.
diff --git a/config.h b/config.h
index 6faca7c5a..625e3e656 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.1 2003/10/19 11:43:07 kls Exp $
+ * $Id: config.h 1.176.1.2 2003/10/24 14:31:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre2"
+#define VDRVERSION  "1.2.6pre3"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 0dedfe81b..ebb236e74 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.67.1.1 2003/10/19 11:41:07 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.2 2003/10/24 14:32:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -963,7 +963,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
                     offs += Data[i + 8];
                     len -= 3;
                     len -= Data[i + 8];
-                    if (len < 0 || offs + len >= Length)
+                    if (len < 0 || offs + len > Length)
                        break;
                     }
                  else {
diff --git a/interface.c b/interface.c
index cff07744f..a0ee9ccd3 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.65 2003/10/05 09:48:13 kls Exp $
+ * $Id: interface.c 1.66 2003/10/24 14:38:08 kls Exp $
  */
 
 #include "interface.h"
@@ -433,7 +433,7 @@ void cInterface::LearnKeys(void)
          Clear();
          if (!rc) {
             Close();
-            return;
+            continue;
             }
          WriteText(1, 1, Headline);
          WriteText(1, 3, tr("Phase 3: Saving key codes"));
diff --git a/recording.c b/recording.c
index b6e47c55b..13aa41729 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.84 2003/10/17 14:36:58 kls Exp $
+ * $Id: recording.c 1.85 2003/10/24 14:47:14 kls Exp $
  */
 
 #include "recording.h"
@@ -681,10 +681,8 @@ bool cMark::Parse(const char *s)
   const char *p = strchr(s, ' ');
   if (p) {
      p = skipspace(p);
-     if (*p) {
+     if (*p)
         comment = strdup(p);
-        comment[strlen(comment) - 1] = 0; // strips trailing newline
-        }
      }
   return true;
 }

From d62fbea7bad99cfa34ec42a678d4cf38ec1593d8 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Oct 2003 17:00:00 +0100
Subject: [PATCH 088/307] Version 1.2.6pre4 - Fixed handling CAM menus in case
 the CAM connection fails while the menu   is being presented (thanks to
 Thomas v. Keller for reportign this one). - Added missing 'const' to some
 cChannel member functions (thanks to Torsten   Herz).

---
 CONTRIBUTORS |  5 +++++
 HISTORY      |  7 +++++++
 channels.h   |  8 ++++----
 ci.c         | 54 +++++++++++++++++++++++++++++++++++++---------------
 ci.h         |  4 +++-
 config.h     |  4 ++--
 6 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3c86eee6a..1a36bdfa7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -641,6 +641,7 @@ Torsten Herz <torsten.herz@web.de>
  to switch to an other channel
  for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix
  for fixing a bug in resetting OSD color palettes
+ for adding missing 'const' to some cChannel member functions
 
 Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
  for reporting a problem with CPU load peaks (in the EPG scanner)
@@ -844,3 +845,7 @@ Markus Hardt <markus.hardt@gmx.net>
 
 Thomas Rausch <Thomas.Rausch@gmx.de>
  for making VDR try to get a timer's channel without RID when loading 'timers.conf'
+
+Thomas v. Keller <v.keller@neckarufer.de>
+ for reporting a crash in case the CAM connection fails while a CAM menu
+ is being presented
diff --git a/HISTORY b/HISTORY
index d121437f4..143a4433f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2444,3 +2444,10 @@ Video Disk Recorder Revision History
 - Continuing learning remote control keys in case one rc fails (thanks to
   Oliver Endriss).
 - Fixed handling comments in editing marks.
+
+2003-10-26: Version 1.2.6pre4
+
+- Fixed handling CAM menus in case the CAM connection fails while the menu
+  is being presented (thanks to Thomas v. Keller for reportign this one).
+- Added missing 'const' to some cChannel member functions (thanks to Torsten
+  Herz).
diff --git a/channels.h b/channels.h
index ca76af16d..a6cc978cb 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.8 2003/08/16 09:12:15 kls Exp $
+ * $Id: channels.h 1.9 2003/10/26 13:21:59 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -119,9 +119,9 @@ class cChannel : public cListObject {
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
-  bool IsCable(void) { return (source & cSource::st_Mask) == cSource::stCable; }
-  bool IsSat(void) { return (source & cSource::st_Mask) == cSource::stSat; }
-  bool IsTerr(void) { return (source & cSource::st_Mask) == cSource::stTerr; }
+  bool IsCable(void) const { return (source & cSource::st_Mask) == cSource::stCable; }
+  bool IsSat(void) const { return (source & cSource::st_Mask) == cSource::stSat; }
+  bool IsTerr(void) const { return (source & cSource::st_Mask) == cSource::stTerr; }
   tChannelID GetChannelID(void) const;
   };
 
diff --git a/ci.c b/ci.c
index e94c20a0e..889c85385 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.16 2003/08/02 10:00:01 kls Exp $
+ * $Id: ci.c 1.17 2003/10/26 13:04:23 kls Exp $
  */
 
 /* XXX TODO
@@ -1004,15 +1004,15 @@ bool cCiDateTime::Process(int Length, const uint8_t *Data)
 class cCiMMI : public cCiSession {
 private:
   char *GetText(int &Length, const uint8_t **Data);
-  cCiMenu *menu;
-  cCiEnquiry *enquiry;
+  cCiMenu *menu, *fetchedMenu;
+  cCiEnquiry *enquiry, *fetchedEnquiry;
 public:
   cCiMMI(int SessionId, cCiTransportConnection *Tc);
   virtual ~cCiMMI();
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   virtual bool HasUserIO(void) { return menu || enquiry; }
-  cCiMenu *Menu(void);
-  cCiEnquiry *Enquiry(void);
+  cCiMenu *Menu(bool Clear = false);
+  cCiEnquiry *Enquiry(bool Clear = false);
   bool SendMenuAnswer(uint8_t Selection);
   bool SendAnswer(const char *Text);
   };
@@ -1021,13 +1021,21 @@ cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_MMI, Tc)
 {
   dbgprotocol("New MMI (session id %d)\n", SessionId);
-  menu = NULL;
-  enquiry = NULL;
+  menu = fetchedMenu = NULL;
+  enquiry = fetchedEnquiry = NULL;
 }
 
 cCiMMI::~cCiMMI()
 {
+  if (fetchedMenu) {
+     cMutexLock MutexLock(&fetchedMenu->mutex);
+     fetchedMenu->mmi = NULL;
+     }
   delete menu;
+  if (fetchedEnquiry) {
+     cMutexLock MutexLock(&fetchedEnquiry->mutex);
+     fetchedEnquiry->mmi = NULL;
+     }
   delete enquiry;
 }
 
@@ -1123,18 +1131,26 @@ bool cCiMMI::Process(int Length, const uint8_t *Data)
   return true;
 }
 
-cCiMenu *cCiMMI::Menu(void)
+cCiMenu *cCiMMI::Menu(bool Clear)
 {
-  cCiMenu *m = menu;
-  menu = NULL;
-  return m;
+  if (Clear)
+     fetchedMenu = NULL;
+  else if (menu) {
+     fetchedMenu = menu;
+     menu = NULL;
+     }
+  return fetchedMenu;
 }
 
-cCiEnquiry *cCiMMI::Enquiry(void)
+cCiEnquiry *cCiMMI::Enquiry(bool Clear)
 {
-  cCiEnquiry *e = enquiry;
-  enquiry = NULL;
-  return e;
+  if (Clear)
+     fetchedEnquiry = NULL;
+  else if (enquiry) {
+     fetchedEnquiry = enquiry;
+     enquiry = NULL;
+     }
+  return fetchedEnquiry;
 }
 
 bool cCiMMI::SendMenuAnswer(uint8_t Selection)
@@ -1170,6 +1186,9 @@ cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable)
 
 cCiMenu::~cCiMenu()
 {
+  cMutexLock MutexLock(&mutex);
+  if (mmi)
+     mmi->Menu(true);
   free(titleText);
   free(subTitleText);
   free(bottomText);
@@ -1188,6 +1207,7 @@ bool cCiMenu::AddEntry(char *s)
 
 bool cCiMenu::Select(int Index)
 {
+  cMutexLock MutexLock(&mutex);
   if (mmi && -1 <= Index && Index < numEntries)
      return mmi->SendMenuAnswer(Index + 1);
   return false;
@@ -1210,11 +1230,15 @@ cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
 
 cCiEnquiry::~cCiEnquiry()
 {
+  cMutexLock MutexLock(&mutex);
+  if (mmi)
+     mmi->Enquiry(true);
   free(text);
 }
 
 bool cCiEnquiry::Reply(const char *s)
 {
+  cMutexLock MutexLock(&mutex);
   return mmi ? mmi->SendAnswer(s) : false;
 }
 
diff --git a/ci.h b/ci.h
index 62046e5ad..6b81a18cc 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.8 2003/05/25 11:44:47 kls Exp $
+ * $Id: ci.h 1.9 2003/10/26 12:22:09 kls Exp $
  */
 
 #ifndef __CI_H
@@ -21,6 +21,7 @@ class cCiMenu {
 private:
   enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum?
   cCiMMI *mmi;
+  cMutex mutex;
   bool selectable;
   char *titleText;
   char *subTitleText;
@@ -45,6 +46,7 @@ class cCiEnquiry {
   friend class cCiMMI;
 private:
   cCiMMI *mmi;
+  cMutex mutex;
   char *text;
   bool blind;
   int expectedLength;
diff --git a/config.h b/config.h
index 625e3e656..3771ce1db 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.2 2003/10/24 14:31:17 kls Exp $
+ * $Id: config.h 1.176.1.3 2003/10/26 13:30:36 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre3"
+#define VDRVERSION  "1.2.6pre4"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99

From 17c5b4169e50c127991cb20d9f8050a5e47b18c2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 8 Nov 2003 18:00:00 +0100
Subject: [PATCH 089/307] Version 1.2.6pre5 - Added cDevice::GetSTC()
 (suggested by Sven Goethel). - Added Asia-Pacific satellites to
 'sources.conf' (thanks to Richard Scobie). - Added North American satellites
 to 'sources.conf' (thanks to Luke Jenkins). - Fixed getting the list of
 recordings in case VDR is started from a directory   where it doesn't have
 access to (thanks to Dirk Mueller).

---
 CONTRIBUTORS | 11 +++++++++++
 HISTORY      |  8 ++++++++
 PLUGINS.html |  9 ++++++++-
 config.h     |  4 ++--
 device.c     |  7 ++++++-
 device.h     |  6 +++++-
 dvbdevice.c  | 17 ++++++++++++++++-
 dvbdevice.h  |  5 +++--
 newplugin    |  2 +-
 recording.c  |  6 +++---
 sources.conf | 20 ++++++++++++++++++++
 11 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1a36bdfa7..f988ff49c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -606,6 +606,7 @@ Thomas Sailer <sailer@scs.ch>
 Sven Goethel <sgoethel@jausoft.com>
  for making switching audio channels work without stopping/restarting the DMX
  for fixing initializing the highlight area in cDvbSpuDecoder
+ for suggesting to add cDevice::GetSTC()
 
 Jan Rieger <jan@ricomp.de>
  for suggestions and testing raw keyboard input
@@ -849,3 +850,13 @@ Thomas Rausch <Thomas.Rausch@gmx.de>
 Thomas v. Keller <v.keller@neckarufer.de>
  for reporting a crash in case the CAM connection fails while a CAM menu
  is being presented
+
+Richard Scobie <r.scobie@clear.net.nz>
+ for adding Asia-Pacific satellites to 'sources.conf'
+
+Luke Jenkins <a@xmission.com>
+ for adding North American satellites to 'sources.conf'
+
+Dirk Mueller <dmuell@gmx.net>
+ for fixing getting the list of recordings in case VDR is started from a directory
+ where it doesn't have access to
diff --git a/HISTORY b/HISTORY
index 143a4433f..4bb06ea15 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2451,3 +2451,11 @@ Video Disk Recorder Revision History
   is being presented (thanks to Thomas v. Keller for reportign this one).
 - Added missing 'const' to some cChannel member functions (thanks to Torsten
   Herz).
+
+2003-11-08: Version 1.2.6pre5
+
+- Added cDevice::GetSTC() (suggested by Sven Goethel).
+- Added Asia-Pacific satellites to 'sources.conf' (thanks to Richard Scobie).
+- Added North American satellites to 'sources.conf' (thanks to Luke Jenkins).
+- Fixed getting the list of recordings in case VDR is started from a directory
+  where it doesn't have access to (thanks to Dirk Mueller).
diff --git a/PLUGINS.html b/PLUGINS.html
index 913a9914f..95ba5d79c 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.2</b></center>
+<center><b>Version 1.2.6</b></center>
 <p>
 <center>
 Copyright &copy; 2003 Klaus Schmidinger<br>
@@ -14,6 +14,10 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
+<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.2.6 are marked like this.
+<!--X1.1.32--></td></tr></table>
+<p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
 This interface allows programmers to develop additional functionality for VDR completely
@@ -1318,6 +1322,9 @@ <h1>Table Of Contents</h1>
 virtual bool HasDecoder(void) const;
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
+<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+virtual int64_t GetSTC(void);
+<!--X1.1.32--></td></tr></table>
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
 virtual void Play(void);
diff --git a/config.h b/config.h
index 3771ce1db..ffe7794db 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.3 2003/10/26 13:30:36 kls Exp $
+ * $Id: config.h 1.176.1.4 2003/11/07 15:12:42 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre4"
+#define VDRVERSION  "1.2.6pre5"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/device.c b/device.c
index b409ac0ef..9a698eadd 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.47 2003/08/15 12:34:36 kls Exp $
+ * $Id: device.c 1.47.1.1 2003/11/07 13:16:12 kls Exp $
  */
 
 #include "device.h"
@@ -498,6 +498,11 @@ bool cDevice::SetPlayMode(ePlayMode PlayMode)
   return false;
 }
 
+int64_t cDevice::GetSTC(void)
+{
+  return -1;
+}
+
 void cDevice::TrickSpeed(int Speed)
 {
 }
diff --git a/device.h b/device.h
index 144adfb6c..d73864f2b 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.34 2003/08/15 13:05:50 kls Exp $
+ * $Id: device.h 1.35 2003/11/07 13:15:45 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -320,6 +320,10 @@ class cDevice : public cThread {
        ///< Sets the device into the given play mode.
        ///< \return true if the operation was successful.
 public:
+  virtual int64_t GetSTC(void);
+       ///< Gets the current System Time Counter, which can be used to
+       ///< synchronize audio and video. If this device is unable to
+       ///< provide the STC, -1 will be returned.
   virtual void TrickSpeed(int Speed);
        ///< Sets the device into a mode where replay is done slower.
        ///< Every single frame shall then be displayed the given number of
diff --git a/dvbdevice.c b/dvbdevice.c
index ebb236e74..4e7b50ca8 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.67.1.2 2003/10/24 14:32:20 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.3 2003/11/07 13:24:49 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -326,6 +326,7 @@ cDvbDevice::cDvbDevice(int n)
   fd_osd      = DvbOpen(DEV_DVB_OSD,    n, O_RDWR);
   fd_video    = DvbOpen(DEV_DVB_VIDEO,  n, O_RDWR | O_NONBLOCK);
   fd_audio    = DvbOpen(DEV_DVB_AUDIO,  n, O_RDWR | O_NONBLOCK);
+  fd_stc      = DvbOpen(DEV_DVB_DEMUX,  n, O_RDWR);
 
   // The DVR device (will be opened and closed as needed):
 
@@ -869,6 +870,20 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
   return true;
 }
 
+int64_t cDvbDevice::GetSTC(void)
+{
+  if (fd_stc >= 0) {
+     struct dmx_stc stc;
+     stc.num = 0;
+     if (ioctl(fd_stc, DMX_GET_STC, &stc) == -1) {
+        esyslog("ERROR: stc %d: %m", CardIndex() + 1);
+        return -1;
+        }
+     return stc.stc / stc.base;
+     }
+  return -1;
+}
+
 void cDvbDevice::TrickSpeed(int Speed)
 {
   if (fd_video >= 0)
diff --git a/dvbdevice.h b/dvbdevice.h
index 78df221ba..56f1c2b15 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.23 2003/10/04 11:54:50 kls Exp $
+ * $Id: dvbdevice.h 1.24 2003/11/07 13:17:13 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -38,7 +38,7 @@ class cDvbDevice : public cDevice {
          ///< \return True if any devices are available.
 private:
   fe_type_t frontendType;
-  int fd_osd, fd_audio, fd_video, fd_dvr;
+  int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc;
   int OsdDeviceHandle(void) const { return fd_osd; }
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -107,6 +107,7 @@ class cDvbDevice : public cDevice {
   virtual bool CanReplay(void) const;
   virtual bool SetPlayMode(ePlayMode PlayMode);
 public:
+  virtual int64_t GetSTC(void);
   virtual void TrickSpeed(int Speed);
   virtual void Clear(void);
   virtual void Play(void);
diff --git a/newplugin b/newplugin
index e47426630..a89852458 100755
--- a/newplugin
+++ b/newplugin
@@ -261,7 +261,7 @@ The next steps you should perform now are:
 sub CreateFile
 {
   my ($Name, $Content) = @_;
-  open(FILE, ">$PLUGINDIR/$Name") || die "$Name:  $!\n";
+  open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V126pre5 $!\n";
   print FILE $Content;
   close(FILE);
 }
diff --git a/recording.c b/recording.c
index 13aa41729..a181ff455 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.85 2003/10/24 14:47:14 kls Exp $
+ * $Id: recording.c 1.86 2003/11/08 15:25:35 kls Exp $
  */
 
 #include "recording.h"
@@ -46,7 +46,7 @@
 #define SUMMARYFILESUFFIX "/summary.vdr"
 #define MARKSFILESUFFIX   "/marks.vdr"
 
-#define FINDCMD      "find %s -follow -type d -name '%s' 2> /dev/null"
+#define FINDCMD      "cd '%s' && find '%s' -follow -type d -name '%s' 2> /dev/null"
 
 #define MINDISKSPACE 1024 // MB
 
@@ -621,7 +621,7 @@ bool cRecordings::Load(bool Deleted)
   Clear();
   bool result = false;
   char *cmd = NULL;
-  asprintf(&cmd, FINDCMD, VideoDirectory, Deleted ? "*" DELEXT : "*" RECEXT);
+  asprintf(&cmd, FINDCMD, VideoDirectory, VideoDirectory, Deleted ? "*" DELEXT : "*" RECEXT);
   FILE *p = popen(cmd, "r");
   if (p) {
      char *s;
diff --git a/sources.conf b/sources.conf
index 90a757364..3ba2f508c 100644
--- a/sources.conf
+++ b/sources.conf
@@ -55,6 +55,15 @@ S76.5E  Apstar
 S78.5E  Thaicom 2/3
 S80E    Express 6A
 S83E    Insat 2E/3B
+S100.5E Asiasat 2
+S105.5E Asiasat 3S
+S113E   Palapa C2
+S152E   Optus B3
+S156E   Optus C1
+S160E   Optus B1
+S166E   PAS 8
+S169E   PAS 2
+S180E   Intelsat 701
 
 S1W     Thor 2/3 & Intelsat 707
 S4W     Amos 1
@@ -80,6 +89,17 @@ S53W    Intelsat 706
 S55.5W  Intelsat 805
 S58W    PAS 9
 S61.5W  Echostar 3
+S79W    AMC5
+S82W    Nimiq 2
+S87W    AMC3
+S91W    Nimiq 1
+S97W    Telestar 5
+S105W   AMC2
+S110W   Echostar 6/8
+S119W   Echostar 7
+S121W   Echostar 9
+S148W   Echostar 1/2
+S157W   Echostar 4
 
 # Cable
 

From 0b283547acdb3a876416bfee3d979e433537adf8 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 9 Nov 2003 18:00:00 +0100
Subject: [PATCH 090/307] Version 1.2.6pre6 - Fixed handling Priority -1 in
 cDvbDevice::ProvidesChannel() (thanks to   Torsten Herz). - Fixed processing
 EPG data in case there is no title (thanks to Torsten Herz).

---
 CONTRIBUTORS           | 2 ++
 HISTORY                | 6 ++++++
 config.h               | 4 ++--
 dvbdevice.c            | 4 ++--
 libdtv/libvdr/libvdr.c | 4 +---
 newplugin              | 2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f988ff49c..b1dee0638 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -643,6 +643,8 @@ Torsten Herz <torsten.herz@web.de>
  for reporting a wrong EPG bugfix code number for the MAX_USEFUL_SUBTITLE_LENGTH fix
  for fixing a bug in resetting OSD color palettes
  for adding missing 'const' to some cChannel member functions
+ for fixing handling Priority -1 in cDvbDevice::ProvidesChannel()
+ for fixing processing EPG data in case there is no title
 
 Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
  for reporting a problem with CPU load peaks (in the EPG scanner)
diff --git a/HISTORY b/HISTORY
index 4bb06ea15..f57c32db0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2459,3 +2459,9 @@ Video Disk Recorder Revision History
 - Added North American satellites to 'sources.conf' (thanks to Luke Jenkins).
 - Fixed getting the list of recordings in case VDR is started from a directory
   where it doesn't have access to (thanks to Dirk Mueller).
+
+2003-11-09: Version 1.2.6pre6
+
+- Fixed handling Priority -1 in cDvbDevice::ProvidesChannel() (thanks to
+  Torsten Herz).
+- Fixed processing EPG data in case there is no title (thanks to Torsten Herz).
diff --git a/config.h b/config.h
index ffe7794db..1f055b123 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.4 2003/11/07 15:12:42 kls Exp $
+ * $Id: config.h 1.176.1.5 2003/11/09 11:06:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre5"
+#define VDRVERSION  "1.2.6pre6"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 4e7b50ca8..5ae8c6fd9 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.67.1.3 2003/11/07 13:24:49 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.4 2003/11/09 11:08:22 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -654,7 +654,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
      result = hasPriority;
-     if (Receiving()) {
+     if (Priority >= 0 && Receiving()) {
         if (dvbTuner->IsTunedTo(Channel)) {
            if (!HasPid(Channel->Vpid())) {
 #ifdef DO_MULTIPLE_RECORDINGS
diff --git a/libdtv/libvdr/libvdr.c b/libdtv/libvdr/libvdr.c
index e041fd82f..5f9012584 100644
--- a/libdtv/libvdr/libvdr.c
+++ b/libdtv/libvdr/libvdr.c
@@ -118,7 +118,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                   AddItemToText (Item->Text,
                      VdrProgramInfo->ExtendedText);
                }
-               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -134,7 +133,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                   VdrProgramInfo->ContentNibble2 =
                      GetContentContentNibble2(Descriptor, j);
                }
-               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -147,12 +145,12 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                   if (!strncmp (VdrProgramInfo->LanguageCode,
                           Rating->LanguageCode, 3))
                      VdrProgramInfo->Rating = Rating->Rating;
-               GotVdrProgramInfo = 1;
             }
             break;
          }
       }      
       if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo);
+      else                   xMemFree (VdrProgramInfo);
    }
 
    return (Result);
diff --git a/newplugin b/newplugin
index a89852458..e47426630 100755
--- a/newplugin
+++ b/newplugin
@@ -261,7 +261,7 @@ The next steps you should perform now are:
 sub CreateFile
 {
   my ($Name, $Content) = @_;
-  open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V126pre5 $!\n";
+  open(FILE, ">$PLUGINDIR/$Name") || die "$Name:  $!\n";
   print FILE $Content;
   close(FILE);
 }

From c432905dd60630f906ac89f58592ad835a9063ef Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 14 Nov 2003 18:00:00 +0100
Subject: [PATCH 091/307] Version 1.2.6 - Final release of version 1.2.6.

---
 HISTORY  | 4 ++++
 config.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index f57c32db0..16f8cee6e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2465,3 +2465,7 @@ Video Disk Recorder Revision History
 - Fixed handling Priority -1 in cDvbDevice::ProvidesChannel() (thanks to
   Torsten Herz).
 - Fixed processing EPG data in case there is no title (thanks to Torsten Herz).
+
+2003-11-14: Version 1.2.6
+
+- Final release of version 1.2.6.
diff --git a/config.h b/config.h
index 1f055b123..cc942d2f7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.5 2003/11/09 11:06:10 kls Exp $
+ * $Id: config.h 1.176.1.6 2003/11/14 13:29:13 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6pre6"
+#define VDRVERSION  "1.2.6"
 #define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99

From 93a94b18b540fbcb9bcdaaea9abd26cdf23d6ee6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 Jan 2004 18:00:00 +0100
Subject: [PATCH 092/307] Version 1.3.0 - Changed thread handling to make it
 work with NPTL ("Native Posix Thread Library").   Thanks to Jon Burgess,
 Andreas Schultz, Werner Fink and Stefan Huelswitt. - The cThread class now
 accepts a 'Description' parameter, which is used to log   the beginning and
 end of the thread, together with its process and thread id.   For
 descriptions that need additional parameters you can use the function  
 cThread::SetDescription(), which accepts 'printf()' like arguments.  
 Existing plugins that use threads should be changed to use this functionality
   instead of explicit 'dsyslog()' calls inside their Action() function in
 order   to support logging the thread ids. - Added "Slovak Link" and "Czech
 Link" to 'ca.conf' (thanks to Emil Petersky).   However, 'ca.conf' is now
 pretty much obsolete due to the automatic CA handling. - Mutexes are now
 created with PTHREAD_MUTEX_ERRORCHECK_NP, which makes the   'lockingTid'
 stuff obsolete (thanks to Stefan Huelswitt). - Changed font handling to allow
 language specific character sets. - Adopted the small font character set from
 the "Elchi" patch (originally   provided by Alessio Sangalli). - Greek
 language texts now use iso8859-7 character set (thanks to Dimitrios  
 Dimitrakos). - Rearranged section data handling, so that the actual data
 handling can be done   separately, even from within plugins. - The EPG data
 structures have been moved from eit.[hc] to epg.[hc] and have been   adapted
 to the general VDR coding style. Plugins that use these data structures   may
 need to change some function names (which should be obvious).   The name
 'subtitle' has been changed to 'shortText' to avoid clashes with actual  
 subtitles that are part of a movie. The name 'extendedDescription' has been  
 shortened to 'description'. - Replaced 'libdtv' with 'libsi' (thanks to
 Marcel Wiesweg), which is thread   safe and can be used by multiple section
 filters simultaneously. - Added 'cRwLock' to 'thread.[hc]'. Note that all
 plugin Makefiles need to   define _GNU_SOURCE for this to work (see the
 example plugin Makefiles and   'newplugin'). - Fixed a problem with crc32 in
 SI handling on 64bit systems (thanks to Pedro   Miguel Sequeira de Justo
 Teixeira for reporting this one). - Fixed an alignment problem in CAM access
 on 64bit systems  (thanks to Pedro   Miguel Sequeira de Justo Teixeira for
 reporting this one). - Added 'StreamType' setting to CAM communication, which
 is important for   Aston/SECA CAMs (thanks to Antonino Sergi). - Now the CA
 descriptors are sent to the CAM in the 'program' or 'ES level'   sections,
 depending on where they are found in the PMT (thanks to Hans-Peter   Raschke
 for reporting this one). This should make SkyCrypt CAMs work. - Now using the
 'version number' of EPG events to avoid unnecessary work. - Channel data is
 now automatically derived from the DVB data stream (inspired   by the
 'autopid' patch from Andreas Schultz). - The current channel is now
 automatically re-tuned if the PIDs or other settings   change. If a recording
 is going on on a channel that has a change in its   settings, the recording
 will be stopped and immediately restarted to use the   new channel settings.
 - EPG events now use the complete channel ID with NID, TID and SID. - Channel
 names in 'channels.conf' can now have a short form, as provided   by some tv
 stations (see man vdr(5)). Currently channels that provide short   names in
 addition to long ones are listed in the OSD as "short,long name",   as in
 "RTL,RTL Television". The short names will be used explicitly later. - The Ca
 parameter in 'channels.conf' has been extended and now contains all the   CA
 system ids for the given channel. When switching to a channel VDR now tests  
 for a device that provides one of these CA system ids. The devices
 automatically   get their supported ids from the CI handler. - The values in
 'ca.conf' are currently without any real meaning. Whether or not   a channel
 with conditional access can be received is now determined automatically   by
 evaluating its CA descriptors and comparing them to the CA system ids  
 provided by the installed CAM. Only the special values 1-16 are used to
 assign   a channel to a particular device. - Increased the maximum number of
 possible OSD colors to 256. - Limited the line length in the EPG bugfix
 report, which appears to fix a buffer   overflow that caused a crash when
 cleaning up the EPG data (at 05:00 in the   morning).

---
 CONTRIBUTORS                                  |   25 +
 HISTORY                                       |   70 +-
 INSTALL                                       |   12 +-
 Makefile                                      |   50 +-
 PLUGINS.html                                  |  223 +-
 PLUGINS/src/hello/Makefile                    |    4 +-
 PLUGINS/src/osddemo/Makefile                  |    4 +-
 PLUGINS/src/sky/HISTORY                       |    4 +
 PLUGINS/src/sky/Makefile                      |    4 +-
 PLUGINS/src/sky/sky.c                         |   12 +-
 PLUGINS/src/status/Makefile                   |    4 +-
 README.developer                              |   83 +
 ca.conf                                       |    2 +
 channels.c                                    |  223 +-
 channels.conf                                 |  254 +-
 channels.h                                    |   52 +-
 ci.c                                          |   71 +-
 ci.h                                          |   13 +-
 config.h                                      |    8 +-
 cutter.c                                      |    6 +-
 device.c                                      |   95 +-
 device.h                                      |   37 +-
 dvbdevice.c                                   |  140 +-
 dvbdevice.h                                   |   17 +-
 dvbplayer.c                                   |   10 +-
 eit.c                                         | 1596 +---
 eit.h                                         |  190 +-
 eitscan.c                                     |  144 +-
 eitscan.h                                     |    7 +-
 epg.c                                         |  684 ++
 epg.h                                         |  134 +
 filter.c                                      |  126 +
 filter.h                                      |   74 +
 font.c                                        |   78 +-
 font.h                                        |   35 +-
 fontfix-iso8859-7.c                           | 6498 +++++++++++++++++
 fontfix.c                                     |    2 +-
 fontosd-iso8859-7.c                           | 5826 +++++++++++++++
 fontosd.c                                     |    2 +-
 fontsml-iso8859-7.c                           | 4930 +++++++++++++
 fontsml.c                                     | 5602 ++++++++++++++
 i18n.c                                        |  418 +-
 i18n.h                                        |    3 +-
 libdtv/COPYING                                |  339 -
 libdtv/Makefile                               |   73 -
 libdtv/README                                 |   27 -
 libdtv/liblx/COPYING                          |  339 -
 libdtv/liblx/Makefile                         |   62 -
 libdtv/liblx/liblx.h                          |  449 --
 libdtv/liblx/xListFuncs.c                     |  189 -
 libdtv/liblx/xMemMgt.c                        |  624 --
 libdtv/libsi/COPYING                          |  339 -
 libdtv/libsi/Makefile                         |   83 -
 libdtv/libsi/README                           |    2 -
 libdtv/libsi/include/libsi.h                  | 1248 ----
 libdtv/libsi/si_debug_services.c              |  674 --
 libdtv/libsi/si_debug_services.h              |  245 -
 libdtv/libsi/si_parser.c                      | 1335 ----
 libdtv/libvdr/COPYING                         |  339 -
 libdtv/libvdr/Makefile                        |   63 -
 libdtv/libvdr/libvdr.c                        |  157 -
 libdtv/libvdr/libvdr.h                        |  111 -
 libsi/Makefile                                |   52 +
 libsi/descriptor.c                            |  635 ++
 libsi/descriptor.h                            |  477 ++
 libsi/gendescr.pl                             |   83 +
 .../include/si_tables.h => libsi/headers.h    | 1074 ++-
 libsi/section.c                               |  328 +
 libsi/section.h                               |  252 +
 libsi/si.c                                    |  415 ++
 libsi/si.h                                    |  392 +
 libsi/util.c                                  |  281 +
 libsi/util.h                                  |  157 +
 lirc.c                                        |    5 +-
 menu.c                                        |  245 +-
 menu.h                                        |   13 +-
 newplugin                                     |    4 +-
 osdbase.c                                     |    6 +-
 osdbase.h                                     |    6 +-
 pat.c                                         |  378 +
 pat.h                                         |   43 +
 rcu.c                                         |    5 +-
 recorder.c                                    |    7 +-
 remote.c                                      |    5 +-
 ringbuffer.c                                  |   10 +-
 ringbuffer.h                                  |    4 +-
 sdt.c                                         |  146 +
 sdt.h                                         |   27 +
 sections.c                                    |  187 +
 sections.h                                    |   45 +
 svdrp.c                                       |   17 +-
 thread.c                                      |  112 +-
 thread.h                                      |   20 +-
 timers.c                                      |   20 +-
 timers.h                                      |    6 +-
 transfer.c                                    |    7 +-
 vdr.5                                         |   43 +-
 vdr.c                                         |   48 +-
 98 files changed, 30388 insertions(+), 9637 deletions(-)
 create mode 100644 README.developer
 create mode 100644 epg.c
 create mode 100644 epg.h
 create mode 100644 filter.c
 create mode 100644 filter.h
 create mode 100644 fontfix-iso8859-7.c
 create mode 100644 fontosd-iso8859-7.c
 create mode 100644 fontsml-iso8859-7.c
 create mode 100644 fontsml.c
 delete mode 100644 libdtv/COPYING
 delete mode 100644 libdtv/Makefile
 delete mode 100644 libdtv/README
 delete mode 100644 libdtv/liblx/COPYING
 delete mode 100644 libdtv/liblx/Makefile
 delete mode 100644 libdtv/liblx/liblx.h
 delete mode 100644 libdtv/liblx/xListFuncs.c
 delete mode 100644 libdtv/liblx/xMemMgt.c
 delete mode 100644 libdtv/libsi/COPYING
 delete mode 100644 libdtv/libsi/Makefile
 delete mode 100644 libdtv/libsi/README
 delete mode 100644 libdtv/libsi/include/libsi.h
 delete mode 100644 libdtv/libsi/si_debug_services.c
 delete mode 100644 libdtv/libsi/si_debug_services.h
 delete mode 100644 libdtv/libsi/si_parser.c
 delete mode 100644 libdtv/libvdr/COPYING
 delete mode 100644 libdtv/libvdr/Makefile
 delete mode 100644 libdtv/libvdr/libvdr.c
 delete mode 100644 libdtv/libvdr/libvdr.h
 create mode 100644 libsi/Makefile
 create mode 100644 libsi/descriptor.c
 create mode 100644 libsi/descriptor.h
 create mode 100755 libsi/gendescr.pl
 rename libdtv/libsi/include/si_tables.h => libsi/headers.h (62%)
 create mode 100644 libsi/section.c
 create mode 100644 libsi/section.h
 create mode 100644 libsi/si.c
 create mode 100644 libsi/si.h
 create mode 100644 libsi/util.c
 create mode 100644 libsi/util.h
 create mode 100644 pat.c
 create mode 100644 pat.h
 create mode 100644 sdt.c
 create mode 100644 sdt.h
 create mode 100644 sections.c
 create mode 100644 sections.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b1dee0638..d2f715dd6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -83,6 +83,8 @@ Dave Chapman <dave@dchapman.com>
 Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de>
  for his support in adapting VDR to DVB-C
  for adding the 'statdvb2vdr' tool (see Tools/statdvb2vdr)
+ for reporting that the CA descriptors need to be sent to the CAM in the 'program'
+ or 'ES level' sections to make SkyCrypt CAMs work
 
 Peter Hofmann <software@pxh.de>
  for his support in adapting VDR to DVB-C
@@ -177,6 +179,9 @@ Stefan Huelswitt <huels@iname.com>
  for fixing an uninitialized variable in cDisplayChannel
  for fixing a possible access of invalid file handles in cSIProcessor::Action()
  for fixing extracting the ES data in cDvbDevice::StillPicture()
+ for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
+ for creating mutexes with PTHREAD_MUTEX_ERRORCHECK_NP, which made the 'lockingTid'
+ stuff obsolete
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -210,6 +215,9 @@ Andreas Schultz <aschultz@warp10.net>
  for changing C++ style comments in libdtv into C style to avoid warnings in gcc 3.x
  for implementing the TerrestrialDeliverySystemDescriptor in libdtv
  for fixing setting the locking pid after a timed wait
+ for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
+ for his 'autopid' patch which was helpful when implementing automatic
+ channel data gathering
 
 Aaron Holtzman
  for writing 'ac3dec'
@@ -243,6 +251,7 @@ Werner Fink <werner@suse.de>
  for replacing the 'for' loops in StripAudioPackets() with memset() calls
  for modifying handling of audio packets in cDvbPlayer for better sync with external
  AC3 replay
+ for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -403,6 +412,7 @@ Simon Dean <linux-dvb@sickhack.com>
 Dimitrios Dimitrakos <mail@dimitrios.de>
  for translating OSD texts to the Greek language
  for fixing handling the LOG_LOCALn parameters in the -l option
+ for providing the iso8859-7 fonts
 
 Marcus Kuba <marcus@kuba4u.de>
  for reporting a bug in the unit of the "SVDRP timeout" setup parameter
@@ -636,6 +646,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for reporting a problem with cReceivers that want to receive from PIDs that are
  currently not transmitting
  for fixing volume display in case a plugin has its own OSD open
+ for providing 'libsi' and adapting the EIT mechanisms to it
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -762,6 +773,7 @@ Karim Afifi <karim.afifi@free.fr>
 
 Jon Burgess <mplayer@jburgess.uklinux.net>
  for pointing out a problem with NPTL ("Native Posix Thread Library")
+ for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
 
 Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
  for reporting a crash when cancelling a newly created timer
@@ -862,3 +874,16 @@ Luke Jenkins <a@xmission.com>
 Dirk Mueller <dmuell@gmx.net>
  for fixing getting the list of recordings in case VDR is started from a directory
  where it doesn't have access to
+
+Emil Petersky <petersky@isr.uni-stuttgart.de>
+ for adding "Slovak Link" and "Czech Link" to 'ca.conf'
+
+Alessio Sangalli <alesan@manoweb.com>
+ for providing the iso8859-1 small font
+
+Pedro Miguel Sequeira de Justo Teixeira <pedro.miguel.teixeira@bigfoot.com>
+ for reporting a problem with crc32 in SI handling on 64bit systems
+ for reporting an alignment problem in CAM access on 64bit systems
+
+Antonino Sergi <voyaser@tiscalinet.it>
+ for adding 'StreamType' setting to CAM communication
diff --git a/HISTORY b/HISTORY
index 16f8cee6e..e3fe7bc03 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2393,7 +2393,7 @@ Video Disk Recorder Revision History
   not loaded (suggested by Alexander Wetzel).
 - Fixed checking for VIDEO_STREAM_S in cRemux::SetBrokenLink() (thanks to Oliver
   Endriss).
-- Added 'repeat' function keys '7' and '9' ("jump to mark") in replay mode
+- Added 'repeat' function to keys '7' and '9' ("jump to mark") in replay mode
   (suggested by Oliver Endriss).
 - Made cOsdMenu::Display() virtual, which allows plugins to do some additional
   processing after calling the base class function (suggested by Jan Rieger).
@@ -2469,3 +2469,71 @@ Video Disk Recorder Revision History
 2003-11-14: Version 1.2.6
 
 - Final release of version 1.2.6.
+
+2004-01-04: Version 1.3.0
+
+- Changed thread handling to make it work with NPTL ("Native Posix Thread Library").
+  Thanks to Jon Burgess, Andreas Schultz, Werner Fink and Stefan Huelswitt.
+- The cThread class now accepts a 'Description' parameter, which is used to log
+  the beginning and end of the thread, together with its process and thread id.
+  For descriptions that need additional parameters you can use the function
+  cThread::SetDescription(), which accepts 'printf()' like arguments.
+  Existing plugins that use threads should be changed to use this functionality
+  instead of explicit 'dsyslog()' calls inside their Action() function in order
+  to support logging the thread ids.
+- Added "Slovak Link" and "Czech Link" to 'ca.conf' (thanks to Emil Petersky).
+  However, 'ca.conf' is now pretty much obsolete due to the automatic CA handling.
+- Mutexes are now created with PTHREAD_MUTEX_ERRORCHECK_NP, which makes the
+  'lockingTid' stuff obsolete (thanks to Stefan Huelswitt).
+- Changed font handling to allow language specific character sets.
+- Adopted the small font character set from the "Elchi" patch (originally
+  provided by Alessio Sangalli).
+- Greek language texts now use iso8859-7 character set (thanks to Dimitrios
+  Dimitrakos).
+- Rearranged section data handling, so that the actual data handling can be done
+  separately, even from within plugins.
+- The EPG data structures have been moved from eit.[hc] to epg.[hc] and have been
+  adapted to the general VDR coding style. Plugins that use these data structures
+  may need to change some function names (which should be obvious).
+  The name 'subtitle' has been changed to 'shortText' to avoid clashes with actual
+  subtitles that are part of a movie. The name 'extendedDescription' has been
+  shortened to 'description'.
+- Replaced 'libdtv' with 'libsi' (thanks to Marcel Wiesweg), which is thread
+  safe and can be used by multiple section filters simultaneously.
+- Added 'cRwLock' to 'thread.[hc]'. Note that all plugin Makefiles need to
+  define _GNU_SOURCE for this to work (see the example plugin Makefiles and
+  'newplugin').
+- Fixed a problem with crc32 in SI handling on 64bit systems (thanks to Pedro
+  Miguel Sequeira de Justo Teixeira for reporting this one).
+- Fixed an alignment problem in CAM access on 64bit systems  (thanks to Pedro
+  Miguel Sequeira de Justo Teixeira for reporting this one).
+- Added 'StreamType' setting to CAM communication, which is important for
+  Aston/SECA CAMs (thanks to Antonino Sergi).
+- Now the CA descriptors are sent to the CAM in the 'program' or 'ES level'
+  sections, depending on where they are found in the PMT (thanks to Hans-Peter
+  Raschke for reporting this one). This should make SkyCrypt CAMs work.
+- Now using the 'version number' of EPG events to avoid unnecessary work.
+- Channel data is now automatically derived from the DVB data stream (inspired
+  by the 'autopid' patch from Andreas Schultz).
+- The current channel is now automatically re-tuned if the PIDs or other settings
+  change. If a recording is going on on a channel that has a change in its
+  settings, the recording will be stopped and immediately restarted to use the
+  new channel settings.
+- EPG events now use the complete channel ID with NID, TID and SID.
+- Channel names in 'channels.conf' can now have a short form, as provided
+  by some tv stations (see man vdr(5)). Currently channels that provide short
+  names in addition to long ones are listed in the OSD as "short,long name",
+  as in "RTL,RTL Television". The short names will be used explicitly later.
+- The Ca parameter in 'channels.conf' has been extended and now contains all the
+  CA system ids for the given channel. When switching to a channel VDR now tests
+  for a device that provides one of these CA system ids. The devices automatically
+  get their supported ids from the CI handler.
+- The values in 'ca.conf' are currently without any real meaning. Whether or not
+  a channel with conditional access can be received is now determined automatically
+  by evaluating its CA descriptors and comparing them to the CA system ids
+  provided by the installed CAM. Only the special values 1-16 are used to assign
+  a channel to a particular device.
+- Increased the maximum number of possible OSD colors to 256.
+- Limited the line length in the EPG bugfix report, which appears to fix a buffer
+  overflow that caused a crash when cleaning up the EPG data (at 05:00 in the
+  morning).
diff --git a/INSTALL b/INSTALL
index 987d5a5aa..88546ea78 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,9 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 1.2
+Version 1.3
 -----------
 
-IMPORTANT NOTE:
----------------
-
-VDR currently doesn't work with NPTL ("Native Posix Thread Library").
-Either don't use NPTL, or set the environment variable
-
-  LD_ASSUME_KERNEL=2.4.1
-  
-before running VDR.
-
 Compiling and running the program:
 ----------------------------------
 
diff --git a/Makefile b/Makefile
index 1c009e836..cc3a3a954 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.58 2003/08/09 11:09:45 kls Exp $
+# $Id: Makefile 1.62 2003/12/25 13:38:56 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -15,7 +15,7 @@ CXX      ?= g++
 CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 
 DVBDIR   = ../DVB
-DTVDIR   = ./libdtv
+LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
@@ -31,16 +31,20 @@ DOXYFILE = Doxyfile
 
 INCLUDES = -I$(DVBDIR)/include
 
-DTVLIB   = $(DTVDIR)/libdtv.a
+SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
-       dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
-       lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
-       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\
+       dvbplayer.o dvbspu.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
+       lirc.o menu.o menuitems.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
+       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o sources.o\
        spu.o status.o svdrp.o thread.o timers.o tools.o transfer.o vdr.o videodir.o
 
-OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
-FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
+FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
+OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
+SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1
+FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
+OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
+SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
 
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
@@ -64,7 +68,9 @@ DEFINES += -DVFAT
 endif
 
 all: vdr
-font: genfontfile fontfix.c fontosd.c
+font: genfontfile\
+      fontfix.c fontosd.c fontsml.c\
+      fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c
 	@echo "font files created."
 
 # Implicit rules:
@@ -83,25 +89,33 @@ $(DEPFILE): Makefile
 
 # The main program:
 
-vdr: $(OBJS) $(DTVLIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
+vdr: $(OBJS) $(SILIB)
+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
 
 # The font files:
 
 fontfix.c:
-	./genfontfile "cFont::tPixelData FontFix" "$(FIXFONT)" > $@
+	./genfontfile "cFont::tPixelData FontFix_iso8859_1" "$(FIXFONT_ISO8859_1)" > $@
 fontosd.c:
-	./genfontfile "cFont::tPixelData FontOsd" "$(OSDFONT)" > $@
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@
+fontsml.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@
+fontfix_iso8859_1.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_7" "$(FIXFONT_ISO8859_7)" > $@
+fontosd_iso8859_1.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_7" "$(OSDFONT_ISO8859_7)" > $@
+fontsml_iso8859_1.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
 
 # The font file generator:
 
 genfontfile: genfontfile.c
 	$(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
 
-# The libdtv library:
+# The libsi library:
 
-$(DTVLIB) $(DTVDIR)/libdtv.h:
-	$(MAKE) -C $(DTVDIR) all
+$(SILIB):
+	$(MAKE) -C $(LSIDIR) all
 
 # The 'include' directory (for plugins):
 
@@ -140,11 +154,11 @@ srcdoc:
 # Housekeeping:
 
 clean:
-	$(MAKE) -C $(DTVDIR) clean
+	$(MAKE) -C $(LSIDIR) clean
 	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
 	-rm -rf include
 	-rm -rf srcdoc
 fontclean:
-	-rm -f fontfix.c fontosd.c
+	-rm -f fontfix*.c fontosd*.c fontsml*.c
 CLEAN: clean fontclean
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 95ba5d79c..d13ca4ab0 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.2.6</b></center>
+<center><b>Version 1.3</b></center>
 <p>
 <center>
 Copyright &copy; 2003 Klaus Schmidinger<br>
@@ -14,9 +14,12 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.2.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.2.6 are marked like this.
-<!--X1.1.32--></td></tr></table>
+<!--X1.2.6--></td></tr></table>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.0 are marked like this.
+<!--X1.3.0--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -64,6 +67,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Status monitor">Status monitor</a>
 <li><a href="#Players">Players</a>
 <li><a href="#Receivers">Receivers</a>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Filters">Filters</a>
+<!--X1.3.0--></td></tr></table>
 <li><a href="#The On Screen Display">The On Screen Display</a>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Dolby Digital">Dolby Digital</a>
@@ -112,7 +118,7 @@ <h1>Table Of Contents</h1>
 <p>
 A plugin can access its name through the (non virtual) member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const char *Name(void);
 </pre></td></tr></table><p>
 
@@ -127,7 +133,7 @@ <h1>Table Of Contents</h1>
 VDR source directory. Inside this directory the following subdirectory structure
 is used:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 VDR/PLUGINS/src
 VDR/PLUGINS/src/hello
 VDR/PLUGINS/lib
@@ -172,7 +178,7 @@ <h1>Table Of Contents</h1>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/src</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
 
@@ -226,7 +232,7 @@ <h1>Table Of Contents</h1>
 <p>
 At the end of the plugin's source file you will find a line that looks like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 VDRPLUGINCREATOR(cPluginHello);
 </pre></td></tr></table><p>
 
@@ -239,7 +245,7 @@ <h1>Table Of Contents</h1>
 Header files usually contain preprocessor statements that prevent the same
 file (or rather its contents, to be precise) from being included more than once, like
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #ifndef __I18N_H
 #define __I18N_H
 
@@ -274,7 +280,7 @@ <h1>Table Of Contents</h1>
 
 The constructor and destructor of a plugin are defined as
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cPlugin(void);
 virtual ~cPlugin();
 </pre></td></tr></table><p>
@@ -304,7 +310,7 @@ <h1>Table Of Contents</h1>
 have to be in any way related to the VDR version number.
 VDR requests a plugin's version number through a call to the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual const char *Version(void) = 0;
 </pre></td></tr></table><p>
 
@@ -315,7 +321,7 @@ <h1>Table Of Contents</h1>
 be as long as really necessary, and shall not contain the plugin's name itself.
 Here's an example:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 static const char *VERSION = "0.0.1";
 
 const char *cPluginHello::Version(void)
@@ -347,13 +353,13 @@ <h1>Table Of Contents</h1>
 
 In order to tell the user what exactly a plugin does, it must implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual const char *Description(void) = 0;
 </pre></td></tr></table><p>
 
 which returns a short, one line description of the plugin's purpose:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 static const char *DESCRIPTION = "A friendly greeting";
 
 virtual const char *Description(void)
@@ -373,7 +379,7 @@ <h1>Table Of Contents</h1>
 If a plugin wants to react on command line arguments, it needs to implement
 the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool ProcessArgs(int argc, char *argv[]);
 </pre></td></tr></table><p>
 
@@ -390,7 +396,7 @@ <h1>Table Of Contents</h1>
 will survive the entire lifetime of the plugin, so it is safe to store pointers to
 these values inside the plugin. Here's an example:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 bool cPluginHello::ProcessArgs(int argc, char *argv[])
 {
   // Implement command line argument processing here if applicable.
@@ -425,7 +431,7 @@ <h1>Table Of Contents</h1>
 
 If a plugin accepts command line options, it should implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual const char *CommandLineHelp(void);
 </pre></td></tr></table><p>
 
@@ -433,7 +439,7 @@ <h1>Table Of Contents</h1>
 The returned string should contain the command line help for this plugin, formatted
 in the same way as done by VDR itself:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const char *cPluginHello::CommandLineHelp(void)
 {
   // Return a string that describes all known command line options.
@@ -456,7 +462,7 @@ <h1>Table Of Contents</h1>
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement one of the functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool Initialize(void);
 virtual bool Start(void);
 </pre></td></tr></table><p>
@@ -493,7 +499,7 @@ <h1>Table Of Contents</h1>
 If the plugin implements a feature that the user shall be able to access
 from VDR's main menu, it needs to implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual const char *MainMenuEntry(void);
 </pre></td></tr></table><p>
 
@@ -501,7 +507,7 @@ <h1>Table Of Contents</h1>
 this plugin will not have an item in the main menu. Here's an example of a
 plugin that will have a main menu item:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 static const char *MAINMENUENTRY = "Hello";
 
 const char *cPluginHello::MainMenuEntry(void)
@@ -520,7 +526,7 @@ <h1>Table Of Contents</h1>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
 
@@ -554,7 +560,7 @@ <h1>Table Of Contents</h1>
 From time to time a plugin may want to do some regular tasks, like cleaning
 up some files or other things. In order to do this it can implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual void Housekeeping(void);
 </pre></td></tr></table><p>
 
@@ -579,7 +585,7 @@ <h1>Table Of Contents</h1>
 If a plugin requires its own setup parameters, it needs to implement the following
 functions to handle these parameters:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual cMenuSetupPage *SetupMenu(void);
 virtual bool SetupParse(const char *Name, const char *Value);
 </pre></td></tr></table><p>
@@ -594,7 +600,7 @@ <h1>Table Of Contents</h1>
 the log file (and program execution will continue).
 A possible implementation of <tt>SetupParse()</tt> could look like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 bool cPluginHello::SetupParse(const char *Name, const char *Value)
 {
   // Parse your own setup parameters and store their values.
@@ -620,7 +626,7 @@ <h1>Table Of Contents</h1>
 <p>
 To store its values in the global setup, a plugin has to call the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 void SetupStore(const char *Name, <i>type</i> Value);
 </pre></td></tr></table><p>
 
@@ -653,7 +659,7 @@ <h1>Table Of Contents</h1>
 <tt>cMenuSetupPage</tt> and implement its constructor and the pure virtual
 <tt>Store()</tt> member function:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 int GreetingTime = 3;
 int UseAlternateGreeting = false;
 
@@ -714,7 +720,7 @@ <h1>Table Of Contents</h1>
 sees fit, it might be a good idea to put them in a common place, preferably
 where other configuration data already exists. VDR provides the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const char *ConfigDirectory(const char *PluginName = NULL);
 </pre></td></tr></table><p>
 
@@ -737,7 +743,7 @@ <h1>Table Of Contents</h1>
 the <tt>ConfigDirectory()</tt> function can be given an additional string that will
 be appended to the returned directory name, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const char *MyConfigDir = ConfigDirectory(Name());
 </pre></td></tr></table><p>
 
@@ -754,7 +760,7 @@ <h1>Table Of Contents</h1>
 class. This allows it to be called even from outside any member function of the derived
 plugin class, by writing
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const char *MyConfigDir = cPlugin::ConfigDirectory();
 </pre></td></tr></table><p>
 
@@ -765,7 +771,7 @@ <h1>Table Of Contents</h1>
 If a plugin displays texts to the user, it should implement internationalized
 versions of these texts and call the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 void RegisterI18n(const tI18nPhrase * const Phrases);
 </pre></td></tr></table><p>
 
@@ -774,7 +780,7 @@ <h1>Table Of Contents</h1>
 The call to this function must be done in the <a href="#Getting started"><tt>Initialize()</tt></a>
 or <a href="#Getting started"><tt>Start()</tt></a> function of the plugin:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const tI18nPhrase Phrases[] = {
   { "Hello world!",
     "Hallo Welt!",
@@ -815,7 +821,7 @@ <h1>Table Of Contents</h1>
 The actual runtime selection of the texts corresponding to the selected language
 is done by wrapping each internationalized text with the <tt>tr()</tt> macro:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 const char *s = tr("Hello world!");
 </pre></td></tr></table><p>
 
@@ -833,20 +839,20 @@ <h1>Table Of Contents</h1>
 
 Plugins are loaded into VDR using the command line option <b><tt>-P</tt></b>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 vdr -Phello
 </pre></td></tr></table><p>
 
 If the plugin accepts command line options, they are given as part of the argument
 to the <b><tt>-P</tt></b> option, which then has to be enclosed in quotes:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 vdr -P"hello -a abc -b"
 </pre></td></tr></table><p>
 
 Any number of plugins can be loaded this way, each with its own <b><tt>-P</tt></b> option:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 vdr -P"hello -a abc -b" -Pdvd -Pmp3
 </pre></td></tr></table><p>
 
@@ -854,7 +860,7 @@ <h1>Table Of Contents</h1>
 cannot be found at their default location) you need to tell VDR the location of
 the plugins through the <b><tt>-L</tt></b> option:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 vdr -L/usr/lib/vdr -Phello
 </pre></td></tr></table><p>
 
@@ -879,14 +885,14 @@ <h1>Table Of Contents</h1>
 <p>
 Simply change into your source directory and execute <tt>make dist</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cd VDR/PLUGINS/src/hello
 make dist
 </pre></td></tr></table><p>
 
 After this you should find a file named like
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 vdr-hello-0.0.1.tgz
 </pre></td></tr></table><p>
 
@@ -902,7 +908,7 @@ <h1>Table Of Contents</h1>
 If a plugin wants to get informed on various events in VDR, it can derive a class from
 <tt>cStatus</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/status.h&gt;
 
 class cMyStatusMonitor : public cStatus {
@@ -922,7 +928,7 @@ <h1>Table Of Contents</h1>
 An object of this class will be informed whenever the channel is switched on one of
 the DVB devices. It could be used in a plugin like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/plugin.h&gt;
 
 class cPluginStatus : public cPlugin {
@@ -975,7 +981,7 @@ <h1>Table Of Contents</h1>
 Implementing a player is a two step process.
 First you need the actual player class, which is derived from the abstract <tt>cPlayer</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/player.h&gt;
 
 class cMyPlayer : public cPlayer {
@@ -991,7 +997,7 @@ <h1>Table Of Contents</h1>
 thread which, e.g.,  reads data from a file, you can additionally derive your class from
 <tt>cThread</tt> and implement the necessary functionality:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/player.h&gt;
 
 class cMyPlayer : public cPlayer, cThread {
@@ -1009,7 +1015,7 @@ <h1>Table Of Contents</h1>
 <p>
 To play the video data, the player needs to call its member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 int PlayVideo(const uchar *Data, int Length);
 </pre></td></tr></table><p>
 
@@ -1020,7 +1026,7 @@ <h1>Table Of Contents</h1>
 DVB device doesn't run out of data.
 To avoid busy loops the player should call its member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 bool DevicePoll(cPoller &amp;Poller, int TimeoutMs = 0);
 </pre></td></tr></table><p>
 
@@ -1029,7 +1035,7 @@ <h1>Table Of Contents</h1>
 If the player can provide more than a single audio track, it can implement the
 following functions to make them available:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual int NumAudioTracks(void) const;
 virtual const char **GetAudioTracks(int *CurrentTrack = NULL);
 virtual void SetAudioTrack(int Index);
@@ -1039,7 +1045,7 @@ <h1>Table Of Contents</h1>
 If there is an additional audio track that has to be replayed with external hardware,
 the player shall call its member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 void PlayAudio(const uchar *Data, int Length);
 </pre></td></tr></table><p>
 
@@ -1048,7 +1054,7 @@ <h1>Table Of Contents</h1>
 The second part needed here is a control object that receives user input from the main
 program loop and reacts on this by telling the player what to do:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/player.h&gt;
 
 class cMyControl : public cControl {
@@ -1066,7 +1072,7 @@ <h1>Table Of Contents</h1>
 hand over a pointer to it to the <tt>cControl</tt> base class, so that it
 can be later attached to the primary DVB device:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cMyControl::cMyControl(void)
 :cControl(player = new cMyPlayer)
 {
@@ -1093,7 +1099,7 @@ <h1>Table Of Contents</h1>
 infrastructure like displaying a list of playable stuff etc) simply has to call the
 static function <tt>cControl::Launch()</tt> with the player control object, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cControl::Launch(new cMyControl);
 </pre></td></tr></table><p>
 
@@ -1104,7 +1110,7 @@ <h1>Table Of Contents</h1>
 <p>
 The <tt>cPlayer</tt> class has a member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 void DeviceStillPicture(const uchar *Data, int Length);
 </pre></td></tr></table><p>
 
@@ -1149,7 +1155,7 @@ <h1>Table Of Contents</h1>
 In order to receive any kind of data from a <tt>cDevice</tt>, a plugin must set up an
 object derived from the <tt>cReceiver</tt> class:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/receiver.h&gt;
 
 class cMyReceiver : public cReceiver, cThread {
@@ -1187,7 +1193,7 @@ <h1>Table Of Contents</h1>
 Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
 a <tt>cDevice</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cMyReceiver *Receiver = new cMyReceiver(123);
 
 cDevice::ActualDevice()-&gt;AttachReceiver(Receiver);
@@ -1201,6 +1207,52 @@ <h1>Table Of Contents</h1>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Filters"><hr><h2>Filters</h2>
+
+<center><i><b>A Fistful of Datas</b></i></center><p>
+
+If you want to receive section data you have to implement a derived <tt>cFilter</tt>
+class which at least implements the <tt>Process()</tt> function and a constructor
+that sets the (initial) filter parameters:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+#include &lt;vdr/filter.h&gt;
+
+class cMyFilter : public cFilter {
+protected:
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+public:
+  cMyFilter(void);
+  ...
+  };
+
+cMyFilter::cMyFilter(void)
+{
+  Set(0x14, 0x70);        // TDT
+}
+
+void cMyFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+{
+  // do something with the data here
+}
+</pre></td></tr></table><p>
+
+An instance of such a filter needs to be attached to the device from
+which it shall receive data, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+cMyFilter Filter;
+
+cDevice::ActualDevice()-&gt;AttachFilter(Filter);
+</pre></td></tr></table><p>
+
+If the <tt>cFilter</tt> isn't needed any more, it may simply be <i>deleted</i>
+and will automatically detach itself from the <tt>cDevice</tt>.
+<p>
+See VDR/eit.c or VDR/pat.c to learn how to process filter data.
+<!--X1.3.0--></td></tr></table>
+
 <a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
@@ -1213,7 +1265,7 @@ <h1>Table Of Contents</h1>
 If a plugin needs to have total control over the OSD, it can call the
 static function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/osd.h&gt;
 
 cOsdBase *MyOsd = cOsd::OpenRaw(x, y);
@@ -1223,7 +1275,7 @@ <h1>Table Of Contents</h1>
 of the OSD area on the screen. Such a "raw" OSD doesn't display anything
 yet, so you need to at least call the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 MyOsd-&gt;Create(...);
 </pre></td></tr></table><p>
 
@@ -1247,7 +1299,7 @@ <h1>Table Of Contents</h1>
 <p>
 To implement an additional device, a plugin must derive a class from cDevice:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/device.h&gt;
 
 class cMyDevice : public cDevice {
@@ -1266,7 +1318,7 @@ <h1>Table Of Contents</h1>
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool ProvidesSource(int Source) const;
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
@@ -1281,7 +1333,7 @@ <h1>Table Of Contents</h1>
 If the device can provide more than a single audio track, it can implement the
 following functions to make them available:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual int NumAudioTracksDevice(void) const;
 virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
 virtual void SetAudioTrackDevice(int Index);
@@ -1292,7 +1344,7 @@ <h1>Table Of Contents</h1>
 <p>
 A device that can be used for recording must implement the functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
@@ -1308,7 +1360,7 @@ <h1>Table Of Contents</h1>
 If this device allows receiving several different data streams, it can
 implement
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool CanBeReUsed(int Frequency, int Vpid);
 </pre></td></tr></table><p>
 
@@ -1318,13 +1370,13 @@ <h1>Table Of Contents</h1>
 <p>
 The functions to implement replaying capabilites are
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool HasDecoder(void) const;
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
-<!--X1.1.32--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.2.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual int64_t GetSTC(void);
-<!--X1.1.32--></td></tr></table>
+<!--X1.2.6--></td></tr></table>
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
 virtual void Play(void);
@@ -1338,12 +1390,39 @@ <h1>Table Of Contents</h1>
 In addition, the following functions may be implemented to provide further
 functionality:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int Si
 virtual void SetVideoFormat(bool VideoFormat16_9);
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<p>
+<b>Section Filtering</b>
+<p>
+If your device provides section filtering capabilities it can implement
+the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+</pre></td></tr></table><p>
+
+which must open a file handle that delivers section data for the given
+filter parameters.
+<p>
+In order to actually start section handling, the
+device also needs to call the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+StartSectionHandler();
+</pre></td></tr></table><p>
+
+from its constructor.
+<p>
+See <a href="#Filters">Filters</a> on how to set up actual filters that can
+handle section data.
+<!--X1.3.0--></td></tr></table>
+
 <p>
 <b>On Screen Display</b>
 <p>
@@ -1351,7 +1430,7 @@ <h1>Table Of Contents</h1>
 that is supposed to be used as a primary device should do), it can implement
 the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual cOsdBase *NewOsd(int x, int y);
 </pre></td></tr></table><p>
 
@@ -1391,7 +1470,7 @@ <h1>Table Of Contents</h1>
 To implement a new audio output facility, simply derive a class from <tt>cAudio</tt>,
 as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/audio.h&gt;
 #include &lt;vdr/thread.h&gt;
 
@@ -1435,7 +1514,7 @@ <h1>Table Of Contents</h1>
 The simplest method for a plugin to issue commands to VDR is to call the
 static function <tt>cRemote::Put(eKeys Key)</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cRemote::Put(kUp);
 </pre></td></tr></table><p>
 
@@ -1447,7 +1526,7 @@ <h1>Table Of Contents</h1>
 be supported by the actual remote control in use, you may want to derive your
 own remote control class from <tt>cRemote</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/remote.h&gt;
 #include &lt;vdr/thread.h&gt;
 
@@ -1472,7 +1551,7 @@ <h1>Table Of Contents</h1>
 <p>
 The constructor of your remote control class should look like this
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 cMyRemote::cMyRemote(const char *Name)
 :cRemote(Name)
 {
@@ -1492,7 +1571,7 @@ <h1>Table Of Contents</h1>
 If your remote control for some reason can't work (maybe because it was unable to
 open some file handle it requires) it can implement the virtual function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool Ready(void);
 </pre></td></tr></table><p>
 
@@ -1513,7 +1592,7 @@ <h1>Table Of Contents</h1>
 readily available next time VDR starts (without having to go through the initialization
 procedure again) it can use the <tt>cRemote</tt> member functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 void PutSetup(const char *Setup);
 const char *GetSetup(void);
 </pre></td></tr></table><p>
@@ -1527,7 +1606,7 @@ <h1>Table Of Contents</h1>
 expressed as a character string. So whatever data your remote control provides
 needs to be given to the base class by calling
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 Put(const char *Code, bool Repeat = false, bool Release = false);
 </pre></td></tr></table><p>
 
@@ -1538,7 +1617,7 @@ <h1>Table Of Contents</h1>
 value, there is another <tt>Put()</tt> function available for your convenience,
 which takes a 64 bit unsigned integer value instead of a character string:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+<p><table><tr><td bgcolor=#F0F0F0><pre>
 Put(uint64 Code, bool Repeat = false, bool Release = false);
 </pre></td></tr></table><p>
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 068f6e9eb..9f35d2096 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2002/12/13 14:54:14 kls Exp $
+# $Id: Makefile 1.9 2003/12/21 15:47:22 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -42,7 +42,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index db871613d..8116d0542 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2002/12/13 14:54:29 kls Exp $
+# $Id: Makefile 1.3 2003/12/21 15:47:26 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -42,7 +42,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index d41904e6f..d3da71ec3 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -12,3 +12,7 @@ VDR Plugin 'sky' Revision History
 2003-05-09: Version 0.1.1
 
 - Changed Start() to Initialize().
+
+2004-01-04: Version 0.2.0
+
+- Implemented automatic PID switching and channel detection
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 3df93c18d..13d623ba8 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2002/12/13 14:54:24 kls Exp $
+# $Id: Makefile 1.3 2003/12/21 15:47:31 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -42,7 +42,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index ae591378e..750d7782b 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.3 2003/05/09 15:27:16 kls Exp $
+ * $Id: sky.c 1.4 2004/01/04 15:29:15 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -14,7 +14,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.1.1";
+static const char *VERSION        = "0.2.0";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
@@ -37,6 +37,7 @@ class cDigiboxDevice : public cDevice {
   cDigiboxDevice(void);
   virtual ~cDigiboxDevice();
   virtual bool ProvidesSource(int Source) const;
+  virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsSetChannel = NULL) const;
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
   };
@@ -137,13 +138,18 @@ bool cDigiboxDevice::ProvidesSource(int Source) const
   return source == Source;
 }
 
+bool cDigiboxDevice::ProvidesTransponder(const cChannel *Channel) const
+{
+  return false; // can't provide any actual transponder
+}
+
 bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = true;
 
-  if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
+  if (ProvidesSource(Channel->Source()) && Channel->Ca() == 0x30) {//XXX
      if (Receiving()) {
         if (digiboxChannelNumber == Channel->Frequency()) {
            needsDetachReceivers = false;
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 18d5eeede..4216e75d5 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2002/12/13 14:54:19 kls Exp $
+# $Id: Makefile 1.7 2003/12/21 15:47:41 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -42,7 +42,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/README.developer b/README.developer
new file mode 100644
index 000000000..eabb09112
--- /dev/null
+++ b/README.developer
@@ -0,0 +1,83 @@
+Version 1.3.0 marks the beginning of a new developer version
+of VDR, in which I am going to integrate functionality from
+patches that have been written by various people for previous
+versions of VDR.
+
+IMPORTANT NOTE: Beginning with version 1.3.0, VDR will automatically
+=============== modify the 'channels.conf' file. Please run this version
+                of VDR in a controlled environment only, and work with
+                copies of all your config files!
+
+This version of VDR focuses on some improvements regarding
+CAM support and, most important, the first step towards automatic
+PID handling. Some things are still in a raw state, but at least
+the program should now dynamically react on any changes in the
+channel settings.
+
+Here's a list of the highlights - and what _not_ to expect yet
+(but don't worry, these things will come soon ;-):
+
+- Automatic switching when PIDs are changed (e.g. for regional
+  programmes).
+- There is no explicit transponder list yet, so you just
+  have to define one channel for a new transponder and VDR
+  will automatically detect all other channels on that transponder.
+- New channels are added to the end of the channel list, so
+  it might be a good idea to add a line like
+
+  :@1000 New channels
+
+  to have them start at some high number.
+- Improved CAM support. Channels with conditional access now automatically
+  use the device that contains the proper CAM.
+- No NVOD or "linked services" support yet.
+- No radio support yet.
+- No transponder scan yet.
+
+Note that this is currently work in progress, so there may be some
+areas that don't work as smooth as expected, yet.
+
+Known issues:
+=============
+
+- The Setup/CICAM menu is currently without much meaning.
+  CA detection is done automatically.
+- The channel "EURO1080" on Astra 19.2E currently broadcasts HDTV
+  test signals. Unfortunately, the full featured DVB cards crash
+  pretty ugly when tuned to that channel, so it might be a good idea
+  to have the channel definition
+
+  EURO1080:12168:v:S19.2E:27500:308:256:0:FF:21100:1:1088:0
+
+  in your 'channels.conf' file. Note the Ca parameter 'F' (255 in hex),
+  which gives this channel a non-existent Ca mode, so that it won't
+  be tuned to at all. If you really want to tune to this channel for
+  tests, do it on your own risk.
+- The 'sky' plugin now temporarily uses Ca value 30 (this will be changed
+  later).
+- Since the CA detection is now done automatically, a timer that starts
+  immediately after VDR has been launched and wants to record a CA channel
+  may not work. This will be changed later to make this work safely.
+
+What to test:
+=============
+
+Apart from the usual general functionality, special attention should
+be given to the following matters:
+
+- Does the automatic PID switching really work in all cases, especially
+  in conjunction with conditional access channels?
+- Does CAM support work for all kinds of CAMs?
+
+Known bugs:
+===========
+
+- Sometimes a new channel is created with the wrong 'source'
+  parameter. This presumably happens when the transponder and source
+  are switched, and there is still an SDT data packet being processed.
+  The call to device->HasLock() in sections.c should fix this (and it
+  apparently does for most cases), but there must still be soemthing
+  wrong in that area.
+- Sometimes the current channel gets re-tuned even though the channel
+  data of this channel didn't change (but that of an other channel did
+  change).
diff --git a/ca.conf b/ca.conf
index 49bff1965..af208f506 100644
--- a/ca.conf
+++ b/ca.conf
@@ -18,6 +18,8 @@
 # Cryptoworks
 
 201    GOD-DIGITAL
+202    Slovak Link
+203    Czech Link
 
 # Videoguard
 
diff --git a/channels.c b/channels.c
index 69ff3c913..9a7965f54 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.16 2003/10/17 15:42:40 kls Exp $
+ * $Id: channels.c 1.17 2004/01/04 12:28:49 kls Exp $
  */
 
 #include "channels.h"
@@ -159,6 +159,7 @@ char *cChannel::buffer = NULL;
 
 cChannel::cChannel(void)
 {
+  memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
   strcpy(name,   "Pro7");
   frequency    = 12480;
   source       = cSource::FromString("S19.2E");
@@ -170,7 +171,7 @@ cChannel::cChannel(void)
   dpid1        = 257;
   dpid2        = 0;
   tpid         = 32;
-  ca           = 0;
+  caids[0]     = 0;
   nid          = 0;
   tid          = 0;
   sid          = 888;
@@ -186,6 +187,28 @@ cChannel::cChannel(void)
   transmission = TRANSMISSION_MODE_AUTO;
   guard        = GUARD_INTERVAL_AUTO;
   hierarchy    = HIERARCHY_AUTO;
+  modification = CHANNELMOD_NONE;
+}
+
+cChannel::cChannel(const cChannel *Channel)
+{
+  *this = *Channel;
+  *name = 0;
+  vpid         = 0;
+  ppid         = 0;
+  apid1        = 0;
+  apid2        = 0;
+  dpid1        = 0;
+  dpid2        = 0;
+  tpid         = 0;
+  caids[0]     = 0;
+  nid          = 0;
+  tid          = 0;
+  sid          = 0;
+  rid          = 0;
+  number       = 0;
+  groupSep     = false;
+  modification = CHANNELMOD_NONE;
 }
 
 cChannel& cChannel::operator= (const cChannel &Channel)
@@ -194,16 +217,117 @@ cChannel& cChannel::operator= (const cChannel &Channel)
   return *this;
 }
 
-static int MHz(int frequency)
+int cChannel::Transponder(void) const
 {
-  while (frequency > 20000)
-        frequency /= 1000;
-  return frequency;
+  int tf = frequency;
+  while (tf > 20000)
+        tf /= 1000;
+  return tf;
 }
 
 tChannelID cChannel::GetChannelID(void) const
 {
-  return tChannelID(source, nid, nid ? tid : MHz(frequency), sid, rid);
+  return tChannelID(source, nid, nid ? tid : Transponder(), sid, rid);
+}
+
+int cChannel::Modification(int Mask)
+{
+  int Result = modification & Mask;
+  modification = CHANNELMOD_NONE;
+  return Result;
+}
+
+void cChannel::SetId(int Nid, int Tid, int Sid, int Rid, bool Log)
+{
+  if (nid != Nid || tid != Tid || sid != Sid || rid != Rid) {
+     if (Log)
+        dsyslog("changing id of channel %d from %d-%d-%d-%d to %d-%d-%d-%d", Number(), nid, tid, sid, rid, Nid, Tid, Sid, Rid);
+     nid = Nid;
+     tid = Tid;
+     sid = Sid;
+     rid = Rid;
+     modification |= CHANNELMOD_ID;
+     Channels.SetModified();
+     }
+}
+
+void cChannel::SetName(const char *Name, bool Log)
+{
+  if (!isempty(Name) && strcmp(name, Name) != 0) {
+     if (Log)
+        dsyslog("changing name of channel %d from '%s' to '%s'", Number(), name, Name);
+     strn0cpy(name, Name, MaxChannelName);
+     modification |= CHANNELMOD_NAME;
+     Channels.SetModified();
+     }
+}
+
+void cChannel::SetPids(int Vpid, int Ppid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid)
+{
+  //XXX if (vpid != Vpid || ppid != Ppid || apid1 != Apid1 || apid2 != Apid2 || dpid1 != Dpid1 || dpid2 != Dpid2 || tpid != Tpid) {
+  if (vpid != Vpid || ppid != Ppid || apid1 != Apid1 || (Apid2 && apid2 != Apid2) || dpid1 != Dpid1 || dpid2 != Dpid2 || tpid != Tpid) {
+     dsyslog("changing pids of channel %d from %d+%d:%d,%d;%d,%d:%d to %d+%d:%d,%d;%d,%d:%d", Number(), vpid, ppid, apid1, apid2, dpid1, dpid2, tpid, Vpid, Ppid, Apid1, Apid2, Dpid1, Dpid2, Tpid);
+     vpid = Vpid;
+     ppid = Ppid;
+     apid1 = Apid1;
+     if (Apid2)//XXX should we actually react here?
+     apid2 = Apid2;
+     dpid1 = Dpid1;
+     dpid2 = Dpid2;
+     tpid = Tpid;
+     modification |= CHANNELMOD_PIDS;
+     Channels.SetModified();
+     }
+}
+
+void cChannel::SetCaIds(const int *CaIds)
+{
+  if (caids[0] && caids[0] <= 0x00FF)
+     return; // special values will not be overwritten
+  bool modified = false;
+  for (int i = 0; i < MAXCAIDS; i++) {
+      if (caids[i] != CaIds[i]) {
+         modified = true;
+         break;
+         }
+      if (!caids[i] || !CaIds[i])
+         break;
+      }
+  if (modified) {
+     char OldCaIdsBuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
+     char NewCaIdsBuf[MAXCAIDS * 5 + 10];
+     char *qo = OldCaIdsBuf;
+     char *qn = NewCaIdsBuf;
+     int i;
+     for (i = 0; i < MAXCAIDS; i++) {
+         if (i == 0 || caids[i])
+            qo += snprintf(qo, sizeof(OldCaIdsBuf), "%s%X", i > 0 ? "," : "", caids[i]);
+         if (!caids[i])
+            break;
+         }
+     for (i = 0; i < MAXCAIDS; i++) {
+         if (i == 0 || CaIds[i])
+            qn += snprintf(qn, sizeof(NewCaIdsBuf), "%s%X", i > 0 ? "," : "", CaIds[i]);
+         caids[i] = CaIds[i];
+         if (!CaIds[i])
+            break;
+         }
+     caids[i] = 0;
+     *qo = *qn = 0;
+     dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
+     modification |= CHANNELMOD_CA;
+     Channels.SetModified();
+     }
+}
+
+void cChannel::SetCaDescriptors(int Level)
+{
+  if (Level > 0) {
+     modification |= CHANNELMOD_CA;
+     Channels.SetModified();
+     if (Level > 1)
+        dsyslog("changing ca descriptors of channel %d", Number());
+     }
 }
 
 static int PrintParameter(char *p, char Name, int Value)
@@ -290,10 +414,10 @@ const char *cChannel::ToText(cChannel *Channel)
      char vpidbuf[32];
      char *q = vpidbuf;
      q += snprintf(q, sizeof(vpidbuf), "%d", Channel->vpid);
-     if (Channel->ppid)
+     if (Channel->ppid && Channel->ppid != Channel->vpid)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
      *q = 0;
-     char apidbuf[32];
+     char apidbuf[MAXAPIDS * 2 * 6 + 10]; // 2: Apids and Dpids, 6: 5 digits plus delimiting ',' or ';', 10: paranoia
      q = apidbuf;
      q += snprintf(q, sizeof(apidbuf), "%d", Channel->apid1);
      if (Channel->apid2)
@@ -303,7 +427,16 @@ const char *cChannel::ToText(cChannel *Channel)
      if (Channel->dpid2)
         q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, Channel->ca, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     char caidbuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
+     q = caidbuf;
+     for (int i = 0; i < MAXCAIDS; i++) {
+         if (i == 0 || Channel->caids[i])
+            q += snprintf(q, sizeof(caidbuf), "%s%X", i > 0 ? "," : "", Channel->caids[i]);
+         if (!Channel->caids[i])
+            break;
+         }
+     *q = 0;
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -336,12 +469,16 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
      char *parambuf = NULL;
      char *vpidbuf = NULL;
      char *apidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%a[^:]:%a[^:]:%d :%d :%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpid, &ca, &sid, &nid, &tid, &rid);
+     char *caidbuf = NULL;
+     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%a[^:]:%a[^:]:%d :%a[^:]:%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpid, &caidbuf, &sid, &nid, &tid, &rid);
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
-           sid = ca;
-           ca = tpid;
+           sid = atoi(caidbuf);
+           delete caidbuf;
+           caidbuf = NULL;
+           caids[0] = tpid;
+           caids[1] = 0;
            tpid = 0;
            }
         vpid  = ppid  = 0;
@@ -350,24 +487,46 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
+
            char *p = strchr(vpidbuf, '+');
            if (p)
               *p++ = 0;
            sscanf(vpidbuf, "%d", &vpid);
            if (p)
               sscanf(p, "%d", &ppid);
+           else
+              ppid = vpid;
+
            p = strchr(apidbuf, ';');
            if (p)
               *p++ = 0;
            sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
            if (p)
               sscanf(p, "%d ,%d ", &dpid1, &dpid2);
+
+           if (caidbuf) {
+              char *p = caidbuf;
+              char *q;
+              int NumCaIds = 0;
+              while ((q = strtok(p, ",")) != NULL) {
+                    if (NumCaIds < MAXCAIDS) {
+                       caids[NumCaIds++] = strtol(q, NULL, 16) & 0xFFFF;
+                       if (NumCaIds == 1 && caids[0] <= 0x00FF)
+                          break;
+                       }
+                    else
+                       esyslog("ERROR: too many CA ids!"); // no need to set ok to 'false'
+                    p = NULL;
+                    }
+              caids[NumCaIds] = 0;
+              }
            }
         strn0cpy(name, namebuf, MaxChannelName);
         free(parambuf);
         free(sourcebuf);
         free(vpidbuf);
         free(apidbuf);
+        free(caidbuf);
         free(namebuf);
         if (!GetChannelID().Valid()) {
            esyslog("ERROR: channel data results in invalid ID!");
@@ -394,6 +553,12 @@ bool cChannel::Save(FILE *f)
 
 cChannels Channels;
 
+cChannels::cChannels(void)
+{
+  maxNumber = 0;
+  modified = false;
+}
+
 bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
 {
   if (cConfig<cChannel>::Load(FileName, AllowComments, MustExist)) {
@@ -457,10 +622,10 @@ cChannel *cChannels::GetByNumber(int Number, int SkipGap)
   return NULL;
 }
 
-cChannel *cChannels::GetByServiceID(int Source, unsigned short ServiceID)
+cChannel *cChannels::GetByServiceID(int Source, int Transponder, unsigned short ServiceID)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep() && channel->Source() == Source && channel->Sid() == ServiceID)
+      if (!channel->GroupSep() && channel->Source() == Source && ISTRANSPONDER(channel->Transponder(), Transponder) && channel->Sid() == ServiceID)
          return channel;
       }
   return NULL;
@@ -497,3 +662,31 @@ bool cChannels::SwitchTo(int Number)
   cChannel *channel = GetByNumber(Number);
   return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
 }
+
+void cChannels::SetModified(void)
+{
+  modified = true;
+}
+
+bool cChannels::Modified(void)
+{
+  bool Result = modified;
+  modified = false;
+  return Result;
+}
+
+cChannel *cChannels::NewChannel(int Source, int Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid)
+{
+  dsyslog("creating new channel '%s' on %s transponder %d with id %d-%d-%d-%d", Name, cSource::ToString(Source), Transponder, Nid, Tid, Sid, Rid);
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (!channel->GroupSep() && channel->Source() == Source && ISTRANSPONDER(channel->Transponder(), Transponder)) {
+         cChannel *NewChannel = new cChannel(channel);
+         Add(NewChannel);
+         ReNumber();
+         NewChannel->SetId(Nid, Tid, Sid, Rid, false);
+         NewChannel->SetName(Name, false);
+         return NewChannel;
+         }
+      }
+  return NULL;
+}
diff --git a/channels.conf b/channels.conf
index f0ba58759..b1ad616f1 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,162 +1,110 @@
-RTL:12188:h:S19.2E:27500:163:104:105:0:12003:0:0:0
-Sat.1:12480:v:S19.2E:27500:1791:1792:34:0:46:0:0:0
-Pro-7:12480:v:S19.2E:27500:255:256;257:32:0:898:0:0:0
-RTL2:12188:h:S19.2E:27500:166:128:68:0:12020:0:0:0
-ARD:11837:h:S19.2E:27500:101:102:104:0:28106:0:0:0
-BR3:11837:h:S19.2E:27500:201:202:204:0:28107:0:0:0
-Hessen-3:11837:h:S19.2E:27500:301:302:304:0:28108:0:0:0
-N3:12110:h:S19.2E:27500:2401:2402:2404:0:28224:0:0:0
-SR3:11837:h:S19.2E:27500:501:502:504:0:28110:0:0:0
-WDR:11837:h:S19.2E:27500:601:602:604:0:28111:0:0:0
-BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112:0:0:0
-SWR BW:11837:h:S19.2E:27500:801:802:804:0:28113:0:0:0
-Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114:0:0:0
-ZDF:11954:h:S19.2E:27500:110:120:130:0:28006:0:0:0
-3sat:11954:h:S19.2E:27500:210:220:230:0:28007:0:0:0
-KiKa:11954:h:S19.2E:27500:310:320:330:0:28008:0:0:0
-arte:11836:h:S19.2E:27500:401:402:404:0:28109:0:0:0
-ORF1:12692:h:S19.2E:22000:160:161:165:102:13001:0:0:0
-ORF2:12692:h:S19.2E:22000:500:501:505:102:13002:0:0:0
-ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011:0:0:0
-CNN:11778:v:S19.2E:27500:165:100:0:0:28522:0:0:0
-Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:0:0:0
-VOX:12188:h:S19.2E:27500:167:136:71:0:12060:0:0:0
-:#DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
-Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899:0:0:0
-Neun Live:12480:v:S19.2E:27500:767:768:35:0:897:0:0:0
-DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:0:0:0
-HOT:12480:v:S19.2E:27500:1279:1280:0:0:40:0:0:0
-Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:0:0:0
-Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004:0:0:0
-Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721:0:0:0
-Sky News:11597:v:S19.2E:22000:305:306:0:0:28707:0:0:0
-Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020:0:0:0
-BVN:12574:h:S19.2E:22000:164+131:96:0:0:5025:0:0:0
-Alice:12610:v:S19.2E:22000:162:96:0:0:12200:0:0:0
-n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:0:0:0
-Al Jazeera:11568:v:S19.2E:22000:55:56:0:0:9021:0:0:0
-Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300:0:0:0
-TW1:12692:h:S19.2E:22000:166:167:0:0:13013:0:0:0
-Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009:0:0:0
-EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201:0:0:0
-EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202:0:0:0
-EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:0:0:0
-ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016:0:0:0
-ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014:0:0:0
-MDR:12110:h:S19.2E:27500:401:402:404:0:28204:0:0:0
-RBB Brandenburg:12110:h:S19.2E:27500:501:502:504:0:28205:0:0:0
-RBB Berlin:12110:h:S19.2E:27500:601:602:604:0:28206:0:0:0
+RTL,RTL Television:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0
+SAT.1:12480:v:S19.2E:27500:1791:1792;1795:34:0:46:133:33:0
+ProSieben:12480:v:S19.2E:27500:255:256;257:32:0:898:133:33:0
+RTL2:12188:h:S19.2E:27500:166:128:68:0:12020:1:1089:0
+Das Erste:11837:h:S19.2E:27500:101:102:104:0:28106:1:1101:0
+Bayerisches FS:11837:h:S19.2E:27500:201:202:204:0:28107:1:1101:0
+hessen fernsehen:11837:h:S19.2E:27500:301:302:304:0:28108:1:1101:0
+NDR FS MV:12110:h:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0
+SR Fernsehen Suedwest:11837:h:S19.2E:27500:501:502:504:0:28110:1:1101:0
+WDR FERNSEHEN:11837:h:S19.2E:27500:601:602:604:0:28111:1:1101:0
+BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112:1:1101:0
+S�DWEST BW:11837:h:S19.2E:27500:801:802:804:0:28113:1:1101:0
+Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114:1:1101:0
+ZDF:11954:h:S19.2E:27500:110:120;125:130:0:28006:1:1079:0
+3sat:11954:h:S19.2E:27500:210:220:230:0:28007:1:1079:0
+KiKa:11954:h:S19.2E:27500:310:320:330:0:28008:1:1079:0
+arte:11836:h:S19.2E:27500:401:402,403:404:0:28109:1:1101:0
+ORF 1:12692:h:S19.2E:22000:160:161;163:165:1762,D05,1702,1801:13001:1:1117:0
+ORF 2:12692:h:S19.2E:22000:500:501;503:505:1762,D05,1702,1801:13002:1:1117:0
+ZDFinfokanal:11954:h:S19.2E:27500:610:620:130:0:28011:1:1079:0
+CNN Int.:11778:v:S19.2E:27500:165:100:47:0:28522:1:1068:0
+S RTL,Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:1:1089:0
+VOX:12188:h:S19.2E:27500:167:136:71:0:12060:1:1089:0
+KABEL1:12480:v:S19.2E:27500:511:512:33:0:899:133:33:0
+NEUN LIVE,NEUN LIVE Television:12480:v:S19.2E:27500:767:768:35:0:897:133:33:0
+DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:133:33:0
+HSEurope,Home Shopping Europe:12480:v:S19.2E:27500:1279:1280:37:0:40:133:33:0
+Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:1:1108:0
+EURONEWS:11817:v:S19.2E:27500:163:92,93:0:500,100:8004:1:1070:0
+Sky News:11597:v:S19.2E:22000:305:306:0:0:28707:1:1026:0
+Veronica/FoxKids:12574:h:S19.2E:22000:518+8190:92:38:622,602,100:5020:53:1109:0
+BVN:12574:h:S19.2E:22000:515+8190:96:36:0:5025:53:1109:0
+CNBC Europe:12610:v:S19.2E:22000:944:945:0:0:12200:1:1112:0
+n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:1:1116:0
+Al Jazeera:11568:v:S19.2E:22000:55:56:0:0:9021:1:1024:0
+TW1:12692:h:S19.2E:22000:166:167:168:0:13013:1:1117:0
+Eurosport:11954:h:S19.2E:27500:410:420:430:0:28009:1:1079:0
+EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201:1:1073:0
+EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202:1:1073:0
+EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:1:1073:0
+ZDFtheaterkanal:11954:h:S19.2E:27500:1110:1120:130:0:28016:1:1079:0
+ZDFdokukanal:11954:h:S19.2E:27500:660:670:130:0:28014:1:1079:0
+MDR FERNSEHEN:12110:h:S19.2E:27500:401:402:404:0:28204:1:1073:0
+RBB Brandenburg:12110:h:S19.2E:27500:501:502:504:0:28205:1:1073:0
+RBB Berlin:12110:h:S19.2E:27500:601:602:604:0:28206:1:1073:0
 :Premiere World
-Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8:0:0:0
-Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10:0:0:0
-Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11:0:0:0
-Premiere 3:11797:h:S19.2E:27500:2303:2304,2305:0:101:43:0:0:0
-Premiere 4:11797:h:S19.2E:27500:767:768,769:0:101:9:0:0:0
-Premiere 5:11797:h:S19.2E:27500:1279:1280,1281:0:101:29:0:0:0
-Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
-Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
-13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
-Sci-Fi:11758:h:S19.2E:27500:2047:2048:0:101:36:0:0:0
-Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
-Disney Channel:11758:h:S19.2E:27500:2559:2560:0:101:34:0:0:0
-Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
-Discovery Channel:11758:h:S19.2E:27500:1023:1024:8181:101:14:0:0:0
-Planet:12090:v:S19.2E:27500:1279:1280:0:101:13:0:0:0
-Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28:0:0:0
-Junior:11758:h:S19.2E:27500:255:256:0:101:19:0:0:0
-K-Toon:11758:h:S19.2E:27500:511:512:0:101:12:0:0:0
-Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23:0:0:0
-Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518:0:0:0
-MGM:11758:h:S19.2E:27500:767:768:2:101:515:0:0:0
-Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32:0:0:0
+START,PREMIERE START:11797:h:S19.2E:27500:255:256:32:1702,1722,1801:8:133:2:0
+PREM 1,PREMIERE 1:11797:h:S19.2E:27500:511:512,513;515:0:1702,1722,1801:10:133:2:0
+PREM 2,PREMIERE 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:1702,1722,1801:11:133:2:0
+PREM 3,PREMIERE 3:11797:h:S19.2E:27500:2303:2304,2305:0:1702,1722,1801:43:133:2:0
+PREM 4,PREMIERE 4:11797:h:S19.2E:27500:767:768,769:0:1702,1722,1801:9:133:2:0
+PREM 5,PREMIERE 5:11797:h:S19.2E:27500:1279:1280,1281:0:1702,1722,1801:29:133:2:0
+PREM 6,PREMIERE 6:11797:h:S19.2E:27500:1535:1536:0:1702,1722,1801:41:133:2:0
+PREM 7,PREMIERE 7:11797:h:S19.2E:27500:1023:1024:0:1702,1722,1801:20:133:2:0
+DISNEY,DISNEY CHANNEL:11758:h:S19.2E:27500:2559:2560:0:1702,1722,1801:34:133:17:0
 :Premiere Direkt
-Premiere Direkt Portal:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
-Premiere Direkt 1A:11719:h:S19.2E:27500:2047:2048:0:101:240:0:0:0
-Premiere Direkt 1B:11719:h:S19.2E:27500:2303:2304:0:101:241:0:0:0
-Premiere Direkt 1C:11719:h:S19.2E:27500:2559:2560:0:101:242:0:0:0
-Premiere Direkt 2A:11719:h:S19.2E:27500:2815:2816:0:101:243:0:0:0
-Premiere Direkt 2B:11719:h:S19.2E:27500:3071:3072:0:101:244:0:0:0
-Premiere Direkt 2C:12031:h:S19.2E:27500:3071:3072:0:101:208:0:0:0
-Premiere Direkt 2D:11719:h:S19.2E:27500:3327:3328:0:101:245:0:0:0
-Premiere Direkt 3A:12031:h:S19.2E:27500:3327:3328:0:101:209:0:0:0
-Premiere Direkt 3B:12031:h:S19.2E:27500:2303:2304:0:101:210:0:0:0
-Premiere Direkt 3C:11758:h:S19.2E:27500:511:512:0:101:211:0:0:0
-Premiere Direkt 3D:12070:h:S19.2E:27500:511:512:0:101:212:0:0:0
+DIREKT,PREMIERE DIREKT:12031:h:S19.2E:27500:2815:2816,2817;2819:0:0:18:133:4:0
 :PW Erotic
-Beate-Uhse.TV:12071:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
-Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:2:101:513:0:0:0
-Premiere Erotik 2:12070:h:S19.2E:27500:1535:1536:0:101:778:0:0:0
-Premiere Erotik 3:12070:h:S19.2E:27500:1791:1792:0:101:779:0:0:0
-Premiere Erotik 4:12070:h:S19.2E:27500:3583:3584:0:101:780:0:0:0
+B-UHSE,BEATE-UHSE.TV:12071:h:S19.2E:27500:1023:1024:0:1702,1722,1801:21:133:1:0
+EROTIK,PREMIERE EROTIK:12031:h:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
 :Sportsworld
-Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
-Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27:0:0:0
-:Formel 1
-:#Supersignal:12070:h:S19.2E:27500:255:256:0:101:211:0:0:0
-:#Cockpitkanal:12070:h:S19.2E:27500:511:512:0:101:212:0:0:0
-:#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213:0:0:0
-:#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214:0:0:0
-:#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215:0:0:0
-:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17:0:0:0
+SPORT 1,PREMIERE SPORT 1:11720:h:S19.2E:27500:255:256,257:0:1702,1722,1801:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:h:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0
 :Beta Digital
-N24:12480:v:S19.2E:27500:2047:2048:0:0:47:0:0:0
-CNBC:11954:h:S19.2E:27500:510:520:0:0:28010:0:0:0
-Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199:0:0:0
-:Premiere Bundesliga
-BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210:0:0:1
-BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17:0:0:1
-BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240:0:0:1
-BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241:0:0:1
-BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242:0:0:1
-BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243:0:0:1
-BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244:0:0:1
-BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245:0:0:1
-BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208:0:0:1
-BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209:0:0:1
+N24:12480:v:S19.2E:27500:2047:2048:36:0:47:133:33:0
+CNBC:11954:h:S19.2E:27500:510:520:530:0:28010:1:1079:0
+Liberty TV.com:12610:v:S19.2E:22000:941:943:0:0:12199:1:1112:0
 :-
-Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010:0:0:0
-Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011:0:0:0
-Canal J:11934:v:S19.2E:27500:167:108:0:0:8157:0:0:0
-Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365:0:0:0
-Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002:0:0:0
-Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003:0:0:0
-Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004:0:0:0
-Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001:0:0:0
-:#KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
-Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511:0:0:0
-TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631:0:0:0
-travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001:0:0:0
-TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516:0:0:0
-TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515:0:0:0
-La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501:0:0:0
-LCP:12207:v:S19.2E:27500:165:100:0:0:8506:0:0:0
-:#AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
-:#AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
-Escales:12285:v:S19.2E:27500:165:100:0:0:17025:0:0:0
-Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612:0:0:0
-:#RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
-K13:12402:v:S19.2E:27500:163:92:0:0:8704:0:0:0
-Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988:0:0:0
-Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:0:0:0
-Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986:0:0:0
-Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985:0:0:0
-Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984:0:0:0
-Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:0:0:0
-RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994:0:0:0
-VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010:0:0:0
-VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647:0:0:0
-MTV 2:12225:h:S19.2E:27500:513:661:577:0:28640:0:0:0
+ProSieben Austria:12051:v:S19.2E:27500:161:84:36:0:20002:1:1082:0
+Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:165:0:20003:1:1082:0
+Kabel 1 Austria:12051:v:S19.2E:27500:166:167:169:0:20004:1:1082:0
+ProSieben Schweiz:12051:v:S19.2E:27500:289:290:33:0:20001:1:1082:0
+FRANCE 5:12207:v:S19.2E:27500:160:80:32:0:8501:1:1090:0
+LCP:12207:v:S19.2E:27500:165:100:0:0:8506:1:1090:0
+ESCALES:12285:v:S19.2E:27500:165:100:0:500,100:17025:1:1094:0
+CANAL CLUB:12324:v:S19.2E:27500:160:80:0:0:8612:1:1096:0
+ASTRA-Mosaic:12552:v:S19.2E:22000:175:176:0:0:3988:1:1108:0
+ASTRA-Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:1:1108:0
+ASTRA-Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986:1:1108:0
+ASTRA-Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985:1:1108:0
+ASTRA-Mosaic 5:12552:v:S19.2E:22000:163:164:0:0:3984:1:1108:0
+Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:1:1108:0
+RTL TELE Letzebuerg:12552:v:S19.2E:22000:168:144,146:74:0:3994:1:1108:0
+Yorin:12574:h:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0
+MTV2 Pop Channel:12225:h:S19.2E:27500:513:661:577:0:28640:1:1091:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
 Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0
-ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012:0:0:0
-VIVA:12670:v:S19.2E:22000:309:310:311:0:12732:0:0:0
-VIVA PLUS:12552:v:S19.2E:22000:171:172:179:0:12120:0:0:0
-MTV Central:11739:v:S19.2E:27500:3031:3032:3034:0:28653:0:0:0
-QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
-Tele 5:12480:v:S19.2E:27500:1535:1536:0:0:51:0:0:0
+VIVA:12670:v:S19.2E:22000:309:310:311:0:12732:1:1116:0
+VIVA PLUS:12552:v:S19.2E:22000:171:172:173:0:12120:1:1108:0
+MTV Central:11739:v:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
+QVC GERMANY:12552:v:S19.2E:22000:165:166:167:0:12100:1:1108:0
+TELE 5:12480:v:S19.2E:27500:1535:1536:38:0:51:133:33:0
 :@201 Sky
-Sky One:106:h:S28.2E:0:160:80:0:301:222:0:0:0
-Sky One Mix:107:h:S28.2E:0:160:80:0:301:919:0:0:0
-itv2:226:h:S28.2E:0:160:80:0:301:451:0:0:0
-sci-fi:130:h:S28.2E:0:160:80:0:301:161:0:0:0
-Paramount Comedy:127:h:S28.2E:0:160:80:0:301:185:0:0:0
+Sky One:106:h:S28.2E:0:160:80:0:30:222:0:0:0
+Sky One Mix:107:h:S28.2E:0:160:80:0:30:919:0:0:0
+itv2:226:h:S28.2E:0:160:80:0:30:451:0:0:0
+sci-fi:130:h:S28.2E:0:160:80:0:30:161:0:0:0
+Paramount Comedy:127:h:S28.2E:0:160:80:0:30:185:0:0:0
+:@900 Some 'seed' channels
+Chelsea TV:11778:v:S28.2E:27500:2308+2304:2309:0:960,961:9307:2:2004:0
+Sky One:12285:v:S28.2E:27500:2311+2304:2312,2313:2307:960,961:4703:2:2030:0
+WDR M�nster:12421:h:S19.2E:27500:101:102:104:0:28310:1:1201:0
+Going Places:10921:h:S28.2E:22000:2310+2304:2311:2312:0:5008:2:2055:0
+Animal Plnt+:12070:h:S28.2E:27500:2315+2307:2316:0:960,961:50002:2:2019:0
+S1T:11954:h:S28.2E:27500:0:0:0:0:4409:2:2030:0
+CNN:12032:v:S28.2E:27500:2309:2311:2310:0:7140:2:2018:0
+BBC PARL'MNT:12129:v:S28.2E:27500:2306:2308,2309:2307:0:7300:2:2022:0
+AL HAYAT:11200:v:S13.0E:27500:413:414:0:0:4733:318:13400:0
+EURO1080:12168:v:S19.2E:27500:308:256:0:FF:21100:1:1088:0
+:@1000 New channels
diff --git a/channels.h b/channels.h
index a6cc978cb..c3d9ad4e4 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.9 2003/10/26 13:21:59 kls Exp $
+ * $Id: channels.h 1.10 2004/01/04 12:26:37 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -12,10 +12,22 @@
 
 #include "config.h"
 #include "sources.h"
+#include "thread.h"
 #include "tools.h"
 
 #define ISTRANSPONDER(f1, f2)  (abs((f1) - (f2)) < 4) //XXX
 
+#define CHANNELMOD_NONE     0x00
+#define CHANNELMOD_ALL      0xFF
+#define CHANNELMOD_NAME     0x01
+#define CHANNELMOD_PIDS     0x02
+#define CHANNELMOD_ID       0x04
+#define CHANNELMOD_CA       0x10
+#define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA)
+
+#define MAXAPIDS  2
+#define MAXCAIDS  8
+
 struct tChannelParameterMap {
   int userValue;
   int driverValue;
@@ -46,7 +58,7 @@ struct tChannelID {
   tChannelID(void) { source = nid = tid = sid = rid = 0; }
   tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
   bool operator== (const tChannelID &arg) const;
-  bool Valid(void) { return tid && sid; } // nid and rid are optional and source may be 0
+  bool Valid(void) { return tid && sid; } // nid and rid are optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   static tChannelID FromString(const char *s);
   const char *ToString(void);
@@ -58,7 +70,7 @@ class cChannel : public cListObject {
 private:
   static char *buffer;
   static const char *ToText(cChannel *Channel);
-  enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
+  enum { MaxChannelName = 64 }; // 63 chars + terminating 0!
   int __BeginData__;
   char name[MaxChannelName];
   int frequency; // MHz
@@ -69,7 +81,7 @@ class cChannel : public cListObject {
   int apid1, apid2;
   int dpid1, dpid2;
   int tpid;
-  int ca;
+  int caids[MAXCAIDS + 1]; // list is zero-terminated
   int nid;
   int tid;
   int sid;
@@ -86,16 +98,19 @@ class cChannel : public cListObject {
   int guard;
   int hierarchy;
   int __EndData__;
+  int modification;
   const char *ParametersToString(void);
   bool StringToParameters(const char *s);
 public:
   cChannel(void);
+  cChannel(const cChannel *Channel);
   cChannel& operator= (const cChannel &Channel);
   const char *ToText(void);
   bool Parse(const char *s, bool AllowNonUniqueID = false);
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
-  int Frequency(void) const { return frequency; }
+  int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
+  int Transponder(void) const;                    ///< Returns the transponder frequency in MHz
   int Source(void) const { return source; }
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
@@ -105,8 +120,11 @@ class cChannel : public cListObject {
   int Dpid1(void) const { return dpid1; }
   int Dpid2(void) const { return dpid2; }
   int Tpid(void) const { return tpid; }
-  int Ca(void) const { return ca; }
+  int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
+  int Nid(void) const { return nid; }
+  int Tid(void) const { return tid; }
   int Sid(void) const { return sid; }
+  int Rid(void) const { return rid; }
   int Number(void) const { return number; }
   void SetNumber(int Number) { number = Number; }
   bool GroupSep(void) const { return groupSep; }
@@ -123,24 +141,38 @@ class cChannel : public cListObject {
   bool IsSat(void) const { return (source & cSource::st_Mask) == cSource::stSat; }
   bool IsTerr(void) const { return (source & cSource::st_Mask) == cSource::stTerr; }
   tChannelID GetChannelID(void) const;
+  int Modification(int Mask = CHANNELMOD_ALL);
+  void SetId(int Nid, int Tid, int Sid, int Rid = 0, bool Log = true);
+  void SetName(const char *Name, bool Log = true);
+  void SetPids(int Vpid, int Ppid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid);
+  void SetCaIds(const int *CaIds); // list must be zero-terminated
+  void SetCaDescriptors(int Level);
   };
 
-class cChannels : public cConfig<cChannel> {
-protected:
+class cChannels : public cRwLock, public cConfig<cChannel> {
+private:
   int maxNumber;
+  bool modified;
+  int beingEdited;
 public:
-  cChannels(void) { maxNumber = 0; }
+  cChannels(void);
   virtual bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
-  cChannel *GetByServiceID(int Source, unsigned short ServiceID);
+  cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID);
   cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false);
+  int BeingEdited(void) { return beingEdited; }
+  void IncBeingEdited(void) { beingEdited++; }
+  void DecBeingEdited(void) { beingEdited--; }
   bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
+  void SetModified(void);
+  bool Modified(void);
+  cChannel *NewChannel(int Source, int Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid = 0);
   };
 
 extern cChannels Channels;
diff --git a/ci.c b/ci.c
index 889c85385..760052ded 100644
--- a/ci.c
+++ b/ci.c
@@ -4,14 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.17 2003/10/26 13:04:23 kls Exp $
+ * $Id: ci.c 1.21 2004/01/02 15:07:36 kls Exp $
  */
 
-/* XXX TODO
-- update CA descriptors in case they change
-XXX*/
-
 #include "ci.h"
+#include <asm/unaligned.h>
 #include <ctype.h>
 #include <linux/dvb/ca.h>
 #include <malloc.h>
@@ -21,6 +18,7 @@ XXX*/
 #include <sys/ioctl.h>
 #include <time.h>
 #include <unistd.h>
+#include "pat.h"
 #include "tools.h"
 
 /* these might come in handy in case you want to use this code without VDR's other files:
@@ -793,10 +791,10 @@ bool cCiApplicationInformation::Process(int Length, const uint8_t *Data)
             if ((l -= 1) < 0) break;
             applicationType = *d++;
             if ((l -= 2) < 0) break;
-            applicationManufacturer = ntohs(*(uint16_t *)d);
+            applicationManufacturer = ntohs(get_unaligned((uint16_t *)d));
             d += 2;
             if ((l -= 2) < 0) break;
-            manufacturerCode = ntohs(*(uint16_t *)d);
+            manufacturerCode = ntohs(get_unaligned((uint16_t *)d));
             d += 2;
             free(menuString);
             menuString = GetString(l, &d);
@@ -1265,8 +1263,9 @@ bool cCiEnquiry::Cancel(void)
 #define CPCI_QUERY            0x03
 #define CPCI_NOT_SELECTED     0x04
 
-cCiCaPmt::cCiCaPmt(int ProgramNumber)
+cCiCaPmt::cCiCaPmt(int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds)
 {
+  caDescriptorsLength = GetCaDescriptors(Source, Transponder, ProgramNumber, CaSystemIds, sizeof(caDescriptors), caDescriptors, streamFlag);
   length = 0;
   capmt[length++] = CPLM_ONLY;
   capmt[length++] = (ProgramNumber >> 8) & 0xFF;
@@ -1275,20 +1274,31 @@ cCiCaPmt::cCiCaPmt(int ProgramNumber)
   esInfoLengthPos = length;
   capmt[length++] = 0x00; // program_info_length H (at program level)
   capmt[length++] = 0x00; // program_info_length L
+  if (!streamFlag)
+     AddCaDescriptors(caDescriptorsLength, caDescriptors);
 }
 
-void cCiCaPmt::AddPid(int Pid)
+bool cCiCaPmt::Valid(void)
 {
-  //XXX buffer overflow check???
-  capmt[length++] = 0x00; //XXX stream_type (apparently doesn't matter)
-  capmt[length++] = (Pid >> 8) & 0xFF;
-  capmt[length++] =  Pid       & 0xFF;
-  esInfoLengthPos = length;
-  capmt[length++] = 0x00; // ES_info_length H (at ES level)
-  capmt[length++] = 0x00; // ES_info_length L
+  return caDescriptorsLength > 0;
+}
+
+void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
+{
+  if (Pid) {
+     //XXX buffer overflow check???
+     capmt[length++] = StreamType;
+     capmt[length++] = (Pid >> 8) & 0xFF;
+     capmt[length++] =  Pid       & 0xFF;
+     esInfoLengthPos = length;
+     capmt[length++] = 0x00; // ES_info_length H (at ES level)
+     capmt[length++] = 0x00; // ES_info_length L
+     if (streamFlag)
+        AddCaDescriptors(caDescriptorsLength, caDescriptors);
+     }
 }
 
-void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
+void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 {
   if (esInfoLengthPos) {
      if (length + Length < int(sizeof(capmt))) {
@@ -1355,7 +1365,7 @@ cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
 
 int cCiHandler::ResourceIdToInt(const uint8_t *Data)
 {
-  return (ntohl(*(int *)Data));
+  return (ntohl(get_unaligned((int32_t *)Data)));
 }
 
 bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
@@ -1367,10 +1377,10 @@ bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
   if (Status >= 0)
      *p++ = Status;
   if (ResourceId) {
-     *(int *)p = htonl(ResourceId);
+     put_unaligned(htonl(ResourceId), (int32_t *)p);
      p += 4;
      }
-  *(short *)p = htons(SessionId);
+  put_unaligned(htons(SessionId), (uint16_t *)p);
   p += 2;
   buffer[1] = p - buffer - 2; // length
   return tc && tc->SendData(p - buffer, buffer) == OK;
@@ -1481,7 +1491,7 @@ bool cCiHandler::Process(void)
          if (Data && Length > 1) {
             switch (*Data) {
               case ST_SESSION_NUMBER:          if (Length > 4) {
-                                                  int SessionId = ntohs(*(short *)&Data[2]);
+                                                  int SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
                                                   cCiSession *Session = GetSessionBySessionId(SessionId);
                                                   if (Session)
                                                      Session->Process(Length - 4, Data + 4);
@@ -1492,7 +1502,7 @@ bool cCiHandler::Process(void)
               case ST_OPEN_SESSION_REQUEST:    OpenSession(Length, Data);
                                                break;
               case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
-                                                  CloseSession(ntohs(*(short *)&Data[2]));
+                                                  CloseSession(ntohs(get_unaligned((uint16_t *)&Data[2])));
                                                break;
               case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
               case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
@@ -1556,6 +1566,23 @@ const unsigned short *cCiHandler::GetCaSystemIds(int Slot)
   return cas ? cas->GetCaSystemIds() : NULL;
 }
 
+bool cCiHandler::ProvidesCa(const unsigned short *CaSystemIds)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+      if (cas) {
+         for (const unsigned short *ids = cas->GetCaSystemIds(); ids && *ids; ids++) {
+             for (const unsigned short *id = CaSystemIds; *id; id++) {
+                 if (*id == *ids)
+                    return true;
+                 }
+             }
+         }
+      }
+  return false;
+}
+
 bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt, int Slot)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/ci.h b/ci.h
index 6b81a18cc..71eccd8df 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.9 2003/10/26 12:22:09 kls Exp $
+ * $Id: ci.h 1.12 2003/12/31 13:49:49 kls Exp $
  */
 
 #ifndef __CI_H
@@ -66,10 +66,14 @@ class cCiCaPmt {
   int length;
   int esInfoLengthPos;
   uint8_t capmt[2048]; ///< XXX is there a specified maximum?
+  int caDescriptorsLength;
+  uint8_t caDescriptors[2048];
+  bool streamFlag;
+  void AddCaDescriptors(int Length, const uint8_t *Data);
 public:
-  cCiCaPmt(int ProgramNumber);
-  void AddPid(int Pid);
-  void AddCaDescriptor(int Length, uint8_t *Data);
+  cCiCaPmt(int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds);
+  bool Valid(void);
+  void AddPid(int Pid, uint8_t StreamType);
   };
 
 #define MAX_CI_SESSION  16 //XXX
@@ -107,6 +111,7 @@ class cCiHandler {
   cCiMenu *GetMenu(void);
   cCiEnquiry *GetEnquiry(void);
   const unsigned short *GetCaSystemIds(int Slot);
+  bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot???
   bool SetCaPmt(cCiCaPmt &CaPmt, int Slot);
   bool Reset(int Slot);
   };
diff --git a/config.h b/config.h
index cc942d2f7..08368e4cf 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.176.1.6 2003/11/14 13:29:13 kls Exp $
+ * $Id: config.h 1.178 2003/12/27 13:57:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.2.6"
-#define VDRVERSNUM   10206  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.0"
+#define VDRVERSNUM   10300  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -87,7 +87,7 @@ template<class T> class cConfig : public cList<T> {
   cConfig(void) { fileName = NULL; }
   virtual ~cConfig() { free(fileName); }
   const char *FileName(void) { return fileName; }
-  bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
+  virtual bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
   {
     Clear();
     if (FileName) {
diff --git a/cutter.c b/cutter.c
index dfad77e4c..25169a2a7 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.5 2003/08/17 09:04:04 kls Exp $
+ * $Id: cutter.c 1.6 2003/10/18 11:29:37 kls Exp $
  */
 
 #include "cutter.h"
@@ -32,6 +32,7 @@ class cCuttingThread : public cThread {
   };
 
 cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
+:cThread("video cutting")
 {
   error = NULL;
   active = false;
@@ -62,8 +63,6 @@ cCuttingThread::~cCuttingThread()
 
 void cCuttingThread::Action(void)
 {
-  dsyslog("video cutting thread started (pid=%d)", getpid());
-
   cMark *Mark = fromMarks.First();
   if (Mark) {
      fromFile = fromFileName->Open();
@@ -175,7 +174,6 @@ void cCuttingThread::Action(void)
      }
   else
      esyslog("no editing marks found!");
-  dsyslog("end video cutting thread");
 }
 
 // --- cCutter ---------------------------------------------------------------
diff --git a/device.c b/device.c
index 9a698eadd..8f73a142a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.47.1.1 2003/11/07 13:16:12 kls Exp $
+ * $Id: device.c 1.51 2004/01/04 11:30:05 kls Exp $
  */
 
 #include "device.h"
@@ -13,7 +13,6 @@
 #include <sys/mman.h>
 #include "audio.h"
 #include "channels.h"
-#include "eit.h"
 #include "i18n.h"
 #include "player.h"
 #include "receiver.h"
@@ -36,6 +35,8 @@ cDevice::cDevice(void)
 {
   cardIndex = nextCardIndex++;
 
+  SetDescription("receiver on device %d", CardIndex() + 1);
+
   SetVideoFormat(Setup.VideoFormat);
 
   active = false;
@@ -43,6 +44,11 @@ cDevice::cDevice(void)
   mute = false;
   volume = Setup.CurrentVolume;
 
+  sectionHandler = NULL;
+  eitFilter = NULL;
+  patFilter = NULL;
+  sdtFilter = NULL;
+
   ciHandler = NULL;
   player = NULL;
 
@@ -63,6 +69,10 @@ cDevice::~cDevice()
   for (int i = 0; i < MAXRECEIVERS; i++)
       Detach(receiver[i]);
   delete ciHandler;
+  delete sdtFilter;
+  delete patFilter;
+  delete eitFilter;
+  delete sectionHandler;
 }
 
 void cDevice::SetUseDevice(int n)
@@ -149,7 +159,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
       if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
          if (device[i]->Receiving() && !ndr)
             pri = 0; // receiving and allows additional receivers
-         else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel->Ca()) < d->ProvidesCa(Channel->Ca()))
+         else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
             pri = 1; // free and fewer Ca's
          else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice())
             pri = 2; // free and not the primary device
@@ -157,7 +167,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
             pri = 3; // free
          else if (d && device[i]->Priority() < d->Priority())
             pri = 4; // receiving but priority is lower
-         else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel->Ca()) < d->ProvidesCa(Channel->Ca()))
+         else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
             pri = 5; // receiving with same priority but fewer Ca's
          else
             pri = 6; // all others
@@ -311,11 +321,42 @@ bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return false;
 }
 
+void cDevice::StartSectionHandler(void)
+{
+  if (!sectionHandler) {
+     sectionHandler = new cSectionHandler(this);
+     AttachFilter(eitFilter = new cEitFilter);
+     AttachFilter(patFilter = new cPatFilter);
+     AttachFilter(sdtFilter = new cSdtFilter(patFilter));
+     sectionHandler->SetStatus(true);
+     }
+}
+
+int cDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
+{
+  return -1;
+}
+
+void cDevice::AttachFilter(cFilter *Filter)
+{
+  sectionHandler->Attach(Filter);
+}
+
+void cDevice::Detach(cFilter *Filter)
+{
+  sectionHandler->Detach(Filter);
+}
+
 bool cDevice::ProvidesSource(int Source) const
 {
   return false;
 }
 
+bool cDevice::ProvidesTransponder(const cChannel *Channel) const
+{
+  return false;
+}
+
 bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   return false;
@@ -398,16 +439,28 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         Result = scrNotAvailable;
      }
   else {
+     Channels.Lock(false);
      cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
-     if (!SetChannelDevice(Channel, LiveView))
+     // Stop section handling:
+     if (sectionHandler) {
+        sectionHandler->SetStatus(false);
+        sectionHandler->SetSource(0, 0);
+        }
+     if (SetChannelDevice(Channel, LiveView)) {
+        // Start section handling:
+        if (sectionHandler) {
+           sectionHandler->SetSource(Channel->Source(), Channel->Transponder());
+           sectionHandler->SetStatus(true);
+           }
+        }
+     else
         Result = scrFailed;
+     Channels.Unlock();
      }
 
   if (Result == scrOk) {
-     if (LiveView && IsPrimaryDevice()) {
-        cSIProcessor::SetCurrentChannelID(Channel->GetChannelID());
+     if (LiveView && IsPrimaryDevice())
         currentChannel = Channel->Number();
-        }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
 
@@ -419,6 +472,11 @@ bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   return false;
 }
 
+bool cDevice::HasLock(void)
+{
+  return true;
+}
+
 bool cDevice::HasProgramme(void)
 {
   return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
@@ -608,6 +666,7 @@ int cDevice::Priority(void) const
 int cDevice::CanShift(int Ca, int Priority, int UsedCards) const
 {
   return -1;//XXX+ too complex with multiple recordings per device
+  /*XXX
   // Test whether a receiver on this device can be shifted to another one
   // in order to perform a new receiving with the given Ca and Priority on this device:
   int ShiftLevel = -1; // default means this device can't be shifted
@@ -638,25 +697,17 @@ int cDevice::CanShift(int Ca, int Priority, int UsedCards) const
   else if (Priority > this->Priority())
      ShiftLevel = 0; // no shifting necessary, this device can do the job
   return ShiftLevel;
+  XXX*/
 }
 
-int cDevice::ProvidesCa(int Ca) const
+int cDevice::ProvidesCa(const cChannel *Channel) const
 {
+  int Ca = Channel->Ca();
   if (Ca == CardIndex() + 1)
      return 1; // exactly _this_ card was requested
   if (Ca && Ca <= MAXDEVICES)
      return 0; // a specific card was requested, but not _this_ one
-  int result = Ca ? 0 : 1; // by default every card can provide FTA
-  int others = Ca ? 1 : 0;
-  for (int i = 0; i < MAXCACAPS; i++) {
-      if (caCaps[i]) {
-         if (caCaps[i] == Ca)
-            result = 1;
-         else
-            others++;
-         }
-      }
-  return result ? result + others : 0;
+  return !Ca; // by default every card can provide FTA
 }
 
 bool cDevice::Receiving(bool CheckAny) const
@@ -670,8 +721,6 @@ bool cDevice::Receiving(bool CheckAny) const
 
 void cDevice::Action(void)
 {
-  dsyslog("receiver thread started on device %d (pid=%d)", CardIndex() + 1, getpid());
-
   if (OpenDvr()) {
      active = true;
      for (; active;) {
@@ -694,8 +743,6 @@ void cDevice::Action(void)
          }
      CloseDvr();
      }
-
-  dsyslog("receiver thread ended on device %d (pid=%d)", CardIndex() + 1, getpid());
 }
 
 bool cDevice::OpenDvr(void)
diff --git a/device.h b/device.h
index d73864f2b..196ccfe91 100644
--- a/device.h
+++ b/device.h
@@ -4,13 +4,18 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.35 2003/11/07 13:15:45 kls Exp $
+ * $Id: device.h 1.37 2004/01/04 11:52:00 kls Exp $
  */
 
 #ifndef __DEVICE_H
 #define __DEVICE_H
 
 #include "ci.h"
+#include "eit.h"
+#include "filter.h"
+#include "pat.h"
+#include "sdt.h"
+#include "sections.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -127,7 +132,8 @@ class cDevice : public cThread {
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
          ///< Returns the number of this device (0 ... MAXDEVICES - 1).
-  int ProvidesCa(int Ca) const;
+  virtual int ProvidesCa(const cChannel *Channel) const;//XXX PLUGINS.html!!!
+         //XXX describe changed functionality!!!
          ///< Checks whether this device provides the given value in its
          ///< caCaps. Returns 0 if the value is not provided, 1 if only this
          ///< value is provided, and > 1 if this and other values are provided.
@@ -157,6 +163,8 @@ class cDevice : public cThread {
 public:
   virtual bool ProvidesSource(int Source) const;
          ///< Returns true if this device can provide the given source.
+  virtual bool ProvidesTransponder(const cChannel *Channel) const;
+         ///< XXX -> PLUGINS.html!
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
          ///< Returns true if this device can provide the given channel.
          ///< In case the device has cReceivers attached to it or it is the primary
@@ -188,6 +196,10 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+  virtual bool HasLock(void);//XXX PLUGINS.html
+         ///< Returns true if the device has a lock on the requested transponder.
+         ///< Default is true, a specific device implementation may return false
+         ///< to indicate that it is not ready yet.
   virtual bool HasProgramme(void);
          ///< Returns true if the device is currently showing any programme to
          ///< the user, either through replaying or live.
@@ -222,6 +234,27 @@ class cDevice : public cThread {
          ///< Type indicates some special types of PIDs, which the device may
          ///< need to set in a specific way.
 
+// Section filter facilities
+
+private:
+  cSectionHandler *sectionHandler;
+  cEitFilter *eitFilter;
+  cPatFilter *patFilter;
+  cSdtFilter *sdtFilter;
+protected:
+  void StartSectionHandler(void);
+       ///< A derived device that provides section data must call
+       ///< this function to actually set up the section handler.
+public:
+  virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+       ///< Opens a file handle for the given filter data.
+       ///< A derived device that provides section data must
+       ///< implement this function.
+  void AttachFilter(cFilter *Filter);
+       ///< Attaches the given filter to this device.
+  void Detach(cFilter *Filter);
+       ///< Detaches the given filter from this device.
+
 // Common Interface facilities:
 
 protected:
diff --git a/dvbdevice.c b/dvbdevice.c
index 5ae8c6fd9..e42ff4bf4 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.67.1.4 2003/11/09 11:08:22 kls Exp $
+ * $Id: dvbdevice.c 1.76 2004/01/04 14:48:37 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -86,7 +86,7 @@ class cDvbTuner : public cThread {
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune, bool UseCa);
-  bool Locked(void) { return tunerStatus == tsLocked; }
+  bool Locked(void) { return tunerStatus >= tsLocked; }
   };
 
 cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler)
@@ -100,6 +100,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   useCa = false;
   tunerStatus = tsIdle;
   startTime = time(NULL);
+  SetDescription("tuner on device %d", cardIndex + 1);
   Start();
 }
 
@@ -113,19 +114,18 @@ cDvbTuner::~cDvbTuner()
 
 bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 {
-  return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Frequency() == Channel->Frequency();
+  return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Transponder() == Channel->Transponder();
 }
 
 void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
 {
   cMutexLock MutexLock(&mutex);
-  bool CaChange = !(Channel->GetChannelID() == channel.GetChannelID());
   if (Tune)
      tunerStatus = tsSet;
-  else if (tunerStatus == tsCam && CaChange)
+  else if (tunerStatus == tsCam)
      tunerStatus = tsTuned;
   useCa = UseCa;
-  if (Channel->Ca() && CaChange)
+  if (Channel->Ca() && tunerStatus != tsCam)
      startTime = time(NULL);
   channel = *Channel;
   newSet.Broadcast();
@@ -247,7 +247,6 @@ bool cDvbTuner::SetFrontend(void)
 
 void cDvbTuner::Action(void)
 {
-  dsyslog("tuner thread started on device %d (pid=%d)", cardIndex + 1, getpid());
   active = true;
   while (active) {
         cMutexLock MutexLock(&mutex);
@@ -268,41 +267,31 @@ void cDvbTuner::Action(void)
                  continue;
                  }
               }
-           if (tunerStatus >= tsLocked) {
-              if (ciHandler) {
-                 if (ciHandler->Process() && useCa) {
-                    if (tunerStatus != tsCam) {//XXX TODO update in case the CA descriptors have changed
-                       for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) {
-                           uchar buffer[2048];
-                           int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), ciHandler->GetCaSystemIds(Slot), sizeof(buffer), buffer);
-                           if (length > 0) {
-                              cCiCaPmt CaPmt(channel.Sid());
-                              CaPmt.AddCaDescriptor(length, buffer);
-                              if (channel.Vpid())
-                                 CaPmt.AddPid(channel.Vpid());
-                              if (channel.Apid1())
-                                 CaPmt.AddPid(channel.Apid1());
-                              if (channel.Apid2())
-                                 CaPmt.AddPid(channel.Apid2());
-                              if (channel.Dpid1())
-                                 CaPmt.AddPid(channel.Dpid1());
-                              if (ciHandler->SetCaPmt(CaPmt, Slot)) {
-                                 tunerStatus = tsCam;
-                                 startTime = 0;
-                                 }
-                              }
+           }
+        if (ciHandler) {
+           if (ciHandler->Process() && useCa) {
+              if (tunerStatus == tsLocked) {
+                 for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) {
+                     cCiCaPmt CaPmt(channel.Source(), channel.Frequency(), channel.Sid(), ciHandler->GetCaSystemIds(Slot));
+                     if (CaPmt.Valid()) {
+                        CaPmt.AddPid(channel.Vpid(), 2);
+                        CaPmt.AddPid(channel.Apid1(), 4);
+                        CaPmt.AddPid(channel.Apid2(), 4);
+                        CaPmt.AddPid(channel.Dpid1(), 0);
+                        if (ciHandler->SetCaPmt(CaPmt, Slot)) {
+                           tunerStatus = tsCam;
+                           startTime = 0;
                            }
-                       }
-                    }
-                 else
-                    tunerStatus = tsLocked;
+                        }
+                     }
                  }
               }
+           else if (tunerStatus > tsLocked)
+              tunerStatus = tsLocked;
            }
         // in the beginning we loop more often to let the CAM connection start up fast
         newSet.TimedWait(mutex, (ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
         }
-  dsyslog("tuner thread ended on device %d (pid=%d)", cardIndex + 1, getpid());
 }
 
 // --- cDvbDevice ------------------------------------------------------------
@@ -313,13 +302,12 @@ cDvbDevice::cDvbDevice(int n)
 {
   dvbTuner = NULL;
   frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
-  siProcessor = NULL;
   spuDecoder = NULL;
   playMode = pmNone;
 
   // Devices that are present on all card types:
 
-  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK); 
+  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK);
 
   // Devices that are only present on cards with decoders:
 
@@ -369,7 +357,6 @@ cDvbDevice::cDvbDevice(int n)
 
   if (fd_frontend >= 0) {
      dvb_frontend_info feinfo;
-     siProcessor = new cSIProcessor(DvbName(DEV_DVB_DEMUX, n));
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
         frontendType = feinfo.type;
         ciHandler = cCiHandler::CreateCiHandler(DvbName(DEV_DVB_CA, n));
@@ -382,12 +369,13 @@ cDvbDevice::cDvbDevice(int n)
      esyslog("ERROR: can't open DVB device %d", n);
 
   aPid1 = aPid2 = 0;
+
+  StartSectionHandler();
 }
 
 cDvbDevice::~cDvbDevice()
 {
   delete spuDecoder;
-  delete siProcessor;
   delete dvbTuner;
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
@@ -445,6 +433,17 @@ bool cDvbDevice::HasDecoder(void) const
   return fd_video >= 0 && fd_audio >= 0;
 }
 
+int cDvbDevice::ProvidesCa(const cChannel *Channel) const
+{
+  if (Channel->Ca() >= 0x0100 && ciHandler) {
+     unsigned short ids[MAXCAIDS + 1];
+     for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0!
+         ids[i] = Channel->Ca(i);
+     return ciHandler->ProvidesCa(ids);
+     }
+  return cDevice::ProvidesCa(Channel);
+}
+
 cOsdBase *cDvbDevice::NewOsd(int x, int y)
 {
   return new cDvbOsd(x, y);
@@ -618,6 +617,30 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
+int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
+{
+  const char *FileName = DvbName(DEV_DVB_DEMUX, CardIndex());
+  int f = open(FileName, O_RDWR | O_NONBLOCK);
+  if (f >= 0) {
+     dmx_sct_filter_params sctFilterParams;
+     memset(&sctFilterParams, 0, sizeof(sctFilterParams));
+     sctFilterParams.pid = Pid;
+     sctFilterParams.timeout = 0;
+     sctFilterParams.flags = DMX_IMMEDIATE_START;
+     sctFilterParams.filter.filter[0] = Tid;
+     sctFilterParams.filter.mask[0] = Mask;
+     if (ioctl(f, DMX_SET_FILTER, &sctFilterParams) >= 0)
+        return f;
+     else {
+        esyslog("ERROR: can't set filter (pid=%d, tid=%02X, mask=%02X)", Pid, Tid, Mask);
+        close(f);
+        }
+     }
+  else
+     esyslog("ERROR: can't open filter handle on '%s'", FileName);
+  return -1;
+}
+
 void cDvbDevice::TurnOffLiveMode(void)
 {
   // Avoid noise while switching:
@@ -646,13 +669,18 @@ bool cDvbDevice::ProvidesSource(int Source) const
   return true;
 }
 
+bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
+{
+  return ProvidesSource(Channel->Source()) && ((Channel->Source() & cSource::st_Mask) != cSource::stSat || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()));
+}
+
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
+  if ((Channel->Vpid() || Channel->Apid1()) && ProvidesSource(Channel->Source()) && ProvidesCa(Channel)) {
      result = hasPriority;
      if (Priority >= 0 && Receiving()) {
         if (dvbTuner->IsTunedTo(Channel)) {
@@ -716,27 +744,19 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      TurnOnLivePIDs = false;
      }
 
-  // Stop SI filtering:
-
-  if (siProcessor) {
-     siProcessor->SetCurrentTransponder(0, 0);
-     siProcessor->SetStatus(false);
-     }
-
   // Turn off live PIDs if necessary:
 
   if (TurnOffLivePIDs)
      TurnOffLiveMode();
 
-  dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution
+  dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
 
   // PID settings:
 
   if (TurnOnLivePIDs) {
      aPid1 = Channel->Apid1();
      aPid2 = Channel->Apid2();
-     int pPid = Channel->Ppid() ? Channel->Ppid() : Channel->Vpid();
-     if (!(AddPid(pPid, ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
@@ -747,16 +767,14 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   else if (StartTransferMode)
      cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));
 
-  // Start SI filtering:
-
-  if (siProcessor) {
-     siProcessor->SetCurrentTransponder(Channel->Source(), Channel->Frequency());
-     siProcessor->SetStatus(true);
-     }
-
   return true;
 }
 
+bool cDvbDevice::HasLock(void)
+{
+  return dvbTuner->Locked();
+}
+
 void cDvbDevice::SetVolumeDevice(int Volume)
 {
   if (HasDecoder()) {
@@ -830,16 +848,12 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
          CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
          CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-         if (siProcessor)
-            siProcessor->SetStatus(true);
          break;
     case pmAudioVideo:
          if (playMode == pmNone)
             TurnOffLiveMode();
          // continue with next...
     case pmAudioOnlyBlack:
-         if (siProcessor)
-            siProcessor->SetStatus(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
          CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
@@ -848,8 +862,6 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_video, VIDEO_PLAY));
          break;
     case pmAudioOnly:
-         if (siProcessor)
-            siProcessor->SetStatus(false);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_STOP, true));
          CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
@@ -859,8 +871,6 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
          break;
     case pmExtern_THIS_SHOULD_BE_AVOIDED:
-         if (siProcessor)
-            siProcessor->SetStatus(false);
          close(fd_video);
          close(fd_audio);
          fd_video = fd_audio = -1;
diff --git a/dvbdevice.h b/dvbdevice.h
index 56f1c2b15..f64e6ddae 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.24 2003/11/07 13:17:13 kls Exp $
+ * $Id: dvbdevice.h 1.26 2004/01/03 10:21:50 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -14,7 +14,6 @@
 #include <linux/dvb/version.h>
 #include "device.h"
 #include "dvbspu.h"
-#include "eit.h"
 
 #if DVB_API_VERSION != 3
 #error VDR requires Linux DVB driver API version 3!
@@ -45,6 +44,7 @@ class cDvbDevice : public cDevice {
 public:
   cDvbDevice(int n);
   virtual ~cDvbDevice();
+  virtual int ProvidesCa(const cChannel *Channel) const;
   virtual bool HasDecoder(void) const;
 
 // OSD facilities
@@ -62,15 +62,23 @@ class cDvbDevice : public cDevice {
   void TurnOffLiveMode(void);
 public:
   virtual bool ProvidesSource(int Source) const;
+  virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+public:
+  virtual bool HasLock(void);
 
 // PID handle facilities
 
 protected:
   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 
+// Section filter facilities
+
+protected:
+  virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+
 // Image Grab facilities
 
 private:
@@ -95,11 +103,6 @@ class cDvbDevice : public cDevice {
   virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
   virtual void SetAudioTrackDevice(int Index);
 
-// EIT facilities
-
-private:
-  cSIProcessor *siProcessor;
-
 // Player facilities
 
 protected:
diff --git a/dvbplayer.c b/dvbplayer.c
index 6b7fe076d..c3bd542d4 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.22 2003/05/24 09:04:26 kls Exp $
+ * $Id: dvbplayer.c 1.23 2003/10/18 11:31:54 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -93,6 +93,7 @@ class cNonBlockingFileReader : public cThread {
   };
 
 cNonBlockingFileReader::cNonBlockingFileReader(void)
+:cThread("non blocking file reader")
 {
   f = -1;
   buffer = NULL;
@@ -146,7 +147,6 @@ int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
 
 void cNonBlockingFileReader::Action(void)
 {
-  dsyslog("non blocking file reader thread started (pid=%d)", getpid());
   active = true;
   while (active) {
         cMutexLock MutexLock(&mutex);
@@ -165,7 +165,6 @@ void cNonBlockingFileReader::Action(void)
            }
         newSet.TimedWait(mutex, 1000);
         }
-  dsyslog("non blocking file reader thread ended (pid=%d)", getpid());
 }
 
 // --- cDvbPlayer ------------------------------------------------------------
@@ -235,6 +234,7 @@ class cDvbPlayer : public cPlayer, cThread {
 int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
 
 cDvbPlayer::cDvbPlayer(const char *FileName)
+:cThread("dvbplayer")
 {
   nonBlockingFileReader = NULL;
   ringBuffer = NULL;
@@ -405,8 +405,6 @@ void cDvbPlayer::Activate(bool On)
 
 void cDvbPlayer::Action(void)
 {
-  dsyslog("dvbplayer thread started (pid=%d)", getpid());
-
   uchar *b = NULL;
   uchar *p = NULL;
   int pc = 0;
@@ -550,8 +548,6 @@ void cDvbPlayer::Action(void)
   cNonBlockingFileReader *nbfr = nonBlockingFileReader;
   nonBlockingFileReader = NULL;
   delete nbfr;
-
-  dsyslog("dvbplayer thread ended (pid=%d)", getpid());
 }
 
 void cDvbPlayer::Pause(void)
diff --git a/eit.c b/eit.c
index 8e0ade7c3..45a4d8001 100644
--- a/eit.c
+++ b/eit.c
@@ -1,1483 +1,201 @@
-/***************************************************************************
-                          eit.c  -  description
-                             -------------------
-    begin                : Fri Aug 25 2000
-    copyright            : (C) 2000 by Robert Schneider
-    email                : Robert.Schneider@web.de
-
-    2001-08-15: Adapted to 'libdtv' by Rolf Hakenes <hakenes@hippomi.de>
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- * $Id: eit.c 1.80 2003/10/12 11:05:42 kls Exp $
- ***************************************************************************/
+/*
+ * eit.c: EIT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version (as used in VDR before 1.3.0) written by
+ * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
+ * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
+ *
+ * $Id: eit.c 1.84 2004/01/02 22:27:29 kls Exp $
+ */
 
 #include "eit.h"
-#include <ctype.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <linux/dvb/dmx.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-#include "channels.h"
-#include "config.h"
-#include "libdtv/libdtv.h"
-#include "videodir.h"
-
-// --- cMJD ------------------------------------------------------------------
-
-class cMJD {
-public:
-   cMJD();
-   cMJD(u_char date_hi, u_char date_lo);
-   cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese);
-   ~cMJD();
-  /**  */
-  void ConvertToTime();
-  /**  */
-  bool SetSystemTime();
-  /**  */
-  time_t GetTime_t();
-protected: // Protected attributes
-  /**  */
-  time_t mjdtime;
-protected: // Protected attributes
-  /**  */
-  u_char time_second;
-protected: // Protected attributes
-  /**  */
-  u_char time_minute;
-protected: // Protected attributes
-  /**  */
-  u_char time_hour;
-protected: // Protected attributes
-  /**  */
-  u_short mjd;
-};
-
-cMJD::cMJD()
-{
-}
-
-cMJD::cMJD(u_char date_hi, u_char date_lo)
-{
-   mjd = date_hi << 8 | date_lo;
-   time_hour = time_minute = time_second = 0;
-   ConvertToTime();
-}
-
-cMJD::cMJD(u_char date_hi, u_char date_lo, u_char timehr, u_char timemi, u_char timese)
-{
-   mjd = date_hi << 8 | date_lo;
-   time_hour = timehr;
-   time_minute = timemi;
-   time_second = timese;
-   ConvertToTime();
-}
-
-cMJD::~cMJD()
-{
-}
-
-/**  */
-void cMJD::ConvertToTime()
-{
-   struct tm t;
-
-   t.tm_sec = time_second;
-   t.tm_min = time_minute;
-   t.tm_hour = time_hour;
-   int k;
+#include "epg.h"
+#include "libsi/section.h"
+#include "libsi/descriptor.h"
 
-   t.tm_year = (int) ((mjd - 15078.2) / 365.25);
-   t.tm_mon = (int) ((mjd - 14956.1 - (int)(t.tm_year * 365.25)) / 30.6001);
-   t.tm_mday = (int) (mjd - 14956 - (int)(t.tm_year * 365.25) - (int)(t.tm_mon * 30.6001));
-   k = (t.tm_mon == 14 || t.tm_mon == 15) ? 1 : 0;
-   t.tm_year = t.tm_year + k;
-   t.tm_mon = t.tm_mon - 1 - k * 12;
-   t.tm_mon--;
-
-   t.tm_isdst = -1;
-   t.tm_gmtoff = 0;
-
-   mjdtime = timegm(&t);
-
-   //isyslog("Time parsed = %s\n", ctime(&mjdtime));
-}
-
-/**  */
-bool cMJD::SetSystemTime()
-{
-   struct tm *ptm;
-   time_t loctim;
-
-   struct tm tm_r;
-   ptm = localtime_r(&mjdtime, &tm_r);
-   loctim = time(NULL);
-
-   if (abs(mjdtime - loctim) > 2)
-   {
-      isyslog("System Time = %s (%ld)\n", ctime(&loctim), loctim);
-      isyslog("Local Time  = %s (%ld)\n", ctime(&mjdtime), mjdtime);
-      if (stime(&mjdtime) < 0)
-         esyslog("ERROR while setting system time: %m");
-      return true;
-   }
-
-   return false;
-}
-/**  */
-time_t cMJD::GetTime_t()
-{
-   return mjdtime;
-}
-
-// --- cTDT ------------------------------------------------------------------
+// --- cEIT ------------------------------------------------------------------
 
-class cTDT {
+class cEIT : public SI::EIT {
 public:
-   cTDT(tdt_t *ptdt);
-   ~cTDT();
-  /**  */
-  bool SetSystemTime();
-protected: // Protected attributes
-  /**  */
-  tdt_t tdt;
-  /**  */
-  cMJD mjd; // kls 2001-03-02: made this a member instead of a pointer (it wasn't deleted in the destructor!)
-};
-
-#define BCD2DEC(b) (((b >> 4) & 0x0F) * 10 + (b & 0x0F))
-
-cTDT::cTDT(tdt_t *ptdt)
-:tdt(*ptdt)
-,mjd(tdt.utc_mjd_hi, tdt.utc_mjd_lo, BCD2DEC(tdt.utc_time_h), BCD2DEC(tdt.utc_time_m), BCD2DEC(tdt.utc_time_s))
-{
-}
-
-cTDT::~cTDT()
-{
-}
-/**  */
-bool cTDT::SetSystemTime()
-{
-   return mjd.SetSystemTime();
-}
-
-// --- cEventInfo ------------------------------------------------------------
-
-cEventInfo::cEventInfo(tChannelID channelid, unsigned short eventid)
-{
-   pTitle = NULL;
-   pSubtitle = NULL;
-   pExtendedDescription = NULL;
-   bIsPresent = bIsFollowing = false;
-   lDuration = 0;
-   tTime = 0;
-   uTableID = 0;
-   uEventID = eventid;
-   channelID = channelid;
-   nChannelNumber = 0;
-}
-
-cEventInfo::~cEventInfo()
-{
-   free(pTitle);
-   free(pSubtitle);
-   free(pExtendedDescription);
-}
-
-/**  */
-const char * cEventInfo::GetTitle() const
-{
-   return pTitle;
-}
-/**  */
-const char * cEventInfo::GetSubtitle() const
-{
-   return pSubtitle;
-}
-/**  */
-const char * cEventInfo::GetExtendedDescription() const
-{
-   return pExtendedDescription;
-}
-/**  */
-bool cEventInfo::IsPresent() const
-{
-   return bIsPresent;
-}
-/**  */
-void cEventInfo::SetPresent(bool pres)
-{
-   bIsPresent = pres;
-}
-/**  */
-bool cEventInfo::IsFollowing() const
-{
-   return bIsFollowing;
-}
-
-void cEventInfo::SetTableID(unsigned char tableid)
-{
-   uTableID = tableid;
-}
-
-/**  */
-void cEventInfo::SetFollowing(bool foll)
-{
-   bIsFollowing = foll;
-}
-/**  */
-const char * cEventInfo::GetDate() const
-{
-   static char szDate[25];
-
-   struct tm tm_r;
-   strftime(szDate, sizeof(szDate), "%d.%m.%Y", localtime_r(&tTime, &tm_r));
-
-   return szDate;
-}
-
-const unsigned char cEventInfo::GetTableID(void) const
-{
-   return uTableID;
-}
-
-/**  */
-const char * cEventInfo::GetTimeString() const
-{
-   static char szTime[25];
-
-   struct tm tm_r;
-   strftime(szTime, sizeof(szTime), "%R", localtime_r(&tTime, &tm_r));
-
-   return szTime;
-}
-/**  */
-const char * cEventInfo::GetEndTimeString() const
-{
-   static char szEndTime[25];
-   time_t tEndTime = tTime + lDuration;
-
-   struct tm tm_r;
-   strftime(szEndTime, sizeof(szEndTime), "%R", localtime_r(&tEndTime, &tm_r));
+  cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data);
+  };
 
-   return szEndTime;
-}
-/**  */
-time_t cEventInfo::GetTime() const
-{
-   return tTime;
-}
-/**  */
-long cEventInfo::GetDuration() const
-{
-   return lDuration;
-}
-/**  */
-unsigned short cEventInfo::GetEventID() const
-{
-   return uEventID;
-}
-/**  */
-void cEventInfo::SetTitle(const char *string)
-{
-   pTitle = strcpyrealloc(pTitle, string);
-}
-/**  */
-void cEventInfo::SetSubtitle(const char *string)
-{
-   pSubtitle = strcpyrealloc(pSubtitle, string);
-}
-/**  */
-void cEventInfo::SetExtendedDescription(const char *string)
-{
-   pExtendedDescription = strcpyrealloc(pExtendedDescription, string);
-}
-/**  */
-void cEventInfo::SetTime(time_t t)
-{
-   tTime = t;
-}
-/**  */
-void cEventInfo::SetDuration(long l)
-{
-   lDuration = l;
-}
-/**  */
-void cEventInfo::SetEventID(unsigned short evid)
+cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
+:SI::EIT(Data, false)
 {
-   uEventID = evid;
-}
-/**  */
-void cEventInfo::SetChannelID(tChannelID channelid)
-{
-   channelID = channelid;
-}
+  if (!CheckCRCAndParse())
+     return;
 
-/**  */
-tChannelID cEventInfo::GetChannelID() const
-{
-   return channelID;
-}
+  tChannelID channelID(Source, getOriginalNetworkId(), getTransportStreamId(), getServiceId());
+  cChannel *channel = Channels.GetByChannelID(channelID, true);
+  if (!channel)
+     return; // only collect data for known channels
 
-/**  */
-void cEventInfo::Dump(FILE *f, const char *Prefix) const
-{
-   if (tTime + lDuration >= time(NULL)) {
-      fprintf(f, "%sE %u %ld %ld %X\n", Prefix, uEventID, tTime, lDuration, uTableID);
-      if (!isempty(pTitle))
-         fprintf(f, "%sT %s\n", Prefix, pTitle);
-      if (!isempty(pSubtitle))
-         fprintf(f, "%sS %s\n", Prefix, pSubtitle);
-      if (!isempty(pExtendedDescription))
-         fprintf(f, "%sD %s\n", Prefix, pExtendedDescription);
-      fprintf(f, "%se\n", Prefix);
-      }
-}
+  cEvent *rEvent = NULL;
 
-bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
-{
-  if (Schedule) {
-     cEventInfo *pEvent = NULL;
-     char *s;
-     while ((s = readline(f)) != NULL) {
-           char *t = skipspace(s + 1);
-           switch (*s) {
-             case 'E': if (!pEvent) {
-                          unsigned int uEventID;
-                          time_t tTime;
-                          long lDuration;
-                          unsigned int uTableID = 0;
-                          int n = sscanf(t, "%u %ld %ld %X", &uEventID, &tTime, &lDuration, &uTableID);
-                          if (n == 3 || n == 4) {
-                             pEvent = (cEventInfo *)Schedule->GetEvent(uEventID, tTime);
-                             if (!pEvent)
-                                pEvent = Schedule->AddEvent(new cEventInfo(Schedule->GetChannelID(), uEventID));
-                             if (pEvent) {
-                                pEvent->SetTableID(uTableID);
-                                pEvent->SetTime(tTime);
-                                pEvent->SetDuration(lDuration);
-                                }
-                             }
-                          }
-                       break;
-             case 'T': if (pEvent)
-                          pEvent->SetTitle(t);
-                       break;
-             case 'S': if (pEvent)
-                          pEvent->SetSubtitle(t);
-                       break;
-             case 'D': if (pEvent)
-                          pEvent->SetExtendedDescription(t);
-                       break;
-             case 'e': pEvent = NULL;
-                       break;
-             case 'c': // to keep things simple we react on 'c' here
-                       return true;
-             default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
-                       return false;
-             }
-           }
-     esyslog("ERROR: unexpected end of file while reading EPG data");
+  cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channelID);
+  if (!pSchedule) {
+     pSchedule = new cSchedule(channelID);
+     Schedules->Add(pSchedule);
      }
-  return false;
-}
-
-#define MAXEPGBUGFIXSTATS 7
-#define MAXEPGBUGFIXCHANS 100
-struct tEpgBugFixStats {
-  int hits;
-  int n;
-  tChannelID channelIDs[MAXEPGBUGFIXCHANS];
-  tEpgBugFixStats(void) { hits = n = 0; }
-  };
 
-tEpgBugFixStats EpgBugFixStats[MAXEPGBUGFIXSTATS];
-
-static void EpgBugFixStat(int Number, tChannelID ChannelID)
-{
-  if (0 <= Number && Number < MAXEPGBUGFIXSTATS) {
-     tEpgBugFixStats *p = &EpgBugFixStats[Number];
-     p->hits++;
-     int i = 0;
-     for (; i < p->n; i++) {
-         if (p->channelIDs[i] == ChannelID)
-            break;
+  SI::EIT::Event SiEitEvent;
+  for (SI::Loop::Iterator it; eventLoop.hasNext(it); ) {
+      SiEitEvent = eventLoop.getNext(it);
+
+      cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
+      if (!pEvent) {
+         // If we don't have that event ID yet, we create a new one.
+         // Otherwise we copy the information into the existing event anyway, because the data might have changed.
+         pEvent = pSchedule->AddEvent(new cEvent(channelID, SiEitEvent.getEventId()));
+         if (!pEvent)
+            continue;
+         pEvent->SetTableID(Tid);
          }
-     if (i == p->n && p->n < MAXEPGBUGFIXCHANS)
-        p->channelIDs[p->n++] = ChannelID;
-     }
-}
-
-static void ReportEpgBugFixStats(bool Reset = false)
-{
-  if (Setup.EPGBugfixLevel > 0) {
-     bool GotHits = false;
-     char buffer[1024];
-     for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) {
-         const char *delim = "\t";
-         tEpgBugFixStats *p = &EpgBugFixStats[i];
-         if (p->hits) {
-            bool PrintedStats = false;
-            char *q = buffer;
-            *buffer = 0;
-            for (int c = 0; c < p->n; c++) {
-                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c], true);
-                if (channel) {
-                   if (!GotHits) {
-                      dsyslog("=====================");
-                      dsyslog("EPG bugfix statistics");
-                      dsyslog("=====================");
-                      dsyslog("IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
-                      dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEventInfo::FixEpgBugs()");
-                      dsyslog("IN VDR/eit.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
-                      dsyslog("=====================");
-                      dsyslog("Fix\tHits\tChannels");
-                      GotHits = true;
-                      }
-                   if (!PrintedStats) {
-                      q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
-                      PrintedStats = true;
-                      }
-                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
-                   delim = ", ";
-                   }
-                }
-            if (*buffer)
-               dsyslog("%s", buffer);
-            }
-         if (Reset)
-            p->hits = p->n = 0;
+      else {
+         // We have found an existing event, either through its event ID or its start time.
+         // If the existing event has a zero table ID it was defined externally and shall
+         // not be overwritten.
+         if (pEvent->TableID() == 0x00)
+            continue;
+         // If the new event comes from a table that belongs to an "other TS" and the existing
+         // one comes from an "actual TS" table, let's skip it.
+         #define ISACTUALTS(tid) (tid == 0x4E || (tid & 0x50) == 0x50)
+         if (!ISACTUALTS(Tid) && ISACTUALTS(pEvent->TableID()))
+            continue;
+         // If the new event comes from a "schedule" table and the existing one comes from
+         // a "present/following" table, let's skip it (the p/f table usually contains more
+         // information, like e.g. a description).
+         if ((Tid & 0x50) == 0x50 && pEvent->TableID() == 0x4E || (Tid & 0x60) == 0x60 && pEvent->TableID() == 0x4F)
+            continue;
+         // If both events come from the same "schedule" table and the new event's table id is larger than the
+         // existing one's, let's skip it (higher tids mean "farther in the future" and usually have less information).
+         if (((Tid & 0x50) == 0x50 || (Tid & 0x60) == 0x60) && (pEvent->TableID() & 0xF0) == (Tid & 0xF0) && (Tid > pEvent->TableID()))
+            continue;
+         // If the new event comes from the same table and has the same version number
+         // as the existing one, let's skip it to avoid unnecessary work.
+         // Unfortunately some stations (like, e.g. "Premiere") broadcast their EPG data on several transponders (like
+         // the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on
+         // each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned
+         // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
+         if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
+            continue;
          }
-     if (GotHits)
-        dsyslog("=====================");
-     }
-}
-
-void cEventInfo::FixEpgBugs(void)
-{
-  // VDR can't usefully handle newline characters in the EPG data, so let's
-  // always convert them to blanks (independent of the setting of EPGBugfixLevel):
-  strreplace(pTitle, '\n', ' ');
-  strreplace(pSubtitle, '\n', ' ');
-  strreplace(pExtendedDescription, '\n', ' ');
-
-  if (Setup.EPGBugfixLevel == 0)
-     return;
-
-  // Some TV stations apparently have their own idea about how to fill in the
-  // EPG data. Let's fix their bugs as good as we can:
-  if (pTitle) {
-
-     // VOX puts too much information into the Subtitle and leaves the Extended
-     // Description empty:
-     //
-     // Title
-     // (NAT, Year Min')[ ["Subtitle". ]Extended Description]
-     //
-     if (pSubtitle && !pExtendedDescription) {
-        if (*pSubtitle == '(') {
-           char *e = strchr(pSubtitle + 1, ')');
-           if (e) {
-              if (*(e + 1)) {
-                 if (*++e == ' ')
-                    if (*(e + 1) == '"')
-                       e++;
+      pEvent->SetVersion(getVersionNumber());
+      pEvent->SetTableID(Tid);
+      pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
+
+      SI::Descriptor *d;
+      SI::ExtendedEventDescriptors exGroup;
+      char text[256];
+      for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
+          switch (d->getDescriptorTag()) {
+            case SI::ExtendedEventDescriptorTag:
+                 exGroup.Add((SI::ExtendedEventDescriptor *)d);
+                 d = NULL; //so that it is not deleted
+                 break;
+            case SI::ShortEventDescriptorTag: {
+                 SI::ShortEventDescriptor *sed = (SI::ShortEventDescriptor *)d;
+                 pEvent->SetTitle(sed->name.getText(text));
+                 pEvent->SetShortText(sed->text.getText(text));
                  }
-              else
-                 e = NULL;
-              char *s = e ? strdup(e) : NULL;
-              free(pSubtitle);
-              pSubtitle = s;
-              EpgBugFixStat(0, GetChannelID());
-              // now the fixes #1 and #2 below will handle the rest
-              }
-           }
-        }
-
-     // VOX and VIVA put the Subtitle in quotes and use either the Subtitle
-     // or the Extended Description field, depending on how long the string is:
-     //
-     // Title
-     // "Subtitle". Extended Description
-     //
-     if ((pSubtitle == NULL) != (pExtendedDescription == NULL)) {
-        char *p = pSubtitle ? pSubtitle : pExtendedDescription;
-        if (*p == '"') {
-           const char *delim = "\".";
-           char *e = strstr(p + 1, delim);
-           if (e) {
-              *e = 0;
-              char *s = strdup(p + 1);
-              char *d = strdup(e + strlen(delim));
-              free(pSubtitle);
-              free(pExtendedDescription);
-              pSubtitle = s;
-              pExtendedDescription = d;
-              EpgBugFixStat(1, GetChannelID());
-              }
-           }
-        }
-
-     // VOX and VIVA put the Extended Description into the Subtitle (preceeded
-     // by a blank) if there is no actual Subtitle and the Extended Description
-     // is short enough:
-     //
-     // Title
-     //  Extended Description
-     //
-     if (pSubtitle && !pExtendedDescription) {
-        if (*pSubtitle == ' ') {
-           memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle));
-           pExtendedDescription = pSubtitle;
-           pSubtitle = NULL;
-           EpgBugFixStat(2, GetChannelID());
-           }
-        }
-
-     // Pro7 sometimes repeats the Title in the Subtitle:
-     //
-     // Title
-     // Title
-     //
-     if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
-        free(pSubtitle);
-        pSubtitle = NULL;
-        EpgBugFixStat(3, GetChannelID());
-        }
-
-     // ZDF.info puts the Subtitle between double quotes, which is nothing
-     // but annoying (some even put a '.' after the closing '"'):
-     //
-     // Title
-     // "Subtitle"[.]
-     //
-     if (pSubtitle && *pSubtitle == '"') {
-        int l = strlen(pSubtitle);
-        if (l > 2 && (pSubtitle[l - 1] == '"' || (pSubtitle[l - 1] == '.' && pSubtitle[l - 2] == '"'))) {
-           memmove(pSubtitle, pSubtitle + 1, l);
-           char *p = strrchr(pSubtitle, '"');
-           if (p)
-              *p = 0;
-           EpgBugFixStat(4, GetChannelID());
-           }
-        }
-
-     if (Setup.EPGBugfixLevel <= 1)
-        return;
-
-     // Some channels apparently try to do some formatting in the texts,
-     // which is a bad idea because they have no way of knowing the width
-     // of the window that will actually display the text.
-     // Remove excess whitespace:
-     pTitle = compactspace(pTitle);
-     pSubtitle = compactspace(pSubtitle);
-     pExtendedDescription = compactspace(pExtendedDescription);
-     // Remove superfluous hyphens:
-     if (pExtendedDescription) {
-        char *p = pExtendedDescription;
-        while (*p && *(p + 1) && *(p + 2)) {
-              if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
-                 if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
-                    memmove(p, p + 2, strlen(p + 2) + 1);
-                    EpgBugFixStat(5, GetChannelID());
-                    }
+                 break;
+            case SI::ContentDescriptorTag:
+                 break;
+            case SI::ParentalRatingDescriptorTag:
+                 break;
+            case SI::TimeShiftedEventDescriptorTag: {
+                 SI::TimeShiftedEventDescriptor *tsed = (SI::TimeShiftedEventDescriptor *)d;
+                 cSchedule *rSchedule = (cSchedule *)Schedules->GetSchedule(tChannelID(Source, 0, 0, tsed->getReferenceServiceId()));
+                 if (!rSchedule)
+                    break;
+                 rEvent = (cEvent *)rSchedule->GetEvent(tsed->getReferenceEventId());
+                 if (!rEvent)
+                    break;
+                 pEvent->SetTitle(rEvent->Title());
+                 pEvent->SetShortText(rEvent->ShortText());
+                 pEvent->SetDescription(rEvent->Description());
                  }
-              p++;
-              }
-        }
-
-#define MAX_USEFUL_SUBTITLE_LENGTH 40
-     // Some channels put a whole lot of information in the Subtitle and leave
-     // the Extended Description totally empty. So if the Subtitle length exceeds
-     // MAX_USEFUL_SUBTITLE_LENGTH, let's put this into the Extended Description
-     // instead:
-     if (!isempty(pSubtitle) && isempty(pExtendedDescription)) {
-        if (strlen(pSubtitle) > MAX_USEFUL_SUBTITLE_LENGTH) {
-           free(pExtendedDescription);
-           pExtendedDescription = pSubtitle;
-           pSubtitle = NULL;
-           EpgBugFixStat(6, GetChannelID());
-           }
-        }
-
-     // Some channels use the ` ("backtick") character, where a ' (single quote)
-     // would be normally used. Actually, "backticks" in normal text don't make
-     // much sense, so let's replace them:
-     strreplace(pTitle, '`', '\'');
-     strreplace(pSubtitle, '`', '\'');
-     strreplace(pExtendedDescription, '`', '\'');
-     }
-}
-
-// --- cSchedule -------------------------------------------------------------
-
-cSchedule::cSchedule(tChannelID channelid)
-{
-   pPresent = pFollowing = NULL;
-   channelID = channelid;
-}
-
-
-cSchedule::~cSchedule()
-{
-}
-
-cEventInfo *cSchedule::AddEvent(cEventInfo *EventInfo)
-{
-  Events.Add(EventInfo);
-  return EventInfo;
-}
-
-const cEventInfo *cSchedule::GetPresentEvent(void) const
-{
-  return GetEventAround(time(NULL));
-}
+                 break;
+            default: ;
+            }
+          delete d;
+          }
 
-const cEventInfo *cSchedule::GetFollowingEvent(void) const
-{
-  const cEventInfo *pe = NULL;
-  time_t now = time(NULL);
-  time_t delta = INT_MAX;
-  for (cEventInfo *p = Events.First(); p; p = Events.Next(p)) {
-      time_t dt = p->GetTime() - now;
-      if (dt > 0 && dt < delta) {
-         delta = dt;
-         pe = p;
+      if (!rEvent) {
+         char buffer[exGroup.getMaximumTextLength()];
+         pEvent->SetDescription(exGroup.getText(buffer));
          }
-      }
-  return pe;
-}
-
-void cSchedule::SetChannelID(tChannelID channelid)
-{
-   channelID = channelid;
-}
-/**  */
-tChannelID cSchedule::GetChannelID() const
-{
-   return channelID;
-}
-/**  */
-const cEventInfo * cSchedule::GetEvent(unsigned short uEventID, time_t tTime) const
-{
-   // Returns either the event info with the given uEventID or, if that one can't
-   // be found, the one with the given tTime (or NULL if neither can be found)
-   cEventInfo *pe = Events.First();
-   cEventInfo *pt = NULL;
-   while (pe != NULL)
-   {
-      if (pe->GetEventID() == uEventID)
-         return pe;
-      if (tTime > 0 && pe->GetTime() == tTime) // 'tTime < 0' is apparently used with NVOD channels
-         pt = pe;
-
-      pe = Events.Next(pe);
-   }
 
-   return pt;
-}
+      pEvent->SetStartTime(SiEitEvent.getStartTime());
+      pEvent->SetDuration(SiEitEvent.getDuration());
+      pEvent->FixEpgBugs();
 
-const cEventInfo *cSchedule::GetEventAround(time_t Time) const
-{
-  const cEventInfo *pe = NULL;
-  time_t delta = INT_MAX;
-  for (cEventInfo *p = Events.First(); p; p = Events.Next(p)) {
-      time_t dt = Time - p->GetTime();
-      if (dt >= 0 && dt < delta && p->GetTime() + p->GetDuration() >= Time) {
-         delta = dt;
-         pe = p;
+      if (isPresentFollowing()) {
+         if (SiEitEvent.getRunningStatus() == SI::RunningStatusPausing || SiEitEvent.getRunningStatus() == SI::RunningStatusRunning)
+            pSchedule->SetPresentEvent(pEvent);
+         else if (SiEitEvent.getRunningStatus() == SI::RunningStatusStartsInAFewSeconds)
+            pSchedule->SetFollowingEvent(pEvent);
          }
       }
-  return pe;
-}
-
-bool cSchedule::SetPresentEvent(cEventInfo *pEvent)
-{
-   if (pPresent != NULL)
-      pPresent->SetPresent(false);
-   pPresent = pEvent;
-   pPresent->SetPresent(true);
-
-   return true;
-}
-
-/**  */
-bool cSchedule::SetFollowingEvent(cEventInfo *pEvent)
-{
-   if (pFollowing != NULL)
-      pFollowing->SetFollowing(false);
-   pFollowing = pEvent;
-   pFollowing->SetFollowing(true);
-
-   return true;
-}
-
-/**  */
-void cSchedule::Cleanup()
-{
-   Cleanup(time(NULL));
-}
-
-/**  */
-void cSchedule::Cleanup(time_t tTime)
-{
-   cEventInfo *pEvent;
-   for (int a = 0; true ; a++)
-   {
-      pEvent = Events.Get(a);
-      if (pEvent == NULL)
-         break;
-      if (pEvent->GetTime() + pEvent->GetDuration() + 3600 < tTime) // adding one hour for safety
-      {
-         Events.Del(pEvent);
-         a--;
-      }
-   }
-}
-
-/**  */
-void cSchedule::Dump(FILE *f, const char *Prefix) const
-{
-   cChannel *channel = Channels.GetByChannelID(channelID, true);
-   if (channel)
-   {
-      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelID().ToString(), channel->Name());
-      for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
-         p->Dump(f, Prefix);
-      fprintf(f, "%sc\n", Prefix);
-   }
-}
-
-bool cSchedule::Read(FILE *f, cSchedules *Schedules)
-{
-  if (Schedules) {
-     char *s;
-     while ((s = readline(f)) != NULL) {
-           if (*s == 'C') {
-              s = skipspace(s + 1);
-              char *p = strchr(s, ' ');
-              if (p)
-                 *p = 0; // strips optional channel name
-              if (*s) {
-                 tChannelID channelID = tChannelID::FromString(s);
-                 if (channelID.Valid()) {
-                    cSchedule *p = (cSchedule *)Schedules->AddChannelID(channelID);
-                    if (p) {
-                       if (!cEventInfo::Read(f, p))
-                          return false;
-                       }
-                    }
-                 else {
-                    esyslog("ERROR: illegal channel ID: %s", s);
-                    return false;
-                    }
-                 }
-              }
-           else {
-              esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
-              return false;
-              }
-           }
-     return true;
-     }
-  return false;
-}
-
-// --- cSchedules ------------------------------------------------------------
-
-cSchedules::cSchedules()
-{
-   pCurrentSchedule = NULL;
-}
-
-cSchedules::~cSchedules()
-{
-}
-/**  */
-const cSchedule *cSchedules::AddChannelID(tChannelID channelid)
-{
-  channelid.ClrRid();
-  const cSchedule *p = GetSchedule(channelid);
-  if (!p) {
-     Add(new cSchedule(channelid));
-     p = GetSchedule(channelid);
-     }
-  return p;
-}
-/**  */
-const cSchedule *cSchedules::SetCurrentChannelID(tChannelID channelid)
-{
-  channelid.ClrRid();
-  pCurrentSchedule = AddChannelID(channelid);
-  if (pCurrentSchedule)
-     currentChannelID = channelid;
-  return pCurrentSchedule;
-}
-/**  */
-const cSchedule * cSchedules::GetSchedule() const
-{
-   return pCurrentSchedule;
-}
-/**  */
-const cSchedule * cSchedules::GetSchedule(tChannelID channelid) const
-{
-   cSchedule *p;
-
-   channelid.ClrRid();
-   p = First();
-   while (p != NULL)
-   {
-      if (p->GetChannelID() == channelid)
-         return p;
-      p = Next(p);
-   }
-
-   return NULL;
-}
-
-/**  */
-void cSchedules::Cleanup()
-{
-   cSchedule *p;
-
-   p = First();
-   while (p != NULL)
-   {
-      p->Cleanup(time(NULL));
-      p = Next(p);
-   }
-}
-
-/**  */
-void cSchedules::Dump(FILE *f, const char *Prefix) const
-{
-   for (cSchedule *p = First(); p; p = Next(p))
-      p->Dump(f, Prefix);
-}
-
-/**  */
-bool cSchedules::Read(FILE *f)
-{
-   cMutexLock MutexLock;
-   return cSchedule::Read(f, (cSchedules *)cSIProcessor::Schedules(MutexLock));
-}
-
-// --- cEIT ------------------------------------------------------------------
-
-class cEIT {
-private:
-   cSchedules *schedules;
-public:
-   cEIT(unsigned char *buf, int length, cSchedules *Schedules);
-   ~cEIT();
-  /**  */
-  int ProcessEIT(unsigned char *buffer, int CurrentSource);
-
-protected: // Protected methods
-  /** returns true if this EIT covers a
-present/following information, false if it's
-schedule information */
-  bool IsPresentFollowing();
-protected: // Protected attributes
-  /** Table ID of this EIT struct */
-  u_char tid;
-};
-
-cEIT::cEIT(unsigned char * buf, int length, cSchedules *Schedules)
-{
-   tid = buf[0];
-   schedules = Schedules;
-}
-
-cEIT::~cEIT()
-{
-}
-
-/**  */
-int cEIT::ProcessEIT(unsigned char *buffer, int CurrentSource)
-{
-   cEventInfo *pEvent, *rEvent = NULL;
-   cSchedule *pSchedule, *rSchedule = NULL;
-   struct LIST *VdrProgramInfos;
-   struct VdrProgramInfo *VdrProgramInfo;
-
-   if (!buffer)
-      return -1;
-
-   VdrProgramInfos = createVdrProgramInfos(buffer);
-
-   if (VdrProgramInfos) {
-      for (VdrProgramInfo = (struct VdrProgramInfo *) VdrProgramInfos->Head; VdrProgramInfo; VdrProgramInfo = (struct VdrProgramInfo *) xSucc (VdrProgramInfo)) {
-          //XXX TODO use complete channel ID
-          cChannel *channel = Channels.GetByServiceID(CurrentSource, VdrProgramInfo->ServiceID);
-          tChannelID channelID = channel ? channel->GetChannelID() : tChannelID(CurrentSource, 0, 0, VdrProgramInfo->ServiceID);
-          channelID.ClrRid();
-          //XXX
-          pSchedule = (cSchedule *)schedules->GetSchedule(channelID);
-          if (!pSchedule) {
-             schedules->Add(new cSchedule(channelID));
-             pSchedule = (cSchedule *)schedules->GetSchedule(channelID);
-             if (!pSchedule)
-                break;
-             }
-          if (VdrProgramInfo->ReferenceServiceID) {
-             rSchedule = (cSchedule *)schedules->GetSchedule(tChannelID(CurrentSource, 0, 0, VdrProgramInfo->ReferenceServiceID));
-             if (!rSchedule)
-                break;
-             rEvent = (cEventInfo *)rSchedule->GetEvent((unsigned short)VdrProgramInfo->ReferenceEventID);
-             if (!rEvent)
-                break;
-             }
-          pEvent = (cEventInfo *)pSchedule->GetEvent((unsigned short)VdrProgramInfo->EventID, VdrProgramInfo->StartTime);
-          if (!pEvent) {
-             // If we don't have that event ID yet, we create a new one.
-             // Otherwise we copy the information into the existing event anyway, because the data might have changed.
-             pEvent = pSchedule->AddEvent(new cEventInfo(channelID, VdrProgramInfo->EventID));
-             if (!pEvent)
-                break;
-             pEvent->SetTableID(tid);
-             }
-          else {
-             // We have found an existing event, either through its event ID or its start time.
-             // If the existing event has a zero table ID it was defined externally and shall
-             // not be overwritten.
-             if (pEvent->GetTableID() == 0x00)
-                continue;
-             // If the new event comes from a table that belongs to an "other TS" and the existing
-             // one comes from an "actual TS" table, lets skip it.
-             if ((tid == 0x4F || tid == 0x60 || tid == 0x61) && (pEvent->GetTableID() == 0x4E || pEvent->GetTableID() == 0x50 || pEvent->GetTableID() == 0x51))
-                continue;
-             }
-          if (rEvent) {
-             pEvent->SetTitle(rEvent->GetTitle());
-             pEvent->SetSubtitle(rEvent->GetSubtitle());
-             pEvent->SetExtendedDescription(rEvent->GetExtendedDescription());
-             }
-          else {
-             pEvent->SetTableID(tid);
-             pEvent->SetTitle(VdrProgramInfo->ShortName);
-             pEvent->SetSubtitle(VdrProgramInfo->ShortText);
-             pEvent->SetExtendedDescription(VdrProgramInfo->ExtendedName);
-             //XXX kls 2001-09-22:
-             //XXX apparently this never occurred, so I have simpified ExtendedDescription handling
-             //XXX pEvent->AddExtendedDescription(VdrProgramInfo->ExtendedText);
-             }
-          pEvent->SetTime(VdrProgramInfo->StartTime);
-          pEvent->SetDuration(VdrProgramInfo->Duration);
-          pEvent->FixEpgBugs();
-          if (IsPresentFollowing()) {
-             if ((GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_PAUSING) || (GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_RUNNING))
-                pSchedule->SetPresentEvent(pEvent);
-             else if (GetRunningStatus(VdrProgramInfo->Status) == RUNNING_STATUS_AWAITING)
-                pSchedule->SetFollowingEvent(pEvent);
-             }
-          }
-      }
-
-   xMemFreeAll(NULL);
-   return 0;
-}
-
-/** returns true if this EIT covers a
-present/following information, false if it's
-schedule information */
-bool cEIT::IsPresentFollowing()
-{
-   if (tid == 0x4e || tid == 0x4f)
-      return true;
-
-   return false;
 }
 
-// --- cCaDescriptor ---------------------------------------------------------
+// --- cTDT ------------------------------------------------------------------
 
-class cCaDescriptor : public cListObject {
-  friend class cSIProcessor;
+class cTDT : public SI::TDT {
 private:
-  int source;
-  int transponder;
-  int serviceId;
-  int caSystem;
-  unsigned int providerId;
-  int caPid;
-  int length;
-  uchar *data;
+  static cMutex mutex;
 public:
-  cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, unsigned int ProviderId, int CaPid, int Length, uchar *Data);
-  virtual ~cCaDescriptor();
-  int Length(void) const { return length; }
-  const uchar *Data(void) const { return data; }
+  cTDT(const u_char *Data);
   };
 
-cCaDescriptor::cCaDescriptor(int Source, int Transponder, int ServiceId, int CaSystem, unsigned int ProviderId, int CaPid, int Length, uchar *Data)
-{
-  source = Source;
-  transponder = Transponder;
-  serviceId = ServiceId;
-  caSystem = CaSystem;
-  providerId = ProviderId;
-  caPid = CaPid;
-  length = Length + 6;
-  data = MALLOC(uchar, length);
-  data[0] = DESCR_CA;
-  data[1] = length - 2;
-  data[2] = (caSystem >> 8) & 0xFF;
-  data[3] =  caSystem       & 0xFF;
-  data[4] = ((CaPid   >> 8) & 0x1F) | 0xE0;
-  data[5] =   CaPid         & 0xFF;
-  if (Length)
-     memcpy(&data[6], Data, Length);
-//#define DEBUG_CA_DESCRIPTORS 1
-#ifdef DEBUG_CA_DESCRIPTORS
-  char buffer[1024];
-  char *q = buffer;
-  q += sprintf(q, "CAM: %04X %5d %5d %04X %6X %04X -", source, transponder, serviceId, caSystem, providerId, caPid);
-  for (int i = 0; i < length; i++)
-      q += sprintf(q, " %02X", data[i]);
-  dsyslog(buffer);
-#endif
-}
+cMutex cTDT::mutex;
 
-cCaDescriptor::~cCaDescriptor()
+cTDT::cTDT(const u_char *Data)
+:SI::TDT(Data, false)
 {
-  free(data);
-}
-
-// --- cSIProcessor ----------------------------------------------------------
-
-#define MAX_FILTERS 20
-#define EPGDATAFILENAME "epg.data"
+  CheckParse();
 
-int cSIProcessor::numSIProcessors = 0;
-cSchedules *cSIProcessor::schedules = NULL;
-cMutex cSIProcessor::schedulesMutex;
-cList<cCaDescriptor> cSIProcessor::caDescriptors;
-cMutex cSIProcessor::caDescriptorsMutex;
-const char *cSIProcessor::epgDataFileName = EPGDATAFILENAME;
-time_t cSIProcessor::lastDump = time(NULL);
+  time_t sattim = getTime();
+  time_t loctim = time(NULL);
 
-/**  */
-cSIProcessor::cSIProcessor(const char *FileName)
-{
-   fileName = strdup(FileName);
-   masterSIProcessor = numSIProcessors == 0; // the first one becomes the 'master'
-   currentSource = 0;
-   currentTransponder = 0;
-   statusCount = 0;
-   pmtIndex = 0;
-   pmtPid = 0;
-   filters = NULL;
-   if (!numSIProcessors++) { // the first one creates them
-      schedules = new cSchedules;
-      }
-   filters = (SIP_FILTER *)calloc(MAX_FILTERS, sizeof(SIP_FILTER));
-   SetStatus(true);
-   Start();
-}
-
-cSIProcessor::~cSIProcessor()
-{
-   if (masterSIProcessor)
-      ReportEpgBugFixStats();
-   active = false;
-   Cancel(3);
-   ShutDownFilters();
-   free(filters);
-   if (!--numSIProcessors) { // the last one deletes them
-      delete schedules;
-      }
-   free(fileName);
-}
-
-const cSchedules *cSIProcessor::Schedules(cMutexLock &MutexLock)
-{
-  if (MutexLock.Lock(&schedulesMutex))
-     return schedules;
-  return NULL;
-}
-
-bool cSIProcessor::Read(FILE *f)
-{
-  bool OwnFile = f == NULL;
-  if (OwnFile) {
-     const char *FileName = GetEpgDataFileName();
-     if (access(FileName, R_OK) == 0) {
-        dsyslog("reading EPG data from %s", FileName);
-        if ((f = fopen(FileName, "r")) == NULL) {
-           LOG_ERROR;
-           return false;
-           }
-        }
-     else
-        return false;
+  if (abs(sattim - loctim) > 2) {
+     mutex.Lock();
+     isyslog("System Time = %s (%ld)\n", ctime(&loctim), loctim);
+     isyslog("Local Time  = %s (%ld)\n", ctime(&sattim), sattim);
+     if (stime(&sattim) < 0)
+        esyslog("ERROR while setting system time: %m");
+     mutex.Unlock();
      }
-  bool result = cSchedules::Read(f);
-  if (OwnFile)
-     fclose(f);
-  return result;
-}
-
-void cSIProcessor::Clear(void)
-{
-  cMutexLock MutexLock(&schedulesMutex);
-  delete schedules;
-  schedules = new cSchedules;
-}
-
-void cSIProcessor::SetEpgDataFileName(const char *FileName)
-{
-  epgDataFileName = NULL;
-  if (FileName)
-     epgDataFileName = strdup(DirectoryOk(FileName) ? AddDirectory(FileName, EPGDATAFILENAME) : FileName);
-}
-
-const char *cSIProcessor::GetEpgDataFileName(void)
-{
-  if (epgDataFileName)
-     return *epgDataFileName == '/' ? epgDataFileName : AddDirectory(VideoDirectory, epgDataFileName);
-  return NULL;
-}
-
-void cSIProcessor::SetStatus(bool On)
-{
-   LOCK_THREAD;
-   statusCount++;
-   ShutDownFilters();
-   pmtIndex = 0;
-   pmtPid = 0;
-   if (On)
-   {
-      AddFilter(0x00, 0x00);  // PAT
-      AddFilter(0x14, 0x70);  // TDT
-      AddFilter(0x12, 0x4e, 0xfe);  // event info, actual(0x4e)/other(0x4f) TS, present/following
-      AddFilter(0x12, 0x50, 0xfe);  // event info, actual TS, schedule(0x50)/schedule for another 4 days(0x51)
-      AddFilter(0x12, 0x60, 0xfe);  // event info, other  TS, schedule(0x60)/schedule for another 4 days(0x61)
-   }
-}
-
-#define PMT_SCAN_TIMEOUT  10 // seconds
-
-/** use the vbi device to parse all relevant SI
-information and let the classes corresponding
-to the tables write their information to the disk */
-void cSIProcessor::Action()
-{
-   dsyslog("EIT processing thread started (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
-
-   time_t lastCleanup = time(NULL);
-   time_t lastPmtScan = time(NULL);
-
-   int oldStatusCount = 0;
-   active = true;
-
-   while(active)
-   {
-      if (masterSIProcessor)
-      {
-         time_t now = time(NULL);
-         struct tm tm_r;
-         struct tm *ptm = localtime_r(&now, &tm_r);
-         if (now - lastCleanup > 3600 && ptm->tm_hour == 5)
-         {
-            cMutexLock MutexLock(&schedulesMutex);
-            isyslog("cleaning up schedules data");
-            schedules->Cleanup();
-            lastCleanup = now;
-            ReportEpgBugFixStats(true);
-         }
-         if (epgDataFileName && now - lastDump > 600)
-         {
-            cMutexLock MutexLock(&schedulesMutex);
-            cSafeFile f(GetEpgDataFileName());
-            if (f.Open()) {
-               schedules->Dump(f);
-               f.Close();
-               }
-            else
-               LOG_ERROR;
-            lastDump = now;
-         }
-      }
-
-      // set up pfd structures for all active filter
-      Lock();
-      pollfd pfd[MAX_FILTERS];
-      int NumUsedFilters = 0;
-      for (int a = 0; a < MAX_FILTERS ; a++)
-      {
-         if (filters[a].inuse)
-         {
-            pfd[NumUsedFilters].fd = filters[a].handle;
-            pfd[NumUsedFilters].events = POLLIN;
-            NumUsedFilters++;
-         }
-      }
-      oldStatusCount = statusCount;
-      Unlock();
-
-      // wait until data becomes ready from the bitfilter
-      if (poll(pfd, NumUsedFilters, 1000) != 0)
-      {
-         for (int aa = 0; aa < NumUsedFilters; aa++)
-         {
-            if (pfd[aa].revents & POLLIN)
-            {
-               int a;
-               for (a = 0; a < MAX_FILTERS; a++) {
-                   if (pfd[aa].fd == filters[a].handle)
-                      break;
-                   }
-               if (a >= MAX_FILTERS || !filters[a].inuse) // filter no longer available
-                  continue;
-               // read section
-               unsigned char buf[4096]; // max. allowed size for any EIT section
-               int r = safe_read(filters[a].handle, buf, sizeof(buf));
-               if (r > 3) // minimum number of bytes necessary to get section length
-               {
-                  int seclen = (((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF)) + 3;
-                  int pid = filters[a].pid;
-                  if (seclen == r)
-                  {
-                     //dsyslog("Received pid 0x%04X with table ID 0x%02X and length of %4d\n", pid, buf[0], seclen);
-                     cMutexLock MutexLock(&schedulesMutex); // since the xMem... stuff is not thread safe, we need to use a "global" mutex
-                     LOCK_THREAD;
-                     if (statusCount != oldStatusCount)
-                        break;
-                     switch (pid)
-                     {
-                        case 0x00:
-                           if (buf[0] == 0x00)
-                           {
-                              if (pmtPid && time(NULL) - lastPmtScan > PMT_SCAN_TIMEOUT) {
-                                 DelFilter(pmtPid, 0x02);
-                                 pmtPid = 0;
-                                 pmtIndex++;
-                                 lastPmtScan = time(NULL);
-                                 }
-                              if (!pmtPid) {
-                                 struct LIST *pat = siParsePAT(buf);
-                                 if (pat) {
-                                    int Index = 0;
-                                    for (struct Program *prg = (struct Program *)pat->Head; prg; prg = (struct Program *)xSucc(prg)) {
-                                        if (prg->ProgramID) {
-                                           if (Index++ == pmtIndex) {
-                                              pmtPid = prg->NetworkPID;
-                                              AddFilter(pmtPid, 0x02);
-                                              break;
-                                              }
-                                           }
-                                        }
-                                    if (!pmtPid)
-                                       pmtIndex = 0;
-                                    }
-                                 xMemFreeAll(NULL);
-                                 }
-                           }
-                           break;
-                        case 0x14:
-                           if (buf[0] == 0x70)
-                           {
-                              if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(currentTransponder, Setup.TimeTransponder))
-                              {
-                                 cTDT ctdt((tdt_t *)buf);
-                                 ctdt.SetSystemTime();
-                              }
-                           }
-                           break;
-
-                        case 0x12:
-                           if (buf[0] != 0x72)
-                           {
-                              cEIT ceit(buf, seclen, schedules);
-                              ceit.ProcessEIT(buf, currentSource);
-                           }
-                           /*else
-                              dsyslog("Received stuffing section in EIT\n");
-                           */
-                           break;
-
-                        default: {
-                           if (pid == pmtPid && buf[0] == 0x02 && currentSource && currentTransponder) {
-                              struct Pid *pi = siParsePMT(buf);
-                              if (pi) {
-                                 struct Descriptor *d;
-                                 for (d = (struct Descriptor *)pi->Descriptors->Head; d; d = (struct Descriptor *)xSucc(d))
-                                     NewCaDescriptor(d, pi->ProgramID);
-                                 // Also scan the PidInfo list for descriptors - some broadcasts send them only here.
-                                 for (struct PidInfo *p = (struct PidInfo *)pi->InfoList->Head; p; p = (struct PidInfo *)xSucc(p)) {
-                                     for (d = (struct Descriptor *)p->Descriptors->Head; d; d = (struct Descriptor *)xSucc(d))
-                                         NewCaDescriptor(d, pi->ProgramID);
-                                     }
-                                 }
-                              xMemFreeAll(NULL);
-                              lastPmtScan = 0; // this triggers the next scan
-                              }
-                           }
-                           break;
-                     }
-                  }
-                  /*
-                  else
-                     dsyslog("read incomplete section - seclen = %d, r = %d", seclen, r);
-                  */
-               }
-            }
-         }
-      }
-   }
-
-   dsyslog("EIT processing thread ended (pid=%d)%s", getpid(), masterSIProcessor ? " - master" : "");
 }
 
-/** Add a filter with packet identifier pid and
-table identifer tid */
-bool cSIProcessor::AddFilter(unsigned short pid, u_char tid, u_char mask)
-{
-   dmx_sct_filter_params sctFilterParams;
-   memset(&sctFilterParams, 0, sizeof(sctFilterParams));
-   sctFilterParams.pid = pid;
-   sctFilterParams.timeout = 0;
-   sctFilterParams.flags = DMX_IMMEDIATE_START;
-   sctFilterParams.filter.filter[0] = tid;
-   sctFilterParams.filter.mask[0] = mask;
+// --- cEitFilter ------------------------------------------------------------
 
-   for (int a = 0; a < MAX_FILTERS; a++)
-   {
-      if (!filters[a].inuse)
-      {
-         filters[a].pid = pid;
-         filters[a].tid = tid;
-         if ((filters[a].handle = open(fileName, O_RDWR | O_NONBLOCK)) >= 0)
-         {
-            if (ioctl(filters[a].handle, DMX_SET_FILTER, &sctFilterParams) >= 0)
-               filters[a].inuse = true;
-            else
-            {
-               esyslog("ERROR: can't set filter (pid=%d, tid=%02X)", pid, tid);
-               close(filters[a].handle);
-               return false;
-            }
-            // dsyslog("Registered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
-         }
-         else
-         {
-            esyslog("ERROR: can't open filter handle");
-            return false;
-         }
-         return true;
-      }
-   }
-   esyslog("ERROR: too many filters");
-
-   return false;
-}
-
-bool cSIProcessor::DelFilter(unsigned short pid, u_char tid)
+cEitFilter::cEitFilter(void)
 {
-   for (int a = 0; a < MAX_FILTERS; a++)
-   {
-      if (filters[a].inuse && filters[a].pid == pid && filters[a].tid == tid)
-      {
-         close(filters[a].handle);
-         // dsyslog("Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
-         filters[a].inuse = false;
-         return true;
-      }
-   }
-   return false;
+  Set(0x12, 0x4E, 0xFE);  // event info, actual(0x4E)/other(0x4F) TS, present/following
+  Set(0x12, 0x50, 0xF0);  // event info, actual TS, schedule(0x50)/schedule for future days(0x5X)
+  Set(0x12, 0x60, 0xF0);  // event info, other  TS, schedule(0x60)/schedule for future days(0x6X)
+  Set(0x14, 0x70);        // TDT
 }
 
-/**  */
-bool cSIProcessor::ShutDownFilters(void)
+void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
-   for (int a = 0; a < MAX_FILTERS; a++)
-   {
-      if (filters[a].inuse)
-      {
-         close(filters[a].handle);
-         // dsyslog("Deregistered filter handle %04x, pid = %02d, tid = %02d", filters[a].handle, filters[a].pid, filters[a].tid);
-         filters[a].inuse = false;
-      }
-   }
-
-   return true; // there's no real 'boolean' to return here...
-}
-
-/** */
-void cSIProcessor::SetCurrentTransponder(int CurrentSource, int CurrentTransponder)
-{
-  currentSource = CurrentSource;
-  currentTransponder = CurrentTransponder;
-}
-
-/** */
-bool cSIProcessor::SetCurrentChannelID(tChannelID channelid)
-{
-  cMutexLock MutexLock(&schedulesMutex);
-  return schedules ? schedules->SetCurrentChannelID(channelid) : false;
-}
-
-void cSIProcessor::TriggerDump(void)
-{
-  cMutexLock MutexLock(&schedulesMutex);
-  lastDump = 0;
-}
-
-void cSIProcessor::NewCaDescriptor(struct Descriptor *d, int ServiceId)
-{
-  if (DescriptorTag(d) == DESCR_CA) {
-     struct CaDescriptor *cd = (struct CaDescriptor *)d;
-     cMutexLock MutexLock(&caDescriptorsMutex);
-
-     for (cCaDescriptor *ca = caDescriptors.First(); ca; ca = caDescriptors.Next(ca)) {
-         if (ca->source == currentSource && ca->transponder == currentTransponder && ca->serviceId == ServiceId && ca->caSystem == cd->CA_type && ca->providerId == cd->ProviderID && ca->caPid == cd->CA_PID)
-            return;
+  switch (Pid) {
+    case 0x12: {
+         cSchedulesLock SchedulesLock(true, 10);
+         cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
+         if (Schedules)
+            cEIT EIT(Schedules, Source(), Tid, Data);
          }
-     caDescriptors.Add(new cCaDescriptor(currentSource, currentTransponder, ServiceId, cd->CA_type, cd->ProviderID, cd->CA_PID, cd->DataLength, cd->Data));
-     //XXX update???
-     }
-}
-
-int cSIProcessor::GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data)
-{
-  if (!CaSystemIds || !*CaSystemIds)
-     return 0;
-  if (BufSize > 0 && Data) {
-     cMutexLock MutexLock(&caDescriptorsMutex);
-     int length = 0;
-     for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
-         if (d->source == Source && d->transponder == Transponder && d->serviceId == ServiceId) {
-            const unsigned short *caids = CaSystemIds;
-            do {
-               if (d->caSystem == *caids) {
-                  if (length + d->Length() <= BufSize) {
-                     memcpy(Data + length, d->Data(), d->Length());
-                     length += d->Length();
-                     }
-                  else
-                     return -1;
-                  }
-               } while (*++caids);
-            }
+         break;
+    case 0x14: {
+         if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
+            cTDT TDT(Data);
          }
-     return length;
-     }
-  return -1;
+         break;
+    }
 }
diff --git a/eit.h b/eit.h
index 96bf1ff5c..c57dd519b 100644
--- a/eit.h
+++ b/eit.h
@@ -1,186 +1,22 @@
-/***************************************************************************
-                          eit.h  -  description
-                             -------------------
-    begin                : Fri Aug 25 2000
-    copyright            : (C) 2000 by Robert Schneider
-    email                : Robert.Schneider@web.de
-
-    2001-08-15: Adapted to 'libdtv' by Rolf Hakenes <hakenes@hippomi.de>
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- * $Id: eit.h 1.29 2003/05/17 09:15:56 kls Exp $
- ***************************************************************************/
+/*
+ * eit.h: EIT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: eit.h 1.30 2003/12/21 14:51:50 kls Exp $
+ */
 
 #ifndef __EIT_H
 #define __EIT_H
 
-#include "channels.h"
-#include "thread.h"
-#include "tools.h"
-
-#define MAXEPGBUGFIXLEVEL 2
-
-class cEventInfo : public cListObject {
-  friend class cSchedule;
-  friend class cEIT;
-private:
-  unsigned char uTableID;           // Table ID this event came from
-  tChannelID channelID;             // Channel ID of program for that event
-  bool bIsFollowing;                // true if this is the next event on this channel
-  bool bIsPresent;                  // true if this is the present event running
-  char *pExtendedDescription;       // Extended description of this event
-  char *pSubtitle;                  // Subtitle of event
-  char *pTitle;                     // Title of event
-  unsigned short uEventID;          // Event ID of this event
-  long lDuration;                   // duration of event in seconds
-  time_t tTime;                     // Start time
-  int nChannelNumber;               // the actual channel number from VDR's channel list (used in cMenuSchedule for sorting by channel number)
-protected:
-  void SetTableID(unsigned char tableid);
-  void SetFollowing(bool foll);
-  void SetPresent(bool pres);
-  void SetTitle(const char *string);
-  void SetChannelID(tChannelID channelid);
-  void SetEventID(unsigned short evid);
-  void SetDuration(long l);
-  void SetTime(time_t t);
-  void SetExtendedDescription(const char *string);
-  void SetSubtitle(const char *string);
-  cEventInfo(tChannelID channelid, unsigned short eventid);
-public:
-  ~cEventInfo();
-  const unsigned char GetTableID(void) const;
-  const char *GetTimeString(void) const;
-  const char *GetEndTimeString(void) const;
-  const char *GetDate(void) const;
-  bool IsFollowing(void) const;
-  bool IsPresent(void) const;
-  const char *GetExtendedDescription(void) const;
-  const char *GetSubtitle(void) const;
-  const char *GetTitle(void) const;
-  unsigned short GetEventID(void) const;
-  long GetDuration(void) const;
-  time_t GetTime(void) const;
-  tChannelID GetChannelID(void) const;
-  int GetChannelNumber(void) const { return nChannelNumber; }
-  void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
-  void Dump(FILE *f, const char *Prefix = "") const;
-  static bool Read(FILE *f, cSchedule *Schedule);
-  void FixEpgBugs(void);
-  };
-
-class cSchedule : public cListObject  {
-  friend class cSchedules;
-  friend class cEIT;
-private:
-  cEventInfo *pPresent;
-  cEventInfo *pFollowing;
-  tChannelID channelID;
-  cList<cEventInfo> Events;
-protected:
-  void SetChannelID(tChannelID channelid);
-  bool SetFollowingEvent(cEventInfo *pEvent);
-  bool SetPresentEvent(cEventInfo *pEvent);
-  void Cleanup(time_t tTime);
-  void Cleanup(void);
-  cSchedule(tChannelID channelid = tChannelID::InvalidID);
-public:
-  ~cSchedule();
-  cEventInfo *AddEvent(cEventInfo *EventInfo);
-  const cEventInfo *GetPresentEvent(void) const;
-  const cEventInfo *GetFollowingEvent(void) const;
-  tChannelID GetChannelID(void) const;
-  const cEventInfo *GetEvent(unsigned short uEventID, time_t tTime = 0) const;
-  const cEventInfo *GetEventAround(time_t tTime) const;
-  const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
-  int NumEvents(void) const { return Events.Count(); }
-  void Dump(FILE *f, const char *Prefix = "") const;
-  static bool Read(FILE *f, cSchedules *Schedules);
-  };
+#include "filter.h"
 
-class cSchedules : public cList<cSchedule> {
-  friend class cSchedule;
-  friend class cSIProcessor;
-private:
-  const cSchedule *pCurrentSchedule;
-  tChannelID currentChannelID;
+class cEitFilter : public cFilter {
 protected:
-  const cSchedule *AddChannelID(tChannelID channelid);
-  const cSchedule *SetCurrentChannelID(tChannelID channelid);
-  void Cleanup();
-public:
-  cSchedules(void);
-  ~cSchedules();
-  const cSchedule *GetSchedule(tChannelID channelid) const;
-  const cSchedule *GetSchedule(void) const;
-  void Dump(FILE *f, const char *Prefix = "") const;
-  static bool Read(FILE *f);
-};
-
-typedef struct sip_filter {
-
-  unsigned short pid;
-  u_char tid;
-  int handle;
-  bool inuse;
-
-}SIP_FILTER;
-
-class cCaDescriptor;
-
-class cSIProcessor : public cThread {
-private:
-  static int numSIProcessors;
-  static cSchedules *schedules;
-  static cMutex schedulesMutex;
-  static cList<cCaDescriptor> caDescriptors;
-  static cMutex caDescriptorsMutex;
-  static const char *epgDataFileName;
-  static time_t lastDump;
-  bool masterSIProcessor;
-  int currentSource;
-  int currentTransponder;
-  int statusCount;
-  int pmtIndex;
-  int pmtPid;
-  SIP_FILTER *filters;
-  char *fileName;
-  bool active;
-  void Action(void);
-  bool AddFilter(unsigned short pid, u_char tid, u_char mask = 0xFF);
-  bool DelFilter(unsigned short pid, u_char tid);
-  bool ShutDownFilters(void);
-  void NewCaDescriptor(struct Descriptor *d, int ServiceId);
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
-  cSIProcessor(const char *FileName);
-  ~cSIProcessor();
-  static void SetEpgDataFileName(const char *FileName);
-  static const char *GetEpgDataFileName(void);
-  static const cSchedules *Schedules(cMutexLock &MutexLock);
-         // Caller must provide a cMutexLock which has to survive the entire
-         // time the returned cSchedules is accessed. Once the cSchedules is no
-         // longer used, the cMutexLock must be destroyed.
-  static int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data);
-         ///< Gets all CA descriptors for a given channel.
-         ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
-         ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
-         ///< are copied that match one of the given CA system IDs.
-         ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
-         ///< available), or -1 if BufSize was too small to hold all CA descriptors.
-  static bool Read(FILE *f = NULL);
-  static void Clear(void);
-  void SetStatus(bool On);
-  void SetCurrentTransponder(int CurrentSource, int CurrentTransponder);
-  static bool SetCurrentChannelID(tChannelID channelid);
-  static void TriggerDump(void);
+  cEitFilter(void);
   };
 
-#endif
+#endif //__EIT_H
diff --git a/eitscan.c b/eitscan.c
index a12bb44d3..b4039c509 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.14 2003/09/06 13:06:13 kls Exp $
+ * $Id: eitscan.c 1.15 2004/01/04 14:54:01 kls Exp $
  */
 
 #include "eitscan.h"
@@ -12,6 +12,68 @@
 #include "channels.h"
 #include "dvbdevice.h"
 
+// --- cScanData -------------------------------------------------------------
+
+class cScanData : public cListObject {
+private:
+  int source;
+  int transponder;
+public:
+  cScanData(int Source, int Transponder);
+  virtual bool operator< (const cListObject &ListObject);
+  int Source(void) { return source; }
+  int Transponder(void) { return transponder; }
+  cChannel *GetChannel(void);
+  };
+
+cScanData::cScanData(int Source, int Transponder)
+{
+  source = Source;
+  transponder = Transponder;
+}
+
+bool cScanData::operator< (const cListObject &ListObject)
+{
+  cScanData *sd = (cScanData *)&ListObject;
+  return source < sd->source || source == sd->source && transponder < sd->transponder;
+}
+
+//XXX this might be done differently later...
+cChannel *cScanData::GetChannel(void)
+{
+  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+      if (!Channel->GroupSep() && Channel->Source() == source && ISTRANSPONDER(Channel->Transponder(), transponder))
+         return Channel;
+      }
+  return NULL;
+}
+
+// --- cScanList -------------------------------------------------------------
+
+class cScanList : public cList<cScanData> {
+public:
+  cScanList(void);
+  void AddTransponder(const cChannel *Channel);
+  };
+
+cScanList::cScanList(void)
+{
+  for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch))
+      AddTransponder(ch);
+  Sort();
+}
+
+void cScanList::AddTransponder(const cChannel *Channel)
+{
+  for (cScanData *sd = First(); sd; sd = Next(sd)) {
+      if (sd->Source() == Channel->Source() && sd->Transponder() == Channel->Transponder())
+         return;
+      }
+  Add(new cScanData(Channel->Source(), Channel->Transponder()));
+}
+
+// --- cEITScanner -----------------------------------------------------------
+
 cEITScanner EITScanner;
 
 cEITScanner::cEITScanner(void)
@@ -20,24 +82,12 @@ cEITScanner::cEITScanner(void)
   currentDevice = NULL;
   currentChannel = 0;
   memset(lastChannel, 0, sizeof(lastChannel));
-  numTransponders = 0;
-  transponders = NULL;
+  scanList = NULL;
 }
 
 cEITScanner::~cEITScanner()
 {
-  free(transponders);
-}
-
-bool cEITScanner::TransponderScanned(cChannel *Channel)
-{
-  for (int i = 0; i < numTransponders; i++) {
-      if (transponders[i] == Channel->Frequency())
-         return true;
-      }
-  transponders = (int *)realloc(transponders, ++numTransponders * sizeof(int));
-  transponders[numTransponders - 1] = Channel->Frequency();
-  return false;
+  delete scanList;
 }
 
 void cEITScanner::Activity(void)
@@ -54,37 +104,51 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        for (int i = 0; i < cDevice::NumDevices(); i++) {
-            cDevice *Device = cDevice::GetDevice(i);
-            if (Device && Device->CardIndex() < MAXDVBDEVICES) {
-               if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                  if (!(Device->Receiving(true) || Device->Replaying())) {
-                     for (;;) {
-                         cChannel *Channel = Channels.GetByNumber(lastChannel[Device->DeviceNumber()] + 1, 1);
-                         if (Channel) {
-                            lastChannel[Device->DeviceNumber()] = Channel->Number();
-                            if (Channel->Sid() && Device->ProvidesChannel(Channel) && !TransponderScanned(Channel)) {
-                               if (Device == cDevice::PrimaryDevice() && !currentChannel) {
-                                  currentChannel = Device->CurrentChannel();
+        if (Channels.Lock(false, 10)) {
+           if (!scanList)
+              scanList = new cScanList();
+           for (bool AnyDeviceSwitched = false; !AnyDeviceSwitched; ) {
+               cScanData *ScanData = NULL;
+               for (int i = 0; i < cDevice::NumDevices(); i++) {
+                   cDevice *Device = cDevice::GetDevice(i);
+                   if (Device) {
+                      if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                         if (!(Device->Receiving(true) || Device->Replaying())) {
+                            if (!ScanData)
+                               ScanData = scanList->First();
+                            if (ScanData) {
+                               cChannel *Channel = ScanData->GetChannel();
+                               //XXX if (Device->ProvidesTransponder(Channel)) {
+                               if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) { //XXX temporary for the 'sky' plugin
+                                  if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                                     currentChannel = Device->CurrentChannel();
+                                  currentDevice = Device;//XXX see also dvbdevice.c!!!
+                                  Device->SwitchChannel(Channel, false);
+                                  currentDevice = NULL;
+                                  scanList->Del(ScanData);
+                                  ScanData = NULL;
+                                  AnyDeviceSwitched = true;
                                   }
-                               currentDevice = Device;
-                               Device->SwitchChannel(Channel, false);
-                               currentDevice = NULL;
-                               break;
                                }
-                            }
-                         else {
-                            if (lastChannel[Device->DeviceNumber()])
-                               numTransponders = 0;
-                            lastChannel[Device->DeviceNumber()] = 0;
-                            break;
+                            else
+                               break;
                             }
                          }
-                     }
+                      }
+                   }
+               if (ScanData && !AnyDeviceSwitched) {
+                  scanList->Del(ScanData);
+                  ScanData = NULL;
+                  }
+               if (!scanList->Count()) {
+                  delete scanList;
+                  scanList = NULL;
+                  break;
                   }
                }
-            }
-        lastScan = time(NULL);
+           Channels.Unlock();
+           lastScan = time(NULL);
+           }
         }
      }
 }
diff --git a/eitscan.h b/eitscan.h
index 420f47d01..fff2dee8d 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.4 2003/09/06 13:05:51 kls Exp $
+ * $Id: eitscan.h 1.5 2004/01/03 13:08:39 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -13,6 +13,8 @@
 #include <time.h>
 #include "config.h"
 
+class cScanList;
+
 class cEITScanner {
 private:
   enum { ActivityTimeout = 60,
@@ -22,8 +24,7 @@ class cEITScanner {
   cDevice *currentDevice;
   int currentChannel;
   int lastChannel[MAXDEVICES];
-  int numTransponders, *transponders;
-  bool TransponderScanned(cChannel *Channel);
+  cScanList *scanList;
 public:
   cEITScanner(void);
   ~cEITScanner();
diff --git a/epg.c b/epg.c
new file mode 100644
index 000000000..60d63af61
--- /dev/null
+++ b/epg.c
@@ -0,0 +1,684 @@
+/*
+ * epg.c: Electronic Program Guide
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version (as used in VDR before 1.3.0) written by
+ * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
+ *
+ * $Id: epg.c 1.3 2004/01/04 14:07:46 kls Exp $
+ */
+
+#include "epg.h"
+#include <ctype.h>
+#include <time.h>
+
+// --- cEvent ----------------------------------------------------------------
+
+cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID)
+{
+  channelID = ChannelID;
+  eventID = EventID;
+  tableID = 0;
+  version = 0xFF; // actual version numbers are 0..31
+  isPresent = isFollowing = false;
+  title = NULL;
+  shortText = NULL;
+  description = NULL;
+  startTime = 0;
+  duration = 0;
+  channelNumber = 0;
+}
+
+cEvent::~cEvent()
+{
+  free(title);
+  free(shortText);
+  free(description);
+}
+
+void cEvent::SetEventID(u_int16_t EventID)
+{
+  eventID = EventID;
+}
+
+void cEvent::SetTableID(uchar TableID)
+{
+  tableID = TableID;
+}
+
+void cEvent::SetVersion(uchar Version)
+{
+  version = Version;
+}
+
+void cEvent::SetIsPresent(bool IsPresent)
+{
+  isPresent = IsPresent;
+}
+
+void cEvent::SetIsFollowing(bool IsFollowing)
+{
+  isFollowing = IsFollowing;
+}
+
+void cEvent::SetTitle(const char *Title)
+{
+  title = strcpyrealloc(title, Title);
+}
+
+void cEvent::SetShortText(const char *ShortText)
+{
+  shortText = strcpyrealloc(shortText, ShortText);
+}
+
+void cEvent::SetDescription(const char *Description)
+{
+  description = strcpyrealloc(description, Description);
+}
+
+void cEvent::SetStartTime(time_t StartTime)
+{
+  startTime = StartTime;
+}
+
+void cEvent::SetDuration(int Duration)
+{
+  duration = Duration;
+}
+
+const char *cEvent::GetDateString(void) const
+{
+  static char buf[25];
+  struct tm tm_r;
+  strftime(buf, sizeof(buf), "%d.%m.%Y", localtime_r(&startTime, &tm_r));
+  return buf;
+}
+
+const char *cEvent::GetTimeString(void) const
+{
+  static char buf[25];
+  struct tm tm_r;
+  strftime(buf, sizeof(buf), "%R", localtime_r(&startTime, &tm_r));
+  return buf;
+}
+
+const char *cEvent::GetEndTimeString(void) const
+{
+  static char buf[25];
+  time_t EndTime = startTime + duration;
+  struct tm tm_r;
+  strftime(buf, sizeof(buf), "%R", localtime_r(&EndTime, &tm_r));
+  return buf;
+}
+
+void cEvent::Dump(FILE *f, const char *Prefix) const
+{
+  if (startTime + duration >= time(NULL)) {
+     fprintf(f, "%sE %u %ld %d %X\n", Prefix, eventID, startTime, duration, tableID);
+     if (!isempty(title))
+        fprintf(f, "%sT %s\n", Prefix, title);
+     if (!isempty(shortText))
+        fprintf(f, "%sS %s\n", Prefix, shortText);
+     if (!isempty(description))
+        fprintf(f, "%sD %s\n", Prefix, description);
+     fprintf(f, "%se\n", Prefix);
+     }
+}
+
+bool cEvent::Read(FILE *f, cSchedule *Schedule)
+{
+  if (Schedule) {
+     cEvent *Event = NULL;
+     char *s;
+     while ((s = readline(f)) != NULL) {
+           char *t = skipspace(s + 1);
+           switch (*s) {
+             case 'E': if (!Event) {
+                          unsigned int EventID;
+                          time_t StartTime;
+                          int Duration;
+                          unsigned int TableID = 0;
+                          int n = sscanf(t, "%u %ld %d %X", &EventID, &StartTime, &Duration, &TableID);
+                          if (n == 3 || n == 4) {
+                             Event = (cEvent *)Schedule->GetEvent(EventID, StartTime);
+                             if (!Event)
+                                Event = Schedule->AddEvent(new cEvent(Schedule->ChannelID(), EventID));
+                             if (Event) {
+                                Event->SetTableID(TableID);
+                                Event->SetStartTime(StartTime);
+                                Event->SetDuration(Duration);
+                                }
+                             }
+                          }
+                       break;
+             case 'T': if (Event)
+                          Event->SetTitle(t);
+                       break;
+             case 'S': if (Event)
+                          Event->SetShortText(t);
+                       break;
+             case 'D': if (Event)
+                          Event->SetDescription(t);
+                       break;
+             case 'e': Event = NULL;
+                       break;
+             case 'c': // to keep things simple we react on 'c' here
+                       return true;
+             default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
+                       return false;
+             }
+           }
+     esyslog("ERROR: unexpected end of file while reading EPG data");
+     }
+  return false;
+}
+
+#define MAXEPGBUGFIXSTATS 7
+#define MAXEPGBUGFIXCHANS 100
+struct tEpgBugFixStats {
+  int hits;
+  int n;
+  tChannelID channelIDs[MAXEPGBUGFIXCHANS];
+  tEpgBugFixStats(void) { hits = n = 0; }
+  };
+
+tEpgBugFixStats EpgBugFixStats[MAXEPGBUGFIXSTATS];
+
+static void EpgBugFixStat(int Number, tChannelID ChannelID)
+{
+  if (0 <= Number && Number < MAXEPGBUGFIXSTATS) {
+     tEpgBugFixStats *p = &EpgBugFixStats[Number];
+     p->hits++;
+     int i = 0;
+     for (; i < p->n; i++) {
+         if (p->channelIDs[i] == ChannelID)
+            break;
+         }
+     if (i == p->n && p->n < MAXEPGBUGFIXCHANS)
+        p->channelIDs[p->n++] = ChannelID;
+     }
+}
+
+void ReportEpgBugFixStats(bool Reset)
+{
+  if (Setup.EPGBugfixLevel > 0) {
+     bool GotHits = false;
+     char buffer[1024];
+     for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) {
+         const char *delim = "\t";
+         tEpgBugFixStats *p = &EpgBugFixStats[i];
+         if (p->hits) {
+            bool PrintedStats = false;
+            char *q = buffer;
+            *buffer = 0;
+            for (int c = 0; c < p->n; c++) {
+                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c], true);
+                if (channel) {
+                   if (!GotHits) {
+                      dsyslog("=====================");
+                      dsyslog("EPG bugfix statistics");
+                      dsyslog("=====================");
+                      dsyslog("IF SOMEBODY WHO IS IN CHARGE OF THE EPG DATA FOR ONE OF THE LISTED");
+                      dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEvent::FixEpgBugs()");
+                      dsyslog("IN VDR/epg.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
+                      dsyslog("=====================");
+                      dsyslog("Fix\tHits\tChannels");
+                      GotHits = true;
+                      }
+                   if (!PrintedStats) {
+                      q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
+                      PrintedStats = true;
+                      }
+                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
+                   delim = ", ";
+                   if (q - buffer > 80) {
+                      q += snprintf(q, sizeof(buffer) - (q - buffer), "%s...", delim);
+                      break;
+                      }
+                   }
+                }
+            if (*buffer)
+               dsyslog("%s", buffer);
+            }
+         if (Reset)
+            p->hits = p->n = 0;
+         }
+     if (GotHits)
+        dsyslog("=====================");
+     }
+}
+
+void cEvent::FixEpgBugs(void)
+{
+  // VDR can't usefully handle newline characters in the EPG data, so let's
+  // always convert them to blanks (independent of the setting of EPGBugfixLevel):
+  strreplace(title, '\n', ' ');
+  strreplace(shortText, '\n', ' ');
+  strreplace(description, '\n', ' ');
+
+  if (Setup.EPGBugfixLevel == 0)
+     return;
+
+  // Some TV stations apparently have their own idea about how to fill in the
+  // EPG data. Let's fix their bugs as good as we can:
+  if (title) {
+
+     // Some channels put too much information into the ShortText and leave the
+     // Description empty:
+     //
+     // Title
+     // (NAT, Year Min')[ ["ShortText". ]Description]
+     //
+     if (shortText && !description) {
+        if (*shortText == '(') {
+           char *e = strchr(shortText + 1, ')');
+           if (e) {
+              if (*(e + 1)) {
+                 if (*++e == ' ')
+                    if (*(e + 1) == '"')
+                       e++;
+                 }
+              else
+                 e = NULL;
+              char *s = e ? strdup(e) : NULL;
+              free(shortText);
+              shortText = s;
+              EpgBugFixStat(0, ChannelID());
+              // now the fixes #1 and #2 below will handle the rest
+              }
+           }
+        }
+
+     // Some channels put the ShortText in quotes and use either the ShortText
+     // or the Description field, depending on how long the string is:
+     //
+     // Title
+     // "ShortText". Description
+     //
+     if ((shortText == NULL) != (description == NULL)) {
+        char *p = shortText ? shortText : description;
+        if (*p == '"') {
+           const char *delim = "\".";
+           char *e = strstr(p + 1, delim);
+           if (e) {
+              *e = 0;
+              char *s = strdup(p + 1);
+              char *d = strdup(e + strlen(delim));
+              free(shortText);
+              free(description);
+              shortText = s;
+              description = d;
+              EpgBugFixStat(1, ChannelID());
+              }
+           }
+        }
+
+     // Some channels put the Description into the ShortText (preceeded
+     // by a blank) if there is no actual ShortText and the Description
+     // is short enough:
+     //
+     // Title
+     //  Description
+     //
+     if (shortText && !description) {
+        if (*shortText == ' ') {
+           memmove(shortText, shortText + 1, strlen(shortText));
+           description = shortText;
+           shortText = NULL;
+           EpgBugFixStat(2, ChannelID());
+           }
+        }
+
+     // Sometimes they repeat the Title in the ShortText:
+     //
+     // Title
+     // Title
+     //
+     if (shortText && strcmp(title, shortText) == 0) {
+        free(shortText);
+        shortText = NULL;
+        EpgBugFixStat(3, ChannelID());
+        }
+
+     // Some channels put the ShortText between double quotes, which is nothing
+     // but annoying (some even put a '.' after the closing '"'):
+     //
+     // Title
+     // "ShortText"[.]
+     //
+     if (shortText && *shortText == '"') {
+        int l = strlen(shortText);
+        if (l > 2 && (shortText[l - 1] == '"' || (shortText[l - 1] == '.' && shortText[l - 2] == '"'))) {
+           memmove(shortText, shortText + 1, l);
+           char *p = strrchr(shortText, '"');
+           if (p)
+              *p = 0;
+           EpgBugFixStat(4, ChannelID());
+           }
+        }
+
+     if (Setup.EPGBugfixLevel <= 1)
+        return;
+
+     // Some channels apparently try to do some formatting in the texts,
+     // which is a bad idea because they have no way of knowing the width
+     // of the window that will actually display the text.
+     // Remove excess whitespace:
+     title = compactspace(title);
+     shortText = compactspace(shortText);
+     description = compactspace(description);
+     // Remove superfluous hyphens:
+     if (description) {
+        char *p = description;
+        while (*p && *(p + 1) && *(p + 2)) {
+              if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
+                 if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
+                    memmove(p, p + 2, strlen(p + 2) + 1);
+                    EpgBugFixStat(5, ChannelID());
+                    }
+                 }
+              p++;
+              }
+        }
+
+#define MAX_USEFUL_EPISODE_LENGTH 40
+     // Some channels put a whole lot of information in the ShortText and leave
+     // the Description totally empty. So if the ShortText length exceeds
+     // MAX_USEFUL_EPISODE_LENGTH, let's put this into the Description
+     // instead:
+     if (!isempty(shortText) && isempty(description)) {
+        if (strlen(shortText) > MAX_USEFUL_EPISODE_LENGTH) {
+           free(description);
+           description = shortText;
+           shortText = NULL;
+           EpgBugFixStat(6, ChannelID());
+           }
+        }
+
+     // Some channels use the ` ("backtick") character, where a ' (single quote)
+     // would be normally used. Actually, "backticks" in normal text don't make
+     // much sense, so let's replace them:
+     strreplace(title, '`', '\'');
+     strreplace(shortText, '`', '\'');
+     strreplace(description, '`', '\'');
+     }
+}
+
+// --- cSchedule -------------------------------------------------------------
+
+cSchedule::cSchedule(tChannelID ChannelID)
+{
+  channelID = ChannelID;
+  present = following = NULL;
+}
+
+cEvent *cSchedule::AddEvent(cEvent *Event)
+{
+  events.Add(Event);
+  return Event;
+}
+
+const cEvent *cSchedule::GetPresentEvent(void) const
+{
+  return GetEventAround(time(NULL));
+}
+
+const cEvent *cSchedule::GetFollowingEvent(void) const
+{
+  const cEvent *pe = NULL;
+  time_t now = time(NULL);
+  time_t delta = INT_MAX;
+  for (cEvent *p = events.First(); p; p = events.Next(p)) {
+      time_t dt = p->StartTime() - now;
+      if (dt > 0 && dt < delta) {
+         delta = dt;
+         pe = p;
+         }
+      }
+  return pe;
+}
+
+const cEvent *cSchedule::GetEvent(u_int16_t EventID, time_t StartTime) const
+{
+  // Returns either the event info with the given EventID or, if that one can't
+  // be found, the one with the given StartTime (or NULL if neither can be found)
+  cEvent *pt = NULL;
+  for (cEvent *pe = events.First(); pe; pe = events.Next(pe)) {
+      if (pe->EventID() == EventID)
+         return pe;
+      if (StartTime > 0 && pe->StartTime() == StartTime) // 'StartTime < 0' is apparently used with NVOD channels
+         pt = pe;
+      }
+  return pt;
+}
+
+const cEvent *cSchedule::GetEventAround(time_t Time) const
+{
+  const cEvent *pe = NULL;
+  time_t delta = INT_MAX;
+  for (cEvent *p = events.First(); p; p = events.Next(p)) {
+      time_t dt = Time - p->StartTime();
+      if (dt >= 0 && dt < delta && p->StartTime() + p->Duration() >= Time) {
+         delta = dt;
+         pe = p;
+         }
+      }
+  return pe;
+}
+
+bool cSchedule::SetPresentEvent(cEvent *Event)
+{
+  if (present)
+     present->SetIsPresent(false);
+  present = Event;
+  present->SetIsPresent(true);
+  return true;
+}
+
+bool cSchedule::SetFollowingEvent(cEvent *Event)
+{
+  if (following)
+     following->SetIsFollowing(false);
+  following = Event;
+  following->SetIsFollowing(true);
+  return true;
+}
+
+void cSchedule::Cleanup(void)
+{
+  Cleanup(time(NULL));
+}
+
+void cSchedule::Cleanup(time_t Time)
+{
+  cEvent *Event;
+  for (int a = 0; true ; a++) {
+      Event = events.Get(a);
+      if (!Event)
+         break;
+      if (Event->StartTime() + Event->Duration() + 3600 < Time) { // adding one hour for safety
+         events.Del(Event);
+         a--;
+         }
+      }
+}
+
+void cSchedule::Dump(FILE *f, const char *Prefix) const
+{
+  cChannel *channel = Channels.GetByChannelID(channelID, true);
+  if (channel) {
+     fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelID().ToString(), channel->Name());
+     for (cEvent *p = events.First(); p; p = events.Next(p))
+        p->Dump(f, Prefix);
+     fprintf(f, "%sc\n", Prefix);
+     }
+}
+
+bool cSchedule::Read(FILE *f, cSchedules *Schedules)
+{
+  if (Schedules) {
+     char *s;
+     while ((s = readline(f)) != NULL) {
+           if (*s == 'C') {
+              s = skipspace(s + 1);
+              char *p = strchr(s, ' ');
+              if (p)
+                 *p = 0; // strips optional channel name
+              if (*s) {
+                 tChannelID channelID = tChannelID::FromString(s);
+                 if (channelID.Valid()) {
+                    cSchedule *p = Schedules->AddSchedule(channelID);
+                    if (p) {
+                       if (!cEvent::Read(f, p))
+                          return false;
+                       }
+                    }
+                 else {
+                    esyslog("ERROR: illegal channel ID: %s", s);
+                    return false;
+                    }
+                 }
+              }
+           else {
+              esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
+              return false;
+              }
+           }
+     return true;
+     }
+  return false;
+}
+
+// --- cSchedulesLock --------------------------------------------------------
+
+cSchedulesLock::cSchedulesLock(bool WriteLock, int TimeoutMs)
+{
+  locked = cSchedules::schedules.rwlock.Lock(WriteLock, TimeoutMs);
+}
+
+cSchedulesLock::~cSchedulesLock()
+{
+  if (locked)
+     cSchedules::schedules.rwlock.Unlock();
+}
+
+// --- cSchedules ------------------------------------------------------------
+
+cSchedules cSchedules::schedules;
+const char *cSchedules::epgDataFileName = NULL;
+time_t cSchedules::lastCleanup = time(NULL);
+time_t cSchedules::lastDump = time(NULL);
+
+const cSchedules *cSchedules::Schedules(cSchedulesLock &SchedulesLock)
+{
+  return SchedulesLock.Locked() ? &schedules : NULL;
+}
+
+void cSchedules::SetEpgDataFileName(const char *FileName)
+{
+  delete epgDataFileName;
+  if (FileName)
+     epgDataFileName = strdup(FileName);
+}
+
+void cSchedules::Cleanup(bool Force)
+{
+  if (Force)
+     lastDump = 0;
+  time_t now = time(NULL);
+  struct tm tm_r;
+  struct tm *ptm = localtime_r(&now, &tm_r);
+  if (now - lastCleanup > 3600 && ptm->tm_hour == 5) {
+     isyslog("cleaning up schedules data");
+     cSchedulesLock SchedulesLock(true, 1000);
+     cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
+     if (s) {
+        for (cSchedule *p = s->First(); p; p = s->Next(p))
+            p->Cleanup(now);
+        }
+     lastCleanup = now;
+     ReportEpgBugFixStats(true);
+     }
+  if (epgDataFileName && now - lastDump > 600) {
+     cSafeFile f(epgDataFileName);
+     if (f.Open()) {
+        Dump(f);
+        f.Close();
+        }
+     else
+        LOG_ERROR;
+     lastDump = now;
+     }
+}
+
+bool cSchedules::ClearAll(void)
+{
+  cSchedulesLock SchedulesLock(true, 1000);
+  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
+  if (s) {
+     s->Clear();
+     return true;
+     }
+  return false;
+}
+
+bool cSchedules::Dump(FILE *f, const char *Prefix)
+{
+  cSchedulesLock SchedulesLock;
+  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
+  if (s) {
+     for (cSchedule *p = s->First(); p; p = s->Next(p))
+         p->Dump(f, Prefix);
+     return true;
+     }
+  return false;
+}
+
+bool cSchedules::Read(FILE *f)
+{
+  cSchedulesLock SchedulesLock(true, 1000);
+  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
+  if (s) {
+     bool OwnFile = f == NULL;
+     if (OwnFile) {
+        if (epgDataFileName && access(epgDataFileName, R_OK) == 0) {
+           dsyslog("reading EPG data from %s", epgDataFileName);
+           if ((f = fopen(epgDataFileName, "r")) == NULL) {
+              LOG_ERROR;
+              return false;
+              }
+           }
+        else
+           return false;
+        }
+     bool result = cSchedule::Read(f, s);
+     if (OwnFile)
+        fclose(f);
+     return result;
+     }
+  return false;
+}
+
+cSchedule *cSchedules::AddSchedule(tChannelID ChannelID)
+{
+  ChannelID.ClrRid();
+  cSchedule *p = (cSchedule *)GetSchedule(ChannelID);
+  if (!p) {
+     p = new cSchedule(ChannelID);
+     Add(p);
+     }
+  return p;
+}
+
+const cSchedule *cSchedules::GetSchedule(tChannelID ChannelID) const
+{
+  ChannelID.ClrRid();
+  for (cSchedule *p = First(); p; p = Next(p)) {
+      if (p->ChannelID() == ChannelID)
+         return p;
+      }
+  return NULL;
+}
+
diff --git a/epg.h b/epg.h
new file mode 100644
index 000000000..19332a592
--- /dev/null
+++ b/epg.h
@@ -0,0 +1,134 @@
+/*
+ * epg.h: Electronic Program Guide
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version (as used in VDR before 1.3.0) written by
+ * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
+ *
+ * $Id: epg.h 1.3 2004/01/03 17:00:25 kls Exp $
+ */
+
+#ifndef __EPG_H
+#define __EPG_H
+
+#include "channels.h"
+#include "thread.h"
+#include "tools.h"
+
+#define MAXEPGBUGFIXLEVEL 2
+
+class cSchedule;
+
+class cEvent : public cListObject {
+private:
+  tChannelID channelID;  // Channel ID of program for this event
+  u_int16_t eventID;     // Event ID of this event
+  uchar tableID;         // Table ID this event came from
+  uchar version;         // Version number of section this event came from
+  //XXX present/following obsolete???
+  bool isPresent;        // true if this is the present event running
+  bool isFollowing;      // true if this is the next event on this channel
+  char *title;           // Title of this event
+  char *shortText;       // Short description of this event (typically the episode name in case of a series)
+  char *description;     // Description of this event
+  time_t startTime;      // Start time of this event
+  int duration;          // Duration of this event in seconds
+  //XXX find an other solution, avoiding channelNumber???
+  int channelNumber;     // the actual channel number from VDR's channel list (used in cMenuSchedule for sorting by channel number)
+public:
+  cEvent(tChannelID ChannelID, u_int16_t EventID);
+  ~cEvent();
+  tChannelID ChannelID(void) const { return channelID; }
+  u_int16_t EventID(void) const { return eventID; }
+  uchar TableID(void) const { return tableID; }
+  uchar Version(void) const { return version; }
+  bool IsPresent(void) const { return isPresent; }
+  bool IsFollowing(void) const { return isFollowing; }
+  const char *Title(void) const { return title; }
+  const char *ShortText(void) const { return shortText; }
+  const char *Description(void) const { return description; }
+  time_t StartTime(void) const { return startTime; }
+  int Duration(void) const { return duration; }
+  int ChannelNumber(void) const { return channelNumber; }
+  const char *GetDateString(void) const;
+  const char *GetTimeString(void) const;
+  const char *GetEndTimeString(void) const;
+  void SetEventID(u_int16_t EventID);
+  void SetTableID(uchar TableID);
+  void SetVersion(uchar Version);
+  void SetIsPresent(bool IsPresent);
+  void SetIsFollowing(bool IsFollowing);
+  void SetTitle(const char *Title);
+  void SetShortText(const char *ShortText);
+  void SetDescription(const char *Description);
+  void SetStartTime(time_t StartTime);
+  void SetDuration(int Duration);
+  void SetChannelNumber(int ChannelNumber) const { ((cEvent *)this)->channelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const' //XXX
+  void Dump(FILE *f, const char *Prefix = "") const;
+  static bool Read(FILE *f, cSchedule *Schedule);
+  void FixEpgBugs(void);
+  };
+
+class cSchedules;
+
+class cSchedule : public cListObject  {
+private:
+  tChannelID channelID;
+  cList<cEvent> events;
+  cEvent *present;
+  cEvent *following;
+public:
+  cSchedule(tChannelID ChannelID);
+  tChannelID ChannelID(void) const { return channelID; }
+  bool SetPresentEvent(cEvent *Event);
+  bool SetFollowingEvent(cEvent *Event);
+  void Cleanup(time_t Time);
+  void Cleanup(void);
+  cEvent *AddEvent(cEvent *Event);
+  const cEvent *GetPresentEvent(void) const;
+  const cEvent *GetFollowingEvent(void) const;
+  const cEvent *GetEvent(u_int16_t EventID, time_t StartTime = 0) const;
+  const cEvent *GetEventAround(time_t Time) const;
+  const cEvent *GetEventNumber(int n) const { return events.Get(n); }
+  int NumEvents(void) const { return events.Count(); }
+  void Dump(FILE *f, const char *Prefix = "") const;
+  static bool Read(FILE *f, cSchedules *Schedules);
+  };
+
+class cSchedulesLock {
+private:
+  bool locked;
+public:
+  cSchedulesLock(bool WriteLock = false, int TimeoutMs = 0);
+  ~cSchedulesLock();
+  bool Locked(void) { return locked; }
+  };
+
+class cSchedules : public cList<cSchedule> {
+  friend class cSchedule;
+  friend class cSchedulesLock;
+private:
+  cRwLock rwlock;
+  static cSchedules schedules;
+  static const char *epgDataFileName;
+  static time_t lastCleanup;
+  static time_t lastDump;
+public:
+  static void SetEpgDataFileName(const char *FileName);
+  static const cSchedules *Schedules(cSchedulesLock &SchedulesLock);
+         ///< Caller must provide a cSchedulesLock which has to survive the entire
+         ///< time the returned cSchedules is accessed. Once the cSchedules is no
+         ///< longer used, the cSchedulesLock must be destroyed.
+  static void Cleanup(bool Force = false);
+  static bool ClearAll(void);
+  static bool Dump(FILE *f, const char *Prefix = "");
+  static bool Read(FILE *f = NULL);
+  cSchedule *AddSchedule(tChannelID ChannelID);
+  const cSchedule *GetSchedule(tChannelID ChannelID) const;
+  };
+
+void ReportEpgBugFixStats(bool Reset = false);
+
+#endif //__EPG_H
diff --git a/filter.c b/filter.c
new file mode 100644
index 000000000..668b7d3ae
--- /dev/null
+++ b/filter.c
@@ -0,0 +1,126 @@
+/*
+ * filter.c: Section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: filter.c 1.1 2003/12/21 15:26:16 kls Exp $
+ */
+
+#include "filter.h"
+#include "sections.h"
+
+// --- cFilterData -----------------------------------------------------------
+
+cFilterData::cFilterData(void)
+{
+  pid = 0;
+  tid = 0;
+  mask = 0;
+  sticky = false;
+}
+
+cFilterData::cFilterData(u_short Pid, u_char Tid, u_char Mask, bool Sticky)
+{
+  pid = Pid;
+  tid = Tid;
+  mask = Mask;
+  sticky = Sticky;
+}
+
+bool cFilterData::Is(u_short Pid, u_char Tid, u_char Mask)
+{
+  return pid == Pid && tid == Tid && mask == Mask;
+}
+
+bool cFilterData::Matches(u_short Pid, u_char Tid)
+{
+  return pid == Pid && tid == (Tid & mask);
+}
+
+// --- cFilter ---------------------------------------------------------------
+
+cFilter::cFilter(void)
+{
+  sectionHandler = NULL;
+  on = false;
+}
+
+cFilter::cFilter(u_short Pid, u_char Tid, u_char Mask)
+{
+  sectionHandler = NULL;
+  on = false;
+  Set(Pid, Tid, Mask);
+}
+
+cFilter::~cFilter()
+{
+  if (sectionHandler)
+     sectionHandler->Detach(this);
+}
+
+int cFilter::Source(void)
+{
+  return sectionHandler ? sectionHandler->Source() : 0;
+}
+
+int cFilter::Transponder(void)
+{
+  return sectionHandler ? sectionHandler->Transponder() : 0;
+}
+
+void cFilter::SetStatus(bool On)
+{
+  if (sectionHandler && on != On) {
+     cFilterData *fd = data.First();
+     while (fd) {
+           if (On)
+              sectionHandler->Add(fd);
+           else {
+              sectionHandler->Del(fd);
+              if (!fd->sticky) {
+                 cFilterData *next = data.Next(fd);
+                 data.Del(fd);
+                 fd = next;
+                 continue;
+                 }
+              }
+           fd = data.Next(fd);
+           }
+     on = On;
+     }
+}
+
+bool cFilter::Matches(u_short Pid, u_char Tid)
+{
+  for (cFilterData *fd = data.First(); fd; fd = data.Next(fd)) {
+      if (fd->Matches(Pid, Tid))
+         return true;
+      }
+  return false;
+}
+
+void cFilter::Set(u_short Pid, u_char Tid, u_char Mask)
+{
+  Add(Pid, Tid, Mask, true);
+}
+
+void cFilter::Add(u_short Pid, u_char Tid, u_char Mask, bool Sticky)
+{
+  cFilterData *fd = new cFilterData(Pid, Tid, Mask, Sticky);
+  data.Add(fd);
+  if (sectionHandler && on)
+     sectionHandler->Add(fd);
+}
+
+void cFilter::Del(u_short Pid, u_char Tid, u_char Mask)
+{
+  for (cFilterData *fd = data.First(); fd; fd = data.Next(fd)) {
+      if (fd->Is(Pid, Tid, Mask)) {
+         if (sectionHandler && on)
+            sectionHandler->Del(fd);
+         data.Del(fd);
+         return;
+         }
+      }
+}
diff --git a/filter.h b/filter.h
new file mode 100644
index 000000000..09703e02f
--- /dev/null
+++ b/filter.h
@@ -0,0 +1,74 @@
+/*
+ * filter.h: Section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: filter.h 1.1 2003/12/22 11:41:40 kls Exp $
+ */
+
+#ifndef __FILTER_H
+#define __FILTER_H
+
+#include <sys/types.h>
+#include "tools.h"
+
+class cFilterData : public cListObject {
+public:
+  u_short pid;
+  u_char tid;
+  u_char mask;
+  bool sticky;
+  cFilterData(void);
+  cFilterData(u_short Pid, u_char Tid, u_char Mask, bool Sticky);
+  bool Is(u_short Pid, u_char Tid, u_char Mask);
+  bool Matches(u_short Pid, u_char Tid);
+  };
+
+class cSectionHandler;
+
+class cFilter : public cListObject {
+  friend class cSectionHandler;
+private:
+  cSectionHandler *sectionHandler;
+  cList<cFilterData> data;
+  bool on;
+protected:
+  cFilter(void);
+  cFilter(u_short Pid, u_char Tid, u_char Mask = 0xFF);
+  virtual ~cFilter();
+  virtual void SetStatus(bool On);
+       ///< Turns this filter on or off, depending on the value of On.
+       ///< If the filter is turned off, any filter data that has been
+       ///< added without the Sticky parameter set to 'true' will be
+       ///< automatically deleted. Those parameters that have been added
+       ///< with Sticky set to 'true' will be automatically reused when
+       ///< SetStatus(true) is called.
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length) = 0;
+       ///< Processes the data delivered to this filter.
+       ///< Pid and Tid is one of the combinations added to this filter by
+       ///< a previous call to Add(), Data is a pointer to Length bytes of
+       ///< data. This function will be called from the section handler's
+       ///< thread, so it has to use proper locking mechanisms in case it
+       ///< accesses any global data. It is guaranteed that if several cFilters
+       ///< are attached to the same cSectionHandler, only _one_ of them has
+       ///< its Process() function called at any given time. It is allowed
+       ///< that more than one cFilter are set up to receive the same Pid/Tid.
+       ///< The Process() function must return as soon as possible.
+  int Source(void);
+       ///< Returns the source of the data delivered to this filter.
+  int Transponder(void);
+       ///< Returns the transponder of the data delivered to this filter.
+  bool Matches(u_short Pid, u_char Tid);
+       ///< Indicates whether this filter wants to receive data from the given Pid/Tid.
+  void Set(u_short Pid, u_char Tid, u_char Mask = 0xFF);
+       ///< Sets the given filter data by calling Add() with Sticky = true.
+  void Add(u_short Pid, u_char Tid, u_char Mask = 0xFF, bool Sticky = false);
+       ///< Adds the given filter data to this filter.
+       ///< If Sticky is true, this will survive a status change, otherwise
+       ///< it will be automatically deleted.
+  void Del(u_short Pid, u_char Tid, u_char Mask = 0xFF);
+       ///< Deletes the given filter data from this filter.
+  };
+
+#endif //__FILTER_H
diff --git a/font.c b/font.c
index 22c92be00..f25136ca1 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.2 2000/11/18 15:16:08 kls Exp $
+ * $Id: font.c 1.4 2003/10/24 12:59:35 kls Exp $
  */
 
 #include "font.h"
@@ -12,24 +12,38 @@
 
 #include "fontfix.c"
 #include "fontosd.c"
+#include "fontsml.c"
 
-cFont::cFont(eDvbFont Font)
-{
+#include "fontfix-iso8859-7.c"
+#include "fontosd-iso8859-7.c"
+#include "fontsml-iso8859-7.c"
+
+static void *FontData[eDvbCodeSize][eDvbFontSize] = {
+  { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 },
+  { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 }
+  };
+
+static const char *FontCode[eDvbCodeSize] = {
+  "iso8859-1",
+  "iso8859-7"
+  };
 
-#define FONTINDEX(Name)\
-    case font##Name: for (int i = 0; i < NUMCHARS; i++)\
-                         data[i] = (tCharData *)&Font##Name[i < 32 ? 0 : i - 32];\
-                     break;
+eDvbCode cFont::code = code_iso8859_1;
+cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
-  switch (Font) {
-    default:
-    FONTINDEX(Osd);
-    FONTINDEX(Fix);
-    // TODO others...
-    }
+cFont::cFont(void *Data)
+{
+  SetData(Data);
 }
 
-int cFont::Width(const char *s)
+void cFont::SetData(void *Data)
+{
+  int h = ((tCharData *)Data)->height;
+  for (int i = 0; i < NUMCHARS; i++)
+      data[i] = (tCharData *)&((tPixelData *)Data)[(i < 32 ? 0 : i - 32) * (h + 2)];
+}
+
+int cFont::Width(const char *s) const
 {
   int w = 0;
   while (s && *s)
@@ -37,7 +51,7 @@ int cFont::Width(const char *s)
   return w;
 }
 
-int cFont::Height(const char *s)
+int cFont::Height(const char *s) const
 {
   int h = 0;
   if (s && *s)
@@ -45,3 +59,37 @@ int cFont::Height(const char *s)
   return h;
 }
 
+bool cFont::SetCode(const char *Code)
+{
+  for (int i = 0; i < eDvbCodeSize; i++) {
+      if (strcmp(Code, FontCode[i]) == 0) {
+         SetCode(eDvbCode(i));
+         return true;
+         }
+      }
+  return false;
+}
+
+void cFont::SetCode(eDvbCode Code)
+{
+  if (code != Code) {
+     code = Code;
+     for (int i = 0; i < eDvbFontSize; i++) {
+         if (fonts[i])
+            fonts[i]->SetData(FontData[code][i]);
+         }
+     }
+}
+
+void cFont::SetFont(eDvbFont Font, void *Data)
+{
+  delete fonts[Font];
+  fonts[Font] = new cFont(Data ? Data : FontData[code][Font]);
+}
+
+const cFont *cFont::GetFont(eDvbFont Font)
+{
+  if (!fonts[Font])
+     SetFont(Font);
+  return fonts[Font];
+}
diff --git a/font.h b/font.h
index 414eaa8b7..6368ac192 100644
--- a/font.h
+++ b/font.h
@@ -4,19 +4,25 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.2 2000/11/18 14:51:45 kls Exp $
+ * $Id: font.h 1.4 2003/10/24 12:59:45 kls Exp $
  */
 
 #ifndef __FONT_H
 #define __FONT_H
 
+#include <stdlib.h>
+
 enum eDvbFont {
   fontOsd,
   fontFix,
-/* TODO as soon as we have the font files...
-  fontTtxSmall,
-  fontTtxLarge,
-*/
+  fontSml
+#define eDvbFontSize (fontSml + 1)
+  };
+
+enum eDvbCode {
+  code_iso8859_1,
+  code_iso8859_7
+#define eDvbCodeSize (code_iso8859_7 + 1)
   };
 
 class cFont {
@@ -28,14 +34,21 @@ class cFont {
     tPixelData lines[1];
     };
 private:
+  static eDvbCode code;
+  static cFont *fonts[];
   const tCharData *data[NUMCHARS];
 public:
-  cFont(eDvbFont Font);
-  int Width(unsigned char c) { return data[c]->width; }
-  int Width(const char *s);
-  int Height(unsigned char c) { return data[c]->height; }
-  int Height(const char *s);
-  const tCharData *CharData(unsigned char c) { return data[c]; }
+  cFont(void *Data);
+  void SetData(void *Data);
+  int Width(unsigned char c) const { return data[c]->width; }
+  int Width(const char *s) const;
+  int Height(unsigned char c) const { return data[c]->height; }
+  int Height(const char *s) const;
+  const tCharData *CharData(unsigned char c) const { return data[c]; }
+  static bool SetCode(const char *Code);
+  static void SetCode(eDvbCode Code);
+  static void SetFont(eDvbFont Font, void *Data = NULL);
+  static const cFont *GetFont(eDvbFont Font);
   };
 
 #endif //__FONT_H
diff --git a/fontfix-iso8859-7.c b/fontfix-iso8859-7.c
new file mode 100644
index 000000000..35cc96ef4
--- /dev/null
+++ b/fontfix-iso8859-7.c
@@ -0,0 +1,6498 @@
+cFont::tPixelData FontFix_iso8859_7[][28] = {
+  {             // 32
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 33
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 34
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000E70,  // ...***..***...
+     0x00000E70,  // ...***..***...
+     0x00000E70,  // ...***..***...
+     0x00000E70,  // ...***..***...
+     0x00000420,  // ....*....*....
+     0x00000420,  // ....*....*....
+     0x00000420,  // ....*....*....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 35
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 36
+     14, 26,
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000007E0,  // ....******....
+     0x00000C38,  // ...**....***..
+     0x00001818,  // ..**......**..
+     0x00001808,  // ..**.......*..
+     0x00001800,  // ..**..........
+     0x00001C00,  // ..***.........
+     0x00000E00,  // ...***........
+     0x00000780,  // ....****......
+     0x000001E0,  // ......****....
+     0x00000070,  // ........***...
+     0x00000038,  // .........***..
+     0x00000018,  // ..........**..
+     0x00001018,  // ..*.......**..
+     0x00001818,  // ..**......**..
+     0x00001C30,  // ..***....**...
+     0x000007E0,  // ....******....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 37
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001E18,  // ..****....**..
+     0x00003318,  // .**..**...**..
+     0x00003330,  // .**..**..**...
+     0x00003330,  // .**..**..**...
+     0x00003360,  // .**..**.**....
+     0x00001E60,  // ..****..**....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000678,  // ....**..****..
+     0x000006CC,  // ....**.**..**.
+     0x00000CCC,  // ...**..**..**.
+     0x00000CCC,  // ...**..**..**.
+     0x000018CC,  // ..**...**..**.
+     0x00001878,  // ..**....****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 38
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000780,  // ....****......
+     0x00000CC0,  // ...**..**.....
+     0x00001860,  // ..**....**....
+     0x00001860,  // ..**....**....
+     0x00001860,  // ..**....**....
+     0x00001860,  // ..**....**....
+     0x00000CC0,  // ...**..**.....
+     0x00000780,  // ....****......
+     0x00000700,  // ....***.......
+     0x00000D80,  // ...**.**......
+     0x0000198C,  // ..**..**...**.
+     0x000018CC,  // ..**...**..**.
+     0x000030D8,  // .**....**.**..
+     0x00003070,  // .**.....***...
+     0x00003030,  // .**......**...
+     0x00003070,  // .**.....***...
+     0x000018D8,  // ..**...**.**..
+     0x00000F9C,  // ...*****..***.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 39
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 40
+     14, 26,
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x00000060,  // ........**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 41
+     14, 26,
+     0x00000000,  // ..............
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 42
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00001998,  // ..**..**..**..
+     0x00003DBC,  // .****.**.****.
+     0x00001FF8,  // ..**********..
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00001FF8,  // ..**********..
+     0x00003DBC,  // .****.**.****.
+     0x00001998,  // ..**..**..**..
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 43
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 44
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 45
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 46
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 47
+     14, 26,
+     0x00000000,  // ..............
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 48
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00000C60,  // ...**...**....
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00000C60,  // ...**...**....
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 49
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000380,  // .....***......
+     0x00000780,  // ....****......
+     0x00000D80,  // ...**.**......
+     0x00001980,  // ..**..**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 50
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00000C30,  // ...**....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00001808,  // ..**.......*..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 51
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FF8,  // .***********..
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x000007C0,  // ....*****.....
+     0x00000070,  // ........***...
+     0x00000030,  // .........**...
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00003030,  // .**......**...
+     0x00003870,  // .***....***...
+     0x00000FC0,  // ...******.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 52
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000660,  // ....**..**....
+     0x00000C60,  // ...**...**....
+     0x00001860,  // ..**....**....
+     0x00001860,  // ..**....**....
+     0x00003060,  // .**.....**....
+     0x00003FF8,  // .***********..
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 53
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF0,  // ..*********...
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FC0,  // ..*******.....
+     0x00000070,  // ........***...
+     0x00000030,  // .........**...
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00003030,  // .**......**...
+     0x00003870,  // .***....***...
+     0x00000FC0,  // ...******.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 54
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000E0,  // .......***....
+     0x00000380,  // .....***......
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001000,  // ..*...........
+     0x000037C0,  // .**.*****.....
+     0x00003C70,  // .****...***...
+     0x00003830,  // .***.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 55
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF8,  // ..**********..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 56
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00000C60,  // ...**...**....
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00000C60,  // ...**...**....
+     0x000007C0,  // ....*****.....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 57
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001838,  // ..**.....***..
+     0x00001C78,  // ..***...****..
+     0x000007D8,  // ....*****.**..
+     0x00000010,  // ..........*...
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000380,  // .....***......
+     0x00000E00,  // ...***........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 58
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 59
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 60
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000000C,  // ...........**.
+     0x0000003C,  // .........****.
+     0x000000F0,  // .......****...
+     0x000003C0,  // .....****.....
+     0x00000F00,  // ...****.......
+     0x00003C00,  // .****.........
+     0x00003C00,  // .****.........
+     0x00000F00,  // ...****.......
+     0x000003C0,  // .....****.....
+     0x000000F0,  // .......****...
+     0x0000003C,  // .........****.
+     0x0000000C,  // ...........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 61
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 62
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003000,  // .**...........
+     0x00003C00,  // .****.........
+     0x00000F00,  // ...****.......
+     0x000003C0,  // .....****.....
+     0x000000F0,  // .......****...
+     0x0000003C,  // .........****.
+     0x0000003C,  // .........****.
+     0x000000F0,  // .......****...
+     0x000003C0,  // .....****.....
+     0x00000F00,  // ...****.......
+     0x00003C00,  // .****.........
+     0x00003000,  // .**...........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 63
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00000E70,  // ...***..***...
+     0x00001C38,  // ..***....***..
+     0x00001C38,  // ..***....***..
+     0x00000C38,  // ...**....***..
+     0x00000038,  // .........***..
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000380,  // .....***......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000300,  // .....**.......
+     0x00000780,  // ....****......
+     0x00000780,  // ....****......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 64
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003018,  // .**.......**..
+     0x000030F8,  // .**....*****..
+     0x00003198,  // .**...**..**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x000031B8,  // .**...**.***..
+     0x000030EC,  // .**....***.**.
+     0x00003000,  // .**...........
+     0x00001800,  // ..**..........
+     0x00001808,  // ..**.......*..
+     0x00000E38,  // ...***...***..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 65
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000080,  // .......*......
+     0x000001C0,  // ......***.....
+     0x000001C0,  // ......***.....
+     0x00000140,  // ......*.*.....
+     0x00000360,  // .....**.**....
+     0x00000360,  // .....**.**....
+     0x00000220,  // .....*...*....
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000410,  // ....*.....*...
+     0x00000FF8,  // ...*********..
+     0x00000C18,  // ...**.....**..
+     0x00000808,  // ...*.......*..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00003C1E,  // .****.....****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 66
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FE0,  // ..********....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C30,  // ...**....**...
+     0x00000FE0,  // ...*******....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C18,  // ...**.....**..
+     0x00001FF0,  // ..*********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 67
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E8,  // .....*****.*..
+     0x00000E78,  // ...***..****..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003008,  // .**........*..
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00001808,  // ..**.......*..
+     0x00001818,  // ..**......**..
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 68
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003F80,  // .*******......
+     0x000018E0,  // ..**...***....
+     0x00001830,  // ..**.....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001830,  // ..**.....**...
+     0x000018E0,  // ..**...***....
+     0x00003F80,  // .*******......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 69
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FF8,  // .***********..
+     0x00001818,  // ..**......**..
+     0x00001808,  // ..**.......*..
+     0x00001808,  // ..**.......*..
+     0x00001800,  // ..**..........
+     0x00001880,  // ..**...*......
+     0x00001880,  // ..**...*......
+     0x00001F80,  // ..******......
+     0x00001880,  // ..**...*......
+     0x00001880,  // ..**...*......
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001808,  // ..**.......*..
+     0x00001808,  // ..**.......*..
+     0x00001818,  // ..**......**..
+     0x00003FF8,  // .***********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 70
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FF8,  // .***********..
+     0x00001818,  // ..**......**..
+     0x00001808,  // ..**.......*..
+     0x00001808,  // ..**.......*..
+     0x00001800,  // ..**..........
+     0x00001880,  // ..**...*......
+     0x00001880,  // ..**...*......
+     0x00001F80,  // ..******......
+     0x00001880,  // ..**...*......
+     0x00001880,  // ..**...*......
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00003E00,  // .*****........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E8,  // .....*****.*..
+     0x00000E78,  // ...***..****..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003008,  // .**........*..
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x0000307C,  // .**.....*****.
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000E38,  // ...***...***..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 72
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C3C,  // .****....****.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 73
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FF0,  // ...********...
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 74
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003F8,  // .....*******..
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x000018C0,  // ..**...**.....
+     0x00000F80,  // ...*****......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 75
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C3C,  // .****....****.
+     0x00001818,  // ..**......**..
+     0x00001830,  // ..**.....**...
+     0x00001860,  // ..**....**....
+     0x000018C0,  // ..**...**.....
+     0x00001980,  // ..**..**......
+     0x00001B00,  // ..**.**.......
+     0x00001F00,  // ..*****.......
+     0x00001D80,  // ..***.**......
+     0x00001980,  // ..**..**......
+     0x000018C0,  // ..**...**.....
+     0x00001860,  // ..**....**....
+     0x00001860,  // ..**....**....
+     0x00001830,  // ..**.....**...
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 76
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003F00,  // .******.......
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C08,  // ...**......*..
+     0x00000C08,  // ...**......*..
+     0x00000C08,  // ...**......*..
+     0x00000C18,  // ...**.....**..
+     0x00003FF8,  // .***********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 77
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000381C,  // .***......***.
+     0x00001818,  // ..**......**..
+     0x00001C38,  // ..***....***..
+     0x00001C38,  // ..***....***..
+     0x00001E78,  // ..****..****..
+     0x00001A58,  // ..**.*..*.**..
+     0x00001BD8,  // ..**.****.**..
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 78
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000383C,  // .***.....****.
+     0x00001C18,  // ..***.....**..
+     0x00001C18,  // ..***.....**..
+     0x00001E18,  // ..****....**..
+     0x00001A18,  // ..**.*....**..
+     0x00001B18,  // ..**.**...**..
+     0x00001918,  // ..**..*...**..
+     0x00001998,  // ..**..**..**..
+     0x00001898,  // ..**...*..**..
+     0x000018D8,  // ..**...**.**..
+     0x00001858,  // ..**....*.**..
+     0x00001878,  // ..**....****..
+     0x00001838,  // ..**.....***..
+     0x00001838,  // ..**.....***..
+     0x00001818,  // ..**......**..
+     0x00003C18,  // .****.....**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 79
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 80
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FE0,  // ..********....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C30,  // ...**....**...
+     0x00000FE0,  // ...*******....
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00001F00,  // ..*****.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 81
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x000000C0,  // .......**.....
+     0x00000060,  // ........**....
+     0x00000030,  // .........**...
+     0x0000001C,  // ..........***.
+     0x00000008,  // ...........*..
+     0x00000000,  // ..............
+  },
+  {             // 82
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FE0,  // ..********....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C30,  // ...**....**...
+     0x00000FE0,  // ...*******....
+     0x00000CC0,  // ...**..**.....
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00001F1C,  // ..*****...***.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 83
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E8,  // ....******.*..
+     0x00000C38,  // ...**....***..
+     0x00001818,  // ..**......**..
+     0x00001808,  // ..**.......*..
+     0x00001808,  // ..**.......*..
+     0x00000C00,  // ...**.........
+     0x00000F00,  // ...****.......
+     0x000003C0,  // .....****.....
+     0x000000F0,  // .......****...
+     0x00000030,  // .........**...
+     0x00000018,  // ..........**..
+     0x00001018,  // ..*.......**..
+     0x00001018,  // ..*.......**..
+     0x00001818,  // ..**......**..
+     0x00001C30,  // ..***....**...
+     0x000017E0,  // ..*.******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 84
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x0000318C,  // .**...**...**.
+     0x00002184,  // .*....**....*.
+     0x00002184,  // .*....**....*.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C3C,  // .****....****.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 86
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C1E,  // .****.....****
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00000808,  // ...*.......*..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000410,  // ....*.....*...
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000220,  // .....*...*....
+     0x00000360,  // .....**.**....
+     0x00000360,  // .....**.**....
+     0x00000140,  // ......*.*.....
+     0x000001C0,  // ......***.....
+     0x000001C0,  // ......***.....
+     0x00000080,  // .......*......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 87
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003E3E,  // .*****...*****
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000188C,  // ..**...*...**.
+     0x00000888,  // ...*...*...*..
+     0x00000DD8,  // ...**.***.**..
+     0x00000DD8,  // ...**.***.**..
+     0x00000D58,  // ...**.*.*.**..
+     0x00000D58,  // ...**.*.*.**..
+     0x00000F78,  // ...****.****..
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 88
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003E3E,  // .*****...*****
+     0x0000180C,  // ..**.......**.
+     0x00000C18,  // ...**.....**..
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000360,  // .....**.**....
+     0x000001C0,  // ......***.....
+     0x00000080,  // .......*......
+     0x000001C0,  // ......***.....
+     0x00000360,  // .....**.**....
+     0x00000630,  // ....**...**...
+     0x00000630,  // ....**...**...
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x0000180C,  // ..**.......**.
+     0x00003E3E,  // .*****...*****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 89
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C3C,  // .****....****.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 90
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001030,  // ..*......**...
+     0x00001030,  // ..*......**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000C08,  // ...**......*..
+     0x00000C08,  // ...**......*..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 91
+     14, 26,
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 92
+     14, 26,
+     0x00000000,  // ..............
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 93
+     14, 26,
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 94
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x00000660,  // ....**..**....
+     0x00000C30,  // ...**....**...
+     0x00001818,  // ..**......**..
+     0x00001008,  // ..*........*..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 95
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 96
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000700,  // ....***.......
+     0x00000780,  // ....****......
+     0x00000780,  // ....****......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 97
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00000030,  // .........**...
+     0x000007F0,  // ....*******...
+     0x00001C30,  // ..***....**...
+     0x00003030,  // .**......**...
+     0x00003070,  // .**.....***...
+     0x000039BC,  // .***..**.****.
+     0x00001F18,  // ..*****...**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 98
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00003800,  // .***..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001BC0,  // ..**.****.....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x00001BC0,  // ..**.****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 99
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007F0,  // ....*******...
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 100
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000030,  // .........**...
+     0x00000070,  // ........***...
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x000007B0,  // ....****.**...
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00001830,  // ..**.....**...
+     0x00001C7C,  // ..***...*****.
+     0x00000798,  // ....****..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 101
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003FF8,  // .***********..
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00001818,  // ..**......**..
+     0x00001C38,  // ..***....***..
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 102
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000F8,  // .......*****..
+     0x00000198,  // ......**..**..
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00001FF0,  // ..*********...
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00001FF0,  // ..*********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 103
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000F80,  // ...*****......
+     0x000018F8,  // ..**...*****..
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x000018C0,  // ..**...**.....
+     0x00000F80,  // ...*****......
+     0x00001800,  // ..**..........
+     0x00000FE0,  // ...*******....
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001C70,  // ..***...***...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+  },
+  {             // 104
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00003800,  // .***..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001BE0,  // ..**.*****....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00003C78,  // .****...****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 105
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00001F80,  // ..******......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00001FF8,  // ..**********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 106
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000001E0,  // ......****....
+     0x000000C0,  // .......**.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x000007E0,  // ....******....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00003060,  // .**.....**....
+     0x000038C0,  // .***...**.....
+     0x00000F80,  // ...*****......
+     0x00000000,  // ..............
+  },
+  {             // 107
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00003800,  // .***..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x000018F8,  // ..**...*****..
+     0x00001860,  // ..**....**....
+     0x000018C0,  // ..**...**.....
+     0x00001980,  // ..**..**......
+     0x00001B00,  // ..**.**.......
+     0x00001F80,  // ..******......
+     0x000018C0,  // ..**...**.....
+     0x00001860,  // ..**....**....
+     0x00001834,  // ..**.....**.*.
+     0x00003E18,  // .*****....**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 108
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000F80,  // ...*****......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 109
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003778,  // .**.***.****..
+     0x000079CC,  // ****..***..**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00007BDE,  // ****.****.****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 110
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001BE0,  // ..**.*****....
+     0x00003C70,  // .****...***...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00003C78,  // .****...****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 111
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 112
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001BC0,  // ..**.****.....
+     0x00003C70,  // .****...***...
+     0x00001830,  // ..**.....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x00001BC0,  // ..**.****.....
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00003E00,  // .*****........
+     0x00000000,  // ..............
+  },
+  {             // 113
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000790,  // ....****..*...
+     0x00001C70,  // ..***...***...
+     0x00001830,  // ..**.....**...
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00001830,  // ..**.....**...
+     0x00001C70,  // ..***...***...
+     0x000007B0,  // ....****.**...
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x00000030,  // .........**...
+     0x000000F8,  // .......*****..
+     0x00000000,  // ..............
+  },
+  {             // 114
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000670,  // ....**..***...
+     0x00001EB8,  // ..****.*.***..
+     0x00000730,  // ....***..**...
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00001FC0,  // ..*******.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 115
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00001C78,  // ..***...****..
+     0x00001818,  // ..**......**..
+     0x00001C00,  // ..***.........
+     0x00000F80,  // ...*****......
+     0x000001F0,  // ......*****...
+     0x00000038,  // .........***..
+     0x00001818,  // ..**......**..
+     0x00001E38,  // ..****...***..
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 116
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00003FF0,  // .**********...
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x0000060C,  // ....**.....**.
+     0x00000738,  // ....***..***..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 117
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001830,  // ..**.....**...
+     0x00003870,  // .***....***...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001C7C,  // ..***...*****.
+     0x00000F98,  // ...*****..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 118
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C78,  // .****...****..
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x000006C0,  // ....**.**.....
+     0x000006C0,  // ....**.**.....
+     0x00000380,  // .....***......
+     0x00000380,  // .....***......
+     0x00000100,  // ......*.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 119
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000783C,  // ****.....****.
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001110,  // ..*...*...*...
+     0x00001BB0,  // ..**.***.**...
+     0x00001BB0,  // ..**.***.**...
+     0x00000AA0,  // ...*.*.*.*....
+     0x00000EE0,  // ...***.***....
+     0x00000EE0,  // ...***.***....
+     0x00000440,  // ....*...*.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C78,  // .****...****..
+     0x00001830,  // ..**.....**...
+     0x00000C60,  // ...**...**....
+     0x000006C0,  // ....**.**.....
+     0x00000380,  // .....***......
+     0x00000380,  // .....***......
+     0x000006C0,  // ....**.**.....
+     0x00000C60,  // ...**...**....
+     0x00001830,  // ..**.....**...
+     0x00003C78,  // .****...****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 121
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C78,  // .****...****..
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x00000660,  // ....**..**....
+     0x000006C0,  // ....**.**.....
+     0x000002C0,  // .....*.**.....
+     0x00000380,  // .....***......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00003300,  // .**..**.......
+     0x00003600,  // .**.**........
+     0x00001C00,  // ..***.........
+     0x00000000,  // ..............
+  },
+  {             // 122
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF0,  // ..*********...
+     0x00001830,  // ..**.....**...
+     0x00001060,  // ..*.....**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000C10,  // ...**.....*...
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 123
+     14, 26,
+     0x00000000,  // ..............
+     0x00000070,  // ........***...
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000E00,  // ...***........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x00000070,  // ........***...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 124
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 125
+     14, 26,
+     0x00000000,  // ..............
+     0x00000E00,  // ...***........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x00000070,  // ........***...
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000E00,  // ...***........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 126
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000F0C,  // ...****....**.
+     0x00001F9C,  // ..******..***.
+     0x000039F8,  // .***..******..
+     0x000030F0,  // .**....****...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 127
+     14, 26,
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+     0x00005554,  // *.*.*.*.*.*.*.
+     0x00002AAA,  // .*.*.*.*.*.*.*
+  },
+  {             // 128
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 161
+     14, 26,
+     0x00000000,  // ..............
+     0x000000E0,  // .......***....
+     0x000000E0,  // .......***....
+     0x000000E0,  // .......***....
+     0x00000080,  // .......*......
+     0x000000C0,  // .......**.....
+     0x00000060,  // ........**....
+     0x00000030,  // .........**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 162
+     14, 26,
+     0x00000000,  // ..............
+     0x000001C0,  // ......***.....
+     0x000001C0,  // ......***.....
+     0x000001C0,  // ......***.....
+     0x00000040,  // ........*.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 163
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000670,  // ....**..***...
+     0x00000C30,  // ...**....**...
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00003FC0,  // .********.....
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000E00,  // ...***........
+     0x00001F98,  // ..******..**..
+     0x000030F0,  // .**....****...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 164
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 165
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 166
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 167
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00000E38,  // ...***...***..
+     0x00001C18,  // ..***.....**..
+     0x00001C18,  // ..***.....**..
+     0x00000E00,  // ...***........
+     0x00000700,  // ....***.......
+     0x00000B80,  // ...*.***......
+     0x000018E0,  // ..**...***....
+     0x00001870,  // ..**....***...
+     0x00001C38,  // ..***....***..
+     0x00000E18,  // ...***....**..
+     0x00000718,  // ....***...**..
+     0x000001D0,  // ......***.*...
+     0x000000E0,  // .......***....
+     0x00000070,  // ........***...
+     0x00001838,  // ..**.....***..
+     0x00001838,  // ..**.....***..
+     0x00001C70,  // ..***...***...
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 168
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001E78,  // ..****..****..
+     0x00000C30,  // ...**....**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 169
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003F0,  // .....******...
+     0x00000618,  // ....**....**..
+     0x00000CEC,  // ...**..***.**.
+     0x00000D2C,  // ...**.*..*.**.
+     0x00000D0C,  // ...**.*....**.
+     0x00000D0C,  // ...**.*....**.
+     0x00000D2C,  // ...**.*..*.**.
+     0x00000CCC,  // ...**..**..**.
+     0x00000618,  // ....**....**..
+     0x000003F0,  // .....******...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 170
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 171
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000084,  // .......*....*.
+     0x0000018C,  // ......**...**.
+     0x00000318,  // .....**...**..
+     0x00000630,  // ....**...**...
+     0x00000C60,  // ...**...**....
+     0x000018C0,  // ..**...**.....
+     0x000018C0,  // ..**...**.....
+     0x00000C60,  // ...**...**....
+     0x00000630,  // ....**...**...
+     0x00000318,  // .....**...**..
+     0x0000018C,  // ......**...**.
+     0x00000084,  // .......*....*.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 172
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 173
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FF0,  // ...********...
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 174
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 175
+     14, 26,
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 176
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000660,  // ....**..**....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 177
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 178
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000C20,  // ...**....*....
+     0x00000FE0,  // ...*******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 179
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x00000060,  // ........**....
+     0x000001C0,  // ......***.....
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 180
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000100,  // ......*.......
+     0x00000100,  // ......*.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 181
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000080,  // .......*......
+     0x00000C98,  // ...**..*..**..
+     0x00001E3C,  // ..****...****.
+     0x00000C18,  // ...**.....**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 182
+     14, 26,
+     0x00000000,  // ..............
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000400,  // ....*.........
+     0x00000580,  // ....*.**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000002C0,  // .....*.**.....
+     0x000006E0,  // ....**.***....
+     0x00000660,  // ....**..**....
+     0x00000460,  // ....*...**....
+     0x00000C30,  // ...**....**...
+     0x00000FF0,  // ...********...
+     0x00000830,  // ...*.....**...
+     0x00000818,  // ...*......**..
+     0x00001818,  // ..**......**..
+     0x0000181C,  // ..**......***.
+     0x00003C3E,  // .****....*****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 183
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 184
+     14, 26,
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001000,  // ..*...........
+     0x00001000,  // ..*...........
+     0x00000FFE,  // ...***********
+     0x00000606,  // ....**......**
+     0x00000602,  // ....**.......*
+     0x00000602,  // ....**.......*
+     0x00000600,  // ....**........
+     0x00000620,  // ....**...*....
+     0x00000620,  // ....**...*....
+     0x000007E0,  // ....******....
+     0x00000620,  // ....**...*....
+     0x00000620,  // ....**...*....
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000602,  // ....**.......*
+     0x00000602,  // ....**.......*
+     0x00000606,  // ....**......**
+     0x00000FFE,  // ...***********
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 185
+     14, 26,
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00002000,  // .*............
+     0x00002000,  // .*............
+     0x00001E1E,  // ..****....****
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000FFC,  // ...**********.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00001E1E,  // ..****....****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 186
+     14, 26,
+     0x00000000,  // ..............
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00002000,  // .*............
+     0x00002FF0,  // .*.********...
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 187
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00002100,  // .*....*.......
+     0x00003180,  // .**...**......
+     0x000018C0,  // ..**...**.....
+     0x00000C60,  // ...**...**....
+     0x00000630,  // ....**...**...
+     0x00000318,  // .....**...**..
+     0x00000318,  // .....**...**..
+     0x00000630,  // ....**...**...
+     0x00000C60,  // ...**...**....
+     0x000018C0,  // ..**...**.....
+     0x00003180,  // .**...**......
+     0x00002100,  // .*....*.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 188
+     14, 26,
+     0x00000000,  // ..............
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00002000,  // .*............
+     0x000023C0,  // .*...****.....
+     0x00000E70,  // ...***..***...
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 189
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C00,  // ...**.........
+     0x00003C00,  // .****.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C1C,  // ...**.....***.
+     0x00000C70,  // ...**...***...
+     0x000001C0,  // ......***.....
+     0x00000700,  // ....***.......
+     0x00001CF8,  // ..***..*****..
+     0x0000718C,  // ***...**...**.
+     0x0000018C,  // ......**...**.
+     0x0000000C,  // ...........**.
+     0x00000018,  // ..........**..
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000184,  // ......**....*.
+     0x000001FC,  // ......*******.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 190
+     14, 26,
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00002000,  // .*............
+     0x00002000,  // .*............
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00002664,  // .*..**..**..*.
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 191
+     14, 26,
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001000,  // ..*...........
+     0x00001000,  // ..*...........
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x00002244,  // .*...*..*...*.
+     0x00001E78,  // ..****..****..
+     0x00001E78,  // ..****..****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 192
+     14, 26,
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000C30,  // ...**....**...
+     0x00001E78,  // ..****..****..
+     0x00000C30,  // ...**....**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000700,  // ....***.......
+     0x00000980,  // ...*..**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000190,  // ......**..*...
+     0x000000E0,  // .......***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 193
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000002C0,  // .....*.**.....
+     0x000006E0,  // ....**.***....
+     0x00000660,  // ....**..**....
+     0x00000460,  // ....*...**....
+     0x00000C30,  // ...**....**...
+     0x00000FF0,  // ...********...
+     0x00000830,  // ...*.....**...
+     0x00000818,  // ...*......**..
+     0x00001818,  // ..**......**..
+     0x0000181C,  // ..**......***.
+     0x00003C3E,  // .****....*****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 194
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FE0,  // ..********....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C30,  // ...**....**...
+     0x00000FE0,  // ...*******....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C18,  // ...**.....**..
+     0x00001FF0,  // ..*********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 195
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00000C0C,  // ...**......**.
+     0x00000C04,  // ...**.......*.
+     0x00000C04,  // ...**.......*.
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00001F80,  // ..******......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 196
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000002C0,  // .....*.**.....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000460,  // ....*...**....
+     0x00000430,  // ....*....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000818,  // ...*......**..
+     0x00001818,  // ..**......**..
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 197
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00000C0C,  // ...**......**.
+     0x00000C04,  // ...**.......*.
+     0x00000C04,  // ...**.......*.
+     0x00000C00,  // ...**.........
+     0x00000C40,  // ...**...*.....
+     0x00000C40,  // ...**...*.....
+     0x00000FC0,  // ...******.....
+     0x00000C40,  // ...**...*.....
+     0x00000C40,  // ...**...*.....
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C04,  // ...**.......*.
+     0x00000C04,  // ...**.......*.
+     0x00000C0C,  // ...**......**.
+     0x00001FFC,  // ..***********.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 198
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001030,  // ..*......**...
+     0x00001030,  // ..*......**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000C08,  // ...**......*..
+     0x00000C08,  // ...**......*..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 199
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C3C,  // .****....****.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 200
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000342C,  // .**.*....*.**.
+     0x000037EC,  // .**.******.**.
+     0x000037EC,  // .**.******.**.
+     0x0000342C,  // .**.*....*.**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 201
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FF0,  // ...********...
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 202
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003C3C,  // .****....****.
+     0x00001818,  // ..**......**..
+     0x00001830,  // ..**.....**...
+     0x00001860,  // ..**....**....
+     0x000018C0,  // ..**...**.....
+     0x00001980,  // ..**..**......
+     0x00001B80,  // ..**.***......
+     0x00001FC0,  // ..*******.....
+     0x00001FC0,  // ..*******.....
+     0x00001CE0,  // ..***..***....
+     0x00001860,  // ..**....**....
+     0x00001870,  // ..**....***...
+     0x00001830,  // ..**.....**...
+     0x00001838,  // ..**.....***..
+     0x0000181C,  // ..**......***.
+     0x00003C3E,  // .****....*****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 203
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x000002C0,  // .....*.**.....
+     0x000006E0,  // ....**.***....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000818,  // ...*......**..
+     0x00001818,  // ..**......**..
+     0x0000181C,  // ..**......***.
+     0x00003C3E,  // .****....*****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 204
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000380E,  // .***.......***
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00001C1C,  // ..***.....***.
+     0x00001C1C,  // ..***.....***.
+     0x00001E3C,  // ..****...****.
+     0x0000162C,  // ..*.**...*.**.
+     0x0000162C,  // ..*.**...*.**.
+     0x0000176C,  // ..*.***.**.**.
+     0x0000134C,  // ..*..**.*..**.
+     0x0000134C,  // ..*..**.*..**.
+     0x000013CC,  // ..*..****..**.
+     0x0000118C,  // ..*...**...**.
+     0x0000118C,  // ..*...**...**.
+     0x0000399E,  // .***..**..****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 205
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000383C,  // .***.....****.
+     0x00001C18,  // ..***.....**..
+     0x00001C18,  // ..***.....**..
+     0x00001E18,  // ..****....**..
+     0x00001A18,  // ..**.*....**..
+     0x00001B18,  // ..**.**...**..
+     0x00001918,  // ..**..*...**..
+     0x00001998,  // ..**..**..**..
+     0x00001898,  // ..**...*..**..
+     0x000018D8,  // ..**...**.**..
+     0x00001858,  // ..**....*.**..
+     0x00001878,  // ..**....****..
+     0x00001838,  // ..**.....***..
+     0x00001838,  // ..**.....***..
+     0x00001818,  // ..**......**..
+     0x00003C18,  // .****.....**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 206
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001008,  // ..*........*..
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001008,  // ..*........*..
+     0x00001008,  // ..*........*..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000420,  // ....*....*....
+     0x000007E0,  // ....******....
+     0x000007E0,  // ....******....
+     0x00000420,  // ....*....*....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00002004,  // .*..........*.
+     0x00002004,  // .*..........*.
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00002004,  // .*..........*.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 207
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 208
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 209
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FE0,  // ..********....
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C30,  // ...**....**...
+     0x00000FE0,  // ...*******....
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00001F00,  // ..*****.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 210
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 211
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x0000180C,  // ..**.......**.
+     0x00001C04,  // ..***.......*.
+     0x00000C04,  // ...**.......*.
+     0x00000E00,  // ...***........
+     0x00000600,  // ....**........
+     0x00000700,  // ....***.......
+     0x00000380,  // .....***......
+     0x00000300,  // .....**.......
+     0x00000200,  // .....*........
+     0x00000600,  // ....**........
+     0x00000400,  // ....*.........
+     0x00000C04,  // ...**.......*.
+     0x00000804,  // ...*........*.
+     0x0000180C,  // ..**.......**.
+     0x00001FFC,  // ..***********.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 212
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x0000318C,  // .**...**...**.
+     0x00002184,  // .*....**....*.
+     0x00002184,  // .*....**....*.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 213
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00002664,  // .*..**..**..*.
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 214
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000007E0,  // ....******....
+     0x00001DB8,  // ..***.**.***..
+     0x00001998,  // ..**..**..**..
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00001998,  // ..**..**..**..
+     0x00001DB8,  // ..***.**.***..
+     0x000007E0,  // ....******....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 215
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003E3E,  // .*****...*****
+     0x00001C1C,  // ..***.....***.
+     0x00000C18,  // ...**.....**..
+     0x00000E30,  // ...***...**...
+     0x00000730,  // ....***..**...
+     0x00000360,  // .....**.**....
+     0x000003E0,  // .....*****....
+     0x000001C0,  // ......***.....
+     0x000001C0,  // ......***.....
+     0x000003E0,  // .....*****....
+     0x00000360,  // .....**.**....
+     0x00000670,  // ....**..***...
+     0x00000638,  // ....**...***..
+     0x00000C18,  // ...**.....**..
+     0x00001C1C,  // ..***.....***.
+     0x00003E3E,  // .*****...*****
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 216
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x0000318C,  // .**...**...**.
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00000DB0,  // ...**.**.**...
+     0x000007E0,  // ....******....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 217
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000E70,  // ...***..***...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x00002244,  // .*...*..*...*.
+     0x00001E78,  // ..****..****..
+     0x00001E78,  // ..****..****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 218
+     14, 26,
+     0x00000C30,  // ...**....**...
+     0x00001E78,  // ..****..****..
+     0x00000C30,  // ...**....**...
+     0x00000000,  // ..............
+     0x00000FF0,  // ...********...
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 219
+     14, 26,
+     0x00000C30,  // ...**....**...
+     0x00001E78,  // ..****..****..
+     0x00000C30,  // ...**....**...
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00003C3C,  // .****....****.
+     0x00002664,  // .*..**..**..*.
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000FF0,  // ...********...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 220
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000100,  // ......*.......
+     0x00000100,  // ......*.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000704,  // ....***.....*.
+     0x00001D8C,  // ..***.**...**.
+     0x000018C8,  // ..**...**..*..
+     0x000030D8,  // .**....**.**..
+     0x00003070,  // .**.....***...
+     0x00003070,  // .**.....***...
+     0x00003060,  // .**.....**....
+     0x000018E0,  // ..**...***....
+     0x00001DB4,  // ..***.**.**.*.
+     0x00000718,  // ....***...**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 221
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000630,  // ....**...**...
+     0x00000E30,  // ...***...**...
+     0x00000600,  // ....**........
+     0x000003C0,  // .....****.....
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00000C10,  // ...**.....*...
+     0x00000630,  // ....**...**...
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 222
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000040,  // ........*.....
+     0x00000040,  // ........*.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001DE0,  // ..***.****....
+     0x00002730,  // .*..***..**...
+     0x00002618,  // .*..**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000218,  // .....*....**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000008,  // ...........*..
+     0x00000000,  // ..............
+  },
+  {             // 223
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000100,  // ......*.......
+     0x00000100,  // ......*.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000700,  // ....***.......
+     0x00000980,  // ...*..**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000190,  // ......**..*...
+     0x000000E0,  // .......***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 224
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000080,  // .......*......
+     0x00000C98,  // ...**..*..**..
+     0x00001E3C,  // ..****...****.
+     0x00000C18,  // ...**.....**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001618,  // ..*.**....**..
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000730,  // ....***..**...
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 225
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000704,  // ....***.....*.
+     0x00001D8C,  // ..***.**...**.
+     0x000018C8,  // ..**...**..*..
+     0x000030D8,  // .**....**.**..
+     0x00003070,  // .**.....***...
+     0x00003070,  // .**.....***...
+     0x00003060,  // .**.....**....
+     0x000018E0,  // ..**...***....
+     0x00001DB4,  // ..***.**.**.*.
+     0x00000718,  // ....***...**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 226
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00000CE0,  // ...**..***....
+     0x00001870,  // ..**....***...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001860,  // ..**....**....
+     0x00001BE0,  // ..**.*****....
+     0x00001830,  // ..**.....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001C18,  // ..***.....**..
+     0x00001E30,  // ..****...**...
+     0x00001BE0,  // ..**.*****....
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001000,  // ..*...........
+     0x00000000,  // ..............
+  },
+  {             // 227
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000602,  // ....**.......*
+     0x00000F04,  // ...****.....*.
+     0x00001F8C,  // ..******...**.
+     0x00001198,  // ..*...**..**..
+     0x00000090,  // .......*..*...
+     0x000000B0,  // .......*.**...
+     0x000000A0,  // .......*.*....
+     0x000000E0,  // .......***....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x000001C0,  // ......***.....
+     0x00000380,  // .....***......
+     0x00000380,  // .....***......
+     0x00000380,  // .....***......
+     0x00000100,  // ......*.......
+     0x00000000,  // ..............
+  },
+  {             // 228
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000660,  // ....**..**....
+     0x00000630,  // ....**...**...
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000003E0,  // .....*****....
+     0x00000E70,  // ...***..***...
+     0x00000C30,  // ...**....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000E70,  // ...***..***...
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 229
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000630,  // ....**...**...
+     0x00000E30,  // ...***...**...
+     0x00000600,  // ....**........
+     0x000003C0,  // .....****.....
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00000C10,  // ...**.....*...
+     0x00000630,  // ....**...**...
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 230
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000338,  // .....**..***..
+     0x000001F8,  // ......******..
+     0x000003F0,  // .....******...
+     0x00000F00,  // ...****.......
+     0x00001C00,  // ..***.........
+     0x00001800,  // ..**..........
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x00001800,  // ..**..........
+     0x00001C00,  // ..***.........
+     0x00000F00,  // ...****.......
+     0x000003C0,  // .....****.....
+     0x000000E0,  // .......***....
+     0x00000030,  // .........**...
+     0x00000010,  // ..........*...
+     0x00000190,  // ......**..*...
+     0x000001B0,  // ......**.**...
+     0x000000E0,  // .......***....
+     0x00000000,  // ..............
+  },
+  {             // 231
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001DE0,  // ..***.****....
+     0x00002730,  // .*..***..**...
+     0x00002618,  // .*..**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000218,  // .....*....**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000008,  // ...........*..
+     0x00000000,  // ..............
+  },
+  {             // 232
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000660,  // ....**..**....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 233
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000700,  // ....***.......
+     0x00000980,  // ...*..**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000190,  // ......**..*...
+     0x000000E0,  // .......***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 234
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001830,  // ..**.....**...
+     0x00003870,  // .***....***...
+     0x000018C0,  // ..**...**.....
+     0x00001980,  // ..**..**......
+     0x00001B00,  // ..**.**.......
+     0x00001F80,  // ..******......
+     0x000019C0,  // ..**..***.....
+     0x000018E0,  // ..**...***....
+     0x00001874,  // ..**....***.*.
+     0x00003E38,  // .*****...***..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 235
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00003C00,  // .****.........
+     0x00002C00,  // .*.**.........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000300,  // .....**.......
+     0x00000380,  // .....***......
+     0x00000780,  // ....****......
+     0x00000680,  // ....**.*......
+     0x00000CC0,  // ...**..**.....
+     0x00000CC0,  // ...**..**.....
+     0x00001860,  // ..**....**....
+     0x00001864,  // ..**....**..*.
+     0x0000303C,  // .**......****.
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 236
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000810,  // ...*......*...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001830,  // ..**.....**...
+     0x00001874,  // ..**....***.*.
+     0x00001CDC,  // ..***..**.***.
+     0x00001798,  // ..*.****..**..
+     0x00001000,  // ..*...........
+     0x00001000,  // ..*...........
+     0x00001000,  // ..*...........
+     0x00001000,  // ..*...........
+     0x00001000,  // ..*...........
+     0x00000000,  // ..............
+  },
+  {             // 237
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001C18,  // ..***.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000618,  // ....**....**..
+     0x00000610,  // ....**....*...
+     0x00000330,  // .....**..**...
+     0x00000320,  // .....**..*....
+     0x000001A0,  // ......**.*....
+     0x000001E0,  // ......****....
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 238
+     14, 26,
+     0x00000000,  // ..............
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000370,  // .....**.***...
+     0x000001F0,  // ......*****...
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x00000600,  // ....**........
+     0x000003F0,  // .....******...
+     0x000007E0,  // ....******....
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001C00,  // ..***.........
+     0x00000E00,  // ...***........
+     0x00000780,  // ....****......
+     0x000001E0,  // ......****....
+     0x00000030,  // .........**...
+     0x00000010,  // ..........*...
+     0x00000310,  // .....**...*...
+     0x00000330,  // .....**..**...
+     0x000001E0,  // ......****....
+     0x00000000,  // ..............
+  },
+  {             // 239
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000E38,  // ...***...***..
+     0x00000C18,  // ...**.....**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00000C18,  // ...**.....**..
+     0x00000E38,  // ...***...***..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 240
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FFC,  // ...**********.
+     0x00001FF8,  // ..**********..
+     0x00003220,  // .**..*...*....
+     0x00002220,  // .*...*...*....
+     0x00000220,  // .....*...*....
+     0x00000620,  // ....**...*....
+     0x00000660,  // ....**..**....
+     0x00000E64,  // ...***..**..*.
+     0x00000C78,  // ...**...****..
+     0x00001830,  // ..**.....**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 241
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000E38,  // ...***...***..
+     0x00000C18,  // ...**.....**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001C18,  // ..***.....**..
+     0x00001E38,  // ..****...***..
+     0x00001BE0,  // ..**.*****....
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+  },
+  {             // 242
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // ......*****...
+     0x000003F8,  // .....*******..
+     0x00000708,  // ....***....*..
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000E00,  // ...***........
+     0x000007E0,  // ....******....
+     0x000003F0,  // .....******...
+     0x00000008,  // ...........*..
+     0x00000008,  // ...........*..
+     0x00000018,  // ..........**..
+     0x000001F0,  // ......*****...
+     0x000001E0,  // ......****....
+     0x00000000,  // ..............
+  },
+  {             // 243
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003FE,  // .....*********
+     0x00000E30,  // ...***...**...
+     0x00000C18,  // ...**.....**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00000C18,  // ...**.....**..
+     0x00000E38,  // ...***...***..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 244
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007FC,  // ....*********.
+     0x00000FF8,  // ...*********..
+     0x00001880,  // ..**...*......
+     0x00001080,  // ..*....*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000084,  // .......*....*.
+     0x000000F8,  // .......*****..
+     0x00000070,  // ........***...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 245
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001618,  // ..*.**....**..
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000730,  // ....***..**...
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 246
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x000003E0,  // .....*****....
+     0x00000EB8,  // ...***.*.***..
+     0x00000C98,  // ...**..*..**..
+     0x0000188C,  // ..**...*...**.
+     0x0000188C,  // ..**...*...**.
+     0x0000188C,  // ..**...*...**.
+     0x0000188C,  // ..**...*...**.
+     0x00000C98,  // ...**..*..**..
+     0x00000EB8,  // ...***.*.***..
+     0x000003E0,  // .....*****....
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000000,  // ..............
+  },
+  {             // 247
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // ..**.......**.
+     0x00003C18,  // .****.....**..
+     0x00002630,  // .*..**...**...
+     0x00000660,  // ....**..**....
+     0x00000360,  // .....**.**....
+     0x000003C0,  // .....****.....
+     0x000001C0,  // ......***.....
+     0x00000380,  // .....***......
+     0x00000380,  // .....***......
+     0x000007C0,  // ....*****.....
+     0x000006C0,  // ....**.**.....
+     0x00000C60,  // ...**...**....
+     0x00001C64,  // ..***...**..*.
+     0x0000183C,  // ..**.....****.
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+  },
+  {             // 248
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x0000388E,  // .***...*...***
+     0x00001C9C,  // ..***..*..***.
+     0x00000C98,  // ...**..*..**..
+     0x00000C98,  // ...**..*..**..
+     0x00000C98,  // ...**..*..**..
+     0x00000C98,  // ...**..*..**..
+     0x00000C98,  // ...**..*..**..
+     0x000006B0,  // ....**.*.**...
+     0x000006B0,  // ....**.*.**...
+     0x000003E0,  // .....*****....
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000000,  // ..............
+  },
+  {             // 249
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000399C,  // .***..**..***.
+     0x00001FF8,  // ..**********..
+     0x00000E70,  // ...***..***...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 250
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001E78,  // ..****..****..
+     0x00000C30,  // ...**....**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000700,  // ....***.......
+     0x00000980,  // ...*..**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000190,  // ......**..*...
+     0x000000E0,  // .......***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 251
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000630,  // ....**...**...
+     0x00000F78,  // ...****.****..
+     0x00000630,  // ....**...**...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001618,  // ..*.**....**..
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000730,  // ....***..**...
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 252
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000E38,  // ...***...***..
+     0x00000C18,  // ...**.....**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00000C18,  // ...**.....**..
+     0x00000E38,  // ...***...***..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 253
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x00000060,  // ........**....
+     0x00000040,  // ........*.....
+     0x00000040,  // ........*.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001618,  // ..*.**....**..
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x0000060C,  // ....**.....**.
+     0x00000618,  // ....**....**..
+     0x00000618,  // ....**....**..
+     0x00000730,  // ....***..**...
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 254
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // .......**.....
+     0x000000C0,  // .......**.....
+     0x00000080,  // .......*......
+     0x00000080,  // .......*......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000399C,  // .***..**..***.
+     0x00001FF8,  // ..**********..
+     0x00000E70,  // ...***..***...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 255
+     14, 26,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  };
diff --git a/fontfix.c b/fontfix.c
index 67eb1621f..5c85e2ac1 100644
--- a/fontfix.c
+++ b/fontfix.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix[][28] = {
+cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 32
      15, 26,
      0x00000000,  // ...............
diff --git a/fontosd-iso8859-7.c b/fontosd-iso8859-7.c
new file mode 100644
index 000000000..228feedc1
--- /dev/null
+++ b/fontosd-iso8859-7.c
@@ -0,0 +1,5826 @@
+cFont::tPixelData FontOsd_iso8859_7[][25] = {
+  {             // 32
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 33
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 34
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000738,  // ..***..***..
+     0x00000738,  // ..***..***..
+     0x00000738,  // ..***..***..
+     0x00000738,  // ..***..***..
+     0x00000210,  // ...*....*...
+     0x00000210,  // ...*....*...
+     0x00000210,  // ...*....*...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 35
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 36
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C08,  // .**......*..
+     0x00000E00,  // .***........
+     0x00000700,  // ..***.......
+     0x000003C0,  // ...****.....
+     0x000000F0,  // .....****...
+     0x00000038,  // .......***..
+     0x0000001C,  // ........***.
+     0x0000080C,  // .*.......**.
+     0x00000C0C,  // .**......**.
+     0x00000E18,  // .***....**..
+     0x000007F0,  // ..*******...
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 37
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000078C,  // ..****...**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CD8,  // .**..**.**..
+     0x00000CD8,  // .**..**.**..
+     0x000007B0,  // ..****.**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x000001BC,  // ....**.****.
+     0x00000366,  // ...**.**..**
+     0x00000366,  // ...**.**..**
+     0x00000666,  // ..**..**..**
+     0x0000063C,  // ..**...****.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 38
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001C0,  // ....***.....
+     0x00000360,  // ...**.**....
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000360,  // ...**.**....
+     0x000001C0,  // ....***.....
+     0x00000380,  // ...***......
+     0x000006C4,  // ..**.**...*.
+     0x00000C6C,  // .**...**.**.
+     0x00000C68,  // .**...**.*..
+     0x00000C38,  // .**....***..
+     0x00000C30,  // .**....**...
+     0x00000678,  // ..**..****..
+     0x000003CC,  // ...****..**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 39
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 40
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000060,  // ......**....
+     0x00000030,  // .......**...
+     0x00000018,  // ........**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 41
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000300,  // ...**.......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 42
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000CCC,  // .**..**..**.
+     0x00000EDC,  // .***.**.***.
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000EDC,  // .***.**.***.
+     0x00000CCC,  // .**..**..**.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 43
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 44
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 45
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 46
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 47
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 48
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000738,  // ..***..***..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 49
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000001E0,  // ....****....
+     0x00000360,  // ...**.**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 50
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000604,  // ..**......*.
+     0x0000060C,  // ..**.....**.
+     0x000007FC,  // ..*********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 51
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001F0,  // ....*****...
+     0x00000018,  // ........**..
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000618,  // ..**....**..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 52
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000198,  // ....**..**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007FE,  // ..**********
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 53
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x000003F0,  // ...******...
+     0x00000018,  // ........**..
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000618,  // ..**....**..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 54
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000038,  // .......***..
+     0x000000E0,  // .....***....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x000006F0,  // ..**.****...
+     0x00000718,  // ..***...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 55
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 56
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 57
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000031C,  // ...**...***.
+     0x000001EC,  // ....****.**.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x000000E0,  // .....***....
+     0x00000380,  // ...***......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 58
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 59
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 60
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000004,  // ..........*.
+     0x0000001C,  // ........***.
+     0x00000078,  // ......****..
+     0x000001E0,  // ....****....
+     0x00000780,  // ..****......
+     0x00000E00,  // .***........
+     0x00000E00,  // .***........
+     0x00000780,  // ..****......
+     0x000001E0,  // ....****....
+     0x00000078,  // ......****..
+     0x0000001C,  // ........***.
+     0x00000004,  // ..........*.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 61
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 62
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000800,  // .*..........
+     0x00000E00,  // .***........
+     0x00000780,  // ..****......
+     0x000001E0,  // ....****....
+     0x00000078,  // ......****..
+     0x0000001C,  // ........***.
+     0x0000001C,  // ........***.
+     0x00000078,  // ......****..
+     0x000001E0,  // ....****....
+     0x00000780,  // ..****......
+     0x00000E00,  // .***........
+     0x00000800,  // .*..........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 63
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000738,  // ..***..***..
+     0x0000071C,  // ..***...***.
+     0x0000061C,  // ..**....***.
+     0x0000001C,  // ........***.
+     0x00000038,  // .......***..
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 64
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000718,  // ..***...**..
+     0x0000060C,  // ..**.....**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C7C,  // .**...*****.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000C76,  // .**...***.**
+     0x00000C00,  // .**.........
+     0x00000600,  // ..**........
+     0x0000070C,  // ..***....**.
+     0x000001F8,  // ....******..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 65
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001E1E,  // ****....****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 66
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FE0,  // .*******....
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x000007F0,  // ..*******...
+     0x00000618,  // ..**....**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 67
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F4,  // ....*****.*.
+     0x0000031C,  // ...**...***.
+     0x0000060C,  // ..**.....**.
+     0x00000604,  // ..**......*.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C04,  // .**.......*.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 68
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FE0,  // .*******....
+     0x00000638,  // ..**...***..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000638,  // ..**...***..
+     0x00000FE0,  // .*******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 69
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x0000060C,  // ..**.....**.
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x00000620,  // ..**...*....
+     0x00000620,  // ..**...*....
+     0x000007E0,  // ..******....
+     0x00000620,  // ..**...*....
+     0x00000620,  // ..**...*....
+     0x00000600,  // ..**........
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x0000060C,  // ..**.....**.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 70
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x0000060C,  // ..**.....**.
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x00000620,  // ..**...*....
+     0x00000620,  // ..**...*....
+     0x000007E0,  // ..******....
+     0x00000620,  // ..**...*....
+     0x00000620,  // ..**...*....
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000F80,  // .*****......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 71
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F4,  // ....*****.*.
+     0x0000031C,  // ...**...***.
+     0x0000060C,  // ..**.....**.
+     0x00000604,  // ..**......*.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C3E,  // .**....*****
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000031C,  // ...**...***.
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 72
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x000007FC,  // ..*********.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 73
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007F8,  // ..********..
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 74
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001FC,  // ....*******.
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000660,  // ..**..**....
+     0x000003C0,  // ...****.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 75
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000660,  // ..**..**....
+     0x000006C0,  // ..**.**.....
+     0x000007C0,  // ..*****.....
+     0x00000760,  // ..***.**....
+     0x00000660,  // ..**..**....
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x0000061C,  // ..**....***.
+     0x00000F0E,  // .****....***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 76
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F00,  // .****.......
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x0000060C,  // ..**.....**.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 77
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E0E,  // .***.....***
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x0000071C,  // ..***...***.
+     0x000007BC,  // ..****.****.
+     0x000006AC,  // ..**.*.*.**.
+     0x000006EC,  // ..**.***.**.
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 78
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E1E,  // .***....****
+     0x0000070C,  // ..***....**.
+     0x0000070C,  // ..***....**.
+     0x0000078C,  // ..****...**.
+     0x0000068C,  // ..**.*...**.
+     0x000006CC,  // ..**.**..**.
+     0x000006CC,  // ..**.**..**.
+     0x0000066C,  // ..**..**.**.
+     0x0000066C,  // ..**..**.**.
+     0x0000062C,  // ..**...*.**.
+     0x0000063C,  // ..**...****.
+     0x0000061C,  // ..**....***.
+     0x0000061C,  // ..**....***.
+     0x00000F0C,  // .****....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 79
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 80
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000618,  // ..**....**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x000007F0,  // ..*******...
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000F80,  // .*****......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 81
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000030,  // .......**...
+     0x00000018,  // ........**..
+     0x0000000E,  // .........***
+     0x00000004,  // ..........*.
+     0x00000000,  // ............
+  },
+  {             // 82
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000618,  // ..**....**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x000007F0,  // ..*******...
+     0x00000660,  // ..**..**....
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x0000061C,  // ..**....***.
+     0x00000F0E,  // .****....***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 83
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E8,  // ...*****.*..
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C08,  // .**......*..
+     0x00000C00,  // .**.........
+     0x00000700,  // ..***.......
+     0x000003C0,  // ...****.....
+     0x000000F0,  // .....****...
+     0x00000038,  // .......***..
+     0x0000000C,  // .........**.
+     0x0000080C,  // .*.......**.
+     0x00000C0C,  // .**......**.
+     0x00000E18,  // .***....**..
+     0x00000BF0,  // .*.******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 84
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000CCC,  // .**..**..**.
+     0x000008C4,  // .*...**...*.
+     0x000008C4,  // .*...**...*.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 86
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001E1E,  // ****....****
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 87
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x000006EC,  // ..**.***.**.
+     0x000006EC,  // ..**.***.**.
+     0x000006AC,  // ..**.*.*.**.
+     0x000003B8,  // ...***.***..
+     0x000003B8,  // ...***.***..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 88
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 89
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001E1E,  // ****....****
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 90
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000818,  // .*......**..
+     0x00000830,  // .*.....**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000304,  // ...**.....*.
+     0x00000604,  // ..**......*.
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 91
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000F8,  // .....*****..
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000F8,  // .....*****..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 92
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 93
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 94
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000210,  // ...*....*...
+     0x00000408,  // ..*......*..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 95
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001FFE,  // ************
+     0x00001FFE,  // ************
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 96
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 97
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000018,  // ........**..
+     0x000003F8,  // ...*******..
+     0x00000618,  // ..**....**..
+     0x00000C18,  // .**.....**..
+     0x00000E7C,  // .***..*****.
+     0x000007D8,  // ..*****.**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 98
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x000006F0,  // ..**.****...
+     0x0000079C,  // ..****..***.
+     0x0000070C,  // ..***....**.
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x0000070C,  // ..***....**.
+     0x0000079C,  // ..****..***.
+     0x000006F0,  // ..**.****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 99
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000FC,  // .....******.
+     0x0000038C,  // ...***...**.
+     0x0000030C,  // ...**....**.
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x0000030C,  // ...**....**.
+     0x0000039C,  // ...***..***.
+     0x000000F0,  // .....****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 100
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000000C,  // .........**.
+     0x0000001C,  // ........***.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x000001EC,  // ....****.**.
+     0x0000073C,  // ..***..****.
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x0000073E,  // ..***..*****
+     0x000001EC,  // ....****.**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 101
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000C00,  // .**.........
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 102
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000078,  // ......****..
+     0x000000CC,  // .....**..**.
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000FF8,  // .*********..
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000FF8,  // .*********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 103
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x0000063C,  // ..**...****.
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000630,  // ..**...**...
+     0x000003E0,  // ...*****....
+     0x00000600,  // ..**........
+     0x000003F8,  // ...*******..
+     0x0000060C,  // ..**.....**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+  },
+  {             // 104
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x000006F0,  // ..**.****...
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 105
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000000F0,  // .....****...
+     0x00000060,  // ......**....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000003E0,  // ...*****....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000003FC,  // ...********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 106
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000000F0,  // .....****...
+     0x00000060,  // ......**....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000003E0,  // ...*****....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00001860,  // **....**....
+     0x00001CC0,  // ***..**.....
+     0x00000780,  // ..****......
+     0x00000000,  // ............
+  },
+  {             // 107
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x0000067C,  // ..**..*****.
+     0x00000630,  // ..**...**...
+     0x00000660,  // ..**..**....
+     0x000006C0,  // ..**.**.....
+     0x000007C0,  // ..*****.....
+     0x00000660,  // ..**..**....
+     0x00000630,  // ..**...**...
+     0x0000061A,  // ..**....**.*
+     0x00000F0C,  // .****....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 108
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000003C0,  // ...****.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 109
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000D98,  // .**.**..**..
+     0x00001EEC,  // ****.***.**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00001DDE,  // ***.***.****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 110
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000006F0,  // ..**.****...
+     0x00000F38,  // .****..***..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 111
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000738,  // ..***..***..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 112
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000006F0,  // ..**.****...
+     0x00000F9C,  // .*****..***.
+     0x0000070C,  // ..***....**.
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x0000070C,  // ..***....**.
+     0x0000079C,  // ..****..***.
+     0x000006F0,  // ..**.****...
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000F80,  // .*****......
+     0x00000000,  // ............
+  },
+  {             // 113
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E4,  // ....****..*.
+     0x0000073C,  // ..***..****.
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x0000073C,  // ..***..****.
+     0x000001EC,  // ....****.**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000003E,  // .......*****
+     0x00000000,  // ............
+  },
+  {             // 114
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000338,  // ...**..***..
+     0x00000F5C,  // .****.*.***.
+     0x00000398,  // ...***..**..
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000FE0,  // .*******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 115
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000380,  // ...***......
+     0x000001F0,  // ....*****...
+     0x00000038,  // .......***..
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 116
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000FF8,  // .*********..
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x0000018C,  // ....**...**.
+     0x000000F8,  // .....*****..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 117
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000E38,  // .***...***..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x0000073C,  // ..***..****.
+     0x000003D8,  // ...****.**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 118
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 119
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x000006EC,  // ..**.***.**.
+     0x000002A8,  // ...*.*.*.*..
+     0x000003B8,  // ...***.***..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 120
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F3C,  // .****..****.
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x00000040,  // ......*.....
+     0x000000C0,  // .....**.....
+     0x00000C80,  // .**..*......
+     0x00000D80,  // .**.**......
+     0x00000700,  // ..***.......
+     0x00000000,  // ............
+  },
+  {             // 122
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000430,  // ..*....**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000308,  // ...**....*..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 123
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000038,  // .......***..
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000380,  // ...***......
+     0x000000C0,  // .....**.....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000038,  // .......***..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 124
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 125
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000380,  // ...***......
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000060,  // ......**....
+     0x00000038,  // .......***..
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000380,  // ...***......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 126
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000038C,  // ...***...**.
+     0x000007CC,  // ..*****..**.
+     0x00000CF8,  // .**..*****..
+     0x00000C70,  // .**...***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 127
+     12, 23,
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+     0x00000AAA,  // .*.*.*.*.*.*
+     0x00001554,  // *.*.*.*.*.*.
+  },
+  {             // 128
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 161
+     12, 23,
+     0x00000000,  // ............
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x00000080,  // .....*......
+     0x000000C0,  // .....**.....
+     0x00000060,  // ......**....
+     0x00000030,  // .......**...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 162
+     12, 23,
+     0x00000000,  // ............
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x00000020,  // .......*....
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 163
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000338,  // ...**..***..
+     0x00000618,  // ..**....**..
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000FC0,  // .******.....
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000FCC,  // .******..**.
+     0x00000CF8,  // .**..*****..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 164
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 165
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 166
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 167
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000718,  // ..***...**..
+     0x00000380,  // ...***......
+     0x000001C0,  // ....***.....
+     0x000002E0,  // ...*.***....
+     0x00000670,  // ..**..***...
+     0x00000638,  // ..**...***..
+     0x00000718,  // ..***...**..
+     0x00000398,  // ...***..**..
+     0x000001D0,  // ....***.*...
+     0x000000E0,  // .....***....
+     0x00000070,  // ......***...
+     0x00000638,  // ..**...***..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 168
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 169
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x00000618,  // ..**....**..
+     0x00000CEC,  // .**..***.**.
+     0x00000D2C,  // .**.*..*.**.
+     0x00000D0C,  // .**.*....**.
+     0x00000D2C,  // .**.*..*.**.
+     0x00000CCC,  // .**..**..**.
+     0x00000618,  // ..**....**..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 170
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 171
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000044,  // ......*...*.
+     0x000000CC,  // .....**..**.
+     0x00000198,  // ....**..**..
+     0x00000330,  // ...**..**...
+     0x00000660,  // ..**..**....
+     0x00000CC0,  // .**..**.....
+     0x00000CC0,  // .**..**.....
+     0x00000660,  // ..**..**....
+     0x00000330,  // ...**..**...
+     0x00000198,  // ....**..**..
+     0x000000CC,  // .....**..**.
+     0x00000044,  // ......*...*.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 172
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 173
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 174
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 175
+     12, 23,
+     0x00001FFE,  // ************
+     0x00001FFE,  // ************
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 176
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000E0,  // .....***....
+     0x000001B0,  // ....**.**...
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 177
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 178
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000310,  // ...**...*...
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 179
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000030,  // .......**...
+     0x000000E0,  // .....***....
+     0x00000030,  // .......**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 180
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000080,  // .....*......
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 181
+     12, 23,
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x0000064C,  // ..**..*..**.
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 182
+     12, 23,
+     0x00000000,  // ............
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000200,  // ...*........
+     0x000002C0,  // ...*.**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000160,  // ....*.**....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001E1E,  // ****....****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 183
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 184
+     12, 23,
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000800,  // .*..........
+     0x00000800,  // .*..........
+     0x00000FFE,  // .***********
+     0x00000306,  // ...**.....**
+     0x00000302,  // ...**......*
+     0x00000302,  // ...**......*
+     0x00000310,  // ...**...*...
+     0x00000310,  // ...**...*...
+     0x000003F0,  // ...******...
+     0x00000310,  // ...**...*...
+     0x00000310,  // ...**...*...
+     0x00000300,  // ...**.......
+     0x00000302,  // ...**......*
+     0x00000302,  // ...**......*
+     0x00000306,  // ...**.....**
+     0x000007FE,  // ..**********
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 185
+     12, 23,
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000800,  // .*..........
+     0x00000800,  // .*..........
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x000007FC,  // ..*********.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 186
+     12, 23,
+     0x00000000,  // ............
+     0x00001800,  // **..........
+     0x00001800,  // **..........
+     0x00001000,  // *...........
+     0x000017F8,  // *.********..
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 187
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000880,  // .*...*......
+     0x00000CC0,  // .**..**.....
+     0x00000660,  // ..**..**....
+     0x00000330,  // ...**..**...
+     0x00000198,  // ....**..**..
+     0x000000CC,  // .....**..**.
+     0x000000CC,  // .....**..**.
+     0x00000198,  // ....**..**..
+     0x00000330,  // ...**..**...
+     0x00000660,  // ..**..**....
+     0x00000CC0,  // .**..**.....
+     0x00000880,  // .*...*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 188
+     12, 23,
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000800,  // .*..........
+     0x000009F0,  // .*..*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 189
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000300,  // ...**.......
+     0x00000F00,  // .****.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000306,  // ...**.....**
+     0x0000030C,  // ...**....**.
+     0x00000338,  // ...**..***..
+     0x00000060,  // ......**....
+     0x000001C0,  // ....***.....
+     0x0000033C,  // ...**..****.
+     0x00000E66,  // .***..**..**
+     0x00001866,  // **....**..**
+     0x00000006,  // ..........**
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000062,  // ......**...*
+     0x0000007E,  // ......******
+     0x00000000,  // ............
+  },
+  {             // 190
+     12, 23,
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000800,  // .*..........
+     0x00000800,  // .*..........
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000932,  // .*..*..**..*
+     0x000001A0,  // ....**.*....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 191
+     12, 23,
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000400,  // ..*.........
+     0x00000400,  // ..*.........
+     0x000001F0,  // ....*****...
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000912,  // .*..*...*..*
+     0x00000F1E,  // .****...****
+     0x0000071C,  // ..***...***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 192
+     12, 23,
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000380,  // ...***......
+     0x000004C0,  // ..*..**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C8,  // .....**..*..
+     0x00000070,  // ......***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 193
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000160,  // ....*.**....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001E1E,  // ****....****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 194
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000618,  // ..**....**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x0000060C,  // ..**.....**.
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x00000606,  // ..**......**
+     0x0000060C,  // ..**.....**.
+     0x00000FF8,  // .*********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 195
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x0000060C,  // ..**.....**.
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000FC0,  // .******.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 196
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000160,  // ....*.**....
+     0x00000330,  // ...**..**...
+     0x00000230,  // ...*...**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000418,  // ..*.....**..
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 197
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x0000060C,  // ..**.....**.
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x00000620,  // ..**...*....
+     0x00000620,  // ..**...*....
+     0x000007E0,  // ..******....
+     0x00000620,  // ..**...*....
+     0x00000620,  // ..**...*....
+     0x00000600,  // ..**........
+     0x00000604,  // ..**......*.
+     0x00000604,  // ..**......*.
+     0x0000060C,  // ..**.....**.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 198
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000818,  // .*......**..
+     0x00000830,  // .*.....**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000304,  // ...**.....*.
+     0x00000604,  // ..**......*.
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 199
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x000007FC,  // ..*********.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 200
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x00000404,  // ..*.......*.
+     0x00000C06,  // .**.......**
+     0x00000D16,  // .**.*...*.**
+     0x00000DF6,  // .**.*****.**
+     0x00000DF6,  // .**.*****.**
+     0x00000D16,  // .**.*...*.**
+     0x00000C06,  // .**.......**
+     0x00000404,  // ..*.......*.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 201
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007F8,  // ..********..
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 202
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000660,  // ..**..**....
+     0x000006E0,  // ..**.***....
+     0x000007E0,  // ..******....
+     0x00000760,  // ..***.**....
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 203
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000160,  // ....*.**....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001E1E,  // ****....****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 204
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0E,  // ***......***
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000E1C,  // .***....***.
+     0x00000E3C,  // .***...****.
+     0x00000E3C,  // .***...****.
+     0x00000F2C,  // .****..*.**.
+     0x00000B6C,  // .*.**.**.**.
+     0x00000B6C,  // .*.**.**.**.
+     0x00000BCC,  // .*.****..**.
+     0x000009CC,  // .*..***..**.
+     0x000009CC,  // .*..***..**.
+     0x0000098C,  // .*..**...**.
+     0x00001C9E,  // ***..*..****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 205
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E1E,  // .***....****
+     0x0000070C,  // ..***....**.
+     0x0000070C,  // ..***....**.
+     0x0000078C,  // ..****...**.
+     0x0000068C,  // ..**.*...**.
+     0x000006CC,  // ..**.**..**.
+     0x0000064C,  // ..**..*..**.
+     0x0000066C,  // ..**..**.**.
+     0x0000062C,  // ..**...*.**.
+     0x0000063C,  // ..**...****.
+     0x0000061C,  // ..**....***.
+     0x0000061C,  // ..**....***.
+     0x0000060C,  // ..**.....**.
+     0x00000F0C,  // .****....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 206
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000404,  // ..*.......*.
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x00000404,  // ..*.......*.
+     0x00000404,  // ..*.......*.
+     0x00000000,  // ............
+     0x00000110,  // ....*...*...
+     0x000001F0,  // ....*****...
+     0x000001F0,  // ....*****...
+     0x00000110,  // ....*...*...
+     0x00000000,  // ............
+     0x00000802,  // .*.........*
+     0x00000802,  // .*.........*
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x00000802,  // .*.........*
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 207
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 208
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 209
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000618,  // ..**....**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x000007F0,  // ..*******...
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000F80,  // .*****......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 210
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 211
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000E04,  // .***......*.
+     0x00000604,  // ..**......*.
+     0x00000700,  // ..***.......
+     0x00000300,  // ...**.......
+     0x00000380,  // ...***......
+     0x00000100,  // ....*.......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000404,  // ..*.......*.
+     0x00000C04,  // .**.......*.
+     0x0000080C,  // .*.......**.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 212
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000CCC,  // .**..**..**.
+     0x000008C4,  // .*...**...*.
+     0x000008C4,  // .*...**...*.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 213
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000932,  // .*..*..**..*
+     0x000001A0,  // ....**.*....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 214
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x000006D8,  // ..**.**.**..
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x000006D8,  // ..**.**.**..
+     0x000003F0,  // ...******...
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 215
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 216
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000CCC,  // .**..**..**.
+     0x000006D8,  // ..**.**.**..
+     0x000006D8,  // ..**.**.**..
+     0x000006D8,  // ..**.**.**..
+     0x000006D8,  // ..**.**.**..
+     0x000003F0,  // ...******...
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 217
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000912,  // .*..*...*..*
+     0x00000F1E,  // .****...****
+     0x0000071C,  // ..***...***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 218
+     12, 23,
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x000007F8,  // ..********..
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 219
+     12, 23,
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x0000060C,  // ..**.....**.
+     0x00000F1E,  // .****...****
+     0x00000932,  // .*..*..**..*
+     0x000001A0,  // ....**.*....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 220
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003C2,  // ...****....*
+     0x00000666,  // ..**..**..**
+     0x00000C64,  // .**...**..*.
+     0x00000C3C,  // .**....****.
+     0x00000C38,  // .**....***..
+     0x00000C30,  // .**....**...
+     0x00000C38,  // .**....***..
+     0x0000067A,  // ..**..****.*
+     0x000003CC,  // ...****..**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 221
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000700,  // ..***.......
+     0x000003C0,  // ...****.....
+     0x00000700,  // ..***.......
+     0x00000608,  // ..**.....*..
+     0x00000718,  // ..***...**..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 222
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000006E0,  // ..**.***....
+     0x00000BB0,  // .*.***.**...
+     0x00000B18,  // .*.**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000118,  // ....*...**..
+     0x00000018,  // ........**..
+     0x00000008,  // .........*..
+     0x00000000,  // ............
+  },
+  {             // 223
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000080,  // .....*......
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000380,  // ...***......
+     0x000004C0,  // ..*..**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C8,  // .....**..*..
+     0x00000070,  // ......***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 224
+     12, 23,
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x0000064C,  // ..**..*..**.
+     0x00000F1E,  // .****...****
+     0x0000060C,  // ..**.....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000B0C,  // .*.**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x00000318,  // ...**...**..
+     0x00000398,  // ...***..**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 225
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003C2,  // ...****....*
+     0x00000666,  // ..**..**..**
+     0x00000C64,  // .**...**..*.
+     0x00000C3C,  // .**....****.
+     0x00000C38,  // .**....***..
+     0x00000C30,  // .**....**...
+     0x00000C38,  // .**....***..
+     0x0000067A,  // ..**..****.*
+     0x000003CC,  // ...****..**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 226
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x00000670,  // ..**..***...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000DE0,  // .**.****....
+     0x00000C30,  // .**....**...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000E18,  // .***....**..
+     0x00000F30,  // .****..**...
+     0x00000DE0,  // .**.****....
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000800,  // .*..........
+     0x00000000,  // ............
+  },
+  {             // 227
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000302,  // ...**......*
+     0x00000784,  // ..****....*.
+     0x00000FCC,  // .******..**.
+     0x000008C8,  // .*...**..*..
+     0x00000058,  // ......*.**..
+     0x00000050,  // ......*.*...
+     0x00000070,  // ......***...
+     0x00000060,  // ......**....
+     0x000000E0,  // .....***....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+  },
+  {             // 228
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000318,  // ...**...**..
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000003E0,  // ...*****....
+     0x00000770,  // ..***.***...
+     0x00000630,  // ..**...**...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000630,  // ..**...**...
+     0x00000770,  // ..***.***...
+     0x000001C0,  // ....***.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 229
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000700,  // ..***.......
+     0x000003E0,  // ...*****....
+     0x00000700,  // ..***.......
+     0x00000608,  // ..**.....*..
+     0x00000718,  // ..***...**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 230
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x0000019C,  // ....**..***.
+     0x000000FC,  // .....******.
+     0x000001F8,  // ....******..
+     0x00000380,  // ...***......
+     0x00000700,  // ..***.......
+     0x00000E00,  // .***........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000E00,  // .***........
+     0x00000700,  // ..***.......
+     0x000003C0,  // ...****.....
+     0x000000F0,  // .....****...
+     0x00000018,  // ........**..
+     0x000000C8,  // .....**..*..
+     0x000000C8,  // .....**..*..
+     0x00000070,  // ......***...
+     0x00000000,  // ............
+  },
+  {             // 231
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000006E0,  // ..**.***....
+     0x00000BB0,  // .*.***.**...
+     0x00000B18,  // .*.**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000118,  // ....*...**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000008,  // .........*..
+     0x00000000,  // ............
+  },
+  {             // 232
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000E0,  // .....***....
+     0x000001B0,  // ....**.**...
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x000007FC,  // ..*********.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 233
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000380,  // ...***......
+     0x000004C0,  // ..*..**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C8,  // .....**..*..
+     0x00000070,  // ......***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 234
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000E38,  // .***...***..
+     0x00000660,  // ..**..**....
+     0x000006C0,  // ..**.**.....
+     0x000007C0,  // ..*****.....
+     0x000006E0,  // ..**.***....
+     0x00000670,  // ..**..***...
+     0x0000063A,  // ..**...***.*
+     0x00000F1C,  // .****...***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 235
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000F00,  // .****.......
+     0x00000980,  // .*..**......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x000001E0,  // ....****....
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x00000630,  // ..**...**...
+     0x00000632,  // ..**...**..*
+     0x00000C1E,  // .**.....****
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 236
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000410,  // ..*.....*...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C34,  // .**....**.*.
+     0x00000E7C,  // .***..*****.
+     0x00000BC8,  // .*.****..*..
+     0x00000800,  // .*..........
+     0x00000800,  // .*..........
+     0x00000800,  // .*..........
+     0x00000800,  // .*..........
+     0x00000000,  // ............
+  },
+  {             // 237
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000070C,  // ..***....**.
+     0x0000030C,  // ...**....**.
+     0x00000188,  // ....**...*..
+     0x00000188,  // ....**...*..
+     0x000000D8,  // .....**.**..
+     0x000000D0,  // .....**.*...
+     0x00000070,  // ......***...
+     0x00000070,  // ......***...
+     0x00000030,  // .......**...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 238
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000338,  // ...**..***..
+     0x000001F8,  // ....******..
+     0x00000380,  // ...***......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x000001F8,  // ....******..
+     0x000001F0,  // ....*****...
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000700,  // ..***.......
+     0x000003C0,  // ...****.....
+     0x000000F0,  // .....****...
+     0x00000018,  // ........**..
+     0x00000188,  // ....**...*..
+     0x00000198,  // ....**..**..
+     0x000000F0,  // .....****...
+     0x00000000,  // ............
+  },
+  {             // 239
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000738,  // ..***..***..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 240
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003FC,  // ...********.
+     0x000007F8,  // ..********..
+     0x00000920,  // .*..*..*....
+     0x00000120,  // ....*..*....
+     0x00000120,  // ....*..*....
+     0x00000120,  // ....*..*....
+     0x00000324,  // ...**..*..*.
+     0x0000033C,  // ...**..****.
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 241
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000730,  // ..***..**...
+     0x000006E0,  // ..**.***....
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000000,  // ............
+  },
+  {             // 242
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000078,  // ......****..
+     0x000000FC,  // .....******.
+     0x00000184,  // ....**....*.
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000380,  // ...***......
+     0x000001F0,  // ....*****...
+     0x000000F8,  // .....*****..
+     0x00000004,  // ..........*.
+     0x00000004,  // ..........*.
+     0x0000007C,  // ......*****.
+     0x00000078,  // ......****..
+     0x00000000,  // ............
+  },
+  {             // 243
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001FC,  // ....*******.
+     0x000007E0,  // ..******....
+     0x00000630,  // ..**...**...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000630,  // ..**...**...
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 244
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001FC,  // ....*******.
+     0x000003F8,  // ...*******..
+     0x00000440,  // ..*...*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000044,  // ......*...*.
+     0x00000078,  // ......****..
+     0x00000030,  // .......**...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 245
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000B0C,  // .*.**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x00000318,  // ...**...**..
+     0x00000398,  // ...***..**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 246
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x000001F0,  // ....*****...
+     0x0000075C,  // ..***.*.***.
+     0x0000064C,  // ..**..*..**.
+     0x00000C46,  // .**...*...**
+     0x00000C46,  // .**...*...**
+     0x00000C46,  // .**...*...**
+     0x0000064C,  // ..**..*..**.
+     0x0000075C,  // ..***.*.***.
+     0x000001F0,  // ....*****...
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+  },
+  {             // 247
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000602,  // ..**.......*
+     0x00000F06,  // .****.....**
+     0x0000098C,  // .*..**...**.
+     0x00000198,  // ....**..**..
+     0x000000D0,  // .....**.*...
+     0x000000F0,  // .....****...
+     0x00000060,  // ......**....
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000001B0,  // ....**.**...
+     0x00000332,  // ...**..**..*
+     0x0000061E,  // ..**....****
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+  },
+  {             // 248
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000C46,  // .**...*...**
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x0000064C,  // ..**..*..**.
+     0x00000358,  // ...**.*.**..
+     0x00000358,  // ...**.*.**..
+     0x000001F0,  // ....*****...
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+  },
+  {             // 249
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000806,  // .*........**
+     0x00000806,  // .*........**
+     0x000008C6,  // .*...**...**
+     0x000008C6,  // .*...**...**
+     0x00000CC6,  // .**..**...**
+     0x00000FFC,  // .**********.
+     0x00000738,  // ..***..***..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 250
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000F3C,  // .****..****.
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000380,  // ...***......
+     0x000004C0,  // ..*..**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C8,  // .....**..*..
+     0x00000070,  // ......***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 251
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000318,  // ...**...**..
+     0x000007BC,  // ..****.****.
+     0x00000318,  // ...**...**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000B0C,  // .*.**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x00000318,  // ...**...**..
+     0x00000398,  // ...***..**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 252
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000738,  // ..***..***..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 253
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000B0C,  // .*.**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x00000318,  // ...**...**..
+     0x00000398,  // ...***..**..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 254
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000806,  // .*........**
+     0x00000806,  // .*........**
+     0x000008C6,  // .*...**...**
+     0x000008C6,  // .*...**...**
+     0x00000CCE,  // .**..**..***
+     0x00000FFC,  // .**********.
+     0x00000738,  // ..***..***..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 255
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  };
diff --git a/fontosd.c b/fontosd.c
index 17d1be5a9..e7f7d48e8 100644
--- a/fontosd.c
+++ b/fontosd.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontOsd[][29] = {
+cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 32
      6, 27,
      0x00000000,  // ......
diff --git a/fontsml-iso8859-7.c b/fontsml-iso8859-7.c
new file mode 100644
index 000000000..03943e780
--- /dev/null
+++ b/fontsml-iso8859-7.c
@@ -0,0 +1,4930 @@
+cFont::tPixelData FontSml_iso8859_7[][24] = {
+  {             // 32
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 33
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 34
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003B8,  // ..***.***..
+     0x000003B8,  // ..***.***..
+     0x000003B8,  // ..***.***..
+     0x000003B8,  // ..***.***..
+     0x00000110,  // ...*...*...
+     0x00000110,  // ...*...*...
+     0x00000110,  // ...*...*...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 35
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 36
+     11, 19,
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000000F8,  // ....*****..
+     0x00000198,  // ...**..**..
+     0x00000308,  // ..**....*..
+     0x00000300,  // ..**.......
+     0x00000380,  // ..***......
+     0x000001E0,  // ...****....
+     0x00000078,  // .....****..
+     0x0000001C,  // .......***.
+     0x0000000C,  // ........**.
+     0x0000020C,  // ..*.....**.
+     0x00000318,  // ..**...**..
+     0x000003F0,  // ..******...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 37
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000780,  // .****......
+     0x00000CCC,  // **..**..**.
+     0x00000CCC,  // **..**..**.
+     0x00000CD8,  // **..**.**..
+     0x000007B0,  // .****.**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000001BC,  // ...**.****.
+     0x00000366,  // ..**.**..**
+     0x00000366,  // ..**.**..**
+     0x00000666,  // .**..**..**
+     0x0000063C,  // .**...****.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 38
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000001B0,  // ...**.**...
+     0x00000110,  // ...*...*...
+     0x00000110,  // ...*...*...
+     0x00000110,  // ...*...*...
+     0x000001B0,  // ...**.**...
+     0x000000E0,  // ....***....
+     0x000001E6,  // ...****..**
+     0x00000334,  // ..**..**.*.
+     0x00000334,  // ..**..**.*.
+     0x0000031C,  // ..**...***.
+     0x00000308,  // ..**....*..
+     0x0000019C,  // ...**..***.
+     0x000000F6,  // ....****.**
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 39
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 40
+     11, 19,
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000030,  // ......**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 41
+     11, 19,
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 42
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x0000036C,  // ..**.**.**.
+     0x0000036C,  // ..**.**.**.
+     0x000000F0,  // ....****...
+     0x000000F0,  // ....****...
+     0x0000036C,  // ..**.**.**.
+     0x0000036C,  // ..**.**.**.
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 43
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 44
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000000,  // ...........
+  },
+  {             // 45
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 46
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 47
+     11, 19,
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 48
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 49
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000001E0,  // ...****....
+     0x00000360,  // ..**.**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 50
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000000C,  // ........**.
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000304,  // ..**.....*.
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 51
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000001F0,  // ...*****...
+     0x00000018,  // .......**..
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x00000318,  // ..**...**..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 52
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000020,  // ......*....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x000000C0,  // ....**.....
+     0x00000098,  // ....*..**..
+     0x00000198,  // ...**..**..
+     0x00000118,  // ...*...**..
+     0x00000318,  // ..**...**..
+     0x000003FC,  // ..********.
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 53
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001FC,  // ...*******.
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000001F0,  // ...*****...
+     0x00000018,  // .......**..
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x00000318,  // ..**...**..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 54
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000038,  // ......***..
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000100,  // ...*.......
+     0x00000370,  // ..**.***...
+     0x00000398,  // ..***..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 55
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x0000000C,  // ........**.
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 56
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 57
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000019C,  // ...**..***.
+     0x000000EC,  // ....***.**.
+     0x00000008,  // ........*..
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x000001C0,  // ...***.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 58
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 59
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000000,  // ...........
+  },
+  {             // 60
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000018,  // .......**..
+     0x00000038,  // ......***..
+     0x00000070,  // .....***...
+     0x000000E0,  // ....***....
+     0x000001C0,  // ...***.....
+     0x00000380,  // ..***......
+     0x00000380,  // ..***......
+     0x000001C0,  // ...***.....
+     0x000000E0,  // ....***....
+     0x00000070,  // .....***...
+     0x00000038,  // ......***..
+     0x00000018,  // .......**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 61
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 62
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000380,  // ..***......
+     0x000001C0,  // ...***.....
+     0x000000E0,  // ....***....
+     0x00000070,  // .....***...
+     0x00000038,  // ......***..
+     0x00000038,  // ......***..
+     0x00000070,  // .....***...
+     0x000000E0,  // ....***....
+     0x000001C0,  // ...***.....
+     0x00000380,  // ..***......
+     0x00000300,  // ..**.......
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 63
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x000003B8,  // ..***.***..
+     0x0000031C,  // ..**...***.
+     0x0000031C,  // ..**...***.
+     0x0000001C,  // .......***.
+     0x00000038,  // ......***..
+     0x00000070,  // .....***...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 64
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000398,  // ..***..**..
+     0x00000308,  // ..**....*..
+     0x0000060C,  // .**.....**.
+     0x0000067C,  // .**..*****.
+     0x000006CC,  // .**.**..**.
+     0x000006CC,  // .**.**..**.
+     0x000006CC,  // .**.**..**.
+     0x000006CC,  // .**.**..**.
+     0x00000676,  // .**..***.**
+     0x00000600,  // .**........
+     0x00000300,  // ..**.......
+     0x0000038C,  // ..***...**.
+     0x000000F8,  // ....*****..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 65
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x000000F0,  // ....****...
+     0x00000090,  // ....*..*...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000001F8,  // ...******..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000204,  // ..*......*.
+     0x0000070E,  // .***....***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 66
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x000003F0,  // ..******...
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x000007F0,  // .*******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 67
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000FC,  // ....******.
+     0x0000038C,  // ..***...**.
+     0x0000030C,  // ..**....**.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x0000060C,  // .**.....**.
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 68
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x00000306,  // ..**.....**
+     0x00000306,  // ..**.....**
+     0x00000306,  // ..**.....**
+     0x00000306,  // ..**.....**
+     0x00000306,  // ..**.....**
+     0x00000306,  // ..**.....**
+     0x0000030C,  // ..**....**.
+     0x0000031C,  // ..**...***.
+     0x000007F0,  // .*******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 69
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x00000184,  // ...**....*.
+     0x00000184,  // ...**....*.
+     0x00000180,  // ...**......
+     0x00000190,  // ...**..*...
+     0x000001F0,  // ...*****...
+     0x00000190,  // ...**..*...
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000184,  // ...**....*.
+     0x00000184,  // ...**....*.
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 70
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x00000184,  // ...**....*.
+     0x00000184,  // ...**....*.
+     0x00000180,  // ...**......
+     0x00000190,  // ...**..*...
+     0x000001F0,  // ...*****...
+     0x00000190,  // ...**..*...
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000003E0,  // ..*****....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 71
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000FC,  // ....******.
+     0x0000038C,  // ..***...**.
+     0x0000030C,  // ..**....**.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x0000061E,  // .**....****
+     0x0000060C,  // .**.....**.
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 72
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 73
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ...******..
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 74
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000007C,  // .....*****.
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x00000330,  // ..**..**...
+     0x000001E0,  // ...****....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 75
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x00000360,  // ..**.**....
+     0x000003E0,  // ..*****....
+     0x000003B0,  // ..***.**...
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000078E,  // .****...***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 76
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000780,  // .****......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000304,  // ..**.....*.
+     0x00000304,  // ..**.....*.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 77
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000E0E,  // ***.....***
+     0x0000071C,  // .***...***.
+     0x0000071C,  // .***...***.
+     0x000007BC,  // .****.****.
+     0x000006AC,  // .**.*.*.**.
+     0x000006EC,  // .**.***.**.
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000F1E,  // ****...****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 78
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000071E,  // .***...****
+     0x0000038C,  // ..***...**.
+     0x0000038C,  // ..***...**.
+     0x000003CC,  // ..****..**.
+     0x0000034C,  // ..**.*..**.
+     0x0000036C,  // ..**.**.**.
+     0x0000036C,  // ..**.**.**.
+     0x0000032C,  // ..**..*.**.
+     0x0000033C,  // ..**..****.
+     0x0000031C,  // ..**...***.
+     0x0000031C,  // ..**...***.
+     0x0000078C,  // .****...**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 79
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 80
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x000003F0,  // ..******...
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000007C0,  // .*****.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 81
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000030,  // ......**...
+     0x00000018,  // .......**..
+     0x0000000C,  // ........**.
+     0x00000000,  // ...........
+  },
+  {             // 82
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000003F0,  // ..******...
+     0x00000360,  // ..**.**....
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000078E,  // .****...***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 83
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000FC,  // ....******.
+     0x0000018C,  // ...**...**.
+     0x00000304,  // ..**.....*.
+     0x00000300,  // ..**.......
+     0x00000380,  // ..***......
+     0x000001E0,  // ...****....
+     0x00000078,  // .....****..
+     0x0000001C,  // .......***.
+     0x0000000C,  // ........**.
+     0x0000020C,  // ..*.....**.
+     0x00000318,  // ..**...**..
+     0x000003F0,  // ..******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 84
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x00000462,  // .*...**...*
+     0x00000462,  // .*...**...*
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 85
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 86
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x00000204,  // ..*......*.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000108,  // ...*....*..
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000090,  // ....*..*...
+     0x000000F0,  // ....****...
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 87
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000E0E,  // ***.....***
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x000006EC,  // .**.***.**.
+     0x000006EC,  // .**.***.**.
+     0x000003B8,  // ..***.***..
+     0x000003B8,  // ..***.***..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 88
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x00000090,  // ....*..*...
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 89
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000108,  // ...*....*..
+     0x00000198,  // ...**..**..
+     0x00000090,  // ....*..*...
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 90
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x0000020C,  // ..*.....**.
+     0x00000218,  // ..*....**..
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000304,  // ..**.....*.
+     0x00000304,  // ..**.....*.
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 91
+     11, 19,
+     0x00000000,  // ...........
+     0x000000F8,  // ....*****..
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000F8,  // ....*****..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 92
+     11, 19,
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 93
+     11, 19,
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 94
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000204,  // ..*......*.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 95
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 96
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 97
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F8,  // ....*****..
+     0x0000018C,  // ...**...**.
+     0x0000000C,  // ........**.
+     0x000000FC,  // ....******.
+     0x0000018C,  // ...**...**.
+     0x0000030C,  // ..**....**.
+     0x0000031C,  // ..**...***.
+     0x000001EE,  // ...****.***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 98
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000700,  // .***.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000370,  // ..**.***...
+     0x00000398,  // ..***..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000398,  // ..***..**..
+     0x00000370,  // ..**.***...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 99
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000FC,  // ....******.
+     0x0000018C,  // ...**...**.
+     0x0000030C,  // ..**....**.
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x0000018C,  // ...**...**.
+     0x000000F8,  // ....*****..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 100
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000001C,  // .......***.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x000000EC,  // ....***.**.
+     0x0000019C,  // ...**..***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000019C,  // ...**..***.
+     0x000000EE,  // ....***.***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 101
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x0000018C,  // ...**...**.
+     0x000000F8,  // ....*****..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 102
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000078,  // .....****..
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000003F8,  // ..*******..
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 103
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x0000031C,  // ..**...***.
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000001F0,  // ...*****...
+     0x00000300,  // ..**.......
+     0x000001FC,  // ...*******.
+     0x00000306,  // ..**.....**
+     0x00000306,  // ..**.....**
+     0x0000030C,  // ..**....**.
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+  },
+  {             // 104
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000700,  // .***.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000378,  // ..**.****..
+     0x0000038C,  // ..***...**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 105
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000040,  // .....*.....
+     0x000000E0,  // ....***....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000003E0,  // ..*****....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 106
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000020,  // ......*....
+     0x00000070,  // .....***...
+     0x00000020,  // ......*....
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x000001F0,  // ...*****...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000630,  // .**...**...
+     0x000003E0,  // ..*****....
+     0x00000000,  // ...........
+  },
+  {             // 107
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000700,  // .***.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x0000033C,  // ..**..****.
+     0x00000310,  // ..**...*...
+     0x00000320,  // ..**..*....
+     0x00000340,  // ..**.*.....
+     0x000003E0,  // ..*****....
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x0000078E,  // .****...***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 108
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000001E0,  // ...****....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 109
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000006DC,  // .**.**.***.
+     0x00000F76,  // ****.***.**
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x00000EEE,  // ***.***.***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 110
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000378,  // ..**.****..
+     0x0000078C,  // .****...**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 111
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 112
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000370,  // ..**.***...
+     0x00000798,  // .****..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000398,  // ..***..**..
+     0x00000370,  // ..**.***...
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000007C0,  // .*****.....
+     0x00000000,  // ...........
+  },
+  {             // 113
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001E8,  // ...****.*..
+     0x00000318,  // ..**...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x00000338,  // ..**..***..
+     0x000001D8,  // ...***.**..
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x0000007C,  // .....*****.
+     0x00000000,  // ...........
+  },
+  {             // 114
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000019C,  // ...**..***.
+     0x000003AC,  // ..***.*.**.
+     0x000001C0,  // ...***.....
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000003E0,  // ..*****....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 115
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ...******..
+     0x0000030C,  // ..**....**.
+     0x00000300,  // ..**.......
+     0x000001E0,  // ...****....
+     0x00000038,  // ......***..
+     0x0000020C,  // ..*.....**.
+     0x0000030C,  // ..**....**.
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 116
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000007F8,  // .********..
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x0000018C,  // ...**...**.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 117
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000030C,  // ..**....**.
+     0x0000071C,  // .***...***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000031E,  // ..**...****
+     0x000001EC,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 118
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000108,  // ...*....*..
+     0x00000198,  // ...**..**..
+     0x00000090,  // ....*..*...
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 119
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000E0E,  // ***.....***
+     0x00000404,  // .*.......*.
+     0x0000064C,  // .**..*..**.
+     0x000006EC,  // .**.***.**.
+     0x000002A8,  // ..*.*.*.*..
+     0x000003B8,  // ..***.***..
+     0x00000318,  // ..**...**..
+     0x00000110,  // ...*...*...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 120
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007BC,  // .****.****.
+     0x00000318,  // ..**...**..
+     0x000001B0,  // ...**.**...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001B0,  // ...**.**...
+     0x00000318,  // ..**...**..
+     0x000007BC,  // .****.****.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 121
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000108,  // ...*....*..
+     0x00000198,  // ...**..**..
+     0x00000090,  // ....*..*...
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x000000C0,  // ....**.....
+     0x00000680,  // .**.*......
+     0x00000700,  // .***.......
+     0x00000000,  // ...........
+  },
+  {             // 122
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x00000218,  // ..*....**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000308,  // ..**....*..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 123
+     11, 19,
+     0x00000000,  // ...........
+     0x00000038,  // ......***..
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000380,  // ..***......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000038,  // ......***..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 124
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 125
+     11, 19,
+     0x00000000,  // ...........
+     0x000001C0,  // ...***.....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000030,  // ......**...
+     0x0000001C,  // .......***.
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001C0,  // ...***.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 126
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000003C6,  // ..****...**
+     0x000007FE,  // .**********
+     0x0000063C,  // .**...****.
+     0x00000018,  // .......**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 127
+     11, 19,
+     0x00000CCC,  // **..**..**.
+     0x00000CCC,  // **..**..**.
+     0x00000332,  // ..**..**..*
+     0x00000332,  // ..**..**..*
+     0x00000CCC,  // **..**..**.
+     0x00000CCC,  // **..**..**.
+     0x00000332,  // ..**..**..*
+     0x00000332,  // ..**..**..*
+     0x00000CCC,  // **..**..**.
+     0x00000CCC,  // **..**..**.
+     0x00000332,  // ..**..**..*
+     0x00000332,  // ..**..**..*
+     0x00000CCC,  // **..**..**.
+     0x00000CCC,  // **..**..**.
+     0x00000332,  // ..**..**..*
+     0x00000332,  // ..**..**..*
+     0x00000CCC,  // **..**..**.
+     0x00000CCC,  // **..**..**.
+     0x00000332,  // ..**..**..*
+  },
+  {             // 128
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 161
+     11, 19,
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000080,  // ....*......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000030,  // ......**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 162
+     11, 19,
+     0x00000070,  // .....***...
+     0x00000070,  // .....***...
+     0x00000070,  // .....***...
+     0x00000010,  // .......*...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 163
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000078,  // .....****..
+     0x000000CC,  // ....**..**.
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000003F0,  // ..******...
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000003EC,  // ..*****.**.
+     0x00000338,  // ..**..***..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 164
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 165
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 166
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 167
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001B0,  // ...**.**...
+     0x00000118,  // ...*...**..
+     0x00000188,  // ...**...*..
+     0x000000D8,  // ....**.**..
+     0x00000070,  // .....***...
+     0x00000030,  // ......**...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 168
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 169
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000108,  // ...*....*..
+     0x00000264,  // ..*..**..*.
+     0x00000294,  // ..*.*..*.*.
+     0x00000284,  // ..*.*....*.
+     0x00000264,  // ..*..**..*.
+     0x00000108,  // ...*....*..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 170
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 171
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000044,  // .....*...*.
+     0x000000CC,  // ....**..**.
+     0x00000198,  // ...**..**..
+     0x00000330,  // ..**..**...
+     0x00000660,  // .**..**....
+     0x00000660,  // .**..**....
+     0x00000330,  // ..**..**...
+     0x00000198,  // ...**..**..
+     0x000000CC,  // ....**..**.
+     0x00000044,  // .....*...*.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 172
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000006,  // .........**
+     0x00000006,  // .........**
+     0x00000006,  // .........**
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 173
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ...******..
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 174
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 175
+     11, 19,
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 176
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 177
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 178
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000188,  // ...**...*..
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 179
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000018,  // .......**..
+     0x00000070,  // .....***...
+     0x00000018,  // .......**..
+     0x00000018,  // .......**..
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 180
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 181
+     11, 19,
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000080,  // ....*......
+     0x000006B0,  // .**.*.**...
+     0x00000630,  // .**...**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 182
+     11, 19,
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x000004C0,  // .*..**.....
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001E0,  // ...****....
+     0x00000130,  // ...*..**...
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x00000618,  // .**....**..
+     0x0000060C,  // .**.....**.
+     0x0000040C,  // .*......**.
+     0x00000F1E,  // ****...****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 183
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 184
+     11, 19,
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x000005FE,  // .*.********
+     0x000000C2,  // ....**....*
+     0x000000C2,  // ....**....*
+     0x000000C0,  // ....**.....
+     0x000000C4,  // ....**...*.
+     0x000000FC,  // ....******.
+     0x000000C4,  // ....**...*.
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C2,  // ....**....*
+     0x000000C2,  // ....**....*
+     0x000001FE,  // ...********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 185
+     11, 19,
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 186
+     11, 19,
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x000005F8,  // .*.******..
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 187
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000440,  // .*...*.....
+     0x00000660,  // .**..**....
+     0x00000330,  // ..**..**...
+     0x00000198,  // ...**..**..
+     0x000000CC,  // ....**..**.
+     0x000000CC,  // ....**..**.
+     0x00000198,  // ...**..**..
+     0x00000330,  // ..**..**...
+     0x00000660,  // .**..**....
+     0x00000440,  // .*...*.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 188
+     11, 19,
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x000004F0,  // .*..****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 189
+     11, 19,
+     0x00000300,  // ..**.......
+     0x00000F00,  // ****.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000306,  // ..**.....**
+     0x0000031C,  // ..**...***.
+     0x00000070,  // .....***...
+     0x000001C0,  // ...***.....
+     0x0000073C,  // .***..****.
+     0x00000C66,  // **...**..**
+     0x00000066,  // .....**..**
+     0x0000000C,  // ........**.
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000062,  // .....**...*
+     0x0000007E,  // .....******
+     0x00000000,  // ...........
+  },
+  {             // 190
+     11, 19,
+     0x00000300,  // ..**.......
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000492,  // .*..*..*..*
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 191
+     11, 19,
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000400,  // .*.........
+     0x000004F0,  // .*..****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x00000492,  // .*..*..*..*
+     0x0000079E,  // .****..****
+     0x0000039C,  // ..***..***.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 192
+     11, 19,
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000020,  // ......*....
+     0x000001AC,  // ...**.*.**.
+     0x0000018C,  // ...**...**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001C0,  // ...***.....
+     0x00000260,  // ..*..**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000064,  // .....**..*.
+     0x00000038,  // ......***..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 193
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001E0,  // ...****....
+     0x00000130,  // ...*..**...
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x00000618,  // .**....**..
+     0x0000060C,  // .**.....**.
+     0x0000040C,  // .*......**.
+     0x00000F1E,  // ****...****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 194
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x00000338,  // ..**..***..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x000003F0,  // ..******...
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x000007F0,  // .*******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 195
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x00000184,  // ...**....*.
+     0x00000184,  // ...**....*.
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000003E0,  // ..*****....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 196
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001E0,  // ...****....
+     0x00000160,  // ...*.**....
+     0x00000130,  // ...*..**...
+     0x00000330,  // ..**..**...
+     0x00000230,  // ..*...**...
+     0x00000218,  // ..*....**..
+     0x00000618,  // .**....**..
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 197
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x00000184,  // ...**....*.
+     0x00000184,  // ...**....*.
+     0x00000180,  // ...**......
+     0x00000188,  // ...**...*..
+     0x000001F8,  // ...******..
+     0x00000188,  // ...**...*..
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x00000184,  // ...**....*.
+     0x00000184,  // ...**....*.
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 198
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x0000020C,  // ..*.....**.
+     0x00000218,  // ..*....**..
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000304,  // ..**.....*.
+     0x00000304,  // ..**.....*.
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 199
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 200
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000696,  // .**.*..*.**
+     0x000006F6,  // .**.****.**
+     0x000006F6,  // .**.****.**
+     0x00000696,  // .**.*..*.**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 201
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ...******..
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 202
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x00000360,  // ..**.**....
+     0x000003E0,  // ..*****....
+     0x000003B0,  // ..***.**...
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 203
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001E0,  // ...****....
+     0x00000130,  // ...*..**...
+     0x00000330,  // ..**..**...
+     0x00000218,  // ..*....**..
+     0x00000218,  // ..*....**..
+     0x00000618,  // .**....**..
+     0x0000040C,  // .*......**.
+     0x0000040C,  // .*......**.
+     0x00000F1E,  // ****...****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 204
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000E0E,  // ***.....***
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x0000071C,  // .***...***.
+     0x0000071C,  // .***...***.
+     0x000005BC,  // .*.**.****.
+     0x000005AC,  // .*.**.*.**.
+     0x000005EC,  // .*.****.**.
+     0x000004CC,  // .*..**..**.
+     0x000004CC,  // .*..**..**.
+     0x000004CC,  // .*..**..**.
+     0x00000E1E,  // ***....****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 205
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000071E,  // .***...****
+     0x0000030C,  // ..**....**.
+     0x0000038C,  // ..***...**.
+     0x0000038C,  // ..***...**.
+     0x0000034C,  // ..**.*..**.
+     0x0000034C,  // ..**.*..**.
+     0x0000032C,  // ..**..*.**.
+     0x0000032C,  // ..**..*.**.
+     0x0000031C,  // ..**...***.
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x0000078C,  // .****...**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 206
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000204,  // ..*......*.
+     0x000003FC,  // ..********.
+     0x000003FC,  // ..********.
+     0x00000204,  // ..*......*.
+     0x00000000,  // ...........
+     0x00000088,  // ....*...*..
+     0x000000F8,  // ....*****..
+     0x000000F8,  // ....*****..
+     0x00000088,  // ....*...*..
+     0x00000000,  // ...........
+     0x00000402,  // .*........*
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000402,  // .*........*
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 207
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x0000039C,  // ..***..***.
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 208
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 209
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x000003F0,  // ..******...
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000007C0,  // .*****.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 210
+     0, 19,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 211
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x00000304,  // ..**.....*.
+     0x00000384,  // ..***....*.
+     0x00000180,  // ...**......
+     0x000001C0,  // ...***.....
+     0x000000E0,  // ....***....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000100,  // ...*.......
+     0x00000304,  // ..**.....*.
+     0x00000204,  // ..*......*.
+     0x000003FC,  // ..********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 212
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x00000462,  // .*...**...*
+     0x00000462,  // .*...**...*
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 213
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000492,  // .*..*..*..*
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 214
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x0000036C,  // ..**.**.**.
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x00000666,  // .**..**..**
+     0x0000036C,  // ..**.**.**.
+     0x000001F8,  // ...******..
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 215
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000079E,  // .****..****
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x00000090,  // ....*..*...
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x000000B0,  // ....*.**...
+     0x00000198,  // ...**..**..
+     0x00000118,  // ...*...**..
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 216
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000666,  // .**..**..**
+     0x0000036C,  // ..**.**.**.
+     0x0000036C,  // ..**.**.**.
+     0x0000036C,  // ..**.**.**.
+     0x000001F8,  // ...******..
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 217
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x0000039C,  // ..***..***.
+     0x0000030C,  // ..**....**.
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x00000606,  // .**......**
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x00000492,  // .*..*..*..*
+     0x0000079E,  // .****..****
+     0x0000039C,  // ..***..***.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 218
+     11, 19,
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x000001F8,  // ...******..
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 219
+     11, 19,
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x0000030C,  // ..**....**.
+     0x0000079E,  // .****..****
+     0x00000492,  // .*..*..*..*
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 220
+     11, 19,
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001C4,  // ...***...*.
+     0x0000036C,  // ..**.**.**.
+     0x00000628,  // .**...*.*..
+     0x00000638,  // .**...***..
+     0x00000630,  // .**...**...
+     0x00000630,  // .**...**...
+     0x0000037A,  // ..**.****.*
+     0x000001CC,  // ...***..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 221
+     11, 19,
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x00000318,  // ..**...**..
+     0x00000300,  // ..**.......
+     0x000001E0,  // ...****....
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000388,  // ..***...*..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 222
+     11, 19,
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000020,  // ......*....
+     0x00000020,  // ......*....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000370,  // ..**.***...
+     0x000005D8,  // .*.***.**..
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000008C,  // ....*...**.
+     0x0000000C,  // ........**.
+     0x00000004,  // .........*.
+     0x00000000,  // ...........
+  },
+  {             // 223
+     11, 19,
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001C0,  // ...***.....
+     0x00000260,  // ..*..**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000064,  // .....**..*.
+     0x00000038,  // ......***..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 224
+     11, 19,
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000358,  // ..**.*.**..
+     0x00000318,  // ..**...**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000318,  // ..**...**..
+     0x0000058C,  // .*.**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 225
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001C4,  // ...***...*.
+     0x0000036C,  // ..**.**.**.
+     0x00000628,  // .**...*.*..
+     0x00000638,  // .**...***..
+     0x00000630,  // .**...**...
+     0x00000630,  // .**...**...
+     0x0000037A,  // ..**.****.*
+     0x000001CC,  // ...***..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 226
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x000001B8,  // ...**.***..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x00000370,  // ..**.***...
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000398,  // ..***..**..
+     0x00000370,  // ..**.***...
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000200,  // ..*........
+     0x00000000,  // ...........
+  },
+  {             // 227
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000182,  // ...**.....*
+     0x000003C4,  // ..****...*.
+     0x0000026C,  // ..*..**.**.
+     0x00000428,  // .*....*.*..
+     0x00000438,  // .*....***..
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+  },
+  {             // 228
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000070,  // .....***...
+     0x000000D8,  // ....**.**..
+     0x000000C8,  // ....**..*..
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 229
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x00000318,  // ..**...**..
+     0x00000300,  // ..**.......
+     0x000001E0,  // ...****....
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000388,  // ..***...*..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 230
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000330,  // ..**..**...
+     0x000001F0,  // ...*****...
+     0x000003E0,  // ..*****....
+     0x00000700,  // .***.......
+     0x00000E00,  // ***........
+     0x00000C00,  // **.........
+     0x00000C00,  // **.........
+     0x00000C00,  // **.........
+     0x00000E00,  // ***........
+     0x00000700,  // .***.......
+     0x00000380,  // ..***......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000320,  // ..**..*....
+     0x000003C0,  // ..****.....
+     0x00000000,  // ...........
+  },
+  {             // 231
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000370,  // ..**.***...
+     0x000005D8,  // .*.***.**..
+     0x0000058C,  // .*.**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000008C,  // ....*...**.
+     0x0000000C,  // ........**.
+     0x00000004,  // .........*.
+     0x00000000,  // ...........
+  },
+  {             // 232
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 233
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001C0,  // ...***.....
+     0x00000260,  // ..*..**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000064,  // .....**..*.
+     0x00000038,  // ......***..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 234
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000318,  // ..**...**..
+     0x00000738,  // .***..***..
+     0x00000360,  // ..**.**....
+     0x000003C0,  // ..****.....
+     0x00000360,  // ..**.**....
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x0000078C,  // .****...**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 235
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000580,  // .*.**......
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001E0,  // ...****....
+     0x00000130,  // ...*..**...
+     0x00000330,  // ..**..**...
+     0x00000218,  // ..*....**..
+     0x0000061A,  // .**....**.*
+     0x0000040C,  // .*......**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 236
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000210,  // ..*....*...
+     0x00000630,  // .**...**...
+     0x00000630,  // .**...**...
+     0x00000630,  // .**...**...
+     0x00000630,  // .**...**...
+     0x00000630,  // .**...**...
+     0x00000774,  // .***.***.*.
+     0x000005D8,  // .*.***.**..
+     0x00000400,  // .*.........
+     0x00000400,  // .*.........
+     0x00000400,  // .*.........
+     0x00000000,  // ...........
+  },
+  {             // 237
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000070C,  // .***....**.
+     0x0000030C,  // ..**....**.
+     0x00000188,  // ...**...*..
+     0x00000188,  // ...**...*..
+     0x000000D0,  // ....**.*...
+     0x000000D0,  // ....**.*...
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 238
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x00000080,  // ....*......
+     0x00000078,  // .....****..
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000078,  // .....****..
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000001C0,  // ...***.....
+     0x00000070,  // .....***...
+     0x00000008,  // ........*..
+     0x00000048,  // .....*..*..
+     0x00000070,  // .....***...
+     0x00000000,  // ...........
+  },
+  {             // 239
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 240
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001FE,  // ...********
+     0x000003FC,  // ..********.
+     0x00000490,  // .*..*..*...
+     0x00000090,  // ....*..*...
+     0x00000090,  // ....*..*...
+     0x00000192,  // ...**..*..*
+     0x0000019E,  // ...**..****
+     0x0000030C,  // ..**....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 241
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000398,  // ..***..**..
+     0x00000370,  // ..**.***...
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000000,  // ...........
+  },
+  {             // 242
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x000001F8,  // ...******..
+     0x00000308,  // ..**....*..
+     0x00000200,  // ..*........
+     0x00000200,  // ..*........
+     0x00000200,  // ..*........
+     0x000003F0,  // ..******...
+     0x000001F8,  // ...******..
+     0x00000008,  // ........*..
+     0x00000008,  // ........*..
+     0x00000070,  // .....***...
+     0x00000000,  // ...........
+  },
+  {             // 243
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000FE,  // ....*******
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 244
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001FC,  // ...*******.
+     0x000003F8,  // ..*******..
+     0x00000440,  // .*...*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000044,  // .....*...*.
+     0x00000078,  // .....****..
+     0x00000030,  // ......**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 245
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000318,  // ..**...**..
+     0x0000058C,  // .*.**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 246
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x000001F0,  // ...*****...
+     0x00000358,  // ..**.*.**..
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x00000358,  // ..**.*.**..
+     0x000001F0,  // ...*****...
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+  },
+  {             // 247
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000602,  // .**.......*
+     0x00000506,  // .*.*.....**
+     0x0000018C,  // ...**...**.
+     0x00000098,  // ....*..**..
+     0x000000F0,  // ....****...
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x00000190,  // ...**..*...
+     0x00000318,  // ..**...**..
+     0x0000060A,  // .**.....*.*
+     0x00000406,  // .*.......**
+     0x00000000,  // ...........
+  },
+  {             // 248
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000C46,  // **...*...**
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x0000064C,  // .**..*..**.
+     0x00000358,  // ..**.*.**..
+     0x00000358,  // ..**.*.**..
+     0x000001F0,  // ...*****...
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+  },
+  {             // 249
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000308,  // ..**....*..
+     0x00000604,  // .**......*.
+     0x00000406,  // .*.......**
+     0x00000466,  // .*...**..**
+     0x00000466,  // .*...**..**
+     0x00000666,  // .**..**..**
+     0x000007FE,  // .**********
+     0x0000039C,  // ..***..***.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 250
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000330,  // ..**..**...
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000380,  // ..***......
+     0x000004C0,  // .*..**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C8,  // ....**..*..
+     0x00000070,  // .....***...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 251
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000318,  // ..**...**..
+     0x0000058C,  // .*.**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 252
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000030,  // ......**...
+     0x00000020,  // ......*....
+     0x00000020,  // ......*....
+     0x00000000,  // ...........
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 253
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000318,  // ..**...**..
+     0x0000058C,  // .*.**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x0000018C,  // ...**...**.
+     0x00000198,  // ...**..**..
+     0x000000F0,  // ....****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 254
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x00000060,  // .....**....
+     0x00000040,  // .....*.....
+     0x00000040,  // .....*.....
+     0x00000000,  // ...........
+     0x00000308,  // ..**....*..
+     0x00000604,  // .**......*.
+     0x00000406,  // .*.......**
+     0x00000466,  // .*...**..**
+     0x00000466,  // .*...**..**
+     0x00000666,  // .**..**..**
+     0x000007FE,  // .**********
+     0x0000039C,  // ..***..***.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 255
+     11, 19,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  };
diff --git a/fontsml.c b/fontsml.c
new file mode 100644
index 000000000..fae029da6
--- /dev/null
+++ b/fontsml.c
@@ -0,0 +1,5602 @@
+cFont::tPixelData FontSml_iso8859_1[][24] = {
+  {             // 32
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 33
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 35
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000090,  // ...*..*...
+     0x00000090,  // ...*..*...
+     0x00000090,  // ...*..*...
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000120,  // ..*..*....
+     0x00000120,  // ..*..*....
+     0x00000120,  // ..*..*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 36
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000020,  // .....*....
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000032C,  // .**..*.**.
+     0x00000320,  // .**..*....
+     0x000003A0,  // .***.*....
+     0x000001E0,  // ..****....
+     0x000000F8,  // ...*****..
+     0x0000003C,  // .....****.
+     0x00000026,  // .....*..**
+     0x00000326,  // .**..*..**
+     0x000003AE,  // .***.*.***
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000020,  // .....*....
+     0x00000020,  // .....*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 37
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007860,  // ..****....**....
+     0x0000CCC0,  // .**..**..**.....
+     0x0000CCC0,  // .**..**..**.....
+     0x0000CD80,  // .**..**.**......
+     0x0000CD80,  // .**..**.**......
+     0x00007B00,  // ..****.**.......
+     0x00000300,  // .......**.......
+     0x00000678,  // ......**..****..
+     0x000006CC,  // ......**.**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x000018CC,  // ....**...**..**.
+     0x00001878,  // ....**....****..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 38
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000780,  // ...****......
+     0x00000FC0,  // ..******.....
+     0x00000CC0,  // ..**..**.....
+     0x00000CC0,  // ..**..**.....
+     0x00000780,  // ...****......
+     0x00000F80,  // ..*****......
+     0x00001DD8,  // .***.***.**..
+     0x000018D8,  // .**...**.**..
+     0x00001878,  // .**....****..
+     0x00001870,  // .**....***...
+     0x00001CF8,  // .***..*****..
+     0x00000FDC,  // ..******.***.
+     0x0000078E,  // ...****...***
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 39
+     3, 22,
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+  },
+  {             // 40
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+  },
+  {             // 41
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000020,  // .*....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000020,  // .*....
+  },
+  {             // 42
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000010,  // ...*...
+     0x00000054,  // .*.*.*.
+     0x0000007C,  // .*****.
+     0x00000010,  // ...*...
+     0x0000007C,  // .*****.
+     0x00000054,  // .*.*.*.
+     0x00000010,  // ...*...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 43
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 44
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 45
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000007C,  // *****. added by hand to avoid flickering!!!
+     0x0000007C,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 46
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 48
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 49
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x000001F0,  // ..*****...
+     0x000001F0,  // ..*****...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 50
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000000C,  // .......**.
+     0x0000001C,  // ......***.
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x000001C0,  // ..***.....
+     0x00000380,  // .***......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 51
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000018,  // ......**..
+     0x00000070,  // ....***...
+     0x00000078,  // ....****..
+     0x0000001C,  // ......***.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 52
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000038,  // .....***..
+     0x00000078,  // ....****..
+     0x000000D8,  // ...**.**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000318,  // .**...**..
+     0x00000618,  // **....**..
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 53
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003F8,  // .*******..
+     0x000003F8,  // .*******..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003F0,  // .******...
+     0x000003F8,  // .*******..
+     0x0000031C,  // .**...***.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 54
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000370,  // .**.***...
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000038C,  // .***...**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 55
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x0000000C,  // .......**.
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 56
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 57
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000001FC,  // ..*******.
+     0x000000EC,  // ...***.**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000318,  // .**...**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 58
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 59
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 60
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000003C,  // .....****.
+     0x000000F0,  // ...****...
+     0x000001C0,  // ..***.....
+     0x00000300,  // .**.......
+     0x000001C0,  // ..***.....
+     0x000000F0,  // ...****...
+     0x0000003C,  // .....****.
+     0x0000000C,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 61
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 62
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x000003C0,  // .****.....
+     0x000000F0,  // ...****...
+     0x00000038,  // .....***..
+     0x0000000C,  // .......**.
+     0x00000038,  // .....***..
+     0x000000F0,  // ...****...
+     0x000003C0,  // .****.....
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 63
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F8,  // .*******..
+     0x00000318,  // .**...**..
+     0x00000318,  // .**...**..
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 64
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x00007038,  // ....***......***..
+     0x0000C018,  // ...**.........**..
+     0x00018F4C,  // ..**...****.*..**.
+     0x00019DCC,  // ..**..***.***..**.
+     0x000318CC,  // .**...**...**..**.
+     0x0003318C,  // .**..**...**...**.
+     0x00033198,  // .**..**...**..**..
+     0x00033198,  // .**..**...**..**..
+     0x00033330,  // .**..**..**..**...
+     0x00033FE0,  // .**..*********....
+     0x00019DC0,  // ..**..***.***.....
+     0x0001C000,  // ..***.............
+     0x0000E000,  // ...***............
+     0x00007FC0,  // ....*********.....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+  },
+  {             // 65
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 66
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FE0,  // .********....
+     0x00001FF0,  // .*********...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001830,  // .**.....**...
+     0x00001FF0,  // .*********...
+     0x00001FF8,  // .**********..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00001FF8,  // .**********..
+     0x00001FF0,  // .*********...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 67
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 68
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FE0,  // .*********....
+     0x00003FF0,  // .**********...
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00003018,  // .**.......**..
+     0x00003038,  // .**......***..
+     0x00003FF0,  // .**********...
+     0x00003FE0,  // .*********....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 69
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 70
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 71
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // .....******....
+     0x00001FF8,  // ...**********..
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x0000607C,  // .**......*****.
+     0x0000607C,  // .**......*****.
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FFC,  // ...***********.
+     0x000007EC,  // .....******.**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003FF8,  // .***********..
+     0x00003FF8,  // .***********..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 73
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000618,  // **....**..
+     0x00000618,  // **....**..
+     0x00000738,  // ***..***..
+     0x000003F0,  // .******...
+     0x000001E0,  // ..****....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 75
+     13, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000181C,  // ..**......***.
+     0x00001838,  // ..**.....***..
+     0x00001870,  // ..**....***...
+     0x000018E0,  // ..**...***....
+     0x000019C0,  // ..**..***.....
+     0x00001B80,  // ..**.***......
+     0x00001F00,  // ..*****.......
+     0x00001F80,  // ..******......
+     0x000019C0,  // ..**..***.....
+     0x000018E0,  // ..**...***....
+     0x00001870,  // ..**....***...
+     0x00001838,  // ..**.....***..
+     0x0000181C,  // ..**......***.
+     0x0000180E,  // ..**.......***
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 76
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 77
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x0000E01C,  // .***........***.
+     0x0000F03C,  // .****......****.
+     0x0000F03C,  // .****......****.
+     0x0000D86C,  // .**.**....**.**.
+     0x0000D86C,  // .**.**....**.**.
+     0x0000CCCC,  // .**..**..**..**.
+     0x0000CCCC,  // .**..**..**..**.
+     0x0000C48C,  // .**...*..*...**.
+     0x0000C78C,  // .**...****...**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 78
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003818,  // .***......**..
+     0x00003C18,  // .****.....**..
+     0x00003C18,  // .****.....**..
+     0x00003618,  // .**.**....**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x00003198,  // .**...**..**..
+     0x00003198,  // .**...**..**..
+     0x000030D8,  // .**....**.**..
+     0x00003078,  // .**.....****..
+     0x00003078,  // .**.....****..
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 79
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF0,  // ..********...
+     0x00000FF8,  // ..*********..
+     0x00000C1C,  // ..**.....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000FF8,  // ..*********..
+     0x00000FF0,  // ..********...
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 81
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x000070DC,  // .***....**.***.
+     0x000030D8,  // ..**....**.**..
+     0x00003878,  // ..***....****..
+     0x00001FF0,  // ...*********...
+     0x000007D8,  // .....*****.**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FE0,  // .*********....
+     0x00003FF0,  // .**********...
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003038,  // .**......***..
+     0x00003FF0,  // .**********...
+     0x00003FE0,  // .*********....
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 83
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003C0,  // ....****.....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x00001818,  // .**......**..
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000070,  // .......***...
+     0x00000038,  // ........***..
+     0x00000018,  // .........**..
+     0x00001818,  // .**......**..
+     0x00001C38,  // .***....***..
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 84
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 86
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 87
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x00030F0C,  // .**....****....**.
+     0x00018F18,  // ..**...****...**..
+     0x00018918,  // ..**...*..*...**..
+     0x00019998,  // ..**..**..**..**..
+     0x00019998,  // ..**..**..**..**..
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D0B0,  // ...**.*....*.**...
+     0x000070E0,  // ....***....***....
+     0x00006060,  // ....**......**....
+     0x00006060,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 88
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x00000360,  // ....**.**....
+     0x00000630,  // ...**...**...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 89
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000E70,  // ..***..***...
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 90
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 91
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+  },
+  {             // 92
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 93
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+  },
+  {             // 94
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x000000D8,  // ..**.**..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 95
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
+  },
+  {             // 96
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000018,  // **..
+     0x0000000C,  // .**.
+     0x00000006,  // ..**
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 97
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 98
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 99
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 101
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 102
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001E,  // ..****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x0000000C,  // ........**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000000E0,  // ....***....
+  },
+  {             // 104
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 105
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 106
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+  },
+  {             // 107
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x0000018C,  // .**...**.
+     0x00000198,  // .**..**..
+     0x000001B0,  // .**.**...
+     0x000001E0,  // .****....
+     0x000001F0,  // .*****...
+     0x000001B0,  // .**.**...
+     0x00000198,  // .**..**..
+     0x0000019C,  // .**..***.
+     0x0000018C,  // .**...**.
+     0x0000018E,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 108
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 109
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000DE78,  // .**.****..****..
+     0x0000FFFC,  // .**************.
+     0x0000E38C,  // .***...***...**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 111
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 112
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+  },
+  {             // 113
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+  },
+  {             // 114
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000036,  // .**.**
+     0x00000036,  // .**.**
+     0x00000038,  // .***..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 115
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000000E,  // ...***
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001A58,  // ..**.*..*.**..
+     0x00000A50,  // ...*.*..*.*...
+     0x00000E70,  // ...***..***...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 121
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 122
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ....**.
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000060,  // .**....
+     0x000000C0,  // **.....
+     0x00000060,  // .**....
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000018,  // ...**..
+     0x0000000C,  // ....**.
+  },
+  {             // 124
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+  },
+  {             // 125
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000060,  // **....
+  },
+  {             // 126
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001CC,  // ..***..**.
+     0x000003FC,  // .********.
+     0x00000338,  // .**..***..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 127
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 161
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+  },
+  {             // 162
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000010,  // ......*...
+     0x00000010,  // ......*...
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x000001AC,  // ..**.*.**.
+     0x00000320,  // .**..*....
+     0x00000320,  // .**..*....
+     0x00000320,  // .**..*....
+     0x00000320,  // .**..*....
+     0x000001AC,  // ..**.*.**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000040,  // ....*.....
+     0x00000040,  // ....*.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 163
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000300,  // .**.......
+     0x00000180,  // ..**......
+     0x000003F0,  // .******...
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000304,  // .**.....*.
+     0x000007FC,  // *********.
+     0x000006F8,  // **.*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 165
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 166
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+  },
+  {             // 167
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003C0,  // .****.....
+     0x000001F0,  // ..*****...
+     0x000001B8,  // ..**.***..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x0000038C,  // .***...**.
+     0x000001CC,  // ..***..**.
+     0x000000F8,  // ...*****..
+     0x00000038,  // .....***..
+     0x0000001C,  // ......***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+  },
+  {             // 168
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000006C,  // **.**.
+     0x0000006C,  // **.**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 169
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001830,  // ...**.....**...
+     0x00002008,  // ..*.........*..
+     0x00002388,  // ..*...***...*..
+     0x00004444,  // .*...*...*...*.
+     0x00004844,  // .*..*....*...*.
+     0x00004804,  // .*..*........*.
+     0x00004804,  // .*..*........*.
+     0x00004804,  // .*..*........*.
+     0x00004444,  // .*...*...*...*.
+     0x00002388,  // ..*...***...*..
+     0x00002008,  // ..*.........*..
+     0x00001830,  // ...**.....**...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000004C,  // .*..**.
+     0x0000001C,  // ...***.
+     0x00000024,  // ..*..*.
+     0x0000006C,  // .**.**.
+     0x00000034,  // ..**.*.
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 171
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000006C,  // ...**.**.
+     0x000000D8,  // ..**.**..
+     0x000001B0,  // .**.**...
+     0x000001B0,  // .**.**...
+     0x000000D8,  // ..**.**..
+     0x0000006C,  // ...**.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 172
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 173
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000007C,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 174
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00001830,  // ..**.....**...
+     0x00002008,  // .*.........*..
+     0x000027C8,  // .*..*****..*..
+     0x00004424,  // *...*....*..*.
+     0x00004424,  // *...*....*..*.
+     0x00004424,  // *...*....*..*.
+     0x000047C4,  // *...*****...*.
+     0x00004484,  // *...*..*....*.
+     0x00004444,  // *...*...*...*.
+     0x00002428,  // .*..*....*.*..
+     0x00002008,  // .*.........*..
+     0x00001830,  // ..**.....**...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 175
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003E,  // *****
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 176
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000006C,  // .**.**.
+     0x00000044,  // .*...*.
+     0x0000006C,  // .**.**.
+     0x00000038,  // ..***..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 177
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 178
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000038,  // .***..
+     0x0000007C,  // *****.
+     0x0000004C,  // *..**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x0000007C,  // *****.
+     0x0000007C,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 179
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000038,  // .***..
+     0x0000007C,  // *****.
+     0x0000004C,  // *..**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000004C,  // *..**.
+     0x0000007C,  // *****.
+     0x00000038,  // .***..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 180
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // ..**
+     0x0000000C,  // .**.
+     0x00000018,  // **..
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 181
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000003FC,  // .********.
+     0x0000036C,  // .**.**.**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+  },
+  {             // 182
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000FC,  // ...******.
+     0x000001C8,  // ..***..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000001C8,  // ..***..*..
+     0x000000C8,  // ...**..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+  },
+  {             // 183
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 184
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x0000001C,  // .***.
+     0x00000006,  // ...**
+     0x00000036,  // **.**
+     0x0000003C,  // ****.
+  },
+  {             // 185
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000078,  // ****..
+     0x00000078,  // ****..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 186
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000006C,  // .**.**.
+     0x00000044,  // .*...*.
+     0x00000044,  // .*...*.
+     0x0000006C,  // .**.**.
+     0x00000038,  // ..***..
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 187
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001B0,  // .**.**...
+     0x000000D8,  // ..**.**..
+     0x0000006C,  // ...**.**.
+     0x0000006C,  // ...**.**.
+     0x000000D8,  // ..**.**..
+     0x000001B0,  // .**.**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 188
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003030,  // ..**......**...
+     0x0000F030,  // ****......**...
+     0x0000F060,  // ****.....**....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00003188,  // ..**...**...*..
+     0x00003118,  // ..**...*...**..
+     0x00003338,  // ..**..**..***..
+     0x00000678,  // .....**..****..
+     0x000006D8,  // .....**.**.**..
+     0x00000CFC,  // ....**..******.
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003030,  // ..**......**...
+     0x0000F030,  // ****......**...
+     0x0000F060,  // ****.....**....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x000031B8,  // ..**...**.***..
+     0x0000317C,  // ..**...*.*****.
+     0x0000334C,  // ..**..**.*..**.
+     0x0000060C,  // .....**.....**.
+     0x00000618,  // .....**....**..
+     0x00000C30,  // ....**....**...
+     0x0000187C,  // ...**....*****.
+     0x0000187C,  // ...**....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007030,  // .***......**...
+     0x0000F830,  // *****.....**...
+     0x00009860,  // *..**....**....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00009988,  // *..**..**...*..
+     0x0000F918,  // *****..*...**..
+     0x00007338,  // .***..**..***..
+     0x00000678,  // .....**..****..
+     0x000006D8,  // .....**.**.**..
+     0x00000CFC,  // ....**..******.
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000001C0,  // ..***.....
+     0x00000380,  // .***......
+     0x00000318,  // .**...**..
+     0x00000318,  // .**...**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+  },
+  {             // 192
+     13, 22,
+     0x00000600,  // ...**........
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 193
+     13, 22,
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 194
+     13, 22,
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 195
+     13, 22,
+     0x00000320,  // ....**..*....
+     0x000005A0,  // ...*.**.*....
+     0x000004C0,  // ...*..**.....
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 196
+     13, 22,
+     0x00000000,  // .............
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 197
+     13, 22,
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000240,  // ....*..*.....
+     0x00000240,  // ....*..*.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 198
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001FFC,  // ......***********.
+     0x00001FFC,  // ......***********.
+     0x00003600,  // .....**.**........
+     0x00003600,  // .....**.**........
+     0x00006600,  // ....**..**........
+     0x00006600,  // ....**..**........
+     0x0000C7F8,  // ...**...********..
+     0x0000C7F8,  // ...**...********..
+     0x0000FE00,  // ...*******........
+     0x0001FE00,  // ..********........
+     0x00018600,  // ..**....**........
+     0x00018600,  // ..**....**........
+     0x000307FC,  // .**.....*********.
+     0x000307FC,  // .**.....*********.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 199
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000006C0,  // ....**.**.....
+     0x00000780,  // ....****......
+  },
+  {             // 200
+     13, 22,
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 201
+     13, 22,
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 202
+     13, 22,
+     0x000000C0,  // ......**.....
+     0x000001E0,  // .....****....
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 203
+     13, 22,
+     0x00000000,  // .............
+     0x00000330,  // ....**..**...
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 204
+     6, 22,
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 22,
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 22,
+     0x00000018,  // ..**..
+     0x0000003C,  // .****.
+     0x00000042,  // *....*
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 207
+     6, 22,
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FE0,  // ..*********....
+     0x00003FF0,  // ..**********...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000FE0C,  // *******.....**.
+     0x0000FE0C,  // *******.....**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x00003FF0,  // ..**********...
+     0x00003FE0,  // ..*********....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 209
+     14, 22,
+     0x00000320,  // .....**..*....
+     0x000005A0,  // ....*.**.*....
+     0x000004C0,  // ....*..**.....
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003818,  // .***......**..
+     0x00003C18,  // .****.....**..
+     0x00003C18,  // .****.....**..
+     0x00003618,  // .**.**....**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x00003198,  // .**...**..**..
+     0x00003198,  // .**...**..**..
+     0x000030D8,  // .**....**.**..
+     0x00003078,  // .**.....****..
+     0x00003078,  // .**.....****..
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 210
+     15, 22,
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 22,
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 22,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 22,
+     0x00000320,  // ......**..*....
+     0x000005A0,  // .....*.**.*....
+     0x000004C0,  // .....*..**.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 22,
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x00000606,  // **......**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 216
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007CC,  // .....*****..**.
+     0x00001FF8,  // ...**********..
+     0x00003830,  // ..***.....**...
+     0x00003078,  // ..**.....****..
+     0x000070DC,  // .***....**.***.
+     0x0000618C,  // .**....**...**.
+     0x0000630C,  // .**...**....**.
+     0x0000620C,  // .**...*.....**.
+     0x0000660C,  // .**..**.....**.
+     0x00006C1C,  // .**.**.....***.
+     0x00003818,  // ..***......**..
+     0x00003838,  // ..***.....***..
+     0x00006FF0,  // .**.********...
+     0x0000C7C0,  // **...*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     14, 22,
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 218
+     14, 22,
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 219
+     14, 22,
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 220
+     14, 22,
+     0x00000000,  // ..............
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 221
+     13, 22,
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000E70,  // ..***..***...
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 222
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 223
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001B8,  // .**.***..
+     0x000001B8,  // .**.***..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001BC,  // .**.****.
+     0x000001B8,  // .**.***..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 224
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 225
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 226
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000001E0,  // ...****....
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 227
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000190,  // ...**..*...
+     0x000002D0,  // ..*.**.*...
+     0x00000260,  // ..*..**....
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 228
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000330,  // ..**..**...
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 229
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x00000120,  // ...*..*....
+     0x00000120,  // ...*..*....
+     0x000000C0,  // ....**.....
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 230
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007EF0,  // ...******.****...
+     0x0000E7F8,  // ..***..********..
+     0x0000C30C,  // ..**....**....**.
+     0x0000070C,  // .......***....**.
+     0x00007FFC,  // ...*************.
+     0x0000E300,  // ..***...**.......
+     0x0000C300,  // ..**....**.......
+     0x0000C38C,  // ..**....***...**.
+     0x0000E7FC,  // ..***..*********.
+     0x00007AF0,  // ...****.*.****...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 231
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000060,  // ....**....
+     0x00000030,  // .....**...
+     0x000001B0,  // ..**.**...
+     0x000001E0,  // ..****....
+  },
+  {             // 232
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x00000060,  // ....**....
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 233
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 234
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 235
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 236
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000018,  // **..
+     0x0000000C,  // .**.
+     0x00000006,  // ..**
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 237
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // ..**
+     0x0000000C,  // .**.
+     0x00000018,  // **..
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 238
+     4, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // ..**..
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 239
+     4, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 240
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x000001B0,  // ...**.**...
+     0x000001C0,  // ...***.....
+     0x00000260,  // ..*..**....
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 241
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C8,  // ...**..*..
+     0x00000168,  // ..*.**.*..
+     0x00000130,  // ..*..**...
+     0x00000000,  // ..........
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 242
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 243
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 244
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000001E0,  // ...****....
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 245
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000190,  // ...**..*...
+     0x000002D0,  // ..*.**.*...
+     0x00000260,  // ..*..**....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 246
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 247
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 248
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E6,  // ....***..**
+     0x000003FC,  // ..********.
+     0x00000318,  // ..**...**..
+     0x0000063C,  // .**...****.
+     0x0000066C,  // .**..**.**.
+     0x000006CC,  // .**.**..**.
+     0x0000078C,  // .****...**.
+     0x00000318,  // ..**...**..
+     0x000007F8,  // .********..
+     0x00000CE0,  // **..***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 249
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x00000060,  // ....**....
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 250
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 251
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 252
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 253
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 254
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+  },
+  {             // 255
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  };
diff --git a/i18n.c b/i18n.c
index fc0e9e3c3..6a35e5a87 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.134 2003/09/11 13:51:56 kls Exp $
+ * $Id: i18n.c 1.137 2003/12/19 13:32:10 kls Exp $
  *
  * Translations provided by:
  *
@@ -51,9 +51,14 @@
  *    which means that it should be 'Italiano', not 'Italian').
  *    Note that only the characters defined in 'fontosd.c' will
  *    be available!
- * 4. Compile VDR and test the new language by switching to it
+ * 4. If your language requires a character set other than the default iso8859-1
+ *    you need to make the appropriate entry in the second phrase below, and
+ *    also create the necessary font files in case they are not yet part of
+ *    the VDR source (see how this is done for iso8859-7, for instance). Don't
+ *    forget to adjust the files font.h and font.c accordingly.
+ * 5. Compile VDR and test the new language by switching to it
  *    in the "Setup/OSD" menu.
- * 5. Send the modified 'i18n.c' file to <kls@cadsoft.de> to have
+ * 6. Send the modified files to <kls@cadsoft.de> to have
  *    it included in the next version of VDR.
  *
  * In case an English phrase is used in more than one context (and might need
@@ -82,12 +87,30 @@ const tI18nPhrase Phrases[] = {
     "suomi", // this is not a typo - it's really lowercase!
     "Polski",
     "Espa�ol",
-    "Ellinika",
+    "��������", // Greek
     "Svenska",
     "Romaneste",
     "Magyar",
     "Catal�",
   },
+  // The character set needed for this language (this MUST be the second phrase!):
+  { "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-7",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+    "iso8859-1",
+  },
   // Menu titles:
   { "VDR",
     "VDR",
@@ -117,7 +140,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmisto",
     "Program",
     "Gu�a de Programaci�n",
-    "Programma",
+    "���������",
     "Program",
     "Program",
     "Program",
@@ -134,7 +157,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavat",
     "Kanaly",
     "Canales",
-    "Kanalia",
+    "�������",
     "Kanaler",
     "Canale",
     "Csatorn�k",
@@ -151,7 +174,7 @@ const tI18nPhrase Phrases[] = {
     "Ajastin",
     "Timery",
     "Timer",
-    "Programmatismos",
+    "��������������",
     "Timers",
     "Timere",
     "Felv�tel beprogramoz�sa",
@@ -168,7 +191,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteet",
     "Nagrania",
     "Grabaciones",
-    "Egrafes",
+    "��������",
     "Inspelningar",
     "Inregistrari",
     "Felvett ad�sok",
@@ -185,7 +208,7 @@ const tI18nPhrase Phrases[] = {
     "Asetukset",
     "Nastawy",
     "Configuraci�n",
-    "Rithmisis",
+    "���������",
     "Inst�llningar",
     "Setari",
     "Be�ll�t�sok",
@@ -202,7 +225,7 @@ const tI18nPhrase Phrases[] = {
     "Komennot",
     "Rozkazy",
     "�rdenes",
-    "Entoles",
+    "�������",
     "Kommandon",
     "Comenzi",
     "Parancsok",
@@ -219,7 +242,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennuskomennot",
     "Rozkazy Nagran",
     "�rdenes de grabaci�n",
-    "Entoles gia egrafes",
+    "������� ��� ��������",
     "Inspelningskommandon",
     "",// TODO
     "Parancsok a felvett filmekhez",
@@ -236,7 +259,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa kanavaa",
     "Ustawienie kanalu",
     "Modificar canal",
-    "Prosarmogi kanaliou",
+    "����������� ��������",
     "�ndra kanal",
     "Editare canale",
     "Csatorn�k be�ll�t�sa",
@@ -253,7 +276,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa ajastinta",
     "Ustawienie timerow",
     "Modificar timer",
-    "Prosarmogi Programmatismou",
+    "���������� �������������",
     "�ndra timer",
     "Editare timere",
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
@@ -270,7 +293,7 @@ const tI18nPhrase Phrases[] = {
     "Tapahtuma",
     "Audycja",
     "Evento",
-    "Ekpompi",
+    "�������",
     "S�ndning",
     "Evenimente",
     "Ad�s",
@@ -287,7 +310,7 @@ const tI18nPhrase Phrases[] = {
     "Tiedot",
     "Zawartosc",
     "Res�men",
-    "Periexomeno",
+    "�����������",
     "Sammanfattning",
     "Cuprins",
     "Tartalom",
@@ -304,7 +327,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmisto - %s",
     "Program - %s",
     "Programa - %s",
-    "Programma - %s",
+    "��������� - %s",
     "Program - %s",
     "Program - %s",
     "Program - %s",
@@ -321,7 +344,7 @@ const tI18nPhrase Phrases[] = {
     "Menossa nyt",
     "Program biezacy",
     "�Qu� hay ahora?",
-    "Trexon Programma",
+    "������ ���������",
     "Vilket program s�nds nu?",
     "Programul actual?",
     "Mi megy most?",
@@ -338,7 +361,7 @@ const tI18nPhrase Phrases[] = {
     "Tulossa seuraavaksi",
     "Program nastepny",
     "�Qu� hay proximo?",
-    "Epomeno Programma",
+    "������� ���������",
     "Vilket �r n�sta program?",
     "Programul urmator?",
     "Mi k�vetkezik?",
@@ -356,7 +379,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa",
     "Edycja",
     "Modificar",
-    "Prosarmogi",
+    "����������",
     "�ndra",
     "Modificare",
     "Be�ll�tani",
@@ -373,7 +396,7 @@ const tI18nPhrase Phrases[] = {
     "Uusi",
     "Nowy",
     "Nuevo",
-    "Neo",
+    "���",
     "Ny",
     "Nou",
     "�j",
@@ -390,7 +413,7 @@ const tI18nPhrase Phrases[] = {
     "Poista",
     "Usunac",
     "Borrar",
-    "Diagrafi",
+    "��������",
     "Ta bort",
     "Sterge",
     "T�r�lni",
@@ -407,7 +430,7 @@ const tI18nPhrase Phrases[] = {
     "Siirr�",
     "Zaznaczyc",
     "Marcar",
-    "Epilogi",
+    "�������",
     "M�rk",
     "Marcheaza",
     "Megjel�lni",
@@ -424,7 +447,7 @@ const tI18nPhrase Phrases[] = {
     "P��ll�/Pois",
     "Zal./ Wyl.",
     "On/Off",
-    "Anoixto/Kleisto",
+    "A����/K������",
     "P�/Av",
     "Pornit/Oprit",
     "Be/Ki",
@@ -441,7 +464,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenna",
     "Nagrywac",
     "Grabar",
-    "Egrafi",
+    "�������",
     "Inspelning",
     "Inregistrare",
     "Felvenni",
@@ -458,7 +481,7 @@ const tI18nPhrase Phrases[] = {
     "Toista",
     "Odtwarzac",
     "Play",
-    "Anaparagogi",
+    "�����������",
     "Spela upp",
     "Redare",
     "Lej�tszani",
@@ -475,7 +498,7 @@ const tI18nPhrase Phrases[] = {
     "Alkuun",
     "Poczatek",
     "Rebobinar",
-    "Arxi",
+    "����",
     "�terspolning",
     "Inapoi",
     "Vissza az elej�re",
@@ -492,7 +515,7 @@ const tI18nPhrase Phrases[] = {
     "Lopeta",
     "Zakonczyc",
     "Parar",
-    "Terma",
+    "�����",
     "Stopp",
     "Stop",
     "Stop",
@@ -509,7 +532,7 @@ const tI18nPhrase Phrases[] = {
     "Jatka",
     "Dalej",
     "Continuar",
-    "Sinexia",
+    "��������",
     "Forts�tt",
     "Reia",
     "Tov�bb",
@@ -526,7 +549,7 @@ const tI18nPhrase Phrases[] = {
     "Yhteenveto",
     "Zawartosc",
     "Resumen",
-    "Periexomeno",
+    "�����������",
     "Sammanfattning",
     "Cuprins",
     "Tartalom",
@@ -543,7 +566,7 @@ const tI18nPhrase Phrases[] = {
     "Avaa",
     "Otworzyc",
     "Abrir",
-    "Anigma",
+    "�������",
     "�ppna",
     "Deschide",
     "Kinyitni",
@@ -560,7 +583,7 @@ const tI18nPhrase Phrases[] = {
     "Valitse",
     "Przelaczyc",
     "Cambiar",
-    "Alagi",
+    "A�����",
     "Byt",
     "Schimba",
     "�tkapcsolni",
@@ -577,7 +600,7 @@ const tI18nPhrase Phrases[] = {
     "Nyt",
     "Teraz",
     "Ahora",
-    "Tora",
+    "����",
     "Nu",
     "Acum",
     "Most",
@@ -594,7 +617,7 @@ const tI18nPhrase Phrases[] = {
     "Seuraavaksi",
     "Nastepny",
     "Siguiente",
-    "Epomeno",
+    "�������",
     "N�sta",
     "Urmator",
     "K�vetkez�",
@@ -611,7 +634,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmisto",
     "Program",
     "Programa",
-    "Programma",
+    "���������",
     "Program",
     "Program",
     "Program",
@@ -628,7 +651,7 @@ const tI18nPhrase Phrases[] = {
     "Kieli",
     "Jezyk",
     "Idioma",
-    "Glosa",
+    "������",
     "Spr�k",
     "Limba",
     "Nyelv",
@@ -645,7 +668,7 @@ const tI18nPhrase Phrases[] = {
     "Avaa",
     "Wyrzucenie",
     "Expulsar",
-    "Exsagogi",
+    "�������",
     "Mata ut",
     "Ejecteaza",
     "Kidobni",
@@ -662,7 +685,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
-    "ABC/abc",
+    "AB�/���",
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
@@ -679,7 +702,7 @@ const tI18nPhrase Phrases[] = {
     "Lis��",
     "Wstawiac",
     "Insertar",
-    "Isodos",
+    "��������",
     "Infoga",
     "Insereaza",
     "Beilleszteni",
@@ -696,7 +719,7 @@ const tI18nPhrase Phrases[] = {
     "Korvaa",
     "Przepisac",
     "Sobreescribir",
-    "Epanagrafi",
+    "�������������",
     "Skriv �ver",
     "Suprascrie",
     "�t�rni",
@@ -713,7 +736,7 @@ const tI18nPhrase Phrases[] = {
     "Valikko",
     "Menu",
     "Men�",
-    "Menou",
+    "M����",
     "Meny",
     "Meniu",
     "Men�",
@@ -730,7 +753,7 @@ const tI18nPhrase Phrases[] = {
     "Alusta",
     "Reset",
     "Reiniciar",
-    "Epanafora",
+    "���������",
     "�terst�ll",
     "",//TODO
     "Reset",
@@ -748,7 +771,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko kanava?",
     "Usunac kanal?",
     "�Eliminar canal?",
-    "Diagrafi Kanaliou?",
+    "�������� ��������?",
     "Ta bort kanalen?",
     "Sterg canalul?",
     "Csatorna t�rl�se?",
@@ -765,7 +788,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko ajastin?",
     "Usunac timer?",
     "�Eliminar timer?",
-    "Diagrafi programmatismou?",
+    "�������� �������������?",
     "Ta bort timern?",
     "Sterg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
@@ -782,7 +805,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko tallenne?",
     "Usunac nagranie?",
     "�Eliminar grabacion?",
-    "Svisimo egrafis?",
+    "�������� �������?",
     "Ta bort inspelningen?",
     "Sterg inregistrarea?",
     "Felv�tel t�rl�se?",
@@ -799,7 +822,7 @@ const tI18nPhrase Phrases[] = {
     "Ajastettu tallennus k�ynniss� - keskeytet��nk�?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
-    "Programmatismos se exselixsi - Diagrafi sigoura?",
+    "�������������� �� ������� - �������� �������?",
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
     "Timer-ul in inregistrare - sterg?",
     "Felv�tel folyamatban van - m�gis t�r�lni?",
@@ -816,7 +839,7 @@ const tI18nPhrase Phrases[] = {
     "Lopetetaanko tallennus?",
     "Zakonczyc nagranie?",
     "�Parar grabaci�n?",
-    "Akirosi egrafis?",
+    "������� ��������?",
     "Stanna inspelning?",
     "Opresc inregistrarea?",
     "Felv�tel befejezni?",
@@ -833,7 +856,7 @@ const tI18nPhrase Phrases[] = {
     "p��vastaanottimella",
     "na pierwszym interfejsie",
     "en interface primario",
-    "stin protevon karta",
+    "���� ����� �����",
     "fr�n den f�rsta enheten?",
     "pe prima interfata",
     "az els� k�rty�n",
@@ -850,7 +873,7 @@ const tI18nPhrase Phrases[] = {
     "Perutaanko muokkaus?",
     "Zakonczyc montaz?",
     "�Cancelar modificaci�n?",
-    "Akirosi epexsergasias?",
+    "A������ ������������?",
     "Avbryta redigeringen?",
     "Opresc editarea?",
     "V�g�st befejezni?",
@@ -867,7 +890,7 @@ const tI18nPhrase Phrases[] = {
     "K�ynnistet��nk� uudelleen?",
     "Rzeczywiscie nowy start?",
     "�De verdad reiniciar?",
-    "Na gini sigoura epanekinisi?",
+    "N� ����� ������� ������������?",
     "Vill du verkligen starta om?",
     "Esti sigur de repornire?",
     "T�nyleg �jraind�tani?",
@@ -884,7 +907,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennus kesken - k�ynnistet��nk� uudelleen?",
     "Nagrywanie w trakcie - rzeczywiscie nowy start?",
     "Grabando - �reiniciar?",
-    "Ginete egrafi - Telika na ginei epanekinisi?",
+    "������� ������� - ������ �� ����� ������������?",
     "Inspelning p�g�r, vill du �nd� starta om?",
     "In inregistrare - repornesc?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
@@ -901,7 +924,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennus kesken - sammutetaanko?",
     "Nagrywanie w trakcie - mimo to wylaczyc?",
     "Grabando - �apagar?",
-    "Ginete egrafi - Telika na ginei termatismos?",
+    "������� ������� - ������ �� ����� �����������?",
     "Inspelning p�g�r, vill du �nd� avbryta?",
     "In inregistrare - opresc?",
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
@@ -918,7 +941,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennus alkaa %d min kuluttua - sammutetaanko?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
     "Grabando en %d minutos, �de verdad apagar?",
-    "Anamenete egrafi se %d lepta - Telika na termatistei?",
+    "���������� ������� �� %d ����� - ������ �� �����������?",
     "Inspelning startar om %d minuter, vill du avsluta?",
     "Inregistrez in %d minute, opresc?",
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
@@ -935,7 +958,7 @@ const tI18nPhrase Phrases[] = {
     "Peru sammutus painamalla mit� tahansa n�pp�int�",
     "Dowolny przycisk zatrzyma wylaczanie",
     "Pulse una tecla para interrumpir apagar",
-    "Piese ena pliktro na akirothei o termatismos",
+    "����� ��� ������� ��� ������� �����������",
     "Tryck valfri knapp f�r att �terkalla avst�ngningen",
     "Apasa orice tasta pentru a anula inchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
@@ -953,7 +976,7 @@ const tI18nPhrase Phrases[] = {
     "Nimi",
     "Nazwa",
     "Nombre",
-    "Onoma",
+    "�����",
     "Namn",
     "Nume",
     "N�v",
@@ -970,7 +993,7 @@ const tI18nPhrase Phrases[] = {
     "Taajuus",
     "Czestotliwosc",
     "Frecuencia",
-    "Sixnotita",
+    "���������",
     "Frekvens",
     "Frecventa",
     "Frekvencia",
@@ -987,7 +1010,7 @@ const tI18nPhrase Phrases[] = {
     "Polarisaatio",
     "Polaryzacja",
     "Polarizaci�n",
-    "Polosi",
+    "������",
     "Polarisation",
     "Polarizare",
     "Polariz�ci�",
@@ -1004,7 +1027,7 @@ const tI18nPhrase Phrases[] = {
     "L�hde",
     "Zrodlo",
     "",//TODO
-    "Pigi",
+    "����������",
     "K�lla",
     "",//TODO
     "Forr�s",
@@ -1038,7 +1061,7 @@ const tI18nPhrase Phrases[] = {
     "Kuva PID",
     "Vpid",
     "Vpid",
-    "Vpid",
+    "B����� PID",
     "Video PID",
     "PID Video",
     "Vpid",
@@ -1328,7 +1351,7 @@ const tI18nPhrase Phrases[] = {
     "Aktiivinen",
     "Aktywny",
     "Activo",
-    "Energo",
+    "������",
     "Aktiv",
     "Activ",
     "Aktiv",
@@ -1345,7 +1368,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava",
     "Kanal",
     "Canal",
-    "Kanali",
+    "������",
     "Kanal",
     "Canal",
     "Csatorna",
@@ -1362,7 +1385,7 @@ const tI18nPhrase Phrases[] = {
     "P�iv�",
     "Dzien",
     "D�a",
-    "Imera",
+    "�����",
     "Dag",
     "Ziua",
     "Nap",
@@ -1379,7 +1402,7 @@ const tI18nPhrase Phrases[] = {
     "Aloitus",
     "Poczatek",
     "Comienzo",
-    "Arxi",
+    "����",
     "B�rjar",
     "Start",
     "Kezdet",
@@ -1396,7 +1419,7 @@ const tI18nPhrase Phrases[] = {
     "Lopetus",
     "Koniec",
     "Fin",
-    "Telos",
+    "�����",
     "Slutar",
     "Stop",
     "V�ge",
@@ -1413,7 +1436,7 @@ const tI18nPhrase Phrases[] = {
     "Prioriteetti",
     "Priorytet",
     "Prioridad",
-    "Protereotita",
+    "�������������",
     "Prioritet",
     "Prioritate",
     "Priorit�s",
@@ -1430,7 +1453,7 @@ const tI18nPhrase Phrases[] = {
     "Elinik�",
     "Trwalosc dni",
     "Durabilidad",
-    "Xronos Zois",
+    "�������� ���������",
     "Livstid",
     "Durata",
     "�lettartam",
@@ -1447,7 +1470,7 @@ const tI18nPhrase Phrases[] = {
     "Tiedosto",
     "Plik",
     "Fichero",
-    "Arxeio",
+    "������",
     "Filnamn",
     "Fisier",
     "File",
@@ -1464,7 +1487,7 @@ const tI18nPhrase Phrases[] = {
     "1. p�iv�",
     "Pierwszy dzien",
     "Primer d�a",
-    "Proti mera",
+    "����� ����",
     "F�rsta dag",
     "Prima zi",
     "Els� nap",
@@ -1482,7 +1505,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava on ajastimen k�yt�ss�!",
     "Kanal jest zajety przez timer nagran",
     "�Canal est� ocupado por un timer!",
-    "To kanali xrisimopiite apo kapoion programmatismo!",
+    "�� ������ ��������������� ��� �������������!",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
     "Csatorn�t m�s haszn�lja!",
@@ -1499,7 +1522,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavan vaihtaminen ei mahdollista!",
     "Kanal nie moze byc teraz przelaczony!",
     "�No puedo cambiar canal!",
-    "Adinati i allagi kanaliou!",
+    "������ �������� �������!",
     "Om�jligt att byta kanal!",
     "Nu pot comuta canalul!",
     "Csatorn�t nem lehet �tkapcsolni!",
@@ -1516,7 +1539,7 @@ const tI18nPhrase Phrases[] = {
     "Ajastintallennus k�ynniss�!",
     "Timer nagrywa!",
     "�Timer esta grabando!",
-    "Ginete progrmamatismeni egrafi!",
+    "������� ��������������� �������!",
     "Timerstyrd inspelning p�g�r!",
     "Timer-ul este in inregistrare!",
     "Felv�tel folyamatban van!",
@@ -1533,7 +1556,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen toistaminen ep�onnistui!",
     "Blad - brak dostepu do nagrania!",
     "�Error al acceder a la grabaci�n!",
-    "Provlima stin prospelasi egrafis!",
+    "�������� ���� ���������� ��������!",
     "Inspelningen g�r inte att l�sa!",
     "Eroare in timpul accesarii inregistrarii",
     "Hiba a felv�tel hozz�f�r�s�n�l",
@@ -1550,7 +1573,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen poistaminen ep�onnistui!",
     "Blad przy usuwaniu nagrania!",
     "�Error al borrar la grabaci�n!",
-    "Provlima sto svisimo egrafis !",
+    "����� ���� ��� �������� ��� �������!",
     "Inspelningen g�r inte att ta bort!",
     "Eroare in timpul stergerii inregistrarii!",
     "Hiba a felv�tel t�rl�s�n�l!",
@@ -1567,7 +1590,7 @@ const tI18nPhrase Phrases[] = {
     "*** Virheellinen kanavavalinta! ***",
     "*** Niewazny kanal ***",
     "*** Canal inv�lido ***",
-    "*** Akiro Kanali ***",
+    "*** ����� ������ ***",
     "*** Felaktig kanal ***",
     "*** Canal invalid ***",
     "*** �rv�nytelen csatorna ***",
@@ -1584,7 +1607,7 @@ const tI18nPhrase Phrases[] = {
     "Ei vapaata vastaanotinta tallennukselle!",
     "Brak wolnej karty DVB do nagrywania!",
     "�No hay dispositivo DVB disponible para grabar!",
-    "Den periseuei DVB Karta gia egrafi!",
+    "���������� DVB ������ ��� �������!",
     "Det finns ingen ledig DVB enhet f�r inspelning!",
     "Nu mai sunt dispozitive DVB pentru inregistrare!",
     "Nincs szabad DVB k�rtya a felv�telhez!",
@@ -1601,7 +1624,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava ei ole k�ytett�viss�!",
     "Kanal jest niedostepny!",
     "!Canal no disponible!",
-    "To kanali den ine diathesimo",
+    "�� ������ ��� ����� ���������!",
     "Kanalen ej tillg�nglig!",
     "",//TODO
     "A csatorna nem el�rhet�",
@@ -1618,7 +1641,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava-asetukset eiv�t ole yksil�lliset!",
     "Nastawy kanalu sa niejednoznaczne!",
     "!Propiedades de canal duplicadas!",
-    "Oi rithmiseis tou kanaliou simpiptoun me allo!",
+    "�� ��������� ��� �������� ����������������!",
     "Kanalinst�llningarna �r ej unika!",
     "",//TODO
     "A csatornabe�ll�t�sok nem egy�rtelm�ek",
@@ -1635,7 +1658,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava lukittu (tallennus k�ynniss�)!",
     "Kanal zablokowany (nagrywanie w toku)!",
     "�Canal bloqueado (grabando)!",
-    "To kanali ine apasxolimeno (Ginete egrafi)!",
+    "�� ������ ����� ������������ (������ �������)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
     "Canal blocat (inregistrare)!",
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
@@ -1652,7 +1675,7 @@ const tI18nPhrase Phrases[] = {
     "Siirtotilan aloitus ep�onnistui!",
     "Tryb transferowy jest niemozliwy!",
     "�No puedo iniciar modo de transferencia!",
-    "Adinamia ekinisis katastasis metaforas!",
+    "�������� ��������� ���������� ���������!",
     "Kan inte starta Transfer Mode!",
     "Nu pot porni Modul de Transfer!",
     "Transfer-Mode nem ind�that�!",
@@ -1669,7 +1692,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Brak znakow montazowych!",
     "Muokkausmerkinn�t puuttuvat",
-    "Den exoun oristei simeia gia epexsergasia",
+    "��� ����� ������� ������ ������������",
     "Det finns inga redigeringsm�rken",//TODO
     "",//TODO
     "A v�g�pont nincs kijel�lve",//TODO
@@ -1686,7 +1709,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkauksen aloitus ep�onnistui!",
     "Uruchamianie montazu jest niemozliwe!",
     "�No puedo iniciar proceso de modificaci�n!",
-    "Adinamia ekinisis tis epexsergasias!",
+    "�������� ��������� ��� ������������!",
     "Kan inte starta redigering!",
     "Nu pot porni procesul de editare!",
     "A v�g�s nem ind�that�!",
@@ -1703,7 +1726,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus on jo k�ynniss�!",
     "Montaz w toku!",
     "�Proceso de modificaci�n ya fue iniciado!",
-    "Epexsergasia vriskete se exselixsi!",
+    "����������� ��������� �� �������!",
     "Redigeringen �r redan aktiv!",
     "Procesul de editare este activ!",
     "A v�g�s m�r aktiv�lt!",
@@ -1720,7 +1743,7 @@ const tI18nPhrase Phrases[] = {
     "Sammutus ei onnistu - '-s' parametri puuttuu!",
     "Wylaczenie niemozliwe - brak opcji '-s'!",
     "�No puedo apagar - opci�n '-s' ausente!",
-    "Adinaton na ginei termatismos. Aniparkti i parametros '-s'!",
+    "�������� �� ����� �����������. ��������� � ���������� '-s'!",
     "Kan inte avsluta, m�ste anv�nda parameter '-s'",
     "Nu pot opri calculatorul - vezi optiunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
@@ -1737,7 +1760,7 @@ const tI18nPhrase Phrases[] = {
     "Kovalevy l�hes t�ynn�!",
     "Dysk wkrotce pelny!",
     "�Disco casi lleno",
-    "O Skliros kontevi na gemisi!",
+    "� ������� �������� �� �������!",
     "L�gt diskutrymme!",
     "Spatiu scazut pe disc!",
     "A merev lemez majdnem tele!",
@@ -1754,7 +1777,7 @@ const tI18nPhrase Phrases[] = {
     "Salausmoduulin valikko ei saatavilla",
     "CAM-Menu niedostepne!",
     "�No pudeo acceder al men� de la CAM!",
-    "Den mpori na aniksi to CAM menou!",
+    "������� � �������� ��� CAM �����!",
     "Det g�r inte att �ppna CAM menyn!",
     "",//TODO
     "A CAM-Men� nem nyithat�",
@@ -1771,7 +1794,7 @@ const tI18nPhrase Phrases[] = {
     "Salausmoduulin alustus ep�onnistui!",
     "Nieudany CAM-Reset!",
     "�No puedo reiniciar la CAM!",
-    "Adinato na gini epanafora sto CAM",
+    "������� �� ����� ��������� ��� CAM",
     "Kan inte �terst�lla CAM!",
     "",//TODO
     "A CAM-Reset nem siker�lt",
@@ -1788,7 +1811,7 @@ const tI18nPhrase Phrases[] = {
     "Salausmoduuli alustettu",
     "CAM-Reset wykonany!",
     "CAM reiniciada",
-    "Sto CAM egine apanafora",
+    "��� CAM ����� ���������",
     "CA modulen har �terst�llts",
     "",//TODO
     "A CAM vissza lett �ll�tva",
@@ -1823,7 +1846,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmaopas",
     "EPG",
     "Gu�a de Programaci�n",
-    "EPG",
+    "������ ������������",
     "Elektronisk programguide",
     "EPG",
     "EPG",
@@ -1891,7 +1914,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennus",
     "Nagranie",
     "Opciones de Grabaci�n",
-    "Egrafi",
+    "�������",
     "Inspelning",
     "Inregistrare",
     "Felv�tel",
@@ -1908,7 +1931,7 @@ const tI18nPhrase Phrases[] = {
     "Toisto",
     "Odtwarzanie",
     "Opciones de Reproducci�n",
-    "Anametadosi",
+    "�����������",
     "Uppspelning",
     "Redare",
     "Lej�tsz�s",
@@ -1925,7 +1948,7 @@ const tI18nPhrase Phrases[] = {
     "Sekalaiset",
     "Pozostale",
     "Varios",
-    "Diafora",
+    "�������",
     "Diverse",
     "Diverse",
     "Egy�b",
@@ -1942,7 +1965,7 @@ const tI18nPhrase Phrases[] = {
     "Laajennokset",
     "Plugins",
     "Plugins",
-    "Plugins",
+    "�������",
     "Moduler",
     "Plugins",
     "Plugins",
@@ -1959,7 +1982,7 @@ const tI18nPhrase Phrases[] = {
     "Laajennos",
     "Plugin",
     "Plugin",
-    "Plugin",
+    "�����",
     "Modul",
     "Plugin",
     "Plugin",
@@ -1976,7 +1999,7 @@ const tI18nPhrase Phrases[] = {
     "K�ynnist� uudelleen",
     "Zastartowac",
     "Reiniciar",
-    "Epanekinisi",
+    "������������",
     "Omstart",
     "Restart",
     "�jraind�t�s",
@@ -1994,7 +2017,7 @@ const tI18nPhrase Phrases[] = {
     "Kieli",
     "Jezyk",
     "Idioma",
-    "Glosa",
+    "������",
     "Spr�k",
     "Limba OSD",
     "Nyelv",
@@ -2011,7 +2034,7 @@ const tI18nPhrase Phrases[] = {
     "Leveys",
     "Szerokosc",
     "Anchura",
-    "Makros",
+    "������",
     "Bredd",
     "Latime OSD",
     "Sz�less�g",
@@ -2028,7 +2051,7 @@ const tI18nPhrase Phrases[] = {
     "Korkeus",
     "Wysokosc",
     "Altura",
-    "Ipsos",
+    "����",
     "H�jd",
     "Inaltime OSD",
     "Magass�g",
@@ -2045,7 +2068,7 @@ const tI18nPhrase Phrases[] = {
     "Viestien esitysaika (s)",
     "Czas wyswietlania wiadomosci (s)",
     "Duraci�n muestra mensajes (s)",
-    "Xronos endiksis minimaton (d)",
+    "������ �������� ��������� (�)",
     "Tid f�r meddelanden (sek)",
     "Timp afisare mesaj (sec)",
     "Inform�ci� felt�ntet�s�nek id�tartama",
@@ -2062,7 +2085,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavatiedon sijainti",
     "Lokalizacja informacji o kanale",
     "Posici�n para informaci�n canal",
-    "Thesi Pliroforias kanalion",
+    "���� ����������� ��������",
     "Placering av kanalinformation",
     "Pozitie info canal",
     "Csatorna-Inf� pozici�ja",
@@ -2079,7 +2102,7 @@ const tI18nPhrase Phrases[] = {
     "N�yt� kanavatieto",
     "Informacja przy zmianie kanalu",
     "Informaci�n para cambio de canal",
-    "Plirofories stin alagi kanaliou",
+    "����������� ���� ������ ��������",
     "Information vid kanalbyte",
     "Info despre comutare canal",
     "Inf� a csatorna v�lt�s�n�l",
@@ -2096,7 +2119,7 @@ const tI18nPhrase Phrases[] = {
     "Valikkojen sivutus",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
-    "Kilisi selidas",
+    "������ �������",
     "Bl�ddra sidor",
     "Deruleaza pagini",
     "Oldalank�nt l�ptetmi",
@@ -2113,7 +2136,7 @@ const tI18nPhrase Phrases[] = {
     "J�rjest� ajastimet",
     "Sortowanie timerow",
     "Ordenar timers",
-    "Organosi programmatismenon",
+    "�������� ����������������",
     "Sortera timers",
     "Sortare timere",
     "A beprogramozott felv�telek elrendez�se",
@@ -2130,7 +2153,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennehakemistot",
     "Wykaz nagran",
     "Gracaciones en directorios",
-    "Fakeloi egrafon",
+    "������� ��������",
     "Kataloger f�r inspelningar",
     "Directoare inregistrari",
     "Felv�telek list�ja",
@@ -2147,7 +2170,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmaoppaan taustap�ivitys (h)",
     "Czas do skanu EPG (h)",
     "Tiempo hasta exploraci�n EPG (h)",
-    "Xronos mexri eksetasi EPG se Ores",
+    "������ ����� ������� EPG �� ����",
     "EPG s�kning timeout",
     "Timeout EPG",
     "Fennmaradt id� az EPG-g (h)",
@@ -2164,7 +2187,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmaoppaan korjaustaso",
     "Poziom bledow EPG",
     "Nivel para arreglar EPG",
-    "EPG Bugfix Vathmos",
+    "������ ��������� ������ EPG",
     "Niv� f�r EPG bugfix",
     "Nivel corectie EPG",
     "EPG hibaelh�r�t�s",
@@ -2181,7 +2204,7 @@ const tI18nPhrase Phrases[] = {
     "Aseta kellonaika",
     "Ustawianie czasu",
     "Ajustar reloj de sistema",
-    "Sintonismos Oras ipologosti",
+    "����������� ���� ����������",
     "St�ll in systemtid",
     "Seteaza ceasul sistem",
     "Az id� be�ll�t�sa",
@@ -2198,7 +2221,7 @@ const tI18nPhrase Phrases[] = {
     "Vastaanota kellonaika l�hettimelt�",
     "Transponder do ustawiania czasu",
     "Transponder para reloj de sistema",
-    "Anametadotis gia sintonismo tis oras",
+    "������������ ����������� ����",
     "Anv�nd klockan fr�n transponder",
     "Preia ceasul din transponder",
     "Id�h�z tartoz� Transponder",
@@ -2215,7 +2238,7 @@ const tI18nPhrase Phrases[] = {
     "P��vastaanotin",
     "Pierwotny interfejs DVB",
     "Primer interface DVB",
-    "Protevon DVB karta",
+    "����� DVB �����",
     "Prim�r DVB enhet",
     "Placa DVB primara",
     "Els� DVB interface",
@@ -2232,7 +2255,7 @@ const tI18nPhrase Phrases[] = {
     "Kuvasuhde",
     "Format telewizyjny",
     "Formato V�deo",
-    "Video Format",
+    "����� ������",
     "Video format",
     "Format Video",
     "Video form�tum",
@@ -2266,7 +2289,7 @@ const tI18nPhrase Phrases[] = {
     "LNB alempi taajuus (MHz)",
     "Dolna czestotliwosc LNB (MHz)",
     "Frecuencia baja LNB (MHz)",
-    "Kato LNB-Sixnotita (MHz)",
+    "���� LNB-��������� (MHz)",
     "Undre LNB frekvens (MHz)",
     "Frecvnta LO LNB (Mhz)",
     "Als� LNB-frekvencia (MHZ)",
@@ -2283,7 +2306,7 @@ const tI18nPhrase Phrases[] = {
     "LNB ylempi taajuus (MHz)",
     "Gorna czestotliwosc LNB (MHz)",
     "Frecuencia alta LNB (MHz)",
-    "Ano LNB-Sixnotita (MHz)",
+    "��� LNB-��������� (MHz)",
     "�vre LNB frekvens (MHz)",
     "Feecventa HI LNB (MHz)",
     "Fels� LNB-frekvencia (MHZ)",
@@ -2300,7 +2323,7 @@ const tI18nPhrase Phrases[] = {
     "DiSEqC k�yt�ss�",
     "Uzywac DiSEqC",
     "Utilizar DiSEqC",
-    "Energopiisi DiSEqC",
+    "������������ DiSEqC",
     "Anv�nd DiSEqC",
     "Utilizez DiSEqC",
     "DiSEqC haszn�lata",
@@ -2334,7 +2357,7 @@ const tI18nPhrase Phrases[] = {
     "Aloitusmarginaali (min)",
     "Poczatkowy czas buforowy (min)",
     "Comenzar grabaci�n antes (min)",
-    "Prosthetos xronos prin arxi (lepta)",
+    "��������� ������ ���� ���� (�����)",
     "Marginal f�r start (min)",
     "Margine la pornire (min)",
     "Id�eltol�d�s a kezd�sn�l (min)",
@@ -2351,7 +2374,7 @@ const tI18nPhrase Phrases[] = {
     "Lopetusmarginaali (min)",
     "Koncowy czas buforowy (min)",
     "Cortar grabaci�n despu�s (min)",
-    "Prosthetos xronos sto telos (lepta)",
+    "��������� ������ ��� ����� (�����)",
     "Marginal f�r stopp (min)",
     "Margine la oprire (min)",
     "Id�eltol�d�s a befejez�sn�l",
@@ -2368,7 +2391,7 @@ const tI18nPhrase Phrases[] = {
     "P��vastaanottimen prioriteetti",
     "Pierwotny limit",
     "L�mite primario",
-    "Protevon orio",
+    "�������� ����",
     "Prim�r gr�ns",
     "Limita Primara",
     "Prim�r-hat�r",
@@ -2385,7 +2408,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen oletusprioriteetti",
     "Priorytet pierwotny",
     "Prioridad predefinida",
-    "Protereotita",
+    "�������������",
     "Normal prioritet",
     "Prioritate implicita",
     "Default priority",
@@ -2402,7 +2425,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen oletuselinik� (d)",
     "Pierwotna trwalosc (d)",
     "Duraci�n predefinida",
-    "Xronos zois",
+    "�������������� �������� ��������� (������)",
     "Normal livstid (dagar)",
     "Durata predefinita",
     "Default �lettartam",
@@ -2419,7 +2442,7 @@ const tI18nPhrase Phrases[] = {
     "Keskeytyksen prioriteetti",
     "Priorytet przerwy",
     "",// TODO
-    "",// TODO
+    "������������� ������������",
     "Prioritet f�r direktinspelning",
     "",// TODO
     "Sz�net priorit�s",
@@ -2436,7 +2459,7 @@ const tI18nPhrase Phrases[] = {
     "Keskeytyksen elinik� (d)",
     "Okres trwania przerwy (d)",
     "",// TODO
-    "",// TODO
+    "�������� �����������",
     "Livstid f�r direktinspelning (dagar)",
     "",// TODO
     "Sz�net �lettartama",
@@ -2453,7 +2476,7 @@ const tI18nPhrase Phrases[] = {
     "K�yt� jakson nime�",
     "Czy uzywac nazwe epizodu",
     "Utilizar nombre de episodo",
-    "Xrisimopiisi onomatos episodiou",
+    "����� �������� ����������",
     "Anv�nd episodnamn",
     "Utilizeaza numele episodului",
     "Epiz�dn�v felhaszn�l�sa",
@@ -2470,7 +2493,7 @@ const tI18nPhrase Phrases[] = {
     "Merkitse pikatallenne",
     "Zaznaczyc natychm. nagranie",
     "Marcar grabaciones instant�neas",
-    "Epilogi trexon egrafis",
+    "������� ��������� ��������",
     "M�rk direktinspelning",
     "Inregistrare imediata",
     "Direktfelv�tel megjel�l�se",
@@ -2487,7 +2510,7 @@ const tI18nPhrase Phrases[] = {
     "Nime� pikatallenne",
     "Nazwac natychm. nagranie",
     "Nombrar grabaciones instant�neas",
-    "eponomasi trexon egrafis",
+    "�������� ��������� ��������",
     "Namnge direktinspelning",
     "Nume inregistrare imediata",
     "Direktfelv�tel megnevez�se",
@@ -2504,7 +2527,7 @@ const tI18nPhrase Phrases[] = {
     "Pikatallennuksen kesto (min)",
     "Dlugosc bezposredniego nagrania (min)",
     "Tiempo de grabaci�n instant�nea (min)",
-    "Stigmiees egrafes xronos (lepta)",
+    "�������� ��������� �������� (�����)",
     "Direktinspelning l�ngd (min)",
     "Timpul de inregistarea imediata (min)",
     "Felv�tel id�tartama",
@@ -2521,7 +2544,7 @@ const tI18nPhrase Phrases[] = {
     "Dolby Digital tallennus",
     "Nagrywac Dolby Digital",
     "Grabar sonido Dolby Digital",
-    "Egrafi tou Dolby Digital ixou",
+    "������� ��� Dolby Digital ����",
     "Spela in ljudet med Dolby Digital",
     "Inregistreaza Dolby Digital",
     "Dolby Digit�l felv�tel",
@@ -2538,7 +2561,7 @@ const tI18nPhrase Phrases[] = {
     "Suurin tiedostokoko (Mt)",
     "Maks. wielkosc pliku (MB)",
     "Tama�o m�x. de fichero (MB)",
-    "Megisto megethos arxeiou (MB)",
+    "������� ������� ������� (MB)",
     "Maximal filstorlek f�r inspelning (MB)",
     "Dimensiune maxima a fisierului video (MB)",
     "Max. video File-terjedelem (MB)",
@@ -2555,7 +2578,7 @@ const tI18nPhrase Phrases[] = {
     "Jaottele muokatut tallenteet",
     "Dzielic montowane pliki",
     "Quebrar ficheros",
-    "Diamelisma epeksergasmenon arxeion",
+    "����������� �������������� �������",
     "Dela upp redigerade filer",
     "Separare fisiere editate",
     "Feldolgozott File-k feloszt�sa",
@@ -2572,7 +2595,7 @@ const tI18nPhrase Phrases[] = {
     "Moninopeustila",
     "Tryb wielopredkosciowy",
     "Modo multi-velocidad",
-    "Multispeed mode",
+    "������� ��������� ���������",
     "Multispeed mode",
     "Mod multi-rata",
     "MultiSpeed funkci�",
@@ -2589,7 +2612,7 @@ const tI18nPhrase Phrases[] = {
     "N�yt� toiston tila",
     "Wyswietlac status odtwarzania",
     "Mostrar modo de replay",
-    "Endiksi katastasis anametadosis",
+    "������� ���������� ������������",
     "Visa uppspelnings l�ge",
     "Afiseaza modul de redare",
     "Lej�tsz�s felt�ntet�se",
@@ -2606,7 +2629,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen paluutunniste",
     "ID odtwarzania",
     "Continuar ID",
-    "Resume ID",// TODO
+    "ID ������������",
     "�teruppta ID",
     "Resume ID",// TODO
     "Lej�tsz�s ID",
@@ -2623,7 +2646,7 @@ const tI18nPhrase Phrases[] = {
     "Tapahtuman odotusaika (min)",
     "Min. czas do nast. akcji (Event) (min)",
     "Tiempo m�nimo pausa (min)",
-    "Elaxistos Xronos paremvolis (lepta)",
+    "��������� ������ ���������� (�����)",
     "Minsta h�ndelse-pause (min)",
     "MinEventTimeout (min)",
     "Min. esem�ny sz�net (min)",
@@ -2640,7 +2663,7 @@ const tI18nPhrase Phrases[] = {
     "K�ytt�j�toiminnon odotusaika (min)",
     "Min. brak aktywnosci uzytkownika (min)",
     "Tiempo m�nimo inactividad (min)",
-    "Elaxistos xronos mi xrisis (lepta)",
+    "��������� ������ �������� (�����)",
     "Minsta an�ndar-inaktivitet (min)",
     "Durata minima de inactivitate (min)",
     "Min. kezel�si aktivit�s (min)",
@@ -2657,7 +2680,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP odotusaika (s)",
     "Min. brak aktywnosci SVDRP (s)",
     "SVDRP Timeout (s)",
-    "SVDRP Timeout (d)",
+    "SVDRP ������� (�)",
     "SVDRP Timeout (d)",
     "Timeout SVDRP (sec)",
     "SVDRP Timeout (s)",
@@ -2674,7 +2697,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavavalinnan odotusaika (s)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������� ������� (�)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2692,7 +2715,7 @@ const tI18nPhrase Phrases[] = {
     "MTKTPLS",
     "PWSCPSN",
     "LMMJVSD",
-    "DTTPPSK",
+    "�������",
     "MTOTFLS",
     "LMMJVSD",
     "HKSCPSV",
@@ -2709,7 +2732,7 @@ const tI18nPhrase Phrases[] = {
     "Ma Ti Ke To Pe La Su ",
     "PonWtoSroCzwPiaSobNie",
     "LunMarMieJueVieSabDom",
-    "DevTriTetPemParSavKir",
+    "������������������K��",
     "M�nTisOnsTorFreL�rS�n",
     "LunMarMieJoiVinSimDum",
     "H�tKedSzeCs�P�nSzoVas",
@@ -2727,7 +2750,7 @@ const tI18nPhrase Phrases[] = {
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
-    "",// TODO
+    " ��������������������������������0123456789-.#~abcdefghijklmnopqrstuvwxyz",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
@@ -2745,7 +2768,7 @@ const tI18nPhrase Phrases[] = {
     "Kaukos��timen opettaminen (%s)",
     "Nauka kodu pilota (%s)",
     "Aprendiendo teclas del telemando (%s)",
-    "Ekmathisi pliktron tilexirismou (%s)",
+    "�������� �������� ������������� (%s)",
     "Inl�rning av fj�rrkontrollsknappar (%s)",
     "Invatare taste telecomanda (%s)",
     "T�vir�ny�t� betan�t�sa (%s)",
@@ -2762,7 +2785,7 @@ const tI18nPhrase Phrases[] = {
     "Vaihe 1: Koodauksen tunnistaminen",
     "Faza 1: Detekcja typu kodu",
     "Fase 1: Detectando tipo de receptor",
-    "Phasi 1: Anixneusi kodika RC",
+    "���� 1: ��������� ������ RC",
     "Steg1: identifiering av RC kod",
     "Faza 1: Detectie tip telecomanda",
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
@@ -2779,7 +2802,7 @@ const tI18nPhrase Phrases[] = {
     "Paina mit� tahansa kaukos��timen n�pp�int�",
     "Nacisnac klawisz pilota",
     "Pulse una tecla en el telemando",
-    "Piese ena pliktro sto tilexiristirio",
+    "����� ��� ������� ��� ���������������",
     "Tryck valfri tangent p� fj�rrkontrollen",
     "Apasati o tasta pe telecomanda",
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
@@ -2796,7 +2819,7 @@ const tI18nPhrase Phrases[] = {
     "N�pp�inpainallus vastaanotettu!",
     "Kod pilota zostal poznany!",
     "�C�digo detectado!",
-    "Evrethike kodikas RC!",
+    "������� ������� RC!",
     "RC koden detekterad!",
     "S-a detectat tipul telecomenzii!",
     "T�vir�ny�t� k�dja felismerve!",
@@ -2813,7 +2836,7 @@ const tI18nPhrase Phrases[] = {
     "�l� paina kaukos��timen n�pp�imi�...",
     "Nie naciskac klawiszy...",
     "No pulse ninguna tecla...",
-    "Min piezeis pliktra...",
+    "��� ������� �������...",
     "Tryck inte p� n�gon knapp...",
     "Nu apasati nicio tasta...",
     "Ne nyomjon meg gombot...",
@@ -2830,7 +2853,7 @@ const tI18nPhrase Phrases[] = {
     "Vaihe 2: N�pp�inkoodien opettelu",
     "Faza 2: Nauka pojedynczych klawiszy",
     "Fase 2: Aprendiendo c�digos espec�ficos",
-    "Fasi 2: Ekmathisi memonomenon kodikon pliktron",
+    "���� 2: �������� ����������� ��������",
     "Fas 2: Inl�rning av specifika knapp koder",
     "Faza 2: Invatarea codurilor specifice tastelor",
     "M�sodik l�p�s: az egyes gombok betan�t�sa",
@@ -2847,7 +2870,7 @@ const tI18nPhrase Phrases[] = {
     "Paina n�pp�int� toiminnolle '%s'",
     "Nacisnac klawisz dla '%s'",
     "Pulsar tecla para '%s'",
-    "Piese to pliktro gia '%s'",
+    "����� �� ������� ��� '%s'",
     "Tryck p� knappen f�r '%s'",
     "Apasati tasta pentru '%s'",
     "'%s' gomb megnyom�sa",
@@ -2864,7 +2887,7 @@ const tI18nPhrase Phrases[] = {
     "Hyv�ksy painamalla 'Yl�s'",
     "Nacisnac 'Gora' do potwierdzenia",
     "Pulse 'Arriba' para confirmar",
-    "Piese 'pano' gia apodoxi",
+    "����� '����' ��� �������",
     "Tryck 'Upp' f�r att bekr�fta",
     "Apsati 'Sus' pentru confirmare",
     "'Fel' megnyom�sa az elfogad�shoz",
@@ -2881,7 +2904,7 @@ const tI18nPhrase Phrases[] = {
     "Jatka painamalla 'Alas'",
     "Nacisnac 'Dol' zeby kontynuowac",
     "Pulse 'Abajo' para confirmar",
-    "Piese 'kato' gia sinexia",
+    "����� '����' ��� ��������",
     "Tryck 'Ner' f�r att bekr�fta",
     "Apasati jos pentru continuare",
     "'Le' megnyom�sa a folytat�shoz",
@@ -2898,7 +2921,7 @@ const tI18nPhrase Phrases[] = {
     "(palaa takaisin painamalla 'Yl�s')",
     "(Nacisnac 'Gora' cofa)",
     "(Pulse 'Arriba' para retornar)",
-    "(Piese 'pano' gia epistrofi",
+    "(����� '����' ��� ���������",
     "(Tryck 'Upp' f�r att backa)",
     "(Apsati 'Sus' pentru revenire)",
     "(�Fel' megnyom�sa a visszat�r�shez)",
@@ -2915,7 +2938,7 @@ const tI18nPhrase Phrases[] = {
     "(lopeta opettaminen painamalla 'Alas')",
     "(Nacisnac 'Dol' by zakonczyc)",
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
-    "(Piese 'Kato' gia termatismo diloseon plktron)",
+    "(����� '����' ��� ���������� �������� ��������)",
     "(Tryck 'Ner' f�r att avsluta knapp definition)",
     "(Apasati 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
@@ -2932,7 +2955,7 @@ const tI18nPhrase Phrases[] = {
     "n�pp�imen puuttuessa paina 'Valikko'",
     "(Nacisnac 'Menu' by ominac klawisz)",
     "Pulse 'Menu' para saltarse esta tecla",
-    "Pata 'Menou' gia prosperasi aftou tou pliktrou",
+    "���� '�����' ��� ���������� ����� ��� ��������",
     "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
     "",// TODO
     "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
@@ -2949,7 +2972,7 @@ const tI18nPhrase Phrases[] = {
     "Vaihe 3: N�pp�inkoodien tallentaminen",
     "Faza 3: Zapamietac Kod",
     "Fase 3: Guardar c�digos de teclas",
-    "Fasi 3: Apothikevsi kodikon",
+    "���� 3: ���������� �������",
     "Fas 3: Spara knappkoder",
     "Faza 3: Salvarea codurilor de taste",
     "Harmadik l�p�s: k�d ment�se",
@@ -2966,7 +2989,7 @@ const tI18nPhrase Phrases[] = {
     "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guardar, 'Abajo' para anular",
-    "'Pano' apothikevsi, 'Kato' akirosi",
+    "'����' ����������, '����' �������",
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
@@ -2984,7 +3007,7 @@ const tI18nPhrase Phrases[] = {
     "Yl�s",
     "Gora",
     "Arriba",
-    "Pano",
+    "����",
     "Upp",
     "Sus",
     "Fel",
@@ -3001,7 +3024,7 @@ const tI18nPhrase Phrases[] = {
     "Alas",
     "Dol",
     "Abajo",
-    "Kato",
+    "����",
     "Ner",
     "Jos",
     "Le",
@@ -3018,7 +3041,7 @@ const tI18nPhrase Phrases[] = {
     "Valikko",
     "Menu",
     "Menu",
-    "Menou",
+    "�����",
     "Meny",
     "Meniu",
     "Men�",
@@ -3035,7 +3058,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
-    "Ok",
+    "��",
     "Ok",
     "Ok",
     "Ok",
@@ -3052,7 +3075,7 @@ const tI18nPhrase Phrases[] = {
     "Takaisin",
     "Wstecz",
     "Retornar",
-    "Piso",
+    "����",
     "Tillbaka",
     "Inapoi",
     "Vissza",
@@ -3069,7 +3092,7 @@ const tI18nPhrase Phrases[] = {
     "Vasemmalle",
     "Lewo",
     "Izquierda",
-    "Aristera",
+    "��������",
     "V�nster",
     "Stinga",
     "Balra",
@@ -3086,7 +3109,7 @@ const tI18nPhrase Phrases[] = {
     "Oikealle",
     "Prawo",
     "Derecha",
-    "Deksia",
+    "�����",
     "H�ger",
     "Dreapta",
     "Jobbra",
@@ -3103,7 +3126,7 @@ const tI18nPhrase Phrases[] = {
     "Punainen",
     "Czerwony",
     "Rojo",
-    "Kokino",
+    "�������",
     "R�d",
     "Rosu",
     "Piros",
@@ -3120,7 +3143,7 @@ const tI18nPhrase Phrases[] = {
     "Vihre�",
     "Zielony",
     "Verde",
-    "Prasino",
+    "�������",
     "Gr�n",
     "Verde",
     "Z�ld",
@@ -3137,7 +3160,7 @@ const tI18nPhrase Phrases[] = {
     "Keltainen",
     "Zolty",
     "Amarillo",
-    "Kitrino",
+    "�������",
     "Gul",
     "Galben",
     "S�rga",
@@ -3154,7 +3177,7 @@ const tI18nPhrase Phrases[] = {
     "Sininen",
     "Niebieski",
     "Azul",
-    "Mple",
+    "����",
     "Bl�",
     "Albastru",
     "K�k",
@@ -3171,7 +3194,7 @@ const tI18nPhrase Phrases[] = {
     "Toista",
     "Odtworzenie",
     "Reproducir",
-    "Anametadosi",
+    "A����������",
     "Spela upp",
     "",// TODO
     "Lej�tsz�s",
@@ -3188,7 +3211,7 @@ const tI18nPhrase Phrases[] = {
     "Keskeyt�",
     "Przerwa",
     "Pausa",
-    "Dialima",
+    "���������",
     "Pausa",
     "",// TODO
     "Sz�net",
@@ -3205,7 +3228,7 @@ const tI18nPhrase Phrases[] = {
     "Lopeta",
     "Stop",
     "Parar",
-    "Terma",
+    "T����",
     "Stoppa",
     "",// TODO
     "Stop",
@@ -3222,7 +3245,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenna",
     "Nagrywac",
     "Grabar",
-    "Egrafi",
+    "E������",
     "Spela in",
     "",// TODO
     "Felvenni",
@@ -3239,7 +3262,7 @@ const tI18nPhrase Phrases[] = {
     "Pikakelaus >>",
     "Naprzod",
     "Adelante r�pido",
-    "Girisma mprosta",
+    "�������� ������",
     "Snabbspolning fram�t",
     "",// TODO
     "El�re p�rgetni",
@@ -3256,7 +3279,7 @@ const tI18nPhrase Phrases[] = {
     "Pikakelaus <<",
     "Wstecz",
     "Atr�s r�pido",
-    "Girisma piso",
+    "�������� ����",
     "Snabbspolning bak�t",
     "",// TODO
     "Vissza p�rgetni",
@@ -3273,7 +3296,7 @@ const tI18nPhrase Phrases[] = {
     "Virtakytkin",
     "Wylaczyc",
     "Corriente",
-    "Klisimo",
+    "K�������",
     "P�/Av",
     "Pornit",
     "Kikapcsolni",
@@ -3290,7 +3313,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava +",
     "Kanal+",
     "Canal +",
-    "Kanali+",
+    "������+",
     "Kanal+",
     "",// TODO
     "Csatorna+",
@@ -3307,7 +3330,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava -",
     "Kanal-",
     "Canal -",
-    "Kanali-",
+    "������-",
     "Kanal-",
     "",// TODO
     "Csatorna-",
@@ -3316,7 +3339,7 @@ const tI18nPhrase Phrases[] = {
   { "Volume+",
     "Lautst�rke+",
     "Glasnost+",
-    "Volume +",
+    "Volume +", 
     "Volume+",
     "Volume+",
     "Volume+",
@@ -3324,7 +3347,7 @@ const tI18nPhrase Phrases[] = {
     "��nenvoimakkuus +",
     "Glosnej",
     "Volumen+",
-    "Entasi+",
+    "������+",
     "Volym+",
     "Volum+",
     "Hanger�+",
@@ -3341,7 +3364,7 @@ const tI18nPhrase Phrases[] = {
     "��nenvoimakkuus -",
     "Ciszej",
     "Volumen-",
-    "Entasi-",
+    "������-",
     "Volym-",
     "Volum-",
     "Hanger�-",
@@ -3358,7 +3381,7 @@ const tI18nPhrase Phrases[] = {
     "��net�n",
     "Cisza",
     "Mudo",
-    "Siopilo",
+    "�������",
     "Ljud Av",
     "Mut(e)",
     "Csend",
@@ -3376,7 +3399,7 @@ const tI18nPhrase Phrases[] = {
     "kyll�",
     "tak",
     "s�",
-    "nai",
+    "���",
     "ja",
     "da",
     "igen",
@@ -3393,7 +3416,7 @@ const tI18nPhrase Phrases[] = {
     "ei",
     "nie",
     "no",
-    "oxi",
+    "���",
     "nej",
     "nu",
     "nem",
@@ -3410,7 +3433,7 @@ const tI18nPhrase Phrases[] = {
     "pois",
     "wyl.",
     "off",
-    "klisto",
+    "�������",
     "av",
     "",// TODO
     "ki",
@@ -3427,7 +3450,7 @@ const tI18nPhrase Phrases[] = {
     "tyhj�",
     "zaden",
     "ninguno",
-    "kanena",
+    "������",
     "ingen",
     "",// TODO
     "semmi",
@@ -3444,7 +3467,7 @@ const tI18nPhrase Phrases[] = {
     "auto",
     "auto",
     "auto",
-    "aftomato",
+    "��������",
     "automatisk",
     "",// TODO
     "auto",
@@ -3461,7 +3484,7 @@ const tI18nPhrase Phrases[] = {
     "yl�reuna",
     "gora",
     "parte superior",
-    "pano",
+    "����",
     "�vre",
     "sus",
     "Fent",
@@ -3478,7 +3501,7 @@ const tI18nPhrase Phrases[] = {
     "alareuna",
     "dol",
     "parte inferior",
-    "kato",
+    "����",
     "undre",
     "jos",
     "lent",
@@ -3495,7 +3518,7 @@ const tI18nPhrase Phrases[] = {
     "Levy",
     "Disk",
     "Disco",
-    "Disk",
+    "������",
     "Disk",
     "Disc",
     "Lemez",
@@ -3512,7 +3535,7 @@ const tI18nPhrase Phrases[] = {
     "vapaana",
     "pozostalo",
     "libre",
-    "akoma",
+    "����",
     "ledigt",
     "liber",
     "szabad",
@@ -3529,7 +3552,7 @@ const tI18nPhrase Phrases[] = {
     "Siirry: ",
     "Skok: ",
     "Salta a: ",
-    "Pidima: ",
+    "����������: ",
     "Hopp: ",
     "Salt: ",
     "Ugr�s: ",
@@ -3546,7 +3569,7 @@ const tI18nPhrase Phrases[] = {
     "��nenvoimakkuus ",
     "Glosnosc ",
     "Volumen ",
-    "Entasi ",
+    "������ ",
     "Volym ",
     "Volum ",
     "Hanger� ",
@@ -3563,7 +3586,7 @@ const tI18nPhrase Phrases[] = {
     " Lopeta toisto",
     " Zatrzymac odtwarzanie",
     " Parar reproduci�n",
-    " Telos anametadosis",
+    " ����� ������������",
     " Avsluta uppspelning",
     " Opreste redare",
     " Lej�tsz�st befejzni",
@@ -3580,7 +3603,7 @@ const tI18nPhrase Phrases[] = {
     " Lopeta tallennus ",
     " Zatrzymac nagrywanie ",
     " Parar grabaci�n ",
-    " Telos egrafis ",
+    " ����� ������� ",
     " Avsluta inspelning ",
     " Opreste inregistrarea ",
     " Felv�telt befejezni ",
@@ -3597,7 +3620,7 @@ const tI18nPhrase Phrases[] = {
     " Peru muokkaus",
     " Przerwac montaz",
     " Anular modificaci�n ",
-    " Akirosi epexsergasias",
+    " ������� ������������",
     " Avbryt redigering",
     " Opreste editare",
     " V�g�st megszak�tani",
@@ -3614,7 +3637,7 @@ const tI18nPhrase Phrases[] = {
     "Vaihdetaan p��vastaanottimelle...",
     "Pierwszy interfejs DVB przelacza...",
     "Cambio al interface DVB primario...",
-    "I protevon DVB Karta alazi...",
+    "� ����� DVB ����� �������...",
     "Byter prim�r DVB enhet...",
     "Comuta interfata primara DVB...",
     "Prim�r Interface �tkapcsolva...",
@@ -3631,7 +3654,7 @@ const tI18nPhrase Phrases[] = {
     "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy",
     "Gora/Dol na nowa pozycje - Ok zmienia",
     "Arriba/Abajo para el nuevo lugar - OK para mover",
-    "Pano/Kato gia nea thesi. meta OK",
+    "����/���� ��� ��� ����. ���� ��",
     "Upp/Ner f�r ny plats - OK f�r att flytta",
     "Sus/Jos pentru noua locatie - OK pentru a muta",
     "Fel/Le egy uj opci��rt - azt�n OK",
@@ -3648,7 +3671,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus aloitettu",
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
-    "Arxi epexsergasias",
+    "���� ������������",
     "Redigering startad",
     "Procesul de editare a inceput",
     "V�g�s elind�tva",
@@ -3665,7 +3688,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus lopetettu",
     "Proces montazu zakonczony",
     "Proceso de modificaci�n terminado",
-    "I epexsergasia teliose",
+    "� ����������� ��������",
     "Redigering avslutad",
     "Procesul de editare s-a terminat",
     "V�g�s befejezve",
@@ -3682,7 +3705,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus ep�onnistui!",
     "Bledny proces montazu!",
     "Modificaci�n ha fallado!",
-    "I epexsergasia apetixe!",
+    "� ����������� �������!",
     "Redigeringsprocessen misslyckades",
     "Proces de editare nereusit",
     "V�g�s sikertelen!",
@@ -3699,7 +3722,7 @@ const tI18nPhrase Phrases[] = {
     "haetaan tallenteita...",
     "Skan nagran...",
     "buscando grabaciones...",
-    "Eksetasi egrafon...",
+    "������� ��������...",
     "S�ker igenom inspelningarna...",
     "Caut inregistrari...",
     "Felvett ad�sok b�ng�sz�se...",
@@ -3716,7 +3739,7 @@ const tI18nPhrase Phrases[] = {
     "Keskeytet��n l�hetys...",
     "Zatrzymany program biezacy...",
     "Emisi�n en directo parada...",
-    "",// TODO
+    "��������� �������� �������",
     "Pausar direktinspelningen",
     "",// TODO
     "Az �l� ad�s meg�ll�tva...",
@@ -3733,7 +3756,7 @@ const tI18nPhrase Phrases[] = {
     "T�ll� laajennoksella ei ole asetuksia!",
     "Ten plugin niema parametrow!",
     "Este plugin no admite configuraci�n",
-    "Afto to plugin den exi parametrous",
+    "���� �� ����� ��� ���� �����������",
     "Den h�r modulen har inga parametrar",
     "",// TODO
     "Ennek a plugin-nak nincs setup-parametere!",
@@ -3824,3 +3847,8 @@ const char * const * I18nLanguages(void)
 {
   return &Phrases[0][0];
 }
+
+const char * const * I18nCharSets(void)
+{
+  return &Phrases[1][0];
+}
diff --git a/i18n.h b/i18n.h
index cb8a0887c..44cf1905b 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.6 2003/05/16 12:48:52 kls Exp $
+ * $Id: i18n.h 1.7 2003/10/19 15:02:05 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -21,6 +21,7 @@ void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin);
 const char *I18nTranslate(const char *s, const char *Plugin = NULL);
 
 const char * const * I18nLanguages(void);
+const char * const * I18nCharSets(void);
 
 #ifdef PLUGIN_NAME_I18N
 #define tr(s)  I18nTranslate(s, PLUGIN_NAME_I18N)
diff --git a/libdtv/COPYING b/libdtv/COPYING
deleted file mode 100644
index a43ea2126..000000000
--- a/libdtv/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/libdtv/Makefile b/libdtv/Makefile
deleted file mode 100644
index 56cb53305..000000000
--- a/libdtv/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-##############################################################
-###                                                        ###
-### Makefile: global makefile for libdtv                   ###
-###                                                        ###
-##############################################################
-
-## $Revision: 1.3 $
-## $Date: 2001/06/25 12:51:41 $
-## $Author: hakenes $
-##
-##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-##
-## libdtv is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## libdtv is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You may have received a copy of the GNU General Public License
-## along with libdtv; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-#
-#
-#
-
-#
-#  adapt this to your GNU make executable
-#
-MAKE = make
-
-AR = ar
-ARFLAGS = ru
-RANLIB = ranlib
-
-SUBDIRS = liblx libsi libvdr
-
-all: newdist
-
-new: clean newdist
-
-clean:
-	@echo "making all clean..."
-	@for i in $(SUBDIRS);\
-	do \
-	    ( echo $$i; cd $$i ;\
-	    $(MAKE) clean ) ;\
-	done
-	@rm -rf lib include libdtv.*
-
-newdist:
-	@mkdir -p include lib
-	@echo "making all distributions..."
-	@for i in $(SUBDIRS) ;\
-	do \
-	    ( cd $$i ;\
-	    $(MAKE) new dist ) ;\
-	done
-	@echo "making libdtv.a/libdtv.h..."
-	@cat include/* > libdtv.h
-	@mkdir -p tmp
-	@for i in $(SUBDIRS) ;\
-	do \
-	    ( cd tmp;\
-              $(AR) x ../lib/$$i.a;\
-              $(AR) $(ARFLAGS) ../libdtv.a *;\
-              rm -f *) ;\
-	done
-	@rm -rf lib include tmp
diff --git a/libdtv/README b/libdtv/README
deleted file mode 100644
index 88ee04904..000000000
--- a/libdtv/README
+++ /dev/null
@@ -1,27 +0,0 @@
-DTV System Information Library
-==============================
-
-This is intended to support the VDR application of Klaus Schmidinger with
-extended EIT support, mainly on NVOD channels.
-Bug reports and suggestions are very appreciated and should be sent to
-hakenes@hippomi.de
-
-Have fun,
-
-  (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-  
-libdtv is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-  
-libdtv is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-  
-You may have received a copy of the GNU General Public License
-along with libdtv; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
diff --git a/libdtv/liblx/COPYING b/libdtv/liblx/COPYING
deleted file mode 100644
index a43ea2126..000000000
--- a/libdtv/liblx/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/libdtv/liblx/Makefile b/libdtv/liblx/Makefile
deleted file mode 100644
index d06ee0915..000000000
--- a/libdtv/liblx/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-##############################################################
-###                                                        ###
-### Makefile: local makefile for liblx                     ###
-###                                                        ###
-##############################################################
-
-## $Revision: 1.2 $
-## $Date: 2001/06/25 19:39:00 $
-## $Author: hakenes $
-##
-##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-##
-## dtv_scan is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## dtv_scan is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You may have received a copy of the GNU General Public License
-## along with dtv_scan; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-#
-#
-#
-CC ?= gcc
-CFLAGS ?= -O2 -g -pedantic -Wmissing-prototypes -Wstrict-prototypes \
-         -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
-
-
-AR = ar
-ARFLAGS = r
-RANLIB = ranlib
-RM = rm -f
-CP = cp
-
-LXINCLUDE = liblx.h
-LXLIB = liblx.a
-LXOBJS = xMemMgt.o xListFuncs.o
-
-all : $(LXLIB)
-
-clean :
-	@echo "cleaning workspace..."
-	@$(RM) $(LXOBJS) $(LXLIB)
-
-new : clean all
-
-$(LXLIB) : $(LXOBJS)
-	@echo "updating library..."
-	@$(AR) $(ARFLAGS) $(LXLIB) $(LXOBJS)
-	@$(RANLIB) $(LXLIB)
-
-dist: all
-	@echo "distributing liblx.a and liblx.h..."
-	@$(CP) $(LXLIB) ../lib
-	@$(CP) $(LXINCLUDE) ../include
-    
diff --git a/libdtv/liblx/liblx.h b/libdtv/liblx/liblx.h
deleted file mode 100644
index 2e122956a..000000000
--- a/libdtv/liblx/liblx.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- *
- * liblx.h: definitions necessary for the liblx package
- *
- *
- * $Revision: 1.2 $
- * $Date: 2001/06/25 19:39:00 $
- * $Author: hakenes $
- *
- *   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
- *
- * liblx is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * liblx is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You may have received a copy of the GNU General Public License
- * along with liblx; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef LIBLX_H
-#define LIBLX_H
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-/*
- *
- *   list support structures
- *
- */
-struct NODE
-{
-   struct NODE                 *Succ;
-   struct NODE                 *Pred;
-   char                        *Name;
-   unsigned short               HashKey;
-};
-
-struct LIST
-{
-   struct NODE                 *Head;
-   struct NODE                 *Tail;
-   char                        *Name;
-   unsigned long                Size;
-};
-
-
-/*
- *
- *   memory managment structures
- *
- */
-struct MEM_ENTRY
-{
-   struct MEM_ENTRY        *Succ;
-   struct MEM_ENTRY        *Pred;
-   unsigned long            Size;
-};
-
-struct MEM_CHUNK
-{
-   struct MEM_CHUNK        *Succ;
-   struct MEM_CHUNK        *Pred;
-   unsigned long            Size;
-   struct MEM_ENTRY        *FirstFreeMemEntry;
-   struct MEM_ENTRY        *FirstUsedMemEntry;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *
- *   list functions (package xList)
- *
- */
-    unsigned short      xHashKey (char *);
-    struct LIST        *xNewList (char *);
-    struct NODE        *xNewNode (char *, unsigned long);
-    struct NODE        *xFindName (struct LIST *, char *);
-/*
- *
- *   memory management
- *
- */
-    void                xMemAllo (unsigned long, unsigned char **);
-    void                xMemFre (unsigned char *);
-    void                xMemFreeAll (struct MEM_CHUNK **);
-    void                xMemMerge (struct MEM_CHUNK **);
-    struct MEM_CHUNK  **xGetRemember (void);
-    void                xSetRemember (struct MEM_CHUNK **);
-    void                xPrintMemList (struct MEM_CHUNK **);
-    unsigned long       xGetMemSize (struct MEM_CHUNK **);
-extern unsigned long    xAllocatedMemory;
-    char               *xSetText (char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#define     MEM_CHUNK_SIZE    65536
-
-#define xMemAlloc(size, ptr) \
-   xMemAllo (((unsigned long)((size))), ((unsigned char **)((ptr))))
-#define xMemFree(ptr) xMemFre (((unsigned char *)((ptr))))
-/*
- *
- *   list support macros
- *
- */
-/*---------------------------------------------------------------------*
- |                                                                     |
- |   xCreateNode (NodeStruct,Name) allocates a correctly sized and     |
- |   typed node struct.                                                |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xCreateNode(NodeStruct,Name) \
-   (NodeStruct) = (void *) xNewNode(Name, sizeof(*(NodeStruct)))
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |      xSize (List) scans for the ->Size field of a list struct       |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xSize(List) ((List) ? ((struct LIST *)(List))->Size : 0)
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |    xName (NodeStruct) scans for the ->Node.Name of a node struct    |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xName(NodeStruct) (((struct NODE *)(NodeStruct))->Name)
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |    xSucc (NodeStruct) scans for the ->Node.Succ of a node struct    |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xSucc(NodeStruct) (((struct NODE *)(NodeStruct))->Succ)
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |    xPred (NodeStruct) scans for the ->Node.Pred of a node struct    |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xPred(NodeStruct) (((struct NODE *)(NodeStruct))->Pred)
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |    xForeach(List,NodeStruct) builds a loop to process each list     |
- |    element.                                                         |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xForeach(List,NodeStruct) \
-   if (List) for ((NodeStruct) = (void *) ((struct LIST *)(List))->Head; \
-           (NodeStruct); (NodeStruct) = (void *) xSucc (NodeStruct))
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |    xForeachReverse(List,NodeStruct) builds a loop to process each   |
- |    element in reverse order.                                        |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xForeachReverse(List,NodeStruct) \
-   if (List) for ((NodeStruct) = (void *) ((struct LIST *)(List))->Tail; \
-           NodeStruct; (NodeStruct) = (void *) xPred (NodeStruct))
-
-
-/*---------------------------------------------------------------------*
- |                                                                     |
- |    xRemove(List,NodeStruct) unchains a node struct out of a list.   |
- |                                                                     |
- *---------------------------------------------------------------------*/
-#define xRemove(List,NodeStruct) \
-   do \
-   { \
-      struct NODE *TmpNode; \
-      struct LIST *TmpList; \
-      \
-      TmpNode = ((struct NODE *)(NodeStruct)); \
-      TmpList = ((struct LIST *)(List)); \
-	  \
-      if (TmpNode->Pred) \
-         (TmpNode->Pred)->Succ = TmpNode->Succ; \
-      else TmpList->Head = TmpNode->Succ; \
-      if (TmpNode->Succ) \
-         (TmpNode->Succ)->Pred = TmpNode->Pred; \
-      else TmpList->Tail = TmpNode->Pred; \
-      TmpList->Size --; \
-   } while (0)
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xAddHead                                            *
- *                                                                       *
- *     arguments :   List - pointer to a LIST structure                  *
- *                                                                       *
- *                   Node - pointer to a NODE structure                  *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *     xAddHead() inserts 'Node' at the head of 'List'.                  *
- *                                                                       *
- *************************************************************************/
-#define xAddHead(List, NodeStruct) \
-   do { \
-      struct NODE *TmpNode; \
-      struct LIST *TmpList; \
-      \
-      TmpNode = ((struct NODE *)(NodeStruct)); \
-      TmpList = ((struct LIST *)(List)); \
-	  \
-      if (TmpList->Head) { \
-         TmpNode->Pred = NULL; \
-         TmpNode->Succ = TmpList->Head; \
-         (TmpList->Head)->Pred = TmpNode; \
-         TmpList->Head = TmpNode; } \
-      else { \
-         TmpList->Head = TmpNode; \
-         TmpList->Tail = TmpNode; \
-         TmpNode->Pred = NULL; \
-         TmpNode->Succ = NULL; } \
-      TmpList->Size++; \
-   } while (0)
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xAddTail                                            *
- *                                                                       *
- *     arguments :   List - pointer to a LIST structure                  *
- *                                                                       *
- *                   Node - pointer to a NODE structure                  *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *     xAddTail() inserts 'Node' at the tail of 'List'.                  *
- *                                                                       *
- *************************************************************************/
-#define xAddTail(List, NodeStruct) \
-   do { \
-      struct NODE *TmpNode; \
-      struct LIST *TmpList; \
-      \
-      TmpNode = ((struct NODE *)(NodeStruct)); \
-      TmpList = ((struct LIST *)(List)); \
-	  \
-      if (TmpList->Head) { \
-         TmpNode->Succ = NULL; \
-         TmpNode->Pred = TmpList->Tail; \
-         (TmpList->Tail)->Succ = TmpNode; \
-         TmpList->Tail = TmpNode; } \
-      else { \
-         TmpList->Head = TmpNode; \
-         TmpList->Tail = TmpNode; \
-         TmpNode->Pred = NULL; \
-         TmpNode->Succ = NULL; } \
-      TmpList->Size++; \
-   } while (0)
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xRemHead                                            *
- *                                                                       *
- *     arguments :   List - pointer to a LIST structure                  *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *     xRemHead() removes a Node from head of 'List'.                    *
- *                                                                       *
- *************************************************************************/
-#define xRemHead(List) \
-   do { \
-      struct LIST *TmpList; \
-      \
-      TmpList = ((struct LIST *)(List)); \
-	  \
-      if (TmpList->Head) \
-      { \
-         TmpList->Head = (TmpList->Head)->Succ; \
-         if (TmpList->Head) (TmpList->Head)->Pred = NULL; \
-         else TmpList->Tail = NULL; \
-         TmpList->Size--; \
-      } \
-   } while (0)
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xRemTail                                            *
- *                                                                       *
- *     arguments :   List - pointer to a LIST structure                  *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *     xRemTail() removes a Node from the tail of 'List'.                *
- *                                                                       *
- *************************************************************************/
-#define xRemTail(List) \
-   do { \
-      struct LIST *TmpList; \
-      \
-      TmpList = ((struct LIST *)(List)); \
-	  \
-      if (TmpList->Tail) \
-      { \
-         TmpList->Tail = (TmpList->Tail)->Pred; \
-         if (TmpList->Tail) (TmpList->Tail)->Succ = NULL; \
-         else TmpList->Head = NULL; \
-         TmpList->Size--; \
-      } \
-   } while (0)
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xConCat                                             *
- *                                                                       *
- *     arguments :   DestinationList - pointer to the destination        *
- *                                     LIST structure                    *
- *                                                                       *
- *                   SourceList - pointer to the source LIST structure   *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xConCat() concats 'SourceList' with 'DestinationList' and clears    *
- *   'SourceList'.                                                       *
- *                                                                       *
- *************************************************************************/
-#define xConCat(DestinationList, SourceList) \
-   do { \
-      struct LIST *SrcList; \
-      struct LIST *DstList; \
-      \
-      SrcList = ((struct LIST *)(SourceList)); \
-      DstList = ((struct LIST *)(DestinationList)); \
-	  \
-      if (DstList && SrcList) \
-      { \
-         if (DstList->Head) { \
-            if (SrcList->Head) { \
-               (DstList->Tail)->Succ = SrcList->Head; \
-               (SrcList->Head)->Pred = DstList->Tail; \
-               DstList->Tail = SrcList->Tail; \
-               DstList->Size += SrcList->Size; \
-               SrcList->Size = 0; \
-               SrcList->Head = NULL; \
-               SrcList->Tail = NULL; } } \
-         else { \
-            DstList->Head = SrcList->Head; \
-            DstList->Tail = SrcList->Tail; \
-            DstList->Size += SrcList->Size; \
-            SrcList->Size = 0; \
-            SrcList->Head = NULL; \
-            SrcList->Tail = NULL; } \
-      } \
-      else if (SrcList) ((struct LIST *)(DestinationList)) = SrcList; \
-   } while (0)
-
-
-
-#define xJoinList(SourceList, DestinationList, NodeStruct) \
-   do { \
-      struct NODE *KeyNode; \
-      struct NODE *TmpNode; \
-      struct LIST *SrcList; \
-      struct LIST *DstList; \
-      \
-      KeyNode = ((struct NODE *)(NodeStruct)); \
-      SrcList = ((struct LIST *)(SourceList)); \
-      DstList = ((struct LIST *)(DestinationList)); \
-	  \
-      if (SrcList->Head) \
-      { \
-         TmpNode = KeyNode->Succ; \
-         KeyNode->Succ = SrcList->Head; \
-         SrcList->Tail->Succ = TmpNode; \
-         SrcList->Head->Pred = KeyNode; \
-         if (!TmpNode) DstList->Tail = SrcList->Tail; \
-         else TmpNode->Pred = SrcList->Tail; \
-         DstList->Size += SrcList->Size; \
-         SrcList->Size = 0; \
-         SrcList->Head = NULL; \
-         SrcList->Tail = NULL; \
-      } \
-   } while (0)
-
-#define xJoin(SourceNode, DestinationList, NodeStruct) \
-   do { \
-      struct NODE *KeyNode; \
-      struct NODE *TmpNode; \
-      struct NODE *SrcNode; \
-      struct LIST *DstList; \
-      \
-      KeyNode = ((struct NODE *)(NodeStruct)); \
-      SrcNode = ((struct NODE *)(SourceNode)); \
-      DstList = ((struct LIST *)(DestinationList)); \
-	  \
-      if (SrcNode) \
-      { \
-         TmpNode = KeyNode->Succ; \
-         KeyNode->Succ = SrcNode; \
-         SrcNode->Succ = TmpNode; \
-         SrcNode->Pred = KeyNode; \
-         if (!TmpNode) DstList->Tail = SrcNode; \
-         else TmpNode->Pred = SrcNode; \
-         DstList->Size += 1; \
-      } \
-   } while (0)
-
-#define xClearList(SrcList) \
-   do { \
-         (SrcList)->Size = 0; \
-         (SrcList)->Head = NULL; \
-         (SrcList)->Tail = NULL; \
-   } while (0)
-
-#define xSetName(nodestruct, name) \
-   do { \
-      struct NODE *TmpNode; \
-      \
-      TmpNode = (struct NODE *) (nodestruct); \
-      \
-      TmpNode->Name = xSetText (name); \
-      TmpNode->HashKey = xHashKey (name); \
-   } while (0)
-
-#endif
diff --git a/libdtv/liblx/xListFuncs.c b/libdtv/liblx/xListFuncs.c
deleted file mode 100644
index 88a908be4..000000000
--- a/libdtv/liblx/xListFuncs.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *
- * xListFuncs.c: list handling functions of liblx
- *
- *
- * $Revision: 1.1 $
- * $Date: 2001/06/25 12:29:47 $
- * $Author: hakenes $
- *
- *   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
- *
- * liblx is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * liblx is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You may have received a copy of the GNU General Public License
- * along with liblx; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include <string.h>
-#include "liblx.h"
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xHashKey                                            *
- *                                                                       *
- *     arguments :   Name - character pointer                            *
- *                                                                       *
- *     return    :   16 Bit CRC checksum as hashkey                      *
- *                                                                       *
- *************************************************************************/
-unsigned short xHashKey (Name)
-
-char *Name;
-{
-    unsigned short     Key = 0;
-    unsigned long      Value;
-    char              *Ptr;
-
-    if (!Name) return (0);
-
-    for (Ptr = Name; *Ptr; Ptr++) {
-        Value = ((Key >> 8) ^ (*Ptr)) & 0xFF;
-        Value = Value ^ (Value >> 4);
-        Key = 0xFFFF & ((Key << 8) ^ Value ^ (Value << 5) ^ (Value << 12));
-    }
-    return (Key);
-}
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xNewNode                                            *
- *                                                                       *
- *     arguments :   Name - character pointer to the node's name         *
- *                                                                       *
- *                   Size - size of the surrounding structure in bytes   *
- *                                                                       *
- *     return    :   pointer to a correct initialized NODE structure     *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xNewNode() allocates memory for a NODE structure and initializes    *
- *   it properly. If argument Name points to a string, it copies that    *
- *   into a new allocated memory area and assigns Node->Name to it.      *
- *   Because NODE's are often part of bigger structures, the size of     *
- *   the surrounding structure could be specified to allocate it.        *
- *                                                                       *
- *************************************************************************/
-
-struct NODE *xNewNode (Name, Size)
-
-char *Name;
-unsigned long Size;
-{
-   struct NODE      *Node;
-
-   if (Size < sizeof(struct NODE)) Size = sizeof(struct NODE);
-
-   xMemAlloc (Size, &Node);
-
-   Node->Succ = NULL;
-   Node->Pred = NULL;
-
-   if (Name == NULL)
-   {
-      Node->Name = NULL;
-      Node->HashKey = 0;
-   }
-   else
-   {
-      xMemAlloc (strlen (Name) + 1, &(Node->Name));
-      strcpy (Node->Name, Name);
-      Node->HashKey = xHashKey (Name);
-   }
-
-   return (Node);
-}
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xNewList                                            *
- *                                                                       *
- *     arguments :   Name - character pointer to the list's name         *
- *                                                                       *
- *     return    :   pointer to a correct initialized LIST structure     *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xNewList() allocates memory for a LIST structure and initializes    *
- *   it properly. If argument Name points to a string, it copies that    *
- *   into a new allocated memory area and assigns List->Name to it.      *
- *                                                                       *
- *************************************************************************/
-
-struct LIST *xNewList (Name)
-
-char *Name;
-{
-   struct LIST      *List;
-
-   xMemAlloc (sizeof(struct LIST), &List);
-
-   List->Head = NULL;
-   List->Tail = NULL;
-   List->Size = 0;
-
-   if (Name == NULL)
-   {
-      List->Name = NULL;
-   }
-   else
-   {
-      xMemAlloc (strlen (Name) + 1, &(List->Name));
-      strcpy (List->Name, Name);
-   }
-
-   return (List);
-}
-
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xFindName                                           *
- *                                                                       *
- *     arguments :   List - pointer to a LIST structure                  *
- *                                                                       *
- *                   Name - pointer to a name string                     *
- *                                                                       *
- *     return    :   pointer to a NODE structure                         *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xFindName() looks for element with name 'Name' in list 'List' and   *
- *   returns its NODE structure.                                         *
- *                                                                       *
- *************************************************************************/
-
-struct NODE *xFindName (List, Name)
-
-struct LIST *List;
-char *Name;
-{
-   struct NODE     *Node;
-   unsigned short   HashKey;
-
-   if (!Name || !List) return (NULL);
-
-   HashKey = xHashKey (Name);
-
-   for (Node = List->Head; Node; Node = Node->Succ)
-      if (HashKey == Node->HashKey)
-         if (Node->Name)
-            if (strcmp (Node->Name, Name) == 0) return (Node);
-
-   return (NULL);
-}
diff --git a/libdtv/liblx/xMemMgt.c b/libdtv/liblx/xMemMgt.c
deleted file mode 100644
index b1b07dee6..000000000
--- a/libdtv/liblx/xMemMgt.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- *
- * xMemMgt.c: memory management functions of liblx
- *
- *
- * $Revision: 1.1 $
- * $Date: 2001/06/25 12:29:47 $
- * $Author: hakenes $
- *
- *   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
- *
- * liblx is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * liblx is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You may have received a copy of the GNU General Public License
- * along with liblx; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-
-#include "liblx.h"
-
-#ifdef DEBUG
-void logPrintf(int, char *, ...);
-#endif
-
-static struct MEM_CHUNK *xRememberKey = NULL;
-
-static struct MEM_CHUNK **xRememberPtr = &xRememberKey;
-
-unsigned long xAllocatedMemory = 0;
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xMemAlloc                                           *
- *                                                                       *
- *     parameter :   Size - size of the requested memory area            *
- *                                                                       *
- *                   DataPointer - pointer to data pointer               *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xMemAlloc() is a clustered, remembering memory management routine.  *
- *   It uses its own tables for free and used memory blocks on private   *
- *   memory area. With xMemFree(), you can free this memory likewise     *
- *   the C free() routine, with xMemFreeAll() all memory at once.        *
- *   By changing the current remember key with xSetRemember() you can    *
- *   define a local memory area, which can be freed by only one call of  *
- *   xMemFreeAll() (see xSetRemember() / xGetRemember()).                *
- *                                                                       *
- *************************************************************************/
-
-void xMemAllo (Size, DataPointer)
-
-unsigned long Size;
-unsigned char **DataPointer;
-{
-   struct MEM_CHUNK        *MemChunk, *MemChunkPred;
-   struct MEM_ENTRY        *MemEntry, *MemEntryPred;
-   long int                 NewSize;
-   unsigned short           FoundFlag;
-#ifdef DEBUG
-   unsigned char           *ptr;
-#endif
-
-   while (Size % 4) Size++;
-
-   if (Size > (MEM_CHUNK_SIZE - sizeof(struct MEM_CHUNK) - 
-                  sizeof(struct MEM_ENTRY)))
-   {
-      NewSize = Size + sizeof(struct MEM_CHUNK) + sizeof(struct MEM_ENTRY);
-
-      if (MemChunk = (*xRememberPtr))
-      {
-         do
-         {
-            MemChunkPred = MemChunk;
-         } while (MemChunk = MemChunk->Succ);
-      }
-      else MemChunkPred = (struct MEM_CHUNK *) &(*xRememberPtr);
-
-      MemChunk = MemChunkPred->Succ = (struct MEM_CHUNK *) malloc (NewSize);
-      xAllocatedMemory += NewSize;
-
-#ifdef DEBUG
-      for (ptr = (unsigned char *) MemChunk; ptr < (unsigned char *)
-            (MemChunk) + NewSize; ptr++)
-             *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
-#endif
-
-      if (!MemChunk)
-      {
-#ifdef DEBUG
-         logPrintf (0, "Not enough memory...\r\n");
-#endif
-         exit (1);
-      }
-
-      MemChunk->Size = NewSize;
-      MemChunk->Pred = MemChunkPred;
-      MemChunk->Succ = NULL;
-      MemChunk->FirstFreeMemEntry = NULL;
-      MemChunk->FirstUsedMemEntry =
-         MemEntry = (struct MEM_ENTRY *) ((unsigned char *)MemChunk +
-                       sizeof(struct MEM_CHUNK));
-
-      MemEntry->Size = Size;
-      MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstUsedMemEntry;
-      MemEntry->Succ = NULL;
-
-      *DataPointer = (unsigned char *) ((unsigned char *)MemEntry +
-                                           sizeof(struct MEM_ENTRY));
-#ifdef DEBUG_CALLS
-      logPrintf (0, "xMemAlloc: %x, %d bytes\r\n", *DataPointer, Size);
-#endif
-      return;
-   }
-
-   MemEntry = NULL;
-   FoundFlag = 0;
-
-   if (MemChunk = (*xRememberPtr))
-   {
-      do
-      {
-         if (MemEntry = MemChunk->FirstFreeMemEntry)
-         do
-         {
-            if (Size <= MemEntry->Size) FoundFlag = 1;
-         } while ((FoundFlag == 0) && (MemEntry = MemEntry->Succ));
-         MemChunkPred = MemChunk;
-      } while ((FoundFlag == 0) && (MemChunk = MemChunk->Succ));
-   }
-   else MemChunkPred = (struct MEM_CHUNK *) &(*xRememberPtr);
-
-   if (!MemEntry)
-   {
-      MemChunk = MemChunkPred->Succ =
-         (struct MEM_CHUNK *) malloc (MEM_CHUNK_SIZE);
-      xAllocatedMemory += MEM_CHUNK_SIZE;
-
-#ifdef DEBUG
-      for (ptr = (unsigned char *) MemChunk; ptr < (unsigned char *)
-            (MemChunk) + MEM_CHUNK_SIZE; ptr++)
-             *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
-#endif
-
-      if (!MemChunk)
-      {
-#ifdef DEBUG
-         logPrintf (0, "Not enough memory...\r\n");
-#endif
-         exit (1);
-      }
-
-      MemChunk->Size = MEM_CHUNK_SIZE;
-      MemChunk->Pred = MemChunkPred;
-      MemChunk->Succ = NULL;
-      MemChunk->FirstUsedMemEntry = NULL;
-      MemChunk->FirstFreeMemEntry =
-         MemEntry = (struct MEM_ENTRY *) 
-		               ((unsigned char *)MemChunk + sizeof(struct MEM_CHUNK));
-
-      MemEntry->Size = MEM_CHUNK_SIZE - sizeof(struct MEM_CHUNK) - 
-	                                       sizeof(struct MEM_ENTRY);
-      MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstFreeMemEntry;
-      MemEntry->Succ = NULL;
-   }
-
-   NewSize = MemEntry->Size - sizeof(struct MEM_ENTRY) - Size;
-
-   MemEntry->Size = Size;
-   *DataPointer = (unsigned char *) 
-                     ((unsigned char *)MemEntry + sizeof(struct MEM_ENTRY));
-
-#ifdef DEBUG
-   for (ptr = *DataPointer; ptr < (unsigned char *)
-            (*DataPointer) + Size; ptr++)
-   {
-     if (((unsigned long )ptr)&1)
-     {  if (*ptr != 0x55)
-           logPrintf (0, "freed memory was used\r\n"); }
-     else { if (*ptr != 0xAA)
-           logPrintf (0, "freed memory was used\r\n"); }
-   }
-#endif
-
-   if (MemEntry->Succ) 
-      ((struct MEM_ENTRY *)MemEntry->Succ)->Pred = MemEntry->Pred;
-   ((struct MEM_ENTRY *)MemEntry->Pred)->Succ = MemEntry->Succ;
-
-   if (MemChunk->FirstUsedMemEntry)
-      MemChunk->FirstUsedMemEntry->Pred = MemEntry;
-   MemEntry->Succ = MemChunk->FirstUsedMemEntry;
-   MemChunk->FirstUsedMemEntry = MemEntry;
-   MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstUsedMemEntry;
-
-   if (NewSize > 0)
-   {
-      MemEntry = (struct MEM_ENTRY *) 
-	          ((unsigned char *)MemEntry + sizeof(struct MEM_ENTRY) + Size);
-      MemEntry->Size = NewSize;
-
-      if (MemChunk->FirstFreeMemEntry)
-         MemChunk->FirstFreeMemEntry->Pred = MemEntry;
-      MemEntry->Succ = MemChunk->FirstFreeMemEntry;
-      MemChunk->FirstFreeMemEntry = MemEntry;
-      MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstFreeMemEntry;
-   }
-#ifdef DEBUG_CALLS
-   logPrintf (0, "xMemAlloc: %x, %d bytes\r\n", *DataPointer, Size);
-#endif
-   return;
-}
-
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xMemFree                                            *
- *                                                                       *
- *     parameter :   DataPointer - data pointer                          *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xMemFree() frees with xMemAlloc() allocated memory.                 *
- *                                                                       *
- *************************************************************************/
-
-void xMemFre (DataPointer)
-
-unsigned char *DataPointer;
-{
-   struct MEM_CHUNK            *MemChunk, *MemChunkPred;
-   struct MEM_ENTRY            *MemEntry, *TempEntry, *PredEntry, *SuccEntry;
-   unsigned short               FoundFlag;
-#ifdef DEBUG
-   unsigned char           *ptr;
-#endif
-
-   if (!DataPointer)
-   {
-      return;
-   }
-   else
-   {
-      MemEntry = NULL;
-      FoundFlag = 0;
-
-      if (MemChunk = (*xRememberPtr))
-      do
-      {
-         if (MemEntry = MemChunk->FirstUsedMemEntry)
-         do
-         {
-            if (DataPointer == (unsigned char *) ((unsigned char *) MemEntry +
-                   sizeof(struct MEM_ENTRY))) FoundFlag = 1;
-         } while ((FoundFlag == 0) && (MemEntry = MemEntry->Succ));
-      } while ((FoundFlag == 0) && (MemChunk = MemChunk->Succ));
-
-      if (FoundFlag == 1)
-      {
-#ifdef DEBUG_CALLS
-   logPrintf (0, "xMemFree: %x, %d bytes\r\n", DataPointer, MemEntry->Size);
-#endif
-         if (MemEntry->Succ)
-            ((struct MEM_ENTRY *)MemEntry->Succ)->Pred = MemEntry->Pred;
-         ((struct MEM_ENTRY *)MemEntry->Pred)->Succ = MemEntry->Succ;
-
-         if (!MemChunk->FirstUsedMemEntry)
-         {
-            if (MemChunk->Succ)
-               ((struct MEM_CHUNK *)MemChunk->Succ)->Pred = MemChunk->Pred;
-            ((struct MEM_CHUNK *)MemChunk->Pred)->Succ = MemChunk->Succ;
-            if (xAllocatedMemory > 0) xAllocatedMemory -= MemChunk->Size;
-            free (MemChunk);
-            return;
-         }
-
-         FoundFlag = 0;
-         PredEntry = NULL;
-         SuccEntry = NULL;
-         if (TempEntry = MemChunk->FirstFreeMemEntry)
-         do
-         {
-            if ((struct MEM_ENTRY *)((unsigned char *)TempEntry +
-                  TempEntry->Size + sizeof(struct MEM_ENTRY)) == MemEntry)
-            {
-               FoundFlag ++;
-               PredEntry = TempEntry;
-            }
-            if ((struct MEM_ENTRY *)((unsigned char *)MemEntry +
-                  MemEntry->Size + sizeof(struct MEM_ENTRY)) == TempEntry)
-            {
-               FoundFlag ++;
-               SuccEntry = TempEntry;
-            }
-         } while ((FoundFlag != 2) && (TempEntry = TempEntry->Succ));
-
-         if (PredEntry)
-         {
-            if (SuccEntry)
-            {
-               /* Vorgdnger + Nachfolger */
-
-               if (SuccEntry->Succ)
-                  ((struct MEM_ENTRY *)SuccEntry->Succ)->Pred = SuccEntry->Pred;
-               ((struct MEM_ENTRY *)SuccEntry->Pred)->Succ = SuccEntry->Succ;
-
-               PredEntry->Size += MemEntry->Size + sizeof(struct MEM_ENTRY) +
-                                  SuccEntry->Size + sizeof(struct MEM_ENTRY);
-            }
-            else
-            {
-               /* nur Vorgaenger */
-
-               PredEntry->Size += MemEntry->Size + sizeof(struct MEM_ENTRY);
-            }
-#ifdef DEBUG
-            for (ptr = (unsigned char *) (PredEntry) + sizeof(struct MEM_ENTRY);
-                ptr < (unsigned char *) (PredEntry) + sizeof(struct MEM_ENTRY) +
-                PredEntry->Size; ptr++)
-                  *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
-#endif
-         }
-         else
-         {
-            if (SuccEntry)
-            {
-               /* nur Nachfolger */
-
-               if (SuccEntry->Succ)
-                  ((struct MEM_ENTRY *)SuccEntry->Succ)->Pred = SuccEntry->Pred;
-               ((struct MEM_ENTRY *)SuccEntry->Pred)->Succ = SuccEntry->Succ;
-
-               MemEntry->Size += SuccEntry->Size + sizeof(struct MEM_ENTRY);
-            }
-
-            if (MemChunk->FirstFreeMemEntry)
-               MemChunk->FirstFreeMemEntry->Pred = MemEntry;
-            MemEntry->Succ = MemChunk->FirstFreeMemEntry;
-            MemChunk->FirstFreeMemEntry = MemEntry;
-            MemEntry->Pred = (struct MEM_ENTRY *) &MemChunk->FirstFreeMemEntry;
-#ifdef DEBUG
-            for (ptr = (unsigned char *) (MemEntry) + sizeof(struct MEM_ENTRY);
-                ptr < (unsigned char *) (MemEntry) + sizeof(struct MEM_ENTRY) +
-                MemEntry->Size; ptr++)
-                 *ptr = (((unsigned long)ptr)&1) ? 0x55 : 0xAA;
-#endif
-         }
-      }
-#ifdef DEBUG_CALLS
-   else
-   logPrintf (0, "xMemFree: tried to free unallocated data %x\r\n", DataPointer);
-#endif
-   }
-   return;
-}
-
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xMemFreeAll                                         *
- *                                                                       *
- *     parameter :   RememberPtr                                         *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xMemFreeAll() frees all with xMemAlloc() allocated memory. If Re-   *
- *   memberPtr is not NULL, the MEM_CHUNK structure from the specified   *
- *   Address is freed, otherwise the natural MEM_CHUNK will be done.     *
- *                                                                       *
- *************************************************************************/
-
-
-void xMemFreeAll (RememberPtr)
-
-struct MEM_CHUNK **RememberPtr;
-{
-   struct MEM_CHUNK            *MemChunk, *MemChunkPred;
-
-   if (RememberPtr)
-   {
-      if (MemChunkPred = (*RememberPtr))
-      do
-      {
-         MemChunk = MemChunkPred->Succ;
-         if (xAllocatedMemory > 0) xAllocatedMemory -= MemChunkPred->Size;
-         free (MemChunkPred);
-      } while (MemChunkPred = MemChunk);
-      *RememberPtr = NULL;
-   }
-   else
-   {
-      if (MemChunkPred = (*xRememberPtr))
-      do
-      {
-         MemChunk = MemChunkPred->Succ;
-         if (xAllocatedMemory > 0) xAllocatedMemory -= MemChunkPred->Size;
-         free (MemChunkPred);
-      } while (MemChunkPred = MemChunk);
-      *xRememberPtr = NULL;
-   }
-}
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xMemMerge                                           *
- *                                                                       *
- *     parameter :   RememberPtr                                         *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xMemMerge() merges the memory area pointed to by RememberKey with   *
- *   the currently used in xRememberPtr.                                 *
- *                                                                       *
- *************************************************************************/
-
-void xMemMerge (RememberPtr)
-
-struct MEM_CHUNK **RememberPtr;
-{
-   struct MEM_CHUNK            *MemChunk, *MemChunkPred;
-
-   if (RememberPtr)
-   {
-      if (MemChunk = (*xRememberPtr))
-      {
-         while (MemChunk->Succ) MemChunk = MemChunk->Succ;
-         MemChunk->Succ = (*RememberPtr);
-         *RememberPtr = NULL;
-      }
-      else (*xRememberPtr = *RememberPtr);
-   }
-   return;
-}
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xGetRemember                                        *
- *                                                                       *
- *     parameter :   none                                                *
- *                                                                       *
- *     return    :   pointer to a MEM_CHUNK tree                         *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xGetRemember() returns the currently used MEM_CHUNK tree.           *
- *                                                                       *
- *************************************************************************/
-
-
-struct MEM_CHUNK **xGetRemember ()
-{
-   return (xRememberPtr);
-}
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xSetRemember                                        *
- *                                                                       *
- *     parameter :   pointer to a MEM_CHUNK tree                         *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xSetRemember() redefines the currently used MEM_CHUNK pointer. If   *
- *   RememberPtr is NULL, the natural MEM_CHUNK is reloaded.             *
- *                                                                       *
- *************************************************************************/
-
-
-void xSetRemember (RememberPtr)
-
-struct MEM_CHUNK **RememberPtr;
-{
-   if (RememberPtr)
-      xRememberPtr = RememberPtr;
-   else
-      xRememberPtr = &xRememberKey;
-}
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xPrintMemList                                       *
- *                                                                       *
- *     parameter :   pointer to a MEM_CHUNK tree                         *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xPrintMemList() prints the currently allocated memory blocks of     *
- *   the specified RememberPtr.                                          *
- *                                                                       *
- *************************************************************************/
-
-
-void xPrintMemList (Remember)
-
-struct MEM_CHUNK **Remember;
-{
-   struct MEM_CHUNK           *MemChunk;
-   struct MEM_ENTRY           *MemEntry;
-
-   fprintf (stderr, "MemChunkPtr = %x\n", (int) Remember);
-
-   if (MemChunk = *Remember)
-   do
-   {
-      fprintf (stderr, "\tMemChunk at %x with Size %d\n", (int) MemChunk, 
-                 (int) MemChunk->Size);
-
-      if (MemEntry = MemChunk->FirstFreeMemEntry)
-      do
-      {
-         fprintf (stderr, "\t\tFree MemEntry at %x (%x) with Size %d\n", 
-                   (int) MemEntry, (int)((unsigned char *)MemEntry + 
-                      sizeof(struct MEM_ENTRY)), (int) MemEntry->Size);
-
-      } while (MemEntry = MemEntry->Succ);
-
-      if (MemEntry = MemChunk->FirstUsedMemEntry)
-      do
-      {
-         fprintf (stderr, "\t\tUsed MemEntry at %x (%x) with Size %d\n", 
-                   (int) MemEntry, (int)((unsigned char *)MemEntry + 
-                      sizeof(struct MEM_ENTRY)), (int) MemEntry->Size);
-
-      } while (MemEntry = MemEntry->Succ);
-
-   } while (MemChunk = MemChunk->Succ);
-   else fprintf (stderr, "\tNo current MemChunk\n");
-}
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xGetMemSize                                         *
- *                                                                       *
- *     parameter :   pointer to a MEM_CHUNK tree                         *
- *                                                                       *
- *     return    :   none                                                *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xGetMemSize() gets the size of the currently allocated memory       *
- *   blocks of the specified (or natural if NULL) RememberPtr            *
- *                                                                       *
- *************************************************************************/
-
-
-unsigned long xGetMemSize (RememberPtr)
-
-struct MEM_CHUNK **RememberPtr;
-{
-   struct MEM_CHUNK           *MemChunk;
-   struct MEM_ENTRY           *MemEntry;
-   unsigned long               Result = 0;
-
-   if (RememberPtr) MemChunk = *RememberPtr;
-   else MemChunk = xRememberKey;
-
-   if (MemChunk)
-   do { Result += (unsigned long) MemChunk->Size; }
-   while (MemChunk = MemChunk->Succ);
-
-   return (Result);
-}
-
-
-/*************************************************************************
- *                                                                       *
- *     function  :   xSetText                                            *
- *                                                                       *
- *     arguments :   xText - pointer to a string                         *
- *                                                                       *
- *     return    :   pointer to an new allocated string                  *
- *                                                                       *
- *-----------------------------------------------------------------------*
- *                                                                       *
- *   xSetText() allocates memory for the string pointed to by 'xText'    *
- *   and duplicates it.                                                  *
- *                                                                       *
- *************************************************************************/
-
-char *xSetText (xText)
-
-char *xText;
-{
-   char   *NewText;
-
-   if (!xText) return (NULL);
-
-   xMemAlloc (strlen(xText) + 1, &NewText);
-   strcpy (NewText, xText);
-
-   return (NewText);   
-}
diff --git a/libdtv/libsi/COPYING b/libdtv/libsi/COPYING
deleted file mode 100644
index a43ea2126..000000000
--- a/libdtv/libsi/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/libdtv/libsi/Makefile b/libdtv/libsi/Makefile
deleted file mode 100644
index 4f278a09c..000000000
--- a/libdtv/libsi/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-##############################################################
-###                                                        ###
-### Makefile: local makefile for libsi                     ###
-###                                                        ###
-##############################################################
-
-## $Revision: 1.4 $
-## $Date: 2001/10/07 10:24:46 $
-## $Author: hakenes $
-##
-##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-##
-## dtv_scan is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## dtv_scan is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You may have received a copy of the GNU General Public License
-## along with dtv_scan; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-#
-#
-#
-
-.DELETE_ON_ERROR:
-
-CC ?= gcc
-CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
-         -DNAPI -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -ansi -pedantic 
-
-INCDIRS = -Iinclude -I../include
-DISTDIR = ../lib
-DISTINCDIR = ../include
-INCLUDES = include/libsi.h include/si_tables.h
-MAKEDEPEND = gcc -M
-
-LIBDIRS = -L. -L../lib
-LIBS = -lsi -llx
-
-AR = ar
-ARFLAGS = ru
-RANLIB = ranlib
-
-SILIB = libsi.a
-OBJS = si_parser.o si_debug_services.o
-
-all : $(SILIB)
-
-clean :
-	@echo cleaning workspace...
-	@rm -f $(OBJS) $(SILIB) *~
-	@rm -f Makefile.dep
-
-depend : Makefile.dep
-Makefile.dep :
-	@echo "updating dependencies..."
-	@$(MAKEDEPEND) $(INCDIRS) $(OBJS:%.o=%.c) $(SITEST_OBJS:%.o=%.c) \
-           $(SISCAN_OBJS:%.o=%.c) > Makefile.dep
-
-new : clean depend all
-
-dist: all
-	@echo "distributing $(SILIB) to $(DISTDIR)..."
-	@cp $(SILIB) $(DISTDIR)
-	@cp $(INCLUDES) $(DISTINCDIR)
-	@$(RANLIB) $(DISTDIR)/$(SILIB)
-
-$(SILIB) : $(OBJS)
-	@echo updating library...
-	@$(AR) $(ARFLAGS) $(SILIB) $(OBJS)
-	@$(RANLIB) $(SILIB)
-
-.c.o : 
-	@echo compiling $<...
-	@$(CC) $(DEFINES) $(CFLAGS) $(INCDIRS) -c $<
-
--include Makefile.dep
diff --git a/libdtv/libsi/README b/libdtv/libsi/README
deleted file mode 100644
index 4f1be1ab5..000000000
--- a/libdtv/libsi/README
+++ /dev/null
@@ -1,2 +0,0 @@
-DVB - System Information Library
-================================
diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
deleted file mode 100644
index ad7a16495..000000000
--- a/libdtv/libsi/include/libsi.h
+++ /dev/null
@@ -1,1248 +0,0 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// libsi.h: definitions for data structures of libsi      ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.7 $
-// $Date: 2003/02/04 18:45:36 $
-// $Author: hakenes $
-//
-//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
-//               GNU GPL with contribution of Oleg Assovski,
-//               www.satmania.com
-//
-// libsi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libsi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libsi; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-#ifndef LIBSI_H
-#define LIBSI_H
-
-#include <time.h>
-#include <sys/types.h>
-#include <asm/types.h>
-
-#define dvb_pid_t int
-
-
-  /* Program Identifier */
-
-#define PID_PAT               0x00           /* Program Association Table */
-#define PID_CAT               0x01           /* Conditional Access Table */
-#define PID_NIT               0x10           /* Network Information Table */
-#define PID_BAT               0x11           /* Bouquet Association Table */
-#define PID_SDT               0x11           /* Service Description Table */
-#define PID_EIT               0x12           /* Event Information Table */
-#define PID_RST               0x13           /* Running Status Table */
-#define PID_TDT               0x14           /* Time Date Table */
-#define PID_TOT               0x14           /* Time Offset Table */
-#define PID_ST                0x14           /* Stuffing Table */
-                           /* 0x15 - 0x1F */ /* Reserved for future use */
-
-  /* Table Identifier */
-
-#define TID_PAT               0x00           /* Program Association Section */
-#define TID_CAT               0x01           /* Conditional Access Section */
-#define TID_PMT               0x02           /* Conditional Access Section */
-                           /* 0x03 - 0x3F */ /* Reserved for future use */
-#define TID_NIT_ACT           0x40           /* Network Information Section -
-                                                   actual */
-#define TID_NIT_OTH           0x41           /* Network Information Section -
-                                                   other */
-#define TID_SDT_ACT           0x42           /* Service Description Section -
-                                                   actual */
-#define TID_SDT_OTH           0x46           /* Service Description Section -
-                                                   other */
-#define TID_EIT_ACT           0x4E           /* Event Information Section -
-                                                   actual */
-#define TID_EIT_OTH           0x4F           /* Event Information Section -
-                                                   other */
-#define TID_EIT_ACT_SCH       0x50           /* Event Information Section -
-                                                   actual, schedule  */
-#define TID_EIT_OTH_SCH       0x60           /* Event Information Section -
-                                                   other, schedule */
-#define TID_TDT               0x70           /* Time Date Section */
-#define TID_TOT               0x73           /* Time Offset Section */
-#define TID_CA_ECM_0          0x80
-#define TID_CA_ECM_1          0x81
-#define TID_CA_EMM            0x82
-
-#define TID_BAT               0x4A           /* Bouquet Association Section */
-
-#define TID_EIT               0x12           /* Event Information Section */
-#define TID_RST               0x71           /* Running Status Section */
-#define TID_ST                0x72           /* Stuffing Section */
-                           /* 0xFF */        /* Reserved for future use */
-
-  /* Descriptor Identifier */
-
-  /* defined by ISO/IEC 13818-1 */
-
-#define DESCR_VIDEO_STREAM                   0x02
-#define DESCR_AUDIO_STREAM                   0x03
-#define DESCR_HIERARCHY                      0x04
-#define DESCR_REGISTRATION                   0x05
-#define DESCR_DATA_STREAM_ALIGN              0x06
-#define DESCR_TARGET_BACKGRID                0x07
-#define DESCR_VIDEO_WINDOW                   0x08
-#define DESCR_CA                             0x09
-#define DESCR_ISO_639_LANGUAGE               0x0A
-#define DESCR_SYSTEM_CLOCK                   0x0B
-#define DESCR_MULTIPLEX_BUFFER_UTIL          0x0C
-#define DESCR_COPYRIGHT                      0x0D
-#define DESCR_MAXIMUM_BITRATE                0x0E
-#define DESCR_PRIVATE_DATA_IND               0x0F
-#define DESCR_SMOOTHING_BUFFER               0x10
-#define DESCR_STD                            0x11
-#define DESCR_IBP                            0x12
-                                          /* 0x13 - 0x3F */ /* Reserved */
-
-  /* defined by ETSI */
-
-#define DESCR_NW_NAME                        0x40
-#define DESCR_SERVICE_LIST                   0x41
-#define DESCR_STUFFING                       0x42
-#define DESCR_SAT_DEL_SYS                    0x43
-#define DESCR_CABLE_DEL_SYS                  0x44
-#define DESCR_VBI_DATA                       0x45
-#define DESCR_VBI_TELETEXT                   0x46
-#define DESCR_BOUQUET_NAME                   0x47
-#define DESCR_SERVICE                        0x48
-#define DESCR_COUNTRY_AVAIL                  0x49
-#define DESCR_LINKAGE                        0x4A
-#define DESCR_NVOD_REF                       0x4B
-#define DESCR_TIME_SHIFTED_SERVICE           0x4C
-#define DESCR_SHORT_EVENT                    0x4D
-#define DESCR_EXTENDED_EVENT                 0x4E
-#define DESCR_TIME_SHIFTED_EVENT             0x4F
-#define DESCR_COMPONENT                      0x50
-#define DESCR_MOSAIC                         0x51
-#define DESCR_STREAM_ID                      0x52
-#define DESCR_CA_IDENT                       0x53
-#define DESCR_CONTENT                        0x54
-#define DESCR_PARENTAL_RATING                0x55
-#define DESCR_TELETEXT                       0x56
-#define DESCR_TELEPHONE                      0x57
-#define DESCR_LOCAL_TIME_OFF                 0x58
-#define DESCR_SUBTITLING                     0x59
-#define DESCR_TERR_DEL_SYS                   0x5A
-#define DESCR_ML_NW_NAME                     0x5B
-#define DESCR_ML_BQ_NAME                     0x5C
-#define DESCR_ML_SERVICE_NAME                0x5D
-#define DESCR_ML_COMPONENT                   0x5E
-#define DESCR_PRIV_DATA_SPEC                 0x5F
-#define DESCR_SERVICE_MOVE                   0x60
-#define DESCR_SHORT_SMOOTH_BUF               0x61
-#define DESCR_FREQUENCY_LIST                 0x62
-#define DESCR_PARTIAL_TP_STREAM              0x63
-#define DESCR_DATA_BROADCAST                 0x64
-#define DESCR_CA_SYSTEM                      0x65
-#define DESCR_DATA_BROADCAST_ID              0x66
-#define DESCR_TRANSPORT_STREAM               0x67
-#define DESCR_DSNG                           0x68
-#define DESCR_PDC                            0x69
-#define DESCR_AC3                            0x6A
-#define DESCR_ANCILLARY_DATA                 0x6B
-#define DESCR_CELL_LIST                      0x6C
-#define DESCR_CELL_FREQ_LINK                 0x6D
-#define DESCR_ANNOUNCEMENT_SUPPORT           0x6E
-
-
-#define MAX_SECTION_BUFFER 4096
-
-
-/* NetworkInfo structure (used to store NIT/BAT information) */
-
-struct NetworkInfo {
-   struct NODE          Node;
-   unsigned short       ID; // NetworkID / BouquetID
-   struct LIST         *Descriptors;
-   struct LIST         *TransportStreams;
-};
-
-#define CreateNetworkInfo(ni, id) \
-   do { \
-      xCreateNode (ni, NULL); \
-      (ni)->ID = id; \
-      (ni)->Descriptors = xNewList(NULL); \
-      (ni)->TransportStreams = NULL; \
-   } while(0)
-
-/* TransportStream structure (NIT/BAT TS loop member) */
-
-struct TransportStream {
-   struct NODE          Node;
-   int                  TransportStreamID;
-   unsigned short       OriginalNetworkID;
-   struct LIST         *Descriptors;
-};
-
-#define CreateTransportStream(ts, tsid, onid) \
-   do { \
-      xCreateNode (ts, NULL); \
-      (ts)->TransportStreamID = tsid; \
-      (ts)->OriginalNetworkID = onid; \
-      (ts)->Descriptors = xNewList(NULL); \
-   } while(0)
-
-/* Strukturen zur Aufnahme der SDT und EIT Informationen */
-
-struct Service {
-   struct NODE          Node;
-   int                  ServiceID;
-   int                  TransportStreamID;
-   int                  OriginalNetworkID;
-   int                  SdtVersion;
-   unsigned short       Status;
-   struct LIST         *Descriptors;
-   struct LIST         *Events;
-};
-
-#define EIT_SCHEDULE_FLAG               0x0001
-#define GetScheduleFlag(x)              ((x)&EIT_SCHEDULE_FLAG)
-#define SetScheduleFlag(x)              ((x)|=EIT_SCHEDULE_FLAG)
-#define EIT_PRESENT_FOLLOWING_FLAG      0x0002
-#define GetPresentFollowing(x)          ((x)&EIT_PRESENT_FOLLOWING_FLAG)
-#define SetPresentFollowing(x)          ((x)|=EIT_PRESENT_FOLLOWING_FLAG)
-#define RUNNING_STATUS_NOT_RUNNING      0x0000
-#define RUNNING_STATUS_AWAITING         0x0004
-#define RUNNING_STATUS_PAUSING          0x0008
-#define RUNNING_STATUS_RUNNING          0x000C
-#define GetRunningStatus(x)             ((x)&RUNNING_STATUS_RUNNING)
-#define SetRunningStatus(x,s)           ((x)|=((s)&RUNNING_STATUS_RUNNING))
-#define FREE_TO_AIR                     0x0000
-#define CONDITIONAL_ACCESS              0x0010
-#define GetConditionalAccess(x)         ((x)&CONDITIONAL_ACCESS)
-#define SetConditionalAccess(x)         ((x)|=CONDITIONAL_ACCESS)
-
-#define CreateService(service, svid, tsid, onid, vers, sta) \
-   do \
-   { \
-      xCreateNode (service, NULL); \
-      service->ServiceID = svid; \
-      service->TransportStreamID = tsid; \
-      service->OriginalNetworkID = onid; \
-      service->SdtVersion = vers; \
-      service->Status = sta; \
-      service->Descriptors = xNewList (NULL); \
-      service->Events = xNewList (NULL); \
-   } while (0)
-
-
-struct Event {
-   struct NODE          Node;
-   int                  EventID;
-   int                  ServiceID;
-   int                  EitVersion;
-   int                  TransportStreamID;
-   int                  OriginalNetworkID;
-   time_t               StartTime;
-   time_t               Duration;
-   unsigned short       Status;
-   struct LIST         *Descriptors;
-};
-
-#define CreateEvent(event, evid, svid, tsid, onid, vers, sta) \
-   do \
-   { \
-      xCreateNode (event, NULL); \
-      event->EventID = evid; \
-      event->ServiceID = svid; \
-      event->TransportStreamID = tsid; \
-      event->OriginalNetworkID = onid; \
-      event->EitVersion = vers; \
-      event->Status = sta; \
-      event->Descriptors = xNewList (NULL); \
-   } while (0)
-
-
-/* Strukturen zur Aufnahme der PAT und PMT Informationen */
-
-struct Program {
-   struct NODE          Node;
-   int                  ProgramID;
-   int                  TransportStreamID;
-   int                  NetworkPID;
-   int                  PatVersion;
-   struct LIST         *Pids;
-};
-
-#define CreateProgram(program, pgid, tsid, npid, vers) \
-   do \
-   { \
-      xCreateNode (program, NULL); \
-      program->ProgramID = pgid; \
-      program->TransportStreamID = tsid; \
-      program->NetworkPID = npid; \
-      program->PatVersion = vers; \
-      program->Pids = xNewList (NULL); \
-   } while (0)
-
-struct Pid {
-   struct NODE          Node;
-   int                  ProgramID;
-   int                  PcrPID;
-   int                  PmtVersion;
-   struct LIST         *Descriptors;
-   struct LIST         *InfoList;
-};
-
-#define CreatePid(pid, pgid, pcid, vers) \
-   do \
-   { \
-      xCreateNode (pid, NULL); \
-      pid->ProgramID = pgid; \
-      pid->PcrPID = pcid; \
-      pid->PmtVersion = vers; \
-      pid->Descriptors = xNewList (NULL); \
-      pid->InfoList = xNewList (NULL); \
-   } while (0)
-
-struct PidInfo {
-   struct NODE          Node;
-   int                  StreamType;
-   dvb_pid_t            ElementaryPid;
-   struct LIST         *Descriptors;
-};
-
-#define CreatePidInfo(pidinfo, styp, epid) \
-   do \
-   { \
-      xCreateNode (pidinfo, NULL); \
-      pidinfo->StreamType = styp; \
-      pidinfo->ElementaryPid = (dvb_pid_t) epid; \
-      pidinfo->Descriptors = xNewList (NULL); \
-   } while (0)
-
-
-#define STREAMTYPE_11172_VIDEO                   1
-#define STREAMTYPE_13818_VIDEO                   2
-#define STREAMTYPE_11172_AUDIO                   3
-#define STREAMTYPE_13818_AUDIO                   4
-#define STREAMTYPE_13818_PRIVATE                 5
-#define STREAMTYPE_13818_PES_PRIVATE             6
-#define STREAMTYPE_13522_MHPEG                   7
-#define STREAMTYPE_13818_DSMCC                   8
-#define STREAMTYPE_ITU_222_1                     9
-#define STREAMTYPE_13818_A                      10
-#define STREAMTYPE_13818_B                      11
-#define STREAMTYPE_13818_C                      12
-#define STREAMTYPE_13818_D                      13
-#define STREAMTYPE_13818_AUX                    14
-
-
-struct Tot {
-   time_t               UTC;
-   time_t               Bias;
-   struct LIST         *Descriptors;
-};
-
-#define CreateTot(tot, utc) \
-   do \
-   { \
-      xMemAlloc(sizeof(struct Tot), &tot); \
-      tot->UTC = utc; \
-      tot->Bias = ((utc - time(NULL) + 1800)/3600)*3600; \
-      tot->Descriptors = xNewList(NULL); \
-   } while (0)
-
-
-/* Descriptors */
-
-#define DescriptorTag(x) ((struct Descriptor *)(x))->Tag
-
-struct Descriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-};
-
-
-/* Iso639LanguageDescriptor */
-
-struct Iso639LanguageDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   char                 LanguageCode[4];
-};
-
-#define CreateIso639LanguageDescriptor(descr, lc1, lc2, lc3) \
-   do \
-   { \
-      xCreateNode (((struct Iso639LanguageDescriptor *)descr), NULL); \
-      ((struct Iso639LanguageDescriptor *)descr)->Tag = DESCR_ISO_639_LANGUAGE; \
-      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[0] = lc1; \
-      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[1] = lc2; \
-      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[2] = lc3; \
-      ((struct Iso639LanguageDescriptor *)descr)->LanguageCode[3] = '\0'; \
-   } while (0)
-
-
-/* Ac3Descriptor */
-
-#define AC3_TYPE_FLAG          0x0001
-#define BS_ID_FLAG             0x0002
-#define MAIN_ID_FLAG           0x0004
-#define ASVC_FLAG              0x0008
-
-struct Ac3Descriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       PresentFlags;
-   unsigned short       Ac3Type;
-   unsigned short       BsId;
-   unsigned short       MainId;
-   unsigned short       Asvc;
-   unsigned short       Amount;        /* AdditionalData */
-   unsigned char       *AdditionalData;
-};
-
-#define CreateAc3Descriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct Ac3Descriptor *)descr), NULL); \
-      ((struct Ac3Descriptor *)descr)->Tag = DESCR_AC3; \
-   } while (0)
-
-#define AddAc3FlagAndValue(descr, flg, val) \
-   do \
-   { \
-      if ((flg) & AC3_TYPE_FLAG) { \
-         ((struct Ac3Descriptor *)descr)->PresentFlags |= AC3_TYPE_FLAG; \
-         ((struct Ac3Descriptor *)descr)->Ac3Type = (val); } \
-      else if ((flg) & BS_ID_FLAG) { \
-         ((struct Ac3Descriptor *)descr)->PresentFlags |= BS_ID_FLAG; \
-         ((struct Ac3Descriptor *)descr)->BsId = (val); } \
-      else if ((flg) & MAIN_ID_FLAG) { \
-         ((struct Ac3Descriptor *)descr)->PresentFlags |= MAIN_ID_FLAG; \
-         ((struct Ac3Descriptor *)descr)->MainId = (val); } \
-      else if ((flg) & ASVC_FLAG) { \
-         ((struct Ac3Descriptor *)descr)->PresentFlags |= ASVC_FLAG; \
-         ((struct Ac3Descriptor *)descr)->Asvc = (val); } \
-   } while (0)
-
-#define AddAc3AdditionalData(descr, ptr, len) \
-   do \
-   { \
-      xMemAlloc ((len)+1, &(((struct Ac3Descriptor *) \
-         descr)->AdditionalData)); \
-      memcpy ((((struct Ac3Descriptor *)descr)->AdditionalData),(ptr),(len)); \
-   } while (0)
-
-
-/* AncillaryDataDescriptor */
-
-struct AncillaryDataDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       Identifier;
-};
-
-#define ANCILLARY_DATA_DVD_VIDEO            0x0001
-#define ANCILLARY_DATA_EXTENDED             0x0002
-#define ANCILLARY_DATA_SWITCHING            0x0004
-#define ANCILLARY_DATA_DAB                  0x0008
-#define ANCILLARY_DATA_SCALE_FACTOR         0x0010
-
-#define CreateAncillaryDataDescriptor(descr, id) \
-   do \
-   { \
-      xCreateNode (((struct AncillaryDataDescriptor *)descr), NULL); \
-      ((struct AncillaryDataDescriptor *)descr)->Tag = DESCR_ANCILLARY_DATA; \
-      ((struct AncillaryDataDescriptor *)descr)->Identifier = id; \
-   } while (0)
-
-
-/* BouquetNameDescriptor */
-/* 
-   the same used instead of NetworkNameDescriptor because their structures
-   are identical. We pass 'tag' parameter to distinguish between them later
-*/
-
-struct BouquetNameDescriptor {
-   struct NODE          Node;    /* Node enth�lt Namen */
-   unsigned short       Tag;
-};
-
-#define CreateBouquetNameDescriptor(descr, text, tag) \
-   do \
-   { \
-      xCreateNode (((struct BouquetNameDescriptor *)descr), NULL); \
-      ((struct NODE *)descr)->Name = text; \
-      ((struct NODE *)descr)->HashKey = xHashKey (text); \
-      ((struct BouquetNameDescriptor *)descr)->Tag = tag; \
-   } while (0)
-
-
-/* CountryAvailabilityDescriptor */
-
-struct CountryAvailabilityDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       AvailibilityFlag;
-   unsigned short       Amount;           /* CountryCodes */
-   char                *CountryCodes;
-};
-
-#define COUNTRIES_ARE_AVAILABLE   0x0001
-#define COUNTRIES_ARE_UNAVAILABLE 0x0000
-
-#define CreateCountryAvailabilityDescriptor(descr, ava) \
-   do \
-   { \
-      xCreateNode (((struct CountryAvailabilityDescriptor *)descr), NULL); \
-      ((struct CountryAvailabilityDescriptor *)descr)->Tag = DESCR_COUNTRY_AVAIL; \
-      ((struct CountryAvailabilityDescriptor *)descr)->AvailibilityFlag = ava; \
-      ((struct CountryAvailabilityDescriptor *)descr)->Amount = 0; \
-      ((struct CountryAvailabilityDescriptor *)descr)->CountryCodes = NULL; \
-   } while (0)
-
-#define AddCountryAvailabilityCode(descr, lc1, lc2, lc3) \
-   do \
-   { \
-      char tmpbuf[4], *tmpptr, *ttptr; \
-      \
-      tmpbuf[0] = lc1; tmpbuf[1] = lc2; \
-      tmpbuf[2] = lc3; tmpbuf[3] = '\0'; \
-      xMemAlloc (((struct CountryAvailabilityDescriptor *)descr)->Amount*4 + 8, &tmpptr); \
-      ttptr = tmpptr; \
-      if (((struct CountryAvailabilityDescriptor *)descr)->CountryCodes) { \
-         memcpy (ttptr, ((struct CountryAvailabilityDescriptor *)descr)->CountryCodes, \
-                        ((struct CountryAvailabilityDescriptor *)descr)->Amount*4); \
-         ttptr += ((struct CountryAvailabilityDescriptor *)descr)->Amount*4; \
-      } \
-      memcpy (ttptr, tmpbuf, 4); \
-      ((struct CountryAvailabilityDescriptor *)descr)->CountryCodes = tmpptr; \
-   } while (0)
-
-
-/* CaIdentifierDescriptor */
-
-struct CaIdentifierDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       Amount;           /* SystemIDs */
-   unsigned short      *SystemID;
-};
-
-#define CreateCaIdentifierDescriptor(descr, amo) \
-   do \
-   { \
-      xCreateNode (((struct CaIdentifierDescriptor *)descr), NULL); \
-      ((struct CaIdentifierDescriptor *)descr)->Tag = DESCR_CA_IDENT; \
-      ((struct CaIdentifierDescriptor *)descr)->Amount = amo; \
-      xMemAlloc (amo*2+2, &((struct CaIdentifierDescriptor *)descr)->SystemID); \
-   } while (0)
-
-#define SetCaIdentifierID(descr, num, id) \
-      ((struct CaIdentifierDescriptor *)descr)->SystemID[num] = id
-#define GetCaIdentifierID(descr, num) (((struct CaIdentifierDescriptor *)descr)->SystemID[num])
-
-/* CaDescriptor */
-
-struct CaDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       CA_type;
-   unsigned short       CA_PID;
-   unsigned int         ProviderID;
-   unsigned short       DataLength;
-   unsigned char       *Data;
-};
-
-#define CreateCaDescriptor(descr, typ, capid, len) \
-   do \
-   { \
-      xCreateNode (((struct CaDescriptor *)descr), NULL); \
-      ((struct CaDescriptor *)descr)->Tag = DESCR_CA; \
-      ((struct CaDescriptor *)descr)->CA_type = typ; \
-      ((struct CaDescriptor *)descr)->CA_PID = capid; \
-      ((struct CaDescriptor *)descr)->ProviderID = 0; \
-      ((struct CaDescriptor *)descr)->DataLength = len; \
-      xMemAlloc (len+1, &((struct CaDescriptor *)descr)->Data); \
-   } while (0)
-
-#define SetCaData(descr, num, id) \
-      ((struct CaDescriptor *)descr)->Data[num] = id
-#define GetCaData(descr, num) (((struct CaDescriptor *)descr)->Data[num])
-
-/* StreamIdentifierDescriptor */
-
-struct StreamIdentifierDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       ComponentTag;
-};
-
-#define CreateStreamIdentifierDescriptor(descr, ctag) \
-   do \
-   { \
-      xCreateNode (((struct StreamIdentifierDescriptor *)descr), NULL); \
-      ((struct StreamIdentifierDescriptor *)descr)->Tag = DESCR_STREAM_ID; \
-      ((struct StreamIdentifierDescriptor *)descr)->ComponentTag = (ctag); \
-   } while (0)
-
-
-/* DataBroadcastDescriptor */
-
-struct DataBroadcastDescriptor {
-   struct NODE          Node;          /* Node enth�lt DescriptorText */
-   unsigned short       Tag;
-   unsigned short       DataBroadcastID;
-   unsigned short       ComponentTag;
-   unsigned short       SelectorLength;
-   unsigned char       *SelectorBytes;
-   char                 LanguageCode[4];
-};
-
-struct MosaicDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   /* to be defined */
-};
-
-struct MultiLingualServiceDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   /* to be defined */
-};
-
-
-/* NvodReferenceDescriptor */
-
-struct NvodReferenceDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   struct LIST         *Items;
-};
-
-#define CreateNvodReferenceDescriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct NvodReferenceDescriptor *)descr), NULL); \
-      ((struct NvodReferenceDescriptor *)descr)->Tag = DESCR_NVOD_REF; \
-      ((struct NvodReferenceDescriptor *)descr)->Items = xNewList (NULL); \
-   } while (0)
-
-struct NvodReferenceItem {
-   struct NODE          Node;
-   int                  TransportStreamID;
-   int                  OriginalNetworkID;
-   int                  ServiceID;
-};
-
-#define CreateNvodReferenceItem(itm, tpid, onid, svid) \
-   do \
-   { \
-      xCreateNode (itm, NULL); \
-      itm->TransportStreamID = tpid; \
-      itm->OriginalNetworkID = onid; \
-      itm->ServiceID = svid; \
-   } while (0)
-
-#define AddNvodReferenceItem(desc, tpid, onid, svid) \
-   do \
-   { \
-      struct NvodReferenceItem *item; \
-      \
-      CreateNvodReferenceItem(item, tpid, onid, svid); \
-      xAddTail (((struct NvodReferenceDescriptor *)desc)->Items, item); \
-   } while (0)
-
-
-/* LinkageDescriptor */
-
-struct LinkageDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   int                  TransportStreamID;
-   int                  OriginalNetworkID;
-   int                  ServiceID;
-   int                  LinkageType;
-   int                  PrivateDataLength;
-   unsigned char       *PrivateData;
-};
-
-#define CreateLinkageDescriptor(descr, tpid, onid, svid, ltyp, pdl, pdp) \
-   do \
-   { \
-      xCreateNode (((struct LinkageDescriptor *)descr), NULL); \
-      ((struct LinkageDescriptor *)descr)->Tag = DESCR_LINKAGE; \
-      ((struct LinkageDescriptor *)descr)->TransportStreamID = tpid; \
-      ((struct LinkageDescriptor *)descr)->OriginalNetworkID = onid; \
-      ((struct LinkageDescriptor *)descr)->ServiceID = svid; \
-      ((struct LinkageDescriptor *)descr)->LinkageType = ltyp; \
-      ((struct LinkageDescriptor *)descr)->PrivateDataLength = pdl; \
-      xMemAlloc ((pdl)+1, &(((struct LinkageDescriptor *) \
-         descr)->PrivateData)); \
-      memcpy ((((struct LinkageDescriptor *)descr)->PrivateData),(pdp),(pdl));\
-   } while (0)
-
-
-/* ServiceDescriptor */
-
-struct ServiceDescriptor {
-   struct NODE          Node;      /* Node enth�lt ServiceName */
-   unsigned short       Tag;
-   unsigned short       ServiceType;
-   char                *ServiceProvider;
-};
-
-#define CreateServiceDescriptor(descr, styp, prov, name) \
-   do \
-   { \
-      xCreateNode (((struct ServiceDescriptor *)descr), NULL); \
-      ((struct NODE *)descr)->Name = name; \
-      ((struct NODE *)descr)->HashKey = xHashKey (name); \
-      ((struct ServiceDescriptor *)descr)->Tag = DESCR_SERVICE; \
-      ((struct ServiceDescriptor *)descr)->ServiceType = styp; \
-      ((struct ServiceDescriptor *)descr)->ServiceProvider = prov; \
-   } while (0)
-
-
-
-struct TelephoneDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   /* to be defined */
-};
-
-
-/* TimeShiftedServiceDescriptor */
-
-struct TimeShiftedServiceDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   int                  ReferenceServiceID;
-};
-
-#define CreateTimeShiftedServiceDescriptor(descr, svid) \
-   do \
-   { \
-      xCreateNode (((struct TimeShiftedServiceDescriptor *)descr), NULL); \
-      ((struct TimeShiftedServiceDescriptor *)descr)->Tag = DESCR_TIME_SHIFTED_SERVICE; \
-      ((struct TimeShiftedServiceDescriptor *)descr)->ReferenceServiceID = svid; \
-   } while (0)
-
-
-/* TimeShiftedEventDescriptor */
-
-struct TimeShiftedEventDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   int                  ReferenceServiceID;
-   int                  ReferenceEventID;
-};
-
-#define CreateTimeShiftedEventDescriptor(descr, svid, evid) \
-   do \
-   { \
-      xCreateNode (((struct TimeShiftedEventDescriptor *)descr), NULL); \
-      ((struct TimeShiftedEventDescriptor *)descr)->Tag = DESCR_TIME_SHIFTED_EVENT; \
-      ((struct TimeShiftedEventDescriptor *)descr)->ReferenceServiceID = svid; \
-      ((struct TimeShiftedEventDescriptor *)descr)->ReferenceEventID = evid; \
-   } while (0)
-
-
-/* ComponentDescriptor */
-
-struct ComponentDescriptor {
-   struct NODE          Node;   /* Node enth�lt ComponentText */
-   unsigned short       Tag;
-   unsigned short       StreamContent;
-   unsigned short       ComponentType;
-   unsigned short       ComponentTag;
-   char                 LanguageCode[4];
-};
-
-#define CreateComponentDescriptor(descr, scnt, ctyp, tag, lc1, lc2, lc3, txt) \
-   do \
-   { \
-      xCreateNode (((struct ComponentDescriptor *)descr), NULL); \
-      ((struct NODE *)descr)->Name = txt; \
-      ((struct NODE *)descr)->HashKey = xHashKey (txt); \
-      ((struct ComponentDescriptor *)descr)->Tag = DESCR_COMPONENT; \
-      ((struct ComponentDescriptor *)descr)->StreamContent = scnt; \
-      ((struct ComponentDescriptor *)descr)->ComponentType = ctyp; \
-      ((struct ComponentDescriptor *)descr)->ComponentTag = tag; \
-      ((struct ComponentDescriptor *)descr)->LanguageCode[0] = lc1; \
-      ((struct ComponentDescriptor *)descr)->LanguageCode[1] = lc2; \
-      ((struct ComponentDescriptor *)descr)->LanguageCode[2] = lc3; \
-      ((struct ComponentDescriptor *)descr)->LanguageCode[3] = '\0'; \
-   } while (0)
-
-
-/* ContentDescriptor */
-
-struct ContentDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   unsigned short       Amount;        /* ContentIDs */
-   unsigned short      *ContentID;
-};
-
-#define CreateContentDescriptor(descr, amo) \
-   do \
-   { \
-      xCreateNode (((struct ContentDescriptor *)descr), NULL); \
-      ((struct ContentDescriptor *)descr)->Tag = DESCR_CONTENT; \
-      ((struct ContentDescriptor *)descr)->Amount = amo; \
-      xMemAlloc (amo*2+2, &((struct ContentDescriptor *)descr)->ContentID); \
-   } while (0)
-
-#define SetContentID(descr, num, cnib1, cnib2, unib1, unib2) \
-   do \
-   { \
-      ((struct ContentDescriptor *)descr)->ContentID[num] = \
-         ((cnib1&0xF) << 12) | ((cnib2&0xF) << 8) | \
-         ((unib1&0xF) << 4) | (unib2&0xF); \
-   } while (0)
-#define GetContentContentNibble1(descr, num) ((((struct ContentDescriptor *)descr)->ContentID[num]&0xF000) >> 12)
-#define GetContentContentNibble2(descr, num) ((((struct ContentDescriptor *)descr)->ContentID[num]&0x0F00) >> 8)
-#define GetContentUserNibble1(descr, num) ((((struct ContentDescriptor *)descr)->ContentID[num]&0x00F0) >> 4)
-#define GetContentUserNibble2(descr, num) (((struct ContentDescriptor *)descr)->ContentID[num]&0x000F)
-
-
-/* ExtendedEventDescriptor */
-
-struct ExtendedEventDescriptor {
-   struct NODE          Node;    /* Node enth�lt EventText */
-   unsigned short       Tag;
-   unsigned short       DescriptorNumber;
-   unsigned short       LastDescriptorNumber;
-   char                 LanguageCode[4];
-   struct LIST         *Items;
-};
-
-#define CreateExtendedEventDescriptor(descr, dnum, ldnb, lc1, lc2, lc3, text) \
-   do \
-   { \
-      xCreateNode (((struct ExtendedEventDescriptor *)descr), NULL); \
-      ((struct NODE *)descr)->Name = text; \
-      ((struct NODE *)descr)->HashKey = xHashKey (text); \
-      ((struct ExtendedEventDescriptor *)descr)->Tag = DESCR_EXTENDED_EVENT; \
-      ((struct ExtendedEventDescriptor *)descr)->DescriptorNumber = dnum; \
-      ((struct ExtendedEventDescriptor *)descr)->LastDescriptorNumber = ldnb; \
-      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[0] = lc1; \
-      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[1] = lc2; \
-      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[2] = lc3; \
-      ((struct ExtendedEventDescriptor *)descr)->LanguageCode[3] = '\0'; \
-      ((struct ExtendedEventDescriptor *)descr)->Items = xNewList (NULL); \
-   } while (0)
-
-struct ExtendedEventItem {
-   struct NODE          Node;    /* Node enth�lt ItemDescription Text */
-   char                *Text;
-};
-
-#define CreateExtendedEventItem(itm, dtxt, text) \
-   do \
-   { \
-      xCreateNode (itm, NULL); \
-      ((struct NODE *)itm)->Name = dtxt; \
-      ((struct NODE *)itm)->HashKey = xHashKey (dtxt); \
-      itm->Text = text; \
-   } while (0)
-
-#define AddExtendedEventItem(desc, dtxt, text) \
-   do \
-   { \
-      struct ExtendedEventItem *item; \
-      \
-      CreateExtendedEventItem(item, dtxt, text); \
-      xAddTail (((struct ExtendedEventDescriptor *)desc)->Items, item); \
-   } while (0)
-
-
-/* ParentalRatingDescriptor */
-
-struct ParentalRatingDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   struct LIST         *Ratings;
-};
-
-#define CreateParentalRatingDescriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct ParentalRatingDescriptor *)descr), NULL); \
-      ((struct ParentalRatingDescriptor *)descr)->Tag = DESCR_PARENTAL_RATING; \
-      ((struct ParentalRatingDescriptor *)descr)->Ratings = xNewList (NULL); \
-   } while (0)
-
-struct ParentalRating {
-   struct NODE          Node;    /* Node enth�lt ItemDescription Text */
-   char                 LanguageCode[4];
-   char                 Rating;
-};
-
-#define CreateParentalRating(rat, lc1, lc2, lc3, val) \
-   do \
-   { \
-      xCreateNode (rat, NULL); \
-      rat->LanguageCode[0] = lc1; \
-      rat->LanguageCode[1] = lc2; \
-      rat->LanguageCode[2] = lc3; \
-      rat->LanguageCode[3] = '\0'; \
-      rat->Rating = val; \
-   } while (0)
-
-#define AddParentalRating(desc, lc1, lc2, lc3, val) \
-   do \
-   { \
-      struct ParentalRating *item; \
-      \
-      CreateParentalRating(item, lc1, lc2, lc3, val); \
-      xAddTail (((struct ParentalRatingDescriptor *)desc)->Ratings, item); \
-   } while (0)
-
-/* ShortEventDescriptor */
-
-struct ShortEventDescriptor {
-   struct NODE          Node;    /* Node enth�lt EventName */
-   unsigned short       Tag;
-   char                 LanguageCode[4];
-   char                *Text;
-};
-
-#define CreateShortEventDescriptor(descr, name, lc1, lc2, lc3, text) \
-   do \
-   { \
-      xCreateNode (((struct ShortEventDescriptor *)descr), NULL); \
-      ((struct NODE *)descr)->Name = name; \
-      ((struct NODE *)descr)->HashKey = xHashKey (name); \
-      ((struct ShortEventDescriptor *)descr)->Tag = DESCR_SHORT_EVENT; \
-      ((struct ShortEventDescriptor *)descr)->LanguageCode[0] = lc1; \
-      ((struct ShortEventDescriptor *)descr)->LanguageCode[1] = lc2; \
-      ((struct ShortEventDescriptor *)descr)->LanguageCode[2] = lc3; \
-      ((struct ShortEventDescriptor *)descr)->LanguageCode[3] = '\0'; \
-      ((struct ShortEventDescriptor *)descr)->Text = text; \
-   } while (0)
-
-
-/* TeletextDescriptor */
-
-struct TeletextDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   struct LIST         *Items;
-};
-
-#define CreateTeletextDescriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct TeletextDescriptor *)descr), NULL); \
-      ((struct TeletextDescriptor *)descr)->Tag = DESCR_TELETEXT; \
-      ((struct TeletextDescriptor *)descr)->Items = xNewList (NULL); \
-   } while (0)
-
-#define TELETEXT_TYPE_INITIAL_PAGE         0x0001
-#define TELETEXT_TYPE_SUBTITLE_PAGE        0x0002
-#define TELETEXT_TYPE_ADDITIONAL_INFO      0x0003
-#define TELETEXT_TYPE_PROGRAM_SCHEDULE     0x0004
-#define TELETEXT_TYPE_HEARING_IMPAIRED     0x0005
-
-struct TeletextItem {
-   struct NODE          Node;
-   char                 LanguageCode[4];
-   unsigned short       Type;
-   unsigned short       MagazineNumber;
-   unsigned short       PageNumber;
-};
-
-#define CreateTeletextItem(itm, tp, mg, pg, lc1, lc2, lc3) \
-   do \
-   { \
-      xCreateNode (itm, NULL); \
-      ((struct TeletextItem *)itm)->Type = (tp); \
-      ((struct TeletextItem *)itm)->MagazineNumber = (mg); \
-      ((struct TeletextItem *)itm)->PageNumber = (mg); \
-      ((struct TeletextItem *)itm)->LanguageCode[0] = (lc1); \
-      ((struct TeletextItem *)itm)->LanguageCode[1] = (lc2); \
-      ((struct TeletextItem *)itm)->LanguageCode[2] = (lc3); \
-      ((struct TeletextItem *)itm)->LanguageCode[3] = '\0'; \
-   } while (0)
-
-#define AddTeletextItem(desc, tp, mg, pg, lc1, lc2, lc3) \
-   do \
-   { \
-      struct TeletextItem *item; \
-      \
-      CreateTeletextItem(item, tp, mg, pg, lc1, lc2, lc3); \
-      xAddTail (((struct TeletextDescriptor *)desc)->Items, item); \
-   } while (0)
-
-
-/* SubtitlingDescriptor */
-
-struct SubtitlingDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   struct LIST         *Items;
-};
-
-#define CreateSubtitlingDescriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct SubtitlingDescriptor *)descr), NULL); \
-      ((struct SubtitlingDescriptor *)descr)->Tag = DESCR_SUBTITLING; \
-      ((struct SubtitlingDescriptor *)descr)->Items = xNewList (NULL); \
-   } while (0)
-
-struct SubtitlingItem {
-   struct NODE          Node;
-   char                 LanguageCode[4];
-   unsigned char        Type;
-   unsigned short       CompositionPageId;
-   unsigned short       AncillaryPageId;
-};
-
-#define CreateSubtitlingItem(itm, tp, cp, ap, lc1, lc2, lc3) \
-   do \
-   { \
-      xCreateNode (itm, NULL); \
-      ((struct SubtitlingItem *)itm)->Type = (tp); \
-      ((struct SubtitlingItem *)itm)->CompositionPageId = (cp); \
-      ((struct SubtitlingItem *)itm)->AncillaryPageId = (ap); \
-      ((struct SubtitlingItem *)itm)->LanguageCode[0] = (lc1); \
-      ((struct SubtitlingItem *)itm)->LanguageCode[1] = (lc2); \
-      ((struct SubtitlingItem *)itm)->LanguageCode[2] = (lc3); \
-      ((struct SubtitlingItem *)itm)->LanguageCode[3] = '\0'; \
-   } while (0)
-
-#define AddSubtitlingItem(desc, tp, cp, ap, lc1, lc2, lc3) \
-   do \
-   { \
-      struct SubtitlingItem *item; \
-      \
-      CreateSubtitlingItem(item, tp, cp, ap, lc1, lc2, lc3); \
-      xAddTail (((struct SubtitlingDescriptor *)desc)->Items, item); \
-   } while (0)
-
-/* SatelliteDeliverySystemDescriptor */
-
-struct SatelliteDeliverySystemDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   long                 Frequency;
-   short                OrbitalPosition;
-   short                Modulation;
-   char                 Polarization;
-   long                 SymbolRate;
-   char                 FEC;
-};
-
-#define CreateSatelliteDeliverySystemDescriptor(descr, freq, orb, mod, polar, sr, fec) \
-   do \
-   { \
-      xCreateNode (((struct SatelliteDeliverySystemDescriptor *)descr), NULL); \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->Tag = DESCR_SAT_DEL_SYS; \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->Frequency = freq; \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->OrbitalPosition = orb; \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->Modulation = mod; \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->Polarization = polar; \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
-      ((struct SatelliteDeliverySystemDescriptor *)descr)->FEC = fec; \
-   } while (0)
-
-/* CableDeliverySystemDescriptor */
-
-struct CableDeliverySystemDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   long                 Frequency;
-   long                 SymbolRate;
-   char                 FECouter;
-   char                 FECinner;
-   char                 Modulation;
-};
-
-#define CreateCableDeliverySystemDescriptor(descr, freq, sr, fec_o, fec_i, mod) \
-   do \
-   { \
-      xCreateNode (((struct CableDeliverySystemDescriptor *)descr), NULL); \
-      ((struct CableDeliverySystemDescriptor *)descr)->Tag = DESCR_CABLE_DEL_SYS; \
-      ((struct CableDeliverySystemDescriptor *)descr)->Frequency = freq; \
-      ((struct CableDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
-      ((struct CableDeliverySystemDescriptor *)descr)->FECouter = fec_o; \
-      ((struct CableDeliverySystemDescriptor *)descr)->FECinner = fec_i; \
-      ((struct CableDeliverySystemDescriptor *)descr)->Modulation = mod; \
-   } while (0)
-
-/* TerrestrialDeliverySystemDescriptor */
-
-struct TerrestrialDeliverySystemDescriptor {
-   struct NODE          Node;
-   unsigned short       Tag;
-   long                 Frequency;
-   char                 Bandwidth;
-   char                 Constellation;
-   char                 Hierarchy;
-   char                 CodeRateHP;
-   char                 CodeRateLP;
-   char                 GuardInterval;
-   char                 TransmissionMode;
-   char                 OtherFrequencyFlag;
-};
-
-#define CreateTerrestrialDeliverySystemDescriptor(descr, freq, bw, cst, hr, crh, crl, gi, tm, ofm) \
-   do \
-   { \
-      xCreateNode (((struct CableDeliverySystemDescriptor *)descr), NULL); \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Tag = DESCR_TERR_DEL_SYS; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Frequency = freq; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Bandwidth = bw; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Constellation = cst; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Hierarchy = hr; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->CodeRateHP = crh; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->CodeRateLP = crl; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->GuardInterval = gi; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->TransmissionMode = tm; \
-      ((struct TerrestrialDeliverySystemDescriptor *)descr)->OtherFrequencyFlag = ofm; \
-   } while (0)
-
-/* ServiceListDescriptor */
-
-struct ServiceListDescriptor {
-   struct NODE          Node;     
-   unsigned short       Tag;
-   struct LIST         *ServiceList;
-};
-
-#define CreateServiceListDescriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct ServiceListDescriptor *)descr), NULL); \
-      ((struct ServiceListDescriptor *)descr)->Tag = DESCR_SERVICE_LIST; \
-      ((struct ServiceListDescriptor *)descr)->ServiceList = xNewList(NULL); \
-   } while (0)
-
-struct ServiceListEntry {
-   struct NODE          Node;     
-   int                  ServiceID;
-   unsigned short       ServiceType;
-};
-
-#define AddServiceListEntry(descr, id, typ) \
-   do \
-   { \
-      struct ServiceListEntry *newent; \
-      \
-      xCreateNode (newent, NULL); \
-      newent->ServiceID = id; \
-      newent->ServiceType = typ; \
-      xAddTail (((struct ServiceListDescriptor *)descr)->ServiceList, newent); \
-   } while (0)
-
-/* LocalTimeOffsetDescriptor */
-
-struct LocalTimeOffsetDescriptor {
-   struct NODE          Node;     
-   unsigned short       Tag;
-   struct LIST         *LocalTimeOffsets;
-};
-
-#define CreateLocalTimeOffsetDescriptor(descr) \
-   do \
-   { \
-      xCreateNode (((struct LocalTimeOffsetDescriptor *)descr), NULL); \
-      ((struct LocalTimeOffsetDescriptor *)descr)->Tag = DESCR_LOCAL_TIME_OFF; \
-      ((struct LocalTimeOffsetDescriptor *)descr)->LocalTimeOffsets = xNewList(NULL); \
-   } while (0)
-
-struct LocalTimeOffsetEntry {
-   struct NODE          Node;     
-   char                 CountryCode[4];
-   char                 RegionID;
-   time_t               CurrentOffset;
-   time_t               ChangeTime;
-   time_t               NextOffset;
-};
-
-#define CreateLocalTimeOffsetEntry(newent, code1, code2, code3, reg, co, ct, no) \
-   do \
-   { \
-      xCreateNode (newent, NULL); \
-      newent->CountryCode[0] = code1; \
-      newent->CountryCode[1] = code2; \
-      newent->CountryCode[2] = code3; \
-      newent->CountryCode[3] = '\0'; \
-      newent->RegionID = reg; \
-      newent->CurrentOffset = co; \
-      newent->ChangeTime = ct; \
-      newent->NextOffset = no; \
-   } while (0)
-
-#define AddLocalTimeOffsetEntry(descr, code1, code2, code3, reg, co, ct, no) \
-   do \
-   { \
-      struct LocalTimeOffsetEntry *newent; \
-      \
-      xCreateNode (newent, NULL); \
-      newent->CountryCode[0] = code1; \
-      newent->CountryCode[1] = code2; \
-      newent->CountryCode[2] = code3; \
-      newent->CountryCode[3] = '\0'; \
-      newent->RegionID = reg; \
-      newent->CurrentOffset = co; \
-      newent->ChangeTime = ct; \
-      newent->NextOffset = no; \
-      xAddTail (((struct LocalTimeOffsetDescriptor *)descr)->LocalTimeOffsets, newent); \
-   } while (0)
-
-#define timezonecmp(ptoe,cod,reg) \
-   (strncmp(ptoe->CountryCode, cod, 3) || (ptoe->RegionID != reg))
-
-
-
-/* Prototypes */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* si_parser.c */
-
-struct LIST *siParsePAT (u_char *);
-struct LIST *siParseCAT (u_char *);
-struct Pid *siParsePMT (u_char *);
-struct LIST *siParseSDT (u_char *);
-struct LIST *siParseNIT (u_char *);
-struct LIST *siParseEIT (u_char *);
-time_t siParseTDT (u_char *);
-struct Tot *siParseTOT (u_char *);
-void siParseDescriptors (struct LIST *, u_char *, int, u_char);
-void siParseDescriptor (struct LIST *, u_char *);
-char *siGetDescriptorText (u_char *, int);
-char *siGetDescriptorName (u_char *, int);
-
-/* si_debug_services.c */
-
-void siDebugServices (struct LIST *);
-void siDebugService (struct Service *);
-void siDebugEvents (char *, struct LIST *);
-void siDebugPrograms (char *, struct LIST *);
-void siDebugProgram (struct Program *);
-void siDebugPids (char *, struct LIST *);
-void siDebugDescriptors (char *, struct LIST *);
-void siDebugEitServices (struct LIST *);
-void siDebugEitEvents (char *, struct LIST *);
-void siDumpDescriptor (void *);
-void siDumpSection (void *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libdtv/libsi/si_debug_services.c b/libdtv/libsi/si_debug_services.c
deleted file mode 100644
index 1ff740007..000000000
--- a/libdtv/libsi/si_debug_services.c
+++ /dev/null
@@ -1,674 +0,0 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// si_debug_services.c: debugging functions for libsi     ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.5 $
-// $Date: 2003/02/04 18:45:35 $
-// $Author: hakenes $
-//
-//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
-//               GNU GPL with contribution of Oleg Assovski,
-//               www.satmania.com
-//
-// libsi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libsi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libsi; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "../liblx/liblx.h"
-#include "libsi.h"
-#include "si_tables.h"
-#include "si_debug_services.h"
-
-
-void siDebugServices (struct LIST *Services)
-{
-   struct Service *Service;
-
-   if (!Services) return;
-
-   xForeach (Services, Service)
-   {
-      printf ("Service\n=======\n");
-      printf ("   ServiceID: %d\n", Service->ServiceID);
-      printf ("   TransportStreamID: %d\n", Service->TransportStreamID);
-      printf ("   OriginalNetworkID: %d\n", Service->OriginalNetworkID);
-      printf ("   SdtVersion: %d\n", Service->SdtVersion);
-      printf ("   Status: ");
-      if (GetScheduleFlag (Service->Status))
-         printf ("SCHEDULE_INFO ");
-      if (GetPresentFollowing(Service->Status))
-         printf ("PRESENT_FOLLOWING ");
-      switch (GetRunningStatus (Service->Status))
-      {
-         case RUNNING_STATUS_NOT_RUNNING:
-            printf ("RUNNING_STATUS_NOT_RUNNING\n");
-         break;
-
-         case RUNNING_STATUS_AWAITING:
-            printf ("RUNNING_STATUS_AWAITING\n");
-         break;
-
-         case RUNNING_STATUS_PAUSING:
-            printf ("RUNNING_STATUS_PAUSING\n");
-         break;
-
-         case RUNNING_STATUS_RUNNING:
-            printf ("RUNNING_STATUS_RUNNING\n");
-         break;
-      }
-      siDebugDescriptors ("   ", Service->Descriptors);
-      siDebugEvents ("   ", Service->Events);
-   }
-   return;
-}
-
-void siDebugService (struct Service *Service)
-{
-   if (!Service) return;
-
-   printf ("Service\r\n=======\r\n");
-   printf ("   ServiceID: %d\r\n", Service->ServiceID);
-   printf ("   TransportStreamID: %d\r\n", Service->TransportStreamID);
-   printf ("   OriginalNetworkID: %d\r\n", Service->OriginalNetworkID);
-   printf ("   SdtVersion: %d\r\n", Service->SdtVersion);
-   printf ("   Status: ");
-   if (GetScheduleFlag (Service->Status))
-      printf ("SCHEDULE_INFO ");
-   if (GetPresentFollowing(Service->Status))
-      printf ("PRESENT_FOLLOWING ");
-   switch (GetRunningStatus (Service->Status))
-   {
-      case RUNNING_STATUS_NOT_RUNNING:
-         printf ("RUNNING_STATUS_NOT_RUNNING\r\n");
-      break;
-
-      case RUNNING_STATUS_AWAITING:
-         printf ("RUNNING_STATUS_AWAITING\r\n");
-      break;
-
-      case RUNNING_STATUS_PAUSING:
-         printf ("RUNNING_STATUS_PAUSING\r\n");
-      break;
-
-      case RUNNING_STATUS_RUNNING:
-         printf ("RUNNING_STATUS_RUNNING\r\n");
-      break;
-   }
-   siDebugDescriptors ("\r   ", Service->Descriptors);
-   siDebugEvents ("\r   ", Service->Events);
-
-   return;
-}
-
-void siDebugEvents (char *Prepend, struct LIST *EventList)
-{
-   struct Event *Event;
-   char          NewPrepend[32];
-
-   if (!EventList) return;
-
-   xForeach (EventList, Event)
-   {
-      printf ("%sEvent\n%s=====\n", Prepend, Prepend);
-      printf ("%s   EventID: %d\n", Prepend, Event->EventID);
-      printf ("%s   ServiceID: %d\n", Prepend, Event->ServiceID);
-      printf ("%s   TransportStreamID: %d\n", Prepend, Event->TransportStreamID);
-      printf ("%s   OriginalNetworkID: %d\n", Prepend, Event->OriginalNetworkID);
-      printf ("%s   EitVersion: %d\n", Prepend, Event->EitVersion);
-      printf ("%s   StartTime: %s", Prepend, ctime (&Event->StartTime));
-      printf ("%s   Duration: %d Minuten\n", Prepend, Event->Duration/60);
-      printf ("%s   Status: ");
-      switch (GetRunningStatus (Event->Status))
-      {
-         case RUNNING_STATUS_NOT_RUNNING:
-            printf ("RUNNING_STATUS_NOT_RUNNING\n");
-         break;
-
-         case RUNNING_STATUS_AWAITING:
-            printf ("RUNNING_STATUS_AWAITING\n");
-         break;
-
-         case RUNNING_STATUS_PAUSING:
-            printf ("RUNNING_STATUS_PAUSING\n");
-         break;
-
-         case RUNNING_STATUS_RUNNING:
-            printf ("RUNNING_STATUS_RUNNING\n");
-         break;
-      }
-      sprintf (NewPrepend, "%s   ", Prepend);
-      siDebugDescriptors (NewPrepend, Event->Descriptors);
-   }
-   return;
-}
-
-
-void siDebugPrograms (char *Prepend, struct LIST *ProgramList)
-{
-   struct Program *Program;
-   char            NewPrepend[32];
-
-   if (!ProgramList) return;
-
-   xForeach (ProgramList, Program)
-   {
-      printf ("%sProgram\n%s=======\n", Prepend, Prepend);
-      printf ("%s   ProgramID: %d\n", Prepend, Program->ProgramID);
-      printf ("%s   TransportStreamID: %d\n", Prepend, Program->TransportStreamID);
-      printf ("%s   NetworkPID: %d\n", Prepend, Program->NetworkPID);
-      printf ("%s   PatVersion: %d\n", Prepend, Program->PatVersion);
-
-      sprintf (NewPrepend, "%s   ", Prepend);
-      siDebugPids (NewPrepend, Program->Pids);
-   }
-   return;
-}
-
-void siDebugProgram (struct Program *Program)
-{
-   if (!Program) return;
-
-   printf ("Program\r\n=======\r\n");
-   printf ("   ProgramID: %d\r\n", Program->ProgramID);
-   printf ("   TransportStreamID: %d\r\n", Program->TransportStreamID);
-   printf ("   NetworkPID: %d\r\n", Program->NetworkPID);
-   printf ("   PatVersion: %d\r\n", Program->PatVersion);
-
-   siDebugPids ("\r   ", Program->Pids);
-
-   return;
-}
-
-void siDebugPids (char *Prepend, struct LIST *PidList)
-{
-   struct Pid         *Pid;
-   struct PidInfo     *PidInfo;
-   char                NewPrepend[32];
-   int                 index;
-
-   if (!PidList) return;
-
-   xForeach (PidList, Pid)
-   {
-      printf ("%sPid\n%s===\n", Prepend, Prepend);
-      printf ("%s   ProgramID: %d\n", Prepend, Pid->ProgramID);
-      printf ("%s   PcrPid: %d\n", Prepend, Pid->PcrPID);
-      printf ("%s   PmtVersion: %d\n", Prepend, Pid->PmtVersion);
-      sprintf (NewPrepend, "%s      ", Prepend);
-      siDebugDescriptors (NewPrepend, Pid->Descriptors);
-
-      xForeach (Pid->InfoList, PidInfo)
-      {
-         printf ("%s   PidInfo\n%s   =======\n", Prepend, Prepend);
-         index = PidInfo->StreamType;
-         if (index > 0x0F && index <= 0x7F) index = 0x0E;
-         if (index >= 0x80) index = 0x0F;
-         printf ("%s      StreamType: %s\n", Prepend, StreamTypes[index]);
-         printf ("%s      ElementaryPid: %d\n", Prepend, PidInfo->ElementaryPid);
-
-         sprintf (NewPrepend, "%s         ", Prepend);
-         siDebugDescriptors (NewPrepend, PidInfo->Descriptors);
-      }
-   }
-   return;
-}
-
-
-void siDebugDescriptors (char *Prepend, struct LIST *Descriptors)
-{
-   struct Descriptor *Descriptor;
-   int i;
-
-   xForeach (Descriptors, Descriptor)
-   {
-      switch (DescriptorTag (Descriptor))
-      {
-         case DESCR_ANCILLARY_DATA:
-            printf ("%sDescriptor: Ancillary Data\n", Prepend);
-            printf ("%s   Identifier: ", Prepend);
-            if (((struct AncillaryDataDescriptor *)Descriptor)->
-                   Identifier & ANCILLARY_DATA_DVD_VIDEO)
-               printf ("DVD-Video Ancillary Data ");
-            if (((struct AncillaryDataDescriptor *)Descriptor)->
-                   Identifier & ANCILLARY_DATA_EXTENDED)
-               printf ("Extended Ancillary Data ");
-            if (((struct AncillaryDataDescriptor *)Descriptor)->
-                   Identifier & ANCILLARY_DATA_SWITCHING)
-               printf ("Announcement Switching Data ");
-            if (((struct AncillaryDataDescriptor *)Descriptor)->
-                   Identifier & ANCILLARY_DATA_DAB)
-               printf ("DAB Ancillary Data ");
-            if (((struct AncillaryDataDescriptor *)Descriptor)->
-                   Identifier & ANCILLARY_DATA_SCALE_FACTOR)
-               printf ("Scale Factor Error Check (ScF-CRC) ");
-            printf ("\n");
-         break;
-
-         case DESCR_NW_NAME:
-            printf ("%sDescriptor: Network Name\n", Prepend);
-            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
-         break;
-
-         case DESCR_BOUQUET_NAME:
-            printf ("%sDescriptor: Bouquet Name\n", Prepend);
-            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
-         break;
-
-         case DESCR_COMPONENT:
-            printf ("%sDescriptor: Component\n", Prepend);
-            printf ("%s   Text: %s\n", Prepend, xName (Descriptor));
-            printf ("%s   Content/Type: ", Prepend);
-            for (i = 0; i < COMPONENT_TYPE_NUMBER; i++)
-               if ((((struct ComponentDescriptor *)Descriptor)->
-                        StreamContent == ComponentTypes[i].Content) &&
-                   (((struct ComponentDescriptor *)Descriptor)->
-                        ComponentType == ComponentTypes[i].Type))
-               { printf ("%s\n", ComponentTypes[i].Description); break; }
-            if (i == COMPONENT_TYPE_NUMBER) { printf ("unbekannt\n"); }
-            printf ("%s   ComponentTag: 0x%02x\n", Prepend,
-               ((struct ComponentDescriptor *)Descriptor)->ComponentTag);
-            printf ("%s   LanguageCode: %s\n", Prepend,
-               ((struct ComponentDescriptor *)Descriptor)->LanguageCode);
-         break;
-
-         case DESCR_SERVICE:
-            printf ("%sDescriptor: Service\n", Prepend);
-            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
-            printf ("%s   ServiceType: ", Prepend);
-            for (i = 0; i < SERVICE_TYPE_NUMBER; i++)
-               if ((((struct ServiceDescriptor *)Descriptor)->
-                        ServiceType == ServiceTypes[i].Type))
-               { printf ("%s\n", ServiceTypes[i].Description); break; }
-            if (i == SERVICE_TYPE_NUMBER) { printf ("unbekannt\n"); }
-            printf ("%s   ServiceProvider: %s\n", Prepend,
-               ((struct ServiceDescriptor *)Descriptor)->ServiceProvider);
-         break;
-
-         case DESCR_COUNTRY_AVAIL:
-            printf ("%sDescriptor: Country Availability\n", Prepend);
-            printf ("%s   Type: %s\n", Prepend, (((struct CountryAvailabilityDescriptor *)Descriptor)->
-                       AvailibilityFlag == COUNTRIES_ARE_AVAILABLE) ? "countries are available" :
-                       "countries are unavailable");
-            {
-               char *cptr = ((struct CountryAvailabilityDescriptor *)Descriptor)->CountryCodes; int j;
-               for (j = 0; j < ((struct CountryAvailabilityDescriptor *)Descriptor)->Amount; j++)
-                { printf ("%s   Country: %s\n", Prepend, cptr); cptr += 4; }
-            }
-         break;
-
-         case DESCR_SHORT_EVENT:
-            printf ("%sDescriptor: Short Event\n", Prepend);
-            printf ("%s   Name: %s\n", Prepend, xName (Descriptor));
-            printf ("%s   LanguageCode: %s\n", Prepend,
-               ((struct ShortEventDescriptor *)Descriptor)->LanguageCode);
-            printf ("%s   Text: %s\n", Prepend,
-               ((struct ShortEventDescriptor *)Descriptor)->Text);
-         break;
-
-         case DESCR_EXTENDED_EVENT:
-         {
-            struct ExtendedEventItem *Item;
-
-            printf ("%sDescriptor: Extended Event\n", Prepend);
-            printf ("%s   Text: %s\n", Prepend, xName (Descriptor));
-            printf ("%s   DescriptorNumber: %d\n", Prepend,
-               ((struct ExtendedEventDescriptor *)Descriptor)->DescriptorNumber);
-            printf ("%s   LastDescriptorNumber: %d\n", Prepend,
-               ((struct ExtendedEventDescriptor *)Descriptor)->LastDescriptorNumber);
-            printf ("%s   LanguageCode: %s\n", Prepend,
-               ((struct ExtendedEventDescriptor *)Descriptor)->LanguageCode);
-            xForeach (((struct ExtendedEventDescriptor *)Descriptor)->Items, Item)
-            {
-               printf ("%s   Item:\n", Prepend);
-               printf ("%s      Description: %s\n", Prepend, xName(Item));
-               printf ("%s      Text: %s\n", Prepend, Item->Text);
-            }
-         }
-         break;
-
-         case DESCR_CA_IDENT:
-            printf ("%sDescriptor: Conditional Access Identity\n", Prepend);
-            {
-               int j,k;
-               for (j = 0; j < ((struct CaIdentifierDescriptor *)Descriptor)->Amount; j++)
-               {
-                  printf ("%s   SystemID: 0x%04x", Prepend, GetCaIdentifierID (Descriptor, j));
-                  k = GetCaIdentifierID (Descriptor, j) >> 8;
-                  if (k < 0 || k > MAX_CA_IDENT) printf (" (unknown)\n");
-                  else printf (" (%s)\n", CaIdents[k]);
-               }
-            }
-         break;
-
-         case DESCR_CA:
-         {
-            int j,k;
-
-            printf ("%sDescriptor: Conditional Access\n", Prepend);
-            printf ("%s   CA type: 0x%04x", Prepend, (((struct CaDescriptor *)Descriptor)->CA_type));
-            k = (((struct CaDescriptor *)Descriptor)->CA_type) >> 8;
-            if (k < 0 || k > MAX_CA_IDENT) printf (" (unknown)\n");
-            else printf (" (%s)\n", CaIdents[k]);
-            printf ("%s   CA PID: %d\n", Prepend, (((struct CaDescriptor *)Descriptor)->CA_PID));
-            printf ("%s   ProviderID: 0x%04X\n", Prepend, (((struct CaDescriptor *)Descriptor)->ProviderID));
-            if (((struct CaDescriptor *)Descriptor)->DataLength > 0)
-            {
-               printf ("%s   CA data:", Prepend);
-               for (j = 0; j < ((struct CaDescriptor *)Descriptor)->DataLength; j++)
-                  printf (" 0x%02x", GetCaData (Descriptor, j));
-               printf ("\n");
-            }
-         }
-         break;
-
-         case DESCR_CONTENT:
-            printf ("%sDescriptor: Content\n", Prepend);
-            {
-               int j;
-               for (j = 0; j < ((struct ContentDescriptor *)Descriptor)->Amount; j++)
-               {
-                  printf ("%s   Content: ", Prepend);
-                  for (i = 0; i < CONTENT_TYPE_NUMBER; i++)
-                     if ((GetContentContentNibble1(Descriptor, j) == ContentTypes[i].Nibble1) &&
-                         (GetContentContentNibble2(Descriptor, j) == ContentTypes[i].Nibble2))
-                     { printf ("%s\n", ContentTypes[i].Description); break; }
-                  if (i == CONTENT_TYPE_NUMBER) { printf ("unbekannt\n"); }
-                  printf ("%s   User-Nibble 1: 0x%1x\n", Prepend, GetContentUserNibble1(Descriptor, j));
-                  printf ("%s   User-Nibble 2: 0x%1x\n", Prepend, GetContentUserNibble2(Descriptor, j));
-               }
-            }
-         break;
-
-         case DESCR_PARENTAL_RATING:
-         {
-            struct ParentalRating *Rating;
-
-            printf ("%sDescriptor: Parental Rating\n", Prepend);
-            xForeach (((struct ParentalRatingDescriptor *)Descriptor)->Ratings, Rating)
-            {
-               printf ("%s   Rating:\n");
-               printf ("%s      LanguageCode: %s\n", Rating->LanguageCode);
-               printf ("%s      Rating: ");
-               if (Rating->Rating == 0) printf ("(undefined)\n");
-               else { if (Rating->Rating <= 0x10) printf ("minimum age is %d\n", Rating->Rating + 3);
-                      else printf ("(rating is provider defined)\n"); }
-            }
-         }
-         break;
-
-         case DESCR_NVOD_REF:
-         {
-            struct NvodReferenceItem *Item;
-
-            printf ("%sDescriptor: NVOD Reference\n", Prepend);
-            xForeach (((struct NvodReferenceDescriptor *)Descriptor)->Items, Item)
-            {
-               printf ("%s   Item:\n", Prepend);
-               printf ("%s      ServiceID: %d\n", Prepend, Item->ServiceID);
-               printf ("%s      TransportStreamID: %d\n", Prepend, Item->TransportStreamID);
-               printf ("%s      OriginalNetworkID: %d\n", Prepend, Item->OriginalNetworkID);
-            }
-         }
-         break;
-
-         case DESCR_TIME_SHIFTED_SERVICE:
-            printf ("%sDescriptor: Time Shifted Service\n", Prepend);
-            printf ("%s   ReferenceServiceID: %d\n", Prepend,
-                                      ((struct TimeShiftedServiceDescriptor *)
-                                         Descriptor)->ReferenceServiceID);
-         break;
-
-         case DESCR_TIME_SHIFTED_EVENT:
-            printf ("%sDescriptor: Time Shifted Event\n", Prepend);
-            printf ("%s   ReferenceServiceID: %d\n", Prepend,
-                                      ((struct TimeShiftedEventDescriptor *)
-                                         Descriptor)->ReferenceServiceID);
-            printf ("%s   ReferenceEventID: %d\n", Prepend,
-                                      ((struct TimeShiftedEventDescriptor *)
-                                         Descriptor)->ReferenceEventID);
-         break;
-
-         case DESCR_ISO_639_LANGUAGE:
-            printf ("%sDescriptor: ISO 639 Language\n", Prepend);
-            printf ("%s   LanguageCode: %s\n", Prepend,
-               ((struct Iso639LanguageDescriptor *)Descriptor)->LanguageCode);
-         break;
-
-         case DESCR_STREAM_ID:
-            printf ("%sDescriptor: Stream Identifier\n", Prepend);
-            printf ("%s   ComponentTag: %d\n", Prepend,
-               ((struct StreamIdentifierDescriptor *)Descriptor)->ComponentTag);
-         break;
-
-         case DESCR_LINKAGE:
-            printf ("%sDescriptor: Linkage\n", Prepend);
-            printf ("%s   TransportStreamID: %d\n", Prepend,
-               ((struct LinkageDescriptor *)Descriptor)->TransportStreamID);
-            printf ("%s   OriginalNetworkID: %d\n", Prepend,
-               ((struct LinkageDescriptor *)Descriptor)->OriginalNetworkID);
-            printf ("%s   ServiceID: %d\n", Prepend,
-               ((struct LinkageDescriptor *)Descriptor)->ServiceID);
-            printf ("%s   LinkageType: %d\n", Prepend,
-               ((struct LinkageDescriptor *)Descriptor)->LinkageType);
-            if (((struct LinkageDescriptor *)Descriptor)->PrivateDataLength)
-            {
-               int j;
-               printf ("%s   PrivateData: ", Prepend);
-               for (j = 0; j < ((struct LinkageDescriptor *)
-                        Descriptor)->PrivateDataLength; j++)
-                  printf ("0x%02X ", ((struct LinkageDescriptor *)
-                        Descriptor)->PrivateData[j]);
-               printf ("\n");
-            }
-         break;
-
-         case DESCR_TELETEXT:
-         {
-            struct TeletextItem *Item;
-
-            printf ("%sDescriptor: Teletext\n", Prepend);
-            xForeach (((struct TeletextDescriptor *)Descriptor)->Items, Item)
-            {
-               printf ("%s   Item:\n");
-               printf ("%s      LanguageCode: %s\n", Prepend, Item->LanguageCode);
-               printf ("%s      Type: ", Prepend);
-               switch (Item->Type)
-               {
-                  case 0x01: printf ("initial Teletext page\n"); break;
-                  case 0x02: printf ("Teletext subtitle page\n"); break;
-                  case 0x03: printf ("additional information page\n"); break;
-                  case 0x04: printf ("programme schedule page\n"); break;
-                  case 0x05: printf ("Teletext subtitle page ");
-                             printf ("for hearing impaired people\n"); break;
-                  default: printf ("reserved for future use\n"); break;
-               }
-               printf ("%s      MagazineNumber: %x\n", Prepend, Item->MagazineNumber);
-               printf ("%s      PageNumber: %x\n", Prepend, Item->PageNumber);
-            }
-         }
-         break;
-
-         case DESCR_SUBTITLING:
-         {
-            struct SubtitlingItem *Item;
-
-            printf ("%sDescriptor: Subtitling\n", Prepend);
-            xForeach (((struct SubtitlingDescriptor *)Descriptor)->Items, Item)
-            {
-               printf ("%s   Item:\n");
-               printf ("%s      LanguageCode: %s\n", Prepend, Item->LanguageCode);
-               printf ("%s      Type: ", Prepend);
-               for (i = 0; i < COMPONENT_TYPE_NUMBER; i++)
-                  if ((0x03 == ComponentTypes[i].Content) &&
-                      (Item->Type == ComponentTypes[i].Type))
-                  { printf ("%s\n", ComponentTypes[i].Description); break; }
-               printf ("%s      CompositionPageId: %x\n", Prepend, Item->CompositionPageId);
-               printf ("%s      AncillaryPageId: %x\n", Prepend, Item->AncillaryPageId);
-            }
-         }
-         break;
-
-         case DESCR_SAT_DEL_SYS:
-         {
-            struct SatelliteDeliverySystemDescriptor *sds =
-                (struct SatelliteDeliverySystemDescriptor *)Descriptor;
-
-            printf ("%sDescriptor: Satellite Delivery System\n", Prepend);
-            printf ("%s   Frequency: %ld\n", Prepend, sds->Frequency);
-            printf ("%s   OrbitalPosition: %d\n", Prepend, sds->OrbitalPosition);
-            printf ("%s   Polarization: %c\n", Prepend, sds->Polarization);
-            printf ("%s   Modulation: %c\n", Prepend, sds->Modulation);
-            printf ("%s   SymbolRate: %ld\n", Prepend, sds->SymbolRate);
-            printf ("%s   FEC: %c\n", Prepend, sds->FEC);
-         }
-         break;
-
-         case DESCR_CABLE_DEL_SYS:
-         {
-            struct CableDeliverySystemDescriptor *cds =
-                (struct CableDeliverySystemDescriptor *)Descriptor;
-
-            printf ("%sDescriptor: Cable Delivery System\n", Prepend);
-            printf ("%s   Frequency: %ld\n", Prepend, cds->Frequency);
-            printf ("%s   SymbolRate: %ld\n", Prepend, cds->SymbolRate);
-            printf ("%s   FEC outer: %d\n", Prepend, cds->FECouter);
-            printf ("%s   FEC inner: %d\n", Prepend, cds->FECinner);
-            printf ("%s   Modulation: %d\n", Prepend, cds->Modulation);
-         }
-         break;
-
-         case DESCR_TERR_DEL_SYS:
-         {
-            struct TerrestrialDeliverySystemDescriptor *tds =
-                (struct TerrestrialDeliverySystemDescriptor *)Descriptor;
-
-            printf ("%sDescriptor: Terrestrial Delivery System\n", Prepend);
-            printf ("%s   Frequency: %ld\n", Prepend, tds->Frequency);
-            printf ("%s   Bandwidth: %d\n", Prepend, tds->Bandwidth);
-            printf ("%s   Constellation: %d\n", Prepend, tds->Constellation);
-            printf ("%s   Hierarchy: %d\n", Prepend, tds->Hierarchy);
-            printf ("%s   CodeRateHP: %d\n", Prepend, tds->CodeRateHP);
-            printf ("%s   CodeRateLP: %d\n", Prepend, tds->CodeRateLP);
-            printf ("%s   GuardInterval: %d\n", Prepend, tds->GuardInterval);
-            printf ("%s   TransmissionMode: %d\n", Prepend, tds->TransmissionMode);
-            printf ("%s   OtherFrequencyFlag: %d\n", Prepend, tds->OtherFrequencyFlag);
-         }
-         break;
-
-         case DESCR_SERVICE_LIST:
-         {
-            struct ServiceListEntry *Entry;
-
-            printf ("%sDescriptor: Service List\n", Prepend);
-            xForeach (((struct ServiceListDescriptor *)Descriptor)->ServiceList, Entry)
-            {
-               printf ("%s   Entry:\n");
-               printf ("%s      ServiceID: %d\n", Prepend, Entry->ServiceID);
-               printf ("%s      ServiceType: %04x\n", Prepend, Entry->ServiceType);
-            }
-         }
-         break;
-
-         case DESCR_LOCAL_TIME_OFF:
-         {
-            struct LocalTimeOffsetEntry *Offset;
-
-            printf ("%sDescriptor: Local Time Offset\n", Prepend);
-            xForeach (((struct LocalTimeOffsetDescriptor *)Descriptor)->LocalTimeOffsets, Offset)
-            {
-               printf ("%s   Offset:\n");
-               printf ("%s      CountryCode: %s\n", Offset->CountryCode);
-               printf ("%s      RegionID: %c\n", Offset->RegionID);
-               printf ("%s      CurrentOffset: %ld\n", Offset->CurrentOffset);
-               printf ("%s      ChangeTime: %ld\n", Offset->ChangeTime);
-               printf ("%s      NextOffset: %ld\n", Offset->NextOffset);
-            }
-         }
-         break;
-
-         case DESCR_STUFFING:
-         case DESCR_VBI_DATA:
-         case DESCR_VBI_TELETEXT:
-         case DESCR_MOSAIC:
-         case DESCR_TELEPHONE:
-         case DESCR_ML_NW_NAME:
-         case DESCR_ML_BQ_NAME:
-         case DESCR_ML_SERVICE_NAME:
-         case DESCR_ML_COMPONENT:
-         case DESCR_PRIV_DATA_SPEC:
-         case DESCR_SERVICE_MOVE:
-         case DESCR_SHORT_SMOOTH_BUF:
-         case DESCR_FREQUENCY_LIST:
-         case DESCR_PARTIAL_TP_STREAM:
-         case DESCR_DATA_BROADCAST:
-         case DESCR_CA_SYSTEM:
-         case DESCR_DATA_BROADCAST_ID:
-         case DESCR_TRANSPORT_STREAM:
-         case DESCR_DSNG:
-         case DESCR_PDC:
-         case DESCR_AC3:
-         case DESCR_CELL_LIST:
-         case DESCR_CELL_FREQ_LINK:
-         case DESCR_ANNOUNCEMENT_SUPPORT:
-         default:
-            printf ("%sDescriptor: %02x (noch nicht unterst�tzt)\n", Prepend, DescriptorTag (Descriptor));
-         break;
-      }
-   }
-   return;
-}
-
-void siDumpDescriptor (void * Descriptor)
-{
-   int Length, i;
-   unsigned char *ptr;
-
-   Length = GetDescriptorLength (Descriptor);
-   for (i = 0, ptr = (char*) Descriptor; i < Length; i++) {
-        if ((i % 8) == 0) 
-           printf ("\n");
-        printf ("0x%02X ", (unsigned int) ptr[i]);
-   }
-   printf ( "\n");
-}
-
-void siDumpSection (void *Section)
-{
-   int Length, i;
-   unsigned char *ptr;
-   char str[9];
-
-   Length = GetSectionLength (Section) + 3;
-   for (i = 0, ptr = (unsigned char*) Section, memset (str, 0, 9); i < Length; i++) {
-        if ((i % 8) == 0) 
-        {
-           printf ("  %s\n", str);
-           memset (str, 0, 8);
-        }
-        printf ("0x%02X ", (unsigned int) ptr[i]);
-        if (ptr[i] < 0x20 || (ptr[i] > 'z' && ptr[i] < ((unsigned char )'�')) )
-           str[i % 8] = '.';
-        else
-           str[i % 8] = ptr[i];
-   }
-   printf ("  %*s\n", (8 - ((abs(i - 1) % 8) ? (abs(i - 1) % 8) : 8)) * 5, str);
-}
-
diff --git a/libdtv/libsi/si_debug_services.h b/libdtv/libsi/si_debug_services.h
deleted file mode 100644
index 404f3c7b8..000000000
--- a/libdtv/libsi/si_debug_services.h
+++ /dev/null
@@ -1,245 +0,0 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// si_debug_services.h: local debugging definitions       ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.2 $
-// $Date: 2003/02/04 18:45:35 $
-// $Author: hakenes $
-//
-//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// libsi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libsi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libsi; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-struct component_type {
-   u_char   Content;
-   u_char   Type;
-   char    *Description;
-};
-
-static struct component_type ComponentTypes[] = {
-   { 0x01, 0x01, "video, 4:3 aspect ratio, 25 Hz" },
-   { 0x01, 0x02, "video, 16:9 aspect ratio with pan vectors, 25 Hz" },
-   { 0x01, 0x03, "video, 16:9 aspect ratio without pan vectors, 25 Hz" },
-   { 0x01, 0x04, "video, > 16:9 aspect ratio, 25 Hz" },
-   { 0x01, 0x05, "video, 4:3 aspect ratio, 30 Hz" },
-   { 0x01, 0x06, "video, 16:9 aspect ratio with pan vectors, 30 Hz" },
-   { 0x01, 0x07, "video, 16:9 aspect ratio without pan vectors, 30 Hz" },
-   { 0x01, 0x08, "video, > 16:9 aspect ratio, 30 Hz" },
-   { 0x01, 0x09, "HD video, 4:3 aspect ratio, 25 Hz" },
-   { 0x01, 0x0A, "HD video, 16:9 aspect ratio with pan vectors, 25 Hz" },
-   { 0x01, 0x0B, "HD video, 16:9 aspect ratio without pan vectors, 25 Hz" },
-   { 0x01, 0x0C, "HD video, > 16:9 aspect ratio, 25 Hz" },
-   { 0x01, 0x0D, "HD video, 4:3 aspect ratio, 30 Hz" },
-   { 0x01, 0x0E, "HD video, 16:9 aspect ratio with pan vectors, 30 Hz" },
-   { 0x01, 0x0F, "HD video, 16:9 aspect ratio without pan vectors, 30 Hz" },
-   { 0x01, 0x10, "HD video, > 16:9 aspect ratio, 30 Hz" },
-   { 0x02, 0x01, "audio, single mono channel" },
-   { 0x02, 0x02, "audio, dual mono channel" },
-   { 0x02, 0x03, "audio, stereo (2 channel)" },
-   { 0x02, 0x04, "audio, multi lingual, multi channel" },
-   { 0x02, 0x05, "audio, surround sound" },
-   { 0x02, 0x40, "audio description for the visually impaired" },
-   { 0x02, 0x41, "audio for the hard of hearing" },
-   { 0x03, 0x01, "EBU Teletext subtitles" },
-   { 0x03, 0x02, "associated EBU Teletext" },
-   { 0x03, 0x03, "VBI data" },
-   { 0x03, 0x10, "DVB subtitles (normal), no aspect criticality" },
-   { 0x03, 0x11, "DVB subtitles (normal), aspect 4:3 only" },
-   { 0x03, 0x12, "DVB subtitles (normal), aspect 16:9 only" },
-   { 0x03, 0x13, "DVB subtitles (normal), aspect 2.21:1 only" },
-   { 0x03, 0x20, "DVB subtitles (hard of hearing), no aspect criticality" },
-   { 0x03, 0x21, "DVB subtitles (hard of hearing), aspect 4:3 only" },
-   { 0x03, 0x22, "DVB subtitles (hard of hearing), aspect 16:9 only" },
-   { 0x03, 0x23, "DVB subtitles (hard of hearing), aspect 2.21:1 only" }
-};
-#define COMPONENT_TYPE_NUMBER 35
-
-
-struct service_type {
-   u_char   Type;
-   char    *Description;
-};
-
-static struct service_type ServiceTypes[] = {
-   { 0x01, "digital television service" },
-   { 0x02, "digital radio sound service" },
-   { 0x03, "Teletext service" },
-   { 0x04, "NVOD reference service" },
-   { 0x05, "NVOD time-shifted service" },
-   { 0x06, "mosaic service" },
-   { 0x07, "PAL coded signal" },
-   { 0x08, "SECAM coded signal" },
-   { 0x09, "D/D2-MAC" },
-   { 0x0A, "FM Radio" },
-   { 0x0B, "NTSC coded signal" },
-   { 0x0C, "data broadcast service" },
-   { 0x0D, "common interface data" },
-   { 0x0E, "RCS Map" },
-   { 0x0F, "RCS FLS" },
-   { 0x10, "DVB MHP service" }
-};
-#define SERVICE_TYPE_NUMBER 16
-
-
-struct content_type {
-   u_char   Nibble1;
-   u_char   Nibble2;
-   char    *Description;
-};
-
-static struct content_type ContentTypes[] = {
-   /*   Movie/Drama: */
-   { 0x01, 0x00, "movie/drama (general)" },
-   { 0x01, 0x01, "detective/thriller" },
-   { 0x01, 0x02, "adventure/western/war" },
-   { 0x01, 0x03, "science fiction/fantasy/horror" },
-   { 0x01, 0x04, "comedy" },
-   { 0x01, 0x05, "soap/melodrama/folkloric" },
-   { 0x01, 0x06, "romance" },
-   { 0x01, 0x07, "serious/classical/religious/historical movie/drama" },
-   { 0x01, 0x08, "adult movie/drama" },
-   /*   News/Current affairs: */
-   { 0x02, 0x00, "news/current affairs (general)" },
-   { 0x02, 0x01, "news/weather report" },
-   { 0x02, 0x02, "news magazine" },
-   { 0x02, 0x03, "documentary" },
-   { 0x02, 0x04, "discussion/interview/debate" },
-   /*   Show/Game show: */
-   { 0x03, 0x00, "show/game show (general)" },
-   { 0x03, 0x01, "game show/quiz/contest" },
-   { 0x03, 0x02, "variety show" },
-   { 0x03, 0x03, "talk show" },
-   /*   Sports: */
-   { 0x04, 0x00, "sports (general)" },
-   { 0x04, 0x01, "special events (Olympic Games, World Cup etc.)" },
-   { 0x04, 0x02, "sports magazines" },
-   { 0x04, 0x03, "football/soccer" },
-   { 0x04, 0x04, "tennis/squash" },
-   { 0x04, 0x05, "team sports (excluding football)" },
-   { 0x04, 0x06, "athletics" },
-   { 0x04, 0x07, "motor sport" },
-   { 0x04, 0x08, "water sport" },
-   { 0x04, 0x09, "winter sports" },
-   { 0x04, 0x0A, "equestrian" },
-   { 0x04, 0x0B, "martial sports" },
-   /*   Children's/Youth programmes: */
-   { 0x05, 0x00, "children's/youth programmes (general)" },
-   { 0x05, 0x01, "pre-school children's programmes" },
-   { 0x05, 0x02, "entertainment programmes for 6 to14" },
-   { 0x05, 0x03, "entertainment programmes for 10 to 16" },
-   { 0x05, 0x04, "informational/educational/school programmes" },
-   { 0x05, 0x05, "cartoons/puppets" },
-   /*   Music/Ballet/Dance: */
-   { 0x06, 0x00, "music/ballet/dance (general)" },
-   { 0x06, 0x01, "rock/pop" },
-   { 0x06, 0x02, "serious music/classical music" },
-   { 0x06, 0x03, "folk/traditional music" },
-   { 0x06, 0x04, "jazz" },
-   { 0x06, 0x05, "musical/opera" },
-   { 0x06, 0x06, "ballet" },
-   /*   Arts/Culture (without music): */
-   { 0x07, 0x00, "arts/culture (without music, general)" },
-   { 0x07, 0x01, "performing arts" },
-   { 0x07, 0x02, "fine arts" },
-   { 0x07, 0x03, "religion" },
-   { 0x07, 0x04, "popular culture/traditional arts" },
-   { 0x07, 0x05, "literature" },
-   { 0x07, 0x06, "film/cinema" },
-   { 0x07, 0x07, "experimental film/video" },
-   { 0x07, 0x08, "broadcasting/press" },
-   { 0x07, 0x09, "new media" },
-   { 0x07, 0x0A, "arts/culture magazines" },
-   { 0x07, 0x0B, "fashion" },
-   /*   Social/Political issues/Economics: */
-   { 0x08, 0x00, "social/political issues/economics (general)" },
-   { 0x08, 0x01, "magazines/reports/documentary" },
-   { 0x08, 0x02, "economics/social advisory" },
-   { 0x08, 0x03, "remarkable people" },
-   /*   Children's/Youth programmes: */
-   /*   Education/ Science/Factual topics: */
-   { 0x09, 0x00, "education/science/factual topics (general)" },
-   { 0x09, 0x01, "nature/animals/environment" },
-   { 0x09, 0x02, "technology/natural sciences" },
-   { 0x09, 0x03, "medicine/physiology/psychology" },
-   { 0x09, 0x04, "foreign countries/expeditions" },
-   { 0x09, 0x05, "social/spiritual sciences" },
-   { 0x09, 0x06, "further education" },
-   { 0x09, 0x07, "languages" },
-   /*   Leisure hobbies: */
-   { 0x0A, 0x00, "leisure hobbies (general)" },
-   { 0x0A, 0x01, "tourism/travel" },
-   { 0x0A, 0x02, "handicraft" },
-   { 0x0A, 0x03, "motoring" },
-   { 0x0A, 0x04, "fitness & health" },
-   { 0x0A, 0x05, "cooking" },
-   { 0x0A, 0x06, "advertisement/shopping" },
-   { 0x0A, 0x07, "gardening" },
-   { 0x0B, 0x00, "original language" },
-   { 0x0B, 0x01, "black & white" },
-   { 0x0B, 0x02, "unpublished" },
-   { 0x0B, 0x03, "live broadcast" }
-};
-#define CONTENT_TYPE_NUMBER 79
-
-static char *StreamTypes[] = {
-   "ITU-T|ISO/IEC Reserved",
-   "ISO/IEC Video",
-   "13818-2 Video or 11172-2 constrained parameter video stream",
-   "ISO/IEC 11172 Audio",
-   "ISO/IEC 13818-3 Audio",
-   "private_sections",
-   "packets containing private data / Videotext",
-   "ISO/IEC 13522 MPEG",
-   "ITU-T Rec. H.222.1",
-   "ISO/IEC 13818-6 type A",
-   "ISO/IEC 13818-6 type B",
-   "ISO/IEC 13818-6 type C",
-   "ISO/IEC 13818-6 type D",
-   "ISO/IEC 13818-1 auxiliary",
-   "ITU-T Rec. H.222.0 | ISO 13818-1 Reserved",
-   "User private"
-};
-
-static char *CaIdents[] = {
-   "Standardized systems",
-   "Canal Plus",
-   "CCETT",
-   "Deutsche Telecom",
-   "Eurodec",
-   "France Telecom",
-   "Irdeto",
-   "Jerrold/GI",
-   "Matra Communication",
-   "News Datacom",
-   "Nokia",
-   "Norwegian Telekom",
-   "NTL",
-   "Philips",
-   "Scientific Atlanta",
-   "Sony",
-   "Tandberg Television",
-   "Thomson",
-   "TV/Com",
-   "HPT - Croatian Post and Telecommunications",
-   "HRT - Croatian Radio and Television",
-   "IBM",
-   "Nera",
-   "BetaTechnik"
-};
-#define MAX_CA_IDENT 24
diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c
deleted file mode 100644
index 896c5ab98..000000000
--- a/libdtv/libsi/si_parser.c
+++ /dev/null
@@ -1,1335 +0,0 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// si_parser.c: main parsing functions of libsi           ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.8 $
-// $Date: 2003/02/04 18:45:35 $
-// $Author: hakenes $
-//
-//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
-//               GNU GPL with contribution of Oleg Assovski,
-//               www.satmania.com
-//
-// libsi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libsi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libsi; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <time.h>
-
-#include "../liblx/liblx.h"
-#include "libsi.h"
-#include "si_tables.h"
-
-static u_long crc32 (char *data, int len);
-
-struct LIST *siParsePAT (u_char *Buffer) 
-{
-   pat_t               *Pat;
-   pat_prog_t          *PatProgram;
-   u_char              *Ptr;
-   int                  SectionLength;
-   int                  TransportStreamID;
-   int                  PatVersion;
-   struct Program      *Program;
-   struct LIST         *ProgramList = NULL;
-
-   if (!Buffer) return NULL;
-
-   Pat = (pat_t *) Buffer; Ptr = Buffer;
-
-   if (Pat->table_id != TID_PAT) {
-      // fprintf (stderr, "PAT: wrong TID %d\n", Pat->table_id);
-      return NULL;
-   }
-
-   SectionLength = HILO (Pat->section_length) + 3 - PAT_LEN - 4;
-
-   if (crc32 (Ptr, HILO (Pat->section_length) + 3)) return (NULL);
-
-   TransportStreamID = HILO (Pat->transport_stream_id);
-   PatVersion = Pat->version_number;
-
-   Ptr += PAT_LEN;
-
-   while (SectionLength > 0)
-   {
-      PatProgram = (pat_prog_t *) Ptr;
-
-      CreateProgram (Program, HILO (PatProgram->program_number),
-         TransportStreamID, HILO (PatProgram->network_pid), PatVersion);
-
-      if (!ProgramList) ProgramList = xNewList (NULL);
-      xAddTail (ProgramList, Program);
-
-      SectionLength -= PAT_PROG_LEN;
-      Ptr += PAT_PROG_LEN;
-   }
-
-   return (ProgramList);
-}
-
-
-struct LIST *siParseCAT (u_char *Buffer) 
-{
-   cat_t               *Cat;
-   u_char              *Ptr;
-   int                  SectionLength;
-   int                  TransportStreamID;
-   int                  CatVersion;
-   struct Descriptor   *Descriptor;
-   struct LIST         *DescriptorList = NULL;
-
-   if (!Buffer) return NULL;
-
-   Cat = (cat_t *) Buffer; Ptr = Buffer;
-
-   if (Cat->table_id != TID_CAT) {
-      // fprintf (stderr, "CAT: wrong TID %d\n", Cat->table_id);
-      return NULL;
-   }
-
-   SectionLength = HILO (Cat->section_length) + 3 - CAT_LEN - 4;
-
-   if (crc32 (Ptr, HILO (Cat->section_length) + 3)) return (NULL);
-
-   CatVersion = Cat->version_number;
-
-   Ptr += CAT_LEN;
-
-   if (SectionLength >= 0)
-   {
-      DescriptorList = xNewList (NULL);
-      siParseDescriptors (DescriptorList, Ptr, SectionLength, Cat->table_id);
-   }
-
-   return (DescriptorList);
-}
-
-
-struct Pid *siParsePMT (u_char *Buffer) 
-{
-   pmt_t               *Pmt;
-   pmt_info_t          *PmtInfo;
-   u_char              *Ptr;
-   int                  SectionLength, ProgramInfoLength,
-                        StreamLength, LoopLength;
-   int                  ProgramID;
-   int                  PcrID;
-   int                  PmtVersion;
-   struct Pid          *Pid;
-   struct PidInfo      *PidInfo;
-
-   if (!Buffer) return NULL;
-
-   Pmt = (pmt_t *) Buffer; Ptr = Buffer;
-
-   if (Pmt->table_id != TID_PMT) {
-      // fprintf (stderr, "PMT: wrong TID %d\n", Pmt->table_id);
-      return NULL;
-   }
-
-   SectionLength = HILO (Pmt->section_length) + 3 - 4;
-
-   if (crc32 (Ptr, HILO (Pmt->section_length) + 3)) return (NULL);
-
-   ProgramInfoLength = HILO (Pmt->program_info_length);
-   StreamLength = SectionLength - ProgramInfoLength - PMT_LEN;
-
-   ProgramID = HILO (Pmt->program_number);
-   PmtVersion = Pmt->version_number;
-   PcrID = HILO (Pmt->PCR_PID);
-
-   Ptr += PMT_LEN;
-
-   CreatePid (Pid, ProgramID, PcrID, PmtVersion);
-
-   if (StreamLength >= 0) siParseDescriptors (Pid->Descriptors, Ptr,
-                             ProgramInfoLength, Pmt->table_id);
-
-   Ptr += ProgramInfoLength;
-
-   while (StreamLength > 0)
-   {
-      PmtInfo = (pmt_info_t *) Ptr;
-
-      CreatePidInfo (PidInfo, PmtInfo->stream_type,
-                        HILO (PmtInfo->elementary_PID));
-
-      LoopLength = HILO (PmtInfo->ES_info_length);
-      Ptr += PMT_INFO_LEN;
-
-      siParseDescriptors (PidInfo->Descriptors, Ptr, LoopLength, Pmt->table_id);
-
-      xAddTail (Pid->InfoList, PidInfo);
-
-      StreamLength -= LoopLength + PMT_INFO_LEN;
-      Ptr += LoopLength;
-   }
-
-   return (Pid);
-}
-
-
-struct LIST *siParseNIT (u_char *Buffer) 
-{
-   nit_t               *Nit;
-   nit_mid_t           *NitMid;
-   nit_ts_t            *TSDesc;
-   u_char              *Ptr;
-   int                  SectionLength, LoopLength, Loop2Length;
-   int                  TransportStreamID;
-   int                  NitVersion;
-   int                  NetworkID;
-   struct TransportStream *TransportStream;
-   struct LIST         *TSList = NULL;
-   struct LIST         *Networks;
-   struct NetworkInfo  *Network;  
-
-   if (!Buffer) return NULL;
-
-   Nit = (nit_t *) Buffer; 
-   Ptr = Buffer;
-
-   if (Nit->table_id != TID_NIT_ACT && Nit->table_id != TID_NIT_OTH && Nit->table_id != TID_BAT) {
-      return NULL;
-   }
-
-   SectionLength = HILO (Nit->section_length) + 3 - NIT_LEN - 4;
-
-   if (crc32 (Ptr, HILO (Nit->section_length) + 3)) return (NULL);
-
-   NitVersion = Nit->version_number;
-   NetworkID = HILO (Nit->network_id);
-   if (NetworkID == 65535)
-      NetworkID = 0;
-   CreateNetworkInfo (Network, NetworkID);
-   Networks = xNewList (NULL);
-   xAddTail (Networks, Network);
-
-   Ptr += NIT_LEN;
-
-   LoopLength = HILO (Nit->network_descriptor_length);
-//   fprintf (stderr, "table 0x%X, SectionLen = %d, LoopLen = %d\n",
-//                              Nit->table_id, SectionLength, LoopLength);
-   if (LoopLength > SectionLength - SDT_DESCR_LEN)
-      return (Networks);
-
-   if (LoopLength <= SectionLength) {
-      if (SectionLength >= 0) siParseDescriptors (Network->Descriptors, Ptr, LoopLength, Nit->table_id);
-      SectionLength -= LoopLength;
-      Ptr += LoopLength;
-      NitMid = (nit_mid_t *) Ptr; 
-      LoopLength = HILO (NitMid->transport_stream_loop_length);
-//      fprintf (stderr, "table 0x%X, TS LoopLen = %d\n",
-//                              Nit->table_id, LoopLength);
-      if ((SectionLength > 0) && (LoopLength <= SectionLength)) {
-         SectionLength -= SIZE_NIT_MID;
-         Ptr += SIZE_NIT_MID;
-         while (LoopLength > 0) {
-            TSDesc = (nit_ts_t *) Ptr;
-            CreateTransportStream (TransportStream, HILO(TSDesc->transport_stream_id), HILO(TSDesc->original_network_id));
-            if (TransportStream->TransportStreamID == 65535)
-               TransportStream->TransportStreamID = 0;
-            if (TransportStream->OriginalNetworkID == 65535)
-               TransportStream->OriginalNetworkID = 0;
-            Loop2Length = HILO (TSDesc->transport_descriptors_length);
-//            fprintf (stderr, "table 0x%X, TSdesc LoopLen  = %d\n",
-//                              Nit->table_id, Loop2Length);
-            Ptr += NIT_TS_LEN;
-            if (Loop2Length <= LoopLength) {
-               if (LoopLength >= 0) siParseDescriptors (TransportStream->Descriptors, Ptr, Loop2Length, Nit->table_id);
-            }
-            if (!Network->TransportStreams)
-               Network->TransportStreams = xNewList (NULL);
-            xAddTail (Network->TransportStreams, TransportStream);
-            LoopLength -= Loop2Length + NIT_TS_LEN;
-            SectionLength -= Loop2Length + NIT_TS_LEN;
-            Ptr += Loop2Length;
-         }
-      }
-   }
-
-   return (Networks);
-}
-
-
-struct LIST *siParseSDT (u_char *Buffer) 
-{
-   sdt_t               *Sdt;
-   sdt_descr_t         *SdtDescriptor;
-   u_char              *Ptr;
-   int                  SectionLength, LoopLength;
-   int                  TransportStreamID;
-   int                  SdtVersion;
-   int                  OriginalNetworkID;
-   struct Service      *Service;
-   struct LIST         *ServiceList = NULL;
-
-   if (!Buffer) return NULL;
-
-   Sdt = (sdt_t *) Buffer; Ptr = Buffer;
-
-   if (Sdt->table_id != TID_SDT_ACT && Sdt->table_id != TID_SDT_OTH) {
-      // fprintf (stderr, "SDT: wrong TID %d\n", Sdt->table_id);
-      return NULL;
-   }
-
-   SectionLength = HILO (Sdt->section_length) + 3 - SDT_LEN - 4;
-
-   if (crc32 (Ptr, HILO (Sdt->section_length) + 3)) return (NULL);
-
-   TransportStreamID = HILO (Sdt->transport_stream_id);
-   SdtVersion = Sdt->version_number;
-   OriginalNetworkID = HILO (Sdt->original_network_id);
-
-   Ptr += SDT_LEN;
-
-   while (SectionLength > 0)
-   {
-      SdtDescriptor = (sdt_descr_t *) Ptr;
-
-      CreateService (Service, HILO (SdtDescriptor->service_id),
-         TransportStreamID, OriginalNetworkID, SdtVersion,
-         SdtDescriptor->free_ca_mode ? CONDITIONAL_ACCESS : FREE_TO_AIR);
-
-      switch (SdtDescriptor->running_status)
-      {
-         case 0x01:
-            SetRunningStatus (Service->Status, RUNNING_STATUS_NOT_RUNNING);
-         break;
-
-         case 0x02:
-            SetRunningStatus (Service->Status, RUNNING_STATUS_AWAITING);
-         break;
-
-         case 0x03:
-            SetRunningStatus (Service->Status, RUNNING_STATUS_PAUSING);
-         break;
-
-         case 0x04:
-         default:
-            SetRunningStatus (Service->Status, RUNNING_STATUS_RUNNING);
-         break;
-      }
-      if (SdtDescriptor->eit_schedule_flag)
-         SetScheduleFlag (Service->Status);
-      if (SdtDescriptor->eit_present_following_flag)
-         SetPresentFollowing (Service->Status);
-
-      LoopLength = HILO (SdtDescriptor->descriptors_loop_length);
-      if (LoopLength > SectionLength - SDT_DESCR_LEN)
-         return (ServiceList);
-      Ptr += SDT_DESCR_LEN;
-
-      siParseDescriptors (Service->Descriptors, Ptr, LoopLength, Sdt->table_id);
-
-      if (!ServiceList) ServiceList = xNewList (NULL);
-      xAddTail (ServiceList, Service);
-
-      SectionLength -= LoopLength + SDT_DESCR_LEN;
-      Ptr += LoopLength;
-   }
-
-   return (ServiceList);
-}
-
-
-struct LIST *siParseEIT (u_char *Buffer) 
-{
-   eit_t               *Eit;
-   eit_event_t         *EitEvent;
-   u_char              *Ptr;
-   int                  SectionLength, LoopLength;
-   int                  ServiceID;
-   int                  EitVersion;
-   int                  TransportStreamID;
-   int                  OriginalNetworkID;
-   struct Event        *Event;
-   struct LIST         *EventList = NULL;
-
-   if (!Buffer) return NULL;
-
-   Eit = (eit_t *) Buffer; Ptr = Buffer;
-
-   if (Eit->table_id != TID_EIT_ACT && Eit->table_id != TID_EIT_OTH &&
-       !(Eit->table_id >= TID_EIT_ACT_SCH &&
-         Eit->table_id <= TID_EIT_ACT_SCH + 0x0F) &&
-       !(Eit->table_id >= TID_EIT_OTH_SCH &&
-         Eit->table_id <= TID_EIT_OTH_SCH + 0x0F)) {
-      // fprintf (stderr, "EIT: wrong TID %d\n", Eit->table_id);
-      return NULL;
-   }
-
-   SectionLength = HILO (Eit->section_length) + 3 - EIT_LEN - 4;
-
-   if (crc32 (Ptr, HILO (Eit->section_length) + 3)) return (NULL);
-
-   ServiceID = HILO (Eit->service_id);
-   TransportStreamID = HILO (Eit->transport_stream_id);
-   EitVersion = Eit->version_number;
-   OriginalNetworkID = HILO (Eit->original_network_id);
-
-   Ptr += EIT_LEN;
-
-   while (SectionLength > 0)
-   {
-      struct tm thisTime;
-      int year, month, day;
-      double mjd;
-
-      EitEvent = (eit_event_t *) Ptr;
-
-      CreateEvent (Event, HILO (EitEvent->event_id), ServiceID,
-         TransportStreamID, OriginalNetworkID, EitVersion,
-         EitEvent->free_ca_mode ? CONDITIONAL_ACCESS : FREE_TO_AIR);
-
-      switch (EitEvent->running_status)
-      {
-         case 0x01:
-            SetRunningStatus (Event->Status, RUNNING_STATUS_NOT_RUNNING);
-         break;
-
-         case 0x02:
-            SetRunningStatus (Event->Status, RUNNING_STATUS_AWAITING);
-         break;
-
-         case 0x03:
-            SetRunningStatus (Event->Status, RUNNING_STATUS_PAUSING);
-         break;
-
-         case 0x04:
-         default:
-            SetRunningStatus (Event->Status, RUNNING_STATUS_RUNNING);
-         break;
-      }
-      Event->StartTime = MjdToEpochTime (EitEvent->mjd) +
-                         BcdTimeToSeconds (EitEvent->start_time);
-      Event->Duration = BcdTimeToSeconds (EitEvent->duration);
-
-      LoopLength = HILO (EitEvent->descriptors_loop_length);
-      if (LoopLength > SectionLength - EIT_EVENT_LEN)
-         return (EventList);
-      Ptr += EIT_EVENT_LEN;
-
-      siParseDescriptors (Event->Descriptors, Ptr, LoopLength, Eit->table_id);
-
-      if (!EventList) EventList = xNewList (NULL);
-      xAddTail (EventList, Event);
-
-      SectionLength -= LoopLength + EIT_EVENT_LEN;
-      Ptr += LoopLength;
-   }
-
-   return (EventList);
-}
-
-
-time_t siParseTDT (u_char *Buffer) 
-{
-   tdt_t               *Tdt;
-   u_char              *Ptr;
-   int                  SectionLength;
-   int                  TdtVersion;
-   time_t               CurrentTime;
-
-   if (!Buffer) return 0;
-
-   Tdt = (tdt_t *) Buffer; Ptr = Buffer;
-
-   if (Tdt->table_id != TID_TDT) {
-      // fprintf (stderr, "TDT: wrong TID %d\n", Tdt->table_id);
-      return 0;
-   }
-
-   SectionLength = HILO (Tdt->section_length) + 3;  /* no CRC ?! */
-
-   CurrentTime = MjdToEpochTime (Tdt->utc_mjd) +
-                 BcdTimeToSeconds (Tdt->utc_time);
-
-   return (CurrentTime);
-}
-
-
-struct Tot *siParseTOT (u_char *Buffer) 
-{
-   tot_t               *Tot;
-   u_char              *Ptr;
-   int                  SectionLength, LoopLength;
-   struct Tot          *table;
-   time_t               CurrentTime;
-
-   if (!Buffer) return NULL;
-
-   Tot = (tot_t *) Buffer;
-   Ptr = Buffer;
-
-   if (Tot->table_id != TID_TOT) {
-      return NULL;
-   }
-
-   if (crc32 (Ptr, HILO (Tot->section_length) + 3)) return (NULL);
-//   SectionLength = HILO (Tot->section_length) + 3 - TOT_LEN - 4;
-
-   CurrentTime = MjdToEpochTime (Tot->utc_mjd) +
-                 BcdTimeToSeconds (Tot->utc_time);
-   LoopLength = HILO (Tot->descriptors_loop_length);
-   if (!LoopLength)
-      return NULL;
-
-   CreateTot (table, CurrentTime);
-
-   Ptr += TOT_LEN;
-
-   siParseDescriptors (table->Descriptors, Ptr, LoopLength, Tot->table_id);
-
-   // fprintf (stderr, "TOT Bias: %d\n", table->Bias);
-   return (table);
-}
-
-static u_char TempTableID = 0;
-
-void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
-                         int Length, u_char TableID)
-{
-   int          DescriptorLength;
-   u_char      *Ptr;
-
-   DescriptorLength = 0;
-   Ptr = Buffer;
-   TempTableID = TableID;
-
-   while (DescriptorLength < Length)
-   {
-      if ((GetDescriptorLength (Ptr) > Length - DescriptorLength) ||
-          (GetDescriptorLength (Ptr) <= 0)) return;
-      switch (TableID)
-      {
-         case TID_NIT_ACT: case TID_NIT_OTH:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_SAT_DEL_SYS:
-               case DESCR_CABLE_DEL_SYS:
-               case DESCR_SERVICE_LIST:
-               case DESCR_PRIV_DATA_SPEC:
-//                  fprintf (stderr, "Got descriptor with tag = 0x%X\n", GetDescriptorTag(Ptr));
-//                  siDumpDescriptor (Ptr);
-               case DESCR_NW_NAME:
-               case DESCR_STUFFING:
-               case DESCR_LINKAGE:
-               case DESCR_TERR_DEL_SYS:
-               case DESCR_ML_NW_NAME:
-               case DESCR_CELL_LIST:
-               case DESCR_CELL_FREQ_LINK:
-               case DESCR_ANNOUNCEMENT_SUPPORT:
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in NIT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         case TID_BAT:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_SERVICE_LIST:
-               case DESCR_STUFFING:
-               case DESCR_BOUQUET_NAME:
-               case DESCR_SERVICE:
-               case DESCR_COUNTRY_AVAIL:
-               case DESCR_LINKAGE:
-               case DESCR_CA_IDENT:
-               case DESCR_ML_BQ_NAME:
-               case DESCR_PRIV_DATA_SPEC:
- //                 fprintf (stderr, "Got descriptor with tag = 0x%X\n", GetDescriptorTag(Ptr));
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in BAT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         case TID_SDT_ACT: case TID_SDT_OTH:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_STUFFING:
-               case DESCR_BOUQUET_NAME:
-               case DESCR_SERVICE: 
-               case DESCR_COUNTRY_AVAIL: 
-               case DESCR_LINKAGE:
-               case DESCR_NVOD_REF:
-               case DESCR_TIME_SHIFTED_SERVICE:
-               case DESCR_MOSAIC:
-               case DESCR_CA_IDENT:
-               case DESCR_TELEPHONE:
-               case DESCR_ML_SERVICE_NAME:
-               case DESCR_PRIV_DATA_SPEC:
-               case DESCR_DATA_BROADCAST:
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in SDT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         case TID_EIT_ACT: case TID_EIT_OTH:
-         case TID_EIT_ACT_SCH: case TID_EIT_OTH_SCH:
-         case TID_EIT_ACT_SCH+1: case TID_EIT_OTH_SCH+1:
-         case TID_EIT_ACT_SCH+2: case TID_EIT_OTH_SCH+2:
-         case TID_EIT_ACT_SCH+3: case TID_EIT_OTH_SCH+3:
-         case TID_EIT_ACT_SCH+4: case TID_EIT_OTH_SCH+4:
-         case TID_EIT_ACT_SCH+5: case TID_EIT_OTH_SCH+5:
-         case TID_EIT_ACT_SCH+6: case TID_EIT_OTH_SCH+6:
-         case TID_EIT_ACT_SCH+7: case TID_EIT_OTH_SCH+7:
-         case TID_EIT_ACT_SCH+8: case TID_EIT_OTH_SCH+8:
-         case TID_EIT_ACT_SCH+9: case TID_EIT_OTH_SCH+9:
-         case TID_EIT_ACT_SCH+10: case TID_EIT_OTH_SCH+10:
-         case TID_EIT_ACT_SCH+11: case TID_EIT_OTH_SCH+11:
-         case TID_EIT_ACT_SCH+12: case TID_EIT_OTH_SCH+12:
-         case TID_EIT_ACT_SCH+13: case TID_EIT_OTH_SCH+13:
-         case TID_EIT_ACT_SCH+14: case TID_EIT_OTH_SCH+14:
-         case TID_EIT_ACT_SCH+15: case TID_EIT_OTH_SCH+15:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_STUFFING:
-               case DESCR_LINKAGE:
-               case DESCR_SHORT_EVENT:
-               case DESCR_EXTENDED_EVENT:
-               case DESCR_TIME_SHIFTED_EVENT:
-               case DESCR_COMPONENT:
-               case DESCR_CA_IDENT:
-               case DESCR_CONTENT:
-               case DESCR_PARENTAL_RATING:
-               case DESCR_TELEPHONE:
-               case DESCR_ML_COMPONENT:
-               case DESCR_PRIV_DATA_SPEC:
-               case DESCR_SHORT_SMOOTH_BUF:
-               case DESCR_DATA_BROADCAST:
-               case DESCR_PDC:
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in EIT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         case TID_TOT:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_LOCAL_TIME_OFF:
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in TOT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         case TID_PMT:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_VBI_DATA:
-               case DESCR_VBI_TELETEXT:
-               case DESCR_MOSAIC:
-               case DESCR_STREAM_ID:
-               case DESCR_TELETEXT:
-               case DESCR_SUBTITLING:
-               case DESCR_PRIV_DATA_SPEC:
-               case DESCR_SERVICE_MOVE:
-               case DESCR_CA_SYSTEM:
-               case DESCR_DATA_BROADCAST_ID:
-               case DESCR_AC3:
-               case DESCR_ANCILLARY_DATA:
-               case DESCR_VIDEO_STREAM:
-               case DESCR_AUDIO_STREAM:
-               case DESCR_HIERARCHY:
-               case DESCR_REGISTRATION:
-               case DESCR_DATA_STREAM_ALIGN:
-               case DESCR_TARGET_BACKGRID:
-               case DESCR_VIDEO_WINDOW:
-               case DESCR_CA:
-               case DESCR_ISO_639_LANGUAGE:
-               case DESCR_SYSTEM_CLOCK:
-               case DESCR_MULTIPLEX_BUFFER_UTIL:
-               case DESCR_COPYRIGHT:
-               case DESCR_MAXIMUM_BITRATE:
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in PMT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         case TID_CAT:
-            switch (GetDescriptorTag(Ptr))
-            {
-               case DESCR_CA_SYSTEM:
-               case DESCR_CA:
-               case DESCR_CA_IDENT:
-                  siParseDescriptor (Descriptors, Ptr);
-               break;
-
-               default:
-                  // fprintf (stderr, "forbidden descriptor 0x%x in CAT\n", GetDescriptorTag(Ptr));
-               break;
-            }
-         break;
-
-         default:
-            // fprintf (stderr, "descriptor 0x%x in unsupported table 0x%x\n", GetDescriptorTag(Ptr), TableID);
-         break;
-      }
-      DescriptorLength += GetDescriptorLength (Ptr);
-      Ptr += GetDescriptorLength (Ptr);
-   }
-   return;
-}
-
-
-void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
-{
-   struct NODE     *Descriptor = NULL;
-   char            *Text , *Text2;
-   u_char          *Ptr;
-   int              Length, i;
-
-   if (!Descriptors || !Buffer) return;
-
-   Ptr = Buffer;
-//   fprintf (stderr, "Got descriptor with tag = 0x%X\n", GetDescriptorTag(Buffer));
-
-   switch (GetDescriptorTag(Buffer))
-   {
-      case DESCR_ANCILLARY_DATA:
-         CreateAncillaryDataDescriptor (Descriptor,
-                   CastAncillaryDataDescriptor(Buffer)->ancillary_data_identifier);
-      break;
-
-      case DESCR_NW_NAME:
-      case DESCR_BOUQUET_NAME:
-         Text = siGetDescriptorName (Buffer + DESCR_BOUQUET_NAME_LEN,
-                   GetDescriptorLength (Buffer) - DESCR_BOUQUET_NAME_LEN);
-//         fprintf (stderr, "Got descriptor with tag = 0x%X, text = '%s'\n", GetDescriptorTag(Buffer), Text);
-         CreateBouquetNameDescriptor (Descriptor, Text, GetDescriptorTag(Buffer));
-      break;
-
-      case DESCR_COMPONENT:
-         Text = siGetDescriptorText (Buffer + DESCR_COMPONENT_LEN,
-                   GetDescriptorLength (Buffer) - DESCR_COMPONENT_LEN);
-         CreateComponentDescriptor (Descriptor,
-                   CastComponentDescriptor(Buffer)->stream_content,
-                   CastComponentDescriptor(Buffer)->component_type,
-                   CastComponentDescriptor(Buffer)->component_tag,
-                   CastComponentDescriptor(Buffer)->lang_code1,
-                   CastComponentDescriptor(Buffer)->lang_code2,
-                   CastComponentDescriptor(Buffer)->lang_code3, Text);
-      break;
-
-      case DESCR_SERVICE:
-         Text = siGetDescriptorName (Buffer + DESCR_SERVICE_LEN,
-                   CastServiceDescriptor(Buffer)->provider_name_length);
-         Text2 = siGetDescriptorName (Buffer + DESCR_SERVICE_LEN +
-                   CastServiceDescriptor(Buffer)->provider_name_length + 1,
-                   *((u_char *)(Buffer + DESCR_SERVICE_LEN +
-                   CastServiceDescriptor(Buffer)->provider_name_length)));
-         CreateServiceDescriptor (Descriptor,
-                   CastServiceDescriptor(Buffer)->service_type, Text, Text2);
-      break;
-
-      case DESCR_COUNTRY_AVAIL:
-         CreateCountryAvailabilityDescriptor (Descriptor,
-                   CastCountryAvailabilityDescriptor(Buffer)->country_availability_flag);
-         Length = GetDescriptorLength (Buffer) - DESCR_COUNTRY_AVAILABILITY_LEN;
-         Ptr += DESCR_COUNTRY_AVAILABILITY_LEN;
-         while (Length > 0)
-            { AddCountryAvailabilityCode(Descriptor,
-                      Ptr[0], Ptr[1], Ptr[2]); Ptr += 3; Length -= 3; }
-      break;
-
-      case DESCR_SHORT_EVENT:
-         Text = siGetDescriptorName (Buffer + DESCR_SHORT_EVENT_LEN,
-                   CastShortEventDescriptor(Buffer)->event_name_length);
-         Text2 = siGetDescriptorText (Buffer + DESCR_SHORT_EVENT_LEN +
-                   CastShortEventDescriptor(Buffer)->event_name_length + 1,
-                   *((u_char *)(Buffer + DESCR_SHORT_EVENT_LEN +
-                   CastShortEventDescriptor(Buffer)->event_name_length)));
-         CreateShortEventDescriptor (Descriptor, Text,
-                   CastShortEventDescriptor(Buffer)->lang_code1,
-                   CastShortEventDescriptor(Buffer)->lang_code2,
-                   CastShortEventDescriptor(Buffer)->lang_code3, Text2);
-      break;
-
-      case DESCR_EXTENDED_EVENT:
-         Text = siGetDescriptorText (Buffer + DESCR_EXTENDED_EVENT_LEN +
-                   CastExtendedEventDescriptor(Buffer)->length_of_items + 1,
-                   *((u_char *)(Buffer + DESCR_EXTENDED_EVENT_LEN +
-                   CastExtendedEventDescriptor(Buffer)->length_of_items)));
-         CreateExtendedEventDescriptor (Descriptor,
-                   CastExtendedEventDescriptor(Buffer)->descriptor_number,
-                   CastExtendedEventDescriptor(Buffer)->last_descriptor_number,
-                   CastExtendedEventDescriptor(Buffer)->lang_code1,
-                   CastExtendedEventDescriptor(Buffer)->lang_code2,
-                   CastExtendedEventDescriptor(Buffer)->lang_code3, Text);
-         Length = CastExtendedEventDescriptor(Buffer)->length_of_items;
-         Ptr += DESCR_EXTENDED_EVENT_LEN;
-//         printf ("EEDesc #%d, %s\n", CastExtendedEventDescriptor(Buffer)->descriptor_number, Text);
-         while ((Length > 0) && (Length < GetDescriptorLength (Buffer)))
-         {
-            Text = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN,
-                      CastExtendedEventItem(Ptr)->item_description_length);
-            Text2 = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN +
-                      CastExtendedEventItem(Ptr)->item_description_length + 1,
-                      *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
-                      CastExtendedEventItem(Ptr)->item_description_length)));
-//            printf ("EEItem #%d, %s, %s\n", CastExtendedEventDescriptor(Buffer)->descriptor_number, Text, Text2);
-            AddExtendedEventItem (Descriptor, Text2, Text);
-            Length -= ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
-                      *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
-                        CastExtendedEventItem(Ptr)->item_description_length)) + 1;
-            Ptr += ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
-                      *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
-                        CastExtendedEventItem(Ptr)->item_description_length)) + 1;
-         }
-      break;
-
-      case DESCR_CA_IDENT:
-         Length = GetDescriptorLength (Buffer) - DESCR_CA_IDENTIFIER_LEN;
-         CreateCaIdentifierDescriptor (Descriptor, Length / 2);
-         Ptr += DESCR_CA_IDENTIFIER_LEN; i = 0;
-         while (Length > 0)
-            { SetCaIdentifierID(Descriptor, i, ((*((u_char *) Ptr)<<8) + *((u_char *) (Ptr+1))));
-              Length -= 2; Ptr += 2; i++; }
-      break;
-
-      case DESCR_CA:
-      {
-         struct CaDescriptor *CD;
-
-         Length = GetDescriptorLength (Buffer) - DESCR_CA_LEN;
-         CreateCaDescriptor (Descriptor,
-            HILO(CastCaDescriptor(Buffer)->CA_type),
-            HILO(CastCaDescriptor(Buffer)->CA_PID), Length);
-         Ptr += DESCR_CA_LEN; i = 0;
-         while (Length > 0)
-            { SetCaData(Descriptor, i, *Ptr);
-              Length --; Ptr ++; i++; }
-
-         /*
-          * The following analyses are more or less directly copied from
-          * MultiDec 8.4b Sources. Thanx to Espresso for his great work !!
-          */
-         CD = (struct CaDescriptor *) Descriptor;
-
-         // fprintf (stderr, "TableID: %02x - CA - Type: 0x%04x, PID: %d\n", TempTableID, CD->CA_type, CD->CA_PID);
-        
-         if ((CD->CA_type >> 8) == 0x01) /* SECA */
-         {
-            CD->ProviderID = (GetCaData (CD, 0) << 8) | GetCaData (CD, 1);
-         }
-         else if ((CD->CA_type >> 8) == 0x05) /* Viaccess ? (France Telecom) */
-         {
-            i=0;
-            while (i < CD->DataLength)
-            {
-               if ((GetCaData (CD, i) == 0x14) && (GetCaData (CD, i+1) == 0x03))
-               {
-                  CD->ProviderID = (GetCaData (CD, i+2) << 16) |
-                                   (GetCaData (CD, i+3) << 8) |
-                                   (GetCaData (CD, i+4) & 0xf0);
-                  i = CD->DataLength;
-               }
-               i++;
-            }
-         }
-         if (CD->CA_type==0x0100)  /* SECA 1 */
-         {
-         /*   bptr=MyPtr+19;
-
-            i=19;
-            while ( i+4 < ca_info->len ) {
-               if ( (*bptr&0xE0) == 0xE0 ) {
-                  CA_ECM=(( *bptr&0x1f)<<8)+*(bptr+1);
-                  Prov_Ident = ( *(bptr+2)<<8) | *(bptr+3);
-                  j=0;
-                  while ( j < ProgrammNeu[ProgrammNummer].CA_Anzahl ) {
-                     if (( ProgrammNeu[ProgrammNummer].CA_System[j].CA_Typ == CA_Typ )
-                            && ( ProgrammNeu[ProgrammNummer].CA_System[j].ECM == CA_ECM )) break;
-                     j++;
-                  };
-
-                  if ( j < MAX_CA_SYSTEMS ) {
-                     if ( j >= ProgrammNeu[ProgrammNummer].CA_Anzahl )
-                          ProgrammNeu[ProgrammNummer].CA_Anzahl++;
-                     ProgrammNeu[ProgrammNummer].CA_System[j].CA_Typ =CA_Typ;
-                     ProgrammNeu[ProgrammNummer].CA_System[j].ECM    =CA_ECM ;
-                     ProgrammNeu[ProgrammNummer].CA_System[j].Provider_Id = Prov_Ident;
-                  };
-               }
-               i+=0x0f;
-               bptr+=0x0f;
-            }; */
-         }
-      }
-      break;
-
-      case DESCR_CONTENT:
-         CreateContentDescriptor (Descriptor,
-                   (GetDescriptorLength(Buffer) - DESCR_CONTENT_LEN) / 2);
-         Length = GetDescriptorLength (Buffer) - DESCR_CONTENT_LEN;
-         Ptr += DESCR_CONTENT_LEN; i = 0;
-         while (Length > 0)
-            { SetContentID(Descriptor, i, CastContentNibble(Ptr)->content_nibble_level_1,
-                              CastContentNibble(Ptr)->content_nibble_level_2,
-                              CastContentNibble(Ptr)->user_nibble_1,
-                              CastContentNibble(Ptr)->user_nibble_2);
-              Length -= 2; Ptr += 2; i++; }
-      break;
-
-      case DESCR_STUFFING:
-         /* intentionally ignored */
-      break;
-
-      case DESCR_PARENTAL_RATING:
-         CreateParentalRatingDescriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer) - DESCR_PARENTAL_RATING_LEN;
-         Ptr += DESCR_PARENTAL_RATING_LEN; i = 0;
-         while (Length > 0)
-            { AddParentalRating (Descriptor, CastParentalRating(Ptr)->lang_code1,
-                 CastParentalRating(Ptr)->lang_code2, CastParentalRating(Ptr)->lang_code3,
-                 CastParentalRating(Ptr)->rating);
-              Length -= PARENTAL_RATING_LEN; Ptr += PARENTAL_RATING_LEN; i++; }
-      break;
-
-      case DESCR_NVOD_REF:
-         CreateNvodReferenceDescriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer) - DESCR_NVOD_REFERENCE_LEN;
-         Ptr += DESCR_NVOD_REFERENCE_LEN;
-         while (Length > 0)
-         {
-            AddNvodReferenceItem (Descriptor,
-               HILO (CastNvodReferenceItem(Ptr)->transport_stream_id),
-               HILO (CastNvodReferenceItem(Ptr)->original_network_id),
-               HILO (CastNvodReferenceItem(Ptr)->service_id));
-            Length -= ITEM_NVOD_REFERENCE_LEN;
-            Ptr += ITEM_NVOD_REFERENCE_LEN;
-         }
-      break;
-
-      case DESCR_TIME_SHIFTED_SERVICE:
-         CreateTimeShiftedServiceDescriptor (Descriptor,
-            HILO (CastTimeShiftedServiceDescriptor(Ptr)->reference_service_id));
-      break;
-
-      case DESCR_TIME_SHIFTED_EVENT:
-         CreateTimeShiftedEventDescriptor (Descriptor,
-            HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_service_id),
-            HILO (CastTimeShiftedEventDescriptor(Ptr)->reference_event_id));
-      break;
-
-      case DESCR_ISO_639_LANGUAGE:
-         CreateIso639LanguageDescriptor (Descriptor,
-                   CastIso639LanguageDescriptor(Buffer)->lang_code1,
-                   CastIso639LanguageDescriptor(Buffer)->lang_code2,
-                   CastIso639LanguageDescriptor(Buffer)->lang_code3);
-      break;
-
-      case DESCR_STREAM_ID:
-         CreateStreamIdentifierDescriptor (Descriptor,
-                   CastStreamIdentifierDescriptor(Ptr)->component_tag);
-      break;
-
-      case DESCR_LINKAGE:
-         CreateLinkageDescriptor (Descriptor,
-                   HILO (CastLinkageDescriptor(Ptr)->transport_stream_id),
-                   HILO (CastLinkageDescriptor(Ptr)->original_network_id),
-                   HILO (CastLinkageDescriptor(Ptr)->service_id),
-                   CastLinkageDescriptor(Ptr)->linkage_type,
-                   GetDescriptorLength (Ptr) - DESCR_LINKAGE_LEN,
-                   Ptr + DESCR_LINKAGE_LEN);
-      break;
-
-      case DESCR_TELETEXT:
-         CreateTeletextDescriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer) - DESCR_TELETEXT_LEN;
-         Ptr += DESCR_TELETEXT_LEN;
-         while (Length > 0)
-         {
-            AddTeletextItem (Descriptor,
-                   CastTeletextItem(Ptr)->type,
-                   CastTeletextItem(Ptr)->magazine_number,
-                   CastTeletextItem(Ptr)->page_number,
-                   CastTeletextItem(Ptr)->lang_code1,
-                   CastTeletextItem(Ptr)->lang_code2,
-                   CastTeletextItem(Ptr)->lang_code3);
-            Length -= ITEM_TELETEXT_LEN;
-            Ptr += ITEM_TELETEXT_LEN;
-         }
-      break;
-
-      case DESCR_AC3:
-         CreateAc3Descriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer);
-         if (CastAc3Descriptor(Buffer)->ac3_type_flag)
-          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
-            AC3_TYPE_FLAG, CastAc3Descriptor(Buffer)->ac3_type); }
-         if (CastAc3Descriptor(Buffer)->bsid_flag)
-          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
-            BS_ID_FLAG, CastAc3Descriptor(Buffer)->bsid); }
-         if (CastAc3Descriptor(Buffer)->mainid_flag)
-          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
-            MAIN_ID_FLAG, CastAc3Descriptor(Buffer)->mainid); }
-         if (CastAc3Descriptor(Buffer)->asvc_flag)
-          { Length -= 1; Ptr += 1; AddAc3FlagAndValue (Descriptor,
-            ASVC_FLAG, CastAc3Descriptor(Buffer)->asvc); }
-         Length -= DESCR_AC3_LEN;
-         Ptr += DESCR_AC3_LEN;
-         if (Length > 0) AddAc3AdditionalData (Descriptor, Ptr, Length);
-      break;
-
-      case DESCR_SUBTITLING:
-         CreateSubtitlingDescriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer) - DESCR_SUBTITLING_LEN;
-         Ptr += DESCR_SUBTITLING_LEN;
-         while (Length > 0)
-         {
-            AddSubtitlingItem (Descriptor,
-                   CastSubtitlingItem(Ptr)->subtitling_type,
-                   HILO (CastSubtitlingItem(Ptr)->composition_page_id),
-                   HILO (CastSubtitlingItem(Ptr)->ancillary_page_id),
-                   CastSubtitlingItem(Ptr)->lang_code1,
-                   CastSubtitlingItem(Ptr)->lang_code2,
-                   CastSubtitlingItem(Ptr)->lang_code3);
-            Length -= ITEM_SUBTITLING_LEN;
-            Ptr += ITEM_SUBTITLING_LEN;
-         }
-      break;
-
-      case DESCR_SAT_DEL_SYS:
-//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
-      {
-         descr_satellite_delivery_system_t *sds;
-         sds = (descr_satellite_delivery_system_t *) Ptr;
-         if (CheckBcdChar (sds->frequency1) && CheckBcdChar (sds->frequency2) &&
-             CheckBcdChar (sds->frequency3) && CheckBcdChar (sds->frequency4) &&
-             CheckBcdChar (sds->orbital_position1) &&
-             CheckBcdChar (sds->orbital_position2) &&
-             CheckBcdChar (sds->symbol_rate1) && CheckBcdChar (sds->symbol_rate1) &&
-             CheckBcdChar (sds->symbol_rate3) && (sds->fec_inner != 0) && (sds->modulation == 1))
-         {
-           CreateSatelliteDeliverySystemDescriptor (Descriptor, 
-            BcdCharToInt (sds->frequency1) * 10 * 1000 * 1000 +
-            BcdCharToInt (sds->frequency2) * 100 * 1000 +
-            BcdCharToInt (sds->frequency3) * 1000 +
-            BcdCharToInt (sds->frequency4) * 10,
-            (sds->west_east_flag ? 1 : -1) *
-            (BcdCharToInt (sds->orbital_position1) * 100 +
-            BcdCharToInt (sds->orbital_position2)),
-            sds->modulation,
-            sds->polarization,
-            BcdCharToInt (sds->symbol_rate1) * 10 * 1000 +
-            BcdCharToInt (sds->symbol_rate2) * 100 +
-            BcdCharToInt (sds->symbol_rate3),
-            sds->fec_inner);
-         }
-         /* else
-         {
-            fprintf (stderr, "Illegal sds descriptor\n");
-            siDumpDescriptor (Buffer);
-         } */
-      }
-      break;
-
-      case DESCR_CABLE_DEL_SYS:
-//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
-      {
-         descr_cable_delivery_system_t *cds;
-         cds = (descr_cable_delivery_system_t *) Ptr;
-         if (CheckBcdChar (cds->frequency1) && CheckBcdChar (cds->frequency2) &&
-             CheckBcdChar (cds->frequency3) && CheckBcdChar (cds->frequency4) &&
-             CheckBcdChar (cds->symbol_rate1) && CheckBcdChar (cds->symbol_rate1) &&
-             CheckBcdChar (cds->symbol_rate3) && (cds->fec_inner != 0))
-         {
-           CreateCableDeliverySystemDescriptor (Descriptor,
-            BcdCharToInt (cds->frequency1) * 100 * 1000 * 1000 +
-            BcdCharToInt (cds->frequency2) * 1000 * 1000 +
-            BcdCharToInt (cds->frequency3) * 10 * 1000 +
-            BcdCharToInt (cds->frequency4) * 100,
-            BcdCharToInt (cds->symbol_rate1) * 10 * 1000 +
-            BcdCharToInt (cds->symbol_rate2) * 100 +
-            BcdCharToInt (cds->symbol_rate3),
-            cds->fec_outer,
-            cds->fec_inner,
-            cds->modulation
-           );
-         }
-         /* else
-         {
-            fprintf (stderr, "Illegal cds descriptor\n");
-            siDumpDescriptor (Buffer);
-         } */
-      }
-      break;
-
-      case DESCR_TERR_DEL_SYS:
-//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
-      {
-         descr_terrestrial_delivery_system_t *tds;
-         tds = (descr_terrestrial_delivery_system_t *) Ptr;
-         if (CheckBcdChar (tds->frequency1) && CheckBcdChar (tds->frequency2) &&
-             CheckBcdChar (tds->frequency3) && CheckBcdChar (tds->frequency4))
-         {
-           CreateTerrestrialDeliverySystemDescriptor (Descriptor,
-            BcdCharToInt (tds->frequency1) * 100 * 1000 * 1000 +
-            BcdCharToInt (tds->frequency2) * 1000 * 1000 +
-            BcdCharToInt (tds->frequency3) * 10 * 1000 +
-            BcdCharToInt (tds->frequency4) * 100,
-            tds->bandwidth,
-            tds->constellation,
-          tds->hierarchy,
-          tds->code_rate_HP,
-          tds->code_rate_LP,
-            tds->guard_interval,
-            tds->transmission_mode,
-            tds->other_frequency_flag
-           );
-         }
-         /* else
-         {
-            fprintf (stderr, "Illegal cds descriptor\n");
-            siDumpDescriptor (Buffer);
-         } */
-      }
-      break;
-
-      case DESCR_SERVICE_LIST:
-//         fprintf (stderr, "got descriptor 0x%x\n", GetDescriptorTag(Buffer));
-         CreateServiceListDescriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer) - DESCR_SERVICE_LIST_LEN;
-         Ptr += DESCR_SERVICE_LIST_LEN;
-         while (Length > 0)
-         {
-            AddServiceListEntry (Descriptor,
-                   HILO (CastServiceListDescriptorLoop(Ptr)->service_id),
-                   CastServiceListDescriptorLoop(Ptr)->service_type);
-            Length -= DESCR_SERVICE_LIST_LEN;
-            Ptr += DESCR_SERVICE_LIST_LEN;
-         }
-      break;
-
-      case DESCR_LOCAL_TIME_OFF:
-         CreateLocalTimeOffsetDescriptor (Descriptor);
-         Length = GetDescriptorLength (Buffer) - DESCR_LOCAL_TIME_OFFSET_LEN;
-         Ptr += DESCR_LOCAL_TIME_OFFSET_LEN;
-         while (Length > 0)
-         {
-            time_t ct, co, no;
-            ct = MjdToEpochTime (CastLocalTimeOffsetEntry(Ptr)->time_of_change_mjd) +
-                 BcdTimeToSeconds (CastLocalTimeOffsetEntry(Ptr)->time_of_change_time);
-            co = (BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->local_time_offset_h) * 3600 + 
-                 BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->local_time_offset_m) * 60) * 
-                 ((CastLocalTimeOffsetEntry(Ptr)->local_time_offset_polarity) ? -1 : 1); 
-            no = (BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->next_time_offset_h) * 3600 + 
-                 BcdCharToInt(CastLocalTimeOffsetEntry(Ptr)->next_time_offset_m) * 60) * 
-                 ((CastLocalTimeOffsetEntry(Ptr)->local_time_offset_polarity) ? -1 : 1); 
-            AddLocalTimeOffsetEntry (Descriptor,
-                   CastLocalTimeOffsetEntry(Ptr)->country_code1, 
-                   CastLocalTimeOffsetEntry(Ptr)->country_code2, 
-                   CastLocalTimeOffsetEntry(Ptr)->country_code3, 
-                   CastLocalTimeOffsetEntry(Ptr)->country_region_id, co, ct, no); 
-            Length -= LOCAL_TIME_OFFSET_ENTRY_LEN;
-            Ptr += LOCAL_TIME_OFFSET_ENTRY_LEN;
-         }
-      break;
-
-      case DESCR_VIDEO_STREAM:
-      case DESCR_AUDIO_STREAM:
-      case DESCR_HIERARCHY:
-      case DESCR_REGISTRATION:
-      case DESCR_DATA_STREAM_ALIGN:
-      case DESCR_TARGET_BACKGRID:
-      case DESCR_VIDEO_WINDOW:
-      case DESCR_SYSTEM_CLOCK:
-      case DESCR_MULTIPLEX_BUFFER_UTIL:
-      case DESCR_COPYRIGHT:
-      case DESCR_MAXIMUM_BITRATE:
-      case DESCR_PRIVATE_DATA_IND:
-      case DESCR_SMOOTHING_BUFFER:
-      case DESCR_STD:
-      case DESCR_IBP:
-      case DESCR_VBI_DATA:
-      case DESCR_VBI_TELETEXT:
-      case DESCR_MOSAIC:
-      case DESCR_TELEPHONE:
-      case DESCR_ML_NW_NAME:
-      case DESCR_ML_BQ_NAME:
-      case DESCR_ML_SERVICE_NAME:
-      case DESCR_ML_COMPONENT:
-      case DESCR_PRIV_DATA_SPEC:
-      case DESCR_SERVICE_MOVE:
-      case DESCR_SHORT_SMOOTH_BUF:
-      case DESCR_FREQUENCY_LIST:
-      case DESCR_PARTIAL_TP_STREAM:
-      case DESCR_DATA_BROADCAST:
-      case DESCR_CA_SYSTEM:
-      case DESCR_DATA_BROADCAST_ID:
-      case DESCR_TRANSPORT_STREAM:
-      case DESCR_DSNG:
-      case DESCR_PDC:
-      case DESCR_CELL_LIST:
-      case DESCR_CELL_FREQ_LINK:
-      case DESCR_ANNOUNCEMENT_SUPPORT:
-      default:
-//         fprintf (stderr, "Unsupported descriptor with tag = 0x%02X\n", GetDescriptorTag(Ptr));
-//         siDumpDescriptor (Buffer);
-         /* fprintf (stderr, "unsupported descriptor 0x%x\n",
-                              GetDescriptorTag(Buffer)); */
-      break;
-   }
-   if (Descriptor) xAddTail (Descriptors, Descriptor);
-   return;
-}
-
-
-/*
- *  ToDo:  ETSI conformal text definition
- */
-#define GDT_TEXT_DESCRIPTOR 0
-#define GDT_NAME_DESCRIPTOR 1
-char *siGetDescriptorTextHandler (u_char *, int , int );
-
-char *siGetDescriptorTextHandler (u_char *Buffer, int Length, int type)
-{
-   char *tmp, *result;
-   int i;
-
-   if ((Length < 0) || (Length > 4095))
-      return (xSetText ("text error"));
-/* ASSENIZATION: removing coding detection - suppose they are all ANSI */
-   // if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff))
-   {
-      xMemAlloc (Length+1, &result);
-      tmp = result;
-      for (i = 0; i < Length; i++)
-      {
-         if (*Buffer == 0) break;
-
-         if ((*Buffer >= ' ' && *Buffer <= '~') || (*Buffer == '\n') ||
-             (*Buffer >= 0xa0)) *tmp++ = *Buffer;
-         if (*Buffer == 0x8A) *tmp++ = '\n';
-         if ((*Buffer == 0x86 || *Buffer == 0x87) && !(GDT_NAME_DESCRIPTOR & type)) *tmp++ = ' ';
-         Buffer++;
-      }
-      *tmp = '\0';
-   }
-   /* else
-   {
-      switch (*Buffer)
-      {
-         case 0x01: result = xSetText ("Coding according to character table 1"); break;
-         case 0x02: result = xSetText ("Coding according to character table 2"); break;
-         case 0x03: result = xSetText ("Coding according to character table 3"); break;
-         case 0x04: result = xSetText ("Coding according to character table 4"); break;
-         case 0x10: result = xSetText ("Coding according to ISO/IEC 8859"); break;
-         case 0x11: result = xSetText ("Coding according to ISO/IEC 10646"); break;
-         case 0x12: result = xSetText ("Coding according to KSC 5601"); break;
-         default: result = xSetText ("Unknown coding"); break;
-      }
-   } */
-
-   return (result);
-}
-
-char *siGetDescriptorText (u_char *Buffer, int Length)
-{
-   return siGetDescriptorTextHandler (Buffer, Length, GDT_TEXT_DESCRIPTOR);
-}
-
-char *siGetDescriptorName (u_char *Buffer, int Length)
-{
-   return siGetDescriptorTextHandler (Buffer, Length, GDT_NAME_DESCRIPTOR);
-}
-
-
-// CRC32 lookup table for polynomial 0x04c11db7
-
-static u_long crc_table[256] = {
-	0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
-	0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
-	0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
-	0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-	0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
-	0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-	0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
-	0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-	0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
-	0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
-	0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-	0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-	0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
-	0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
-	0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
-	0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-	0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
-	0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
-	0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
-	0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-	0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-	0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
-	0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
-	0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-	0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
-	0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
-	0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
-	0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-	0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
-	0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
-	0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-	0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-	0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
-	0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
-	0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
-	0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
-	0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
-	0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
-	0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
-	0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-	0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-	0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
-	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
-
-static u_long crc32 (char *data, int len)
-{
-	register int i;
-	u_long crc = 0xffffffff;
-
-	for (i=0; i<len; i++)
-		crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
-
-	return crc;
-}
diff --git a/libdtv/libvdr/COPYING b/libdtv/libvdr/COPYING
deleted file mode 100644
index a43ea2126..000000000
--- a/libdtv/libvdr/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
deleted file mode 100644
index 6eebedd4e..000000000
--- a/libdtv/libvdr/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-##############################################################
-###                                                        ###
-### Makefile: local makefile for libvdr                    ###
-###                                                        ###
-##############################################################
-
-## $Revision: 1.3 $
-## $Date: 2001/10/06 15:33:46 $
-## $Author: hakenes $
-##
-##   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-##
-## libdtv is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## libdtv is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You may have received a copy of the GNU General Public License
-## along with libdtv; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-#
-#
-#
-CC ?= gcc
-CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
-         -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
-
-CFLAGS += -I../include
-
-AR = ar
-ARFLAGS = r
-RANLIB = ranlib
-RM = rm -f
-CP = cp
-
-VDRINCLUDE = libvdr.h
-VDRLIB = libvdr.a
-VDROBJS = libvdr.o
-
-all : $(VDRLIB)
-
-clean :
-	@echo "cleaning workspace..."
-	@$(RM) $(VDROBJS) $(VDRLIB)
-
-new : clean all
-
-$(VDRLIB) : $(VDROBJS)
-	@echo "updating library..."
-	@$(AR) $(ARFLAGS) $(VDRLIB) $(VDROBJS)
-	@$(RANLIB) $(VDRLIB)
-
-dist: all
-	@echo "distributing libvdr.a and libvdr.h..."
-	@$(CP) $(VDRLIB) ../lib
-	@$(CP) $(VDRINCLUDE) ../include
-    
diff --git a/libdtv/libvdr/libvdr.c b/libdtv/libvdr/libvdr.c
deleted file mode 100644
index 5f9012584..000000000
--- a/libdtv/libvdr/libvdr.c
+++ /dev/null
@@ -1,157 +0,0 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// libvdr.c: routines to parse the DVB-SI stream          ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.1 $
-// $Date: 2001/10/07 10:25:33 $
-// $Author: hakenes $
-//
-//   (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// libvdr is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libvdr is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libvdr; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-#include <liblx.h>
-#include <libsi.h>
-#include <si_tables.h>
-#include "libvdr.h"
-
-
-
-struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
-{
-   struct VdrProgramInfo      *VdrProgramInfo;
-   struct LIST                *Result, *EventList;
-   struct Event               *Event;
-   struct Descriptor          *Descriptor;
-   int GotVdrProgramInfo;
-   
-   if (!siBuffer) return (NULL);
-
-   if (!(EventList = siParseEIT (siBuffer))) return (NULL);
-
-   Result = xNewList (NULL);
-
-   xForeach (EventList, Event)
-   {
-      VdrProgramInfo = NULL;
-      GotVdrProgramInfo = 0;
-      
-      xForeach (Event->Descriptors, Descriptor)
-      {
-         if (!VdrProgramInfo)
-         {
-            CreateVdrProgramInfo(VdrProgramInfo,
-               Event->EventID, Event->TransportStreamID,
-               Event->ServiceID, Event->StartTime,
-               Event->Duration, Event->Status);
-         }
-         
-         switch (Descriptor->Tag)
-         {
-            case DESCR_SHORT_EVENT:
-            {
-               if (!xName(Descriptor) || !xName(Descriptor)[0])
-                  break;
-
-               VdrProgramInfo->ShortName =
-                  xSetText (xName (Descriptor));
-               VdrProgramInfo->ShortText =
-                  xSetText (((struct ShortEventDescriptor
-                     *)Descriptor)->Text);
-               memcpy (VdrProgramInfo->LanguageCode, ((struct
-                  ShortEventDescriptor *)Descriptor)->
-                  LanguageCode, 4);
-               GotVdrProgramInfo = 1;
-            }      
-            break;
-
-            case DESCR_TIME_SHIFTED_EVENT:
-            {
-               struct tm *StartTime;
-
-               VdrProgramInfo->ReferenceServiceID =
-                  ((struct TimeShiftedEventDescriptor
-                     *)Descriptor)->ReferenceServiceID;
-               VdrProgramInfo->ReferenceEventID =
-                  ((struct TimeShiftedEventDescriptor
-                     *)Descriptor)->ReferenceEventID;
-               GotVdrProgramInfo = 1;
-            }
-            break;
-
-            case DESCR_EXTENDED_EVENT:
-            {
-               struct ExtendedEventItem *Item;
-
-               if (xName (Descriptor))
-                  AddToText (xName (Descriptor),
-                     VdrProgramInfo->ExtendedName);
-               xForeach (((struct ExtendedEventDescriptor*)
-                  Descriptor)->Items, Item)
-               {
-                  AddItemToText (xName (Item),
-                     VdrProgramInfo->ExtendedText);
-                  AddItemToText (Item->Text,
-                     VdrProgramInfo->ExtendedText);
-               }
-            }
-            break;
-
-            case DESCR_CONTENT:
-            {
-               int i, j;
-
-               for (j = 0; j < ((struct ContentDescriptor*)
-                  Descriptor)->Amount; j++)
-               {
-                  VdrProgramInfo->ContentNibble1 =
-                     GetContentContentNibble1(Descriptor, j);
-                  VdrProgramInfo->ContentNibble2 =
-                     GetContentContentNibble2(Descriptor, j);
-               }
-            }
-            break;
-
-            case DESCR_PARENTAL_RATING:
-            {
-               struct ParentalRating *Rating;
-               
-               xForeach (((struct ParentalRatingDescriptor *)
-                           Descriptor)->Ratings, Rating)
-                  if (!strncmp (VdrProgramInfo->LanguageCode,
-                          Rating->LanguageCode, 3))
-                     VdrProgramInfo->Rating = Rating->Rating;
-            }
-            break;
-         }
-      }      
-      if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo);
-      else                   xMemFree (VdrProgramInfo);
-   }
-
-   return (Result);
-}
diff --git a/libdtv/libvdr/libvdr.h b/libdtv/libvdr/libvdr.h
deleted file mode 100644
index 421b2e719..000000000
--- a/libdtv/libvdr/libvdr.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// libvdr.h: definitions necessary for the libvdr package ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.4 $
-// $Date: 2001/10/06 15:33:46 $
-// $Author: hakenes $
-//
-//   (C) 1992-2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
-//
-// libvdr is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libvdr is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libvdr; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-#ifndef LIBVDR_H
-#define LIBVDR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct LIST *createVdrProgramInfos (unsigned char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-struct VdrProgramInfo {
-   struct NODE          Node;
-   int                  EventID;
-   int                  TransportStreamID;
-   int                  ServiceID;
-   time_t               StartTime;
-   time_t               Duration;
-   unsigned short       Status;
-   char                 LanguageCode[4];
-   unsigned short       Rating;
-   unsigned short       ContentNibble1;
-   unsigned short       ContentNibble2;
-   char                *ShortName;
-   char                *ShortText;
-   char                *ExtendedName;
-   char                *ExtendedText;
-   int                  ReferenceServiceID;
-   int                  ReferenceEventID;
-};
-
-
-#define CreateVdrProgramInfo(cinf, evid, tpid, svid, stst, dura, sta) \
-   do \
-   { \
-      xCreateNode (cinf, NULL); \
-      cinf->EventID = evid; \
-      cinf->TransportStreamID = tpid; \
-      cinf->ServiceID = svid; \
-      cinf->StartTime = stst; \
-      cinf->Duration = dura; \
-      cinf->Status = sta; \
-      cinf->LanguageCode[0] = 0; \
-      cinf->Rating = 0; \
-      cinf->ContentNibble1 = 0; \
-      cinf->ContentNibble2 = 0; \
-      cinf->ShortName = NULL; \
-      cinf->ShortText = NULL; \
-      cinf->ExtendedName = NULL; \
-      cinf->ExtendedText = NULL; \
-      cinf->ReferenceServiceID = 0; \
-      cinf->ReferenceEventID = 0; \
-   } while (0)
-
-#define AddToText(src, dest) \
-   do { \
-      if (dest) \
-      { \
-         char *tmbuf; \
-         xMemAlloc (strlen (src) + strlen (dest) + 4, &tmbuf); \
-         sprintf (tmbuf, "%s%s", (dest), (src)); \
-         xMemFree (dest); (dest) = tmbuf; \
-      } else { \
-         (dest) = xSetText (src); \
-      } \
-   } while (0)
-
-
-#define AddItemToText(src, dest) \
-   do { \
-      if (dest) \
-      { \
-         char *tmbuf; \
-         xMemAlloc (strlen (src) + strlen (dest) + 4, &tmbuf); \
-         sprintf (tmbuf, "%s|%s", (dest), (src)); \
-         xMemFree (dest); (dest) = tmbuf; \
-      } else { \
-         (dest) = xSetText (src); \
-      } \
-   } while (0)
-
-#endif
diff --git a/libsi/Makefile b/libsi/Makefile
new file mode 100644
index 000000000..613fbeee8
--- /dev/null
+++ b/libsi/Makefile
@@ -0,0 +1,52 @@
+#
+# Makefile for a libsi
+#
+# $Id: Makefile 1.2 2003/12/13 10:41:39 kls Exp $
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
+AR = ar
+ARFLAGS = ru
+RANLIB = ranlib
+
+### The directory environment:
+
+INCLUDES +=
+
+DEFINES +=
+
+LIBS +=
+
+### The object files (add further files here):
+
+OBJS = util.o si.o section.o descriptor.o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libsi.a
+
+libsi.a : $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.a *.so *.tgz core* *~
+
+dist:
+	tar cvzf libsi.tar.gz -C .. libsi/util.c libsi/si.c libsi/section.c libsi/descriptor.c \
+   libsi/util.h libsi/si.h libsi/section.h libsi/descriptor.h libsi/headers.h libsi/Makefile libsi/gendescr.pl
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
new file mode 100644
index 000000000..433d6802a
--- /dev/null
+++ b/libsi/descriptor.c
@@ -0,0 +1,635 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: descriptor.c 1.2 2003/12/13 10:42:05 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#include <string.h>
+#include "descriptor.h"
+
+namespace SI {
+
+void ShortEventDescriptor::Parse() {
+   unsigned int offset=0;
+   const descr_short_event *s;
+   data.setPointerAndOffset<const descr_short_event>(s, offset);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   name.setDataAndOffset(data+offset, s->event_name_length, offset);
+   const descr_short_event_mid *mid;
+   data.setPointerAndOffset<const descr_short_event_mid>(mid, offset);
+   text.setData(data+offset, mid->text_length);
+}
+
+int ExtendedEventDescriptor::getDescriptorNumber() {
+   return s->descriptor_number;
+}
+
+int ExtendedEventDescriptor::getLastDescriptorNumber() {
+   return s->last_descriptor_number;
+}
+
+void ExtendedEventDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_extended_event>(s, offset);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   itemLoop.setDataAndOffset(data+offset, s->length_of_items, offset);
+   const descr_extended_event_mid *mid;
+   data.setPointerAndOffset<const descr_extended_event_mid>(mid, offset);
+   text.setData(data+offset, mid->text_length);
+}
+
+void ExtendedEventDescriptor::Item::Parse() {
+   unsigned int offset=0;
+   const item_extended_event *first;
+   data.setPointerAndOffset<const item_extended_event>(first, offset);
+   itemDescription.setDataAndOffset(data+offset, first->item_description_length, offset);
+   const item_extended_event_mid *mid;
+   data.setPointerAndOffset<const item_extended_event_mid>(mid, offset);
+   item.setData(data+offset, mid->item_length);
+}
+
+int ExtendedEventDescriptors::getTextLength() {
+   int ret=0;
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
+      ret+=d->text.getLength()+1; //plus a blank
+      ExtendedEventDescriptor::Item item;
+      for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
+         item=d->itemLoop.getNext(it);
+         ret+=item.item.getLength();
+         ret+=item.itemDescription.getLength();
+         ret+=2; //the blanks
+      }
+   }
+   return ret;
+}
+
+//is there a case where this function does not return the same as getTextLength?
+int ExtendedEventDescriptors::getMaximumTextLength() {
+   int ret=0;
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
+      ret+=d->text.getLength()+1; //plus a blank
+      ret+=d->itemLoop.getLength();
+   }
+   return ret;
+}
+
+char *ExtendedEventDescriptors::getText() {
+   char *text=new char[getMaximumTextLength()];
+   return getText(text);
+}
+
+//appends the Strings of every Descriptor in the group
+char *ExtendedEventDescriptors::getText(char *buffer) {
+   int index=0, len;
+   char tempbuf[256];
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
+      d->text.getText(tempbuf);
+      len=strlen(tempbuf);
+      if (len) {
+         memcpy(buffer+index, tempbuf, len);
+         index+=len;
+      }
+
+      ExtendedEventDescriptor::Item item;
+      for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
+         item=d->itemLoop.getNext(it);
+
+         item.item.getText(tempbuf);
+         len=strlen(tempbuf);
+         if (len) {
+            memcpy(buffer+index, tempbuf, len);
+            index+=len;
+         }
+
+         item.itemDescription.getText(tempbuf);
+         len=strlen(tempbuf);
+         if (len) {
+            memcpy(buffer+index, tempbuf, len);
+            index+=len;
+         }
+      }
+   }
+   buffer[index]='\0';
+   return buffer;
+}
+
+int TimeShiftedEventDescriptor::getReferenceServiceId() const {
+   return HILO(s->reference_service_id);
+}
+
+int TimeShiftedEventDescriptor::getReferenceEventId() const {
+   return HILO(s->reference_event_id);
+}
+
+void TimeShiftedEventDescriptor::Parse() {
+   s=data.getData<const descr_time_shifted_event>();
+}
+
+void ContentDescriptor::Parse() {
+   //this descriptor is only a header and a loop
+   nibbleLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader));
+}
+
+int ContentDescriptor::Nibble::getContentNibbleLevel1() const {
+   return s->content_nibble_level_1;
+}
+
+int ContentDescriptor::Nibble::getContentNibbleLevel2() const {
+   return s->content_nibble_level_2;
+}
+
+int ContentDescriptor::Nibble::getUserNibble1() const {
+   return s->user_nibble_1;
+}
+
+int ContentDescriptor::Nibble::getUserNibble2() const {
+   return s->user_nibble_2;
+}
+
+void ContentDescriptor::Nibble::Parse() {
+   s=data.getData<const nibble_content>();
+}
+
+void ParentalRatingDescriptor::Parse() {
+   //this descriptor is only a header and a loop
+   ratingLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader));
+}
+
+int ParentalRatingDescriptor::Rating::getRating() const {
+   return s->rating;
+}
+
+void ParentalRatingDescriptor::Rating::Parse() {
+   s=data.getData<const parental_rating>();
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+}
+
+int CaDescriptor::getCaType() const {
+   return HILO(s->CA_type);
+}
+
+int CaDescriptor::getCaPid() const {
+   return HILO(s->CA_PID);
+}
+
+void CaDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_ca>(s, offset);
+   privateData.assign(data.getData(offset), getLength()-offset);
+}
+
+int StreamIdentifierDescriptor::getComponentTag() const {
+   return s->component_tag;
+}
+
+void StreamIdentifierDescriptor::Parse() {
+   s=data.getData<const descr_stream_identifier>();
+}
+
+void NetworkNameDescriptor::Parse() {
+   name.setData(data+sizeof(descr_network_name), getLength()-sizeof(descr_network_name));
+}
+
+void CaIdentifierDescriptor::Parse() {
+   identifiers.setData(data+sizeof(descr_ca_identifier), getLength()-sizeof(descr_ca_identifier));
+}
+
+int CarouselIdentifierDescriptor::getCarouselId() const {
+   return (HILO(s->carousel_id_hi) << 16) | HILO(s->carousel_id_lo);
+}
+
+int CarouselIdentifierDescriptor::getFormatId() const {
+   return s->FormatId;
+}
+
+void CarouselIdentifierDescriptor::Parse() {
+   s=data.getData<const descr_carousel_identifier>();
+}
+
+void ServiceListDescriptor::Parse() {
+   serviceLoop.setData(data+sizeof(descr_service_list), getLength()-sizeof(descr_service_list));
+}
+
+int ServiceListDescriptor::Service::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int ServiceListDescriptor::Service::getServiceType() const {
+   return s->service_type;
+}
+
+void ServiceListDescriptor::Service::Parse() {
+   s=data.getData<const descr_service_list_loop>();
+}
+
+int SatelliteDeliverySystemDescriptor::getFrequency() const {
+   return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo);
+}
+
+int SatelliteDeliverySystemDescriptor::getOrbitalPosition() const {
+   return HILO(s->orbital_position);
+}
+
+int SatelliteDeliverySystemDescriptor::getWestEastFlag() const {
+   return s->west_east_flag;
+}
+
+int SatelliteDeliverySystemDescriptor::getPolarization() const {
+   return s->polarization;
+}
+
+int SatelliteDeliverySystemDescriptor::getModulation() const {
+   return s->modulation;
+}
+
+int SatelliteDeliverySystemDescriptor::getSymbolRate() const {
+   return (HILO(s->symbol_rate_hi) << 12) | (s->symbol_rate_lo_1 << 4) | s->symbol_rate_lo_2;
+}
+
+int SatelliteDeliverySystemDescriptor::getFecInner() const {
+   return s->fec_inner;
+}
+
+void SatelliteDeliverySystemDescriptor::Parse() {
+   s=data.getData<const descr_satellite_delivery_system>();
+}
+
+int CableDeliverySystemDescriptor::getFrequency() const {
+   return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo);
+}
+
+int CableDeliverySystemDescriptor::getFecOuter() const {
+   return s->fec_outer;
+}
+
+int CableDeliverySystemDescriptor::getModulation() const {
+   return s->modulation;
+}
+
+int CableDeliverySystemDescriptor::getSymbolRate() const {
+   return (HILO(s->symbol_rate_hi) << 12) | (s->symbol_rate_lo_1 << 4) | s->symbol_rate_lo_2;
+}
+
+int CableDeliverySystemDescriptor::getFecInner() const {
+   return s->fec_inner;
+}
+
+void CableDeliverySystemDescriptor::Parse() {
+   s=data.getData<const descr_cable_delivery_system>();
+}
+
+int TerrestrialDeliverySystemDescriptor::getFrequency() const {
+   return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo);
+}
+
+int TerrestrialDeliverySystemDescriptor::getBandwidth() const {
+   return s->bandwidth;
+}
+
+int TerrestrialDeliverySystemDescriptor::getConstellation() const {
+   return s->constellation;
+}
+
+int TerrestrialDeliverySystemDescriptor::getHierarchy() const {
+   return s->hierarchy;
+}
+
+int TerrestrialDeliverySystemDescriptor::getCodeRateHP() const {
+   return s->code_rate_HP;
+}
+
+int TerrestrialDeliverySystemDescriptor::getCodeRateLP() const {
+   return s->code_rate_LP;
+}
+
+int TerrestrialDeliverySystemDescriptor::getGuardInterval() const {
+   return s->guard_interval;
+}
+
+int TerrestrialDeliverySystemDescriptor::getTransmissionMode() const {
+   return s->transmission_mode;
+}
+
+bool TerrestrialDeliverySystemDescriptor::getOtherFrequency() const {
+   return s->other_frequency_flag;
+}
+
+void TerrestrialDeliverySystemDescriptor::Parse() {
+   s=data.getData<const descr_terrestrial_delivery>();
+}
+
+int ServiceDescriptor::getServiceType() const {
+   return s->service_type;
+}
+
+void ServiceDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_service>(s, offset);
+   providerName.setDataAndOffset(data+offset, s->provider_name_length, offset);
+   const descr_service_mid *mid;
+   data.setPointerAndOffset<const descr_service_mid>(mid, offset);
+   serviceName.setData(data+offset, mid->service_name_length);
+}
+
+void NVODReferenceDescriptor::Parse() {
+   serviceLoop.setData(data+sizeof(descr_nvod_reference), getLength()-sizeof(descr_nvod_reference));
+}
+
+int NVODReferenceDescriptor::Service::getTransportStream() const {
+   return HILO(s->transport_stream_id);
+}
+
+int NVODReferenceDescriptor::Service::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+int NVODReferenceDescriptor::Service::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+void NVODReferenceDescriptor::Service::Parse() {
+   s=data.getData<const item_nvod_reference>();
+}
+
+int TimeShiftedServiceDescriptor::getReferenceServiceId() const {
+   return HILO(s->reference_service_id);
+}
+
+void TimeShiftedServiceDescriptor::Parse() {
+   s=data.getData<const descr_time_shifted_service>();
+}
+
+int ComponentDescriptor::getStreamContent() const {
+   return s->stream_content;
+}
+
+int ComponentDescriptor::getComponentType() const {
+   return s->component_type;
+}
+
+int ComponentDescriptor::getComponentTag() const {
+   return s->component_tag;
+}
+
+void ComponentDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_component>(s, offset);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   description.setData(data+offset, getLength()-offset);
+}
+
+void SubtitlingDescriptor::Parse() {
+   subtitlingLoop.setData(data+sizeof(descr_subtitling), getLength()-sizeof(descr_subtitling));
+}
+
+int SubtitlingDescriptor::Subtitling::getSubtitlingType() const {
+   return s->subtitling_type;
+}
+
+int SubtitlingDescriptor::Subtitling::getCompositionPageId() const {
+   return HILO(s->composition_page_id);
+}
+
+int SubtitlingDescriptor::Subtitling::getAncillaryPageId() const {
+   return HILO(s->ancillary_page_id);
+}
+
+void SubtitlingDescriptor::Subtitling::Parse() {
+   s=data.getData<const item_subtitling>();
+}
+
+int ServiceMoveDescriptor::getNewOriginalNetworkId() const {
+   return HILO(s->new_original_network_id);
+}
+
+int ServiceMoveDescriptor::getNewTransportStreamId() const {
+   return HILO(s->new_transport_stream_id);
+}
+
+int ServiceMoveDescriptor::getNewServiceId() const {
+   return HILO(s->new_service_id);
+}
+
+void ServiceMoveDescriptor::Parse() {
+   s=data.getData<const descr_service_move>();
+}
+
+int FrequencyListDescriptor::getCodingType() const {
+   return s->coding_type;
+}
+
+void FrequencyListDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_frequency_list>(s, offset);
+   frequencies.setData(data+offset, getLength()-offset);
+}
+
+void ServiceIdentifierDescriptor::Parse() {
+   textualServiceIdentifier.setData(data+sizeof(descr_service_identifier), getLength()-sizeof(descr_service_identifier));
+}
+
+void MultilingualNameDescriptor::Parse() {
+   nameLoop.setData(data+sizeof(descr_multilingual_network_name), getLength()-sizeof(descr_multilingual_network_name));
+}
+
+void MultilingualNameDescriptor::Name::Parse() {
+   unsigned int offset=0;
+   const entry_multilingual_name *s;
+   data.setPointerAndOffset<const entry_multilingual_name>(s, offset);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   name.setData(data+offset, s->text_length);
+}
+
+int MultilingualComponentDescriptor::getComponentTag() const {
+   return s->component_tag;
+}
+
+void MultilingualComponentDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_multilingual_component>(s, offset);
+   nameLoop.setData(data+sizeof(descr_multilingual_component), getLength()-sizeof(descr_multilingual_component));
+}
+
+void MultilingualServiceNameDescriptor::Parse() {
+   nameLoop.setData(data+sizeof(descr_multilingual_network_name), getLength()-sizeof(descr_multilingual_network_name));
+}
+
+void MultilingualServiceNameDescriptor::Name::Parse() {
+   unsigned int offset=0;
+   const entry_multilingual_name *s;
+   data.setPointerAndOffset<const entry_multilingual_name>(s, offset);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   providerName.setDataAndOffset(data+offset, s->text_length, offset);
+   const entry_multilingual_service_name_mid *mid;
+   data.setPointerAndOffset<const entry_multilingual_service_name_mid>(mid, offset);
+   name.setData(data+offset, mid->service_name_length);
+}
+
+void ApplicationSignallingDescriptor::Parse() {
+   entryLoop.setData(data+sizeof(descr_application_signalling), getLength()-sizeof(descr_application_signalling));
+}
+
+int ApplicationSignallingDescriptor::ApplicationEntryDescriptor::getApplicationType() const {
+   return HILO(s->application_type);
+}
+
+int ApplicationSignallingDescriptor::ApplicationEntryDescriptor::getAITVersionNumber() const {
+   return s->AIT_version_number;
+}
+
+void ApplicationSignallingDescriptor::ApplicationEntryDescriptor::Parse() {
+   s=data.getData<const application_signalling_entry>();
+}
+
+bool MHP_ApplicationDescriptor::isServiceBound() const {
+   return s->service_bound_flag;
+}
+
+int MHP_ApplicationDescriptor::getVisibility() const {
+   return s->visibility;
+}
+
+int MHP_ApplicationDescriptor::getApplicationPriority() const {
+   return s->application_priority;
+}
+
+void MHP_ApplicationDescriptor::Parse() {
+   unsigned int offset=0;
+   const descr_application *dapp;
+   data.setPointerAndOffset<const descr_application>(dapp, offset);
+   profileLoop.setDataAndOffset(data+offset, dapp->application_profiles_length, offset);
+   data.setPointerAndOffset<const descr_application_end>(s, offset);
+   transportProtocolLabels.setData(data+offset, getLength()-offset);
+}
+
+int MHP_ApplicationDescriptor::Profile::getApplicationProfile() const {
+      return HILO(s->application_profile);
+}
+
+int MHP_ApplicationDescriptor::Profile::getVersionMajor() const {
+      return s->version_major;
+}
+
+int MHP_ApplicationDescriptor::Profile::getVersionMinor() const {
+      return s->version_minor;
+}
+
+int MHP_ApplicationDescriptor::Profile::getVersionMicro() const {
+      return s->version_micro;
+}
+
+void MHP_ApplicationDescriptor::Profile::Parse() {
+   s=data.getData<application_profile_entry>();
+}
+
+void MHP_ApplicationNameDescriptor::Parse() {
+   nameLoop.setData(data+sizeof(descr_application_name), getLength()-sizeof(descr_application_name));
+}
+
+void MHP_ApplicationNameDescriptor::NameEntry::Parse() {
+   const descr_application_name_entry *s;
+   s=data.getData<const descr_application_name_entry>();
+   name.setData(data+sizeof(descr_application_name_entry), s->application_name_length);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+}
+
+int MHP_TransportProtocolDescriptor::getProtocolId() const {
+   return HILO(s->protocol_id);
+}
+
+int MHP_TransportProtocolDescriptor::getProtocolLabel() const {
+   return s->transport_protocol_label;
+}
+
+bool MHP_TransportProtocolDescriptor::isRemote() const {
+   return remote;
+}
+
+int MHP_TransportProtocolDescriptor::getComponentTag() const {
+   return componentTag;
+}
+
+void MHP_TransportProtocolDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_transport_protocol>(s, offset);
+   if (getProtocolId() == ObjectCarousel) {
+      const transport_via_oc *oc;
+      data.setPointerAndOffset<const transport_via_oc>(oc, offset);
+      remote=oc->remote;
+      if (remote) {
+         const transport_via_oc_remote_end *rem;
+         data.setPointerAndOffset<const transport_via_oc_remote_end>(rem, offset);
+         componentTag=rem->component_tag;
+      } else {
+         const transport_via_oc_end *rem;
+         data.setPointerAndOffset<const transport_via_oc_end>(rem, offset);
+         componentTag=rem->component_tag;
+      }
+   } else { //unimplemented
+      remote=false;
+      componentTag=-1;
+   }
+}
+
+void MHP_DVBJApplicationDescriptor::Parse() {
+   applicationLoop.setData(data+sizeof(descr_dvbj_application), getLength()-sizeof(descr_dvbj_application));
+}
+
+void MHP_DVBJApplicationDescriptor::ApplicationEntry::Parse() {
+   const descr_dvbj_application_entry *entry=data.getData<const descr_dvbj_application_entry>();
+   parameter.setData(data+sizeof(descr_dvbj_application_entry), entry->parameter_length);
+}
+
+void MHP_DVBJApplicationLocationDescriptor::Parse() {
+   unsigned int offset=0;
+   const descr_dvbj_application_location *first;
+   data.setPointerAndOffset<const descr_dvbj_application_location>(first, offset);
+   baseDirectory.setDataAndOffset(data+offset, first->base_directory_length, offset);
+   const descr_dvbj_application_location_mid *mid;
+   data.setPointerAndOffset<const descr_dvbj_application_location_mid>(mid, offset);
+   classPath.setDataAndOffset(data+offset, mid->classpath_extension_length, offset);
+   initialClass.setData(data+offset, getLength()-offset);
+}
+
+int MHP_ApplicationIconsDescriptor::getIconFlags() const {
+   return HILO(s->icon_flags);
+}
+
+void MHP_ApplicationIconsDescriptor::Parse() {
+   unsigned int offset=0;
+   const descr_application_icons_descriptor *first;
+   data.setPointerAndOffset<const descr_application_icons_descriptor>(first, offset);
+   iconLocator.setDataAndOffset(data+offset, first->icon_locator_length, offset);
+   data.setPointerAndOffset<const descr_application_icons_descriptor_end>(s, offset);
+}
+
+} //end of namespace
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
new file mode 100644
index 000000000..9abe1f01c
--- /dev/null
+++ b/libsi/descriptor.h
@@ -0,0 +1,477 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: descriptor.h 1.2 2003/12/13 10:42:08 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef LIBSI_DESCRIPTOR_H
+#define LIBSI_DESCRIPTOR_H
+
+#include "si.h"
+#include "headers.h"
+
+namespace SI {
+
+class ShortEventDescriptor : public Descriptor {
+public:
+   char languageCode[3];
+   String name; //name of the event
+   String text; //short description
+protected:
+   virtual void Parse();
+};
+
+class ExtendedEventDescriptor : public GroupDescriptor {
+public:
+   class Item : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(item_extended_event)+sizeof(item_extended_event_mid)+item.getLength()+itemDescription.getLength(); }
+      String item;
+      String itemDescription;
+   protected:
+      virtual void Parse();
+   };
+   char languageCode[3];
+   int getDescriptorNumber();
+   int getLastDescriptorNumber();
+   StructureLoop<Item> itemLoop;
+   String text;
+protected:
+   virtual void Parse();
+private:
+   const descr_extended_event *s;
+};
+
+class ExtendedEventDescriptors : public DescriptorGroup {
+public:
+     //don't use
+   int getTextLength();
+     //really fast
+   int getMaximumTextLength();
+   //same semantics as with SI::String
+   char *getText();
+   //buffer must at least be getTextLength(), getMaximumTextLength() is a good choice
+   char *getText(char *buffer);
+};
+
+class TimeShiftedEventDescriptor : public Descriptor {
+public:
+   int getReferenceServiceId() const;
+   int getReferenceEventId() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_time_shifted_event *s;
+};
+
+class ContentDescriptor : public Descriptor {
+public:
+   class Nibble : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(nibble_content); }
+      int getContentNibbleLevel1() const;
+      int getContentNibbleLevel2() const;
+      int getUserNibble1() const;
+      int getUserNibble2() const;
+   protected:
+      virtual void Parse();
+   private:
+      const nibble_content *s;
+   };
+   StructureLoop<Nibble> nibbleLoop;
+protected:
+   virtual void Parse();
+};
+
+class ParentalRatingDescriptor : public Descriptor {
+public:
+   class Rating : public LoopElement {
+   public:
+      char languageCode[3];
+      int getRating() const;
+      virtual int getLength() { return sizeof(parental_rating); }
+   protected:
+      virtual void Parse();
+   private:
+      const parental_rating *s;
+   };
+   StructureLoop<Rating> ratingLoop;
+protected:
+   virtual void Parse();
+};
+
+class CaDescriptor : public Descriptor {
+public:
+   int getCaType() const;
+   int getCaPid() const;
+   CharArray privateData;
+protected:
+   virtual void Parse();
+private:
+   const descr_ca *s;
+};
+
+class StreamIdentifierDescriptor : public Descriptor {
+public:
+   int getComponentTag() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_stream_identifier *s;
+};
+
+class NetworkNameDescriptor : public Descriptor {
+public:
+   String name;
+protected:
+   virtual void Parse();
+};
+
+class CaIdentifierDescriptor : public Descriptor {
+public:
+   TypeLoop<SixteenBit> identifiers;
+protected:
+   virtual void Parse();
+};
+
+class CarouselIdentifierDescriptor : public Descriptor {
+public:
+   int getCarouselId() const;
+   int getFormatId() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_carousel_identifier *s;
+};
+
+class BouquetNameDescriptor : public NetworkNameDescriptor {
+};
+
+class ServiceListDescriptor : public Descriptor {
+public:
+   class Service : public LoopElement {
+   public:
+      int getServiceId() const;
+      int getServiceType() const;
+   virtual int getLength() { return sizeof(descr_service_list_loop); }
+   protected:
+      virtual void Parse();
+   private:
+      const descr_service_list_loop *s;
+   };
+   StructureLoop<Service> serviceLoop;
+protected:
+   virtual void Parse();
+};
+
+class SatelliteDeliverySystemDescriptor : public Descriptor {
+public:
+   int getFrequency() const;
+   int getOrbitalPosition() const;
+   int getWestEastFlag() const;
+   int getPolarization() const;
+   int getModulation() const;
+   int getSymbolRate() const;
+   int getFecInner() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_satellite_delivery_system *s;
+};
+
+class CableDeliverySystemDescriptor : public Descriptor {
+public:
+   int getFrequency() const;
+   int getFecOuter() const;
+   int getModulation() const;
+   int getSymbolRate() const;
+   int getFecInner() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_cable_delivery_system *s;
+};
+
+class TerrestrialDeliverySystemDescriptor : public Descriptor {
+public:
+   int getFrequency() const;
+   int getBandwidth() const;
+   int getConstellation() const;
+   int getHierarchy() const;
+   int getCodeRateHP() const;
+   int getCodeRateLP() const;
+   int getGuardInterval() const;
+   int getTransmissionMode() const;
+   bool getOtherFrequency() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_terrestrial_delivery *s;
+};
+
+class ServiceDescriptor : public Descriptor {
+public:
+   int getServiceType() const;
+   String serviceName;
+   String providerName;
+protected:
+   virtual void Parse();
+private:
+   const descr_service *s;
+};
+
+class NVODReferenceDescriptor : public Descriptor {
+public:
+   class Service : public LoopElement {
+   public:
+      int getTransportStream() const;
+      int getOriginalNetworkId() const;
+      int getServiceId() const;
+      virtual int getLength() { return sizeof(item_nvod_reference); }
+   protected:
+      virtual void Parse();
+   private:
+      const item_nvod_reference *s;
+   };
+   StructureLoop<Service> serviceLoop;
+protected:
+   virtual void Parse();
+};
+
+class TimeShiftedServiceDescriptor : public Descriptor {
+public:
+   int getReferenceServiceId() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_time_shifted_service *s;
+};
+
+class ComponentDescriptor : public Descriptor {
+public:
+   int getStreamContent() const;
+   int getComponentType() const;
+   int getComponentTag() const;
+   char languageCode[3];
+   String description;
+protected:
+   virtual void Parse();
+private:
+   const descr_component *s;
+};
+
+class SubtitlingDescriptor : public Descriptor {
+public:
+   class Subtitling : public Descriptor {
+   public:
+      int getSubtitlingType() const;
+      int getCompositionPageId() const;
+      int getAncillaryPageId() const;
+      virtual int getLength() { return sizeof(item_nvod_reference); }
+   protected:
+      virtual void Parse();
+   private:
+      const item_subtitling *s;
+   };
+   StructureLoop<Subtitling> subtitlingLoop;
+protected:
+   virtual void Parse();
+};
+
+class ServiceMoveDescriptor : public Descriptor {
+public:
+   int getNewOriginalNetworkId() const;
+   int getNewTransportStreamId() const;
+   int getNewServiceId() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_service_move *s;
+};
+
+class FrequencyListDescriptor : public Descriptor {
+public:
+   int getCodingType() const;
+   TypeLoop<ThirtyTwoBit> frequencies;
+protected:
+   virtual void Parse();
+private:
+   const descr_frequency_list *s;
+};
+
+class ServiceIdentifierDescriptor : public Descriptor {
+public:
+   String textualServiceIdentifier;
+protected:
+   virtual void Parse();
+};
+
+//abstract base class
+class MultilingualNameDescriptor : public Descriptor {
+public:
+   class Name : public LoopElement {
+   public:
+      char languageCode[3];
+      String name;
+      virtual int getLength() { return sizeof(entry_multilingual_name)+name.getLength(); }
+   protected:
+      virtual void Parse();
+   };
+   StructureLoop<Name> nameLoop;
+protected:
+   virtual void Parse();
+};
+
+class MultilingualNetworkNameDescriptor : public MultilingualNameDescriptor {
+   //inherits nameLoop from MultilingualNameDescriptor
+};
+
+class MultilingualBouquetNameDescriptor : public MultilingualNameDescriptor {
+   //inherits nameLoop from MultilingualNameDescriptor
+};
+
+class MultilingualComponentDescriptor : public MultilingualNameDescriptor {
+public:
+   int getComponentTag() const;
+   //inherits nameLoop from MultilingualNameDescriptor
+protected:
+   virtual void Parse();
+private:
+   const descr_multilingual_component *s;
+};
+
+class MultilingualServiceNameDescriptor : public Descriptor {
+public:
+   class Name : public MultilingualNameDescriptor::Name {
+   public:
+      virtual int getLength() { return sizeof(entry_multilingual_name)+providerName.getLength()+sizeof(entry_multilingual_service_name_mid)+name.getLength(); }
+      String providerName;
+      //inherits name, meaning: service name;
+   protected:
+      virtual void Parse();
+   };
+   StructureLoop<Name> nameLoop;
+protected:
+   virtual void Parse();
+};
+
+//a descriptor currently unimplemented in this library
+class UnimplementedDescriptor : public Descriptor {
+protected:
+   virtual void Parse() {}
+};
+
+class ApplicationSignallingDescriptor : public Descriptor {
+public:
+   class ApplicationEntryDescriptor : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(application_signalling_entry); }
+      int getApplicationType() const;
+      int getAITVersionNumber() const;
+   protected:
+      virtual void Parse();
+   private:
+      const application_signalling_entry *s;
+   };
+   StructureLoop<ApplicationEntryDescriptor> entryLoop;
+protected:
+   virtual void Parse();
+};
+
+class MHP_ApplicationDescriptor : public Descriptor {
+public:
+   class Profile : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(application_profile_entry); }
+      int getApplicationProfile() const;
+      int getVersionMajor() const;
+      int getVersionMinor() const;
+      int getVersionMicro() const;
+   private:
+      const application_profile_entry *s;
+   protected:
+      virtual void Parse();
+   };
+   StructureLoop<Profile> profileLoop;
+   bool isServiceBound() const;
+   int getVisibility() const;
+   int getApplicationPriority() const;
+   TypeLoop<EightBit> transportProtocolLabels;
+private:
+   const descr_application_end *s;
+protected:
+   virtual void Parse();
+};
+
+class MHP_ApplicationNameDescriptor : public Descriptor {
+public:
+   class NameEntry : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(descr_application_name_entry)+name.getLength(); }
+      char languageCode[3];
+      String name;
+   protected:
+      virtual void Parse();
+   };
+   StructureLoop<NameEntry> nameLoop;
+protected:
+   virtual void Parse();
+};
+
+class MHP_TransportProtocolDescriptor : public Descriptor {
+public:
+   enum Protocol { ObjectCarousel = 0x01, IPviaDVB = 0x02, HTTPoverInteractionChannel = 0x03 };
+   int getProtocolId() const;
+   int getProtocolLabel() const;
+   bool isRemote() const;
+   int getComponentTag() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_transport_protocol *s;
+   bool remote;
+   int componentTag;
+};
+
+class MHP_DVBJApplicationDescriptor : public Descriptor {
+public:
+   class ApplicationEntry : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(descr_dvbj_application_entry)+parameter.getLength(); }
+      String parameter;
+   protected:
+      virtual void Parse();
+   };
+   StructureLoop<ApplicationEntry> applicationLoop;
+protected:
+   virtual void Parse();
+};
+
+class MHP_DVBJApplicationLocationDescriptor : public Descriptor {
+public:
+   String baseDirectory;
+   String classPath;
+   String initialClass;
+protected:
+   virtual void Parse();
+};
+
+class MHP_ApplicationIconsDescriptor : public Descriptor {
+public:
+   String iconLocator;
+   int getIconFlags() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_application_icons_descriptor_end *s;
+};
+
+} //end of namespace
+
+#endif //LIBSI_TABLE_H
diff --git a/libsi/gendescr.pl b/libsi/gendescr.pl
new file mode 100755
index 000000000..e2b206f7f
--- /dev/null
+++ b/libsi/gendescr.pl
@@ -0,0 +1,83 @@
+#!/usr/bin/perl
+
+# $Id: gendescr.pl 1.2 2003/12/13 10:40:53 kls Exp $
+
+print "Name (ohne ...Descriptor):";
+$name=<STDIN>;
+$name =~ s/\n$//;
+$inner = ($name =~ s/�$//);
+$name .= "Descriptor" unless ($inner);
+
+print "Struct:";
+$struct=<STDIN>;
+$struct =~ s/\n$//;
+
+mm:
+$index=0;
+$which=1;
+print "Variablen:";
+while ( <STDIN> ) {
+   if (/�/) {
+      goto vv;
+   } elsif (/�/) {
+      $which=1;
+      next;
+   }
+   $eingabe=$_;
+   $eingabe =~ s/(.{75,120} )/\1\n/g;
+   $eingabe =~ s/\n$//;
+   if ($which) {
+      $members[$index]=$eingabe;
+   } else {
+      $members_comments[$index]=$eingabe;
+      $index++;
+      print "Jep!\n";
+   }
+   $which= (! $which);
+}
+
+vv:
+$filename_h="tempdescr.h";
+$filename_c="tempdescr.c";
+schreib();
+
+sub schreib {
+   print "Danke.\n";
+   open(OUTPUT_H, ">>".$filename_h) or die "Could not open file!!";
+   open(OUTPUT_C, ">>".$filename_c) or die "Could not open file!!";
+
+   if ($inner) {
+      $offset="   ";
+   } else {
+      $offset="";
+   }
+   print(OUTPUT_H $offset."class ".$name);
+   if ($inner) {
+      print(OUTPUT_H " : public LoopElement {\n".$offset."public:");
+   } else {
+      print(OUTPUT_H " : public Descriptor {\n".$offset."public:");
+   }
+   #for ($i=0; $i<=$#vars;$i++) {
+   #   print (OUTPUT "/*\n".$vars_comments[$i]." */\n".$vars[$i].";\n\n\n");
+   #}
+   for ($i=0; $i<=$#members;$i++) {
+      print (OUTPUT_H "\n".$offset."   int get".$members[$i]."() const;");
+   }
+   print(OUTPUT_H "\n".$offset."virtual int getLength() { return sizeof(".$struct."); }") if ($inner);
+
+   print(OUTPUT_H "\n".$offset."protected:\n".$offset."   virtual void Parse();");
+   print(OUTPUT_H "\n".$offset."private:\n".$offset."   const ".$struct." *s;") if ($struct ne "");
+   print(OUTPUT_H "\n".$offset."};\n\n");
+   for ($i=0; $i<=$#members_comments;$i++) {
+      print (OUTPUT_C "int ".$name."::get".$members[$i]."() const {\n");
+      if ($members_comments[$i] =~ /^(.+)_hi$/) {
+         $varbase=$1;
+         print (OUTPUT_C "   return HILO(s->".$varbase.");\n}\n\n");
+      } else {
+         print (OUTPUT_C "   return s->".$members_comments[$i].";\n}\n\n");
+      }
+   }
+   print (OUTPUT_C "void ".$name."::Parse() {\n}\n\n");
+   print (OUTPUT_C "\n\n\n");
+   exit;
+}
diff --git a/libdtv/libsi/include/si_tables.h b/libsi/headers.h
similarity index 62%
rename from libdtv/libsi/include/si_tables.h
rename to libsi/headers.h
index 24c316de6..d5c11999f 100644
--- a/libdtv/libsi/include/si_tables.h
+++ b/libsi/headers.h
@@ -1,55 +1,73 @@
-//////////////////////////////////////////////////////////////
-///                                                        ///
-/// si_tables.h: definitions for data structures of the    ///
-///              incoming SI data stream                   ///
-///                                                        ///
-//////////////////////////////////////////////////////////////
-
-// $Revision: 1.4 $
-// $Date: 2003/02/04 18:45:36 $
-// $Author: hakenes $
-//
-//   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the
-//               GNU GPL with contribution of Oleg Assovski,
-//               www.satmania.com
-//
-// libsi is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// libsi is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You may have received a copy of the GNU General Public License
-// along with libsi; see the file COPYING.  If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-#define HILO(x) (x##_hi << 8 | x##_lo)
-
-#define MjdToEpochTime(x) (((x##_hi << 8 | x##_lo)-40587)*86400)
-#define BcdTimeToSeconds(x) ((3600 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
-                             (60 * ((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))) + \
-                             ((10*((x##_s & 0xF0)>>4)) + (x##_s & 0xF)))
-#define BcdTimeToMinutes(x) ((60 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
-                             (((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))))
-#define BcdCharToInt(x) (10*((x & 0xF0)>>4) + (x & 0xF))
-#define CheckBcdChar(x) ((((x & 0xF0)>>4) <= 9) && \
-                         ((x & 0x0F) <= 9))
-#define CheckBcdSignedChar(x) ((((x & 0xF0)>>4) >= 0) && (((x & 0xF0)>>4) <= 9) && \
-                         ((x & 0x0F) >= 0) && ((x & 0x0F) <= 9))
-
-#define TableHasMoreSections(x) (((pat_t *)(x))->last_section_number > ((pat_t *)(x))->section_number)
-#define GetTableId(x) ((pat_t *)(x))->table_id
-#define GetSectionNumber(x) ((pat_t *)(x))->section_number
-#define GetLastSectionNumber(x) ((pat_t *)(x))->last_section_number
-#define GetServiceId(x) (((eit_t *)(x))->service_id_hi << 8) | ((eit_t *)(x))->service_id_lo
-#define GetSegmentLastSectionNumber(x) ((eit_t *)(x))->segment_last_section_number
-#define GetLastTableId(x) ((eit_t *)(x))->segment_last_table_id
-#define GetSectionLength(x) HILO(((pat_t *)(x))->section_length)
+/***************************************************************************
+ *                                                                         *
+ *   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the              *
+ *               GNU GPL with contribution of Oleg Assovski,               *
+ *               www.satmania.com                                          *
+ *               Adapted and extended by Marcel Wiesweg                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: headers.h 1.2 2003/12/13 10:43:26 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef LIBSI_HEADERS_H
+#define LIBSI_HEADERS_H
+
+#include <endian.h>
+
+namespace SI {
+
+typedef unsigned char u_char;
+
+struct SectionHeader {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+};
+
+struct ExtendedSectionHeader {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char table_id_extension_hi                  :8;
+   u_char table_id_extension_lo                  :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+};
+
+struct DescriptorHeader {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
 
 /*
  *
@@ -70,7 +88,7 @@
 
 #define PAT_LEN 8
 
-typedef struct {
+struct pat {
    u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
@@ -97,11 +115,11 @@ typedef struct {
 #endif
    u_char section_number                         :8;
    u_char last_section_number                    :8;
-} pat_t;
+};
 
 #define PAT_PROG_LEN 4
 
-typedef struct {
+struct pat_prog {
    u_char program_number_hi                      :8;
    u_char program_number_lo                      :8;
 #if BYTE_ORDER == BIG_ENDIAN
@@ -111,9 +129,9 @@ typedef struct {
    u_char network_pid_hi                         :5;
    u_char                                        :3;
 #endif
-   u_char network_pid_lo                         :8; 
+   u_char network_pid_lo                         :8;
    /* or program_map_pid (if prog_num=0)*/
-} pat_prog_t;
+};
 
 /*
  *
@@ -127,7 +145,7 @@ typedef struct {
  */
 #define CAT_LEN 8
 
-typedef struct {
+struct cat {
    u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
@@ -154,7 +172,7 @@ typedef struct {
 #endif
    u_char section_number                         :8;
    u_char last_section_number                    :8;
-} cat_t;
+};
 
 /*
  *
@@ -168,7 +186,7 @@ typedef struct {
 
 #define PMT_LEN 12
 
-typedef struct {
+struct pmt {
    u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
@@ -212,11 +230,11 @@ typedef struct {
 #endif
    u_char program_info_length_lo                 :8;
    //descriptors
-} pmt_t;
+};
 
 #define PMT_INFO_LEN 5
 
-typedef struct {
+struct pmt_info {
    u_char stream_type                            :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char                                        :3;
@@ -235,7 +253,7 @@ typedef struct {
 #endif
    u_char ES_info_length_lo                      :8;
    // descriptors
-} pmt_info_t;
+};
 
 /*
  *
@@ -247,80 +265,80 @@ typedef struct {
  *
  */
 
-#define NIT_LEN 10 
+#define NIT_LEN 10
 
-typedef struct { 
-   u_char table_id                               :8; 
+struct nit {
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char section_syntax_indicator               :1; 
-   u_char                                        :3; 
-   u_char section_length_hi                      :4; 
-#else 
-   u_char section_length_hi                      :4; 
-   u_char                                        :3; 
-   u_char section_syntax_indicator               :1; 
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
 #endif
-   u_char section_length_lo                      :8; 
-   u_char network_id_hi                          :8; 
-   u_char network_id_lo                          :8; 
+   u_char section_length_lo                      :8;
+   u_char network_id_hi                          :8;
+   u_char network_id_lo                          :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :2; 
-   u_char version_number                         :5; 
-   u_char current_next_indicator                 :1; 
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
 #else
-   u_char current_next_indicator                 :1; 
-   u_char version_number                         :5; 
-   u_char                                        :2; 
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
 #endif
-   u_char section_number                         :8; 
-   u_char last_section_number                    :8; 
-#if BYTE_ORDER == BIG_ENDIAN 
-   u_char                                        :4; 
-   u_char network_descriptor_length_hi           :4; 
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char network_descriptor_length_hi           :4;
 #else
-   u_char network_descriptor_length_hi           :4; 
-   u_char                                        :4; 
+   u_char network_descriptor_length_hi           :4;
+   u_char                                        :4;
 #endif
-   u_char network_descriptor_length_lo           :8; 
+   u_char network_descriptor_length_lo           :8;
   /* descriptors */
-} nit_t; 
- 
-#define SIZE_NIT_MID 2 
+};
+
+#define SIZE_NIT_MID 2
 
-typedef struct {                                 // after descriptors 
+struct nit_mid {                                 // after descriptors
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :4; 
-   u_char transport_stream_loop_length_hi        :4; 
+   u_char                                        :4;
+   u_char transport_stream_loop_length_hi        :4;
 #else
-   u_char transport_stream_loop_length_hi        :4; 
-   u_char                                        :4; 
+   u_char transport_stream_loop_length_hi        :4;
+   u_char                                        :4;
 #endif
-   u_char transport_stream_loop_length_lo        :8; 
-} nit_mid_t; 
- 
-#define SIZE_NIT_END 4 
-
-struct nit_end_struct { 
-   long CRC; 
-}; 
- 
-#define NIT_TS_LEN 6 
-
-typedef struct { 
-   u_char transport_stream_id_hi                 :8; 
-   u_char transport_stream_id_lo                 :8; 
-   u_char original_network_id_hi                 :8; 
-   u_char original_network_id_lo                 :8; 
+   u_char transport_stream_loop_length_lo        :8;
+};
+
+#define SIZE_NIT_END 4
+
+struct nit_end {
+   long CRC;
+};
+
+#define NIT_TS_LEN 6
+
+struct ni_ts {
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :4; 
-   u_char transport_descriptors_length_hi        :4; 
-#else  
-   u_char transport_descriptors_length_hi        :4; 
-   u_char                                        :4; 
+   u_char                                        :4;
+   u_char transport_descriptors_length_hi        :4;
+#else
+   u_char transport_descriptors_length_hi        :4;
+   u_char                                        :4;
 #endif
-   u_char transport_descriptors_length_lo        :8; 
+   u_char transport_descriptors_length_lo        :8;
    /* descriptors  */
-} nit_ts_t;
+};
 
 /*
  *
@@ -351,7 +369,7 @@ typedef struct {
 
 #define SDT_LEN 11
 
-typedef struct {
+struct sdt {
    u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
@@ -379,14 +397,14 @@ typedef struct {
    u_char original_network_id_hi                 :8;
    u_char original_network_id_lo                 :8;
    u_char                                        :8;
-} sdt_t;
+};
 
 #define GetSDTTransportStreamId(x) (HILO(((sdt_t *) x)->transport_stream_id))
 #define GetSDTOriginalNetworkId(x) (HILO(((sdt_t *) x)->original_network_id))
 
 #define SDT_DESCR_LEN 5
 
-typedef struct {
+struct sdt_descr {
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
 #if BYTE_ORDER == BIG_ENDIAN
@@ -405,12 +423,12 @@ typedef struct {
    u_char running_status                         :3;
 #endif
    u_char descriptors_loop_length_lo             :8;
-} sdt_descr_t;
+};
 
 /*
  *
  *    3) Event Information Table (EIT):
- * 
+ *
  *       - the EIT contains data concerning events or programmes such as event
  *         name, start time, duration, etc.; - the use of different descriptors
  *         allows the transmission of different kinds of event information e.g.
@@ -420,7 +438,7 @@ typedef struct {
 
 #define EIT_LEN 14
 
-typedef struct {
+struct eit {
    u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
@@ -451,11 +469,11 @@ typedef struct {
    u_char original_network_id_lo                 :8;
    u_char segment_last_section_number            :8;
    u_char segment_last_table_id                  :8;
-} eit_t;
+};
 
 #define EIT_EVENT_LEN 12
 
-typedef struct {
+struct eit_event {
    u_char event_id_hi                            :8;
    u_char event_id_lo                            :8;
    u_char mjd_hi                                 :8;
@@ -476,7 +494,7 @@ typedef struct {
    u_char running_status                         :3;
 #endif
    u_char descriptors_loop_length_lo             :8;
-} eit_event_t;
+};
 
 /*
  *
@@ -487,7 +505,39 @@ typedef struct {
  *         events.
  *
  */
-    /* TO BE DONE */
+
+struct rst {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+};
+
+struct rst_info {
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+   u_char event_id_hi                            :8;
+   u_char event_id_lo                            :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :5;
+   u_char running_status                         :3;
+#else
+   u_char running_status                         :3;
+   u_char                                        :5;
+#endif
+};
+
 /*
  *
  *    5) Time and Date Table (TDT):
@@ -500,8 +550,8 @@ typedef struct {
 
 #define TDT_LEN 8
 
-typedef struct {
-   u_char table_id                               :8; 
+struct tdt {
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
    u_char                                        :3;
@@ -517,7 +567,7 @@ typedef struct {
    u_char utc_time_h                             :8;
    u_char utc_time_m                             :8;
    u_char utc_time_s                             :8;
-} tdt_t;
+};
 
 /*
  *
@@ -530,8 +580,8 @@ typedef struct {
  */
 #define TOT_LEN 10
 
-typedef struct {
-   u_char table_id                               :8; 
+struct tot {
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
    u_char                                        :3;
@@ -555,8 +605,7 @@ typedef struct {
    u_char                                        :4;
 #endif
    u_char descriptors_loop_length_lo             :8;
-} tot_t;
-
+};
 
 /*
  *
@@ -589,6 +638,96 @@ typedef struct {
  *
  */
     /* TO BE DONE */
+
+/*
+ *
+ *    3) Application Information Table (AIT):
+ *
+ *       - the AIT contains data concerning MHP application broadcast by a service.
+ *
+ */
+
+#define AIT_LEN 10
+
+struct ait {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char application_type_hi                    :8;
+   u_char application_type_lo                    :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char common_descriptors_length_hi           :4;
+#else
+   u_char common_descriptors_length_hi           :4;
+   u_char                                        :4;
+#endif
+   u_char common_descriptors_length_lo           :8;
+};
+
+#define SIZE_AIT_MID 2
+
+struct ait_mid {                                 // after descriptors
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char application_loop_length_hi             :4;
+#else
+   u_char application_loop_length_hi             :4;
+   u_char                                        :4;
+#endif
+   u_char application_loop_length_lo             :8;
+};
+
+#define SIZE_AIT_END 4
+
+struct ait_end {
+   long CRC;
+};
+
+#define AIT_APP_LEN 9
+
+struct ait_app {
+   //how to deal with 32 bit fields?
+
+   u_char organisation_id_hi_hi                  :8;
+   u_char organisation_id_hi_lo                  :8;
+   u_char organisation_id_lo_hi                  :8;
+   u_char organisation_id_lo_lo                  :8;
+
+   //long organisation_id                          :32;
+   u_char application_id_hi                      :8;
+   u_char application_id_lo                      :8;
+   u_char application_control_code               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char application_descriptors_length_hi      :4;
+#else
+   u_char application_descriptors_length_hi      :4;
+   u_char                                        :4;
+#endif
+   u_char application_descriptors_length_lo      :8;
+   /* descriptors  */
+};
+
 /*
  *
  *    The following describes the different descriptors that can be used within
@@ -609,20 +748,18 @@ typedef struct {
  */
 
 #define DESCR_GEN_LEN 2
-typedef struct descr_gen_struct {
+struct descr_gen {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_gen_t;
-#define CastGenericDescriptor(x) ((descr_gen_t *)(x))
+};
 
 #define GetDescriptorTag(x) (((descr_gen_t *) x)->descriptor_tag)
 #define GetDescriptorLength(x) (((descr_gen_t *) x)->descriptor_length+DESCR_GEN_LEN)
 
-
 /* 0x09 ca_descriptor */
 
 #define DESCR_CA_LEN 6
-typedef struct descr_ca_struct {
+struct descr_ca {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char CA_type_hi                             :8;
@@ -635,73 +772,77 @@ typedef struct descr_ca_struct {
    u_char reserved                               :3;
 #endif
    u_char CA_PID_lo                              :8;
-} descr_ca_t;
-#define CastCaDescriptor(x) ((descr_ca_t *)(x))
+};
 
 /* 0x0A iso_639_language_descriptor */
 
 #define DESCR_ISO_639_LANGUAGE_LEN 5
-typedef struct descr_iso_639_language_struct {
+struct descr_iso_639_language {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
-} descr_iso_639_language_t;
-#define CastIso639LanguageDescriptor(x) ((descr_iso_639_language_t *)(x))
+};
+
+/* 0x13 carousel_identifier_descriptor */
 
+#define DESCR_CAROUSEL_IDENTIFIER_LEN 7
+struct descr_carousel_identifier {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char carousel_id_hi_hi                      :8;
+   u_char carousel_id_hi_lo                      :8;
+   u_char carousel_id_lo_hi                      :8;
+   u_char carousel_id_lo_lo                      :8;
+   u_char FormatId                               :8;
+   /* FormatSpecifier follows */
+};
 
 /* 0x40 network_name_descriptor */
 
 #define DESCR_NETWORK_NAME_LEN 2
-typedef struct descr_network_name_struct {
+struct descr_network_name {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_network_name_t;
-#define CastNetworkNameDescriptor(x) ((descr_network_name_t *)(x))
-
+};
 
 /* 0x41 service_list_descriptor */
 
 #define DESCR_SERVICE_LIST_LEN 2
-typedef struct descr_service_list_struct {
+struct descr_service_list {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_service_list_t;
-#define CastServiceListDescriptor(x) ((descr_service_list_t *)(x))
+};
 
 #define DESCR_SERVICE_LIST_LOOP_LEN 3
-typedef struct descr_service_list_loop_struct {
+struct descr_service_list_loop {
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
    u_char service_type                           :8;
-} descr_service_list_loop_t;
-#define CastServiceListDescriptorLoop(x) ((descr_service_list_loop_t *)(x))
-
+};
 
 /* 0x42 stuffing_descriptor */
 
 #define DESCR_STUFFING_LEN XX
-typedef struct descr_stuffing_struct {
+struct descr_stuffing {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_stuffing_t;
-#define CastStuffingDescriptor(x) ((descr_stuffing_t *)(x))
-
+};
 
 /* 0x43 satellite_delivery_system_descriptor */
 
 #define DESCR_SATELLITE_DELIVERY_SYSTEM_LEN 13
-typedef struct descr_satellite_delivery_system_struct {
+struct descr_satellite_delivery_system {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   u_char frequency1                             :8;
-   u_char frequency2                             :8;
-   u_char frequency3                             :8;
-   u_char frequency4                             :8;
-   u_char orbital_position1                      :8;
-   u_char orbital_position2                      :8;
+   u_char frequency_hi_hi                        :8;
+   u_char frequency_hi_lo                        :8;
+   u_char frequency_lo_hi                        :8;
+   u_char frequency_lo_lo                        :8;
+   u_char orbital_position_hi                    :8;
+   u_char orbital_position_lo                    :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char west_east_flag                         :1;
    u_char polarization                           :2;
@@ -711,30 +852,28 @@ typedef struct descr_satellite_delivery_system_struct {
    u_char polarization                           :2;
    u_char west_east_flag                         :1;
 #endif
-   u_char symbol_rate1                           :8;
-   u_char symbol_rate2                           :8;
-   u_char symbol_rate3                           :8;
+   u_char symbol_rate_hi_hi                      :8;
+   u_char symbol_rate_hi_lo                      :8;
+   u_char symbol_rate_lo_1                       :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char symbol_rate4                           :4;
+   u_char symbol_rate_lo_2                       :4;
    u_char fec_inner                              :4;
 #else
    u_char fec_inner                              :4;
-   u_char symbol_rate4                           :4;
+   u_char symbol_rate_lo_2                       :4;
 #endif
-} descr_satellite_delivery_system_t;
-#define CastSatelliteDeliverySystemDescriptor(x) ((descr_satellite_delivery_system_t *)(x))
-
+};
 
 /* 0x44 cable_delivery_system_descriptor */
 
 #define DESCR_CABLE_DELIVERY_SYSTEM_LEN 13
-typedef struct descr_cable_delivery_system_struct {
+struct descr_cable_delivery_system {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   u_char frequency1                             :8;
-   u_char frequency2                             :8;
-   u_char frequency3                             :8;
-   u_char frequency4                             :8;
+   u_char frequency_hi_hi                        :8;
+   u_char frequency_hi_lo                        :8;
+   u_char frequency_lo_hi                        :8;
+   u_char frequency_lo_lo                        :8;
    u_char reserved1                              :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char reserved2                              :4;
@@ -744,68 +883,62 @@ typedef struct descr_cable_delivery_system_struct {
    u_char reserved2                              :4;
 #endif
    u_char modulation                             :8;
-   u_char symbol_rate1                           :8;
-   u_char symbol_rate2                           :8;
-   u_char symbol_rate3                           :8;
+   u_char symbol_rate_hi_hi                      :8;
+   u_char symbol_rate_hi_lo                      :8;
+   u_char symbol_rate_lo_1                       :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char symbol_rate4                           :4;
+   u_char symbol_rate_lo_2                       :4;
    u_char fec_inner                              :4;
 #else
    u_char fec_inner                              :4;
-   u_char symbol_rate4                           :4;
+   u_char symbol_rate_lo_2                       :4;
 #endif
-} descr_cable_delivery_system_t;
-#define CastCableDeliverySystemDescriptor(x) ((descr_cable_delivery_system_t *)(x))
-
+};
 
 /* 0x45 vbi_data_descriptor */
 
 #define DESCR_VBI_DATA_LEN XX
-typedef struct descr_vbi_data_struct {
+struct descr_vbi_data {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_vbi_data_t;
-#define CastVbiDataDescriptor(x) ((descr_vbi_data_t *)(x))
-
+};
 
 /* 0x46 vbi_teletext_descriptor */
 
 #define DESCR_VBI_TELETEXT_LEN XX
-typedef struct descr_vbi_teletext_struct {
+struct descr_vbi_teletext {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_vbi_teletext_t;
-#define CastVbiDescriptor(x) ((descr_vbi_teletext_t *)(x))
-
+};
 
 /* 0x47 bouquet_name_descriptor */
 
 #define DESCR_BOUQUET_NAME_LEN 2
-typedef struct descr_bouquet_name_struct {
+struct descr_bouquet_name {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_bouquet_name_t;
-#define CastBouquetNameDescriptor(x) ((descr_bouquet_name_t *)(x))
-
+};
 
 /* 0x48 service_descriptor */
 
 #define DESCR_SERVICE_LEN  4
-typedef struct descr_service_struct {
+struct descr_service {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char service_type                           :8;
    u_char provider_name_length                   :8;
-} descr_service_t;
-#define CastServiceDescriptor(x) ((descr_service_t *)(x))
+};
 
+struct descr_service_mid {
+   u_char service_name_length                   :8;
+};
 
 /* 0x49 country_availability_descriptor */
 
 #define DESCR_COUNTRY_AVAILABILITY_LEN 3
-typedef struct descr_country_availability_struct {
+struct descr_country_availability {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
 #if BYTE_ORDER == BIG_ENDIAN
@@ -815,79 +948,71 @@ typedef struct descr_country_availability_struct {
    u_char reserved                               :7;
    u_char country_availability_flag              :1;
 #endif
-} descr_country_availability_t;
-#define CastCountryAvailabilityDescriptor(x) ((descr_country_availability_t *)(x))
-
+};
 
 /* 0x4A linkage_descriptor */
 
 #define DESCR_LINKAGE_LEN 9
-typedef struct descr_linkage_struct {
+struct descr_linkage {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char transport_stream_id_hi                 :8;
    u_char transport_stream_id_lo                 :8;
-   u_char original_network_id_hi                 :8; 
-   u_char original_network_id_lo                 :8; 
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
    u_char linkage_type                           :8;
-} descr_linkage_t;
-#define CastLinkageDescriptor(x) ((descr_linkage_t *)(x))
-
+};
 
 /* 0x4B nvod_reference_descriptor */
 
 #define DESCR_NVOD_REFERENCE_LEN 2
-typedef struct descr_nvod_reference_struct {
+struct descr_nvod_reference {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_nvod_reference_t;
-#define CastNvodReferenceDescriptor(x) ((descr_nvod_reference_t *)(x))
+};
 
 #define ITEM_NVOD_REFERENCE_LEN 6
-typedef struct item_nvod_reference_struct {
+struct item_nvod_reference {
    u_char transport_stream_id_hi                 :8;
    u_char transport_stream_id_lo                 :8;
-   u_char original_network_id_hi                 :8; 
-   u_char original_network_id_lo                 :8; 
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
-} item_nvod_reference_t;
-#define CastNvodReferenceItem(x) ((item_nvod_reference_t *)(x))
-
-
+};
 
 /* 0x4C time_shifted_service_descriptor */
 
 #define DESCR_TIME_SHIFTED_SERVICE_LEN 4
-typedef struct descr_time_shifted_service_struct {
+struct descr_time_shifted_service {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char reference_service_id_hi                :8;
    u_char reference_service_id_lo                :8;
-} descr_time_shifted_service_t;
-#define CastTimeShiftedServiceDescriptor(x) ((descr_time_shifted_service_t *)(x))
-
+};
 
 /* 0x4D short_event_descriptor */
 
 #define DESCR_SHORT_EVENT_LEN 6
-typedef struct descr_short_event_struct {
+struct descr_short_event {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
    u_char event_name_length                      :8;
-} descr_short_event_t;
-#define CastShortEventDescriptor(x) ((descr_short_event_t *)(x))
+};
 
+struct descr_short_event_mid {
+   u_char text_length                      :8;
+};
 
 /* 0x4E extended_event_descriptor */
 
 #define DESCR_EXTENDED_EVENT_LEN 7
-typedef struct descr_extended_event_struct {
+struct descr_extended_event {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
@@ -902,34 +1027,37 @@ typedef struct descr_extended_event_struct {
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
    u_char length_of_items                        :8;
-} descr_extended_event_t;
-#define CastExtendedEventDescriptor(x) ((descr_extended_event_t *)(x))
+};
+
+struct descr_extended_event_mid {
+   u_char text_length                            :8;
+};
 
 #define ITEM_EXTENDED_EVENT_LEN 1
-typedef struct item_extended_event_struct {
-   u_char item_description_length               :8;
-} item_extended_event_t;
-#define CastExtendedEventItem(x) ((item_extended_event_t *)(x))
+struct item_extended_event {
+   u_char item_description_length                :8;
+};
 
+struct item_extended_event_mid {
+   u_char item_length                            :8;
+};
 
 /* 0x4F time_shifted_event_descriptor */
 
 #define DESCR_TIME_SHIFTED_EVENT_LEN 6
-typedef struct descr_time_shifted_event_struct {
+struct descr_time_shifted_event {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char reference_service_id_hi                :8;
    u_char reference_service_id_lo                :8;
    u_char reference_event_id_hi                  :8;
    u_char reference_event_id_lo                  :8;
-} descr_time_shifted_event_t;
-#define CastTimeShiftedEventDescriptor(x) ((descr_time_shifted_event_t *)(x))
-
+};
 
 /* 0x50 component_descriptor */
 
 #define DESCR_COMPONENT_LEN  8
-typedef struct descr_component_struct {
+struct descr_component {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
 #if BYTE_ORDER == BIG_ENDIAN
@@ -944,134 +1072,117 @@ typedef struct descr_component_struct {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
-} descr_component_t;
-#define CastComponentDescriptor(x) ((descr_component_t *)(x))
-
+};
 
 /* 0x51 mosaic_descriptor */
 
 #define DESCR_MOSAIC_LEN XX
-typedef struct descr_mosaic_struct {
+struct descr_mosaic {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_mosaic_t;
-#define CastMosaicDescriptor(x) ((descr_mosaic_t *)(x))
-
+};
 
 /* 0x52 stream_identifier_descriptor */
 
 #define DESCR_STREAM_IDENTIFIER_LEN 3
-typedef struct descr_stream_identifier_struct {
+struct descr_stream_identifier {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char component_tag                          :8;
-} descr_stream_identifier_t;
-#define CastStreamIdentifierDescriptor(x) ((descr_stream_identifier_t *)(x))
-
+};
 
 /* 0x53 ca_identifier_descriptor */
 
 #define DESCR_CA_IDENTIFIER_LEN 2
-typedef struct descr_ca_identifier_struct {
+struct descr_ca_identifier {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_ca_identifier_t;
-#define CastCaIdentifierDescriptor(x) ((descr_ca_identifier_t *)(x))
-
+};
 
 /* 0x54 content_descriptor */
 
 #define DESCR_CONTENT_LEN 2
-typedef struct descr_content_struct {
+struct descr_content {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_content_t;
-#define CastContentDescriptor(x) ((descr_content_t *)(x))
+};
 
-typedef struct nibble_content_struct {
+struct nibble_content {
 #if BYTE_ORDER == BIG_ENDIAN
    u_char content_nibble_level_1                 :4;
    u_char content_nibble_level_2                 :4;
+#else
+   u_char content_nibble_level_2                 :4;
+   u_char content_nibble_level_1                 :4;
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
    u_char user_nibble_1                          :4;
    u_char user_nibble_2                          :4;
 #else
    u_char user_nibble_2                          :4;
    u_char user_nibble_1                          :4;
-   u_char content_nibble_level_2                 :4;
-   u_char content_nibble_level_1                 :4;
 #endif
-} nibble_content_t;
-#define CastContentNibble(x) ((nibble_content_t *)(x))
-
+};
 
 /* 0x55 parental_rating_descriptor */
 
 #define DESCR_PARENTAL_RATING_LEN 2
-typedef struct descr_parental_rating_struct {
+struct descr_parental_rating {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_parental_rating_t;
-#define CastParentalRatingDescriptor(x) ((descr_parental_rating_t *)(x))
+};
 
 #define PARENTAL_RATING_LEN 4
-typedef struct parental_rating_struct {
+struct parental_rating {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
    u_char rating                                 :8;
-} parental_rating_t;
-#define CastParentalRating(x) ((parental_rating_t *)(x))
-
+};
 
 /* 0x56 teletext_descriptor */
 
 #define DESCR_TELETEXT_LEN 2
-typedef struct descr_teletext_struct {
+struct descr_teletext {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_teletext_t;
-#define CastTeletextDescriptor(x) ((descr_teletext_t *)(x))
+};
 
 #define ITEM_TELETEXT_LEN 5
-typedef struct item_teletext_struct {
+struct item_teletext {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char type                                   :5; 
-   u_char magazine_number                        :3; 
-#else 
-   u_char magazine_number                        :3; 
-   u_char type                                   :5; 
-#endif 
-   u_char page_number                            :8; 
-} item_teletext_t;
-#define CastTeletextItem(x) ((item_teletext_t *)(x))
-
+   u_char type                                   :5;
+   u_char magazine_number                        :3;
+#else
+   u_char magazine_number                        :3;
+   u_char type                                   :5;
+#endif
+   u_char page_number                            :8;
+};
 
 /* 0x57 telephone_descriptor */
 
 #define DESCR_TELEPHONE_LEN XX
-typedef struct descr_telephone_struct {
+struct descr_telephone {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_telephone_t;
-#define CastTelephoneDescriptor(x) ((descr_telephone_t *)(x))
-
+};
 
 /* 0x58 local_time_offset_descriptor */
 
 #define DESCR_LOCAL_TIME_OFFSET_LEN 2
-typedef struct descr_local_time_offset_struct {
+struct descr_local_time_offset {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_local_time_offset_t;
-#define CastLocalTimeOffsetDescriptor(x) ((descr_local_time_offset_t *)(x))
+};
 
 #define LOCAL_TIME_OFFSET_ENTRY_LEN 15
-typedef struct local_time_offset_entry_struct {
+struct local_time_offset_entry {
    u_char country_code1                          :8;
    u_char country_code2                          :8;
    u_char country_code3                          :8;
@@ -1093,43 +1204,38 @@ typedef struct local_time_offset_entry_struct {
    u_char time_of_change_time_s                  :8;
    u_char next_time_offset_h                     :8;
    u_char next_time_offset_m                     :8;
-} local_time_offset_entry_t ;
-#define CastLocalTimeOffsetEntry(x) ((local_time_offset_entry_t *)(x))
-
+};
 
 /* 0x59 subtitling_descriptor */
 
 #define DESCR_SUBTITLING_LEN 2
-typedef struct descr_subtitling_struct {
+struct descr_subtitling {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-} descr_subtitling_t;
-#define CastSubtitlingDescriptor(x) ((descr_subtitling_t *)(x))
+};
 
 #define ITEM_SUBTITLING_LEN 8
-typedef struct item_subtitling_struct {
+struct item_subtitling {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
-   u_char subtitling_type                        :8; 
-   u_char composition_page_id_hi                 :8; 
-   u_char composition_page_id_lo                 :8; 
-   u_char ancillary_page_id_hi                   :8; 
-   u_char ancillary_page_id_lo                   :8; 
-} item_subtitling_t;
-#define CastSubtitlingItem(x) ((item_subtitling_t *)(x))
-
+   u_char subtitling_type                        :8;
+   u_char composition_page_id_hi                 :8;
+   u_char composition_page_id_lo                 :8;
+   u_char ancillary_page_id_hi                   :8;
+   u_char ancillary_page_id_lo                   :8;
+};
 
 /* 0x5A terrestrial_delivery_system_descriptor */
 
 #define DESCR_TERRESTRIAL_DELIVERY_SYSTEM_LEN XX
-typedef struct descr_terrestrial_delivery_struct {
+struct descr_terrestrial_delivery {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   u_char frequency1                             :8;
-   u_char frequency2                             :8;
-   u_char frequency3                             :8;
-   u_char frequency4                             :8;
+   u_char frequency_hi_hi                        :8;
+   u_char frequency_hi_lo                        :8;
+   u_char frequency_lo_hi                        :8;
+   u_char frequency_lo_lo                        :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char bandwidth                              :3;
    u_char reserved1                              :5;
@@ -1161,179 +1267,166 @@ typedef struct descr_terrestrial_delivery_struct {
    u_char reserver3                              :8;
    u_char reserver4                              :8;
    u_char reserver5                              :8;
-} descr_terrestrial_delivery_system_t;
-#define CastTerrestrialDeliverySystemDescriptor(x) ((descr_terrestrial_delivery_system_t *)(x))
-
+};
 
 /* 0x5B multilingual_network_name_descriptor */
 
 #define DESCR_MULTILINGUAL_NETWORK_NAME_LEN XX
-typedef struct descr_multilingual_network_name_struct {
+struct descr_multilingual_network_name {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
-} descr_multilingual_network_name_t;
-#define CastMultilingualNetworkNameDescriptor(x) ((descr_multilingual_network_name_t *)(x))
+};
 
+struct entry_multilingual_name {
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+   u_char text_length                            :8;
+};
 
 /* 0x5C multilingual_bouquet_name_descriptor */
 
 #define DESCR_MULTILINGUAL_BOUQUET_NAME_LEN XX
-typedef struct descr_multilingual_bouquet_name_struct {
+struct descr_multilingual_bouquet_name {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
-} descr_multilingual_bouquet_name_t;
-#define CastMultilingualBouquetNameDescriptor(x) ((descr_multilingual_bouquet_name_t *)(x))
-
+};
 
 /* 0x5D multilingual_service_name_descriptor */
 
 #define DESCR_MULTILINGUAL_SERVICE_NAME_LEN XX
-typedef struct descr_multilingual_service_name_struct {
+struct descr_multilingual_service_name {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
-} descr_multilingual_service_name_t;
-#define CastMultilingualServiceNameDescriptor(x) ((descr_multilingual_service_name_t *)(x))
+};
 
+struct entry_multilingual_service_name_mid {
+   u_char service_name_length                    :8;
+};
 
 /* 0x5E multilingual_component_descriptor */
 
 #define DESCR_MULTILINGUAL_COMPONENT_LEN XX
-typedef struct descr_multilingual_component_struct {
+struct descr_multilingual_component {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
-} descr_multilingual_component_t;
-#define CastMultilingualComponentDescriptor(x) ((descr_multilingual_component_t *)(x))
-
+   u_char component_tag                          :8;
+};
 
 /* 0x5F private_data_specifier_descriptor */
 
 #define DESCR_PRIVATE_DATA_SPECIFIER_LEN XX
-typedef struct descr_private_data_specifier_struct {
+struct descr_private_data_specifier {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_private_data_specifier_t;
-#define CastPrivateDataSpecifierDescriptor(x) ((descr_private_data_specifier_t *)(x))
-
+};
 
 /* 0x60 service_move_descriptor */
 
 #define DESCR_SERVICE_MOVE_LEN XX
-typedef struct descr_service_move_struct {
+struct descr_service_move {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
-} descr_service_move_t;
-#define CastServiceMoveDescriptor(x) ((descr_service_move_t *)(x))
-
+   u_char new_original_network_id_hi             :8;
+   u_char new_original_network_id_lo             :8;
+   u_char new_transport_stream_id_hi             :8;
+   u_char new_transport_stream_id_lo             :8;
+   u_char new_service_id_hi                      :8;
+   u_char new_service_id_lo                      :8;
+};
 
 /* 0x61 short_smoothing_buffer_descriptor */
 
 #define DESCR_SHORT_SMOOTHING_BUFFER_LEN XX
-typedef struct descr_short_smoothing_buffer_struct {
+struct descr_short_smoothing_buffer {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_short_smoothing_buffer_t;
-#define CastShortSmoothingBufferDescriptor(x) ((descr_short_smoothing_buffer_t *)(x))
-
+};
 
 /* 0x62 frequency_list_descriptor */
 
 #define DESCR_FREQUENCY_LIST_LEN XX
-typedef struct descr_frequency_list_struct {
+struct descr_frequency_list {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
-} descr_frequency_list_t;
-#define CastFrequencyListDescriptor(x) ((descr_frequency_list_t *)(x))
-
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :6;
+   u_char coding_type                            :2;
+#else
+   u_char coding_type                            :2;
+   u_char                                        :6;
+#endif
+};
 
 /* 0x63 partial_transport_stream_descriptor */
 
 #define DESCR_PARTIAL_TRANSPORT_STREAM_LEN XX
-typedef struct descr_partial_transport_stream_struct {
+struct descr_partial_transport_stream {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_partial_transport_stream_t;
-#define CastPartialDescriptor(x) ((descr_partial_transport_stream_t *)(x))
-
+};
 
 /* 0x64 data_broadcast_descriptor */
 
 #define DESCR_DATA_BROADCAST_LEN XX
-typedef struct descr_data_broadcast_struct {
+struct descr_data_broadcast {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_data_broadcast_t;
-#define CastDataBroadcastDescriptor(x) ((descr_data_broadcast_t *)(x))
-
+};
 
 /* 0x65 ca_system_descriptor */
 
 #define DESCR_CA_SYSTEM_LEN XX
-typedef struct descr_ca_system_struct {
+struct descr_ca_system {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_ca_system_t;
-#define CastCaSystemDescriptor(x) ((descr_ca_system_t *)(x))
-
+};
 
 /* 0x66 data_broadcast_id_descriptor */
 
 #define DESCR_DATA_BROADCAST_ID_LEN XX
-typedef struct descr_data_broadcast_id_struct {
+struct descr_data_broadcast_id {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_data_broadcast_id_t;
-#define CastDataBroadcastIdDescriptor(x) ((descr_data_broadcast_id_t *)(x))
-
+};
 
 /* 0x67 transport_stream_descriptor */
 
 #define DESCR_TRANSPORT_STREAM_LEN XX
-typedef struct descr_transport_stream_struct {
+struct descr_transport_stream {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_transport_stream_t;
-#define CastTransportStreamDescriptor(x) ((descr_transport_stream_t *)(x))
-
+};
 
 /* 0x68 dsng_descriptor */
 
 #define DESCR_DSNG_LEN XX
-typedef struct descr_dsng_struct {
+struct descr_dsng {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_dsng_t;
-#define CastDsngDescriptor(x) ((descr_dsng_t *)(x))
-
+};
 
 /* 0x69 pdc_descriptor */
 
 #define DESCR_PDC_LEN XX
-typedef struct descr_pdc_struct {
+struct descr_pdc {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_pdc_t;
-#define CastPdcDescriptor(x) ((descr_pdc_t *)(x))
-
+};
 
 /* 0x6A ac3_descriptor */
 
 #define DESCR_AC3_LEN 3
-typedef struct descr_ac3_struct {
+struct descr_ac3 {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
 #if BYTE_ORDER == BIG_ENDIAN
@@ -1353,51 +1446,224 @@ typedef struct descr_ac3_struct {
    u_char bsid                                   :8;
    u_char mainid                                 :8;
    u_char asvc                                   :8;
-} descr_ac3_t;
-#define CastAc3Descriptor(x) ((descr_ac3_t *)(x))
-
+};
 
 /* 0x6B ancillary_data_descriptor */
 
 #define DESCR_ANCILLARY_DATA_LEN 3
-typedef struct descr_ancillary_data_struct {
+struct descr_ancillary_data {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    u_char ancillary_data_identifier              :8;
-} descr_ancillary_data_t;
-#define CastAncillaryDataDescriptor(x) ((descr_ancillary_data_t *)(x))
-
+};
 
 /* 0x6C cell_list_descriptor */
 
 #define DESCR_CELL_LIST_LEN XX
-typedef struct descr_cell_list_struct {
+struct descr_cell_list {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_cell_list_t;
-#define CastCellListDescriptor(x) ((descr_cell_list_t *)(x))
-
+};
 
 /* 0x6D cell_frequency_link_descriptor */
 
 #define DESCR_CELL_FREQUENCY_LINK_LEN XX
-typedef struct descr_cell_frequency_link_struct {
+struct descr_cell_frequency_link {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_cell_frequency_link_t;
-#define CastCellFrequencyLinkDescriptor(x) ((descr_cell_frequency_link_t *)(x))
-
+};
 
 /* 0x6E announcement_support_descriptor */
 
 #define DESCR_ANNOUNCEMENT_SUPPORT_LEN XX
-typedef struct descr_announcement_support_struct {
+struct descr_announcement_support {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
-} descr_announcement_support_t;
-#define CastAnnouncementSupportDescriptor(x) ((descr_announcement_support_t *)(x))
+};
+
+/* 0x6F application_signalling_descriptor */
+
+#define DESCR_APPLICATION_SIGNALLING_LEN 2
+struct descr_application_signalling {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+#define APPLICATION_SIGNALLING_ENTRY_LEN 3
+struct application_signalling_entry {
+   u_char application_type_hi                    :8;
+   u_char application_type_lo                    :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :3;
+   u_char AIT_version_number                     :5;
+#else
+   u_char AIT_version_number                     :5;
+   u_char                                        :3;
+#endif
+};
+
+/* 0x71 service_identifier_descriptor (ETSI TS 102 812, MHP) */
+
+struct descr_service_identifier {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+/* MHP 0x00 application_descriptor */
+
+#define DESCR_APPLICATION_LEN 3
+
+struct descr_application {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char application_profiles_length            :8;
+};
+
+#define DESCR_APPLICATION_END_LEN 2
+
+struct descr_application_end {
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char service_bound_flag                     :1;
+   u_char visibility                             :2;
+   u_char                                        :5;
+#else
+   u_char                                        :5;
+   u_char visibility                             :2;
+   u_char service_bound_flag                     :1;
+#endif
+   u_char application_priority                   :8;
+/*now follow 8bit transport_protocol_label fields to the end */
+};
+
+#define APPLICATION_PROFILE_ENTRY_LEN 5
+
+struct application_profile_entry {
+   u_char application_profile_hi                 :8;
+   u_char application_profile_lo                 :8;
+   u_char version_major                          :8;
+   u_char version_minor                          :8;
+   u_char version_micro                          :8;
+};
+
+/* MHP 0x01 application_name_desriptor */
+
+#define DESCR_APPLICATION_NAME_LEN 2
+
+struct descr_application_name {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+#define APPLICATION_NAME_ENTRY_LEN 4
+
+struct descr_application_name_entry {
+   u_char lang_code1                             :8;
+   u_char lang_code2                             :8;
+   u_char lang_code3                             :8;
+   u_char application_name_length                :8;
+   /* application name string */
+};
+
+/* MHP 0x02 transport_protocol_descriptor */
+
+#define DESCR_TRANSPORT_PROTOCOL_LEN 5
+
+struct descr_transport_protocol {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char protocol_id_hi                         :8;
+   u_char protocol_id_lo                         :8;
+   u_char transport_protocol_label               :8;
+   /* protocol_id-specific selector bytes follow */
+};
+
+#define TRANSPORT_VIA_OC_LEN 1
+
+struct transport_via_oc {
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char remote                                 :1;
+   u_char                                        :7;
+#else
+   u_char                                        :7;
+   u_char remote                                 :1;
+#endif
+};
+
+//if remote is true, transport_via_oc_remote_end_t follows,
+// else transport_via_oc_end_t.
+
+#define TRANSPORT_VIA_OC_REMOTE_END_LEN 7
+
+struct transport_via_oc_remote_end {
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+   u_char component_tag                          :8;
+};
+
+#define TRANSPORT_VIA_OC_END_LEN 1
+
+struct transport_via_oc_end {
+   u_char component_tag                          :8;
+};
+
+/* 0x03 dvb_j_application_descriptor() */
+
+#define DESCR_DVBJ_APPLICATION_LEN 2
+
+struct descr_dvbj_application {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+#define DESCR_DVBJ_APPLICATION_ENTRY_LEN 1
+
+struct descr_dvbj_application_entry {
+   u_char parameter_length                       :8;
+   /* parameter string */
+};
+
+/* 0x04 dvb_j_application_location_descriptor */
+
+#define DESCR_DVBJ_APPLICATION_LOCATION_LEN 3
+
+struct descr_dvbj_application_location {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char base_directory_length                  :8;
+   /* base directory string */
+};
+
+#define DESCR_DVBJ_APPLICATION_LOCATION_MID_LEN 1
+
+struct descr_dvbj_application_location_mid {
+   u_char classpath_extension_length                  :8;
+};
+
+/* 0x0B application_icons_descriptor */
+
+#define DESCR_APPLICATION_ICONS_LEN 3
+
+struct descr_application_icons_descriptor {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char icon_locator_length                    :8;
+   /* icon locator */
+};
+
+#define DESCR_APPLICATION_ICONS_END_LEN 2
+
+struct descr_application_icons_descriptor_end {
+   u_char icon_flags_hi                          :8;
+   u_char icon_flags_lo                          :8;
+};
 
+} //end of namespace
 
+#endif //LIBSI_HEADERS_H
diff --git a/libsi/section.c b/libsi/section.c
new file mode 100644
index 000000000..0de2a573c
--- /dev/null
+++ b/libsi/section.c
@@ -0,0 +1,328 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: section.c 1.2 2003/12/13 10:42:14 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#include "section.h"
+#include <stdio.h>
+
+namespace SI {
+
+/*********************** PAT ***********************/
+
+void PAT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const pat>(s, offset);
+   associationLoop.setData(data+offset, getLength()-offset-4);
+}
+
+int PAT::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int PAT::Association::getServiceId() const {
+   return HILO(s->program_number);
+}
+
+int PAT::Association::getPid() const {
+   return HILO(s->network_pid);
+}
+
+void PAT::Association::Parse() {
+   s=data.getData<pat_prog>();
+}
+
+/*********************** CAT ***********************/
+
+void CAT::Parse() {
+   loop.setData(data+sizeof(cat), getLength()-sizeof(cat)-4);
+}
+
+/*********************** PMT ***********************/
+
+void PMT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const pmt>(s, offset);
+   commonDescriptors.setDataAndOffset(data+offset, HILO(s->program_info_length), offset);
+   streamLoop.setData(data+offset, getLength()-offset-4);
+}
+
+int PMT::getServiceId() const {
+   return HILO(s->program_number);
+}
+
+int PMT::getPCRPid() const {
+   return HILO(s->PCR_PID);
+}
+
+int PMT::Stream::getPid() const {
+   return HILO(s->elementary_PID);
+}
+
+int PMT::Stream::getStreamType() const {
+   return s->stream_type;
+}
+
+void PMT::Stream::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const pmt_info>(s, offset);
+   streamDescriptors.setData(data+offset, HILO(s->ES_info_length));
+}
+
+/*********************** NIT ***********************/
+
+int NIT::getNetworkId() const {
+   return HILO(s->network_id);
+}
+
+void NIT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const nit>(s, offset);
+   commonDescriptors.setDataAndOffset(data+offset, HILO(s->network_descriptor_length), offset);
+   const nit_mid *mid;
+   data.setPointerAndOffset<const nit_mid>(mid, offset);
+   transportStreamLoop.setData(data+offset, HILO(mid->transport_stream_loop_length));
+}
+
+int NIT::TransportStream::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int NIT::TransportStream::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+void NIT::TransportStream::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const ni_ts>(s, offset);
+   transportStreamDescriptors.setData(data+offset, HILO(s->transport_descriptors_length));
+}
+
+/*********************** SDT ***********************/
+
+void SDT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const sdt>(s, offset);
+   serviceLoop.setData(data+offset, getLength()-offset-4); //4 is for CRC
+}
+
+int SDT::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int SDT::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+int SDT::Service::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int SDT::Service::getEITscheduleFlag() const {
+   return s->eit_schedule_flag;
+}
+
+int SDT::Service::getEITpresentFollowingFlag() const {
+   return s->eit_present_following_flag;
+}
+
+RunningStatus SDT::Service::getRunningStatus() const {
+   return (RunningStatus)s->running_status;
+}
+
+int SDT::Service::getFreeCaMode() const {
+   return s->free_ca_mode;
+}
+
+void SDT::Service::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const sdt_descr>(s, offset);
+   serviceDescriptors.setData(data+offset, HILO(s->descriptors_loop_length));
+}
+
+/*********************** EIT ***********************/
+
+int EIT::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int EIT::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int EIT::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+bool EIT::isPresentFollowing() const {
+   return getTableId() == TableIdEIT_presentFollowing || getTableId() == TableIdEIT_presentFollowing_other;
+}
+
+bool EIT::isActualTS() const {
+   return
+       (getTableId() ==TableIdEIT_presentFollowing)
+    || (TableIdEIT_schedule_first <= getTableId() && getTableId() <= TableIdEIT_schedule_last);
+}
+
+void EIT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const eit>(s, offset);
+   //printf("%d %d %d %d %d\n", getServiceId(), getTransportStreamId(), getOriginalNetworkId(), isPresentFollowing(), isActualTS());
+   eventLoop.setData(data+offset, getLength()-offset-4); //4 is for CRC
+}
+
+time_t EIT::Event::getStartTime() const {
+   return DVBTime::getTime(s->mjd_hi, s->mjd_lo, s->start_time_h, s->start_time_m, s->start_time_s);
+}
+
+time_t EIT::Event::getDuration() const {
+   return DVBTime::getDuration(s->duration_h, s->duration_m, s->duration_s);
+}
+
+int EIT::Event::getEventId() const {
+   return HILO(s->event_id);
+}
+
+int EIT::Event::getMJD() const {
+   return HILO(s->mjd);
+}
+
+int EIT::Event::getStartTimeHour() const {
+   return DVBTime::bcdToDec(s->start_time_h);
+}
+
+int EIT::Event::getStartTimeMinute() const {
+   return DVBTime::bcdToDec(s->start_time_m);
+}
+
+int EIT::Event::getStartTimeSecond() const {
+   return DVBTime::bcdToDec(s->start_time_s);
+}
+
+int EIT::Event::getDurationHour() const {
+   return DVBTime::bcdToDec(s->duration_h);
+}
+
+int EIT::Event::getDurationMinute() const {
+   return DVBTime::bcdToDec(s->duration_m);
+}
+
+int EIT::Event::getDurationSecond() const {
+   return DVBTime::bcdToDec(s->duration_s);
+}
+
+RunningStatus EIT::Event::getRunningStatus() const {
+   return (RunningStatus)s->running_status;
+}
+
+int EIT::Event::getFreeCaMode() const {
+   return s->free_ca_mode;
+}
+
+void EIT::Event::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const eit_event>(s, offset);
+   //printf("%d %d %d\n", getStartTime(), getDuration(), getRunningStatus());
+   eventDescriptors.setData(data+offset, HILO(s->descriptors_loop_length));
+}
+
+/*********************** TDT ***********************/
+
+time_t TDT::getTime() const {
+   return DVBTime::getTime(s->utc_mjd_hi, s->utc_mjd_lo, s->utc_time_h, s->utc_time_m, s->utc_time_s);
+}
+
+void TDT::Parse() {
+   s=data.getData<const tdt>();
+}
+
+/*********************** TOT ***********************/
+
+time_t TOT::getTime() const {
+   return DVBTime::getTime(s->utc_mjd_hi, s->utc_mjd_lo, s->utc_time_h, s->utc_time_m, s->utc_time_s);
+}
+
+void TOT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const tot>(s, offset);
+   descriptorLoop.setData(data+offset, getLength()-offset-4);
+}
+
+/*********************** RST ***********************/
+
+void RST::Parse() {
+   unsigned int offset=0;
+   const rst *s;
+   data.setPointerAndOffset<const rst>(s, offset);
+   infoLoop.setData(data+offset, getLength()-offset);
+}
+
+int RST::RunningInfo::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int RST::RunningInfo::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+int RST::RunningInfo::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int RST::RunningInfo::getEventId() const {
+   return HILO(s->event_id);
+}
+
+RunningStatus RST::RunningInfo::getRunningStatus() const {
+   return (RunningStatus)s->running_status;
+}
+
+void RST::RunningInfo::Parse() {
+   s=data.getData<const rst_info>();
+}
+
+/*********************** AIT ***********************/
+
+int AIT::getApplicationType() const {
+   return HILO(first->application_type);
+}
+
+int AIT::getAITVersion() const {
+   return first->version_number;
+}
+
+void AIT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const ait>(first, offset);
+   commonDescriptors.setDataAndOffset(data+offset, HILO(first->common_descriptors_length), offset);
+   const ait_mid *mid;
+   data.setPointerAndOffset<const ait_mid>(mid, offset);
+   applicationLoop.setData(data+offset, HILO(mid->application_loop_length));
+}
+
+long AIT::Application::getOrganisationId() const {
+   return data.FourBytes(0);
+}
+
+int AIT::Application::getApplicationId() const {
+   return HILO(s->application_id);
+}
+
+int AIT::Application::getControlCode() const {
+   return s->application_control_code;
+}
+
+void AIT::Application::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const ait_app>(s, offset);
+   applicationDescriptors.setData(data+offset, HILO(s->application_descriptors_length));
+}
+
+} //end of namespace
diff --git a/libsi/section.h b/libsi/section.h
new file mode 100644
index 000000000..efca9bb67
--- /dev/null
+++ b/libsi/section.h
@@ -0,0 +1,252 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: section.h 1.2 2003/12/13 10:42:15 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef LIBSI_SECTION_H
+#define LIBSI_SECTION_H
+
+#include <time.h>
+
+#include "si.h"
+#include "headers.h"
+
+namespace SI {
+
+class PAT : public NumberedSection {
+public:
+   PAT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   PAT() {}
+   class Association : public LoopElement {
+   public:
+      int getServiceId() const;
+      int getPid() const;
+      bool isNITPid() const { return getServiceId()==0; }
+      virtual int getLength() { return sizeof(pat_prog); }
+   protected:
+      virtual void Parse();
+   private:
+      const pat_prog *s;
+   };
+   int getTransportStreamId() const;
+   StructureLoop<Association> associationLoop;
+protected:
+   virtual void Parse();
+private:
+   const pat *s;
+};
+
+class CAT : public NumberedSection {
+public:
+   CAT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   CAT() {}
+   DescriptorLoop loop;
+protected:
+   virtual void Parse();
+};
+
+class PMT : public NumberedSection {
+public:
+   PMT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   PMT() {}
+   class Stream : public LoopElement {
+   public:
+      int getPid() const;
+      int getStreamType() const;
+      DescriptorLoop streamDescriptors;
+      virtual int getLength() { return sizeof(pmt_info)+streamDescriptors.getLength(); }
+   protected:
+      virtual void Parse();
+   private:
+      const pmt_info *s;
+   };
+   DescriptorLoop commonDescriptors;
+   StructureLoop<Stream> streamLoop;
+   int getServiceId() const;
+   int getPCRPid() const;
+protected:
+   virtual void Parse();
+private:
+   const pmt *s;
+};
+
+class NIT : public NumberedSection {
+public:
+   NIT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   NIT() {}
+   class TransportStream : public LoopElement {
+   public:
+      int getTransportStreamId() const;
+      int getOriginalNetworkId() const;
+      virtual int getLength() { return sizeof(ni_ts)+transportStreamDescriptors.getLength(); }
+      DescriptorLoop transportStreamDescriptors;
+   protected:
+      virtual void Parse();
+   private:
+      const ni_ts *s;
+   };
+   DescriptorLoop commonDescriptors;
+   StructureLoop<TransportStream> transportStreamLoop;
+   int getNetworkId() const;
+protected:
+   virtual void Parse();
+private:
+   const nit *s;
+};
+
+//BAT has the same structure as NIT but different allowed descriptors
+class BAT : public NIT {
+public:
+   BAT(const unsigned char *data, bool doCopy=true) : NIT(data, doCopy) {}
+   BAT() {}
+   int getBouquetId() const { return getNetworkId(); }
+};
+
+class SDT : public NumberedSection {
+public:
+   SDT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   SDT() {}
+   class Service : public LoopElement {
+   public:
+      int getServiceId() const;
+      int getEITscheduleFlag() const;
+      int getEITpresentFollowingFlag() const;
+      RunningStatus getRunningStatus() const;
+      int getFreeCaMode() const;
+      virtual int getLength() { return sizeof(sdt_descr)+serviceDescriptors.getLength(); }
+      DescriptorLoop serviceDescriptors;
+   protected:
+      virtual void Parse();
+   private:
+      const sdt_descr *s;
+   };
+   int getTransportStreamId() const;
+   int getOriginalNetworkId() const;
+   StructureLoop<Service> serviceLoop;
+protected:
+   virtual void Parse();
+private:
+   const sdt *s;
+};
+
+class EIT : public NumberedSection {
+public:
+   EIT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   EIT() {}
+   class Event : public LoopElement {
+   public:
+      int getEventId() const;
+      time_t getStartTime() const; //UTC
+      time_t getDuration() const;
+
+      int getMJD() const;
+      int getStartTimeHour() const; //UTC
+      int getStartTimeMinute() const; //UTC
+      int getStartTimeSecond() const; //UTC
+      int getDurationHour() const;
+      int getDurationMinute() const;
+      int getDurationSecond() const;
+      RunningStatus getRunningStatus() const;
+      int getFreeCaMode() const;
+
+      DescriptorLoop eventDescriptors;
+      virtual int getLength() { return sizeof(eit_event)+eventDescriptors.getLength(); }
+   protected:
+      virtual void Parse();
+   private:
+      const eit_event *s;
+   };
+   int getServiceId() const;
+   int getTransportStreamId() const;
+   int getOriginalNetworkId() const;
+   StructureLoop<Event> eventLoop;
+
+   //true if table conveys present/following information, false if it conveys schedule information
+   bool isPresentFollowing() const;
+   //true if table describes TS on which it is broadcast, false if it describes other TS
+   bool isActualTS() const;
+protected:
+   virtual void Parse();
+private:
+   const eit *s;
+};
+
+class TDT : public Section {
+public:
+   TDT(const unsigned char *data, bool doCopy=true) : Section(data, doCopy) {}
+   TDT() {}
+   time_t getTime() const; //UTC
+protected:
+   virtual void Parse();
+private:
+   const tdt *s;
+};
+
+class TOT : public CRCSection {
+public:
+   TOT(const unsigned char *data, bool doCopy=true) : CRCSection(data, doCopy) {}
+   TOT() {}
+   time_t getTime() const;
+   DescriptorLoop descriptorLoop;
+protected:
+   virtual void Parse();
+private:
+   const tot *s;
+};
+
+class RST : public Section {
+public:
+   RST(const unsigned char *data, bool doCopy=true) : Section(data, doCopy) {}
+   RST() {}
+   class RunningInfo : public LoopElement {
+   public:
+      int getTransportStreamId() const;
+      int getOriginalNetworkId() const;
+      int getServiceId() const;
+      int getEventId() const;
+      RunningStatus getRunningStatus() const;
+      virtual int getLength() { return sizeof(rst_info); }
+   protected:
+      virtual void Parse();
+   private:
+      const rst_info *s;
+   };
+   StructureLoop<RunningInfo> infoLoop;
+protected:
+   virtual void Parse();
+};
+
+class AIT : public NumberedSection {
+public:
+   AIT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   AIT() {}
+   class Application : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(ait_app)+applicationDescriptors.getLength(); }
+      long getOrganisationId() const;
+      int getApplicationId() const;
+      int getControlCode() const;
+      MHP_DescriptorLoop applicationDescriptors;
+   protected:
+      virtual void Parse();
+      const ait_app *s;
+   };
+   MHP_DescriptorLoop commonDescriptors;
+   StructureLoop<Application> applicationLoop;
+   int getApplicationType() const;
+   int getAITVersion() const;
+protected:
+   const ait *first;
+   virtual void Parse();
+};
+
+} //end of namespace
+
+#endif //LIBSI_TABLE_H
diff --git a/libsi/si.c b/libsi/si.c
new file mode 100644
index 000000000..bcf519a81
--- /dev/null
+++ b/libsi/si.c
@@ -0,0 +1,415 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: si.c 1.3 2004/01/04 14:26:53 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#include <string.h>
+#include "si.h"
+#include "descriptor.h"
+
+namespace SI {
+
+Object::Object() {
+}
+
+Object::Object(CharArray &d) : data(d) {
+}
+
+void Object::setData(const unsigned char*d, unsigned int size, bool doCopy) {
+   data.assign(d, size, doCopy);
+}
+
+void Object::setData(CharArray &d) {
+   data=d;
+}
+
+Section::Section(const unsigned char *data, bool doCopy) {
+   setData(data, getLength(data), doCopy);
+}
+
+TableId Section::getTableId() const {
+   return getTableId(data.getData());
+}
+
+int Section::getLength() {
+   return getLength(data.getData());
+}
+
+TableId Section::getTableId(const unsigned char *d) {
+   return (TableId)((const SectionHeader *)d)->table_id;
+}
+
+int Section::getLength(const unsigned char *d) {
+   return HILO(((const SectionHeader *)d)->section_length)+sizeof(SectionHeader);
+}
+
+bool CRCSection::isValid() {
+   return CRC32::isValid((const char *)data.getData(), getLength()/*, data.FourBytes(getLength()-4)*/);
+}
+
+bool CRCSection::CheckCRCAndParse() {
+   if (!isValid())
+      return false;
+   CheckParse();
+   return true;
+}
+
+bool NumberedSection::getCurrentNextIndicator() const {
+   return data.getData<ExtendedSectionHeader>()->current_next_indicator;
+}
+
+int NumberedSection::getVersionNumber() const {
+   return data.getData<ExtendedSectionHeader>()->version_number;
+}
+
+int NumberedSection::getSectionNumber() const {
+   return data.getData<ExtendedSectionHeader>()->section_number;
+}
+
+int NumberedSection::getLastSectionNumber() const {
+   return data.getData<ExtendedSectionHeader>()->last_section_number;
+}
+
+int Descriptor::getLength() {
+   return getLength(data.getData());
+}
+
+DescriptorTag Descriptor::getDescriptorTag() const {
+   return getDescriptorTag(data.getData());
+}
+
+int Descriptor::getLength(const unsigned char *d) {
+   return ((const DescriptorHeader*)d)->descriptor_length+sizeof(DescriptorHeader);
+}
+
+DescriptorTag Descriptor::getDescriptorTag(const unsigned char *d) {
+   return (DescriptorTag)((const DescriptorHeader*)d)->descriptor_tag;
+}
+
+Descriptor *DescriptorLoop::getNext(Iterator &it) {
+   if (it.i<getLength()) {
+      return createDescriptor(it.i);
+   }
+   return 0;
+}
+
+Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool returnUnimplemetedDescriptor) {
+   Descriptor *d=0;
+   if (it.i<getLength()) {
+      const unsigned char *p=data.getData(it.i);
+      const unsigned char *end=p+getLength();
+      while (p < end) {
+         if (Descriptor::getDescriptorTag(p) == tag) {
+            d=createDescriptor(it.i);
+            break;
+         }
+         it.i+=Descriptor::getLength(p);
+         p+=Descriptor::getLength(p);
+      }
+   }
+   if (d && d->getDescriptorTag()==UnimplementedDescriptorTag)
+      return returnUnimplemetedDescriptor ? d : 0;
+   return d;
+}
+
+Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplemetedDescriptor) {
+   Descriptor *d=0;
+   if (it.i<getLength()) {
+      const unsigned char *p=data.getData(it.i);
+      const unsigned char *end=p+getLength();
+      while (p < end) {
+         for (int u=0; u<arrayLength;u++)
+            if (Descriptor::getDescriptorTag(p) == tags[u]) {
+               d=createDescriptor(it.i);
+               break;
+            }
+         if (d)
+            break;
+         it.i+=Descriptor::getLength(p);
+         p+=Descriptor::getLength(p);
+      }
+   }
+   if (d && d->getDescriptorTag()==UnimplementedDescriptorTag)
+      return returnUnimplemetedDescriptor ? d : 0;
+   return d;
+}
+
+Descriptor *DescriptorLoop::createDescriptor(int &i) {
+   Descriptor *d=Descriptor::getDescriptor(data+i, domain);
+   i+=d->getLength();
+   d->CheckParse();
+   return d;
+}
+
+DescriptorGroup::DescriptorGroup(bool del) {
+   array=0;
+   length=0;
+   deleteOnDesctruction=del;
+}
+
+DescriptorGroup::~DescriptorGroup() {
+   if (deleteOnDesctruction)
+      Delete();
+   delete[] array;
+}
+
+void DescriptorGroup::Delete() {
+   for (int i=0;i<length;i++)
+      if (array[i]!=0) {
+         delete array[i];
+         array[i]=0;
+      }
+}
+
+void DescriptorGroup::Add(GroupDescriptor *d) {
+   if (!array) {
+      length=d->getLastDescriptorNumber()+1;
+      array=new GroupDescriptor*[length]; //numbering is zero-based
+      for (int i=0;i<length;i++)
+         array[i]=0;
+   } else if (length != d->getLastDescriptorNumber()+1)
+      return; //avoid crash in case of misuse
+   array[d->getDescriptorNumber()]=d;
+}
+
+bool DescriptorGroup::isComplete() {
+   for (int i=0;i<length;i++)
+      if (array[i]==0)
+         return false;
+   return true;
+}
+
+char *String::getText() {
+   if (getLength() < 0 || getLength() >4095)
+      return "text error";
+   char *data=new char(getLength()+1);
+   decodeText(data);
+   return data;
+}
+
+char *String::getText(char *buffer) {
+   if (getLength() < 0 || getLength() >4095) {
+      strncpy(buffer, "text error", getLength()+1);
+      return buffer;
+   }
+   decodeText(buffer);
+   return buffer;
+}
+
+//taken from libdtv, Copyright Rolf Hakenes <hakenes@hippomi.de>
+void String::decodeText(char *buffer) {
+   const unsigned char *from=data.getData(0);
+   char *to=buffer;
+
+   /* Disable detection of coding tables - libdtv doesn't do it either
+   if ( (0x01 <= *from) && (*from <= 0x1f) ) {
+      codeTable=*from
+   }
+   */
+
+   for (int i = 0; i < getLength(); i++) {
+      if (*from == 0)
+         break;
+      if (    ((' ' <= *from) && (*from <= '~'))
+           || (*from == '\n')
+           || ((0xA0 <= *from) && (*from <= 0xFF))
+         )
+         *to++ = *from;
+      else if (*from == 0x8A)
+         *to++ = '\n';
+      else if (*from == 0x86 || *from == 0x87) //&& !(GDT_NAME_DESCRIPTOR & type))
+         *to++ = *from;
+      from++;
+   }
+   *to = '\0';
+}
+
+Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain) {
+   Descriptor *d=0;
+   switch (domain) {
+   case SI:
+      switch ((DescriptorTag)da.getData<DescriptorHeader>()->descriptor_tag) {
+         case CaDescriptorTag:
+            d=new CaDescriptor();
+            break;
+         case CarouselIdentifierDescriptorTag:
+            d=new CarouselIdentifierDescriptor();
+            break;
+         case NetworkNameDescriptorTag:
+            d=new NetworkNameDescriptor();
+            break;
+         case ServiceListDescriptorTag:
+            d=new ServiceListDescriptor();
+            break;
+         case SatelliteDeliverySystemDescriptorTag:
+            d=new SatelliteDeliverySystemDescriptor();
+            break;
+         case CableDeliverySystemDescriptorTag:
+            d=new CableDeliverySystemDescriptor();
+            break;
+         case TerrestrialDeliverySystemDescriptorTag:
+            d=new TerrestrialDeliverySystemDescriptor();
+            break;
+         case BouquetNameDescriptorTag:
+            d=new BouquetNameDescriptor();
+            break;
+         case ServiceDescriptorTag:
+            d=new ServiceDescriptor();
+            break;
+         case NVODReferenceDescriptorTag:
+            d=new NVODReferenceDescriptor();
+            break;
+         case TimeShiftedServiceDescriptorTag:
+            d=new TimeShiftedServiceDescriptor();
+            break;
+         case ComponentDescriptorTag:
+            d=new ComponentDescriptor();
+            break;
+         case StreamIdentifierDescriptorTag:
+            d=new StreamIdentifierDescriptor();
+            break;
+         case SubtitlingDescriptorTag:
+            d=new SubtitlingDescriptor();
+            break;
+         case MultilingualNetworkNameDescriptorTag:
+            d=new MultilingualNetworkNameDescriptor();
+            break;
+         case MultilingualBouquetNameDescriptorTag:
+            d=new MultilingualBouquetNameDescriptor();
+            break;
+         case MultilingualServiceNameDescriptorTag:
+            d=new MultilingualServiceNameDescriptor();
+            break;
+         case MultilingualComponentDescriptorTag:
+            d=new MultilingualComponentDescriptor();
+            break;
+         case ServiceMoveDescriptorTag:
+            d=new ServiceMoveDescriptor();
+            break;
+         case FrequencyListDescriptorTag:
+            d=new FrequencyListDescriptor();
+            break;
+         case ServiceIdentifierDescriptorTag:
+            d=new ServiceIdentifierDescriptor();
+            break;
+         case CaIdentifierDescriptorTag:
+            d=new CaIdentifierDescriptor();
+            break;
+         case ShortEventDescriptorTag:
+            d=new ShortEventDescriptor();
+            break;
+         case ExtendedEventDescriptorTag:
+            d=new ExtendedEventDescriptor();
+            break;
+         case TimeShiftedEventDescriptorTag:
+            d=new TimeShiftedEventDescriptor();
+            break;
+         case ContentDescriptorTag:
+            d=new ContentDescriptor();
+            break;
+         case ParentalRatingDescriptorTag:
+            d=new ParentalRatingDescriptor();
+            break;
+         case ApplicationSignallingDescriptorTag:
+            d=new ApplicationSignallingDescriptor();
+            break;
+
+         //note that it is no problem to implement one
+         //of the unimplemented descriptors.
+
+         //defined in ISO-13818-1
+         case VideoStreamDescriptorTag:
+         case AudioStreamDescriptorTag:
+         case HierarchyDescriptorTag:
+         case RegistrationDescriptorTag:
+         case DataStreamAlignmentDescriptorTag:
+         case TargetBackgroundGridDescriptorTag:
+         case VideoWindowDescriptorTag:
+         case ISO639LanguageDescriptorTag:
+         case SystemClockDescriptorTag:
+         case MultiplexBufferUtilizationDescriptorTag:
+         case CopyrightDescriptorTag:
+         case MaximumBitrateDescriptorTag:
+         case PrivateDataIndicatorDescriptorTag:
+         case SmoothingBufferDescriptorTag:
+         case STDDescriptorTag:
+         case IBPDescriptorTag:
+
+         //defined in ETSI EN 300 468
+         case StuffingDescriptorTag:
+         case VBIDataDescriptorTag:
+         case VBITeletextDescriptorTag:
+         case CountryAvailabilityDescriptorTag:
+         case MocaicDescriptorTag:
+         case LinkageDescriptorTag:
+         case TeletextDescriptorTag:
+         case TelephoneDescriptorTag:
+         case LocalTimeOffsetDescriptorTag:
+         case PrivateDataSpecifierDescriptorTag:
+         case CellListDescriptorTag:
+         case CellFrequencyLinkDescriptorTag:
+         case ServiceAvailabilityDescriptorTag:
+         case ShortSmoothingBufferDescriptorTag:
+         case PartialTransportStreamDescriptorTag:
+         case DataBroadcastDescriptorTag:
+         case DataBroadcastIdDescriptorTag:
+         case CaSystemDescriptorTag:
+         case AC3DescriptorTag:
+         case DSNGDescriptorTag:
+         case PDCDescriptorTag:
+         case AncillaryDataDescriptorTag:
+         case AnnouncementSupportDescriptorTag:
+         case AdaptationFieldDataDescriptorTag:
+         case TransportStreamDescriptorTag:
+         default:
+            d=new UnimplementedDescriptor();
+            break;
+      }
+      break;
+   case MHP:
+      switch ((DescriptorTag)da.getData<DescriptorHeader>()->descriptor_tag) {
+      // They once again start with 0x00 (see page 234, MHP specification)
+         case MHP_ApplicationDescriptorTag:
+            d=new MHP_ApplicationDescriptor();
+            break;
+         case MHP_ApplicationNameDescriptorTag:
+            d=new MHP_ApplicationNameDescriptor();
+            break;
+         case MHP_TransportProtocolDescriptorTag:
+            d=new MHP_TransportProtocolDescriptor();
+            break;
+         case MHP_DVBJApplicationDescriptorTag:
+            d=new MHP_DVBJApplicationDescriptor();
+            break;
+         case MHP_DVBJApplicationLocationDescriptorTag:
+            d=new MHP_DVBJApplicationLocationDescriptor();
+            break;
+      // 0x05 - 0x0A is unimplemented this library
+         case MHP_ExternalApplicationAuthorisationDescriptorTag:
+         case MHP_IPv4RoutingDescriptorTag:
+         case MHP_IPv6RoutingDescriptorTag:
+         case MHP_DVBHTMLApplicationDescriptorTag:
+         case MHP_DVBHTMLApplicationLocationDescriptorTag:
+         case MHP_DVBHTMLApplicationBoundaryDescriptorTag:
+         case MHP_ApplicationIconsDescriptorTag:
+         case MHP_PrefetchDescriptorTag:
+         case MHP_DelegatedApplicationDescriptorTag:
+         case MHP_ApplicationStorageDescriptorTag:
+         default:
+            d=new UnimplementedDescriptor();
+            break;
+      }
+      break;
+   }
+   d->setData(da);
+   return d;
+}
+
+} //end of namespace
diff --git a/libsi/si.h b/libsi/si.h
new file mode 100644
index 000000000..31d17cb28
--- /dev/null
+++ b/libsi/si.h
@@ -0,0 +1,392 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: si.h 1.3 2003/12/26 14:09:30 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef LIBSI_SI_H
+#define LIBSI_SI_H
+
+#include <stdint.h>
+
+#include "util.h"
+#include "headers.h"
+
+namespace SI {
+
+enum TableId { TableIdPAT = 0x00, //program association section
+               TableIdCAT = 0x01, //conditional access section
+               TableIdPMT = 0x02, //program map section
+               TableIdTSDT = 0x03,//transport stream description section
+               TableIdNIT = 0x40, //network information, actual network section
+               TableIdNIT_other  = 0x41, //network information section, other network
+               TableIdSDT = 0x42, //service description section
+               TableIdSDT_other  = 0x46,
+               TableIdBAT = 0x46, //bouquet association section
+               TableIdEIT_presentFollowing = 0x4E, //event information section
+               TableIdEIT_presentFollowing_other = 0x4F,
+               //range from 0x50 to 0x5F
+               TableIdEIT_schedule_first = 0x50,
+               TableIdEIT_schedule_last = 0x5F,
+               //range from 0x60 to 0x6F
+               TableIdEIT_schedule_Other_first = 0x60,
+               TableIdEIT_schedule_Other_fast = 0x6F,
+               TableIdTDT = 0x70, //time date section
+               TableIdRST = 0x71, //running status section
+               TableIdST  = 0x72, //stuffing section
+               TableIdTOT = 0x73, //time offset section
+               TableIdDIT = 0x7E, //discontinuity information section
+               TableIdSIT = 0x7F, //service information section
+               TableIdAIT = 0x74  //application information section
+             };
+
+
+enum DescriptorTag {
+  // defined by ISO/IEC 13818-1
+               VideoStreamDescriptorTag = 0x02,
+               AudioStreamDescriptorTag = 0x03,
+               HierarchyDescriptorTag = 0x04,
+               RegistrationDescriptorTag = 0x05,
+               DataStreamAlignmentDescriptorTag = 0x06,
+               TargetBackgroundGridDescriptorTag = 0x07,
+               VideoWindowDescriptorTag = 0x08,
+               CaDescriptorTag = 0x09,
+               ISO639LanguageDescriptorTag = 0x0A,
+               SystemClockDescriptorTag = 0x0B,
+               MultiplexBufferUtilizationDescriptorTag = 0x0C,
+               CopyrightDescriptorTag = 0x0D,
+               MaximumBitrateDescriptorTag = 0x0E,
+               PrivateDataIndicatorDescriptorTag = 0x0F,
+               SmoothingBufferDescriptorTag = 0x10,
+               STDDescriptorTag = 0x11,
+               IBPDescriptorTag = 0x12,
+  // defined by ISO-13818-6 (DSM-CC)
+               CarouselIdentifierDescriptorTag = 0x13,
+               // 0x14 - 0x3F  Reserved
+  // defined by ETSI (EN 300 468)
+               NetworkNameDescriptorTag = 0x40,
+               ServiceListDescriptorTag = 0x41,
+               StuffingDescriptorTag = 0x42,
+               SatelliteDeliverySystemDescriptorTag = 0x43,
+               CableDeliverySystemDescriptorTag = 0x44,
+               VBIDataDescriptorTag = 0x45,
+               VBITeletextDescriptorTag = 0x46,
+               BouquetNameDescriptorTag = 0x47,
+               ServiceDescriptorTag = 0x48,
+               CountryAvailabilityDescriptorTag = 0x49,
+               LinkageDescriptorTag = 0x4A,
+               NVODReferenceDescriptorTag = 0x4B,
+               TimeShiftedServiceDescriptorTag = 0x4C,
+               ShortEventDescriptorTag = 0x4D,
+               ExtendedEventDescriptorTag = 0x4E,
+               TimeShiftedEventDescriptorTag = 0x4F,
+               ComponentDescriptorTag = 0x50,
+               MocaicDescriptorTag = 0x51,
+               StreamIdentifierDescriptorTag = 0x52,
+               CaIdentifierDescriptorTag = 0x53,
+               ContentDescriptorTag = 0x54,
+               ParentalRatingDescriptorTag = 0x55,
+               TeletextDescriptorTag = 0x56,
+               TelephoneDescriptorTag = 0x57,
+               LocalTimeOffsetDescriptorTag = 0x58,
+               SubtitlingDescriptorTag = 0x59,
+               TerrestrialDeliverySystemDescriptorTag = 0x5A,
+               MultilingualNetworkNameDescriptorTag = 0x5B,
+               MultilingualBouquetNameDescriptorTag = 0x5C,
+               MultilingualServiceNameDescriptorTag = 0x5D,
+               MultilingualComponentDescriptorTag = 0x5E,
+               PrivateDataSpecifierDescriptorTag = 0x5F,
+               ServiceMoveDescriptorTag = 0x60,
+               ShortSmoothingBufferDescriptorTag = 0x61,
+               FrequencyListDescriptorTag = 0x62,
+               PartialTransportStreamDescriptorTag = 0x63,
+               DataBroadcastDescriptorTag = 0x64,
+               CaSystemDescriptorTag = 0x65,
+               DataBroadcastIdDescriptorTag = 0x66,
+               TransportStreamDescriptorTag = 0x67,
+               DSNGDescriptorTag = 0x68,
+               PDCDescriptorTag = 0x69,
+               AC3DescriptorTag = 0x6A,
+               AncillaryDataDescriptorTag = 0x6B,
+               CellListDescriptorTag = 0x6C,
+               CellFrequencyLinkDescriptorTag = 0x6D,
+               AnnouncementSupportDescriptorTag = 0x6E,
+               ApplicationSignallingDescriptorTag = 0x6F,
+               AdaptationFieldDataDescriptorTag = 0x70,
+               ServiceIdentifierDescriptorTag = 0x71,
+               ServiceAvailabilityDescriptorTag = 0x72,
+ // Defined by ETSI TS 102 812 (MHP)
+               // They once again start with 0x00 (see page 234, MHP specification)
+               MHP_ApplicationDescriptorTag = 0x00,
+               MHP_ApplicationNameDescriptorTag = 0x01,
+               MHP_TransportProtocolDescriptorTag = 0x02,
+               MHP_DVBJApplicationDescriptorTag = 0x03,
+               MHP_DVBJApplicationLocationDescriptorTag = 0x04,
+               // 0x05 - 0x0A is unimplemented this library
+               MHP_ExternalApplicationAuthorisationDescriptorTag = 0x05,
+               MHP_IPv4RoutingDescriptorTag = 0x06,
+               MHP_IPv6RoutingDescriptorTag = 0x07,
+               MHP_DVBHTMLApplicationDescriptorTag = 0x08,
+               MHP_DVBHTMLApplicationLocationDescriptorTag = 0x09,
+               MHP_DVBHTMLApplicationBoundaryDescriptorTag = 0x0A,
+               MHP_ApplicationIconsDescriptorTag = 0x0B,
+               MHP_PrefetchDescriptorTag = 0x0C,
+               MHP_DelegatedApplicationDescriptorTag = 0x0E,
+               MHP_ApplicationStorageDescriptorTag = 0x10,
+
+               //a descriptor currently unimplemented in this library
+               //the actual value 0xFF is "forbidden" according to the spec.
+               UnimplementedDescriptorTag = 0xFF
+};
+
+enum DescriptorTagDomain { SI, MHP };
+
+enum RunningStatus { RunningStatusUndefined = 0,
+                     RunningStatusNotRunning = 1,
+                     RunningStatusStartsInAFewSeconds = 2,
+                     RunningStatusPausing = 3,
+                     RunningStatusRunning = 4
+                   };
+
+/* Some principles:
+   - Objects that return references to other objects contained in their data must make sure
+     that the returned objects have been parsed.
+     (the Loop subclasses take care of that.)
+     Note that this does not apply to Loops and Strings (their are never returned by reference, BTW).
+*/
+
+class Object : public Parsable {
+public:
+   Object();
+   Object(CharArray &d);
+   //can only be called once since data is immutable
+   void setData(const unsigned char*data, unsigned int size, bool doCopy=true);
+   virtual int getLength() = 0;
+protected:
+   CharArray data;
+   //is protected - not used for sections
+   template <class T> friend class StructureLoop;
+   void setData(CharArray &d);
+};
+
+class Section : public Object {
+public:
+   //convenience: sets data and parses if doParse
+   Section(const unsigned char *data, bool doCopy=true);
+   Section() {}
+   TableId getTableId() const;
+   virtual int getLength();
+
+   static int getLength(const unsigned char *d);
+   static TableId getTableId(const unsigned char *d);
+};
+
+class CRCSection : public Section {
+public:
+   //convenience: sets data and parses if doParse
+   CRCSection(const unsigned char *data, bool doCopy=true) : Section(data, doCopy) {}
+   CRCSection() {}
+   bool isValid();
+   //convenience: isValid+CheckParse
+   bool CheckCRCAndParse();
+};
+
+/* A section which has the ExtendedSectionHeader
+   (section_syntax_indicator==1) */
+class NumberedSection : public CRCSection {
+public:
+   NumberedSection(const unsigned char *data, bool doCopy=true) : CRCSection(data, doCopy) {}
+   NumberedSection() {}
+   bool getCurrentNextIndicator() const;
+   int getVersionNumber() const;
+   int getSectionNumber() const;
+   int getLastSectionNumber() const;
+   bool moreThanOneSection()  const { return getLastSectionNumber()>1; }
+};
+
+class VariableLengthPart : public Object {
+public:
+   //never forget to call this
+   void setData(CharArray d, int l) { Object::setData(d); length=l; }
+   //convenience method
+   void setDataAndOffset(CharArray d, int l, unsigned int &offset) { Object::setData(d); length=l; offset+=l; }
+   virtual int getLength() { return length; }
+private:
+   int length;
+};
+
+class LoopElement : public Object {
+};
+
+class SubStructure : public LoopElement {
+};
+
+class Descriptor : public LoopElement {
+public:
+   virtual int getLength();
+   DescriptorTag getDescriptorTag() const;
+
+   static int getLength(const unsigned char *d);
+   static DescriptorTag getDescriptorTag(const unsigned char *d);
+protected:
+   friend class DescriptorLoop;
+   //returns a subclass of descriptor according to the data given.
+   //The object is allocated with new and must be delete'd.
+   //setData() will have been called, CheckParse() not.
+   //Never returns null - maybe the UnimplementedDescriptor.
+   static Descriptor *getDescriptor(CharArray d, DescriptorTagDomain domain);
+};
+
+class Loop : public VariableLengthPart {
+public:
+   class Iterator {
+   public:
+      Iterator() { i=0; }
+      void reset() { i=0; }
+   private:
+      template <class T> friend class StructureLoop;
+      friend class DescriptorLoop;
+      template <class T> friend class TypeLoop;
+      int i;
+   };
+protected:
+   virtual void Parse() {}
+};
+
+//contains LoopElements of one type only
+template <class T> class StructureLoop : public Loop {
+public:
+   //currently you must use a while-loop testing for hasNext()
+   //i must be 0 to get the first descriptor (with the first call)
+   T getNext(Iterator &it)
+      {
+         CharArray d=data;
+         d.addOffset(it.i);
+         T ret;
+         ret.setData(d);
+         ret.CheckParse();
+         it.i+=ret.getLength();
+         return ret;
+      }
+   T* getNextAsPointer(Iterator &it)
+      {
+         if (getLength() <= it.i)
+            return 0;
+         CharArray d=data;
+         d.addOffset(it.i);
+         T *ret=new T();
+         ret->setData(d);
+         ret->CheckParse();
+         it.i+=ret->getLength();
+         return ret;
+      }
+   bool hasNext(Iterator &it) { return getLength() > it.i; }
+};
+
+//contains descriptors of different types
+class DescriptorLoop : public Loop {
+public:
+   DescriptorLoop() { domain=SI; }
+   //i must be 0 to get the first descriptor (with the first call)
+   //All returned descriptors must be delete'd.
+   //returns null if no more descriptors available
+   Descriptor *getNext(Iterator &it);
+   //return the next descriptor with given tag, or 0 if not available.
+   //if the descriptor found is not implemented,
+   // an UnimplementedDescriptor will be returned if returnUnimplemetedDescriptor==true,
+   // 0 will be returned if returnUnimplemetedDescriptor==false
+   Descriptor *getNext(Iterator &it, DescriptorTag tag, bool returnUnimplemetedDescriptor=false);
+   //return the next descriptor with one of the given tags, or 0 if not available.
+   Descriptor *getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplemetedDescriptor=false);
+protected:
+   Descriptor *createDescriptor(int &i);
+   DescriptorTagDomain domain;
+};
+
+typedef uint8_t   EightBit;
+typedef uint16_t  SixteenBit;
+typedef uint32_t  ThirtyTwoBit;
+typedef uint64_t  SixtyFourBit;
+
+template <typename T> class TypeLoop : public Loop {
+public:
+   int getCount() const { return getLength()/sizeof(T); }
+   T operator[](const unsigned int index) const
+      {
+         switch (sizeof(T)) {
+         case 1:
+            return data[index];
+         case 2:
+            return data.TwoBytes(index);
+         case 4:
+            return data.FourBytes(index);
+         case 8:
+            return (SixtyFourBit(data.FourBytes(index)) << 32) | data.FourBytes(index+4);
+         }
+      }
+   T getNext(Iterator &it) const
+      {
+         T ret=operator[](it.i);
+         it.i+=sizeof(T);
+         return ret;
+      }
+   bool hasNext(Iterator &it) { return getLength() > it.i; }
+};
+
+class MHP_DescriptorLoop : public DescriptorLoop {
+public:
+   MHP_DescriptorLoop() { domain=MHP; }
+};
+
+//The content of the ExtendedEventDescriptor may be split over several
+//descriptors if the text is longer than 256 bytes.
+//The following classes provide base functionality to handle this case.
+class GroupDescriptor : public Descriptor {
+public:
+   virtual int getDescriptorNumber() = 0;
+   virtual int getLastDescriptorNumber() = 0;
+};
+
+class DescriptorGroup {
+public:
+   DescriptorGroup(bool deleteOnDesctruction=true);
+   ~DescriptorGroup();
+   void Add(GroupDescriptor *d);
+   void Delete();
+   int getLength() { return length; }
+   GroupDescriptor **getDescriptors() { return array; }
+   bool isComplete(); //if all descriptors have been added
+protected:
+   int length;
+   GroupDescriptor **array;
+   bool deleteOnDesctruction;
+};
+
+class String : public VariableLengthPart {
+public:
+   //A note to the length: getLength() returns the length of the raw data.
+   //The text may be shorter. Its length can be obtained with one of the
+   //above functions and strlen.
+
+   //returns text. Data is allocated with new and must be delete'd by the user.
+   char *getText();
+   //copies text into given buffer.
+   //a buffer of size getLength()+1 is guaranteed to be sufficiently large.
+   //In most descriptors the string length is an 8-bit field,
+   //so the maximum there is 256.
+   //returns the given buffer for convenience.
+   char * getText(char *buffer);
+protected:
+   virtual void Parse() {}
+   void decodeText(char *buffer);
+};
+
+} //end of namespace
+
+#endif //LIBSI_SI_H
diff --git a/libsi/util.c b/libsi/util.c
new file mode 100644
index 000000000..a2a6f0d21
--- /dev/null
+++ b/libsi/util.c
@@ -0,0 +1,281 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg, Rolf Hakenes                *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: util.c 1.3 2003/12/22 14:03:03 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#include <string.h>
+#include "util.h"
+
+namespace SI {
+
+/*---------------------------- CharArray ----------------------------*/
+
+CharArray::CharArray() : data_(0), off(0) {
+}
+
+CharArray::~CharArray() {
+   if (!data_)
+      return;
+   if (--data_->count_ == 0)
+      delete data_;
+}
+
+CharArray::CharArray(const CharArray &f) : data_(f.data_), off(f.off) {
+   if (data_)
+      ++ data_->count_;
+}
+
+CharArray& CharArray::operator=(const CharArray &f) {
+    // DO NOT CHANGE THE ORDER OF THESE STATEMENTS!
+    // (This order properly handles self-assignment)
+    if (f.data_) {
+      ++ f.data_->count_;
+    }
+    if (data_) {
+      if (--data_->count_ == 0)
+         delete data_;
+    }
+    data_ = f.data_;
+    off = f.off;
+    return *this;
+}
+
+void CharArray::assign(const unsigned char*data, unsigned int size, bool doCopy) {
+    //immutable
+    if (!data_)
+      data_= doCopy ? (Data*)new DataOwnData() : (Data*)new DataForeignData();
+    // This method might need to change things in *data_
+    // Thus it first checks if this is the only pointer to *data_
+    if (data_->count_ > 1) {
+      Data* d = doCopy ? (Data*)new DataOwnData() : (Data*)new DataForeignData();
+      -- data_->count_;
+      data_ = d;
+    }
+    data_->assign(data, size);
+}
+
+bool CharArray::operator==(const char *string) const {
+   //here we can use strcmp, string is null-terminated.
+   if (!data_)
+      return false;
+   return data_->size ? (!strcmp((const char*)data_->data, string)) : string[0]==0;
+}
+
+bool CharArray::operator==(const CharArray &other) const {
+   if (!data_ || !other.data_)
+      return !(data_ || other.data_); //true if both empty
+
+   if (data_->size != other.data_->size)
+      return false;
+
+   //do _not_ use strcmp! Data is not necessarily null-terminated.
+   for (unsigned int i=0;i<data_->size;i++)
+      if (data_->data[i] != other.data_->data[i])
+         return false;
+   return true;
+}
+
+CharArray CharArray::operator+(const unsigned int offset) const {
+   CharArray f(*this);
+   f.off+=offset;
+   return f;
+}
+
+CharArray::Data::Data() : count_(1) {
+   size=0;
+   data=0;
+   /*
+   lockingPid = 0;
+   locked = 0;
+   pthread_mutex_init(&mutex, NULL);
+   */
+}
+
+CharArray::Data::~Data() {
+   /*
+   if (locked)
+      pthread_mutex_unlock(&mutex);
+   pthread_mutex_destroy(&mutex);
+   */
+}
+
+/*CharArray::Data::Data(const Data& d) : count_(1) {
+   size=0;
+   data=0;
+
+   lockingPid = 0;
+   locked = 0;
+   pthread_mutex_init(&mutex, NULL);
+}*/
+
+CharArray::DataOwnData::~DataOwnData() {
+   Delete();
+}
+
+void CharArray::DataOwnData::assign(const unsigned char*d, unsigned int s) {
+   Delete();
+   size=s;
+   unsigned char *newdata=new unsigned char[size];
+   memcpy(newdata, d, size);
+   data=newdata;
+}
+
+void CharArray::DataOwnData::Delete() {
+   delete[] data;
+}
+
+CharArray::DataForeignData::~DataForeignData() {
+   Delete();
+}
+
+void CharArray::DataForeignData::assign(const unsigned char*d, unsigned int s) {
+   size=s;
+   data=d;
+}
+
+void CharArray::DataForeignData::Delete() {
+   //do not delete!
+}
+
+/*
+void CharArray::Data::assign(unsigned int s) {
+   if (data)
+      delete[] data;
+   size=s;
+   if (size) { //new assignment may be zero length
+      data=new unsigned char[size];
+      memset(data, 0, size);
+   }
+}
+
+void CharArray::Data::Lock(void)
+{
+  if ( !pthread_equal(pthread_self(), lockingPid) || !locked) {
+     pthread_mutex_lock(&mutex);
+     lockingPid = pthread_self();
+     }
+  locked++;
+}
+
+void CharArray::Data::Unlock(void)
+{
+   if (!--locked) {
+     lockingPid = 0;
+     pthread_mutex_unlock(&mutex);
+   }
+}
+*/
+
+Parsable::Parsable() {
+   parsed=false;
+}
+
+void Parsable::CheckParse() {
+   if (!parsed) {
+      parsed=true;
+      Parse();
+   }
+}
+
+//taken and adapted from libdtv, (c) Rolf Hakenes and VDR, (c) Klaus Schmidinger
+time_t DVBTime::getTime(unsigned char date_hi, unsigned char date_lo, unsigned char time_hour, unsigned char time_minute, unsigned char time_second) {
+   u_int16_t mjd = date_hi << 8 | date_lo;
+   struct tm t;
+
+   t.tm_sec = bcdToDec(time_second);
+   t.tm_min = bcdToDec(time_minute);
+   t.tm_hour = bcdToDec(time_hour);
+
+   int k;
+   t.tm_year = (int) ((mjd - 15078.2) / 365.25);
+   t.tm_mon = (int) ((mjd - 14956.1 - (int)(t.tm_year * 365.25)) / 30.6001);
+   t.tm_mday = (int) (mjd - 14956 - (int)(t.tm_year * 365.25) - (int)(t.tm_mon * 30.6001));
+   k = (t.tm_mon == 14 || t.tm_mon == 15) ? 1 : 0;
+   t.tm_year = t.tm_year + k;
+   t.tm_mon = t.tm_mon - 1 - k * 12;
+   t.tm_mon--;
+
+   t.tm_isdst = -1;
+   t.tm_gmtoff = 0;
+
+   return timegm(&t);
+}
+
+time_t DVBTime::getDuration(unsigned char time_hour, unsigned char time_minute, unsigned char time_second) {
+   return
+     bcdToDec(time_second)
+   + bcdToDec(time_minute) * 60
+   + bcdToDec(time_hour) *3600;
+}
+
+//taken and adapted from libdtv, (c) Rolf Hakenes
+// CRC32 lookup table for polynomial 0x04c11db7
+u_int32_t CRC32::crc_table[256] = {
+   0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+   0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+   0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+   0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+   0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
+   0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+   0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
+   0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+   0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
+   0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+   0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
+   0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+   0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
+   0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+   0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
+   0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+   0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
+   0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+   0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
+   0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+   0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
+   0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+   0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
+   0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+   0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
+   0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+   0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
+   0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+   0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
+   0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+   0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
+   0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+   0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
+   0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+   0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
+   0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+   0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
+   0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+   0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
+   0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+   0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
+   0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+   0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
+
+u_int32_t CRC32::crc32 (const char *d, int len, u_int32_t crc)
+{
+   register int i;
+
+   for (i=0; i<len; i++)
+      crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *d++) & 0xff];
+
+   return crc;
+}
+
+CRC32::CRC32(const char *d, int len, u_int32_t CRCvalue) {
+   data=d;
+   length=len;
+   value=CRCvalue;
+}
+
+} //end of namespace
diff --git a/libsi/util.h b/libsi/util.h
new file mode 100644
index 000000000..db0192386
--- /dev/null
+++ b/libsi/util.h
@@ -0,0 +1,157 @@
+/***************************************************************************
+ *       Copyright (c) 2003 by Marcel Wiesweg                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   $Id: util.h 1.3 2003/12/22 14:07:41 kls Exp $
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef LIBSI_UTIL_H
+#define LIBSI_UTIL_H
+
+#include <stdint.h>
+#include <sys/types.h>
+#include <pthread.h>
+#include <time.h>
+
+#define HILO(x) (x##_hi << 8 | x##_lo)
+#define BCD_TIME_TO_SECONDS(x) ((3600 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
+                             (60 * ((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))) + \
+                             ((10*((x##_s & 0xF0)>>4)) + (x##_s & 0xF)))
+
+namespace SI {
+
+//Holds an array of unsigned char which is deleted
+//when the last object pointing to it is deleted.
+//Optimized for use in libsi.
+class CharArray {
+public:
+   CharArray();
+
+   CharArray(const CharArray &source);
+   CharArray& operator=(const CharArray &source);
+   ~CharArray();
+
+   //can be called exactly once
+   void assign(const unsigned char*data, unsigned int size, bool doCopy=true);
+   //compares to a null-terminated string
+   bool operator==(const char *string) const;
+   //compares to another CharArray (data not necessarily null-terminated)
+   bool operator==(const CharArray &other) const;
+
+   //returns another CharArray with its offset incremented by offset
+   CharArray operator+(const unsigned int offset) const;
+
+   //access and convenience methods
+   const unsigned char* getData() const { return data_->data+off; }
+   const unsigned char* getData(int offset) const { return data_->data+offset+off; }
+   template <typename T> const T* getData() const { return (T*)(data_->data+off); }
+   template <typename T> const T* getData(int offset) const { return (T*)(data_->data+offset+off); }
+      //sets p to point to data+offset, increments offset
+   template <typename T> void setPointerAndOffset(const T* &p, unsigned int &offset) const { p=(T*)getData(offset); offset+=sizeof(T); }
+   unsigned char operator[](const unsigned int index) const { return data_->data ? data_->data[off+index] : 0; }
+   int getLength() const { return data_->size; }
+   u_int16_t TwoBytes(const unsigned int index) const { return data_->data ? data_->TwoBytes(off+index) : 0; }
+   u_int32_t FourBytes(const unsigned int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
+
+   void addOffset(unsigned int offset) { off+=offset; }
+private:
+   class Data {
+   public:
+      Data();
+      virtual ~Data();
+
+      virtual void assign(const unsigned char*data, unsigned int size) = 0;
+      virtual void Delete() = 0;
+
+      u_int16_t TwoBytes(const unsigned int index) const
+         { return (data[index] << 8) | data[index+1]; }
+      u_int32_t FourBytes(const unsigned int index) const
+         { return (data[index] << 24) | (data[index+1] << 16) | (data[index+2] << 8) | data[index+3]; }
+      /*#ifdef CHARARRAY_THREADSAFE
+      void Lock();
+      void Unlock();
+      #else
+      void Lock() {}
+      void Unlock() {}
+      #endif
+      Data(const Data& d);
+      void assign(unsigned int size);
+      */
+
+      const unsigned char*data;
+      unsigned int size;
+
+      unsigned count_;
+      // count_ is the number of CharArray objects that point at this
+      // count_ must be initialized to 1 by all constructors
+      // (it starts as 1 since it is pointed to by the CharArray object that created it)
+
+      /*
+      pthread_mutex_t mutex;
+      pid_t lockingPid;
+      pthread_t locked;
+      */
+   };
+   class DataOwnData : public Data {
+   public:
+      DataOwnData() {}
+      virtual ~DataOwnData();
+      virtual void assign(const unsigned char*data, unsigned int size);
+      virtual void Delete();
+   };
+   class DataForeignData : public Data {
+   public:
+      DataForeignData() {}
+      virtual ~DataForeignData();
+      virtual void assign(const unsigned char*data, unsigned int size);
+      virtual void Delete();
+   };
+   Data* data_;
+   unsigned int off;
+};
+
+
+
+//abstract base class
+class Parsable {
+public:
+   void CheckParse();
+protected:
+   Parsable();
+   virtual ~Parsable() {}
+   //actually parses given data.
+   virtual void Parse() = 0;
+private:
+   bool parsed;
+};
+
+//taken and adapted from libdtv, (c) Rolf Hakenes and VDR, (c) Klaus Schmidinger
+namespace DVBTime {
+time_t getTime(unsigned char date_hi, unsigned char date_lo, unsigned char timehr, unsigned char timemi, unsigned char timese);
+time_t getDuration(unsigned char timehr, unsigned char timemi, unsigned char timese);
+inline unsigned char bcdToDec(unsigned char b) { return ((b >> 4) & 0x0F) * 10 + (b & 0x0F); }
+};
+
+//taken and adapted from libdtv, (c) Rolf Hakenes
+class CRC32 {
+public:
+   CRC32(const char *d, int len, u_int32_t CRCvalue=0xFFFFFFFF);
+   bool isValid() { return crc32(data, length, value) == 0; }
+   static bool isValid(const char *d, int len, u_int32_t CRCvalue=0xFFFFFFFF) { return crc32(d, len, CRCvalue) == 0; }
+protected:
+   static u_int32_t crc_table[256];
+   static u_int32_t crc32 (const char *d, int len, u_int32_t CRCvalue);
+
+   const char *data;
+   int length;
+   u_int32_t value;
+};
+
+} //end of namespace
+
+#endif
diff --git a/lirc.c b/lirc.c
index 0774cf812..d1aa4e598 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.6 2003/04/27 11:39:47 kls Exp $
+ * $Id: lirc.c 1.7 2003/10/18 11:34:02 kls Exp $
  */
 
 #include "lirc.h"
@@ -20,6 +20,7 @@
 
 cLircRemote::cLircRemote(char *DeviceName)
 :cRemote("LIRC")
+,cThread("LIRC remote control")
 {
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
@@ -49,8 +50,6 @@ bool cLircRemote::Ready(void)
 
 void cLircRemote::Action(void)
 {
-  dsyslog("LIRC remote control thread started (pid=%d)", getpid());
-
   int FirstTime = 0;
   int LastTime = 0;
   char buf[LIRC_BUFFER_SIZE];
diff --git a/menu.c b/menu.c
index 72683c01f..5e628bbb2 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.273 2003/10/03 14:36:20 kls Exp $
+ * $Id: menu.c 1.276 2004/01/04 11:12:43 kls Exp $
  */
 
 #include "menu.h"
@@ -16,7 +16,6 @@
 #include "channels.h"
 #include "config.h"
 #include "cutter.h"
-#include "eit.h"
 #include "i18n.h"
 #include "menuitems.h"
 #include "plugin.h"
@@ -69,7 +68,7 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
     case kLeft|k_Repeat:
     case kLeft:  delta = -1;
     case kRight|k_Repeat:
-    case kRight: 
+    case kRight:
                  {
                    cChannel *channel = Channels.GetByNumber(*value + delta, delta);
                    if (channel) {
@@ -458,7 +457,7 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
            }
         }
      else if (NORMALKEY(Key) == kRight) {
-        if (source) { 
+        if (source) {
            if (source->Next())
               source = (cSource *)source->Next();
            }
@@ -582,7 +581,7 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
-  Add(new cMenuEditCaItem(  tr("CA"),           &data.ca, true));
+  Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0], true));//XXX
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 0));
   /* XXX not yet used
   Add(new cMenuEditIntItem( tr("Nid"),          &data.nid, 0));
@@ -616,7 +615,6 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
            if (channel) {
               *channel = data;
               isyslog("edited channel %d %s", channel->Number(), data.ToText());
-              Timers.Save();
               state = osBack;
               }
            else {
@@ -627,7 +625,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
               isyslog("added channel %d %s", channel->Number(), data.ToText());
               state = osUser1;
               }
-           Channels.Save();
+           Channels.SetModified();
            }
         else {
            Interface->Error(tr("Channel settings are not unique!"));
@@ -683,6 +681,7 @@ class cMenuChannels : public cOsdMenu {
   virtual void Move(int From, int To);
 public:
   cMenuChannels(void);
+  ~cMenuChannels();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -694,6 +693,12 @@ cMenuChannels::cMenuChannels(void)
          Add(new cMenuChannelItem(channel), channel->Number() == cDevice::CurrentChannel());
       }
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
+  Channels.IncBeingEdited();
+}
+
+cMenuChannels::~cMenuChannels()
+{
+  Channels.DecBeingEdited();
 }
 
 cChannel *cMenuChannels::GetChannel(int Index)
@@ -705,11 +710,10 @@ cChannel *cMenuChannels::GetChannel(int Index)
 void cMenuChannels::Propagate(void)
 {
   Channels.ReNumber();
-  Channels.Save();
   for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
       ci->Set();
-  Timers.Save(); // channel numbering has changed!
   Display();
+  Channels.SetModified();
 }
 
 eOSState cMenuChannels::Switch(void)
@@ -904,7 +908,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:     {  
+       case kOk:     {
                        cChannel *ch = Channels.GetByNumber(channel);
                        if (ch)
                           data.channel = ch;
@@ -1128,29 +1132,29 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
 
 class cMenuEvent : public cOsdMenu {
 private:
-  const cEventInfo *eventInfo;
+  const cEvent *event;
 public:
-  cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch = false);
+  cMenuEvent(const cEvent *Event, bool CanSwitch = false);
   cMenuEvent(bool Now);
   virtual eOSState ProcessKey(eKeys Key);
 };
 
-cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
+cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
 :cOsdMenu(tr("Event"))
 {
-  eventInfo = EventInfo;
-  if (eventInfo) {
-     cChannel *channel = Channels.GetByChannelID(eventInfo->GetChannelID(), true);
+  event = Event;
+  if (event) {
+     cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
      if (channel) {
         char *buffer;
-        asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
+        asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, event->GetDateString(), event->GetTimeString(), event->GetEndTimeString());
         SetTitle(buffer, false);
         free(buffer);
         int Line = 2;
         cMenuTextItem *item;
-        const char *Title = eventInfo->GetTitle();
-        const char *Subtitle = eventInfo->GetSubtitle();
-        const char *ExtendedDescription = eventInfo->GetExtendedDescription();
+        const char *Title = event->Title();
+        const char *Subtitle = event->ShortText();
+        const char *ExtendedDescription = event->Description();
         if (!isempty(Title)) {
            Add(item = new cMenuTextItem(Title, 1, Line, Setup.OSDwidth - 2, -1, clrCyan));
            Line += item->Height() + 1;
@@ -1185,16 +1189,16 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
 
 class cMenuWhatsOnItem : public cOsdItem {
 public:
-  const cEventInfo *eventInfo;
-  cMenuWhatsOnItem(const cEventInfo *EventInfo);
+  const cEvent *event;
+  cMenuWhatsOnItem(const cEvent *Event);
 };
 
-cMenuWhatsOnItem::cMenuWhatsOnItem(const cEventInfo *EventInfo)
+cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event)
 {
-  eventInfo = EventInfo;
+  event = Event;
   char *buffer = NULL;
-  cChannel *channel = Channels.GetByNumber(eventInfo->GetChannelNumber());
-  asprintf(&buffer, "%d\t%.*s\t%.*s\t%s", eventInfo->GetChannelNumber(), 6, channel ? channel->Name() : "???", 5, eventInfo->GetTimeString(), eventInfo->GetTitle());
+  cChannel *channel = Channels.GetByNumber(event->ChannelNumber());
+  asprintf(&buffer, "%d\t%.*s\t%.*s\t%s", event->ChannelNumber(), 6, channel ? channel->Name() : "???", 5, event->GetTimeString(), event->Title());
   SetText(buffer, false);
 }
 
@@ -1205,36 +1209,36 @@ class cMenuWhatsOn : public cOsdMenu {
   eOSState Record(void);
   eOSState Switch(void);
   static int currentChannel;
-  static const cEventInfo *scheduleEventInfo;
+  static const cEvent *scheduleEvent;
 public:
   cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr);
   static int CurrentChannel(void) { return currentChannel; }
   static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; }
-  static const cEventInfo *ScheduleEventInfo(void);
+  static const cEvent *ScheduleEvent(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
 int cMenuWhatsOn::currentChannel = 0;
-const cEventInfo *cMenuWhatsOn::scheduleEventInfo = NULL;
+const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 
 static int CompareEventChannel(const void *p1, const void *p2)
 {
-  return (int)( (*(const cEventInfo **)p1)->GetChannelNumber() - (*(const cEventInfo **)p2)->GetChannelNumber());
+  return (int)( (*(const cEvent **)p1)->ChannelNumber() - (*(const cEvent **)p2)->ChannelNumber());
 }
 
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
 :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6)
 {
   const cSchedule *Schedule = Schedules->First();
-  const cEventInfo **pArray = NULL;
+  const cEvent **pArray = NULL;
   int num = 0;
 
   while (Schedule) {
-        pArray = (const cEventInfo **)realloc(pArray, (num + 1) * sizeof(cEventInfo *));
+        pArray = (const cEvent **)realloc(pArray, (num + 1) * sizeof(cEvent *));
 
         pArray[num] = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
         if (pArray[num]) {
-           cChannel *channel = Channels.GetByChannelID(pArray[num]->GetChannelID(), true);
+           cChannel *channel = Channels.GetByChannelID(pArray[num]->ChannelID(), true);
            if (channel) {
               pArray[num]->SetChannelNumber(channel->Number());
               num++;
@@ -1243,20 +1247,20 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
         Schedule = (const cSchedule *)Schedules->Next(Schedule);
         }
 
-  qsort(pArray, num, sizeof(cEventInfo *), CompareEventChannel);
+  qsort(pArray, num, sizeof(cEvent *), CompareEventChannel);
 
   for (int a = 0; a < num; a++)
-      Add(new cMenuWhatsOnItem(pArray[a]), pArray[a]->GetChannelNumber() == CurrentChannelNr);
+      Add(new cMenuWhatsOnItem(pArray[a]), pArray[a]->ChannelNumber() == CurrentChannelNr);
 
   currentChannel = CurrentChannelNr;
   free(pArray);
   SetHelp(Count() ? tr("Record") : NULL, Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
 }
 
-const cEventInfo *cMenuWhatsOn::ScheduleEventInfo(void)
+const cEvent *cMenuWhatsOn::ScheduleEvent(void)
 {
-  const cEventInfo *ei = scheduleEventInfo;
-  scheduleEventInfo = NULL;
+  const cEvent *ei = scheduleEvent;
+  scheduleEvent = NULL;
   return ei;
 }
 
@@ -1264,7 +1268,7 @@ eOSState cMenuWhatsOn::Switch(void)
 {
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {
-     cChannel *channel = Channels.GetByChannelID(item->eventInfo->GetChannelID(), true);
+     cChannel *channel = Channels.GetByChannelID(item->event->ChannelID(), true);
      if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
         return osEnd;
      }
@@ -1276,7 +1280,7 @@ eOSState cMenuWhatsOn::Record(void)
 {
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {
-     cTimer *timer = new cTimer(item->eventInfo);
+     cTimer *timer = new cTimer(item->event);
      cTimer *t = Timers.GetTimer(timer);
      if (t) {
         delete timer;
@@ -1300,14 +1304,14 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
        case kGreen:  {
                        cMenuWhatsOnItem *mi = (cMenuWhatsOnItem *)Get(Current());
                        if (mi) {
-                          scheduleEventInfo = mi->eventInfo;
-                          currentChannel = mi->eventInfo->GetChannelNumber();
+                          scheduleEvent = mi->event;
+                          currentChannel = mi->event->ChannelNumber();
                           }
                      }
                      break;
        case kBlue:   return Switch();
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuWhatsOnItem *)Get(Current()))->eventInfo, true));
+                        return AddSubMenu(new cMenuEvent(((cMenuWhatsOnItem *)Get(Current()))->event, true));
                      break;
        default:      break;
        }
@@ -1319,15 +1323,15 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
 
 class cMenuScheduleItem : public cOsdItem {
 public:
-  const cEventInfo *eventInfo;
-  cMenuScheduleItem(const cEventInfo *EventInfo);
+  const cEvent *event;
+  cMenuScheduleItem(const cEvent *Event);
 };
 
-cMenuScheduleItem::cMenuScheduleItem(const cEventInfo *EventInfo)
+cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event)
 {
-  eventInfo = EventInfo;
+  event = Event;
   char *buffer = NULL;
-  asprintf(&buffer, "%.*s\t%.*s\t%s", 5, eventInfo->GetDate(), 5, eventInfo->GetTimeString(), eventInfo->GetTitle());
+  asprintf(&buffer, "%.*s\t%.*s\t%s", 5, event->GetDateString(), 5, event->GetTimeString(), event->Title());
   SetText(buffer, false);
 }
 
@@ -1335,7 +1339,7 @@ cMenuScheduleItem::cMenuScheduleItem(const cEventInfo *EventInfo)
 
 class cMenuSchedule : public cOsdMenu {
 private:
-  cMutexLock mutexLock;
+  cSchedulesLock schedulesLock;
   const cSchedules *schedules;
   bool now, next;
   int otherChannel;
@@ -1356,7 +1360,7 @@ cMenuSchedule::cMenuSchedule(void)
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel) {
      cMenuWhatsOn::SetCurrentChannel(channel->Number());
-     schedules = cSIProcessor::Schedules(mutexLock);
+     schedules = cSchedules::Schedules(schedulesLock);
      PrepareSchedule(channel);
      SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"));
      }
@@ -1364,12 +1368,12 @@ cMenuSchedule::cMenuSchedule(void)
 
 cMenuSchedule::~cMenuSchedule()
 {
-  cMenuWhatsOn::ScheduleEventInfo(); // makes sure any posted data is cleared
+  cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared
 }
 
 static int CompareEventTime(const void *p1, const void *p2)
 {
-  return (int)((*(cEventInfo **)p1)->GetTime() - (*(cEventInfo **)p2)->GetTime());
+  return (int)((*(cEvent **)p1)->StartTime() - (*(cEvent **)p2)->StartTime());
 }
 
 void cMenuSchedule::PrepareSchedule(cChannel *Channel)
@@ -1381,22 +1385,24 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
   free(buffer);
   if (schedules) {
      const cSchedule *Schedule = schedules->GetSchedule(Channel->GetChannelID());
-     int num = Schedule->NumEvents();
-     const cEventInfo **pArray = MALLOC(const cEventInfo *, num);
-     if (pArray) {
-        time_t now = time(NULL);
-        int numreal = 0;
-        for (int a = 0; a < num; a++) {
-            const cEventInfo *EventInfo = Schedule->GetEventNumber(a);
-            if (EventInfo->GetTime() + EventInfo->GetDuration() > now)
-               pArray[numreal++] = EventInfo;
-            }
-
-        qsort(pArray, numreal, sizeof(cEventInfo *), CompareEventTime);
-
-        for (int a = 0; a < numreal; a++)
-            Add(new cMenuScheduleItem(pArray[a]));
-        free(pArray);
+     if (Schedule) {
+        int num = Schedule->NumEvents();
+        const cEvent **pArray = MALLOC(const cEvent *, num);
+        if (pArray) {
+           time_t now = time(NULL);
+           int numreal = 0;
+           for (int a = 0; a < num; a++) {
+               const cEvent *Event = Schedule->GetEventNumber(a);
+               if (Event->StartTime() + Event->Duration() > now)
+                  pArray[numreal++] = Event;
+               }
+   
+           qsort(pArray, numreal, sizeof(cEvent *), CompareEventTime);
+   
+           for (int a = 0; a < numreal; a++)
+               Add(new cMenuScheduleItem(pArray[a]));
+           free(pArray);
+           }
         }
      }
 }
@@ -1405,7 +1411,7 @@ eOSState cMenuSchedule::Record(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
-     cTimer *timer = new cTimer(item->eventInfo);
+     cTimer *timer = new cTimer(item->event);
      cTimer *t = Timers.GetTimer(timer);
      if (t) {
         delete timer;
@@ -1438,7 +1444,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                         if (!now && !next) {
                            int ChannelNr = 0;
                            if (Count()) {
-                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetChannelID(), true);
+                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->event->ChannelID(), true);
                               if (channel)
                                  ChannelNr = channel->Number();
                               }
@@ -1456,16 +1462,16 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                         return Switch();
                      break;
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->eventInfo, otherChannel));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel));
                      break;
        default:      break;
        }
      }
   else if (!HasSubMenu()) {
      now = next = false;
-     const cEventInfo *ei = cMenuWhatsOn::ScheduleEventInfo();
+     const cEvent *ei = cMenuWhatsOn::ScheduleEvent();
      if (ei) {
-        cChannel *channel = Channels.GetByChannelID(ei->GetChannelID(), true);
+        cChannel *channel = Channels.GetByChannelID(ei->ChannelID(), true);
         if (channel) {
            PrepareSchedule(channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
@@ -1985,6 +1991,7 @@ class cMenuSetupOSD : public cMenuSetupBase {
   virtual void Set(void);
 public:
   cMenuSetupOSD(void) { Set(); }
+  virtual ~cMenuSetupOSD() { cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]); }
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -2011,6 +2018,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
   if (data.OSDLanguage != osdLanguage) {
      int OriginalOSDLanguage = Setup.OSDLanguage;
      Setup.OSDLanguage = data.OSDLanguage;
+     cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
      Set();
      Display();
      Setup.OSDLanguage = OriginalOSDLanguage;
@@ -2631,10 +2639,10 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   int EpgLines = withInfo ? 5 : 1;
   lines = 0;
   number = 0;
-  cChannel *channel = Channels.GetByNumber(Number);
+  channel = Channels.GetByNumber(Number);
   Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   if (channel) {
-     DisplayChannel(channel);
+     DisplayChannel();
      DisplayInfo();
      }
   lastTime = time_ms();
@@ -2658,16 +2666,16 @@ cDisplayChannel::~cDisplayChannel()
   Interface->Close();
 }
 
-void cDisplayChannel::DisplayChannel(const cChannel *Channel)
+void cDisplayChannel::DisplayChannel(void)
 {
   int BufSize = Width() + 1;
   char buffer[BufSize];
   *buffer = 0;
-  if (Channel) {
-     if (Channel->GroupSep())
-        snprintf(buffer, BufSize, "%s", Channel->Name());
+  if (channel) {
+     if (channel->GroupSep())
+        snprintf(buffer, BufSize, "%s", channel->Name());
      else
-        snprintf(buffer, BufSize, "%d%s  %s", Channel->Number(), number ? "-" : "", Channel->Name());
+        snprintf(buffer, BufSize, "%d%s  %s", channel->Number(), number ? "-" : "", channel->Name());
      }
   else if (number)
      snprintf(buffer, BufSize, "%d-", number);
@@ -2682,28 +2690,28 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
 
 void cDisplayChannel::DisplayInfo(void)
 {
-  if (withInfo) {
-     const cEventInfo *Present = NULL, *Following = NULL;
-     cMutexLock MutexLock;
-     const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
+  if (withInfo && channel) {
+     const cEvent *Present = NULL, *Following = NULL;
+     cSchedulesLock SchedulesLock;
+     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
      if (Schedules) {
-        const cSchedule *Schedule = Schedules->GetSchedule();
+        const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
         if (Schedule) {
            const char *PresentTitle = NULL, *PresentSubtitle = NULL, *FollowingTitle = NULL, *FollowingSubtitle = NULL;
            int Lines = 0;
            if ((Present = Schedule->GetPresentEvent()) != NULL) {
-              PresentTitle = Present->GetTitle();
+              PresentTitle = Present->Title();
               if (!isempty(PresentTitle))
                  Lines++;
-              PresentSubtitle = Present->GetSubtitle();
+              PresentSubtitle = Present->ShortText();
               if (!isempty(PresentSubtitle))
                  Lines++;
               }
            if ((Following = Schedule->GetFollowingEvent()) != NULL) {
-              FollowingTitle = Following->GetTitle();
+              FollowingTitle = Following->Title();
               if (!isempty(FollowingTitle))
                  Lines++;
-              FollowingSubtitle = Following->GetSubtitle();
+              FollowingSubtitle = Following->ShortText();
               if (!isempty(FollowingSubtitle))
                  Lines++;
               }
@@ -2731,7 +2739,7 @@ void cDisplayChannel::DisplayInfo(void)
               Interface->Flush();
               lines = Lines;
               lastTime = time_ms();
-              cStatus::MsgOsdProgramme(Present ? Present->GetTime() : 0, PresentTitle, PresentSubtitle, Following ? Following->GetTime() : 0, FollowingTitle, FollowingSubtitle);
+              cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, PresentTitle, PresentSubtitle, Following ? Following->StartTime() : 0, FollowingTitle, FollowingSubtitle);
               }
            }
         }
@@ -2741,7 +2749,8 @@ void cDisplayChannel::DisplayInfo(void)
 void cDisplayChannel::Refresh(void)
 {
   Interface->Clear();
-  DisplayChannel(Channels.GetByNumber(cDevice::CurrentChannel()));
+  channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  DisplayChannel();
   lastTime = time_ms();
   lines = 0;
 }
@@ -2759,20 +2768,21 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
          if (number >= 0) {
             number = number * 10 + Key - k0;
             if (number > 0) {
-               cChannel *channel = Channels.GetByNumber(number);
+               channel = Channels.GetByNumber(number);
                Interface->Clear();
                withInfo = false;
-               DisplayChannel(channel);
+               DisplayChannel();
                lastTime = time_ms();
                // Lets see if there can be any useful further input:
                int n = channel ? number * 10 : 0;
-               while (channel && (channel = Channels.Next(channel)) != NULL) {
-                     if (!channel->GroupSep()) {
-                        if (n <= channel->Number() && channel->Number() <= n + 9) {
+               cChannel *ch = channel;
+               while (ch && (ch = Channels.Next(ch)) != NULL) {
+                     if (!ch->GroupSep()) {
+                        if (n <= ch->Number() && ch->Number() <= n + 9) {
                            n = 0;
                            break;
                            }
-                        if (channel->Number() > n)
+                        if (ch->Number() > n)
                            n *= 10;
                         }
                      }
@@ -2803,10 +2813,10 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                group = Channels.GetPrevGroup(group < 1 ? 1 : group);
             if (group < 0)
                group = SaveGroup;
-            cChannel *channel = Channels.Get(group);
+            channel = Channels.Get(group);
             if (channel) {
                Interface->Clear();
-               DisplayChannel(channel);
+               DisplayChannel();
                if (!channel->GroupSep())
                   group = -1;
                }
@@ -2833,7 +2843,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                Channels.SwitchTo(number);
             else {
                number = 0;
-               DisplayChannel(NULL);
+               channel = NULL;
+               DisplayChannel();
                lastTime = time_ms();
                return osContinue;
                }
@@ -2965,7 +2976,7 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
 
 cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
 {
-  eventInfo = NULL;
+  event = NULL;
   instantId = NULL;
   fileName = NULL;
   recorder = NULL;
@@ -2984,10 +2995,10 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   const char *Title = NULL;
   const char *Subtitle = NULL;
   const char *Summary = NULL;
-  if (GetEventInfo()) {
-     Title = eventInfo->GetTitle();
-     Subtitle = eventInfo->GetSubtitle();
-     Summary = eventInfo->GetExtendedDescription();
+  if (GetEvent()) {
+     Title = event->Title();
+     Subtitle = event->ShortText();
+     Summary = event->Description();
      dsyslog("Title: '%s' Subtitle: '%s'", Title, Subtitle);
      }
   cRecording Recording(timer, Title, Subtitle, Summary);
@@ -3036,19 +3047,19 @@ cRecordControl::~cRecordControl()
 
 #define INSTANT_REC_EPG_LOOKAHEAD 300 // seconds to look into the EPG data for an instant recording
 
-bool cRecordControl::GetEventInfo(void)
+bool cRecordControl::GetEvent(void)
 {
   const cChannel *channel = timer->Channel();
   time_t Time = timer->Active() == taActInst ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
-        cMutexLock MutexLock;
-        const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
+        cSchedulesLock SchedulesLock;
+        const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
         if (Schedules) {
            const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
            if (Schedule) {
-              eventInfo = Schedule->GetEventAround(Time);
-              if (eventInfo) {
+              event = Schedule->GetEventAround(Time);
+              if (event) {
                  if (seconds > 0)
                     dsyslog("got EPG info after %d seconds", seconds);
                  return true;
@@ -3215,6 +3226,20 @@ void cRecordControls::Process(time_t t)
       }
 }
 
+void cRecordControls::ChannelDataModified(cChannel *Channel)
+{
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
+      if (RecordControls[i]) {
+         if (RecordControls[i]->Timer() && RecordControls[i]->Timer()->Channel() == Channel) {
+            isyslog("stopping recording due to modification of channel %d", Channel->Number());
+            RecordControls[i]->Stop(true);
+            // This will restart the recording, maybe even from a different
+            // device in case conditional access has changed.
+            }
+         }
+      }
+}
+
 bool cRecordControls::Active(void)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
diff --git a/menu.h b/menu.h
index e304ea314..041d6f7c2 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.57 2003/08/03 09:37:18 kls Exp $
+ * $Id: menu.h 1.59 2004/01/04 11:01:13 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -12,6 +12,7 @@
 
 #include "ci.h"
 #include "device.h"
+#include "epg.h"
 #include "osd.h"
 #include "dvbplayer.h"
 #include "recorder.h"
@@ -36,7 +37,8 @@ class cDisplayChannel : public cOsdObject {
   int lines;
   int lastTime;
   int number;
-  void DisplayChannel(const cChannel *Channel);
+  cChannel *channel;
+  void DisplayChannel(void);
   void DisplayInfo(void);
   void Refresh(void);
 public:
@@ -113,10 +115,10 @@ class cRecordControl {
   cDevice *device;
   cTimer *timer;
   cRecorder *recorder;
-  const cEventInfo *eventInfo;
+  const cEvent *event;
   char *instantId;
   char *fileName;
-  bool GetEventInfo(void);
+  bool GetEvent(void);
 public:
   cRecordControl(cDevice *Device, cTimer *Timer = NULL, bool Pause = false);
   virtual ~cRecordControl();
@@ -141,6 +143,7 @@ class cRecordControls {
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
   static void Process(time_t t);
+  static void ChannelDataModified(cChannel *Channel);
   static bool Active(void);
   static void Shutdown(void);
   };
@@ -151,7 +154,7 @@ class cReplayControl : public cDvbPlayerControl {
   bool visible, modeOnly, shown, displayFrames;
   int lastCurrent, lastTotal;
   time_t timeoutShow;
-  bool timeSearchActive, timeSearchHide;  
+  bool timeSearchActive, timeSearchHide;
   int timeSearchTime, timeSearchPos;
   void TimeSearchDisplay(void);
   void TimeSearchProcess(eKeys Key);
diff --git a/newplugin b/newplugin
index e47426630..8adae35f1 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.15 2003/05/09 14:59:28 kls Exp $
+# $Id: newplugin 1.16 2003/12/21 15:45:18 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -97,7 +97,7 @@ PACKAGE = vdr-\$(ARCHIVE)
 
 INCLUDES += -I\$(VDRDIR)/include -I\$(DVBDIR)/include
 
-DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
 ### The object files (add further files here):
 
diff --git a/osdbase.c b/osdbase.c
index 98cae8240..2ba4de85a 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.10 2003/08/24 11:38:27 kls Exp $
+ * $Id: osdbase.c 1.11 2003/10/19 14:32:32 kls Exp $
  */
 
 #include "osdbase.h"
@@ -131,7 +131,6 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
 
 cBitmap::~cBitmap()
 {
-  delete font;
   free(bitmap);
 }
 
@@ -139,8 +138,7 @@ eDvbFont cBitmap::SetFont(eDvbFont Font)
 {
   eDvbFont oldFont = fontType;
   if (fontType != Font || !font) {
-     delete font;
-     font = new cFont(Font);
+     font = cFont::GetFont(Font);
      fontType = Font;
      }
   return oldFont;
diff --git a/osdbase.h b/osdbase.h
index 605bd8e90..ce4bc90af 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.6 2002/09/08 14:12:41 kls Exp $
+ * $Id: osdbase.h 1.8 2004/01/04 14:22:43 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include "font.h"
 
-#define MAXNUMCOLORS 16
+#define MAXNUMCOLORS 256
 
 enum eDvbColor {
 #ifdef DEBUG_OSD
@@ -73,7 +73,7 @@ class cPalette {
 
 class cBitmap : public cPalette {
 private:
-  cFont *font;
+  const cFont *font;
   eDvbFont fontType;
   char *bitmap;
   bool clearWithBackground;
diff --git a/pat.c b/pat.c
new file mode 100644
index 000000000..3fa6848c3
--- /dev/null
+++ b/pat.c
@@ -0,0 +1,378 @@
+/*
+ * pat.c: PAT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: pat.c 1.3 2004/01/04 12:27:06 kls Exp $
+ */
+
+#include "pat.h"
+#include <malloc.h>
+#include "channels.h"
+#include "libsi/section.h"
+#include "libsi/descriptor.h"
+#include "thread.h"
+
+#define PMT_SCAN_TIMEOUT  10 // seconds
+
+// --- cCaDescriptor ---------------------------------------------------------
+
+class cCaDescriptor : public cListObject {
+private:
+  int caSystem;
+  bool stream;
+  int length;
+  uchar *data;
+public:
+  cCaDescriptor(int CaSystem, int CaPid, bool Stream, int Length, const uchar *Data);
+  virtual ~cCaDescriptor();
+  bool operator== (const cCaDescriptor &arg) const;
+  int CaSystem(void) { return caSystem; }
+  int Stream(void) { return stream; }
+  int Length(void) const { return length; }
+  const uchar *Data(void) const { return data; }
+  };
+
+cCaDescriptor::cCaDescriptor(int CaSystem, int CaPid, bool Stream, int Length, const uchar *Data)
+{
+  caSystem = CaSystem;
+  stream = Stream;
+  length = Length + 6;
+  data = MALLOC(uchar, length);
+  data[0] = SI::CaDescriptorTag;
+  data[1] = length - 2;
+  data[2] = (caSystem >> 8) & 0xFF;
+  data[3] =  caSystem       & 0xFF;
+  data[4] = ((CaPid   >> 8) & 0x1F) | 0xE0;
+  data[5] =   CaPid         & 0xFF;
+  if (Length)
+     memcpy(&data[6], Data, Length);
+}
+
+cCaDescriptor::~cCaDescriptor()
+{
+  free(data);
+}
+
+bool cCaDescriptor::operator== (const cCaDescriptor &arg) const
+{
+  return length == arg.length && memcmp(data, arg.data, length) == 0;
+}
+
+// --- cCaDescriptors --------------------------------------------------------
+
+class cCaDescriptors : public cListObject {
+private:
+  int source;
+  int transponder;
+  int serviceId;
+  int numCaIds;
+  int caIds[MAXCAIDS + 1];
+  cList<cCaDescriptor> caDescriptors;
+  void AddCaId(int CaId);
+public:
+  cCaDescriptors(int Source, int Transponder, int ServiceId);
+  bool operator== (const cCaDescriptors &arg) const;
+  bool Is(int Source, int Transponder, int ServiceId);
+  bool Is(cCaDescriptors * CaDescriptors);
+  bool Empty(void) { return caDescriptors.Count() == 0; }
+  void AddCaDescriptor(SI::CaDescriptor *d, bool Stream);
+  int GetCaDescriptors(const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+  const int *CaIds(void) { return caIds; }
+  };
+
+cCaDescriptors::cCaDescriptors(int Source, int Transponder, int ServiceId)
+{
+  source = Source;
+  transponder = Transponder;
+  serviceId = ServiceId;
+  numCaIds = 0;
+  caIds[0] = 0;
+}
+
+bool cCaDescriptors::operator== (const cCaDescriptors &arg) const
+{
+  cCaDescriptor *ca1 = caDescriptors.First();
+  cCaDescriptor *ca2 = arg.caDescriptors.First();
+  while (ca1 && ca2) {
+        if (!(*ca1 == *ca2))
+           return false;
+        ca1 = caDescriptors.Next(ca1);
+        ca2 = arg.caDescriptors.Next(ca2);
+        }
+  return !ca1 && !ca2;
+}
+
+bool cCaDescriptors::Is(int Source, int Transponder, int ServiceId)
+{
+  return source == Source && transponder == Transponder && serviceId == ServiceId;
+}
+
+bool cCaDescriptors::Is(cCaDescriptors * CaDescriptors)
+{
+  return Is(CaDescriptors->source, CaDescriptors->transponder, CaDescriptors->serviceId);
+}
+
+void cCaDescriptors::AddCaId(int CaId)
+{
+  if (numCaIds < MAXCAIDS) {
+     for (int i = 0; i < numCaIds; i++) {
+         if (caIds[i] == CaId)
+            return;
+         }
+     caIds[numCaIds++] = CaId;
+     caIds[numCaIds] = 0;
+     }
+}
+
+void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
+{
+  cCaDescriptor *nca = new cCaDescriptor(d->getCaType(), d->getCaPid(), Stream, d->privateData.getLength(), d->privateData.getData());
+  for (cCaDescriptor *ca = caDescriptors.First(); ca; ca = caDescriptors.Next(ca)) {
+      if (*ca == *nca) {
+         delete nca;
+         return;
+         }
+      }
+  AddCaId(nca->CaSystem());
+  caDescriptors.Add(nca);
+//#define DEBUG_CA_DESCRIPTORS 1
+#ifdef DEBUG_CA_DESCRIPTORS
+  char buffer[1024];
+  char *q = buffer;
+  q += sprintf(q, "CAM: %04X %5d %5d %04X %d -", source, transponder, serviceId, d->getCaType(), Stream);
+  for (int i = 0; i < nca->Length(); i++)
+      q += sprintf(q, " %02X", nca->Data()[i]);
+  dsyslog(buffer);
+#endif
+}
+
+int cCaDescriptors::GetCaDescriptors(const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+{
+  if (!CaSystemIds || !*CaSystemIds)
+     return 0;
+  if (BufSize > 0 && Data) {
+     int length = 0;
+     int IsStream = -1;
+     for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+         const unsigned short *caids = CaSystemIds;
+         do {
+            if (d->CaSystem() == *caids) {
+               if (length + d->Length() <= BufSize) {
+                  if (IsStream >= 0 && IsStream != d->Stream())
+                     dsyslog("CAM: different stream flag in CA descriptors");
+                  IsStream = d->Stream();
+                  memcpy(Data + length, d->Data(), d->Length());
+                  length += d->Length();
+                  }
+               else
+                  return -1;
+               }
+            } while (*++caids);
+         }
+     StreamFlag = IsStream == 1;
+     return length;
+     }
+  return -1;
+}
+
+// --- cCaDescriptorHandler --------------------------------------------------
+
+class cCaDescriptorHandler : public cList<cCaDescriptors> {
+private:
+  cMutex mutex;
+public:
+  int AddCaDescriptors(cCaDescriptors *CaDescriptors);
+      // Returns 0 if this is an already known descriptor,
+      // 1 if it is an all new descriptor with actual contents,
+      // and 2 if an existing descriptor was changed.
+  int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+  };
+
+int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
+{
+  cMutexLock MutexLock(&mutex);
+  for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
+      if (ca->Is(CaDescriptors)) {
+         if (*ca == *CaDescriptors) {
+            delete CaDescriptors;
+            return 0;
+            }
+         Del(ca);
+         Add(CaDescriptors);
+         return 2;
+         }
+      }
+  Add(CaDescriptors);
+  return CaDescriptors->Empty() ? 0 : 1;
+}
+
+int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+{
+  cMutexLock MutexLock(&mutex);
+  for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
+      if (ca->Is(Source, Transponder, ServiceId))
+         return ca->GetCaDescriptors(CaSystemIds, BufSize, Data, StreamFlag);
+      }
+  return 0;
+}
+
+cCaDescriptorHandler CaDescriptorHandler;
+
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+{
+  return CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, BufSize, Data, StreamFlag);
+}
+
+// --- cPatFilter ------------------------------------------------------------
+
+cPatFilter::cPatFilter(void)
+{
+  pmtIndex = 0;
+  pmtPid = 0;
+  lastPmtScan = 0;
+  numPmtEntries = 0;
+  Set(0x00, 0x00);  // PAT
+}
+
+void cPatFilter::SetStatus(bool On)
+{
+  cFilter::SetStatus(On);
+  pmtIndex = 0;
+  pmtPid = 0;
+  lastPmtScan = 0;
+  numPmtEntries = 0;
+}
+
+void cPatFilter::Trigger(void)
+{
+  numPmtEntries = 0;
+}
+
+bool cPatFilter::PmtVersionChanged(int PmtPid, int Version)
+{
+  Version <<= 16;
+  for (int i = 0; i < numPmtEntries; i++) {
+      if ((pmtVersion[i] & 0x0000FFFF) == PmtPid) {
+         bool Changed = (pmtVersion[i] & 0x00FF0000) != Version;
+         if (Changed)
+            pmtVersion[i] = PmtPid | Version;
+         return Changed;
+         }
+      }
+  if (numPmtEntries < MAXPMTENTRIES)
+     pmtVersion[numPmtEntries++] = PmtPid | Version;
+  return true;
+}
+
+void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+{
+  if (Pid == 0x00) {
+     if (Tid == 0x00) {
+        if (pmtPid && time(NULL) - lastPmtScan > PMT_SCAN_TIMEOUT) {
+           Del(pmtPid, 0x02);
+           pmtPid = 0;
+           pmtIndex++;
+           lastPmtScan = time(NULL);
+           }
+        if (!pmtPid) {
+           SI::PAT pat(Data, false);
+           if (!pat.CheckCRCAndParse())
+              return;
+           SI::PAT::Association assoc;
+           int Index = 0;
+           for (SI::Loop::Iterator it; pat.associationLoop.hasNext(it); ) {
+               assoc = pat.associationLoop.getNext(it);
+               if (!assoc.isNITPid()) {
+                  if (Index++ == pmtIndex) {
+                     pmtPid = assoc.getPid();
+                     Add(pmtPid, 0x02);
+                     break;
+                     }
+                  }
+               }
+           if (!pmtPid)
+              pmtIndex = 0;
+           }
+        }
+     }
+  else if (Pid == pmtPid && Tid == SI::TableIdPMT && Source() && Transponder()) {
+     SI::PMT pmt(Data, false);
+     if (!pmt.CheckCRCAndParse())
+        return;
+     if (!PmtVersionChanged(pmtPid, pmt.getVersionNumber())) {
+        lastPmtScan = 0; // this triggers the next scan
+        return;
+        }
+     if (!Channels.Lock(true, 10)) {
+        numPmtEntries = 0; // to make sure we try again
+        return;
+        }
+     cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), pmt.getServiceId());
+     if (Channel) {
+        SI::CaDescriptor *d;
+        cCaDescriptors *CaDescriptors = new cCaDescriptors(Channel->Source(), Channel->Transponder(), Channel->Sid());
+        // Scan the common loop:
+        for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)pmt.commonDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
+            CaDescriptors->AddCaDescriptor(d, false);
+            delete d;
+            }
+        // Scan the stream-specific loop:
+        SI::PMT::Stream stream;
+        int Vpid = 0;
+        int Ppid = pmt.getPCRPid();
+        int Apids[MAXAPIDS] = { 0 };
+        int Dpids[MAXAPIDS] = { 0 };
+        int Tpid = 0;
+        int NumApids = 0;
+        int NumDpids = 0;
+        for (SI::Loop::Iterator it; pmt.streamLoop.hasNext(it); ) {
+            stream = pmt.streamLoop.getNext(it);
+            switch (stream.getStreamType()) {
+              case 1: // STREAMTYPE_11172_VIDEO
+              case 2: // STREAMTYPE_13818_VIDEO
+                      Vpid = stream.getPid();
+                      break;
+              case 3: // STREAMTYPE_11172_AUDIO
+              case 4: // STREAMTYPE_13818_AUDIO
+                      {
+                      if (NumApids < MAXAPIDS)
+                         Apids[NumApids++] = stream.getPid();
+                      }
+                      break;
+              case 5: // STREAMTYPE_13818_PRIVATE
+              case 6: // STREAMTYPE_13818_PES_PRIVATE
+              //XXX case 8: // STREAMTYPE_13818_DSMCC
+                      {
+                      SI::Descriptor *d;
+                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                          switch (d->getDescriptorTag()) {
+                            case SI::AC3DescriptorTag:
+                                 if (NumDpids < MAXAPIDS)
+                                    Dpids[NumDpids++] = stream.getPid();
+                                 break;
+                            case SI::TeletextDescriptorTag:
+                                 Tpid = stream.getPid();
+                                 break;
+                            default: ;
+                            }
+                          delete d;
+                          }
+                      }
+                      break;
+              //default: printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());//XXX
+              }
+            for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)stream.streamDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
+                CaDescriptors->AddCaDescriptor(d, true);
+                delete d;
+                }
+            }
+        Channel->SetPids(Vpid, Ppid, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
+        Channel->SetCaIds(CaDescriptors->CaIds());
+        Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
+        }
+     lastPmtScan = 0; // this triggers the next scan
+     Channels.Unlock();
+     }
+}
diff --git a/pat.h b/pat.h
new file mode 100644
index 000000000..dd1a1fe8e
--- /dev/null
+++ b/pat.h
@@ -0,0 +1,43 @@
+/*
+ * pat.h: PAT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: pat.h 1.3 2004/01/03 13:47:54 kls Exp $
+ */
+
+#ifndef __PAT_H
+#define __PAT_H
+
+#include "filter.h"
+
+#define MAXPMTENTRIES 64
+
+class cPatFilter : public cFilter {
+private:
+  time_t lastPmtScan;
+  int pmtIndex;
+  int pmtPid;
+  int pmtVersion[MAXPMTENTRIES];
+  int numPmtEntries;
+  bool PmtVersionChanged(int PmtPid, int Version);
+protected:
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+public:
+  cPatFilter(void);
+  virtual void SetStatus(bool On);
+  void Trigger(void);
+  };
+
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+         ///< Gets all CA descriptors for a given channel.
+         ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
+         ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
+         ///< are copied that match one of the given CA system IDs.
+         ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
+         ///< available), or -1 if BufSize was too small to hold all CA descriptors.
+         ///< The return value in StreamFlag tells whether these CA descriptors are to be used
+         ///< for the individual streams.
+
+#endif //__PAT_H
diff --git a/rcu.c b/rcu.c
index dae9b2a1d..43dc480a0 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.5 2003/05/02 14:42:40 kls Exp $
+ * $Id: rcu.c 1.6 2003/10/18 11:34:30 kls Exp $
  */
 
 #include "rcu.h"
@@ -18,6 +18,7 @@
 
 cRcuRemote::cRcuRemote(char *DeviceName)
 :cRemote("RCU")
+,cThread("RCU remote control")
 {
   dp = 0;
   mode = modeB;
@@ -92,8 +93,6 @@ void cRcuRemote::Action(void)
     } buffer;
 #pragma pack()
 
-  dsyslog("RCU remote control thread started (pid=%d)", getpid());
-
   time_t LastCodeRefresh = 0;
   int FirstTime = 0;
   uint64 LastCommand = 0;
diff --git a/recorder.c b/recorder.c
index 2583bae21..c46c56513 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.7 2003/08/02 13:01:19 kls Exp $
+ * $Id: recorder.c 1.8 2003/10/18 11:35:02 kls Exp $
  */
 
 #include <stdarg.h>
@@ -25,6 +25,7 @@
 
 cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
 :cReceiver(Ca, Priority, 5, VPid, APid1, APid2, DPid1, DPid2)
+,cThread("recording")
 {
   ringBuffer = NULL;
   remux = NULL;
@@ -106,8 +107,6 @@ void cRecorder::Receive(uchar *Data, int Length)
 
 void cRecorder::Action(void)
 {
-  dsyslog("recording thread started (pid=%d)", getpid());
-
   time_t t = time(NULL);
   active = true;
   while (active) {
@@ -143,6 +142,4 @@ void cRecorder::Action(void)
         else
            usleep(1); // this keeps the CPU load low
         }
-
-  dsyslog("recording thread ended (pid=%d)", getpid());
 }
diff --git a/remote.c b/remote.c
index 1b73d168a..227f640cd 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.38 2003/05/02 10:49:50 kls Exp $
+ * $Id: remote.c 1.39 2003/10/18 11:35:32 kls Exp $
  */
 
 #include "remote.h"
@@ -197,6 +197,7 @@ bool cKbdRemote::rawMode = false;
 
 cKbdRemote::cKbdRemote(void)
 :cRemote("KBD")
+,cThread("KBD remote control")
 {
   active = false;
   tcgetattr(STDIN_FILENO, &savedTm);
@@ -245,7 +246,6 @@ int cKbdRemote::MapCodeToFunc(uint64 Code)
 
 void cKbdRemote::Action(void)
 {
-  dsyslog("KBD remote control thread started (pid=%d)", getpid());
   cPoller Poller(STDIN_FILENO);
   active = true;
   while (active) {
@@ -285,5 +285,4 @@ void cKbdRemote::Action(void)
                  }
            }
         }
-  dsyslog("KBD remote control thread ended (pid=%d)", getpid());
 }
diff --git a/ringbuffer.c b/ringbuffer.c
index 2cf9d75d9..c92b75f6d 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.17 2003/05/12 17:38:11 kls Exp $
+ * $Id: ringbuffer.c 1.18 2003/10/12 14:25:09 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -75,7 +75,7 @@ cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics)
 {
   margin = Margin;
   buffer = NULL;
-  getThreadPid = -1;
+  getThreadTid = 0;
   if (Size > 1) { // 'Size - 1' must not be 0!
      buffer = MALLOC(uchar, Size);
      if (!buffer)
@@ -125,7 +125,7 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
         int percent = maxFill * 100 / (Size() - 1) / 5 * 5;
         if (abs(lastPercent - percent) >= 5) {
            if (percent > 75)
-              dsyslog("buffer usage: %d%% (pid=%d)", percent, getThreadPid);
+              dsyslog("buffer usage: %d%% (tid=%ld)", percent, getThreadTid);
            lastPercent = percent;
            }
         }
@@ -159,8 +159,8 @@ uchar *cRingBufferLinear::Get(int &Count)
 {
   uchar *p = NULL;
   Lock();
-  if (getThreadPid < 0)
-     getThreadPid = getpid();
+  if (getThreadTid <= 0)
+     getThreadTid = pthread_self();
   int rest = Size() - tail;
   if (rest < margin && head < tail) {
      int t = margin - rest;
diff --git a/ringbuffer.h b/ringbuffer.h
index 150634544..0680df439 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.12 2003/05/12 17:35:10 kls Exp $
+ * $Id: ringbuffer.h 1.13 2003/10/12 13:57:56 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -46,7 +46,7 @@ class cRingBufferLinear : public cRingBuffer {
   int margin, head, tail;
   int lastGet;
   uchar *buffer;
-  pid_t getThreadPid;
+  pthread_t getThreadTid;
 public:
   cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false);
     ///< Creates a linear ring buffer.
diff --git a/sdt.c b/sdt.c
new file mode 100644
index 000000000..a4e91b809
--- /dev/null
+++ b/sdt.c
@@ -0,0 +1,146 @@
+/*
+ * sdt.c: SDT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sdt.c 1.1 2004/01/04 11:54:42 kls Exp $
+ */
+
+#include "sdt.h"
+#include "channels.h"
+#include "libsi/section.h"
+#include "libsi/descriptor.h"
+
+// --- cSDT ------------------------------------------------------------------
+
+class cSDT : public SI::SDT {
+public:
+  cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFilter, const u_char *Data);
+  };
+
+cSDT::cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFilter, const u_char *Data)
+:SI::SDT(Data, false)
+{
+  if (!CheckCRCAndParse())
+     return;
+
+  if (getVersionNumber() == lastSdtVersion)
+     return;
+
+  if (!Channels.Lock(true, 10))
+     return;
+
+  lastSdtVersion = getVersionNumber();
+
+  SI::SDT::Service SiSdtService;
+  for (SI::Loop::Iterator it; serviceLoop.hasNext(it); ) {
+      SiSdtService = serviceLoop.getNext(it);
+
+      cChannel *Channel = Channels.GetByChannelID(tChannelID(Source, getOriginalNetworkId(), getTransportStreamId(), SiSdtService.getServiceId()));
+      if (!Channel)
+         Channel = Channels.GetByChannelID(tChannelID(Source, 0, Transponder, SiSdtService.getServiceId()));
+
+      SI::Descriptor *d;
+      for (SI::Loop::Iterator it2; (d = SiSdtService.serviceDescriptors.getNext(it2)); ) {
+          switch (d->getDescriptorTag()) {
+            case SI::ServiceDescriptorTag: {
+                 SI::ServiceDescriptor *sd = (SI::ServiceDescriptor *)d;
+                 switch (sd->getServiceType()) {
+                   case 0x01: // digital television service
+                   //XXX TODO case 0x02: // digital radio sound service
+                   //XXX TODO case 0x04: // NVOD reference service
+                   //XXX TODO case 0x05: // NVOD time-shifted service
+                        {
+                        char buffer[1024];
+                        char *p = sd->serviceName.getText(buffer);
+                        char NameBuf[1024];
+                        char ShortNameBuf[1024];
+                        char *pn = NameBuf;
+                        char *ps = ShortNameBuf;
+                        int IsShortName = 0;
+                        while (*p) {
+                              if ((uchar)*p == 0x86)
+                                 IsShortName++;
+                              else if ((uchar)*p == 0x87)
+                                 IsShortName--;
+                              else {
+                                 *pn++ = *p;
+                                 if (IsShortName)
+                                    *ps++ = *p;
+                                 }
+                              p++;
+                              }
+                        *pn = *ps = 0;
+                        pn = NameBuf;
+                        if (*NameBuf && *ShortNameBuf) {
+                           *ps++ = ',';
+                           strcpy(ps, NameBuf);
+                           pn = ShortNameBuf;
+                           }
+                        if (Channel) {
+                           Channel->SetId(getOriginalNetworkId(), getTransportStreamId(), SiSdtService.getServiceId());
+                           Channel->SetName(pn);
+                           // Using SiSdtService.getFreeCaMode() is no good, because some
+                           // tv stations set this flag even for non-encrypted channels :-(
+                           // The special value 0xFFFF was supposed to mean "unknown encryption"
+                           // and would have been overwritten with real CA values later:
+                           // Channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
+                           }
+                        else if (*pn) {
+                           Channel = Channels.NewChannel(Source, Transponder, pn, getOriginalNetworkId(), getTransportStreamId(), SiSdtService.getServiceId());
+                           PatFilter->Trigger();
+                           }
+                        }
+                   }
+                 }
+                 break;
+            // Using the CaIdentifierDescriptor is no good, because some tv stations
+            // just don't use it. The actual CA values are collected in pat.c:
+            /*
+            case SI::CaIdentifierDescriptorTag: {
+                 SI::CaIdentifierDescriptor *cid = (SI::CaIdentifierDescriptor *)d;
+                 if (Channel) {
+                    for (SI::Loop::Iterator it; cid->identifiers.hasNext(it); )
+                        Channel->SetCa(cid->identifiers.getNext(it));
+                    }
+                 }
+                 break;
+            */
+            case SI::NVODReferenceDescriptorTag: {
+                 SI::NVODReferenceDescriptor *nrd = (SI::NVODReferenceDescriptor *)d;
+                 for (SI::Loop::Iterator it; nrd->serviceLoop.hasNext(it); ) {
+                     SI::NVODReferenceDescriptor::Service Service = nrd->serviceLoop.getNext(it);
+                     //printf(" %04X-%04X-%04X\n", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());//XXX TODO
+                     }
+                 }
+                 break;
+            default: ;
+            }
+          delete d;
+          }
+      }
+  Channels.Unlock();
+}
+
+
+// --- cSdtFilter ------------------------------------------------------------
+
+cSdtFilter::cSdtFilter(cPatFilter *PatFilter)
+{
+  lastSdtVersion = 0xFF;
+  patFilter = PatFilter;
+  Set(0x11, 0x42);  // SDT
+}
+
+void cSdtFilter::SetStatus(bool On)
+{
+  cFilter::SetStatus(On);
+  lastSdtVersion = 0xFF;
+}
+
+void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+{
+  if (Source() && Transponder())
+     cSDT SDT(Source(), Transponder(), lastSdtVersion, patFilter, Data);
+}
diff --git a/sdt.h b/sdt.h
new file mode 100644
index 000000000..8d75f3c77
--- /dev/null
+++ b/sdt.h
@@ -0,0 +1,27 @@
+/*
+ * sdt.h: SDT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sdt.h 1.1 2004/01/03 13:49:55 kls Exp $
+ */
+
+#ifndef __SDT_H
+#define __SDT_H
+
+#include "filter.h"
+#include "pat.h"
+
+class cSdtFilter : public cFilter {
+private:
+  uchar lastSdtVersion;
+  cPatFilter *patFilter;
+protected:
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+public:
+  cSdtFilter(cPatFilter *PatFilter);
+  virtual void SetStatus(bool On);
+  };
+
+#endif //__SDT_H
diff --git a/sections.c b/sections.c
new file mode 100644
index 000000000..6b4d4907d
--- /dev/null
+++ b/sections.c
@@ -0,0 +1,187 @@
+/*
+ * sections.c: Section data handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sections.c 1.2 2004/01/03 12:54:01 kls Exp $
+ */
+
+#include "sections.h"
+#include <unistd.h>
+#include "device.h"
+
+// --- cFilterHandle----------------------------------------------------------
+
+class cFilterHandle : public cListObject {
+public:
+  cFilterData filterData;
+  int handle;
+  int used;
+  cFilterHandle(const cFilterData &FilterData);
+  };
+
+cFilterHandle::cFilterHandle(const cFilterData &FilterData)
+{
+  filterData = FilterData;
+  handle = -1;
+  used = 0;
+}
+
+// --- cSectionHandler -------------------------------------------------------
+
+cSectionHandler::cSectionHandler(cDevice *Device)
+:cThread("Section handler")
+{
+  device = Device;
+  active = false;
+  source = 0;
+  transponder = 0;
+  statusCount = 0;
+  on = false;
+  Start();
+}
+
+cSectionHandler::~cSectionHandler()
+{
+  active = false;
+  Cancel(3);
+  cFilter *fi;
+  while ((fi = filters.First()) != NULL)
+        Detach(fi);
+}
+
+void cSectionHandler::Add(const cFilterData *FilterData)
+{
+  Lock();
+  statusCount++;
+  cFilterHandle *fh;
+  for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
+      if (fh->filterData.Is(FilterData->pid, FilterData->tid, FilterData->mask))
+         break;
+      }
+  if (!fh) {
+     fh = new cFilterHandle(*FilterData);
+     filterHandles.Add(fh);
+     fh->handle = device->OpenFilter(FilterData->pid, FilterData->tid, FilterData->mask);
+     }
+  fh->used++;
+  Unlock();
+}
+
+void cSectionHandler::Del(const cFilterData *FilterData)
+{
+  Lock();
+  statusCount++;
+  cFilterHandle *fh;
+  for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
+      if (fh->filterData.Is(FilterData->pid, FilterData->tid, FilterData->mask)) {
+         if (--fh->used <= 0) {
+            close(fh->handle);
+            filterHandles.Del(fh);
+            break;
+            }
+         }
+      }
+  Unlock();
+}
+
+void cSectionHandler::Attach(cFilter *Filter)
+{
+  Lock();
+  statusCount++;
+  filters.Add(Filter);
+  Filter->sectionHandler = this;
+  Filter->SetStatus(true);
+  Unlock();
+}
+
+void cSectionHandler::Detach(cFilter *Filter)
+{
+  Lock();
+  statusCount++;
+  Filter->SetStatus(false);
+  Filter->sectionHandler = NULL;
+  filters.Del(Filter, false);
+  Unlock();
+}
+
+void cSectionHandler::SetSource(int Source, int Transponder)
+{
+  Lock();
+  source = Source;
+  transponder = Transponder;
+  Unlock();
+}
+
+void cSectionHandler::SetStatus(bool On)
+{
+  Lock();
+  if (on != On) {
+     statusCount++;
+     for (cFilter *fi = filters.First(); fi; fi = filters.Next(fi)) {
+         fi->SetStatus(false);
+         if (On)
+            fi->SetStatus(true);
+         }
+     on = On;
+     }
+  Unlock();
+}
+
+void cSectionHandler::Action(void)
+{
+  active = true;
+  while (active) {
+
+        Lock();
+        int NumFilters = filterHandles.Count();
+        pollfd pfd[NumFilters];
+        for (cFilterHandle *fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
+            int i = fh->Index();
+            pfd[i].fd = fh->handle;
+            pfd[i].events = POLLIN;
+            }
+        int oldStatusCount = statusCount;
+        Unlock();
+
+        if (poll(pfd, NumFilters, 1000) != 0) {
+           bool DeviceHasLock = device->HasLock();
+           if (!DeviceHasLock)
+              usleep(100000);
+           for (int i = 0; i < NumFilters; i++) {
+               if (pfd[i].revents & POLLIN) {
+                  cFilterHandle *fh = NULL;
+                  LOCK_THREAD;
+                  if (statusCount != oldStatusCount)
+                     break;
+                  for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
+                      if (pfd[i].fd == fh->handle)
+                         break;
+                      }
+                  if (fh) {
+                     // Read section data:
+                     unsigned char buf[4096]; // max. allowed size for any EIT section
+                     int r = safe_read(fh->handle, buf, sizeof(buf));
+                     if (!DeviceHasLock)
+                        continue; // we do the read anyway, to flush any data that might have come from a different transponder
+                     if (r > 3) { // minimum number of bytes necessary to get section length
+                        int len = (((buf[1] & 0x0F) << 8) | (buf[2] & 0xFF)) + 3;
+                        if (len == r) {
+                           // Distribute data to all attached filters:
+                           int pid = fh->filterData.pid;
+                           int tid = buf[0];
+                           for (cFilter *fi = filters.First(); fi; fi = filters.Next(fi)) {
+                               if (fi->Matches(pid, tid))
+                                  fi->Process(pid, tid, buf, len);
+                               }
+                           }
+                        else
+                           dsyslog("read incomplete section - len = %d, r = %d", len, r);
+                        }
+                     }
+                  }
+               }
+           }
+        }
+}
diff --git a/sections.h b/sections.h
new file mode 100644
index 000000000..1f4f462be
--- /dev/null
+++ b/sections.h
@@ -0,0 +1,45 @@
+/*
+ * sections.h: Section data handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sections.h 1.1 2003/12/21 14:37:00 kls Exp $
+ */
+
+#ifndef __SECTIONS_H
+#define __SECTIONS_H
+
+#include "filter.h"
+#include "thread.h"
+#include "tools.h"
+
+class cDevice;
+class cFilterHandle;
+
+class cSectionHandler : public cThread {
+  friend class cFilter;
+private:
+  cDevice *device;
+  bool active;
+  int source;
+  int transponder;
+  int statusCount;
+  bool on;
+  cList<cFilter> filters;
+  cList<cFilterHandle> filterHandles;
+  void Add(const cFilterData *FilterData);
+  void Del(const cFilterData *FilterData);
+  virtual void Action(void);
+public:
+  cSectionHandler(cDevice *Device);
+  virtual ~cSectionHandler();
+  int Source(void) { return source; }
+  int Transponder(void) { return transponder; }
+  void Attach(cFilter *Filter);
+  void Detach(cFilter *Filter);
+  void SetSource(int Source, int Transponder);
+  void SetStatus(bool On);
+  };
+
+#endif //__SECTIONS_H
diff --git a/svdrp.c b/svdrp.c
index 228911e0c..83847a0ef 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.55 2003/08/31 11:24:47 kls Exp $
+ * $Id: svdrp.c 1.57 2003/12/28 10:09:30 kls Exp $
  */
 
 #include "svdrp.h"
@@ -155,7 +155,7 @@ bool cPUTEhandler::Process(const char *s)
      else {
         rewind(f);
         if (cSchedules::Read(f)) {
-           cSIProcessor::TriggerDump();
+           cSchedules::Cleanup(true);
            status = 250;
            message = "EPG data processed";
            }
@@ -458,7 +458,7 @@ void cSVDRP::CmdCHAN(const char *Option)
 
 void cSVDRP::CmdCLRE(const char *Option)
 {
-  cSIProcessor::Clear();
+  cSchedules::ClearAll();
   Reply(250, "EPG data cleared");
 }
 
@@ -476,7 +476,7 @@ void cSVDRP::CmdDELC(const char *Option)
                }
            Channels.Del(channel);
            Channels.ReNumber();
-           Channels.Save();
+           Channels.SetModified();
            isyslog("channel %s deleted", Option);
            Reply(250, "Channel \"%s\" deleted", Option);
            }
@@ -707,8 +707,8 @@ void cSVDRP::CmdLSTC(const char *Option)
 
 void cSVDRP::CmdLSTE(const char *Option)
 {
-  cMutexLock MutexLock;
-  const cSchedules *Schedules = cSIProcessor::Schedules(MutexLock);
+  cSchedulesLock SchedulesLock;
+  const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
   if (Schedules) {
      FILE *f = fdopen(file, "w");
      if (f) {
@@ -810,9 +810,8 @@ void cSVDRP::CmdMODC(const char *Option)
               if (Channels.HasUniqueChannelID(&ch, channel)) {
                  *channel = ch;
                  Channels.ReNumber();
-                 Channels.Save();
+                 Channels.SetModified();
                  isyslog("modifed channel %d %s", channel->Number(), channel->ToText());
-                 Timers.Save();
                  Reply(250, "%d %s", channel->Number(), channel->ToText());
                  }
               else
@@ -886,7 +885,7 @@ void cSVDRP::CmdNEWC(const char *Option)
            *channel = ch;
            Channels.Add(channel);
            Channels.ReNumber();
-           Channels.Save();
+           Channels.SetModified();
            isyslog("new channel %d %s", channel->Number(), channel->ToText());
            Reply(250, "%d %s", channel->Number(), channel->ToText());
            }
diff --git a/thread.c b/thread.c
index 5fbcfd883..974362c9a 100644
--- a/thread.c
+++ b/thread.c
@@ -4,12 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.25 2003/05/18 12:45:13 kls Exp $
+ * $Id: thread.c 1.30 2004/01/03 16:59:33 kls Exp $
  */
 
 #include "thread.h"
 #include <errno.h>
+#include <malloc.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/wait.h>
@@ -30,7 +32,7 @@ cCondVar::~cCondVar()
 
 void cCondVar::Wait(cMutex &Mutex)
 {
-  if (Mutex.locked && Mutex.lockingPid == getpid()) {
+  if (Mutex.locked) {
      int locked = Mutex.locked;
      Mutex.locked = 0; // have to clear the locked count here, as pthread_cond_wait
                        // does an implizit unlock of the mutex
@@ -43,7 +45,7 @@ bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
 {
   bool r = true; // true = condition signaled false = timeout
 
-  if (Mutex.locked && Mutex.lockingPid == getpid()) {
+  if (Mutex.locked) {
      struct timeval now;                   // unfortunately timedwait needs the absolute time, not the delta :-(
      if (gettimeofday(&now, NULL) == 0) {  // get current time
         now.tv_usec += TimeoutMs * 1000;   // add the timeout
@@ -61,7 +63,6 @@ bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
         if (pthread_cond_timedwait(&cond, &Mutex.mutex, &abstime) == ETIMEDOUT)
            r = false;
         Mutex.locked = locked;
-        Mutex.lockingPid = getpid();
         }
      }
   return r;
@@ -79,13 +80,46 @@ void cCondVar::Signal(void)
 }
 */
 
+// --- cRwLock ---------------------------------------------------------------
+
+cRwLock::cRwLock(bool PreferWriter)
+{
+  pthread_rwlockattr_t attr = { PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP };
+  pthread_rwlock_init(&rwlock, &attr);
+}
+
+cRwLock::~cRwLock()
+{
+  pthread_rwlock_destroy(&rwlock);
+}
+
+bool cRwLock::Lock(bool Write, int TimeoutMs)
+{
+  int Result = 0;
+  struct timespec abstime;
+  if (TimeoutMs) {
+     abstime.tv_sec = TimeoutMs / 1000;
+     abstime.tv_nsec = (TimeoutMs % 1000) * 1000000;
+     }
+  if (Write)
+     Result = TimeoutMs ? pthread_rwlock_timedwrlock(&rwlock, &abstime) : pthread_rwlock_wrlock(&rwlock);
+  else
+     Result = TimeoutMs ? pthread_rwlock_timedrdlock(&rwlock, &abstime) : pthread_rwlock_rdlock(&rwlock);
+  return Result == 0;
+}
+
+void cRwLock::Unlock(void)
+{
+  pthread_rwlock_unlock(&rwlock);
+}
+
 // --- cMutex ----------------------------------------------------------------
 
 cMutex::cMutex(void)
 {
-  lockingPid = 0;
   locked = 0;
-  pthread_mutex_init(&mutex, NULL);
+  pthread_mutexattr_t attr = { PTHREAD_MUTEX_ERRORCHECK_NP };
+  pthread_mutex_init(&mutex, &attr);
 }
 
 cMutex::~cMutex()
@@ -95,19 +129,14 @@ cMutex::~cMutex()
 
 void cMutex::Lock(void)
 {
-  if (getpid() != lockingPid || !locked) {
-     pthread_mutex_lock(&mutex);
-     lockingPid = getpid();
-     }
+  pthread_mutex_lock(&mutex);
   locked++;
 }
 
 void cMutex::Unlock(void)
 {
- if (!--locked) {
-    lockingPid = 0;
+ if (!--locked)
     pthread_mutex_unlock(&mutex);
-    }
 }
 
 // --- cThread ---------------------------------------------------------------
@@ -118,18 +147,33 @@ void cMutex::Unlock(void)
 bool cThread::signalHandlerInstalled = false;
 bool cThread::emergencyExitRequested = false;
 
-cThread::cThread(void)
+cThread::cThread(const char *Description)
 {
   if (!signalHandlerInstalled) {
      signal(SIGIO, SignalHandler);
      signalHandlerInstalled = true;
      }
   running = false;
-  parentPid = threadPid = 0;
+  parentTid = childTid = 0;
+  description = NULL;
+  SetDescription(Description);
 }
 
 cThread::~cThread()
 {
+  free(description);
+}
+
+void cThread::SetDescription(const char *Description, ...)
+{
+  free(description);
+  description = NULL;
+  if (Description) {
+     va_list ap;
+     va_start(ap, Description);
+     vasprintf(&description, Description, ap);
+     va_end(ap);
+     }
 }
 
 void cThread::SignalHandler(int signum)
@@ -139,8 +183,13 @@ void cThread::SignalHandler(int signum)
 
 void *cThread::StartThread(cThread *Thread)
 {
-  Thread->threadPid = getpid();
+  Thread->childTid = pthread_self();
+  if (Thread->description)
+     dsyslog("%s thread started (pid=%d, tid=%ld)", Thread->description, getpid(), Thread->childTid);
   Thread->Action();
+  if (Thread->description)
+     dsyslog("%s thread ended (pid=%d, tid=%ld)", Thread->description, getpid(), Thread->childTid);
+  Thread->childTid = 0;
   return NULL;
 }
 
@@ -148,9 +197,9 @@ bool cThread::Start(void)
 {
   if (!running) {
      running = true;
-     parentPid = getpid();
-     pthread_create(&thread, NULL, (void *(*) (void *))&StartThread, (void *)this);
-     pthread_setschedparam(thread, SCHED_RR, 0);
+     parentTid = pthread_self();
+     pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this);
+     pthread_setschedparam(childTid, SCHED_RR, 0);
      usleep(10000); // otherwise calling Active() immediately after Start() causes a "pure virtual method called" error
      }
   return true; //XXX return value of pthread_create()???
@@ -158,12 +207,21 @@ bool cThread::Start(void)
 
 bool cThread::Active(void)
 {
-  if (threadPid) {
-     if (kill(threadPid, SIGIO) < 0) { // couldn't find another way of checking whether the thread is still running - any ideas?
-        if (errno == ESRCH)
-           threadPid = 0;
-        else
+  if (childTid) {
+     //
+     // Single UNIX Spec v2 says:
+     //
+     // The pthread_kill() function is used to request
+     // that a signal be delivered to the specified thread.
+     //
+     // As in kill(), if sig is zero, error checking is
+     // performed but no signal is actually sent.
+     //
+     int err;
+     if ((err = pthread_kill(childTid, 0)) != 0) {
+        if (err != ESRCH)
            LOG_ERROR;
+        childTid = 0;
         }
      else
         return true;
@@ -180,14 +238,14 @@ void cThread::Cancel(int WaitSeconds)
             return;
          usleep(10000);
          }
-     esyslog("ERROR: thread %d won't end (waited %d seconds) - cancelling it...", threadPid, WaitSeconds);
+     esyslog("ERROR: thread %ld won't end (waited %d seconds) - cancelling it...", childTid, WaitSeconds);
      }
-  pthread_cancel(thread);
+  pthread_cancel(childTid);
 }
 
 void cThread::WakeUp(void)
 {
-  kill(parentPid, SIGIO); // makes any waiting 'select()' call return immediately
+  pthread_kill(parentTid, SIGIO); // makes any waiting 'select()' call return immediately
 }
 
 bool cThread::EmergencyExit(bool Request)
diff --git a/thread.h b/thread.h
index 059974249..1804a5a6e 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.15 2003/05/03 14:03:36 kls Exp $
+ * $Id: thread.h 1.20 2004/01/03 16:58:50 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -28,11 +28,20 @@ class cCondVar {
   //void Signal(void);
   };
 
+class cRwLock {
+private:
+  pthread_rwlock_t rwlock;
+public:
+  cRwLock(bool PreferWriter = false);
+  ~cRwLock();
+  bool Lock(bool Write, int TimeoutMs = 0);
+  void Unlock(void);
+  };
+
 class cMutex {
   friend class cCondVar;
 private:
   pthread_mutex_t mutex;
-  pid_t lockingPid;
   int locked;
 public:
   cMutex(void);
@@ -44,10 +53,10 @@ class cMutex {
 class cThread {
   friend class cThreadLock;
 private:
-  pthread_t thread;
+  pthread_t parentTid, childTid;
   cMutex mutex;
-  pid_t parentPid, threadPid;
   bool running;
+  char *description;
   static bool emergencyExitRequested;
   static bool signalHandlerInstalled;
   static void SignalHandler(int signum);
@@ -59,8 +68,9 @@ class cThread {
   virtual void Action(void) = 0;
   void Cancel(int WaitSeconds = 0);
 public:
-  cThread(void);
+  cThread(const char *Description = NULL);
   virtual ~cThread();
+  void SetDescription(const char *Description, ...);
   bool Start(void);
   bool Active(void);
   static bool EmergencyExit(bool Request = false);
diff --git a/timers.c b/timers.c
index a4ab3c163..1db88a0fb 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.6 2003/10/12 10:33:09 kls Exp $
+ * $Id: timers.c 1.8 2003/12/27 13:10:04 kls Exp $
  */
 
 #include "timers.h"
@@ -44,14 +44,14 @@ cTimer::cTimer(bool Instant, bool Pause)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
 }
 
-cTimer::cTimer(const cEventInfo *EventInfo)
+cTimer::cTimer(const cEvent *Event)
 {
   startTime = stopTime = 0;
   recording = pending = false;
   active = true;
-  channel = Channels.GetByChannelID(EventInfo->GetChannelID(), true);
-  time_t tstart = EventInfo->GetTime();
-  time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
+  channel = Channels.GetByChannelID(Event->ChannelID(), true);
+  time_t tstart = Event->StartTime();
+  time_t tstop = tstart + Event->Duration() + Setup.MarginStop * 60;
   tstart -= Setup.MarginStart * 60;
   struct tm tm_r;
   struct tm *time = localtime_r(&tstart, &tm_r);
@@ -64,9 +64,9 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   priority = Setup.DefaultPriority;
   lifetime = Setup.DefaultLifetime;
   *file = 0;
-  const char *Title = EventInfo->GetTitle();
+  const char *Title = Event->Title();
   if (!isempty(Title))
-     strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
+     strn0cpy(file, Event->Title(), sizeof(file));
   firstday = 0;
   summary = NULL;
 }
@@ -216,8 +216,10 @@ bool cTimer::Parse(const char *s)
      strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
-     tChannelID cid = tChannelID::FromString(channelbuffer);
-     channel = cid.Valid() ? Channels.GetByChannelID(cid, true) : Channels.GetByNumber(atoi(channelbuffer));
+     if (isnumber(channelbuffer))
+        channel = Channels.GetByNumber(atoi(channelbuffer));
+     else
+        channel = Channels.GetByChannelID(tChannelID::FromString(channelbuffer), true);
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;
diff --git a/timers.h b/timers.h
index 3b1a3ca46..b70983c22 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.5 2003/05/11 13:35:53 kls Exp $
+ * $Id: timers.h 1.6 2003/12/13 13:04:21 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -12,7 +12,7 @@
 
 #include "channels.h"
 #include "config.h"
-#include "eit.h"
+#include "epg.h"
 #include "tools.h"
 
 enum eTimerActive { taInactive = 0,
@@ -39,7 +39,7 @@ class cTimer : public cListObject {
   char *summary;
 public:
   cTimer(bool Instant = false, bool Pause = false);
-  cTimer(const cEventInfo *EventInfo);
+  cTimer(const cEvent *Event);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
   virtual bool operator< (const cListObject &ListObject);
diff --git a/transfer.c b/transfer.c
index 3e24dccde..1209dfcae 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.14 2003/08/31 12:19:16 kls Exp $
+ * $Id: transfer.c 1.15 2003/10/18 11:36:03 kls Exp $
  */
 
 #include "transfer.h"
@@ -19,6 +19,7 @@
 
 cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
 :cReceiver(0, -1, 5, VPid, APid1, APid2, DPid1, DPid2)
+,cThread("transfer")
 {
   ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, TS_SIZE * 2, true);
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
@@ -66,8 +67,6 @@ void cTransfer::Receive(uchar *Data, int Length)
 
 void cTransfer::Action(void)
 {
-  dsyslog("transfer thread started (pid=%d)", getpid());
-
   int PollTimeouts = 0;
   active = true;
   while (active) {
@@ -125,8 +124,6 @@ void cTransfer::Action(void)
         else
            usleep(1); // this keeps the CPU load low
         }
-
-  dsyslog("transfer thread ended (pid=%d)", getpid());
 }
 
 void cTransfer::StripAudioPackets(uchar *b, int Length, uchar Except)
diff --git a/vdr.5 b/vdr.5
index 67bdc37bf..761c400d5 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.20 2003/05/29 11:58:57 kls Exp $
+.\" $Id: vdr.5 1.21 2004/01/02 15:24:21 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -45,7 +45,7 @@ Such a delimiter will not appear in the Channels menu.
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
-\fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003:0:0:0\fR
+\fBRTL,RTL Television:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0\fR
 
 The line number of a channel definition (not counting group separators,
 and based on a possible previous '@...' parameter)
@@ -57,6 +57,13 @@ to right):
 .B Name
 The channel's name (if the name originally contains a ':' character
 it has to be replaced by '|').
+Some tv stations provide a way of deriving a "short name" from the
+channel name, which can be used in situations where there is not
+much space for displaying a long name. If a short name is available
+for this channel, it preceeds the full name and is delimited by a comma,
+as in
+
+\fBRTL,RTL Television:...\fR
 .TP
 .B Frequency
 The transponder frequency (as an integer). For DVB-S this value is in MHz. For DVB-C
@@ -119,23 +126,33 @@ the audio PIDs, separated by a semicolon, as in
 The teletext PID.
 .TP
 .B Conditional access
-An integer defining how this channel can be accessed:
+A hexadecimal integer defining how this channel can be accessed:
 .TS
 tab (@);
 l l.
-\fB0\fR@Free To Air
-\fB1...4\fR@explicitly requires the DVB card with the given number
-\fB>=100\fR@requires a specific decryption method defined in \fIca.conf\fR
+\fB0000\fR@Free To Air
+\fB0001...000F\fR@explicitly requires the device with the given number
+\fB0010...00FF\fR@reserved for user defined assignments defined in \fIca.conf\fR
+\fB0100...FFFF\fR@specific decryption methods as broadcast in the data stream\fR
 .TE
+Values in the range 0001...00FF will not be overwritten, all other values
+will be automatically replaced by the actual CA system identifiers received
+from the data stream. If there is more than one CA system id broadcast, they
+will be separated by commas, as in
+
+.B ...:1702,1722,1801:...
+
+The values are in hex because that's the way they are defined in the "ETR 162"
+document. Leading zeros may be omitted.
 .TP
 .B SID
 The Service ID of this channel.
 .TP
 .B NID
-The Network ID of this channel (for future use, currently always 0).
+The Network ID of this channel.
 .TP
 .B TID
-The Transport stream ID of this channel (for future use, currently always 0).
+The Transport stream ID of this channel.
 .TP
 .B RID
 The Radio ID of this channel (typically 0, may be used to distinguish channels where
@@ -144,12 +161,12 @@ NID, TID and SID are all equal).
 A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
 which is a string that looks like this:
 
-\fBS19.2E-0-12188-12003-0\fR
+\fBS19.2E-1-1089-12003-0\fR
 
-The components of this string are the \fBSource\fR (S19.2E), \fBFrequency\fR
-(12188, MHz) and \fBSID\fR (12003) as defined above. The parts that are currently
-\fB0\fR are reserved for future use (the last part can be omitted if it is \fB0\fR,
-so the above example could also be written as \fBS19.2E-0-12188-12003\fR).
+The components of this string are the \fBSource\fR (S19.2E), \fBNID\fR
+(1), \fBTID\fR (1089), \fBSID\fR (12003) and \fBRID\fR (0) as defined above.
+The last part can be omitted if it is \fB0\fR,
+so the above example could also be written as S19.2E-1-1089-12003).
 .br
 The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
 files to properly identify the channels.
diff --git a/vdr.c b/vdr.c
index e4874afc0..fc12f0052 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.169 2003/09/14 09:36:54 kls Exp $
+ * $Id: vdr.c 1.172 2004/01/04 11:12:05 kls Exp $
  */
 
 #include <getopt.h>
@@ -39,6 +39,7 @@
 #include "diseqc.h"
 #include "dvbdevice.h"
 #include "eitscan.h"
+#include "epg.h"
 #include "i18n.h"
 #include "interface.h"
 #include "keys.h"
@@ -93,10 +94,12 @@ int main(int argc, char *argv[])
 #define DEFAULTSVDRPPORT 2001
 #define DEFAULTWATCHDOG     0 // seconds
 #define DEFAULTPLUGINDIR PLUGINDIR
+#define DEFAULTEPGDATAFILENAME "epg.data"
 
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *AudioCommand = NULL;
   const char *ConfigDirectory = NULL;
+  const char *EpgDataFileName = DEFAULTEPGDATAFILENAME;
   bool DisplayHelp = false;
   bool DisplayVersion = false;
   bool DaemonMode = false;
@@ -146,7 +149,7 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
                     return 2;
                     break;
-          case 'E': cSIProcessor::SetEpgDataFileName(*optarg != '-' ? optarg : NULL);
+          case 'E': EpgDataFileName = (*optarg != '-' ? optarg : NULL);
                     break;
           case 'h': DisplayHelp = true;
                     break;
@@ -239,7 +242,8 @@ int main(int argc, char *argv[])
                "                           there may be several -D options (default: all DVB\n"
                "                           devices will be used)\n"
                "  -E FILE   --epgfile=FILE write the EPG data into the given FILE (default is\n"
-               "                           %s); use '-E-' to disable this\n"
+               "                           '%s' in the video directory)\n"
+               "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
                "  -h,       --help         print this help and exit\n"
@@ -261,7 +265,7 @@ int main(int argc, char *argv[])
                "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                "                           seconds (default: %d); '0' disables the watchdog\n"
                "\n",
-               cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
+               DEFAULTEPGDATAFILENAME,
                DEFAULTPLUGINDIR,
                DEFAULTSVDRPPORT,
                VideoDirectory,
@@ -358,6 +362,19 @@ int main(int argc, char *argv[])
         ))
      return 2;
 
+  cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
+
+  // EPG data:
+
+  if (EpgDataFileName) {
+     if (DirectoryOk(EpgDataFileName))
+        EpgDataFileName = AddDirectory(EpgDataFileName, DEFAULTEPGDATAFILENAME);
+     else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
+        EpgDataFileName = AddDirectory(VideoDirectory, EpgDataFileName);
+     }
+  cSchedules::SetEpgDataFileName(EpgDataFileName);
+  cSchedules::Read();
+
   // DVB interfaces:
 
   cDvbDevice::Initialize();
@@ -436,8 +453,6 @@ int main(int argc, char *argv[])
   else
      cDevice::PrimaryDevice()->SetVolume(Setup.CurrentVolume, true);
 
-  cSIProcessor::Read();
-
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
@@ -496,6 +511,25 @@ int main(int argc, char *argv[])
               dsyslog("max. latency time %d seconds", MaxLatencyTime);
               }
            }
+        // Handle channel modifications:
+        if (!Channels.BeingEdited() && Channels.Modified()) {
+           if (Channels.Lock(false, 100)) {
+              Channels.Save(); //XXX only after user changes???
+              Timers.Save();
+              for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                  if (Channel && Channel->Modification(CHANNELMOD_RETUNE)) {
+                     cRecordControls::ChannelDataModified(Channel);
+                     if (Channel->Number() == cDevice::CurrentChannel()) {
+                        if (!cDevice::PrimaryDevice()->Replaying()) {
+                           isyslog("retuning due to modification of channel %d", Channel->Number());
+                           Channels.SwitchTo(Channel->Number());
+                           }
+                        }
+                     }
+                  }
+              Channels.Unlock();
+              }
+           }
         // Channel display:
         if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
            if (!Menu)
@@ -779,6 +813,7 @@ int main(int argc, char *argv[])
                  }
               // Disk housekeeping:
               RemoveDeletedRecordings();
+              cSchedules::Cleanup();
               // Plugins housekeeping:
               PluginManager.Housekeeping();
               }
@@ -799,6 +834,7 @@ int main(int argc, char *argv[])
   Setup.Save();
   cDevice::Shutdown();
   PluginManager.Shutdown(true);
+  ReportEpgBugFixStats();
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
   isyslog("exiting");

From a76a03c0d815680e3e8fc52f24f60a30177d3021 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 11 Jan 2004 18:00:00 +0100
Subject: [PATCH 093/307] Version 1.3.1 - Fixed a lockup in the EPG scanner
 when no non-primary device was available   (thanks to Martin Holst for
 reporting this one). - Fixed a compiler warning about virtual cConfig::Load()
 functions (thanks to   Lauri Tischler for reporting this one). - Fixed a
 warning about character comparison in libsi/si.c (thanks to Lauri   Tischler
 for reporting this one). - The new parameter "Update channels" in the
 "Setup/DVB" menu can be used to   control if and how channels will be
 automatically updated (see MANUAL).   This has already been part of the
 'autopid' patch by Andreas Schultz and has   now been adopted. - Fixed a
 crash in case there is no DVB hardware present (thanks to Sascha   Volkenandt
 for reporting this one). - Changed calculation of channel ids to make it work
 for tv stations that use   the undefined NID value 0 (thanks to Teemu
 Rantanen for reporting this one). - Enhanced the SDT filter to handle multi
 part sections. - Added support for selecting preferred EPG languages (based
 upon a patch by   Teemu Rantanen). - Fixed a 'const' in libsi/si.h (thanks to
 Marcel Wiesweg). - Fixed the 'su' call in 'runvdr' to make it work on systems
 that require the   user name to appear before the command option (thanks to
 Robert Huitl). - Fixed testing for matching section filters in case they are
 turned off (thanks   to Marcel Wiesweg). - In case of incomplete sections an
 error message is now logged only every 10   seconds. - Fixed a possible NULL
 pointer access in cEITScanner::Process() (thanks to   Andreas Kool). - The
 actual transponder data is now taken from the NIT and existing channels   are
 adjusted if necessary. If the NIT contains new transponders, they are  
 scanned for channels during the next EPG scan. Note that only the satellite  
 branches are tested, cable and terrestrial need to be tested by somebody who 
  actually has such equipment.

---
 CONTRIBUTORS     |  15 ++++
 HISTORY          |  34 +++++++++
 MANUAL           |  19 +++++
 Makefile         |   4 +-
 README.developer |   4 +-
 channels.c       | 111 +++++++++++++++++++---------
 channels.conf    | 188 +++++++++++++++++++++++------------------------
 channels.h       |  12 ++-
 config.c         |  41 ++++++++++-
 config.h         |  13 +++-
 device.c         |   9 ++-
 device.h         |   4 +-
 dvbdevice.c      |   6 +-
 eit.c            |  47 +++++++++---
 eitscan.c        | 100 ++++++++++++++++---------
 eitscan.h        |   7 +-
 epg.c            |  18 ++++-
 epg.h            |   4 +-
 filter.c         |  44 +++++++++--
 filter.h         |  15 +++-
 i18n.c           | 177 +++++++++++++++++++++++++++++++++++++++++++-
 i18n.h           |   5 +-
 libsi/si.c       |   4 +-
 libsi/si.h       |   6 +-
 menu.c           |  79 +++++++++++++++++++-
 nit.c            | 139 +++++++++++++++++++++++++++++++++++
 nit.h            |  25 +++++++
 pat.c            |  10 ++-
 runvdr           |   4 +-
 sdt.c            |  86 +++++++++-------------
 sdt.h            |   4 +-
 sections.c       |  39 ++++++++--
 sections.h       |  16 ++--
 sources.c        |  13 +++-
 sources.h        |   4 +-
 tools.c          |  10 ++-
 tools.h          |   5 +-
 vdr.5            |   6 +-
 38 files changed, 1037 insertions(+), 290 deletions(-)
 create mode 100644 nit.c
 create mode 100644 nit.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d2f715dd6..9b21c586f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -522,6 +522,8 @@ Lauri Tischler <lauri.tischler@efore.fi>
  for reporting a faulty parameter initialization in menu.c
  for reporting a problem in case the original current channel becomes
  unavailable due to a recording on a different transponder
+ for reporting a compiler warning about virtual cConfig::Load() functions
+ for reporting a warning about character comparison in libsi/si.c
 
 Andy Carter <fruit@ukgateway.net>
  for helping to test new DVB-T handling
@@ -584,6 +586,7 @@ Andreas Kool <akool@akool.de>
  for reporting a problem with empty values in setup.conf
  for fixing detecting the /dev/videoN devices for GRAB in case there are others
  before the DVB devices
+ for fixing a possible NULL pointer access in cEITScanner::Process()
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
@@ -635,6 +638,9 @@ Teemu Rantanen <tvr@iki.fi>
  for adding TS error checking to remux.c
  for pinpointing a problem with excessive memmove() calls in 'Transfer Mode'
  for fixing faulty calculation of section length in eit.c
+ for reporting a problem in calculation of channel ids for tv stations that use
+ the undefined NID value 0
+ for adding EPG preferred languages
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
@@ -647,6 +653,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  currently not transmitting
  for fixing volume display in case a plugin has its own OSD open
  for providing 'libsi' and adapting the EIT mechanisms to it
+ for fixing testing for matching section filters in case they are turned off
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -670,6 +677,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for making the 'epg.data' file being read after all plugins have been started
  for reporting a problem with cReceivers that use a ring buffer and didn't immediately
  return from their Receive() function if the buffer runs full
+ for reporting a crash in case there is no DVB hardware present
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -887,3 +895,10 @@ Pedro Miguel Sequeira de Justo Teixeira <pedro.miguel.teixeira@bigfoot.com>
 
 Antonino Sergi <voyaser@tiscalinet.it>
  for adding 'StreamType' setting to CAM communication
+
+Martin Holst <holstm@gmx.de>
+ for reporting a lockup in 1.3.0 when the EPG scanner kicks in
+
+Robert Huitl <vdr@huitl.de>
+ for fixing 'su' call in 'runvdr' to make it work on systems that require the
+ user name to appear before the command option
diff --git a/HISTORY b/HISTORY
index e3fe7bc03..bef76aa0b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2537,3 +2537,37 @@ Video Disk Recorder Revision History
 - Limited the line length in the EPG bugfix report, which appears to fix a buffer
   overflow that caused a crash when cleaning up the EPG data (at 05:00 in the
   morning).
+
+2004-01-11: Version 1.3.1
+
+- Fixed a lockup in the EPG scanner when no non-primary device was available
+  (thanks to Martin Holst for reporting this one).
+- Fixed a compiler warning about virtual cConfig::Load() functions (thanks to
+  Lauri Tischler for reporting this one).
+- Fixed a warning about character comparison in libsi/si.c (thanks to Lauri
+  Tischler for reporting this one).
+- The new parameter "Update channels" in the "Setup/DVB" menu can be used to
+  control if and how channels will be automatically updated (see MANUAL).
+  This has already been part of the 'autopid' patch by Andreas Schultz and has
+  now been adopted.
+- Fixed a crash in case there is no DVB hardware present (thanks to Sascha
+  Volkenandt for reporting this one).
+- Changed calculation of channel ids to make it work for tv stations that use
+  the undefined NID value 0 (thanks to Teemu Rantanen for reporting this one).
+- Enhanced the SDT filter to handle multi part sections.
+- Added support for selecting preferred EPG languages (based upon a patch by
+  Teemu Rantanen).
+- Fixed a 'const' in libsi/si.h (thanks to Marcel Wiesweg).
+- Fixed the 'su' call in 'runvdr' to make it work on systems that require the
+  user name to appear before the command option (thanks to Robert Huitl).
+- Fixed testing for matching section filters in case they are turned off (thanks
+  to Marcel Wiesweg).
+- In case of incomplete sections an error message is now logged only every 10
+  seconds.
+- Fixed a possible NULL pointer access in cEITScanner::Process() (thanks to
+  Andreas Kool).
+- The actual transponder data is now taken from the NIT and existing channels
+  are adjusted if necessary. If the NIT contains new transponders, they are
+  scanned for channels during the next EPG scan. Note that only the satellite
+  branches are tested, cable and terrestrial need to be tested by somebody who
+  actually has such equipment.
diff --git a/MANUAL b/MANUAL
index 8687e7046..1873c516a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -482,6 +482,19 @@ Version 1.2
                          be taken. Note that in order to set the system time from
                          the transponder data the option "Set system time" must also
                          be enabled.
+  Preferred languages = 0
+                         Some tv stations broadcast their EPG data in various
+                         different languages. This option allows you to define
+                         which language(s) you prefer in such cases. By default,
+                         or if none of the preferred languages is broadcast, any
+                         language will be accepted and the EPG data will be
+                         displayed in the first language received from the data
+                         stream. If this option is set to a non-zero value, the
+                         menu page will contain that many "Preferred language"
+                         options which allow you to select the individual preferred
+                         languages. If an actual EPG data record is received in
+                         different languages, the preferred languages are checked
+                         in the given order to decide which one to take.
 
   DVB:
 
@@ -498,6 +511,12 @@ Version 1.2
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
                          (4:3 or 16:9).
 
+  Update channels = 4    Controls the automatic channel update function. '0' means
+                         no update, '1' will only update channel names, '2' will
+                         update channel names and PIDs, '3' will perform all
+                         updates and also add newly found channels, and '4' will
+                         also add newly found transponders.
+
   LNB:
 
   SLOF               = 11700  The switching frequency (in MHz) between low and
diff --git a/Makefile b/Makefile
index cc3a3a954..eb1ccac0a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.62 2003/12/25 13:38:56 kls Exp $
+# $Id: Makefile 1.63 2004/01/10 14:11:57 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -35,7 +35,7 @@ SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
        dvbplayer.o dvbspu.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
-       lirc.o menu.o menuitems.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
+       lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o sources.o\
        spu.o status.o svdrp.o thread.o timers.o tools.o transfer.o vdr.o videodir.o
 
diff --git a/README.developer b/README.developer
index eabb09112..6b765660b 100644
--- a/README.developer
+++ b/README.developer
@@ -32,7 +32,6 @@ Here's a list of the highlights - and what _not_ to expect yet
   use the device that contains the proper CAM.
 - No NVOD or "linked services" support yet.
 - No radio support yet.
-- No transponder scan yet.
 
 Note that this is currently work in progress, so there may be some
 areas that don't work as smooth as expected, yet.
@@ -77,7 +76,8 @@ Known bugs:
   are switched, and there is still an SDT data packet being processed.
   The call to device->HasLock() in sections.c should fix this (and it
   apparently does for most cases), but there must still be soemthing
-  wrong in that area.
+  wrong in that area. This may be fixed in 1.3.1 - please report if
+  it does still happen there.
 - Sometimes the current channel gets re-tuned even though the channel
   data of this channel didn't change (but that of an other channel did
   change).
diff --git a/channels.c b/channels.c
index 9a7965f54..67ee2b533 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.17 2004/01/04 12:28:49 kls Exp $
+ * $Id: channels.c 1.19 2004/01/11 15:52:32 kls Exp $
  */
 
 #include "channels.h"
@@ -160,25 +160,6 @@ char *cChannel::buffer = NULL;
 cChannel::cChannel(void)
 {
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-  strcpy(name,   "Pro7");
-  frequency    = 12480;
-  source       = cSource::FromString("S19.2E");
-  srate        = 27500;
-  vpid         = 255;
-  ppid         = 0;
-  apid1        = 256;
-  apid2        = 0;
-  dpid1        = 257;
-  dpid2        = 0;
-  tpid         = 32;
-  caids[0]     = 0;
-  nid          = 0;
-  tid          = 0;
-  sid          = 888;
-  rid          = 0;
-  number       = 0;
-  groupSep     = false;
-  polarization = 'v';
   inversion    = INVERSION_AUTO;
   bandwidth    = BANDWIDTH_AUTO;
   coderateH    = FEC_AUTO;
@@ -227,7 +208,7 @@ int cChannel::Transponder(void) const
 
 tChannelID cChannel::GetChannelID(void) const
 {
-  return tChannelID(source, nid, nid ? tid : Transponder(), sid, rid);
+  return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid);
 }
 
 int cChannel::Modification(int Mask)
@@ -237,6 +218,68 @@ int cChannel::Modification(int Mask)
   return Result;
 }
 
+bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, bool Log)
+{
+  // Workarounds for broadcaster stupidity:
+  // Some providers broadcast the transponder frequency of their channels with two different
+  // values (like 12551 and 12552), so we need to allow for a little tolerance here
+  if (abs(frequency - Frequency) <= 1)
+     Frequency = frequency;
+  // Sometimes the transponder frequency is set to 0, which is just wrong
+  if (Frequency == 0)
+     return false;
+
+  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
+     if (Log)
+        dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), cSource::ToString(source), frequency, polarization, srate, coderateH, cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
+     source = Source;
+     frequency = Frequency;
+     polarization = Polarization;
+     srate = Srate;
+     coderateH = CoderateH;
+     modulation = QPSK;
+     modification |= CHANNELMOD_TRANSP;
+     Channels.SetModified();
+     }
+  return true;
+}
+
+bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH, bool Log)
+{
+  if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
+     if (Log)
+        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, modulation, srate, coderateH, cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
+     source = Source;
+     frequency = Frequency;
+     modulation = Modulation;
+     srate = Srate;
+     coderateH = CoderateH;
+     modification |= CHANNELMOD_TRANSP;
+     Channels.SetModified();
+     }
+  return true;
+}
+
+bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, bool Log)
+{
+  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
+     if (Log)
+        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
+     source = Source;
+     frequency = Frequency;
+     bandwidth = Bandwidth;
+     modulation = Modulation;
+     hierarchy = Hierarchy;
+     coderateH = CoderateH;
+     coderateL = CoderateL;
+     guard = Guard;
+     transmission = Transmission;
+     modification |= CHANNELMOD_TRANSP;
+     Channels.SetModified();
+     }
+  return true;
+}
+
 void cChannel::SetId(int Nid, int Tid, int Sid, int Rid, bool Log)
 {
   if (nid != Nid || tid != Tid || sid != Sid || rid != Rid) {
@@ -382,9 +425,9 @@ bool cChannel::StringToParameters(const char *s)
           case 'G': s = ParseParameter(s, guard, GuardValues); break;
           case 'H': polarization = *s++; break;
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
-          // 'L' reserved for possible circular polarization
+          case 'L': polarization = *s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
-          // 'R' reserved for possible circular polarization
+          case 'R': polarization = *s++; break;
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = *s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
@@ -675,18 +718,16 @@ bool cChannels::Modified(void)
   return Result;
 }
 
-cChannel *cChannels::NewChannel(int Source, int Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid)
+cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid)
 {
-  dsyslog("creating new channel '%s' on %s transponder %d with id %d-%d-%d-%d", Name, cSource::ToString(Source), Transponder, Nid, Tid, Sid, Rid);
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep() && channel->Source() == Source && ISTRANSPONDER(channel->Transponder(), Transponder)) {
-         cChannel *NewChannel = new cChannel(channel);
-         Add(NewChannel);
-         ReNumber();
-         NewChannel->SetId(Nid, Tid, Sid, Rid, false);
-         NewChannel->SetName(Name, false);
-         return NewChannel;
-         }
-      }
+  if (Transponder) {
+     dsyslog("creating new channel '%s' on %s transponder %d with id %d-%d-%d-%d", Name, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
+     cChannel *NewChannel = new cChannel(Transponder);
+     Add(NewChannel);
+     ReNumber();
+     NewChannel->SetId(Nid, Tid, Sid, Rid, false);
+     NewChannel->SetName(Name, false);
+     return NewChannel;
+     }
   return NULL;
 }
diff --git a/channels.conf b/channels.conf
index b1ad616f1..10628ac96 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,95 +1,95 @@
-RTL,RTL Television:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0
-SAT.1:12480:v:S19.2E:27500:1791:1792;1795:34:0:46:133:33:0
-ProSieben:12480:v:S19.2E:27500:255:256;257:32:0:898:133:33:0
-RTL2:12188:h:S19.2E:27500:166:128:68:0:12020:1:1089:0
-Das Erste:11837:h:S19.2E:27500:101:102:104:0:28106:1:1101:0
-Bayerisches FS:11837:h:S19.2E:27500:201:202:204:0:28107:1:1101:0
-hessen fernsehen:11837:h:S19.2E:27500:301:302:304:0:28108:1:1101:0
-NDR FS MV:12110:h:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0
-SR Fernsehen Suedwest:11837:h:S19.2E:27500:501:502:504:0:28110:1:1101:0
-WDR FERNSEHEN:11837:h:S19.2E:27500:601:602:604:0:28111:1:1101:0
-BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112:1:1101:0
-S�DWEST BW:11837:h:S19.2E:27500:801:802:804:0:28113:1:1101:0
-Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114:1:1101:0
-ZDF:11954:h:S19.2E:27500:110:120;125:130:0:28006:1:1079:0
-3sat:11954:h:S19.2E:27500:210:220:230:0:28007:1:1079:0
-KiKa:11954:h:S19.2E:27500:310:320:330:0:28008:1:1079:0
-arte:11836:h:S19.2E:27500:401:402,403:404:0:28109:1:1101:0
-ORF 1:12692:h:S19.2E:22000:160:161;163:165:1762,D05,1702,1801:13001:1:1117:0
-ORF 2:12692:h:S19.2E:22000:500:501;503:505:1762,D05,1702,1801:13002:1:1117:0
-ZDFinfokanal:11954:h:S19.2E:27500:610:620:130:0:28011:1:1079:0
-CNN Int.:11778:v:S19.2E:27500:165:100:47:0:28522:1:1068:0
-S RTL,Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:1:1089:0
-VOX:12188:h:S19.2E:27500:167:136:71:0:12060:1:1089:0
-KABEL1:12480:v:S19.2E:27500:511:512:33:0:899:133:33:0
-NEUN LIVE,NEUN LIVE Television:12480:v:S19.2E:27500:767:768:35:0:897:133:33:0
-DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:133:33:0
-HSEurope,Home Shopping Europe:12480:v:S19.2E:27500:1279:1280:37:0:40:133:33:0
-Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:1:1108:0
-EURONEWS:11817:v:S19.2E:27500:163:92,93:0:500,100:8004:1:1070:0
-Sky News:11597:v:S19.2E:22000:305:306:0:0:28707:1:1026:0
-Veronica/FoxKids:12574:h:S19.2E:22000:518+8190:92:38:622,602,100:5020:53:1109:0
-BVN:12574:h:S19.2E:22000:515+8190:96:36:0:5025:53:1109:0
-CNBC Europe:12610:v:S19.2E:22000:944:945:0:0:12200:1:1112:0
-n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:1:1116:0
-Al Jazeera:11568:v:S19.2E:22000:55:56:0:0:9021:1:1024:0
-TW1:12692:h:S19.2E:22000:166:167:168:0:13013:1:1117:0
-Eurosport:11954:h:S19.2E:27500:410:420:430:0:28009:1:1079:0
-EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201:1:1073:0
-EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202:1:1073:0
-EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:1:1073:0
-ZDFtheaterkanal:11954:h:S19.2E:27500:1110:1120:130:0:28016:1:1079:0
-ZDFdokukanal:11954:h:S19.2E:27500:660:670:130:0:28014:1:1079:0
-MDR FERNSEHEN:12110:h:S19.2E:27500:401:402:404:0:28204:1:1073:0
-RBB Brandenburg:12110:h:S19.2E:27500:501:502:504:0:28205:1:1073:0
-RBB Berlin:12110:h:S19.2E:27500:601:602:604:0:28206:1:1073:0
+RTL,RTL Television:12187:hC34:S19.2E:27500:163:104:105:0:12003:1:1089:0
+SAT.1:12480:vC34:S19.2E:27500:1791:1792;1795:34:0:46:133:33:0
+ProSieben:12480:vC34:S19.2E:27500:255:256;257:32:0:898:133:33:0
+RTL2:12187:hC34:S19.2E:27500:166:128:68:0:12020:1:1089:0
+Das Erste:11836:hC34:S19.2E:27500:101:102:104:0:28106:1:1101:0
+Bayerisches FS:11836:hC34:S19.2E:27500:201:202:204:0:28107:1:1101:0
+hessen fernsehen:11836:hC34:S19.2E:27500:301:302:304:0:28108:1:1101:0
+NDR FS MV:12109:hC34:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0
+SR Fernsehen Suedwest:11836:hC34:S19.2E:27500:501:502:504:0:28110:1:1101:0
+WDR K�ln:11836:hC34:S19.2E:27500:601:602:604:0:28111:1:1101:0
+BR-alpha:11836:hC34:S19.2E:27500:701:702:704:0:28112:1:1101:0
+S�DWEST BW:11836:hC34:S19.2E:27500:801:802:804:0:28113:1:1101:0
+Phoenix:11836:hC34:S19.2E:27500:901:902:904:0:28114:1:1101:0
+ZDF:11953:hC34:S19.2E:27500:110:120;125:130:0:28006:1:1079:0
+3sat:11953:hC34:S19.2E:27500:210:220:230:0:28007:1:1079:0
+KiKa:11953:hC34:S19.2E:27500:310:320:330:0:28008:1:1079:0
+arte:11836:hC34:S19.2E:27500:401:402,403:404:0:28109:1:1101:0
+ORF 1:12692:hC56:S19.2E:22000:160:161,162;163:165:1762,D05,1702,1801:13001:1:1117:0
+ORF 2:12692:hC56:S19.2E:22000:500:501;503:505:1762,D05,1702,1801:13002:1:1117:0
+ZDFinfokanal:11953:hC34:S19.2E:27500:610:620:130:0:28011:1:1079:0
+CNN Int.:11778:vC34:S19.2E:27500:165:100:47:0:28522:1:1068:0
+S RTL,Super RTL:12187:hC34:S19.2E:27500:165:120:65:0:12040:1:1089:0
+VOX:12187:hC34:S19.2E:27500:167:136:71:0:12060:1:1089:0
+KABEL1:12480:vC34:S19.2E:27500:511:512:33:0:899:133:33:0
+NEUN LIVE,NEUN LIVE Television:12480:vC34:S19.2E:27500:767:768:35:0:897:133:33:0
+DSF:12480:vC34:S19.2E:27500:1023:1024:0:0:900:133:33:0
+HSEurope,Home Shopping Europe:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
+Bloomberg TV Germany:12552:vC56:S19.2E:22000:162:99:0:0:12160:1:1108:0
+EURONEWS:11817:vC34:S19.2E:27500:163:92,93:0:500,100:8004:1:1070:0
+Sky News:11597:vC56:S19.2E:22000:305:306:0:0:28707:1:1026:0
+Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92:38:622,602,100:5020:53:1109:0
+BVN:12574:hC56:S19.2E:22000:515+8190:96:36:0:5025:53:1109:0
+CNBC Europe:12610:vC56:S19.2E:22000:944:945:0:0:12200:1:1112:0
+n-tv:12669:vC56:S19.2E:22000:162:96:55:0:12730:1:1116:0
+Al Jazeera:11567:vC56:S19.2E:22000:55:56:0:0:9021:1:1024:0
+TW1:12692:hC56:S19.2E:22000:166:167:168:0:13013:1:1117:0
+Eurosport:11953:hC34:S19.2E:27500:410:420:430:0:28009:1:1079:0
+EinsExtra:12109:hC34:S19.2E:27500:101:102:0:0:28201:1:1073:0
+EinsFestival:12109:hC34:S19.2E:27500:201:202:0:0:28202:1:1073:0
+EinsMuXx:12109:hC34:S19.2E:27500:301:302:0:0:28203:1:1073:0
+ZDFtheaterkanal:11953:hC34:S19.2E:27500:1110:1120:130:0:28016:1:1079:0
+ZDFdokukanal:11953:hC34:S19.2E:27500:660:670:130:0:28014:1:1079:0
+MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402:404:0:28204:1:1073:0
+RBB Brandenburg:12109:hC34:S19.2E:27500:501:502:504:0:28205:1:1073:0
+RBB Berlin:12109:hC34:S19.2E:27500:601:602:604:0:28206:1:1073:0
 :Premiere World
-START,PREMIERE START:11797:h:S19.2E:27500:255:256:32:1702,1722,1801:8:133:2:0
-PREM 1,PREMIERE 1:11797:h:S19.2E:27500:511:512,513;515:0:1702,1722,1801:10:133:2:0
-PREM 2,PREMIERE 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3:11797:h:S19.2E:27500:2303:2304,2305:0:1702,1722,1801:43:133:2:0
-PREM 4,PREMIERE 4:11797:h:S19.2E:27500:767:768,769:0:1702,1722,1801:9:133:2:0
-PREM 5,PREMIERE 5:11797:h:S19.2E:27500:1279:1280,1281:0:1702,1722,1801:29:133:2:0
-PREM 6,PREMIERE 6:11797:h:S19.2E:27500:1535:1536:0:1702,1722,1801:41:133:2:0
-PREM 7,PREMIERE 7:11797:h:S19.2E:27500:1023:1024:0:1702,1722,1801:20:133:2:0
-DISNEY,DISNEY CHANNEL:11758:h:S19.2E:27500:2559:2560:0:1702,1722,1801:34:133:17:0
+START,PREMIERE START:11797:hC34:S19.2E:27500:255:256:32:1702,1722,1801:8:133:2:0
+PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512,513;515:0:1702,1722,1801:10:133:2:0
+PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792,1793;1795:0:1702,1722,1801:11:133:2:0
+PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304,2305:0:1702,1722,1801:43:133:2:0
+PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768,769:0:1702,1722,1801:9:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280,1281:0:1702,1722,1801:29:133:2:0
+PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536:0:1702,1722,1801:41:133:2:0
+PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024:0:1702,1722,1801:20:133:2:0
+DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560:0:1702,1722,1801:34:133:17:0
 :Premiere Direkt
-DIREKT,PREMIERE DIREKT:12031:h:S19.2E:27500:2815:2816,2817;2819:0:0:18:133:4:0
+DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816,2817;2819:0:0:18:133:4:0
 :PW Erotic
-B-UHSE,BEATE-UHSE.TV:12071:h:S19.2E:27500:1023:1024:0:1702,1722,1801:21:133:1:0
-EROTIK,PREMIERE EROTIK:12031:h:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
+B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024:0:1702,1722,1801:21:133:1:0
+EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1:11720:h:S19.2E:27500:255:256,257:0:1702,1722,1801:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:h:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0
+SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256,257:0:1702,1722,1801:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0
 :Beta Digital
-N24:12480:v:S19.2E:27500:2047:2048:36:0:47:133:33:0
-CNBC:11954:h:S19.2E:27500:510:520:530:0:28010:1:1079:0
-Liberty TV.com:12610:v:S19.2E:22000:941:943:0:0:12199:1:1112:0
+N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
+CNBC:11953:hC34:S19.2E:27500:510:520:530:0:28010:1:1079:0
+Liberty TV.com:12610:vC56:S19.2E:22000:941:943:0:0:12199:1:1112:0
 :-
-ProSieben Austria:12051:v:S19.2E:27500:161:84:36:0:20002:1:1082:0
-Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:165:0:20003:1:1082:0
-Kabel 1 Austria:12051:v:S19.2E:27500:166:167:169:0:20004:1:1082:0
-ProSieben Schweiz:12051:v:S19.2E:27500:289:290:33:0:20001:1:1082:0
-FRANCE 5:12207:v:S19.2E:27500:160:80:32:0:8501:1:1090:0
-LCP:12207:v:S19.2E:27500:165:100:0:0:8506:1:1090:0
-ESCALES:12285:v:S19.2E:27500:165:100:0:500,100:17025:1:1094:0
-CANAL CLUB:12324:v:S19.2E:27500:160:80:0:0:8612:1:1096:0
-ASTRA-Mosaic:12552:v:S19.2E:22000:175:176:0:0:3988:1:1108:0
-ASTRA-Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:1:1108:0
-ASTRA-Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986:1:1108:0
-ASTRA-Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985:1:1108:0
-ASTRA-Mosaic 5:12552:v:S19.2E:22000:163:164:0:0:3984:1:1108:0
-Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:1:1108:0
-RTL TELE Letzebuerg:12552:v:S19.2E:22000:168:144,146:74:0:3994:1:1108:0
-Yorin:12574:h:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0
-MTV2 Pop Channel:12225:h:S19.2E:27500:513:661:577:0:28640:1:1091:0
+ProSieben Austria:12051:vC34:S19.2E:27500:161:84:36:0:20002:1:1082:0
+Kabel 1 Schweiz:12051:vC34:S19.2E:27500:162:163:165:0:20003:1:1082:0
+Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167:169:0:20004:1:1082:0
+ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290:33:0:20001:1:1082:0
+FRANCE 5:12207:vC34:S19.2E:27500:160:80:32:0:8501:1:1090:0
+LCP:12207:vC34:S19.2E:27500:165:100:0:0:8506:1:1090:0
+ESCALES:12285:vC34:S19.2E:27500:165:100:0:500,100:17025:1:1094:0
+CANAL CLUB:12324:vC34:S19.2E:27500:160:80:0:0:8612:1:1096:0
+ASTRA-Mosaic:12552:vC56:S19.2E:22000:175:176:0:0:3988:1:1108:0
+ASTRA-Mosaic 2:12552:vC56:S19.2E:22000:179:120:0:0:3987:1:1108:0
+ASTRA-Mosaic 3:12552:vC56:S19.2E:22000:182:169:0:0:3986:1:1108:0
+ASTRA-Mosaic 4:12552:vC56:S19.2E:22000:185:170:0:0:3985:1:1108:0
+ASTRA-Mosaic 5:12552:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
+Chamber TV:12552:vC56:S19.2E:22000:55:56:0:0:12180:1:1108:0
+RTL TELE Letzebuerg:12552:vC56:S19.2E:22000:168:144,146:74:0:3994:1:1108:0
+Yorin:12574:hC56:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0
+MTV2 Pop Channel:12226:hC34:S19.2E:27500:513:661:577:0:28640:1:1091:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
 Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0
-VIVA:12670:v:S19.2E:22000:309:310:311:0:12732:1:1116:0
-VIVA PLUS:12552:v:S19.2E:22000:171:172:173:0:12120:1:1108:0
-MTV Central:11739:v:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-QVC GERMANY:12552:v:S19.2E:22000:165:166:167:0:12100:1:1108:0
-TELE 5:12480:v:S19.2E:27500:1535:1536:38:0:51:133:33:0
+VIVA:12669:vC56:S19.2E:22000:309:310:311:0:12732:1:1116:0
+VIVA PLUS:12552:vC56:S19.2E:22000:171:172:173:0:12120:1:1108:0
+MTV Central:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
+QVC GERMANY:12552:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
+TELE 5:12480:vC34:S19.2E:27500:1535:1536:38:0:51:133:33:0
 :@201 Sky
 Sky One:106:h:S28.2E:0:160:80:0:30:222:0:0:0
 Sky One Mix:107:h:S28.2E:0:160:80:0:30:919:0:0:0
@@ -97,14 +97,14 @@ itv2:226:h:S28.2E:0:160:80:0:30:451:0:0:0
 sci-fi:130:h:S28.2E:0:160:80:0:30:161:0:0:0
 Paramount Comedy:127:h:S28.2E:0:160:80:0:30:185:0:0:0
 :@900 Some 'seed' channels
-Chelsea TV:11778:v:S28.2E:27500:2308+2304:2309:0:960,961:9307:2:2004:0
-Sky One:12285:v:S28.2E:27500:2311+2304:2312,2313:2307:960,961:4703:2:2030:0
-WDR M�nster:12421:h:S19.2E:27500:101:102:104:0:28310:1:1201:0
-Going Places:10921:h:S28.2E:22000:2310+2304:2311:2312:0:5008:2:2055:0
-Animal Plnt+:12070:h:S28.2E:27500:2315+2307:2316:0:960,961:50002:2:2019:0
-S1T:11954:h:S28.2E:27500:0:0:0:0:4409:2:2030:0
-CNN:12032:v:S28.2E:27500:2309:2311:2310:0:7140:2:2018:0
-BBC PARL'MNT:12129:v:S28.2E:27500:2306:2308,2309:2307:0:7300:2:2022:0
-AL HAYAT:11200:v:S13.0E:27500:413:414:0:0:4733:318:13400:0
-EURO1080:12168:v:S19.2E:27500:308:256:0:FF:21100:1:1088:0
+Chelsea TV:11778:vC23:S28.2E:27500:2308+2304:2309:0:960,961:9307:2:2004:0
+Sky One:12285:vC23:S28.2E:27500:2311+2304:2312,2313:2307:960,961:4703:2:2030:0
+WDR M�nster:12421:hC34:S19.2E:27500:101:102:104:0:28310:1:1201:0
+Going Places:10920:hC56:S28.2E:22000:2310+2304:2311:2312:0:5008:2:2055:0
+Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316:0:960,961:50002:2:2019:0
+S1T:12285:vC23:S28.2E:27500:2311+2304:2312,2313:2314:960,961:4409:2:2030:0
+CNN:12051:vC23:S28.2E:27500:2309:2311:2310:0:7140:2:2018:0
+BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308,2309:2307:0:7300:2:2022:0
+AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 :@1000 New channels
diff --git a/channels.h b/channels.h
index c3d9ad4e4..64c05ebe5 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.10 2004/01/04 12:26:37 kls Exp $
+ * $Id: channels.h 1.12 2004/01/11 15:20:18 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -23,7 +23,8 @@
 #define CHANNELMOD_PIDS     0x02
 #define CHANNELMOD_ID       0x04
 #define CHANNELMOD_CA       0x10
-#define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA)
+#define CHANNELMOD_TRANSP   0x20
+#define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA | CHANNELMOD_TRANSP)
 
 #define MAXAPIDS  2
 #define MAXCAIDS  8
@@ -142,6 +143,9 @@ class cChannel : public cListObject {
   bool IsTerr(void) const { return (source & cSource::st_Mask) == cSource::stTerr; }
   tChannelID GetChannelID(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
+  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, bool Log = true);
+  bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH, bool Log = true);
+  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, bool Log = true);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0, bool Log = true);
   void SetName(const char *Name, bool Log = true);
   void SetPids(int Vpid, int Ppid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid);
@@ -156,7 +160,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   int beingEdited;
 public:
   cChannels(void);
-  virtual bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
+  bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
@@ -172,7 +176,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   int MaxNumber(void) { return maxNumber; }
   void SetModified(void);
   bool Modified(void);
-  cChannel *NewChannel(int Source, int Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid = 0);
+  cChannel *NewChannel(const cChannel *Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid = 0);
   };
 
 extern cChannels Channels;
diff --git a/config.c b/config.c
index d3f2db7d0..6caf587a2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.117 2003/10/17 14:11:27 kls Exp $
+ * $Id: config.c 1.120 2004/01/11 15:38:11 kls Exp $
  */
 
 #include "config.h"
@@ -259,6 +259,7 @@ cSetup::cSetup(void)
   TimeTransponder = 0;
   MarginStart = 2;
   MarginStop = 10;
+  EPGLanguages[0] = -1;
   EPGScanTimeout = 5;
   EPGBugfixLevel = 2;
   SVDRPTimeout = 300;
@@ -272,6 +273,7 @@ cSetup::cSetup(void)
   UseSubtitle = 1;
   RecordingDirs = 1;
   VideoFormat = 0;
+  UpdateChannels = 4;
   RecordDolbyDigital = 1;
   ChannelInfoPos = 0;
   OSDwidth = 52;
@@ -394,6 +396,39 @@ bool cSetup::ParseCaCaps(const char *Value)
   return false;
 }
 
+void cSetup::StoreLanguages(const char *Name, int *Values)
+{
+  char buffer[I18nNumLanguages * 4];
+  char *q = buffer;
+  for (int i = 0; i < I18nNumLanguages; i++) {
+      if (Values[i] < 0)
+         break;
+      const char *s = I18nLanguageAbbreviation(Values[i]);
+      if (s) {
+         if (q > buffer)
+            *q++ = ' ';
+         strncpy(q, s, 3);
+         q += 3;
+         }
+      }
+  *q = 0;
+  Store(Name, buffer);
+}
+
+bool cSetup::ParseLanguages(const char *Value, int *Values)
+{
+  int n = 0;
+  while (Value && *Value && n < I18nNumLanguages) {
+        int i = I18nLanguageIndex(Value);
+        if (i >= 0)
+           Values[n++] = i;
+        if ((Value = strchr(Value, ' ')) != NULL)
+           Value++;
+        }
+  Values[n] = -1;
+  return true;
+}
+
 bool cSetup::Parse(const char *Name, const char *Value)
 {
   if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
@@ -411,6 +446,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
   else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
   else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
+  else if (!strcasecmp(Name, "EPGLanguages"))        return ParseLanguages(Value, EPGLanguages);
   else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
   else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
@@ -424,6 +460,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
+  else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
   else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
   else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
@@ -461,6 +498,7 @@ bool cSetup::Save(void)
   Store("TimeTransponder",    TimeTransponder);
   Store("MarginStart",        MarginStart);
   Store("MarginStop",         MarginStop);
+  StoreLanguages("EPGLanguages", EPGLanguages);
   Store("EPGScanTimeout",     EPGScanTimeout);
   Store("EPGBugfixLevel",     EPGBugfixLevel);
   Store("SVDRPTimeout",       SVDRPTimeout);
@@ -474,6 +512,7 @@ bool cSetup::Save(void)
   Store("UseSubtitle",        UseSubtitle);
   Store("RecordingDirs",      RecordingDirs);
   Store("VideoFormat",        VideoFormat);
+  Store("UpdateChannels",     UpdateChannels);
   Store("RecordDolbyDigital", RecordDolbyDigital);
   Store("ChannelInfoPos",     ChannelInfoPos);
   Store("OSDwidth",           OSDwidth);
diff --git a/config.h b/config.h
index 08368e4cf..22623e73a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.178 2003/12/27 13:57:56 kls Exp $
+ * $Id: config.h 1.182 2004/01/06 16:47:41 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,10 +17,11 @@
 #include <time.h>
 #include <unistd.h>
 #include "device.h"
+#include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.0"
-#define VDRVERSNUM   10300  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.1"
+#define VDRVERSNUM   10301  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -87,7 +88,7 @@ template<class T> class cConfig : public cList<T> {
   cConfig(void) { fileName = NULL; }
   virtual ~cConfig() { free(fileName); }
   const char *FileName(void) { return fileName; }
-  virtual bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
+  bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
   {
     Clear();
     if (FileName) {
@@ -195,6 +196,8 @@ class cSetup : public cConfig<cSetupLine> {
 private:
   void StoreCaCaps(const char *Name);
   bool ParseCaCaps(const char *Value);
+  void StoreLanguages(const char *Name, int *Values);
+  bool ParseLanguages(const char *Value, int *Values);
   bool Parse(const char *Name, const char *Value);
   cSetupLine *Get(const char *Name, const char *Plugin = NULL);
   void Store(const char *Name, const char *Value, const char *Plugin = NULL, bool AllowMultiple = false);
@@ -216,6 +219,7 @@ class cSetup : public cConfig<cSetupLine> {
   int SetSystemTime;
   int TimeTransponder;
   int MarginStart, MarginStop;
+  int EPGLanguages[I18nNumLanguages + 1];
   int EPGScanTimeout;
   int EPGBugfixLevel;
   int SVDRPTimeout;
@@ -227,6 +231,7 @@ class cSetup : public cConfig<cSetupLine> {
   int UseSubtitle;
   int RecordingDirs;
   int VideoFormat;
+  int UpdateChannels;
   int RecordDolbyDigital;
   int ChannelInfoPos;
   int OSDwidth, OSDheight;
diff --git a/device.c b/device.c
index 8f73a142a..46d9ab8b0 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.51 2004/01/04 11:30:05 kls Exp $
+ * $Id: device.c 1.52 2004/01/11 13:21:12 kls Exp $
  */
 
 #include "device.h"
@@ -48,6 +48,7 @@ cDevice::cDevice(void)
   eitFilter = NULL;
   patFilter = NULL;
   sdtFilter = NULL;
+  nitFilter = NULL;
 
   ciHandler = NULL;
   player = NULL;
@@ -69,6 +70,7 @@ cDevice::~cDevice()
   for (int i = 0; i < MAXRECEIVERS; i++)
       Detach(receiver[i]);
   delete ciHandler;
+  delete nitFilter;
   delete sdtFilter;
   delete patFilter;
   delete eitFilter;
@@ -328,6 +330,7 @@ void cDevice::StartSectionHandler(void)
      AttachFilter(eitFilter = new cEitFilter);
      AttachFilter(patFilter = new cPatFilter);
      AttachFilter(sdtFilter = new cSdtFilter(patFilter));
+     AttachFilter(nitFilter = new cNitFilter);
      sectionHandler->SetStatus(true);
      }
 }
@@ -444,12 +447,12 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      // Stop section handling:
      if (sectionHandler) {
         sectionHandler->SetStatus(false);
-        sectionHandler->SetSource(0, 0);
+        sectionHandler->SetChannel(NULL);
         }
      if (SetChannelDevice(Channel, LiveView)) {
         // Start section handling:
         if (sectionHandler) {
-           sectionHandler->SetSource(Channel->Source(), Channel->Transponder());
+           sectionHandler->SetChannel(Channel);
            sectionHandler->SetStatus(true);
            }
         }
diff --git a/device.h b/device.h
index 196ccfe91..8599474ad 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.37 2004/01/04 11:52:00 kls Exp $
+ * $Id: device.h 1.38 2004/01/10 14:15:10 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -13,6 +13,7 @@
 #include "ci.h"
 #include "eit.h"
 #include "filter.h"
+#include "nit.h"
 #include "pat.h"
 #include "sdt.h"
 #include "sections.h"
@@ -241,6 +242,7 @@ class cDevice : public cThread {
   cEitFilter *eitFilter;
   cPatFilter *patFilter;
   cSdtFilter *sdtFilter;
+  cNitFilter *nitFilter;
 protected:
   void StartSectionHandler(void);
        ///< A derived device that provides section data must call
diff --git a/dvbdevice.c b/dvbdevice.c
index e42ff4bf4..cddde8e27 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.76 2004/01/04 14:48:37 kls Exp $
+ * $Id: dvbdevice.c 1.78 2004/01/10 12:21:41 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -632,7 +632,7 @@ int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
      if (ioctl(f, DMX_SET_FILTER, &sctFilterParams) >= 0)
         return f;
      else {
-        esyslog("ERROR: can't set filter (pid=%d, tid=%02X, mask=%02X)", Pid, Tid, Mask);
+        esyslog("ERROR: can't set filter (pid=%d, tid=%02X, mask=%02X): %m", Pid, Tid, Mask);
         close(f);
         }
      }
@@ -772,7 +772,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
 bool cDvbDevice::HasLock(void)
 {
-  return dvbTuner->Locked();
+  return dvbTuner ? dvbTuner->Locked() : false;
 }
 
 void cDvbDevice::SetVolumeDevice(int Volume)
diff --git a/eit.c b/eit.c
index 45a4d8001..d71cad82d 100644
--- a/eit.c
+++ b/eit.c
@@ -8,11 +8,12 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.84 2004/01/02 22:27:29 kls Exp $
+ * $Id: eit.c 1.85 2004/01/09 15:44:43 kls Exp $
  */
 
 #include "eit.h"
 #include "epg.h"
+#include "i18n.h"
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
 
@@ -88,19 +89,36 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       pEvent->SetTableID(Tid);
       pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
 
+      int LanguagePreferenceShort = -1;
+      int LanguagePreferenceExt = -1;
+      bool UseExtendedEventDescriptor = false;
       SI::Descriptor *d;
-      SI::ExtendedEventDescriptors exGroup;
-      char text[256];
+      SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
+      SI::ShortEventDescriptor *ShortEventDescriptor = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
-            case SI::ExtendedEventDescriptorTag:
-                 exGroup.Add((SI::ExtendedEventDescriptor *)d);
-                 d = NULL; //so that it is not deleted
+            case SI::ExtendedEventDescriptorTag: {
+                 SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
+                 if (I18nIsPreferredLanguage(Setup.EPGLanguages, I18nLanguageIndex(eed->languageCode), LanguagePreferenceExt) || !ExtendedEventDescriptors) {
+                    delete ExtendedEventDescriptors;
+                    ExtendedEventDescriptors = new SI::ExtendedEventDescriptors;
+                    UseExtendedEventDescriptor = true;
+                    }
+                 if (UseExtendedEventDescriptor) {
+                    ExtendedEventDescriptors->Add(eed);
+                    d = NULL; // so that it is not deleted
+                    }
+                 if (eed->getDescriptorNumber() == eed->getLastDescriptorNumber())
+                    UseExtendedEventDescriptor = false;
+                 }
                  break;
             case SI::ShortEventDescriptorTag: {
                  SI::ShortEventDescriptor *sed = (SI::ShortEventDescriptor *)d;
-                 pEvent->SetTitle(sed->name.getText(text));
-                 pEvent->SetShortText(sed->text.getText(text));
+                 if (I18nIsPreferredLanguage(Setup.EPGLanguages, I18nLanguageIndex(sed->languageCode), LanguagePreferenceShort) || !ShortEventDescriptor) {
+                    delete ShortEventDescriptor;
+                    ShortEventDescriptor = sed;
+                    d = NULL; // so that it is not deleted
+                    }
                  }
                  break;
             case SI::ContentDescriptorTag:
@@ -126,9 +144,18 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
           }
 
       if (!rEvent) {
-         char buffer[exGroup.getMaximumTextLength()];
-         pEvent->SetDescription(exGroup.getText(buffer));
+         if (ShortEventDescriptor) {
+            char buffer[256];
+            pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer));
+            pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer));
+            }
+         if (ExtendedEventDescriptors) {
+            char buffer[ExtendedEventDescriptors->getMaximumTextLength()];
+            pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer));
+            }
          }
+      delete ExtendedEventDescriptors;
+      delete ShortEventDescriptor;
 
       pEvent->SetStartTime(SiEitEvent.getStartTime());
       pEvent->SetDuration(SiEitEvent.getDuration());
diff --git a/eitscan.c b/eitscan.c
index b4039c509..fc734d272 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.15 2004/01/04 14:54:01 kls Exp $
+ * $Id: eitscan.c 1.18 2004/01/11 15:50:59 kls Exp $
  */
 
 #include "eitscan.h"
@@ -23,7 +23,7 @@ class cScanData : public cListObject {
   virtual bool operator< (const cListObject &ListObject);
   int Source(void) { return source; }
   int Transponder(void) { return transponder; }
-  cChannel *GetChannel(void);
+  cChannel *GetChannel(cList<cChannel> *Channels);
   };
 
 cScanData::cScanData(int Source, int Transponder)
@@ -38,10 +38,9 @@ bool cScanData::operator< (const cListObject &ListObject)
   return source < sd->source || source == sd->source && transponder < sd->transponder;
 }
 
-//XXX this might be done differently later...
-cChannel *cScanData::GetChannel(void)
+cChannel *cScanData::GetChannel(cList<cChannel> *Channels)
 {
-  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+  for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
       if (!Channel->GroupSep() && Channel->Source() == source && ISTRANSPONDER(Channel->Transponder(), transponder))
          return Channel;
       }
@@ -52,13 +51,13 @@ cChannel *cScanData::GetChannel(void)
 
 class cScanList : public cList<cScanData> {
 public:
-  cScanList(void);
+  cScanList(cList<cChannel> *Channels);
   void AddTransponder(const cChannel *Channel);
   };
 
-cScanList::cScanList(void)
+cScanList::cScanList(cList<cChannel> *Channels)
 {
-  for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch))
+  for (cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch))
       AddTransponder(ch);
   Sort();
 }
@@ -66,12 +65,30 @@ cScanList::cScanList(void)
 void cScanList::AddTransponder(const cChannel *Channel)
 {
   for (cScanData *sd = First(); sd; sd = Next(sd)) {
-      if (sd->Source() == Channel->Source() && sd->Transponder() == Channel->Transponder())
+      if (sd->Source() == Channel->Source() && ISTRANSPONDER(sd->Transponder(), Channel->Transponder()))
          return;
       }
   Add(new cScanData(Channel->Source(), Channel->Transponder()));
 }
 
+// --- cTransponderList ------------------------------------------------------
+
+class cTransponderList : public cList<cChannel> {
+public:
+  void AddTransponder(cChannel *Channel);
+  };
+
+void cTransponderList::AddTransponder(cChannel *Channel)
+{
+  for (cChannel *ch = First(); ch; ch = Next(ch)) {
+      if (ch->Source() == Channel->Source() && ch->Transponder() == Channel->Transponder()) {
+         delete Channel;
+         return;
+         }
+      }
+  Add(Channel);
+}
+
 // --- cEITScanner -----------------------------------------------------------
 
 cEITScanner EITScanner;
@@ -81,13 +98,22 @@ cEITScanner::cEITScanner(void)
   lastScan = lastActivity = time(NULL);
   currentDevice = NULL;
   currentChannel = 0;
-  memset(lastChannel, 0, sizeof(lastChannel));
+  numScan = 0;
   scanList = NULL;
+  transponderList = NULL;
 }
 
 cEITScanner::~cEITScanner()
 {
   delete scanList;
+  delete transponderList;
+}
+
+void cEITScanner::AddTransponder(cChannel *Channel)
+{
+  if (!transponderList)
+     transponderList = new cTransponderList;
+  transponderList->AddTransponder(Channel);
 }
 
 void cEITScanner::Activity(void)
@@ -105,36 +131,39 @@ void cEITScanner::Process(void)
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         if (Channels.Lock(false, 10)) {
+           cList<cChannel> *ChannelList = &Channels;
+           if (numScan % 2 == 0 && transponderList) // switch between the list of new transponders and the actual channels in case there are transponders w/o any channels
+              ChannelList = transponderList;
            if (!scanList)
-              scanList = new cScanList();
+              scanList = new cScanList(ChannelList);
            for (bool AnyDeviceSwitched = false; !AnyDeviceSwitched; ) {
                cScanData *ScanData = NULL;
                for (int i = 0; i < cDevice::NumDevices(); i++) {
-                   cDevice *Device = cDevice::GetDevice(i);
-                   if (Device) {
-                      if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                         if (!(Device->Receiving(true) || Device->Replaying())) {
-                            if (!ScanData)
-                               ScanData = scanList->First();
-                            if (ScanData) {
-                               cChannel *Channel = ScanData->GetChannel();
-                               //XXX if (Device->ProvidesTransponder(Channel)) {
-                               if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) { //XXX temporary for the 'sky' plugin
-                                  if (Device == cDevice::PrimaryDevice() && !currentChannel)
-                                     currentChannel = Device->CurrentChannel();
-                                  currentDevice = Device;//XXX see also dvbdevice.c!!!
-                                  Device->SwitchChannel(Channel, false);
-                                  currentDevice = NULL;
-                                  scanList->Del(ScanData);
-                                  ScanData = NULL;
-                                  AnyDeviceSwitched = true;
+                   if (ScanData || (ScanData = scanList->First()) != NULL) {
+                      cDevice *Device = cDevice::GetDevice(i);
+                      if (Device) {
+                         if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                            if (!(Device->Receiving(true) || Device->Replaying())) {
+                               cChannel *Channel = ScanData->GetChannel(ChannelList);
+                               if (Channel) {
+                                  //XXX if (Device->ProvidesTransponder(Channel)) {
+                                  if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) { //XXX temporary for the 'sky' plugin
+                                     if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                                        currentChannel = Device->CurrentChannel();
+                                     currentDevice = Device;//XXX see also dvbdevice.c!!!
+                                     Device->SwitchChannel(Channel, false);
+                                     currentDevice = NULL;
+                                     scanList->Del(ScanData);
+                                     ScanData = NULL;
+                                     AnyDeviceSwitched = true;
+                                     }
                                   }
                                }
-                            else
-                               break;
                             }
                          }
                       }
+                   else
+                      break;
                    }
                if (ScanData && !AnyDeviceSwitched) {
                   scanList->Del(ScanData);
@@ -143,12 +172,17 @@ void cEITScanner::Process(void)
                if (!scanList->Count()) {
                   delete scanList;
                   scanList = NULL;
+                  numScan++;
+                  if (ChannelList == transponderList) {
+                     delete transponderList;
+                     transponderList = NULL;
+                     }
                   break;
                   }
                }
-           Channels.Unlock();
-           lastScan = time(NULL);
            }
+        lastScan = time(NULL);
+        Channels.Unlock();
         }
      }
 }
diff --git a/eitscan.h b/eitscan.h
index fff2dee8d..d68379451 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.5 2004/01/03 13:08:39 kls Exp $
+ * $Id: eitscan.h 1.6 2004/01/11 14:11:25 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -14,6 +14,7 @@
 #include "config.h"
 
 class cScanList;
+class cTransponderList;
 
 class cEITScanner {
 private:
@@ -23,13 +24,15 @@ class cEITScanner {
   time_t lastScan, lastActivity;
   cDevice *currentDevice;
   int currentChannel;
-  int lastChannel[MAXDEVICES];
+  int numScan;
   cScanList *scanList;
+  cTransponderList *transponderList;
 public:
   cEITScanner(void);
   ~cEITScanner();
   bool Active(void) { return currentChannel; }
   bool UsesDevice(const cDevice *Device) { return currentDevice == Device; }
+  void AddTransponder(cChannel *Channel);
   void Activity(void);
   void Process(void);
   };
diff --git a/epg.c b/epg.c
index 60d63af61..19f1c7f4f 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.3 2004/01/04 14:07:46 kls Exp $
+ * $Id: epg.c 1.4 2004/01/09 15:22:18 kls Exp $
  */
 
 #include "epg.h"
@@ -486,6 +486,12 @@ bool cSchedule::SetFollowingEvent(cEvent *Event)
   return true;
 }
 
+void cSchedule::ResetVersions(void)
+{
+  for (cEvent *p = events.First(); p; p = events.Next(p))
+      p->SetVersion(0xFF);
+}
+
 void cSchedule::Cleanup(void)
 {
   Cleanup(time(NULL));
@@ -613,6 +619,16 @@ void cSchedules::Cleanup(bool Force)
      }
 }
 
+void cSchedules::ResetVersions(void)
+{
+  cSchedulesLock SchedulesLock(true);
+  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
+  if (s) {
+     for (cSchedule *Schedule = s->First(); Schedule; Schedule = s->Next(Schedule))
+         Schedule->ResetVersions();
+     }
+}
+
 bool cSchedules::ClearAll(void)
 {
   cSchedulesLock SchedulesLock(true, 1000);
diff --git a/epg.h b/epg.h
index 19332a592..409968ac3 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.3 2004/01/03 17:00:25 kls Exp $
+ * $Id: epg.h 1.4 2004/01/09 15:21:05 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -84,6 +84,7 @@ class cSchedule : public cListObject  {
   tChannelID ChannelID(void) const { return channelID; }
   bool SetPresentEvent(cEvent *Event);
   bool SetFollowingEvent(cEvent *Event);
+  void ResetVersions(void);
   void Cleanup(time_t Time);
   void Cleanup(void);
   cEvent *AddEvent(cEvent *Event);
@@ -122,6 +123,7 @@ class cSchedules : public cList<cSchedule> {
          ///< time the returned cSchedules is accessed. Once the cSchedules is no
          ///< longer used, the cSchedulesLock must be destroyed.
   static void Cleanup(bool Force = false);
+  static void ResetVersions(void);
   static bool ClearAll(void);
   static bool Dump(FILE *f, const char *Prefix = "");
   static bool Read(FILE *f = NULL);
diff --git a/filter.c b/filter.c
index 668b7d3ae..08bde5a44 100644
--- a/filter.c
+++ b/filter.c
@@ -4,12 +4,39 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.c 1.1 2003/12/21 15:26:16 kls Exp $
+ * $Id: filter.c 1.4 2004/01/11 13:31:34 kls Exp $
  */
 
 #include "filter.h"
 #include "sections.h"
 
+// --- cSectionSyncer --------------------------------------------------------
+
+cSectionSyncer::cSectionSyncer(void)
+{
+  Reset();
+}
+
+void cSectionSyncer::Reset(void)
+{
+  lastVersion = 0xFF;
+  synced = false;
+}
+
+bool cSectionSyncer::Sync(uchar Version, int Number, int LastNumber)
+{
+  if (Version == lastVersion)
+     return false;
+  if (!synced) {
+     if (Number != 0)
+        return false; // sync on first section
+     synced = true;
+     }
+  if (Number == LastNumber)
+     lastVersion = Version;
+  return synced;
+}
+
 // --- cFilterData -----------------------------------------------------------
 
 cFilterData::cFilterData(void)
@@ -69,6 +96,11 @@ int cFilter::Transponder(void)
   return sectionHandler ? sectionHandler->Transponder() : 0;
 }
 
+const cChannel *cFilter::Channel(void)
+{
+  return sectionHandler ? sectionHandler->Channel() : NULL;
+}
+
 void cFilter::SetStatus(bool On)
 {
   if (sectionHandler && on != On) {
@@ -93,10 +125,12 @@ void cFilter::SetStatus(bool On)
 
 bool cFilter::Matches(u_short Pid, u_char Tid)
 {
-  for (cFilterData *fd = data.First(); fd; fd = data.Next(fd)) {
-      if (fd->Matches(Pid, Tid))
-         return true;
-      }
+  if (on) {
+     for (cFilterData *fd = data.First(); fd; fd = data.Next(fd)) {
+         if (fd->Matches(Pid, Tid))
+            return true;
+         }
+     }
   return false;
 }
 
diff --git a/filter.h b/filter.h
index 09703e02f..9bd163fea 100644
--- a/filter.h
+++ b/filter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.h 1.1 2003/12/22 11:41:40 kls Exp $
+ * $Id: filter.h 1.3 2004/01/11 13:31:59 kls Exp $
  */
 
 #ifndef __FILTER_H
@@ -13,6 +13,16 @@
 #include <sys/types.h>
 #include "tools.h"
 
+class cSectionSyncer {
+private:
+  int lastVersion;
+  bool synced;
+public:
+  cSectionSyncer(void);
+  void Reset(void);
+  bool Sync(uchar Version, int Number, int LastNumber);
+  };
+
 class cFilterData : public cListObject {
 public:
   u_short pid;
@@ -25,6 +35,7 @@ class cFilterData : public cListObject {
   bool Matches(u_short Pid, u_char Tid);
   };
 
+class cChannel;
 class cSectionHandler;
 
 class cFilter : public cListObject {
@@ -59,6 +70,8 @@ class cFilter : public cListObject {
        ///< Returns the source of the data delivered to this filter.
   int Transponder(void);
        ///< Returns the transponder of the data delivered to this filter.
+  const cChannel *Channel(void);
+       ///< Returns the channel of the data delivered to this filter.
   bool Matches(u_short Pid, u_char Tid);
        ///< Indicates whether this filter wants to receive data from the given Pid/Tid.
   void Set(u_short Pid, u_char Tid, u_char Mask = 0xFF);
diff --git a/i18n.c b/i18n.c
index 6a35e5a87..c72ccd830 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.137 2003/12/19 13:32:10 kls Exp $
+ * $Id: i18n.c 1.140 2004/01/11 15:38:45 kls Exp $
  *
  * Translations provided by:
  *
@@ -111,6 +111,24 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-1",
   },
+  // The 3-letter names of the language (this MUST be the third phrase!):
+  { "eng",
+    "deu,ger",
+    "slv",
+    "ita",
+    "dut,nla",
+    "por",
+    "fra,fre",
+    "nor",
+    "fin",
+    "pol",
+    "esl,spa",
+    "ell,gre",
+    "sve,swe",
+    "ron,rum",
+    "hun",
+    "cat,cln",
+  },
   // Menu titles:
   { "VDR",
     "VDR",
@@ -2227,6 +2245,40 @@ const tI18nPhrase Phrases[] = {
     "Id�h�z tartoz� Transponder",
     "Usar el temps del m�ltiplex",
   },
+  { "Setup.EPG$Preferred languages",
+    "Bevorzugte Sprachen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Suosikkikielet",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.EPG$Preferred language",
+    "Bevorzugte Sprache",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Suosikkikieli",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
     "Primarna naprava",
@@ -2261,6 +2313,91 @@ const tI18nPhrase Phrases[] = {
     "Video form�tum",
     "Format del v�deo",
   },
+  { "Setup.DVB$Update channels",
+    "Kan�le aktualisieren",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "names only",
+    "nur Namen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "names and PIDs",
+    "Namen und PIDs",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "add new channels",
+    "neue Kan�le hinzuf�gen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "add new transponders",
+    "neue Transponder hinzuf�gen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
     "Frekvenca preklopa (MHz)",
@@ -3852,3 +3989,41 @@ const char * const * I18nCharSets(void)
 {
   return &Phrases[1][0];
 }
+
+const char * I18nLanguageAbbreviation(int Index)
+{
+  return Index < I18nNumLanguages ? Phrases[2][Index] : NULL;
+}
+
+int I18nLanguageIndex(const char Code[3])
+{
+  char s[4];
+  memcpy(s, Code, 3);
+  s[3] = 0;
+  for (int i = 0; i < I18nNumLanguages; i++) {
+      if (strcasestr(Phrases[2][i], s))
+         return i;
+      }
+  //dsyslog("unknown language code: '%s'", s);
+  return -1;
+}
+
+bool I18nIsPreferredLanguage(int *PreferredLanguages, int LanguageIndex, int &OldPreference)
+{
+  for (int i = 0; i < I18nNumLanguages; i++) {
+      if (PreferredLanguages[i] < 0)
+         break; // the language is not a preferred one
+      if (PreferredLanguages[i] == LanguageIndex) {
+         if (OldPreference < 0 || i < OldPreference) {
+            OldPreference = i;
+            return true;
+            }
+         break;
+         }
+      }
+  if (OldPreference < 0) {
+     OldPreference = I18nNumLanguages; // higher than the maximum possible value
+     return true; // if we don't find a preferred one, we take the first one
+     }
+  return false;
+}
diff --git a/i18n.h b/i18n.h
index 44cf1905b..8c8821404 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.7 2003/10/19 15:02:05 kls Exp $
+ * $Id: i18n.h 1.8 2004/01/06 15:56:53 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -22,6 +22,9 @@ const char *I18nTranslate(const char *s, const char *Plugin = NULL);
 
 const char * const * I18nLanguages(void);
 const char * const * I18nCharSets(void);
+const char * I18nLanguageAbbreviation(int Index);
+int I18nLanguageIndex(const char Code[3]);
+bool I18nIsPreferredLanguage(int *PreferredLanguages, int LanguageIndex, int &OldPreference);
 
 #ifdef PLUGIN_NAME_I18N
 #define tr(s)  I18nTranslate(s, PLUGIN_NAME_I18N)
diff --git a/libsi/si.c b/libsi/si.c
index bcf519a81..ac2e26fff 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.3 2004/01/04 14:26:53 kls Exp $
+ *   $Id: si.c 1.4 2004/01/05 11:04:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -219,7 +219,7 @@ void String::decodeText(char *buffer) {
          break;
       if (    ((' ' <= *from) && (*from <= '~'))
            || (*from == '\n')
-           || ((0xA0 <= *from) && (*from <= 0xFF))
+           || (0xA0 <= *from)
          )
          *to++ = *from;
       else if (*from == 0x8A)
diff --git a/libsi/si.h b/libsi/si.h
index 31d17cb28..d2ac417c0 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.3 2003/12/26 14:09:30 kls Exp $
+ *   $Id: si.h 1.5 2004/01/09 15:59:53 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -207,7 +207,7 @@ class NumberedSection : public CRCSection {
    int getVersionNumber() const;
    int getSectionNumber() const;
    int getLastSectionNumber() const;
-   bool moreThanOneSection()  const { return getLastSectionNumber()>1; }
+   bool moreThanOneSection()  const { return getLastSectionNumber()>0; }
 };
 
 class VariableLengthPart : public Object {
@@ -316,7 +316,7 @@ typedef uint64_t  SixtyFourBit;
 
 template <typename T> class TypeLoop : public Loop {
 public:
-   int getCount() const { return getLength()/sizeof(T); }
+   int getCount() { return getLength()/sizeof(T); }
    T operator[](const unsigned int index) const
       {
          switch (sizeof(T)) {
diff --git a/menu.c b/menu.c
index 5e628bbb2..cf9d8eb17 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.276 2004/01/04 11:12:43 kls Exp $
+ * $Id: menu.c 1.279 2004/01/11 15:40:32 kls Exp $
  */
 
 #include "menu.h"
@@ -2029,22 +2029,90 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
 // --- cMenuSetupEPG ---------------------------------------------------------
 
 class cMenuSetupEPG : public cMenuSetupBase {
+private:
+  int originalNumLanguages;
+  int numLanguages;
+  void Setup(void);
 public:
   cMenuSetupEPG(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuSetupEPG::cMenuSetupEPG(void)
 {
+  for (numLanguages = 0; numLanguages < I18nNumLanguages && data.EPGLanguages[numLanguages] >= 0; numLanguages++)
+      ;
+  originalNumLanguages = numLanguages;
   SetSection(tr("EPG"));
+  Setup();
+}
+
+void cMenuSetupEPG::Setup(void)
+{
+  int current = Current();
+
+  Clear();
+
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"),      &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"),          &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
-  Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
+  if (data.SetSystemTime)
+     Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
+  Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"),       &numLanguages, 0, I18nNumLanguages));
+  for (int i = 0; i < numLanguages; i++)
+     Add(new cMenuEditStraItem(tr("Setup.EPG$Preferred language"),     &data.EPGLanguages[i], I18nNumLanguages, I18nLanguages()));
+
+  SetCurrent(Get(current));
+  Display();
+}
+
+eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
+{
+  int oldnumLanguages = numLanguages;
+  int oldSetSystemTime = data.SetSystemTime;
+
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+  if (Key == kOk) {
+     bool Modified = numLanguages != originalNumLanguages;
+     if (!Modified) {
+        for (int i = 0; i < numLanguages; i++) {
+            if (data.EPGLanguages[i] != ::Setup.EPGLanguages[i]) {
+               Modified = true;
+               break;
+               }
+            }
+        }
+     if (Modified)
+        cSchedules::ResetVersions();
+     }
+  else if (Key != kNone) {
+     if (numLanguages != oldnumLanguages || data.SetSystemTime != oldSetSystemTime) {
+        for (int i = oldnumLanguages; i < numLanguages; i++) {
+            data.EPGLanguages[i] = 0;
+            for (int l = 0; l < I18nNumLanguages; l++) {
+                int k;
+                for (k = 0; k < oldnumLanguages; k++) {
+                    if (data.EPGLanguages[k] == l)
+                       break;
+                    }
+                if (k >= oldnumLanguages) {
+                   data.EPGLanguages[i] = l;
+                   break;
+                   }
+                }
+            }
+        data.EPGLanguages[numLanguages] = -1;
+        Setup();
+        }
+     }
+  return state;
 }
 
 // --- cMenuSetupDVB ---------------------------------------------------------
 
 class cMenuSetupDVB : public cMenuSetupBase {
+private:
+  const char *updateChannelsTexts[5];
 public:
   cMenuSetupDVB(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -2052,9 +2120,16 @@ class cMenuSetupDVB : public cMenuSetupBase {
 
 cMenuSetupDVB::cMenuSetupDVB(void)
 {
+  updateChannelsTexts[0] = tr("no");
+  updateChannelsTexts[1] = tr("names only");
+  updateChannelsTexts[2] = tr("names and PIDs");
+  updateChannelsTexts[3] = tr("add new channels");
+  updateChannelsTexts[4] = tr("add new transponders");
+
   SetSection(tr("DVB"));
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
+  Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 5, updateChannelsTexts));
 }
 
 eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
diff --git a/nit.c b/nit.c
new file mode 100644
index 000000000..1ac731cd3
--- /dev/null
+++ b/nit.c
@@ -0,0 +1,139 @@
+/*
+ * nit.c: NIT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: nit.c 1.1 2004/01/11 15:42:51 kls Exp $
+ */
+
+#include "nit.h"
+#include <linux/dvb/frontend.h>
+#include "channels.h"
+#include "eitscan.h"
+#include "libsi/section.h"
+#include "libsi/descriptor.h"
+#include "tools.h"
+
+cNitFilter::cNitFilter(void)
+{
+  Set(0x10, 0x40);  // NIT
+}
+
+void cNitFilter::SetStatus(bool On)
+{
+  cFilter::SetStatus(On);
+  sectionSyncer.Reset();
+}
+
+void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+{
+  SI::NIT nit(Data, false);
+  if (!nit.CheckCRCAndParse())
+     return;
+  if (!sectionSyncer.Sync(nit.getVersionNumber(), nit.getSectionNumber(), nit.getLastSectionNumber()))
+     return;
+  if (!Channels.Lock(true, 10))
+     return;
+  for (SI::Loop::Iterator it; nit.transportStreamLoop.hasNext(it); ) {
+      SI::NIT::TransportStream ts = nit.transportStreamLoop.getNext(it);
+      SI::Descriptor *d;
+      for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
+          switch (d->getDescriptorTag()) {
+            case SI::SatelliteDeliverySystemDescriptorTag: {
+                 SI::SatelliteDeliverySystemDescriptor *sd = (SI::SatelliteDeliverySystemDescriptor *)d;
+                 int Source = cSource::FromData(cSource::stSat, BCD2INT(sd->getOrbitalPosition()), sd->getWestEastFlag());
+                 int Frequency = BCD2INT(sd->getFrequency()) / 100;
+                 static char Polarizations[] = { 'h', 'v', 'l', 'r' };
+                 char Polarization = Polarizations[sd->getPolarization()];
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE };
+                 int CodeRate = CodeRates[sd->getFecInner()];
+                 int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
+                 bool found = false;
+                 for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                     if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                        if (Setup.UpdateChannels >= 4)
+                           Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
+                        found = true;
+                        }
+                     }
+                 if (!found && Setup.UpdateChannels >= 4) {
+                    cChannel *Channel = new cChannel;
+                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0, false);
+                    if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, false))
+                       EITScanner.AddTransponder(Channel);
+                    else
+                       delete Channel;
+                    }
+                 }
+                 break;
+            case SI::CableDeliverySystemDescriptorTag: {
+                 SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
+                 int Source = cSource::FromData(cSource::stCable);
+                 int Frequency = BCD2INT(sd->getFrequency()) / 10;
+                 //XXX FEC_outer???
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE };
+                 int CodeRate = CodeRates[sd->getFecInner()];
+                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256 };
+                 int Modulation = Modulations[sd->getModulation()];
+                 int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
+                 bool found = false;
+                 for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                     if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                        if (Setup.UpdateChannels >= 4)
+                           Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
+                        found = true;
+                        }
+                     }
+                 if (!found && Setup.UpdateChannels >= 4) {
+                    cChannel *Channel = new cChannel;
+                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0, false);
+                    if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate, false))
+                       EITScanner.AddTransponder(Channel);
+                    else
+                       delete Channel;
+                    }
+                 }
+                 break;
+            case SI::TerrestrialDeliverySystemDescriptorTag: {
+                 SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
+                 int Source = cSource::FromData(cSource::stCable);
+                 int Frequency = sd->getFrequency() * 10;
+                 static int Bandwidths[] = { BANDWIDTH_6_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_8_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
+                 int Bandwidth = Bandwidths[sd->getBandwidth()];
+                 static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
+                 int Constellation = Constellations[sd->getConstellation()];
+                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4 };
+                 int Hierarchy = Hierarchies[sd->getHierarchy()];
+                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_NONE, FEC_NONE, FEC_NONE };
+                 int CodeRateHP = CodeRates[sd->getCodeRateHP()];
+                 int CodeRateLP = CodeRates[sd->getCodeRateLP()];
+                 static int GuardIntervals[] = { GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_32 };
+                 int GuardInterval = GuardIntervals[sd->getGuardInterval()];
+                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
+                 int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
+                 bool found = false;
+                 for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                     if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                        if (Setup.UpdateChannels >= 4)
+                           Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
+                        found = true;
+                        }
+                     }
+                 if (!found && Setup.UpdateChannels >= 4) {
+                    cChannel *Channel = new cChannel;
+                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0, false);
+                    if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, false))
+                       EITScanner.AddTransponder(Channel);
+                    else
+                       delete Channel;
+                    }
+                 }
+                 break;
+            default: ;
+            }
+          delete d;
+          }
+      }
+  Channels.Unlock();
+}
diff --git a/nit.h b/nit.h
new file mode 100644
index 000000000..e7d987df7
--- /dev/null
+++ b/nit.h
@@ -0,0 +1,25 @@
+/*
+ * nit.h: NIT section filter
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: nit.h 1.1 2004/01/11 14:31:05 kls Exp $
+ */
+
+#ifndef __NIT_H
+#define __NIT_H
+
+#include "filter.h"
+
+class cNitFilter : public cFilter {
+private:
+  cSectionSyncer sectionSyncer;
+protected:
+  virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
+public:
+  cNitFilter(void);
+  virtual void SetStatus(bool On);
+  };
+
+#endif //__NIT_H
diff --git a/pat.c b/pat.c
index 3fa6848c3..312e2f155 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.3 2004/01/04 12:27:06 kls Exp $
+ * $Id: pat.c 1.4 2004/01/05 11:42:30 kls Exp $
  */
 
 #include "pat.h"
@@ -368,9 +368,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                 delete d;
                 }
             }
-        Channel->SetPids(Vpid, Ppid, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
-        Channel->SetCaIds(CaDescriptors->CaIds());
-        Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
+        if (Setup.UpdateChannels >= 2) {
+           Channel->SetPids(Vpid, Ppid, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
+           Channel->SetCaIds(CaDescriptors->CaIds());
+           Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
+           }
         }
      lastPmtScan = 0; // this triggers the next scan
      Channels.Unlock();
diff --git a/runvdr b/runvdr
index 9c639914f..883e16b1c 100755
--- a/runvdr
+++ b/runvdr
@@ -18,7 +18,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.11 2003/08/26 16:15:41 kls Exp $
+# $Id: runvdr 1.12 2004/01/09 16:19:26 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
@@ -33,7 +33,7 @@ if [ $LSMOD -eq 0 ] ; then
    fi
 
 while (true) do
-      su -c "$VDRCMD" $VDRUSR
+      su $VDRUSR -c "$VDRCMD"
       if test $? -eq 0 -o $? -eq 2; then exit; fi
       date
       echo "restarting VDR"
diff --git a/sdt.c b/sdt.c
index a4e91b809..9d760bf43 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,42 +4,47 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.1 2004/01/04 11:54:42 kls Exp $
+ * $Id: sdt.c 1.4 2004/01/11 14:28:28 kls Exp $
  */
 
 #include "sdt.h"
 #include "channels.h"
+#include "config.h"
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
 
-// --- cSDT ------------------------------------------------------------------
+// --- cSdtFilter ------------------------------------------------------------
 
-class cSDT : public SI::SDT {
-public:
-  cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFilter, const u_char *Data);
-  };
+cSdtFilter::cSdtFilter(cPatFilter *PatFilter)
+{
+  patFilter = PatFilter;
+  Set(0x11, 0x42);  // SDT
+}
 
-cSDT::cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFilter, const u_char *Data)
-:SI::SDT(Data, false)
+void cSdtFilter::SetStatus(bool On)
 {
-  if (!CheckCRCAndParse())
-     return;
+  cFilter::SetStatus(On);
+  sectionSyncer.Reset();
+}
 
-  if (getVersionNumber() == lastSdtVersion)
+void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
+{
+  if (!(Source() && Transponder()))
+     return;
+  SI::SDT sdt(Data, false);
+  if (!sdt.CheckCRCAndParse())
+     return;
+  if (!sectionSyncer.Sync(sdt.getVersionNumber(), sdt.getSectionNumber(), sdt.getLastSectionNumber()))
      return;
-
   if (!Channels.Lock(true, 10))
      return;
-
-  lastSdtVersion = getVersionNumber();
-
   SI::SDT::Service SiSdtService;
-  for (SI::Loop::Iterator it; serviceLoop.hasNext(it); ) {
-      SiSdtService = serviceLoop.getNext(it);
+  for (SI::Loop::Iterator it; sdt.serviceLoop.hasNext(it); ) {
+      SiSdtService = sdt.serviceLoop.getNext(it);
 
-      cChannel *Channel = Channels.GetByChannelID(tChannelID(Source, getOriginalNetworkId(), getTransportStreamId(), SiSdtService.getServiceId()));
-      if (!Channel)
-         Channel = Channels.GetByChannelID(tChannelID(Source, 0, Transponder, SiSdtService.getServiceId()));
+      cChannel *channel = Channels.GetByChannelID(tChannelID(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
+      if (!channel)
+         channel = Channels.GetByChannelID(tChannelID(Source(), 0, Transponder(), SiSdtService.getServiceId()));
 
       SI::Descriptor *d;
       for (SI::Loop::Iterator it2; (d = SiSdtService.serviceDescriptors.getNext(it2)); ) {
@@ -78,18 +83,19 @@ cSDT::cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFi
                            strcpy(ps, NameBuf);
                            pn = ShortNameBuf;
                            }
-                        if (Channel) {
-                           Channel->SetId(getOriginalNetworkId(), getTransportStreamId(), SiSdtService.getServiceId());
-                           Channel->SetName(pn);
+                        if (channel) {
+                           channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
+                           if (Setup.UpdateChannels >= 1)
+                              channel->SetName(pn);
                            // Using SiSdtService.getFreeCaMode() is no good, because some
                            // tv stations set this flag even for non-encrypted channels :-(
                            // The special value 0xFFFF was supposed to mean "unknown encryption"
                            // and would have been overwritten with real CA values later:
-                           // Channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
+                           // channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
                            }
-                        else if (*pn) {
-                           Channel = Channels.NewChannel(Source, Transponder, pn, getOriginalNetworkId(), getTransportStreamId(), SiSdtService.getServiceId());
-                           PatFilter->Trigger();
+                        else if (*pn && Setup.UpdateChannels >= 3) {
+                           channel = Channels.NewChannel(Channel(), pn, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
+                           patFilter->Trigger();
                            }
                         }
                    }
@@ -100,9 +106,9 @@ cSDT::cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFi
             /*
             case SI::CaIdentifierDescriptorTag: {
                  SI::CaIdentifierDescriptor *cid = (SI::CaIdentifierDescriptor *)d;
-                 if (Channel) {
+                 if (channel) {
                     for (SI::Loop::Iterator it; cid->identifiers.hasNext(it); )
-                        Channel->SetCa(cid->identifiers.getNext(it));
+                        channel->SetCa(cid->identifiers.getNext(it));
                     }
                  }
                  break;
@@ -122,25 +128,3 @@ cSDT::cSDT(int Source, int Transponder, uchar &lastSdtVersion, cPatFilter *PatFi
       }
   Channels.Unlock();
 }
-
-
-// --- cSdtFilter ------------------------------------------------------------
-
-cSdtFilter::cSdtFilter(cPatFilter *PatFilter)
-{
-  lastSdtVersion = 0xFF;
-  patFilter = PatFilter;
-  Set(0x11, 0x42);  // SDT
-}
-
-void cSdtFilter::SetStatus(bool On)
-{
-  cFilter::SetStatus(On);
-  lastSdtVersion = 0xFF;
-}
-
-void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
-{
-  if (Source() && Transponder())
-     cSDT SDT(Source(), Transponder(), lastSdtVersion, patFilter, Data);
-}
diff --git a/sdt.h b/sdt.h
index 8d75f3c77..a427119c3 100644
--- a/sdt.h
+++ b/sdt.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.h 1.1 2004/01/03 13:49:55 kls Exp $
+ * $Id: sdt.h 1.2 2004/01/05 14:30:14 kls Exp $
  */
 
 #ifndef __SDT_H
@@ -15,7 +15,7 @@
 
 class cSdtFilter : public cFilter {
 private:
-  uchar lastSdtVersion;
+  cSectionSyncer sectionSyncer;
   cPatFilter *patFilter;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
diff --git a/sections.c b/sections.c
index 6b4d4907d..fb934a8cd 100644
--- a/sections.c
+++ b/sections.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.2 2004/01/03 12:54:01 kls Exp $
+ * $Id: sections.c 1.4 2004/01/11 13:22:13 kls Exp $
  */
 
 #include "sections.h"
 #include <unistd.h>
+#include "channels.h"
 #include "device.h"
 
 // --- cFilterHandle----------------------------------------------------------
@@ -28,17 +29,24 @@ cFilterHandle::cFilterHandle(const cFilterData &FilterData)
   used = 0;
 }
 
+// --- cSectionHandlerPrivate ------------------------------------------------
+
+class cSectionHandlerPrivate {
+public:
+  cChannel channel;
+  };
+
 // --- cSectionHandler -------------------------------------------------------
 
 cSectionHandler::cSectionHandler(cDevice *Device)
 :cThread("Section handler")
 {
+  shp = new cSectionHandlerPrivate;
   device = Device;
   active = false;
-  source = 0;
-  transponder = 0;
   statusCount = 0;
   on = false;
+  lastIncompleteSection = 0;
   Start();
 }
 
@@ -49,6 +57,22 @@ cSectionHandler::~cSectionHandler()
   cFilter *fi;
   while ((fi = filters.First()) != NULL)
         Detach(fi);
+  delete shp;
+}
+
+int cSectionHandler::Source(void)
+{
+  return shp->channel.Source();
+}
+
+int cSectionHandler::Transponder(void)
+{
+  return shp->channel.Transponder();
+}
+
+const cChannel *cSectionHandler::Channel(void)
+{
+  return &shp->channel;
 }
 
 void cSectionHandler::Add(const cFilterData *FilterData)
@@ -106,11 +130,10 @@ void cSectionHandler::Detach(cFilter *Filter)
   Unlock();
 }
 
-void cSectionHandler::SetSource(int Source, int Transponder)
+void cSectionHandler::SetChannel(const cChannel *Channel)
 {
   Lock();
-  source = Source;
-  transponder = Transponder;
+  shp->channel = Channel? *Channel : cChannel();
   Unlock();
 }
 
@@ -176,8 +199,10 @@ void cSectionHandler::Action(void)
                                   fi->Process(pid, tid, buf, len);
                                }
                            }
-                        else
+                        else if (time(NULL) - lastIncompleteSection > 10) { // log them only every 10 seconds
                            dsyslog("read incomplete section - len = %d, r = %d", len, r);
+                           lastIncompleteSection = time(NULL);
+                           }
                         }
                      }
                   }
diff --git a/sections.h b/sections.h
index 1f4f462be..670f78532 100644
--- a/sections.h
+++ b/sections.h
@@ -4,28 +4,31 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.h 1.1 2003/12/21 14:37:00 kls Exp $
+ * $Id: sections.h 1.3 2004/01/11 13:18:38 kls Exp $
  */
 
 #ifndef __SECTIONS_H
 #define __SECTIONS_H
 
+#include <time.h>
 #include "filter.h"
 #include "thread.h"
 #include "tools.h"
 
 class cDevice;
+class cChannel;
 class cFilterHandle;
+class cSectionHandlerPrivate;
 
 class cSectionHandler : public cThread {
   friend class cFilter;
 private:
+  cSectionHandlerPrivate *shp;
   cDevice *device;
   bool active;
-  int source;
-  int transponder;
   int statusCount;
   bool on;
+  time_t lastIncompleteSection;
   cList<cFilter> filters;
   cList<cFilterHandle> filterHandles;
   void Add(const cFilterData *FilterData);
@@ -34,11 +37,12 @@ class cSectionHandler : public cThread {
 public:
   cSectionHandler(cDevice *Device);
   virtual ~cSectionHandler();
-  int Source(void) { return source; }
-  int Transponder(void) { return transponder; }
+  int Source(void);
+  int Transponder(void);
+  const cChannel *Channel(void);
   void Attach(cFilter *Filter);
   void Detach(cFilter *Filter);
-  void SetSource(int Source, int Transponder);
+  void SetChannel(const cChannel *Channel);
   void SetStatus(bool On);
   };
 
diff --git a/sources.c b/sources.c
index fc660a5cc..a9c314881 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 1.1 2002/10/06 09:27:10 kls Exp $
+ * $Id: sources.c 1.2 2004/01/11 10:36:57 kls Exp $
  */
 
 #include "sources.h"
@@ -90,6 +90,17 @@ int cSource::FromString(const char *s)
   return code;
 }
 
+int cSource::FromData(eSourceType SourceType, int Position, bool East)
+{
+  int code = SourceType;
+  if (SourceType == stSat) {
+     if (East)
+        code |= st_Neg;
+     code |= (Position & st_Pos);;
+     }
+  return code;
+}
+
 // -- cSources ---------------------------------------------------------------
 
 cSources Sources;
diff --git a/sources.h b/sources.h
index 65d1bd6e2..3e9abc7fc 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 1.1 2002/10/04 14:25:03 kls Exp $
+ * $Id: sources.h 1.2 2004/01/11 10:35:36 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -21,6 +21,7 @@ class cSource : public cListObject {
     stTerr  = 0xC000,
     st_Mask = 0xC000,
     st_Neg  = 0x0800,
+    st_Pos  = 0x07FF,
     };
 private:
   int code;
@@ -33,6 +34,7 @@ class cSource : public cListObject {
   bool Parse(const char *s);
   static const char *ToString(int Code);
   static int FromString(const char *s);
+  static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
   };
 
 class cSources : public cConfig<cSource> {
diff --git a/tools.c b/tools.c
index 21ec526c4..fc8cb294b 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.77 2003/04/06 15:31:45 kls Exp $
+ * $Id: tools.c 1.78 2004/01/11 15:42:30 kls Exp $
  */
 
 #include "tools.h"
@@ -20,6 +20,14 @@
 
 int SysLogLevel = 3;
 
+int BCD2INT(int x)
+{
+  return ((1000000 * BCDCHARTOINT((x >> 24) & 0xFF)) +
+            (10000 * BCDCHARTOINT((x >> 16) & 0xFF)) +
+              (100 * BCDCHARTOINT((x >>  8) & 0xFF)) +
+                     BCDCHARTOINT( x        & 0xFF));
+}
+
 ssize_t safe_read(int filedes, void *buffer, size_t size)
 {
   for (;;) {
diff --git a/tools.h b/tools.h
index a5a626c39..5af8ffa4f 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.54 2002/12/15 14:59:53 kls Exp $
+ * $Id: tools.h 1.55 2004/01/11 15:42:15 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -52,6 +52,9 @@ template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #endif
 
+#define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
+int BCD2INT(int x);
+
 ssize_t safe_read(int filedes, void *buffer, size_t size);
 ssize_t safe_write(int filedes, const void *buffer, size_t size);
 void writechar(int filedes, char c);
diff --git a/vdr.5 b/vdr.5
index 761c400d5..10597f55c 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.21 2004/01/02 15:24:21 kls Exp $
+.\" $Id: vdr.5 1.22 2004/01/05 15:26:33 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -544,7 +544,7 @@ l l.
 \fBC\fR@<channel id> <channel name>
 \fBE\fR@<event id> <start time> <duration> <table id>
 \fBT\fR@<title>
-\fBS\fR@<subtitle>
+\fBS\fR@<short text>
 \fBD\fR@<description>
 \fBe\fR@
 \fBc\fR@
@@ -566,7 +566,7 @@ l l.
 <duration>     @is the time (in seconds) that this event will take
 <table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
 <title>        @is the title of the event
-<subtitle>     @is the subtitle (typically the name of the episode etc.)
+<short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
 .TE
 

From b8e837dbbbaa8a91c4dc257fde5c0131bedeb23e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 18 Jan 2004 18:00:00 +0100
Subject: [PATCH 094/307] Version 1.3.2 - Fixed resetting the EPG data versions
 after changing the preferred languages   (thanks to Teemu Rantanen for
 reporting this one and helping to debug it). - Added LinkageDescriptor
 handling to 'libsi' (thanks to Marcel Wiesweg). - Added Russian language
 texts (thanks to Vyacheslav Dikonov).   Plugin authors may want to add the
 new entries to their I18N texts and contact   the translators to have their
 texts translated. Note that there are now 17   different OSD languages, so
 please make sure you have 17 versions for each of   your texts. - Some
 corrections and additions to the Finnish OSD texts (thanks to Rolf  
 Ahrenberg and Niko Tarnanen). - Fixed a wrong 'delta' value in the call to
 the shutdown script (thanks to   Stephan Epstein for reporting this one). -
 Activated detection of radio channels (to avoid reports about "channels not  
 being detected that used to be detected with the 'scan' utility or the  
 original 'autopid' patch ;-). - Channels with a zero VPID no longer write a
 PPID into channels.conf. - Short channel names are now only stored if they
 actually differ from the   full name. - The EPG scan now scans newly found
 transponders together with already existing   ones. - The "Red" button in the
 "Setup/EPG" menu can now be used to force an EPG   scan on a single DVB card
 system (see MANUAL for details). - The new SVDRP command 'SCAN' can be used
 to force  an EPG scan on a single   DVB card system (see MANUAL under
 Setup/EPG for details). - Fixed handling PID changes in 'Transfer Mode'. -
 Excess blanks in channel names read from the SDT are now removed. - Fixed
 wrong parameter settings when scanning NITs for terrestrial transponders  
 (thanks to Christian Tramnitz for pointing out this one). - Fixed some out of
 bounds parameter settings when scanning NITs for cable   and satellite
 transponders. - Added 'libsi' include files to the 'include' directory, so
 that plugins can   use them (thanks to Marcel Wiesweg). - Now only processing
 NITs that contain the transponder they are actually   broadcast on. - Fixed
 setting the source type for newly detected terrestrial transponders   (thanks
 to Christian Tramnitz for his support in debugging this).

---
 CONTRIBUTORS             |   16 +
 HISTORY                  |   39 +
 MANUAL                   |    9 +
 Makefile                 |   20 +-
 PLUGINS/src/hello/i18n.c |   14 +-
 README.developer         |    1 -
 channels.conf            |    4 +-
 config.h                 |    6 +-
 eitscan.c                |   79 +-
 eitscan.h                |    6 +-
 font.c                   |   12 +-
 font.h                   |    5 +-
 fontfix-iso8859-5.c      | 6051 ++++++++++++++++++++++++++++++++++++
 fontosd-iso8859-5.c      | 5602 ++++++++++++++++++++++++++++++++++
 fontsml-iso8859-5.c      | 6274 ++++++++++++++++++++++++++++++++++++++
 i18n.c                   |  263 +-
 i18n.h                   |    4 +-
 libsi/descriptor.c       |   24 +-
 libsi/descriptor.h       |   15 +-
 libsi/si.c               |    6 +-
 libsi/si.h               |   18 +-
 menu.c                   |   19 +-
 nit.c                    |   99 +-
 nit.h                    |   16 +-
 pat.c                    |    4 +-
 sdt.c                    |    8 +-
 svdrp.c                  |   13 +-
 svdrp.h                  |    3 +-
 vdr.c                    |    6 +-
 29 files changed, 18529 insertions(+), 107 deletions(-)
 create mode 100644 fontfix-iso8859-5.c
 create mode 100644 fontosd-iso8859-5.c
 create mode 100644 fontsml-iso8859-5.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9b21c586f..f07b42074 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -641,6 +641,8 @@ Teemu Rantanen <tvr@iki.fi>
  for reporting a problem in calculation of channel ids for tv stations that use
  the undefined NID value 0
  for adding EPG preferred languages
+ for reporting and helping to debug resetting the EPG data versions after changing
+ the preferred languages
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
@@ -654,6 +656,8 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for fixing volume display in case a plugin has its own OSD open
  for providing 'libsi' and adapting the EIT mechanisms to it
  for fixing testing for matching section filters in case they are turned off
+ for adding 'libsi' include files to the 'include' directory, so that plugins can
+ use them
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -902,3 +906,15 @@ Martin Holst <holstm@gmx.de>
 Robert Huitl <vdr@huitl.de>
  for fixing 'su' call in 'runvdr' to make it work on systems that require the
  user name to appear before the command option
+
+Vyacheslav Dikonov <sdiconov@mail.ru>
+ for translating OSD texts to the Russian language
+
+Stephan Epstein <s.epstein@vinzenz.com>
+ for reporting a wrong 'delta' value in the call to the shutdown script
+
+Christian Tramnitz <maillist@tramnitz.com>
+ for pointing out a problem with wrong parameter settings when scanning NITs
+ for terrestrial transponders
+ for his support in debugging a problem in setting the source type for newly
+ detected terrestrial transponders
diff --git a/HISTORY b/HISTORY
index bef76aa0b..a6ded3069 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2571,3 +2571,42 @@ Video Disk Recorder Revision History
   scanned for channels during the next EPG scan. Note that only the satellite
   branches are tested, cable and terrestrial need to be tested by somebody who
   actually has such equipment.
+
+2004-01-18: Version 1.3.2
+
+- Fixed resetting the EPG data versions after changing the preferred languages
+  (thanks to Teemu Rantanen for reporting this one and helping to debug it).
+- Added LinkageDescriptor handling to 'libsi' (thanks to Marcel Wiesweg).
+- Added Russian language texts (thanks to Vyacheslav Dikonov).
+  Plugin authors may want to add the new entries to their I18N texts and contact
+  the translators to have their texts translated. Note that there are now 17
+  different OSD languages, so please make sure you have 17 versions for each of
+  your texts.
+- Some corrections and additions to the Finnish OSD texts (thanks to Rolf
+  Ahrenberg and Niko Tarnanen).
+- Fixed a wrong 'delta' value in the call to the shutdown script (thanks to
+  Stephan Epstein for reporting this one).
+- Activated detection of radio channels (to avoid reports about "channels not
+  being detected that used to be detected with the 'scan' utility or the
+  original 'autopid' patch ;-).
+- Channels with a zero VPID no longer write a PPID into channels.conf.
+- Short channel names are now only stored if they actually differ from the
+  full name.
+- The EPG scan now scans newly found transponders together with already existing
+  ones.
+- The "Red" button in the "Setup/EPG" menu can now be used to force an EPG
+  scan on a single DVB card system (see MANUAL for details).
+- The new SVDRP command 'SCAN' can be used to force  an EPG scan on a single
+  DVB card system (see MANUAL under Setup/EPG for details).
+- Fixed handling PID changes in 'Transfer Mode'.
+- Excess blanks in channel names read from the SDT are now removed.
+- Fixed wrong parameter settings when scanning NITs for terrestrial transponders
+  (thanks to Christian Tramnitz for pointing out this one).
+- Fixed some out of bounds parameter settings when scanning NITs for cable
+  and satellite transponders.
+- Added 'libsi' include files to the 'include' directory, so that plugins can
+  use them (thanks to Marcel Wiesweg).
+- Now only processing NITs that contain the transponder they are actually
+  broadcast on.
+- Fixed setting the source type for newly detected terrestrial transponders
+  (thanks to Christian Tramnitz for his support in debugging this).
diff --git a/MANUAL b/MANUAL
index 1873c516a..80977a90f 100644
--- a/MANUAL
+++ b/MANUAL
@@ -482,6 +482,7 @@ Version 1.2
                          be taken. Note that in order to set the system time from
                          the transponder data the option "Set system time" must also
                          be enabled.
+
   Preferred languages = 0
                          Some tv stations broadcast their EPG data in various
                          different languages. This option allows you to define
@@ -496,6 +497,14 @@ Version 1.2
                          different languages, the preferred languages are checked
                          in the given order to decide which one to take.
 
+  Scan                   The "Red" button in the "Setup/EPG" menu can be used to
+                         force an EPG scan on a single DVB card system. If pressed,
+                         and the primary DVB device is currently not recording or
+                         replaying, it will loop through the transponders once and
+                         then switch back to the original channel. Any user activity
+                         during the EPG scan will also stop the scan and bring back
+                         the original channel.
+
   DVB:
 
   Primary DVB interface = 1
diff --git a/Makefile b/Makefile
index eb1ccac0a..ce38c3db3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.63 2004/01/10 14:11:57 kls Exp $
+# $Id: Makefile 1.65 2004/01/18 14:16:53 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -42,6 +42,9 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
 FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
 OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1
+FIXFONT_ISO8859_5 = -rfx-courier-bold-r-normal--24-*-75-75-m-*-iso8859-5
+OSDFONT_ISO8859_5 = -rfx-helvetica-medium-r-normal--24-*-75-75-p-*-iso8859-5
+SMLFONT_ISO8859_5 = -rfx-helvetica-medium-r-normal--18-*-75-75-p-*-iso8859-5
 FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
 OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
 SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
@@ -70,6 +73,7 @@ endif
 all: vdr
 font: genfontfile\
       fontfix.c fontosd.c fontsml.c\
+      fontfix_iso8859_5.c fontosd_iso8859_5.c fontsml_iso8859_5.c\
       fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c
 	@echo "font files created."
 
@@ -100,11 +104,17 @@ fontosd.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@
 fontsml.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@
-fontfix_iso8859_1.c:
+fontfix_iso8859_5.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_5" "$(FIXFONT_ISO8859_5)" > $@
+fontosd_iso8859_5.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_5" "$(OSDFONT_ISO8859_5)" > $@
+fontsml_iso8859_5.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_5" "$(SMLFONT_ISO8859_5)" > $@
+fontfix_iso8859_7.c:
 	./genfontfile "cFont::tPixelData FontFix_iso8859_7" "$(FIXFONT_ISO8859_7)" > $@
-fontosd_iso8859_1.c:
+fontosd_iso8859_7.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_7" "$(OSDFONT_ISO8859_7)" > $@
-fontsml_iso8859_1.c:
+fontsml_iso8859_7.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
 
 # The font file generator:
@@ -122,6 +132,8 @@ $(SILIB):
 include-dir:
 	@mkdir -p include/vdr
 	@(cd include/vdr; for i in ../../*.h; do ln -fs $$i .; done)
+	@mkdir -p include/libsi
+	@(cd include/libsi; for i in ../../libsi/*.h; do ln -fs $$i .; done)
 
 # Plugins:
 
diff --git a/PLUGINS/src/hello/i18n.c b/PLUGINS/src/hello/i18n.c
index 644bb50aa..304233ba8 100644
--- a/PLUGINS/src/hello/i18n.c
+++ b/PLUGINS/src/hello/i18n.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.c 1.3 2002/06/23 13:05:59 kls Exp $
+ * $Id: i18n.c 1.4 2004/01/16 13:28:23 kls Exp $
  */
 
 #include "i18n.h"
@@ -24,6 +24,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "������!",
   },
   { "Hello world!",
     "Hallo Welt!",
@@ -40,6 +42,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "���������� ���!",
   },
   { "Howdy folks!",
     "Tach zusammen!",
@@ -56,6 +60,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "��� ���������?",
   },
   { "A friendly greeting",
     "Ein freundlicher Gru�",
@@ -72,6 +78,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "��������� �����������",
   },
   { "Greeting time (s)",
     "Dauer des Gru�es (s)",
@@ -88,6 +96,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "����������������� �����������",
   },
   { "Use alternate greeting",
     "Alternativen Gru� verwenden",
@@ -104,6 +114,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "",// TODO
+    "�������������� �����������",
   },
   { NULL }
   };
diff --git a/README.developer b/README.developer
index 6b765660b..d079d6375 100644
--- a/README.developer
+++ b/README.developer
@@ -31,7 +31,6 @@ Here's a list of the highlights - and what _not_ to expect yet
 - Improved CAM support. Channels with conditional access now automatically
   use the device that contains the proper CAM.
 - No NVOD or "linked services" support yet.
-- No radio support yet.
 
 Note that this is currently work in progress, so there may be some
 areas that don't work as smooth as expected, yet.
diff --git a/channels.conf b/channels.conf
index 10628ac96..7776b3fe4 100644
--- a/channels.conf
+++ b/channels.conf
@@ -6,7 +6,7 @@ Das Erste:11836:hC34:S19.2E:27500:101:102:104:0:28106:1:1101:0
 Bayerisches FS:11836:hC34:S19.2E:27500:201:202:204:0:28107:1:1101:0
 hessen fernsehen:11836:hC34:S19.2E:27500:301:302:304:0:28108:1:1101:0
 NDR FS MV:12109:hC34:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0
-SR Fernsehen Suedwest:11836:hC34:S19.2E:27500:501:502:504:0:28110:1:1101:0
+SR Fernsehen S�dwest:11836:hC34:S19.2E:27500:501:502:504:0:28110:1:1101:0
 WDR K�ln:11836:hC34:S19.2E:27500:601:602:604:0:28111:1:1101:0
 BR-alpha:11836:hC34:S19.2E:27500:701:702:704:0:28112:1:1101:0
 S�DWEST BW:11836:hC34:S19.2E:27500:801:802:804:0:28113:1:1101:0
@@ -63,7 +63,6 @@ SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256,257:0:1702,1722,1801:17
 SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
-CNBC:11953:hC34:S19.2E:27500:510:520:530:0:28010:1:1079:0
 Liberty TV.com:12610:vC56:S19.2E:22000:941:943:0:0:12199:1:1112:0
 :-
 ProSieben Austria:12051:vC34:S19.2E:27500:161:84:36:0:20002:1:1082:0
@@ -84,7 +83,6 @@ RTL TELE Letzebuerg:12552:vC56:S19.2E:22000:168:144,146:74:0:3994:1:1108:0
 Yorin:12574:hC56:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0
 MTV2 Pop Channel:12226:hC34:S19.2E:27500:513:661:577:0:28640:1:1091:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
-Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0
 VIVA:12669:vC56:S19.2E:22000:309:310:311:0:12732:1:1116:0
 VIVA PLUS:12552:vC56:S19.2E:22000:171:172:173:0:12120:1:1108:0
 MTV Central:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
diff --git a/config.h b/config.h
index 22623e73a..0a49f3fae 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.182 2004/01/06 16:47:41 kls Exp $
+ * $Id: config.h 1.183 2004/01/11 21:42:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.1"
-#define VDRVERSNUM   10301  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.2"
+#define VDRVERSNUM   10302  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/eitscan.c b/eitscan.c
index fc734d272..a2096af97 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,58 +4,48 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.18 2004/01/11 15:50:59 kls Exp $
+ * $Id: eitscan.c 1.20 2004/01/17 15:38:11 kls Exp $
  */
 
 #include "eitscan.h"
 #include <stdlib.h>
 #include "channels.h"
 #include "dvbdevice.h"
+#include "interface.h"
 
 // --- cScanData -------------------------------------------------------------
 
 class cScanData : public cListObject {
 private:
-  int source;
-  int transponder;
+  cChannel channel;
 public:
-  cScanData(int Source, int Transponder);
+  cScanData(const cChannel *Channel);
   virtual bool operator< (const cListObject &ListObject);
-  int Source(void) { return source; }
-  int Transponder(void) { return transponder; }
-  cChannel *GetChannel(cList<cChannel> *Channels);
+  int Source(void) { return channel.Source(); }
+  int Transponder(void) { return channel.Transponder(); }
+  const cChannel *GetChannel(void) { return &channel; }
   };
 
-cScanData::cScanData(int Source, int Transponder)
+cScanData::cScanData(const cChannel *Channel)
 {
-  source = Source;
-  transponder = Transponder;
+  channel = *Channel;
 }
 
 bool cScanData::operator< (const cListObject &ListObject)
 {
   cScanData *sd = (cScanData *)&ListObject;
-  return source < sd->source || source == sd->source && transponder < sd->transponder;
-}
-
-cChannel *cScanData::GetChannel(cList<cChannel> *Channels)
-{
-  for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
-      if (!Channel->GroupSep() && Channel->Source() == source && ISTRANSPONDER(Channel->Transponder(), transponder))
-         return Channel;
-      }
-  return NULL;
+  return Source() < sd->Source() || Source() == sd->Source() && Transponder() < sd->Transponder();
 }
 
 // --- cScanList -------------------------------------------------------------
 
 class cScanList : public cList<cScanData> {
 public:
-  cScanList(cList<cChannel> *Channels);
+  void AddTransponders(cList<cChannel> *Channels);
   void AddTransponder(const cChannel *Channel);
   };
 
-cScanList::cScanList(cList<cChannel> *Channels)
+void cScanList::AddTransponders(cList<cChannel> *Channels)
 {
   for (cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch))
       AddTransponder(ch);
@@ -64,11 +54,13 @@ cScanList::cScanList(cList<cChannel> *Channels)
 
 void cScanList::AddTransponder(const cChannel *Channel)
 {
-  for (cScanData *sd = First(); sd; sd = Next(sd)) {
-      if (sd->Source() == Channel->Source() && ISTRANSPONDER(sd->Transponder(), Channel->Transponder()))
-         return;
-      }
-  Add(new cScanData(Channel->Source(), Channel->Transponder()));
+  if (Channel->Source() && Channel->Transponder()) {
+     for (cScanData *sd = First(); sd; sd = Next(sd)) {
+         if (sd->Source() == Channel->Source() && ISTRANSPONDER(sd->Transponder(), Channel->Transponder()))
+            return;
+         }
+     Add(new cScanData(Channel));
+     }
 }
 
 // --- cTransponderList ------------------------------------------------------
@@ -98,7 +90,6 @@ cEITScanner::cEITScanner(void)
   lastScan = lastActivity = time(NULL);
   currentDevice = NULL;
   currentChannel = 0;
-  numScan = 0;
   scanList = NULL;
   transponderList = NULL;
 }
@@ -116,6 +107,11 @@ void cEITScanner::AddTransponder(cChannel *Channel)
   transponderList->AddTransponder(Channel);
 }
 
+void cEITScanner::ForceScan(void)
+{
+  lastActivity = 0;
+}
+
 void cEITScanner::Activity(void)
 {
   if (currentChannel) {
@@ -131,11 +127,15 @@ void cEITScanner::Process(void)
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         if (Channels.Lock(false, 10)) {
-           cList<cChannel> *ChannelList = &Channels;
-           if (numScan % 2 == 0 && transponderList) // switch between the list of new transponders and the actual channels in case there are transponders w/o any channels
-              ChannelList = transponderList;
-           if (!scanList)
-              scanList = new cScanList(ChannelList);
+           if (!scanList) {
+              scanList = new cScanList;
+              scanList->AddTransponders(&Channels);
+              if (transponderList) {
+                 scanList->AddTransponders(transponderList);
+                 delete transponderList;
+                 transponderList = NULL;
+                 }
+              }
            for (bool AnyDeviceSwitched = false; !AnyDeviceSwitched; ) {
                cScanData *ScanData = NULL;
                for (int i = 0; i < cDevice::NumDevices(); i++) {
@@ -144,12 +144,14 @@ void cEITScanner::Process(void)
                       if (Device) {
                          if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
                             if (!(Device->Receiving(true) || Device->Replaying())) {
-                               cChannel *Channel = ScanData->GetChannel(ChannelList);
+                               const cChannel *Channel = ScanData->GetChannel();
                                if (Channel) {
                                   //XXX if (Device->ProvidesTransponder(Channel)) {
                                   if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) { //XXX temporary for the 'sky' plugin
-                                     if (Device == cDevice::PrimaryDevice() && !currentChannel)
+                                     if (Device == cDevice::PrimaryDevice() && !currentChannel) {
                                         currentChannel = Device->CurrentChannel();
+                                        Interface->Info("Starting EPG scan");
+                                        }
                                      currentDevice = Device;//XXX see also dvbdevice.c!!!
                                      Device->SwitchChannel(Channel, false);
                                      currentDevice = NULL;
@@ -172,11 +174,8 @@ void cEITScanner::Process(void)
                if (!scanList->Count()) {
                   delete scanList;
                   scanList = NULL;
-                  numScan++;
-                  if (ChannelList == transponderList) {
-                     delete transponderList;
-                     transponderList = NULL;
-                     }
+                  if (lastActivity == 0) // this was a triggered scan
+                     Activity();
                   break;
                   }
                }
diff --git a/eitscan.h b/eitscan.h
index d68379451..c5116cb97 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.6 2004/01/11 14:11:25 kls Exp $
+ * $Id: eitscan.h 1.8 2004/01/17 15:36:24 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -24,15 +24,15 @@ class cEITScanner {
   time_t lastScan, lastActivity;
   cDevice *currentDevice;
   int currentChannel;
-  int numScan;
   cScanList *scanList;
   cTransponderList *transponderList;
 public:
   cEITScanner(void);
   ~cEITScanner();
-  bool Active(void) { return currentChannel; }
+  bool Active(void) { return currentChannel || lastActivity == 0; }
   bool UsesDevice(const cDevice *Device) { return currentDevice == Device; }
   void AddTransponder(cChannel *Channel);
+  void ForceScan(void);
   void Activity(void);
   void Process(void);
   };
diff --git a/font.c b/font.c
index f25136ca1..e933df230 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.4 2003/10/24 12:59:35 kls Exp $
+ * $Id: font.c 1.5 2004/01/16 13:17:57 kls Exp $
  */
 
 #include "font.h"
@@ -14,18 +14,24 @@
 #include "fontosd.c"
 #include "fontsml.c"
 
+#include "fontfix-iso8859-5.c"
+#include "fontosd-iso8859-5.c"
+#include "fontsml-iso8859-5.c"
+
 #include "fontfix-iso8859-7.c"
 #include "fontosd-iso8859-7.c"
 #include "fontsml-iso8859-7.c"
 
 static void *FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 },
-  { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 }
+  { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5 },
+  { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 },
   };
 
 static const char *FontCode[eDvbCodeSize] = {
   "iso8859-1",
-  "iso8859-7"
+  "iso8859-5",
+  "iso8859-7",
   };
 
 eDvbCode cFont::code = code_iso8859_1;
diff --git a/font.h b/font.h
index 6368ac192..9c3631604 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.4 2003/10/24 12:59:45 kls Exp $
+ * $Id: font.h 1.5 2004/01/16 13:18:28 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -21,7 +21,8 @@ enum eDvbFont {
 
 enum eDvbCode {
   code_iso8859_1,
-  code_iso8859_7
+  code_iso8859_5,
+  code_iso8859_7,
 #define eDvbCodeSize (code_iso8859_7 + 1)
   };
 
diff --git a/fontfix-iso8859-5.c b/fontfix-iso8859-5.c
new file mode 100644
index 000000000..08f7fd7c7
--- /dev/null
+++ b/fontfix-iso8859-5.c
@@ -0,0 +1,6051 @@
+cFont::tPixelData FontFix_iso8859_5[][26] = {
+  {             // 32
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 33
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 34
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001CE0,  // ...***..***....
+     0x00001CE0,  // ...***..***....
+     0x00001CE0,  // ...***..***....
+     0x00001CE0,  // ...***..***....
+     0x000018C0,  // ...**...**.....
+     0x00001080,  // ...*....*......
+     0x00001080,  // ...*....*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 35
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 36
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000F60,  // ....****.**....
+     0x00001FE0,  // ...********....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F80,  // ...******......
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00003FE0,  // ..*********....
+     0x000037C0,  // ..**.*****.....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 37
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F00,  // ....****.......
+     0x00001980,  // ...**..**......
+     0x00001080,  // ...*....*......
+     0x00001080,  // ...*....*......
+     0x00001980,  // ...**..**......
+     0x00000F00,  // ....****.......
+     0x00000070,  // .........***...
+     0x000003C0,  // ......****.....
+     0x00000E00,  // ....***........
+     0x000039E0,  // ..***..****....
+     0x00000330,  // ......**..**...
+     0x00000210,  // ......*....*...
+     0x00000210,  // ......*....*...
+     0x00000330,  // ......**..**...
+     0x000001E0,  // .......****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 38
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000E00,  // ....***........
+     0x00001F30,  // ...*****..**...
+     0x00001BF0,  // ...**.******...
+     0x000031E0,  // ..**...****....
+     0x000030C0,  // ..**....**.....
+     0x000031E0,  // ..**...****....
+     0x00003FF8,  // ..***********..
+     0x00001F38,  // ...*****..***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000200,  // ......*........
+     0x00000200,  // ......*........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 40
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000060,  // .........**....
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000E0,  // ........***....
+     0x00000060,  // .........**....
+     0x00000000,  // ...............
+  },
+  {             // 41
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001C00,  // ...***.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00000000,  // ...............
+  },
+  {             // 42
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003330,  // ..**..**..**...
+     0x00003B70,  // ..***.**.***...
+     0x00000FC0,  // ....******.....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 43
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 44
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000800,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 45
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 46
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 47
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 48
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00001860,  // ...**....**....
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 49
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 50
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 51
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000007C0,  // .....*****.....
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x00003FE0,  // ..*********....
+     0x00001FC0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 52
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000007F0,  // .....*******...
+     0x000007F0,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 53
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ...*********...
+     0x00001FF0,  // ...*********...
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BC0,  // ...**.****.....
+     0x00001FF0,  // ...*********...
+     0x00001C70,  // ...***...***...
+     0x00000038,  // ..........***..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00003038,  // ..**......***..
+     0x00003870,  // ..***....***...
+     0x00001FF0,  // ...*********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 54
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F8,  // ........*****..
+     0x000003F8,  // ......*******..
+     0x00000780,  // .....****......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x000019E0,  // ...**..****....
+     0x00001BF0,  // ...**.******...
+     0x00001E38,  // ...****...***..
+     0x00001C18,  // ...***.....**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001C18,  // ...***.....**..
+     0x00000E38,  // ....***...***..
+     0x00000FF0,  // ....********...
+     0x000003E0,  // ......*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 55
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 56
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 57
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // ......****.....
+     0x00000FF0,  // ....********...
+     0x00000C30,  // ....**....**...
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C78,  // ...***...****..
+     0x00000FD8,  // ....******.**..
+     0x00000798,  // .....****..**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 58
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 59
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001000,  // ...*...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 60
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000001C,  // ...........***.
+     0x00000078,  // .........****..
+     0x000001E0,  // .......****....
+     0x00000780,  // .....****......
+     0x00001E00,  // ...****........
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001E00,  // ...****........
+     0x00000780,  // .....****......
+     0x000001E0,  // .......****....
+     0x00000078,  // .........****..
+     0x0000001C,  // ...........***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007000,  // .***...........
+     0x00003C00,  // ..****.........
+     0x00000F00,  // ....****.......
+     0x000003C0,  // ......****.....
+     0x000000F0,  // ........****...
+     0x0000003C,  // ..........****.
+     0x0000003C,  // ..........****.
+     0x000000F0,  // ........****...
+     0x000003C0,  // ......****.....
+     0x00000F00,  // ....****.......
+     0x00003C00,  // ..****.........
+     0x00007000,  // .***...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00001870,  // ...**....***...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000001E0,  // .......****....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 64
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x00003060,  // ..**.....**....
+     0x00003060,  // ..**.....**....
+     0x000031E0,  // ..**...****....
+     0x000033E0,  // ..**..*****....
+     0x00003760,  // ..**.***.**....
+     0x00003660,  // ..**.**..**....
+     0x00003660,  // ..**.**..**....
+     0x00003760,  // ..**.***.**....
+     0x000033F0,  // ..**..******...
+     0x000031F0,  // ..**...*****...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 65
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F80,  // ..*******......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF0,  // .***********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 68
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 69
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018CC,  // ...**...**..**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 71
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x000060FC,  // .**.....******.
+     0x000060FC,  // .**.....******.
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 73
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 74
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFC,  // ....**********.
+     0x00000FFC,  // ....**********.
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x000070E0,  // .***....***....
+     0x00003FC0,  // ..********.....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 75
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCF8,  // ******..*****..
+     0x0000FCF8,  // ******..*****..
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00003F00,  // ..******.......
+     0x00003B80,  // ..***.***......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 77
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F03C,  // ****......****.
+     0x0000F03C,  // ****......****.
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006318,  // .**...**...**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 78
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 79
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF8,  // .************..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000F0C,  // ....****....**.
+     0x00001FFC,  // ...***********.
+     0x00001CF0,  // ...***..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FF80,  // *********......
+     0x0000FFE0,  // ***********....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003070,  // ..**.....***...
+     0x00003FE0,  // ..*********....
+     0x00003F80,  // ..*******......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 83
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 85
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 86
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006FD8,  // .**.******.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00003CF0,  // ..****..****...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 88
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000000,  // ...............
+  },
+  {             // 92
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 93
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+  },
+  {             // 94
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 95
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFFE,  // ***************
+     0x0000FFFE,  // ***************
+     0x00000000,  // ...............
+  },
+  {             // 96
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 97
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 98
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000F000,  // ****...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x000037C0,  // ..**.*****.....
+     0x00003FF0,  // ..**********...
+     0x00003C70,  // ..****...***...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00003C70,  // ..****...***...
+     0x0000FFF0,  // ************...
+     0x0000F7C0,  // ****.*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 99
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x0000381C,  // ..***......***.
+     0x00003FFC,  // ..************.
+     0x00000FF0,  // ....********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 100
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F0,  // ........****...
+     0x000000F0,  // ........****...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FFC,  // ..************.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 101
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 102
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F8,  // .......******..
+     0x000003F8,  // ......*******..
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 103
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001FC0,  // ...*******.....
+  },
+  {             // 104
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000F000,  // ****...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 105
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 106
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // ..********.....
+     0x00003FC0,  // ..********.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00003F80,  // ..*******......
+     0x00003F00,  // ..******.......
+  },
+  {             // 107
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x000018F0,  // ...**...****...
+     0x000018F0,  // ...**...****...
+     0x000019C0,  // ...**..***.....
+     0x00001B80,  // ...**.***......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00001B80,  // ...**.***......
+     0x000019C0,  // ...**..***.....
+     0x000018E0,  // ...**...***....
+     0x000078FC,  // .****...******.
+     0x000078FC,  // .****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 108
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 109
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001DEF0,  // ***.****.****...
+     0x0001FFF8,  // **************..
+     0x00007398,  // ..***..***..**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001F3DE,  // *****..****.****
+     0x0001F3DE,  // *****..****.****
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 111
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 112
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7C0,  // ****.*****.....
+     0x0000FFF0,  // ************...
+     0x00003C70,  // ..****...***...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00003C70,  // ..****...***...
+     0x00003FF0,  // ..**********...
+     0x000037C0,  // ..**.*****.....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x0000FE00,  // *******........
+     0x0000FE00,  // *******........
+  },
+  {             // 113
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x000001FC,  // .......*******.
+     0x000001FC,  // .......*******.
+  },
+  {             // 114
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00003FF8,  // ..***********..
+     0x00000F18,  // ....****...**..
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 115
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 116
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001C70,  // ...***...***...
+     0x00000FF0,  // ....********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 117
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 118
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 119
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00003330,  // ..**..**..**...
+     0x000037B0,  // ..**.****.**...
+     0x000037B0,  // ..**.****.**...
+     0x00003CF0,  // ..****..****...
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 121
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 122
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 123
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x000000E0,  // ........***....
+     0x00000000,  // ...............
+  },
+  {             // 124
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 125
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000380,  // ......***......
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+  },
+  {             // 126
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E18,  // ...****....**..
+     0x00003F38,  // ..******..***..
+     0x000073F0,  // .***..******...
+     0x000061E0,  // .**....****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 127
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 161
+     15, 24,
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018CC,  // ...**...**..**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 162
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 163
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 164
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 165
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 166
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 167
+     15, 24,
+     0x00000000,  // ...............
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 168
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFC,  // ....**********.
+     0x00000FFC,  // ....**********.
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x000070E0,  // .***....***....
+     0x00003FC0,  // ..********.....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 170
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 171
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 172
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 173
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 174
+     15, 24,
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 176
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F80,  // ..*******......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 177
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001800,  // ...**..........
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 178
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF0,  // .***********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 179
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 180
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x0000C00C,  // **..........**.
+     0x0000C00C,  // **..........**.
+     0x0000C00C,  // **..........**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018CC,  // ...**...**..**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 182
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001E79E,  // ****..****..****
+     0x0001E79E,  // ****..****..****
+     0x00006318,  // ..**...**...**..
+     0x00007338,  // ..***..**..***..
+     0x00003330,  // ...**..**..**...
+     0x00001B60,  // ....**.**.**....
+     0x00001FE0,  // ....********....
+     0x00001FE0,  // ....********....
+     0x000037B0,  // ...**.****.**...
+     0x00003330,  // ...**..**..**...
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001C78E,  // ***...****...***
+     0x0001C78E,  // ***...****...***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 183
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000037E0,  // ..**.******....
+     0x00003FF0,  // ..**********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00000038,  // ..........***..
+     0x000003F0,  // ......******...
+     0x000003F8,  // ......*******..
+     0x0000001C,  // ...........***.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007F0,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 184
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3C,  // .*****....****.
+     0x00007C3C,  // .*****....****.
+     0x00003078,  // ..**.....****..
+     0x00003078,  // ..**.....****..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003C18,  // ..****.....**..
+     0x00007C7C,  // .*****...*****.
+     0x0000787C,  // .****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 185
+     15, 24,
+     0x00000C60,  // ....**...**....
+     0x000007C0,  // .....*****.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C3C,  // .*****....****.
+     0x00007C3C,  // .*****....****.
+     0x00003078,  // ..**.....****..
+     0x00003078,  // ..**.....****..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003C18,  // ..****.....**..
+     0x00007C7C,  // .*****...*****.
+     0x0000787C,  // .****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 186
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCF8,  // ******..*****..
+     0x0000FCF8,  // ******..*****..
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00003F00,  // ..******.......
+     0x00003B80,  // ..***.***......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 187
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFE,  // ..*************
+     0x00003FFE,  // ..*************
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x0000D818,  // **.**......**..
+     0x0000F87E,  // *****....******
+     0x0000707E,  // .***.....******
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 188
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F03C,  // ****......****.
+     0x0000F03C,  // ****......****.
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006318,  // .**...**...**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 192
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF8,  // .************..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000FF0,  // ....********...
+     0x00003FFC,  // ..************.
+     0x0000399C,  // ..***..**..***.
+     0x0000718E,  // .***...**...***
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x0000718E,  // .***...**...***
+     0x0000399C,  // ..***..**..***.
+     0x00003FFC,  // ..************.
+     0x00000FF0,  // ....********...
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 199
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001838,  // ...**.....***..
+     0x00001FF8,  // ...**********..
+     0x00000FD8,  // ....******.**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x0000007C,  // .........*****.
+     0x0000007C,  // .........*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 200
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7BC,  // ****.****.****.
+     0x0000F7BC,  // ****.****.****.
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7BC,  // ****.****.****.
+     0x0000F7BC,  // ****.****.****.
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FF00,  // ********.......
+     0x0000FF00,  // ********.......
+     0x0000CC00,  // **..**.........
+     0x0000CC00,  // **..**.........
+     0x0000CC00,  // **..**.........
+     0x00000C00,  // ....**.........
+     0x00000FF8,  // ....*********..
+     0x00000FFC,  // ....**********.
+     0x00000C0E,  // ....**......***
+     0x00000C06,  // ....**.......**
+     0x00000C06,  // ....**.......**
+     0x00000C06,  // ....**.......**
+     0x00000C0E,  // ....**......***
+     0x00003FFC,  // ..************.
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F83E,  // *****.....*****
+     0x0000F83E,  // *****.....*****
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00007F0C,  // .*******....**.
+     0x00007F8C,  // .********...**.
+     0x000061CC,  // .**....***..**.
+     0x000060CC,  // .**.....**..**.
+     0x000060CC,  // .**.....**..**.
+     0x000060CC,  // .**.....**..**.
+     0x000061CC,  // .**....***..**.
+     0x0000FFBE,  // *********.*****
+     0x0000FF3E,  // ********..*****
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E00,  // .******........
+     0x00007E00,  // .******........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 205
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00006FC0,  // .**.******.....
+     0x00007FF0,  // .***********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000601C,  // .**........***.
+     0x0000000C,  // ............**.
+     0x000003FC,  // ......********.
+     0x000003FC,  // ......********.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x0000001C,  // ...........***.
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 206
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F8F0,  // *****...****...
+     0x0000F9F8,  // *****..******..
+     0x0000639C,  // .**...***..***.
+     0x0000630C,  // .**...**....**.
+     0x0000670E,  // .**..***....***
+     0x00006606,  // .**..**......**
+     0x00007E06,  // .******......**
+     0x00007E06,  // .******......**
+     0x00006606,  // .**..**......**
+     0x00006606,  // .**..**......**
+     0x0000670E,  // .**..***....***
+     0x0000630C,  // .**...**....**.
+     0x0000639C,  // .**...***..***.
+     0x0000F9F8,  // *****..******..
+     0x0000F8F0,  // *****...****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 207
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FC,  // .....*********.
+     0x00001FFC,  // ...***********.
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003830,  // ..***.....**...
+     0x00001FF0,  // ...*********...
+     0x000007F0,  // .....*******...
+     0x00000E30,  // ....***...**...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00003830,  // ..***.....**...
+     0x0000F0FC,  // ****....******.
+     0x0000F0FC,  // ****....******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000018,  // ...........**..
+     0x000007F8,  // .....********..
+     0x00001FE0,  // ...********....
+     0x00003800,  // ..***..........
+     0x00003000,  // ..**...........
+     0x00006FC0,  // .**.******.....
+     0x00007FF0,  // .***********...
+     0x00007870,  // .****....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF0,  // .***********...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001FE0,  // ...********....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00007FF0,  // .***********...
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00003F80,  // ..*******......
+     0x00003F80,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001E79E,  // ****..****..****
+     0x0001E79E,  // ****..****..****
+     0x00007338,  // ..***..**..***..
+     0x00003B70,  // ...***.**.***...
+     0x00001FE0,  // ....********....
+     0x00001FE0,  // ....********....
+     0x000037B0,  // ...**.****.**...
+     0x00003330,  // ...**..**..**...
+     0x00006318,  // ..**...**...**..
+     0x0001E79E,  // ****..****..****
+     0x0001C78E,  // ***...****...***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 215
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00006FE0,  // .**.*******....
+     0x00007FF0,  // .***********...
+     0x00007030,  // .***......**...
+     0x00006030,  // .**.......**...
+     0x000007E0,  // .....******....
+     0x000007F0,  // .....*******...
+     0x00000038,  // ..........***..
+     0x00000018,  // ...........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FC7C,  // ******...*****.
+     0x0000FCFC,  // ******..******.
+     0x000030F0,  // ..**....****...
+     0x000031B0,  // ..**...**.**...
+     0x000031B0,  // ..**...**.**...
+     0x00003330,  // ..**..**..**...
+     0x00003730,  // ..**.***..**...
+     0x00003630,  // ..**.**...**...
+     0x00003C30,  // ..****....**...
+     0x0000FCFC,  // ******..******.
+     0x0000F8FC,  // *****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x0000FC7C,  // ******...*****.
+     0x0000FCFC,  // ******..******.
+     0x000030F0,  // ..**....****...
+     0x000031B0,  // ..**...**.**...
+     0x000031B0,  // ..**...**.**...
+     0x00003330,  // ..**..**..**...
+     0x00003730,  // ..**.***..**...
+     0x00003630,  // ..**.**...**...
+     0x00003C30,  // ..****....**...
+     0x0000FCFC,  // ******..******.
+     0x0000F8FC,  // *****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 218
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF0,  // .*****..****...
+     0x00007CF0,  // .*****..****...
+     0x000019C0,  // ...**..***.....
+     0x00001B80,  // ...**.***......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00001B80,  // ...**.***......
+     0x000019C0,  // ...**..***.....
+     0x000018E0,  // ...**...***....
+     0x00007CFC,  // .*****..******.
+     0x00007CFC,  // .*****..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 219
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x00000C30,  // ....**....**...
+     0x0000D830,  // **.**.....**...
+     0x0000F8FC,  // *****...******.
+     0x000070FC,  // .***....******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F03C,  // ****......****.
+     0x0000F03C,  // ****......****.
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006318,  // .**...**...**..
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 221
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7C0,  // ****.*****.....
+     0x0000FFF0,  // ************...
+     0x00003C70,  // ..****...***...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00003C70,  // ..****...***...
+     0x00003FF0,  // ..**********...
+     0x000037C0,  // ..**.*****.....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x0000FE00,  // *******........
+     0x0000FE00,  // *******........
+  },
+  {             // 225
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x0000381C,  // ..***......***.
+     0x00003FFC,  // ..************.
+     0x00000FF0,  // ....********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 226
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000FC0,  // ....******.....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 227
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 228
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00001DB8,  // ...***.**.***..
+     0x00003FFC,  // ..************.
+     0x000073CE,  // .***..****..***
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x000073CE,  // .***..****..***
+     0x00003FFC,  // ..************.
+     0x00001DB8,  // ...***.**.***..
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000007E0,  // .....******....
+     0x000007E0,  // .....******....
+  },
+  {             // 229
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 230
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FFFC,  // **************.
+     0x0000FFFC,  // **************.
+     0x0000000C,  // ............**.
+     0x0000000C,  // ............**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 231
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FF0,  // ...*********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x000000FC,  // ........******.
+     0x000000FC,  // ........******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 232
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001F7BE,  // *****.****.*****
+     0x0001F7BE,  // *****.****.*****
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001FFFE,  // ****************
+     0x0001FFFE,  // ****************
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 233
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001F7BE,  // *****.****.*****
+     0x0001F7BE,  // *****.****.*****
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001FFFE,  // ****************
+     0x0001FFFE,  // ****************
+     0x00000006,  // ..............**
+     0x00000006,  // ..............**
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 234
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FF00,  // ********.......
+     0x0000FF00,  // ********.......
+     0x0000CC00,  // **..**.........
+     0x0000CC00,  // **..**.........
+     0x00000FF0,  // ....********...
+     0x00000FF8,  // ....*********..
+     0x00000C1C,  // ....**.....***.
+     0x00000C0C,  // ....**......**.
+     0x00000C1C,  // ....**.....***.
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 235
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F83E,  // *****.....*****
+     0x0000F83E,  // *****.....*****
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00007F0C,  // .*******....**.
+     0x00007F8C,  // .********...**.
+     0x000061CC,  // .**....***..**.
+     0x000060CC,  // .**.....**..**.
+     0x000061CC,  // .**....***..**.
+     0x0000FFBE,  // *********.*****
+     0x0000FF3E,  // ********..*****
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 236
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E00,  // .******........
+     0x00007E00,  // .******........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001FE0,  // ...********....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00007FF0,  // .***********...
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 237
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000037E0,  // ..**.******....
+     0x00003FF8,  // ..***********..
+     0x00003C38,  // ..****....***..
+     0x0000381C,  // ..***......***.
+     0x000031FC,  // ..**...*******.
+     0x000001FC,  // .......*******.
+     0x0000000C,  // ............**.
+     0x0000001C,  // ...........***.
+     0x00007038,  // .***......***..
+     0x00007FF8,  // .************..
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 238
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F1F0,  // ****...*****...
+     0x0000F3F8,  // ****..*******..
+     0x0000671C,  // .**..***...***.
+     0x0000660C,  // .**..**.....**.
+     0x00007E0C,  // .******.....**.
+     0x00007E0C,  // .******.....**.
+     0x0000660C,  // .**..**.....**.
+     0x0000660C,  // .**..**.....**.
+     0x0000671C,  // .**..***...***.
+     0x0000F3F8,  // ****..*******..
+     0x0000F1F0,  // ****...*****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x00007060,  // .***.....**....
+     0x00003FE0,  // ..*********....
+     0x00001FE0,  // ...********....
+     0x00001C60,  // ...***...**....
+     0x00003860,  // ..***....**....
+     0x0000F1F8,  // ****...******..
+     0x0000F1F8,  // ****...******..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 240
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001E1E0,  // ****....****....
+     0x0001E1E0,  // ****....****....
+     0x0000F0DC,  // .****....**.***.
+     0x0000F0FE,  // .****....*******
+     0x0000D8F6,  // .**.**...****.**
+     0x0000D8FE,  // .**.**...*******
+     0x0000CCDC,  // .**..**..**.***.
+     0x0000CCC0,  // .**..**..**.....
+     0x0000C6FE,  // .**...**.*******
+     0x0000C6FE,  // .**...**.*******
+     0x0000C3C0,  // .**....****.....
+     0x0000C3C0,  // .**....****.....
+     0x0000C1C0,  // .**.....***.....
+     0x0001E1C0,  // ****....***.....
+     0x0001E0C0,  // ****.....**.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 241
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 242
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 243
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 244
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00007F18,  // .*******...**..
+     0x00007F00,  // .*******.......
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x0000381C,  // ..***......***.
+     0x00003FFC,  // ..************.
+     0x00000FF0,  // ....********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 245
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 246
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 247
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 248
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // ..********.....
+     0x00003FC0,  // ..********.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00003F80,  // ..*******......
+     0x00003F00,  // ..******.......
+  },
+  {             // 249
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 250
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 251
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 252
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 253
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007F0,  // .....*******...
+     0x00000FF0,  // ....********...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001C00,  // ...***.........
+     0x00003F00,  // ..******.......
+     0x000067C0,  // .**..*****.....
+     0x000061F0,  // .**....*****...
+     0x00007878,  // .****....****..
+     0x00003E18,  // ..*****....**..
+     0x00000F98,  // ....*****..**..
+     0x000003F8,  // ......*******..
+     0x000000F0,  // ........****...
+     0x00000060,  // .........**....
+     0x00003060,  // ..**.....**....
+     0x000030E0,  // ..**....***....
+     0x00003FC0,  // ..********.....
+     0x00003F80,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 254
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 255
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  };
+  
\ No newline at end of file
diff --git a/fontosd-iso8859-5.c b/fontosd-iso8859-5.c
new file mode 100644
index 000000000..3e8e99988
--- /dev/null
+++ b/fontosd-iso8859-5.c
@@ -0,0 +1,5602 @@
+cFont::tPixelData FontOsd_iso8859_5[][24] = {
+  {             // 32
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 33
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 35
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000DC,  // .....**.***.
+     0x000001D8,  // ....***.**..
+     0x00000198,  // ....**..**..
+     0x00000198,  // ....**..**..
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00001FFC,  // ***********.
+     0x00001FFC,  // ***********.
+     0x00000660,  // ..**..**....
+     0x00000660,  // ..**..**....
+     0x00000EC0,  // .***.**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 36
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000003F8,  // ...*******..
+     0x000007E8,  // ..******.*..
+     0x000006C0,  // ..**.**.....
+     0x000006C0,  // ..**.**.....
+     0x000006C0,  // ..**.**.....
+     0x000003C0,  // ...****.....
+     0x000001C0,  // ....***.....
+     0x000000E0,  // .....***....
+     0x000000F0,  // .....****...
+     0x000000D8,  // .....**.**..
+     0x000000D8,  // .....**.**..
+     0x000000D8,  // .....**.**..
+     0x000007F8,  // ..********..
+     0x000003F0,  // ...******...
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 37
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001E0E,  // .****.....***
+     0x00003F0C,  // ******....**.
+     0x00003318,  // **..**...**..
+     0x00003338,  // **..**..***..
+     0x00003F70,  // ******.***...
+     0x00001EE0,  // .****.***....
+     0x000000FC,  // ......******.
+     0x000001BC,  // .....**.****.
+     0x000003E6,  // ....*****..**
+     0x00000766,  // ...***.**..**
+     0x00000E66,  // ..***..**..**
+     0x00000C66,  // ..**...**..**
+     0x0000183C,  // .**.....****.
+     0x0000383C,  // ***.....****.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 38
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003C0,  // ....****.....
+     0x000007E0,  // ...******....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x000006E0,  // ...**.***....
+     0x000007C0,  // ...*****.....
+     0x00000F00,  // ..****.......
+     0x00001D8C,  // .***.**...**.
+     0x000019CC,  // .**..***..**.
+     0x000018EC,  // .**...***.**.
+     0x00001878,  // .**....****..
+     0x00001C70,  // .***...***...
+     0x00000FF0,  // ..********...
+     0x0000079C,  // ...****..***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 39
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 40
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000002,  // .....*
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000010,  // ..*...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+     0x00000002,  // .....*
+  },
+  {             // 41
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000040,  // *.....
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000010,  // ..*...
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000060,  // **....
+     0x00000040,  // *.....
+  },
+  {             // 42
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000020,  // ....*....
+     0x000001AC,  // .**.*.**.
+     0x000000D8,  // ..**.**..
+     0x00000050,  // ...*.*...
+     0x00000050,  // ...*.*...
+     0x00000088,  // ..*...*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00001FFE,  // ************
+     0x00001FFE,  // ************
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 44
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // ..***.
+     0x0000001C,  // ..***.
+     0x0000001C,  // ..***.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+  },
+  {             // 45
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 46
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000006,  // .......**
+     0x00000006,  // .......**
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000018,  // .....**..
+     0x00000038,  // ....***..
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x000000E0,  // ..***....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000300,  // **.......
+     0x00000300,  // **.......
+  },
+  {             // 48
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x000003F0,  // ...******...
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000738,  // ..***..***..
+     0x000003F0,  // ...******...
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 49
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003C0,  // ...****.....
+     0x000003C0,  // ...****.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 50
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F0,  // ..*******...
+     0x00000438,  // ..*....***..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000070,  // ......***...
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 51
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F0,  // ..*******...
+     0x00000438,  // ..*....***..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x000003C0,  // ...****.....
+     0x000003F0,  // ...******...
+     0x00000038,  // .......***..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000438,  // ..*....***..
+     0x000007F0,  // ..*******...
+     0x000007E0,  // ..******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 52
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000070,  // ......***...
+     0x00000070,  // ......***...
+     0x000000F0,  // .....****...
+     0x000001F0,  // ....*****...
+     0x000003B0,  // ...***.**...
+     0x00000330,  // ...**..**...
+     0x00000630,  // ..**...**...
+     0x00000E30,  // .***...**...
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 53
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x000003F8,  // ...*******..
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x000003E0,  // ...*****....
+     0x000003F0,  // ...******...
+     0x00000038,  // .......***..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000238,  // ...*...***..
+     0x000003F0,  // ...******...
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 54
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F0,  // ...******...
+     0x00000710,  // ..***...*...
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000DE0,  // .**.****....
+     0x00000FF0,  // .********...
+     0x00000E38,  // .***...***..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000418,  // ..*.....**..
+     0x00000630,  // ..**...**...
+     0x000003F0,  // ...******...
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 55
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x0000001C,  // ........***.
+     0x00000018,  // ........**..
+     0x00000038,  // .......***..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000300,  // ...**.......
+     0x00000300,  // ...**.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 56
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000F0,  // .....****...
+     0x000001FC,  // ....*******.
+     0x0000039C,  // ...***..***.
+     0x0000030C,  // ...**....**.
+     0x0000030C,  // ...**....**.
+     0x00000190,  // ....**..*...
+     0x000001E0,  // ....****....
+     0x000003F8,  // ...*******..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 57
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x000003F8,  // ...*******..
+     0x00000718,  // ..***...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003EC,  // ...*****.**.
+     0x000001EC,  // ....****.**.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000238,  // ...*...***..
+     0x000003F0,  // ...******...
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 58
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+  },
+  {             // 60
+     12, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000002,  // .............*
+     0x0000000E,  // ...........***
+     0x0000003C,  // .........****.
+     0x000000F0,  // .......****...
+     0x000003C0,  // .....****.....
+     0x00001F80,  // ..******......
+     0x00000F80,  // ...*****......
+     0x000003C0,  // .....****.....
+     0x000000F0,  // .......****...
+     0x0000003C,  // .........****.
+     0x0000000E,  // ...........***
+     0x00000002,  // .............*
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 61
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 62
+     12, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001000,  // .*...........
+     0x00001C00,  // .***.........
+     0x00000F00,  // ..****.......
+     0x000003C0,  // ....****.....
+     0x000000F0,  // ......****...
+     0x0000007C,  // .......*****.
+     0x0000007E,  // .......******
+     0x000000F0,  // ......****...
+     0x000003C0,  // ....****.....
+     0x00000F00,  // ..****.......
+     0x00001C00,  // .***.........
+     0x00001000,  // .*...........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     8, 22,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000F0,  // .****...
+     0x000001F8,  // ******..
+     0x0000011C,  // *...***.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000038,  // ...***..
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 64
+     16, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000003E0,  // ........*****....
+     0x00000FF8,  // ......*********..
+     0x00001C1C,  // .....***.....***.
+     0x000031EE,  // ....**...****.***
+     0x000063C6,  // ...**...****...**
+     0x00006646,  // ...**..**..*...**
+     0x0000CC86,  // ..**..**..*....**
+     0x0000CD86,  // ..**..**.**....**
+     0x0000CDEC,  // ..**..**.****.**.
+     0x0000CE7C,  // ..**..***..*****.
+     0x0000EC78,  // ..***.**...****..
+     0x00007040,  // ...***.....*.....
+     0x00003FC0,  // ....********.....
+     0x00000F80,  // ......*****......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 65
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x000003E0,  // ....*****....
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000380C,  // ***.......**.
+     0x00003006,  // **.........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 66
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x000003E0,  // ..*****....
+     0x000003F0,  // ..******...
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003F8,  // ..*******..
+     0x000003F0,  // ..******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 67
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F8,  // .....******..
+     0x000007FC,  // ...*********.
+     0x00000E04,  // ..***......*.
+     0x00000C00,  // ..**.........
+     0x00001C00,  // .***.........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C00,  // ..**.........
+     0x00000E04,  // ..***......*.
+     0x000007FC,  // ...*********.
+     0x000001F8,  // .....******..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 68
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FC0,  // ..*******.....
+     0x00001FF0,  // ..*********...
+     0x00001838,  // ..**.....***..
+     0x00001818,  // ..**......**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00001FF0,  // ..*********...
+     0x00001FC0,  // ..*******.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 69
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FC,  // ..*******.
+     0x000001FC,  // ..*******.
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 70
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FC,  // ..*******.
+     0x000001FC,  // ..*******.
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 71
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003F0,  // .....******...
+     0x00000FF8,  // ...*********..
+     0x00001C08,  // ..***......*..
+     0x00001800,  // ..**..........
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001818,  // ..**......**..
+     0x00001C18,  // ..***.....**..
+     0x00000FF8,  // ...*********..
+     0x000003F0,  // .....******...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 72
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 73
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 74
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x000000F8,  // *****..
+     0x000000F0,  // ****...
+  },
+  {             // 75
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x00000670,  // ..**..***...
+     0x00000660,  // ..**..**....
+     0x000006C0,  // ..**.**.....
+     0x000007C0,  // ..*****.....
+     0x000007C0,  // ..*****.....
+     0x000006E0,  // ..**.***....
+     0x00000660,  // ..**..**....
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x0000061C,  // ..**....***.
+     0x0000060E,  // ..**.....***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 76
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 77
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000701C,  // ..***.......***.
+     0x0000701C,  // ..***.......***.
+     0x0000783C,  // ..****.....****.
+     0x0000783C,  // ..****.....****.
+     0x00007C3C,  // ..*****....****.
+     0x00006C6C,  // ..**.**...**.**.
+     0x00006C6C,  // ..**.**...**.**.
+     0x00006E6C,  // ..**.***..**.**.
+     0x000066CC,  // ..**..**.**..**.
+     0x000066CC,  // ..**..**.**..**.
+     0x000067CC,  // ..**..*****..**.
+     0x0000638C,  // ..**...***...**.
+     0x0000638C,  // ..**...***...**.
+     0x0000600C,  // ..**.........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 78
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001C18,  // ..***.....**..
+     0x00001E18,  // ..****....**..
+     0x00001E18,  // ..****....**..
+     0x00001F18,  // ..*****...**..
+     0x00001B18,  // ..**.**...**..
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x000018D8,  // ..**...**.**..
+     0x000018F8,  // ..**...*****..
+     0x00001878,  // ..**....****..
+     0x00001878,  // ..**....****..
+     0x00001838,  // ..**.....***..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 79
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FC,  // ..*******.
+     0x000001FE,  // ..********
+     0x0000018E,  // ..**...***
+     0x00000186,  // ..**....**
+     0x00000186,  // ..**....**
+     0x00000186,  // ..**....**
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000001F0,  // ..*****...
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 81
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007E0,  // .....******....
+     0x00000078,  // .........****..
+     0x0000003E,  // ..........*****
+     0x0000001C,  // ...........***.
+     0x00000004,  // .............*.
+  },
+  {             // 82
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007E0,  // ..******....
+     0x000007F0,  // ..*******...
+     0x00000638,  // ..**...***..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000610,  // ..**....*...
+     0x00000630,  // ..**...**...
+     0x000007C0,  // ..*****.....
+     0x000007E0,  // ..******....
+     0x00000670,  // ..**..***...
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x0000061C,  // ..**....***.
+     0x0000060E,  // ..**.....***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 83
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001F8,  // ..******..
+     0x00000388,  // .***...*..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000001C0,  // ..***.....
+     0x000000F0,  // ...****...
+     0x00000078,  // ....****..
+     0x0000001C,  // ......***.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000021C,  // .*....***.
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 84
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001FFE,  // ************
+     0x00001FFE,  // ************
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 86
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001806,  // **........**
+     0x00001C06,  // ***.......**
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000338,  // ...**..***..
+     0x00000330,  // ...**..**...
+     0x000003B0,  // ...***.**...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 87
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00018306,  // **.....**.....**
+     0x00018306,  // **.....**.....**
+     0x0000C78E,  // .**...****...***
+     0x0000C78C,  // .**...****...**.
+     0x0000C78C,  // .**...****...**.
+     0x0000C78C,  // .**...****...**.
+     0x00006DD8,  // ..**.**.***.**..
+     0x00006CD8,  // ..**.**..**.**..
+     0x00006CD8,  // ..**.**..**.**..
+     0x00006CD8,  // ..**.**..**.**..
+     0x00003CF0,  // ...****..****...
+     0x00003870,  // ...***....***...
+     0x00003870,  // ...***....***...
+     0x00003870,  // ...***....***...
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 88
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C1C,  // ***.....***.
+     0x00000C18,  // .**.....**..
+     0x00000638,  // ..**...***..
+     0x00000730,  // ..***..**...
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000003E0,  // ...*****....
+     0x00000360,  // ...**.**....
+     0x00000630,  // ..**...**...
+     0x00000E38,  // .***...***..
+     0x00000C18,  // .**.....**..
+     0x0000181C,  // **......***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 89
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C06,  // ***.......**
+     0x00000C0C,  // .**......**.
+     0x00000E1C,  // .***....***.
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x000003F0,  // ...******...
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 90
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x0000000C,  // ........**.
+     0x0000001C,  // .......***.
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000070,  // .....***...
+     0x000000E0,  // ....***....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000380,  // ..***......
+     0x00000700,  // .***.......
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 91
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+  },
+  {             // 92
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000300,  // **.......
+     0x00000300,  // **.......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000E0,  // ..***....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000038,  // ....***..
+     0x00000018,  // .....**..
+     0x00000018,  // .....**..
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x00000006,  // .......**
+     0x00000006,  // .......**
+  },
+  {             // 93
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+  },
+  {             // 94
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000001B0,  // ....**.**...
+     0x000001B0,  // ....**.**...
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000E0E,  // .***.....***
+     0x00000C06,  // .**.......**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 95
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 96
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000300,  // ...**.......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 97
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000010C,  // ..*....**.
+     0x0000000C,  // .......**.
+     0x000000FC,  // ...******.
+     0x000001FC,  // ..*******.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FE,  // .*********
+     0x000001CE,  // ..***..***
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 98
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x000006F0,  // ..**.****...
+     0x000007F8,  // ..********..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000718,  // ..***...**..
+     0x000007F8,  // ..********..
+     0x000006F0,  // ..**.****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 99
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ....*****.
+     0x000001FC,  // ..*******.
+     0x00000180,  // ..**......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000184,  // ..**....*.
+     0x000001FC,  // ..*******.
+     0x00000078,  // ....****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x000003D8,  // ...****.**..
+     0x000007F8,  // ..********..
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000E38,  // .***...***..
+     0x000007F8,  // ..********..
+     0x000003D8,  // ...****.**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 101
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001E0,  // ...****....
+     0x000003F0,  // ..******...
+     0x00000318,  // ..**...**..
+     0x00000618,  // .**....**..
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000708,  // .***....*..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 102
+     7, 22,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001E,  // ....****
+     0x0000003E,  // ...*****
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 103
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003D8,  // ...****.**..
+     0x000007F8,  // ..********..
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000E38,  // .***...***..
+     0x000007D8,  // ..*****.**..
+     0x00000398,  // ...***..**..
+     0x00000018,  // ........**..
+     0x00000430,  // ..*....**...
+     0x000007F0,  // ..*******...
+     0x000007E0,  // ..******....
+  },
+  {             // 104
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000670,  // ..**..***...
+     0x000006F8,  // ..**.*****..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 105
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 106
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000008C,  // *...**.
+     0x000000F8,  // *****..
+     0x000000F0,  // ****...
+  },
+  {             // 107
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x0000031C,  // ..**...***.
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x00000360,  // ..**.**....
+     0x000003E0,  // ..*****....
+     0x000003E0,  // ..*****....
+     0x00000370,  // ..**.***...
+     0x00000338,  // ..**..***..
+     0x0000031C,  // ..**...***.
+     0x0000030E,  // ..**....***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 108
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 109
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00019C70,  // ..**..***...***...
+     0x0001BEF8,  // ..**.*****.*****..
+     0x0001C718,  // ..***...***...**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 110
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000670,  // ..**..***...
+     0x000006F8,  // ..**.*****..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 111
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 112
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000006F0,  // ..**.****...
+     0x000007F8,  // ..********..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000718,  // ..***...**..
+     0x000007F8,  // ..********..
+     0x000006F0,  // ..**.****...
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+  },
+  {             // 113
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003D8,  // ...****.**..
+     0x000007F8,  // ..********..
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000E38,  // .***...***..
+     0x000007F8,  // ..********..
+     0x000003D8,  // ...****.**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+  },
+  {             // 114
+     8, 22,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000066,  // ..**..**
+     0x0000006E,  // ..**.***
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 115
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F0,  // .******...
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001E0,  // ..****....
+     0x000000F8,  // ...*****..
+     0x00000018,  // ......**..
+     0x00000218,  // .*....**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 116
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000007E,  // .******
+     0x0000007E,  // .******
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003E,  // ..*****
+     0x0000001E,  // ...****
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 117
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x000007D8,  // ..*****.**..
+     0x00000398,  // ...***..**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 118
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000070E,  // ***....***
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000001F0,  // ..*****...
+     0x000000F0,  // ...****...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000C30C,  // **....**....**.
+     0x0000C78C,  // **...****...**.
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006CF0,  // .**.**..****...
+     0x00003CF0,  // ..****..****...
+     0x00003CF0,  // ..****..****...
+     0x000038F0,  // ..***...****...
+     0x00003860,  // ..***....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E1C,  // .***....***.
+     0x00000718,  // ..***...**..
+     0x00000330,  // ...**..**...
+     0x000001F0,  // ....*****...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000003E0,  // ...*****....
+     0x00000330,  // ...**..**...
+     0x00000638,  // ..**...***..
+     0x00000E1C,  // .***....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000030E,  // .**....***
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000000F8,  // ...*****..
+     0x000000F0,  // ...****...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000000C0,  // ...**.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 122
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000300,  // ..**.......
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 123
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000001C,  // ..***.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000070,  // ***...
+     0x00000078,  // ****..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001C,  // ..***.
+     0x0000000C,  // ...**.
+  },
+  {             // 124
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+  },
+  {             // 125
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // .**...
+     0x00000038,  // .***..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000000E,  // ...***
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000038,  // .***..
+     0x00000030,  // .**...
+  },
+  {             // 126
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000786,  // ..****....**
+     0x000007C6,  // ..*****...**
+     0x00000CE6,  // .**..***..**
+     0x00000C7C,  // .**...*****.
+     0x00000C1C,  // .**.....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 127
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 161
+     10, 22,
+     0x00000000,  // ..........
+     0x000000CC,  // ...**..**.
+     0x000000CC,  // ...**..**.
+     0x00000000,  // ..........
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FC,  // ..*******.
+     0x000001FC,  // ..*******.
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 162
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001FFE0,  // ************....
+     0x0001FFE0,  // ************....
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000DF0,  // .....**.*****...
+     0x00000FF8,  // .....*********..
+     0x00000E1C,  // .....***....***.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000C1C,  // .....**.....***.
+     0x00000C78,  // .....**...****..
+     0x00000C70,  // .....**...***...
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 163
+     10, 22,
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F8,  // .....******..
+     0x000007FC,  // ...*********.
+     0x00000E04,  // ..***......*.
+     0x00000C00,  // ..**.........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001FE0,  // .********....
+     0x00001FE0,  // .********....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C00,  // ..**.........
+     0x00000E04,  // ..***......*.
+     0x000007FC,  // ...*********.
+     0x000001F8,  // .....******..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 165
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001F8,  // ..******..
+     0x00000388,  // .***...*..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000001C0,  // ..***.....
+     0x000000F0,  // ...****...
+     0x00000078,  // ....****..
+     0x0000001C,  // ......***.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000021C,  // .*....***.
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 166
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 167
+     5, 22,
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 168
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x000000F8,  // *****..
+     0x000000F0,  // ****...
+  },
+  {             // 169
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0000FF00,  // ...********.......
+     0x0000FF00,  // ...********.......
+     0x0000C300,  // ...**....**.......
+     0x0000C300,  // ...**....**.......
+     0x0000C300,  // ...**....**.......
+     0x0000C300,  // ...**....**.......
+     0x0000C3F0,  // ...**....******...
+     0x0000C3F8,  // ...**....*******..
+     0x0000C31C,  // ...**....**...***.
+     0x0000C30C,  // ...**....**....**.
+     0x0000C30C,  // ...**....**....**.
+     0x0001831C,  // ..**.....**...***.
+     0x000383FC,  // .***.....********.
+     0x000303F8,  // .**......*******..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 170
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018300,  // ..**.....**.......
+     0x00018300,  // ..**.....**.......
+     0x00018300,  // ..**.....**.......
+     0x00018300,  // ..**.....**.......
+     0x00018300,  // ..**.....**.......
+     0x00018300,  // ..**.....**.......
+     0x0001FFF0,  // ..*************...
+     0x0001FFF8,  // ..**************..
+     0x0001831C,  // ..**.....**...***.
+     0x0001830C,  // ..**.....**....**.
+     0x0001830C,  // ..**.....**....**.
+     0x0001831C,  // ..**.....**...***.
+     0x000183FC,  // ..**.....********.
+     0x000183F8,  // ..**.....*******..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 171
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001FFE0,  // ************....
+     0x0001FFE0,  // ************....
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000DF0,  // .....**.*****...
+     0x00000FF8,  // .....*********..
+     0x00000E1C,  // .....***....***.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000C0C,  // .....**......**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 172
+     12, 22,
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x00000670,  // ..**..***...
+     0x00000660,  // ..**..**....
+     0x000006C0,  // ..**.**.....
+     0x000007C0,  // ..*****.....
+     0x000007C0,  // ..*****.....
+     0x000006E0,  // ..**.***....
+     0x00000660,  // ..**..**....
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x0000061C,  // ..**....***.
+     0x0000060E,  // ..**.....***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 173
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 174
+     12, 22,
+     0x00000210,  // ...*....*...
+     0x000003F0,  // ...******...
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00001C0E,  // ***......***
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x00000618,  // ..**....**..
+     0x00000318,  // ...**...**..
+     0x00000330,  // ...**..**...
+     0x000001B0,  // ....**.**...
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000780,  // ..****......
+     0x00000700,  // ..***.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 175
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+  },
+  {             // 176
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x000003E0,  // ....*****....
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000380C,  // ***.......**.
+     0x00003006,  // **.........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 177
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x000003FC,  // ..********.
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 178
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000318,  // ..**...**..
+     0x000003E0,  // ..*****....
+     0x000003F0,  // ..******...
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003F8,  // ..*******..
+     0x000003F0,  // ..******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 179
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 180
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FF8,  // ...*********..
+     0x00000FF8,  // ...*********..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00000000,  // ..............
+  },
+  {             // 181
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FC,  // ..*******.
+     0x000001FC,  // ..*******.
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001FE,  // ..********
+     0x000001FE,  // ..********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 182
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0003060C,  // .**.....**.....**.
+     0x00018618,  // ..**....**....**..
+     0x0001C638,  // ..***...**...***..
+     0x0000E670,  // ...***..**..***...
+     0x00006660,  // ....**..**..**....
+     0x000036C0,  // .....**.**.**.....
+     0x00003FC0,  // .....********.....
+     0x00003FC0,  // .....********.....
+     0x000076E0,  // ....***.**.***....
+     0x00006660,  // ....**..**..**....
+     0x0000C630,  // ...**...**...**...
+     0x00018618,  // ..**....**....**..
+     0x0003861C,  // .***....**....***.
+     0x0007060E,  // ***.....**.....***
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 183
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F8,  // .*******..
+     0x0000020C,  // .*.....**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000018,  // ......**..
+     0x000000E0,  // ...***....
+     0x000000F0,  // ...****...
+     0x0000001C,  // ......***.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000020C,  // .*.....**.
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 184
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00001878,  // ..**....****..
+     0x00001878,  // ..**....****..
+     0x000018F8,  // ..**...*****..
+     0x000018D8,  // ..**...**.**..
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001B18,  // ..**.**...**..
+     0x00001F18,  // ..*****...**..
+     0x00001E18,  // ..****....**..
+     0x00001E18,  // ..****....**..
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 185
+     14, 22,
+     0x00000420,  // ....*....*....
+     0x000007E0,  // ....******....
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00001878,  // ..**....****..
+     0x00001878,  // ..**....****..
+     0x000018F8,  // ..**...*****..
+     0x000018D8,  // ..**...**.**..
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001B18,  // ..**.**...**..
+     0x00001F18,  // ..*****...**..
+     0x00001E18,  // ..****....**..
+     0x00001E18,  // ..****....**..
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 186
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000060C,  // ..**.....**.
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x00000670,  // ..**..***...
+     0x00000660,  // ..**..**....
+     0x000006C0,  // ..**.**.....
+     0x000007C0,  // ..*****.....
+     0x000007C0,  // ..*****.....
+     0x000006E0,  // ..**.***....
+     0x00000660,  // ..**..**....
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x0000061C,  // ..**....***.
+     0x0000060E,  // ..**.....***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 187
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FF8,  // ...*********..
+     0x00000FF8,  // ...*********..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00001818,  // ..**......**..
+     0x00003818,  // .***......**..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 188
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000701C,  // ..***.......***.
+     0x0000701C,  // ..***.......***.
+     0x0000783C,  // ..****.....****.
+     0x0000783C,  // ..****.....****.
+     0x00007C3C,  // ..*****....****.
+     0x00006C6C,  // ..**.**...**.**.
+     0x00006C6C,  // ..**.**...**.**.
+     0x00006E6C,  // ..**.***..**.**.
+     0x000066CC,  // ..**..**.**..**.
+     0x000066CC,  // ..**..**.**..**.
+     0x000067CC,  // ..**..*****..**.
+     0x0000638C,  // ..**...***...**.
+     0x0000638C,  // ..**...***...**.
+     0x0000600C,  // ..**.........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 189
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 190
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 192
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FC,  // ..*******.
+     0x000001FE,  // ..********
+     0x0000018E,  // ..**...***
+     0x00000186,  // ..**....**
+     0x00000186,  // ..**....**
+     0x00000186,  // ..**....**
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000001F0,  // ..*****...
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 193
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F8,  // .....******..
+     0x000007FC,  // ...*********.
+     0x00000E04,  // ..***......*.
+     0x00000C00,  // ..**.........
+     0x00001C00,  // .***.........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C00,  // ..**.........
+     0x00000E04,  // ..***......*.
+     0x000007FC,  // ...*********.
+     0x000001F8,  // .....******..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 194
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001FFE,  // ************
+     0x00001FFE,  // ************
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 195
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0E,  // ***......***
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x00000618,  // ..**....**..
+     0x00000318,  // ...**...**..
+     0x00000330,  // ...**..**...
+     0x000001B0,  // ....**.**...
+     0x000001E0,  // ....****....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000780,  // ..****......
+     0x00000700,  // ..***.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 196
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00001FE0,  // ....********....
+     0x00007FF8,  // ..************..
+     0x00006318,  // ..**...**...**..
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00006318,  // ..**...**...**..
+     0x00007FF8,  // ..************..
+     0x00001FE0,  // ....********....
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 197
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C1C,  // ***.....***.
+     0x00000C18,  // .**.....**..
+     0x00000638,  // ..**...***..
+     0x00000730,  // ..***..**...
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000003E0,  // ...*****....
+     0x00000360,  // ...**.**....
+     0x00000630,  // ..**...**...
+     0x00000E38,  // .***...***..
+     0x00000C18,  // .**.....**..
+     0x0000181C,  // **......***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 198
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x00000000,  // ..............
+  },
+  {             // 199
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001C38,  // .***....***..
+     0x00000FF8,  // ..*********..
+     0x000007D8,  // ...*****.**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 200
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x0001FFF8,  // ..**************..
+     0x0001FFF8,  // ..**************..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 201
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x0001FFFC,  // ..***************.
+     0x0001FFFC,  // ..***************.
+     0x0000000C,  // ...............**.
+     0x0000000C,  // ...............**.
+     0x0000000C,  // ...............**.
+     0x00000000,  // ..................
+  },
+  {             // 202
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000F00,  // ****.......
+     0x00000F00,  // ****.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 203
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00007E18,  // ..******....**..
+     0x00007F18,  // ..*******...**..
+     0x00006398,  // ..**...***..**..
+     0x00006198,  // ..**....**..**..
+     0x00006198,  // ..**....**..**..
+     0x00006398,  // ..**...***..**..
+     0x00007F98,  // ..********..**..
+     0x00007F18,  // ..*******...**..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 204
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000031C,  // ..**...***.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 205
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FC0,  // ..******.....
+     0x00001FF0,  // .*********...
+     0x00001038,  // .*......***..
+     0x00000018,  // .........**..
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x000003FC,  // ....********.
+     0x000003FC,  // ....********.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00001038,  // .*......***..
+     0x00001FF0,  // .*********...
+     0x00000FC0,  // ..******.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 206
+     19, 22,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x000303C0,  // ..**......****.....
+     0x00030FF0,  // ..**....********...
+     0x00031C38,  // ..**...***....***..
+     0x00031818,  // ..**...**......**..
+     0x0003381C,  // ..**..***......***.
+     0x0003300C,  // ..**..**........**.
+     0x0003F00C,  // ..******........**.
+     0x0003F00C,  // ..******........**.
+     0x0003300C,  // ..**..**........**.
+     0x0003381C,  // ..**..***......***.
+     0x00031818,  // ..**...**......**..
+     0x00031C38,  // ..**...***....***..
+     0x00030FF0,  // ..**....********...
+     0x000303C0,  // ..**......****.....
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 207
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ....******..
+     0x000003F8,  // ...*******..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000218,  // ...*....**..
+     0x00000318,  // ...**...**..
+     0x000000F8,  // .....*****..
+     0x000001F8,  // ....******..
+     0x00000398,  // ...***..**..
+     0x00000318,  // ...**...**..
+     0x00000618,  // ..**....**..
+     0x00000E18,  // .***....**..
+     0x00001C18,  // ***.....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 208
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000010C,  // ..*....**.
+     0x0000000C,  // .......**.
+     0x000000FC,  // ...******.
+     0x000001FC,  // ..*******.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FE,  // .*********
+     0x000001CE,  // ..***..***
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 209
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ....******..
+     0x000007F8,  // ..********..
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000DE0,  // .**.****....
+     0x00000FF8,  // .*********..
+     0x00000E18,  // .***....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 210
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000030C,  // ..**....**.
+     0x0000031C,  // ..**...***.
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 211
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000FE,  // ..*******
+     0x000000FE,  // ..*******
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 212
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x000003F8,  // ...*******..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 213
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001E0,  // ...****....
+     0x000003F0,  // ..******...
+     0x00000318,  // ..**...**..
+     0x00000618,  // .**....**..
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000708,  // .***....*..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 214
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000E31C,  // .***...**...***.
+     0x00006318,  // ..**...**...**..
+     0x00003330,  // ...**..**..**...
+     0x00001B60,  // ....**.**.**....
+     0x00001FE0,  // ....********....
+     0x00001FE0,  // ....********....
+     0x00003B70,  // ...***.**.***...
+     0x00007338,  // ..***..**..***..
+     0x0000E31C,  // .***...**...***.
+     0x0001C30E,  // ***....**....***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 215
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F8,  // .*******..
+     0x0000020C,  // .*.....**.
+     0x0000001C,  // ......***.
+     0x000000F0,  // ...****...
+     0x000000F8,  // ...*****..
+     0x0000000C,  // .......**.
+     0x0000020C,  // .*.....**.
+     0x000003FC,  // .********.
+     0x000001F8,  // ..******..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 216
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x00000678,  // ..**..****..
+     0x00000678,  // ..**..****..
+     0x000006D8,  // ..**.**.**..
+     0x000006D8,  // ..**.**.**..
+     0x00000798,  // ..****..**..
+     0x00000798,  // ..****..**..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 217
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000210,  // ...*....*...
+     0x000003F0,  // ...******...
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x00000678,  // ..**..****..
+     0x00000678,  // ..**..****..
+     0x000006D8,  // ..**.**.**..
+     0x000006D8,  // ..**.**.**..
+     0x00000798,  // ..****..**..
+     0x00000798,  // ..****..**..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 218
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000031C,  // ..**...***.
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x00000360,  // ..**.**....
+     0x000003E0,  // ..*****....
+     0x000003E0,  // ..*****....
+     0x00000370,  // ..**.***...
+     0x00000338,  // ..**..***..
+     0x0000031C,  // ..**...***.
+     0x0000030E,  // ..**....***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 219
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x000003F8,  // ...*******..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000318,  // ...**...**..
+     0x00000F18,  // .****...**..
+     0x00000E18,  // .***....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 220
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001C18,  // ..***.....**..
+     0x00001C38,  // ..***....***..
+     0x00001E38,  // ..****...***..
+     0x00001E78,  // ..****..****..
+     0x00001E78,  // ..****..****..
+     0x00001BD8,  // ..**.****.**..
+     0x00001BD8,  // ..**.****.**..
+     0x00001998,  // ..**..**..**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 221
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 222
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 223
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 224
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000006F0,  // ..**.****...
+     0x000007F8,  // ..********..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000718,  // ..***...**..
+     0x000007F8,  // ..********..
+     0x000006F0,  // ..**.****...
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+  },
+  {             // 225
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ....****..
+     0x000001FC,  // ..*******.
+     0x00000184,  // ..**....*.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000184,  // ..**....*.
+     0x000001FC,  // ..*******.
+     0x00000078,  // ....****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 226
+     8, 22,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000001FE,  // ********
+     0x000001FE,  // ********
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 227
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000030E,  // .**....***
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000000F8,  // ...*****..
+     0x000000F0,  // ...****...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000000C0,  // ...**.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 228
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00003B70,  // ...***.**.***...
+     0x00007FF8,  // ..************..
+     0x00006798,  // ..**..****..**..
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00006798,  // ..**..****..**..
+     0x00007FF8,  // ..************..
+     0x00003B70,  // ...***.**.***...
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+  },
+  {             // 229
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E1C,  // .***....***.
+     0x00000718,  // ..***...**..
+     0x00000330,  // ...**..**...
+     0x000001F0,  // ....*****...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000003E0,  // ...*****....
+     0x00000330,  // ...**..**...
+     0x00000638,  // ..**...***..
+     0x00000E1C,  // .***....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 230
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 231
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x000007F8,  // ..********..
+     0x00000398,  // ...***..**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 232
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x0001FFF8,  // ..**************..
+     0x0001FFF8,  // ..**************..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 233
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x00018618,  // ..**....**....**..
+     0x0001FFFC,  // ..***************.
+     0x0001FFFC,  // ..***************.
+     0x0000000C,  // ...............**.
+     0x0000000C,  // ...............**.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 234
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000F00,  // ****.......
+     0x00000F00,  // ****.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 235
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00007E18,  // ..******....**..
+     0x00007F18,  // ..*******...**..
+     0x00006198,  // ..**....**..**..
+     0x00006198,  // ..**....**..**..
+     0x00007F98,  // ..********..**..
+     0x00007F18,  // ..*******...**..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 236
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x000003F0,  // ..******...
+     0x000003F8,  // ..*******..
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x000003FC,  // ..********.
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 237
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001E0,  // ..****....
+     0x000003F8,  // .*******..
+     0x00000218,  // .*....**..
+     0x0000000C,  // .......**.
+     0x0000007C,  // ....*****.
+     0x0000007C,  // ....*****.
+     0x0000000C,  // .......**.
+     0x00000218,  // .*....**..
+     0x000003F8,  // .*******..
+     0x000001E0,  // ..****....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 238
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x000060E0,  // ..**.....***....
+     0x000063F8,  // ..**...*******..
+     0x00006318,  // ..**...**...**..
+     0x0000660C,  // ..**..**.....**.
+     0x00007E0C,  // ..******.....**.
+     0x00007E0C,  // ..******.....**.
+     0x0000660C,  // ..**..**.....**.
+     0x00006318,  // ..**...**...**..
+     0x000063F8,  // ..**...*******..
+     0x000060E0,  // ..**.....***....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 239
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x000007F8,  // ..********..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000003F8,  // ...*******..
+     0x000000F8,  // .....*****..
+     0x00000198,  // ....**..**..
+     0x00000318,  // ...**...**..
+     0x00000618,  // ..**....**..
+     0x00000E18,  // .***....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 240
+     19, 22,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00030300,  // ..**......**.......
+     0x00038300,  // ..***.....**.......
+     0x0003C300,  // ..****....**.......
+     0x0003C338,  // ..****....**..***..
+     0x0003E37C,  // ..*****...**.*****.
+     0x0003636C,  // ..**.**...**.**.**.
+     0x0003336C,  // ..**..**..**.**.**.
+     0x0003337C,  // ..**..**..**.*****.
+     0x00031B38,  // ..**...**.**..***..
+     0x00031F00,  // ..**...*****.......
+     0x00030F7C,  // ..**....****.*****.
+     0x00030F7C,  // ..**....****.*****.
+     0x00030700,  // ..**.....***.......
+     0x00030300,  // ..**......**.......
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 241
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000330,  // ..**..**...
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x000001E0,  // ...****....
+     0x000003F0,  // ..******...
+     0x00000318,  // ..**...**..
+     0x00000618,  // .**....**..
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000708,  // .***....*..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 242
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000FE0,  // .*******....
+     0x00000FE0,  // .*******....
+     0x00000600,  // ..**........
+     0x00000670,  // ..**..***...
+     0x000006F8,  // ..**.*****..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x000000F0,  // .....****...
+     0x000000E0,  // .....***....
+  },
+  {             // 243
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000000,  // .........
+     0x000000FE,  // ..*******
+     0x000000FE,  // ..*******
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 244
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ....****..
+     0x000001FC,  // ..*******.
+     0x00000184,  // ..**....*.
+     0x00000300,  // .**.......
+     0x000003E0,  // .*****....
+     0x000003E0,  // .*****....
+     0x00000300,  // .**.......
+     0x00000184,  // ..**....*.
+     0x000001FC,  // ..*******.
+     0x00000078,  // ....****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 245
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F0,  // .******...
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001E0,  // ..****....
+     0x000000F8,  // ...*****..
+     0x00000018,  // ......**..
+     0x00000218,  // .*....**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 246
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 247
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 248
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000008C,  // *...**.
+     0x000000F8,  // *****..
+     0x000000F0,  // ****...
+  },
+  {             // 249
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007F00,  // ...*******.......
+     0x00007F00,  // ...*******.......
+     0x00006300,  // ...**...**.......
+     0x00006300,  // ...**...**.......
+     0x000063F0,  // ...**...******...
+     0x000063F8,  // ...**...*******..
+     0x0000630C,  // ...**...**....**.
+     0x0000630C,  // ...**...**....**.
+     0x0001E3FC,  // .****...********.
+     0x0001C3F8,  // .***....*******..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 250
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C300,  // ..**....**.......
+     0x0000C300,  // ..**....**.......
+     0x0000C300,  // ..**....**.......
+     0x0000C300,  // ..**....**.......
+     0x0000FFF0,  // ..************...
+     0x0000FFF8,  // ..*************..
+     0x0000C30C,  // ..**....**....**.
+     0x0000C30C,  // ..**....**....**.
+     0x0000C3FC,  // ..**....********.
+     0x0000C3F8,  // ..**....*******..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 251
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000FE0,  // .*******....
+     0x00000FE0,  // .*******....
+     0x00000600,  // ..**........
+     0x00000670,  // ..**..***...
+     0x000006F8,  // ..**.*****..
+     0x00000718,  // ..***...**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 252
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x0000031C,  // ..**...***.
+     0x00000318,  // ..**...**..
+     0x00000330,  // ..**..**...
+     0x00000360,  // ..**.**....
+     0x000003E0,  // ..*****....
+     0x000003E0,  // ..*****....
+     0x00000370,  // ..**.***...
+     0x00000338,  // ..**..***..
+     0x0000031C,  // ..**...***.
+     0x0000030E,  // ..**....***
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 253
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x00000708,  // ..***....*..
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000380,  // ...***......
+     0x000003E0,  // ...*****....
+     0x00000670,  // ..**..***...
+     0x00000618,  // ..**....**..
+     0x00000718,  // ..***...**..
+     0x00000398,  // ...***..**..
+     0x000001F0,  // ....*****...
+     0x00000070,  // ......***...
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000438,  // ..*....***..
+     0x000007F8,  // ..********..
+     0x000003E0,  // ...*****....
+  },
+  {             // 254
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000108,  // ..*....*..
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000030E,  // .**....***
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000000F8,  // ...*****..
+     0x000000F0,  // ...****...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000000C0,  // ...**.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 255
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  };
diff --git a/fontsml-iso8859-5.c b/fontsml-iso8859-5.c
new file mode 100644
index 000000000..957203459
--- /dev/null
+++ b/fontsml-iso8859-5.c
@@ -0,0 +1,6274 @@
+cFont::tPixelData FontSml_iso8859_5[][27] = {
+  {             // 32
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 33
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     9, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000006C,  // ....**.**.
+     0x0000006C,  // ....**.**.
+     0x000000D8,  // ...**.**..
+     0x000007FE,  // **********
+     0x000007FE,  // **********
+     0x000000D8,  // ...**.**..
+     0x000001B0,  // ..**.**...
+     0x000007FE,  // **********
+     0x000007FE,  // **********
+     0x000001B0,  // ..**.**...
+     0x00000360,  // .**.**....
+     0x00000360,  // .**.**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 36
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x000001AC,  // .**.*.**.
+     0x000001A0,  // .**.*....
+     0x000001E0,  // .****....
+     0x000000F0,  // ..****...
+     0x00000078,  // ...****..
+     0x0000003C,  // ....****.
+     0x000001AC,  // .**.*.**.
+     0x000001AC,  // .**.*.**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000020,  // ....*....
+     0x00000020,  // ....*....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 37
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000F060,  // .****.....**....
+     0x000198C0,  // **..**...**.....
+     0x000198C0,  // **..**...**.....
+     0x00019980,  // **..**..**......
+     0x00019B00,  // **..**.**.......
+     0x0000F300,  // .****..**.......
+     0x00000678,  // ......**..****..
+     0x000006CC,  // ......**.**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x000018CC,  // ....**...**..**.
+     0x00003078,  // ...**.....****..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 38
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F0,  // ..*******...
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x000003E0,  // ...*****....
+     0x000003C0,  // ...****.....
+     0x000006E8,  // ..**.***.*..
+     0x00000CEC,  // .**..***.**.
+     0x00000C78,  // .**...****..
+     0x00000C3C,  // .**....****.
+     0x000007FE,  // ..**********
+     0x000003C4,  // ...****...*.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 39
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 40
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 41
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 42
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000010,  // ...*...
+     0x0000007C,  // .*****.
+     0x00000010,  // ...*...
+     0x00000028,  // ..*.*..
+     0x0000006C,  // .**.**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 43
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 44
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 45
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 46
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 48
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x0000039C,  // ***..***.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000039C,  // ***..***.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 49
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000070,  // ...***...
+     0x000000F0,  // ..****...
+     0x000001B0,  // .**.**...
+     0x00000130,  // .*..**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 50
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x0000038C,  // ***...**.
+     0x0000030C,  // **....**.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000038,  // ....***..
+     0x00000070,  // ...***...
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000003FC,  // ********.
+     0x000003FC,  // ********.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 51
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000038C,  // ***...**.
+     0x0000000C,  // ......**.
+     0x00000078,  // ...****..
+     0x00000078,  // ...****..
+     0x0000001C,  // .....***.
+     0x0000000C,  // ......**.
+     0x0000030C,  // **....**.
+     0x0000039C,  // ***..***.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 52
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000018,  // .....**..
+     0x00000038,  // ....***..
+     0x00000038,  // ....***..
+     0x00000078,  // ...****..
+     0x000000D8,  // ..**.**..
+     0x000000D8,  // ..**.**..
+     0x00000198,  // .**..**..
+     0x00000318,  // **...**..
+     0x000003FC,  // ********.
+     0x000003FC,  // ********.
+     0x00000018,  // .....**..
+     0x00000018,  // .....**..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 53
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001F8,  // .******..
+     0x000001F8,  // .******..
+     0x00000180,  // .**......
+     0x00000300,  // **.......
+     0x000003F0,  // ******...
+     0x000003F8,  // *******..
+     0x0000031C,  // **...***.
+     0x0000000C,  // ......**.
+     0x0000030C,  // **....**.
+     0x0000039C,  // ***..***.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 54
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x00000300,  // **.......
+     0x00000370,  // **.***...
+     0x000003F8,  // *******..
+     0x0000039C,  // ***..***.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 55
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000003FC,  // ********.
+     0x000003FC,  // ********.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 56
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x000001F8,  // .******..
+     0x000001F8,  // .******..
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 57
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x00000318,  // **...**..
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000039C,  // ***..***.
+     0x000001FC,  // .*******.
+     0x000000EC,  // ..***.**.
+     0x0000000C,  // ......**.
+     0x00000318,  // **...**..
+     0x000003F8,  // *******..
+     0x000001F0,  // .*****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 58
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 60
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000008,  // .......*..
+     0x00000038,  // .....***..
+     0x000000F0,  // ...****...
+     0x000003C0,  // .****.....
+     0x00000700,  // ***.......
+     0x000003C0,  // .****.....
+     0x000000F0,  // ...****...
+     0x00000038,  // .....***..
+     0x00000008,  // .......*..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 61
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 62
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000400,  // *.........
+     0x00000700,  // ***.......
+     0x000003C0,  // .****.....
+     0x000000F0,  // ...****...
+     0x00000038,  // .....***..
+     0x000000F0,  // ...****...
+     0x000003C0,  // .****.....
+     0x00000700,  // ***.......
+     0x00000400,  // *.........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 63
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000001C,  // ......***.
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 64
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FF0,  // ....**********...
+     0x00007038,  // ...***......***..
+     0x0000EED8,  // ..***.***.**.**..
+     0x0000DFCC,  // ..**.*******..**.
+     0x0001D9CC,  // .***.**..***..**.
+     0x0001B1CC,  // .**.**...***..**.
+     0x0001B18C,  // .**.**...**...**.
+     0x0001B19C,  // .**.**...**..***.
+     0x0001B3B8,  // .**.**..***.***..
+     0x0001BFF0,  // .**.**********...
+     0x0000DDE0,  // ..**.***.****....
+     0x0000E00E,  // ..***.........***
+     0x0000703C,  // ...***......****.
+     0x00003FF8,  // ....***********..
+     0x00000FE0,  // ......*******....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 65
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000007FC,  // .*********.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000C06,  // **.......**
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 66
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 67
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000E08,  // .***.....*..
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000E08,  // .***.....*..
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 68
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FE0,  // .*******....
+     0x00000FF8,  // .*********..
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C18,  // .**.....**..
+     0x00000FF8,  // .*********..
+     0x00000FE0,  // .*******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 69
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 70
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003F8,  // .*******..
+     0x000003F8,  // .*******..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 71
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003F0,  // ....******...
+     0x00000FF8,  // ..*********..
+     0x00000C1C,  // ..**.....***.
+     0x00001C08,  // .***......*..
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x0000187C,  // .**....*****.
+     0x0000187C,  // .**....*****.
+     0x00001C0C,  // .***......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000FFC,  // ..**********.
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 72
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 73
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 74
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000030C,  // **....**.
+     0x0000031C,  // **...***.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 75
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000CC0,  // .**..**.....
+     0x00000DE0,  // .**.****....
+     0x00000F70,  // .****.***...
+     0x00000E30,  // .***...**...
+     0x00000C38,  // .**....***..
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 76
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 77
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001C1C,  // .***.....***.
+     0x00001C1C,  // .***.....***.
+     0x00001E3C,  // .****...****.
+     0x00001E3C,  // .****...****.
+     0x00001A2C,  // .**.*...*.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x000019CC,  // .**..***..**.
+     0x000019CC,  // .**..***..**.
+     0x000019CC,  // .**..***..**.
+     0x0000188C,  // .**...*...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 78
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x00000F0C,  // .****....**.
+     0x00000F0C,  // .****....**.
+     0x00000D8C,  // .**.**...**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000C6C,  // .**...**.**.
+     0x00000C3C,  // .**....****.
+     0x00000C3C,  // .**....****.
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 79
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00001C0C,  // .***......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 80
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x000007F8,  // .********..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000061C,  // .**....***.
+     0x000007F8,  // .********..
+     0x000007F0,  // .*******...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 81
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00001C0C,  // .***......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x000018DC,  // .**...**.***.
+     0x00000C78,  // ..**...****..
+     0x00000FF8,  // ..*********..
+     0x000003D8,  // ....****.**..
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 82
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FE0,  // .*******....
+     0x00000C70,  // .**...***...
+     0x00000C38,  // .**....***..
+     0x00000C18,  // .**.....**..
+     0x00000C1C,  // .**.....***.
+     0x00000C0E,  // .**......***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 83
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x0000071C,  // .***...***.
+     0x0000060C,  // .**.....**.
+     0x00000780,  // .****......
+     0x000003F0,  // ..******...
+     0x000000F8,  // ....*****..
+     0x0000001C,  // .......***.
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 84
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000007FE,  // **********
+     0x000007FE,  // **********
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 85
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000E1C,  // .***....***.
+     0x000007F8,  // ..********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 86
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000C06,  // **.......**
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000003B8,  // ..***.***..
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 87
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00030706,  // **.....***.....**
+     0x0003870E,  // ***....***....***
+     0x00018F8C,  // .**...*****...**.
+     0x00018D8C,  // .**...**.**...**.
+     0x00018D8C,  // .**...**.**...**.
+     0x0000DDD8,  // ..**.***.***.**..
+     0x0000D8D8,  // ..**.**...**.**..
+     0x0000D8D8,  // ..**.**...**.**..
+     0x000078F8,  // ...****...*****..
+     0x00007070,  // ...***.....***...
+     0x00007070,  // ...***.....***...
+     0x00007070,  // ...***.....***...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 88
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x00000318,  // ..**...**..
+     0x000001B0,  // ...**.**...
+     0x000001F0,  // ...*****...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001F0,  // ...*****...
+     0x000001B0,  // ...**.**...
+     0x00000318,  // ..**...**..
+     0x0000071C,  // .***...***.
+     0x0000060C,  // .**.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 89
+     10, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000C0C,  // .**......**.
+     0x00000E1C,  // .***....***.
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x00000370,  // ...**.***...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 90
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FE,  // .********
+     0x000001FE,  // .********
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000038,  // ....***..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000E0,  // ..***....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000003FE,  // *********
+     0x000003FE,  // *********
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 91
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 92
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 93
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 94
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 95
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000003FE,  // *********
+     0x000003FE,  // *********
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 96
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 97
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x0000003C,  // ....****.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000000F6,  // ..****.**
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 98
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000370,  // .**.***...
+     0x000003F8,  // .*******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000003F8,  // .*******..
+     0x00000370,  // .**.***...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 99
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x000001CC,  // .***..**.
+     0x000000FC,  // ..******.
+     0x00000078,  // ...****..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 100
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x000000EC,  // ...***.**.
+     0x000001FC,  // ..*******.
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001FC,  // ..*******.
+     0x000000EC,  // ...***.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 101
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000180,  // .**......
+     0x000001CC,  // .***..**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 102
+     5, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001E,  // ..****
+     0x0000003E,  // .*****
+     0x00000030,  // .**...
+     0x0000007C,  // *****.
+     0x0000007C,  // *****.
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000EC,  // ...***.**.
+     0x000001FC,  // ..*******.
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001FC,  // ..*******.
+     0x000000EC,  // ...***.**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000001F8,  // ..******..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 104
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 105
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 106
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 107
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x0000018C,  // .**...**.
+     0x00000198,  // .**..**..
+     0x000001B0,  // .**.**...
+     0x000001F0,  // .*****...
+     0x000001F8,  // .******..
+     0x000001D8,  // .***.**..
+     0x00000198,  // .**..**..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 108
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 109
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003738,  // .**.***..***..
+     0x00003FFC,  // .************.
+     0x000039CC,  // .***..***..**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 110
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 111
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 112
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000370,  // .**.***...
+     0x000003F8,  // .*******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000003F8,  // .*******..
+     0x00000370,  // .**.***...
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 113
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000EC,  // ...***.**.
+     0x000001FC,  // ..*******.
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001FC,  // ..*******.
+     0x000000EC,  // ...***.**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 114
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000006E,  // .**.***
+     0x0000007E,  // .******
+     0x00000070,  // .***...
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 115
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x000001E0,  // .****....
+     0x000000F8,  // ..*****..
+     0x0000001C,  // .....***.
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000000F8,  // ..*****..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000010,  // ..*...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x0000007C,  // *****.
+     0x0000007C,  // *****.
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x0000003C,  // .****.
+     0x0000001C,  // ..***.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000000D8,  // ..**.**..
+     0x000000D8,  // ..**.**..
+     0x000000D8,  // ..**.**..
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 119
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000031C6,  // **...***...**
+     0x000031C6,  // **...***...**
+     0x000019CC,  // .**..***..**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00000E38,  // ..***...***..
+     0x00000E38,  // ..***...***..
+     0x00000E38,  // ..***...***..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 120
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000D8,  // ..**.**..
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 121
+     9, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x000001F0,  // ...*****...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000C0,  // ....**.....
+     0x000003C0,  // ..****.....
+     0x00000380,  // ..***......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 122
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000018,  // .....**..
+     0x00000038,  // ....***..
+     0x00000070,  // ...***...
+     0x000000E0,  // ..***....
+     0x000000C0,  // ..**.....
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000E,  // ....***
+     0x0000001E,  // ...****
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000070,  // .***...
+     0x00000070,  // .***...
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x0000001E,  // ...****
+     0x0000000E,  // ....***
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 124
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 125
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x000000E0,  // ***....
+     0x000000F0,  // ****...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000001C,  // ...***.
+     0x0000001C,  // ...***.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x000000F0,  // ****...
+     0x000000E0,  // ***....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 126
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003C4,  // .****...*.
+     0x000007FC,  // *********.
+     0x00000478,  // *...****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 127
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 161
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 162
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFC0,  // **********.....
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000DF0,  // ....**.*****...
+     0x00000FF8,  // ....*********..
+     0x00000E1C,  // ....***....***.
+     0x00000C0C,  // ....**......**.
+     0x00000C0C,  // ....**......**.
+     0x00000C1C,  // ....**.....***.
+     0x00000CF8,  // ....**..*****..
+     0x00000CF0,  // ....**..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 163
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C08,  // .**......*..
+     0x00000C00,  // .**.........
+     0x00000FC0,  // .******.....
+     0x00000FC0,  // .******.....
+     0x00000C00,  // .**.........
+     0x00000C08,  // .**......*..
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 165
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x0000071C,  // .***...***.
+     0x0000060C,  // .**.....**.
+     0x00000780,  // .****......
+     0x000003F0,  // ..******...
+     0x000000F8,  // ....*****..
+     0x0000001C,  // .......***.
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 166
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 167
+     4, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 168
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000030C,  // **....**.
+     0x0000031C,  // **...***.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 169
+     19, 25,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x0003FC00,  // ..********.........
+     0x0003FC00,  // ..********.........
+     0x00030C00,  // ..**....**.........
+     0x00030C00,  // ..**....**.........
+     0x00030C00,  // ..**....**.........
+     0x00030FF0,  // ..**....********...
+     0x00030FF8,  // ..**....*********..
+     0x00030C1C,  // ..**....**.....***.
+     0x00030C0C,  // ..**....**......**.
+     0x00030C1C,  // ..**....**.....***.
+     0x000F0FF8,  // ****....*********..
+     0x000E0FF0,  // ***.....********...
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 170
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00030C00,  // .**....**.........
+     0x00030C00,  // .**....**.........
+     0x00030C00,  // .**....**.........
+     0x00030C00,  // .**....**.........
+     0x00030C00,  // .**....**.........
+     0x0003FFF0,  // .**************...
+     0x0003FFF8,  // .***************..
+     0x00030C1C,  // .**....**.....***.
+     0x00030C0C,  // .**....**......**.
+     0x00030C1C,  // .**....**.....***.
+     0x00030FF8,  // .**....*********..
+     0x00030FF0,  // .**....********...
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 171
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFC0,  // **********.....
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000FF0,  // ....********...
+     0x00000FF8,  // ....*********..
+     0x00000C1C,  // ....**.....***.
+     0x00000C0C,  // ....**......**.
+     0x00000C0C,  // ....**......**.
+     0x00000C0C,  // ....**......**.
+     0x00000C0C,  // ....**......**.
+     0x00000C0C,  // ....**......**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 172
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030E,  // .**....***
+     0x0000031E,  // .**...****
+     0x00000338,  // .**..***..
+     0x00000330,  // .**..**...
+     0x00000370,  // .**.***...
+     0x000003E0,  // .*****....
+     0x000003F0,  // .******...
+     0x00000338,  // .**..***..
+     0x00000318,  // .**...**..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000306,  // .**.....**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 173
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 174
+     11, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000220,  // ....*...*....
+     0x000001C0,  // .....***.....
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000003E0,  // ....*****....
+     0x000001C0,  // .....***.....
+     0x00000080,  // ......*......
+     0x00000180,  // .....**......
+     0x00000780,  // ...****......
+     0x00000700,  // ...***.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 175
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 176
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000007FC,  // .*********.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000C06,  // **.......**
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 177
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 178
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 179
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 180
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001FFE,  // ************
+     0x00001FFE,  // ************
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 181
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 182
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000718E,  // ***...**...***
+     0x0000799E,  // ****..**..****
+     0x00001998,  // ..**..**..**..
+     0x00000DB8,  // ...**.**.***..
+     0x00000DB0,  // ...**.**.**...
+     0x000007E0,  // ....******....
+     0x00000FF0,  // ...********...
+     0x00001DB8,  // ..***.**.***..
+     0x00001998,  // ..**..**..**..
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00006186,  // **....**....**
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 183
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x000007F8,  // .********..
+     0x00000E1C,  // ***....***.
+     0x0000040C,  // .*......**.
+     0x00000018,  // .......**..
+     0x00000070,  // .....***...
+     0x00000078,  // .....****..
+     0x0000000C,  // ........**.
+     0x0000040C,  // .*......**.
+     0x00000E1C,  // ***....***.
+     0x000007F8,  // .********..
+     0x000003F0,  // ..******...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 184
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C3C,  // .**....****.
+     0x00000C3C,  // .**....****.
+     0x00000C6C,  // .**...**.**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000D8C,  // .**.**...**.
+     0x00000F0C,  // .****....**.
+     0x00000F0C,  // .****....**.
+     0x00000E0C,  // .***.....**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 185
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000110,  // ....*...*...
+     0x000000E0,  // .....***....
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C3C,  // .**....****.
+     0x00000C3C,  // .**....****.
+     0x00000C6C,  // .**...**.**.
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x00000D8C,  // .**.**...**.
+     0x00000F0C,  // .****....**.
+     0x00000F0C,  // .****....**.
+     0x00000E0C,  // .***.....**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 186
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030E,  // .**....***
+     0x0000031E,  // .**...****
+     0x00000338,  // .**..***..
+     0x00000330,  // .**..**...
+     0x00000370,  // .**.***...
+     0x000003E0,  // .*****....
+     0x000003F0,  // .******...
+     0x00000338,  // .**..***..
+     0x00000318,  // .**...**..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000306,  // .**.....**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 187
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00001E0C,  // ****.....**.
+     0x00001C0C,  // ***......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 188
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001C1C,  // .***.....***.
+     0x00001C1C,  // .***.....***.
+     0x00001E3C,  // .****...****.
+     0x00001E3C,  // .****...****.
+     0x00001A2C,  // .**.*...*.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x000019CC,  // .**..***..**.
+     0x000019CC,  // .**..***..**.
+     0x000019CC,  // .**..***..**.
+     0x0000188C,  // .**...*...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 189
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 190
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00001C0C,  // .***......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 191
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 192
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F0,  // .*******...
+     0x000007F8,  // .********..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000061C,  // .**....***.
+     0x000007F8,  // .********..
+     0x000007F0,  // .*******...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 193
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000E08,  // .***.....*..
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000E08,  // .***.....*..
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 194
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000007FE,  // **********
+     0x000007FE,  // **********
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 195
+     11, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000003E0,  // ....*****....
+     0x000001C0,  // .....***.....
+     0x00000080,  // ......*......
+     0x00000180,  // .....**......
+     0x00000780,  // ...****......
+     0x00000700,  // ...***.......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 196
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000007E0,  // ....******....
+     0x00001FF8,  // ..**********..
+     0x00001998,  // ..**..**..**..
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00001998,  // ..**..**..**..
+     0x00001FF8,  // ..**********..
+     0x000007E0,  // ....******....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 197
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x00000318,  // ..**...**..
+     0x000001B0,  // ...**.**...
+     0x000001F0,  // ...*****...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001F0,  // ...*****...
+     0x000001B0,  // ...**.**...
+     0x00000318,  // ..**...**..
+     0x0000071C,  // .***...***.
+     0x0000060C,  // .**.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 198
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x00000006,  // ..........**
+     0x00000006,  // ..........**
+     0x00000006,  // ..........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 199
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x000007FC,  // ..*********.
+     0x000003FC,  // ...********.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x0000000C,  // .........**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 200
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000FFFC,  // .**************.
+     0x0000FFFC,  // .**************.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 201
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000FFFE,  // .***************
+     0x0000FFFE,  // .***************
+     0x00000006,  // ..............**
+     0x00000006,  // ..............**
+     0x00000006,  // ..............**
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 202
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FC00,  // ******.........
+     0x0000FC00,  // ******.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000FF0,  // ....********...
+     0x00000FF8,  // ....*********..
+     0x00000C1C,  // ....**.....***.
+     0x00000C0C,  // ....**......**.
+     0x00000C1C,  // ....**.....***.
+     0x00000FF8,  // ....*********..
+     0x00000FF0,  // ....********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001FE0C,  // .********.....**.
+     0x0001FF0C,  // .*********....**.
+     0x0001838C,  // .**.....***...**.
+     0x0001818C,  // .**......**...**.
+     0x0001838C,  // .**.....***...**.
+     0x0001FF0C,  // .*********....**.
+     0x0001FE0C,  // .********.....**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 204
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 205
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F0,  // ..*******...
+     0x00000E18,  // .***....**..
+     0x0000040C,  // ..*......**.
+     0x0000000C,  // .........**.
+     0x000000FC,  // .....******.
+     0x000000FC,  // .....******.
+     0x0000000C,  // .........**.
+     0x0000040C,  // ..*......**.
+     0x00000E18,  // .***....**..
+     0x000007F8,  // ..********..
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 206
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x000303E0,  // .**......*****....
+     0x00030FF8,  // .**....*********..
+     0x00030C18,  // .**....**.....**..
+     0x0003180C,  // .**...**.......**.
+     0x0003180C,  // .**...**.......**.
+     0x0003F80C,  // .*******.......**.
+     0x0003F80C,  // .*******.......**.
+     0x0003180C,  // .**...**.......**.
+     0x0003180C,  // .**...**.......**.
+     0x00030C18,  // .**....**.....**..
+     0x00030FF8,  // .**....*********..
+     0x000303E0,  // .**......*****....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 207
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003FC,  // ...********.
+     0x000007FC,  // ..*********.
+     0x00000E0C,  // .***.....**.
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x000007FC,  // ..*********.
+     0x000001FC,  // ....*******.
+     0x0000038C,  // ...***...**.
+     0x0000070C,  // ..***....**.
+     0x0000060C,  // ..**.....**.
+     0x00000E0C,  // .***.....**.
+     0x00001C0C,  // ***......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 208
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x0000003C,  // ....****.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000000F6,  // ..****.**
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 209
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001FC,  // ...*******.
+     0x000003F8,  // ..*******..
+     0x00000700,  // .***.......
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x0000071C,  // .***...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 210
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003F8,  // .*******..
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x000003F8,  // .*******..
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000003F8,  // .*******..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 211
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000007E,  // .******
+     0x0000007E,  // .******
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 212
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000618,  // .**....**..
+     0x00000FFC,  // **********.
+     0x00000FFC,  // **********.
+     0x00000C0C,  // **......**.
+     0x00000C0C,  // **......**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 213
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000180,  // .**......
+     0x000001CC,  // .***..**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 214
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001CCE,  // ***..**..***
+     0x00001EDE,  // ****.**.****
+     0x000006D8,  // ..**.**.**..
+     0x000003F0,  // ...******...
+     0x000003F0,  // ...******...
+     0x000006D8,  // ..**.**.**..
+     0x00000CCC,  // .**..**..**.
+     0x00000CCC,  // .**..**..**.
+     0x000018C6,  // **...**...**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 215
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FC,  // .******.
+     0x000000CC,  // .**..**.
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x0000000C,  // .....**.
+     0x000000CC,  // .**..**.
+     0x000000FC,  // .******.
+     0x00000078,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 216
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x0000033C,  // .**..****.
+     0x0000033C,  // .**..****.
+     0x0000036C,  // .**.**.**.
+     0x000003CC,  // .****..**.
+     0x000003CC,  // .****..**.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 217
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000088,  // ...*...*..
+     0x00000070,  // ....***...
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x0000033C,  // .**..****.
+     0x0000033C,  // .**..****.
+     0x0000036C,  // .**.**.**.
+     0x000003CC,  // .****..**.
+     0x000003CC,  // .****..**.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 218
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000018E,  // .**...***
+     0x0000019E,  // .**..****
+     0x00000198,  // .**..**..
+     0x000001B8,  // .**.***..
+     0x000001F0,  // .*****...
+     0x000001F8,  // .******..
+     0x0000019C,  // .**..***.
+     0x0000018C,  // .**...**.
+     0x0000018E,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 219
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FC,  // ..********.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x0000030C,  // ..**....**.
+     0x00000F0C,  // ****....**.
+     0x00000E0C,  // ***.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 220
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001C1C,  // .***.....***.
+     0x00001C1C,  // .***.....***.
+     0x00001E3C,  // .****...****.
+     0x00001E3C,  // .****...****.
+     0x00001B6C,  // .**.**.**.**.
+     0x00001B6C,  // .**.**.**.**.
+     0x000019CC,  // .**..***..**.
+     0x000019CC,  // .**..***..**.
+     0x0000188C,  // .**...*...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 221
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 222
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 223
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 224
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000370,  // .**.***...
+     0x000003F8,  // .*******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000003F8,  // .*******..
+     0x00000370,  // .**.***...
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 225
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x000001CC,  // .***..**.
+     0x000000FC,  // ..******.
+     0x00000078,  // ...****..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 226
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000001FE,  // ********
+     0x000001FE,  // ********
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 227
+     9, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x000001F0,  // ...*****...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000C0,  // ....**.....
+     0x000003C0,  // ..****.....
+     0x00000380,  // ..***......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 228
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00003B70,  // ...***.**.***...
+     0x00007FF8,  // ..************..
+     0x0000E79C,  // .***..****..***.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000E79C,  // .***..****..***.
+     0x00007FF8,  // ..************..
+     0x00003B70,  // ...***.**.***...
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 229
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000D8,  // ..**.**..
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 230
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 231
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000001FC,  // ..*******.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 232
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 233
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00003FFE,  // .*************
+     0x00003FFE,  // .*************
+     0x00000006,  // ............**
+     0x00000006,  // ............**
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 234
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000F80,  // .*****......
+     0x00000F80,  // .*****......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x000001F8,  // ....******..
+     0x000001FC,  // ....*******.
+     0x0000018C,  // ....**...**.
+     0x000001FC,  // ....*******.
+     0x000001F8,  // ....******..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 235
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00003F8C,  // .*******...**.
+     0x00003FCC,  // .********..**.
+     0x000030CC,  // .**....**..**.
+     0x000030CC,  // .**....**..**.
+     0x00003FCC,  // .********..**.
+     0x00003F8C,  // .*******...**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 236
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003F8,  // .*******..
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000003F8,  // .*******..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 237
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x0000003C,  // ....****.
+     0x0000003C,  // ....****.
+     0x0000000C,  // ......**.
+     0x0000019C,  // .**..***.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 238
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000061F0,  // .**....*****...
+     0x000063F8,  // .**...*******..
+     0x0000671C,  // .**..***...***.
+     0x0000660C,  // .**..**.....**.
+     0x00007E0C,  // .******.....**.
+     0x00007E0C,  // .******.....**.
+     0x0000671C,  // .**..***...***.
+     0x000063F8,  // .**...*******..
+     0x000061F0,  // .**....*****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FC,  // ..*******.
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000001FC,  // ..*******.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000070C,  // ***....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 240
+     19, 25,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00060C00,  // .**.....**.........
+     0x00070C70,  // .***....**...***...
+     0x00070CF8,  // .***....**..*****..
+     0x00078D8C,  // .****...**.**...**.
+     0x0006CD8C,  // .**.**..**.**...**.
+     0x0006CD8C,  // .**.**..**.**...**.
+     0x00066CF8,  // .**..**.**..*****..
+     0x00066C70,  // .**..**.**...***...
+     0x00063C00,  // .**...****.........
+     0x00061DFC,  // .**....***.*******.
+     0x00061DFC,  // .**....***.*******.
+     0x00060C00,  // .**.....**.........
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 241
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CC,  // ..**..**.
+     0x000000CC,  // ..**..**.
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000180,  // .**......
+     0x000001CC,  // .***..**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 242
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x000007E0,  // ******....
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000000C,  // .......**.
+     0x0000003C,  // .....****.
+     0x00000038,  // .....***..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 243
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x0000007E,  // .******
+     0x0000007E,  // .******
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 244
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x000001E0,  // .****....
+     0x000001E0,  // .****....
+     0x00000180,  // .**......
+     0x000001CC,  // .***..**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 245
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x000001E0,  // .****....
+     0x000000F8,  // ..*****..
+     0x0000001C,  // .....***.
+     0x0000018C,  // .**...**.
+     0x000001FC,  // .*******.
+     0x000000F8,  // ..*****..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 246
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 247
+     4, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 248
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 249
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007F00,  // ..*******.......
+     0x00007F00,  // ..*******.......
+     0x00006300,  // ..**...**.......
+     0x000063F8,  // ..**...*******..
+     0x000063FC,  // ..**...********.
+     0x0000630C,  // ..**...**....**.
+     0x0000630C,  // ..**...**....**.
+     0x0001E3FC,  // ****...********.
+     0x0001C3F8,  // ***....*******..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 250
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00006300,  // .**...**.......
+     0x00006300,  // .**...**.......
+     0x00006300,  // .**...**.......
+     0x00007FF8,  // .************..
+     0x00007FFC,  // .*************.
+     0x0000630C,  // .**...**....**.
+     0x0000630C,  // .**...**....**.
+     0x000063FC,  // .**...********.
+     0x000063F8,  // .**...*******..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 251
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x000007E0,  // ******....
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 252
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x0000018E,  // .**...***
+     0x0000019E,  // .**..****
+     0x00000198,  // .**..**..
+     0x000001B8,  // .**.***..
+     0x000001F0,  // .*****...
+     0x000001F8,  // .******..
+     0x0000019C,  // .**..***.
+     0x0000018C,  // .**...**.
+     0x0000018E,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 253
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x00000198,  // .**..**..
+     0x000001C0,  // .***.....
+     0x000000E0,  // ..***....
+     0x000001F0,  // .*****...
+     0x00000338,  // **..***..
+     0x0000031C,  // **...***.
+     0x0000038C,  // ***...**.
+     0x000001CC,  // .***..**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x00000038,  // ....***..
+     0x00000198,  // .**..**..
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 254
+     9, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000110,  // ...*...*...
+     0x000000E0,  // ....***....
+     0x00000000,  // ...........
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x000001F0,  // ...*****...
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000C0,  // ....**.....
+     0x000003C0,  // ..****.....
+     0x00000380,  // ..***......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 255
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  };
diff --git a/i18n.c b/i18n.c
index c72ccd830..a92630eb7 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.140 2004/01/11 15:38:45 kls Exp $
+ * $Id: i18n.c 1.143 2004/01/17 14:39:38 kls Exp $
  *
  * Translations provided by:
  *
@@ -22,6 +22,7 @@
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
+ * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
  *
  */
 
@@ -92,6 +93,7 @@ const tI18nPhrase Phrases[] = {
     "Romaneste",
     "Magyar",
     "Catal�",
+    "�������", // Russian
   },
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-1",
@@ -110,6 +112,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
+    "iso8859-5",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
   { "eng",
@@ -128,6 +131,7 @@ const tI18nPhrase Phrases[] = {
     "ron,rum",
     "hun",
     "cat,cln",
+    "rus",
   },
   // Menu titles:
   { "VDR",
@@ -146,6 +150,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -163,6 +168,7 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Program",
     "Guia de Programaci�",
+    "�������",
   },
   { "Channels",
     "Kan�le",
@@ -180,6 +186,7 @@ const tI18nPhrase Phrases[] = {
     "Canale",
     "Csatorn�k",
     "Canals",
+    "������",
   },
   { "Timers",
     "Timer",
@@ -197,6 +204,7 @@ const tI18nPhrase Phrases[] = {
     "Timere",
     "Felv�tel beprogramoz�sa",
     "Temporitzadors",
+    "�������",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -214,6 +222,7 @@ const tI18nPhrase Phrases[] = {
     "Inregistrari",
     "Felvett ad�sok",
     "Veure programes gravats",
+    "������",
   },
   { "Setup",
     "Einstellungen",
@@ -231,6 +240,7 @@ const tI18nPhrase Phrases[] = {
     "Setari",
     "Be�ll�t�sok",
     "Configuraci�",
+    "���������",
   },
   { "Commands",
     "Befehle",
@@ -248,6 +258,7 @@ const tI18nPhrase Phrases[] = {
     "Comenzi",
     "Parancsok",
     "Ordres",
+    "�������",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -265,6 +276,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Parancsok a felvett filmekhez",
     "Ordres de gravaci�",
+    "������� ������",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -282,6 +294,7 @@ const tI18nPhrase Phrases[] = {
     "Editare canale",
     "Csatorn�k be�ll�t�sa",
     "Editar canal",
+    "�������������� ������",
   },
   { "Edit timer",
     "Timer editieren",
@@ -299,6 +312,7 @@ const tI18nPhrase Phrases[] = {
     "Editare timere",
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
     "Editar temporitzador",
+    "��������� �������",
   },
   { "Event",
     "Sendung",
@@ -316,6 +330,7 @@ const tI18nPhrase Phrases[] = {
     "Evenimente",
     "Ad�s",
     "Esdeveniment",
+    "��������",
   },
   { "Summary",
     "Inhalt",
@@ -333,6 +348,7 @@ const tI18nPhrase Phrases[] = {
     "Cuprins",
     "Tartalom",
     "Sinopsi",
+    "��������",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -350,6 +366,7 @@ const tI18nPhrase Phrases[] = {
     "Program - %s",
     "Program - %s",
     "Guia de Programaci� - %s",
+    "��������� - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -367,6 +384,7 @@ const tI18nPhrase Phrases[] = {
     "Programul actual?",
     "Mi megy most?",
     "Qu� fan ara?",
+    "������ � �����:",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -384,6 +402,7 @@ const tI18nPhrase Phrases[] = {
     "Programul urmator?",
     "Mi k�vetkezik?",
     "Qu� fan despr�s?",
+    "����� � ���������:",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -402,6 +421,7 @@ const tI18nPhrase Phrases[] = {
     "Modificare",
     "Be�ll�tani",
     "Editar",
+    "�������������",
   },
   { "New",
     "Neu",
@@ -419,6 +439,7 @@ const tI18nPhrase Phrases[] = {
     "Nou",
     "�j",
     "Nou",
+    "��������",
   },
   { "Delete",
     "L�schen",
@@ -436,6 +457,7 @@ const tI18nPhrase Phrases[] = {
     "Sterge",
     "T�r�lni",
     "Esborrar",
+    "�������",
   },
   { "Mark",
     "Markieren",
@@ -453,6 +475,7 @@ const tI18nPhrase Phrases[] = {
     "Marcheaza",
     "Megjel�lni",
     "Marcar",
+    "�����������",
   },
   { "On/Off",
     "Ein/Aus",
@@ -470,6 +493,7 @@ const tI18nPhrase Phrases[] = {
     "Pornit/Oprit",
     "Be/Ki",
     "On/Off",
+    "���/����",
   },
   { "Record",
     "Aufnehmen",
@@ -487,6 +511,7 @@ const tI18nPhrase Phrases[] = {
     "Inregistrare",
     "Felvenni",
     "Gravar",
+    "������",
   },
   { "Play",
     "Wiedergabe",
@@ -504,6 +529,7 @@ const tI18nPhrase Phrases[] = {
     "Redare",
     "Lej�tszani",
     "Reproduir",
+    "�������������",
   },
   { "Rewind",
     "Anfang",
@@ -521,6 +547,7 @@ const tI18nPhrase Phrases[] = {
     "Inapoi",
     "Vissza az elej�re",
     "Enrera",
+    "�����",
   },
   { "Button$Stop",
     "Beenden",
@@ -538,6 +565,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "Stop",
     "Aturar",
+    "����",
   },
   { "Resume",
     "Weiter",
@@ -555,6 +583,7 @@ const tI18nPhrase Phrases[] = {
     "Reia",
     "Tov�bb",
     "Continuar",
+    "����������",
   },
   { "Summary",
     "Inhalt",
@@ -572,6 +601,7 @@ const tI18nPhrase Phrases[] = {
     "Cuprins",
     "Tartalom",
     "Resum",
+    "��������",
   },
   { "Open",
     "�ffnen",
@@ -589,6 +619,7 @@ const tI18nPhrase Phrases[] = {
     "Deschide",
     "Kinyitni",
     "Obrir",
+    "�������",
   },
   { "Switch",
     "Umschalten",
@@ -606,6 +637,7 @@ const tI18nPhrase Phrases[] = {
     "Schimba",
     "�tkapcsolni",
     "Canviar",
+    "�����������",
   },
   { "Now",
     "Jetzt",
@@ -623,6 +655,7 @@ const tI18nPhrase Phrases[] = {
     "Acum",
     "Most",
     "Ara",
+    "������",
   },
   { "Next",
     "N�chste",
@@ -640,6 +673,7 @@ const tI18nPhrase Phrases[] = {
     "Urmator",
     "K�vetkez�",
     "Seg�ent",
+    "�����",
   },
   { "Button$Schedule",
     "Programm",
@@ -657,6 +691,7 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Program",
     "Programar",
+    "���������",
   },
   { "Language",
     "Sprache",
@@ -674,6 +709,7 @@ const tI18nPhrase Phrases[] = {
     "Limba",
     "Nyelv",
     "Idioma",
+    "����",
   },
   { "Eject",
     "Auswerfen",
@@ -691,6 +727,7 @@ const tI18nPhrase Phrases[] = {
     "Ejecteaza",
     "Kidobni",
     "Expulsar",
+    "�������",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -708,6 +745,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
+    "���/���",
   },
   { "Insert",
     "Einf�gen",
@@ -725,6 +763,7 @@ const tI18nPhrase Phrases[] = {
     "Insereaza",
     "Beilleszteni",
     "Inserir",
+    "�������",
   },
   { "Overwrite",
     "�berschreiben",
@@ -742,6 +781,7 @@ const tI18nPhrase Phrases[] = {
     "Suprascrie",
     "�t�rni",
     "Sobrescriure",
+    "������",
   },
   { "Menu",
     "Men�",
@@ -759,6 +799,7 @@ const tI18nPhrase Phrases[] = {
     "Meniu",
     "Men�",
     "Men�",
+    "����",
   },
   { "Reset",
     "Reset",
@@ -776,6 +817,25 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Reset",
     "Reiniciar",
+    "�����",
+  },
+  { "Scan",
+    "Scan",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   // Confirmations:
   { "Delete channel?",
@@ -794,6 +854,7 @@ const tI18nPhrase Phrases[] = {
     "Sterg canalul?",
     "Csatorna t�rl�se?",
     "Esborrar el canal?",
+    "������� �����?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -811,6 +872,7 @@ const tI18nPhrase Phrases[] = {
     "Sterg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
     "Esborrar el temporitzador?",
+    "������� ������?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -828,6 +890,7 @@ const tI18nPhrase Phrases[] = {
     "Sterg inregistrarea?",
     "Felv�tel t�rl�se?",
     "Esborrar gravaci�?",
+    "������� ������?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -845,6 +908,7 @@ const tI18nPhrase Phrases[] = {
     "Timer-ul in inregistrare - sterg?",
     "Felv�tel folyamatban van - m�gis t�r�lni?",
     "Temporitzador activat - Esborrar de totes maneres?",
+    "���� ������ �� ������� - ������������� �������?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -862,6 +926,7 @@ const tI18nPhrase Phrases[] = {
     "Opresc inregistrarea?",
     "Felv�tel befejezni?",
     "Aturar la gravaci�?",
+    "���������� ������?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -879,6 +944,7 @@ const tI18nPhrase Phrases[] = {
     "pe prima interfata",
     "az els� k�rty�n",
     "a la interf�cie prim�ria",
+    "�� �������� ����������",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -896,6 +962,7 @@ const tI18nPhrase Phrases[] = {
     "Opresc editarea?",
     "V�g�st befejezni?",
     "Cancel�lar l'edici�?",
+    "�������� ��������������?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -913,6 +980,7 @@ const tI18nPhrase Phrases[] = {
     "Esti sigur de repornire?",
     "T�nyleg �jraind�tani?",
     "Segur que voleu reiniciar?",
+    "������������� �������������?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -930,6 +998,7 @@ const tI18nPhrase Phrases[] = {
     "In inregistrare - repornesc?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
     "Gravant - Reiniciar de totes maneres?",
+    "���� ������ - ������������� �������������?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -947,6 +1016,7 @@ const tI18nPhrase Phrases[] = {
     "In inregistrare - opresc?",
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
     "Gravant - Apagar de totes maneres?",
+    "���� ������ - ������������� ���������?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -964,6 +1034,7 @@ const tI18nPhrase Phrases[] = {
     "Inregistrez in %d minute, opresc?",
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
     "Hi ha una gravaci� en %d minuts - Apagar de totes maneres?",
+    "����� %d ����� �������� ������ - ������������� ���������?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -981,6 +1052,7 @@ const tI18nPhrase Phrases[] = {
     "Apasa orice tasta pentru a anula inchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
     "Prem qualsevol tecla per cancel�lar l'aturada",
+    "������� ����� ������ ����� �������� ����������.",
   },
   // Channel parameters:
   { "Name",
@@ -999,6 +1071,7 @@ const tI18nPhrase Phrases[] = {
     "Nume",
     "N�v",
     "Nom",
+    "��������",
   },
   { "Frequency",
     "Frequenz",
@@ -1016,6 +1089,7 @@ const tI18nPhrase Phrases[] = {
     "Frecventa",
     "Frekvencia",
     "Freq��ncia",
+    "�������",
   },
   { "Polarization",
     "Polarisation",
@@ -1033,6 +1107,7 @@ const tI18nPhrase Phrases[] = {
     "Polarizare",
     "Polariz�ci�",
     "Polaritzaci�",
+    "�����������",
   },
   { "Source",
     "Quelle",
@@ -1050,6 +1125,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Forr�s",
     "Origen",
+    "��������",
   },
   { "Srate",
     "Srate",
@@ -1067,6 +1143,7 @@ const tI18nPhrase Phrases[] = {
     "Rata simboluri",
     "Srate",
     "Srate",
+    "����. ��������",
   },
   { "Vpid",
     "Vpid",
@@ -1084,6 +1161,7 @@ const tI18nPhrase Phrases[] = {
     "PID Video",
     "Vpid",
     "PID V�deo",
+    "Vpid (�����)",
   },
   { "Ppid",
     "Ppid",
@@ -1101,6 +1179,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
+    "Ppid",
   },
   { "Apid1",
     "Apid1",
@@ -1118,6 +1197,7 @@ const tI18nPhrase Phrases[] = {
     "PID Audio (1)",
     "Apid1",
     "PID �udio (1)",
+    "Apid1 (����� 1)",
   },
   { "Apid2",
     "Apid2",
@@ -1135,6 +1215,7 @@ const tI18nPhrase Phrases[] = {
     "PID Audio (2)",
     "Apid2",
     "PID �udio (2)",
+    "Apid2 (����� 2)",
   },
   { "Dpid1",
     "Dpid1",
@@ -1152,6 +1233,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (1)",
     "Dpid1",
     "PID AC3 (1)",
+    "Dpid1 (AC3 1)",
   },
   { "Dpid2",
     "Dpid2",
@@ -1169,6 +1251,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (2)",
     "Dpid2",
     "PID AC3 (2)",
+    "Dpid2 (AC3 2)",
   },
   { "Tpid",
     "Tpid",
@@ -1186,6 +1269,7 @@ const tI18nPhrase Phrases[] = {
     "PID Teletext",
     "Tpid",
     "PID Teletext",
+    "Tpid (���������)",
   },
   { "CA",
     "CA",
@@ -1203,6 +1287,7 @@ const tI18nPhrase Phrases[] = {
     "Criptare",
     "CA",
     "Acc�s Condicional",
+    "CA (�������)",
   },
   { "Sid",
     "Sid",
@@ -1220,6 +1305,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid",
+    "Sid",
   },
   { "Inversion",
     "Inversion",
@@ -1237,6 +1323,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
     "Inversion",
     "Inversi�",
+    "��������",
   },
   { "Bandwidth",
     "Bandwidth",
@@ -1254,6 +1341,7 @@ const tI18nPhrase Phrases[] = {
     "Bandwidth",
     "Bandwidth",
     "Amplada de banda",
+    "��������",
   },
   { "CoderateH",
     "CoderateH",
@@ -1271,6 +1359,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
+    "CoderateH",
   },
   { "CoderateL",
     "CoderateL",
@@ -1288,6 +1377,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
+    "CoderateL",
   },
   { "Modulation",
     "Modulation",
@@ -1305,6 +1395,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulation",
     "Modulaci�",
+    "���������",
   },
   { "Transmission",
     "Transmission",
@@ -1322,6 +1413,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmission",
     "Transmissi�",
+    "��������",
   },
   { "Guard",
     "Guard",
@@ -1339,6 +1431,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
     "Guard",
     "Protegir",
+    "������",
   },
   { "Hierarchy",
     "Hierarchy",
@@ -1356,6 +1449,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchy",
     "Hierarchy",
     "Jerarquia",
+    "��������",
   },
   // Timer parameters:
   { "Active",
@@ -1374,6 +1468,7 @@ const tI18nPhrase Phrases[] = {
     "Activ",
     "Aktiv",
     "Actiu",
+    "�����������",
   },
   { "Channel",
     "Kanal",
@@ -1391,6 +1486,7 @@ const tI18nPhrase Phrases[] = {
     "Canal",
     "Csatorna",
     "Canal",
+    "�����",
   },
   { "Day",
     "Tag",
@@ -1408,6 +1504,7 @@ const tI18nPhrase Phrases[] = {
     "Ziua",
     "Nap",
     "Dia",
+    "����",
   },
   { "Start",
     "Anfang",
@@ -1425,6 +1522,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Kezdet",
     "Inici",
+    "������",
   },
   { "Stop",
     "Ende",
@@ -1442,6 +1540,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "V�ge",
     "Fi",
+    "�����",
   },
   { "Priority",
     "Priorit�t",
@@ -1459,6 +1558,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritate",
     "Priorit�s",
     "Prioritat",
+    "���������",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1476,6 +1576,7 @@ const tI18nPhrase Phrases[] = {
     "Durata",
     "�lettartam",
     "Durada",
+    "���� ��������",
   },
   { "File",
     "Datei",
@@ -1493,6 +1594,7 @@ const tI18nPhrase Phrases[] = {
     "Fisier",
     "File",
     "Arxiu",
+    "����",
   },
   { "First day",
     "Erster Tag",
@@ -1510,6 +1612,7 @@ const tI18nPhrase Phrases[] = {
     "Prima zi",
     "Els� nap",
     "Primer dia",
+    "������ ����",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -1528,6 +1631,7 @@ const tI18nPhrase Phrases[] = {
     "Canalul este utilizat de un timer!",
     "Csatorn�t m�s haszn�lja!",
     "Canal en �s per un temporitzador!",
+    "����� ����� ��������!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1545,6 +1649,7 @@ const tI18nPhrase Phrases[] = {
     "Nu pot comuta canalul!",
     "Csatorn�t nem lehet �tkapcsolni!",
     "No puc canviar de canal!",
+    "���������� ����������� �����!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1562,6 +1667,7 @@ const tI18nPhrase Phrases[] = {
     "Timer-ul este in inregistrare!",
     "Felv�tel folyamatban van!",
     "El temporitzador est� gravant!",
+    "���� ������ �� �������!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1579,6 +1685,7 @@ const tI18nPhrase Phrases[] = {
     "Eroare in timpul accesarii inregistrarii",
     "Hiba a felv�tel hozz�f�r�s�n�l",
     "Error a l'accedir a la gravaci�!",
+    "������ ������� � ������!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1596,6 +1703,7 @@ const tI18nPhrase Phrases[] = {
     "Eroare in timpul stergerii inregistrarii!",
     "Hiba a felv�tel t�rl�s�n�l!",
     "Error a l'esborrar la gravaci�!",
+    "������ �������� ������!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1613,6 +1721,7 @@ const tI18nPhrase Phrases[] = {
     "*** Canal invalid ***",
     "*** �rv�nytelen csatorna ***",
     "*** Canal incorrecte ***",
+    "*** ������������ ����� ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1630,6 +1739,7 @@ const tI18nPhrase Phrases[] = {
     "Nu mai sunt dispozitive DVB pentru inregistrare!",
     "Nincs szabad DVB k�rtya a felv�telhez!",
     "No hi ha cap dispositiu DVB lliure per gravar!",
+    "��� ���������� DVB-���������� ��� ������!",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -1647,6 +1757,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "A csatorna nem el�rhet�",
     "Canal no disponible!",
+    "����� ����������!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -1664,6 +1775,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "A csatornabe�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
+    "��������� ������ �� ���������!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -1681,6 +1793,7 @@ const tI18nPhrase Phrases[] = {
     "Canal blocat (inregistrare)!",
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
     "Canal bloquejat (gravant)!",
+    "����� ������������ (���� ������)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -1698,6 +1811,7 @@ const tI18nPhrase Phrases[] = {
     "Nu pot porni Modul de Transfer!",
     "Transfer-Mode nem ind�that�!",
     "No puc iniciar el mode de transfer�ncia!",
+    "���������� �������� ����� ��������!", // ???
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
@@ -1715,6 +1829,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "A v�g�pont nincs kijel�lve",//TODO
     "No hi ha marques d'edici� definides",
+    "�� ������ ����� ��� �������!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -1732,6 +1847,7 @@ const tI18nPhrase Phrases[] = {
     "Nu pot porni procesul de editare!",
     "A v�g�s nem ind�that�!",
     "No puc iniciar el proc�s d'edici�!",
+    "���������� ������ ������ ������!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1749,6 +1865,7 @@ const tI18nPhrase Phrases[] = {
     "Procesul de editare este activ!",
     "A v�g�s m�r aktiv�lt!",
     "Proc�s d'edici� iniciat anteriorment!",
+    "������� ������������ ��� �������!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -1766,6 +1883,7 @@ const tI18nPhrase Phrases[] = {
     "Nu pot opri calculatorul - vezi optiunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
     "No puc apagar, falta la opci� -s !",
+    "���������� ���������� - �� ����� �������� '-s'!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1783,6 +1901,7 @@ const tI18nPhrase Phrases[] = {
     "Spatiu scazut pe disc!",
     "A merev lemez majdnem tele!",
     "Disc gaireb� ple!",
+    "������������ ����� �� �����!",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -1800,6 +1919,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "A CAM-Men� nem nyithat�",
     "No puc obrir el men� de la CAM!",
+    "���� CAM-������ ����������!",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -1817,6 +1937,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "A CAM-Reset nem siker�lt",
     "No puc reiniciar la CAM!",
+    "������ ����������� CAM-������!",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
@@ -1834,6 +1955,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "A CAM vissza lett �ll�tva",
     "CAM reiniciada",
+    "CAM-������ �����������!",
   },
   // Setup pages:
   { "OSD",
@@ -1852,6 +1974,7 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "OSD",
     "Informaci� en pantalla",
+    "����",
   },
   { "EPG",
     "EPG",
@@ -1869,6 +1992,7 @@ const tI18nPhrase Phrases[] = {
     "EPG",
     "EPG",
     "Guia de Programes",
+    "�������",
   },
   { "DVB",
     "DVB",
@@ -1886,6 +2010,7 @@ const tI18nPhrase Phrases[] = {
     "Placa DVB",
     "DVB",
     "Tarja DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -1903,6 +2028,7 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
     "Configuraci� de l'LNB",
+    "���������",
   },
   { "CICAM",
     "CICAM",
@@ -1920,6 +2046,7 @@ const tI18nPhrase Phrases[] = {
     "Acces conditionat",
     "CICAM",
     "CI Acc�s condicional",
+    "�������� ������",
   },
   { "Recording",
     "Aufnahme",
@@ -1937,6 +2064,7 @@ const tI18nPhrase Phrases[] = {
     "Inregistrare",
     "Felv�tel",
     "Opcions de Gravaci�",
+    "������",
   },
   { "Replay",
     "Wiedergabe",
@@ -1954,6 +2082,7 @@ const tI18nPhrase Phrases[] = {
     "Redare",
     "Lej�tsz�s",
     "Opcions de Reproducci�",
+    "���������������",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -1971,6 +2100,7 @@ const tI18nPhrase Phrases[] = {
     "Diverse",
     "Egy�b",
     "Miscel�l�nia",
+    "������",
   },
   { "Plugins",
     "Plugins",
@@ -1988,6 +2118,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Plugins",
+    "������ ����������",
   },
   { "Plugin",
     "Plugin",
@@ -2005,6 +2136,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Plugin",
+    "������",
   },
   { "Restart",
     "Neustart",
@@ -2022,6 +2154,7 @@ const tI18nPhrase Phrases[] = {
     "Restart",
     "�jraind�t�s",
     "Reiniciar",
+    "�������������",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -2040,6 +2173,7 @@ const tI18nPhrase Phrases[] = {
     "Limba OSD",
     "Nyelv",
     "Idioma",
+    "����",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -2057,6 +2191,7 @@ const tI18nPhrase Phrases[] = {
     "Latime OSD",
     "Sz�less�g",
     "Amplada",
+    "������",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -2074,6 +2209,7 @@ const tI18nPhrase Phrases[] = {
     "Inaltime OSD",
     "Magass�g",
     "Al�ada",
+    "������",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -2091,6 +2227,7 @@ const tI18nPhrase Phrases[] = {
     "Timp afisare mesaj (sec)",
     "Inform�ci� felt�ntet�s�nek id�tartama",
     "Durada dels missatges (s)",
+    "������������ ������ ��������� (���)",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -2108,6 +2245,7 @@ const tI18nPhrase Phrases[] = {
     "Pozitie info canal",
     "Csatorna-Inf� pozici�ja",
     "Posici� de la informaci� del canal",
+    "��������� ���� ���������� � ������",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -2125,6 +2263,7 @@ const tI18nPhrase Phrases[] = {
     "Info despre comutare canal",
     "Inf� a csatorna v�lt�s�n�l",
     "Informaci� del canvi de canal",
+    "���������� ���������� � ������",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -2134,7 +2273,7 @@ const tI18nPhrase Phrases[] = {
     "Scroll da p�gina no menu",
     "Scrolling par pages",
     "Rask rulling i menyer",
-    "Valikkojen sivutus",
+    "Valikkosivujen pikaselaus",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
     "������ �������",
@@ -2142,6 +2281,7 @@ const tI18nPhrase Phrases[] = {
     "Deruleaza pagini",
     "Oldalank�nt l�ptetmi",
     "Despla�ar p�gina sencera",
+    "��������� ������� ����",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -2159,6 +2299,7 @@ const tI18nPhrase Phrases[] = {
     "Sortare timere",
     "A beprogramozott felv�telek elrendez�se",
     "Ordenar gravacions programades",
+    "���������� ��������",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -2176,6 +2317,7 @@ const tI18nPhrase Phrases[] = {
     "Directoare inregistrari",
     "Felv�telek list�ja",
     "Gravacions en subcarpetes",
+    "�������� �������� �������",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -2193,6 +2335,7 @@ const tI18nPhrase Phrases[] = {
     "Timeout EPG",
     "Fennmaradt id� az EPG-g (h)",
     "M�xim d'Hores a cercar per la Guia",
+    "�������� ������������ �������� (�)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -2210,6 +2353,7 @@ const tI18nPhrase Phrases[] = {
     "Nivel corectie EPG",
     "EPG hibaelh�r�t�s",
     "Nivell de correcci� de la Guia",
+    "������� ��������� ������",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2227,6 +2371,7 @@ const tI18nPhrase Phrases[] = {
     "Seteaza ceasul sistem",
     "Az id� be�ll�t�sa",
     "Ajustar l'hora del sistema",
+    "���������� ��������� �����",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -2236,7 +2381,7 @@ const tI18nPhrase Phrases[] = {
     "Usar rel�gio do transponder",
     "Utiliser l'heure de la cha�ne",
     "Bruk klokke fra transponder",
-    "Vastaanota kellonaika l�hettimelt�",
+    "Vastaanota kellonaika transponderilta",
     "Transponder do ustawiania czasu",
     "Transponder para reloj de sistema",
     "������������ ����������� ����",
@@ -2244,6 +2389,7 @@ const tI18nPhrase Phrases[] = {
     "Preia ceasul din transponder",
     "Id�h�z tartoz� Transponder",
     "Usar el temps del m�ltiplex",
+    "������������ ����� ������������",
   },
   { "Setup.EPG$Preferred languages",
     "Bevorzugte Sprachen",
@@ -2261,6 +2407,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "�������������� �����",
   },
   { "Setup.EPG$Preferred language",
     "Bevorzugte Sprache",
@@ -2278,6 +2425,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "������",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -2295,6 +2443,7 @@ const tI18nPhrase Phrases[] = {
     "Placa DVB primara",
     "Els� DVB interface",
     "Tarja DVB prim�ria",
+    "�������� DVB-����������",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -2312,6 +2461,7 @@ const tI18nPhrase Phrases[] = {
     "Format Video",
     "Video form�tum",
     "Format del v�deo",
+    "������ �����",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -2321,6 +2471,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "P�ivit� kanavat",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2328,7 +2479,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "��������� ��������� �������",
   },
   { "names only",
     "nur Namen",
@@ -2338,6 +2489,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "vain nimet",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2345,7 +2497,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ��������",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -2355,6 +2507,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "nimet ja PID:it",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2362,7 +2515,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������� � PID�",
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
@@ -2372,6 +2525,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "lis�� uudet kanavat",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2379,7 +2533,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����� ������",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
@@ -2389,6 +2543,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "lis�� uudet transponderit",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2396,7 +2551,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "���. ������������",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -2414,6 +2569,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "������� ������������ (SLOF) (���)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -2431,6 +2587,7 @@ const tI18nPhrase Phrases[] = {
     "Frecvnta LO LNB (Mhz)",
     "Als� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB baixa (MHz)",
+    "������ ������� ���������� (���)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -2448,6 +2605,7 @@ const tI18nPhrase Phrases[] = {
     "Feecventa HI LNB (MHz)",
     "Fels� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB alta (MHz)",
+    "������� ������� ���������� (���)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -2465,6 +2623,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizez DiSEqC",
     "DiSEqC haszn�lata",
     "Utilitzar DiSEqC",
+    "������������ DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -2482,6 +2641,7 @@ const tI18nPhrase Phrases[] = {
     "Setare acces conditional",
     "CICAM DVB",
     "Acc�s condicional CICAM",
+    "CAM-������ DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -2499,6 +2659,7 @@ const tI18nPhrase Phrases[] = {
     "Margine la pornire (min)",
     "Id�eltol�d�s a kezd�sn�l (min)",
     "Marge d'inici de gravaci� (min)",
+    "���������� ������ ������ (���)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -2516,6 +2677,7 @@ const tI18nPhrase Phrases[] = {
     "Margine la oprire (min)",
     "Id�eltol�d�s a befejez�sn�l",
     "Marge de fi de gravaci� (min)",
+    "������������ ��������� ������ (���)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -2533,6 +2695,7 @@ const tI18nPhrase Phrases[] = {
     "Limita Primara",
     "Prim�r-hat�r",
     "L�mit primari",
+    "���. ��������� ������� ���. ����������",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -2550,6 +2713,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritate implicita",
     "Default priority",
     "Prioritat per defecte",
+    "��������� ������� �� ���������",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -2567,6 +2731,7 @@ const tI18nPhrase Phrases[] = {
     "Durata predefinita",
     "Default �lettartam",
     "Durada predefinida",
+    "���� �������� ������ �� ��������� (�)",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
@@ -2584,6 +2749,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Sz�net priorit�s",
     "Prioritat de la pausa",
+    "��������� ����������� ���������",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
@@ -2601,6 +2767,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Sz�net �lettartama",
     "Durada de la pausa (d)",
+    "�������� ����������� ��������� (�)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -2618,6 +2785,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizeaza numele episodului",
     "Epiz�dn�v felhaszn�l�sa",
     "Utilitzar el nom de l'episodi",
+    "������������ ����� �� ��������",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -2635,6 +2803,7 @@ const tI18nPhrase Phrases[] = {
     "Inregistrare imediata",
     "Direktfelv�tel megjel�l�se",
     "Marcar gravaci� instant�nia",
+    "�������� ��������� ������� ������",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -2652,6 +2821,7 @@ const tI18nPhrase Phrases[] = {
     "Nume inregistrare imediata",
     "Direktfelv�tel megnevez�se",
     "Anomenar gravacions instant�nies",
+    "����� ���������� ������ �������",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -2669,6 +2839,7 @@ const tI18nPhrase Phrases[] = {
     "Timpul de inregistarea imediata (min)",
     "Felv�tel id�tartama",
     "Temps de gravaci� instant�nia (min)",
+    "������������ ������ ������ (���)",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -2686,6 +2857,7 @@ const tI18nPhrase Phrases[] = {
     "Inregistreaza Dolby Digital",
     "Dolby Digit�l felv�tel",
     "Gravar el so en Dolby Digital",
+    "���������� ���� Dolby Digital",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -2703,6 +2875,7 @@ const tI18nPhrase Phrases[] = {
     "Dimensiune maxima a fisierului video (MB)",
     "Max. video File-terjedelem (MB)",
     "Mida m�xima de l'arxiu (MB)",
+    "����. ������ ���������� (��)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -2720,6 +2893,7 @@ const tI18nPhrase Phrases[] = {
     "Separare fisiere editate",
     "Feldolgozott File-k feloszt�sa",
     "Separar arxius",
+    "������ ����������������� �����",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -2737,6 +2911,7 @@ const tI18nPhrase Phrases[] = {
     "Mod multi-rata",
     "MultiSpeed funkci�",
     "Mode de multivelocitat",
+    "��������������� �����",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -2754,6 +2929,7 @@ const tI18nPhrase Phrases[] = {
     "Afiseaza modul de redare",
     "Lej�tsz�s felt�ntet�se",
     "Mostrar mode de reproducci�",
+    "���������� ����� ���������������", // ???
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
@@ -2771,6 +2947,7 @@ const tI18nPhrase Phrases[] = {
     "Resume ID",// TODO
     "Lej�tsz�s ID",
     "ID de Continuar",
+    "ID ���������������", // ???
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -2788,6 +2965,7 @@ const tI18nPhrase Phrases[] = {
     "MinEventTimeout (min)",
     "Min. esem�ny sz�net (min)",
     "Temps m�nim en pausa (min)",
+    "���. ����� �������� ������� (���)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -2805,6 +2983,7 @@ const tI18nPhrase Phrases[] = {
     "Durata minima de inactivitate (min)",
     "Min. kezel�si aktivit�s (min)",
     "Temps m�nim d'inactivitat (min)",
+    "���. ����� �������� ����� (���)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -2822,6 +3001,7 @@ const tI18nPhrase Phrases[] = {
     "Timeout SVDRP (sec)",
     "SVDRP Timeout (s)",
     "SVDRP Timeout (s)",
+    "�������� ������ ����. SVDRP (���)",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
@@ -2839,6 +3019,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "�������� ������������ ������ (���)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -2857,6 +3038,7 @@ const tI18nPhrase Phrases[] = {
     "LMMJVSD",
     "HKSCPSV",
     "LMCJVSG",
+    "���ǿ��",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -2874,6 +3056,7 @@ const tI18nPhrase Phrases[] = {
     "LunMarMieJoiVinSimDum",
     "H�tKedSzeCs�P�nSzoVas",
     "Dl Dm Dc Dj Dv Ds Dg ",
+    "��ݲ�������ҿ����Ѳ��",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -2892,6 +3075,7 @@ const tI18nPhrase Phrases[] = {
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
+    " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~",
   },
   // Learning keys:
   { "Learning Remote Control Keys (%s)",
@@ -2910,6 +3094,7 @@ const tI18nPhrase Phrases[] = {
     "Invatare taste telecomanda (%s)",
     "T�vir�ny�t� betan�t�sa (%s)",
     "Aprenent les tecles del comandament a dist�ncia (%s)",
+    "���� ����� ������ ������ (%s)",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -2927,6 +3112,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 1: Detectie tip telecomanda",
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
     "Fase 1: Detectant el tipus de receptor",
+    "��� 1: ����������� ���� ���� ������",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -2944,6 +3130,7 @@ const tI18nPhrase Phrases[] = {
     "Apasati o tasta pe telecomanda",
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
     "Premeu qualsevol tecla del comandament",
+    "������� ����� ������ �� ������",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -2961,6 +3148,7 @@ const tI18nPhrase Phrases[] = {
     "S-a detectat tipul telecomenzii!",
     "T�vir�ny�t� k�dja felismerve!",
     "Codi detectat!",
+    "��������� ��� ������!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -2978,6 +3166,7 @@ const tI18nPhrase Phrases[] = {
     "Nu apasati nicio tasta...",
     "Ne nyomjon meg gombot...",
     "No premeu cap tecla...",
+    "�� ��������� ������...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -2995,6 +3184,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 2: Invatarea codurilor specifice tastelor",
     "M�sodik l�p�s: az egyes gombok betan�t�sa",
     "Fase 2: Aprenentantge de les funcions",
+    "��� 2: ������� ����� ��������� ������",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -3012,6 +3202,7 @@ const tI18nPhrase Phrases[] = {
     "Apasati tasta pentru '%s'",
     "'%s' gomb megnyom�sa",
     "Premeu una tecla per '%s'",
+    "������� ������ '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -3029,6 +3220,7 @@ const tI18nPhrase Phrases[] = {
     "Apsati 'Sus' pentru confirmare",
     "'Fel' megnyom�sa az elfogad�shoz",
     "Premeu 'Amunt' per confirmar",
+    "������� '�����' ����� �����������",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -3046,6 +3238,7 @@ const tI18nPhrase Phrases[] = {
     "Apasati jos pentru continuare",
     "'Le' megnyom�sa a folytat�shoz",
     "Premeu 'Avall' per continuar",
+    "������� '����' ����� ����������",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -3063,6 +3256,7 @@ const tI18nPhrase Phrases[] = {
     "(Apsati 'Sus' pentru revenire)",
     "(�Fel' megnyom�sa a visszat�r�shez)",
     "(Premeu 'Amunt' per retornar)",
+    "(������� '�����' ����� ���������)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -3080,6 +3274,7 @@ const tI18nPhrase Phrases[] = {
     "(Apasati 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
     "(Premeu 'Avall' per finalitzar l'aprenentatge)",
+    "(������� '����' ����� ��������� ��������� ������)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -3097,6 +3292,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
     "Premeu 'Men�' per obviar aquesta tecla",
+    "(������� '����' ����� ���������� ������)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -3114,6 +3310,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 3: Salvarea codurilor de taste",
     "Harmadik l�p�s: k�d ment�se",
     "Fase 3: Guardant els codis de les tecles",
+    "��� 3: ����������� ����� ������",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -3131,6 +3328,7 @@ const tI18nPhrase Phrases[] = {
     "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
     "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
+    "������� '�����' ����� ���������, '����' ����� ����������",
   },
   // Key names:
   { "Up",
@@ -3149,6 +3347,7 @@ const tI18nPhrase Phrases[] = {
     "Sus",
     "Fel",
     "Amunt",
+    "�����",
   },
   { "Down",
     "Ab",
@@ -3166,6 +3365,7 @@ const tI18nPhrase Phrases[] = {
     "Jos",
     "Le",
     "Avall",
+    "����",
   },
   { "Menu",
     "Men�",
@@ -3183,6 +3383,7 @@ const tI18nPhrase Phrases[] = {
     "Meniu",
     "Men�",
     "Men�",
+    "����",
   },
   { "Ok",
     "Ok",
@@ -3200,6 +3401,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "D'acord",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -3217,6 +3419,7 @@ const tI18nPhrase Phrases[] = {
     "Inapoi",
     "Vissza",
     "Retornar",
+    "�����",
   },
   { "Left",
     "Links",
@@ -3234,6 +3437,7 @@ const tI18nPhrase Phrases[] = {
     "Stinga",
     "Balra",
     "Esquerra",
+    "������",
   },
   { "Right",
     "Rechts",
@@ -3251,6 +3455,7 @@ const tI18nPhrase Phrases[] = {
     "Dreapta",
     "Jobbra",
     "Dreta",
+    "�������",
   },
   { "Red",
     "Rot",
@@ -3268,6 +3473,7 @@ const tI18nPhrase Phrases[] = {
     "Rosu",
     "Piros",
     "Vermell",
+    "�������",
   },
   { "Green",
     "Gr�n",
@@ -3285,6 +3491,7 @@ const tI18nPhrase Phrases[] = {
     "Verde",
     "Z�ld",
     "Verd",
+    "�������",
   },
   { "Yellow",
     "Gelb",
@@ -3302,6 +3509,7 @@ const tI18nPhrase Phrases[] = {
     "Galben",
     "S�rga",
     "Groc",
+    "������",
   },
   { "Blue",
     "Blau",
@@ -3319,6 +3527,7 @@ const tI18nPhrase Phrases[] = {
     "Albastru",
     "K�k",
     "Blau",
+    "�����",
   },
   { "Play",
     "Wiedergabe",
@@ -3336,6 +3545,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Lej�tsz�s",
     "Reproduir",
+    "���������������",
   },
   { "Pause",
     "Pause",
@@ -3353,6 +3563,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Sz�net",
     "Pausa",
+    "�����",
   },
   { "Stop",
     "Stop",
@@ -3370,6 +3581,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Stop",
     "Aturar",
+    "����",
   },
   { "Record",
     "Aufnehmen",
@@ -3387,6 +3599,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Felvenni",
     "Gravar",
+    "������",
   },
   { "FastFwd",
     "Vorlauf",
@@ -3404,6 +3617,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "El�re p�rgetni",
     "Endavant r�pidament",
+    "������",
   },
   { "FastRew",
     "R�cklauf",
@@ -3421,6 +3635,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Vissza p�rgetni",
     "Enrera r�pidament",
+    "�����",
   },
   { "Power",
     "Ausschalten",
@@ -3438,6 +3653,7 @@ const tI18nPhrase Phrases[] = {
     "Pornit",
     "Kikapcsolni",
     "Aturar",
+    "���������",
   },
   { "Channel+",
     "Kanal+",
@@ -3455,6 +3671,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Csatorna+",
     "Canal +",
+    "����� +",
   },
   { "Channel-",
     "Kanal-",
@@ -3472,11 +3689,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Csatorna-",
     "Canal -",
+    "����� -",
   },
   { "Volume+",
     "Lautst�rke+",
     "Glasnost+",
-    "Volume +", 
+    "Volume +",
     "Volume+",
     "Volume+",
     "Volume+",
@@ -3489,6 +3707,7 @@ const tI18nPhrase Phrases[] = {
     "Volum+",
     "Hanger�+",
     "Volum +",
+    "��������� +",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -3506,6 +3725,7 @@ const tI18nPhrase Phrases[] = {
     "Volum-",
     "Hanger�-",
     "Volum -",
+    "��������� -",
   },
   { "Mute",
     "Stumm",
@@ -3523,6 +3743,7 @@ const tI18nPhrase Phrases[] = {
     "Mut(e)",
     "Csend",
     "En silenci",
+    "��������� ����",
   },
   // Miscellaneous:
   { "yes",
@@ -3541,6 +3762,7 @@ const tI18nPhrase Phrases[] = {
     "da",
     "igen",
     "s�",
+    "��",
   },
   { "no",
     "nein",
@@ -3558,6 +3780,7 @@ const tI18nPhrase Phrases[] = {
     "nu",
     "nem",
     "no",
+    "���",
   },
   { "off",
     "aus",
@@ -3575,6 +3798,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "ki",
     "off",
+    "����",
   },
   { "none",
     "keine",
@@ -3592,6 +3816,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "semmi",
     "cap",
+    "������",
   },
   { "auto",
     "auto",
@@ -3609,6 +3834,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "auto",
     "auto",
+    "����",
   },
   { "top",
     "oben",
@@ -3626,6 +3852,7 @@ const tI18nPhrase Phrases[] = {
     "sus",
     "Fent",
     "a dalt",
+    "������",
   },
   { "bottom",
     "unten",
@@ -3643,6 +3870,7 @@ const tI18nPhrase Phrases[] = {
     "jos",
     "lent",
     "a baix",
+    "�����",
   },
   { "Disk",
     "Disk",
@@ -3660,6 +3888,7 @@ const tI18nPhrase Phrases[] = {
     "Disc",
     "Lemez",
     "Disc",
+    "����",
   },
   { "free",
     "frei",
@@ -3677,6 +3906,7 @@ const tI18nPhrase Phrases[] = {
     "liber",
     "szabad",
     "lliure",
+    "��������",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -3694,6 +3924,7 @@ const tI18nPhrase Phrases[] = {
     "Salt: ",
     "Ugr�s: ",
     "Salta a:",
+    "�������: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -3711,6 +3942,7 @@ const tI18nPhrase Phrases[] = {
     "Volum ",
     "Hanger� ",
     "Volum ",
+    "��������� ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -3728,6 +3960,7 @@ const tI18nPhrase Phrases[] = {
     " Opreste redare",
     " Lej�tsz�st befejzni",
     " Aturar la reproducci�",
+    " ���������� ���������������",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -3745,6 +3978,7 @@ const tI18nPhrase Phrases[] = {
     " Opreste inregistrarea ",
     " Felv�telt befejezni ",
     " Aturar la gravaci� ",
+    " ���������� ������ ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -3762,6 +3996,7 @@ const tI18nPhrase Phrases[] = {
     " Opreste editare",
     " V�g�st megszak�tani",
     " Cancel�lar l'edici� ",
+    " �������� ������ ������",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -3779,6 +4014,7 @@ const tI18nPhrase Phrases[] = {
     "Comuta interfata primara DVB...",
     "Prim�r Interface �tkapcsolva...",
     "Canviant a la interf�cie DVB prim�ria...",
+    "����� ��������� DVB-����������...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -3796,6 +4032,7 @@ const tI18nPhrase Phrases[] = {
     "Sus/Jos pentru noua locatie - OK pentru a muta",
     "Fel/Le egy uj opci��rt - azt�n OK",
     "Amunt/Avall per una nova localitzaci� - OK per moure",
+    "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\"",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -3813,6 +4050,7 @@ const tI18nPhrase Phrases[] = {
     "Procesul de editare a inceput",
     "V�g�s elind�tva",
     "Proc�s d'edici� iniciat",
+    "����� ������ ������",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -3822,7 +4060,7 @@ const tI18nPhrase Phrases[] = {
     "Processo de modifica��o terminado",
     "Montage termin�",
     "Redigeringsprosess avsluttet",
-    "Muokkaus lopetettu",
+    "Muokkaus valmis",
     "Proces montazu zakonczony",
     "Proceso de modificaci�n terminado",
     "� ����������� ��������",
@@ -3830,6 +4068,7 @@ const tI18nPhrase Phrases[] = {
     "Procesul de editare s-a terminat",
     "V�g�s befejezve",
     "Proc�s d'edici� finalitzat",
+    "������ �������",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -3847,6 +4086,7 @@ const tI18nPhrase Phrases[] = {
     "Proces de editare nereusit",
     "V�g�s sikertelen!",
     "Proc�s d'edici� fallit!",
+    "������ �� ����� ������� ������!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -3864,6 +4104,7 @@ const tI18nPhrase Phrases[] = {
     "Caut inregistrari...",
     "Felvett ad�sok b�ng�sz�se...",
     "cercant gravacions...",
+    "������������ �������...",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -3881,6 +4122,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Az �l� ad�s meg�ll�tva...",
     "Pausa d'emissi� en directe...",
+    "����� ����������� ���������...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -3898,6 +4140,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Ennek a plugin-nak nincs setup-parametere!",
     "Aquest plugin no admet configuraci�!",
+    "������ ���������� �� ����� ���������� ���������!",
    },
   { NULL }
   };
diff --git a/i18n.h b/i18n.h
index 8c8821404..26957645b 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.8 2004/01/06 15:56:53 kls Exp $
+ * $Id: i18n.h 1.9 2004/01/16 12:43:47 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 16;
+const int I18nNumLanguages = 17;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 433d6802a..4f4ef341a 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.2 2003/12/13 10:42:05 kls Exp $
+ *   $Id: descriptor.c 1.3 2004/01/12 16:17:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -492,6 +492,28 @@ void MultilingualServiceNameDescriptor::Name::Parse() {
    name.setData(data+offset, mid->service_name_length);
 }
 
+void LinkageDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_linkage>(s, offset);
+   privateData.assign(data.getData(offset), getLength()-offset);
+}
+
+int LinkageDescriptor::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int LinkageDescriptor::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+int LinkageDescriptor::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+LinkageType LinkageDescriptor::getLinkageType() const {
+   return (LinkageType)s->linkage_type;
+}
+
 void ApplicationSignallingDescriptor::Parse() {
    entryLoop.setData(data+sizeof(descr_application_signalling), getLength()-sizeof(descr_application_signalling));
 }
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 9abe1f01c..3eb90fa2d 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.2 2003/12/13 10:42:08 kls Exp $
+ *   $Id: descriptor.h 1.3 2004/01/12 16:17:47 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -361,6 +361,19 @@ class MultilingualServiceNameDescriptor : public Descriptor {
    virtual void Parse();
 };
 
+class LinkageDescriptor : public Descriptor {
+public:
+   int getTransportStreamId() const;
+   int getOriginalNetworkId() const;
+   int getServiceId() const;
+   LinkageType getLinkageType() const;
+   CharArray privateData;
+protected:
+   virtual void Parse();
+private:
+   const descr_linkage *s;
+};
+
 //a descriptor currently unimplemented in this library
 class UnimplementedDescriptor : public Descriptor {
 protected:
diff --git a/libsi/si.c b/libsi/si.c
index ac2e26fff..4342097f6 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.4 2004/01/05 11:04:17 kls Exp $
+ *   $Id: si.c 1.5 2004/01/12 22:19:34 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -320,6 +320,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case ApplicationSignallingDescriptorTag:
             d=new ApplicationSignallingDescriptor();
             break;
+         case LinkageDescriptorTag:
+            d=new LinkageDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -348,7 +351,6 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case VBITeletextDescriptorTag:
          case CountryAvailabilityDescriptorTag:
          case MocaicDescriptorTag:
-         case LinkageDescriptorTag:
          case TeletextDescriptorTag:
          case TelephoneDescriptorTag:
          case LocalTimeOffsetDescriptorTag:
diff --git a/libsi/si.h b/libsi/si.h
index d2ac417c0..4666c2d4d 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.5 2004/01/09 15:59:53 kls Exp $
+ *   $Id: si.h 1.6 2004/01/12 16:19:11 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -154,6 +154,18 @@ enum RunningStatus { RunningStatusUndefined = 0,
                      RunningStatusRunning = 4
                    };
 
+enum LinkageType { LinkageTypeInformationService = 0x01,
+                   LinkageTypeEPGService = 0x02,
+                   LinkageTypeCaReplacementService = 0x03,
+                   LinkageTypeTSContainingCompleteNetworkBouquetSi = 0x04,
+                   LinkageTypeServiceReplacementService = 0x05,
+                   LinkageTypeDataBroadcastService = 0x06,
+                   LinkageTypeRCSMap = 0x07,
+                   LinkageTypeMobileHandover = 0x08,
+                   LinkageTypeSystemSoftwareUpdateService = 0x09,
+                   LinkageTypeTSContainingSsuBatOrNit = 0x0A
+                 };
+
 /* Some principles:
    - Objects that return references to other objects contained in their data must make sure
      that the returned objects have been parsed.
@@ -167,6 +179,7 @@ class Object : public Parsable {
    Object(CharArray &d);
    //can only be called once since data is immutable
    void setData(const unsigned char*data, unsigned int size, bool doCopy=true);
+   CharArray getData() { return data; }
    virtual int getLength() = 0;
 protected:
    CharArray data;
@@ -224,9 +237,6 @@ class VariableLengthPart : public Object {
 class LoopElement : public Object {
 };
 
-class SubStructure : public LoopElement {
-};
-
 class Descriptor : public LoopElement {
 public:
    virtual int getLength();
diff --git a/menu.c b/menu.c
index cf9d8eb17..8526f36b8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.279 2004/01/11 15:40:32 kls Exp $
+ * $Id: menu.c 1.281 2004/01/17 14:17:00 kls Exp $
  */
 
 #include "menu.h"
@@ -16,6 +16,7 @@
 #include "channels.h"
 #include "config.h"
 #include "cutter.h"
+#include "eitscan.h"
 #include "i18n.h"
 #include "menuitems.h"
 #include "plugin.h"
@@ -2044,6 +2045,7 @@ cMenuSetupEPG::cMenuSetupEPG(void)
       ;
   originalNumLanguages = numLanguages;
   SetSection(tr("EPG"));
+  SetHelp(tr("Scan"));
   Setup();
 }
 
@@ -2068,10 +2070,6 @@ void cMenuSetupEPG::Setup(void)
 
 eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
 {
-  int oldnumLanguages = numLanguages;
-  int oldSetSystemTime = data.SetSystemTime;
-
-  eOSState state = cMenuSetupBase::ProcessKey(Key);
   if (Key == kOk) {
      bool Modified = numLanguages != originalNumLanguages;
      if (!Modified) {
@@ -2085,7 +2083,12 @@ eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
      if (Modified)
         cSchedules::ResetVersions();
      }
-  else if (Key != kNone) {
+
+  int oldnumLanguages = numLanguages;
+  int oldSetSystemTime = data.SetSystemTime;
+
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+  if (Key != kNone) {
      if (numLanguages != oldnumLanguages || data.SetSystemTime != oldSetSystemTime) {
         for (int i = oldnumLanguages; i < numLanguages; i++) {
             data.EPGLanguages[i] = 0;
@@ -2104,6 +2107,10 @@ eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
         data.EPGLanguages[numLanguages] = -1;
         Setup();
         }
+     if (Key == kRed) {
+        EITScanner.ForceScan();
+        return osEnd;
+        }
      }
   return state;
 }
diff --git a/nit.c b/nit.c
index 1ac731cd3..f38871647 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.1 2004/01/11 15:42:51 kls Exp $
+ * $Id: nit.c 1.5 2004/01/18 16:32:45 kls Exp $
  */
 
 #include "nit.h"
@@ -17,12 +17,16 @@
 
 cNitFilter::cNitFilter(void)
 {
+  numNits = 0;
+  networkId = 0;
   Set(0x10, 0x40);  // NIT
 }
 
 void cNitFilter::SetStatus(bool On)
 {
   cFilter::SetStatus(On);
+  numNits = 0;
+  networkId = 0;
   sectionSyncer.Reset();
 }
 
@@ -31,7 +35,59 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
   SI::NIT nit(Data, false);
   if (!nit.CheckCRCAndParse())
      return;
-  if (!sectionSyncer.Sync(nit.getVersionNumber(), nit.getSectionNumber(), nit.getLastSectionNumber()))
+  // Some broadcasters send more than one NIT, with no apparent way of telling which
+  // one is the right one to use. This is an attempt to find the NIT that contains
+  // the transponder it was transmitted on and use only that one:
+  int ThisNIT = -1;
+  if (!networkId) {
+     for (int i = 0; i < numNits; i++) {
+         if (nits[i].networkId == nit.getNetworkId()) {
+            if (nit.getSectionNumber() == 0) {
+               // all NITs have passed by
+               for (int j = 0; j < numNits; j++) {
+                   if (nits[j].hasTransponder) {
+                      networkId = nits[j].networkId;
+                      //printf("taking NIT with network ID %d\n", networkId);
+                      //XXX what if more than one NIT contaisn this transponder???
+                      break;
+                      }
+                   }
+               if (!networkId) {
+                  //printf("none of the NITs contains transponder %d\n", Transponder());
+                  return;
+                  }
+               }
+            else {
+               ThisNIT = i;
+               break;
+               }
+            }
+         }
+     if (!networkId && ThisNIT < 0 && numNits < MAXNITS) {
+        if (nit.getSectionNumber() == 0) {
+           *nits[numNits].name = 0;
+           SI::Descriptor *d;
+           for (SI::Loop::Iterator it; (d = nit.commonDescriptors.getNext(it)); ) {
+               switch (d->getDescriptorTag()) {
+                 case SI::NetworkNameDescriptorTag: {
+                      SI::NetworkNameDescriptor *nnd = (SI::NetworkNameDescriptor *)d;
+                      nnd->name.getText(nits[numNits].name);
+                      }
+                      break;
+                 default: ;
+                 }
+               }
+           nits[numNits].networkId = nit.getNetworkId();
+           nits[numNits].hasTransponder = false;
+           //printf("NIT[%d] %5d '%s'\n", numNits, nits[numNits].networkId, nits[numNits].name);
+           ThisNIT = numNits;
+           numNits++;
+           }
+        }
+     }
+  else if (networkId != nit.getNetworkId())
+     return; // ignore all other NITs
+  else if (!sectionSyncer.Sync(nit.getVersionNumber(), nit.getSectionNumber(), nit.getLastSectionNumber()))
      return;
   if (!Channels.Lock(true, 10))
      return;
@@ -46,9 +102,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Frequency = BCD2INT(sd->getFrequency()) / 100;
                  static char Polarizations[] = { 'h', 'v', 'l', 'r' };
                  char Polarization = Polarizations[sd->getPolarization()];
-                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE };
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
+                 if (ThisNIT >= 0) {
+                    if (ISTRANSPONDER(Frequency, Transponder())) {
+                       nits[ThisNIT].hasTransponder = true;
+                       //printf("has transponder %d\n", Transponder());
+                       }
+                    break;
+                    }
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
@@ -72,11 +135,18 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Source = cSource::FromData(cSource::stCable);
                  int Frequency = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
-                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE, FEC_NONE };
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256 };
-                 int Modulation = Modulations[sd->getModulation()];
+                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
+                 int Modulation = Modulations[min(sd->getModulation(), 6)];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
+                 if (ThisNIT >= 0) {
+                    if (ISTRANSPONDER(Frequency / 1000, Transponder())) {
+                       nits[ThisNIT].hasTransponder = true;
+                       //printf("has transponder %d\n", Transponder());
+                       }
+                    break;
+                    }
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
@@ -97,21 +167,28 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  break;
             case SI::TerrestrialDeliverySystemDescriptorTag: {
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
-                 int Source = cSource::FromData(cSource::stCable);
+                 int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = sd->getFrequency() * 10;
-                 static int Bandwidths[] = { BANDWIDTH_6_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_8_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
+                 static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
                  int Bandwidth = Bandwidths[sd->getBandwidth()];
                  static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
                  int Constellation = Constellations[sd->getConstellation()];
-                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4 };
+                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
                  int Hierarchy = Hierarchies[sd->getHierarchy()];
-                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_NONE, FEC_NONE, FEC_NONE };
+                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
                  int CodeRateHP = CodeRates[sd->getCodeRateHP()];
                  int CodeRateLP = CodeRates[sd->getCodeRateLP()];
-                 static int GuardIntervals[] = { GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_32 };
+                 static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
                  int GuardInterval = GuardIntervals[sd->getGuardInterval()];
                  static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
                  int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
+                 if (ThisNIT >= 0) {
+                    if (ISTRANSPONDER(Frequency / 1000000, Transponder())) {
+                       nits[ThisNIT].hasTransponder = true;
+                       //printf("has transponder %d\n", Transponder());
+                       }
+                    break;
+                    }
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
diff --git a/nit.h b/nit.h
index e7d987df7..f0655cded 100644
--- a/nit.h
+++ b/nit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.h 1.1 2004/01/11 14:31:05 kls Exp $
+ * $Id: nit.h 1.2 2004/01/18 11:13:48 kls Exp $
  */
 
 #ifndef __NIT_H
@@ -12,9 +12,23 @@
 
 #include "filter.h"
 
+#define MAXNITS 16
+#define MAXNETWORKNAME 256
+
 class cNitFilter : public cFilter {
 private:
+
+  class cNit {
+  public:
+    u_short networkId;
+    char name[MAXNETWORKNAME];
+    bool hasTransponder;
+    };
+
   cSectionSyncer sectionSyncer;
+  cNit nits[MAXNITS];
+  u_short networkId;
+  int numNits;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
diff --git a/pat.c b/pat.c
index 312e2f155..d7cf862c9 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.4 2004/01/05 11:42:30 kls Exp $
+ * $Id: pat.c 1.5 2004/01/16 15:43:34 kls Exp $
  */
 
 #include "pat.h"
@@ -369,7 +369,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                 }
             }
         if (Setup.UpdateChannels >= 2) {
-           Channel->SetPids(Vpid, Ppid, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
+           Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
            Channel->SetCaIds(CaDescriptors->CaIds());
            Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
            }
diff --git a/sdt.c b/sdt.c
index 9d760bf43..6fd331487 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.4 2004/01/11 14:28:28 kls Exp $
+ * $Id: sdt.c 1.7 2004/01/17 17:27:49 kls Exp $
  */
 
 #include "sdt.h"
@@ -53,7 +53,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::ServiceDescriptor *sd = (SI::ServiceDescriptor *)d;
                  switch (sd->getServiceType()) {
                    case 0x01: // digital television service
-                   //XXX TODO case 0x02: // digital radio sound service
+                   case 0x02: // digital radio sound service
                    //XXX TODO case 0x04: // NVOD reference service
                    //XXX TODO case 0x05: // NVOD time-shifted service
                         {
@@ -78,11 +78,13 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                               }
                         *pn = *ps = 0;
                         pn = NameBuf;
-                        if (*NameBuf && *ShortNameBuf) {
+                        if (*NameBuf && *ShortNameBuf && strcmp(NameBuf, ShortNameBuf) != 0) {
                            *ps++ = ',';
                            strcpy(ps, NameBuf);
                            pn = ShortNameBuf;
                            }
+                        pn = compactspace(pn);
+                        ps = compactspace(ps);
                         if (channel) {
                            channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            if (Setup.UpdateChannels >= 1)
diff --git a/svdrp.c b/svdrp.c
index 83847a0ef..4c2390a1d 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.57 2003/12/28 10:09:30 kls Exp $
+ * $Id: svdrp.c 1.58 2004/01/17 13:47:39 kls Exp $
  */
 
 #include "svdrp.h"
@@ -29,6 +29,7 @@
 #include "channels.h"
 #include "config.h"
 #include "device.h"
+#include "eitscan.h"
 #include "keys.h"
 #include "remote.h"
 #include "timers.h"
@@ -251,6 +252,9 @@ const char *HelpPages[] = {
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
   "    by itself terminates the input and starts processing of the data (all\n"
   "    entered data is buffered until the terminating '.' is seen).",
+  "SCAN\n"
+  "    Forces an EPG scan. If this is a single DVB device system, the scan\n"
+  "    will be done on the primary device unless it is currently recording.",
   "STAT disk\n"
   "    Return information about disk usage (total, free, percent).",
   "UPDT <settings>\n"
@@ -954,6 +958,12 @@ void cSVDRP::CmdPUTE(const char *Option)
      DELETENULL(PUTEhandler);
 }
 
+void cSVDRP::CmdSCAN(const char *Option)
+{
+  EITScanner.ForceScan();
+  Reply(250, "EPG scan triggered");
+}
+
 void cSVDRP::CmdSTAT(const char *Option)
 {
   if (*Option) {
@@ -1062,6 +1072,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
+  else if (CMD("SCAN"))  CmdSCAN(s);
   else if (CMD("STAT"))  CmdSTAT(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("VOLU"))  CmdVOLU(s);
diff --git a/svdrp.h b/svdrp.h
index 67918ed5a..815c91efe 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.19 2003/04/27 14:09:59 kls Exp $
+ * $Id: svdrp.h 1.20 2004/01/17 13:30:52 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -73,6 +73,7 @@ class cSVDRP {
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
   void CmdPUTE(const char *Option);
+  void CmdSCAN(const char *Option);
   void CmdSTAT(const char *Option);
   void CmdUPDT(const char *Option);
   void CmdVOLU(const char *Option);
diff --git a/vdr.c b/vdr.c
index fc12f0052..c44498581 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.172 2004/01/04 11:12:05 kls Exp $
+ * $Id: vdr.c 1.174 2004/01/17 16:56:57 kls Exp $
  */
 
 #include <getopt.h>
@@ -52,6 +52,7 @@
 #include "sources.h"
 #include "timers.h"
 #include "tools.h"
+#include "transfer.h"
 #include "videodir.h"
 
 #define MINCHANNELWAIT  10 // seconds to wait between failed channel switchings
@@ -520,7 +521,7 @@ int main(int argc, char *argv[])
                   if (Channel && Channel->Modification(CHANNELMOD_RETUNE)) {
                      cRecordControls::ChannelDataModified(Channel);
                      if (Channel->Number() == cDevice::CurrentChannel()) {
-                        if (!cDevice::PrimaryDevice()->Replaying()) {
+                        if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice()) {
                            isyslog("retuning due to modification of channel %d", Channel->Number());
                            Channels.SwitchTo(Channel->Number());
                            }
@@ -795,6 +796,7 @@ int main(int argc, char *argv[])
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
                        int Channel = timer ? timer->Channel()->Number() : 0;
                        const char *File = timer ? timer->File() : "";
+                       Delta = Next - time(NULL); // compensates for Confirm() timeout
                        char *cmd;
                        asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
                        isyslog("executing '%s'", cmd);

From 7c5ef5dbbada89f55aa15a7c5ac653f4390ce9b4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 Jan 2004 18:00:00 +0100
Subject: [PATCH 095/307] Version 1.3.3 - Completed the Finnish OSD texts
 (thanks to Rolf Ahrenberg). - Added ISO639LanguageDescriptor to 'libsi'. -
 Changed the 'languageCode' members in the descriptor classes of 'libsi' to  
 'char[4]' and setting the 4th byte to 0 for easier handling. - Fixed
 frequency handling when setting the CA descriptors in cDvbTuner::Action()  
 (thanks to Jan Ekholm for reporting and helping to debug this one). - Now
 setting CA descriptors even if "Setup/DVB/Update channels" is less than 2. -
 There can now be up to 32 audio and Dolby PIDs (however, currently still only
   the first two are used throughout the rest of the program). - The audio and
 Dolby PIDs in 'channels.conf' now can have an optional language   code (see
 man vdr(5)). Currently this is only stored and not yet used otherwise. -
 Added a call to cStatus::MsgOsdCurrentItem() to cMenuEditItem::SetValue()  
 (thanks to Martin Hammerschmid).

---
 CONTRIBUTORS       |   3 +
 HISTORY            |  16 ++++
 channels.c         | 179 +++++++++++++++++++++++++++++----------------
 channels.conf      | 164 ++++++++++++++++++++---------------------
 channels.h         |  20 ++---
 config.c           |   4 +-
 config.h           |   6 +-
 dvbdevice.c        |   4 +-
 i18n.c             |  23 +++---
 i18n.h             |   7 +-
 libsi/descriptor.c |  18 ++++-
 libsi/descriptor.h |  23 ++++--
 libsi/si.c         |   6 +-
 menu.c             |  10 +--
 menuitems.c        |   3 +-
 pat.c              |  49 +++++++++++--
 vdr.5              |  12 ++-
 17 files changed, 345 insertions(+), 202 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f07b42074..1f8e02a80 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -51,6 +51,7 @@ Martin Hammerschmid <martin@hammerschmid.com>
  for reporting a problem with a missing initialization of 'number' in cChannel
  for implementing a "resume ID" which allows several users to each have their own
  resume.vdr files
+ for adding a call to cStatus::MsgOsdCurrentItem() to cMenuEditItem::SetValue()
 
 Bastian Guse <bastian@nocopy.de>
  for writing the FORMATS entry for timers.conf
@@ -647,6 +648,8 @@ Teemu Rantanen <tvr@iki.fi>
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
  for reporting a compiler warning in g++ 3.2.3 regarding cReplayControl::Show()
+ for reporting and helping to debug a problem in frequency handling when setting
+ the CA descriptors in cDvbTuner::Action()
 
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
diff --git a/HISTORY b/HISTORY
index a6ded3069..ddabd534a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2610,3 +2610,19 @@ Video Disk Recorder Revision History
   broadcast on.
 - Fixed setting the source type for newly detected terrestrial transponders
   (thanks to Christian Tramnitz for his support in debugging this).
+
+2004-01-25: Version 1.3.3
+
+- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added ISO639LanguageDescriptor to 'libsi'.
+- Changed the 'languageCode' members in the descriptor classes of 'libsi' to
+  'char[4]' and setting the 4th byte to 0 for easier handling.
+- Fixed frequency handling when setting the CA descriptors in cDvbTuner::Action()
+  (thanks to Jan Ekholm for reporting and helping to debug this one).
+- Now setting CA descriptors even if "Setup/DVB/Update channels" is less than 2.
+- There can now be up to 32 audio and Dolby PIDs (however, currently still only
+  the first two are used throughout the rest of the program).
+- The audio and Dolby PIDs in 'channels.conf' now can have an optional language
+  code (see man vdr(5)). Currently this is only stored and not yet used otherwise.
+- Added a call to cStatus::MsgOsdCurrentItem() to cMenuEditItem::SetValue()
+  (thanks to Martin Hammerschmid).
diff --git a/channels.c b/channels.c
index 67ee2b533..d49d7a4d9 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.19 2004/01/11 15:52:32 kls Exp $
+ * $Id: channels.c 1.20 2004/01/25 15:32:08 kls Exp $
  */
 
 #include "channels.h"
@@ -177,10 +177,8 @@ cChannel::cChannel(const cChannel *Channel)
   *name = 0;
   vpid         = 0;
   ppid         = 0;
-  apid1        = 0;
-  apid2        = 0;
-  dpid1        = 0;
-  dpid2        = 0;
+  apids[0]     = 0;
+  dpids[0]     = 0;
   tpid         = 0;
   caids[0]     = 0;
   nid          = 0;
@@ -305,18 +303,62 @@ void cChannel::SetName(const char *Name, bool Log)
      }
 }
 
-void cChannel::SetPids(int Vpid, int Ppid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid)
+static bool IntArraysDiffer(const int *a, const int *b, const char na[][4] = NULL, const char nb[][4] = NULL)
 {
-  //XXX if (vpid != Vpid || ppid != Ppid || apid1 != Apid1 || apid2 != Apid2 || dpid1 != Dpid1 || dpid2 != Dpid2 || tpid != Tpid) {
-  if (vpid != Vpid || ppid != Ppid || apid1 != Apid1 || (Apid2 && apid2 != Apid2) || dpid1 != Dpid1 || dpid2 != Dpid2 || tpid != Tpid) {
-     dsyslog("changing pids of channel %d from %d+%d:%d,%d;%d,%d:%d to %d+%d:%d,%d;%d,%d:%d", Number(), vpid, ppid, apid1, apid2, dpid1, dpid2, tpid, Vpid, Ppid, Apid1, Apid2, Dpid1, Dpid2, Tpid);
+  int i = 0;
+  while (a[i] && b[i]) {
+        if (a[i] != b[i] || na && nb && strcmp(na[i], nb[i]) != 0)
+           return true;
+        i++;
+        }
+  return a[i] != b[i] || a[i] && na && nb && strcmp(na[i], nb[i]) != 0;
+}
+
+static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[][4] = NULL)
+{
+  char *q = s;
+  int i = 0;
+  while (a[i] || i == 0) {
+        q += sprintf(q, Base == 16 ? "%s%X" : "%s%d", i ? "," : "", a[i]);
+        if (n && *n[i])
+           q += sprintf(q, "=%s", n[i]);
+        i++;
+        }
+  *q = 0;
+  return q - s;
+}
+
+void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid)
+{
+  bool modified = vpid != Vpid || ppid != Ppid || tpid != Tpid;
+  if (!modified)
+     modified = IntArraysDiffer(apids, Apids, alangs, ALangs) || IntArraysDiffer(dpids, Dpids, dlangs, DLangs);
+  if (modified) {
+     char OldApidsBuf[MAXAPIDS * 2 * 10 + 10]; // 2: Apids and Dpids, 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
+     char NewApidsBuf[MAXAPIDS * 2 * 10 + 10];
+     char *q = OldApidsBuf;
+     q += IntArrayToString(q, apids, 10, alangs);
+     if (dpids[0]) {
+        *q++ = ';';
+        q += IntArrayToString(q, dpids, 10, dlangs);
+        }
+     *q = 0;
+     q = NewApidsBuf;
+     q += IntArrayToString(q, Apids, 10, ALangs);
+     if (Dpids[0]) {
+        *q++ = ';';
+        q += IntArrayToString(q, Dpids, 10, DLangs);
+        }
+     *q = 0;
+     dsyslog("changing pids of channel %d from %d+%d:%s:%d to %d+%d:%s:%d", Number(), vpid, ppid, OldApidsBuf, tpid, Vpid, Ppid, NewApidsBuf, Tpid);
      vpid = Vpid;
      ppid = Ppid;
-     apid1 = Apid1;
-     if (Apid2)//XXX should we actually react here?
-     apid2 = Apid2;
-     dpid1 = Dpid1;
-     dpid2 = Dpid2;
+     for (int i = 0; i <= MAXAPIDS; i++) { // <= to copy the terminating 0
+         apids[i] = Apids[i];
+         strn0cpy(alangs[i], ALangs[i], 4);
+         dpids[i] = Dpids[i];
+         strn0cpy(dlangs[i], DLangs[i], 4);
+         }
      tpid = Tpid;
      modification |= CHANNELMOD_PIDS;
      Channels.SetModified();
@@ -327,37 +369,14 @@ void cChannel::SetCaIds(const int *CaIds)
 {
   if (caids[0] && caids[0] <= 0x00FF)
      return; // special values will not be overwritten
-  bool modified = false;
-  for (int i = 0; i < MAXCAIDS; i++) {
-      if (caids[i] != CaIds[i]) {
-         modified = true;
-         break;
-         }
-      if (!caids[i] || !CaIds[i])
-         break;
-      }
-  if (modified) {
+  if (IntArraysDiffer(caids, CaIds)) {
      char OldCaIdsBuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
      char NewCaIdsBuf[MAXCAIDS * 5 + 10];
-     char *qo = OldCaIdsBuf;
-     char *qn = NewCaIdsBuf;
-     int i;
-     for (i = 0; i < MAXCAIDS; i++) {
-         if (i == 0 || caids[i])
-            qo += snprintf(qo, sizeof(OldCaIdsBuf), "%s%X", i > 0 ? "," : "", caids[i]);
-         if (!caids[i])
-            break;
-         }
-     for (i = 0; i < MAXCAIDS; i++) {
-         if (i == 0 || CaIds[i])
-            qn += snprintf(qn, sizeof(NewCaIdsBuf), "%s%X", i > 0 ? "," : "", CaIds[i]);
-         caids[i] = CaIds[i];
-         if (!CaIds[i])
-            break;
-         }
-     caids[i] = 0;
-     *qo = *qn = 0;
+     IntArrayToString(OldCaIdsBuf, caids, 16);
+     IntArrayToString(NewCaIdsBuf, CaIds, 16);
      dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
+     for (int i = 0; i <= MAXCAIDS && CaIds[i]; i++) // <= to copy the terminating 0
+         caids[i] = CaIds[i];
      modification |= CHANNELMOD_CA;
      Channels.SetModified();
      }
@@ -460,24 +479,17 @@ const char *cChannel::ToText(cChannel *Channel)
      if (Channel->ppid && Channel->ppid != Channel->vpid)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
      *q = 0;
-     char apidbuf[MAXAPIDS * 2 * 6 + 10]; // 2: Apids and Dpids, 6: 5 digits plus delimiting ',' or ';', 10: paranoia
+     char apidbuf[MAXAPIDS * 2 * 10 + 10]; // 2: Apids and Dpids, 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
      q = apidbuf;
-     q += snprintf(q, sizeof(apidbuf), "%d", Channel->apid1);
-     if (Channel->apid2)
-        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->apid2);
-     if (Channel->dpid1 || Channel->dpid2)
-        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ";%d", Channel->dpid1);
-     if (Channel->dpid2)
-        q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
+     q += IntArrayToString(q, Channel->apids, 10, Channel->alangs);
+     if (Channel->dpids[0]) {
+        *q++ = ';';
+        q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs);
+        }
      *q = 0;
      char caidbuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
      q = caidbuf;
-     for (int i = 0; i < MAXCAIDS; i++) {
-         if (i == 0 || Channel->caids[i])
-            q += snprintf(q, sizeof(caidbuf), "%s%X", i > 0 ? "," : "", Channel->caids[i]);
-         if (!Channel->caids[i])
-            break;
-         }
+     q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
      asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
@@ -524,9 +536,9 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            caids[1] = 0;
            tpid = 0;
            }
-        vpid  = ppid  = 0;
-        apid1 = apid2 = 0;
-        dpid1 = dpid2 = 0;
+        vpid = ppid = 0;
+        apids[0] = 0;
+        dpids[0] = 0;
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
@@ -540,12 +552,49 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            else
               ppid = vpid;
 
-           p = strchr(apidbuf, ';');
-           if (p)
-              *p++ = 0;
-           sscanf(apidbuf, "%d ,%d ", &apid1, &apid2);
-           if (p)
-              sscanf(p, "%d ,%d ", &dpid1, &dpid2);
+           char *dpidbuf = strchr(apidbuf, ';');
+           if (dpidbuf)
+              *dpidbuf++ = 0;
+           p = apidbuf;
+           char *q;
+           int NumApids = 0;
+           while ((q = strtok(p, ",")) != NULL) {
+                 if (NumApids < MAXAPIDS) {
+                    char *l = strchr(q, '=');
+                    if (l) {
+                       *l++ = 0;
+                       strn0cpy(alangs[NumApids], l, 4);
+                       }
+                    else
+                       *alangs[NumApids] = 0;
+                    apids[NumApids++] = strtol(q, NULL, 10);
+                    }
+                 else
+                    esyslog("ERROR: too many APIDs!"); // no need to set ok to 'false'
+                 p = NULL;
+                 }
+           apids[NumApids] = 0;
+           if (dpidbuf) {
+              char *p = dpidbuf;
+              char *q;
+              int NumDpids = 0;
+              while ((q = strtok(p, ",")) != NULL) {
+                    if (NumDpids < MAXAPIDS) {
+                       char *l = strchr(q, '=');
+                       if (l) {
+                          *l++ = 0;
+                          strn0cpy(dlangs[NumDpids], l, 4);
+                          }
+                       else
+                          *dlangs[NumDpids] = 0;
+                       dpids[NumDpids++] = strtol(q, NULL, 10);
+                       }
+                    else
+                       esyslog("ERROR: too many DPIDs!"); // no need to set ok to 'false'
+                    p = NULL;
+                    }
+              dpids[NumDpids] = 0;
+              }
 
            if (caidbuf) {
               char *p = caidbuf;
diff --git a/channels.conf b/channels.conf
index 7776b3fe4..f5c6dd029 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,92 +1,92 @@
-RTL,RTL Television:12187:hC34:S19.2E:27500:163:104:105:0:12003:1:1089:0
-SAT.1:12480:vC34:S19.2E:27500:1791:1792;1795:34:0:46:133:33:0
-ProSieben:12480:vC34:S19.2E:27500:255:256;257:32:0:898:133:33:0
-RTL2:12187:hC34:S19.2E:27500:166:128:68:0:12020:1:1089:0
-Das Erste:11836:hC34:S19.2E:27500:101:102:104:0:28106:1:1101:0
-Bayerisches FS:11836:hC34:S19.2E:27500:201:202:204:0:28107:1:1101:0
-hessen fernsehen:11836:hC34:S19.2E:27500:301:302:304:0:28108:1:1101:0
-NDR FS MV:12109:hC34:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0
-SR Fernsehen S�dwest:11836:hC34:S19.2E:27500:501:502:504:0:28110:1:1101:0
-WDR K�ln:11836:hC34:S19.2E:27500:601:602:604:0:28111:1:1101:0
-BR-alpha:11836:hC34:S19.2E:27500:701:702:704:0:28112:1:1101:0
-S�DWEST BW:11836:hC34:S19.2E:27500:801:802:804:0:28113:1:1101:0
-Phoenix:11836:hC34:S19.2E:27500:901:902:904:0:28114:1:1101:0
-ZDF:11953:hC34:S19.2E:27500:110:120;125:130:0:28006:1:1079:0
-3sat:11953:hC34:S19.2E:27500:210:220:230:0:28007:1:1079:0
-KiKa:11953:hC34:S19.2E:27500:310:320:330:0:28008:1:1079:0
-arte:11836:hC34:S19.2E:27500:401:402,403:404:0:28109:1:1101:0
-ORF 1:12692:hC56:S19.2E:22000:160:161,162;163:165:1762,D05,1702,1801:13001:1:1117:0
-ORF 2:12692:hC56:S19.2E:22000:500:501;503:505:1762,D05,1702,1801:13002:1:1117:0
-ZDFinfokanal:11953:hC34:S19.2E:27500:610:620:130:0:28011:1:1079:0
-CNN Int.:11778:vC34:S19.2E:27500:165:100:47:0:28522:1:1068:0
-S RTL,Super RTL:12187:hC34:S19.2E:27500:165:120:65:0:12040:1:1089:0
-VOX:12187:hC34:S19.2E:27500:167:136:71:0:12060:1:1089:0
+RTL,RTL Television:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
+SAT.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
+ProSieben:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
+RTL2:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
+Das Erste:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
+Bayerisches FS:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
+hessen fernsehen:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
+NDR FS MV:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
+SR Fernsehen S�dwest:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
+WDR K�ln:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
+BR-alpha:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
+S�DWEST BW:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
+Phoenix:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
+ZDF:11953:hC34:S19.2E:27500:110:120=deu;125=deu:130:3:28006:1:1079:0
+3sat:11953:hC34:S19.2E:27500:210:220=deu:230:0:28007:1:1079:0
+KiKa:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
+arte:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
+ORF 1:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
+ORF 2:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ZDFinfokanal:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
+CNN Int.:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
+S RTL,Super RTL:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
+VOX:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1:12480:vC34:S19.2E:27500:511:512:33:0:899:133:33:0
 NEUN LIVE,NEUN LIVE Television:12480:vC34:S19.2E:27500:767:768:35:0:897:133:33:0
-DSF:12480:vC34:S19.2E:27500:1023:1024:0:0:900:133:33:0
+DSF:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSEurope,Home Shopping Europe:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
-Bloomberg TV Germany:12552:vC56:S19.2E:22000:162:99:0:0:12160:1:1108:0
-EURONEWS:11817:vC34:S19.2E:27500:163:92,93:0:500,100:8004:1:1070:0
-Sky News:11597:vC56:S19.2E:22000:305:306:0:0:28707:1:1026:0
-Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92:38:622,602,100:5020:53:1109:0
-BVN:12574:hC56:S19.2E:22000:515+8190:96:36:0:5025:53:1109:0
-CNBC Europe:12610:vC56:S19.2E:22000:944:945:0:0:12200:1:1112:0
-n-tv:12669:vC56:S19.2E:22000:162:96:55:0:12730:1:1116:0
-Al Jazeera:11567:vC56:S19.2E:22000:55:56:0:0:9021:1:1024:0
-TW1:12692:hC56:S19.2E:22000:166:167:168:0:13013:1:1117:0
-Eurosport:11953:hC34:S19.2E:27500:410:420:430:0:28009:1:1079:0
-EinsExtra:12109:hC34:S19.2E:27500:101:102:0:0:28201:1:1073:0
-EinsFestival:12109:hC34:S19.2E:27500:201:202:0:0:28202:1:1073:0
-EinsMuXx:12109:hC34:S19.2E:27500:301:302:0:0:28203:1:1073:0
+Bloomberg TV Germany:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
+EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:500,100:8004:1:1070:0
+Sky News:11597:vC56:S19.2E:22000:305:306=eng:0:0:28707:1:1026:0
+Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
+BVN:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
+CNBC Europe:12610:vC56:S19.2E:22000:944:945=eng:0:0:12200:1:1112:0
+n-tv:12669:vC56:S19.2E:22000:162:96=deu:55:0:12730:1:1116:0
+Al Jazeera:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
+TW1:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
+Eurosport:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
+EinsExtra:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
+EinsFestival:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
+EinsMuXx:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
 ZDFtheaterkanal:11953:hC34:S19.2E:27500:1110:1120:130:0:28016:1:1079:0
-ZDFdokukanal:11953:hC34:S19.2E:27500:660:670:130:0:28014:1:1079:0
-MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402:404:0:28204:1:1073:0
-RBB Brandenburg:12109:hC34:S19.2E:27500:501:502:504:0:28205:1:1073:0
-RBB Berlin:12109:hC34:S19.2E:27500:601:602:604:0:28206:1:1073:0
+ZDFdokukanal:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
+MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
+RBB Brandenburg:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
+RBB Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-START,PREMIERE START:11797:hC34:S19.2E:27500:255:256:32:1702,1722,1801:8:133:2:0
-PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512,513;515:0:1702,1722,1801:10:133:2:0
-PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792,1793;1795:0:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304,2305:0:1702,1722,1801:43:133:2:0
-PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768,769:0:1702,1722,1801:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280,1281:0:1702,1722,1801:29:133:2:0
-PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536:0:1702,1722,1801:41:133:2:0
-PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024:0:1702,1722,1801:20:133:2:0
-DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560:0:1702,1722,1801:34:133:17:0
+START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1722,1801:8:133:2:0
+PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:0:1702,1722,1801:10:133:2:0
+PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:0:1702,1722,1801:11:133:2:0
+PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:0:1702,1722,1801:43:133:2:0
+PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:0:1702,1722,1801:9:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:0:1702,1722,1801:29:133:2:0
+PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:0:1702,1722,1801:41:133:2:0
+PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:20:133:2:0
+DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1702,1722,1801:34:133:17:0
 :Premiere Direkt
-DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816,2817;2819:0:0:18:133:4:0
+DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024:0:1702,1722,1801:21:133:1:0
+B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256,257:0:1702,1722,1801:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0
+SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:0:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
-Liberty TV.com:12610:vC56:S19.2E:22000:941:943:0:0:12199:1:1112:0
+Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-ProSieben Austria:12051:vC34:S19.2E:27500:161:84:36:0:20002:1:1082:0
-Kabel 1 Schweiz:12051:vC34:S19.2E:27500:162:163:165:0:20003:1:1082:0
-Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167:169:0:20004:1:1082:0
+ProSieben Austria:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
+Kabel 1 Schweiz:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
+Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290:33:0:20001:1:1082:0
-FRANCE 5:12207:vC34:S19.2E:27500:160:80:32:0:8501:1:1090:0
-LCP:12207:vC34:S19.2E:27500:165:100:0:0:8506:1:1090:0
+FRANCE 5:12207:vC34:S19.2E:27500:160:80=fra:32:0:8501:1:1090:0
+LCP:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
 ESCALES:12285:vC34:S19.2E:27500:165:100:0:500,100:17025:1:1094:0
-CANAL CLUB:12324:vC34:S19.2E:27500:160:80:0:0:8612:1:1096:0
-ASTRA-Mosaic:12552:vC56:S19.2E:22000:175:176:0:0:3988:1:1108:0
-ASTRA-Mosaic 2:12552:vC56:S19.2E:22000:179:120:0:0:3987:1:1108:0
-ASTRA-Mosaic 3:12552:vC56:S19.2E:22000:182:169:0:0:3986:1:1108:0
-ASTRA-Mosaic 4:12552:vC56:S19.2E:22000:185:170:0:0:3985:1:1108:0
-ASTRA-Mosaic 5:12552:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
-Chamber TV:12552:vC56:S19.2E:22000:55:56:0:0:12180:1:1108:0
-RTL TELE Letzebuerg:12552:vC56:S19.2E:22000:168:144,146:74:0:3994:1:1108:0
-Yorin:12574:hC56:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0
-MTV2 Pop Channel:12226:hC34:S19.2E:27500:513:661:577:0:28640:1:1091:0
+CANAL CLUB:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
+ASTRA-Mosaic:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
+ASTRA-Mosaic 2:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
+ASTRA-Mosaic 3:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
+ASTRA-Mosaic 4:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
+ASTRA-Mosaic 5:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
+Chamber TV:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
+RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
+Yorin:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,602,100:5010:53:1109:0
+MTV2 Pop Channel:12226:hC34:S19.2E:27500:513:661=deu:577:0:28640:1:1091:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
-VIVA:12669:vC56:S19.2E:22000:309:310:311:0:12732:1:1116:0
-VIVA PLUS:12552:vC56:S19.2E:22000:171:172:173:0:12120:1:1108:0
+VIVA:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
+VIVA PLUS:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
 MTV Central:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-QVC GERMANY:12552:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
+QVC GERMANY:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5:12480:vC34:S19.2E:27500:1535:1536:38:0:51:133:33:0
 :@201 Sky
 Sky One:106:h:S28.2E:0:160:80:0:30:222:0:0:0
@@ -95,14 +95,14 @@ itv2:226:h:S28.2E:0:160:80:0:30:451:0:0:0
 sci-fi:130:h:S28.2E:0:160:80:0:30:161:0:0:0
 Paramount Comedy:127:h:S28.2E:0:160:80:0:30:185:0:0:0
 :@900 Some 'seed' channels
-Chelsea TV:11778:vC23:S28.2E:27500:2308+2304:2309:0:960,961:9307:2:2004:0
-Sky One:12285:vC23:S28.2E:27500:2311+2304:2312,2313:2307:960,961:4703:2:2030:0
-WDR M�nster:12421:hC34:S19.2E:27500:101:102:104:0:28310:1:1201:0
-Going Places:10920:hC56:S28.2E:22000:2310+2304:2311:2312:0:5008:2:2055:0
-Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316:0:960,961:50002:2:2019:0
-S1T:12285:vC23:S28.2E:27500:2311+2304:2312,2313:2314:960,961:4409:2:2030:0
-CNN:12051:vC23:S28.2E:27500:2309:2311:2310:0:7140:2:2018:0
-BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308,2309:2307:0:7300:2:2022:0
-AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+Chelsea TV:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
+Sky One:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4703:2:2030:0
+WDR M�nster:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
+Going Places:10920:hC56:S28.2E:22000:2310+2304:2311=eng:2312:0:5008:2:2055:0
+Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
+S1T:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2314:960,961:4409:2:2030:0
+CNN:12051:vC23:S28.2E:27500:2309:2311=eng:2310:0:7140:2:2018:0
+BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308=eng,2309=eng:2307:0:7300:2:2022:0
+AL HAYAT:11200:vC56:S13.0E:27500:413:414=eng:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 :@1000 New channels
diff --git a/channels.h b/channels.h
index 64c05ebe5..532a1121a 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.12 2004/01/11 15:20:18 kls Exp $
+ * $Id: channels.h 1.13 2004/01/25 15:31:16 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -26,7 +26,7 @@
 #define CHANNELMOD_TRANSP   0x20
 #define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA | CHANNELMOD_TRANSP)
 
-#define MAXAPIDS  2
+#define MAXAPIDS 32
 #define MAXCAIDS  8
 
 struct tChannelParameterMap {
@@ -79,8 +79,10 @@ class cChannel : public cListObject {
   int srate;
   int vpid;
   int ppid;
-  int apid1, apid2;
-  int dpid1, dpid2;
+  int apids[MAXAPIDS + 1]; // list is zero-terminated
+  char alangs[MAXAPIDS][4];
+  int dpids[MAXAPIDS + 1]; // list is zero-terminated
+  char dlangs[MAXAPIDS][4];
   int tpid;
   int caids[MAXCAIDS + 1]; // list is zero-terminated
   int nid;
@@ -116,10 +118,10 @@ class cChannel : public cListObject {
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
   int Ppid(void) const { return ppid; }
-  int Apid1(void) const { return apid1; }
-  int Apid2(void) const { return apid2; }
-  int Dpid1(void) const { return dpid1; }
-  int Dpid2(void) const { return dpid2; }
+  int Apid1(void) const { return apids[0]; }
+  int Apid2(void) const { return apids[1]; }
+  int Dpid1(void) const { return dpids[0]; }
+  int Dpid2(void) const { return dpids[1]; }
   int Tpid(void) const { return tpid; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
   int Nid(void) const { return nid; }
@@ -148,7 +150,7 @@ class cChannel : public cListObject {
   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, bool Log = true);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0, bool Log = true);
   void SetName(const char *Name, bool Log = true);
-  void SetPids(int Vpid, int Ppid, int Apid1, int Apid2, int Dpid1, int Dpid2, int Tpid);
+  void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
   };
diff --git a/config.c b/config.c
index 6caf587a2..f6814e84f 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.120 2004/01/11 15:38:11 kls Exp $
+ * $Id: config.c 1.121 2004/01/25 14:41:10 kls Exp $
  */
 
 #include "config.h"
@@ -403,7 +403,7 @@ void cSetup::StoreLanguages(const char *Name, int *Values)
   for (int i = 0; i < I18nNumLanguages; i++) {
       if (Values[i] < 0)
          break;
-      const char *s = I18nLanguageAbbreviation(Values[i]);
+      const char *s = I18nLanguageCode(Values[i]);
       if (s) {
          if (q > buffer)
             *q++ = ' ';
diff --git a/config.h b/config.h
index 0a49f3fae..332c29638 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.183 2004/01/11 21:42:23 kls Exp $
+ * $Id: config.h 1.184 2004/01/24 10:03:55 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.2"
-#define VDRVERSNUM   10302  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.3"
+#define VDRVERSNUM   10303  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index cddde8e27..01a9a6c6b 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.78 2004/01/10 12:21:41 kls Exp $
+ * $Id: dvbdevice.c 1.79 2004/01/25 13:50:21 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -272,7 +272,7 @@ void cDvbTuner::Action(void)
            if (ciHandler->Process() && useCa) {
               if (tunerStatus == tsLocked) {
                  for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) {
-                     cCiCaPmt CaPmt(channel.Source(), channel.Frequency(), channel.Sid(), ciHandler->GetCaSystemIds(Slot));
+                     cCiCaPmt CaPmt(channel.Source(), channel.Transponder(), channel.Sid(), ciHandler->GetCaSystemIds(Slot));
                      if (CaPmt.Valid()) {
                         CaPmt.AddPid(channel.Vpid(), 2);
                         CaPmt.AddPid(channel.Apid1(), 4);
diff --git a/i18n.c b/i18n.c
index a92630eb7..f87827b63 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.143 2004/01/17 14:39:38 kls Exp $
+ * $Id: i18n.c 1.146 2004/01/25 14:41:02 kls Exp $
  *
  * Translations provided by:
  *
@@ -827,7 +827,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "P�ivit�",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -4233,24 +4233,27 @@ const char * const * I18nCharSets(void)
   return &Phrases[1][0];
 }
 
-const char * I18nLanguageAbbreviation(int Index)
+const char * I18nLanguageCode(int Index)
 {
-  return Index < I18nNumLanguages ? Phrases[2][Index] : NULL;
+  return 0 <= Index && Index < I18nNumLanguages ? Phrases[2][Index] : NULL;
 }
 
-int I18nLanguageIndex(const char Code[3])
+int I18nLanguageIndex(const char *Code)
 {
-  char s[4];
-  memcpy(s, Code, 3);
-  s[3] = 0;
   for (int i = 0; i < I18nNumLanguages; i++) {
-      if (strcasestr(Phrases[2][i], s))
+      if (strcasestr(Phrases[2][i], Code))
          return i;
       }
-  //dsyslog("unknown language code: '%s'", s);
+  //dsyslog("unknown language code: '%s'", Code);
   return -1;
 }
 
+const char *I18nNormalizeLanguageCode(const char *Code)
+{
+  int n = I18nLanguageIndex(Code);
+  return n >= 0 ? I18nLanguageCode(n) : Code;
+}
+
 bool I18nIsPreferredLanguage(int *PreferredLanguages, int LanguageIndex, int &OldPreference)
 {
   for (int i = 0; i < I18nNumLanguages; i++) {
diff --git a/i18n.h b/i18n.h
index 26957645b..ff990025a 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.9 2004/01/16 12:43:47 kls Exp $
+ * $Id: i18n.h 1.11 2004/01/25 14:40:50 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -22,8 +22,9 @@ const char *I18nTranslate(const char *s, const char *Plugin = NULL);
 
 const char * const * I18nLanguages(void);
 const char * const * I18nCharSets(void);
-const char * I18nLanguageAbbreviation(int Index);
-int I18nLanguageIndex(const char Code[3]);
+const char * I18nLanguageCode(int Index);
+int I18nLanguageIndex(const char *Code);
+const char *I18nNormalizeLanguageCode(const char *Code);
 bool I18nIsPreferredLanguage(int *PreferredLanguages, int LanguageIndex, int &OldPreference);
 
 #ifdef PLUGIN_NAME_I18N
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 4f4ef341a..55a6a9c0c 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.3 2004/01/12 16:17:20 kls Exp $
+ *   $Id: descriptor.c 1.5 2004/01/24 14:52:41 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -22,6 +22,7 @@ void ShortEventDescriptor::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
    name.setDataAndOffset(data+offset, s->event_name_length, offset);
    const descr_short_event_mid *mid;
    data.setPointerAndOffset<const descr_short_event_mid>(mid, offset);
@@ -42,6 +43,7 @@ void ExtendedEventDescriptor::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
    itemLoop.setDataAndOffset(data+offset, s->length_of_items, offset);
    const descr_extended_event_mid *mid;
    data.setPointerAndOffset<const descr_extended_event_mid>(mid, offset);
@@ -183,6 +185,7 @@ void ParentalRatingDescriptor::Rating::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
 }
 
 int CaDescriptor::getCaType() const {
@@ -398,6 +401,7 @@ void ComponentDescriptor::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
    description.setData(data+offset, getLength()-offset);
 }
 
@@ -462,6 +466,7 @@ void MultilingualNameDescriptor::Name::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
    name.setData(data+offset, s->text_length);
 }
 
@@ -486,6 +491,7 @@ void MultilingualServiceNameDescriptor::Name::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
    providerName.setDataAndOffset(data+offset, s->text_length, offset);
    const entry_multilingual_service_name_mid *mid;
    data.setPointerAndOffset<const entry_multilingual_service_name_mid>(mid, offset);
@@ -514,6 +520,15 @@ LinkageType LinkageDescriptor::getLinkageType() const {
    return (LinkageType)s->linkage_type;
 }
 
+void ISO639LanguageDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_iso_639_language>(s, offset);
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
+}
+
 void ApplicationSignallingDescriptor::Parse() {
    entryLoop.setData(data+sizeof(descr_application_signalling), getLength()-sizeof(descr_application_signalling));
 }
@@ -582,6 +597,7 @@ void MHP_ApplicationNameDescriptor::NameEntry::Parse() {
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
 }
 
 int MHP_TransportProtocolDescriptor::getProtocolId() const {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 3eb90fa2d..5541cc416 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.3 2004/01/12 16:17:47 kls Exp $
+ *   $Id: descriptor.h 1.5 2004/01/24 14:52:05 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -20,7 +20,7 @@ namespace SI {
 
 class ShortEventDescriptor : public Descriptor {
 public:
-   char languageCode[3];
+   char languageCode[4];
    String name; //name of the event
    String text; //short description
 protected:
@@ -37,7 +37,7 @@ class ExtendedEventDescriptor : public GroupDescriptor {
    protected:
       virtual void Parse();
    };
-   char languageCode[3];
+   char languageCode[4];
    int getDescriptorNumber();
    int getLastDescriptorNumber();
    StructureLoop<Item> itemLoop;
@@ -93,7 +93,7 @@ class ParentalRatingDescriptor : public Descriptor {
 public:
    class Rating : public LoopElement {
    public:
-      char languageCode[3];
+      char languageCode[4];
       int getRating() const;
       virtual int getLength() { return sizeof(parental_rating); }
    protected:
@@ -258,7 +258,7 @@ class ComponentDescriptor : public Descriptor {
    int getStreamContent() const;
    int getComponentType() const;
    int getComponentTag() const;
-   char languageCode[3];
+   char languageCode[4];
    String description;
 protected:
    virtual void Parse();
@@ -317,7 +317,7 @@ class MultilingualNameDescriptor : public Descriptor {
 public:
    class Name : public LoopElement {
    public:
-      char languageCode[3];
+      char languageCode[4];
       String name;
       virtual int getLength() { return sizeof(entry_multilingual_name)+name.getLength(); }
    protected:
@@ -374,6 +374,15 @@ class LinkageDescriptor : public Descriptor {
    const descr_linkage *s;
 };
 
+class ISO639LanguageDescriptor : public Descriptor {
+public:
+   char languageCode[4];
+protected:
+   virtual void Parse();
+private:
+   const descr_iso_639_language *s;
+};
+
 //a descriptor currently unimplemented in this library
 class UnimplementedDescriptor : public Descriptor {
 protected:
@@ -427,7 +436,7 @@ class MHP_ApplicationNameDescriptor : public Descriptor {
    class NameEntry : public LoopElement {
    public:
       virtual int getLength() { return sizeof(descr_application_name_entry)+name.getLength(); }
-      char languageCode[3];
+      char languageCode[4];
       String name;
    protected:
       virtual void Parse();
diff --git a/libsi/si.c b/libsi/si.c
index 4342097f6..4264feb63 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.5 2004/01/12 22:19:34 kls Exp $
+ *   $Id: si.c 1.6 2004/01/23 14:27:45 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -323,6 +323,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case LinkageDescriptorTag:
             d=new LinkageDescriptor();
             break;
+         case ISO639LanguageDescriptorTag:
+            d=new ISO639LanguageDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -335,7 +338,6 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case DataStreamAlignmentDescriptorTag:
          case TargetBackgroundGridDescriptorTag:
          case VideoWindowDescriptorTag:
-         case ISO639LanguageDescriptorTag:
          case SystemClockDescriptorTag:
          case MultiplexBufferUtilizationDescriptorTag:
          case CopyrightDescriptorTag:
diff --git a/menu.c b/menu.c
index 8526f36b8..f30d55a78 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.281 2004/01/17 14:17:00 kls Exp $
+ * $Id: menu.c 1.282 2004/01/24 13:22:04 kls Exp $
  */
 
 #include "menu.h"
@@ -577,10 +577,10 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
   Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Ppid"),         &data.ppid,  0, 0x1FFF));
-  Add(new cMenuEditIntItem( tr("Apid1"),        &data.apid1, 0, 0x1FFF));
-  Add(new cMenuEditIntItem( tr("Apid2"),        &data.apid2, 0, 0x1FFF));
-  Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpid1, 0, 0x1FFF));
-  Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpid2, 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Apid1"),        &data.apids[0], 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Apid2"),        &data.apids[1], 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpids[0], 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpids[1], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
   Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0], true));//XXX
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 0));
diff --git a/menuitems.c b/menuitems.c
index d680ff9c6..e66415418 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.13 2003/04/12 09:21:33 kls Exp $
+ * $Id: menuitems.c 1.14 2004/01/25 15:40:55 kls Exp $
  */
 
 #include "menuitems.h"
@@ -37,6 +37,7 @@ void cMenuEditItem::SetValue(const char *Value)
   asprintf(&buffer, "%s:\t%s", name, value);
   SetText(buffer, false);
   Display();
+  cStatus::MsgOsdCurrentItem(buffer);
 }
 
 // --- cMenuEditIntItem ------------------------------------------------------
diff --git a/pat.c b/pat.c
index d7cf862c9..9b27bdae7 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.5 2004/01/16 15:43:34 kls Exp $
+ * $Id: pat.c 1.7 2004/01/25 15:12:53 kls Exp $
  */
 
 #include "pat.h"
@@ -109,7 +109,7 @@ bool cCaDescriptors::Is(int Source, int Transponder, int ServiceId)
   return source == Source && transponder == Transponder && serviceId == ServiceId;
 }
 
-bool cCaDescriptors::Is(cCaDescriptors * CaDescriptors)
+bool cCaDescriptors::Is(cCaDescriptors *CaDescriptors)
 {
   return Is(CaDescriptors->source, CaDescriptors->transponder, CaDescriptors->serviceId);
 }
@@ -324,6 +324,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS] = { 0 };
         int Dpids[MAXAPIDS] = { 0 };
+        char ALangs[MAXAPIDS][4];
+        char DLangs[MAXAPIDS][4];
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
@@ -337,28 +339,59 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               case 3: // STREAMTYPE_11172_AUDIO
               case 4: // STREAMTYPE_13818_AUDIO
                       {
-                      if (NumApids < MAXAPIDS)
-                         Apids[NumApids++] = stream.getPid();
+                      if (NumApids < MAXAPIDS) {
+                         Apids[NumApids] = stream.getPid();
+                         *ALangs[NumApids] = 0;
+                         SI::Descriptor *d;
+                         for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                             switch (d->getDescriptorTag()) {
+                               case SI::ISO639LanguageDescriptorTag: {
+                                    SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                    if (*ld->languageCode != '-') { // some use "---" to indicate "none"
+                                       strn0cpy(ALangs[NumApids], I18nNormalizeLanguageCode(ld->languageCode), 4);
+                                       ALangs[NumApids][4] = 0;
+                                       }
+                                    }
+                                    break;
+                               default: ;
+                               }
+                             delete d;
+                             }
+                         NumApids++;
+                         }
                       }
                       break;
               case 5: // STREAMTYPE_13818_PRIVATE
               case 6: // STREAMTYPE_13818_PES_PRIVATE
               //XXX case 8: // STREAMTYPE_13818_DSMCC
                       {
+                      int dpid = 0;
+                      char lang[4] = { 0 };
                       SI::Descriptor *d;
                       for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                           switch (d->getDescriptorTag()) {
                             case SI::AC3DescriptorTag:
-                                 if (NumDpids < MAXAPIDS)
-                                    Dpids[NumDpids++] = stream.getPid();
+                                 dpid = stream.getPid();
                                  break;
                             case SI::TeletextDescriptorTag:
                                  Tpid = stream.getPid();
                                  break;
+                            case SI::ISO639LanguageDescriptorTag: {
+                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), 4);
+                                 }
+                                 break;
                             default: ;
                             }
                           delete d;
                           }
+                      if (dpid) {
+                         if (NumDpids < MAXAPIDS) {
+                            Dpids[NumDpids] = dpid;
+                            strn0cpy(DLangs[NumDpids], lang, 4);
+                            NumDpids++;
+                            }
+                         }
                       }
                       break;
               //default: printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());//XXX
@@ -369,10 +402,10 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                 }
             }
         if (Setup.UpdateChannels >= 2) {
-           Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
+           Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid);
            Channel->SetCaIds(CaDescriptors->CaIds());
-           Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
            }
+        Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
         }
      lastPmtScan = 0; // this triggers the next scan
      Channels.Unlock();
diff --git a/vdr.5 b/vdr.5
index 10597f55c..7f8626ecf 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.22 2004/01/05 15:26:33 kls Exp $
+.\" $Id: vdr.5 1.23 2004/01/25 14:44:59 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -117,10 +117,18 @@ plus sign, as in
 .B ...:164+17:...
 .TP
 .B APID
-The audio PID (either one number, or two, separated by a comma).
+The audio PID (either one number, or several, separated by commas).
 If this channel also carries Dolby Digital sound, the Dolby PIDs follow
 the audio PIDs, separated by a semicolon, as in
+
 .B ...:101,102;103,104:...
+
+If certain audio PIDs broadcast in specific languages, the language
+codes for these can be appended to the individual audio or Dolby PID, separated
+by an '=' sign, as in
+
+.B ...:101=deu,102=eng;103=deu,104=eng:...
+
 .TP
 .B TPID
 The teletext PID.

From 3fc29659759abb10154b78f9e3568407e523e1fc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Feb 2004 18:00:00 +0100
Subject: [PATCH 096/307] Version 1.3.4 - Fixed handling language codes in case
 there is no audio or Dolby PID. - Fixed handling CA ids (was broken in
 1.3.3). - Fixed the SVDRP command 'STAT DISK' to avoid a 'division by 0' in
 case the   disk is full (thanks to Jens Rosenboom). - Fixed handling bitmap
 indexes for 256 color mode (thanks to Andreas Regel). - Now handling "linked
 services" (based on the 'autopid' patch from Andreas   Schultz). Linked
 channels are detected and added to 'channels.conf', but   currently they are
 not yet presented to the user other than being in the   normal channel list
 (this will come later). - Preliminary fix for the "Unknown picture type
 error" (thanks to Sascha   Volkenandt for his support in debugging this one).
 This may slow down switching   between channels on different transponders for
 now, but a better solution will   come later. - Fixed the validity check for
 channel IDs, because some providers use TIDs with   value 0 (thanks to Thomas
 Bergwinkl). - Enabled switching to a channel even if it has no Vpid or Apid
 set, because these   might be automatically set when tuned to that
 transponder. - No longer closing the Channels menu after trying to switch to
 a channel that   is currently not available. - Removed the now obsolete
 CaCaps stuff. The Setup/CICAM menu now displays the   actual CAM type as
 reported by the CAM. The 'ca.conf' file has been stripped   down to the
 values 0..4.

---
 CONTRIBUTORS        | 12 ++++++
 HISTORY             | 25 ++++++++++++
 README.developer    |  4 +-
 ca.conf             | 83 ----------------------------------------
 channels.c          | 92 ++++++++++++++++++++++++++++++++++++++++++---
 channels.conf       | 10 ++---
 channels.h          | 24 ++++++++++--
 ci.c                | 10 ++++-
 ci.h                |  3 +-
 config.c            | 49 +-----------------------
 config.h            |  9 ++---
 device.c            | 16 +-------
 device.h            |  7 +---
 dvbdevice.c         |  9 ++++-
 eit.c               | 36 +++++++++++++++++-
 fontfix-iso8859-5.c |  1 -
 menu.c              | 21 ++++++-----
 osdbase.c           | 16 ++++----
 osdbase.h           | 12 +++---
 sections.c          |  4 +-
 svdrp.c             |  9 ++---
 vdr.c               |  4 +-
 22 files changed, 245 insertions(+), 211 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1f8e02a80..bc4c2ee5d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -685,6 +685,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for reporting a problem with cReceivers that use a ring buffer and didn't immediately
  return from their Receive() function if the buffer runs full
  for reporting a crash in case there is no DVB hardware present
+ for his support in debugging the the "Unknown picture type error"
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -921,3 +922,14 @@ Christian Tramnitz <maillist@tramnitz.com>
  for terrestrial transponders
  for his support in debugging a problem in setting the source type for newly
  detected terrestrial transponders
+
+Jens Rosenboom <me@jayr.de>
+ for fixing the SVDRP command 'STAT DISK' to avoid a 'division by 0' in case
+ the disk is full
+
+Andreas Regel <andreas.regel@gmx.de>
+ for fixing handling bitmap indexes for 256 color mode
+
+Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
+ for fixing the validity check for channel IDs, because some providers use TIDs
+ with value 0
diff --git a/HISTORY b/HISTORY
index ddabd534a..317be40d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2626,3 +2626,28 @@ Video Disk Recorder Revision History
   code (see man vdr(5)). Currently this is only stored and not yet used otherwise.
 - Added a call to cStatus::MsgOsdCurrentItem() to cMenuEditItem::SetValue()
   (thanks to Martin Hammerschmid).
+
+2004-02-08: Version 1.3.4
+
+- Fixed handling language codes in case there is no audio or Dolby PID.
+- Fixed handling CA ids (was broken in 1.3.3).
+- Fixed the SVDRP command 'STAT DISK' to avoid a 'division by 0' in case the
+  disk is full (thanks to Jens Rosenboom).
+- Fixed handling bitmap indexes for 256 color mode (thanks to Andreas Regel).
+- Now handling "linked services" (based on the 'autopid' patch from Andreas
+  Schultz). Linked channels are detected and added to 'channels.conf', but
+  currently they are not yet presented to the user other than being in the
+  normal channel list (this will come later).
+- Preliminary fix for the "Unknown picture type error" (thanks to Sascha
+  Volkenandt for his support in debugging this one). This may slow down switching
+  between channels on different transponders for now, but a better solution will
+  come later.
+- Fixed the validity check for channel IDs, because some providers use TIDs with
+  value 0 (thanks to Thomas Bergwinkl).
+- Enabled switching to a channel even if it has no Vpid or Apid set, because these
+  might be automatically set when tuned to that transponder.
+- No longer closing the Channels menu after trying to switch to a channel that
+  is currently not available.
+- Removed the now obsolete CaCaps stuff. The Setup/CICAM menu now displays the
+  actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped
+  down to the values 0..4.
diff --git a/README.developer b/README.developer
index d079d6375..4fe75c812 100644
--- a/README.developer
+++ b/README.developer
@@ -30,7 +30,7 @@ Here's a list of the highlights - and what _not_ to expect yet
   to have them start at some high number.
 - Improved CAM support. Channels with conditional access now automatically
   use the device that contains the proper CAM.
-- No NVOD or "linked services" support yet.
+- No NVOD support yet.
 
 Note that this is currently work in progress, so there may be some
 areas that don't work as smooth as expected, yet.
@@ -47,7 +47,7 @@ Known issues:
 
   EURO1080:12168:v:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 
-  in your 'channels.conf' file. Note the Ca parameter 'F' (255 in hex),
+  in your 'channels.conf' file. Note the Ca parameter 'FF' (255 in hex),
   which gives this channel a non-existent Ca mode, so that it won't
   be tuned to at all. If you really want to tune to this channel for
   tests, do it on your own risk.
diff --git a/ca.conf b/ca.conf
index af208f506..e4bab6681 100644
--- a/ca.conf
+++ b/ca.conf
@@ -9,89 +9,6 @@
 
 0      Free To Air
 
-# BetaCrypt
-
-101    Premiere World
-102    ORF
-103    DIGI-Kabel
-
-# Cryptoworks
-
-201    GOD-DIGITAL
-202    Slovak Link
-203    Czech Link
-
-# Videoguard
-
-301    Sky Digital
-
-# Viaccess 1
-
-401    SRG Swiss
-402    NTV Plus
-403    Viasat
-404    Parabole Reunion
-405    Hrvatska radiotelevizija
-406    RTV Slovenija
-407    Visat
-
-# Viaccess 2
-
-501    Alpha Digital Greece
-
-# Cryptoworks
-
-601    UPC Direct
-602    DigiTurk
-
-# Mediaguard
-
-701    CanalSatellite Reunion
-
-# Mediaguard 2
-
-801    Orbit Network
-
-# Nagravision
-
-901    PolSat Cyfrowy
-902    TV Cabo
-
-# Irdeto 2
-
-1001   ADD
-1002   Nova Greece
-1003   Multichoice Africa
-
-# Conax
-
-1101 Canal Digital Scandinavia
-
-# Mediaguard, Viaccess 1, Viaccess 2
-
-10001  AB Sat France
-10002  TPS France
-
-# Videoguard, Mediaguard 2, Irdeto 2
-
-12001  Sky Italia
-
-# Mediaguard 1, Irdeto 1
-
-13001  Canal Digitaal Satelliet NL
-
-# Mediaguard 1, Mediaguard 2, Viaccess 1
-
-14001  Canal Satellite France
-
-# Mediaguard 2, Nagravision
-
-15001  Digital+ Espana
-
-# Mediaguard 2, Cryptoworks
-
-16001  Cyfra+ Polska
-
 # Special values to "hard code" a channel to a specific DVB card:
 
 1      DVB 1
diff --git a/channels.c b/channels.c
index d49d7a4d9..b5bd9bd4f 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.20 2004/01/25 15:32:08 kls Exp $
+ * $Id: channels.c 1.23 2004/02/08 11:05:22 kls Exp $
  */
 
 #include "channels.h"
@@ -169,11 +169,13 @@ cChannel::cChannel(void)
   guard        = GUARD_INTERVAL_AUTO;
   hierarchy    = HIERARCHY_AUTO;
   modification = CHANNELMOD_NONE;
+  linkChannels = NULL;
+  refChannel   = NULL;
 }
 
-cChannel::cChannel(const cChannel *Channel)
+cChannel::cChannel(const cChannel &Channel)
 {
-  *this = *Channel;
+  *this = Channel;
   *name = 0;
   vpid         = 0;
   ppid         = 0;
@@ -188,6 +190,28 @@ cChannel::cChannel(const cChannel *Channel)
   number       = 0;
   groupSep     = false;
   modification = CHANNELMOD_NONE;
+  linkChannels = NULL;
+  refChannel   = NULL;
+}
+
+cChannel::~cChannel()
+{
+  delete linkChannels;
+  linkChannels = NULL; // more than one channel can link to this one, so we need the following loop
+  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+      if (Channel->linkChannels) {
+         for (cLinkChannel *lc = Channel->linkChannels->First(); lc; lc = Channel->linkChannels->Next(lc)) {
+             if (lc->Channel() == this) {
+                Channel->linkChannels->Del(lc);
+                break;
+                }
+             }
+         if (Channel->linkChannels->Count() == 0) {
+            delete Channel->linkChannels;
+            Channel->linkChannels = NULL;
+            }
+         }
+      }
 }
 
 cChannel& cChannel::operator= (const cChannel &Channel)
@@ -320,8 +344,10 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
   int i = 0;
   while (a[i] || i == 0) {
         q += sprintf(q, Base == 16 ? "%s%X" : "%s%d", i ? "," : "", a[i]);
-        if (n && *n[i])
+        if (a[i] && n && *n[i])
            q += sprintf(q, "=%s", n[i]);
+        if (!a[i])
+           break;
         i++;
         }
   *q = 0;
@@ -375,8 +401,11 @@ void cChannel::SetCaIds(const int *CaIds)
      IntArrayToString(OldCaIdsBuf, caids, 16);
      IntArrayToString(NewCaIdsBuf, CaIds, 16);
      dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
-     for (int i = 0; i <= MAXCAIDS && CaIds[i]; i++) // <= to copy the terminating 0
+     for (int i = 0; i <= MAXCAIDS; i++) { // <= to copy the terminating 0
          caids[i] = CaIds[i];
+         if (!CaIds[i])
+            break;
+         }
      modification |= CHANNELMOD_CA;
      Channels.SetModified();
      }
@@ -392,6 +421,57 @@ void cChannel::SetCaDescriptors(int Level)
      }
 }
 
+void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
+{
+  if (!linkChannels && !LinkChannels)
+     return;
+  if (linkChannels && LinkChannels) {
+     cLinkChannel *lca = linkChannels->First();
+     cLinkChannel *lcb = LinkChannels->First();
+     while (lca && lcb) {
+           if (lca->Channel() != lcb->Channel()) {
+              lca = NULL;
+              break;
+              }
+           lca = linkChannels->Next(lca);
+           lcb = LinkChannels->Next(lcb);
+           }
+     if (!lca && !lcb) {
+        delete LinkChannels;
+        return; // linkage has not changed
+        }
+     }
+  char buffer[((linkChannels ? linkChannels->Count() : 0) + (LinkChannels ? LinkChannels->Count() : 0)) * 6 + 256]; // 6: 5 digit channel number plus blank, 256: other texts (see below) plus reserve
+  char *q = buffer;
+  q += sprintf(q, "linking channel %d from", Number());
+  if (linkChannels) {
+     for (cLinkChannel *lc = linkChannels->First(); lc; lc = linkChannels->Next(lc)) {
+         lc->Channel()->SetRefChannel(NULL);
+         q += sprintf(q, " %d", lc->Channel()->Number());
+         }
+     delete linkChannels;
+     }
+  else
+     q += sprintf(q, " none");
+  q += sprintf(q, " to");
+  linkChannels = LinkChannels;
+  if (linkChannels) {
+     for (cLinkChannel *lc = linkChannels->First(); lc; lc = linkChannels->Next(lc)) {
+         lc->Channel()->SetRefChannel(this);
+         q += sprintf(q, " %d", lc->Channel()->Number());
+         //dsyslog("link %4d -> %4d: %s", Number(), lc->Channel()->Number(), lc->Channel()->Name());
+         }
+     }
+  else
+     q += sprintf(q, " none");
+  dsyslog(buffer);
+}
+
+void cChannel::SetRefChannel(cChannel *RefChannel)
+{
+  refChannel = RefChannel;
+}
+
 static int PrintParameter(char *p, char Name, int Value)
 {
   return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
@@ -771,7 +851,7 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, i
 {
   if (Transponder) {
      dsyslog("creating new channel '%s' on %s transponder %d with id %d-%d-%d-%d", Name, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
-     cChannel *NewChannel = new cChannel(Transponder);
+     cChannel *NewChannel = new cChannel(*Transponder);
      Add(NewChannel);
      ReNumber();
      NewChannel->SetId(Nid, Tid, Sid, Rid, false);
diff --git a/channels.conf b/channels.conf
index f5c6dd029..e7aa7f3a7 100644
--- a/channels.conf
+++ b/channels.conf
@@ -11,7 +11,7 @@ WDR K
 BR-alpha:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST BW:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
-ZDF:11953:hC34:S19.2E:27500:110:120=deu;125=deu:130:3:28006:1:1079:0
+ZDF:11953:hC34:S19.2E:27500:110:120=deu;125=deu:130:0:28006:1:1079:0
 3sat:11953:hC34:S19.2E:27500:210:220=deu:230:0:28007:1:1079:0
 KiKa:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
@@ -30,7 +30,7 @@ EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,9
 Sky News:11597:vC56:S19.2E:22000:305:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
-CNBC Europe:12610:vC56:S19.2E:22000:944:945=eng:0:0:12200:1:1112:0
+CNBC Europe:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
 n-tv:12669:vC56:S19.2E:22000:162:96=deu:55:0:12730:1:1116:0
 Al Jazeera:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
@@ -47,7 +47,7 @@ RBB Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1722,1801:8:133:2:0
 PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:0:1702,1722,1801:10:133:2:0
 PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:0:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:0:1702,1722,1801:43:133:2:0
+PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:0:1702,1722,1801:43:133:2:0
 PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:0:1702,1722,1801:9:133:2:0
 PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:0:1702,1722,1801:29:133:2:0
 PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:0:1702,1722,1801:41:133:2:0
@@ -59,7 +59,7 @@ DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0
 B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
+Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
 SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:0:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
@@ -68,7 +68,7 @@ Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 ProSieben Austria:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
-ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290:33:0:20001:1:1082:0
+ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
 FRANCE 5:12207:vC34:S19.2E:27500:160:80=fra:32:0:8501:1:1090:0
 LCP:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
 ESCALES:12285:vC34:S19.2E:27500:165:100:0:500,100:17025:1:1094:0
diff --git a/channels.h b/channels.h
index 532a1121a..6d6dd3a55 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.13 2004/01/25 15:31:16 kls Exp $
+ * $Id: channels.h 1.15 2004/02/08 12:20:22 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -59,13 +59,26 @@ struct tChannelID {
   tChannelID(void) { source = nid = tid = sid = rid = 0; }
   tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
   bool operator== (const tChannelID &arg) const;
-  bool Valid(void) { return tid && sid; } // nid and rid are optional and source may be 0//XXX source may not be 0???
+  bool Valid(void) { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   static tChannelID FromString(const char *s);
   const char *ToString(void);
   static const tChannelID InvalidID;
   };
 
+class cChannel;
+
+class cLinkChannel : public cListObject {
+private:
+  cChannel *channel;
+public:
+  cLinkChannel(cChannel *Channel) { channel = Channel; }
+  cChannel *Channel(void) { return channel; }
+  };
+
+class cLinkChannels : public cList<cLinkChannel> {
+  };
+
 class cChannel : public cListObject {
   friend class cMenuEditChannel;
 private:
@@ -102,11 +115,14 @@ class cChannel : public cListObject {
   int hierarchy;
   int __EndData__;
   int modification;
+  cLinkChannels *linkChannels;
+  cChannel *refChannel;
   const char *ParametersToString(void);
   bool StringToParameters(const char *s);
 public:
   cChannel(void);
-  cChannel(const cChannel *Channel);
+  cChannel(const cChannel &Channel);
+  ~cChannel();
   cChannel& operator= (const cChannel &Channel);
   const char *ToText(void);
   bool Parse(const char *s, bool AllowNonUniqueID = false);
@@ -153,6 +169,8 @@ class cChannel : public cListObject {
   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
+  void SetLinkChannels(cLinkChannels *LinkChannels);
+  void SetRefChannel(cChannel *RefChannel);
   };
 
 class cChannels : public cRwLock, public cConfig<cChannel> {
diff --git a/ci.c b/ci.c
index 760052ded..65ec687fc 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.21 2004/01/02 15:07:36 kls Exp $
+ * $Id: ci.c 1.22 2004/02/08 15:02:04 kls Exp $
  */
 
 #include "ci.h"
@@ -763,6 +763,7 @@ class cCiApplicationInformation : public cCiSession {
   virtual ~cCiApplicationInformation();
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   bool EnterMenu(void);
+  const char *GetMenuString(void) { return menuString; }
   };
 
 cCiApplicationInformation::cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc)
@@ -1559,6 +1560,13 @@ cCiEnquiry *cCiHandler::GetEnquiry(void)
   return NULL;
 }
 
+const char *cCiHandler::GetCamName(int Slot)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiApplicationInformation *ai = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION, Slot);
+  return ai ? ai->GetMenuString() : NULL;
+}
+
 const unsigned short *cCiHandler::GetCaSystemIds(int Slot)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/ci.h b/ci.h
index 71eccd8df..7ae2b96ec 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.12 2003/12/31 13:49:49 kls Exp $
+ * $Id: ci.h 1.13 2004/02/08 14:36:23 kls Exp $
  */
 
 #ifndef __CI_H
@@ -110,6 +110,7 @@ class cCiHandler {
   bool EnterMenu(int Slot);
   cCiMenu *GetMenu(void);
   cCiEnquiry *GetEnquiry(void);
+  const char *GetCamName(int Slot);
   const unsigned short *GetCaSystemIds(int Slot);
   bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot???
   bool SetCaPmt(cCiCaPmt &CaPmt, int Slot);
diff --git a/config.c b/config.c
index f6814e84f..833a2bba4 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.121 2004/01/25 14:41:10 kls Exp $
+ * $Id: config.c 1.122 2004/02/08 15:04:41 kls Exp $
  */
 
 #include "config.h"
@@ -286,7 +286,6 @@ cSetup::cSetup(void)
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
   ResumeID = 0;
-  memset(CaCaps, sizeof(CaCaps), 0);
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
 }
@@ -352,50 +351,6 @@ bool cSetup::Load(const char *FileName)
   return false;
 }
 
-void cSetup::StoreCaCaps(const char *Name)
-{
-  cSetupLine *l;
-  while ((l = Get(Name)) != NULL)
-        Del(l);
-  for (int d = 0; d < MAXDEVICES; d++) {
-      char buffer[MAXPARSEBUFFER];
-      char *q = buffer;
-      *buffer = 0;
-      for (int i = 0; i < MAXCACAPS; i++) {
-          if (CaCaps[d][i]) {
-             if (!*buffer)
-                q += snprintf(buffer, sizeof(buffer), "%d", d + 1);
-             q += snprintf(q, sizeof(buffer) - (q - buffer), " %d", CaCaps[d][i]);
-             }
-          }
-      if (*buffer)
-         Store(Name, buffer, NULL, true);
-      }
-}
-
-bool cSetup::ParseCaCaps(const char *Value)
-{
-  char *p;
-  int d = strtol(Value, &p, 10);
-  if (d > 0 && d <= MAXDEVICES) {
-     d--;
-     int i = 0;
-     while (p != Value && p && *p) {
-           if (i < MAXCACAPS) {
-              int c = strtol(p, &p, 10);
-              if (c > 0)
-                 CaCaps[d][i++] = c;
-              else
-                 return false;
-              }
-           else
-              return false;
-           }
-     return true;
-     }
-  return false;
-}
-
 void cSetup::StoreLanguages(const char *Name, int *Values)
 {
   char buffer[I18nNumLanguages * 4];
@@ -473,7 +428,6 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
   else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
-  else if (!strcasecmp(Name, "CaCaps"))              return ParseCaCaps(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
   else
@@ -525,7 +479,6 @@ bool cSetup::Save(void)
   Store("MultiSpeedMode",     MultiSpeedMode);
   Store("ShowReplayMode",     ShowReplayMode);
   Store("ResumeID",           ResumeID);
-  StoreCaCaps("CaCaps");
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
 
diff --git a/config.h b/config.h
index 332c29638..766126a41 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.184 2004/01/24 10:03:55 kls Exp $
+ * $Id: config.h 1.186 2004/02/08 15:04:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.3"
-#define VDRVERSNUM   10303  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.4"
+#define VDRVERSNUM   10304  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -194,8 +194,6 @@ class cSetupLine : public cListObject {
 class cSetup : public cConfig<cSetupLine> {
   friend class cPlugin; // needs to be able to call Store()
 private:
-  void StoreCaCaps(const char *Name);
-  bool ParseCaCaps(const char *Value);
   void StoreLanguages(const char *Name, int *Values);
   bool ParseLanguages(const char *Value, int *Values);
   bool Parse(const char *Name, const char *Value);
@@ -242,7 +240,6 @@ class cSetup : public cConfig<cSetupLine> {
   int MultiSpeedMode;
   int ShowReplayMode;
   int ResumeID;
-  int CaCaps[MAXDEVICES][MAXCACAPS];
   int CurrentChannel;
   int CurrentVolume;
   int __EndData__;
diff --git a/device.c b/device.c
index 46d9ab8b0..871149e9d 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.52 2004/01/11 13:21:12 kls Exp $
+ * $Id: device.c 1.53 2004/02/08 15:05:11 kls Exp $
  */
 
 #include "device.h"
@@ -56,10 +56,8 @@ cDevice::cDevice(void)
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
 
-  if (numDevices < MAXDEVICES) {
+  if (numDevices < MAXDEVICES)
      device[numDevices++] = this;
-     SetCaCaps(cardIndex);
-     }
   else
      esyslog("ERROR: too many devices!");
 }
@@ -200,16 +198,6 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
   return d;
 }
 
-void cDevice::SetCaCaps(int Index)
-{
-  for (int d = 0; d < numDevices; d++) {
-      if (Index < 0 || Index == device[d]->CardIndex()) {
-         for (int i = 0; i < MAXCACAPS; i++)
-             device[d]->caCaps[i] = Setup.CaCaps[device[d]->CardIndex()][i];
-         }
-      }
-}
-
 void cDevice::Shutdown(void)
 {
   for (int i = 0; i < numDevices; i++) {
diff --git a/device.h b/device.h
index 8599474ad..496e70214 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.38 2004/01/10 14:15:10 kls Exp $
+ * $Id: device.h 1.39 2004/02/08 15:05:49 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -21,7 +21,6 @@
 #include "tools.h"
 
 #define MAXDEVICES         16 // the maximum number of devices in the system
-#define MAXCACAPS          16 // the maximum number of different CA values per device
 #define MAXPIDHANDLES      16 // the maximum number of different PIDs per device
 #define MAXRECEIVERS       16 // the maximum number of receivers per device
 #define MAXVOLUME         255
@@ -97,16 +96,12 @@ class cDevice : public cThread {
          ///< given Priority.
          ///< See ProvidesChannel() for more information on how
          ///< priorities are handled, and the meaning of NeedsDetachReceivers.
-  static void SetCaCaps(int Index = -1);
-         ///< Sets the CaCaps of the given device according to the Setup data.
-         ///< By default the CaCaps of all devices are set.
   static void Shutdown(void);
          ///< Closes down all devices.
          ///< Must be called at the end of the program.
 private:
   static int nextCardIndex;
   int cardIndex;
-  int caCaps[MAXCACAPS];
 protected:
   cDevice(void);
   virtual ~cDevice();
diff --git a/dvbdevice.c b/dvbdevice.c
index 01a9a6c6b..e1d5fc635 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.79 2004/01/25 13:50:21 kls Exp $
+ * $Id: dvbdevice.c 1.81 2004/02/08 14:07:07 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -680,7 +680,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if ((Channel->Vpid() || Channel->Apid1()) && ProvidesSource(Channel->Source()) && ProvidesCa(Channel)) {
+  if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel)) {
      result = hasPriority;
      if (Priority >= 0 && Receiving()) {
         if (dvbTuner->IsTunedTo(Channel)) {
@@ -751,6 +751,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
 
+  //XXX TODO preliminary fix for the "Unknown picture type" error
+  time_t t0 = time(NULL);
+  while (!dvbTuner->Locked() && time(NULL) - t0 < 5)
+        usleep(100);
+  //XXX
   // PID settings:
 
   if (TurnOnLivePIDs) {
diff --git a/eit.c b/eit.c
index d71cad82d..c24a3d0a1 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.85 2004/01/09 15:44:43 kls Exp $
+ * $Id: eit.c 1.86 2004/02/08 10:26:54 kls Exp $
  */
 
 #include "eit.h"
@@ -95,6 +95,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       SI::Descriptor *d;
       SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
       SI::ShortEventDescriptor *ShortEventDescriptor = NULL;
+      cLinkChannels *LinkChannels = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
@@ -138,6 +139,36 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  pEvent->SetDescription(rEvent->Description());
                  }
                  break;
+            case SI::LinkageDescriptorTag: {
+                 SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d;
+                 tChannelID linkID(Source, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                 if (ld->getLinkageType() == 0xB0) { // Premiere World
+                    time_t now = time(NULL);
+                    bool hit = SiEitEvent.getStartTime() <= now && now < SiEitEvent.getStartTime() + SiEitEvent.getDuration();
+                    if (hit) {
+                       cChannel *link = Channels.GetByChannelID(linkID);
+                       if (link != channel) { // only link to other channels, not the same one
+                          char linkName[ld->privateData.getLength() + 1];
+                          strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
+                          //fprintf(stderr, "Linkage %s %4d %4d %5d %5d %5d %5d  %02X  '%s'\n", hit ? "*" : "", channel->Number(), link ? link->Number() : -1, SiEitEvent.getEventId(), ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId(), ld->getLinkageType(), linkName);//XXX
+                          if (link) {
+                             if (Setup.UpdateChannels >= 1)
+                                link->SetName(linkName);
+                             }
+                          else if (Setup.UpdateChannels >= 3) {
+                             link = Channels.NewChannel(channel, linkName, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                             //XXX patFilter->Trigger();
+                             }
+                          if (link) {
+                             if (!LinkChannels)
+                                LinkChannels = new cLinkChannels;
+                             LinkChannels->Add(new cLinkChannel(link));
+                             }
+                          }
+                       }
+                    }
+                 }
+                 break;
             default: ;
             }
           delete d;
@@ -167,6 +198,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          else if (SiEitEvent.getRunningStatus() == SI::RunningStatusStartsInAFewSeconds)
             pSchedule->SetFollowingEvent(pEvent);
          }
+
+      if (LinkChannels)
+         channel->SetLinkChannels(LinkChannels);
       }
 }
 
diff --git a/fontfix-iso8859-5.c b/fontfix-iso8859-5.c
index 08f7fd7c7..51cef2409 100644
--- a/fontfix-iso8859-5.c
+++ b/fontfix-iso8859-5.c
@@ -6048,4 +6048,3 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // 
   },
   };
-  
\ No newline at end of file
diff --git a/menu.c b/menu.c
index f30d55a78..6a7907f71 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.282 2004/01/24 13:22:04 kls Exp $
+ * $Id: menu.c 1.284 2004/02/08 15:06:42 kls Exp $
  */
 
 #include "menu.h"
@@ -723,7 +723,7 @@ eOSState cMenuChannels::Switch(void)
      return osContinue;
   cChannel *ch = GetChannel(Current());
   if (ch)
-     cDevice::PrimaryDevice()->SwitchChannel(ch, true);
+     return cDevice::PrimaryDevice()->SwitchChannel(ch, true) ? osEnd : osContinue;
   return osEnd;
 }
 
@@ -2216,11 +2216,16 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
   helpKeys = -1;
   SetSection(tr("CICAM"));
   for (int d = 0; d < cDevice::NumDevices(); d++) {
-      for (int i = 0; i < 2; i++) {
+      cDevice *Device = cDevice::GetDevice(d);
+      cCiHandler *CiHandler = Device->CiHandler();
+      for (int Slot = 0; Slot < 2; Slot++) {
           char buffer[32];
-          int CardIndex = cDevice::GetDevice(d)->CardIndex();
-          snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, i + 1);
-          Add(new cMenuEditCaItem(buffer, &data.CaCaps[CardIndex][i]));
+          int CardIndex = Device->CardIndex();
+          const char *CamName = CiHandler ? CiHandler->GetCamName(Slot) : NULL;
+          if (!CamName)
+             CamName = "-";
+          snprintf(buffer, sizeof(buffer), "%s%d %d\t%s", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, Slot + 1, CamName);
+          Add(new cOsdItem(buffer));
           }
       }
   SetHelpKeys();
@@ -2275,9 +2280,7 @@ eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
 {
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
-  if (state == osBack && Key == kOk)
-     cDevice::SetCaCaps();
-  else if (state == osUnknown) {
+  if (state == osUnknown) {
      switch (Key) {
        case kRed:    if (helpKeys == 1)
                         return Menu();
diff --git a/osdbase.c b/osdbase.c
index 2ba4de85a..71794068c 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.11 2003/10/19 14:32:32 kls Exp $
+ * $Id: osdbase.c 1.12 2004/01/31 10:31:13 kls Exp $
  */
 
 #include "osdbase.h"
@@ -116,7 +116,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
   fontType = fontOsd;
   font = NULL;
   if (width > 0 && height > 0) {
-     bitmap = MALLOC(char, width * height);
+     bitmap = MALLOC(u_char, width * height);
      if (bitmap) {
         Clean();
         memset(bitmap, 0x00, width * height);
@@ -186,7 +186,7 @@ void cBitmap::Clean(void)
   dirtyY2 = -1;
 }
 
-void cBitmap::SetIndex(int x, int y, char Index)
+void cBitmap::SetIndex(int x, int y, u_char Index)
 {
   if (bitmap) {
      if (0 <= x && x < width && 0 <= y && y < height) {
@@ -231,8 +231,8 @@ int cBitmap::Width(const char *s)
 void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
 {
   if (bitmap) {
-     char fg = Index(ColorFg);
-     char bg = Index(ColorBg);
+     u_char fg = Index(ColorFg);
+     u_char bg = Index(ColorBg);
      int h = font->Height(s);
      while (s && *s) {
            const cFont::tCharData *CharData = font->CharData(*s++);
@@ -253,7 +253,7 @@ void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor Col
 void cBitmap::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
 {
   if (bitmap) {
-     char c = Index(Color);
+     u_char c = Index(Color);
      for (int y = y1; y <= y2; y++)
          for (int x = x1; x <= x2; x++)
              SetIndex(x, y, c);
@@ -267,7 +267,7 @@ void cBitmap::Clear(void)
      Fill(0, 0, width - 1, height - 1, clrBackground);
 }
 
-const char *cBitmap::Data(int x, int y)
+const u_char *cBitmap::Data(int x, int y)
 {
   return &bitmap[y * width + x];
 }
@@ -327,7 +327,7 @@ void cWindow::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor Col
   cBitmap::Text(x, y, s, ColorFg, ColorBg);
 }
 
-const char *cWindow::Data(int x, int y)
+const u_char *cWindow::Data(int x, int y)
 {
   return cBitmap::Data(x, y);
 }
diff --git a/osdbase.h b/osdbase.h
index ce4bc90af..3277d8200 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.8 2004/01/04 14:22:43 kls Exp $
+ * $Id: osdbase.h 1.9 2004/01/31 10:28:49 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -49,7 +49,7 @@ class cPalette {
   bool fetched[MAXNUMCOLORS];
   bool full;
 protected:
-  typedef unsigned char tIndexes[MAXNUMCOLORS];
+  typedef u_char tIndexes[MAXNUMCOLORS];
 public:
   cPalette(int Bpp);
   int Index(eDvbColor Color);
@@ -75,7 +75,7 @@ class cBitmap : public cPalette {
 private:
   const cFont *font;
   eDvbFont fontType;
-  char *bitmap;
+  u_char *bitmap;
   bool clearWithBackground;
 protected:
   int width, height;
@@ -86,7 +86,7 @@ class cBitmap : public cPalette {
   bool ClearWithBackground(void) { return clearWithBackground; }
   eDvbFont SetFont(eDvbFont Font);
   bool Dirty(int &x1, int &y1, int &x2, int &y2);
-  void SetIndex(int x, int y, char Index);
+  void SetIndex(int x, int y, u_char Index);
   void SetPixel(int x, int y, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   int Width(void) { return width; }
@@ -97,7 +97,7 @@ class cBitmap : public cPalette {
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void Clean(void);
   void Clear(void);
-  const char *Data(int x, int y);
+  const u_char *Data(int x, int y);
   };
 
 #define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
@@ -122,7 +122,7 @@ class cWindow : public cBitmap {
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
-  const char *Data(int x, int y);
+  const u_char *Data(int x, int y);
   };
 
 typedef int tWindowHandle;
diff --git a/sections.c b/sections.c
index fb934a8cd..ead623d0e 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.4 2004/01/11 13:22:13 kls Exp $
+ * $Id: sections.c 1.5 2004/02/07 15:51:57 kls Exp $
  */
 
 #include "sections.h"
@@ -133,7 +133,7 @@ void cSectionHandler::Detach(cFilter *Filter)
 void cSectionHandler::SetChannel(const cChannel *Channel)
 {
   Lock();
-  shp->channel = Channel? *Channel : cChannel();
+  shp->channel = Channel ? *Channel : cChannel();
   Unlock();
 }
 
diff --git a/svdrp.c b/svdrp.c
index 4c2390a1d..4ade5ec98 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.58 2004/01/17 13:47:39 kls Exp $
+ * $Id: svdrp.c 1.59 2004/01/31 10:13:50 kls Exp $
  */
 
 #include "svdrp.h"
@@ -968,10 +968,9 @@ void cSVDRP::CmdSTAT(const char *Option)
 {
   if (*Option) {
      if (strcasecmp(Option, "DISK") == 0) {
-        int FreeMB;
-        int Percent = VideoDiskSpace(&FreeMB);
-        int Total = (FreeMB / (100 - Percent)) * 100;
-        Reply(250, "%dMB %dMB %d%%", Total, FreeMB, Percent);
+        int FreeMB, UsedMB;
+        int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
+        Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent);
         }
      else
         Reply(501, "Invalid Option \"%s\"", Option);
diff --git a/vdr.c b/vdr.c
index c44498581..916730795 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.174 2004/01/17 16:56:57 kls Exp $
+ * $Id: vdr.c 1.175 2004/02/08 11:23:29 kls Exp $
  */
 
 #include <getopt.h>
@@ -518,7 +518,7 @@ int main(int argc, char *argv[])
               Channels.Save(); //XXX only after user changes???
               Timers.Save();
               for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                  if (Channel && Channel->Modification(CHANNELMOD_RETUNE)) {
+                  if (Channel->Modification(CHANNELMOD_RETUNE)) {
                      cRecordControls::ChannelDataModified(Channel);
                      if (Channel->Number() == cDevice::CurrentChannel()) {
                         if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice()) {

From 5a4eb3f1041b8a53826cebe570f9d201f3d35826 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 29 Feb 2004 18:00:00 +0100
Subject: [PATCH 097/307] =?UTF-8?q?Version=201.3.5=20-=20Fixed=20reading?=
 =?UTF-8?q?=20the=20EPG=20preferred=20language=20parameter=20from=20'setup?=
 =?UTF-8?q?.conf'.=20-=20Fixed=20switching=20to=20a=20visible=20programme?=
 =?UTF-8?q?=20in=20case=20the=20current=20channel=20has=20neither=20=20=20?=
 =?UTF-8?q?a=20video=20nor=20an=20audio=20PID.=20-=20Fixed=20editing=20cha?=
 =?UTF-8?q?nnels=20(SID=20now=20range=20checked)=20and=20creating=20new=20?=
 =?UTF-8?q?channels=20(NID,=20=20=20TID=20and=20RID=20are=20now=20set=20to?=
 =?UTF-8?q?=200).=20-=20Fixed=20transponder=20handling=20to=20make=20it=20?=
 =?UTF-8?q?work=20with=20satellites=20that=20provide=20two=20=20=20transpo?=
 =?UTF-8?q?nders=20on=20the=20same=20frequency,=20with=20different=20polar?=
 =?UTF-8?q?ization,=20like=20Hispasat=20=20=20at=20S30.0W=20(thanks=20to?=
 =?UTF-8?q?=20Thomas=20Bergwinkl=20for=20pointing=20this=20out).=20See=20m?=
 =?UTF-8?q?an=20vdr(5)=20=20=20for=20details=20about=20the=20enhanced=20ch?=
 =?UTF-8?q?annel=20ID=20format.=20-=20Since=20there=20appears=20to=20be=20?=
 =?UTF-8?q?no=20general=20solution=20for=20the=20UPT=20error=20yet,=20a=20?=
 =?UTF-8?q?recording=20=20=20now=20initiates=20an=20"emergency=20exit"=20i?=
 =?UTF-8?q?f=20the=20number=20of=20UPT=20errors=20during=20one=20=20=20rec?=
 =?UTF-8?q?ording=20exceeds=2010=20(suggested=20by=20Gregoire=20Favre).=20?=
 =?UTF-8?q?Since=20the=20UPT=20error=20doesn't=20=20=20happen=20on=20my=20?=
 =?UTF-8?q?system,=20this=20has=20not=20been=20explicitly=20tested.=20=20?=
 =?UTF-8?q?=20The=20"preliminary=20fix"=20for=20the=20UPT=20error=20in=20V?=
 =?UTF-8?q?DR/dvbdevice.c=20has=20been=20disabled=20=20=20by=20default,=20?=
 =?UTF-8?q?since=20it=20makes=20channel=20switching=20unpleasently=20slow.?=
 =?UTF-8?q?=20If=20you=20want=20=20=20to=20have=20that=20workaround=20back?=
 =?UTF-8?q?,=20you=20can=20uncomment=20the=20line=20=20=20//#define=20WAIT?=
 =?UTF-8?q?=5FFOR=5FLOCK=5FAFTER=5FTUNING=201=20=20=20in=20VDR/dvbdevice.c?=
 =?UTF-8?q?.=20-=20Adapted=20the=20'sky'=20plugin=20to=20use=20the=20actua?=
 =?UTF-8?q?l=20channel=20IDs,=20and=20to=20fetch=20EPG=20data=20=20=20from?=
 =?UTF-8?q?=20www.bleb.org.=20-=20Limited=20automatic=20retuning=20to=20de?=
 =?UTF-8?q?vices=20that=20actually=20provide=20the=20transponder=20=20=20(?=
 =?UTF-8?q?necessary=20for=20the=20'sky'=20plugin).=20-=20Fixed=20handling?=
 =?UTF-8?q?=20receivers=20in=20the=20'sky'=20plugin,=20so=20that=20a=20rec?=
 =?UTF-8?q?ording=20on=20the=20same=20=20=20channel=20won't=20interrupt=20?=
 =?UTF-8?q?an=20ongoing=20Transfer=20Mode.=20-=20Added=20subtable=20ID=20a?=
 =?UTF-8?q?nd=20TSDT=20handling=20to=20'libsi'=20(thanks=20to=20Marcel=20W?=
 =?UTF-8?q?iesweg).=20-=20Fixed=20some=20Russian=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Vyacheslav=20Dikonov).=20-=20Added=20the=20'running=20s?=
 =?UTF-8?q?tatus'=20to=20the=20EPG=20events.=20This=20is=20necessary=20for?=
 =?UTF-8?q?=20implementing=20=20=20the=20VPS=20function=20for=20recording.?=
 =?UTF-8?q?=20-=20Removed=20the=20obsolete=20'present'=20and=20'following'?=
 =?UTF-8?q?=20handling=20from=20the=20EPG=20data.=20-=20The=20EPG=20data?=
 =?UTF-8?q?=20is=20now=20always=20kept=20sorted=20chronologically=20in=20t?=
 =?UTF-8?q?he=20internal=20data=20=20=20structures.=20This=20also=20means?=
 =?UTF-8?q?=20that=20any=20EPG=20data=20retrieved=20through=20the=20SVRDP?=
 =?UTF-8?q?=20=20=20command=20LSTE=20is=20guaranteed=20to=20be=20sorted=20?=
 =?UTF-8?q?by=20start=20time.=20-=20Now=20using=20the=20'running=20status'?=
 =?UTF-8?q?=20in=20the=20channel=20display,=20so=20that=20a=20programme=20?=
 =?UTF-8?q?=20=20that=20has=20an=20end=20time=20that=20is=20before=20the?=
 =?UTF-8?q?=20current=20time,=20but=20is=20still=20running,=20=20=20will?=
 =?UTF-8?q?=20still=20be=20shown=20in=20the=20display=20(provided=20the=20?=
 =?UTF-8?q?broadcasters=20handle=20the=20=20=20'running=20status'=20flag?=
 =?UTF-8?q?=20correctly).=20This=20also=20applies=20to=20programmes=20that?=
 =?UTF-8?q?=20have=20=20=20a=20start=20time=20that=20is=20in=20the=20futur?=
 =?UTF-8?q?e,=20but=20are=20already=20running.=20-=20Implemented=20an=20"E?=
 =?UTF-8?q?PG=20linger=20time",=20which=20can=20be=20set=20to=20have=20old?=
 =?UTF-8?q?er=20EPG=20information=20=20=20still=20displayed=20in=20the=20"?=
 =?UTF-8?q?Schedule"=20menu=20(thanks=20to=20Jaakko=20Hyv=C3=A4tti).=20-?=
 =?UTF-8?q?=20Added=20PDCDescriptor=20handling=20to=20'libsi'.=20-=20Imple?=
 =?UTF-8?q?mented=20handling=20the=20VPS=20timestamps=20(aka=20"Programme?=
 =?UTF-8?q?=20Identification=20Label")=20=20=20for=20full=20VPS=20support?=
 =?UTF-8?q?=20for=20timers=20(provided=20the=20tv=20stations=20actually=20?=
 =?UTF-8?q?broadcast=20=20=20this=20information).=20The=20VPS=20time=20is?=
 =?UTF-8?q?=20displayed=20in=20the=20event=20info=20page=20if=20it=20exist?=
 =?UTF-8?q?s=20=20=20and=20is=20different=20than=20the=20event's=20start?=
 =?UTF-8?q?=20time.=20-=20Extended=20the=20SVDRP=20command=20LSTE=20to=20a?=
 =?UTF-8?q?llow=20limiting=20the=20listed=20data=20to=20a=20given=20=20=20?=
 =?UTF-8?q?channel,=20the=20present=20or=20following=20events,=20or=20even?=
 =?UTF-8?q?ts=20at=20a=20given=20time=20(thanks=20to=20=20=20Thomas=20Heil?=
 =?UTF-8?q?igenmann).=20-=20Fixed=20a=20typo=20in=20libsi/si.h=20(thanks?=
 =?UTF-8?q?=20to=20St=C3=A9phane=20Est=C3=A9-Gracias).=20-=20Timers=20can?=
 =?UTF-8?q?=20now=20be=20set=20to=20use=20the=20VPS=20information=20to=20c?=
 =?UTF-8?q?ontrol=20recording=20a=20programme.=20=20=20The=20new=20setup?=
 =?UTF-8?q?=20options=20"Recording/Use=20VPS"=20and=20"Recording/VPS=20mar?=
 =?UTF-8?q?gin",=20as=20well=20as=20=20=20the=20"VPS"=20option=20in=20the?=
 =?UTF-8?q?=20individual=20timers,=20can=20be=20used=20to=20control=20this?=
 =?UTF-8?q?=20feature=20=20=20(see=20MANUAL=20for=20details).=20=20=20Note?=
 =?UTF-8?q?=20that=20this=20feature=20will=20certainly=20need=20a=20lot=20?=
 =?UTF-8?q?of=20testing=20before=20it=20can=20be=20=20=20called=20"safe"!?=
 =?UTF-8?q?=20-=20The=20"Schedule"=20and=20"What's=20on=20now/next=3F"=20m?=
 =?UTF-8?q?enus=20now=20have=20an=20additional=20column=20=20=20which=20di?=
 =?UTF-8?q?splays=20information=20on=20whether=20there=20is=20a=20timer=20?=
 =?UTF-8?q?defined=20for=20an=20event,=20=20=20whether=20an=20event=20has?=
 =?UTF-8?q?=20a=20VPS=20time=20that's=20different=20than=20its=20start=20t?=
 =?UTF-8?q?ime,=20and=20=20=20whether=20an=20event=20is=20currently=20runn?=
 =?UTF-8?q?ing=20(see=20MANUAL=20under=20"The=20"Schedule"=20Menu"=20=20?=
 =?UTF-8?q?=20for=20details).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                      |  10 ++
 HISTORY                           |  62 ++++++++++++
 MANUAL                            |  32 ++++++
 PLUGINS/src/sky/HISTORY           |   8 ++
 PLUGINS/src/sky/README            |  29 +++---
 PLUGINS/src/sky/channels.conf.sky |  38 ++++++-
 PLUGINS/src/sky/getskyepg.pl      | 136 ++++++++++++++++---------
 PLUGINS/src/sky/sky.c             |  96 ++++++++++++++----
 README.vps                        | 130 ++++++++++++++++++++++++
 channels.c                        |  32 +++++-
 channels.conf                     |  39 ++++---
 channels.h                        |   8 +-
 config.c                          |  15 ++-
 config.h                          |   9 +-
 device.h                          |   4 +-
 dvbdevice.c                       |   6 +-
 eit.c                             |  61 ++++++-----
 eitscan.c                         |   5 +-
 eitscan.h                         |   2 +-
 epg.c                             | 159 +++++++++++++++++++++--------
 epg.h                             |  38 ++++---
 epg2html.pl                       |  10 +-
 i18n.c                            |  78 +++++++++++++-
 libsi/descriptor.c                |  23 ++++-
 libsi/descriptor.h                |  14 ++-
 libsi/headers.h                   |  59 ++++++++++-
 libsi/section.c                   |  18 +++-
 libsi/section.h                   |  15 ++-
 libsi/si.c                        |  14 ++-
 libsi/si.h                        |   7 +-
 menu.c                            | 163 +++++++++++++++---------------
 menu.h                            |   4 +-
 menuitems.c                       |  19 +++-
 menuitems.h                       |  12 ++-
 nit.c                             |   4 +-
 remux.c                           |   9 +-
 remux.h                           |   3 +-
 svdrp.c                           |  76 ++++++++++++--
 timers.c                          | 163 ++++++++++++++++++++++++++----
 timers.h                          |  35 +++++--
 vdr.5                             |  28 +++--
 vdr.c                             |  50 +++++++--
 42 files changed, 1346 insertions(+), 377 deletions(-)
 create mode 100644 README.vps

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bc4c2ee5d..438d8275b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -279,6 +279,8 @@ Andy Grobb <Charly98@01019freenet.de>
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
  for adding MPEG1 handling to cDvbDevice::StillPicture()
+ for extending the SVDRP command LSTE to allow limiting the listed data to a given
+ channel, the present or following events, or events at a given time
 
 Norbert Schmidt <nschmidt-nrw@t-online.de>
  for filling in some missing teletext PIDs
@@ -438,6 +440,8 @@ Gregoire Favre <greg@ulima.unil.ch>
  for fixing some function headers to make them compile with gcc 3.x
  for reporting a bug in taking an active SVDRP connection into account when doing shutdown
  for translating OSD texts to the French language
+ for suggesting to initiate an "emergency exit" if there are UPT errors during a
+ recording
 
 Sven Grothklags <sven@uni-paderborn.de>
  for fixing the cutting mechanism to make it re-sync in case a frame is larger
@@ -559,6 +563,7 @@ Jaakko Hyv
  for fixing the minimum lifespan of deleted recordings
  for suggesting to improve channel switching in case of numerical input by switching
  as soon as the channel is unique
+ for implementing an "EPG linger time"
 
 Dennis Noordsij <dennis.noordsij@wiral.com>
  for reporting a small glitch when switching channels
@@ -933,3 +938,8 @@ Andreas Regel <andreas.regel@gmx.de>
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
  with value 0
+ for pointing out that transponder handling didn't work with satellites that provide
+ two transponders on the same frequency, with different polarization
+
+St�phane Est�-Gracias <sestegra@free.fr>
+ for fixing a typo in libsi/si.h
diff --git a/HISTORY b/HISTORY
index 317be40d4..e995005d1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2651,3 +2651,65 @@ Video Disk Recorder Revision History
 - Removed the now obsolete CaCaps stuff. The Setup/CICAM menu now displays the
   actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped
   down to the values 0..4.
+
+2004-02-29: Version 1.3.5
+
+- Fixed reading the EPG preferred language parameter from 'setup.conf'.
+- Fixed switching to a visible programme in case the current channel has neither
+  a video nor an audio PID.
+- Fixed editing channels (SID now range checked) and creating new channels (NID,
+  TID and RID are now set to 0).
+- Fixed transponder handling to make it work with satellites that provide two
+  transponders on the same frequency, with different polarization, like Hispasat
+  at S30.0W (thanks to Thomas Bergwinkl for pointing this out). See man vdr(5)
+  for details about the enhanced channel ID format.
+- Since there appears to be no general solution for the UPT error yet, a recording
+  now initiates an "emergency exit" if the number of UPT errors during one
+  recording exceeds 10 (suggested by Gregoire Favre). Since the UPT error doesn't
+  happen on my system, this has not been explicitly tested.
+  The "preliminary fix" for the UPT error in VDR/dvbdevice.c has been disabled
+  by default, since it makes channel switching unpleasently slow. If you want
+  to have that workaround back, you can uncomment the line
+  //#define WAIT_FOR_LOCK_AFTER_TUNING 1
+  in VDR/dvbdevice.c.
+- Adapted the 'sky' plugin to use the actual channel IDs, and to fetch EPG data
+  from www.bleb.org.
+- Limited automatic retuning to devices that actually provide the transponder
+  (necessary for the 'sky' plugin).
+- Fixed handling receivers in the 'sky' plugin, so that a recording on the same
+  channel won't interrupt an ongoing Transfer Mode.
+- Added subtable ID and TSDT handling to 'libsi' (thanks to Marcel Wiesweg).
+- Fixed some Russian OSD texts (thanks to Vyacheslav Dikonov).
+- Added the 'running status' to the EPG events. This is necessary for implementing
+  the VPS function for recording.
+- Removed the obsolete 'present' and 'following' handling from the EPG data.
+- The EPG data is now always kept sorted chronologically in the internal data
+  structures. This also means that any EPG data retrieved through the SVRDP
+  command LSTE is guaranteed to be sorted by start time.
+- Now using the 'running status' in the channel display, so that a programme
+  that has an end time that is before the current time, but is still running,
+  will still be shown in the display (provided the broadcasters handle the
+  'running status' flag correctly). This also applies to programmes that have
+  a start time that is in the future, but are already running.
+- Implemented an "EPG linger time", which can be set to have older EPG information
+  still displayed in the "Schedule" menu (thanks to Jaakko Hyv�tti).
+- Added PDCDescriptor handling to 'libsi'.
+- Implemented handling the VPS timestamps (aka "Programme Identification Label")
+  for full VPS support for timers (provided the tv stations actually broadcast
+  this information). The VPS time is displayed in the event info page if it exists
+  and is different than the event's start time.
+- Extended the SVDRP command LSTE to allow limiting the listed data to a given
+  channel, the present or following events, or events at a given time (thanks to
+  Thomas Heiligenmann).
+- Fixed a typo in libsi/si.h (thanks to St�phane Est�-Gracias).
+- Timers can now be set to use the VPS information to control recording a programme.
+  The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
+  the "VPS" option in the individual timers, can be used to control this feature
+  (see MANUAL for details). 
+  Note that this feature will certainly need a lot of testing before it can be
+  called "safe"!
+- The "Schedule" and "What's on now/next?" menus now have an additional column
+  which displays information on whether there is a timer defined for an event,
+  whether an event has a VPS time that's different than its start time, and
+  whether an event is currently running (see MANUAL under "The "Schedule" Menu"
+  for details).
diff --git a/MANUAL b/MANUAL
index 80977a90f..c4d4391fc 100644
--- a/MANUAL
+++ b/MANUAL
@@ -138,6 +138,16 @@ Version 1.2
   The "Blue" button can be pressed to switch to the channel with the selected
   programme.
 
+  The following markers in these menus give additional information about the
+  status of the events:
+
+  t  there is a timer defined for this event which covers only part of the event
+  T  there is a timer defined for this event which covers the entire event
+  V  this event has a VPS time that's different than its start time
+  *  this event is currently running (the validity of this marker depends on
+     whether there is currently a DVB card receiving the transponder this channel
+     is on).
+
 * Selecting a Channel
 
   There are four ways to select a channel:
@@ -351,6 +361,14 @@ Version 1.2
              would have a Day setting of "M-W----".
   Start:     The start time of the timer in hh:mm as 24 hour ("military") time.
   Stop:      The stop time of the timer.
+  VPS:       Defines whether the timer shall use VPS (if available). If this
+             option is set to 'yes', the start time must exactly match the
+             programme's VPS time, otherwise nothing will be recorded. If VPS
+             is used, the stop time has no real meaning. However, it must be
+             different than the start time, and should correspond to the actual
+             stop time of the programme, just in case there is no real VPS data
+             available at the time of recording, so VDR has to fall back to
+             normal timer recording.
   Priority:  The Priority (0..99) is used to decide which timer shall be
              started in case there are two or more timers with the exact same
              start time. The first timer in the list with the highest Priority
@@ -462,6 +480,9 @@ Version 1.2
                          be fixed accordingly. Restart VDR if you want to make sure
                          all data is fixed.
 
+  EPG linger time = 0    The time (in minutes) within which old EPG information
+                         shall still be displayed in the "Schedule" menu.
+
   Set system time = no   Defines whether the system time will be set according to
                          the time received from the DVB data stream.
                          Note that this works only if VDR is running under a user
@@ -582,6 +603,17 @@ Version 1.2
                          no  = don't use the 'Episode name'
                          yes = use it (and create subdirectories)
 
+  Use VPS = 0            Defines whether a timer that is created from an EPG entry
+                         (by pressing the "Record" (red) button in the "Schedules"
+                         or "What's on now/next?" menu) will automatically use VPS
+                         if the event it is created for has a VPS time.
+
+  VPS margin = 120       Defines how many seconds before a VPS controlled timer is
+                         scheduled to start, VDR will make sure that one of the DVB
+                         devices is tuned to the transponder that timer shall record
+                         from. This is necessary for the "Running Status" information
+                         that is broadcast in the EPG data to be seen by VDR.
+
   Mark instant recording = yes
                          Defines whether an "instant recording" (started by
                          pressing the "Red" button in the "VDR" menu) will be
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index d3da71ec3..c1c5f98e9 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -16,3 +16,11 @@ VDR Plugin 'sky' Revision History
 2004-01-04: Version 0.2.0
 
 - Implemented automatic PID switching and channel detection
+
+2004-02-15: Version 0.3.0
+
+- Now using the actual channel IDs a derived from the data stream.
+- Switched EPG data retrieval to http://www.bleb.org.
+- Added automatic DST detection to getskyepg.pl.
+- Fixed handling receivers, so that a recording on the same channel
+  won't interrupt an ongoing Transfer mode.
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
index bd089ccf3..185a98b0f 100644
--- a/PLUGINS/src/sky/README
+++ b/PLUGINS/src/sky/README
@@ -28,23 +28,18 @@ control the Digibox.
 
 In order to access the Sky channels VDR needs to know the channel number
 under which each channel is stored in the Sky Digibox. These numbers are
-used as 'frequency' parameters in the channels.conf definitions of the Sky
-channels (see the file 'channels.conf.sky'). Since these numbers are always
-less than 1000, they can be easily distinguished from normal satellite
-transponder frequencies. The VPID is 160 and the APID is 80 for all Sky
-channels. These are just fake PIDs, since the Kfir card always uses these
-fixed PIDs. The 'Ca' parameter of the Sky channels is set to 301, which
-is defined as "Videoguard, Sky Digital" in VDR's 'ca.conf' file. Again, please
-note that VDR doesn't do any decrypting here, this is just to mark these
-channels as "conditionally accessible" and have a way of setting the CICAM
-value for the Kfir device in VDR's Setup menu.
-
-The Sky EPG is available on the Internet at http://www.ananova.com.
+stored in the file 'channels.conf.sky', together with the channel IDs as
+derived from the actual channel data and the names under which the EPG
+data for each channel can be found (see below). Copy this file to your
+plugins config directory, in a subdirectory named 'sky', as in
+
+/video/plugins/sky/channels.conf.sky
+
+The Sky EPG is available on the Internet at http://www.bleb.org.
 The Perl script getskyepg.pl extracts the EPG data from these pages
-and sends it to VDR via an SVDRP connection. The channel numbers Sky
-uses to generate the EPG pages are stored as the 'sid' parameter in
-the channels.conf definitions of the Sky channels. You can keep your
-EPG data up-to-date by entering a call to getskyepg.pl into your
-/etc/crontab. Call 'getskyepg.pl -h' for a list of options.
+and sends it to VDR via an SVDRP connection. The channel names as
+used on the bleb.org pages are defined in the channels.conf.sky file.
+You can keep your EPG data up-to-date by entering a call to getskyepg.pl
+into your /etc/crontab. Call 'getskyepg.pl -h' for a list of options.
 The getskyepg.pl script requires the programs /usr/bin/wget and /usr/bin/logger
 to be installed on your system.
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
index f4a437be5..ba262f82d 100644
--- a/PLUGINS/src/sky/channels.conf.sky
+++ b/PLUGINS/src/sky/channels.conf.sky
@@ -1,4 +1,34 @@
-Sky One:106:h:S28.2E:0:160:80:0:301:222
-itv2:226:h:S28.2E:0:160:80:0:301:451
-sci-fi:130:h:S28.2E:0:160:80:0:301:161
-Paramount Comedy:127:h:S28.2E:0:160:80:0:301:185
+# Sky channel definitions
+#
+# Syntax:
+# 
+# ChannelID:ChannelNumber:EPGname
+#
+# where
+#
+# ChannelID is the channel ID as derived from the actual channel
+#           data as broadcast in the data stream (see man vdr(5)).
+#
+# ChannelNumber is the number of this channel as you have to
+#               enter it on the DigiBox remote control.
+#
+# EPGname is the name of the page at www.bleb.org that has EPG
+#         data for this channel (without the '.xml'). If no such
+#         page exists, 'x' is entered.
+#
+S28.2E-2-2027-4705:106:sky_one
+S28.2E-2-2027-5104:107:sky_one_mix
+S28.2E-2-2054-10240:226:itv2
+S28.2E-2-2023-4905:130:scifi
+S28.2E-2-2025-5904:127:paramount
+S28.2E-2-2009-6201:551:discovery
+S28.2E-2-2020-4809:310:sky_cinema
+S28.2E-2-2007-4303:301:sky_movies1
+S28.2E-2-2007-4302:302:sky_movies2
+S28.2E-2-2007-4403:303:sky_movies3
+S28.2E-2-2011-4402:304:sky_movies4
+S28.2E-2-2011-4503:305:sky_movies5
+S28.2E-2-2011-4502:306:sky_movies6
+S28.2E-2-2020-4603:307:sky_movies7
+S28.2E-2-2007-5502:308:sky_movies8
+S28.2E-2-2020-4602:309:x
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index 46c2d7ffe..77768ade7 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -1,14 +1,14 @@
 #!/usr/bin/perl
 
-# getskyepg.pl: Get EPG data from Sky's web pages
+# getskyepg.pl: Get EPG data for Sky channels from the Internet
 #
 # Connects to a running VDR instance via SVDRP, gets the channel data
-# for the Sky channels and connects to Sky's web pages to extract the
+# for the Sky channels and connects to Internet web pages to extract the
 # EPG data for these channels. The result is sent to VDR via SVDRP.
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 1.2 2003/04/02 16:21:47 kls Exp $
+# $Id: getskyepg.pl 1.3 2004/02/15 13:35:52 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
@@ -16,31 +16,33 @@
 $Usage = qq{
 Usage: $0 [options]
 
-Options: -d hostname        destination hostname (default: localhost)
+Options: -c filename        channel config file name (default: channels.conf.sky)
+         -d hostname        destination hostname (default: localhost)
          -p port            SVDRP port number (default: 2001)
          -S source          channel source (default: S28.2E)
          -D days            days to get EPG for (1..7, default: 2)
 };
 
-die $Usage if (!getopts("d:D:hp:S:") || $opt_h);
+die $Usage if (!getopts("c:d:D:hp:S:") || $opt_h);
 
+$Conf   = $opt_c || "channels.conf.sky";
 $Dest   = $opt_d || "localhost";
 $Port   = $opt_p || 2001;
 $Source = $opt_S || "S28.2E";
 $Days   = $opt_D || 2;
 
-$SkyWebPage = "www.ananova.com/tv/frontpage.html";
+$SkyWebPage = "www.bleb.org/tv/data/listings";
 $WGET = "/usr/bin/wget -q -O-";
 $LOGGER = "/usr/bin/logger -t SKYEPG";
 
-$DST = -3600; ##XXX TODO find out whether DST is active!
+$DST = -3600; # Daylight Saving Time offset
 $SecsInDay = 86400;
 
-$MaxFrequency = 1000;
-$idxName = 0;
-$idxFrequency = 1;
-$idxSource = 3;
-$idxSid = 9;
+@Channels = ();
+
+$idxSource = 0;
+$idxNumber = 1;
+$idxName = 2;
 
 Error("days out of range: $Days") unless (1 <= $Days && $Days <= 7);
 
@@ -57,34 +59,52 @@ sub Error
 
 sub GetChannels
 {
-  SVDRPsend("LSTC");
-  my @channels = ();
-  for (SVDRPreceive(250)) {
-      my @a = split(':', substr($_, 4));
-      if ($a[$idxSource] eq $Source && $a[$idxFrequency] < $MaxFrequency) {
-         push(@channels, [@a]);
-         }
-      }
-  return @channels;
+  open(CHANNELS, $Conf) || Error("$Conf: $!");
+  while (<CHANNELS>) {
+        chomp;
+        next if (/^#/);
+        my @a = split(":");
+        push(@Channels, [@a]) unless ($a[$idxName] eq "x");
+        }
+  close(CHANNELS);
 }
 
+GetChannels();
+
 sub GetPage
 {
   my $channel = shift;
   my $day = shift;
-  my $url = "$SkyWebPage?c=$channel&day=day$day";
+  $day--;
+  my $url = "$SkyWebPage/$day/$channel.xml";
   Log("reading $url");
   my @page = split("\n", `$WGET '$url'`);
   Log("received " . ($#page + 1) . " lines");
   return @page;
 }
 
+sub StripWhitespace
+{
+  my $s = shift;
+  $s =~ s/\s*(.*)\s*/$1/;
+  $s =~ s/\s+/ /g;
+  return $s;
+}
+
+sub Extract
+{
+  my $s = shift;
+  my $t = shift;
+  $s =~ /<$t>([^<]*)<\/$t>/;
+  return StripWhitespace($1);
+}
+
 # In order to get the duration we need to buffer the last event:
 $Id = "";
 $Time = 0;
 $Title = "";
-$Episode = "";
-$Descr = "";
+$Subtitle = "";
+$Desc = "";
 
 sub GetEpgData
 {
@@ -94,40 +114,64 @@ sub GetEpgData
   $Time = 0;
   for $day (1 .. $Days) {
       my $dt = 0;
-      my $ap = "";
       my @page = GetPage($channel, $day);
+      my $data = "";
       for $line (@page) {
-          if ($line =~ /^<\/tr><tr /) {
-             # extract information:
-             my ($time, $title, $episode, $descr) = ($line =~ /^.*?<b>(.*?)<\/b>.*?<b>(.*?)<\/b> *(<i>.*?<\/i>)? *(.*?) *<\/small>/);
-             my ($h, $m, $a) = ($time =~ /([0-9]+)\.([0-9]+)(.)m/);
-             # handle am/pm:
-             $dt = $SecsInDay if ($ap eq "p" && $a eq "a");
-             $ap = $a;
-             $h += 12 if ($a eq "p" && $h < 12);
-             $h -= 12 if ($a eq "a" && $h == 12);
+          chomp($line);
+          if ($line =~ /<programme>/) {
+             $data = "";
+             }
+          elsif ($line =~ /<\/programme>/) {
+             my $title = Extract($data, "title");
+             my $subtitle = Extract($data, "subtitle");
+             my $desc = Extract($data, "desc");
+             my $start = Extract($data, "start");
+             # 'end' is useless, because it is sometimes missing :-(
+             # my $end = Extract($data, "end");
+             if (!$subtitle) {
+                # They sometimes write all info into the description, as in
+                # Episode: some description.
+                # Why don't they just fill in the data correctly?
+                my ($s, $d) = ($desc =~ /([^:]*)[:](.*)/);
+                if ($s && $d) {
+                   $subtitle = $s;
+                   $desc = $d;
+                   }
+                }
+             # 'start' and 'end' as time of day isn't of much use here, since
+             # the page for one day contains data that actually belongs to the
+             # next day (after midnight). Oh well, lets reconstruct the missing
+             # information:
+             $start = "0" . $start if (length($start) < 4);
+             my ($h, $m) = ($start =~ /(..)(..)/);
+             $dt = $SecsInDay if ($h > 12);
              # convert to time_t:
              my @gmt = gmtime;
              $gmt[0] = 0;  # seconds
              $gmt[1] = $m; # minutes
              $gmt[2] = $h; # hours
-             $time = timegm(@gmt) + ($day - 1) * $SecsInDay + $dt + $DST;
+             $time = timegm(@gmt) + ($day - 1) * $SecsInDay + ($h < 12 ? $dt : 0);
+             # comensate for DST:
+             $time += $DST if (localtime($time))[8];
              # create EPG data:
              if ($Time) {
                 $duration = $time - $Time;
                 SVDRPsend("E $Id $Time $duration");
                 SVDRPsend("T $Title");
-                SVDRPsend("S $Episode");
-                SVDRPsend("D $Descr");
+                SVDRPsend("S $Subtitle");
+                SVDRPsend("D $Desc");
                 SVDRPsend("e");
                 $numEvents++;
                 }
              # buffer the last event:
              $Id = $time / 60 % 0xFFFF; # this gives us unique ids for every minute of over 6 weeks
              $Time = $time;
-             ($Title = $title)     =~ s/<[^>]+>//g;
-             ($Episode = $episode) =~ s/<[^>]+>//g;
-             ($Descr = $descr)     =~ s/<[^>]+>//g;
+             $Title = $title;
+             $Subtitle = $subtitle;
+             $Desc = $desc;
+             }
+          else {
+             $data .= $line;
              }
           }
       }
@@ -137,14 +181,10 @@ sub GetEpgData
 
 sub ProcessEpg
 {
-  Log("getting Sky channel definitions");
-  my @channels = GetChannels();
-  Error("no Sky channels found") unless @channels;
-  Log("found " . ($#channels + 1) . " channels");
-  for (@channels) {
-      my $channel = @$_[$idxSid];
-      my $channelID = "@$_[$idxSource]-0-@$_[$idxFrequency]-$channel";
-      Log("processing channel @$_[0]");
+  for (@Channels) {
+      my $channel = @$_[$idxName];
+      my $channelID = @$_[$idxSource];
+      Log("processing channel $channel - $channelID");
       SVDRPsend("PUTE");
       SVDRPreceive(354);
       GetEpgData($channel, $channelID);
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 750d7782b..6196eefc2 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.4 2004/01/04 15:29:15 kls Exp $
+ * $Id: sky.c 1.6 2004/02/15 14:59:46 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -14,16 +14,53 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.2.0";
+static const char *VERSION        = "0.3.0";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
 
+#define DUMMYAPID  80
+#define DUMMYVPID 160
+
+class cSkyChannel : public cListObject {
+public:
+  tChannelID channelID;
+  int digiboxChannelNumber;
+  bool Parse(const char *s);
+  };
+
+bool cSkyChannel::Parse(const char *s)
+{
+  char *id = NULL;
+  if (2 == sscanf(s, "%a[^:]:%d", &id, &digiboxChannelNumber))
+     channelID = tChannelID::FromString(id);
+  free(id);
+  return digiboxChannelNumber && channelID.Valid();
+}
+
+class cSkyChannels : public cConfig<cSkyChannel> {
+public:
+  cSkyChannel *GetSkyChannel(const cChannel *Channel);
+  };
+
+cSkyChannel *cSkyChannels::GetSkyChannel(const cChannel *Channel)
+{
+  tChannelID ChannelID = Channel->GetChannelID();
+  for (cSkyChannel *sc = First(); sc; sc = Next(sc)) {
+      if (ChannelID == sc->channelID)
+         return sc;
+      }
+  return NULL;
+}
+
+cSkyChannels SkyChannels;
+
 class cDigiboxDevice : public cDevice {
 private:
   int source;
   int digiboxChannelNumber;
   int fd_dvr;
+  int apid, vpid;
   cTSBuffer *tsBuffer;
   int fd_lirc;
   void LircSend(const char *s);
@@ -47,6 +84,7 @@ cDigiboxDevice::cDigiboxDevice(void)
   source = cSource::FromString("S28.2E");//XXX parameter???
   digiboxChannelNumber = 0;
   fd_dvr = -1;
+  apid = vpid = 0;
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
   strn0cpy(addr.sun_path, "/dev/lircd", sizeof(addr.sun_path));//XXX parameter???
@@ -93,7 +131,7 @@ void cDigiboxDevice::LircSend(int n)
 
 bool cDigiboxDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
-  dsyslog("SetPid %d %d", Handle->pid, On);
+  //dsyslog("SetPid %d %d", Handle->pid, On);
   return true;
 }
 
@@ -122,6 +160,16 @@ bool cDigiboxDevice::GetTSPacket(uchar *&Data)
      int r = tsBuffer->Read();
      if (r >= 0) {
         Data = tsBuffer->Get();
+        if (Data) {
+           // insert the actual PIDs:
+           int Pid = (((uint16_t)Data[1] & PID_MASK_HI) << 8) | Data[2];
+           if (Pid == DUMMYAPID)
+              Pid = apid;
+           else if (Pid == DUMMYVPID)
+              Pid = vpid;
+           Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~PID_MASK_HI);
+           Data[2] = Pid & 0xFF;
+           }
         return true;
         }
      else if (FATALERRNO) {
@@ -149,9 +197,10 @@ bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = true;
 
-  if (ProvidesSource(Channel->Source()) && Channel->Ca() == 0x30) {//XXX
-     if (Receiving()) {
-        if (digiboxChannelNumber == Channel->Frequency()) {
+  cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
+  if (SkyChannel) {
+     if (Receiving(true)) {
+        if (digiboxChannelNumber == SkyChannel->digiboxChannelNumber) {
            needsDetachReceivers = false;
            result = true;
            }
@@ -168,16 +217,21 @@ bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool
 
 bool cDigiboxDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  if (fd_lirc >= 0 && !Receiving()) { // if we are receiving the channel is already set!
-     digiboxChannelNumber = Channel->Frequency();
-     //XXX only when recording??? -> faster channel switching!
-     LircSend("SKY"); // makes sure the Digibox is "on"
-     //XXX lircprint(fd_lirc, "BACKUP");
-     //XXX lircprint(fd_lirc, "BACKUP");
-     //XXX lircprint(fd_lirc, "BACKUP");
-     LircSend(digiboxChannelNumber);
+  if (fd_lirc >= 0 && !Receiving(true)) { // if we are receiving the channel is already set!
+     cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
+     if (SkyChannel) {
+        digiboxChannelNumber = SkyChannel->digiboxChannelNumber;
+        apid = Channel->Apid1();
+        vpid = Channel->Vpid();
+        //XXX only when recording??? -> faster channel switching!
+        LircSend("SKY"); // makes sure the Digibox is "on"
+        //XXX lircprint(fd_lirc, "BACKUP");
+        //XXX lircprint(fd_lirc, "BACKUP");
+        //XXX lircprint(fd_lirc, "BACKUP");
+        LircSend(digiboxChannelNumber);
+        }
      }
-return true;
+  return true;
 }
 
 // --- cPluginSky ------------------------------------------------------------
@@ -225,8 +279,16 @@ bool cPluginSky::ProcessArgs(int argc, char *argv[])
 bool cPluginSky::Initialize(void)
 {
   // Initialize any background activities the plugin shall perform.
-  new cDigiboxDevice;
-  return true;
+  const char *ConfigDir = ConfigDirectory(Name());
+  if (ConfigDir) {
+     if (SkyChannels.Load(AddDirectory(ConfigDir, "channels.conf.sky"), true)) {
+        new cDigiboxDevice;
+        return true;
+        }
+     }
+  else
+     esyslog("ERROR: can't get config directory");
+  return false;
 }
 
 void cPluginSky::Housekeeping(void)
diff --git a/README.vps b/README.vps
new file mode 100644
index 000000000..2aa19ce8b
--- /dev/null
+++ b/README.vps
@@ -0,0 +1,130 @@
+VPS (Video Programming Service)
+===============================
+
+Beginning with version 1.3.5 VDR supports the VPS method
+of identifying programmes to record, and making sure they
+are recorded in full length, even if they run longer than
+initially specified or are shifted in time.
+
+Of course, the main prerequisite for this to work is that
+the broadcasters actually provide the necessary data. In
+particular these are
+
+- EPG data (well, obviously)
+- the data for each event must contain the "Programme Identification Label"
+  descriptor, which contains the VPS timestamp for this programme
+- the event data must provide and maintain the "Running Status" flag,
+  which indicates whether this programme is currently running or not.
+
+Currently only the German "�ffentlich Rechtliche" tv stations provide
+the necessary VPS data, so this will work only for stations like "Das Erste",
+"ZDF" and the like.
+
+Following is a step by step description of what happens for a VPS controlled
+timer recording. First let's take a look at what the VDR user needs to do.
+
+VPS as seen by the VDR user:
+----------------------------
+
+When the VDR user sets up a timer that shall be under VPS control, there
+are only two things that need to be done:
+
+1. Set the "Start" time to the actual VPS time as published in tv magazines.
+   Typically the VPS time is the same as the printed start time, unless
+   expliciltly specified otherwise. For instance, a tv magazine might print
+
+   20:15 Wetten, dass...?
+         (VPS = 20:14)
+
+   In this case the timer would need to be set to 20:14.
+
+2. Set the "VPS" flag in the timer definition to "yes" in order to tell VDR
+   that this timer is to be handled under VPS control. This is no different
+   to old analog video recorders, where each timer has also had a separate
+   VPS flag.
+
+If the user sets up a timer from the "Schedule" menu, things are even simpler.
+If the setup option "Recording/Use VPS" is set to "yes", any timer that is
+programmed from an event that has VPS information will automatically be set
+up as a VPS timer.
+
+IMPORTANT: In order for a recording to work under VPS control it is of
+========== paramount importance that the start time is set to the actual
+           VPS time of that event, NOT some time a few minutes before the
+           event starts! If a timer is set to use VPS, and the time doesn't
+           match any event's VPS time, nothing will be recorded!
+
+VPS as seen by VDR:
+-------------------
+
+The following things happen when VDR processes timers:
+
+- VDR regularly scans the EPG data and assigns events to the timers (see
+  cTimers::SetEvents() in VDR/timers.c).
+  This can be seen in the log file as
+
+  timer 1 (15 1830-1900 'Neues') set to event 28.02.2004 18:30-18:59 (VPS: 28.02 18:30) 'neues'
+
+- When a VPS timer is asked whether it matches (i.e. whether a recording shall
+  be started), it checks whether it has an event assigned to it, and whether
+  that event has a running status of "starts in a few seconds" or "running"
+  (see cTimer::Matches(time_t t, bool Directly) in VDR/timers.c). This allows
+  the recording process to catch the entire programme, even if it runs longer
+  than initially advertised. It also works if it runs shorter or gets shifted.
+
+- When a VPS timer event is coming up (i.e. there are only a few minutes until
+  it starts, according to the related event data's start time - which may be
+  different than the VPS time!), VDR tunes a free DVB device to that transponder
+  (unless there is already a device tuned to that one) in order to make sure
+  that the event data (especially the "Running Status") will be up to date and
+  a change in the "Running status" flag will be seen immediately. This may
+  lead to the primary device being switched to a different channel if there
+  is no other free DVB device available. See the main program loop in VDR/vdr.c,
+  "Make sure VPS timers "see" their channel early enough:".
+
+Problems:
+---------
+
+- In order for a VPS controlled timer to function properly, it needs to "see"
+  any changes in the running status of its event. This means that one of the
+  DVB devices needs to be tuned to the proper transponder some time before
+  the actual start time of the event. However, this may result in an other
+  timer (with lower priority) to be stopped, because it occupies the DVB device
+  and has it tuned to a different transponder.
+  See "// Make sure VPS timers "see" their channel early enough:" in VDR/vdr.c.
+TODO:
+  Something needs to be done to prevent two timers from repeatedly switching
+  the device between channels in such a situation.
+
+- If, for some reason, the driver doesn't deliver any more section data, a
+  VPS controlled timer will never see that the programme has started (or ended).
+TODO:
+  Therefore some mechanism needs to be implemented that makes absolutely sure
+  we continuously receive at least the event data for the present event.
+
+Caveats:
+--------
+
+Apparently VPS in digital broadcasting is still in an early state. Only few
+tv stations actually support it, and other tv stations don't even handle the
+"Running Status" correctly (which, by itself, would already be helpful, even
+without VPS).
+
+Here's a list of things that are apparently done wrong by the individual
+stations:
+
+- The German "�ffentlich Rechtliche" tv stations, although supporting VPS,
+  don't switch the "Running Status" of an upcoming broadcast to "starts in
+  a few seconds", but rather go directly from "unknown" or "not running" to
+  "running". This may result in a recording that misses the first few seconds
+  of the programme.
+- The RTL group handles EPG events in a rather random way. They change event
+  IDs randomly, and switch the "Running Status" flag at times that are only
+  losely related to the actual events. For instance, if the "RTL aktuell"
+  programme starts at 18:45, they switch that event to "running" at about
+  18:43. Or, even worse, if "Wer wird Million�r?" runs until 21:15, they
+  switch the _next_ programme to running (which implicitly set "Wer wird
+  Million�r?" to "not running) at around 21:11 - so anybody using that
+  information to control recording would not see the end of that programme.
+
+... more following as it comes up...
diff --git a/channels.c b/channels.c
index b5bd9bd4f..3b0b6161f 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.23 2004/02/08 11:05:22 kls Exp $
+ * $Id: channels.c 1.24 2004/02/13 15:37:42 kls Exp $
  */
 
 #include "channels.h"
@@ -153,6 +153,13 @@ const char *tChannelID::ToString(void)
   return buffer;
 }
 
+tChannelID &tChannelID::ClrPolarization(void)
+{
+  while (tid > 100000)
+        tid -= 100000;
+  return *this;
+}
+
 // -- cChannel ---------------------------------------------------------------
 
 char *cChannel::buffer = NULL;
@@ -220,11 +227,25 @@ cChannel& cChannel::operator= (const cChannel &Channel)
   return *this;
 }
 
+int cChannel::Transponder(int Frequency, char Polarization)
+{
+  // some satellites have transponders at the same frequency, just with different polarization:
+  switch (tolower(Polarization)) {
+    case 'h': Frequency += 100000; break;
+    case 'v': Frequency += 200000; break;
+    case 'l': Frequency += 300000; break;
+    case 'r': Frequency += 400000; break;
+    }
+  return Frequency;
+}
+
 int cChannel::Transponder(void) const
 {
   int tf = frequency;
   while (tf > 20000)
         tf /= 1000;
+  if (IsSat())
+     tf = Transponder(tf, polarization);
   return tf;
 }
 
@@ -803,7 +824,7 @@ cChannel *cChannels::GetByServiceID(int Source, int Transponder, unsigned short
   return NULL;
 }
 
-cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid)
+cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid, bool TryWithoutPolarization)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (!channel->GroupSep() && channel->GetChannelID() == ChannelID)
@@ -816,6 +837,13 @@ cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid)
             return channel;
          }
      }
+  if (TryWithoutPolarization) {
+     ChannelID.ClrPolarization();
+     for (cChannel *channel = First(); channel; channel = Next(channel)) {
+         if (!channel->GroupSep() && channel->GetChannelID().ClrPolarization() == ChannelID)
+            return channel;
+         }
+     }
   return NULL;
 }
 
diff --git a/channels.conf b/channels.conf
index e7aa7f3a7..f36c5f344 100644
--- a/channels.conf
+++ b/channels.conf
@@ -26,8 +26,8 @@ NEUN LIVE,NEUN LIVE Television:12480:vC34:S19.2E:27500:767:768:35:0:897:133:33:0
 DSF:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSEurope,Home Shopping Europe:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
 Bloomberg TV Germany:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:500,100:8004:1:1070:0
-Sky News:11597:vC56:S19.2E:22000:305:306=eng:0:0:28707:1:1026:0
+EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+Sky News Intl:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 CNBC Europe:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
@@ -45,11 +45,11 @@ RBB Brandenburg:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 RBB Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1722,1801:8:133:2:0
-PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:0:1702,1722,1801:10:133:2:0
-PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:0:1702,1722,1801:11:133:2:0
+PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:0:1702,1722,1801:10:133:2:0
+PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:0:1702,1722,1801:11:133:2:0
 PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:0:1702,1722,1801:43:133:2:0
 PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:0:1702,1722,1801:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:0:1702,1722,1801:29:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:0:1702,1722,1801:29:133:2:0
 PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:0:1702,1722,1801:41:133:2:0
 PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:20:133:2:0
 DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1702,1722,1801:34:133:17:0
@@ -59,7 +59,7 @@ DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0
 B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
 :Sportsworld
-Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
+Konferenz:11719:hC34:S19.2E:27500:255:256=deu:0:1702,1722,1801:17:133:3:0
 SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:0:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
@@ -89,20 +89,31 @@ MTV Central:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 QVC GERMANY:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5:12480:vC34:S19.2E:27500:1535:1536:38:0:51:133:33:0
 :@201 Sky
-Sky One:106:h:S28.2E:0:160:80:0:30:222:0:0:0
-Sky One Mix:107:h:S28.2E:0:160:80:0:30:919:0:0:0
-itv2:226:h:S28.2E:0:160:80:0:30:451:0:0:0
-sci-fi:130:h:S28.2E:0:160:80:0:30:161:0:0:0
-Paramount Comedy:127:h:S28.2E:0:160:80:0:30:185:0:0:0
+Sky One:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
+Sky One Mix:12226:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:5104:2:2027:0
+ITV2:10906:vC56:S28.2E:22000:2348:2349=eng,2350=eng:2351:960,961:10240:2:2054:0
+Sci-Fi:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
+Paramount:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
+Discovery:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0
+Sky Movies 1:11836:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR;2313=eng:2312:960,961:4303:2:2007:0
+Sky Movies 2:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2323=eng:2308:960,961:4302:2:2007:0
+Sky Movies 3:11836:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR;2318=eng:2317:960,961:4403:2:2007:0
+Sky Movies 4:11914:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR:2308:960,961:4402:2:2011:0
+Sky Movies 5:11914:hC23:S28.2E:27500:2313+2304:2314=eng,2315=NAR:2316:960,961:4503:2:2011:0
+Sky Movies 6:11914:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR:2312:960,961:4502:2:2011:0
+Sky Movies 7:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
+Sky Movies 8:11836:hC23:S28.2E:27500:2319+2304:2320=eng,2321=NAR:2322:960,961:5502:2:2007:0
+Sky Movies 9:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
+Sky Cinema 1:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
+Sky Cinema 2:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
 :@900 Some 'seed' channels
 Chelsea TV:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-Sky One:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4703:2:2030:0
 WDR M�nster:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
 Going Places:10920:hC56:S28.2E:22000:2310+2304:2311=eng:2312:0:5008:2:2055:0
 Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
-S1T:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2314:960,961:4409:2:2030:0
+S1T:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
 CNN:12051:vC23:S28.2E:27500:2309:2311=eng:2310:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308=eng,2309=eng:2307:0:7300:2:2022:0
-AL HAYAT:11200:vC56:S13.0E:27500:413:414=eng:0:0:4733:318:13400:0
+AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 :@1000 New channels
diff --git a/channels.h b/channels.h
index 6d6dd3a55..c797cb284 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.15 2004/02/08 12:20:22 kls Exp $
+ * $Id: channels.h 1.16 2004/02/13 15:16:36 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -61,6 +61,7 @@ struct tChannelID {
   bool operator== (const tChannelID &arg) const;
   bool Valid(void) { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
+  tChannelID &ClrPolarization(void);
   static tChannelID FromString(const char *s);
   const char *ToString(void);
   static const tChannelID InvalidID;
@@ -129,7 +130,8 @@ class cChannel : public cListObject {
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
-  int Transponder(void) const;                    ///< Returns the transponder frequency in MHz
+  int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
+  static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
   int Source(void) const { return source; }
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
@@ -187,7 +189,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID);
-  cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false);
+  cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false, bool TryWithoutPolarization = false);
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
   void DecBeingEdited(void) { beingEdited--; }
diff --git a/config.c b/config.c
index 833a2bba4..6183eedb7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.122 2004/02/08 15:04:41 kls Exp $
+ * $Id: config.c 1.124 2004/02/21 15:05:40 kls Exp kls $
  */
 
 #include "config.h"
@@ -262,6 +262,7 @@ cSetup::cSetup(void)
   EPGLanguages[0] = -1;
   EPGScanTimeout = 5;
   EPGBugfixLevel = 2;
+  EPGLinger = 0;
   SVDRPTimeout = 300;
   ZapTimeout = 3;
   SortTimers = 1;
@@ -271,6 +272,8 @@ cSetup::cSetup(void)
   PausePriority = 10;
   PauseLifetime = 1;
   UseSubtitle = 1;
+  UseVps = 0;
+  VpsMargin = 120;
   RecordingDirs = 1;
   VideoFormat = 0;
   UpdateChannels = 4;
@@ -374,7 +377,9 @@ bool cSetup::ParseLanguages(const char *Value, int *Values)
 {
   int n = 0;
   while (Value && *Value && n < I18nNumLanguages) {
-        int i = I18nLanguageIndex(Value);
+        char buffer[4];
+        strn0cpy(buffer, Value, sizeof(buffer));
+        int i = I18nLanguageIndex(buffer);
         if (i >= 0)
            Values[n++] = i;
         if ((Value = strchr(Value, ' ')) != NULL)
@@ -404,6 +409,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGLanguages"))        return ParseLanguages(Value, EPGLanguages);
   else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
   else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
+  else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
@@ -413,6 +419,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "PausePriority"))       PausePriority      = atoi(Value);
   else if (!strcasecmp(Name, "PauseLifetime"))       PauseLifetime      = atoi(Value);
   else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
+  else if (!strcasecmp(Name, "UseVps"))              UseVps             = atoi(Value);
+  else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
@@ -455,6 +463,7 @@ bool cSetup::Save(void)
   StoreLanguages("EPGLanguages", EPGLanguages);
   Store("EPGScanTimeout",     EPGScanTimeout);
   Store("EPGBugfixLevel",     EPGBugfixLevel);
+  Store("EPGLinger",          EPGLinger);
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("ZapTimeout",         ZapTimeout);
   Store("SortTimers",         SortTimers);
@@ -464,6 +473,8 @@ bool cSetup::Save(void)
   Store("PausePriority",      PausePriority);
   Store("PauseLifetime",      PauseLifetime);
   Store("UseSubtitle",        UseSubtitle);
+  Store("UseVps",             UseVps);
+  Store("VpsMargin",          VpsMargin);
   Store("RecordingDirs",      RecordingDirs);
   Store("VideoFormat",        VideoFormat);
   Store("UpdateChannels",     UpdateChannels);
diff --git a/config.h b/config.h
index 766126a41..cc1edf282 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.186 2004/02/08 15:04:52 kls Exp $
+ * $Id: config.h 1.188 2004/02/21 15:04:53 kls Exp kls $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.4"
-#define VDRVERSNUM   10304  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.5"
+#define VDRVERSNUM   10305  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -220,6 +220,7 @@ class cSetup : public cConfig<cSetupLine> {
   int EPGLanguages[I18nNumLanguages + 1];
   int EPGScanTimeout;
   int EPGBugfixLevel;
+  int EPGLinger;
   int SVDRPTimeout;
   int ZapTimeout;
   int SortTimers;
@@ -227,6 +228,8 @@ class cSetup : public cConfig<cSetupLine> {
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
   int UseSubtitle;
+  int UseVps;
+  int VpsMargin;
   int RecordingDirs;
   int VideoFormat;
   int UpdateChannels;
diff --git a/device.h b/device.h
index 496e70214..af6c85f85 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.39 2004/02/08 15:05:49 kls Exp $
+ * $Id: device.h 1.40 2004/02/14 11:29:57 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -435,7 +435,7 @@ class cDevice : public cThread {
 /// from the driver with each call to Read(), thus avoiding the overhead
 /// of getting each TS packet separately from the driver. It also makes
 /// sure the returned data points to a TS packet and automatically
-/// re-synchronizes after broken packet.
+/// re-synchronizes after broken packets.
 
 class cTSBuffer {
 private:
diff --git a/dvbdevice.c b/dvbdevice.c
index e1d5fc635..8ed62e1fd 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.81 2004/02/08 14:07:07 kls Exp $
+ * $Id: dvbdevice.c 1.82 2004/02/24 10:12:13 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -35,6 +35,7 @@ extern "C" {
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
+//#define WAIT_FOR_LOCK_AFTER_TUNING 1
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -751,11 +752,12 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
 
+#ifdef WAIT_FOR_LOCK_AFTER_TUNING
   //XXX TODO preliminary fix for the "Unknown picture type" error
   time_t t0 = time(NULL);
   while (!dvbTuner->Locked() && time(NULL) - t0 < 5)
         usleep(100);
-  //XXX
+#endif
   // PID settings:
 
   if (TurnOnLivePIDs) {
diff --git a/eit.c b/eit.c
index c24a3d0a1..85f051ec6 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.86 2004/02/08 10:26:54 kls Exp $
+ * $Id: eit.c 1.89 2004/02/22 13:17:52 kls Exp kls $
  */
 
 #include "eit.h"
@@ -43,18 +43,19 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
      Schedules->Add(pSchedule);
      }
 
+  bool Modified = false;
+
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.hasNext(it); ) {
       SiEitEvent = eventLoop.getNext(it);
 
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
       if (!pEvent) {
-         // If we don't have that event ID yet, we create a new one.
+         // If we don't have that event yet, we create a new one.
          // Otherwise we copy the information into the existing event anyway, because the data might have changed.
          pEvent = pSchedule->AddEvent(new cEvent(channelID, SiEitEvent.getEventId()));
          if (!pEvent)
             continue;
-         pEvent->SetTableID(Tid);
          }
       else {
          // We have found an existing event, either through its event ID or its start time.
@@ -62,19 +63,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          // not be overwritten.
          if (pEvent->TableID() == 0x00)
             continue;
-         // If the new event comes from a table that belongs to an "other TS" and the existing
-         // one comes from an "actual TS" table, let's skip it.
-         #define ISACTUALTS(tid) (tid == 0x4E || (tid & 0x50) == 0x50)
-         if (!ISACTUALTS(Tid) && ISACTUALTS(pEvent->TableID()))
-            continue;
-         // If the new event comes from a "schedule" table and the existing one comes from
-         // a "present/following" table, let's skip it (the p/f table usually contains more
-         // information, like e.g. a description).
-         if ((Tid & 0x50) == 0x50 && pEvent->TableID() == 0x4E || (Tid & 0x60) == 0x60 && pEvent->TableID() == 0x4F)
-            continue;
-         // If both events come from the same "schedule" table and the new event's table id is larger than the
-         // existing one's, let's skip it (higher tids mean "farther in the future" and usually have less information).
-         if (((Tid & 0x50) == 0x50 || (Tid & 0x60) == 0x60) && (pEvent->TableID() & 0xF0) == (Tid & 0xF0) && (Tid > pEvent->TableID()))
+         // If the new event has a higher table ID, let's skip it.
+         // The lower the table ID, the more "current" the information.
+         if (Tid > pEvent->TableID())
             continue;
          // If the new event comes from the same table and has the same version number
          // as the existing one, let's skip it to avoid unnecessary work.
@@ -85,9 +76,16 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
             continue;
          }
-      pEvent->SetVersion(getVersionNumber());
-      pEvent->SetTableID(Tid);
+      // XXX TODO log different (non-zero) event IDs for the same event???
       pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
+      pEvent->SetTableID(Tid);
+      pEvent->SetVersion(getVersionNumber());
+      pEvent->SetStartTime(SiEitEvent.getStartTime());
+      pEvent->SetDuration(SiEitEvent.getDuration());
+      if (isPresentFollowing()) {
+         if (SiEitEvent.getRunningStatus() > SI::RunningStatusNotRunning)
+            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus());
+         }
 
       int LanguagePreferenceShort = -1;
       int LanguagePreferenceExt = -1;
@@ -126,6 +124,21 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  break;
             case SI::ParentalRatingDescriptorTag:
                  break;
+            case SI::PDCDescriptorTag: {
+                 SI::PDCDescriptor *pd = (SI::PDCDescriptor *)d;
+                 time_t now = time(NULL);
+                 struct tm tm_r;
+                 struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
+                 t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+                 t.tm_mon = pd->getMonth() - 1;
+                 t.tm_mday = pd->getDay();
+                 t.tm_hour = pd->getHour();
+                 t.tm_min = pd->getMinute();
+                 t.tm_sec = 0;
+                 time_t vps = mktime(&t);
+                 pEvent->SetVps(vps);
+                 }
+                 break;
             case SI::TimeShiftedEventDescriptorTag: {
                  SI::TimeShiftedEventDescriptor *tsed = (SI::TimeShiftedEventDescriptor *)d;
                  cSchedule *rSchedule = (cSchedule *)Schedules->GetSchedule(tChannelID(Source, 0, 0, tsed->getReferenceServiceId()));
@@ -188,20 +201,14 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
 
-      pEvent->SetStartTime(SiEitEvent.getStartTime());
-      pEvent->SetDuration(SiEitEvent.getDuration());
       pEvent->FixEpgBugs();
 
-      if (isPresentFollowing()) {
-         if (SiEitEvent.getRunningStatus() == SI::RunningStatusPausing || SiEitEvent.getRunningStatus() == SI::RunningStatusRunning)
-            pSchedule->SetPresentEvent(pEvent);
-         else if (SiEitEvent.getRunningStatus() == SI::RunningStatusStartsInAFewSeconds)
-            pSchedule->SetFollowingEvent(pEvent);
-         }
-
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
+      Modified = true;
       }
+  if (Modified)
+     pSchedule->Sort();
 }
 
 // --- cTDT ------------------------------------------------------------------
diff --git a/eitscan.c b/eitscan.c
index a2096af97..54b579b03 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.20 2004/01/17 15:38:11 kls Exp $
+ * $Id: eitscan.c 1.21 2004/02/14 13:44:31 kls Exp kls $
  */
 
 #include "eitscan.h"
@@ -146,8 +146,7 @@ void cEITScanner::Process(void)
                             if (!(Device->Receiving(true) || Device->Replaying())) {
                                const cChannel *Channel = ScanData->GetChannel();
                                if (Channel) {
-                                  //XXX if (Device->ProvidesTransponder(Channel)) {
-                                  if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) { //XXX temporary for the 'sky' plugin
+                                  if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) {
                                      if (Device == cDevice::PrimaryDevice() && !currentChannel) {
                                         currentChannel = Device->CurrentChannel();
                                         Interface->Info("Starting EPG scan");
diff --git a/eitscan.h b/eitscan.h
index c5116cb97..c2ed7fb5b 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.8 2004/01/17 15:36:24 kls Exp $
+ * $Id: eitscan.h 1.8 2004/01/17 15:36:24 kls Exp kls $
  */
 
 #ifndef __EITSCAN_H
diff --git a/epg.c b/epg.c
index 19f1c7f4f..88d9ee3fb 100644
--- a/epg.c
+++ b/epg.c
@@ -7,10 +7,12 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.4 2004/01/09 15:22:18 kls Exp $
+ * $Id: epg.c 1.13 2004/02/22 14:41:37 kls Exp kls $
  */
 
 #include "epg.h"
+#include "libsi/si.h"
+#include "timers.h"
 #include <ctype.h>
 #include <time.h>
 
@@ -22,13 +24,13 @@ cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID)
   eventID = EventID;
   tableID = 0;
   version = 0xFF; // actual version numbers are 0..31
-  isPresent = isFollowing = false;
+  runningStatus = 0;
   title = NULL;
   shortText = NULL;
   description = NULL;
   startTime = 0;
   duration = 0;
-  channelNumber = 0;
+  vps = 0;
 }
 
 cEvent::~cEvent()
@@ -38,6 +40,12 @@ cEvent::~cEvent()
   free(description);
 }
 
+bool cEvent::operator< (const cListObject &ListObject)
+{
+  cEvent *e = (cEvent *)&ListObject;
+  return startTime < e->startTime;
+}
+
 void cEvent::SetEventID(u_int16_t EventID)
 {
   eventID = EventID;
@@ -53,14 +61,9 @@ void cEvent::SetVersion(uchar Version)
   version = Version;
 }
 
-void cEvent::SetIsPresent(bool IsPresent)
+void cEvent::SetRunningStatus(int RunningStatus)
 {
-  isPresent = IsPresent;
-}
-
-void cEvent::SetIsFollowing(bool IsFollowing)
-{
-  isFollowing = IsFollowing;
+  runningStatus = RunningStatus;
 }
 
 void cEvent::SetTitle(const char *Title)
@@ -88,6 +91,20 @@ void cEvent::SetDuration(int Duration)
   duration = Duration;
 }
 
+void cEvent::SetVps(time_t Vps)
+{
+  vps = Vps;
+}
+
+bool cEvent::HasTimer(void) const
+{
+  for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
+      if (t->Event() == this)
+         return true;
+      }
+  return false;
+}
+
 const char *cEvent::GetDateString(void) const
 {
   static char buf[25];
@@ -113,6 +130,14 @@ const char *cEvent::GetEndTimeString(void) const
   return buf;
 }
 
+const char *cEvent::GetVpsString(void) const
+{
+  static char buf[25];
+  struct tm tm_r;
+  strftime(buf, sizeof(buf), "%d.%m %R", localtime_r(&vps, &tm_r));
+  return buf;
+}
+
 void cEvent::Dump(FILE *f, const char *Prefix) const
 {
   if (startTime + duration >= time(NULL)) {
@@ -123,6 +148,8 @@ void cEvent::Dump(FILE *f, const char *Prefix) const
         fprintf(f, "%sS %s\n", Prefix, shortText);
      if (!isempty(description))
         fprintf(f, "%sD %s\n", Prefix, description);
+     if (vps)
+        fprintf(f, "%sV %ld\n", Prefix, vps);
      fprintf(f, "%se\n", Prefix);
      }
 }
@@ -162,6 +189,9 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
              case 'D': if (Event)
                           Event->SetDescription(t);
                        break;
+             case 'V': if (Event)
+                          Event->SetVps(atoi(t));
+                       break;
              case 'e': Event = NULL;
                        break;
              case 'c': // to keep things simple we react on 'c' here
@@ -175,7 +205,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 7
+#define MAXEPGBUGFIXSTATS 8
 #define MAXEPGBUGFIXCHANS 100
 struct tEpgBugFixStats {
   int hits;
@@ -257,6 +287,13 @@ void cEvent::FixEpgBugs(void)
   strreplace(title, '\n', ' ');
   strreplace(shortText, '\n', ' ');
   strreplace(description, '\n', ' ');
+  // Same for control characters:
+  strreplace(title, '\x86', ' ');
+  strreplace(title, '\x87', ' ');
+  strreplace(shortText, '\x86', ' ');
+  strreplace(shortText, '\x87', ' ');
+  strreplace(description, '\x86', ' ');
+  strreplace(description, '\x87', ' ');
 
   if (Setup.EPGBugfixLevel == 0)
      return;
@@ -397,6 +434,20 @@ void cEvent::FixEpgBugs(void)
            }
         }
 
+     // Some channels put the same information into ShortText and Description.
+     // In that case we delete one of them:
+     if (shortText && description && strcmp(shortText, description) == 0) {
+        if (strlen(shortText) > MAX_USEFUL_EPISODE_LENGTH) {
+           free(shortText);
+           shortText = NULL;
+           }
+        else {
+           free(description);
+           description = NULL;
+           }
+        EpgBugFixStat(7, ChannelID());
+        }
+
      // Some channels use the ` ("backtick") character, where a ' (single quote)
      // would be normally used. Actually, "backticks" in normal text don't make
      // much sense, so let's replace them:
@@ -411,7 +462,6 @@ void cEvent::FixEpgBugs(void)
 cSchedule::cSchedule(tChannelID ChannelID)
 {
   channelID = ChannelID;
-  present = following = NULL;
 }
 
 cEvent *cSchedule::AddEvent(cEvent *Event)
@@ -420,26 +470,30 @@ cEvent *cSchedule::AddEvent(cEvent *Event)
   return Event;
 }
 
-const cEvent *cSchedule::GetPresentEvent(void) const
-{
-  return GetEventAround(time(NULL));
-}
-
-const cEvent *cSchedule::GetFollowingEvent(void) const
+const cEvent *cSchedule::GetPresentEvent(bool CheckRunningStatus) const
 {
   const cEvent *pe = NULL;
   time_t now = time(NULL);
-  time_t delta = INT_MAX;
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
-      time_t dt = p->StartTime() - now;
-      if (dt > 0 && dt < delta) {
-         delta = dt;
+      if (p->StartTime() <= now && now < p->StartTime() + p->Duration()) {
          pe = p;
+         if (!CheckRunningStatus)
+            break;
          }
+      if (CheckRunningStatus && p->RunningStatus() >= SI::RunningStatusPausing)
+         return p;
       }
   return pe;
 }
 
+const cEvent *cSchedule::GetFollowingEvent(bool CheckRunningStatus) const
+{
+  const cEvent *p = GetPresentEvent(CheckRunningStatus);
+  if (p)
+     p = events.Next(p);
+  return p;
+}
+
 const cEvent *cSchedule::GetEvent(u_int16_t EventID, time_t StartTime) const
 {
   // Returns either the event info with the given EventID or, if that one can't
@@ -468,22 +522,14 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
   return pe;
 }
 
-bool cSchedule::SetPresentEvent(cEvent *Event)
-{
-  if (present)
-     present->SetIsPresent(false);
-  present = Event;
-  present->SetIsPresent(true);
-  return true;
-}
-
-bool cSchedule::SetFollowingEvent(cEvent *Event)
+void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus)
 {
-  if (following)
-     following->SetIsFollowing(false);
-  following = Event;
-  following->SetIsFollowing(true);
-  return true;
+  for (cEvent *p = events.First(); p; p = events.Next(p)) {
+      if (p == Event)
+         p->SetRunningStatus(RunningStatus);
+      else if (RunningStatus >= SI::RunningStatusPausing && p->RunningStatus() > SI::RunningStatusNotRunning)
+         p->SetRunningStatus(SI::RunningStatusNotRunning);
+      }
 }
 
 void cSchedule::ResetVersions(void)
@@ -492,6 +538,11 @@ void cSchedule::ResetVersions(void)
       p->SetVersion(0xFF);
 }
 
+void cSchedule::Sort(void)
+{
+  events.Sort();
+}
+
 void cSchedule::Cleanup(void)
 {
   Cleanup(time(NULL));
@@ -504,20 +555,41 @@ void cSchedule::Cleanup(time_t Time)
       Event = events.Get(a);
       if (!Event)
          break;
-      if (Event->StartTime() + Event->Duration() + 3600 < Time) { // adding one hour for safety
+      if (!Event->HasTimer() && Event->StartTime() + Event->Duration() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
          events.Del(Event);
          a--;
          }
       }
 }
 
-void cSchedule::Dump(FILE *f, const char *Prefix) const
+void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime) const
 {
   cChannel *channel = Channels.GetByChannelID(channelID, true);
   if (channel) {
      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelID().ToString(), channel->Name());
-     for (cEvent *p = events.First(); p; p = events.Next(p))
-        p->Dump(f, Prefix);
+     const cEvent *p;
+     switch (DumpMode) {
+       case dmAll: {
+            for (p = events.First(); p; p = events.Next(p))
+                p->Dump(f, Prefix);
+            }
+            break;
+       case dmPresent: {
+            if ((p = GetPresentEvent()) != NULL)
+               p->Dump(f, Prefix);
+            }
+            break;
+       case dmFollowing: {
+            if ((p = GetFollowingEvent()) != NULL)
+               p->Dump(f, Prefix);
+            }
+            break;
+       case dmAtTime: {
+            if ((p = GetEventAround(AtTime)) != NULL)
+               p->Dump(f, Prefix);
+            }
+            break;
+       }
      fprintf(f, "%sc\n", Prefix);
      }
 }
@@ -539,6 +611,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
                     if (p) {
                        if (!cEvent::Read(f, p))
                           return false;
+                       p->Sort();
                        }
                     }
                  else {
@@ -640,13 +713,13 @@ bool cSchedules::ClearAll(void)
   return false;
 }
 
-bool cSchedules::Dump(FILE *f, const char *Prefix)
+bool cSchedules::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime)
 {
   cSchedulesLock SchedulesLock;
   cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
   if (s) {
      for (cSchedule *p = s->First(); p; p = s->Next(p))
-         p->Dump(f, Prefix);
+         p->Dump(f, Prefix, DumpMode, AtTime);
      return true;
      }
   return false;
diff --git a/epg.h b/epg.h
index 409968ac3..4b209b5f2 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.4 2004/01/09 15:21:05 kls Exp $
+ * $Id: epg.h 1.10 2004/02/22 14:34:04 kls Exp kls $
  */
 
 #ifndef __EPG_H
@@ -19,6 +19,8 @@
 
 #define MAXEPGBUGFIXLEVEL 2
 
+enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
+
 class cSchedule;
 
 class cEvent : public cListObject {
@@ -27,45 +29,43 @@ class cEvent : public cListObject {
   u_int16_t eventID;     // Event ID of this event
   uchar tableID;         // Table ID this event came from
   uchar version;         // Version number of section this event came from
-  //XXX present/following obsolete???
-  bool isPresent;        // true if this is the present event running
-  bool isFollowing;      // true if this is the next event on this channel
+  int runningStatus;     // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running
   char *title;           // Title of this event
   char *shortText;       // Short description of this event (typically the episode name in case of a series)
   char *description;     // Description of this event
   time_t startTime;      // Start time of this event
   int duration;          // Duration of this event in seconds
-  //XXX find an other solution, avoiding channelNumber???
-  int channelNumber;     // the actual channel number from VDR's channel list (used in cMenuSchedule for sorting by channel number)
+  time_t vps;            // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
 public:
   cEvent(tChannelID ChannelID, u_int16_t EventID);
   ~cEvent();
+  virtual bool operator< (const cListObject &ListObject);
   tChannelID ChannelID(void) const { return channelID; }
   u_int16_t EventID(void) const { return eventID; }
   uchar TableID(void) const { return tableID; }
   uchar Version(void) const { return version; }
-  bool IsPresent(void) const { return isPresent; }
-  bool IsFollowing(void) const { return isFollowing; }
+  int RunningStatus(void) const { return runningStatus; }
   const char *Title(void) const { return title; }
   const char *ShortText(void) const { return shortText; }
   const char *Description(void) const { return description; }
   time_t StartTime(void) const { return startTime; }
   int Duration(void) const { return duration; }
-  int ChannelNumber(void) const { return channelNumber; }
+  time_t Vps(void) const { return vps; }
+  bool HasTimer(void) const;
   const char *GetDateString(void) const;
   const char *GetTimeString(void) const;
   const char *GetEndTimeString(void) const;
+  const char *GetVpsString(void) const;
   void SetEventID(u_int16_t EventID);
   void SetTableID(uchar TableID);
   void SetVersion(uchar Version);
-  void SetIsPresent(bool IsPresent);
-  void SetIsFollowing(bool IsFollowing);
+  void SetRunningStatus(int RunningStatus);
   void SetTitle(const char *Title);
   void SetShortText(const char *ShortText);
   void SetDescription(const char *Description);
   void SetStartTime(time_t StartTime);
   void SetDuration(int Duration);
-  void SetChannelNumber(int ChannelNumber) const { ((cEvent *)this)->channelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const' //XXX
+  void SetVps(time_t Vps);
   void Dump(FILE *f, const char *Prefix = "") const;
   static bool Read(FILE *f, cSchedule *Schedule);
   void FixEpgBugs(void);
@@ -77,24 +77,22 @@ class cSchedule : public cListObject  {
 private:
   tChannelID channelID;
   cList<cEvent> events;
-  cEvent *present;
-  cEvent *following;
 public:
   cSchedule(tChannelID ChannelID);
   tChannelID ChannelID(void) const { return channelID; }
-  bool SetPresentEvent(cEvent *Event);
-  bool SetFollowingEvent(cEvent *Event);
+  void SetRunningStatus(cEvent *Event, int RunningStatus);
   void ResetVersions(void);
+  void Sort(void);
   void Cleanup(time_t Time);
   void Cleanup(void);
   cEvent *AddEvent(cEvent *Event);
-  const cEvent *GetPresentEvent(void) const;
-  const cEvent *GetFollowingEvent(void) const;
+  const cEvent *GetPresentEvent(bool CheckRunningStatus = false) const;
+  const cEvent *GetFollowingEvent(bool CheckRunningStatus = false) const;
   const cEvent *GetEvent(u_int16_t EventID, time_t StartTime = 0) const;
   const cEvent *GetEventAround(time_t Time) const;
   const cEvent *GetEventNumber(int n) const { return events.Get(n); }
   int NumEvents(void) const { return events.Count(); }
-  void Dump(FILE *f, const char *Prefix = "") const;
+  void Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0) const;
   static bool Read(FILE *f, cSchedules *Schedules);
   };
 
@@ -125,7 +123,7 @@ class cSchedules : public cList<cSchedule> {
   static void Cleanup(bool Force = false);
   static void ResetVersions(void);
   static bool ClearAll(void);
-  static bool Dump(FILE *f, const char *Prefix = "");
+  static bool Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0);
   static bool Read(FILE *f = NULL);
   cSchedule *AddSchedule(tChannelID ChannelID);
   const cSchedule *GetSchedule(tChannelID ChannelID) const;
diff --git a/epg2html.pl b/epg2html.pl
index 6b7b8c942..c6e6f9cf2 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.4 2002/05/30 09:46:46 kls Exp $
+# $Id: epg2html.pl 1.5 2004/02/22 13:18:27 kls Exp $
 
 @Index = ();
 
@@ -47,13 +47,14 @@ sub Tags
          while (<>) {
                if (/^E (.*?) (.*?) ([^ ]*)/) {
                   (my $Time, $Duration) = ($2, $3);
-                  my $Title = "", $Subtitle = "", $Description = "";
+                  my $Title = "", $Subtitle = "", $Description = "", $Vps = 0;
                   while (<>) {
                         if    (/^T (.*)/) { $Title       = Tags($1); }
                         elsif (/^S (.*)/) { $Subtitle    = Tags($1); }
                         elsif (/^D (.*)/) { $Description = Tags($1); }
+                        elsif (/^V (.*)/) { $Vps         = $1; }
                         elsif (/^e/) {
-                           $Events{$Time} = [($Duration, $Title, $Subtitle, $Description)];
+                           $Events{$Time} = [($Duration, $Title, $Subtitle, $Description, $Vps)];
                            last;
                            }
                         }
@@ -62,7 +63,7 @@ sub Tags
                   my @Schedule = ();
                   my $Day = "";
                   for $t (sort keys %Events) {
-                      (my $Duration, $Title, $Subtitle, $Description) = @{$Events{$t}};
+                      (my $Duration, $Title, $Subtitle, $Description, $Vps) = @{$Events{$t}};
                       my $d = GetDay($t);
                       if ($d ne $Day) {
                          push(@Schedule, "</table>\n") if ($Day && @Schedule);
@@ -73,6 +74,7 @@ sub Tags
                       my $Entry = $Title;
                       $Entry .= "<br><i>$Subtitle</i>" if $Subtitle;
                       $Entry .= "<br>$Description" if $Description;
+                      $Entry .= "<br>(VPS = " . scalar localtime($Vps) . ")" if $Vps && $Vps != $t;
                       push(@Schedule, "<tr><td valign=top>" . GetTime($t) . "</td><td>$Entry</td></tr>\n");
                       }
                   push(@Schedule, "</table>\n") if (@Schedule);
diff --git a/i18n.c b/i18n.c
index f87827b63..8983d6fd9 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.146 2004/01/25 14:41:02 kls Exp $
+ * $Id: i18n.c 1.148 2004/02/21 15:14:36 kls Exp kls $
  *
  * Translations provided by:
  *
@@ -835,7 +835,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "�����������",
   },
   // Confirmations:
   { "Delete channel?",
@@ -1542,6 +1542,24 @@ const tI18nPhrase Phrases[] = {
     "Fi",
     "�����",
   },
+  { "VPS",
+    "VPS",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Priority",
     "Priorit�t",
     "Prioriteta",
@@ -2355,6 +2373,24 @@ const tI18nPhrase Phrases[] = {
     "Nivell de correcci� de la Guia",
     "������� ��������� ������",
   },
+  { "Setup.EPG$EPG linger time (min)",
+    "Alte EPG-Daten anzeigen (min)",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Vanha tieto n�kyy (min)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Visa gammal info (min)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
     "Nastavi sistemski cas",
@@ -2787,6 +2823,42 @@ const tI18nPhrase Phrases[] = {
     "Utilitzar el nom de l'episodi",
     "������������ ����� �� ��������",
   },
+  { "Setup.Recording$Use VPS",
+    "VPS benutzen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.Recording$VPS margin (s)",
+    "Zeitpuffer bei VPS (s)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
     "Oznaci direktno snemanje",
@@ -4140,7 +4212,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Ennek a plugin-nak nincs setup-parametere!",
     "Aquest plugin no admet configuraci�!",
-    "������ ���������� �� ����� ���������� ���������!",
+    "������ �� ����� ���������� ���������!",
    },
   { NULL }
   };
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 55a6a9c0c..0b0019f8d 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.5 2004/01/24 14:52:41 kls Exp $
+ *   $Id: descriptor.c 1.6 2004/02/22 11:11:36 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -529,6 +529,27 @@ void ISO639LanguageDescriptor::Parse() {
    languageCode[3]=0;
 }
 
+void PDCDescriptor::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const descr_pdc>(s, offset);
+}
+
+int PDCDescriptor::getDay() const {
+   return ((s->pil0 & 0x0F) << 1) | ((s->pil1 & 0x80) >> 7);
+}
+
+int PDCDescriptor::getMonth() const {
+   return (s->pil1 >> 3) & 0x0F;
+}
+
+int PDCDescriptor::getHour() const {
+   return ((s->pil1 & 0x07) << 2) | ((s->pil2 & 0xC0) >> 6);
+}
+
+int PDCDescriptor::getMinute() const {
+   return s->pil2 & 0x3F;
+}
+
 void ApplicationSignallingDescriptor::Parse() {
    entryLoop.setData(data+sizeof(descr_application_signalling), getLength()-sizeof(descr_application_signalling));
 }
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 5541cc416..17c81eb09 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.5 2004/01/24 14:52:05 kls Exp $
+ *   $Id: descriptor.h 1.6 2004/02/22 10:16:47 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -383,6 +383,18 @@ class ISO639LanguageDescriptor : public Descriptor {
    const descr_iso_639_language *s;
 };
 
+class PDCDescriptor : public Descriptor {
+public:
+   int getDay() const;
+   int getMonth() const;
+   int getHour() const;
+   int getMinute() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_pdc *s;
+};
+
 //a descriptor currently unimplemented in this library
 class UnimplementedDescriptor : public Descriptor {
 protected:
diff --git a/libsi/headers.h b/libsi/headers.h
index d5c11999f..ff3e0f95e 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.2 2003/12/13 10:43:26 kls Exp $
+ *   $Id: headers.h 1.4 2004/02/22 11:12:46 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -257,7 +257,48 @@ struct pmt_info {
 
 /*
  *
- *    4) Network Information Table (NIT):
+ *    4) Transport Stream Description Table (TSDT):
+ *
+ *       - The TSDT carries a loop of descriptors that apply to
+ *         the whole transport stream. The syntax and semantics
+ *         of the TSDT are defined in newer versions of ISO/IEC 13818-1.
+ *
+ */
+
+#define TSDT_LEN 8
+
+struct tsdt {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char dummy                                  :1; // has to be 0
+   u_char                                        :2;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :2;
+   u_char dummy                                  :1; // has to be 0
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char                                        :8;
+   u_char                                        :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+};
+
+/*
+ *
+ *    5) Network Information Table (NIT):
  *
  *       - the NIT is intended to provide information about the physical
  *         network. The syntax and semantics of the NIT are defined in
@@ -468,7 +509,7 @@ struct eit {
    u_char original_network_id_hi                 :8;
    u_char original_network_id_lo                 :8;
    u_char segment_last_section_number            :8;
-   u_char segment_last_table_id                  :8;
+   u_char last_table_id                          :8;
 };
 
 #define EIT_EVENT_LEN 12
@@ -1416,11 +1457,19 @@ struct descr_dsng {
 
 /* 0x69 pdc_descriptor */
 
-#define DESCR_PDC_LEN XX
+#define DESCR_PDC_LEN 5
 struct descr_pdc {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char pil2                                   :8;
+   u_char pil1                                   :8;
+   u_char pil0                                   :8;
+#else
+   u_char pil0                                   :8;
+   u_char pil1                                   :8;
+   u_char pil2                                   :8;
+#endif
 };
 
 /* 0x6A ac3_descriptor */
diff --git a/libsi/section.c b/libsi/section.c
index 0de2a573c..2cac809df 100644
--- a/libsi/section.c
+++ b/libsi/section.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.c 1.2 2003/12/13 10:42:14 kls Exp $
+ *   $Id: section.c 1.3 2004/02/20 13:44:59 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -76,6 +76,14 @@ void PMT::Stream::Parse() {
    streamDescriptors.setData(data+offset, HILO(s->ES_info_length));
 }
 
+/*********************** TSDT ***********************/
+
+void TSDT::Parse() {
+   unsigned int offset=0;
+   data.setPointerAndOffset<const tsdt>(s, offset);
+   transportStreamDescriptors.setDataAndOffset(data+offset, getLength()-offset-4, offset);
+}
+
 /*********************** NIT ***********************/
 
 int NIT::getNetworkId() const {
@@ -161,6 +169,14 @@ int EIT::getOriginalNetworkId() const {
    return HILO(s->original_network_id);
 }
 
+int EIT::getSegmentLastSectionNumber() const {
+   return s->segment_last_section_number;
+}
+
+int EIT::getLastTableId() const {
+   return s->last_table_id;
+}
+
 bool EIT::isPresentFollowing() const {
    return getTableId() == TableIdEIT_presentFollowing || getTableId() == TableIdEIT_presentFollowing_other;
 }
diff --git a/libsi/section.h b/libsi/section.h
index efca9bb67..5b43f05f4 100644
--- a/libsi/section.h
+++ b/libsi/section.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.h 1.2 2003/12/13 10:42:15 kls Exp $
+ *   $Id: section.h 1.3 2004/02/20 13:45:45 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -77,6 +77,17 @@ class PMT : public NumberedSection {
    const pmt *s;
 };
 
+class TSDT : public NumberedSection {
+public:
+   TSDT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   TSDT() {}
+   DescriptorLoop transportStreamDescriptors;
+protected:
+   virtual void Parse();
+private:
+   const tsdt *s;
+};
+
 class NIT : public NumberedSection {
 public:
    NIT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
@@ -166,6 +177,8 @@ class EIT : public NumberedSection {
    int getServiceId() const;
    int getTransportStreamId() const;
    int getOriginalNetworkId() const;
+   int getSegmentLastSectionNumber() const;
+   int getLastTableId() const;
    StructureLoop<Event> eventLoop;
 
    //true if table conveys present/following information, false if it conveys schedule information
diff --git a/libsi/si.c b/libsi/si.c
index 4264feb63..ee6480207 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.6 2004/01/23 14:27:45 kls Exp $
+ *   $Id: si.c 1.8 2004/02/22 10:14:12 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -61,6 +61,14 @@ bool CRCSection::CheckCRCAndParse() {
    return true;
 }
 
+int NumberedSection::getTableIdExtension() const {
+   return getTableIdExtension(data.getData());
+}
+
+int NumberedSection::getTableIdExtension(const unsigned char *d) {
+   return HILO(((const ExtendedSectionHeader *)d)->table_id_extension);
+}
+
 bool NumberedSection::getCurrentNextIndicator() const {
    return data.getData<ExtendedSectionHeader>()->current_next_indicator;
 }
@@ -326,6 +334,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case ISO639LanguageDescriptorTag:
             d=new ISO639LanguageDescriptor();
             break;
+         case PDCDescriptorTag:
+            d=new PDCDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -367,7 +378,6 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case CaSystemDescriptorTag:
          case AC3DescriptorTag:
          case DSNGDescriptorTag:
-         case PDCDescriptorTag:
          case AncillaryDataDescriptorTag:
          case AnnouncementSupportDescriptorTag:
          case AdaptationFieldDataDescriptorTag:
diff --git a/libsi/si.h b/libsi/si.h
index 4666c2d4d..befff85b0 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.6 2004/01/12 16:19:11 kls Exp $
+ *   $Id: si.h 1.8 2004/02/23 17:02:33 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -36,7 +36,7 @@ enum TableId { TableIdPAT = 0x00, //program association section
                TableIdEIT_schedule_last = 0x5F,
                //range from 0x60 to 0x6F
                TableIdEIT_schedule_Other_first = 0x60,
-               TableIdEIT_schedule_Other_fast = 0x6F,
+               TableIdEIT_schedule_Other_last = 0x6F,
                TableIdTDT = 0x70, //time date section
                TableIdRST = 0x71, //running status section
                TableIdST  = 0x72, //stuffing section
@@ -216,11 +216,14 @@ class NumberedSection : public CRCSection {
 public:
    NumberedSection(const unsigned char *data, bool doCopy=true) : CRCSection(data, doCopy) {}
    NumberedSection() {}
+   int getTableIdExtension() const;
    bool getCurrentNextIndicator() const;
    int getVersionNumber() const;
    int getSectionNumber() const;
    int getLastSectionNumber() const;
    bool moreThanOneSection()  const { return getLastSectionNumber()>0; }
+
+   static int getTableIdExtension(const unsigned char *d);
 };
 
 class VariableLengthPart : public Object {
diff --git a/menu.c b/menu.c
index 6a7907f71..c15315111 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.284 2004/02/08 15:06:42 kls Exp $
+ * $Id: menu.c 1.292 2004/02/22 14:14:55 kls Exp kls $
  */
 
 #include "menu.h"
@@ -18,6 +18,7 @@
 #include "cutter.h"
 #include "eitscan.h"
 #include "i18n.h"
+#include "libsi/si.h"
 #include "menuitems.h"
 #include "plugin.h"
 #include "recording.h"
@@ -557,8 +558,12 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
   channel = Channel;
   if (channel) {
      data = *channel;
-     if (New)
+     if (New) {
         channel = NULL;
+        data.nid = 0;
+        data.tid = 0;
+        data.rid = 0;
+        }
      Setup();
      }
 }
@@ -583,7 +588,7 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpids[1], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
   Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0], true));//XXX
-  Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 0));
+  Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 1, 0xFFFF));
   /* XXX not yet used
   Add(new cMenuEditIntItem( tr("Nid"),          &data.nid, 0));
   Add(new cMenuEditIntItem( tr("Tid"),          &data.tid, 0));
@@ -867,13 +872,14 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
   if (timer) {
      data = *timer;
      if (New)
-        data.active = 1;
+        data.SetFlags(tfActive);
      channel = data.Channel()->Number();
-     Add(new cMenuEditBoolItem(tr("Active"),       &data.active));
+     Add(new cMenuEditBitItem( tr("Active"),       &data.flags, tfActive));
      Add(new cMenuEditChanItem(tr("Channel"),      &channel));
      Add(new cMenuEditDayItem( tr("Day"),          &data.day));
      Add(new cMenuEditTimeItem(tr("Start"),        &data.start));
      Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop));
+     Add(new cMenuEditBitItem( tr("VPS"),          &data.flags, tfVps));
      Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
      Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), tr(FileNameChars)));
@@ -922,13 +928,13 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                        if (timer) {
                           if (memcmp(timer, &data, sizeof(data)) != 0) {
                              *timer = data;
-                             if (timer->active)
-                                timer->active = 1; // allows external programs to mark active timers with values > 1 and recognize if the user has modified them
+                             if (timer->HasFlags(tfActive))
+                                timer->ClrFlags(~tfAll); // allows external programs to mark active timers with values > 0xFFFF and recognize if the user has modified them
                              }
                           if (addIfConfirmed)
                              Timers.Add(timer);
                           Timers.Save();
-                          isyslog("timer %d %s (%s)", timer->Index() + 1, addIfConfirmed ? "added" : "modified", timer->active ? "active" : "inactive");
+                          isyslog("timer %d %s (%s)", timer->Index() + 1, addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
                           }
                      }
@@ -972,7 +978,7 @@ void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
-                    !timer->Active() ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
+                    !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
                     timer->PrintDay(timer->Day()),
                     timer->Start() / 100,
@@ -1037,7 +1043,7 @@ eOSState cMenuTimers::OnOff(void)
      if (timer->FirstDay())
         isyslog("timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
      else
-        isyslog("timer %d %sactivated", timer->Index() + 1, timer->Active() ? "" : "de");
+        isyslog("timer %d %sactivated", timer->Index() + 1, timer->HasFlags(tfActive) ? "" : "de");
      Timers.Save();
      }
   return osContinue;
@@ -1164,6 +1170,13 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
            Add(item = new cMenuTextItem(Subtitle, 1, Line, Setup.OSDwidth - 2, -1, clrYellow));
            Line += item->Height() + 1;
            }
+        if (Event->Vps() && Event->Vps() != Event->StartTime()) {
+           char *buffer;
+           asprintf(&buffer, "VPS: %s", Event->GetVpsString());
+           Add(item = new cMenuTextItem(buffer, 1, Line, Setup.OSDwidth - 2, -1, clrYellow));
+           free(buffer);
+           Line += item->Height() + 1;
+           }
         if (!isempty(ExtendedDescription))
            Add(new cMenuTextItem(ExtendedDescription, 1, Line, Setup.OSDwidth - 2, Height() - Line - 2, clrCyan), true);
         SetHelp(tr("Record"), NULL, NULL, CanSwitch ? tr("Switch") : NULL);
@@ -1191,15 +1204,20 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
 class cMenuWhatsOnItem : public cOsdItem {
 public:
   const cEvent *event;
-  cMenuWhatsOnItem(const cEvent *Event);
+  const cChannel *channel;
+  cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel);
 };
 
-cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event)
+cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel)
 {
   event = Event;
+  channel = Channel;
   char *buffer = NULL;
-  cChannel *channel = Channels.GetByNumber(event->ChannelNumber());
-  asprintf(&buffer, "%d\t%.*s\t%.*s\t%s", event->ChannelNumber(), 6, channel ? channel->Name() : "???", 5, event->GetTimeString(), event->Title());
+  int TimerMatch;
+  char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
+  char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
+  char r = event->RunningStatus() > SI::RunningStatusNotRunning ? '*' : ' ';
+  asprintf(&buffer, "%d\t%.*s\t%.*s\t%c%c%c\t%s", channel->Number(), 6, channel->Name(), 5, event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1222,39 +1240,20 @@ class cMenuWhatsOn : public cOsdMenu {
 int cMenuWhatsOn::currentChannel = 0;
 const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 
-static int CompareEventChannel(const void *p1, const void *p2)
-{
-  return (int)( (*(const cEvent **)p1)->ChannelNumber() - (*(const cEvent **)p2)->ChannelNumber());
-}
-
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
-:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6)
-{
-  const cSchedule *Schedule = Schedules->First();
-  const cEvent **pArray = NULL;
-  int num = 0;
-
-  while (Schedule) {
-        pArray = (const cEvent **)realloc(pArray, (num + 1) * sizeof(cEvent *));
-
-        pArray[num] = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
-        if (pArray[num]) {
-           cChannel *channel = Channels.GetByChannelID(pArray[num]->ChannelID(), true);
-           if (channel) {
-              pArray[num]->SetChannelNumber(channel->Number());
-              num++;
-              }
-           }
-        Schedule = (const cSchedule *)Schedules->Next(Schedule);
-        }
-
-  qsort(pArray, num, sizeof(cEvent *), CompareEventChannel);
-
-  for (int a = 0; a < num; a++)
-      Add(new cMenuWhatsOnItem(pArray[a]), pArray[a]->ChannelNumber() == CurrentChannelNr);
-
+:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6, 4)
+{
+  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+      if (!Channel->GroupSep()) {
+         const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+         if (Schedule) {
+            const cEvent *Event = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
+            if (Event)
+               Add(new cMenuWhatsOnItem(Event, Channel), Channel->Number() == CurrentChannelNr);
+            }
+         }
+      }
   currentChannel = CurrentChannelNr;
-  free(pArray);
   SetHelp(Count() ? tr("Record") : NULL, Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
 }
 
@@ -1306,7 +1305,7 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                        cMenuWhatsOnItem *mi = (cMenuWhatsOnItem *)Get(Current());
                        if (mi) {
                           scheduleEvent = mi->event;
-                          currentChannel = mi->event->ChannelNumber();
+                          currentChannel = mi->channel->Number();
                           }
                      }
                      break;
@@ -1332,7 +1331,11 @@ cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event)
 {
   event = Event;
   char *buffer = NULL;
-  asprintf(&buffer, "%.*s\t%.*s\t%s", 5, event->GetDateString(), 5, event->GetTimeString(), event->Title());
+  int TimerMatch;
+  char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
+  char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
+  char r = event->RunningStatus() > SI::RunningStatusNotRunning ? '*' : ' ';
+  asprintf(&buffer, "%.*s\t%.*s\t%c%c%c\t%s", 5, event->GetDateString(), 5, event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1354,7 +1357,7 @@ class cMenuSchedule : public cOsdMenu {
   };
 
 cMenuSchedule::cMenuSchedule(void)
-:cOsdMenu("", 6, 6)
+:cOsdMenu("", 6, 6, 4)
 {
   now = next = false;
   otherChannel = 0;
@@ -1372,11 +1375,6 @@ cMenuSchedule::~cMenuSchedule()
   cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared
 }
 
-static int CompareEventTime(const void *p1, const void *p2)
-{
-  return (int)((*(cEvent **)p1)->StartTime() - (*(cEvent **)p2)->StartTime());
-}
-
 void cMenuSchedule::PrepareSchedule(cChannel *Channel)
 {
   Clear();
@@ -1387,23 +1385,14 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
   if (schedules) {
      const cSchedule *Schedule = schedules->GetSchedule(Channel->GetChannelID());
      if (Schedule) {
+        const cEvent *PresentEvent = Schedule->GetPresentEvent(Channel->Number() == cDevice::CurrentChannel());
         int num = Schedule->NumEvents();
-        const cEvent **pArray = MALLOC(const cEvent *, num);
-        if (pArray) {
-           time_t now = time(NULL);
-           int numreal = 0;
-           for (int a = 0; a < num; a++) {
-               const cEvent *Event = Schedule->GetEventNumber(a);
-               if (Event->StartTime() + Event->Duration() > now)
-                  pArray[numreal++] = Event;
-               }
-   
-           qsort(pArray, numreal, sizeof(cEvent *), CompareEventTime);
-   
-           for (int a = 0; a < numreal; a++)
-               Add(new cMenuScheduleItem(pArray[a]));
-           free(pArray);
-           }
+        time_t now = time(NULL) - Setup.EPGLinger * 60;
+        for (int a = 0; a < num; a++) {
+            const cEvent *Event = Schedule->GetEventNumber(a);
+            if (Event->StartTime() + Event->Duration() > now || Event == PresentEvent)
+               Add(new cMenuScheduleItem(Event), Event == PresentEvent);
+            }
         }
      }
 }
@@ -2057,6 +2046,7 @@ void cMenuSetupEPG::Setup(void)
 
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"),      &data.EPGScanTimeout));
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"),          &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
+  Add(new cMenuEditIntItem( tr("Setup.EPG$EPG linger time (min)"),     &data.EPGLinger, 0));
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
   if (data.SetSystemTime)
      Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
@@ -2314,6 +2304,8 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditIntItem( tr("Setup.Recording$Pause priority"),            &data.PausePriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Pause lifetime (d)"),        &data.PauseLifetime, 0, MAXLIFETIME));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Use VPS"),                   &data.UseVps));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$VPS margin (s)"),            &data.VpsMargin, 0));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
   Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
@@ -2784,7 +2776,7 @@ void cDisplayChannel::DisplayInfo(void)
         if (Schedule) {
            const char *PresentTitle = NULL, *PresentSubtitle = NULL, *FollowingTitle = NULL, *FollowingSubtitle = NULL;
            int Lines = 0;
-           if ((Present = Schedule->GetPresentEvent()) != NULL) {
+           if ((Present = Schedule->GetPresentEvent(true)) != NULL) {
               PresentTitle = Present->Title();
               if (!isempty(PresentTitle))
                  Lines++;
@@ -2792,7 +2784,7 @@ void cDisplayChannel::DisplayInfo(void)
               if (!isempty(PresentSubtitle))
                  Lines++;
               }
-           if ((Following = Schedule->GetFollowingEvent()) != NULL) {
+           if ((Following = Schedule->GetFollowingEvent(true)) != NULL) {
               FollowingTitle = Following->Title();
               if (!isempty(FollowingTitle))
                  Lines++;
@@ -3076,11 +3068,12 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      }
   timer->SetPending(true);
   timer->SetRecording(true);
+  event = timer->Event();
 
   const char *Title = NULL;
   const char *Subtitle = NULL;
   const char *Summary = NULL;
-  if (GetEvent()) {
+  if (event || GetEvent()) {
      Title = event->Title();
      Subtitle = event->ShortText();
      Summary = event->Description();
@@ -3135,7 +3128,7 @@ cRecordControl::~cRecordControl()
 bool cRecordControl::GetEvent(void)
 {
   const cChannel *channel = timer->Channel();
-  time_t Time = timer->Active() == taActInst ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
+  time_t Time = timer->HasFlags(tfInstant) ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
         cSchedulesLock SchedulesLock;
@@ -3207,12 +3200,14 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
            cThread::EmergencyExit(true);
            return false;
            }
-        for (int i = 0; i < MAXRECORDCONTROLS; i++) {
-            if (!RecordControls[i]) {
-               RecordControls[i] = new cRecordControl(device, Timer, Pause);
-               return true;
+        if (!Timer || Timer->Matches()) {
+           for (int i = 0; i < MAXRECORDCONTROLS; i++) {
+               if (!RecordControls[i]) {
+                  RecordControls[i] = new cRecordControl(device, Timer, Pause);
+                  return true;
+                  }
                }
-            }
+           }
         }
      else if (!Timer || (Timer->Priority() >= Setup.PrimaryLimit && !Timer->Pending()))
         isyslog("no free DVB device to record channel %d!", ch);
@@ -3237,7 +3232,7 @@ void cRecordControls::Stop(cDevice *Device)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
-         if (RecordControls[i]->Uses(Device)) {
+         if (RecordControls[i]->Device() == Device) {
             isyslog("stopping recording on DVB device %d due to higher priority", Device->CardIndex() + 1);
             RecordControls[i]->Stop(true);
             }
@@ -3316,10 +3311,12 @@ void cRecordControls::ChannelDataModified(cChannel *Channel)
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          if (RecordControls[i]->Timer() && RecordControls[i]->Timer()->Channel() == Channel) {
-            isyslog("stopping recording due to modification of channel %d", Channel->Number());
-            RecordControls[i]->Stop(true);
-            // This will restart the recording, maybe even from a different
-            // device in case conditional access has changed.
+            if (RecordControls[i]->Device()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
+               isyslog("stopping recording due to modification of channel %d", Channel->Number());
+               RecordControls[i]->Stop(true);
+               // This will restart the recording, maybe even from a different
+               // device in case conditional access has changed.
+               }
             }
          }
       }
diff --git a/menu.h b/menu.h
index 041d6f7c2..a03d3a0af 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.59 2004/01/04 11:01:13 kls Exp $
+ * $Id: menu.h 1.60 2004/02/15 14:11:28 kls Exp kls $
  */
 
 #ifndef __MENU_H
@@ -123,7 +123,7 @@ class cRecordControl {
   cRecordControl(cDevice *Device, cTimer *Timer = NULL, bool Pause = false);
   virtual ~cRecordControl();
   bool Process(time_t t);
-  bool Uses(cDevice *Device) { return Device == device; }
+  cDevice *Device(void) { return device; }
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
   const char *InstantId(void) { return instantId; }
diff --git a/menuitems.c b/menuitems.c
index e66415418..e3c99a5cb 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.14 2004/01/25 15:40:55 kls Exp $
+ * $Id: menuitems.c 1.14 2004/01/25 15:40:55 kls Exp kls $
  */
 
 #include "menuitems.h"
@@ -113,6 +113,23 @@ void cMenuEditBoolItem::Set(void)
   SetValue(buf);
 }
 
+// --- cMenuEditBitItem ------------------------------------------------------
+
+cMenuEditBitItem::cMenuEditBitItem(const char *Name, int *Value, int Mask, const char *FalseString, const char *TrueString)
+:cMenuEditBoolItem(Name, &bit, FalseString, TrueString)
+{
+  value = Value;
+  bit = (*value & Mask) != 0;
+  mask = Mask;
+  Set();
+}
+
+void cMenuEditBitItem::Set(void)
+{
+  *value = bit ? *value | mask : *value & ~mask;
+  cMenuEditBoolItem::Set();
+}
+
 // --- cMenuEditNumItem ------------------------------------------------------
 
 cMenuEditNumItem::cMenuEditNumItem(const char *Name, char *Value, int Length, bool Blind)
diff --git a/menuitems.h b/menuitems.h
index f9b2ff301..72a24182d 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.5 2003/01/12 15:06:23 kls Exp $
+ * $Id: menuitems.h 1.5 2003/01/12 15:06:23 kls Exp kls $
  */
 
 #ifndef __MENUITEMS_H
@@ -42,6 +42,16 @@ class cMenuEditBoolItem : public cMenuEditIntItem {
   cMenuEditBoolItem(const char *Name, int *Value, const char *FalseString = NULL, const char *TrueString = NULL);
   };
 
+class cMenuEditBitItem : public cMenuEditBoolItem {
+protected:
+  int *value;
+  int bit;
+  int mask;
+  virtual void Set(void);
+public:
+  cMenuEditBitItem(const char *Name, int *Value, int Mask, const char *FalseString = NULL, const char *TrueString = NULL);
+  };
+
 class cMenuEditNumItem : public cMenuEditItem {
 protected:
   char *value;
diff --git a/nit.c b/nit.c
index f38871647..92c02f1fd 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.5 2004/01/18 16:32:45 kls Exp $
+ * $Id: nit.c 1.6 2004/02/13 14:41:36 kls Exp $
  */
 
 #include "nit.h"
@@ -106,7 +106,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int CodeRate = CodeRates[sd->getFecInner()];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
-                    if (ISTRANSPONDER(Frequency, Transponder())) {
+                    if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) {
                        nits[ThisNIT].hasTransponder = true;
                        //printf("has transponder %d\n", Transponder());
                        }
diff --git a/remux.c b/remux.c
index 5ea24bf9e..65544b5e7 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.17 2003/09/14 10:34:39 kls Exp $
+ * $Id: remux.c 1.18 2004/02/14 10:40:37 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -114,6 +114,7 @@
 #define SC_PICTURE 0x00  // "picture header"
 
 #define MAXNONUSEFULDATA (10*1024*1024)
+#define MAXNUMUPTERRORS  10
 
 class cTS2PES {
 private:
@@ -459,6 +460,7 @@ cRemux::cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOn
   dPid1 = DPid1;
   dPid2 = DPid2;
   exitOnFailure = ExitOnFailure;
+  numUPTerrors = 0;
   synced = false;
   skipped = 0;
   resultCount = resultDelivered = 0;
@@ -618,8 +620,11 @@ XXX*/
                      if (l < 0)
                         return NULL; // no useful data found, wait for more
                      if (pt != NO_PICTURE) {
-                        if (pt < I_FRAME || B_FRAME < pt)
+                        if (pt < I_FRAME || B_FRAME < pt) {
                            esyslog("ERROR: unknown picture type '%d'", pt);
+                           if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure)
+                              cThread::EmergencyExit(true);
+                           }
                         else if (!synced) {
                            if (pt == I_FRAME) {
                               resultDelivered = i; // will drop everything before this position
diff --git a/remux.h b/remux.h
index e953001d6..31e64dfbf 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.10 2003/04/26 14:13:11 kls Exp $
+ * $Id: remux.h 1.11 2004/02/14 10:40:41 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -30,6 +30,7 @@ class cTS2PES;
 class cRemux {
 private:
   bool exitOnFailure;
+  int numUPTerrors;
   bool synced;
   int skipped;
   int vPid, aPid1, aPid2, dPid1, dPid2;
diff --git a/svdrp.c b/svdrp.c
index 4ade5ec98..b73d21152 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.59 2004/01/31 10:13:50 kls Exp $
+ * $Id: svdrp.c 1.60 2004/02/22 15:31:23 kls Exp kls $
  */
 
 #include "svdrp.h"
@@ -205,8 +205,12 @@ const char *HelpPages[] = {
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
   "    containing the given string as part of their name are listed.",
-  "LSTE\n"
-  "    List EPG data.",
+  "LSTE [ <channel> ] [ now | next | at <time> ]\n"
+  "    List EPG data. Without any parameters all data of all channels is\n"
+  "    listed. If a channel is given (either by number of by channel ID),\n",
+  "    only data for that channel is listed. 'now', 'next', or 'at <time>'\n"
+  "    restricts the returned data to present events, following events, or\n"
+  "    events at the given time (which must be in time_t form)."
   "LSTR [ <number> ]\n"
   "    List recordings. Without option, all recordings are listed. Otherwise\n"
   "    the summary for the given recording is listed.",
@@ -714,9 +718,65 @@ void cSVDRP::CmdLSTE(const char *Option)
   cSchedulesLock SchedulesLock;
   const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
   if (Schedules) {
+     const cSchedule* Schedule = NULL;
+     eDumpMode DumpMode = dmAll;
+     time_t AtTime = 0;
+     if (*Option) {
+        char buf[strlen(Option) + 1];
+        strcpy(buf, Option);
+        const char *delim = " \t";
+        char *p = strtok(buf, delim);
+        while (p && DumpMode == dmAll) {
+              if (strcasecmp(p, "NOW") == 0)
+                 DumpMode = dmPresent;
+              else if (strcasecmp(p, "NEXT") == 0)
+                 DumpMode = dmFollowing;
+              else if (strcasecmp(p, "AT") == 0) {
+                 DumpMode = dmAtTime;
+                 if ((p = strtok(NULL, delim)) != NULL) {
+                    if (isnumber(p))
+                       AtTime = strtol(p, NULL, 10);
+                    else {
+                       Reply(501, "Invalid time");
+                       return;
+                       }
+                    }
+                 else {
+                    Reply(501, "Missing time");
+                    return;
+                    }
+                 }
+              else if (!Schedule) {
+                 cChannel* Channel = NULL;
+                 if (isnumber(p))
+                    Channel = Channels.GetByNumber(strtol(Option, NULL, 10));
+                 else
+                    Channel = Channels.GetByChannelID(tChannelID::FromString(Option));
+                 if (Channel) {
+                    Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+                    if (!Schedule) {
+                       Reply(550, "No schedule found");
+                       return;
+                       }
+                    }
+                 else {
+                    Reply(550, "Channel \"%s\" not defined", p);
+                    return;
+                    }
+                 }
+              else {
+                 Reply(501, "Unknown option: \"%s\"", p);
+                 return;
+                 }
+              p = strtok(NULL, delim);
+              }
+        }
      FILE *f = fdopen(file, "w");
      if (f) {
-        Schedules->Dump(f, "215-");
+        if (Schedule)
+           Schedule->Dump(f, "215-", DumpMode, AtTime);
+        else
+           Schedules->Dump(f, "215-", DumpMode, AtTime);
         fflush(f);
         Reply(215, "End of EPG data");
         // don't 'fclose(f)' here!
@@ -741,7 +801,7 @@ void cSVDRP::CmdLSTR(const char *Option)
               free(summary);
               }
            else
-              Reply(550, "No summary availabe");
+              Reply(550, "No summary available");
            }
         else
            Reply(550, "Recording \"%s\" not found", Option);
@@ -845,16 +905,16 @@ void cSVDRP::CmdMODT(const char *Option)
         if (timer) {
            cTimer t = *timer;
            if (strcasecmp(tail, "ON") == 0)
-              t.SetActive(taActive);
+              t.SetFlags(tfActive);
            else if (strcasecmp(tail, "OFF") == 0)
-              t.SetActive(taInactive);
+              t.ClrFlags(tfActive);
            else if (!t.Parse(tail)) {
               Reply(501, "Error in timer settings");
               return;
               }
            *timer = t;
            Timers.Save();
-           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->Active() ? "active" : "inactive");
+           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->HasFlags(tfActive) ? "active" : "inactive");
            Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
            }
         else
diff --git a/timers.c b/timers.c
index 1db88a0fb..b29d6c852 100644
--- a/timers.c
+++ b/timers.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.8 2003/12/27 13:10:04 kls Exp $
+ * $Id: timers.c 1.9 2004/02/13 15:37:49 kls Exp kls $
  */
 
 #include "timers.h"
 #include <ctype.h>
 #include "channels.h"
 #include "i18n.h"
+#include "libsi/si.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -23,8 +24,10 @@ char *cTimer::buffer = NULL;
 cTimer::cTimer(bool Instant, bool Pause)
 {
   startTime = stopTime = 0;
-  recording = pending = false;
-  active = Instant ? taActInst : taInactive;
+  recording = pending = inVpsMargin = false;
+  flags = tfNone;
+  if (Instant)
+     SetFlags(tfActive | tfInstant);
   channel = Channels.GetByNumber(cDevice::CurrentChannel());
   time_t t = time(NULL);
   struct tm tm_r;
@@ -40,6 +43,7 @@ cTimer::cTimer(bool Instant, bool Pause)
   *file = 0;
   firstday = 0;
   summary = NULL;
+  event = NULL;
   if (Instant && channel)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
 }
@@ -47,12 +51,17 @@ cTimer::cTimer(bool Instant, bool Pause)
 cTimer::cTimer(const cEvent *Event)
 {
   startTime = stopTime = 0;
-  recording = pending = false;
-  active = true;
+  recording = pending = inVpsMargin = false;
+  flags = tfActive;
+  if (Event->Vps() && Setup.UseVps)
+     SetFlags(tfVps);
   channel = Channels.GetByChannelID(Event->ChannelID(), true);
-  time_t tstart = Event->StartTime();
-  time_t tstop = tstart + Event->Duration() + Setup.MarginStop * 60;
-  tstart -= Setup.MarginStart * 60;
+  time_t tstart = (flags & tfVps) ? Event->Vps() : Event->StartTime();
+  time_t tstop = tstart + Event->Duration();
+  if (!(HasFlags(tfVps))) {
+     tstop  += Setup.MarginStop * 60;
+     tstart -= Setup.MarginStart * 60;
+     }
   struct tm tm_r;
   struct tm *time = localtime_r(&tstart, &tm_r);
   day = time->tm_mday;
@@ -69,6 +78,7 @@ cTimer::cTimer(const cEvent *Event)
      strn0cpy(file, Event->Title(), sizeof(file));
   firstday = 0;
   summary = NULL;
+  event = Event;
 }
 
 cTimer::~cTimer()
@@ -81,6 +91,7 @@ cTimer& cTimer::operator= (const cTimer &Timer)
   memcpy(this, &Timer, sizeof(*this));
   if (summary)
      summary = strdup(summary);
+  event = NULL;
   return *this;
 }
 
@@ -97,7 +108,7 @@ const char *cTimer::ToText(bool UseChannelID)
   free(buffer);
   strreplace(file, ':', '|');
   strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", active, UseChannelID ? Channel()->GetChannelID().ToString() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
+  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? Channel()->GetChannelID().ToString() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
   return buffer;
@@ -205,7 +216,7 @@ bool cTimer::Parse(const char *s)
      s = s2;
      }
   bool result = false;
-  if (8 <= sscanf(s, "%d :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &active, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
+  if (8 <= sscanf(s, "%d :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
      if (summary && !*skipspace(summary)) {
         free(summary);
         summary = NULL;
@@ -219,7 +230,7 @@ bool cTimer::Parse(const char *s)
      if (isnumber(channelbuffer))
         channel = Channels.GetByNumber(atoi(channelbuffer));
      else
-        channel = Channels.GetByChannelID(tChannelID::FromString(channelbuffer), true);
+        channel = Channels.GetByChannelID(tChannelID::FromString(channelbuffer), true, true);
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;
@@ -290,7 +301,7 @@ char *cTimer::SetFile(const char *File)
   return file;
 }
 
-bool cTimer::Matches(time_t t)
+bool cTimer::Matches(time_t t, bool Directly)
 {
   startTime = stopTime = 0;
   if (t == 0)
@@ -316,9 +327,35 @@ bool cTimer::Matches(time_t t)
       }
   if (!startTime)
      startTime = firstday; // just to have something that's more than a week in the future
-  else if (t > startTime || t > firstday + SECSINDAY + 3600) // +3600 in case of DST change
+  else if (!Directly && (t > startTime || t > firstday + SECSINDAY + 3600)) // +3600 in case of DST change
      firstday = 0;
-  return active && startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
+
+  if (HasFlags(tfActive)) {
+     if (HasFlags(tfVps) && !Directly && event && event->Vps()) {
+        startTime = event->StartTime();
+        stopTime = startTime + event->Duration();
+        return event->RunningStatus() > SI::RunningStatusNotRunning;
+        }
+     return startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
+     }
+  return false;
+}
+
+int cTimer::Matches(const cEvent *Event)
+{
+  if (channel->GetChannelID() == Event->ChannelID()) {
+     bool UseVps = HasFlags(tfVps) && Event->Vps();
+     time_t t1 = UseVps ? Event->Vps() : Event->StartTime();
+     time_t t2 = t1 + Event->Duration();
+     bool m1 = Matches(t1, true);
+     bool m2 = UseVps ? m1 : Matches(t2, true);
+     startTime = stopTime = 0;
+     if (m1 && m2)
+        return tmFull;
+     if (m1 || m2)
+        return tmPartial;
+     }
+  return tmNone;
 }
 
 time_t cTimer::StartTime(void)
@@ -335,6 +372,19 @@ time_t cTimer::StopTime(void)
   return stopTime;
 }
 
+void cTimer::SetEvent(const cEvent *Event)
+{
+  if (event != Event) { //XXX TODO check event data, too???
+     if (Event) {
+        char vpsbuf[64] = "";
+        if (Event->Vps())
+           sprintf(vpsbuf, "(VPS: %s) ", Event->GetVpsString());
+        isyslog("timer %d (%d %04d-%04d '%s') set to event %s %s-%s %s'%s'", Index() + 1, Channel()->Number(), start, stop, file, Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString(), vpsbuf, Event->Title());
+        }
+     event = Event;
+     }
+}
+
 void cTimer::SetRecording(bool Recording)
 {
   recording = Recording;
@@ -346,28 +396,52 @@ void cTimer::SetPending(bool Pending)
   pending = Pending;
 }
 
-void cTimer::SetActive(int Active)
+void cTimer::SetInVpsMargin(bool InVpsMargin)
+{
+  if (InVpsMargin && !inVpsMargin)
+     isyslog("timer %d (%d %04d-%04d '%s') entered VPS margin", Index() + 1, Channel()->Number(), start, stop, file);
+  inVpsMargin = InVpsMargin;
+}
+
+void cTimer::SetFlags(int Flags)
+{
+  flags |= Flags;
+}
+
+void cTimer::ClrFlags(int Flags)
 {
-  active = Active;
+  flags &= ~Flags;
+}
+
+void cTimer::InvFlags(int Flags)
+{
+  flags ^= Flags;
+}
+
+bool cTimer::HasFlags(int Flags)
+{
+  return (flags & Flags) == Flags;
 }
 
 void cTimer::Skip(void)
 {
   firstday = IncDay(SetTime(StartTime(), 0), 1);
+  event = NULL;
 }
 
 void cTimer::OnOff(void)
 {
   if (IsSingleEvent())
-     active = !active;
+     InvFlags(tfActive);
   else if (firstday) {
      firstday = 0;
-     active = false;
+     ClrFlags(tfActive);
      }
-  else if (active)
+  else if (HasFlags(tfActive))
      Skip();
   else
-     active = true;
+     SetFlags(tfActive);
+  event = NULL;
   Matches(); // refresh start and end time
 }
 
@@ -396,12 +470,59 @@ cTimer *cTimers::GetMatch(time_t t)
   return t0;
 }
 
+cTimer *cTimers::GetMatch(const cEvent *Event, int *Match)
+{
+  cTimer *t = NULL;
+  int m = tmNone;
+  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      int tm = ti->Matches(Event);
+      if (tm > m) {
+         t = ti;
+         m = tm;
+         if (m == tmFull)
+            break;
+         }
+      }
+  if (Match)
+     *Match = m;
+  return t;
+}
+
 cTimer *cTimers::GetNextActiveTimer(void)
 {
   cTimer *t0 = NULL;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if (ti->Active() && (!t0 || *ti < *t0))
+      if ((ti->HasFlags(tfActive)) && (!t0 || *ti < *t0))
          t0 = ti;
       }
   return t0;
 }
+
+void cTimers::SetEvents(void)
+{
+  cSchedulesLock SchedulesLock;
+  const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+  if (Schedules) {
+     for (cTimer *ti = First(); ti; ti = Next(ti)) {
+         const cSchedule *Schedule = Schedules->GetSchedule(ti->Channel()->GetChannelID());
+         const cEvent *Event = NULL;
+         if (Schedule) {
+            //XXX what if the Schedule doesn't have any VPS???
+            const cEvent *e;
+            int Match = tmNone;
+            int i = 0;
+            while ((e = Schedule->GetEventNumber(i++)) != NULL) {
+                  int m = ti->Matches(e);
+                  if (m > Match) {
+                     Match = m;
+                     Event = e;
+                     if (Match == tmFull)
+                        break;
+                        //XXX what if there's another event with the same VPS time???
+                     }
+                  }
+            }
+         ti->SetEvent(Event);
+         }
+     }
+}
diff --git a/timers.h b/timers.h
index b70983c22..11fc0b29a 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.6 2003/12/13 13:04:21 kls Exp $
+ * $Id: timers.h 1.6 2003/12/13 13:04:21 kls Exp kls $
  */
 
 #ifndef __TIMERS_H
@@ -15,19 +15,21 @@
 #include "epg.h"
 #include "tools.h"
 
-enum eTimerActive { taInactive = 0,
-                    taActive   = 1,
-                    taInstant  = 2,
-                    taActInst  = (taActive | taInstant)
-                  };
+enum eTimerFlags { tfNone      = 0x0000,
+                   tfActive    = 0x0001,
+                   tfInstant   = 0x0002,
+                   tfVps       = 0x0004,
+                   tfAll       = 0xFFFF,
+                 };
+enum eTimerMatch { tmNone, tmPartial, tmFull };
 
 class cTimer : public cListObject {
   friend class cMenuEditTimer;
 private:
   time_t startTime, stopTime;
   static char *buffer;
-  bool recording, pending;
-  int active;
+  bool recording, pending, inVpsMargin;
+  int flags;
   cChannel *channel;
   int day;
   int start;
@@ -37,6 +39,7 @@ class cTimer : public cListObject {
   char file[MaxFileName];
   time_t firstday;
   char *summary;
+  const cEvent *event;
 public:
   cTimer(bool Instant = false, bool Pause = false);
   cTimer(const cEvent *Event);
@@ -45,7 +48,8 @@ class cTimer : public cListObject {
   virtual bool operator< (const cListObject &ListObject);
   bool Recording(void) { return recording; }
   bool Pending(void) { return pending; }
-  int Active(void) { return active; }
+  bool InVpsMargin(void) { return inVpsMargin; }
+  int Flags(void) { return flags; }
   const cChannel *Channel(void) { return channel; }
   int Day(void) { return day; }
   int Start(void) { return start; }
@@ -56,6 +60,7 @@ class cTimer : public cListObject {
   time_t FirstDay(void) { return firstday; }
   const char *Summary(void) { return summary; }
   const char *ToText(bool UseChannelID = false);
+  const cEvent *Event(void) { return event; }
   bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void);
@@ -65,12 +70,18 @@ class cTimer : public cListObject {
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
   char *SetFile(const char *File);
-  bool Matches(time_t t = 0);
+  bool Matches(time_t t = 0, bool Directly = false);
+  int Matches(const cEvent *Event);
   time_t StartTime(void);
   time_t StopTime(void);
+  void SetEvent(const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
-  void SetActive(int Active);
+  void SetInVpsMargin(bool InVpsMargin);
+  void SetFlags(int Flags);
+  void ClrFlags(int Flags);
+  void InvFlags(int Flags);
+  bool HasFlags(int Flags);
   void Skip(void);
   void OnOff(void);
   const char *PrintFirstDay(void);
@@ -85,10 +96,12 @@ class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
   cTimer *GetMatch(time_t t);
+  cTimer *GetMatch(const cEvent *Event, int *Match = NULL);
   cTimer *GetNextActiveTimer(void);
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
   void DecBeingEdited(void) { beingEdited--; }
+  void SetEvents(void);
   };
 
 extern cTimers Timers;
diff --git a/vdr.5 b/vdr.5
index 7f8626ecf..2947e941e 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.23 2004/01/25 14:44:59 kls Exp $
+.\" $Id: vdr.5 1.25 2004/02/22 13:18:48 kls Exp kls $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -178,6 +178,13 @@ so the above example could also be written as S19.2E-1-1089-12003).
 .br
 The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
 files to properly identify the channels.
+
+If a channel has both \fBNID\fR and \fBTID\fR set to 0, the \fBchannel\ ID\fR
+will use the \fBFrequency\fR instead of the \fBTID\fR. For satellite channels
+an additional offset of 100000, 200000, 300000 or 400000 is added to that
+number, depending on the \fBPolarization\fR (\fBH\fR, \fBV\fR, \fBL\fR or \fBR\fR,
+respectively). This is necessary because on some satellites the same frequency is
+used for two different transponders, with opposite polarization.
 .SS TIMERS
 The file \fItimers.conf\fR contains the timer setup.
 Each line contains one timer definition, with individual fields
@@ -189,12 +196,17 @@ The fields in a timer definition have the following meaning (from left
 to right):
 .TP
 .B Status
-Defines whether this timer is \fBinactive\fR (0) or \fBactive\fR (1).
-The value 3 is used for instant recordings.
-Values other than these can be used by external programs to mark active timers
-and recognize if the user has modified them. When a user modifes an active
-timer the \fBstatus\fR field will be explicitly set to '1' (or '0', respectively,
-if the user deactivates the timer).
+The individual bits in this field have the following meaning:
+.TS
+tab (@);
+l l.
+\fB1\fR@the timer is active (and will record if it hits)
+\fB2\fR@this is an instant recording timer
+\fB4\fR@this timer uses VPS
+.TE
+Bits other than these can be used by external programs to mark active timers
+and recognize if the user has modified them. When a user modifies an active
+timer, the upper 16 bits of this 32 bit parameter will be explicitly set to 0.
 
 Note: in order to allow future extensibility, external programs using the
 \fBstatus\fR parameter should only use the upper 16 bit of this 32 bit parameter
@@ -554,6 +566,7 @@ l l.
 \fBT\fR@<title>
 \fBS\fR@<short text>
 \fBD\fR@<description>
+\fBV\fR@<vps time>
 \fBe\fR@
 \fBc\fR@
 .TE
@@ -576,6 +589,7 @@ l l.
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
+<vps time>     @is the Video Programming Service time of this event
 .TE
 
 This file will be read at program startup in order to restore the results of
diff --git a/vdr.c b/vdr.c
index 916730795..5d438747b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.175 2004/02/08 11:23:29 kls Exp $
+ * $Id: vdr.c 1.177 2004/02/15 14:29:30 kls Exp kls $
  */
 
 #include <getopt.h>
@@ -483,6 +483,7 @@ int main(int argc, char *argv[])
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
   bool UserShutdown = false;
+  bool TimerInVpsMargin = false;
 
   while (!Interrupted) {
         // Handle emergency exits:
@@ -496,11 +497,15 @@ int main(int argc, char *argv[])
         if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
            if (time(NULL) - lastTime > MINCHANNELWAIT) {
-              if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
-                  && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
-                  && !cDevice::SwitchChannel(1) // ...or the next higher available one...
-                  && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
-                 lastTime = time(NULL); // don't do this too often
+              cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
+              if (Channel && (Channel->Vpid() || Channel->Apid1())) {
+                 if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
+                     && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
+                     && !cDevice::SwitchChannel(1) // ...or the next higher available one...
+                     && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
+                    ; 
+                 }   
+              lastTime = time(NULL); // don't do this too often
               LastTimerChannel = -1;
               }
            }
@@ -522,8 +527,10 @@ int main(int argc, char *argv[])
                      cRecordControls::ChannelDataModified(Channel);
                      if (Channel->Number() == cDevice::CurrentChannel()) {
                         if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice()) {
-                           isyslog("retuning due to modification of channel %d", Channel->Number());
-                           Channels.SwitchTo(Channel->Number());
+                           if (cDevice::ActualDevice()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
+                              isyslog("retuning due to modification of channel %d", Channel->Number());
+                              Channels.SwitchTo(Channel->Number());
+                              }
                            }
                         }
                      }
@@ -542,8 +549,15 @@ int main(int argc, char *argv[])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
-           time_t Now = time(NULL); // must do both following calls with the exact same time!
+           static time_t LastSetEvents = 0;//XXX trigger by actual EPG data modification???
+           if (!Menu && time(NULL) - LastSetEvents > 5) {
+              Timers.SetEvents();
+              LastSetEvents = time(NULL);
+              }
+           time_t Now = time(NULL); // must do all following calls with the exact same time!
+           // Process ongoing recordings:
            cRecordControls::Process(Now);
+           // Start new recordings:
            cTimer *Timer = Timers.GetMatch(Now);
            if (Timer) {
               if (!cRecordControls::Start(Timer))
@@ -551,6 +565,21 @@ int main(int argc, char *argv[])
               else
                  LastTimerChannel = Timer->Channel()->Number();
               }
+           // Make sure VPS timers "see" their channel early enough:
+           TimerInVpsMargin = false;
+           for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+               if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording() && !Timer->Pending() && Timer->Matches(Now + Setup.VpsMargin, true)) {
+                  if (!Timer->InVpsMargin()) {
+                     Timer->SetInVpsMargin(true);
+                     TimerInVpsMargin = true;
+                     //XXX if not primary device has TP???
+                     LastTimerChannel = Timer->Channel()->Number();
+                     cRecordControls::Start(Timer); // will only switch the device
+                     }
+                  }
+               else
+                  Timer->SetInVpsMargin(false);
+               }
            }
         // CAM control:
         if (!Menu && !Interface->IsOpen())
@@ -752,7 +781,8 @@ int main(int argc, char *argv[])
              }
            }
         if (!Menu) {
-           EITScanner.Process();
+           if (!TimerInVpsMargin)
+              EITScanner.Process();
            if (!cCutter::Active() && cCutter::Ended()) {
               if (cCutter::Error())
                  Interface->Error(tr("Editing process failed!"));

From 9384e56566f56e77d577319a42929e708936e7c7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Mar 2004 18:00:00 +0100
Subject: [PATCH 098/307] =?UTF-8?q?Version=201.3.6=20-=20Completed=20the?=
 =?UTF-8?q?=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20?=
 =?UTF-8?q?-=20Fixed=20some=20descriptor=20handling=20in=20'libsi'=20(than?=
 =?UTF-8?q?ks=20to=20St=C3=A9phane=20Est=C3=A9-Gracias).=20-=20Fixed=20han?=
 =?UTF-8?q?dling=20the=20current=20menu=20item=20(thanks=20to=20Marc=20Hop?=
 =?UTF-8?q?pe).=20-=20Fixed=20assigning=20events=20to=20timers=20(they=20n?=
 =?UTF-8?q?o=20longer=20get=20"stuck").=20-=20Added=20log=20entries=20when?=
 =?UTF-8?q?ever=20the=20running=20status=20of=20an=20event=20changes=20(cu?=
 =?UTF-8?q?rrently=20=20=20only=20logging=20the=20first=2030=20channels).?=
 =?UTF-8?q?=20-=20Fixed=20handling=20timers=20in=20VPS=20margin=20if=20the?=
 =?UTF-8?q?=20EPG=20scan=20is=20turned=20on=20(the=20EPG=20scan=20=20=20sw?=
 =?UTF-8?q?itched=20the=20device=20away=20from=20the=20channel,=20so=20it?=
 =?UTF-8?q?=20wouldn't=20see=20the=20change=20of=20=20=20the=20running=20s?=
 =?UTF-8?q?tatus).=20-=20Fixed=20handling=20"itemized"=20texts=20in=20EPG?=
 =?UTF-8?q?=20data=20(thanks=20to=20St=C3=A9phane=20Est=C3=A9-Gracias=20?=
 =?UTF-8?q?=20=20for=20pointing=20out=20this=20problem,=20and=20Marcel=20W?=
 =?UTF-8?q?iesweg=20for=20improving=20'libsi').=20-=20Fixed=20handling=20V?=
 =?UTF-8?q?PS=20times=20at=20year=20boundaries.=20-=20Avoiding=20too=20man?=
 =?UTF-8?q?y=20consecutive=20"ring=20buffer=20overflow"=20messages=20(whic?=
 =?UTF-8?q?h=20only=20=20=20slowed=20down=20performance=20even=20more).=20?=
 =?UTF-8?q?-=20Taking=20the=20Sid=20into=20account=20when=20detecting=20ve?=
 =?UTF-8?q?rsion=20changes=20in=20processing=20the=20=20=20PMT=20(thanks?=
 =?UTF-8?q?=20to=20St=C3=A9phane=20Est=C3=A9-Gracias=20for=20pointing=20ou?=
 =?UTF-8?q?t=20this=20problem).=20-=20Completed=20the=20Russian=20OSD=20te?=
 =?UTF-8?q?xts=20(thanks=20to=20Vyacheslav=20Dikonov).=20-=20Any=20newline?=
 =?UTF-8?q?=20characters=20in=20the=20'description'=20of=20EPG=20events=20?=
 =?UTF-8?q?are=20now=20preserved=20=20=20to=20allow=20texts=20to=20be=20di?=
 =?UTF-8?q?splayed=20the=20way=20the=20tv=20stations=20have=20formatted=20?=
 =?UTF-8?q?them.=20=20=20This=20was=20also=20necessary=20to=20better=20dis?=
 =?UTF-8?q?play=20itemized=20texts.=20-=20Fixed=20detecting=20the=20runnin?=
 =?UTF-8?q?g=20status=20in=20case=20an=20empty=20EPG=20event=20is=20broadc?=
 =?UTF-8?q?ast=20(thanks=20=20=20to=20Michael=20Pennewi=C3=9F=20for=20poin?=
 =?UTF-8?q?ting=20this=20out).=20-=20Improved=20performance=20when=20pagin?=
 =?UTF-8?q?g=20through=20very=20long=20menu=20lists.=20-=20Removed=20cSche?=
 =?UTF-8?q?dule::GetEventNumber()=20and=20cSchedule::NumEvents().=20There?=
 =?UTF-8?q?=20is=20now=20=20=20cSchedule::Events()=20that=20returns=20the?=
 =?UTF-8?q?=20list=20of=20events=20directly.=20-=20Avoiding=20occasional?=
 =?UTF-8?q?=20bad=20responsiveness=20to=20user=20interaction=20caused=20by?=
 =?UTF-8?q?=20assigning=20=20=20events=20to=20timers.=20-=20Now=20explicit?=
 =?UTF-8?q?ly=20turning=20on=20the=20LNB=20power=20at=20startup,=20because?=
 =?UTF-8?q?=20newer=20drivers=20don't=20=20=20do=20this=20any=20more=20(th?=
 =?UTF-8?q?anks=20to=20Oliver=20Endriss=20for=20pointing=20this=20out).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS       |  12 ++++
 HISTORY            |  32 ++++++++++
 README.vps         |   6 ++
 channels.conf      |  26 ++++----
 config.c           |   2 +-
 config.h           |   6 +-
 device.h           |   4 +-
 dvbdevice.c        |   3 +-
 eit.c              |  22 +++++--
 eitscan.c          |   2 +-
 eitscan.h          |   2 +-
 epg.c              |  52 +++++++++++----
 epg.h              |  13 ++--
 i18n.c             |  28 ++++----
 libsi/descriptor.c | 156 ++++++++++++++++++++++++++++++++++++++++-----
 libsi/descriptor.h |  27 ++++++--
 libsi/si.c         |  83 +++++++++++++++++++-----
 libsi/si.h         |  63 +++++++++++++++---
 menu.c             |  32 +++-------
 menu.h             |   2 +-
 menuitems.c        |   2 +-
 menuitems.h        |   2 +-
 osd.c              |  36 +++++------
 pat.c              |  18 +++---
 pat.h              |   7 +-
 recorder.c         |   4 +-
 ringbuffer.c       |  17 ++++-
 ringbuffer.h       |   6 +-
 sdt.c              |  27 ++------
 svdrp.c            |   2 +-
 timers.c           |  42 ++++++------
 timers.h           |   2 +-
 transfer.c         |   4 +-
 vdr.5              |   2 +-
 vdr.c              |  16 +++--
 35 files changed, 544 insertions(+), 216 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 438d8275b..1f7223197 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -514,6 +514,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for suggesting to add 'repeat' function keys '7' and '9'
  for fixing handling rc key learning in case cRemote::Initialize() returns 'false'
  for suggesting to change the default "Lifetime" to 99
+ for pointing out that the LNB power needs to be explicitly turned on at startup,
+ because newer drivers don't do this any more
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -943,3 +945,13 @@ Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
 
 St�phane Est�-Gracias <sestegra@free.fr>
  for fixing a typo in libsi/si.h
+ for fixing some descriptor handling in 'libsi'
+ for pointing out a problem with "itemized" texts in EPG data
+ for pointing out a problem with taking the Sid into account when detecting version
+ changes in processing the PMT
+
+Marc Hoppe <MarcHoppe@gmx.de>
+ for fixing handling the current menu item
+
+Michael Pennewi� <M.Pennewiss@ARD-Digital.de>
+ for pointing out that an empty EPG event means there is currently no running event
diff --git a/HISTORY b/HISTORY
index e995005d1..1371dc926 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2713,3 +2713,35 @@ Video Disk Recorder Revision History
   whether an event has a VPS time that's different than its start time, and
   whether an event is currently running (see MANUAL under "The "Schedule" Menu"
   for details).
+
+2004-03-14: Version 1.3.6
+
+- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed some descriptor handling in 'libsi' (thanks to St�phane Est�-Gracias).
+- Fixed handling the current menu item (thanks to Marc Hoppe).
+- Fixed assigning events to timers (they no longer get "stuck").
+- Added log entries whenever the running status of an event changes (currently
+  only logging the first 30 channels).
+- Fixed handling timers in VPS margin if the EPG scan is turned on (the EPG scan
+  switched the device away from the channel, so it wouldn't see the change of
+  the running status).
+- Fixed handling "itemized" texts in EPG data (thanks to St�phane Est�-Gracias
+  for pointing out this problem, and Marcel Wiesweg for improving 'libsi').
+- Fixed handling VPS times at year boundaries.
+- Avoiding too many consecutive "ring buffer overflow" messages (which only
+  slowed down performance even more).
+- Taking the Sid into account when detecting version changes in processing the
+  PMT (thanks to St�phane Est�-Gracias for pointing out this problem).
+- Completed the Russian OSD texts (thanks to Vyacheslav Dikonov).
+- Any newline characters in the 'description' of EPG events are now preserved
+  to allow texts to be displayed the way the tv stations have formatted them.
+  This was also necessary to better display itemized texts.
+- Fixed detecting the running status in case an empty EPG event is broadcast (thanks
+  to Michael Pennewi� for pointing this out).
+- Improved performance when paging through very long menu lists.
+- Removed cSchedule::GetEventNumber() and cSchedule::NumEvents(). There is now
+  cSchedule::Events() that returns the list of events directly.
+- Avoiding occasional bad responsiveness to user interaction caused by assigning
+  events to timers.
+- Now explicitly turning on the LNB power at startup, because newer drivers don't
+  do this any more (thanks to Oliver Endriss for pointing this out).
diff --git a/README.vps b/README.vps
index 2aa19ce8b..d81f5d1a2 100644
--- a/README.vps
+++ b/README.vps
@@ -128,3 +128,9 @@ stations:
   information to control recording would not see the end of that programme.
 
 ... more following as it comes up...
+
+Contact:
+--------
+
+ARD Digital: http://www.ard-digital.de/home/index.php?id=16&languageid=1
+ZDF vision:  http://www.zdf.de/ZDFde/inhalt/1/0,1872,1021601,00.html (select "zdfvision")
diff --git a/channels.conf b/channels.conf
index f36c5f344..ca0b6fc42 100644
--- a/channels.conf
+++ b/channels.conf
@@ -24,9 +24,10 @@ VOX:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1:12480:vC34:S19.2E:27500:511:512:33:0:899:133:33:0
 NEUN LIVE,NEUN LIVE Television:12480:vC34:S19.2E:27500:767:768:35:0:897:133:33:0
 DSF:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
-HSEurope,Home Shopping Europe:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
+HSE24:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
 Bloomberg TV Germany:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+rbb Brandenburg:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News Intl:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -38,20 +39,19 @@ Eurosport:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
 EinsExtra:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
 EinsFestival:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
 EinsMuXx:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
-ZDFtheaterkanal:11953:hC34:S19.2E:27500:1110:1120:130:0:28016:1:1079:0
+ZDFtheaterkanal:11953:hC34:S19.2E:27500:1110:1120=deu:130:0:28016:1:1079:0
 ZDFdokukanal:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
-RBB Brandenburg:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
-RBB Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
+rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1722,1801:8:133:2:0
-PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:0:1702,1722,1801:10:133:2:0
+START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
+PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:0:1702,1801,1722:10:133:2:0
 PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:0:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:0:1702,1722,1801:43:133:2:0
-PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:0:1702,1722,1801:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:0:1702,1722,1801:29:133:2:0
-PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:0:1702,1722,1801:41:133:2:0
-PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:20:133:2:0
+PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:0:1722,1702,1801:43:133:2:0
+PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:0:1801,1722,1702:9:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:0:1801,1702,1722:29:133:2:0
+PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:0:1722,1801,1702:41:133:2:0
+PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:0:1722,1702,1801:20:133:2:0
 DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1702,1722,1801:34:133:17:0
 :Premiere Direkt
 DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
@@ -59,7 +59,7 @@ DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0
 B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
 :Sportsworld
-Konferenz:11719:hC34:S19.2E:27500:255:256=deu:0:1702,1722,1801:17:133:3:0
+SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
 SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:0:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
@@ -114,6 +114,6 @@ Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
 S1T:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
 CNN:12051:vC23:S28.2E:27500:2309:2311=eng:2310:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308=eng,2309=eng:2307:0:7300:2:2022:0
-AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+AL HAYAT:11200:vC56:S13.0E:27500:413:414=eng:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 :@1000 New channels
diff --git a/config.c b/config.c
index 6183eedb7..aaf376abb 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.124 2004/02/21 15:05:40 kls Exp kls $
+ * $Id: config.c 1.125 2004/02/28 11:12:20 kls Exp $
  */
 
 #include "config.h"
diff --git a/config.h b/config.h
index cc1edf282..d2afdeea1 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.188 2004/02/21 15:04:53 kls Exp kls $
+ * $Id: config.h 1.190 2004/03/05 14:35:15 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.5"
-#define VDRVERSNUM   10305  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.6"
+#define VDRVERSNUM   10306  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.h b/device.h
index af6c85f85..5815aca4d 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.40 2004/02/14 11:29:57 kls Exp $
+ * $Id: device.h 1.41 2004/03/14 10:47:01 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -382,7 +382,7 @@ class cDevice : public cThread {
   virtual int PlayVideo(const uchar *Data, int Length);
        ///< Actually plays the given data block as video. The data must be
        ///< part of a PES (Packetized Elementary Stream) which can contain
-       ///< one video and one audio strem.
+       ///< one video and one audio stream.
   virtual void PlayAudio(const uchar *Data, int Length);
        ///< Plays additional audio streams, like Dolby Digital.
        ///< A derived class must call the base class function to make sure data
diff --git a/dvbdevice.c b/dvbdevice.c
index 8ed62e1fd..6e1d7f956 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.82 2004/02/24 10:12:13 kls Exp $
+ * $Id: dvbdevice.c 1.83 2004/03/14 14:47:46 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -101,6 +101,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   useCa = false;
   tunerStatus = tsIdle;
   startTime = time(NULL);
+  CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
   Start();
 }
diff --git a/eit.c b/eit.c
index 85f051ec6..a42647762 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.89 2004/02/22 13:17:52 kls Exp kls $
+ * $Id: eit.c 1.93 2004/03/13 13:54:20 kls Exp $
  */
 
 #include "eit.h"
@@ -43,10 +43,12 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
      Schedules->Add(pSchedule);
      }
 
+  bool Empty = true;
   bool Modified = false;
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.hasNext(it); ) {
+      Empty = false;
       SiEitEvent = eventLoop.getNext(it);
 
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
@@ -82,10 +84,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       pEvent->SetVersion(getVersionNumber());
       pEvent->SetStartTime(SiEitEvent.getStartTime());
       pEvent->SetDuration(SiEitEvent.getDuration());
-      if (isPresentFollowing()) {
-         if (SiEitEvent.getRunningStatus() > SI::RunningStatusNotRunning)
-            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus());
-         }
 
       int LanguagePreferenceShort = -1;
       int LanguagePreferenceExt = -1;
@@ -130,11 +128,16 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  struct tm tm_r;
                  struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
                  t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+                 int month = t.tm_mon;
                  t.tm_mon = pd->getMonth() - 1;
                  t.tm_mday = pd->getDay();
                  t.tm_hour = pd->getHour();
                  t.tm_min = pd->getMinute();
                  t.tm_sec = 0;
+                 if (month == 11 && t.tm_mon == 0) // current month is dec, but event is in jan
+                    t.tm_year++;
+                 else if (month == 0 && t.tm_mon == 11) // current month is jan, but event is in dec
+                    t.tm_year--;
                  time_t vps = mktime(&t);
                  pEvent->SetVps(vps);
                  }
@@ -195,7 +198,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
             }
          if (ExtendedEventDescriptors) {
             char buffer[ExtendedEventDescriptors->getMaximumTextLength()];
-            pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer));
+            pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, ": "));
             }
          }
       delete ExtendedEventDescriptors;
@@ -205,8 +208,15 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
 
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
+      if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
+         if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
+            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
+         }
       Modified = true;
       }
+  if (Empty && Tid == 0x4E && getSectionNumber() == 0)
+     // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
+     pSchedule->ClrRunningStatus(channel);
   if (Modified)
      pSchedule->Sort();
 }
diff --git a/eitscan.c b/eitscan.c
index 54b579b03..191a00e63 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.21 2004/02/14 13:44:31 kls Exp kls $
+ * $Id: eitscan.c 1.21 2004/02/14 13:44:31 kls Exp $
  */
 
 #include "eitscan.h"
diff --git a/eitscan.h b/eitscan.h
index c2ed7fb5b..c5116cb97 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.8 2004/01/17 15:36:24 kls Exp kls $
+ * $Id: eitscan.h 1.8 2004/01/17 15:36:24 kls Exp $
  */
 
 #ifndef __EITSCAN_H
diff --git a/epg.c b/epg.c
index 88d9ee3fb..28d8c1d2b 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.13 2004/02/22 14:41:37 kls Exp kls $
+ * $Id: epg.c 1.18 2004/03/13 15:01:05 kls Exp $
  */
 
 #include "epg.h"
@@ -61,8 +61,11 @@ void cEvent::SetVersion(uchar Version)
   version = Version;
 }
 
-void cEvent::SetRunningStatus(int RunningStatus)
+void cEvent::SetRunningStatus(int RunningStatus, cChannel *Channel)
 {
+  if (Channel && runningStatus != RunningStatus && (RunningStatus > SI::RunningStatusNotRunning || runningStatus > SI::RunningStatusUndefined))
+     if (Channel->Number() <= 30)//XXX maybe log only those that have timers???
+     isyslog("channel %d (%s) event %s '%s' status %d", Channel->Number(), Channel->Name(), GetTimeString(), Title(), RunningStatus);
   runningStatus = RunningStatus;
 }
 
@@ -105,6 +108,11 @@ bool cEvent::HasTimer(void) const
   return false;
 }
 
+bool cEvent::IsRunning(bool OrAboutToStart) const
+{
+  return runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
+}
+
 const char *cEvent::GetDateString(void) const
 {
   static char buf[25];
@@ -146,8 +154,11 @@ void cEvent::Dump(FILE *f, const char *Prefix) const
         fprintf(f, "%sT %s\n", Prefix, title);
      if (!isempty(shortText))
         fprintf(f, "%sS %s\n", Prefix, shortText);
-     if (!isempty(description))
+     if (!isempty(description)) {
+        strreplace(description, '\n', '|');
         fprintf(f, "%sD %s\n", Prefix, description);
+        strreplace(description, '|', '\n');
+        }
      if (vps)
         fprintf(f, "%sV %ld\n", Prefix, vps);
      fprintf(f, "%se\n", Prefix);
@@ -186,8 +197,10 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
              case 'S': if (Event)
                           Event->SetShortText(t);
                        break;
-             case 'D': if (Event)
+             case 'D': if (Event) {
+                          strreplace(t, '|', '\n');
                           Event->SetDescription(t);
+                          }
                        break;
              case 'V': if (Event)
                           Event->SetVps(atoi(t));
@@ -282,11 +295,10 @@ void ReportEpgBugFixStats(bool Reset)
 
 void cEvent::FixEpgBugs(void)
 {
-  // VDR can't usefully handle newline characters in the EPG data, so let's
-  // always convert them to blanks (independent of the setting of EPGBugfixLevel):
+  // VDR can't usefully handle newline characters in the title and shortText of EPG
+  // data, so let's always convert them to blanks (independent of the setting of EPGBugfixLevel):
   strreplace(title, '\n', ' ');
   strreplace(shortText, '\n', ' ');
-  strreplace(description, '\n', ' ');
   // Same for control characters:
   strreplace(title, '\x86', ' ');
   strreplace(title, '\x87', ' ');
@@ -462,6 +474,7 @@ void cEvent::FixEpgBugs(void)
 cSchedule::cSchedule(tChannelID ChannelID)
 {
   channelID = ChannelID;
+  hasRunning = false;;
 }
 
 cEvent *cSchedule::AddEvent(cEvent *Event)
@@ -475,7 +488,7 @@ const cEvent *cSchedule::GetPresentEvent(bool CheckRunningStatus) const
   const cEvent *pe = NULL;
   time_t now = time(NULL);
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
-      if (p->StartTime() <= now && now < p->StartTime() + p->Duration()) {
+      if (p->StartTime() <= now && now < p->EndTime()) {
          pe = p;
          if (!CheckRunningStatus)
             break;
@@ -514,7 +527,7 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
   time_t delta = INT_MAX;
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
       time_t dt = Time - p->StartTime();
-      if (dt >= 0 && dt < delta && p->StartTime() + p->Duration() >= Time) {
+      if (dt >= 0 && dt < delta && p->EndTime() >= Time) {
          delta = dt;
          pe = p;
          }
@@ -522,14 +535,29 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
   return pe;
 }
 
-void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus)
+void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel)
 {
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
       if (p == Event)
-         p->SetRunningStatus(RunningStatus);
+         p->SetRunningStatus(RunningStatus, Channel);
       else if (RunningStatus >= SI::RunningStatusPausing && p->RunningStatus() > SI::RunningStatusNotRunning)
          p->SetRunningStatus(SI::RunningStatusNotRunning);
       }
+  if (RunningStatus >= SI::RunningStatusPausing)
+     hasRunning = true;
+}
+
+void cSchedule::ClrRunningStatus(cChannel *Channel)
+{
+  if (hasRunning) {
+     for (cEvent *p = events.First(); p; p = events.Next(p)) {
+         if (p->RunningStatus() >= SI::RunningStatusPausing) {
+            p->SetRunningStatus(SI::RunningStatusNotRunning, Channel);
+            hasRunning = false;
+            break;
+            }
+         }
+     }
 }
 
 void cSchedule::ResetVersions(void)
@@ -555,7 +583,7 @@ void cSchedule::Cleanup(time_t Time)
       Event = events.Get(a);
       if (!Event)
          break;
-      if (!Event->HasTimer() && Event->StartTime() + Event->Duration() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
+      if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
          events.Del(Event);
          a--;
          }
diff --git a/epg.h b/epg.h
index 4b209b5f2..9a6547ef0 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.10 2004/02/22 14:34:04 kls Exp kls $
+ * $Id: epg.h 1.15 2004/03/14 13:25:39 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -49,9 +49,11 @@ class cEvent : public cListObject {
   const char *ShortText(void) const { return shortText; }
   const char *Description(void) const { return description; }
   time_t StartTime(void) const { return startTime; }
+  time_t EndTime(void) const { return startTime + duration; }
   int Duration(void) const { return duration; }
   time_t Vps(void) const { return vps; }
   bool HasTimer(void) const;
+  bool IsRunning(bool OrAboutToStart = false) const;
   const char *GetDateString(void) const;
   const char *GetTimeString(void) const;
   const char *GetEndTimeString(void) const;
@@ -59,7 +61,7 @@ class cEvent : public cListObject {
   void SetEventID(u_int16_t EventID);
   void SetTableID(uchar TableID);
   void SetVersion(uchar Version);
-  void SetRunningStatus(int RunningStatus);
+  void SetRunningStatus(int RunningStatus, cChannel *Channel = NULL);
   void SetTitle(const char *Title);
   void SetShortText(const char *ShortText);
   void SetDescription(const char *Description);
@@ -77,21 +79,22 @@ class cSchedule : public cListObject  {
 private:
   tChannelID channelID;
   cList<cEvent> events;
+  bool hasRunning;
 public:
   cSchedule(tChannelID ChannelID);
   tChannelID ChannelID(void) const { return channelID; }
-  void SetRunningStatus(cEvent *Event, int RunningStatus);
+  void SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel = NULL);
+  void ClrRunningStatus(cChannel *Channel = NULL);
   void ResetVersions(void);
   void Sort(void);
   void Cleanup(time_t Time);
   void Cleanup(void);
   cEvent *AddEvent(cEvent *Event);
+  const cList<cEvent> *Events(void) const { return &events; }
   const cEvent *GetPresentEvent(bool CheckRunningStatus = false) const;
   const cEvent *GetFollowingEvent(bool CheckRunningStatus = false) const;
   const cEvent *GetEvent(u_int16_t EventID, time_t StartTime = 0) const;
   const cEvent *GetEventAround(time_t Time) const;
-  const cEvent *GetEventNumber(int n) const { return events.Get(n); }
-  int NumEvents(void) const { return events.Count(); }
   void Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0) const;
   static bool Read(FILE *f, cSchedules *Schedules);
   };
diff --git a/i18n.c b/i18n.c
index 8983d6fd9..17cc2a48f 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.148 2004/02/21 15:14:36 kls Exp kls $
+ * $Id: i18n.c 1.152 2004/03/13 10:59:23 kls Exp $
  *
  * Translations provided by:
  *
@@ -1550,6 +1550,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "VPS",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -1557,8 +1558,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "VPS ��������",
   },
   { "Priority",
     "Priorit�t",
@@ -1839,9 +1839,9 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Pas de marques d'�dition d�finies!",
     "",//TODO
-    "",//TODO
+    "Muokkausmerkinn�t puuttuvat!",
     "Brak znakow montazowych!",
-    "Muokkausmerkinn�t puuttuvat",
+    "",//TODO
     "��� ����� ������� ������ ������������",
     "Det finns inga redigeringsm�rken",//TODO
     "",//TODO
@@ -2389,7 +2389,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������� ���������� ������ (���)",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2777,7 +2777,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Priorit� des pauses",
     "",// TODO
-    "Keskeytyksen prioriteetti",
+    "Taukotallenteen prioriteetti",
     "Priorytet przerwy",
     "",// TODO
     "������������� ������������",
@@ -2795,7 +2795,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Dur�e de vie des pauses (j)",
     "",// TODO
-    "Keskeytyksen elinik� (d)",
+    "Taukotallenteen elinik� (d)",
     "Okres trwania przerwy (d)",
     "",// TODO
     "�������� �����������",
@@ -2831,6 +2831,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "K�yt� VPS-toimintoa",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2838,8 +2839,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "������������ ������� VPS",
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
@@ -2849,6 +2849,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "VPS-toiminnon aloitusmarginaali (s)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2856,8 +2857,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "�������� ����� VPS (���)",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -3627,7 +3627,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Pause",
     "",// TODO
-    "Keskeyt�",
+    "Tauko",
     "Przerwa",
     "Pausa",
     "���������",
@@ -4186,7 +4186,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Pause de l'�mission en direct...",
     "",// TODO
-    "Keskeytet��n l�hetys...",
+    "Pys�ytet��n l�hetys...",
     "Zatrzymany program biezacy...",
     "Emisi�n en directo parada...",
     "��������� �������� �������",
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 0b0019f8d..82e2a8f36 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.6 2004/02/22 11:11:36 kls Exp $
+ *   $Id: descriptor.c 1.10 2004/03/13 15:08:12 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -60,13 +60,13 @@ void ExtendedEventDescriptor::Item::Parse() {
    item.setData(data+offset, mid->item_length);
 }
 
-int ExtendedEventDescriptors::getTextLength() {
+/*int ExtendedEventDescriptors::getTextLength() {
    int ret=0;
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
-      ret+=d->text.getLength()+1; //plus a blank
+      ret+=d->text.getLength();
       ExtendedEventDescriptor::Item item;
       for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
          item=d->itemLoop.getNext(it);
@@ -76,28 +76,84 @@ int ExtendedEventDescriptors::getTextLength() {
       }
    }
    return ret;
-}
+}*/
 
-//is there a case where this function does not return the same as getTextLength?
 int ExtendedEventDescriptors::getMaximumTextLength() {
+   return getMaximumTextPlainLength()+getMaximumTextItemizedLength();
+}
+
+char *ExtendedEventDescriptors::getText(const char *separation1, const char *separation2) {
+   char *text=new char[getMaximumTextLength()+strlen(separation1)+strlen(separation2)];
+   return getText(text, separation1, separation2);
+}
+
+char *ExtendedEventDescriptors::getText(char *buffer, const char *separation1, const char *separation2) {
+   int index=0, len;
+   char tempbuf[256];
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
+      d->text.getText(tempbuf);
+      len=strlen(tempbuf);
+      if (len) {
+         memcpy(buffer+index, tempbuf, len);
+         index+=len;
+      }
+   }
+
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
+
+      strcpy(buffer+index, separation2); // let's have a separator between the long text and the items
+      index += strlen(separation2);
+      ExtendedEventDescriptor::Item item;
+      for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
+         item=d->itemLoop.getNext(it);
+
+         item.itemDescription.getText(tempbuf);
+         len=strlen(tempbuf);
+         if (len) {
+            memcpy(buffer+index, tempbuf, len);
+            index+=len;
+         }
+         strcpy(buffer+index, separation1);
+         index += strlen(separation1);
+
+         item.item.getText(tempbuf);
+         len=strlen(tempbuf);
+         if (len) {
+            memcpy(buffer+index, tempbuf, len);
+            index+=len;
+         }
+         strcpy(buffer+index, separation2);
+         index += strlen(separation2);
+      }
+   }
+
+   buffer[index]='\0';
+   return buffer;
+}
+
+int ExtendedEventDescriptors::getMaximumTextPlainLength() {
    int ret=0;
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
-      ret+=d->text.getLength()+1; //plus a blank
-      ret+=d->itemLoop.getLength();
+      ret+=d->text.getLength();
    }
    return ret;
 }
 
-char *ExtendedEventDescriptors::getText() {
-   char *text=new char[getMaximumTextLength()];
-   return getText(text);
+char *ExtendedEventDescriptors::getTextPlain() {
+   char *text=new char[getMaximumTextPlainLength()];
+   return getTextPlain(text);
 }
 
-//appends the Strings of every Descriptor in the group
-char *ExtendedEventDescriptors::getText(char *buffer) {
+char *ExtendedEventDescriptors::getTextPlain(char *buffer) {
    int index=0, len;
    char tempbuf[256];
    for (int i=0;i<length;i++) {
@@ -110,30 +166,98 @@ char *ExtendedEventDescriptors::getText(char *buffer) {
          memcpy(buffer+index, tempbuf, len);
          index+=len;
       }
+   }
+   buffer[index]='\0';
+   return buffer;
+}
+
+int ExtendedEventDescriptors::getMaximumTextItemizedLength() {
+   int ret=0;
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
+      //the size for the two separating characters is included ;-)
+      ret+=d->itemLoop.getLength();
+   }
+   return ret;
+}
+
+char *ExtendedEventDescriptors::getTextItemized(const char *separation1, const char *separation2) {
+   char *text=new char[getMaximumTextItemizedLength()+strlen(separation1)+strlen(separation2)];
+   return getTextItemized(text, separation1, separation2);
+}
+
+char *ExtendedEventDescriptors::getTextItemized(char *buffer, const char *separation1, const char *separation2) {
+   int index=0, len;
+   char tempbuf[256];
+   for (int i=0;i<length;i++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
+      if (!d)
+         continue;
 
       ExtendedEventDescriptor::Item item;
       for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
          item=d->itemLoop.getNext(it);
 
-         item.item.getText(tempbuf);
+         item.itemDescription.getText(tempbuf);
          len=strlen(tempbuf);
          if (len) {
             memcpy(buffer+index, tempbuf, len);
             index+=len;
          }
+         strcpy(buffer+index, separation1);
+         index += strlen(separation1);
 
-         item.itemDescription.getText(tempbuf);
+         item.item.getText(tempbuf);
          len=strlen(tempbuf);
          if (len) {
             memcpy(buffer+index, tempbuf, len);
             index+=len;
          }
+         strcpy(buffer+index, separation2);
+         index += strlen(separation2);
       }
    }
    buffer[index]='\0';
    return buffer;
 }
 
+//returns the itemized text pair by pair. Maximum length for buffers is 256.
+//Return value is false if and only if the end of the list is reached.
+bool ExtendedEventDescriptors::getTextItemized(Loop::Iterator &it, bool &valid, char *itemDescription, char *itemText) {
+   //The iterator has to store two values: The descriptor index (4bit)
+   //and the item loop index (max overall length 256, min item length 16 => max number 128 => 7bit)
+   valid=false;
+
+   int index=(it.i & 0x780) >> 7; // 0x780 == 1111 000 0000
+   it.i &= 0x7F; //0x7F == 111 1111
+
+   for (;index<length;index++) {
+      ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[index];
+      if (!d)
+         continue;
+
+      ExtendedEventDescriptor::Item item;
+      if (d->itemLoop.hasNext(it)) {
+         item=d->itemLoop.getNext(it);
+
+         item.item.getText(itemDescription);
+         item.itemDescription.getText(itemText);
+         valid=true;
+         break;
+      } else {
+         it.reset();
+         continue;
+      }
+   }
+
+   it.i &= 0x7F;
+   it.i |= (index & 0xF) << 7; //0xF == 1111
+
+   return index<length;
+}
+
 int TimeShiftedEventDescriptor::getReferenceServiceId() const {
    return HILO(s->reference_service_id);
 }
@@ -148,7 +272,7 @@ void TimeShiftedEventDescriptor::Parse() {
 
 void ContentDescriptor::Parse() {
    //this descriptor is only a header and a loop
-   nibbleLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader));
+   nibbleLoop.setData(data+sizeof(descr_content), getLength()-sizeof(descr_content));
 }
 
 int ContentDescriptor::Nibble::getContentNibbleLevel1() const {
@@ -173,7 +297,7 @@ void ContentDescriptor::Nibble::Parse() {
 
 void ParentalRatingDescriptor::Parse() {
    //this descriptor is only a header and a loop
-   ratingLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader));
+   ratingLoop.setData(data+sizeof(descr_parental_rating), getLength()-sizeof(descr_parental_rating));
 }
 
 int ParentalRatingDescriptor::Rating::getRating() const {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 17c81eb09..3368b0a97 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.6 2004/02/22 10:16:47 kls Exp $
+ *   $Id: descriptor.h 1.7 2004/03/07 11:13:54 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -50,14 +50,29 @@ class ExtendedEventDescriptor : public GroupDescriptor {
 
 class ExtendedEventDescriptors : public DescriptorGroup {
 public:
-     //don't use
-   int getTextLength();
-     //really fast
    int getMaximumTextLength();
+   //Returns a concatenated version of first the non-itemized and then the itemized text
    //same semantics as with SI::String
-   char *getText();
+   char *getText(const char *separation1="\t", const char *separation2="\n");
    //buffer must at least be getTextLength(), getMaximumTextLength() is a good choice
-   char *getText(char *buffer);
+   char *getText(char *buffer, const char *separation1="\t", const char *separation2="\n");
+
+   //these only return the non-itemized text fields in concatenated form
+   int getMaximumTextPlainLength();
+   char *getTextPlain();
+   char *getTextPlain(char *buffer);
+
+   //these only return the itemized text fields in concatenated form.
+   //Between the description and the text the separation1 character is used,
+   //separation2 used between two pairs. Example:
+   //Director\tSteven Spielberg\nActor\tMichael Mendl\n
+   int getMaximumTextItemizedLength();
+   char *getTextItemized(const char *separation1="\t", const char *separation2="\n");
+   char *getTextItemized(char *buffer, const char *separation1="\t", const char *separation2="\n");
+   //returns the itemized text pair by pair. Maximum length for buffers is 256.
+   //Return value is false if and only if the end of the list is reached.
+   //The argument valid indicates whether the buffers contain valid content.
+   bool getTextItemized(Loop::Iterator &it, bool &valid, char *itemDescription, char *itemText);
 };
 
 class TimeShiftedEventDescriptor : public Descriptor {
diff --git a/libsi/si.c b/libsi/si.c
index ee6480207..9ce46f0d7 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.8 2004/02/22 10:14:12 kls Exp $
+ *   $Id: si.c 1.9 2004/03/07 10:50:09 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -103,7 +103,7 @@ DescriptorTag Descriptor::getDescriptorTag(const unsigned char *d) {
 
 Descriptor *DescriptorLoop::getNext(Iterator &it) {
    if (it.i<getLength()) {
-      return createDescriptor(it.i);
+      return createDescriptor(it.i, true);
    }
    return 0;
 }
@@ -115,19 +115,18 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool return
       const unsigned char *end=p+getLength();
       while (p < end) {
          if (Descriptor::getDescriptorTag(p) == tag) {
-            d=createDescriptor(it.i);
-            break;
+            d=createDescriptor(it.i, returnUnimplemetedDescriptor);
+            if (d)
+               break;
          }
          it.i+=Descriptor::getLength(p);
          p+=Descriptor::getLength(p);
       }
    }
-   if (d && d->getDescriptorTag()==UnimplementedDescriptorTag)
-      return returnUnimplemetedDescriptor ? d : 0;
    return d;
 }
 
-Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplemetedDescriptor) {
+Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplementedDescriptor) {
    Descriptor *d=0;
    if (it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
@@ -135,27 +134,38 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int array
       while (p < end) {
          for (int u=0; u<arrayLength;u++)
             if (Descriptor::getDescriptorTag(p) == tags[u]) {
-               d=createDescriptor(it.i);
+               d=createDescriptor(it.i, returnUnimplementedDescriptor);
                break;
             }
          if (d)
-            break;
+            break; //length is added to it.i by createDescriptor, break here
          it.i+=Descriptor::getLength(p);
          p+=Descriptor::getLength(p);
       }
    }
-   if (d && d->getDescriptorTag()==UnimplementedDescriptorTag)
-      return returnUnimplemetedDescriptor ? d : 0;
    return d;
 }
 
-Descriptor *DescriptorLoop::createDescriptor(int &i) {
-   Descriptor *d=Descriptor::getDescriptor(data+i, domain);
+Descriptor *DescriptorLoop::createDescriptor(int &i, bool returnUnimplemetedDescriptor) {
+   Descriptor *d=Descriptor::getDescriptor(data+i, domain, returnUnimplemetedDescriptor);
+   if (!d)
+      return 0;
    i+=d->getLength();
    d->CheckParse();
    return d;
 }
 
+int DescriptorLoop::getNumberOfDescriptors() {
+   const unsigned char *p=data.getData();
+   const unsigned char *end=p+getLength();
+   int count=0;
+   while (p < end) {
+      count++;
+      p+=Descriptor::getLength(p);
+   }
+   return count;
+}
+
 DescriptorGroup::DescriptorGroup(bool del) {
    array=0;
    length=0;
@@ -211,6 +221,16 @@ char *String::getText(char *buffer) {
    return buffer;
 }
 
+//taken from VDR, Copyright Klaus Schmidinger <kls@cadsoft.de>
+char *String::getText(char *buffer, char *shortVersion) {
+   if (getLength() < 0 || getLength() >4095) {
+      strncpy(buffer, "text error", getLength()+1);
+      return buffer;
+   }
+   decodeText(buffer, shortVersion);
+   return buffer;
+}
+
 //taken from libdtv, Copyright Rolf Hakenes <hakenes@hippomi.de>
 void String::decodeText(char *buffer) {
    const unsigned char *from=data.getData(0);
@@ -228,18 +248,47 @@ void String::decodeText(char *buffer) {
       if (    ((' ' <= *from) && (*from <= '~'))
            || (*from == '\n')
            || (0xA0 <= *from)
+           || (*from == 0x86 || *from == 0x87)
          )
          *to++ = *from;
       else if (*from == 0x8A)
          *to++ = '\n';
-      else if (*from == 0x86 || *from == 0x87) //&& !(GDT_NAME_DESCRIPTOR & type))
+      from++;
+   }
+   *to = '\0';
+}
+
+void String::decodeText(char *buffer, char *shortVersion) {
+   const unsigned char *from=data.getData(0);
+   char *to=buffer;
+   char *toShort=shortVersion;
+   int IsShortName=0;
+
+   for (int i = 0; i < getLength(); i++) {
+      if (*from == 0)
+         break;
+      if (    ((' ' <= *from) && (*from <= '~'))
+           || (*from == '\n')
+           || (0xA0 <= *from)
+         )
+      {
          *to++ = *from;
+         if (IsShortName)
+            *toShort++ = *from;
+      }
+      else if (*from == 0x8A)
+         *to++ = '\n';
+      else if (*from == 0x86)
+         IsShortName++;
+      else if (*from == 0x87)
+         IsShortName--;
       from++;
    }
    *to = '\0';
+   *toShort = '\0';
 }
 
-Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain) {
+Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain, bool returnUnimplemetedDescriptor) {
    Descriptor *d=0;
    switch (domain) {
    case SI:
@@ -383,6 +432,8 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case AdaptationFieldDataDescriptorTag:
          case TransportStreamDescriptorTag:
          default:
+            if (!returnUnimplemetedDescriptor)
+               return 0;
             d=new UnimplementedDescriptor();
             break;
       }
@@ -417,6 +468,8 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain)
          case MHP_DelegatedApplicationDescriptorTag:
          case MHP_ApplicationStorageDescriptorTag:
          default:
+            if (!returnUnimplemetedDescriptor)
+               return 0;
             d=new UnimplementedDescriptor();
             break;
       }
diff --git a/libsi/si.h b/libsi/si.h
index befff85b0..195830d61 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.8 2004/02/23 17:02:33 kls Exp $
+ *   $Id: si.h 1.9 2004/03/07 10:09:49 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -252,8 +252,11 @@ class Descriptor : public LoopElement {
    //returns a subclass of descriptor according to the data given.
    //The object is allocated with new and must be delete'd.
    //setData() will have been called, CheckParse() not.
-   //Never returns null - maybe the UnimplementedDescriptor.
-   static Descriptor *getDescriptor(CharArray d, DescriptorTagDomain domain);
+   //if returnUnimplemetedDescriptor==true:
+   //   Never returns null - maybe the UnimplementedDescriptor.
+   //if returnUnimplemetedDescriptor==false:
+   //   Never returns the UnimplementedDescriptor - maybe null
+   static Descriptor *getDescriptor(CharArray d, DescriptorTagDomain domain, bool returnUnimplemetedDescriptor);
 };
 
 class Loop : public VariableLengthPart {
@@ -266,6 +269,7 @@ class Loop : public VariableLengthPart {
       template <class T> friend class StructureLoop;
       friend class DescriptorLoop;
       template <class T> friend class TypeLoop;
+      friend class ExtendedEventDescriptors;
       int i;
    };
 protected:
@@ -311,14 +315,46 @@ class DescriptorLoop : public Loop {
    //returns null if no more descriptors available
    Descriptor *getNext(Iterator &it);
    //return the next descriptor with given tag, or 0 if not available.
-   //if the descriptor found is not implemented,
-   // an UnimplementedDescriptor will be returned if returnUnimplemetedDescriptor==true,
-   // 0 will be returned if returnUnimplemetedDescriptor==false
+   //if returnUnimplemetedDescriptor==true:
+   //   an UnimplementedDescriptor may be returned if the next matching descriptor is unimplemented,
+   //   0 will be returned if and only if no matching descriptor is found.
+   //if returnUnimplemetedDescriptor==false:
+   //   if 0 is returned, either no descriptor with the given tag was found,
+   //   or descriptors were found, but the descriptor type is not implemented
+   //In either case, a return value of 0 indicates that no further calls to this method
+   //with the iterator shall be made.
    Descriptor *getNext(Iterator &it, DescriptorTag tag, bool returnUnimplemetedDescriptor=false);
    //return the next descriptor with one of the given tags, or 0 if not available.
+   //if returnUnimplemetedDescriptor==true:
+   //   returns 0 if and only if no descriptor with one of the given tags was found.
+   //   The UnimplementedDescriptor may be returned.
+   //if returnUnimplemetedDescriptor==false:
+   //   if 0 is returned, either no descriptor with one of the given tags was found,
+   //   or descriptors were found, but none of them are implemented.
+   //   The UnimplementedDescriptor will never be returned.
+   //In either case, a return value of 0 indicates that no further calls to this method
+   //with the iterator shall be made.
    Descriptor *getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplemetedDescriptor=false);
+   //returns the number of descriptors in this loop
+   int getNumberOfDescriptors();
+   //writes the tags of the descriptors in this loop in the array,
+   // which must at least have the size getNumberOfDescriptors().
+   //The number of descriptors, i.e. getNumberOfDescriptors(), is returned.
+   // You can specify the array type (Descriptor tags are 8 Bit,
+   // you might e.g. choose a char, short, int or DescriptorTag array)
+   template <typename T> int getDescriptorTags(T *tags)
+      {
+         const unsigned char *p=data.getData();
+         const unsigned char *end=p+getLength();
+         int count=0;
+         while (p < end) {
+            tags[count++]=(T)Descriptor::getDescriptorTag(p);
+            p+=Descriptor::getLength(p);
+         }
+         return count;
+      }
 protected:
-   Descriptor *createDescriptor(int &i);
+   Descriptor *createDescriptor(int &i, bool returnUnimplemetedDescriptor);
    DescriptorTagDomain domain;
 };
 
@@ -385,7 +421,7 @@ class String : public VariableLengthPart {
 public:
    //A note to the length: getLength() returns the length of the raw data.
    //The text may be shorter. Its length can be obtained with one of the
-   //above functions and strlen.
+   //getText functions and strlen.
 
    //returns text. Data is allocated with new and must be delete'd by the user.
    char *getText();
@@ -394,10 +430,19 @@ class String : public VariableLengthPart {
    //In most descriptors the string length is an 8-bit field,
    //so the maximum there is 256.
    //returns the given buffer for convenience.
-   char * getText(char *buffer);
+   //The emphasis marks 0x86 and 0x87 are still available.
+   char *getText(char *buffer);
+   //The same semantics as for getText(char*) apply.
+   //The short version of the text according to ETSI TR 101 211 (chapter 4.6)
+   //will be written into the shortVersion buffer (which should, therefore, have the same
+   //length as buffer). If no shortVersion is available, shortVersion will contain
+   //an empty string.
+   //The emphasis marks 0x86 and 0x87 are still available in buffer, but not in shortVersion.
+   char *getText(char *buffer, char *shortVersion);
 protected:
    virtual void Parse() {}
    void decodeText(char *buffer);
+   void decodeText(char *buffer, char *shortVersion);
 };
 
 } //end of namespace
diff --git a/menu.c b/menu.c
index c15315111..4fdb994b9 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.292 2004/02/22 14:14:55 kls Exp kls $
+ * $Id: menu.c 1.297 2004/03/14 13:24:02 kls Exp $
  */
 
 #include "menu.h"
@@ -18,7 +18,6 @@
 #include "cutter.h"
 #include "eitscan.h"
 #include "i18n.h"
-#include "libsi/si.h"
 #include "menuitems.h"
 #include "plugin.h"
 #include "recording.h"
@@ -1009,13 +1008,8 @@ class cMenuTimers : public cOsdMenu {
 cMenuTimers::cMenuTimers(void)
 :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
 {
-  int i = 0;
-  cTimer *timer;
-
-  while ((timer = Timers.Get(i)) != NULL) {
-        Add(new cMenuTimerItem(timer));
-        i++;
-        }
+  for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer))
+      Add(new cMenuTimerItem(timer));
   if (Setup.SortTimers)
      Sort();
   SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? tr("On/Off") : tr("Mark"));
@@ -1216,7 +1210,7 @@ cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel)
   int TimerMatch;
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
-  char r = event->RunningStatus() > SI::RunningStatusNotRunning ? '*' : ' ';
+  char r = event->IsRunning() ? '*' : ' ';
   asprintf(&buffer, "%d\t%.*s\t%.*s\t%c%c%c\t%s", channel->Number(), 6, channel->Name(), 5, event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
@@ -1334,7 +1328,7 @@ cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event)
   int TimerMatch;
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
-  char r = event->RunningStatus() > SI::RunningStatusNotRunning ? '*' : ' ';
+  char r = event->IsRunning() ? '*' : ' ';
   asprintf(&buffer, "%.*s\t%.*s\t%c%c%c\t%s", 5, event->GetDateString(), 5, event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
@@ -1386,11 +1380,9 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
      const cSchedule *Schedule = schedules->GetSchedule(Channel->GetChannelID());
      if (Schedule) {
         const cEvent *PresentEvent = Schedule->GetPresentEvent(Channel->Number() == cDevice::CurrentChannel());
-        int num = Schedule->NumEvents();
         time_t now = time(NULL) - Setup.EPGLinger * 60;
-        for (int a = 0; a < num; a++) {
-            const cEvent *Event = Schedule->GetEventNumber(a);
-            if (Event->StartTime() + Event->Duration() > now || Event == PresentEvent)
+        for (const cEvent *Event = Schedule->Events()->First(); Event; Event = Schedule->Events()->Next(Event)) {
+            if (Event->EndTime() > now || Event == PresentEvent)
                Add(new cMenuScheduleItem(Event), Event == PresentEvent);
             }
         }
@@ -1494,13 +1486,8 @@ cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char
   SetHasHotkeys();
   commands = Commands;
   parameters = Parameters ? strdup(Parameters) : NULL;
-  int i = 0;
-  cCommand *command;
-
-  while ((command = commands->Get(i)) != NULL) {
-        Add(new cOsdItem(hk(command->Title())));
-        i++;
-        }
+  for (cCommand *command = commands->First(); command; command = commands->Next(command))
+      Add(new cOsdItem(hk(command->Title())));
 }
 
 cMenuCommands::~cMenuCommands()
@@ -3196,6 +3183,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
            if (device == cTransferControl::ReceiverDevice())
               cControl::Shutdown(); // in case this device was used for Transfer Mode
            }
+        dsyslog("switching device %d to channel %d", device->DeviceNumber() + 1, channel->Number());
         if (!device->SwitchChannel(channel, false)) {
            cThread::EmergencyExit(true);
            return false;
diff --git a/menu.h b/menu.h
index a03d3a0af..6fe954083 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.60 2004/02/15 14:11:28 kls Exp kls $
+ * $Id: menu.h 1.60 2004/02/15 14:11:28 kls Exp $
  */
 
 #ifndef __MENU_H
diff --git a/menuitems.c b/menuitems.c
index e3c99a5cb..49874f111 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.14 2004/01/25 15:40:55 kls Exp kls $
+ * $Id: menuitems.c 1.15 2004/02/24 12:38:43 kls Exp $
  */
 
 #include "menuitems.h"
diff --git a/menuitems.h b/menuitems.h
index 72a24182d..7091740dd 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.5 2003/01/12 15:06:23 kls Exp kls $
+ * $Id: menuitems.h 1.6 2004/02/24 11:55:14 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
diff --git a/osd.c b/osd.c
index 8f3343b83..7ede0015e 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.43 2003/06/04 16:13:00 kls Exp $
+ * $Id: osd.c 1.45 2004/03/14 10:33:20 kls Exp $
  */
 
 #include "osd.h"
@@ -429,30 +429,27 @@ void cOsdMenu::Display(void)
   Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
   int count = Count();
   if (count > 0) {
-     for (int i = 0; i < count; i++) {
-        cOsdItem *item = Get(i);
-        if (item)
-           cStatus::MsgOsdItem(item->Text(), i);
-        }
+     int ni = 0;
+     for (cOsdItem *item = First(); item; item = Next(item))
+         cStatus::MsgOsdItem(item->Text(), ni++);
      if (current < 0)
         current = 0; // just for safety - there HAS to be a current item!
-     int n = 0;
-     if (current - first >= MAXOSDITEMS) {
+     if (current - first >= MAXOSDITEMS || current < first) {
         first = current - MAXOSDITEMS / 2;
         if (first + MAXOSDITEMS > count)
            first = count - MAXOSDITEMS;
         if (first < 0)
            first = 0;
         }
-     for (int i = first; i < count; i++) {
-         cOsdItem *item = Get(i);
-         if (item) {
-            item->Display(i - first, i == current ? clrBlack : clrWhite, i == current ? clrCyan : clrBackground);
-            if (i == current)
-               cStatus::MsgOsdCurrentItem(item->Text());
-            }
+     int i = first;
+     int n = 0;
+     for (cOsdItem *item = Get(first); item; item = Next(item)) {
+         item->Display(i - first, i == current ? clrBlack : clrWhite, i == current ? clrCyan : clrBackground);
+         if (i == current)
+            cStatus::MsgOsdCurrentItem(item->Text());
          if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
             break;
+         i++;
          }
      }
   if (!isempty(status))
@@ -562,12 +559,13 @@ void cOsdMenu::PageDown(void)
 {
   current += MAXOSDITEMS;
   first += MAXOSDITEMS;
-  if (current > Count() - 1) {
-     current = Count() - 1;
-     first = max(0, Count() - MAXOSDITEMS);
+  int count = Count();
+  if (current > count - 1) {
+     current = count - 1;
+     first = max(0, count - MAXOSDITEMS);
      }
   if (SpecialItem(current)) {
-     current += (current < Count() - 1) ? 1 : -1;
+     current += (current < count - 1) ? 1 : -1;
      first = max(first, current - MAXOSDITEMS);
      }
   Display();
diff --git a/pat.c b/pat.c
index 9b27bdae7..b9fc0e637 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.7 2004/01/25 15:12:53 kls Exp $
+ * $Id: pat.c 1.8 2004/03/07 16:59:00 kls Exp $
  */
 
 #include "pat.h"
@@ -250,19 +250,21 @@ void cPatFilter::Trigger(void)
   numPmtEntries = 0;
 }
 
-bool cPatFilter::PmtVersionChanged(int PmtPid, int Version)
+bool cPatFilter::PmtVersionChanged(int PmtPid, int Sid, int Version)
 {
-  Version <<= 16;
+  uint64_t v = Version;
+  v <<= 32;
+  uint64_t id = (PmtPid | (Sid << 16)) & 0x00000000FFFFFFFFLL;
   for (int i = 0; i < numPmtEntries; i++) {
-      if ((pmtVersion[i] & 0x0000FFFF) == PmtPid) {
-         bool Changed = (pmtVersion[i] & 0x00FF0000) != Version;
+      if ((pmtVersion[i] & 0x00000000FFFFFFFFLL) == id) {
+         bool Changed = (pmtVersion[i] & 0x000000FF00000000LL) != v;
          if (Changed)
-            pmtVersion[i] = PmtPid | Version;
+            pmtVersion[i] = id | v;
          return Changed;
          }
       }
   if (numPmtEntries < MAXPMTENTRIES)
-     pmtVersion[numPmtEntries++] = PmtPid | Version;
+     pmtVersion[numPmtEntries++] = id | v;
   return true;
 }
 
@@ -301,7 +303,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      SI::PMT pmt(Data, false);
      if (!pmt.CheckCRCAndParse())
         return;
-     if (!PmtVersionChanged(pmtPid, pmt.getVersionNumber())) {
+     if (!PmtVersionChanged(pmtPid, pmt.getTableIdExtension(), pmt.getVersionNumber())) {
         lastPmtScan = 0; // this triggers the next scan
         return;
         }
diff --git a/pat.h b/pat.h
index dd1a1fe8e..a7f463572 100644
--- a/pat.h
+++ b/pat.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 1.3 2004/01/03 13:47:54 kls Exp $
+ * $Id: pat.h 1.4 2004/03/07 16:22:01 kls Exp $
  */
 
 #ifndef __PAT_H
 #define __PAT_H
 
 #include "filter.h"
+#include <stdint.h>
 
 #define MAXPMTENTRIES 64
 
@@ -19,9 +20,9 @@ class cPatFilter : public cFilter {
   time_t lastPmtScan;
   int pmtIndex;
   int pmtPid;
-  int pmtVersion[MAXPMTENTRIES];
+  uint64_t pmtVersion[MAXPMTENTRIES];
   int numPmtEntries;
-  bool PmtVersionChanged(int PmtPid, int Version);
+  bool PmtVersionChanged(int PmtPid, int Sid, int Version);
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
diff --git a/recorder.c b/recorder.c
index c46c56513..b6b9a2401 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.8 2003/10/18 11:35:02 kls Exp $
+ * $Id: recorder.c 1.9 2004/03/07 14:39:25 kls Exp $
  */
 
 #include <stdarg.h>
@@ -102,7 +102,7 @@ void cRecorder::Receive(uchar *Data, int Length)
 {
   int p = ringBuffer->Put(Data, Length);
   if (p != Length && active)
-     esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length - p);
+     ringBuffer->ReportOverflow(Length - p);
 }
 
 void cRecorder::Action(void)
diff --git a/ringbuffer.c b/ringbuffer.c
index c92b75f6d..6f26748a7 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.18 2003/10/12 14:25:09 kls Exp $
+ * $Id: ringbuffer.c 1.19 2004/03/07 13:46:51 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -17,6 +17,8 @@
 
 // --- cRingBuffer -----------------------------------------------------------
 
+#define OVERFLOWREPORTDELTA 5 // seconds between reports
+
 cRingBuffer::cRingBuffer(int Size, bool Statistics)
 {
   size = Size;
@@ -24,6 +26,8 @@ cRingBuffer::cRingBuffer(int Size, bool Statistics)
   maxFill = 0;
   lastPercent = 0;
   putTimeout = getTimeout = 0;
+  lastOverflowReport = 0;
+  overflowCount = overflowBytes = 0;
 }
 
 cRingBuffer::~cRingBuffer()
@@ -68,6 +72,17 @@ void cRingBuffer::SetTimeouts(int PutTimeout, int GetTimeout)
   getTimeout = GetTimeout;
 }
 
+void cRingBuffer::ReportOverflow(int Bytes)
+{
+  overflowCount++;
+  overflowBytes += Bytes;
+  if (time(NULL) - lastOverflowReport > OVERFLOWREPORTDELTA) {
+     esyslog("ERROR: %d ring buffer overflow%s (%d bytes dropped)", overflowCount, overflowCount > 1 ? "s" : "", overflowBytes);
+     overflowCount = overflowBytes = 0;
+     lastOverflowReport = time(NULL);
+     }
+}
+
 // --- cRingBufferLinear -----------------------------------------------------
 
 cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics)
diff --git a/ringbuffer.h b/ringbuffer.h
index 0680df439..349096fe8 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.13 2003/10/12 13:57:56 kls Exp $
+ * $Id: ringbuffer.h 1.14 2004/03/07 13:40:45 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -21,6 +21,9 @@ class cRingBuffer {
   int putTimeout;
   int getTimeout;
   int size;
+  time_t lastOverflowReport;
+  int overflowCount;
+  int overflowBytes;
 protected:
   int maxFill;//XXX
   int lastPercent;
@@ -39,6 +42,7 @@ class cRingBuffer {
   cRingBuffer(int Size, bool Statistics = false);
   virtual ~cRingBuffer();
   void SetTimeouts(int PutTimeout, int GetTimeout);
+  void ReportOverflow(int Bytes);
   };
 
 class cRingBufferLinear : public cRingBuffer {
diff --git a/sdt.c b/sdt.c
index 6fd331487..5ac6b4194 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.7 2004/01/17 17:27:49 kls Exp $
+ * $Id: sdt.c 1.8 2004/03/07 10:46:08 kls Exp $
  */
 
 #include "sdt.h"
@@ -57,34 +57,17 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    //XXX TODO case 0x04: // NVOD reference service
                    //XXX TODO case 0x05: // NVOD time-shifted service
                         {
-                        char buffer[1024];
-                        char *p = sd->serviceName.getText(buffer);
                         char NameBuf[1024];
                         char ShortNameBuf[1024];
-                        char *pn = NameBuf;
-                        char *ps = ShortNameBuf;
-                        int IsShortName = 0;
-                        while (*p) {
-                              if ((uchar)*p == 0x86)
-                                 IsShortName++;
-                              else if ((uchar)*p == 0x87)
-                                 IsShortName--;
-                              else {
-                                 *pn++ = *p;
-                                 if (IsShortName)
-                                    *ps++ = *p;
-                                 }
-                              p++;
-                              }
-                        *pn = *ps = 0;
-                        pn = NameBuf;
+                        sd->serviceName.getText(NameBuf, ShortNameBuf);
+                        char *pn = compactspace(NameBuf);
+                        char *ps = compactspace(ShortNameBuf);
                         if (*NameBuf && *ShortNameBuf && strcmp(NameBuf, ShortNameBuf) != 0) {
+                           ps = ShortNameBuf + strlen(ShortNameBuf);
                            *ps++ = ',';
                            strcpy(ps, NameBuf);
                            pn = ShortNameBuf;
                            }
-                        pn = compactspace(pn);
-                        ps = compactspace(ps);
                         if (channel) {
                            channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            if (Setup.UpdateChannels >= 1)
diff --git a/svdrp.c b/svdrp.c
index b73d21152..5d35eae74 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.60 2004/02/22 15:31:23 kls Exp kls $
+ * $Id: svdrp.c 1.61 2004/02/24 12:24:43 kls Exp $
  */
 
 #include "svdrp.h"
diff --git a/timers.c b/timers.c
index b29d6c852..696936502 100644
--- a/timers.c
+++ b/timers.c
@@ -4,14 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.9 2004/02/13 15:37:49 kls Exp kls $
+ * $Id: timers.c 1.12 2004/03/14 13:27:57 kls Exp $
  */
 
 #include "timers.h"
 #include <ctype.h>
 #include "channels.h"
 #include "i18n.h"
-#include "libsi/si.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -333,8 +332,8 @@ bool cTimer::Matches(time_t t, bool Directly)
   if (HasFlags(tfActive)) {
      if (HasFlags(tfVps) && !Directly && event && event->Vps()) {
         startTime = event->StartTime();
-        stopTime = startTime + event->Duration();
-        return event->RunningStatus() > SI::RunningStatusNotRunning;
+        stopTime = event->EndTime();
+        return event->IsRunning(true);
         }
      return startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
      }
@@ -350,9 +349,14 @@ int cTimer::Matches(const cEvent *Event)
      bool m1 = Matches(t1, true);
      bool m2 = UseVps ? m1 : Matches(t2, true);
      startTime = stopTime = 0;
-     if (m1 && m2)
+     if (m1 && m2) {
+        if (UseVps && Event->IsRunning(true))
+           return tmFull;
+        if (time(NULL) > Event->EndTime())
+           return tmNone;
         return tmFull;
-     if (m1 || m2)
+        }
+     if ((m1 || m2) && time(NULL) <= Event->EndTime())
         return tmPartial;
      }
   return tmNone;
@@ -381,6 +385,8 @@ void cTimer::SetEvent(const cEvent *Event)
            sprintf(vpsbuf, "(VPS: %s) ", Event->GetVpsString());
         isyslog("timer %d (%d %04d-%04d '%s') set to event %s %s-%s %s'%s'", Index() + 1, Channel()->Number(), start, stop, file, Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString(), vpsbuf, Event->Title());
         }
+     else
+        isyslog("timer %d (%d %04d-%04d '%s') set to no event", Index() + 1, Channel()->Number(), start, stop, file);
      event = Event;
      }
 }
@@ -500,7 +506,7 @@ cTimer *cTimers::GetNextActiveTimer(void)
 
 void cTimers::SetEvents(void)
 {
-  cSchedulesLock SchedulesLock;
+  cSchedulesLock SchedulesLock(false, 100);
   const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
   if (Schedules) {
      for (cTimer *ti = First(); ti; ti = Next(ti)) {
@@ -508,19 +514,17 @@ void cTimers::SetEvents(void)
          const cEvent *Event = NULL;
          if (Schedule) {
             //XXX what if the Schedule doesn't have any VPS???
-            const cEvent *e;
             int Match = tmNone;
-            int i = 0;
-            while ((e = Schedule->GetEventNumber(i++)) != NULL) {
-                  int m = ti->Matches(e);
-                  if (m > Match) {
-                     Match = m;
-                     Event = e;
-                     if (Match == tmFull)
-                        break;
-                        //XXX what if there's another event with the same VPS time???
-                     }
-                  }
+            for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
+                int m = ti->Matches(e);
+                if (m > Match) {
+                   Match = m;
+                   Event = e;
+                   if (Match == tmFull)
+                      break;
+                      //XXX what if there's another event with the same VPS time???
+                   }
+                }
             }
          ti->SetEvent(Event);
          }
diff --git a/timers.h b/timers.h
index 11fc0b29a..ce4bff602 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.6 2003/12/13 13:04:21 kls Exp kls $
+ * $Id: timers.h 1.7 2004/02/29 14:18:17 kls Exp $
  */
 
 #ifndef __TIMERS_H
diff --git a/transfer.c b/transfer.c
index 1209dfcae..c709928ea 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.15 2003/10/18 11:36:03 kls Exp $
+ * $Id: transfer.c 1.16 2004/03/07 14:40:15 kls Exp $
  */
 
 #include "transfer.h"
@@ -55,7 +55,7 @@ void cTransfer::Receive(uchar *Data, int Length)
      int i = 0;
      while (active && Length > 0) {
            if (i++ > 10) {
-              esyslog("ERROR: ring buffer overflow (%d bytes dropped)", Length);
+              ringBuffer->ReportOverflow(Length);
               break;
               }
            int p = ringBuffer->Put(Data, Length);
diff --git a/vdr.5 b/vdr.5
index 2947e941e..e54c9f8ed 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.25 2004/02/22 13:18:48 kls Exp kls $
+.\" $Id: vdr.5 1.26 2004/02/24 12:36:35 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
diff --git a/vdr.c b/vdr.c
index 5d438747b..af95f377e 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.177 2004/02/15 14:29:30 kls Exp kls $
+ * $Id: vdr.c 1.180 2004/03/14 14:25:02 kls Exp $
  */
 
 #include <getopt.h>
@@ -549,10 +549,13 @@ int main(int argc, char *argv[])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
-           static time_t LastSetEvents = 0;//XXX trigger by actual EPG data modification???
-           if (!Menu && time(NULL) - LastSetEvents > 5) {
-              Timers.SetEvents();
-              LastSetEvents = time(NULL);
+           // Assign events to timers:
+           if (time(NULL) - LastActivity > 10) {
+              static time_t LastSetEvents = 0;//XXX trigger by actual EPG data modification???
+              if (time(NULL) - LastSetEvents > 5) {
+                 Timers.SetEvents();
+                 LastSetEvents = time(NULL);
+                 }
               }
            time_t Now = time(NULL); // must do all following calls with the exact same time!
            // Process ongoing recordings:
@@ -571,7 +574,6 @@ int main(int argc, char *argv[])
                if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording() && !Timer->Pending() && Timer->Matches(Now + Setup.VpsMargin, true)) {
                   if (!Timer->InVpsMargin()) {
                      Timer->SetInVpsMargin(true);
-                     TimerInVpsMargin = true;
                      //XXX if not primary device has TP???
                      LastTimerChannel = Timer->Channel()->Number();
                      cRecordControls::Start(Timer); // will only switch the device
@@ -579,6 +581,8 @@ int main(int argc, char *argv[])
                   }
                else
                   Timer->SetInVpsMargin(false);
+               if (Timer->InVpsMargin())
+                  TimerInVpsMargin = true;
                }
            }
         // CAM control:

From c80a53ff6ea22aa14d1f9772b310b77ea0da7c42 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 16 May 2004 18:00:00 +0200
Subject: [PATCH 099/307] =?UTF-8?q?Version=201.3.7=20-=20Fixed=20a=20memor?=
 =?UTF-8?q?y=20leak=20in=20thread=20handling=20when=20using=20NPTL=20(than?=
 =?UTF-8?q?ks=20to=20Jon=20Burgess).=20-=20Fixed=20handling=20Setup.Record?=
 =?UTF-8?q?DolbyDigital,=20which=20was=20broken=20since=20version=201.1.6.?=
 =?UTF-8?q?=20-=20Fixed=20handling=20text=20lengths=20for=20itemized=20EPG?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Marcel=20Wiesweg).=20-=20Fixed=20the?=
 =?UTF-8?q?=20help=20for=20LSTE=20and=20LSTR=20(was=20broken=20in=201.3.6)?=
 =?UTF-8?q?.=20-=20Improved=20iso8859-7=20fonts=20(thanks=20to=20Dimitrios?=
 =?UTF-8?q?=20Dimitrakos).=20-=20Added=20some=203-letter=20language=20code?=
 =?UTF-8?q?s=20(thanks=20to=20Marcus=20M=C3=B6nnig).=20-=20Added=20languag?=
 =?UTF-8?q?e=20code=20handling=20to=20the=20subtitling=20descriptor=20in?=
 =?UTF-8?q?=20'libsi'=20(thanks=20to=20=20=20Pekka=20Virtanen).=20-=20Move?=
 =?UTF-8?q?d=20several=20menu=20item=20classes=20from=20menu.c=20to=20menu?=
 =?UTF-8?q?items.[hc]=20to=20make=20them=20=20=20available=20for=20plugins?=
 =?UTF-8?q?.=20-=20The=20epg2html.pl=20script=20now=20handles=20'|'=20in?=
 =?UTF-8?q?=20description=20texts.=20-=20The=20new=20setup=20option=20"OSD?=
 =?UTF-8?q?/Use=20small=20font"=20can=20be=20used=20to=20control=20the=20u?=
 =?UTF-8?q?se=20of=20=20=20the=20small=20font=20(see=20MANUAL=20for=20deta?=
 =?UTF-8?q?ils).=20-=20Swapped=20osd.[hc]=20and=20osdbase.[hc]=20to=20have?=
 =?UTF-8?q?=20the=20virtual=20OSD=20base=20class=20named=20cOsd.=20=20=20P?=
 =?UTF-8?q?lugins=20may=20need=20to=20adjust=20their=20#include=20statemen?=
 =?UTF-8?q?ts.=20-=20Colors=20are=20now=20given=20as=20AARRGGBB=20instead?=
 =?UTF-8?q?=20of=20AABBGGRR.=20The=20values=20are=20mapped=20to=20=20=20th?=
 =?UTF-8?q?e=20driver's=20(wrong)=20sequence=20in=20dvbosd.c=20(this=20sho?=
 =?UTF-8?q?uld=20really=20be=20fixed=20in=20the=20=20=20driver,=20together?=
 =?UTF-8?q?=20with=20the=20endian=20problem).=20-=20The=20new=20OSD=20setu?=
 =?UTF-8?q?p=20parameters=20"Left"=20and=20"Top"=20can=20be=20used=20to=20?=
 =?UTF-8?q?define=20the=20top=20left=20=20=20corner=20of=20the=20OSD.=20-?=
 =?UTF-8?q?=20The=20OSD=20size=20parameters=20are=20now=20in=20pixel=20(as?=
 =?UTF-8?q?=20opposed=20to=20formerly=20characters).=20=20=20When=20readin?=
 =?UTF-8?q?g=20a=20'setup.conf'=20file=20from=20an=20older=20version=20of?=
 =?UTF-8?q?=20VDR,=20the=20OSDwidth=20=20=20and=20OSDheight=20values=20wil?=
 =?UTF-8?q?l=20be=20converted=20to=20pixel=20automatically.=20-=20The=20OS?=
 =?UTF-8?q?D=20is=20now=20fully=20device=20independent.=20See=20the=20comm?=
 =?UTF-8?q?ents=20in=20VDR/osd.h=20and=20the=20=20=20description=20in=20PL?=
 =?UTF-8?q?UGINS.html=20for=20information=20on=20how=20a=20plugin=20can=20?=
 =?UTF-8?q?implement=20an=20OSD=20=20=20display=20on=20arbitrary=20hardwar?=
 =?UTF-8?q?e.=20-=20The=20OSD=20(actually=20its=20cBitmap=20class)=20can?=
 =?UTF-8?q?=20now=20handle=20XPM=20files.=20There=20are=20several=20=20=20?=
 =?UTF-8?q?XPM=20files=20in=20the=20VDR/symbols=20directory=20which=20can?=
 =?UTF-8?q?=20be=20used=20by=20skins=20(some=20of=20these=20=20=20have=20b?=
 =?UTF-8?q?een=20taken=20from=20the=20"elchi"=20patch).=20See=20VDR/skinst?=
 =?UTF-8?q?tng.c=20for=20examples=20on=20how=20=20=20to=20use=20these.=20-?=
 =?UTF-8?q?=20Due=20to=20the=20changes=20in=20the=20OSD=20handling=20the?=
 =?UTF-8?q?=20DEBUG=5FOSD=20option=20for=20a=20textual=20OSD=20=20=20has?=
 =?UTF-8?q?=20been=20dropped.=20There=20will=20be=20a=20plugin=20that=20im?=
 =?UTF-8?q?plements=20a=20skin=20with=20this=20=20=20functionality=20later?=
 =?UTF-8?q?.=20-=20The=20entire=20OSD=20display=20can=20now=20be=20impleme?=
 =?UTF-8?q?nted=20via=20"skins".=20See=20VDR/skins.[hc],=20=20=20VDR/skinc?=
 =?UTF-8?q?lassic.[hc],=20VDR/skinsttng.[hc]=20and=20PLUGINS.html=20for=20?=
 =?UTF-8?q?information=20on=20how=20=20=20a=20plugin=20can=20implement=20i?=
 =?UTF-8?q?ts=20own=20skin.=20By=20default=20VDR=20comes=20with=20a=20"Cla?=
 =?UTF-8?q?ssic"=20skin=20=20=20that=20implements=20the=20OSD=20display=20?=
 =?UTF-8?q?known=20from=20previous=20versions,=20and=20the=20new=20skin=20?=
 =?UTF-8?q?=20=20named=20"ST:TNG=20Panels",=20which=20is=20also=20the=20de?=
 =?UTF-8?q?fault=20skin=20now.=20The=20actual=20skin=20can=20=20=20be=20se?=
 =?UTF-8?q?lected=20through=20"Setup/OSD/Skin".=20-=20The=20colors=20used?=
 =?UTF-8?q?=20in=20a=20skin=20can=20now=20be=20configured=20using=20"theme?=
 =?UTF-8?q?s".=20See=20PLUGINS.html=20=20=20for=20information=20on=20how?=
 =?UTF-8?q?=20a=20skin=20can=20make=20use=20of=20themes,=20and=20man=20vdr?=
 =?UTF-8?q?(5)=20for=20the=20=20=20structure=20of=20a=20theme=20file.=20Th?=
 =?UTF-8?q?e=20actual=20theme=20to=20use=20can=20be=20selected=20through?=
 =?UTF-8?q?=20=20=20"Setup/OSD/Theme".=20-=20Added=20Croatian=20language?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Drazen=20Dupor).=20=20=20NOTE:=20ther?=
 =?UTF-8?q?e=20is=20apparently=20a=20problem=20with=20the=20newly=20introd?=
 =?UTF-8?q?uced=20iso8859-2=20font,=20=20=20because=20as=20soon=20as=20Set?=
 =?UTF-8?q?up/OSD/Language=20is=20set=20to=20Croatian=20(currently=20the?=
 =?UTF-8?q?=20last=20one=20=20=20in=20the=20list)=20everything=20freezes?=
 =?UTF-8?q?=20and=20the=20vdr=20processes=20have=20to=20be=20killed=20with?=
 =?UTF-8?q?=20-9=20=20=20and=20the=20driver=20needs=20to=20be=20reloaded.?=
 =?UTF-8?q?=20Maybe=20somebody=20else=20can=20find=20out=20what's=20=20=20?=
 =?UTF-8?q?going=20wrong=20here...=20-=20Added=20missing=20NULL=20checks?=
 =?UTF-8?q?=20when=20accessing=20sectionHandler=20in=20device.c=20(thanks?=
 =?UTF-8?q?=20to=20=20=20Pekka=20Virtanen).=20-=20Fixed=20setting=20the=20?=
 =?UTF-8?q?time=20from=20the=20DVB=20data=20stream=20(thanks=20to=20Helmut?=
 =?UTF-8?q?=20Auer=20for=20=20=20pointing=20out=20a=20frequency/transponde?=
 =?UTF-8?q?r=20handling=20mixup).=20This=20now=20also=20takes=20the=20=20?=
 =?UTF-8?q?=20actual=20source=20(sat,=20cable=20etc.)=20into=20account.=20?=
 =?UTF-8?q?Please=20go=20into=20"Setup/EPG"=20and=20=20=20set=20the=20"Set?=
 =?UTF-8?q?=20system=20time"=20and=20"Use=20time=20from=20transponder"=20p?=
 =?UTF-8?q?arameters=20accordingly=20=20=20(this=20is=20necessary=20even?=
 =?UTF-8?q?=20if=20you=20have=20already=20set=20them=20before!).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                      |    17 +
 HISTORY                           |    59 +
 INSTALL                           |     5 -
 MANUAL                            |    17 +-
 Makefile                          |    40 +-
 PLUGINS.html                      |   215 +-
 PLUGINS/src/osddemo/HISTORY       |     4 +
 PLUGINS/src/osddemo/osddemo.c     |    22 +-
 PLUGINS/src/sky/channels.conf.sky |     2 +-
 channels.c                        |    18 +-
 channels.conf                     |    28 +-
 channels.h                        |     4 +-
 config.c                          |    32 +-
 config.h                          |    22 +-
 device.c                          |    23 +-
 device.h                          |    11 +-
 dvbdevice.c                       |     9 +-
 dvbdevice.h                       |     7 +-
 dvbosd.c                          |   160 +-
 dvbosd.h                          |    29 +-
 dvbspu.c                          |    17 +-
 dvbspu.h                          |     6 +-
 eit.c                             |     4 +-
 eitscan.c                         |     6 +-
 epg2html.pl                       |     4 +-
 font.c                            |   142 +-
 font.h                            |    33 +-
 fontfix-iso8859-2.c               |  6498 +++++++++++++++
 fontfix-iso8859-7.c               | 12112 ++++++++++++++--------------
 fontosd-iso8859-2.c               |  6949 ++++++++++++++++
 fontosd-iso8859-7.c               | 11032 +++++++++++++------------
 fontsml-iso8859-2.c               |  5826 +++++++++++++
 fontsml-iso8859-7.c               |  9372 ++++++++++-----------
 i18n.c                            |   428 +-
 i18n.h                            |     4 +-
 interface.c                       |   341 +-
 interface.h                       |    35 +-
 libsi/descriptor.c                |    22 +-
 libsi/descriptor.h                |     7 +-
 menu.c                            |   813 +-
 menu.h                            |    16 +-
 menuitems.c                       |   335 +-
 menuitems.h                       |    61 +-
 osd.c                             |  1109 +--
 osd.h                             |   460 +-
 osdbase.c                         |   667 +-
 osdbase.h                         |   296 +-
 player.c                          |     4 +-
 player.h                          |     4 +-
 plugin.h                          |     4 +-
 recorder.c                        |     4 +-
 recording.c                       |    15 +-
 recording.h                       |    26 +-
 skinclassic.c                     |   541 ++
 skinclassic.h                     |    26 +
 skins.c                           |   201 +
 skins.h                           |   297 +
 skinsttng.c                       |   879 ++
 skinsttng.h                       |    26 +
 svdrp.c                           |     6 +-
 symbols/arrowdown.xpm             |    17 +
 symbols/arrowup.xpm               |    17 +
 symbols/audio.xpm                 |    23 +
 symbols/dolbydigital.xpm          |    23 +
 symbols/encrypted.xpm             |    23 +
 symbols/ffwd.xpm                  |    31 +
 symbols/ffwd1.xpm                 |    31 +
 symbols/ffwd2.xpm                 |    31 +
 symbols/ffwd3.xpm                 |    31 +
 symbols/frew.xpm                  |    31 +
 symbols/frew1.xpm                 |    31 +
 symbols/frew2.xpm                 |    31 +
 symbols/frew3.xpm                 |    31 +
 symbols/mute.xpm                  |    25 +
 symbols/pause.xpm                 |    31 +
 symbols/play.xpm                  |    31 +
 symbols/radio.xpm                 |    23 +
 symbols/recording.xpm             |    23 +
 symbols/sfwd.xpm                  |    31 +
 symbols/sfwd1.xpm                 |    31 +
 symbols/sfwd2.xpm                 |    31 +
 symbols/sfwd3.xpm                 |    31 +
 symbols/srew.xpm                  |    31 +
 symbols/srew1.xpm                 |    31 +
 symbols/srew2.xpm                 |    31 +
 symbols/srew3.xpm                 |    31 +
 symbols/teletext.xpm              |    23 +
 symbols/volume.xpm                |    19 +
 themes.c                          |   305 +
 themes.h                          |    82 +
 thread.c                          |     3 +-
 vdr.1                             |     9 +-
 vdr.5                             |    44 +-
 vdr.c                             |    51 +-
 94 files changed, 41924 insertions(+), 18696 deletions(-)
 create mode 100644 fontfix-iso8859-2.c
 create mode 100644 fontosd-iso8859-2.c
 create mode 100644 fontsml-iso8859-2.c
 create mode 100644 skinclassic.c
 create mode 100644 skinclassic.h
 create mode 100644 skins.c
 create mode 100644 skins.h
 create mode 100644 skinsttng.c
 create mode 100644 skinsttng.h
 create mode 100644 symbols/arrowdown.xpm
 create mode 100644 symbols/arrowup.xpm
 create mode 100644 symbols/audio.xpm
 create mode 100644 symbols/dolbydigital.xpm
 create mode 100644 symbols/encrypted.xpm
 create mode 100644 symbols/ffwd.xpm
 create mode 100644 symbols/ffwd1.xpm
 create mode 100644 symbols/ffwd2.xpm
 create mode 100644 symbols/ffwd3.xpm
 create mode 100644 symbols/frew.xpm
 create mode 100644 symbols/frew1.xpm
 create mode 100644 symbols/frew2.xpm
 create mode 100644 symbols/frew3.xpm
 create mode 100644 symbols/mute.xpm
 create mode 100644 symbols/pause.xpm
 create mode 100644 symbols/play.xpm
 create mode 100644 symbols/radio.xpm
 create mode 100644 symbols/recording.xpm
 create mode 100644 symbols/sfwd.xpm
 create mode 100644 symbols/sfwd1.xpm
 create mode 100644 symbols/sfwd2.xpm
 create mode 100644 symbols/sfwd3.xpm
 create mode 100644 symbols/srew.xpm
 create mode 100644 symbols/srew1.xpm
 create mode 100644 symbols/srew2.xpm
 create mode 100644 symbols/srew3.xpm
 create mode 100644 symbols/teletext.xpm
 create mode 100644 symbols/volume.xpm
 create mode 100644 themes.c
 create mode 100644 themes.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1f7223197..7036bfd60 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -475,6 +475,8 @@ J
 Helmut Auer <vdr@helmutauer.de>
  for reporting a superfluous error message in cLockFile
  for suggesting to make the "Zap timeout" a setup variable
+ for fixing a frequency/transponder handling mixup when setting the time from the
+ DVB data stream
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -797,6 +799,7 @@ Karim Afifi <karim.afifi@free.fr>
 Jon Burgess <mplayer@jburgess.uklinux.net>
  for pointing out a problem with NPTL ("Native Posix Thread Library")
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
+ for fixing a memory leak in thread handling when using NPTL
 
 Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
  for reporting a crash when cancelling a newly created timer
@@ -955,3 +958,17 @@ Marc Hoppe <MarcHoppe@gmx.de>
 
 Michael Pennewi� <M.Pennewiss@ARD-Digital.de>
  for pointing out that an empty EPG event means there is currently no running event
+
+Marcus M�nnig <minibbjd@gmx.de>
+ for adding some 3-letter language codes
+
+Pekka Virtanen <pekka.virtanen@sci.fi>
+ for adding language code handling to the subtitling descriptor in 'libsi'
+ for adding missing NULL checks when accessing sectionHandler in device.c
+
+John Kennedy <rkennedy@ix.netcom.com>
+ for publishing "A Fast Bresenham Algorithm For Drawing Ellipses" (found at
+ http://homepage.smc.edu/kennedy_john/BELIPSE.PDF)
+
+Drazen Dupor <drazen.dupor@dupor.com>
+ for translating OSD texts to the Croatian language
diff --git a/HISTORY b/HISTORY
index 1371dc926..7ea36ca57 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2745,3 +2745,62 @@ Video Disk Recorder Revision History
   events to timers.
 - Now explicitly turning on the LNB power at startup, because newer drivers don't
   do this any more (thanks to Oliver Endriss for pointing this out).
+
+2004-05-16: Version 1.3.7
+
+- Fixed a memory leak in thread handling when using NPTL (thanks to Jon Burgess).
+- Fixed handling Setup.RecordDolbyDigital, which was broken since version 1.1.6.
+- Fixed handling text lengths for itemized EPG texts (thanks to Marcel Wiesweg).
+- Fixed the help for LSTE and LSTR (was broken in 1.3.6).
+- Improved iso8859-7 fonts (thanks to Dimitrios Dimitrakos).
+- Added some 3-letter language codes (thanks to Marcus M�nnig).
+- Added language code handling to the subtitling descriptor in 'libsi' (thanks to
+  Pekka Virtanen).
+- Moved several menu item classes from menu.c to menuitems.[hc] to make them
+  available for plugins.
+- The epg2html.pl script now handles '|' in description texts.
+- The new setup option "OSD/Use small font" can be used to control the use of
+  the small font (see MANUAL for details).
+- Swapped osd.[hc] and osdbase.[hc] to have the virtual OSD base class named cOsd.
+  Plugins may need to adjust their #include statements.
+- Colors are now given as AARRGGBB instead of AABBGGRR. The values are mapped to
+  the driver's (wrong) sequence in dvbosd.c (this should really be fixed in the
+  driver, together with the endian problem).
+- The new OSD setup parameters "Left" and "Top" can be used to define the top left
+  corner of the OSD.
+- The OSD size prameters are now in pixel (as opposed to formerly characters).
+  When reading a 'setup.conf' file from an older version of VDR, the OSDwidth
+  and OSDheight values will be converted to pixel automatically.
+- The OSD is now fully device independent. See the comments in VDR/osd.h and the
+  description in PLUGINS.html for information on how a plugin can implement an OSD
+  display on arbitrary hardware.
+- The OSD (actually its cBitmap class) can now handle XPM files. There are several
+  XPM files in the VDR/symbols directory which can be used by skins (some of these
+  have been taken from the "elchi" patch). See VDR/skinsttng.c for examples on how
+  to use these.
+- Due to the changes in the OSD handling the DEBUG_OSD option for a textual OSD
+  has been dropped. There will be a plugin that implements a skin with this
+  functionality later.
+- The entire OSD display can now be implemented via "skins". See VDR/skins.[hc],
+  VDR/skinclassic.[hc], VDR/skinsttng.[hc] and PLUGINS.html for information on how
+  a plugin can implement its own skin. By default VDR comes with a "Classic" skin
+  that implements the OSD display known from previous versions, and the new skin
+  named "ST:TNG Panels", which is also the default skin now. The actual skin can
+  be selected through "Setup/OSD/Skin".
+- The colors used in a skin can now be configured using "themes". See PLUGINS.html
+  for information on how a skin can make use of themes, and man vdr(5) for the
+  structure of a theme file. The actual theme to use can be selected through
+  "Setup/OSD/Theme".
+- Added Croatian language texts (thanks to Drazen Dupor).
+  NOTE: there is apparently a problem with the newly introduced iso8859-2 font,
+  because as soon as Setup/OSD/Language is set to Croatian (currently the last one
+  in the list) everything freezes and the vdr processes have to be killed with -9
+  and the driver needs to be reloaded. Maybe somebody else can find out what's
+  going wrong here...
+- Added missing NULL checks when accessing sectionHandler in device.c (thanks to
+  Pekka Virtanen).
+- Fixed setting the time from the DVB data stream (thanks to Helmut Auer for
+  pointing out a frequency/transponder handling mixup). This now also takes the
+  actual source (sat, cable etc.) into account. Please go into "Setup/EPG" and
+  set the "Set system time" and "Use time from transponder" parameters accordingly
+  (this is necessary even if you have already set them before!).
diff --git a/INSTALL b/INSTALL
index 88546ea78..ec1906aac 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,11 +40,6 @@ following values in the 'make' call to activate the respective control mode:
 
 If you want to disable control via the PC keyboard, you can add NO_KBD=1
 to the 'make' call.
-Adding "DEBUG_OSD=1" will use the PC screen (or current window)
-to display texts instead of the DVB card's on-screen display
-interface. These modes are useful when testing new menus if you
-only have a remote connection to the VDR (which, in my case, is
-located in the living room and has neither a monitor nor a keyboard).
 
 If your video directory will be on a VFAT partition, add the compile
 time switch
diff --git a/MANUAL b/MANUAL
index c4d4391fc..ffbc46069 100644
--- a/MANUAL
+++ b/MANUAL
@@ -425,13 +425,26 @@ Version 1.2
 
   Language = English     Defines the language used to display the OSD texts.
 
-  Width = 52             The width and height of the OSD .
-  Height = 18            The valid ranges are width=40...56, height=12...21.
+  Skin = ST:TNG Panels   Defines the "skin" used to display the OSD menus.
+
+  Theme = Default        Defines the "theme" to use with the current skin.
+
+  Left = 54              The top and left offset of the OSD.
+  Top = 45               The valid ranges are left=0...672, top=0...567.
+
+  Width = 624            The width and height of the OSD.
+  Height = 486           The valid ranges are width=480...672, height=324...567.
+                         The Width must be a multiple of 8.
 
   Message time = 1       The time (in seconds) how long an informational
                          message shall be displayed on the OSD. The valid range
                          is 1...60.
 
+  Use small font = 1     Defines whether the small font shall be used. 0 means never
+                         use the small font, 1 means use the small font wherever the
+                         current skin wants to, and 2 means always use the small
+                         font.
+
   Channel info position = bottom
                          The position of the channel info window in the OSD
                          (either 'bottom' or 'top').
diff --git a/Makefile b/Makefile
index ce38c3db3..4a2197c11 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.65 2004/01/18 14:16:53 kls Exp $
+# $Id: Makefile 1.67 2004/05/16 10:51:44 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -36,15 +36,22 @@ SILIB    = $(LSIDIR)/libsi.a
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
        dvbplayer.o dvbspu.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
-       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o sources.o\
-       spu.o status.o svdrp.o thread.o timers.o tools.o transfer.o vdr.o videodir.o
+       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o\
+       skinclassic.o skins.o skinsttng.o sources.o spu.o status.o svdrp.o themes.o thread.o\
+       timers.o tools.o transfer.o vdr.o videodir.o
 
 FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
 OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1
+
+FIXFONT_ISO8859_2 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-2
+OSDFONT_ISO8859_2 = -adobe-helvetica-medium-r-normal--24-*-75-75-p-*-iso8859-2
+SMLFONT_ISO8859_2 = -adobe-helvetica-medium-r-normal--18-*-75-75-p-*-iso8859-2
+
 FIXFONT_ISO8859_5 = -rfx-courier-bold-r-normal--24-*-75-75-m-*-iso8859-5
 OSDFONT_ISO8859_5 = -rfx-helvetica-medium-r-normal--24-*-75-75-p-*-iso8859-5
 SMLFONT_ISO8859_5 = -rfx-helvetica-medium-r-normal--18-*-75-75-p-*-iso8859-5
+
 FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
 OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
 SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
@@ -60,11 +67,6 @@ DEFINES += -D_GNU_SOURCE
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
-ifdef DEBUG_OSD
-DEFINES += -DDEBUG_OSD
-NCURSESLIB = -lncurses
-endif
-
 ifdef VFAT
 # for people who want their video directory on a VFAT partition
 DEFINES += -DVFAT
@@ -73,6 +75,7 @@ endif
 all: vdr
 font: genfontfile\
       fontfix.c fontosd.c fontsml.c\
+      fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
       fontfix_iso8859_5.c fontosd_iso8859_5.c fontsml_iso8859_5.c\
       fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c
 	@echo "font files created."
@@ -104,17 +107,26 @@ fontosd.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@
 fontsml.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@
-fontfix_iso8859_5.c:
+
+fontfix-iso8859-2.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_2" "$(FIXFONT_ISO8859_2)" > $@
+fontosd-iso8859-2.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_2" "$(OSDFONT_ISO8859_2)" > $@
+fontsml-iso8859-2.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_2" "$(SMLFONT_ISO8859_2)" > $@
+
+fontfix-iso8859-5.c:
 	./genfontfile "cFont::tPixelData FontFix_iso8859_5" "$(FIXFONT_ISO8859_5)" > $@
-fontosd_iso8859_5.c:
+fontosd-iso8859-5.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_5" "$(OSDFONT_ISO8859_5)" > $@
-fontsml_iso8859_5.c:
+fontsml-iso8859-5.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_5" "$(SMLFONT_ISO8859_5)" > $@
-fontfix_iso8859_7.c:
+
+fontfix-iso8859-7.c:
 	./genfontfile "cFont::tPixelData FontFix_iso8859_7" "$(FIXFONT_ISO8859_7)" > $@
-fontosd_iso8859_7.c:
+fontosd-iso8859-7.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_7" "$(OSDFONT_ISO8859_7)" > $@
-fontsml_iso8859_7.c:
+fontsml-iso8859-7.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
 
 # The font file generator:
diff --git a/PLUGINS.html b/PLUGINS.html
index d13ca4ab0..a2cfe9b3b 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -9,17 +9,20 @@
 <center><b>Version 1.3</b></center>
 <p>
 <center>
-Copyright &copy; 2003 Klaus Schmidinger<br>
+Copyright &copy; 2004 Klaus Schmidinger<br>
 <a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.2.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.2.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.2.6 are marked like this.
 <!--X1.2.6--></td></tr></table>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.0 are marked like this.
 <!--X1.3.0--></td></tr></table>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.7 are marked like this.
+<!--X1.3.7--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -67,10 +70,14 @@ <h1>Table Of Contents</h1>
 <li><a href="#Status monitor">Status monitor</a>
 <li><a href="#Players">Players</a>
 <li><a href="#Receivers">Receivers</a>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Filters">Filters</a>
 <!--X1.3.0--></td></tr></table>
 <li><a href="#The On Screen Display">The On Screen Display</a>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Skins">Skins</a>
+<li><a href="#Themes">Themes</a>
+<!--X1.3.7--></td></tr></table>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Dolby Digital">Dolby Digital</a>
 <li><a href="#Remote Control">Remote Control</a>
@@ -1207,7 +1214,7 @@ <h1>Table Of Contents</h1>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="Filters"><hr><h2>Filters</h2>
 
 <center><i><b>A Fistful of Datas</b></i></center><p>
@@ -1253,35 +1260,166 @@ <h1>Table Of Contents</h1>
 See VDR/eit.c or VDR/pat.c to learn how to process filter data.
 <!--X1.3.0--></td></tr></table>
 
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
-<center><i><b>Express yourself</b></i></center><p>
+<center><i><b>Window to the world</b></i></center><p>
 
-Most of the time a plugin should be able to access the OSD through the
-standard mechanisms also used by VDR itself. However, these set up the OSD in
-a manner of textual rows and columns, and automatically set the various
-windows and color depths.
-<p>
 If a plugin needs to have total control over the OSD, it can call the
 static function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/osd.h&gt;
 
-cOsdBase *MyOsd = cOsd::OpenRaw(x, y);
+cOsd *MyOsd = cOsdProvider::NewOsd(x, y);
 </pre></td></tr></table><p>
 
 where <tt>x</tt> and <tt>y</tt> are the coordinates of the upper left corner
-of the OSD area on the screen. Such a "raw" OSD doesn't display anything
+of the OSD area on the screen. Such an OSD doesn't display anything
 yet, so you need to at least call the function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-MyOsd-&gt;Create(...);
+tArea Area = { 0, 0, 100, 100, 4 };
+MyOsd-&gt;SetAreas(Area, 1);
 </pre></td></tr></table><p>
 
-to define an actual OSD drawing area (see VDR/osdbase.h for the declarations
-of these functions, and VDR/osd.c to see how VDR opens the OSD and sets up
+to define an actual OSD drawing area (see VDR/osd.h for the declarations
+of these functions, and VDR/skinsttng.c to see how VDR opens the OSD and sets up
 its windows and color depths).
+<p>
+Theoretically the OSD supports a full screen drawing area, with 32 bit color
+depth. However, the actual OSD device in use may not be able to provide the
+full area or color depth, maybe because of lack of OSD memory or other restrictions.
+A plugin that uses the OSD should therefore test whether the OSD is able to
+provide the requested functionality, and should offer alternate color depths
+to allow a less powerfull OSD implementation to still work reasonably.
+Since it is often not really necessary to have hundreds or thousands of colors
+all over the OSD area, a plugin can divide the total drawing area into several
+sub-areas with different color depths and separate color palettes, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+tArea Area = { 0, 0, 99, 99, 4 };
+if (osd-&gt;CanHandleAreas(Area, 1) == oeOk)
+   osd-&gt;SetAreas(Area, 1);
+else {
+   tArea Areas[] = { { 0,  0, 99, 19, 2 },
+                     { 0, 20, 99, 79, 2 },
+                     { 0, 80, 99, 99, 4 }
+                   };
+   osd-&gt;SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+   }
+</pre></td></tr></table><p>
+
+In this example an OSD with 100 by 100 pixel and 4 bit color depth shall
+be opened, so at first a single area with the full required resolution
+is set up and <tt>CanHandleAreas()</tt> is called with it. If the result indicates
+that the OSD will be able to handle this drawing area, a call to <tt>SetAreas()</tt>
+actually sets it. If a single area with that resolution can't be handled,
+a second attempt is made in which the total drawing area is divided into
+three horizontal stripes, two of which use only 2 bit color depth (because
+the objects drawn in there can be displayed with 4 colors) while the third
+one still requests 4 bit color depth.
+<p>
+Note that a plugin should always at first request a single drawing area
+with the full required resolution. Only if this fails shall it use alternate
+areas. Drawing areas are always rectangular and may not overlap (but do not need
+to be adjacent).
+
+<a name="Skins"><hr><h2>Skins</h2>
+
+<center><i><b>The emperor's new clothes</b></i></center><p>
+
+The way VDR displays its menus to the user is implemented through <i>skins</i>.
+A particular skin provides several functions that return objects to be used
+for displaying a specific part of the OSD, like a menu, the channel display
+or the volume bar.
+<p>
+By default VDR offers the <i>Classic</i> and the <i>ST:TNG Panels</i> skins,
+which can be selected through Setup/OSD/Skin. A plugin can implement an
+arbitrary skin of its own by doing something similar to what's done in
+<tt>VDR/skinclassic.c</tt>.
+<p>
+The first step in implementing a new skin is to derive a class from <tt>cSkin</tt>
+that provides the handling objects necessary to do the actual work:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+#include "skins.h"
+
+class cMySkin : public cSkin {
+public:
+  cMySkin(void);
+  virtual const char *Description(void);
+  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
+  virtual cSkinDisplayMenu *DisplayMenu(void);
+  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
+  virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayMessage *DisplayMessage(void);
+  };
+</pre></td></tr></table><p>
+
+See the comments in <tt>VDR/skins.h</tt> for details. <tt>VDR/skinclassic.[hc]</tt>
+can be used as an example for how to implement all the necessary classes and
+functions to compose a complete skin. See also the chapter about <a href="#Themes">themes</a>
+if you want to make the colors used by your skin configurable.
+<p>
+To add your new skin to the list of skins available to the user in Setup/OSD/Skin,
+all you need to do is create a new object of your skin class, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+new cMySkin;
+</pre></td></tr></table><p>
+
+in the <a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
+Do not delete this object, it will be automatically deleted when the program ends.
+
+<a name="Themes"><hr><h2>Themes</h2>
+
+<center><i><b>Eye of the beholder...</b></i></center><p>
+
+A <i>theme</i> is a collection of colors that can be used by a <a href="#Skins">skin</a>.
+Since every skin most likely has its own idea about what parts of it can be
+<i>themed</i>, and different skins may have completely different numbers of
+"themeable" parts, a particular theme can only be used with the skin it was designed
+for. A particular skin, however, can have any number of themes. Which theme
+will be actually used can be defined in Setup/OSD/Theme.
+<p>
+In order to make a skin "themeable" is shall create an object of type cTheme, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+static cTheme Theme;
+</pre></td></tr></table><p>
+
+The next step is to define the colors that shall be provided by this theme, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+THEME_CLR(Theme, clrTitle,        0xFFBC8024);
+THEME_CLR(Theme, clrButtonRedFg,  clrWhite);
+THEME_CLR(Theme, clrButtonRedBg,  clrRed);
+</pre></td></tr></table><p>
+
+<tt>THEME_CLR()</tt> is a helper macro that adds the given color name
+and its default color value to the theme.
+<p>
+Any color names can be used, but they should always start with <tt>clr...</tt> and
+if a given color has a foreground and a background value, the two names shall be
+distinguished by appending <tt>...Fg</tt> and <tt>...Bg</tt>, respectively.
+<p>
+Color values can be either 32 bit hexadecimal numbers in the form 0xAARRGGBB
+(where the individual bytes represent Alpha (transparency), Red, Green
+and Blue component, respectively), or one of the predefined color names from
+<tt>VDR/osd.h</tt>.
+<p>
+In the actual drawing code of a skin, the color names defined with the <tt>THEME_CLR()</tt>
+macros can be used to fetch the actual color values from the theme, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+osd-&gt;DrawText(x, y, s, Theme.Color(clrButtonRedFg), Theme.Color(clrButtonRedBg), font);
+</pre></td></tr></table><p>
+
+By default this will use the colors that have been defined in the respective
+<tt>THEME_CLR()</tt> line, but may be overwritten through user supplied theme
+files (see <tt>man vdr(5)</tt> for information about the format of a theme file).
+<!--X1.3.7--></td></tr></table>
 
 <a name="Devices"><hr><h2>Devices</h2>
 
@@ -1297,7 +1435,7 @@ <h1>Table Of Contents</h1>
 "on the fly" - assuming your machine is fast enough), or just a software program that takes an MPEG data
 stream and displays it, for instance, on an existing graphics adapter.
 <p>
-To implement an additional device, a plugin must derive a class from cDevice:
+To implement an additional device, a plugin must derive a class from <tt>cDevice</tt>:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 #include &lt;vdr/device.h&gt;
@@ -1374,7 +1512,7 @@ <h1>Table Of Contents</h1>
 virtual bool HasDecoder(void) const;
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
-<!--X1.2.6--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.2.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 virtual int64_t GetSTC(void);
 <!--X1.2.6--></td></tr></table>
 virtual void TrickSpeed(int Speed);
@@ -1396,7 +1534,7 @@ <h1>Table Of Contents</h1>
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p>
 <b>Section Filtering</b>
 <p>
@@ -1426,23 +1564,46 @@ <h1>Table Of Contents</h1>
 <p>
 <b>On Screen Display</b>
 <p>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 If your device provides On Screen Display (OSD) capabilities (which every device
-that is supposed to be used as a primary device should do), it can implement
-the function
+that is supposed to be used as a primary device should do), it shall implement
+an "OSD provider" class, derived from <tt>cOsdProvider</tt>, which, when its <tt>CreateOsd()</tt>
+function is called, returns an object derived from <tt>cOsd</tt>, which can be used to
+access the device's OSD:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+class cMyOsdProvider : public cOsdProvider {
+public:
+  cMyOsdProvider(void);
+  virtual cOsd *CreateOsd(int Left, int Top);
+  };
+</pre></td></tr></table><p>
+
+In its <tt>MakePrimaryDevice()</tt> function the device shall create an object
+of this class, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-virtual cOsdBase *NewOsd(int x, int y);
+void cMyDevice::MakePrimaryDevice(bool On)
+{
+  new cMyOsdProvider;
+}
 </pre></td></tr></table><p>
 
-which must return a newly created object of a derived cOsdBase class that
-implements the functions necessary to display OSD information on your device.
-The caller of this function will delete the object as soon as it is no longer
-needed.
+The OSD provider object is allocated on the heap and shall not be deleted
+(it will be deleted automatically in case a different device sets up an OSD
+provider, or when the program ends).
+
+Note that an OSD implementation need not be physically linked to the device
+in any way. All it needs to make sure is that the OSD will be visible to the
+user - whether this goes through OSD facilities of the physical device (like
+a "full featured" DVB card) or through a graphics adapter that overlays its
+output with the video signal, doesn't matter.
+<!--X1.3.7--></td></tr></table>
 
 <p>
 <b>Initializing new devices</b>
 <p>
-A derived cDevice class shall implement a static function
+A derived <tt>cDevice</tt> class shall implement a static function
 in which it determines whether the necessary hardware to run this sort of
 device is actually present in this machine (or whatever other prerequisites
 might be important), and then creates as many device objects as necessary.
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index c7d4ebcf6..fd10cc3c3 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -8,3 +8,7 @@ VDR Plugin 'osddemo' Revision History
 2002-12-13: Version 0.1.0
 
 - Changed setting of CXX and CXXFLAGS variables in Makefile.
+
+2004-04-30: Version 0.1.1
+
+- New OSD handling.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 3ac8a2d99..08b2d9675 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 1.2 2002/12/13 15:02:01 kls Exp $
+ * $Id: osddemo.c 1.3 2004/05/16 09:28:51 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -16,10 +16,10 @@ static const char *MAINMENUENTRY  = "Osd Demo";
 
 class cLineGame : public cOsdObject {
 private:
-  cOsdBase *osd;
+  cOsd *osd;
   int x;
   int y;
-  eDvbColor color;
+  tColor color;
 public:
   cLineGame(void);
   ~cLineGame();
@@ -41,15 +41,11 @@ cLineGame::~cLineGame()
 
 void cLineGame::Show(void)
 {
-  osd = cOsd::OpenRaw(100, 50);
+  osd = cOsdProvider::NewOsd(100, 50);
   if (osd) {
-     osd->Create(0, 0, 100, 200, 4);
-     osd->AddColor(clrBackground);
-     osd->AddColor(clrRed);
-     osd->AddColor(clrGreen);
-     osd->AddColor(clrYellow);
-     osd->AddColor(clrBlue);
-     osd->Clear();
+     tArea Area = { 0, 0, 99, 199,  4 };
+     osd->SetAreas(&Area, 1);
+     osd->DrawRectangle(0, 0, 99, 199, clrGray50);
      osd->Flush();
      }
 }
@@ -70,7 +66,7 @@ eOSState cLineGame::ProcessKey(eKeys Key)
        case kOk:     return osEnd;
        default: return state;
        }
-     osd->Fill(x, y, x + 3, y + 3, color);
+     osd->DrawRectangle(x, y, x + 3, y + 3, color);
      osd->Flush();
      state = osContinue;
      }
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
index ba262f82d..4b6e1af5a 100644
--- a/PLUGINS/src/sky/channels.conf.sky
+++ b/PLUGINS/src/sky/channels.conf.sky
@@ -18,7 +18,7 @@
 #
 S28.2E-2-2027-4705:106:sky_one
 S28.2E-2-2027-5104:107:sky_one_mix
-S28.2E-2-2054-10240:226:itv2
+S28.2E-2-2054-10240:175:itv2
 S28.2E-2-2023-4905:130:scifi
 S28.2E-2-2025-5904:127:paramount
 S28.2E-2-2009-6201:551:discovery
diff --git a/channels.c b/channels.c
index 3b0b6161f..021b61743 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.24 2004/02/13 15:37:42 kls Exp $
+ * $Id: channels.c 1.25 2004/04/03 13:42:06 kls Exp $
  */
 
 #include "channels.h"
@@ -888,3 +888,19 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, i
      }
   return NULL;
 }
+
+const char *ChannelString(const cChannel *Channel, int Number)
+{
+  static char buffer[256];
+  if (Channel) {
+     if (Channel->GroupSep())
+        snprintf(buffer, sizeof(buffer), "%s", Channel->Name());
+     else
+        snprintf(buffer, sizeof(buffer), "%d%s  %s", Channel->Number(), Number ? "-" : "", Channel->Name());
+     }
+  else if (Number)
+     snprintf(buffer, sizeof(buffer), "%d-", Number);
+  else
+     snprintf(buffer, sizeof(buffer), "%s", tr("*** Invalid Channel ***"));
+  return buffer;
+}
diff --git a/channels.conf b/channels.conf
index ca0b6fc42..d1d205b3b 100644
--- a/channels.conf
+++ b/channels.conf
@@ -44,20 +44,20 @@ ZDFdokukanal:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
-PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:0:1702,1801,1722:10:133:2:0
-PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:0:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:0:1722,1702,1801:43:133:2:0
-PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:0:1801,1722,1702:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:0:1801,1702,1722:29:133:2:0
-PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:0:1722,1801,1702:41:133:2:0
-PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:0:1722,1702,1801:20:133:2:0
+START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
+PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1702,1722:10:133:2:0
+PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1702,1722,1801:11:133:2:0
+PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
+PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
+PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
+PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
 DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1702,1722,1801:34:133:17:0
 :Premiere Direkt
 DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:0:1702,1722,1801:21:133:1:0
-EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0
+B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
+EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
 SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
 SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:0:1702,1722,1801:27:133:4:0
@@ -71,7 +71,7 @@ Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
 FRANCE 5:12207:vC34:S19.2E:27500:160:80=fra:32:0:8501:1:1090:0
 LCP:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
-ESCALES:12285:vC34:S19.2E:27500:165:100:0:500,100:17025:1:1094:0
+ESCALES:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
 CANAL CLUB:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
 ASTRA-Mosaic:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
 ASTRA-Mosaic 2:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
@@ -112,8 +112,8 @@ WDR M
 Going Places:10920:hC56:S28.2E:22000:2310+2304:2311=eng:2312:0:5008:2:2055:0
 Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
 S1T:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
-CNN:12051:vC23:S28.2E:27500:2309:2311=eng:2310:0:7140:2:2018:0
-BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308=eng,2309=eng:2307:0:7300:2:2022:0
-AL HAYAT:11200:vC56:S13.0E:27500:413:414=eng:0:0:4733:318:13400:0
+CNN:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
+BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
+AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 :@1000 New channels
diff --git a/channels.h b/channels.h
index c797cb284..f5c9fbe1f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.16 2004/02/13 15:16:36 kls Exp $
+ * $Id: channels.h 1.17 2004/04/03 13:40:47 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -203,4 +203,6 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
 
 extern cChannels Channels;
 
+const char *ChannelString(const cChannel *Channel, int Number);
+
 #endif //__CHANNELS_H
diff --git a/config.c b/config.c
index aaf376abb..ef362f6df 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.125 2004/02/28 11:12:20 kls Exp $
+ * $Id: config.c 1.127 2004/05/16 12:43:55 kls Exp $
  */
 
 #include "config.h"
@@ -245,6 +245,8 @@ cSetup Setup;
 cSetup::cSetup(void)
 {
   OSDLanguage = 0;
+  strcpy(OSDSkin, "sttng");
+  strcpy(OSDTheme, "default");
   PrimaryDVB = 1;
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
@@ -256,6 +258,7 @@ cSetup::cSetup(void)
   LnbFrequHi = 10600;
   DiSEqC = 0;
   SetSystemTime = 0;
+  TimeSource = 0;
   TimeTransponder = 0;
   MarginStart = 2;
   MarginStop = 10;
@@ -279,9 +282,12 @@ cSetup::cSetup(void)
   UpdateChannels = 4;
   RecordDolbyDigital = 1;
   ChannelInfoPos = 0;
-  OSDwidth = 52;
-  OSDheight = 18;
+  OSDLeft = 54;
+  OSDTop = 45;
+  OSDWidth = 624;
+  OSDHeight = 486;
   OSDMessageTime = 1;
+  UseSmallFont = 1;
   MaxVideoFileSize = MAXVIDEOFILESIZE;
   SplitEditedFiles = 0;
   MinEventTimeout = 30;
@@ -392,6 +398,8 @@ bool cSetup::ParseLanguages(const char *Value, int *Values)
 bool cSetup::Parse(const char *Name, const char *Value)
 {
   if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
+  else if (!strcasecmp(Name, "OSDSkin"))             strn0cpy(OSDSkin, Value, MaxSkinName);
+  else if (!strcasecmp(Name, "OSDTheme"))            strn0cpy(OSDTheme, Value, MaxThemeName);
   else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
   else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
@@ -403,6 +411,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
   else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
   else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
+  else if (!strcasecmp(Name, "TimeSource"))          TimeSource         = cSource::FromString(Value);
   else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
   else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
   else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
@@ -426,9 +435,12 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
   else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
-  else if (!strcasecmp(Name, "OSDwidth"))            OSDwidth           = atoi(Value);
-  else if (!strcasecmp(Name, "OSDheight"))           OSDheight          = atoi(Value);
+  else if (!strcasecmp(Name, "OSDLeft"))             OSDLeft            = atoi(Value);
+  else if (!strcasecmp(Name, "OSDTop"))              OSDTop             = atoi(Value);
+  else if (!strcasecmp(Name, "OSDWidth"))          { OSDWidth           = atoi(Value); if (OSDWidth  < 100) OSDWidth  *= 12; OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
+  else if (!strcasecmp(Name, "OSDHeight"))         { OSDHeight          = atoi(Value); if (OSDHeight < 100) OSDHeight *= 27; }
   else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
+  else if (!strcasecmp(Name, "UseSmallFont"))        UseSmallFont       = atoi(Value);
   else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
   else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
   else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
@@ -446,6 +458,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
 bool cSetup::Save(void)
 {
   Store("OSDLanguage",        OSDLanguage);
+  Store("OSDSkin",            OSDSkin);
+  Store("OSDTheme",           OSDTheme);
   Store("PrimaryDVB",         PrimaryDVB);
   Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch);
   Store("MenuScrollPage",     MenuScrollPage);
@@ -457,6 +471,7 @@ bool cSetup::Save(void)
   Store("LnbFrequHi",         LnbFrequHi);
   Store("DiSEqC",             DiSEqC);
   Store("SetSystemTime",      SetSystemTime);
+  Store("TimeSource",         cSource::ToString(TimeSource));
   Store("TimeTransponder",    TimeTransponder);
   Store("MarginStart",        MarginStart);
   Store("MarginStop",         MarginStop);
@@ -480,9 +495,12 @@ bool cSetup::Save(void)
   Store("UpdateChannels",     UpdateChannels);
   Store("RecordDolbyDigital", RecordDolbyDigital);
   Store("ChannelInfoPos",     ChannelInfoPos);
-  Store("OSDwidth",           OSDwidth);
-  Store("OSDheight",          OSDheight);
+  Store("OSDLeft",            OSDLeft);
+  Store("OSDTop",             OSDTop);
+  Store("OSDWidth",           OSDWidth);
+  Store("OSDHeight",          OSDHeight);
   Store("OSDMessageTime",     OSDMessageTime);
+  Store("UseSmallFont",       UseSmallFont);
   Store("MaxVideoFileSize",   MaxVideoFileSize);
   Store("SplitEditedFiles",   SplitEditedFiles);
   Store("MinEventTimeout",    MinEventTimeout);
diff --git a/config.h b/config.h
index d2afdeea1..b9845a4ec 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.190 2004/03/05 14:35:15 kls Exp $
+ * $Id: config.h 1.193 2004/05/16 12:41:43 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,18 +20,20 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.6"
-#define VDRVERSNUM   10306  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.7"
+#define VDRVERSNUM   10307  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
 
-#define MINOSDWIDTH  40
-#define MAXOSDWIDTH  56
-#define MINOSDHEIGHT 12
-#define MAXOSDHEIGHT 21
+#define MINOSDWIDTH  480
+#define MAXOSDWIDTH  672
+#define MINOSDHEIGHT 324
+#define MAXOSDHEIGHT 567
 
 #define MaxFileName 256
+#define MaxSkinName 16
+#define MaxThemeName 16
 
 class cCommand : public cListObject {
 private:
@@ -204,6 +206,8 @@ class cSetup : public cConfig<cSetupLine> {
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
   int __BeginData__;
   int OSDLanguage;
+  char OSDSkin[MaxSkinName];
+  char OSDTheme[MaxThemeName];
   int PrimaryDVB;
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
@@ -215,6 +219,7 @@ class cSetup : public cConfig<cSetupLine> {
   int LnbFrequHi;
   int DiSEqC;
   int SetSystemTime;
+  int TimeSource;
   int TimeTransponder;
   int MarginStart, MarginStop;
   int EPGLanguages[I18nNumLanguages + 1];
@@ -235,8 +240,9 @@ class cSetup : public cConfig<cSetupLine> {
   int UpdateChannels;
   int RecordDolbyDigital;
   int ChannelInfoPos;
-  int OSDwidth, OSDheight;
+  int OSDLeft, OSDTop, OSDWidth, OSDHeight;
   int OSDMessageTime;
+  int UseSmallFont;
   int MaxVideoFileSize;
   int SplitEditedFiles;
   int MinEventTimeout, MinUserInactivity;
diff --git a/device.c b/device.c
index 871149e9d..0c2b76dcd 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.53 2004/02/08 15:05:11 kls Exp $
+ * $Id: device.c 1.55 2004/05/16 12:14:47 kls Exp $
  */
 
 #include "device.h"
@@ -126,11 +126,6 @@ bool cDevice::HasDecoder(void) const
   return false;
 }
 
-cOsdBase *cDevice::NewOsd(int x, int y)
-{
-  return NULL;
-}
-
 cSpuDecoder *cDevice::GetSpuDecoder(void)
 {
   return NULL;
@@ -330,12 +325,14 @@ int cDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
 
 void cDevice::AttachFilter(cFilter *Filter)
 {
-  sectionHandler->Attach(Filter);
+  if (sectionHandler)
+     sectionHandler->Attach(Filter);
 }
 
 void cDevice::Detach(cFilter *Filter)
 {
-  sectionHandler->Detach(Filter);
+  if (sectionHandler)
+     sectionHandler->Detach(Filter);
 }
 
 bool cDevice::ProvidesSource(int Source) const
@@ -360,11 +357,9 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
   for (int i = 3; i--;) {
       switch (SetChannel(Channel, LiveView)) {
         case scrOk:           return true;
-        case scrNotAvailable: if (Interface)
-                                 Interface->Error(tr("Channel not available!"));
+        case scrNotAvailable: Skins.Message(mtError, tr("Channel not available!"));
                               return false;
-        case scrNoTransfer:   if (Interface)
-                                 Interface->Error(tr("Can't start Transfer Mode!"));
+        case scrNoTransfer:   Skins.Message(mtError, tr("Can't start Transfer Mode!"));
                               return false;
         case scrFailed:       break; // loop will retry
         }
@@ -396,8 +391,8 @@ bool cDevice::SwitchChannel(int Direction)
         if (PrimaryDevice()->SwitchChannel(channel, true))
            result = true;
         }
-     else if (n != first && Interface)
-        Interface->Error(tr("Channel not available!"));
+     else if (n != first)
+        Skins.Message(mtError, tr("Channel not available!"));
      }
   return result;
 }
diff --git a/device.h b/device.h
index 5815aca4d..a725e4d43 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.41 2004/03/14 10:47:01 kls Exp $
+ * $Id: device.h 1.42 2004/04/17 10:15:25 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -54,7 +54,6 @@ enum eVideoSystem { vsPAL,
                     vsNTSC
                   };
 
-class cOsdBase;
 class cChannel;
 class cPlayer;
 class cReceiver;
@@ -139,15 +138,9 @@ class cDevice : public cThread {
   virtual bool HasDecoder(void) const;
          ///< Tells whether this device has an MPEG decoder.
 
-// OSD facilities
+// SPU facilities
 
 public:
-  virtual cOsdBase *NewOsd(int x, int y);
-         ///< Creates a new cOsdBase object that can be used by the cOsd class
-         ///< to display information on the screen, with the upper left corner
-         ///< of the OSD at the given coordinates. If a derived cDevice doesn't
-         ///< implement this function, NULL will be returned by default (which
-         ///< means the device has no OSD capabilities).
   virtual cSpuDecoder *GetSpuDecoder(void);
          ///< Returns a pointer to the device's SPU decoder (or NULL, if this
          ///< device doesn't have an SPU decoder).
diff --git a/dvbdevice.c b/dvbdevice.c
index 6e1d7f956..afeb97319 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.83 2004/03/14 14:47:46 kls Exp $
+ * $Id: dvbdevice.c 1.84 2004/05/01 13:15:46 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -427,7 +427,7 @@ bool cDvbDevice::Initialize(void)
 void cDvbDevice::MakePrimaryDevice(bool On)
 {
   if (HasDecoder())
-     cDvbOsd::SetDvbDevice(On ? this : NULL);
+     new cDvbOsdProvider(fd_osd);
 }
 
 bool cDvbDevice::HasDecoder(void) const
@@ -446,11 +446,6 @@ int cDvbDevice::ProvidesCa(const cChannel *Channel) const
   return cDevice::ProvidesCa(Channel);
 }
 
-cOsdBase *cDvbDevice::NewOsd(int x, int y)
-{
-  return new cDvbOsd(x, y);
-}
-
 cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
 {
   if (!spuDecoder && IsPrimaryDevice())
diff --git a/dvbdevice.h b/dvbdevice.h
index f64e6ddae..2c5bd8eb1 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.26 2004/01/03 10:21:50 kls Exp $
+ * $Id: dvbdevice.h 1.27 2004/04/17 11:56:22 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -26,7 +26,6 @@ class cDvbTuner;
 /// The cDvbDevice implements a DVB device which can be accessed through the Linux DVB driver API.
 
 class cDvbDevice : public cDevice {
-  friend class cDvbOsd;
 private:
   static bool Probe(const char *FileName);
          ///< Probes for existing DVB devices.
@@ -38,7 +37,6 @@ class cDvbDevice : public cDevice {
 private:
   fe_type_t frontendType;
   int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc;
-  int OsdDeviceHandle(void) const { return fd_osd; }
 protected:
   virtual void MakePrimaryDevice(bool On);
 public:
@@ -47,12 +45,11 @@ class cDvbDevice : public cDevice {
   virtual int ProvidesCa(const cChannel *Channel) const;
   virtual bool HasDecoder(void) const;
 
-// OSD facilities
+// SPU facilities
 
 private:
   cDvbSpuDecoder *spuDecoder;
 public:
-  cOsdBase *NewOsd(int x, int y);
   virtual cSpuDecoder *GetSpuDecoder(void);
 
 // Channel facilities
diff --git a/dvbosd.c b/dvbosd.c
index 3d57362df..d21bcefb9 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.21 2003/04/12 12:10:12 kls Exp $
+ * $Id: dvbosd.c 1.22 2004/05/01 15:10:44 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -13,40 +13,49 @@
 #include <sys/unistd.h>
 #include "tools.h"
 
-const cDvbDevice *cDvbOsd::dvbDevice = NULL;
+// --- cDvbOsd ---------------------------------------------------------------
 
-cDvbOsd::cDvbOsd(int x, int y)
-:cOsdBase(x, y)
+#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
+#define MAXOSDMEMORY  92000 // number of bytes available to the OSD (depends on firmware version, but there is no way of determining the actual value)
+
+cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
+:cOsd(Left, Top)
 {
-  osdDev = dvbDevice ? dvbDevice->OsdDeviceHandle() : -1;
-  if (dvbDevice && osdDev < 0)
+  osdDev = OsdDev;
+  shown = false;
+  if (osdDev < 0)
      esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
 }
 
 cDvbOsd::~cDvbOsd()
 {
-  for (int i = 0; i < NumWindows(); i++)
-      CloseWindow(GetWindowNr(i));
-}
-
-void cDvbOsd::SetDvbDevice(const cDvbDevice *DvbDevice)
-{
-  dvbDevice = DvbDevice;
+  if (shown) {
+     cBitmap *Bitmap;
+     for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+         Cmd(OSD_SetWindow, 0, i + 1);
+         Cmd(OSD_Close);
+         }
+     }
 }
 
-bool cDvbOsd::SetWindow(cWindow *Window)
+eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
-  if (Window) {
-     // Window handles are counted 0...(MAXNUMWINDOWS - 1), but the actual window
-     // numbers in the driver are used from 1...MAXNUMWINDOWS.
-     int Handle = Window->Handle();
-     if (0 <= Handle && Handle < MAXNUMWINDOWS) {
-        Cmd(OSD_SetWindow, 0, Handle + 1);
-        return true;
-        }
-     esyslog("ERROR: illegal window handle: %d", Handle);
+  eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
+  if (Result == oeOk) {
+     if (NumAreas > MAXNUMWINDOWS)
+        return oeTooManyAreas;
+     int TotalMemory = 0;
+     for (int i = 0; i < NumAreas; i++) {
+         if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8)
+            return oeBppNotSupported;
+         if ((Areas[i].Width() & (8 / Areas[i].bpp - 1)) != 0)
+            return oeWrongAlignment;
+         TotalMemory += Areas[i].Width() * Areas[i].Height() / (8 / Areas[i].bpp);
+         }
+     if (TotalMemory > MAXOSDMEMORY)
+        return oeOutOfMemory;
      }
-  return false;
+  return Result;
 }
 
 void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
@@ -64,51 +73,78 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      }
 }
 
-bool cDvbOsd::OpenWindow(cWindow *Window)
-{
-  if (SetWindow(Window)) {
-     Cmd(OSD_Open, Window->Bpp(), X0() + Window->X0(), Y0() + Window->Y0(), X0() + Window->X0() + Window->Width() - 1, Y0() + Window->Y0() + Window->Height() - 1, (void *)1); // initially hidden!
-     return true;
-     }
-  return false;
-}
-
-void cDvbOsd::CommitWindow(cWindow *Window)
+void cDvbOsd::Flush(void)
 {
-  if (SetWindow(Window)) {
-     int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-     if (Window->Dirty(x1, y1, x2, y2)) {
-        // commit colors:
-        int FirstColor = 0, LastColor = 0;
-        const eDvbColor *pal;
-        while ((pal = Window->NewColors(FirstColor, LastColor)) != NULL)
-              Cmd(OSD_SetPalette, FirstColor, LastColor, 0, 0, 0, pal);
-        // commit modified data:
-        Cmd(OSD_SetBlock, Window->Width(), x1, y1, x2, y2, Window->Data(x1, y1));
-        }
+  cBitmap *Bitmap;
+  for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+      Cmd(OSD_SetWindow, 0, i + 1);
+      if (!shown)
+         Cmd(OSD_Open, Bitmap->Bpp(), Left() + Bitmap->X0(), Top() + Bitmap->Y0(), Left() + Bitmap->X0() + Bitmap->Width() - 1, Top() + Bitmap->Y0() + Bitmap->Height() - 1, (void *)1); // initially hidden!
+      int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+      if (Bitmap->Dirty(x1, y1, x2, y2)) {
+         //TODO Workaround: apparently the bitmap sent to the driver always has to be a multiple
+         //TODO of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
+         //TODO Fix driver (should be able to handle any size bitmaps!)
+         while ((x1 > 0 || x2 < Bitmap->Width() - 1) && ((x2 - x1) & 7) != 7) {
+               if (x2 < Bitmap->Width() - 1)
+                  x2++;
+               else if (x1 > 0)
+                  x1--;
+               }
+         //TODO "... / 2" <==> Bpp???
+         while ((y1 > 0 || y2 < Bitmap->Height() - 1) && (((x2 - x1 + 1) * (y2 - y1 + 1) / 2) & 7) != 0) {
+               if (y2 < Bitmap->Height() - 1)
+                  y2++;
+               else if (y1 > 0)
+                  y1--;
+               }
+         while ((x1 > 0 || x2 < Bitmap->Width() - 1) && (((x2 - x1 + 1) * (y2 - y1 + 1) / 2) & 7) != 0) {
+               if (x2 < Bitmap->Width() - 1)
+                  x2++;
+               else if (x1 > 0)
+                  x1--;
+               }
+         // commit colors:
+         int NumColors;
+         const tColor *Colors = Bitmap->Colors(NumColors);
+         if (Colors) {
+            //TODO this should be fixed in the driver!
+            tColor colors[NumColors];
+            for (int i = 0; i < NumColors; i++) {
+                // convert AARRGGBB to AABBGGRR (the driver expects the colors the wrong way):
+                colors[i] = (Colors[i] & 0xFF000000) | ((Colors[i] & 0x0000FF) << 16) | (Colors[i] & 0x00FF00) | ((Colors[i] & 0xFF0000) >> 16);
+#if __BYTE_ORDER == __BIG_ENDIAN
+                // actually the driver itself should access the bytes according to the current endianness!
+                colors[i] = ((colors[i] & 0xFF) << 24) | ((colors[i] & 0xFF00) << 8) | ((colors[i] & 0xFF0000) >> 8) | ((colors[i] & 0xFF000000) >> 24);
+#endif
+                }
+            Colors = colors;
+            //TODO end of stuff that should be fixed in the driver
+            Cmd(OSD_SetPalette, 0, NumColors - 1, 0, 0, 0, Colors);
+            }
+         // commit modified data:
+         Cmd(OSD_SetBlock, Bitmap->Width(), x1, y1, x2, y2, Bitmap->Data(x1, y1));
+         }
+      Bitmap->Clean();
+      }
+  if (!shown) {
+     // Showing the windows in a separate loop to avoid seeing them come up one after another
+     for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+         Cmd(OSD_SetWindow, 0, i + 1);
+         Cmd(OSD_MoveWindow, 0, Left() + Bitmap->X0(), Top() + Bitmap->Y0());
+         }
+     shown = true;
      }
 }
 
-void cDvbOsd::ShowWindow(cWindow *Window)
-{
-  if (SetWindow(Window))
-     Cmd(OSD_MoveWindow, 0, X0() + Window->X0(), Y0() + Window->Y0());
-}
-
-void cDvbOsd::HideWindow(cWindow *Window, bool Hide)
-{
-  if (SetWindow(Window))
-     Cmd(Hide ? OSD_Hide : OSD_Show, 0);
-}
+// --- cDvbOsdProvider -------------------------------------------------------
 
-void cDvbOsd::MoveWindow(cWindow *Window, int x, int y)
+cDvbOsdProvider::cDvbOsdProvider(int OsdDev)
 {
-  if (SetWindow(Window))
-     Cmd(OSD_MoveWindow, 0, X0() + x, Y0() + y);
+  osdDev = OsdDev;
 }
 
-void cDvbOsd::CloseWindow(cWindow *Window)
+cOsd *cDvbOsdProvider::CreateOsd(int Left, int Top)
 {
-  if (SetWindow(Window))
-     Cmd(OSD_Close);
+  return new cDvbOsd(Left, Top, osdDev);
 }
diff --git a/dvbosd.h b/dvbosd.h
index cbc7901f4..bac43f510 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.16 2002/11/01 10:05:47 kls Exp $
+ * $Id: dvbosd.h 1.17 2004/04/30 13:44:16 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -12,25 +12,26 @@
 
 #include <linux/dvb/osd.h>
 #include "dvbdevice.h"
-#include "osdbase.h"
+#include "osd.h"
 
-class cDvbOsd : public cOsdBase {
+class cDvbOsd : public cOsd {
 private:
-  static const cDvbDevice *dvbDevice;
   int osdDev;
-  bool SetWindow(cWindow *Window);
+  bool shown;
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
-protected:
-  virtual bool OpenWindow(cWindow *Window);
-  virtual void CommitWindow(cWindow *Window);
-  virtual void ShowWindow(cWindow *Window);
-  virtual void HideWindow(cWindow *Window, bool Hide);
-  virtual void MoveWindow(cWindow *Window, int x, int y);
-  virtual void CloseWindow(cWindow *Window);
 public:
-  cDvbOsd(int x, int y);
+  cDvbOsd(int Left, int Top, int OsdDev);
   virtual ~cDvbOsd();
-  static void SetDvbDevice(const cDvbDevice *DvbDevice);
+  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+  virtual void Flush(void);
+  };
+
+class cDvbOsdProvider : public cOsdProvider {
+private:
+  int osdDev;
+public:
+  cDvbOsdProvider(int OsdDev);
+  virtual cOsd *CreateOsd(int Left, int Top);
   };
 
 #endif //__DVBOSD_H
diff --git a/dvbspu.c b/dvbspu.c
index 74ace19a3..a7af8ee16 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.5 2003/10/12 09:43:18 kls Exp $
+ * $Id: dvbspu.c 1.6 2004/04/30 13:45:02 kls Exp $
  */
 
 #include <assert.h>
@@ -16,8 +16,6 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "osd.h"
-#include "osdbase.h"
 #include "device.h"
 #include "dvbspu.h"
 
@@ -105,13 +103,13 @@ cBitmap *cDvbSpuBitmap::getBitmap(const aDvbSpuPalDescr paldescr,
     if (w & 0x03)
         w += 4 - (w & 0x03);
 
-    cBitmap *ret = new cBitmap(w, h, 2, true);
+    cBitmap *ret = new cBitmap(w, h, 2);
 
     // set the palette
     for (int i = 0; i < 4; i++) {
         uint32_t color =
             pal.getColor(paldescr[i].index, paldescr[i].trans);
-        ret->SetColor(i, (eDvbColor) color);
+        ret->SetColor(i, (tColor) color);
     }
 
     // set the content
@@ -323,8 +321,9 @@ int cDvbSpuDecoder::ScaleYres(int value)
 
 void cDvbSpuDecoder::DrawBmp(sDvbSpuRect & size, cBitmap * bmp)
 {
-    osd->Create(size.x1, size.y1, size.width(), size.height(), 2, false);
-    osd->SetBitmap(size.x1, size.y1, *bmp);
+    tArea Area = { size.x1, size.y1, size.x2, size.y2, 2 };
+    osd->SetAreas(&Area, 1);
+    osd->DrawBitmap(size.x1, size.y1, *bmp);
     delete bmp;
 }
 
@@ -360,8 +359,8 @@ void cDvbSpuDecoder::Draw(void)
 
     if (bg || fg) {
         if (osd == NULL)
-            if ((osd = cOsd::OpenRaw(0, 0)) == NULL) {
-                dsyslog("OpenRaw failed\n");
+            if ((osd = cOsdProvider::NewOsd(0, 0)) == NULL) {
+                dsyslog("NewOsd failed\n");
                 return;
             }
 
diff --git a/dvbspu.h b/dvbspu.h
index 11bf7207f..4c926df39 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.2 2002/09/29 13:49:01 kls Exp $
+ * $Id: dvbspu.h 1.3 2004/04/30 13:44:41 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -16,7 +16,7 @@
 
 #include <inttypes.h>
 
-#include "osdbase.h"
+#include "osd.h"
 #include "spu.h"
 
 typedef struct sDvbSpuPalDescr {
@@ -91,7 +91,7 @@ class cDvbSpuBitmap {
 
 class cDvbSpuDecoder:public cSpuDecoder {
   private:
-    cOsdBase * osd;
+    cOsd * osd;
 
     // processing state
     uint8_t *spu;
diff --git a/eit.c b/eit.c
index a42647762..97ba5230c 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.93 2004/03/13 13:54:20 kls Exp $
+ * $Id: eit.c 1.94 2004/03/20 10:53:23 kls Exp $
  */
 
 #include "eit.h"
@@ -197,7 +197,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer));
             }
          if (ExtendedEventDescriptors) {
-            char buffer[ExtendedEventDescriptors->getMaximumTextLength()];
+            char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ")];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, ": "));
             }
          }
diff --git a/eitscan.c b/eitscan.c
index 191a00e63..4e2bb4267 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,14 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.21 2004/02/14 13:44:31 kls Exp $
+ * $Id: eitscan.c 1.22 2004/04/16 13:33:34 kls Exp $
  */
 
 #include "eitscan.h"
 #include <stdlib.h>
 #include "channels.h"
 #include "dvbdevice.h"
-#include "interface.h"
+#include "skins.h"
 
 // --- cScanData -------------------------------------------------------------
 
@@ -149,7 +149,7 @@ void cEITScanner::Process(void)
                                   if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) {
                                      if (Device == cDevice::PrimaryDevice() && !currentChannel) {
                                         currentChannel = Device->CurrentChannel();
-                                        Interface->Info("Starting EPG scan");
+                                        Skins.Message(mtInfo, "Starting EPG scan");
                                         }
                                      currentDevice = Device;//XXX see also dvbdevice.c!!!
                                      Device->SwitchChannel(Channel, false);
diff --git a/epg2html.pl b/epg2html.pl
index c6e6f9cf2..6b2584660 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.5 2004/02/22 13:18:27 kls Exp $
+# $Id: epg2html.pl 1.6 2004/03/28 11:15:01 kls Exp $
 
 @Index = ();
 
@@ -51,7 +51,7 @@ sub Tags
                   while (<>) {
                         if    (/^T (.*)/) { $Title       = Tags($1); }
                         elsif (/^S (.*)/) { $Subtitle    = Tags($1); }
-                        elsif (/^D (.*)/) { $Description = Tags($1); }
+                        elsif (/^D (.*)/) { $Description = Tags($1); $Description =~ s/\|/<br>/g; }
                         elsif (/^V (.*)/) { $Vps         = $1; }
                         elsif (/^e/) {
                            $Events{$Time} = [($Duration, $Title, $Subtitle, $Description, $Vps)];
diff --git a/font.c b/font.c
index e933df230..9a5b31e32 100644
--- a/font.c
+++ b/font.c
@@ -4,9 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.5 2004/01/16 13:17:57 kls Exp $
+ * $Id: font.c 1.7 2004/05/16 10:50:59 kls Exp $
  */
 
+#include "config.h"
+#include <ctype.h>
 #include "font.h"
 #include "tools.h"
 
@@ -14,6 +16,10 @@
 #include "fontosd.c"
 #include "fontsml.c"
 
+#include "fontfix-iso8859-2.c"
+#include "fontosd-iso8859-2.c"
+#include "fontsml-iso8859-2.c"
+
 #include "fontfix-iso8859-5.c"
 #include "fontosd-iso8859-5.c"
 #include "fontsml-iso8859-5.c"
@@ -22,14 +28,18 @@
 #include "fontosd-iso8859-7.c"
 #include "fontsml-iso8859-7.c"
 
+// --- cFont -----------------------------------------------------------------
+
 static void *FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 },
+  { FontOsd_iso8859_2, FontFix_iso8859_2, FontSml_iso8859_2 },
   { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5 },
   { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 },
   };
 
 static const char *FontCode[eDvbCodeSize] = {
   "iso8859-1",
+  "iso8859-2",
   "iso8859-5",
   "iso8859-7",
   };
@@ -44,9 +54,9 @@ cFont::cFont(void *Data)
 
 void cFont::SetData(void *Data)
 {
-  int h = ((tCharData *)Data)->height;
+  height = ((tCharData *)Data)->height;
   for (int i = 0; i < NUMCHARS; i++)
-      data[i] = (tCharData *)&((tPixelData *)Data)[(i < 32 ? 0 : i - 32) * (h + 2)];
+      data[i] = (tCharData *)&((tPixelData *)Data)[(i < 32 ? 0 : i - 32) * (height + 2)];
 }
 
 int cFont::Width(const char *s) const
@@ -61,7 +71,7 @@ int cFont::Height(const char *s) const
 {
   int h = 0;
   if (s && *s)
-     h = Height(*s); // all characters have the same height!
+     h = height; // all characters have the same height!
   return h;
 }
 
@@ -95,7 +105,131 @@ void cFont::SetFont(eDvbFont Font, void *Data)
 
 const cFont *cFont::GetFont(eDvbFont Font)
 {
+  if (Setup.UseSmallFont == 0 && Font == fontSml)
+     Font = fontOsd;
+  else if (Setup.UseSmallFont == 2 && Font == fontOsd)
+     Font = fontSml;
   if (!fonts[Font])
      SetFont(Font);
   return fonts[Font];
 }
+
+// --- cTextWrapper ----------------------------------------------------------
+
+cTextWrapper::cTextWrapper(void)
+{
+  text = eol = NULL;
+  lines = 0;
+  lastLine = -1;
+}
+
+cTextWrapper::cTextWrapper(const char *Text, const cFont *Font, int Width)
+{
+  text = NULL;
+  Set(Text, Font, Width);
+}
+
+cTextWrapper::~cTextWrapper()
+{
+  free(text);
+}
+
+void cTextWrapper::Set(const char *Text, const cFont *Font, int Width)
+{
+  free(text);
+  text = Text ? strdup(Text) : NULL;
+  eol = NULL;
+  lines = 0;
+  lastLine = -1;
+  if (!text)
+     return;
+  lines = 1;
+  if (Width <= 0)
+     return;
+
+  char *Blank = NULL;
+  char *Delim = NULL;
+  int w = 0;
+
+  stripspace(text); // strips trailing newlines
+
+  for (char *p = text; *p; ) {
+      if (*p == '\n') {
+         lines++;
+         w = 0;
+         Blank = Delim = NULL;
+         p++;
+         continue;
+         }
+      else if (isspace(*p))
+         Blank = p;
+      int cw = Font->Width(*p);
+      if (w + cw > Width) {
+         if (Blank) {
+            *Blank = '\n';
+            p = Blank;
+            continue;
+            }
+         else {
+            // Here's the ugly part, where we don't have any whitespace to
+            // punch in a newline, so we need to make room for it:
+            if (Delim)
+               p = Delim + 1; // let's fall back to the most recent delimiter
+            char *s = MALLOC(char, strlen(text) + 2); // The additional '\n' plus the terminating '\0'
+            int l = p - text;
+            strncpy(s, text, l);
+            s[l] = '\n';
+            strcpy(s + l + 1, p);
+            free(text);
+            text = s;
+            p = text + l;
+            continue;
+            }
+         }
+      else
+         w += cw;
+      if (strchr("-.,:;!?_", *p)) {
+         Delim = p;
+         Blank = NULL;
+         }
+      p++;
+      }
+}
+
+const char *cTextWrapper::Text(void)
+{
+  if (eol) {
+     *eol = '\n';
+     eol = NULL;
+     }
+  return text;
+}
+
+const char *cTextWrapper::GetLine(int Line)
+{
+  char *s = NULL;
+  if (Line < lines) {
+     if (eol) {
+        *eol = '\n';
+        if (Line == lastLine + 1)
+           s = eol + 1;
+        eol = NULL;
+        }
+     if (!s) {
+        s = text;
+        for (int i = 0; i < Line; i++) {
+            s = strchr(s, '\n');
+            if (s)
+               s++;
+            else
+               break;
+            }
+        }
+     if (s) {
+        if ((eol = strchr(s, '\n')) != NULL)
+           *eol = 0;
+        }
+     lastLine = Line;
+     }
+  return s;
+}
diff --git a/font.h b/font.h
index 9c3631604..3803960b3 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.5 2004/01/16 13:18:28 kls Exp $
+ * $Id: font.h 1.7 2004/05/16 10:49:44 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -21,6 +21,7 @@ enum eDvbFont {
 
 enum eDvbCode {
   code_iso8859_1,
+  code_iso8859_2,
   code_iso8859_5,
   code_iso8859_7,
 #define eDvbCodeSize (code_iso8859_7 + 1)
@@ -38,13 +39,20 @@ class cFont {
   static eDvbCode code;
   static cFont *fonts[];
   const tCharData *data[NUMCHARS];
+  int height;
 public:
   cFont(void *Data);
   void SetData(void *Data);
   int Width(unsigned char c) const { return data[c]->width; }
+      ///< Returns the width of the given character.
   int Width(const char *s) const;
+      ///< Returns the width of the given string.
   int Height(unsigned char c) const { return data[c]->height; }
+      ///< Returns the height of the given character.
   int Height(const char *s) const;
+      ///< Returns the height of the given string.
+  int Height(void) const { return height; }
+      ///< Returns the height of this font (all characters have the same height).
   const tCharData *CharData(unsigned char c) const { return data[c]; }
   static bool SetCode(const char *Code);
   static void SetCode(eDvbCode Code);
@@ -52,4 +60,27 @@ class cFont {
   static const cFont *GetFont(eDvbFont Font);
   };
 
+class cTextWrapper {
+private:
+  char *text;
+  char *eol;
+  int lines;
+  int lastLine;
+public:
+  cTextWrapper(void);
+  cTextWrapper(const char *Text, const cFont *Font, int Width);
+  ~cTextWrapper();
+  void Set(const char *Text, const cFont *Font, int Width);
+      ///< Wraps the Text to make it fit into the area defined by the given Width
+      ///< when displayed with the given Font.
+      ///< Wrapping is done by inserting the necessary number of newline
+      ///< characters into the string.
+  const char *Text(void);
+      ///< Returns the full wrapped text.
+  int Lines(void) { return lines; }
+      ///< Returns the actual number of lines needed to display the full wrapped text.
+  const char *GetLine(int Line);
+      ///< Returns the given Line. The first line is numbered 0.
+  };
+
 #endif //__FONT_H
diff --git a/fontfix-iso8859-2.c b/fontfix-iso8859-2.c
new file mode 100644
index 000000000..1e743bdb9
--- /dev/null
+++ b/fontfix-iso8859-2.c
@@ -0,0 +1,6498 @@
+cFont::tPixelData FontFix_iso8859_2[][28] = {
+  {             // 32
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 33
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 34
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00000880,  // ....*...*......
+     0x00000880,  // ....*...*......
+     0x00000880,  // ....*...*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 35
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 36
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000F60,  // ....****.**....
+     0x00001FE0,  // ...********....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F80,  // ...******......
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00003FE0,  // ..*********....
+     0x000037C0,  // ..**.*****.....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 37
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F00,  // ....****.......
+     0x00001980,  // ...**..**......
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00001980,  // ...**..**......
+     0x00000F00,  // ....****.......
+     0x00000070,  // .........***...
+     0x000003C0,  // ......****.....
+     0x00000E00,  // ....***........
+     0x000039E0,  // ..***..****....
+     0x00000330,  // ......**..**...
+     0x00000618,  // .....**....**..
+     0x00000618,  // .....**....**..
+     0x00000330,  // ......**..**...
+     0x000001E0,  // .......****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 38
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000E00,  // ....***........
+     0x00001F30,  // ...*****..**...
+     0x00001BF0,  // ...**.******...
+     0x000031E0,  // ..**...****....
+     0x000030C0,  // ..**....**.....
+     0x000031E0,  // ..**...****....
+     0x00003FF8,  // ..***********..
+     0x00001F38,  // ...*****..***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000200,  // ......*........
+     0x00000200,  // ......*........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 40
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000060,  // .........**....
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000E0,  // ........***....
+     0x00000060,  // .........**....
+     0x00000000,  // ...............
+  },
+  {             // 41
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001C00,  // ...***.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00000000,  // ...............
+  },
+  {             // 42
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003330,  // ..**..**..**...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000300,  // ......**.......
+     0x00000FC0,  // ....******.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 43
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 44
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000800,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 45
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 46
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 47
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 48
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00001860,  // ...**....**....
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 49
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 50
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 51
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000007C0,  // .....*****.....
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x00003FE0,  // ..*********....
+     0x00001FC0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 52
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000007F0,  // .....*******...
+     0x000007F0,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 53
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ...*********...
+     0x00001FF0,  // ...*********...
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BC0,  // ...**.****.....
+     0x00001FF0,  // ...*********...
+     0x00001C70,  // ...***...***...
+     0x00000038,  // ..........***..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00003038,  // ..**......***..
+     0x00003870,  // ..***....***...
+     0x00001FF0,  // ...*********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 54
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F0,  // .......*****...
+     0x000007F0,  // .....*******...
+     0x00000F00,  // ....****.......
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00003800,  // ..***..........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003830,  // ..***.....**...
+     0x00001C70,  // ...***...***...
+     0x00001FE0,  // ...********....
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 55
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 56
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 57
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // ......****.....
+     0x00000FF0,  // ....********...
+     0x00000C30,  // ....**....**...
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C78,  // ...***...****..
+     0x00000FD8,  // ....******.**..
+     0x00000798,  // .....****..**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 58
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 59
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001000,  // ...*...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 60
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000001C,  // ...........***.
+     0x00000078,  // .........****..
+     0x000001E0,  // .......****....
+     0x00000780,  // .....****......
+     0x00001E00,  // ...****........
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001E00,  // ...****........
+     0x00000780,  // .....****......
+     0x000001E0,  // .......****....
+     0x00000078,  // .........****..
+     0x0000001C,  // ...........***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007000,  // .***...........
+     0x00003C00,  // ..****.........
+     0x00000F00,  // ....****.......
+     0x000003C0,  // ......****.....
+     0x000000F0,  // ........****...
+     0x0000003C,  // ..........****.
+     0x0000003C,  // ..........****.
+     0x000000F0,  // ........****...
+     0x000003C0,  // ......****.....
+     0x00000F00,  // ....****.......
+     0x00003C00,  // ..****.........
+     0x00007000,  // .***...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00001870,  // ...**....***...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000001E0,  // .......****....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 64
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x00003060,  // ..**.....**....
+     0x00003060,  // ..**.....**....
+     0x000031E0,  // ..**...****....
+     0x000033E0,  // ..**..*****....
+     0x00003760,  // ..**.***.**....
+     0x00003660,  // ..**.**..**....
+     0x00003660,  // ..**.**..**....
+     0x00003760,  // ..**.***.**....
+     0x000033F0,  // ..**..******...
+     0x000031F0,  // ..**...*****...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 65
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF0,  // .***********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003000,  // ..**...........
+     0x00003818,  // ..***......**..
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 68
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 69
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x000018CC,  // ...**...**..**.
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 71
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x000060FC,  // .**.....******.
+     0x000060FC,  // .**.....******.
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 73
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 74
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFC,  // ....**********.
+     0x00000FFC,  // ....**********.
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x000070E0,  // .***....***....
+     0x00003FC0,  // ..********.....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 75
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCF8,  // ******..*****..
+     0x0000FCF8,  // ******..*****..
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00003F00,  // ..******.......
+     0x00003B80,  // ..***.***......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 77
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F03C,  // ****......****.
+     0x0000F03C,  // ****......****.
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006798,  // .**..****..**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 78
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 79
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF8,  // .************..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x0000070C,  // .....***....**.
+     0x00001FFC,  // ...***********.
+     0x00001CF0,  // ...***..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FF80,  // *********......
+     0x0000FFE0,  // ***********....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003070,  // ..**.....***...
+     0x00003FE0,  // ..*********....
+     0x00003F80,  // ..*******......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 83
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 85
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 86
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006FD8,  // .**.******.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00003CF0,  // ..****..****...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 88
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000000,  // ...............
+  },
+  {             // 92
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 93
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+  },
+  {             // 94
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 95
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFFE,  // ***************
+     0x0000FFFE,  // ***************
+     0x00000000,  // ...............
+  },
+  {             // 96
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 97
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 98
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BE0,  // ...**.*****....
+     0x00001FF8,  // ...**********..
+     0x00001E38,  // ...****...***..
+     0x00001C1C,  // ...***.....***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00001C1C,  // ...***.....***.
+     0x00001E38,  // ...****...***..
+     0x00007FF8,  // .************..
+     0x00007BE0,  // .****.*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 99
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 100
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F0,  // ........****...
+     0x000000F0,  // ........****...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FFC,  // ..************.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 101
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 102
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F8,  // .......******..
+     0x000003F8,  // ......*******..
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 103
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001FC0,  // ...*******.....
+  },
+  {             // 104
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000F000,  // ****...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 105
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 106
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // ..********.....
+     0x00003FC0,  // ..********.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00003F80,  // ..*******......
+     0x00003F00,  // ..******.......
+  },
+  {             // 107
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x000018F0,  // ...**...****...
+     0x000018F0,  // ...**...****...
+     0x000019C0,  // ...**..***.....
+     0x00001B80,  // ...**.***......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00001B80,  // ...**.***......
+     0x000019C0,  // ...**..***.....
+     0x000018E0,  // ...**...***....
+     0x000078FC,  // .****...******.
+     0x000078FC,  // .****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 108
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 109
+     15, 26,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001DEF0,  // ***.****.****...
+     0x0001FFF8,  // **************..
+     0x00007398,  // ..***..***..**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001F3DE,  // *****..****.****
+     0x0001F3DE,  // *****..****.****
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 111
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 112
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7C0,  // ****.*****.....
+     0x0000FFF0,  // ************...
+     0x00003C70,  // ..****...***...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00003C70,  // ..****...***...
+     0x00003FF0,  // ..**********...
+     0x000037C0,  // ..**.*****.....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x0000FE00,  // *******........
+     0x0000FE00,  // *******........
+  },
+  {             // 113
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x000001FC,  // .......*******.
+     0x000001FC,  // .......*******.
+  },
+  {             // 114
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00003FF8,  // ..***********..
+     0x00000F18,  // ....****...**..
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 115
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 116
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001C70,  // ...***...***...
+     0x00000FF0,  // ....********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 117
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 118
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 119
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00003330,  // ..**..**..**...
+     0x000037B0,  // ..**.****.**...
+     0x000037B0,  // ..**.****.**...
+     0x00003CF0,  // ..****..****...
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 121
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 122
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 123
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x000000E0,  // ........***....
+     0x00000000,  // ...............
+  },
+  {             // 124
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 125
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000380,  // ......***......
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+  },
+  {             // 126
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E18,  // ...****....**..
+     0x00003F38,  // ..******..***..
+     0x000073F0,  // .***..******...
+     0x000061E0,  // .**....****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 127
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 161
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+  },
+  {             // 162
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 163
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000D80,  // ....**.**......
+     0x00000F80,  // ....*****......
+     0x00000F00,  // ....****.......
+     0x00001E00,  // ...****........
+     0x00003C00,  // ..****.........
+     0x00007C00,  // .*****.........
+     0x00006C18,  // .**.**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 164
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 165
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003180,  // ..**...**......
+     0x00001B00,  // ...**.**.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 166
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 167
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007F0,  // .....*******...
+     0x00000FF0,  // ....********...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001C00,  // ...***.........
+     0x00003F00,  // ..******.......
+     0x000067C0,  // .**..*****.....
+     0x000061F0,  // .**....*****...
+     0x00007878,  // .****....****..
+     0x00003E18,  // ..*****....**..
+     0x00000F98,  // ....*****..**..
+     0x000003F8,  // ......*******..
+     0x000000F0,  // ........****...
+     0x00000060,  // .........**....
+     0x00003060,  // ..**.....**....
+     0x000030E0,  // ..**....***....
+     0x00003FC0,  // ..********.....
+     0x00003F80,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 168
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003C00,  // ..****.........
+     0x00001F80,  // ...******......
+     0x000003F0,  // ......******...
+     0x00000078,  // .........****..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 171
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 172
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 173
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 174
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 176
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 177
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+  },
+  {             // 178
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000360,  // ......**.**....
+     0x000001C0,  // .......***.....
+     0x00000000,  // ...............
+  },
+  {             // 179
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000360,  // ......**.**....
+     0x000003E0,  // ......*****....
+     0x000003C0,  // ......****.....
+     0x00000780,  // .....****......
+     0x00000F00,  // ....****.......
+     0x00001F00,  // ...*****.......
+     0x00001B00,  // ...**.**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 180
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     15, 26,
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 182
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 183
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 184
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 185
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 186
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 187
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00006300,  // .**...**.......
+     0x00003600,  // ..**.**........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001C70,  // ...***...***...
+     0x00000FF0,  // ....********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 188
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000CC0,  // ....**..**.....
+     0x00001980,  // ...**..**......
+     0x00003300,  // ..**..**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 192
+     15, 26,
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x0000FF80,  // *********......
+     0x0000FFE0,  // ***********....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003070,  // ..**.....***...
+     0x00003FE0,  // ..*********....
+     0x00003F80,  // ..*******......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 26,
+     0x00000600,  // .....**........
+     0x00000F00,  // ....****.......
+     0x00001F80,  // ...******......
+     0x000039C0,  // ..***..***.....
+     0x000070E0,  // .***....***....
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000030C0,  // ..**....**.....
+     0x00001980,  // ...**..**......
+     0x00000F00,  // ....****.......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 26,
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003000,  // ..**...........
+     0x00003818,  // ..***......**..
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 199
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003008,  // ..**........*..
+     0x00003818,  // ..***......**..
+     0x00001FF0,  // ...*********...
+     0x000007E0,  // .....******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 200
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003000,  // ..**...........
+     0x00003818,  // ..***......**..
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000360,  // ......**.**....
+     0x000001C0,  // .......***.....
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 205
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 206
+     15, 26,
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 207
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000FE0C,  // *******.....**.
+     0x0000FE0C,  // *******.....**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 26,
+     0x00000000,  // ...............
+     0x00000198,  // .......**..**..
+     0x00000330,  // ......**..**...
+     0x00000660,  // .....**..**....
+     0x00000CC0,  // ....**..**.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00002010,  // ..*........*...
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00002010,  // ..*........*...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000FF80,  // *********......
+     0x0000FFE0,  // ***********....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003070,  // ..**.....***...
+     0x00003FE0,  // ..*********....
+     0x00003F80,  // ..*******......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     15, 26,
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000006C0,  // .....**.**.....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 218
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 219
+     15, 26,
+     0x00000000,  // ...............
+     0x00000198,  // .......**..**..
+     0x00000330,  // ......**..**...
+     0x00000660,  // .....**..**....
+     0x00000CC0,  // ....**..**.....
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 221
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 223
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x000018E0,  // ...**...***....
+     0x00001BC0,  // ...**.****.....
+     0x00001BE0,  // ...**.*****....
+     0x00001870,  // ...**....***...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000019B8,  // ...**..**.***..
+     0x00007DF0,  // .*****.*****...
+     0x00007CE0,  // .*****..***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00003FF8,  // ..***********..
+     0x00000F18,  // ....****...**..
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 225
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 226
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 227
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000030C0,  // ..**....**.....
+     0x00001980,  // ...**..**......
+     0x00000F00,  // ....****.......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 228
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 229
+     15, 26,
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 230
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 231
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007030,  // .***......**...
+     0x00006030,  // .**.......**...
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00000FE0,  // ....*******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 232
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 233
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 234
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000360,  // ......**.**....
+     0x000001C0,  // .......***.....
+     0x00000000,  // ...............
+  },
+  {             // 235
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 236
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 237
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 238
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     15, 26,
+     0x00000000,  // ...............
+     0x00000318,  // ......**...**..
+     0x000001B0,  // .......**.**...
+     0x000000E0,  // ........***....
+     0x00000000,  // ...............
+     0x000000F0,  // ........****...
+     0x000000F0,  // ........****...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FFC,  // ..************.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 240
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F0,  // ........****...
+     0x000000F0,  // ........****...
+     0x00000030,  // ..........**...
+     0x000007FE,  // .....**********
+     0x000007FE,  // .....**********
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FFC,  // ..************.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 241
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 242
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 243
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 244
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 245
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000330,  // ......**..**...
+     0x00000660,  // .....**..**....
+     0x00000CC0,  // ....**..**.....
+     0x00001980,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 246
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 247
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFF8,  // *************..
+     0x0000FFF8,  // *************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 248
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00003FF8,  // ..***********..
+     0x00000F18,  // ....****...**..
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 249
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000D80,  // ....**.**......
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 250
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 251
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000330,  // ......**..**...
+     0x00000660,  // .....**..**....
+     0x00000CC0,  // ....**..**.....
+     0x00001980,  // ...**..**......
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 252
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 253
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 254
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001C70,  // ...***...***...
+     0x00000FF0,  // ....********...
+     0x000007C0,  // .....*****.....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 255
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  };
diff --git a/fontfix-iso8859-7.c b/fontfix-iso8859-7.c
index 35cc96ef4..6a4e6dd94 100644
--- a/fontfix-iso8859-7.c
+++ b/fontfix-iso8859-7.c
@@ -1,5168 +1,2706 @@
-cFont::tPixelData FontFix_iso8859_7[][28] = {
+cFont::tPixelData FontFix_iso8859_7[][26] = {
   {             // 32
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 33
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000C8,  // .**..*..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000308,  // ....**....*..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00000210,  // ....*....*...
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000420,  // ...*....*....
+     0x00000420,  // ...*....*....
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000C60,  // ..**...**....
+     0x00000840,  // ..*....*.....
+     0x00000840,  // ..*....*.....
+     0x000018C0,  // .**...**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 36
+     13, 24,
+     0x00000000,  // .............
+     0x00000080,  // ......*......
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000CB8,  // ..**..*.***..
+     0x0000189C,  // .**...*..***.
+     0x00001880,  // .**...*......
+     0x00001880,  // .**...*......
+     0x00001C80,  // .***..*......
+     0x00000F80,  // ..*****......
+     0x000007E0,  // ...******....
+     0x000000F8,  // ......*****..
+     0x0000009C,  // ......*..***.
+     0x0000008C,  // ......*...**.
+     0x0000188C,  // .**...*...**.
+     0x0000188C,  // .**...*...**.
+     0x00001C9C,  // .***..*..***.
+     0x00000EB8,  // ..***.*.***..
+     0x000007F0,  // ...*******...
+     0x00000080,  // ......*......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     20, 24,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00038040,  // ...***........*.....
+     0x0006C0C0,  // ..**.**......**.....
+     0x000C6080,  // .**...**.....*......
+     0x000C6180,  // .**...**....**......
+     0x000C6100,  // .**...**....*.......
+     0x000C6300,  // .**...**...**.......
+     0x000E6200,  // .***..**...*........
+     0x0007C600,  // ..*****...**........
+     0x00000470,  // ..........*...***...
+     0x00000CF8,  // .........**..*****..
+     0x0000198C,  // ........**..**...**.
+     0x0000118C,  // ........*...**...**.
+     0x0000318C,  // .......**...**...**.
+     0x0000218C,  // .......*....**...**.
+     0x0000618C,  // ......**....**...**.
+     0x000040C8,  // ......*......**..*..
+     0x0000C0F8,  // .....**......*****..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 38
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000F80,  // ....*****......
+     0x00000F00,  // ....****.......
+     0x00001F80,  // ...******......
+     0x00003180,  // ..**...**......
+     0x000071D8,  // .***...***.**..
+     0x000060F8,  // .**.....*****..
+     0x00006070,  // .**......***...
+     0x00006078,  // .**......****..
+     0x000030F8,  // ..**....*****..
+     0x00003FCC,  // ..********..**.
+     0x00000F80,  // ....*****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     4, 24,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 40
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ....**..
+     0x00000010,  // ....*...
+     0x00000030,  // ...**...
+     0x00000020,  // ...*....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000040,  // ..*.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000008,  // .....*..
+  },
+  {             // 41
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000040,  // ..*.....
+     0x00000020,  // ...*....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000008,  // .....*..
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x00000008,  // .....*..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000010,  // ....*...
+     0x00000030,  // ...**...
+     0x00000020,  // ...*....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+  },
+  {             // 42
+     9, 24,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x000000FC,  // ..******.
+     0x000000FC,  // ..******.
+     0x00000078,  // ...****..
+     0x0000004C,  // ...*..**.
+     0x00000048,  // ...*..*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 44
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000004,  // ....*.
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 45
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 46
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     6, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000004,  // .....*.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000008,  // ....*..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000020,  // ..*....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000040,  // .*.....
+     0x00000040,  // .*.....
+     0x000000C0,  // **.....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C18,  // ..**.....**..
+     0x00000C38,  // ..**....***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x000000E0,  // ......***....
+     0x000003E0,  // ....*****....
+     0x00000760,  // ...***.**....
+     0x00000460,  // ...*...**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000700,  // ...***.......
+     0x00000C00,  // ..**.........
+     0x00000800,  // ..*..........
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C78,  // ..**...****..
+     0x00000C38,  // ..**....***..
+     0x00000038,  // ........***..
+     0x00000038,  // ........***..
+     0x00000070,  // .......***...
+     0x000001E0,  // .....****....
+     0x000000F8,  // ......*****..
+     0x00000018,  // .........**..
+     0x0000001C,  // .........***.
+     0x0000001C,  // .........***.
+     0x0000081C,  // ..*......***.
+     0x00000C1C,  // ..**.....***.
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000070,  // .......***...
+     0x00000070,  // .......***...
+     0x000000F0,  // ......****...
+     0x000001B0,  // .....**.**...
+     0x000003B0,  // ....***.**...
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007F8,  // ...********..
+     0x000007F8,  // ...********..
+     0x00000600,  // ...**........
+     0x00000400,  // ...*.........
+     0x00000C00,  // ..**.........
+     0x00000DE0,  // ..**.****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00001C1C,  // .***.....***.
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007F8,  // ...********..
+     0x00000E18,  // ..***....**..
+     0x00000C0C,  // ..**......**.
+     0x00000C00,  // ..**.........
+     0x00001800,  // .**..........
+     0x000019E0,  // .**..****....
+     0x00001BF8,  // .**.*******..
+     0x00001C18,  // .***.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000E18,  // ..***....**..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FF8,  // .**********..
+     0x00001FF8,  // .**********..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000618,  // ...**....**..
+     0x000003F0,  // ....******...
+     0x000007F8,  // ...********..
+     0x00000E18,  // ..***....**..
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000618,  // ...**....**..
+     0x000007F8,  // ...********..
+     0x000001E0,  // .....****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00001C18,  // .***.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00001C1C,  // .***.....***.
+     0x00000E3C,  // ..***...****.
+     0x000007EC,  // ...******.**.
+     0x000003CC,  // ....****..**.
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003C0,  // ....****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000004,  // ....*.
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 60
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000000C,  // ..........**.
+     0x0000007C,  // .......*****.
+     0x000001F0,  // .....*****...
+     0x00000780,  // ...****......
+     0x00001E00,  // .****........
+     0x00001E00,  // .****........
+     0x00000780,  // ...****......
+     0x000001E0,  // .....****....
+     0x0000007C,  // .......*****.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 61
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 62
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001F00,  // .*****.......
+     0x000003C0,  // ....****.....
+     0x000000F0,  // ......****...
+     0x0000003C,  // ........****.
+     0x0000001C,  // .........***.
+     0x000000F8,  // ......*****..
+     0x000003C0,  // ....****.....
+     0x00001F00,  // .*****.......
+     0x00001C00,  // .***.........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F8,  // ...********..
+     0x0000061C,  // ...**....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x0000001C,  // .........***.
+     0x00000038,  // ........***..
+     0x00000070,  // .......***...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     23, 24,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00007F00,  // .........*******.......
+     0x0003FFC0,  // ......************.....
+     0x000780E0,  // .....****.......***....
+     0x000E0030,  // ....***...........**...
+     0x001C0018,  // ...***.............**..
+     0x00187998,  // ...**....****..**..**..
+     0x0031CD8C,  // ..**...***..**.**...**.
+     0x0031870C,  // ..**...**....***....**.
+     0x0063030C,  // .**...**......**....**.
+     0x0066030C,  // .**..**.......**....**.
+     0x0066030C,  // .**..**.......**....**.
+     0x00660708,  // .**..**......***....*..
+     0x00660618,  // .**..**......**....**..
+     0x00660E30,  // .**..**.....***...**...
+     0x00631E70,  // .**...**...****..***...
+     0x0033FFE0,  // ..**..*************....
+     0x0030E78E,  // ..**....***..****...***
+     0x0018000C,  // ...**...............**.
+     0x001E0038,  // ...****...........***..
+     0x000780F0,  // .....****.......****...
+     0x0003FFC0,  // ......************.....
+     0x00007F00,  // .........*******.......
+  },
+  {             // 65
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D00,  // ......**.*.......
+     0x00000D80,  // ......**.**......
+     0x00001980,  // .....**..**......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x000030E0,  // ....**....***....
+     0x00003060,  // ....**.....**....
+     0x00007FE0,  // ...**********....
+     0x00007FF0,  // ...***********...
+     0x00006030,  // ...**.......**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001801C,  // .**..........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 66
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x0000301C,  // ..**.......***.
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x000007C0,  // ......*****.....
+     0x00001FF0,  // ....*********...
+     0x00003838,  // ...***.....***..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x0000C000,  // .**.............
+     0x0000C000,  // .**.............
+     0x0000C000,  // .**.............
+     0x0000C000,  // .**.............
+     0x0000C000,  // .**.............
+     0x0000C000,  // .**.............
+     0x0000E018,  // .***........**..
+     0x00006018,  // ..**........**..
+     0x00007018,  // ..***.......**..
+     0x00003830,  // ...***.....**...
+     0x00001FE0,  // ....********....
+     0x00000FC0,  // .....******.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 68
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FE0,  // ..**********....
+     0x00007FF0,  // ..***********...
+     0x00006038,  // ..**.......***..
+     0x0000601C,  // ..**........***.
+     0x0000600C,  // ..**.........**.
+     0x0000600E,  // ..**.........***
+     0x00006006,  // ..**..........**
+     0x00006006,  // ..**..........**
+     0x00006006,  // ..**..........**
+     0x00006006,  // ..**..........**
+     0x0000600E,  // ..**.........***
+     0x0000600C,  // ..**.........**.
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00007FF0,  // ..***********...
+     0x00007FC0,  // ..*********.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 69
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FE0,  // ..*********....
+     0x00003FE0,  // ..*********....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FF0,  // ..*********...
+     0x00001FF0,  // ..*********...
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 33
-     14, 26,
+  {             // 71
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001FC0,  // ......*******.....
+     0x00007FF0,  // ....***********...
+     0x0000F070,  // ...****.....***...
+     0x0001C018,  // ..***.........**..
+     0x0001801C,  // ..**..........***.
+     0x00038000,  // .***..............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x000300FC,  // .**........******.
+     0x000380FC,  // .***.......******.
+     0x0001800C,  // ..**...........**.
+     0x0001C00C,  // ..***..........**.
+     0x0000E03C,  // ...***.......****.
+     0x00007FF0,  // ....***********...
+     0x00000FC0,  // .......******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 72
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x00007FFC,  // ..*************.
+     0x00007FFC,  // ..*************.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 73
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 75
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000301C,  // ..**.......***.
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003F80,  // ..*******......
+     0x00003DC0,  // ..****.***.....
+     0x000038C0,  // ..***...**.....
+     0x000030E0,  // ..**....***....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003038,  // ..**......***..
+     0x0000301C,  // ..**.......***.
+     0x0000300E,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 77
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000E01C,  // ..***........***.
+     0x0000F01C,  // ..****.......***.
+     0x0000F03C,  // ..****......****.
+     0x0000F83C,  // ..*****.....****.
+     0x0000D86C,  // ..**.**....**.**.
+     0x0000DC6C,  // ..**.***...**.**.
+     0x0000CCCC,  // ..**..**..**..**.
+     0x0000CCCC,  // ..**..**..**..**.
+     0x0000C78C,  // ..**...****...**.
+     0x0000C78C,  // ..**...****...**.
+     0x0000C30C,  // ..**....**....**.
+     0x0000C30C,  // ..**....**....**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 78
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000600C,  // ..**.........**.
+     0x0000700C,  // ..***........**.
+     0x0000780C,  // ..****.......**.
+     0x00007C0C,  // ..*****......**.
+     0x00006C0C,  // ..**.**......**.
+     0x00006E0C,  // ..**.***.....**.
+     0x0000670C,  // ..**..***....**.
+     0x0000630C,  // ..**...**....**.
+     0x0000618C,  // ..**....**...**.
+     0x000061CC,  // ..**....***..**.
+     0x000060CC,  // ..**.....**..**.
+     0x0000606C,  // ..**......**.**.
+     0x0000607C,  // ..**......*****.
+     0x0000603C,  // ..**.......****.
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 79
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003001C,  // .**...........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003001C,  // .**...........***.
+     0x0003001C,  // .**...........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FFC,  // ..************.
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x00003006,  // ..**.........**
+     0x0000300E,  // ..**........***
+     0x0000301E,  // ..**.......****
+     0x00003FFC,  // ..************.
+     0x00003FF0,  // ..**********...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003001C,  // .**...........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003001C,  // .**...........***.
+     0x00018318,  // ..**.....**...**..
+     0x0001C3B8,  // ..***....***.***..
+     0x0000E0F0,  // ...***.....****...
+     0x00007FF0,  // ....***********...
+     0x00001F9C,  // ......******..***.
+     0x00000008,  // ...............*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF0,  // ..***********...
+     0x00007FF8,  // ..************..
+     0x0000601C,  // ..**........***.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000601C,  // ..**........***.
+     0x00007FF8,  // ..************..
+     0x00007FE0,  // ..**********....
+     0x000060C0,  // ..**.....**.....
+     0x000060E0,  // ..**.....***....
+     0x00006060,  // ..**......**....
+     0x00006070,  // ..**......***...
+     0x00006030,  // ..**.......**...
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x0000600C,  // ..**.........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 83
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // .....******....
+     0x00001FF8,  // ...**********..
+     0x00001838,  // ...**.....***..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003000,  // ..**...........
+     0x00003C00,  // ..****.........
+     0x00001FC0,  // ...*******.....
+     0x000007F0,  // .....*******...
+     0x00000078,  // .........****..
+     0x0000000C,  // ............**.
+     0x0000300C,  // ..**........**.
+     0x00003004,  // ..**.........*.
+     0x0000380C,  // ..***.......**.
+     0x00001C18,  // ...***.....**..
+     0x00000FF8,  // ....*********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
      0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
      0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
      0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 34
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000E70,  // ...***..***...
-     0x00000E70,  // ...***..***...
-     0x00000E70,  // ...***..***...
-     0x00000E70,  // ...***..***...
-     0x00000420,  // ....*....*....
-     0x00000420,  // ....*....*....
-     0x00000420,  // ....*....*....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 35
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 36
-     14, 26,
-     0x00000000,  // ..............
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
-     0x000007E0,  // ....******....
-     0x00000C38,  // ...**....***..
-     0x00001818,  // ..**......**..
-     0x00001808,  // ..**.......*..
-     0x00001800,  // ..**..........
-     0x00001C00,  // ..***.........
-     0x00000E00,  // ...***........
-     0x00000780,  // ....****......
-     0x000001E0,  // ......****....
-     0x00000070,  // ........***...
-     0x00000038,  // .........***..
-     0x00000018,  // ..........**..
-     0x00001018,  // ..*.......**..
-     0x00001818,  // ..**......**..
-     0x00001C30,  // ..***....**...
-     0x000007E0,  // ....******....
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 37
-     14, 26,
+  {             // 85
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000701C,  // ..***.......***.
+     0x00003838,  // ...***.....***..
+     0x00001FF0,  // ....*********...
+     0x00000FE0,  // .....*******....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 86
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000E006,  // ***..........**
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00007018,  // .***.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001820,  // ...**.....*....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x000006C0,  // .....**.**.....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     21, 24,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x0070380C,  // ***......***.......**.
+     0x0030381C,  // .**......***......***.
+     0x00303C18,  // .**......****.....**..
+     0x00306C18,  // .**.....**.**.....**..
+     0x00386C18,  // .***....**.**.....**..
+     0x00186638,  // ..**....**..**...***..
+     0x00184630,  // ..**....*...**...**...
+     0x0018C630,  // ..**...**...**...**...
+     0x0008C630,  // ...*...**...**...**...
+     0x000CC360,  // ...**..**....**.**....
+     0x000D8360,  // ...**.**.....**.**....
+     0x000D8360,  // ...**.**.....**.**....
+     0x00058160,  // ....*.**......*.**....
+     0x00070140,  // ....***.......*.*.....
+     0x000701C0,  // ....***.......***.....
+     0x000701C0,  // ....***.......***.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000700C,  // .***........**.
+     0x00003818,  // ..***......**..
+     0x00001838,  // ...**.....***..
+     0x00001C70,  // ...***...***...
+     0x00000E60,  // ....***..**....
+     0x000006C0,  // .....**.**.....
+     0x000007C0,  // .....*****.....
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x000006C0,  // .....**.**.....
+     0x00000EE0,  // ....***.***....
+     0x00001C70,  // ...***...***...
+     0x00001830,  // ...**.....**...
+     0x00003838,  // ..***.....***..
+     0x0000701C,  // .***.......***.
+     0x0000E00E,  // ***.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000E00C,  // .***.........**.
+     0x00006018,  // ..**........**..
+     0x00007038,  // ..***......***..
+     0x00003830,  // ...***.....**...
+     0x00001860,  // ....**....**....
+     0x00000CE0,  // .....**..***....
+     0x00000EC0,  // .....***.**.....
+     0x00000780,  // ......****......
+     0x00000380,  // .......***......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001E18,  // ..****....**..
-     0x00003318,  // .**..**...**..
-     0x00003330,  // .**..**..**...
-     0x00003330,  // .**..**..**...
-     0x00003360,  // .**..**.**....
-     0x00001E60,  // ..****..**....
-     0x000000C0,  // .......**.....
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000018,  // ..........**..
+     0x00000038,  // .........***..
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
      0x000000C0,  // .......**.....
      0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
      0x00000300,  // .....**.......
-     0x00000678,  // ....**..****..
-     0x000006CC,  // ....**.**..**.
-     0x00000CCC,  // ...**..**..**.
-     0x00000CCC,  // ...**..**..**.
-     0x000018CC,  // ..**...**..**.
-     0x00001878,  // ..**....****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 38
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000780,  // ....****......
-     0x00000CC0,  // ...**..**.....
-     0x00001860,  // ..**....**....
-     0x00001860,  // ..**....**....
-     0x00001860,  // ..**....**....
-     0x00001860,  // ..**....**....
-     0x00000CC0,  // ...**..**.....
-     0x00000780,  // ....****......
      0x00000700,  // ....***.......
-     0x00000D80,  // ...**.**......
-     0x0000198C,  // ..**..**...**.
-     0x000018CC,  // ..**...**..**.
-     0x000030D8,  // .**....**.**..
-     0x00003070,  // .**.....***...
-     0x00003030,  // .**......**...
-     0x00003070,  // .**.....***...
-     0x000018D8,  // ..**...**.**..
-     0x00000F9C,  // ...*****..***.
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00003000,  // .**...........
+     0x00007FFC,  // *************.
+     0x00007FFC,  // *************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 39
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 91
+     6, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000003C,  // ..****.
+     0x0000003C,  // ..****.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003C,  // ..****.
+     0x0000003C,  // ..****.
+     0x00000000,  // .......
   },
-  {             // 40
-     14, 26,
-     0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x00000060,  // ........**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 92
+     6, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x00000040,  // .*.....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000020,  // ..*....
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000010,  // ...*...
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000004,  // .....*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
-  {             // 41
-     14, 26,
-     0x00000000,  // ..............
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 93
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x00000000,  // ......
   },
-  {             // 42
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00001998,  // ..**..**..**..
-     0x00003DBC,  // .****.**.****.
-     0x00001FF8,  // ..**********..
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00001FF8,  // ..**********..
-     0x00003DBC,  // .****.**.****.
-     0x00001998,  // ..**..**..**..
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 94
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000000E0,  // ....***....
+     0x000001E0,  // ...****....
+     0x000001B0,  // ...**.**...
+     0x00000330,  // ..**..**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x00000618,  // .**....**..
+     0x0000060C,  // .**.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
-  {             // 43
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 95
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // ..............
+     0x00003FFE,  // .*************
+     0x00000000,  // .............
   },
-  {             // 44
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 96
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000E0,  // .***....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
-  {             // 45
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 97
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007E0,  // ...******....
+     0x00000FF0,  // ..********...
+     0x00001C18,  // .***.....**..
+     0x00000818,  // ..*......**..
+     0x00000038,  // ........***..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00000FF8,  // ..*********..
+     0x00000798,  // ...****..**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 46
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 98
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF0,  // .*********...
+     0x00001C18,  // .***.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001C38,  // .***....***..
+     0x00001FF0,  // .*********...
+     0x000019E0,  // .**..****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 47
-     14, 26,
-     0x00000000,  // ..............
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 99
+     11, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C08,  // .**......*..
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
-  {             // 48
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00000C60,  // ...**...**....
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00000C60,  // ...**...**....
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 100
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001C18,  // .***.....**..
+     0x00000C38,  // ..**....***..
+     0x000007F8,  // ...********..
+     0x000003D8,  // ....****.**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 49
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000380,  // .....***......
-     0x00000780,  // ....****......
-     0x00000D80,  // ...**.**......
-     0x00001980,  // ..**..**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 101
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C18,  // ..**.....**..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001818,  // .**......**..
+     0x00000C18,  // ..**.....**..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 50
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00000C30,  // ...**....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00001808,  // ..**.......*..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 102
+     6, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000C,  // ....**.
+     0x0000001C,  // ...***.
+     0x00000038,  // ..***..
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x000000FC,  // ******.
+     0x000000FC,  // ******.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
-  {             // 51
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FF8,  // .***********..
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x000007C0,  // ....*****.....
-     0x00000070,  // ........***...
-     0x00000030,  // .........**...
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00003030,  // .**......**...
-     0x00003870,  // .***....***...
-     0x00000FC0,  // ...******.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 103
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003EC,  // ....*****.**.
+     0x0000077C,  // ...***.*****.
+     0x00000C1C,  // ..**.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C1C,  // ..**.....***.
+     0x000007FC,  // ...*********.
+     0x000003CC,  // ....****..**.
+     0x0000000C,  // ..........**.
+     0x0000181C,  // .**......***.
+     0x00001C18,  // .***.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
   },
-  {             // 52
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000660,  // ....**..**....
-     0x00000C60,  // ...**...**....
-     0x00001860,  // ..**....**....
-     0x00001860,  // ..**....**....
-     0x00003060,  // .**.....**....
-     0x00003FF8,  // .***********..
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 104
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x000019F0,  // .**..*****...
+     0x00001FF8,  // .**********..
+     0x00001C1C,  // .***.....***.
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 53
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // ..*********...
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FC0,  // ..*******.....
-     0x00000070,  // ........***...
-     0x00000030,  // .........**...
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00003030,  // .**......**...
-     0x00003870,  // .***....***...
-     0x00000FC0,  // ...******.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 105
+     5, 24,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
-  {             // 54
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000E0,  // .......***....
-     0x00000380,  // .....***......
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001000,  // ..*...........
-     0x000037C0,  // .**.*****.....
-     0x00003C70,  // .****...***...
-     0x00003830,  // .***.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 106
+     5, 24,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x00000038,  // .***..
   },
-  {             // 55
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF8,  // ..**********..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 107
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x0000060C,  // .**.....**.
+     0x00000618,  // .**....**..
+     0x00000630,  // .**...**...
+     0x00000660,  // .**..**....
+     0x000006C0,  // .**.**.....
+     0x000007C0,  // .*****.....
+     0x00000760,  // .***.**....
+     0x00000670,  // .**..***...
+     0x00000630,  // .**...**...
+     0x00000618,  // .**....**..
+     0x0000061C,  // .**....***.
+     0x0000060C,  // .**.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
-  {             // 56
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00000C60,  // ...**...**....
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00000C60,  // ...**...**....
-     0x000007C0,  // ....*****.....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 108
+     5, 24,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
-  {             // 57
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001838,  // ..**.....***..
-     0x00001C78,  // ..***...****..
-     0x000007D8,  // ....*****.**..
-     0x00000010,  // ..........*...
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000380,  // .....***......
-     0x00000E00,  // ...***........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 109
+     19, 24,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x000678F0,  // .**..****...****...
+     0x0007DDF8,  // .*****.***.******..
+     0x00070F0C,  // .***....****....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x0006060C,  // .**......**.....**.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
   },
-  {             // 58
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 110
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000019E0,  // .**..****....
+     0x00001FF0,  // .*********...
+     0x00001C38,  // .***....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 59
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 111
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C18,  // ..**.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C38,  // ..**....***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 60
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000000C,  // ...........**.
-     0x0000003C,  // .........****.
-     0x000000F0,  // .......****...
-     0x000003C0,  // .....****.....
-     0x00000F00,  // ...****.......
-     0x00003C00,  // .****.........
-     0x00003C00,  // .****.........
-     0x00000F00,  // ...****.......
-     0x000003C0,  // .....****.....
-     0x000000F0,  // .......****...
-     0x0000003C,  // .........****.
-     0x0000000C,  // ...........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 112
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001BE0,  // .**.*****....
+     0x00001E30,  // .****...**...
+     0x00001C18,  // .***.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001C38,  // .***....***..
+     0x00001FF0,  // .*********...
+     0x00001BE0,  // .**.*****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000000,  // .............
   },
-  {             // 61
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 113
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000E78,  // ..***..****..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001C18,  // .***.....**..
+     0x00000C38,  // ..**....***..
+     0x000007F8,  // ...********..
+     0x000003D8,  // ....****.**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000000,  // .............
   },
-  {             // 62
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003000,  // .**...........
-     0x00003C00,  // .****.........
-     0x00000F00,  // ...****.......
-     0x000003C0,  // .....****.....
-     0x000000F0,  // .......****...
-     0x0000003C,  // .........****.
-     0x0000003C,  // .........****.
-     0x000000F0,  // .......****...
-     0x000003C0,  // .....****.....
-     0x00000F00,  // ...****.......
-     0x00003C00,  // .****.........
-     0x00003000,  // .**...........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 114
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000DC,  // .**.***.
+     0x000000FC,  // .******.
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
-  {             // 63
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00000E70,  // ...***..***...
-     0x00001C38,  // ..***....***..
-     0x00001C38,  // ..***....***..
-     0x00000C38,  // ...**....***..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000380,  // .....***......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000300,  // .....**.......
-     0x00000780,  // ....****......
-     0x00000780,  // ....****......
-     0x00000300,  // .....**.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 115
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ...******..
+     0x000003FC,  // ..********.
+     0x0000060E,  // .**.....***
+     0x00000600,  // .**........
+     0x00000780,  // .****......
+     0x000003F8,  // ..*******..
+     0x0000007C,  // .....*****.
+     0x00000006,  // .........**
+     0x00000606,  // .**......**
+     0x00000706,  // .***.....**
+     0x000003FC,  // ..********.
+     0x000001F8,  // ...******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
-  {             // 64
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003018,  // .**.......**..
-     0x000030F8,  // .**....*****..
-     0x00003198,  // .**...**..**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x000031B8,  // .**...**.***..
-     0x000030EC,  // .**....***.**.
-     0x00003000,  // .**...........
-     0x00001800,  // ..**..........
-     0x00001808,  // ..**.......*..
-     0x00000E38,  // ...***...***..
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 116
+     6, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000007C,  // .*****.
+     0x0000007C,  // .*****.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003C,  // ..****.
+     0x0000001C,  // ...***.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
-  {             // 65
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000080,  // .......*......
-     0x000001C0,  // ......***.....
-     0x000001C0,  // ......***.....
-     0x00000140,  // ......*.*.....
-     0x00000360,  // .....**.**....
-     0x00000360,  // .....**.**....
-     0x00000220,  // .....*...*....
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000410,  // ....*.....*...
-     0x00000FF8,  // ...*********..
-     0x00000C18,  // ...**.....**..
-     0x00000808,  // ...*.......*..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00003C1E,  // .****.....****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 117
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001C38,  // .***....***..
+     0x00000FF8,  // ..*********..
+     0x00000798,  // ...****..**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 66
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FE0,  // ..********....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C30,  // ...**....**...
-     0x00000FE0,  // ...*******....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C18,  // ...**.....**..
-     0x00001FF0,  // ..*********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 118
+     11, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0C,  // ***......**.
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
-  {             // 67
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E8,  // .....*****.*..
-     0x00000E78,  // ...***..****..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003008,  // .**........*..
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00001808,  // ..**.......*..
-     0x00001818,  // ..**......**..
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 119
+     16, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0003060C,  // **.....**.....**.
+     0x0001870C,  // .**....***....**.
+     0x00018F18,  // .**...****...**..
+     0x00018F18,  // .**...****...**..
+     0x00018F18,  // .**...****...**..
+     0x0000C990,  // ..**..*..**..*...
+     0x0000D9B0,  // ..**.**..**.**...
+     0x0000D9B0,  // ..**.**..**.**...
+     0x000059B0,  // ...*.**..**.**...
+     0x000070E0,  // ...***....***....
+     0x000070E0,  // ...***....***....
+     0x000030E0,  // ....**....***....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
-  {             // 68
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003F80,  // .*******......
-     0x000018E0,  // ..**...***....
-     0x00001830,  // ..**.....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001830,  // ..**.....**...
-     0x000018E0,  // ..**...***....
-     0x00003F80,  // .*******......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 120
+     11, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C18,  // .**.....**..
+     0x00000638,  // ..**...***..
+     0x00000730,  // ..***..**...
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000360,  // ...**.**....
+     0x00000370,  // ...**.***...
+     0x00000630,  // ..**...**...
+     0x00000E18,  // .***....**..
+     0x00001C1C,  // ***.....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
-  {             // 69
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FF8,  // .***********..
-     0x00001818,  // ..**......**..
-     0x00001808,  // ..**.......*..
-     0x00001808,  // ..**.......*..
-     0x00001800,  // ..**..........
-     0x00001880,  // ..**...*......
-     0x00001880,  // ..**...*......
-     0x00001F80,  // ..******......
-     0x00001880,  // ..**...*......
-     0x00001880,  // ..**...*......
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001808,  // ..**.......*..
-     0x00001808,  // ..**.......*..
-     0x00001818,  // ..**......**..
-     0x00003FF8,  // .***********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 121
+     11, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
   },
-  {             // 70
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FF8,  // .***********..
-     0x00001818,  // ..**......**..
-     0x00001808,  // ..**.......*..
-     0x00001808,  // ..**.......*..
-     0x00001800,  // ..**..........
-     0x00001880,  // ..**...*......
-     0x00001880,  // ..**...*......
-     0x00001F80,  // ..******......
-     0x00001880,  // ..**...*......
-     0x00001880,  // ..**...*......
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00003E00,  // .*****........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 122
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000FFC,  // **********.
+     0x00000FFC,  // **********.
+     0x00000018,  // .......**..
+     0x00000038,  // ......***..
+     0x00000070,  // .....***...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000300,  // ..**.......
+     0x00000700,  // .***.......
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
-  {             // 71
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E8,  // .....*****.*..
-     0x00000E78,  // ...***..****..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003008,  // .**........*..
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x0000307C,  // .**.....*****.
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000E38,  // ...***...***..
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 123
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x0000003C,  // ...****.
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x0000001C,  // ....***.
+     0x0000000C,  // .....**.
   },
-  {             // 72
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C3C,  // .****....****.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 124
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
   },
-  {             // 73
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FF0,  // ...********...
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 125
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000E0,  // .***....
+     0x000000F0,  // .****...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
   },
-  {             // 74
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003F8,  // .....*******..
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x000018C0,  // ..**...**.....
-     0x00000F80,  // ...*****......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 126
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FC4,  // .*******...*.
+     0x00001FFC,  // .***********.
+     0x00001078,  // .*.....****..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 75
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C3C,  // .****....****.
-     0x00001818,  // ..**......**..
-     0x00001830,  // ..**.....**...
-     0x00001860,  // ..**....**....
-     0x000018C0,  // ..**...**.....
-     0x00001980,  // ..**..**......
-     0x00001B00,  // ..**.**.......
-     0x00001F00,  // ..*****.......
-     0x00001D80,  // ..***.**......
-     0x00001980,  // ..**..**......
-     0x000018C0,  // ..**...**.....
-     0x00001860,  // ..**....**....
-     0x00001860,  // ..**....**....
-     0x00001830,  // ..**.....**...
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 127
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 76
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003F00,  // .******.......
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C08,  // ...**......*..
-     0x00000C08,  // ...**......*..
-     0x00000C08,  // ...**......*..
-     0x00000C18,  // ...**.....**..
-     0x00003FF8,  // .***********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 128
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 77
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000381C,  // .***......***.
-     0x00001818,  // ..**......**..
-     0x00001C38,  // ..***....***..
-     0x00001C38,  // ..***....***..
-     0x00001E78,  // ..****..****..
-     0x00001A58,  // ..**.*..*.**..
-     0x00001BD8,  // ..**.****.**..
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 129
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 78
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000383C,  // .***.....****.
-     0x00001C18,  // ..***.....**..
-     0x00001C18,  // ..***.....**..
-     0x00001E18,  // ..****....**..
-     0x00001A18,  // ..**.*....**..
-     0x00001B18,  // ..**.**...**..
-     0x00001918,  // ..**..*...**..
-     0x00001998,  // ..**..**..**..
-     0x00001898,  // ..**...*..**..
-     0x000018D8,  // ..**...**.**..
-     0x00001858,  // ..**....*.**..
-     0x00001878,  // ..**....****..
-     0x00001838,  // ..**.....***..
-     0x00001838,  // ..**.....***..
-     0x00001818,  // ..**......**..
-     0x00003C18,  // .****.....**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 130
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 79
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 131
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 80
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FE0,  // ..********....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C30,  // ...**....**...
-     0x00000FE0,  // ...*******....
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00001F00,  // ..*****.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 81
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x000000C0,  // .......**.....
-     0x00000060,  // ........**....
-     0x00000030,  // .........**...
-     0x0000001C,  // ..........***.
-     0x00000008,  // ...........*..
-     0x00000000,  // ..............
-  },
-  {             // 82
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FE0,  // ..********....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C30,  // ...**....**...
-     0x00000FE0,  // ...*******....
-     0x00000CC0,  // ...**..**.....
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00001F1C,  // ..*****...***.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 83
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E8,  // ....******.*..
-     0x00000C38,  // ...**....***..
-     0x00001818,  // ..**......**..
-     0x00001808,  // ..**.......*..
-     0x00001808,  // ..**.......*..
-     0x00000C00,  // ...**.........
-     0x00000F00,  // ...****.......
-     0x000003C0,  // .....****.....
-     0x000000F0,  // .......****...
-     0x00000030,  // .........**...
-     0x00000018,  // ..........**..
-     0x00001018,  // ..*.......**..
-     0x00001018,  // ..*.......**..
-     0x00001818,  // ..**......**..
-     0x00001C30,  // ..***....**...
-     0x000017E0,  // ..*.******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 84
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x0000318C,  // .**...**...**.
-     0x00002184,  // .*....**....*.
-     0x00002184,  // .*....**....*.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000007E0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C3C,  // .****....****.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x000007E0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 86
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C1E,  // .****.....****
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00000808,  // ...*.......*..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000410,  // ....*.....*...
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000220,  // .....*...*....
-     0x00000360,  // .....**.**....
-     0x00000360,  // .....**.**....
-     0x00000140,  // ......*.*.....
-     0x000001C0,  // ......***.....
-     0x000001C0,  // ......***.....
-     0x00000080,  // .......*......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 87
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003E3E,  // .*****...*****
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000188C,  // ..**...*...**.
-     0x00000888,  // ...*...*...*..
-     0x00000DD8,  // ...**.***.**..
-     0x00000DD8,  // ...**.***.**..
-     0x00000D58,  // ...**.*.*.**..
-     0x00000D58,  // ...**.*.*.**..
-     0x00000F78,  // ...****.****..
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 88
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003E3E,  // .*****...*****
-     0x0000180C,  // ..**.......**.
-     0x00000C18,  // ...**.....**..
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000360,  // .....**.**....
-     0x000001C0,  // ......***.....
-     0x00000080,  // .......*......
-     0x000001C0,  // ......***.....
-     0x00000360,  // .....**.**....
-     0x00000630,  // ....**...**...
-     0x00000630,  // ....**...**...
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x0000180C,  // ..**.......**.
-     0x00003E3E,  // .*****...*****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 89
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C3C,  // .****....****.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000007E0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 90
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001030,  // ..*......**...
-     0x00001030,  // ..*......**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000C08,  // ...**......*..
-     0x00000C08,  // ...**......*..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     14, 26,
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 92
-     14, 26,
-     0x00000000,  // ..............
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 93
-     14, 26,
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 94
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x00000660,  // ....**..**....
-     0x00000C30,  // ...**....**...
-     0x00001818,  // ..**......**..
-     0x00001008,  // ..*........*..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 95
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 96
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000700,  // ....***.......
-     0x00000780,  // ....****......
-     0x00000780,  // ....****......
-     0x00000300,  // .....**.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 97
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00000030,  // .........**...
-     0x000007F0,  // ....*******...
-     0x00001C30,  // ..***....**...
-     0x00003030,  // .**......**...
-     0x00003070,  // .**.....***...
-     0x000039BC,  // .***..**.****.
-     0x00001F18,  // ..*****...**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 98
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00003800,  // .***..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001BC0,  // ..**.****.....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x00001BC0,  // ..**.****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 99
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007F0,  // ....*******...
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 100
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000030,  // .........**...
-     0x00000070,  // ........***...
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x000007B0,  // ....****.**...
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00001830,  // ..**.....**...
-     0x00001C7C,  // ..***...*****.
-     0x00000798,  // ....****..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 101
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003FF8,  // .***********..
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00001818,  // ..**......**..
-     0x00001C38,  // ..***....***..
-     0x000007E0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 102
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000F8,  // .......*****..
-     0x00000198,  // ......**..**..
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00001FF0,  // ..*********...
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00001FF0,  // ..*********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 103
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000F80,  // ...*****......
-     0x000018F8,  // ..**...*****..
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x000018C0,  // ..**...**.....
-     0x00000F80,  // ...*****......
-     0x00001800,  // ..**..........
-     0x00000FE0,  // ...*******....
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001C70,  // ..***...***...
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-  },
-  {             // 104
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00003800,  // .***..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001BE0,  // ..**.*****....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00003C78,  // .****...****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 105
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00001F80,  // ..******......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00001FF8,  // ..**********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 106
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000001E0,  // ......****....
-     0x000000C0,  // .......**.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x000007E0,  // ....******....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00003060,  // .**.....**....
-     0x000038C0,  // .***...**.....
-     0x00000F80,  // ...*****......
-     0x00000000,  // ..............
-  },
-  {             // 107
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00003800,  // .***..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x000018F8,  // ..**...*****..
-     0x00001860,  // ..**....**....
-     0x000018C0,  // ..**...**.....
-     0x00001980,  // ..**..**......
-     0x00001B00,  // ..**.**.......
-     0x00001F80,  // ..******......
-     0x000018C0,  // ..**...**.....
-     0x00001860,  // ..**....**....
-     0x00001834,  // ..**.....**.*.
-     0x00003E18,  // .*****....**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 108
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000F80,  // ...*****......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 109
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003778,  // .**.***.****..
-     0x000079CC,  // ****..***..**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00007BDE,  // ****.****.****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 110
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001BE0,  // ..**.*****....
-     0x00003C70,  // .****...***...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00003C78,  // .****...****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 111
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 112
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001BC0,  // ..**.****.....
-     0x00003C70,  // .****...***...
-     0x00001830,  // ..**.....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x00001BC0,  // ..**.****.....
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00003E00,  // .*****........
-     0x00000000,  // ..............
-  },
-  {             // 113
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000790,  // ....****..*...
-     0x00001C70,  // ..***...***...
-     0x00001830,  // ..**.....**...
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00001830,  // ..**.....**...
-     0x00001C70,  // ..***...***...
-     0x000007B0,  // ....****.**...
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x00000030,  // .........**...
-     0x000000F8,  // .......*****..
-     0x00000000,  // ..............
-  },
-  {             // 114
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000670,  // ....**..***...
-     0x00001EB8,  // ..****.*.***..
-     0x00000730,  // ....***..**...
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00001FC0,  // ..*******.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 115
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00001C78,  // ..***...****..
-     0x00001818,  // ..**......**..
-     0x00001C00,  // ..***.........
-     0x00000F80,  // ...*****......
-     0x000001F0,  // ......*****...
-     0x00000038,  // .........***..
-     0x00001818,  // ..**......**..
-     0x00001E38,  // ..****...***..
-     0x000007E0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 116
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00003FF0,  // .**********...
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x0000060C,  // ....**.....**.
-     0x00000738,  // ....***..***..
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 117
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001830,  // ..**.....**...
-     0x00003870,  // .***....***...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001C7C,  // ..***...*****.
-     0x00000F98,  // ...*****..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 118
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C78,  // .****...****..
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
-     0x000006C0,  // ....**.**.....
-     0x000006C0,  // ....**.**.....
-     0x00000380,  // .....***......
-     0x00000380,  // .....***......
-     0x00000100,  // ......*.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 119
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000783C,  // ****.....****.
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001110,  // ..*...*...*...
-     0x00001BB0,  // ..**.***.**...
-     0x00001BB0,  // ..**.***.**...
-     0x00000AA0,  // ...*.*.*.*....
-     0x00000EE0,  // ...***.***....
-     0x00000EE0,  // ...***.***....
-     0x00000440,  // ....*...*.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C78,  // .****...****..
-     0x00001830,  // ..**.....**...
-     0x00000C60,  // ...**...**....
-     0x000006C0,  // ....**.**.....
-     0x00000380,  // .....***......
-     0x00000380,  // .....***......
-     0x000006C0,  // ....**.**.....
-     0x00000C60,  // ...**...**....
-     0x00001830,  // ..**.....**...
-     0x00003C78,  // .****...****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 121
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C78,  // .****...****..
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
-     0x00000660,  // ....**..**....
-     0x000006C0,  // ....**.**.....
-     0x000002C0,  // .....*.**.....
-     0x00000380,  // .....***......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00003300,  // .**..**.......
-     0x00003600,  // .**.**........
-     0x00001C00,  // ..***.........
-     0x00000000,  // ..............
-  },
-  {             // 122
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // ..*********...
-     0x00001830,  // ..**.....**...
-     0x00001060,  // ..*.....**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000C10,  // ...**.....*...
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 123
-     14, 26,
-     0x00000000,  // ..............
-     0x00000070,  // ........***...
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000E00,  // ...***........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x00000070,  // ........***...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 124
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 125
-     14, 26,
-     0x00000000,  // ..............
-     0x00000E00,  // ...***........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x00000070,  // ........***...
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000E00,  // ...***........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 126
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000F0C,  // ...****....**.
-     0x00001F9C,  // ..******..***.
-     0x000039F8,  // .***..******..
-     0x000030F0,  // .**....****...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 127
-     14, 26,
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-     0x00005554,  // *.*.*.*.*.*.*.
-     0x00002AAA,  // .*.*.*.*.*.*.*
-  },
-  {             // 128
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 161
-     14, 26,
-     0x00000000,  // ..............
-     0x000000E0,  // .......***....
-     0x000000E0,  // .......***....
-     0x000000E0,  // .......***....
-     0x00000080,  // .......*......
-     0x000000C0,  // .......**.....
-     0x00000060,  // ........**....
-     0x00000030,  // .........**...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 162
-     14, 26,
-     0x00000000,  // ..............
-     0x000001C0,  // ......***.....
-     0x000001C0,  // ......***.....
-     0x000001C0,  // ......***.....
-     0x00000040,  // ........*.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 163
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000670,  // ....**..***...
-     0x00000C30,  // ...**....**...
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00003FC0,  // .********.....
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000E00,  // ...***........
-     0x00001F98,  // ..******..**..
-     0x000030F0,  // .**....****...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 164
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 165
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 166
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 167
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00000E38,  // ...***...***..
-     0x00001C18,  // ..***.....**..
-     0x00001C18,  // ..***.....**..
-     0x00000E00,  // ...***........
-     0x00000700,  // ....***.......
-     0x00000B80,  // ...*.***......
-     0x000018E0,  // ..**...***....
-     0x00001870,  // ..**....***...
-     0x00001C38,  // ..***....***..
-     0x00000E18,  // ...***....**..
-     0x00000718,  // ....***...**..
-     0x000001D0,  // ......***.*...
-     0x000000E0,  // .......***....
-     0x00000070,  // ........***...
-     0x00001838,  // ..**.....***..
-     0x00001838,  // ..**.....***..
-     0x00001C70,  // ..***...***...
-     0x000007E0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 168
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001E78,  // ..****..****..
-     0x00000C30,  // ...**....**...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 169
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003F0,  // .....******...
-     0x00000618,  // ....**....**..
-     0x00000CEC,  // ...**..***.**.
-     0x00000D2C,  // ...**.*..*.**.
-     0x00000D0C,  // ...**.*....**.
-     0x00000D0C,  // ...**.*....**.
-     0x00000D2C,  // ...**.*..*.**.
-     0x00000CCC,  // ...**..**..**.
-     0x00000618,  // ....**....**..
-     0x000003F0,  // .....******...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 170
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 171
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000084,  // .......*....*.
-     0x0000018C,  // ......**...**.
-     0x00000318,  // .....**...**..
-     0x00000630,  // ....**...**...
-     0x00000C60,  // ...**...**....
-     0x000018C0,  // ..**...**.....
-     0x000018C0,  // ..**...**.....
-     0x00000C60,  // ...**...**....
-     0x00000630,  // ....**...**...
-     0x00000318,  // .....**...**..
-     0x0000018C,  // ......**...**.
-     0x00000084,  // .......*....*.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 172
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 173
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FF0,  // ...********...
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 174
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 175
-     14, 26,
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 176
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000660,  // ....**..**....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 177
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 178
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000C20,  // ...**....*....
-     0x00000FE0,  // ...*******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 179
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
-     0x00000060,  // ........**....
-     0x000001C0,  // ......***.....
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
-     0x000007C0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 180
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000100,  // ......*.......
-     0x00000100,  // ......*.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 181
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000080,  // .......*......
-     0x00000C98,  // ...**..*..**..
-     0x00001E3C,  // ..****...****.
-     0x00000C18,  // ...**.....**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 182
-     14, 26,
-     0x00000000,  // ..............
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000400,  // ....*.........
-     0x00000580,  // ....*.**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000002C0,  // .....*.**.....
-     0x000006E0,  // ....**.***....
-     0x00000660,  // ....**..**....
-     0x00000460,  // ....*...**....
-     0x00000C30,  // ...**....**...
-     0x00000FF0,  // ...********...
-     0x00000830,  // ...*.....**...
-     0x00000818,  // ...*......**..
-     0x00001818,  // ..**......**..
-     0x0000181C,  // ..**......***.
-     0x00003C3E,  // .****....*****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 183
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 184
-     14, 26,
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001000,  // ..*...........
-     0x00001000,  // ..*...........
-     0x00000FFE,  // ...***********
-     0x00000606,  // ....**......**
-     0x00000602,  // ....**.......*
-     0x00000602,  // ....**.......*
-     0x00000600,  // ....**........
-     0x00000620,  // ....**...*....
-     0x00000620,  // ....**...*....
-     0x000007E0,  // ....******....
-     0x00000620,  // ....**...*....
-     0x00000620,  // ....**...*....
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000602,  // ....**.......*
-     0x00000602,  // ....**.......*
-     0x00000606,  // ....**......**
-     0x00000FFE,  // ...***********
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 185
-     14, 26,
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00002000,  // .*............
-     0x00002000,  // .*............
-     0x00001E1E,  // ..****....****
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000FFC,  // ...**********.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00001E1E,  // ..****....****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 186
-     14, 26,
-     0x00000000,  // ..............
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00002000,  // .*............
-     0x00002FF0,  // .*.********...
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 187
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00002100,  // .*....*.......
-     0x00003180,  // .**...**......
-     0x000018C0,  // ..**...**.....
-     0x00000C60,  // ...**...**....
-     0x00000630,  // ....**...**...
-     0x00000318,  // .....**...**..
-     0x00000318,  // .....**...**..
-     0x00000630,  // ....**...**...
-     0x00000C60,  // ...**...**....
-     0x000018C0,  // ..**...**.....
-     0x00003180,  // .**...**......
-     0x00002100,  // .*....*.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 188
-     14, 26,
-     0x00000000,  // ..............
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00002000,  // .*............
-     0x000023C0,  // .*...****.....
-     0x00000E70,  // ...***..***...
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 189
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C00,  // ...**.........
-     0x00003C00,  // .****.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C1C,  // ...**.....***.
-     0x00000C70,  // ...**...***...
-     0x000001C0,  // ......***.....
-     0x00000700,  // ....***.......
-     0x00001CF8,  // ..***..*****..
-     0x0000718C,  // ***...**...**.
-     0x0000018C,  // ......**...**.
-     0x0000000C,  // ...........**.
-     0x00000018,  // ..........**..
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000184,  // ......**....*.
-     0x000001FC,  // ......*******.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 190
-     14, 26,
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00002000,  // .*............
-     0x00002000,  // .*............
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00002664,  // .*..**..**..*.
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 191
-     14, 26,
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001000,  // ..*...........
-     0x00001000,  // ..*...........
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x00002244,  // .*...*..*...*.
-     0x00001E78,  // ..****..****..
-     0x00001E78,  // ..****..****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 192
-     14, 26,
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000C30,  // ...**....**...
-     0x00001E78,  // ..****..****..
-     0x00000C30,  // ...**....**...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000700,  // ....***.......
-     0x00000980,  // ...*..**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000190,  // ......**..*...
-     0x000000E0,  // .......***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 193
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000002C0,  // .....*.**.....
-     0x000006E0,  // ....**.***....
-     0x00000660,  // ....**..**....
-     0x00000460,  // ....*...**....
-     0x00000C30,  // ...**....**...
-     0x00000FF0,  // ...********...
-     0x00000830,  // ...*.....**...
-     0x00000818,  // ...*......**..
-     0x00001818,  // ..**......**..
-     0x0000181C,  // ..**......***.
-     0x00003C3E,  // .****....*****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 194
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FE0,  // ..********....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C30,  // ...**....**...
-     0x00000FE0,  // ...*******....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C18,  // ...**.....**..
-     0x00001FF0,  // ..*********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 195
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00000C0C,  // ...**......**.
-     0x00000C04,  // ...**.......*.
-     0x00000C04,  // ...**.......*.
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00001F80,  // ..******......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 196
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000002C0,  // .....*.**.....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000460,  // ....*...**....
-     0x00000430,  // ....*....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000818,  // ...*......**..
-     0x00001818,  // ..**......**..
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 197
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00000C0C,  // ...**......**.
-     0x00000C04,  // ...**.......*.
-     0x00000C04,  // ...**.......*.
-     0x00000C00,  // ...**.........
-     0x00000C40,  // ...**...*.....
-     0x00000C40,  // ...**...*.....
-     0x00000FC0,  // ...******.....
-     0x00000C40,  // ...**...*.....
-     0x00000C40,  // ...**...*.....
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C04,  // ...**.......*.
-     0x00000C04,  // ...**.......*.
-     0x00000C0C,  // ...**......**.
-     0x00001FFC,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 198
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001030,  // ..*......**...
-     0x00001030,  // ..*......**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000C08,  // ...**......*..
-     0x00000C08,  // ...**......*..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 199
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C3C,  // .****....****.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 200
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000342C,  // .**.*....*.**.
-     0x000037EC,  // .**.******.**.
-     0x000037EC,  // .**.******.**.
-     0x0000342C,  // .**.*....*.**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 201
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FF0,  // ...********...
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 202
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003C3C,  // .****....****.
-     0x00001818,  // ..**......**..
-     0x00001830,  // ..**.....**...
-     0x00001860,  // ..**....**....
-     0x000018C0,  // ..**...**.....
-     0x00001980,  // ..**..**......
-     0x00001B80,  // ..**.***......
-     0x00001FC0,  // ..*******.....
-     0x00001FC0,  // ..*******.....
-     0x00001CE0,  // ..***..***....
-     0x00001860,  // ..**....**....
-     0x00001870,  // ..**....***...
-     0x00001830,  // ..**.....**...
-     0x00001838,  // ..**.....***..
-     0x0000181C,  // ..**......***.
-     0x00003C3E,  // .****....*****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 203
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x000002C0,  // .....*.**.....
-     0x000006E0,  // ....**.***....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000818,  // ...*......**..
-     0x00001818,  // ..**......**..
-     0x0000181C,  // ..**......***.
-     0x00003C3E,  // .****....*****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 204
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000380E,  // .***.......***
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00001C1C,  // ..***.....***.
-     0x00001C1C,  // ..***.....***.
-     0x00001E3C,  // ..****...****.
-     0x0000162C,  // ..*.**...*.**.
-     0x0000162C,  // ..*.**...*.**.
-     0x0000176C,  // ..*.***.**.**.
-     0x0000134C,  // ..*..**.*..**.
-     0x0000134C,  // ..*..**.*..**.
-     0x000013CC,  // ..*..****..**.
-     0x0000118C,  // ..*...**...**.
-     0x0000118C,  // ..*...**...**.
-     0x0000399E,  // .***..**..****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 205
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000383C,  // .***.....****.
-     0x00001C18,  // ..***.....**..
-     0x00001C18,  // ..***.....**..
-     0x00001E18,  // ..****....**..
-     0x00001A18,  // ..**.*....**..
-     0x00001B18,  // ..**.**...**..
-     0x00001918,  // ..**..*...**..
-     0x00001998,  // ..**..**..**..
-     0x00001898,  // ..**...*..**..
-     0x000018D8,  // ..**...**.**..
-     0x00001858,  // ..**....*.**..
-     0x00001878,  // ..**....****..
-     0x00001838,  // ..**.....***..
-     0x00001838,  // ..**.....***..
-     0x00001818,  // ..**......**..
-     0x00003C18,  // .****.....**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 206
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001008,  // ..*........*..
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001008,  // ..*........*..
-     0x00001008,  // ..*........*..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000420,  // ....*....*....
-     0x000007E0,  // ....******....
-     0x000007E0,  // ....******....
-     0x00000420,  // ....*....*....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00002004,  // .*..........*.
-     0x00002004,  // .*..........*.
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00002004,  // .*..........*.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 207
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 208
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 209
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FE0,  // ..********....
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C30,  // ...**....**...
-     0x00000FE0,  // ...*******....
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00001F00,  // ..*****.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 210
-     0, 26,
+  {             // 132
+     0, 24,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -5187,1312 +2725,3326 @@ cFont::tPixelData FontFix_iso8859_7[][28] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 133
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 211
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x0000180C,  // ..**.......**.
-     0x00001C04,  // ..***.......*.
-     0x00000C04,  // ...**.......*.
-     0x00000E00,  // ...***........
-     0x00000600,  // ....**........
-     0x00000700,  // ....***.......
-     0x00000380,  // .....***......
-     0x00000300,  // .....**.......
-     0x00000200,  // .....*........
-     0x00000600,  // ....**........
-     0x00000400,  // ....*.........
-     0x00000C04,  // ...**.......*.
-     0x00000804,  // ...*........*.
-     0x0000180C,  // ..**.......**.
-     0x00001FFC,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 212
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x0000318C,  // .**...**...**.
-     0x00002184,  // .*....**....*.
-     0x00002184,  // .*....**....*.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 213
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00002664,  // .*..**..**..*.
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 214
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000007E0,  // ....******....
-     0x00001DB8,  // ..***.**.***..
-     0x00001998,  // ..**..**..**..
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00001998,  // ..**..**..**..
-     0x00001DB8,  // ..***.**.***..
-     0x000007E0,  // ....******....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 215
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003E3E,  // .*****...*****
-     0x00001C1C,  // ..***.....***.
-     0x00000C18,  // ...**.....**..
-     0x00000E30,  // ...***...**...
-     0x00000730,  // ....***..**...
-     0x00000360,  // .....**.**....
-     0x000003E0,  // .....*****....
-     0x000001C0,  // ......***.....
-     0x000001C0,  // ......***.....
-     0x000003E0,  // .....*****....
-     0x00000360,  // .....**.**....
-     0x00000670,  // ....**..***...
-     0x00000638,  // ....**...***..
-     0x00000C18,  // ...**.....**..
-     0x00001C1C,  // ..***.....***.
-     0x00003E3E,  // .*****...*****
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 134
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 216
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x0000318C,  // .**...**...**.
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00000DB0,  // ...**.**.**...
-     0x000007E0,  // ....******....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 135
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 217
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000E70,  // ...***..***...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x00002244,  // .*...*..*...*.
-     0x00001E78,  // ..****..****..
-     0x00001E78,  // ..****..****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 136
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 218
-     14, 26,
-     0x00000C30,  // ...**....**...
-     0x00001E78,  // ..****..****..
-     0x00000C30,  // ...**....**...
-     0x00000000,  // ..............
-     0x00000FF0,  // ...********...
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 137
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 219
-     14, 26,
-     0x00000C30,  // ...**....**...
-     0x00001E78,  // ..****..****..
-     0x00000C30,  // ...**....**...
-     0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00003C3C,  // .****....****.
-     0x00002664,  // .*..**..**..*.
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000FF0,  // ...********...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 138
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 220
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000100,  // ......*.......
-     0x00000100,  // ......*.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000704,  // ....***.....*.
-     0x00001D8C,  // ..***.**...**.
-     0x000018C8,  // ..**...**..*..
-     0x000030D8,  // .**....**.**..
-     0x00003070,  // .**.....***...
-     0x00003070,  // .**.....***...
-     0x00003060,  // .**.....**....
-     0x000018E0,  // ..**...***....
-     0x00001DB4,  // ..***.**.**.*.
-     0x00000718,  // ....***...**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 139
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 221
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000630,  // ....**...**...
-     0x00000E30,  // ...***...**...
-     0x00000600,  // ....**........
-     0x000003C0,  // .....****.....
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00000C10,  // ...**.....*...
-     0x00000630,  // ....**...**...
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 140
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 222
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000040,  // ........*.....
-     0x00000040,  // ........*.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001DE0,  // ..***.****....
-     0x00002730,  // .*..***..**...
-     0x00002618,  // .*..**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000218,  // .....*....**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000008,  // ...........*..
-     0x00000000,  // ..............
+  {             // 141
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 223
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000100,  // ......*.......
-     0x00000100,  // ......*.......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000700,  // ....***.......
-     0x00000980,  // ...*..**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000190,  // ......**..*...
-     0x000000E0,  // .......***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 142
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 224
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000080,  // .......*......
-     0x00000C98,  // ...**..*..**..
-     0x00001E3C,  // ..****...****.
-     0x00000C18,  // ...**.....**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001618,  // ..*.**....**..
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000730,  // ....***..**...
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 143
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 225
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000704,  // ....***.....*.
-     0x00001D8C,  // ..***.**...**.
-     0x000018C8,  // ..**...**..*..
-     0x000030D8,  // .**....**.**..
-     0x00003070,  // .**.....***...
-     0x00003070,  // .**.....***...
-     0x00003060,  // .**.....**....
-     0x000018E0,  // ..**...***....
-     0x00001DB4,  // ..***.**.**.*.
-     0x00000718,  // ....***...**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 144
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 226
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00000CE0,  // ...**..***....
-     0x00001870,  // ..**....***...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001860,  // ..**....**....
-     0x00001BE0,  // ..**.*****....
-     0x00001830,  // ..**.....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001C18,  // ..***.....**..
-     0x00001E30,  // ..****...**...
-     0x00001BE0,  // ..**.*****....
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001000,  // ..*...........
-     0x00000000,  // ..............
+  {             // 145
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 227
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000602,  // ....**.......*
-     0x00000F04,  // ...****.....*.
-     0x00001F8C,  // ..******...**.
-     0x00001198,  // ..*...**..**..
-     0x00000090,  // .......*..*...
-     0x000000B0,  // .......*.**...
-     0x000000A0,  // .......*.*....
-     0x000000E0,  // .......***....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x000001C0,  // ......***.....
-     0x00000380,  // .....***......
-     0x00000380,  // .....***......
-     0x00000380,  // .....***......
-     0x00000100,  // ......*.......
-     0x00000000,  // ..............
+  {             // 146
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 228
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000660,  // ....**..**....
-     0x00000630,  // ....**...**...
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000003E0,  // .....*****....
-     0x00000E70,  // ...***..***...
-     0x00000C30,  // ...**....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000E70,  // ...***..***...
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 147
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 229
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000630,  // ....**...**...
-     0x00000E30,  // ...***...**...
-     0x00000600,  // ....**........
-     0x000003C0,  // .....****.....
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00000C10,  // ...**.....*...
-     0x00000630,  // ....**...**...
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 149
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 230
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000338,  // .....**..***..
-     0x000001F8,  // ......******..
-     0x000003F0,  // .....******...
-     0x00000F00,  // ...****.......
-     0x00001C00,  // ..***.........
-     0x00001800,  // ..**..........
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x00001800,  // ..**..........
-     0x00001C00,  // ..***.........
-     0x00000F00,  // ...****.......
-     0x000003C0,  // .....****.....
-     0x000000E0,  // .......***....
-     0x00000030,  // .........**...
-     0x00000010,  // ..........*...
-     0x00000190,  // ......**..*...
-     0x000001B0,  // ......**.**...
-     0x000000E0,  // .......***....
-     0x00000000,  // ..............
+  {             // 150
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 231
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001DE0,  // ..***.****....
-     0x00002730,  // .*..***..**...
-     0x00002618,  // .*..**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000218,  // .....*....**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000008,  // ...........*..
-     0x00000000,  // ..............
+  {             // 151
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 232
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000660,  // ....**..**....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 152
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 233
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000700,  // ....***.......
-     0x00000980,  // ...*..**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000190,  // ......**..*...
-     0x000000E0,  // .......***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 153
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 234
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001830,  // ..**.....**...
-     0x00003870,  // .***....***...
-     0x000018C0,  // ..**...**.....
-     0x00001980,  // ..**..**......
-     0x00001B00,  // ..**.**.......
-     0x00001F80,  // ..******......
-     0x000019C0,  // ..**..***.....
-     0x000018E0,  // ..**...***....
-     0x00001874,  // ..**....***.*.
-     0x00003E38,  // .*****...***..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 155
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 235
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00003C00,  // .****.........
-     0x00002C00,  // .*.**.........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000300,  // .....**.......
-     0x00000380,  // .....***......
-     0x00000780,  // ....****......
-     0x00000680,  // ....**.*......
-     0x00000CC0,  // ...**..**.....
-     0x00000CC0,  // ...**..**.....
-     0x00001860,  // ..**....**....
-     0x00001864,  // ..**....**..*.
-     0x0000303C,  // .**......****.
-     0x00003018,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 156
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 236
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000810,  // ...*......*...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001830,  // ..**.....**...
-     0x00001874,  // ..**....***.*.
-     0x00001CDC,  // ..***..**.***.
-     0x00001798,  // ..*.****..**..
-     0x00001000,  // ..*...........
-     0x00001000,  // ..*...........
-     0x00001000,  // ..*...........
-     0x00001000,  // ..*...........
-     0x00001000,  // ..*...........
-     0x00000000,  // ..............
+  {             // 157
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 237
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001C18,  // ..***.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000618,  // ....**....**..
-     0x00000610,  // ....**....*...
-     0x00000330,  // .....**..**...
-     0x00000320,  // .....**..*....
-     0x000001A0,  // ......**.*....
-     0x000001E0,  // ......****....
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 158
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 238
-     14, 26,
-     0x00000000,  // ..............
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000370,  // .....**.***...
-     0x000001F0,  // ......*****...
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x00000600,  // ....**........
-     0x000003F0,  // .....******...
-     0x000007E0,  // ....******....
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001C00,  // ..***.........
-     0x00000E00,  // ...***........
-     0x00000780,  // ....****......
-     0x000001E0,  // ......****....
-     0x00000030,  // .........**...
-     0x00000010,  // ..........*...
-     0x00000310,  // .....**...*...
-     0x00000330,  // .....**..**...
-     0x000001E0,  // ......****....
-     0x00000000,  // ..............
+  {             // 159
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 239
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000E38,  // ...***...***..
-     0x00000C18,  // ...**.....**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00000C18,  // ...**.....**..
-     0x00000E38,  // ...***...***..
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 160
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 240
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 161
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000010,  // ....*...
+     0x00000010,  // ....*...
+     0x00000010,  // ....*...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+  },
+  {             // 162
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006700,  // ...**..***.......
+     0x0000C700,  // ..**...***.......
+     0x0000CD00,  // ..**..**.*.......
+     0x00000D80,  // ......**.**......
+     0x00001980,  // .....**..**......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x000030E0,  // ....**....***....
+     0x00003060,  // ....**.....**....
+     0x00007FE0,  // ...**********....
+     0x00007FF0,  // ...***********...
+     0x00006030,  // ...**.......**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001801C,  // .**..........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 163
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000003F0,  // ....******...
+     0x00000618,  // ...**....**..
+     0x00000418,  // ...*.....**..
+     0x00000C08,  // ..**......*..
+     0x00000C00,  // ..**.........
+     0x00000400,  // ...*.........
+     0x00000400,  // ...*.........
+     0x00001FC0,  // .*******.....
+     0x00001FC0,  // .*******.....
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000400,  // ...*.........
+     0x00000C00,  // ..**.........
+     0x00000F80,  // ..*****......
+     0x00001FFC,  // .***********.
+     0x00000878,  // ..*....****..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 164
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000808,  // ..*.......*..
+     0x00001DFC,  // .***.*******.
+     0x00000FF8,  // ..*********..
+     0x00000630,  // ...**...**...
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x00000FF8,  // ..*********..
+     0x00001DCC,  // .***.***..**.
+     0x00000808,  // ..*.......*..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 165
+     13, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000FFC,  // ...**********.
-     0x00001FF8,  // ..**********..
-     0x00003220,  // .**..*...*....
-     0x00002220,  // .*...*...*....
-     0x00000220,  // .....*...*....
-     0x00000620,  // ....**...*....
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00000C30,  // ...**....**...
      0x00000660,  // ....**..**....
-     0x00000E64,  // ...***..**..*.
-     0x00000C78,  // ...**...****..
-     0x00001830,  // ..**.....**...
-     0x00000000,  // ..............
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 241
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000E38,  // ...***...***..
-     0x00000C18,  // ...**.....**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001C18,  // ..***.....**..
-     0x00001E38,  // ..****...***..
-     0x00001BE0,  // ..**.*****....
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00000000,  // ..............
+  {             // 166
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
   },
-  {             // 242
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // ......*****...
-     0x000003F8,  // .....*******..
-     0x00000708,  // ....***....*..
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000E00,  // ...***........
-     0x000007E0,  // ....******....
-     0x000003F0,  // .....******...
-     0x00000008,  // ...........*..
-     0x00000008,  // ...........*..
-     0x00000018,  // ..........**..
-     0x000001F0,  // ......*****...
-     0x000001E0,  // ......****....
-     0x00000000,  // ..............
+  {             // 167
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000C00,  // ..**.........
+     0x00000600,  // ...**........
+     0x00000780,  // ...****......
+     0x00000DE0,  // ..**.****....
+     0x00001870,  // .**....***...
+     0x00001838,  // .**.....***..
+     0x0000181C,  // .**......***.
+     0x00000C0C,  // ..**......**.
+     0x0000070C,  // ...***....**.
+     0x00000398,  // ....***..**..
+     0x000001F0,  // .....*****...
+     0x00000070,  // .......***...
+     0x00000038,  // ........***..
+     0x00000418,  // ...*.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000638,  // ...**...***..
+     0x000007F0,  // ...*******...
+     0x000001E0,  // .....****....
   },
-  {             // 243
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003FE,  // .....*********
-     0x00000E30,  // ...***...**...
-     0x00000C18,  // ...**.....**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00000C18,  // ...**.....**..
-     0x00000E38,  // ...***...***..
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 168
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
-  {             // 244
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 169
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000F80,  // ......*****......
+     0x00003FE0,  // ....*********....
+     0x00006030,  // ...**.......**...
+     0x0000C018,  // ..**.........**..
+     0x00018F8C,  // .**...*****...**.
+     0x00019CC4,  // .**..***..**...*.
+     0x00033846,  // **..***....*...**
+     0x00033006,  // **..**.........**
+     0x00033002,  // **..**..........*
+     0x00033002,  // **..**..........*
+     0x00033006,  // **..**.........**
+     0x00019064,  // .**..*.....**..*.
+     0x000198C4,  // .**..**...**...*.
+     0x0000CF88,  // ..**..*****...*..
+     0x0000E018,  // ..***........**..
+     0x00007070,  // ...***.....***...
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 170
+     8, 24,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x0000000C,  // ......**.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000000F4,  // ..****.*.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 171
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000118,  // .....*...**..
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000660,  // ...**..**....
+     0x00000CC0,  // ..**..**.....
+     0x00000CC0,  // ..**..**.....
+     0x00000C60,  // ..**...**....
+     0x00000660,  // ...**..**....
+     0x00000330,  // ....**..**...
+     0x00000310,  // ....**...*...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 172
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 173
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 174
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000F80,  // ......*****......
+     0x00003CE0,  // ....****..***....
+     0x00006030,  // ...**.......**...
+     0x0000C018,  // ..**.........**..
+     0x00019F8C,  // .**..******...**.
+     0x000199C4,  // .**..**..***...*.
+     0x00031846,  // **...**....*...**
+     0x00031846,  // **...**....*...**
+     0x000318C2,  // **...**...**....*
+     0x00031F82,  // **...******.....*
+     0x00031982,  // **...**..**.....*
+     0x00019884,  // .**..**...*....*.
+     0x000198C4,  // .**..**...**...*.
+     0x0000D848,  // ..**.**....*..*..
+     0x0000E018,  // ..***........**..
+     0x00007070,  // ...***.....***...
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 175
+     12, 24,
+     0x00000000,  // ..............
+     0x00003FFE,  // .*************
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 176
+     9, 24,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x0000010C,  // .*....**.
+     0x00000104,  // .*.....*.
+     0x0000010C,  // .*....**.
+     0x00000088,  // ..*...*..
+     0x00000070,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 177
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 178
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ...****.
+     0x0000007E,  // ..******
+     0x000000C6,  // .**...**
+     0x00000006,  // ......**
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x000000FE,  // .*******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000CC,  // .**..**.
+     0x0000000C,  // .....**.
+     0x00000038,  // ...***..
+     0x0000003C,  // ...****.
+     0x00000004,  // ......*.
+     0x00000084,  // .*....*.
+     0x000000CC,  // .**..**.
+     0x00000078,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     8, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 181
+     13, 24,
+     0x00000000,  // .............
+     0x000000F0,  // ......****...
+     0x000000E0,  // ......***....
+     0x000019CC,  // .**..***..**.
+     0x0000198C,  // .**..**...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 182
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006700,  // ...**..***.......
+     0x0000C700,  // ..**...***.......
+     0x0000CD00,  // ..**..**.*.......
+     0x00000D80,  // ......**.**......
+     0x00001980,  // .....**..**......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x000030E0,  // ....**....***....
+     0x00003060,  // ....**.....**....
+     0x00007FE0,  // ...**********....
+     0x00007FF0,  // ...***********...
+     0x00006030,  // ...**.......**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001801C,  // .**..........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 183
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0003BFFC,  // .***.************.
+     0x00033FFC,  // .**..************.
+     0x00063000,  // **...**...........
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003FE0,  // .....*********....
+     0x00003FE0,  // .....*********....
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003000,  // .....**...........
+     0x00003FF8,  // .....***********..
+     0x00003FF8,  // .....***********..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 185
+     20, 24,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x000EC018,  // .***.**.........**..
+     0x000CC018,  // .**..**.........**..
+     0x0018C018,  // **...**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000FFF8,  // .....*************..
+     0x0000FFF8,  // .....*************..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x0000C018,  // .....**.........**..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 186
+     9, 24,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001D8,  // ..***.**..
+     0x00000198,  // ..**..**..
+     0x00000318,  // .**...**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 187
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000008C0,  // ..*...**.....
+     0x00000C40,  // ..**...*.....
+     0x00000660,  // ...**..**....
+     0x00000630,  // ...**...**...
+     0x00000330,  // ....**..**...
+     0x00000318,  // ....**...**..
+     0x00000330,  // ....**..**...
+     0x00000660,  // ...**..**....
+     0x00000460,  // ...*...**....
+     0x00000CC0,  // ..**..**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 188
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00038FC0,  // .***...******.....
+     0x00033FF0,  // .**..**********...
+     0x00067038,  // **..***......***..
+     0x0000C01C,  // ...**.........***.
+     0x0000C00C,  // ...**..........**.
+     0x0001800E,  // ..**...........***
+     0x0001800E,  // ..**...........***
+     0x00018006,  // ..**............**
+     0x00018006,  // ..**............**
+     0x00018006,  // ..**............**
+     0x0001800E,  // ..**...........***
+     0x0001800E,  // ..**...........***
+     0x0000C00C,  // ...**..........**.
+     0x0000E01C,  // ...***........***.
+     0x00007038,  // ....***......***..
+     0x00003FF0,  // .....**********...
+     0x00000FC0,  // .......******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 189
+     19, 24,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x0000C018,  // ....**.........**..
+     0x0001C030,  // ...***........**...
+     0x0003C060,  // ..****.......**....
+     0x0000C060,  // ....**.......**....
+     0x0000C0C0,  // ....**......**.....
+     0x0000C180,  // ....**.....**......
+     0x0000C100,  // ....**.....*.......
+     0x0000C300,  // ....**....**.......
+     0x0000C600,  // ....**...**........
+     0x00000C3C,  // ........**....****.
+     0x00000866,  // ........*....**..**
+     0x00001806,  // .......**........**
+     0x00003006,  // ......**.........**
+     0x0000601C,  // .....**........***.
+     0x00006038,  // .....**.......***..
+     0x0000C060,  // ....**.......**....
+     0x000180FE,  // ...**.......*******
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 190
+     19, 24,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x000CE00C,  // ..**..***.........**.
+     0x00186018,  // .**....**........**..
+     0x00187038,  // .**....***......***..
+     0x00003830,  // ........***.....**...
+     0x00001860,  // .........**....**....
+     0x00001CE0,  // .........***..***....
+     0x00000CC0,  // ..........**..**.....
+     0x00000780,  // ...........****......
+     0x00000780,  // ...........****......
+     0x00000300,  // ............**.......
+     0x00000300,  // ............**.......
+     0x00000300,  // ............**.......
+     0x00000300,  // ............**.......
+     0x00000300,  // ............**.......
+     0x00000300,  // ............**.......
+     0x00000300,  // ............**.......
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 191
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00030F80,  // ..**....*****......
+     0x00033FE0,  // ..**..*********....
+     0x00067070,  // .**..***.....***...
+     0x0000E018,  // ....***........**..
+     0x0000C018,  // ....**.........**..
+     0x0001800C,  // ...**...........**.
+     0x0001800C,  // ...**...........**.
+     0x0001800C,  // ...**...........**.
+     0x0001800C,  // ...**...........**.
+     0x0001800C,  // ...**...........**.
+     0x0001800C,  // ...**...........**.
+     0x0000C018,  // ....**.........**..
+     0x0000C018,  // ....**.........**..
+     0x00006030,  // .....**.......**...
+     0x00003060,  // ......**.....**....
+     0x0001F8FC,  // ...******...******.
+     0x0001F8FC,  // ...******...******.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 192
+     5, 24,
+     0x00000000,  // ........
+     0x00000038,  // .....***..
+     0x00000030,  // .....**...
+     0x00000666,  // **..**..**
+     0x00000606,  // **......**
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 193
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D00,  // ......**.*.......
+     0x00000D80,  // ......**.**......
+     0x00001980,  // .....**..**......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x000030E0,  // ....**....***....
+     0x00003060,  // ....**.....**....
+     0x00007FE0,  // ...**********....
+     0x00007FF0,  // ...***********...
+     0x00006030,  // ...**.......**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001801C,  // .**..........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 194
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x0000301C,  // ..**.......***.
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FE,  // ..**********
+     0x000007FE,  // ..**********
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 196
+     15, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001980,  // .....**..**......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x000030E0,  // ....**....***....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00006030,  // ...**.......**...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000FFF8,  // ..*************..
+     0x0001FFFC,  // .***************.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 197
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FE0,  // ..*********....
+     0x00003FE0,  // ..*********....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007FC,  // ....*********.
-     0x00000FF8,  // ...*********..
-     0x00001880,  // ..**...*......
-     0x00001080,  // ..*....*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000084,  // .......*....*.
-     0x000000F8,  // .......*****..
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000018,  // ..........**..
+     0x00000038,  // .........***..
      0x00000070,  // ........***...
-     0x00000000,  // ..............
+     0x000000E0,  // .......***....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00003000,  // .**...........
+     0x00007FFC,  // *************.
+     0x00007FFC,  // *************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 245
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001618,  // ..*.**....**..
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000730,  // ....***..**...
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 199
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x00007FFC,  // ..*************.
+     0x00007FFC,  // ..*************.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 246
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x000003E0,  // .....*****....
-     0x00000EB8,  // ...***.*.***..
-     0x00000C98,  // ...**..*..**..
-     0x0000188C,  // ..**...*...**.
-     0x0000188C,  // ..**...*...**.
-     0x0000188C,  // ..**...*...**.
-     0x0000188C,  // ..**...*...**.
-     0x00000C98,  // ...**..*..**..
-     0x00000EB8,  // ...***.*.***..
-     0x000003E0,  // .....*****....
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000000,  // ..............
+  {             // 200
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018038,  // ..**.........***..
+     0x0003801C,  // .***..........***.
+     0x0003001C,  // .**...........***.
+     0x0003001C,  // .**...........***.
+     0x00031F8C,  // .**...******...**.
+     0x00031F8C,  // .**...******...**.
+     0x0003001C,  // .**...........***.
+     0x0003001C,  // .**...........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 247
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // ..**.......**.
-     0x00003C18,  // .****.....**..
-     0x00002630,  // .*..**...**...
-     0x00000660,  // ....**..**....
-     0x00000360,  // .....**.**....
-     0x000003C0,  // .....****.....
-     0x000001C0,  // ......***.....
-     0x00000380,  // .....***......
-     0x00000380,  // .....***......
-     0x000007C0,  // ....*****.....
-     0x000006C0,  // ....**.**.....
-     0x00000C60,  // ...**...**....
-     0x00001C64,  // ..***...**..*.
-     0x0000183C,  // ..**.....****.
-     0x00003018,  // .**.......**..
-     0x00000000,  // ..............
+  {             // 201
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 202
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000301C,  // ..**.......***.
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003F80,  // ..*******......
+     0x00003DC0,  // ..****.***.....
+     0x000038C0,  // ..***...**.....
+     0x000030E0,  // ..**....***....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003038,  // ..**......***..
+     0x0000301C,  // ..**.......***.
+     0x0000300E,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x000006C0,  // .....**.**.....
+     0x000006C0,  // .....**.**.....
+     0x000006C0,  // .....**.**.....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00001870,  // ...**....***...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000C00E,  // **..........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000E01C,  // ..***........***.
+     0x0000F01C,  // ..****.......***.
+     0x0000F03C,  // ..****......****.
+     0x0000F83C,  // ..*****.....****.
+     0x0000D86C,  // ..**.**....**.**.
+     0x0000DC6C,  // ..**.***...**.**.
+     0x0000CCCC,  // ..**..**..**..**.
+     0x0000CCCC,  // ..**..**..**..**.
+     0x0000C78C,  // ..**...****...**.
+     0x0000C78C,  // ..**...****...**.
+     0x0000C30C,  // ..**....**....**.
+     0x0000C30C,  // ..**....**....**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 205
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000600C,  // ..**.........**.
+     0x0000700C,  // ..***........**.
+     0x0000780C,  // ..****.......**.
+     0x00007C0C,  // ..*****......**.
+     0x00006C0C,  // ..**.**......**.
+     0x00006E0C,  // ..**.***.....**.
+     0x0000670C,  // ..**..***....**.
+     0x0000630C,  // ..**...**....**.
+     0x0000618C,  // ..**....**...**.
+     0x000061CC,  // ..**....***..**.
+     0x000060CC,  // ..**.....**..**.
+     0x0000606C,  // ..**......**.**.
+     0x0000607C,  // ..**......*****.
+     0x0000603C,  // ..**.......****.
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 206
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ...*********...
+     0x00001FF0,  // ...*********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
-  {             // 248
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x0000388E,  // .***...*...***
-     0x00001C9C,  // ..***..*..***.
-     0x00000C98,  // ...**..*..**..
-     0x00000C98,  // ...**..*..**..
-     0x00000C98,  // ...**..*..**..
-     0x00000C98,  // ...**..*..**..
-     0x00000C98,  // ...**..*..**..
-     0x000006B0,  // ....**.*.**...
-     0x000006B0,  // ....**.*.**...
-     0x000003E0,  // .....*****....
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000000,  // ..............
+  {             // 207
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003001C,  // .**...........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003001C,  // .**...........***.
+     0x0003001C,  // .**...........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 249
-     14, 26,
+  {             // 208
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FFC,  // ..*************.
+     0x00007FFC,  // ..*************.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 209
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FFC,  // ..************.
+     0x0000300E,  // ..**........***
+     0x0000300E,  // ..**........***
+     0x00003006,  // ..**.........**
+     0x0000300E,  // ..**........***
+     0x0000301E,  // ..**.......****
+     0x00003FFC,  // ..************.
+     0x00003FF0,  // ..**********...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001C00,  // ..***.........
+     0x00000C00,  // ...**.........
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000001C0,  // ......***.....
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
+  },
+  {             // 211
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000399C,  // .***..**..***.
-     0x00001FF8,  // ..**********..
-     0x00000E70,  // ...***..***...
      0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001C00,  // ..***.........
+     0x00000C00,  // ...**.........
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000001C0,  // ......***.....
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 250
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 212
+     14, 24,
      0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001E78,  // ..****..****..
-     0x00000C30,  // ...**....**...
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000700,  // ....***.......
-     0x00000980,  // ...*..**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
      0x00000180,  // ......**......
-     0x00000190,  // ......**..*...
-     0x000000E0,  // .......***....
-     0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 251
-     14, 26,
-     0x00000000,  // ..............
+  {             // 213
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000E00C,  // .***.........**.
+     0x00006018,  // ..**........**..
+     0x00007038,  // ..***......***..
+     0x00003830,  // ...***.....**...
+     0x00001860,  // ....**....**....
+     0x00000CE0,  // .....**..***....
+     0x00000EC0,  // .....***.**.....
+     0x00000780,  // ......****......
+     0x00000380,  // .......***......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000600,  // ........**........
+     0x00000600,  // ........**........
+     0x00003FC0,  // .....********.....
+     0x0000FFF0,  // ...************...
+     0x0001C63C,  // ..***...**...****.
+     0x0001860C,  // ..**....**.....**.
+     0x0003060E,  // .**.....**.....***
+     0x0003060E,  // .**.....**.....***
+     0x00030606,  // .**.....**......**
+     0x0003060E,  // .**.....**.....***
+     0x0003060E,  // .**.....**.....***
+     0x0001861C,  // ..**....**....***.
+     0x0001C63C,  // ..***...**...****.
+     0x0000FFF0,  // ...************...
+     0x00003FC0,  // .....********.....
+     0x00000600,  // ........**........
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 215
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000700C,  // .***........**.
+     0x00003818,  // ..***......**..
+     0x00001838,  // ...**.....***..
+     0x00001C70,  // ...***...***...
+     0x00000E60,  // ....***..**....
+     0x000006C0,  // .....**.**.....
+     0x000007C0,  // .....*****.....
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x000006C0,  // .....**.**.....
+     0x00000EE0,  // ....***.***....
+     0x00001C70,  // ...***...***...
+     0x00001830,  // ...**.....**...
+     0x00003838,  // ..***.....***..
+     0x0000701C,  // .***.......***.
+     0x0000E00E,  // ***.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     19, 24,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00060C18,  // .**.....**.....**..
+     0x00060C18,  // .**.....**.....**..
+     0x00060C18,  // .**.....**.....**..
+     0x00060C18,  // .**.....**.....**..
+     0x00060C18,  // .**.....**.....**..
+     0x00060C18,  // .**.....**.....**..
+     0x00060C18,  // .**.....**.....**..
+     0x00070C38,  // .***....**....***..
+     0x00038C70,  // ..***...**...***...
+     0x0001FFE0,  // ...************....
+     0x00007F80,  // .....********......
+     0x00000C00,  // ........**.........
+     0x00000C00,  // ........**.........
+     0x00000C00,  // ........**.........
+     0x00000C00,  // ........**.........
+     0x00000C00,  // ........**.........
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 217
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00001F80,  // .....******......
+     0x00003FC0,  // ....********.....
+     0x000070E0,  // ...***....***....
+     0x0000E070,  // ..***......***...
+     0x0000C030,  // ..**........**...
+     0x00018018,  // .**..........**..
+     0x00018018,  // .**..........**..
+     0x00018018,  // .**..........**..
+     0x00018018,  // .**..........**..
+     0x00018018,  // .**..........**..
+     0x00018018,  // .**..........**..
+     0x0000C010,  // ..**.........*...
+     0x0000C030,  // ..**........**...
+     0x00006060,  // ...**......**....
+     0x000030C0,  // ....**....**.....
+     0x0001F9F8,  // .******..******..
+     0x0001F9F8,  // .******..******..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 218
+     6, 24,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000376,  // **.***.**
+     0x00000376,  // **.***.**
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 219
+     15, 24,
+     0x0000C00E,  // .**..........***
+     0x0000C00E,  // .**..........***
+     0x00000000,  // ................
+     0x0000C00E,  // .**..........***
+     0x0000600C,  // ..**.........**.
+     0x00007018,  // ..***.......**..
+     0x00003038,  // ...**......***..
+     0x00001870,  // ....**....***...
+     0x00001C60,  // ....***...**....
+     0x00000CC0,  // .....**..**.....
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x000007F8,  // ...********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00000C38,  // ..**....***..
+     0x00000FEE,  // ..*******.***
+     0x000003CC,  // ....****..**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 221
+     10, 24,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000070,  // ....***...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001FC,  // ..*******.
+     0x00000308,  // .**....*..
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001E0,  // ..****....
+     0x000001E0,  // ..****....
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000030C,  // .**....**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 222
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x00000040,  // .......*.....
+     0x00000000,  // .............
+     0x00000DF0,  // ..**.*****...
+     0x00000FB8,  // ..*****.***..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+  },
+  {             // 223
+     5, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ...***.
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 224
+     12, 24,
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x0000066C,  // ..**..**.**.
+     0x0000060C,  // ..**.....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 225
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x000007F8,  // ...********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00000C38,  // ..**....***..
+     0x00000FEE,  // ..*******.***
+     0x000003CC,  // ....****..**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 226
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F0,  // ...*******...
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C30,  // ..**....**...
+     0x00000CE0,  // ..**..***....
+     0x00000CF0,  // ..**..****...
+     0x00000C18,  // ..**.....**..
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E0C,  // ..***.....**.
+     0x00000E18,  // ..***....**..
+     0x00000DF0,  // ..**.*****...
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+  },
+  {             // 227
+     11, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+  },
+  {             // 228
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF8,  // ..*********..
+     0x00000E00,  // ..***........
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x000003E0,  // ....*****....
+     0x00000F70,  // ..****.***...
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000E18,  // ..***....**..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     10, 24,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001FC,  // ..*******.
+     0x00000308,  // .**....*..
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001E0,  // ..****....
+     0x000001E0,  // ..****....
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000030C,  // .**....**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 230
+     10, 24,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000FE,  // ...*******
+     0x000000FE,  // ...*******
+     0x00000008,  // .......*..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000040,  // ....*.....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001F8,  // ..******..
+     0x000000FC,  // ...******.
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x0000001C,  // ......***.
+     0x00000010,  // ......*...
+  },
+  {             // 231
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000DF0,  // ..**.*****...
+     0x00000FB8,  // ..*****.***..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+  },
+  {             // 232
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 233
+     5, 24,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 234
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000061C,  // .**....***.
+     0x00000638,  // .**...***..
+     0x00000670,  // .**..***...
+     0x000006E0,  // .**.***....
+     0x000007C0,  // .*****.....
+     0x000007C0,  // .*****.....
+     0x000007C0,  // .*****.....
+     0x00000660,  // .**..**....
+     0x00000670,  // .**..***...
+     0x00000638,  // .**...***..
+     0x0000061C,  // .**....***.
+     0x0000060C,  // .**.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 235
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000001C0,  // ...***.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000F0,  // ....****...
+     0x000001B0,  // ...**.**...
+     0x000001B8,  // ...**.***..
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x0000030C,  // ..**....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000E06,  // ***......**
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 236
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000E1C,  // ..***....***.
+     0x00000FFC,  // ..**********.
+     0x00000DEC,  // ..**.****.**.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+  },
+  {             // 237
+     11, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0C,  // ***......**.
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 238
+     10, 24,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000001F0,  // ..*****...
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x00000180,  // ..**......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000180,  // ..**......
+     0x000000F8,  // ...*****..
+     0x0000003E,  // .....*****
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x0000003E,  // .....*****
+     0x00000038,  // .....***..
+     0x00000000,  // ..........
+  },
+  {             // 239
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C18,  // ..**.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C18,  // ..**.....**..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 240
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
+     0x00000FFE,  // .***********
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x0000060C,  // ..**.....**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 241
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F8,  // ...********..
+     0x00000C1C,  // ..**.....***.
+     0x0000180E,  // .**.......***
+     0x0000180E,  // .**.......***
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180E,  // .**.......***
+     0x00001C0E,  // .***......***
+     0x00001C1C,  // .***.....***.
+     0x00001FF8,  // .**********..
+     0x00001BF0,  // .**.******...
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000000,  // .............
+  },
+  {             // 242
+     11, 24,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000007E,  // .....******
+     0x000000FE,  // ....*******
+     0x00000380,  // ..***......
+     0x00000300,  // ..**.......
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000700,  // .***.......
+     0x00000380,  // ..***......
+     0x000001F0,  // ...*****...
+     0x0000007C,  // .....*****.
+     0x0000000E,  // ........***
+     0x00000006,  // .........**
+     0x0000000E,  // ........***
+     0x0000007C,  // .....*****.
+     0x000000F0,  // ....****...
+  },
+  {             // 243
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000630,  // ....**...**...
-     0x00000F78,  // ...****.****..
-     0x00000630,  // ....**...**...
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001618,  // ..*.**....**..
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000730,  // ....***..**...
-     0x000003E0,  // .....*****....
      0x00000000,  // ..............
+     0x000007FE,  // ....**********
+     0x00000CFE,  // ...**..*******
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003838,  // .***.....***..
+     0x00001830,  // ..**.....**...
+     0x00000FE0,  // ...*******....
+     0x000007C0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
+  {             // 244
+     9, 24,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FE,  // .********
+     0x000001FE,  // .********
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 245
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 246
+     15, 24,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000CE0,  // ....**..***....
+     0x00001DF8,  // ...***.******..
+     0x00003198,  // ..**...**..**..
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x00003198,  // ..**...**..**..
+     0x00003998,  // ..***..**..**..
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+  },
+  {             // 247
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000618,  // ..**....**..
+     0x00000638,  // ..**...***..
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000001E0,  // ....****....
+     0x00000370,  // ...**.***...
+     0x00000330,  // ...**..**...
+     0x00000638,  // ..**...***..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+  },
+  {             // 248
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C31C,  // .**....**...***.
+     0x00006318,  // ..**...**...**..
+     0x00007FF8,  // ..************..
+     0x00001FE0,  // ....********....
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+  },
+  {             // 249
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018010,  // ..**..........*...
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003061C,  // .**.....**....***.
+     0x00018F18,  // ..**...****...**..
+     0x0001F9F8,  // ..******..******..
+     0x0000F0F0,  // ...****....****...
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 250
+     5, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x000000CE,  // **..***
+     0x000000CE,  // **..***
+     0x00000000,  // .......
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 251
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
   {             // 252
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000E38,  // ...***...***..
-     0x00000C18,  // ...**.....**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00000C18,  // ...**.....**..
-     0x00000E38,  // ...***...***..
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 24,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C18,  // ..**.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C18,  // ..**.....**..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 253
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x00000060,  // ........**....
-     0x00000040,  // ........*.....
-     0x00000040,  // ........*.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001618,  // ..*.**....**..
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x0000060C,  // ....**.....**.
-     0x00000618,  // ....**....**..
-     0x00000618,  // ....**....**..
-     0x00000730,  // ....***..**...
-     0x000003E0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     12, 24,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 254
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // .......**.....
-     0x000000C0,  // .......**.....
-     0x00000080,  // .......*......
-     0x00000080,  // .......*......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000399C,  // .***..**..***.
-     0x00001FF8,  // ..**********..
-     0x00000E70,  // ...***..***...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000380,  // .........***......
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003061C,  // .**.....**....***.
+     0x00018F18,  // ..**...****...**..
+     0x0001F9F8,  // ..******..******..
+     0x0000F0F0,  // ...****....****...
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 255
-     14, 26,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     0, 24,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
   };
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
new file mode 100644
index 000000000..b479f0736
--- /dev/null
+++ b/fontosd-iso8859-2.c
@@ -0,0 +1,6949 @@
+
+// 08.04.2004 modified 30 font - drazen.dupor@dupor.com
+
+cFont::tPixelData FontOsd_iso8859_2[][30] = {
+  {             // 32
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 33
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000044,  // ..*...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000198,  // ......**..**..
+     0x00000198,  // ......**..**..
+     0x00000198,  // ......**..**..
+     0x00000330,  // .....**..**...
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00000330,  // .....**..**...
+     0x00000330,  // .....**..**...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000CC0,  // ...**..**.....
+     0x00000CC0,  // ...**..**.....
+     0x00000CC0,  // ...**..**.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 36
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000007F0,  // ...*******...
+     0x00000FF8,  // ..*********..
+     0x00001CDC,  // .***..**.***.
+     0x000018CC,  // .**...**..**.
+     0x000018C0,  // .**...**.....
+     0x00001CC0,  // .***..**.....
+     0x00000EC0,  // ..***.**.....
+     0x000007C0,  // ...*****.....
+     0x000001F0,  // .....*****...
+     0x000000F8,  // ......*****..
+     0x000000DC,  // ......**.***.
+     0x000000CC,  // ......**..**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x00001CDC,  // .***..**.***.
+     0x00000FF8,  // ..*********..
+     0x000007F0,  // ...*******...
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     22, 28,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000180,  // ..............**......
+     0x000F0300,  // ...****......**.......
+     0x001F8300,  // ..******.....**.......
+     0x0030C600,  // .**....**...**........
+     0x0030C600,  // .**....**...**........
+     0x0030CC00,  // .**....**..**.........
+     0x0030CC00,  // .**....**..**.........
+     0x001F9800,  // ..******..**..........
+     0x000F1800,  // ...****...**..........
+     0x00003000,  // .........**...........
+     0x000031E0,  // .........**...****....
+     0x000063F0,  // ........**...******...
+     0x00006618,  // ........**..**....**..
+     0x0000C618,  // .......**...**....**..
+     0x0000C618,  // .......**...**....**..
+     0x00018618,  // ......**....**....**..
+     0x000183F0,  // ......**.....******...
+     0x000101E0,  // ......*.......****....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 38
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00001E00,  // .....****........
+     0x00003F00,  // ....******.......
+     0x00007380,  // ...***..***......
+     0x00006180,  // ...**....**......
+     0x00006180,  // ...**....**......
+     0x00006180,  // ...**....**......
+     0x00003300,  // ....**..**.......
+     0x00001E00,  // .....****........
+     0x00003C00,  // ....****.........
+     0x00007E30,  // ...******...**...
+     0x0000E730,  // ..***..***..**...
+     0x0000C3B0,  // ..**....***.**...
+     0x000181E0,  // .**......****....
+     0x000180C0,  // .**.......**.....
+     0x000181E0,  // .**......****....
+     0x0001C3B0,  // .***....***.**...
+     0x0000FF38,  // ..********..***..
+     0x00003C00,  // ....****.........
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 39
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 40
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x0000000C,  // .....**.
+  },
+  {             // 41
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x000000C0,  // .**.....
+  },
+  {             // 42
+     10, 28,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000040,  // ....*.....
+     0x00000040,  // ....*.....
+     0x00000358,  // .**.*.**..
+     0x000001F0,  // ..*****...
+     0x000000E0,  // ...***....
+     0x000001B0,  // ..**.**...
+     0x00000110,  // ..*...*...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 43
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 44
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+  },
+  {             // 45
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 46
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // .....**
+     0x00000006,  // .....**
+     0x00000006,  // .....**
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000001C0,  // .....***.....
+     0x00000FC0,  // ..******.....
+     0x00000FC0,  // ..******.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003C0,  // ....****.....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000038,  // ........***..
+     0x00000070,  // .......***...
+     0x000001E0,  // .....****....
+     0x00000380,  // ....***......
+     0x00000700,  // ...***.......
+     0x00000E00,  // ..***........
+     0x00001C00,  // .***.........
+     0x00001800,  // .**..........
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C30,  // ..**....**...
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x000001E0,  // .....****....
+     0x000001F8,  // .....******..
+     0x00000018,  // .........**..
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000070,  // .......***...
+     0x00000070,  // .......***...
+     0x000000F0,  // ......****...
+     0x000001F0,  // .....*****...
+     0x000001B0,  // .....**.**...
+     0x00000330,  // ....**..**...
+     0x00000730,  // ...***..**...
+     0x00000630,  // ...**...**...
+     0x00000C30,  // ..**....**...
+     0x00001C30,  // .***....**...
+     0x00001830,  // .**.....**...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000DC0,  // ..**.***.....
+     0x00000FF0,  // ..********...
+     0x00000E38,  // ..***...***..
+     0x00000018,  // .........**..
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00001C38,  // .***....***..
+     0x00000FF0,  // ..********...
+     0x000003C0,  // ....****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F8,  // ...********..
+     0x00000E18,  // ..***....**..
+     0x00000C0C,  // ..**......**.
+     0x00001C0C,  // .***......**.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x000019E0,  // .**..****....
+     0x00001BF0,  // .**.******...
+     0x00001E38,  // .****...***..
+     0x00001C18,  // .***.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000001C,  // .........***.
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000380,  // ....***......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000700,  // ...***.......
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000630,  // ...**...**...
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C18,  // ..**.....**..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000E38,  // ..***...***..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000E38,  // ..***...***..
+     0x00001C18,  // .***.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000E3C,  // ..***...****.
+     0x00000FEC,  // ..*******.**.
+     0x000003CC,  // ....****..**.
+     0x0000000C,  // ..........**.
+     0x0000001C,  // .........***.
+     0x00001818,  // .**......**..
+     0x00001C38,  // .***....***..
+     0x00000FF0,  // ..********...
+     0x000003C0,  // ....****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+  },
+  {             // 60
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000018,  // ...........**..
+     0x00000078,  // .........****..
+     0x000001E0,  // .......****....
+     0x00000780,  // .....****......
+     0x00001E00,  // ...****........
+     0x00007000,  // .***...........
+     0x00007000,  // .***...........
+     0x00001E00,  // ...****........
+     0x00000780,  // .....****......
+     0x000001E0,  // .......****....
+     0x00000078,  // .........****..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00006000,  // .**............
+     0x00007800,  // .****..........
+     0x00001E00,  // ...****........
+     0x00000780,  // .....****......
+     0x000001E0,  // .......****....
+     0x00000038,  // ..........***..
+     0x00000038,  // ..........***..
+     0x000001E0,  // .......****....
+     0x00000780,  // .....****......
+     0x00001E00,  // ...****........
+     0x00007800,  // .****..........
+     0x00006000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000071C,  // ..***...***.
+     0x00000E0C,  // .***.....**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000018,  // ........**..
+     0x00000038,  // .......***..
+     0x00000070,  // ......***...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 64
+     25, 28,
+     0x00000000,  // .........................
+     0x00000000,  // .........................
+     0x00000000,  // .........................
+     0x00000000,  // .........................
+     0x00000000,  // .........................
+     0x0000FF00,  // ..........********.......
+     0x0003FFC0,  // ........************.....
+     0x000F01E0,  // ......****.......****....
+     0x001C0070,  // .....***...........***...
+     0x00380018,  // ....***..............**..
+     0x00300018,  // ....**...............**..
+     0x0060730C,  // ...**......***..**....**.
+     0x0060FB0C,  // ...**.....*****.**....**.
+     0x00C1C70C,  // ..**.....***...***....**.
+     0x00C3860C,  // ..**....***....**.....**.
+     0x00C3060C,  // ..**....**.....**.....**.
+     0x00C6060C,  // ..**...**......**.....**.
+     0x00C60C1C,  // ..**...**.....**.....***.
+     0x00C60C18,  // ..**...**.....**.....**..
+     0x00C60C38,  // ..**...**.....**....***..
+     0x00E71C70,  // ..***..***...***...***...
+     0x0063F7E0,  // ...**...******.******....
+     0x0071E380,  // ...***...****...***......
+     0x00380000,  // ....***..................
+     0x001C0000,  // .....***.................
+     0x000F0300,  // ......****......**.......
+     0x0007FF00,  // .......***********.......
+     0x0000FC00,  // ..........******.........
+  },
+  {             // 65
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00007FF0,  // ...***********...
+     0x00007FF0,  // ...***********...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 66
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFC0,  // ..**********.....
+     0x0000FFF0,  // ..************...
+     0x0000C070,  // ..**.......***...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C018,  // ..**.........**..
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C01C,  // ..**.........***.
+     0x0000C038,  // ..**........***..
+     0x0000FFF0,  // ..************...
+     0x0000FFC0,  // ..**********.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 67
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x00038018,  // .***..........**..
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x0003000C,  // .**............**.
+     0x0003800C,  // .***...........**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 68
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0001FF80,  // ..**********......
+     0x0001FFE0,  // ..************....
+     0x000180F0,  // ..**.......****...
+     0x00018038,  // ..**.........***..
+     0x00018018,  // ..**..........**..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001801C,  // ..**..........***.
+     0x00018018,  // ..**..........**..
+     0x00018038,  // ..**.........***..
+     0x000180F0,  // ..**.......****...
+     0x0001FFE0,  // ..************....
+     0x0001FF80,  // ..**********......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 69
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF0,  // ..***********...
+     0x00007FF0,  // ..***********...
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 70
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     19, 28,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00003F00,  // ......******.......
+     0x0000FFC0,  // ....**********.....
+     0x0001E1E0,  // ...****....****....
+     0x00038070,  // ..***........***...
+     0x00030030,  // ..**..........**...
+     0x00070030,  // .***..........**...
+     0x00060000,  // .**................
+     0x00060000,  // .**................
+     0x00060000,  // .**................
+     0x000603F8,  // .**.......*******..
+     0x000603F8,  // .**.......*******..
+     0x00060018,  // .**............**..
+     0x00060018,  // .**............**..
+     0x00070018,  // .***...........**..
+     0x00030038,  // ..**..........***..
+     0x00038078,  // ..***........****..
+     0x0001E1F8,  // ...****....******..
+     0x0000FFD8,  // ....**********.**..
+     0x00003F18,  // ......******...**..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 72
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0001FFF8,  // ..**************..
+     0x0001FFF8,  // ..**************..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 73
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 74
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 75
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018070,  // ..**........***...
+     0x000180E0,  // ..**.......***....
+     0x000181C0,  // ..**......***.....
+     0x00018380,  // ..**.....***......
+     0x00018700,  // ..**....***.......
+     0x00018E00,  // ..**...***........
+     0x00019C00,  // ..**..***.........
+     0x0001B800,  // ..**.***..........
+     0x0001F800,  // ..******..........
+     0x0001FC00,  // ..*******.........
+     0x0001CE00,  // ..***..***........
+     0x00018700,  // ..**....***.......
+     0x00018380,  // ..**.....***......
+     0x000181C0,  // ..**......***.....
+     0x000180E0,  // ..**.......***....
+     0x00018070,  // ..**........***...
+     0x00018038,  // ..**.........***..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 76
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 77
+     21, 28,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x000C0018,  // ..**.............**..
+     0x000E0038,  // ..***...........***..
+     0x000E0038,  // ..***...........***..
+     0x000F0078,  // ..****.........****..
+     0x000F0078,  // ..****.........****..
+     0x000D80D8,  // ..**.**.......**.**..
+     0x000D80D8,  // ..**.**.......**.**..
+     0x000D80D8,  // ..**.**.......**.**..
+     0x000CC198,  // ..**..**.....**..**..
+     0x000CC198,  // ..**..**.....**..**..
+     0x000CC198,  // ..**..**.....**..**..
+     0x000C6318,  // ..**...**...**...**..
+     0x000C6318,  // ..**...**...**...**..
+     0x000C6318,  // ..**...**...**...**..
+     0x000C3618,  // ..**....**.**....**..
+     0x000C3618,  // ..**....**.**....**..
+     0x000C3618,  // ..**....**.**....**..
+     0x000C1C18,  // ..**.....***.....**..
+     0x000C1C18,  // ..**.....***.....**..
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+  },
+  {             // 78
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0001C018,  // ..***.........**..
+     0x0001E018,  // ..****........**..
+     0x0001E018,  // ..****........**..
+     0x0001B018,  // ..**.**.......**..
+     0x0001B818,  // ..**.***......**..
+     0x00019818,  // ..**..**......**..
+     0x00019C18,  // ..**..***.....**..
+     0x00018C18,  // ..**...**.....**..
+     0x00018E18,  // ..**...***....**..
+     0x00018618,  // ..**....**....**..
+     0x00018718,  // ..**....***...**..
+     0x00018318,  // ..**.....**...**..
+     0x00018398,  // ..**.....***..**..
+     0x00018198,  // ..**......**..**..
+     0x000181D8,  // ..**......***.**..
+     0x000180D8,  // ..**.......**.**..
+     0x00018078,  // ..**........****..
+     0x00018078,  // ..**........****..
+     0x00018038,  // ..**.........***..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 79
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003801C,  // .***..........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF0,  // ..***********...
+     0x00007FF8,  // ..************..
+     0x00006018,  // ..**........**..
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x00006018,  // ..**........**..
+     0x00007FF8,  // ..************..
+     0x00007FF0,  // ..***********...
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 81
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003801C,  // .***..........***.
+     0x00018398,  // ..**.....***..**..
+     0x0001C1F8,  // ..***.....******..
+     0x0000F070,  // ...****.....***...
+     0x00007FF8,  // ....************..
+     0x00001F9C,  // ......******..***.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFF0,  // ..************...
+     0x0000FFE0,  // ..***********....
+     0x0000C070,  // ..**.......***...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 83
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x000007C0,  // ......*****.....
+     0x00001FF0,  // ....*********...
+     0x00003838,  // ...***.....***..
+     0x00007018,  // ..***.......**..
+     0x00006018,  // ..**........**..
+     0x00006000,  // ..**............
+     0x00007000,  // ..***...........
+     0x00003E00,  // ...*****........
+     0x00000FC0,  // .....******.....
+     0x000001F0,  // ........*****...
+     0x00000078,  // ..........****..
+     0x0000001C,  // ............***.
+     0x0000000C,  // .............**.
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x00007838,  // ..****.....***..
+     0x00003FF0,  // ...**********...
+     0x00000FC0,  // .....******.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 84
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000FFFC,  // .**************.
+     0x0000FFFC,  // .**************.
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 85
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0000C030,  // ...**........**...
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 86
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001C01C,  // .***.........***.
+     0x0000C018,  // ..**.........**..
+     0x0000E038,  // ..***.......***..
+     0x00006030,  // ...**.......**...
+     0x00006030,  // ...**.......**...
+     0x00007070,  // ...***.....***...
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x000038E0,  // ....***...***....
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00001DC0,  // .....***.***.....
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 87
+     22, 28,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x0030180C,  // .**.......**.......**.
+     0x0030180C,  // .**.......**.......**.
+     0x0030180C,  // .**.......**.......**.
+     0x00303C0C,  // .**......****......**.
+     0x00183C18,  // ..**.....****.....**..
+     0x00186618,  // ..**....**..**....**..
+     0x00186618,  // ..**....**..**....**..
+     0x00186618,  // ..**....**..**....**..
+     0x00186618,  // ..**....**..**....**..
+     0x000C6630,  // ...**...**..**...**...
+     0x000CC330,  // ...**..**....**..**...
+     0x000CC330,  // ...**..**....**..**...
+     0x000CC330,  // ...**..**....**..**...
+     0x0006C360,  // ....**.**....**.**....
+     0x0006C360,  // ....**.**....**.**....
+     0x000781E0,  // ....****......****....
+     0x000381C0,  // .....***......***.....
+     0x000300C0,  // .....**........**.....
+     0x000300C0,  // .....**........**.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0001800C,  // .**...........**.
+     0x0001C01C,  // .***.........***.
+     0x0000E038,  // ..***.......***..
+     0x00006030,  // ...**.......**...
+     0x00003060,  // ....**.....**....
+     0x000038E0,  // ....***...***....
+     0x00001DC0,  // .....***.***.....
+     0x00000F80,  // ......*****......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000F80,  // ......*****......
+     0x00001DC0,  // .....***.***.....
+     0x000018C0,  // .....**...**.....
+     0x000038E0,  // ....***...***....
+     0x00007070,  // ...***.....***...
+     0x00006030,  // ...**.......**...
+     0x0000C018,  // ..**.........**..
+     0x0001C01C,  // .***.........***.
+     0x0001800C,  // .**...........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 89
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x00006018,  // ..**........**..
+     0x00007038,  // ..***......***..
+     0x00003030,  // ...**......**...
+     0x00003870,  // ...***....***...
+     0x00001860,  // ....**....**....
+     0x00001CE0,  // ....***..***....
+     0x00000CC0,  // .....**..**.....
+     0x00000FC0,  // .....******.....
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 90
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000001C,  // ...........***.
+     0x00000038,  // ..........***..
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00003800,  // ..***..........
+     0x00007000,  // .***...........
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000003C,  // ..****.
+     0x0000003C,  // ..****.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003C,  // ..****.
+  },
+  {             // 92
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000006,  // .....**
+     0x00000006,  // .....**
+     0x00000006,  // .....**
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 93
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000078,  // .****..
+     0x00000078,  // .****..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000078,  // .****..
+  },
+  {             // 94
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x00000120,  // ....*..*....
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 95
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+  },
+  {             // 96
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000060,  // .**....
+     0x00000030,  // ..**...
+     0x00000018,  // ...**..
+     0x0000000C,  // ....**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 97
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000018,  // .........**..
+     0x000000F8,  // ......*****..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001C78,  // .***...****..
+     0x00000FDC,  // ..******.***.
+     0x0000078C,  // ...****...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 98
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x000019E0,  // ..**..****....
+     0x00001BF0,  // ..**.******...
+     0x00001E38,  // ..****...***..
+     0x00001C18,  // ..***.....**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001C18,  // ..***.....**..
+     0x00001E38,  // ..****...***..
+     0x00001BF0,  // ..**.******...
+     0x000019E0,  // ..**..****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 99
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 100
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000798,  // ....****..**..
+     0x00000FD8,  // ...******.**..
+     0x00001C78,  // ..***...****..
+     0x00001838,  // ..**.....***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001838,  // ..**.....***..
+     0x00001C78,  // ..***...****..
+     0x00000FD8,  // ...******.**..
+     0x00000798,  // ....****..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 101
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001E0,  // .....****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 102
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x0000003C,  // ...****.
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 103
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000798,  // ....****..**..
+     0x00000FD8,  // ...******.**..
+     0x00001C78,  // ..***...****..
+     0x00001838,  // ..**.....***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001838,  // ..**.....***..
+     0x00001C78,  // ..***...****..
+     0x00000FD8,  // ...******.**..
+     0x00000798,  // ....****..**..
+     0x00000018,  // ..........**..
+     0x00003018,  // .**.......**..
+     0x00003830,  // .***.....**...
+     0x00001FF0,  // ..*********...
+  },
+  {             // 104
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000CE0,  // ..**..***....
+     0x00000DF8,  // ..**.******..
+     0x00000F18,  // ..****...**..
+     0x00000E0C,  // ..***.....**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 106
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000078,  // ****..
+  },
+  {             // 107
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x0000060C,  // ..**.....**.
+     0x0000061C,  // ..**....***.
+     0x00000638,  // ..**...***..
+     0x00000670,  // ..**..***...
+     0x000006E0,  // ..**.***....
+     0x000007C0,  // ..*****.....
+     0x000007E0,  // ..******....
+     0x00000670,  // ..**..***...
+     0x00000630,  // ..**...**...
+     0x00000638,  // ..**...***..
+     0x0000061C,  // ..**....***.
+     0x0000060C,  // ..**.....**.
+     0x0000060E,  // ..**.....***
+     0x00000606,  // ..**......**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 108
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 109
+     20, 28,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x000671E0,  // ..**..***...****....
+     0x0007FBF0,  // ..********.******...
+     0x00071E38,  // ..***...****...***..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00060C18,  // ..**.....**.....**..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 110
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000019C0,  // ..**..***.....
+     0x00001BF0,  // ..**.******...
+     0x00001E30,  // ..****...**...
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 111
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 112
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000019E0,  // ..**..****....
+     0x00001BF0,  // ..**.******...
+     0x00001E38,  // ..****...***..
+     0x00001C18,  // ..***.....**..
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001C18,  // ..***.....**..
+     0x00001E38,  // ..****...***..
+     0x00001BF0,  // ..**.******...
+     0x000019E0,  // ..**..****....
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+  },
+  {             // 113
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000798,  // ....****..**..
+     0x00000FD8,  // ...******.**..
+     0x00001C78,  // ..***...****..
+     0x00001838,  // ..**.....***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001838,  // ..**.....***..
+     0x00001C78,  // ..***...****..
+     0x00000FD8,  // ...******.**..
+     0x00000798,  // ....****..**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+  },
+  {             // 114
+     9, 28,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CC,  // ..**..**.
+     0x000000DC,  // ..**.***.
+     0x000000FC,  // ..******.
+     0x000000E0,  // ..***....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 115
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F8,  // ..********..
+     0x00000E1C,  // .***....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000F80,  // .*****......
+     0x000007F0,  // ..*******...
+     0x000000F8,  // .....*****..
+     0x0000001C,  // ........***.
+     0x0000000C,  // .........**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 116
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x0000003C,  // ...****.
+     0x0000001C,  // ....***.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 117
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00000C78,  // ...**...****..
+     0x00000FD8,  // ...******.**..
+     0x00000398,  // .....***..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 118
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 119
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00060606,  // **......**......**
+     0x00060606,  // **......**......**
+     0x00030F0C,  // .**....****....**.
+     0x00030F0C,  // .**....****....**.
+     0x00030F0C,  // .**....****....**.
+     0x00018918,  // ..**...*..*...**..
+     0x00019998,  // ..**..**..**..**..
+     0x00019998,  // ..**..**..**..**..
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D0B0,  // ...**.*....*.**...
+     0x0000F0F0,  // ...****....****...
+     0x000070E0,  // ....***....***....
+     0x00006060,  // ....**......**....
+     0x00006060,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 120
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000E1C,  // .***....***.
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x000003F0,  // ...******...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000E1C,  // .***....***.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x0000180C,  // .**.......**.
+     0x00001C18,  // .***.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x000001E0,  // .....****....
+     0x000001C0,  // .....***.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000F00,  // ..****.......
+  },
+  {             // 122
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000380,  // ...***......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 123
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+  },
+  {             // 124
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+  },
+  {             // 125
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+  },
+  {             // 126
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000E18,  // ...***....**..
+     0x00001F98,  // ..******..**..
+     0x000019F8,  // ..**..******..
+     0x00001870,  // ..**....***...
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 127
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 28,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 161
+     17, 28,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00007FF0,  // ...***********...
+     0x00007FF0,  // ...***********...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001838C,  // .**.....***...**.
+     0x00000600,  // .......**........
+     0x00000C00,  // ......**.........
+     0x00000C00,  // ......**.........
+     0x00000F80,  // ......*****......
+  },
+  {             // 162
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000102,  // *......*
+     0x00000186,  // **....**
+     0x000000FC,  // .******.
+     0x00000078,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 163
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001B00,  // ...**.**.......
+     0x00001E00,  // ...****........
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00003800,  // ..***..........
+     0x00007800,  // .****..........
+     0x0000D800,  // **.**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001FFC,  // ...***********.
+     0x00001FFC,  // ...***********.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 164
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001DDC,  // .***.***.***.
+     0x00000FF8,  // ..*********..
+     0x00000630,  // ...**...**...
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x00000FF8,  // ..*********..
+     0x00001DDC,  // .***.***.***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 165
+     19, 28,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00030018,  // ..**...........**..
+     0x00030018,  // ..**...........**..
+     0x00030018,  // ..**...........**..
+     0x00030008,  // ..**............*..
+     0x00030008,  // ..**............*..
+     0x00030010,  // ..**...........*...
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x00030000,  // ..**...............
+     0x0003FF80,  // ..***********......
+     0x0003FF80,  // ..***********......
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 166
+     16, 28,
+     0x000000C0,  // .........**.....
+     0x00000180,  // ........**......
+     0x00000300,  // .......**.......
+     0x00000600,  // ......**........
+     0x00000000,  // ................
+     0x000007C0,  // ......*****.....
+     0x00001FF0,  // ....*********...
+     0x00003838,  // ...***.....***..
+     0x00007018,  // ..***.......**..
+     0x00006018,  // ..**........**..
+     0x00006000,  // ..**............
+     0x00007000,  // ..***...........
+     0x00003E00,  // ...*****........
+     0x00000FC0,  // .....******.....
+     0x000001F0,  // ........*****...
+     0x00000078,  // ..........****..
+     0x0000001C,  // ............***.
+     0x0000000C,  // .............**.
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x00007838,  // ..****.....***..
+     0x00003FF0,  // ...**********...
+     0x00000FC0,  // .....******.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 167
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00000E18,  // ..***....**..
+     0x00000700,  // ...***.......
+     0x00000380,  // ....***......
+     0x00000FC0,  // ..******.....
+     0x00001CE0,  // .***..***....
+     0x00001870,  // .**....***...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x00000C0C,  // ..**......**.
+     0x00000E0C,  // ..***.....**.
+     0x0000070C,  // ...***....**.
+     0x00000398,  // ....***..**..
+     0x000001F0,  // .....*****...
+     0x000000E0,  // ......***....
+     0x00000070,  // .......***...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+  },
+  {             // 168
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 169
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00001860,  // ....**....**....
+     0x00000CC0,  // .....**..**.....
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x000007C0,  // ......*****.....
+     0x00001FF0,  // ....*********...
+     0x00003830,  // ...***.....**...
+     0x00003000,  // ...**...........
+     0x00003000,  // ...**...........
+     0x00003800,  // ...***..........
+     0x00001FE0,  // ....********....
+     0x000007F8,  // ......********..
+     0x0000001C,  // ............***.
+     0x0000000C,  // .............**.
+     0x0000600C,  // ..**.........**.
+     0x00007018,  // ..***.......**..
+     0x00003FF8,  // ...***********..
+     0x00000FE0,  // .....*******....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 170
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x000007C0,  // ......*****.....
+     0x00001FF0,  // ....*********...
+     0x00003838,  // ...***.....***..
+     0x00007018,  // ..***.......**..
+     0x00006018,  // ..**........**..
+     0x00006000,  // ..**............
+     0x00007000,  // ..***...........
+     0x00003E00,  // ...*****........
+     0x00000FC0,  // .....******.....
+     0x000001F0,  // ........*****...
+     0x00000078,  // ..........****..
+     0x0000001C,  // ............***.
+     0x0000000C,  // .............**.
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x00007838,  // ..****.....***..
+     0x00003FF0,  // ...**********...
+     0x00000FC0,  // .....******.....
+     0x00000380,  // .......***......
+     0x000000C0,  // .........**.....
+     0x000000C0,  // .........**.....
+     0x000007C0,  // ......*****.....
+  },
+  {             // 171
+     16, 28,
+     0x00001860,  // ....**....**....
+     0x00000CC0,  // .....**..**.....
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x0000FFFC,  // .**************.
+     0x0000FFFC,  // .**************.
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 172
+     15, 28,
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000001C,  // ...........***.
+     0x00000038,  // ..........***..
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00003800,  // ..***..........
+     0x00007000,  // .***...........
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 173
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 174
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000001C,  // ...........***.
+     0x00000038,  // ..........***..
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000003C0,  // ......****.....
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00007000,  // .***...........
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000001C,  // ...........***.
+     0x00000038,  // ..........***..
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00003800,  // ..***..........
+     0x00007000,  // .***...........
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 176
+     9, 28,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x00000198,  // .**..**..
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x00000198,  // .**..**..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 177
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000018,  // .........**..
+     0x000000F8,  // ......*****..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001C78,  // .***...****..
+     0x00000FDC,  // ..******.***.
+     0x000007EC,  // ...******.**.
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x000003E0,  // ....*****....
+  },
+  {             // 178
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000E,  // ....***
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003E,  // ..*****
+  },
+  {             // 179
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001C,  // ..***.
+     0x00000038,  // .***..
+     0x00000078,  // ****..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 180
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000C,  // ....**.
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000060,  // .**....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 181
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000608,  // ..**.....*..
+     0x00000608,  // ..**.....*..
+     0x00000610,  // ..**....*...
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 182
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F8,  // ..********..
+     0x00000E1C,  // .***....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000F80,  // .*****......
+     0x000007F0,  // ..*******...
+     0x000000F8,  // .....*****..
+     0x0000001C,  // ........***.
+     0x0000000C,  // .........**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 183
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000186,  // **....**
+     0x000000CC,  // .**..**.
+     0x00000078,  // ..****..
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 184
+     7, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000038,  // ..***..
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000007C,  // .*****.
+  },
+  {             // 185
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F0,  // ..*******...
+     0x00000E38,  // .***...***..
+     0x00000C18,  // .**.....**..
+     0x00000C00,  // .**.........
+     0x00000F80,  // .*****......
+     0x000007F0,  // ..*******...
+     0x000000F8,  // .....*****..
+     0x0000001C,  // ........***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000E1C,  // .***....***.
+     0x000007F8,  // ..********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 186
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x000007F8,  // ..********..
+     0x00000E1C,  // .***....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000F80,  // .*****......
+     0x000007F0,  // ..*******...
+     0x000000F8,  // .....*****..
+     0x0000001C,  // ........***.
+     0x0000000C,  // .........**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x000000E0,  // .....***....
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x000001F0,  // ....*****...
+  },
+  {             // 187
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000018,  // ..........**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C08,  // ...**......*..
+     0x00000C08,  // ...**......*..
+     0x00003F10,  // .******...*...
+     0x00003F00,  // .******.......
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000C00,  // ...**.........
+     0x00000F00,  // ...****.......
+     0x00000700,  // ....***.......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 188
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000380,  // ...***......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 189
+     9, 28,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000006C,  // ...**.**.
+     0x000000D8,  // ..**.**..
+     0x000001B0,  // .**.**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 190
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000380,  // ...***......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 191
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000380,  // ...***......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000E00,  // .***........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 192
+     17, 28,
+     0x00000180,  // .........**......
+     0x00000300,  // ........**.......
+     0x00000600,  // .......**........
+     0x00000C00,  // ......**.........
+     0x00000000,  // .................
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFF0,  // ..************...
+     0x0000FFE0,  // ..***********....
+     0x0000C070,  // ..**.......***...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 193
+     17, 28,
+     0x000000C0,  // ..........**.....
+     0x00000180,  // .........**......
+     0x00000300,  // ........**.......
+     0x00000600,  // .......**........
+     0x00000000,  // .................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00007FF0,  // ...***********...
+     0x00007FF0,  // ...***********...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 194
+     17, 28,
+     0x00000300,  // ........**.......
+     0x00000780,  // .......****......
+     0x00000CC0,  // ......**..**.....
+     0x00001860,  // .....**....**....
+     0x00000000,  // .................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00007FF0,  // ...***********...
+     0x00007FF0,  // ...***********...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 195
+     17, 28,
+     0x00002040,  // ....*......*.....
+     0x000030C0,  // ....**....**.....
+     0x00001F80,  // .....******......
+     0x00000F00,  // ......****.......
+     0x00000000,  // .................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00007FF0,  // ...***********...
+     0x00007FF0,  // ...***********...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 196
+     17, 28,
+     0x00000000,  // .................
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00003060,  // ....**.....**....
+     0x00006030,  // ...**.......**...
+     0x00007FF0,  // ...***********...
+     0x00007FF0,  // ...***********...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 197
+     14, 28,
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000600,  // ....**........
+     0x00000C00,  // ...**.........
+     0x00000000,  // ..............
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 198
+     18, 28,
+     0x00000180,  // ..........**......
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000C00,  // .......**.........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x00038018,  // .***..........**..
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x0003000C,  // .**............**.
+     0x0003800C,  // .***...........**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 199
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x00038018,  // .***..........**..
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x0003000C,  // .**............**.
+     0x0003800C,  // .***...........**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000E00,  // .......***........
+     0x00000300,  // .........**.......
+     0x00000300,  // .........**.......
+     0x00001F00,  // ......*****.......
+  },
+  {             // 200
+     18, 28,
+     0x000030C0,  // .....**....**.....
+     0x00001980,  // ......**..**......
+     0x00000F00,  // .......****.......
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x00038018,  // .***..........**..
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x0003000C,  // .**............**.
+     0x0003800C,  // .***...........**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 201
+     16, 28,
+     0x000000C0,  // .........**.....
+     0x00000180,  // ........**......
+     0x00000300,  // .......**.......
+     0x00000600,  // ......**........
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF0,  // ..***********...
+     0x00007FF0,  // ..***********...
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 202
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF0,  // ..***********...
+     0x00007FF0,  // ..***********...
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000600,  // ......**........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000F80,  // .....*****......
+  },
+  {             // 203
+     16, 28,
+     0x00000000,  // ................
+     0x00000CC0,  // .....**..**.....
+     0x00000CC0,  // .....**..**.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF0,  // ..***********...
+     0x00007FF0,  // ..***********...
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 204
+     16, 28,
+     0x000030C0,  // ...**....**.....
+     0x00001980,  // ....**..**......
+     0x00000F00,  // .....****.......
+     0x00000600,  // ......**........
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF0,  // ..***********...
+     0x00007FF0,  // ..***********...
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 205
+     8, 28,
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 206
+     8, 28,
+     0x00000030,  // ...**...
+     0x00000078,  // ..****..
+     0x000000CC,  // .**..**.
+     0x00000186,  // **....**
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 207
+     18, 28,
+     0x000030C0,  // .....**....**.....
+     0x00001980,  // ......**..**......
+     0x00000F00,  // .......****.......
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x0001FF80,  // ..**********......
+     0x0001FFE0,  // ..************....
+     0x000180F0,  // ..**.......****...
+     0x00018038,  // ..**.........***..
+     0x00018018,  // ..**..........**..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001801C,  // ..**..........***.
+     0x00018018,  // ..**..........**..
+     0x00018038,  // ..**.........***..
+     0x000180F0,  // ..**.......****...
+     0x0001FFE0,  // ..************....
+     0x0001FF80,  // ..**********......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 208
+     18, 28,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0001FF80,  // ..**********......
+     0x0001FFE0,  // ..************....
+     0x000180F0,  // ..**.......****...
+     0x00018038,  // ..**.........***..
+     0x00018018,  // ..**..........**..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0007F80C,  // ********.......**.
+     0x0007F80C,  // ********.......**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001801C,  // ..**..........***.
+     0x00018018,  // ..**..........**..
+     0x00018038,  // ..**.........***..
+     0x000180F0,  // ..**.......****...
+     0x0001FFE0,  // ..************....
+     0x0001FF80,  // ..**********......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 209
+     18, 28,
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000C00,  // .......**.........
+     0x00001800,  // ......**..........
+     0x00000000,  // ..................
+     0x0001C018,  // ..***.........**..
+     0x0001E018,  // ..****........**..
+     0x0001E018,  // ..****........**..
+     0x0001B018,  // ..**.**.......**..
+     0x0001B818,  // ..**.***......**..
+     0x00019818,  // ..**..**......**..
+     0x00019C18,  // ..**..***.....**..
+     0x00018C18,  // ..**...**.....**..
+     0x00018E18,  // ..**...***....**..
+     0x00018618,  // ..**....**....**..
+     0x00018718,  // ..**....***...**..
+     0x00018318,  // ..**.....**...**..
+     0x00018398,  // ..**.....***..**..
+     0x00018198,  // ..**......**..**..
+     0x000181D8,  // ..**......***.**..
+     0x000180D8,  // ..**.......**.**..
+     0x00018078,  // ..**........****..
+     0x00018078,  // ..**........****..
+     0x00018038,  // ..**.........***..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 210
+     18, 28,
+     0x00006180,  // ....**....**......
+     0x00003300,  // .....**..**.......
+     0x00001E00,  // ......****........
+     0x00000C00,  // .......**.........
+     0x00000000,  // ..................
+     0x0001C018,  // ..***.........**..
+     0x0001E018,  // ..****........**..
+     0x0001E018,  // ..****........**..
+     0x0001B018,  // ..**.**.......**..
+     0x0001B818,  // ..**.***......**..
+     0x00019818,  // ..**..**......**..
+     0x00019C18,  // ..**..***.....**..
+     0x00018C18,  // ..**...**.....**..
+     0x00018E18,  // ..**...***....**..
+     0x00018618,  // ..**....**....**..
+     0x00018718,  // ..**....***...**..
+     0x00018318,  // ..**.....**...**..
+     0x00018398,  // ..**.....***..**..
+     0x00018198,  // ..**......**..**..
+     0x000181D8,  // ..**......***.**..
+     0x000180D8,  // ..**.......**.**..
+     0x00018078,  // ..**........****..
+     0x00018078,  // ..**........****..
+     0x00018038,  // ..**.........***..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 211
+     18, 28,
+     0x000000C0,  // ...........**.....
+     0x00000180,  // ..........**......
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003801C,  // .***..........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 212
+     18, 28,
+     0x00000600,  // ........**........
+     0x00000F00,  // .......****.......
+     0x00001980,  // ......**..**......
+     0x000030C0,  // .....**....**.....
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003801C,  // .***..........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 213
+     18, 28,
+     0x00000000,  // ..................
+     0x000006C0,  // ........**.**.....
+     0x00000D80,  // .......**.**......
+     0x00001B00,  // ......**.**.......
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003801C,  // .***..........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 214
+     18, 28,
+     0x00000000,  // ..................
+     0x00001980,  // ......**..**......
+     0x00001980,  // ......**..**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F0F0,  // ...****....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003801C,  // .***..........***.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000F0F0,  // ...****....****...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 215
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000600C,  // **.........**.
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00000C60,  // ...**...**....
+     0x000006C0,  // ....**.**.....
+     0x00000380,  // .....***......
+     0x00000380,  // .....***......
+     0x000006C0,  // ....**.**.....
+     0x00000C60,  // ...**...**....
+     0x00001830,  // ..**.....**...
+     0x00003018,  // .**.......**..
+     0x0000600C,  // **.........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 216
+     17, 28,
+     0x000030C0,  // ....**....**.....
+     0x00001980,  // .....**..**......
+     0x00000F00,  // ......****.......
+     0x00000600,  // .......**........
+     0x00000000,  // .................
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFF0,  // ..************...
+     0x0000FFE0,  // ..***********....
+     0x0000C070,  // ..**.......***...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 217
+     18, 28,
+     0x00000F00,  // .......****.......
+     0x00000900,  // .......*..*.......
+     0x00000F00,  // .......****.......
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0000C030,  // ...**........**...
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 218
+     18, 28,
+     0x000000C0,  // ...........**.....
+     0x00000180,  // ..........**......
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0000C030,  // ...**........**...
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 219
+     18, 28,
+     0x00000000,  // ..................
+     0x000006C0,  // ........**.**.....
+     0x00000D80,  // .......**.**......
+     0x00001B00,  // ......**.**.......
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0000C030,  // ...**........**...
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 220
+     18, 28,
+     0x00000000,  // ..................
+     0x00001980,  // ......**..**......
+     0x00001980,  // ......**..**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x00018018,  // ..**..........**..
+     0x0000C030,  // ...**........**...
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 221
+     16, 28,
+     0x00000060,  // ..........**....
+     0x000000C0,  // .........**.....
+     0x00000180,  // ........**......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x00006018,  // ..**........**..
+     0x00007038,  // ..***......***..
+     0x00003030,  // ...**......**...
+     0x00003870,  // ...***....***...
+     0x00001860,  // ....**....**....
+     0x00001CE0,  // ....***..***....
+     0x00000CC0,  // .....**..**.....
+     0x00000FC0,  // .....******.....
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 222
+     16, 28,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000FFFC,  // .**************.
+     0x0000FFFC,  // .**************.
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000380,  // .......***......
+     0x000000C0,  // .........**.....
+     0x000000C0,  // .........**.....
+     0x000007C0,  // ......*****.....
+  },
+  {             // 223
+     15, 28,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000FE0,  // ....*******....
+     0x00001C60,  // ...***...**....
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00001860,  // ...**....**....
+     0x000018E0,  // ...**...***....
+     0x000019C0,  // ...**..***.....
+     0x000019E0,  // ...**..****....
+     0x00001870,  // ...**....***...
+     0x00001830,  // ...**.....**...
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001830,  // ...**.....**...
+     0x00001870,  // ...**....***...
+     0x000019E0,  // ...**..****....
+     0x000019C0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     9, 28,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x000000CC,  // ..**..**.
+     0x000000DC,  // ..**.***.
+     0x000000FC,  // ..******.
+     0x000000E0,  // ..***....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 225
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000018,  // .........**..
+     0x000000F8,  // ......*****..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001C78,  // .***...****..
+     0x00000FDC,  // ..******.***.
+     0x0000078C,  // ...****...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 226
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000001E0,  // .....****....
+     0x00000330,  // ....**..**...
+     0x00000618,  // ...**....**..
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000018,  // .........**..
+     0x000000F8,  // ......*****..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001C78,  // .***...****..
+     0x00000FDC,  // ..******.***.
+     0x0000078C,  // ...****...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 227
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000408,  // ...*......*..
+     0x00000618,  // ...**....**..
+     0x000003F0,  // ....******...
+     0x000001E0,  // .....****....
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000018,  // .........**..
+     0x000000F8,  // ......*****..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001C78,  // .***...****..
+     0x00000FDC,  // ..******.***.
+     0x0000078C,  // ...****...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 228
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000330,  // ....**..**...
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x00000018,  // .........**..
+     0x000000F8,  // ......*****..
+     0x000007F8,  // ...********..
+     0x00000F18,  // ..****...**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001C78,  // .***...****..
+     0x00000FDC,  // ..******.***.
+     0x0000078C,  // ...****...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     6, 28,
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 230
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 231
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x000001C0,  // ....***.....
+     0x00000060,  // ......**....
+     0x00000060,  // ......**....
+     0x000003E0,  // ...*****....
+  },
+  {             // 232
+     12, 28,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000618,  // ..**....**..
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x0000071C,  // ..***...***.
+     0x0000060C,  // ..**.....**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x0000060C,  // ..**.....**.
+     0x0000071C,  // ..***...***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 233
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001E0,  // .....****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 234
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001E0,  // .....****....
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x000003E0,  // ....*****....
+  },
+  {             // 235
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000330,  // ....**..**...
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001E0,  // .....****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 236
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000618,  // ...**....**..
+     0x00000330,  // ....**..**...
+     0x000001E0,  // .....****....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001E0,  // .....****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 237
+     6, 28,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 238
+     6, 28,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ...**...
+     0x00000078,  // ..****..
+     0x000000CC,  // .**..**.
+     0x00000186,  // **....**
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 239
+     19, 28,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000318,  // ..........**...**..
+     0x00000318,  // ..........**...**..
+     0x00000318,  // ..........**...**..
+     0x00000308,  // ..........**....*..
+     0x00000308,  // ..........**....*..
+     0x0000F310,  // ....****..**...*...
+     0x0001FB00,  // ...******.**.......
+     0x00038F00,  // ..***...****.......
+     0x00030700,  // ..**.....***.......
+     0x00060300,  // .**.......**.......
+     0x00060300,  // .**.......**.......
+     0x00060300,  // .**.......**.......
+     0x00060300,  // .**.......**.......
+     0x00060300,  // .**.......**.......
+     0x00060300,  // .**.......**.......
+     0x00030700,  // ..**.....***.......
+     0x00038F00,  // ..***...****.......
+     0x0001FB00,  // ...******.**.......
+     0x0000F300,  // ....****..**.......
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 240
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x00000018,  // ..........**..
+     0x000001F8,  // ......******..
+     0x000001F8,  // ......******..
+     0x00000798,  // ....****..**..
+     0x00000FD8,  // ...******.**..
+     0x00001C78,  // ..***...****..
+     0x00001838,  // ..**.....***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001838,  // ..**.....***..
+     0x00001C78,  // ..***...****..
+     0x00000FD8,  // ...******.**..
+     0x00000798,  // ....****..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 241
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x000019C0,  // ..**..***.....
+     0x00001BF0,  // ..**.******...
+     0x00001E30,  // ..****...**...
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 242
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x000019C0,  // ..**..***.....
+     0x00001BF0,  // ..**.******...
+     0x00001E30,  // ..****...**...
+     0x00001C18,  // ..***.....**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 243
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 244
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000001E0,  // .....****....
+     0x00000330,  // ....**..**...
+     0x00000618,  // ...**....**..
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 245
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000D8,  // ......**.**..
+     0x000001B0,  // .....**.**...
+     0x00000360,  // ....**.**....
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 246
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 247
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 248
+     9, 28,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000186,  // .**....**
+     0x000000CC,  // ..**..**.
+     0x00000078,  // ...****..
+     0x00000030,  // ....**...
+     0x00000000,  // .........
+     0x000000CC,  // ..**..**.
+     0x000000DC,  // ..**.***.
+     0x000000FC,  // ..******.
+     0x000000E0,  // ..***....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 249
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x00000240,  // .....*..*.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00000C78,  // ...**...****..
+     0x00000FD8,  // ...******.**..
+     0x00000398,  // .....***..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 250
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000030,  // .........**...
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00000C78,  // ...**...****..
+     0x00000FD8,  // ...******.**..
+     0x00000398,  // .....***..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 251
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001B0,  // ......**.**...
+     0x00000360,  // .....**.**....
+     0x000006C0,  // ....**.**.....
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00000C78,  // ...**...****..
+     0x00000FD8,  // ...******.**..
+     0x00000398,  // .....***..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 252
+     14, 28,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001838,  // ..**.....***..
+     0x00000C78,  // ...**...****..
+     0x00000FD8,  // ...******.**..
+     0x00000398,  // .....***..**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 253
+     13, 28,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x0000180C,  // .**.......**.
+     0x00001C18,  // .***.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x000001E0,  // .....****....
+     0x000001C0,  // .....***.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000F00,  // ..****.......
+  },
+  {             // 254
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x0000003C,  // ...****.
+     0x0000003C,  // ...****.
+     0x00000038,  // ...***..
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000007C,  // ..*****.
+  },
+  {             // 255
+     8, 28,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  };
diff --git a/fontosd-iso8859-7.c b/fontosd-iso8859-7.c
index 228feedc1..f0ec08c01 100644
--- a/fontosd-iso8859-7.c
+++ b/fontosd-iso8859-7.c
@@ -1,6 +1,8 @@
-cFont::tPixelData FontOsd_iso8859_7[][25] = {
+cFont::tPixelData FontOsd_iso8859_7[][27] = {
   {             // 32
-     12, 23,
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -26,299 +28,2471 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // ............
   },
   {             // 33
-     12, 23,
-     0x00000000,  // ............
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 34
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CE,  // .**..***
+     0x000000CE,  // .**..***
+     0x000000CE,  // .**..***
+     0x000000CE,  // .**..***
+     0x000000CE,  // .**..***
+     0x000000C4,  // .**...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000010C,  // .....*....**.
+     0x0000030C,  // ....**....**.
+     0x00000308,  // ....**....*..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00003FFE,  // *************
+     0x00003FFE,  // *************
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000430,  // ...*....**...
+     0x00003FFE,  // *************
+     0x00003FFE,  // *************
+     0x00000C60,  // ..**...**....
+     0x00000C60,  // ..**...**....
+     0x00000860,  // ..*....**....
+     0x00001840,  // .**....*.....
+     0x00001840,  // .**....*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 36
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000007F0,  // ...*******...
+     0x00000FF8,  // ..*********..
+     0x00001CCC,  // .***..**..**.
+     0x000018CC,  // .**...**..**.
+     0x000018C0,  // .**...**.....
+     0x00001CC0,  // .***..**.....
+     0x00000EC0,  // ..***.**.....
+     0x000007E0,  // ...******....
+     0x000003F8,  // ....*******..
+     0x000000F8,  // ......*****..
+     0x000000CC,  // ......**..**.
+     0x000000CC,  // ......**..**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x00000CCC,  // ..**..**..**.
+     0x00000FF8,  // ..*********..
+     0x000007F0,  // ...*******...
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     21, 25,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00078040,  // ...****........*.....
+     0x000FC0C0,  // ..******......**.....
+     0x00186080,  // .**....**.....*......
+     0x00186180,  // .**....**....**......
+     0x00186100,  // .**....**....*.......
+     0x00186300,  // .**....**...**.......
+     0x00186200,  // .**....**...*........
+     0x000CC600,  // ..**..**...**........
+     0x000FC400,  // ..******...*.........
+     0x00000C70,  // ..........**...***...
+     0x000008F8,  // ..........*...*****..
+     0x0000198C,  // .........**..**...**.
+     0x0000118C,  // .........*...**...**.
+     0x0000318C,  // ........**...**...**.
+     0x0000618C,  // .......**....**...**.
+     0x0000618C,  // .......**....**...**.
+     0x0000C0C8,  // ......**......**..*..
+     0x0000C0F8,  // ......**......*****..
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+  },
+  {             // 38
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000F80,  // .....*****......
+     0x00001FC0,  // ....*******.....
+     0x000038E0,  // ...***...***....
+     0x00003060,  // ...**.....**....
+     0x000030E0,  // ...**....***....
+     0x000038C0,  // ...***...**.....
+     0x00001FC0,  // ....*******.....
+     0x00000F00,  // .....****.......
+     0x00001F00,  // ....*****.......
+     0x00007780,  // ..***.****......
+     0x000063D8,  // ..**...****.**..
+     0x0000C1D8,  // .**.....***.**..
+     0x0000C0F8,  // .**......*****..
+     0x0000C070,  // .**.......***...
+     0x0000E078,  // .***......****..
+     0x000070FC,  // ..***....******.
+     0x00003FCE,  // ...********..***
+     0x00001F04,  // ....*****.....*.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 39
+     4, 25,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 40
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000008,  // .....*..
+     0x00000018,  // ....**..
+     0x00000010,  // ....*...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000008,  // .....*..
+  },
+  {             // 41
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000040,  // ..*.....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000040,  // ..*.....
+     0x00000000,  // ........
+  },
+  {             // 42
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x000001FE,  // .********
+     0x000000FC,  // ..******.
+     0x00000038,  // ....***..
+     0x00000058,  // ...*.**..
+     0x000000CC,  // ..**..**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 44
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x00000010,  // ...*...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 45
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 46
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 47
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000004,  // .....*.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000008,  // ....*..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000020,  // ..*....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000040,  // .*.....
+     0x00000040,  // .*.....
+     0x000000C0,  // **.....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x00000C18,  // ..**.....**..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x000000E0,  // ......***....
+     0x000003E0,  // ....*****....
+     0x00000760,  // ...***.**....
+     0x00000460,  // ...*...**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F8,  // ...********..
+     0x00000C18,  // ..**.....**..
+     0x00001C0C,  // .***......**.
+     0x0000180C,  // .**.......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000001C0,  // .....***.....
+     0x00000380,  // ....***......
+     0x00000600,  // ...**........
+     0x00000C00,  // ..**.........
+     0x00000800,  // ..*..........
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F8,  // ...********..
+     0x00000E7C,  // ..***..*****.
+     0x00000C3C,  // ..**....****.
+     0x0000083C,  // ..*.....****.
+     0x0000003C,  // ........****.
+     0x0000003C,  // ........****.
+     0x00000078,  // .......****..
+     0x000001E0,  // .....****....
+     0x000000F8,  // ......*****..
+     0x0000001C,  // .........***.
+     0x0000001E,  // .........****
+     0x0000000E,  // ..........***
+     0x0000001E,  // .........****
+     0x00000C1E,  // ..**.....****
+     0x00000C3C,  // ..**....****.
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000070,  // .......***...
+     0x00000070,  // .......***...
+     0x000000F0,  // ......****...
+     0x000001B0,  // .....**.**...
+     0x000003B0,  // ....***.**...
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000E30,  // ..***...**...
+     0x00000C30,  // ..**....**...
+     0x00001830,  // .**.....**...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003FC,  // ....********.
+     0x000003FC,  // ....********.
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x000006F0,  // ...**.****...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x0000000E,  // ..........***
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000C06,  // ..**.......**
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001F0,  // .....*****...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000003FC,  // ....********.
+     0x0000061C,  // ...**....***.
+     0x00000C0E,  // ..**......***
+     0x00000C0E,  // ..**......***
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x000019F0,  // .**..*****...
+     0x00001BF8,  // .**.*******..
+     0x00001C1C,  // .***.....***.
+     0x00001C0E,  // .***......***
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00000C0E,  // ..**......***
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000001F0,  // .....*****...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FF8,  // .**********..
+     0x00001FF8,  // .**********..
+     0x00000030,  // ........**...
+     0x00000070,  // .......***...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007FC,  // ...*********.
+     0x00000E0E,  // ..***.....***
+     0x00000C0E,  // ..**......***
+     0x00000C0E,  // ..**......***
+     0x00000C0E,  // ..**......***
+     0x0000061C,  // ...**....***.
+     0x000003F8,  // ....*******..
+     0x000007F8,  // ...********..
+     0x0000060C,  // ...**.....**.
+     0x00000E06,  // ..***......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000E06,  // ..***......**
+     0x0000070C,  // ...***....**.
+     0x000003F8,  // ....*******..
+     0x000001F0,  // .....*****...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x0000180E,  // .**.......***
+     0x0000180E,  // .**.......***
+     0x0000180E,  // .**.......***
+     0x0000180E,  // .**.......***
+     0x00001C0E,  // .***......***
+     0x00000E1E,  // ..***....****
+     0x000007F6,  // ...*******.**
+     0x000003E6,  // ....*****..**
+     0x0000000E,  // ..........***
+     0x0000000C,  // ..........**.
+     0x00000C0C,  // ..**......**.
+     0x00000C18,  // ..**.....**..
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 59
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x00000010,  // ...*...
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 60
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000008,  // ...........*..
+     0x00000038,  // .........***..
+     0x000000F0,  // .......****...
+     0x000007C0,  // ....*****.....
+     0x00001E00,  // ..****........
+     0x00003800,  // .***..........
+     0x00003E00,  // .*****........
+     0x00000F80,  // ...*****......
+     0x000001E0,  // ......****....
+     0x00000078,  // ........****..
+     0x00000018,  // ..........**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 61
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FF8,  // .***********..
+     0x00003FF8,  // .***********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FF8,  // .***********..
+     0x00003FF8,  // .***********..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 62
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00002000,  // .*............
+     0x00003C00,  // .****.........
+     0x00001F00,  // ..*****.......
+     0x000003E0,  // .....*****....
+     0x000000F8,  // .......*****..
+     0x00000018,  // ..........**..
+     0x00000078,  // ........****..
+     0x000001E0,  // ......****....
+     0x00000F80,  // ...*****......
+     0x00003E00,  // .*****........
+     0x00003000,  // .**...........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 63
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F8,  // ...********..
+     0x00000E18,  // ..***....**..
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000038,  // ........***..
+     0x00000070,  // .......***...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     24, 25,
+     0x00000000,  // ........................
+     0x00000000,  // ........................
+     0x0000FE00,  // .........*******........
+     0x0003FFC0,  // .......************.....
+     0x000F01E0,  // .....****.......****....
+     0x001C0070,  // ....***...........***...
+     0x00380038,  // ...***.............***..
+     0x00307998,  // ...**.....****..**..**..
+     0x0070FD8C,  // ..***....******.**...**.
+     0x0061870C,  // ..**....**....***....**.
+     0x0063030C,  // ..**...**......**....**.
+     0x00C3030C,  // .**....**......**....**.
+     0x00C6030C,  // .**...**.......**....**.
+     0x00C6030C,  // .**...**.......**....**.
+     0x00C60608,  // .**...**......**.....*..
+     0x00C60618,  // .**...**......**....**..
+     0x00C60E30,  // .**...**.....***...**...
+     0x00E31E70,  // .***...**...****..***...
+     0x0063FFC0,  // ..**...************.....
+     0x0070E780,  // ..***....***..****......
+     0x0038000C,  // ...***...............**.
+     0x001C0038,  // ....***............***..
+     0x000F00F0,  // .....****........****...
+     0x0007FFE0,  // ......**************....
+     0x0000FF00,  // .........********.......
+  },
+  {             // 65
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00000DC0,  // ......**.***.....
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00001860,  // .....**....**....
+     0x00003060,  // ....**.....**....
+     0x00003070,  // ....**.....***...
+     0x00007FF0,  // ...***********...
+     0x00007FF8,  // ...************..
+     0x00006038,  // ...**.......***..
+     0x0000E018,  // ..***........**..
+     0x0000C01C,  // ..**.........***.
+     0x0000C00C,  // ..**..........**.
+     0x0001C00E,  // .***..........***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 66
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FC0,  // ..*********.....
+     0x00007FF0,  // ..***********...
+     0x00006038,  // ..**.......***..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006030,  // ..**.......**...
+     0x00007FE0,  // ..**********....
+     0x00007FF0,  // ..***********...
+     0x00006038,  // ..**.......***..
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00007FF0,  // ..***********...
+     0x00007FE0,  // ..**********....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 67
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000F80,  // ......*****......
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0001C000,  // .***.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x0001C018,  // .***.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000E030,  // ..***.......**...
+     0x00007070,  // ...***.....***...
+     0x00003FE0,  // ....*********....
+     0x00000F80,  // ......*****......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 68
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFC0,  // ..**********.....
+     0x0000FFE0,  // ..***********....
+     0x0000C070,  // ..**.......***...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C01C,  // ..**.........***.
+     0x0000C01C,  // ..**.........***.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C01C,  // ..**.........***.
+     0x0000C018,  // ..**.........**..
+     0x0000C038,  // ..**........***..
+     0x0000C070,  // ..**.......***...
+     0x0000FFE0,  // ..***********....
+     0x0000FF80,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 69
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FC0,  // ..*********.....
+     0x00007FC0,  // ..*********.....
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 70
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FF0,  // ..*********...
+     0x00001FF0,  // ..*********...
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x0000F078,  // ...****.....****..
+     0x0000C038,  // ...**........***..
+     0x0001801C,  // ..**..........***.
+     0x00018000,  // ..**..............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x000300FC,  // .**........******.
+     0x000300FC,  // .**........******.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0000C01C,  // ...**.........***.
+     0x0000F078,  // ...****.....****..
+     0x00003FF0,  // .....**********...
+     0x00000FC0,  // .......******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 72
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000FFFC,  // ..**************.
+     0x0000FFFC,  // ..**************.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 73
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 74
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
      0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000E38,  // .***...***..
+     0x000007F0,  // ..*******...
+     0x000003E0,  // ...*****....
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
-  {             // 34
-     12, 23,
+  {             // 75
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00006070,  // ..**......***...
+     0x000060E0,  // ..**.....***....
+     0x000061C0,  // ..**....***.....
+     0x00006380,  // ..**...***......
+     0x00006700,  // ..**..***.......
+     0x00006F00,  // ..**.****.......
+     0x00007F00,  // ..*******.......
+     0x00007B80,  // ..****.***......
+     0x000071C0,  // ..***...***.....
+     0x000060E0,  // ..**.....***....
+     0x000060E0,  // ..**.....***....
+     0x00006070,  // ..**......***...
+     0x00006038,  // ..**.......***..
+     0x00006038,  // ..**.......***..
+     0x0000601C,  // ..**........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 76
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 77
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0001C01C,  // ..***.........***.
+     0x0001E03C,  // ..****.......****.
+     0x0001E03C,  // ..****.......****.
+     0x0001F07C,  // ..*****.....*****.
+     0x0001B06C,  // ..**.**.....**.**.
+     0x0001B8EC,  // ..**.***...***.**.
+     0x000198CC,  // ..**..**...**..**.
+     0x00019DCC,  // ..**..***.***..**.
+     0x00018D8C,  // ..**...**.**...**.
+     0x00018F8C,  // ..**...*****...**.
+     0x0001870C,  // ..**....***....**.
+     0x0001870C,  // ..**....***....**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 78
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000E00C,  // ..***.........**.
+     0x0000E00C,  // ..***.........**.
+     0x0000F00C,  // ..****........**.
+     0x0000F80C,  // ..*****.......**.
+     0x0000D80C,  // ..**.**.......**.
+     0x0000DC0C,  // ..**.***......**.
+     0x0000CE0C,  // ..**..***.....**.
+     0x0000C70C,  // ..**...***....**.
+     0x0000C70C,  // ..**...***....**.
+     0x0000C38C,  // ..**....***...**.
+     0x0000C1CC,  // ..**.....***..**.
+     0x0000C0CC,  // ..**......**..**.
+     0x0000C0EC,  // ..**......***.**.
+     0x0000C07C,  // ..**.......*****.
+     0x0000C03C,  // ..**........****.
+     0x0000C03C,  // ..**........****.
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 79
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x0000F078,  // ...****.....****..
+     0x0000C038,  // ...**........***..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x00030006,  // .**.............**
+     0x00030006,  // .**.............**
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x0001800C,  // ..**...........**.
+     0x0001801C,  // ..**..........***.
+     0x0000C018,  // ...**.........**..
+     0x0000F078,  // ...****.....****..
+     0x00003FE0,  // .....*********....
+     0x00001FC0,  // ......*******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FE0,  // ..**********....
+     0x00007FF8,  // ..************..
+     0x0000603C,  // ..**.......****.
+     0x0000601C,  // ..**........***.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00007FF8,  // ..************..
+     0x00007FE0,  // ..**********....
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 81
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x0000F078,  // ...****.....****..
+     0x0000C038,  // ...**........***..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x00030006,  // .**.............**
+     0x00030006,  // .**.............**
+     0x00030006,  // .**.............**
+     0x0003000E,  // .**............***
+     0x0001800C,  // ..**...........**.
+     0x0001819C,  // ..**......**..***.
+     0x0000C1DC,  // ...**.....***.***.
+     0x0000F078,  // ...****.....****..
+     0x00007FF8,  // ....************..
+     0x00001F8E,  // ......******...***
+     0x00000004,  // ................*.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFE0,  // ..***********....
+     0x0000FFF8,  // ..*************..
+     0x0000C01C,  // ..**.........***.
+     0x0000C01C,  // ..**.........***.
+     0x0000C00C,  // ..**..........**.
+     0x0000C01C,  // ..**.........***.
+     0x0000C03C,  // ..**........****.
+     0x0000FFF8,  // ..*************..
+     0x0000FFE0,  // ..***********....
+     0x0000C1C0,  // ..**.....***.....
+     0x0000C0C0,  // ..**......**.....
+     0x0000C0E0,  // ..**......***....
+     0x0000C070,  // ..**.......***...
+     0x0000C030,  // ..**........**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 83
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000FE0,  // .....*******....
+     0x00001FF0,  // ....*********...
+     0x00003838,  // ...***.....***..
+     0x0000601C,  // ..**........***.
+     0x0000600C,  // ..**.........**.
+     0x00006000,  // ..**............
+     0x00007000,  // ..***...........
+     0x00003E00,  // ...*****........
+     0x00001FE0,  // ....********....
+     0x000003F8,  // .......*******..
+     0x00000038,  // ...........***..
+     0x0000000C,  // .............**.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000700C,  // ..***........**.
+     0x00003818,  // ...***......**..
+     0x00001FF0,  // ....*********...
+     0x000007E0,  // ......******....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 84
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C01C,  // ..**.........***.
+     0x0000C01C,  // ..**.........***.
+     0x0000E018,  // ..***........**..
+     0x00007038,  // ...***......***..
+     0x00003FF0,  // ....**********...
+     0x00000FC0,  // ......******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 86
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001C00C,  // ***..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000C01C,  // .**.........***.
+     0x0000E018,  // .***........**..
+     0x00006018,  // ..**........**..
+     0x00006030,  // ..**.......**...
+     0x00003030,  // ...**......**...
+     0x00003070,  // ...**.....***...
+     0x00003860,  // ...***....**....
+     0x00001860,  // ....**....**....
+     0x000018C0,  // ....**...**.....
+     0x00001CC0,  // ....***..**.....
+     0x00000CC0,  // .....**..**.....
+     0x00000D80,  // .....**.**......
+     0x00000780,  // ......****......
+     0x00000700,  // ......***.......
+     0x00000700,  // ......***.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 87
+     22, 25,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00701C06,  // ***.......***.......**
+     0x00303C0E,  // .**......****......***
+     0x00303C0C,  // .**......****......**.
+     0x00303E0C,  // .**......*****.....**.
+     0x0038360C,  // .***.....**.**.....**.
+     0x00186618,  // ..**....**..**....**..
+     0x00186618,  // ..**....**..**....**..
+     0x00186318,  // ..**....**...**...**..
+     0x001CC318,  // ..***..**....**...**..
+     0x000CC330,  // ...**..**....**..**...
+     0x000CC3B0,  // ...**..**....***.**...
+     0x000CC1B0,  // ...**..**.....**.**...
+     0x000581B0,  // ....*.**......**.**...
+     0x000781E0,  // ....****......****....
+     0x000781E0,  // ....****......****....
+     0x000700E0,  // ....***........***....
+     0x000300C0,  // .....**........**.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000E01C,  // .***........***.
+     0x00007018,  // ..***.......**..
+     0x00003030,  // ...**......**...
+     0x00003870,  // ...***....***...
+     0x00001CE0,  // ....***..***....
+     0x00000CC0,  // .....**..**.....
+     0x00000F80,  // .....*****......
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000DC0,  // .....**.***.....
+     0x00001CE0,  // ....***..***....
+     0x00003860,  // ...***....**....
+     0x00003070,  // ...**.....***...
+     0x00007038,  // ..***......***..
+     0x0000E018,  // .***........**..
+     0x0001C01C,  // ***.........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 89
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000E00C,  // .***.........**.
+     0x0000E01C,  // .***........***.
+     0x00007018,  // ..***.......**..
+     0x00003030,  // ...**......**...
+     0x00003870,  // ...***....***...
+     0x00001C60,  // ....***...**....
+     0x00000CC0,  // .....**..**.....
+     0x00000FC0,  // .....******.....
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 90
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFE,  // .*************
+     0x00003FFC,  // .************.
+     0x0000000C,  // ...........**.
+     0x00000018,  // ..........**..
+     0x00000030,  // .........**...
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00001C00,  // ..***.........
+     0x00001800,  // ..**..........
+     0x00003000,  // .**...........
+     0x00007FFC,  // *************.
+     0x00007FFC,  // *************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 91
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000003E,  // ..*****
+     0x0000003E,  // ..*****
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003E,  // ..*****
+     0x0000003E,  // ..*****
+  },
+  {             // 92
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x00000040,  // .*.....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000020,  // ..*....
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000010,  // ...*...
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000008,  // ....*..
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000004,  // .....*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 93
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x0000007C,  // .*****.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000007C,  // .*****.
+     0x0000007C,  // .*****.
+  },
+  {             // 94
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000000A0,  // ....*.*....
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x00000318,  // ..**...**..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 95
+     13, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+  },
+  {             // 96
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000E0,  // .***....
+     0x00000070,  // ..***...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 97
+     13, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00001FF0,  // ..*********...
+     0x00003838,  // .***.....***..
+     0x00003018,  // .**.......**..
+     0x00000018,  // ..........**..
+     0x000001F8,  // ......******..
+     0x00000FD8,  // ...******.**..
+     0x00003C18,  // .****.....**..
+     0x00003018,  // .**.......**..
+     0x00003038,  // .**......***..
+     0x00003878,  // .***....****..
+     0x00001FD8,  // ..*******.**..
+     0x00000F9C,  // ...*****..***.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 98
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000DF0,  // ..**.*****...
+     0x00000FF8,  // ..*********..
+     0x00000E1C,  // ..***....***.
+     0x00000E0E,  // ..***.....***
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000E0C,  // ..***.....**.
+     0x00000E1C,  // ..***....***.
+     0x00000FF8,  // ..*********..
+     0x00000CF0,  // ..**..****...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 99
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000738,  // ..***..***..
-     0x00000738,  // ..***..***..
-     0x00000738,  // ..***..***..
-     0x00000738,  // ..***..***..
-     0x00000210,  // ...*....*...
-     0x00000210,  // ...*....*...
-     0x00000210,  // ...*....*...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000003F8,  // ...*******..
+     0x0000061C,  // ..**....***.
+     0x00000E0C,  // .***.....**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x0000061C,  // ..**....***.
+     0x000003F8,  // ...*******..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+  },
+  {             // 100
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x000003CC,  // ....****..**.
+     0x000007FC,  // ...*********.
+     0x00000C1C,  // ..**.....***.
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000E1C,  // ..***....***.
+     0x000007FC,  // ...*********.
+     0x000003CC,  // ....****..**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 101
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F8,  // ...********..
+     0x00000C18,  // ..**.....**..
+     0x0000080C,  // ..*.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001C0C,  // .***......**.
+     0x00000E18,  // ..***....**..
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 102
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000000C,  // ....**.
+     0x0000001C,  // ...***.
+     0x00000038,  // ..***..
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x000000FC,  // ******.
+     0x000000FC,  // ******.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 103
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003EC,  // ....*****.**.
+     0x000007FC,  // ...*********.
+     0x00000C1C,  // ..**.....***.
+     0x00000C1C,  // ..**.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C1C,  // ..**.....***.
+     0x000007FC,  // ...*********.
+     0x000003CC,  // ....****..**.
+     0x0000000C,  // ..........**.
+     0x0000181C,  // .**......***.
+     0x00001C18,  // .***.....**..
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+  },
+  {             // 104
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000CF0,  // ..**..****...
+     0x00000FF8,  // ..*********..
+     0x00000E1C,  // ..***....***.
+     0x00000E0C,  // ..***.....**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 106
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x00000078,  // ****..
+  },
+  {             // 107
+     12, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C38,  // ..**....***..
+     0x00000C70,  // ..**...***...
+     0x00000CE0,  // ..**..***....
+     0x00000DC0,  // ..**.***.....
+     0x00000F80,  // ..*****......
+     0x00000FC0,  // ..******.....
+     0x00000EC0,  // ..***.**.....
+     0x00000C60,  // ..**...**....
+     0x00000C70,  // ..**...***...
+     0x00000C30,  // ..**....**...
+     0x00000C18,  // ..**.....**..
+     0x00000C1C,  // ..**.....***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 108
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 109
+     20, 25,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0006F8F0,  // ..**.*****...****...
+     0x0007FFF8,  // ..****************..
+     0x00070E1C,  // ..***....***....***.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00060C0C,  // ..**.....**......**.
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 110
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000CF0,  // ..**..****...
+     0x00000FF8,  // ..*********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 111
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003F0,  // ....******...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00001C0E,  // .***......***
+     0x0000180E,  // .**.......***
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180E,  // .**.......***
+     0x00001C0C,  // .***......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 112
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000DF0,  // ..**.*****...
+     0x00000FB8,  // ..*****.***..
+     0x00000E0C,  // ..***.....**.
+     0x00000E0E,  // ..***.....***
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C0E,  // ..**......***
+     0x00000E0C,  // ..***.....**.
+     0x00000F1C,  // ..****...***.
+     0x00000FF8,  // ..*********..
+     0x00000DF0,  // ..**.*****...
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+  },
+  {             // 113
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003EC,  // ....*****.**.
+     0x0000077C,  // ...***.*****.
+     0x00000C1C,  // ..**.....***.
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000E1C,  // ..***....***.
+     0x000007FC,  // ...*********.
+     0x000003CC,  // ....****..**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+  },
+  {             // 114
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000006E,  // ..**.***
+     0x0000007E,  // ..******
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 115
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-  },
-  {             // 35
-     12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x000007F8,  // ..********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000E00,  // .***........
+     0x000007C0,  // ..*****.....
+     0x000003F8,  // ...*******..
+     0x0000003C,  // .......****.
+     0x0000000C,  // .........**.
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x000007F8,  // ..********..
+     0x000003F0,  // ...******...
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
-  {             // 36
-     12, 23,
+  {             // 116
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x000000FC,  // ******.
+     0x000000FC,  // ******.
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x0000003C,  // ..****.
+     0x0000001C,  // ...***.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 117
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007FC,  // ...*********.
+     0x000003CC,  // ....****..**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 118
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C08,  // .**......*..
-     0x00000E00,  // .***........
-     0x00000700,  // ..***.......
-     0x000003C0,  // ...****.....
-     0x000000F0,  // .....****...
-     0x00000038,  // .......***..
-     0x0000001C,  // ........***.
-     0x0000080C,  // .*.......**.
-     0x00000C0C,  // .**......**.
-     0x00000E18,  // .***....**..
-     0x000007F0,  // ..*******...
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-  },
-  {             // 37
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000078C,  // ..****...**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CD8,  // .**..**.**..
-     0x00000CD8,  // .**..**.**..
-     0x000007B0,  // ..****.**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x000001BC,  // ....**.****.
-     0x00000366,  // ...**.**..**
-     0x00000366,  // ...**.**..**
-     0x00000666,  // ..**..**..**
-     0x0000063C,  // ..**...****.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 38
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001C0,  // ....***.....
-     0x00000360,  // ...**.**....
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000360,  // ...**.**....
-     0x000001C0,  // ....***.....
-     0x00000380,  // ...***......
-     0x000006C4,  // ..**.**...*.
-     0x00000C6C,  // .**...**.**.
-     0x00000C68,  // .**...**.*..
-     0x00000C38,  // .**....***..
-     0x00000C30,  // .**....**...
-     0x00000678,  // ..**..****..
-     0x000003CC,  // ...****..**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 39
-     12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
+     0x00001C0C,  // ***......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000730,  // ..***..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
      0x000001E0,  // ....****....
      0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
+     0x000001C0,  // ....***.....
      0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
-  {             // 40
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000060,  // ......**....
-     0x00000030,  // .......**...
-     0x00000018,  // ........**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 119
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00030706,  // **.....***.....**
+     0x0001870C,  // .**....***....**.
+     0x0001870C,  // .**....***....**.
+     0x00018D8C,  // .**...**.**...**.
+     0x00018D98,  // .**...**.**..**..
+     0x0000CD98,  // ..**..**.**..**..
+     0x0000C998,  // ..**..*..**..**..
+     0x0000D8D0,  // ..**.**...**.*...
+     0x000078F0,  // ...****...****...
+     0x000078F0,  // ...****...****...
+     0x000070E0,  // ...***....***....
+     0x00003060,  // ....**.....**....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
-  {             // 41
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ...**.......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000000,  // ............
+  {             // 120
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
-  },
-  {             // 42
-     12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000CCC,  // .**..**..**.
-     0x00000EDC,  // .***.**.***.
+     0x00000C1C,  // .**.....***.
+     0x00000618,  // ..**....**..
+     0x00000730,  // ..***..**...
+     0x00000370,  // ...**.***...
      0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
      0x000001E0,  // ....****....
-     0x00000EDC,  // .***.**.***.
-     0x00000CCC,  // .**..**..**.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 43
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
+     0x000003E0,  // ...*****....
+     0x00000330,  // ...**..**...
+     0x00000638,  // ..**...***..
+     0x00000E1C,  // .***....***.
+     0x00000C0C,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
-  {             // 44
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 121
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -327,2774 +2501,280 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000E0C,  // .***.....**.
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000730,  // ..***..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
      0x000001E0,  // ....****....
      0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
      0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000080,  // .....*......
      0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 45
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
   },
-  {             // 46
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 122
+     12, 25,
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-  },
-  {             // 47
-     12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
+     0x00001FFC,  // ***********.
+     0x00001FFC,  // ***********.
+     0x00000038,  // .......***..
      0x00000030,  // .......**...
      0x00000060,  // ......**....
-     0x00000060,  // ......**....
      0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
      0x00000180,  // ....**......
      0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
      0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 48
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000738,  // ..***..***..
-     0x000001E0,  // ....****....
+     0x00000E00,  // .***........
+     0x00001FFC,  // ***********.
+     0x00001FFC,  // ***********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
-  {             // 49
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000001E0,  // ....****....
-     0x00000360,  // ...**.**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 123
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // .....***.
+     0x0000001C,  // .....***.
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000060,  // ...**....
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x0000001C,  // .....***.
+     0x0000001C,  // .....***.
   },
-  {             // 50
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000604,  // ..**......*.
-     0x0000060C,  // ..**.....**.
-     0x000007FC,  // ..*********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 124
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
   },
-  {             // 51
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001F0,  // ....*****...
-     0x00000018,  // ........**..
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x00000618,  // ..**....**..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 125
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000E0,  // .***....
+     0x000000F0,  // .****...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x0000000C,  // .....**.
+     0x0000001C,  // ....***.
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x000000E0,  // .***....
+     0x000000E0,  // .***....
   },
-  {             // 52
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000198,  // ....**..**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007FE,  // ..**********
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 126
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003F8C,  // .*******...**.
+     0x00003FFC,  // .************.
+     0x000020F8,  // .*.....*****..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 53
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x000003F0,  // ...******...
-     0x00000018,  // ........**..
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x00000618,  // ..**....**..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 127
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 54
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // .......***..
-     0x000000E0,  // .....***....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x000006F0,  // ..**.****...
-     0x00000718,  // ..***...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 128
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 55
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 129
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 56
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 130
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 57
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000031C,  // ...**...***.
-     0x000001EC,  // ....****.**.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x000000E0,  // .....***....
-     0x00000380,  // ...***......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 58
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 59
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 60
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000004,  // ..........*.
-     0x0000001C,  // ........***.
-     0x00000078,  // ......****..
-     0x000001E0,  // ....****....
-     0x00000780,  // ..****......
-     0x00000E00,  // .***........
-     0x00000E00,  // .***........
-     0x00000780,  // ..****......
-     0x000001E0,  // ....****....
-     0x00000078,  // ......****..
-     0x0000001C,  // ........***.
-     0x00000004,  // ..........*.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 61
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 62
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000800,  // .*..........
-     0x00000E00,  // .***........
-     0x00000780,  // ..****......
-     0x000001E0,  // ....****....
-     0x00000078,  // ......****..
-     0x0000001C,  // ........***.
-     0x0000001C,  // ........***.
-     0x00000078,  // ......****..
-     0x000001E0,  // ....****....
-     0x00000780,  // ..****......
-     0x00000E00,  // .***........
-     0x00000800,  // .*..........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 63
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000738,  // ..***..***..
-     0x0000071C,  // ..***...***.
-     0x0000061C,  // ..**....***.
-     0x0000001C,  // ........***.
-     0x00000038,  // .......***..
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 64
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000718,  // ..***...**..
-     0x0000060C,  // ..**.....**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C7C,  // .**...*****.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000C76,  // .**...***.**
-     0x00000C00,  // .**.........
-     0x00000600,  // ..**........
-     0x0000070C,  // ..***....**.
-     0x000001F8,  // ....******..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 65
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001E1E,  // ****....****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 66
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FE0,  // .*******....
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x000007F0,  // ..*******...
-     0x00000618,  // ..**....**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x00000FF0,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 67
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F4,  // ....*****.*.
-     0x0000031C,  // ...**...***.
-     0x0000060C,  // ..**.....**.
-     0x00000604,  // ..**......*.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C04,  // .**.......*.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 68
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FE0,  // .*******....
-     0x00000638,  // ..**...***..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000638,  // ..**...***..
-     0x00000FE0,  // .*******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 69
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x0000060C,  // ..**.....**.
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x00000620,  // ..**...*....
-     0x00000620,  // ..**...*....
-     0x000007E0,  // ..******....
-     0x00000620,  // ..**...*....
-     0x00000620,  // ..**...*....
-     0x00000600,  // ..**........
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x0000060C,  // ..**.....**.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 70
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x0000060C,  // ..**.....**.
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x00000620,  // ..**...*....
-     0x00000620,  // ..**...*....
-     0x000007E0,  // ..******....
-     0x00000620,  // ..**...*....
-     0x00000620,  // ..**...*....
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000F80,  // .*****......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 71
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F4,  // ....*****.*.
-     0x0000031C,  // ...**...***.
-     0x0000060C,  // ..**.....**.
-     0x00000604,  // ..**......*.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C3E,  // .**....*****
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000031C,  // ...**...***.
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 72
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x000007FC,  // ..*********.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 73
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // ..********..
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000007F8,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 74
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ....*******.
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000660,  // ..**..**....
-     0x000003C0,  // ...****.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000660,  // ..**..**....
-     0x000006C0,  // ..**.**.....
-     0x000007C0,  // ..*****.....
-     0x00000760,  // ..***.**....
-     0x00000660,  // ..**..**....
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x0000061C,  // ..**....***.
-     0x00000F0E,  // .****....***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 76
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F00,  // .****.......
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x0000060C,  // ..**.....**.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 77
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E0E,  // .***.....***
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x0000071C,  // ..***...***.
-     0x000007BC,  // ..****.****.
-     0x000006AC,  // ..**.*.*.**.
-     0x000006EC,  // ..**.***.**.
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 78
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E1E,  // .***....****
-     0x0000070C,  // ..***....**.
-     0x0000070C,  // ..***....**.
-     0x0000078C,  // ..****...**.
-     0x0000068C,  // ..**.*...**.
-     0x000006CC,  // ..**.**..**.
-     0x000006CC,  // ..**.**..**.
-     0x0000066C,  // ..**..**.**.
-     0x0000066C,  // ..**..**.**.
-     0x0000062C,  // ..**...*.**.
-     0x0000063C,  // ..**...****.
-     0x0000061C,  // ..**....***.
-     0x0000061C,  // ..**....***.
-     0x00000F0C,  // .****....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 79
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 80
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000618,  // ..**....**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x000007F0,  // ..*******...
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000F80,  // .*****......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 81
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000030,  // .......**...
-     0x00000018,  // ........**..
-     0x0000000E,  // .........***
-     0x00000004,  // ..........*.
-     0x00000000,  // ............
-  },
-  {             // 82
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000618,  // ..**....**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x000007F0,  // ..*******...
-     0x00000660,  // ..**..**....
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x0000061C,  // ..**....***.
-     0x00000F0E,  // .****....***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 83
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003E8,  // ...*****.*..
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C08,  // .**......*..
-     0x00000C00,  // .**.........
-     0x00000700,  // ..***.......
-     0x000003C0,  // ...****.....
-     0x000000F0,  // .....****...
-     0x00000038,  // .......***..
-     0x0000000C,  // .........**.
-     0x0000080C,  // .*.......**.
-     0x00000C0C,  // .**......**.
-     0x00000E18,  // .***....**..
-     0x00000BF0,  // .*.******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 84
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000CCC,  // .**..**..**.
-     0x000008C4,  // .*...**...*.
-     0x000008C4,  // .*...**...*.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 86
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00001E1E,  // ****....****
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 87
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x000006EC,  // ..**.***.**.
-     0x000006EC,  // ..**.***.**.
-     0x000006AC,  // ..**.*.*.**.
-     0x000003B8,  // ...***.***..
-     0x000003B8,  // ...***.***..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 88
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 89
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00001E1E,  // ****....****
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 90
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000818,  // .*......**..
-     0x00000830,  // .*.....**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000304,  // ...**.....*.
-     0x00000604,  // ..**......*.
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 91
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // .....*****..
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000F8,  // .....*****..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 92
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 93
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000003E0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 94
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000210,  // ...*....*...
-     0x00000408,  // ..*......*..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 95
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00001FFE,  // ************
-     0x00001FFE,  // ************
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 96
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 97
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000018,  // ........**..
-     0x000003F8,  // ...*******..
-     0x00000618,  // ..**....**..
-     0x00000C18,  // .**.....**..
-     0x00000E7C,  // .***..*****.
-     0x000007D8,  // ..*****.**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 98
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000E00,  // .***........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x000006F0,  // ..**.****...
-     0x0000079C,  // ..****..***.
-     0x0000070C,  // ..***....**.
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x0000070C,  // ..***....**.
-     0x0000079C,  // ..****..***.
-     0x000006F0,  // ..**.****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 99
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FC,  // .....******.
-     0x0000038C,  // ...***...**.
-     0x0000030C,  // ...**....**.
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x0000030C,  // ...**....**.
-     0x0000039C,  // ...***..***.
-     0x000000F0,  // .....****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // .........**.
-     0x0000001C,  // ........***.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x000001EC,  // ....****.**.
-     0x0000073C,  // ..***..****.
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x0000073E,  // ..***..*****
-     0x000001EC,  // ....****.**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 101
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000C00,  // .**.........
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 102
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000078,  // ......****..
-     0x000000CC,  // .....**..**.
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000FF8,  // .*********..
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000FF8,  // .*********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 103
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x0000063C,  // ..**...****.
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000630,  // ..**...**...
-     0x000003E0,  // ...*****....
-     0x00000600,  // ..**........
-     0x000003F8,  // ...*******..
-     0x0000060C,  // ..**.....**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-  },
-  {             // 104
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000E00,  // .***........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x000006F0,  // ..**.****...
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 105
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000000F0,  // .....****...
-     0x00000060,  // ......**....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000003E0,  // ...*****....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000003FC,  // ...********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 106
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000000F0,  // .....****...
-     0x00000060,  // ......**....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000003E0,  // ...*****....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00001860,  // **....**....
-     0x00001CC0,  // ***..**.....
-     0x00000780,  // ..****......
-     0x00000000,  // ............
-  },
-  {             // 107
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000E00,  // .***........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x0000067C,  // ..**..*****.
-     0x00000630,  // ..**...**...
-     0x00000660,  // ..**..**....
-     0x000006C0,  // ..**.**.....
-     0x000007C0,  // ..*****.....
-     0x00000660,  // ..**..**....
-     0x00000630,  // ..**...**...
-     0x0000061A,  // ..**....**.*
-     0x00000F0C,  // .****....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 108
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000003C0,  // ...****.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000007F8,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 109
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000D98,  // .**.**..**..
-     0x00001EEC,  // ****.***.**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00001DDE,  // ***.***.****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 110
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000006F0,  // ..**.****...
-     0x00000F38,  // .****..***..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 111
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000738,  // ..***..***..
-     0x000001E0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 112
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000006F0,  // ..**.****...
-     0x00000F9C,  // .*****..***.
-     0x0000070C,  // ..***....**.
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x0000070C,  // ..***....**.
-     0x0000079C,  // ..****..***.
-     0x000006F0,  // ..**.****...
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000F80,  // .*****......
-     0x00000000,  // ............
-  },
-  {             // 113
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E4,  // ....****..*.
-     0x0000073C,  // ..***..****.
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x0000073C,  // ..***..****.
-     0x000001EC,  // ....****.**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000003E,  // .......*****
-     0x00000000,  // ............
-  },
-  {             // 114
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000338,  // ...**..***..
-     0x00000F5C,  // .****.*.***.
-     0x00000398,  // ...***..**..
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000FE0,  // .*******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 115
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000380,  // ...***......
-     0x000001F0,  // ....*****...
-     0x00000038,  // .......***..
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000FF8,  // .*********..
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x0000018C,  // ....**...**.
-     0x000000F8,  // .....*****..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 117
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000E38,  // .***...***..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x0000073C,  // ..***..****.
-     0x000003D8,  // ...****.**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 118
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x000006EC,  // ..**.***.**.
-     0x000002A8,  // ...*.*.*.*..
-     0x000003B8,  // ...***.***..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 120
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F3C,  // .****..****.
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x00000040,  // ......*.....
-     0x000000C0,  // .....**.....
-     0x00000C80,  // .**..*......
-     0x00000D80,  // .**.**......
-     0x00000700,  // ..***.......
-     0x00000000,  // ............
-  },
-  {             // 122
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000430,  // ..*....**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000308,  // ...**....*..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // .......***..
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000380,  // ...***......
-     0x000000C0,  // .....**.....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000038,  // .......***..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 124
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 125
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000380,  // ...***......
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000060,  // ......**....
-     0x00000038,  // .......***..
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000380,  // ...***......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 126
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000038C,  // ...***...**.
-     0x000007CC,  // ..*****..**.
-     0x00000CF8,  // .**..*****..
-     0x00000C70,  // .**...***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 127
-     12, 23,
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-     0x00000AAA,  // .*.*.*.*.*.*
-     0x00001554,  // *.*.*.*.*.*.
-  },
-  {             // 128
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
+  {             // 131
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 151
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3119,34 +2799,10 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 152
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
+  {             // 132
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 153
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3171,34 +2827,10 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 154
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
+  {             // 133
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 155
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3223,9 +2855,8 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 156
-     0, 23,
-     0x00000000,  // 
+  {             // 134
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3248,12 +2879,12 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 157
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 135
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3274,14 +2905,14 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 158
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 136
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3300,9 +2931,6 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 159
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3310,6 +2938,9 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 137
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3326,113 +2957,6 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 160
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 161
-     12, 23,
-     0x00000000,  // ............
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x00000080,  // .....*......
-     0x000000C0,  // .....**.....
-     0x00000060,  // ......**....
-     0x00000030,  // .......**...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 162
-     12, 23,
-     0x00000000,  // ............
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x00000020,  // .......*....
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 163
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000338,  // ...**..***..
-     0x00000618,  // ..**....**..
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000FC0,  // .******.....
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000FCC,  // .******..**.
-     0x00000CF8,  // .**..*****..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 164
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3442,6 +2966,9 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 138
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3456,9 +2983,6 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 165
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3470,6 +2994,9 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 139
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3482,113 +3009,6 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 166
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 167
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000718,  // ..***...**..
-     0x00000380,  // ...***......
-     0x000001C0,  // ....***.....
-     0x000002E0,  // ...*.***....
-     0x00000670,  // ..**..***...
-     0x00000638,  // ..**...***..
-     0x00000718,  // ..***...**..
-     0x00000398,  // ...***..**..
-     0x000001D0,  // ....***.*...
-     0x000000E0,  // .....***....
-     0x00000070,  // ......***...
-     0x00000638,  // ..**...***..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 168
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000618,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 169
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x00000618,  // ..**....**..
-     0x00000CEC,  // .**..***.**.
-     0x00000D2C,  // .**.*..*.**.
-     0x00000D0C,  // .**.*....**.
-     0x00000D2C,  // .**.*..*.**.
-     0x00000CCC,  // .**..**..**.
-     0x00000618,  // ..**....**..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 170
-     0, 23,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3602,6 +3022,9 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
+  },
+  {             // 140
+     0, 25,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3612,87 +3035,26 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
-  },
-  {             // 171
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000044,  // ......*...*.
-     0x000000CC,  // .....**..**.
-     0x00000198,  // ....**..**..
-     0x00000330,  // ...**..**...
-     0x00000660,  // ..**..**....
-     0x00000CC0,  // .**..**.....
-     0x00000CC0,  // .**..**.....
-     0x00000660,  // ..**..**....
-     0x00000330,  // ...**..**...
-     0x00000198,  // ....**..**..
-     0x000000CC,  // .....**..**.
-     0x00000044,  // ......*...*.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 172
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 173
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 174
-     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3717,918 +3079,878 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 175
-     12, 23,
-     0x00001FFE,  // ************
-     0x00001FFE,  // ************
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 176
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000E0,  // .....***....
-     0x000001B0,  // ....**.**...
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 177
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 178
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000310,  // ...**...*...
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 179
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000030,  // .......**...
-     0x000000E0,  // .....***....
-     0x00000030,  // .......**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 180
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000080,  // .....*......
-     0x00000080,  // .....*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 181
-     12, 23,
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x0000064C,  // ..**..*..**.
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 182
-     12, 23,
-     0x00000000,  // ............
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000200,  // ...*........
-     0x000002C0,  // ...*.**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000160,  // ....*.**....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001E1E,  // ****....****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 183
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 142
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 184
-     12, 23,
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000800,  // .*..........
-     0x00000800,  // .*..........
-     0x00000FFE,  // .***********
-     0x00000306,  // ...**.....**
-     0x00000302,  // ...**......*
-     0x00000302,  // ...**......*
-     0x00000310,  // ...**...*...
-     0x00000310,  // ...**...*...
-     0x000003F0,  // ...******...
-     0x00000310,  // ...**...*...
-     0x00000310,  // ...**...*...
-     0x00000300,  // ...**.......
-     0x00000302,  // ...**......*
-     0x00000302,  // ...**......*
-     0x00000306,  // ...**.....**
-     0x000007FE,  // ..**********
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 143
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 185
-     12, 23,
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000800,  // .*..........
-     0x00000800,  // .*..........
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x000007FC,  // ..*********.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 144
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 186
-     12, 23,
-     0x00000000,  // ............
-     0x00001800,  // **..........
-     0x00001800,  // **..........
-     0x00001000,  // *...........
-     0x000017F8,  // *.********..
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000007F8,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 145
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 187
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000880,  // .*...*......
-     0x00000CC0,  // .**..**.....
-     0x00000660,  // ..**..**....
-     0x00000330,  // ...**..**...
-     0x00000198,  // ....**..**..
-     0x000000CC,  // .....**..**.
-     0x000000CC,  // .....**..**.
-     0x00000198,  // ....**..**..
-     0x00000330,  // ...**..**...
-     0x00000660,  // ..**..**....
-     0x00000CC0,  // .**..**.....
-     0x00000880,  // .*...*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 146
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 188
-     12, 23,
-     0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000800,  // .*..........
-     0x000009F0,  // .*..*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 147
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 189
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ...**.......
-     0x00000F00,  // .****.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000306,  // ...**.....**
-     0x0000030C,  // ...**....**.
-     0x00000338,  // ...**..***..
-     0x00000060,  // ......**....
-     0x000001C0,  // ....***.....
-     0x0000033C,  // ...**..****.
-     0x00000E66,  // .***..**..**
-     0x00001866,  // **....**..**
-     0x00000006,  // ..........**
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000062,  // ......**...*
-     0x0000007E,  // ......******
-     0x00000000,  // ............
+  {             // 149
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 190
-     12, 23,
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000800,  // .*..........
-     0x00000800,  // .*..........
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000932,  // .*..*..**..*
-     0x000001A0,  // ....**.*....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 150
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 191
-     12, 23,
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000400,  // ..*.........
-     0x00000400,  // ..*.........
-     0x000001F0,  // ....*****...
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000912,  // .*..*...*..*
-     0x00000F1E,  // .****...****
-     0x0000071C,  // ..***...***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 151
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 192
-     12, 23,
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000618,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000380,  // ...***......
-     0x000004C0,  // ..*..**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C8,  // .....**..*..
-     0x00000070,  // ......***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 152
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 193
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000160,  // ....*.**....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001E1E,  // ****....****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 153
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 194
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000618,  // ..**....**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x0000060C,  // ..**.....**.
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x00000606,  // ..**......**
-     0x0000060C,  // ..**.....**.
-     0x00000FF8,  // .*********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 154
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 195
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x0000060C,  // ..**.....**.
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000FC0,  // .******.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 155
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 196
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000160,  // ....*.**....
-     0x00000330,  // ...**..**...
-     0x00000230,  // ...*...**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000418,  // ..*.....**..
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 156
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 197
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x0000060C,  // ..**.....**.
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x00000620,  // ..**...*....
-     0x00000620,  // ..**...*....
-     0x000007E0,  // ..******....
-     0x00000620,  // ..**...*....
-     0x00000620,  // ..**...*....
-     0x00000600,  // ..**........
-     0x00000604,  // ..**......*.
-     0x00000604,  // ..**......*.
-     0x0000060C,  // ..**.....**.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 157
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 198
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000818,  // .*......**..
-     0x00000830,  // .*.....**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000304,  // ...**.....*.
-     0x00000604,  // ..**......*.
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 158
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 199
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x000007FC,  // ..*********.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 159
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 200
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x00000404,  // ..*.......*.
-     0x00000C06,  // .**.......**
-     0x00000D16,  // .**.*...*.**
-     0x00000DF6,  // .**.*****.**
-     0x00000DF6,  // .**.*****.**
-     0x00000D16,  // .**.*...*.**
-     0x00000C06,  // .**.......**
-     0x00000404,  // ..*.......*.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 160
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 201
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // ..********..
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000007F8,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 161
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000010,  // ....*...
+     0x00000010,  // ....*...
+     0x00000010,  // ....*...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
   },
-  {             // 202
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000660,  // ..**..**....
-     0x000006E0,  // ..**.***....
-     0x000007E0,  // ..******....
-     0x00000760,  // ..***.**....
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 162
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006700,  // ...**..***.......
+     0x0000E700,  // ..***..***.......
+     0x0000CD80,  // ..**..**.**......
+     0x00000D80,  // ......**.**......
+     0x00000DC0,  // ......**.***.....
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00001860,  // .....**....**....
+     0x00003060,  // ....**.....**....
+     0x00003070,  // ....**.....***...
+     0x00007FF0,  // ...***********...
+     0x00007FF8,  // ...************..
+     0x00006038,  // ...**.......***..
+     0x0000E018,  // ..***........**..
+     0x0000C01C,  // ..**.........***.
+     0x0000C00C,  // ..**..........**.
+     0x0001C00E,  // .***..........***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 203
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000160,  // ....*.**....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001E1E,  // ****....****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 163
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000003F8,  // ....*******..
+     0x00000618,  // ...**....**..
+     0x0000041C,  // ...*.....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C00,  // ..**.........
+     0x00000400,  // ...*.........
+     0x00000600,  // ...**........
+     0x00001FC0,  // .*******.....
+     0x00001FC0,  // .*******.....
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000600,  // ...**........
+     0x00000400,  // ...*.........
+     0x00000C00,  // ..**.........
+     0x00000F84,  // ..*****....*.
+     0x00001FFC,  // .***********.
+     0x0000087C,  // ..*....*****.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 204
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00001C0E,  // ***......***
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000E1C,  // .***....***.
-     0x00000E3C,  // .***...****.
-     0x00000E3C,  // .***...****.
-     0x00000F2C,  // .****..*.**.
-     0x00000B6C,  // .*.**.**.**.
-     0x00000B6C,  // .*.**.**.**.
-     0x00000BCC,  // .*.****..**.
-     0x000009CC,  // .*..***..**.
-     0x000009CC,  // .*..***..**.
-     0x0000098C,  // .*..**...**.
-     0x00001C9E,  // ***..*..****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 164
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000804,  // ..*........*.
+     0x00001DEE,  // .***.****.***
+     0x00000FFC,  // ..**********.
+     0x00000738,  // ...***..***..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E0C,  // ..***.....**.
+     0x00000718,  // ...***...**..
+     0x00000FFC,  // ..**********.
+     0x00001DEE,  // .***.****.***
+     0x00000804,  // ..*........*.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 205
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E1E,  // .***....****
-     0x0000070C,  // ..***....**.
-     0x0000070C,  // ..***....**.
-     0x0000078C,  // ..****...**.
-     0x0000068C,  // ..**.*...**.
-     0x000006CC,  // ..**.**..**.
-     0x0000064C,  // ..**..*..**.
-     0x0000066C,  // ..**..**.**.
-     0x0000062C,  // ..**...*.**.
-     0x0000063C,  // ..**...****.
-     0x0000061C,  // ..**....***.
-     0x0000061C,  // ..**....***.
-     0x0000060C,  // ..**.....**.
-     0x00000F0C,  // .****....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 165
+     13, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000381C,  // .***......***.
+     0x00001818,  // ..**......**..
+     0x00001C30,  // ..***....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 206
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000404,  // ..*.......*.
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x00000404,  // ..*.......*.
-     0x00000404,  // ..*.......*.
-     0x00000000,  // ............
-     0x00000110,  // ....*...*...
-     0x000001F0,  // ....*****...
-     0x000001F0,  // ....*****...
-     0x00000110,  // ....*...*...
-     0x00000000,  // ............
-     0x00000802,  // .*.........*
-     0x00000802,  // .*.........*
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
-     0x00000802,  // .*.........*
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 166
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
   },
-  {             // 207
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 167
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C1C,  // ..**.....***.
+     0x00000C00,  // ..**.........
+     0x00000600,  // ...**........
+     0x00000780,  // ...****......
+     0x00000FE0,  // ..*******....
+     0x000008F0,  // ..*...****...
+     0x00001838,  // .**.....***..
+     0x0000181C,  // .**......***.
+     0x00000C0E,  // ..**......***
+     0x00000E06,  // ..***......**
+     0x00000786,  // ...****....**
+     0x000003CC,  // ....****..**.
+     0x000000F8,  // ......*****..
+     0x00000038,  // ........***..
+     0x0000001C,  // .........***.
+     0x0000040C,  // ...*......**.
+     0x00000C0C,  // ..**......**.
+     0x0000061C,  // ...**....***.
+     0x000007F8,  // ...********..
+     0x000001F0,  // .....*****...
   },
-  {             // 208
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFE,  // .***********
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 168
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CE,  // .**..***
+     0x000000CE,  // .**..***
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
-  {             // 209
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000618,  // ..**....**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x000007F0,  // ..*******...
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000F80,  // .*****......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 169
+     17, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E030,  // ...***.......**...
+     0x00018018,  // ..**..........**..
+     0x00038F0C,  // .***...****....**.
+     0x000339C4,  // .**..***..***...*.
+     0x000730C6,  // ***..**....**...**
+     0x00066006,  // **..**..........**
+     0x00066006,  // **..**..........**
+     0x00066002,  // **..**...........*
+     0x00066006,  // **..**..........**
+     0x00067046,  // **..***.....*...**
+     0x000330C4,  // .**..**....**...*.
+     0x00031F0C,  // .**...*****....**.
+     0x00018008,  // ..**...........*..
+     0x0000C010,  // ...**.........*...
+     0x00007060,  // ....***.....**....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 210
-     0, 23,
+  {             // 170
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000001FC,  // .*******.
+     0x0000018C,  // .**...**.
+     0x0000000C,  // ......**.
+     0x000000FC,  // ..******.
+     0x000001C4,  // .***...*.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000000F4,  // ..****.*.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 171
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000118,  // .....*...**..
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000660,  // ...**..**....
+     0x00000CE0,  // ..**..***....
+     0x00000CE0,  // ..**..***....
+     0x00000660,  // ...**..**....
+     0x00000630,  // ...**...**...
+     0x00000330,  // ....**..**...
+     0x00000118,  // .....*...**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 172
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x0000000C,  // ...........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 173
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -4653,997 +3975,1492 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 211
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000E04,  // .***......*.
-     0x00000604,  // ..**......*.
-     0x00000700,  // ..***.......
-     0x00000300,  // ...**.......
-     0x00000380,  // ...***......
-     0x00000100,  // ....*.......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000404,  // ..*.......*.
-     0x00000C04,  // .**.......*.
-     0x0000080C,  // .*.......**.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 174
+     17, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C018,  // ..***.........**..
+     0x0003800C,  // .***...........**.
+     0x00033F84,  // .**..*******....*.
+     0x000730C6,  // ***..**....**...**
+     0x000630C6,  // **...**....**...**
+     0x000630C2,  // **...**....**....*
+     0x00063F82,  // **...*******.....*
+     0x00063302,  // **...**..**......*
+     0x00063186,  // **...**...**....**
+     0x000330C4,  // .**..**....**...*.
+     0x000330C4,  // .**..**....**...*.
+     0x00018008,  // ..**...........*..
+     0x0000C010,  // ...**.........*...
+     0x00007060,  // ....***.....**....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 212
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000CCC,  // .**..**..**.
-     0x000008C4,  // .*...**...*.
-     0x000008C4,  // .*...**...*.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 175
+     13, 25,
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 213
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000932,  // .*..*..**..*
-     0x000001A0,  // ....**.*....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 176
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000F8,  // ..*****..
+     0x0000008C,  // ..*...**.
+     0x00000084,  // ..*....*.
+     0x00000084,  // ..*....*.
+     0x000000CC,  // ..**..**.
+     0x00000078,  // ...****..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
-  {             // 214
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x000006D8,  // ..**.**.**..
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x000006D8,  // ..**.**.**..
-     0x000003F0,  // ...******...
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 177
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 215
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 178
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ...****.
+     0x0000007E,  // ..******
+     0x000000C6,  // .**...**
+     0x00000006,  // ......**
+     0x00000006,  // ......**
+     0x0000000C,  // .....**.
+     0x00000038,  // ...***..
+     0x00000070,  // ..***...
+     0x000000E0,  // .***....
+     0x000000FE,  // .*******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ...****.
+     0x0000007E,  // ..******
+     0x00000046,  // ..*...**
+     0x00000006,  // ......**
+     0x0000001C,  // ....***.
+     0x0000001E,  // ....****
+     0x00000002,  // .......*
+     0x000000C2,  // .**....*
+     0x00000066,  // ..**..**
+     0x0000003C,  // ...****.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     8, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ....**..
+     0x00000038,  // ...***..
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 181
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // ......***....
+     0x000000E0,  // ......***....
+     0x000019CC,  // .**..***..**.
+     0x0000198C,  // .**..**...**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 182
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006700,  // ...**..***.......
+     0x0000E700,  // ..***..***.......
+     0x0000CD80,  // ..**..**.**......
+     0x00000D80,  // ......**.**......
+     0x00000DC0,  // ......**.***.....
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00001860,  // .....**....**....
+     0x00003060,  // ....**.....**....
+     0x00003070,  // ....**.....***...
+     0x00007FF0,  // ...***********...
+     0x00007FF8,  // ...************..
+     0x00006038,  // ...**.......***..
+     0x0000E018,  // ..***........**..
+     0x0000C01C,  // ..**.........***.
+     0x0000C00C,  // ..**..........**.
+     0x0001C00E,  // .***..........***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 183
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 184
+     19, 25,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00077FF8,  // ..***.************..
+     0x00067FF8,  // ..**..************..
+     0x000C6000,  // .**...**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00007FC0,  // ......*********.....
+     0x00007FC0,  // ......*********.....
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00006000,  // ......**............
+     0x00007FF8,  // ......************..
+     0x00007FF8,  // ......************..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
   },
-  {             // 216
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000CCC,  // .**..**..**.
-     0x000006D8,  // ..**.**.**..
-     0x000006D8,  // ..**.**.**..
-     0x000006D8,  // ..**.**.**..
-     0x000006D8,  // ..**.**.**..
-     0x000003F0,  // ...******...
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 185
+     21, 25,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x001D8018,  // ..***.**..........**..
+     0x00198018,  // ..**..**..........**..
+     0x00318018,  // .**...**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x0001FFF8,  // ......**************..
+     0x0001FFF8,  // ......**************..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00018018,  // ......**..........**..
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
   },
-  {             // 217
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000912,  // .*..*...*..*
-     0x00000F1E,  // .****...****
-     0x0000071C,  // ..***...***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 186
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CC,  // ..**..**.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
-  {             // 218
-     12, 23,
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000618,  // ..**....**..
-     0x00000000,  // ............
-     0x000007F8,  // ..********..
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000007F8,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 187
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C40,  // ..**...*.....
+     0x00000660,  // ...**..**....
+     0x00000630,  // ...**...**...
+     0x00000330,  // ....**..**...
+     0x00000398,  // ....***..**..
+     0x00000398,  // ....***..**..
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000460,  // ...*...**....
+     0x00000CC0,  // ..**..**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 219
-     12, 23,
-     0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
-     0x00000618,  // ..**....**..
-     0x00000000,  // ............
-     0x0000060C,  // ..**.....**.
-     0x00000F1E,  // .****...****
-     0x00000932,  // .*..*..**..*
-     0x000001A0,  // ....**.*....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 188
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00071FC0,  // ..***...*******.....
+     0x00063FF0,  // ..**...**********...
+     0x000CE078,  // .**..***......****..
+     0x0000C01C,  // .....**.........***.
+     0x0001801C,  // ....**..........***.
+     0x0001800C,  // ....**...........**.
+     0x0003000E,  // ...**............***
+     0x0003000E,  // ...**............***
+     0x0003000E,  // ...**............***
+     0x0003000E,  // ...**............***
+     0x0003000E,  // ...**............***
+     0x0003000E,  // ...**............***
+     0x0001800C,  // ....**...........**.
+     0x0001801C,  // ....**..........***.
+     0x0000C018,  // .....**.........**..
+     0x0000F078,  // .....****.....****..
+     0x00003FF0,  // .......**********...
+     0x00001FC0,  // ........*******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 220
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003C2,  // ...****....*
-     0x00000666,  // ..**..**..**
-     0x00000C64,  // .**...**..*.
-     0x00000C3C,  // .**....****.
-     0x00000C38,  // .**....***..
-     0x00000C30,  // .**....**...
-     0x00000C38,  // .**....***..
-     0x0000067A,  // ..**..****.*
-     0x000003CC,  // ...****..**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 189
+     20, 25,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00018018,  // ....**..........**..
+     0x00038030,  // ...***.........**...
+     0x000F8060,  // .*****........**....
+     0x000D80C0,  // .**.**.......**.....
+     0x000180C0,  // ....**.......**.....
+     0x00018180,  // ....**......**......
+     0x00018300,  // ....**.....**.......
+     0x00018200,  // ....**.....*........
+     0x00018600,  // ....**....**........
+     0x00018C00,  // ....**...**.........
+     0x0000187C,  // ........**....*****.
+     0x000018C6,  // ........**...**...**
+     0x00003006,  // .......**.........**
+     0x00006006,  // ......**..........**
+     0x0000C01C,  // .....**.........***.
+     0x0000C030,  // .....**........**...
+     0x00018060,  // ....**........**....
+     0x000300FE,  // ...**........*******
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
-  {             // 221
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000700,  // ..***.......
-     0x000003C0,  // ...****.....
-     0x00000700,  // ..***.......
-     0x00000608,  // ..**.....*..
-     0x00000718,  // ..***...**..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 190
+     20, 25,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x001CC00C,  // ..***..**..........**.
+     0x0018E01C,  // ..**...***........***.
+     0x00307018,  // .**.....***.......**..
+     0x00003030,  // .........**......**...
+     0x00003870,  // .........***....***...
+     0x00001C60,  // ..........***...**....
+     0x00000CC0,  // ...........**..**.....
+     0x00000FC0,  // ...........******.....
+     0x00000780,  // ............****......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000300,  // .............**.......
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
   },
-  {             // 222
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000006E0,  // ..**.***....
-     0x00000BB0,  // .*.***.**...
-     0x00000B18,  // .*.**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000118,  // ....*...**..
-     0x00000018,  // ........**..
-     0x00000008,  // .........*..
-     0x00000000,  // ............
+  {             // 191
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00061F00,  // ..**....*****.......
+     0x00067FC0,  // ..**..*********.....
+     0x000CE0E0,  // .**..***.....***....
+     0x0001C070,  // ....***.......***...
+     0x00018030,  // ....**.........**...
+     0x00038038,  // ...***.........***..
+     0x00030018,  // ...**...........**..
+     0x00030018,  // ...**...........**..
+     0x00030018,  // ...**...........**..
+     0x00030018,  // ...**...........**..
+     0x00030018,  // ...**...........**..
+     0x00030018,  // ...**...........**..
+     0x00018030,  // ....**.........**...
+     0x00018030,  // ....**.........**...
+     0x0000C060,  // .....**.......**....
+     0x000060C0,  // ......**.....**.....
+     0x0003F1F8,  // ...******...******..
+     0x0003F1F8,  // ...******...******..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 223
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000080,  // .....*......
-     0x00000080,  // .....*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000380,  // ...***......
-     0x000004C0,  // ..*..**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C8,  // .....**..*..
-     0x00000070,  // ......***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 192
+     5, 25,
+     0x00000000,  // .........
+     0x00000070,  // .....***...
+     0x00000060,  // .....**....
+     0x00000CCE,  // **..**..***
+     0x00000C0E,  // **......***
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
-  {             // 224
-     12, 23,
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x0000064C,  // ..**..*..**.
-     0x00000F1E,  // .****...****
-     0x0000060C,  // ..**.....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000B0C,  // .*.**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x00000318,  // ...**...**..
-     0x00000398,  // ...***..**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 193
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00000D80,  // ......**.**......
+     0x00000DC0,  // ......**.***.....
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00001860,  // .....**....**....
+     0x00003060,  // ....**.....**....
+     0x00003070,  // ....**.....***...
+     0x00007FF0,  // ...***********...
+     0x00007FF8,  // ...************..
+     0x00006038,  // ...**.......***..
+     0x0000E018,  // ..***........**..
+     0x0000C01C,  // ..**.........***.
+     0x0000C00C,  // ..**..........**.
+     0x0001C00E,  // .***..........***
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 225
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003C2,  // ...****....*
-     0x00000666,  // ..**..**..**
-     0x00000C64,  // .**...**..*.
-     0x00000C3C,  // .**....****.
-     0x00000C38,  // .**....***..
-     0x00000C30,  // .**....**...
-     0x00000C38,  // .**....***..
-     0x0000067A,  // ..**..****.*
-     0x000003CC,  // ...****..**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 194
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FC0,  // ..*********.....
+     0x00007FF0,  // ..***********...
+     0x00006038,  // ..**.......***..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006018,  // ..**........**..
+     0x00006030,  // ..**.......**...
+     0x00007FE0,  // ..**********....
+     0x00007FF0,  // ..***********...
+     0x00006038,  // ..**.......***..
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00007FF0,  // ..***********...
+     0x00007FE0,  // ..**********....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 226
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x00000670,  // ..**..***...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000DE0,  // .**.****....
-     0x00000C30,  // .**....**...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000E18,  // .***....**..
-     0x00000F30,  // .****..**...
-     0x00000DE0,  // .**.****....
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000800,  // .*..........
-     0x00000000,  // ............
+  {             // 195
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 227
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000302,  // ...**......*
-     0x00000784,  // ..****....*.
-     0x00000FCC,  // .******..**.
-     0x000008C8,  // .*...**..*..
-     0x00000058,  // ......*.**..
-     0x00000050,  // ......*.*...
-     0x00000070,  // ......***...
-     0x00000060,  // ......**....
-     0x000000E0,  // .....***....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000080,  // .....*......
-     0x00000000,  // ............
+  {             // 196
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000580,  // .......*.**......
+     0x00000D80,  // ......**.**......
+     0x00000DC0,  // ......**.***.....
+     0x00001CC0,  // .....***..**.....
+     0x000018C0,  // .....**...**.....
+     0x00001860,  // .....**....**....
+     0x00003060,  // ....**.....**....
+     0x00003070,  // ....**.....***...
+     0x00007030,  // ...***......**...
+     0x00006038,  // ...**.......***..
+     0x00006038,  // ...**.......***..
+     0x0000E018,  // ..***........**..
+     0x0000C01C,  // ..**.........***.
+     0x0000FFFC,  // ..**************.
+     0x0001FFFE,  // .****************
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 228
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000318,  // ...**...**..
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000003E0,  // ...*****....
-     0x00000770,  // ..***.***...
-     0x00000630,  // ..**...**...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000630,  // ..**...**...
-     0x00000770,  // ..***.***...
-     0x000001C0,  // ....***.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 197
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FC0,  // ..*********.....
+     0x00007FC0,  // ..*********.....
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00007FF8,  // ..************..
+     0x00007FF8,  // ..************..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 229
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000700,  // ..***.......
-     0x000003E0,  // ...*****....
-     0x00000700,  // ..***.......
-     0x00000608,  // ..**.....*..
-     0x00000718,  // ..***...**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 198
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFE,  // .*************
+     0x00003FFC,  // .************.
+     0x0000000C,  // ...........**.
+     0x00000018,  // ..........**..
+     0x00000030,  // .........**...
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00001C00,  // ..***.........
+     0x00001800,  // ..**..........
+     0x00003000,  // .**...........
+     0x00007FFC,  // *************.
+     0x00007FFC,  // *************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 230
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x0000019C,  // ....**..***.
-     0x000000FC,  // .....******.
-     0x000001F8,  // ....******..
-     0x00000380,  // ...***......
-     0x00000700,  // ..***.......
-     0x00000E00,  // .***........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000E00,  // .***........
-     0x00000700,  // ..***.......
-     0x000003C0,  // ...****.....
-     0x000000F0,  // .....****...
-     0x00000018,  // ........**..
-     0x000000C8,  // .....**..*..
-     0x000000C8,  // .....**..*..
-     0x00000070,  // ......***...
-     0x00000000,  // ............
+  {             // 199
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000FFFC,  // ..**************.
+     0x0000FFFC,  // ..**************.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 200
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x0000F0F8,  // ...****....*****..
+     0x0000C038,  // ...**........***..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x00031FC6,  // .**...*******...**
+     0x00031FC6,  // .**...*******...**
+     0x0003000E,  // .**............***
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0000C018,  // ...**.........**..
+     0x0000E078,  // ...***......****..
+     0x00003FF0,  // .....**********...
+     0x00001FC0,  // ......*******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 231
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000006E0,  // ..**.***....
-     0x00000BB0,  // .*.***.**...
-     0x00000B18,  // .*.**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000118,  // ....*...**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000008,  // .........*..
-     0x00000000,  // ............
+  {             // 201
+     7, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
-  {             // 232
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000E0,  // .....***....
-     0x000001B0,  // ....**.**...
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x000007FC,  // ..*********.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 202
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00006070,  // ..**......***...
+     0x000060E0,  // ..**.....***....
+     0x000061C0,  // ..**....***.....
+     0x00006380,  // ..**...***......
+     0x00006700,  // ..**..***.......
+     0x00006F00,  // ..**.****.......
+     0x00007F00,  // ..*******.......
+     0x00007B80,  // ..****.***......
+     0x000071C0,  // ..***...***.....
+     0x000060E0,  // ..**.....***....
+     0x000060E0,  // ..**.....***....
+     0x00006070,  // ..**......***...
+     0x00006038,  // ..**.......***..
+     0x00006038,  // ..**.......***..
+     0x0000601C,  // ..**........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 233
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000380,  // ...***......
-     0x000004C0,  // ..*..**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C8,  // .....**..*..
-     0x00000070,  // ......***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 203
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000300,  // .......**.......
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000D80,  // .....**.**......
+     0x00000CC0,  // .....**..**.....
+     0x00000CC0,  // .....**..**.....
+     0x000018E0,  // ....**...***....
+     0x00001860,  // ....**....**....
+     0x00003860,  // ...***....**....
+     0x00003070,  // ...**.....***...
+     0x00003030,  // ...**......**...
+     0x00006030,  // ..**.......**...
+     0x00006038,  // ..**.......***..
+     0x0000E018,  // .***........**..
+     0x0000C01C,  // .**.........***.
+     0x0000C00C,  // .**..........**.
+     0x0001C00C,  // ***..........**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 234
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000E38,  // .***...***..
-     0x00000660,  // ..**..**....
-     0x000006C0,  // ..**.**.....
-     0x000007C0,  // ..*****.....
-     0x000006E0,  // ..**.***....
-     0x00000670,  // ..**..***...
-     0x0000063A,  // ..**...***.*
-     0x00000F1C,  // .****...***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 204
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0001C01C,  // ..***.........***.
+     0x0001E03C,  // ..****.......****.
+     0x0001E03C,  // ..****.......****.
+     0x0001F07C,  // ..*****.....*****.
+     0x0001B06C,  // ..**.**.....**.**.
+     0x0001B8EC,  // ..**.***...***.**.
+     0x000198CC,  // ..**..**...**..**.
+     0x00019DCC,  // ..**..***.***..**.
+     0x00018D8C,  // ..**...**.**...**.
+     0x00018F8C,  // ..**...*****...**.
+     0x0001870C,  // ..**....***....**.
+     0x0001870C,  // ..**....***....**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 235
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000F00,  // .****.......
-     0x00000980,  // .*..**......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x000001E0,  // ....****....
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x00000630,  // ..**...**...
-     0x00000632,  // ..**...**..*
-     0x00000C1E,  // .**.....****
-     0x00000C0C,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 205
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000E00C,  // ..***.........**.
+     0x0000E00C,  // ..***.........**.
+     0x0000F00C,  // ..****........**.
+     0x0000F80C,  // ..*****.......**.
+     0x0000D80C,  // ..**.**.......**.
+     0x0000DC0C,  // ..**.***......**.
+     0x0000CE0C,  // ..**..***.....**.
+     0x0000C70C,  // ..**...***....**.
+     0x0000C70C,  // ..**...***....**.
+     0x0000C38C,  // ..**....***...**.
+     0x0000C1CC,  // ..**.....***..**.
+     0x0000C0CC,  // ..**......**..**.
+     0x0000C0EC,  // ..**......***.**.
+     0x0000C07C,  // ..**.......*****.
+     0x0000C03C,  // ..**........****.
+     0x0000C03C,  // ..**........****.
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
-  {             // 236
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000410,  // ..*.....*...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C34,  // .**....**.*.
-     0x00000E7C,  // .***..*****.
-     0x00000BC8,  // .*.****..*..
-     0x00000800,  // .*..........
-     0x00000800,  // .*..........
-     0x00000800,  // .*..........
-     0x00000800,  // .*..........
-     0x00000000,  // ............
+  {             // 206
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ...**********..
+     0x00001FF8,  // ...**********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
-  {             // 237
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000070C,  // ..***....**.
-     0x0000030C,  // ...**....**.
-     0x00000188,  // ....**...*..
-     0x00000188,  // ....**...*..
-     0x000000D8,  // .....**.**..
-     0x000000D0,  // .....**.*...
-     0x00000070,  // ......***...
-     0x00000070,  // ......***...
-     0x00000030,  // .......**...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 207
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x0000F078,  // ...****.....****..
+     0x0000C038,  // ...**........***..
+     0x0001801C,  // ..**..........***.
+     0x0001800C,  // ..**...........**.
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x00030006,  // .**.............**
+     0x00030006,  // .**.............**
+     0x0003000E,  // .**............***
+     0x0003000E,  // .**............***
+     0x0001800C,  // ..**...........**.
+     0x0001801C,  // ..**..........***.
+     0x0000C018,  // ...**.........**..
+     0x0000F078,  // ...****.....****..
+     0x00003FE0,  // .....*********....
+     0x00001FC0,  // ......*******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 238
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000338,  // ...**..***..
-     0x000001F8,  // ....******..
-     0x00000380,  // ...***......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x000001F8,  // ....******..
-     0x000001F0,  // ....*****...
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000700,  // ..***.......
-     0x000003C0,  // ...****.....
-     0x000000F0,  // .....****...
-     0x00000018,  // ........**..
-     0x00000188,  // ....**...*..
-     0x00000198,  // ....**..**..
-     0x000000F0,  // .....****...
-     0x00000000,  // ............
+  {             // 208
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFFC,  // ..**************.
+     0x0000FFFC,  // ..**************.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x0000C00C,  // ..**..........**.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
-  {             // 239
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000738,  // ..***..***..
-     0x000001E0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 209
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007FE0,  // ..**********....
+     0x00007FF8,  // ..************..
+     0x0000603C,  // ..**.......****.
+     0x0000601C,  // ..**........***.
+     0x0000600C,  // ..**.........**.
+     0x0000600C,  // ..**.........**.
+     0x0000601C,  // ..**........***.
+     0x00006038,  // ..**.......***..
+     0x00007FF8,  // ..************..
+     0x00007FE0,  // ..**********....
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00006000,  // ..**............
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 240
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FC,  // ...********.
-     0x000007F8,  // ..********..
-     0x00000920,  // .*..*..*....
-     0x00000120,  // ....*..*....
-     0x00000120,  // ....*..*....
-     0x00000120,  // ....*..*....
-     0x00000324,  // ...**..*..*.
-     0x0000033C,  // ...**..****.
-     0x00000618,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 210
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00003800,  // ..***..........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
-  {             // 241
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000730,  // ..***..**...
-     0x000006E0,  // ..**.***....
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000000,  // ............
+  {             // 211
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00003800,  // ..***..........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
-  {             // 242
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000078,  // ......****..
-     0x000000FC,  // .....******.
-     0x00000184,  // ....**....*.
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000380,  // ...***......
-     0x000001F0,  // ....*****...
-     0x000000F8,  // .....*****..
-     0x00000004,  // ..........*.
-     0x00000004,  // ..........*.
-     0x0000007C,  // ......*****.
-     0x00000078,  // ......****..
-     0x00000000,  // ............
+  {             // 212
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 243
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ....*******.
-     0x000007E0,  // ..******....
-     0x00000630,  // ..**...**...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000630,  // ..**...**...
-     0x000003E0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 213
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000E00C,  // .***.........**.
+     0x0000E01C,  // .***........***.
+     0x00007018,  // ..***.......**..
+     0x00003030,  // ...**......**...
+     0x00003870,  // ...***....***...
+     0x00001C60,  // ....***...**....
+     0x00000CC0,  // .....**..**.....
+     0x00000FC0,  // .....******.....
+     0x00000780,  // ......****......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 244
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ....*******.
-     0x000003F8,  // ...*******..
-     0x00000440,  // ..*...*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000044,  // ......*...*.
-     0x00000078,  // ......****..
-     0x00000030,  // .......**...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 214
+     19, 25,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000C00,  // ........**.........
+     0x00000C00,  // ........**.........
+     0x00007F80,  // .....********......
+     0x0001FFE0,  // ...************....
+     0x00038C78,  // ..***...**...****..
+     0x00030C38,  // ..**....**....***..
+     0x00070C1C,  // .***....**.....***.
+     0x00060C1C,  // .**.....**.....***.
+     0x00060C0C,  // .**.....**......**.
+     0x00060C0C,  // .**.....**......**.
+     0x00060C1C,  // .**.....**.....***.
+     0x00070C1C,  // .***....**.....***.
+     0x00030C38,  // ..**....**....***..
+     0x0003CC70,  // ..****..**...***...
+     0x0001FFE0,  // ...************....
+     0x00007F80,  // .....********......
+     0x00000C00,  // ........**.........
+     0x00000C00,  // ........**.........
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 215
+     16, 25,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000E01C,  // .***........***.
+     0x00007018,  // ..***.......**..
+     0x00003030,  // ...**......**...
+     0x00003870,  // ...***....***...
+     0x00001CE0,  // ....***..***....
+     0x00000CC0,  // .....**..**.....
+     0x00000F80,  // .....*****......
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000DC0,  // .....**.***.....
+     0x00001CE0,  // ....***..***....
+     0x00003860,  // ...***....**....
+     0x00003070,  // ...**.....***...
+     0x00007038,  // ..***......***..
+     0x0000E018,  // .***........**..
+     0x0001C01C,  // ***.........***.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 216
+     20, 25,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x000C0C18,  // .**......**.....**..
+     0x000C0C18,  // .**......**.....**..
+     0x000C0C18,  // .**......**.....**..
+     0x000C0C18,  // .**......**.....**..
+     0x000C0C18,  // .**......**.....**..
+     0x000C0C18,  // .**......**.....**..
+     0x000C0C18,  // .**......**.....**..
+     0x000E0C38,  // .***.....**....***..
+     0x00060C30,  // ..**.....**....**...
+     0x00078C70,  // ..****...**...***...
+     0x0003FFE0,  // ...*************....
+     0x00007F80,  // ......********......
+     0x00000C00,  // .........**.........
+     0x00000C00,  // .........**.........
+     0x00000C00,  // .........**.........
+     0x00000C00,  // .........**.........
+     0x00000C00,  // .........**.........
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
-  {             // 245
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000B0C,  // .*.**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x00000318,  // ...**...**..
-     0x00000398,  // ...***..**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 217
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F00,  // ......*****.......
+     0x00007FC0,  // ....*********.....
+     0x0000E0E0,  // ...***.....***....
+     0x0001C070,  // ..***.......***...
+     0x00018030,  // ..**.........**...
+     0x00038038,  // .***.........***..
+     0x00030018,  // .**...........**..
+     0x00030018,  // .**...........**..
+     0x00030018,  // .**...........**..
+     0x00030018,  // .**...........**..
+     0x00030018,  // .**...........**..
+     0x00030018,  // .**...........**..
+     0x00018030,  // ..**.........**...
+     0x00018030,  // ..**.........**...
+     0x0000C060,  // ...**.......**....
+     0x000060C0,  // ....**.....**.....
+     0x0003F1F8,  // .******...******..
+     0x0003F1F8,  // .******...******..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 246
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x000001F0,  // ....*****...
-     0x0000075C,  // ..***.*.***.
-     0x0000064C,  // ..**..*..**.
-     0x00000C46,  // .**...*...**
-     0x00000C46,  // .**...*...**
-     0x00000C46,  // .**...*...**
-     0x0000064C,  // ..**..*..**.
-     0x0000075C,  // ..***.*.***.
-     0x000001F0,  // ....*****...
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
+  {             // 218
+     7, 25,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000376,  // **.***.**
+     0x00000376,  // **.***.**
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000070,  // ...***...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
-  {             // 247
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000602,  // ..**.......*
-     0x00000F06,  // .****.....**
-     0x0000098C,  // .*..**...**.
-     0x00000198,  // ....**..**..
-     0x000000D0,  // .....**.*...
-     0x000000F0,  // .....****...
-     0x00000060,  // ......**....
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000001B0,  // ....**.**...
-     0x00000332,  // ...**..**..*
-     0x0000061E,  // ..**....****
-     0x00000C0C,  // .**......**.
-     0x00000000,  // ............
+  {             // 219
+     16, 25,
+     0x00000000,  // ................
+     0x0001800E,  // .**...........***
+     0x0001800E,  // .**...........***
+     0x00000000,  // .................
+     0x0001800E,  // .**...........***
+     0x0000C00C,  // ..**..........**.
+     0x0000E018,  // ..***........**..
+     0x00007038,  // ...***......***..
+     0x00003870,  // ....***....***...
+     0x00001C60,  // .....***...**....
+     0x00000CC0,  // ......**..**.....
+     0x00000F80,  // ......*****......
+     0x00000780,  // .......****......
+     0x00000300,  // ........**.......
+     0x00000300,  // ........**.......
+     0x00000300,  // ........**.......
+     0x00000300,  // ........**.......
+     0x00000300,  // ........**.......
+     0x00000300,  // ........**.......
+     0x00000300,  // ........**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 248
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000C46,  // .**...*...**
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x0000064C,  // ..**..*..**.
-     0x00000358,  // ...**.*.**..
-     0x00000358,  // ...**.*.**..
-     0x000001F0,  // ....*****...
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
+  {             // 220
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00000FD8,  // ...******.**..
+     0x00001EF8,  // ..****.*****..
+     0x00001838,  // ..**.....***..
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003838,  // .***.....***..
+     0x00001878,  // ..**....****..
+     0x00000FEE,  // ...*******.***
+     0x000007CC,  // ....*****..**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 249
-     12, 23,
-     0x00000000,  // ............
+  {             // 221
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000038,  // .....***..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001FC,  // ..*******.
+     0x00000388,  // .***...*..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001E0,  // ..****....
+     0x000001E0,  // ..****....
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 222
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // .......***...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000CF0,  // ..**..****...
+     0x00000FF8,  // ..*********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+  },
+  {             // 223
+     5, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ...***.
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 224
+     13, 25,
+     0x00000000,  // .............
+     0x00000070,  // .......***...
+     0x000000E0,  // ......***....
+     0x00000CCC,  // ..**..**..**.
+     0x00000C0C,  // ..**......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000618,  // ...**....**..
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 225
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FD8,  // ...******.**..
+     0x00001EF8,  // ..****.*****..
+     0x00001838,  // ..**.....***..
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003838,  // .***.....***..
+     0x00001878,  // ..**....****..
+     0x00000FEE,  // ...*******.***
+     0x000007CC,  // ....*****..**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 226
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000FF0,  // ...********...
+     0x00000C38,  // ...**....***..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001870,  // ..**....***...
+     0x000019E0,  // ..**..****....
+     0x000018F0,  // ..**...****...
+     0x00001818,  // ..**......**..
+     0x0000181C,  // ..**......***.
+     0x0000180C,  // ..**.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00001E18,  // ..****....**..
+     0x00001FF8,  // ..**********..
+     0x000019E0,  // ..**..****....
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+  },
+  {             // 227
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5652,175 +5469,806 @@ cFont::tPixelData FontOsd_iso8859_7[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
      0x00000C0C,  // .**......**.
-     0x00000806,  // .*........**
-     0x00000806,  // .*........**
-     0x000008C6,  // .*...**...**
-     0x000008C6,  // .*...**...**
-     0x00000CC6,  // .**..**...**
-     0x00000FFC,  // .**********.
-     0x00000738,  // ..***..***..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 250
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
      0x00000618,  // ..**....**..
-     0x00000F3C,  // .****..****.
      0x00000618,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000380,  // ...***......
-     0x000004C0,  // ..*..**.....
+     0x00000738,  // ..***..***..
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
      0x000000C0,  // .....**.....
      0x000000C0,  // .....**.....
      0x000000C0,  // .....**.....
      0x000000C0,  // .....**.....
      0x000000C0,  // .....**.....
-     0x000000C8,  // .....**..*..
-     0x00000070,  // ......***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
   },
-  {             // 251
-     12, 23,
+  {             // 228
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000E00,  // ..***........
+     0x00000300,  // ....**.......
+     0x000001C0,  // .....***.....
+     0x000003E0,  // ....*****....
+     0x000007F8,  // ...********..
+     0x00000C1C,  // ..**.....***.
+     0x00001C0C,  // .***......**.
+     0x0000180E,  // .**.......***
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180E,  // .**.......***
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x00000308,  // .**....*..
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001E0,  // ..****....
+     0x000001E0,  // ..****....
+     0x00000380,  // .***......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 230
+     10, 25,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000FE,  // ...*******
+     0x000000FE,  // ...*******
+     0x0000000C,  // .......**.
+     0x00000010,  // ......*...
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000380,  // .***......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000380,  // .***......
+     0x000001F8,  // ..******..
+     0x000000FC,  // ...******.
+     0x0000000E,  // .......***
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x0000001C,  // ......***.
+     0x00000018,  // ......**..
+  },
+  {             // 231
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000DF0,  // ..**.*****...
+     0x00000FF8,  // ..*********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x00000000,  // .............
+  },
+  {             // 232
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0E,  // ..**......***
+     0x0000180E,  // .**.......***
+     0x0000180E,  // .**.......***
+     0x00001806,  // .**........**
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180E,  // .**.......***
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 233
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 234
+     12, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C38,  // ..**....***..
+     0x00000C70,  // ..**...***...
+     0x00000CE0,  // ..**..***....
+     0x00000DC0,  // ..**.***.....
+     0x00000F80,  // ..*****......
+     0x00000F80,  // ..*****......
+     0x00000FC0,  // ..******.....
+     0x00000CC0,  // ..**..**.....
+     0x00000C60,  // ..**...**....
+     0x00000C70,  // ..**...***...
+     0x00000C38,  // ..**....***..
+     0x00000C1C,  // ..**.....***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 235
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000300,  // ...**.......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000003E0,  // ...*****....
+     0x00000370,  // ...**.***...
+     0x00000330,  // ...**..**...
+     0x00000630,  // ..**...**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00001C0C,  // ***......**.
      0x00000000,  // ............
-     0x00000318,  // ...**...**..
-     0x000007BC,  // ..****.****.
-     0x00000318,  // ...**...**..
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000B0C,  // .*.**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x00000318,  // ...**...**..
-     0x00000398,  // ...***..**..
-     0x000001F0,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
+  },
+  {             // 236
+     14, 25,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001C38,  // ..***....***..
+     0x00001FF8,  // ..**********..
+     0x00001BD8,  // ..**.****.**..
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+  },
+  {             // 237
+     12, 25,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-  },
-  {             // 252
-     12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x00001C0C,  // ***......**.
      0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
      0x00000618,  // ..**....**..
-     0x00000738,  // ..***..***..
+     0x00000618,  // ..**....**..
+     0x00000730,  // ..***..**...
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
      0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000000C0,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
+  {             // 238
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000300,  // ..**.......
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000300,  // ..**.......
+     0x000001F0,  // ...*****...
+     0x000000F0,  // ....****...
+     0x00000180,  // ...**......
+     0x00000300,  // ..**.......
+     0x00000700,  // .***.......
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000700,  // .***.......
+     0x000003E0,  // ..*****....
+     0x000000FC,  // ....******.
+     0x0000001E,  // .......****
+     0x00000006,  // .........**
+     0x0000000E,  // ........***
+     0x0000007C,  // .....*****.
+     0x00000070,  // .....***...
+  },
+  {             // 239
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003F0,  // ....******...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00001C0E,  // .***......***
+     0x0000180E,  // .**.......***
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180E,  // .**.......***
+     0x00001C0C,  // .***......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 240
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 241
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000003F8,  // ....*******..
+     0x0000061C,  // ...**....***.
+     0x00000E0C,  // ..***.....**.
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000C06,  // ..**.......**
+     0x00000E0C,  // ..***.....**.
+     0x00000E1C,  // ..***....***.
+     0x00000FF8,  // ..*********..
+     0x00000DF0,  // ..**.*****...
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+  },
+  {             // 242
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000003E,  // ......*****
+     0x000000FE,  // ....*******
+     0x000001C0,  // ...***.....
+     0x00000300,  // ..**.......
+     0x00000300,  // ..**.......
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000700,  // .***.......
+     0x000003C0,  // ..****.....
+     0x000001F8,  // ...******..
+     0x0000007E,  // .....******
+     0x0000000E,  // ........***
+     0x00000006,  // .........**
+     0x0000000E,  // ........***
+     0x0000007C,  // .....*****.
+     0x00000070,  // .....***...
+  },
+  {             // 243
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFE,  // ....***********
+     0x00001FFE,  // ...************
+     0x00003070,  // ..**.....***...
+     0x00003038,  // ..**......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006038,  // .**.......***..
+     0x00007030,  // .***......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 244
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FE,  // .********
+     0x000001FE,  // .********
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 245
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 246
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000CF0,  // ....**..****...
+     0x00001DF8,  // ...***.******..
+     0x0000318C,  // ..**...**...**.
+     0x0000618E,  // .**....**...***
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x0000618E,  // .**....**...***
+     0x0000718C,  // .***...**...**.
+     0x0000319C,  // ..**...**..***.
+     0x00003DB8,  // ..****.**.***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+  },
+  {             // 247
+     12, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000181C,  // .**......***.
+     0x00001C18,  // .***.....**..
+     0x00000C38,  // ..**....***..
+     0x00000E30,  // ..***...**...
+     0x00000660,  // ...**..**....
+     0x00000760,  // ...***.**....
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x000001C0,  // .....***.....
+     0x000003C0,  // ....****.....
+     0x000003E0,  // ....*****....
+     0x00000660,  // ...**..**....
+     0x00000630,  // ...**...**...
+     0x00000C30,  // ..**....**...
+     0x00000C18,  // ..**.....**..
+     0x00001818,  // .**......**..
+     0x0000380C,  // ***.......**.
+  },
+  {             // 248
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001800C,  // .**...........**.
+     0x0001860C,  // .**....**.....**.
+     0x0001860C,  // .**....**.....**.
+     0x0001860C,  // .**....**.....**.
+     0x0001861C,  // .**....**....***.
+     0x0001C61C,  // .***...**....***.
+     0x0000C638,  // ..**...**...***..
+     0x0000FFF8,  // ..*************..
+     0x00003FE0,  // ....*********....
+     0x00000600,  // .......**........
+     0x00000600,  // .......**........
+     0x00000600,  // .......**........
+     0x00000600,  // .......**........
+     0x00000000,  // .................
+  },
+  {             // 249
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0000C00C,  // ...**..........**.
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00038706,  // .***....***.....**
+     0x0001878C,  // ..**....****...**.
+     0x0001FCFC,  // ..*******..******.
+     0x00007878,  // ....****....****..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 250
+     5, 25,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000019E,  // .**..****
+     0x0000019E,  // .**..****
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 251
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E18,  // ..***....**..
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 252
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // .......***...
+     0x000000E0,  // ......***....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x000003F0,  // ....******...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00001C0E,  // .***......***
+     0x0000180E,  // .**.......***
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180E,  // .**.......***
+     0x00001C0C,  // .***......**.
+     0x00000E1C,  // ..***....***.
+     0x000007F8,  // ...********..
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
   {             // 253
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000B0C,  // .*.**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x00000318,  // ...**...**..
-     0x00000398,  // ...***..**..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // .......***...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000E18,  // ..***....**..
+     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 254
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000806,  // .*........**
-     0x00000806,  // .*........**
-     0x000008C6,  // .*...**...**
-     0x000008C6,  // .*...**...**
-     0x00000CCE,  // .**..**..***
-     0x00000FFC,  // .**********.
-     0x00000738,  // ..***..***..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     18, 25,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x000001C0,  // ..........***.....
+     0x00000380,  // .........***......
+     0x00000300,  // .........**.......
+     0x00000000,  // ..................
+     0x0000C018,  // ...**.........**..
+     0x0001800C,  // ..**...........**.
+     0x0001800C,  // ..**...........**.
+     0x0003830E,  // .***.....**....***
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x00030306,  // .**......**.....**
+     0x0003870E,  // .***....***....***
+     0x0001878C,  // ..**....****...**.
+     0x0001FCFC,  // ..*******..******.
+     0x00007870,  // ....****....***...
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 255
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     0, 25,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
   };
diff --git a/fontsml-iso8859-2.c b/fontsml-iso8859-2.c
new file mode 100644
index 000000000..f33afd635
--- /dev/null
+++ b/fontsml-iso8859-2.c
@@ -0,0 +1,5826 @@
+cFont::tPixelData FontSml_iso8859_2[][25] = {
+  {             // 32
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 33
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000024,  // *..*.
+     0x00000024,  // *..*.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 35
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000090,  // ...*..*...
+     0x00000090,  // ...*..*...
+     0x00000090,  // ...*..*...
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000120,  // ..*..*....
+     0x00000120,  // ..*..*....
+     0x00000120,  // ..*..*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 36
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000020,  // .....*....
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000032C,  // .**..*.**.
+     0x00000320,  // .**..*....
+     0x000003A0,  // .***.*....
+     0x000001E0,  // ..****....
+     0x000000F8,  // ...*****..
+     0x0000003C,  // .....****.
+     0x00000026,  // .....*..**
+     0x00000326,  // .**..*..**
+     0x000003AE,  // .***.*.***
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000020,  // .....*....
+     0x00000020,  // .....*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 37
+     16, 23,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007860,  // ..****....**....
+     0x0000FCC0,  // .******..**.....
+     0x0000CCC0,  // .**..**..**.....
+     0x0000CD80,  // .**..**.**......
+     0x0000FD80,  // .******.**......
+     0x00007B00,  // ..****.**.......
+     0x00000300,  // .......**.......
+     0x00000678,  // ......**..****..
+     0x000006FC,  // ......**.******.
+     0x00000CCC,  // .....**..**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x000018FC,  // ....**...******.
+     0x00001878,  // ....**....****..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 38
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000780,  // ...****......
+     0x00000FC0,  // ..******.....
+     0x00000CC0,  // ..**..**.....
+     0x00000CC0,  // ..**..**.....
+     0x00000780,  // ...****......
+     0x00000F80,  // ..*****......
+     0x00001DD8,  // .***.***.**..
+     0x000018D8,  // .**...**.**..
+     0x00001878,  // .**....****..
+     0x00001870,  // .**....***...
+     0x00001CF8,  // .***..*****..
+     0x00000FDC,  // ..******.***.
+     0x0000078E,  // ...****...***
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 39
+     3, 23,
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+  },
+  {             // 40
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+  },
+  {             // 41
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000020,  // .*....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000020,  // .*....
+  },
+  {             // 42
+     7, 23,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x0000007C,  // .*****.
+     0x00000038,  // ..***..
+     0x00000038,  // ..***..
+     0x00000044,  // .*...*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 43
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 44
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 45
+     7, 23,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x0000007C,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 46
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000004,  // ...*.
+     0x00000004,  // ...*.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000010,  // .*...
+     0x00000010,  // .*...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 48
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 49
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x000001F0,  // ..*****...
+     0x000001F0,  // ..*****...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 50
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000000C,  // .......**.
+     0x0000001C,  // ......***.
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x000001C0,  // ..***.....
+     0x00000380,  // .***......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 51
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000018,  // ......**..
+     0x00000070,  // ....***...
+     0x00000078,  // ....****..
+     0x0000001C,  // ......***.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 52
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000001C,  // ......***.
+     0x0000003C,  // .....****.
+     0x0000006C,  // ....**.**.
+     0x000000CC,  // ...**..**.
+     0x000000CC,  // ...**..**.
+     0x0000018C,  // ..**...**.
+     0x0000030C,  // .**....**.
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 53
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003F8,  // .*******..
+     0x000003F8,  // .*******..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003F0,  // .******...
+     0x000003F8,  // .*******..
+     0x0000031C,  // .**...***.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 54
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000370,  // .**.***...
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000038C,  // .***...**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 55
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x0000000C,  // .......**.
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 56
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000001F8,  // ..******..
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 57
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000001FC,  // ..*******.
+     0x000000EC,  // ...***.**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000318,  // .**...**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 58
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 59
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 60
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000003C,  // .....****.
+     0x000000F0,  // ...****...
+     0x000001C0,  // ..***.....
+     0x00000300,  // .**.......
+     0x000001C0,  // ..***.....
+     0x000000F0,  // ...****...
+     0x0000003C,  // .....****.
+     0x0000000C,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 61
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 62
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x000003C0,  // .****.....
+     0x000000F0,  // ...****...
+     0x00000038,  // .....***..
+     0x0000000C,  // .......**.
+     0x00000038,  // .....***..
+     0x000000F0,  // ...****...
+     0x000003C0,  // .****.....
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 63
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F8,  // .*******..
+     0x00000318,  // .**...**..
+     0x00000318,  // .**...**..
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 64
+     18, 23,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x00007038,  // ....***......***..
+     0x0000C018,  // ...**.........**..
+     0x00018ECC,  // ..**...***.**..**.
+     0x00019DCC,  // ..**..***.***..**.
+     0x000318CC,  // .**...**...**..**.
+     0x0003318C,  // .**..**...**...**.
+     0x00033198,  // .**..**...**..**..
+     0x00033198,  // .**..**...**..**..
+     0x00033330,  // .**..**..**..**...
+     0x00033FE0,  // .**..*********....
+     0x00019DC0,  // ..**..***.***.....
+     0x0001C000,  // ..***.............
+     0x0000E000,  // ...***............
+     0x00007FC0,  // ....*********.....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+  },
+  {             // 65
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 66
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FE0,  // .********....
+     0x00001FF0,  // .*********...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001830,  // .**.....**...
+     0x00001FF0,  // .*********...
+     0x00001FF8,  // .**********..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00001FF8,  // .**********..
+     0x00001FF0,  // .*********...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 67
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 68
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FE0,  // .********....
+     0x00001FF0,  // .*********...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF0,  // .*********...
+     0x00001FE0,  // .********....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 69
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 70
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 71
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x0000380C,  // .***.......**.
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x0000307C,  // .**.....*****.
+     0x0000307C,  // .**.....*****.
+     0x0000380C,  // .***.......**.
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FFC,  // ...**********.
+     0x000003EC,  // .....*****.**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 72
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 73
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 75
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000181C,  // .**......***.
+     0x00001838,  // .**.....***..
+     0x00001870,  // .**....***...
+     0x000018E0,  // .**...***....
+     0x000019C0,  // .**..***.....
+     0x00001B80,  // .**.***......
+     0x00001F00,  // .*****.......
+     0x00001F80,  // .******......
+     0x000019C0,  // .**..***.....
+     0x000018E0,  // .**...***....
+     0x00001870,  // .**....***...
+     0x00001838,  // .**.....***..
+     0x0000181C,  // .**......***.
+     0x0000180E,  // .**.......***
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 76
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 77
+     16, 23,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x0000E01C,  // .***........***.
+     0x0000F03C,  // .****......****.
+     0x0000F03C,  // .****......****.
+     0x0000D86C,  // .**.**....**.**.
+     0x0000D86C,  // .**.**....**.**.
+     0x0000CCCC,  // .**..**..**..**.
+     0x0000CCCC,  // .**..**..**..**.
+     0x0000C48C,  // .**...*..*...**.
+     0x0000C78C,  // .**...****...**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 78
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00001E0C,  // .****.....**.
+     0x00001E0C,  // .****.....**.
+     0x00001B0C,  // .**.**....**.
+     0x0000198C,  // .**..**...**.
+     0x0000198C,  // .**..**...**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x0000186C,  // .**....**.**.
+     0x0000183C,  // .**.....****.
+     0x0000183C,  // .**.....****.
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 79
+     15, 23,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 81
+     15, 23,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x000070DC,  // .***....**.***.
+     0x000030D8,  // ..**....**.**..
+     0x00003878,  // ..***....****..
+     0x00001FF0,  // ...*********...
+     0x000007D8,  // .....*****.**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 83
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000078,  // .......****..
+     0x0000001C,  // .........***.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 84
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 86
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 87
+     18, 23,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x00030F0C,  // .**....****....**.
+     0x00018F18,  // ..**...****...**..
+     0x00018918,  // ..**...*..*...**..
+     0x00019998,  // ..**..**..**..**..
+     0x00019998,  // ..**..**..**..**..
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D0B0,  // ...**.*....*.**...
+     0x000070E0,  // ....***....***....
+     0x00006060,  // ....**......**....
+     0x00006060,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 88
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x00000360,  // ....**.**....
+     0x00000630,  // ...**...**...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 89
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 90
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 91
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001E,  // .****
+     0x0000001E,  // .****
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x0000001E,  // .****
+     0x0000001E,  // .****
+  },
+  {             // 92
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000010,  // .*...
+     0x00000010,  // .*...
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000004,  // ...*.
+     0x00000004,  // ...*.
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 93
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+  },
+  {             // 94
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x0000018C,  // .**...**.
+     0x00000104,  // .*.....*.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 95
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000007FE,  // **********
+     0x000007FE,  // **********
+  },
+  {             // 96
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000018,  // **..
+     0x0000000C,  // .**.
+     0x00000006,  // ..**
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 97
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x0000001C,  // .....***.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000EC,  // ..***.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 98
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 99
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 101
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 102
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001E,  // ..****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x0000000C,  // ........**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000000E0,  // ....***....
+  },
+  {             // 104
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000338,  // .**..***..
+     0x0000037C,  // .**.*****.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 105
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 106
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+  },
+  {             // 107
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x0000018C,  // .**...**.
+     0x00000198,  // .**..**..
+     0x000001B0,  // .**.**...
+     0x000001E0,  // .****....
+     0x000001F0,  // .*****...
+     0x000001B0,  // .**.**...
+     0x00000198,  // .**..**..
+     0x0000019C,  // .**..***.
+     0x0000018C,  // .**...**.
+     0x0000018E,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 108
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 109
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003318,  // .**..**...**..
+     0x000037BC,  // .**.****.****.
+     0x000039CC,  // .***..***..**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 110
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000338,  // .**..***..
+     0x0000037C,  // .**.*****.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 111
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 112
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+  },
+  {             // 113
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+  },
+  {             // 114
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000036,  // .**.**
+     0x00000036,  // .**.**
+     0x00000038,  // .***..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 115
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001C,  // ..***.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003EC,  // .*****.**.
+     0x000001CC,  // ..***..**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001A58,  // ..**.*..*.**..
+     0x00000A50,  // ...*.*..*.*...
+     0x00000E70,  // ...***..***...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 121
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 122
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+  },
+  {             // 124
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+  },
+  {             // 125
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000060,  // **....
+  },
+  {             // 126
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ...**..**.
+     0x000001F8,  // ..******..
+     0x00000330,  // .**..**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 127
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 23,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 161
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001806,  // **........**
+     0x00001866,  // **....**..**
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x000000E0,  // .....***....
+  },
+  {             // 162
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000042,  // *....*
+     0x00000066,  // **..**
+     0x0000003C,  // .****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 163
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000360,  // .**.**....
+     0x000003E0,  // .*****....
+     0x00000780,  // ****......
+     0x00000700,  // ***.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000003FC,  // .********.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 165
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00003004,  // .**.........*.
+     0x00003004,  // .**.........*.
+     0x00003008,  // .**........*..
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003FC0,  // .********.....
+     0x00003FC0,  // .********.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 166
+     13, 23,
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000078,  // .......****..
+     0x0000001C,  // .........***.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 167
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003C0,  // .****.....
+     0x000001F0,  // ..*****...
+     0x000001B8,  // ..**.***..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x0000038C,  // .***...**.
+     0x000001CC,  // ..***..**.
+     0x000000F8,  // ...*****..
+     0x00000038,  // .....***..
+     0x0000001C,  // ......***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+  },
+  {             // 168
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000006C,  // **.**.
+     0x0000006C,  // **.**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 169
+     13, 23,
+     0x00000000,  // .............
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000078,  // .......****..
+     0x0000001C,  // .........***.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 170
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000078,  // .......****..
+     0x0000001C,  // .........***.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x000001C0,  // .....***.....
+     0x00000060,  // .......**....
+     0x00000360,  // ....**.**....
+     0x000003C0,  // ....****.....
+  },
+  {             // 171
+     12, 23,
+     0x00000000,  // ............
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 172
+     12, 23,
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 173
+     7, 23,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x0000007C,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 174
+     12, 23,
+     0x00000000,  // ............
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 175
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 176
+     7, 23,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000006C,  // .**.**.
+     0x00000044,  // .*...*.
+     0x0000006C,  // .**.**.
+     0x00000038,  // ..***..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 177
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x0000001C,  // .....***.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000FC,  // ..******.
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x000000C0,  // ..**.....
+     0x00000070,  // ...***...
+  },
+  {             // 178
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000E,  // ...***
+  },
+  {             // 179
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000E,  // .***
+     0x0000001E,  // ****
+     0x0000001C,  // ***.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 180
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // ..**
+     0x0000000C,  // .**.
+     0x00000018,  // **..
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 181
+     8, 23,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000C4,  // .**...*.
+     0x000000C4,  // .**...*.
+     0x000000C8,  // .**..*..
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 182
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 183
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x0000003C,  // .****.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x0000001C,  // .***.
+     0x00000006,  // ...**
+     0x00000036,  // **.**
+     0x0000003C,  // ****.
+  },
+  {             // 185
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000198,  // .**..**..
+     0x000000F0,  // ..****...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 186
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000070,  // ...***...
+     0x00000018,  // .....**..
+     0x000000D8,  // ..**.**..
+     0x000000F0,  // ..****...
+  },
+  {             // 187
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000018C,  // ..**...**.
+     0x00000184,  // ..**....*.
+     0x00000184,  // ..**....*.
+     0x000007E8,  // ******.*..
+     0x000007E0,  // ******....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x000001C0,  // ..***.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 188
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 189
+     5, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000036,  // ..**.**
+     0x0000006C,  // .**.**.
+     0x000000D8,  // **.**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 190
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000198,  // .**..**..
+     0x000000F0,  // ..****...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 191
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000030,  // ....**...
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 192
+     12, 23,
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 193
+     12, 23,
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 194
+     12, 23,
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 195
+     12, 23,
+     0x00000000,  // ............
+     0x00000210,  // ...*....*...
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 196
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000000,  // ............
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000001E0,  // ....****....
+     0x000001E0,  // ....****....
+     0x00000330,  // ...**..**...
+     0x00000330,  // ...**..**...
+     0x00000618,  // ..**....**..
+     0x00000618,  // ..**....**..
+     0x000007F8,  // ..********..
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00001806,  // **........**
+     0x00001806,  // **........**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 197
+     10, 23,
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 198
+     14, 23,
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 199
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000380,  // .....***......
+     0x000000C0,  // .......**.....
+     0x000006C0,  // ....**.**.....
+     0x00000780,  // ....****......
+  },
+  {             // 200
+     14, 23,
+     0x00000000,  // ..............
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 201
+     11, 23,
+     0x00000000,  // ...........
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 202
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000180,  // ...**......
+     0x000000E0,  // ....***....
+  },
+  {             // 203
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 204
+     11, 23,
+     0x00000000,  // ...........
+     0x00000330,  // ..**..**...
+     0x000001E0,  // ...****....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F8,  // .********..
+     0x000007F8,  // .********..
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 205
+     6, 23,
+     0x00000000,  // ......
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 23,
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 207
+     13, 23,
+     0x00000000,  // .............
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00001FE0,  // .********....
+     0x00001FF0,  // .*********...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF0,  // .*********...
+     0x00001FE0,  // .********....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 208
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FE0,  // .********....
+     0x00001FF0,  // .*********...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00003F0C,  // ******....**.
+     0x00003F0C,  // ******....**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF0,  // .*********...
+     0x00001FE0,  // .********....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 209
+     13, 23,
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00001E0C,  // .****.....**.
+     0x00001E0C,  // .****.....**.
+     0x00001B0C,  // .**.**....**.
+     0x0000198C,  // .**..**...**.
+     0x0000198C,  // .**..**...**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x0000186C,  // .**....**.**.
+     0x0000183C,  // .**.....****.
+     0x0000183C,  // .**.....****.
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 210
+     13, 23,
+     0x00000000,  // .............
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00001E0C,  // .****.....**.
+     0x00001E0C,  // .****.....**.
+     0x00001B0C,  // .**.**....**.
+     0x0000198C,  // .**..**...**.
+     0x0000198C,  // .**..**...**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x0000186C,  // .**....**.**.
+     0x0000183C,  // .**.....****.
+     0x0000183C,  // .**.....****.
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 211
+     15, 23,
+     0x00000000,  // ...............
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 23,
+     0x00000000,  // ...............
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 23,
+     0x00000000,  // ...............
+     0x000001B0,  // .......**.**...
+     0x00000360,  // ......**.**....
+     0x000006C0,  // .....**.**.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 23,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000006C0,  // .....**.**.....
+     0x000006C0,  // .....**.**.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x00000606,  // **......**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 216
+     12, 23,
+     0x00000000,  // ............
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 217
+     13, 23,
+     0x000001C0,  // .....***.....
+     0x00000360,  // ....**.**....
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 218
+     13, 23,
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 219
+     13, 23,
+     0x00000000,  // .............
+     0x000000D8,  // ......**.**..
+     0x000001B0,  // .....**.**...
+     0x00000360,  // ....**.**....
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 220
+     13, 23,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000330,  // ....**..**...
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 221
+     14, 23,
+     0x00000000,  // ..............
+     0x00000060,  // ........**....
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 222
+     12, 23,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000E0,  // .....***....
+     0x00000030,  // .......**...
+     0x000001B0,  // ....**.**...
+     0x000001E0,  // ....****....
+  },
+  {             // 223
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001B8,  // .**.***..
+     0x000001B8,  // .**.***..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001BC,  // .**.****.
+     0x000001B8,  // .**.***..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 224
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000036,  // .**.**
+     0x00000036,  // .**.**
+     0x00000038,  // .***..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 225
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x0000001C,  // .....***.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000EC,  // ..***.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 226
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000078,  // ...****..
+     0x000000CC,  // ..**..**.
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x0000001C,  // .....***.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000EC,  // ..***.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 227
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000084,  // ..*....*.
+     0x000000CC,  // ..**..**.
+     0x00000078,  // ...****..
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x0000001C,  // .....***.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000EC,  // ..***.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 228
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000D8,  // ..**.**..
+     0x000000D8,  // ..**.**..
+     0x00000000,  // .........
+     0x000000F8,  // ..*****..
+     0x000001DC,  // .***.***.
+     0x0000018C,  // .**...**.
+     0x0000001C,  // .....***.
+     0x000000FC,  // ..******.
+     0x000001CC,  // .***..**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001DC,  // .***.***.
+     0x000000EC,  // ..***.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 229
+     4, 23,
+     0x00000000,  // .....
+     0x00000006,  // ...**
+     0x0000000C,  // ..**.
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 230
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 231
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x000000E0,  // ...***....
+     0x00000030,  // .....**...
+     0x000001B0,  // ..**.**...
+     0x000001E0,  // ..****....
+  },
+  {             // 232
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 233
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 234
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000070,  // ....***...
+  },
+  {             // 235
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000D8,  // ...**.**..
+     0x000000D8,  // ...**.**..
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 236
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 237
+     4, 23,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // ..**
+     0x0000000C,  // .**.
+     0x00000018,  // **..
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 238
+     4, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // ..**..
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 239
+     14, 23,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000006C,  // ........**.**.
+     0x0000006C,  // ........**.**.
+     0x00000064,  // ........**..*.
+     0x00000064,  // ........**..*.
+     0x00000F68,  // ...****.**.*..
+     0x00001FE0,  // ..********....
+     0x000018E0,  // ..**...***....
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x000018E0,  // ..**...***....
+     0x00001FE0,  // ..********....
+     0x00000F60,  // ...****.**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 240
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x000000FC,  // ....******.
+     0x000000FC,  // ....******.
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 241
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000338,  // .**..***..
+     0x0000037C,  // .**.*****.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 242
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000338,  // .**..***..
+     0x0000037C,  // .**.*****.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 243
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 244
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000000F0,  // ....****...
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 245
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000006C,  // .....**.**.
+     0x000000D8,  // ....**.**..
+     0x000001B0,  // ...**.**...
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 246
+     11, 23,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001B0,  // ...**.**...
+     0x000001B0,  // ...**.**...
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 247
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 248
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x0000003C,  // .****.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000036,  // .**.**
+     0x00000036,  // .**.**
+     0x00000038,  // .***..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 249
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000070,  // ....***...
+     0x000000D8,  // ...**.**..
+     0x000000D8,  // ...**.**..
+     0x00000070,  // ....***...
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003EC,  // .*****.**.
+     0x000001CC,  // ..***..**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 250
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003EC,  // .*****.**.
+     0x000001CC,  // ..***..**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 251
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000006C,  // ....**.**.
+     0x000000D8,  // ...**.**..
+     0x000001B0,  // ..**.**...
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003EC,  // .*****.**.
+     0x000001CC,  // ..***..**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 252
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003EC,  // .*****.**.
+     0x000001CC,  // ..***..**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 253
+     10, 23,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 254
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001C,  // ..***.
+     0x0000001C,  // ..***.
+     0x0000001C,  // ..***.
+     0x00000006,  // ....**
+     0x00000036,  // .**.**
+     0x0000003C,  // .****.
+  },
+  {             // 255
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  };
diff --git a/fontsml-iso8859-7.c b/fontsml-iso8859-7.c
index 03943e780..a7936ba04 100644
--- a/fontsml-iso8859-7.c
+++ b/fontsml-iso8859-7.c
@@ -1,248 +1,259 @@
-cFont::tPixelData FontSml_iso8859_7[][24] = {
+cFont::tPixelData FontSml_iso8859_7[][22] = {
   {             // 32
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
   {             // 33
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
   {             // 34
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003B8,  // ..***.***..
-     0x000003B8,  // ..***.***..
-     0x000003B8,  // ..***.***..
-     0x000003B8,  // ..***.***..
-     0x00000110,  // ...*...*...
-     0x00000110,  // ...*...*...
-     0x00000110,  // ...*...*...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     7, 20,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x0000006C,  // .**.**.
+     0x0000004C,  // .*..**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
   {             // 35
-     11, 19,
+     10, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x00000088,  // ....*...*..
+     0x00000188,  // ...**...*..
      0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
+     0x00000118,  // ...*...**..
+     0x00000FFC,  // **********.
+     0x00000110,  // ...*...*...
+     0x00000310,  // ..**...*...
+     0x00000310,  // ..**...*...
+     0x00000230,  // ..*...**...
+     0x00000FFC,  // **********.
+     0x00000220,  // ..*...*....
+     0x00000620,  // .**...*....
+     0x00000660,  // .**..**....
+     0x00000460,  // .*...**....
+     0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
   {             // 36
-     11, 19,
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000000F8,  // ....*****..
-     0x00000198,  // ...**..**..
-     0x00000308,  // ..**....*..
-     0x00000300,  // ..**.......
-     0x00000380,  // ..***......
-     0x000001E0,  // ...****....
-     0x00000078,  // .....****..
-     0x0000001C,  // .......***.
-     0x0000000C,  // ........**.
-     0x0000020C,  // ..*.....**.
-     0x00000318,  // ..**...**..
-     0x000003F0,  // ..******...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000020,  // .....*....
+     0x00000070,  // ....***...
+     0x000001FC,  // ..*******.
+     0x00000326,  // .**..*..**
+     0x00000326,  // .**..*..**
+     0x00000320,  // .**..*....
+     0x000003A0,  // .***.*....
+     0x000001F0,  // ..*****...
+     0x0000007C,  // ....*****.
+     0x0000002E,  // .....*.***
+     0x00000026,  // .....*..**
+     0x00000326,  // .**..*..**
+     0x00000326,  // .**..*..**
+     0x000001AC,  // ..**.*.**.
+     0x000000F8,  // ...*****..
+     0x00000020,  // .....*....
+     0x00000020,  // .....*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 37
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000780,  // .****......
-     0x00000CCC,  // **..**..**.
-     0x00000CCC,  // **..**..**.
-     0x00000CD8,  // **..**.**..
-     0x000007B0,  // .****.**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000001BC,  // ...**.****.
-     0x00000366,  // ..**.**..**
-     0x00000366,  // ..**.**..**
-     0x00000666,  // .**..**..**
-     0x0000063C,  // .**...****.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     17, 20,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000F020,  // ..****......*....
+     0x00019840,  // .**..**....*.....
+     0x00019840,  // .**..**....*.....
+     0x00019880,  // .**..**...*......
+     0x00019880,  // .**..**...*......
+     0x00019900,  // .**..**..*.......
+     0x0000F100,  // ..****...*.......
+     0x00000278,  // ........*..****..
+     0x0000064C,  // .......**..*..**.
+     0x000004C4,  // .......*..**...*.
+     0x00000CC4,  // ......**..**...*.
+     0x000008C4,  // ......*...**...*.
+     0x0000104C,  // .....*.....*..**.
+     0x00001078,  // .....*.....****..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 38
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000001B0,  // ...**.**...
-     0x00000110,  // ...*...*...
-     0x00000110,  // ...*...*...
-     0x00000110,  // ...*...*...
-     0x000001B0,  // ...**.**...
-     0x000000E0,  // ....***....
-     0x000001E6,  // ...****..**
-     0x00000334,  // ..**..**.*.
-     0x00000334,  // ..**..**.*.
-     0x0000031C,  // ..**...***.
-     0x00000308,  // ..**....*..
-     0x0000019C,  // ...**..***.
-     0x000000F6,  // ....****.**
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001E0,  // ....****....
+     0x00000370,  // ...**.***...
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x000003E0,  // ...*****....
+     0x00000380,  // ...***......
+     0x000006C0,  // ..**.**.....
+     0x00000C68,  // .**...**.*..
+     0x0000087C,  // .*....*****.
+     0x00001838,  // **.....***..
+     0x00000C18,  // .**.....**..
+     0x00000C3C,  // .**....****.
+     0x000007E6,  // ..******..**
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 39
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     4, 20,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000008,  // .*..
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
   },
   {             // 40
-     11, 19,
-     0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x00000030,  // ......**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000010,  // ..*...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000004,  // ....*.
+     0x00000006,  // ....**
   },
   {             // 41
-     11, 19,
-     0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000010,  // ..*...
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000006,  // ....**
+     0x00000004,  // ....*.
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000010,  // ..*...
+     0x00000000,  // ......
   },
   {             // 42
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x0000036C,  // ..**.**.**.
-     0x0000036C,  // ..**.**.**.
-     0x000000F0,  // ....****...
-     0x000000F0,  // ....****...
-     0x0000036C,  // ..**.**.**.
-     0x0000036C,  // ..**.**.**.
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     7, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000034,  // ...**.*.
+     0x000000FC,  // .******.
+     0x00000030,  // ...**...
+     0x00000058,  // ..*.**..
+     0x00000048,  // ..*..*..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 43
-     11, 19,
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -251,9 +262,8 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000060,  // .....**....
      0x00000060,  // .....**....
      0x00000060,  // .....**....
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000060,  // .....**....
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
      0x00000060,  // .....**....
      0x00000060,  // .....**....
      0x00000060,  // .....**....
@@ -262,42 +272,414 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 44
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
+  },
+  {             // 44
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000004,  // ...*.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 45
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 46
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000010,  // ..*...
+     0x00000030,  // .**...
+     0x00000020,  // .*....
+     0x00000020,  // .*....
+     0x00000020,  // .*....
+     0x00000060,  // **....
+     0x00000040,  // *.....
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 48
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000184,  // ..**....*.
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000104,  // ..*.....*.
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 49
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000010,  // ......*...
+     0x00000030,  // .....**...
+     0x000000F0,  // ...****...
+     0x000001F0,  // ..*****...
+     0x00000130,  // ..*..**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 50
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001CC,  // ..***..**.
+     0x00000306,  // .**.....**
+     0x00000302,  // .**......*
+     0x00000002,  // .........*
+     0x00000006,  // ........**
+     0x0000000C,  // .......**.
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 51
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000070,  // ....***...
+     0x000000D8,  // ...**.**..
+     0x0000018C,  // ..**...**.
+     0x0000018C,  // ..**...**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000038,  // .....***..
+     0x0000000C,  // .......**.
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000186,  // ..**....**
+     0x0000008C,  // ...*...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 52
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000038,  // .....***..
+     0x00000078,  // ....****..
+     0x000000D8,  // ...**.**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000318,  // .**...**..
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 53
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000FC,  // ...******.
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000178,  // ..*.****..
+     0x000001FC,  // ..*******.
+     0x00000306,  // .**.....**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000306,  // .**.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 54
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ....****..
+     0x000000DC,  // ...**.***.
+     0x00000186,  // ..**....**
+     0x00000106,  // ..*.....**
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000106,  // ..*.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 55
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FE,  // .*********
+     0x000003FC,  // .********.
+     0x0000000C,  // .......**.
+     0x00000018,  // ......**..
+     0x00000010,  // ......*...
+     0x00000030,  // .....**...
+     0x00000020,  // .....*....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 56
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x000001CC,  // ..***..**.
+     0x00000386,  // .***....**
+     0x00000302,  // .**......*
+     0x00000302,  // .**......*
+     0x00000306,  // .**.....**
+     0x00000184,  // ..**....*.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 57
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001DC,  // ..***.***.
+     0x00000384,  // .***....*.
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018E,  // ..**...***
+     0x000000F6,  // ...****.**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000104,  // ..*.....*.
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 58
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 59
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000004,  // ...*.
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000000,  // .....
+  },
+  {             // 60
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000003C,  // ......****.
+     0x000000E0,  // ....***....
+     0x00000780,  // .****......
+     0x00000600,  // .**........
+     0x00000380,  // ..***......
+     0x000000F0,  // ....****...
+     0x0000003C,  // ......****.
+     0x00000004,  // .........*.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
      0x00000000,  // ...........
   },
-  {             // 45
-     11, 19,
-     0x00000000,  // ...........
+  {             // 61
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
      0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
      0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -307,2726 +689,1493 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 46
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 62
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x00000400,  // .*.........
+     0x00000780,  // .****......
+     0x000001E0,  // ...****....
+     0x0000003C,  // ......****.
+     0x0000000C,  // ........**.
+     0x00000078,  // .....****..
+     0x000001E0,  // ...****....
+     0x00000700,  // .***.......
+     0x00000400,  // .*.........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 47
-     11, 19,
-     0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 63
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000006,  // ........**
+     0x0000000E,  // .......***
+     0x0000001C,  // ......***.
+     0x00000030,  // .....**...
+     0x00000020,  // .....*....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
-  {             // 48
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 64
+     19, 20,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00001F80,  // .......******......
+     0x000079E0,  // .....****..****....
+     0x0000C030,  // ....**........**...
+     0x00018018,  // ...**..........**..
+     0x00031ECC,  // ..**...****.**..**.
+     0x000331CC,  // ..**..**...***..**.
+     0x00066184,  // .**..**....**....*.
+     0x00064184,  // .**..*.....**....*.
+     0x0006C18C,  // .**.**.....**...**.
+     0x0006C18C,  // .**.**.....**...**.
+     0x0006C118,  // .**.**.....*...**..
+     0x00066330,  // .**..**...**..**...
+     0x00067FE0,  // .**..**********....
+     0x000319C4,  // ..**...**..***...*.
+     0x0003000C,  // ..**............**.
+     0x0001C018,  // ...***.........**..
+     0x0000F070,  // ....****.....***...
+     0x00001FC0,  // .......*******.....
   },
-  {             // 49
-     11, 19,
+  {             // 65
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ......**......
+     0x000001C0,  // ......***.....
+     0x000003C0,  // .....****.....
+     0x00000240,  // .....*..*.....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000430,  // ....*....**...
+     0x00000C30,  // ...**....**...
+     0x00000FF8,  // ...*********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000100C,  // ..*........**.
+     0x0000300C,  // .**........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 66
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000C38,  // .**....***..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF0,  // .********...
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 67
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007F8,  // ...********..
+     0x00000E0C,  // ..***.....**.
+     0x00000C0C,  // ..**......**.
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00000C04,  // ..**.......*.
+     0x00000C0C,  // ..**......**.
+     0x00000618,  // ...**....**..
+     0x000003F0,  // ....******...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 68
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FF0,  // .*********...
+     0x00001FF8,  // .**********..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FF8,  // .**********..
+     0x00001FE0,  // .********....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 69
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FF0,  // .********...
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 70
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000001E0,  // ...****....
-     0x00000360,  // ..**.**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007F0,  // .*******...
+     0x000007F0,  // .*******...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 50
-     11, 19,
+  {             // 71
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // .....******....
+     0x00001FF0,  // ...*********...
+     0x00003818,  // ..***......**..
+     0x0000300C,  // ..**........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x0000607C,  // .**......*****.
+     0x0000607C,  // .**......*****.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 73
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 74
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000000C,  // ......**.
+     0x0000030C,  // **....**.
+     0x0000030C,  // **....**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 75
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C18,  // .**.....**..
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000CC0,  // .**..**.....
+     0x00000DC0,  // .**.***.....
+     0x00000FC0,  // .******.....
+     0x00000E60,  // .***..**....
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0E,  // .**......***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 76
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 77
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000380E,  // .***.......***
+     0x00003C0E,  // .****......***
+     0x00003C1E,  // .****.....****
+     0x0000361E,  // .**.**....****
+     0x00003636,  // .**.**...**.**
+     0x00003336,  // .**..**..**.**
+     0x00003366,  // .**..**.**..**
+     0x000031C6,  // .**...***...**
+     0x000031C6,  // .**...***...**
+     0x00003086,  // .**....*....**
+     0x00003006,  // .**.........**
+     0x00003006,  // .**.........**
+     0x00003006,  // .**.........**
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 78
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00001E0C,  // .****.....**.
+     0x00001B0C,  // .**.**....**.
+     0x00001B0C,  // .**.**....**.
+     0x0000198C,  // .**..**...**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x0000186C,  // .**....**.**.
+     0x0000183C,  // .**.....****.
+     0x0000183C,  // .**.....****.
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 79
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000C3C,  // .**....****.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C0E,  // .**......***
+     0x00000FFC,  // .**********.
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 81
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x000030D8,  // ..**....**.**..
+     0x00003878,  // ..***....****..
+     0x00001FF8,  // ...**********..
+     0x000007CC,  // .....*****..**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     13, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FF0,  // .**********...
+     0x00003018,  // .**.......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000301C,  // .**.......***.
+     0x00003FF8,  // .***********..
+     0x00003FC0,  // .********.....
+     0x00003060,  // .**.....**....
+     0x00003060,  // .**.....**....
+     0x00003030,  // .**......**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x0000300C,  // .**........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 83
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007FC,  // ..*********.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C00,  // .**.........
+     0x00000700,  // ..***.......
+     0x000003F0,  // ...******...
+     0x0000003C,  // .......****.
+     0x00000006,  // ..........**
+     0x00000C02,  // .**........*
+     0x00000C02,  // .**........*
+     0x00000606,  // ..**......**
+     0x000007FC,  // ..*********.
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 84
+     11, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 86
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000180C,  // .**.......**.
+     0x00001808,  // .**.......*..
+     0x00001818,  // .**......**..
+     0x00000C10,  // ..**.....*...
+     0x00000C30,  // ..**....**...
+     0x00000430,  // ...*....**...
+     0x00000620,  // ...**...*....
+     0x00000660,  // ...**..**....
+     0x00000240,  // ....*..*.....
+     0x000003C0,  // ....****.....
+     0x000001C0,  // .....***.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 87
+     18, 20,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0006060C,  // **......**.....**.
+     0x00020E0C,  // .*.....***.....**.
+     0x00030F0C,  // .**....****....**.
+     0x00030B08,  // .**....*.**....*..
+     0x00031918,  // .**...**..*...**..
+     0x00011998,  // ..*...**..**..**..
+     0x00019198,  // ..**..*...**..**..
+     0x00019190,  // ..**..*...**..*...
+     0x0000B0B0,  // ...*.**....*.**...
+     0x0000B0F0,  // ...*.**....****...
+     0x0000E0E0,  // ...***.....***....
+     0x0000E060,  // ...***......**....
+     0x00006060,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 88
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x00000660,  // ...**..**....
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x000003C0,  // ....****.....
+     0x00000760,  // ...***.**....
+     0x00000630,  // ...**...**...
+     0x00000C30,  // ..**....**...
+     0x00001818,  // .**......**..
+     0x0000380C,  // ***.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 89
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000380C,  // ***.......**.
+     0x00001818,  // .**......**..
+     0x00000C18,  // ..**.....**..
+     0x00000E30,  // ..***...**...
+     0x00000660,  // ...**..**....
+     0x00000340,  // ....**.*.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 90
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
      0x0000000C,  // ........**.
      0x00000018,  // .......**..
      0x00000030,  // ......**...
      0x00000060,  // .....**....
+     0x000000E0,  // ....***....
      0x000000C0,  // ....**.....
      0x00000180,  // ...**......
-     0x00000304,  // ..**.....*.
-     0x000003FC,  // ..********.
+     0x00000300,  // ..**.......
+     0x00000600,  // .**........
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 51
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000001F0,  // ...*****...
-     0x00000018,  // .......**..
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x00000318,  // ..**...**..
-     0x000001F0,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 91
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001E,  // .****
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x0000001E,  // .****
   },
-  {             // 52
-     11, 19,
+  {             // 92
+     5, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000040,  // *.....
+     0x00000060,  // **....
+     0x00000020,  // .*....
+     0x00000020,  // .*....
+     0x00000020,  // .*....
+     0x00000030,  // .**...
+     0x00000010,  // ..*...
+     0x00000010,  // ..*...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 93
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003C,  // ****.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+  },
+  {             // 94
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000060,  // ...**....
+     0x00000070,  // ...***...
+     0x00000050,  // ...*.*...
+     0x000000D8,  // ..**.**..
+     0x00000098,  // ..*..**..
+     0x00000188,  // .**...*..
+     0x0000018C,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 95
+     10, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000020,  // ......*....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x000000C0,  // ....**.....
-     0x00000098,  // ....*..**..
-     0x00000198,  // ...**..**..
-     0x00000118,  // ...*...**..
-     0x00000318,  // ..**...**..
-     0x000003FC,  // ..********.
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 53
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001FC,  // ...*******.
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000001F0,  // ...*****...
-     0x00000018,  // .......**..
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x00000318,  // ..**...**..
-     0x000001F0,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 54
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000038,  // ......***..
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000100,  // ...*.......
-     0x00000370,  // ..**.***...
-     0x00000398,  // ..***..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
      0x00000000,  // ...........
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
+  },
+  {             // 96
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 97
+     10, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 55
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003FC,  // ..********.
+     0x000001F8,  // ...******..
+     0x0000039C,  // ..***..***.
+     0x0000060C,  // .**.....**.
      0x0000000C,  // ........**.
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
+     0x000000FC,  // ....******.
+     0x000003EC,  // ..*****.**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000061C,  // .**....***.
+     0x000003E4,  // ..*****..*.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 56
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
+  {             // 98
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003DC,  // .****.***.
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000038C,  // .***...**.
+     0x00000378,  // .**.****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 99
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000384,  // .***....*.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000304,  // .**.....*.
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x000000F6,  // ...****.**
+     0x000001DE,  // ..***.****
+     0x00000106,  // ..*.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018E,  // ..**...***
+     0x000000FE,  // ...*******
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 101
+     10, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 57
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000019C,  // ...**..***.
-     0x000000EC,  // ....***.**.
-     0x00000008,  // ........*..
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x000001C0,  // ...***.....
+     0x000001F0,  // ...*****...
+     0x00000398,  // ..***..**..
+     0x0000020C,  // ..*.....**.
+     0x0000060C,  // .**.....**.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000001F0,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 58
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 102
+     5, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001C,  // ..***.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000003E,  // .*****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
-  {             // 59
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000000,  // ...........
+  {             // 103
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F6,  // ...****.**
+     0x0000018E,  // ..**...***
+     0x00000106,  // ..*.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x000001DE,  // ..***.****
+     0x000000F6,  // ...****.**
+     0x00000006,  // ........**
+     0x00000306,  // .**.....**
+     0x0000038C,  // .***...**.
+     0x000000F8,  // ...*****..
   },
-  {             // 60
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // .......**..
-     0x00000038,  // ......***..
-     0x00000070,  // .....***...
-     0x000000E0,  // ....***....
-     0x000001C0,  // ...***.....
-     0x00000380,  // ..***......
-     0x00000380,  // ..***......
-     0x000001C0,  // ...***.....
-     0x000000E0,  // ....***....
-     0x00000070,  // .....***...
-     0x00000038,  // ......***..
-     0x00000018,  // .......**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 104
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000037C,  // .**.*****.
+     0x000003CE,  // .****..***
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
-  {             // 61
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 105
+     4, 20,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
   },
-  {             // 62
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000380,  // ..***......
-     0x000001C0,  // ...***.....
-     0x000000E0,  // ....***....
-     0x00000070,  // .....***...
-     0x00000038,  // ......***..
-     0x00000038,  // ......***..
-     0x00000070,  // .....***...
-     0x000000E0,  // ....***....
-     0x000001C0,  // ...***.....
-     0x00000380,  // ..***......
-     0x00000300,  // ..**.......
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 106
+     4, 20,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000038,  // ***..
   },
-  {             // 63
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x000003B8,  // ..***.***..
-     0x0000031C,  // ..**...***.
-     0x0000031C,  // ..**...***.
-     0x0000001C,  // .......***.
-     0x00000038,  // ......***..
-     0x00000070,  // .....***...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 107
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000318,  // .**...**..
+     0x00000330,  // .**..**...
+     0x00000360,  // .**.**....
+     0x000003E0,  // .*****....
+     0x000003E0,  // .*****....
+     0x00000330,  // .**..**...
+     0x00000318,  // .**...**..
+     0x00000318,  // .**...**..
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
-  {             // 64
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000398,  // ..***..**..
-     0x00000308,  // ..**....*..
-     0x0000060C,  // .**.....**.
-     0x0000067C,  // .**..*****.
-     0x000006CC,  // .**.**..**.
-     0x000006CC,  // .**.**..**.
-     0x000006CC,  // .**.**..**.
-     0x000006CC,  // .**.**..**.
-     0x00000676,  // .**..***.**
-     0x00000600,  // .**........
-     0x00000300,  // ..**.......
-     0x0000038C,  // ..***...**.
-     0x000000F8,  // ....*****..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 108
+     4, 20,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
   },
-  {             // 65
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x000000F0,  // ....****...
-     0x00000090,  // ....*..*...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000001F8,  // ...******..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000204,  // ..*......*.
-     0x0000070E,  // .***....***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 109
+     16, 20,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000DE78,  // .**.****..****..
+     0x0000E38C,  // .***...***...**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
-  {             // 66
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x000003F0,  // ..******...
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x000007F0,  // .*******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 110
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000037C,  // .**.*****.
+     0x000003CE,  // .****..***
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
-  {             // 67
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FC,  // ....******.
-     0x0000038C,  // ..***...**.
-     0x0000030C,  // ..**....**.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x0000060C,  // .**.....**.
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 111
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
-  {             // 68
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x00000306,  // ..**.....**
-     0x00000306,  // ..**.....**
-     0x00000306,  // ..**.....**
-     0x00000306,  // ..**.....**
-     0x00000306,  // ..**.....**
-     0x00000306,  // ..**.....**
-     0x0000030C,  // ..**....**.
-     0x0000031C,  // ..**...***.
-     0x000007F0,  // .*******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 112
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000378,  // .**.****..
+     0x0000038C,  // .***...**.
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000038C,  // .***...**.
+     0x000003F8,  // .*******..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
   },
-  {             // 69
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x00000184,  // ...**....*.
-     0x00000184,  // ...**....*.
-     0x00000180,  // ...**......
-     0x00000190,  // ...**..*...
-     0x000001F0,  // ...*****...
-     0x00000190,  // ...**..*...
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000184,  // ...**....*.
-     0x00000184,  // ...**....*.
-     0x000003FC,  // ..********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 113
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F6,  // ...****.**
+     0x0000018E,  // ..**...***
+     0x00000106,  // ..*.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000106,  // ..*.....**
+     0x0000018E,  // ..**...***
+     0x000000FE,  // ...*******
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
   },
-  {             // 70
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x00000184,  // ...**....*.
-     0x00000184,  // ...**....*.
-     0x00000180,  // ...**......
-     0x00000190,  // ...**..*...
-     0x000001F0,  // ...*****...
-     0x00000190,  // ...**..*...
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000003E0,  // ..*****....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 114
+     6, 20,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000006C,  // .**.**.
+     0x0000007C,  // .*****.
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
-  {             // 71
-     11, 19,
+  {             // 115
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000001CE,  // .***..***
+     0x00000186,  // .**....**
+     0x00000180,  // .**......
+     0x000000F8,  // ..*****..
+     0x0000007C,  // ...*****.
+     0x00000006,  // .......**
+     0x00000182,  // .**.....*
+     0x00000186,  // .**....**
+     0x000000FC,  // ..******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000003E,  // .*****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000000E,  // ...***
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 117
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018E,  // ..**...***
+     0x000001F6,  // ..*****.**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000060C,  // **.....**.
+     0x0000020C,  // .*.....**.
+     0x00000308,  // .**....*..
+     0x00000118,  // ..*...**..
+     0x00000190,  // ..**..*...
+     0x000001B0,  // ..**.**...
+     0x000000B0,  // ...*.**...
+     0x000000E0,  // ...***....
+     0x000000E0,  // ...***....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     13, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00006184,  // **....**....*.
+     0x0000238C,  // .*...***...**.
+     0x0000238C,  // .*...***...**.
+     0x00003288,  // .**..*.*...*..
+     0x000032D8,  // .**..*.**.**..
+     0x000016D8,  // ..*.**.**.**..
+     0x00001650,  // ..*.**..*.*...
+     0x00001C50,  // ..***...*.*...
+     0x00000C70,  // ...**...***...
+     0x00000C60,  // ...**...**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x00000318,  // .**...**..
+     0x000001B0,  // ..**.**...
+     0x000000E0,  // ...***....
+     0x000000E0,  // ...***....
+     0x000000E0,  // ...***....
+     0x000000B0,  // ...*.**...
+     0x00000190,  // ..**..*...
+     0x00000318,  // .**...**..
+     0x0000060C,  // **.....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 121
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000060C,  // **.....**.
+     0x0000030C,  // .**....**.
+     0x00000308,  // .**....*..
+     0x00000118,  // ..*...**..
+     0x00000190,  // ..**..*...
+     0x000001B0,  // ..**.**...
+     0x000000B0,  // ...*.**...
+     0x000000E0,  // ...***....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000040,  // ....*.....
+     0x000000C0,  // ...**.....
+     0x00000380,  // .***......
+     0x00000300,  // .**.......
+  },
+  {             // 122
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000003FE,  // *********
+     0x0000000C,  // ......**.
+     0x00000008,  // ......*..
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x00000100,  // .*.......
+     0x000003FE,  // *********
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ....***
+     0x0000000E,  // ....***
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000010,  // ...*...
+     0x00000020,  // ..*....
+     0x00000010,  // ...*...
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000008,  // ....*..
+     0x0000000E,  // ....***
+  },
+  {             // 124
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+  },
+  {             // 125
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // .**...
+     0x00000038,  // .***..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+  },
+  {             // 126
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000FC,  // ....******.
-     0x0000038C,  // ..***...**.
-     0x0000030C,  // ..**....**.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x0000061E,  // .**....****
-     0x0000060C,  // .**.....**.
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 72
-     11, 19,
      0x00000000,  // ...........
+     0x000007C4,  // .*****...*.
+     0x000007FC,  // .*********.
+     0x00000038,  // ......***..
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 73
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 74
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000007C,  // .....*****.
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x00000330,  // ..**..**...
-     0x000001E0,  // ...****....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 75
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x00000360,  // ..**.**....
-     0x000003E0,  // ..*****....
-     0x000003B0,  // ..***.**...
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000078E,  // .****...***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 76
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000780,  // .****......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000304,  // ..**.....*.
-     0x00000304,  // ..**.....*.
-     0x000007FC,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 77
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000E0E,  // ***.....***
-     0x0000071C,  // .***...***.
-     0x0000071C,  // .***...***.
-     0x000007BC,  // .****.****.
-     0x000006AC,  // .**.*.*.**.
-     0x000006EC,  // .**.***.**.
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000F1E,  // ****...****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 78
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000071E,  // .***...****
-     0x0000038C,  // ..***...**.
-     0x0000038C,  // ..***...**.
-     0x000003CC,  // ..****..**.
-     0x0000034C,  // ..**.*..**.
-     0x0000036C,  // ..**.**.**.
-     0x0000036C,  // ..**.**.**.
-     0x0000032C,  // ..**..*.**.
-     0x0000033C,  // ..**..****.
-     0x0000031C,  // ..**...***.
-     0x0000031C,  // ..**...***.
-     0x0000078C,  // .****...**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 79
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 80
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x000003F0,  // ..******...
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000007C0,  // .*****.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 81
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
-     0x00000030,  // ......**...
-     0x00000018,  // .......**..
-     0x0000000C,  // ........**.
-     0x00000000,  // ...........
-  },
-  {             // 82
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000003F0,  // ..******...
-     0x00000360,  // ..**.**....
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000078E,  // .****...***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 83
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FC,  // ....******.
-     0x0000018C,  // ...**...**.
-     0x00000304,  // ..**.....*.
-     0x00000300,  // ..**.......
-     0x00000380,  // ..***......
-     0x000001E0,  // ...****....
-     0x00000078,  // .....****..
-     0x0000001C,  // .......***.
-     0x0000000C,  // ........**.
-     0x0000020C,  // ..*.....**.
-     0x00000318,  // ..**...**..
-     0x000003F0,  // ..******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 84
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x00000462,  // .*...**...*
-     0x00000462,  // .*...**...*
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 85
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 86
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x00000204,  // ..*......*.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000108,  // ...*....*..
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000090,  // ....*..*...
-     0x000000F0,  // ....****...
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 87
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000E0E,  // ***.....***
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x000006EC,  // .**.***.**.
-     0x000006EC,  // .**.***.**.
-     0x000003B8,  // ..***.***..
-     0x000003B8,  // ..***.***..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 88
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x00000090,  // ....*..*...
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 89
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000108,  // ...*....*..
-     0x00000198,  // ...**..**..
-     0x00000090,  // ....*..*...
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 90
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x0000020C,  // ..*.....**.
-     0x00000218,  // ..*....**..
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000304,  // ..**.....*.
-     0x00000304,  // ..**.....*.
-     0x000003FC,  // ..********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 91
-     11, 19,
-     0x00000000,  // ...........
-     0x000000F8,  // ....*****..
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000F8,  // ....*****..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 92
-     11, 19,
-     0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 93
-     11, 19,
-     0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x000001F0,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 94
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000204,  // ..*......*.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 96
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 97
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ....*****..
-     0x0000018C,  // ...**...**.
-     0x0000000C,  // ........**.
-     0x000000FC,  // ....******.
-     0x0000018C,  // ...**...**.
-     0x0000030C,  // ..**....**.
-     0x0000031C,  // ..**...***.
-     0x000001EE,  // ...****.***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 98
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000700,  // .***.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000370,  // ..**.***...
-     0x00000398,  // ..***..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000398,  // ..***..**..
-     0x00000370,  // ..**.***...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 99
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FC,  // ....******.
-     0x0000018C,  // ...**...**.
-     0x0000030C,  // ..**....**.
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x0000018C,  // ...**...**.
-     0x000000F8,  // ....*****..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 100
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000001C,  // .......***.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x000000EC,  // ....***.**.
-     0x0000019C,  // ...**..***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000019C,  // ...**..***.
-     0x000000EE,  // ....***.***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 101
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x0000018C,  // ...**...**.
-     0x000000F8,  // ....*****..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 102
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000078,  // .....****..
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000003F8,  // ..*******..
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000003F8,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 103
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x0000031C,  // ..**...***.
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000001F0,  // ...*****...
-     0x00000300,  // ..**.......
-     0x000001FC,  // ...*******.
-     0x00000306,  // ..**.....**
-     0x00000306,  // ..**.....**
-     0x0000030C,  // ..**....**.
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-  },
-  {             // 104
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000700,  // .***.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000378,  // ..**.****..
-     0x0000038C,  // ..***...**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 105
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000040,  // .....*.....
-     0x000000E0,  // ....***....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000003E0,  // ..*****....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000003FC,  // ..********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 106
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000020,  // ......*....
-     0x00000070,  // .....***...
-     0x00000020,  // ......*....
-     0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x000001F0,  // ...*****...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000630,  // .**...**...
-     0x000003E0,  // ..*****....
-     0x00000000,  // ...........
-  },
-  {             // 107
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000700,  // .***.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x0000033C,  // ..**..****.
-     0x00000310,  // ..**...*...
-     0x00000320,  // ..**..*....
-     0x00000340,  // ..**.*.....
-     0x000003E0,  // ..*****....
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x0000078E,  // .****...***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 108
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000001E0,  // ...****....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 109
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000006DC,  // .**.**.***.
-     0x00000F76,  // ****.***.**
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x00000EEE,  // ***.***.***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 110
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000378,  // ..**.****..
-     0x0000078C,  // .****...**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 111
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 112
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000370,  // ..**.***...
-     0x00000798,  // .****..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000398,  // ..***..**..
-     0x00000370,  // ..**.***...
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000007C0,  // .*****.....
-     0x00000000,  // ...........
-  },
-  {             // 113
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001E8,  // ...****.*..
-     0x00000318,  // ..**...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x00000338,  // ..**..***..
-     0x000001D8,  // ...***.**..
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x0000007C,  // .....*****.
-     0x00000000,  // ...........
-  },
-  {             // 114
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000019C,  // ...**..***.
-     0x000003AC,  // ..***.*.**.
-     0x000001C0,  // ...***.....
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000003E0,  // ..*****....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 115
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x0000030C,  // ..**....**.
-     0x00000300,  // ..**.......
-     0x000001E0,  // ...****....
-     0x00000038,  // ......***..
-     0x0000020C,  // ..*.....**.
-     0x0000030C,  // ..**....**.
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 116
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000007F8,  // .********..
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x0000018C,  // ...**...**.
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 117
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000030C,  // ..**....**.
-     0x0000071C,  // .***...***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000031E,  // ..**...****
-     0x000001EC,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 118
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000108,  // ...*....*..
-     0x00000198,  // ...**..**..
-     0x00000090,  // ....*..*...
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 119
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000E0E,  // ***.....***
-     0x00000404,  // .*.......*.
-     0x0000064C,  // .**..*..**.
-     0x000006EC,  // .**.***.**.
-     0x000002A8,  // ..*.*.*.*..
-     0x000003B8,  // ..***.***..
-     0x00000318,  // ..**...**..
-     0x00000110,  // ...*...*...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 120
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007BC,  // .****.****.
-     0x00000318,  // ..**...**..
-     0x000001B0,  // ...**.**...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001B0,  // ...**.**...
-     0x00000318,  // ..**...**..
-     0x000007BC,  // .****.****.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 121
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000108,  // ...*....*..
-     0x00000198,  // ...**..**..
-     0x00000090,  // ....*..*...
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x000000C0,  // ....**.....
-     0x00000680,  // .**.*......
-     0x00000700,  // .***.......
-     0x00000000,  // ...........
-  },
-  {             // 122
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x00000218,  // ..*....**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000308,  // ..**....*..
-     0x000003F8,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 123
-     11, 19,
-     0x00000000,  // ...........
-     0x00000038,  // ......***..
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000380,  // ..***......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000038,  // ......***..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 124
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 125
-     11, 19,
-     0x00000000,  // ...........
-     0x000001C0,  // ...***.....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000030,  // ......**...
-     0x0000001C,  // .......***.
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001C0,  // ...***.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 126
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000003C6,  // ..****...**
-     0x000007FE,  // .**********
-     0x0000063C,  // .**...****.
-     0x00000018,  // .......**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 127
-     11, 19,
-     0x00000CCC,  // **..**..**.
-     0x00000CCC,  // **..**..**.
-     0x00000332,  // ..**..**..*
-     0x00000332,  // ..**..**..*
-     0x00000CCC,  // **..**..**.
-     0x00000CCC,  // **..**..**.
-     0x00000332,  // ..**..**..*
-     0x00000332,  // ..**..**..*
-     0x00000CCC,  // **..**..**.
-     0x00000CCC,  // **..**..**.
-     0x00000332,  // ..**..**..*
-     0x00000332,  // ..**..**..*
-     0x00000CCC,  // **..**..**.
-     0x00000CCC,  // **..**..**.
-     0x00000332,  // ..**..**..*
-     0x00000332,  // ..**..**..*
-     0x00000CCC,  // **..**..**.
-     0x00000CCC,  // **..**..**.
-     0x00000332,  // ..**..**..*
-  },
-  {             // 128
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 161
-     11, 19,
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000080,  // ....*......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x00000030,  // ......**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 162
-     11, 19,
-     0x00000070,  // .....***...
-     0x00000070,  // .....***...
-     0x00000070,  // .....***...
-     0x00000010,  // .......*...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 163
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000078,  // .....****..
-     0x000000CC,  // ....**..**.
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000003F0,  // ..******...
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000003EC,  // ..*****.**.
-     0x00000338,  // ..**..***..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 164
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 165
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 166
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 167
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001B0,  // ...**.**...
-     0x00000118,  // ...*...**..
-     0x00000188,  // ...**...*..
-     0x000000D8,  // ....**.**..
-     0x00000070,  // .....***...
-     0x00000030,  // ......**...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 168
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 169
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000108,  // ...*....*..
-     0x00000264,  // ..*..**..*.
-     0x00000294,  // ..*.*..*.*.
-     0x00000284,  // ..*.*....*.
-     0x00000264,  // ..*..**..*.
-     0x00000108,  // ...*....*..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3035,96 +2184,9 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 170
-     0, 19,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
+  {             // 127
+     0, 20,
      0x00000000,  // 
-  },
-  {             // 171
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000044,  // .....*...*.
-     0x000000CC,  // ....**..**.
-     0x00000198,  // ...**..**..
-     0x00000330,  // ..**..**...
-     0x00000660,  // .**..**....
-     0x00000660,  // .**..**....
-     0x00000330,  // ..**..**...
-     0x00000198,  // ...**..**..
-     0x000000CC,  // ....**..**.
-     0x00000044,  // .....*...*.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 172
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000006,  // .........**
-     0x00000006,  // .........**
-     0x00000006,  // .........**
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 173
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 174
-     0, 19,
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3145,778 +2207,561 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 175
-     11, 19,
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 176
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 177
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 178
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000188,  // ...**...*..
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 179
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000018,  // .......**..
-     0x00000070,  // .....***...
-     0x00000018,  // .......**..
-     0x00000018,  // .......**..
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 180
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 181
-     11, 19,
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000080,  // ....*......
-     0x000006B0,  // .**.*.**...
-     0x00000630,  // .**...**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 182
-     11, 19,
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x000004C0,  // .*..**.....
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001E0,  // ...****....
-     0x00000130,  // ...*..**...
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x00000618,  // .**....**..
-     0x0000060C,  // .**.....**.
-     0x0000040C,  // .*......**.
-     0x00000F1E,  // ****...****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 183
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 184
-     11, 19,
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x000005FE,  // .*.********
-     0x000000C2,  // ....**....*
-     0x000000C2,  // ....**....*
-     0x000000C0,  // ....**.....
-     0x000000C4,  // ....**...*.
-     0x000000FC,  // ....******.
-     0x000000C4,  // ....**...*.
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C2,  // ....**....*
-     0x000000C2,  // ....**....*
-     0x000001FE,  // ...********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 185
-     11, 19,
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 186
-     11, 19,
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x000005F8,  // .*.******..
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 187
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000440,  // .*...*.....
-     0x00000660,  // .**..**....
-     0x00000330,  // ..**..**...
-     0x00000198,  // ...**..**..
-     0x000000CC,  // ....**..**.
-     0x000000CC,  // ....**..**.
-     0x00000198,  // ...**..**..
-     0x00000330,  // ..**..**...
-     0x00000660,  // .**..**....
-     0x00000440,  // .*...*.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 128
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 188
-     11, 19,
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x000004F0,  // .*..****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 129
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 189
-     11, 19,
-     0x00000300,  // ..**.......
-     0x00000F00,  // ****.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000306,  // ..**.....**
-     0x0000031C,  // ..**...***.
-     0x00000070,  // .....***...
-     0x000001C0,  // ...***.....
-     0x0000073C,  // .***..****.
-     0x00000C66,  // **...**..**
-     0x00000066,  // .....**..**
-     0x0000000C,  // ........**.
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000062,  // .....**...*
-     0x0000007E,  // .....******
-     0x00000000,  // ...........
+  {             // 130
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 190
-     11, 19,
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000492,  // .*..*..*..*
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 131
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 191
-     11, 19,
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000400,  // .*.........
-     0x000004F0,  // .*..****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x00000492,  // .*..*..*..*
-     0x0000079E,  // .****..****
-     0x0000039C,  // ..***..***.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 132
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 192
-     11, 19,
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000020,  // ......*....
-     0x000001AC,  // ...**.*.**.
-     0x0000018C,  // ...**...**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001C0,  // ...***.....
-     0x00000260,  // ..*..**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000064,  // .....**..*.
-     0x00000038,  // ......***..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 133
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 193
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001E0,  // ...****....
-     0x00000130,  // ...*..**...
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x00000618,  // .**....**..
-     0x0000060C,  // .**.....**.
-     0x0000040C,  // .*......**.
-     0x00000F1E,  // ****...****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 134
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 194
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x00000338,  // ..**..***..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x000003F0,  // ..******...
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x000007F0,  // .*******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 135
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 195
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x00000184,  // ...**....*.
-     0x00000184,  // ...**....*.
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000003E0,  // ..*****....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 137
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 196
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001E0,  // ...****....
-     0x00000160,  // ...*.**....
-     0x00000130,  // ...*..**...
-     0x00000330,  // ..**..**...
-     0x00000230,  // ..*...**...
-     0x00000218,  // ..*....**..
-     0x00000618,  // .**....**..
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 138
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 197
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x00000184,  // ...**....*.
-     0x00000184,  // ...**....*.
-     0x00000180,  // ...**......
-     0x00000188,  // ...**...*..
-     0x000001F8,  // ...******..
-     0x00000188,  // ...**...*..
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x00000184,  // ...**....*.
-     0x00000184,  // ...**....*.
-     0x000003FC,  // ..********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 139
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 198
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x0000020C,  // ..*.....**.
-     0x00000218,  // ..*....**..
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000304,  // ..**.....*.
-     0x00000304,  // ..**.....*.
-     0x000003FC,  // ..********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 140
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 199
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 141
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 200
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000696,  // .**.*..*.**
-     0x000006F6,  // .**.****.**
-     0x000006F6,  // .**.****.**
-     0x00000696,  // .**.*..*.**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 142
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 201
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 143
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 202
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x00000360,  // ..**.**....
-     0x000003E0,  // ..*****....
-     0x000003B0,  // ..***.**...
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 144
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 203
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001E0,  // ...****....
-     0x00000130,  // ...*..**...
-     0x00000330,  // ..**..**...
-     0x00000218,  // ..*....**..
-     0x00000218,  // ..*....**..
-     0x00000618,  // .**....**..
-     0x0000040C,  // .*......**.
-     0x0000040C,  // .*......**.
-     0x00000F1E,  // ****...****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 145
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 204
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000E0E,  // ***.....***
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x0000071C,  // .***...***.
-     0x0000071C,  // .***...***.
-     0x000005BC,  // .*.**.****.
-     0x000005AC,  // .*.**.*.**.
-     0x000005EC,  // .*.****.**.
-     0x000004CC,  // .*..**..**.
-     0x000004CC,  // .*..**..**.
-     0x000004CC,  // .*..**..**.
-     0x00000E1E,  // ***....****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 146
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 205
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000071E,  // .***...****
-     0x0000030C,  // ..**....**.
-     0x0000038C,  // ..***...**.
-     0x0000038C,  // ..***...**.
-     0x0000034C,  // ..**.*..**.
-     0x0000034C,  // ..**.*..**.
-     0x0000032C,  // ..**..*.**.
-     0x0000032C,  // ..**..*.**.
-     0x0000031C,  // ..**...***.
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x0000078C,  // .****...**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 147
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 206
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000204,  // ..*......*.
-     0x000003FC,  // ..********.
-     0x000003FC,  // ..********.
-     0x00000204,  // ..*......*.
-     0x00000000,  // ...........
-     0x00000088,  // ....*...*..
-     0x000000F8,  // ....*****..
-     0x000000F8,  // ....*****..
-     0x00000088,  // ....*...*..
-     0x00000000,  // ...........
-     0x00000402,  // .*........*
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x00000402,  // .*........*
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 148
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 207
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x0000039C,  // ..***..***.
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 149
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 208
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 150
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 209
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x000003F0,  // ..******...
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000007C0,  // .*****.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 151
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 210
-     0, 19,
+  {             // 152
+     0, 20,
+     0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
      0x00000000,  // 
@@ -3937,580 +2782,523 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000000,  // 
      0x00000000,  // 
   },
-  {             // 211
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x00000304,  // ..**.....*.
-     0x00000384,  // ..***....*.
-     0x00000180,  // ...**......
-     0x000001C0,  // ...***.....
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000100,  // ...*.......
-     0x00000304,  // ..**.....*.
-     0x00000204,  // ..*......*.
-     0x000003FC,  // ..********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 212
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x00000462,  // .*...**...*
-     0x00000462,  // .*...**...*
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 213
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000492,  // .*..*..*..*
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 214
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x0000036C,  // ..**.**.**.
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x00000666,  // .**..**..**
-     0x0000036C,  // ..**.**.**.
-     0x000001F8,  // ...******..
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 215
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000079E,  // .****..****
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x00000090,  // ....*..*...
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x000000B0,  // ....*.**...
-     0x00000198,  // ...**..**..
-     0x00000118,  // ...*...**..
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 216
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000666,  // .**..**..**
-     0x0000036C,  // ..**.**.**.
-     0x0000036C,  // ..**.**.**.
-     0x0000036C,  // ..**.**.**.
-     0x000001F8,  // ...******..
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 217
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x0000039C,  // ..***..***.
-     0x0000030C,  // ..**....**.
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x00000606,  // .**......**
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x00000492,  // .*..*..*..*
-     0x0000079E,  // .****..****
-     0x0000039C,  // ..***..***.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 218
-     11, 19,
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 219
-     11, 19,
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000000,  // ...........
-     0x0000030C,  // ..**....**.
-     0x0000079E,  // .****..****
-     0x00000492,  // .*..*..*..*
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000001F8,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 220
-     11, 19,
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001C4,  // ...***...*.
-     0x0000036C,  // ..**.**.**.
-     0x00000628,  // .**...*.*..
-     0x00000638,  // .**...***..
-     0x00000630,  // .**...**...
-     0x00000630,  // .**...**...
-     0x0000037A,  // ..**.****.*
-     0x000001CC,  // ...***..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 221
-     11, 19,
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x00000318,  // ..**...**..
-     0x00000300,  // ..**.......
-     0x000001E0,  // ...****....
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000388,  // ..***...*..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 222
-     11, 19,
-     0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000020,  // ......*....
-     0x00000020,  // ......*....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000370,  // ..**.***...
-     0x000005D8,  // .*.***.**..
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000008C,  // ....*...**.
-     0x0000000C,  // ........**.
-     0x00000004,  // .........*.
-     0x00000000,  // ...........
-  },
-  {             // 223
-     11, 19,
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001C0,  // ...***.....
-     0x00000260,  // ..*..**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000064,  // .....**..*.
-     0x00000038,  // ......***..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 224
-     11, 19,
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000358,  // ..**.*.**..
-     0x00000318,  // ..**...**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000318,  // ..**...**..
-     0x0000058C,  // .*.**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 225
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001C4,  // ...***...*.
-     0x0000036C,  // ..**.**.**.
-     0x00000628,  // .**...*.*..
-     0x00000638,  // .**...***..
-     0x00000630,  // .**...**...
-     0x00000630,  // .**...**...
-     0x0000037A,  // ..**.****.*
-     0x000001CC,  // ...***..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 153
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 226
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x000001B8,  // ...**.***..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x00000370,  // ..**.***...
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000398,  // ..***..**..
-     0x00000370,  // ..**.***...
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000200,  // ..*........
-     0x00000000,  // ...........
+  {             // 154
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 227
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000182,  // ...**.....*
-     0x000003C4,  // ..****...*.
-     0x0000026C,  // ..*..**.**.
-     0x00000428,  // .*....*.*..
-     0x00000438,  // .*....***..
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
+  {             // 155
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 228
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // .....***...
-     0x000000D8,  // ....**.**..
-     0x000000C8,  // ....**..*..
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 156
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 229
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x00000318,  // ..**...**..
-     0x00000300,  // ..**.......
-     0x000001E0,  // ...****....
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000388,  // ..***...*..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 157
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 230
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000330,  // ..**..**...
-     0x000001F0,  // ...*****...
-     0x000003E0,  // ..*****....
-     0x00000700,  // .***.......
-     0x00000E00,  // ***........
-     0x00000C00,  // **.........
-     0x00000C00,  // **.........
-     0x00000C00,  // **.........
-     0x00000E00,  // ***........
-     0x00000700,  // .***.......
-     0x00000380,  // ..***......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x00000320,  // ..**..*....
-     0x000003C0,  // ..****.....
-     0x00000000,  // ...........
+  {             // 158
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 231
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000370,  // ..**.***...
-     0x000005D8,  // .*.***.**..
-     0x0000058C,  // .*.**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000008C,  // ....*...**.
-     0x0000000C,  // ........**.
-     0x00000004,  // .........*.
-     0x00000000,  // ...........
+  {             // 159
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 232
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 160
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
-  {             // 233
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 161
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+  },
+  {             // 162
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001980,  // ..**..**......
+     0x000019C0,  // ..**..***.....
+     0x000003C0,  // .....****.....
+     0x00000240,  // .....*..*.....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000430,  // ....*....**...
+     0x00000C30,  // ...**....**...
+     0x00000FF8,  // ...*********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000100C,  // ..*........**.
+     0x0000300C,  // .**........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 163
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ....****..
+     0x0000019C,  // ..**..***.
+     0x0000010C,  // ..*....**.
+     0x00000100,  // ..*.......
+     0x00000100,  // ..*.......
+     0x00000100,  // ..*.......
+     0x000003E0,  // .*****....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000100,  // ..*.......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x0000023E,  // .*...*****
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000004,  // ........*.
+     0x000003F6,  // .******.**
+     0x000001DC,  // ..***.***.
+     0x0000030C,  // .**....**.
+     0x00000304,  // .**.....*.
+     0x0000030C,  // .**....**.
+     0x0000018C,  // ..**...**.
+     0x000003FC,  // .********.
+     0x00000376,  // .**.***.**
+     0x00000004,  // ........*.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 165
+     10, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001C0,  // ...***.....
-     0x00000260,  // ..*..**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000064,  // .....**..*.
-     0x00000038,  // ......***..
+     0x00000C0C,  // **......**.
+     0x00000608,  // .**.....*..
+     0x00000218,  // ..*....**..
+     0x00000330,  // ..**..**...
+     0x00000130,  // ...*..**...
+     0x000001E0,  // ...****....
+     0x000007FC,  // .*********.
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000007FC,  // .*********.
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
+     0x000000C0,  // ....**.....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 234
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+  {             // 166
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+  },
+  {             // 167
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001D8,  // ..***.**..
+     0x0000018C,  // ..**...**.
+     0x00000180,  // ..**......
+     0x000000C0,  // ...**.....
+     0x000000E0,  // ...***....
+     0x00000138,  // ..*..***..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x00000186,  // ..**....**
+     0x000001C6,  // ..***...**
+     0x00000064,  // ....**..*.
+     0x00000038,  // .....***..
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000184,  // ..**....*.
+     0x000000CC,  // ...**..**.
+     0x00000078,  // ....****..
+  },
+  {             // 168
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 169
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00000C30,  // ...**....**...
+     0x00001808,  // ..**.......*..
+     0x000033C4,  // .**..****...*.
+     0x00006626,  // **..**...*..**
+     0x00006C02,  // **.**........*
+     0x00006C02,  // **.**........*
+     0x00006C02,  // **.**........*
+     0x00006C22,  // **.**....*...*
+     0x00006626,  // **..**...*..**
+     0x000033C4,  // .**..****...*.
+     0x00001808,  // ..**.......*..
+     0x00000C10,  // ...**.....*...
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 170
+     7, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000F8,  // .*****..
+     0x000001CC,  // ***..**.
+     0x00000004,  // ......*.
+     0x000000FC,  // .******.
+     0x0000018C,  // **...**.
+     0x0000018C,  // **...**.
+     0x000000F4,  // .****.*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 171
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000004C,  // ....*..**.
+     0x000000C8,  // ...**..*..
+     0x00000198,  // ..**..**..
+     0x00000130,  // ..*..**...
+     0x00000330,  // .**..**...
+     0x00000190,  // ..**..*...
+     0x00000098,  // ...*..**..
+     0x0000004C,  // ....*..**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 172
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000318,  // ..**...**..
-     0x00000738,  // .***..***..
-     0x00000360,  // ..**.**....
-     0x000003C0,  // ..****.....
-     0x00000360,  // ..**.**....
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x0000078C,  // .****...**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
      0x00000000,  // ...........
-  },
-  {             // 235
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000580,  // .*.**......
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001E0,  // ...****....
-     0x00000130,  // ...*..**...
-     0x00000330,  // ..**..**...
-     0x00000218,  // ..*....**..
-     0x0000061A,  // .**....**.*
-     0x0000040C,  // .*......**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 236
-     11, 19,
-     0x00000000,  // ...........
+  {             // 173
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 174
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007E0,  // ....******....
+     0x00000C30,  // ...**....**...
+     0x00001808,  // ..**.......*..
+     0x000037C4,  // .**.*****...*.
+     0x00006666,  // **..**..**..**
+     0x00006622,  // **..**...*...*
+     0x00006622,  // **..**...*...*
+     0x000067C2,  // **..*****....*
+     0x00006642,  // **..**..*....*
+     0x00006666,  // **..**..**..**
+     0x00003624,  // .**.**...*..*.
+     0x00001808,  // ..**.......*..
+     0x00000C10,  // ...**.....*...
+     0x000007E0,  // ....******....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 175
+     10, 20,
+     0x00000000,  // ............
+     0x00000FFE,  // .***********
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000210,  // ..*....*...
-     0x00000630,  // .**...**...
-     0x00000630,  // .**...**...
-     0x00000630,  // .**...**...
-     0x00000630,  // .**...**...
-     0x00000630,  // .**...**...
-     0x00000774,  // .***.***.*.
-     0x000005D8,  // .*.***.**..
-     0x00000400,  // .*.........
-     0x00000400,  // .*.........
-     0x00000400,  // .*.........
      0x00000000,  // ...........
-  },
-  {             // 237
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4518,413 +3306,1849 @@ cFont::tPixelData FontSml_iso8859_7[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000070C,  // .***....**.
-     0x0000030C,  // ..**....**.
-     0x00000188,  // ...**...*..
-     0x00000188,  // ...**...*..
-     0x000000D0,  // ....**.*...
-     0x000000D0,  // ....**.*...
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
-  {             // 238
-     11, 19,
+  {             // 176
+     7, 20,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000003C,  // ..****.
+     0x00000046,  // .*...**
+     0x00000042,  // .*....*
+     0x00000046,  // .*...**
+     0x0000003C,  // ..****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 177
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 178
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x00000026,  // .*..**
+     0x00000002,  // .....*
+     0x00000004,  // ....*.
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x0000003E,  // .*****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 179
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // ..***.
+     0x00000036,  // .**.**
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000002,  // .....*
+     0x00000022,  // .*...*
+     0x0000003C,  // .****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 180
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 181
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000038,  // .....***..
+     0x00000336,  // .**..**.**
+     0x00000366,  // .**.**..**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 182
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001980,  // ..**..**......
+     0x000019C0,  // ..**..***.....
+     0x000003C0,  // .....****.....
+     0x00000240,  // .....*..*.....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000430,  // ....*....**...
+     0x00000C30,  // ...**....**...
+     0x00000FF8,  // ...*********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000100C,  // ..*........**.
+     0x0000300C,  // .**........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 183
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 184
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00006FFC,  // ..**.**********.
+     0x0000CC00,  // .**..**.........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000FF0,  // .....********...
+     0x00000FF0,  // .....********...
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000C00,  // .....**.........
+     0x00000FFC,  // .....**********.
+     0x00000FFC,  // .....**********.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 185
+     16, 20,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000D80C,  // .**.**.......**.
+     0x0000980C,  // .*..**.......**.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x00001FFC,  // ....***********.
+     0x00001FFC,  // ....***********.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x0000180C,  // ....**.......**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 186
+     7, 20,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000006C,  // .**.**.
+     0x0000004C,  // .*..**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 187
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000120,  // ..*..*....
+     0x00000190,  // ..**..*...
+     0x00000098,  // ...*..**..
+     0x000000CC,  // ...**..**.
+     0x000000CC,  // ...**..**.
+     0x000000D8,  // ...**.**..
+     0x00000190,  // ..**..*...
+     0x00000130,  // ..*..**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 188
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000063E0,  // .**...*****....
+     0x00006E38,  // .**.***...***..
+     0x0000D80C,  // **.**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00003006,  // ..**.........**
+     0x00003006,  // ..**.........**
+     0x00003006,  // ..**.........**
+     0x00003006,  // ..**.........**
+     0x00003006,  // ..**.........**
+     0x00003006,  // ..**.........**
+     0x0000180C,  // ...**.......**.
+     0x00001C1C,  // ...***.....***.
+     0x00000FF8,  // ....*********..
+     0x000003E0,  // ......*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 189
+     16, 20,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00003018,  // ...**.......**..
+     0x00007010,  // ..***.......*...
+     0x0000B020,  // .*.**......*....
+     0x00003060,  // ...**.....**....
+     0x000030C0,  // ...**....**.....
+     0x00003080,  // ...**....*......
+     0x00003100,  // ...**...*.......
+     0x0000033C,  // .......**..****.
+     0x00000626,  // ......**...*..**
+     0x00000406,  // ......*.......**
+     0x00000804,  // .....*........*.
+     0x00001818,  // ....**......**..
+     0x00003030,  // ...**......**...
+     0x0000207E,  // ...*......******
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 190
+     16, 20,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0001B80C,  // ..**.***.......**.
+     0x00031818,  // .**...**......**..
+     0x00000C18,  // .......**.....**..
+     0x00000630,  // ........**...**...
+     0x00000660,  // ........**..**....
+     0x00000340,  // .........**.*.....
+     0x000001C0,  // ..........***.....
+     0x00000180,  // ..........**......
+     0x00000180,  // ..........**......
+     0x00000180,  // ..........**......
+     0x00000180,  // ..........**......
+     0x00000180,  // ..........**......
+     0x00000180,  // ..........**......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 191
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000063E0,  // .**...*****....
+     0x00006E70,  // .**.***..***...
+     0x0000D818,  // **.**......**..
+     0x00001818,  // ...**......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00001008,  // ...*........*..
+     0x00001818,  // ...**......**..
+     0x00000C30,  // ....**....**...
+     0x00003E7C,  // ..*****..*****.
+     0x00003E7C,  // ..*****..*****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 192
+     4, 20,
+     0x00000000,  // .........
+     0x00000030,  // ....**...
+     0x00000366,  // **.**..**
+     0x00000306,  // **.....**
+     0x00000000,  // .........
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000060,  // ...**....
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 193
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ......**......
+     0x000001C0,  // ......***.....
+     0x000003C0,  // .....****.....
+     0x00000240,  // .....*..*.....
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000430,  // ....*....**...
+     0x00000C30,  // ...**....**...
+     0x00000FF8,  // ...*********..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x0000100C,  // ..*........**.
+     0x0000300C,  // .**........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 194
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF0,  // .********...
+     0x00000C38,  // .**....***..
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF0,  // .********...
+     0x00000FFC,  // .**********.
+     0x00000C0C,  // .**......**.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C0C,  // .**......**.
+     0x00000FFC,  // .**********.
+     0x00000FF0,  // .********...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 195
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 196
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ......**......
+     0x000001C0,  // ......***.....
+     0x000003C0,  // .....****.....
+     0x00000240,  // .....*..*.....
+     0x00000660,  // ....**..**....
+     0x00000620,  // ....**...*....
+     0x00000430,  // ....*....**...
+     0x00000C30,  // ...**....**...
+     0x00000C18,  // ...**.....**..
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001FFC,  // ..***********.
+     0x00003FFC,  // .************.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 197
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FF0,  // .********...
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 198
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x00000080,  // ....*......
-     0x00000078,  // .....****..
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000078,  // .....****..
+     0x00000000,  // ...........
+     0x000007FE,  // .**********
+     0x000007FE,  // .**********
+     0x0000000C,  // ........**.
+     0x00000018,  // .......**..
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000E0,  // ....***....
      0x000000C0,  // ....**.....
      0x00000180,  // ...**......
      0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000001C0,  // ...***.....
-     0x00000070,  // .....***...
-     0x00000008,  // ........*..
-     0x00000048,  // .....*..*..
-     0x00000070,  // .....***...
+     0x00000600,  // .**........
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
+     0x00000000,  // ...........
      0x00000000,  // ...........
-  },
-  {             // 239
-     11, 19,
      0x00000000,  // ...........
      0x00000000,  // ...........
+  },
+  {             // 199
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 200
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x000067CC,  // .**..*****..**.
+     0x000067CC,  // .**..*****..**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 202
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C18,  // .**.....**..
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000CC0,  // .**..**.....
+     0x00000DC0,  // .**.***.....
+     0x00000FC0,  // .******.....
+     0x00000E60,  // .***..**....
+     0x00000C30,  // .**....**...
+     0x00000C30,  // .**....**...
+     0x00000C18,  // .**.....**..
+     0x00000C0C,  // .**......**.
+     0x00000C0E,  // .**......***
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 203
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000360,  // ....**.**....
+     0x00000660,  // ...**..**....
+     0x00000620,  // ...**...*....
+     0x00000430,  // ...*....**...
+     0x00000C30,  // ..**....**...
+     0x00000C18,  // ..**.....**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000100C,  // .*........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 204
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000380E,  // .***.......***
+     0x00003C0E,  // .****......***
+     0x00003C1E,  // .****.....****
+     0x0000361E,  // .**.**....****
+     0x00003636,  // .**.**...**.**
+     0x00003336,  // .**..**..**.**
+     0x00003366,  // .**..**.**..**
+     0x000031C6,  // .**...***...**
+     0x000031C6,  // .**...***...**
+     0x00003086,  // .**....*....**
+     0x00003006,  // .**.........**
+     0x00003006,  // .**.........**
+     0x00003006,  // .**.........**
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 205
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001C0C,  // .***......**.
+     0x00001E0C,  // .****.....**.
+     0x00001B0C,  // .**.**....**.
+     0x00001B0C,  // .**.**....**.
+     0x0000198C,  // .**..**...**.
+     0x000018CC,  // .**...**..**.
+     0x000018CC,  // .**...**..**.
+     0x0000186C,  // .**....**.**.
+     0x0000183C,  // .**.....****.
+     0x0000183C,  // .**.....****.
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 206
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 207
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 209
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000C3C,  // .**....****.
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C06,  // .**.......**
+     0x00000C0E,  // .**......***
+     0x00000FFC,  // .**********.
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 210
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
+     0x00000600,  // ..**........
+     0x00000300,  // ...**.......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 211
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
+     0x00000600,  // ..**........
+     0x00000300,  // ...**.......
+     0x00000180,  // ....**......
+     0x000000C0,  // .....**.....
+     0x000000E0,  // .....***....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 212
+     11, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 213
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000380C,  // ***.......**.
+     0x00001818,  // .**......**..
+     0x00000C18,  // ..**.....**..
+     0x00000E30,  // ..***...**...
+     0x00000660,  // ...**..**....
+     0x00000340,  // ....**.*.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 214
+     15, 20,
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000FE0,  // ....*******....
+     0x00003FF8,  // ..***********..
+     0x0000331C,  // ..**..**...***.
+     0x0000630E,  // .**...**....***
+     0x00006306,  // .**...**.....**
+     0x00006306,  // .**...**.....**
+     0x00006306,  // .**...**.....**
+     0x00006306,  // .**...**.....**
+     0x0000230C,  // ..*...**....**.
+     0x00003318,  // ..**..**...**..
+     0x00000FF0,  // ....********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     12, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000630,  // ...**...**...
+     0x00000660,  // ...**..**....
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x000003C0,  // ....****.....
+     0x00000760,  // ...***.**....
+     0x00000630,  // ...**...**...
+     0x00000C30,  // ..**....**...
+     0x00001818,  // .**......**..
+     0x0000380C,  // ***.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 216
+     16, 20,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C31C,  // .**....**...***.
+     0x00006338,  // ..**...**..***..
+     0x00003FF0,  // ...**********...
+     0x00001FE0,  // ....********....
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000300,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 217
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x00000FF0,  // ...********...
+     0x00001C38,  // ..***....***..
+     0x00001818,  // ..**......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001008,  // ..*........*..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00003E7C,  // .*****..*****.
+     0x00003E7C,  // .*****..*****.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 218
+     5, 20,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x000001B6,  // **.**.**
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 219
+     12, 20,
+     0x00000000,  // .............
+     0x00003006,  // **.........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 220
+     11, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000638,  // ..**...***..
+     0x000003EC,  // ...*****.**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 221
+     8, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ....**..
+     0x00000010,  // ....*...
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FE,  // .*******
+     0x000000C4,  // .**...*.
+     0x000000C0,  // .**.....
+     0x00000040,  // ..*.....
+     0x00000030,  // ...**...
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C6,  // .**...**
+     0x0000007C,  // ..*****.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 222
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x0000037C,  // .**.*****.
+     0x0000038E,  // .***...***
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000000,  // ..........
+  },
+  {             // 223
+     4, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x00000008,  // ..*..
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 224
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000364,  // .**.**..*.
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000010C,  // ..*....**.
+     0x00000188,  // ..**...*..
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 225
+     11, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F8,  // ...*******..
+     0x00000638,  // ..**...***..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000638,  // ..**...***..
+     0x000003EC,  // ...*****.**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 226
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x000001E0,  // ...****....
+     0x000003B8,  // ..***.***..
+     0x00000618,  // .**....**..
+     0x00000608,  // .**.....*..
+     0x00000608,  // .**.....*..
+     0x00000618,  // .**....**..
+     0x000006E0,  // .**.***....
+     0x00000638,  // .**...***..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000006F0,  // .**.****...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
      0x00000000,  // ...........
+  },
+  {             // 227
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000204,  // .*......*.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000118,  // ..*...**..
+     0x00000198,  // ..**..**..
+     0x00000190,  // ..**..*...
+     0x000000F0,  // ...****...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+  },
+  {             // 228
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FC,  // ..*******.
+     0x000000C0,  // ...**.....
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x0000018C,  // ..**...**.
+     0x00000304,  // .**.....*.
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 229
+     8, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000007C,  // ..*****.
+     0x000000EC,  // .***.**.
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x00000070,  // ..***...
+     0x00000070,  // ..***...
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C6,  // .**...**
+     0x0000007C,  // ..*****.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 230
+     8, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003E,  // ...*****
+     0x00000004,  // ......*.
+     0x00000008,  // .....*..
+     0x00000010,  // ....*...
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000040,  // ..*.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000C0,  // .**.....
+     0x000000F0,  // .****...
+     0x0000007E,  // ..******
+     0x00000006,  // ......**
+     0x00000006,  // ......**
+     0x0000000E,  // .....***
+     0x00000008,  // .....*..
+  },
+  {             // 231
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000037C,  // .**.*****.
+     0x0000038E,  // .***...***
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000006,  // ........**
+     0x00000000,  // ..........
+  },
+  {             // 232
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x0000018C,  // ..**...**.
+     0x00000184,  // ..**....*.
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000104,  // ..*.....*.
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 233
+     4, 20,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 234
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000031C,  // .**...***.
+     0x00000338,  // .**..***..
+     0x00000360,  // .**.**....
+     0x000003C0,  // .****.....
+     0x000003C0,  // .****.....
+     0x00000360,  // .**.**....
+     0x00000330,  // .**..**...
+     0x00000330,  // .**..**...
+     0x00000318,  // .**...**..
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 235
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000080,  // ...*......
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000040,  // ....*.....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000000B0,  // ...*.**...
+     0x000001B0,  // ..**.**...
+     0x00000190,  // ..**..*...
+     0x00000118,  // ..*...**..
+     0x00000318,  // .**...**..
+     0x00000308,  // .**....*..
+     0x0000060C,  // **.....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 236
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000071C,  // .***...***.
+     0x000007FC,  // .*********.
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+  },
+  {             // 237
+     9, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000060C,  // **.....**.
+     0x0000020C,  // .*.....**.
+     0x00000308,  // .**....*..
+     0x00000118,  // ..*...**..
+     0x00000190,  // ..**..*...
+     0x000001B0,  // ..**.**...
+     0x000000B0,  // ...*.**...
+     0x000000E0,  // ...***....
+     0x000000E0,  // ...***....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 238
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x000000F8,  // ..*****..
+     0x00000038,  // ....***..
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x000000F0,  // ..****...
+     0x0000003E,  // ....*****
+     0x00000006,  // .......**
+     0x00000006,  // .......**
+     0x0000001C,  // .....***.
+     0x00000000,  // .........
+  },
+  {             // 239
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 240
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FE,  // ...********
-     0x000003FC,  // ..********.
-     0x00000490,  // .*..*..*...
-     0x00000090,  // ....*..*...
-     0x00000090,  // ....*..*...
-     0x00000192,  // ...**..*..*
-     0x0000019E,  // ...**..****
-     0x0000030C,  // ..**....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000007FE,  // **********
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 241
-     11, 19,
-     0x00000000,  // ...........
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000398,  // ..***..**..
-     0x00000370,  // ..**.***...
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003B8,  // ..***.***..
+     0x00000308,  // ..**....*..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F0,  // .*******...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
   },
   {             // 242
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x000001F8,  // ...******..
-     0x00000308,  // ..**....*..
-     0x00000200,  // ..*........
-     0x00000200,  // ..*........
-     0x00000200,  // ..*........
-     0x000003F0,  // ..******...
-     0x000001F8,  // ...******..
-     0x00000008,  // ........*..
-     0x00000008,  // ........*..
-     0x00000070,  // .....***...
-     0x00000000,  // ...........
+     9, 20,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000003E,  // ....*****
+     0x00000072,  // ...***..*
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x000000C0,  // ..**.....
+     0x00000070,  // ...***...
+     0x0000001C,  // .....***.
+     0x00000006,  // .......**
+     0x00000006,  // .......**
+     0x0000003E,  // ....*****
+     0x00000038,  // ....***..
   },
   {             // 243
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FE,  // ....*******
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003FC,  // ...********.
+     0x00000630,  // ..**...**...
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000C18,  // .**.....**..
+     0x00000630,  // ..**...**...
+     0x000003E0,  // ...*****....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 244
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ...*******.
-     0x000003F8,  // ..*******..
-     0x00000440,  // .*...*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000044,  // .....*...*.
-     0x00000078,  // .....****..
-     0x00000030,  // ......**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     7, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 245
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000318,  // ..**...**..
-     0x0000058C,  // .*.**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000188,  // ..**...*..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 246
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x000001F0,  // ...*****...
-     0x00000358,  // ..**.*.**..
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x00000358,  // ..**.*.**..
-     0x000001F0,  // ...*****...
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000378,  // ...**.****..
+     0x0000064C,  // ..**..*..**.
+     0x00000C46,  // .**...*...**
+     0x00000C46,  // .**...*...**
+     0x00000C46,  // .**...*...**
+     0x00000C46,  // .**...*...**
+     0x00000C46,  // .**...*...**
+     0x0000064C,  // ..**..*..**.
+     0x00000778,  // ..***.****..
+     0x000001F0,  // ....*****...
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
+     0x00000040,  // ......*.....
   },
   {             // 247
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000602,  // .**.......*
-     0x00000506,  // .*.*.....**
-     0x0000018C,  // ...**...**.
-     0x00000098,  // ....*..**..
-     0x000000F0,  // ....****...
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x00000190,  // ...**..*...
-     0x00000318,  // ..**...**..
-     0x0000060A,  // .**.....*.*
-     0x00000406,  // .*.......**
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000020C,  // .*.....**.
+     0x0000030C,  // .**....**.
+     0x00000118,  // ..*...**..
+     0x00000198,  // ..**..**..
+     0x000000B0,  // ...*.**...
+     0x000000E0,  // ...***....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000000F0,  // ...****...
+     0x00000190,  // ..**..*...
+     0x00000118,  // ..*...**..
+     0x0000030C,  // .**....**.
+     0x0000020C,  // .*.....**.
+     0x00000000,  // ..........
   },
   {             // 248
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000C46,  // **...*...**
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x0000064C,  // .**..*..**.
-     0x00000358,  // ..**.*.**..
-     0x00000358,  // ..**.*.**..
-     0x000001F0,  // ...*****...
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
+     13, 20,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x00001806,  // .**........**
+     0x000018C6,  // .**...**...**
+     0x000018C6,  // .**...**...**
+     0x000018C6,  // .**...**...**
+     0x000018C6,  // .**...**...**
+     0x00000CCC,  // ..**..**..**.
+     0x000007F8,  // ...********..
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
   },
   {             // 249
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000308,  // ..**....*..
-     0x00000604,  // .**......*.
-     0x00000406,  // .*.......**
-     0x00000466,  // .*...**..**
-     0x00000466,  // .*...**..**
-     0x00000666,  // .**..**..**
-     0x000007FE,  // .**********
-     0x0000039C,  // ..***..***.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003008,  // ..**........*..
+     0x00003008,  // ..**........*..
+     0x0000600C,  // .**.........**.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x00006184,  // .**....**....*.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x000033C8,  // ..**..****..*..
+     0x00001E78,  // ...****..****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 250
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000330,  // ..**..**...
-     0x00000330,  // ..**..**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000380,  // ..***......
-     0x000004C0,  // .*..**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C8,  // ....**..*..
-     0x00000070,  // .....***...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     4, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000006E,  // **.***
+     0x00000060,  // **....
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
   {             // 251
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000318,  // ..**...**..
-     0x0000058C,  // .*.**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000188,  // ..**...*..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 252
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000030,  // ......**...
-     0x00000020,  // ......*....
-     0x00000020,  // ......*....
-     0x00000000,  // ...........
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000010,  // ......*...
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001DC,  // ..***.***.
+     0x00000386,  // .***....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x00000306,  // .**.....**
+     0x0000018C,  // ..**...**.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 253
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000318,  // ..**...**..
-     0x0000058C,  // .*.**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x0000018C,  // ...**...**.
-     0x00000198,  // ...**..**..
-     0x000000F0,  // ....****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     10, 20,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000020,  // .....*....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000188,  // ..**...*..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 254
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000040,  // .....*.....
-     0x00000040,  // .....*.....
-     0x00000000,  // ...........
-     0x00000308,  // ..**....*..
-     0x00000604,  // .**......*.
-     0x00000406,  // .*.......**
-     0x00000466,  // .*...**..**
-     0x00000466,  // .*...**..**
-     0x00000666,  // .**..**..**
-     0x000007FE,  // .**********
-     0x0000039C,  // ..***..***.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000C0,  // ........**.....
+     0x00000080,  // ........*......
+     0x00000000,  // ...............
+     0x00001018,  // ...*.......**..
+     0x00003008,  // ..**........*..
+     0x0000200C,  // ..*.........**.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x00006184,  // .**....**....*.
+     0x0000618C,  // .**....**...**.
+     0x0000618C,  // .**....**...**.
+     0x000033C8,  // ..**..****..*..
+     0x00001E78,  // ...****..****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 255
-     11, 19,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     0, 20,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
   },
   };
diff --git a/i18n.c b/i18n.c
index 17cc2a48f..a1b73d41b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.152 2004/03/13 10:59:23 kls Exp $
+ * $Id: i18n.c 1.155 2004/05/16 11:53:45 kls Exp $
  *
  * Translations provided by:
  *
@@ -23,6 +23,7 @@
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
+ * Croatian    Drazen Dupor <drazen.dupor@dupor.com>
  *
  */
 
@@ -94,6 +95,7 @@ const tI18nPhrase Phrases[] = {
     "Magyar",
     "Catal�",
     "�������", // Russian
+    "Hrvatski",
   },
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-1",
@@ -113,13 +115,14 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-1",
     "iso8859-5",
+    "iso8859-2",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
-  { "eng",
+  { "eng,dos",
     "deu,ger",
     "slv",
     "ita",
-    "dut,nla",
+    "dut,nla,nld",
     "por",
     "fra,fre",
     "nor",
@@ -132,6 +135,7 @@ const tI18nPhrase Phrases[] = {
     "hun",
     "cat,cln",
     "rus",
+    "hrv",
   },
   // Menu titles:
   { "VDR",
@@ -151,6 +155,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -169,6 +174,7 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Guia de Programaci�",
     "�������",
+    "Raspored",
   },
   { "Channels",
     "Kan�le",
@@ -187,6 +193,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorn�k",
     "Canals",
     "������",
+    "Programi",
   },
   { "Timers",
     "Timer",
@@ -205,6 +212,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel beprogramoz�sa",
     "Temporitzadors",
     "�������",
+    "Termini",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -223,6 +231,7 @@ const tI18nPhrase Phrases[] = {
     "Felvett ad�sok",
     "Veure programes gravats",
     "������",
+    "Snimke",
   },
   { "Setup",
     "Einstellungen",
@@ -241,6 +250,7 @@ const tI18nPhrase Phrases[] = {
     "Be�ll�t�sok",
     "Configuraci�",
     "���������",
+    "Konfiguracija",
   },
   { "Commands",
     "Befehle",
@@ -259,6 +269,7 @@ const tI18nPhrase Phrases[] = {
     "Parancsok",
     "Ordres",
     "�������",
+    "Naredbe",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -277,6 +288,7 @@ const tI18nPhrase Phrases[] = {
     "Parancsok a felvett filmekhez",
     "Ordres de gravaci�",
     "������� ������",
+    "Naredbe za snimanje",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -295,6 +307,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorn�k be�ll�t�sa",
     "Editar canal",
     "�������������� ������",
+    "Ure�ivanje programa",
   },
   { "Edit timer",
     "Timer editieren",
@@ -313,6 +326,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
     "Editar temporitzador",
     "��������� �������",
+    "Ure�ivanje termina",
   },
   { "Event",
     "Sendung",
@@ -331,6 +345,7 @@ const tI18nPhrase Phrases[] = {
     "Ad�s",
     "Esdeveniment",
     "��������",
+    "Emisija",
   },
   { "Summary",
     "Inhalt",
@@ -349,6 +364,7 @@ const tI18nPhrase Phrases[] = {
     "Tartalom",
     "Sinopsi",
     "��������",
+    "Sadr�aj",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -367,6 +383,7 @@ const tI18nPhrase Phrases[] = {
     "Program - %s",
     "Guia de Programaci� - %s",
     "��������� - %s",
+    "Raspored - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -385,6 +402,7 @@ const tI18nPhrase Phrases[] = {
     "Mi megy most?",
     "Qu� fan ara?",
     "������ � �����:",
+    "�to je trenutno na programu?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -403,6 +421,7 @@ const tI18nPhrase Phrases[] = {
     "Mi k�vetkezik?",
     "Qu� fan despr�s?",
     "����� � ���������:",
+    "�to slijedi?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -422,6 +441,7 @@ const tI18nPhrase Phrases[] = {
     "Be�ll�tani",
     "Editar",
     "�������������",
+    "Promjeni",
   },
   { "New",
     "Neu",
@@ -440,6 +460,7 @@ const tI18nPhrase Phrases[] = {
     "�j",
     "Nou",
     "��������",
+    "Novi",
   },
   { "Delete",
     "L�schen",
@@ -458,6 +479,7 @@ const tI18nPhrase Phrases[] = {
     "T�r�lni",
     "Esborrar",
     "�������",
+    "Obri�i",
   },
   { "Mark",
     "Markieren",
@@ -476,6 +498,7 @@ const tI18nPhrase Phrases[] = {
     "Megjel�lni",
     "Marcar",
     "�����������",
+    "Ozna�i",
   },
   { "On/Off",
     "Ein/Aus",
@@ -494,6 +517,7 @@ const tI18nPhrase Phrases[] = {
     "Be/Ki",
     "On/Off",
     "���/����",
+    "De-/Aktiviraj",
   },
   { "Record",
     "Aufnehmen",
@@ -512,6 +536,7 @@ const tI18nPhrase Phrases[] = {
     "Felvenni",
     "Gravar",
     "������",
+    "Snimi",
   },
   { "Play",
     "Wiedergabe",
@@ -530,6 +555,7 @@ const tI18nPhrase Phrases[] = {
     "Lej�tszani",
     "Reproduir",
     "�������������",
+    "Start",
   },
   { "Rewind",
     "Anfang",
@@ -548,6 +574,7 @@ const tI18nPhrase Phrases[] = {
     "Vissza az elej�re",
     "Enrera",
     "�����",
+    "Na po�etak",
   },
   { "Button$Stop",
     "Beenden",
@@ -566,6 +593,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "Aturar",
     "����",
+    "Stop",
   },
   { "Resume",
     "Weiter",
@@ -584,6 +612,7 @@ const tI18nPhrase Phrases[] = {
     "Tov�bb",
     "Continuar",
     "����������",
+    "Nastavi",
   },
   { "Summary",
     "Inhalt",
@@ -602,6 +631,7 @@ const tI18nPhrase Phrases[] = {
     "Tartalom",
     "Resum",
     "��������",
+    "Sadr�aj",
   },
   { "Open",
     "�ffnen",
@@ -620,6 +650,7 @@ const tI18nPhrase Phrases[] = {
     "Kinyitni",
     "Obrir",
     "�������",
+    "Otvori",
   },
   { "Switch",
     "Umschalten",
@@ -638,6 +669,7 @@ const tI18nPhrase Phrases[] = {
     "�tkapcsolni",
     "Canviar",
     "�����������",
+    "Prebaci",
   },
   { "Now",
     "Jetzt",
@@ -656,6 +688,7 @@ const tI18nPhrase Phrases[] = {
     "Most",
     "Ara",
     "������",
+    "Trenutno",
   },
   { "Next",
     "N�chste",
@@ -674,6 +707,7 @@ const tI18nPhrase Phrases[] = {
     "K�vetkez�",
     "Seg�ent",
     "�����",
+    "Slijedi",
   },
   { "Button$Schedule",
     "Programm",
@@ -692,6 +726,7 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Programar",
     "���������",
+    "Raspored",
   },
   { "Language",
     "Sprache",
@@ -710,6 +745,7 @@ const tI18nPhrase Phrases[] = {
     "Nyelv",
     "Idioma",
     "����",
+    "Jezik",
   },
   { "Eject",
     "Auswerfen",
@@ -728,6 +764,7 @@ const tI18nPhrase Phrases[] = {
     "Kidobni",
     "Expulsar",
     "�������",
+    "Izbaci",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -746,6 +783,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "���/���",
+    "ABC/abc",
   },
   { "Insert",
     "Einf�gen",
@@ -764,6 +802,7 @@ const tI18nPhrase Phrases[] = {
     "Beilleszteni",
     "Inserir",
     "�������",
+    "Umetni",
   },
   { "Overwrite",
     "�berschreiben",
@@ -782,6 +821,7 @@ const tI18nPhrase Phrases[] = {
     "�t�rni",
     "Sobrescriure",
     "������",
+    "Prepi�i",
   },
   { "Menu",
     "Men�",
@@ -800,6 +840,7 @@ const tI18nPhrase Phrases[] = {
     "Men�",
     "Men�",
     "����",
+    "Izbor",
   },
   { "Reset",
     "Reset",
@@ -818,6 +859,7 @@ const tI18nPhrase Phrases[] = {
     "Reset",
     "Reiniciar",
     "�����",
+    "Reset",
   },
   { "Scan",
     "Scan",
@@ -836,6 +878,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "�����������",
+    "Pretra�i",
   },
   // Confirmations:
   { "Delete channel?",
@@ -855,6 +898,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorna t�rl�se?",
     "Esborrar el canal?",
     "������� �����?",
+    "Obrisati program?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -873,6 +917,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel beprogramoz�s�nak t�rl�se?",
     "Esborrar el temporitzador?",
     "������� ������?",
+    "Obrisati termin?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -891,6 +936,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel t�rl�se?",
     "Esborrar gravaci�?",
     "������� ������?",
+    "Obrisati snimku?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -909,6 +955,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel folyamatban van - m�gis t�r�lni?",
     "Temporitzador activat - Esborrar de totes maneres?",
     "���� ������ �� ������� - ������������� �������?",
+    "Jo� snimam - zaista obrisati?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -927,6 +974,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel befejezni?",
     "Aturar la gravaci�?",
     "���������� ������?",
+    "Zaustaviti snimanje?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -945,6 +993,7 @@ const tI18nPhrase Phrases[] = {
     "az els� k�rty�n",
     "a la interf�cie prim�ria",
     "�� �������� ����������",
+    "na primarnom ure�aju",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -963,6 +1012,7 @@ const tI18nPhrase Phrases[] = {
     "V�g�st befejezni?",
     "Cancel�lar l'edici�?",
     "�������� ��������������?",
+    "Otkazati ure�ivanje?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -981,6 +1031,7 @@ const tI18nPhrase Phrases[] = {
     "T�nyleg �jraind�tani?",
     "Segur que voleu reiniciar?",
     "������������� �������������?",
+    "Zaista ponovo pokrenuti?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -999,6 +1050,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
     "Gravant - Reiniciar de totes maneres?",
     "���� ������ - ������������� �������������?",
+    "Snimanje traje - svejedno restart sistema?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -1017,6 +1069,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
     "Gravant - Apagar de totes maneres?",
     "���� ������ - ������������� ���������?",
+    "Snimanje traje - svejedno isklju�iti?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -1035,6 +1088,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
     "Hi ha una gravaci� en %d minuts - Apagar de totes maneres?",
     "����� %d ����� �������� ������ - ������������� ���������?",
+    "Snimanje za %d minuta - svejedno isklju�iti?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -1053,6 +1107,7 @@ const tI18nPhrase Phrases[] = {
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
     "Prem qualsevol tecla per cancel�lar l'aturada",
     "������� ����� ������ ����� �������� ����������.",
+    "Pritisnite tipku ako ne �elite ugasiti sistem",
   },
   // Channel parameters:
   { "Name",
@@ -1072,6 +1127,7 @@ const tI18nPhrase Phrases[] = {
     "N�v",
     "Nom",
     "��������",
+    "Naziv",
   },
   { "Frequency",
     "Frequenz",
@@ -1090,6 +1146,7 @@ const tI18nPhrase Phrases[] = {
     "Frekvencia",
     "Freq��ncia",
     "�������",
+    "Frekvencija",
   },
   { "Polarization",
     "Polarisation",
@@ -1108,6 +1165,7 @@ const tI18nPhrase Phrases[] = {
     "Polariz�ci�",
     "Polaritzaci�",
     "�����������",
+    "Polarizacija",
   },
   { "Source",
     "Quelle",
@@ -1126,6 +1184,7 @@ const tI18nPhrase Phrases[] = {
     "Forr�s",
     "Origen",
     "��������",
+    "Izvor",
   },
   { "Srate",
     "Srate",
@@ -1144,6 +1203,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Srate",
     "����. ��������",
+    "Srate", // hrv
   },
   { "Vpid",
     "Vpid",
@@ -1162,6 +1222,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "PID V�deo",
     "Vpid (�����)",
+    "Vpid",
   },
   { "Ppid",
     "Ppid",
@@ -1180,6 +1241,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
+    "Ppid",
   },
   { "Apid1",
     "Apid1",
@@ -1198,6 +1260,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1",
     "PID �udio (1)",
     "Apid1 (����� 1)",
+    "Apid1", // hrv
   },
   { "Apid2",
     "Apid2",
@@ -1216,6 +1279,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "PID �udio (2)",
     "Apid2 (����� 2)",
+    "Apid2", // hrv
   },
   { "Dpid1",
     "Dpid1",
@@ -1234,6 +1298,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1",
     "PID AC3 (1)",
     "Dpid1 (AC3 1)",
+    "Dpid1", // hrv
   },
   { "Dpid2",
     "Dpid2",
@@ -1252,6 +1317,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2",
     "PID AC3 (2)",
     "Dpid2 (AC3 2)",
+    "Dpid2", // hrv
   },
   { "Tpid",
     "Tpid",
@@ -1270,6 +1336,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid",
     "PID Teletext",
     "Tpid (���������)",
+    "Tpid", // hrv
   },
   { "CA",
     "CA",
@@ -1288,6 +1355,7 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "Acc�s Condicional",
     "CA (�������)",
+    "Kodiranje (CA)",
   },
   { "Sid",
     "Sid",
@@ -1306,6 +1374,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid",
+    "Sid", // hrv
   },
   { "Inversion",
     "Inversion",
@@ -1324,6 +1393,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
     "Inversi�",
     "��������",
+    "Inverzija",
   },
   { "Bandwidth",
     "Bandwidth",
@@ -1342,6 +1412,7 @@ const tI18nPhrase Phrases[] = {
     "Bandwidth",
     "Amplada de banda",
     "��������",
+    "Bandwidth", // hrv "Pojasna �irina",
   },
   { "CoderateH",
     "CoderateH",
@@ -1360,6 +1431,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
+    "CoderateH", // hrv
   },
   { "CoderateL",
     "CoderateL",
@@ -1378,6 +1450,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
+    "CoderateL", // hrv
   },
   { "Modulation",
     "Modulation",
@@ -1396,6 +1469,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulaci�",
     "���������",
+    "Modulacija",
   },
   { "Transmission",
     "Transmission",
@@ -1414,6 +1488,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmissi�",
     "��������",
+    "Prijenos",
   },
   { "Guard",
     "Guard",
@@ -1432,6 +1507,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
     "Protegir",
     "������",
+    "Za�tita",
   },
   { "Hierarchy",
     "Hierarchy",
@@ -1450,6 +1526,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchy",
     "Jerarquia",
     "��������",
+    "Hijerarhija",
   },
   // Timer parameters:
   { "Active",
@@ -1469,6 +1546,7 @@ const tI18nPhrase Phrases[] = {
     "Aktiv",
     "Actiu",
     "�����������",
+    "Aktivan",
   },
   { "Channel",
     "Kanal",
@@ -1487,6 +1565,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorna",
     "Canal",
     "�����",
+    "Program",
   },
   { "Day",
     "Tag",
@@ -1505,6 +1584,7 @@ const tI18nPhrase Phrases[] = {
     "Nap",
     "Dia",
     "����",
+    "Dan",
   },
   { "Start",
     "Anfang",
@@ -1523,6 +1603,7 @@ const tI18nPhrase Phrases[] = {
     "Kezdet",
     "Inici",
     "������",
+    "Po�etak",
   },
   { "Stop",
     "Ende",
@@ -1541,6 +1622,7 @@ const tI18nPhrase Phrases[] = {
     "V�ge",
     "Fi",
     "�����",
+    "Kraj",
   },
   { "VPS",
     "VPS",
@@ -1559,6 +1641,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "VPS ��������",
+    "VPS", // hrv
   },
   { "Priority",
     "Priorit�t",
@@ -1577,6 +1660,7 @@ const tI18nPhrase Phrases[] = {
     "Priorit�s",
     "Prioritat",
     "���������",
+    "Prioritet",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1595,6 +1679,7 @@ const tI18nPhrase Phrases[] = {
     "�lettartam",
     "Durada",
     "���� ��������",
+    "Trajanje",
   },
   { "File",
     "Datei",
@@ -1613,6 +1698,7 @@ const tI18nPhrase Phrases[] = {
     "File",
     "Arxiu",
     "����",
+    "Datoteka",
   },
   { "First day",
     "Erster Tag",
@@ -1631,6 +1717,7 @@ const tI18nPhrase Phrases[] = {
     "Els� nap",
     "Primer dia",
     "������ ����",
+    "Prvi dan",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -1650,6 +1737,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorn�t m�s haszn�lja!",
     "Canal en �s per un temporitzador!",
     "����� ����� ��������!",
+    "Program je trenutno zauzet terminom za snimanje",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1668,6 +1756,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorn�t nem lehet �tkapcsolni!",
     "No puc canviar de canal!",
     "���������� ����������� �����!",
+    "Ne mogu prebaciti program!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1686,6 +1775,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel folyamatban van!",
     "El temporitzador est� gravant!",
     "���� ������ �� �������!",
+    "Snimanje po definiranom terminu!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1704,6 +1794,7 @@ const tI18nPhrase Phrases[] = {
     "Hiba a felv�tel hozz�f�r�s�n�l",
     "Error a l'accedir a la gravaci�!",
     "������ ������� � ������!",
+    "Gre�ka pri pristupanju snimke!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1722,6 +1813,7 @@ const tI18nPhrase Phrases[] = {
     "Hiba a felv�tel t�rl�s�n�l!",
     "Error a l'esborrar la gravaci�!",
     "������ �������� ������!",
+    "Gre�ka pri brisanju snimke!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1740,6 +1832,7 @@ const tI18nPhrase Phrases[] = {
     "*** �rv�nytelen csatorna ***",
     "*** Canal incorrecte ***",
     "*** ������������ ����� ***",
+    "*** Neispravan program ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1758,6 +1851,7 @@ const tI18nPhrase Phrases[] = {
     "Nincs szabad DVB k�rtya a felv�telhez!",
     "No hi ha cap dispositiu DVB lliure per gravar!",
     "��� ���������� DVB-���������� ��� ������!",
+    "Nema slobodnog DVB ure�aja za snimanje!",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -1776,6 +1870,7 @@ const tI18nPhrase Phrases[] = {
     "A csatorna nem el�rhet�",
     "Canal no disponible!",
     "����� ����������!",
+    "Program nije dostupan!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -1794,6 +1889,7 @@ const tI18nPhrase Phrases[] = {
     "A csatornabe�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
     "��������� ������ �� ���������!",
+    "Parametri programa nisu jedinstveni!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -1812,6 +1908,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
     "Canal bloquejat (gravant)!",
     "����� ������������ (���� ������)!",
+    "Program blokiran (snimanje)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -1830,6 +1927,7 @@ const tI18nPhrase Phrases[] = {
     "Transfer-Mode nem ind�that�!",
     "No puc iniciar el mode de transfer�ncia!",
     "���������� �������� ����� ��������!", // ???
+    "Ne mogu zapo�eti 'prijenosni' na�in!",
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
@@ -1848,6 +1946,7 @@ const tI18nPhrase Phrases[] = {
     "A v�g�pont nincs kijel�lve",//TODO
     "No hi ha marques d'edici� definides",
     "�� ������ ����� ��� �������!",
+    "Nijedna prekidna to�ka nije postavljena!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -1866,6 +1965,7 @@ const tI18nPhrase Phrases[] = {
     "A v�g�s nem ind�that�!",
     "No puc iniciar el proc�s d'edici�!",
     "���������� ������ ������ ������!",
+    "Ne mogu zapo�eti ure�ivanje!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1884,6 +1984,7 @@ const tI18nPhrase Phrases[] = {
     "A v�g�s m�r aktiv�lt!",
     "Proc�s d'edici� iniciat anteriorment!",
     "������� ������������ ��� �������!",
+    "Ure�ivanje je ve� aktivirano!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -1902,6 +2003,7 @@ const tI18nPhrase Phrases[] = {
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
     "No puc apagar, falta la opci� -s !",
     "���������� ���������� - �� ����� �������� '-s'!",
+    "Ga�enje nemogu�e - nedostaje opcija '-s'!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -1920,6 +2022,7 @@ const tI18nPhrase Phrases[] = {
     "A merev lemez majdnem tele!",
     "Disc gaireb� ple!",
     "������������ ����� �� �����!",
+    "Nedovoljno prostora na disku",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -1938,6 +2041,7 @@ const tI18nPhrase Phrases[] = {
     "A CAM-Men� nem nyithat�",
     "No puc obrir el men� de la CAM!",
     "���� CAM-������ ����������!",
+    "Ne mogu otvoriti CAM izbor!",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -1956,6 +2060,7 @@ const tI18nPhrase Phrases[] = {
     "A CAM-Reset nem siker�lt",
     "No puc reiniciar la CAM!",
     "������ ����������� CAM-������!",
+    "Ne mogu resetirati CAM",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
@@ -1974,6 +2079,7 @@ const tI18nPhrase Phrases[] = {
     "A CAM vissza lett �ll�tva",
     "CAM reiniciada",
     "CAM-������ �����������!",
+    "CAM je resetiran!",
   },
   // Setup pages:
   { "OSD",
@@ -1993,6 +2099,7 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "Informaci� en pantalla",
     "����",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -2011,6 +2118,7 @@ const tI18nPhrase Phrases[] = {
     "EPG",
     "Guia de Programes",
     "�������",
+    "Pregled emisija (EPG)",
   },
   { "DVB",
     "DVB",
@@ -2029,6 +2137,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "Tarja DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -2047,6 +2156,7 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "Configuraci� de l'LNB",
     "���������",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -2065,6 +2175,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "CI Acc�s condicional",
     "�������� ������",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -2083,6 +2194,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel",
     "Opcions de Gravaci�",
     "������",
+    "Snimanje",
   },
   { "Replay",
     "Wiedergabe",
@@ -2101,6 +2213,7 @@ const tI18nPhrase Phrases[] = {
     "Lej�tsz�s",
     "Opcions de Reproducci�",
     "���������������",
+    "Reprodukcija",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -2119,6 +2232,7 @@ const tI18nPhrase Phrases[] = {
     "Egy�b",
     "Miscel�l�nia",
     "������",
+    "Ostalo",
   },
   { "Plugins",
     "Plugins",
@@ -2137,6 +2251,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "������ ����������",
+    "Dodaci (Plugins)",
   },
   { "Plugin",
     "Plugin",
@@ -2155,6 +2270,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "������",
+    "Plugin",
   },
   { "Restart",
     "Neustart",
@@ -2173,6 +2289,7 @@ const tI18nPhrase Phrases[] = {
     "�jraind�t�s",
     "Reiniciar",
     "�������������",
+    "Restart sistema",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -2192,6 +2309,83 @@ const tI18nPhrase Phrases[] = {
     "Nyelv",
     "Idioma",
     "����",
+    "Jezik",
+  },
+  { "Setup.OSD$Skin",
+    "Oberfl�che",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Theme",
+    "Thema",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Left",
+    "Links",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Top",
+    "Oben",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -2210,6 +2404,7 @@ const tI18nPhrase Phrases[] = {
     "Sz�less�g",
     "Amplada",
     "������",
+    "�irina",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -2228,6 +2423,7 @@ const tI18nPhrase Phrases[] = {
     "Magass�g",
     "Al�ada",
     "������",
+    "Visina",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -2246,6 +2442,83 @@ const tI18nPhrase Phrases[] = {
     "Inform�ci� felt�ntet�s�nek id�tartama",
     "Durada dels missatges (s)",
     "������������ ������ ��������� (���)",
+    "Vrijeme prikaza poruka (s)",
+  },
+  { "Setup.OSD$Use small font",
+    "Kleine Schrift benutzen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "never",
+    "nie",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "skin dependent",
+    "je nach Oberfl�che",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "always",
+    "immer",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -2264,6 +2537,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorna-Inf� pozici�ja",
     "Posici� de la informaci� del canal",
     "��������� ���� ���������� � ������",
+    "Pozicija informacije o programu",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -2282,6 +2556,7 @@ const tI18nPhrase Phrases[] = {
     "Inf� a csatorna v�lt�s�n�l",
     "Informaci� del canvi de canal",
     "���������� ���������� � ������",
+    "Informacije kod promjene kanala",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -2300,6 +2575,7 @@ const tI18nPhrase Phrases[] = {
     "Oldalank�nt l�ptetmi",
     "Despla�ar p�gina sencera",
     "��������� ������� ����",
+    "Listaj po stranicama",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -2318,6 +2594,7 @@ const tI18nPhrase Phrases[] = {
     "A beprogramozott felv�telek elrendez�se",
     "Ordenar gravacions programades",
     "���������� ��������",
+    "Sortiraj termine",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -2336,6 +2613,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�telek list�ja",
     "Gravacions en subcarpetes",
     "�������� �������� �������",
+    "Imenik za snimke",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -2354,6 +2632,7 @@ const tI18nPhrase Phrases[] = {
     "Fennmaradt id� az EPG-g (h)",
     "M�xim d'Hores a cercar per la Guia",
     "�������� ������������ �������� (�)",
+    "Vrijeme do EPG pregleda (h)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -2372,6 +2651,7 @@ const tI18nPhrase Phrases[] = {
     "EPG hibaelh�r�t�s",
     "Nivell de correcci� de la Guia",
     "������� ��������� ������",
+    "Nivo popravka EPG gre�aka",
   },
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
@@ -2390,6 +2670,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������� ���������� ������ (���)",
+    "Prika�i stare EPG podatke (min)",// TODO
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2408,6 +2689,7 @@ const tI18nPhrase Phrases[] = {
     "Az id� be�ll�t�sa",
     "Ajustar l'hora del sistema",
     "���������� ��������� �����",
+    "Podesi vrijeme sistema",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -2426,6 +2708,7 @@ const tI18nPhrase Phrases[] = {
     "Id�h�z tartoz� Transponder",
     "Usar el temps del m�ltiplex",
     "������������ ����� ������������",
+    "Transponder za pode�avanje sata",
   },
   { "Setup.EPG$Preferred languages",
     "Bevorzugte Sprachen",
@@ -2444,6 +2727,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������������� �����",
+    "Preferirani jezik",
   },
   { "Setup.EPG$Preferred language",
     "Bevorzugte Sprache",
@@ -2462,6 +2746,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "������",
+    "Preferirani jezik",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -2480,6 +2765,7 @@ const tI18nPhrase Phrases[] = {
     "Els� DVB interface",
     "Tarja DVB prim�ria",
     "�������� DVB-����������",
+    "Primarni DVB ure�aj",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -2498,6 +2784,7 @@ const tI18nPhrase Phrases[] = {
     "Video form�tum",
     "Format del v�deo",
     "������ �����",
+    "Video format",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -2516,6 +2803,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "��������� ��������� �������",
+    "Aktualiziraj programe",
   },
   { "names only",
     "nur Namen",
@@ -2534,6 +2822,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "������ ��������",
+    "samo imena",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -2552,6 +2841,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������� � PID�",
+    "imena i identifikatore (PIDs)",
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
@@ -2570,6 +2860,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "����� ������",
+    "dodaj nove programe",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
@@ -2588,6 +2879,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "���. ������������",
+    "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -2606,6 +2898,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "������� ������������ (SLOF) (���)",
+    "Frekv. preklopa SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -2624,6 +2917,7 @@ const tI18nPhrase Phrases[] = {
     "Als� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB baixa (MHz)",
     "������ ������� ���������� (���)",
+    "Donja LNB frekv. (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -2642,6 +2936,7 @@ const tI18nPhrase Phrases[] = {
     "Fels� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB alta (MHz)",
     "������� ������� ���������� (���)",
+    "Gornja LNB frekv. (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -2660,6 +2955,7 @@ const tI18nPhrase Phrases[] = {
     "DiSEqC haszn�lata",
     "Utilitzar DiSEqC",
     "������������ DiSEqC",
+    "Koristi DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -2678,6 +2974,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "Acc�s condicional CICAM",
     "CAM-������ DVB",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -2696,6 +2993,7 @@ const tI18nPhrase Phrases[] = {
     "Id�eltol�d�s a kezd�sn�l (min)",
     "Marge d'inici de gravaci� (min)",
     "���������� ������ ������ (���)",
+    "Rezerva na po�etku snimanja (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -2714,6 +3012,7 @@ const tI18nPhrase Phrases[] = {
     "Id�eltol�d�s a befejez�sn�l",
     "Marge de fi de gravaci� (min)",
     "������������ ��������� ������ (���)",
+    "Rezerva na kraju (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -2732,6 +3031,7 @@ const tI18nPhrase Phrases[] = {
     "Prim�r-hat�r",
     "L�mit primari",
     "���. ��������� ������� ���. ����������",
+    "Standardno ograni�enje",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -2750,6 +3050,7 @@ const tI18nPhrase Phrases[] = {
     "Default priority",
     "Prioritat per defecte",
     "��������� ������� �� ���������",
+    "Standardni prioritet",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -2768,6 +3069,7 @@ const tI18nPhrase Phrases[] = {
     "Default �lettartam",
     "Durada predefinida",
     "���� �������� ������ �� ��������� (�)",
+    "Standardno trajanje (d)",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
@@ -2786,6 +3088,7 @@ const tI18nPhrase Phrases[] = {
     "Sz�net priorit�s",
     "Prioritat de la pausa",
     "��������� ����������� ���������",
+    "Prioritet pauze",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
@@ -2804,6 +3107,7 @@ const tI18nPhrase Phrases[] = {
     "Sz�net �lettartama",
     "Durada de la pausa (d)",
     "�������� ����������� ��������� (�)",
+    "Trajanje pauze (d)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -2822,6 +3126,7 @@ const tI18nPhrase Phrases[] = {
     "Epiz�dn�v felhaszn�l�sa",
     "Utilitzar el nom de l'episodi",
     "������������ ����� �� ��������",
+    "Koristi ime epizode",
   },
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
@@ -2840,6 +3145,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "������������ ������� VPS",
+    "Koristi VPS",
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
@@ -2858,6 +3164,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������� ����� VPS (���)",
+    "Vremenska rezerva kod VPS (s)",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -2876,6 +3183,7 @@ const tI18nPhrase Phrases[] = {
     "Direktfelv�tel megjel�l�se",
     "Marcar gravaci� instant�nia",
     "�������� ��������� ������� ������",
+    "Ozna�i direktno snimanje",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -2894,6 +3202,7 @@ const tI18nPhrase Phrases[] = {
     "Direktfelv�tel megnevez�se",
     "Anomenar gravacions instant�nies",
     "����� ���������� ������ �������",
+    "Imenuj direktno snimanje",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -2912,6 +3221,7 @@ const tI18nPhrase Phrases[] = {
     "Felv�tel id�tartama",
     "Temps de gravaci� instant�nia (min)",
     "������������ ������ ������ (���)",
+    "Trajanje direktnog snimanja (min)",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -2930,6 +3240,7 @@ const tI18nPhrase Phrases[] = {
     "Dolby Digit�l felv�tel",
     "Gravar el so en Dolby Digital",
     "���������� ���� Dolby Digital",
+    "Snimi 'Dolby digital' ton",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -2948,6 +3259,7 @@ const tI18nPhrase Phrases[] = {
     "Max. video File-terjedelem (MB)",
     "Mida m�xima de l'arxiu (MB)",
     "����. ������ ���������� (��)",
+    "Maksimalna veli�ina datoteke (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -2966,6 +3278,7 @@ const tI18nPhrase Phrases[] = {
     "Feldolgozott File-k feloszt�sa",
     "Separar arxius",
     "������ ����������������� �����",
+    "Podijeli ure�ene datoteke",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -2984,6 +3297,7 @@ const tI18nPhrase Phrases[] = {
     "MultiSpeed funkci�",
     "Mode de multivelocitat",
     "��������������� �����",
+    "MultiSpeed na�in",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -3002,6 +3316,7 @@ const tI18nPhrase Phrases[] = {
     "Lej�tsz�s felt�ntet�se",
     "Mostrar mode de reproducci�",
     "���������� ����� ���������������", // ???
+    "Prika�i na�in prikazivanja",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
@@ -3020,6 +3335,7 @@ const tI18nPhrase Phrases[] = {
     "Lej�tsz�s ID",
     "ID de Continuar",
     "ID ���������������", // ???
+    "ID nastavka",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -3038,6 +3354,7 @@ const tI18nPhrase Phrases[] = {
     "Min. esem�ny sz�net (min)",
     "Temps m�nim en pausa (min)",
     "���. ����� �������� ������� (���)",
+    "Najmanje vrijeme pauze",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -3056,6 +3373,7 @@ const tI18nPhrase Phrases[] = {
     "Min. kezel�si aktivit�s (min)",
     "Temps m�nim d'inactivitat (min)",
     "���. ����� �������� ����� (���)",
+    "Najmanje vrijeme neaktivnosti (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -3074,6 +3392,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP Timeout (s)",
     "SVDRP Timeout (s)",
     "�������� ������ ����. SVDRP (���)",
+    "SVDRP vrijeme neaktivnosti",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
@@ -3092,6 +3411,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������� ������������ ������ (���)",
+    "",// hrv TODO
   },
   // The days of the week:
   { "MTWTFSS",
@@ -3111,6 +3431,7 @@ const tI18nPhrase Phrases[] = {
     "HKSCPSV",
     "LMCJVSG",
     "���ǿ��",
+    "PUS�PSN", // hrv
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -3129,6 +3450,7 @@ const tI18nPhrase Phrases[] = {
     "H�tKedSzeCs�P�nSzoVas",
     "Dl Dm Dc Dj Dv Ds Dg ",
     "��ݲ�������ҿ����Ѳ��",
+    "PonUtoSri�etPetSubNed", // hrv
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -3148,6 +3470,7 @@ const tI18nPhrase Phrases[] = {
     " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
     " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~",
+    " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~", // hrv
   },
   // Learning keys:
   { "Learning Remote Control Keys (%s)",
@@ -3167,6 +3490,7 @@ const tI18nPhrase Phrases[] = {
     "T�vir�ny�t� betan�t�sa (%s)",
     "Aprenent les tecles del comandament a dist�ncia (%s)",
     "���� ����� ������ ������ (%s)",
+    "U�enje k�da daljinskog upravlja�a (%s)",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -3185,6 +3509,7 @@ const tI18nPhrase Phrases[] = {
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
     "Fase 1: Detectant el tipus de receptor",
     "��� 1: ����������� ���� ���� ������",
+    "Faza 1: detektiranje k�da daljinskog upravlja�a.",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -3203,6 +3528,7 @@ const tI18nPhrase Phrases[] = {
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
     "Premeu qualsevol tecla del comandament",
     "������� ����� ������ �� ������",
+    "Pritisnite tipku na daljinskom upravlja�u",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -3221,6 +3547,7 @@ const tI18nPhrase Phrases[] = {
     "T�vir�ny�t� k�dja felismerve!",
     "Codi detectat!",
     "��������� ��� ������!",
+    "K�d daljinskog upravlja�a je prepoznat!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -3239,6 +3566,7 @@ const tI18nPhrase Phrases[] = {
     "Ne nyomjon meg gombot...",
     "No premeu cap tecla...",
     "�� ��������� ������...",
+    "Ne pritiskajte tipku...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -3257,6 +3585,7 @@ const tI18nPhrase Phrases[] = {
     "M�sodik l�p�s: az egyes gombok betan�t�sa",
     "Fase 2: Aprenentantge de les funcions",
     "��� 2: ������� ����� ��������� ������",
+    "Faza 2: U�enje posebnih k�dova",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -3275,6 +3604,7 @@ const tI18nPhrase Phrases[] = {
     "'%s' gomb megnyom�sa",
     "Premeu una tecla per '%s'",
     "������� ������ '%s'",
+    "Pritisnite tipku za '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -3293,6 +3623,7 @@ const tI18nPhrase Phrases[] = {
     "'Fel' megnyom�sa az elfogad�shoz",
     "Premeu 'Amunt' per confirmar",
     "������� '�����' ����� �����������",
+    "Pritisnite 'Gore' za potvrdu",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -3311,6 +3642,7 @@ const tI18nPhrase Phrases[] = {
     "'Le' megnyom�sa a folytat�shoz",
     "Premeu 'Avall' per continuar",
     "������� '����' ����� ����������",
+    "Pritisnite 'Dolje' za nastavak",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -3329,6 +3661,7 @@ const tI18nPhrase Phrases[] = {
     "(�Fel' megnyom�sa a visszat�r�shez)",
     "(Premeu 'Amunt' per retornar)",
     "(������� '�����' ����� ���������)",
+    "(pritisnite 'Gore' za nazad)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -3347,6 +3680,7 @@ const tI18nPhrase Phrases[] = {
     "('Le' megnyom�sa a befejez�shez)",
     "(Premeu 'Avall' per finalitzar l'aprenentatge)",
     "(������� '����' ����� ��������� ��������� ������)",
+    "(pritisnite 'Dolje' za kraj)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -3365,6 +3699,7 @@ const tI18nPhrase Phrases[] = {
     "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
     "Premeu 'Men�' per obviar aquesta tecla",
     "(������� '����' ����� ���������� ������)",
+    "pritisnite 'Izbor' da presko�ite ovu tipku",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -3383,6 +3718,7 @@ const tI18nPhrase Phrases[] = {
     "Harmadik l�p�s: k�d ment�se",
     "Fase 3: Guardant els codis de les tecles",
     "��� 3: ����������� ����� ������",
+    "Faza 3: Spremanje k�dova tipki",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -3401,6 +3737,7 @@ const tI18nPhrase Phrases[] = {
     "'Fel' ment�s, 'Le� m�gse",
     "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
     "������� '�����' ����� ���������, '����' ����� ����������",
+    "'Gore' za potvrdu, 'Dolje' za prekid",
   },
   // Key names:
   { "Up",
@@ -3420,6 +3757,7 @@ const tI18nPhrase Phrases[] = {
     "Fel",
     "Amunt",
     "�����",
+    "Gore",
   },
   { "Down",
     "Ab",
@@ -3438,6 +3776,7 @@ const tI18nPhrase Phrases[] = {
     "Le",
     "Avall",
     "����",
+    "Dolje",
   },
   { "Menu",
     "Men�",
@@ -3456,6 +3795,7 @@ const tI18nPhrase Phrases[] = {
     "Men�",
     "Men�",
     "����",
+    "Izbor",
   },
   { "Ok",
     "Ok",
@@ -3474,6 +3814,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "D'acord",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -3492,6 +3833,7 @@ const tI18nPhrase Phrases[] = {
     "Vissza",
     "Retornar",
     "�����",
+    "Nazad",
   },
   { "Left",
     "Links",
@@ -3510,6 +3852,7 @@ const tI18nPhrase Phrases[] = {
     "Balra",
     "Esquerra",
     "������",
+    "Lijevo",
   },
   { "Right",
     "Rechts",
@@ -3528,6 +3871,7 @@ const tI18nPhrase Phrases[] = {
     "Jobbra",
     "Dreta",
     "�������",
+    "Desno",
   },
   { "Red",
     "Rot",
@@ -3546,6 +3890,7 @@ const tI18nPhrase Phrases[] = {
     "Piros",
     "Vermell",
     "�������",
+    "Crveno",
   },
   { "Green",
     "Gr�n",
@@ -3564,6 +3909,7 @@ const tI18nPhrase Phrases[] = {
     "Z�ld",
     "Verd",
     "�������",
+    "Zeleno",
   },
   { "Yellow",
     "Gelb",
@@ -3582,6 +3928,7 @@ const tI18nPhrase Phrases[] = {
     "S�rga",
     "Groc",
     "������",
+    "�uto",
   },
   { "Blue",
     "Blau",
@@ -3600,6 +3947,7 @@ const tI18nPhrase Phrases[] = {
     "K�k",
     "Blau",
     "�����",
+    "Plavo",
   },
   { "Play",
     "Wiedergabe",
@@ -3618,6 +3966,7 @@ const tI18nPhrase Phrases[] = {
     "Lej�tsz�s",
     "Reproduir",
     "���������������",
+    "Start",
   },
   { "Pause",
     "Pause",
@@ -3636,6 +3985,7 @@ const tI18nPhrase Phrases[] = {
     "Sz�net",
     "Pausa",
     "�����",
+    "Pauza",
   },
   { "Stop",
     "Stop",
@@ -3654,6 +4004,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "Aturar",
     "����",
+    "Stop",
   },
   { "Record",
     "Aufnehmen",
@@ -3672,6 +4023,7 @@ const tI18nPhrase Phrases[] = {
     "Felvenni",
     "Gravar",
     "������",
+    "Snimaj",
   },
   { "FastFwd",
     "Vorlauf",
@@ -3690,6 +4042,7 @@ const tI18nPhrase Phrases[] = {
     "El�re p�rgetni",
     "Endavant r�pidament",
     "������",
+    "Naprijed",
   },
   { "FastRew",
     "R�cklauf",
@@ -3708,6 +4061,7 @@ const tI18nPhrase Phrases[] = {
     "Vissza p�rgetni",
     "Enrera r�pidament",
     "�����",
+    "Nazad",
   },
   { "Power",
     "Ausschalten",
@@ -3726,6 +4080,7 @@ const tI18nPhrase Phrases[] = {
     "Kikapcsolni",
     "Aturar",
     "���������",
+    "Isklju�i",
   },
   { "Channel+",
     "Kanal+",
@@ -3744,6 +4099,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorna+",
     "Canal +",
     "����� +",
+    "Program +",
   },
   { "Channel-",
     "Kanal-",
@@ -3762,6 +4118,7 @@ const tI18nPhrase Phrases[] = {
     "Csatorna-",
     "Canal -",
     "����� -",
+    "Program -",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -3780,6 +4137,7 @@ const tI18nPhrase Phrases[] = {
     "Hanger�+",
     "Volum +",
     "��������� +",
+    "Glasnije", // hrv "Glasnocca +"
   },
   { "Volume-",
     "Lautst�rke-",
@@ -3798,6 +4156,7 @@ const tI18nPhrase Phrases[] = {
     "Hanger�-",
     "Volum -",
     "��������� -",
+    "Ti�e", // hrv Glasnocca -"
   },
   { "Mute",
     "Stumm",
@@ -3816,6 +4175,7 @@ const tI18nPhrase Phrases[] = {
     "Csend",
     "En silenci",
     "��������� ����",
+    "Bez zvuka",
   },
   // Miscellaneous:
   { "yes",
@@ -3835,6 +4195,7 @@ const tI18nPhrase Phrases[] = {
     "igen",
     "s�",
     "��",
+    "da",
   },
   { "no",
     "nein",
@@ -3853,6 +4214,7 @@ const tI18nPhrase Phrases[] = {
     "nem",
     "no",
     "���",
+    "ne",
   },
   { "off",
     "aus",
@@ -3871,6 +4233,7 @@ const tI18nPhrase Phrases[] = {
     "ki",
     "off",
     "����",
+    "ugasi",
   },
   { "none",
     "keine",
@@ -3889,6 +4252,7 @@ const tI18nPhrase Phrases[] = {
     "semmi",
     "cap",
     "������",
+    "nijedan",
   },
   { "auto",
     "auto",
@@ -3907,6 +4271,7 @@ const tI18nPhrase Phrases[] = {
     "auto",
     "auto",
     "����",
+    "automatski",
   },
   { "top",
     "oben",
@@ -3925,6 +4290,7 @@ const tI18nPhrase Phrases[] = {
     "Fent",
     "a dalt",
     "������",
+    "gore",
   },
   { "bottom",
     "unten",
@@ -3943,6 +4309,7 @@ const tI18nPhrase Phrases[] = {
     "lent",
     "a baix",
     "�����",
+    "dolje",
   },
   { "Disk",
     "Disk",
@@ -3961,6 +4328,7 @@ const tI18nPhrase Phrases[] = {
     "Lemez",
     "Disc",
     "����",
+    "Disk",
   },
   { "free",
     "frei",
@@ -3979,6 +4347,7 @@ const tI18nPhrase Phrases[] = {
     "szabad",
     "lliure",
     "��������",
+    "slobodno",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -3997,6 +4366,7 @@ const tI18nPhrase Phrases[] = {
     "Ugr�s: ",
     "Salta a:",
     "�������: ",
+    "Sko�i: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -4015,6 +4385,7 @@ const tI18nPhrase Phrases[] = {
     "Hanger� ",
     "Volum ",
     "��������� ",
+    "Glasno�a ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -4033,6 +4404,7 @@ const tI18nPhrase Phrases[] = {
     " Lej�tsz�st befejzni",
     " Aturar la reproducci�",
     " ���������� ���������������",
+    " Prekini reprodukciju",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -4051,6 +4423,7 @@ const tI18nPhrase Phrases[] = {
     " Felv�telt befejezni ",
     " Aturar la gravaci� ",
     " ���������� ������ ",
+    " Prekini snimanje ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -4069,6 +4442,7 @@ const tI18nPhrase Phrases[] = {
     " V�g�st megszak�tani",
     " Cancel�lar l'edici� ",
     " �������� ������ ������",
+    " Prekini ure�ivanje",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -4087,6 +4461,7 @@ const tI18nPhrase Phrases[] = {
     "Prim�r Interface �tkapcsolva...",
     "Canviant a la interf�cie DVB prim�ria...",
     "����� ��������� DVB-����������...",
+    "Preklapanje primarnog DVB ure�aja...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -4105,6 +4480,7 @@ const tI18nPhrase Phrases[] = {
     "Fel/Le egy uj opci��rt - azt�n OK",
     "Amunt/Avall per una nova localitzaci� - OK per moure",
     "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\"",
+    "Gore/Dolje na novu poziciju - zatim OK",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -4123,6 +4499,7 @@ const tI18nPhrase Phrases[] = {
     "V�g�s elind�tva",
     "Proc�s d'edici� iniciat",
     "����� ������ ������",
+    "Rezanje je zapo�eto",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -4141,6 +4518,7 @@ const tI18nPhrase Phrases[] = {
     "V�g�s befejezve",
     "Proc�s d'edici� finalitzat",
     "������ �������",
+    "Rezanje zavr�eno",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -4159,6 +4537,7 @@ const tI18nPhrase Phrases[] = {
     "V�g�s sikertelen!",
     "Proc�s d'edici� fallit!",
     "������ �� ����� ������� ������!",
+    "Rezanje neuspje�no!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -4177,6 +4556,7 @@ const tI18nPhrase Phrases[] = {
     "Felvett ad�sok b�ng�sz�se...",
     "cercant gravacions...",
     "������������ �������...",
+    "pretra�ivanje snimljenog...",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -4195,6 +4575,7 @@ const tI18nPhrase Phrases[] = {
     "Az �l� ad�s meg�ll�tva...",
     "Pausa d'emissi� en directe...",
     "����� ����������� ���������...",
+    "Zaustavljanje �ivog signala...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -4213,7 +4594,46 @@ const tI18nPhrase Phrases[] = {
     "Ennek a plugin-nak nincs setup-parametere!",
     "Aquest plugin no admet configuraci�!",
     "������ �� ����� ���������� ���������!",
-   },
+    "Ovaj dodatak (Plugin) nema parametara!",
+  },
+  { "Classic VDR",
+    "Klassischer VDR",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "ST:TNG Panels",
+    "ST:TNG Konsolen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { NULL }
   };
 
diff --git a/i18n.h b/i18n.h
index ff990025a..839ac6ed5 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.11 2004/01/25 14:40:50 kls Exp $
+ * $Id: i18n.h 1.12 2004/05/16 10:52:40 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 17;
+const int I18nNumLanguages = 18;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/interface.c b/interface.c
index a0ee9ccd3..06ba331ae 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.66 2003/10/24 14:38:08 kls Exp $
+ * $Id: interface.c 1.67 2004/05/02 10:57:06 kls Exp $
  */
 
 #include "interface.h"
@@ -12,16 +12,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "i18n.h"
-#include "osd.h"
 #include "status.h"
 
 cInterface *Interface = NULL;
 
 cInterface::cInterface(int SVDRPport)
 {
-  open = 0;
-  cols[0] = 0;
-  width = height = 0;
   interrupted = false;
   SVDRP = NULL;
   if (SVDRPport)
@@ -33,38 +29,17 @@ cInterface::~cInterface()
   delete SVDRP;
 }
 
-void cInterface::Open(int NumCols, int NumLines)
-{
-  if (!open++) {
-     if (NumCols == 0)
-        NumCols = Setup.OSDwidth;
-     if (NumLines == 0)
-        NumLines = Setup.OSDheight;
-     cOsd::Open(width = NumCols, height = NumLines);
-     }
-}
-
-void cInterface::Close(void)
-{
-  if (open == 1)
-     Clear();
-  if (!--open) {
-     cOsd::Close();
-     width = height = 0;
-     }
-}
-
 eKeys cInterface::GetKey(bool Wait)
 {
   if (!cRemote::HasKeys())
-     Flush();
+     Skins.Flush();
   if (SVDRP) {
      if (SVDRP->Process())
         Wait = false;
-     if (!open) {
+     if (!Skins.IsOpen()) {
         char *message = SVDRP->GetMessage();
         if (message) {
-           Info(message);
+           Skins.Message(mtInfo, message);
            free(message);
            }
         }
@@ -76,7 +51,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
 {
   if (Seconds == 0)
      Seconds = Setup.OSDMessageTime;
-  Flush();
+  Skins.Flush();
   eKeys Key = kNone;
   time_t timeout = time(NULL) + Seconds;
   for (;;) {
@@ -90,267 +65,37 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
   return Key;
 }
 
-void cInterface::Clear(void)
-{
-  if (open)
-     cOsd::Clear();
-  cStatus::MsgOsdClear();
-}
-
-void cInterface::ClearEol(int x, int y, eDvbColor Color)
-{
-  if (open)
-     cOsd::ClrEol(x, y, Color);
-}
-
-void cInterface::Fill(int x, int y, int w, int h, eDvbColor Color)
-{
-  if (open)
-     cOsd::Fill(x, y, w, h, Color);
-}
-
-void cInterface::SetBitmap(int x, int y, const cBitmap &Bitmap)
-{
-  if (open)
-     cOsd::SetBitmap(x, y, Bitmap);
-}
-
-void cInterface::Flush(void)
-{
-  if (open)
-     cOsd::Flush();
-}
-
-void cInterface::SetCols(int *c)
-{
-  for (int i = 0; i < MaxCols; i++) {
-      cols[i] = *c++;
-      if (cols[i] == 0)
-         break;
-      }
-}
-
-eDvbFont cInterface::SetFont(eDvbFont Font)
-{
-  return cOsd::SetFont(Font);
-}
-
-char *cInterface::WrapText(const char *Text, int Width, int *Height)
-{
-  // Wraps the Text to make it fit into the area defined by the given Width
-  // (which is given in character cells).
-  // The actual number of lines resulting from this operation is returned in
-  // Height.
-  // The returned string is newly created on the heap and the caller
-  // is responsible for deleting it once it is no longer used.
-  // Wrapping is done by inserting the necessary number of newline
-  // characters into the string.
-
-  int Lines = 1;
-  char *t = strdup(Text);
-  char *Blank = NULL;
-  char *Delim = NULL;
-  int w = 0;
-
-  Width *= cOsd::CellWidth();
-
-  while (*t && t[strlen(t) - 1] == '\n')
-        t[strlen(t) - 1] = 0; // skips trailing newlines
-
-  for (char *p = t; *p; ) {
-      if (*p == '|')
-         *p = '\n';
-      if (*p == '\n') {
-         Lines++;
-         w = 0;
-         Blank = Delim = NULL;
-         p++;
-         continue;
-         }
-      else if (isspace(*p))
-         Blank = p;
-      int cw = cOsd::Width(*p);
-      if (w + cw > Width) {
-         if (Blank) {
-            *Blank = '\n';
-            p = Blank;
-            continue;
-            }
-         else {
-            // Here's the ugly part, where we don't have any whitespace to
-            // punch in a newline, so we need to make room for it:
-            if (Delim)
-               p = Delim + 1; // let's fall back to the most recent delimiter
-            char *s = MALLOC(char, strlen(t) + 2); // The additional '\n' plus the terminating '\0'
-            int l = p - t;
-            strncpy(s, t, l);
-            s[l] = '\n';
-            strcpy(s + l + 1, p);
-            free(t);
-            t = s;
-            p = t + l;
-            continue;
-            }
-         }
-      else
-         w += cw;
-      if (strchr("-.,:;!?_", *p)) {
-         Delim = p;
-         Blank = NULL;
-         }
-      p++;
-      }
-
-  *Height = Lines;
-  return t;
-}
-
-void cInterface::Write(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
-{
-  if (open)
-     cOsd::Text(x, y, s, FgColor, BgColor);
-}
-
-void cInterface::WriteText(int x, int y, const char *s, eDvbColor FgColor, eDvbColor BgColor)
-{
-  if (open) {
-     ClearEol(x, y, BgColor);
-     int col = 0;
-     for (;;) {
-         const char *t = strchr(s, '\t');
-         const char *p = s;
-         char buf[1000];
-         if (t && col < MaxCols && cols[col] > 0) {
-            unsigned int n = t - s;
-            if (n >= sizeof(buf))
-               n = sizeof(buf) - 1;
-            strncpy(buf, s, n);
-            buf[n] = 0;
-            p = buf;
-            s = t + 1;
-            }
-         Write(x, y, p, FgColor, BgColor);
-         if (p == s)
-            break;
-         x += cols[col++];
-         }
-     }
-}
-
-void cInterface::Title(const char *s)
-{
-  ClearEol(0, 0, clrCyan);
-  const char *t = strchr(s, '\t');
-  if (t) {
-     char buffer[Width() + 1];
-     unsigned int n = t - s;
-     if (n >= sizeof(buffer))
-        n = sizeof(buffer) - 1;
-     strn0cpy(buffer, s, n + 1);
-     Write(1, 0, buffer, clrBlack, clrCyan);
-     t++;
-     Write(-(cOsd::WidthInCells(t) + 1), 0, t, clrBlack, clrCyan);
-     }
-  else {
-     int x = (Width() - strlen(s)) / 2;
-     if (x < 0)
-        x = 0;
-     Write(x, 0, s, clrBlack, clrCyan);
-     }
-  cStatus::MsgOsdTitle(s);
-}
-
-void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
-{
-  int Line = (abs(height) == 1) ? 0 : -2;
-  ClearEol(0, Line, s ? BgColor : clrBackground);
-  if (s) {
-     int x = (Width() - int(strlen(s))) / 2;
-     if (x < 0)
-        x = 0;
-     Write(x, Line, s, FgColor, BgColor);
-     }
-  cStatus::MsgOsdStatusMessage(s);
-}
-
-void cInterface::Info(const char *s)
-{
-  Open(Setup.OSDwidth, -1);
-  isyslog("info: %s", s);
-  Status(s, clrBlack, clrGreen);
-  Wait();
-  Status(NULL);
-  Close();
-}
-
-void cInterface::Error(const char *s)
-{
-  Open(Setup.OSDwidth, -1);
-  esyslog("ERROR: %s", s);
-  Status(s, clrWhite, clrRed);
-  Wait();
-  Status(NULL);
-  Close();
-}
-
 bool cInterface::Confirm(const char *s, int Seconds, bool WaitForTimeout)
 {
-  Open(Setup.OSDwidth, -1);
   isyslog("confirm: %s", s);
-  Status(s, clrBlack, clrYellow);
-  eKeys k = Wait(Seconds);
+  eKeys k = Skins.Message(mtWarning, s, Seconds);
   bool result = WaitForTimeout ? k == kNone : k == kOk;
-  Status(NULL);
-  Close();
   isyslog("%sconfirmed", result ? "" : "not ");
   return result;
 }
 
-void cInterface::HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor)
-{
-  if (open) {
-     const int w = Width() / 4;
-     cOsd::Fill(Index * w, -1, w, 1, Text ? BgColor : clrBackground);
-     if (Text) {
-        int l = (w - int(strlen(Text))) / 2;
-        if (l < 0)
-           l = 0;
-        cOsd::Text(Index * w + l, -1, Text, FgColor, BgColor);
-        }
-     }
-}
-
-void cInterface::Help(const char *Red, const char *Green, const char *Yellow, const char *Blue)
-{
-  HelpButton(0, Red,    clrBlack, clrRed);
-  HelpButton(1, Green,  clrBlack, clrGreen);
-  HelpButton(2, Yellow, clrBlack, clrYellow);
-  HelpButton(3, Blue,   clrWhite, clrBlue);
-  cStatus::MsgOsdHelpKeys(Red, Green, Yellow, Blue);
-}
-
-bool cInterface::QueryKeys(cRemote *Remote)
+bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
 {
-  WriteText(1, 3, tr("Phase 1: Detecting RC code type"));
-  WriteText(1, 5, tr("Press any key on the RC unit"));
-  Flush();
+  DisplayMenu->SetItem(tr("Phase 1: Detecting RC code type"), 1, false, false);
+  DisplayMenu->SetItem(tr("Press any key on the RC unit"), 3, false, false);
+  DisplayMenu->Flush();
   if (Remote->Initialize()) {
-     WriteText(1, 5, tr("RC code detected!"));
-     WriteText(1, 6, tr("Do not press any key..."));
-     Flush();
+     DisplayMenu->SetItem(tr("RC code detected!"), 3, false, false);
+     DisplayMenu->SetItem(tr("Do not press any key..."), 4, false, false);
+     DisplayMenu->Flush();
      sleep(3);
-     ClearEol(0, 5);
-     ClearEol(0, 6);
+     DisplayMenu->SetItem("", 3, false, false);
+     DisplayMenu->SetItem("", 4, false, false);
 
-     WriteText(1, 3, tr("Phase 2: Learning specific key codes"));
+     DisplayMenu->SetItem(tr("Phase 2: Learning specific key codes"), 1, false, false);
      eKeys NewKey = kUp;
      while (NewKey != kNone) {
            char *Prompt;
            asprintf(&Prompt, tr("Press key for '%s'"), tr(cKey::ToString(NewKey)));
-           WriteText(1, 5, Prompt);
+           DisplayMenu->SetItem(Prompt, 3, false, false);
            free(Prompt);
            cRemote::Clear();
-           Flush();
+           DisplayMenu->Flush();
            for (eKeys k = NewKey; k == NewKey; ) {
                char *NewCode = NULL;
                eKeys Key = cRemote::Get(100, &NewCode);
@@ -362,20 +107,20 @@ bool cInterface::QueryKeys(cRemote *Remote)
                                    Keys.Del(last);
                                 }
                              break;
-                 case kDown: WriteText(1, 5, tr("Press 'Up' to confirm"));
-                             WriteText(1, 6, tr("Press 'Down' to continue"));
-                             ClearEol(0, 7);
-                             ClearEol(0, 8);
-                             ClearEol(0, 9);
-                             Flush();
+                 case kDown: DisplayMenu->SetItem(tr("Press 'Up' to confirm"), 3, false, false);
+                             DisplayMenu->SetItem(tr("Press 'Down' to continue"), 4, false, false);
+                             DisplayMenu->SetItem("", 5, false, false);
+                             DisplayMenu->SetItem("", 6, false, false);
+                             DisplayMenu->SetItem("", 7, false, false);
+                             DisplayMenu->Flush();
                              for (;;) {
                                  Key = cRemote::Get(100);
                                  if (Key == kUp) {
-                                    Clear();
+                                    DisplayMenu->Clear();
                                     return true;
                                     }
                                  else if (Key == kDown) {
-                                    ClearEol(0, 6);
+                                    DisplayMenu->SetItem("", 4, false, false);
                                     k = kNone; // breaks the outer for() loop
                                     break;
                                     }
@@ -394,17 +139,17 @@ bool cInterface::QueryKeys(cRemote *Remote)
                  }
                }
            if (NewKey > kUp)
-              WriteText(1, 7, tr("(press 'Up' to go back)"));
+              DisplayMenu->SetItem(tr("(press 'Up' to go back)"), 5, false, false);
            else
-              ClearEol(0, 7);
+              DisplayMenu->SetItem("", 5, false, false);
            if (NewKey > kDown)
-              WriteText(1, 8, tr("(press 'Down' to end key definition)"));
+              DisplayMenu->SetItem(tr("(press 'Down' to end key definition)"), 6, false, false);
            else
-              ClearEol(0, 8);
+              DisplayMenu->SetItem("", 6, false, false);
            if (NewKey > kMenu)
-              WriteText(1, 9, tr("(press 'Menu' to skip this key)"));
+              DisplayMenu->SetItem(tr("(press 'Menu' to skip this key)"), 7, false, false);
            else
-              ClearEol(0, 9);
+              DisplayMenu->SetItem("", 7, false, false);
            }
      return true;
      }
@@ -421,33 +166,31 @@ void cInterface::LearnKeys(void)
       bool known = Keys.KnowsRemote(Remote->Name());
       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
       if (!known) {
-         Open();
-         char Headline[Width()];
+         cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
+         char Headline[256];
          snprintf(Headline, sizeof(Headline), tr("Learning Remote Control Keys (%s)"), Remote->Name());
-         Clear();
          cRemote::Clear();
-         WriteText(1, 1, Headline);
+         DisplayMenu->SetTitle(Headline);
          cRemote::SetLearning(Remote);
-         bool rc = QueryKeys(Remote);
+         bool rc = QueryKeys(Remote, DisplayMenu);
          cRemote::SetLearning(NULL);
-         Clear();
+         DisplayMenu->Clear();
          if (!rc) {
-            Close();
+            delete DisplayMenu;
             continue;
             }
-         WriteText(1, 1, Headline);
-         WriteText(1, 3, tr("Phase 3: Saving key codes"));
-         WriteText(1, 5, tr("Press 'Up' to save, 'Down' to cancel"));
+         DisplayMenu->SetItem(tr("Phase 3: Saving key codes"), 1, false, false);
+         DisplayMenu->SetItem(tr("Press 'Up' to save, 'Down' to cancel"), 3, false, false);
          for (;;) {
              eKeys key = GetKey();
              if (key == kUp) {
                 Keys.Save();
-                Close();
+                delete DisplayMenu;
                 break;
                 }
              else if (key == kDown) {
                 Keys.Load();
-                Close();
+                delete DisplayMenu;
                 break;
                 }
              }
diff --git a/interface.h b/interface.h
index bcc29df09..2b3f979ac 100644
--- a/interface.h
+++ b/interface.h
@@ -4,57 +4,30 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.30 2003/10/05 09:42:53 kls Exp $
+ * $Id: interface.h 1.31 2004/05/01 11:11:13 kls Exp $
  */
 
 #ifndef __INTERFACE_H
 #define __INTERFACE_H
 
 #include "config.h"
-#include "osdbase.h"
 #include "remote.h"
+#include "skins.h"
 #include "svdrp.h"
 
 class cInterface {
-public:
-  enum { MaxCols = 5 };
 private:
-  int width, height;
-  int open;
-  int cols[MaxCols];
   bool interrupted;
   cSVDRP *SVDRP;
-  bool QueryKeys(cRemote *Remote);
-  void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
-  eKeys Wait(int Seconds = 0, bool KeepChar = false);
+  bool QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu);
 public:
   cInterface(int SVDRPport = 0);
   ~cInterface();
-  bool IsOpen(void) { return open > 0; }
-  void Open(int NumCols = 0, int NumLines = 0);
-  void Close(void);
   bool HasSVDRPConnection(void) { return SVDRP && SVDRP->HasConnection(); }
   void Interrupt(void) { interrupted = true; }
-  int Width(void) { return width; }
-  int Height(void) { return height; }
   eKeys GetKey(bool Wait = true);
-  void Clear(void);
-  void ClearEol(int x, int y, eDvbColor Color = clrBackground);
-  void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  void Flush(void);
-  void SetCols(int *c);
-  const int *GetCols(void) { return cols; }
-  eDvbFont SetFont(eDvbFont Font);
-  char *WrapText(const char *Text, int Width, int *Height);
-  void Write(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  void WriteText(int x, int y, const char *s, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  void Title(const char *s);
-  void Status(const char *s, eDvbColor FgColor = clrBlack, eDvbColor BgColor = clrCyan);
-  void Info(const char *s);
-  void Error(const char *s);
+  eKeys Wait(int Seconds = 0, bool KeepChar = false);
   bool Confirm(const char *s, int Seconds = 10, bool WaitForTimeout = false);
-  void Help(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   void LearnKeys(void);
   };
 
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 82e2a8f36..685722e77 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.10 2004/03/13 15:08:12 kls Exp $
+ *   $Id: descriptor.c 1.12 2004/03/26 15:25:28 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -78,12 +78,13 @@ void ExtendedEventDescriptor::Item::Parse() {
    return ret;
 }*/
 
-int ExtendedEventDescriptors::getMaximumTextLength() {
-   return getMaximumTextPlainLength()+getMaximumTextItemizedLength();
+int ExtendedEventDescriptors::getMaximumTextLength(const char *separation1, const char *separation2) {
+   //add length of plain text, of itemized text with separators, and for one separator between the two fields.
+   return getMaximumTextPlainLength()+getMaximumTextItemizedLength(separation1, separation2)+strlen(separation2);
 }
 
 char *ExtendedEventDescriptors::getText(const char *separation1, const char *separation2) {
-   char *text=new char[getMaximumTextLength()+strlen(separation1)+strlen(separation2)];
+   char *text=new char[getMaximumTextLength(separation1, separation2)];
    return getText(text, separation1, separation2);
 }
 
@@ -171,20 +172,21 @@ char *ExtendedEventDescriptors::getTextPlain(char *buffer) {
    return buffer;
 }
 
-int ExtendedEventDescriptors::getMaximumTextItemizedLength() {
+int ExtendedEventDescriptors::getMaximumTextItemizedLength(const char *separation1, const char *separation2) {
    int ret=0;
+   int sepLength=strlen(separation1)+strlen(separation2)-2;
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
-      //the size for the two separating characters is included ;-)
-      ret+=d->itemLoop.getLength();
+      //The length includes two 8-bit length fields which have already been subtracted from sepLength
+      ret+=d->itemLoop.getLength()+sepLength;
    }
    return ret;
 }
 
 char *ExtendedEventDescriptors::getTextItemized(const char *separation1, const char *separation2) {
-   char *text=new char[getMaximumTextItemizedLength()+strlen(separation1)+strlen(separation2)];
+   char *text=new char[getMaximumTextItemizedLength(separation1, separation2)];
    return getTextItemized(text, separation1, separation2);
 }
 
@@ -547,6 +549,10 @@ int SubtitlingDescriptor::Subtitling::getAncillaryPageId() const {
 
 void SubtitlingDescriptor::Subtitling::Parse() {
    s=data.getData<const item_subtitling>();
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
 }
 
 int ServiceMoveDescriptor::getNewOriginalNetworkId() const {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 3368b0a97..db3bba61e 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.7 2004/03/07 11:13:54 kls Exp $
+ *   $Id: descriptor.h 1.9 2004/03/26 15:26:03 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -50,7 +50,7 @@ class ExtendedEventDescriptor : public GroupDescriptor {
 
 class ExtendedEventDescriptors : public DescriptorGroup {
 public:
-   int getMaximumTextLength();
+   int getMaximumTextLength(const char *separation1="\t", const char *separation2="\n");
    //Returns a concatenated version of first the non-itemized and then the itemized text
    //same semantics as with SI::String
    char *getText(const char *separation1="\t", const char *separation2="\n");
@@ -66,7 +66,7 @@ class ExtendedEventDescriptors : public DescriptorGroup {
    //Between the description and the text the separation1 character is used,
    //separation2 used between two pairs. Example:
    //Director\tSteven Spielberg\nActor\tMichael Mendl\n
-   int getMaximumTextItemizedLength();
+   int getMaximumTextItemizedLength(const char *separation1="\t", const char *separation2="\n");
    char *getTextItemized(const char *separation1="\t", const char *separation2="\n");
    char *getTextItemized(char *buffer, const char *separation1="\t", const char *separation2="\n");
    //returns the itemized text pair by pair. Maximum length for buffers is 256.
@@ -285,6 +285,7 @@ class SubtitlingDescriptor : public Descriptor {
 public:
    class Subtitling : public Descriptor {
    public:
+      char languageCode[4];
       int getSubtitlingType() const;
       int getCompositionPageId() const;
       int getAncillaryPageId() const;
diff --git a/menu.c b/menu.c
index 4fdb994b9..968a873c8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.297 2004/03/14 13:24:02 kls Exp $
+ * $Id: menu.c 1.300 2004/05/16 12:47:22 kls Exp $
  */
 
 #include "menu.h"
@@ -18,12 +18,14 @@
 #include "cutter.h"
 #include "eitscan.h"
 #include "i18n.h"
+#include "interface.h"
 #include "menuitems.h"
 #include "plugin.h"
 #include "recording.h"
 #include "remote.h"
 #include "sources.h"
 #include "status.h"
+#include "themes.h"
 #include "timers.h"
 #include "transfer.h"
 #include "videodir.h"
@@ -37,330 +39,6 @@
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
-// --- cMenuEditChanItem -----------------------------------------------------
-
-class cMenuEditChanItem : public cMenuEditIntItem {
-protected:
-  virtual void Set(void);
-public:
-  cMenuEditChanItem(const char *Name, int *Value);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
-:cMenuEditIntItem(Name, Value, 1, Channels.MaxNumber())
-{
-  Set();
-}
-
-void cMenuEditChanItem::Set(void)
-{
-  char buf[255];
-  cChannel *channel = Channels.GetByNumber(*value);
-  snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
-  SetValue(buf);
-}
-
-eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
-{
-  int delta = 1;
-
-  switch (Key) {
-    case kLeft|k_Repeat:
-    case kLeft:  delta = -1;
-    case kRight|k_Repeat:
-    case kRight:
-                 {
-                   cChannel *channel = Channels.GetByNumber(*value + delta, delta);
-                   if (channel) {
-                      *value = channel->Number();
-                      Set();
-                      }
-                 }
-                 break;
-    default : return cMenuEditIntItem::ProcessKey(Key);
-    }
-  return osContinue;
-}
-
-// --- cMenuEditTranItem -----------------------------------------------------
-
-class cMenuEditTranItem : public cMenuEditChanItem {
-private:
-  int number;
-  int transponder;
-public:
-  cMenuEditTranItem(const char *Name, int *Value);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value)
-:cMenuEditChanItem(Name, Value)
-{
-  number = 0;
-  transponder = *Value;
-  cChannel *channel = Channels.First();
-  while (channel) {
-        if (!channel->GroupSep() && ISTRANSPONDER(channel->Frequency(), *Value)) {
-           number = channel->Number();
-           break;
-           }
-        channel = (cChannel *)channel->Next();
-        }
-  *Value = number;
-  Set();
-  *Value = transponder;
-}
-
-eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
-{
-  *value = number;
-  eOSState state = cMenuEditChanItem::ProcessKey(Key);
-  number = *value;
-  cChannel *channel = Channels.GetByNumber(*value);
-  if (channel)
-     transponder = channel->Frequency();
-  *value = transponder;
-  return state;
-}
-
-// --- cMenuEditDayItem ------------------------------------------------------
-
-class cMenuEditDayItem : public cMenuEditIntItem {
-protected:
-  static int days[];
-  int d;
-  virtual void Set(void);
-public:
-  cMenuEditDayItem(const char *Name, int *Value);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-int cMenuEditDayItem::days[] ={ cTimer::ParseDay("M------"),
-                                cTimer::ParseDay("-T-----"),
-                                cTimer::ParseDay("--W----"),
-                                cTimer::ParseDay("---T---"),
-                                cTimer::ParseDay("----F--"),
-                                cTimer::ParseDay("-----S-"),
-                                cTimer::ParseDay("------S"),
-                                cTimer::ParseDay("MTWTF--"),
-                                cTimer::ParseDay("MTWTFS-"),
-                                cTimer::ParseDay("MTWTFSS"),
-                                cTimer::ParseDay("-----SS"),
-                                0 };
-
-cMenuEditDayItem::cMenuEditDayItem(const char *Name, int *Value)
-:cMenuEditIntItem(Name, Value, -INT_MAX, 31)
-{
-  d = -1;
-  if (*value < 0) {
-     int n = 0;
-     while (days[n]) {
-           if (days[n] == *value) {
-              d = n;
-              break;
-              }
-           n++;
-           }
-     }
-  Set();
-}
-
-void cMenuEditDayItem::Set(void)
-{
-  SetValue(cTimer::PrintDay(*value));
-}
-
-eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
-{
-  switch (Key) {
-    case kLeft|k_Repeat:
-    case kLeft:  if (d > 0)
-                    *value = days[--d];
-                 else if (d == 0) {
-                    *value = 31;
-                    d = -1;
-                    }
-                 else if (*value == 1) {
-                    d = sizeof(days) / sizeof(int) - 2;
-                    *value = days[d];
-                    }
-                 else
-                    return cMenuEditIntItem::ProcessKey(Key);
-                 Set();
-                 break;
-    case kRight|k_Repeat:
-    case kRight: if (d >= 0) {
-                    *value = days[++d];
-                    if (*value == 0) {
-                       *value = 1;
-                       d = -1;
-                       }
-                    }
-                 else if (*value == 31) {
-                    d = 0;
-                    *value = days[d];
-                    }
-                 else
-                    return cMenuEditIntItem::ProcessKey(Key);
-                 Set();
-                 break;
-    default : return cMenuEditIntItem::ProcessKey(Key);
-    }
-  return osContinue;
-}
-
-// --- cMenuEditDateItem -----------------------------------------------------
-
-class cMenuEditDateItem : public cMenuEditItem {
-protected:
-  time_t *value;
-  virtual void Set(void);
-public:
-  cMenuEditDateItem(const char *Name, time_t *Value);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  Set();
-}
-
-void cMenuEditDateItem::Set(void)
-{
-#define DATEBUFFERSIZE 32
-  char buf[DATEBUFFERSIZE];
-  if (*value) {
-     struct tm tm_r;
-     localtime_r(value, &tm_r);
-     strftime(buf, DATEBUFFERSIZE, "%Y-%m-%d ", &tm_r);
-     strcat(buf, WeekDayName(tm_r.tm_wday));
-     }
-  else
-     *buf = 0;
-  SetValue(buf);
-}
-
-eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        *value -= SECSINDAY;
-        if (*value < time(NULL))
-           *value = 0;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (!*value)
-           *value = cTimer::SetTime(time(NULL), 0);
-        *value += SECSINDAY;
-        }
-     else
-        return state;
-     Set();
-     state = osContinue;
-     }
-  return state;
-}
-
-// --- cMenuEditTimeItem -----------------------------------------------------
-
-class cMenuEditTimeItem : public cMenuEditItem {
-protected:
-  int *value;
-  int hh, mm;
-  int pos;
-  virtual void Set(void);
-public:
-  cMenuEditTimeItem(const char *Name, int *Value);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditTimeItem::cMenuEditTimeItem(const char *Name, int *Value)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  hh = *value / 100;
-  mm = *value % 100;
-  pos = 0;
-  Set();
-}
-
-void cMenuEditTimeItem::Set(void)
-{
-  char buf[10];
-  switch (pos) {
-    case 1:  snprintf(buf, sizeof(buf), "%01d-:--", hh / 10); break;
-    case 2:  snprintf(buf, sizeof(buf), "%02d:--", hh); break;
-    case 3:  snprintf(buf, sizeof(buf), "%02d:%01d-", hh, mm / 10); break;
-    default: snprintf(buf, sizeof(buf), "%02d:%02d", hh, mm);
-    }
-  SetValue(buf);
-}
-
-eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     if (k0 <= Key && Key <= k9) {
-        if (fresh || pos > 3) {
-           pos = 0;
-           fresh = false;
-           }
-        int n = Key - k0;
-        switch (pos) {
-          case 0: if (n <= 2) {
-                     hh = n * 10;
-                     mm = 0;
-                     pos++;
-                     }
-                  break;
-          case 1: if (hh + n <= 23) {
-                     hh += n;
-                     pos++;
-                     }
-                  break;
-          case 2: if (n <= 5) {
-                     mm += n * 10;
-                     pos++;
-                     }
-                  break;
-          case 3: if (mm + n <= 59) {
-                     mm += n;
-                     pos++;
-                     }
-                  break;
-          }
-        }
-     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        if (--mm < 0) {
-           mm = 59;
-           if (--hh < 0)
-              hh = 23;
-           }
-        fresh = true;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (++mm > 59) {
-           mm = 0;
-           if (++hh > 23)
-              hh = 0;
-           }
-        fresh = true;
-        }
-     else
-        return state;
-     *value = hh * 100 + mm;
-     Set();
-     state = osContinue;
-     }
-  return state;
-}
-
 // --- cMenuEditCaItem -------------------------------------------------------
 
 class cMenuEditCaItem : public cMenuEditIntItem {
@@ -633,7 +311,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
            Channels.SetModified();
            }
         else {
-           Interface->Error(tr("Channel settings are not unique!"));
+           Skins.Message(mtError, tr("Channel settings are not unique!"));
            state = osContinue;
            }
         }
@@ -658,7 +336,7 @@ cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
 {
   channel = Channel;
   if (channel->GroupSep())
-     SetColor(clrCyan, clrBackground);
+     SetSelectable(false);
   Set();
 }
 
@@ -757,7 +435,7 @@ eOSState cMenuChannels::Delete(void)
      // Check if there is a timer using this channel:
      for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) {
          if (ti->Channel() == channel) {
-            Interface->Error(tr("Channel is being used by a timer!"));
+            Skins.Message(mtError, tr("Channel is being used by a timer!"));
             return osContinue;
             }
          }
@@ -822,19 +500,42 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
 // --- cMenuText -------------------------------------------------------------
 
 class cMenuText : public cOsdMenu {
+private:
+  const char *text;
 public:
   cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
+  virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
 :cOsdMenu(Title)
 {
-  Add(new cMenuTextItem(Text, 1, 2, Setup.OSDwidth - 2, MAXOSDITEMS, clrWhite, clrBackground, Font));
+  text = Text;
+}
+
+void cMenuText::Display(void)
+{
+  cOsdMenu::Display();
+  DisplayMenu()->SetText(text, true);//XXX define control character in text to choose the font???
 }
 
 eOSState cMenuText::ProcessKey(eKeys Key)
 {
+  switch (Key) {
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:
+    case kLeft|k_Repeat:
+    case kLeft:
+    case kRight|k_Repeat:
+    case kRight:
+                  DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+                  return osContinue;
+    default: break;
+    }
+
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -919,7 +620,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                        if (ch)
                           data.channel = ch;
                        else {
-                          Interface->Error(tr("*** Invalid Channel ***"));
+                          Skins.Message(mtError, tr("*** Invalid Channel ***"));
                           break;
                           }
                        if (!*data.file)
@@ -1099,6 +800,7 @@ eOSState cMenuTimers::Summary(void)
   cTimer *ti = CurrentTimer();
   if (ti && !isempty(ti->Summary()))
      return AddSubMenu(new cMenuText(tr("Summary"), ti->Summary()));
+     //XXX cSkin::SetRecording()???
   return Edit(); // convenience for people not using the Summary feature ;-)
 }
 
@@ -1136,7 +838,7 @@ class cMenuEvent : public cOsdMenu {
   const cEvent *event;
 public:
   cMenuEvent(const cEvent *Event, bool CanSwitch = false);
-  cMenuEvent(bool Now);
+  virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
 };
 
@@ -1147,39 +849,34 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
   if (event) {
      cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
      if (channel) {
-        char *buffer;
-        asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, event->GetDateString(), event->GetTimeString(), event->GetEndTimeString());
-        SetTitle(buffer, false);
-        free(buffer);
-        int Line = 2;
-        cMenuTextItem *item;
-        const char *Title = event->Title();
-        const char *Subtitle = event->ShortText();
-        const char *ExtendedDescription = event->Description();
-        if (!isempty(Title)) {
-           Add(item = new cMenuTextItem(Title, 1, Line, Setup.OSDwidth - 2, -1, clrCyan));
-           Line += item->Height() + 1;
-           }
-        if (!isempty(Subtitle)) {
-           Add(item = new cMenuTextItem(Subtitle, 1, Line, Setup.OSDwidth - 2, -1, clrYellow));
-           Line += item->Height() + 1;
-           }
-        if (Event->Vps() && Event->Vps() != Event->StartTime()) {
-           char *buffer;
-           asprintf(&buffer, "VPS: %s", Event->GetVpsString());
-           Add(item = new cMenuTextItem(buffer, 1, Line, Setup.OSDwidth - 2, -1, clrYellow));
-           free(buffer);
-           Line += item->Height() + 1;
-           }
-        if (!isempty(ExtendedDescription))
-           Add(new cMenuTextItem(ExtendedDescription, 1, Line, Setup.OSDwidth - 2, Height() - Line - 2, clrCyan), true);
+        SetTitle(channel->Name());
         SetHelp(tr("Record"), NULL, NULL, CanSwitch ? tr("Switch") : NULL);
         }
      }
 }
 
+void cMenuEvent::Display(void)
+{
+  cOsdMenu::Display();
+  DisplayMenu()->SetEvent(event);
+}
+
 eOSState cMenuEvent::ProcessKey(eKeys Key)
 {
+  switch (Key) {
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:
+    case kLeft|k_Repeat:
+    case kLeft:
+    case kRight|k_Repeat:
+    case kRight:
+                  DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+                  return osContinue;
+    default: break;
+    }
+
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1266,7 +963,7 @@ eOSState cMenuWhatsOn::Switch(void)
      if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
         return osEnd;
      }
-  Interface->Error(tr("Can't switch channel!"));
+  Skins.Message(mtError, tr("Can't switch channel!"));
   return osContinue;
 }
 
@@ -1410,7 +1107,7 @@ eOSState cMenuSchedule::Switch(void)
      if (Channels.SwitchTo(otherChannel))
         return osEnd;
      }
-  Interface->Error(tr("Can't switch channel!"));
+  Skins.Message(mtError, tr("Can't switch channel!"));
   return osContinue;
 }
 
@@ -1508,10 +1205,10 @@ eOSState cMenuCommands::Execute(void)
         }
      if (confirmed) {
         asprintf(&buffer, "%s...", command->Title());
-        Interface->Status(buffer);
-        Interface->Flush();
+        Skins.Message(mtStatus, buffer);
         free(buffer);
         const char *Result = command->Execute(parameters);
+        Skins.Message(mtStatus, NULL);
         if (Result)
            return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
         return osEnd;
@@ -1712,11 +1409,11 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
-  if (!Base) {
-     Interface->Status(tr("scanning recordings..."));
-     Interface->Flush();
-     }
+  if (!Base)
+     Skins.Message(mtStatus, tr("scanning recordings..."));
   if (Base || Recordings.Load()) {
+     if (!Base)
+        Skins.Message(mtStatus, NULL);
      const char *LastReplayed = cReplayControl::LastReplayed();
      cMenuRecordingItem *LastItem = NULL;
      char *LastItemText = NULL;
@@ -1783,7 +1480,7 @@ cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
 {
   cRecording *recording = Recordings.GetByName(Item->FileName());
   if (!recording)
-     Interface->Error(tr("Error while accessing recording!"));
+     Skins.Message(mtError, tr("Error while accessing recording!"));
   return recording;
 }
 
@@ -1871,7 +1568,7 @@ eOSState cMenuRecordings::Delete(void)
                  return osBack;
               }
            else
-              Interface->Error(tr("Error while deleting recording!"));
+              Skins.Message(mtError, tr("Error while deleting recording!"));
            }
         }
      }
@@ -1965,39 +1662,101 @@ void cMenuSetupBase::Store(void)
 
 class cMenuSetupOSD : public cMenuSetupBase {
 private:
+  const char *useSmallFontTexts[3];
+  int numSkins;
+  int originalSkinIndex;
+  int skinIndex;
+  const char **skinDescriptions;
+  cThemes themes;
+  int themeIndex;
   virtual void Set(void);
 public:
-  cMenuSetupOSD(void) { Set(); }
-  virtual ~cMenuSetupOSD() { cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]); }
+  cMenuSetupOSD(void);
+  virtual ~cMenuSetupOSD();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+cMenuSetupOSD::cMenuSetupOSD(void)
+{
+  numSkins = Skins.Count();
+  skinIndex = originalSkinIndex = Skins.Current()->Index();
+  skinDescriptions = new const char*[numSkins];
+  themes.Load(Skins.Current()->Name());
+  themeIndex = Skins.Current()->Theme() ? themes.GetThemeIndex(Skins.Current()->Theme()->Description()) : 0;
+  Set();
+}
+
+cMenuSetupOSD::~cMenuSetupOSD()
+{
+  cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
+  delete skinDescriptions;
+}
+
 void cMenuSetupOSD::Set(void)
 {
+  int current = Current();
+  for (cSkin *Skin = Skins.First(); Skin; Skin = Skins.Next(Skin))
+      skinDescriptions[Skin->Index()] = Skin->Description();
+  useSmallFontTexts[0] = tr("never");
+  useSmallFontTexts[1] = tr("skin dependent");
+  useSmallFontTexts[2] = tr("always");
   Clear();
   SetSection(tr("OSD"));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, I18nNumLanguages, I18nLanguages()));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"),                   &skinIndex, numSkins, skinDescriptions));
+  if (themes.NumThemes())
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"),                  &themeIndex, themes.NumThemes(), themes.Descriptions()));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Left"),                   &data.OSDLeft, 0, MAXOSDWIDTH));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Top"),                    &data.OSDTop, 0, MAXOSDHEIGHT));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDWidth, MINOSDWIDTH, MAXOSDWIDTH));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDHeight, MINOSDHEIGHT, MAXOSDHEIGHT));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Use small font"),         &data.UseSmallFont, 3, useSmallFontTexts));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
+  SetCurrent(Get(current));
+  Display();
 }
 
 eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
 {
+  if (Key == kOk) {
+     if (skinIndex != originalSkinIndex) {
+        cSkin *Skin = Skins.Get(skinIndex);
+        if (Skin) {
+           strn0cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin));
+           Skins.SetCurrent(Skin->Name());
+           }
+        }
+     if (themes.NumThemes() && Skins.Current()->Theme()) {
+        Skins.Current()->Theme()->Load(themes.FileName(themeIndex));
+        strn0cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme));
+        }
+     data.OSDWidth &= ~0x07; // OSD width must be a multiple of 8
+     }
+
   int osdLanguage = data.OSDLanguage;
+  int oldSkinIndex = skinIndex;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
-  if (data.OSDLanguage != osdLanguage) {
+  if (data.OSDLanguage != osdLanguage || skinIndex != oldSkinIndex) {
      int OriginalOSDLanguage = Setup.OSDLanguage;
      Setup.OSDLanguage = data.OSDLanguage;
      cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
+
+     cSkin *Skin = Skins.Get(skinIndex);
+     if (Skin) {
+        char *d = themes.NumThemes() ? strdup(themes.Descriptions()[themeIndex]) : NULL;
+        themes.Load(Skin->Name());
+        if (skinIndex != oldSkinIndex)
+           themeIndex = d ? themes.GetThemeIndex(d) : 0;
+        free(d);
+        }
+     
      Set();
-     Display();
      Setup.OSDLanguage = OriginalOSDLanguage;
      }
   return state;
@@ -2036,7 +1795,7 @@ void cMenuSetupEPG::Setup(void)
   Add(new cMenuEditIntItem( tr("Setup.EPG$EPG linger time (min)"),     &data.EPGLinger, 0));
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
   if (data.SetSystemTime)
-     Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder));
+     Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder, &data.TimeSource));
   Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"),       &numLanguages, 0, I18nNumLanguages));
   for (int i = 0; i < numLanguages; i++)
      Add(new cMenuEditStraItem(tr("Setup.EPG$Preferred language"),     &data.EPGLanguages[i], I18nNumLanguages, I18nLanguages()));
@@ -2236,7 +1995,7 @@ eOSState cMenuSetupCICAM::Menu(void)
   if (CiHandler && CiHandler->EnterMenu(Slot))
      return osEnd; // the CAM menu will be executed explicitly from the main loop
   else
-     Interface->Error(tr("Can't open CAM menu!"));
+     Skins.Message(mtError, tr("Can't open CAM menu!"));
   return osContinue;
 }
 
@@ -2245,11 +2004,11 @@ eOSState cMenuSetupCICAM::Reset(void)
   int Slot = 0;
   cCiHandler *CiHandler = GetCurrentCiHandler(&Slot);
   if (CiHandler && CiHandler->Reset(Slot)) {
-     Interface->Info(tr("CAM has been reset"));
+     Skins.Message(mtInfo, tr("CAM has been reset"));
      return osEnd;
      }
   else
-     Interface->Error(tr("Can't reset CAM!"));
+     Skins.Message(mtError, tr("Can't reset CAM!"));
   return osContinue;
 }
 
@@ -2388,7 +2147,7 @@ eOSState cMenuSetupPlugins::ProcessKey(eKeys Key)
                  menu->SetPlugin(p);
                  return AddSubMenu(menu);
                  }
-              Interface->Info(tr("This plugin has no setup parameters!"));
+              Skins.Message(mtInfo, tr("This plugin has no setup parameters!"));
               }
            }
         }
@@ -2523,7 +2282,7 @@ cOsdObject *cMenuMain::PluginOsdObject(void)
 void cMenuMain::Set(const char *Plugin)
 {
   Clear();
-  //SetTitle("VDR"); // this is done below, including disk usage
+  //XXX //SetTitle("VDR"); // this is done below, including disk usage
   SetHasHotkeys();
 
   // Title with disk usage:
@@ -2537,6 +2296,7 @@ void cMenuMain::Set(const char *Plugin)
   int Hours = Minutes / 60;
   Minutes %= 60;
   snprintf(buffer, sizeof(buffer), "%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free"));
+  //XXX -> skin function!!!
   SetTitle(buffer);
 
   // Basic menu items:
@@ -2661,9 +2421,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                    const char **at = &AudioTracks[CurrentAudioTrack];
                                    if (!*++at)
                                       at = AudioTracks;
-                                   Interface->Clear();
                                    cDevice::PrimaryDevice()->SetAudioTrack(at - AudioTracks);
-                                   //XXX Interface->Info(*at);
                                    state = osEnd;
                                    }
                                 }
@@ -2700,14 +2458,14 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 {
   group = -1;
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
-  int EpgLines = withInfo ? 5 : 1;
-  lines = 0;
+  displayChannel = Skins.Current()->DisplayChannel(withInfo);
   number = 0;
   channel = Channels.GetByNumber(Number);
-  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
+  lastPresent = lastFollowing = NULL;
   if (channel) {
      DisplayChannel();
      DisplayInfo();
+     displayChannel->Flush();
      }
   lastTime = time_ms();
 }
@@ -2716,94 +2474,41 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdObject(true)
 {
   group = -1;
-  lines = 0;
   number = 0;
+  lastPresent = lastFollowing = NULL;
   lastTime = time_ms();
   withInfo = Setup.ShowInfoOnChSwitch;
-  int EpgLines = withInfo ? 5 : 1;
-  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
+  displayChannel = Skins.Current()->DisplayChannel(withInfo);
   ProcessKey(FirstKey);
 }
 
 cDisplayChannel::~cDisplayChannel()
 {
-  Interface->Close();
+  delete displayChannel;
 }
 
 void cDisplayChannel::DisplayChannel(void)
 {
-  int BufSize = Width() + 1;
-  char buffer[BufSize];
-  *buffer = 0;
-  if (channel) {
-     if (channel->GroupSep())
-        snprintf(buffer, BufSize, "%s", channel->Name());
-     else
-        snprintf(buffer, BufSize, "%d%s  %s", channel->Number(), number ? "-" : "", channel->Name());
-     }
-  else if (number)
-     snprintf(buffer, BufSize, "%d-", number);
-  else
-     snprintf(buffer, BufSize, "%s", tr("*** Invalid Channel ***"));
-  Interface->Fill(0, 0, Setup.OSDwidth, 1, clrBackground);
-  Interface->Write(0, 0, buffer);
-  const char *date = DayDateTime();
-  Interface->Write(-strlen(date), 0, date);
-  cStatus::MsgOsdChannel(buffer);
+  displayChannel->SetChannel(channel, number);
+  cStatus::MsgOsdChannel(ChannelString(channel, number));
+  lastPresent = lastFollowing = NULL;
 }
 
 void cDisplayChannel::DisplayInfo(void)
 {
   if (withInfo && channel) {
-     const cEvent *Present = NULL, *Following = NULL;
      cSchedulesLock SchedulesLock;
      const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
      if (Schedules) {
         const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
         if (Schedule) {
-           const char *PresentTitle = NULL, *PresentSubtitle = NULL, *FollowingTitle = NULL, *FollowingSubtitle = NULL;
-           int Lines = 0;
-           if ((Present = Schedule->GetPresentEvent(true)) != NULL) {
-              PresentTitle = Present->Title();
-              if (!isempty(PresentTitle))
-                 Lines++;
-              PresentSubtitle = Present->ShortText();
-              if (!isempty(PresentSubtitle))
-                 Lines++;
-              }
-           if ((Following = Schedule->GetFollowingEvent(true)) != NULL) {
-              FollowingTitle = Following->Title();
-              if (!isempty(FollowingTitle))
-                 Lines++;
-              FollowingSubtitle = Following->ShortText();
-              if (!isempty(FollowingSubtitle))
-                 Lines++;
-              }
-           if (Lines > lines) {
-              const int t = 6;
-              int l = 1;
-              Interface->Fill(0, 1, Setup.OSDwidth, Lines, clrBackground);
-              if (!isempty(PresentTitle)) {
-                 Interface->Write(0, l, Present->GetTimeString(), clrYellow, clrBackground);
-                 Interface->Write(t, l, PresentTitle, clrCyan, clrBackground);
-                 l++;
-                 }
-              if (!isempty(PresentSubtitle)) {
-                 Interface->Write(t, l, PresentSubtitle, clrCyan, clrBackground);
-                 l++;
-                 }
-              if (!isempty(FollowingTitle)) {
-                 Interface->Write(0, l, Following->GetTimeString(), clrYellow, clrBackground);
-                 Interface->Write(t, l, FollowingTitle, clrCyan, clrBackground);
-                 l++;
-                 }
-              if (!isempty(FollowingSubtitle)) {
-                 Interface->Write(t, l, FollowingSubtitle, clrCyan, clrBackground);
-                 }
-              Interface->Flush();
-              lines = Lines;
-              lastTime = time_ms();
-              cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, PresentTitle, PresentSubtitle, Following ? Following->StartTime() : 0, FollowingTitle, FollowingSubtitle);
+           const cEvent *Present = Schedule->GetPresentEvent(true);
+           const cEvent *Following = Schedule->GetFollowingEvent(true);
+           if (Present != lastPresent || Following != lastFollowing) {
+              displayChannel->SetEvents(Present, Following);
+              cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
+              lastPresent = Present;
+              lastFollowing = Following;
               }
            }
         }
@@ -2812,11 +2517,10 @@ void cDisplayChannel::DisplayInfo(void)
 
 void cDisplayChannel::Refresh(void)
 {
-  Interface->Clear();
   channel = Channels.GetByNumber(cDevice::CurrentChannel());
   DisplayChannel();
+  displayChannel->SetEvents(NULL, NULL);
   lastTime = time_ms();
-  lines = 0;
 }
 
 eOSState cDisplayChannel::ProcessKey(eKeys Key)
@@ -2833,7 +2537,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             number = number * 10 + Key - k0;
             if (number > 0) {
                channel = Channels.GetByNumber(number);
-               Interface->Clear();
+               displayChannel->SetEvents(NULL, NULL);
                withInfo = false;
                DisplayChannel();
                lastTime = time_ms();
@@ -2852,7 +2556,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      }
                if (n > 0) {
                   // This channel is the only one that fits the input, so let's take it right away:
-                  Interface->Flush(); // makes sure the user sees his last input
+                  displayChannel->Flush(); // makes sure the user sees his last input
                   Channels.SwitchTo(number);
                   return osEnd;
                   }
@@ -2879,7 +2583,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                group = SaveGroup;
             channel = Channels.Get(group);
             if (channel) {
-               Interface->Clear();
+               displayChannel->SetEvents(NULL, NULL);
                DisplayChannel();
                if (!channel->GroupSep())
                   group = -1;
@@ -2928,85 +2632,50 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     };
   if (time_ms() - lastTime < INFOTIMEOUT) {
      DisplayInfo();
+     displayChannel->Flush();
      return osContinue;
      }
   return osEnd;
 }
 
-// --- cVolumeBar ------------------------------------------------------------
-
-class cVolumeBar : public cBitmap {
-public:
-  cVolumeBar(int Width, int Height, int Current, int Total, const char *Prompt = NULL);
-  };
-
-cVolumeBar::cVolumeBar(int Width, int Height, int Current, int Total, const char *Prompt)
-:cBitmap(Width, Height, 2)
-{
-  int l = Prompt ? cBitmap::Width(Prompt) : 0;
-  int p = (Width - l) * Current / Total;
-  Text(0, 0, Prompt, clrGreen);
-  Fill(l, 0, p, Height - 1, clrGreen);
-  Fill(l + p, 0, Width - 1, Height - 1, clrWhite);
-}
-
 // --- cDisplayVolume --------------------------------------------------------
 
 #define VOLUMETIMEOUT 1000 //ms
 #define MUTETIMEOUT   5000 //ms
 
-cDisplayVolume *cDisplayVolume::displayVolume = NULL;
+cDisplayVolume *cDisplayVolume::currentDisplayVolume = NULL;
 
 cDisplayVolume::cDisplayVolume(void)
 :cOsdObject(true)
 {
-  displayVolume = this;
+  currentDisplayVolume = this;
   timeout = time_ms() + (cDevice::PrimaryDevice()->IsMute() ? MUTETIMEOUT : VOLUMETIMEOUT);
-  Interface->Open(Setup.OSDwidth, -1);
+  displayVolume = Skins.Current()->DisplayVolume();
   Show();
 }
 
 cDisplayVolume::~cDisplayVolume()
 {
-  Interface->Close();
-  displayVolume = NULL;
+  delete displayVolume;
+  currentDisplayVolume = NULL;
 }
 
 void cDisplayVolume::Show(void)
 {
-  cDevice *device = cDevice::PrimaryDevice();
-  if (device->IsMute()) {
-     Interface->Fill(0, 0, Width(), 1, clrTransparent);
-     Interface->Write(0, 0, tr("Mute"), clrGreen);
-     }
-  else {
-     int Current = cDevice::CurrentVolume();
-     int Total = MAXVOLUME;
-     const char *Prompt = tr("Volume ");
-#ifdef DEBUG_OSD
-     int l = strlen(Prompt);
-     int p = int(double(Width() - l) * Current / Total + 0.5);
-     Interface->Write(0, 0, Prompt, clrGreen);
-     Interface->Fill(l, 0, p, 1, clrGreen);
-     Interface->Fill(l + p, 0, Width() - l - p, 1, clrWhite);
-#else
-     cVolumeBar VolumeBar(Width() * cOsd::CellWidth(), cOsd::LineHeight(), Current, Total, Prompt);
-     Interface->SetBitmap(0, 0, VolumeBar);
-#endif
-     }
+  displayVolume->SetVolume(cDevice::CurrentVolume(), MAXVOLUME, cDevice::PrimaryDevice()->IsMute());
 }
 
 cDisplayVolume *cDisplayVolume::Create(void)
 {
-  if (!displayVolume)
+  if (!currentDisplayVolume)
      new cDisplayVolume;
-  return displayVolume;
+  return currentDisplayVolume;
 }
 
 void cDisplayVolume::Process(eKeys Key)
 {
-  if (displayVolume)
-     displayVolume->ProcessKey(Key);
+  if (currentDisplayVolume)
+     currentDisplayVolume->ProcessKey(Key);
 }
 
 eOSState cDisplayVolume::ProcessKey(eKeys Key)
@@ -3244,9 +2913,7 @@ bool cRecordControls::StopPrimary(bool DoIt)
 
 bool cRecordControls::PauseLiveVideo(void)
 {
-  Interface->Open(Setup.OSDwidth, -1);
-  Interface->Status(tr("Pausing live video..."));
-  Interface->Flush();
+  Skins.Message(mtStatus, tr("Pausing live video..."));
   cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
   if (Start(NULL, true)) {
      sleep(2); // allow recorded file to fill up enough to start replaying
@@ -3254,11 +2921,11 @@ bool cRecordControls::PauseLiveVideo(void)
      cControl::Launch(rc);
      cControl::Attach();
      sleep(1); // allow device to replay some frames, so we have a picture
-     Interface->Close();
+     Skins.Message(mtStatus, NULL);
      rc->ProcessKey(kPause); // pause, allowing replay mode display
      return true;
      }
-  Interface->Close();
+  Skins.Message(mtStatus, NULL);
   return false;
 }
 
@@ -3325,50 +2992,6 @@ void cRecordControls::Shutdown(void)
       DELETENULL(RecordControls[i]);
 }
 
-// --- cProgressBar ----------------------------------------------------------
-
-class cProgressBar : public cBitmap {
-protected:
-  int total;
-  int Pos(int p) { return p * width / total; }
-  void Mark(int x, bool Start, bool Current);
-public:
-  cProgressBar(int Width, int Height, int Current, int Total, const cMarks &Marks);
-  };
-
-cProgressBar::cProgressBar(int Width, int Height, int Current, int Total, const cMarks &Marks)
-:cBitmap(Width, Height, 2)
-{
-  total = Total;
-  if (total > 0) {
-     int p = Pos(Current);
-     Fill(0, 0, p, Height - 1, clrGreen);
-     Fill(p + 1, 0, Width - 1, Height - 1, clrWhite);
-     bool Start = true;
-     for (const cMark *m = Marks.First(); m; m = Marks.Next(m)) {
-         int p1 = Pos(m->position);
-         if (Start) {
-            const cMark *m2 = Marks.Next(m);
-            int p2 = Pos(m2 ? m2->position : total);
-            int h = Height / 3;
-            Fill(p1, h, p2, Height - h, clrRed);
-            }
-         Mark(p1, Start, m->position == Current);
-         Start = !Start;
-         }
-     }
-}
-
-void cProgressBar::Mark(int x, bool Start, bool Current)
-{
-  Fill(x, 0, x, height - 1, clrBlack);
-  const int d = height / (Current ? 3 : 9);
-  for (int i = 0; i < d; i++) {
-      int h = Start ? i : height - 1 - i;
-      Fill(x - d + i, h, x + d - i, h, Current ? clrRed : clrBlack);
-      }
-}
-
 // --- cReplayControl --------------------------------------------------------
 
 char *cReplayControl::fileName = NULL;
@@ -3377,8 +3000,11 @@ char *cReplayControl::title = NULL;
 cReplayControl::cReplayControl(void)
 :cDvbPlayerControl(fileName)
 {
+  displayReplay = NULL;
   visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
+  lastPlay = lastForward = false;
+  lastSpeed = -1;
   timeoutShow = 0;
   timeSearchActive = false;
   marks.Load(fileName);
@@ -3432,61 +3058,36 @@ void cReplayControl::Show(void)
 void cReplayControl::Hide(void)
 {
   if (visible) {
-     Interface->Close();
+     delete displayReplay;
+     displayReplay = NULL;
      needsFastResponse = visible = false;
      modeOnly = false;
+     lastPlay = lastForward = false;
+     lastSpeed = -1;
      }
 }
 
-void cReplayControl::DisplayAtBottom(const char *s)
-{
-  if (s) {
-     int w = cOsd::WidthInCells(s);
-     int d = max(Width() - w, 0) / 2;
-     if (modeOnly) //XXX remove when displaying replay mode differently
-        Interface->Fill(0, -1, Interface->Width(), 1, clrTransparent); //XXX remove when displaying replay mode differently
-     Interface->Write(d, -1, s);
-     Interface->Flush();
-     }
-  else
-     Interface->Fill(12, 2, Width() - 22, 1, clrBackground);
-}
-
 void cReplayControl::ShowMode(void)
 {
-  if (Setup.ShowReplayMode && !timeSearchActive) {
+  if (visible || Setup.ShowReplayMode) {
      bool Play, Forward;
      int Speed;
-     if (GetReplayMode(Play, Forward, Speed)) {
+     if (GetReplayMode(Play, Forward, Speed) && (!visible || Play != lastPlay || Forward != lastForward || Speed != lastSpeed)) {
         bool NormalPlay = (Play && Speed == -1);
 
         if (!visible) {
            if (NormalPlay)
               return; // no need to do indicate ">" unless there was a different mode displayed before
-           // open small display
-           /*XXX change when displaying replay mode differently
-           Interface->Open(9, -1);
-           Interface->Clear();
-           XXX*/
-           Interface->Open(0, -1); //XXX remove when displaying replay mode differently
            visible = modeOnly = true;
+           displayReplay = Skins.Current()->DisplayReplay(modeOnly);
            }
 
         if (modeOnly && !timeoutShow && NormalPlay)
            timeoutShow = time(NULL) + MODETIMEOUT;
-        const char *Mode;
-        if (Speed == -1) Mode = Play    ? "  >  " : " ||  ";
-        else if (Play)   Mode = Forward ? " X>> " : " <<X ";
-        else             Mode = Forward ? " X|> " : " <|X ";
-        char buf[16];
-        strn0cpy(buf, Mode, sizeof(buf));
-        char *p = strchr(buf, 'X');
-        if (p)
-           *p = Speed > 0 ? '1' + Speed - 1 : ' ';
-
-        eDvbFont OldFont = Interface->SetFont(fontFix);
-        DisplayAtBottom(buf);
-        Interface->SetFont(OldFont);
+        displayReplay->SetMode(Play, Forward, Speed);
+        lastPlay = Play;
+        lastForward = Forward;
+        lastSpeed = Speed;
         }
      }
 }
@@ -3497,33 +3098,26 @@ bool cReplayControl::ShowProgress(bool Initial)
 
   if (GetIndex(Current, Total) && Total > 0) {
      if (!visible) {
-        Interface->Open(Setup.OSDwidth, -3);
+        displayReplay = Skins.Current()->DisplayReplay(modeOnly);
+        displayReplay->SetMarks(&marks);
         needsFastResponse = visible = true;
         }
      if (Initial) {
-        Interface->Clear();
         if (title)
-           Interface->Write(0, 0, title);
+           displayReplay->SetTitle(title);
         lastCurrent = lastTotal = -1;
         }
      if (Total != lastTotal) {
-        Interface->Write(-7, 2, IndexToHMSF(Total));
+        displayReplay->SetTotal(IndexToHMSF(Total));
         if (!Initial)
-           Interface->Flush();
+           displayReplay->Flush();
         }
      if (Current != lastCurrent || Total != lastTotal) {
-#ifdef DEBUG_OSD
-        int p = Width() * Current / Total;
-        Interface->Fill(0, 1, p, 1, clrGreen);
-        Interface->Fill(p, 1, Width() - p, 1, clrWhite);
-#else
-        cProgressBar ProgressBar(Width() * cOsd::CellWidth(), cOsd::LineHeight(), Current, Total, marks);
-        Interface->SetBitmap(0, cOsd::LineHeight(), ProgressBar);
+        displayReplay->SetProgress(Current, Total);
         if (!Initial)
-           Interface->Flush();
-#endif
-        Interface->Write(0, 2, IndexToHMSF(Current, displayFrames));
-        Interface->Flush();
+           displayReplay->Flush();
+        displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames));
+        displayReplay->Flush();
         lastCurrent = Current;
         }
      lastTotal = Total;
@@ -3547,7 +3141,7 @@ void cReplayControl::TimeSearchDisplay(void)
   char cm10 = timeSearchPos > 1 ? m10 : '-';
   char cm1  = timeSearchPos > 0 ? m1  : '-';
   sprintf(buf + len, "%c%c:%c%c", ch10, ch1, cm10, cm1);
-  DisplayAtBottom(buf);
+  displayReplay->SetJump(buf);
 }
 
 void cReplayControl::TimeSearchProcess(eKeys Key)
@@ -3593,7 +3187,7 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
      if (timeSearchHide)
         Hide();
      else
-        DisplayAtBottom();
+        displayReplay->SetJump(NULL);
      ShowMode();
      }
 }
@@ -3678,14 +3272,14 @@ void cReplayControl::EditCut(void)
      Hide();
      if (!cCutter::Active()) {
         if (!marks.Count())
-           Interface->Error(tr("No editing marks defined!"));
+           Skins.Message(mtError, tr("No editing marks defined!"));
         else if (!cCutter::Start(fileName))
-           Interface->Error(tr("Can't start editing process!"));
+           Skins.Message(mtError, tr("Can't start editing process!"));
         else
-           Interface->Info(tr("Editing process started"));
+           Skins.Message(mtInfo, tr("Editing process started"));
         }
      else
-        Interface->Error(tr("Editing process already active!"));
+        Skins.Message(mtError, tr("Editing process already active!"));
      ShowMode();
      }
 }
@@ -3790,8 +3384,5 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     }
   if (DoShowMode)
      ShowMode();
-  if (DisplayedFrames && !displayFrames)
-     Interface->Fill(0, 2, 11, 1, clrBackground);
   return osContinue;
 }
-
diff --git a/menu.h b/menu.h
index 6fe954083..d52f6419b 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.60 2004/02/15 14:11:28 kls Exp $
+ * $Id: menu.h 1.61 2004/04/30 13:45:19 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -13,10 +13,11 @@
 #include "ci.h"
 #include "device.h"
 #include "epg.h"
-#include "osd.h"
+#include "osdbase.h"
 #include "dvbplayer.h"
 #include "recorder.h"
 #include "recording.h"
+#include "skins.h"
 
 class cMenuMain : public cOsdMenu {
 private:
@@ -32,12 +33,14 @@ class cMenuMain : public cOsdMenu {
 
 class cDisplayChannel : public cOsdObject {
 private:
+  cSkinDisplayChannel *displayChannel;
   int group;
   bool withInfo;
-  int lines;
   int lastTime;
   int number;
   cChannel *channel;
+  const cEvent *lastPresent;
+  const cEvent *lastFollowing;
   void DisplayChannel(void);
   void DisplayInfo(void);
   void Refresh(void);
@@ -50,8 +53,9 @@ class cDisplayChannel : public cOsdObject {
 
 class cDisplayVolume : public cOsdObject {
 private:
+  cSkinDisplayVolume *displayVolume;
   int timeout;
-  static cDisplayVolume *displayVolume;
+  static cDisplayVolume *currentDisplayVolume;
   virtual void Show(void);
   cDisplayVolume(void);
 public:
@@ -150,9 +154,12 @@ class cRecordControls {
 
 class cReplayControl : public cDvbPlayerControl {
 private:
+  cSkinDisplayReplay *displayReplay;
   cMarks marks;
   bool visible, modeOnly, shown, displayFrames;
   int lastCurrent, lastTotal;
+  bool lastPlay, lastForward;
+  int lastSpeed;
   time_t timeoutShow;
   bool timeSearchActive, timeSearchHide;
   int timeSearchTime, timeSearchPos;
@@ -162,7 +169,6 @@ class cReplayControl : public cDvbPlayerControl {
   void ShowTimed(int Seconds = 0);
   static char *fileName;
   static char *title;
-  void DisplayAtBottom(const char *s = NULL);
   void ShowMode(void);
   bool ShowProgress(bool Initial);
   void MarkToggle(void);
diff --git a/menuitems.c b/menuitems.c
index 49874f111..3f835878a 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,13 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.15 2004/02/24 12:38:43 kls Exp $
+ * $Id: menuitems.c 1.18 2004/05/16 12:47:02 kls Exp $
  */
 
 #include "menuitems.h"
 #include <ctype.h>
 #include "i18n.h"
 #include "plugin.h"
+#include "remote.h"
+#include "skins.h"
 #include "status.h"
 
 const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
@@ -36,7 +38,6 @@ void cMenuEditItem::SetValue(const char *Value)
   char *buffer = NULL;
   asprintf(&buffer, "%s:\t%s", name, value);
   SetText(buffer, false);
-  Display();
   cStatus::MsgOsdCurrentItem(buffer);
 }
 
@@ -253,9 +254,9 @@ cMenuEditStrItem::~cMenuEditStrItem()
 void cMenuEditStrItem::SetHelpKeys(void)
 {
   if (pos >= 0)
-     Interface->Help(tr("ABC/abc"), tr(insert ? "Overwrite" : "Insert"), tr("Delete"));
+     cSkinDisplay::Current()->SetButtons(tr("ABC/abc"), tr(insert ? "Overwrite" : "Insert"), tr("Delete"));
   else
-     Interface->Help(NULL);
+     cSkinDisplay::Current()->SetButtons(NULL);
 }
 
 void cMenuEditStrItem::Set(void)
@@ -264,21 +265,21 @@ void cMenuEditStrItem::Set(void)
   const char *fmt = insert && newchar ? "[]%c%s" : "[%c]%s";
 
   if (pos >= 0) {
+     const cFont *font = cFont::GetFont(fontOsd);
      strncpy(buf, value, pos);
      snprintf(buf + pos, sizeof(buf) - pos - 2, fmt, *(value + pos), value + pos + 1);
-     int width = Interface->Width() - Interface->GetCols()[0];
-     if (cOsd::WidthInCells(buf) <= width) {
+     int width = cSkinDisplay::Current()->EditableWidth();
+     if (font->Width(buf) <= width) {
         // the whole buffer fits on the screen
         SetValue(buf);
         return;
         }
-     width *= cOsd::CellWidth();
-     width -= cOsd::Width('>'); // assuming '<' and '>' have the same with
+     width -= font->Width('>'); // assuming '<' and '>' have the same with
      int w = 0;
      int i = 0;
      int l = strlen(buf);
      while (i < l && w <= width)
-           w += cOsd::Width(buf[i++]);
+           w += font->Width(buf[i++]);
      if (i >= pos + 4) {
         // the cursor fits on the screen
         buf[i - 1] = '>';
@@ -295,7 +296,7 @@ void cMenuEditStrItem::Set(void)
      else
         i--;
      while (i >= 0 && w <= width)
-           w += cOsd::Width(buf[i--]);
+           w += font->Width(buf[i--]);
      buf[++i] = '<';
      SetValue(buf + i);
      }
@@ -461,100 +462,286 @@ void cMenuEditStraItem::Set(void)
   SetValue(strings[*value]);
 }
 
-// --- cMenuTextItem ---------------------------------------------------------
+// --- cMenuEditChanItem -----------------------------------------------------
 
-cMenuTextItem::cMenuTextItem(const char *Text, int X, int Y, int W, int H, eDvbColor FgColor, eDvbColor BgColor, eDvbFont Font)
+cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
+:cMenuEditIntItem(Name, Value, 1, Channels.MaxNumber())
 {
-  x = X;
-  y = Y;
-  w = W;
-  h = H;
-  fgColor = FgColor;
-  bgColor = BgColor;
-  font = Font;
-  offset = 0;
-  eDvbFont oldFont = Interface->SetFont(font);
-  text = Interface->WrapText(Text, w - 1, &lines);
-  Interface->SetFont(oldFont);
-  if (h < 0)
-     h = lines;
+  Set();
 }
 
-cMenuTextItem::~cMenuTextItem()
+void cMenuEditChanItem::Set(void)
 {
-  free(text);
+  char buf[255];
+  cChannel *channel = Channels.GetByNumber(*value);
+  snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
+  SetValue(buf);
 }
 
-void cMenuTextItem::Clear(void)
+eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
 {
-  Interface->Fill(x, y, w, h, bgColor);
+  int delta = 1;
+
+  switch (Key) {
+    case kLeft|k_Repeat:
+    case kLeft:  delta = -1;
+    case kRight|k_Repeat:
+    case kRight:
+                 {
+                   cChannel *channel = Channels.GetByNumber(*value + delta, delta);
+                   if (channel) {
+                      *value = channel->Number();
+                      Set();
+                      }
+                 }
+                 break;
+    default : return cMenuEditIntItem::ProcessKey(Key);
+    }
+  return osContinue;
 }
 
-void cMenuTextItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
+// --- cMenuEditTranItem -----------------------------------------------------
+
+cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value, int *Source)
+:cMenuEditChanItem(Name, Value)
 {
-  int l = 0;
-  char *t = text;
-  eDvbFont oldFont = Interface->SetFont(font);
-  while (*t) {
-        char *n = strchr(t, '\n');
-        if (l >= offset) {
-           if (n)
-              *n = 0;
-           Interface->Write(x, y + l - offset, t, fgColor, bgColor);
-           if (n)
-              *n = '\n';
-           else
-              break;
-           }
-        if (!n)
-           break;
-        t = n + 1;
-        if (++l >= h + offset)
+  number = 0;
+  source = Source;
+  transponder = *Value;
+  cChannel *channel = Channels.First();
+  while (channel) {
+        if (!channel->GroupSep() && *source == channel->Source() && ISTRANSPONDER(channel->Transponder(), *Value)) {
+           number = channel->Number();
            break;
+           }
+        channel = (cChannel *)channel->Next();
         }
-  Interface->SetFont(oldFont);
-  // scroll indicators use inverted color scheme!
-  if (CanScrollUp())   Interface->Write(x + w - 1, y,         "^", bgColor, fgColor);
-  if (CanScrollDown()) Interface->Write(x + w - 1, y + h - 1, "v", bgColor, fgColor);
-  cStatus::MsgOsdTextItem(text);
+  *Value = number;
+  Set();
+  *Value = transponder;
 }
 
-void cMenuTextItem::ScrollUp(bool Page)
+eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
 {
-  if (CanScrollUp()) {
-     Clear();
-     offset = max(offset - (Page ? h : 1), 0);
-     Display();
+  *value = number;
+  eOSState state = cMenuEditChanItem::ProcessKey(Key);
+  number = *value;
+  cChannel *channel = Channels.GetByNumber(*value);
+  if (channel) {
+     *source = channel->Source();
+     transponder = channel->Transponder();
      }
-  cStatus::MsgOsdTextItem(NULL, true);
+  *value = transponder;
+  return state;
 }
 
-void cMenuTextItem::ScrollDown(bool Page)
-{
-  if (CanScrollDown()) {
-     Clear();
-     offset = min(offset + (Page ? h : 1), lines - h);
-     Display();
+// --- cMenuEditDayItem ------------------------------------------------------
+
+int cMenuEditDayItem::days[] ={ cTimer::ParseDay("M------"),
+                                cTimer::ParseDay("-T-----"),
+                                cTimer::ParseDay("--W----"),
+                                cTimer::ParseDay("---T---"),
+                                cTimer::ParseDay("----F--"),
+                                cTimer::ParseDay("-----S-"),
+                                cTimer::ParseDay("------S"),
+                                cTimer::ParseDay("MTWTF--"),
+                                cTimer::ParseDay("MTWTFS-"),
+                                cTimer::ParseDay("MTWTFSS"),
+                                cTimer::ParseDay("-----SS"),
+                                0 };
+
+cMenuEditDayItem::cMenuEditDayItem(const char *Name, int *Value)
+:cMenuEditIntItem(Name, Value, -INT_MAX, 31)
+{
+  d = -1;
+  if (*value < 0) {
+     int n = 0;
+     while (days[n]) {
+           if (days[n] == *value) {
+              d = n;
+              break;
+              }
+           n++;
+           }
      }
-  cStatus::MsgOsdTextItem(NULL, false);
+  Set();
+}
+
+void cMenuEditDayItem::Set(void)
+{
+  SetValue(cTimer::PrintDay(*value));
 }
 
-eOSState cMenuTextItem::ProcessKey(eKeys Key)
+eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
     case kLeft|k_Repeat:
-    case kLeft:
-    case kUp|k_Repeat:
-    case kUp:            ScrollUp(NORMALKEY(Key) == kLeft);    break;
+    case kLeft:  if (d > 0)
+                    *value = days[--d];
+                 else if (d == 0) {
+                    *value = 31;
+                    d = -1;
+                    }
+                 else if (*value == 1) {
+                    d = sizeof(days) / sizeof(int) - 2;
+                    *value = days[d];
+                    }
+                 else
+                    return cMenuEditIntItem::ProcessKey(Key);
+                 Set();
+                 break;
     case kRight|k_Repeat:
-    case kRight:
-    case kDown|k_Repeat:
-    case kDown:          ScrollDown(NORMALKEY(Key) == kRight); break;
-    default:             return osUnknown;
+    case kRight: if (d >= 0) {
+                    *value = days[++d];
+                    if (*value == 0) {
+                       *value = 1;
+                       d = -1;
+                       }
+                    }
+                 else if (*value == 31) {
+                    d = 0;
+                    *value = days[d];
+                    }
+                 else
+                    return cMenuEditIntItem::ProcessKey(Key);
+                 Set();
+                 break;
+    default : return cMenuEditIntItem::ProcessKey(Key);
     }
   return osContinue;
 }
 
+// --- cMenuEditDateItem -----------------------------------------------------
+
+cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  Set();
+}
+
+void cMenuEditDateItem::Set(void)
+{
+#define DATEBUFFERSIZE 32
+  char buf[DATEBUFFERSIZE];
+  if (*value) {
+     struct tm tm_r;
+     localtime_r(value, &tm_r);
+     strftime(buf, DATEBUFFERSIZE, "%Y-%m-%d ", &tm_r);
+     strcat(buf, WeekDayName(tm_r.tm_wday));
+     }
+  else
+     *buf = 0;
+  SetValue(buf);
+}
+
+eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        *value -= SECSINDAY;
+        if (*value < time(NULL))
+           *value = 0;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (!*value)
+           *value = cTimer::SetTime(time(NULL), 0);
+        *value += SECSINDAY;
+        }
+     else
+        return state;
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
+// --- cMenuEditTimeItem -----------------------------------------------------
+
+cMenuEditTimeItem::cMenuEditTimeItem(const char *Name, int *Value)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  hh = *value / 100;
+  mm = *value % 100;
+  pos = 0;
+  Set();
+}
+
+void cMenuEditTimeItem::Set(void)
+{
+  char buf[10];
+  switch (pos) {
+    case 1:  snprintf(buf, sizeof(buf), "%01d-:--", hh / 10); break;
+    case 2:  snprintf(buf, sizeof(buf), "%02d:--", hh); break;
+    case 3:  snprintf(buf, sizeof(buf), "%02d:%01d-", hh, mm / 10); break;
+    default: snprintf(buf, sizeof(buf), "%02d:%02d", hh, mm);
+    }
+  SetValue(buf);
+}
+
+eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     if (k0 <= Key && Key <= k9) {
+        if (fresh || pos > 3) {
+           pos = 0;
+           fresh = false;
+           }
+        int n = Key - k0;
+        switch (pos) {
+          case 0: if (n <= 2) {
+                     hh = n * 10;
+                     mm = 0;
+                     pos++;
+                     }
+                  break;
+          case 1: if (hh + n <= 23) {
+                     hh += n;
+                     pos++;
+                     }
+                  break;
+          case 2: if (n <= 5) {
+                     mm += n * 10;
+                     pos++;
+                     }
+                  break;
+          case 3: if (mm + n <= 59) {
+                     mm += n;
+                     pos++;
+                     }
+                  break;
+          }
+        }
+     else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (--mm < 0) {
+           mm = 59;
+           if (--hh < 0)
+              hh = 23;
+           }
+        fresh = true;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (++mm > 59) {
+           mm = 0;
+           if (++hh > 23)
+              hh = 0;
+           }
+        fresh = true;
+        }
+     else
+        return state;
+     *value = hh * 100 + mm;
+     Set();
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuSetupPage --------------------------------------------------------
 
 cMenuSetupPage::cMenuSetupPage(void)
diff --git a/menuitems.h b/menuitems.h
index 7091740dd..5a2912c86 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.6 2004/02/24 11:55:14 kls Exp $
+ * $Id: menuitems.h 1.9 2004/05/16 12:45:14 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
 #define __MENUITEMS_H
 
-#include "osd.h"
+#include "osdbase.h"
 
 extern const char *FileNameChars;
 
@@ -100,22 +100,51 @@ class cMenuEditStraItem : public cMenuEditIntItem {
   cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings);
   };
 
-class cMenuTextItem : public cOsdItem {
+class cMenuEditChanItem : public cMenuEditIntItem {
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditChanItem(const char *Name, int *Value);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditTranItem : public cMenuEditChanItem {
 private:
-  char *text;
-  int x, y, w, h, lines, offset;
-  eDvbColor fgColor, bgColor;
-  eDvbFont font;
+  int number;
+  int *source;
+  int transponder;
+public:
+  cMenuEditTranItem(const char *Name, int *Value, int *Source);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditDayItem : public cMenuEditIntItem {
+protected:
+  static int days[];
+  int d;
+  virtual void Set(void);
+public:
+  cMenuEditDayItem(const char *Name, int *Value);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditDateItem : public cMenuEditItem {
+protected:
+  time_t *value;
+  virtual void Set(void);
+public:
+  cMenuEditDateItem(const char *Name, time_t *Value);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEditTimeItem : public cMenuEditItem {
+protected:
+  int *value;
+  int hh, mm;
+  int pos;
+  virtual void Set(void);
 public:
-  cMenuTextItem(const char *Text, int X, int Y, int W, int H = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground, eDvbFont Font = fontOsd);
-  ~cMenuTextItem();
-  int Height(void) { return h; }
-  void Clear(void);
-  virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  bool CanScrollUp(void) { return offset > 0; }
-  bool CanScrollDown(void) { return h + offset < lines; }
-  void ScrollUp(bool Page);
-  void ScrollDown(bool Page);
+  cMenuEditTimeItem(const char *Name, int *Value);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/osd.c b/osd.c
index 7ede0015e..94668623a 100644
--- a/osd.c
+++ b/osd.c
@@ -4,651 +4,768 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.45 2004/03/14 10:33:20 kls Exp $
+ * $Id: osd.c 1.46 2004/05/16 09:25:06 kls Exp $
  */
 
 #include "osd.h"
-#include <string.h>
-#include "device.h"
-#include "i18n.h"
-#include "status.h"
+#include <math.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/unistd.h>
+#include "tools.h"
 
-// --- cOsd ------------------------------------------------------------------
-
-#ifdef DEBUG_OSD
-  WINDOW *cOsd::window = NULL;
-  int cOsd::colorPairs[MaxColorPairs] = { 0 };
-#else
-  cOsdBase *cOsd::osd = NULL;
-#endif
-  int cOsd::cols = 0;
-  int cOsd::rows = 0;
+// --- cPalette --------------------------------------------------------------
 
-void cOsd::Initialize(void)
+cPalette::cPalette(int Bpp)
 {
-#if defined(DEBUG_OSD)
-  initscr();
-  start_color();
-  leaveok(stdscr, true);
-#endif
+  SetBpp(Bpp);
 }
 
-void cOsd::Shutdown(void)
+void cPalette::Reset(void)
 {
-  Close();
-#if defined(DEBUG_OSD)
-  endwin();
-#endif
+  numColors = 0;
+  modified = false;
 }
 
-#ifdef DEBUG_OSD
-void cOsd::SetColor(eDvbColor colorFg, eDvbColor colorBg)
+int cPalette::Index(tColor Color)
 {
-  int color = (colorBg << 16) | colorFg | 0x80000000;
-  for (int i = 0; i < MaxColorPairs; i++) {
-      if (!colorPairs[i]) {
-         colorPairs[i] = color;
-         init_pair(i + 1, colorFg, colorBg);
-         wattrset(window, COLOR_PAIR(i + 1));
-         break;
-         }
-      else if (color == colorPairs[i]) {
-         wattrset(window, COLOR_PAIR(i + 1));
-         break;
-         }
+  for (int i = 0; i < numColors; i++) {
+      if (color[i] == Color)
+         return i;
       }
-}
-#endif
-
-cOsdBase *cOsd::OpenRaw(int x, int y)
-{
-#ifdef DEBUG_OSD
-  return NULL;
-#else
-  return osd ? NULL : cDevice::PrimaryDevice()->NewOsd(x, y);
-#endif
-}
-
-void cOsd::Open(int w, int h)
-{
-  int d = (h < 0) ? Setup.OSDheight + h : 0;
-  h = abs(h);
-  cols = w;
-  rows = h;
-#ifdef DEBUG_OSD
-  window = subwin(stdscr, h, w, d, (Setup.OSDwidth - w) / 2);
-  syncok(window, true);
-  #define B2C(b) (((b) * 1000) / 255)
-  #define SETCOLOR(n, r, g, b, o) init_color(n, B2C(r), B2C(g), B2C(b))
-  //XXX
-  SETCOLOR(clrBackground,  0x00, 0x00, 0x00, 127); // background 50% gray
-  SETCOLOR(clrBlack,       0x00, 0x00, 0x00, 255);
-  SETCOLOR(clrRed,         0xFC, 0x14, 0x14, 255);
-  SETCOLOR(clrGreen,       0x24, 0xFC, 0x24, 255);
-  SETCOLOR(clrYellow,      0xFC, 0xC0, 0x24, 255);
-  SETCOLOR(clrBlue,        0x00, 0x00, 0xFC, 255);
-  SETCOLOR(clrCyan,        0x00, 0xFC, 0xFC, 255);
-  SETCOLOR(clrMagenta,     0xB0, 0x00, 0xFC, 255);
-  SETCOLOR(clrWhite,       0xFC, 0xFC, 0xFC, 255);
-#else
-  w *= charWidth;
-  h *= lineHeight;
-  d *= lineHeight;
-  int x = (720 - w + charWidth) / 2; //TODO PAL vs. NTSC???
-  int y = (576 - Setup.OSDheight * lineHeight) / 2 + d;
-  //XXX
-  osd = OpenRaw(x, y);
-  //XXX TODO this should be transferred to the places where the individual windows are requested (there's too much detailed knowledge here!)
-  if (!osd)
-     return;
-  if (h / lineHeight == 5) { //XXX channel display
-     osd->Create(0,              0, w, h, 4);
-     }
-  else if (h / lineHeight == 1) { //XXX info display
-     osd->Create(0,              0, w, h, 4);
+  if (numColors < maxColors) {
+     color[numColors++] = Color;
+     modified = true;
+     return numColors - 1;
      }
-  else if (d == 0) { //XXX full menu
-     osd->Create(0,                            0, w,                         lineHeight, 2);
-     osd->Create(0,                   lineHeight, w, (Setup.OSDheight - 3) * lineHeight, 2);
-     osd->AddColor(clrBackground);
-     osd->AddColor(clrCyan);
-     osd->AddColor(clrWhite);
-     osd->AddColor(clrBlack);
-     osd->Create(0, (Setup.OSDheight - 2) * lineHeight, w,               2 * lineHeight, 4);
-     }
-  else { //XXX progress display
-     /*XXX
-     osd->Create(0,              0, w, lineHeight, 1);
-     osd->Create(0,     lineHeight, w, lineHeight, 2, false);
-     osd->Create(0, 2 * lineHeight, w, lineHeight, 1);
-     XXX*///XXX some pixels are not drawn correctly with lower bpp values
-     osd->Create(0,              0, w, h, 4);
-     }
-#endif
+  dsyslog("too many different colors used in palette");
+  //TODO: return the index of the "closest" color?
+  return 0;
 }
 
-void cOsd::Close(void)
+void cPalette::SetBpp(int Bpp)
 {
-#ifdef DEBUG_OSD
-  if (window) {
-     delwin(window);
-     window = 0;
+  bpp = Bpp;
+  maxColors = 1 << bpp;
+  Reset();
+}
+
+void cPalette::SetColor(int Index, tColor Color)
+{
+  if (Index < maxColors) {
+     if (numColors <= Index) {
+        numColors = Index + 1;
+        modified = true;
+        }
+     else
+        modified |= color[Index] != Color;
+     color[Index] = Color;
      }
-#else
-  delete osd;
-  osd = NULL;
-#endif
 }
 
-void cOsd::Clear(void)
+const tColor *cPalette::Colors(int &NumColors)
 {
-#ifdef DEBUG_OSD
-  SetColor(clrBackground, clrBackground);
-  Fill(0, 0, cols, rows, clrBackground);
-  refresh();
-#else
-  if (osd)
-     osd->Clear();
-#endif
+  NumColors = numColors;
+  return numColors ? color : NULL;
 }
 
-void cOsd::Fill(int x, int y, int w, int h, eDvbColor color)
+void cPalette::Take(const cPalette &Palette, tIndexes *Indexes, tColor ColorFg, tColor ColorBg)
 {
-  if (x < 0) x = cols + x;
-  if (y < 0) y = rows + y;
-#ifdef DEBUG_OSD
-  SetColor(color, color);
-  for (int r = 0; r < h; r++) {
-      wmove(window, y + r, x); // ncurses wants 'y' before 'x'!
-      whline(window, ' ', w);
+  for (int i = 0; i < Palette.numColors; i++) {
+      tColor Color = Palette.color[i];
+      if (ColorFg || ColorBg) {
+         switch (i) {
+           case 0: Color = ColorBg; break;
+           case 1: Color = ColorFg; break;
+           }
+         }
+      int n = Index(Color);
+      if (Indexes)
+         (*Indexes)[i] = n;
       }
-  wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
-#else
-  if (osd)
-     osd->Fill(x * charWidth, y * lineHeight, (x + w) * charWidth - 1, (y + h) * lineHeight - 1, color);
-#endif
 }
 
-void cOsd::SetBitmap(int x, int y, const cBitmap &Bitmap)
+// --- cBitmap ---------------------------------------------------------------
+
+cBitmap::cBitmap(int Width, int Height, int Bpp, int X0, int Y0)
+:cPalette(Bpp)
 {
-#ifndef DEBUG_OSD
-  if (osd)
-     osd->SetBitmap(x, y, Bitmap);
-#endif
+  bitmap = NULL;
+  x0 = X0;
+  y0 = Y0;
+  SetSize(Width, Height);
 }
 
-void cOsd::ClrEol(int x, int y, eDvbColor color)
+cBitmap::cBitmap(const char *FileName)
 {
-  Fill(x, y, cols - x, 1, color);
+  bitmap = NULL;
+  x0 = 0;
+  y0 = 0;
+  LoadXpm(FileName);
 }
 
-int cOsd::CellWidth(void)
+cBitmap::cBitmap(char *Xpm[])
 {
-#ifdef DEBUG_OSD
-  return 1;
-#else
-  return charWidth;
-#endif
+  bitmap = NULL;
+  x0 = 0;
+  y0 = 0;
+  SetXpm(Xpm);
 }
 
-int cOsd::LineHeight(void)
+cBitmap::~cBitmap()
 {
-#ifdef DEBUG_OSD
-  return 1;
-#else
-  return lineHeight;
-#endif
+  free(bitmap);
 }
 
-int cOsd::Width(unsigned char c)
+void cBitmap::SetSize(int Width, int Height)
 {
-#ifdef DEBUG_OSD
-  return 1;
-#else
-  return osd ? osd->Width(c) : 1;
-#endif
+  if (bitmap && Width == width && Height == height)
+     return;
+  width = Width;
+  height = Height;
+  free(bitmap);
+  bitmap = NULL;
+  dirtyX1 = 0;
+  dirtyY1 = 0;
+  dirtyX2 = width - 1;
+  dirtyY2 = height - 1;
+  if (width > 0 && height > 0) {
+     bitmap = MALLOC(tIndex, width * height);
+     if (bitmap)
+        memset(bitmap, 0x00, width * height);
+     else
+        esyslog("ERROR: can't allocate bitmap!");
+     }
+  else
+     esyslog("ERROR: illegal bitmap parameters (%d, %d)!", width, height);
 }
 
-int cOsd::WidthInCells(const char *s)
+bool cBitmap::Contains(int x, int y) const
 {
-#ifdef DEBUG_OSD
-  return strlen(s);
-#else
-  return osd ? (osd->Width(s) + charWidth - 1) / charWidth : strlen(s);
-#endif
+  x -= x0;
+  y -= y0;
+  return 0 <= x && x < width && 0 <= y && y < height;
 }
 
-eDvbFont cOsd::SetFont(eDvbFont Font)
+bool cBitmap::Intersects(int x1, int y1, int x2, int y2) const
 {
-#ifdef DEBUG_OSD
-  return Font;
-#else
-  return osd ? osd->SetFont(Font) : Font;
-#endif
+  x1 -= x0;
+  y1 -= y0;
+  x2 -= x0;
+  y2 -= y0;
+  return !(x2 < 0 || x1 >= width || y2 < 0 || y1 >= height);
 }
 
-void cOsd::Text(int x, int y, const char *s, eDvbColor colorFg, eDvbColor colorBg)
+bool cBitmap::Dirty(int &x1, int &y1, int &x2, int &y2)
 {
-  if (x < 0) x = cols + x;
-  if (y < 0) y = rows + y;
-#ifdef DEBUG_OSD
-  SetColor(colorFg, colorBg);
-  wmove(window, y, x); // ncurses wants 'y' before 'x'!
-  waddnstr(window, s, cols - x);
-#else
-  if (osd)
-     osd->Text(x * charWidth, y * lineHeight, s, colorFg, colorBg);
-#endif
+  if (dirtyX2 >= 0) {
+     x1 = dirtyX1;
+     y1 = dirtyY1;
+     x2 = dirtyX2;
+     y2 = dirtyY2;
+     return true;
+     }
+  return false;
+}
+
+void cBitmap::Clean(void)
+{
+  dirtyX1 = width;
+  dirtyY1 = height;
+  dirtyX2 = -1;
+  dirtyY2 = -1;
+}
+
+bool cBitmap::LoadXpm(const char *FileName)
+{
+  bool Result = false;
+  FILE *f = fopen(FileName, "r");
+  if (f) {
+     char **Xpm = NULL;
+     bool isXpm = false;
+     int lines = 0;
+     int index = 0;
+     char *s;
+     while ((s = readline(f)) != NULL) {
+           s = skipspace(s);
+           if (!isXpm) {
+              if (strcmp(s, "/* XPM */") != 0) {
+                 esyslog("ERROR: invalid header in XPM file '%s'", FileName);
+                 break;
+                 }
+              isXpm = true;
+              }
+           else if (*s++ == '"') {
+              if (!lines) {
+                 int w, h, n, c;
+                 if (4 != sscanf(s, "%d %d %d %d", &w, &h, &n, &c)) {
+                    esyslog("ERROR: faulty 'values' line in XPM file '%s'", FileName);
+                    break;
+                    }
+                 lines = h + n + 1;
+                 Xpm = MALLOC(char *, lines);
+                 }
+              char *q = strchr(s, '"');
+              if (!q) {
+                 esyslog("ERROR: missing quotes in XPM file '%s'", FileName);
+                 break;
+                 }
+              *q = 0;
+              if (index < lines)
+                 Xpm[index++] = strdup(s);
+              else {
+                 esyslog("ERROR: too many lines in XPM file '%s'", FileName);
+                 break;
+                 }
+              }
+           }
+     if (index == lines)
+        Result = SetXpm(Xpm);
+     else
+        esyslog("ERROR: too few lines in XPM file '%s'", FileName);
+     for (int i = 0; i < index; i++)
+         free(Xpm[i]);
+     free(Xpm);
+     fclose(f);
+     }
+  else
+     esyslog("ERROR: can't open XPM file '%s'", FileName);
+  return Result;
 }
 
-void cOsd::Flush(void)
+bool cBitmap::SetXpm(char *Xpm[])
 {
-#ifdef DEBUG_OSD
-  refresh();
-#else
-  if (osd)
-     osd->Flush();
-#endif
+  char **p = Xpm;
+  int w, h, n, c;
+  if (4 != sscanf(*p, "%d %d %d %d", &w, &h, &n, &c)) {
+     esyslog("ERROR: faulty 'values' line in XPM: '%s'", *p);
+     return false;
+     }
+  if (n > MAXNUMCOLORS) {
+     esyslog("ERROR: too many colors in XPM: %d", n);
+     return false;
+     }
+  int b = 0;
+  while (1 << (1 << b) < n)
+        b++;
+  SetBpp(1 << b);
+  SetSize(w, h);
+  for (int i = 0; i < n; i++) {
+      const char *s = *++p;
+      if (int(strlen(s)) < c) {
+         esyslog("ERROR: faulty 'colors' line in XPM: '%s'", s);
+         return false;
+         }
+      s = skipspace(s + c);
+      if (*s != 'c') {
+         esyslog("ERROR: unknown color key in XPM: '%c'", *s);
+         return false;
+         }
+      s = skipspace(s + 1);
+      if (*s != '#') {
+         esyslog("ERROR: unknown color code in XPM: '%c'", *s);
+         return false;
+         }
+      tColor color = strtoul(++s, NULL, 16) | 0xFF000000;
+      SetColor(i, color);
+      }
+  for (int y = 0; y < h; y++) {
+      const char *s = *++p;
+      if (int(strlen(s)) != w * c) {
+         esyslog("ERROR: faulty pixel line in XPM: %d '%s'", y, s);
+         return false;
+         }
+      for (int x = 0; x < w; x++) {
+          for (int i = 0; i <= n; i++) {
+              if (i == n) {
+                 esyslog("ERROR: undefined pixel color in XPM: %d %d '%s'", x, y, s);
+                 return false;
+                 }
+              if (strncmp(Xpm[i + 1], s, c) == 0) {
+                 SetIndex(x, y, i);
+                 break;
+                 }
+              }
+          s += c;
+          }
+      }
+  return true;
 }
 
-// --- cOsdItem --------------------------------------------------------------
-
-cOsdItem::cOsdItem(eOSState State)
+void cBitmap::SetIndex(int x, int y, tIndex Index)
 {
-  text = NULL;
-  offset = -1;
-  state = State;
-  fresh = false;
-  userColor = false;
-  fgColor = clrWhite;
-  bgColor = clrBackground;
+  if (bitmap) {
+     if (0 <= x && x < width && 0 <= y && y < height) {
+        if (bitmap[width * y + x] != Index) {
+           bitmap[width * y + x] = Index;
+           if (dirtyX1 > x)  dirtyX1 = x;
+           if (dirtyY1 > y)  dirtyY1 = y;
+           if (dirtyX2 < x)  dirtyX2 = x;
+           if (dirtyY2 < y)  dirtyY2 = y;
+           }
+        }
+     }
 }
 
-cOsdItem::cOsdItem(const char *Text, eOSState State)
+void cBitmap::DrawPixel(int x, int y, tColor Color)
 {
-  text = NULL;
-  offset = -1;
-  state = State;
-  fresh = false;
-  userColor = false;
-  fgColor = clrWhite;
-  bgColor = clrBackground;
-  SetText(Text);
+  x -= x0;
+  y -= y0;
+  SetIndex(x, y, Index(Color));
 }
 
-cOsdItem::~cOsdItem()
+void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)
 {
-  free(text);
+  if (bitmap && Bitmap.bitmap && Intersects(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1)) {
+     x -= x0;
+     y -= y0;
+     tIndexes Indexes;
+     if (ColorFg || ColorBg) {
+        }
+     Take(Bitmap, &Indexes, ColorFg, ColorBg);
+     for (int ix = 0; ix < Bitmap.width; ix++) {
+         for (int iy = 0; iy < Bitmap.height; iy++)
+             SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
+         }
+     }
 }
 
-void cOsdItem::SetText(const char *Text, bool Copy)
-{
-  free(text);
-  text = Copy ? strdup(Text) : (char *)Text; // text assumes ownership!
+void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
+{
+  if (bitmap) {
+     int w = Font->Width(s);
+     int h = Font->Height();
+     int limit = 0;
+     if (Width || Height) {
+        int cw = Width ? Width : w;
+        int ch = Height ? Height : h;
+        if (!Intersects(x, y, x + cw - 1, y + ch - 1))
+           return;
+        DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
+        limit = x + cw - x0;
+        if (Width) {
+           if ((Alignment & taLeft) != 0)
+              ;
+           else if ((Alignment & taRight) != 0) {
+              if (w < Width)
+                 x += Width - w;
+              }
+           else { // taCentered
+              if (w < Width)
+                 x += (Width - w) / 2;
+              }
+           }
+        if (Height) {
+           if ((Alignment & taTop) != 0)
+              ;
+           else if ((Alignment & taBottom) != 0) {
+              if (h < Height)
+                 y += Height - h;
+              }
+           else { // taCentered
+              if (h < Height)
+                 y += (Height - h) / 2;
+              }
+           }
+        }
+     else if (!Intersects(x, y, x + w - 1, y + h - 1))
+        return;
+     x -= x0;
+     y -= y0;
+     tIndex fg = Index(ColorFg);
+     tIndex bg = Index(ColorBg);
+     while (s && *s) {
+           const cFont::tCharData *CharData = Font->CharData(*s++);
+           if (limit && int(x + CharData->width) > limit)
+              break; // we don't draw partial characters
+           if (int(x + CharData->width) > 0) {
+              for (int row = 0; row < h; row++) {
+                  cFont::tPixelData PixelData = CharData->lines[row];
+                  for (int col = CharData->width; col-- > 0; ) {
+                      SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
+                      PixelData >>= 1;
+                      }
+                  }
+              }
+           x += CharData->width;
+           if (x > width - 1)
+              break;
+           }
+     }
+}
+
+void cBitmap::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
+{
+  if (bitmap && Intersects(x1, y1, x2, y2)) {
+     x1 -= x0;
+     y1 -= y0;
+     x2 -= x0;
+     y2 -= y0;
+     x1 = max(x1, 0);
+     y1 = max(y1, 0);
+     x2 = min(x2, width - 1);
+     y2 = min(y2, height - 1);
+     if (x1 == 0 && y1 == 0 && x2 == width - 1 && y2 == height - 1)
+        Reset();
+     tIndex c = Index(Color);
+     for (int y = y1; y <= y2; y++)
+         for (int x = x1; x <= x2; x++)
+             SetIndex(x, y, c);
+     }
 }
 
-void cOsdItem::SetColor(eDvbColor FgColor, eDvbColor BgColor)
+void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
 {
-  userColor = true;
-  fgColor = FgColor; 
-  bgColor = BgColor; 
+  if (!Intersects(x1, y1, x2, y2))
+     return;
+  // Algorithm based on http://homepage.smc.edu/kennedy_john/BELIPSE.PDF
+  int rx = x2 - x1;
+  int ry = y2 - y1;
+  int cx = (x1 + x2) / 2;
+  int cy = (y1 + y2) / 2;
+  switch (abs(Quadrants)) {
+    case 0: rx /= 2; ry /= 2; break;
+    case 1: cx = x1; cy = y2; break;
+    case 2: cx = x2; cy = y2; break;
+    case 3: cx = x2; cy = y1; break;
+    case 4: cx = x1; cy = y1; break;
+    case 5: cx = x1;          ry /= 2; break;
+    case 6:          cy = y2; rx /= 2; break;
+    case 7: cx = x2;          ry /= 2; break;
+    case 8:          cy = y1; rx /= 2; break;
+    }
+  int TwoASquare = 2 * rx * rx;
+  int TwoBSquare = 2 * ry * ry;
+  int x = rx;
+  int y = 0;
+  int XChange = ry * ry * (1 - 2 * rx);
+  int YChange = rx * rx;
+  int EllipseError = 0;
+  int StoppingX = TwoBSquare * rx;
+  int StoppingY = 0;
+  while (StoppingX >= StoppingY) {
+        switch (Quadrants) {
+          case  5: DrawRectangle(cx,     cy + y, cx + x, cy + y, Color); // no break
+          case  1: DrawRectangle(cx,     cy - y, cx + x, cy - y, Color); break;
+          case  7: DrawRectangle(cx - x, cy + y, cx,     cy + y, Color); // no break
+          case  2: DrawRectangle(cx - x, cy - y, cx,     cy - y, Color); break;
+          case  3: DrawRectangle(cx - x, cy + y, cx,     cy + y, Color); break;
+          case  4: DrawRectangle(cx,     cy + y, cx + x, cy + y, Color); break;
+          case  0:
+          case  6: DrawRectangle(cx - x, cy - y, cx + x, cy - y, Color); if (Quadrants == 6) break;
+          case  8: DrawRectangle(cx - x, cy + y, cx + x, cy + y, Color); break;
+          case -1: DrawRectangle(cx + x, cy - y, x2,     cy - y, Color); break;
+          case -2: DrawRectangle(x1,     cy - y, cx - x, cy - y, Color); break;
+          case -3: DrawRectangle(x1,     cy + y, cx - x, cy + y, Color); break;
+          case -4: DrawRectangle(cx + x, cy + y, x2,     cy + y, Color); break;
+          }
+        y++;
+        StoppingY += TwoASquare;
+        EllipseError += YChange;
+        YChange += TwoASquare;
+        if (2 * EllipseError + XChange > 0) {
+           x--;
+           StoppingX -= TwoBSquare;
+           EllipseError += XChange;
+           XChange += TwoBSquare;
+           }
+        }
+  x = 0;
+  y = ry;
+  XChange = ry * ry;
+  YChange = rx * rx * (1 - 2 * ry);
+  EllipseError = 0;
+  StoppingX = 0;
+  StoppingY = TwoASquare * ry;
+  while (StoppingX <= StoppingY) {
+        switch (Quadrants) {
+          case  5: DrawRectangle(cx,     cy + y, cx + x, cy + y, Color); // no break
+          case  1: DrawRectangle(cx,     cy - y, cx + x, cy - y, Color); break;
+          case  7: DrawRectangle(cx - x, cy + y, cx,     cy + y, Color); // no break
+          case  2: DrawRectangle(cx - x, cy - y, cx,     cy - y, Color); break;
+          case  3: DrawRectangle(cx - x, cy + y, cx,     cy + y, Color); break;
+          case  4: DrawRectangle(cx,     cy + y, cx + x, cy + y, Color); break;
+          case  0:
+          case  6: DrawRectangle(cx - x, cy - y, cx + x, cy - y, Color); if (Quadrants == 6) break;
+          case  8: DrawRectangle(cx - x, cy + y, cx + x, cy + y, Color); break;
+          case -1: DrawRectangle(cx + x, cy - y, x2,     cy - y, Color); break;
+          case -2: DrawRectangle(x1,     cy - y, cx - x, cy - y, Color); break;
+          case -3: DrawRectangle(x1,     cy + y, cx - x, cy + y, Color); break;
+          case -4: DrawRectangle(cx + x, cy + y, x2,     cy + y, Color); break;
+          }
+        x++;
+        StoppingX += TwoBSquare;
+        EllipseError += XChange;
+        XChange += TwoBSquare;
+        if (2 * EllipseError + YChange > 0) {
+           y--;
+           StoppingY -= TwoASquare;
+           EllipseError += YChange;
+           YChange += TwoASquare;
+           }
+        }
 }
 
-void cOsdItem::Display(int Offset, eDvbColor FgColor, eDvbColor BgColor)
+void cBitmap::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
-  if (Offset < 0) {
-     FgColor = clrBlack;
-     BgColor = clrCyan;
+  // TODO This is just a quick and dirty implementation of a slope drawing
+  // machanism. If somebody can come up with a better solution, let's have it!
+  if (!Intersects(x1, y1, x2, y2))
+     return;
+  bool upper    = Type & 0x01;
+  bool falling  = Type & 0x02;
+  bool vertical = Type & 0x04;
+  if (vertical) {
+     for (int y = y1; y <= y2; y++) {
+         double c = cos((y - y1) * M_PI / (y2 - y1 + 1));
+         if (falling)
+            c = -c;
+         int x = int((x2 - x1 + 1) * c / 2);
+         if (upper && !falling || !upper && falling)
+            DrawRectangle(x1, y, (x1 + x2) / 2 + x, y, Color);
+         else
+            DrawRectangle((x1 + x2) / 2 + x, y, x2, y, Color);
+         }
+     }
+  else {
+     for (int x = x1; x <= x2; x++) {
+         double c = cos((x - x1) * M_PI / (x2 - x1 + 1));
+         if (falling)
+            c = -c;
+         int y = int((y2 - y1 + 1) * c / 2);
+         if (upper)
+            DrawRectangle(x, y1, x, (y1 + y2) / 2 + y, Color);
+         else
+            DrawRectangle(x, (y1 + y2) / 2 + y, x, y2, Color);
+         }
      }
-  fresh |= Offset >= 0;
-  if (Offset >= 0)
-     offset = Offset;
-  if (offset >= 0)
-     Interface->WriteText(0, offset + 2, text, userColor ? fgColor : FgColor, userColor ? bgColor : BgColor);
 }
 
-eOSState cOsdItem::ProcessKey(eKeys Key)
+const tIndex *cBitmap::Data(int x, int y)
 {
-  return Key == kOk ? state : osUnknown;
+  return &bitmap[y * width + x];
 }
 
-// --- cOsdMenu --------------------------------------------------------------
+// --- cOsd ------------------------------------------------------------------
+
+bool cOsd::isOpen = false;
 
-cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
+cOsd::cOsd(int Left, int Top)
 {
-  isMenu = true;
-  digit = 0;
-  hasHotkeys = false;
-  visible = false;
-  title = NULL;
-  SetTitle(Title);
-  cols[0] = c0;
-  cols[1] = c1;
-  cols[2] = c2;
-  cols[3] = c3;
-  cols[4] = c4;
-  first = 0;
-  current = marked = -1;
-  subMenu = NULL;
-  helpRed = helpGreen = helpYellow = helpBlue = NULL;
-  status = NULL;
-  Interface->Open();
+  if (isOpen)
+     esyslog("ERROR: OSD opened without closing previous OSD!");
+  savedRegion = NULL;
+  numBitmaps = 0;
+  left = Left;
+  top = Top;
+  width = height = 0;
+  isOpen = true;
 }
 
-cOsdMenu::~cOsdMenu()
+cOsd::~cOsd()
 {
-  free(title);
-  delete subMenu;
-  free(status);
-  Interface->Clear();
-  Interface->Close();
+  for (int i = 0; i < numBitmaps; i++)
+      delete bitmaps[i];
+  delete savedRegion;
+  isOpen = false;
 }
 
-const char *cOsdMenu::hk(const char *s)
+cBitmap *cOsd::GetBitmap(int Area)
 {
-  static char buffer[64];
-  if (s && hasHotkeys) {
-     if (digit == 0 && '1' <= *s && *s <= '9' && *(s + 1) == ' ')
-        digit = -1; // prevents automatic hotkeys - input already has them
-     if (digit >= 0) {
-        digit++;
-        snprintf(buffer, sizeof(buffer), " %c %s", (digit < 10) ? '0' + digit : ' ' , s);
-        s = buffer;
-        }
-     }
-  return s;
+  return Area < numBitmaps ? bitmaps[Area] : NULL;
 }
 
-void cOsdMenu::SetHasHotkeys(void)
+eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
-  hasHotkeys = true;
-  digit = 0;
+  for (int i = 0; i < NumAreas; i++) {
+      for (int j = i + 1; j < NumAreas; j++) {
+          if (Areas[i].Intersects(Areas[j]))
+             return oeAreasOverlap;
+          if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)
+             return oeWrongAlignment;
+          }
+      }
+  return oeOk;
 }
 
-void cOsdMenu::SetStatus(const char *s)
+eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
 {
-  free(status);
-  status = s ? strdup(s) : NULL;
-  if (visible)
-     Interface->Status(status);
+  eOsdError Result = oeUnknown;
+  if (numBitmaps == 0) {
+     Result = CanHandleAreas(Areas, NumAreas);
+     if (Result == oeOk) {
+        width = height = 0;
+        for (int i = 0; i < NumAreas; i++) {
+            bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
+            width = max(width, Areas[i].x2);
+            height = max(height, Areas[i].y2);
+            }
+        }
+     }
+  if (Result != oeOk)
+     esyslog("ERROR: cOsd::SetAreas returned %d\n", Result);
+  return Result;
 }
 
-void cOsdMenu::SetTitle(const char *Title, bool ShowDate)
+void cOsd::SaveRegion(int x1, int y1, int x2, int y2)
 {
-  free(title);
-  if (ShowDate)
-     asprintf(&title, "%s\t%s", Title, DayDateTime(time(NULL)));
-  else
-     title = strdup(Title);
+  delete savedRegion;
+  savedRegion = new cBitmap(x2 - x1 + 1, y2 - y1 + 1, 8, x1, y1);
+  for (int i = 0; i < numBitmaps; i++)
+      savedRegion->DrawBitmap(bitmaps[i]->X0(), bitmaps[i]->Y0(), *bitmaps[i]);
 }
 
-void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+void cOsd::RestoreRegion(void)
 {
-  // strings are NOT copied - must be constants!!!
-  helpRed    = Red;
-  helpGreen  = Green;
-  helpYellow = Yellow;
-  helpBlue   = Blue;
-  if (visible)
-     Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
+  if (savedRegion) {
+     DrawBitmap(savedRegion->X0(), savedRegion->Y0(), *savedRegion);
+     delete savedRegion;
+     savedRegion = NULL;
+     }
 }
 
-void cOsdMenu::Del(int Index)
+eOsdError cOsd::SetPalette(const cPalette &Palette, int Area)
 {
-  cList<cOsdItem>::Del(Get(Index));
-  if (current == Count())
-     current--;
-  if (Index == first && first > 0)
-     first--;
+  if (Area < numBitmaps)
+     bitmaps[Area]->Take(Palette);
+  return oeUnknown;
 }
 
-void cOsdMenu::Add(cOsdItem *Item, bool Current, cOsdItem *After)
+void cOsd::DrawPixel(int x, int y, tColor Color)
 {
-  cList<cOsdItem>::Add(Item, After);
-  if (Current)
-     current = Item->Index();
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->DrawPixel(x, y, Color);
 }
 
-void cOsdMenu::Ins(cOsdItem *Item, bool Current, cOsdItem *Before)
+void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)
 {
-  cList<cOsdItem>::Ins(Item, Before);
-  if (Current)
-     current = Item->Index();
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg);
 }
 
-void cOsdMenu::Display(void)
+void cOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
 {
-  if (subMenu) {
-     subMenu->Display();
-     return;
-     }
-  visible = true;
-  Interface->Clear();
-  Interface->SetCols(cols);
-  Interface->Title(title);
-  Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
-  int count = Count();
-  if (count > 0) {
-     int ni = 0;
-     for (cOsdItem *item = First(); item; item = Next(item))
-         cStatus::MsgOsdItem(item->Text(), ni++);
-     if (current < 0)
-        current = 0; // just for safety - there HAS to be a current item!
-     if (current - first >= MAXOSDITEMS || current < first) {
-        first = current - MAXOSDITEMS / 2;
-        if (first + MAXOSDITEMS > count)
-           first = count - MAXOSDITEMS;
-        if (first < 0)
-           first = 0;
-        }
-     int i = first;
-     int n = 0;
-     for (cOsdItem *item = Get(first); item; item = Next(item)) {
-         item->Display(i - first, i == current ? clrBlack : clrWhite, i == current ? clrCyan : clrBackground);
-         if (i == current)
-            cStatus::MsgOsdCurrentItem(item->Text());
-         if (++n == MAXOSDITEMS) //TODO get this from Interface!!!
-            break;
-         i++;
-         }
-     }
-  if (!isempty(status))
-     Interface->Status(status);
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->DrawText(x, y, s, ColorFg, ColorBg, Font, Width, Height, Alignment);
 }
 
-void cOsdMenu::SetCurrent(cOsdItem *Item)
+void cOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
 {
-  current = Item ? Item->Index() : -1;
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->DrawRectangle(x1, y1, x2, y2, Color);
 }
 
-void cOsdMenu::RefreshCurrent(void)
+void cOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
 {
-  cOsdItem *item = Get(current);
-  if (item)
-     item->Set();
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->DrawEllipse(x1, y1, x2, y2, Color, Quadrants);
 }
 
-void cOsdMenu::DisplayCurrent(bool Current)
+void cOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
-  cOsdItem *item = Get(current);
-  if (item) {
-     item->Display(current - first, Current ? clrBlack : clrWhite, Current ? clrCyan : clrBackground);
-     if (Current)
-        cStatus::MsgOsdCurrentItem(item->Text());
-     }
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->DrawSlope(x1, y1, x2, y2, Color, Type);
 }
 
-void cOsdMenu::Clear(void)
+void cOsd::Flush(void)
 {
-  first = 0;
-  current = marked = -1;
-  cList<cOsdItem>::Clear();
 }
 
-bool cOsdMenu::SpecialItem(int idx)
+// --- cOsdProvider ----------------------------------------------------------
+
+cOsdProvider *cOsdProvider::osdProvider = NULL;
+
+cOsdProvider::cOsdProvider(void)
 {
-  cOsdItem *item = Get(idx);
-  return item && item->HasUserColor();
+  delete osdProvider;
+  osdProvider = this;
 }
 
-void cOsdMenu::CursorUp(void)
+cOsdProvider::~cOsdProvider()
 {
-  if (current > 0) {
-     int tmpCurrent = current;
-     while (--tmpCurrent >= 0 && SpecialItem(tmpCurrent));
-     if (tmpCurrent < 0)
-        return;
-     if (tmpCurrent >= first)
-        DisplayCurrent(false);
-     current = tmpCurrent;
-     if (current < first) {
-        first = first > MAXOSDITEMS - 1 ? first - (MAXOSDITEMS - 1) : 0;
-        if (Setup.MenuScrollPage)
-           current = SpecialItem(first) ? first + 1 : first;
-        Display();
-        }
-     else
-        DisplayCurrent(true);
-     }
+  osdProvider = NULL;
 }
 
-void cOsdMenu::CursorDown(void)
+cOsd *cOsdProvider::NewOsd(int Left, int Top)
 {
-  int last = Count() - 1;
-  int lastOnScreen = first + MAXOSDITEMS - 1;
-
-  if (current < last) {
-     int tmpCurrent = current;
-     while (++tmpCurrent <= last && SpecialItem(tmpCurrent));
-     if (tmpCurrent > last)
-        return;
-     if (tmpCurrent <= lastOnScreen)
-        DisplayCurrent(false);
-     current = tmpCurrent;
-     if (current > lastOnScreen) {
-        first += MAXOSDITEMS - 1;
-        lastOnScreen = first + MAXOSDITEMS - 1;
-        if (lastOnScreen > last) {
-           first = last - (MAXOSDITEMS - 1);
-           lastOnScreen = last;
-           }
-        if (Setup.MenuScrollPage)
-           current = SpecialItem(lastOnScreen) ? lastOnScreen - 1 : lastOnScreen;
-        Display();
-        }
-     else
-        DisplayCurrent(true);
-     }
+  if (osdProvider)
+     return osdProvider->CreateOsd(Left, Top);
+  esyslog("ERROR: no OSD provider available - using dummy OSD!");
+  return new cOsd(Left, Top); // create a dummy cOsd, so that access won't result in a segfault
 }
 
-void cOsdMenu::PageUp(void)
+void cOsdProvider::Shutdown(void)
 {
-  current -= MAXOSDITEMS;
-  first -= MAXOSDITEMS;
-  if (first < 0)
-     first = current = 0;
-  if (SpecialItem(current)) {
-     current -= (current > 0) ? 1 : -1;
-     first = min(first, current - 1);
-     }
-  Display();
-  DisplayCurrent(true);
+  delete osdProvider;
+  osdProvider = NULL;
 }
 
-void cOsdMenu::PageDown(void) 
+// --- cTextScroller ---------------------------------------------------------
+
+cTextScroller::cTextScroller(void)
 {
-  current += MAXOSDITEMS;
-  first += MAXOSDITEMS;
-  int count = Count();
-  if (current > count - 1) {
-     current = count - 1;
-     first = max(0, count - MAXOSDITEMS);
-     }
-  if (SpecialItem(current)) {
-     current += (current < count - 1) ? 1 : -1;
-     first = max(first, current - MAXOSDITEMS);
-     }
-  Display();
-  DisplayCurrent(true);
+  osd = NULL;
+  left = top = width = height = 0;
+  font = NULL;
+  colorFg = 0;
+  colorBg = 0;
+  offset = 0;
+  shown = 0;
 }
 
-void cOsdMenu::Mark(void)
+cTextScroller::cTextScroller(cOsd *Osd, int Left, int Top, int Width, int Height, const char *Text, const cFont *Font, tColor ColorFg, tColor ColorBg)
 {
-  if (Count() && marked < 0) {
-     marked = current;
-     SetStatus(tr("Up/Dn for new location - OK to move"));
-     }
+  Set(Osd, Left, Top, Width, Height, Text, Font, ColorFg, ColorBg);
 }
 
-eOSState cOsdMenu::HotKey(eKeys Key)
+void cTextScroller::Set(cOsd *Osd, int Left, int Top, int Width, int Height, const char *Text, const cFont *Font, tColor ColorFg, tColor ColorBg)
 {
-  for (cOsdItem *item = First(); item; item = Next(item)) {
-      const char *s = item->Text();
-      if (s && (s = skipspace(s)) != NULL) {
-         if (*s == Key - k1 + '1') {
-            current = item->Index();
-            cRemote::Put(kOk, true);
-            break;
-            }
-         }
-      }
-  return osContinue;
+  osd = Osd;
+  left = Left;
+  top = Top;
+  width = Width;
+  height = Height;
+  font = Font;
+  colorFg = ColorFg;
+  colorBg = ColorBg;
+  offset = 0;
+  textWrapper.Set(Text, Font, Width);
+  shown = min(Total(), height / font->Height());
+  height = shown * font->Height(); // sets height to the actually used height, which may be less than Height
+  DrawText();
 }
 
-eOSState cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
+void cTextScroller::Reset(void)
 {
-  delete subMenu;
-  subMenu = SubMenu;
-  subMenu->Display();
-  return osContinue; // convenience return value
+  osd = NULL; // just makes sure it won't draw anything
 }
 
-eOSState cOsdMenu::CloseSubMenu()
+void cTextScroller::DrawText(void)
 {
-  delete subMenu;
-  subMenu = NULL;
-  RefreshCurrent();
-  Display();
-  return osContinue; // convenience return value
+  if (osd) {
+     for (int i = 0; i < shown; i++)
+          osd->DrawText(left, top + i * font->Height(), textWrapper.GetLine(offset + i), colorFg, colorBg, font, width);
+     }
 }
 
-eOSState cOsdMenu::ProcessKey(eKeys Key)
+void cTextScroller::Scroll(bool Up, bool Page)
 {
-  if (subMenu) {
-     eOSState state = subMenu->ProcessKey(Key);
-     if (state == osBack)
-        return CloseSubMenu();
-     return state;
+  if (Up) {
+     if (CanScrollUp()) {
+        offset -= Page ? shown : 1;
+        if (offset < 0)
+           offset = 0;
+        DrawText();
+        }
      }
-
-  cOsdItem *item = Get(current);
-  if (marked < 0 && item) {
-     eOSState state = item->ProcessKey(Key);
-     if (state != osUnknown)
-        return state;
+  else {
+     if (CanScrollDown()) {
+        offset += Page ? shown : 1;
+        if (offset + shown > Total())
+           offset = Total() - shown;
+        DrawText();
+        }
      }
-  switch (Key) {
-    case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
-    case kUp|k_Repeat:
-    case kUp:   CursorUp();   break;
-    case kDown|k_Repeat:
-    case kDown: CursorDown(); break;
-    case kLeft|k_Repeat:
-    case kLeft: PageUp(); break;
-    case kRight|k_Repeat:
-    case kRight: PageDown(); break;
-    case kBack: return osBack;
-    case kOk:   if (marked >= 0) {
-                   SetStatus(NULL);
-                   if (marked != current)
-                      Move(marked, current);
-                   marked = -1;
-                   break;
-                   }
-                // else run into default
-    default: if (marked < 0)
-                return osUnknown;
-    }
-  return osContinue;
 }
-
diff --git a/osd.h b/osd.h
index 3835b093f..2df875ed4 100644
--- a/osd.h
+++ b/osd.h
@@ -4,169 +4,349 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.40 2003/09/14 10:59:22 kls Exp $
+ * $Id: osd.h 1.41 2004/05/15 14:54:37 kls Exp $
  */
 
 #ifndef __OSD_H
 #define __OSD_H
 
-#if defined(DEBUG_OSD)
-#include <ncurses.h>
-#endif
-#include "config.h"
-#include "osdbase.h"
-#include "interface.h"
-#include "osdbase.h"
-#include "tools.h"
+#include <stdio.h>
+#include <stdint.h>
+#include "font.h"
 
-#define MAXOSDITEMS (Setup.OSDheight - 4)
+#define MAXNUMCOLORS 256
 
-enum eOSState { osUnknown,
-                osContinue,
-                osSchedule,
-                osChannels,
-                osTimers,
-                osRecordings,
-                osPlugin,
-                osSetup,
-                osCommands,
-                osPause,
-                osRecord,
-                osReplay,
-                osStopRecord,
-                osStopReplay,
-                osCancelEdit,
-                osSwitchDvb,
-                osBack,
-                osEnd,
-                os_User, // the following values can be used locally
-                osUser1,
-                osUser2,
-                osUser3,
-                osUser4,
-                osUser5,
-                osUser6,
-                osUser7,
-                osUser8,
-                osUser9,
-                osUser10,
-              };
+enum {
+                   //AARRGGBB
+  clrTransparent = 0x00000000,
+  clrGray50      = 0x7F000000, // 50% gray
+  clrBlack       = 0xFF000000,
+  clrRed         = 0xFFFC1414,
+  clrGreen       = 0xFF24FC24,
+  clrYellow      = 0xFFFCC024,
+  clrMagenta     = 0xFFB000FC,
+  clrBlue        = 0xFF0000FC,
+  clrCyan        = 0xFF00FCFC,
+  clrWhite       = 0xFFFCFCFC,
+  };
 
-class cOsd {
+enum eOsdError { oeOk,
+                 oeTooManyAreas,
+                 oeTooManyColors,
+                 oeBppNotSupported,
+                 oeAreasOverlap,
+                 oeWrongAlignment,
+                 oeOutOfMemory,
+                 oeUnknown,
+               };
+
+typedef uint32_t tColor;
+typedef uint8_t tIndex;
+
+class cPalette {
 private:
-  enum { charWidth  = 12, // average character width
-         lineHeight = 27  // smallest text height
-       };
-#ifdef DEBUG_OSD
-  static WINDOW *window;
-  enum { MaxColorPairs = 16 };
-  static int colorPairs[MaxColorPairs];
-  static void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
-#else
-  static cOsdBase *osd;
-#endif
-  static int cols, rows;
+  tColor color[MAXNUMCOLORS];
+  int bpp;
+  int maxColors, numColors;
+  bool modified;
+protected:
+  typedef tIndex tIndexes[MAXNUMCOLORS];
 public:
-  static void Initialize(void);
-  static void Shutdown(void);
-  static cOsdBase *OpenRaw(int x, int y);
-       // Returns a raw OSD without any predefined windows or colors.
-       // If the "normal" OSD is currently in use, NULL will be returned.
-       // The caller must delete this object before the "normal" OSD is used again!
-  static void Open(int w, int h);
-  static void Close(void);
-  static void Clear(void);
-  static void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
-  static void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  static void ClrEol(int x, int y, eDvbColor color = clrBackground);
-  static int CellWidth(void);
-  static int LineHeight(void);
-  static int Width(unsigned char c);
-  static int WidthInCells(const char *s);
-  static eDvbFont SetFont(eDvbFont Font);
-  static void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
-  static void Flush(void);
+  cPalette(int Bpp = 8);
+        ///< Initializes the palette with the given color depth.
+  int Bpp(void) { return bpp; }
+  void Reset(void);
+        ///< Resets the palette, making it contain no colors.
+  int Index(tColor Color);
+        ///< Returns the index of the given Color (the first color has index 0).
+        ///< If Color is not yet contained in this palette, it will be added if
+        ///< there is a free slot. If the color can't be added to this palette,
+        ///< 0 will be returned.
+  tColor Color(int Index) { return Index < maxColors ? color[Index] : 0; }
+        ///< Returns the color at the given Index. If Index is outside the valid
+        ///< range, 0 will be returned.
+  void SetBpp(int Bpp);
+        ///< Sets the color depth of this palette to the given value.
+        ///< The palette contents will be reset, so that it contains no colors.
+  void SetColor(int Index, tColor Color);
+        ///< Sets the palette entry at Index to Color. If Index is larger than
+        ///< the number of currently used entries in this palette, the entries
+        ///< in between will have undefined values.
+  const tColor *Colors(int &NumColors);
+        ///< Returns a pointer to the complete color table and stores the
+        ///< number of valid entries in NumColors. If no colors have been
+        ///< stored yet, NumColors will be set to 0 and the function will
+        ///< return NULL.
+  void Take(const cPalette &Palette, tIndexes *Indexes = NULL, tColor ColorFg = 0, tColor ColorBg = 0);
+        ///< Takes the colors from the given Palette and adds them to this palette,
+        ///< using existing entries if possible. If Indexes is given, it will be
+        ///< filled with the index values that each color of Palette has in this
+        ///< palette. If either of ColorFg or ColorBg is not zero, the first color
+        ///< in Palette will be taken as ColorBg, and the second color will become
+        ///< ColorFg.
   };
 
-class cOsdItem : public cListObject {
+enum eTextAlignment { taCenter  = 0x00,
+                      taLeft    = 0x01,
+                      taRight   = 0x02,
+                      taTop     = 0x04,
+                      taBottom  = 0x08,
+                      taDefault = taTop | taLeft
+                    };
+
+class cBitmap : public cPalette {
 private:
-  char *text;
-  int offset;
-  eOSState state;
-protected:
-  bool fresh;
-  bool userColor;
-  eDvbColor fgColor, bgColor;
+  tIndex *bitmap;
+  int x0, y0;
+  int width, height;
+  int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
+public:
+  cBitmap(int Width, int Height, int Bpp, int X0 = 0, int Y0 = 0);
+       ///< Creates a bitmap with the given Width, Height and color depth (Bpp).
+       ///< X0 and Y0 define the offset at which this bitmap will be located on the OSD.
+       ///< All coordinates given in the other functions will be relative to
+       ///< this offset (unless specified otherwise).
+  cBitmap(const char *FileName);
+       ///< Creates a bitmap and loads an XPM image from the given file.
+  cBitmap(char *Xpm[]);
+       ///< Creates a bitmap from the given XPM data.
+  virtual ~cBitmap();
+  int X0(void) const { return x0; }
+  int Y0(void) const { return y0; }
+  int Width(void) const { return width; }
+  int Height(void) const { return height; }
+  void SetSize(int Width, int Height);
+       ///< Sets the size of this bitmap to the given values. Any previous
+       ///< contents of the bitmap will be lost. If Width and Height are the same
+       ///< as the current values, nothing will happen and the bitmap remains
+       ///< unchanged.
+  bool Contains(int x, int y) const;
+       ///< Returns true if this bitmap contains the point (x, y).
+  bool Intersects(int x1, int y1, int x2, int y2) const;
+       ///< Returns true if this bitmap intersects with the rectangle
+       ///< defined by the given coordinates.
+  bool Dirty(int &x1, int &y1, int &x2, int &y2);
+       ///< Tells whether there is a dirty area and returns the bounding
+       ///< rectangle of that area (relative to the bitmaps origin).
+  void Clean(void);
+       ///< Marks the dirty area as clean.
+  bool LoadXpm(const char *FileName);
+       ///< Calls SetXpm() with the data from the file FileName.
+       ///< Returns true if the operation was successful.
+  bool SetXpm(char *Xpm[]);
+       ///< Sets this bitmap to the given XPM data. Any previous bitmap or
+       ///< palette data will be overwritten with the new data.
+       ///< Returns true if the operation was successful.
+  void SetIndex(int x, int y, tIndex Index);
+       ///< Sets the index at the given coordinates to Index.
+       ///< Coordinates are relative to the bitmap's origin.
+  void DrawPixel(int x, int y, tColor Color);
+       ///< Sets the pixel at the given coordinates to the given Color, which is
+       ///< a full 32 bit ARGB value.
+       ///< If the coordinates are outside the bitmap area, no pixel will be set.
+  void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0);
+       ///< Sets the pixels in this bitmap with the data from the given
+       ///< Bitmap, putting the upper left corner of the Bitmap at (x, y).
+       ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
+       ///< will be mapped to ColorBg and the second palette entry will be mapped to
+       ///< ColorFg (palette indexes are defined so that 0 is the background and
+       ///< 1 is the foreground color).
+  void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
+       ///< Draws the given string at coordinates (x, y) with the given foreground
+       ///< and background color and font. If Width and Height are given, the text
+       ///< will be drawn into a rectangle with the given size and the given
+       ///< Alignment (default is top-left).
+  void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
+       ///< Draws a filled rectangle defined by the upper left (x1, y1) and lower right
+       ///< (x2, y2) corners with the given Color. If the rectangle covers the entire
+       ///< bitmap area, the color palette will be reset, so that new colors can be
+       ///< used for drawing.
+  void DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants = 0);
+       ///< Draws a filled ellipse defined by the upper left (x1, y1) and lower right
+       ///< (x2, y2) corners with the given Color. Quadrants controls which parts of
+       ///< the ellipse are actually drawn:
+       ///< 0       draws the entire ellipse
+       ///< 1..4    draws only the first, second, third or fourth quadrant, respectively
+       ///< 5..8    draws the right, top, left or bottom half, respectively
+       ///< -1..-8  draws the inverted part of the given quadrant(s)
+       ///< If Quadrants is not 0, the coordinates are those of the actual area, not
+       ///< the full circle!
+  void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
+       ///< Draws a "slope" into the rectangle defined by the upper left (x1, y1) and
+       ///< lower right (x2, y2) corners with the given Color. Type controls the
+       ///< direction of the slope and which side of it will be drawn:
+       ///< 0: horizontal, rising,  lower
+       ///< 1: horizontal, rising,  upper
+       ///< 2: horizontal, falling, lower
+       ///< 3: horizontal, falling, upper
+       ///< 4: vertical,   rising,  lower
+       ///< 5: vertical,   rising,  upper
+       ///< 6: vertical,   falling, lower
+       ///< 7: vertical,   falling, upper
+  const tIndex *Data(int x, int y);
+       ///< Returns the address of the index byte at the given coordinates.
+  };
+
+struct tArea {
+  int x1, y1, x2, y2;
+  int bpp;
+  int Width(void) const { return x2 - x1 + 1; }
+  int Height(void) const { return y2 - y1 + 1; }
+  bool Intersects(const tArea &Area) const { return !(x2 < Area.x1 || x1 > Area.x2 || y2 < Area.y1 || y1 > Area.y2); }
+  };
+
+#define MAXOSDAREAS 16
+
+class cOsd {
+private:
+  static bool isOpen;
+  cBitmap *savedRegion;
+  cBitmap *bitmaps[MAXOSDAREAS];
+  int numBitmaps;
+  int left, top, width, height;
 public:
-  cOsdItem(eOSState State = osUnknown);
-  cOsdItem(const char *Text, eOSState State = osUnknown);
-  virtual ~cOsdItem();
-  bool HasUserColor(void) { return userColor; }
-  void SetText(const char *Text, bool Copy = true);
-  void SetColor(eDvbColor FgColor, eDvbColor BgColor = clrBackground);
-  const char *Text(void) { return text; }
-  virtual void Display(int Offset = -1, eDvbColor FgColor = clrWhite, eDvbColor BgColor = clrBackground);
-  virtual void Set(void) {}
-  virtual eOSState ProcessKey(eKeys Key);
+  cOsd(int Left, int Top);
+       ///< Initializes the OSD with the given coordinates.
+       ///< By default it is assumed that the full area will be able to display
+       ///< full 32 bit graphics (ARGB with eight bit for each color and the alpha
+       ///< value, repectively). However, the actual hardware in use may not be
+       ///< able to display such a high resolution OSD, so there is an option to
+       ///< divide the full OSD area into several sub-areas with lower color depths
+       ///< and individual palettes. The sub-areas need not necessarily cover the
+       ///< entire OSD area, but only the OSD area actually covered by sub-areas
+       ///< will be available for drawing.
+       ///< At least one area must be defined in order to set the actual width and
+       ///< height of the OSD. Also, the caller must first try to use an area that
+       ///< consists of only one sub-area that covers the entire drawing space,
+       ///< and should require only the minimum necessary color depth. This is
+       ///< because a derived cOsd class may or may not be able to handle more
+       ///< than one area.
+  virtual ~cOsd();
+       ///< Shuts down the OSD.
+  static bool IsOpen(void) { return isOpen; }
+  int Left(void) { return left; }
+  int Top(void) { return top; }
+  int Width(void) { return width; }
+  int Height(void) { return height; }
+  cBitmap *GetBitmap(int Area);
+       ///< Returns a pointer to the bitmap for the given Area, or NULL if no
+       ///< such bitmap exists.
+  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+       ///< Checks whether the OSD can display the given set of sub-areas.
+       ///< The return value indicates whether a call to SetAreas() with this
+       ///< set of areas will succeed. CanHandleAreas() may be called with an
+       ///< OSD that is already in use with other areas and will not interfere
+       ///< with the current operation of the OSD.
+       ///< A derived class must first call the base class CanHandleAreas()
+       ///< to check the basic conditions, like not overlapping etc.
+  virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
+       ///< Sets the sub-areas to the given areas.
+       ///< The return value indicates whether the operation was successful.
+       ///< If an error is reported, nothing will have changed and the previous
+       ///< OSD (if any) will still be displayed as before.
+       ///< If the OSD has been divided into several sub-areas, all areas that
+       ///< are part of the rectangle that surrounds a given drawing operation
+       ///< will be drawn into, with the proper offsets.
+  virtual void SaveRegion(int x1, int y1, int x2, int y2);
+       ///< Saves the region defined by the given coordinates for later restoration
+       ///< through RestoreRegion(). Only one saved region can be active at any
+       ///< given time.
+  virtual void RestoreRegion(void);
+       ///< Restores the region previously saved by a call to SaveRegion().
+       ///< If SaveRegion() has not been called before, nothing will happen.
+  virtual eOsdError SetPalette(const cPalette &Palette, int Area);
+       ///< Sets the Palette for the given Area (the first area is numbered 0).
+  virtual void DrawPixel(int x, int y, tColor Color);
+       ///< Sets the pixel at the given coordinates to the given Color, which is
+       ///< a full 32 bit ARGB value.
+       ///< If the OSD area has been divided into separate sub-areas, and the
+       ///< given coordinates don't fall into any of these sub-areas, no pixel will
+       ///< be set.
+  virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0);
+       ///< Sets the pixels in the OSD with the data from the given
+       ///< Bitmap, putting the upper left corner of the Bitmap at (x, y).
+       ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
+       ///< will be mapped to ColorBg and the second palette entry will be mapped to
+       ///< ColorFg (palette indexes are defined so that 0 is the background and
+       ///< 1 is the foreground color).
+  virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
+       ///< Draws the given string at coordinates (x, y) with the given foreground
+       ///< and background color and font. If Width and Height are given, the text
+       ///< will be drawn into a rectangle with the given size and the given
+       ///< Alignment (default is top-left).
+  virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
+       ///< Draws a filled rectangle defined by the upper left (x1, y1) and lower right
+       ///< (x2, y2) corners with the given Color.
+  virtual void DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants = 0);
+       ///< Draws a filled ellipse defined by the upper left (x1, y1) and lower right
+       ///< (x2, y2) corners with the given Color. Quadrants controls which parts of
+       ///< the ellipse are actually drawn:
+       ///< 0       draws the entire ellipse
+       ///< 1..4    draws only the first, second, third or fourth quadrant, respectively
+       ///< 5..8    draws the right, top, left or bottom half, respectively
+       ///< -1..-8  draws the inverted part of the given quadrant(s)
+       ///< If Quadrants is not 0, the coordinates are those of the actual area, not
+       ///< the full circle!
+  void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
+       ///< Draws a "slope" into the rectangle defined by the upper left (x1, y1) and
+       ///< lower right (x2, y2) corners with the given Color. Type controls the
+       ///< direction of the slope and which side of it will be drawn:
+       ///< 0: horizontal, rising,  lower
+       ///< 1: horizontal, rising,  upper
+       ///< 2: horizontal, falling, lower
+       ///< 3: horizontal, falling, upper
+       ///< 4: vertical,   rising,  lower
+       ///< 5: vertical,   rising,  upper
+       ///< 6: vertical,   falling, lower
+       ///< 7: vertical,   falling, upper
+  virtual void Flush(void);
+       ///< Actually commits all data to the OSD hardware.
   };
 
-class cOsdObject {
-  friend class cOsdMenu;
+class cOsdProvider {
 private:
-  bool isMenu;
+  static cOsdProvider *osdProvider;
 protected:
-  bool needsFastResponse;
+  virtual cOsd *CreateOsd(int Left, int Top) = 0;
+      ///< Returns a pointer to a newly created cOsd object, which will be located
+      ///< at the given coordinates.
 public:
-  cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
-  virtual ~cOsdObject() {}
-  int Width(void) { return Interface->Width(); }
-  int Height(void) { return Interface->Height(); }
-  bool NeedsFastResponse(void) { return needsFastResponse; }
-  bool IsMenu(void) { return isMenu; }
-  virtual void Show(void) {}
-  virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
+  cOsdProvider(void);
+      //XXX maybe parameter to make this one "sticky"??? (frame-buffer etc.)
+  virtual ~cOsdProvider();
+  static cOsd *NewOsd(int Left, int Top);
+      ///< Returns a pointer to a newly created cOsd object, which will be located
+      ///< at the given coordinates. When the cOsd object is no longer needed, the
+      ///< caller must delete it.
+  static void Shutdown(void);
+      ///< Shuts down the OSD provider facility by deleting the current OSD provider.
   };
 
-class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
+class cTextScroller {
 private:
-  char *title;
-  int cols[cInterface::MaxCols];
-  int first, current, marked;
-  cOsdMenu *subMenu;
-  const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
-  char *status;
-  int digit;
-  bool hasHotkeys;
-protected:
-  bool visible;
-  const char *hk(const char *s);
-  void SetHasHotkeys(void);
-  virtual void Clear(void);
-  bool SpecialItem(int idx);
-  void SetCurrent(cOsdItem *Item);
-  void RefreshCurrent(void);
-  void DisplayCurrent(bool Current);
-  void CursorUp(void);
-  void CursorDown(void);
-  void PageUp(void);
-  void PageDown(void);
-  void Mark(void);
-  eOSState HotKey(eKeys Key);
-  eOSState AddSubMenu(cOsdMenu *SubMenu);
-  eOSState CloseSubMenu();
-  bool HasSubMenu(void) { return subMenu; }
-  void SetStatus(const char *s);
-  void SetTitle(const char *Title, bool ShowDate = true);
-  void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
-  virtual void Del(int Index);
+  cOsd *osd;
+  int left, top, width, height;
+  const cFont *font;
+  tColor colorFg, colorBg;
+  int offset, shown;
+  cTextWrapper textWrapper;
+  void DrawText(void);
 public:
-  cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
-  virtual ~cOsdMenu();
-  int Current(void) { return current; }
-  void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
-  void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
-  virtual void Display(void);
-  virtual eOSState ProcessKey(eKeys Key);
+  cTextScroller(void);
+  cTextScroller(cOsd *Osd, int Left, int Top, int Width, int Height, const char *Text, const cFont *Font, tColor ColorFg, tColor ColorBg);
+  void Set(cOsd *Osd, int Left, int Top, int Width, int Height, const char *Text, const cFont *Font, tColor ColorFg, tColor ColorBg);
+  void Reset(void);
+  int Left(void) { return left; }
+  int Top(void) { return top; }
+  int Width(void) { return width; }
+  int Height(void) { return height; }
+  int Total(void) { return textWrapper.Lines(); }
+  int Offset(void) { return offset; }
+  int Shown(void) { return shown; }
+  bool CanScroll(void) { return CanScrollUp() || CanScrollDown(); }
+  bool CanScrollUp(void) { return offset > 0; }
+  bool CanScrollDown(void) { return offset + shown < Total(); }
+  void Scroll(bool Up, bool Page);
   };
 
 #endif //__OSD_H
diff --git a/osdbase.c b/osdbase.c
index 71794068c..08aef965d 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,495 +4,410 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.12 2004/01/31 10:31:13 kls Exp $
+ * $Id: osdbase.c 1.13 2004/05/01 10:51:43 kls Exp $
  */
 
 #include "osdbase.h"
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/unistd.h>
-#include "tools.h"
+#include <string.h>
+#include "device.h"
+#include "i18n.h"
+#include "remote.h"
+#include "status.h"
 
-// --- cPalette --------------------------------------------------------------
+// --- cOsdItem --------------------------------------------------------------
 
-cPalette::cPalette(int Bpp)
+cOsdItem::cOsdItem(eOSState State)
 {
-  maxColors = 1 << Bpp;
-  numColors = 0;
-  full = false;
+  text = NULL;
+  offset = -1;
+  state = State;
+  selectable = true;
+  fresh = true;
 }
 
-void cPalette::SetColor(int Index, eDvbColor Color)
+cOsdItem::cOsdItem(const char *Text, eOSState State)
 {
-  if (Index < maxColors) {
-     if (numColors < Index)
-        numColors = Index + 1;
-     used[Index] = true;
-     color[Index] = Color;
-     fetched[Index] = false;
-     }
+  text = NULL;
+  offset = -1;
+  state = State;
+  selectable = true;
+  fresh = true;
+  SetText(Text);
 }
 
-int cPalette::Index(eDvbColor Color)
+cOsdItem::~cOsdItem()
 {
-#if __BYTE_ORDER == __BIG_ENDIAN
-  Color = eDvbColor(((Color & 0xFF) << 24) | ((Color & 0xFF00) << 8) | ((Color & 0xFF0000) >> 8) | ((Color & 0xFF000000) >> 24));
-#endif
-  for (int i = 0; i < numColors; i++) {
-      if (color[i] == Color) {
-         used[i] = true;
-         return i;
-         }
-      }
-  if (!full) {
-     if (numColors < maxColors) {
-        color[numColors++] = Color;
-        used[numColors - 1] = true;
-        fetched[numColors - 1] = false;
-        return numColors - 1;
-        }
-     for (int i = maxColors; --i >= 0; ) {
-         if (!used[i]) {
-            color[i] = Color;
-            used[i] = true;
-            fetched[i] = false;
-            return i;
-            }
-         }
-     esyslog("ERROR: too many different colors used in palette");
-     full = true;
-     }
-  return 0;
+  free(text);
 }
 
-void cPalette::Reset(void)
+void cOsdItem::SetText(const char *Text, bool Copy)
 {
-  for (int i = 0; i < numColors; i++)
-      used[i] = fetched[i] = false;
-  full = false;
+  free(text);
+  text = Copy ? strdup(Text) : (char *)Text; // text assumes ownership!
 }
 
-const eDvbColor *cPalette::NewColors(int &FirstColor, int &LastColor)
+void cOsdItem::SetSelectable(bool Selectable)
 {
-  for (FirstColor = 0; FirstColor < numColors; FirstColor++) {
-      if (!fetched[FirstColor]) {
-         for (LastColor = FirstColor; LastColor < numColors && !fetched[LastColor]; LastColor++)
-             fetched[LastColor] = true;
-         LastColor--; // the loop ended one past the last one!
-         return &color[FirstColor];
-         }
-      }
-  return NULL;
+  selectable = Selectable;
 }
 
-const eDvbColor *cPalette::AllColors(int &NumColors)
+void cOsdItem::SetFresh(bool Fresh)
 {
-  NumColors = numColors;
-  return numColors ? color : NULL;
+  fresh = Fresh;
 }
 
-void cPalette::Take(const cPalette &Palette, tIndexes *Indexes)
+eOSState cOsdItem::ProcessKey(eKeys Key)
 {
-  for (int i = 0; i < Palette.numColors; i++) {
-      if (Palette.used[i]) {
-         int n = Index(Palette.color[i]);
-         if (Indexes)
-            (*Indexes)[i] = n;
-         }
-      }
+  return Key == kOk ? state : osUnknown;
 }
 
-// --- cBitmap ---------------------------------------------------------------
+// --- cOsdMenu --------------------------------------------------------------
 
-cBitmap::cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground)
-:cPalette(Bpp)
-{
-  width = Width;
-  height = Height;
-  clearWithBackground = ClearWithBackground;
-  bitmap = NULL;
-  fontType = fontOsd;
-  font = NULL;
-  if (width > 0 && height > 0) {
-     bitmap = MALLOC(u_char, width * height);
-     if (bitmap) {
-        Clean();
-        memset(bitmap, 0x00, width * height);
-        SetFont(fontOsd);
-        }
-     else
-        esyslog("ERROR: can't allocate bitmap!");
-     }
-  else
-     esyslog("ERROR: illegal bitmap parameters (%d, %d)!", width, height);
-}
+cSkinDisplayMenu *cOsdMenu::displayMenu = NULL;
+int cOsdMenu::displayMenuCount = 0;
+int cOsdMenu::displayMenuItems = 0;//XXX dynamic???
 
-cBitmap::~cBitmap()
+cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
-  free(bitmap);
-}
-
-eDvbFont cBitmap::SetFont(eDvbFont Font)
-{
-  eDvbFont oldFont = fontType;
-  if (fontType != Font || !font) {
-     font = cFont::GetFont(Font);
-     fontType = Font;
+  isMenu = true;
+  digit = 0;
+  hasHotkeys = false;
+  title = NULL;
+  SetTitle(Title);
+  cols[0] = c0;
+  cols[1] = c1;
+  cols[2] = c2;
+  cols[3] = c3;
+  cols[4] = c4;
+  first = 0;
+  current = marked = -1;
+  subMenu = NULL;
+  helpRed = helpGreen = helpYellow = helpBlue = NULL;
+  status = NULL;
+  if (!displayMenuCount++) {
+     displayMenu = Skins.Current()->DisplayMenu();
+     displayMenuItems = displayMenu->MaxItems();
      }
-  return oldFont;
 }
 
-bool cBitmap::Dirty(int &x1, int &y1, int &x2, int &y2)
+cOsdMenu::~cOsdMenu()
 {
-  if (dirtyX2 >= 0) {
-     //XXX Workaround: apparently the bitmap sent to the driver always has to be a multiple
-     //XXX of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
-     //TODO Fix driver (should be able to handle any size bitmaps!)
-     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && ((dirtyX2 - dirtyX1) & 7) != 7) {
-           if (dirtyX2 < width - 1)
-              dirtyX2++;
-           else if (dirtyX1 > 0)
-              dirtyX1--;
-           }
-     //XXX "... / 2" <==> Bpp???
-     while ((dirtyY1 > 0 || dirtyY2 < height - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
-           if (dirtyY2 < height - 1)
-              dirtyY2++;
-           else if (dirtyY1 > 0)
-              dirtyY1--;
-           }
-     while ((dirtyX1 > 0 || dirtyX2 < width - 1) && (((dirtyX2 - dirtyX1 + 1) * (dirtyY2 - dirtyY1 + 1) / 2) & 7) != 0) {
-           if (dirtyX2 < width - 1)
-              dirtyX2++;
-           else if (dirtyX1 > 0)
-              dirtyX1--;
-           }
-     x1 = dirtyX1;
-     y1 = dirtyY1;
-     x2 = dirtyX2;
-     y2 = dirtyY2;
-     return true;
-     }
-  return false;
-}
-
-void cBitmap::Clean(void)
-{
-  dirtyX1 = width;
-  dirtyY1 = height;
-  dirtyX2 = -1;
-  dirtyY2 = -1;
+  free(title);
+  delete subMenu;
+  free(status);
+  displayMenu->Clear();
+  cStatus::MsgOsdClear();
+  if (!--displayMenuCount)
+     DELETENULL(displayMenu);
 }
 
-void cBitmap::SetIndex(int x, int y, u_char Index)
+const char *cOsdMenu::hk(const char *s)
 {
-  if (bitmap) {
-     if (0 <= x && x < width && 0 <= y && y < height) {
-        if (bitmap[width * y + x] != Index) {
-           bitmap[width * y + x] = Index;
-           if (dirtyX1 > x)  dirtyX1 = x;
-           if (dirtyY1 > y)  dirtyY1 = y;
-           if (dirtyX2 < x)  dirtyX2 = x;
-           if (dirtyY2 < y)  dirtyY2 = y;
-           }
+  static char buffer[64];
+  if (s && hasHotkeys) {
+     if (digit == 0 && '1' <= *s && *s <= '9' && *(s + 1) == ' ')
+        digit = -1; // prevents automatic hotkeys - input already has them
+     if (digit >= 0) {
+        digit++;
+        snprintf(buffer, sizeof(buffer), " %c %s", (digit < 10) ? '0' + digit : ' ' , s);
+        s = buffer;
         }
      }
+  return s;
 }
 
-void cBitmap::SetPixel(int x, int y, eDvbColor Color)
+void cOsdMenu::SetHasHotkeys(void)
 {
-  SetIndex(x, y, Index(Color));
+  hasHotkeys = true;
+  digit = 0;
 }
 
-void cBitmap::SetBitmap(int x, int y, const cBitmap &Bitmap)
+void cOsdMenu::SetStatus(const char *s)
 {
-  if (bitmap && Bitmap.bitmap) {
-     tIndexes Indexes;
-     Take(Bitmap, &Indexes);
-     for (int ix = 0; ix < Bitmap.width; ix++) {
-         for (int iy = 0; iy < Bitmap.height; iy++)
-             SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
-         }
-     }
+  free(status);
+  status = s ? strdup(s) : NULL;
+  displayMenu->SetMessage(mtStatus, s);
 }
 
-int cBitmap::Width(unsigned char c)
+void cOsdMenu::SetTitle(const char *Title)
 {
-  return font ? font->Width(c) : -1;
+  free(title);
+  title = strdup(Title);
 }
 
-int cBitmap::Width(const char *s)
+void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
-  return font ? font->Width(s) : -1;
+  // strings are NOT copied - must be constants!!!
+  helpRed    = Red;
+  helpGreen  = Green;
+  helpYellow = Yellow;
+  helpBlue   = Blue;
+  displayMenu->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
+  cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
 }
 
-void cBitmap::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
+void cOsdMenu::Del(int Index)
 {
-  if (bitmap) {
-     u_char fg = Index(ColorFg);
-     u_char bg = Index(ColorBg);
-     int h = font->Height(s);
-     while (s && *s) {
-           const cFont::tCharData *CharData = font->CharData(*s++);
-           if (int(x + CharData->width) > width)
-              break;
-           for (int row = 0; row < h; row++) {
-               cFont::tPixelData PixelData = CharData->lines[row];
-               for (int col = CharData->width; col-- > 0; ) {
-                   SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
-                   PixelData >>= 1;
-                   }
-               }
-           x += CharData->width;
-           }
-     }
+  cList<cOsdItem>::Del(Get(Index));
+  if (current == Count())
+     current--;
+  if (Index == first && first > 0)
+     first--;
 }
 
-void cBitmap::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
-{
-  if (bitmap) {
-     u_char c = Index(Color);
-     for (int y = y1; y <= y2; y++)
-         for (int x = x1; x <= x2; x++)
-             SetIndex(x, y, c);
-     }
-}
-
-void cBitmap::Clear(void)
-{
-  Reset();
-  if (clearWithBackground)
-     Fill(0, 0, width - 1, height - 1, clrBackground);
-}
-
-const u_char *cBitmap::Data(int x, int y)
-{
-  return &bitmap[y * width + x];
-}
-
-// --- cWindow ---------------------------------------------------------------
-
-cWindow::cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
-:cBitmap(w, h, Bpp, ClearWithBackground)
+void cOsdMenu::Add(cOsdItem *Item, bool Current, cOsdItem *After)
 {
-  handle = Handle;
-  x0 = x;
-  y0 = y;
-  bpp = Bpp;
-  tiled = Tiled;
-  shown = false;
+  cList<cOsdItem>::Add(Item, After);
+  if (Current)
+     current = Item->Index();
 }
 
-bool cWindow::Contains(int x, int y)
+void cOsdMenu::Ins(cOsdItem *Item, bool Current, cOsdItem *Before)
 {
-  x -= x0;
-  y -= y0;
-  return x >= 0 && y >= 0 && x < width && y < height;
+  cList<cOsdItem>::Ins(Item, Before);
+  if (Current)
+     current = Item->Index();
 }
 
-void cWindow::Relocate(int x, int y)
+void cOsdMenu::Display(void)
 {
-  x0 = x;
-  y0 = y;
+  if (subMenu) {
+     subMenu->Display();
+     return;
+     }
+  displayMenu->Clear();
+  cStatus::MsgOsdClear();
+  displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
+  displayMenu->SetTitle(title);
+  cStatus::MsgOsdTitle(title);
+  displayMenu->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
+  cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
+  int count = Count();
+  if (count > 0) {
+     int ni = 0;
+     for (cOsdItem *item = First(); item; item = Next(item))
+         cStatus::MsgOsdItem(item->Text(), ni++);
+     if (current < 0)
+        current = 0; // just for safety - there HAS to be a current item!
+     if (current - first >= displayMenuItems || current < first) {
+        first = current - displayMenuItems / 2;
+        if (first + displayMenuItems > count)
+           first = count - displayMenuItems;
+        if (first < 0)
+           first = 0;
+        }
+     int i = first;
+     int n = 0;
+     for (cOsdItem *item = Get(first); item; item = Next(item)) {
+         displayMenu->SetItem(item->Text(), i - first, i == current, item->Selectable());
+         if (i == current)
+            cStatus::MsgOsdCurrentItem(item->Text());
+         if (++n == displayMenuItems)
+            break;
+         i++;
+         }
+     }
+  if (!isempty(status))
+     displayMenu->SetMessage(mtStatus, status);
 }
 
-void cWindow::Fill(int x1, int y1, int x2, int y2, eDvbColor Color)
+void cOsdMenu::SetCurrent(cOsdItem *Item)
 {
-  if (tiled) {
-     x1 -= x0;
-     y1 -= y0;
-     x2 -= x0;
-     y2 -= y0;
-     }
-  cBitmap::Fill(x1, y1, x2, y2, Color);
+  current = Item ? Item->Index() : -1;
 }
 
-void cWindow::SetBitmap(int x, int y, const cBitmap &Bitmap)
+void cOsdMenu::RefreshCurrent(void)
 {
-  if (tiled) {
-     x -= x0;
-     y -= y0;
-     }
-  cBitmap::SetBitmap(x, y, Bitmap);
+  cOsdItem *item = Get(current);
+  if (item)
+     item->Set();
 }
 
-void cWindow::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg)
+void cOsdMenu::DisplayCurrent(bool Current)
 {
-  if (tiled) {
-     x -= x0;
-     y -= y0;
+  cOsdItem *item = Get(current);
+  if (item) {
+     displayMenu->SetItem(item->Text(), current - first, Current, item->Selectable());
+     if (Current)
+        cStatus::MsgOsdCurrentItem(item->Text());
+     if (!Current)
+        item->SetFresh(true); // leaving the current item resets 'fresh'
      }
-  cBitmap::Text(x, y, s, ColorFg, ColorBg);
 }
 
-const u_char *cWindow::Data(int x, int y)
+void cOsdMenu::Clear(void)
 {
-  return cBitmap::Data(x, y);
+  first = 0;
+  current = marked = -1;
+  cList<cOsdItem>::Clear();
 }
 
-// --- cOsdBase --------------------------------------------------------------
-
-cOsdBase::cOsdBase(int x, int y)
+bool cOsdMenu::SelectableItem(int idx)
 {
-  numWindows = 0;
-  x0 = x;
-  y0 = y;
+  cOsdItem *item = Get(idx);
+  return item && item->Selectable();
 }
 
-cOsdBase::~cOsdBase()
+void cOsdMenu::CursorUp(void)
 {
-  for (int i = 0; i < numWindows; i++)
-      delete window[i];
+  if (current > 0) {
+     int tmpCurrent = current;
+     while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent));
+     if (tmpCurrent < 0)
+        return;
+     if (tmpCurrent >= first)
+        DisplayCurrent(false);
+     current = tmpCurrent;
+     if (current < first) {
+        first = first > displayMenuItems - 1 ? first - (displayMenuItems - 1) : 0;
+        if (Setup.MenuScrollPage)
+           current = !SelectableItem(first) ? first + 1 : first;
+        Display();
+        }
+     else
+        DisplayCurrent(true);
+     }
 }
 
-tWindowHandle cOsdBase::Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
-{
-  if (numWindows < MAXNUMWINDOWS) {
-     if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
-        if ((w & 0x03) != 0) {
-           w += 4 - (w & 0x03);
-           dsyslog("OSD window width must be a multiple of 4 - increasing to %d", w);
+void cOsdMenu::CursorDown(void)
+{
+  int last = Count() - 1;
+  int lastOnScreen = first + displayMenuItems - 1;
+
+  if (current < last) {
+     int tmpCurrent = current;
+     while (++tmpCurrent <= last && !SelectableItem(tmpCurrent));
+     if (tmpCurrent > last)
+        return;
+     if (tmpCurrent <= lastOnScreen)
+        DisplayCurrent(false);
+     current = tmpCurrent;
+     if (current > lastOnScreen) {
+        first += displayMenuItems - 1;
+        lastOnScreen = first + displayMenuItems - 1;
+        if (lastOnScreen > last) {
+           first = last - (displayMenuItems - 1);
+           lastOnScreen = last;
            }
-        cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
-        if (OpenWindow(win)) {
-           window[win->Handle()] = win;
-           numWindows++;
-           return win->Handle();
-           }
-        else
-           delete win;
+        if (Setup.MenuScrollPage)
+           current = !SelectableItem(lastOnScreen) ? lastOnScreen - 1 : lastOnScreen;
+        Display();
         }
      else
-        esyslog("ERROR: illegal OSD parameters");
+        DisplayCurrent(true);
      }
-  else
-     esyslog("ERROR: too many OSD windows");
-  return -1;
 }
 
-void cOsdBase::AddColor(eDvbColor Color, tWindowHandle Window)
+void cOsdMenu::PageUp(void)
 {
-  cWindow *w = GetWindow(Window);
-  if (w) {
-     w->Index(Color);
-     w->Reset();
+  current -= displayMenuItems;
+  first -= displayMenuItems;
+  if (first < 0)
+     first = current = 0;
+  if (!SelectableItem(current)) {
+     current -= (current > 0) ? 1 : -1;
+     first = min(first, current - 1);
      }
+  Display();
+  DisplayCurrent(true);
 }
 
-cWindow *cOsdBase::GetWindow(int x, int y)
-{
-  for (int i = 0; i < numWindows; i++) {
-      if (window[i]->Tiled() && window[i]->Contains(x, y))
-         return window[i];
-      }
-  return NULL;
-}
-
-cWindow *cOsdBase::GetWindow(tWindowHandle Window)
-{
-  if (0 <= Window && Window < numWindows)
-     return window[Window];
-  if (Window == LAST_CREATED_WINDOW && numWindows > 0)
-     return window[numWindows - 1];
-  return NULL;
-}
-
-void cOsdBase::Flush(void)
-{
-  for (int i = 0; i < numWindows; i++) {
-      CommitWindow(window[i]);
-      window[i]->Clean();
-      }
-  // Showing the windows in a separate loop to avoid seeing them come up one after another
-  for (int i = 0; i < numWindows; i++) {
-      if (!window[i]->Shown())
-         ShowWindow(window[i]);
-      }
-}
-
-void cOsdBase::Clear(tWindowHandle Window)
+void cOsdMenu::PageDown(void) 
 {
-  if (Window == ALL_TILED_WINDOWS || Window == ALL_WINDOWS) {
-     for (int i = 0; i < numWindows; i++)
-         if (Window == ALL_WINDOWS || window[i]->Tiled())
-            window[i]->Clear();
+  current += displayMenuItems;
+  first += displayMenuItems;
+  int count = Count();
+  if (current > count - 1) {
+     current = count - 1;
+     first = max(0, count - displayMenuItems);
      }
-  else {
-     cWindow *w = GetWindow(Window);
-     if (w)
-        w->Clear();
+  if (!SelectableItem(current)) {
+     current += (current < count - 1) ? 1 : -1;
+     first = max(first, current - displayMenuItems);
      }
+  Display();
+  DisplayCurrent(true);
 }
 
-void cOsdBase::Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window)
-{
-  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x1, y1) : GetWindow(Window);
-  if (w)
-     w->Fill(x1, y1, x2, y2, Color);
-}
-
-void cOsdBase::SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window)
+void cOsdMenu::Mark(void)
 {
-  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
-  if (w)
-     w->SetBitmap(x, y, Bitmap);
+  if (Count() && marked < 0) {
+     marked = current;
+     SetStatus(tr("Up/Dn for new location - OK to move"));
+     }
 }
 
-int cOsdBase::Width(unsigned char c)
+eOSState cOsdMenu::HotKey(eKeys Key)
 {
-  return numWindows ? window[0]->Width(c) : 0;
+  for (cOsdItem *item = First(); item; item = Next(item)) {
+      const char *s = item->Text();
+      if (s && (s = skipspace(s)) != NULL) {
+         if (*s == Key - k1 + '1') {
+            current = item->Index();
+            cRemote::Put(kOk, true);
+            break;
+            }
+         }
+      }
+  return osContinue;
 }
 
-int cOsdBase::Width(const char *s)
+eOSState cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
 {
-  return numWindows ? window[0]->Width(s) : 0;
+  delete subMenu;
+  subMenu = SubMenu;
+  subMenu->Display();
+  return osContinue; // convenience return value
 }
 
-eDvbFont cOsdBase::SetFont(eDvbFont Font)
+eOSState cOsdMenu::CloseSubMenu()
 {
-  eDvbFont oldFont = Font;
-  for (int i = 0; i < numWindows; i++)
-      oldFont = window[i]->SetFont(Font);
-  return oldFont;
+  delete subMenu;
+  subMenu = NULL;
+  RefreshCurrent();
+  Display();
+  return osContinue; // convenience return value
 }
 
-void cOsdBase::Text(int x, int y, const char *s, eDvbColor ColorFg, eDvbColor ColorBg, tWindowHandle Window)
+eOSState cOsdMenu::ProcessKey(eKeys Key)
 {
-  cWindow *w = (Window == ALL_TILED_WINDOWS) ? GetWindow(x, y) : GetWindow(Window);
-  if (w)
-     w->Text(x, y, s, ColorFg, ColorBg);
-}
+  if (subMenu) {
+     eOSState state = subMenu->ProcessKey(Key);
+     if (state == osBack)
+        return CloseSubMenu();
+     return state;
+     }
 
-void cOsdBase::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int NewHeight)
-{
-  cWindow *w = GetWindow(Window);
-  if (w) {
-     if (NewWidth > 0 && NewHeight > 0) {
-        if ((NewWidth & 0x03) != 0) {
-           NewWidth += 4 - (NewWidth & 0x03);
-           dsyslog("OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
-           }
-        CloseWindow(w);
-        cWindow *NewWindow = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());
-        window[w->Handle()] = NewWindow;
-        delete w;
-        OpenWindow(NewWindow);
-        }
-     else {
-        MoveWindow(w, x, y);
-        w->Relocate(x, y);
+  cOsdItem *item = Get(current);
+  if (marked < 0 && item) {
+     eOSState state = item->ProcessKey(Key);
+     if (state != osUnknown) {
+        DisplayCurrent(true);
+        return state;
         }
      }
+  switch (Key) {
+    case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
+    case kUp|k_Repeat:
+    case kUp:   CursorUp();   break;
+    case kDown|k_Repeat:
+    case kDown: CursorDown(); break;
+    case kLeft|k_Repeat:
+    case kLeft: PageUp(); break;
+    case kRight|k_Repeat:
+    case kRight: PageDown(); break;
+    case kBack: return osBack;
+    case kOk:   if (marked >= 0) {
+                   SetStatus(NULL);
+                   if (marked != current)
+                      Move(marked, current);
+                   marked = -1;
+                   break;
+                   }
+                // else run into default
+    default: if (marked < 0)
+                return osUnknown;
+    }
+  return osContinue;
 }
 
-void cOsdBase::Hide(tWindowHandle Window)
-{
-  HideWindow(GetWindow(Window), true);
-}
-
-void cOsdBase::Show(tWindowHandle Window)
-{
-  HideWindow(GetWindow(Window), false);
-}
diff --git a/osdbase.h b/osdbase.h
index 3277d8200..53fbf6b83 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,221 +4,127 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.9 2004/01/31 10:28:49 kls Exp $
+ * $Id: osdbase.h 1.10 2004/04/30 13:40:11 kls Exp $
  */
 
 #ifndef __OSDBASE_H
 #define __OSDBASE_H
 
-#include <stdio.h>
-#include "font.h"
+#include "config.h"
+#include "osd.h"
+#include "skins.h"
+#include "tools.h"
 
-#define MAXNUMCOLORS 256
+enum eOSState { osUnknown,
+                osContinue,
+                osSchedule,
+                osChannels,
+                osTimers,
+                osRecordings,
+                osPlugin,
+                osSetup,
+                osCommands,
+                osPause,
+                osRecord,
+                osReplay,
+                osStopRecord,
+                osStopReplay,
+                osCancelEdit,
+                osSwitchDvb,
+                osBack,
+                osEnd,
+                os_User, // the following values can be used locally
+                osUser1,
+                osUser2,
+                osUser3,
+                osUser4,
+                osUser5,
+                osUser6,
+                osUser7,
+                osUser8,
+                osUser9,
+                osUser10,
+              };
 
-enum eDvbColor {
-#ifdef DEBUG_OSD
-  clrBackground,
-  clrTransparent = clrBackground,
-  clrBlack = clrBackground,
-  clrRed,
-  clrGreen,
-  clrYellow,
-  clrBlue,
-  clrMagenta,
-  clrCyan,
-  clrWhite,
-#else
-  clrTransparent = 0x00000000,
-  clrBackground  = 0x7F000000, // 50% gray
-  clrBlack       = 0xFF000000,
-  clrRed         = 0xFF1414FC,
-  clrGreen       = 0xFF24FC24,
-  clrYellow      = 0xFF24C0FC,
-  clrMagenta     = 0xFFFC00B0,
-  clrBlue        = 0xFFFC0000,
-  clrCyan        = 0xFFFCFC00,
-  clrWhite       = 0xFFFCFCFC,
-#endif
-  };
-
-class cPalette {
+class cOsdItem : public cListObject {
 private:
-  eDvbColor color[MAXNUMCOLORS];
-  int maxColors, numColors;
-  bool used[MAXNUMCOLORS];
-  bool fetched[MAXNUMCOLORS];
-  bool full;
+  char *text;
+  int offset;
+  eOSState state;
+  bool selectable;
 protected:
-  typedef u_char tIndexes[MAXNUMCOLORS];
+  bool fresh;
 public:
-  cPalette(int Bpp);
-  int Index(eDvbColor Color);
-  void Reset(void);
-  void SetColor(int Index, eDvbColor Color);
-  eDvbColor GetColor(int Index) { return Index < maxColors ? color[Index] : clrBlack; }
-  const eDvbColor *NewColors(int &FirstColor, int &LastColor);
-        // With every call this function returns a consecutive range of
-        // color entries that have been added since the last call. The
-        // return value is the address of the first new color, and the
-        // index of the first and last new color are returned in the given
-        // int parameters. If there are no new color entries, NULL will
-        // be returned.
-  const eDvbColor *AllColors(int &NumColors);
-        // Returns a pointer to the complete color table and stores the
-        // number of valid entries in NumColors. If no colors have been
-        // stored yet, NumColors will be set to 0 and the function will
-        // return NULL.
-  void Take(const cPalette &Palette, tIndexes *Indexes = NULL);
+  cOsdItem(eOSState State = osUnknown);
+  cOsdItem(const char *Text, eOSState State = osUnknown);
+  virtual ~cOsdItem();
+  bool Selectable(void) { return selectable; }
+  void SetText(const char *Text, bool Copy = true);
+  void SetSelectable(bool Selectable);
+  void SetFresh(bool Fresh);
+  const char *Text(void) { return text; }
+  virtual void Set(void) {}
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
-class cBitmap : public cPalette {
+class cOsdObject {
+  friend class cOsdMenu;
 private:
-  const cFont *font;
-  eDvbFont fontType;
-  u_char *bitmap;
-  bool clearWithBackground;
+  bool isMenu;
 protected:
-  int width, height;
-  int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
+  bool needsFastResponse;
 public:
-  cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground = true);
-  virtual ~cBitmap();
-  bool ClearWithBackground(void) { return clearWithBackground; }
-  eDvbFont SetFont(eDvbFont Font);
-  bool Dirty(int &x1, int &y1, int &x2, int &y2);
-  void SetIndex(int x, int y, u_char Index);
-  void SetPixel(int x, int y, eDvbColor Color);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  int Width(void) { return width; }
-  int Width(unsigned char c);
-  int Width(const char *s);
-  int Height(void) { return height; }
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
-  void Clean(void);
-  void Clear(void);
-  const u_char *Data(int x, int y);
+  cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
+  virtual ~cOsdObject() {}
+  bool NeedsFastResponse(void) { return needsFastResponse; }
+  bool IsMenu(void) { return isMenu; }
+  virtual void Show(void) {}
+  virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
   };
 
-#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
-
-class cWindow : public cBitmap {
-private:
-  int handle;  // the index within the OSD's window array (0...MAXNUMWINDOWS - 1)
-  int x0, y0;
-  int bpp;
-  bool tiled;
-  bool shown;
-public:
-  cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled);
-  int X0(void) { return x0; }
-  int Y0(void) { return y0; }
-  int Bpp(void) { return bpp; }
-  bool Tiled(void) { return tiled; }
-  bool Shown(void) { bool s = shown; shown = true; return s; }
-  int Handle(void) { return handle; }
-  bool Contains(int x, int y);
-  void Relocate(int x, int y);
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
-  void SetBitmap(int x, int y, const cBitmap &Bitmap);
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
-  const u_char *Data(int x, int y);
-  };
-
-typedef int tWindowHandle;
-
-// '-1' is used as an error return value!
-#define ALL_WINDOWS         (-2)
-#define ALL_TILED_WINDOWS   (-3)
-#define LAST_CREATED_WINDOW (-4)
-
-class cOsdBase {
+class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 private:
-  int numWindows;
-  int x0, y0;
-  cWindow *window[MAXNUMWINDOWS];
-  cWindow *GetWindow(int x, int y);
-  cWindow *GetWindow(tWindowHandle Window);
+  static cSkinDisplayMenu *displayMenu;
+  static int displayMenuCount;
+  static int displayMenuItems;
+  char *title;
+  int cols[cSkinDisplayMenu::MaxTabs];
+  int first, current, marked;
+  cOsdMenu *subMenu;
+  const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
+  char *status;
+  int digit;
+  bool hasHotkeys;
 protected:
-  cWindow *GetWindowNr(int i) { return i < MAXNUMWINDOWS ? window[i] : NULL; }
-  int NumWindows(void) { return numWindows; }
-  int X0(void) { return x0; }
-  int Y0(void) { return y0; }
-  virtual bool OpenWindow(cWindow *Window) = 0;
-       // Opens the window on the OSD hardware, without actually showing it (the
-       // initial state shall be "hidden").
-  virtual void CommitWindow(cWindow *Window) = 0;
-       // Write any modified data and color definitions to the OSD hardware.
-       // Use the window's Dirty() function to find out which area of data
-       // actually needs to be transferred. If the window has not yet been explicitly
-       // shown through a call to ShowWindow(), no visible activity shall take place.
-  virtual void ShowWindow(cWindow *Window) = 0;
-       // Make the window actually visible on the OSD hardware.
-  virtual void HideWindow(cWindow *Window, bool Hide) = 0;
-       // Temporarily hide the window (if 'Hide' is 'true') or make a previously
-       // hidden window visible again (if 'Hide' is 'false').
-  virtual void MoveWindow(cWindow *Window, int x, int y) = 0;
-       // Move the window to a new location.
-  virtual void CloseWindow(cWindow *Window) = 0;
-       // Close the window and release any OSD hardware resources allocated for it.
+  cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
+  const char *hk(const char *s);
+  void SetHasHotkeys(void);
+  virtual void Clear(void);
+  bool SelectableItem(int idx);
+  void SetCurrent(cOsdItem *Item);
+  void RefreshCurrent(void);
+  void DisplayCurrent(bool Current);
+  void CursorUp(void);
+  void CursorDown(void);
+  void PageUp(void);
+  void PageDown(void);
+  void Mark(void);
+  eOSState HotKey(eKeys Key);
+  eOSState AddSubMenu(cOsdMenu *SubMenu);
+  eOSState CloseSubMenu();
+  bool HasSubMenu(void) { return subMenu; }
+  void SetStatus(const char *s);
+  void SetTitle(const char *Title);
+  void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
+  virtual void Del(int Index);
 public:
-  cOsdBase(int x, int y);
-       // Initializes the OSD, starting at screen coordinates (x, y).
-  virtual ~cOsdBase();
-       // Destroys all windows and shuts down the OSD.
-  tWindowHandle Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, bool Tiled = true);
-       // Creates a window at coordinates (x, y), which are relative to the OSD's
-       // origin given in the constructor, with the given width, height and color
-       // depth. ClearWithBackground controls whether the window will be filled with
-       // clrBackground when it is cleared. Setting this to 'false' may be useful
-       // for windows that don't need clrBackground but want to save this color
-       // palette entry for a different color. Tiled controls whether this will
-       // be part of a multi section OSD (with several windows that all have
-       // different color depths and palettes and form one large OSD area), or
-       // whether this is a "standalone" window that will be drawn "in front"
-       // of any windows defined *after* this one (this can be used for highlighting
-       // certain parts of the OSD, as would be done in a 'cursor').
-       // Returns a handle that can be used to identify this window.
-  void AddColor(eDvbColor Color, tWindowHandle Window = LAST_CREATED_WINDOW);
-       // Adds the Color to the color palette of the given window if it is not
-       // already contained in the palette (and if the palette still has free
-       // slots for new colors). The default value LAST_CREATED_WINDOW will
-       // access the most recently created window, without the need of explicitly
-       // using a window handle.
-  void Flush(void);
-       // Actually commits all data of all windows to the OSD.
-  void Clear(tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Clears the given window. If ALL_TILED_WINDOWS is given, only the tiled
-       // windows will be cleared, leaving the standalone windows untouched. If
-       // ALL_WINDOWS is given, the standalone windows will also be cleared.
-  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color, tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Fills the rectangle defined by the upper left (x1, y2) and lower right
-       // (x2, y2) corners with the given Color. If a specific window is given,
-       // the coordinates are relative to that window's upper left corner.
-       // Otherwise they are relative to the upper left corner of the entire OSD.
-       // If all tiled windows are selected, only that window which contains the
-       // point (x1, y1) will actually be filled.
-  void SetBitmap(int x, int y, const cBitmap &Bitmap, tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Sets the pixels within the given window with the data from the given
-       // Bitmap. See Fill() for details about the coordinates.
-  int Width(unsigned char c);
-       // Returns the width (in pixels) of the given character in the current font.
-  int Width(const char *s);
-       // Returns the width (in pixels) of the given string in the current font.
-  eDvbFont SetFont(eDvbFont Font);
-       // Sets the current font for subsequent Width() and Text() operations.
-  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground, tWindowHandle Window = ALL_TILED_WINDOWS);
-       // Writes the given string at coordinates (x, y) with the given foreground
-       // and background color into the given window (see Fill() for details
-       // about the coordinates).
-  void Relocate(tWindowHandle Window, int x, int y, int NewWidth = -1, int NewHeight = -1);
-       // Moves the given window to the new location at (x, y). If NewWidth and
-       // NewHeight are also given, the window will also be resized to the new
-       // width and height.
-  void Hide(tWindowHandle Window);
-       // Hides the given window.
-  void Show(tWindowHandle Window);
-       // Shows the given window.
+  cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
+  virtual ~cOsdMenu();
+  int Current(void) { return current; }
+  void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
+  void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
+  virtual void Display(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 #endif //__OSDBASE_H
diff --git a/player.c b/player.c
index a88c5010a..c08e42307 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.6 2002/11/02 14:55:37 kls Exp $
+ * $Id: player.c 1.7 2004/04/16 13:34:11 kls Exp $
  */
 
 #include "player.h"
@@ -80,7 +80,7 @@ void cControl::Attach(void)
      if (cDevice::PrimaryDevice()->AttachPlayer(control->player))
         control->attached = true;
      else {
-        Interface->Error(tr("Channel locked (recording)!"));
+        Skins.Message(mtError, tr("Channel locked (recording)!"));
         Shutdown();
         }
      }
diff --git a/player.h b/player.h
index faeab1a74..85b7bd135 100644
--- a/player.h
+++ b/player.h
@@ -4,14 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.10 2002/11/03 11:27:30 kls Exp $
+ * $Id: player.h 1.11 2004/04/30 13:45:59 kls Exp $
  */
 
 #ifndef __PLAYER_H
 #define __PLAYER_H
 
 #include "device.h"
-#include "osd.h"
+#include "osdbase.h"
 
 class cPlayer {
   friend class cDevice;
diff --git a/plugin.h b/plugin.h
index 0a753faaa..2d1cf5d0c 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.6 2003/05/09 14:57:55 kls Exp $
+ * $Id: plugin.h 1.7 2004/04/30 13:46:21 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -12,7 +12,7 @@
 
 #include "i18n.h"
 #include "menuitems.h"
-#include "osd.h"
+#include "osdbase.h"
 #include "tools.h"
 
 #define VDRPLUGINCREATOR(PluginClass) extern "C" void *VDRPluginCreator(void) { return new PluginClass; }
diff --git a/recorder.c b/recorder.c
index b6b9a2401..4270fbed7 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.9 2004/03/07 14:39:25 kls Exp $
+ * $Id: recorder.c 1.10 2004/03/20 10:33:21 kls Exp $
  */
 
 #include <stdarg.h>
@@ -24,7 +24,7 @@
 #define DISKCHECKINTERVAL   100 // seconds
 
 cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cReceiver(Ca, Priority, 5, VPid, APid1, APid2, DPid1, DPid2)
+:cReceiver(Ca, Priority, Setup.RecordDolbyDigital ? 5 : 3, VPid, APid1, APid2, DPid1, DPid2)
 ,cThread("recording")
 {
   ringBuffer = NULL;
diff --git a/recording.c b/recording.c
index a181ff455..05efc4404 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.86 2003/11/08 15:25:35 kls Exp $
+ * $Id: recording.c 1.87 2004/05/07 14:24:18 kls Exp $
  */
 
 #include "recording.h"
@@ -18,6 +18,7 @@
 #include "i18n.h"
 #include "interface.h"
 #include "remux.h" //XXX+ I_FRAME
+#include "skins.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -461,7 +462,7 @@ char *cRecording::SortName(void)
   return sortBuffer;
 }
 
-int cRecording::GetResume(void)
+int cRecording::GetResume(void) const
 {
   if (resume == RESUME_NOT_INITIALIZED) {
      cResumeFile ResumeFile(FileName());
@@ -476,7 +477,7 @@ bool cRecording::operator< (const cListObject &ListObject)
   return strcasecmp(SortName(), r->SortName()) < 0;
 }
 
-const char *cRecording::FileName(void)
+const char *cRecording::FileName(void) const
 {
   if (!fileName) {
      struct tm tm_r;
@@ -488,7 +489,7 @@ const char *cRecording::FileName(void)
   return fileName;
 }
 
-const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
+const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) const
 {
   char New = NewIndicator && IsNew() ? '*' : ' ';
   free(titleBuffer);
@@ -548,7 +549,7 @@ const char *cRecording::PrefixFileName(char Prefix)
   return NULL;
 }
 
-int cRecording::HierarchyLevels(void)
+int cRecording::HierarchyLevels(void) const
 {
   const char *s = name;
   int level = 0;
@@ -559,7 +560,7 @@ int cRecording::HierarchyLevels(void)
   return level;
 }
 
-bool cRecording::IsEdited(void)
+bool cRecording::IsEdited(void) const
 {
   const char *s = strrchr(name, '~');
   s = !s ? name : s + 1;
@@ -637,7 +638,7 @@ bool cRecordings::Load(bool Deleted)
      result = Count() > 0;
      }
   else
-     Interface->Error("Error while opening pipe!");
+     Skins.Message(mtError, "Error while opening pipe!");
   free(cmd);
   return result;
 }
diff --git a/recording.h b/recording.h
index 59a9dca0d..01a25ab41 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.28 2003/10/17 14:27:36 kls Exp $
+ * $Id: recording.h 1.29 2004/05/07 14:24:22 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -34,15 +34,15 @@ class cResumeFile {
 
 class cRecording : public cListObject {
 private:
-  int resume;
-  char *titleBuffer;
+  mutable int resume;
+  mutable char *titleBuffer;
   char *sortBuffer;
-  char *fileName;
-  char *name;
+  mutable char *fileName;
+  mutable char *name;
   char *summary;
   char *StripEpisodeName(char *s);
   char *SortName(void);
-  int GetResume(void);
+  int GetResume(void) const;
 public:
   time_t start;
   int priority;
@@ -51,14 +51,14 @@ class cRecording : public cListObject {
   cRecording(const char *FileName);
   ~cRecording();
   virtual bool operator< (const cListObject &ListObject);
-  const char *Name(void) { return name; }
-  const char *FileName(void);
-  const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1);
-  const char *Summary(void) { return summary; }
+  const char *Name(void) const { return name; }
+  const char *FileName(void) const;
+  const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
+  const char *Summary(void) const { return summary; }
   const char *PrefixFileName(char Prefix);
-  int HierarchyLevels(void);
-  bool IsNew(void) { return GetResume() <= 0; }
-  bool IsEdited(void);
+  int HierarchyLevels(void) const;
+  bool IsNew(void) const { return GetResume() <= 0; }
+  bool IsEdited(void) const;
   bool WriteSummary(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
diff --git a/skinclassic.c b/skinclassic.c
new file mode 100644
index 000000000..2c4b56321
--- /dev/null
+++ b/skinclassic.c
@@ -0,0 +1,541 @@
+/*
+ * skinclassic.c: The 'classic' VDR skin
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skinclassic.c 1.1 2004/05/15 14:51:18 kls Exp $
+ */
+
+#include "skinclassic.h"
+#include "font.h"
+#include "i18n.h"
+#include "osd.h"
+#include "themes.h"
+
+#define ScrollWidth  5
+
+static cTheme Theme;
+
+THEME_CLR(Theme, clrBackground,             clrGray50);
+THEME_CLR(Theme, clrButtonRedFg,            clrWhite);
+THEME_CLR(Theme, clrButtonRedBg,            clrRed);
+THEME_CLR(Theme, clrButtonGreenFg,          clrBlack);
+THEME_CLR(Theme, clrButtonGreenBg,          clrGreen);
+THEME_CLR(Theme, clrButtonYellowFg,         clrBlack);
+THEME_CLR(Theme, clrButtonYellowBg,         clrYellow);
+THEME_CLR(Theme, clrButtonBlueFg,           clrWhite);
+THEME_CLR(Theme, clrButtonBlueBg,           clrBlue);
+THEME_CLR(Theme, clrMessageStatusFg,        clrBlack);
+THEME_CLR(Theme, clrMessageStatusBg,        clrCyan);
+THEME_CLR(Theme, clrMessageInfoFg,          clrBlack);
+THEME_CLR(Theme, clrMessageInfoBg,          clrGreen);
+THEME_CLR(Theme, clrMessageWarningFg,       clrBlack);
+THEME_CLR(Theme, clrMessageWarningBg,       clrYellow);
+THEME_CLR(Theme, clrMessageErrorFg,         clrWhite);
+THEME_CLR(Theme, clrMessageErrorBg,         clrRed);
+THEME_CLR(Theme, clrVolumePrompt,           clrGreen);
+THEME_CLR(Theme, clrVolumeBarUpper,         clrWhite);
+THEME_CLR(Theme, clrVolumeBarLower,         clrGreen);
+THEME_CLR(Theme, clrChannelName,            clrWhite);
+THEME_CLR(Theme, clrChannelDate,            clrWhite);
+THEME_CLR(Theme, clrChannelEpgTimeFg,       clrWhite);
+THEME_CLR(Theme, clrChannelEpgTimeBg,       clrRed);
+THEME_CLR(Theme, clrChannelEpgTitle,        clrCyan);
+THEME_CLR(Theme, clrChannelEpgShortText,    clrYellow);
+THEME_CLR(Theme, clrMenuTitleFg,            clrBlack);
+THEME_CLR(Theme, clrMenuTitleBg,            clrCyan);
+THEME_CLR(Theme, clrMenuDate,               clrBlack);
+THEME_CLR(Theme, clrMenuItemCurrentFg,      clrBlack);
+THEME_CLR(Theme, clrMenuItemCurrentBg,      clrCyan);
+THEME_CLR(Theme, clrMenuItemSelectable,     clrWhite);
+THEME_CLR(Theme, clrMenuItemNonSelectable,  clrCyan);
+THEME_CLR(Theme, clrMenuEventTime,          clrWhite);
+THEME_CLR(Theme, clrMenuEventVpsFg,         clrBlack);
+THEME_CLR(Theme, clrMenuEventVpsBg,         clrWhite);
+THEME_CLR(Theme, clrMenuEventTitle,         clrCyan);
+THEME_CLR(Theme, clrMenuEventShortText,     clrWhite);
+THEME_CLR(Theme, clrMenuEventDescription,   clrCyan);
+THEME_CLR(Theme, clrMenuScrollbarTotal,     clrWhite);
+THEME_CLR(Theme, clrMenuScrollbarShown,     clrCyan);
+THEME_CLR(Theme, clrMenuText,               clrWhite);
+THEME_CLR(Theme, clrReplayTitle,            clrWhite);
+THEME_CLR(Theme, clrReplayCurrent,          clrWhite);
+THEME_CLR(Theme, clrReplayTotal,            clrWhite);
+THEME_CLR(Theme, clrReplayModeJump,         clrWhite);
+THEME_CLR(Theme, clrReplayProgressSeen,     clrGreen);
+THEME_CLR(Theme, clrReplayProgressRest,     clrWhite);
+THEME_CLR(Theme, clrReplayProgressSelected, clrRed);
+THEME_CLR(Theme, clrReplayProgressMark,     clrBlack);
+THEME_CLR(Theme, clrReplayProgressCurrent,  clrRed);
+
+// --- cSkinClassicDisplayChannel --------------------------------------------
+
+class cSkinClassicDisplayChannel : public cSkinDisplayChannel{
+private:
+  cOsd *osd;
+  int lineHeight;
+  int timeWidth;
+public:
+  cSkinClassicDisplayChannel(bool WithInfo);
+  virtual ~cSkinClassicDisplayChannel();
+  virtual void SetChannel(const cChannel *Channel, int Number);
+  virtual void SetEvents(const cEvent *Present, const cEvent *Following);
+  virtual void Flush(void);
+  };
+
+cSkinClassicDisplayChannel::cSkinClassicDisplayChannel(bool WithInfo)
+{
+  int Lines = WithInfo ? 5 : 1;
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - Lines * lineHeight));
+  timeWidth = font->Width("00:00") + 4;
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight, 4 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, Theme.Color(clrBackground));
+}
+
+cSkinClassicDisplayChannel::~cSkinClassicDisplayChannel()
+{
+  delete osd;
+}
+
+void cSkinClassicDisplayChannel::SetChannel(const cChannel *Channel, int Number)
+{
+  osd->DrawRectangle(0, 0, osd->Width() - 1, lineHeight - 1, Theme.Color(clrBackground));
+  osd->DrawText(2, 0, ChannelString(Channel, Number), Theme.Color(clrChannelName), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+}
+
+void cSkinClassicDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
+{
+  osd->DrawRectangle(0, lineHeight, timeWidth - 1, osd->Height(), Theme.Color(clrChannelEpgTimeBg));
+  osd->DrawRectangle(timeWidth, lineHeight, osd->Width() - 1, osd->Height(), Theme.Color(clrBackground));
+  for (int i = 0; i < 2; i++) {
+      const cEvent *e = !i ? Present : Following;
+      if (e) {
+         osd->DrawText(             2, (2 * i + 1) * lineHeight, e->GetTimeString(), Theme.Color(clrChannelEpgTimeFg), Theme.Color(clrChannelEpgTimeBg), cFont::GetFont(fontOsd));
+         osd->DrawText(timeWidth + 10, (2 * i + 1) * lineHeight, e->Title(), Theme.Color(clrChannelEpgTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+         osd->DrawText(timeWidth + 10, (2 * i + 2) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml));
+         }
+      }
+}
+
+void cSkinClassicDisplayChannel::Flush(void)
+{
+  const char *date = DayDateTime();
+  osd->DrawText(osd->Width() - cFont::GetFont(fontSml)->Width(date) - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml));
+  osd->Flush();
+}
+
+// --- cSkinClassicDisplayMenu -----------------------------------------------
+
+class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
+private:
+  cOsd *osd;
+  int x0, x1;
+  int y0, y1, y2, y3, y4, y5;
+  int lineHeight;
+  void SetScrollbar(void);
+public:
+  cSkinClassicDisplayMenu(void);
+  virtual ~cSkinClassicDisplayMenu();
+  virtual void Scroll(bool Up, bool Page);
+  virtual int MaxItems(void);
+  virtual void Clear(void);
+  virtual void SetTitle(const char *Title);
+  virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetEvent(const cEvent *Event);
+  virtual void SetRecording(const cRecording *Recording);
+  virtual void SetText(const char *Text, bool FixedFont);
+  virtual void Flush(void);
+  };
+
+cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  x0 = 0;
+  x1 = Setup.OSDWidth;
+  y0 = 0;
+  y1 = lineHeight;
+  y2 = y1 + lineHeight;
+  y5 = Setup.OSDHeight;
+  y4 = y5 - lineHeight;
+  y3 = y4 - lineHeight;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop);
+  tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 4 } };
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x1 - 1, y1 - 1, 2 },
+                       { x0, y1, x1 - 1, y3 - 1, 2 },
+                       { x0, y3, x1 - 1, y5 - 1, 4 }
+                     };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
+  osd->DrawRectangle(x0, y0, x1 - 1, y5 - 1, Theme.Color(clrBackground));
+}
+
+cSkinClassicDisplayMenu::~cSkinClassicDisplayMenu()
+{
+  delete osd;
+}
+
+void cSkinClassicDisplayMenu::SetScrollbar(void)
+{
+  if (textScroller.CanScroll()) {
+     int yt = textScroller.Top();
+     int yb = yt + textScroller.Height();
+     int st = yt;
+     int sb = yb;
+     int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
+     int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
+     int xl = x1 - ScrollWidth;
+     osd->DrawRectangle(xl, st, x1 - 1, sb, Theme.Color(clrMenuScrollbarTotal));
+     osd->DrawRectangle(xl, tt, x1 - 1, tb, Theme.Color(clrMenuScrollbarShown));
+     }
+}
+
+void cSkinClassicDisplayMenu::Scroll(bool Up, bool Page)
+{
+  cSkinDisplayMenu::Scroll(Up, Page);
+  SetScrollbar();
+}
+
+int cSkinClassicDisplayMenu::MaxItems(void)
+{
+  return (y3 - y2) / lineHeight;
+}
+
+void cSkinClassicDisplayMenu::Clear(void)
+{
+  textScroller.Reset();
+  osd->DrawRectangle(x0, y1, x1 - 1, y4 - 1, Theme.Color(clrBackground));
+}
+
+void cSkinClassicDisplayMenu::SetTitle(const char *Title)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x1 - x0);
+}
+
+void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int w = x1 - x0;
+  int t0 = x0;
+  int t1 = x0 + w / 4;
+  int t2 = x0 + w / 2;
+  int t3 = x1 - w / 4;
+  int t4 = x1;
+  osd->DrawText(t0, y4, Red,    Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font, t1 - t0, 0, taCenter);
+  osd->DrawText(t1, y4, Green,  Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font, t2 - t1, 0, taCenter);
+  osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, t3 - t2, 0, taCenter);
+  osd->DrawText(t3, y4, Blue,   Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font, t4 - t3, 0, taCenter);
+}
+
+void cSkinClassicDisplayMenu::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  if (Text)
+     osd->DrawText(x0, y3, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x1 - x0, 0, taCenter);
+  else
+     osd->DrawRectangle(x0, y3, x1 - 1, y4 - 1, Theme.Color(clrBackground));
+}
+
+void cSkinClassicDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable)
+{
+  int y = y2 + Index * lineHeight;
+  tColor ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = Theme.Color(clrMenuItemCurrentFg);
+     ColorBg = Theme.Color(clrMenuItemCurrentBg);
+     }
+  else {
+     ColorFg = Theme.Color(Selectable ? clrMenuItemSelectable : clrMenuItemNonSelectable);
+     ColorBg = Theme.Color(clrBackground);
+     }
+  const cFont *font = cFont::GetFont(fontOsd);
+  for (int i = 0; i < MaxTabs; i++) {
+      const char *s = GetTabbedText(Text, i);
+      if (s) {
+         int xt = x0 + Tab(i);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, font, x1 - xt);
+         }
+      if (!Tab(i + 1))
+         break;
+      }
+  SetEditableWidth(x1 - x0 - Tab(1));
+}
+
+void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
+{
+  if (!Event)
+     return;
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xl = x0 + 10;
+  int y = y2;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());//TODO dayname, no year
+  ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
+  if (Event->Vps() && Event->Vps() != Event->StartTime()) {
+     char *buffer;
+     asprintf(&buffer, " VPS: %s", Event->GetVpsString());
+     const cFont *font = cFont::GetFont(fontSml);
+     osd->DrawText(x1 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font);
+     free(buffer);
+     }
+  y += ts.Height();
+  y += font->Height();
+  ts.Set(osd, xl, y, x1 - xl, y3 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (!isempty(Event->ShortText())) {
+     const cFont *font = cFont::GetFont(fontSml);
+     ts.Set(osd, xl, y, x1 - xl, y3 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+     y += ts.Height();
+     }
+  y += font->Height();
+  if (!isempty(Event->Description())) {
+     textScroller.Set(osd, xl, y, x1 - xl - 2 * ScrollWidth, y3 - y, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
+     SetScrollbar();
+     }
+}
+
+void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
+{
+  SetText(Recording->Summary(), false); //TODO
+}
+
+void cSkinClassicDisplayMenu::SetText(const char *Text, bool FixedFont)
+{
+  const cFont *font = cFont::GetFont(FixedFont ? fontFix : fontOsd);
+  textScroller.Set(osd, x0, y2, x1 - x0 - 2 * ScrollWidth, y3 - y2, Text, font, Theme.Color(clrMenuText), Theme.Color(clrBackground));
+  SetScrollbar();
+}
+
+void cSkinClassicDisplayMenu::Flush(void)
+{
+  const char *date = DayDateTime();
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(x1 - font->Width(date) - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font);
+  osd->Flush();
+}
+
+// --- cSkinClassicDisplayReplay ---------------------------------------------
+
+class cSkinClassicDisplayReplay : public cSkinDisplayReplay {
+private:
+  cOsd *osd;
+  int x0, x1;
+  int y0, y1, y2, y3;
+  int lastCurrentWidth;
+public:
+  cSkinClassicDisplayReplay(bool ModeOnly);
+  virtual ~cSkinClassicDisplayReplay();
+  virtual void SetTitle(const char *Title);
+  virtual void SetMode(bool Play, bool Forward, int Speed);
+  virtual void SetProgress(int Current, int Total);
+  virtual void SetCurrent(const char *Current);
+  virtual void SetTotal(const char *Total);
+  virtual void SetJump(const char *Jump);
+  virtual void Flush(void);
+  };
+
+cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  lastCurrentWidth = 0;
+  x0 = 0;
+  x1 = Setup.OSDWidth;
+  y0 = 0;
+  y1 = lineHeight;
+  y2 = 2 * lineHeight;
+  y3 = 3 * lineHeight;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y3);
+  tArea Areas[] = { { x0, y0, x1 - 1, y3 - 1, 4 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  osd->DrawRectangle(x0, y0, x1 - 1, y3 - 1, ModeOnly ? clrTransparent : Theme.Color(clrBackground));
+}
+
+cSkinClassicDisplayReplay::~cSkinClassicDisplayReplay()
+{
+  delete osd;
+}
+
+void cSkinClassicDisplayReplay::SetTitle(const char *Title)
+{
+  osd->DrawText(x0, y0, Title, Theme.Color(clrReplayTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+}
+
+void cSkinClassicDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
+{
+  if (Setup.ShowReplayMode) {
+     const char *Mode;
+     if (Speed == -1) Mode = Play    ? "  >  " : " ||  ";
+     else if (Play)   Mode = Forward ? " X>> " : " <<X ";
+     else             Mode = Forward ? " X|> " : " <|X ";
+     char buf[16];
+     strn0cpy(buf, Mode, sizeof(buf));
+     char *p = strchr(buf, 'X');
+     if (p)
+        *p = Speed > 0 ? '1' + Speed - 1 : ' ';
+     SetJump(buf);
+     }
+}
+
+void cSkinClassicDisplayReplay::SetProgress(int Current, int Total)
+{
+  cProgressBar pb(x1 - x0, y2 - y1, Current, Total, marks, Theme.Color(clrReplayProgressSeen), Theme.Color(clrReplayProgressRest), Theme.Color(clrReplayProgressSelected), Theme.Color(clrReplayProgressMark), Theme.Color(clrReplayProgressCurrent));
+  osd->DrawBitmap(x0, y1, pb);
+}
+
+void cSkinClassicDisplayReplay::SetCurrent(const char *Current)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int w = font->Width(Current);
+  osd->DrawText(x0, y2, Current, Theme.Color(clrReplayCurrent), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : 0);
+  lastCurrentWidth = w;
+}
+
+void cSkinClassicDisplayReplay::SetTotal(const char *Total)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(x1 - font->Width(Total), y2, Total, Theme.Color(clrReplayTotal), Theme.Color(clrBackground), font);
+}
+
+void cSkinClassicDisplayReplay::SetJump(const char *Jump)
+{
+  osd->DrawText(x0 + (x1 - x0) / 4, y2, Jump, Theme.Color(clrReplayModeJump), Theme.Color(clrBackground), cFont::GetFont(fontOsd), (x1 - x0) / 2, 0, taCenter);
+}
+
+void cSkinClassicDisplayReplay::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinClassicDisplayVolume ---------------------------------------------
+
+class cSkinClassicDisplayVolume : public cSkinDisplayVolume {
+private:
+  cOsd *osd;
+public:
+  cSkinClassicDisplayVolume(void);
+  virtual ~cSkinClassicDisplayVolume();
+  virtual void SetVolume(int Current, int Total, bool Mute);
+  virtual void Flush(void);
+  };
+
+cSkinClassicDisplayVolume::cSkinClassicDisplayVolume(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - lineHeight);
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 4 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+}
+
+cSkinClassicDisplayVolume::~cSkinClassicDisplayVolume()
+{
+  delete osd;
+}
+
+void cSkinClassicDisplayVolume::SetVolume(int Current, int Total, bool Mute)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  if (Mute) {
+     osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, clrTransparent);
+     osd->DrawText(0, 0, tr("Mute"), Theme.Color(clrVolumePrompt), Theme.Color(clrBackground), font);
+     }
+  else {
+     const char *Prompt = tr("Volume ");
+     int l = font->Width(Prompt);
+     int p = (osd->Width() - l) * Current / Total;
+     osd->DrawText(0, 0, Prompt, Theme.Color(clrVolumePrompt), Theme.Color(clrBackground), font);
+     osd->DrawRectangle(l, 0, l + p - 1, osd->Height() - 1, Theme.Color(clrVolumeBarLower));
+     osd->DrawRectangle(l + p, 0, osd->Width() - 1, osd->Height() - 1, Theme.Color(clrVolumeBarUpper));
+     }
+}
+
+void cSkinClassicDisplayVolume::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinClassicDisplayMessage --------------------------------------------
+
+class cSkinClassicDisplayMessage : public cSkinDisplayMessage {
+private:
+  cOsd *osd;
+public:
+  cSkinClassicDisplayMessage(void);
+  virtual ~cSkinClassicDisplayMessage();
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinClassicDisplayMessage::cSkinClassicDisplayMessage(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - lineHeight);
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 2 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+}
+
+cSkinClassicDisplayMessage::~cSkinClassicDisplayMessage()
+{
+  delete osd;
+}
+
+void cSkinClassicDisplayMessage::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(0, 0, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, Setup.OSDWidth, 0, taCenter);
+}
+
+void cSkinClassicDisplayMessage::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinClassic ----------------------------------------------------------
+
+cSkinClassic::cSkinClassic(void)
+:cSkin("classic", &::Theme)//XXX naming problem???
+{
+}
+
+const char *cSkinClassic::Description(void)
+{
+  return tr("Classic VDR");
+}
+
+cSkinDisplayChannel *cSkinClassic::DisplayChannel(bool WithInfo)
+{
+  return new cSkinClassicDisplayChannel(WithInfo);
+}
+
+cSkinDisplayMenu *cSkinClassic::DisplayMenu(void)
+{
+  return new cSkinClassicDisplayMenu;
+}
+
+cSkinDisplayReplay *cSkinClassic::DisplayReplay(bool ModeOnly)
+{
+  return new cSkinClassicDisplayReplay(ModeOnly);
+}
+
+cSkinDisplayVolume *cSkinClassic::DisplayVolume(void)
+{
+  return new cSkinClassicDisplayVolume;
+}
+
+cSkinDisplayMessage *cSkinClassic::DisplayMessage(void)
+{
+  return new cSkinClassicDisplayMessage;
+}
diff --git a/skinclassic.h b/skinclassic.h
new file mode 100644
index 000000000..e990b5880
--- /dev/null
+++ b/skinclassic.h
@@ -0,0 +1,26 @@
+/*
+ * skinclassic.h: The 'classic' VDR skin
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skinclassic.h 1.1 2004/04/18 09:38:02 kls Exp $
+ */
+
+#ifndef __SKINCLASSIC_H
+#define __SKINCLASSIC_H
+
+#include "skins.h"
+
+class cSkinClassic : public cSkin {
+public:
+  cSkinClassic(void);
+  virtual const char *Description(void);
+  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
+  virtual cSkinDisplayMenu *DisplayMenu(void);
+  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
+  virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayMessage *DisplayMessage(void);
+  };
+
+#endif //__SKINCLASSIC_H
diff --git a/skins.c b/skins.c
new file mode 100644
index 000000000..6872a9479
--- /dev/null
+++ b/skins.c
@@ -0,0 +1,201 @@
+/*
+ * skins.c: The optical appearance of the OSD
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skins.c 1.1 2004/05/15 12:34:38 kls Exp $
+ */
+
+#include "skins.h"
+#include "interface.h"
+#include "status.h"
+#include "tools.h"
+
+// --- cSkinDisplay ----------------------------------------------------------
+
+cSkinDisplay *cSkinDisplay::current = NULL;
+
+cSkinDisplay::cSkinDisplay(void)
+{
+  current = this;
+  editableWidth = 100; //XXX
+}
+
+cSkinDisplay::~cSkinDisplay()
+{
+  current = NULL;
+}
+
+// --- cSkinDisplayMenu ------------------------------------------------------
+
+cSkinDisplayMenu::cSkinDisplayMenu(void)
+{
+  SetTabs(0);
+}
+
+void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
+{
+  tabs[0] = 0;
+  tabs[1] = Tab1 ? tabs[0] + Tab1 : 0;
+  tabs[2] = Tab2 ? tabs[1] + Tab2 : 0;
+  tabs[3] = Tab3 ? tabs[2] + Tab3 : 0;
+  tabs[4] = Tab4 ? tabs[3] + Tab4 : 0;
+  tabs[5] = Tab5 ? tabs[4] + Tab5 : 0;
+  for (int i = 1; i < MaxTabs; i++)
+      tabs[i] *= 12;//XXX average character width of font used for items!!!
+}
+
+void cSkinDisplayMenu::Scroll(bool Up, bool Page)
+{
+  textScroller.Scroll(Up, Page);
+}
+
+const char *cSkinDisplayMenu::GetTabbedText(const char *s, int Tab)
+{
+  if (!s)
+     return NULL;
+  static char buffer[1000];
+  const char *a = s;
+  const char *b = strchrnul(a, '\t');
+  while (*b && Tab-- > 0) {
+        a = b + 1;
+        b = strchrnul(a, '\t');
+        }
+  if (!*b)
+     return (Tab <= 0) ? a : NULL;
+  unsigned int n = b - a;
+  if (n >= sizeof(buffer))
+     n = sizeof(buffer) - 1;
+  strncpy(buffer, a, n);
+  buffer[n] = 0;
+  return buffer;
+}
+
+// --- cSkinDisplayReplay::cProgressBar --------------------------------------
+
+cSkinDisplayReplay::cProgressBar::cProgressBar(int Width, int Height, int Current, int Total, const cMarks *Marks, tColor ColorSeen, tColor ColorRest, tColor ColorSelected, tColor ColorMark, tColor ColorCurrent)
+:cBitmap(Width, Height, 2)
+{
+  total = Total;
+  if (total > 0) {
+     int p = Pos(Current);
+     DrawRectangle(0, 0, p, Height - 1, ColorSeen);
+     DrawRectangle(p + 1, 0, Width - 1, Height - 1, ColorRest);
+     if (Marks) {
+        bool Start = true;
+        for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
+            int p1 = Pos(m->position);
+            if (Start) {
+               const cMark *m2 = Marks->Next(m);
+               int p2 = Pos(m2 ? m2->position : total);
+               int h = Height / 3;
+               DrawRectangle(p1, h, p2, Height - h, ColorSelected);
+               }
+            Mark(p1, Start, m->position == Current, ColorMark, ColorCurrent);
+            Start = !Start;
+            }
+        }
+     }
+}
+
+void cSkinDisplayReplay::cProgressBar::Mark(int x, bool Start, bool Current, tColor ColorMark, tColor ColorCurrent)
+{
+  DrawRectangle(x, 0, x, Height() - 1, ColorMark);
+  const int d = Height() / (Current ? 3 : 9);
+  for (int i = 0; i < d; i++) {
+      int h = Start ? i : Height() - 1 - i;
+      DrawRectangle(x - d + i, h, x + d - i, h, Current ? ColorCurrent : ColorMark);
+      }
+}
+
+// --- cSkinDisplayReplay ----------------------------------------------------
+
+cSkinDisplayReplay::cSkinDisplayReplay(void)
+{
+  marks = NULL;
+}
+
+void cSkinDisplayReplay::SetMarks(const cMarks *Marks)
+{
+  marks = Marks;
+}
+
+// --- cSkin -----------------------------------------------------------------
+
+cSkin::cSkin(const char *Name, cTheme *Theme)
+{
+  name = strdup(Name);
+  theme = Theme;
+  if (theme)
+     cThemes::Save(name, theme);
+  Skins.Add(this);
+}
+
+cSkin::~cSkin()
+{
+  free(name);
+}
+
+// --- cSkins ----------------------------------------------------------------
+
+cSkins Skins;
+
+cSkins::cSkins(void)
+{
+  displayMessage = NULL;
+}
+
+cSkins::~cSkins()
+{
+  delete displayMessage;
+}
+
+bool cSkins::SetCurrent(const char *Name)
+{
+  if (Name) {
+     for (cSkin *Skin = First(); Skin; Skin = Next(Skin)) {
+         if (strcmp(Skin->Name(), Name) == 0) {
+            current = Skin;
+            return true;
+            }
+         }
+     }
+  current = First();
+  return current != NULL;
+}
+
+eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
+{
+  switch (Type) {
+    case mtInfo:  isyslog("info: %s", s); break;
+    case mtError: esyslog("ERROR: %s", s); break;
+    default: ;
+    }
+  if (!cSkinDisplay::Current() && !displayMessage)
+     displayMessage = Current()->DisplayMessage();
+  cSkinDisplay::Current()->SetMessage(Type, s);
+  cSkinDisplay::Current()->Flush();
+  cStatus::MsgOsdStatusMessage(s);
+  eKeys k = kNone;
+  if (Type != mtStatus) {
+     k = Interface->Wait(Seconds);
+     if (displayMessage) {
+        delete displayMessage;
+        displayMessage = NULL;
+        }
+     else
+        cSkinDisplay::Current()->SetMessage(Type, NULL);
+     }
+  else if (!s && displayMessage) {
+     delete displayMessage;
+     displayMessage = NULL;
+     }
+  return k;
+}
+
+void cSkins::Flush(void)
+{
+  if (cSkinDisplay::Current())
+     cSkinDisplay::Current()->Flush();
+}
diff --git a/skins.h b/skins.h
new file mode 100644
index 000000000..412810f29
--- /dev/null
+++ b/skins.h
@@ -0,0 +1,297 @@
+/*
+ * skins.h: The optical appearance of the OSD
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skins.h 1.1 2004/05/16 09:40:18 kls Exp $
+ */
+
+#ifndef __SKINS_H
+#define __SKINS_H
+
+#include "channels.h"
+#include "epg.h"
+#include "keys.h"
+#include "osd.h"
+#include "recording.h"
+#include "themes.h"
+#include "tools.h"
+
+enum eMessageType { mtStatus = 0, mtInfo, mtWarning, mtError }; // will be used to calculate color offsets!
+
+class cSkinDisplay {
+private:
+  static cSkinDisplay *current;
+  int editableWidth; //XXX this is not nice, but how else could we know this value?
+public:
+  cSkinDisplay(void);
+  virtual ~cSkinDisplay();
+  int EditableWidth(void) { return editableWidth; }
+  void SetEditableWidth(int Width) { editableWidth = Width; }
+       ///< If an item is set through a call to cSkinDisplayMenu::SetItem(), this
+       ///< function shall be called to set the width of the rightmost tab separated
+       ///< field. This information will be used for editable items.
+  virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL) {}
+       ///< Sets the color buttons to the given strings, provided this cSkinDisplay
+       ///< actually has a color button display.
+  virtual void SetMessage(eMessageType Type, const char *Text) {}
+       ///< Sets a one line message Text, with the given Type. Type can be used
+       ///< to determine, e.g., the colors for displaying the Text.
+  virtual void Flush(void) {}
+       ///< Actually draws the OSD display to the output device.
+  static cSkinDisplay *Current(void) { return current; }
+       ///< Returns the currently active cSkinDisplay.
+  };
+
+class cSkinDisplayChannel : public cSkinDisplay {
+       ///< This class is used to display the current channel, together with
+       ///< the present and following EPG even. How and to what extent this
+       ///< is done is totally up to the derived class.
+public:
+  virtual void SetChannel(const cChannel *Channel, int Number) = 0;
+       ///< Sets the current channel to Channel. If Number is not 0, the
+       ///< user is in the process of entering a channel number, which must
+       ///< be displayed accordingly.
+  virtual void SetEvents(const cEvent *Present, const cEvent *Following) = 0;
+       ///< Sets the Present and Following EPG events. It either of these
+       ///< is not available, NULL will be given.
+  /*TODO
+  SetButtons
+    Red    = Video options
+    Green  = Info now
+    Yellow = Info next
+    Blue   = Audio options
+  AudioOptions
+  VideoOptions
+  */
+  };
+
+class cSkinDisplayMenu : public cSkinDisplay {
+       ///< This class implements the general purpose menu display, which is
+       ///< used throughout the program to display information and let the
+       ///< user interact with items.
+       ///< A menu consists of the following fields, each of which is explicitly
+       ///< set by calls to the member functions below:
+       ///< - Title: a single line of text, indicating what this menu displays
+       ///< - Color buttons: the red, green, yellow and blue buttons, used for
+       ///<   various functions
+       ///< - Message: a one line message, indicating a Status, Info, Warning,
+       ///<   or Error condition
+       ///< - Central area: the main central area of the menu, used to display
+       ///<   one of the following:
+       ///<   - Items: a list of single line items, of which the user may be
+       ///<     able to select one
+       ///<   - Event: the full information about one EPG event
+       ///<   - Text: a multi line, scrollable text
+public:
+  enum { MaxTabs = 6 };
+private:
+  int tabs[MaxTabs];
+protected:
+  cTextScroller textScroller;
+  int Tab(int n) { return (n >= 0 && n < MaxTabs) ? tabs[n] : 0; }
+       ///< Returns the offset of the given tab from the left border of the
+       ///< item display area. The value returned is in pixel.//XXX ncurses???
+  const char *GetTabbedText(const char *s, int Tab);
+       ///< Returns the that part of the given string, that follows the given
+       ///< Tab (where 0 indicates the beginning of the string). If no such
+       ///< part can be found, NULL will be returned.
+public:
+  cSkinDisplayMenu(void);
+  virtual void SetTabs(int Tab1, int Tab2 = 0, int Tab3 = 0, int Tab4 = 0, int Tab5 = 0);
+       ///< Sets the tab columns to the given values, which are the number of
+       ///< characters in each column.//XXX ncurses???
+  virtual void Scroll(bool Up, bool Page);
+       ///< If this menu contains a text area that can be scrolled, this function
+       ///< will be called to actually scroll the text. Up indicates whether the
+       ///< text shall be scrolled up or down, and Page is true if it shall be
+       ///< scrolled by a full page, rather than a single line. An object of the
+       ///< cTextScroller class can be used to implement the scrolling text area.
+  virtual int MaxItems(void) = 0;
+       ///< Returns the maximum number of items the menu can display.
+  virtual void Clear(void) = 0;
+       ///< Clears the entire central area of the menu.
+  virtual void SetTitle(const char *Title) = 0;
+       ///< Sets the title of this menu to Title.
+  virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL) = 0;
+       ///< Sets the color buttons to the given strings. If any of the values is
+       ///< NULL, any previous text must be removed from the related button.
+  virtual void SetMessage(eMessageType Type, const char *Text) = 0;
+       ///< Sets a one line message Text, with the given Type. Type can be used
+       ///< to determine, e.g., the colors for displaying the Text.
+       ///< If Text is NULL, any previously displayed message must be removed, and
+       ///< any previous contents overwritten by the message must be restored.
+  virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable) = 0;
+       ///< Sets the item at the given Index to Text. Index is between 0 and the
+       ///< value returned by MaxItems(), minus one. Text may contain tab characters ('\t'),
+       ///< which shall be used to separate the text into several columns, according to the
+       ///< values set by a prior call to SetTabs(). If Current is true, this item shall
+       ///< be drawn in a way indicating to the user that it is the currently selected
+       ///< one. Selectable can be used to display items differently that can't be
+       ///< selected by the user.
+       ///< Whenever the current status is moved from one item to another,
+       ///< this function will be first called for the old current item
+       ///< with Current set to false, and then for the new current item
+       ///< with Current set to true.
+  /*TODO
+  virtual void SetItem(const cEvent *Event, int Index, bool Current, bool Selectable, bool NowNext???, bool Schedule???);
+  virtual void SetItem(const cTimer *Timer, int Index, bool Current, bool Selectable);
+  virtual void SetItem(const cChannel *Channel, int Index, bool Current, bool Selectable);
+  virtual void SetItem(const cRecording *Recording, int Index, bool Current, bool Selectable);
+  --> false: call SetItem(text)
+  */
+  virtual void SetEvent(const cEvent *Event) = 0;
+       ///< Sets the Event that shall be displayed, using the entire central area
+       ///< of the menu. The Event's 'description' shall be displayed using a
+       ///< cTextScroller, and the Scroll() function will be called to drive scrolling
+       ///< that text if necessary.
+  virtual void SetRecording(const cRecording *Recording) = 0;
+       ///< Sets the Recording that shall be displayed, using the entire central area
+       ///< of the menu. The Recording's 'summary' shall be displayed using a
+       ///< cTextScroller, and the Scroll() function will be called to drive scrolling
+       ///< that text if necessary.
+  virtual void SetText(const char *Text, bool FixedFont) = 0;
+       ///< Sets the Text that shall be displayed, using the entire central area
+       ///< of the menu. The Text shall be displayed using a cTextScroller, and
+       ///< the Scroll() function will be called to drive scrolling that text if
+       ///< necessary.
+  //XXX ??? virtual void SetHelp(const char *Help) = 0;
+  };
+
+class cSkinDisplayReplay : public cSkinDisplay {
+       ///< This class implements the progress display used during replay of
+       ///< a recording.
+protected:
+  const cMarks *marks;
+  class cProgressBar : public cBitmap {
+  protected:
+    int total;
+    int Pos(int p) { return p * Width() / total; }
+    void Mark(int x, bool Start, bool Current, tColor ColorMark, tColor ColorCurrent);
+  public:
+    cProgressBar(int Width, int Height, int Current, int Total, const cMarks *Marks, tColor ColorSeen, tColor ColorRest, tColor ColorSelected, tColor ColorMark, tColor ColorCurrent);
+    };
+public:
+  cSkinDisplayReplay(void);
+  virtual void SetMarks(const cMarks *Marks);
+       ///< Sets the editing marks to Marks, which shall be used to display the
+       ///< progress bar through a cProgressBar object.
+  virtual void SetTitle(const char *Title) = 0;
+       ///< Sets the title of the recording.
+  virtual void SetMode(bool Play, bool Forward, int Speed) = 0;
+       ///< Sets the current replay mode, which can be used to display some
+       ///< indicator, showing the user whether we are currently in normal
+       ///< play mode, fast forward etc.
+  virtual void SetProgress(int Current, int Total) = 0;
+       ///< This function will be called whenever the position in of the total
+       ///< length of the recording has changed. A cProgressBar shall then be
+       ///< used to display a progress indicator.
+  virtual void SetCurrent(const char *Current) = 0;
+       ///< Sets the current position within the recording, as a user readable
+       ///< string if the form "h:mm:ss.ff". The ".ff" part, indicating the
+       ///< frame number, is optional and the actual implementation needs to
+       ///< take care that it is erased from the display when a Current string
+       ///< _with_ ".ff" is followed by one without it.
+  virtual void SetTotal(const char *Total) = 0;
+       ///< Sets the total length of the recording, as a user readable 
+       ///< string if the form "h:mm:ss".
+  virtual void SetJump(const char *Jump) = 0;
+       ///< Sets the prompt that allows the user to enter a jump point.
+       ///< Jump is a string of the form "Jump: mm:ss". The actual implementation
+       ///< needs to be able to handle variations in the length of this
+       ///< string, which will occur when the user enters an actual value.
+       ///< If Jump is NULL, the jump prompt shall be removed from the display.
+  };
+
+class cSkinDisplayVolume : public cSkinDisplay {
+       ///< This class implements the volume/mute display.
+public:
+  virtual void SetVolume(int Current, int Total, bool Mute) = 0;
+       ///< Sets the volume to the given Current value, which is in the range
+       ///< 0...Total. If Mute is true, audio is currently muted and a "mute"
+       ///< indicator shall be displayed.
+  };
+
+class cSkinDisplayMessage : public cSkinDisplay {
+       ///< This class implements a simple message display.
+public:
+  virtual void SetMessage(eMessageType Type, const char *Text) = 0;
+       ///< Sets the message to Text. Type can be used to decide how to display
+       ///< the message, for instance in which colors.
+  };
+
+class cSkin : public cListObject {
+private:
+  char *name;
+  cTheme *theme;
+public:
+  cSkin(const char *Name, cTheme *Theme = NULL);
+       ///< Creates a new skin class, with the given Name and Theme.
+       ///< Name will be used to identify this skin in the 'setup.conf'
+       ///< file, and is normally not seen by the user. It should
+       ///< consist of only lowercase letters and digits.
+       ///< Theme must be a static object that survives the entire lifetime
+       ///< of this skin.
+       ///< The constructor of a derived class shall not set up any data
+       ///< structures yet, because whether or not this skin will actually
+       ///< be used is not yet known at this point. All actual work shall
+       ///< be done in the pure functions below.
+       ///< A cSkin object must be created on the heap and shall not be
+       ///< explicitly deleted.
+  virtual ~cSkin();
+  const char *Name(void) { return name; }
+  cTheme *Theme(void) { return theme; }
+  virtual const char *Description(void) = 0;
+       ///< Returns a user visible, single line description of this skin,
+       ///< which may consist of arbitrary text and can, if the skin
+       ///< implementation wishes to do so, be internationalized.
+       ///< The actual text shouldn't be too long, so that it can be
+       ///< fully displayed in the Setup/OSD menu.
+  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo) = 0;
+       ///< Creates and returns a new object for displaying the current
+       ///< channel. WithInfo indicates whether it shall display only
+       ///< the basic channel data, or also information about the present
+       ///< and following EPG event.
+       ///< The caller must delete the object after use.
+  virtual cSkinDisplayMenu *DisplayMenu(void) = 0;
+       ///< Creates and returns a new object for displaying a menu.
+       ///< The caller must delete the object after use.
+  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly) = 0;
+       ///< Creates and returns a new object for displaying replay progress.
+       ///< ModeOnly indicates whether this should be a full featured replay
+       ///< display, or just a replay mode indicator.
+       ///< The caller must delete the object after use.
+  virtual cSkinDisplayVolume *DisplayVolume(void) = 0;
+       ///< Creates and returns a new object for displaying the current volume.
+       ///< The caller must delete the object after use.
+  virtual cSkinDisplayMessage *DisplayMessage(void) = 0;
+       ///< Creates and returns a new object for displaying a message.
+       ///< The caller must delete the object after use.
+  };
+
+class cSkins : public cList<cSkin> {
+private:
+  cSkin *current;
+  cSkinDisplayMessage *displayMessage;
+public:
+  cSkins(void);
+  ~cSkins();
+  bool SetCurrent(const char *Name = NULL);
+       ///< Sets the current skin to the one indicated by name.
+       ///< If no such skin can be found, the first one will be used.
+  cSkin *Current(void) { return current; }
+       ///< Returns a pointer to the current skin.
+  bool IsOpen(void) { return cSkinDisplay::Current(); }
+       ///< Returns true if there is currently a skin display object active.
+  eKeys Message(eMessageType Type, const char *s, int Seconds = 0);
+       ///< Displays the given message, either through a currently visible
+       ///< display object that is capable of doing so, or by creating a
+       ///< temporary cSkinDisplayMessage object.
+  void Flush(void);
+       ///< Flushes the currently active cSkinDisplay, if any.
+  };
+
+extern cSkins Skins;
+
+#endif //__SKINS_H
diff --git a/skinsttng.c b/skinsttng.c
new file mode 100644
index 000000000..cb44a3e09
--- /dev/null
+++ b/skinsttng.c
@@ -0,0 +1,879 @@
+/*
+ * skinsttng.c: A VDR skin with ST:TNG Panels
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skinsttng.c 1.1 2004/05/16 09:27:35 kls Exp $
+ */
+
+// Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
+// registered in the United States Patent and Trademark Office.
+// No infringement intended.
+
+#include "skinsttng.h"
+#include "font.h"
+#include "osd.h"
+#include "menu.h"
+#include "themes.h"
+
+#include "symbols/arrowdown.xpm"
+#include "symbols/arrowup.xpm"
+#include "symbols/audio.xpm"
+#include "symbols/dolbydigital.xpm"
+#include "symbols/encrypted.xpm"
+#include "symbols/ffwd.xpm"
+#include "symbols/ffwd1.xpm"
+#include "symbols/ffwd2.xpm"
+#include "symbols/ffwd3.xpm"
+#include "symbols/frew.xpm"
+#include "symbols/frew1.xpm"
+#include "symbols/frew2.xpm"
+#include "symbols/frew3.xpm"
+#include "symbols/mute.xpm"
+#include "symbols/pause.xpm"
+#include "symbols/play.xpm"
+#include "symbols/radio.xpm"
+#include "symbols/recording.xpm"
+#include "symbols/sfwd.xpm"
+#include "symbols/sfwd1.xpm"
+#include "symbols/sfwd2.xpm"
+#include "symbols/sfwd3.xpm"
+#include "symbols/srew.xpm"
+#include "symbols/srew1.xpm"
+#include "symbols/srew2.xpm"
+#include "symbols/srew3.xpm"
+#include "symbols/teletext.xpm"
+#include "symbols/volume.xpm"
+
+#define Roundness   10
+#define Gap          5
+#define ScrollWidth  5
+
+static cTheme Theme;
+
+THEME_CLR(Theme, clrBackground,             clrGray50);
+THEME_CLR(Theme, clrButtonRedFg,            clrWhite);
+THEME_CLR(Theme, clrButtonRedBg,            clrRed);
+THEME_CLR(Theme, clrButtonGreenFg,          clrBlack);
+THEME_CLR(Theme, clrButtonGreenBg,          clrGreen);
+THEME_CLR(Theme, clrButtonYellowFg,         clrBlack);
+THEME_CLR(Theme, clrButtonYellowBg,         clrYellow);
+THEME_CLR(Theme, clrButtonBlueFg,           clrWhite);
+THEME_CLR(Theme, clrButtonBlueBg,           clrBlue);
+THEME_CLR(Theme, clrMessageFrame,           clrYellow);
+THEME_CLR(Theme, clrMessageStatusFg,        clrBlack);
+THEME_CLR(Theme, clrMessageStatusBg,        clrCyan);
+THEME_CLR(Theme, clrMessageInfoFg,          clrBlack);
+THEME_CLR(Theme, clrMessageInfoBg,          clrGreen);
+THEME_CLR(Theme, clrMessageWarningFg,       clrBlack);
+THEME_CLR(Theme, clrMessageWarningBg,       clrYellow);
+THEME_CLR(Theme, clrMessageErrorFg,         clrWhite);
+THEME_CLR(Theme, clrMessageErrorBg,         clrRed);
+THEME_CLR(Theme, clrVolumeFrame,            clrYellow);
+THEME_CLR(Theme, clrVolumeSymbol,           clrBlack);
+THEME_CLR(Theme, clrVolumeBarUpper,         0xFFBC8024);
+THEME_CLR(Theme, clrVolumeBarLower,         0xFF248024);
+THEME_CLR(Theme, clrChannelFrame,           clrYellow);
+THEME_CLR(Theme, clrChannelName,            clrBlack);
+THEME_CLR(Theme, clrChannelDate,            clrBlack);
+THEME_CLR(Theme, clrChannelSymbolOn,        clrBlack);
+THEME_CLR(Theme, clrChannelSymbolOff,       0xFFBC8024);
+THEME_CLR(Theme, clrChannelSymbolRecFg,     clrWhite);
+THEME_CLR(Theme, clrChannelSymbolRecBg,     clrRed);
+THEME_CLR(Theme, clrChannelEpgTime,         clrBlack);
+THEME_CLR(Theme, clrChannelEpgTitle,        clrCyan);
+THEME_CLR(Theme, clrChannelEpgShortText,    clrYellow);
+THEME_CLR(Theme, clrChannelTimebarSeen,     clrYellow);
+THEME_CLR(Theme, clrChannelTimebarRest,     clrGray50);
+THEME_CLR(Theme, clrMenuFrame,              clrYellow);
+THEME_CLR(Theme, clrMenuTitle,              clrBlack);
+THEME_CLR(Theme, clrMenuDate,               clrBlack);
+THEME_CLR(Theme, clrMenuItemCurrentFg,      clrBlack);
+THEME_CLR(Theme, clrMenuItemCurrentBg,      clrYellow);
+THEME_CLR(Theme, clrMenuItemSelectable,     clrYellow);
+THEME_CLR(Theme, clrMenuItemNonSelectable,  clrCyan);
+THEME_CLR(Theme, clrMenuEventTime,          clrYellow);
+THEME_CLR(Theme, clrMenuEventVps,           clrBlack);
+THEME_CLR(Theme, clrMenuEventTitle,         clrCyan);
+THEME_CLR(Theme, clrMenuEventShortText,     clrYellow);
+THEME_CLR(Theme, clrMenuEventDescription,   clrCyan);
+THEME_CLR(Theme, clrMenuScrollbarTotal,     clrYellow);
+THEME_CLR(Theme, clrMenuScrollbarShown,     clrCyan);
+THEME_CLR(Theme, clrMenuScrollbarArrow,     clrBlack);
+THEME_CLR(Theme, clrMenuText,               clrCyan);
+THEME_CLR(Theme, clrReplayFrame,            clrYellow);
+THEME_CLR(Theme, clrReplayTitle,            clrBlack);
+THEME_CLR(Theme, clrReplayMode,             clrBlack);
+THEME_CLR(Theme, clrReplayCurrent,          clrBlack);
+THEME_CLR(Theme, clrReplayTotal,            clrBlack);
+THEME_CLR(Theme, clrReplayJump,             clrBlack);
+THEME_CLR(Theme, clrReplayProgressSeen,     clrGreen);
+THEME_CLR(Theme, clrReplayProgressRest,     clrWhite);
+THEME_CLR(Theme, clrReplayProgressSelected, clrRed);
+THEME_CLR(Theme, clrReplayProgressMark,     clrBlack);
+THEME_CLR(Theme, clrReplayProgressCurrent,  clrRed);
+
+// --- cSkinSTTNGDisplayChannel ----------------------------------------------
+
+class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel{
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1, y2, y3, y4, y5, y6, y7;
+  bool withInfo;
+  int lineHeight;
+  tColor frameColor;
+  const cEvent *present;
+  int lastSeen;
+  static cBitmap bmTeletext, bmRadio, bmAudio, bmDolbyDigital, bmEncrypted, bmRecording;
+public:
+  cSkinSTTNGDisplayChannel(bool WithInfo);
+  virtual ~cSkinSTTNGDisplayChannel();
+  virtual void SetChannel(const cChannel *Channel, int Number);
+  virtual void SetEvents(const cEvent *Present, const cEvent *Following);
+  virtual void Flush(void);
+  };
+
+cBitmap cSkinSTTNGDisplayChannel::bmTeletext(teletext_xpm);
+cBitmap cSkinSTTNGDisplayChannel::bmRadio(radio_xpm);
+cBitmap cSkinSTTNGDisplayChannel::bmAudio(audio_xpm);
+cBitmap cSkinSTTNGDisplayChannel::bmDolbyDigital(dolbydigital_xpm);
+cBitmap cSkinSTTNGDisplayChannel::bmEncrypted(encrypted_xpm);
+cBitmap cSkinSTTNGDisplayChannel::bmRecording(recording_xpm);
+
+cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
+{
+  present = NULL;
+  lastSeen = -1;
+  const cFont *font = cFont::GetFont(fontOsd);
+  withInfo = WithInfo;
+  lineHeight = font->Height();
+  frameColor = Theme.Color(clrChannelFrame);
+  if (withInfo) {
+     x0 = 0;
+     x1 = x0 + font->Width("00:00") + 4;
+     x2 = x1 + Roundness;
+     x3 = x2 + Gap;
+     x7 = Setup.OSDWidth;
+     x6 = x7 - lineHeight / 2;
+     x5 = x6 - lineHeight / 2;
+     x4 = x5 - Gap;
+     y0 = 0;
+     y1 = lineHeight;
+     y2 = y1 + Roundness;
+     y3 = y2 + Gap;
+     y4 = y3 + 4 * lineHeight;
+     y5 = y4 + Gap;
+     y6 = y5 + Roundness;
+     y7 = y6 + cFont::GetFont(fontSml)->Height();
+     int yt = (y0 + y1) / 2;
+     int yb = (y6 + y7) / 2;
+     osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - y7));
+     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
+     osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+     osd->DrawRectangle(x0, y6, x1 - 1, y7 - 1, clrTransparent);
+     osd->DrawRectangle(x6, y0, x7 - 1, yt - 1, clrTransparent);
+     osd->DrawRectangle(x6, yb, x7 - 1, y7 - 1, clrTransparent);
+     osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 2);
+     osd->DrawRectangle(x1, y0, x4 - 1, y1 - 1, frameColor);
+     osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+     osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+     osd->DrawRectangle(x0, y1, x1 - 1, y2 - 1, frameColor);
+     osd->DrawEllipse  (x1, y1, x2 - 1, y2 - 1, frameColor, -2);
+     osd->DrawRectangle(x0, y3, x1 - 1, y4 - 1, frameColor);
+     osd->DrawRectangle(x0, y5, x1 - 1, y6 - 1, frameColor);
+     osd->DrawEllipse  (x1, y5, x2 - 1, y6 - 1, frameColor, -3);
+     osd->DrawEllipse  (x0, y6, x1 - 1, y7 - 1, frameColor, 3);
+     osd->DrawRectangle(x1, y6, x4 - 1, y7 - 1, frameColor);
+     osd->DrawRectangle(x5, y6, x6 - 1, y7 - 1, frameColor);
+     osd->DrawEllipse  (x6, y6, x7 - 1, y7 - 1, frameColor, 5);
+     }
+  else {
+     x0 = 0;
+     x1 = lineHeight / 2;
+     x2 = lineHeight;
+     x3 = x2 + Gap;
+     x7 = Setup.OSDWidth;
+     x6 = x7 - lineHeight / 2;
+     x5 = x6 - lineHeight / 2;
+     x4 = x5 - Gap;
+     y0 = 0;
+     y1 = lineHeight;
+     osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - y1));
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
+     osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
+     osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+     osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+     osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+     }
+}
+
+cSkinSTTNGDisplayChannel::~cSkinSTTNGDisplayChannel()
+{
+  delete osd;
+}
+
+void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
+{
+  osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+  int x = x4 - 5;
+  if (Channel && !Channel->GroupSep()) {
+     int d = 3;
+     bool rec = cRecordControls::Active();
+     x -= bmRecording.Width() + d;
+     osd->DrawBitmap(x, y0 + (y1 - y0 - bmRecording.Height()) / 2, bmRecording, Theme.Color(rec ? clrChannelSymbolRecFg : clrChannelSymbolOff), rec ? Theme.Color(clrChannelSymbolRecBg) : frameColor);
+     x -= bmEncrypted.Width() + d;
+     osd->DrawBitmap(x, y0 + (y1 - y0 - bmEncrypted.Height()) / 2, bmEncrypted, Theme.Color(Channel->Ca() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     x -= bmDolbyDigital.Width() + d;
+     osd->DrawBitmap(x, y0 + (y1 - y0 - bmDolbyDigital.Height()) / 2, bmDolbyDigital, Theme.Color(Channel->Dpid1() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     x -= bmAudio.Width() + d;
+     osd->DrawBitmap(x, y0 + (y1 - y0 - bmAudio.Height()) / 2, bmAudio, Theme.Color(Channel->Apid2() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     if (Channel->Vpid()) {
+        x -= bmTeletext.Width() + d;
+        osd->DrawBitmap(x, y0 + (y1 - y0 - bmTeletext.Height()) / 2, bmTeletext, Theme.Color(Channel->Tpid() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+        }
+     else {
+        x -= bmRadio.Width() + d;
+        osd->DrawBitmap(x, y0 + (y1 - y0 - bmRadio.Height()) / 2, bmRadio, Theme.Color(clrChannelSymbolOn), frameColor);
+        }
+     }
+  osd->DrawText(x3 + 2, y0, ChannelString(Channel, Number), Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontOsd), x - x3 - 2);
+}
+
+void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
+{
+  if (!withInfo)
+     return;
+  if (present != Present)
+     lastSeen = -1;
+  present = Present;   
+  osd->DrawRectangle(x0, y3, x1 - 1, y4 - 1, frameColor);
+  osd->DrawRectangle(x3, y3, x7 - 1, y4 - 1, Theme.Color(clrBackground));
+  for (int i = 0; i < 2; i++) {
+      const cEvent *e = !i ? Present : Following;
+      if (e) {
+         osd->DrawText(x0 + 2, y3 + 2 * i * lineHeight, e->GetTimeString(), Theme.Color(clrChannelEpgTime), frameColor, cFont::GetFont(fontOsd));
+         osd->DrawText(x3 + 2, y3 + 2 * i * lineHeight, e->Title(), Theme.Color(clrChannelEpgTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd), x4 - x3 - 2);
+         osd->DrawText(x3 + 2, y3 + (2 * i + 1) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), x4 - x3 - 2);
+         }
+      }
+}
+
+void cSkinSTTNGDisplayChannel::Flush(void)
+{
+  if (withInfo) {
+     const char *date = DayDateTime();
+     const cFont *font = cFont::GetFont(fontSml);
+     osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
+   
+     int seen = 0;
+     if (present) {
+        time_t t = time(NULL);
+        if (t > present->StartTime())
+           seen = min(y4 - y3 - 1, int((y4 - y3) * double(t - present->StartTime()) / present->Duration()));
+        }
+     if (seen != lastSeen) {
+        osd->DrawRectangle(x1 + Gap, y3, x1 + Gap + ScrollWidth - 1, y4 - 1, Theme.Color(clrChannelTimebarRest));
+        if (seen)
+        osd->DrawRectangle(x1 + Gap, y3, x1 + Gap + ScrollWidth - 1, y3 + seen, Theme.Color(clrChannelTimebarSeen));
+        lastSeen = seen;
+        }
+     }
+  osd->Flush();
+}
+
+// --- cSkinSTTNGDisplayMenu -------------------------------------------------
+
+class cSkinSTTNGDisplayMenu : public cSkinDisplayMenu {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1, y2, y3, y4, y5, y6, y7;
+  int lineHeight;
+  tColor frameColor;
+  int currentIndex;
+  bool message;
+  void SetScrollbar(void);
+public:
+  cSkinSTTNGDisplayMenu(void);
+  virtual ~cSkinSTTNGDisplayMenu();
+  virtual void Scroll(bool Up, bool Page);
+  virtual int MaxItems(void);
+  virtual void Clear(void);
+  virtual void SetTitle(const char *Title);
+  virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetEvent(const cEvent *Event);
+  virtual void SetRecording(const cRecording *Recording);
+  virtual void SetText(const char *Text, bool FixedFont);
+  virtual void Flush(void);
+  };
+
+cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  frameColor = Theme.Color(clrMenuFrame);
+  currentIndex = -1;
+  message = false;
+  x0 = 0;
+  x1 = lineHeight / 2;
+  x2 = x1 + Roundness;
+  x3 = x2 + Gap;
+  x7 = Setup.OSDWidth;
+  x6 = x7 - lineHeight / 2;
+  x5 = x6 - lineHeight / 2;
+  x4 = x5 - Gap;
+  y0 = 0;
+  y1 = lineHeight;
+  y2 = y1 + Roundness;
+  y3 = y2 + Gap;
+  y7 = Setup.OSDHeight;
+  y6 = y7 - cFont::GetFont(fontSml)->Height();
+  y5 = y6 - Roundness;
+  y4 = y5 - Gap;
+  int yt = (y0 + y1) / 2;
+  int yb = (y6 + y7) / 2;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop);
+  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 },
+                       { x0, y1, x7 - 1, y6 - 1, 2 },
+                       { x0, y6, x7 - 1, y7 - 1, 4 }
+                     };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     /*TODO
+     tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
+                       { x0, y3, x3 - 1, y4 - 1, 1 },
+                       { x3, y3, x5 - 1, y4 - 1, 2 },
+                       { x0, y4, x7 - 1, y7 - 1, 4 }
+                     };
+     */
+     }
+  osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+  osd->DrawRectangle(x0, y6, x1 - 1, y7 - 1, clrTransparent);
+  osd->DrawRectangle(x6, y0, x7 - 1, yt - 1, clrTransparent);
+  osd->DrawRectangle(x6, yb, x7 - 1, y7 - 1, clrTransparent);
+  osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 2);
+  osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+  osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+  osd->DrawRectangle(x0, y1, x1 - 1, y6 - 1, frameColor);
+  osd->DrawEllipse  (x1, y1, x2 - 1, y2 - 1, frameColor, -2);
+  osd->DrawEllipse  (x1, y5, x2 - 1, y6 - 1, frameColor, -3);
+  osd->DrawEllipse  (x0, y6, x1 - 1, y7 - 1, frameColor, 3);
+  osd->DrawRectangle(x1, y6, x2 - 1, y7 - 1, frameColor);
+  osd->DrawRectangle(x3, y6, x4 - 1, y7 - 1, frameColor);
+  osd->DrawRectangle(x5, y6, x6 - 1, y7 - 1, frameColor);
+  osd->DrawEllipse  (x6, y6, x7 - 1, y7 - 1, frameColor, 5);
+}
+
+cSkinSTTNGDisplayMenu::~cSkinSTTNGDisplayMenu()
+{
+  delete osd;
+}
+
+void cSkinSTTNGDisplayMenu::SetScrollbar(void)
+{
+  if (textScroller.CanScroll()) {
+     int h  = lineHeight;
+     int yt = textScroller.Top();
+     int yb = yt + textScroller.Height();
+     int st = yt + h + Gap;
+     int sb = yb - h - Gap;
+     int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
+     int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
+     osd->DrawRectangle(x5, st, x5 + ScrollWidth - 1, sb, Theme.Color(clrMenuScrollbarTotal));
+     osd->DrawRectangle(x5, tt, x5 + ScrollWidth - 1, tb, Theme.Color(clrMenuScrollbarShown));
+     osd->DrawRectangle(x5, yt, x6 - 1, yt + h - 1, frameColor);
+     osd->DrawEllipse  (x6, yt, x7 - 1, yt + h - 1, frameColor, 5);
+     osd->DrawRectangle(x5, yb - h, x6 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (x6, yb - h, x7 - 1, yb - 1, frameColor, 5);
+     if (textScroller.CanScrollUp()) {
+        cBitmap bm(arrowup_xpm);
+        osd->DrawBitmap(x5 + (x7 - x5 - bm.Width()) / 2 - 2, yt + (h - bm.Height()) / 2, bm, Theme.Color(clrMenuScrollbarArrow), frameColor);
+        }
+     if (textScroller.CanScrollDown()) {
+        cBitmap bm(arrowdown_xpm);
+        osd->DrawBitmap(x5 + (x7 - x5 - bm.Width()) / 2 - 2, yb - h + (h - bm.Height()) / 2, bm, Theme.Color(clrMenuScrollbarArrow), frameColor);
+        }
+     }
+}
+
+void cSkinSTTNGDisplayMenu::Scroll(bool Up, bool Page)
+{
+  cSkinDisplayMenu::Scroll(Up, Page);
+  SetScrollbar();
+}
+
+int cSkinSTTNGDisplayMenu::MaxItems(void)
+{
+  return (y4 - y3 - 2 * Roundness) / lineHeight;
+}
+
+void cSkinSTTNGDisplayMenu::Clear(void)
+{
+  textScroller.Reset();
+  osd->DrawRectangle(x1, y3, x7 - 1, y4 - 1, Theme.Color(clrBackground));
+}
+
+void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  const char *VDR = " VDR";
+  int w = font->Width(VDR);
+  osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - w - x3 - 5);
+  osd->DrawText(x4 - w, y0, VDR, frameColor, clrBlack, font);
+}
+
+void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  const char *date = DayDateTime();
+  const cFont *font = cFont::GetFont(fontSml);
+  int d = 10;
+  int d2 = d / 2;
+  int t4 = x4 - font->Width(date) - 2;
+  int w = t4 - x3;
+  int t0 = x3 + d2;
+  int t1 = x3 + w / 4;
+  int t2 = x3 + w / 2;
+  int t3 = t4 - w / 4;
+  osd->DrawRectangle(t0 + d2, y6, t1 - d2, y7 - 1, clrBlack);
+  osd->DrawRectangle(t1 + d2, y6, t2 - d2, y7 - 1, clrBlack);
+  osd->DrawRectangle(t2 + d2, y6, t3 - d2, y7 - 1, clrBlack);
+  osd->DrawRectangle(t3 + d2, y6, t4 - d2, y7 - 1, clrBlack);
+  osd->DrawText(t0 + d, y6, Red,    Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font, t1 - t0 - 2 * d, 0, taCenter);
+  osd->DrawText(t1 + d, y6, Green,  Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font, t2 - t1 - 2 * d, 0, taCenter);
+  osd->DrawText(t2 + d, y6, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, t3 - t2 - 2 * d, 0, taCenter);
+  osd->DrawText(t3 + d, y6, Blue,   Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font, t4 - t3 - 2 * d, 0, taCenter);
+}
+
+void cSkinSTTNGDisplayMenu::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontSml);
+  if (Text) {
+     osd->SaveRegion(x3, y6, x4 - 1, y7 - 1);
+     osd->DrawText(x3, y6, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x4 - x3, 0, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
+void cSkinSTTNGDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable)
+{
+  int y = y3 + Roundness + Index * lineHeight;
+  tColor ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = Theme.Color(clrMenuItemCurrentFg);
+     ColorBg = Theme.Color(clrMenuItemCurrentBg);
+     osd->DrawEllipse  (x1, y - Roundness,  x2 - 1, y - 1, frameColor, -3);
+     osd->DrawRectangle(x1, y,              x2 - 1, y + lineHeight - 1, frameColor);
+     osd->DrawEllipse  (x1, y + lineHeight, x2 - 1, y + lineHeight + Roundness - 1, frameColor, -2);
+     osd->DrawRectangle(x3, y,              x4 - 1, y + lineHeight - 1, ColorBg);
+     currentIndex = Index;
+     }
+  else {
+     ColorFg = Theme.Color(Selectable ? clrMenuItemSelectable : clrMenuItemNonSelectable);
+     ColorBg = Theme.Color(clrBackground);
+     if (currentIndex == Index) {
+        osd->DrawRectangle(x1, y - Roundness,  x2 - 1, y + lineHeight + Roundness - 1, Theme.Color(clrBackground));
+        osd->DrawRectangle(x3, y,              x4 - 1, y + lineHeight - 1, Theme.Color(clrBackground));
+        }
+     }
+  const cFont *font = cFont::GetFont(fontOsd);
+  for (int i = 0; i < MaxTabs; i++) {
+      const char *s = GetTabbedText(Text, i);
+      if (s) {
+         int xt = x3 + 5 + Tab(i);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, font, x4 - xt);
+         }
+      if (!Tab(i + 1))
+         break;
+      }
+  SetEditableWidth(x4 - x3 - 5 - Tab(1));
+}
+
+void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
+{
+  if (!Event)
+     return;
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xl = x3 + 5;
+  int y = y3;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());//TODO dayname, no year
+  ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
+  if (Event->Vps() && Event->Vps() != Event->StartTime()) {
+     char *buffer;
+     asprintf(&buffer, " VPS: %s", Event->GetVpsString());
+     const cFont *font = cFont::GetFont(fontSml);
+     osd->DrawText(x4 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVps), frameColor, font);
+     int yb = y + font->Height();
+     osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (x6, y, x7 - 1, yb - 1, frameColor, 5);
+     free(buffer);
+     }
+  y += ts.Height();
+  y += font->Height();
+  ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (!isempty(Event->ShortText())) {
+     const cFont *font = cFont::GetFont(fontSml);
+     ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+     y += ts.Height();
+     }
+  y += font->Height();
+  if (!isempty(Event->Description())) {
+     int yt = y;
+     int yb = y4 - Roundness;
+     textScroller.Set(osd, xl, yt, x4 - xl, yb - yt, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
+     yb = yt + textScroller.Height();
+     osd->DrawEllipse  (x1, yt - Roundness, x2, yt,             frameColor, -3);
+     osd->DrawRectangle(x1, yt,             x2, yb,             frameColor);
+     osd->DrawEllipse  (x1, yb,             x2, yb + Roundness, frameColor, -2);
+     SetScrollbar();
+     }
+}
+
+void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
+{
+  SetText(Recording->Summary(), false); //XXX
+}
+
+void cSkinSTTNGDisplayMenu::SetText(const char *Text, bool FixedFont)
+{
+  const cFont *font = cFont::GetFont(FixedFont ? fontFix : fontOsd);
+  font = cFont::GetFont(fontSml);//XXX -> make a way to let the text define which font to use
+  textScroller.Set(osd, x3, y3, x4 - x3, y4 - y3, Text, font, Theme.Color(clrMenuText), Theme.Color(clrBackground));
+  SetScrollbar();
+}
+
+void cSkinSTTNGDisplayMenu::Flush(void)
+{
+  if (!message) {
+     const char *date = DayDateTime();
+     const cFont *font = cFont::GetFont(fontSml);
+     osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrMenuDate), frameColor, font);
+     }
+  osd->Flush();
+}
+
+// --- cSkinSTTNGDisplayReplay -----------------------------------------------
+
+class cSkinSTTNGDisplayReplay : public cSkinDisplayReplay {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1, y2, y3, y4, y5, y6, y7;
+  tColor frameColor;
+  int lastCurrentWidth;
+public:
+  cSkinSTTNGDisplayReplay(bool ModeOnly);
+  virtual ~cSkinSTTNGDisplayReplay();
+  virtual void SetTitle(const char *Title);
+  virtual void SetMode(bool Play, bool Forward, int Speed);
+  virtual void SetProgress(int Current, int Total);
+  virtual void SetCurrent(const char *Current);
+  virtual void SetTotal(const char *Total);
+  virtual void SetJump(const char *Jump);
+  virtual void Flush(void);
+  };
+
+#define SymbolWidth 30
+#define SymbolHeight 30
+
+cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
+{
+  const cFont *font = cFont::GetFont(fontSml);
+  int lineHeight = font->Height();
+  frameColor = Theme.Color(clrReplayFrame);
+  lastCurrentWidth = 0;
+  cBitmap bm(play_xpm);
+  x0 = 0;
+  x1 = max(SymbolWidth, bm.Width());
+  x2 = x1 + Roundness;
+  x3 = x2 + Gap;
+  x7 = Setup.OSDWidth;
+  x6 = x7 - lineHeight / 2;
+  x5 = x6 - lineHeight / 2;
+  x4 = x5 - Gap;
+  y0 = 0;
+  y1 = lineHeight;
+  y2 = y1 + Roundness;
+  y3 = y2 + Gap;
+  y4 = y3 + max(SymbolHeight, bm.Height());
+  y5 = y4 + Gap;
+  y6 = y5 + Roundness;
+  y7 = y6 + font->Height();
+  int yt = (y0 + y1) / 2;
+  int yb = (y6 + y7) / 2;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y7);
+  tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, ModeOnly ? clrTransparent : Theme.Color(clrBackground));
+  if (!ModeOnly) {
+     osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+     osd->DrawRectangle(x0, y6, x1 - 1, y7 - 1, clrTransparent);
+     osd->DrawRectangle(x6, y0, x7 - 1, yt - 1, clrTransparent);
+     osd->DrawRectangle(x6, yb, x7 - 1, y7 - 1, clrTransparent);
+     osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 2);
+     osd->DrawRectangle(x1, y0, x4 - 1, y1 - 1, frameColor);
+     osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+     osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+     osd->DrawRectangle(x0, y1, x1 - 1, y2 - 1, frameColor);
+     osd->DrawEllipse  (x1, y1, x2 - 1, y2 - 1, frameColor, -2);
+     }
+  osd->DrawRectangle(x0, y3, x1 - 1, y4 - 1, frameColor);
+  if (!ModeOnly) {
+     osd->DrawRectangle(x0, y5, x1 - 1, y6 - 1, frameColor);
+     osd->DrawEllipse  (x1, y5, x2 - 1, y6 - 1, frameColor, -3);
+     osd->DrawEllipse  (x0, y6, x1 - 1, y7 - 1, frameColor, 3);
+     osd->DrawRectangle(x1, y6, x4 - 1, y7 - 1, frameColor);
+     osd->DrawRectangle(x5, y6, x6 - 1, y7 - 1, frameColor);
+     osd->DrawEllipse  (x6, y6, x7 - 1, y7 - 1, frameColor, 5);
+     }
+}
+
+cSkinSTTNGDisplayReplay::~cSkinSTTNGDisplayReplay()
+{
+  delete osd;
+}
+
+void cSkinSTTNGDisplayReplay::SetTitle(const char *Title)
+{
+  osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrReplayTitle), frameColor, cFont::GetFont(fontSml), x4 - x3 - 5);
+}
+
+static char **ReplaySymbols[2][2][5] = {
+  { { pause_xpm, srew_xpm, srew1_xpm, srew2_xpm, srew3_xpm },
+    { pause_xpm, sfwd_xpm, sfwd1_xpm, sfwd2_xpm, sfwd3_xpm }, },
+  { { play_xpm,  frew_xpm, frew1_xpm, frew2_xpm, frew3_xpm },
+    { play_xpm,  ffwd_xpm, ffwd1_xpm, ffwd2_xpm, ffwd3_xpm } }
+  };
+
+void cSkinSTTNGDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
+{
+  if (Speed < -1)
+     Speed = -1;
+  if (Speed > 3)
+     Speed = 3;
+  cBitmap bm(ReplaySymbols[Play][Forward][Speed + 1]);
+  osd->DrawBitmap(x0 + (x1 - x0 - bm.Width()) / 2, y3 + (y4 - y3 - bm.Height()) / 2, bm, Theme.Color(clrReplayMode), frameColor);
+}
+
+void cSkinSTTNGDisplayReplay::SetProgress(int Current, int Total)
+{
+  cProgressBar pb(x4 - x3, y4 - y3, Current, Total, marks, Theme.Color(clrReplayProgressSeen), Theme.Color(clrReplayProgressRest), Theme.Color(clrReplayProgressSelected), Theme.Color(clrReplayProgressMark), Theme.Color(clrReplayProgressCurrent));
+  osd->DrawBitmap(x3, y3, pb);
+}
+
+void cSkinSTTNGDisplayReplay::SetCurrent(const char *Current)
+{
+  const cFont *font = cFont::GetFont(fontSml);
+  int w = font->Width(Current);
+  osd->DrawText(x3, y6, Current, Theme.Color(clrReplayCurrent), frameColor, font, lastCurrentWidth > w ? lastCurrentWidth : 0);
+  lastCurrentWidth = w;
+}
+
+void cSkinSTTNGDisplayReplay::SetTotal(const char *Total)
+{
+  const cFont *font = cFont::GetFont(fontSml);
+  osd->DrawText(x4 - font->Width(Total) - 5, y6, Total, Theme.Color(clrReplayTotal), frameColor, font);
+}
+
+void cSkinSTTNGDisplayReplay::SetJump(const char *Jump)
+{
+  osd->DrawText(x0 + (x4 - x0) / 4, y6, Jump, Theme.Color(clrReplayJump), frameColor, cFont::GetFont(fontSml), (x4 - x3) / 2, 0, taCenter);
+}
+
+void cSkinSTTNGDisplayReplay::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinSTTNGDisplayVolume -----------------------------------------------
+
+class cSkinSTTNGDisplayVolume : public cSkinDisplayVolume {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1;
+  tColor frameColor;
+  int mute;
+public:
+  cSkinSTTNGDisplayVolume(void);
+  virtual ~cSkinSTTNGDisplayVolume();
+  virtual void SetVolume(int Current, int Total, bool Mute);
+  virtual void Flush(void);
+  };
+
+cSkinSTTNGDisplayVolume::cSkinSTTNGDisplayVolume(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  frameColor = Theme.Color(clrVolumeFrame);
+  mute = -1;
+  x0 = 0;
+  x1 = lineHeight / 2;
+  x2 = lineHeight;
+  x3 = x2 + Gap;
+  x7 = Setup.OSDWidth;
+  x6 = x7 - lineHeight / 2;
+  x5 = x6 - lineHeight / 2;
+  x4 = x5 - Gap;
+  y0 = 0;
+  y1 = lineHeight;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y1);
+  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
+  osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
+  osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+  osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+}
+
+cSkinSTTNGDisplayVolume::~cSkinSTTNGDisplayVolume()
+{
+  delete osd;
+}
+
+void cSkinSTTNGDisplayVolume::SetVolume(int Current, int Total, bool Mute)
+{
+  int xl = x3 + 5;
+  int xr = x4 - 5;
+  int yt = y0 + 3;
+  int yb = y1 - 3;
+  if (mute != Mute) {
+     osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+     mute = Mute;
+     }
+  cBitmap bm(Mute ? mute_xpm : volume_xpm);
+  osd->DrawBitmap(xl, y0 + (y1 - y0 - bm.Height()) / 2, bm, Theme.Color(clrVolumeSymbol), frameColor);
+  if (!Mute) {
+     xl += bm.Width() + 5;
+     int w = (y1 - y0) / 3;
+     int d = 3;
+     int n = (xr - xl + d) / (w + d);
+     int x = xr - n * (w + d);
+     tColor Color = Theme.Color(clrVolumeBarLower);
+     for (int i = 0; i < n; i++) {
+         if (Total * i >= Current * n)
+            Color = Theme.Color(clrVolumeBarUpper);
+         osd->DrawRectangle(x, yt, x + w - 1, yb - 1, Color);
+         x += w + d;
+         }
+     }
+}
+
+void cSkinSTTNGDisplayVolume::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinSTTNGDisplayMessage ----------------------------------------------
+
+class cSkinSTTNGDisplayMessage : public cSkinDisplayMessage {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1;
+public:
+  cSkinSTTNGDisplayMessage(void);
+  virtual ~cSkinSTTNGDisplayMessage();
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinSTTNGDisplayMessage::cSkinSTTNGDisplayMessage(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  tColor frameColor = Theme.Color(clrMessageFrame);
+  x0 = 0;
+  x1 = lineHeight / 2;
+  x2 = lineHeight;
+  x3 = x2 + Gap;
+  x7 = Setup.OSDWidth;
+  x6 = x7 - lineHeight / 2;
+  x5 = x6 - lineHeight / 2;
+  x4 = x5 - Gap;
+  y0 = 0;
+  y1 = lineHeight;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y1);
+  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
+  osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
+  osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+  osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+}
+
+cSkinSTTNGDisplayMessage::~cSkinSTTNGDisplayMessage()
+{
+  delete osd;
+}
+
+void cSkinSTTNGDisplayMessage::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(x3, y0, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x4 - x3, 0, taCenter);
+}
+
+void cSkinSTTNGDisplayMessage::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinSTTNG ------------------------------------------------------------
+
+cSkinSTTNG::cSkinSTTNG(void)
+:cSkin("sttng", &::Theme)//XXX naming problem???
+{
+}
+
+const char *cSkinSTTNG::Description(void)
+{
+  return tr("ST:TNG Panels");
+}
+
+cSkinDisplayChannel *cSkinSTTNG::DisplayChannel(bool WithInfo)
+{
+  return new cSkinSTTNGDisplayChannel(WithInfo);
+}
+
+cSkinDisplayMenu *cSkinSTTNG::DisplayMenu(void)
+{
+  return new cSkinSTTNGDisplayMenu;
+}
+
+cSkinDisplayReplay *cSkinSTTNG::DisplayReplay(bool ModeOnly)
+{
+  return new cSkinSTTNGDisplayReplay(ModeOnly);
+}
+
+cSkinDisplayVolume *cSkinSTTNG::DisplayVolume(void)
+{
+  return new cSkinSTTNGDisplayVolume;
+}
+
+cSkinDisplayMessage *cSkinSTTNG::DisplayMessage(void)
+{
+  return new cSkinSTTNGDisplayMessage;
+}
diff --git a/skinsttng.h b/skinsttng.h
new file mode 100644
index 000000000..82b259954
--- /dev/null
+++ b/skinsttng.h
@@ -0,0 +1,26 @@
+/*
+ * skinsttng.h: A VDR skin with ST:TNG Panels
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skinsttng.h 1.1 2004/04/18 09:38:47 kls Exp $
+ */
+
+#ifndef __SKINSTTNG_H
+#define __SKINSTTNG_H
+
+#include "skins.h"
+
+class cSkinSTTNG : public cSkin {
+public:
+  cSkinSTTNG(void);
+  virtual const char *Description(void);
+  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
+  virtual cSkinDisplayMenu *DisplayMenu(void);
+  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
+  virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayMessage *DisplayMessage(void);
+  };
+
+#endif //__SKINSTTNG_H
diff --git a/svdrp.c b/svdrp.c
index 5d35eae74..63126f51e 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.61 2004/02/24 12:24:43 kls Exp $
+ * $Id: svdrp.c 1.62 2004/03/25 17:00:23 kls Exp $
  */
 
 #include "svdrp.h"
@@ -207,10 +207,10 @@ const char *HelpPages[] = {
   "    containing the given string as part of their name are listed.",
   "LSTE [ <channel> ] [ now | next | at <time> ]\n"
   "    List EPG data. Without any parameters all data of all channels is\n"
-  "    listed. If a channel is given (either by number of by channel ID),\n",
+  "    listed. If a channel is given (either by number of by channel ID),\n"
   "    only data for that channel is listed. 'now', 'next', or 'at <time>'\n"
   "    restricts the returned data to present events, following events, or\n"
-  "    events at the given time (which must be in time_t form)."
+  "    events at the given time (which must be in time_t form).",
   "LSTR [ <number> ]\n"
   "    List recordings. Without option, all recordings are listed. Otherwise\n"
   "    the summary for the given recording is listed.",
diff --git a/symbols/arrowdown.xpm b/symbols/arrowdown.xpm
new file mode 100644
index 000000000..a3f49cdfa
--- /dev/null
+++ b/symbols/arrowdown.xpm
@@ -0,0 +1,17 @@
+/* XPM */
+static char * arrowdown_xpm[] = {
+"12 12 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++",
+"++++++++++++",
+".++++++++++.",
+".++++++++++.",
+"..++++++++..",
+"..++++++++..",
+"...++++++...",
+"...++++++...",
+"....++++....",
+"....++++....",
+".....++.....",
+".....++....."};
diff --git a/symbols/arrowup.xpm b/symbols/arrowup.xpm
new file mode 100644
index 000000000..a177b4a27
--- /dev/null
+++ b/symbols/arrowup.xpm
@@ -0,0 +1,17 @@
+/* XPM */
+static char * arrowup_xpm[] = {
+"12 12 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+".....++.....",
+".....++.....",
+"....++++....",
+"....++++....",
+"...++++++...",
+"...++++++...",
+"..++++++++..",
+"..++++++++..",
+".++++++++++.",
+".++++++++++.",
+"++++++++++++",
+"++++++++++++"};
diff --git a/symbols/audio.xpm b/symbols/audio.xpm
new file mode 100644
index 000000000..26f7cabf1
--- /dev/null
+++ b/symbols/audio.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * audio_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"..+++++++++++++++++++++++..",
+"..+++++++++++++++++++++++..",
+"..++...................++..",
+"..++...................++..",
+"..++...++++.....++++...++..",
+"..++..++..++...++..++..++..",
+"..++.++....++.++....++.++..",
+"..++..++..++...++..++..++..",
+"..++...++++.....++++...++..",
+"..++...................++..",
+"..++...................++..",
+"..++...................++..",
+"..+++++++++++++++++++++++..",
+"..+++++++++++++++++++++++..",
+"...........................",
+"..........................."};
diff --git a/symbols/dolbydigital.xpm b/symbols/dolbydigital.xpm
new file mode 100644
index 000000000..e51709ea7
--- /dev/null
+++ b/symbols/dolbydigital.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"..+++++++++++.+++++++++++..",
+"..++.++++++++.++++++++.++..",
+"..++...++++++.++++++...++..",
+"..++.....++++.++++.....++..",
+"..++......+++.+++......++..",
+"..++.......++.++.......++..",
+"..++.......++.++.......++..",
+"..++.......++.++.......++..",
+"..++.......++.++.......++..",
+"..++......+++.+++......++..",
+"..++.....++++.++++.....++..",
+"..++...++++++.++++++...++..",
+"..++.++++++++.++++++++.++..",
+"..+++++++++++.+++++++++++..",
+"...........................",
+"..........................."};
diff --git a/symbols/encrypted.xpm b/symbols/encrypted.xpm
new file mode 100644
index 000000000..f2ae082a8
--- /dev/null
+++ b/symbols/encrypted.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * encrypted_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"..+++++++++++++++++++++++..",
+"..+++++++++++++++++++++++..",
+"..++...................++..",
+"..++...................++..",
+"..++............++++...++..",
+"..++...........++..++..++..",
+"..++.+++++++++++....++.++..",
+"..++.+++++++++++....++.++..",
+"..++..+++......++..++..++..",
+"..++..+++.......++++...++..",
+"..++...................++..",
+"..++...................++..",
+"..+++++++++++++++++++++++..",
+"..+++++++++++++++++++++++..",
+"...........................",
+"..........................."};
diff --git a/symbols/ffwd.xpm b/symbols/ffwd.xpm
new file mode 100644
index 000000000..7d1edc2c8
--- /dev/null
+++ b/symbols/ffwd.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * ffwd_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..++......++................",
+"..+++.....+++...............",
+"..+++++...+++++.............",
+"..++++++....++++............",
+"..++++++++...+++++..........",
+"..+++++++++....++++.........",
+"..+++++++++++...+++++.......",
+"..++++++++++++....++++......",
+"..++++++++++++++...+++++....",
+"..+++++++++++++++....++++...",
+"..++++++++++++++++....++++..",
+"..++++++++++++++++....++++..",
+"..+++++++++++++++....++++...",
+"..++++++++++++++...+++++....",
+"..++++++++++++....++++......",
+"..+++++++++++...+++++.......",
+"..+++++++++....++++.........",
+"..++++++++...+++++..........",
+"..++++++....++++............",
+"..+++++...+++++.............",
+"..+++.....+++...............",
+"..++......++................",
+"............................",
+"............................"};
diff --git a/symbols/ffwd1.xpm b/symbols/ffwd1.xpm
new file mode 100644
index 000000000..f78db80c1
--- /dev/null
+++ b/symbols/ffwd1.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * ffwd1_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..++......++................",
+"..+++.....+++...............",
+"..+++++...+++++.............",
+"..++++++....++++............",
+"..++++++++...+++++..........",
+"..+++++++++....++++.........",
+"..+++++++++++...+++++.......",
+"..++++++++++++....++++......",
+"..++++++++++++++...+++++....",
+"..++++++++++++++.....++++...",
+"..++++++++++++++...+++++....",
+"..++++++++++++....++++......",
+"..+++++++++++...+++++.......",
+"..+++++++++....++++.........",
+"..++++++++...+++++..........",
+"..++++++....++++............",
+"..+++++...+++++.............",
+"..+++.....+++...............",
+"..++......++................",
+"............................",
+"..++++++....................",
+"..++++++....................",
+"............................",
+"............................"};
diff --git a/symbols/ffwd2.xpm b/symbols/ffwd2.xpm
new file mode 100644
index 000000000..f117fc25e
--- /dev/null
+++ b/symbols/ffwd2.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * ffwd2_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..++......++................",
+"..+++.....+++...............",
+"..+++++...+++++.............",
+"..++++++....++++............",
+"..++++++++...+++++..........",
+"..+++++++++....++++.........",
+"..+++++++++++...+++++.......",
+"..++++++++++++....++++......",
+"..++++++++++++++...+++++....",
+"..++++++++++++++.....++++...",
+"..++++++++++++++...+++++....",
+"..++++++++++++....++++......",
+"..+++++++++++...+++++.......",
+"..+++++++++....++++.........",
+"..++++++++...+++++..........",
+"..++++++....++++............",
+"..+++++...+++++.............",
+"..+++.....+++...............",
+"..++......++................",
+"............................",
+"..++++++...++++++...........",
+"..++++++...++++++...........",
+"............................",
+"............................"};
diff --git a/symbols/ffwd3.xpm b/symbols/ffwd3.xpm
new file mode 100644
index 000000000..8b9e9b0d9
--- /dev/null
+++ b/symbols/ffwd3.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * ffwd3_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..++......++................",
+"..+++.....+++...............",
+"..+++++...+++++.............",
+"..++++++....++++............",
+"..++++++++...+++++..........",
+"..+++++++++....++++.........",
+"..+++++++++++...+++++.......",
+"..++++++++++++....++++......",
+"..++++++++++++++...+++++....",
+"..++++++++++++++.....++++...",
+"..++++++++++++++...+++++....",
+"..++++++++++++....++++......",
+"..+++++++++++...+++++.......",
+"..+++++++++....++++.........",
+"..++++++++...+++++..........",
+"..++++++....++++............",
+"..+++++...+++++.............",
+"..+++.....+++...............",
+"..++......++................",
+"............................",
+"..++++++...++++++...++++++..",
+"..++++++...++++++...++++++..",
+"............................",
+"............................"};
diff --git a/symbols/frew.xpm b/symbols/frew.xpm
new file mode 100644
index 000000000..d8a6c4747
--- /dev/null
+++ b/symbols/frew.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * frew_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++......++..",
+"...............+++.....+++..",
+".............+++++...+++++..",
+"............++++....++++++..",
+"..........+++++...++++++++..",
+".........++++....+++++++++..",
+".......+++++...+++++++++++..",
+"......++++....++++++++++++..",
+"....+++++...++++++++++++++..",
+"...++++....+++++++++++++++..",
+"..++++....++++++++++++++++..",
+"..++++....++++++++++++++++..",
+"...++++....+++++++++++++++..",
+"....+++++...++++++++++++++..",
+"......++++....++++++++++++..",
+".......+++++...+++++++++++..",
+".........++++....+++++++++..",
+"..........+++++...++++++++..",
+"............++++....++++++..",
+".............+++++...+++++..",
+"...............+++.....+++..",
+"................++......++..",
+"............................",
+"............................"};
diff --git a/symbols/frew1.xpm b/symbols/frew1.xpm
new file mode 100644
index 000000000..493c229d3
--- /dev/null
+++ b/symbols/frew1.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * frew1_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++......++..",
+"...............+++.....+++..",
+".............+++++...+++++..",
+"............++++....++++++..",
+"..........+++++...++++++++..",
+".........++++....+++++++++..",
+".......+++++...+++++++++++..",
+"......++++....++++++++++++..",
+"....+++++...++++++++++++++..",
+"...++++.....++++++++++++++..",
+"....+++++...++++++++++++++..",
+"......++++....++++++++++++..",
+".......+++++...+++++++++++..",
+".........++++....+++++++++..",
+"..........+++++...++++++++..",
+"............++++....++++++..",
+".............+++++...+++++..",
+"...............+++.....+++..",
+"................++......++..",
+"............................",
+"....................++++++..",
+"....................++++++..",
+"............................",
+"............................"};
diff --git a/symbols/frew2.xpm b/symbols/frew2.xpm
new file mode 100644
index 000000000..81fc0ee65
--- /dev/null
+++ b/symbols/frew2.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * frew2_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++......++..",
+"...............+++.....+++..",
+".............+++++...+++++..",
+"............++++....++++++..",
+"..........+++++...++++++++..",
+".........++++....+++++++++..",
+".......+++++...+++++++++++..",
+"......++++....++++++++++++..",
+"....+++++...++++++++++++++..",
+"...++++.....++++++++++++++..",
+"....+++++...++++++++++++++..",
+"......++++....++++++++++++..",
+".......+++++...+++++++++++..",
+".........++++....+++++++++..",
+"..........+++++...++++++++..",
+"............++++....++++++..",
+".............+++++...+++++..",
+"...............+++.....+++..",
+"................++......++..",
+"............................",
+"...........++++++...++++++..",
+"...........++++++...++++++..",
+"............................",
+"............................"};
diff --git a/symbols/frew3.xpm b/symbols/frew3.xpm
new file mode 100644
index 000000000..19b183cd9
--- /dev/null
+++ b/symbols/frew3.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * frew3_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++......++..",
+"...............+++.....+++..",
+".............+++++...+++++..",
+"............++++....++++++..",
+"..........+++++...++++++++..",
+".........++++....+++++++++..",
+".......+++++...+++++++++++..",
+"......++++....++++++++++++..",
+"....+++++...++++++++++++++..",
+"...++++.....++++++++++++++..",
+"....+++++...++++++++++++++..",
+"......++++....++++++++++++..",
+".......+++++...+++++++++++..",
+".........++++....+++++++++..",
+"..........+++++...++++++++..",
+"............++++....++++++..",
+".............+++++...+++++..",
+"...............+++.....+++..",
+"................++......++..",
+"............................",
+"..++++++...++++++...++++++..",
+"..++++++...++++++...++++++..",
+"............................",
+"............................"};
diff --git a/symbols/mute.xpm b/symbols/mute.xpm
new file mode 100644
index 000000000..0f1292f5c
--- /dev/null
+++ b/symbols/mute.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * mute_xpm[] = {
+"26 20 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"......++.......++.......++",
+"......+++....++++......+++",
+".......+++..+++++.....+++.",
+"........+++..+.++....+++..",
+".......+.+++...++...+++...",
+".....++++.+++..++..+++....",
+"++++++++...+++....+++.....",
+"+++++++.....+++..+++......",
+"++...++......++++++.......",
+"++...++.......++++........",
+"++...++.......++++........",
+"++...++......++++++.......",
+"+++++++.....+++..+++......",
+"++++++++...+++....+++.....",
+".....++++.+++..++..+++....",
+".......+.+++...++...+++...",
+"........+++..+.++....+++..",
+".......+++..+++++.....+++.",
+"......+++....++++......+++",
+"......++.......++.......++"};
diff --git a/symbols/pause.xpm b/symbols/pause.xpm
new file mode 100644
index 000000000..c1d82c326
--- /dev/null
+++ b/symbols/pause.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * pause_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"......+++++......+++++......",
+"............................",
+"............................"};
diff --git a/symbols/play.xpm b/symbols/play.xpm
new file mode 100644
index 000000000..0e088f862
--- /dev/null
+++ b/symbols/play.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * play_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"......++....................",
+"......+++...................",
+"......+++++.................",
+"......++++++................",
+"......++++++++..............",
+"......+++++++++.............",
+"......+++++++++++...........",
+"......++++++++++++..........",
+"......++++++++++++++........",
+"......+++++++++++++++.......",
+"......++++++++++++++++......",
+"......++++++++++++++++......",
+"......+++++++++++++++.......",
+"......++++++++++++++........",
+"......++++++++++++..........",
+"......+++++++++++...........",
+"......+++++++++.............",
+"......++++++++..............",
+"......++++++................",
+"......+++++.................",
+"......+++...................",
+"......++....................",
+"............................",
+"............................"};
diff --git a/symbols/radio.xpm b/symbols/radio.xpm
new file mode 100644
index 000000000..f4d1fc936
--- /dev/null
+++ b/symbols/radio.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * radio_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"............+++++..........",
+"............+++++++++......",
+"............+++++++++++....",
+"............+++...++++++...",
+"............+++.....++++...",
+"............+++.....+++....",
+"............+++.....++.....",
+"............+++............",
+"............+++............",
+"............+++............",
+"......+++++++++............",
+"...+++++++++++++...........",
+"..+++++++++++++++..........",
+"..+++++++++++++++..........",
+"...+++++++++++++...........",
+".....++++++++++............",
+"..........................."};
diff --git a/symbols/recording.xpm b/symbols/recording.xpm
new file mode 100644
index 000000000..ea7bbd6db
--- /dev/null
+++ b/symbols/recording.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * recording_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"..++++++...++++++..++++++..",
+"..+++++++.+++++++.+++++++..",
+"..++...++.++......++.......",
+"..++...++.++......++.......",
+"..++...++.++......++.......",
+"..++...++.++......++.......",
+"..++++++..+++++...++.......",
+"..++++....+++++...++.......",
+"..++.++...++......++.......",
+"..++..++..++......++.......",
+"..++...++.++......++.......",
+"..++...++.++......++.......",
+"..++...++.+++++++.+++++++..",
+"..++...++..++++++..++++++..",
+"...........................",
+"..........................."};
diff --git a/symbols/sfwd.xpm b/symbols/sfwd.xpm
new file mode 100644
index 000000000..38468e5d4
--- /dev/null
+++ b/symbols/sfwd.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * sfwd_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..+++++...++................",
+"..+++++...+++...............",
+"..+++++...+++++.............",
+"..+++++...++++++............",
+"..+++++...++++++++..........",
+"..+++++...+++++++++.........",
+"..+++++...+++++++++++.......",
+"..+++++...++++++++++++......",
+"..+++++...++++++++++++++....",
+"..+++++...+++++++++++++++...",
+"..+++++...++++++++++++++++..",
+"..+++++...++++++++++++++++..",
+"..+++++...+++++++++++++++...",
+"..+++++...++++++++++++++....",
+"..+++++...++++++++++++......",
+"..+++++...+++++++++++.......",
+"..+++++...+++++++++.........",
+"..+++++...++++++++..........",
+"..+++++...++++++............",
+"..+++++...+++++.............",
+"..+++++...+++...............",
+"..+++++...++................",
+"............................",
+"............................"};
diff --git a/symbols/sfwd1.xpm b/symbols/sfwd1.xpm
new file mode 100644
index 000000000..f07801b0e
--- /dev/null
+++ b/symbols/sfwd1.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * sfwd1_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..+++++...++................",
+"..+++++...+++...............",
+"..+++++...+++++.............",
+"..+++++...++++++............",
+"..+++++...++++++++..........",
+"..+++++...+++++++++.........",
+"..+++++...+++++++++++.......",
+"..+++++...++++++++++++......",
+"..+++++...++++++++++++++....",
+"..+++++...+++++++++++++++...",
+"..+++++...++++++++++++++....",
+"..+++++...++++++++++++......",
+"..+++++...+++++++++++.......",
+"..+++++...+++++++++.........",
+"..+++++...++++++++..........",
+"..+++++...++++++............",
+"..+++++...+++++.............",
+"..+++++...+++...............",
+"..+++++...++................",
+"............................",
+"..++++++....................",
+"..++++++....................",
+"............................",
+"............................"};
diff --git a/symbols/sfwd2.xpm b/symbols/sfwd2.xpm
new file mode 100644
index 000000000..784744a1c
--- /dev/null
+++ b/symbols/sfwd2.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * sfwd2_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..+++++...++................",
+"..+++++...+++...............",
+"..+++++...+++++.............",
+"..+++++...++++++............",
+"..+++++...++++++++..........",
+"..+++++...+++++++++.........",
+"..+++++...+++++++++++.......",
+"..+++++...++++++++++++......",
+"..+++++...++++++++++++++....",
+"..+++++...+++++++++++++++...",
+"..+++++...++++++++++++++....",
+"..+++++...++++++++++++......",
+"..+++++...+++++++++++.......",
+"..+++++...+++++++++.........",
+"..+++++...++++++++..........",
+"..+++++...++++++............",
+"..+++++...+++++.............",
+"..+++++...+++...............",
+"..+++++...++................",
+"............................",
+"..++++++...++++++...........",
+"..++++++...++++++...........",
+"............................",
+"............................"};
diff --git a/symbols/sfwd3.xpm b/symbols/sfwd3.xpm
new file mode 100644
index 000000000..05abde6be
--- /dev/null
+++ b/symbols/sfwd3.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * sfwd3_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"..+++++...++................",
+"..+++++...+++...............",
+"..+++++...+++++.............",
+"..+++++...++++++............",
+"..+++++...++++++++..........",
+"..+++++...+++++++++.........",
+"..+++++...+++++++++++.......",
+"..+++++...++++++++++++......",
+"..+++++...++++++++++++++....",
+"..+++++...+++++++++++++++...",
+"..+++++...++++++++++++++....",
+"..+++++...++++++++++++......",
+"..+++++...+++++++++++.......",
+"..+++++...+++++++++.........",
+"..+++++...++++++++..........",
+"..+++++...++++++............",
+"..+++++...+++++.............",
+"..+++++...+++...............",
+"..+++++...++................",
+"............................",
+"..++++++...++++++...++++++..",
+"..++++++...++++++...++++++..",
+"............................",
+"............................"};
diff --git a/symbols/srew.xpm b/symbols/srew.xpm
new file mode 100644
index 000000000..4dbae7e58
--- /dev/null
+++ b/symbols/srew.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * srew_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++...+++++..",
+"...............+++...+++++..",
+".............+++++...+++++..",
+"............++++++...+++++..",
+"..........++++++++...+++++..",
+".........+++++++++...+++++..",
+".......+++++++++++...+++++..",
+"......++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"...+++++++++++++++...+++++..",
+"..++++++++++++++++...+++++..",
+"..++++++++++++++++...+++++..",
+"...+++++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"......++++++++++++...+++++..",
+".......+++++++++++...+++++..",
+".........+++++++++...+++++..",
+"..........++++++++...+++++..",
+"............++++++...+++++..",
+".............+++++...+++++..",
+"...............+++...+++++..",
+"................++...+++++..",
+"............................",
+"............................"};
diff --git a/symbols/srew1.xpm b/symbols/srew1.xpm
new file mode 100644
index 000000000..101cdf734
--- /dev/null
+++ b/symbols/srew1.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * srew1_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++...+++++..",
+"...............+++...+++++..",
+".............+++++...+++++..",
+"............++++++...+++++..",
+"..........++++++++...+++++..",
+".........+++++++++...+++++..",
+".......+++++++++++...+++++..",
+"......++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"...+++++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"......++++++++++++...+++++..",
+".......+++++++++++...+++++..",
+".........+++++++++...+++++..",
+"..........++++++++...+++++..",
+"............++++++...+++++..",
+".............+++++...+++++..",
+"...............+++...+++++..",
+"................++...+++++..",
+"............................",
+"....................++++++..",
+"....................++++++..",
+"............................",
+"............................"};
diff --git a/symbols/srew2.xpm b/symbols/srew2.xpm
new file mode 100644
index 000000000..f664532bc
--- /dev/null
+++ b/symbols/srew2.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * srew2_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++...+++++..",
+"...............+++...+++++..",
+".............+++++...+++++..",
+"............++++++...+++++..",
+"..........++++++++...+++++..",
+".........+++++++++...+++++..",
+".......+++++++++++...+++++..",
+"......++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"...+++++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"......++++++++++++...+++++..",
+".......+++++++++++...+++++..",
+".........+++++++++...+++++..",
+"..........++++++++...+++++..",
+"............++++++...+++++..",
+".............+++++...+++++..",
+"...............+++...+++++..",
+"................++...+++++..",
+"............................",
+"...........++++++...++++++..",
+"...........++++++...++++++..",
+"............................",
+"............................"};
diff --git a/symbols/srew3.xpm b/symbols/srew3.xpm
new file mode 100644
index 000000000..b82a6c724
--- /dev/null
+++ b/symbols/srew3.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * srew3_xpm[] = {
+"28 26 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"............................",
+"............................",
+"................++...+++++..",
+"...............+++...+++++..",
+".............+++++...+++++..",
+"............++++++...+++++..",
+"..........++++++++...+++++..",
+".........+++++++++...+++++..",
+".......+++++++++++...+++++..",
+"......++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"...+++++++++++++++...+++++..",
+"....++++++++++++++...+++++..",
+"......++++++++++++...+++++..",
+".......+++++++++++...+++++..",
+".........+++++++++...+++++..",
+"..........++++++++...+++++..",
+"............++++++...+++++..",
+".............+++++...+++++..",
+"...............+++...+++++..",
+"................++...+++++..",
+"............................",
+"..++++++...++++++...++++++..",
+"..++++++...++++++...++++++..",
+"............................",
+"............................"};
diff --git a/symbols/teletext.xpm b/symbols/teletext.xpm
new file mode 100644
index 000000000..49fc3c248
--- /dev/null
+++ b/symbols/teletext.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * teletext_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"..+++++++++++++++++++++++..",
+"..+++++++++++++++++++++++..",
+"..++...................++..",
+"..++..+++++++++++++++..++..",
+"..++..+++++++++++++++..++..",
+"..++...................++..",
+"..++..+++++++++++++++..++..",
+"..++..+++++++++++++++..++..",
+"..++...................++..",
+"..++..+++++++++++++++..++..",
+"..++..+++++++++++++++..++..",
+"..++...................++..",
+"..+++++++++++++++++++++++..",
+"..+++++++++++++++++++++++..",
+"...........................",
+"..........................."};
diff --git a/symbols/volume.xpm b/symbols/volume.xpm
new file mode 100644
index 000000000..9cbc0b258
--- /dev/null
+++ b/symbols/volume.xpm
@@ -0,0 +1,19 @@
+/* XPM */
+static char * volume_xpm[] = {
+"28 14 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"..........................++",
+"........................++++",
+"......................++++++",
+"....................++++++++",
+"..................++++++++++",
+"................++++++++++++",
+"..............++++++++++++++",
+"............++++++++++++++++",
+"..........++++++++++++++++++",
+"........++++++++++++++++++++",
+"......++++++++++++++++++++++",
+"....++++++++++++++++++++++++",
+"..++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++"};
diff --git a/themes.c b/themes.c
new file mode 100644
index 000000000..0232822ee
--- /dev/null
+++ b/themes.c
@@ -0,0 +1,305 @@
+/*
+ * themes.c: Color themes used by skins
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: themes.c 1.1 2004/05/16 09:43:14 kls Exp $
+ */
+
+#include "themes.h"
+#include <dirent.h>
+#include <string.h>
+#include "config.h"
+#include "tools.h"
+
+// --- cTheme ----------------------------------------------------------------
+
+cTheme::cTheme(void)
+{
+  name = strdup("default");
+  memset(descriptions, 0, sizeof(descriptions));
+  memset(colorNames, 0, sizeof(colorNames));
+  memset(colorValues, 0, sizeof(colorValues));
+  descriptions[0] = strdup("Default");
+}
+
+cTheme::~cTheme()
+{
+  free(name);
+  for (int i = 0; i < I18nNumLanguages; i++)
+      free(descriptions[i]);
+  for (int i = 0; i < MaxThemeColors; i++)
+      free(colorNames[i]);
+}
+
+bool cTheme::FileNameOk(const char *FileName, bool SetName)
+{
+  const char *error = NULL;
+  if (!isempty(FileName)) {
+     const char *d = strrchr(FileName, '/');
+     if (d)
+        FileName = d + 1;
+     const char *n = strchr(FileName, '-');
+     if (n) {
+        if (n > FileName) {
+           if (!strchr(++n, '-')) {
+              const char *e = strchr(n, '.');
+              if (e && strcmp(e, ".theme") == 0) {
+                 if (e - n >= 1) {
+                    // FileName is ok
+                    if (SetName) {
+                       free(name);
+                       name = strndup(n, e - n);
+                       }
+                    }
+                 else
+                    error = "missing theme name";
+                 }
+              else
+                 error = "invalid extension";
+              }
+           else
+              error = "too many '-'";
+           }
+        else
+           error = "missing skin name";
+        }
+     else
+        error = "missing '-'";
+     }
+  else
+     error = "empty";
+  if (error)
+     esyslog("ERROR: invalid theme file name (%s): '%s'", error, FileName);
+  return !error;
+}
+
+const char *cTheme::Description(void)
+{
+  char *s = descriptions[Setup.OSDLanguage];
+  if (!s)
+     s = descriptions[0];
+  return s ? s : name;
+}
+
+bool cTheme::Load(const char *FileName, bool OnlyDescriptions)
+{
+  if (!FileNameOk(FileName, true))
+     return false;
+  bool result = false;
+  if (!OnlyDescriptions)
+     isyslog("loading %s", FileName);
+  FILE *f = fopen(FileName, "r");
+  if (f) {
+     int line = 0;
+     result = true;
+     char *s;
+     const char *error = NULL;
+     while ((s = readline(f)) != NULL) {
+           line++;
+           char *p = strchr(s, '#');
+           if (p)
+              *p = 0;
+           s = stripspace(skipspace(s));
+           if (!isempty(s)) {
+              char *n = s;
+              char *v = strchr(s, '=');
+              if (v) {
+                 *v++ = 0;
+                 n = stripspace(skipspace(n));
+                 v = stripspace(skipspace(v));
+                 if (strstr(n, "Description") == n) {
+                    int lang = 0;
+                    char *l = strchr(n, '.');
+                    if (l)
+                       lang = I18nLanguageIndex(++l);
+                    if (lang >= 0)
+                       descriptions[lang] = strdup(v);
+                    else
+                       error = "invalid language code";
+                    }
+                 else if (!OnlyDescriptions) {
+                    for (int i = 0; i < MaxThemeColors; i++) {
+                        if (colorNames[i]) {
+                           if (strcmp(n, colorNames[i]) == 0) {
+                              char *p = NULL;
+                              errno = 0;
+                              tColor c = strtoul(v, &p, 16);
+                              if (!errno && !*p)
+                                 colorValues[i] = c;
+                              else
+                                 error = "invalid color value";
+                              break;
+                              }
+                           }
+                        else {
+                           error = "unknown color name";
+                           break;
+                           }
+                        }
+                    }
+                 }
+              else
+                 error = "missing value";
+              }
+           if (error) {
+              result = false;
+              break;
+              }
+           }
+     if (!result)
+        esyslog("ERROR: error in %s, line %d%s%s\n", FileName, line, error ? ": " : "", error ? error : "");
+     fclose(f);
+     }
+  else
+     LOG_ERROR_STR(FileName);
+  return result;
+}
+
+bool cTheme::Save(const char *FileName)
+{
+  if (!FileNameOk(FileName))
+     return false;
+  bool result = true;
+  cSafeFile f(FileName);
+  if (f.Open()) {
+     for (int i = 0; i < I18nNumLanguages; i++) {
+         if (descriptions[i])
+            fprintf(f, "Description%s%.*s = %s\n", i ? "." : "", 3, i ? I18nLanguageCode(i) : "", descriptions[i]);
+         }
+     for (int i = 0; i < MaxThemeColors; i++) {
+         if (colorNames[i])
+            fprintf(f, "%s = %08X\n", colorNames[i], colorValues[i]);
+         }
+     if (!f.Close())
+        result = false;
+     }
+  else
+     result = false;
+  return result;
+}
+
+int cTheme::AddColor(const char *Name, tColor Color)
+{
+  for (int i = 0; i < MaxThemeColors; i++) {
+      if (colorNames[i]) {
+         if (strcmp(Name, colorNames[i]) == 0) {
+            colorValues[i] = Color;
+            return i;
+            }
+         }
+      else {
+         colorNames[i] = strdup(Name);
+         colorValues[i] = Color;
+         return i;
+         }
+      }
+  return -1;
+}
+
+tColor cTheme::Color(int Subject)
+{
+  return (Subject >= 0 && Subject < MaxThemeColors) ? colorValues[Subject] : 0;
+}
+
+// --- cThemes ---------------------------------------------------------------
+
+char *cThemes::themesDirectory = NULL;
+
+cThemes::cThemes(void)
+{
+  numThemes = 0;
+  names = 0;
+  fileNames = NULL;
+  descriptions = NULL;
+}
+
+cThemes::~cThemes()
+{
+  Clear();
+}
+
+void cThemes::Clear(void)
+{
+  for (int i = 0; i < numThemes; i++) {
+      free(names[i]);
+      free(fileNames[i]);
+      free(descriptions[i]);
+      }
+  free(names);
+  free(fileNames);
+  free(descriptions);
+  numThemes = 0;
+  names = 0;
+  fileNames = NULL;
+  descriptions = NULL;
+}
+
+bool cThemes::Load(const char *SkinName)
+{
+  Clear();
+  if (themesDirectory) {
+     DIR *d = opendir(themesDirectory);
+     if (d) {
+        struct dirent *e;
+        while ((e = readdir(d)) != NULL) {
+              if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+                 if (strstr(e->d_name, SkinName) == e->d_name && e->d_name[strlen(SkinName)] == '-') {
+                    const char *FileName = AddDirectory(themesDirectory, e->d_name);
+                    cTheme Theme;
+                    if (Theme.Load(FileName, true)) {
+                       names = (char **)realloc(names, (numThemes + 1) * sizeof(char *));
+                       names[numThemes] = strdup(Theme.Name());
+                       fileNames = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *));
+                       fileNames[numThemes] = strdup(FileName);
+                       descriptions = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *));
+                       descriptions[numThemes] = strdup(Theme.Description());
+                       numThemes++;
+                       }
+                    }
+                 }
+              }
+        closedir(d);
+        return numThemes > 0;
+        }
+     }
+  return false;
+}
+
+int cThemes::GetThemeIndex(const char *Description)
+{
+  int index = 0;
+  for (int i = 0; i < numThemes; i++) {
+      if (strcmp(descriptions[i], Description) == 0)
+         return i;
+      if (strcmp(descriptions[i], "Default") == 0)
+         index = 1;
+      }
+  return index;
+}
+
+void cThemes::SetThemesDirectory(const char *ThemesDirectory)
+{
+  free(themesDirectory);
+  themesDirectory = strdup(ThemesDirectory);
+  MakeDirs(themesDirectory, true);
+}
+
+void cThemes::Load(const char *SkinName, const char *ThemeName, cTheme *Theme)
+{
+  char *FileName = NULL;
+  asprintf(&FileName, "%s/%s-%s.theme", themesDirectory, SkinName, ThemeName);
+  if (access(FileName, F_OK) == 0) // the file exists
+     Theme->Load(FileName);
+  free(FileName);
+}
+
+void cThemes::Save(const char *SkinName, cTheme *Theme)
+{
+  char *FileName = NULL;
+  asprintf(&FileName, "%s/%s-%s.theme", themesDirectory, SkinName, Theme->Name());
+  if (access(FileName, F_OK) != 0) // the file does not exist
+     Theme->Save(FileName);
+  free(FileName);
+}
diff --git a/themes.h b/themes.h
new file mode 100644
index 000000000..617f1d2e6
--- /dev/null
+++ b/themes.h
@@ -0,0 +1,82 @@
+/*
+ * themes.h: Color themes used by skins
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: themes.h 1.1 2004/05/15 14:22:16 kls Exp $
+ */
+
+#ifndef __THEMES_H
+#define __THEMES_H
+
+#include "i18n.h"
+#include "osd.h"
+
+class cTheme {
+public:
+  enum { MaxThemeColors = 128 };
+private:
+  char *name;
+  char *descriptions[I18nNumLanguages];
+  char *colorNames[MaxThemeColors];
+  tColor colorValues[MaxThemeColors];
+  bool FileNameOk(const char *FileName, bool SetName = false);
+public:
+  cTheme(void);
+       ///< Creates a new theme class.
+  ~cTheme();
+  const char *Name(void) { return name; }
+  const char *Description(void);
+       ///< Returns a user visible, single line description of this theme.
+       ///< The actual text shouldn't be too long, so that it can be
+       ///< fully displayed in the Setup/OSD menu.
+  bool Load(const char *FileName, bool OnlyDescriptions = false);
+       ///< Loads the theme data from the given file.
+  bool Save(const char *FileName);
+       ///< Saves the theme data to the given file.
+       ///< FileName must be in the form "<skin>-<theme>.theme", where <skin>
+       ///< is the name of the skin this theme applies to, and <theme> is the
+       ///< actual theme name, which will be used to identify this theme in the
+       ///< 'setup.conf', and is normally not seen by the user. It should
+       ///< consist of only lowercase letters and digits.
+  int AddColor(const char *Name, tColor Color);
+       ///< Adds a color with the given Name to this theme, initializes it
+       ///< with Color and returns an index into the color array that can
+       ///< be used in a call to Color() later. The index returned from the
+       ///< first call to AddColor() is 0, and subsequent calls will return
+       ///< values that are incremented by 1 with every call.
+       ///< If a color entry with the given Name already exists, its value
+       ///< will be overwritten with Color and the returned index will be
+       ///< that of the existing entry.
+  tColor Color(int Subject);
+       ///< Returns the color for the given Subject. Subject must be one of
+       ///< the values returned by a previous call to AddColor().
+  };
+
+// A helper macro that simplifies defining theme colors.
+#define THEME_CLR(Theme, Subject, Color) static const int Subject = Theme.AddColor(#Subject, Color)
+
+class cThemes {
+private:
+  int numThemes;
+  char **names;
+  char **fileNames;
+  char **descriptions;
+  static char *themesDirectory;
+  void Clear(void);
+public:
+  cThemes(void);
+  ~cThemes();
+  bool Load(const char *SkinName);
+  int NumThemes(void) { return numThemes; }
+  const char *Name(int Index) { return Index < numThemes ? names[Index] : NULL; }
+  const char *FileName(int Index) { return Index < numThemes ? fileNames[Index] : NULL; }
+  const char * const *Descriptions(void) { return descriptions; }
+  int GetThemeIndex(const char *Description);
+  static void SetThemesDirectory(const char *ThemesDirectory);
+  static void Load(const char *SkinName, const char *ThemeName, cTheme *Theme);
+  static void Save(const char *SkinName, cTheme *Theme);
+  };
+
+#endif //__THEMES_H
diff --git a/thread.c b/thread.c
index 974362c9a..084a42956 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.30 2004/01/03 16:59:33 kls Exp $
+ * $Id: thread.c 1.31 2004/03/14 16:48:30 kls Exp $
  */
 
 #include "thread.h"
@@ -199,6 +199,7 @@ bool cThread::Start(void)
      running = true;
      parentTid = pthread_self();
      pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this);
+     pthread_detach(childTid); // auto-reap
      pthread_setschedparam(childTid, SCHED_RR, 0);
      usleep(10000); // otherwise calling Active() immediately after Start() causes a "pure virtual method called" error
      }
diff --git a/vdr.1 b/vdr.1
index ca49acdf3..b519f9d92 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.8 2003/05/29 11:58:28 kls Exp $
+.\" $Id: vdr.1 1.10 2004/05/16 12:10:52 kls Exp $
 .\"
 .TH vdr 1 "1 June 2003" "1.2.0" "Video Disk Recorder"
 .SH NAME
@@ -164,12 +164,11 @@ Contains the index into the recording where the last replay session left off.
 .I index.vdr
 Contains the file number, offset and type of each frame of the recording.
 .TP
-.I keys.conf
+.I remote.conf
 Contains the key assignments for the remote control.
 .TP
-.I keys-pc.conf
-Contains the key assignments for the PC keyboard (used if the program
-was compiled with DEBUG_OSD=1).
+.I keymacros.conf
+Contains user defined remote control key macros.
 .TP
 .IR 001.vdr\  ...\  255.vdr
 The actual data files of a recording.
diff --git a/vdr.5 b/vdr.5
index e54c9f8ed..a224a6670 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.26 2004/02/24 12:36:35 kls Exp $
+.\" $Id: vdr.5 1.27 2004/05/15 09:24:57 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -505,6 +505,48 @@ Examples:
 The file \fIsetup.conf\fR contains the basic configuration options for \fBvdr\fR.
 Each line contains one option in the format "Name = Value".
 See the MANUAL file for a description of the available options.
+.SS THEMES
+The files \fIthemes/<skin>-<theme>.theme\fR in the config directory contain the
+color theme definitions for the various skins. In the actual file names \fI<skin>\fR
+will be replaced by the name if the skin this theme belongs to, and \fI<theme>\fR
+will be the name of this theme.
+Each line in a theme file contains one option in the format "Name = Value".
+Anything after (and including) a '#' character is comment.
+
+The definitions in a theme file are either \fBcolors\fR or a \fBdescription\fR.
+.br
+\fBColors\fR are in the form
+
+\fBclrTitle = FF123456\fR
+
+where the name (clrTitle) is one of the names defined in the source code of
+the \fBskin\fR that uses this theme, through the \fBTHEME_CLR()\fR macro.
+The value (FF123456) is an eight digit hex number that consist of four bytes,
+representing alpha (transparency), red, green and blue component of the color.
+An alpha value of 00 means the color will be completely transparent, while FF
+means it will be opaque. An RGB value of 000000 results in black, while FFFFFF
+is white.
+
+A \fBdescription\fR can be given as
+
+\fBDescription = Shades of blue\fR
+
+and will be used in the Setup/OSD menu to select a theme for a given skin.
+The description should give the user an idea what this theme will be like
+(for instance, in the given example it would use various shades of blue),
+and shouldn't be too long to make sure it fits on the Setup screen.
+The default description always should be given in English. If you want,
+you can provide language specific descriptions as
+
+\fBDescription.eng = Shades of blue\fR
+.br
+\fBDescription.ger = Blaut�ne\fR
+
+where the language code (as defined in VDR/i18n.c) is added to the keyword
+"Description", separated by a dot. You can enter as many language specific
+descriptions as there are languages defined in VDR/i18n.h.
+If a theme file doesn't contain a Description, the name of the theme (as
+given in the theme's file name) will be used.
 .SS AUDIO/VIDEO DATA
 The files \fI001.vdr\fR...\fI255.vdr\fR are the actual recorded MPEG data
 files. In order to keep the size of an individual file below a given limit,
diff --git a/vdr.c b/vdr.c
index af95f377e..20820549b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.180 2004/03/14 14:25:02 kls Exp $
+ * $Id: vdr.c 1.181 2004/05/16 10:12:43 kls Exp $
  */
 
 #include <getopt.h>
@@ -45,11 +45,14 @@
 #include "keys.h"
 #include "lirc.h"
 #include "menu.h"
-#include "osd.h"
+#include "osdbase.h"
 #include "plugin.h"
 #include "rcu.h"
 #include "recording.h"
+#include "skinclassic.h"
+#include "skinsttng.h"
 #include "sources.h"
+#include "themes.h"
 #include "timers.h"
 #include "tools.h"
 #include "transfer.h"
@@ -310,7 +313,6 @@ int main(int argc, char *argv[])
   // Daemon mode:
 
   if (DaemonMode) {
-#if !defined(DEBUG_OSD)
      pid_t pid = fork();
      if (pid < 0) {
         fprintf(stderr, "%m\n");
@@ -322,10 +324,6 @@ int main(int argc, char *argv[])
      fclose(stdin);
      fclose(stdout);
      fclose(stderr);
-#else
-     fprintf(stderr, "vdr: can't run in daemon mode with DEBUG_OSD on!\n");
-     return 2;
-#endif
      }
   else if (Terminal) {
      // Claim new controlling terminal
@@ -348,6 +346,7 @@ int main(int argc, char *argv[])
      ConfigDirectory = VideoDirectory;
 
   cPlugin::SetConfigDirectory(ConfigDirectory);
+  cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
 
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
   if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
@@ -416,10 +415,6 @@ int main(int argc, char *argv[])
         }
      }
 
-  // OSD:
-
-  cOsd::Initialize();
-
   // User interface:
 
   Interface = new cInterface(SVDRPport);
@@ -429,6 +424,13 @@ int main(int argc, char *argv[])
   if (!PluginManager.StartPlugins())
      return 2;
 
+  // Skins:
+
+  new cSkinClassic;
+  new cSkinSTTNG;
+  Skins.SetCurrent(Setup.OSDSkin);
+  cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+
   // Remote Controls:
 #if defined(REMOTE_RCU)
   new cRcuRemote("/dev/ttyS1");
@@ -586,7 +588,7 @@ int main(int argc, char *argv[])
                }
            }
         // CAM control:
-        if (!Menu && !Interface->IsOpen())
+        if (!Menu && !cOsd::IsOpen())
            Menu = CamControl();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
@@ -646,7 +648,7 @@ int main(int argc, char *argv[])
                   }
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
-               if (!Menu && !Interface->IsOpen())
+               if (!Menu && !cOsd::IsOpen())
                   Menu = Temp = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
                key = kNone; // nobody else needs to see these keys
@@ -657,7 +659,7 @@ int main(int argc, char *argv[])
                   DELETENULL(Menu);
                   Temp = NULL;
                   if (!cRecordControls::PauseLiveVideo())
-                     Interface->Error(tr("No free DVB device to record!"));
+                     Skins.Message(mtError, tr("No free DVB device to record!"));
                   key = kNone; // nobody else needs to see this key
                   }
                break;
@@ -665,9 +667,9 @@ int main(int argc, char *argv[])
           case kRecord:
                if (!cControl::Control()) {
                   if (cRecordControls::Start())
-                     ;//XXX Interface->Info(tr("Recording"));
+                     ;//XXX Skins.Message(mtInfo, tr("Recording"));
                   else
-                     Interface->Error(tr("No free DVB device to record!"));
+                     Skins.Message(mtError, tr("No free DVB device to record!"));
                   key = kNone; // nobody else needs to see this key
                   }
                break;
@@ -677,7 +679,7 @@ int main(int argc, char *argv[])
                        cControl::Shutdown();
                        Temp = NULL;
                        if (!Shutdown) {
-                          Interface->Error(tr("Can't shutdown - option '-s' not given!"));
+                          Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
                           break;
                           }
                        if (cRecordControls::Active()) {
@@ -699,14 +701,14 @@ int main(int argc, char *argv[])
                             cControl::Shutdown(); // just in case
                             Temp = NULL;
                             if (!cRecordControls::PauseLiveVideo())
-                               Interface->Error(tr("No free DVB device to record!"));
+                               Skins.Message(mtError, tr("No free DVB device to record!"));
                             break;
              case osRecord: DELETENULL(Menu);
                             Temp = NULL;
                             if (cRecordControls::Start())
-                               ;//XXX Interface->Info(tr("Recording"));
+                               ;//XXX Skins.Message(mtInfo, tr("Recording"));
                             else
-                               Interface->Error(tr("No free DVB device to record!"));
+                               Skins.Message(mtError, tr("No free DVB device to record!"));
                             break;
              case osRecordings:
                             DELETENULL(Menu);
@@ -728,7 +730,7 @@ int main(int argc, char *argv[])
                             DELETENULL(Menu);
                             cControl::Shutdown();
                             Temp = NULL;
-                            Interface->Info(tr("Switching primary DVB..."));
+                            Skins.Message(mtInfo, tr("Switching primary DVB..."));
                             cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                             break;
              case osPlugin: DELETENULL(Menu);
@@ -789,9 +791,9 @@ int main(int argc, char *argv[])
               EITScanner.Process();
            if (!cCutter::Active() && cCutter::Ended()) {
               if (cCutter::Error())
-                 Interface->Error(tr("Editing process failed!"));
+                 Skins.Message(mtError, tr("Editing process failed!"));
               else
-                 Interface->Info(tr("Editing process finished"));
+                 Skins.Message(mtInfo, tr("Editing process finished"));
               }
            }
         if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
@@ -862,9 +864,10 @@ int main(int argc, char *argv[])
   delete Menu;
   cControl::Shutdown();
   delete Interface;
-  cOsd::Shutdown();
+  cOsdProvider::Shutdown();
   Remotes.Clear();
   Audios.Clear();
+  Skins.Clear();
   Setup.CurrentChannel = cDevice::CurrentChannel();
   Setup.CurrentVolume  = cDevice::CurrentVolume();
   Setup.Save();

From 3c349510b5060ec05a684425b6b2e5b70d67f65c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 May 2004 18:00:00 +0200
Subject: [PATCH 100/307] Version 1.3.8 - Fixed a crash when switching the skin
 and having selected a non-default theme   that is not available for the newly
 selected skin (thanks to Sascha Volkenandt   for reporting this one). - Fixed
 some issues with gcc 3.4 (thanks to Prakash K. Cheemplavam and Marcel  
 Wiesweg). - Added a hint to PLUGINS.html about how to name a plugin that
 implements a skin. - Completed the Finnish OSD texts (thanks to Rolf
 Ahrenberg). - Single shot timers and events now show the day of week (adopted
 with some changes   from the "elchi" patch, orginally introduced by Oskar
 Signell). Plugins that use   cEvent::GetDateString() should note that this
 function now returns a longer   string, including the day of week. The new
 function const char *WeekDayName(time_t t)   can be called with a time_t
 value to get the day of week for that time. - When processing XPM data, the
 color name "None" is now mapped to #00000000, which   is "fully transparent"
 (suggested by Sascha Volkenandt). - Fixed the OSD alignment in the SPU
 decoder (thanks to Miko Wohlgemuth for reporting   this one and helping to
 test the fix). - Fixed freezing picture when a recording starts on a system
 that always uses   'Transfer Mode' (thanks to Michal Dobrzynski for reporting
 this one). - Fixed a memory leak in NIT processing (thanks to Marcel
 Wiesweg). - Added a few missing initializations (thanks to Marcel Wiesweg). -
 Moved the declaration of cMenuText to VDR/menu.h to make it available to
 plugins.   It now also has a SetText() function that can be used to
 dynamically set the text   in an already existing cMenuText (both suggested
 by Stefan Huelswitt). - Added play mode pmVideoOnly (thanks to Marcel
 Wiesweg). - Added a missing cStatus::MsgOsdClear() to
 cDisplayChannel::~cDisplayChannel()   (thanks to Oliver Endriss). - No longer
 displaying unused color buttons in the "Classic VDR" skin (thanks to   Oliver
 Endriss for reporting this one). - Added some missing
 cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for   reporting
 this one).

---
 CONTRIBUTORS  | 23 +++++++++++++++++++++++
 HISTORY       | 33 +++++++++++++++++++++++++++++++++
 PLUGINS.html  | 35 +++++++++++++++++++++++++----------
 channels.conf | 10 +++++-----
 config.h      |  8 ++++----
 device.h      |  3 ++-
 dvbdevice.c   | 14 ++++++++++++--
 dvbspu.c      |  9 +++++++--
 epg.c         |  9 ++++++---
 i18n.c        | 22 +++++++++++-----------
 menu.c        | 41 ++++++++++++++++++++++++++---------------
 menu.h        | 13 ++++++++++++-
 nit.c         |  3 ++-
 osd.c         |  4 +++-
 pat.c         |  8 ++++----
 plugin.c      |  4 ++--
 skinclassic.c | 12 ++++++------
 skins.h       |  4 ++--
 skinsttng.c   |  4 ++--
 themes.c      |  4 ++--
 tools.c       |  8 +++++++-
 tools.h       |  3 ++-
 22 files changed, 198 insertions(+), 76 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7036bfd60..48e7831d5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -183,6 +183,8 @@ Stefan Huelswitt <huels@iname.com>
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
  for creating mutexes with PTHREAD_MUTEX_ERRORCHECK_NP, which made the 'lockingTid'
  stuff obsolete
+ for suggesting to move the declaration of cMenuText to VDR/menu.h to make it
+ available to plugins, and to add a SetText() function
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -518,6 +520,9 @@ Oliver Endriss <o.endriss@gmx.de>
  for suggesting to change the default "Lifetime" to 99
  for pointing out that the LNB power needs to be explicitly turned on at startup,
  because newer drivers don't do this any more
+ for adding a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel()
+ for reporting that the "Classic VDR" skin wrongly displayed unused color buttons
+ for reporting some missing cStatus::MsgOsdTextItem() calls
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -670,6 +675,10 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for fixing testing for matching section filters in case they are turned off
  for adding 'libsi' include files to the 'include' directory, so that plugins can
  use them
+ for his help in fixing some issues with gcc 3.4
+ for fixing a memory leak in NIT processing
+ for adding a few missing initializations
+ for adding play mode pmVideoOnly
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -695,6 +704,9 @@ Sascha Volkenandt <sascha@akv-soft.de>
  return from their Receive() function if the buffer runs full
  for reporting a crash in case there is no DVB hardware present
  for his support in debugging the the "Unknown picture type error"
+ for reporting a crash when switching the skin and having selected a non-default
+ theme that is not available for the newly selected skin
+ for suggesting to map the color name "None" to #00000000 when processing XPM data
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -860,6 +872,7 @@ Christoph Hermanns <christoph.hermanns@gmx.de>
 Oskar Signell <oskar@signell.net>
  for pointing out a problem with setting an editing mark while in "Pause" mode,
  where replay was not immediately positioned to the marked frame
+ for making single shot timers and events show the day of week
 
 Dirk Essl <de@floydworld.de>
  for reporting a wrong URL to the 'Doxygen' tool in INSTALL
@@ -972,3 +985,13 @@ John Kennedy <rkennedy@ix.netcom.com>
 
 Drazen Dupor <drazen.dupor@dupor.com>
  for translating OSD texts to the Croatian language
+
+Prakash K. Cheemplavam <PrakashKC@gmx.de>
+ for fixing some issues with gcc 3.4
+
+Miko Wohlgemuth <weak@chello.at>
+ for reporting a problem with the OSD alignment in the SPU decoder
+
+Michal Dobrzynski <michal_dobrzynski@mac.com>
+ for reporting a freezing picture when a recording starts on a system that always
+ uses 'Transfer Mode'
diff --git a/HISTORY b/HISTORY
index 7ea36ca57..43cfe9b8e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2804,3 +2804,36 @@ Video Disk Recorder Revision History
   actual source (sat, cable etc.) into account. Please go into "Setup/EPG" and
   set the "Set system time" and "Use time from transponder" parameters accordingly
   (this is necessary even if you have already set them before!).
+
+2004-05-23: Version 1.3.8
+
+- Fixed a crash when switching the skin and having selected a non-default theme
+  that is not available for the newly selected skin (thanks to Sascha Volkenandt
+  for reporting this one).
+- Fixed some issues with gcc 3.4 (thanks to Prakash K. Cheemplavam and Marcel
+  Wiesweg).
+- Added a hint to PLUGINS.html about how to name a plugin that implements a skin.
+- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Single shot timers and events now show the day of week (adopted with some changes
+  from the "elchi" patch, orginally introduced by Oskar Signell). Plugins that use
+  cEvent::GetDateString() should note that this function now returns a longer
+  string, including the day of week. The new function const char *WeekDayName(time_t t)
+  can be called with a time_t value to get the day of week for that time.
+- When processing XPM data, the color name "None" is no mapped to #00000000, which
+  is "fully transparent" (suggested by Sascha Volkenandt).
+- Fixed the OSD alignment in the SPU decoder (thanks to Miko Wohlgemuth for reporting
+  this one and helping to test the fix).
+- Fixed freezing picture when a recording starts on a system that always uses
+  'Transfer Mode' (thanks to Michal Dobrzynski for reporting this one).
+- Fixed a memory leak in NIT processing (thanks to Marcel Wiesweg).
+- Added a few missing initializations (thanks to Marcel Wiesweg).
+- Moved the declaration of cMenuText to VDR/menu.h to make it available to plugins.
+  It now also has a SetText() function that can be used to dynamically set the text
+  in an already existing cMenuText (both suggested by Stefan Huelswitt).
+- Added play mode pmVideoOnly (thanks to Marcel Wiesweg).
+- Added a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel()
+  (thanks to Oliver Endriss).
+- No longer displaying unused color buttons in the "Classic VDR" skin (thanks to
+  Oliver Endriss for reporting this one).
+- Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for
+  reporting this one).
diff --git a/PLUGINS.html b/PLUGINS.html
index a2cfe9b3b..cfd28d129 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,15 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.2.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.2.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.2.6 are marked like this.
 <!--X1.2.6--></td></tr></table>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.0 are marked like this.
 <!--X1.3.0--></td></tr></table>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.7 are marked like this.
 <!--X1.3.7--></td></tr></table>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.8 are marked like this.
+<!--X1.3.8--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -70,11 +73,11 @@ <h1>Table Of Contents</h1>
 <li><a href="#Status monitor">Status monitor</a>
 <li><a href="#Players">Players</a>
 <li><a href="#Receivers">Receivers</a>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Filters">Filters</a>
 <!--X1.3.0--></td></tr></table>
 <li><a href="#The On Screen Display">The On Screen Display</a>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <!--X1.3.7--></td></tr></table>
@@ -1214,7 +1217,7 @@ <h1>Table Of Contents</h1>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Filters"><hr><h2>Filters</h2>
 
 <center><i><b>A Fistful of Datas</b></i></center><p>
@@ -1260,7 +1263,7 @@ <h1>Table Of Contents</h1>
 See VDR/eit.c or VDR/pat.c to learn how to process filter data.
 <!--X1.3.0--></td></tr></table>
 
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Window to the world</b></i></center><p>
@@ -1371,6 +1374,18 @@ <h1>Table Of Contents</h1>
 
 in the <a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
 Do not delete this object, it will be automatically deleted when the program ends.
+<p>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+In order to be able to easily identify plugins that implement a skin it is recommended
+that the name of such a plugin should be
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+skinxyz
+</pre></td></tr></table><p>
+
+where <tt>xyz</tt> is the actual name of the skin.
+
+<!--X1.3.8--></td></tr></table>
 
 <a name="Themes"><hr><h2>Themes</h2>
 
@@ -1512,7 +1527,7 @@ <h1>Table Of Contents</h1>
 virtual bool HasDecoder(void) const;
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
-<!--X1.2.6--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.2.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual int64_t GetSTC(void);
 <!--X1.2.6--></td></tr></table>
 virtual void TrickSpeed(int Speed);
@@ -1534,7 +1549,7 @@ <h1>Table Of Contents</h1>
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p>
 <b>Section Filtering</b>
 <p>
@@ -1564,7 +1579,7 @@ <h1>Table Of Contents</h1>
 <p>
 <b>On Screen Display</b>
 <p>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 If your device provides On Screen Display (OSD) capabilities (which every device
 that is supposed to be used as a primary device should do), it shall implement
 an "OSD provider" class, derived from <tt>cOsdProvider</tt>, which, when its <tt>CreateOsd()</tt>
diff --git a/channels.conf b/channels.conf
index d1d205b3b..c80333678 100644
--- a/channels.conf
+++ b/channels.conf
@@ -47,20 +47,20 @@ rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1702,1722:10:133:2:0
 PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
+PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
-DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1702,1722,1801:34:133:17:0
+DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:0:1702,1722,1801:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:0:1702,1722,1801:27:133:4:0
+Formel 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
 Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
diff --git a/config.h b/config.h
index b9845a4ec..18f3aeaf8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.193 2004/05/16 12:41:43 kls Exp $
+ * $Id: config.h 1.195 2004/05/22 11:29:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.7"
-#define VDRVERSNUM   10307  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.8"
+#define VDRVERSNUM   10308  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -140,7 +140,7 @@ template<class T> class cConfig : public cList<T> {
   bool Save(void)
   {
     bool result = true;
-    T *l = (T *)First();
+    T *l = (T *)this->First();
     cSafeFile f(fileName);
     if (f.Open()) {
        while (l) {
diff --git a/device.h b/device.h
index a725e4d43..6f0f70a72 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.42 2004/04/17 10:15:25 kls Exp $
+ * $Id: device.h 1.43 2004/05/23 10:10:08 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -36,6 +36,7 @@ enum ePlayMode { pmNone,           // audio/video from decoder
                  pmAudioVideo,     // audio/video from player
                  pmAudioOnly,      // audio only from player, video from decoder
                  pmAudioOnlyBlack, // audio only from player, no video (black screen)
+                 pmVideoOnly,      // video only from player, audio from decoder
                  pmExtern_THIS_SHOULD_BE_AVOIDED
                  // external player (e.g. MPlayer), release the device
                  // WARNING: USE THIS MODE ONLY AS A LAST RESORT, IF YOU
diff --git a/dvbdevice.c b/dvbdevice.c
index afeb97319..cb143a6d3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.84 2004/05/01 13:15:46 kls Exp $
+ * $Id: dvbdevice.c 1.86 2004/05/23 10:11:42 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -679,7 +679,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel)) {
      result = hasPriority;
-     if (Priority >= 0 && Receiving()) {
+     if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
            if (!HasPid(Channel->Vpid())) {
 #ifdef DO_MULTIPLE_RECORDINGS
@@ -873,6 +873,16 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_audio, AUDIO_PLAY));
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
          break;
+    case pmVideoOnly:
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_video, VIDEO_STOP, true));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+         CHECK(ioctl(fd_audio, AUDIO_PLAY));
+         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_video, VIDEO_PLAY));
+         break;
     case pmExtern_THIS_SHOULD_BE_AVOIDED:
          close(fd_video);
          close(fd_audio);
diff --git a/dvbspu.c b/dvbspu.c
index a7af8ee16..184e68631 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.6 2004/04/30 13:45:02 kls Exp $
+ * $Id: dvbspu.c 1.7 2004/05/22 14:02:32 kls Exp $
  */
 
 #include <assert.h>
@@ -321,8 +321,13 @@ int cDvbSpuDecoder::ScaleYres(int value)
 
 void cDvbSpuDecoder::DrawBmp(sDvbSpuRect & size, cBitmap * bmp)
 {
-    tArea Area = { size.x1, size.y1, size.x2, size.y2, 2 };
+    int x2 = size.x2;
+    while ((x2 - size.x1 + 1) & 0x03)
+          x2++;
+    tArea Area = { size.x1, size.y1, x2, size.y2, 2 };
     osd->SetAreas(&Area, 1);
+    if (x2 > size.x2)
+       osd->DrawRectangle(size.x2 + 1, size.y1, x2, size.y2, clrTransparent);
     osd->DrawBitmap(size.x1, size.y1, *bmp);
     delete bmp;
 }
diff --git a/epg.c b/epg.c
index 28d8c1d2b..2768db2e9 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.18 2004/03/13 15:01:05 kls Exp $
+ * $Id: epg.c 1.19 2004/05/22 12:37:07 kls Exp $
  */
 
 #include "epg.h"
@@ -115,9 +115,12 @@ bool cEvent::IsRunning(bool OrAboutToStart) const
 
 const char *cEvent::GetDateString(void) const
 {
-  static char buf[25];
+  static char buf[32];
   struct tm tm_r;
-  strftime(buf, sizeof(buf), "%d.%m.%Y", localtime_r(&startTime, &tm_r));
+  tm *tm = localtime_r(&startTime, &tm_r);
+  char *p = stpcpy(buf, WeekDayName(tm->tm_wday));
+  *p++ = ' ';
+  strftime(p, sizeof(buf) - (p - buf), "%d.%m.%Y", tm);
   return buf;
 }
 
diff --git a/i18n.c b/i18n.c
index a1b73d41b..dd74446dd 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.155 2004/05/16 11:53:45 kls Exp $
+ * $Id: i18n.c 1.156 2004/05/22 11:46:35 kls Exp $
  *
  * Translations provided by:
  *
@@ -2319,7 +2319,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Ulkoasu",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2338,7 +2338,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Teema",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2357,7 +2357,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Vaakakeskitys",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2376,7 +2376,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pystykeskitys",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2452,7 +2452,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "K�yt� pieni� kirjasimia",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2471,7 +2471,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ei koskaan",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2490,7 +2490,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ulkoasun mukaan",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2509,7 +2509,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "aina",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4604,7 +4604,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Klassinen VDR",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4623,7 +4623,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ST:TNG konsoli",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/menu.c b/menu.c
index 968a873c8..889b82b11 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.300 2004/05/16 12:47:22 kls Exp $
+ * $Id: menu.c 1.306 2004/05/23 11:21:06 kls Exp $
  */
 
 #include "menu.h"
@@ -499,25 +499,29 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
 
 // --- cMenuText -------------------------------------------------------------
 
-class cMenuText : public cOsdMenu {
-private:
-  const char *text;
-public:
-  cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
-  virtual void Display(void);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
 cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
 :cOsdMenu(Title)
 {
-  text = Text;
+  text = NULL;
+  SetText(Text);
+}
+
+cMenuText::~cMenuText()
+{
+  free(text);
+}
+
+void cMenuText::SetText(const char *Text)
+{
+  free(text);
+  text = strdup(Text);
 }
 
 void cMenuText::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetText(text, true);//XXX define control character in text to choose the font???
+  cStatus::MsgOsdTextItem(text);
 }
 
 eOSState cMenuText::ProcessKey(eKeys Key)
@@ -532,6 +536,7 @@ eOSState cMenuText::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
                   return osContinue;
     default: break;
     }
@@ -633,6 +638,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                              }
                           if (addIfConfirmed)
                              Timers.Add(timer);
+                          timer->Matches();
                           Timers.Save();
                           isyslog("timer %d %s (%s)", timer->Index() + 1, addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
@@ -677,9 +683,11 @@ bool cMenuTimerItem::operator< (const cListObject &ListObject)
 void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
-  asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
+  asprintf(&buffer, "%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
+                    timer->IsSingleEvent() ? WeekDayName(timer->StartTime()) : "",
+                    timer->IsSingleEvent() ? " " : "",
                     timer->PrintDay(timer->Day()),
                     timer->Start() / 100,
                     timer->Start() % 100,
@@ -859,6 +867,7 @@ void cMenuEvent::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetEvent(event);
+  cStatus::MsgOsdTextItem(event->Description());
 }
 
 eOSState cMenuEvent::ProcessKey(eKeys Key)
@@ -873,6 +882,7 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
                   return osContinue;
     default: break;
     }
@@ -908,7 +918,7 @@ cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel)
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
   char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%d\t%.*s\t%.*s\t%c%c%c\t%s", channel->Number(), 6, channel->Name(), 5, event->GetTimeString(), t, v, r, event->Title());
+  asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->Name(), event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1026,7 +1036,7 @@ cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event)
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
   char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%.*s\t%.*s\t%c%c%c\t%s", 5, event->GetDateString(), 5, event->GetTimeString(), t, v, r, event->Title());
+  asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, event->GetDateString(), event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1048,7 +1058,7 @@ class cMenuSchedule : public cOsdMenu {
   };
 
 cMenuSchedule::cMenuSchedule(void)
-:cOsdMenu("", 6, 6, 4)
+:cOsdMenu("", 7, 6, 4)
 {
   now = next = false;
   otherChannel = 0;
@@ -2485,6 +2495,7 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 cDisplayChannel::~cDisplayChannel()
 {
   delete displayChannel;
+  cStatus::MsgOsdClear();
 }
 
 void cDisplayChannel::DisplayChannel(void)
diff --git a/menu.h b/menu.h
index d52f6419b..150f88de8 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.61 2004/04/30 13:45:19 kls Exp $
+ * $Id: menu.h 1.63 2004/05/23 09:47:26 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -19,6 +19,17 @@
 #include "recording.h"
 #include "skins.h"
 
+class cMenuText : public cOsdMenu {
+private:
+  char *text;
+public:
+  cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
+  virtual ~cMenuText();
+  void SetText(const char *Text);
+  virtual void Display(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
diff --git a/nit.c b/nit.c
index 92c02f1fd..cf3b674fc 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.6 2004/02/13 14:41:36 kls Exp $
+ * $Id: nit.c 1.7 2004/05/22 15:46:21 kls Exp $
  */
 
 #include "nit.h"
@@ -76,6 +76,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       break;
                  default: ;
                  }
+               delete d;
                }
            nits[numNits].networkId = nit.getNetworkId();
            nits[numNits].hasTransponder = false;
diff --git a/osd.c b/osd.c
index 94668623a..077cd9c1f 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.46 2004/05/16 09:25:06 kls Exp $
+ * $Id: osd.c 1.47 2004/05/22 13:47:39 kls Exp $
  */
 
 #include "osd.h"
@@ -264,6 +264,8 @@ bool cBitmap::SetXpm(char *Xpm[])
          return false;
          }
       s = skipspace(s + 1);
+      if (strcasecmp(s, "none") == 0)
+         s = "#00000000";
       if (*s != '#') {
          esyslog("ERROR: unknown color code in XPM: '%c'", *s);
          return false;
diff --git a/pat.c b/pat.c
index b9fc0e637..260f67d31 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.8 2004/03/07 16:59:00 kls Exp $
+ * $Id: pat.c 1.9 2004/05/23 09:29:04 kls Exp $
  */
 
 #include "pat.h"
@@ -211,6 +211,7 @@ int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
 int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
 {
   cMutexLock MutexLock(&mutex);
+  StreamFlag = false;
   for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
       if (ca->Is(Source, Transponder, ServiceId))
          return ca->GetCaDescriptors(CaSystemIds, BufSize, Data, StreamFlag);
@@ -326,8 +327,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS] = { 0 };
         int Dpids[MAXAPIDS] = { 0 };
-        char ALangs[MAXAPIDS][4];
-        char DLangs[MAXAPIDS][4];
+        char ALangs[MAXAPIDS][4] = { "" };
+        char DLangs[MAXAPIDS][4] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
@@ -343,7 +344,6 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       {
                       if (NumApids < MAXAPIDS) {
                          Apids[NumApids] = stream.getPid();
-                         *ALangs[NumApids] = 0;
                          SI::Descriptor *d;
                          for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                              switch (d->getDescriptorTag()) {
diff --git a/plugin.c b/plugin.c
index a0d270118..7f211b3ce 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.10 2003/08/30 14:52:58 kls Exp $
+ * $Id: plugin.c 1.11 2004/05/22 11:25:22 kls Exp $
  */
 
 #include "plugin.h"
@@ -162,7 +162,7 @@ bool cDll::Load(bool Log)
   const char *error = dlerror();
   if (!error) {
      void *(*creator)(void);
-     (void *)creator = dlsym(handle, "VDRPluginCreator");
+     creator = (void *(*)(void))dlsym(handle, "VDRPluginCreator");
      if (!(error = dlerror()))
         plugin = (cPlugin *)creator();
      }
diff --git a/skinclassic.c b/skinclassic.c
index 2c4b56321..3f0de1c50 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.1 2004/05/15 14:51:18 kls Exp $
+ * $Id: skinclassic.c 1.3 2004/05/23 10:40:02 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -231,10 +231,10 @@ void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, con
   int t2 = x0 + w / 2;
   int t3 = x1 - w / 4;
   int t4 = x1;
-  osd->DrawText(t0, y4, Red,    Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font, t1 - t0, 0, taCenter);
-  osd->DrawText(t1, y4, Green,  Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font, t2 - t1, 0, taCenter);
-  osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, t3 - t2, 0, taCenter);
-  osd->DrawText(t3, y4, Blue,   Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font, t4 - t3, 0, taCenter);
+  osd->DrawText(t0, y4, Red,    Theme.Color(clrButtonRedFg),    Red    ? Theme.Color(clrButtonRedBg)    : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter);
+  osd->DrawText(t1, y4, Green,  Theme.Color(clrButtonGreenFg),  Green  ? Theme.Color(clrButtonGreenBg)  : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter);
+  osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Yellow ? Theme.Color(clrButtonYellowBg) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter);
+  osd->DrawText(t3, y4, Blue,   Theme.Color(clrButtonBlueFg),   Blue   ? Theme.Color(clrButtonBlueBg)   : Theme.Color(clrBackground), font, t4 - t3, 0, taCenter);
 }
 
 void cSkinClassicDisplayMenu::SetMessage(eMessageType Type, const char *Text)
@@ -280,7 +280,7 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
   int y = y2;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());//TODO dayname, no year
+  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());
   ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
diff --git a/skins.h b/skins.h
index 412810f29..03c8a4a0c 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.1 2004/05/16 09:40:18 kls Exp $
+ * $Id: skins.h 1.2 2004/05/16 20:16:57 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -184,7 +184,7 @@ class cSkinDisplayReplay : public cSkinDisplay {
        ///< indicator, showing the user whether we are currently in normal
        ///< play mode, fast forward etc.
   virtual void SetProgress(int Current, int Total) = 0;
-       ///< This function will be called whenever the position in of the total
+       ///< This function will be called whenever the position in or the total
        ///< length of the recording has changed. A cProgressBar shall then be
        ///< used to display a progress indicator.
   virtual void SetCurrent(const char *Current) = 0;
diff --git a/skinsttng.c b/skinsttng.c
index cb44a3e09..a268978ad 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.1 2004/05/16 09:27:35 kls Exp $
+ * $Id: skinsttng.c 1.2 2004/05/22 13:05:07 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -515,7 +515,7 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
   int y = y3;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());//TODO dayname, no year
+  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
diff --git a/themes.c b/themes.c
index 0232822ee..1b6adf9d0 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.1 2004/05/16 09:43:14 kls Exp $
+ * $Id: themes.c 1.2 2004/05/22 10:30:06 kls Exp $
  */
 
 #include "themes.h"
@@ -274,7 +274,7 @@ int cThemes::GetThemeIndex(const char *Description)
       if (strcmp(descriptions[i], Description) == 0)
          return i;
       if (strcmp(descriptions[i], "Default") == 0)
-         index = 1;
+         index = i;
       }
   return index;
 }
diff --git a/tools.c b/tools.c
index fc8cb294b..42193b2f5 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.78 2004/01/11 15:42:30 kls Exp $
+ * $Id: tools.c 1.79 2004/05/22 12:13:27 kls Exp $
  */
 
 #include "tools.h"
@@ -495,6 +495,12 @@ const char *WeekDayName(int WeekDay)
      return "???";
 }
 
+const char *WeekDayName(time_t t)
+{
+  struct tm tm_r;
+  return WeekDayName(localtime_r(&t, &tm_r)->tm_wday);
+}
+
 const char *DayDateTime(time_t t)
 {
   static char buffer[32];
diff --git a/tools.h b/tools.h
index 5af8ffa4f..2132d0016 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.55 2004/01/11 15:42:15 kls Exp $
+ * $Id: tools.h 1.56 2004/05/22 12:11:44 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -84,6 +84,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
 const char *WeekDayName(int WeekDay); ///< \warning returns a statically allocated string!
+const char *WeekDayName(time_t t); ///< \warning returns a statically allocated string!
 const char *DayDateTime(time_t t = 0); ///< \warning returns a statically allocated string!
 
 class cPoller {

From b81bf2d1c92e2ac820d2116c66f328869eb627cd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 31 May 2004 18:00:00 +0200
Subject: [PATCH 101/307] =?UTF-8?q?Version=201.3.9=20-=20Completed=20Croat?=
 =?UTF-8?q?ian=20language=20texts=20(thanks=20to=20Drazen=20Dupor).=20-=20?=
 =?UTF-8?q?New=20iso8859-2=20font=20to=20fix=20the=20problem=20with=20prog?=
 =?UTF-8?q?ram=20freezes=20(thanks=20to=20Drazen=20Dupor).=20-=20Implement?=
 =?UTF-8?q?ed=20a=20default=20cRemote::Initialize()=20that=20waits=2010=20?=
 =?UTF-8?q?seconds=20for=20a=20keypress=20=20=20in=20order=20to=20prevent?=
 =?UTF-8?q?=20a=20"hangup"=20in=20case,=20e.g.,=20the=20LIRC=20driver=20is?=
 =?UTF-8?q?=20not=20loaded=20(thanks=20=20=20to=20Helmut=20Auer).=20-=20Up?=
 =?UTF-8?q?dated=20'channels.conf.terr'=20for=20Hannover=20(thanks=20to=20?=
 =?UTF-8?q?Peter=20Waechtler).=20-=20cBitmap::DrawBitmap()=20now=20also=20?=
 =?UTF-8?q?resets=20the=20palette=20if=20the=20entire=20bitmap=20area=20is?=
 =?UTF-8?q?=20=20=20covered=20(suggested=20by=20Sascha=20Volkenandt).=20-?=
 =?UTF-8?q?=20Fixed=20setting=20the=20title=20in=20the=20replay=20display?=
 =?UTF-8?q?=20of=20the=20"Classic=20VDR"=20skin=20in=20case=20=20=20a=20sh?=
 =?UTF-8?q?orter=20title=20is=20set=20after=20a=20longer=20one=20(thanks?=
 =?UTF-8?q?=20to=20Stefan=20Huelswitt=20for=20=20=20reporting=20this=20one?=
 =?UTF-8?q?).=20-=20Now=20using=20more=20separate=20areas=20in=20the=20"ST?=
 =?UTF-8?q?:TNG=20Panels"=20skin=20to=20allow=20a=20theme=20to=20=20=20use?=
 =?UTF-8?q?=20more=20independent=20clrMenu*=20colors.=20-=20Fixed=20removi?=
 =?UTF-8?q?ng=20the=20"scanning=20recordings..."=20message=20in=20case=20t?=
 =?UTF-8?q?he=20video=20directory=20=20=20is=20empty=20(thanks=20to=20Andr?=
 =?UTF-8?q?eas=20Regel=20for=20reporting=20this=20one).=20-=20Added=20SetM?=
 =?UTF-8?q?essage()=20functions=20to=20the=20Replay=20and=20Channel=20skin?=
 =?UTF-8?q?=20functions.=20Plugins=20=20=20that=20implement=20skins=20will?=
 =?UTF-8?q?=20need=20to=20implement=20these=20functions.=20This=20fixes=20?=
 =?UTF-8?q?a=20missing=20=20=20"Editing=20process=20finished"=20message=20?=
 =?UTF-8?q?(thanks=20to=20Oliver=20Endriss=20for=20reporting=20this=20=20?=
 =?UTF-8?q?=20one).=20-=20Fixed=20the=20height=20of=20the=20channel=20disp?=
 =?UTF-8?q?lay=20in=20the=20"Classic=20VDR"=20skin.=20-=20Fixed=20handling?=
 =?UTF-8?q?=20descriptor=20loops=20in=20'libsi',=20which=20had=20sometimes?=
 =?UTF-8?q?=20caused=20invalid=20=20=20CA=20ids=20to=20be=20added=20to=20t?=
 =?UTF-8?q?he=20channel=20definitions=20(thanks=20to=20Wayne=20Keer=20for?=
 =?UTF-8?q?=20reporting=20=20=20this=20one,=20and=20Marcel=20Wiesweg=20for?=
 =?UTF-8?q?=20fixing=20it).=20-=20Fixed=20handling=20colors=20in=20cDvbSpu?=
 =?UTF-8?q?Palette::yuv2rgb()=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler?=
 =?UTF-8?q?).=20-=20Made=20some=20functions=20of=20cFont=20virtual=20to=20?=
 =?UTF-8?q?allow=20implementing=20dummy=20fonts=20for=20the=20=20=20'curse?=
 =?UTF-8?q?s'=20skin.=20-=20The=20new=20plugin=20'skincurses'=20re-impleme?=
 =?UTF-8?q?nts=20the=20functionality=20that=20was=20previously=20=20=20ava?=
 =?UTF-8?q?ilable=20by=20compiling=20VDR=20with=20DEBUG=5FOSD.=20Some=20th?=
 =?UTF-8?q?ings=20may=20not=20yet=20work=20as=20they=20=20=20should,=20but?=
 =?UTF-8?q?=20it's=20a=20starting=20point.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |   15 +
 HISTORY                             |   34 +-
 PLUGINS/src/skincurses/COPYING      |  340 ++
 PLUGINS/src/skincurses/HISTORY      |    6 +
 PLUGINS/src/skincurses/Makefile     |   82 +
 PLUGINS/src/skincurses/README       |   16 +
 PLUGINS/src/skincurses/skincurses.c |  724 +++
 channels.conf                       |   14 +-
 channels.conf.terr                  |   23 +-
 config.h                            |    6 +-
 dvbspu.h                            |    7 +-
 font.c                              |   12 +-
 font.h                              |   12 +-
 fontosd-iso8859-2.c                 | 8338 +++++++++++++--------------
 i18n.c                              |   32 +-
 libsi/si.c                          |    6 +-
 menu.c                              |    9 +-
 osd.c                               |   19 +-
 osd.h                               |   11 +-
 remote.c                            |   15 +-
 remote.h                            |    4 +-
 skinclassic.c                       |   48 +-
 skins.h                             |   12 +-
 skinsttng.c                         |   74 +-
 24 files changed, 5489 insertions(+), 4370 deletions(-)
 create mode 100644 PLUGINS/src/skincurses/COPYING
 create mode 100644 PLUGINS/src/skincurses/HISTORY
 create mode 100644 PLUGINS/src/skincurses/Makefile
 create mode 100644 PLUGINS/src/skincurses/README
 create mode 100644 PLUGINS/src/skincurses/skincurses.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 48e7831d5..cb59f2f81 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -185,6 +185,8 @@ Stefan Huelswitt <huels@iname.com>
  stuff obsolete
  for suggesting to move the declaration of cMenuText to VDR/menu.h to make it
  available to plugins, and to add a SetText() function
+ for reporting a bug in setting the title in the replay display of the "Classic VDR"
+ skin in case a shorter title is set after a longer one
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -479,6 +481,7 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to make the "Zap timeout" a setup variable
  for fixing a frequency/transponder handling mixup when setting the time from the
  DVB data stream
+ for implementing a default cRemote::Initialize()
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -523,6 +526,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for adding a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel()
  for reporting that the "Classic VDR" skin wrongly displayed unused color buttons
  for reporting some missing cStatus::MsgOsdTextItem() calls
+ for reporting a missing "Editing process finished" message with skins
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -707,6 +711,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for reporting a crash when switching the skin and having selected a non-default
  theme that is not available for the newly selected skin
  for suggesting to map the color name "None" to #00000000 when processing XPM data
+ for suggesting to also reset the palette in cBitmap::DrawBitmap() if the entire
+ bitmap area is covered
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -952,6 +958,8 @@ Jens Rosenboom <me@jayr.de>
 
 Andreas Regel <andreas.regel@gmx.de>
  for fixing handling bitmap indexes for 256 color mode
+ for reporting a bug in removing the "scanning recordings..." message in case the
+ video directory is empty
 
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -995,3 +1003,10 @@ Miko Wohlgemuth <weak@chello.at>
 Michal Dobrzynski <michal_dobrzynski@mac.com>
  for reporting a freezing picture when a recording starts on a system that always
  uses 'Transfer Mode'
+
+Wayne Keer <syphir@syphir.sytes.net>
+ for reporting a bug in handling descriptor loops in 'libsi', which had sometimes
+ caused invalid CA ids to be added to the channel definitions
+
+Marco Schl��ler <marco@lordzodiac.de>
+ for fixing handling colors in cDvbSpuPalette::yuv2rgb()
diff --git a/HISTORY b/HISTORY
index 43cfe9b8e..73cfdfef2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2819,7 +2819,7 @@ Video Disk Recorder Revision History
   cEvent::GetDateString() should note that this function now returns a longer
   string, including the day of week. The new function const char *WeekDayName(time_t t)
   can be called with a time_t value to get the day of week for that time.
-- When processing XPM data, the color name "None" is no mapped to #00000000, which
+- When processing XPM data, the color name "None" is now mapped to #00000000, which
   is "fully transparent" (suggested by Sascha Volkenandt).
 - Fixed the OSD alignment in the SPU decoder (thanks to Miko Wohlgemuth for reporting
   this one and helping to test the fix).
@@ -2837,3 +2837,35 @@ Video Disk Recorder Revision History
   Oliver Endriss for reporting this one).
 - Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for
   reporting this one).
+
+2004-05-31: Version 1.3.9
+
+- Completed Croatian language texts (thanks to Drazen Dupor).
+- New iso8859-2 font to fix the problem with program freezes (thanks to Drazen Dupor).
+- Implemented a default cRemote::Initialize() that waits 10 seconds for a keypress
+  in order to prevent a "hangup" in case, e.g., the LIRC driver is not loaded (thanks
+  to Helmut Auer).
+- Updated 'channels.conf.terr' for Hannover (thanks to Peter Waechtler).
+- cBitmap::DrawBitmap() now also resets the palette if the entire bitmap area is
+  covered (suggested by Sascha Volkenandt).
+- Fixed setting the title in the replay display of the "Classic VDR" skin in case
+  a shorter title is set after a longer one (thanks to Stefan Huelswitt for
+  reporting this one).
+- Now using more separate areas in the "ST:TNG Panels" skin to allow a theme to
+  use more independent clrMenu* colors.
+- Fixed removing the "scanning recordings..." message in case the video directory
+  is empty (thanks to Andreas Regel for reporting this one).
+- Added SetMessage() functions to the Replay and Channel skin functions. Plugins
+  that implement skins will need to implement these functions. This fixes a missing
+  "Editing process finished" message (thanks to Oliver Endriss for reporting this
+  one).
+- Fixed the height of the channel display in the "Classic VDR" skin.
+- Fixed handling descriptor loops in 'libsi', which had sometimes caused invalid
+  CA ids to be added to the channel definitions (thanks to Wayne Keer for reporting
+  this one, and Marcel Wiesweg for fixing it).
+- Fixed handling colors in cDvbSpuPalette::yuv2rgb() (thanks to Marco Schl��ler).
+- Made some functions of cFont virtual to allow implementing dummy fonts for the
+  'curses' skin.
+- The new plugin 'skincurses' re-implements the functionality that was previously
+  available by compiling VDR with DEBUG_OSD. Some things may not yet work as they
+  should, but it's a starting point.
diff --git a/PLUGINS/src/skincurses/COPYING b/PLUGINS/src/skincurses/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/src/skincurses/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
new file mode 100644
index 000000000..9f459b4f3
--- /dev/null
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'skincurses' Revision History
+----------------------------------------
+
+2004-05-29: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
new file mode 100644
index 000000000..794863b3c
--- /dev/null
+++ b/PLUGINS/src/skincurses/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2004/05/29 14:44:58 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = skincurses
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README
new file mode 100644
index 000000000..7e82b22c5
--- /dev/null
+++ b/PLUGINS/src/skincurses/README
@@ -0,0 +1,16 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          www.cadsoft.de/vdr
+
+Latest version available at: www.cadsoft.de/vdr
+
+See the file COPYING for license information.
+
+Description:
+
+The 'skincurses' plugin implements a VDR skin that works in a
+shell window, using only plain text output. It re-implements
+what used to be available by compiling VDR versions before 1.3.7
+with the DEBUG_OSD macro set.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
new file mode 100644
index 000000000..38c297ac2
--- /dev/null
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -0,0 +1,724 @@
+/*
+ * skincurses.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: skincurses.c 1.1 2004/05/31 14:01:49 kls Exp $
+ */
+
+#include <ncurses.h>
+#include <vdr/osd.h>
+#include <vdr/plugin.h>
+#include <vdr/skins.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "A text only skin";
+static const char *MAINMENUENTRY  = NULL;
+
+// --- cCursesFont -----------------------------------------------------------
+
+class cCursesFont : public cFont {
+public:
+  cCursesFont(void): cFont(NULL) {}
+  virtual int Width(unsigned char c) const { return 1; }
+  virtual int Width(const char *s) const { return s ? strlen(s) : 0; }
+  virtual int Height(unsigned char c) const { return 1; }
+  virtual int Height(const char *s) const { return 1; }
+  virtual int Height(void) const { return 1; }
+  };
+
+static const cCursesFont Font;
+
+// --- cCursesOsd ------------------------------------------------------------
+
+#define clrBackground   COLOR_BLACK
+#define clrTransparent  clrBackground
+#define clrBlack        clrBackground
+#define clrRed          COLOR_RED
+#define clrGreen        COLOR_GREEN
+#define clrYellow       COLOR_YELLOW
+#define clrBlue         COLOR_BLUE
+#define clrMagenta      COLOR_MAGENTA
+#define clrCyan         COLOR_CYAN
+#define clrWhite        COLOR_WHITE
+
+static int clrMessage[] = {
+  clrBlack,
+  clrCyan,
+  clrBlack,
+  clrGreen,
+  clrBlack,
+  clrYellow,
+  clrWhite,
+  clrRed
+  };
+
+#define OsdWidth  50//XXX
+#define OsdHeight 20//XXX
+
+class cCursesOsd : public cOsd {
+private:
+  WINDOW *savedRegion;
+  WINDOW *window;
+  enum { MaxColorPairs = 16 };
+  int colorPairs[MaxColorPairs];
+  void SetColor(int colorFg, int colorBg = clrBackground);
+public:
+  cCursesOsd(int Left, int Top);
+  virtual ~cCursesOsd();
+  virtual void SaveRegion(int x1, int y1, int x2, int y2);
+  virtual void RestoreRegion(void);
+  virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
+  virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
+  virtual void Flush(void);
+  };
+
+cCursesOsd::cCursesOsd(int Left, int Top)
+:cOsd(Left, Top)
+{
+  savedRegion = NULL;
+
+  memset(colorPairs, 0x00, sizeof(colorPairs));
+  start_color();
+  leaveok(stdscr, true);
+
+  window = subwin(stdscr, OsdHeight, OsdWidth, 0, 0);
+  syncok(window, true);
+}
+
+cCursesOsd::~cCursesOsd()
+{
+  if (window) {
+     werase(window);
+     Flush();
+     delwin(window);
+     window = NULL;
+     }
+}
+
+void cCursesOsd::SetColor(int colorFg, int colorBg)
+{
+  int color = (colorBg << 16) | colorFg | 0x80000000;
+  for (int i = 0; i < MaxColorPairs; i++) {
+      if (!colorPairs[i]) {
+         colorPairs[i] = color;
+         init_pair(i + 1, colorFg, colorBg);
+         //XXX??? attron(COLOR_PAIR(WHITE_ON_BLUE));
+         wattrset(window, COLOR_PAIR(i + 1));
+         break;
+         }
+      else if (color == colorPairs[i]) {
+         wattrset(window, COLOR_PAIR(i + 1));
+         break;
+         }
+      }
+}
+
+void cCursesOsd::SaveRegion(int x1, int y1, int x2, int y2)
+{
+  if (savedRegion) {
+     delwin(savedRegion);
+     savedRegion = NULL;
+     }
+  savedRegion = newwin(y2 - y1 + 1, x2 - x1 + 1, y1, x1);
+  copywin(window, savedRegion, y1, x1, 0, 0, y2 - y1, x2 - x1, false);
+}
+
+void cCursesOsd::RestoreRegion(void)
+{
+  if (savedRegion) {
+     copywin(savedRegion, window, 0, 0, savedRegion->_begy, savedRegion->_begx, savedRegion->_maxy - savedRegion->_begy, savedRegion->_maxx - savedRegion->_begx, false);
+     delwin(savedRegion);
+     savedRegion = NULL;
+     }
+}
+
+void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault)
+{
+  int w = Font->Width(s);
+  int h = Font->Height();
+  if (Width || Height) {
+     int cw = Width ? Width : w;
+     int ch = Height ? Height : h;
+     DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
+     if (Width) {
+        if ((Alignment & taLeft) != 0)
+           ;
+        else if ((Alignment & taRight) != 0) {
+           if (w < Width)
+              x += Width - w;
+           }
+        else { // taCentered
+           if (w < Width)
+              x += (Width - w) / 2;
+           }
+        }
+     if (Height) {
+        if ((Alignment & taTop) != 0)
+           ;
+        else if ((Alignment & taBottom) != 0) {
+           if (h < Height)
+              y += Height - h;
+           }
+        else { // taCentered
+           if (h < Height)
+              y += (Height - h) / 2;
+           }
+        }
+     }
+  SetColor(ColorFg, ColorBg);
+  wmove(window, y, x); // ncurses wants 'y' before 'x'!
+  waddnstr(window, s, OsdWidth - x);
+}
+
+void cCursesOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
+{
+  SetColor(Color, Color);
+  for (int y = y1; y <= y2; y++) {
+      wmove(window, y, x1); // ncurses wants 'y' before 'x'!
+      whline(window, ' ', x2 - x1 + 1);
+      }
+  wsyncup(window); // shouldn't be necessary because of 'syncok()', but w/o it doesn't work
+}
+
+void cCursesOsd::Flush(void)
+{
+  refresh();
+}
+
+// --- cSkinCursesDisplayChannel ---------------------------------------------
+
+class cSkinCursesDisplayChannel : public cSkinDisplayChannel {
+private:
+  cOsd *osd;
+  int timeWidth;
+  bool message;
+public:
+  cSkinCursesDisplayChannel(bool WithInfo);
+  virtual ~cSkinCursesDisplayChannel();
+  virtual void SetChannel(const cChannel *Channel, int Number);
+  virtual void SetEvents(const cEvent *Present, const cEvent *Following);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinCursesDisplayChannel::cSkinCursesDisplayChannel(bool WithInfo)
+{
+  int Lines = WithInfo ? 5 : 1;
+  message = false;
+  osd = new cCursesOsd(0, Setup.ChannelInfoPos ? 0 : OsdHeight - Lines);
+  timeWidth = strlen("00:00");
+  osd->DrawRectangle(0, 0, OsdWidth - 1, Lines - 1, clrBackground);
+}
+
+cSkinCursesDisplayChannel::~cSkinCursesDisplayChannel()
+{
+  delete osd;
+}
+
+void cSkinCursesDisplayChannel::SetChannel(const cChannel *Channel, int Number)
+{
+  osd->DrawRectangle(0, 0, OsdWidth - 1, 0, clrBackground);
+  osd->DrawText(0, 0, ChannelString(Channel, Number), clrWhite, clrBackground, &Font);
+}
+
+void cSkinCursesDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
+{
+  osd->DrawRectangle(0, 1, timeWidth - 1, 4, clrRed);
+  osd->DrawRectangle(timeWidth, 1, OsdWidth - 1, 4, clrBackground);
+  for (int i = 0; i < 2; i++) {
+      const cEvent *e = !i ? Present : Following;
+      if (e) {
+         osd->DrawText(            0, 2 * i + 1, e->GetTimeString(), clrWhite, clrRed, &Font);
+         osd->DrawText(timeWidth + 1, 2 * i + 1, e->Title(), clrCyan, clrBackground, &Font);
+         osd->DrawText(timeWidth + 1, 2 * i + 2, e->ShortText(), clrYellow, clrBackground, &Font);
+         }
+      }
+}
+
+void cSkinCursesDisplayChannel::SetMessage(eMessageType Type, const char *Text)
+{
+  if (Text) {
+     osd->SaveRegion(0, 0, OsdWidth - 1, 0);
+     osd->DrawText(0, 0, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
+void cSkinCursesDisplayChannel::Flush(void)
+{
+  if (!message) {
+     const char *date = DayDateTime();
+     osd->DrawText(OsdWidth - strlen(date), 0, date, clrWhite, clrBackground, &Font);
+     }
+  osd->Flush();
+}
+
+// --- cSkinCursesDisplayMenu ------------------------------------------------
+
+class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
+private:
+  cOsd *osd;
+  void SetScrollbar(void);
+public:
+  cSkinCursesDisplayMenu(void);
+  virtual ~cSkinCursesDisplayMenu();
+  virtual void Scroll(bool Up, bool Page);
+  virtual int MaxItems(void);
+  virtual void Clear(void);
+  virtual void SetTitle(const char *Title);
+  virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetEvent(const cEvent *Event);
+  virtual void SetRecording(const cRecording *Recording);
+  virtual void SetText(const char *Text, bool FixedFont);
+  virtual void Flush(void);
+  };
+
+cSkinCursesDisplayMenu::cSkinCursesDisplayMenu(void)
+{
+  osd = new cCursesOsd(0, 0);
+  osd->DrawRectangle(0, 0, OsdWidth - 1, OsdHeight - 1, clrBackground);
+}
+
+cSkinCursesDisplayMenu::~cSkinCursesDisplayMenu()
+{
+  delete osd;
+}
+
+void cSkinCursesDisplayMenu::SetScrollbar(void)
+{
+  if (textScroller.CanScroll()) {
+     int yt = textScroller.Top();
+     int yb = yt + textScroller.Height() - 1;
+     int st = yt;
+     int sb = yb;
+     int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
+     int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
+     int xl = OsdWidth - 1;
+     osd->DrawRectangle(xl, st, xl, sb, clrCyan);
+     osd->DrawRectangle(xl, tt, xl, tb, clrWhite);
+     }
+}
+
+void cSkinCursesDisplayMenu::Scroll(bool Up, bool Page)
+{
+  cSkinDisplayMenu::Scroll(Up, Page);
+  SetScrollbar();
+}
+
+int cSkinCursesDisplayMenu::MaxItems(void)
+{
+  return OsdHeight - 4;
+}
+
+void cSkinCursesDisplayMenu::Clear(void)
+{
+  osd->DrawRectangle(0, 1, OsdWidth - 1, OsdHeight - 2, clrBackground);
+  textScroller.Reset();
+}
+
+void cSkinCursesDisplayMenu::SetTitle(const char *Title)
+{
+  osd->DrawText(0, 0, Title, clrBlack, clrCyan, &Font, OsdWidth);
+}
+
+void cSkinCursesDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  int w = OsdWidth;
+  int t0 = 0;
+  int t1 = 0 + w / 4;
+  int t2 = 0 + w / 2;
+  int t3 = w - w / 4;
+  int t4 = w;
+  int y = OsdHeight - 1;
+  osd->DrawText(t0, y, Red,    clrWhite, Red    ? clrRed    : clrBackground, &Font, t1 - t0, 0, taCenter);
+  osd->DrawText(t1, y, Green,  clrBlack, Green  ? clrGreen  : clrBackground, &Font, t2 - t1, 0, taCenter);
+  osd->DrawText(t2, y, Yellow, clrBlack, Yellow ? clrYellow : clrBackground, &Font, t3 - t2, 0, taCenter);
+  osd->DrawText(t3, y, Blue,   clrWhite, Blue   ? clrBlue   : clrBackground, &Font, t4 - t3, 0, taCenter);
+}
+
+void cSkinCursesDisplayMenu::SetMessage(eMessageType Type, const char *Text)
+{
+  if (Text)
+     osd->DrawText(0, OsdHeight - 2, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+  else
+     osd->DrawRectangle(0, OsdHeight - 2, OsdWidth - 1, OsdHeight - 2, clrBackground);
+}
+
+void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable)
+{
+  int y = 2 + Index;
+  int ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = clrBlack;
+     ColorBg = clrCyan;
+     }
+  else {
+     ColorFg = Selectable ? clrWhite : clrCyan;
+     ColorBg = clrBackground;
+     }
+  for (int i = 0; i < MaxTabs; i++) {
+      const char *s = GetTabbedText(Text, i);
+      if (s) {
+         int xt = Tab(i);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, OsdWidth - xt);
+         }
+      if (!Tab(i + 1))
+         break;
+      }
+  SetEditableWidth(OsdWidth - Tab(1));
+}
+
+void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
+{
+  if (!Event)
+     return;
+  int y = 2;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());
+  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
+  if (Event->Vps() && Event->Vps() != Event->StartTime()) {
+     char *buffer;
+     asprintf(&buffer, " VPS: %s", Event->GetVpsString());
+     osd->DrawText(OsdWidth - strlen(buffer), y, buffer, clrBlack, clrYellow, &Font);
+     free(buffer);
+     }
+  y += ts.Height();
+  y += 1;
+  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Event->Title(), &Font, clrCyan, clrBackground);
+  y += ts.Height();
+  if (!isempty(Event->ShortText())) {
+     ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Event->ShortText(), &Font, clrYellow, clrBackground);
+     y += ts.Height();
+     }
+  y += 1;
+  if (!isempty(Event->Description())) {
+     textScroller.Set(osd, 0, y, OsdWidth - 2, OsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground);
+     SetScrollbar();
+     }
+}
+
+void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
+{
+  SetText(Recording->Summary(), false); //TODO
+}
+
+void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
+{
+  textScroller.Set(osd, 0, 2, OsdWidth - 2, OsdHeight - 4, Text, &Font, clrWhite, clrBackground);
+  SetScrollbar();
+}
+
+void cSkinCursesDisplayMenu::Flush(void)
+{
+  const char *date = DayDateTime();
+  osd->DrawText(OsdWidth - strlen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
+  osd->Flush();
+}
+
+// --- cSkinCursesDisplayReplay ----------------------------------------------
+
+class cSkinCursesDisplayReplay : public cSkinDisplayReplay {
+private:
+  cOsd *osd;
+  bool message;
+public:
+  cSkinCursesDisplayReplay(bool ModeOnly);
+  virtual ~cSkinCursesDisplayReplay();
+  virtual void SetTitle(const char *Title);
+  virtual void SetMode(bool Play, bool Forward, int Speed);
+  virtual void SetProgress(int Current, int Total);
+  virtual void SetCurrent(const char *Current);
+  virtual void SetTotal(const char *Total);
+  virtual void SetJump(const char *Jump);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinCursesDisplayReplay::cSkinCursesDisplayReplay(bool ModeOnly)
+{
+  message = false;
+  osd = new cCursesOsd(0, OsdHeight - 3);
+  osd->DrawRectangle(0, 0, OsdWidth - 1, 2, ModeOnly ? clrTransparent : clrBackground);
+}
+
+cSkinCursesDisplayReplay::~cSkinCursesDisplayReplay()
+{
+  delete osd;
+}
+
+void cSkinCursesDisplayReplay::SetTitle(const char *Title)
+{
+  osd->DrawText(0, 0, Title, clrWhite, clrBackground, &Font, OsdWidth);
+}
+
+void cSkinCursesDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
+{
+  if (Setup.ShowReplayMode) {
+     const char *Mode;
+     if (Speed == -1) Mode = Play    ? "  >  " : " ||  ";
+     else if (Play)   Mode = Forward ? " X>> " : " <<X ";
+     else             Mode = Forward ? " X|> " : " <|X ";
+     char buf[16];
+     strn0cpy(buf, Mode, sizeof(buf));
+     char *p = strchr(buf, 'X');
+     if (p)
+        *p = Speed > 0 ? '1' + Speed - 1 : ' ';
+     SetJump(buf);
+     }
+}
+
+void cSkinCursesDisplayReplay::SetProgress(int Current, int Total)
+{
+  int p = OsdWidth * Current / Total;
+  osd->DrawRectangle(0, 1, p, 1, clrGreen);
+  osd->DrawRectangle(p, 1, OsdWidth, 1, clrWhite);
+}
+
+void cSkinCursesDisplayReplay::SetCurrent(const char *Current)
+{
+  osd->DrawText(0, 2, Current, clrWhite, clrBackground, &Font, strlen(Current) + 3);
+}
+
+void cSkinCursesDisplayReplay::SetTotal(const char *Total)
+{
+  osd->DrawText(OsdWidth - strlen(Total), 2, Total, clrWhite, clrBackground, &Font);
+}
+
+void cSkinCursesDisplayReplay::SetJump(const char *Jump)
+{
+  osd->DrawText(OsdWidth / 4, 2, Jump, clrWhite, clrBackground, &Font, OsdWidth / 2, 0, taCenter);
+}
+
+void cSkinCursesDisplayReplay::SetMessage(eMessageType Type, const char *Text)
+{
+  if (Text) {
+     osd->SaveRegion(0, 2, OsdWidth - 1, 2);
+     osd->DrawText(0, 2, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
+void cSkinCursesDisplayReplay::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinCursesDisplayVolume ----------------------------------------------
+
+class cSkinCursesDisplayVolume : public cSkinDisplayVolume {
+private:
+  cOsd *osd;
+public:
+  cSkinCursesDisplayVolume(void);
+  virtual ~cSkinCursesDisplayVolume();
+  virtual void SetVolume(int Current, int Total, bool Mute);
+  virtual void Flush(void);
+  };
+
+cSkinCursesDisplayVolume::cSkinCursesDisplayVolume(void)
+{
+  osd = new cCursesOsd(0, OsdHeight - 1);
+}
+
+cSkinCursesDisplayVolume::~cSkinCursesDisplayVolume()
+{
+  delete osd;
+}
+
+void cSkinCursesDisplayVolume::SetVolume(int Current, int Total, bool Mute)
+{
+  if (Mute) {
+     osd->DrawRectangle(0, 0, OsdWidth - 1, 0, clrTransparent);
+     osd->DrawText(0, 0, tr("Mute"), clrGreen, clrBackground, &Font);
+     }
+  else {
+     const char *Prompt = tr("Volume ");
+     int l = strlen(Prompt);
+     int p = (OsdWidth - l) * Current / Total;
+     osd->DrawText(0, 0, Prompt, clrGreen, clrBackground, &Font);
+     osd->DrawRectangle(l, 0, l + p - 1, 0, clrGreen);
+     osd->DrawRectangle(l + p, 0, OsdWidth - 1, 0, clrWhite);
+     }
+}
+
+void cSkinCursesDisplayVolume::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinCursesDisplayMessage ---------------------------------------------
+
+class cSkinCursesDisplayMessage : public cSkinDisplayMessage {
+private:
+  cOsd *osd;
+public:
+  cSkinCursesDisplayMessage(void);
+  virtual ~cSkinCursesDisplayMessage();
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinCursesDisplayMessage::cSkinCursesDisplayMessage(void)
+{
+  osd = new cCursesOsd(0, OsdHeight - 1);
+}
+
+cSkinCursesDisplayMessage::~cSkinCursesDisplayMessage()
+{
+  delete osd;
+}
+
+void cSkinCursesDisplayMessage::SetMessage(eMessageType Type, const char *Text)
+{
+  osd->DrawText(0, 0, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+}
+
+void cSkinCursesDisplayMessage::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinCurses -----------------------------------------------------------
+
+class cSkinCurses : public cSkin {
+public:
+  cSkinCurses(void);
+  virtual const char *Description(void);
+  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
+  virtual cSkinDisplayMenu *DisplayMenu(void);
+  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
+  virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayMessage *DisplayMessage(void);
+  };
+
+cSkinCurses::cSkinCurses(void)
+:cSkin("curses")
+{
+}
+
+const char *cSkinCurses::Description(void)
+{
+  return tr("Text mode");
+}
+
+cSkinDisplayChannel *cSkinCurses::DisplayChannel(bool WithInfo)
+{
+  return new cSkinCursesDisplayChannel(WithInfo);
+}
+
+cSkinDisplayMenu *cSkinCurses::DisplayMenu(void)
+{
+  return new cSkinCursesDisplayMenu;
+}
+
+cSkinDisplayReplay *cSkinCurses::DisplayReplay(bool ModeOnly)
+{
+  return new cSkinCursesDisplayReplay(ModeOnly);
+}
+
+cSkinDisplayVolume *cSkinCurses::DisplayVolume(void)
+{
+  return new cSkinCursesDisplayVolume;
+}
+
+cSkinDisplayMessage *cSkinCurses::DisplayMessage(void)
+{
+  return new cSkinCursesDisplayMessage;
+}
+
+// --- cPluginSkinCurses -----------------------------------------------------
+
+class cPluginSkinCurses : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  cPluginSkinCurses(void);
+  virtual ~cPluginSkinCurses();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Initialize(void);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdObject *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginSkinCurses::cPluginSkinCurses(void)
+{
+  // Initialize any member variables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+}
+
+cPluginSkinCurses::~cPluginSkinCurses()
+{
+  // Clean up after yourself!
+  endwin();
+}
+
+const char *cPluginSkinCurses::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return NULL;
+}
+
+bool cPluginSkinCurses::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  return true;
+}
+
+bool cPluginSkinCurses::Initialize(void)
+{
+  // Initialize any background activities the plugin shall perform.
+  initscr();
+  return true;
+}
+
+bool cPluginSkinCurses::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  new cSkinCurses;
+  return true;
+}
+
+void cPluginSkinCurses::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
+}
+
+cOsdObject *cPluginSkinCurses::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  return NULL;
+}
+
+cMenuSetupPage *cPluginSkinCurses::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPluginSkinCurses::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginSkinCurses); // Don't touch this!
diff --git a/channels.conf b/channels.conf
index c80333678..ec562950d 100644
--- a/channels.conf
+++ b/channels.conf
@@ -46,21 +46,21 @@ rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1702,1722:10:133:2:0
-PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1702,1722,1801:11:133:2:0
+PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
-PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
-DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
+PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
+DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
 :Premiere Direkt
 DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
-EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
+B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
+EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-Formel 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
+F1-Portal:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu:32:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
 Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
diff --git a/channels.conf.terr b/channels.conf.terr
index f6a84566b..6148fd458 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -73,10 +73,19 @@ Eurosport:754000:I0C23D0M16B8T8G8Y0:T:27500:577:578:583:0:16420:0:0:0
 DSF:754000:I0C23D0M16B8T8G8Y0:T:27500:129:130:135:0:16392:0:0:0
 VIVA Plus:754000:I0C23D0M16B8T8G8Y0:T:27500:529:530:535:0:16417:0:0:0
 Testkanal Pro7:778000:I0C23D0M16B8T8G8Y0:T:27500:305:306:311:0:16403:0:0:0
-: DVB-T Hannover, Germany
-ARD:554000:I0C12D0M16B8T8G32Y0:T:27500:512:650:513:0:28156:0:0:0
-ZDF:554000:I0C12D0M16B8T8G32Y0:T:27500:513:651:513:0:28160:0:0:0
-NDR:554000:I0C12D0M16B8T8G32Y0:T:27500:514:652:513:0:28162:0:0:0
-RTL:530500:I0C12D0M16B8T8G32Y0:T:27500:512:650:513:0:1:0:0:0
-SAT1:530500:I0C12D0M16B8T8G32Y0:T:27500:513:651:513:0:2:0:0:0
-9Live:530500:I0C12D0M16B8T8G32Y0:T:27500:514:652:513:0:3:0:0:0
+: DVB-T Nord Hannover Germany
+ARD:530000:I0C12D0M16B8T8G32Y0:T:27500:4113:4114:4117:0:1:0:0:0
+Phoenix:530000:I0C12D0M16B8T8G32Y0:T:27500:4145:4146:4148:0:3:0:0:0
+Eins-Extra:530000:I0C12D0M16B8T8G32Y0:T:27500:4161:4162:0:0:4:0:0:0
+NDR:530000:I0C12D0M16B8T8G32Y0:T:27500:4129:4130:4133:0:129:0:0:0
+SAT.1:658000:I0C12D0M16B8T8G32Y0:T:27500:385:386:391:0:16408:0:0:0
+ProSieben:658000:I0C12D0M16B8T8G32Y0:T:27500:305:306:311:0:16403:0:0:0
+N24:658000:I0C12D0M16B8T8G32Y0:T:27500:225:226:231:0:16398:0:0:0
+KABEL1:658000:I0C12D0M16B8T8G32Y0:T:27500:161:162:167:0:16394:0:0:0
+VOX:498000:I0C12D0M16B8T8G32Y0:T:27500:545:546:551:0:16418:0:0:0
+RTL:498000:I0C12D0M16B8T8G32Y0:T:27500:337:338:343:0:16405:0:0:0
+RTL2:498000:I0C12D0M16B8T8G32Y0:T:27500:353:354:359:0:16406:0:0:0
+Super-RTL:498000:I0C12D0M16B8T8G32Y0:T:27500:369:370:375:0:16407:0:0:0
+ZDF:490000:I0C12D0M16B8T8G32Y0:T:27500:545:546:551:0:514:0:0:0
+Info-3sat:490000:I0C12D0M16B8T8G32Y0:T:27500:561:562:567:0:515:0:0:0
+Doku-KiKa:490000:I0C12D0M16B8T8G32Y0:T:27500:593:594:514:0:517:0:0:0
diff --git a/config.h b/config.h
index 18f3aeaf8..3f62fcb56 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.195 2004/05/22 11:29:52 kls Exp $
+ * $Id: config.h 1.196 2004/05/28 13:16:03 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.8"
-#define VDRVERSNUM   10308  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.9"
+#define VDRVERSNUM   10309  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbspu.h b/dvbspu.h
index 4c926df39..df717c1b6 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.3 2004/04/30 13:44:41 kls Exp $
+ * $Id: dvbspu.h 1.4 2004/05/31 08:49:20 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -157,7 +157,6 @@ inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
     int Y, Cb, Cr;
     int Ey, Epb, Epr;
     int Eg, Eb, Er;
-    uint32_t result;
 
     Y = (yuv_color >> 16) & 0xff;
     Cb = (yuv_color) & 0xff;
@@ -191,9 +190,7 @@ inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
     if (Er < 0)
         Er = 0;
 
-    result = (Eb << 16) | (Eg << 8) | Er;
-
-    return result;
+    return Eb | (Eg << 8) | (Er << 16);
 }
 
 inline uint32_t cDvbSpuPalette::getColor(uint8_t idx, uint8_t trans) const
diff --git a/font.c b/font.c
index 9a5b31e32..eeabd3346 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.7 2004/05/16 10:50:59 kls Exp $
+ * $Id: font.c 1.8 2004/05/31 09:55:37 kls Exp $
  */
 
 #include "config.h"
@@ -54,9 +54,13 @@ cFont::cFont(void *Data)
 
 void cFont::SetData(void *Data)
 {
-  height = ((tCharData *)Data)->height;
-  for (int i = 0; i < NUMCHARS; i++)
-      data[i] = (tCharData *)&((tPixelData *)Data)[(i < 32 ? 0 : i - 32) * (height + 2)];
+  if (Data) {
+     height = ((tCharData *)Data)->height;
+     for (int i = 0; i < NUMCHARS; i++)
+         data[i] = (tCharData *)&((tPixelData *)Data)[(i < 32 ? 0 : i - 32) * (height + 2)];
+     }
+  else
+     height = 0;
 }
 
 int cFont::Width(const char *s) const
diff --git a/font.h b/font.h
index 3803960b3..b90daf6f7 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.7 2004/05/16 10:49:44 kls Exp $
+ * $Id: font.h 1.8 2004/05/31 09:52:46 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -43,15 +43,15 @@ class cFont {
 public:
   cFont(void *Data);
   void SetData(void *Data);
-  int Width(unsigned char c) const { return data[c]->width; }
+  virtual int Width(unsigned char c) const { return data[c]->width; }
       ///< Returns the width of the given character.
-  int Width(const char *s) const;
+  virtual int Width(const char *s) const;
       ///< Returns the width of the given string.
-  int Height(unsigned char c) const { return data[c]->height; }
+  virtual int Height(unsigned char c) const { return data[c]->height; }
       ///< Returns the height of the given character.
-  int Height(const char *s) const;
+  virtual int Height(const char *s) const;
       ///< Returns the height of the given string.
-  int Height(void) const { return height; }
+  virtual int Height(void) const { return height; }
       ///< Returns the height of this font (all characters have the same height).
   const tCharData *CharData(unsigned char c) const { return data[c]; }
   static bool SetCode(const char *Code);
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index b479f0736..883753cd1 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -1,10 +1,18 @@
 
-// 08.04.2004 modified 30 font - drazen.dupor@dupor.com
+/*
+ * iso8859-2 modified iso8859-1 (Drazen Dupor 23.05.2004).
+ *
+ * Because (still) uncleared problem with old iso8859-2 font
+ * (there were also bigger).
+ *
+ * I modifyed iso8859-1 font partially.
+ * For a start there is chars needed for Croatian and Slovak.
+ *
+ */
 
-cFont::tPixelData FontOsd_iso8859_2[][30] = {
+cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 32
-     6, 28,
-     0x00000000,  // ......
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -34,38 +42,38 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
   },
   {             // 33
-     6, 28,
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000010,  // ..*...
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 34
-     8, 28,
+     8, 27,
+     0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -92,178 +100,171 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
   },
   {             // 35
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000198,  // ......**..**..
-     0x00000198,  // ......**..**..
-     0x00000198,  // ......**..**..
-     0x00000330,  // .....**..**...
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00000330,  // .....**..**...
-     0x00000330,  // .....**..**...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000CC0,  // ...**..**.....
-     0x00000CC0,  // ...**..**.....
-     0x00000CC0,  // ...**..**.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000118,  // .....*...**..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00000310,  // ....**...*...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000230,  // ....*...**...
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000620,  // ...**...*....
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000460,  // ...*...**....
+     0x00000C60,  // ..**...**....
+     0x00000C40,  // ..**...*.....
+     0x00000C40,  // ..**...*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 36
-     13, 28,
-     0x00000000,  // .............
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000007F0,  // ...*******...
-     0x00000FF8,  // ..*********..
-     0x00001CDC,  // .***..**.***.
-     0x000018CC,  // .**...**..**.
-     0x000018C0,  // .**...**.....
-     0x00001CC0,  // .***..**.....
-     0x00000EC0,  // ..***.**.....
-     0x000007C0,  // ...*****.....
-     0x000001F0,  // .....*****...
-     0x000000F8,  // ......*****..
-     0x000000DC,  // ......**.***.
-     0x000000CC,  // ......**..**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x00001CDC,  // .***..**.***.
-     0x00000FF8,  // ..*********..
-     0x000007F0,  // ...*******...
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000FF0,  // ..********...
+     0x00000CB8,  // ..**..*.***..
+     0x00001998,  // .**..**..**..
+     0x00001998,  // .**..**..**..
+     0x00001980,  // .**..**......
+     0x00001980,  // .**..**......
+     0x00000F80,  // ..*****......
+     0x000007E0,  // ...******....
+     0x000003F8,  // ....*******..
+     0x0000019C,  // .....**..***.
+     0x0000018C,  // .....**...**.
+     0x0000198C,  // .**..**...**.
+     0x0000198C,  // .**..**...**.
+     0x0000199C,  // .**..**..***.
+     0x00001D38,  // .***.*..***..
+     0x00000FF0,  // ..********...
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 37
-     22, 28,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000180,  // ..............**......
-     0x000F0300,  // ...****......**.......
-     0x001F8300,  // ..******.....**.......
-     0x0030C600,  // .**....**...**........
-     0x0030C600,  // .**....**...**........
-     0x0030CC00,  // .**....**..**.........
-     0x0030CC00,  // .**....**..**.........
-     0x001F9800,  // ..******..**..........
-     0x000F1800,  // ...****...**..........
-     0x00003000,  // .........**...........
-     0x000031E0,  // .........**...****....
-     0x000063F0,  // ........**...******...
-     0x00006618,  // ........**..**....**..
-     0x0000C618,  // .......**...**....**..
-     0x0000C618,  // .......**...**....**..
-     0x00018618,  // ......**....**....**..
-     0x000183F0,  // ......**.....******...
-     0x000101E0,  // ......*.......****....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00038040,  // ...***........*.....
+     0x000FE0C0,  // .*******.....**.....
+     0x001C7180,  // ***...***...**......
+     0x00183100,  // **.....**...*.......
+     0x00183300,  // **.....**..**.......
+     0x001C7200,  // ***...***..*........
+     0x000FE600,  // .*******..**........
+     0x0007C400,  // ..*****...*.........
+     0x00000C78,  // .........**...****..
+     0x000018FC,  // ........**...******.
+     0x000019CC,  // ........**..***..**.
+     0x00003186,  // .......**...**....**
+     0x00002186,  // .......*....**....**
+     0x00006186,  // ......**....**....**
+     0x0000C0FC,  // .....**......******.
+     0x0000C078,  // .....**.......****..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
   {             // 38
-     17, 28,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00001E00,  // .....****........
-     0x00003F00,  // ....******.......
-     0x00007380,  // ...***..***......
-     0x00006180,  // ...**....**......
-     0x00006180,  // ...**....**......
-     0x00006180,  // ...**....**......
-     0x00003300,  // ....**..**.......
-     0x00001E00,  // .....****........
-     0x00003C00,  // ....****.........
-     0x00007E30,  // ...******...**...
-     0x0000E730,  // ..***..***..**...
-     0x0000C3B0,  // ..**....***.**...
-     0x000181E0,  // .**......****....
-     0x000180C0,  // .**.......**.....
-     0x000181E0,  // .**......****....
-     0x0001C3B0,  // .***....***.**...
-     0x0000FF38,  // ..********..***..
-     0x00003C00,  // ....****.........
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000DC0,  // ....**.***.....
+     0x00000F80,  // ....*****......
+     0x00000F00,  // ....****.......
+     0x00001F98,  // ...******..**..
+     0x00003198,  // ..**...**..**..
+     0x000060D8,  // .**.....**.**..
+     0x00006070,  // .**......***...
+     0x00006070,  // .**......***...
+     0x00007078,  // .***.....****..
+     0x00003FDC,  // ..********.***.
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 39
-     6, 28,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000004,  // ...*.
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
   {             // 40
-     8, 28,
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
      0x00000018,  // ....**..
      0x00000018,  // ....**..
      0x00000030,  // ...**...
      0x00000030,  // ...**...
      0x00000030,  // ...**...
+     0x00000020,  // ...*....
      0x00000060,  // ..**....
      0x00000060,  // ..**....
      0x00000060,  // ..**....
@@ -272,26 +273,25 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000060,  // ..**....
      0x00000060,  // ..**....
      0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
+     0x00000020,  // ...*....
      0x00000030,  // ...**...
      0x00000030,  // ...**...
+     0x00000010,  // ....*...
      0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x0000000C,  // .....**.
+     0x00000008,  // .....*..
+     0x00000008,  // .....*..
   },
   {             // 41
-     8, 28,
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
+     0x00000080,  // .*......
+     0x00000040,  // ..*.....
      0x00000060,  // ..**....
+     0x00000020,  // ...*....
      0x00000030,  // ...**...
      0x00000030,  // ...**...
      0x00000030,  // ...**...
@@ -303,80 +303,76 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000018,  // ....**..
      0x00000018,  // ....**..
      0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
      0x00000030,  // ...**...
      0x00000030,  // ...**...
      0x00000030,  // ...**...
+     0x00000020,  // ...*....
      0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x000000C0,  // .**.....
+     0x00000040,  // ..*.....
+     0x00000080,  // .*......
   },
   {             // 42
-     10, 28,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000040,  // ....*.....
-     0x00000040,  // ....*.....
-     0x00000358,  // .**.*.**..
-     0x000001F0,  // ..*****...
-     0x000000E0,  // ...***....
-     0x000001B0,  // ..**.**...
-     0x00000110,  // ..*...*...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000020,  // ....*....
+     0x000001AC,  // .**.*.**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x00000088,  // ..*...*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
   {             // 43
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 44
-     6, 28,
-     0x00000000,  // ......
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -399,45 +395,44 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000018,  // ..**..
      0x00000018,  // ..**..
-     0x00000018,  // ..**..
      0x00000008,  // ...*..
      0x00000008,  // ...*..
-     0x00000010,  // ..*...
+     0x00000018,  // ..**..
+     0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 45
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 46
-     6, 28,
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -458,48 +453,46 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 47
-     7, 28,
+     6, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000006,  // .....**
-     0x00000006,  // .....**
-     0x00000006,  // .....**
-     0x0000000C,  // ....**.
+     0x00000004,  // .....*.
+     0x00000004,  // .....*.
      0x0000000C,  // ....**.
      0x0000000C,  // ....**.
+     0x00000008,  // ....*..
      0x00000018,  // ...**..
      0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
+     0x00000010,  // ...*...
      0x00000030,  // ..**...
      0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000060,  // .**....
+     0x00000020,  // ..*....
      0x00000060,  // .**....
      0x00000060,  // .**....
+     0x00000040,  // .*.....
      0x000000C0,  // **.....
      0x000000C0,  // **.....
-     0x000000C0,  // **.....
+     0x00000080,  // *......
+     0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
   },
   {             // 48
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -510,7 +503,6 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x000007F0,  // ...*******...
      0x00000E38,  // ..***...***..
      0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
@@ -520,7 +512,6 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
      0x00000E38,  // ..***...***..
      0x000007F0,  // ...*******...
      0x000003E0,  // ....*****....
@@ -528,9 +519,10 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 49
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -539,8 +531,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x000000C0,  // ......**.....
      0x000000C0,  // ......**.....
-     0x000001C0,  // .....***.....
-     0x00000FC0,  // ..******.....
+     0x000003C0,  // ....****.....
      0x00000FC0,  // ..******.....
      0x000000C0,  // ......**.....
      0x000000C0,  // ......**.....
@@ -554,35 +545,33 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x000000C0,  // ......**.....
      0x000000C0,  // ......**.....
      0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 50
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003C0,  // ....****.....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C1C,  // ..**.....***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000000C,  // ..........**.
      0x00000018,  // .........**..
      0x00000038,  // ........***..
-     0x00000070,  // .......***...
-     0x000001E0,  // .....****....
-     0x00000380,  // ....***......
+     0x000000F0,  // ......****...
+     0x000003C0,  // ....****.....
      0x00000700,  // ...***.......
      0x00000E00,  // ..***........
-     0x00001C00,  // .***.........
+     0x00000C00,  // ..**.........
      0x00001800,  // .**..........
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
@@ -590,19 +579,19 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 51
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
+     0x000007E0,  // ...******....
      0x00000FF0,  // ..********...
-     0x00000C30,  // ..**....**...
-     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
      0x00001818,  // .**......**..
      0x00001818,  // .**......**..
      0x00000018,  // .........**..
@@ -611,19 +600,19 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x000001F8,  // .....******..
      0x00000018,  // .........**..
      0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
      0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 52
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -632,15 +621,13 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000030,  // ........**...
      0x00000070,  // .......***...
-     0x00000070,  // .......***...
      0x000000F0,  // ......****...
-     0x000001F0,  // .....*****...
+     0x000000F0,  // ......****...
      0x000001B0,  // .....**.**...
      0x00000330,  // ....**..**...
-     0x00000730,  // ...***..**...
      0x00000630,  // ...**...**...
+     0x00000430,  // ...*....**...
      0x00000C30,  // ..**....**...
-     0x00001C30,  // .***....**...
      0x00001830,  // .**.....**...
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
@@ -652,9 +639,10 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 53
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -666,47 +654,44 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000C00,  // ..**.........
      0x00000C00,  // ..**.........
      0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000DC0,  // ..**.***.....
+     0x00000FE0,  // ..*******....
      0x00000FF0,  // ..********...
-     0x00000E38,  // ..***...***..
-     0x00000018,  // .........**..
+     0x00001C38,  // .***....***..
+     0x0000181C,  // .**......***.
      0x0000000C,  // ..........**.
      0x0000000C,  // ..........**.
      0x0000000C,  // ..........**.
      0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00001C38,  // .***....***..
+     0x00001C18,  // .***.....**..
      0x00000FF0,  // ..********...
-     0x000003C0,  // ....****.....
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 54
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F8,  // ...********..
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
      0x00000E18,  // ..***....**..
-     0x00000C0C,  // ..**......**.
-     0x00001C0C,  // .***......**.
-     0x00001800,  // .**..........
+     0x00000C1C,  // ..**.....***.
+     0x00001C00,  // .***.........
      0x00001800,  // .**..........
-     0x000019E0,  // .**..****....
-     0x00001BF0,  // .**.******...
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
      0x00001E38,  // .****...***..
-     0x00001C18,  // .***.....**..
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
+     0x0000180C,  // .**.......**.
      0x00000C18,  // ..**.....**..
      0x00000FF8,  // ..*********..
      0x000003E0,  // ....*****....
@@ -714,9 +699,10 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 55
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -725,60 +711,58 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
-     0x0000001C,  // .........***.
+     0x00000008,  // ..........*..
      0x00000018,  // .........**..
      0x00000030,  // ........**...
-     0x00000030,  // ........**...
      0x00000060,  // .......**....
      0x00000060,  // .......**....
      0x000000C0,  // ......**.....
      0x000000C0,  // ......**.....
      0x00000180,  // .....**......
      0x00000180,  // .....**......
-     0x00000380,  // ....***......
+     0x00000300,  // ....**.......
      0x00000300,  // ....**.......
      0x00000300,  // ....**.......
      0x00000700,  // ...***.......
      0x00000600,  // ...**........
-     0x00000600,  // ...**........
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 56
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x000007F0,  // ...*******...
-     0x00000630,  // ...**...**...
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
      0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x000007E0,  // ...******....
      0x000007F0,  // ...*******...
-     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
      0x00001C1C,  // .***.....***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00000E38,  // ..***...***..
+     0x00001C1C,  // .***.....***.
      0x00000FF8,  // ..*********..
      0x000003E0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 57
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -786,30 +770,29 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000E38,  // ..***...***..
-     0x00001C18,  // .***.....**..
-     0x0000180C,  // .**.......**.
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000E3C,  // ..***...****.
-     0x00000FEC,  // ..*******.**.
-     0x000003CC,  // ....****..**.
+     0x00001C3C,  // .***....****.
+     0x00000FFC,  // ..**********.
+     0x000003EC,  // ....*****.**.
      0x0000000C,  // ..........**.
      0x0000001C,  // .........***.
      0x00001818,  // .**......**..
-     0x00001C38,  // .***....***..
+     0x00000C38,  // ..**....***..
      0x00000FF0,  // ..********...
-     0x000003C0,  // ....****.....
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 58
-     6, 28,
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -820,9 +803,8 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -831,16 +813,16 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 59
-     6, 28,
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -851,9 +833,8 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -862,326 +843,316 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000010,  // ..*...
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 60
-     15, 28,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000018,  // ...........**..
-     0x00000078,  // .........****..
-     0x000001E0,  // .......****....
-     0x00000780,  // .....****......
-     0x00001E00,  // ...****........
-     0x00007000,  // .***...........
-     0x00007000,  // .***...........
-     0x00001E00,  // ...****........
-     0x00000780,  // .....****......
-     0x000001E0,  // .......****....
-     0x00000078,  // .........****..
-     0x00000018,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000004,  // ...........*.
+     0x0000001C,  // .........***.
+     0x00000078,  // .......****..
+     0x000003C0,  // ....****.....
+     0x00000F00,  // ..****.......
+     0x00001C00,  // .***.........
+     0x00001E00,  // .****........
+     0x000003C0,  // ....****.....
+     0x000000F0,  // ......****...
+     0x0000001C,  // .........***.
+     0x00000004,  // ...........*.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 61
-     15, 28,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 62
-     15, 28,
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001000,  // .*...........
+     0x00001C00,  // .***.........
+     0x00000780,  // ...****......
+     0x000001E0,  // .....****....
+     0x0000007C,  // .......*****.
+     0x0000000C,  // ..........**.
+     0x0000003C,  // ........****.
+     0x000000F0,  // ......****...
+     0x00000780,  // ...****......
+     0x00001E00,  // .****........
+     0x00001000,  // .*...........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00007E00,  // .........******........
+     0x0003FFC0,  // ......************.....
+     0x000781E0,  // .....****......****....
+     0x000E0070,  // ....***..........***...
+     0x001C0038,  // ...***............***..
+     0x00383D18,  // ..***.....****.*...**..
+     0x0030FF9C,  // ..**....*********..***.
+     0x0031C38C,  // ..**...***....***...**.
+     0x0061830C,  // .**....**.....**....**.
+     0x0063030C,  // .**...**......**....**.
+     0x0063030C,  // .**...**......**....**.
+     0x00630618,  // .**...**.....**....**..
+     0x00630618,  // .**...**.....**....**..
+     0x00738E30,  // .***..***...***...**...
+     0x0031FFE0,  // ..**...************....
+     0x0038E3C0,  // ..***...***...****.....
+     0x001C0000,  // ...***.................
+     0x000F0000,  // ....****...............
+     0x0007FF00,  // .....***********.......
+     0x0000FE00,  // ........*******........
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 65
+     15, 27,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
+  },
+  {             // 66
+     15, 27,
      0x00000000,  // ...............
-     0x00006000,  // .**............
-     0x00007800,  // .****..........
-     0x00001E00,  // ...****........
-     0x00000780,  // .....****......
-     0x000001E0,  // .......****....
-     0x00000038,  // ..........***..
-     0x00000038,  // ..........***..
-     0x000001E0,  // .......****....
-     0x00000780,  // .....****......
-     0x00001E00,  // ...****........
-     0x00007800,  // .****..........
-     0x00006000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
-  {             // 63
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000071C,  // ..***...***.
-     0x00000E0C,  // .***.....**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000018,  // ........**..
-     0x00000038,  // .......***..
-     0x00000070,  // ......***...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 64
-     25, 28,
-     0x00000000,  // .........................
-     0x00000000,  // .........................
-     0x00000000,  // .........................
-     0x00000000,  // .........................
-     0x00000000,  // .........................
-     0x0000FF00,  // ..........********.......
-     0x0003FFC0,  // ........************.....
-     0x000F01E0,  // ......****.......****....
-     0x001C0070,  // .....***...........***...
-     0x00380018,  // ....***..............**..
-     0x00300018,  // ....**...............**..
-     0x0060730C,  // ...**......***..**....**.
-     0x0060FB0C,  // ...**.....*****.**....**.
-     0x00C1C70C,  // ..**.....***...***....**.
-     0x00C3860C,  // ..**....***....**.....**.
-     0x00C3060C,  // ..**....**.....**.....**.
-     0x00C6060C,  // ..**...**......**.....**.
-     0x00C60C1C,  // ..**...**.....**.....***.
-     0x00C60C18,  // ..**...**.....**.....**..
-     0x00C60C38,  // ..**...**.....**....***..
-     0x00E71C70,  // ..***..***...***...***...
-     0x0063F7E0,  // ...**...******.******....
-     0x0071E380,  // ...***...****...***......
-     0x00380000,  // ....***..................
-     0x001C0000,  // .....***.................
-     0x000F0300,  // ......****......**.......
-     0x0007FF00,  // .......***********.......
-     0x0000FC00,  // ..........******.........
-  },
-  {             // 65
-     17, 28,
+  {             // 67
+     17, 27,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00007FF0,  // ...***********...
-     0x00007FF0,  // ...***********...
-     0x0000C018,  // ..**.........**..
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
      0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
      0x0000C018,  // ..**.........**..
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
+     0x0000E018,  // ..***........**..
+     0x00007030,  // ...***......**...
+     0x00007FF0,  // ...***********...
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
   },
-  {             // 66
-     17, 28,
+  {             // 68
+     17, 27,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFC0,  // ..**********.....
-     0x0000FFF0,  // ..************...
-     0x0000C070,  // ..**.......***...
+     0x0000FF80,  // ..*********......
+     0x0000FFE0,  // ..***********....
+     0x0000C0E0,  // ..**......***....
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C0E0,  // ..**......***....
      0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C018,  // ..**.........**..
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C01C,  // ..**.........***.
-     0x0000C038,  // ..**........***..
-     0x0000FFF0,  // ..************...
-     0x0000FFC0,  // ..**********.....
+     0x0000FF80,  // ..*********......
+     0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-  },
-  {             // 67
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x00038018,  // .***..........**..
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x0003000C,  // .**............**.
-     0x0003800C,  // .***...........**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 68
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0001FF80,  // ..**********......
-     0x0001FFE0,  // ..************....
-     0x000180F0,  // ..**.......****...
-     0x00018038,  // ..**.........***..
-     0x00018018,  // ..**..........**..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001801C,  // ..**..........***.
-     0x00018018,  // ..**..........**..
-     0x00018038,  // ..**.........***..
-     0x000180F0,  // ..**.......****...
-     0x0001FFE0,  // ..************....
-     0x0001FF80,  // ..**********......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
   },
   {             // 69
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF0,  // ..***********...
-     0x00007FF0,  // ..***********...
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 70
-     14, 28,
+     14, 27,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1194,8 +1165,6 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00001800,  // ..**..........
      0x00001800,  // ..**..........
      0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
      0x00001FF8,  // ..**********..
      0x00001FF8,  // ..**********..
      0x00001800,  // ..**..........
@@ -1210,257 +1179,250 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 71
-     19, 28,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00003F00,  // ......******.......
-     0x0000FFC0,  // ....**********.....
-     0x0001E1E0,  // ...****....****....
-     0x00038070,  // ..***........***...
-     0x00030030,  // ..**..........**...
-     0x00070030,  // .***..........**...
-     0x00060000,  // .**................
-     0x00060000,  // .**................
-     0x00060000,  // .**................
-     0x000603F8,  // .**.......*******..
-     0x000603F8,  // .**.......*******..
-     0x00060018,  // .**............**..
-     0x00060018,  // .**............**..
-     0x00070018,  // .***...........**..
-     0x00030038,  // ..**..........***..
-     0x00038078,  // ..***........****..
-     0x0001E1F8,  // ...****....******..
-     0x0000FFD8,  // ....**********.**..
-     0x00003F18,  // ......******...**..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 72
-     18, 28,
+     18, 27,
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C030,  // ..***........**...
      0x00018018,  // ..**..........**..
+     0x00038000,  // .***..............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x000303F8,  // .**......*******..
+     0x000303F8,  // .**......*******..
+     0x00030018,  // .**...........**..
+     0x00038018,  // .***..........**..
      0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0001FFF8,  // ..**************..
-     0x0001FFF8,  // ..**************..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E078,  // ...***......****..
+     0x00007FD8,  // ....*********.**..
+     0x00001F88,  // ......******...*..
+     0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
   },
-  {             // 73
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+  {             // 72
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000FFF8,  // ..*************..
+     0x0000FFF8,  // ..*************..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 73
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 74
-     13, 28,
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00001818,  // **......**..
+     0x00001818,  // **......**..
+     0x00001C38,  // ***....***..
+     0x00000FF0,  // .********...
+     0x000007E0,  // ..******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 75
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000300E,  // ..**........***
+     0x0000301C,  // ..**.......***.
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003780,  // ..**.****......
+     0x00003F80,  // ..*******......
+     0x00003DC0,  // ..****.***.....
+     0x000038E0,  // ..***...***....
+     0x00003060,  // ..**.....**....
+     0x00003030,  // ..**......**...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300E,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-  },
-  {             // 75
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018070,  // ..**........***...
-     0x000180E0,  // ..**.......***....
-     0x000181C0,  // ..**......***.....
-     0x00018380,  // ..**.....***......
-     0x00018700,  // ..**....***.......
-     0x00018E00,  // ..**...***........
-     0x00019C00,  // ..**..***.........
-     0x0001B800,  // ..**.***..........
-     0x0001F800,  // ..******..........
-     0x0001FC00,  // ..*******.........
-     0x0001CE00,  // ..***..***........
-     0x00018700,  // ..**....***.......
-     0x00018380,  // ..**.....***......
-     0x000181C0,  // ..**......***.....
-     0x000180E0,  // ..**.......***....
-     0x00018070,  // ..**........***...
-     0x00018038,  // ..**.........***..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 76
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
   },
   {             // 77
-     21, 28,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x000C0018,  // ..**.............**..
-     0x000E0038,  // ..***...........***..
-     0x000E0038,  // ..***...........***..
-     0x000F0078,  // ..****.........****..
-     0x000F0078,  // ..****.........****..
-     0x000D80D8,  // ..**.**.......**.**..
-     0x000D80D8,  // ..**.**.......**.**..
-     0x000D80D8,  // ..**.**.......**.**..
-     0x000CC198,  // ..**..**.....**..**..
-     0x000CC198,  // ..**..**.....**..**..
-     0x000CC198,  // ..**..**.....**..**..
-     0x000C6318,  // ..**...**...**...**..
-     0x000C6318,  // ..**...**...**...**..
-     0x000C6318,  // ..**...**...**...**..
-     0x000C3618,  // ..**....**.**....**..
-     0x000C3618,  // ..**....**.**....**..
-     0x000C3618,  // ..**....**.**....**..
-     0x000C1C18,  // ..**.....***.....**..
-     0x000C1C18,  // ..**.....***.....**..
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00038038,  // ..***.........***..
+     0x00038038,  // ..***.........***..
+     0x0003C038,  // ..****........***..
+     0x0003C078,  // ..****.......****..
+     0x0003C078,  // ..****.......****..
+     0x00036058,  // ..**.**......*.**..
+     0x000360D8,  // ..**.**.....**.**..
+     0x000360D8,  // ..**.**.....**.**..
+     0x00033098,  // ..**..**....*..**..
+     0x00033198,  // ..**..**...**..**..
+     0x00033198,  // ..**..**...**..**..
+     0x00031918,  // ..**...**..*...**..
+     0x00031B18,  // ..**...**.**...**..
+     0x00031B18,  // ..**...**.**...**..
+     0x00030F18,  // ..**....****...**..
+     0x00030E18,  // ..**....***....**..
+     0x00030E18,  // ..**....***....**..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
   },
   {             // 78
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0001C018,  // ..***.........**..
-     0x0001E018,  // ..****........**..
-     0x0001E018,  // ..****........**..
-     0x0001B018,  // ..**.**.......**..
-     0x0001B818,  // ..**.***......**..
-     0x00019818,  // ..**..**......**..
-     0x00019C18,  // ..**..***.....**..
-     0x00018C18,  // ..**...**.....**..
-     0x00018E18,  // ..**...***....**..
-     0x00018618,  // ..**....**....**..
-     0x00018718,  // ..**....***...**..
-     0x00018318,  // ..**.....**...**..
-     0x00018398,  // ..**.....***..**..
-     0x00018198,  // ..**......**..**..
-     0x000181D8,  // ..**......***.**..
-     0x000180D8,  // ..**.......**.**..
-     0x00018078,  // ..**........****..
-     0x00018078,  // ..**........****..
-     0x00018038,  // ..**.........***..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 79
-     18, 28,
+     18, 27,
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1468,7 +1430,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ..................
      0x00001F80,  // ......******......
      0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
+     0x0000E0F0,  // ...***.....****...
      0x0001C038,  // ..***........***..
      0x00018018,  // ..**..........**..
      0x0003801C,  // .***..........***.
@@ -1478,51 +1440,49 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003801C,  // .***..........***.
      0x00018018,  // ..**..........**..
      0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
+     0x0000E070,  // ...***......***...
      0x00007FE0,  // ....**********....
      0x00001F80,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 80
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007FF0,  // ..***********...
-     0x00007FF8,  // ..************..
-     0x00006018,  // ..**........**..
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x00006018,  // ..**........**..
-     0x00007FF8,  // ..************..
-     0x00007FF0,  // ..***********...
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000301C,  // ..**.......***.
+     0x00003FF8,  // ..***********..
+     0x00003FE0,  // ..*********....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 81
-     18, 28,
+     18, 27,
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1530,7 +1490,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ..................
      0x00001F80,  // ......******......
      0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
+     0x0000E0F0,  // ...***.....****...
      0x0001C038,  // ..***........***..
      0x00018018,  // ..**..........**..
      0x0003801C,  // .***..........***.
@@ -1540,485 +1500,469 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003801C,  // .***..........***.
-     0x00018398,  // ..**.....***..**..
+     0x00018098,  // ..**.......*..**..
      0x0001C1F8,  // ..***.....******..
-     0x0000F070,  // ...****.....***...
-     0x00007FF8,  // ....************..
+     0x0000E0F0,  // ...***.....****...
+     0x00007FF0,  // ....***********...
      0x00001F9C,  // ......******..***.
+     0x00000008,  // ...............*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
   },
   {             // 82
-     17, 28,
+     17, 27,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFE0,  // ..***********....
+     0x0000FFC0,  // ..**********.....
      0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
+     0x0000C038,  // ..**........***..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C030,  // ..**........**...
-     0x0000FFF0,  // ..************...
      0x0000FFE0,  // ..***********....
-     0x0000C070,  // ..**.......***...
+     0x0000FFF0,  // ..************...
      0x0000C030,  // ..**........**...
+     0x0000C038,  // ..**........***..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
   },
   {             // 83
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x000007C0,  // ......*****.....
-     0x00001FF0,  // ....*********...
-     0x00003838,  // ...***.....***..
-     0x00007018,  // ..***.......**..
-     0x00006018,  // ..**........**..
-     0x00006000,  // ..**............
-     0x00007000,  // ..***...........
-     0x00003E00,  // ...*****........
-     0x00000FC0,  // .....******.....
-     0x000001F0,  // ........*****...
-     0x00000078,  // ..........****..
-     0x0000001C,  // ............***.
-     0x0000000C,  // .............**.
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x00007838,  // ..****.....***..
-     0x00003FF0,  // ...**********...
-     0x00000FC0,  // .....******.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 84
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000FFFC,  // .**************.
-     0x0000FFFC,  // .**************.
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 85
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0000C030,  // ...**........**...
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00003018,  // ..**.......**..
+     0x00003008,  // ..**........*..
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FF0,  // ....********...
+     0x000000F8,  // ........*****..
+     0x0000001C,  // ...........***.
+     0x0000000C,  // ............**.
+     0x0000600C,  // .**.........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
-  {             // 86
-     17, 28,
+  {             // 84
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     17, 27,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001C01C,  // .***.........***.
      0x0000C018,  // ..**.........**..
-     0x0000E038,  // ..***.......***..
-     0x00006030,  // ...**.......**...
-     0x00006030,  // ...**.......**...
-     0x00007070,  // ...***.....***...
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x000038E0,  // ....***...***....
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00001DC0,  // .....***.***.....
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
   },
+  {             // 86
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000301C,  // ..**.......***.
+     0x00003818,  // ..***......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C30,  // ...***....**...
+     0x00000C30,  // ....**....**...
+     0x00000C70,  // ....**...***...
+     0x00000E60,  // ....***..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x000007C0,  // .....*****.....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
   {             // 87
-     22, 28,
+     22, 27,
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x0030180C,  // .**.......**.......**.
-     0x0030180C,  // .**.......**.......**.
-     0x0030180C,  // .**.......**.......**.
-     0x00303C0C,  // .**......****......**.
+     0x0030380C,  // .**......***.......**.
+     0x00303C1C,  // .**......****.....***.
+     0x00383C1C,  // .***.....****.....***.
      0x00183C18,  // ..**.....****.....**..
      0x00186618,  // ..**....**..**....**..
      0x00186618,  // ..**....**..**....**..
-     0x00186618,  // ..**....**..**....**..
-     0x00186618,  // ..**....**..**....**..
-     0x000C6630,  // ...**...**..**...**...
+     0x001C6638,  // ..***...**..**...***..
+     0x000CC630,  // ...**..**...**...**...
      0x000CC330,  // ...**..**....**..**...
      0x000CC330,  // ...**..**....**..**...
-     0x000CC330,  // ...**..**....**..**...
-     0x0006C360,  // ....**.**....**.**....
-     0x0006C360,  // ....**.**....**.**....
+     0x000EC370,  // ...***.**....**.***...
      0x000781E0,  // ....****......****....
-     0x000381C0,  // .....***......***.....
-     0x000300C0,  // .....**........**.....
+     0x000781E0,  // ....****......****....
+     0x000781E0,  // ....****......****....
+     0x000781C0,  // ....****......***.....
      0x000300C0,  // .....**........**.....
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
+     0x00000000,  // ......................
   },
   {             // 88
-     17, 28,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0001800C,  // .**...........**.
-     0x0001C01C,  // .***.........***.
-     0x0000E038,  // ..***.......***..
-     0x00006030,  // ...**.......**...
-     0x00003060,  // ....**.....**....
-     0x000038E0,  // ....***...***....
-     0x00001DC0,  // .....***.***.....
-     0x00000F80,  // ......*****......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000F80,  // ......*****......
-     0x00001DC0,  // .....***.***.....
-     0x000018C0,  // .....**...**.....
-     0x000038E0,  // ....***...***....
-     0x00007070,  // ...***.....***...
-     0x00006030,  // ...**.......**...
-     0x0000C018,  // ..**.........**..
-     0x0001C01C,  // .***.........***.
-     0x0001800C,  // .**...........**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000700C,  // .***........**.
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C70,  // ....**...***...
+     0x00000660,  // .....**..**....
+     0x000007C0,  // .....*****.....
+     0x000003C0,  // ......****.....
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000006C0,  // .....**.**.....
+     0x00000E60,  // ....***..**....
+     0x00001C70,  // ...***...***...
+     0x00001838,  // ...**.....***..
+     0x00003818,  // ..***......**..
+     0x0000701C,  // .***.......***.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 89
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x00006018,  // ..**........**..
-     0x00007038,  // ..***......***..
-     0x00003030,  // ...**......**...
-     0x00003870,  // ...***....***...
-     0x00001860,  // ....**....**....
-     0x00001CE0,  // ....***..***....
-     0x00000CC0,  // .....**..**.....
-     0x00000FC0,  // .....******.....
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 90
-     15, 28,
+     15, 27,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000001C,  // ...........***.
-     0x00000038,  // ..........***..
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00003800,  // ..***..........
-     0x00007000,  // .***...........
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x0000600E,  // .**.........***
+     0x0000700E,  // .***........***
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C30,  // ....**....**...
+     0x00000E60,  // ....***..**....
+     0x00000760,  // .....***.**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
+  {             // 90
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x0000001C,  // ..........***.
+     0x00000018,  // ..........**..
+     0x00000038,  // .........***..
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001C00,  // ..***.........
+     0x00003800,  // .***..........
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
   {             // 91
-     7, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000003C,  // ..****.
-     0x0000003C,  // ..****.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003C,  // ..****.
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
   },
   {             // 92
-     7, 28,
+     6, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
+     0x00000080,  // *......
      0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x00000060,  // .**....
+     0x00000040,  // .*.....
+     0x00000040,  // .*.....
      0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
+     0x00000020,  // ..*....
+     0x00000020,  // ..*....
+     0x00000020,  // ..*....
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
      0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000006,  // .....**
-     0x00000006,  // .....**
-     0x00000006,  // .....**
+     0x00000004,  // .....*.
+     0x00000004,  // .....*.
+     0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
   },
   {             // 93
-     7, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000078,  // .****..
-     0x00000078,  // .****..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000078,  // .****..
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
   },
   {             // 94
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x00000120,  // ....*..*....
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     11, 27,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001A0,  // ...**.*....
+     0x000001B0,  // ...**.**...
+     0x00000110,  // ...*...*...
+     0x00000318,  // ..**...**..
+     0x00000218,  // ..*....**..
+     0x00000608,  // .**.....*..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
   {             // 95
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
      0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000000,  // .............
   },
   {             // 96
-     7, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000060,  // .**....
-     0x00000030,  // ..**...
-     0x00000018,  // ...**..
-     0x0000000C,  // ....**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
   {             // 97
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2030,57 +1974,55 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
      0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
      0x00000018,  // .........**..
-     0x000000F8,  // ......*****..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
      0x00001C18,  // .***.....**..
      0x00001818,  // .**......**..
      0x00001838,  // .**.....***..
-     0x00001C78,  // .***...****..
-     0x00000FDC,  // ..******.***.
-     0x0000078C,  // ...****...**.
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 98
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x000019E0,  // ..**..****....
-     0x00001BF0,  // ..**.******...
-     0x00001E38,  // ..****...***..
-     0x00001C18,  // ..***.....**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001C18,  // ..***.....**..
-     0x00001E38,  // ..****...***..
-     0x00001BF0,  // ..**.******...
-     0x000019E0,  // ..**..****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 99
-     12, 28,
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2092,57 +2034,55 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003F8,  // ...*******..
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
      0x000001F0,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 100
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000798,  // ....****..**..
-     0x00000FD8,  // ...******.**..
-     0x00001C78,  // ..***...****..
-     0x00001838,  // ..**.....***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001838,  // ..**.....***..
-     0x00001C78,  // ..***...****..
-     0x00000FD8,  // ...******.**..
-     0x00000798,  // ....****..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 101
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2153,134 +2093,38 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
+     0x000003E0,  // ....*****....
      0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
      0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001E0,  // .....****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x0000003C,  // ...****.
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 103
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000798,  // ....****..**..
-     0x00000FD8,  // ...******.**..
-     0x00001C78,  // ..***...****..
-     0x00001838,  // ..**.....***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001838,  // ..**.....***..
-     0x00001C78,  // ..***...****..
-     0x00000FD8,  // ...******.**..
-     0x00000798,  // ....****..**..
-     0x00000018,  // ..........**..
-     0x00003018,  // .**.......**..
-     0x00003830,  // .***.....**...
-     0x00001FF0,  // ..*********...
-  },
-  {             // 104
-     13, 28,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000CE0,  // ..**..***....
-     0x00000DF8,  // ..**.******..
-     0x00000F18,  // ..****...**..
-     0x00000E0C,  // ..***.....**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
-  {             // 105
-     6, 28,
-     0x00000000,  // ......
-     0x00000000,  // ......
+  {             // 102
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001E,  // ..****
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
@@ -2295,164 +2139,250 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x000007F8,  // ...********..
+     0x000003D8,  // ....****.**..
+     0x00000018,  // .........**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x000007C0,  // ...*****.....
+  },
+  {             // 104
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000DF0,  // ..**.*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
   {             // 106
-     6, 28,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000078,  // ****..
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
   },
   {             // 107
-     12, 28,
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x0000060C,  // ..**.....**.
-     0x0000061C,  // ..**....***.
-     0x00000638,  // ..**...***..
-     0x00000670,  // ..**..***...
-     0x000006E0,  // ..**.***....
-     0x000007C0,  // ..*****.....
-     0x000007E0,  // ..******....
-     0x00000670,  // ..**..***...
-     0x00000630,  // ..**...**...
-     0x00000638,  // ..**...***..
-     0x0000061C,  // ..**....***.
-     0x0000060C,  // ..**.....**.
-     0x0000060E,  // ..**.....***
-     0x00000606,  // ..**......**
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C18,  // .**.....**..
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000CC0,  // .**..**.....
+     0x00000FC0,  // .******.....
+     0x00000FC0,  // .******.....
+     0x00000E60,  // .***..**....
+     0x00000C70,  // .**...***...
+     0x00000C30,  // .**....**...
+     0x00000C18,  // .**.....**..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 108
-     6, 28,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
   },
   {             // 109
-     20, 28,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x000671E0,  // ..**..***...****....
-     0x0007FBF0,  // ..********.******...
-     0x00071E38,  // ..***...****...***..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00060C18,  // ..**.....**.....**..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00037CF8,  // ..**.*****..*****..
+     0x0003FFFC,  // ..****************.
+     0x0003870C,  // ..***....***....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
   },
   {             // 110
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000019C0,  // ..**..***.....
-     0x00001BF0,  // ..**.******...
-     0x00001E30,  // ..****...**...
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 111
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2464,119 +2394,115 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
      0x000003E0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 112
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000019E0,  // ..**..****....
-     0x00001BF0,  // ..**.******...
-     0x00001E38,  // ..****...***..
-     0x00001C18,  // ..***.....**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001C18,  // ..***.....**..
-     0x00001E38,  // ..****...***..
-     0x00001BF0,  // ..**.******...
-     0x000019E0,  // ..**..****....
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000019E0,  // .**..****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
   },
   {             // 113
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000798,  // ....****..**..
-     0x00000FD8,  // ...******.**..
-     0x00001C78,  // ..***...****..
-     0x00001838,  // ..**.....***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001838,  // ..**.....***..
-     0x00001C78,  // ..***...****..
-     0x00000FD8,  // ...******.**..
-     0x00000798,  // ....****..**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007D8,  // ...*****.**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
   },
   {             // 114
-     9, 28,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // ..**..**.
-     0x000000DC,  // ..**.***.
-     0x000000FC,  // ..******.
-     0x000000E0,  // ..***....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x0000007C,  // ..*****.
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 115
-     12, 28,
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2587,89 +2513,56 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003E0,  // ...*****....
+     0x000003F0,  // ...******...
      0x000007F8,  // ..********..
-     0x00000E1C,  // .***....***.
-     0x00000C0C,  // .**......**.
+     0x00000C18,  // .**.....**..
      0x00000C00,  // .**.........
-     0x00000F80,  // .*****......
-     0x000007F0,  // ..*******...
-     0x000000F8,  // .....*****..
+     0x00000E00,  // .***........
+     0x000007E0,  // ..******....
+     0x000001F8,  // ....******..
      0x0000001C,  // ........***.
-     0x0000000C,  // .........**.
      0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
      0x00000FF8,  // .*********..
      0x000003F0,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 116
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x0000003C,  // ...****.
-     0x0000001C,  // ....***.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 117
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00000C78,  // ...**...****..
-     0x00000FD8,  // ...******.**..
-     0x00000398,  // .....***..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 118
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2680,58 +2573,86 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
+  {             // 118
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0C,  // ***......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000E18,  // .***....**..
+     0x00000638,  // ..**...***..
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
   {             // 119
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00060606,  // **......**......**
-     0x00060606,  // **......**......**
-     0x00030F0C,  // .**....****....**.
-     0x00030F0C,  // .**....****....**.
-     0x00030F0C,  // .**....****....**.
-     0x00018918,  // ..**...*..*...**..
-     0x00019998,  // ..**..**..**..**..
-     0x00019998,  // ..**..**..**..**..
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D0B0,  // ...**.*....*.**...
-     0x0000F0F0,  // ...****....****...
-     0x000070E0,  // ....***....***....
-     0x00006060,  // ....**......**....
-     0x00006060,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0003060C,  // **.....**.....**.
+     0x0001870C,  // .**....***....**.
+     0x00018F1C,  // .**...****...***.
+     0x00018F18,  // .**...****...**..
+     0x00018D98,  // .**...**.**..**..
+     0x0000C998,  // ..**..*..**..**..
+     0x0000D9B0,  // ..**.**..**.**...
+     0x0000D9B0,  // ..**.**..**.**...
+     0x000058F0,  // ...*.**...****...
+     0x000070F0,  // ...***....****...
+     0x000070E0,  // ...***....***....
+     0x000070E0,  // ...***....***....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 120
-     12, 28,
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2742,58 +2663,56 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000E1C,  // .***....***.
+     0x00000C1C,  // .**.....***.
      0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x000003F0,  // ...******...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
+     0x00000630,  // ..**...**...
+     0x00000360,  // ...**.**....
      0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000E1C,  // .***....***.
-     0x00000C0C,  // .**......**.
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000003E0,  // ...*****....
+     0x00000370,  // ...**.***...
+     0x00000630,  // ..**...**...
+     0x00000E18,  // .***....**..
+     0x00000C1C,  // .**.....***.
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 121
-     13, 28,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x0000180C,  // .**.......**.
-     0x00001C18,  // .***.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x000001E0,  // .....****....
-     0x000001C0,  // .....***.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000F00,  // ..****.......
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
   },
   {             // 122
-     12, 28,
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2804,34 +2723,33 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000018,  // ........**..
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
      0x00000030,  // .......**...
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
      0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000380,  // ...***......
+     0x00000180,  // ....**......
      0x00000300,  // ...**.......
      0x00000600,  // ..**........
-     0x00000E00,  // .***........
+     0x00000C00,  // .**.........
      0x00000FFC,  // .**********.
      0x00000FFC,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 123
-     8, 28,
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000000C,  // .....**.
      0x00000018,  // ....**..
+     0x00000038,  // ...***..
      0x00000030,  // ...**...
      0x00000030,  // ...**...
      0x00000030,  // ...**...
@@ -2839,9 +2757,8 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000030,  // ...**...
      0x00000030,  // ...**...
      0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x000000C0,  // .**.....
+     0x00000070,  // ..***...
+     0x000000E0,  // .***....
      0x000000C0,  // .**.....
      0x00000060,  // ..**....
      0x00000030,  // ...**...
@@ -2851,11 +2768,11 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000030,  // ...**...
      0x00000030,  // ...**...
      0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000038,  // ...***..
      0x00000018,  // ....**..
   },
   {             // 124
-     6, 28,
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2883,73 +2800,69 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
-     0x00000018,  // ..**..
   },
   {             // 125
-     8, 28,
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x000000C0,  // .**.....
+     0x000000E0,  // .***....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
      0x00000060,  // ..**....
      0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
+     0x00000038,  // ...***..
      0x00000018,  // ....**..
      0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
      0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
   },
   {             // 126
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000E18,  // ...***....**..
-     0x00001F98,  // ..******..**..
-     0x000019F8,  // ..**..******..
-     0x00001870,  // ..**....***...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000700,  // ...***.......
+     0x00000F8C,  // ..*****...**.
+     0x000008FC,  // ..*...******.
+     0x00000038,  // ........***..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 127
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -2979,8 +2892,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 128
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3010,8 +2922,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 129
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3041,8 +2952,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 130
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3072,8 +2982,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 131
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3103,8 +3012,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 132
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3134,8 +3042,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 133
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3165,8 +3072,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 134
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3196,8 +3102,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 135
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3227,8 +3132,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 136
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3258,8 +3162,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 137
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3289,8 +3192,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 138
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3320,8 +3222,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 139
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3351,8 +3252,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 140
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3382,8 +3282,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 141
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3413,8 +3312,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 142
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3444,8 +3342,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 143
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3475,8 +3372,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 144
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3506,8 +3402,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 145
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3537,8 +3432,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 146
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3568,8 +3462,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 147
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3599,8 +3492,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 148
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3630,8 +3522,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 149
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3661,8 +3552,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 150
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3692,8 +3582,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 151
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3723,8 +3612,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 152
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3754,8 +3642,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 153
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3785,8 +3672,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 154
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3816,8 +3702,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 155
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3847,8 +3732,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 156
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3878,8 +3762,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 157
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3909,8 +3792,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 158
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3940,8 +3822,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 159
-     0, 28,
-     0x00000000,  //
+     0, 27,
      0x00000000,  //
      0x00000000,  //
      0x00000000,  //
@@ -3971,85 +3852,37 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  //
   },
   {             // 160
-     6, 28,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
   },
   {             // 161
-     17, 28,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00007FF0,  // ...***********...
-     0x00007FF0,  // ...***********...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001838C,  // .**.....***...**.
-     0x00000600,  // .......**........
-     0x00000C00,  // ......**.........
-     0x00000C00,  // ......**.........
-     0x00000F80,  // ......*****......
-  },
-  {             // 162
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000102,  // *......*
-     0x00000186,  // **....**
-     0x000000FC,  // .******.
-     0x00000078,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4060,42 +3893,86 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+  },
+  {             // 162
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000003F0,  // ....******...
+     0x00000FF8,  // ..*********..
+     0x00000E58,  // ..***..*.**..
+     0x00001C4C,  // .***...*..**.
+     0x00001840,  // .**....*.....
+     0x00001840,  // .**....*.....
+     0x00001880,  // .**...*......
+     0x00001880,  // .**...*......
+     0x0000188C,  // .**...*...**.
+     0x00000C9C,  // ..**..*..***.
+     0x00000EB8,  // ..***.*.***..
+     0x000007F0,  // ...*******...
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 163
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001B00,  // ...**.**.......
-     0x00001E00,  // ...****........
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
-     0x00003800,  // ..***..........
-     0x00007800,  // .****..........
-     0x0000D800,  // **.**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001FFC,  // ...***********.
-     0x00001FFC,  // ...***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000E00,  // ..***........
+     0x00001FC0,  // .*******.....
+     0x00001F40,  // .*****.*.....
+     0x00000700,  // ...***.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000600,  // ...**........
+     0x00000C00,  // ..**.........
+     0x00001FFC,  // .***********.
+     0x00001FF8,  // .**********..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 164
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4105,18 +3982,17 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001DDC,  // .***.***.***.
+     0x00000408,  // ...*......*..
+     0x00000FD8,  // ..******.**..
      0x00000FF8,  // ..*********..
-     0x00000630,  // ...**...**...
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
      0x00000C18,  // ..**.....**..
      0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
-     0x00000FF8,  // ..*********..
-     0x00001DDC,  // .***.***.***.
-     0x0000180C,  // .**.......**.
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x00000FD8,  // ..******.**..
+     0x00000408,  // ...*......*..
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4126,262 +4002,105 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
   },
   {             // 165
-     19, 28,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00030018,  // ..**...........**..
-     0x00030018,  // ..**...........**..
-     0x00030018,  // ..**...........**..
-     0x00030008,  // ..**............*..
-     0x00030008,  // ..**............*..
-     0x00030010,  // ..**...........*...
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x00030000,  // ..**...............
-     0x0003FF80,  // ..***********......
-     0x0003FF80,  // ..***********......
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 166
-     16, 28,
-     0x000000C0,  // .........**.....
-     0x00000180,  // ........**......
-     0x00000300,  // .......**.......
-     0x00000600,  // ......**........
-     0x00000000,  // ................
-     0x000007C0,  // ......*****.....
-     0x00001FF0,  // ....*********...
-     0x00003838,  // ...***.....***..
-     0x00007018,  // ..***.......**..
-     0x00006018,  // ..**........**..
-     0x00006000,  // ..**............
-     0x00007000,  // ..***...........
-     0x00003E00,  // ...*****........
-     0x00000FC0,  // .....******.....
-     0x000001F0,  // ........*****...
-     0x00000078,  // ..........****..
-     0x0000001C,  // ............***.
-     0x0000000C,  // .............**.
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x00007838,  // ..****.....***..
-     0x00003FF0,  // ...**********...
-     0x00000FC0,  // .....******.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 167
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00000E18,  // ..***....**..
-     0x00000700,  // ...***.......
-     0x00000380,  // ....***......
-     0x00000FC0,  // ..******.....
-     0x00001CE0,  // .***..***....
-     0x00001870,  // .**....***...
-     0x00001838,  // .**.....***..
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
      0x00001818,  // .**......**..
-     0x00000C0C,  // ..**......**.
-     0x00000E0C,  // ..***.....**.
-     0x0000070C,  // ...***....**.
-     0x00000398,  // ....***..**..
-     0x000001F0,  // .....*****...
-     0x000000E0,  // ......***....
-     0x00000070,  // .......***...
-     0x00000C38,  // ..**....***..
      0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
+     0x00000C30,  // ..**....**...
+     0x00000620,  // ...**...*....
+     0x00000260,  // ....*..**....
+     0x000003C0,  // ....****.....
+     0x00001DF8,  // .***.******..
+     0x00001FF8,  // .**********..
+     0x00000180,  // .....**......
+     0x00001FF8,  // .**********..
+     0x00001FF8,  // .**********..
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 168
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 169
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00001860,  // ....**....**....
-     0x00000CC0,  // .....**..**.....
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x000007C0,  // ......*****.....
-     0x00001FF0,  // ....*********...
-     0x00003830,  // ...***.....**...
-     0x00003000,  // ...**...........
-     0x00003000,  // ...**...........
-     0x00003800,  // ...***..........
-     0x00001FE0,  // ....********....
-     0x000007F8,  // ......********..
-     0x0000001C,  // ............***.
-     0x0000000C,  // .............**.
-     0x0000600C,  // ..**.........**.
-     0x00007018,  // ..***.......**..
-     0x00003FF8,  // ...***********..
-     0x00000FE0,  // .....*******....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 170
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x000007C0,  // ......*****.....
-     0x00001FF0,  // ....*********...
-     0x00003838,  // ...***.....***..
-     0x00007018,  // ..***.......**..
-     0x00006018,  // ..**........**..
-     0x00006000,  // ..**............
-     0x00007000,  // ..***...........
-     0x00003E00,  // ...*****........
-     0x00000FC0,  // .....******.....
-     0x000001F0,  // ........*****...
-     0x00000078,  // ..........****..
-     0x0000001C,  // ............***.
-     0x0000000C,  // .............**.
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x00007838,  // ..****.....***..
-     0x00003FF0,  // ...**********...
-     0x00000FC0,  // .....******.....
-     0x00000380,  // .......***......
-     0x000000C0,  // .........**.....
-     0x000000C0,  // .........**.....
-     0x000007C0,  // ......*****.....
-  },
-  {             // 171
-     16, 28,
-     0x00001860,  // ....**....**....
-     0x00000CC0,  // .....**..**.....
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x0000FFFC,  // .**************.
-     0x0000FFFC,  // .**************.
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+  {             // 166
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
   },
-  {             // 172
-     15, 28,
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000001C,  // ...........***.
-     0x00000038,  // ..........***..
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00003800,  // ..***..........
-     0x00007000,  // .***...........
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+  {             // 167
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E00,  // ..***........
+     0x00000780,  // ...****......
+     0x00000DE0,  // ..**.****....
+     0x000018F0,  // .**...****...
+     0x00001838,  // .**.....***..
+     0x0000181C,  // .**......***.
+     0x00001C0C,  // .***......**.
+     0x00000E0C,  // ..***.....**.
+     0x00000798,  // ...****..**..
+     0x000001F0,  // .....*****...
+     0x000000E0,  // ......***....
+     0x00000070,  // .......***...
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000E30,  // ..***...**...
+     0x000007E0,  // ...******....
+     0x000003C0,  // ....****.....
   },
-  {             // 173
-     8, 28,
-     0x00000000,  // ........
+  {             // 168
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4391,8 +4110,6 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4404,86 +4121,53 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ........
      0x00000000,  // ........
   },
-  {             // 174
-     15, 28,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000001C,  // ...........***.
-     0x00000038,  // ..........***..
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
+  {             // 169 iso8859-2
+     15, 27,
+     0x00000C30,  // ....**....**...
+     0x00000660,  // .....**..**....
      0x000003C0,  // ......****.....
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00007000,  // .***...........
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     15, 28,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // .......**......
      0x00000180,  // .......**......
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000001C,  // ...........***.
-     0x00000038,  // ..........***..
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00003018,  // ..**.......**..
+     0x00003008,  // ..**........*..
+     0x00003000,  // ..**...........
      0x00003800,  // ..***..........
-     0x00007000,  // .***...........
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00001F00,  // ...*****.......
+     0x00000FF0,  // ....********...
+     0x000000F8,  // ........*****..
+     0x0000001C,  // ...........***.
+     0x0000000C,  // ............**.
+     0x0000600C,  // .**.........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
-  {             // 176
-     9, 28,
-     0x00000000,  // .........
+  {             // 170
+     9, 27,
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x00000018,  // .....**..
+     0x00000078,  // ...****..
      0x00000198,  // .**..**..
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
      0x00000198,  // .**..**..
-     0x000000F0,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000000EC,  // ..***.**.
+     0x000001F8,  // .******..
+     0x000001F8,  // .******..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4497,8 +4181,8 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .........
      0x00000000,  // .........
   },
-  {             // 177
-     13, 28,
+  {             // 171
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4509,191 +4193,61 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x00000C18,  // ..**.....**..
-     0x00000018,  // .........**..
-     0x000000F8,  // ......*****..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001C78,  // .***...****..
-     0x00000FDC,  // ..******.***.
-     0x000007EC,  // ...******.**.
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x000003E0,  // ....*****....
-  },
-  {             // 178
-     7, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000E,  // ....***
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003E,  // ..*****
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000110,  // .....*...*...
+     0x00000310,  // ....**...*...
+     0x00000670,  // ...**..***...
+     0x00000C40,  // ..**...*.....
+     0x00000C60,  // ..**...**....
+     0x00000730,  // ...***..**...
+     0x00000310,  // ....**...*...
+     0x00000110,  // .....*...*...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 179
-     6, 28,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001C,  // ..***.
-     0x00000038,  // .***..
-     0x00000078,  // ****..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+  {             // 172
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 180
-     7, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000C,  // ....**.
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
-     0x00000060,  // .**....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 181
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000608,  // ..**.....*..
-     0x00000608,  // ..**.....*..
-     0x00000610,  // ..**....*...
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 182
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F8,  // ..********..
-     0x00000E1C,  // .***....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000F80,  // .*****......
-     0x000007F0,  // ..*******...
-     0x000000F8,  // .....*****..
-     0x0000001C,  // ........***.
-     0x0000000C,  // .........**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 183
-     8, 28,
+  {             // 173
+     8, 27,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000186,  // **....**
-     0x000000CC,  // .**..**.
-     0x00000078,  // ..****..
-     0x00000030,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4704,6 +4258,9 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
+     0x000000F8,  // .*****..
+     0x000000F8,  // .*****..
+     0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4714,853 +4271,1127 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ........
      0x00000000,  // ........
   },
-  {             // 184
-     7, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000038,  // ..***..
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000007C,  // .*****.
-  },
-  {             // 185
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F0,  // ..*******...
-     0x00000E38,  // .***...***..
-     0x00000C18,  // .**.....**..
-     0x00000C00,  // .**.........
-     0x00000F80,  // .*****......
-     0x000007F0,  // ..*******...
-     0x000000F8,  // .....*****..
-     0x0000001C,  // ........***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000E1C,  // .***....***.
-     0x000007F8,  // ..********..
-     0x000003F0,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 174 iso8859-2
+     14, 27,
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x0000001C,  // ..........***.
+     0x00000018,  // ..........**..
+     0x00000038,  // .........***..
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001C00,  // ..***.........
+     0x00003800,  // .***..........
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
-  {             // 186
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F8,  // ..********..
-     0x00000E1C,  // .***....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000F80,  // .*****......
-     0x000007F0,  // ..*******...
-     0x000000F8,  // .....*****..
-     0x0000001C,  // ........***.
-     0x0000000C,  // .........**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
-     0x000000E0,  // .....***....
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x000001F0,  // ....*****...
+  {             // 175
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
-  {             // 187
-     14, 28,
+  {             // 176
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x000007E0,  // ....******....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000007E0,  // ....******....
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000018,  // ..........**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C08,  // ...**......*..
-     0x00000C08,  // ...**......*..
-     0x00003F10,  // .******...*...
-     0x00003F00,  // .******.......
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000C00,  // ...**.........
-     0x00000F00,  // ...****.......
-     0x00000700,  // ....***.......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 188
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000380,  // ...***......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000E00,  // .***........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 177
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 178
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FE,  // .*******
+     0x00000086,  // .*....**
+     0x00000006,  // ......**
+     0x0000000C,  // .....**.
+     0x00000030,  // ...**...
+     0x000000E0,  // .***....
+     0x00000080,  // .*......
+     0x000000FE,  // .*******
+     0x0000007E,  // ..******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FC,  // .******.
+     0x0000008C,  // .*...**.
+     0x0000000C,  // .....**.
+     0x00000038,  // ...***..
+     0x0000000C,  // .....**.
+     0x00000006,  // ......**
+     0x00000186,  // **....**
+     0x000000FC,  // .******.
+     0x00000078,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x00000038,  // ...***..
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 181
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x00001FDE,  // .*******.****
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 182
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001FE,  // ....********
+     0x000003FE,  // ...*********
+     0x000007EC,  // ..******.**.
+     0x000007EC,  // ..******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x000007EC,  // ..******.**.
+     0x000007EC,  // ..******.**.
+     0x000001EC,  // ....****.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x00000000,  // ............
+  },
+  {             // 183
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000010,  // ....*...
+     0x00000038,  // ...***..
+     0x0000003C,  // ...****.
+     0x000000FC,  // .******.
+     0x00000038,  // ...***..
+  },
+  {             // 185 iso8859-2
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x000007F8,  // ..********..
+     0x00000C18,  // .**.....**..
+     0x00000C00,  // .**.........
+     0x00000E00,  // .***........
+     0x000007E0,  // ..******....
+     0x000001F8,  // ....******..
+     0x0000001C,  // ........***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+
+  {             // 186
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x0000007C,  // ..*****.
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x0000007C,  // ..*****.
+     0x00000038,  // ...***..
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 187
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000840,  // ..*....*.....
+     0x00000C60,  // ..**...**....
+     0x00000730,  // ...***..**...
+     0x00000310,  // ....**...*...
+     0x00000330,  // ....**..**...
+     0x00000E60,  // ..***..**....
+     0x00000C40,  // ..**...*.....
+     0x00000840,  // ..*....*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 188
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00030060,  // ...**.........**....
+     0x00070040,  // ..***.........*.....
+     0x000F0080,  // .****........*......
+     0x00030180,  // ...**.......**......
+     0x00030300,  // ...**......**.......
+     0x00030200,  // ...**......*........
+     0x00030618,  // ...**.....**....**..
+     0x00030C18,  // ...**....**.....**..
+     0x00030C38,  // ...**....**....***..
+     0x00001878,  // ........**....****..
+     0x000030D8,  // .......**....**.**..
+     0x00007098,  // ......***....*..**..
+     0x000061FE,  // ......**....********
+     0x0000C1FE,  // .....**.....********
+     0x0001C018,  // ....***.........**..
+     0x00018008,  // ....**...........*..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
   {             // 189
-     9, 28,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000006C,  // ...**.**.
-     0x000000D8,  // ..**.**..
-     0x000001B0,  // .**.**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00030040,  // ...**.........*.....
+     0x00070080,  // ..***........*......
+     0x000F0180,  // .****.......**......
+     0x00030100,  // ...**.......*.......
+     0x00030300,  // ...**......**.......
+     0x00030600,  // ...**.....**........
+     0x00030C78,  // ...**....**...****..
+     0x00030CFC,  // ...**....**..******.
+     0x00031886,  // ...**...**...*....**
+     0x00003086,  // .......**....*....**
+     0x0000300C,  // .......**........**.
+     0x00006018,  // ......**........**..
+     0x0000C060,  // .....**.......**....
+     0x0000C080,  // .....**......*......
+     0x000181FE,  // ....**......********
+     0x0003007E,  // ...**.........******
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
-  {             // 190
-     12, 28,
+  {             // 190 iso8859-2
+     12, 27,
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
      0x00000330,  // ...**..**...
      0x000001E0,  // ....****....
      0x000000C0,  // .....**.....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000018,  // ........**..
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
      0x00000030,  // .......**...
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
      0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000380,  // ...***......
+     0x00000180,  // ....**......
      0x00000300,  // ...**.......
      0x00000600,  // ..**........
-     0x00000E00,  // .***........
+     0x00000C00,  // .**.........
      0x00000FFC,  // .**********.
      0x00000FFC,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 191
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001C38,  // ..***....***..
+     0x00000FF0,  // ...********...
+     0x000007C0,  // ....*****.....
+  },
+  {             // 192
+     15, 27,
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000100,  // .......*.......
+     0x00000080,  // ........*......
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193 iso8859-2
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 27,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000006C0,  // .....**.**.....
+     0x00000460,  // .....*...**....
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 27,
+     0x00000000,  // ...............
+     0x00000720,  // .....***..*....
+     0x00000FE0,  // ....*******....
+     0x00000040,  // .........*.....
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 27,
+     0x00000000,  // ...............
+     0x000006E0,  // .....**.***....
+     0x000006E0,  // .....**.***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 27,
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x00000240,  // ......*..*.....
+     0x00000380,  // ......***......
+     0x00000180,  // .......**......
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
-  {             // 191
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
+  {             // 198 iso8859-2
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000018,  // ........**..
      0x00000030,  // .......**...
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
+     0x00000060,  // ......**....
      0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000380,  // ...***......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000E00,  // .***........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
-  {             // 192
-     17, 28,
-     0x00000180,  // .........**......
-     0x00000300,  // ........**.......
-     0x00000600,  // .......**........
-     0x00000C00,  // ......**.........
+  {             // 199
+     17, 27,
      0x00000000,  // .................
-     0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000FFF0,  // ..************...
-     0x0000FFE0,  // ..***********....
-     0x0000C070,  // ..**.......***...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006030,  // ...**.......**...
+     0x000078F0,  // ...****...****...
+     0x00001FE0,  // .....********....
+     0x00000200,  // ........*........
+     0x00000700,  // .......***.......
+     0x00000380,  // ........***......
+     0x00000F80,  // ......*****......
+     0x00000700,  // .......***.......
   },
-  {             // 193
-     17, 28,
-     0x000000C0,  // ..........**.....
-     0x00000180,  // .........**......
+  {             // 200 iso8859-2
+     17, 27,
+     0x00001860,  // .....**....**....
+     0x00000CC0,  // ......**..**.....
+     0x00000780,  // .......****......
      0x00000300,  // ........**.......
-     0x00000600,  // .......**........
      0x00000000,  // .................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00007FF0,  // ...***********...
-     0x00007FF0,  // ...***********...
-     0x0000C018,  // ..**.........**..
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
      0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
      0x0000C018,  // ..**.........**..
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
+     0x0000E018,  // ..***........**..
+     0x00007030,  // ...***......**...
+     0x00007FF0,  // ...***********...
+     0x00001FC0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-  },
-  {             // 194
-     17, 28,
-     0x00000300,  // ........**.......
-     0x00000780,  // .......****......
-     0x00000CC0,  // ......**..**.....
-     0x00001860,  // .....**....**....
      0x00000000,  // .................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00007FF0,  // ...***********...
-     0x00007FF0,  // ...***********...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
+  },
+  {             // 201 iso8859-2
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 27,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x00000640,  // .....**..*.....
+     0x00000460,  // .....*...**....
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 27,
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     6, 27,
+     0x00000070,  // ***...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205 iso8859-2
+     6, 27,
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 27,
+     0x00000030,  // ..**...
+     0x00000078,  // .****..
+     0x0000004C,  // .*..**.
+     0x000000C4,  // **...*.
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 207
+     6, 27,
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208 iso8859-2
+     17, 27,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-  },
-  {             // 195
-     17, 28,
-     0x00002040,  // ....*......*.....
-     0x000030C0,  // ....**....**.....
-     0x00001F80,  // .....******......
-     0x00000F00,  // ......****.......
      0x00000000,  // .................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00007FF0,  // ...***********...
-     0x00007FF0,  // ...***********...
+     0x0000FF80,  // ..*********......
+     0x0000FFE0,  // ..***********....
+     0x0000C0F0,  // ..**......****...
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0003FC18,  // ********.....**..
+     0x0003FC18,  // ********.....**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C0E0,  // ..**......***....
+     0x0000FFE0,  // ..***********....
+     0x0000FF80,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-  },
-  {             // 196
-     17, 28,
      0x00000000,  // .................
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
+  },
+  {             // 209
+     17, 27,
      0x00000000,  // .................
+     0x00000EC0,  // ......***.**.....
+     0x00001FC0,  // .....*******.....
+     0x00000180,  // .........**......
      0x00000000,  // .................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00007FF0,  // ...***********...
-     0x00007FF0,  // ...***********...
      0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
   },
-  {             // 197
-     14, 28,
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00000000,  // ..............
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 198
-     18, 28,
-     0x00000180,  // ..........**......
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
-     0x00000C00,  // .......**.........
-     0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x00038018,  // .***..........**..
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x0003000C,  // .**............**.
-     0x0003800C,  // .***...........**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 199
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x00038018,  // .***..........**..
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x0003000C,  // .**............**.
-     0x0003800C,  // .***...........**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000E00,  // .......***........
-     0x00000300,  // .........**.......
-     0x00000300,  // .........**.......
-     0x00001F00,  // ......*****.......
-  },
-  {             // 200
-     18, 28,
-     0x000030C0,  // .....**....**.....
-     0x00001980,  // ......**..**......
-     0x00000F00,  // .......****.......
-     0x00000600,  // ........**........
-     0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x00038018,  // .***..........**..
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x0003000C,  // .**............**.
-     0x0003800C,  // .***...........**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 201
-     16, 28,
-     0x000000C0,  // .........**.....
-     0x00000180,  // ........**......
-     0x00000300,  // .......**.......
-     0x00000600,  // ......**........
-     0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF0,  // ..***********...
-     0x00007FF0,  // ..***********...
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 202
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF0,  // ..***********...
-     0x00007FF0,  // ..***********...
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00000600,  // ......**........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000F80,  // .....*****......
-  },
-  {             // 203
-     16, 28,
-     0x00000000,  // ................
-     0x00000CC0,  // .....**..**.....
-     0x00000CC0,  // .....**..**.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF0,  // ..***********...
-     0x00007FF0,  // ..***********...
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 204
-     16, 28,
-     0x000030C0,  // ...**....**.....
-     0x00001980,  // ....**..**......
-     0x00000F00,  // .....****.......
-     0x00000600,  // ......**........
-     0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF0,  // ..***********...
-     0x00007FF0,  // ..***********...
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 205
-     8, 28,
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 206
-     8, 28,
-     0x00000030,  // ...**...
-     0x00000078,  // ..****..
-     0x000000CC,  // .**..**.
-     0x00000186,  // **....**
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 207
-     18, 28,
-     0x000030C0,  // .....**....**.....
-     0x00001980,  // ......**..**......
-     0x00000F00,  // .......****.......
-     0x00000600,  // ........**........
-     0x00000000,  // ..................
-     0x0001FF80,  // ..**********......
-     0x0001FFE0,  // ..************....
-     0x000180F0,  // ..**.......****...
-     0x00018038,  // ..**.........***..
-     0x00018018,  // ..**..........**..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001801C,  // ..**..........***.
-     0x00018018,  // ..**..........**..
-     0x00018038,  // ..**.........***..
-     0x000180F0,  // ..**.......****...
-     0x0001FFE0,  // ..************....
-     0x0001FF80,  // ..**********......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 208
-     18, 28,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0001FF80,  // ..**********......
-     0x0001FFE0,  // ..************....
-     0x000180F0,  // ..**.......****...
-     0x00018038,  // ..**.........***..
-     0x00018018,  // ..**..........**..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0007F80C,  // ********.......**.
-     0x0007F80C,  // ********.......**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001801C,  // ..**..........***.
-     0x00018018,  // ..**..........**..
-     0x00018038,  // ..**.........***..
-     0x000180F0,  // ..**.......****...
-     0x0001FFE0,  // ..************....
-     0x0001FF80,  // ..**********......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 209
-     18, 28,
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
-     0x00000C00,  // .......**.........
-     0x00001800,  // ......**..........
-     0x00000000,  // ..................
-     0x0001C018,  // ..***.........**..
-     0x0001E018,  // ..****........**..
-     0x0001E018,  // ..****........**..
-     0x0001B018,  // ..**.**.......**..
-     0x0001B818,  // ..**.***......**..
-     0x00019818,  // ..**..**......**..
-     0x00019C18,  // ..**..***.....**..
-     0x00018C18,  // ..**...**.....**..
-     0x00018E18,  // ..**...***....**..
-     0x00018618,  // ..**....**....**..
-     0x00018718,  // ..**....***...**..
-     0x00018318,  // ..**.....**...**..
-     0x00018398,  // ..**.....***..**..
-     0x00018198,  // ..**......**..**..
-     0x000181D8,  // ..**......***.**..
-     0x000180D8,  // ..**.......**.**..
-     0x00018078,  // ..**........****..
-     0x00018078,  // ..**........****..
-     0x00018038,  // ..**.........***..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 210
-     18, 28,
-     0x00006180,  // ....**....**......
-     0x00003300,  // .....**..**.......
-     0x00001E00,  // ......****........
-     0x00000C00,  // .......**.........
-     0x00000000,  // ..................
-     0x0001C018,  // ..***.........**..
-     0x0001E018,  // ..****........**..
-     0x0001E018,  // ..****........**..
-     0x0001B018,  // ..**.**.......**..
-     0x0001B818,  // ..**.***......**..
-     0x00019818,  // ..**..**......**..
-     0x00019C18,  // ..**..***.....**..
-     0x00018C18,  // ..**...**.....**..
-     0x00018E18,  // ..**...***....**..
-     0x00018618,  // ..**....**....**..
-     0x00018718,  // ..**....***...**..
-     0x00018318,  // ..**.....**...**..
-     0x00018398,  // ..**.....***..**..
-     0x00018198,  // ..**......**..**..
-     0x000181D8,  // ..**......***.**..
-     0x000180D8,  // ..**.......**.**..
-     0x00018078,  // ..**........****..
-     0x00018078,  // ..**........****..
-     0x00018038,  // ..**.........***..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+  {             // 210 iso8859-2
+     17, 27,
+     0x00001860,  // .....**....**....
+     0x00000CC0,  // ......**..**.....
+     0x00000780,  // .......****......
+     0x00000300,  // ........**.......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
-  {             // 211
-     18, 28,
-     0x000000C0,  // ...........**.....
+  {             // 211 iso8859-2
+     18, 27,
      0x00000180,  // ..........**......
      0x00000300,  // .........**.......
      0x00000600,  // ........**........
+     0x00000400,  // ........*.........
      0x00000000,  // ..................
      0x00001F80,  // ......******......
      0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
+     0x0000E0F0,  // ...***.....****...
      0x0001C038,  // ..***........***..
      0x00018018,  // ..**..........**..
      0x0003801C,  // .***..........***.
@@ -5570,28 +5401,27 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003801C,  // .***..........***.
      0x00018018,  // ..**..........**..
      0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
+     0x0000E070,  // ...***......***...
      0x00007FE0,  // ....**********....
      0x00001F80,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
+     0x00000000,  // ..................
   },
-  {             // 212
-     18, 28,
+  {             // 212 iso8859-2
+     18, 27,
      0x00000600,  // ........**........
      0x00000F00,  // .......****.......
-     0x00001980,  // ......**..**......
-     0x000030C0,  // .....**....**.....
+     0x00000900,  // .......*..*.......
+     0x00001080,  // ......*....*......
      0x00000000,  // ..................
      0x00001F80,  // ......******......
      0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
+     0x0000E0F0,  // ...***.....****...
      0x0001C038,  // ..***........***..
      0x00018018,  // ..**..........**..
      0x0003801C,  // .***..........***.
@@ -5601,28 +5431,27 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003801C,  // .***..........***.
      0x00018018,  // ..**..........**..
      0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
+     0x0000E070,  // ...***......***...
      0x00007FE0,  // ....**********....
      0x00001F80,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 213
-     18, 28,
+     18, 27,
      0x00000000,  // ..................
-     0x000006C0,  // ........**.**.....
-     0x00000D80,  // .......**.**......
-     0x00001B00,  // ......**.**.......
+     0x00001CC0,  // ......***..**.....
+     0x00001F80,  // ......******......
+     0x00000180,  // ..........**......
      0x00000000,  // ..................
      0x00001F80,  // ......******......
      0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
+     0x0000E0F0,  // ...***.....****...
      0x0001C038,  // ..***........***..
      0x00018018,  // ..**..........**..
      0x0003801C,  // .***..........***.
@@ -5632,20 +5461,19 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003801C,  // .***..........***.
      0x00018018,  // ..**..........**..
      0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
+     0x0000E070,  // ...***......***...
      0x00007FE0,  // ....**********....
      0x00001F80,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 214
-     18, 28,
+     18, 27,
      0x00000000,  // ..................
      0x00001980,  // ......**..**......
      0x00001980,  // ......**..**......
@@ -5653,7 +5481,7 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ..................
      0x00001F80,  // ......******......
      0x00007FE0,  // ....**********....
-     0x0000F0F0,  // ...****....****...
+     0x0000E0F0,  // ...***.....****...
      0x0001C038,  // ..***........***..
      0x00018018,  // ..**..........**..
      0x0003801C,  // .***..........***.
@@ -5663,68 +5491,88 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
      0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003801C,  // .***..........***.
      0x00018018,  // ..**..........**..
      0x0001C038,  // ..***........***..
-     0x0000F0F0,  // ...****....****...
+     0x0000E070,  // ...***......***...
      0x00007FE0,  // ....**********....
      0x00001F80,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 215
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000600C,  // **.........**.
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00000C60,  // ...**...**....
-     0x000006C0,  // ....**.**.....
-     0x00000380,  // .....***......
-     0x00000380,  // .....***......
-     0x000006C0,  // ....**.**.....
-     0x00000C60,  // ...**...**....
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x0000600C,  // **.........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000408,  // ...*......*..
+     0x00000E18,  // ..***....**..
+     0x00000730,  // ...***..**...
+     0x000003E0,  // ....*****....
+     0x000001C0,  // .....***.....
+     0x000001E0,  // .....****....
+     0x00000370,  // ....**.***...
+     0x00000638,  // ...**...***..
+     0x00000418,  // ...*.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 216
-     17, 28,
-     0x000030C0,  // ....**....**.....
-     0x00001980,  // .....**..**......
-     0x00000F00,  // ......****.......
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F8C,  // ......******...**.
+     0x00007FE8,  // ....**********.*..
+     0x0000E070,  // ...***......***...
+     0x0001C038,  // ..***........***..
+     0x00018058,  // ..**........*.**..
+     0x0003809C,  // .***.......*..***.
+     0x0003018C,  // .**.......**...**.
+     0x0003030C,  // .**......**....**.
+     0x0003060C,  // .**.....**.....**.
+     0x00030C0C,  // .**....**......**.
+     0x0003180C,  // .**...**.......**.
+     0x0003300C,  // .**..**........**.
+     0x0001E018,  // ..****........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x0003FFE0,  // .*************....
+     0x00023F80,  // .*...*******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 217
+     17, 27,
+     0x00001C00,  // .....***.........
+     0x00000C00,  // ......**.........
      0x00000600,  // .......**........
+     0x00000300,  // ........**.......
      0x00000000,  // .................
-     0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000FFF0,  // ..************...
-     0x0000FFE0,  // ..***********....
-     0x0000C070,  // ..**.......***...
-     0x0000C030,  // ..**........**...
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
@@ -5732,447 +5580,410 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
   },
-  {             // 217
-     18, 28,
-     0x00000F00,  // .......****.......
-     0x00000900,  // .......*..*.......
-     0x00000F00,  // .......****.......
-     0x00000600,  // ........**........
-     0x00000000,  // ..................
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0000C030,  // ...**........**...
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 218
-     18, 28,
-     0x000000C0,  // ...........**.....
-     0x00000180,  // ..........**......
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
-     0x00000000,  // ..................
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0000C030,  // ...**........**...
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+  {             // 218 iso8859-2
+     17, 27,
+     0x00000180,  // .........**......
+     0x00000300,  // ........**.......
+     0x00000200,  // ........*........
+     0x00000400,  // .......*.........
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 219
-     18, 28,
-     0x00000000,  // ..................
-     0x000006C0,  // ........**.**.....
-     0x00000D80,  // .......**.**......
-     0x00001B00,  // ......**.**.......
-     0x00000000,  // ..................
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0000C030,  // ...**........**...
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     17, 27,
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 220
-     18, 28,
-     0x00000000,  // ..................
-     0x00001980,  // ......**..**......
-     0x00001980,  // ......**..**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0000C030,  // ...**........**...
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     17, 27,
+     0x00000000,  // .................
+     0x00001D80,  // .....***.**......
+     0x00001D80,  // .....***.**......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
-  {             // 221
-     16, 28,
-     0x00000060,  // ..........**....
-     0x000000C0,  // .........**.....
-     0x00000180,  // ........**......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x00006018,  // ..**........**..
-     0x00007038,  // ..***......***..
-     0x00003030,  // ...**......**...
-     0x00003870,  // ...***....***...
-     0x00001860,  // ....**....**....
-     0x00001CE0,  // ....***..***....
-     0x00000CC0,  // .....**..**.....
-     0x00000FC0,  // .....******.....
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+  {             // 221 iso8859-2
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700E,  // .***........***
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C30,  // ....**....**...
+     0x00000E60,  // ....***..**....
+     0x00000760,  // .....***.**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 222
-     16, 28,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000FFFC,  // .**************.
-     0x0000FFFC,  // .**************.
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000380,  // .......***......
-     0x000000C0,  // .........**.....
-     0x000000C0,  // .........**.....
-     0x000007C0,  // ......*****.....
-  },
-  {             // 223
-     15, 28,
+     15, 27,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000FE0,  // ....*******....
-     0x00001C60,  // ...***...**....
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001860,  // ...**....**....
-     0x000018E0,  // ...**...***....
-     0x000019C0,  // ...**..***.....
-     0x000019E0,  // ...**..****....
-     0x00001870,  // ...**....***...
-     0x00001830,  // ...**.....**...
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001830,  // ...**.....**...
-     0x00001870,  // ...**....***...
-     0x000019E0,  // ...**..****....
-     0x000019C0,  // ...**..***.....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003038,  // ..**......***..
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
+  {             // 223
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x000007F0,  // ....*******...
+     0x00000E38,  // ...***...***..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C38,  // ...**....***..
+     0x00000CE0,  // ...**..***....
+     0x00000CF0,  // ...**..****...
+     0x00000C18,  // ...**.....**..
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C18,  // ...**.....**..
+     0x00000CF8,  // ...**..*****..
+     0x00000CE0,  // ...**..***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
   {             // 224
-     9, 28,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x00000000,  // .........
-     0x000000CC,  // ..**..**.
-     0x000000DC,  // ..**.***.
-     0x000000FC,  // ..******.
-     0x000000E0,  // ..***....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 225
-     13, 28,
+  {             // 225 iso8859-2
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
      0x00000060,  // .......**....
      0x000000C0,  // ......**.....
      0x00000180,  // .....**......
      0x00000000,  // .............
+     0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
      0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
      0x00000018,  // .........**..
-     0x000000F8,  // ......*****..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
      0x00001C18,  // .***.....**..
      0x00001818,  // .**......**..
      0x00001838,  // .**.....***..
-     0x00001C78,  // .***...****..
-     0x00000FDC,  // ..******.***.
-     0x0000078C,  // ...****...**.
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 226
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000001E0,  // .....****....
-     0x00000330,  // ....**..**...
-     0x00000618,  // ...**....**..
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
      0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
      0x00000018,  // .........**..
-     0x000000F8,  // ......*****..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
      0x00001C18,  // .***.....**..
      0x00001818,  // .**......**..
      0x00001838,  // .**.....***..
-     0x00001C78,  // .***...****..
-     0x00000FDC,  // ..******.***.
-     0x0000078C,  // ...****...**.
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 227
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000408,  // ...*......*..
-     0x00000618,  // ...**....**..
-     0x000003F0,  // ....******...
-     0x000001E0,  // .....****....
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
      0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
      0x00000018,  // .........**..
-     0x000000F8,  // ......*****..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
      0x00001C18,  // .***.....**..
      0x00001818,  // .**......**..
      0x00001838,  // .**.....***..
-     0x00001C78,  // .***...****..
-     0x00000FDC,  // ..******.***.
-     0x0000078C,  // ...****...**.
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 228
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000330,  // ....**..**...
-     0x00000330,  // ....**..**...
+     0x00000760,  // ...***.**....
+     0x00000760,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
      0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
      0x00000018,  // .........**..
-     0x000000F8,  // ......*****..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
      0x00001C18,  // .***.....**..
      0x00001818,  // .**......**..
      0x00001838,  // .**.....***..
-     0x00001C78,  // .***...****..
-     0x00000FDC,  // ..******.***.
-     0x0000078C,  // ...****...**.
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 229
-     6, 28,
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 230
-     12, 28,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003F8,  // ...*******..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x000001C0,  // .....***.....
+     0x00000240,  // ....*..*.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 230 iso8859-2
+       17, 27,
+       0x000000E0,  // ..........***....
+       0x000000C0,  // ..........**.....
+       0x00000180,  // .........**......
+       0x00000300,  // ........**.......
+       0x00000000,  // .................
+       0x00000FC0,  // ......******.....
+       0x00003FE0,  // ....*********....
+       0x00007070,  // ...***.....***...
+       0x0000E038,  // ..***.......***..
+       0x0000C018,  // ..**.........**..
+       0x0000C000,  // ..**.............
+       0x00018000,  // .**..............
+       0x00018000,  // .**..............
+       0x00018000,  // .**..............
+       0x00018000,  // .**..............
+       0x00018000,  // .**..............
+       0x00018018,  // .**..........**..
+       0x0000C018,  // ..**.........**..
+       0x0000E018,  // ..***........**..
+       0x00007030,  // ...***......**...
+       0x00007FF0,  // ...***********...
+       0x00001FC0,  // .....*******.....
+       0x00000000,  // .................
+       0x00000000,  // .................
+       0x00000000,  // .................
+       0x00000000,  // .................
+       0x00000000,  // .................
   },
   {             // 231
-     12, 28,
+     12, 27,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -6184,191 +5995,160 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003F8,  // ...*******..
-     0x000001F0,  // ....*****...
-     0x000001C0,  // ....***.....
-     0x00000060,  // ......**....
-     0x00000060,  // ......**....
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x00000738,  // ..***..***..
+     0x000003F0,  // ...******...
+     0x00000080,  // .....*......
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
      0x000003E0,  // ...*****....
+     0x000000C0,  // .....**.....
   },
-  {             // 232
-     12, 28,
+  {             // 232 iso8859-2
+     12, 27,
+     0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
      0x00000330,  // ...**..**...
      0x000001E0,  // ....****....
      0x000000C0,  // .....**.....
      0x00000000,  // ............
      0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
      0x00000C00,  // .**.........
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003F8,  // ...*******..
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
      0x000001F0,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
+     0x00000000,  // ............
   },
-  {             // 233
-     13, 28,
+  {             // 233 iso8859-2
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
+     0x00000070,  // .......***...
+     0x000000E0,  // ......***....
      0x00000180,  // .....**......
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001E0,  // .....****....
-     0x00000000,  // .............
      0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 234
-     13, 28,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001C0,  // .....***.....
+     0x000003E0,  // ....*****....
      0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
      0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001E0,  // .....****....
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
      0x000003E0,  // ....*****....
-  },
-  {             // 235
-     13, 28,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+  },
+  {             // 234
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
      0x00000000,  // .............
-     0x00000330,  // ....**..**...
-     0x00000330,  // ....**..**...
      0x00000000,  // .............
      0x00000000,  // .............
      0x000001C0,  // .....***.....
+     0x00000160,  // .....*.**....
+     0x00000320,  // ....**..*....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
      0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
      0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001E0,  // .....****....
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
-  {             // 236
-     13, 28,
+  {             // 235
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000618,  // ...**....**..
-     0x00000330,  // ....**..**...
-     0x000001E0,  // .....****....
-     0x000000C0,  // ......**.....
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
+     0x00000370,  // ....**.***...
+     0x00000370,  // ....**.***...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
      0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x00001FFC,  // .***********.
      0x00001FFC,  // .***********.
      0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001E0,  // .....****....
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
-  {             // 237
-     6, 28,
+  {             // 236
+     6, 27,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000070,  // ***...
      0x00000030,  // .**...
+     0x00000018,  // ..**..
      0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
@@ -6376,6 +6156,29 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 237
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
@@ -6387,563 +6190,546 @@ cFont::tPixelData FontOsd_iso8859_2[][30] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 238
-     6, 28,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000030,  // ...**...
-     0x00000078,  // ..****..
-     0x000000CC,  // .**..**.
-     0x00000186,  // **....**
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // ..***.
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 239
-     19, 28,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000318,  // ..........**...**..
-     0x00000318,  // ..........**...**..
-     0x00000318,  // ..........**...**..
-     0x00000308,  // ..........**....*..
-     0x00000308,  // ..........**....*..
-     0x0000F310,  // ....****..**...*...
-     0x0001FB00,  // ...******.**.......
-     0x00038F00,  // ..***...****.......
-     0x00030700,  // ..**.....***.......
-     0x00060300,  // .**.......**.......
-     0x00060300,  // .**.......**.......
-     0x00060300,  // .**.......**.......
-     0x00060300,  // .**.......**.......
-     0x00060300,  // .**.......**.......
-     0x00060300,  // .**.......**.......
-     0x00030700,  // ..**.....***.......
-     0x00038F00,  // ..***...****.......
-     0x0001FB00,  // ...******.**.......
-     0x0000F300,  // ....****..**.......
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
-  {             // 240
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x00000018,  // ..........**..
-     0x000001F8,  // ......******..
-     0x000001F8,  // ......******..
-     0x00000798,  // ....****..**..
-     0x00000FD8,  // ...******.**..
-     0x00001C78,  // ..***...****..
-     0x00001838,  // ..**.....***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001838,  // ..**.....***..
-     0x00001C78,  // ..***...****..
-     0x00000FD8,  // ...******.**..
-     0x00000798,  // ....****..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 240 iso8859-2
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // ......******.
+     0x00000018,  // ......******.
+     0x00000018,  // .........**..
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 241
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000000,  // ..............
-     0x000019C0,  // ..**..***.....
-     0x00001BF0,  // ..**.******...
-     0x00001E30,  // ..****...**...
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 242
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x000019C0,  // ..**..***.....
-     0x00001BF0,  // ..**.******...
-     0x00001E30,  // ..****...**...
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+  {             // 242 iso8859-2
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 243
-     13, 28,
+  {             // 243 iso8859-2
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
      0x00000060,  // .......**....
      0x000000C0,  // ......**.....
      0x00000180,  // .....**......
      0x00000000,  // .............
+     0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
      0x000003E0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
-  {             // 244
-     13, 28,
+  {             // 244 iso8859-2
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000001E0,  // .....****....
-     0x00000330,  // ....**..**...
-     0x00000618,  // ...**....**..
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
      0x000003E0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 245
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
      0x00000000,  // .............
-     0x000000D8,  // ......**.**..
-     0x000001B0,  // .....**.**...
-     0x00000360,  // ....**.**....
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
      0x000003E0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 246
-     13, 28,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
+     0x00000760,  // ...***.**....
+     0x00000760,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
      0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
      0x000003E0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 247
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 248
-     9, 28,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000186,  // .**....**
-     0x000000CC,  // ..**..**.
-     0x00000078,  // ...****..
-     0x00000030,  // ....**...
-     0x00000000,  // .........
-     0x000000CC,  // ..**..**.
-     0x000000DC,  // ..**.***.
-     0x000000FC,  // ..******.
-     0x000000E0,  // ..***....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 249
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x00000240,  // .....*..*.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00000C78,  // ...**...****..
-     0x00000FD8,  // ...******.**..
-     0x00000398,  // .....***..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 250
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000030,  // .........**...
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00000C78,  // ...**...****..
-     0x00000FD8,  // ...******.**..
-     0x00000398,  // .....***..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 251
-     14, 28,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001B0,  // ......**.**...
-     0x00000360,  // .....**.**....
-     0x000006C0,  // ....**.**.....
-     0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00000C78,  // ...**...****..
-     0x00000FD8,  // ...******.**..
-     0x00000398,  // .....***..**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 248
+     14, 27,
      0x00000000,  // ..............
      0x00000000,  // ..............
-  },
-  {             // 252
-     14, 28,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00000C78,  // ...**...****..
-     0x00000FD8,  // ...******.**..
-     0x00000398,  // .....***..**..
+     0x000007C8,  // ....*****..*..
+     0x00001FF0,  // ..*********...
+     0x00001830,  // ..**.....**...
+     0x00003078,  // .**.....****..
+     0x00003098,  // .**....*..**..
+     0x00003198,  // .**...**..**..
+     0x00003318,  // .**..**...**..
+     0x00003618,  // .**.**....**..
+     0x00003438,  // .**.*....***..
+     0x00001870,  // ..**....***...
+     0x00001FE0,  // ..********....
+     0x000027C0,  // .*..*****.....
+     0x00002000,  // .*............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
-  {             // 253
-     13, 28,
+  {             // 249
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
+     0x00000700,  // ...***.......
      0x00000180,  // .....**......
+     0x00000080,  // ......*......
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x0000180C,  // .**.......**.
-     0x00001C18,  // .***.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x000001E0,  // .....****....
-     0x000001C0,  // .....***.....
-     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 250 iso8859-2
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // ......***....
      0x000000C0,  // ......**.....
      0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000F00,  // ..****.......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 251
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 252
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000006E0,  // ...**.***....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 253 iso8859-2
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
   },
   {             // 254
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x0000003C,  // ...****.
-     0x0000003C,  // ...****.
-     0x00000038,  // ...***..
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000007C,  // ..*****.
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000019E0,  // .**..****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
   },
   {             // 255
-     8, 28,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000370,  // ...**.***...
+     0x00000370,  // ...**.***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
   },
   };
diff --git a/i18n.c b/i18n.c
index dd74446dd..5094fbd3e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.156 2004/05/22 11:46:35 kls Exp $
+ * $Id: i18n.c 1.157 2004/05/28 13:19:29 kls Exp $
  *
  * Translations provided by:
  *
@@ -1889,7 +1889,7 @@ const tI18nPhrase Phrases[] = {
     "A csatornabe�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
     "��������� ������ �� ���������!",
-    "Parametri programa nisu jedinstveni!",
+    "Parametri programa nisu jednozna�ni!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -2328,7 +2328,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Povr�ina",
   },
   { "Setup.OSD$Theme",
     "Thema",
@@ -2347,7 +2347,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Tema",
   },
   { "Setup.OSD$Left",
     "Links",
@@ -2366,7 +2366,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Lijevo",
   },
   { "Setup.OSD$Top",
     "Oben",
@@ -2385,7 +2385,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Gore",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -2461,7 +2461,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Koristi mala slova",
   },
   { "never",
     "nie",
@@ -2480,7 +2480,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "nikada",
   },
   { "skin dependent",
     "je nach Oberfl�che",
@@ -2499,7 +2499,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ovisno o povr�ini",
   },
   { "always",
     "immer",
@@ -2518,7 +2518,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "uvijek",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -2670,7 +2670,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������� ���������� ������ (���)",
-    "Prika�i stare EPG podatke (min)",// TODO
+    "Prika�i stare EPG podatke (min)",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2710,7 +2710,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ����� ������������",
     "Transponder za pode�avanje sata",
   },
-  { "Setup.EPG$Preferred languages",
+  { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
     "",// TODO
     "",// TODO
@@ -2727,9 +2727,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������������� �����",
-    "Preferirani jezik",
+    "Preferirani jezici",
   },
-  { "Setup.EPG$Preferred language",
+  { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
     "",// TODO
     "",// TODO
@@ -4613,7 +4613,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Klasi�cni VDR",
   },
   { "ST:TNG Panels",
     "ST:TNG Konsolen",
@@ -4632,7 +4632,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ST:TNG Konzole",
   },
   { NULL }
   };
diff --git a/libsi/si.c b/libsi/si.c
index 9ce46f0d7..2bc8339a6 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.9 2004/03/07 10:50:09 kls Exp $
+ *   $Id: si.c 1.10 2004/05/29 17:06:23 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -112,7 +112,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool return
    Descriptor *d=0;
    if (it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
-      const unsigned char *end=p+getLength();
+      const unsigned char *end=p+getLength()-it.i;
       while (p < end) {
          if (Descriptor::getDescriptorTag(p) == tag) {
             d=createDescriptor(it.i, returnUnimplemetedDescriptor);
@@ -130,7 +130,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int array
    Descriptor *d=0;
    if (it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
-      const unsigned char *end=p+getLength();
+      const unsigned char *end=p+getLength()-it.i;
       while (p < end) {
          for (int u=0; u<arrayLength;u++)
             if (Descriptor::getDescriptorTag(p) == tags[u]) {
diff --git a/menu.c b/menu.c
index 889b82b11..49cdef4cf 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.306 2004/05/23 11:21:06 kls Exp $
+ * $Id: menu.c 1.307 2004/05/29 10:19:22 kls Exp $
  */
 
 #include "menu.h"
@@ -1421,9 +1421,10 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   if (!Base)
      Skins.Message(mtStatus, tr("scanning recordings..."));
-  if (Base || Recordings.Load()) {
-     if (!Base)
-        Skins.Message(mtStatus, NULL);
+  bool Loaded = Base || Recordings.Load();
+  if (!Base)
+     Skins.Message(mtStatus, NULL);
+  if (Loaded) {
      const char *LastReplayed = cReplayControl::LastReplayed();
      cMenuRecordingItem *LastItem = NULL;
      char *LastItemText = NULL;
diff --git a/osd.c b/osd.c
index 077cd9c1f..a63d0e15e 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.47 2004/05/22 13:47:39 kls Exp $
+ * $Id: osd.c 1.48 2004/05/28 15:33:22 kls Exp $
  */
 
 #include "osd.h"
@@ -149,6 +149,15 @@ bool cBitmap::Contains(int x, int y) const
   return 0 <= x && x < width && 0 <= y && y < height;
 }
 
+bool cBitmap::Covers(int x1, int y1, int x2, int y2) const
+{
+  x1 -= x0;
+  y1 -= y0;
+  x2 -= x0;
+  y2 -= y0;
+  return x1 <= 0 && y1 <= 0 && x2 >= width - 1 && y2 >= height - 1;
+}
+
 bool cBitmap::Intersects(int x1, int y1, int x2, int y2) const
 {
   x1 -= x0;
@@ -321,11 +330,11 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
 void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)
 {
   if (bitmap && Bitmap.bitmap && Intersects(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1)) {
+     if (Covers(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1))
+        Reset();
      x -= x0;
      y -= y0;
      tIndexes Indexes;
-     if (ColorFg || ColorBg) {
-        }
      Take(Bitmap, &Indexes, ColorFg, ColorBg);
      for (int ix = 0; ix < Bitmap.width; ix++) {
          for (int iy = 0; iy < Bitmap.height; iy++)
@@ -401,6 +410,8 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
 void cBitmap::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
 {
   if (bitmap && Intersects(x1, y1, x2, y2)) {
+     if (Covers(x1, y1, x2, y2))
+        Reset();
      x1 -= x0;
      y1 -= y0;
      x2 -= x0;
@@ -409,8 +420,6 @@ void cBitmap::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
      y1 = max(y1, 0);
      x2 = min(x2, width - 1);
      y2 = min(y2, height - 1);
-     if (x1 == 0 && y1 == 0 && x2 == width - 1 && y2 == height - 1)
-        Reset();
      tIndex c = Index(Color);
      for (int y = y1; y <= y2; y++)
          for (int x = x1; x <= x2; x++)
diff --git a/osd.h b/osd.h
index 2df875ed4..848c68b0a 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.41 2004/05/15 14:54:37 kls Exp $
+ * $Id: osd.h 1.43 2004/05/29 14:02:47 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -122,9 +122,12 @@ class cBitmap : public cPalette {
        ///< unchanged.
   bool Contains(int x, int y) const;
        ///< Returns true if this bitmap contains the point (x, y).
+  bool Covers(int x1, int y1, int x2, int y2) const;
+       ///< Returns true if the rectangle defined by the given coordinates
+       ///< completely covers this bitmap.
   bool Intersects(int x1, int y1, int x2, int y2) const;
-       ///< Returns true if this bitmap intersects with the rectangle
-       ///< defined by the given coordinates.
+       ///< Returns true if the rectangle defined by the given coordinates
+       ///< intersects with this bitmap.
   bool Dirty(int &x1, int &y1, int &x2, int &y2);
        ///< Tells whether there is a dirty area and returns the bounding
        ///< rectangle of that area (relative to the bitmaps origin).
@@ -287,7 +290,7 @@ class cOsd {
        ///< -1..-8  draws the inverted part of the given quadrant(s)
        ///< If Quadrants is not 0, the coordinates are those of the actual area, not
        ///< the full circle!
-  void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
+  virtual void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
        ///< Draws a "slope" into the rectangle defined by the upper left (x1, y1) and
        ///< lower right (x2, y2) corners with the given Color. Type controls the
        ///< direction of the slope and which side of it will be drawn:
diff --git a/remote.c b/remote.c
index 227f640cd..b435bc463 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.39 2003/10/18 11:35:32 kls Exp $
+ * $Id: remote.c 1.40 2004/05/28 14:19:52 kls Exp $
  */
 
 #include "remote.h"
@@ -18,6 +18,8 @@
 
 // --- cRemote ---------------------------------------------------------------
 
+#define INITTIMEOUT 10000 // ms
+
 eKeys cRemote::keys[MaxKeys];
 int cRemote::in = 0;
 int cRemote::out = 0;
@@ -48,6 +50,17 @@ void cRemote::PutSetup(const char *Setup)
   Keys.PutSetup(Name(), Setup);
 }
 
+bool cRemote::Initialize(void)
+{
+  if (Ready()) {
+     char *NewCode = NULL;
+     eKeys Key = Get(INITTIMEOUT, &NewCode);
+     if (Key != kNone || NewCode)
+        return true;
+     }
+  return false;
+}
+
 void cRemote::Clear(void)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/remote.h b/remote.h
index 64a209764..2ef206f22 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.28 2003/05/02 10:41:35 kls Exp $
+ * $Id: remote.h 1.29 2004/05/28 14:14:02 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -38,7 +38,7 @@ class cRemote : public cListObject {
 public:
   virtual ~cRemote();
   virtual bool Ready(void) { return true; }
-  virtual bool Initialize(void) { return true; }
+  virtual bool Initialize(void);
   const char *Name(void) { return name; }
   static void SetLearning(cRemote *Learning) { learning = Learning; }
   static void Clear(void);
diff --git a/skinclassic.c b/skinclassic.c
index 3f0de1c50..8fd6fe94b 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.3 2004/05/23 10:40:02 kls Exp $
+ * $Id: skinclassic.c 1.7 2004/05/29 14:04:50 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -71,16 +71,18 @@ THEME_CLR(Theme, clrReplayProgressCurrent,  clrRed);
 
 // --- cSkinClassicDisplayChannel --------------------------------------------
 
-class cSkinClassicDisplayChannel : public cSkinDisplayChannel{
+class cSkinClassicDisplayChannel : public cSkinDisplayChannel {
 private:
   cOsd *osd;
   int lineHeight;
   int timeWidth;
+  bool message;
 public:
   cSkinClassicDisplayChannel(bool WithInfo);
   virtual ~cSkinClassicDisplayChannel();
   virtual void SetChannel(const cChannel *Channel, int Number);
   virtual void SetEvents(const cEvent *Present, const cEvent *Following);
+  virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void Flush(void);
   };
 
@@ -89,9 +91,10 @@ cSkinClassicDisplayChannel::cSkinClassicDisplayChannel(bool WithInfo)
   int Lines = WithInfo ? 5 : 1;
   const cFont *font = cFont::GetFont(fontOsd);
   lineHeight = font->Height();
+  message = false;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - Lines * lineHeight));
   timeWidth = font->Width("00:00") + 4;
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight, 4 } };
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight - 1, 4 } };
   osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, Theme.Color(clrBackground));
 }
@@ -121,10 +124,26 @@ void cSkinClassicDisplayChannel::SetEvents(const cEvent *Present, const cEvent *
       }
 }
 
+void cSkinClassicDisplayChannel::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  if (Text) {
+     osd->SaveRegion(0, 0, osd->Width() - 1, lineHeight - 1);
+     osd->DrawText(0, 0, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, osd->Width(), 0, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
 void cSkinClassicDisplayChannel::Flush(void)
 {
-  const char *date = DayDateTime();
-  osd->DrawText(osd->Width() - cFont::GetFont(fontSml)->Width(date) - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml));
+  if (!message) {
+     const char *date = DayDateTime();
+     osd->DrawText(osd->Width() - cFont::GetFont(fontSml)->Width(date) - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml));
+     }
   osd->Flush();
 }
 
@@ -333,6 +352,7 @@ class cSkinClassicDisplayReplay : public cSkinDisplayReplay {
   int x0, x1;
   int y0, y1, y2, y3;
   int lastCurrentWidth;
+  bool message;
 public:
   cSkinClassicDisplayReplay(bool ModeOnly);
   virtual ~cSkinClassicDisplayReplay();
@@ -342,6 +362,7 @@ class cSkinClassicDisplayReplay : public cSkinDisplayReplay {
   virtual void SetCurrent(const char *Current);
   virtual void SetTotal(const char *Total);
   virtual void SetJump(const char *Jump);
+  virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void Flush(void);
   };
 
@@ -350,6 +371,7 @@ cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly)
   const cFont *font = cFont::GetFont(fontOsd);
   int lineHeight = font->Height();
   lastCurrentWidth = 0;
+  message = false;
   x0 = 0;
   x1 = Setup.OSDWidth;
   y0 = 0;
@@ -369,7 +391,7 @@ cSkinClassicDisplayReplay::~cSkinClassicDisplayReplay()
 
 void cSkinClassicDisplayReplay::SetTitle(const char *Title)
 {
-  osd->DrawText(x0, y0, Title, Theme.Color(clrReplayTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+  osd->DrawText(x0, y0, Title, Theme.Color(clrReplayTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd), x1 - x0);
 }
 
 void cSkinClassicDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
@@ -413,6 +435,20 @@ void cSkinClassicDisplayReplay::SetJump(const char *Jump)
   osd->DrawText(x0 + (x1 - x0) / 4, y2, Jump, Theme.Color(clrReplayModeJump), Theme.Color(clrBackground), cFont::GetFont(fontOsd), (x1 - x0) / 2, 0, taCenter);
 }
 
+void cSkinClassicDisplayReplay::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  if (Text) {
+     osd->SaveRegion(x0, y2, x1 - 1, y3 - 1);
+     osd->DrawText(x0, y2, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x1 - x0, y3 - y2, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
 void cSkinClassicDisplayReplay::Flush(void)
 {
   osd->Flush();
diff --git a/skins.h b/skins.h
index 03c8a4a0c..814780c17 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.2 2004/05/16 20:16:57 kls Exp $
+ * $Id: skins.h 1.3 2004/05/29 13:13:21 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -56,6 +56,11 @@ class cSkinDisplayChannel : public cSkinDisplay {
   virtual void SetEvents(const cEvent *Present, const cEvent *Following) = 0;
        ///< Sets the Present and Following EPG events. It either of these
        ///< is not available, NULL will be given.
+  virtual void SetMessage(eMessageType Type, const char *Text) = 0;
+       ///< Sets a one line message Text, with the given Type. Type can be used
+       ///< to determine, e.g., the colors for displaying the Text.
+       ///< If Text is NULL, any previously displayed message must be removed, and
+       ///< any previous contents overwritten by the message must be restored.
   /*TODO
   SetButtons
     Red    = Video options
@@ -202,6 +207,11 @@ class cSkinDisplayReplay : public cSkinDisplay {
        ///< needs to be able to handle variations in the length of this
        ///< string, which will occur when the user enters an actual value.
        ///< If Jump is NULL, the jump prompt shall be removed from the display.
+  virtual void SetMessage(eMessageType Type, const char *Text) = 0;
+       ///< Sets a one line message Text, with the given Type. Type can be used
+       ///< to determine, e.g., the colors for displaying the Text.
+       ///< If Text is NULL, any previously displayed message must be removed, and
+       ///< any previous contents overwritten by the message must be restored.
   };
 
 class cSkinDisplayVolume : public cSkinDisplay {
diff --git a/skinsttng.c b/skinsttng.c
index a268978ad..ac4aab99a 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.2 2004/05/22 13:05:07 kls Exp $
+ * $Id: skinsttng.c 1.5 2004/05/29 14:05:12 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -116,7 +116,7 @@ THEME_CLR(Theme, clrReplayProgressCurrent,  clrRed);
 
 // --- cSkinSTTNGDisplayChannel ----------------------------------------------
 
-class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel{
+class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel {
 private:
   cOsd *osd;
   int x0, x1, x2, x3, x4, x5, x6, x7;
@@ -124,6 +124,7 @@ class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel{
   bool withInfo;
   int lineHeight;
   tColor frameColor;
+  bool message;
   const cEvent *present;
   int lastSeen;
   static cBitmap bmTeletext, bmRadio, bmAudio, bmDolbyDigital, bmEncrypted, bmRecording;
@@ -132,6 +133,7 @@ class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel{
   virtual ~cSkinSTTNGDisplayChannel();
   virtual void SetChannel(const cChannel *Channel, int Number);
   virtual void SetEvents(const cEvent *Present, const cEvent *Following);
+  virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void Flush(void);
   };
 
@@ -150,6 +152,7 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
   withInfo = WithInfo;
   lineHeight = font->Height();
   frameColor = Theme.Color(clrChannelFrame);
+  message = false;
   if (withInfo) {
      x0 = 0;
      x1 = x0 + font->Width("00:00") + 4;
@@ -251,7 +254,7 @@ void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fo
      return;
   if (present != Present)
      lastSeen = -1;
-  present = Present;   
+  present = Present;
   osd->DrawRectangle(x0, y3, x1 - 1, y4 - 1, frameColor);
   osd->DrawRectangle(x3, y3, x7 - 1, y4 - 1, Theme.Color(clrBackground));
   for (int i = 0; i < 2; i++) {
@@ -264,13 +267,33 @@ void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fo
       }
 }
 
+void cSkinSTTNGDisplayChannel::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(withInfo ? fontSml : fontOsd);
+  if (Text) {
+     int yt = withInfo ? y6 : y0;
+     int yb = withInfo ? y7 : y1;
+     osd->SaveRegion(x2, yt, x4 - 1, yb - 1);
+     if (withInfo)
+        osd->DrawRectangle(x2, yt, x3 - 1, yb - 1, Theme.Color(clrBackground));
+     osd->DrawText(x3, yt, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x4 - x3, 0, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
 void cSkinSTTNGDisplayChannel::Flush(void)
 {
   if (withInfo) {
-     const char *date = DayDateTime();
-     const cFont *font = cFont::GetFont(fontSml);
-     osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
-   
+     if (!message) {
+        const char *date = DayDateTime();
+        const cFont *font = cFont::GetFont(fontSml);
+        osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
+        }
+
      int seen = 0;
      if (present) {
         time_t t = time(NULL);
@@ -324,12 +347,12 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   message = false;
   x0 = 0;
   x1 = lineHeight / 2;
-  x2 = x1 + Roundness;
-  x3 = x2 + Gap;
+  x3 = (x1 + Roundness + Gap + 7) & ~0x07; // must be multiple of 8
+  x2 = x3 - Gap;
   x7 = Setup.OSDWidth;
   x6 = x7 - lineHeight / 2;
-  x5 = x6 - lineHeight / 2;
-  x4 = x5 - Gap;
+  x4 = (x6 - lineHeight / 2 - Gap) & ~0x07; // must be multiple of 8
+  x5 = x4 + Gap;
   y0 = 0;
   y1 = lineHeight;
   y2 = y1 + Roundness;
@@ -345,18 +368,13 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 },
-                       { x0, y1, x7 - 1, y6 - 1, 2 },
-                       { x0, y6, x7 - 1, y7 - 1, 4 }
-                     };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
-     /*TODO
      tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
                        { x0, y3, x3 - 1, y4 - 1, 1 },
-                       { x3, y3, x5 - 1, y4 - 1, 2 },
+                       { x3, y3, x4 - 1, y4 - 1, 2 },
+                       { x4, y3, x7 - 1, y4 - 1, 2 },
                        { x0, y4, x7 - 1, y7 - 1, 4 }
                      };
-     */
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
   osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
@@ -581,6 +599,7 @@ class cSkinSTTNGDisplayReplay : public cSkinDisplayReplay {
   int y0, y1, y2, y3, y4, y5, y6, y7;
   tColor frameColor;
   int lastCurrentWidth;
+  bool message;
 public:
   cSkinSTTNGDisplayReplay(bool ModeOnly);
   virtual ~cSkinSTTNGDisplayReplay();
@@ -590,6 +609,7 @@ class cSkinSTTNGDisplayReplay : public cSkinDisplayReplay {
   virtual void SetCurrent(const char *Current);
   virtual void SetTotal(const char *Total);
   virtual void SetJump(const char *Jump);
+  virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void Flush(void);
   };
 
@@ -602,6 +622,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   int lineHeight = font->Height();
   frameColor = Theme.Color(clrReplayFrame);
   lastCurrentWidth = 0;
+  message = false;
   cBitmap bm(play_xpm);
   x0 = 0;
   x1 = max(SymbolWidth, bm.Width());
@@ -700,6 +721,21 @@ void cSkinSTTNGDisplayReplay::SetJump(const char *Jump)
   osd->DrawText(x0 + (x4 - x0) / 4, y6, Jump, Theme.Color(clrReplayJump), frameColor, cFont::GetFont(fontSml), (x4 - x3) / 2, 0, taCenter);
 }
 
+void cSkinSTTNGDisplayReplay::SetMessage(eMessageType Type, const char *Text)
+{
+  const cFont *font = cFont::GetFont(fontSml);
+  if (Text) {
+     osd->SaveRegion(x2, y6, x4 - 1, y7 - 1);
+     osd->DrawRectangle(x2, y6, x3 - 1, y7 - 1, Theme.Color(clrBackground));
+     osd->DrawText(x3, y6, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x4 - x3, 0, taCenter);
+     message = true;
+     }
+  else {
+     osd->RestoreRegion();
+     message = false;
+     }
+}
+
 void cSkinSTTNGDisplayReplay::Flush(void)
 {
   osd->Flush();

From c281d01c089f4c9410a2756d3bcd99a56f702c86 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Jun 2004 18:00:00 +0200
Subject: [PATCH 102/307] =?UTF-8?q?Version=201.3.10=20-=20Fixed=20some=20d?=
 =?UTF-8?q?efault=20parameters=20in=20'skincurses'.=20-=20Fixed=20cBitmap:?=
 =?UTF-8?q?:DrawPixel(),=20which=20messed=20with=20other=20bitmaps'=20pale?=
 =?UTF-8?q?ttes=20in=20case=20=20=20the=20pixel=20coordinates=20were=20out?=
 =?UTF-8?q?side=20this=20bitmap=20(thanks=20to=20Sascha=20Volkenandt=20for?=
 =?UTF-8?q?=20=20=20reporting=20this=20one).=20-=20The=20cBitmap::DrawText?=
 =?UTF-8?q?()=20function=20now=20doesn't=20set=20any=20background=20pixels?=
 =?UTF-8?q?=20if=20the=20=20=20given=20background=20color=20is=20clrTransp?=
 =?UTF-8?q?arent.=20This=20allows=20drawing=20"transparent"=20=20=20texts?=
 =?UTF-8?q?=20(suggested=20by=20Sascha=20Volkenandt).=20-=20The=20cBitmap:?=
 =?UTF-8?q?:SetXpm()=20function=20now=20ignores=20unused=20"none"=20color?=
 =?UTF-8?q?=20entries,=20which=20=20=20some=20broken=20graphics=20tools=20?=
 =?UTF-8?q?write=20into=20XPM=20files=20(suggested=20by=20Sascha=20Volkena?=
 =?UTF-8?q?ndt).=20-=20No=20longer=20setting=20lnb=20voltage=20if=20the=20?=
 =?UTF-8?q?frontend=20is=20not=20DVB-S=20(thanks=20to=20Marco=20=20=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20Fixed=20displaying=20the=20current=20ch?=
 =?UTF-8?q?annel=20when=20switching=20via=20the=20SVDRP=20command=20CHAN?=
 =?UTF-8?q?=20=20=20(thanks=20to=20J=C3=BCrgen=20Schmitz=20for=20reporting?=
 =?UTF-8?q?=20this=20one).=20-=20Fixed=20missing=20audio=20after=20replayi?=
 =?UTF-8?q?ng=20a=20DVD=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-?=
 =?UTF-8?q?=20Added=20a=20note=20about=20the=20default=20assignment=20of?=
 =?UTF-8?q?=20the=20color=20keys=20to=20MANUAL.=20-=20Added=20a=20note=20a?=
 =?UTF-8?q?bout=20NPTL=20("Native=20Posix=20Thread=20Library")=20to=20the?=
 =?UTF-8?q?=20INSTALL=20file=20=20=20(apparently=20the=20"fix"=20in=20vers?=
 =?UTF-8?q?ion=201.3.0=20didn't=20really=20fix=20this).=20-=20Modified=20'?=
 =?UTF-8?q?libsi'=20to=20require=20callers=20to=20state=20the=20buffer=20s?=
 =?UTF-8?q?izes=20when=20getting=20=20=20strings=20in=20order=20to=20avoid?=
 =?UTF-8?q?=20buffer=20overflows=20(thanks=20to=20Philip=20Lawatsch=20for?=
 =?UTF-8?q?=20=20=20debugging=20a=20buffer=20overflow=20in=20eit.c).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  14 +++
 HISTORY                             |  23 +++++
 INSTALL                             |  10 +++
 MANUAL                              |   8 ++
 PLUGINS/src/skincurses/HISTORY      |   6 +-
 PLUGINS/src/skincurses/skincurses.c |   6 +-
 channels.conf                       |   8 +-
 config.h                            |   6 +-
 dvbdevice.c                         |  13 +--
 eit.c                               |  10 +--
 libsi/descriptor.c                  | 134 +++++++++++++++-------------
 libsi/descriptor.h                  |  10 +--
 libsi/si.c                          |  33 ++++---
 libsi/si.h                          |  10 +--
 menu.c                              |   4 +-
 nit.c                               |   4 +-
 osd.c                               |  32 ++++---
 osd.h                               |  16 +++-
 sdt.c                               |   4 +-
 19 files changed, 226 insertions(+), 125 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cb59f2f81..d6f34f1d3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -713,6 +713,11 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for suggesting to map the color name "None" to #00000000 when processing XPM data
  for suggesting to also reset the palette in cBitmap::DrawBitmap() if the entire
  bitmap area is covered
+ for reporting a bug in cBitmap::DrawPixel(), which messed with other bitmaps'
+ palettes in case the pixel coordinates were outside this bitmap
+ for suggesting to allow drawing "transparent" texts
+ for suggesting to ignore unused "none" color entries in XPM files written by
+ some broken graphics tools
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -1010,3 +1015,12 @@ Wayne Keer <syphir@syphir.sytes.net>
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
+ for fixing setting lnb voltage if the frontend is not DVB-S
+ for fixing missing audio after replaying a DVD
+
+J�rgen Schmitz <j.schmitz@web.de>
+ for reporting a bug in displaying the current channel when switching via the SVDRP
+ command CHAN
+
+Philip Lawatsch <philip@lawatsch.at>
+ for debugging a buffer overflow in eit.c
diff --git a/HISTORY b/HISTORY
index 73cfdfef2..56cae9d2e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2869,3 +2869,26 @@ Video Disk Recorder Revision History
 - The new plugin 'skincurses' re-implements the functionality that was previously
   available by compiling VDR with DEBUG_OSD. Some things may not yet work as they
   should, but it's a starting point.
+
+2004-06-06: Version 1.3.10
+
+- Fixed some default parameters in 'skincurses'.
+- Fixed cBitmap::DrawPixel(), which messed with other bitmaps' palettes in case
+  the pixel coordinates were outside this bitmap (thanks to Sascha Volkenandt for
+  reporting this one).
+- The cBitmap::DrawText() function now doesn't set any background pixels if the
+  given background color is clrTransparent. This allows drawing "transparent"
+  texts (suggested by Sascha Volkenandt).
+- The cBitmap::SetXpm() function now ignores unused "none" color entries, which
+  some broken graphics tools write into XPM files (suggested by Sascha Volkenandt).
+- No longer setting lnb voltage if the frontend is not DVB-S (thanks to Marco
+  Schl��ler).
+- Fixed displaying the current channel when switching via the SVDRP command CHAN
+  (thanks to J�rgen Schmitz for reporting this one).
+- Fixed missing audio after replaying a DVD (thanks to Marco Schl��ler).
+- Added a note about the default assignment of the color keys to MANUAL.
+- Added a note about NPTL ("Native Posix Thread Library") to the INSTALL file
+  (apparently the "fix" in version 1.3.0 didn't really fix this).
+- Modified 'libsi' to require callers to state the buffer sizes when getting
+  strings in order to avoid buffer overflows (thanks to Philip Lawatsch for
+  debugging a buffer overflow in eit.c).
diff --git a/INSTALL b/INSTALL
index ec1906aac..012dd9460 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,6 +4,16 @@ Installation of the Video Disk Recorder
 Version 1.3
 -----------
 
+IMPORTANT NOTE:
+---------------
+
+VDR currently doesn't work with NPTL ("Native Posix Thread Library").
+Either don't use NPTL, or set the environment variable
+
+  LD_ASSUME_KERNEL=2.4.1
+  
+before running VDR.
+
 Compiling and running the program:
 ----------------------------------
 
diff --git a/MANUAL b/MANUAL
index ffbc46069..9855d0ee2 100644
--- a/MANUAL
+++ b/MANUAL
@@ -59,6 +59,14 @@ Version 1.2
   User1...9   additional user defined keys for macro functions
               (defined in 'keymacros.conf')
 
+  Note that in normal viewing mode (no OSD active) the color keys can have user
+  defined functionality, as configured in 'keymacros.conf'.
+  The default assignment is
+
+  Red       Recordings menu
+  Green     Schedule menu
+  Blue      Timers menu
+
   (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
       has been enabled in the "Setup" menu. Otherwise the Blue button is used
       to "mark" a timer for moving.
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 9f459b4f3..df6735835 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -1,6 +1,10 @@
 VDR Plugin 'skincurses' Revision History
 ----------------------------------------
 
-2004-05-29: Version 0.0.1
+2004-05-31: Version 0.0.1
 
 - Initial revision.
+
+2004-05-31: Version 0.0.2
+
+- Fixed some default parameters.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 38c297ac2..e2b218da7 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.1 2004/05/31 14:01:49 kls Exp $
+ * $Id: skincurses.c 1.2 2004/05/31 14:57:40 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -133,7 +133,7 @@ void cCursesOsd::RestoreRegion(void)
      }
 }
 
-void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault)
+void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
 {
   int w = Font->Width(s);
   int h = Font->Height();
diff --git a/channels.conf b/channels.conf
index ec562950d..8ce691731 100644
--- a/channels.conf
+++ b/channels.conf
@@ -46,9 +46,9 @@ rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1702,1722:10:133:2:0
-PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
+PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
+PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
 PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
@@ -59,8 +59,8 @@ DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0
 B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-F1-Portal:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu:32:1702,1722,1801:27:133:4:0
+SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
 Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
diff --git a/config.h b/config.h
index 3f62fcb56..f9d501640 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.196 2004/05/28 13:16:03 kls Exp $
+ * $Id: config.h 1.197 2004/06/05 10:06:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.9"
-#define VDRVERSNUM   10309  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.10"
+#define VDRVERSNUM   10310  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index cb143a6d3..e5b777dc2 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.86 2004/05/23 10:11:42 kls Exp $
+ * $Id: dvbdevice.c 1.89 2004/06/06 11:28:28 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -101,7 +101,8 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   useCa = false;
   tunerStatus = tsIdle;
   startTime = time(NULL);
-  CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
+  if (frontendType == FE_QPSK)
+     CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
   Start();
 }
@@ -560,15 +561,15 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
 
 eVideoSystem cDvbDevice::GetVideoSystem(void)
 {
-  eVideoSystem VideoSytem = vsPAL;
+  eVideoSystem VideoSystem = vsPAL;
   video_size_t vs;
   if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
      if (vs.h == 480 || vs.h == 240)
-        VideoSytem = vsNTSC;
+        VideoSystem = vsNTSC;
      }
   else
      LOG_ERROR;
-  return VideoSytem;
+  return VideoSystem;
 }
 
 //                            ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
@@ -766,6 +767,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      if (IsPrimaryDevice())
         AddPid(Channel->Tpid(), ptTeletext);
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
   else if (StartTransferMode)
      cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));
diff --git a/eit.c b/eit.c
index 97ba5230c..3ac53fac6 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.94 2004/03/20 10:53:23 kls Exp $
+ * $Id: eit.c 1.95 2004/06/06 14:49:45 kls Exp $
  */
 
 #include "eit.h"
@@ -193,12 +193,12 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       if (!rEvent) {
          if (ShortEventDescriptor) {
             char buffer[256];
-            pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer));
-            pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer));
+            pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
+            pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
          if (ExtendedEventDescriptors) {
-            char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ")];
-            pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, ": "));
+            char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
+            pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
          }
       delete ExtendedEventDescriptors;
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 685722e77..eb921c95f 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.12 2004/03/26 15:25:28 kls Exp $
+ *   $Id: descriptor.c 1.13 2004/06/06 14:47:30 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -84,53 +84,61 @@ int ExtendedEventDescriptors::getMaximumTextLength(const char *separation1, cons
 }
 
 char *ExtendedEventDescriptors::getText(const char *separation1, const char *separation2) {
-   char *text=new char[getMaximumTextLength(separation1, separation2)];
-   return getText(text, separation1, separation2);
+   int size = getMaximumTextLength(separation1, separation2);
+   char *text=new char[size];
+   return getText(text, size, separation1, separation2);
 }
 
-char *ExtendedEventDescriptors::getText(char *buffer, const char *separation1, const char *separation2) {
+char *ExtendedEventDescriptors::getText(char *buffer, int size, const char *separation1, const char *separation2) {
    int index=0, len;
-   char tempbuf[256];
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
-      d->text.getText(tempbuf);
-      len=strlen(tempbuf);
-      if (len) {
-         memcpy(buffer+index, tempbuf, len);
-         index+=len;
-      }
+      d->text.getText(buffer+index, size);
+      len = strlen(buffer+index);
+      index += len;
+      size -= len;
    }
 
+   int sepLen1 = strlen(separation1);
+   int sepLen2 = strlen(separation2);
+   bool separated = false;
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
 
-      strcpy(buffer+index, separation2); // let's have a separator between the long text and the items
-      index += strlen(separation2);
       ExtendedEventDescriptor::Item item;
       for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
          item=d->itemLoop.getNext(it);
 
-         item.itemDescription.getText(tempbuf);
-         len=strlen(tempbuf);
-         if (len) {
-            memcpy(buffer+index, tempbuf, len);
-            index+=len;
+         if (!separated && size > sepLen2) {
+            strcpy(buffer+index, separation2); // let's have a separator between the long text and the items
+            index += sepLen2;
+            size -= sepLen2;
+            separated = true;
+         }
+
+         item.itemDescription.getText(buffer+index, size);
+         len = strlen(buffer+index);
+         index += len;
+         size -= len;
+         if (size > sepLen1) {
+            strcpy(buffer+index, separation1);
+            index += sepLen1;
+            size -= sepLen1;
          }
-         strcpy(buffer+index, separation1);
-         index += strlen(separation1);
-
-         item.item.getText(tempbuf);
-         len=strlen(tempbuf);
-         if (len) {
-            memcpy(buffer+index, tempbuf, len);
-            index+=len;
+
+         item.item.getText(buffer+index, size);
+         len = strlen(buffer+index);
+         index += len;
+         size -= len;
+         if (size > sepLen2) {
+            strcpy(buffer+index, separation2);
+            index += sepLen2;
+            size -= sepLen2;
          }
-         strcpy(buffer+index, separation2);
-         index += strlen(separation2);
       }
    }
 
@@ -150,23 +158,21 @@ int ExtendedEventDescriptors::getMaximumTextPlainLength() {
 }
 
 char *ExtendedEventDescriptors::getTextPlain() {
-   char *text=new char[getMaximumTextPlainLength()];
-   return getTextPlain(text);
+   int size = getMaximumTextPlainLength();
+   char *text=new char[size];
+   return getTextPlain(text, size);
 }
 
-char *ExtendedEventDescriptors::getTextPlain(char *buffer) {
+char *ExtendedEventDescriptors::getTextPlain(char *buffer, int size) {
    int index=0, len;
-   char tempbuf[256];
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
-      d->text.getText(tempbuf);
-      len=strlen(tempbuf);
-      if (len) {
-         memcpy(buffer+index, tempbuf, len);
-         index+=len;
-      }
+      d->text.getText(buffer+index, size);
+      len = strlen(buffer+index);
+      index += len;
+      size -= len;
    }
    buffer[index]='\0';
    return buffer;
@@ -174,25 +180,27 @@ char *ExtendedEventDescriptors::getTextPlain(char *buffer) {
 
 int ExtendedEventDescriptors::getMaximumTextItemizedLength(const char *separation1, const char *separation2) {
    int ret=0;
-   int sepLength=strlen(separation1)+strlen(separation2)-2;
+   int sepLength=strlen(separation1)+strlen(separation2);
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
          continue;
-      //The length includes two 8-bit length fields which have already been subtracted from sepLength
+      //The length includes two 8-bit length fields which have already been subtracted from sepLength //XXX kls 2004-06-06: what does this mean???
       ret+=d->itemLoop.getLength()+sepLength;
    }
    return ret;
 }
 
 char *ExtendedEventDescriptors::getTextItemized(const char *separation1, const char *separation2) {
-   char *text=new char[getMaximumTextItemizedLength(separation1, separation2)];
-   return getTextItemized(text, separation1, separation2);
+   int size = getMaximumTextItemizedLength(separation1, separation2);
+   char *text=new char[size];
+   return getTextItemized(text, size, separation1, separation2);
 }
 
-char *ExtendedEventDescriptors::getTextItemized(char *buffer, const char *separation1, const char *separation2) {
+char *ExtendedEventDescriptors::getTextItemized(char *buffer, int size, const char *separation1, const char *separation2) {
    int index=0, len;
-   char tempbuf[256];
+   int sepLen1 = strlen(separation1);
+   int sepLen2 = strlen(separation2);
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)
@@ -202,23 +210,25 @@ char *ExtendedEventDescriptors::getTextItemized(char *buffer, const char *separa
       for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
          item=d->itemLoop.getNext(it);
 
-         item.itemDescription.getText(tempbuf);
-         len=strlen(tempbuf);
-         if (len) {
-            memcpy(buffer+index, tempbuf, len);
-            index+=len;
+         item.itemDescription.getText(buffer+index, size);
+         len = strlen(buffer+index);
+         index += len;
+         size -= len;
+         if (size > sepLen1) {
+            strcpy(buffer+index, separation1);
+            index += sepLen1;
+            size -= sepLen1;
          }
-         strcpy(buffer+index, separation1);
-         index += strlen(separation1);
-
-         item.item.getText(tempbuf);
-         len=strlen(tempbuf);
-         if (len) {
-            memcpy(buffer+index, tempbuf, len);
-            index+=len;
+
+         item.item.getText(buffer+index, size);
+         len = strlen(buffer+index);
+         index += len;
+         size -= len;
+         if (size > sepLen2) {
+            strcpy(buffer+index, separation2);
+            index += sepLen2;
+            size -= sepLen2;
          }
-         strcpy(buffer+index, separation2);
-         index += strlen(separation2);
       }
    }
    buffer[index]='\0';
@@ -227,7 +237,7 @@ char *ExtendedEventDescriptors::getTextItemized(char *buffer, const char *separa
 
 //returns the itemized text pair by pair. Maximum length for buffers is 256.
 //Return value is false if and only if the end of the list is reached.
-bool ExtendedEventDescriptors::getTextItemized(Loop::Iterator &it, bool &valid, char *itemDescription, char *itemText) {
+bool ExtendedEventDescriptors::getTextItemized(Loop::Iterator &it, bool &valid, char *itemDescription, char *itemText, int sizeItemDescription, int sizeItemText) {
    //The iterator has to store two values: The descriptor index (4bit)
    //and the item loop index (max overall length 256, min item length 16 => max number 128 => 7bit)
    valid=false;
@@ -244,8 +254,8 @@ bool ExtendedEventDescriptors::getTextItemized(Loop::Iterator &it, bool &valid,
       if (d->itemLoop.hasNext(it)) {
          item=d->itemLoop.getNext(it);
 
-         item.item.getText(itemDescription);
-         item.itemDescription.getText(itemText);
+         item.item.getText(itemDescription, sizeItemDescription);
+         item.itemDescription.getText(itemText, sizeItemText);
          valid=true;
          break;
       } else {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index db3bba61e..949592313 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.9 2004/03/26 15:26:03 kls Exp $
+ *   $Id: descriptor.h 1.10 2004/06/06 13:51:29 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -55,12 +55,12 @@ class ExtendedEventDescriptors : public DescriptorGroup {
    //same semantics as with SI::String
    char *getText(const char *separation1="\t", const char *separation2="\n");
    //buffer must at least be getTextLength(), getMaximumTextLength() is a good choice
-   char *getText(char *buffer, const char *separation1="\t", const char *separation2="\n");
+   char *getText(char *buffer, int size, const char *separation1="\t", const char *separation2="\n");
 
    //these only return the non-itemized text fields in concatenated form
    int getMaximumTextPlainLength();
    char *getTextPlain();
-   char *getTextPlain(char *buffer);
+   char *getTextPlain(char *buffer, int size);
 
    //these only return the itemized text fields in concatenated form.
    //Between the description and the text the separation1 character is used,
@@ -68,11 +68,11 @@ class ExtendedEventDescriptors : public DescriptorGroup {
    //Director\tSteven Spielberg\nActor\tMichael Mendl\n
    int getMaximumTextItemizedLength(const char *separation1="\t", const char *separation2="\n");
    char *getTextItemized(const char *separation1="\t", const char *separation2="\n");
-   char *getTextItemized(char *buffer, const char *separation1="\t", const char *separation2="\n");
+   char *getTextItemized(char *buffer, int size, const char *separation1="\t", const char *separation2="\n");
    //returns the itemized text pair by pair. Maximum length for buffers is 256.
    //Return value is false if and only if the end of the list is reached.
    //The argument valid indicates whether the buffers contain valid content.
-   bool getTextItemized(Loop::Iterator &it, bool &valid, char *itemDescription, char *itemText);
+   bool getTextItemized(Loop::Iterator &it, bool &valid, char *itemDescription, char *itemText, int sizeItemDescription, int sizeItemText);
 };
 
 class TimeShiftedEventDescriptor : public Descriptor {
diff --git a/libsi/si.c b/libsi/si.c
index 2bc8339a6..40f94539c 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.10 2004/05/29 17:06:23 kls Exp $
+ *   $Id: si.c 1.11 2004/06/06 14:43:56 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -206,33 +206,36 @@ bool DescriptorGroup::isComplete() {
 
 char *String::getText() {
    if (getLength() < 0 || getLength() >4095)
-      return "text error";
+      return strdup("text error"); // caller will delete it!
    char *data=new char(getLength()+1);
-   decodeText(data);
+   decodeText(data, getLength()+1);
    return data;
 }
 
-char *String::getText(char *buffer) {
-   if (getLength() < 0 || getLength() >4095) {
-      strncpy(buffer, "text error", getLength()+1);
+char *String::getText(char *buffer, int size) {
+   if (getLength() < 0 || getLength() >= size) {
+      strncpy(buffer, "text error", size);
+      buffer[size-1] = 0;
       return buffer;
    }
-   decodeText(buffer);
+   decodeText(buffer, size);
    return buffer;
 }
 
 //taken from VDR, Copyright Klaus Schmidinger <kls@cadsoft.de>
-char *String::getText(char *buffer, char *shortVersion) {
-   if (getLength() < 0 || getLength() >4095) {
-      strncpy(buffer, "text error", getLength()+1);
+char *String::getText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion) {
+   if (getLength() < 0 || getLength() >= sizeBuffer) {
+      strncpy(buffer, "text error", sizeBuffer);
+      buffer[sizeBuffer-1] = 0;
+      *shortVersion = 0;
       return buffer;
    }
-   decodeText(buffer, shortVersion);
+   decodeText(buffer, shortVersion, sizeBuffer, sizeShortVersion);
    return buffer;
 }
 
 //taken from libdtv, Copyright Rolf Hakenes <hakenes@hippomi.de>
-void String::decodeText(char *buffer) {
+void String::decodeText(char *buffer, int size) {
    const unsigned char *from=data.getData(0);
    char *to=buffer;
 
@@ -254,11 +257,13 @@ void String::decodeText(char *buffer) {
       else if (*from == 0x8A)
          *to++ = '\n';
       from++;
+      if (to - buffer >= size - 1)
+         break;
    }
    *to = '\0';
 }
 
-void String::decodeText(char *buffer, char *shortVersion) {
+void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion) {
    const unsigned char *from=data.getData(0);
    char *to=buffer;
    char *toShort=shortVersion;
@@ -283,6 +288,8 @@ void String::decodeText(char *buffer, char *shortVersion) {
       else if (*from == 0x87)
          IsShortName--;
       from++;
+      if (to - buffer >= sizeBuffer - 1 || toShort - shortVersion >= sizeShortVersion - 1)
+         break;
    }
    *to = '\0';
    *toShort = '\0';
diff --git a/libsi/si.h b/libsi/si.h
index 195830d61..85d16ed4a 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.9 2004/03/07 10:09:49 kls Exp $
+ *   $Id: si.h 1.10 2004/06/06 13:35:21 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -431,18 +431,18 @@ class String : public VariableLengthPart {
    //so the maximum there is 256.
    //returns the given buffer for convenience.
    //The emphasis marks 0x86 and 0x87 are still available.
-   char *getText(char *buffer);
+   char *getText(char *buffer, int size);
    //The same semantics as for getText(char*) apply.
    //The short version of the text according to ETSI TR 101 211 (chapter 4.6)
    //will be written into the shortVersion buffer (which should, therefore, have the same
    //length as buffer). If no shortVersion is available, shortVersion will contain
    //an empty string.
    //The emphasis marks 0x86 and 0x87 are still available in buffer, but not in shortVersion.
-   char *getText(char *buffer, char *shortVersion);
+   char *getText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
 protected:
    virtual void Parse() {}
-   void decodeText(char *buffer);
-   void decodeText(char *buffer, char *shortVersion);
+   void decodeText(char *buffer, int size);
+   void decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
 };
 
 } //end of namespace
diff --git a/menu.c b/menu.c
index 49cdef4cf..0d013801f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.307 2004/05/29 10:19:22 kls Exp $
+ * $Id: menu.c 1.308 2004/06/06 15:06:28 kls Exp $
  */
 
 #include "menu.h"
@@ -2643,6 +2643,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      }
     };
   if (time_ms() - lastTime < INFOTIMEOUT) {
+     if (!number && group < 0 && channel && channel->Number() != cDevice::CurrentChannel())
+        Refresh(); // makes sure a channel switch through the SVDRP CHAN command is displayed
      DisplayInfo();
      displayChannel->Flush();
      return osContinue;
diff --git a/nit.c b/nit.c
index cf3b674fc..c515c240a 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.7 2004/05/22 15:46:21 kls Exp $
+ * $Id: nit.c 1.8 2004/06/06 14:24:49 kls Exp $
  */
 
 #include "nit.h"
@@ -71,7 +71,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                switch (d->getDescriptorTag()) {
                  case SI::NetworkNameDescriptorTag: {
                       SI::NetworkNameDescriptor *nnd = (SI::NetworkNameDescriptor *)d;
-                      nnd->name.getText(nits[numNits].name);
+                      nnd->name.getText(nits[numNits].name, MAXNETWORKNAME);
                       }
                       break;
                  default: ;
diff --git a/osd.c b/osd.c
index a63d0e15e..ac950ff62 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.48 2004/05/28 15:33:22 kls Exp $
+ * $Id: osd.c 1.52 2004/06/05 16:52:51 kls Exp $
  */
 
 #include "osd.h"
@@ -244,7 +244,7 @@ bool cBitmap::LoadXpm(const char *FileName)
   return Result;
 }
 
-bool cBitmap::SetXpm(char *Xpm[])
+bool cBitmap::SetXpm(char *Xpm[], bool IgnoreNone)
 {
   char **p = Xpm;
   int w, h, n, c;
@@ -257,10 +257,11 @@ bool cBitmap::SetXpm(char *Xpm[])
      return false;
      }
   int b = 0;
-  while (1 << (1 << b) < n)
+  while (1 << (1 << b) < (IgnoreNone ? n - 1 : n))
         b++;
   SetBpp(1 << b);
   SetSize(w, h);
+  int NoneColorIndex = MAXNUMCOLORS;
   for (int i = 0; i < n; i++) {
       const char *s = *++p;
       if (int(strlen(s)) < c) {
@@ -273,14 +274,18 @@ bool cBitmap::SetXpm(char *Xpm[])
          return false;
          }
       s = skipspace(s + 1);
-      if (strcasecmp(s, "none") == 0)
+      if (strcasecmp(s, "none") == 0) {
          s = "#00000000";
+         NoneColorIndex = i;
+         if (IgnoreNone)
+            continue;
+         }
       if (*s != '#') {
          esyslog("ERROR: unknown color code in XPM: '%c'", *s);
          return false;
          }
       tColor color = strtoul(++s, NULL, 16) | 0xFF000000;
-      SetColor(i, color);
+      SetColor((IgnoreNone && i > NoneColorIndex) ? i - 1 : i, color);
       }
   for (int y = 0; y < h; y++) {
       const char *s = *++p;
@@ -295,13 +300,17 @@ bool cBitmap::SetXpm(char *Xpm[])
                  return false;
                  }
               if (strncmp(Xpm[i + 1], s, c) == 0) {
-                 SetIndex(x, y, i);
+                 if (i == NoneColorIndex)
+                    NoneColorIndex = MAXNUMCOLORS;
+                 SetIndex(x, y, (IgnoreNone && i > NoneColorIndex) ? i - 1 : i);
                  break;
                  }
               }
           s += c;
           }
       }
+  if (NoneColorIndex < MAXNUMCOLORS && !IgnoreNone)
+     return SetXpm(Xpm, true);
   return true;
 }
 
@@ -324,7 +333,8 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
 {
   x -= x0;
   y -= y0;
-  SetIndex(x, y, Index(Color));
+  if (0 <= x && x < width && 0 <= y && y < height)
+     SetIndex(x, y, Index(Color));
 }
 
 void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)
@@ -354,7 +364,8 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
         int ch = Height ? Height : h;
         if (!Intersects(x, y, x + cw - 1, y + ch - 1))
            return;
-        DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
+        if (ColorBg != clrTransparent)
+           DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
         limit = x + cw - x0;
         if (Width) {
            if ((Alignment & taLeft) != 0)
@@ -386,7 +397,7 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
      x -= x0;
      y -= y0;
      tIndex fg = Index(ColorFg);
-     tIndex bg = Index(ColorBg);
+     tIndex bg = (ColorBg != clrTransparent) ? Index(ColorBg) : 0;
      while (s && *s) {
            const cFont::tCharData *CharData = Font->CharData(*s++);
            if (limit && int(x + CharData->width) > limit)
@@ -395,7 +406,8 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
               for (int row = 0; row < h; row++) {
                   cFont::tPixelData PixelData = CharData->lines[row];
                   for (int col = CharData->width; col-- > 0; ) {
-                      SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
+                      if (ColorBg != clrTransparent || (PixelData & 1))
+                         SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
                       PixelData >>= 1;
                       }
                   }
diff --git a/osd.h b/osd.h
index 848c68b0a..947e076f2 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.43 2004/05/29 14:02:47 kls Exp $
+ * $Id: osd.h 1.45 2004/06/05 12:38:44 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -136,9 +136,15 @@ class cBitmap : public cPalette {
   bool LoadXpm(const char *FileName);
        ///< Calls SetXpm() with the data from the file FileName.
        ///< Returns true if the operation was successful.
-  bool SetXpm(char *Xpm[]);
+  bool SetXpm(char *Xpm[], bool IgnoreNone = false);
        ///< Sets this bitmap to the given XPM data. Any previous bitmap or
        ///< palette data will be overwritten with the new data.
+       ///< If IgnoreNone is true, a "none" color entry will be ignored.
+       ///< Only set IgnoreNone to true if you know that there is a "none"
+       ///< color entry in the XPM data and that this entry is not used!
+       ///< If SetXpm() is called with IgnoreNone set to false and the XPM
+       ///< data contains an unused "none" entry, it will be automatically
+       ///< called again with IgnoreNone set to true.
        ///< Returns true if the operation was successful.
   void SetIndex(int x, int y, tIndex Index);
        ///< Sets the index at the given coordinates to Index.
@@ -158,7 +164,8 @@ class cBitmap : public cPalette {
        ///< Draws the given string at coordinates (x, y) with the given foreground
        ///< and background color and font. If Width and Height are given, the text
        ///< will be drawn into a rectangle with the given size and the given
-       ///< Alignment (default is top-left).
+       ///< Alignment (default is top-left). If ColorBg is clrTransparent, no
+       ///< background pixels will be drawn, which allows drawing "transparent" text.
   void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
        ///< Draws a filled rectangle defined by the upper left (x1, y1) and lower right
        ///< (x2, y2) corners with the given Color. If the rectangle covers the entire
@@ -276,7 +283,8 @@ class cOsd {
        ///< Draws the given string at coordinates (x, y) with the given foreground
        ///< and background color and font. If Width and Height are given, the text
        ///< will be drawn into a rectangle with the given size and the given
-       ///< Alignment (default is top-left).
+       ///< Alignment (default is top-left). If ColorBg is clrTransparent, no
+       ///< background pixels will be drawn, which allows drawing "transparent" text.
   virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
        ///< Draws a filled rectangle defined by the upper left (x1, y1) and lower right
        ///< (x2, y2) corners with the given Color.
diff --git a/sdt.c b/sdt.c
index 5ac6b4194..247d2c9b7 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.8 2004/03/07 10:46:08 kls Exp $
+ * $Id: sdt.c 1.9 2004/06/06 14:25:22 kls Exp $
  */
 
 #include "sdt.h"
@@ -59,7 +59,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         {
                         char NameBuf[1024];
                         char ShortNameBuf[1024];
-                        sd->serviceName.getText(NameBuf, ShortNameBuf);
+                        sd->serviceName.getText(NameBuf, ShortNameBuf, sizeof(NameBuf), sizeof(ShortNameBuf));
                         char *pn = compactspace(NameBuf);
                         char *ps = compactspace(ShortNameBuf);
                         if (*NameBuf && *ShortNameBuf && strcmp(NameBuf, ShortNameBuf) != 0) {

From eb52e3004a829b73ddea535a881a0161ff19fa55 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 19 Jun 2004 18:00:00 +0200
Subject: [PATCH 103/307] =?UTF-8?q?Version=201.3.11=20-=20In=20order=20to?=
 =?UTF-8?q?=20avoid=20problems=20on=20NPTL=20systems,=20VDR=20now=20checks?=
 =?UTF-8?q?=20for=20the=20presence=20=20=20of=20NPTL=20at=20program=20star?=
 =?UTF-8?q?t,=20and=20if=20it=20is,=20exits=20and=20tells=20the=20user=20t?=
 =?UTF-8?q?o=20do=20=20=20'export=20LD=5FASSUME=5FKERNEL=3D2.4.1'=20before?=
 =?UTF-8?q?=20starting=20VDR.=20-=20Revisited=20the=20"Fixed=20missing=20a?=
 =?UTF-8?q?udio=20after=20replaying=20a=20DVD"=20change=20because=20it=20?=
 =?UTF-8?q?=20=20introduced=20a=20sound=20disturbance=20when=20switching?=
 =?UTF-8?q?=20between=20channels=20on=20the=20same=20=20=20transponder=20(?=
 =?UTF-8?q?thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20In=20order=20?=
 =?UTF-8?q?to=20avoid=20problems=20on=20UTF-8=20systems,=20VDR=20now=20che?=
 =?UTF-8?q?cks=20for=20the=20presence=20=20=20of=20UTF-8=20at=20program=20?=
 =?UTF-8?q?start,=20and=20if=20it=20is,=20exits=20and=20tells=20the=20user?=
 =?UTF-8?q?=20to=20turn=20off=20=20=20UTF-8=20before=20starting=20VDR=20(t?=
 =?UTF-8?q?hanks=20to=20Ludwig=20Nussel=20for=20pointing=20out=20a=20probl?=
 =?UTF-8?q?em=20=20=20with=20systems=20that=20are=20set=20to=20use=20UTF-8?=
 =?UTF-8?q?).=20There=20are=20also=20problems=20in=20case=20the=20=20=20vi?=
 =?UTF-8?q?deo=20partition=20is=20mounted=20with=20"iocharset=3Dutf8"=20(t?=
 =?UTF-8?q?hanks=20to=20J=C3=B6rg=20Knitter=20for=20=20=20reporting=20this?=
 =?UTF-8?q?=20one).=20=20=20Please=20also=20read=20the=20"IMPORTANT=20NOTE?=
 =?UTF-8?q?S"=20section=20in=20the=20INSTALL=20file!=20-=20Some=20changes?=
 =?UTF-8?q?=20to=20the=20SPU=20decoder=20interface=20(thanks=20to=20Sven?=
 =?UTF-8?q?=20Goethel).=20-=20Some=20improvements=20in=20cOsd=20creation?=
 =?UTF-8?q?=20(thanks=20to=20some=20suggestions=20by=20Jouni=20Karvo).=20-?=
 =?UTF-8?q?=20Fixed=20calculating=20the=20OSD=20width=20and=20height=20(th?=
 =?UTF-8?q?anks=20to=20Olaf=20Henkel=20for=20reporting=20=20=20a=20problem?=
 =?UTF-8?q?=20with=20long=20event=20texts=20in=20the=20"Classic=20VDR"=20s?=
 =?UTF-8?q?kin).=20-=20Fixed=20switching=20channels=20while=20an=20encrypt?=
 =?UTF-8?q?ed=20channel=20is=20being=20recorded,=20because=20the=20=20=20c?=
 =?UTF-8?q?hannel=20was=20switched=20if=20the=20new=20channel=20was=20on?=
 =?UTF-8?q?=20the=20same=20transponder=20and=20was=20=20=20a=20radio=20cha?=
 =?UTF-8?q?nnel=20or=20an=20unencrypted=20channel=20(thanks=20to=20Martin?=
 =?UTF-8?q?=20Dauskardt=20for=20reporting=20=20=20this=20one).=20-=20No=20?=
 =?UTF-8?q?longer=20using=20the=20external=20'find'=20command=20to=20scan?=
 =?UTF-8?q?=20the=20video=20directory=20for=20=20=20recordings=20(based=20?=
 =?UTF-8?q?on=20a=20suggestion=20by=20Mirko=20D=C3=B6lle).=20-=20The=20lis?=
 =?UTF-8?q?t=20of=20recordings=20is=20now=20kept=20statically=20in=20memor?=
 =?UTF-8?q?y=20to=20avoid=20long=20delays=20=20=20when=20opening=20the=20"?=
 =?UTF-8?q?Recordings"=20menu.=20As=20a=20side=20effect,=20external=20modi?=
 =?UTF-8?q?fications=20to=20=20=20the=20video=20directory=20are=20no=20lon?=
 =?UTF-8?q?ger=20immediately=20reflected=20in=20the=20"Recordings"=20menu.?=
 =?UTF-8?q?=20=20=20If=20a=20plugin=20manipulates=20the=20video=20director?=
 =?UTF-8?q?y=20in=20any=20way,=20it=20can=20call=20the=20function=20=20=20?=
 =?UTF-8?q?Recordings.TriggerUpdate()=20to=20trigger=20an=20update=20of=20?=
 =?UTF-8?q?the=20list=20of=20recordings.=20=20=20If=20some=20external=20to?=
 =?UTF-8?q?ol=20manipulates=20the=20video=20directory,=20it=20can=20touch?=
 =?UTF-8?q?=20the=20file=20=20=20'.update'=20in=20the=20video=20directory?=
 =?UTF-8?q?=20to=20trigger=20an=20update=20of=20the=20list=20of=20recordin?=
 =?UTF-8?q?gs.=20-=20Fixed=20a=20memory=20leak=20in=20theme=20description?=
 =?UTF-8?q?=20handling=20(thanks=20to=20Sascha=20Volkenandt).=20-=20Added?=
 =?UTF-8?q?=20cDevice::Flush()=20to=20make=20sure=20that=20all=20data=20in?=
 =?UTF-8?q?=20the=20video=20card's=20buffers=20=20=20has=20been=20processe?=
 =?UTF-8?q?d=20(thanks=20to=20Reinhard=20Nissl).=20Currently=20this=20is?=
 =?UTF-8?q?=20not=20yet=20actually=20=20=20implemented=20for=20FF=20DVB=20?=
 =?UTF-8?q?cards.=20-=20Fixed=20handling=20the=20color=20button=20texts=20?=
 =?UTF-8?q?in=20cMenuEditStrItem=20(thanks=20to=20Maynard=20=20=20Cedric?=
 =?UTF-8?q?=20for=20reporting=20this=20one).=20-=20Fixed=20the=20descripti?=
 =?UTF-8?q?on=20of=20cRingBufferLinear=20(thanks=20to=20Ludwig=20Nussel=20?=
 =?UTF-8?q?for=20pointing=20=20=20out=20this=20one).=20-=20Fixed=20cRingBu?=
 =?UTF-8?q?fferLinear::Get()=20in=20case=20the=20buffer=20wraps=20around?=
 =?UTF-8?q?=20(thanks=20to=20Ludwig=20=20=20Nussel=20for=20reporting=20thi?=
 =?UTF-8?q?s=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  24 +++++++++
 HISTORY       |  43 ++++++++++++++++
 INSTALL       |  17 ++++++-
 channels.conf |  23 ++++-----
 config.h      |   6 +--
 cutter.c      |   4 +-
 device.c      |   7 ++-
 device.h      |   8 ++-
 dvbdevice.c   |  17 +++++--
 dvbdevice.h   |   3 +-
 dvbosd.c      |  16 +++++-
 dvbosd.h      |  16 +-----
 dvbplayer.c   |   8 ++-
 dvbspu.h      |   8 +--
 menu.c        |  61 +++++++++++------------
 menu.h        |   4 +-
 menuitems.c   |   4 +-
 osd.c         |  12 +++--
 osd.h         |   6 ++-
 player.h      |   3 +-
 recording.c   | 132 +++++++++++++++++++++++++++++++++++++-------------
 recording.h   |  15 +++++-
 ringbuffer.c  |   3 +-
 ringbuffer.h  |   4 +-
 spu.h         |   5 +-
 svdrp.c       |   6 ++-
 themes.c      |   6 ++-
 tools.c       |  10 +++-
 tools.h       |   3 +-
 vdr.1         |   6 ++-
 vdr.c         |  27 ++++++++++-
 31 files changed, 366 insertions(+), 141 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d6f34f1d3..ace8e91ac 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -376,6 +376,7 @@ Ruben Nunez Francisco <ruben.nunez@tang-it.com>
 Mirko D�lle <mdoelle@linux-user.de>
  for reporting a bug when a timer records over midnight of a day that had a
  change in Daylight Saving Time
+ for suggesting to avoid the external 'find' command to scan the video directory
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -639,6 +640,7 @@ Sven Goethel <sgoethel@jausoft.com>
  for making switching audio channels work without stopping/restarting the DMX
  for fixing initializing the highlight area in cDvbSpuDecoder
  for suggesting to add cDevice::GetSTC()
+ for making some changes to the SPU decoder interface
 
 Jan Rieger <jan@ricomp.de>
  for suggestions and testing raw keyboard input
@@ -718,6 +720,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for suggesting to allow drawing "transparent" texts
  for suggesting to ignore unused "none" color entries in XPM files written by
  some broken graphics tools
+ for fixing a memory leak in theme description handling
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -730,6 +733,9 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for reporting a problem with the LIRC remote control trying to learn keys even if it
  couldn't connect to the LIRC daemon
  for making the plugin library directory configurable via Make.config
+ for reporting a problem on systems that have UTF-8 enabled
+ for pointing out a flaw in the the description of cRingBufferLinear
+ for reporting a bug in cRingBufferLinear::Get() in case the buffer wraps around
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -850,6 +856,8 @@ Reinhard Nissl <rnissl@gmx.de>
  when using other libraries that also implement a function by that name
  for reporting a bug in handling ':' characters in channel names when reading
  channels.conf
+ for adding cDevice::Flush() to make sure that all data in the video card's buffers
+ has been processed
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1024,3 +1032,19 @@ J
 
 Philip Lawatsch <philip@lawatsch.at>
  for debugging a buffer overflow in eit.c
+
+Jouni Karvo <kex@netlab.hut.fi>
+ for suggesting to make the cOsd constructor 'protected'
+
+Olaf Henkel <olafhenkel@t-online.de>
+ for reporting a problem with long event texts in the "Classic VDR" skin
+
+Martin Dauskardt <md001@gmx.de>
+ for reporting a problem with switching channels while an encrypted channel is being
+ recorded
+
+Maynard Cedric <maynard.cedric@wanadoo.fr>
+ for reporting a problem in handling the color button texts in cMenuEditStrItem
+
+J�rg Knitter <joerg.knitter@gmx.de>
+ for reporting a problem in case the video partition is mounted with "iocharset=utf8"
diff --git a/HISTORY b/HISTORY
index 56cae9d2e..322213bcb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2892,3 +2892,46 @@ Video Disk Recorder Revision History
 - Modified 'libsi' to require callers to state the buffer sizes when getting
   strings in order to avoid buffer overflows (thanks to Philip Lawatsch for
   debugging a buffer overflow in eit.c).
+
+2004-06-19: Version 1.3.11
+
+- In order to avoid problems on NPTL systems, VDR now checks for the presence
+  of NPTL at program start, and if it is, exits and tells the user to do
+  'export LD_ASSUME_KERNEL=2.4.1' before starting VDR.
+- Revisited the "Fixed missing audio after replaying a DVD" change because it
+  introduced a sound disturbance when switching between channels on the same
+  transponder (thanks to Marco Schl��ler).
+- In order to avoid problems on UTF-8 systems, VDR now checks for the presence
+  of UTF-8 at program start, and if it is, exits and tells the user to turn off
+  UTF-8 before starting VDR (thanks to Ludwig Nussel for pointing out a problem
+  with systems that are set to use UTF-8). There are also problems in case the
+  video partition is mounted with "iocharset=utf8" (thanks to J�rg Knitter for
+  reporting this one).
+  Please also read the "IMPORTANT NOTES" section in the INSTALL file!
+- Some changes to the SPU decoder interface (thanks to Sven Goethel).
+- Some improvements in cOsd creation (thanks to some suggestions by Jouni Karvo).
+- Fixed calculating the OSD width and height (thanks to Olaf Henkel for reporting
+  a problem with long event texts in the "Classic VDR" skin).
+- Fixed switching channels while an encrypted channel is being recorded, because the
+  channel was switched if the new channel was on the same transponder and was
+  a radio channel or an unencrypted channel (thanks to Martin Dauskardt for reporting
+  this one).
+- No longer using the external 'find' command to scan the video directory for
+  recordings (based on a suggestion by Mirko D�lle).
+- The list of recordings is now kept statically in memory to avoid long delays
+  when opening the "Recordings" menu. As a side effect, external modifications to
+  the video directory are no longer immediately reflected in the "Recordings" menu.
+  If a plugin manipulates the video directory in any way, it can call the function
+  Recordings.TriggerUpdate() to trigger an update of the list of recordings.
+  If some external tool manipulates the video directory, it can touch the file
+  '.update' in the video directory to trigger an update of the list of recordings.
+- Fixed a memory leak in theme description handling (thanks to Sascha Volkenandt).
+- Added cDevice::Flush() to make sure that all data in the video card's buffers
+  has been processed (thanks to Reinhard Nissl). Currently this is not yet actually
+  implemented for FF DVB cards.
+- Fixed handling the color button texts in cMenuEditStrItem (thanks to Maynard
+  Cedric for reporting this one).
+- Fixed the description of cRingBufferLinear (thanks to Ludwig Nussel for pointing
+  out this one).
+- Fixed cRingBufferLinear::Get() in case the buffer wraps around (thanks to Ludwig
+  Nussel for reporting this one).
diff --git a/INSTALL b/INSTALL
index 012dd9460..f054d7ab3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,8 @@ Installation of the Video Disk Recorder
 Version 1.3
 -----------
 
-IMPORTANT NOTE:
----------------
+IMPORTANT NOTES:
+----------------
 
 VDR currently doesn't work with NPTL ("Native Posix Thread Library").
 Either don't use NPTL, or set the environment variable
@@ -14,6 +14,19 @@ Either don't use NPTL, or set the environment variable
   
 before running VDR.
 
+Also, please make sure your environment is NOT set to use UTF-8 or
+any other multibyte character representation. Check the value of your
+$LANG or $LC_CTYPE environment variable, and if it contains something
+like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"
+or whatever single byte character mode you want. If you run VDR with
+UTF-8 enabled, it may crash in case it encounters EPG or channel data
+that contains non-7-bit ASCII characters. Another problem may occur if
+you have mounted your video partition with "iocharset=utf8". In that case
+recordings that contain umlauts or other non-seven-bit ASCII characters
+may be displayed wrong, or not at all. Please make sure you mount your
+video partition with "iocharset=iso8859-1" or whatever single byte character
+mode you want.
+
 Compiling and running the program:
 ----------------------------------
 
diff --git a/channels.conf b/channels.conf
index 8ce691731..5a36b9e49 100644
--- a/channels.conf
+++ b/channels.conf
@@ -28,7 +28,7 @@ HSE24:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
 Bloomberg TV Germany:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
-Sky News Intl:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
+Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 CNBC Europe:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
@@ -45,13 +45,13 @@ MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1702,1722:10:133:2:0
+PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
 PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
-PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
-PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
+PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1801,1702:29:133:2:0
+PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1722,1801,1702:41:133:2:0
+PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
 DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
 :Premiere Direkt
 DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
@@ -59,8 +59,8 @@ DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0
 B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
 EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
+F1-Portal:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
+SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu:32:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
 Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -95,14 +95,14 @@ ITV2:10906:vC56:S28.2E:22000:2348:2349=eng,2350=eng:2351:960,961:10240:2:2054:0
 Sci-Fi:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
 Paramount:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
 Discovery:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0
-Sky Movies 1:11836:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR;2313=eng:2312:960,961:4303:2:2007:0
-Sky Movies 2:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2323=eng:2308:960,961:4302:2:2007:0
-Sky Movies 3:11836:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR;2318=eng:2317:960,961:4403:2:2007:0
+Sky Movies 1:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
+Sky Movies 2:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
+Sky Movies 3:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0
 Sky Movies 4:11914:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR:2308:960,961:4402:2:2011:0
 Sky Movies 5:11914:hC23:S28.2E:27500:2313+2304:2314=eng,2315=NAR:2316:960,961:4503:2:2011:0
 Sky Movies 6:11914:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR:2312:960,961:4502:2:2011:0
 Sky Movies 7:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
-Sky Movies 8:11836:hC23:S28.2E:27500:2319+2304:2320=eng,2321=NAR:2322:960,961:5502:2:2007:0
+Sky Movies 8:11836:hC23:S28.2E:27500:2320+2304:2321=eng,2322=NAR:2323:960,961:5502:2:2007:0
 Sky Movies 9:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
 Sky Cinema 1:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
 Sky Cinema 2:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
@@ -116,4 +116,5 @@ CNN:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
 AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
+Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
 :@1000 New channels
diff --git a/config.h b/config.h
index f9d501640..60c50a6dc 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.197 2004/06/05 10:06:50 kls Exp $
+ * $Id: config.h 1.198 2004/06/10 13:18:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.10"
-#define VDRVERSNUM   10310  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.11"
+#define VDRVERSNUM   10311  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index 25169a2a7..c8ed60ecb 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.6 2003/10/18 11:29:37 kls Exp $
+ * $Id: cutter.c 1.7 2004/06/13 16:04:08 kls Exp $
  */
 
 #include "cutter.h"
@@ -205,6 +205,7 @@ bool cCutter::Start(const char *FileName)
         // XXX
         editedVersionName = strdup(evn);
         Recording.WriteSummary();
+        Recordings.AddByName(editedVersionName);
         cuttingThread = new cCuttingThread(FileName, editedVersionName);
         return true;
         }
@@ -224,6 +225,7 @@ void cCutter::Stop(void)
      if (Error)
         esyslog("ERROR: '%s' during editing process", Error);
      RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed?
+     Recordings.DelByName(editedVersionName);
      }
 }
 
diff --git a/device.c b/device.c
index 0c2b76dcd..d62b45635 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.55 2004/05/16 12:14:47 kls Exp $
+ * $Id: device.c 1.56 2004/06/19 08:51:05 kls Exp $
  */
 
 #include "device.h"
@@ -619,6 +619,11 @@ bool cDevice::Poll(cPoller &Poller, int TimeoutMs)
   return false;
 }
 
+bool cDevice::Flush(int TimeoutMs)
+{
+  return true;
+}
+
 int cDevice::PlayVideo(const uchar *Data, int Length)
 {
   return -1;
diff --git a/device.h b/device.h
index 6f0f70a72..10bca28c2 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.43 2004/05/23 10:10:08 kls Exp $
+ * $Id: device.h 1.44 2004/06/19 08:50:37 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -373,6 +373,12 @@ class cDevice : public cThread {
        ///< If TimeoutMs is not zero, the device will wait up to the given number
        ///< of milleseconds before returning in case there is no immediate
        ///< need for data.
+  virtual bool Flush(int TimeoutMs = 0);
+       ///< Returns true if the device's output buffers are empty, i. e. any
+       ///< data which was bufferd so far has been processed.
+       ///< If TimeoutMs is not zero, the device will wait up to the given
+       ///< number of milliseconds before returning in case there is still
+       ///< data in the buffers..
   virtual int PlayVideo(const uchar *Data, int Length);
        ///< Actually plays the given data block as video. The data must be
        ///< part of a PES (Packetized Elementary Stream) which can contain
diff --git a/dvbdevice.c b/dvbdevice.c
index e5b777dc2..833480132 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.89 2004/06/06 11:28:28 kls Exp $
+ * $Id: dvbdevice.c 1.93 2004/06/19 09:33:42 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -682,9 +682,9 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
-           if (!HasPid(Channel->Vpid())) {
+           if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid1() && !HasPid(Channel->Apid1())) {
 #ifdef DO_MULTIPLE_RECORDINGS
-              if (Channel->Ca() > CACONFBASE)
+              if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE)
                  needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels
                                         || Ca() != Channel->Ca();
               else if (!IsPrimaryDevice())
@@ -766,9 +766,10 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
         }
      if (IsPrimaryDevice())
         AddPid(Channel->Tpid(), ptTeletext);
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schl��ler <marco@lordzodiac.de> this works
+                                                   // to avoid missing audio after replaying a DVD; with 'false' there is an audio disturbance when switching
+                                                   // between two channels on the same transponder on DVB-S
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
      }
   else if (StartTransferMode)
      cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));
@@ -1068,6 +1069,12 @@ bool cDvbDevice::Poll(cPoller &Poller, int TimeoutMs)
   return Poller.Poll(TimeoutMs);
 }
 
+bool cDvbDevice::Flush(int TimeoutMs)
+{
+  //TODO actually this function should wait until all buffered data has been processed by the card, but how?
+  return true;
+}
+
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
   int fd = (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video;
diff --git a/dvbdevice.h b/dvbdevice.h
index 2c5bd8eb1..f7a4b925d 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.27 2004/04/17 11:56:22 kls Exp $
+ * $Id: dvbdevice.h 1.28 2004/06/19 08:51:33 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -115,6 +115,7 @@ class cDvbDevice : public cDevice {
   virtual void Mute(void);
   virtual void StillPicture(const uchar *Data, int Length);
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
+  virtual bool Flush(int TimeoutMs = 0);
   virtual int PlayVideo(const uchar *Data, int Length);
   virtual void PlayAudio(const uchar *Data, int Length);
 
diff --git a/dvbosd.c b/dvbosd.c
index d21bcefb9..8056499fd 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,13 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.22 2004/05/01 15:10:44 kls Exp $
+ * $Id: dvbosd.c 1.23 2004/06/12 13:10:03 kls Exp $
  */
 
 #include "dvbosd.h"
+#include <linux/dvb/osd.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/unistd.h>
+#include "dvbdevice.h"
 #include "tools.h"
 
 // --- cDvbOsd ---------------------------------------------------------------
@@ -18,6 +20,18 @@
 #define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
 #define MAXOSDMEMORY  92000 // number of bytes available to the OSD (depends on firmware version, but there is no way of determining the actual value)
 
+class cDvbOsd : public cOsd {
+private:
+  int osdDev;
+  bool shown;
+  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
+public:
+  cDvbOsd(int Left, int Top, int OsdDev);
+  virtual ~cDvbOsd();
+  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+  virtual void Flush(void);
+  };
+
 cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
 :cOsd(Left, Top)
 {
diff --git a/dvbosd.h b/dvbosd.h
index bac43f510..752b9fa1a 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,28 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.17 2004/04/30 13:44:16 kls Exp $
+ * $Id: dvbosd.h 1.18 2004/06/12 13:09:52 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
-#include <linux/dvb/osd.h>
-#include "dvbdevice.h"
 #include "osd.h"
 
-class cDvbOsd : public cOsd {
-private:
-  int osdDev;
-  bool shown;
-  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
-public:
-  cDvbOsd(int Left, int Top, int OsdDev);
-  virtual ~cDvbOsd();
-  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-  virtual void Flush(void);
-  };
-
 class cDvbOsdProvider : public cOsdProvider {
 private:
   int osdDev;
diff --git a/dvbplayer.c b/dvbplayer.c
index c3bd542d4..8b60c2e18 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.23 2003/10/18 11:31:54 kls Exp $
+ * $Id: dvbplayer.c 1.24 2004/06/19 08:55:49 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -418,7 +418,7 @@ void cDvbPlayer::Action(void)
   int AudioTrack = 0; // -1 = any, 0 = none, >0 = audioTrack
 
   running = true;
-  while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
+  while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
         cPoller Poller;
         if (DevicePoll(Poller, 100)) {
 
@@ -438,6 +438,10 @@ void cDvbPlayer::Action(void)
                              continue;
                           }
                        else {
+                          // hit begin of recording: wait for device buffers to drain
+                          // before changing play mode:
+                          if (!DeviceFlush(100))
+                             continue;
                           // can't call Play() here, because those functions may only be
                           // called from the foreground thread - and we also don't need
                           // to empty the buffer here
diff --git a/dvbspu.h b/dvbspu.h
index df717c1b6..e0f3d0c6d 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.4 2004/05/31 08:49:20 kls Exp $
+ * $Id: dvbspu.h 1.5 2004/06/12 12:57:55 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -132,9 +132,6 @@ class cDvbSpuDecoder:public cSpuDecoder {
     int ScaleYres(int value);
     void DrawBmp(sDvbSpuRect & size, cBitmap * bmp);
 
-    void Draw();
-    void Hide();
-
   public:
     cDvbSpuDecoder();
     ~cDvbSpuDecoder();
@@ -147,6 +144,9 @@ class cDvbSpuDecoder:public cSpuDecoder {
                       uint32_t palette);
     void clearHighlight(void);
     void Empty(void);
+    void Hide(void);
+    void Draw(void);
+    bool IsVisible(void) { return osd != NULL; }
     void processSPU(uint32_t pts, uint8_t * buf);
 };
 
diff --git a/menu.c b/menu.c
index 0d013801f..95d725365 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.308 2004/06/06 15:06:28 kls Exp $
+ * $Id: menu.c 1.309 2004/06/13 20:26:51 kls Exp $
  */
 
 #include "menu.h"
@@ -1410,7 +1410,6 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 
 // --- cMenuRecordings -------------------------------------------------------
 
-cRecordings cMenuRecordings::Recordings;
 int cMenuRecordings::helpKeys = -1;
 
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
@@ -1419,40 +1418,35 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
+  const char *LastReplayed = cReplayControl::LastReplayed();
+  cMenuRecordingItem *LastItem = NULL;
+  char *LastItemText = NULL;
   if (!Base)
-     Skins.Message(mtStatus, tr("scanning recordings..."));
-  bool Loaded = Base || Recordings.Load();
-  if (!Base)
-     Skins.Message(mtStatus, NULL);
-  if (Loaded) {
-     const char *LastReplayed = cReplayControl::LastReplayed();
-     cMenuRecordingItem *LastItem = NULL;
-     char *LastItemText = NULL;
-     for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
-         if (!Base || (strstr(recording->Name(), Base) == recording->Name() && recording->Name()[strlen(Base)] == '~')) {
-            cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-            if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
-               Add(Item);
-               LastItem = Item;
-               free(LastItemText);
-               LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
-               }
-            else
-               delete Item;
-            if (LastItem) {
-               if (LastReplayed && strcmp(LastReplayed, recording->FileName()) == 0)
-                  SetCurrent(LastItem);
-               if (LastItem->IsDirectory())
-                  LastItem->IncrementCounter(recording->IsNew());
-               }
+     Recordings.Sort();
+  for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
+      if (!Base || (strstr(recording->Name(), Base) == recording->Name() && recording->Name()[strlen(Base)] == '~')) {
+         cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
+         if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
+            Add(Item);
+            LastItem = Item;
+            free(LastItemText);
+            LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
+            }
+         else
+            delete Item;
+         if (LastItem) {
+            if (LastReplayed && strcmp(LastReplayed, recording->FileName()) == 0)
+               SetCurrent(LastItem);
+            if (LastItem->IsDirectory())
+               LastItem->IncrementCounter(recording->IsNew());
             }
          }
-     free(LastItemText);
-     if (Current() < 0)
-        SetCurrent(First());
-     else if (OpenSubMenus && Open(true))
-        return;
-     }
+      }
+  free(LastItemText);
+  if (Current() < 0)
+     SetCurrent(First());
+  else if (OpenSubMenus && Open(true))
+     return;
   SetHelpKeys();
 }
 
@@ -2780,6 +2774,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         cStatus::MsgRecording(device, Recording.Name());
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName, Recording.Name());
+        Recordings.AddByName(fileName);
         }
      else
         DELETENULL(recorder);
diff --git a/menu.h b/menu.h
index 150f88de8..5990a2ea9 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.63 2004/05/23 09:47:26 kls Exp $
+ * $Id: menu.h 1.64 2004/06/13 11:46:03 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -16,7 +16,6 @@
 #include "osdbase.h"
 #include "dvbplayer.h"
 #include "recorder.h"
-#include "recording.h"
 #include "skins.h"
 
 class cMenuText : public cOsdMenu {
@@ -107,7 +106,6 @@ class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
 private:
-  static cRecordings Recordings;
   char *base;
   int level;
   static int helpKeys;
diff --git a/menuitems.c b/menuitems.c
index 3f835878a..ee92dc9f7 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.18 2004/05/16 12:47:02 kls Exp $
+ * $Id: menuitems.c 1.19 2004/06/19 09:45:45 kls Exp $
  */
 
 #include "menuitems.h"
@@ -331,8 +331,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  if (pos >= 0) {
                     insert = !insert;
                     newchar = true;
+                    SetHelpKeys();
                     }
-                 SetHelpKeys();
                  break;
     case kYellow|k_Repeat:
     case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
diff --git a/osd.c b/osd.c
index ac950ff62..d87bee3e8 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.52 2004/06/05 16:52:51 kls Exp $
+ * $Id: osd.c 1.55 2004/06/15 20:29:42 kls Exp $
  */
 
 #include "osd.h"
@@ -622,8 +622,8 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
         width = height = 0;
         for (int i = 0; i < NumAreas; i++) {
             bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
-            width = max(width, Areas[i].x2);
-            height = max(height, Areas[i].y2);
+            width = max(width, Areas[i].x2 + 1);
+            height = max(height, Areas[i].y2 + 1);
             }
         }
      }
@@ -713,6 +713,10 @@ cOsdProvider::~cOsdProvider()
 
 cOsd *cOsdProvider::NewOsd(int Left, int Top)
 {
+  if (cOsd::IsOpen()) {
+     esyslog("ERROR: attempt to open OSD while it is already open!");
+     return NULL;
+     }
   if (osdProvider)
      return osdProvider->CreateOsd(Left, Top);
   esyslog("ERROR: no OSD provider available - using dummy OSD!");
@@ -769,7 +773,7 @@ void cTextScroller::DrawText(void)
 {
   if (osd) {
      for (int i = 0; i < shown; i++)
-          osd->DrawText(left, top + i * font->Height(), textWrapper.GetLine(offset + i), colorFg, colorBg, font, width);
+         osd->DrawText(left, top + i * font->Height(), textWrapper.GetLine(offset + i), colorFg, colorBg, font, width);
      }
 }
 
diff --git a/osd.h b/osd.h
index 947e076f2..172c47576 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.45 2004/06/05 12:38:44 kls Exp $
+ * $Id: osd.h 1.46 2004/06/12 13:14:48 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -208,13 +208,14 @@ struct tArea {
 #define MAXOSDAREAS 16
 
 class cOsd {
+  friend class cOsdProvider;
 private:
   static bool isOpen;
   cBitmap *savedRegion;
   cBitmap *bitmaps[MAXOSDAREAS];
   int numBitmaps;
   int left, top, width, height;
-public:
+protected:
   cOsd(int Left, int Top);
        ///< Initializes the OSD with the given coordinates.
        ///< By default it is assumed that the full area will be able to display
@@ -231,6 +232,7 @@ class cOsd {
        ///< and should require only the minimum necessary color depth. This is
        ///< because a derived cOsd class may or may not be able to handle more
        ///< than one area.
+public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
   static bool IsOpen(void) { return isOpen; }
diff --git a/player.h b/player.h
index 85b7bd135..8c5392aea 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.11 2004/04/30 13:45:59 kls Exp $
+ * $Id: player.h 1.12 2004/06/19 08:53:07 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -20,6 +20,7 @@ class cPlayer {
   ePlayMode playMode;
 protected:
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
+  bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
   void DeviceClear(void) { if (device) device->Clear(); }
   void DevicePlay(void) { if (device) device->Play(); }
diff --git a/recording.c b/recording.c
index 05efc4404..cbc916a28 100644
--- a/recording.c
+++ b/recording.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.87 2004/05/07 14:24:18 kls Exp $
+ * $Id: recording.c 1.88 2004/06/13 20:25:19 kls Exp $
  */
 
 #include "recording.h"
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -25,7 +26,7 @@
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
 /* This was the original code, which works fine in a Linux only environment.
-   Unfortunately, because of windows and its brain dead file system, we have
+   Unfortunately, because of Windows and its brain dead file system, we have
    to use a more complicated approach, in order to allow users who have enabled
    the VFAT compile time option to see their recordings even if they forget to
    enable VFAT when compiling a new version of VDR... Gee, do I hate Windows.
@@ -47,8 +48,6 @@
 #define SUMMARYFILESUFFIX "/summary.vdr"
 #define MARKSFILESUFFIX   "/marks.vdr"
 
-#define FINDCMD      "cd '%s' && find '%s' -follow -type d -name '%s' 2> /dev/null"
-
 #define MINDISKSPACE 1024 // MB
 
 #define DELETEDLIFETIME     1 // hours after which a deleted recording will be actually removed
@@ -70,14 +69,14 @@ void RemoveDeletedRecordings(void)
      if (!LockFile.Lock())
         return;
      // Remove the oldest file that has been "deleted":
-     cRecordings Recordings;
-     if (Recordings.Load(true)) {
-        cRecording *r = Recordings.First();
+     cRecordings DeletedRecordings(true);
+     if (DeletedRecordings.Load()) {
+        cRecording *r = DeletedRecordings.First();
         cRecording *r0 = r;
         while (r) {
               if (r->start < r0->start)
                  r0 = r;
-              r = Recordings.Next(r);
+              r = DeletedRecordings.Next(r);
               }
         if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 3600) {
            r0->Remove();
@@ -105,14 +104,14 @@ void AssertFreeDiskSpace(int Priority)
            return;
         // Remove the oldest file that has been "deleted":
         isyslog("low disk space while recording, trying to remove a deleted recording...");
-        cRecordings Recordings;
-        if (Recordings.Load(true)) {
-           cRecording *r = Recordings.First();
+        cRecordings DeletedRecordings(true);
+        if (DeletedRecordings.Load()) {
+           cRecording *r = DeletedRecordings.First();
            cRecording *r0 = r;
            while (r) {
                  if (r->start < r0->start)
                     r0 = r;
-                 r = Recordings.Next(r);
+                 r = DeletedRecordings.Next(r);
                  }
            if (r0 && r0->Remove()) {
               LastFreeDiskCheck += REMOVELATENCY / Factor;
@@ -121,7 +120,7 @@ void AssertFreeDiskSpace(int Priority)
            }
         // No "deleted" files to remove, so let's see if we can delete a recording:
         isyslog("...no deleted recording found, trying to delete an old recording...");
-        if (Recordings.Load(false)) {
+        if (Recordings.Load()) {
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
@@ -138,8 +137,10 @@ void AssertFreeDiskSpace(int Priority)
                     }
                  r = Recordings.Next(r);
                  }
-           if (r0 && r0->Delete())
+           if (r0 && r0->Delete()) {
+              Recordings.Del(r0);
               return;
+              }
            }
         // Unable to free disk space, but there's nothing we can do about that...
         isyslog("...no old recording found, giving up");
@@ -617,30 +618,75 @@ bool cRecording::Remove(void)
 
 // --- cRecordings -----------------------------------------------------------
 
-bool cRecordings::Load(bool Deleted)
+cRecordings Recordings;
+
+cRecordings::cRecordings(bool Deleted)
 {
-  Clear();
-  bool result = false;
-  char *cmd = NULL;
-  asprintf(&cmd, FINDCMD, VideoDirectory, VideoDirectory, Deleted ? "*" DELEXT : "*" RECEXT);
-  FILE *p = popen(cmd, "r");
-  if (p) {
-     char *s;
-     while ((s = readline(p)) != NULL) {
-           cRecording *r = new cRecording(s);
-           if (r->Name())
-              Add(r);
-           else
-              delete r;
+  deleted = Deleted;
+  lastUpdate = 0;
+}
+
+bool cRecordings::ScanVideoDir(const char *DirName)
+{
+  DIR *d = opendir(DirName);
+  if (d) {
+     struct dirent *e;
+     while ((e = readdir(d)) != NULL) {
+           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+              char *buffer;
+              asprintf(&buffer, "%s/%s", DirName, e->d_name);
+              struct stat st;
+              if (stat(buffer, &st) == 0) {
+                 if (S_ISLNK(st.st_mode)) {
+                    free(buffer);
+                    buffer = ReadLink(buffer);
+                    if (!buffer)
+                       return false;
+                    if (stat(buffer, &st) != 0) {
+                       LOG_ERROR_STR(DirName);
+                       return false;
+                       }
+                    }
+                 if (S_ISDIR(st.st_mode)) {
+                    if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
+                       cRecording *r = new cRecording(buffer);
+                       if (r->Name())
+                          Add(r);
+                       else
+                          delete r;
+                       }
+                    else if (!ScanVideoDir(buffer))
+                       return false;
+                    }
+                 }
+              else {
+                 LOG_ERROR_STR(DirName);
+                 return false;
+                 }
+              free(buffer);
+              }
            }
-     pclose(p);
-     Sort();
-     result = Count() > 0;
+     closedir(d);
      }
-  else
-     Skins.Message(mtError, "Error while opening pipe!");
-  free(cmd);
-  return result;
+  else {
+     LOG_ERROR_STR(DirName);
+     return false;
+     }
+  return true;
+}
+
+bool cRecordings::NeedsUpdate(void)
+{
+  return lastUpdate <= LastModifiedTime(AddDirectory(VideoDirectory, ".update"));
+}
+
+bool cRecordings::Load(void)
+{
+  lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
+  Clear();
+  ScanVideoDir(VideoDirectory);
+  Sort();
+  return Count() > 0;
 }
 
 cRecording *cRecordings::GetByName(const char *FileName)
@@ -652,6 +698,22 @@ cRecording *cRecordings::GetByName(const char *FileName)
   return NULL;
 }
 
+void cRecordings::AddByName(const char *FileName)
+{
+  cRecording *recording = GetByName(FileName);
+  if (!recording) {
+     recording = new cRecording(FileName);
+     Add(recording);
+     }
+}
+
+void cRecordings::DelByName(const char *FileName)
+{
+  cRecording *recording = GetByName(FileName);
+  if (recording)
+     Del(recording);
+}
+
 // --- cMark -----------------------------------------------------------------
 
 char *cMark::buffer = NULL;
diff --git a/recording.h b/recording.h
index 01a25ab41..04a1885bf 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.29 2004/05/07 14:24:22 kls Exp $
+ * $Id: recording.h 1.30 2004/06/13 15:37:42 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -69,11 +69,22 @@ class cRecording : public cListObject {
   };
 
 class cRecordings : public cList<cRecording> {
+private:
+  bool deleted;
+  time_t lastUpdate;
+  bool ScanVideoDir(const char *DirName);
 public:
-  bool Load(bool Deleted = false);
+  cRecordings(bool Deleted = false);
+  bool Load(void);
+  void TriggerUpdate(void) { lastUpdate = 0; }
+  bool NeedsUpdate(void);
   cRecording *GetByName(const char *FileName);
+  void AddByName(const char *FileName);
+  void DelByName(const char *FileName);
   };
 
+extern cRecordings Recordings;
+
 class cMark : public cListObject {
 private:
   static char *buffer;
diff --git a/ringbuffer.c b/ringbuffer.c
index 6f26748a7..b52c37e5f 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.19 2004/03/07 13:46:51 kls Exp $
+ * $Id: ringbuffer.c 1.20 2004/06/19 12:27:56 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -181,6 +181,7 @@ uchar *cRingBufferLinear::Get(int &Count)
      int t = margin - rest;
      memcpy(buffer + t, buffer + tail, rest);
      tail = t;
+     rest = head - tail;
      }
   int diff = head - tail;
   int cont = (diff >= 0) ? diff : Size() + diff - margin;
diff --git a/ringbuffer.h b/ringbuffer.h
index 349096fe8..f4074886c 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.14 2004/03/07 13:40:45 kls Exp $
+ * $Id: ringbuffer.h 1.15 2004/06/19 10:32:15 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -54,7 +54,7 @@ class cRingBufferLinear : public cRingBuffer {
 public:
   cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false);
     ///< Creates a linear ring buffer.
-    ///< The buffer will be able to hold at most Size bytes of data, and will
+    ///< The buffer will be able to hold at most Size-Margin-1 bytes of data, and will
     ///< be guaranteed to return at least Margin bytes in one consecutive block.
   virtual ~cRingBufferLinear();
   virtual int Available(void);
diff --git a/spu.h b/spu.h
index 1ccc74b99..053cf1a9d 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 1.1 2002/09/08 14:17:51 kls Exp $
+ * $Id: spu.h 1.2 2004/06/12 12:56:27 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
@@ -32,6 +32,9 @@ class cSpuDecoder {
                               uint32_t palette) = 0;
     virtual void clearHighlight(void) = 0;
     virtual void Empty(void) = 0;
+    virtual void Hide(void) = 0;
+    virtual void Draw(void) = 0;
+    virtual bool IsVisible(void) = 0;
     virtual void processSPU(uint32_t pts, uint8_t * buf) = 0;
 };
 
diff --git a/svdrp.c b/svdrp.c
index 63126f51e..87f146e52 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.62 2004/03/25 17:00:23 kls Exp $
+ * $Id: svdrp.c 1.63 2004/06/13 13:38:38 kls Exp $
  */
 
 #include "svdrp.h"
@@ -504,8 +504,10 @@ void cSVDRP::CmdDELR(const char *Option)
      if (isnumber(Option)) {
         cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
-           if (recording->Delete())
+           if (recording->Delete()) {
               Reply(250, "Recording \"%s\" deleted", Option);
+              ::Recordings.Load(); // must make sure the global recordings list is updated
+              }
            else
               Reply(554, "Error while deleting recording!");
            }
diff --git a/themes.c b/themes.c
index 1b6adf9d0..0a9b951d8 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.2 2004/05/22 10:30:06 kls Exp $
+ * $Id: themes.c 1.3 2004/06/18 15:05:07 kls Exp $
  */
 
 #include "themes.h"
@@ -114,8 +114,10 @@ bool cTheme::Load(const char *FileName, bool OnlyDescriptions)
                     char *l = strchr(n, '.');
                     if (l)
                        lang = I18nLanguageIndex(++l);
-                    if (lang >= 0)
+                    if (lang >= 0) {
+                       free(descriptions[lang]);
                        descriptions[lang] = strdup(v);
+                       }
                     else
                        error = "invalid language code";
                     }
diff --git a/tools.c b/tools.c
index 42193b2f5..0f42182e1 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.79 2004/05/22 12:13:27 kls Exp $
+ * $Id: tools.c 1.80 2004/06/13 14:36:41 kls Exp $
  */
 
 #include "tools.h"
@@ -481,6 +481,14 @@ bool SpinUpDisk(const char *FileName)
   return false;
 }
 
+time_t LastModifiedTime(const char *FileName)
+{
+  struct stat fs;
+  if (stat(FileName, &fs) == 0)
+     return fs.st_mtime;
+  return 0;
+}
+
 const char *WeekDayName(int WeekDay)
 {
   static char buffer[4];
diff --git a/tools.h b/tools.h
index 2132d0016..071e35e0f 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.56 2004/05/22 12:11:44 kls Exp $
+ * $Id: tools.h 1.57 2004/06/13 14:13:26 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -83,6 +83,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
+time_t LastModifiedTime(const char *FileName);
 const char *WeekDayName(int WeekDay); ///< \warning returns a statically allocated string!
 const char *WeekDayName(time_t t); ///< \warning returns a statically allocated string!
 const char *DayDateTime(time_t t = 0); ///< \warning returns a statically allocated string!
diff --git a/vdr.1 b/vdr.1
index b519f9d92..106b1d3fe 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.10 2004/05/16 12:10:52 kls Exp $
+.\" $Id: vdr.1 1.11 2004/06/13 14:48:03 kls Exp $
 .\"
 .TH vdr 1 "1 June 2003" "1.2.0" "Video Disk Recorder"
 .SH NAME
@@ -176,6 +176,10 @@ The actual data files of a recording.
 .I epg.data
 Contains all current EPG data. Can be used for external processing and will
 also be read at program startup to have the full EPG data available immediately.
+.TP
+.I .update
+If this file is present in the video directory, its last modification time will
+be used to trigger an update of the list of recordings in the "Recordings" menu.
 .SH SEE ALSO
 .BR vdr (5)
 .SH AUTHOR
diff --git a/vdr.c b/vdr.c
index 20820549b..fc1f9e092 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.181 2004/05/16 10:12:43 kls Exp $
+ * $Id: vdr.c 1.184 2004/06/13 13:52:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -84,6 +84,25 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
+#ifdef _CS_GNU_LIBPTHREAD_VERSION
+  // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
+  char LibPthreadVersion[128];
+  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion) > 0)) {
+     if (strstr(LibPthreadVersion, "NPTL")) {
+        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
+        return 2;
+        }
+     }
+#endif
+
+  // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
+  char *LangEnv;
+  if ((LangEnv = getenv("LANG"))    != NULL && strcasestr(LangEnv, "utf") ||
+      (LangEnv = getenv("LC_TYPE")) != NULL && strcasestr(LangEnv, "utf")) {
+     fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
+     return 2;
+     }
+
   // Save terminal settings:
 
   struct termios savedTm;
@@ -456,6 +475,10 @@ int main(int argc, char *argv[])
   else
      cDevice::PrimaryDevice()->SetVolume(Setup.CurrentVolume, true);
 
+  // Recordings:
+
+  Recordings.Load();
+
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
@@ -587,6 +610,8 @@ int main(int argc, char *argv[])
                   TimerInVpsMargin = true;
                }
            }
+        if (!Menu && Recordings.NeedsUpdate())
+           Recordings.Load();
         // CAM control:
         if (!Menu && !cOsd::IsOpen())
            Menu = CamControl();

From 335a57291373aa25739a7192807fbfe1c8de0efd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 18 Jul 2004 18:00:00 +0200
Subject: [PATCH 104/307] =?UTF-8?q?Version=201.3.12=20-=20Removed=20all=20?=
 =?UTF-8?q?error=20messages=20from=20cRecordings::ScanVideoDir()=20and=20j?=
 =?UTF-8?q?ust=20skipping=20=20=20entries=20that=20cause=20errors=20in=20o?=
 =?UTF-8?q?rder=20to=20avoid=20failure=20in=20case=20of=20things=20like=20?=
 =?UTF-8?q?=20=20broken=20links=20etc.=20-=20The=20function=20cTimers::Set?=
 =?UTF-8?q?Events()=20now=20immediately=20returns=20if=20there=20is=20some?=
 =?UTF-8?q?=20user=20=20=20input.=20-=20Fixed=20handling=20menu=20status?=
 =?UTF-8?q?=20messages=20when=20the=20list=20contents=20is=20scrolled=20(t?=
 =?UTF-8?q?hanks=20to=20=20=20Alfred=20Zastrow=20for=20reporting=20this=20?=
 =?UTF-8?q?one).=20-=20Fixed=20checking=20the=20last=20area=20for=20misali?=
 =?UTF-8?q?gnment=20in=20cOsd::CanHandleAreas()=20(thanks=20=20=20to=20Rei?=
 =?UTF-8?q?nhard=20Nissl=20for=20reporting=20this=20one).=20-=20No=20longe?=
 =?UTF-8?q?r=20adding=20section=20filters=20to=20the=20list=20of=20filters?=
 =?UTF-8?q?=20if=20they=20can't=20be=20opened=20=20=20(thanks=20to=20Marco?=
 =?UTF-8?q?=20Schl=C3=BC=C3=9Fler=20for=20pointing=20this=20out).=20-=20Fi?=
 =?UTF-8?q?xed=20handling=20error=20case=20'-1'=20when=20polling=20section?=
 =?UTF-8?q?=20filters=20(thanks=20to=20Marco=20=20=20Schl=C3=BC=C3=9Fler).?=
 =?UTF-8?q?=20-=20Fixed=20handling=20error=20case=20'-1'=20when=20polling?=
 =?UTF-8?q?=20CAM=20connections.=20-=20Making=20sure=20the=20OSD=20reports?=
 =?UTF-8?q?=20oeWrongAlignment=20errors=20before=20any=20oeAreasOverlap=20?=
 =?UTF-8?q?=20=20error=20(suggested=20by=20Reinhard=20Nissl).=20-=20Avoidi?=
 =?UTF-8?q?ng=20flashing=20effects=20in=20the=20OSD=20of=20full=20featured?=
 =?UTF-8?q?=20DVB=20cards=20by=20explicitly=20=20=20clearing=20the=20OSD?=
 =?UTF-8?q?=20windows=20before=20opening=20them=20(suggested=20by=20Marco?=
 =?UTF-8?q?=20Schl=C3=BC=C3=9Fler).=20-=20Experimental=20support=20for=20N?=
 =?UTF-8?q?VOD=20channels.=20Currently=20these=20channels=20are=20detected?=
 =?UTF-8?q?=20=20=20and=20linked=20to=20their=20"base"=20channels=20using?=
 =?UTF-8?q?=20the=20same=20mechanisms=20as=20for=20the=20=20=20"linked=20s?=
 =?UTF-8?q?ervices"=20(let's=20see=20if=20this=20is=20useful).=20Thanks=20?=
 =?UTF-8?q?to=20Mike=20parker=20for=20=20=20helping=20to=20test=20this.=20?=
 =?UTF-8?q?Also=20used=20some=20input=20from=20the=20'autopid'=20patch=20b?=
 =?UTF-8?q?y=20Andreas=20=20=20Schultz).=20-=20Now=20storing=20the=20name?=
 =?UTF-8?q?=20of=20the=20service=20provider=20(aka=20"bouquet")=20in=20the?=
 =?UTF-8?q?=20channel=20=20=20name,=20separated=20by=20a=20semicolon=20(se?=
 =?UTF-8?q?e=20man=20vdr(5)=20for=20details).=20Explicit=20usage=20=20=20o?=
 =?UTF-8?q?f=20the=20various=20parts=20of=20the=20channel=20name=20is=20ye?=
 =?UTF-8?q?t=20to=20come.=20-=20The=20'radio'=20channel=20icon=20is=20now?=
 =?UTF-8?q?=20only=20displayed=20in=20the=20ST:TNG=20skin=20if=20the=20cha?=
 =?UTF-8?q?nnel=20=20=20actually=20has=20an=20APID.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  12 +++
 HISTORY       |  31 ++++++++
 channels.conf | 210 +++++++++++++++++++++++++-------------------------
 ci.c          |   4 +-
 config.h      |   6 +-
 dvbosd.c      |  10 ++-
 eit.c         |   4 +-
 osd.c         |  15 ++--
 osdbase.c     |   3 +-
 recording.c   |  23 ++----
 recording.h   |   4 +-
 sdt.c         |  33 +++++++-
 sections.c    |  16 ++--
 skinsttng.c   |   4 +-
 timers.c      |   5 +-
 vdr.5         |   7 +-
 16 files changed, 235 insertions(+), 152 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ace8e91ac..dfbe07b98 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -789,6 +789,7 @@ Alfred Zastrow <vdr@zastrow4u.de>
  for suggesting to implement separate PausePriority and PauseLifetime parameters for
  the recordings created when pausing live video
  for reporting two warnings when compiling with gcc 3.3.1
+ for reporting a bug in handling menu status messages when the list contents is scrolled
 
 Matthias Raus <matthias-raus@web.de>
  for reporting a problem with starting the editing process if no marks have been set
@@ -858,6 +859,9 @@ Reinhard Nissl <rnissl@gmx.de>
  channels.conf
  for adding cDevice::Flush() to make sure that all data in the video card's buffers
  has been processed
+ for reporting a bug in checking the last area for misalignment in cOsd::CanHandleAreas()
+ for suggesting to make sure the OSD reports oeWrongAlignment errors before any
+ oeAreasOverlap error
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1025,6 +1029,11 @@ Marco Schl
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
  for fixing setting lnb voltage if the frontend is not DVB-S
  for fixing missing audio after replaying a DVD
+ for pointing out that it is unnecessary to add section filters to the list of
+ filters if they can't be opened
+ for fixing handling error case '-1' when polling section filters
+ for suggesting to avoiding flashing effects in the OSD of full featured DVB cards
+ by explicitly clearing the OSD windows before opening them
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1048,3 +1057,6 @@ Maynard Cedric <maynard.cedric@wanadoo.fr>
 
 J�rg Knitter <joerg.knitter@gmx.de>
  for reporting a problem in case the video partition is mounted with "iocharset=utf8"
+
+Mike parker <vdr@msatt.freeserve.co.uk>
+ for helping to test support for NVOD channels
diff --git a/HISTORY b/HISTORY
index 322213bcb..476fac545 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2935,3 +2935,34 @@ Video Disk Recorder Revision History
   out this one).
 - Fixed cRingBufferLinear::Get() in case the buffer wraps around (thanks to Ludwig
   Nussel for reporting this one).
+
+2004-07-18: Version 1.3.12
+
+- Removed all error messages from cRecordings::ScanVideoDir() and just skipping
+  entries that cause errors in order to avoid failure in case of things like
+  broken links etc.
+- The function cTimers::SetEvents() now immediately returns if there is some user
+  input.
+- Fixed handling menu status messages when the list contents is scrolled (thanks to
+  Alfred Zastrow for reporting this one).
+- Fixed checking the last area for misalignment in cOsd::CanHandleAreas() (thanks
+  to Reinhard Nissl for reporting this one).
+- No longer adding section filters to the list of filters if they can't be opened
+  (thanks to Marco Schl��ler for pointing this out).
+- Fixed handling error case '-1' when polling section filters (thanks to Marco
+  Schl��ler).
+- Fixed handling error case '-1' when polling CAM connections.
+- Making sure the OSD reports oeWrongAlignment errors before any oeAreasOverlap
+  error (suggested by Reinhard Nissl).
+- Avoiding flashing effects in the OSD of full featured DVB cards by explicitly
+  clearing the OSD windows before opening them (suggested by Marco Schl��ler).
+- Experimental support for NVOD channels. Currently these channels are detected
+  and linked to their "base" channels using the same mechanisms as for the
+  "linked services" (let's see if this is useful). Thanks to Mike parker for
+  helping to test this. Also used some input from the 'autopid' patch by Andreas
+  Schultz).
+- Now storing the name of the service provider (aka "bouquet") in the channel
+  name, separated by a semicolon (see man vdr(5) for details). Explicit usage
+  of the various parts of the channel name is yet to come.
+- The 'radio' channel icon is now only displayed in the ST:TNG skin if the channel
+  actually has an APID.
diff --git a/channels.conf b/channels.conf
index 5a36b9e49..7c2423b8a 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,120 +1,120 @@
-RTL,RTL Television:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
-SAT.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
-ProSieben:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
-RTL2:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
-Das Erste:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
-Bayerisches FS:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
-hessen fernsehen:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
-NDR FS MV:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
-SR Fernsehen S�dwest:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
-WDR K�ln:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
-S�DWEST BW:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
-Phoenix:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
-ZDF:11953:hC34:S19.2E:27500:110:120=deu;125=deu:130:0:28006:1:1079:0
-3sat:11953:hC34:S19.2E:27500:210:220=deu:230:0:28007:1:1079:0
-KiKa:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
-arte:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF 1:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
-ORF 2:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
-ZDFinfokanal:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
-CNN Int.:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
-S RTL,Super RTL:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
-VOX:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
-KABEL1:12480:vC34:S19.2E:27500:511:512:33:0:899:133:33:0
-NEUN LIVE,NEUN LIVE Television:12480:vC34:S19.2E:27500:767:768:35:0:897:133:33:0
-DSF:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
-HSE24:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0
-Bloomberg TV Germany:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
-Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
-Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
-BVN:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
-CNBC Europe:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
-n-tv:12669:vC56:S19.2E:22000:162:96=deu:55:0:12730:1:1116:0
-Al Jazeera:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
-TW1:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
-Eurosport:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
-EinsExtra:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
-EinsFestival:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
-EinsMuXx:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
-ZDFtheaterkanal:11953:hC34:S19.2E:27500:1110:1120=deu:130:0:28016:1:1079:0
-ZDFdokukanal:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
-MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
-rbb Berlin:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
+RTL,RTL Television;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
+SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
+ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
+RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
+Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
+Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
+hessen fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
+NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
+SR Fernsehen S�dwest;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
+WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
+S�DWEST BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
+Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
+ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
+3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu:230:0:28007:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
+arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
+ORF 1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
+ORF 2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
+CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
+S RTL,Super RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
+VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
+KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
+NEUN LIVE,NEUN LIVE Television;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
+DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
+HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
+Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
+Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
+BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
+CNBC Europe;CNBC:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
+n-tv;n-tv:12669:vC56:S19.2E:22000:162:96=deu:55:0:12730:1:1116:0
+Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
+TW1;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
+Eurosport;ZDFvision:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
+EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
+EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
+EinsMuXx;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
+ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:130:0:28016:1:1079:0
+ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
+MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
+rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-START,PREMIERE START:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
-PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1722,1801,1702:11:133:2:0
-PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
-PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1801,1702:29:133:2:0
-PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536=deu:32:1722,1801,1702:41:133:2:0
-PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
-DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
+START,PREMIERE START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
+PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
+PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
+PREM 3,PREMIERE 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
+PREM 4,PREMIERE 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
+PREM 5,PREMIERE 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREM 6,PREMIERE 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
+PREM 7,PREMIERE 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
+DISNEY,DISNEY CHANNEL;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
 :Premiere Direkt
-DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
+DIREKT,PREMIERE DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
-EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
+B-UHSE,BEATE-UHSE.TV;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
+EROTIK,PREMIERE EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-F1-Portal:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
-SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840=deu:32:1702,1722,1801:27:133:4:0
+SPORT 1,PREMIERE SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
+SPORT 2,PREMIERE SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
 :Beta Digital
-N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0
-Liberty TV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
+N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
+Liberty TV.com;Maastricht Multimedia:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-ProSieben Austria:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
-Kabel 1 Schweiz:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
-Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
-ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
-FRANCE 5:12207:vC34:S19.2E:27500:160:80=fra:32:0:8501:1:1090:0
-LCP:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
-ESCALES:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
-CANAL CLUB:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
-ASTRA-Mosaic:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
-ASTRA-Mosaic 2:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
-ASTRA-Mosaic 3:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
-ASTRA-Mosaic 4:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
-ASTRA-Mosaic 5:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
-Chamber TV:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
+ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
+Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
+Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
+ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
+FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:0:8501:1:1090:0
+LCP;CSAT:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
+ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
+CANAL CLUB;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
+ASTRA-Mosaic;ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
+ASTRA-Mosaic 2;ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
+ASTRA-Mosaic 3;ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
+ASTRA-Mosaic 4;ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
+ASTRA-Mosaic 5;ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
+Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
-Yorin:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,602,100:5010:53:1109:0
-MTV2 Pop Channel:12226:hC34:S19.2E:27500:513:661=deu:577:0:28640:1:1091:0
+Yorin;CANAL+:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,602,100:5010:53:1109:0
+MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
-VIVA:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
-VIVA PLUS:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
-MTV Central:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-QVC GERMANY:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
-TELE 5:12480:vC34:S19.2E:27500:1535:1536:38:0:51:133:33:0
+VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
+VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
+MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
+QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
+TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
-Sky One:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
-Sky One Mix:12226:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:5104:2:2027:0
-ITV2:10906:vC56:S28.2E:22000:2348:2349=eng,2350=eng:2351:960,961:10240:2:2054:0
-Sci-Fi:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
-Paramount:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
-Discovery:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0
-Sky Movies 1:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
-Sky Movies 2:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
-Sky Movies 3:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0
-Sky Movies 4:11914:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR:2308:960,961:4402:2:2011:0
-Sky Movies 5:11914:hC23:S28.2E:27500:2313+2304:2314=eng,2315=NAR:2316:960,961:4503:2:2011:0
-Sky Movies 6:11914:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR:2312:960,961:4502:2:2011:0
-Sky Movies 7:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
-Sky Movies 8:11836:hC23:S28.2E:27500:2320+2304:2321=eng,2322=NAR:2323:960,961:5502:2:2007:0
-Sky Movies 9:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
-Sky Cinema 1:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
-Sky Cinema 2:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
+Sky One;BSkyB:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
+Sky One Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2317=NAR:2316:960,961:5104:2:2027:0
+ITV2;BSkyB:10906:vC56:S28.2E:22000:2348:2349=eng,2350=eng:2351:960,961:10240:2:2054:0
+Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
+Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
+Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0
+Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
+Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
+Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0
+Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR:2308:960,961:4402:2:2011:0
+Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:2313+2304:2314=eng,2315=NAR:2316:960,961:4503:2:2011:0
+Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR:2312:960,961:4502:2:2011:0
+Sky Movies 7;BSkyB:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
+Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:2320+2304:2321=eng,2322=NAR:2323:960,961:5502:2:2007:0
+Sky Movies 9;BSkyB:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
+Sky Cinema 1;BSkyB:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
+Sky Cinema 2;BSkyB:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
 :@900 Some 'seed' channels
-Chelsea TV:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-WDR M�nster:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
+Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
+WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
 Going Places:10920:hC56:S28.2E:22000:2310+2304:2311=eng:2312:0:5008:2:2055:0
-Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
-S1T:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
-CNN:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
+Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
+S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
+CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+AL HAYAT;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
 :@1000 New channels
diff --git a/ci.c b/ci.c
index 65ec687fc..ac232b9bc 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.22 2004/02/08 15:02:04 kls Exp $
+ * $Id: ci.c 1.23 2004/07/17 14:30:17 kls Exp $
  */
 
 #include "ci.h"
@@ -327,7 +327,7 @@ int cCiTransportConnection::RecvTPDU(void)
   pfd[0].fd = fd;
   pfd[0].events = POLLIN;
   lastResponse = ERROR;
-  if (poll(pfd, 1, CAM_READ_TIMEOUT) && (pfd[0].revents & POLLIN) && tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
+  if (poll(pfd, 1, CAM_READ_TIMEOUT) > 0 && (pfd[0].revents & POLLIN) && tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
      switch (state) {
        case stIDLE:     break;
        case stCREATION: if (tpdu->Tag() == T_CTC_REPLY) {
diff --git a/config.h b/config.h
index 60c50a6dc..3a67da641 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.198 2004/06/10 13:18:50 kls Exp $
+ * $Id: config.h 1.199 2004/07/17 11:09:42 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.11"
-#define VDRVERSNUM   10311  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.12"
+#define VDRVERSNUM   10312  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbosd.c b/dvbosd.c
index 8056499fd..973298d32 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.23 2004/06/12 13:10:03 kls Exp $
+ * $Id: dvbosd.c 1.24 2004/07/18 13:51:42 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -39,6 +39,14 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
   shown = false;
   if (osdDev < 0)
      esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
+  else {
+     // must clear all windows here to avoid flashing effects - doesn't work if done
+     // in Flush() only for the windows that are actually used...
+     for (int i = 0; i < MAXNUMWINDOWS; i++) {
+         Cmd(OSD_SetWindow, 0, i + 1);
+         Cmd(OSD_Clear);
+         }
+     }
 }
 
 cDvbOsd::~cDvbOsd()
diff --git a/eit.c b/eit.c
index 3ac53fac6..dac29539c 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.95 2004/06/06 14:49:45 kls Exp $
+ * $Id: eit.c 1.96 2004/07/18 10:52:58 kls Exp $
  */
 
 #include "eit.h"
@@ -144,7 +144,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  break;
             case SI::TimeShiftedEventDescriptorTag: {
                  SI::TimeShiftedEventDescriptor *tsed = (SI::TimeShiftedEventDescriptor *)d;
-                 cSchedule *rSchedule = (cSchedule *)Schedules->GetSchedule(tChannelID(Source, 0, 0, tsed->getReferenceServiceId()));
+                 cSchedule *rSchedule = (cSchedule *)Schedules->GetSchedule(tChannelID(Source, channel->Nid(), channel->Tid(), tsed->getReferenceServiceId()));
                  if (!rSchedule)
                     break;
                  rEvent = (cEvent *)rSchedule->GetEvent(tsed->getReferenceEventId());
diff --git a/osd.c b/osd.c
index d87bee3e8..2877c280c 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.55 2004/06/15 20:29:42 kls Exp $
+ * $Id: osd.c 1.57 2004/07/18 09:23:03 kls Exp $
  */
 
 #include "osd.h"
@@ -602,15 +602,18 @@ cBitmap *cOsd::GetBitmap(int Area)
 
 eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
+  eOsdError Result = oeOk;
   for (int i = 0; i < NumAreas; i++) {
+      if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)
+         return oeWrongAlignment;
       for (int j = i + 1; j < NumAreas; j++) {
-          if (Areas[i].Intersects(Areas[j]))
-             return oeAreasOverlap;
-          if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)
-             return oeWrongAlignment;
+          if (Areas[i].Intersects(Areas[j])) {
+             Result = oeAreasOverlap;
+             break;
+             }
           }
       }
-  return oeOk;
+  return Result;
 }
 
 eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
diff --git a/osdbase.c b/osdbase.c
index 08aef965d..42fda30e0 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.13 2004/05/01 10:51:43 kls Exp $
+ * $Id: osdbase.c 1.14 2004/07/17 13:29:13 kls Exp $
  */
 
 #include "osdbase.h"
@@ -175,6 +175,7 @@ void cOsdMenu::Display(void)
      subMenu->Display();
      return;
      }
+  displayMenu->SetMessage(mtStatus, NULL);
   displayMenu->Clear();
   cStatus::MsgOsdClear();
   displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
diff --git a/recording.c b/recording.c
index cbc916a28..e33e23150 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.88 2004/06/13 20:25:19 kls Exp $
+ * $Id: recording.c 1.89 2004/07/17 11:22:29 kls Exp $
  */
 
 #include "recording.h"
@@ -626,7 +626,7 @@ cRecordings::cRecordings(bool Deleted)
   lastUpdate = 0;
 }
 
-bool cRecordings::ScanVideoDir(const char *DirName)
+void cRecordings::ScanVideoDir(const char *DirName)
 {
   DIR *d = opendir(DirName);
   if (d) {
@@ -641,10 +641,10 @@ bool cRecordings::ScanVideoDir(const char *DirName)
                     free(buffer);
                     buffer = ReadLink(buffer);
                     if (!buffer)
-                       return false;
+                       continue;
                     if (stat(buffer, &st) != 0) {
-                       LOG_ERROR_STR(DirName);
-                       return false;
+                       free(buffer);
+                       continue;
                        }
                     }
                  if (S_ISDIR(st.st_mode)) {
@@ -655,24 +655,15 @@ bool cRecordings::ScanVideoDir(const char *DirName)
                        else
                           delete r;
                        }
-                    else if (!ScanVideoDir(buffer))
-                       return false;
+                    else
+                       ScanVideoDir(buffer);
                     }
                  }
-              else {
-                 LOG_ERROR_STR(DirName);
-                 return false;
-                 }
               free(buffer);
               }
            }
      closedir(d);
      }
-  else {
-     LOG_ERROR_STR(DirName);
-     return false;
-     }
-  return true;
 }
 
 bool cRecordings::NeedsUpdate(void)
diff --git a/recording.h b/recording.h
index 04a1885bf..88b90d3b1 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.30 2004/06/13 15:37:42 kls Exp $
+ * $Id: recording.h 1.31 2004/07/17 11:09:49 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -72,7 +72,7 @@ class cRecordings : public cList<cRecording> {
 private:
   bool deleted;
   time_t lastUpdate;
-  bool ScanVideoDir(const char *DirName);
+  void ScanVideoDir(const char *DirName);
 public:
   cRecordings(bool Deleted = false);
   bool Load(void);
diff --git a/sdt.c b/sdt.c
index 247d2c9b7..efcad3d5d 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.9 2004/06/06 14:25:22 kls Exp $
+ * $Id: sdt.c 1.11 2004/07/18 11:14:42 kls Exp $
  */
 
 #include "sdt.h"
@@ -46,6 +46,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
       if (!channel)
          channel = Channels.GetByChannelID(tChannelID(Source(), 0, Transponder(), SiSdtService.getServiceId()));
 
+      cLinkChannels *LinkChannels = NULL;
       SI::Descriptor *d;
       for (SI::Loop::Iterator it2; (d = SiSdtService.serviceDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
@@ -54,8 +55,8 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  switch (sd->getServiceType()) {
                    case 0x01: // digital television service
                    case 0x02: // digital radio sound service
-                   //XXX TODO case 0x04: // NVOD reference service
-                   //XXX TODO case 0x05: // NVOD time-shifted service
+                   case 0x04: // NVOD reference service
+                   case 0x05: // NVOD time-shifted service
                         {
                         char NameBuf[1024];
                         char ShortNameBuf[1024];
@@ -68,6 +69,15 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            strcpy(ps, NameBuf);
                            pn = ShortNameBuf;
                            }
+                        if (*pn) {
+                           char ProviderNameBuf[1024];
+                           sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
+                           if (*ProviderNameBuf) {
+                              char *p = pn + strlen(pn);
+                              *p++ = ';';
+                              strcpy(p, ProviderNameBuf);
+                              }
+                           }
                         if (channel) {
                            channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            if (Setup.UpdateChannels >= 1)
@@ -102,7 +112,16 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::NVODReferenceDescriptor *nrd = (SI::NVODReferenceDescriptor *)d;
                  for (SI::Loop::Iterator it; nrd->serviceLoop.hasNext(it); ) {
                      SI::NVODReferenceDescriptor::Service Service = nrd->serviceLoop.getNext(it);
-                     //printf(" %04X-%04X-%04X\n", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());//XXX TODO
+                     cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
+                     if (!link && Setup.UpdateChannels >= 3) {
+                        link = Channels.NewChannel(Channel(), "NVOD", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
+                        patFilter->Trigger();
+                        }
+                     if (link) {
+                        if (!LinkChannels)
+                           LinkChannels = new cLinkChannels;
+                        LinkChannels->Add(new cLinkChannel(link));
+                        }
                      }
                  }
                  break;
@@ -110,6 +129,12 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             }
           delete d;
           }
+      if (LinkChannels) {
+         if (channel)
+            channel->SetLinkChannels(LinkChannels);
+         else
+            delete LinkChannels;
+         }
       }
   Channels.Unlock();
 }
diff --git a/sections.c b/sections.c
index ead623d0e..3b2dbe9b6 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.5 2004/02/07 15:51:57 kls Exp $
+ * $Id: sections.c 1.7 2004/07/17 14:26:32 kls Exp $
  */
 
 #include "sections.h"
@@ -85,11 +85,15 @@ void cSectionHandler::Add(const cFilterData *FilterData)
          break;
       }
   if (!fh) {
-     fh = new cFilterHandle(*FilterData);
-     filterHandles.Add(fh);
-     fh->handle = device->OpenFilter(FilterData->pid, FilterData->tid, FilterData->mask);
+     int handle = device->OpenFilter(FilterData->pid, FilterData->tid, FilterData->mask);
+     if (handle >= 0) {
+        fh = new cFilterHandle(*FilterData);
+        fh->handle = handle;
+        filterHandles.Add(fh);
+        }
      }
-  fh->used++;
+  if (fh)
+     fh->used++;
   Unlock();
 }
 
@@ -168,7 +172,7 @@ void cSectionHandler::Action(void)
         int oldStatusCount = statusCount;
         Unlock();
 
-        if (poll(pfd, NumFilters, 1000) != 0) {
+        if (poll(pfd, NumFilters, 1000) > 0) {
            bool DeviceHasLock = device->HasLock();
            if (!DeviceHasLock)
               usleep(100000);
diff --git a/skinsttng.c b/skinsttng.c
index ac4aab99a..f80175f80 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.5 2004/05/29 14:05:12 kls Exp $
+ * $Id: skinsttng.c 1.6 2004/07/18 11:32:42 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -240,7 +240,7 @@ void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
         x -= bmTeletext.Width() + d;
         osd->DrawBitmap(x, y0 + (y1 - y0 - bmTeletext.Height()) / 2, bmTeletext, Theme.Color(Channel->Tpid() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
         }
-     else {
+     else if (Channel->Apid1()) {
         x -= bmRadio.Width() + d;
         osd->DrawBitmap(x, y0 + (y1 - y0 - bmRadio.Height()) / 2, bmRadio, Theme.Color(clrChannelSymbolOn), frameColor);
         }
diff --git a/timers.c b/timers.c
index 696936502..ab1690a6e 100644
--- a/timers.c
+++ b/timers.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.12 2004/03/14 13:27:57 kls Exp $
+ * $Id: timers.c 1.13 2004/07/17 12:46:27 kls Exp $
  */
 
 #include "timers.h"
 #include <ctype.h>
 #include "channels.h"
 #include "i18n.h"
+#include "remote.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -516,6 +517,8 @@ void cTimers::SetEvents(void)
             //XXX what if the Schedule doesn't have any VPS???
             int Match = tmNone;
             for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
+                if (cRemote::HasKeys())
+                   return; // react immediately on user input
                 int m = ti->Matches(e);
                 if (m > Match) {
                    Match = m;
diff --git a/vdr.5 b/vdr.5
index a224a6670..4cc522b65 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.27 2004/05/15 09:24:57 kls Exp $
+.\" $Id: vdr.5 1.28 2004/07/18 11:06:54 kls Exp $
 .\"
 .TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -64,6 +64,11 @@ for this channel, it preceeds the full name and is delimited by a comma,
 as in
 
 \fBRTL,RTL Television:...\fR
+
+If present, the name of the service provider or "bouquet" is appended
+to the channel name, separated by a semicolon, as in
+
+\fBRTL,RTL Television;RTL World:...\fR
 .TP
 .B Frequency
 The transponder frequency (as an integer). For DVB-S this value is in MHz. For DVB-C

From af483c11aebd8146a978dba3d604bda0951e24ac Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Oct 2004 18:00:00 +0200
Subject: [PATCH 105/307] =?UTF-8?q?Version=201.3.13=20-=20Fixed=20checking?=
 =?UTF-8?q?=20for=20the=20presence=20of=20NPTL=20(thanks=20to=20Jouni=20Ka?=
 =?UTF-8?q?rvo).=20-=20Making=20sure=20section=20filters=20are=20only=20se?=
 =?UTF-8?q?t=20if=20the=20device=20actually=20has=20a=20lock=20=20=20(than?=
 =?UTF-8?q?ks=20to=20Andreas=20Share=20for=20pointing=20this=20out).=20-?=
 =?UTF-8?q?=20Fixed=20a=20possible=20NULL=20pointer=20assignment=20in=20cM?=
 =?UTF-8?q?enuText::SetText()=20(thanks=20to=20=20=20Marco=20Schl=C3=BCssl?=
 =?UTF-8?q?er).=20-=20Fixed=20a=20crash=20in=20case=20the=20last=20line=20?=
 =?UTF-8?q?in=20channels.conf=20is=20a=20group=20separator=20and=20=20=20t?=
 =?UTF-8?q?hat=20group=20is=20selected=20in=20the=20channel=20display=20(t?=
 =?UTF-8?q?hanks=20to=20Dick=20Streefland).=20-=20Added=20cRingBufferLinea?=
 =?UTF-8?q?r::Read()=20to=20read=20directly=20from=20a=20file=20handle=20i?=
 =?UTF-8?q?nto=20the=20=20=20ring=20buffer.=20-=20Using=20timeouts=20in=20?=
 =?UTF-8?q?ring=20buffers=20to=20avoid=20'usleep()'.=20-=20Clearing=20the?=
 =?UTF-8?q?=20'Transfer=20Mode'=20ring=20buffer=20after=20clearing=20the?=
 =?UTF-8?q?=20device=20to=20avoid=20=20=20an=20"almost=20full"=20ring=20bu?=
 =?UTF-8?q?ffer.=20-=20Removed=20locking=20from=20cRingBufferLinear=20for?=
 =?UTF-8?q?=20better=20performance=20under=20high=20load.=20-=20Using=20a?=
 =?UTF-8?q?=20cRingBufferLinear=20in=20cRemux=20to=20avoid=20unnecessary?=
 =?UTF-8?q?=20copying=20of=20data.=20-=20Using=20a=20cRingBufferLinear=20i?=
 =?UTF-8?q?n=20cTSBuffer=20and=20filling=20it=20in=20a=20separate=20thread?=
 =?UTF-8?q?=20=20=20to=20avoid=20buffer=20overflows.=20Plugins=20using=20c?=
 =?UTF-8?q?TSBuffer=20will=20need=20to=20remove=20the=20=20=20call=20to=20?=
 =?UTF-8?q?the=20now=20obsolete=20Read()=20function=20(see=20cDvbDevice::G?=
 =?UTF-8?q?etTSPacket()=20for=20=20=20the=20new=20usage=20of=20cTSBuffer).?=
 =?UTF-8?q?=20-=20cRemux::Process()=20has=20been=20split=20into=20Put(),?=
 =?UTF-8?q?=20Get()=20and=20Del()=20to=20allow=20for=20a=20=20=20better=20?=
 =?UTF-8?q?decoupling=20of=20the=20remuxing=20and=20disk=20writing=20proce?=
 =?UTF-8?q?ss.=20Plugins=20using=20=20=20cRemux=20will=20need=20to=20be=20?=
 =?UTF-8?q?modified=20accordingly.=20-=20The=20actual=20disk=20writing=20i?=
 =?UTF-8?q?n=20recordings=20is=20now=20done=20in=20a=20separate=20thread?=
 =?UTF-8?q?=20to=20=20=20improve=20the=20overall=20throughput.=20-=20Chang?=
 =?UTF-8?q?ed=20cRemux=20so=20that=20it=20returns=20the=20maximum=20availa?=
 =?UTF-8?q?ble=20amount=20of=20data=20with=20=20=20each=20call,=20not=20ju?=
 =?UTF-8?q?st=202048=20byte.=20-=20Added=20a=20visual=20display=20of=20all?=
 =?UTF-8?q?=20cRingBufferLinear=20buffers=20for=20debugging.=20To=20=20=20?=
 =?UTF-8?q?activate=20it,=20define=20DEBUGRINGBUFFERS=20in=20ringbuffer.h.?=
 =?UTF-8?q?=20-=20Instead=20of=20cCondVar=20now=20using=20the=20new=20cCon?=
 =?UTF-8?q?dWait=20(which=20also=20avoids=20a=20possible=20=20=20"near=20m?=
 =?UTF-8?q?iss"=20condition;=20thanks=20to=20Sascha=20Volkenandt=20for=20p?=
 =?UTF-8?q?ointing=20out=20this=20one).=20=20=20cCondVar=20is=20still=20pr?=
 =?UTF-8?q?esent=20for=20plugins=20that=20use=20it=20(and=20VDR=20itself?=
 =?UTF-8?q?=20also=20still=20=20=20uses=20it=20in=20cRemote).=20-=20The=20?=
 =?UTF-8?q?cRingBuffer=20now=20does=20EnableGet()/EnablePut()=20only=20if?=
 =?UTF-8?q?=20the=20buffer=20is=20more=20than=20=20=20one=20third=20full?=
 =?UTF-8?q?=20or=20empty,=20respectively.=20This=20dramatically=20improves?=
 =?UTF-8?q?=20recording=20=20=20performance=20and=20reduces=20system=20loa?=
 =?UTF-8?q?d=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler=20for=20doing=20?=
 =?UTF-8?q?some=20=20=20testing=20regarding=20buffer=20performance=20and?=
 =?UTF-8?q?=20giving=20me=20some=20hints=20that=20finally=20led=20=20=20to?=
 =?UTF-8?q?=20finding=20out=20that=20this=20was=20the=20basic=20problem=20?=
 =?UTF-8?q?causing=20buffer=20overflows).=20-=20Improved=20Transfer=20Mode?=
 =?UTF-8?q?=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler=20for=20suggestio?=
 =?UTF-8?q?ns=20and=20testing).=20-=20Fixed=20a=20possible=20crash=20with?=
 =?UTF-8?q?=20inconsistent=20SI=20data=20(thanks=20to=20Marcel=20Wiesweg).?=
 =?UTF-8?q?=20-=20Fixed=20showing=20the=20replay=20mode=20if=20the=20OSD?=
 =?UTF-8?q?=20is=20currently=20in=20use=20(thanks=20to=20Kimmo=20=20=20Tyk?=
 =?UTF-8?q?kala=20for=20pointing=20out=20this=20problem).=20-=20cOsdProvid?=
 =?UTF-8?q?er::NewOsd()=20now=20always=20returns=20a=20valid=20pointer,=20?=
 =?UTF-8?q?even=20if=20the=20OSD=20is=20=20=20currently=20in=20use=20(it?=
 =?UTF-8?q?=20will=20then=20return=20a=20dummy=20cOsd=20object=20and=20wri?=
 =?UTF-8?q?te=20a=20message=20to=20=20=20the=20log=20file).=20-=20Added=20?=
 =?UTF-8?q?Estonian=20language=20texts=20(thanks=20to=20Arthur=20Konovalov?=
 =?UTF-8?q?).=20-=20Fixed=20'newplugin'=20and=20libsi/Makefile=20to=20use?=
 =?UTF-8?q?=20the=20compiler=20defined=20in=20$(CXX)=20for=20=20=20generat?=
 =?UTF-8?q?ing=20file=20dependencies=20(thanks=20to=20Andreas=20Brachold).?=
 =?UTF-8?q?=20-=20Moved=20the=20initialization=20of=20aPid1=20and=20aPid2?=
 =?UTF-8?q?=20to=20the=20beginning=20of=20cDvbDevice::cDvbDevice()=20=20?=
 =?UTF-8?q?=20to=20have=20them=20set=20in=20case=20a=20patch=20references?=
 =?UTF-8?q?=20them=20(thanks=20to=20Wayne=20Keer=20for=20pointing=20=20=20?=
 =?UTF-8?q?this=20out).=20-=20Completed=20the=20Russian=20OSD=20texts=20(t?=
 =?UTF-8?q?hanks=20to=20Vyacheslav=20Dikonov).=20-=20Avoiding=20unnecessar?=
 =?UTF-8?q?y=20section=20filter=20start/stops=20(thanks=20to=20Marco=20Sch?=
 =?UTF-8?q?l=C3=BC=C3=9Fler).=20-=20Made=20the=20"Channel=20not=20availabl?=
 =?UTF-8?q?e!"=20message=20and=20mtInfo=20instead=20of=20mtError=20(sugges?=
 =?UTF-8?q?ted=20=20=20by=20Wayne=20Keer).=20-=20Made=20volume=20control?=
 =?UTF-8?q?=20more=20linear=20(thanks=20to=20Emil=20Naepflein=20and=20Udo?=
 =?UTF-8?q?=20Richter).=20-=20Now=20skipping=20code=20table=20info=20in=20?=
 =?UTF-8?q?SI=20data=20(suggested=20by=20Milos=20Kapoun).=20-=20Added=20mi?=
 =?UTF-8?q?ssing=20Czech=20characters=20to=20fontosd-iso8859-2.c=20(thanks?=
 =?UTF-8?q?=20to=20Milos=20Kapoun).=20-=20Fixed=20a=20crash=20in=20the=20t?=
 =?UTF-8?q?ime=20search=20mechanism=20(reported=20by=20Reinhard=20Nissl).?=
 =?UTF-8?q?=20-=20If=20one=20PID=20can't=20be=20added,=20the=20whole=20cDe?=
 =?UTF-8?q?vice::AttachReceiver()=20will=20now=20fail=20=20=20and=20all=20?=
 =?UTF-8?q?PIDs=20added=20so=20far=20will=20be=20deleted=20(thanks=20to=20?=
 =?UTF-8?q?Marco=20Schl=C3=BC=C3=9Fler=20for=20=20=20pointing=20out=20this?=
 =?UTF-8?q?=20one).=20-=20Now=20only=20saving=20channels.conf=20after=20a?=
 =?UTF-8?q?=20modification=20made=20by=20the=20user=20(avoids=20=20=20lots?=
 =?UTF-8?q?=20of=20disk=20access=20due=20to=20automatic=20channel=20update?=
 =?UTF-8?q?s).=20Automatic=20channel=20=20=20modifications=20will=20be=20s?=
 =?UTF-8?q?aved=20every=2010=20minutes=20if=20no=20recording=20is=20curren?=
 =?UTF-8?q?tly=20=20=20active.=20-=20Removed=20the=20'Log'=20parameter=20f?=
 =?UTF-8?q?rom=20the=20cChannel::Set...=20functions.=20Instead=20=20=20che?=
 =?UTF-8?q?cking=20if=20the=20channel=20has=20a=20non-zero=20number.=20-?=
 =?UTF-8?q?=20Updated=20'channels.conf.terr'=20for=20Hannover=20(thanks=20?=
 =?UTF-8?q?to=20Sven=20Kreiensen).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS            |   40 +
 HISTORY                 |   70 +
 Makefile                |   16 +-
 PLUGINS/src/sky/HISTORY |    4 +
 PLUGINS/src/sky/sky.c   |   34 +-
 channels.c              |   63 +-
 channels.conf           |   28 +-
 channels.conf.terr      |   32 +-
 channels.h              |   25 +-
 config.h                |    6 +-
 device.c                |  134 +-
 device.h                |   16 +-
 dvbdevice.c             |   42 +-
 dvbplayer.c             |   26 +-
 eit.c                   |    6 +-
 fontfix-iso8859-15.c    | 6498 +++++++++++++++++++++++++++++++++++++
 fontosd-iso8859-15.c    | 6722 +++++++++++++++++++++++++++++++++++++++
 fontosd-iso8859-2.c     |  452 +--
 fontsml-iso8859-15.c    | 5602 ++++++++++++++++++++++++++++++++
 i18n.c                  |  262 +-
 i18n.h                  |    4 +-
 libsi/Makefile          |    4 +-
 libsi/descriptor.c      |   14 +-
 libsi/si.c              |   26 +-
 libsi/si.h              |   30 +-
 libsi/util.c            |    6 +-
 libsi/util.h            |    9 +-
 menu.c                  |   18 +-
 newplugin               |    4 +-
 nit.c                   |   18 +-
 osd.c                   |   13 +-
 osd.h                   |    6 +-
 pat.c                   |    8 +-
 recorder.c              |  170 +-
 recorder.h              |   13 +-
 remux.c                 |  328 +-
 remux.h                 |   30 +-
 ringbuffer.c            |  230 +-
 ringbuffer.h            |   42 +-
 sdt.c                   |   10 +-
 sections.c              |   28 +-
 sections.h              |    4 +-
 svdrp.c                 |    8 +-
 thread.c                |   61 +-
 thread.h                |   20 +-
 transfer.c              |  118 +-
 transfer.h              |    3 +-
 vdr.c                   |   34 +-
 48 files changed, 20367 insertions(+), 970 deletions(-)
 create mode 100644 fontfix-iso8859-15.c
 create mode 100644 fontosd-iso8859-15.c
 create mode 100644 fontsml-iso8859-15.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dfbe07b98..0874cf441 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -271,6 +271,8 @@ Matthias Weingart <matthias@pentax.boerde.de>
 
 Andreas Share <a.share@t-online.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+ for pointing out that section filters should only be set if the device actually has
+ a lock
 
 Simon Bauschulte <SemiSchwabe@Brutzel.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -628,6 +630,7 @@ Emil Naepflein <Emil.Naepflein@philosys.de>
  for fixing selecting the device, because sometimes an FTA recording terminated a
  CA recording
  for suggesting to never delete edited recordings automatically if the disk runs full
+ for making volume control more linear
 
 Gerald Berwolf <genka@genka.de>
  for suggesting to deactivate some templates in tools.h in case some plugin needs to
@@ -685,6 +688,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for fixing a memory leak in NIT processing
  for adding a few missing initializations
  for adding play mode pmVideoOnly
+ for fixing a possible crash with inconsistent SI data
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -721,6 +725,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for suggesting to ignore unused "none" color entries in XPM files written by
  some broken graphics tools
  for fixing a memory leak in theme description handling
+ for pointing out a "near miss" condition in cCondVar
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -750,6 +755,8 @@ Christoph Friederich <christoph.friederich@gmx.de>
 
 Andreas Brachold <andy03@deltab.de>
  for his support in keeping 'channels.conf.terr' up to date
+ for fixing 'newplugin' and libsi/Makefile to use the compiler defined in $(CXX)
+ for generating file dependencies
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -862,6 +869,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting a bug in checking the last area for misalignment in cOsd::CanHandleAreas()
  for suggesting to make sure the OSD reports oeWrongAlignment errors before any
  oeAreasOverlap error
+ for reporting a a crash in the time search mechanism
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1024,6 +1032,10 @@ Michal Dobrzynski <michal_dobrzynski@mac.com>
 Wayne Keer <syphir@syphir.sytes.net>
  for reporting a bug in handling descriptor loops in 'libsi', which had sometimes
  caused invalid CA ids to be added to the channel definitions
+ for pointing out a problem with the initialization of aPid1 and aPid2 in
+ cDvbDevice::cDvbDevice() in case a patch references them
+ for suggesting to make the "Channel not available!" message and mtInfo instead of
+ mtError
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
@@ -1034,6 +1046,13 @@ Marco Schl
  for fixing handling error case '-1' when polling section filters
  for suggesting to avoiding flashing effects in the OSD of full featured DVB cards
  by explicitly clearing the OSD windows before opening them
+ for fixing a possible NULL pointer assignment in cMenuText::SetText()
+ for doing some testing regarding buffer performance and giving me some hints that
+ finally lead to finding out that the basic problem causing buffer overflows was in
+ EnableGet()/EnablePut() being called too often
+ for avoiding unnecessary section filter start/stops
+ for pointing out that if one PID can't be added, the whole cDevice::AttachReceiver()
+ should fail and all PIDs added so far should be deleted
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1044,6 +1063,7 @@ Philip Lawatsch <philip@lawatsch.at>
 
 Jouni Karvo <kex@netlab.hut.fi>
  for suggesting to make the cOsd constructor 'protected'
+ for fixing checking for the presence of NPTL
 
 Olaf Henkel <olafhenkel@t-online.de>
  for reporting a problem with long event texts in the "Classic VDR" skin
@@ -1060,3 +1080,23 @@ J
 
 Mike parker <vdr@msatt.freeserve.co.uk>
  for helping to test support for NVOD channels
+
+Dick Streefland <Dick.Streefland@xs4all.nl>
+ for fixing a crash in case the last line in channels.conf is a group separator and
+ that group is selected in the channel display
+
+Kimmo Tykkala <tykkala@iki.fi>
+ for pointing out a problem in showing the replay mode if the OSD is currently in use
+
+Arthur Konovalov <kasjas@hot.ee>
+ for translating OSD texts to the Estonian language
+
+Milos Kapoun <m.kapoun@cra.cz>
+ for suggesting to skip code table info in SI data
+ for adding missing Czech characters to fontosd-iso8859-2.c
+
+Udo Richter <udo_richter@gmx.de>
+ for refining the formula for making volume control more linear
+
+Sven Kreiensen <svenk@kammer.uni-hannover.de>
+ for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 476fac545..3baa1b963 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2966,3 +2966,73 @@ Video Disk Recorder Revision History
   of the various parts of the channel name is yet to come.
 - The 'radio' channel icon is now only displayed in the ST:TNG skin if the channel
   actually has an APID.
+
+2004-10-17: Version 1.3.13
+
+- Fixed checking for the presence of NPTL (thanks to Jouni Karvo).
+- Making sure section filters are only set if the device actually has a lock
+  (thanks to Andreas Share for pointing this out).
+- Fixed a possible NULL pointer assignment in cMenuText::SetText() (thanks to
+  Marco Schl�ssler).
+- Fixed a crash in case the last line in channels.conf is a group separator and
+  that group is selected in the channel display (thanks to Dick Streefland).
+- Added cRingBufferLinear::Read() to read directly from a file handle into the
+  ring buffer.
+- Using timeouts in ring buffers to avoid 'usleep()'.
+- Clearing the 'Transfer Mode' ring buffer after clearing the device to avoid
+  an "almost full" ring buffer.
+- Removed locking from cRingBufferLinear for better performance under high load.
+- Using a cRingBufferLinear in cRemux to avoid unnecessary copying of data.
+- Using a cRingBufferLinear in cTSBuffer and filling it in a separate thread
+  to avoid buffer overflows. Plugins using cTSBuffer will need to remove the
+  call to the now obsolete Read() function (see cDvbDevice::GetTSPacket() for
+  the new usage of cTSBuffer).
+- cRemux::Process() has been split into Put(), Get() and Del() to allow for a
+  better decoupling of the remuxing and disk writing process. Plugins using
+  cRemux will need to be modified accordingly.
+- The actual disk writing in recordings is now done in a separate thread to
+  improve the overall throughput.
+- Changed cRemux so that it returns the maximum available amount of data with
+  each call, not just 2048 byte.
+- Added a visual display of all cRingBufferLinear buffers for debugging. To
+  activate it, define DEBUGRINGBUFFERS in ringbuffer.h.
+- Instead of cCondVar now using the new cCondWait (which also avoids a possible
+  "near miss" condition; thanks to Sascha Volkenandt for pointing out this one).
+  cCondVar is still present for plugins that use it (and VDR itself also still
+  uses it in cRemote).
+- The cRingBuffer now does EnableGet()/EnablePut() only if the buffer is more than
+  one third full or empty, respectively. This dramatically improves recording
+  performance and reduces system load (thanks to Marco Schl��ler for doing some
+  testing regarding buffer performance and giving me some hints that finally lead
+  to finding out that this was the basic problem causing buffer overflows).
+- Improved Transfer Mode (thanks to Marco Schl��ler for suggestions and testing).
+- Fixed a possible crash with inconsistent SI data (thanks to Marcel Wiesweg).
+- Fixed showing the replay mode if the OSD is currently in use (thanks to Kimmo
+  Tykkala for pointing out this problem).
+- cOsdProvider::NewOsd() now always returns a valid pointer, even if the OSD is
+  currently in use (it will then return a dummy cOsd object and write a message to
+  the log file).
+- Added Estonian language texts (thanks to Arthur Konovalov).
+- Fixed 'newplugin' and libsi/Makefile to use the compiler defined in $(CXX) for
+  generating file dependencies (thanks to Andreas Brachold).
+- Moved the initialization of aPid1 and aPid2 to the beginning of cDvbDevice::cDvbDevice()
+  to have them set in case a patch references them (thanks to Wayne Keer for pointing
+  this out).
+- Completed the Russian OSD texts (thanks to Vyacheslav Dikonov).
+- Avoiding unnecessary section filter start/stops (thanks to Marco Schl��ler).
+- Made the "Channel not available!" message and mtInfo instead of mtError (suggested
+  by Wayne Keer).
+- Made volume control more linear (thanks to Emil Naepflein and Udo Richter).
+- Now skipping code table info in SI data (suggested by Milos Kapoun).
+- Added missing Czech characters to fontosd-iso8859-2.c (thanks to Milos Kapoun).
+- Fixed a crash in the time search mechanism (reported by Reinhard Nissl).
+- If one PID can't be added, the whole cDevice::AttachReceiver() will now fail
+  and all PIDs added so far will be deleted (thanks to Marco Schl��ler for
+  pointing out this one).
+- Now only saving channels.conf after a modification made by the user (avoids
+  lots of disk access due to automatic channel updates). Automatic channel
+  modifications will be saved every 10 minutes if no recording is currently
+  active.
+- Removed the 'Log' parameter from the cChannel::Set... functions. Instead
+  checking if the channel has a non-zero number.
+- Updated 'channels.conf.terr' for Hannover (thanks to Sven Kreiensen).
diff --git a/Makefile b/Makefile
index 4a2197c11..83f0c811d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.67 2004/05/16 10:51:44 kls Exp $
+# $Id: Makefile 1.68 2004/10/16 11:58:14 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -56,6 +56,10 @@ FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
 OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
 SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
 
+FIXFONT_ISO8859_15 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-15
+OSDFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-15
+SMLFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-15
+
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
 endif
@@ -77,7 +81,8 @@ font: genfontfile\
       fontfix.c fontosd.c fontsml.c\
       fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
       fontfix_iso8859_5.c fontosd_iso8859_5.c fontsml_iso8859_5.c\
-      fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c
+      fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c\
+      fontfix_iso8859_15.c fontosd_iso8859_15.c fontsml_iso8859_15.c
 	@echo "font files created."
 
 # Implicit rules:
@@ -129,6 +134,13 @@ fontosd-iso8859-7.c:
 fontsml-iso8859-7.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
 
+fontfix-iso8859-15.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_15" "$(FIXFONT_ISO8859_15)" > $@
+fontosd-iso8859-15.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_15" "$(OSDFONT_ISO8859_15)" > $@
+fontsml-iso8859-15.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_15" "$(SMLFONT_ISO8859_15)" > $@
+
 # The font file generator:
 
 genfontfile: genfontfile.c
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index c1c5f98e9..2d15da7ea 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -24,3 +24,7 @@ VDR Plugin 'sky' Revision History
 - Added automatic DST detection to getskyepg.pl.
 - Fixed handling receivers, so that a recording on the same channel
   won't interrupt an ongoing Transfer mode.
+
+2004-10-16: Version 0.3.1
+
+- Improved buffer handling.
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 6196eefc2..eea697ea8 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.6 2004/02/15 14:59:46 kls Exp $
+ * $Id: sky.c 1.7 2004/10/16 09:10:06 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -14,7 +14,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.0";
+static const char *VERSION        = "0.3.1";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
@@ -140,7 +140,7 @@ bool cDigiboxDevice::OpenDvr(void)
   CloseDvr();
   fd_dvr = open("/dev/video2", O_RDONLY | O_NONBLOCK);//XXX parameter???
   if (fd_dvr >= 0)
-     tsBuffer = new cTSBuffer(fd_dvr, KILOBYTE(256), CardIndex() + 1);
+     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1);
   return fd_dvr >= 0;
 }
 
@@ -157,24 +157,16 @@ void cDigiboxDevice::CloseDvr(void)
 bool cDigiboxDevice::GetTSPacket(uchar *&Data)
 {
   if (tsBuffer) {
-     int r = tsBuffer->Read();
-     if (r >= 0) {
-        Data = tsBuffer->Get();
-        if (Data) {
-           // insert the actual PIDs:
-           int Pid = (((uint16_t)Data[1] & PID_MASK_HI) << 8) | Data[2];
-           if (Pid == DUMMYAPID)
-              Pid = apid;
-           else if (Pid == DUMMYVPID)
-              Pid = vpid;
-           Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~PID_MASK_HI);
-           Data[2] = Pid & 0xFF;
-           }
-        return true;
-        }
-     else if (FATALERRNO) {
-        LOG_ERROR;
-        return false;
+     Data = tsBuffer->Get();
+     if (Data) {
+        // insert the actual PIDs:
+        int Pid = (((uint16_t)Data[1] & PID_MASK_HI) << 8) | Data[2];
+        if (Pid == DUMMYAPID)
+           Pid = apid;
+        else if (Pid == DUMMYVPID)
+           Pid = vpid;
+        Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~PID_MASK_HI);
+        Data[2] = Pid & 0xFF;
         }
      return true;
      }
diff --git a/channels.c b/channels.c
index 021b61743..ad3ca7fca 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.25 2004/04/03 13:42:06 kls Exp $
+ * $Id: channels.c 1.27 2004/10/17 12:20:56 kls Exp $
  */
 
 #include "channels.h"
@@ -261,7 +261,7 @@ int cChannel::Modification(int Mask)
   return Result;
 }
 
-bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, bool Log)
+bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
 {
   // Workarounds for broadcaster stupidity:
   // Some providers broadcast the transponder frequency of their channels with two different
@@ -273,41 +273,46 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
      return false;
 
   if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
-     if (Log)
+     if (Number()) {
         dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), cSource::ToString(source), frequency, polarization, srate, coderateH, cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      source = Source;
      frequency = Frequency;
      polarization = Polarization;
      srate = Srate;
      coderateH = CoderateH;
      modulation = QPSK;
-     modification |= CHANNELMOD_TRANSP;
-     Channels.SetModified();
      }
   return true;
 }
 
-bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH, bool Log)
+bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH)
 {
   if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
-     if (Log)
+     if (Number()) {
         dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, modulation, srate, coderateH, cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      source = Source;
      frequency = Frequency;
      modulation = Modulation;
      srate = Srate;
      coderateH = CoderateH;
-     modification |= CHANNELMOD_TRANSP;
-     Channels.SetModified();
      }
   return true;
 }
 
-bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, bool Log)
+bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission)
 {
   if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
-     if (Log)
+     if (Number()) {
         dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      source = Source;
      frequency = Frequency;
      bandwidth = Bandwidth;
@@ -317,34 +322,34 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
      coderateL = CoderateL;
      guard = Guard;
      transmission = Transmission;
-     modification |= CHANNELMOD_TRANSP;
-     Channels.SetModified();
      }
   return true;
 }
 
-void cChannel::SetId(int Nid, int Tid, int Sid, int Rid, bool Log)
+void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
 {
   if (nid != Nid || tid != Tid || sid != Sid || rid != Rid) {
-     if (Log)
+     if (Number()) {
         dsyslog("changing id of channel %d from %d-%d-%d-%d to %d-%d-%d-%d", Number(), nid, tid, sid, rid, Nid, Tid, Sid, Rid);
+        modification |= CHANNELMOD_ID;
+        Channels.SetModified();
+        }
      nid = Nid;
      tid = Tid;
      sid = Sid;
      rid = Rid;
-     modification |= CHANNELMOD_ID;
-     Channels.SetModified();
      }
 }
 
-void cChannel::SetName(const char *Name, bool Log)
+void cChannel::SetName(const char *Name)
 {
   if (!isempty(Name) && strcmp(name, Name) != 0) {
-     if (Log)
+     if (Number()) {
         dsyslog("changing name of channel %d from '%s' to '%s'", Number(), name, Name);
+        modification |= CHANNELMOD_NAME;
+        Channels.SetModified();
+        }
      strn0cpy(name, Name, MaxChannelName);
-     modification |= CHANNELMOD_NAME;
-     Channels.SetModified();
      }
 }
 
@@ -749,7 +754,7 @@ cChannels Channels;
 cChannels::cChannels(void)
 {
   maxNumber = 0;
-  modified = false;
+  modified = CHANNELSMOD_NONE;
 }
 
 bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
@@ -863,15 +868,15 @@ bool cChannels::SwitchTo(int Number)
   return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
 }
 
-void cChannels::SetModified(void)
+void cChannels::SetModified(bool ByUser)
 {
-  modified = true;
+  modified = ByUser ? CHANNELSMOD_USER : !modified ? CHANNELSMOD_AUTO : modified;
 }
 
-bool cChannels::Modified(void)
+int cChannels::Modified(void)
 {
-  bool Result = modified;
-  modified = false;
+  int Result = modified;
+  modified = CHANNELSMOD_NONE;
   return Result;
 }
 
@@ -880,10 +885,10 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, i
   if (Transponder) {
      dsyslog("creating new channel '%s' on %s transponder %d with id %d-%d-%d-%d", Name, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
      cChannel *NewChannel = new cChannel(*Transponder);
+     NewChannel->SetId(Nid, Tid, Sid, Rid);
+     NewChannel->SetName(Name);
      Add(NewChannel);
      ReNumber();
-     NewChannel->SetId(Nid, Tid, Sid, Rid, false);
-     NewChannel->SetName(Name, false);
      return NewChannel;
      }
   return NULL;
diff --git a/channels.conf b/channels.conf
index 7c2423b8a..008f73275 100644
--- a/channels.conf
+++ b/channels.conf
@@ -4,7 +4,7 @@ ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:13
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
 Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
-hessen fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
+hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR Fernsehen S�dwest;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
@@ -12,7 +12,7 @@ BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
-3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu:230:0:28007:1:1079:0
+3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
 ORF 1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
@@ -27,7 +27,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -45,9 +45,9 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 START,PREMIERE START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
-PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
+PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0
+PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1801,1722:11:133:2:0
+PREM 3,PREMIERE 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREM 4,PREMIERE 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREM 5,PREMIERE 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREM 6,PREMIERE 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
@@ -57,10 +57,10 @@ DISNEY,DISNEY CHANNEL;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702
 DIREKT,PREMIERE DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 B-UHSE,BEATE-UHSE.TV;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
-EROTIK,PREMIERE EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
+EROTIK,DIREKT EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
-SPORT 2,PREMIERE SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
+SPORT 1,PREMIERE SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu:32:1801,1702,1722:17:133:3:0
+SPORT 2,PREMIERE SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 Liberty TV.com;Maastricht Multimedia:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -69,10 +69,10 @@ ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
-FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:0:8501:1:1090:0
+FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
 LCP;CSAT:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
 ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
-CANAL CLUB;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
+Best of Shopping;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
 ASTRA-Mosaic;ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
 ASTRA-Mosaic 2;ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
 ASTRA-Mosaic 3;ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
@@ -90,8 +90,8 @@ QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
-Sky One Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2317=NAR:2316:960,961:5104:2:2027:0
-ITV2;BSkyB:10906:vC56:S28.2E:22000:2348:2349=eng,2350=eng:2351:960,961:10240:2:2054:0
+Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5104:2:2027:0
+ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2054:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0
@@ -114,7 +114,7 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-AL HAYAT;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+Olisat;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
 :@1000 New channels
diff --git a/channels.conf.terr b/channels.conf.terr
index 6148fd458..11c40b175 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -73,19 +73,19 @@ Eurosport:754000:I0C23D0M16B8T8G8Y0:T:27500:577:578:583:0:16420:0:0:0
 DSF:754000:I0C23D0M16B8T8G8Y0:T:27500:129:130:135:0:16392:0:0:0
 VIVA Plus:754000:I0C23D0M16B8T8G8Y0:T:27500:529:530:535:0:16417:0:0:0
 Testkanal Pro7:778000:I0C23D0M16B8T8G8Y0:T:27500:305:306:311:0:16403:0:0:0
-: DVB-T Nord Hannover Germany
-ARD:530000:I0C12D0M16B8T8G32Y0:T:27500:4113:4114:4117:0:1:0:0:0
-Phoenix:530000:I0C12D0M16B8T8G32Y0:T:27500:4145:4146:4148:0:3:0:0:0
-Eins-Extra:530000:I0C12D0M16B8T8G32Y0:T:27500:4161:4162:0:0:4:0:0:0
-NDR:530000:I0C12D0M16B8T8G32Y0:T:27500:4129:4130:4133:0:129:0:0:0
-SAT.1:658000:I0C12D0M16B8T8G32Y0:T:27500:385:386:391:0:16408:0:0:0
-ProSieben:658000:I0C12D0M16B8T8G32Y0:T:27500:305:306:311:0:16403:0:0:0
-N24:658000:I0C12D0M16B8T8G32Y0:T:27500:225:226:231:0:16398:0:0:0
-KABEL1:658000:I0C12D0M16B8T8G32Y0:T:27500:161:162:167:0:16394:0:0:0
-VOX:498000:I0C12D0M16B8T8G32Y0:T:27500:545:546:551:0:16418:0:0:0
-RTL:498000:I0C12D0M16B8T8G32Y0:T:27500:337:338:343:0:16405:0:0:0
-RTL2:498000:I0C12D0M16B8T8G32Y0:T:27500:353:354:359:0:16406:0:0:0
-Super-RTL:498000:I0C12D0M16B8T8G32Y0:T:27500:369:370:375:0:16407:0:0:0
-ZDF:490000:I0C12D0M16B8T8G32Y0:T:27500:545:546:551:0:514:0:0:0
-Info-3sat:490000:I0C12D0M16B8T8G32Y0:T:27500:561:562:567:0:515:0:0:0
-Doku-KiKa:490000:I0C12D0M16B8T8G32Y0:T:27500:593:594:514:0:517:0:0:0
+: DVB-T Hannover, Germany
+ZDF:490000:I0C23D0M16B8T8G32Y0:T:27500:545:546:551:0:514:0:0
+Info/3sat:490000:I0C23D0M16B8T8G32Y0:T:27500:561:562:567:0:515:0:0
+Doku/KiKa:490000:I0C23D0M16B8T8G32Y0:T:27500:593:594:599:0:517:0:0
+RTL Television:498000:I0C23D0M16B8T8G32Y0:T:27500:337:337:343:0:16405:0:0
+RTL2:498000:I0C23D0M16B8T8G32Y0:T:27500:353:354:359:0:16406:0:0
+Super RTL:498000:I0C23D0M16B8T8G32Y0:T:27500:369:370:375:0:16407:0:0
+VOX:498000:I0C23D0M16B8T8G32Y0:T:27500:545:546:551:0:16418:0:0
+NDR FS NDS:530000:I0C23D0M16B8T8G32Y0:T:27500:4129:4130:4133:0:129:0:0
+Das Erste:530000:I0C23D0M16B8T8G32Y0:T:27500:4113:4114:4117:0:1:0:0
+Eins Extra:530000:I0C23D0M16B8T8G32Y0:T:27500:4161:4162:8192:0:4:0:0
+Phoenix:530000:I0C23D0M16B8T8G32Y0:T:27500:4145:4146:4148:0:3:0:0
+Sat.1:658000:I0C23D0M16B8T8G32Y0:T:27500:385:386:391:0:16408:0:0
+N24:658000:I0C23D0M16B8T8G32Y0:T:27500:225:226:231:0:16398:0:0
+ProSieben:658000:I0C23D0M16B8T8G32Y0:T:27500:305:306:311:0:16403:0:0
+KABEL1:658000:I0C23D0M16B8T8G32Y0:T:27500:161:162:167:0:16394:0:0
diff --git a/channels.h b/channels.h
index f5c9fbe1f..666e91b62 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.17 2004/04/03 13:40:47 kls Exp $
+ * $Id: channels.h 1.19 2004/10/17 11:52:07 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -26,6 +26,10 @@
 #define CHANNELMOD_TRANSP   0x20
 #define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA | CHANNELMOD_TRANSP)
 
+#define CHANNELSMOD_NONE    0
+#define CHANNELSMOD_AUTO    1
+#define CHANNELSMOD_USER    2
+
 #define MAXAPIDS 32
 #define MAXCAIDS  8
 
@@ -163,11 +167,11 @@ class cChannel : public cListObject {
   bool IsTerr(void) const { return (source & cSource::st_Mask) == cSource::stTerr; }
   tChannelID GetChannelID(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
-  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, bool Log = true);
-  bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH, bool Log = true);
-  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, bool Log = true);
-  void SetId(int Nid, int Tid, int Sid, int Rid = 0, bool Log = true);
-  void SetName(const char *Name, bool Log = true);
+  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
+  bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
+  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
+  void SetId(int Nid, int Tid, int Sid, int Rid = 0);
+  void SetName(const char *Name);
   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
@@ -178,7 +182,7 @@ class cChannel : public cListObject {
 class cChannels : public cRwLock, public cConfig<cChannel> {
 private:
   int maxNumber;
-  bool modified;
+  int modified;
   int beingEdited;
 public:
   cChannels(void);
@@ -196,8 +200,11 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
-  void SetModified(void);
-  bool Modified(void);
+  void SetModified(bool ByUser = false);
+  int Modified(void);
+      ///< Returns 0 if no channels have been modified, 1 if an automatic
+      ///< modification has been made, and 2 if the user has made a modification.
+      ///< Calling this function resets the 'modified' flag to 0.
   cChannel *NewChannel(const cChannel *Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid = 0);
   };
 
diff --git a/config.h b/config.h
index 3a67da641..d61f1d1e4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.199 2004/07/17 11:09:42 kls Exp $
+ * $Id: config.h 1.200 2004/07/27 07:22:46 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.12"
-#define VDRVERSNUM   10312  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.13"
+#define VDRVERSNUM   10313  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index d62b45635..b53c0ab2c 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.56 2004/06/19 08:51:05 kls Exp $
+ * $Id: device.c 1.60 2004/10/17 09:39:10 kls Exp $
  */
 
 #include "device.h"
@@ -248,7 +248,11 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
         if (++pidHandles[n].used == 2 && n <= ptTeletext) {
            // It's a special PID that may have to be switched into "tap" mode
            PRINTPIDS("A");
-           return SetPid(&pidHandles[n], n, true);
+           if (!SetPid(&pidHandles[n], n, true)) {
+              esyslog("ERROR: can't set PID %d on device %d", Pid, CardIndex() + 1);
+              DelPid(Pid, PidType);
+              return false;
+              }
            }
         PRINTPIDS("a");
         return true;
@@ -261,13 +265,19 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
         // The Pid is not yet in use and we have a free slot
         n = a;
         }
-     else
-        esyslog("ERROR: no free slot for PID %d", Pid);
+     else {
+        esyslog("ERROR: no free slot for PID %d on device %d", Pid, CardIndex() + 1);
+        return false;
+        }
      if (n >= 0) {
         pidHandles[n].pid = Pid;
         pidHandles[n].used = 1;
         PRINTPIDS("C");
-        return SetPid(&pidHandles[n], n, true);
+        if (!SetPid(&pidHandles[n], n, true)) {
+           esyslog("ERROR: can't set PID %d on device %d", Pid, CardIndex() + 1);
+           DelPid(Pid, PidType);
+           return false;
+           }
         }
      }
   return true;
@@ -314,7 +324,6 @@ void cDevice::StartSectionHandler(void)
      AttachFilter(patFilter = new cPatFilter);
      AttachFilter(sdtFilter = new cSdtFilter(patFilter));
      AttachFilter(nitFilter = new cNitFilter);
-     sectionHandler->SetStatus(true);
      }
 }
 
@@ -357,7 +366,7 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
   for (int i = 3; i--;) {
       switch (SetChannel(Channel, LiveView)) {
         case scrOk:           return true;
-        case scrNotAvailable: Skins.Message(mtError, tr("Channel not available!"));
+        case scrNotAvailable: Skins.Message(mtInfo, tr("Channel not available!"));
                               return false;
         case scrNoTransfer:   Skins.Message(mtError, tr("Can't start Transfer Mode!"));
                               return false;
@@ -758,8 +767,13 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
      return true;
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
-         for (int n = 0; n < MAXRECEIVEPIDS; n++)
-             AddPid(Receiver->pids[n]);//XXX+ retval!
+         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
+             if (!AddPid(Receiver->pids[n])) {
+                for ( ; n-- > 0; )
+                    DelPid(Receiver->pids[n]);
+                return false;
+                }
+             }
          Receiver->Activate(true);
          Lock();
          Receiver->device = this;
@@ -801,79 +815,67 @@ void cDevice::Detach(cReceiver *Receiver)
 
 cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
 {
+  SetDescription("TS buffer on device %d", CardIndex);
   f = File;
-  size = Size / TS_SIZE * TS_SIZE;
   cardIndex = CardIndex;
-  tsRead = tsWrite = 0;
-  buf = (f >= 0 && size >= TS_SIZE) ? MALLOC(uchar, size + TS_SIZE) : NULL;
-  // the '+ TS_SIZE' allocates some extra space for handling packets that got split by a buffer roll-over
-  firstRead = true;
+  active = false;
+  delivered = false;
+  ringBuffer = new cRingBufferLinear(Size, TS_SIZE, true, "TS");
+  ringBuffer->SetTimeouts(100, 100);
+  Start();
 }
 
 cTSBuffer::~cTSBuffer()
 {
-  free(buf);
-}
-
-int cTSBuffer::Read(void)
-{
-  if (buf) {
-     cPoller Poller(f, false);
-     bool repeat;
-     int total = 0;
-     do {
-        repeat = false;
-        if (firstRead || Used() > TS_SIZE || Poller.Poll(100)) { // only wait if there's not enough data in the buffer
-           firstRead = false;
-           if (tsRead == tsWrite)
-              tsRead = tsWrite = 0; // keep the maximum buffer space available
-           if (tsWrite >= size && tsRead > 0)
-              tsWrite = 0;
-           int free = tsRead <= tsWrite ? size - tsWrite : tsRead - tsWrite - 1;
-           if (free > 0) {
-              int r = read(f, buf + tsWrite, free);
-              if (r > 0) {
-                 total += r;
-                 tsWrite += r;
-                 if (tsWrite >= size && tsRead > 0) {
-                    tsWrite = 0;
-                    repeat = true; // read again after a boundary roll-over
-                    }
-                 }
-              }
-           }
-        } while (repeat);
-     return total;
+  active = false;
+  Cancel(3);
+  delete ringBuffer;
+}
+
+void cTSBuffer::Action(void)
+{
+  if (ringBuffer) {
+     bool firstRead = true;
+     cPoller Poller(f);
+     active = true;
+     for (; active;) {
+         if (firstRead || Poller.Poll(100)) {
+            firstRead = false;
+            int r = ringBuffer->Read(f);
+            if (r < 0 && FATALERRNO) {
+               if (errno == EOVERFLOW)
+                  esyslog("ERROR: driver buffer overflow on device %d", cardIndex);
+               else {
+                  LOG_ERROR;
+                  break;
+                  }
+               }
+            }
+         }
      }
-  return -1;
 }
 
 uchar *cTSBuffer::Get(void)
 {
-  if (Used() >= TS_SIZE) {
-     uchar *p = buf + tsRead;
+  int Count = 0;
+  if (delivered) {
+     ringBuffer->Del(TS_SIZE);
+     delivered = false;
+     }
+  uchar *p = ringBuffer->Get(Count);
+  if (p && Count >= TS_SIZE) {
      if (*p != TS_SYNC_BYTE) {
-        esyslog("ERROR: not sync'ed to TS packet on device %d", cardIndex);
-        int tsMax = tsRead < tsWrite ? tsWrite : size;
-        for (int i = tsRead; i < tsMax; i++) {
-            if (buf[i] == TS_SYNC_BYTE) {
-               esyslog("ERROR: skipped %d bytes to sync on TS packet on device %d", i - tsRead, cardIndex);
-               tsRead = i;
-               return NULL;
+        for (int i = 1; i < Count; i++) {
+            if (p[i] == TS_SYNC_BYTE) {
+               Count = i;
+               break;
                }
             }
-        if ((tsRead = tsMax) >= size)
-           tsRead = 0;
+        ringBuffer->Del(Count);
+        esyslog("ERROR: skipped %d bytes to sync on TS packet on device %d", Count, cardIndex);
         return NULL;
         }
-     if (tsRead + TS_SIZE > size) {
-        // the packet rolled over the buffer boundary, so let's fetch the rest from the beginning (which MUST be there, since Used() >= TS_SIZE)
-        int rest = TS_SIZE - (size - tsRead);
-        memcpy(buf + size, buf, rest);
-        tsRead = rest;
-        }
-     else if ((tsRead += TS_SIZE) >= size)
-        tsRead = 0;
+     delivered = true;
      return p;
      }
   return NULL;
diff --git a/device.h b/device.h
index 10bca28c2..bec6bf5be 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.44 2004/06/19 08:50:37 kls Exp $
+ * $Id: device.h 1.45 2004/09/24 14:07:22 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -15,6 +15,7 @@
 #include "filter.h"
 #include "nit.h"
 #include "pat.h"
+#include "ringbuffer.h"
 #include "sdt.h"
 #include "sections.h"
 #include "thread.h"
@@ -437,20 +438,17 @@ class cDevice : public cThread {
 /// sure the returned data points to a TS packet and automatically
 /// re-synchronizes after broken packets.
 
-class cTSBuffer {
+class cTSBuffer : public cThread {
 private:
   int f;
-  int size;
   int cardIndex;
-  int tsRead;
-  int tsWrite;
-  uchar *buf;
-  bool firstRead;
-  int Used(void) { return tsRead <= tsWrite ? tsWrite - tsRead : size - tsRead + tsWrite; }
+  bool active;
+  bool delivered;
+  cRingBufferLinear *ringBuffer;
+  virtual void Action(void);
 public:
   cTSBuffer(int File, int Size, int CardIndex);
   ~cTSBuffer();
-  int Read(void);
   uchar *Get(void);
   };
 
diff --git a/dvbdevice.c b/dvbdevice.c
index 833480132..561b6c620 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.93 2004/06/19 09:33:42 kls Exp $
+ * $Id: dvbdevice.c 1.97 2004/10/17 09:10:43 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -78,8 +78,7 @@ class cDvbTuner : public cThread {
   bool useCa;
   time_t startTime;
   eTunerStatus tunerStatus;
-  cMutex mutex;
-  cCondVar newSet;
+  cCondWait newSet;
   bool SetFrontend(void);
   virtual void Action(void);
 public:
@@ -111,7 +110,7 @@ cDvbTuner::~cDvbTuner()
 {
   active = false;
   tunerStatus = tsIdle;
-  newSet.Broadcast();
+  newSet.Signal();
   Cancel(3);
 }
 
@@ -122,7 +121,7 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 
 void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
 {
-  cMutexLock MutexLock(&mutex);
+  Lock();
   if (Tune)
      tunerStatus = tsSet;
   else if (tunerStatus == tsCam)
@@ -131,7 +130,8 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
   if (Channel->Ca() && tunerStatus != tsCam)
      startTime = time(NULL);
   channel = *Channel;
-  newSet.Broadcast();
+  Unlock();
+  newSet.Signal();
 }
 
 static unsigned int FrequencyToHz(unsigned int f)
@@ -252,7 +252,7 @@ void cDvbTuner::Action(void)
 {
   active = true;
   while (active) {
-        cMutexLock MutexLock(&mutex);
+        Lock();
         if (tunerStatus == tsSet)
            tunerStatus = SetFrontend() ? tsTuned : tsIdle;
         if (tunerStatus == tsTuned) {
@@ -267,7 +267,6 @@ void cDvbTuner::Action(void)
               if (event.status & FE_REINIT) {
                  tunerStatus = tsSet;
                  esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
-                 continue;
                  }
               }
            }
@@ -292,8 +291,9 @@ void cDvbTuner::Action(void)
            else if (tunerStatus > tsLocked)
               tunerStatus = tsLocked;
            }
+        Unlock();
         // in the beginning we loop more often to let the CAM connection start up fast
-        newSet.TimedWait(mutex, (ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
+        newSet.Wait((ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
         }
 }
 
@@ -307,6 +307,7 @@ cDvbDevice::cDvbDevice(int n)
   frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   spuDecoder = NULL;
   playMode = pmNone;
+  aPid1 = aPid2 = 0;
 
   // Devices that are present on all card types:
 
@@ -371,8 +372,6 @@ cDvbDevice::cDvbDevice(int n)
   else
      esyslog("ERROR: can't open DVB device %d", n);
 
-  aPid1 = aPid2 = 0;
-
   StartSectionHandler();
 }
 
@@ -786,7 +785,8 @@ void cDvbDevice::SetVolumeDevice(int Volume)
 {
   if (HasDecoder()) {
      audio_mixer_t am;
-     am.volume_left = am.volume_right = Volume;
+     // conversion for linear volume response:
+     am.volume_left = am.volume_right = 2 * Volume - Volume * Volume / 255;
      CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
      }
 }
@@ -1101,29 +1101,17 @@ bool cDvbDevice::OpenDvr(void)
 void cDvbDevice::CloseDvr(void)
 {
   if (fd_dvr >= 0) {
-     close(fd_dvr);
-     fd_dvr = -1;
      delete tsBuffer;
      tsBuffer = NULL;
+     close(fd_dvr);
+     fd_dvr = -1;
      }
 }
 
 bool cDvbDevice::GetTSPacket(uchar *&Data)
 {
   if (tsBuffer) {
-     int r = tsBuffer->Read();
-     if (r >= 0) {
-        Data = tsBuffer->Get();
-        return true;
-        }
-     else if (FATALERRNO) {
-        if (errno == EOVERFLOW)
-           esyslog("ERROR: DVB driver buffer overflow on device %d", CardIndex() + 1);
-        else {
-           LOG_ERROR;
-           return false;
-           }
-        }
+     Data = tsBuffer->Get();
      return true;
      }
   return false;
diff --git a/dvbplayer.c b/dvbplayer.c
index 8b60c2e18..c9cdc1ab6 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.24 2004/06/19 08:55:49 kls Exp $
+ * $Id: dvbplayer.c 1.25 2004/10/15 13:07:55 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -80,8 +80,7 @@ class cNonBlockingFileReader : public cThread {
   int length;
   bool hasData;
   bool active;
-  cMutex mutex; 
-  cCondVar newSet;
+  cCondWait newSet;
 protected:
   void Action(void);
 public:
@@ -106,20 +105,21 @@ cNonBlockingFileReader::cNonBlockingFileReader(void)
 cNonBlockingFileReader::~cNonBlockingFileReader()
 {
   active = false;
-  newSet.Broadcast();
+  newSet.Signal();
   Cancel(3);
   free(buffer);
 }
 
 void cNonBlockingFileReader::Clear(void)
 {
-  cMutexLock MutexLock(&mutex);
+  Lock();
   f = -1;
   free(buffer);
   buffer = NULL;
   wanted = length = 0;
   hasData = false;
-  newSet.Broadcast();
+  Unlock();
+  newSet.Signal();
 }
 
 int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
@@ -139,7 +139,7 @@ int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
      wanted = Length;
      length = 0;
      hasData = false;
-     newSet.Broadcast();
+     newSet.Signal();
      }
   errno = EAGAIN;
   return -1;
@@ -149,7 +149,7 @@ void cNonBlockingFileReader::Action(void)
 {
   active = true;
   while (active) {
-        cMutexLock MutexLock(&mutex);
+        Lock();
         if (!hasData && f >= 0 && buffer) {
            int r = safe_read(f, buffer + length, wanted - length);
            if (r >= 0) {
@@ -163,16 +163,14 @@ void cNonBlockingFileReader::Action(void)
               hasData = true;
               }
            }
-        newSet.TimedWait(mutex, 1000);
+        Unlock();
+        newSet.Wait(1000);
         }
 }
 
 // --- cDvbPlayer ------------------------------------------------------------
 
-//XXX+ also used in recorder.c - find a better place???
-// The size of the array used to buffer video data:
-// (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE  MEGABYTE(1)
+#define PLAYERBUFSIZE  MEGABYTE(1)
 
 // The number of frames to back up when resuming an interrupted replay session:
 #define RESUMEBACKUP (10 * FRAMESPERSEC)
@@ -257,7 +255,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   replayFile = fileName->Open();
   if (replayFile < 0)
      return;
-  ringBuffer = new cRingBufferFrame(VIDEOBUFSIZE);
+  ringBuffer = new cRingBufferFrame(PLAYERBUFSIZE);
   // Create the index file:
   index = new cIndexFile(FileName, false);
   if (!index)
diff --git a/eit.c b/eit.c
index dac29539c..b0cbfdfe7 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.96 2004/07/18 10:52:58 kls Exp $
+ * $Id: eit.c 1.97 2004/10/16 09:49:13 kls Exp $
  */
 
 #include "eit.h"
@@ -47,10 +47,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
   bool Modified = false;
 
   SI::EIT::Event SiEitEvent;
-  for (SI::Loop::Iterator it; eventLoop.hasNext(it); ) {
+  for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
       Empty = false;
-      SiEitEvent = eventLoop.getNext(it);
-
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
       if (!pEvent) {
          // If we don't have that event yet, we create a new one.
diff --git a/fontfix-iso8859-15.c b/fontfix-iso8859-15.c
new file mode 100644
index 000000000..24189544b
--- /dev/null
+++ b/fontfix-iso8859-15.c
@@ -0,0 +1,6498 @@
+cFont::tPixelData FontFix_iso8859_15[][28] = {
+  {             // 32
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 33
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 34
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00001DC0,  // ...***.***.....
+     0x00000880,  // ....*...*......
+     0x00000880,  // ....*...*......
+     0x00000880,  // ....*...*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 35
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00001980,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 36
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000F60,  // ....****.**....
+     0x00001FE0,  // ...********....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F80,  // ...******......
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00003FE0,  // ..*********....
+     0x000037C0,  // ..**.*****.....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 37
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F00,  // ....****.......
+     0x00001980,  // ...**..**......
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00001980,  // ...**..**......
+     0x00000F00,  // ....****.......
+     0x00000070,  // .........***...
+     0x000003C0,  // ......****.....
+     0x00000E00,  // ....***........
+     0x000039E0,  // ..***..****....
+     0x00000330,  // ......**..**...
+     0x00000618,  // .....**....**..
+     0x00000618,  // .....**....**..
+     0x00000330,  // ......**..**...
+     0x000001E0,  // .......****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 38
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000E00,  // ....***........
+     0x00001F30,  // ...*****..**...
+     0x00001BF0,  // ...**.******...
+     0x000031E0,  // ..**...****....
+     0x000030C0,  // ..**....**.....
+     0x000031E0,  // ..**...****....
+     0x00003FF8,  // ..***********..
+     0x00001F38,  // ...*****..***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000800,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 40
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000060,  // .........**....
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000E0,  // ........***....
+     0x00000060,  // .........**....
+     0x00000000,  // ...............
+  },
+  {             // 41
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001C00,  // ...***.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00000000,  // ...............
+  },
+  {             // 42
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003330,  // ..**..**..**...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000300,  // ......**.......
+     0x00000FC0,  // ....******.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 43
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 44
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000800,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 45
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 46
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 47
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 48
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00001860,  // ...**....**....
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 49
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 50
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C00,  // ...***.........
+     0x00003800,  // ..***..........
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 51
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000007C0,  // .....*****.....
+     0x000007E0,  // .....******....
+     0x00000070,  // .........***...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x00003FE0,  // ..*********....
+     0x00001FC0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 52
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000030C0,  // ..**....**.....
+     0x000030C0,  // ..**....**.....
+     0x00007FF0,  // .***********...
+     0x00007FF0,  // .***********...
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000007F0,  // .....*******...
+     0x000007F0,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 53
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ...*********...
+     0x00001FF0,  // ...*********...
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BC0,  // ...**.****.....
+     0x00001FF0,  // ...*********...
+     0x00001C70,  // ...***...***...
+     0x00000038,  // ..........***..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00003038,  // ..**......***..
+     0x00003870,  // ..***....***...
+     0x00001FF0,  // ...*********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 54
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F0,  // .......*****...
+     0x000007F0,  // .....*******...
+     0x00000F00,  // ....****.......
+     0x00001C00,  // ...***.........
+     0x00001800,  // ...**..........
+     0x00003800,  // ..***..........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003830,  // ..***.....**...
+     0x00001C70,  // ...***...***...
+     0x00001FE0,  // ...********....
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 55
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 56
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 57
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // ......****.....
+     0x00000FF0,  // ....********...
+     0x00000C30,  // ....**....**...
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C78,  // ...***...****..
+     0x00000FD8,  // ....******.**..
+     0x00000798,  // .....****..**..
+     0x00000018,  // ...........**..
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 58
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 59
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00001800,  // ...**..........
+     0x00001000,  // ...*...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 60
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000001C,  // ...........***.
+     0x00000078,  // .........****..
+     0x000001E0,  // .......****....
+     0x00000780,  // .....****......
+     0x00001E00,  // ...****........
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001E00,  // ...****........
+     0x00000780,  // .....****......
+     0x000001E0,  // .......****....
+     0x00000078,  // .........****..
+     0x0000001C,  // ...........***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007000,  // .***...........
+     0x00003C00,  // ..****.........
+     0x00000F00,  // ....****.......
+     0x000003C0,  // ......****.....
+     0x000000F0,  // ........****...
+     0x0000003C,  // ..........****.
+     0x0000003C,  // ..........****.
+     0x000000F0,  // ........****...
+     0x000003C0,  // ......****.....
+     0x00000F00,  // ....****.......
+     0x00003C00,  // ..****.........
+     0x00007000,  // .***...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00001FE0,  // ...********....
+     0x00001870,  // ...**....***...
+     0x00001830,  // ...**.....**...
+     0x00001830,  // ...**.....**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x000001E0,  // .......****....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 64
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x00003060,  // ..**.....**....
+     0x00003060,  // ..**.....**....
+     0x000031E0,  // ..**...****....
+     0x000033E0,  // ..**..*****....
+     0x00003760,  // ..**.***.**....
+     0x00003660,  // ..**.**..**....
+     0x00003660,  // ..**.**..**....
+     0x00003760,  // ..**.***.**....
+     0x000033F0,  // ..**..******...
+     0x000031F0,  // ..**...*****...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001860,  // ...**....**....
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 65
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF0,  // .***********...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001FF0,  // ...*********...
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003000,  // ..**...........
+     0x00003818,  // ..***......**..
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 68
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 69
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x000018CC,  // ...**...**..**.
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 71
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .....******.**.
+     0x00001FFC,  // ...***********.
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x000060FC,  // .**.....******.
+     0x000060FC,  // .**.....******.
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FF8,  // ...**********..
+     0x000007E0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 73
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 74
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFC,  // ....**********.
+     0x00000FFC,  // ....**********.
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x00006060,  // .**......**....
+     0x000070E0,  // .***....***....
+     0x00003FC0,  // ..********.....
+     0x00001F80,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 75
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCF8,  // ******..*****..
+     0x0000FCF8,  // ******..*****..
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003700,  // ..**.***.......
+     0x00003E00,  // ..*****........
+     0x00003F00,  // ..******.......
+     0x00003B80,  // ..***.***......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00000C18,  // ....**.....**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 77
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F03C,  // ****......****.
+     0x0000F03C,  // ****......****.
+     0x00007878,  // .****....****..
+     0x00007878,  // .****....****..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006798,  // .**..****..**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 78
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 79
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // .**********....
+     0x00007FF8,  // .************..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x0000070C,  // .....***....**.
+     0x00001FFC,  // ...***********.
+     0x00001CF0,  // ...***..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FF80,  // *********......
+     0x0000FFE0,  // ***********....
+     0x00003070,  // ..**.....***...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003070,  // ..**.....***...
+     0x00003FE0,  // ..*********....
+     0x00003F80,  // ..*******......
+     0x000031C0,  // ..**...***.....
+     0x000030E0,  // ..**....***....
+     0x00003060,  // ..**.....**....
+     0x00003070,  // ..**.....***...
+     0x0000FC3C,  // ******....****.
+     0x0000FC3C,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 83
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FE0,  // ....*******....
+     0x000001F0,  // .......*****...
+     0x00000038,  // ..........***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 85
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 86
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006018,  // .**........**..
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00006798,  // .**..****..**..
+     0x00006798,  // .**..****..**..
+     0x00006FD8,  // .**.******.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00003CF0,  // ..****..****...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 88
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x000003E0,  // ......*****....
+     0x000003E0,  // ......*****....
+     0x00000000,  // ...............
+  },
+  {             // 92
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x00000060,  // .........**....
+     0x00000060,  // .........**....
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 93
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+  },
+  {             // 94
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 95
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFFE,  // ***************
+     0x0000FFFE,  // ***************
+     0x00000000,  // ...............
+  },
+  {             // 96
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000180,  // .......**......
+     0x000000C0,  // ........**.....
+     0x00000040,  // .........*.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 97
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 98
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BE0,  // ...**.*****....
+     0x00001FF8,  // ...**********..
+     0x00001E38,  // ...****...***..
+     0x00001C1C,  // ...***.....***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00001C1C,  // ...***.....***.
+     0x00001E38,  // ...****...***..
+     0x00007FF8,  // .************..
+     0x00007BE0,  // .****.*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 99
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00003FF8,  // ..***********..
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 100
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F0,  // ........****...
+     0x000000F0,  // ........****...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FFC,  // ..************.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 101
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 102
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F8,  // .......******..
+     0x000003F8,  // ......*******..
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 103
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000070,  // .........***...
+     0x00001FE0,  // ...********....
+     0x00001FC0,  // ...*******.....
+  },
+  {             // 104
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000F000,  // ****...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x000037C0,  // ..**.*****.....
+     0x00003FE0,  // ..*********....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 105
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 106
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // ..********.....
+     0x00003FC0,  // ..********.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00003F80,  // ..*******......
+     0x00003F00,  // ..******.......
+  },
+  {             // 107
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x000018F0,  // ...**...****...
+     0x000018F0,  // ...**...****...
+     0x000019C0,  // ...**..***.....
+     0x00001B80,  // ...**.***......
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00001B80,  // ...**.***......
+     0x000019C0,  // ...**..***.....
+     0x000018E0,  // ...**...***....
+     0x000078FC,  // .****...******.
+     0x000078FC,  // .****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 108
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 109
+     15, 26,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0001DEF0,  // ***.****.****...
+     0x0001FFF8,  // **************..
+     0x00007398,  // ..***..***..**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x00006318,  // ..**...**...**..
+     0x0001F3DE,  // *****..****.****
+     0x0001F3DE,  // *****..****.****
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 111
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 112
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F7C0,  // ****.*****.....
+     0x0000FFF0,  // ************...
+     0x00003C70,  // ..****...***...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00003C70,  // ..****...***...
+     0x00003FF0,  // ..**********...
+     0x000037C0,  // ..**.*****.....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x0000FE00,  // *******........
+     0x0000FE00,  // *******........
+  },
+  {             // 113
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FBC,  // ....*****.****.
+     0x00003FFC,  // ..************.
+     0x000038F0,  // ..***...****...
+     0x00007070,  // .***.....***...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00006030,  // .**.......**...
+     0x00007070,  // .***.....***...
+     0x000038F0,  // ..***...****...
+     0x00003FF0,  // ..**********...
+     0x00000FB0,  // ....*****.**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x000001FC,  // .......*******.
+     0x000001FC,  // .......*******.
+  },
+  {             // 114
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00003FF8,  // ..***********..
+     0x00000F18,  // ....****...**..
+     0x00000E00,  // ....***........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 115
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 116
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007FE0,  // .**********....
+     0x00007FE0,  // .**********....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001C70,  // ...***...***...
+     0x00000FF0,  // ....********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 117
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 118
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 119
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F87C,  // *****....*****.
+     0x0000F87C,  // *****....*****.
+     0x00006318,  // .**...**...**..
+     0x00006318,  // .**...**...**..
+     0x00003330,  // ..**..**..**...
+     0x000037B0,  // ..**.****.**...
+     0x000037B0,  // ..**.****.**...
+     0x00003CF0,  // ..****..****...
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 121
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 122
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 123
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x000000E0,  // ........***....
+     0x00000000,  // ...............
+  },
+  {             // 124
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 125
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000380,  // ......***......
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00001C00,  // ...***.........
+     0x00000000,  // ...............
+  },
+  {             // 126
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E18,  // ...****....**..
+     0x00003F38,  // ..******..***..
+     0x000073F0,  // .***..******...
+     0x000061E0,  // .**....****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 127
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 161
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000000,  // ...............
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000600,  // .....**........
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000F00,  // ....****.......
+     0x00000600,  // .....**........
+  },
+  {             // 162
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000F60,  // ....****.**....
+     0x00001FE0,  // ...********....
+     0x000038E0,  // ..***...***....
+     0x00003060,  // ..**.....**....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003860,  // ..***....**....
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 163
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00000FE0,  // ....*******....
+     0x00001C60,  // ...***...**....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F80,  // .********......
+     0x00007F80,  // .********......
+     0x00000C00,  // ....**.........
+     0x00000C00,  // ....**.........
+     0x00001C00,  // ...***.........
+     0x00003818,  // ..***......**..
+     0x00007FF8,  // .************..
+     0x00007FF0,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 164
+     17, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // .......******.**.
+     0x00001FFC,  // .....***********.
+     0x0000381C,  // ....***......***.
+     0x0000300C,  // ....**........**.
+     0x0003FFCC,  // ************..**.
+     0x0003FFC0,  // ************.....
+     0x00006000,  // ...**............
+     0x00006000,  // ...**............
+     0x0003FFC0,  // ************.....
+     0x0003FFC0,  // ************.....
+     0x00007000,  // ...***...........
+     0x0000300C,  // ....**........**.
+     0x0000381C,  // ....***......***.
+     0x00001FF8,  // .....**********..
+     0x000007E0,  // .......******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 165
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 166
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x000006C0,  // .....**.**.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FD8,  // ....******.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003C00,  // ..****.........
+     0x00001F80,  // ...******......
+     0x000003F0,  // ......******...
+     0x00000078,  // .........****..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00007FF0,  // .***********...
+     0x00006FE0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 167
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007F0,  // .....*******...
+     0x00000FF0,  // ....********...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001C00,  // ...***.........
+     0x00003F00,  // ..******.......
+     0x000067C0,  // .**..*****.....
+     0x000061F0,  // .**....*****...
+     0x00007878,  // .****....****..
+     0x00003E18,  // ..*****....**..
+     0x00000F98,  // ....*****..**..
+     0x000003F8,  // ......*******..
+     0x000000F0,  // ........****...
+     0x00000060,  // .........**....
+     0x00003060,  // ..**.....**....
+     0x000030E0,  // ..**....***....
+     0x00003FC0,  // ..********.....
+     0x00003F80,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 168
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00001FF0,  // ...*********...
+     0x00003870,  // ..***....***...
+     0x00003830,  // ..***.....**...
+     0x00001F00,  // ...*****.......
+     0x000007C0,  // .....*****.....
+     0x000001F0,  // .......*****...
+     0x00003038,  // ..**......***..
+     0x00003838,  // ..***.....***..
+     0x00003FF0,  // ..**********...
+     0x000037E0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00006798,  // .**..****..**..
+     0x00006FD8,  // .**.******.**..
+     0x0000DCCC,  // **.***..**..**.
+     0x0000D80C,  // **.**.......**.
+     0x0000D80C,  // **.**.......**.
+     0x0000DCCC,  // **.***..**..**.
+     0x00006FD8,  // .**.******.**..
+     0x00006798,  // .**..****..**..
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x000000C0,  // ........**.....
+     0x00000FC0,  // ....******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000019E0,  // ...**..****....
+     0x00000F60,  // ....****.**....
+     0x00000000,  // ...............
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 171
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000071C,  // .....***...***.
+     0x00000E38,  // ....***...***..
+     0x00001C70,  // ...***...***...
+     0x000038E0,  // ..***...***....
+     0x000071C0,  // .***...***.....
+     0x000038E0,  // ..***...***....
+     0x00001C70,  // ...***...***...
+     0x00000E38,  // ....***...***..
+     0x0000071C,  // .....***...***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 172
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 173
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 174
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00001FE0,  // ...********....
+     0x00003870,  // ..***....***...
+     0x00006F98,  // .**.*****..**..
+     0x00006FD8,  // .**.******.**..
+     0x0000CCCC,  // **..**..**..**.
+     0x0000CCCC,  // **..**..**..**.
+     0x0000CF8C,  // **..*****...**.
+     0x0000CD8C,  // **..**.**...**.
+     0x00006CD8,  // .**.**..**.**..
+     0x00006CD8,  // .**.**..**.**..
+     0x00003870,  // ..***....***...
+     0x00001FE0,  // ...********....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 176
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 177
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 178
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000600,  // .....**........
+     0x00000C60,  // ....**...**....
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 179
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000000C0,  // ........**.....
+     0x000003C0,  // ......****.....
+     0x00000060,  // .........**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 180
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000000C0,  // ........**.....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E18,  // ....***....**..
+     0x00001C18,  // ...***.....**..
+     0x00003818,  // ..***......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00003FFC,  // ..************.
+     0x00003FBC,  // ..*******.****.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+  },
+  {             // 182
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FF8,  // ....*********..
+     0x00003FF8,  // ..***********..
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00007360,  // .***..**.**....
+     0x00003F60,  // ..******.**....
+     0x00000F60,  // ....****.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00000360,  // ......**.**....
+     0x00001F78,  // ...*****.****..
+     0x00001F78,  // ...*****.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 183
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 184
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00001C30,  // ...***....**...
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 185
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 186
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000000,  // ...............
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 187
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000071C0,  // .***...***.....
+     0x000038E0,  // ..***...***....
+     0x00001C70,  // ...***...***...
+     0x00000E38,  // ....***...***..
+     0x0000071C,  // .....***...***.
+     0x00000E38,  // ....***...***..
+     0x00001C70,  // ...***...***...
+     0x000038E0,  // ..***...***....
+     0x000071C0,  // .***...***.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 188
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFE,  // ...************
+     0x00007FFE,  // .**************
+     0x00006386,  // .**...***....**
+     0x0000C186,  // **.....**....**
+     0x0000C180,  // **.....**......
+     0x0000C198,  // **.....**..**..
+     0x0000C1F8,  // **.....******..
+     0x0000C1F8,  // **.....******..
+     0x0000C198,  // **.....**..**..
+     0x0000C180,  // **.....**......
+     0x0000C180,  // **.....**......
+     0x0000C186,  // **.....**....**
+     0x00006386,  // .**...***....**
+     0x00007FFE,  // .**************
+     0x00001FFE,  // ...************
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF8,  // ..****..*****..
+     0x00007FFC,  // .*************.
+     0x0000E78E,  // ***..****...***
+     0x0000C306,  // **....**.....**
+     0x0000C306,  // **....**.....**
+     0x0000C3FE,  // **....*********
+     0x0000C3FE,  // **....*********
+     0x0000C300,  // **....**.......
+     0x0000E786,  // ***..****....**
+     0x00007FFE,  // .**************
+     0x00003CF8,  // ..****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00001E00,  // ...****........
+     0x00003800,  // ..***..........
+     0x00003000,  // ..**...........
+     0x00003060,  // ..**.....**....
+     0x00003060,  // ..**.....**....
+     0x00003860,  // ..***....**....
+     0x00001FE0,  // ...********....
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+  },
+  {             // 192
+     15, 26,
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 26,
+     0x00000600,  // .....**........
+     0x00000F00,  // ....****.......
+     0x00001F80,  // ...******......
+     0x000039C0,  // ..***..***.....
+     0x000070E0,  // .***....***....
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 26,
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000D80,  // ....**.**......
+     0x00000880,  // ....*...*......
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00003F00,  // ..******.......
+     0x00003F00,  // ..******.......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFE,  // ....***********
+     0x00000FFE,  // ....***********
+     0x00000386,  // ......***....**
+     0x00000786,  // .....****....**
+     0x00000780,  // .....****......
+     0x00000D98,  // ....**.**..**..
+     0x000009F8,  // ....*..******..
+     0x000019F8,  // ...**..******..
+     0x00001F98,  // ...******..**..
+     0x00003F80,  // ..*******......
+     0x00003180,  // ..**...**......
+     0x00006186,  // .**....**....**
+     0x00006186,  // .**....**....**
+     0x0000F7FE,  // ****.**********
+     0x0000F7FE,  // ****.**********
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 199
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // .....*****.**..
+     0x00001FF8,  // ...**********..
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x00007018,  // .***.......**..
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003008,  // ..**........*..
+     0x00003818,  // ..***......**..
+     0x00001FF0,  // ...*********...
+     0x000007E0,  // .....******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 200
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000018D8,  // ...**...**.**..
+     0x000018C0,  // ...**...**.....
+     0x00001FC0,  // ...*******.....
+     0x00001FC0,  // ...*******.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 205
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 206
+     15, 26,
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 207
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000CC0,  // ....**..**.....
+     0x00000000,  // ...............
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFC0,  // **********.....
+     0x0000FFF0,  // ************...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000FE0C,  // *******.....**.
+     0x0000FE0C,  // *******.....**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x0000FFF0,  // ************...
+     0x0000FFE0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // .....***..**...
+     0x00000FE0,  // ....*******....
+     0x000019C0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x0000787C,  // .****....*****.
+     0x0000787C,  // .****....*****.
+     0x00003C18,  // ..****.....**..
+     0x00003C18,  // ..****.....**..
+     0x00003618,  // ..**.**....**..
+     0x00003618,  // ..**.**....**..
+     0x00003318,  // ..**..**...**..
+     0x00003318,  // ..**..**...**..
+     0x00003198,  // ..**...**..**..
+     0x00003198,  // ..**...**..**..
+     0x000030D8,  // ..**....**.**..
+     0x000030D8,  // ..**....**.**..
+     0x00003078,  // ..**.....****..
+     0x00007C78,  // .*****...****..
+     0x00007C38,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x000001C0,  // .......***.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // .....***..**...
+     0x00000FE0,  // ....*******....
+     0x000019C0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00002010,  // ..*........*...
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001CE0,  // ...***..***....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00002010,  // ..*........*...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000C,  // ............**.
+     0x00000018,  // ...........**..
+     0x000007F0,  // .....*******...
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003078,  // ..**.....****..
+     0x000070DC,  // .***....**.***.
+     0x0000608C,  // .**.....*...**.
+     0x0000618C,  // .**....**...**.
+     0x0000630C,  // .**...**....**.
+     0x0000620C,  // .**...*.....**.
+     0x0000660C,  // .**..**.....**.
+     0x0000741C,  // .***.*.....***.
+     0x00003C18,  // ..****.....**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000037C0,  // ..**.*****.....
+     0x00006000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 218
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 219
+     15, 26,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000007E0,  // .....******....
+     0x00000E70,  // ....***..***...
+     0x00001C38,  // ...***....***..
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000C60,  // ....**...**....
+     0x00000000,  // ...............
+     0x00007C7C,  // .*****...*****.
+     0x00007C7C,  // .*****...*****.
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00003018,  // ..**.......**..
+     0x00001830,  // ...**.....**...
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 221
+     15, 26,
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00000CC0,  // ....**..**.....
+     0x00000FC0,  // ....******.....
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00001FE0,  // ...********....
+     0x00001FE0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E00,  // .******........
+     0x00007E00,  // .******........
+     0x00001800,  // ...**..........
+     0x00001FE0,  // ...********....
+     0x00001FF8,  // ...**********..
+     0x0000181C,  // ...**......***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000181C,  // ...**......***.
+     0x00001FF8,  // ...**********..
+     0x00001FE0,  // ...********....
+     0x00001800,  // ...**..........
+     0x00007E00,  // .******........
+     0x00007E00,  // .******........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001CE0,  // ...***..***....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x000018E0,  // ...**...***....
+     0x00001BC0,  // ...**.****.....
+     0x00001BE0,  // ...**.*****....
+     0x00001870,  // ...**....***...
+     0x00001838,  // ...**.....***..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x00001818,  // ...**......**..
+     0x000019B8,  // ...**..**.***..
+     0x00007DF0,  // .*****.*****...
+     0x00007CE0,  // .*****..***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 225
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 226
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 227
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 228
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 229
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000D80,  // ....**.**......
+     0x00000880,  // ....*...*......
+     0x00000D80,  // ....**.**......
+     0x00000700,  // .....***.......
+     0x00001F80,  // ...******......
+     0x00003FC0,  // ..********.....
+     0x000030E0,  // ..**....***....
+     0x00000060,  // .........**....
+     0x00000FE0,  // ....*******....
+     0x00003FE0,  // ..*********....
+     0x00007060,  // .***.....**....
+     0x00006060,  // .**......**....
+     0x000060E0,  // .**.....***....
+     0x00007FF8,  // .************..
+     0x00003F78,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 230
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003CF0,  // ..****..****...
+     0x00007FF8,  // .************..
+     0x0000679C,  // .**..****..***.
+     0x0000030C,  // ......**....**.
+     0x00001F0C,  // ...*****....**.
+     0x00007FFC,  // .*************.
+     0x0000E3FC,  // ***...********.
+     0x0000C300,  // **....**.......
+     0x0000C78C,  // **...****...**.
+     0x0000FFFC,  // **************.
+     0x00007CF0,  // .*****..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 231
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FB0,  // ....*****.**...
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007030,  // .***......**...
+     0x00006030,  // .**.......**...
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x00007000,  // .***...........
+     0x00003830,  // ..***.....**...
+     0x00003FF0,  // ..**********...
+     0x00000FE0,  // ....*******....
+     0x00000300,  // ......**.......
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
+  },
+  {             // 232
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 233
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 234
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000007C0,  // .....*****.....
+     0x00000EE0,  // ....***.***....
+     0x00001C70,  // ...***...***...
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 235
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00007FF8,  // .************..
+     0x00007FF8,  // .************..
+     0x00007000,  // .***...........
+     0x00003838,  // ..***.....***..
+     0x00003FF8,  // ..***********..
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 236
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 237
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 238
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F00,  // ...*****.......
+     0x00001F00,  // ...*****.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00000300,  // ......**.......
+     0x00003FF0,  // ..**********...
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 240
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000F000,  // ****...........
+     0x0000FC70,  // ******...***...
+     0x00000FF0,  // ....********...
+     0x00001F80,  // ...******......
+     0x00007DC0,  // .*****.***.....
+     0x000070E0,  // .***....***....
+     0x00000FF0,  // ....********...
+     0x00003FF0,  // ..**********...
+     0x00003878,  // ..***....****..
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 241
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x0000F3C0,  // ****..****.....
+     0x0000F7E0,  // ****.******....
+     0x00003C70,  // ..****...***...
+     0x00003830,  // ..***.....**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x0000FCFC,  // ******..******.
+     0x0000FCFC,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 242
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 243
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 244
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 245
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E60,  // ....***..**....
+     0x00001FC0,  // ...*******.....
+     0x00003380,  // ..**..***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 246
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ....******.....
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x00007038,  // .***......***..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00006018,  // .**........**..
+     0x00007038,  // .***......***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00000FC0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 247
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000FFF8,  // *************..
+     0x0000FFF8,  // *************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 248
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000C,  // ............**.
+     0x00000FD8,  // ....******.**..
+     0x00003FF0,  // ..**********...
+     0x00003870,  // ..***....***...
+     0x000070D8,  // .***....**.**..
+     0x00006198,  // .**....**..**..
+     0x00006318,  // .**...**...**..
+     0x00006618,  // .**..**....**..
+     0x00006C38,  // .**.**....***..
+     0x00003870,  // ..***....***...
+     0x00003FF0,  // ..**********...
+     0x00003FC0,  // ..********.....
+     0x00006000,  // .**............
+     0x0000C000,  // **.............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 249
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // ..***..........
+     0x00001C00,  // ...***.........
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 250
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000700,  // .....***.......
+     0x00000E00,  // ....***........
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 251
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000700,  // .....***.......
+     0x00000F80,  // ....*****......
+     0x00001DC0,  // ...***.***.....
+     0x000038E0,  // ..***...***....
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 252
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x0000F0F0,  // ****....****...
+     0x0000F0F0,  // ****....****...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001FFC,  // ...***********.
+     0x00000FBC,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 253
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // .........***...
+     0x000000E0,  // ........***....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 254
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // .****..........
+     0x00007800,  // .****..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001BE0,  // ...**.*****....
+     0x00001FF8,  // ...**********..
+     0x00001E38,  // ...****...***..
+     0x00001C1C,  // ...***.....***.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x0000180C,  // ...**.......**.
+     0x00001C1C,  // ...***.....***.
+     0x00001E38,  // ...****...***..
+     0x00001FF8,  // ...**********..
+     0x00001BE0,  // ...**.*****....
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00001800,  // ...**..........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  {             // 255
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x000018C0,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00007CF8,  // .*****..*****..
+     0x00007CF8,  // .*****..*****..
+     0x00003030,  // ..**......**...
+     0x00003870,  // ..***....***...
+     0x00001860,  // ...**....**....
+     0x00001CE0,  // ...***..***....
+     0x00000CC0,  // ....**..**.....
+     0x00000DC0,  // ....**.***.....
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000300,  // ......**.......
+     0x00000700,  // .....***.......
+     0x00000600,  // .....**........
+     0x00000E00,  // ....***........
+     0x00007F00,  // .*******.......
+     0x00007F00,  // .*******.......
+  },
+  };
diff --git a/fontosd-iso8859-15.c b/fontosd-iso8859-15.c
new file mode 100644
index 000000000..c53c88c36
--- /dev/null
+++ b/fontosd-iso8859-15.c
@@ -0,0 +1,6722 @@
+cFont::tPixelData FontOsd_iso8859_15[][29] = {
+  {             // 32
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 33
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x000000CC,  // .**..**.
+     0x00000044,  // ..*...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000118,  // .....*...**..
+     0x00000318,  // ....**...**..
+     0x00000318,  // ....**...**..
+     0x00000310,  // ....**...*...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000230,  // ....*...**...
+     0x00000630,  // ...**...**...
+     0x00000630,  // ...**...**...
+     0x00000620,  // ...**...*....
+     0x00003FFC,  // ************.
+     0x00003FFC,  // ************.
+     0x00000460,  // ...*...**....
+     0x00000C60,  // ..**...**....
+     0x00000C40,  // ..**...*.....
+     0x00000C40,  // ..**...*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 36
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000FF0,  // ..********...
+     0x00000CB8,  // ..**..*.***..
+     0x00001998,  // .**..**..**..
+     0x00001998,  // .**..**..**..
+     0x00001980,  // .**..**......
+     0x00001980,  // .**..**......
+     0x00000F80,  // ..*****......
+     0x000007E0,  // ...******....
+     0x000003F8,  // ....*******..
+     0x0000019C,  // .....**..***.
+     0x0000018C,  // .....**...**.
+     0x0000198C,  // .**..**...**.
+     0x0000198C,  // .**..**...**.
+     0x0000199C,  // .**..**..***.
+     0x00001D38,  // .***.*..***..
+     0x00000FF0,  // ..********...
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00038040,  // ...***........*.....
+     0x000FE0C0,  // .*******.....**.....
+     0x001C7180,  // ***...***...**......
+     0x00183100,  // **.....**...*.......
+     0x00183300,  // **.....**..**.......
+     0x001C7200,  // ***...***..*........
+     0x000FE600,  // .*******..**........
+     0x0007C400,  // ..*****...*.........
+     0x00000C78,  // .........**...****..
+     0x000018FC,  // ........**...******.
+     0x000019CC,  // ........**..***..**.
+     0x00003186,  // .......**...**....**
+     0x00002186,  // .......*....**....**
+     0x00006186,  // ......**....**....**
+     0x0000C0FC,  // .....**......******.
+     0x0000C078,  // .....**.......****..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 38
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000FC0,  // ....******.....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00001860,  // ...**....**....
+     0x00000DC0,  // ....**.***.....
+     0x00000F80,  // ....*****......
+     0x00000F00,  // ....****.......
+     0x00001F98,  // ...******..**..
+     0x00003198,  // ..**...**..**..
+     0x000060D8,  // .**.....**.**..
+     0x00006070,  // .**......***...
+     0x00006070,  // .**......***...
+     0x00007078,  // .***.....****..
+     0x00003FDC,  // ..********.***.
+     0x00001F00,  // ...*****.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000004,  // ...*.
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 40
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000C,  // .....**.
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000020,  // ...*....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000020,  // ...*....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000010,  // ....*...
+     0x00000018,  // ....**..
+     0x00000008,  // .....*..
+     0x00000008,  // .....*..
+  },
+  {             // 41
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000080,  // .*......
+     0x00000040,  // ..*.....
+     0x00000060,  // ..**....
+     0x00000020,  // ...*....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000020,  // ...*....
+     0x00000060,  // ..**....
+     0x00000040,  // ..*.....
+     0x00000080,  // .*......
+  },
+  {             // 42
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000020,  // ....*....
+     0x000001AC,  // .**.*.**.
+     0x000000F8,  // ..*****..
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x00000088,  // ..*...*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 44
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 45
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 46
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     6, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000004,  // .....*.
+     0x00000004,  // .....*.
+     0x0000000C,  // ....**.
+     0x0000000C,  // ....**.
+     0x00000008,  // ....*..
+     0x00000018,  // ...**..
+     0x00000018,  // ...**..
+     0x00000010,  // ...*...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000020,  // ..*....
+     0x00000060,  // .**....
+     0x00000060,  // .**....
+     0x00000040,  // .*.....
+     0x000000C0,  // **.....
+     0x000000C0,  // **.....
+     0x00000080,  // *......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x000007F0,  // ...*******...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000003C0,  // ....****.....
+     0x00000FC0,  // ..******.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C1C,  // ..**.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000038,  // ........***..
+     0x000000F0,  // ......****...
+     0x000003C0,  // ....****.....
+     0x00000700,  // ...***.......
+     0x00000E00,  // ..***........
+     0x00000C00,  // ..**.........
+     0x00001800,  // .**..........
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007E0,  // ...******....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x000001E0,  // .....****....
+     0x000001F8,  // .....******..
+     0x00000018,  // .........**..
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // ........**...
+     0x00000070,  // .......***...
+     0x000000F0,  // ......****...
+     0x000000F0,  // ......****...
+     0x000001B0,  // .....**.**...
+     0x00000330,  // ....**..**...
+     0x00000630,  // ...**...**...
+     0x00000430,  // ...*....**...
+     0x00000C30,  // ..**....**...
+     0x00001830,  // .**.....**...
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000030,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FE0,  // ..*******....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x0000181C,  // .**......***.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C18,  // .***.....**..
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E18,  // ..***....**..
+     0x00000C1C,  // ..**.....***.
+     0x00001C00,  // .***.........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000008,  // ..........*..
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000700,  // ...***.......
+     0x00000600,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x000007E0,  // ...******....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C3C,  // .***....****.
+     0x00000FFC,  // ..**********.
+     0x000003EC,  // ....*****.**.
+     0x0000000C,  // ..........**.
+     0x0000001C,  // .........***.
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000004,  // ....*.
+     0x00000004,  // ....*.
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 60
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000004,  // ...........*.
+     0x0000001C,  // .........***.
+     0x00000078,  // .......****..
+     0x000003C0,  // ....****.....
+     0x00000F00,  // ..****.......
+     0x00001C00,  // .***.........
+     0x00001E00,  // .****........
+     0x000003C0,  // ....****.....
+     0x000000F0,  // ......****...
+     0x0000001C,  // .........***.
+     0x00000004,  // ...........*.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 61
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 62
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001000,  // .*...........
+     0x00001C00,  // .***.........
+     0x00000780,  // ...****......
+     0x000001E0,  // .....****....
+     0x0000007C,  // .......*****.
+     0x0000000C,  // ..........**.
+     0x0000003C,  // ........****.
+     0x000000F0,  // ......****...
+     0x00000780,  // ...****......
+     0x00001E00,  // .****........
+     0x00001000,  // .*...........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // .....*****...
+     0x000007F8,  // ...********..
+     0x00000E1C,  // ..***....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x0000000C,  // ..........**.
+     0x00000018,  // .........**..
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00007E00,  // .........******........
+     0x0003FFC0,  // ......************.....
+     0x000781E0,  // .....****......****....
+     0x000E0070,  // ....***..........***...
+     0x001C0038,  // ...***............***..
+     0x00383D18,  // ..***.....****.*...**..
+     0x0030FF9C,  // ..**....*********..***.
+     0x0031C38C,  // ..**...***....***...**.
+     0x0061830C,  // .**....**.....**....**.
+     0x0063030C,  // .**...**......**....**.
+     0x0063030C,  // .**...**......**....**.
+     0x00630618,  // .**...**.....**....**..
+     0x00630618,  // .**...**.....**....**..
+     0x00738E30,  // .***..***...***...**...
+     0x0031FFE0,  // ..**...************....
+     0x0038E3C0,  // ..***...***...****.....
+     0x001C0000,  // ...***.................
+     0x000F0000,  // ....****...............
+     0x0007FF00,  // .....***********.......
+     0x0000FE00,  // ........*******........
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 65
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x00003038,  // ..**......***..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x00007030,  // ...***......**...
+     0x00007FF0,  // ...***********...
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 68
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FF80,  // ..*********......
+     0x0000FFE0,  // ..***********....
+     0x0000C0E0,  // ..**......***....
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C0E0,  // ..**......***....
+     0x0000FFE0,  // ..***********....
+     0x0000FF80,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 69
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFC,  // ..***********.
+     0x00001FFC,  // ..***********.
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001FF8,  // ..**********..
+     0x00001FF8,  // ..**********..
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00001800,  // ..**..........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E070,  // ...***......***...
+     0x0001C030,  // ..***........**...
+     0x00018018,  // ..**..........**..
+     0x00038000,  // .***..............
+     0x00030000,  // .**...............
+     0x00030000,  // .**...............
+     0x000303F8,  // .**......*******..
+     0x000303F8,  // .**......*******..
+     0x00030018,  // .**...........**..
+     0x00038018,  // .***..........**..
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E078,  // ...***......****..
+     0x00007FD8,  // ....*********.**..
+     0x00001F88,  // ......******...*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 72
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000FFF8,  // ..*************..
+     0x0000FFF8,  // ..*************..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 73
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00000018,  // ........**..
+     0x00001818,  // **......**..
+     0x00001818,  // **......**..
+     0x00001C38,  // ***....***..
+     0x00000FF0,  // .********...
+     0x000007E0,  // ..******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 75
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000300E,  // ..**........***
+     0x0000301C,  // ..**.......***.
+     0x00003038,  // ..**......***..
+     0x00003070,  // ..**.....***...
+     0x000030E0,  // ..**....***....
+     0x000031C0,  // ..**...***.....
+     0x00003380,  // ..**..***......
+     0x00003780,  // ..**.****......
+     0x00003F80,  // ..*******......
+     0x00003DC0,  // ..****.***.....
+     0x000038E0,  // ..***...***....
+     0x00003060,  // ..**.....**....
+     0x00003030,  // ..**......**...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300E,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 77
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00038038,  // ..***.........***..
+     0x00038038,  // ..***.........***..
+     0x0003C038,  // ..****........***..
+     0x0003C078,  // ..****.......****..
+     0x0003C078,  // ..****.......****..
+     0x00036058,  // ..**.**......*.**..
+     0x000360D8,  // ..**.**.....**.**..
+     0x000360D8,  // ..**.**.....**.**..
+     0x00033098,  // ..**..**....*..**..
+     0x00033198,  // ..**..**...**..**..
+     0x00033198,  // ..**..**...**..**..
+     0x00031918,  // ..**...**..*...**..
+     0x00031B18,  // ..**...**.**...**..
+     0x00031B18,  // ..**...**.**...**..
+     0x00030F18,  // ..**....****...**..
+     0x00030E18,  // ..**....***....**..
+     0x00030E18,  // ..**....***....**..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 78
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 79
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FE0,  // ..*********....
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000301C,  // ..**.......***.
+     0x00003FF8,  // ..***********..
+     0x00003FE0,  // ..*********....
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018098,  // ..**.......*..**..
+     0x0001C1F8,  // ..***.....******..
+     0x0000E0F0,  // ...***.....****...
+     0x00007FF0,  // ....***********...
+     0x00001F9C,  // ......******..***.
+     0x00000008,  // ...............*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FFC0,  // ..**********.....
+     0x0000FFF0,  // ..************...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C030,  // ..**........**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 83
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00003018,  // ..**.......**..
+     0x00003008,  // ..**........*..
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FF0,  // ....********...
+     0x000000F8,  // ........*****..
+     0x0000001C,  // ...........***.
+     0x0000000C,  // ............**.
+     0x0000600C,  // .**.........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 86
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000301C,  // ..**.......***.
+     0x00003818,  // ..***......**..
+     0x00001818,  // ...**......**..
+     0x00001838,  // ...**.....***..
+     0x00001C30,  // ...***....**...
+     0x00000C30,  // ....**....**...
+     0x00000C70,  // ....**...***...
+     0x00000E60,  // ....***..**....
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x000007C0,  // .....*****.....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     22, 27,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x0030180C,  // .**.......**.......**.
+     0x0030380C,  // .**......***.......**.
+     0x00303C1C,  // .**......****.....***.
+     0x00383C1C,  // .***.....****.....***.
+     0x00183C18,  // ..**.....****.....**..
+     0x00186618,  // ..**....**..**....**..
+     0x00186618,  // ..**....**..**....**..
+     0x001C6638,  // ..***...**..**...***..
+     0x000CC630,  // ...**..**...**...**...
+     0x000CC330,  // ...**..**....**..**...
+     0x000CC330,  // ...**..**....**..**...
+     0x000EC370,  // ...***.**....**.***...
+     0x000781E0,  // ....****......****....
+     0x000781E0,  // ....****......****....
+     0x000781E0,  // ....****......****....
+     0x000781C0,  // ....****......***.....
+     0x000300C0,  // .....**........**.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000700C,  // .***........**.
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C70,  // ....**...***...
+     0x00000660,  // .....**..**....
+     0x000007C0,  // .....*****.....
+     0x000003C0,  // ......****.....
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000006C0,  // .....**.**.....
+     0x00000E60,  // ....***..**....
+     0x00001C70,  // ...***...***...
+     0x00001838,  // ...**.....***..
+     0x00003818,  // ..***......**..
+     0x0000701C,  // .***.......***.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700E,  // .***........***
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C30,  // ....**....**...
+     0x00000E60,  // ....***..**....
+     0x00000760,  // .....***.**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x0000001C,  // ..........***.
+     0x00000018,  // ..........**..
+     0x00000038,  // .........***..
+     0x00000070,  // ........***...
+     0x000000E0,  // .......***....
+     0x000001C0,  // ......***.....
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001C00,  // ..***.........
+     0x00003800,  // .***..........
+     0x00003FFC,  // .************.
+     0x00003FFC,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 91
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x0000003E,  // .*****
+     0x0000003E,  // .*****
+  },
+  {             // 92
+     6, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000080,  // *......
+     0x000000C0,  // **.....
+     0x00000040,  // .*.....
+     0x00000040,  // .*.....
+     0x00000060,  // .**....
+     0x00000020,  // ..*....
+     0x00000020,  // ..*....
+     0x00000020,  // ..*....
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000010,  // ...*...
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x00000008,  // ....*..
+     0x0000000C,  // ....**.
+     0x00000004,  // .....*.
+     0x00000004,  // .....*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 93
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000003C,  // .****.
+     0x0000003C,  // .****.
+  },
+  {             // 94
+     11, 27,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E0,  // ....***....
+     0x000000E0,  // ....***....
+     0x000001A0,  // ...**.*....
+     0x000001B0,  // ...**.**...
+     0x00000110,  // ...*...*...
+     0x00000318,  // ..**...**..
+     0x00000218,  // ..*....**..
+     0x00000608,  // .**.....*..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 95
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000000,  // .............
+  },
+  {             // 96
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000004,  // ...*.
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 97
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 98
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 99
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 100
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 101
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 102
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001E,  // ..****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x000007F8,  // ...********..
+     0x000003D8,  // ....****.**..
+     0x00000018,  // .........**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x000007C0,  // ...*****.....
+  },
+  {             // 104
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000DF0,  // ..**.*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 106
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+  },
+  {             // 107
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C18,  // .**.....**..
+     0x00000C30,  // .**....**...
+     0x00000C60,  // .**...**....
+     0x00000CC0,  // .**..**.....
+     0x00000FC0,  // .******.....
+     0x00000FC0,  // .******.....
+     0x00000E60,  // .***..**....
+     0x00000C70,  // .**...***...
+     0x00000C30,  // .**....**...
+     0x00000C18,  // .**.....**..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 108
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 109
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00037CF8,  // ..**.*****..*****..
+     0x0003FFFC,  // ..****************.
+     0x0003870C,  // ..***....***....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x0003060C,  // ..**.....**.....**.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 110
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 111
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 112
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000019E0,  // .**..****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 113
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007D8,  // ...*****.**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+  },
+  {             // 114
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x0000007C,  // ..*****.
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 115
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x000007F8,  // ..********..
+     0x00000C18,  // .**.....**..
+     0x00000C00,  // .**.........
+     0x00000E00,  // .***........
+     0x000007E0,  // ..******....
+     0x000001F8,  // ....******..
+     0x0000001C,  // ........***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 116
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 118
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00001C0C,  // ***......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000E18,  // .***....**..
+     0x00000638,  // ..**...***..
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 119
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0003060C,  // **.....**.....**.
+     0x0001870C,  // .**....***....**.
+     0x00018F1C,  // .**...****...***.
+     0x00018F18,  // .**...****...**..
+     0x00018D98,  // .**...**.**..**..
+     0x0000C998,  // ..**..*..**..**..
+     0x0000D9B0,  // ..**.**..**.**...
+     0x0000D9B0,  // ..**.**..**.**...
+     0x000058F0,  // ...*.**...****...
+     0x000070F0,  // ...***....****...
+     0x000070E0,  // ...***....***....
+     0x000070E0,  // ...***....***....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 120
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C1C,  // .**.....***.
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x000003E0,  // ...*****....
+     0x00000370,  // ...**.***...
+     0x00000630,  // ..**...**...
+     0x00000E18,  // .***....**..
+     0x00000C1C,  // .**.....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
+  },
+  {             // 122
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 123
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ....**..
+     0x00000038,  // ...***..
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000070,  // ..***...
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000038,  // ...***..
+     0x00000018,  // ....**..
+  },
+  {             // 124
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+  },
+  {             // 125
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000C0,  // .**.....
+     0x000000E0,  // .***....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000030,  // ...**...
+     0x00000038,  // ...***..
+     0x00000018,  // ....**..
+     0x00000030,  // ...**...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x000000E0,  // .***....
+     0x000000C0,  // .**.....
+  },
+  {             // 126
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000700,  // ...***.......
+     0x00000F8C,  // ..*****...**.
+     0x000008FC,  // ..*...******.
+     0x00000038,  // ........***..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 127
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 161
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+  },
+  {             // 162
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000003F0,  // ....******...
+     0x00000FF8,  // ..*********..
+     0x00000E58,  // ..***..*.**..
+     0x00001C4C,  // .***...*..**.
+     0x00001840,  // .**....*.....
+     0x00001840,  // .**....*.....
+     0x00001880,  // .**...*......
+     0x00001880,  // .**...*......
+     0x0000188C,  // .**...*...**.
+     0x00000C9C,  // ..**..*..***.
+     0x00000EB8,  // ..***.*.***..
+     0x000007F0,  // ...*******...
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 163
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00001818,  // .**......**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000E00,  // ..***........
+     0x00001FC0,  // .*******.....
+     0x00001F40,  // .*****.*.....
+     0x00000700,  // ...***.......
+     0x00000300,  // ....**.......
+     0x00000300,  // ....**.......
+     0x00000600,  // ...**........
+     0x00000C00,  // ..**.........
+     0x00001FFC,  // .***********.
+     0x00001FF8,  // .**********..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 164
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FF8,  // ....***********..
+     0x0000F03C,  // ..****......****.
+     0x0000E00C,  // ..***.........**.
+     0x0000E00C,  // ..***.........**.
+     0x0003FE00,  // *********........
+     0x0003FE00,  // *********........
+     0x0001C000,  // .***.............
+     0x0001C000,  // .***.............
+     0x0001C000,  // .***.............
+     0x0003FE00,  // *********........
+     0x0003FE00,  // *********........
+     0x0000E00C,  // ..***.........**.
+     0x0000F03C,  // ..****......****.
+     0x0000F03C,  // ..****......****.
+     0x00003FF8,  // ....***********..
+     0x00000FC0,  // ......******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 165
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x00001818,  // .**......**..
+     0x00000C18,  // ..**.....**..
+     0x00000C30,  // ..**....**...
+     0x00000620,  // ...**...*....
+     0x00000260,  // ....*..**....
+     0x000003C0,  // ....****.....
+     0x00001DF8,  // .***.******..
+     0x00001FF8,  // .**********..
+     0x00000180,  // .....**......
+     0x00001FF8,  // .**********..
+     0x00001FF8,  // .**********..
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 166
+     16, 27,
+     0x00001860,  // ....**....**....
+     0x00000CC0,  // .....**..**.....
+     0x00000780,  // ......****......
+     0x00000780,  // ......****......
+     0x00000000,  // ................
+     0x00000FC0,  // .....******.....
+     0x00007FF8,  // ..************..
+     0x0000F03C,  // .****......****.
+     0x0000E01C,  // .***........***.
+     0x0000E01C,  // .***........***.
+     0x0000F000,  // .****...........
+     0x00007F00,  // ..*******.......
+     0x00000FC0,  // .....******.....
+     0x000000F8,  // .........*****..
+     0x000000F8,  // .........*****..
+     0x0000003C,  // ...........****.
+     0x0000001C,  // ............***.
+     0x0000E01C,  // .***........***.
+     0x0000F03C,  // .****......****.
+     0x0000F03C,  // .****......****.
+     0x00007FF8,  // ..************..
+     0x00001FC0,  // ....*******.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 167
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // .....****....
+     0x000007F0,  // ...*******...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000E00,  // ..***........
+     0x00000780,  // ...****......
+     0x00000DE0,  // ..**.****....
+     0x000018F0,  // .**...****...
+     0x00001838,  // .**.....***..
+     0x0000181C,  // .**......***.
+     0x00001C0C,  // .***......**.
+     0x00000E0C,  // ..***.....**.
+     0x00000798,  // ...****..**..
+     0x000001F0,  // .....*****...
+     0x000000E0,  // ......***....
+     0x00000070,  // .......***...
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000E30,  // ..***...**...
+     0x000007E0,  // ...******....
+     0x000003C0,  // ....****.....
+  },
+  {             // 168
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000738,  // ..***..***..
+     0x000003E0,  // ...*****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003F0,  // ...******...
+     0x000007F8,  // ..********..
+     0x00000C18,  // .**.....**..
+     0x00000C00,  // .**.........
+     0x00000E00,  // .***........
+     0x000007E0,  // ..******....
+     0x000001F8,  // ....******..
+     0x0000001C,  // ........***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000FF8,  // .*********..
+     0x000003F0,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 169
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F078,  // ...****.....****..
+     0x0001C718,  // ..***...***...**..
+     0x00038F8C,  // .***...*****...**.
+     0x000318CC,  // .**...**...**..**.
+     0x00063046,  // **...**.....*...**
+     0x00063006,  // **...**.........**
+     0x00063006,  // **...**.........**
+     0x00063006,  // **...**.........**
+     0x00063066,  // **...**.....**..**
+     0x000318C6,  // .**...**...**...**
+     0x00031FCC,  // .**...*******..**.
+     0x0001879C,  // ..**....****..***.
+     0x0000E078,  // ...***......****..
+     0x00007FF0,  // ....***********...
+     0x00001F80,  // ......******......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 170
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000F0,  // ..****...
+     0x000001F8,  // .******..
+     0x00000018,  // .....**..
+     0x00000078,  // ...****..
+     0x00000198,  // .**..**..
+     0x00000198,  // .**..**..
+     0x000001FC,  // .*******.
+     0x000000EC,  // ..***.**.
+     0x000001F8,  // .******..
+     0x000001F8,  // .******..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 171
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000110,  // .....*...*...
+     0x00000310,  // ....**...*...
+     0x00000670,  // ...**..***...
+     0x00000C40,  // ..**...*.....
+     0x00000C60,  // ..**...**....
+     0x00000730,  // ...***..**...
+     0x00000310,  // ....**...*...
+     0x00000110,  // .....*...*...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 172
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFE,  // .************
+     0x00001FFE,  // .************
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000006,  // ...........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 173
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000F8,  // .*****..
+     0x000000F8,  // .*****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 174
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000F078,  // ...****.....****..
+     0x0001FF98,  // ..**********..**..
+     0x0003BFCC,  // .***.********..**.
+     0x0003306C,  // .**..**.....**.**.
+     0x00063066,  // **...**.....**..**
+     0x00063066,  // **...**.....**..**
+     0x00063FC6,  // **...********...**
+     0x00063FE6,  // **...*********..**
+     0x00063066,  // **...**.....**..**
+     0x0003306E,  // .**..**.....**.***
+     0x0003306C,  // .**..**.....**.**.
+     0x0001F07C,  // ..*****.....*****.
+     0x0000E078,  // ...***......****..
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 175
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 176
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x000007E0,  // ....******....
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000007E0,  // ....******....
+     0x000003C0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 177
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 178
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FE,  // .*******
+     0x00000086,  // .*....**
+     0x00000006,  // ......**
+     0x0000000C,  // .....**.
+     0x00000030,  // ...**...
+     0x000000E0,  // .***....
+     0x00000080,  // .*......
+     0x000000FE,  // .*******
+     0x0000007E,  // ..******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x000000FC,  // .******.
+     0x0000008C,  // .*...**.
+     0x0000000C,  // .....**.
+     0x00000038,  // ...***..
+     0x0000000C,  // .....**.
+     0x00000006,  // ......**
+     0x00000186,  // **....**
+     0x000000FC,  // .******.
+     0x00000078,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     15, 27,
+     0x00000C30,  // ....**....**...
+     0x00000660,  // .....**..**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000000,  // ...............
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x0000001C,  // ...........***.
+     0x00000030,  // ..........**...
+     0x00000030,  // ..........**...
+     0x00000060,  // .........**....
+     0x000001C0,  // .......***.....
+     0x00000380,  // ......***......
+     0x00000780,  // .....****......
+     0x00000780,  // .....****......
+     0x00000600,  // .....**........
+     0x00000C00,  // ....**.........
+     0x00003800,  // ..***..........
+     0x00007000,  // .***...........
+     0x00007000,  // .***...........
+     0x00007FFC,  // .*************.
+     0x00007FFC,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x00001FDE,  // .*******.****
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 182
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001FE,  // ....********
+     0x000003FE,  // ...*********
+     0x000007EC,  // ..******.**.
+     0x000007EC,  // ..******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x00000FEC,  // .*******.**.
+     0x000007EC,  // ..******.**.
+     0x000007EC,  // ..******.**.
+     0x000001EC,  // ....****.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x0000006C,  // ......**.**.
+     0x00000000,  // ............
+  },
+  {             // 183
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000738,  // ..***..***..
+     0x000003E0,  // ...*****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FF8,  // .*********..
+     0x00000FF8,  // .*********..
+     0x00000030,  // .......**...
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 185
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000010,  // ....*...
+     0x00000070,  // ..***...
+     0x000000F0,  // .****...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000030,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 186
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000078,  // ..****..
+     0x0000007C,  // ..*****.
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x000000C6,  // .**...**
+     0x0000007C,  // ..*****.
+     0x00000038,  // ...***..
+     0x000000FC,  // .******.
+     0x000000FC,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 187
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000840,  // ..*....*.....
+     0x00000C60,  // ..**...**....
+     0x00000730,  // ...***..**...
+     0x00000310,  // ....**...*...
+     0x00000330,  // ....**..**...
+     0x00000E60,  // ..***..**....
+     0x00000C40,  // ..**...*.....
+     0x00000840,  // ..*....*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 188
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x0003DFFC,  // ......****.***********.
+     0x000FFFFC,  // ....******************.
+     0x003C3C00,  // ..****....****.........
+     0x00381C00,  // ..***......***.........
+     0x00381C00,  // ..***......***.........
+     0x00781C00,  // .****......***.........
+     0x00701C00,  // .***.......***.........
+     0x00701FF8,  // .***.......**********..
+     0x00701FF8,  // .***.......**********..
+     0x00701FF8,  // .***.......**********..
+     0x00701C00,  // .***.......***.........
+     0x00781C00,  // .****......***.........
+     0x00381C00,  // ..***......***.........
+     0x003C3C00,  // ..****....****.........
+     0x003C3C00,  // ..****....****.........
+     0x000FFFFC,  // ....******************.
+     0x0003DFFC,  // ......****.***********.
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 189
+     21, 27,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x0003F3E0,  // ....******..*****....
+     0x000FFFF0,  // ..****************...
+     0x000E1C1C,  // ..***....***.....***.
+     0x001C0C1C,  // .***......**.....***.
+     0x001C0C1C,  // .***......**.....***.
+     0x001C0FFC,  // .***......**********.
+     0x001C0C00,  // .***......**.........
+     0x001C0C00,  // .***......**.........
+     0x000E1F1C,  // ..***....*****...***.
+     0x000E1F1C,  // ..***....*****...***.
+     0x000FFFFC,  // ..******************.
+     0x0003F3E0,  // ....******..*****....
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+  },
+  {             // 190
+     17, 27,
+     0x00000000,  // .................
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x000018C0,  // .....**...**.....
+     0x00000000,  // .................
+     0x0001C00C,  // .***..........**.
+     0x0001C00C,  // .***..........**.
+     0x0000E038,  // ..***.......***..
+     0x0000E038,  // ..***.......***..
+     0x0000E038,  // ..***.......***..
+     0x00003070,  // ....**.....***...
+     0x00003070,  // ....**.....***...
+     0x000018C0,  // .....**...**.....
+     0x00000F80,  // ......*****......
+     0x00000F80,  // ......*****......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 191
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000380,  // .....***......
+     0x00000700,  // ....***.......
+     0x00000E00,  // ...***........
+     0x00000C00,  // ...**.........
+     0x00001800,  // ..**..........
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00001C38,  // ..***....***..
+     0x00000FF0,  // ...********...
+     0x000007C0,  // ....*****.....
+  },
+  {             // 192
+     15, 27,
+     0x00000E00,  // ....***........
+     0x00000700,  // .....***.......
+     0x00000100,  // .......*.......
+     0x00000080,  // ........*......
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 27,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x000006C0,  // .....**.**.....
+     0x00000460,  // .....*...**....
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 27,
+     0x00000000,  // ...............
+     0x00000720,  // .....***..*....
+     0x00000FE0,  // ....*******....
+     0x00000040,  // .........*.....
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 27,
+     0x00000000,  // ...............
+     0x000006E0,  // .....**.***....
+     0x000006E0,  // .....**.***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 27,
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x00000240,  // ......*..*.....
+     0x00000380,  // ......***......
+     0x00000180,  // .......**......
+     0x00000380,  // ......***......
+     0x000003C0,  // ......****.....
+     0x000007C0,  // .....*****.....
+     0x000006C0,  // .....**.**.....
+     0x000006E0,  // .....**.***....
+     0x00000E60,  // ....***..**....
+     0x00000C60,  // ....**...**....
+     0x00000C70,  // ....**...***...
+     0x00001C30,  // ...***....**...
+     0x00001830,  // ...**.....**...
+     0x00001FF8,  // ...**********..
+     0x00003FF8,  // ..***********..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000700C,  // .***........**.
+     0x0000600C,  // .**.........**.
+     0x0000600E,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x0001FFF8,  // .......**************..
+     0x0001FFF8,  // .......**************..
+     0x00031800,  // ......**...**..........
+     0x00031800,  // ......**...**..........
+     0x00061800,  // .....**....**..........
+     0x00061800,  // .....**....**..........
+     0x000E1800,  // ....***....**..........
+     0x000C1FF8,  // ....**.....**********..
+     0x000C1FF8,  // ....**.....**********..
+     0x00181800,  // ...**......**..........
+     0x001FF800,  // ...**********..........
+     0x003FF800,  // ..***********..........
+     0x00301800,  // ..**.......**..........
+     0x00301800,  // ..**.......**..........
+     0x00701800,  // .***.......**..........
+     0x00601FFC,  // .**........***********.
+     0x00E01FFC,  // ***........***********.
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 199
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006030,  // ...**.......**...
+     0x000078F0,  // ...****...****...
+     0x00001FE0,  // .....********....
+     0x00000200,  // ........*........
+     0x00000700,  // .......***.......
+     0x00000380,  // ........***......
+     0x00000F80,  // ......*****......
+     0x00000700,  // .......***.......
+  },
+  {             // 200
+     15, 27,
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000180,  // .......**......
+     0x00000080,  // ........*......
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 27,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x00000640,  // .....**..*.....
+     0x00000460,  // .....*...**....
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 27,
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     6, 27,
+     0x00000070,  // ***...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 27,
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 27,
+     0x00000030,  // ..**...
+     0x00000078,  // .****..
+     0x0000004C,  // .*..**.
+     0x000000C4,  // **...*.
+     0x00000000,  // .......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 207
+     6, 27,
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000FF80,  // ..*********......
+     0x0000FFE0,  // ..***********....
+     0x0000C0F0,  // ..**......****...
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0003FC18,  // ********.....**..
+     0x0003FC18,  // ********.....**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000C030,  // ..**........**...
+     0x0000C0E0,  // ..**......***....
+     0x0000FFE0,  // ..***********....
+     0x0000FF80,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 209
+     17, 27,
+     0x00000000,  // .................
+     0x00000EC0,  // ......***.**.....
+     0x00001FC0,  // .....*******.....
+     0x00000180,  // .........**......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x0000F018,  // ..****.......**..
+     0x0000F018,  // ..****.......**..
+     0x0000D818,  // ..**.**......**..
+     0x0000DC18,  // ..**.***.....**..
+     0x0000CC18,  // ..**..**.....**..
+     0x0000C618,  // ..**...**....**..
+     0x0000C718,  // ..**...***...**..
+     0x0000C318,  // ..**....**...**..
+     0x0000C398,  // ..**....***..**..
+     0x0000C198,  // ..**.....**..**..
+     0x0000C0D8,  // ..**......**.**..
+     0x0000C0F8,  // ..**......*****..
+     0x0000C078,  // ..**.......****..
+     0x0000C038,  // ..**........***..
+     0x0000C038,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 210
+     18, 27,
+     0x00001800,  // ......**..........
+     0x00000C00,  // .......**.........
+     0x00000600,  // ........**........
+     0x00000200,  // .........*........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 211
+     18, 27,
+     0x00000180,  // ..........**......
+     0x00000300,  // .........**.......
+     0x00000600,  // ........**........
+     0x00000400,  // ........*.........
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 212
+     18, 27,
+     0x00000600,  // ........**........
+     0x00000F00,  // .......****.......
+     0x00000900,  // .......*..*.......
+     0x00001080,  // ......*....*......
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 213
+     18, 27,
+     0x00000000,  // ..................
+     0x00001CC0,  // ......***..**.....
+     0x00001F80,  // ......******......
+     0x00000180,  // ..........**......
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 214
+     18, 27,
+     0x00000000,  // ..................
+     0x00001980,  // ......**..**......
+     0x00001980,  // ......**..**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F80,  // ......******......
+     0x00007FE0,  // ....**********....
+     0x0000E0F0,  // ...***.....****...
+     0x0001C038,  // ..***........***..
+     0x00018018,  // ..**..........**..
+     0x0003801C,  // .***..........***.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x0003000C,  // .**............**.
+     0x00018018,  // ..**..........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x00007FE0,  // ....**********....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 215
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000408,  // ...*......*..
+     0x00000E18,  // ..***....**..
+     0x00000730,  // ...***..**...
+     0x000003E0,  // ....*****....
+     0x000001C0,  // .....***.....
+     0x000001E0,  // .....****....
+     0x00000370,  // ....**.***...
+     0x00000638,  // ...**...***..
+     0x00000418,  // ...*.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 216
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001F8C,  // ......******...**.
+     0x00007FE8,  // ....**********.*..
+     0x0000E070,  // ...***......***...
+     0x0001C038,  // ..***........***..
+     0x00018058,  // ..**........*.**..
+     0x0003809C,  // .***.......*..***.
+     0x0003018C,  // .**.......**...**.
+     0x0003030C,  // .**......**....**.
+     0x0003060C,  // .**.....**.....**.
+     0x00030C0C,  // .**....**......**.
+     0x0003180C,  // .**...**.......**.
+     0x0003300C,  // .**..**........**.
+     0x0001E018,  // ..****........**..
+     0x0001C038,  // ..***........***..
+     0x0000E070,  // ...***......***...
+     0x0003FFE0,  // .*************....
+     0x00023F80,  // .*...*******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 217
+     17, 27,
+     0x00001C00,  // .....***.........
+     0x00000C00,  // ......**.........
+     0x00000600,  // .......**........
+     0x00000300,  // ........**.......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 218
+     17, 27,
+     0x00000180,  // .........**......
+     0x00000300,  // ........**.......
+     0x00000200,  // ........*........
+     0x00000400,  // .......*.........
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 219
+     17, 27,
+     0x00000700,  // .......***.......
+     0x00000700,  // .......***.......
+     0x00000D80,  // ......**.**......
+     0x00001880,  // .....**...*......
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 220
+     17, 27,
+     0x00000000,  // .................
+     0x00001D80,  // .....***.**......
+     0x00001D80,  // .....***.**......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x00006070,  // ...**......***...
+     0x00007FE0,  // ...**********....
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 221
+     15, 27,
+     0x000000E0,  // ........***....
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x0000600E,  // .**.........***
+     0x0000700E,  // .***........***
+     0x0000301C,  // ..**.......***.
+     0x00001818,  // ...**......**..
+     0x00001C38,  // ...***....***..
+     0x00000C30,  // ....**....**...
+     0x00000E60,  // ....***..**....
+     0x00000760,  // .....***.**....
+     0x000003C0,  // ......****.....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF0,  // ..**********...
+     0x00003FF8,  // ..***********..
+     0x0000301C,  // ..**.......***.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003038,  // ..**......***..
+     0x00003FF8,  // ..***********..
+     0x00003FF0,  // ..**********...
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x000007F0,  // ....*******...
+     0x00000E38,  // ...***...***..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C18,  // ...**.....**..
+     0x00000C38,  // ...**....***..
+     0x00000CE0,  // ...**..***....
+     0x00000CF0,  // ...**..****...
+     0x00000C18,  // ...**.....**..
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C0C,  // ...**......**.
+     0x00000C18,  // ...**.....**..
+     0x00000CF8,  // ...**..*****..
+     0x00000CE0,  // ...**..***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 224
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 225
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 226
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 227
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 228
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000760,  // ...***.**....
+     0x00000760,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x000001C0,  // .....***.....
+     0x00000240,  // ....*..*.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00000C18,  // ..**.....**..
+     0x00000818,  // ..*......**..
+     0x00000018,  // .........**..
+     0x000003F8,  // ....*******..
+     0x00000F98,  // ..*****..**..
+     0x00001C18,  // .***.....**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FFC,  // .***********.
+     0x000007DC,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 230
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0001F3F0,  // ....*****..******...
+     0x0007FFF8,  // ..****************..
+     0x00060E1C,  // ..**.....***....***.
+     0x00040C0C,  // ..*......**......**.
+     0x00001C0C,  // ........***......**.
+     0x0003FFFC,  // ...****************.
+     0x0007EFFC,  // ..******.**********.
+     0x000E0C00,  // .***.....**.........
+     0x000C0C0C,  // .**......**......**.
+     0x000C1E1C,  // .**.....****....***.
+     0x000FF7F8,  // .********.********..
+     0x0007C3F0,  // ..*****....******...
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 231
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x00000738,  // ..***..***..
+     0x000003F0,  // ...******...
+     0x00000080,  // .....*......
+     0x000000E0,  // .....***....
+     0x000000E0,  // .....***....
+     0x000003E0,  // ...*****....
+     0x000000C0,  // .....**.....
+  },
+  {             // 232
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 233
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // .......***...
+     0x000000E0,  // ......***....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 234
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000160,  // .....*.**....
+     0x00000320,  // ....**..*....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 235
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000370,  // ....**.***...
+     0x00000370,  // ....**.***...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 236
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000070,  // ***...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 237
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 238
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // ..***.
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 239
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 240
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000420,  // ...*....*....
+     0x000007C0,  // ...*****.....
+     0x00000780,  // ...****......
+     0x000004C0,  // ...*..**.....
+     0x000000E0,  // ......***....
+     0x000003F0,  // ....******...
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 241
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000009F0,  // ..*..*****...
+     0x00000FF8,  // ..*********..
+     0x00000E18,  // ..***....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000C18,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 242
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 243
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 244
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 245
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000300,  // ....**.......
+     0x000007F0,  // ...*******...
+     0x000004E0,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 246
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000760,  // ...***.**....
+     0x00000760,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF0,  // ..********...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00000C38,  // ..**....***..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 247
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // ......**.....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 248
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C8,  // ....*****..*..
+     0x00001FF0,  // ..*********...
+     0x00001830,  // ..**.....**...
+     0x00003078,  // .**.....****..
+     0x00003098,  // .**....*..**..
+     0x00003198,  // .**...**..**..
+     0x00003318,  // .**..**...**..
+     0x00003618,  // .**.**....**..
+     0x00003438,  // .**.*....***..
+     0x00001870,  // ..**....***...
+     0x00001FE0,  // ..********....
+     0x000027C0,  // .*..*****.....
+     0x00002000,  // .*............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 249
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000700,  // ...***.......
+     0x00000180,  // .....**......
+     0x00000080,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 250
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // ......***....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 251
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001C0,  // .....***.....
+     0x00000340,  // ....**.*.....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 252
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000006E0,  // ...**.***....
+     0x00000260,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001838,  // .**.....***..
+     0x00001FF8,  // .**********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 253
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000070,  // ......***...
+     0x000000E0,  // .....***....
+     0x00000080,  // .....*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
+  },
+  {             // 254
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001BE0,  // .**.*****....
+     0x00001FF8,  // .**********..
+     0x00001E38,  // .****...***..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00001E38,  // .****...***..
+     0x00001FF8,  // .**********..
+     0x000019E0,  // .**..****....
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+     0x00001800,  // .**..........
+  },
+  {             // 255
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000370,  // ...**.***...
+     0x00000370,  // ...**.***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000C18,  // .**.....**..
+     0x00000618,  // ..**....**..
+     0x00000630,  // ..**...**...
+     0x00000630,  // ..**...**...
+     0x00000330,  // ...**..**...
+     0x00000360,  // ...**.**....
+     0x00000360,  // ...**.**....
+     0x000001E0,  // ....****....
+     0x000001C0,  // ....***.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000180,  // ....**......
+     0x00000380,  // ...***......
+     0x00000F00,  // .****.......
+     0x00000E00,  // .***........
+  },
+  };
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index 883753cd1..c47836144 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -4182,34 +4182,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .........
   },
   {             // 171
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000110,  // .....*...*...
-     0x00000310,  // ....**...*...
-     0x00000670,  // ...**..***...
-     0x00000C40,  // ..**...*.....
-     0x00000C60,  // ..**...**....
-     0x00000730,  // ...***..**...
-     0x00000310,  // ....**...*...
-     0x00000110,  // .....*...*...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 27,
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 172
      13, 27,
@@ -4663,34 +4663,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
   },
   {             // 187
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000840,  // ..*....*.....
-     0x00000C60,  // ..**...**....
-     0x00000730,  // ...***..**...
-     0x00000310,  // ....**...*...
-     0x00000330,  // ....**..**...
-     0x00000E60,  // ..***..**....
-     0x00000C40,  // ..**...*.....
-     0x00000840,  // ..*....*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x00000007,  // ...***
+     0x00000003,   // ....**
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 188
      20, 27,
@@ -5173,34 +5173,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
   },
   {             // 204
-     6, 27,
-     0x00000070,  // ***...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     15, 27,
+     0x00000C30,  // ....**....**...
+     0x00000660,  // .....**..**....
+     0x000003C0,  // ......****.....
+     0x00000180,  // .......**......
+     0x00000000,  // ...............
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FF8,  // ..***********..
+     0x00003FF8,  // ..***********..
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003000,  // ..**...........
+     0x00003FFC,  // ..************.
+     0x00003FFC,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 205 iso8859-2
      6, 27,
@@ -5209,28 +5209,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000008,  // ...*..
      0x00000018,  // ..**..
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
   {             // 206
      6, 27,
@@ -5533,41 +5533,41 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
   },
   {             // 216
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00001F8C,  // ......******...**.
-     0x00007FE8,  // ....**********.*..
-     0x0000E070,  // ...***......***...
-     0x0001C038,  // ..***........***..
-     0x00018058,  // ..**........*.**..
-     0x0003809C,  // .***.......*..***.
-     0x0003018C,  // .**.......**...**.
-     0x0003030C,  // .**......**....**.
-     0x0003060C,  // .**.....**.....**.
-     0x00030C0C,  // .**....**......**.
-     0x0003180C,  // .**...**.......**.
-     0x0003300C,  // .**..**........**.
-     0x0001E018,  // ..****........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x0003FFE0,  // .*************....
-     0x00023F80,  // .*...*******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     17, 27,
+     0x00001860,  // .....**....**....
+     0x00000CC0,  // ......**..**.....
+     0x00000780,  // .......****......
+     0x00000300,  // ........**.......
+     0x00000000,  // .................
+     0x0000FFC0,  // ..**********.....
+     0x0000FFF0,  // ..************...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C030,  // ..**........**...
+     0x0000FFE0,  // ..***********....
+     0x0000FFF0,  // ..************...
+     0x0000C030,  // ..**........**...
+     0x0000C038,  // ..**........***..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C018,  // ..**.........**..
+     0x0000C01C,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 217
      17, 27,
-     0x00001C00,  // .....***.........
-     0x00000C00,  // ......**.........
-     0x00000600,  // .......**........
-     0x00000300,  // ........**.......
+     0x00000780,  // ......****.......
+     0x00000C00,  // ....**....**.....
+     0x00006240,  // ....**....**.....
+     0x00000780,  // ......****.......
      0x00000000,  // .................
      0x0000C018,  // ..**.........**..
      0x0000C018,  // ..**.........**..
@@ -6133,34 +6133,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
   },
   {             // 236
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000070,  // ***...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000330,  // ...**..**...
+     0x000001E0,  // ....****....
+     0x000000C0,  // .....**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x000007F0,  // ...*******...
+     0x00000C38,  // ..**....***..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x00001FFC,  // .***********.
+     0x00001FFC,  // .***********.
+     0x00001800,  // .**..........
+     0x00001808,  // .**.......*..
+     0x00000C18,  // ..**.....**..
+     0x00000FF0,  // ..********...
+     0x000003E0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 237
      6, 27,
@@ -6223,34 +6223,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
   },
   {             // 239
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     13, 27,
+     0x00000000,  // .............
+     0x00000007,  // .........***.
+     0x00000007,  // .........***.
+     0x00000003,  // ..........**.
+     0x00000000,  // .............
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x00000018,  // .........**..
+     0x000003D8,  // ....****.**..
+     0x00000FF8,  // ..*********..
+     0x00000C38,  // ..**....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C38,  // ..**....***..
+     0x00000FF8,  // ..*********..
+     0x000007C0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 240 iso8859-2
      13, 27,
@@ -6493,34 +6493,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
   },
   {             // 248
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007C8,  // ....*****..*..
-     0x00001FF0,  // ..*********...
-     0x00001830,  // ..**.....**...
-     0x00003078,  // .**.....****..
-     0x00003098,  // .**....*..**..
-     0x00003198,  // .**...**..**..
-     0x00003318,  // .**..**...**..
-     0x00003618,  // .**.**....**..
-     0x00003438,  // .**.*....***..
-     0x00001870,  // ..**....***...
-     0x00001FE0,  // ..********....
-     0x000027C0,  // .*..*****.....
-     0x00002000,  // .*............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000066,  // .**..**.
+     0x0000003C,  // ..****..
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000001C,  // ....***.
+     0x0000007C,  // ..*****.
+     0x00000070,  // ..***...
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000060,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 249
      13, 27,
@@ -6529,10 +6529,10 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000700,  // ...***.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
-     0x00000000,  // .............
+     0x000001E0,  // ....****.....
+     0x00000210,  // ...*....*....
+     0x00000210,  // ...*....*....
+     0x000001E0,  // ....****.....
      0x00000000,  // .............
      0x00001818,  // .**......**..
      0x00001818,  // .**......**..
diff --git a/fontsml-iso8859-15.c b/fontsml-iso8859-15.c
new file mode 100644
index 000000000..e17aa1162
--- /dev/null
+++ b/fontsml-iso8859-15.c
@@ -0,0 +1,5602 @@
+cFont::tPixelData FontSml_iso8859_15[][24] = {
+  {             // 32
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 33
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000010,  // ..*...
+     0x00000010,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 35
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x000003FE,  // .*********
+     0x000003FE,  // .*********
+     0x00000090,  // ...*..*...
+     0x00000090,  // ...*..*...
+     0x00000090,  // ...*..*...
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000120,  // ..*..*....
+     0x00000120,  // ..*..*....
+     0x00000120,  // ..*..*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 36
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000020,  // .....*....
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000032C,  // .**..*.**.
+     0x00000320,  // .**..*....
+     0x000003A0,  // .***.*....
+     0x000001E0,  // ..****....
+     0x000000F8,  // ...*****..
+     0x0000003C,  // .....****.
+     0x00000026,  // .....*..**
+     0x00000326,  // .**..*..**
+     0x000003AE,  // .***.*.***
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000020,  // .....*....
+     0x00000020,  // .....*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 37
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007860,  // ..****....**....
+     0x0000CCC0,  // .**..**..**.....
+     0x0000CCC0,  // .**..**..**.....
+     0x0000CD80,  // .**..**.**......
+     0x0000CD80,  // .**..**.**......
+     0x00007B00,  // ..****.**.......
+     0x00000300,  // .......**.......
+     0x00000678,  // ......**..****..
+     0x000006CC,  // ......**.**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x00000CCC,  // .....**..**..**.
+     0x000018CC,  // ....**...**..**.
+     0x00001878,  // ....**....****..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 38
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000780,  // ...****......
+     0x00000FC0,  // ..******.....
+     0x00000CC0,  // ..**..**.....
+     0x00000CC0,  // ..**..**.....
+     0x00000780,  // ...****......
+     0x00000F80,  // ..*****......
+     0x00001DD8,  // .***.***.**..
+     0x000018D8,  // .**...**.**..
+     0x00001878,  // .**....****..
+     0x00001870,  // .**....***...
+     0x00001CF8,  // .***..*****..
+     0x00000FDC,  // ..******.***.
+     0x0000078E,  // ...****...***
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 39
+     3, 22,
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000004,  // .*.
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+  },
+  {             // 40
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000008,  // ...*..
+  },
+  {             // 41
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000020,  // .*....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000020,  // .*....
+  },
+  {             // 42
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000010,  // ...*...
+     0x00000054,  // .*.*.*.
+     0x0000007C,  // .*****.
+     0x00000010,  // ...*...
+     0x0000007C,  // .*****.
+     0x00000054,  // .*.*.*.
+     0x00000010,  // ...*...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 43
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 44
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 45
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000007C,  // *****. added by hand to avoid flickering!!!
+     0x0000007C,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 46
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 48
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 49
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x000001F0,  // ..*****...
+     0x000001F0,  // ..*****...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 50
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000000C,  // .......**.
+     0x0000001C,  // ......***.
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x000001C0,  // ..***.....
+     0x00000380,  // .***......
+     0x00000300,  // .**.......
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 51
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000018,  // ......**..
+     0x00000070,  // ....***...
+     0x00000078,  // ....****..
+     0x0000001C,  // ......***.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 52
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000038,  // .....***..
+     0x00000078,  // ....****..
+     0x000000D8,  // ...**.**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000318,  // .**...**..
+     0x00000618,  // **....**..
+     0x000007FC,  // *********.
+     0x000007FC,  // *********.
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 53
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003F8,  // .*******..
+     0x000003F8,  // .*******..
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x000003F0,  // .******...
+     0x000003F8,  // .*******..
+     0x0000031C,  // .**...***.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 54
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000370,  // .**.***...
+     0x000003F8,  // .*******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000038C,  // .***...**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 55
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x0000000C,  // .......**.
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000180,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 56
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000001F8,  // ..******..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 57
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000001FC,  // ..*******.
+     0x000000EC,  // ...***.**.
+     0x0000000C,  // .......**.
+     0x0000000C,  // .......**.
+     0x00000318,  // .**...**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 58
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 59
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000008,  // ..*..
+     0x00000008,  // ..*..
+     0x00000010,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 60
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // .......**.
+     0x0000003C,  // .....****.
+     0x000000F0,  // ...****...
+     0x000001C0,  // ..***.....
+     0x00000300,  // .**.......
+     0x000001C0,  // ..***.....
+     0x000000F0,  // ...****...
+     0x0000003C,  // .....****.
+     0x0000000C,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 61
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x000003F8,  // ..*******..
+     0x000003F8,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 62
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x000003C0,  // .****.....
+     0x000000F0,  // ...****...
+     0x00000038,  // .....***..
+     0x0000000C,  // .......**.
+     0x00000038,  // .....***..
+     0x000000F0,  // ...****...
+     0x000003C0,  // .****.....
+     0x00000300,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 63
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001F0,  // ..*****...
+     0x000003F8,  // .*******..
+     0x00000318,  // .**...**..
+     0x00000318,  // .**...**..
+     0x00000038,  // .....***..
+     0x00000070,  // ....***...
+     0x000000E0,  // ...***....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 64
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // .......******.....
+     0x00003FF0,  // .....**********...
+     0x00007038,  // ....***......***..
+     0x0000C018,  // ...**.........**..
+     0x00018F4C,  // ..**...****.*..**.
+     0x00019DCC,  // ..**..***.***..**.
+     0x000318CC,  // .**...**...**..**.
+     0x0003318C,  // .**..**...**...**.
+     0x00033198,  // .**..**...**..**..
+     0x00033198,  // .**..**...**..**..
+     0x00033330,  // .**..**..**..**...
+     0x00033FE0,  // .**..*********....
+     0x00019DC0,  // ..**..***.***.....
+     0x0001C000,  // ..***.............
+     0x0000E000,  // ...***............
+     0x00007FC0,  // ....*********.....
+     0x00001F80,  // ......******......
+     0x00000000,  // ..................
+  },
+  {             // 65
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 66
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001FE0,  // .********....
+     0x00001FF0,  // .*********...
+     0x00001838,  // .**.....***..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001830,  // .**.....**...
+     0x00001FF0,  // .*********...
+     0x00001FF8,  // .**********..
+     0x0000181C,  // .**......***.
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x0000181C,  // .**......***.
+     0x00001FF8,  // .**********..
+     0x00001FF0,  // .*********...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 67
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 68
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FE0,  // .*********....
+     0x00003FF0,  // .**********...
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00003018,  // .**.......**..
+     0x00003038,  // .**......***..
+     0x00003FF0,  // .**********...
+     0x00003FE0,  // .*********....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 69
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 70
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // ..*********.
+     0x000007FC,  // ..*********.
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x000007F8,  // ..********..
+     0x000007F8,  // ..********..
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000600,  // ..**........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 71
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // .....******....
+     0x00001FF8,  // ...**********..
+     0x0000381C,  // ..***......***.
+     0x0000300C,  // ..**........**.
+     0x0000700C,  // .***........**.
+     0x00006000,  // .**............
+     0x00006000,  // .**............
+     0x0000607C,  // .**......*****.
+     0x0000607C,  // .**......*****.
+     0x0000700C,  // .***........**.
+     0x0000300C,  // ..**........**.
+     0x0000381C,  // ..***......***.
+     0x00001FFC,  // ...***********.
+     0x000007EC,  // .....******.**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003FF8,  // .***********..
+     0x00003FF8,  // .***********..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 73
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000018,  // ......**..
+     0x00000618,  // **....**..
+     0x00000618,  // **....**..
+     0x00000738,  // ***..***..
+     0x000003F0,  // .******...
+     0x000001E0,  // ..****....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 75
+     13, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000181C,  // ..**......***.
+     0x00001838,  // ..**.....***..
+     0x00001870,  // ..**....***...
+     0x000018E0,  // ..**...***....
+     0x000019C0,  // ..**..***.....
+     0x00001B80,  // ..**.***......
+     0x00001F00,  // ..*****.......
+     0x00001F80,  // ..******......
+     0x000019C0,  // ..**..***.....
+     0x000018E0,  // ..**...***....
+     0x00001870,  // ..**....***...
+     0x00001838,  // ..**.....***..
+     0x0000181C,  // ..**......***.
+     0x0000180E,  // ..**.......***
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 76
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 77
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000C00C,  // .**..........**.
+     0x0000C00C,  // .**..........**.
+     0x0000E01C,  // .***........***.
+     0x0000E01C,  // .***........***.
+     0x0000F03C,  // .****......****.
+     0x0000F03C,  // .****......****.
+     0x0000D86C,  // .**.**....**.**.
+     0x0000D86C,  // .**.**....**.**.
+     0x0000CCCC,  // .**..**..**..**.
+     0x0000CCCC,  // .**..**..**..**.
+     0x0000C48C,  // .**...*..*...**.
+     0x0000C78C,  // .**...****...**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 78
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003818,  // .***......**..
+     0x00003C18,  // .****.....**..
+     0x00003C18,  // .****.....**..
+     0x00003618,  // .**.**....**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x00003198,  // .**...**..**..
+     0x00003198,  // .**...**..**..
+     0x000030D8,  // .**....**.**..
+     0x00003078,  // .**.....****..
+     0x00003078,  // .**.....****..
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 79
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF0,  // ..********...
+     0x00000FF8,  // ..*********..
+     0x00000C1C,  // ..**.....***.
+     0x00000C0C,  // ..**......**.
+     0x00000C0C,  // ..**......**.
+     0x00000C1C,  // ..**.....***.
+     0x00000FF8,  // ..*********..
+     0x00000FF0,  // ..********...
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 81
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x000070DC,  // .***....**.***.
+     0x000030D8,  // ..**....**.**..
+     0x00003878,  // ..***....****..
+     0x00001FF0,  // ...*********...
+     0x000007D8,  // .....*****.**..
+     0x00000018,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FE0,  // .*********....
+     0x00003FF0,  // .**********...
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003038,  // .**......***..
+     0x00003FF0,  // .**********...
+     0x00003FE0,  // .*********....
+     0x00003030,  // .**......**...
+     0x00003030,  // .**......**...
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 83
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003C0,  // ....****.....
+     0x00000FF0,  // ..********...
+     0x00001C38,  // .***....***..
+     0x00001818,  // .**......**..
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000070,  // .......***...
+     0x00000038,  // ........***..
+     0x00000018,  // .........**..
+     0x00001818,  // .**......**..
+     0x00001C38,  // .***....***..
+     0x00000FF0,  // ..********...
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 84
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 86
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 87
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x0003060C,  // .**.....**.....**.
+     0x00030F0C,  // .**....****....**.
+     0x00018F18,  // ..**...****...**..
+     0x00018918,  // ..**...*..*...**..
+     0x00019998,  // ..**..**..**..**..
+     0x00019998,  // ..**..**..**..**..
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D9B0,  // ...**.**..**.**...
+     0x0000D0B0,  // ...**.*....*.**...
+     0x000070E0,  // ....***....***....
+     0x00006060,  // ....**......**....
+     0x00006060,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 88
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000C18,  // ..**.....**..
+     0x00000E38,  // ..***...***..
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x000001C0,  // .....***.....
+     0x00000360,  // ....**.**....
+     0x00000630,  // ...**...**...
+     0x00000E38,  // ..***...***..
+     0x00000C18,  // ..**.....**..
+     0x0000180C,  // .**.......**.
+     0x0000180C,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 89
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000E70,  // ..***..***...
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 90
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 91
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+  },
+  {             // 92
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000030,  // **...
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000006,  // ...**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 93
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x0000003C,  // ****.
+  },
+  {             // 94
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000020,  // ....*....
+     0x00000070,  // ...***...
+     0x000000D8,  // ..**.**..
+     0x000000D8,  // ..**.**..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 95
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000FFE,  // ***********
+     0x00000FFE,  // ***********
+  },
+  {             // 96
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000018,  // **..
+     0x0000000C,  // .**.
+     0x00000006,  // ..**
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 97
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 98
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 99
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 101
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 102
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ...***
+     0x0000001E,  // ..****
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000030C,  // ..**....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x0000000C,  // ........**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000000E0,  // ....***....
+  },
+  {             // 104
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 105
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 106
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000000C,  // ..**.
+     0x0000003C,  // ****.
+     0x00000038,  // ***..
+  },
+  {             // 107
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x00000180,  // .**......
+     0x0000018C,  // .**...**.
+     0x00000198,  // .**..**..
+     0x000001B0,  // .**.**...
+     0x000001E0,  // .****....
+     0x000001F0,  // .*****...
+     0x000001B0,  // .**.**...
+     0x00000198,  // .**..**..
+     0x0000019C,  // .**..***.
+     0x0000018C,  // .**...**.
+     0x0000018E,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 108
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 109
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000DE78,  // .**.****..****..
+     0x0000FFFC,  // .**************.
+     0x0000E38C,  // .***...***...**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x0000C30C,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 111
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 112
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+  },
+  {             // 113
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001EC,  // ...****.**.
+     0x000003FC,  // ..********.
+     0x0000031C,  // ..**...***.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000031C,  // ..**...***.
+     0x000003FC,  // ..********.
+     0x000001EC,  // ...****.**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+  },
+  {             // 114
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000036,  // .**.**
+     0x00000036,  // .**.**
+     0x00000038,  // .***..
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000030,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 115
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000000E,  // ...***
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x0000318C,  // .**...**...**.
+     0x00001998,  // ..**..**..**..
+     0x00001998,  // ..**..**..**..
+     0x00001A58,  // ..**.*..*.**..
+     0x00000A50,  // ...*.*..*.*...
+     0x00000E70,  // ...***..***...
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x0000039C,  // .***..***.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 121
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 122
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ....**.
+     0x00000018,  // ...**..
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000060,  // .**....
+     0x000000C0,  // **.....
+     0x00000060,  // .**....
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000030,  // ..**...
+     0x00000018,  // ...**..
+     0x0000000C,  // ....**.
+  },
+  {             // 124
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+  },
+  {             // 125
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000000C,  // ...**.
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x00000060,  // **....
+  },
+  {             // 126
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001CC,  // ..***..**.
+     0x000003FC,  // .********.
+     0x00000338,  // .**..***..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 127
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 161
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000008,  // ...*..
+     0x00000008,  // ...*..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+  },
+  {             // 162
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000010,  // ......*...
+     0x00000010,  // ......*...
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x000001AC,  // ..**.*.**.
+     0x00000320,  // .**..*....
+     0x00000320,  // .**..*....
+     0x00000320,  // .**..*....
+     0x00000320,  // .**..*....
+     0x000001AC,  // ..**.*.**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000040,  // ....*.....
+     0x00000040,  // ....*.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 163
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000300,  // .**.......
+     0x00000180,  // ..**......
+     0x000003F0,  // .******...
+     0x000000C0,  // ...**.....
+     0x000000C0,  // ...**.....
+     0x00000180,  // ..**......
+     0x00000304,  // .**.....*.
+     0x000007FC,  // *********.
+     0x000006F8,  // **.*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00007F00,  // *******.......
+     0x00007F00,  // *******.......
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00007F00,  // *******.......
+     0x00007F00,  // *******.......
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 165
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 166
+     13, 22,
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
+     0x00000000,  // .............
+     0x000003E0,  // ....*****....
+     0x00000FF8,  // ..*********..
+     0x00001C1C,  // .***.....***.
+     0x0000180C,  // .**.......**.
+     0x00001C00,  // .***.........
+     0x00000F80,  // ..*****......
+     0x000003E0,  // ....*****....
+     0x00000078,  // .......****..
+     0x0000001C,  // .........***.
+     0x0000000C,  // ..........**.
+     0x0000180C,  // .**.......**.
+     0x00001C1C,  // .***.....***.
+     0x00000FF8,  // ..*********..
+     0x000007E0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 167
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003C0,  // .****.....
+     0x000001F0,  // ..*****...
+     0x000001B8,  // ..**.***..
+     0x0000031C,  // .**...***.
+     0x0000030C,  // .**....**.
+     0x0000038C,  // .***...**.
+     0x000001CC,  // ..***..**.
+     0x000000F8,  // ...*****..
+     0x00000038,  // .....***..
+     0x0000001C,  // ......***.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000001F8,  // ..******..
+     0x000000F0,  // ...****...
+  },
+  {             // 168
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000198,  // .**..**..
+     0x000000F0,  // ..****...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x00000078,  // ...****..
+     0x000000FC,  // ..******.
+     0x0000018C,  // .**...**.
+     0x00000180,  // .**......
+     0x000001F8,  // .******..
+     0x0000007C,  // ...*****.
+     0x0000000C,  // ......**.
+     0x0000018C,  // .**...**.
+     0x000001F8,  // .******..
+     0x000000F0,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 169
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001830,  // ...**.....**...
+     0x00002008,  // ..*.........*..
+     0x00002388,  // ..*...***...*..
+     0x00004444,  // .*...*...*...*.
+     0x00004844,  // .*..*....*...*.
+     0x00004804,  // .*..*........*.
+     0x00004804,  // .*..*........*.
+     0x00004804,  // .*..*........*.
+     0x00004444,  // .*...*...*...*.
+     0x00002388,  // ..*...***...*..
+     0x00002008,  // ..*.........*..
+     0x00001830,  // ...**.....**...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000004C,  // .*..**.
+     0x0000001C,  // ...***.
+     0x00000024,  // ..*..*.
+     0x0000006C,  // .**.**.
+     0x00000034,  // ..**.*.
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 171
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000006C,  // ...**.**.
+     0x000000D8,  // ..**.**..
+     0x000001B0,  // .**.**...
+     0x000001B0,  // .**.**...
+     0x000000D8,  // ..**.**..
+     0x0000006C,  // ...**.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 172
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FC,  // .*********.
+     0x000007FC,  // .*********.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x0000000C,  // ........**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 173
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000007C,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 174
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000007C0,  // ....*****.....
+     0x00001830,  // ..**.....**...
+     0x00002008,  // .*.........*..
+     0x000027C8,  // .*..*****..*..
+     0x00004424,  // *...*....*..*.
+     0x00004424,  // *...*....*..*.
+     0x00004424,  // *...*....*..*.
+     0x000047C4,  // *...*****...*.
+     0x00004484,  // *...*..*....*.
+     0x00004444,  // *...*...*...*.
+     0x00002428,  // .*..*....*.*..
+     0x00002008,  // .*.........*..
+     0x00001830,  // ..**.....**...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 175
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000003E,  // *****
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 176
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000006C,  // .**.**.
+     0x00000044,  // .*...*.
+     0x0000006C,  // .**.**.
+     0x00000038,  // ..***..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 177
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 178
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000038,  // .***..
+     0x0000007C,  // *****.
+     0x0000004C,  // *..**.
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000030,  // .**...
+     0x0000007C,  // *****.
+     0x0000007C,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 179
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000038,  // .***..
+     0x0000007C,  // *****.
+     0x0000004C,  // *..**.
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000004C,  // *..**.
+     0x0000007C,  // *****.
+     0x00000038,  // .***..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 180
+     12, 22,
+     0x00000318,  // ...**...**..
+     0x000001B0,  // ....**.**...
+     0x000000E0,  // .....***....
+     0x00000000,  // ............
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x0000000C,  // .........**.
+     0x00000018,  // ........**..
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x000001C0,  // ....***.....
+     0x00000180,  // ....**......
+     0x00000300,  // ...**.......
+     0x00000600,  // ..**........
+     0x00000C00,  // .**.........
+     0x00000FFC,  // .**********.
+     0x00000FFC,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 181
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000039C,  // .***..***.
+     0x000003FC,  // .********.
+     0x0000036C,  // .**.**.**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+  },
+  {             // 182
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000FC,  // ...******.
+     0x000001C8,  // ..***..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000003C8,  // .****..*..
+     0x000001C8,  // ..***..*..
+     0x000000C8,  // ...**..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+     0x00000048,  // ....*..*..
+  },
+  {             // 183
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 184
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000198,  // .**..**..
+     0x000000F0,  // ..****...
+     0x00000060,  // ...**....
+     0x00000000,  // .........
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x0000000C,  // ......**.
+     0x00000018,  // .....**..
+     0x00000030,  // ....**...
+     0x00000060,  // ...**....
+     0x000000C0,  // ..**.....
+     0x00000180,  // .**......
+     0x000001FC,  // .*******.
+     0x000001FC,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 185
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000078,  // ****..
+     0x00000078,  // ****..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 186
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000038,  // ..***..
+     0x0000006C,  // .**.**.
+     0x00000044,  // .*...*.
+     0x00000044,  // .*...*.
+     0x0000006C,  // .**.**.
+     0x00000038,  // ..***..
+     0x00000000,  // .......
+     0x0000007C,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 187
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001B0,  // .**.**...
+     0x000000D8,  // ..**.**..
+     0x0000006C,  // ...**.**.
+     0x0000006C,  // ...**.**.
+     0x000000D8,  // ..**.**..
+     0x000001B0,  // .**.**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 188
+     19, 22,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x000077FC,  // .....***.*********.
+     0x0001FFFC,  // ...***************.
+     0x00038E00,  // ..***...***........
+     0x00030600,  // ..**.....**........
+     0x00070600,  // .***.....**........
+     0x00060600,  // .**......**........
+     0x000607F8,  // .**......********..
+     0x000607F8,  // .**......********..
+     0x00060600,  // .**......**........
+     0x00070600,  // .***.....**........
+     0x00030600,  // ..**.....**........
+     0x00038E00,  // ..***...***........
+     0x0001FFFC,  // ...***************.
+     0x000077FC,  // .....***.*********.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 189
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007CF0,  // ...*****..****...
+     0x0000FFF8,  // ..*************..
+     0x0000C70C,  // ..**...***....**.
+     0x0001830C,  // .**.....**....**.
+     0x000183FC,  // .**.....********.
+     0x00018300,  // .**.....**.......
+     0x00018300,  // .**.....**.......
+     0x0000C78C,  // ..**...****...**.
+     0x0000FFFC,  // ..**************.
+     0x00007CF0,  // ...*****..****...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 190
+     14, 22,
+     0x00000000,  // ..............
+     0x00000660,  // ....**..**....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x0000300C,  // .**........**.
+     0x0000300C,  // .**........**.
+     0x00001818,  // ..**......**..
+     0x00001818,  // ..**......**..
+     0x00000C30,  // ...**....**...
+     0x00000C30,  // ...**....**...
+     0x00000660,  // ....**..**....
+     0x000003C0,  // .....****.....
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 191
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000000E0,  // ...***....
+     0x000001C0,  // ..***.....
+     0x00000380,  // .***......
+     0x00000318,  // .**...**..
+     0x00000318,  // .**...**..
+     0x000003F8,  // .*******..
+     0x000001F0,  // ..*****...
+  },
+  {             // 192
+     13, 22,
+     0x00000600,  // ...**........
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 193
+     13, 22,
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 194
+     13, 22,
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 195
+     13, 22,
+     0x00000320,  // ....**..*....
+     0x000005A0,  // ...*.**.*....
+     0x000004C0,  // ...*..**.....
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 196
+     13, 22,
+     0x00000000,  // .............
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 197
+     13, 22,
+     0x00000000,  // .............
+     0x00000180,  // .....**......
+     0x00000240,  // ....*..*.....
+     0x00000240,  // ....*..*.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x000003C0,  // ....****.....
+     0x000003C0,  // ....****.....
+     0x00000660,  // ...**..**....
+     0x00000660,  // ...**..**....
+     0x00000C30,  // ..**....**...
+     0x00000C30,  // ..**....**...
+     0x00000FF0,  // ..********...
+     0x00001FF8,  // .**********..
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 198
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00001FFC,  // ......***********.
+     0x00001FFC,  // ......***********.
+     0x00003600,  // .....**.**........
+     0x00003600,  // .....**.**........
+     0x00006600,  // ....**..**........
+     0x00006600,  // ....**..**........
+     0x0000C7F8,  // ...**...********..
+     0x0000C7F8,  // ...**...********..
+     0x0000FE00,  // ...*******........
+     0x0001FE00,  // ..********........
+     0x00018600,  // ..**....**........
+     0x00018600,  // ..**....**........
+     0x000307FC,  // .**.....*********.
+     0x000307FC,  // .**.....*********.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 199
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // .....*****....
+     0x00000FF8,  // ...*********..
+     0x00001C1C,  // ..***.....***.
+     0x0000180C,  // ..**.......**.
+     0x00003800,  // .***..........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003000,  // .**...........
+     0x00003800,  // .***..........
+     0x0000180C,  // ..**.......**.
+     0x00001C1C,  // ..***.....***.
+     0x00000FF8,  // ...*********..
+     0x000003E0,  // .....*****....
+     0x00000180,  // ......**......
+     0x000000C0,  // .......**.....
+     0x000006C0,  // ....**.**.....
+     0x00000780,  // ....****......
+  },
+  {             // 200
+     13, 22,
+     0x00000300,  // ....**.......
+     0x00000180,  // .....**......
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 201
+     13, 22,
+     0x00000030,  // ........**...
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 202
+     13, 22,
+     0x000000C0,  // ......**.....
+     0x000001E0,  // .....****....
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 203
+     13, 22,
+     0x00000000,  // .............
+     0x00000330,  // ....**..**...
+     0x00000330,  // ....**..**...
+     0x00000000,  // .............
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FF8,  // ..*********..
+     0x00000FF8,  // ..*********..
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000C00,  // ..**.........
+     0x00000FFC,  // ..**********.
+     0x00000FFC,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 204
+     6, 22,
+     0x00000060,  // **....
+     0x00000030,  // .**...
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 22,
+     0x00000006,  // ....**
+     0x0000000C,  // ...**.
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 22,
+     0x00000018,  // ..**..
+     0x0000003C,  // .****.
+     0x00000042,  // *....*
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 207
+     6, 22,
+     0x00000000,  // ......
+     0x00000066,  // **..**
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FE0,  // ..*********....
+     0x00003FF0,  // ..**********...
+     0x00003038,  // ..**......***..
+     0x00003018,  // ..**.......**..
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x0000FE0C,  // *******.....**.
+     0x0000FE0C,  // *******.....**.
+     0x0000300C,  // ..**........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00003038,  // ..**......***..
+     0x00003FF0,  // ..**********...
+     0x00003FE0,  // ..*********....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 209
+     14, 22,
+     0x00000320,  // .....**..*....
+     0x000005A0,  // ....*.**.*....
+     0x000004C0,  // ....*..**.....
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003818,  // .***......**..
+     0x00003C18,  // .****.....**..
+     0x00003C18,  // .****.....**..
+     0x00003618,  // .**.**....**..
+     0x00003318,  // .**..**...**..
+     0x00003318,  // .**..**...**..
+     0x00003198,  // .**...**..**..
+     0x00003198,  // .**...**..**..
+     0x000030D8,  // .**....**.**..
+     0x00003078,  // .**.....****..
+     0x00003078,  // .**.....****..
+     0x00003038,  // .**......***..
+     0x00003018,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 210
+     15, 22,
+     0x00000C00,  // ....**.........
+     0x00000600,  // .....**........
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 22,
+     0x000000C0,  // ........**.....
+     0x00000180,  // .......**......
+     0x00000300,  // ......**.......
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 22,
+     0x00000180,  // .......**......
+     0x000003C0,  // ......****.....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 22,
+     0x00000320,  // ......**..*....
+     0x000005A0,  // .....*.**.*....
+     0x000004C0,  // .....*..**.....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 22,
+     0x00000000,  // ...............
+     0x00000660,  // .....**..**....
+     0x00000660,  // .....**..**....
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00003838,  // ..***.....***..
+     0x00003018,  // ..**.......**..
+     0x0000701C,  // .***.......***.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000600C,  // .**.........**.
+     0x0000701C,  // .***.......***.
+     0x00003018,  // ..**.......**..
+     0x00003838,  // ..***.....***..
+     0x00001FF0,  // ...*********...
+     0x000007C0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000606,  // **......**
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x0000030C,  // .**....**.
+     0x00000606,  // **......**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 216
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007CC,  // .....*****..**.
+     0x00001FF8,  // ...**********..
+     0x00003830,  // ..***.....**...
+     0x00003078,  // ..**.....****..
+     0x000070DC,  // .***....**.***.
+     0x0000618C,  // .**....**...**.
+     0x0000630C,  // .**...**....**.
+     0x0000620C,  // .**...*.....**.
+     0x0000660C,  // .**..**.....**.
+     0x00006C1C,  // .**.**.....***.
+     0x00003818,  // ..***......**..
+     0x00003838,  // ..***.....***..
+     0x00006FF0,  // .**.********...
+     0x0000C7C0,  // **...*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     14, 22,
+     0x00000600,  // ....**........
+     0x00000300,  // .....**.......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 218
+     14, 22,
+     0x000000C0,  // .......**.....
+     0x00000180,  // ......**......
+     0x00000300,  // .....**.......
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 219
+     14, 22,
+     0x00000180,  // ......**......
+     0x000003C0,  // .....****.....
+     0x00000660,  // ....**..**....
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 220
+     14, 22,
+     0x00000000,  // ..............
+     0x00000C60,  // ...**...**....
+     0x00000C60,  // ...**...**....
+     0x00000000,  // ..............
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00003018,  // .**.......**..
+     0x00001830,  // ..**.....**...
+     0x00001FF0,  // ..*********...
+     0x000007C0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 221
+     13, 22,
+     0x00000060,  // .......**....
+     0x000000C0,  // ......**.....
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x0000300C,  // **........**.
+     0x0000300C,  // **........**.
+     0x00001818,  // .**......**..
+     0x00001818,  // .**......**..
+     0x00000C30,  // ..**....**...
+     0x00000E70,  // ..***..***...
+     0x00000660,  // ...**..**....
+     0x000003C0,  // ....****.....
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000180,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 222
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000FF0,  // .********...
+     0x00000FF8,  // .*********..
+     0x00000C1C,  // .**.....***.
+     0x00000C0C,  // .**......**.
+     0x00000C0C,  // .**......**.
+     0x00000C1C,  // .**.....***.
+     0x00000FF8,  // .*********..
+     0x00000FF0,  // .********...
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 223
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000070,  // ...***...
+     0x000000F8,  // ..*****..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001B8,  // .**.***..
+     0x000001B8,  // .**.***..
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x0000018C,  // .**...**.
+     0x000001BC,  // .**.****.
+     0x000001B8,  // .**.***..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 224
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 225
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000180,  // ...**......
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 226
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000001E0,  // ...****....
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 227
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000190,  // ...**..*...
+     0x000002D0,  // ..*.**.*...
+     0x00000260,  // ..*..**....
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 228
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000330,  // ..**..**...
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 229
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x00000120,  // ...*..*....
+     0x00000120,  // ...*..*....
+     0x000000C0,  // ....**.....
+     0x000003F0,  // ..******...
+     0x00000738,  // .***..***..
+     0x00000618,  // .**....**..
+     0x00000038,  // ......***..
+     0x000003F8,  // ..*******..
+     0x00000718,  // .***...**..
+     0x00000618,  // .**....**..
+     0x00000618,  // .**....**..
+     0x0000073C,  // .***..****.
+     0x000003CC,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 230
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007EF0,  // ...******.****...
+     0x0000E7F8,  // ..***..********..
+     0x0000C30C,  // ..**....**....**.
+     0x0000070C,  // .......***....**.
+     0x00007FFC,  // ...*************.
+     0x0000E300,  // ..***...**.......
+     0x0000C300,  // ..**....**.......
+     0x0000C38C,  // ..**....***...**.
+     0x0000E7FC,  // ..***..*********.
+     0x00007AF0,  // ...****.*.****...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 231
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ...*****..
+     0x000001FC,  // ..*******.
+     0x0000018C,  // ..**...**.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000018C,  // ..**...**.
+     0x000001FC,  // ..*******.
+     0x000000F8,  // ...*****..
+     0x00000060,  // ....**....
+     0x00000030,  // .....**...
+     0x000001B0,  // ..**.**...
+     0x000001E0,  // ..****....
+  },
+  {             // 232
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x00000060,  // ....**....
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 233
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x000000C0,  // ...**.....
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 234
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 235
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F0,  // ...****...
+     0x000001F8,  // ..******..
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x000003FC,  // .********.
+     0x00000300,  // .**.......
+     0x00000300,  // .**.......
+     0x0000038C,  // .***...**.
+     0x000001FC,  // ..*******.
+     0x000000F0,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 236
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000018,  // **..
+     0x0000000C,  // .**.
+     0x00000006,  // ..**
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 237
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // ..**
+     0x0000000C,  // .**.
+     0x00000018,  // **..
+     0x00000000,  // ....
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x0000000C,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 238
+     4, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // ..**..
+     0x0000003C,  // .****.
+     0x00000066,  // **..**
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 239
+     4, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000036,  // **.**
+     0x00000036,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000018,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 240
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // ..**.......
+     0x000001B0,  // ...**.**...
+     0x000001C0,  // ...***.....
+     0x00000260,  // ..*..**....
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 241
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C8,  // ...**..*..
+     0x00000168,  // ..*.**.*..
+     0x00000130,  // ..*..**...
+     0x00000000,  // ..........
+     0x00000378,  // .**.****..
+     0x000003FC,  // .********.
+     0x0000038C,  // .***...**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 242
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000180,  // ...**......
+     0x000000C0,  // ....**.....
+     0x00000060,  // .....**....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 243
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // ......**...
+     0x00000060,  // .....**....
+     0x000000C0,  // ....**.....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 244
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ....**.....
+     0x000001E0,  // ...****....
+     0x00000330,  // ..**..**...
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 245
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000190,  // ...**..*...
+     0x000002D0,  // ..*.**.*...
+     0x00000260,  // ..*..**....
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 246
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ...**..**..
+     0x00000198,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F0,  // ...*****...
+     0x000003F8,  // ..*******..
+     0x00000318,  // ..**...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000318,  // ..**...**..
+     0x000003F8,  // ..*******..
+     0x000001F0,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 247
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x000003FC,  // .********.
+     0x000003FC,  // .********.
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 248
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000E6,  // ....***..**
+     0x000003FC,  // ..********.
+     0x00000318,  // ..**...**..
+     0x0000063C,  // .**...****.
+     0x0000066C,  // .**..**.**.
+     0x000006CC,  // .**.**..**.
+     0x0000078C,  // .****...**.
+     0x00000318,  // ..**...**..
+     0x000007F8,  // .********..
+     0x00000CE0,  // **..***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 249
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000C0,  // ...**.....
+     0x00000060,  // ....**....
+     0x00000030,  // .....**...
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 250
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 251
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ....**....
+     0x000000F0,  // ...****...
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 252
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000031C,  // .**...***.
+     0x000003FC,  // .********.
+     0x000001EC,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 253
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // ......**..
+     0x00000030,  // .....**...
+     0x00000060,  // ....**....
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  {             // 254
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x000006F0,  // .**.****...
+     0x000007F8,  // .********..
+     0x00000718,  // .***...**..
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x0000060C,  // .**.....**.
+     0x00000718,  // .***...**..
+     0x000007F8,  // .********..
+     0x000006F0,  // .**.****...
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+     0x00000600,  // .**........
+  },
+  {             // 255
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x0000030C,  // .**....**.
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000198,  // ..**..**..
+     0x00000090,  // ...*..*...
+     0x000000F0,  // ...****...
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x00000060,  // ....**....
+     0x000001C0,  // ..***.....
+     0x000001C0,  // ..***.....
+  },
+  };
diff --git a/i18n.c b/i18n.c
index 5094fbd3e..e3f4637af 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.157 2004/05/28 13:19:29 kls Exp $
+ * $Id: i18n.c 1.159 2004/10/16 13:20:56 kls Exp $
  *
  * Translations provided by:
  *
@@ -24,6 +24,7 @@
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
  * Croatian    Drazen Dupor <drazen.dupor@dupor.com>
+ * Estonian    Arthur Konovalov <kasjas@hot.ee>
  *
  */
 
@@ -96,6 +97,7 @@ const tI18nPhrase Phrases[] = {
     "Catal�",
     "�������", // Russian
     "Hrvatski",
+    "Eesti",
   },
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-1",
@@ -116,6 +118,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-5",
     "iso8859-2",
+    "iso8859-15", // or iso8859-1 as alternative
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
   { "eng,dos",
@@ -136,6 +139,7 @@ const tI18nPhrase Phrases[] = {
     "cat,cln",
     "rus",
     "hrv",
+    "est",
   },
   // Menu titles:
   { "VDR",
@@ -156,6 +160,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -175,6 +180,7 @@ const tI18nPhrase Phrases[] = {
     "Guia de Programaci�",
     "�������",
     "Raspored",
+    "Kava",
   },
   { "Channels",
     "Kan�le",
@@ -194,6 +200,7 @@ const tI18nPhrase Phrases[] = {
     "Canals",
     "������",
     "Programi",
+    "Kanalid",
   },
   { "Timers",
     "Timer",
@@ -213,6 +220,7 @@ const tI18nPhrase Phrases[] = {
     "Temporitzadors",
     "�������",
     "Termini",
+    "Taimer",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -232,6 +240,7 @@ const tI18nPhrase Phrases[] = {
     "Veure programes gravats",
     "������",
     "Snimke",
+    "Salvestused",
   },
   { "Setup",
     "Einstellungen",
@@ -251,6 +260,7 @@ const tI18nPhrase Phrases[] = {
     "Configuraci�",
     "���������",
     "Konfiguracija",
+    "S�tted",
   },
   { "Commands",
     "Befehle",
@@ -270,6 +280,7 @@ const tI18nPhrase Phrases[] = {
     "Ordres",
     "�������",
     "Naredbe",
+    "K�sud",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -289,6 +300,7 @@ const tI18nPhrase Phrases[] = {
     "Ordres de gravaci�",
     "������� ������",
     "Naredbe za snimanje",
+    "Salvestuse k�sud",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -308,6 +320,7 @@ const tI18nPhrase Phrases[] = {
     "Editar canal",
     "�������������� ������",
     "Ure�ivanje programa",
+    "Kanali muutmine",
   },
   { "Edit timer",
     "Timer editieren",
@@ -327,6 +340,7 @@ const tI18nPhrase Phrases[] = {
     "Editar temporitzador",
     "��������� �������",
     "Ure�ivanje termina",
+    "Taimeri muutmine",
   },
   { "Event",
     "Sendung",
@@ -346,6 +360,7 @@ const tI18nPhrase Phrases[] = {
     "Esdeveniment",
     "��������",
     "Emisija",
+    "S�ndmus",
   },
   { "Summary",
     "Inhalt",
@@ -365,6 +380,7 @@ const tI18nPhrase Phrases[] = {
     "Sinopsi",
     "��������",
     "Sadr�aj",
+    "Kokkuv�te",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -384,6 +400,7 @@ const tI18nPhrase Phrases[] = {
     "Guia de Programaci� - %s",
     "��������� - %s",
     "Raspored - %s",
+    "Programm - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -403,6 +420,7 @@ const tI18nPhrase Phrases[] = {
     "Qu� fan ara?",
     "������ � �����:",
     "�to je trenutno na programu?",
+    "Hetkel eetris",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -422,6 +440,7 @@ const tI18nPhrase Phrases[] = {
     "Qu� fan despr�s?",
     "����� � ���������:",
     "�to slijedi?",
+    "J�rgmisena eetris",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -442,6 +461,7 @@ const tI18nPhrase Phrases[] = {
     "Editar",
     "�������������",
     "Promjeni",
+    "Muuda",
   },
   { "New",
     "Neu",
@@ -461,6 +481,7 @@ const tI18nPhrase Phrases[] = {
     "Nou",
     "��������",
     "Novi",
+    "Uus",
   },
   { "Delete",
     "L�schen",
@@ -480,6 +501,7 @@ const tI18nPhrase Phrases[] = {
     "Esborrar",
     "�������",
     "Obri�i",
+    "Kustuta",
   },
   { "Mark",
     "Markieren",
@@ -499,6 +521,7 @@ const tI18nPhrase Phrases[] = {
     "Marcar",
     "�����������",
     "Ozna�i",
+    "Siirda",
   },
   { "On/Off",
     "Ein/Aus",
@@ -518,6 +541,7 @@ const tI18nPhrase Phrases[] = {
     "On/Off",
     "���/����",
     "De-/Aktiviraj",
+    "Sees/V�ljas",
   },
   { "Record",
     "Aufnehmen",
@@ -537,6 +561,7 @@ const tI18nPhrase Phrases[] = {
     "Gravar",
     "������",
     "Snimi",
+    "Salvesta",
   },
   { "Play",
     "Wiedergabe",
@@ -556,6 +581,7 @@ const tI18nPhrase Phrases[] = {
     "Reproduir",
     "�������������",
     "Start",
+    "Start",
   },
   { "Rewind",
     "Anfang",
@@ -575,6 +601,7 @@ const tI18nPhrase Phrases[] = {
     "Enrera",
     "�����",
     "Na po�etak",
+    "Algusesse",
   },
   { "Button$Stop",
     "Beenden",
@@ -594,6 +621,7 @@ const tI18nPhrase Phrases[] = {
     "Aturar",
     "����",
     "Stop",
+    "Stopp",
   },
   { "Resume",
     "Weiter",
@@ -613,6 +641,7 @@ const tI18nPhrase Phrases[] = {
     "Continuar",
     "����������",
     "Nastavi",
+    "J�tka",
   },
   { "Summary",
     "Inhalt",
@@ -632,6 +661,7 @@ const tI18nPhrase Phrases[] = {
     "Resum",
     "��������",
     "Sadr�aj",
+    "Kokkuv�te",
   },
   { "Open",
     "�ffnen",
@@ -651,6 +681,7 @@ const tI18nPhrase Phrases[] = {
     "Obrir",
     "�������",
     "Otvori",
+    "Ava",
   },
   { "Switch",
     "Umschalten",
@@ -670,6 +701,7 @@ const tI18nPhrase Phrases[] = {
     "Canviar",
     "�����������",
     "Prebaci",
+    "Vali",
   },
   { "Now",
     "Jetzt",
@@ -689,6 +721,7 @@ const tI18nPhrase Phrases[] = {
     "Ara",
     "������",
     "Trenutno",
+    "N��d",
   },
   { "Next",
     "N�chste",
@@ -708,6 +741,7 @@ const tI18nPhrase Phrases[] = {
     "Seg�ent",
     "�����",
     "Slijedi",
+    "J�rgmine",
   },
   { "Button$Schedule",
     "Programm",
@@ -727,6 +761,7 @@ const tI18nPhrase Phrases[] = {
     "Programar",
     "���������",
     "Raspored",
+    "Kava",
   },
   { "Language",
     "Sprache",
@@ -746,6 +781,7 @@ const tI18nPhrase Phrases[] = {
     "Idioma",
     "����",
     "Jezik",
+    "Keel",
   },
   { "Eject",
     "Auswerfen",
@@ -765,6 +801,7 @@ const tI18nPhrase Phrases[] = {
     "Expulsar",
     "�������",
     "Izbaci",
+    "Ava",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -784,6 +821,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "���/���",
     "ABC/abc",
+    "ABC/abc",
   },
   { "Insert",
     "Einf�gen",
@@ -803,6 +841,7 @@ const tI18nPhrase Phrases[] = {
     "Inserir",
     "�������",
     "Umetni",
+    "Lisa (INS)",
   },
   { "Overwrite",
     "�berschreiben",
@@ -822,6 +861,7 @@ const tI18nPhrase Phrases[] = {
     "Sobrescriure",
     "������",
     "Prepi�i",
+    "Asenda (OVR)",
   },
   { "Menu",
     "Men�",
@@ -841,6 +881,7 @@ const tI18nPhrase Phrases[] = {
     "Men�",
     "����",
     "Izbor",
+    "Men��",
   },
   { "Reset",
     "Reset",
@@ -860,6 +901,7 @@ const tI18nPhrase Phrases[] = {
     "Reiniciar",
     "�����",
     "Reset",
+    "Reset",
   },
   { "Scan",
     "Scan",
@@ -879,6 +921,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "�����������",
     "Pretra�i",
+    "Uuenda",
   },
   // Confirmations:
   { "Delete channel?",
@@ -899,6 +942,7 @@ const tI18nPhrase Phrases[] = {
     "Esborrar el canal?",
     "������� �����?",
     "Obrisati program?",
+    "Kustutan kanali?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -918,6 +962,7 @@ const tI18nPhrase Phrases[] = {
     "Esborrar el temporitzador?",
     "������� ������?",
     "Obrisati termin?",
+    "Kustutan taimeri?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -937,6 +982,7 @@ const tI18nPhrase Phrases[] = {
     "Esborrar gravaci�?",
     "������� ������?",
     "Obrisati snimku?",
+    "Kustutan salvestuse?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -956,6 +1002,7 @@ const tI18nPhrase Phrases[] = {
     "Temporitzador activat - Esborrar de totes maneres?",
     "���� ������ �� ������� - ������������� �������?",
     "Jo� snimam - zaista obrisati?",
+    "Salvestus aktiivne - kustutan?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -975,6 +1022,7 @@ const tI18nPhrase Phrases[] = {
     "Aturar la gravaci�?",
     "���������� ������?",
     "Zaustaviti snimanje?",
+    "L�petan salvestamise?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -994,6 +1042,7 @@ const tI18nPhrase Phrases[] = {
     "a la interf�cie prim�ria",
     "�� �������� ����������",
     "na primarnom ure�aju",
+    "peavastuv�tjal",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -1013,6 +1062,7 @@ const tI18nPhrase Phrases[] = {
     "Cancel�lar l'edici�?",
     "�������� ��������������?",
     "Otkazati ure�ivanje?",
+    "T�histan muudatuse?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -1032,6 +1082,7 @@ const tI18nPhrase Phrases[] = {
     "Segur que voleu reiniciar?",
     "������������� �������������?",
     "Zaista ponovo pokrenuti?",
+    "Restart?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -1051,6 +1102,7 @@ const tI18nPhrase Phrases[] = {
     "Gravant - Reiniciar de totes maneres?",
     "���� ������ - ������������� �������������?",
     "Snimanje traje - svejedno restart sistema?",
+    "Salvestamine aktiivne - restart?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -1070,6 +1122,7 @@ const tI18nPhrase Phrases[] = {
     "Gravant - Apagar de totes maneres?",
     "���� ������ - ������������� ���������?",
     "Snimanje traje - svejedno isklju�iti?",
+    "Salvestamine aktiivne - l�litan v�lja?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -1089,6 +1142,7 @@ const tI18nPhrase Phrases[] = {
     "Hi ha una gravaci� en %d minuts - Apagar de totes maneres?",
     "����� %d ����� �������� ������ - ������������� ���������?",
     "Snimanje za %d minuta - svejedno isklju�iti?",
+    "Salvestamine algab %d minuti p�rast - l�litan v�lja?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -1108,6 +1162,7 @@ const tI18nPhrase Phrases[] = {
     "Prem qualsevol tecla per cancel�lar l'aturada",
     "������� ����� ������ ����� �������� ����������.",
     "Pritisnite tipku ako ne �elite ugasiti sistem",
+    "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks",
   },
   // Channel parameters:
   { "Name",
@@ -1128,6 +1183,7 @@ const tI18nPhrase Phrases[] = {
     "Nom",
     "��������",
     "Naziv",
+    "Nimi",
   },
   { "Frequency",
     "Frequenz",
@@ -1147,6 +1203,7 @@ const tI18nPhrase Phrases[] = {
     "Freq��ncia",
     "�������",
     "Frekvencija",
+    "Sagedus",
   },
   { "Polarization",
     "Polarisation",
@@ -1166,6 +1223,7 @@ const tI18nPhrase Phrases[] = {
     "Polaritzaci�",
     "�����������",
     "Polarizacija",
+    "Polarisatsioon",
   },
   { "Source",
     "Quelle",
@@ -1185,6 +1243,7 @@ const tI18nPhrase Phrases[] = {
     "Origen",
     "��������",
     "Izvor",
+    "Allikas",
   },
   { "Srate",
     "Srate",
@@ -1204,6 +1263,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "����. ��������",
     "Srate", // hrv
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -1223,6 +1283,7 @@ const tI18nPhrase Phrases[] = {
     "PID V�deo",
     "Vpid (�����)",
     "Vpid",
+    "Vpid",
   },
   { "Ppid",
     "Ppid",
@@ -1242,6 +1303,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
+    "Ppid",
   },
   { "Apid1",
     "Apid1",
@@ -1261,6 +1323,7 @@ const tI18nPhrase Phrases[] = {
     "PID �udio (1)",
     "Apid1 (����� 1)",
     "Apid1", // hrv
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -1280,6 +1343,7 @@ const tI18nPhrase Phrases[] = {
     "PID �udio (2)",
     "Apid2 (����� 2)",
     "Apid2", // hrv
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -1299,6 +1363,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (1)",
     "Dpid1 (AC3 1)",
     "Dpid1", // hrv
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -1318,6 +1383,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (2)",
     "Dpid2 (AC3 2)",
     "Dpid2", // hrv
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -1337,6 +1403,7 @@ const tI18nPhrase Phrases[] = {
     "PID Teletext",
     "Tpid (���������)",
     "Tpid", // hrv
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -1356,6 +1423,7 @@ const tI18nPhrase Phrases[] = {
     "Acc�s Condicional",
     "CA (�������)",
     "Kodiranje (CA)",
+    "CA",
   },
   { "Sid",
     "Sid",
@@ -1375,6 +1443,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid", // hrv
+    "Sid",
   },
   { "Inversion",
     "Inversion",
@@ -1394,6 +1463,7 @@ const tI18nPhrase Phrases[] = {
     "Inversi�",
     "��������",
     "Inverzija",
+    "Inversioon",
   },
   { "Bandwidth",
     "Bandwidth",
@@ -1413,6 +1483,7 @@ const tI18nPhrase Phrases[] = {
     "Amplada de banda",
     "��������",
     "Bandwidth", // hrv "Pojasna �irina",
+    "Ribalaius",
   },
   { "CoderateH",
     "CoderateH",
@@ -1432,6 +1503,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH", // hrv
+    "CoderateH",
   },
   { "CoderateL",
     "CoderateL",
@@ -1451,6 +1523,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL", // hrv
+    "CoderateL",
   },
   { "Modulation",
     "Modulation",
@@ -1470,6 +1543,7 @@ const tI18nPhrase Phrases[] = {
     "Modulaci�",
     "���������",
     "Modulacija",
+    "Modulatsioon",
   },
   { "Transmission",
     "Transmission",
@@ -1489,6 +1563,7 @@ const tI18nPhrase Phrases[] = {
     "Transmissi�",
     "��������",
     "Prijenos",
+    "Transmissioon",
   },
   { "Guard",
     "Guard",
@@ -1508,6 +1583,7 @@ const tI18nPhrase Phrases[] = {
     "Protegir",
     "������",
     "Za�tita",
+    "Guard",
   },
   { "Hierarchy",
     "Hierarchy",
@@ -1527,6 +1603,7 @@ const tI18nPhrase Phrases[] = {
     "Jerarquia",
     "��������",
     "Hijerarhija",
+    "Hierarhia",
   },
   // Timer parameters:
   { "Active",
@@ -1547,6 +1624,7 @@ const tI18nPhrase Phrases[] = {
     "Actiu",
     "�����������",
     "Aktivan",
+    "Aktiivne",
   },
   { "Channel",
     "Kanal",
@@ -1566,6 +1644,7 @@ const tI18nPhrase Phrases[] = {
     "Canal",
     "�����",
     "Program",
+    "Kanal",
   },
   { "Day",
     "Tag",
@@ -1585,6 +1664,7 @@ const tI18nPhrase Phrases[] = {
     "Dia",
     "����",
     "Dan",
+    "P�ev",
   },
   { "Start",
     "Anfang",
@@ -1604,6 +1684,7 @@ const tI18nPhrase Phrases[] = {
     "Inici",
     "������",
     "Po�etak",
+    "Start",
   },
   { "Stop",
     "Ende",
@@ -1623,6 +1704,7 @@ const tI18nPhrase Phrases[] = {
     "Fi",
     "�����",
     "Kraj",
+    "Stopp",
   },
   { "VPS",
     "VPS",
@@ -1642,6 +1724,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "VPS ��������",
     "VPS", // hrv
+    "VPS",
   },
   { "Priority",
     "Priorit�t",
@@ -1661,6 +1744,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritat",
     "���������",
     "Prioritet",
+    "Prioriteet",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1680,6 +1764,7 @@ const tI18nPhrase Phrases[] = {
     "Durada",
     "���� ��������",
     "Trajanje",
+    "Eluiga",
   },
   { "File",
     "Datei",
@@ -1699,6 +1784,7 @@ const tI18nPhrase Phrases[] = {
     "Arxiu",
     "����",
     "Datoteka",
+    "Fail",
   },
   { "First day",
     "Erster Tag",
@@ -1718,6 +1804,7 @@ const tI18nPhrase Phrases[] = {
     "Primer dia",
     "������ ����",
     "Prvi dan",
+    "Esimene p�ev",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -1738,6 +1825,7 @@ const tI18nPhrase Phrases[] = {
     "Canal en �s per un temporitzador!",
     "����� ����� ��������!",
     "Program je trenutno zauzet terminom za snimanje",
+    "Kanal on taimeri kasutuses!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1757,6 +1845,7 @@ const tI18nPhrase Phrases[] = {
     "No puc canviar de canal!",
     "���������� ����������� �����!",
     "Ne mogu prebaciti program!",
+    "Kanali vahetus ei ole v�imalik!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1776,6 +1865,7 @@ const tI18nPhrase Phrases[] = {
     "El temporitzador est� gravant!",
     "���� ������ �� �������!",
     "Snimanje po definiranom terminu!",
+    "Taimeri salvestamine!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1795,6 +1885,7 @@ const tI18nPhrase Phrases[] = {
     "Error a l'accedir a la gravaci�!",
     "������ ������� � ������!",
     "Gre�ka pri pristupanju snimke!",
+    "Salvestuse taasesitus eba�nnestus!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1814,6 +1905,7 @@ const tI18nPhrase Phrases[] = {
     "Error a l'esborrar la gravaci�!",
     "������ �������� ������!",
     "Gre�ka pri brisanju snimke!",
+    "Salvestuse kustutamine eba�nnestus!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1833,6 +1925,7 @@ const tI18nPhrase Phrases[] = {
     "*** Canal incorrecte ***",
     "*** ������������ ����� ***",
     "*** Neispravan program ***",
+    "*** Vigane kanal ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1852,6 +1945,7 @@ const tI18nPhrase Phrases[] = {
     "No hi ha cap dispositiu DVB lliure per gravar!",
     "��� ���������� DVB-���������� ��� ������!",
     "Nema slobodnog DVB ure�aja za snimanje!",
+    "Puudub vaba DVB seade salvestamiseks!",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -1871,6 +1965,7 @@ const tI18nPhrase Phrases[] = {
     "Canal no disponible!",
     "����� ����������!",
     "Program nije dostupan!",
+    "Kanal ei ole k�ttesaadav!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -1890,6 +1985,7 @@ const tI18nPhrase Phrases[] = {
     "Propietats del canal duplicades!",
     "��������� ������ �� ���������!",
     "Parametri programa nisu jednozna�ni!",
+    "Kanaliseaded ei ole unikaalsed!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -1909,6 +2005,7 @@ const tI18nPhrase Phrases[] = {
     "Canal bloquejat (gravant)!",
     "����� ������������ (���� ������)!",
     "Program blokiran (snimanje)!",
+    "Kanal lukus (salvestamine aktiivne)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -1928,6 +2025,7 @@ const tI18nPhrase Phrases[] = {
     "No puc iniciar el mode de transfer�ncia!",
     "���������� �������� ����� ��������!", // ???
     "Ne mogu zapo�eti 'prijenosni' na�in!",
+    "Siirdemooduse start eba�nnestus!",
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
@@ -1947,6 +2045,7 @@ const tI18nPhrase Phrases[] = {
     "No hi ha marques d'edici� definides",
     "�� ������ ����� ��� �������!",
     "Nijedna prekidna to�ka nije postavljena!",
+    "Redigeerimise markerid puuduvad!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -1966,6 +2065,7 @@ const tI18nPhrase Phrases[] = {
     "No puc iniciar el proc�s d'edici�!",
     "���������� ������ ������ ������!",
     "Ne mogu zapo�eti ure�ivanje!",
+    "Redigeerimise start eba�nnestus!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -1985,6 +2085,7 @@ const tI18nPhrase Phrases[] = {
     "Proc�s d'edici� iniciat anteriorment!",
     "������� ������������ ��� �������!",
     "Ure�ivanje je ve� aktivirano!",
+    "Redigeerimine on juba aktiivne!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -2004,6 +2105,7 @@ const tI18nPhrase Phrases[] = {
     "No puc apagar, falta la opci� -s !",
     "���������� ���������� - �� ����� �������� '-s'!",
     "Ga�enje nemogu�e - nedostaje opcija '-s'!",
+    "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -2023,6 +2125,7 @@ const tI18nPhrase Phrases[] = {
     "Disc gaireb� ple!",
     "������������ ����� �� �����!",
     "Nedovoljno prostora na disku",
+    "K�vaketas peaaegu t�is!",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -2042,6 +2145,7 @@ const tI18nPhrase Phrases[] = {
     "No puc obrir el men� de la CAM!",
     "���� CAM-������ ����������!",
     "Ne mogu otvoriti CAM izbor!",
+    "Ei saa avada CAM men��d!",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -2061,6 +2165,7 @@ const tI18nPhrase Phrases[] = {
     "No puc reiniciar la CAM!",
     "������ ����������� CAM-������!",
     "Ne mogu resetirati CAM",
+    "CAM mooduli taask�ivitus eba�nnestus!",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
@@ -2080,6 +2185,7 @@ const tI18nPhrase Phrases[] = {
     "CAM reiniciada",
     "CAM-������ �����������!",
     "CAM je resetiran!",
+    "CAM mooduli taask�ivitus tehtud",
   },
   // Setup pages:
   { "OSD",
@@ -2100,6 +2206,7 @@ const tI18nPhrase Phrases[] = {
     "Informaci� en pantalla",
     "����",
     "OSD",
+    "Ekraanimen��",
   },
   { "EPG",
     "EPG",
@@ -2119,6 +2226,7 @@ const tI18nPhrase Phrases[] = {
     "Guia de Programes",
     "�������",
     "Pregled emisija (EPG)",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -2138,6 +2246,7 @@ const tI18nPhrase Phrases[] = {
     "Tarja DVB",
     "DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -2157,6 +2266,7 @@ const tI18nPhrase Phrases[] = {
     "Configuraci� de l'LNB",
     "���������",
     "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -2176,6 +2286,7 @@ const tI18nPhrase Phrases[] = {
     "CI Acc�s condicional",
     "�������� ������",
     "CICAM",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -2195,6 +2306,7 @@ const tI18nPhrase Phrases[] = {
     "Opcions de Gravaci�",
     "������",
     "Snimanje",
+    "Salvestamine",
   },
   { "Replay",
     "Wiedergabe",
@@ -2214,6 +2326,7 @@ const tI18nPhrase Phrases[] = {
     "Opcions de Reproducci�",
     "���������������",
     "Reprodukcija",
+    "Taasesitus",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -2233,6 +2346,7 @@ const tI18nPhrase Phrases[] = {
     "Miscel�l�nia",
     "������",
     "Ostalo",
+    "Muud s�tted",
   },
   { "Plugins",
     "Plugins",
@@ -2252,6 +2366,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "������ ����������",
     "Dodaci (Plugins)",
+    "Laiendusmoodulid",
   },
   { "Plugin",
     "Plugin",
@@ -2271,6 +2386,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "������",
     "Plugin",
+    "Laiendusmoodul",
   },
   { "Restart",
     "Neustart",
@@ -2290,6 +2406,7 @@ const tI18nPhrase Phrases[] = {
     "Reiniciar",
     "�������������",
     "Restart sistema",
+    "Restart",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -2310,6 +2427,7 @@ const tI18nPhrase Phrases[] = {
     "Idioma",
     "����",
     "Jezik",
+    "Keel",
   },
   { "Setup.OSD$Skin",
     "Oberfl�che",
@@ -2327,8 +2445,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�����",
     "Povr�ina",
+    "Kest",
   },
   { "Setup.OSD$Theme",
     "Thema",
@@ -2346,8 +2465,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������",
     "Tema",
+    "Teema",
   },
   { "Setup.OSD$Left",
     "Links",
@@ -2365,8 +2485,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ �����",
     "Lijevo",
+    "Vasakule",
   },
   { "Setup.OSD$Top",
     "Oben",
@@ -2384,8 +2505,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ������",
     "Gore",
+    "�lesse",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -2405,6 +2527,7 @@ const tI18nPhrase Phrases[] = {
     "Amplada",
     "������",
     "�irina",
+    "Laius",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -2424,6 +2547,7 @@ const tI18nPhrase Phrases[] = {
     "Al�ada",
     "������",
     "Visina",
+    "K�rgus",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -2443,6 +2567,7 @@ const tI18nPhrase Phrases[] = {
     "Durada dels missatges (s)",
     "������������ ������ ��������� (���)",
     "Vrijeme prikaza poruka (s)",
+    "Kanaliteate esitusaeg (s)",
   },
   { "Setup.OSD$Use small font",
     "Kleine Schrift benutzen",
@@ -2460,8 +2585,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������������ ������ �����",
     "Koristi mala slova",
+    "V�ikese fondi kasutamine",
   },
   { "never",
     "nie",
@@ -2479,8 +2605,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������",
     "nikada",
+    "mitte kunagi",
   },
   { "skin dependent",
     "je nach Oberfl�che",
@@ -2498,8 +2625,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������� ����",
     "ovisno o povr�ini",
+    "kestast s�ltuv",
   },
   { "always",
     "immer",
@@ -2517,8 +2645,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������",
     "uvijek",
+    "alati",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -2538,6 +2667,7 @@ const tI18nPhrase Phrases[] = {
     "Posici� de la informaci� del canal",
     "��������� ���� ���������� � ������",
     "Pozicija informacije o programu",
+    "Kanaliinfo asukoht",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -2557,6 +2687,7 @@ const tI18nPhrase Phrases[] = {
     "Informaci� del canvi de canal",
     "���������� ���������� � ������",
     "Informacije kod promjene kanala",
+    "N�ita kanaliteadet",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -2576,6 +2707,7 @@ const tI18nPhrase Phrases[] = {
     "Despla�ar p�gina sencera",
     "��������� ������� ����",
     "Listaj po stranicama",
+    "Lehek�lje kerimine",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -2595,6 +2727,7 @@ const tI18nPhrase Phrases[] = {
     "Ordenar gravacions programades",
     "���������� ��������",
     "Sortiraj termine",
+    "Taimeri sorteerimine",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -2614,6 +2747,7 @@ const tI18nPhrase Phrases[] = {
     "Gravacions en subcarpetes",
     "�������� �������� �������",
     "Imenik za snimke",
+    "Salvesta kausta nime",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -2633,6 +2767,7 @@ const tI18nPhrase Phrases[] = {
     "M�xim d'Hores a cercar per la Guia",
     "�������� ������������ �������� (�)",
     "Vrijeme do EPG pregleda (h)",
+    "EPG skaneerimise viide (h)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -2652,6 +2787,7 @@ const tI18nPhrase Phrases[] = {
     "Nivell de correcci� de la Guia",
     "������� ��������� ������",
     "Nivo popravka EPG gre�aka",
+    "EPG veaparanduse tase",
   },
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
@@ -2671,6 +2807,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������� ���������� ������ (���)",
     "Prika�i stare EPG podatke (min)",
+    "Vana EPG viide (min)",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2690,6 +2827,7 @@ const tI18nPhrase Phrases[] = {
     "Ajustar l'hora del sistema",
     "���������� ��������� �����",
     "Podesi vrijeme sistema",
+    "Kella s�nkroniseerimine",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -2709,6 +2847,7 @@ const tI18nPhrase Phrases[] = {
     "Usar el temps del m�ltiplex",
     "������������ ����� ������������",
     "Transponder za pode�avanje sata",
+    "Kella s�nkroniseerimise transponder",
   },
   { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
@@ -2728,6 +2867,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������������� �����",
     "Preferirani jezici",
+    "Eelistatuid keeli",
   },
   { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
@@ -2747,6 +2887,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "������",
     "Preferirani jezik",
+    "Eelistatud keel",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -2766,6 +2907,7 @@ const tI18nPhrase Phrases[] = {
     "Tarja DVB prim�ria",
     "�������� DVB-����������",
     "Primarni DVB ure�aj",
+    "Esmane DVB seade",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -2785,6 +2927,7 @@ const tI18nPhrase Phrases[] = {
     "Format del v�deo",
     "������ �����",
     "Video format",
+    "TV k�lgsuhe",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -2804,6 +2947,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "��������� ��������� �������",
     "Aktualiziraj programe",
+    "Kanalite uuendamine",
   },
   { "names only",
     "nur Namen",
@@ -2823,6 +2967,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "������ ��������",
     "samo imena",
+    "ainult nimed",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -2842,6 +2987,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������� � PID�",
     "imena i identifikatore (PIDs)",
+    "nimed ja PID-id",
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
@@ -2861,6 +3007,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "����� ������",
     "dodaj nove programe",
+    "lisa uued kanalid",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
@@ -2880,6 +3027,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "���. ������������",
     "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
+    "lisa uued transponderid",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -2899,6 +3047,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "������� ������������ (SLOF) (���)",
     "Frekv. preklopa SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -2918,6 +3067,7 @@ const tI18nPhrase Phrases[] = {
     "Freq��ncia LNB baixa (MHz)",
     "������ ������� ���������� (���)",
     "Donja LNB frekv. (MHz)",
+    "Alumine (LO) LNB sagedus (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -2937,6 +3087,7 @@ const tI18nPhrase Phrases[] = {
     "Freq��ncia LNB alta (MHz)",
     "������� ������� ���������� (���)",
     "Gornja LNB frekv. (MHz)",
+    "�lemine (HI) LNB sagedus (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -2956,6 +3107,7 @@ const tI18nPhrase Phrases[] = {
     "Utilitzar DiSEqC",
     "������������ DiSEqC",
     "Koristi DiSEqC",
+    "DiSEqC kasutamine",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -2975,6 +3127,7 @@ const tI18nPhrase Phrases[] = {
     "Acc�s condicional CICAM",
     "CAM-������ DVB",
     "CICAM DVB",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -2994,6 +3147,7 @@ const tI18nPhrase Phrases[] = {
     "Marge d'inici de gravaci� (min)",
     "���������� ������ ������ (���)",
     "Rezerva na po�etku snimanja (min)",
+    "Salvestamise algusvaru (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -3013,6 +3167,7 @@ const tI18nPhrase Phrases[] = {
     "Marge de fi de gravaci� (min)",
     "������������ ��������� ������ (���)",
     "Rezerva na kraju (min)",
+    "Salvestamise l�puvaru (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -3032,6 +3187,7 @@ const tI18nPhrase Phrases[] = {
     "L�mit primari",
     "���. ��������� ������� ���. ����������",
     "Standardno ograni�enje",
+    "Esmase seadme prioriteet",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -3051,6 +3207,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritat per defecte",
     "��������� ������� �� ���������",
     "Standardni prioritet",
+    "Vaikimisi prioriteet",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -3070,6 +3227,7 @@ const tI18nPhrase Phrases[] = {
     "Durada predefinida",
     "���� �������� ������ �� ��������� (�)",
     "Standardno trajanje (d)",
+    "Salvestuse eluiga (p�evi)",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
@@ -3089,6 +3247,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritat de la pausa",
     "��������� ����������� ���������",
     "Prioritet pauze",
+    "Pausi prioriteet",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
@@ -3108,6 +3267,7 @@ const tI18nPhrase Phrases[] = {
     "Durada de la pausa (d)",
     "�������� ����������� ��������� (�)",
     "Trajanje pauze (d)",
+    "Pausi eluiga (p�evi)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -3127,6 +3287,7 @@ const tI18nPhrase Phrases[] = {
     "Utilitzar el nom de l'episodi",
     "������������ ����� �� ��������",
     "Koristi ime epizode",
+    "Kasuta episoodi nime",
   },
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
@@ -3146,6 +3307,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "������������ ������� VPS",
     "Koristi VPS",
+    "Kasuta VPS-i",
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
@@ -3165,6 +3327,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������� ����� VPS (���)",
     "Vremenska rezerva kod VPS (s)",
+    "VPS-i algusvaru (s)",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -3184,6 +3347,7 @@ const tI18nPhrase Phrases[] = {
     "Marcar gravaci� instant�nia",
     "�������� ��������� ������� ������",
     "Ozna�i direktno snimanje",
+    "M�rgista otsesalvestusi",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -3203,6 +3367,7 @@ const tI18nPhrase Phrases[] = {
     "Anomenar gravacions instant�nies",
     "����� ���������� ������ �������",
     "Imenuj direktno snimanje",
+    "Otsesalvestuse nimi",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -3222,6 +3387,7 @@ const tI18nPhrase Phrases[] = {
     "Temps de gravaci� instant�nia (min)",
     "������������ ������ ������ (���)",
     "Trajanje direktnog snimanja (min)",
+    "Otsesalvestuse kestus (min)",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -3241,6 +3407,7 @@ const tI18nPhrase Phrases[] = {
     "Gravar el so en Dolby Digital",
     "���������� ���� Dolby Digital",
     "Snimi 'Dolby digital' ton",
+    "Dolby Digital salvestamine",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -3260,6 +3427,7 @@ const tI18nPhrase Phrases[] = {
     "Mida m�xima de l'arxiu (MB)",
     "����. ������ ���������� (��)",
     "Maksimalna veli�ina datoteke (MB)",
+    "Maksimaalne failisuurus (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -3279,6 +3447,7 @@ const tI18nPhrase Phrases[] = {
     "Separar arxius",
     "������ ����������������� �����",
     "Podijeli ure�ene datoteke",
+    "T�kelda redigeeritud faile",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -3298,6 +3467,7 @@ const tI18nPhrase Phrases[] = {
     "Mode de multivelocitat",
     "��������������� �����",
     "MultiSpeed na�in",
+    "Multi-kiiruse moodus",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -3317,6 +3487,7 @@ const tI18nPhrase Phrases[] = {
     "Mostrar mode de reproducci�",
     "���������� ����� ���������������", // ???
     "Prika�i na�in prikazivanja",
+    "Korduse moodus",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
@@ -3336,6 +3507,7 @@ const tI18nPhrase Phrases[] = {
     "ID de Continuar",
     "ID ���������������", // ???
     "ID nastavka",
+    "J�tkamise ID",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -3355,6 +3527,7 @@ const tI18nPhrase Phrases[] = {
     "Temps m�nim en pausa (min)",
     "���. ����� �������� ������� (���)",
     "Najmanje vrijeme pauze",
+    "Min. s�ndmuse kestus (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -3374,6 +3547,7 @@ const tI18nPhrase Phrases[] = {
     "Temps m�nim d'inactivitat (min)",
     "���. ����� �������� ����� (���)",
     "Najmanje vrijeme neaktivnosti (min)",
+    "Min. kasutaja tegevusetus (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -3393,6 +3567,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP Timeout (s)",
     "�������� ������ ����. SVDRP (���)",
     "SVDRP vrijeme neaktivnosti",
+    "SVDRP ooteaeg (s)",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
@@ -3412,6 +3587,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������� ������������ ������ (���)",
     "",// hrv TODO
+    "Kanalivahetuse ooteaeg (s)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -3432,6 +3608,7 @@ const tI18nPhrase Phrases[] = {
     "LMCJVSG",
     "���ǿ��",
     "PUS�PSN", // hrv
+    "ETKNRLP",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -3451,6 +3628,7 @@ const tI18nPhrase Phrases[] = {
     "Dl Dm Dc Dj Dv Ds Dg ",
     "��ݲ�������ҿ����Ѳ��",
     "PonUtoSri�etPetSubNed", // hrv
+    " E  T  K  N  R  L  P ",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -3471,6 +3649,7 @@ const tI18nPhrase Phrases[] = {
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
     " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~",
     " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~", // hrv
+    " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~",
   },
   // Learning keys:
   { "Learning Remote Control Keys (%s)",
@@ -3491,6 +3670,7 @@ const tI18nPhrase Phrases[] = {
     "Aprenent les tecles del comandament a dist�ncia (%s)",
     "���� ����� ������ ������ (%s)",
     "U�enje k�da daljinskog upravlja�a (%s)",
+    "Kaugjuhtimispuldi �petamine (%s)",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -3510,6 +3690,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 1: Detectant el tipus de receptor",
     "��� 1: ����������� ���� ���� ������",
     "Faza 1: detektiranje k�da daljinskog upravlja�a.",
+    "Aste 1: Koodeerimiss�steemi tuvastamine",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -3529,6 +3710,7 @@ const tI18nPhrase Phrases[] = {
     "Premeu qualsevol tecla del comandament",
     "������� ����� ������ �� ������",
     "Pritisnite tipku na daljinskom upravlja�u",
+    "Vajuta puldil suvalist klahvi",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -3548,6 +3730,7 @@ const tI18nPhrase Phrases[] = {
     "Codi detectat!",
     "��������� ��� ������!",
     "K�d daljinskog upravlja�a je prepoznat!",
+    "Koodeerimiss�steem tuvastatud!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -3567,6 +3750,7 @@ const tI18nPhrase Phrases[] = {
     "No premeu cap tecla...",
     "�� ��������� ������...",
     "Ne pritiskajte tipku...",
+    "�ra vajuta puldil �htki klahvi...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -3586,6 +3770,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 2: Aprenentantge de les funcions",
     "��� 2: ������� ����� ��������� ������",
     "Faza 2: U�enje posebnih k�dova",
+    "Aste 2: Klahvide �petamine",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -3605,6 +3790,7 @@ const tI18nPhrase Phrases[] = {
     "Premeu una tecla per '%s'",
     "������� ������ '%s'",
     "Pritisnite tipku za '%s'",
+    "Vajuta klahvile '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -3624,6 +3810,7 @@ const tI18nPhrase Phrases[] = {
     "Premeu 'Amunt' per confirmar",
     "������� '�����' ����� �����������",
     "Pritisnite 'Gore' za potvrdu",
+    "Kinnitamiseks vajuta '�les'",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -3643,6 +3830,7 @@ const tI18nPhrase Phrases[] = {
     "Premeu 'Avall' per continuar",
     "������� '����' ����� ����������",
     "Pritisnite 'Dolje' za nastavak",
+    "J�tkamiseks vajuta 'Alla'",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -3662,6 +3850,7 @@ const tI18nPhrase Phrases[] = {
     "(Premeu 'Amunt' per retornar)",
     "(������� '�����' ����� ���������)",
     "(pritisnite 'Gore' za nazad)",
+    "(tagasiminekuks vajuta '�les')",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -3681,6 +3870,7 @@ const tI18nPhrase Phrases[] = {
     "(Premeu 'Avall' per finalitzar l'aprenentatge)",
     "(������� '����' ����� ��������� ��������� ������)",
     "(pritisnite 'Dolje' za kraj)",
+    "(l�petamiseks vajuta 'Alla')",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -3700,6 +3890,7 @@ const tI18nPhrase Phrases[] = {
     "Premeu 'Men�' per obviar aquesta tecla",
     "(������� '����' ����� ���������� ������)",
     "pritisnite 'Izbor' da presko�ite ovu tipku",
+    "(selle klahvi vahelej�tmiseks vajuta 'Men��')",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -3719,6 +3910,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 3: Guardant els codis de les tecles",
     "��� 3: ����������� ����� ������",
     "Faza 3: Spremanje k�dova tipki",
+    "Aste 3: Klavhikoodide salvestamine",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -3738,6 +3930,7 @@ const tI18nPhrase Phrases[] = {
     "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
     "������� '�����' ����� ���������, '����' ����� ����������",
     "'Gore' za potvrdu, 'Dolje' za prekid",
+    "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'",
   },
   // Key names:
   { "Up",
@@ -3758,6 +3951,7 @@ const tI18nPhrase Phrases[] = {
     "Amunt",
     "�����",
     "Gore",
+    "�les",
   },
   { "Down",
     "Ab",
@@ -3777,6 +3971,7 @@ const tI18nPhrase Phrases[] = {
     "Avall",
     "����",
     "Dolje",
+    "Alla",
   },
   { "Menu",
     "Men�",
@@ -3796,6 +3991,7 @@ const tI18nPhrase Phrases[] = {
     "Men�",
     "����",
     "Izbor",
+    "Men��",
   },
   { "Ok",
     "Ok",
@@ -3815,6 +4011,7 @@ const tI18nPhrase Phrases[] = {
     "D'acord",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -3834,6 +4031,7 @@ const tI18nPhrase Phrases[] = {
     "Retornar",
     "�����",
     "Nazad",
+    "Tagasi",
   },
   { "Left",
     "Links",
@@ -3853,6 +4051,7 @@ const tI18nPhrase Phrases[] = {
     "Esquerra",
     "������",
     "Lijevo",
+    "Vasakule",
   },
   { "Right",
     "Rechts",
@@ -3872,6 +4071,7 @@ const tI18nPhrase Phrases[] = {
     "Dreta",
     "�������",
     "Desno",
+    "Paremale",
   },
   { "Red",
     "Rot",
@@ -3891,6 +4091,7 @@ const tI18nPhrase Phrases[] = {
     "Vermell",
     "�������",
     "Crveno",
+    "Punane",
   },
   { "Green",
     "Gr�n",
@@ -3910,6 +4111,7 @@ const tI18nPhrase Phrases[] = {
     "Verd",
     "�������",
     "Zeleno",
+    "Roheline",
   },
   { "Yellow",
     "Gelb",
@@ -3929,6 +4131,7 @@ const tI18nPhrase Phrases[] = {
     "Groc",
     "������",
     "�uto",
+    "Kollane",
   },
   { "Blue",
     "Blau",
@@ -3948,6 +4151,7 @@ const tI18nPhrase Phrases[] = {
     "Blau",
     "�����",
     "Plavo",
+    "Sinine",
   },
   { "Play",
     "Wiedergabe",
@@ -3967,6 +4171,7 @@ const tI18nPhrase Phrases[] = {
     "Reproduir",
     "���������������",
     "Start",
+    "Start",
   },
   { "Pause",
     "Pause",
@@ -3986,6 +4191,7 @@ const tI18nPhrase Phrases[] = {
     "Pausa",
     "�����",
     "Pauza",
+    "Paus",
   },
   { "Stop",
     "Stop",
@@ -4005,6 +4211,7 @@ const tI18nPhrase Phrases[] = {
     "Aturar",
     "����",
     "Stop",
+    "Stopp",
   },
   { "Record",
     "Aufnehmen",
@@ -4024,6 +4231,7 @@ const tI18nPhrase Phrases[] = {
     "Gravar",
     "������",
     "Snimaj",
+    "Salvestamine",
   },
   { "FastFwd",
     "Vorlauf",
@@ -4043,6 +4251,7 @@ const tI18nPhrase Phrases[] = {
     "Endavant r�pidament",
     "������",
     "Naprijed",
+    "Edasikerimine",
   },
   { "FastRew",
     "R�cklauf",
@@ -4062,6 +4271,7 @@ const tI18nPhrase Phrases[] = {
     "Enrera r�pidament",
     "�����",
     "Nazad",
+    "Tagasikerimine",
   },
   { "Power",
     "Ausschalten",
@@ -4081,6 +4291,7 @@ const tI18nPhrase Phrases[] = {
     "Aturar",
     "���������",
     "Isklju�i",
+    "Toide",
   },
   { "Channel+",
     "Kanal+",
@@ -4100,6 +4311,7 @@ const tI18nPhrase Phrases[] = {
     "Canal +",
     "����� +",
     "Program +",
+    "Kanal+",
   },
   { "Channel-",
     "Kanal-",
@@ -4119,6 +4331,7 @@ const tI18nPhrase Phrases[] = {
     "Canal -",
     "����� -",
     "Program -",
+    "Kanal-",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -4138,6 +4351,7 @@ const tI18nPhrase Phrases[] = {
     "Volum +",
     "��������� +",
     "Glasnije", // hrv "Glasnocca +"
+    "Helitugevus+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -4157,6 +4371,7 @@ const tI18nPhrase Phrases[] = {
     "Volum -",
     "��������� -",
     "Ti�e", // hrv Glasnocca -"
+    "Helitugevus-",
   },
   { "Mute",
     "Stumm",
@@ -4176,6 +4391,7 @@ const tI18nPhrase Phrases[] = {
     "En silenci",
     "��������� ����",
     "Bez zvuka",
+    "H��letu",
   },
   // Miscellaneous:
   { "yes",
@@ -4196,6 +4412,7 @@ const tI18nPhrase Phrases[] = {
     "s�",
     "��",
     "da",
+    "jah",
   },
   { "no",
     "nein",
@@ -4215,6 +4432,7 @@ const tI18nPhrase Phrases[] = {
     "no",
     "���",
     "ne",
+    "ei",
   },
   { "off",
     "aus",
@@ -4234,6 +4452,7 @@ const tI18nPhrase Phrases[] = {
     "off",
     "����",
     "ugasi",
+    "v�lja",
   },
   { "none",
     "keine",
@@ -4253,6 +4472,7 @@ const tI18nPhrase Phrases[] = {
     "cap",
     "������",
     "nijedan",
+    "t�hi",
   },
   { "auto",
     "auto",
@@ -4272,6 +4492,7 @@ const tI18nPhrase Phrases[] = {
     "auto",
     "����",
     "automatski",
+    "automaatne",
   },
   { "top",
     "oben",
@@ -4291,6 +4512,7 @@ const tI18nPhrase Phrases[] = {
     "a dalt",
     "������",
     "gore",
+    "�leval",
   },
   { "bottom",
     "unten",
@@ -4310,6 +4532,7 @@ const tI18nPhrase Phrases[] = {
     "a baix",
     "�����",
     "dolje",
+    "all",
   },
   { "Disk",
     "Disk",
@@ -4329,6 +4552,7 @@ const tI18nPhrase Phrases[] = {
     "Disc",
     "����",
     "Disk",
+    "Ketas",
   },
   { "free",
     "frei",
@@ -4348,6 +4572,7 @@ const tI18nPhrase Phrases[] = {
     "lliure",
     "��������",
     "slobodno",
+    "vaba",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -4367,6 +4592,7 @@ const tI18nPhrase Phrases[] = {
     "Salta a:",
     "�������: ",
     "Sko�i: ",
+    "H�pe: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -4386,6 +4612,7 @@ const tI18nPhrase Phrases[] = {
     "Volum ",
     "��������� ",
     "Glasno�a ",
+    "Helitugevus ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -4405,6 +4632,7 @@ const tI18nPhrase Phrases[] = {
     " Aturar la reproducci�",
     " ���������� ���������������",
     " Prekini reprodukciju",
+    " L�peta kordus",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -4424,6 +4652,7 @@ const tI18nPhrase Phrases[] = {
     " Aturar la gravaci� ",
     " ���������� ������ ",
     " Prekini snimanje ",
+    " L�peta salvestamine ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -4443,6 +4672,7 @@ const tI18nPhrase Phrases[] = {
     " Cancel�lar l'edici� ",
     " �������� ������ ������",
     " Prekini ure�ivanje",
+    " Katkesta monteerimine",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -4462,6 +4692,7 @@ const tI18nPhrase Phrases[] = {
     "Canviant a la interf�cie DVB prim�ria...",
     "����� ��������� DVB-����������...",
     "Preklapanje primarnog DVB ure�aja...",
+    "Esmase DVB seadme �mberl�litus...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -4481,6 +4712,7 @@ const tI18nPhrase Phrases[] = {
     "Amunt/Avall per una nova localitzaci� - OK per moure",
     "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\"",
     "Gore/Dolje na novu poziciju - zatim OK",
+    "'�les/Alla' uus asukoht - 'OK' kinnitus",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -4500,6 +4732,7 @@ const tI18nPhrase Phrases[] = {
     "Proc�s d'edici� iniciat",
     "����� ������ ������",
     "Rezanje je zapo�eto",
+    "Redigeerimine algas",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -4519,6 +4752,7 @@ const tI18nPhrase Phrases[] = {
     "Proc�s d'edici� finalitzat",
     "������ �������",
     "Rezanje zavr�eno",
+    "Redigeerimine on l�petatud",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -4538,6 +4772,7 @@ const tI18nPhrase Phrases[] = {
     "Proc�s d'edici� fallit!",
     "������ �� ����� ������� ������!",
     "Rezanje neuspje�no!",
+    "Redigeerimine eba�nnestus",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -4557,6 +4792,7 @@ const tI18nPhrase Phrases[] = {
     "cercant gravacions...",
     "������������ �������...",
     "pretra�ivanje snimljenog...",
+    "salvestuste skaneerimine...",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -4576,6 +4812,7 @@ const tI18nPhrase Phrases[] = {
     "Pausa d'emissi� en directe...",
     "����� ����������� ���������...",
     "Zaustavljanje �ivog signala...",
+    "Saate edastamise peatamine...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -4595,6 +4832,7 @@ const tI18nPhrase Phrases[] = {
     "Aquest plugin no admet configuraci�!",
     "������ �� ����� ���������� ���������!",
     "Ovaj dodatak (Plugin) nema parametara!",
+    "Sellel laienudusmoodulil ei ole seadeid!",
   },
   { "Classic VDR",
     "Klassischer VDR",
@@ -4612,8 +4850,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������������",
     "Klasi�cni VDR",
+    "Klassikaline VDR",
   },
   { "ST:TNG Panels",
     "ST:TNG Konsolen",
@@ -4631,8 +4870,9 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ST:TNG ������",
     "ST:TNG Konzole",
+    "ST:TNG konsool",
   },
   { NULL }
   };
diff --git a/i18n.h b/i18n.h
index 839ac6ed5..b28511a8b 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.12 2004/05/16 10:52:40 kls Exp $
+ * $Id: i18n.h 1.13 2004/10/16 11:50:41 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 18;
+const int I18nNumLanguages = 19;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/libsi/Makefile b/libsi/Makefile
index 613fbeee8..2d8713b3e 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 1.2 2003/12/13 10:41:39 kls Exp $
+# $Id: Makefile 1.3 2004/10/16 13:31:50 kls Exp $
 
 ### The C++ compiler and options:
 
@@ -30,7 +30,7 @@ OBJS = util.o si.o section.o descriptor.o
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index eb921c95f..207b7c25b 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.13 2004/06/06 14:47:30 kls Exp $
+ *   $Id: descriptor.c 1.14 2004/10/16 09:51:05 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -110,9 +110,7 @@ char *ExtendedEventDescriptors::getText(char *buffer, int size, const char *sepa
          continue;
 
       ExtendedEventDescriptor::Item item;
-      for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
-         item=d->itemLoop.getNext(it);
-
+      for (Loop::Iterator it; d->itemLoop.getNext(item, it);   ) {
          if (!separated && size > sepLen2) {
             strcpy(buffer+index, separation2); // let's have a separator between the long text and the items
             index += sepLen2;
@@ -207,9 +205,7 @@ char *ExtendedEventDescriptors::getTextItemized(char *buffer, int size, const ch
          continue;
 
       ExtendedEventDescriptor::Item item;
-      for (Loop::Iterator it; d->itemLoop.hasNext(it);   ) {
-         item=d->itemLoop.getNext(it);
-
+      for (Loop::Iterator it; d->itemLoop.getNext(item, it);   ) {
          item.itemDescription.getText(buffer+index, size);
          len = strlen(buffer+index);
          index += len;
@@ -251,9 +247,7 @@ bool ExtendedEventDescriptors::getTextItemized(Loop::Iterator &it, bool &valid,
          continue;
 
       ExtendedEventDescriptor::Item item;
-      if (d->itemLoop.hasNext(it)) {
-         item=d->itemLoop.getNext(it);
-
+      if (d->itemLoop.getNext(item, it)) {
          item.item.getText(itemDescription, sizeItemDescription);
          item.itemDescription.getText(itemText, sizeItemText);
          valid=true;
diff --git a/libsi/si.c b/libsi/si.c
index 40f94539c..ba97c6e92 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.11 2004/06/06 14:43:56 kls Exp $
+ *   $Id: si.c 1.13 2004/10/16 15:12:57 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -30,6 +30,10 @@ void Object::setData(CharArray &d) {
    data=d;
 }
 
+bool Object::checkSize(unsigned int offset) {
+   return data.checkSize(offset);
+}
+
 Section::Section(const unsigned char *data, bool doCopy) {
    setData(data, getLength(data), doCopy);
 }
@@ -50,15 +54,15 @@ int Section::getLength(const unsigned char *d) {
    return HILO(((const SectionHeader *)d)->section_length)+sizeof(SectionHeader);
 }
 
-bool CRCSection::isValid() {
+bool CRCSection::isCRCValid() {
    return CRC32::isValid((const char *)data.getData(), getLength()/*, data.FourBytes(getLength()-4)*/);
 }
 
 bool CRCSection::CheckCRCAndParse() {
-   if (!isValid())
+   if (!isCRCValid())
       return false;
    CheckParse();
-   return true;
+   return isValid();
 }
 
 int NumberedSection::getTableIdExtension() const {
@@ -102,7 +106,7 @@ DescriptorTag Descriptor::getDescriptorTag(const unsigned char *d) {
 }
 
 Descriptor *DescriptorLoop::getNext(Iterator &it) {
-   if (it.i<getLength()) {
+   if (isValid() && it.i<getLength()) {
       return createDescriptor(it.i, true);
    }
    return 0;
@@ -110,7 +114,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it) {
 
 Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool returnUnimplemetedDescriptor) {
    Descriptor *d=0;
-   if (it.i<getLength()) {
+   if (isValid() && it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
       const unsigned char *end=p+getLength()-it.i;
       while (p < end) {
@@ -128,7 +132,7 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool return
 
 Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplementedDescriptor) {
    Descriptor *d=0;
-   if (it.i<getLength()) {
+   if (isValid() && it.i<getLength()) {
       const unsigned char *p=data.getData(it.i);
       const unsigned char *end=p+getLength()-it.i;
       while (p < end) {
@@ -147,6 +151,8 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int array
 }
 
 Descriptor *DescriptorLoop::createDescriptor(int &i, bool returnUnimplemetedDescriptor) {
+   if (!checkSize(Descriptor::getLength(data.getData(i))))
+      return 0;
    Descriptor *d=Descriptor::getDescriptor(data+i, domain, returnUnimplemetedDescriptor);
    if (!d)
       return 0;
@@ -245,6 +251,9 @@ void String::decodeText(char *buffer, int size) {
    }
    */
 
+   if (*from == 0x10)
+      from += 3; // skips code table info
+
    for (int i = 0; i < getLength(); i++) {
       if (*from == 0)
          break;
@@ -269,6 +278,9 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
    char *toShort=shortVersion;
    int IsShortName=0;
 
+   if (*from == 0x10)
+      from += 3; // skips code table info
+
    for (int i = 0; i < getLength(); i++) {
       if (*from == 0)
          break;
diff --git a/libsi/si.h b/libsi/si.h
index 85d16ed4a..8f89c3432 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.10 2004/06/06 13:35:21 kls Exp $
+ *   $Id: si.h 1.11 2004/10/16 09:58:10 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -180,12 +180,17 @@ class Object : public Parsable {
    //can only be called once since data is immutable
    void setData(const unsigned char*data, unsigned int size, bool doCopy=true);
    CharArray getData() { return data; }
+   //returns the valid flag which indicates if data is all right or errors have been encountered
+   bool isValid() { return data.isValid(); }
    virtual int getLength() = 0;
 protected:
    CharArray data;
    //is protected - not used for sections
    template <class T> friend class StructureLoop;
    void setData(CharArray &d);
+   //returns whether the given offset fits within the limits of the actual data
+   //The valid flag will be set accordingly
+   bool checkSize(unsigned int offset);
 };
 
 class Section : public Object {
@@ -205,7 +210,7 @@ class CRCSection : public Section {
    //convenience: sets data and parses if doParse
    CRCSection(const unsigned char *data, bool doCopy=true) : Section(data, doCopy) {}
    CRCSection() {}
-   bool isValid();
+   bool isCRCValid();
    //convenience: isValid+CheckParse
    bool CheckCRCAndParse();
 };
@@ -229,9 +234,9 @@ class NumberedSection : public CRCSection {
 class VariableLengthPart : public Object {
 public:
    //never forget to call this
-   void setData(CharArray d, int l) { Object::setData(d); length=l; }
+   void setData(CharArray d, int l) { Object::setData(d); checkSize(l); length=l; }
    //convenience method
-   void setDataAndOffset(CharArray d, int l, unsigned int &offset) { Object::setData(d); length=l; offset+=l; }
+   void setDataAndOffset(CharArray d, int l, unsigned int &offset) { Object::setData(d); checkSize(l); length=l; offset+=l; }
    virtual int getLength() { return length; }
 private:
    int length;
@@ -281,29 +286,36 @@ template <class T> class StructureLoop : public Loop {
 public:
    //currently you must use a while-loop testing for hasNext()
    //i must be 0 to get the first descriptor (with the first call)
-   T getNext(Iterator &it)
+   bool getNext(T &obj, Iterator &it)
       {
+         if (!isValid() || it.i >= getLength())
+            return false;
          CharArray d=data;
          d.addOffset(it.i);
          T ret;
          ret.setData(d);
          ret.CheckParse();
+         if (!checkSize(ret.getLength()))
+            return false;
          it.i+=ret.getLength();
-         return ret;
+         obj=ret;
+         return true;
       }
    T* getNextAsPointer(Iterator &it)
       {
-         if (getLength() <= it.i)
+         if (!isValid() || it.i >= getLength())
             return 0;
          CharArray d=data;
          d.addOffset(it.i);
          T *ret=new T();
          ret->setData(d);
          ret->CheckParse();
+         if (!checkSize(ret->getLength()))
+            return 0;
          it.i+=ret->getLength();
          return ret;
       }
-   bool hasNext(Iterator &it) { return getLength() > it.i; }
+   //bool hasNext(Iterator &it) { return getLength() > it.i; }
 };
 
 //contains descriptors of different types
@@ -385,7 +397,7 @@ template <typename T> class TypeLoop : public Loop {
          it.i+=sizeof(T);
          return ret;
       }
-   bool hasNext(Iterator &it) { return getLength() > it.i; }
+   bool hasNext(Iterator &it) { return isValid() && (getLength() > it.i); }
 };
 
 class MHP_DescriptorLoop : public DescriptorLoop {
diff --git a/libsi/util.c b/libsi/util.c
index a2a6f0d21..c6ad234ad 100644
--- a/libsi/util.c
+++ b/libsi/util.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.c 1.3 2003/12/22 14:03:03 kls Exp $
+ *   $Id: util.c 1.4 2004/10/16 09:58:41 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -88,9 +88,7 @@ CharArray CharArray::operator+(const unsigned int offset) const {
    return f;
 }
 
-CharArray::Data::Data() : count_(1) {
-   size=0;
-   data=0;
+CharArray::Data::Data() : data(0), size(0), count_(1), valid(true) {
    /*
    lockingPid = 0;
    locked = 0;
diff --git a/libsi/util.h b/libsi/util.h
index db0192386..db2a0a179 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 1.3 2003/12/22 14:07:41 kls Exp $
+ *   $Id: util.h 1.4 2004/10/16 09:59:48 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -58,6 +58,9 @@ class CharArray {
    u_int16_t TwoBytes(const unsigned int index) const { return data_->data ? data_->TwoBytes(off+index) : 0; }
    u_int32_t FourBytes(const unsigned int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
 
+   bool isValid() const { return data_->valid; }
+   bool checkSize(unsigned int offset) { return (data_->valid && (data_->valid=(off+offset < data_->size))); }
+
    void addOffset(unsigned int offset) { off+=offset; }
 private:
    class Data {
@@ -86,10 +89,12 @@ class CharArray {
       const unsigned char*data;
       unsigned int size;
 
-      unsigned count_;
       // count_ is the number of CharArray objects that point at this
       // count_ must be initialized to 1 by all constructors
       // (it starts as 1 since it is pointed to by the CharArray object that created it)
+      unsigned count_;
+
+      bool valid;
 
       /*
       pthread_mutex_t mutex;
diff --git a/menu.c b/menu.c
index 95d725365..e3fe69a84 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.309 2004/06/13 20:26:51 kls Exp $
+ * $Id: menu.c 1.314 2004/10/17 10:28:27 kls Exp $
  */
 
 #include "menu.h"
@@ -308,7 +308,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
               isyslog("added channel %d %s", channel->Number(), data.ToText());
               state = osUser1;
               }
-           Channels.SetModified();
+           Channels.SetModified(true);
            }
         else {
            Skins.Message(mtError, tr("Channel settings are not unique!"));
@@ -396,7 +396,7 @@ void cMenuChannels::Propagate(void)
   for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
       ci->Set();
   Display();
-  Channels.SetModified();
+  Channels.SetModified(true);
 }
 
 eOSState cMenuChannels::Switch(void)
@@ -514,7 +514,7 @@ cMenuText::~cMenuText()
 void cMenuText::SetText(const char *Text)
 {
   free(text);
-  text = strdup(Text);
+  text = Text ? strdup(Text) : NULL;
 }
 
 void cMenuText::Display(void)
@@ -2628,8 +2628,11 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     //TODO
     //XXX case kGreen:  return osEventNow;
     //XXX case kYellow: return osEventNext;
-    case kOk:     if (group >= 0)
-                     Channels.SwitchTo(Channels.Get(Channels.GetNextNormal(group))->Number());
+    case kOk:     if (group >= 0) {
+                     cChannel *channel = Channels.Get(Channels.GetNextNormal(group));
+                     if (channel)
+                        Channels.SwitchTo(channel->Number());
+                     }
                   return osEnd;
     default:      if ((Key & (k_Repeat | k_Release)) == 0) {
                      cRemote::Put(Key);
@@ -3073,12 +3076,13 @@ void cReplayControl::Hide(void)
      modeOnly = false;
      lastPlay = lastForward = false;
      lastSpeed = -1;
+     timeSearchActive = false;
      }
 }
 
 void cReplayControl::ShowMode(void)
 {
-  if (visible || Setup.ShowReplayMode) {
+  if (visible || Setup.ShowReplayMode && !cOsd::IsOpen()) {
      bool Play, Forward;
      int Speed;
      if (GetReplayMode(Play, Forward, Speed) && (!visible || Play != lastPlay || Forward != lastForward || Speed != lastSpeed)) {
diff --git a/newplugin b/newplugin
index 8adae35f1..07d3f685d 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.16 2003/12/21 15:45:18 kls Exp $
+# $Id: newplugin 1.17 2004/10/16 12:12:43 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -110,7 +110,7 @@ OBJS = \$(PLUGIN).o
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = \$(CXX) -MM -MG
 DEPFILE = .dependencies
 \$(DEPFILE): Makefile
 	\@\$(MAKEDEP) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@
diff --git a/nit.c b/nit.c
index c515c240a..73b1df247 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.8 2004/06/06 14:24:49 kls Exp $
+ * $Id: nit.c 1.10 2004/10/17 12:00:54 kls Exp $
  */
 
 #include "nit.h"
@@ -92,8 +92,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      return;
   if (!Channels.Lock(true, 10))
      return;
-  for (SI::Loop::Iterator it; nit.transportStreamLoop.hasNext(it); ) {
-      SI::NIT::TransportStream ts = nit.transportStreamLoop.getNext(it);
+  SI::NIT::TransportStream ts;
+  for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
       SI::Descriptor *d;
       for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
@@ -123,8 +123,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                      }
                  if (!found && Setup.UpdateChannels >= 4) {
                     cChannel *Channel = new cChannel;
-                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0, false);
-                    if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, false))
+                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                    if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate))
                        EITScanner.AddTransponder(Channel);
                     else
                        delete Channel;
@@ -158,8 +158,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                      }
                  if (!found && Setup.UpdateChannels >= 4) {
                     cChannel *Channel = new cChannel;
-                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0, false);
-                    if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate, false))
+                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                    if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate))
                        EITScanner.AddTransponder(Channel);
                     else
                        delete Channel;
@@ -200,8 +200,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                      }
                  if (!found && Setup.UpdateChannels >= 4) {
                     cChannel *Channel = new cChannel;
-                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0, false);
-                    if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, false))
+                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                    if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
                        EITScanner.AddTransponder(Channel);
                     else
                        delete Channel;
diff --git a/osd.c b/osd.c
index 2877c280c..23a997f16 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.57 2004/07/18 09:23:03 kls Exp $
+ * $Id: osd.c 1.58 2004/10/16 10:31:34 kls Exp $
  */
 
 #include "osd.h"
@@ -716,13 +716,12 @@ cOsdProvider::~cOsdProvider()
 
 cOsd *cOsdProvider::NewOsd(int Left, int Top)
 {
-  if (cOsd::IsOpen()) {
-     esyslog("ERROR: attempt to open OSD while it is already open!");
-     return NULL;
-     }
-  if (osdProvider)
+  if (cOsd::IsOpen())
+     esyslog("ERROR: attempt to open OSD while it is already open - using dummy OSD!");
+  else if (osdProvider)
      return osdProvider->CreateOsd(Left, Top);
-  esyslog("ERROR: no OSD provider available - using dummy OSD!");
+  else
+     esyslog("ERROR: no OSD provider available - using dummy OSD!");
   return new cOsd(Left, Top); // create a dummy cOsd, so that access won't result in a segfault
 }
 
diff --git a/osd.h b/osd.h
index 172c47576..bd69084f7 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.46 2004/06/12 13:14:48 kls Exp $
+ * $Id: osd.h 1.47 2004/10/16 10:33:44 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -330,7 +330,9 @@ class cOsdProvider {
   static cOsd *NewOsd(int Left, int Top);
       ///< Returns a pointer to a newly created cOsd object, which will be located
       ///< at the given coordinates. When the cOsd object is no longer needed, the
-      ///< caller must delete it.
+      ///< caller must delete it. If the OSD is already in use, or there is no OSD
+      ///< provider, a dummy OSD is returned so that the caller may always use the
+      ///< returned pointer without having to check it every time it is accessed.
   static void Shutdown(void);
       ///< Shuts down the OSD provider facility by deleting the current OSD provider.
   };
diff --git a/pat.c b/pat.c
index 260f67d31..a0124f7b1 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.9 2004/05/23 09:29:04 kls Exp $
+ * $Id: pat.c 1.10 2004/10/16 10:01:12 kls Exp $
  */
 
 #include "pat.h"
@@ -285,8 +285,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               return;
            SI::PAT::Association assoc;
            int Index = 0;
-           for (SI::Loop::Iterator it; pat.associationLoop.hasNext(it); ) {
-               assoc = pat.associationLoop.getNext(it);
+           for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
                if (!assoc.isNITPid()) {
                   if (Index++ == pmtIndex) {
                      pmtPid = assoc.getPid();
@@ -332,8 +331,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
-        for (SI::Loop::Iterator it; pmt.streamLoop.hasNext(it); ) {
-            stream = pmt.streamLoop.getNext(it);
+        for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
diff --git a/recorder.c b/recorder.c
index 4270fbed7..3508b0ae5 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.10 2004/03/20 10:33:21 kls Exp $
+ * $Id: recorder.c 1.11 2004/10/16 09:23:01 kls Exp $
  */
 
 #include <stdarg.h>
@@ -12,9 +12,7 @@
 #include <unistd.h>
 #include "recorder.h"
 
-// The size of the array used to buffer video data:
-// (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE  MEGABYTE(5)
+#define RECORDERBUFSIZE  MEGABYTE(5)
 
 // The maximum time we wait before assuming that a recorded video data stream
 // is broken:
@@ -23,25 +21,35 @@
 #define MINFREEDISKSPACE    (512) // MB
 #define DISKCHECKINTERVAL   100 // seconds
 
-cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cReceiver(Ca, Priority, Setup.RecordDolbyDigital ? 5 : 3, VPid, APid1, APid2, DPid1, DPid2)
-,cThread("recording")
+class cFileWriter : public cThread {
+private:
+  cRemux *remux;
+  cFileName *fileName;
+  cIndexFile *index;
+  uchar pictureType;
+  int fileSize;
+  int recordFile;
+  bool active;
+  time_t lastDiskSpaceCheck;
+  bool RunningLowOnDiskSpace(void);
+  bool NextFile(void);
+protected:
+  virtual void Action(void);
+public:
+  cFileWriter(const char *FileName, cRemux *Remux);
+  virtual ~cFileWriter();
+  };
+
+cFileWriter::cFileWriter(const char *FileName, cRemux *Remux)
+:cThread("file writer")
 {
-  ringBuffer = NULL;
-  remux = NULL;
+  active = false;
   fileName = NULL;
+  remux = Remux;
   index = NULL;
   pictureType = NO_PICTURE;
   fileSize = 0;
-  active = false;
   lastDiskSpaceCheck = time(NULL);
-
-  // Make sure the disk is up and running:
-
-  SpinUpDisk(FileName);
-
-  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, TS_SIZE * 2, true);
-  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2, true);
   fileName = new cFileName(FileName, true);
   recordFile = fileName->Open();
   if (recordFile < 0)
@@ -53,28 +61,15 @@ cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int A
      // let's continue without index, so we'll at least have the recording
 }
 
-cRecorder::~cRecorder()
+cFileWriter::~cFileWriter()
 {
-  Detach();
+  active = false;
+  Cancel(3);
   delete index;
   delete fileName;
-  delete remux;
-  delete ringBuffer;
 }
 
-void cRecorder::Activate(bool On)
-{
-  if (On) {
-     if (recordFile >= 0)
-        Start();
-     }
-  else if (active) {
-     active = false;
-     Cancel(3);
-     }
-}
-
-bool cRecorder::RunningLowOnDiskSpace(void)
+bool cFileWriter::RunningLowOnDiskSpace(void)
 {
   if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
      int Free = FreeDiskSpaceMB(fileName->Name());
@@ -87,7 +82,7 @@ bool cRecorder::RunningLowOnDiskSpace(void)
   return false;
 }
 
-bool cRecorder::NextFile(void)
+bool cFileWriter::NextFile(void)
 {
   if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
      if (fileSize > MEGABYTE(Setup.MaxVideoFileSize) || RunningLowOnDiskSpace()) {
@@ -98,40 +93,29 @@ bool cRecorder::NextFile(void)
   return recordFile >= 0;
 }
 
-void cRecorder::Receive(uchar *Data, int Length)
-{
-  int p = ringBuffer->Put(Data, Length);
-  if (p != Length && active)
-     ringBuffer->ReportOverflow(Length - p);
-}
-
-void cRecorder::Action(void)
+void cFileWriter::Action(void)
 {
   time_t t = time(NULL);
   active = true;
   while (active) {
-        int r;
-        const uchar *b = ringBuffer->Get(r);
-        if (b) {
-           int Count = r, Result;
-           uchar *p = remux->Process(b, Count, Result, &pictureType);
-           ringBuffer->Del(Count);
-           if (p) {
-              //XXX+ active??? see old version (Busy)
-              if (!active && pictureType == I_FRAME) // finish the recording before the next 'I' frame
+        int Count;
+        uchar *p = remux->Get(Count, &pictureType);
+        if (p) {
+           //XXX+ active??? see old version (Busy)
+           if (!active && pictureType == I_FRAME) // finish the recording before the next 'I' frame
+              break;
+           if (NextFile()) {
+              if (index && pictureType != NO_PICTURE)
+                 index->Write(pictureType, fileName->Number(), fileSize);
+              if (safe_write(recordFile, p, Count) < 0) {
+                 LOG_ERROR_STR(fileName->Name());
                  break;
-              if (NextFile()) {
-                 if (index && pictureType != NO_PICTURE)
-                    index->Write(pictureType, fileName->Number(), fileSize);
-                 if (safe_write(recordFile, p, Result) < 0) {
-                    LOG_ERROR_STR(fileName->Name());
-                    break;
-                    }
-                 fileSize += Result;
                  }
-              else
-                 break;
+              fileSize += Count;
+              remux->Del(Count);
               }
+           else
+              break;
            t = time(NULL);
            }
         else if (time(NULL) - t > MAXBROKENTIMEOUT) {
@@ -139,7 +123,65 @@ void cRecorder::Action(void)
            cThread::EmergencyExit(true);
            t = time(NULL);
            }
-        else
-           usleep(1); // this keeps the CPU load low
+        }
+  active = false;
+}
+
+cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
+:cReceiver(Ca, Priority, Setup.RecordDolbyDigital ? 5 : 3, VPid, APid1, APid2, DPid1, DPid2)
+,cThread("recording")
+{
+  active = false;
+
+  // Make sure the disk is up and running:
+
+  SpinUpDisk(FileName);
+
+  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
+  ringBuffer->SetTimeouts(0, 100);
+  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2, true);
+  writer = new cFileWriter(FileName, remux);
+}
+
+cRecorder::~cRecorder()
+{
+  Detach();
+  delete writer;
+  delete remux;
+  delete ringBuffer;
+}
+
+void cRecorder::Activate(bool On)
+{
+  if (On) {
+     writer->Start();
+     Start();
+     }
+  else if (active) {
+     active = false;
+     Cancel(3);
+     }
+}
+
+void cRecorder::Receive(uchar *Data, int Length)
+{
+  if (active) {
+     int p = ringBuffer->Put(Data, Length);
+     if (p != Length && active)
+        ringBuffer->ReportOverflow(Length - p);
+     }
+}
+
+void cRecorder::Action(void)
+{
+  active = true;
+  while (active) {
+        int r;
+        uchar *b = ringBuffer->Get(r);
+        if (b) {
+           int Count = remux->Put(b, r);
+           if (Count)
+              ringBuffer->Del(Count);
+           }
         }
 }
diff --git a/recorder.h b/recorder.h
index e19148a6b..2a0875dd6 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 1.1 2002/06/08 09:35:03 kls Exp $
+ * $Id: recorder.h 1.2 2004/10/10 11:22:38 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -16,19 +16,14 @@
 #include "ringbuffer.h"
 #include "thread.h"
 
+class cFileWriter;
+
 class cRecorder : public cReceiver, cThread {
 private:
   cRingBufferLinear *ringBuffer;
   cRemux *remux;
-  cFileName *fileName;
-  cIndexFile *index;
-  uchar pictureType;
-  int fileSize;
-  int recordFile;
+  cFileWriter *writer;
   bool active;
-  time_t lastDiskSpaceCheck;
-  bool RunningLowOnDiskSpace(void);
-  bool NextFile(void);
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
diff --git a/remux.c b/remux.c
index 65544b5e7..9b3b28646 100644
--- a/remux.c
+++ b/remux.c
@@ -8,63 +8,9 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.18 2004/02/14 10:40:37 kls Exp $
+ * $Id: remux.c 1.19 2004/10/16 09:11:52 kls Exp $
  */
 
-/* The calling interface of the 'cRemux::Process()' function is defined
-   as follows:
-
-   'Data' points to a chunk of data that consists of 'Count' bytes.
-   The 'Process' function shall try to remultiplex as much of the
-   data as possible and return a pointer to the resulting buffer.
-   That buffer typically is different from the incoming 'Data',
-   but in the simplest case (when 'Process' does nothing) might
-   as well point to the original 'Data'. When returning, 'Count'
-   shall be set to the number of bytes that have been processed
-   (i.e. have been taken from 'Data'), while 'Result' indicates
-   how many bytes the returned buffer contains. 'PictureType' shall
-   be set to NO_PICTURE if the returned data does not start a new
-   picture, or one of I_FRAME, P_FRAME or B_FRAME if a new picture
-   starting point has been found. This also means that the returned
-   data buffer may contain at most one entire video frame, because
-   the next frame must be returned with its own value for 'PictureType'.
-
-   'Process' shall do it's best to keep the latency time as short
-   as possible in order to allow a quick start of VDR's "Transfer
-   mode" (displaying the signal of one DVB card on another card).
-   In order to do that, this function may decide to first pass
-   through the incoming data (almost) unprocessed, and make
-   actual processing kick in after a few seconds (if that is at
-   all possible for the algorithm). This may result in a non-
-   optimal stream at the beginning, which won't matter for normal
-   recordings but may make switching through encrypted channels
-   in "Transfer mode" faster.
-
-   In the resulting data stream, a new packet shall always be started
-   when a frame border is encountered. VDR needs this in order to
-   be able to detect and store the frame indexes, and to easily
-   display single frames in fast forward/back mode. The very first
-   data block returned shall be the starting point of an I_FRAME.
-   Everything before that shall be silently dropped.
-
-   If the incoming data is not enough to do remultiplexing, a value
-   of NULL shall be returned ('Result' has no meaning then). This
-   will tell the caller to wait for more data to be presented in
-   the next call. If NULL is returned and 'Count' is not 0, the
-   caller shall remove 'Count' bytes from the beginning of 'Data'
-   before the next call. This is the way 'Process' indicates that
-   it must skip that data.
-
-   Any data that is not used during this call will appear at the
-   beginning of the incoming 'Data' buffer at the next call, plus
-   any new data that has become available.
-
-   It is guaranteed that the caller will completely process any
-   returned data before the next call to 'Process'. That way, 'Process'
-   can dynamically allocate its return buffer and be sure the caller
-   doesn't keep any pointers into that buffer.
-*/
-
 #include "remux.h"
 #include <stdlib.h>
 #include "thread.h"
@@ -133,8 +79,7 @@ class cTS2PES {
   uint8_t check;
   int which;
   bool done;
-  uint8_t *resultBuffer;
-  int *resultCount;
+  cRingBufferLinear *resultBuffer;
   int tsErrors;
   int ccErrors;
   int ccCounter;
@@ -145,7 +90,7 @@ class cTS2PES {
   void write_ipack(const uint8_t *Data, int Count);
   void instant_repack(const uint8_t *Buf, int Count);
 public:
-  cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t AudioCid = 0x00);
+  cTS2PES(cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid = 0x00);
   ~cTS2PES();
   void ts_to_pes(const uint8_t *Buf); // don't need count (=188)
   void Clear(void);
@@ -153,10 +98,9 @@ class cTS2PES {
 
 uint8_t cTS2PES::headr[] = { 0x00, 0x00, 0x01 };
 
-cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t AudioCid)
+cTS2PES::cTS2PES(cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid)
 {
   resultBuffer = ResultBuffer;
-  resultCount = ResultCount;
   size = Size;
   audioCid = AudioCid;
 
@@ -184,12 +128,9 @@ void cTS2PES::Clear(void)
 
 void cTS2PES::store(uint8_t *Data, int Count)
 {
-  if (*resultCount + Count > RESULTBUFFERSIZE) {
-     esyslog("ERROR: result buffer overflow (%d + %d > %d)", *resultCount, Count, RESULTBUFFERSIZE);
-     Count = RESULTBUFFERSIZE - *resultCount;
-     }
-  memcpy(resultBuffer + *resultCount, Data, Count);
-  *resultCount += Count;
+  int n = resultBuffer->Put(Data, Count);
+  if (n != Count)
+     esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
 }
 
 void cTS2PES::reset_ipack(void)
@@ -452,6 +393,8 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
 
 // --- cRemux ----------------------------------------------------------------
 
+#define RESULTBUFFERSIZE KILOBYTE(256)
+
 cRemux::cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure)
 {
   vPid = VPid;
@@ -463,13 +406,15 @@ cRemux::cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOn
   numUPTerrors = 0;
   synced = false;
   skipped = 0;
-  resultCount = resultDelivered = 0;
-  vTS2PES  =         new cTS2PES(resultBuffer, &resultCount, IPACKS);
-  aTS2PES1 =         new cTS2PES(resultBuffer, &resultCount, IPACKS, 0xC0);
-  aTS2PES2 = aPid2 ? new cTS2PES(resultBuffer, &resultCount, IPACKS, 0xC1) : NULL;
-  dTS2PES1 = dPid1 ? new cTS2PES(resultBuffer, &resultCount, IPACKS)       : NULL;
+  resultSkipped = 0;
+  resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
+  resultBuffer->SetTimeouts(0, 100);
+  vTS2PES  =         new cTS2PES(resultBuffer, IPACKS);
+  aTS2PES1 =         new cTS2PES(resultBuffer, IPACKS, 0xC0);
+  aTS2PES2 = aPid2 ? new cTS2PES(resultBuffer, IPACKS, 0xC1) : NULL;
+  dTS2PES1 = dPid1 ? new cTS2PES(resultBuffer, IPACKS)       : NULL;
   //XXX don't yet know how to tell apart primary and secondary DD data...
-  dTS2PES2 = /*XXX dPid2 ? new cTS2PES(resultBuffer, &resultCount, IPACKS) : XXX*/ NULL;
+  dTS2PES2 = /*XXX dPid2 ? new cTS2PES(resultBuffer, IPACKS) : XXX*/ NULL;
 }
 
 cRemux::~cRemux()
@@ -479,6 +424,7 @@ cRemux::~cRemux()
   delete aTS2PES2;
   delete dTS2PES1;
   delete dTS2PES2;
+  delete resultBuffer;
 }
 
 int cRemux::GetPid(const uchar *Data)
@@ -488,27 +434,32 @@ int cRemux::GetPid(const uchar *Data)
 
 int cRemux::GetPacketLength(const uchar *Data, int Count, int Offset)
 {
-  // Returns the entire length of the packet starting at offset, or -1 in case of error.
-  return (Offset + 5 < Count) ? (Data[Offset + 4] << 8) + Data[Offset + 5] + 6 : -1;
+  // Returns the length of the packet starting at Offset, or -1 if Count is
+  // too small to contain the entire packet.
+  int Length = (Offset + 5 < Count) ? (Data[Offset + 4] << 8) + Data[Offset + 5] + 6 : -1;
+  if (Length > 0 && Offset + Length <= Count)
+     return Length;
+  return -1;
 }
 
 int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType)
 {
   // Scans the video packet starting at Offset and returns its length.
   // If the return value is -1 the packet was not completely in the buffer.
-
   int Length = GetPacketLength(Data, Count, Offset);
-  if (Length > 0 && Offset + Length <= Count) {
-     int i = Offset + 8; // the minimum length of the video packet header
-     i += Data[i] + 1;   // possible additional header bytes
-     for (; i < Offset + Length; i++) {
-         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
-            switch (Data[i + 3]) {
-              case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
-                               return Length;
-              }
+  if (Length > 0) {
+     if (Length >= 8) {
+        int i = Offset + 8; // the minimum length of the video packet header
+        i += Data[i] + 1;   // possible additional header bytes
+        for (; i < Offset + Length; i++) {
+            if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
+               switch (Data[i + 3]) {
+                 case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
+                                  return Length;
+                 }
+               }
             }
-         }
+        }
      PictureType = NO_PICTURE;
      return Length;
      }
@@ -517,28 +468,8 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
 
 #define TS_SYNC_BYTE 0x47
 
-uchar *cRemux::Process(const uchar *Data, int &Count, int &Result, uchar *PictureType)
+int cRemux::Put(const uchar *Data, int Count)
 {
-  uchar dummyPictureType;
-  if (!PictureType)
-     PictureType = &dummyPictureType;
-
-/*XXX
-  // test recording the raw TS:
-  Result = Count;
-  *PictureType = I_FRAME;
-  return Data;
-XXX*/
-
-  // Remove any previously delivered data from the result buffer:
-
-  if (resultDelivered) {
-     if (resultDelivered < resultCount)
-        memmove(resultBuffer, resultBuffer + resultDelivered, resultCount - resultDelivered);
-     resultCount -= resultDelivered;
-     resultDelivered = 0;
-     }
-
   int used = 0;
 
   // Make sure we are looking at a TS packet:
@@ -560,6 +491,8 @@ XXX*/
          break;
       if (Data[i] != TS_SYNC_BYTE)
          break;
+      if (resultBuffer->Free() < IPACKS)
+         break;
       int pid = GetPid(Data + i + 1);
       if (Data[i + 3] & 0x10) { // got payload
          if      (pid == vPid)              vTS2PES->ts_to_pes(Data + i);
@@ -569,31 +502,9 @@ XXX*/
          else if (pid == dPid2 && dTS2PES2) dTS2PES2->ts_to_pes(Data + i);
          }
       used += TS_SIZE;
-      if (resultCount > (int)sizeof(resultBuffer) / 2)
-         break;
       }
-  Count = used;
-
-/*XXX
-  // test recording without determining the real frame borders:
-  *PictureType = I_FRAME;
-  Result = resultDelivered = resultCount;
-  return Result ? resultBuffer : NULL;
-XXX*/
-
-  // Special VPID case to enable recording radio channels:
-
-  if (vPid == 0 || vPid == 1 || vPid == 0x1FFF) {
-     // XXX actually '0' should be enough, but '1' must be used with encrypted channels (driver bug?)
-     // XXX also allowing 0x1FFF to not break Michael Paar's original patch,
-     // XXX but it would probably be best to only use '0'
-     *PictureType = I_FRAME;
-     Result = resultDelivered = resultCount;
-     return Result ? resultBuffer : NULL;
-     }
 
   // Check if we're getting anywhere here:
-
   if (!synced && skipped >= 0) {
      if (skipped > MAXNONUSEFULDATA) {
         esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
@@ -602,77 +513,112 @@ XXX*/
            cThread::EmergencyExit(true);
         }
      else
-        skipped += Count;
+        skipped += used;
+     }
+
+  return used;
+}
+
+uchar *cRemux::Get(int &Count, uchar *PictureType)
+{
+  // Remove any previously skipped data from the result buffer:
+
+  if (resultSkipped > 0) {
+     resultBuffer->Del(resultSkipped);
+     resultSkipped = 0;
+     }
+
+#if 0
+  // Test recording without determining the real frame borders:
+  if (PictureType)
+     *PictureType = I_FRAME;
+  return resultBuffer->Get(Count);
+#endif
+
+  // Special VPID case to enable recording radio channels:
+
+  if (vPid == 0 || vPid == 1 || vPid == 0x1FFF) {
+     // XXX actually '0' should be enough, but '1' must be used with encrypted channels (driver bug?)
+     // XXX also allowing 0x1FFF to not break Michael Paar's original patch,
+     // XXX but it would probably be best to only use '0'
+     if (PictureType)
+        *PictureType = I_FRAME;
+     return resultBuffer->Get(Count);
      }
 
   // Check for frame borders:
 
-  *PictureType = NO_PICTURE;
-
-  if (resultCount >= MINVIDEODATA) {
-     for (int i = 0; i < resultCount; i++) {
-         if (resultBuffer[i] == 0 && resultBuffer[i + 1] == 0 && resultBuffer[i + 2] == 1) {
-            switch (resultBuffer[i + 3]) {
-              case VIDEO_STREAM_S ... VIDEO_STREAM_E:
-                   {
-                     uchar pt = NO_PICTURE;
-                     int l = ScanVideoPacket(resultBuffer, resultCount, i, pt);
-                     if (l < 0)
-                        return NULL; // no useful data found, wait for more
-                     if (pt != NO_PICTURE) {
-                        if (pt < I_FRAME || B_FRAME < pt) {
-                           esyslog("ERROR: unknown picture type '%d'", pt);
-                           if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure)
-                              cThread::EmergencyExit(true);
-                           }
-                        else if (!synced) {
-                           if (pt == I_FRAME) {
-                              resultDelivered = i; // will drop everything before this position
-                              SetBrokenLink(resultBuffer + i, l);
-                              synced = true;
-                              }
-                           else {
-                              resultDelivered = i + l; // will drop everything before and including this packet
-                              return NULL;
-                              }
-                           }
-                        }
-                     if (synced) {
-                        *PictureType = pt;
-                        Result = l;
-                        uchar *p = resultBuffer + resultDelivered;
-                        resultDelivered += l;
-                        return p;
-                        }
-                     else {
-                        resultDelivered = i + l; // will drop everything before and including this packet
-                        return NULL;
-                        }
-                   }
-                   break;
-              case PRIVATE_STREAM1:
-              case AUDIO_STREAM_S ... AUDIO_STREAM_E:
-                   {
-                     int l = GetPacketLength(resultBuffer, resultCount, i);
-                     if (l < 0)
-                        return NULL; // no useful data found, wait for more
-                     if (synced) {
-                        Result = l;
-                        uchar *p = resultBuffer + resultDelivered;
-                        resultDelivered += l;
-                        return p;
-                        }
-                     else {
-                        resultDelivered = i + l; // will drop everything before and including this packet
-                        return NULL;
+  if (PictureType)
+     *PictureType = NO_PICTURE;
+
+  Count = 0;
+  uchar *resultData = NULL;
+  int resultCount = 0;
+  uchar *data = resultBuffer->Get(resultCount);
+  if (data) {
+     for (int i = 0; i < resultCount - 3; i++) {
+         if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
+            int l = 0;
+            uchar StreamType = data[i + 3];
+            if (VIDEO_STREAM_S <= StreamType && StreamType <= VIDEO_STREAM_E) {
+               uchar pt = NO_PICTURE;
+               l = ScanVideoPacket(data, resultCount, i, pt);
+               if (l < 0)
+                  return resultData;
+               if (pt != NO_PICTURE) {
+                  if (pt < I_FRAME || B_FRAME < pt) {
+                     esyslog("ERROR: unknown picture type '%d'", pt);
+                     if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure)
+                        cThread::EmergencyExit(true);
+                     }
+                  else if (!synced) {
+                     if (pt == I_FRAME) {
+                        if (PictureType)
+                           *PictureType = pt;
+                        resultSkipped = i; // will drop everything before this position
+                        SetBrokenLink(data + i, l);
+                        synced = true;
                         }
-                   }
-                   break;
-              }
+                     }
+                  else if (Count)
+                     return resultData;
+                  else if (PictureType)
+                     *PictureType = pt;
+                  }
+               }
+            else { //if (AUDIO_STREAM_S <= StreamType && StreamType <= AUDIO_STREAM_E || StreamType == PRIVATE_STREAM1) {
+               l = GetPacketLength(data, resultCount, i);
+               if (l < 0)
+                  return resultData;
+               }
+            if (synced) {
+               if (!Count)
+                  resultData = data + i;
+               Count += l;
+               }
+            else
+               resultSkipped = i;
+            if (l > 0)
+               i += l - 1; // the loop increments, too
             }
          }
      }
-  return NULL; // no useful data found, wait for more
+  return resultData;
+}
+
+void cRemux::Del(int Count)
+{
+  resultBuffer->Del(Count);
+}
+
+void cRemux::Clear(void)
+{
+  if (vTS2PES)  vTS2PES->Clear();
+  if (aTS2PES1) aTS2PES1->Clear();
+  if (aTS2PES2) aTS2PES2->Clear();
+  if (dTS2PES1) dTS2PES1->Clear();
+  if (dTS2PES2) dTS2PES2->Clear();
+  resultBuffer->Clear();
 }
 
 void cRemux::SetBrokenLink(uchar *Data, int Length)
diff --git a/remux.h b/remux.h
index 31e64dfbf..0475c0127 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.11 2004/02/14 10:40:41 kls Exp $
+ * $Id: remux.h 1.12 2004/10/15 12:31:16 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -12,6 +12,7 @@
 
 #include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
 #include <linux/dvb/dmx.h>
+#include "ringbuffer.h"
 #include "tools.h"
 
 // Picture types:
@@ -20,11 +21,6 @@
 #define P_FRAME    2
 #define B_FRAME    3
 
-// The minimum amount of video data necessary to identify frames:
-#define MINVIDEODATA (16*1024) // just a safe guess (max. size of any frame block, plus some safety)
-
-#define RESULTBUFFERSIZE (MINVIDEODATA * 4)
-
 class cTS2PES;
 
 class cRemux {
@@ -35,16 +31,30 @@ class cRemux {
   int skipped;
   int vPid, aPid1, aPid2, dPid1, dPid2;
   cTS2PES *vTS2PES, *aTS2PES1, *aTS2PES2, *dTS2PES1, *dTS2PES2;
-  uchar resultBuffer[RESULTBUFFERSIZE];
-  int resultCount;
-  int resultDelivered;
+  cRingBufferLinear *resultBuffer;
+  int resultSkipped;
   int GetPid(const uchar *Data);
   int GetPacketLength(const uchar *Data, int Count, int Offset);
   int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
 public:
   cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
   ~cRemux();
-  uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
+  int Put(const uchar *Data, int Count);
+       ///< Puts at most Count bytes of Data into the remuxer.
+       ///< \return Returns the number of bytes actually consumed from Data.
+  uchar *Get(int &Count, uchar *PictureType = NULL);
+       ///< Gets all currently available data from the remuxer.
+       ///< \return Count contains the number of bytes the result points to, and
+       ///< PictureType (if not NULL) will contain one of NO_PICTURE, I_FRAME, P_FRAME
+       ///< or B_FRAME.
+  void Del(int Count);
+       ///< Deletes Count bytes from the remuxer. Count must be the number returned
+       ///< from a previous call to Get(). Several calls to Del() with fractions of
+       ///< a previously returned Count may be made, but the total sum of all Count
+       ///< values must be exactly what the previous Get() has returned.
+  void Clear(void);
+       ///< Clears the remuxer of all data it might still contain, keeping the PID
+       ///< settings as they are.
   static void SetBrokenLink(uchar *Data, int Length);
   };
 
diff --git a/ringbuffer.c b/ringbuffer.c
index b52c37e5f..3473a9e7e 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.20 2004/06/19 12:27:56 kls Exp $
+ * $Id: ringbuffer.c 1.21 2004/10/15 13:49:25 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -18,11 +18,14 @@
 // --- cRingBuffer -----------------------------------------------------------
 
 #define OVERFLOWREPORTDELTA 5 // seconds between reports
+#define PERCENTAGEDELTA     10
+#define PERCENTAGETHRESHOLD 70
 
 cRingBuffer::cRingBuffer(int Size, bool Statistics)
 {
   size = Size;
   statistics = Statistics;
+  getThreadTid = 0;
   maxFill = 0;
   lastPercent = 0;
   putTimeout = getTimeout = 0;
@@ -36,34 +39,41 @@ cRingBuffer::~cRingBuffer()
      dsyslog("buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
 
-void cRingBuffer::WaitForPut(void)
+void cRingBuffer::UpdatePercentage(int Fill)
 {
-  if (putTimeout) {
-     putMutex.Lock();
-     readyForPut.TimedWait(putMutex, putTimeout);
-     putMutex.Unlock();
+  if (Fill > maxFill)
+     maxFill = Fill;
+  int percent = Fill * 100 / (Size() - 1) / PERCENTAGEDELTA * PERCENTAGEDELTA;
+  if (percent != lastPercent) {
+     if (percent >= PERCENTAGETHRESHOLD && percent > lastPercent || percent < PERCENTAGETHRESHOLD && lastPercent >= PERCENTAGETHRESHOLD) {
+        dsyslog("buffer usage: %d%% (tid=%ld)", percent, getThreadTid);
+        lastPercent = percent;
+        }
      }
 }
 
+void cRingBuffer::WaitForPut(void)
+{
+  if (putTimeout)
+     readyForPut.Wait(putTimeout);
+}
+
 void cRingBuffer::WaitForGet(void)
 {
-  if (getTimeout) {
-     getMutex.Lock();
-     readyForGet.TimedWait(getMutex, getTimeout);
-     getMutex.Unlock();
-     }
+  if (getTimeout)
+     readyForGet.Wait(getTimeout);
 }
 
 void cRingBuffer::EnablePut(void)
 {
-  if (putTimeout)
-     readyForPut.Broadcast();
+  if (putTimeout && Free() > Size() / 3)
+     readyForPut.Signal();
 }
 
 void cRingBuffer::EnableGet(void)
 {
-  if (getTimeout)
-     readyForGet.Broadcast();
+  if (getTimeout && Available() > Size() / 3)
+     readyForGet.Signal();
 }
 
 void cRingBuffer::SetTimeouts(int PutTimeout, int GetTimeout)
@@ -85,70 +95,168 @@ void cRingBuffer::ReportOverflow(int Bytes)
 
 // --- cRingBufferLinear -----------------------------------------------------
 
-cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics)
+#ifdef DEBUGRINGBUFFERS
+#define MAXRBLS 30
+#define DEBUGRBLWIDTH 45
+
+cRingBufferLinear *cRingBufferLinear::RBLS[MAXRBLS] = { NULL };
+
+void cRingBufferLinear::AddDebugRBL(cRingBufferLinear *RBL)
+{
+  for (int i = 0; i < MAXRBLS; i++) {
+      if (!RBLS[i]) {
+         RBLS[i] = RBL;
+         break;
+         }
+      }
+}
+
+void cRingBufferLinear::DelDebugRBL(cRingBufferLinear *RBL)
+{
+  for (int i = 0; i < MAXRBLS; i++) {
+      if (RBLS[i] == RBL) {
+         RBLS[i] = NULL;
+         break;
+         }
+      }
+}
+
+void cRingBufferLinear::PrintDebugRBL(void)
+{
+  bool printed = false;
+  for (int i = 0; i < MAXRBLS; i++) {
+      cRingBufferLinear *p = RBLS[i];
+      if (p) {
+         printed = true;
+         int lh = p->lastHead;
+         int lt = p->lastTail;
+         int h = lh * DEBUGRBLWIDTH / p->Size();
+         int t = lt * DEBUGRBLWIDTH / p->Size();
+         char buf[DEBUGRBLWIDTH + 10];
+         memset(buf, '-', DEBUGRBLWIDTH);
+         if (lt <= lh)
+            memset(buf + t, '*', max(h - t, 1));
+         else {
+            memset(buf, '*', h);
+            memset(buf + t, '*', DEBUGRBLWIDTH - t);
+            }
+         buf[t] = '<';
+         buf[h] = '>';
+         buf[DEBUGRBLWIDTH] = 0;
+         printf("%2d %s %8d %8d %s\n", i, buf, p->lastPut, p->lastGet, p->description);
+         }
+      }
+  if (printed)
+     printf("\n");
+  }
+#endif
+
+cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics, const char *Description)
 :cRingBuffer(Size, Statistics)
 {
-  margin = Margin;
+  description = Description ? strdup(Description) : NULL;
+  tail = head = margin = Margin;
   buffer = NULL;
-  getThreadTid = 0;
   if (Size > 1) { // 'Size - 1' must not be 0!
-     buffer = MALLOC(uchar, Size);
-     if (!buffer)
-        esyslog("ERROR: can't allocate ring buffer (size=%d)", Size);
-     Clear();
+     if (Margin <= Size / 2) {
+        buffer = MALLOC(uchar, Size);
+        if (!buffer)
+           esyslog("ERROR: can't allocate ring buffer (size=%d)", Size);
+        Clear();
+        }
+     else
+        esyslog("ERROR: illegal margin for ring buffer (%d > %d)", Margin, Size / 2);
      }
   else
      esyslog("ERROR: illegal size for ring buffer (%d)", Size);
+#ifdef DEBUGRINGBUFFERS
+  lastHead = head;
+  lastTail = tail;
+  lastPut = lastGet = -1;
+  AddDebugRBL(this);
+#endif
 }
 
 cRingBufferLinear::~cRingBufferLinear()
 {
+#ifdef DEBUGRINGBUFFERS
+  DelDebugRBL(this);
+#endif
   free(buffer);
+  free(description);
 }
 
 int cRingBufferLinear::Available(void)
 {
-  Lock();
   int diff = head - tail;
-  Unlock();
   return (diff >= 0) ? diff : Size() + diff - margin;
 }
 
 void cRingBufferLinear::Clear(void)
 {
-  Lock();
-  head = tail = margin;
-  lastGet = -1;
-  Unlock();
+  tail = head;
+#ifdef DEBUGRINGBUFFERS
+  lastHead = head;
+  lastTail = tail;
+  lastPut = lastGet = -1;
+#endif
+  maxFill = 0;
   EnablePut();
+}
+
+int cRingBufferLinear::Read(int FileHandle, int Max)
+{
+  int Tail = tail;
+  int diff = Tail - head;
+  int free = (diff > 0) ? diff - 1 : Size() - head;
+  if (Tail <= margin)
+     free--;
+  int Count = 0;
+  if (free > 0) {
+     if (0 < Max && Max < free)
+        free = Max;
+     Count = safe_read(FileHandle, buffer + head, free);
+     if (Count > 0) {
+        int Head = head + Count;
+        if (Head >= Size())
+           Head = margin;
+        head = Head;
+        if (statistics) {
+           int fill = head - Tail;
+           if (fill < 0)
+              fill = Size() + fill;
+           else if (fill >= Size())
+              fill = Size() - 1;
+           UpdatePercentage(fill);
+           }
+        }
+     }
+#ifdef DEBUGRINGBUFFERS
+  lastHead = head;
+  lastPut = Count;
+#endif
   EnableGet();
+  if (free == 0)
+     WaitForPut();
+  return Count;
 }
 
 int cRingBufferLinear::Put(const uchar *Data, int Count)
 {
   if (Count > 0) {
-     Lock();
+     int Tail = tail;
      int rest = Size() - head;
-     int diff = tail - head;
-     int free = ((tail < margin) ? rest : (diff > 0) ? diff : Size() + diff - margin) - 1;
+     int diff = Tail - head;
+     int free = ((Tail < margin) ? rest : (diff > 0) ? diff : Size() + diff - margin) - 1;
      if (statistics) {
         int fill = Size() - free - 1 + Count;
         if (fill >= Size())
            fill = Size() - 1;
-        if (fill > maxFill)
-           maxFill = fill;
-        int percent = maxFill * 100 / (Size() - 1) / 5 * 5;
-        if (abs(lastPercent - percent) >= 5) {
-           if (percent > 75)
-              dsyslog("buffer usage: %d%% (tid=%ld)", percent, getThreadTid);
-           lastPercent = percent;
-           }
+        UpdatePercentage(fill);
         }
      if (free > 0) {
         if (free < Count)
            Count = free;
-        if (Count > maxFill)
-           maxFill = Count;
         if (Count >= rest) {
            memcpy(buffer + head, Data, rest);
            if (Count - rest)
@@ -162,7 +270,10 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
         }
      else
         Count = 0;
-     Unlock();
+#ifdef DEBUGRINGBUFFERS
+     lastHead = head;
+     lastPut = Count;
+#endif
      EnableGet();
      if (Count == 0)
         WaitForPut();
@@ -173,25 +284,24 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
 uchar *cRingBufferLinear::Get(int &Count)
 {
   uchar *p = NULL;
-  Lock();
+  int Head = head;
   if (getThreadTid <= 0)
      getThreadTid = pthread_self();
   int rest = Size() - tail;
-  if (rest < margin && head < tail) {
+  if (rest < margin && Head < tail) {
      int t = margin - rest;
      memcpy(buffer + t, buffer + tail, rest);
      tail = t;
-     rest = head - tail;
+     rest = Head - tail;
      }
-  int diff = head - tail;
+  int diff = Head - tail;
   int cont = (diff >= 0) ? diff : Size() + diff - margin;
   if (cont > rest)
      cont = rest;
   if (cont >= margin) {
      p = buffer + tail;
-     Count = lastGet = cont;
+     Count = gotten = cont;
      }
-  Unlock();
   if (!p)
      WaitForGet();
   return p;
@@ -199,17 +309,23 @@ uchar *cRingBufferLinear::Get(int &Count)
 
 void cRingBufferLinear::Del(int Count)
 {
-  if (Count > 0 && Count <= lastGet) {
-     Lock();
-     tail += Count;
-     lastGet -= Count;
-     if (tail >= Size())
-        tail = margin;
-     Unlock();
+  if (Count > gotten) {
+     esyslog("ERROR: invalid Count in cRingBufferLinear::Del: %d (limited to %d)", Count, gotten);
+     Count = gotten;
+     }
+  if (Count > 0) {
+     int Tail = tail;
+     Tail += Count;
+     gotten -= Count;
+     if (Tail >= Size())
+        Tail = margin;
+     tail = Tail;
      EnablePut();
      }
-  else
-     esyslog("ERROR: invalid Count in cRingBufferLinear::Del: %d", Count);
+#ifdef DEBUGRINGBUFFERS
+  lastTail = tail;
+  lastGet = Count;
+#endif
 }
 
 // --- cFrame ----------------------------------------------------------------
diff --git a/ringbuffer.h b/ringbuffer.h
index f4074886c..c47aac3f5 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.15 2004/06/19 10:32:15 kls Exp $
+ * $Id: ringbuffer.h 1.16 2004/10/15 13:50:46 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -15,9 +15,7 @@
 
 class cRingBuffer {
 private:
-  cMutex mutex;
-  cCondVar readyForPut, readyForGet;
-  cMutex putMutex, getMutex;
+  cCondWait readyForPut, readyForGet;
   int putTimeout;
   int getTimeout;
   int size;
@@ -25,18 +23,18 @@ class cRingBuffer {
   int overflowCount;
   int overflowBytes;
 protected:
+  pthread_t getThreadTid;
   int maxFill;//XXX
   int lastPercent;
   bool statistics;//XXX
+  void UpdatePercentage(int Fill);
   void WaitForPut(void);
   void WaitForGet(void);
   void EnablePut(void);
   void EnableGet(void);
   virtual void Clear(void) = 0;
   virtual int Available(void) = 0;
-  int Free(void) { return size - Available() - 1; }
-  void Lock(void) { mutex.Lock(); }
-  void Unlock(void) { mutex.Unlock(); }
+  virtual int Free(void) { return Size() - Available() - 1; }
   int Size(void) { return size; }
 public:
   cRingBuffer(int Size, bool Statistics = false);
@@ -46,20 +44,39 @@ class cRingBuffer {
   };
 
 class cRingBufferLinear : public cRingBuffer {
+//#define DEBUGRINGBUFFERS
+#ifdef DEBUGRINGBUFFERS
+private:
+  int lastHead, lastTail;
+  int lastPut, lastGet;
+  static cRingBufferLinear *RBLS[];
+  static void AddDebugRBL(cRingBufferLinear *RBL);
+  static void DelDebugRBL(cRingBufferLinear *RBL);
+public:
+  static void PrintDebugRBL(void);
+#endif
 private:
   int margin, head, tail;
-  int lastGet;
+  int gotten;
   uchar *buffer;
-  pthread_t getThreadTid;
+  char *description;
 public:
-  cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false);
+  cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false, const char *Description = NULL);
     ///< Creates a linear ring buffer.
     ///< The buffer will be able to hold at most Size-Margin-1 bytes of data, and will
     ///< be guaranteed to return at least Margin bytes in one consecutive block.
+    ///< The optional Description is used for debugging only.
   virtual ~cRingBufferLinear();
   virtual int Available(void);
+  virtual int Free(void) { return Size() - Available() - 1 - margin; }
   virtual void Clear(void);
     ///< Immediately clears the ring buffer.
+  int Read(int FileHandle, int Max = 0);
+    ///< Reads at most Max bytes from FileHandle and stores them in the
+    ///< ring buffer. If Max is 0, reads as many bytes as possible.
+    ///< Only one actual read() call is done.
+    ///< \return Returns the number of bytes actually read and stored, or
+    ///< an error value from the actual read() call.
   int Put(const uchar *Data, int Count);
     ///< Puts at most Count bytes of Data into the ring buffer.
     ///< \return Returns the number of bytes actually stored.
@@ -67,7 +84,7 @@ class cRingBufferLinear : public cRingBuffer {
     ///< Gets data from the ring buffer.
     ///< The data will remain in the buffer until a call to Del() deletes it.
     ///< \return Returns a pointer to the data, and stores the number of bytes
-    ///< actually retrieved in Count. If the returned pointer is NULL, Count has no meaning.
+    ///< actually available in Count. If the returned pointer is NULL, Count has no meaning.
   void Del(int Count);
     ///< Deletes at most Count bytes from the ring buffer.
     ///< Count must be less or equal to the number that was returned by a previous
@@ -98,9 +115,12 @@ class cFrame {
 
 class cRingBufferFrame : public cRingBuffer {
 private:
+  cMutex mutex;
   cFrame *head;
   int currentFill;
   void Delete(cFrame *Frame);
+  void Lock(void) { mutex.Lock(); }
+  void Unlock(void) { mutex.Unlock(); }
 public:
   cRingBufferFrame(int Size, bool Statistics = false);
   virtual ~cRingBufferFrame();
diff --git a/sdt.c b/sdt.c
index efcad3d5d..92d5a740c 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.11 2004/07/18 11:14:42 kls Exp $
+ * $Id: sdt.c 1.12 2004/10/16 10:02:23 kls Exp $
  */
 
 #include "sdt.h"
@@ -39,9 +39,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
   if (!Channels.Lock(true, 10))
      return;
   SI::SDT::Service SiSdtService;
-  for (SI::Loop::Iterator it; sdt.serviceLoop.hasNext(it); ) {
-      SiSdtService = sdt.serviceLoop.getNext(it);
-
+  for (SI::Loop::Iterator it; sdt.serviceLoop.getNext(SiSdtService, it); ) {
       cChannel *channel = Channels.GetByChannelID(tChannelID(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
       if (!channel)
          channel = Channels.GetByChannelID(tChannelID(Source(), 0, Transponder(), SiSdtService.getServiceId()));
@@ -110,8 +108,8 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             */
             case SI::NVODReferenceDescriptorTag: {
                  SI::NVODReferenceDescriptor *nrd = (SI::NVODReferenceDescriptor *)d;
-                 for (SI::Loop::Iterator it; nrd->serviceLoop.hasNext(it); ) {
-                     SI::NVODReferenceDescriptor::Service Service = nrd->serviceLoop.getNext(it);
+                 SI::NVODReferenceDescriptor::Service Service;
+                 for (SI::Loop::Iterator it; nrd->serviceLoop.getNext(Service, it); ) {
                      cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
                      if (!link && Setup.UpdateChannels >= 3) {
                         link = Channels.NewChannel(Channel(), "NVOD", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
diff --git a/sections.c b/sections.c
index 3b2dbe9b6..64923367b 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.7 2004/07/17 14:26:32 kls Exp $
+ * $Id: sections.c 1.9 2004/10/16 13:45:02 kls Exp $
  */
 
 #include "sections.h"
@@ -46,6 +46,7 @@ cSectionHandler::cSectionHandler(cDevice *Device)
   active = false;
   statusCount = 0;
   on = false;
+  waitForLock = false;
   lastIncompleteSection = 0;
   Start();
 }
@@ -120,7 +121,8 @@ void cSectionHandler::Attach(cFilter *Filter)
   statusCount++;
   filters.Add(Filter);
   Filter->sectionHandler = this;
-  Filter->SetStatus(true);
+  if (on)
+     Filter->SetStatus(true);
   Unlock();
 }
 
@@ -145,13 +147,18 @@ void cSectionHandler::SetStatus(bool On)
 {
   Lock();
   if (on != On) {
-     statusCount++;
-     for (cFilter *fi = filters.First(); fi; fi = filters.Next(fi)) {
-         fi->SetStatus(false);
-         if (On)
-            fi->SetStatus(true);
-         }
-     on = On;
+     if (!On || device->HasLock()) {
+        statusCount++;
+        for (cFilter *fi = filters.First(); fi; fi = filters.Next(fi)) {
+            fi->SetStatus(false);
+            if (On)
+               fi->SetStatus(true);
+            }
+        on = On;
+        waitForLock = false;
+        }
+     else
+        waitForLock = On;
      }
   Unlock();
 }
@@ -162,12 +169,15 @@ void cSectionHandler::Action(void)
   while (active) {
 
         Lock();
+        if (waitForLock)
+           SetStatus(true);
         int NumFilters = filterHandles.Count();
         pollfd pfd[NumFilters];
         for (cFilterHandle *fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
             int i = fh->Index();
             pfd[i].fd = fh->handle;
             pfd[i].events = POLLIN;
+            pfd[i].revents = 0;
             }
         int oldStatusCount = statusCount;
         Unlock();
diff --git a/sections.h b/sections.h
index 670f78532..0b2b5bdf6 100644
--- a/sections.h
+++ b/sections.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.h 1.3 2004/01/11 13:18:38 kls Exp $
+ * $Id: sections.h 1.4 2004/08/08 13:44:17 kls Exp $
  */
 
 #ifndef __SECTIONS_H
@@ -27,7 +27,7 @@ class cSectionHandler : public cThread {
   cDevice *device;
   bool active;
   int statusCount;
-  bool on;
+  bool on, waitForLock;
   time_t lastIncompleteSection;
   cList<cFilter> filters;
   cList<cFilterHandle> filterHandles;
diff --git a/svdrp.c b/svdrp.c
index 87f146e52..788b16824 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.63 2004/06/13 13:38:38 kls Exp $
+ * $Id: svdrp.c 1.64 2004/10/17 10:28:47 kls Exp $
  */
 
 #include "svdrp.h"
@@ -484,7 +484,7 @@ void cSVDRP::CmdDELC(const char *Option)
                }
            Channels.Del(channel);
            Channels.ReNumber();
-           Channels.SetModified();
+           Channels.SetModified(true);
            isyslog("channel %s deleted", Option);
            Reply(250, "Channel \"%s\" deleted", Option);
            }
@@ -876,7 +876,7 @@ void cSVDRP::CmdMODC(const char *Option)
               if (Channels.HasUniqueChannelID(&ch, channel)) {
                  *channel = ch;
                  Channels.ReNumber();
-                 Channels.SetModified();
+                 Channels.SetModified(true);
                  isyslog("modifed channel %d %s", channel->Number(), channel->ToText());
                  Reply(250, "%d %s", channel->Number(), channel->ToText());
                  }
@@ -951,7 +951,7 @@ void cSVDRP::CmdNEWC(const char *Option)
            *channel = ch;
            Channels.Add(channel);
            Channels.ReNumber();
-           Channels.SetModified();
+           Channels.SetModified(true);
            isyslog("new channel %d %s", channel->Number(), channel->ToText());
            Reply(250, "%d %s", channel->Number(), channel->ToText());
            }
diff --git a/thread.c b/thread.c
index 084a42956..64b944b6c 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.31 2004/03/14 16:48:30 kls Exp $
+ * $Id: thread.c 1.32 2004/10/15 13:15:02 kls Exp $
  */
 
 #include "thread.h"
@@ -18,6 +18,58 @@
 #include <unistd.h>
 #include "tools.h"
 
+// --- cCondWait -------------------------------------------------------------
+
+cCondWait::cCondWait(void)
+{
+  signaled = false;
+  pthread_mutex_init(&mutex, NULL);
+  pthread_cond_init(&cond, NULL);
+}
+
+cCondWait::~cCondWait()
+{
+  pthread_cond_destroy(&cond);
+  pthread_mutex_destroy(&mutex);
+}
+
+bool cCondWait::Wait(int TimeoutMs)
+{
+  pthread_mutex_lock(&mutex);
+  if (!signaled) {
+     if (TimeoutMs) {
+        struct timeval now;
+        if (gettimeofday(&now, NULL) == 0) {  // get current time
+           now.tv_usec += TimeoutMs * 1000;   // add the timeout
+           int sec = now.tv_usec / 1000000;
+           now.tv_sec += sec;
+           now.tv_usec -= sec * 1000000;
+           struct timespec abstime;              // build timespec for timedwait
+           abstime.tv_sec = now.tv_sec;          // seconds
+           abstime.tv_nsec = now.tv_usec * 1000; // nano seconds
+           while (!signaled) {
+                 if (pthread_cond_timedwait(&cond, &mutex, &abstime) == ETIMEDOUT)
+                    break;
+                 }
+           }
+        }
+     else
+        pthread_cond_wait(&cond, &mutex);
+     }
+  bool r = signaled;
+  signaled = false;
+  pthread_mutex_unlock(&mutex);
+  return r;
+}
+
+void cCondWait::Signal(void)
+{
+  pthread_mutex_lock(&mutex);
+  signaled = true;
+  pthread_cond_signal(&cond);
+  pthread_mutex_unlock(&mutex);
+}
+
 // --- cCondVar --------------------------------------------------------------
 
 cCondVar::cCondVar(void)
@@ -73,13 +125,6 @@ void cCondVar::Broadcast(void)
   pthread_cond_broadcast(&cond);
 }
 
-/*
-void cCondVar::Signal(void)
-{
-  pthread_cond_signal(&cond);
-}
-*/
-
 // --- cRwLock ---------------------------------------------------------------
 
 cRwLock::cRwLock(bool PreferWriter)
diff --git a/thread.h b/thread.h
index 1804a5a6e..7d9254c04 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.20 2004/01/03 16:58:50 kls Exp $
+ * $Id: thread.h 1.21 2004/10/15 13:16:39 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -14,6 +14,23 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+class cCondWait {
+private:
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+  bool signaled;
+public:
+  cCondWait(void);
+  ~cCondWait();
+  bool Wait(int TimeoutMs = 0);
+       ///< Waits at most TimeoutMs milliseconds for a call to Signal(), or
+       ///< forever if TimeoutMs is 0.
+       ///< \return Returns true if Signal() has been called, false it the given
+       ///< timeout has expired.
+  void Signal(void);
+       ///< Signals a caller of Wait() that the condition it is waiting for is met.
+  };
+
 class cMutex;
 
 class cCondVar {
@@ -25,7 +42,6 @@ class cCondVar {
   void Wait(cMutex &Mutex);
   bool TimedWait(cMutex &Mutex, int TimeoutMs);
   void Broadcast(void);
-  //void Signal(void);
   };
 
 class cRwLock {
diff --git a/transfer.c b/transfer.c
index c709928ea..a79143924 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,15 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.16 2004/03/07 14:40:15 kls Exp $
+ * $Id: transfer.c 1.17 2004/10/16 09:22:58 kls Exp $
  */
 
 #include "transfer.h"
 
-//XXX+ also used in recorder.c - find a better place???
-// The size of the array used to buffer video data:
-// (must be larger than MINVIDEODATA - see remux.h)
-#define VIDEOBUFSIZE  MEGABYTE(1)
+#define TRANSFERBUFSIZE  MEGABYTE(2)
 #define POLLTIMEOUTS_BEFORE_DEVICECLEAR 3
 
 // --- cTransfer -------------------------------------------------------------
@@ -21,11 +18,10 @@ cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
 :cReceiver(0, -1, 5, VPid, APid1, APid2, DPid1, DPid2)
 ,cThread("transfer")
 {
-  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, TS_SIZE * 2, true);
+  ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
   canToggleAudioTrack = false;
   audioTrack = 0xC0;
-  gotBufferReserve = false;
   active = false;
 }
 
@@ -51,79 +47,69 @@ void cTransfer::Activate(bool On)
 
 void cTransfer::Receive(uchar *Data, int Length)
 {
-  if (IsAttached()) {
-     int i = 0;
-     while (active && Length > 0) {
-           if (i++ > 10) {
-              ringBuffer->ReportOverflow(Length);
-              break;
-              }
-           int p = ringBuffer->Put(Data, Length);
-           Length -= p;
-           Data += p;
-           }
+  if (IsAttached() && active) {
+     int p = ringBuffer->Put(Data, Length);
+     if (p != Length && active)
+        ringBuffer->ReportOverflow(Length - p);
+     return;
      }
 }
 
 void cTransfer::Action(void)
 {
   int PollTimeouts = 0;
+  uchar *p = NULL;
+  int Result = 0;
   active = true;
   while (active) {
-
-        //XXX+ Maybe we need this to avoid buffer underruns in driver.
-        //XXX+ But then again, it appears to play just fine without this...
-        /*
-        if (!gotBufferReserve) {
-           if (ringBuffer->Available() < 4 * MAXFRAMESIZE) {
-              usleep(100000); // allow the buffer to collect some reserve
+        int Count;
+        uchar *b = ringBuffer->Get(Count);
+        if (b) {
+           if (Count > TRANSFERBUFSIZE * 2 / 3) {
+              // If the buffer runs full, we have no chance of ever catching up
+              // since the data comes in at the same rate as it goes out (it's "live").
+              // So let's clear the buffer instead of suffering from permanent
+              // overflows.
+              dsyslog("clearing transfer buffer to avoid overflows");
+              ringBuffer->Clear();
+              remux->Clear();
+              p = NULL;
               continue;
               }
-           else
-              gotBufferReserve = true;
+           Count = remux->Put(b, Count);
+           if (Count)
+              ringBuffer->Del(Count);
            }
-           */
-
-        // Get data from the buffer:
-
-        int r;
-        const uchar *b = ringBuffer->Get(r);
-
-        // Play the data:
-
-        if (b) {
-           int Count = r, Result;
-           uchar *p = remux->Process(b, Count, Result);
-           ringBuffer->Del(Count);
-           if (p) {
-              StripAudioPackets(p, Result, audioTrack);
-              while (Result > 0 && active) {
-                    cPoller Poller;
-                    if (DevicePoll(Poller, 100)) {
-                       PollTimeouts = 0;
-                       int w = PlayVideo(p, Result);
-                       if (w > 0) {
-                          p += w;
-                          Result -= w;
-                          }
-                       else if (w < 0 && FATALERRNO) {
-                          LOG_ERROR;
-                          break;
-                          }
-                       }
-                    else {
-                       PollTimeouts++;
-                       if (PollTimeouts == POLLTIMEOUTS_BEFORE_DEVICECLEAR) {
-                          dsyslog("clearing device because of consecutive poll timeouts");
-                          DeviceClear();
-                          }
-                       }
-                    }
+        if (!p && (p = remux->Get(Result)) != NULL)
+           StripAudioPackets(p, Result, audioTrack);
+        if (p) {
+           cPoller Poller;
+           if (DevicePoll(Poller, 100)) {
+              PollTimeouts = 0;
+              int w = PlayVideo(p, Result);
+              if (w > 0) {
+                 p += w;
+                 Result -= w;
+                 remux->Del(w);
+                 if (Result <= 0)
+                    p = NULL;
+                 }
+              else if (w < 0 && FATALERRNO)
+                 LOG_ERROR;
+              }
+           else {
+              PollTimeouts++;
+              if (PollTimeouts == POLLTIMEOUTS_BEFORE_DEVICECLEAR) {
+                 dsyslog("clearing device because of consecutive poll timeouts");
+                 DeviceClear();
+                 ringBuffer->Clear();
+                 remux->Clear();
+                 p = NULL;
+                 }
               }
            }
-        else
-           usleep(1); // this keeps the CPU load low
         }
+  active = false;
 }
 
 void cTransfer::StripAudioPackets(uchar *b, int Length, uchar Except)
diff --git a/transfer.h b/transfer.h
index 5ecb96ad8..f33cb27b9 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.4 2003/05/11 08:48:36 kls Exp $
+ * $Id: transfer.h 1.5 2004/10/15 12:39:54 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -22,7 +22,6 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
   cRemux *remux;
   bool canToggleAudioTrack;
   uchar audioTrack;
-  bool gotBufferReserve;
   bool active;
   void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
 protected:
diff --git a/vdr.c b/vdr.c
index fc1f9e092..6d76f1783 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.184 2004/06/13 13:52:09 kls Exp $
+ * $Id: vdr.c 1.187 2004/10/17 11:50:21 kls Exp $
  */
 
 #include <getopt.h>
@@ -58,10 +58,11 @@
 #include "transfer.h"
 #include "videodir.h"
 
-#define MINCHANNELWAIT  10 // seconds to wait between failed channel switchings
-#define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
-#define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
-#define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
+#define MINCHANNELWAIT     10 // seconds to wait between failed channel switchings
+#define ACTIVITYTIMEOUT    60 // seconds before starting housekeeping
+#define SHUTDOWNWAIT      300 // seconds to wait in user prompt before automatic shutdown
+#define MANUALSTART       600 // seconds the next timer must be in the future to assume manual start
+#define CHANNELSAVEDELTA  600 // seconds before saving channels.conf after automatic modifications
 
 static int Interrupted = 0;
 
@@ -87,7 +88,7 @@ int main(int argc, char *argv[])
 #ifdef _CS_GNU_LIBPTHREAD_VERSION
   // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
   char LibPthreadVersion[128];
-  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion) > 0)) {
+  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
      if (strstr(LibPthreadVersion, "NPTL")) {
         fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
         return 2;
@@ -516,6 +517,9 @@ int main(int argc, char *argv[])
            esyslog("emergency exit requested - shutting down");
            break;
            }
+#ifdef DEBUGRINGBUFFERS
+        cRingBufferLinear::PrintDebugRBL();
+#endif
         // Attach launched player control:
         cControl::Attach();
         // Make sure we have a visible programme in case device usage has changed:
@@ -543,10 +547,20 @@ int main(int argc, char *argv[])
               }
            }
         // Handle channel modifications:
-        if (!Channels.BeingEdited() && Channels.Modified()) {
-           if (Channels.Lock(false, 100)) {
-              Channels.Save(); //XXX only after user changes???
-              Timers.Save();
+        if (!Channels.BeingEdited()) {
+           int modified = Channels.Modified();
+           static time_t ChannelSaveTimeout = 0;
+           if (modified == CHANNELSMOD_USER)
+              ChannelSaveTimeout = 1; // triggers an immediate save
+           else if (modified && !ChannelSaveTimeout)
+              ChannelSaveTimeout = time(NULL) + CHANNELSAVEDELTA;
+           bool timeout = ChannelSaveTimeout == 1 || ChannelSaveTimeout && time(NULL) > ChannelSaveTimeout && !cRecordControls::Active();
+           if ((modified || timeout) && Channels.Lock(false, 100)) {
+              if (timeout) {
+                 Channels.Save();
+                 Timers.Save();
+                 ChannelSaveTimeout = 0;
+                 }
               for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                   if (Channel->Modification(CHANNELMOD_RETUNE)) {
                      cRecordControls::ChannelDataModified(Channel);

From 6f93a5f7819b3c7030a5b199e502bedd4eb7844c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 24 Oct 2004 18:00:00 +0200
Subject: [PATCH 106/307] =?UTF-8?q?Version=201.3.14=20-=20Fixed=20detectin?=
 =?UTF-8?q?g=20transponder=20lock=20in=20cDvbTuner=20(based=20on=20a=20pat?=
 =?UTF-8?q?ch=20from=20Stefan=20=20=20Meyknecht).=20-=20What=20was=20previ?=
 =?UTF-8?q?ously=20marked=20with=20WAIT=5FFOR=5FLOCK=5FAFTER=5FTUNING=20is?=
 =?UTF-8?q?=20now=20permanently=20=20=20active=20and=20uses=20a=20cCondVar?=
 =?UTF-8?q?=20to=20signal=20when=20a=20transponder=20is=20locked.=20-=20Ad?=
 =?UTF-8?q?ded=20some=20missing=20'const'=20to=20cChannel.=20-=20Added=20a?=
 =?UTF-8?q?=20sample=20setup=20for=20'DisiCon-4=20Single=20Cable=20Network?=
 =?UTF-8?q?'=20to=20'diseqc.conf'=20=20=20(thanks=20to=20Oliver=20Endriss)?=
 =?UTF-8?q?.=20-=20Fixed=20attaching=20a=20cPlayer=20to=20a=20cDevice,=20s?=
 =?UTF-8?q?o=20that=20'Operation=20not=20permitted'=20=20=20errors=20don't?=
 =?UTF-8?q?=20occur=20any=20more=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9F?=
 =?UTF-8?q?ler).=20-=20Fixed=20a=20case=20where=20the=20resultBuffer=20in?=
 =?UTF-8?q?=20cRemux=20ran=20full=20before=20getting=20a=20sync.=20-=20Rem?=
 =?UTF-8?q?oved=20the=20usleep()=20call=20from=20cDvbPlayer::Action()=20to?=
 =?UTF-8?q?=20make=20VDR=20run=20on=20NPTL=20=20=20systems=20(thanks=20to?=
 =?UTF-8?q?=20Alfred=20Zastrow).=20The=20NPTL=20check=20at=20startup=20has?=
 =?UTF-8?q?=20also=20been=20=20=20removed.=20-=20Taking=20the=20complete?=
 =?UTF-8?q?=20size=20of=20available=20data=20into=20account=20when=20decid?=
 =?UTF-8?q?ing=20whether=20=20=20to=20clear=20the=20transfer=20buffer=20to?=
 =?UTF-8?q?=20avoid=20overflows=20(thanks=20to=20Reinhard=20Nissl).=20-=20?=
 =?UTF-8?q?Updated=20Romanian=20language=20texts=20and=20the=20iso8859-2?=
 =?UTF-8?q?=20fonts=20(thanks=20to=20Lucian=20Muresan).=20-=20Now=20actual?=
 =?UTF-8?q?ly=20using=20the=20iso8859-15=20fonts=20(thanks=20to=20Lucian?=
 =?UTF-8?q?=20Muresan).=20-=20Some=20minor=20code=20cleanups=20(thanks=20t?=
 =?UTF-8?q?o=20Prakash=20K.=20Cheemplavam).=20-=20Fixed=20missing=20cleanu?=
 =?UTF-8?q?p=20at=20program=20exit=20in=20case=20there=20is=20a=20problem?=
 =?UTF-8?q?=20with=20a=20plugin=20=20=20(thanks=20to=20Mattias=20Gr=C3=B6n?=
 =?UTF-8?q?lund=20for=20pointing=20this=20out).=20-=20Increased=20the=20re?=
 =?UTF-8?q?quired=20free=20buffer=20space=20in=20the=20resultBuffer=20of?=
 =?UTF-8?q?=20cRemux=20to=20=20=202=20*=20IPACKS=20to=20avoid=20a=20buffer?=
 =?UTF-8?q?=20overflow=20in=20case=20a=20cTS2PES=20writes=20one=20complete?=
 =?UTF-8?q?=20=20=20packet=20and=20then=20(within=20processing=20the=20sam?=
 =?UTF-8?q?e=20TS=20packet)=20wants=20to=20write=20another=20=20=20small?=
 =?UTF-8?q?=20packet.=20-=20Removed=20the=20signal=20handler=20and=20WakeU?=
 =?UTF-8?q?p()=20call=20from=20cThread=20(it=20is=20no=20longer=20=20=20ne?=
 =?UTF-8?q?eded).=20-=20Added=20some=20checks=20when=20canceling=20a=20thr?=
 =?UTF-8?q?ead=20and=20removed=20the=20usleep()=20in=20=20=20cThread::Star?=
 =?UTF-8?q?t()=20(suggested=20by=20Ludwig=20Nussel).=20Also=20removed=20'r?=
 =?UTF-8?q?unning'=20from=20=20=20cThread=20and=20using=20only=20childTid?=
 =?UTF-8?q?=20to=20indicate=20whether=20a=20thread=20is=20actually=20=20?=
 =?UTF-8?q?=20running.=20-=20Added=20cCondWait::Sleep()=20and=20using=20it?=
 =?UTF-8?q?=20to=20replace=20all=20usleep()=20calls=20(based=20=20=20on=20?=
 =?UTF-8?q?a=20suggestion=20by=20Werner=20Fink).=20-=20Only=20assigning=20?=
 =?UTF-8?q?events=20to=20timers=20if=20the=20related=20schedule=20has=20ac?=
 =?UTF-8?q?tually=20been=20=20=20modified.=20-=20When=20searching=20for=20?=
 =?UTF-8?q?the=20present=20event,=20the=20running=20status=20is=20now=20on?=
 =?UTF-8?q?ly=20taken=20=20=20into=20account=20if=20the=20event=20has=20be?=
 =?UTF-8?q?en=20"seen"=20within=20the=20past=2030=20seconds.=20=20=20This?=
 =?UTF-8?q?=20avoids=20shortly=20seeing=20the=20wrong=20events=20in=20the?=
 =?UTF-8?q?=20channel=20display=20when=20=20=20switching=20to=20a=20channe?=
 =?UTF-8?q?l=20that=20hasn't=20been=20tuned=20to=20in=20a=20while.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS        |  22 +++
 HISTORY             |  43 +++++-
 INSTALL             |   9 +-
 channels.c          |  16 +-
 channels.conf       |  18 +--
 channels.h          |   8 +-
 config.h            |   6 +-
 device.c            |   4 +-
 diseqc.c            |   5 +-
 diseqc.conf         |  11 ++
 dvbdevice.c         |  75 +++++----
 dvbplayer.c         |   4 +-
 eit.c               |   7 +-
 epg.c               |  18 ++-
 epg.h               |  11 +-
 font.c              |  16 +-
 font.h              |   5 +-
 fontosd-iso8859-2.c | 363 ++++++++++++++++++++++----------------------
 fontsml-iso8859-2.c |  68 ++++-----
 genfontfile.c       |   2 +-
 i18n.c              | 360 +++++++++++++++++++++----------------------
 libsi/util.h        |   4 +-
 remux.c             |   8 +-
 sections.c          |   5 +-
 thread.c            |  56 +++----
 thread.h            |  10 +-
 timers.c            |  54 ++++---
 timers.h            |   6 +-
 transfer.c          |   4 +-
 vdr.c               |  68 ++++-----
 30 files changed, 696 insertions(+), 590 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0874cf441..86f1e2894 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -257,6 +257,7 @@ Werner Fink <werner@suse.de>
  for modifying handling of audio packets in cDvbPlayer for better sync with external
  AC3 replay
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
+ for suggesting to replace usleep() calls with a pthread_cond_timedwait() based wait
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -530,6 +531,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting that the "Classic VDR" skin wrongly displayed unused color buttons
  for reporting some missing cStatus::MsgOsdTextItem() calls
  for reporting a missing "Editing process finished" message with skins
+ for adding a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf'
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -741,6 +743,8 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for reporting a problem on systems that have UTF-8 enabled
  for pointing out a flaw in the the description of cRingBufferLinear
  for reporting a bug in cRingBufferLinear::Get() in case the buffer wraps around
+ for adding some checks when cancelling a thread and removing the usleep() in
+ cThread::Start()
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -797,6 +801,8 @@ Alfred Zastrow <vdr@zastrow4u.de>
  the recordings created when pausing live video
  for reporting two warnings when compiling with gcc 3.3.1
  for reporting a bug in handling menu status messages when the list contents is scrolled
+ for reporting that without the usleep() call in cDvbPlayer::Action() VDR runs on NPTL
+ systems
 
 Matthias Raus <matthias-raus@web.de>
  for reporting a problem with starting the editing process if no marks have been set
@@ -870,6 +876,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for suggesting to make sure the OSD reports oeWrongAlignment errors before any
  oeAreasOverlap error
  for reporting a a crash in the time search mechanism
+ for taking the complete size of available data into account when deciding whether
+ to clear the transfer buffer to avoid overflows
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1021,6 +1029,7 @@ Drazen Dupor <drazen.dupor@dupor.com>
 
 Prakash K. Cheemplavam <PrakashKC@gmx.de>
  for fixing some issues with gcc 3.4
+ for some minor code cleanups
 
 Miko Wohlgemuth <weak@chello.at>
  for reporting a problem with the OSD alignment in the SPU decoder
@@ -1053,6 +1062,8 @@ Marco Schl
  for avoiding unnecessary section filter start/stops
  for pointing out that if one PID can't be added, the whole cDevice::AttachReceiver()
  should fail and all PIDs added so far should be deleted
+ for fixing attaching a cPlayer to a cDevice, so that 'Operation not permited'
+ errors don't occur any more
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1100,3 +1111,14 @@ Udo Richter <udo_richter@gmx.de>
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
+
+Stefan Meyknecht <stefan@meyknecht.org>
+ for a patch that fixed detecting transponder lock in cDvbTuner
+
+Lucian Muresan <lucianm@users.sourceforge.net>
+ for updating the Romanian language texts and the iso8859-2 fonts
+ for making VDR actually use the iso8859-15 fonts
+
+Mattias Gr�nlund <Mattias@Gronlund.net>
+ for pointing out a missing cleanup at program exit in case there is a problem
+ with a plugin
diff --git a/HISTORY b/HISTORY
index 3baa1b963..f6d6c2064 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3003,7 +3003,7 @@ Video Disk Recorder Revision History
 - The cRingBuffer now does EnableGet()/EnablePut() only if the buffer is more than
   one third full or empty, respectively. This dramatically improves recording
   performance and reduces system load (thanks to Marco Schl��ler for doing some
-  testing regarding buffer performance and giving me some hints that finally lead
+  testing regarding buffer performance and giving me some hints that finally led
   to finding out that this was the basic problem causing buffer overflows).
 - Improved Transfer Mode (thanks to Marco Schl��ler for suggestions and testing).
 - Fixed a possible crash with inconsistent SI data (thanks to Marcel Wiesweg).
@@ -3036,3 +3036,44 @@ Video Disk Recorder Revision History
 - Removed the 'Log' parameter from the cChannel::Set... functions. Instead
   checking if the channel has a non-zero number.
 - Updated 'channels.conf.terr' for Hannover (thanks to Sven Kreiensen).
+
+2004-10-24: Version 1.3.14
+
+- Fixed detecting transponder lock in cDvbTuner (based on a patch from Stefan
+  Meyknecht).
+- What was previously marked with WAIT_FOR_LOCK_AFTER_TUNING is now permanently
+  active and uses a cCondVar to signal when a transponder is locked.
+- Added some missing 'const' to cChannel.
+- Added a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf'
+  (thanks to Oliver Endriss).
+- Fixed attaching a cPlayer to a cDevice, so that 'Operation not permited'
+  errors don't occur any more (thanks to Marco Schl��ler).
+- Fixed a case where the resultBuffer in cRemux ran full before getting a sync.
+- Removed the usleep() call from cDvbPlayer::Action() to make VDR run on NPTL
+  systems (thanks to Alfred Zastrow). The NPTL check at startup has also been
+  removed.
+- Taking the complete size of available data into account when deciding whether
+  to clear the transfer buffer to avoid overflows (thanks to Reinhard Nissl).
+- Updated Romanian language texts and the iso8859-2 fonts (thanks to Lucian Muresan).
+- Now actually using the iso8859-15 fonts (thanks to Lucian Muresan).
+- Some minor code cleanups (thanks to Prakash K. Cheemplavam).
+- Fixed missing cleanup at program exit in case there is a problem with a plugin
+  (thanks to Mattias Gr�nlund for pointing this out).
+- Increased the required free buffer space in the resultBuffer of cRemux to
+  2 * IPACKS to avoid a buffer overflow in case a cTS2PES writes one complete
+  packet and then (within processing the same TS packet) wants to write another
+  small packet.
+- Removed the signal handler and WakeUp() call from cThread (it is no longer
+  needed).
+- Added some checks when cancelling a thread and removed the usleep() in
+  cThread::Start() (suggested by Ludwig Nussel). Also removed 'running' from
+  cThread and using only childTid to indicate whether a thread is actually
+  running.
+- Added cCondWait::Sleep() and using it to replace all usleep() calls (based
+  on a suggestion by Werner Fink).
+- Only assigning events to timers if the related schedule has actually been
+  modified.
+- When searching for the present event, the running status is now only taken
+  into account if the event has been "seen" within the past 30 seconds.
+  This avoids shortly seeing the wrong events in the channel display when
+  switching to a channel that hasn't been tuned to in a while.
diff --git a/INSTALL b/INSTALL
index f054d7ab3..2b363d440 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,14 +7,7 @@ Version 1.3
 IMPORTANT NOTES:
 ----------------
 
-VDR currently doesn't work with NPTL ("Native Posix Thread Library").
-Either don't use NPTL, or set the environment variable
-
-  LD_ASSUME_KERNEL=2.4.1
-  
-before running VDR.
-
-Also, please make sure your environment is NOT set to use UTF-8 or
+Please make sure your environment is NOT set to use UTF-8 or
 any other multibyte character representation. Check the value of your
 $LANG or $LC_CTYPE environment variable, and if it contains something
 like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"
diff --git a/channels.c b/channels.c
index ad3ca7fca..ad8156d18 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.27 2004/10/17 12:20:56 kls Exp $
+ * $Id: channels.c 1.28 2004/10/22 14:11:07 kls Exp $
  */
 
 #include "channels.h"
@@ -503,7 +503,7 @@ static int PrintParameter(char *p, char Name, int Value)
   return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
 }
 
-const char *cChannel::ParametersToString(void)
+const char *cChannel::ParametersToString(void) const
 {
   char type = *cSource::ToString(source);
   if (isdigit(type))
@@ -563,14 +563,12 @@ bool cChannel::StringToParameters(const char *s)
   return true;
 }
 
-const char *cChannel::ToText(cChannel *Channel)
+const char *cChannel::ToText(const cChannel *Channel)
 {
   char buf[MaxChannelName * 2];
-  char *s = Channel->name;
-  if (strchr(s, ':')) {
-     s = strcpy(buf, s);
-     strreplace(s, ':', '|');
-     }
+  const char *s = Channel->name;
+  if (strchr(s, ':'))
+     s = strreplace(strcpy(buf, s), ':', '|');
   free(buffer);
   if (Channel->groupSep) {
      if (Channel->number)
@@ -602,7 +600,7 @@ const char *cChannel::ToText(cChannel *Channel)
   return buffer;
 }
 
-const char *cChannel::ToText(void)
+const char *cChannel::ToText(void) const
 {
   return ToText(this);
 }
diff --git a/channels.conf b/channels.conf
index 008f73275..d7f7db0f4 100644
--- a/channels.conf
+++ b/channels.conf
@@ -32,7 +32,7 @@ Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 CNBC Europe;CNBC:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
-n-tv;n-tv:12669:vC56:S19.2E:22000:162:96=deu:55:0:12730:1:1116:0
+n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
 Eurosport;ZDFvision:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
@@ -45,22 +45,22 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 START,PREMIERE START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0
-PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1801,1722:11:133:2:0
+PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1702,1801,1722:10:133:2:0
+PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1702,1722,1801:11:133:2:0
 PREM 3,PREMIERE 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREM 4,PREMIERE 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREM 5,PREMIERE 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
-PREM 6,PREMIERE 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
-PREM 7,PREMIERE 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
+PREM 5,PREMIERE 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
+PREM 6,PREMIERE 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
+PREM 7,PREMIERE 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
 DISNEY,DISNEY CHANNEL;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
 :Premiere Direkt
 DIREKT,PREMIERE DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 B-UHSE,BEATE-UHSE.TV;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
-EROTIK,DIREKT EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
+EROTIK,DIREKT EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-SPORT 1,PREMIERE SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu:32:1801,1702,1722:17:133:3:0
-SPORT 2,PREMIERE SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
+Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
+Formel 1:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 Liberty TV.com;Maastricht Multimedia:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
diff --git a/channels.h b/channels.h
index 666e91b62..a2530f10f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.19 2004/10/17 11:52:07 kls Exp $
+ * $Id: channels.h 1.20 2004/10/22 14:09:47 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -88,7 +88,7 @@ class cChannel : public cListObject {
   friend class cMenuEditChannel;
 private:
   static char *buffer;
-  static const char *ToText(cChannel *Channel);
+  static const char *ToText(const cChannel *Channel);
   enum { MaxChannelName = 64 }; // 63 chars + terminating 0!
   int __BeginData__;
   char name[MaxChannelName];
@@ -122,14 +122,14 @@ class cChannel : public cListObject {
   int modification;
   cLinkChannels *linkChannels;
   cChannel *refChannel;
-  const char *ParametersToString(void);
+  const char *ParametersToString(void) const;
   bool StringToParameters(const char *s);
 public:
   cChannel(void);
   cChannel(const cChannel &Channel);
   ~cChannel();
   cChannel& operator= (const cChannel &Channel);
-  const char *ToText(void);
+  const char *ToText(void) const;
   bool Parse(const char *s, bool AllowNonUniqueID = false);
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
diff --git a/config.h b/config.h
index d61f1d1e4..c3372a8b8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.200 2004/07/27 07:22:46 kls Exp $
+ * $Id: config.h 1.201 2004/10/22 13:29:38 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.13"
-#define VDRVERSNUM   10313  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.14"
+#define VDRVERSNUM   10314  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index b53c0ab2c..5a57faf87 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.60 2004/10/17 09:39:10 kls Exp $
+ * $Id: device.c 1.61 2004/10/23 10:15:31 kls Exp $
  */
 
 #include "device.h"
@@ -595,8 +595,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
      if (player)
         Detach(player);
      player = Player;
-     player->device = this;
      SetPlayMode(player->playMode);
+     player->device = this;
      player->Activate(true);
      return true;
      }
diff --git a/diseqc.c b/diseqc.c
index 0766db8ac..801e1cd8b 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.2 2002/12/07 13:44:56 kls Exp $
+ * $Id: diseqc.c 1.3 2004/10/24 11:04:56 kls Exp $
  */
 
 #include "diseqc.h"
 #include <ctype.h>
 #include "sources.h"
+#include "thread.h"
 
 // -- cDiseqc ----------------------------------------------------------------
 
@@ -61,7 +62,7 @@ char *cDiseqc::Wait(char *s)
   int n = strtol(s, &p, 10);
   if (!errno && p != s && n >= 0) {
      if (!parsing)
-        usleep(n * 1000);
+        cCondWait::SleepMs(n);
      return p;
      }
   esyslog("ERROR: illegal value for wait time in '%s'", s - 1);
diff --git a/diseqc.conf b/diseqc.conf
index 135089ed6..d4526d86e 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -60,3 +60,14 @@ S21.5E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S21.5E  99999 V 10600  [E0 10 38 F5]
 # S21.5E  11700 H  9750  [E0 10 38 F6]
 # S21.5E  99999 H 10600  [E0 10 38 F7]
+#
+# DisiCon-4 Single Cable Network:
+#
+# horizontal: 11.704 - 12.205 GHz (1. IF: 1144 - 1645 MHz) - LOF 1 (10,56 GHz)
+# horizontal: 12.676 - 12.709 GHz (1. IF: 2116 - 2148 MHz) - LOF 1 (10,56 GHz)
+# vertical:   12.035 - 12.107 GHz (1. IF:  955 - 1027 MHz) - LOF 3 (11,08 GHz)
+# vertical:   12.464 - 12.716 GHz (1. IF: 1744 - 1996 MHz) - LOF 2 (10,72 GHz)
+#
+# S19.2E  99999 H 10560 t v
+# S19.2E  12110 V 11080 t v
+# S19.2E  99999 V 10720 t v
diff --git a/dvbdevice.c b/dvbdevice.c
index 561b6c620..3f38a0a46 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.97 2004/10/17 09:10:43 kls Exp $
+ * $Id: dvbdevice.c 1.100 2004/10/24 11:06:37 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -35,7 +35,7 @@ extern "C" {
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
-//#define WAIT_FOR_LOCK_AFTER_TUNING 1
+#define TUNER_LOCK_TIMEOUT 5000 // ms
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -78,6 +78,8 @@ class cDvbTuner : public cThread {
   bool useCa;
   time_t startTime;
   eTunerStatus tunerStatus;
+  cMutex mutex;
+  cCondVar locked;
   cCondWait newSet;
   bool SetFrontend(void);
   virtual void Action(void);
@@ -86,7 +88,7 @@ class cDvbTuner : public cThread {
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune, bool UseCa);
-  bool Locked(void) { return tunerStatus >= tsLocked; }
+  bool Locked(int TimeoutMs = 0);
   };
 
 cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler)
@@ -125,7 +127,7 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
   if (Tune)
      tunerStatus = tsSet;
   else if (tunerStatus == tsCam)
-     tunerStatus = tsTuned;
+     tunerStatus = tsLocked;
   useCa = UseCa;
   if (Channel->Ca() && tunerStatus != tsCam)
      startTime = time(NULL);
@@ -134,6 +136,14 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
   newSet.Signal();
 }
 
+bool cDvbTuner::Locked(int TimeoutMs)
+{
+  cMutexLock MutexLock(&mutex);
+  if (TimeoutMs && tunerStatus < tsLocked)
+     locked.TimedWait(mutex, TimeoutMs);
+  return tunerStatus >= tsLocked;
+}
+
 static unsigned int FrequencyToHz(unsigned int f)
 {
   while (f && f < 1000000)
@@ -253,22 +263,25 @@ void cDvbTuner::Action(void)
   active = true;
   while (active) {
         Lock();
-        if (tunerStatus == tsSet)
+        if (tunerStatus == tsSet) {
+           dvb_frontend_event event;
+           while (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0)
+                 ; // discard stale events
            tunerStatus = SetFrontend() ? tsTuned : tsIdle;
-        if (tunerStatus == tsTuned) {
-           fe_status_t status = fe_status_t(0);
-           CHECK(ioctl(fd_frontend, FE_READ_STATUS, &status));
-           if (status & FE_HAS_LOCK)
-              tunerStatus = tsLocked;
            }
         if (tunerStatus != tsIdle) {
            dvb_frontend_event event;
-           if (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0) {
-              if (event.status & FE_REINIT) {
-                 tunerStatus = tsSet;
-                 esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
+           while (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0) {
+                 if (event.status & FE_REINIT) {
+                    tunerStatus = tsSet;
+                    esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
+                    }
+                 if (event.status & FE_HAS_LOCK) {
+                    cMutexLock MutexLock(&mutex);
+                    tunerStatus = tsLocked;
+                    locked.Broadcast();
+                    }
                  }
-              }
            }
         if (ciHandler) {
            if (ciHandler->Process() && useCa) {
@@ -293,7 +306,7 @@ void cDvbTuner::Action(void)
            }
         Unlock();
         // in the beginning we loop more often to let the CAM connection start up fast
-        newSet.Wait((ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
+        newSet.Wait((tunerStatus == tsTuned || ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
         }
 }
 
@@ -735,25 +748,29 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   StartTransferMode = false;
 #endif
 
-  // XXX 1.3: use the same mechanism as below (!EITScanner.UsesDevice(this))
-  if (EITScanner.Active()) {
-     StartTransferMode = false;
-     TurnOnLivePIDs = false;
-     }
-
   // Turn off live PIDs if necessary:
 
   if (TurnOffLivePIDs)
      TurnOffLiveMode();
 
+  // Set the tuner:
+
   dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
 
-#ifdef WAIT_FOR_LOCK_AFTER_TUNING
-  //XXX TODO preliminary fix for the "Unknown picture type" error
-  time_t t0 = time(NULL);
-  while (!dvbTuner->Locked() && time(NULL) - t0 < 5)
-        usleep(100);
-#endif
+  // If this channel switch was requested by the EITScanner we don't wait for
+  // a lock and don't set any live PIDs (the EITScanner will wait for the lock
+  // by itself before setting any filters):
+
+  if (EITScanner.UsesDevice(this))
+     return true;
+
+  // Wait for a lock:
+
+  if (!dvbTuner->Locked(TUNER_LOCK_TIMEOUT)) {
+     esyslog("ERROR: no lock for channel %d on device %d", Channel->Number(), CardIndex() + 1);
+     return false;
+     }
+
   // PID settings:
 
   if (TurnOnLivePIDs) {
@@ -1058,7 +1075,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
 #define MIN_IFRAME 400000
   for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
       safe_write(fd_video, Data, Length);
-      usleep(1); // allows the buffer to be displayed in case the progress display is active
+      cCondWait::SleepMs(1); // allows the buffer to be displayed in case the progress display is active
       }
 #endif
 }
diff --git a/dvbplayer.c b/dvbplayer.c
index c9cdc1ab6..d583fe6b2 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.25 2004/10/15 13:07:55 kls Exp $
+ * $Id: dvbplayer.c 1.26 2004/10/23 12:39:35 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -490,8 +490,6 @@ void cDvbPlayer::Action(void)
                     break;
                     }
                  }
-              else//XXX
-                 usleep(1); // this keeps the CPU load low
               }
 
            // Store the frame in the buffer:
diff --git a/eit.c b/eit.c
index b0cbfdfe7..8ff51d348 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.97 2004/10/16 09:49:13 kls Exp $
+ * $Id: eit.c 1.98 2004/10/24 14:56:39 kls Exp $
  */
 
 #include "eit.h"
@@ -59,6 +59,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          }
       else {
          // We have found an existing event, either through its event ID or its start time.
+         pEvent->SetSeen();
          // If the existing event has a zero table ID it was defined externally and shall
          // not be overwritten.
          if (pEvent->TableID() == 0x00)
@@ -215,8 +216,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
   if (Empty && Tid == 0x4E && getSectionNumber() == 0)
      // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
      pSchedule->ClrRunningStatus(channel);
-  if (Modified)
+  if (Modified) {
      pSchedule->Sort();
+     Schedules->SetModified(pSchedule);
+     }
 }
 
 // --- cTDT ------------------------------------------------------------------
diff --git a/epg.c b/epg.c
index 2768db2e9..39b029e52 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.19 2004/05/22 12:37:07 kls Exp $
+ * $Id: epg.c 1.20 2004/10/24 15:01:50 kls Exp $
  */
 
 #include "epg.h"
@@ -99,6 +99,11 @@ void cEvent::SetVps(time_t Vps)
   vps = Vps;
 }
 
+void cEvent::SetSeen(void)
+{
+  seen = time(NULL);
+}
+
 bool cEvent::HasTimer(void) const
 {
   for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
@@ -478,6 +483,7 @@ cSchedule::cSchedule(tChannelID ChannelID)
 {
   channelID = ChannelID;
   hasRunning = false;;
+  modified = 0;
 }
 
 cEvent *cSchedule::AddEvent(cEvent *Event)
@@ -496,7 +502,7 @@ const cEvent *cSchedule::GetPresentEvent(bool CheckRunningStatus) const
          if (!CheckRunningStatus)
             break;
          }
-      if (CheckRunningStatus && p->RunningStatus() >= SI::RunningStatusPausing)
+      if (CheckRunningStatus && time(NULL) - p->Seen() < 30 && p->RunningStatus() >= SI::RunningStatusPausing)
          return p;
       }
   return pe;
@@ -643,6 +649,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
                        if (!cEvent::Read(f, p))
                           return false;
                        p->Sort();
+                       Schedules->SetModified(p);
                        }
                     }
                  else {
@@ -680,6 +687,7 @@ cSchedules cSchedules::schedules;
 const char *cSchedules::epgDataFileName = NULL;
 time_t cSchedules::lastCleanup = time(NULL);
 time_t cSchedules::lastDump = time(NULL);
+time_t cSchedules::modified = 0;
 
 const cSchedules *cSchedules::Schedules(cSchedulesLock &SchedulesLock)
 {
@@ -693,6 +701,12 @@ void cSchedules::SetEpgDataFileName(const char *FileName)
      epgDataFileName = strdup(FileName);
 }
 
+void cSchedules::SetModified(cSchedule *Schedule)
+{
+  Schedule->SetModified();
+  modified = time(NULL);
+}
+
 void cSchedules::Cleanup(bool Force)
 {
   if (Force)
diff --git a/epg.h b/epg.h
index 9a6547ef0..6c31049d8 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.15 2004/03/14 13:25:39 kls Exp $
+ * $Id: epg.h 1.16 2004/10/24 13:56:00 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -36,6 +36,7 @@ class cEvent : public cListObject {
   time_t startTime;      // Start time of this event
   int duration;          // Duration of this event in seconds
   time_t vps;            // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
+  time_t seen;           // When this event was last seen in the data stream
 public:
   cEvent(tChannelID ChannelID, u_int16_t EventID);
   ~cEvent();
@@ -52,6 +53,7 @@ class cEvent : public cListObject {
   time_t EndTime(void) const { return startTime + duration; }
   int Duration(void) const { return duration; }
   time_t Vps(void) const { return vps; }
+  time_t Seen(void) const { return seen; }
   bool HasTimer(void) const;
   bool IsRunning(bool OrAboutToStart = false) const;
   const char *GetDateString(void) const;
@@ -68,6 +70,7 @@ class cEvent : public cListObject {
   void SetStartTime(time_t StartTime);
   void SetDuration(int Duration);
   void SetVps(time_t Vps);
+  void SetSeen(void);
   void Dump(FILE *f, const char *Prefix = "") const;
   static bool Read(FILE *f, cSchedule *Schedule);
   void FixEpgBugs(void);
@@ -80,9 +83,12 @@ class cSchedule : public cListObject  {
   tChannelID channelID;
   cList<cEvent> events;
   bool hasRunning;
+  time_t modified;
 public:
   cSchedule(tChannelID ChannelID);
   tChannelID ChannelID(void) const { return channelID; }
+  time_t Modified(void) const { return modified; }
+  void SetModified(void) { modified = time(NULL); }
   void SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel = NULL);
   void ClrRunningStatus(cChannel *Channel = NULL);
   void ResetVersions(void);
@@ -117,12 +123,15 @@ class cSchedules : public cList<cSchedule> {
   static const char *epgDataFileName;
   static time_t lastCleanup;
   static time_t lastDump;
+  static time_t modified;
 public:
   static void SetEpgDataFileName(const char *FileName);
   static const cSchedules *Schedules(cSchedulesLock &SchedulesLock);
          ///< Caller must provide a cSchedulesLock which has to survive the entire
          ///< time the returned cSchedules is accessed. Once the cSchedules is no
          ///< longer used, the cSchedulesLock must be destroyed.
+  static time_t Modified(void) { return modified; }
+  static void SetModified(cSchedule *Schedule);
   static void Cleanup(bool Force = false);
   static void ResetVersions(void);
   static bool ClearAll(void);
diff --git a/font.c b/font.c
index eeabd3346..29f949445 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.8 2004/05/31 09:55:37 kls Exp $
+ * $Id: font.c 1.9 2004/10/23 14:06:01 kls Exp $
  */
 
 #include "config.h"
@@ -28,13 +28,18 @@
 #include "fontosd-iso8859-7.c"
 #include "fontsml-iso8859-7.c"
 
+#include "fontfix-iso8859-15.c"
+#include "fontosd-iso8859-15.c"
+#include "fontsml-iso8859-15.c"
+
 // --- cFont -----------------------------------------------------------------
 
 static void *FontData[eDvbCodeSize][eDvbFontSize] = {
-  { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 },
-  { FontOsd_iso8859_2, FontFix_iso8859_2, FontSml_iso8859_2 },
-  { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5 },
-  { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 },
+  { FontOsd_iso8859_1,  FontFix_iso8859_1,  FontSml_iso8859_1 },
+  { FontOsd_iso8859_2,  FontFix_iso8859_2,  FontSml_iso8859_2 },
+  { FontOsd_iso8859_5,  FontFix_iso8859_5,  FontSml_iso8859_5 },
+  { FontOsd_iso8859_7,  FontFix_iso8859_7,  FontSml_iso8859_7 },
+  { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15 },
   };
 
 static const char *FontCode[eDvbCodeSize] = {
@@ -42,6 +47,7 @@ static const char *FontCode[eDvbCodeSize] = {
   "iso8859-2",
   "iso8859-5",
   "iso8859-7",
+  "iso8859-15",
   };
 
 eDvbCode cFont::code = code_iso8859_1;
diff --git a/font.h b/font.h
index b90daf6f7..5d74f66c7 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.8 2004/05/31 09:52:46 kls Exp $
+ * $Id: font.h 1.9 2004/10/23 14:06:37 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -24,7 +24,8 @@ enum eDvbCode {
   code_iso8859_2,
   code_iso8859_5,
   code_iso8859_7,
-#define eDvbCodeSize (code_iso8859_7 + 1)
+  code_iso8859_15,
+#define eDvbCodeSize (code_iso8859_15 + 1)
   };
 
 class cFont {
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index c47836144..bf9c0fb9f 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -419,8 +419,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
+     0x000007F8,  // ...********..
+     0x000007F8,  // ...********..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2473,33 +2473,33 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 114
      8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x0000007C,  // ..*****.
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CE,  // ..**..***.
+     0x000000FE,  // ..*******.
+     0x000000E0,  // ..***.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 115
      12, 27,
@@ -4151,35 +4151,35 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
-  {             // 170
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x00000018,  // .....**..
-     0x00000078,  // ...****..
-     0x00000198,  // .**..**..
-     0x00000198,  // .**..**..
-     0x000001FC,  // .*******.
-     0x000000EC,  // ..***.**.
-     0x000001F8,  // .******..
-     0x000001F8,  // .******..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+  {             // 170 iso8859-2
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007C0,  // .....*****.....
+     0x00001FF0,  // ...*********...
+     0x00001838,  // ...**.....***..
+     0x00003018,  // ..**.......**..
+     0x00003008,  // ..**........*..
+     0x00003000,  // ..**...........
+     0x00003800,  // ..***..........
+     0x00001F00,  // ...*****.......
+     0x00000FF0,  // ....********...
+     0x000000F8,  // ........*****..
+     0x0000001C,  // ...........***.
+     0x0000000C,  // ............**.
+     0x0000600C,  // .**.........**.
+     0x0000300C,  // ..**........**.
+     0x00003018,  // ..**.......**..
+     0x00001FF0,  // ...*********...
+     0x00000FE0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000780,  // .....****......
+     0x00000180,  // .......**......
+     0x00000F80,  // ....*****......
+     0x00000700,  // .....***.......
   },
   {             // 171
      14, 27,
@@ -4631,36 +4631,35 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
   },
-
-  {             // 186
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x0000007C,  // ..*****.
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x0000007C,  // ..*****.
-     0x00000038,  // ...***..
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+  {             // 186 iso8859-2
+     12, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x00000C18,  // .**.....**...
+     0x00000C00,  // .**..........
+     0x00000E00,  // .***.........
+     0x000007E0,  // ..******.....
+     0x000001F8,  // ....******...
+     0x0000001C,  // ........***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000FF8,  // .*********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x000001E0,  // ....****.....
+     0x00000060,  // ......**.....
+     0x000003E0,  // ...*****.....
+     0x000001C0,  // ....***......
   },
   {             // 187
      6, 27,
@@ -4902,12 +4901,12 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
-  {             // 195
+  {             // 195 iso8859-2
      15, 27,
      0x00000000,  // ...............
-     0x00000720,  // .....***..*....
-     0x00000FE0,  // ....*******....
-     0x00000040,  // .........*.....
+     0x00000C30,  // ....**...**....
+     0x00000660,  // .....**.**.....
+     0x00000380,  // ......***......
      0x00000000,  // ...............
      0x00000380,  // ......***......
      0x000003C0,  // ......****.....
@@ -5233,34 +5232,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .......
   },
   {             // 206
-     6, 27,
-     0x00000030,  // ..**...
-     0x00000078,  // .****..
-     0x0000004C,  // .*..**.
-     0x000000C4,  // **...*.
-     0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
+     7, 27,
+     0x00000030,  // ..**....
+     0x00000078,  // .****...
+     0x00000048,  // .*..*...
+     0x000000CC,  // **..**..
+     0x00000000,  // ........
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 207
      6, 27,
@@ -5712,35 +5711,35 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
-  {             // 222
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003038,  // ..**......***..
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+  {             // 222 iso8859-2
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00007FFE,  // **************
+     0x00007FFE,  // **************
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000180,  // ......**......
+     0x00000000,  // ..............
+     0x000003C0,  // .....****.....
+     0x000000C0,  // .......**.....
+     0x000006C0,  // ....**.**.....
+     0x00000380,  // .....***......
   },
   {             // 223
      14, 27,
@@ -5862,16 +5861,16 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
   },
-  {             // 227
+  {             // 227 iso8859-2
      13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000630,  // ...**...**...
+     0x00000360,  // ....**.**....
+     0x000001C0,  // .....***.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x000003E0,  // ....*****....
@@ -6672,35 +6671,35 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000F00,  // .****.......
      0x00000E00,  // .***........
   },
-  {             // 254
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000019E0,  // .**..****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+  {             // 254 iso8859-2
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000007E,  // ******
+     0x0000007E,  // ******
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x00000018,  // ..**..
+     0x0000001E,  // ..****
+     0x0000001E,  // ..****
+     0x00000000,  // ......
+     0x0000001E,  // ..****
+     0x00000006,  // ....**
+     0x00000036,  // .**.**
+     0x0000001C,  // ..***.
   },
   {             // 255
      12, 27,
diff --git a/fontsml-iso8859-2.c b/fontsml-iso8859-2.c
index f33afd635..ce5b35ee0 100644
--- a/fontsml-iso8859-2.c
+++ b/fontsml-iso8859-2.c
@@ -2132,30 +2132,30 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x0000000C,  // ........**.
   },
   {             // 114
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000036,  // .**.**
-     0x00000036,  // .**.**
-     0x00000038,  // .***..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     9, 23,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CC,  // .**..**..
+     0x000000F8,  // .*****...
+     0x000000E0,  // .***.....
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
   {             // 115
      9, 23,
@@ -5356,12 +5356,12 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
   },
   {             // 238
-     4, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
      0x00000018,  // ..**..
      0x0000003C,  // .****.
      0x00000066,  // **..**
@@ -5376,10 +5376,10 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000018,  // ..**..
      0x00000018,  // ..**..
      0x00000018,  // ..**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 239
      14, 23,
diff --git a/genfontfile.c b/genfontfile.c
index 41d87b795..bc171cf25 100644
--- a/genfontfile.c
+++ b/genfontfile.c
@@ -179,7 +179,7 @@ SuckGlyphsFromServer(Display * dpy, Font font)
           charHeight = charinfo->ascent + charinfo->descent;
           spanLength = (charWidth + 7) / 8;
         }
-        bitmapData = calloc(height * spanLength, sizeof(char));
+        bitmapData = (unsigned char *)calloc(height * spanLength, sizeof(char));
         if (!bitmapData)
           goto FreeFontAndReturn;
         DEBUG_GLYPH4("index %d, glyph %d (%d by %d)\n",
diff --git a/i18n.c b/i18n.c
index e3f4637af..f325d5712 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.159 2004/10/16 13:20:56 kls Exp $
+ * $Id: i18n.c 1.160 2004/10/23 13:57:38 kls Exp $
  *
  * Translations provided by:
  *
@@ -19,7 +19,7 @@
  * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
  * Swedish     Tomas Prybil <tomas@prybil.se> and Jan Ekholm <chakie@infa.abo.fi>
- * Romanian    Paul Lacatus <paul@campina.iiruc.ro>
+ * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
@@ -92,7 +92,7 @@ const tI18nPhrase Phrases[] = {
     "Espa�ol",
     "��������", // Greek
     "Svenska",
-    "Romaneste",
+    "Rom�n�",
     "Magyar",
     "Catal�",
     "�������", // Russian
@@ -113,7 +113,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-7",
     "iso8859-1",
-    "iso8859-1",
+    "iso8859-2",
     "iso8859-1",
     "iso8859-1",
     "iso8859-5",
@@ -134,7 +134,7 @@ const tI18nPhrase Phrases[] = {
     "esl,spa",
     "ell,gre",
     "sve,swe",
-    "ron,rum",
+    "rom,rum",
     "hun",
     "cat,cln",
     "rus",
@@ -175,7 +175,7 @@ const tI18nPhrase Phrases[] = {
     "Gu�a de Programaci�n",
     "���������",
     "Program",
-    "Program",
+    "Program (EPG)",
     "Program",
     "Guia de Programaci�",
     "�������",
@@ -215,7 +215,7 @@ const tI18nPhrase Phrases[] = {
     "Timer",
     "��������������",
     "Timers",
-    "Timere",
+    "Timer-e",
     "Felv�tel beprogramoz�sa",
     "Temporitzadors",
     "�������",
@@ -235,7 +235,7 @@ const tI18nPhrase Phrases[] = {
     "Grabaciones",
     "��������",
     "Inspelningar",
-    "Inregistrari",
+    "�nregistr�ri",
     "Felvett ad�sok",
     "Veure programes gravats",
     "������",
@@ -255,7 +255,7 @@ const tI18nPhrase Phrases[] = {
     "Configuraci�n",
     "���������",
     "Inst�llningar",
-    "Setari",
+    "Configura�ie",
     "Be�ll�t�sok",
     "Configuraci�",
     "���������",
@@ -295,7 +295,7 @@ const tI18nPhrase Phrases[] = {
     "�rdenes de grabaci�n",
     "������� ��� ��������",
     "Inspelningskommandon",
-    "",// TODO
+    "Comenzi �nregistrare",
     "Parancsok a felvett filmekhez",
     "Ordres de gravaci�",
     "������� ������",
@@ -315,7 +315,7 @@ const tI18nPhrase Phrases[] = {
     "Modificar canal",
     "����������� ��������",
     "�ndra kanal",
-    "Editare canale",
+    "Modificare canal",
     "Csatorn�k be�ll�t�sa",
     "Editar canal",
     "�������������� ������",
@@ -335,7 +335,7 @@ const tI18nPhrase Phrases[] = {
     "Modificar timer",
     "���������� �������������",
     "�ndra timer",
-    "Editare timere",
+    "Modificare timer",
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
     "Editar temporitzador",
     "��������� �������",
@@ -355,7 +355,7 @@ const tI18nPhrase Phrases[] = {
     "Evento",
     "�������",
     "S�ndning",
-    "Evenimente",
+    "Emisiune",
     "Ad�s",
     "Esdeveniment",
     "��������",
@@ -375,7 +375,7 @@ const tI18nPhrase Phrases[] = {
     "Res�men",
     "�����������",
     "Sammanfattning",
-    "Cuprins",
+    "Detalii",
     "Tartalom",
     "Sinopsi",
     "��������",
@@ -395,7 +395,7 @@ const tI18nPhrase Phrases[] = {
     "Programa - %s",
     "��������� - %s",
     "Program - %s",
-    "Program - %s",
+    "Programul canalului %s",
     "Program - %s",
     "Guia de Programaci� - %s",
     "��������� - %s",
@@ -415,7 +415,7 @@ const tI18nPhrase Phrases[] = {
     "�Qu� hay ahora?",
     "������ ���������",
     "Vilket program s�nds nu?",
-    "Programul actual?",
+    "Ce emisiuni sunt acum?",
     "Mi megy most?",
     "Qu� fan ara?",
     "������ � �����:",
@@ -435,7 +435,7 @@ const tI18nPhrase Phrases[] = {
     "�Qu� hay proximo?",
     "������� ���������",
     "Vilket �r n�sta program?",
-    "Programul urmator?",
+    "Ce emisiuni urmeaz�?",
     "Mi k�vetkezik?",
     "Qu� fan despr�s?",
     "����� � ���������:",
@@ -456,7 +456,7 @@ const tI18nPhrase Phrases[] = {
     "Modificar",
     "����������",
     "�ndra",
-    "Modificare",
+    "Modific�",
     "Be�ll�tani",
     "Editar",
     "�������������",
@@ -496,7 +496,7 @@ const tI18nPhrase Phrases[] = {
     "Borrar",
     "��������",
     "Ta bort",
-    "Sterge",
+    "�terge",
     "T�r�lni",
     "Esborrar",
     "�������",
@@ -516,7 +516,7 @@ const tI18nPhrase Phrases[] = {
     "Marcar",
     "�������",
     "M�rk",
-    "Marcheaza",
+    "Marcheaz�",
     "Megjel�lni",
     "Marcar",
     "�����������",
@@ -536,7 +536,7 @@ const tI18nPhrase Phrases[] = {
     "On/Off",
     "A����/K������",
     "P�/Av",
-    "Pornit/Oprit",
+    "Act./Inact.",
     "Be/Ki",
     "On/Off",
     "���/����",
@@ -556,7 +556,7 @@ const tI18nPhrase Phrases[] = {
     "Grabar",
     "�������",
     "Inspelning",
-    "Inregistrare",
+    "�nregistr.",
     "Felvenni",
     "Gravar",
     "������",
@@ -596,7 +596,7 @@ const tI18nPhrase Phrases[] = {
     "Rebobinar",
     "����",
     "�terspolning",
-    "Inapoi",
+    "�napoi",
     "Vissza az elej�re",
     "Enrera",
     "�����",
@@ -636,7 +636,7 @@ const tI18nPhrase Phrases[] = {
     "Continuar",
     "��������",
     "Forts�tt",
-    "Reia",
+    "Revenire",
     "Tov�bb",
     "Continuar",
     "����������",
@@ -696,7 +696,7 @@ const tI18nPhrase Phrases[] = {
     "Cambiar",
     "A�����",
     "Byt",
-    "Schimba",
+    "Comut�",
     "�tkapcsolni",
     "Canviar",
     "�����������",
@@ -736,7 +736,7 @@ const tI18nPhrase Phrases[] = {
     "Siguiente",
     "�������",
     "N�sta",
-    "Urmator",
+    "Urm�tor",
     "K�vetkez�",
     "Seg�ent",
     "�����",
@@ -796,7 +796,7 @@ const tI18nPhrase Phrases[] = {
     "Expulsar",
     "�������",
     "Mata ut",
-    "Ejecteaza",
+    "Ejecteaz�",
     "Kidobni",
     "Expulsar",
     "�������",
@@ -836,7 +836,7 @@ const tI18nPhrase Phrases[] = {
     "Insertar",
     "��������",
     "Infoga",
-    "Insereaza",
+    "Insereaz�",
     "Beilleszteni",
     "Inserir",
     "�������",
@@ -896,7 +896,7 @@ const tI18nPhrase Phrases[] = {
     "Reiniciar",
     "���������",
     "�terst�ll",
-    "",//TODO
+    "Resetare",
     "Reset",
     "Reiniciar",
     "�����",
@@ -916,7 +916,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "C�utare canale",
     "",//TODO
     "",//TODO
     "�����������",
@@ -937,7 +937,7 @@ const tI18nPhrase Phrases[] = {
     "�Eliminar canal?",
     "�������� ��������?",
     "Ta bort kanalen?",
-    "Sterg canalul?",
+    "�terg canalul?",
     "Csatorna t�rl�se?",
     "Esborrar el canal?",
     "������� �����?",
@@ -957,7 +957,7 @@ const tI18nPhrase Phrases[] = {
     "�Eliminar timer?",
     "�������� �������������?",
     "Ta bort timern?",
-    "Sterg timer-ul?",
+    "�terg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
     "Esborrar el temporitzador?",
     "������� ������?",
@@ -977,7 +977,7 @@ const tI18nPhrase Phrases[] = {
     "�Eliminar grabacion?",
     "�������� �������?",
     "Ta bort inspelningen?",
-    "Sterg inregistrarea?",
+    "�terg �nregistrarea?",
     "Felv�tel t�rl�se?",
     "Esborrar gravaci�?",
     "������� ������?",
@@ -997,7 +997,7 @@ const tI18nPhrase Phrases[] = {
     "�Timer activo - de verdad eliminarlo?",
     "�������������� �� ������� - �������� �������?",
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
-    "Timer-ul in inregistrare - sterg?",
+    "Timer-ul tocmai �nregistreaz� - �terg, totu�i?",
     "Felv�tel folyamatban van - m�gis t�r�lni?",
     "Temporitzador activat - Esborrar de totes maneres?",
     "���� ������ �� ������� - ������������� �������?",
@@ -1017,7 +1017,7 @@ const tI18nPhrase Phrases[] = {
     "�Parar grabaci�n?",
     "������� ��������?",
     "Stanna inspelning?",
-    "Opresc inregistrarea?",
+    "Opresc �nregistrarea?",
     "Felv�tel befejezni?",
     "Aturar la gravaci�?",
     "���������� ������?",
@@ -1037,7 +1037,7 @@ const tI18nPhrase Phrases[] = {
     "en interface primario",
     "���� ����� �����",
     "fr�n den f�rsta enheten?",
-    "pe prima interfata",
+    "pe prima interfa��",
     "az els� k�rty�n",
     "a la interf�cie prim�ria",
     "�� �������� ����������",
@@ -1057,7 +1057,7 @@ const tI18nPhrase Phrases[] = {
     "�Cancelar modificaci�n?",
     "A������ ������������?",
     "Avbryta redigeringen?",
-    "Opresc editarea?",
+    "Opresc montajul �nregistr�rii?",
     "V�g�st befejezni?",
     "Cancel�lar l'edici�?",
     "�������� ��������������?",
@@ -1077,7 +1077,7 @@ const tI18nPhrase Phrases[] = {
     "�De verdad reiniciar?",
     "N� ����� ������� ������������?",
     "Vill du verkligen starta om?",
-    "Esti sigur de repornire?",
+    "Sigur repornesc?",
     "T�nyleg �jraind�tani?",
     "Segur que voleu reiniciar?",
     "������������� �������������?",
@@ -1097,7 +1097,7 @@ const tI18nPhrase Phrases[] = {
     "Grabando - �reiniciar?",
     "������� ������� - ������ �� ����� ������������?",
     "Inspelning p�g�r, vill du �nd� starta om?",
-    "In inregistrare - repornesc?",
+    "Tocmai se �nregistreaz� - repornesc, totu�i?",
     "Felv�tel folyamatban van - m�gis �jraind�tani?",
     "Gravant - Reiniciar de totes maneres?",
     "���� ������ - ������������� �������������?",
@@ -1117,7 +1117,7 @@ const tI18nPhrase Phrases[] = {
     "Grabando - �apagar?",
     "������� ������� - ������ �� ����� �����������?",
     "Inspelning p�g�r, vill du �nd� avbryta?",
-    "In inregistrare - opresc?",
+    "Tocmai se �nregistreaz� - �nchid, totu�i?",
     "Felv�tel folyamatban van - m�gis kikapcsolni?",
     "Gravant - Apagar de totes maneres?",
     "���� ������ - ������������� ���������?",
@@ -1137,7 +1137,7 @@ const tI18nPhrase Phrases[] = {
     "Grabando en %d minutos, �de verdad apagar?",
     "���������� ������� �� %d ����� - ������ �� �����������?",
     "Inspelning startar om %d minuter, vill du avsluta?",
-    "Inregistrez in %d minute, opresc?",
+    "�nregistrez peste %d minute - �nchid, totu�i?",
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
     "Hi ha una gravaci� en %d minuts - Apagar de totes maneres?",
     "����� %d ����� �������� ������ - ������������� ���������?",
@@ -1157,7 +1157,7 @@ const tI18nPhrase Phrases[] = {
     "Pulse una tecla para interrumpir apagar",
     "����� ��� ������� ��� ������� �����������",
     "Tryck valfri knapp f�r att �terkalla avst�ngningen",
-    "Apasa orice tasta pentru a anula inchiderea",
+    "Apas� orice tast� pentru a anula �nchiderea",
     "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
     "Prem qualsevol tecla per cancel�lar l'aturada",
     "������� ����� ������ ����� �������� ����������.",
@@ -1198,7 +1198,7 @@ const tI18nPhrase Phrases[] = {
     "Frecuencia",
     "���������",
     "Frekvens",
-    "Frecventa",
+    "Frecven��",
     "Frekvencia",
     "Freq��ncia",
     "�������",
@@ -1238,7 +1238,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "����������",
     "K�lla",
-    "",//TODO
+    "Surs�",
     "Forr�s",
     "Origen",
     "��������",
@@ -1258,7 +1258,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Symbolrate",
-    "Rata simboluri",
+    "Rat� simboluri",
     "Srate",
     "Srate",
     "����. ��������",
@@ -1418,7 +1418,7 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "CA",
     "Kortl�sare",
-    "Criptare",
+    "CA (Acces Condi�ional)",
     "CA",
     "Acc�s Condicional",
     "CA (�������)",
@@ -1458,7 +1458,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
     "Inversion",
     "Inversion",
-    "Inversion",
+    "Inversiune",
     "Inversion",
     "Inversi�",
     "��������",
@@ -1478,7 +1478,7 @@ const tI18nPhrase Phrases[] = {
     "Bandwidth",
     "Bandwidth",
     "Bandbredd",
-    "Bandwidth",
+    "L�rgime de band�",
     "Bandwidth",
     "Amplada de banda",
     "��������",
@@ -1538,7 +1538,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulation",
     "Modulation",
-    "Modulation",
+    "Modula�ie",
     "Modulation",
     "Modulaci�",
     "���������",
@@ -1558,7 +1558,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmission",
     "Transmission",
-    "Transmission",
+    "Transmisiune",
     "Transmission",
     "Transmissi�",
     "��������",
@@ -1598,7 +1598,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
-    "Hierarchy",
+    "Ierarhie",
     "Hierarchy",
     "Jerarquia",
     "��������",
@@ -1679,7 +1679,7 @@ const tI18nPhrase Phrases[] = {
     "Comienzo",
     "����",
     "B�rjar",
-    "Start",
+    "�nceput",
     "Kezdet",
     "Inici",
     "������",
@@ -1699,7 +1699,7 @@ const tI18nPhrase Phrases[] = {
     "Fin",
     "�����",
     "Slutar",
-    "Stop",
+    "Sf�r�it",
     "V�ge",
     "Fi",
     "�����",
@@ -1719,7 +1719,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "VPS",
     "",// TODO
     "",// TODO
     "VPS ��������",
@@ -1759,7 +1759,7 @@ const tI18nPhrase Phrases[] = {
     "Durabilidad",
     "�������� ���������",
     "Livstid",
-    "Durata",
+    "Timp de p�strare",
     "�lettartam",
     "Durada",
     "���� ��������",
@@ -1779,7 +1779,7 @@ const tI18nPhrase Phrases[] = {
     "Fichero",
     "������",
     "Filnamn",
-    "Fisier",
+    "Fi�ier",
     "File",
     "Arxiu",
     "����",
@@ -1860,7 +1860,7 @@ const tI18nPhrase Phrases[] = {
     "�Timer esta grabando!",
     "������� ��������������� �������!",
     "Timerstyrd inspelning p�g�r!",
-    "Timer-ul este in inregistrare!",
+    "Timer-ul tocmai �nregistreaz�!",
     "Felv�tel folyamatban van!",
     "El temporitzador est� gravant!",
     "���� ������ �� �������!",
@@ -1880,7 +1880,7 @@ const tI18nPhrase Phrases[] = {
     "�Error al acceder a la grabaci�n!",
     "�������� ���� ���������� ��������!",
     "Inspelningen g�r inte att l�sa!",
-    "Eroare in timpul accesarii inregistrarii",
+    "Eroare la accesarea �nregistr�rii",
     "Hiba a felv�tel hozz�f�r�s�n�l",
     "Error a l'accedir a la gravaci�!",
     "������ ������� � ������!",
@@ -1900,7 +1900,7 @@ const tI18nPhrase Phrases[] = {
     "�Error al borrar la grabaci�n!",
     "����� ���� ��� �������� ��� �������!",
     "Inspelningen g�r inte att ta bort!",
-    "Eroare in timpul stergerii inregistrarii!",
+    "Eroare la �tergerea �nregistr�rii!",
     "Hiba a felv�tel t�rl�s�n�l!",
     "Error a l'esborrar la gravaci�!",
     "������ �������� ������!",
@@ -1940,7 +1940,7 @@ const tI18nPhrase Phrases[] = {
     "�No hay dispositivo DVB disponible para grabar!",
     "���������� DVB ������ ��� �������!",
     "Det finns ingen ledig DVB enhet f�r inspelning!",
-    "Nu mai sunt dispozitive DVB pentru inregistrare!",
+    "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!",
     "Nincs szabad DVB k�rtya a felv�telhez!",
     "No hi ha cap dispositiu DVB lliure per gravar!",
     "��� ���������� DVB-���������� ��� ������!",
@@ -1960,7 +1960,7 @@ const tI18nPhrase Phrases[] = {
     "!Canal no disponible!",
     "�� ������ ��� ����� ���������!",
     "Kanalen ej tillg�nglig!",
-    "",//TODO
+    "Canal indisponibil",
     "A csatorna nem el�rhet�",
     "Canal no disponible!",
     "����� ����������!",
@@ -1980,7 +1980,7 @@ const tI18nPhrase Phrases[] = {
     "!Propiedades de canal duplicadas!",
     "�� ��������� ��� �������� ����������������!",
     "Kanalinst�llningarna �r ej unika!",
-    "",//TODO
+    "Parametrii canalului nu sunt univoci!",
     "A csatornabe�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
     "��������� ������ �� ���������!",
@@ -2000,7 +2000,7 @@ const tI18nPhrase Phrases[] = {
     "�Canal bloqueado (grabando)!",
     "�� ������ ����� ������������ (������ �������)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
-    "Canal blocat (inregistrare)!",
+    "Canal blocat (�nregistrare)!",
     "Csatorna hozz�f�rhetetlen (felv�tel)!",
     "Canal bloquejat (gravant)!",
     "����� ������������ (���� ������)!",
@@ -2020,7 +2020,7 @@ const tI18nPhrase Phrases[] = {
     "�No puedo iniciar modo de transferencia!",
     "�������� ��������� ���������� ���������!",
     "Kan inte starta Transfer Mode!",
-    "Nu pot porni Modul de Transfer!",
+    "Nu pot porni modul de transfer!",
     "Transfer-Mode nem ind�that�!",
     "No puc iniciar el mode de transfer�ncia!",
     "���������� �������� ����� ��������!", // ???
@@ -2040,7 +2040,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "��� ����� ������� ������ ������������",
     "Det finns inga redigeringsm�rken",//TODO
-    "",//TODO
+    "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare",
     "A v�g�pont nincs kijel�lve",//TODO
     "No hi ha marques d'edici� definides",
     "�� ������ ����� ��� �������!",
@@ -2060,7 +2060,7 @@ const tI18nPhrase Phrases[] = {
     "�No puedo iniciar proceso de modificaci�n!",
     "�������� ��������� ��� ������������!",
     "Kan inte starta redigering!",
-    "Nu pot porni procesul de editare!",
+    "Nu pot porni montajul �nregistr�rii!",
     "A v�g�s nem ind�that�!",
     "No puc iniciar el proc�s d'edici�!",
     "���������� ������ ������ ������!",
@@ -2080,7 +2080,7 @@ const tI18nPhrase Phrases[] = {
     "�Proceso de modificaci�n ya fue iniciado!",
     "����������� ��������� �� �������!",
     "Redigeringen �r redan aktiv!",
-    "Procesul de editare este activ!",
+    "Montajul �nregistr�rii este deja activ!",
     "A v�g�s m�r aktiv�lt!",
     "Proc�s d'edici� iniciat anteriorment!",
     "������� ������������ ��� �������!",
@@ -2100,7 +2100,7 @@ const tI18nPhrase Phrases[] = {
     "�No puedo apagar - opci�n '-s' ausente!",
     "�������� �� ����� �����������. ��������� � ���������� '-s'!",
     "Kan inte avsluta, m�ste anv�nda parameter '-s'",
-    "Nu pot opri calculatorul - vezi optiunea '-s'",
+    "Nu pot �nchide - vezi op�iunea '-s'",
     "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
     "No puc apagar, falta la opci� -s !",
     "���������� ���������� - �� ����� �������� '-s'!",
@@ -2120,7 +2120,7 @@ const tI18nPhrase Phrases[] = {
     "�Disco casi lleno",
     "� ������� �������� �� �������!",
     "L�gt diskutrymme!",
-    "Spatiu scazut pe disc!",
+    "Spa�iul pe disc e foarte sc�zut!",
     "A merev lemez majdnem tele!",
     "Disc gaireb� ple!",
     "������������ ����� �� �����!",
@@ -2140,7 +2140,7 @@ const tI18nPhrase Phrases[] = {
     "�No pudeo acceder al men� de la CAM!",
     "������� � �������� ��� CAM �����!",
     "Det g�r inte att �ppna CAM menyn!",
-    "",//TODO
+    "Nu pot deschide meniul CAM",
     "A CAM-Men� nem nyithat�",
     "No puc obrir el men� de la CAM!",
     "���� CAM-������ ����������!",
@@ -2160,7 +2160,7 @@ const tI18nPhrase Phrases[] = {
     "�No puedo reiniciar la CAM!",
     "������� �� ����� ��������� ��� CAM",
     "Kan inte �terst�lla CAM!",
-    "",//TODO
+    "Nu pot reseta CAM",
     "A CAM-Reset nem siker�lt",
     "No puc reiniciar la CAM!",
     "������ ����������� CAM-������!",
@@ -2180,7 +2180,7 @@ const tI18nPhrase Phrases[] = {
     "CAM reiniciada",
     "��� CAM ����� ���������",
     "CA modulen har �terst�llts",
-    "",//TODO
+    "CAM-ul a fost resetat",
     "A CAM vissza lett �ll�tva",
     "CAM reiniciada",
     "CAM-������ �����������!",
@@ -2241,7 +2241,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "DVB",
     "DVB",
-    "Placa DVB",
+    "Dispozitiv DVB",
     "DVB",
     "Tarja DVB",
     "DVB",
@@ -2281,7 +2281,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "CICAM",
     "CICAM",
-    "Acces conditionat",
+    "CICAM",
     "CICAM",
     "CI Acc�s condicional",
     "�������� ������",
@@ -2301,7 +2301,7 @@ const tI18nPhrase Phrases[] = {
     "Opciones de Grabaci�n",
     "�������",
     "Inspelning",
-    "Inregistrare",
+    "�nregistrare",
     "Felv�tel",
     "Opcions de Gravaci�",
     "������",
@@ -2361,7 +2361,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "�������",
     "Moduler",
-    "Plugins",
+    "Plugin-uri",
     "Plugins",
     "Plugins",
     "������ ����������",
@@ -2381,7 +2381,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "�����",
     "Modul",
-    "Plugin",
+    "Plugin (modul adi�ional)",
     "Plugin",
     "Plugin",
     "������",
@@ -2401,7 +2401,7 @@ const tI18nPhrase Phrases[] = {
     "Reiniciar",
     "������������",
     "Omstart",
-    "Restart",
+    "Repornire",
     "�jraind�t�s",
     "Reiniciar",
     "�������������",
@@ -2442,7 +2442,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Skin",
     "",// TODO
     "",// TODO
     "�����",
@@ -2462,7 +2462,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Tem�",
     "",// TODO
     "",// TODO
     "�������",
@@ -2482,7 +2482,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "St�nga",
     "",// TODO
     "",// TODO
     "������ �����",
@@ -2502,7 +2502,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Sus",
     "",// TODO
     "",// TODO
     "������ ������",
@@ -2522,7 +2522,7 @@ const tI18nPhrase Phrases[] = {
     "Anchura",
     "������",
     "Bredd",
-    "Latime OSD",
+    "L��ime OSD",
     "Sz�less�g",
     "Amplada",
     "������",
@@ -2542,7 +2542,7 @@ const tI18nPhrase Phrases[] = {
     "Altura",
     "����",
     "H�jd",
-    "Inaltime OSD",
+    "�n�l�ime OSD",
     "Magass�g",
     "Al�ada",
     "������",
@@ -2562,7 +2562,7 @@ const tI18nPhrase Phrases[] = {
     "Duraci�n muestra mensajes (s)",
     "������ �������� ��������� (�)",
     "Tid f�r meddelanden (sek)",
-    "Timp afisare mesaj (sec)",
+    "Timp afi�are mesaje (sec)",
     "Inform�ci� felt�ntet�s�nek id�tartama",
     "Durada dels missatges (s)",
     "������������ ������ ��������� (���)",
@@ -2582,7 +2582,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Utilizare fonturi mici",
     "",// TODO
     "",// TODO
     "������������ ������ �����",
@@ -2602,7 +2602,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "niciodat�",
     "",// TODO
     "",// TODO
     "�������",
@@ -2622,7 +2622,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "dep. de skin",
     "",// TODO
     "",// TODO
     "�������� ����",
@@ -2642,7 +2642,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�ntotdeauna",
     "",// TODO
     "",// TODO
     "������",
@@ -2662,7 +2662,7 @@ const tI18nPhrase Phrases[] = {
     "Posici�n para informaci�n canal",
     "���� ����������� ��������",
     "Placering av kanalinformation",
-    "Pozitie info canal",
+    "Pozi�ia informa�iilor despre canal",
     "Csatorna-Inf� pozici�ja",
     "Posici� de la informaci� del canal",
     "��������� ���� ���������� � ������",
@@ -2682,7 +2682,7 @@ const tI18nPhrase Phrases[] = {
     "Informaci�n para cambio de canal",
     "����������� ���� ������ ��������",
     "Information vid kanalbyte",
-    "Info despre comutare canal",
+    "Informa�ii la comutarea canalului",
     "Inf� a csatorna v�lt�s�n�l",
     "Informaci� del canvi de canal",
     "���������� ���������� � ������",
@@ -2702,7 +2702,7 @@ const tI18nPhrase Phrases[] = {
     "Desplazar p�gina entera",
     "������ �������",
     "Bl�ddra sidor",
-    "Deruleaza pagini",
+    "Deruleaz� pagini",
     "Oldalank�nt l�ptetmi",
     "Despla�ar p�gina sencera",
     "��������� ������� ����",
@@ -2722,7 +2722,7 @@ const tI18nPhrase Phrases[] = {
     "Ordenar timers",
     "�������� ����������������",
     "Sortera timers",
-    "Sortare timere",
+    "Sortare timer-e",
     "A beprogramozott felv�telek elrendez�se",
     "Ordenar gravacions programades",
     "���������� ��������",
@@ -2742,7 +2742,7 @@ const tI18nPhrase Phrases[] = {
     "Gracaciones en directorios",
     "������� ��������",
     "Kataloger f�r inspelningar",
-    "Directoare inregistrari",
+    "Directoare �nregistr�ri",
     "Felv�telek list�ja",
     "Gravacions en subcarpetes",
     "�������� �������� �������",
@@ -2762,7 +2762,7 @@ const tI18nPhrase Phrases[] = {
     "Tiempo hasta exploraci�n EPG (h)",
     "������ ����� ������� EPG �� ����",
     "EPG s�kning timeout",
-    "Timeout EPG",
+    "Interval achizi�ie EPG (h)",
     "Fennmaradt id� az EPG-g (h)",
     "M�xim d'Hores a cercar per la Guia",
     "�������� ������������ �������� (�)",
@@ -2782,7 +2782,7 @@ const tI18nPhrase Phrases[] = {
     "Nivel para arreglar EPG",
     "������ ��������� ������ EPG",
     "Niv� f�r EPG bugfix",
-    "Nivel corectie EPG",
+    "Nivel corec�ie EPG",
     "EPG hibaelh�r�t�s",
     "Nivell de correcci� de la Guia",
     "������� ��������� ������",
@@ -2802,7 +2802,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Visa gammal info (min)",
-    "",// TODO
+    "Date EPG expirate cel mult (min)",
     "",// TODO
     "",// TODO
     "�������� ���������� ������ (���)",
@@ -2822,7 +2822,7 @@ const tI18nPhrase Phrases[] = {
     "Ajustar reloj de sistema",
     "����������� ���� ����������",
     "St�ll in systemtid",
-    "Seteaza ceasul sistem",
+    "Potrive�te ceasul sistem",
     "Az id� be�ll�t�sa",
     "Ajustar l'hora del sistema",
     "���������� ��������� �����",
@@ -2842,7 +2842,7 @@ const tI18nPhrase Phrases[] = {
     "Transponder para reloj de sistema",
     "������������ ����������� ����",
     "Anv�nd klockan fr�n transponder",
-    "Preia ceasul din transponder",
+    "Preia ora din transponder",
     "Id�h�z tartoz� Transponder",
     "Usar el temps del m�ltiplex",
     "������������ ����� ������������",
@@ -2862,7 +2862,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Limbi preferate",
     "",// TODO
     "",// TODO
     "�������������� �����",
@@ -2882,7 +2882,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Limba preferat�",
     "",// TODO
     "",// TODO
     "������",
@@ -2902,7 +2902,7 @@ const tI18nPhrase Phrases[] = {
     "Primer interface DVB",
     "����� DVB �����",
     "Prim�r DVB enhet",
-    "Placa DVB primara",
+    "Dispozitiv DVB primar",
     "Els� DVB interface",
     "Tarja DVB prim�ria",
     "�������� DVB-����������",
@@ -2922,7 +2922,7 @@ const tI18nPhrase Phrases[] = {
     "Formato V�deo",
     "����� ������",
     "Video format",
-    "Format Video",
+    "Format video",
     "Video form�tum",
     "Format del v�deo",
     "������ �����",
@@ -2942,7 +2942,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Actualizare canale",
     "",// TODO
     "",// TODO
     "��������� ��������� �������",
@@ -2962,7 +2962,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "doar numele",
     "",// TODO
     "",// TODO
     "������ ��������",
@@ -2982,7 +2982,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "nume si PID-uri",
     "",// TODO
     "",// TODO
     "�������� � PID�",
@@ -3002,7 +3002,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ad�ugare canale noi",
     "",// TODO
     "",// TODO
     "����� ������",
@@ -3022,7 +3022,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ad�ugare transpondere noi",
     "",// TODO
     "",// TODO
     "���. ������������",
@@ -3042,7 +3042,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
-    "SLOF (MHz)",
+    "Frecven�� comutare band�, SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
     "������� ������������ (SLOF) (���)",
@@ -3062,7 +3062,7 @@ const tI18nPhrase Phrases[] = {
     "Frecuencia baja LNB (MHz)",
     "���� LNB-��������� (MHz)",
     "Undre LNB frekvens (MHz)",
-    "Frecvnta LO LNB (Mhz)",
+    "Frecvn�� LNB inferioar� (Mhz)",
     "Als� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB baixa (MHz)",
     "������ ������� ���������� (���)",
@@ -3082,7 +3082,7 @@ const tI18nPhrase Phrases[] = {
     "Frecuencia alta LNB (MHz)",
     "��� LNB-��������� (MHz)",
     "�vre LNB frekvens (MHz)",
-    "Feecventa HI LNB (MHz)",
+    "Frecvn�� LNB superioar� (MHz)",
     "Fels� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB alta (MHz)",
     "������� ������� ���������� (���)",
@@ -3102,7 +3102,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizar DiSEqC",
     "������������ DiSEqC",
     "Anv�nd DiSEqC",
-    "Utilizez DiSEqC",
+    "Utilizare DiSEqC",
     "DiSEqC haszn�lata",
     "Utilitzar DiSEqC",
     "������������ DiSEqC",
@@ -3122,7 +3122,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
-    "Setare acces conditional",
+    "CICAM DVB",
     "CICAM DVB",
     "Acc�s condicional CICAM",
     "CAM-������ DVB",
@@ -3142,7 +3142,7 @@ const tI18nPhrase Phrases[] = {
     "Comenzar grabaci�n antes (min)",
     "��������� ������ ���� ���� (�����)",
     "Marginal f�r start (min)",
-    "Margine la pornire (min)",
+    "Marj� la pornire (min)",
     "Id�eltol�d�s a kezd�sn�l (min)",
     "Marge d'inici de gravaci� (min)",
     "���������� ������ ������ (���)",
@@ -3162,7 +3162,7 @@ const tI18nPhrase Phrases[] = {
     "Cortar grabaci�n despu�s (min)",
     "��������� ������ ��� ����� (�����)",
     "Marginal f�r stopp (min)",
-    "Margine la oprire (min)",
+    "Marj� la oprire (min)",
     "Id�eltol�d�s a befejez�sn�l",
     "Marge de fi de gravaci� (min)",
     "������������ ��������� ������ (���)",
@@ -3182,7 +3182,7 @@ const tI18nPhrase Phrases[] = {
     "L�mite primario",
     "�������� ����",
     "Prim�r gr�ns",
-    "Limita Primara",
+    "Limit� primar�",
     "Prim�r-hat�r",
     "L�mit primari",
     "���. ��������� ������� ���. ����������",
@@ -3202,7 +3202,7 @@ const tI18nPhrase Phrases[] = {
     "Prioridad predefinida",
     "�������������",
     "Normal prioritet",
-    "Prioritate implicita",
+    "Prioritate implicit�",
     "Default priority",
     "Prioritat per defecte",
     "��������� ������� �� ���������",
@@ -3222,7 +3222,7 @@ const tI18nPhrase Phrases[] = {
     "Duraci�n predefinida",
     "�������������� �������� ��������� (������)",
     "Normal livstid (dagar)",
-    "Durata predefinita",
+    "Timp de p�strare predefinit (zile)",
     "Default �lettartam",
     "Durada predefinida",
     "���� �������� ������ �� ��������� (�)",
@@ -3242,7 +3242,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "������������� ������������",
     "Prioritet f�r direktinspelning",
-    "",// TODO
+    "Prioritate pauz�",
     "Sz�net priorit�s",
     "Prioritat de la pausa",
     "��������� ����������� ���������",
@@ -3262,7 +3262,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������� �����������",
     "Livstid f�r direktinspelning (dagar)",
-    "",// TODO
+    "P�strarea emisiunilor 'pauzate' (zile)",
     "Sz�net �lettartama",
     "Durada de la pausa (d)",
     "�������� ����������� ��������� (�)",
@@ -3282,7 +3282,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizar nombre de episodo",
     "����� �������� ����������",
     "Anv�nd episodnamn",
-    "Utilizeaza numele episodului",
+    "Utilizeaz� numele episodului",
     "Epiz�dn�v felhaszn�l�sa",
     "Utilitzar el nom de l'episodi",
     "������������ ����� �� ��������",
@@ -3302,7 +3302,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Utilizeaz� VPS",
     "",// TODO
     "",// TODO
     "������������ ������� VPS",
@@ -3322,7 +3322,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Marj� de timp la utilizare VPS (s)",
     "",// TODO
     "",// TODO
     "�������� ����� VPS (���)",
@@ -3342,7 +3342,7 @@ const tI18nPhrase Phrases[] = {
     "Marcar grabaciones instant�neas",
     "������� ��������� ��������",
     "M�rk direktinspelning",
-    "Inregistrare imediata",
+    "Marcheaz� �nregistrare imediat�",
     "Direktfelv�tel megjel�l�se",
     "Marcar gravaci� instant�nia",
     "�������� ��������� ������� ������",
@@ -3362,7 +3362,7 @@ const tI18nPhrase Phrases[] = {
     "Nombrar grabaciones instant�neas",
     "�������� ��������� ��������",
     "Namnge direktinspelning",
-    "Nume inregistrare imediata",
+    "Nume �nregistrare imediat�",
     "Direktfelv�tel megnevez�se",
     "Anomenar gravacions instant�nies",
     "����� ���������� ������ �������",
@@ -3382,7 +3382,7 @@ const tI18nPhrase Phrases[] = {
     "Tiempo de grabaci�n instant�nea (min)",
     "�������� ��������� �������� (�����)",
     "Direktinspelning l�ngd (min)",
-    "Timpul de inregistarea imediata (min)",
+    "Timpul de �nregistare imediat� (min)",
     "Felv�tel id�tartama",
     "Temps de gravaci� instant�nia (min)",
     "������������ ������ ������ (���)",
@@ -3402,7 +3402,7 @@ const tI18nPhrase Phrases[] = {
     "Grabar sonido Dolby Digital",
     "������� ��� Dolby Digital ����",
     "Spela in ljudet med Dolby Digital",
-    "Inregistreaza Dolby Digital",
+    "�nregistreaz� Dolby Digital",
     "Dolby Digit�l felv�tel",
     "Gravar el so en Dolby Digital",
     "���������� ���� Dolby Digital",
@@ -3422,7 +3422,7 @@ const tI18nPhrase Phrases[] = {
     "Tama�o m�x. de fichero (MB)",
     "������� ������� ������� (MB)",
     "Maximal filstorlek f�r inspelning (MB)",
-    "Dimensiune maxima a fisierului video (MB)",
+    "Dimensiune maxim� a fi�ierului video (MB)",
     "Max. video File-terjedelem (MB)",
     "Mida m�xima de l'arxiu (MB)",
     "����. ������ ���������� (��)",
@@ -3442,7 +3442,7 @@ const tI18nPhrase Phrases[] = {
     "Quebrar ficheros",
     "����������� �������������� �������",
     "Dela upp redigerade filer",
-    "Separare fisiere editate",
+    "Separare fi�iere montate",
     "Feldolgozott File-k feloszt�sa",
     "Separar arxius",
     "������ ����������������� �����",
@@ -3462,7 +3462,7 @@ const tI18nPhrase Phrases[] = {
     "Modo multi-velocidad",
     "������� ��������� ���������",
     "Multispeed mode",
-    "Mod multi-rata",
+    "Mod multi-vitez�",
     "MultiSpeed funkci�",
     "Mode de multivelocitat",
     "��������������� �����",
@@ -3482,7 +3482,7 @@ const tI18nPhrase Phrases[] = {
     "Mostrar modo de replay",
     "������� ���������� ������������",
     "Visa uppspelnings l�ge",
-    "Afiseaza modul de redare",
+    "Afi�eaz� redarea",
     "Lej�tsz�s felt�ntet�se",
     "Mostrar mode de reproducci�",
     "���������� ����� ���������������", // ???
@@ -3502,7 +3502,7 @@ const tI18nPhrase Phrases[] = {
     "Continuar ID",
     "ID ������������",
     "�teruppta ID",
-    "Resume ID",// TODO
+    "Identificator continuare",
     "Lej�tsz�s ID",
     "ID de Continuar",
     "ID ���������������", // ???
@@ -3522,7 +3522,7 @@ const tI18nPhrase Phrases[] = {
     "Tiempo m�nimo pausa (min)",
     "��������� ������ ���������� (�����)",
     "Minsta h�ndelse-pause (min)",
-    "MinEventTimeout (min)",
+    "Durat� minim� emisiuni (min)",
     "Min. esem�ny sz�net (min)",
     "Temps m�nim en pausa (min)",
     "���. ����� �������� ������� (���)",
@@ -3542,7 +3542,7 @@ const tI18nPhrase Phrases[] = {
     "Tiempo m�nimo inactividad (min)",
     "��������� ������ �������� (�����)",
     "Minsta an�ndar-inaktivitet (min)",
-    "Durata minima de inactivitate (min)",
+    "Durata minim� de inactivitate (min)",
     "Min. kezel�si aktivit�s (min)",
     "Temps m�nim d'inactivitat (min)",
     "���. ����� �������� ����� (���)",
@@ -3582,7 +3582,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "������� ������� (�)",
     "",// TODO
-    "",// TODO
+    "Interval zapping (s)",
     "",// TODO
     "",// TODO
     "�������� ������������ ������ (���)",
@@ -3623,7 +3623,7 @@ const tI18nPhrase Phrases[] = {
     "LunMarMieJueVieSabDom",
     "������������������K��",
     "M�nTisOnsTorFreL�rS�n",
-    "LunMarMieJoiVinSimDum",
+    "LunMarMieJoiVinS�mDum",
     "H�tKedSzeCs�P�nSzoVas",
     "Dl Dm Dc Dj Dv Ds Dg ",
     "��ݲ�������ҿ����Ѳ��",
@@ -3644,7 +3644,7 @@ const tI18nPhrase Phrases[] = {
     " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
     " ��������������������������������0123456789-.#~abcdefghijklmnopqrstuvwxyz",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
+    " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~",
     " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
     " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~",
@@ -3665,7 +3665,7 @@ const tI18nPhrase Phrases[] = {
     "Aprendiendo teclas del telemando (%s)",
     "�������� �������� ������������� (%s)",
     "Inl�rning av fj�rrkontrollsknappar (%s)",
-    "Invatare taste telecomanda (%s)",
+    "�nv��are taste telecomand� (%s)",
     "T�vir�ny�t� betan�t�sa (%s)",
     "Aprenent les tecles del comandament a dist�ncia (%s)",
     "���� ����� ������ ������ (%s)",
@@ -3685,7 +3685,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 1: Detectando tipo de receptor",
     "���� 1: ��������� ������ RC",
     "Steg1: identifiering av RC kod",
-    "Faza 1: Detectie tip telecomanda",
+    "Faza 1: Detec�ia tipului telecomenzii",
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
     "Fase 1: Detectant el tipus de receptor",
     "��� 1: ����������� ���� ���� ������",
@@ -3705,7 +3705,7 @@ const tI18nPhrase Phrases[] = {
     "Pulse una tecla en el telemando",
     "����� ��� ������� ��� ���������������",
     "Tryck valfri tangent p� fj�rrkontrollen",
-    "Apasati o tasta pe telecomanda",
+    "Ap�sa�i o tast� pe telecomand�",
     "Nyomjon meg egy gombot a t�vir�ny�t�n",
     "Premeu qualsevol tecla del comandament",
     "������� ����� ������ �� ������",
@@ -3745,7 +3745,7 @@ const tI18nPhrase Phrases[] = {
     "No pulse ninguna tecla...",
     "��� ������� �������...",
     "Tryck inte p� n�gon knapp...",
-    "Nu apasati nicio tasta...",
+    "Nu ap�sa�i nici o tast�...",
     "Ne nyomjon meg gombot...",
     "No premeu cap tecla...",
     "�� ��������� ������...",
@@ -3765,7 +3765,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 2: Aprendiendo c�digos espec�ficos",
     "���� 2: �������� ����������� ��������",
     "Fas 2: Inl�rning av specifika knapp koder",
-    "Faza 2: Invatarea codurilor specifice tastelor",
+    "Faza 2: �nv��area codurilor anumitor taste",
     "M�sodik l�p�s: az egyes gombok betan�t�sa",
     "Fase 2: Aprenentantge de les funcions",
     "��� 2: ������� ����� ��������� ������",
@@ -3785,7 +3785,7 @@ const tI18nPhrase Phrases[] = {
     "Pulsar tecla para '%s'",
     "����� �� ������� ��� '%s'",
     "Tryck p� knappen f�r '%s'",
-    "Apasati tasta pentru '%s'",
+    "Ap�sa�i tasta pentru '%s'",
     "'%s' gomb megnyom�sa",
     "Premeu una tecla per '%s'",
     "������� ������ '%s'",
@@ -3805,7 +3805,7 @@ const tI18nPhrase Phrases[] = {
     "Pulse 'Arriba' para confirmar",
     "����� '����' ��� �������",
     "Tryck 'Upp' f�r att bekr�fta",
-    "Apsati 'Sus' pentru confirmare",
+    "Ap�sa�i 'Sus' pentru confirmare",
     "'Fel' megnyom�sa az elfogad�shoz",
     "Premeu 'Amunt' per confirmar",
     "������� '�����' ����� �����������",
@@ -3825,7 +3825,7 @@ const tI18nPhrase Phrases[] = {
     "Pulse 'Abajo' para confirmar",
     "����� '����' ��� ��������",
     "Tryck 'Ner' f�r att bekr�fta",
-    "Apasati jos pentru continuare",
+    "Ap�sa�i 'Jos' pentru continuare",
     "'Le' megnyom�sa a folytat�shoz",
     "Premeu 'Avall' per continuar",
     "������� '����' ����� ����������",
@@ -3845,7 +3845,7 @@ const tI18nPhrase Phrases[] = {
     "(Pulse 'Arriba' para retornar)",
     "(����� '����' ��� ���������",
     "(Tryck 'Upp' f�r att backa)",
-    "(Apsati 'Sus' pentru revenire)",
+    "(Ap�sa�i 'Sus' pentru revenire)",
     "(�Fel' megnyom�sa a visszat�r�shez)",
     "(Premeu 'Amunt' per retornar)",
     "(������� '�����' ����� ���������)",
@@ -3865,7 +3865,7 @@ const tI18nPhrase Phrases[] = {
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
     "(����� '����' ��� ���������� �������� ��������)",
     "(Tryck 'Ner' f�r att avsluta knapp definition)",
-    "(Apasati 'Jos' pentru terminare)",
+    "(Ap�sa�i 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
     "(Premeu 'Avall' per finalitzar l'aprenentatge)",
     "(������� '����' ����� ��������� ��������� ������)",
@@ -3885,7 +3885,7 @@ const tI18nPhrase Phrases[] = {
     "Pulse 'Menu' para saltarse esta tecla",
     "���� '�����' ��� ���������� ����� ��� ��������",
     "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
-    "",// TODO
+    "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�",
     "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
     "Premeu 'Men�' per obviar aquesta tecla",
     "(������� '����' ����� ���������� ������)",
@@ -3925,7 +3925,7 @@ const tI18nPhrase Phrases[] = {
     "Pulse 'Arriba' para guardar, 'Abajo' para anular",
     "'����' ����������, '����' �������",
     "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
-    "Apsati 'Sus' pentru salvare, 'Jos' pentru anulare",
+    "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
     "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
     "������� '�����' ����� ���������, '����' ����� ����������",
@@ -4006,7 +4006,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "��",
     "Ok",
-    "Ok",
+    "OK",
     "Ok",
     "D'acord",
     "Ok",
@@ -4026,7 +4026,7 @@ const tI18nPhrase Phrases[] = {
     "Retornar",
     "����",
     "Tillbaka",
-    "Inapoi",
+    "�napoi",
     "Vissza",
     "Retornar",
     "�����",
@@ -4046,7 +4046,7 @@ const tI18nPhrase Phrases[] = {
     "Izquierda",
     "��������",
     "V�nster",
-    "Stinga",
+    "St�nga",
     "Balra",
     "Esquerra",
     "������",
@@ -4086,7 +4086,7 @@ const tI18nPhrase Phrases[] = {
     "Rojo",
     "�������",
     "R�d",
-    "Rosu",
+    "Ro�u",
     "Piros",
     "Vermell",
     "�������",
@@ -4166,7 +4166,7 @@ const tI18nPhrase Phrases[] = {
     "Reproducir",
     "A����������",
     "Spela upp",
-    "",// TODO
+    "Redare",
     "Lej�tsz�s",
     "Reproduir",
     "���������������",
@@ -4186,7 +4186,7 @@ const tI18nPhrase Phrases[] = {
     "Pausa",
     "���������",
     "Pausa",
-    "",// TODO
+    "Pauz�",
     "Sz�net",
     "Pausa",
     "�����",
@@ -4206,7 +4206,7 @@ const tI18nPhrase Phrases[] = {
     "Parar",
     "T����",
     "Stoppa",
-    "",// TODO
+    "Stop",
     "Stop",
     "Aturar",
     "����",
@@ -4226,7 +4226,7 @@ const tI18nPhrase Phrases[] = {
     "Grabar",
     "E������",
     "Spela in",
-    "",// TODO
+    "�nregistrare",
     "Felvenni",
     "Gravar",
     "������",
@@ -4246,7 +4246,7 @@ const tI18nPhrase Phrases[] = {
     "Adelante r�pido",
     "�������� ������",
     "Snabbspolning fram�t",
-    "",// TODO
+    "Derulare �nainte",
     "El�re p�rgetni",
     "Endavant r�pidament",
     "������",
@@ -4266,7 +4266,7 @@ const tI18nPhrase Phrases[] = {
     "Atr�s r�pido",
     "�������� ����",
     "Snabbspolning bak�t",
-    "",// TODO
+    "Derulare �napoi",
     "Vissza p�rgetni",
     "Enrera r�pidament",
     "�����",
@@ -4286,7 +4286,7 @@ const tI18nPhrase Phrases[] = {
     "Corriente",
     "K�������",
     "P�/Av",
-    "Pornit",
+    "�nchidere",
     "Kikapcsolni",
     "Aturar",
     "���������",
@@ -4306,7 +4306,7 @@ const tI18nPhrase Phrases[] = {
     "Canal +",
     "������+",
     "Kanal+",
-    "",// TODO
+    "Canal+",
     "Csatorna+",
     "Canal +",
     "����� +",
@@ -4326,7 +4326,7 @@ const tI18nPhrase Phrases[] = {
     "Canal -",
     "������-",
     "Kanal-",
-    "",// TODO
+    "Canal-",
     "Csatorna-",
     "Canal -",
     "����� -",
@@ -4386,7 +4386,7 @@ const tI18nPhrase Phrases[] = {
     "Mudo",
     "�������",
     "Ljud Av",
-    "Mut(e)",
+    "F�r� sunet",
     "Csend",
     "En silenci",
     "��������� ����",
@@ -4447,7 +4447,7 @@ const tI18nPhrase Phrases[] = {
     "off",
     "�������",
     "av",
-    "",// TODO
+    "inactiv",
     "ki",
     "off",
     "����",
@@ -4467,7 +4467,7 @@ const tI18nPhrase Phrases[] = {
     "ninguno",
     "������",
     "ingen",
-    "",// TODO
+    "niciuna(ul)",
     "semmi",
     "cap",
     "������",
@@ -4487,7 +4487,7 @@ const tI18nPhrase Phrases[] = {
     "auto",
     "��������",
     "automatisk",
-    "",// TODO
+    "automat",
     "auto",
     "auto",
     "����",
@@ -4587,7 +4587,7 @@ const tI18nPhrase Phrases[] = {
     "Salta a: ",
     "����������: ",
     "Hopp: ",
-    "Salt: ",
+    "Salt la: ",
     "Ugr�s: ",
     "Salta a:",
     "�������: ",
@@ -4627,7 +4627,7 @@ const tI18nPhrase Phrases[] = {
     " Parar reproduci�n",
     " ����� ������������",
     " Avsluta uppspelning",
-    " Opreste redare",
+    " Opre�te redarea",
     " Lej�tsz�st befejzni",
     " Aturar la reproducci�",
     " ���������� ���������������",
@@ -4647,7 +4647,7 @@ const tI18nPhrase Phrases[] = {
     " Parar grabaci�n ",
     " ����� ������� ",
     " Avsluta inspelning ",
-    " Opreste inregistrarea ",
+    " Opre�te �nregistrarea ",
     " Felv�telt befejezni ",
     " Aturar la gravaci� ",
     " ���������� ������ ",
@@ -4667,7 +4667,7 @@ const tI18nPhrase Phrases[] = {
     " Anular modificaci�n ",
     " ������� ������������",
     " Avbryt redigering",
-    " Opreste editare",
+    " Opre�te montajul �nregistr�rii",
     " V�g�st megszak�tani",
     " Cancel�lar l'edici� ",
     " �������� ������ ������",
@@ -4687,7 +4687,7 @@ const tI18nPhrase Phrases[] = {
     "Cambio al interface DVB primario...",
     "� ����� DVB ����� �������...",
     "Byter prim�r DVB enhet...",
-    "Comuta interfata primara DVB...",
+    "Comut dispozitiv DVB primar...",
     "Prim�r Interface �tkapcsolva...",
     "Canviant a la interf�cie DVB prim�ria...",
     "����� ��������� DVB-����������...",
@@ -4707,7 +4707,7 @@ const tI18nPhrase Phrases[] = {
     "Arriba/Abajo para el nuevo lugar - OK para mover",
     "����/���� ��� ��� ����. ���� ��",
     "Upp/Ner f�r ny plats - OK f�r att flytta",
-    "Sus/Jos pentru noua locatie - OK pentru a muta",
+    "Sus/Jos pentru noua loca�ie - OK pentru a muta",
     "Fel/Le egy uj opci��rt - azt�n OK",
     "Amunt/Avall per una nova localitzaci� - OK per moure",
     "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\"",
@@ -4727,7 +4727,7 @@ const tI18nPhrase Phrases[] = {
     "Proceso modificaci�n iniciado",
     "���� ������������",
     "Redigering startad",
-    "Procesul de editare a inceput",
+    "Montajul �nregistr�rii a �nceput",
     "V�g�s elind�tva",
     "Proc�s d'edici� iniciat",
     "����� ������ ������",
@@ -4747,7 +4747,7 @@ const tI18nPhrase Phrases[] = {
     "Proceso de modificaci�n terminado",
     "� ����������� ��������",
     "Redigering avslutad",
-    "Procesul de editare s-a terminat",
+    "Montajul �nregistr�rii s-a terminat",
     "V�g�s befejezve",
     "Proc�s d'edici� finalitzat",
     "������ �������",
@@ -4767,7 +4767,7 @@ const tI18nPhrase Phrases[] = {
     "Modificaci�n ha fallado!",
     "� ����������� �������!",
     "Redigeringsprocessen misslyckades",
-    "Proces de editare nereusit",
+    "Montajul �nregistr�rii a e�uat",
     "V�g�s sikertelen!",
     "Proc�s d'edici� fallit!",
     "������ �� ����� ������� ������!",
@@ -4787,7 +4787,7 @@ const tI18nPhrase Phrases[] = {
     "buscando grabaciones...",
     "������� ��������...",
     "S�ker igenom inspelningarna...",
-    "Caut inregistrari...",
+    "Caut �nregistr�ri...",
     "Felvett ad�sok b�ng�sz�se...",
     "cercant gravacions...",
     "������������ �������...",
@@ -4807,7 +4807,7 @@ const tI18nPhrase Phrases[] = {
     "Emisi�n en directo parada...",
     "��������� �������� �������",
     "Pausar direktinspelningen",
-    "",// TODO
+    "Trec �n pauz� emisiunea transmis�...",
     "Az �l� ad�s meg�ll�tva...",
     "Pausa d'emissi� en directe...",
     "����� ����������� ���������...",
@@ -4827,7 +4827,7 @@ const tI18nPhrase Phrases[] = {
     "Este plugin no admite configuraci�n",
     "���� �� ����� ��� ���� �����������",
     "Den h�r modulen har inga parametrar",
-    "",// TODO
+    "Acest plugin nu se configureaz�!",
     "Ennek a plugin-nak nincs setup-parametere!",
     "Aquest plugin no admet configuraci�!",
     "������ �� ����� ���������� ���������!",
@@ -4847,7 +4847,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "VDR clasic",
     "",// TODO
     "",// TODO
     "������������",
@@ -4867,7 +4867,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Cons. ST:TNG",
     "",// TODO
     "",// TODO
     "ST:TNG ������",
diff --git a/libsi/util.h b/libsi/util.h
index db2a0a179..da188ad44 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 1.4 2004/10/16 09:59:48 kls Exp $
+ *   $Id: util.h 1.5 2004/10/23 14:22:40 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -140,7 +140,7 @@ namespace DVBTime {
 time_t getTime(unsigned char date_hi, unsigned char date_lo, unsigned char timehr, unsigned char timemi, unsigned char timese);
 time_t getDuration(unsigned char timehr, unsigned char timemi, unsigned char timese);
 inline unsigned char bcdToDec(unsigned char b) { return ((b >> 4) & 0x0F) * 10 + (b & 0x0F); }
-};
+}
 
 //taken and adapted from libdtv, (c) Rolf Hakenes
 class CRC32 {
diff --git a/remux.c b/remux.c
index 9b3b28646..e096f9cca 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.19 2004/10/16 09:11:52 kls Exp $
+ * $Id: remux.c 1.21 2004/10/24 09:25:33 kls Exp $
  */
 
 #include "remux.h"
@@ -491,8 +491,8 @@ int cRemux::Put(const uchar *Data, int Count)
          break;
       if (Data[i] != TS_SYNC_BYTE)
          break;
-      if (resultBuffer->Free() < IPACKS)
-         break;
+      if (resultBuffer->Free() < 2 * IPACKS)
+         break; // A cTS2PES might write one full packet and also a small rest
       int pid = GetPid(Data + i + 1);
       if (Data[i + 3] & 0x10) { // got payload
          if      (pid == vPid)              vTS2PES->ts_to_pes(Data + i);
@@ -597,7 +597,7 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
                Count += l;
                }
             else
-               resultSkipped = i;
+               resultSkipped = i + l;
             if (l > 0)
                i += l - 1; // the loop increments, too
             }
diff --git a/sections.c b/sections.c
index 64923367b..7c42a6efa 100644
--- a/sections.c
+++ b/sections.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.9 2004/10/16 13:45:02 kls Exp $
+ * $Id: sections.c 1.10 2004/10/24 11:05:12 kls Exp $
  */
 
 #include "sections.h"
 #include <unistd.h>
 #include "channels.h"
 #include "device.h"
+#include "thread.h"
 
 // --- cFilterHandle----------------------------------------------------------
 
@@ -185,7 +186,7 @@ void cSectionHandler::Action(void)
         if (poll(pfd, NumFilters, 1000) > 0) {
            bool DeviceHasLock = device->HasLock();
            if (!DeviceHasLock)
-              usleep(100000);
+              cCondWait::SleepMs(100);
            for (int i = 0; i < NumFilters; i++) {
                if (pfd[i].revents & POLLIN) {
                   cFilterHandle *fh = NULL;
diff --git a/thread.c b/thread.c
index 64b944b6c..144563df8 100644
--- a/thread.c
+++ b/thread.c
@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.32 2004/10/15 13:15:02 kls Exp $
+ * $Id: thread.c 1.35 2004/10/24 11:05:56 kls Exp $
  */
 
 #include "thread.h"
 #include <errno.h>
 #include <malloc.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <sys/resource.h>
 #include <sys/time.h>
@@ -33,6 +32,12 @@ cCondWait::~cCondWait()
   pthread_mutex_destroy(&mutex);
 }
 
+void cCondWait::SleepMs(int TimeoutMs)
+{
+  cCondWait w;
+  w.Wait(TimeoutMs);
+}
+
 bool cCondWait::Wait(int TimeoutMs)
 {
   pthread_mutex_lock(&mutex);
@@ -186,19 +191,10 @@ void cMutex::Unlock(void)
 
 // --- cThread ---------------------------------------------------------------
 
-// The signal handler is necessary to be able to use SIGIO to wake up any
-// pending 'select()' call.
-
-bool cThread::signalHandlerInstalled = false;
 bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(const char *Description)
 {
-  if (!signalHandlerInstalled) {
-     signal(SIGIO, SignalHandler);
-     signalHandlerInstalled = true;
-     }
-  running = false;
   parentTid = childTid = 0;
   description = NULL;
   SetDescription(Description);
@@ -221,11 +217,6 @@ void cThread::SetDescription(const char *Description, ...)
      }
 }
 
-void cThread::SignalHandler(int signum)
-{
-  signal(signum, SignalHandler);
-}
-
 void *cThread::StartThread(cThread *Thread)
 {
   Thread->childTid = pthread_self();
@@ -240,13 +231,11 @@ void *cThread::StartThread(cThread *Thread)
 
 bool cThread::Start(void)
 {
-  if (!running) {
-     running = true;
+  if (!childTid) {
      parentTid = pthread_self();
      pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this);
      pthread_detach(childTid); // auto-reap
      pthread_setschedparam(childTid, SCHED_RR, 0);
-     usleep(10000); // otherwise calling Active() immediately after Start() causes a "pure virtual method called" error
      }
   return true; //XXX return value of pthread_create()???
 }
@@ -277,21 +266,20 @@ bool cThread::Active(void)
 
 void cThread::Cancel(int WaitSeconds)
 {
-  running = false;
-  if (WaitSeconds > 0) {
-     for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
-         if (!Active())
-            return;
-         usleep(10000);
-         }
-     esyslog("ERROR: thread %ld won't end (waited %d seconds) - cancelling it...", childTid, WaitSeconds);
+  if (childTid) {
+     if (WaitSeconds > 0) {
+        for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
+            if (!Active())
+               return;
+            cCondWait::SleepMs(10);
+            }
+        esyslog("ERROR: thread %ld won't end (waited %d seconds) - cancelling it...", childTid, WaitSeconds);
+        }
+     if (childTid) {
+        pthread_cancel(childTid);
+        childTid = 0;
+        }
      }
-  pthread_cancel(childTid);
-}
-
-void cThread::WakeUp(void)
-{
-  pthread_kill(parentTid, SIGIO); // makes any waiting 'select()' call return immediately
 }
 
 bool cThread::EmergencyExit(bool Request)
@@ -451,7 +439,7 @@ int cPipe::Close(void)
            else if (ret == pid)
               break;
            i--;
-           usleep(100000);
+           cCondWait::SleepMs(100);
            }
      if (!i) {
         kill(pid, SIGKILL);
diff --git a/thread.h b/thread.h
index 7d9254c04..2cc623bf7 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.21 2004/10/15 13:16:39 kls Exp $
+ * $Id: thread.h 1.24 2004/10/24 11:00:32 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -22,6 +22,10 @@ class cCondWait {
 public:
   cCondWait(void);
   ~cCondWait();
+  static void SleepMs(int TimeoutMs);
+       ///< Creates a cCondWait object and uses it to sleep for TimeoutMs
+       ///< milliseconds, immediately giving up the calling thread's time
+       ///< slice and thus avoiding a "busy wait".
   bool Wait(int TimeoutMs = 0);
        ///< Waits at most TimeoutMs milliseconds for a call to Signal(), or
        ///< forever if TimeoutMs is 0.
@@ -71,16 +75,12 @@ class cThread {
 private:
   pthread_t parentTid, childTid;
   cMutex mutex;
-  bool running;
   char *description;
   static bool emergencyExitRequested;
-  static bool signalHandlerInstalled;
-  static void SignalHandler(int signum);
   static void *StartThread(cThread *Thread);
 protected:
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
-  void WakeUp(void);
   virtual void Action(void) = 0;
   void Cancel(int WaitSeconds = 0);
 public:
diff --git a/timers.c b/timers.c
index ab1690a6e..4c4ba2130 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.13 2004/07/17 12:46:27 kls Exp $
+ * $Id: timers.c 1.14 2004/10/24 14:56:55 kls Exp $
  */
 
 #include "timers.h"
@@ -456,6 +456,12 @@ void cTimer::OnOff(void)
 
 cTimers Timers;
 
+cTimers::cTimers(void)
+{
+  beingEdited = 0;;
+  lastSetEvents = 0;
+}
+
 cTimer *cTimers::GetTimer(cTimer *Timer)
 {
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
@@ -507,29 +513,35 @@ cTimer *cTimers::GetNextActiveTimer(void)
 
 void cTimers::SetEvents(void)
 {
+  if (time(NULL) - lastSetEvents < 5)
+     return;
   cSchedulesLock SchedulesLock(false, 100);
   const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
   if (Schedules) {
-     for (cTimer *ti = First(); ti; ti = Next(ti)) {
-         const cSchedule *Schedule = Schedules->GetSchedule(ti->Channel()->GetChannelID());
-         const cEvent *Event = NULL;
-         if (Schedule) {
-            //XXX what if the Schedule doesn't have any VPS???
-            int Match = tmNone;
-            for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
-                if (cRemote::HasKeys())
-                   return; // react immediately on user input
-                int m = ti->Matches(e);
-                if (m > Match) {
-                   Match = m;
-                   Event = e;
-                   if (Match == tmFull)
-                      break;
-                      //XXX what if there's another event with the same VPS time???
-                   }
-                }
+     if (!lastSetEvents || Schedules->Modified() >= lastSetEvents) {
+        for (cTimer *ti = First(); ti; ti = Next(ti)) {
+            const cSchedule *Schedule = Schedules->GetSchedule(ti->Channel()->GetChannelID());
+            if (Schedule) {
+               if (!lastSetEvents || Schedule->Modified() >= lastSetEvents) {
+                  const cEvent *Event = NULL;
+                  int Match = tmNone;
+                  for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
+                      if (cRemote::HasKeys())
+                         return; // react immediately on user input
+                      int m = ti->Matches(e);
+                      if (m > Match) {
+                         Match = m;
+                         Event = e;
+                         if (Match == tmFull)
+                            break;
+                            //XXX what if there's another event with the same VPS time???
+                         }
+                      }
+                  ti->SetEvent(Event);
+                  }
+               }
             }
-         ti->SetEvent(Event);
-         }
+        }
      }
+  lastSetEvents = time(NULL);
 }
diff --git a/timers.h b/timers.h
index ce4bff602..cbc6a92f4 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.7 2004/02/29 14:18:17 kls Exp $
+ * $Id: timers.h 1.8 2004/10/24 14:40:37 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -93,14 +93,16 @@ class cTimer : public cListObject {
 class cTimers : public cConfig<cTimer> {
 private:
   int beingEdited;
+  time_t lastSetEvents;
 public:
+  cTimers(void);
   cTimer *GetTimer(cTimer *Timer);
   cTimer *GetMatch(time_t t);
   cTimer *GetMatch(const cEvent *Event, int *Match = NULL);
   cTimer *GetNextActiveTimer(void);
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
-  void DecBeingEdited(void) { beingEdited--; }
+  void DecBeingEdited(void) { if (!--beingEdited) lastSetEvents = 0; }
   void SetEvents(void);
   };
 
diff --git a/transfer.c b/transfer.c
index a79143924..d4ccee208 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.17 2004/10/16 09:22:58 kls Exp $
+ * $Id: transfer.c 1.18 2004/10/23 13:35:08 kls Exp $
  */
 
 #include "transfer.h"
@@ -65,7 +65,7 @@ void cTransfer::Action(void)
         int Count;
         uchar *b = ringBuffer->Get(Count);
         if (b) {
-           if (Count > TRANSFERBUFSIZE * 2 / 3) {
+           if (ringBuffer->Available() > TRANSFERBUFSIZE * 9 / 10) {
               // If the buffer runs full, we have no chance of ever catching up
               // since the data comes in at the same rate as it goes out (it's "live").
               // So let's clear the buffer instead of suffering from permanent
diff --git a/vdr.c b/vdr.c
index 6d76f1783..033f186bc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.187 2004/10/17 11:50:21 kls Exp $
+ * $Id: vdr.c 1.190 2004/10/24 14:01:11 kls Exp $
  */
 
 #include <getopt.h>
@@ -64,6 +64,8 @@
 #define MANUALSTART       600 // seconds the next timer must be in the future to assume manual start
 #define CHANNELSAVEDELTA  600 // seconds before saving channels.conf after automatic modifications
 
+#define EXIT(v) { ExitCode = (v); goto Exit; }
+
 static int Interrupted = 0;
 
 static void SignalHandler(int signum)
@@ -85,17 +87,6 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
-#ifdef _CS_GNU_LIBPTHREAD_VERSION
-  // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
-  char LibPthreadVersion[128];
-  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
-     if (strstr(LibPthreadVersion, "NPTL")) {
-        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
-        return 2;
-        }
-     }
-#endif
-
   // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
   char *LangEnv;
   if ((LangEnv = getenv("LANG"))    != NULL && strcasestr(LangEnv, "utf") ||
@@ -133,6 +124,7 @@ int main(int argc, char *argv[])
   const char *Terminal = NULL;
   const char *Shutdown = NULL;
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
+  int ExitCode = 0;
 
   static struct option long_options[] = {
       { "audio",    required_argument, NULL, 'a' },
@@ -358,7 +350,7 @@ int main(int argc, char *argv[])
   // Load plugins:
 
   if (!PluginManager.LoadPlugins(true))
-     return 2;
+     EXIT(2);
 
   // Configuration data:
 
@@ -380,7 +372,7 @@ int main(int argc, char *argv[])
         Keys.Load(AddDirectory(ConfigDirectory, "remote.conf")) &&
         KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true)
         ))
-     return 2;
+     EXIT(2);
 
   cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
 
@@ -402,7 +394,7 @@ int main(int argc, char *argv[])
   // Initialize plugins:
 
   if (!PluginManager.InitializePlugins())
-     return 2;
+     EXIT(2);
 
   // Primary device:
 
@@ -425,12 +417,12 @@ int main(int argc, char *argv[])
         fprintf(stderr, "vdr: %s\n", msg);
         esyslog("ERROR: %s", msg);
         if (!cDevice::SetPrimaryDevice(1))
-           return 2;
+           EXIT(2);
         if (!cDevice::PrimaryDevice()) {
            const char *msg = "no primary device found - giving up!";
            fprintf(stderr, "vdr: %s\n", msg);
            esyslog("ERROR: %s", msg);
-           return 2;
+           EXIT(2);
            }
         }
      }
@@ -442,7 +434,7 @@ int main(int argc, char *argv[])
   // Start plugins:
 
   if (!PluginManager.StartPlugins())
-     return 2;
+     EXIT(2);
 
   // Skins:
 
@@ -498,18 +490,18 @@ int main(int argc, char *argv[])
 
   // Main program loop:
 
-  cOsdObject *Menu = NULL;
-  cOsdObject *Temp = NULL;
-  int LastChannel = -1;
-  int LastTimerChannel = -1;
-  int PreviousChannel[2] = { 1, 1 };
-  int PreviousChannelIndex = 0;
-  time_t LastChannelChanged = time(NULL);
-  time_t LastActivity = 0;
-  int MaxLatencyTime = 0;
-  bool ForceShutdown = false;
-  bool UserShutdown = false;
-  bool TimerInVpsMargin = false;
+  static cOsdObject *Menu = NULL;
+  static cOsdObject *Temp = NULL;
+  static int LastChannel = -1;
+  static int LastTimerChannel = -1;
+  static int PreviousChannel[2] = { 1, 1 };
+  static int PreviousChannelIndex = 0;
+  static time_t LastChannelChanged = time(NULL);
+  static time_t LastActivity = 0;
+  static int MaxLatencyTime = 0;
+  static bool ForceShutdown = false;
+  static bool UserShutdown = false;
+  static bool TimerInVpsMargin = false;
 
   while (!Interrupted) {
         // Handle emergency exits:
@@ -589,14 +581,9 @@ int main(int argc, char *argv[])
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
            // Assign events to timers:
-           if (time(NULL) - LastActivity > 10) {
-              static time_t LastSetEvents = 0;//XXX trigger by actual EPG data modification???
-              if (time(NULL) - LastSetEvents > 5) {
-                 Timers.SetEvents();
-                 LastSetEvents = time(NULL);
-                 }
-              }
-           time_t Now = time(NULL); // must do all following calls with the exact same time!
+           Timers.SetEvents();
+           // Must do all following calls with the exact same time!
+           time_t Now = time(NULL);
            // Process ongoing recordings:
            cRecordControls::Process(Now);
            // Start new recordings:
@@ -898,6 +885,9 @@ int main(int argc, char *argv[])
         }
   if (Interrupted)
      isyslog("caught signal %d", Interrupted);
+
+Exit:
+
   cRecordControls::Shutdown();
   cCutter::Stop();
   delete Menu;
@@ -924,5 +914,5 @@ int main(int argc, char *argv[])
      esyslog("emergency exit!");
      return 1;
      }
-  return 0;
+  return ExitCode;
 }

From 3038be2a6a849e726d6fe99236d5dc61b679198f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 1 Nov 2004 18:00:00 +0100
Subject: [PATCH 107/307] =?UTF-8?q?Version=201.3.15=20-=20Fixed=20some=20t?=
 =?UTF-8?q?ypos=20in=20the=20Makefile's=20'font'=20target=20(thanks=20to?=
 =?UTF-8?q?=20Uwe=20Hanke).=20-=20Added=20more=20checks=20and=20polling=20?=
 =?UTF-8?q?when=20getting=20frontend=20events=20(based=20on=20a=20patch=20?=
 =?UTF-8?q?=20=20from=20Werner=20Fink).=20-=20No=20longer=20explicitly=20w?=
 =?UTF-8?q?aiting=20for=20a=20tuner=20lock=20when=20switching=20channels?=
 =?UTF-8?q?=20=20=20(apparently=20setting=20"live"=20PIDs=20before=20the?=
 =?UTF-8?q?=20tuner=20is=20locked=20doesn't=20hurt).=20=20=20Moved=20the?=
 =?UTF-8?q?=20wait=20into=20cDevice::AttachReceiver()=20instead.=20-=20Imm?=
 =?UTF-8?q?ediately=20displaying=20the=20new=20channel=20info=20when=20swi?=
 =?UTF-8?q?tching=20channel=20groups.=20-=20Moved=20the=20main=20program?=
 =?UTF-8?q?=20loop=20variables=20further=20up=20to=20allow=20compilation?=
 =?UTF-8?q?=20with=20=20=20older=20compiler=20versions=20(thanks=20to=20Ma?=
 =?UTF-8?q?rco=20Schl=C3=BC=C3=9Fler=20for=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Now=20calling=20pthread=5Fcond=5Fbroadcast()=20in=20the=20de?=
 =?UTF-8?q?structor=20of=20cCondWait=20and=20=20=20cCondVar=20to=20make=20?=
 =?UTF-8?q?sure=20any=20sleepers=20will=20wake=20up=20(suggested=20by=20We?=
 =?UTF-8?q?rner=20Fink).=20=20=20Also=20using=20pthread=5Fcond=5Fbroadcast?=
 =?UTF-8?q?()=20instead=20of=20pthread=5Fcond=5Fsignal()=20in=20=20=20cCon?=
 =?UTF-8?q?dWait,=20in=20case=20there=20is=20more=20than=20one=20sleeper.?=
 =?UTF-8?q?=20-=20Making=20sure=20that=20timers=20and=20channels=20are=20o?=
 =?UTF-8?q?nly=20saved=20together,=20in=20a=20consistent=20=20=20manner=20?=
 =?UTF-8?q?(thanks=20to=20Mirko=20D=C3=B6lle=20for=20reporting=20a=20probl?=
 =?UTF-8?q?em=20with=20inconsistent=20=20=20channel=20and=20timer=20lists)?=
 =?UTF-8?q?.=20-=20Now=20handling=20the=20channel=20name,=20short=20name?=
 =?UTF-8?q?=20and=20provider=20separately.=20cChannel=20=20=20therefore=20?=
 =?UTF-8?q?has=20two=20new=20functions,=20ShortName()=20and=20Provider().?=
 =?UTF-8?q?=20ShortName()=20=20=20can=20be=20used=20to=20display=20a=20sho?=
 =?UTF-8?q?rt=20version=20of=20the=20name=20(in=20case=20such=20a=20versio?=
 =?UTF-8?q?n=20=20=20is=20available).=20The=20optional=20boolean=20paramet?=
 =?UTF-8?q?er=20of=20ShortName()=20can=20be=20set=20to=20=20=20true=20to?=
 =?UTF-8?q?=20make=20it=20return=20the=20name,=20if=20no=20short=20name=20?=
 =?UTF-8?q?is=20available.=20=20=20The=20sequence=20of=20'name'=20and=20's?=
 =?UTF-8?q?hort=20name'=20in=20the=20channels.conf=20file=20has=20been=20?=
 =?UTF-8?q?=20=20swapped=20(see=20man=20vdr(5)).=20-=20Added=20the=20'port?=
 =?UTF-8?q?al=20name'=20to=20cChannels=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler).=20-=20Fixed=20handling=20key=20codes=20that=20start?=
 =?UTF-8?q?=20with=200x1B=20in=20the=20KBD=20remote=20control=20code.=20-?=
 =?UTF-8?q?=20Now=20using=20qsort()=20to=20sort=20cListBase=20lists.=20For?=
 =?UTF-8?q?=20this,=20the=20virtual=20function=20=20=20cListObject::operat?=
 =?UTF-8?q?or<()=20has=20been=20replaced=20with=20cListObject::Compare().?=
 =?UTF-8?q?=20=20=20Plugins=20that=20implement=20derived=20cListObject=20c?=
 =?UTF-8?q?lasses=20may=20need=20to=20adjust=20their=20=20=20code.=20-=20T?=
 =?UTF-8?q?he=20"Channels"=20menu=20can=20now=20be=20sorted=20"by=20number?=
 =?UTF-8?q?"=20(default),=20"by=20name"=20and=20=20=20"by=20provider".=20W?=
 =?UTF-8?q?hile=20in=20the=20"Channels"=20menu,=20pressing=20the=20'0'=20k?=
 =?UTF-8?q?ey=20switches=20=20=20through=20these=20modes.=20-=20Fixed=20th?=
 =?UTF-8?q?e=20buffer=20size=20in=20cRecording::SortName().=20-=20Now=20di?=
 =?UTF-8?q?splaying=20the=20name=20of=20the=20remote=20control=20for=20whi?=
 =?UTF-8?q?ch=20the=20keys=20are=20being=20=20=20learned=20inside=20the=20?=
 =?UTF-8?q?menu=20to=20avoid=20overwriting=20the=20date/time=20in=20the=20?=
 =?UTF-8?q?'classic'=20=20=20skin=20(thanks=20to=20Oliver=20Endriss=20for?=
 =?UTF-8?q?=20reporting=20this=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  10 +++++
 HISTORY       |  39 +++++++++++++++++++
 MANUAL        |   4 +-
 Makefile      |   8 ++--
 channels.c    |  83 +++++++++++++++++++++++++++++++---------
 channels.conf |  36 +++++++++---------
 channels.h    |  16 +++++---
 config.c      |  12 +++---
 config.h      |   8 ++--
 device.c      |   9 ++++-
 device.h      |   6 ++-
 dvbdevice.c   |  55 +++++++++++++++++++--------
 dvbdevice.h   |   4 +-
 eit.c         |  12 +++---
 eitscan.c     |  19 ++++++----
 epg.c         |   6 +--
 epg.h         |   4 +-
 i18n.c        |  40 ++++++++++----------
 interface.c   |  44 +++++++++++----------
 menu.c        | 103 ++++++++++++++++++++++++++++++++++++++------------
 recording.c   |  12 +++---
 recording.h   |  10 ++---
 remote.c      |   5 +--
 sdt.c         |  26 ++++---------
 svdrp.c       |  10 ++---
 thread.c      |   6 ++-
 timers.c      |  40 ++++++++++++++------
 timers.h      |  29 ++++++++------
 tools.c       |  35 ++++++++++-------
 tools.h       |   6 ++-
 vdr.5         |  14 +++----
 vdr.c         |  38 ++++++++++---------
 32 files changed, 485 insertions(+), 264 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 86f1e2894..b869c6b58 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -258,6 +258,7 @@ Werner Fink <werner@suse.de>
  AC3 replay
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
  for suggesting to replace usleep() calls with a pthread_cond_timedwait() based wait
+ for suggesting to add more checks and polling when getting frontend events
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -380,6 +381,7 @@ Mirko D
  for reporting a bug when a timer records over midnight of a day that had a
  change in Daylight Saving Time
  for suggesting to avoid the external 'find' command to scan the video directory
+ for reporting a problem with inconsistent channel and timer lists
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -532,6 +534,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting some missing cStatus::MsgOsdTextItem() calls
  for reporting a missing "Editing process finished" message with skins
  for adding a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf'
+ for reporting a problem with the name of the remote control for which the keys are
+ being learned overwriting the date/time in the 'classic' skin
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1064,6 +1068,9 @@ Marco Schl
  should fail and all PIDs added so far should be deleted
  for fixing attaching a cPlayer to a cDevice, so that 'Operation not permited'
  errors don't occur any more
+ for reporting a problem with initialization of the main program loop variables
+ with older compiler versions
+ for adding the 'portal name' to cChannels
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1122,3 +1129,6 @@ Lucian Muresan <lucianm@users.sourceforge.net>
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
  with a plugin
+
+Uwe Hanke <uhanke@gmx.de>
+ for fixing some typos in the Makefile's 'font' target
diff --git a/HISTORY b/HISTORY
index f6d6c2064..d2c33d099 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3077,3 +3077,42 @@ Video Disk Recorder Revision History
   into account if the event has been "seen" within the past 30 seconds.
   This avoids shortly seeing the wrong events in the channel display when
   switching to a channel that hasn't been tuned to in a while.
+
+2004-11-01: Version 1.3.15
+
+- Fixed some typos in the Makefile's 'font' target (thanks to Uwe Hanke).
+- Added more checks and polling when getting frontend events (based on a patch
+  from Werner Fink).
+- No longer explicitly waiting for a tuner lock when switching channels
+  (apparently setting "live" PIDs before the tuner is locked doesn't hurt).
+  Moved the wait into cDevice::AttachReceiver() instead.
+- Immediately displaying the new channel info when switching channel groups.
+- Moved the main program loop variables further up to allow compilation with
+  older compiler versions (thanks to Marco Schl��ler for reporting this one).
+- Now calling pthread_cond_broadcast() in the desctructor of cCondWait and
+  cCondVar to make sure any sleepers will wake up (suggested by Werner Fink).
+  Also using pthread_cond_broadcast() instead of pthread_cond_signal() in
+  cCondWait, in case there is more than one sleeper.
+- Making sure that timers and channels are only saved together, in a consistent
+  manner (thanks to Mirko D�lle for reporting a problem with inconsistent
+  channel and timer lists).
+- Now handling the channel name, short name and provider separately. cChannel
+  therefore has two new functions, ShortName() and Provider(). ShortName()
+  can be used to display a short version of the name (in case such a version
+  is available). The optional boolean parameter of ShortName() can be set to
+  true to make it return the name, if no short name is available.
+  The sequence of 'name' and 'short name' in the channels.conf file has been
+  swapped (see man vdr(5)).
+- Added the 'portal name' to cChannels (thanks to Marco Schl��ler).
+- Fixed handling key codes that start with 0x1B in the KBD remote control code.
+- Now using qsort() to sort cListBase lists. For this, the virtual function
+  cListObject::operator<() has been replaced with cListObject::Compare().
+  Plugins that implement derived cListObject classes may need to adjust their
+  code.
+- The "Channels" menu can now be sorted "by number" (default), "by name" and
+  "by provider". While in the "Channels" menu, pressing the '0' key switches
+  through these modes.
+- Fixed the buffer size in cRecording::SortName().
+- Now displaying the name of the remote control for which the keys are being
+  learned inside the menu to avoid overwriting the date/time in the 'classic'
+  skin (thanks to Oliver Endriss for reporting this one).
diff --git a/MANUAL b/MANUAL
index 9855d0ee2..cc89252fd 100644
--- a/MANUAL
+++ b/MANUAL
@@ -24,7 +24,7 @@ Version 1.2
   Green   -           Language     New        New        Ins/Ovr       Rewind            Skip -60s
   Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s
   Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
-  0..9    Ch select   -            -          -          Numeric inp.  Exec cmd(2)       Editing
+  0..9    Ch select   -            Sort(3)    -          Numeric inp.  Exec cmd(2)       Editing
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
   are used to enter the data, and the Left key can be used to delete the last
@@ -71,6 +71,8 @@ Version 1.2
       has been enabled in the "Setup" menu. Otherwise the Blue button is used
       to "mark" a timer for moving.
   (2) See "Processing Recordings" below.
+  (3) In the "Channels" menu the '0' key switches the sort mode through "by number",
+      "by name" and "by provider".
 
 * Navigating through the On Screen Menus
 
diff --git a/Makefile b/Makefile
index 83f0c811d..d0a05334e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.68 2004/10/16 11:58:14 kls Exp $
+# $Id: Makefile 1.69 2004/10/30 11:51:09 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -80,9 +80,9 @@ all: vdr
 font: genfontfile\
       fontfix.c fontosd.c fontsml.c\
       fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
-      fontfix_iso8859_5.c fontosd_iso8859_5.c fontsml_iso8859_5.c\
-      fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c\
-      fontfix_iso8859_15.c fontosd_iso8859_15.c fontsml_iso8859_15.c
+      fontfix_iso8859-5.c fontosd_iso8859-5.c fontsml_iso8859-5.c\
+      fontfix_iso8859-7.c fontosd_iso8859-7.c fontsml_iso8859-7.c\
+      fontfix_iso8859-15.c fontosd_iso8859-15.c fontsml_iso8859-15.c
 	@echo "font files created."
 
 # Implicit rules:
diff --git a/channels.c b/channels.c
index ad8156d18..57986e358 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.28 2004/10/22 14:11:07 kls Exp $
+ * $Id: channels.c 1.30 2004/10/31 12:54:06 kls Exp $
  */
 
 #include "channels.h"
@@ -166,6 +166,10 @@ char *cChannel::buffer = NULL;
 
 cChannel::cChannel(void)
 {
+  name = strdup("");
+  shortName = strdup("");
+  provider = strdup("");
+  portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
   inversion    = INVERSION_AUTO;
   bandwidth    = BANDWIDTH_AUTO;
@@ -182,8 +186,11 @@ cChannel::cChannel(void)
 
 cChannel::cChannel(const cChannel &Channel)
 {
+  name = strdup("");
+  shortName = strdup("");
+  provider = strdup("");
+  portalName = strdup("");
   *this = Channel;
-  *name = 0;
   vpid         = 0;
   ppid         = 0;
   apids[0]     = 0;
@@ -219,10 +226,18 @@ cChannel::~cChannel()
             }
          }
       }
+  free(name);
+  free(shortName);
+  free(provider);
+  free(portalName);
 }
 
 cChannel& cChannel::operator= (const cChannel &Channel)
 {
+  name = strcpyrealloc(name, Channel.name);
+  shortName = strcpyrealloc(shortName, Channel.shortName);
+  provider = strcpyrealloc(provider, Channel.provider);
+  portalName = strcpyrealloc(portalName, Channel.portalName);
   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
   return *this;
 }
@@ -341,15 +356,29 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
      }
 }
 
-void cChannel::SetName(const char *Name)
+void cChannel::SetName(const char *Name, const char *ShortName, const char *Provider)
 {
   if (!isempty(Name) && strcmp(name, Name) != 0) {
      if (Number()) {
-        dsyslog("changing name of channel %d from '%s' to '%s'", Number(), name, Name);
+        dsyslog("changing name of channel %d from '%s,%s;%s' to '%s,%s;%s'", Number(), name, shortName, provider, Name, ShortName, Provider);
         modification |= CHANNELMOD_NAME;
         Channels.SetModified();
         }
-     strn0cpy(name, Name, MaxChannelName);
+     name = strcpyrealloc(name, Name);
+     shortName = strcpyrealloc(shortName, ShortName);
+     provider = strcpyrealloc(provider, Provider);
+     }
+}
+
+void cChannel::SetPortalName(const char *PortalName)
+{
+  if (!isempty(PortalName) && strcmp(portalName, PortalName) != 0) {
+     if (Number()) {
+        dsyslog("changing portal name of channel %d from '%s' to '%s'", Number(), portalName, PortalName);
+        modification |= CHANNELMOD_NAME;
+        Channels.SetModified();
+        }
+     portalName = strcpyrealloc(portalName, PortalName);
      }
 }
 
@@ -565,16 +594,21 @@ bool cChannel::StringToParameters(const char *s)
 
 const char *cChannel::ToText(const cChannel *Channel)
 {
-  char buf[MaxChannelName * 2];
-  const char *s = Channel->name;
-  if (strchr(s, ':'))
-     s = strreplace(strcpy(buf, s), ':', '|');
+  char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia
+  char *q = FullName;
+  q += sprintf(q, "%s", Channel->name);
+  if (!isempty(Channel->shortName))
+     q += sprintf(q, ",%s", Channel->shortName);
+  if (!isempty(Channel->provider))
+     q += sprintf(q, ";%s", Channel->provider);
+  *q = 0;
+  strreplace(FullName, ':', '|');
   free(buffer);
   if (Channel->groupSep) {
      if (Channel->number)
-        asprintf(&buffer, ":@%d %s\n", Channel->number, s);
+        asprintf(&buffer, ":@%d %s\n", Channel->number, FullName);
      else
-        asprintf(&buffer, ":%s\n", s);
+        asprintf(&buffer, ":%s\n", FullName);
      }
   else {
      char vpidbuf[32];
@@ -595,7 +629,7 @@ const char *cChannel::ToText(const cChannel *Channel)
      q = caidbuf;
      q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -619,7 +653,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            s = p;
            }
         }
-     strn0cpy(name, skipspace(s), MaxChannelName);
+     name = strcpyrealloc(name, skipspace(s));
+     strreplace(name, '|', ':');
      }
   else {
      groupSep = false;
@@ -717,7 +752,20 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
               caids[NumCaIds] = 0;
               }
            }
-        strn0cpy(name, namebuf, MaxChannelName);
+        strreplace(namebuf, '|', ':');
+
+        char *p = strchr(namebuf, ';');
+        if (p) {
+           *p++ = 0;
+           provider = strcpyrealloc(provider, p);
+           }
+        p = strchr(namebuf, ',');
+        if (p) {
+           *p++ = 0;
+           shortName = strcpyrealloc(shortName, p);
+           }
+        name = strcpyrealloc(name, namebuf);
+
         free(parambuf);
         free(sourcebuf);
         free(vpidbuf);
@@ -736,7 +784,6 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
      else
         return false;
      }
-  strreplace(name, '|', ':');
   return ok;
 }
 
@@ -878,13 +925,13 @@ int cChannels::Modified(void)
   return Result;
 }
 
-cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid)
+cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid, int Rid)
 {
   if (Transponder) {
-     dsyslog("creating new channel '%s' on %s transponder %d with id %d-%d-%d-%d", Name, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
+     dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
      cChannel *NewChannel = new cChannel(*Transponder);
      NewChannel->SetId(Nid, Tid, Sid, Rid);
-     NewChannel->SetName(Name);
+     NewChannel->SetName(Name, ShortName, Provider);
      Add(NewChannel);
      ReNumber();
      return NewChannel;
diff --git a/channels.conf b/channels.conf
index d7f7db0f4..acb25d5f9 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,4 +1,4 @@
-RTL,RTL Television;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
+RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
 ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
@@ -19,10 +19,10 @@ ORF 1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:130
 ORF 2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
-S RTL,Super RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
+Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
-NEUN LIVE,NEUN LIVE Television;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
+NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
@@ -44,23 +44,23 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-START,PREMIERE START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1702,1801,1722:10:133:2:0
-PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1702,1722,1801:11:133:2:0
-PREM 3,PREMIERE 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREM 4,PREMIERE 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREM 5,PREMIERE 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
-PREM 6,PREMIERE 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
-PREM 7,PREMIERE 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
-DISNEY,DISNEY CHANNEL;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
+PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
 :Premiere Direkt
-DIREKT,PREMIERE DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
+PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-B-UHSE,BEATE-UHSE.TV;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
-EROTIK,DIREKT EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
+BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
+DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
-Formel 1:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0
+PREMIERE SPORT 1,SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
+PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 Liberty TV.com;Maastricht Multimedia:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -94,7 +94,7 @@ Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5
 ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2054:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
-Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0
+Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0
diff --git a/channels.h b/channels.h
index a2530f10f..62b00c3cd 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.20 2004/10/22 14:09:47 kls Exp $
+ * $Id: channels.h 1.22 2004/10/31 12:54:26 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -89,9 +89,11 @@ class cChannel : public cListObject {
 private:
   static char *buffer;
   static const char *ToText(const cChannel *Channel);
-  enum { MaxChannelName = 64 }; // 63 chars + terminating 0!
+  char *name;
+  char *shortName;
+  char *provider;
+  char *portalName;
   int __BeginData__;
-  char name[MaxChannelName];
   int frequency; // MHz
   int source;
   int srate;
@@ -133,6 +135,9 @@ class cChannel : public cListObject {
   bool Parse(const char *s, bool AllowNonUniqueID = false);
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
+  const char *ShortName(bool OrName = false) const { return (OrName && isempty(shortName)) ? name : shortName; }
+  const char *Provider(void) const { return provider; }
+  const char *PortalName(void) const { return portalName; }
   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
   int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
   static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
@@ -171,7 +176,8 @@ class cChannel : public cListObject {
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
-  void SetName(const char *Name);
+  void SetName(const char *Name, const char *ShortName, const char *Provider);
+  void SetPortalName(const char *PortalName);
   void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
@@ -205,7 +211,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
       ///< Returns 0 if no channels have been modified, 1 if an automatic
       ///< modification has been made, and 2 if the user has made a modification.
       ///< Calling this function resets the 'modified' flag to 0.
-  cChannel *NewChannel(const cChannel *Transponder, const char *Name, int Nid, int Tid, int Sid, int Rid = 0);
+  cChannel *NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid, int Rid = 0);
   };
 
 extern cChannels Channels;
diff --git a/config.c b/config.c
index ef362f6df..36ecb1264 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.127 2004/05/16 12:43:55 kls Exp $
+ * $Id: config.c 1.128 2004/10/31 16:17:39 kls Exp $
  */
 
 #include "config.h"
@@ -193,19 +193,19 @@ cSetupLine::~cSetupLine()
   free(value);
 }
 
-bool cSetupLine::operator< (const cListObject &ListObject)
+int cSetupLine::Compare(const cListObject &ListObject) const
 {
   const cSetupLine *sl = (cSetupLine *)&ListObject;
   if (!plugin && !sl->plugin)
-     return strcasecmp(name, sl->name) < 0;
+     return strcasecmp(name, sl->name);
   if (!plugin)
-     return true;
+     return -1;
   if (!sl->plugin)
-     return false;
+     return 1;
   int result = strcasecmp(plugin, sl->plugin);
   if (result == 0)
      result = strcasecmp(name, sl->name);
-  return result < 0;
+  return result;
 }
 
 bool cSetupLine::Parse(char *s)
diff --git a/config.h b/config.h
index c3372a8b8..bc9052ae8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.201 2004/10/22 13:29:38 kls Exp $
+ * $Id: config.h 1.203 2004/10/31 16:17:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.14"
-#define VDRVERSNUM   10314  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.15"
+#define VDRVERSNUM   10315  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -185,7 +185,7 @@ class cSetupLine : public cListObject {
   cSetupLine(void);
   cSetupLine(const char *Name, const char *Value, const char *Plugin = NULL);
   virtual ~cSetupLine();
-  virtual bool operator< (const cListObject &ListObject);
+  virtual int Compare(const cListObject &ListObject) const;
   const char *Plugin(void) { return plugin; }
   const char *Name(void) { return name; }
   const char *Value(void) { return value; }
diff --git a/device.c b/device.c
index 5a57faf87..5a750ca0b 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.61 2004/10/23 10:15:31 kls Exp $
+ * $Id: device.c 1.62 2004/10/30 14:53:38 kls Exp $
  */
 
 #include "device.h"
@@ -23,6 +23,7 @@
 
 // The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -1
+#define TUNER_LOCK_TIMEOUT 5000 // ms
 
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
@@ -467,7 +468,7 @@ bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   return false;
 }
 
-bool cDevice::HasLock(void)
+bool cDevice::HasLock(int TimeoutMs)
 {
   return true;
 }
@@ -765,6 +766,10 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
      return false;
   if (Receiver->device == this)
      return true;
+  if (!HasLock(TUNER_LOCK_TIMEOUT)) {
+     esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
+     return false;
+     }
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
          for (int n = 0; n < MAXRECEIVEPIDS; n++) {
diff --git a/device.h b/device.h
index bec6bf5be..16ec2c09c 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.45 2004/09/24 14:07:22 kls Exp $
+ * $Id: device.h 1.46 2004/10/30 14:49:56 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -187,10 +187,12 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
-  virtual bool HasLock(void);//XXX PLUGINS.html
+  virtual bool HasLock(int TimeoutMs = 0);//XXX PLUGINS.html
          ///< Returns true if the device has a lock on the requested transponder.
          ///< Default is true, a specific device implementation may return false
          ///< to indicate that it is not ready yet.
+         ///< If TimeoutMs is not zero, waits for the given number of milliseconds
+         ///< before returning false.
   virtual bool HasProgramme(void);
          ///< Returns true if the device is currently showing any programme to
          ///< the user, either through replaying or live.
diff --git a/dvbdevice.c b/dvbdevice.c
index 3f38a0a46..fb87ae4bc 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.100 2004/10/24 11:06:37 kls Exp $
+ * $Id: dvbdevice.c 1.102 2004/10/30 14:53:30 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -35,7 +35,6 @@ extern "C" {
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
-#define TUNER_LOCK_TIMEOUT 5000 // ms
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -81,6 +80,7 @@ class cDvbTuner : public cThread {
   cMutex mutex;
   cCondVar locked;
   cCondWait newSet;
+  bool GetFrontendEvent(dvb_frontend_event &Event, int TimeoutMs = 0);
   bool SetFrontend(void);
   virtual void Action(void);
 public:
@@ -144,6 +144,36 @@ bool cDvbTuner::Locked(int TimeoutMs)
   return tunerStatus >= tsLocked;
 }
 
+bool cDvbTuner::GetFrontendEvent(dvb_frontend_event &Event, int TimeoutMs)
+{
+  if (TimeoutMs) {
+     struct pollfd pfd;
+     pfd.fd = fd_frontend;
+     pfd.events = POLLIN | POLLPRI;
+     do {
+        int stat = poll(&pfd, 1, TimeoutMs);
+        if (stat == 1)
+           break;
+        if (stat < 0) {
+           if (errno == EINTR)
+              continue;
+           esyslog("ERROR: frontend %d poll failed: %m", cardIndex);
+           }
+        return false;
+        } while (0);
+     }
+  do {
+     int stat = ioctl(fd_frontend, FE_GET_EVENT, &Event);
+     if (stat == 0)
+        return true;
+     if (stat < 0) {
+        if (errno == EINTR)
+           continue;
+        }
+     } while (0);
+  return false;
+}
+
 static unsigned int FrequencyToHz(unsigned int f)
 {
   while (f && f < 1000000)
@@ -260,18 +290,17 @@ bool cDvbTuner::SetFrontend(void)
 
 void cDvbTuner::Action(void)
 {
+  dvb_frontend_event event;
   active = true;
   while (active) {
         Lock();
         if (tunerStatus == tsSet) {
-           dvb_frontend_event event;
-           while (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0)
+           while (GetFrontendEvent(event))
                  ; // discard stale events
            tunerStatus = SetFrontend() ? tsTuned : tsIdle;
            }
         if (tunerStatus != tsIdle) {
-           dvb_frontend_event event;
-           while (ioctl(fd_frontend, FE_GET_EVENT, &event) == 0) {
+           while (GetFrontendEvent(event, 10)) {
                  if (event.status & FE_REINIT) {
                     tunerStatus = tsSet;
                     esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
@@ -306,7 +335,8 @@ void cDvbTuner::Action(void)
            }
         Unlock();
         // in the beginning we loop more often to let the CAM connection start up fast
-        newSet.Wait((tunerStatus == tsTuned || ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
+        if (tunerStatus != tsTuned)
+           newSet.Wait((ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
         }
 }
 
@@ -764,13 +794,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (EITScanner.UsesDevice(this))
      return true;
 
-  // Wait for a lock:
-
-  if (!dvbTuner->Locked(TUNER_LOCK_TIMEOUT)) {
-     esyslog("ERROR: no lock for channel %d on device %d", Channel->Number(), CardIndex() + 1);
-     return false;
-     }
-
   // PID settings:
 
   if (TurnOnLivePIDs) {
@@ -793,9 +816,9 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   return true;
 }
 
-bool cDvbDevice::HasLock(void)
+bool cDvbDevice::HasLock(int TimeoutMs)
 {
-  return dvbTuner ? dvbTuner->Locked() : false;
+  return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
 }
 
 void cDvbDevice::SetVolumeDevice(int Volume)
diff --git a/dvbdevice.h b/dvbdevice.h
index f7a4b925d..7dd6174d1 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.28 2004/06/19 08:51:33 kls Exp $
+ * $Id: dvbdevice.h 1.29 2004/10/30 14:48:27 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -64,7 +64,7 @@ class cDvbDevice : public cDevice {
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 public:
-  virtual bool HasLock(void);
+  virtual bool HasLock(int TimeoutMs = 0);
 
 // PID handle facilities
 
diff --git a/eit.c b/eit.c
index 8ff51d348..ed02cf281 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.98 2004/10/24 14:56:39 kls Exp $
+ * $Id: eit.c 1.100 2004/10/31 12:56:24 kls Exp $
  */
 
 #include "eit.h"
@@ -161,17 +161,17 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                     time_t now = time(NULL);
                     bool hit = SiEitEvent.getStartTime() <= now && now < SiEitEvent.getStartTime() + SiEitEvent.getDuration();
                     if (hit) {
+                       char linkName[ld->privateData.getLength() + 1];
+                       strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
                        cChannel *link = Channels.GetByChannelID(linkID);
                        if (link != channel) { // only link to other channels, not the same one
-                          char linkName[ld->privateData.getLength() + 1];
-                          strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
                           //fprintf(stderr, "Linkage %s %4d %4d %5d %5d %5d %5d  %02X  '%s'\n", hit ? "*" : "", channel->Number(), link ? link->Number() : -1, SiEitEvent.getEventId(), ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId(), ld->getLinkageType(), linkName);//XXX
                           if (link) {
                              if (Setup.UpdateChannels >= 1)
-                                link->SetName(linkName);
+                                link->SetName(linkName, "", "");
                              }
                           else if (Setup.UpdateChannels >= 3) {
-                             link = Channels.NewChannel(channel, linkName, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                             link = Channels.NewChannel(channel, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
                              //XXX patFilter->Trigger();
                              }
                           if (link) {
@@ -180,6 +180,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                              LinkChannels->Add(new cLinkChannel(link));
                              }
                           }
+                       else
+                          channel->SetPortalName(linkName);
                        }
                     }
                  }
diff --git a/eitscan.c b/eitscan.c
index 4e2bb4267..a1bff662e 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.22 2004/04/16 13:33:34 kls Exp $
+ * $Id: eitscan.c 1.23 2004/10/31 16:19:49 kls Exp $
  */
 
 #include "eitscan.h"
@@ -20,10 +20,10 @@ class cScanData : public cListObject {
   cChannel channel;
 public:
   cScanData(const cChannel *Channel);
-  virtual bool operator< (const cListObject &ListObject);
-  int Source(void) { return channel.Source(); }
-  int Transponder(void) { return channel.Transponder(); }
-  const cChannel *GetChannel(void) { return &channel; }
+  virtual int Compare(const cListObject &ListObject) const;
+  int Source(void) const { return channel.Source(); }
+  int Transponder(void) const { return channel.Transponder(); }
+  const cChannel *GetChannel(void) const { return &channel; }
   };
 
 cScanData::cScanData(const cChannel *Channel)
@@ -31,10 +31,13 @@ cScanData::cScanData(const cChannel *Channel)
   channel = *Channel;
 }
 
-bool cScanData::operator< (const cListObject &ListObject)
+int cScanData::Compare(const cListObject &ListObject) const
 {
-  cScanData *sd = (cScanData *)&ListObject;
-  return Source() < sd->Source() || Source() == sd->Source() && Transponder() < sd->Transponder();
+  const cScanData *sd = (const cScanData *)&ListObject;
+  int r = Source() - sd->Source();
+  if (r == 0)
+     r = Transponder() - sd->Transponder();
+  return r;
 }
 
 // --- cScanList -------------------------------------------------------------
diff --git a/epg.c b/epg.c
index 39b029e52..ffd61a439 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.20 2004/10/24 15:01:50 kls Exp $
+ * $Id: epg.c 1.21 2004/10/31 16:12:36 kls Exp $
  */
 
 #include "epg.h"
@@ -40,10 +40,10 @@ cEvent::~cEvent()
   free(description);
 }
 
-bool cEvent::operator< (const cListObject &ListObject)
+int cEvent::Compare(const cListObject &ListObject) const
 {
   cEvent *e = (cEvent *)&ListObject;
-  return startTime < e->startTime;
+  return startTime - e->startTime;
 }
 
 void cEvent::SetEventID(u_int16_t EventID)
diff --git a/epg.h b/epg.h
index 6c31049d8..3268b17ce 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.16 2004/10/24 13:56:00 kls Exp $
+ * $Id: epg.h 1.17 2004/10/31 16:17:10 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -40,7 +40,7 @@ class cEvent : public cListObject {
 public:
   cEvent(tChannelID ChannelID, u_int16_t EventID);
   ~cEvent();
-  virtual bool operator< (const cListObject &ListObject);
+  virtual int Compare(const cListObject &ListObject) const;
   tChannelID ChannelID(void) const { return channelID; }
   u_int16_t EventID(void) const { return eventID; }
   uchar TableID(void) const { return tableID; }
diff --git a/i18n.c b/i18n.c
index f325d5712..eeece5232 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.160 2004/10/23 13:57:38 kls Exp $
+ * $Id: i18n.c 1.161 2004/11/01 14:18:48 kls Exp $
  *
  * Translations provided by:
  *
@@ -3652,25 +3652,25 @@ const tI18nPhrase Phrases[] = {
     " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~",
   },
   // Learning keys:
-  { "Learning Remote Control Keys (%s)",
-    "Fernbedienungs-Codes lernen (%s)",
-    "Ucenje kod upravljalca (%s)",
-    "Apprendimento tasti unita` remota (%s)",
-    "Leren toetsen afstandsbediening (%s)",
-    "Aprender as teclas do telecomando (%s)",
-    "Apprentissage des codes de t�l�commande (%s)",
-    "L�re fjernkontrolltaster (%s)",
-    "Kaukos��timen opettaminen (%s)",
-    "Nauka kodu pilota (%s)",
-    "Aprendiendo teclas del telemando (%s)",
-    "�������� �������� ������������� (%s)",
-    "Inl�rning av fj�rrkontrollsknappar (%s)",
-    "�nv��are taste telecomand� (%s)",
-    "T�vir�ny�t� betan�t�sa (%s)",
-    "Aprenent les tecles del comandament a dist�ncia (%s)",
-    "���� ����� ������ ������ (%s)",
-    "U�enje k�da daljinskog upravlja�a (%s)",
-    "Kaugjuhtimispuldi �petamine (%s)",
+  { "Learning Remote Control Keys",
+    "Fernbedienungs-Codes lernen",
+    "Ucenje kod upravljalca",
+    "Apprendimento tasti unita` remota",
+    "Leren toetsen afstandsbediening",
+    "Aprender as teclas do telecomando",
+    "Apprentissage des codes de t�l�commande",
+    "L�re fjernkontrolltaster",
+    "Kaukos��timen opettaminen",
+    "Nauka kodu pilota",
+    "Aprendiendo teclas del telemando",
+    "�������� �������� �������������",
+    "Inl�rning av fj�rrkontrollsknappar",
+    "�nv��are taste telecomand�",
+    "T�vir�ny�t� betan�t�sa",
+    "Aprenent les tecles del comandament a dist�ncia",
+    "���� ����� ������ ������",
+    "U�enje k�da daljinskog upravlja�a",
+    "Kaugjuhtimispuldi �petamine",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
diff --git a/interface.c b/interface.c
index 06ba331ae..337374338 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.67 2004/05/02 10:57:06 kls Exp $
+ * $Id: interface.c 1.68 2004/11/01 14:23:28 kls Exp $
  */
 
 #include "interface.h"
@@ -76,23 +76,23 @@ bool cInterface::Confirm(const char *s, int Seconds, bool WaitForTimeout)
 
 bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
 {
-  DisplayMenu->SetItem(tr("Phase 1: Detecting RC code type"), 1, false, false);
-  DisplayMenu->SetItem(tr("Press any key on the RC unit"), 3, false, false);
+  DisplayMenu->SetItem(tr("Phase 1: Detecting RC code type"), 2, false, false);
+  DisplayMenu->SetItem(tr("Press any key on the RC unit"), 4, false, false);
   DisplayMenu->Flush();
   if (Remote->Initialize()) {
-     DisplayMenu->SetItem(tr("RC code detected!"), 3, false, false);
-     DisplayMenu->SetItem(tr("Do not press any key..."), 4, false, false);
+     DisplayMenu->SetItem(tr("RC code detected!"), 4, false, false);
+     DisplayMenu->SetItem(tr("Do not press any key..."), 5, false, false);
      DisplayMenu->Flush();
      sleep(3);
-     DisplayMenu->SetItem("", 3, false, false);
      DisplayMenu->SetItem("", 4, false, false);
+     DisplayMenu->SetItem("", 5, false, false);
 
-     DisplayMenu->SetItem(tr("Phase 2: Learning specific key codes"), 1, false, false);
+     DisplayMenu->SetItem(tr("Phase 2: Learning specific key codes"), 2, false, false);
      eKeys NewKey = kUp;
      while (NewKey != kNone) {
            char *Prompt;
            asprintf(&Prompt, tr("Press key for '%s'"), tr(cKey::ToString(NewKey)));
-           DisplayMenu->SetItem(Prompt, 3, false, false);
+           DisplayMenu->SetItem(Prompt, 4, false, false);
            free(Prompt);
            cRemote::Clear();
            DisplayMenu->Flush();
@@ -107,11 +107,11 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
                                    Keys.Del(last);
                                 }
                              break;
-                 case kDown: DisplayMenu->SetItem(tr("Press 'Up' to confirm"), 3, false, false);
-                             DisplayMenu->SetItem(tr("Press 'Down' to continue"), 4, false, false);
-                             DisplayMenu->SetItem("", 5, false, false);
+                 case kDown: DisplayMenu->SetItem(tr("Press 'Up' to confirm"), 4, false, false);
+                             DisplayMenu->SetItem(tr("Press 'Down' to continue"), 5, false, false);
                              DisplayMenu->SetItem("", 6, false, false);
                              DisplayMenu->SetItem("", 7, false, false);
+                             DisplayMenu->SetItem("", 8, false, false);
                              DisplayMenu->Flush();
                              for (;;) {
                                  Key = cRemote::Get(100);
@@ -120,7 +120,7 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
                                     return true;
                                     }
                                  else if (Key == kDown) {
-                                    DisplayMenu->SetItem("", 4, false, false);
+                                    DisplayMenu->SetItem("", 5, false, false);
                                     k = kNone; // breaks the outer for() loop
                                     break;
                                     }
@@ -139,17 +139,17 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
                  }
                }
            if (NewKey > kUp)
-              DisplayMenu->SetItem(tr("(press 'Up' to go back)"), 5, false, false);
+              DisplayMenu->SetItem(tr("(press 'Up' to go back)"), 6, false, false);
            else
-              DisplayMenu->SetItem("", 5, false, false);
+              DisplayMenu->SetItem("", 6, false, false);
            if (NewKey > kDown)
-              DisplayMenu->SetItem(tr("(press 'Down' to end key definition)"), 6, false, false);
+              DisplayMenu->SetItem(tr("(press 'Down' to end key definition)"), 7, false, false);
            else
-              DisplayMenu->SetItem("", 6, false, false);
+              DisplayMenu->SetItem("", 7, false, false);
            if (NewKey > kMenu)
-              DisplayMenu->SetItem(tr("(press 'Menu' to skip this key)"), 7, false, false);
+              DisplayMenu->SetItem(tr("(press 'Menu' to skip this key)"), 8, false, false);
            else
-              DisplayMenu->SetItem("", 7, false, false);
+              DisplayMenu->SetItem("", 8, false, false);
            }
      return true;
      }
@@ -168,9 +168,10 @@ void cInterface::LearnKeys(void)
       if (!known) {
          cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
          char Headline[256];
-         snprintf(Headline, sizeof(Headline), tr("Learning Remote Control Keys (%s)"), Remote->Name());
+         snprintf(Headline, sizeof(Headline), tr("Learning Remote Control Keys"));
          cRemote::Clear();
          DisplayMenu->SetTitle(Headline);
+         DisplayMenu->SetItem(Remote->Name(), 0, false, false);
          cRemote::SetLearning(Remote);
          bool rc = QueryKeys(Remote, DisplayMenu);
          cRemote::SetLearning(NULL);
@@ -179,8 +180,9 @@ void cInterface::LearnKeys(void)
             delete DisplayMenu;
             continue;
             }
-         DisplayMenu->SetItem(tr("Phase 3: Saving key codes"), 1, false, false);
-         DisplayMenu->SetItem(tr("Press 'Up' to save, 'Down' to cancel"), 3, false, false);
+         DisplayMenu->SetItem(Remote->Name(), 0, false, false);
+         DisplayMenu->SetItem(tr("Phase 3: Saving key codes"), 2, false, false);
+         DisplayMenu->SetItem(tr("Press 'Up' to save, 'Down' to cancel"), 4, false, false);
          for (;;) {
              eKeys key = GetKey();
              if (key == kUp) {
diff --git a/menu.c b/menu.c
index e3fe69a84..f5c3c6110 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.314 2004/10/17 10:28:27 kls Exp $
+ * $Id: menu.c 1.319 2004/11/01 13:49:40 kls Exp $
  */
 
 #include "menu.h"
@@ -223,6 +223,7 @@ class cMenuEditChannel : public cOsdMenu {
 private:
   cChannel *channel;
   cChannel data;
+  char name[256];
   void Setup(void);
 public:
   cMenuEditChannel(cChannel *Channel, bool New = false);
@@ -254,7 +255,8 @@ void cMenuEditChannel::Setup(void)
   Clear();
 
   // Parameters for all types of sources:
-  Add(new cMenuEditStrItem( tr("Name"),          data.name, sizeof(data.name), tr(FileNameChars)));
+  strn0cpy(name, data.name, sizeof(name));
+  Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name), tr(FileNameChars)));
   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
   Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
@@ -295,6 +297,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      if (Key == kOk) {
         if (Channels.HasUniqueChannelID(&data, channel)) {
+           data.name = strcpyrealloc(data.name, name);
            if (channel) {
               *channel = data;
               isyslog("edited channel %d %s", channel->Number(), data.ToText());
@@ -324,14 +327,23 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 // --- cMenuChannelItem ------------------------------------------------------
 
 class cMenuChannelItem : public cOsdItem {
+public:
+  enum eChannelSortMode { csmNumber, csmName, csmProvider };
 private:
+  static eChannelSortMode sortMode;
   cChannel *channel;
 public:
   cMenuChannelItem(cChannel *Channel);
+  static void SetSortMode(eChannelSortMode SortMode) { sortMode = SortMode; }
+  static void IncSortMode(void) { sortMode = eChannelSortMode((sortMode == csmProvider) ? csmNumber : sortMode + 1); }
+  virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
   cChannel *Channel(void) { return channel; }
+  static eChannelSortMode SortMode(void) { return sortMode; }
   };
 
+cMenuChannelItem::eChannelSortMode cMenuChannelItem::sortMode = csmNumber;
+
 cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
 {
   channel = Channel;
@@ -340,11 +352,28 @@ cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
   Set();
 }
 
+int cMenuChannelItem::Compare(const cListObject &ListObject) const
+{
+  cMenuChannelItem *p = (cMenuChannelItem *)&ListObject;
+  int r = -1;
+  if (sortMode == csmProvider)
+     r = strcoll(channel->Provider(), p->channel->Provider());
+  if (sortMode == csmName || r == 0)
+     r = strcoll(channel->Name(), p->channel->Name());
+  if (sortMode == csmNumber || r == 0)
+     r = channel->Number() - p->channel->Number();
+  return r;
+}
+
 void cMenuChannelItem::Set(void)
 {
   char *buffer = NULL;
-  if (!channel->GroupSep())
-     asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
+  if (!channel->GroupSep()) {
+     if (sortMode == csmProvider)
+        asprintf(&buffer, "%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
+     else
+        asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
+     }
   else
      asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->Name());
   SetText(buffer, false);
@@ -354,6 +383,7 @@ void cMenuChannelItem::Set(void)
 
 class cMenuChannels : public cOsdMenu {
 private:
+  void Setup(void);
   cChannel *GetChannel(int Index);
   void Propagate(void);
 protected:
@@ -371,11 +401,7 @@ class cMenuChannels : public cOsdMenu {
 cMenuChannels::cMenuChannels(void)
 :cOsdMenu(tr("Channels"), CHNUMWIDTH)
 {
-  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-      if (!channel->GroupSep() || *channel->Name())
-         Add(new cMenuChannelItem(channel), channel->Number() == cDevice::CurrentChannel());
-      }
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
+  Setup();
   Channels.IncBeingEdited();
 }
 
@@ -384,6 +410,28 @@ cMenuChannels::~cMenuChannels()
   Channels.DecBeingEdited();
 }
 
+void cMenuChannels::Setup(void)
+{
+  cChannel *currentChannel = GetChannel(Current());
+  if (!currentChannel)
+     currentChannel = Channels.GetByNumber(cDevice::CurrentChannel());
+  cMenuChannelItem *currentItem = NULL;
+  Clear();
+  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+      if (!channel->GroupSep() || cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber && *channel->Name()) {
+         cMenuChannelItem *item = new cMenuChannelItem(channel);
+         Add(item);
+         if (channel == currentChannel)
+            currentItem = item;
+         }
+      }
+  if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
+     Sort();
+  SetCurrent(currentItem);
+  SetHelp(tr("Edit"), tr("New"), tr("Delete"), cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber ? tr("Mark") : NULL);
+  Display();
+}
+
 cChannel *cMenuChannels::GetChannel(int Index)
 {
   cMenuChannelItem *p = (cMenuChannelItem *)Get(Index);
@@ -483,11 +531,14 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
     default:
          if (state == osUnknown) {
             switch (Key) {
+              case k0:      cMenuChannelItem::IncSortMode();
+                            Setup();
+                            break;
               case kOk:     return Switch();
               case kRed:    return Edit();
               case kGreen:  return New();
               case kYellow: return Delete();
-              case kBlue:   if (!HasSubMenu())
+              case kBlue:   if (!HasSubMenu() && cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber)
                                Mark();
                             break;
               default: break;
@@ -629,7 +680,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                           break;
                           }
                        if (!*data.file)
-                          strcpy(data.file, data.Channel()->Name());
+                          strcpy(data.file, data.Channel()->ShortName(true));
                        if (timer) {
                           if (memcmp(timer, &data, sizeof(data)) != 0) {
                              *timer = data;
@@ -639,7 +690,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                           if (addIfConfirmed)
                              Timers.Add(timer);
                           timer->Matches();
-                          Timers.Save();
+                          Timers.SetModified();
                           isyslog("timer %d %s (%s)", timer->Index() + 1, addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
                           }
@@ -664,7 +715,7 @@ class cMenuTimerItem : public cOsdItem {
   cTimer *timer;
 public:
   cMenuTimerItem(cTimer *Timer);
-  virtual bool operator< (const cListObject &ListObject);
+  virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
   cTimer *Timer(void) { return timer; }
   };
@@ -675,9 +726,9 @@ cMenuTimerItem::cMenuTimerItem(cTimer *Timer)
   Set();
 }
 
-bool cMenuTimerItem::operator< (const cListObject &ListObject)
+int cMenuTimerItem::Compare(const cListObject &ListObject) const
 {
-  return *timer < *((cMenuTimerItem *)&ListObject)->timer;
+  return timer->Compare(*((cMenuTimerItem *)&ListObject)->timer);
 }
 
 void cMenuTimerItem::Set(void)
@@ -747,7 +798,7 @@ eOSState cMenuTimers::OnOff(void)
         isyslog("timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
      else
         isyslog("timer %d %sactivated", timer->Index() + 1, timer->HasFlags(tfActive) ? "" : "de");
-     Timers.Save();
+     Timers.SetModified();
      }
   return osContinue;
 }
@@ -784,7 +835,7 @@ eOSState cMenuTimers::Delete(void)
         int Index = ti->Index();
         Timers.Del(ti);
         cOsdMenu::Del(Current());
-        Timers.Save();
+        Timers.SetModified();
         Display();
         isyslog("timer %d deleted", Index + 1);
         }
@@ -796,7 +847,7 @@ void cMenuTimers::Move(int From, int To)
 {
   Timers.Move(From, To);
   cOsdMenu::Move(From, To);
-  Timers.Save();
+  Timers.SetModified();
   Display();
   isyslog("timer %d moved to %d", From + 1, To + 1);
 }
@@ -918,7 +969,7 @@ cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel)
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
   char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->Name(), event->GetTimeString(), t, v, r, event->Title());
+  asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1556,7 +1607,7 @@ eOSState cMenuRecordings::Delete(void)
                     Timers.Del(timer);
                     isyslog("timer %d deleted", Index + 1);
                     }
-                 Timers.Save();
+                 Timers.SetModified();
                  }
               }
            else
@@ -2629,9 +2680,13 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     //XXX case kGreen:  return osEventNow;
     //XXX case kYellow: return osEventNext;
     case kOk:     if (group >= 0) {
-                     cChannel *channel = Channels.Get(Channels.GetNextNormal(group));
+                     channel = Channels.Get(Channels.GetNextNormal(group));
                      if (channel)
                         Channels.SwitchTo(channel->Number());
+                     withInfo = true;
+                     group = -1;
+                     Refresh();
+                     break;
                      }
                   return osEnd;
     default:      if ((Key & (k_Repeat | k_Release)) == 0) {
@@ -2730,7 +2785,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   if (!timer) {
      timer = new cTimer(true, Pause);
      Timers.Add(timer);
-     Timers.Save();
+     Timers.SetModified();
      asprintf(&instantId, cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
      }
   timer->SetPending(true);
@@ -2759,7 +2814,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         }
      else {
         Timers.Del(timer);
-        Timers.Save();
+        Timers.SetModified();
         if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName, Recording.Name());
         }
@@ -2829,7 +2884,7 @@ void cRecordControl::Stop(bool KeepInstant)
      if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && timer->StopTime() <= time(NULL))) {
         isyslog("deleting timer %d", timer->Index() + 1);
         Timers.Del(timer);
-        Timers.Save();
+        Timers.SetModified();
         }
      timer = NULL;
      cStatus::MsgRecording(device, NULL);
diff --git a/recording.c b/recording.c
index e33e23150..5a703db2d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.89 2004/07/17 11:22:29 kls Exp $
+ * $Id: recording.c 1.92 2004/11/01 14:04:47 kls Exp $
  */
 
 #include "recording.h"
@@ -335,7 +335,7 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
      name = strreplace(name, TIMERMACRO_EPISODE, Subtitle);
      if (Timer->IsSingleEvent()) {
         Timer->SetFile(name); // this was an instant recording, so let's set the actual data
-        Timers.Save();
+        Timers.SetModified();
         }
      }
   else if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
@@ -451,11 +451,11 @@ char *cRecording::StripEpisodeName(char *s)
   return s;
 }
 
-char *cRecording::SortName(void)
+char *cRecording::SortName(void) const
 {
   if (!sortBuffer) {
      char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
-     int l = strxfrm(NULL, s, 0);
+     int l = strxfrm(NULL, s, 0) + 1;
      sortBuffer = MALLOC(char, l);
      strxfrm(sortBuffer, s, l);
      free(s);
@@ -472,10 +472,10 @@ int cRecording::GetResume(void) const
   return resume;
 }
 
-bool cRecording::operator< (const cListObject &ListObject)
+int cRecording::Compare(const cListObject &ListObject) const
 {
   cRecording *r = (cRecording *)&ListObject;
-  return strcasecmp(SortName(), r->SortName()) < 0;
+  return strcasecmp(SortName(), r->SortName());
 }
 
 const char *cRecording::FileName(void) const
diff --git a/recording.h b/recording.h
index 88b90d3b1..184f49efe 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.31 2004/07/17 11:09:49 kls Exp $
+ * $Id: recording.h 1.32 2004/10/31 16:24:38 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -36,12 +36,12 @@ class cRecording : public cListObject {
 private:
   mutable int resume;
   mutable char *titleBuffer;
-  char *sortBuffer;
+  mutable char *sortBuffer;
   mutable char *fileName;
   mutable char *name;
   char *summary;
-  char *StripEpisodeName(char *s);
-  char *SortName(void);
+  static char *StripEpisodeName(char *s);
+  char *SortName(void) const;
   int GetResume(void) const;
 public:
   time_t start;
@@ -50,7 +50,7 @@ class cRecording : public cListObject {
   cRecording(cTimer *Timer, const char *Title, const char *Subtitle, const char *Summary);
   cRecording(const char *FileName);
   ~cRecording();
-  virtual bool operator< (const cListObject &ListObject);
+  virtual int Compare(const cListObject &ListObject) const;
   const char *Name(void) const { return name; }
   const char *FileName(void) const;
   const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
diff --git a/remote.c b/remote.c
index b435bc463..2d382e0b0 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.40 2004/05/28 14:19:52 kls Exp $
+ * $Id: remote.c 1.41 2004/10/31 14:05:12 kls Exp $
  */
 
 #include "remote.h"
@@ -265,7 +265,6 @@ void cKbdRemote::Action(void)
         if (Poller.Poll(100)) {
            uint64 Command = 0;
            uint i = 0;
-           int t0 = time_ms();
            while (active && i < sizeof(Command)) {
                  uchar ch;
                  int r = read(STDIN_FILENO, &ch, 1);
@@ -280,7 +279,7 @@ void cKbdRemote::Action(void)
                     // of their codes, so we'll need to wait some 100ms to see if
                     // there is more coming up - or whether this really is the 'ESC'
                     // key (if somebody knows how to clean this up, please let me know):
-                    if (Command == 0x1B && time_ms() - t0 < 100)
+                    if (Command == 0x1B && Poller.Poll(100))
                        continue;
                     if (Command) {
                        if (rawMode || !Put(Command)) {
diff --git a/sdt.c b/sdt.c
index 92d5a740c..8bb700928 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.12 2004/10/16 10:02:23 kls Exp $
+ * $Id: sdt.c 1.13 2004/10/31 12:10:20 kls Exp $
  */
 
 #include "sdt.h"
@@ -58,28 +58,16 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         {
                         char NameBuf[1024];
                         char ShortNameBuf[1024];
+                        char ProviderNameBuf[1024];
                         sd->serviceName.getText(NameBuf, ShortNameBuf, sizeof(NameBuf), sizeof(ShortNameBuf));
                         char *pn = compactspace(NameBuf);
                         char *ps = compactspace(ShortNameBuf);
-                        if (*NameBuf && *ShortNameBuf && strcmp(NameBuf, ShortNameBuf) != 0) {
-                           ps = ShortNameBuf + strlen(ShortNameBuf);
-                           *ps++ = ',';
-                           strcpy(ps, NameBuf);
-                           pn = ShortNameBuf;
-                           }
-                        if (*pn) {
-                           char ProviderNameBuf[1024];
-                           sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
-                           if (*ProviderNameBuf) {
-                              char *p = pn + strlen(pn);
-                              *p++ = ';';
-                              strcpy(p, ProviderNameBuf);
-                              }
-                           }
+                        sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
+                        char *pp = compactspace(ProviderNameBuf);
                         if (channel) {
                            channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            if (Setup.UpdateChannels >= 1)
-                              channel->SetName(pn);
+                              channel->SetName(pn, ps, pp);
                            // Using SiSdtService.getFreeCaMode() is no good, because some
                            // tv stations set this flag even for non-encrypted channels :-(
                            // The special value 0xFFFF was supposed to mean "unknown encryption"
@@ -87,7 +75,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            // channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
                            }
                         else if (*pn && Setup.UpdateChannels >= 3) {
-                           channel = Channels.NewChannel(Channel(), pn, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
+                           channel = Channels.NewChannel(Channel(), pn, ps, pp, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            patFilter->Trigger();
                            }
                         }
@@ -112,7 +100,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (SI::Loop::Iterator it; nrd->serviceLoop.getNext(Service, it); ) {
                      cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
                      if (!link && Setup.UpdateChannels >= 3) {
-                        link = Channels.NewChannel(Channel(), "NVOD", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
+                        link = Channels.NewChannel(Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
                         patFilter->Trigger();
                         }
                      if (link) {
diff --git a/svdrp.c b/svdrp.c
index 788b16824..eec6869c7 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.64 2004/10/17 10:28:47 kls Exp $
+ * $Id: svdrp.c 1.65 2004/10/31 10:09:53 kls Exp $
  */
 
 #include "svdrp.h"
@@ -529,7 +529,7 @@ void cSVDRP::CmdDELT(const char *Option)
         if (timer) {
            if (!timer->Recording()) {
               Timers.Del(timer);
-              Timers.Save();
+              Timers.SetModified();
               isyslog("timer %s deleted", Option);
               Reply(250, "Timer \"%s\" deleted", Option);
               }
@@ -915,7 +915,7 @@ void cSVDRP::CmdMODT(const char *Option)
               return;
               }
            *timer = t;
-           Timers.Save();
+           Timers.SetModified();
            isyslog("timer %d modified (%s)", timer->Index() + 1, timer->HasFlags(tfActive) ? "active" : "inactive");
            Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
            }
@@ -973,7 +973,7 @@ void cSVDRP::CmdNEWT(const char *Option)
         cTimer *t = Timers.GetTimer(timer);
         if (!t) {
            Timers.Add(timer);
-           Timers.Save();
+           Timers.SetModified();
            isyslog("timer %d added", timer->Index() + 1);
            Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
            return;
@@ -1057,7 +1057,7 @@ void cSVDRP::CmdUPDT(const char *Option)
            Timers.Add(timer);
            isyslog("timer %d added", timer->Index() + 1);
            }
-        Timers.Save();
+        Timers.SetModified();
         Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
         return;
         }
diff --git a/thread.c b/thread.c
index 144563df8..080be0e0d 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.35 2004/10/24 11:05:56 kls Exp $
+ * $Id: thread.c 1.36 2004/10/31 09:54:02 kls Exp $
  */
 
 #include "thread.h"
@@ -28,6 +28,7 @@ cCondWait::cCondWait(void)
 
 cCondWait::~cCondWait()
 {
+  pthread_cond_broadcast(&cond); // wake up any sleepers
   pthread_cond_destroy(&cond);
   pthread_mutex_destroy(&mutex);
 }
@@ -71,7 +72,7 @@ void cCondWait::Signal(void)
 {
   pthread_mutex_lock(&mutex);
   signaled = true;
-  pthread_cond_signal(&cond);
+  pthread_cond_broadcast(&cond);
   pthread_mutex_unlock(&mutex);
 }
 
@@ -84,6 +85,7 @@ cCondVar::cCondVar(void)
 
 cCondVar::~cCondVar()
 {
+  pthread_cond_broadcast(&cond); // wake up any sleepers
   pthread_cond_destroy(&cond);
 }
 
diff --git a/timers.c b/timers.c
index 4c4ba2130..38fbf3948 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.14 2004/10/24 14:56:55 kls Exp $
+ * $Id: timers.c 1.16 2004/10/31 16:41:30 kls Exp $
  */
 
 #include "timers.h"
@@ -95,12 +95,15 @@ cTimer& cTimer::operator= (const cTimer &Timer)
   return *this;
 }
 
-bool cTimer::operator< (const cListObject &ListObject)
+int cTimer::Compare(const cListObject &ListObject) const
 {
   cTimer *ti = (cTimer *)&ListObject;
   time_t t1 = StartTime();
   time_t t2 = ti->StartTime();
-  return t1 < t2 || (t1 == t2 && priority > ti->priority);
+  int r = t1 - t2;
+  if (r == 0)
+     r = ti->priority - priority;
+  return r;
 }
 
 const char *cTimer::ToText(bool UseChannelID)
@@ -248,25 +251,25 @@ bool cTimer::Save(FILE *f)
   return fprintf(f, ToText(true)) > 0;
 }
 
-bool cTimer::IsSingleEvent(void)
+bool cTimer::IsSingleEvent(void) const
 {
   return (day & 0x80000000) == 0;
 }
 
-int cTimer::GetMDay(time_t t)
+int cTimer::GetMDay(time_t t) const
 {
   struct tm tm_r;
   return localtime_r(&t, &tm_r)->tm_mday;
 }
 
-int cTimer::GetWDay(time_t t)
+int cTimer::GetWDay(time_t t) const
 {
   struct tm tm_r;
   int weekday = localtime_r(&t, &tm_r)->tm_wday;
   return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
 }
 
-bool cTimer::DayMatches(time_t t)
+bool cTimer::DayMatches(time_t t) const
 {
   return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
 }
@@ -301,7 +304,7 @@ char *cTimer::SetFile(const char *File)
   return file;
 }
 
-bool cTimer::Matches(time_t t, bool Directly)
+bool cTimer::Matches(time_t t, bool Directly) const
 {
   startTime = stopTime = 0;
   if (t == 0)
@@ -363,14 +366,14 @@ int cTimer::Matches(const cEvent *Event)
   return tmNone;
 }
 
-time_t cTimer::StartTime(void)
+time_t cTimer::StartTime(void) const
 {
   if (!startTime)
      Matches();
   return startTime;
 }
 
-time_t cTimer::StopTime(void)
+time_t cTimer::StopTime(void) const
 {
   if (!stopTime)
      Matches();
@@ -425,7 +428,7 @@ void cTimer::InvFlags(int Flags)
   flags ^= Flags;
 }
 
-bool cTimer::HasFlags(int Flags)
+bool cTimer::HasFlags(int Flags) const
 {
   return (flags & Flags) == Flags;
 }
@@ -458,6 +461,7 @@ cTimers Timers;
 
 cTimers::cTimers(void)
 {
+  modified = false;
   beingEdited = 0;;
   lastSetEvents = 0;
 }
@@ -505,12 +509,24 @@ cTimer *cTimers::GetNextActiveTimer(void)
 {
   cTimer *t0 = NULL;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if ((ti->HasFlags(tfActive)) && (!t0 || *ti < *t0))
+      if ((ti->HasFlags(tfActive)) && (!t0 || ti->Compare(*t0) < 0))
          t0 = ti;
       }
   return t0;
 }
 
+void cTimers::SetModified(void)
+{
+  modified = true;
+}
+
+bool cTimers::Modified(void)
+{
+  bool Result = modified;
+  modified = false;
+  return Result;
+}
+
 void cTimers::SetEvents(void)
 {
   if (time(NULL) - lastSetEvents < 5)
diff --git a/timers.h b/timers.h
index cbc6a92f4..24f54adf9 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.8 2004/10/24 14:40:37 kls Exp $
+ * $Id: timers.h 1.10 2004/10/31 16:41:17 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -26,7 +26,7 @@ enum eTimerMatch { tmNone, tmPartial, tmFull };
 class cTimer : public cListObject {
   friend class cMenuEditTimer;
 private:
-  time_t startTime, stopTime;
+  mutable time_t startTime, stopTime;
   static char *buffer;
   bool recording, pending, inVpsMargin;
   int flags;
@@ -37,7 +37,7 @@ class cTimer : public cListObject {
   int priority;
   int lifetime;
   char file[MaxFileName];
-  time_t firstday;
+  mutable time_t firstday;
   char *summary;
   const cEvent *event;
 public:
@@ -45,7 +45,7 @@ class cTimer : public cListObject {
   cTimer(const cEvent *Event);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
-  virtual bool operator< (const cListObject &ListObject);
+  virtual int Compare(const cListObject &ListObject) const;
   bool Recording(void) { return recording; }
   bool Pending(void) { return pending; }
   bool InVpsMargin(void) { return inVpsMargin; }
@@ -63,17 +63,17 @@ class cTimer : public cListObject {
   const cEvent *Event(void) { return event; }
   bool Parse(const char *s);
   bool Save(FILE *f);
-  bool IsSingleEvent(void);
-  int GetMDay(time_t t);
-  int GetWDay(time_t t);
-  bool DayMatches(time_t t);
+  bool IsSingleEvent(void) const;
+  int GetMDay(time_t t) const;
+  int GetWDay(time_t t) const;
+  bool DayMatches(time_t t) const;
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
   char *SetFile(const char *File);
-  bool Matches(time_t t = 0, bool Directly = false);
+  bool Matches(time_t t = 0, bool Directly = false) const;
   int Matches(const cEvent *Event);
-  time_t StartTime(void);
-  time_t StopTime(void);
+  time_t StartTime(void) const;
+  time_t StopTime(void) const;
   void SetEvent(const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
@@ -81,7 +81,7 @@ class cTimer : public cListObject {
   void SetFlags(int Flags);
   void ClrFlags(int Flags);
   void InvFlags(int Flags);
-  bool HasFlags(int Flags);
+  bool HasFlags(int Flags) const;
   void Skip(void);
   void OnOff(void);
   const char *PrintFirstDay(void);
@@ -92,6 +92,7 @@ class cTimer : public cListObject {
 
 class cTimers : public cConfig<cTimer> {
 private:
+  bool modified;
   int beingEdited;
   time_t lastSetEvents;
 public:
@@ -103,6 +104,10 @@ class cTimers : public cConfig<cTimer> {
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
   void DecBeingEdited(void) { if (!--beingEdited) lastSetEvents = 0; }
+  void SetModified(void);
+  bool Modified(void);
+      ///< Returns true if any of the timers have been modified.
+      ///< Calling this function resets the 'modified' flag to false.
   void SetEvents(void);
   };
 
diff --git a/tools.c b/tools.c
index 0f42182e1..ecb57c319 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.80 2004/06/13 14:36:41 kls Exp $
+ * $Id: tools.c 1.81 2004/10/31 16:42:36 kls Exp $
  */
 
 #include "tools.h"
@@ -939,19 +939,28 @@ int cListBase::Count(void) const
   return n;
 }
 
+static int CompareListObjects(const void *a, const void *b)
+{
+  const cListObject *la = *(const cListObject **)a;
+  const cListObject *lb = *(const cListObject **)b;
+  return la->Compare(*lb);
+}
+
 void cListBase::Sort(void)
 {
-  bool swapped;
-  do {
-     swapped = false;
-     cListObject *object = objects;
-     while (object) {
-           if (object->Next() && *object->Next() < *object) {
-              Move(object->Next(), object);
-              swapped = true;
-              }
-           object = object->Next();
-           }
-     } while (swapped);
+  int n = Count();
+  cListObject *a[n];
+  cListObject *object = objects;
+  int i = 0;
+  while (object && i < n) {
+        a[i++] = object;
+        object = object->Next();
+        }
+  qsort(a, n, sizeof(cListObject *), CompareListObjects);
+  objects = lastObject = NULL;
+  for (i = 0; i < n; i++) {
+      a[i]->Unlink();
+      Add(a[i]);
+      }
 }
 
diff --git a/tools.h b/tools.h
index 071e35e0f..9e0abff46 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.57 2004/06/13 14:13:26 kls Exp $
+ * $Id: tools.h 1.58 2004/10/31 16:16:37 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -148,7 +148,9 @@ class cListObject {
 public:
   cListObject(void);
   virtual ~cListObject();
-  virtual bool operator< (const cListObject &ListObject) { return false; }
+  virtual int Compare(const cListObject &ListObject) const { return 0; }
+      ///< Must return 0 if this object is equal to ListObject, a positive value
+      ///< if it is "greater", and a negative value if it is "smaller".
   void Append(cListObject *Object);
   void Insert(cListObject *Object);
   void Unlink(void);
diff --git a/vdr.5 b/vdr.5
index 4cc522b65..311094ffb 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2003 Klaus Schmidinger
+.\" Copyright (C) 2004 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.28 2004/07/18 11:06:54 kls Exp $
+.\" $Id: vdr.5 1.29 2004/10/31 12:13:43 kls Exp $
 .\"
-.TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "31 Oct 2004" "1.3.15" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -45,7 +45,7 @@ Such a delimiter will not appear in the Channels menu.
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
-\fBRTL,RTL Television:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0\fR
+\fBRTL Television,RTL:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0\fR
 
 The line number of a channel definition (not counting group separators,
 and based on a possible previous '@...' parameter)
@@ -60,15 +60,15 @@ it has to be replaced by '|').
 Some tv stations provide a way of deriving a "short name" from the
 channel name, which can be used in situations where there is not
 much space for displaying a long name. If a short name is available
-for this channel, it preceeds the full name and is delimited by a comma,
+for this channel, it follows the full name and is delimited by a comma,
 as in
 
-\fBRTL,RTL Television:...\fR
+\fBRTL Television,RTL:...\fR
 
 If present, the name of the service provider or "bouquet" is appended
 to the channel name, separated by a semicolon, as in
 
-\fBRTL,RTL Television;RTL World:...\fR
+\fBRTL Television,RTL;RTL World:...\fR
 .TP
 .B Frequency
 The transponder frequency (as an integer). For DVB-S this value is in MHz. For DVB-C
diff --git a/vdr.c b/vdr.c
index 033f186bc..d91308f57 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.190 2004/10/24 14:01:11 kls Exp $
+ * $Id: vdr.c 1.192 2004/10/31 10:17:23 kls Exp $
  */
 
 #include <getopt.h>
@@ -347,6 +347,21 @@ int main(int argc, char *argv[])
 
   isyslog("VDR version %s started", VDRVERSION);
 
+  // Main program loop variables - need to be here to have them initialized before any EXIT():
+
+  cOsdObject *Menu = NULL;
+  cOsdObject *Temp = NULL;
+  int LastChannel = -1;
+  int LastTimerChannel = -1;
+  int PreviousChannel[2] = { 1, 1 };
+  int PreviousChannelIndex = 0;
+  time_t LastChannelChanged = time(NULL);
+  time_t LastActivity = 0;
+  int MaxLatencyTime = 0;
+  bool ForceShutdown = false;
+  bool UserShutdown = false;
+  bool TimerInVpsMargin = false;
+
   // Load plugins:
 
   if (!PluginManager.LoadPlugins(true))
@@ -490,19 +505,6 @@ int main(int argc, char *argv[])
 
   // Main program loop:
 
-  static cOsdObject *Menu = NULL;
-  static cOsdObject *Temp = NULL;
-  static int LastChannel = -1;
-  static int LastTimerChannel = -1;
-  static int PreviousChannel[2] = { 1, 1 };
-  static int PreviousChannelIndex = 0;
-  static time_t LastChannelChanged = time(NULL);
-  static time_t LastActivity = 0;
-  static int MaxLatencyTime = 0;
-  static bool ForceShutdown = false;
-  static bool UserShutdown = false;
-  static bool TimerInVpsMargin = false;
-
   while (!Interrupted) {
         // Handle emergency exits:
         if (cThread::EmergencyExit()) {
@@ -538,11 +540,13 @@ int main(int argc, char *argv[])
               dsyslog("max. latency time %d seconds", MaxLatencyTime);
               }
            }
-        // Handle channel modifications:
-        if (!Channels.BeingEdited()) {
+        // Handle channel and timer modifications:
+        if (!Channels.BeingEdited() && !Timers.BeingEdited()) {
            int modified = Channels.Modified();
            static time_t ChannelSaveTimeout = 0;
-           if (modified == CHANNELSMOD_USER)
+           // Channels and timers need to be stored in a consistent manner,
+           // therefore if one of them is changed, we save both.
+           if (modified == CHANNELSMOD_USER || Timers.Modified())
               ChannelSaveTimeout = 1; // triggers an immediate save
            else if (modified && !ChannelSaveTimeout)
               ChannelSaveTimeout = time(NULL) + CHANNELSAVEDELTA;

From 23ed5a5ed3824b01cbf66699ff0b34f72ddb9826 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Nov 2004 18:00:00 +0100
Subject: [PATCH 108/307] =?UTF-8?q?Version=201.3.16=20-=20Fixed=20cChannel?=
 =?UTF-8?q?::SetName()=20in=20case=20only=20the=20ShortName=20or=20Provide?=
 =?UTF-8?q?r=20has=20changed=20=20=20(thanks=20to=20Sascha=20Volkenandt=20?=
 =?UTF-8?q?for=20reporting=20this=20one).=20-=20Added=20Danish=20language?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Mogens=20Elneff).=20-=20Reactivated?=
 =?UTF-8?q?=20the=20NPTL=20check=20at=20startup=20because=20there=20appear?=
 =?UTF-8?q?=20to=20be=20still=20=20=20unsolved=20problems=20when=20running?=
 =?UTF-8?q?=20on=20NPTL=20systems.=20-=20Added=20missing=20calls=20to=20cS?=
 =?UTF-8?q?tatus::MsgOsdClear()=20in=20cSkins::Message()=20(thanks=20=20?=
 =?UTF-8?q?=20to=20Joachim=20Wilke=20for=20reporting=20this=20one,=20and?=
 =?UTF-8?q?=20Andreas=20Regel=20for=20additional=20=20=20input).=20-=20Fix?=
 =?UTF-8?q?ed=20the=20cDvbSpuDecoder=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler).=20-=20Fixed=20handling=20of=20pmAudioOnlyBlack=20(t?=
 =?UTF-8?q?hanks=20to=20Stefan=20Huelswitt).=20-=20Fixed=20a=20short=20gli?=
 =?UTF-8?q?tch=20when=20starting=20a=20recording=20on=20the=20primary=20de?=
 =?UTF-8?q?vice=20while=20=20=20in=20replay=20or=20transfer=20mode=20(than?=
 =?UTF-8?q?ks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Added=20missing?=
 =?UTF-8?q?=20initialization=20of=20cEvent::seen.=20-=20Checking=20PID=20l?=
 =?UTF-8?q?anguage=20codes=20for=20ISO=20639=20compliance=20to=20avoid=20p?=
 =?UTF-8?q?roblems=20with=20=20=20funny=20characters.=20Invalid=20language?=
 =?UTF-8?q?=20codes=20will=20be=20stored=20as=20"=3F=3F=3F".=20-=20The=20'?=
 =?UTF-8?q?0'=20key=20now=20toggles=20the=20"Day"=20item=20in=20the=20"Tim?=
 =?UTF-8?q?ers"=20menu=20between=20"single=20=20=20shot"=20and=20"repeatin?=
 =?UTF-8?q?g".=20The=20keys=20'1'...'7'=20can=20be=20used=20to=20toggle=20?=
 =?UTF-8?q?the=20individual=20=20=20days=20('1'=20is=20Monday).=20Thanks?=
 =?UTF-8?q?=20to=20Sascha=20Klek=20for=20reporting=20a=20problem=20with=20?=
 =?UTF-8?q?the=20=20=20'0'=20key=20in=20the=20"Day"=20item=20of=20the=20"T?=
 =?UTF-8?q?imers"=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                      |  17 ++
 HISTORY                           |  24 ++-
 INSTALL                           |   9 +-
 MANUAL                            |   8 +-
 PLUGINS/src/sky/channels.conf.sky |   2 +-
 channels.c                        |  26 ++--
 channels.conf                     |  14 +-
 config.h                          |   6 +-
 dvbdevice.c                       |  24 +--
 dvbdevice.h                       |   4 +-
 dvbspu.c                          |  73 ++++++---
 dvbspu.h                          |   4 +-
 epg.c                             |   3 +-
 i18n.c                            | 249 +++++++++++++++++++++++++++++-
 i18n.h                            |   4 +-
 menuitems.c                       |  32 +++-
 skins.c                           |   8 +-
 timers.c                          |   6 +-
 timers.h                          |   6 +-
 vdr.c                             |  13 +-
 20 files changed, 454 insertions(+), 78 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b869c6b58..000ed4604 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -187,6 +187,7 @@ Stefan Huelswitt <huels@iname.com>
  available to plugins, and to add a SetText() function
  for reporting a bug in setting the title in the replay display of the "Classic VDR"
  skin in case a shorter title is set after a longer one
+ for fixing handling of pmAudioOnlyBlack
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -732,6 +733,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
  some broken graphics tools
  for fixing a memory leak in theme description handling
  for pointing out a "near miss" condition in cCondVar
+ for reporting a bug in cChannel::SetName() in case only the ShortName or Provider
+ has changed
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -997,6 +1000,8 @@ Andreas Regel <andreas.regel@gmx.de>
  for fixing handling bitmap indexes for 256 color mode
  for reporting a bug in removing the "scanning recordings..." message in case the
  video directory is empty
+ for pointing out a missing call to cStatus::MsgOsdtatusMessage(NULL) in
+ cSkins::Message()
 
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1071,6 +1076,9 @@ Marco Schl
  for reporting a problem with initialization of the main program loop variables
  with older compiler versions
  for adding the 'portal name' to cChannels
+ for fixing the cDvbSpuDecoder
+ for fixing a short glitch when starting a recording on the primary device while
+ in replay or transfer mode
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1132,3 +1140,12 @@ Mattias Gr
 
 Uwe Hanke <uhanke@gmx.de>
  for fixing some typos in the Makefile's 'font' target
+
+Mogens Elneff <mogens@elneff.dk>
+ for translating OSD texts to the Danish language
+
+Joachim Wilke <vdr@joachim-wilke.de>
+ for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
+
+Sascha Klek <sklek@gmx.de>
+  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
diff --git a/HISTORY b/HISTORY
index d2c33d099..07534fbd9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -359,7 +359,7 @@ Video Disk Recorder Revision History
   the EPG scanner).
 - The EPG scanner now starts with the first channel (it used to start with the
   second channel).
-- Reacitvated setting the PNR.
+- Reactivated setting the PNR.
 - Adapted the frame scanning to the new muxing of the driver.
 - The new compile time option REMOTE=NONE can be used to compile VDR without
   any remote control support (for applications where it shall be controlled
@@ -3116,3 +3116,25 @@ Video Disk Recorder Revision History
 - Now displaying the name of the remote control for which the keys are being
   learned inside the menu to avoid overwriting the date/time in the 'classic'
   skin (thanks to Oliver Endriss for reporting this one).
+
+2004-11-14: Version 1.3.16
+
+- Fixed cChannel::SetName() in case only the ShortName or Provider has changed
+  (thanks to Sascha Volkenandt for reporting this one).
+- Added Danish language texts (thanks to Mogens Elneff).
+- Reactivated the NPTL check at startup because there appear to be still
+  unsolved problems when running on NPTL systems.
+- Added missing calls to cStatus::MsgOsdClear() in cSkins::Message() (thanks
+  to Joachim Wilke for reporting this one, and Andreas Regel for additional
+  input).
+- Fixed the cDvbSpuDecoder (thanks to Marco Schl��ler).
+- Fixed handling of pmAudioOnlyBlack (thanks to Stefan Huelswitt).
+- Fixed a short glitch when starting a recording on the primary device while
+  in replay or transfer mode (thanks to Marco Schl��ler).
+- Added missing initialization of cEvent::seen.
+- Checking PID language codes for ISO 639 compliance to avoid problems with
+  funny characters. Invalid language codes will be stored as "???".
+- The '0' key now toggles the "Day" item in the "Timers" menu between "single
+  shot" and "repeating". The keys '1'...'7' can be used to toggle the individual
+  days ('1' is monday). Thanks to Sascha Klek for reporting a problem with the
+  '0' key in the "Day" item of the "Timers" menu.
diff --git a/INSTALL b/INSTALL
index 2b363d440..f054d7ab3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,14 @@ Version 1.3
 IMPORTANT NOTES:
 ----------------
 
-Please make sure your environment is NOT set to use UTF-8 or
+VDR currently doesn't work with NPTL ("Native Posix Thread Library").
+Either don't use NPTL, or set the environment variable
+
+  LD_ASSUME_KERNEL=2.4.1
+  
+before running VDR.
+
+Also, please make sure your environment is NOT set to use UTF-8 or
 any other multibyte character representation. Check the value of your
 $LANG or $LC_CTYPE environment variable, and if it contains something
 like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"
diff --git a/MANUAL b/MANUAL
index cc89252fd..f5a1814c7 100644
--- a/MANUAL
+++ b/MANUAL
@@ -24,7 +24,7 @@ Version 1.2
   Green   -           Language     New        New        Ins/Ovr       Rewind            Skip -60s
   Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s
   Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
-  0..9    Ch select   -            Sort(3)    -          Numeric inp.  Exec cmd(2)       Editing
+  0..9    Ch select   -            Sort(3)    Day(4)     Numeric inp.  Exec cmd(2)       Editing
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
   are used to enter the data, and the Left key can be used to delete the last
@@ -73,6 +73,9 @@ Version 1.2
   (2) See "Processing Recordings" below.
   (3) In the "Channels" menu the '0' key switches the sort mode through "by number",
       "by name" and "by provider".
+  (4) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
+      a single shot and a repeating timer. If "Day" indicates a repeating timer,
+      the keys '1'...'7' can be used to toggle the individual days ('1' is monday).
 
 * Navigating through the On Screen Menus
 
@@ -369,6 +372,9 @@ Version 1.2
              by listing the days of the week on which they shall record.
              For example, a timer that shall record every monday and wednesday
              would have a Day setting of "M-W----".
+             The '0' key toggles between a single shot and a repeating timer.
+             If "Day" indicates a repeating timer, the keys '1'...'7' can be
+             used to toggle the individual days ('1' is monday).
   Start:     The start time of the timer in hh:mm as 24 hour ("military") time.
   Stop:      The stop time of the timer.
   VPS:       Defines whether the timer shall use VPS (if available). If this
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
index 4b6e1af5a..d40837fc9 100644
--- a/PLUGINS/src/sky/channels.conf.sky
+++ b/PLUGINS/src/sky/channels.conf.sky
@@ -18,7 +18,7 @@
 #
 S28.2E-2-2027-4705:106:sky_one
 S28.2E-2-2027-5104:107:sky_one_mix
-S28.2E-2-2054-10240:175:itv2
+S28.2E-2-2054-10240:118:itv2
 S28.2E-2-2023-4905:130:scifi
 S28.2E-2-2025-5904:127:paramount
 S28.2E-2-2009-6201:551:discovery
diff --git a/channels.c b/channels.c
index 57986e358..5d500ecef 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.30 2004/10/31 12:54:06 kls Exp $
+ * $Id: channels.c 1.31 2004/11/02 18:07:05 kls Exp $
  */
 
 #include "channels.h"
@@ -358,15 +358,23 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
 
 void cChannel::SetName(const char *Name, const char *ShortName, const char *Provider)
 {
-  if (!isempty(Name) && strcmp(name, Name) != 0) {
-     if (Number()) {
-        dsyslog("changing name of channel %d from '%s,%s;%s' to '%s,%s;%s'", Number(), name, shortName, provider, Name, ShortName, Provider);
-        modification |= CHANNELMOD_NAME;
-        Channels.SetModified();
+  if (!isempty(Name)) {
+     bool nn = strcmp(name, Name) != 0;
+     bool ns = strcmp(shortName, ShortName) != 0;
+     bool np = strcmp(provider, Provider) != 0;
+     if (nn || ns || np) {
+        if (Number()) {
+           dsyslog("changing name of channel %d from '%s,%s;%s' to '%s,%s;%s'", Number(), name, shortName, provider, Name, ShortName, Provider);
+           modification |= CHANNELMOD_NAME;
+           Channels.SetModified();
+           }
+        if (nn)
+           name = strcpyrealloc(name, Name);
+        if (ns)
+           shortName = strcpyrealloc(shortName, ShortName);
+        if (np)
+           provider = strcpyrealloc(provider, Provider);
         }
-     name = strcpyrealloc(name, Name);
-     shortName = strcpyrealloc(shortName, ShortName);
-     provider = strcpyrealloc(provider, Provider);
      }
 }
 
diff --git a/channels.conf b/channels.conf
index acb25d5f9..95ccdf14a 100644
--- a/channels.conf
+++ b/channels.conf
@@ -24,7 +24,7 @@ VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
 NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
-HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
+HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
@@ -48,8 +48,8 @@ PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
@@ -59,7 +59,7 @@ PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2
 BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
 DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
 :Sportsworld
-PREMIERE SPORT 1,SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
+Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
 PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
@@ -82,10 +82,10 @@ Chamber TV;Chambre des D
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
 Yorin;CANAL+:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,602,100:5010:53:1109:0
 MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
+MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
 VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
 VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
-MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
@@ -94,7 +94,7 @@ Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5
 ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2054:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
-Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
+Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307:2305:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0
@@ -114,7 +114,7 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-Olisat;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
+Olisat / Telefe;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
 :@1000 New channels
diff --git a/config.h b/config.h
index bc9052ae8..955eb9f8b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.203 2004/10/31 16:17:02 kls Exp $
+ * $Id: config.h 1.204 2004/11/02 17:20:27 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.15"
-#define VDRVERSNUM   10315  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.16"
+#define VDRVERSNUM   10316  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index fb87ae4bc..2702f953d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.102 2004/10/30 14:53:30 kls Exp $
+ * $Id: dvbdevice.c 1.104 2004/11/07 10:27:19 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -681,14 +681,15 @@ int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   return -1;
 }
 
-void cDvbDevice::TurnOffLiveMode(void)
+void cDvbDevice::TurnOffLiveMode(bool LiveView)
 {
-  // Avoid noise while switching:
-
-  CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-  CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-  CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-  CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+  if (LiveView) {
+     // Avoid noise while switching:
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     }
 
   // Turn off live PIDs:
 
@@ -781,7 +782,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // Turn off live PIDs if necessary:
 
   if (TurnOffLivePIDs)
-     TurnOffLiveMode();
+     TurnOffLiveMode(LiveView);
 
   // Set the tuner:
 
@@ -897,10 +898,9 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
          break;
     case pmAudioVideo:
-         if (playMode == pmNone)
-            TurnOffLiveMode();
-         // continue with next...
     case pmAudioOnlyBlack:
+         if (playMode == pmNone)
+            TurnOffLiveMode(true);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
          CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
diff --git a/dvbdevice.h b/dvbdevice.h
index 7dd6174d1..1817f3718 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.29 2004/10/30 14:48:27 kls Exp $
+ * $Id: dvbdevice.h 1.30 2004/11/07 10:25:16 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -56,7 +56,7 @@ class cDvbDevice : public cDevice {
 
 private:
   cDvbTuner *dvbTuner;
-  void TurnOffLiveMode(void);
+  void TurnOffLiveMode(bool LiveView);
 public:
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
diff --git a/dvbspu.c b/dvbspu.c
index 184e68631..696113928 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.7 2004/05/22 14:02:32 kls Exp $
+ * $Id: dvbspu.c 1.8 2004/11/06 11:50:13 kls Exp $
  */
 
 #include <assert.h>
@@ -319,25 +319,42 @@ int cDvbSpuDecoder::ScaleYres(int value)
         return value;
 }
 
-void cDvbSpuDecoder::DrawBmp(sDvbSpuRect & size, cBitmap * bmp)
+sDvbSpuRect cDvbSpuDecoder::CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDvbSpuRect bgsize, cBitmap *bgbmp)
 {
-    int x2 = size.x2;
-    while ((x2 - size.x1 + 1) & 0x03)
-          x2++;
-    tArea Area = { size.x1, size.y1, x2, size.y2, 2 };
-    osd->SetAreas(&Area, 1);
-    if (x2 > size.x2)
-       osd->DrawRectangle(size.x2 + 1, size.y1, x2, size.y2, clrTransparent);
-    osd->DrawBitmap(size.x1, size.y1, *bmp);
-    delete bmp;
+    sDvbSpuRect size;
+    if (fgbmp && bgbmp) {
+       size.x1 = min(fgsize.x1, bgsize.x1);
+       size.y1 = min(fgsize.y1, bgsize.y1);
+       size.x2 = max(fgsize.x2, bgsize.x2);
+       size.y2 = max(fgsize.y2, bgsize.y2);
+       }
+    else if (fgbmp) {
+       size.x1 = fgsize.x1;
+       size.y1 = fgsize.y1;
+       size.x2 = fgsize.x2;
+       size.y2 = fgsize.y2;
+       }
+    else if (bgbmp) {
+       size.x1 = bgsize.x1;
+       size.y1 = bgsize.y1;
+       size.x2 = bgsize.x2;
+       size.y2 = bgsize.y2;
+       }
+    else {
+       size.x1 = 0;
+       size.y1 = 0;
+       size.x2 = 0;
+       size.y2 = 0;
+       }
+    return size;
 }
 
 void cDvbSpuDecoder::Draw(void)
 {
-    Hide();
-
-    if (!spubmp)
+    if (!spubmp) {
+        Hide();
         return;
+    }
 
     cBitmap *fg = NULL;
     cBitmap *bg = NULL;
@@ -362,18 +379,28 @@ void cDvbSpuDecoder::Draw(void)
         }
     }
 
-    if (bg || fg) {
-        if (osd == NULL)
-            if ((osd = cOsdProvider::NewOsd(0, 0)) == NULL) {
-                dsyslog("NewOsd failed\n");
-                return;
-            }
+    sDvbSpuRect areaSize = CalcAreaSize(hlsize, fg, bgsize, bg);
 
-        if (fg)
-            DrawBmp(hlsize, fg);
+    if (!fg || !bg || !osd) {
+       Hide();
+       }
+
+    if (bg || fg) {
+        if (osd == NULL) {
+           osd = cOsdProvider::NewOsd(0, 0);
+           int x2 = areaSize.x2;
+           while ((x2 - areaSize.x1 + 1) & 0x03)
+                 x2++;
+           tArea Area = { areaSize.x1, areaSize.y1, x2, areaSize.y2, (fg && bg) ? 4 : 2 };
+           osd->SetAreas(&Area, 1);
+           }
 
         if (bg)
-            DrawBmp(bgsize, bg);
+           osd->DrawBitmap(bgsize.x1, bgsize.y1, *bg);
+        if (fg)
+           osd->DrawBitmap(hlsize.x1, hlsize.y1, *fg);
+        delete fg;
+        delete bg;
 
         osd->Flush();
     }
diff --git a/dvbspu.h b/dvbspu.h
index e0f3d0c6d..078f432e5 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.5 2004/06/12 12:57:55 kls Exp $
+ * $Id: dvbspu.h 1.6 2004/11/06 11:42:37 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -130,7 +130,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
 
     int ScaleYcoord(int value);
     int ScaleYres(int value);
-    void DrawBmp(sDvbSpuRect & size, cBitmap * bmp);
+    sDvbSpuRect CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDvbSpuRect bgsize, cBitmap *bgbmp);
 
   public:
     cDvbSpuDecoder();
diff --git a/epg.c b/epg.c
index ffd61a439..877ce24ce 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.21 2004/10/31 16:12:36 kls Exp $
+ * $Id: epg.c 1.22 2004/11/07 10:43:30 kls Exp $
  */
 
 #include "epg.h"
@@ -31,6 +31,7 @@ cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID)
   startTime = 0;
   duration = 0;
   vps = 0;
+  SetSeen();
 }
 
 cEvent::~cEvent()
diff --git a/i18n.c b/i18n.c
index eeece5232..75756041d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.161 2004/11/01 14:18:48 kls Exp $
+ * $Id: i18n.c 1.163 2004/11/14 14:28:29 kls Exp $
  *
  * Translations provided by:
  *
@@ -25,6 +25,7 @@
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
  * Croatian    Drazen Dupor <drazen.dupor@dupor.com>
  * Estonian    Arthur Konovalov <kasjas@hot.ee>
+ * Danish      Mogens Elneff <mogens@elneff.dk>
  *
  */
 
@@ -74,6 +75,7 @@
  */
 
 #include "i18n.h"
+#include <ctype.h>
 #include "config.h"
 #include "tools.h"
 
@@ -98,6 +100,7 @@ const tI18nPhrase Phrases[] = {
     "�������", // Russian
     "Hrvatski",
     "Eesti",
+    "Dansk",
   },
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-1",
@@ -119,6 +122,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-5",
     "iso8859-2",
     "iso8859-15", // or iso8859-1 as alternative
+    "iso8859-1",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
   { "eng,dos",
@@ -140,6 +144,7 @@ const tI18nPhrase Phrases[] = {
     "rus",
     "hrv",
     "est",
+    "dan",
   },
   // Menu titles:
   { "VDR",
@@ -161,6 +166,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -181,6 +187,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Raspored",
     "Kava",
+    "Programoversigt",
   },
   { "Channels",
     "Kan�le",
@@ -201,6 +208,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Programi",
     "Kanalid",
+    "Kanaler",
   },
   { "Timers",
     "Timer",
@@ -221,6 +229,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Termini",
     "Taimer",
+    "Timere",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -241,6 +250,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Snimke",
     "Salvestused",
+    "Optagelser",
   },
   { "Setup",
     "Einstellungen",
@@ -261,6 +271,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "Konfiguracija",
     "S�tted",
+    "Indstillinger",
   },
   { "Commands",
     "Befehle",
@@ -281,6 +292,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Naredbe",
     "K�sud",
+    "Kommandoer",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -301,6 +313,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������",
     "Naredbe za snimanje",
     "Salvestuse k�sud",
+    "Optage kommandoer",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -321,6 +334,7 @@ const tI18nPhrase Phrases[] = {
     "�������������� ������",
     "Ure�ivanje programa",
     "Kanali muutmine",
+    "Rediger kanal",
   },
   { "Edit timer",
     "Timer editieren",
@@ -341,6 +355,7 @@ const tI18nPhrase Phrases[] = {
     "��������� �������",
     "Ure�ivanje termina",
     "Taimeri muutmine",
+    "Rediger timer",
   },
   { "Event",
     "Sendung",
@@ -361,6 +376,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Emisija",
     "S�ndmus",
+    "Udsendelse",
   },
   { "Summary",
     "Inhalt",
@@ -381,6 +397,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Sadr�aj",
     "Kokkuv�te",
+    "Omtale",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -401,6 +418,7 @@ const tI18nPhrase Phrases[] = {
     "��������� - %s",
     "Raspored - %s",
     "Programm - %s",
+    "Program - %s",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -421,6 +439,7 @@ const tI18nPhrase Phrases[] = {
     "������ � �����:",
     "�to je trenutno na programu?",
     "Hetkel eetris",
+    "Hvilket program vises nu?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -441,6 +460,7 @@ const tI18nPhrase Phrases[] = {
     "����� � ���������:",
     "�to slijedi?",
     "J�rgmisena eetris",
+    "Hvilket n�ste program vises?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -462,6 +482,7 @@ const tI18nPhrase Phrases[] = {
     "�������������",
     "Promjeni",
     "Muuda",
+    "Rediger",
   },
   { "New",
     "Neu",
@@ -482,6 +503,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Novi",
     "Uus",
+    "Ny",
   },
   { "Delete",
     "L�schen",
@@ -502,6 +524,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Obri�i",
     "Kustuta",
+    "Slet",
   },
   { "Mark",
     "Markieren",
@@ -522,6 +545,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Ozna�i",
     "Siirda",
+    "Mark�r",
   },
   { "On/Off",
     "Ein/Aus",
@@ -542,6 +566,7 @@ const tI18nPhrase Phrases[] = {
     "���/����",
     "De-/Aktiviraj",
     "Sees/V�ljas",
+    "Til/Fra",
   },
   { "Record",
     "Aufnehmen",
@@ -562,6 +587,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Snimi",
     "Salvesta",
+    "Optag",
   },
   { "Play",
     "Wiedergabe",
@@ -582,6 +608,7 @@ const tI18nPhrase Phrases[] = {
     "�������������",
     "Start",
     "Start",
+    "Afspil",
   },
   { "Rewind",
     "Anfang",
@@ -602,6 +629,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Na po�etak",
     "Algusesse",
+    "Forfra",
   },
   { "Button$Stop",
     "Beenden",
@@ -622,6 +650,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Stop",
     "Stopp",
+    "Stop",
   },
   { "Resume",
     "Weiter",
@@ -642,6 +671,7 @@ const tI18nPhrase Phrases[] = {
     "����������",
     "Nastavi",
     "J�tka",
+    "Forts�t",
   },
   { "Summary",
     "Inhalt",
@@ -662,6 +692,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Sadr�aj",
     "Kokkuv�te",
+    "Omtale",
   },
   { "Open",
     "�ffnen",
@@ -682,6 +713,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Otvori",
     "Ava",
+    "�bn",
   },
   { "Switch",
     "Umschalten",
@@ -702,6 +734,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Prebaci",
     "Vali",
+    "Skift",
   },
   { "Now",
     "Jetzt",
@@ -722,6 +755,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Trenutno",
     "N��d",
+    "Nu",
   },
   { "Next",
     "N�chste",
@@ -742,6 +776,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Slijedi",
     "J�rgmine",
+    "N�ste",
   },
   { "Button$Schedule",
     "Programm",
@@ -762,6 +797,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "Raspored",
     "Kava",
+    "Program",
   },
   { "Language",
     "Sprache",
@@ -782,6 +818,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Jezik",
     "Keel",
+    "Sprog",
   },
   { "Eject",
     "Auswerfen",
@@ -802,6 +839,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Izbaci",
     "Ava",
+    "Skub ud",
   },
   { "ABC/abc",
     "ABC/abc",
@@ -822,6 +860,7 @@ const tI18nPhrase Phrases[] = {
     "���/���",
     "ABC/abc",
     "ABC/abc",
+    "ABC/abc",
   },
   { "Insert",
     "Einf�gen",
@@ -842,6 +881,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Umetni",
     "Lisa (INS)",
+    "Inds�t",
   },
   { "Overwrite",
     "�berschreiben",
@@ -862,6 +902,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Prepi�i",
     "Asenda (OVR)",
+    "Overskriv",
   },
   { "Menu",
     "Men�",
@@ -882,6 +923,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Izbor",
     "Men��",
+    "Menu",
   },
   { "Reset",
     "Reset",
@@ -902,6 +944,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Reset",
     "Reset",
+    "Nulstille",
   },
   { "Scan",
     "Scan",
@@ -922,6 +965,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Pretra�i",
     "Uuenda",
+    "Skan",
   },
   // Confirmations:
   { "Delete channel?",
@@ -943,6 +987,7 @@ const tI18nPhrase Phrases[] = {
     "������� �����?",
     "Obrisati program?",
     "Kustutan kanali?",
+    "Slet kanal?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -963,6 +1008,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������?",
     "Obrisati termin?",
     "Kustutan taimeri?",
+    "Slet timer?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -983,6 +1029,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������?",
     "Obrisati snimku?",
     "Kustutan salvestuse?",
+    "Slet optagelse",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -1003,6 +1050,7 @@ const tI18nPhrase Phrases[] = {
     "���� ������ �� ������� - ������������� �������?",
     "Jo� snimam - zaista obrisati?",
     "Salvestus aktiivne - kustutan?",
+    "Timerstyret optagelse i gang - slet alligevel?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -1023,6 +1071,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ������?",
     "Zaustaviti snimanje?",
     "L�petan salvestamise?",
+    "Stop optagelse?",
   },
   { "on primary interface",
     "auf dem prim�ren Interface",
@@ -1043,6 +1092,7 @@ const tI18nPhrase Phrases[] = {
     "�� �������� ����������",
     "na primarnom ure�aju",
     "peavastuv�tjal",
+    "p� prim�r enhed",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -1063,6 +1113,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��������������?",
     "Otkazati ure�ivanje?",
     "T�histan muudatuse?",
+    "Afbryd redigering?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -1083,6 +1134,7 @@ const tI18nPhrase Phrases[] = {
     "������������� �������������?",
     "Zaista ponovo pokrenuti?",
     "Restart?",
+    "Vil du virkelig genstarte?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -1103,6 +1155,7 @@ const tI18nPhrase Phrases[] = {
     "���� ������ - ������������� �������������?",
     "Snimanje traje - svejedno restart sistema?",
     "Salvestamine aktiivne - restart?",
+    "Optagelse igang - genstart alligevel?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -1123,6 +1176,7 @@ const tI18nPhrase Phrases[] = {
     "���� ������ - ������������� ���������?",
     "Snimanje traje - svejedno isklju�iti?",
     "Salvestamine aktiivne - l�litan v�lja?",
+    "Optagelse igang - sluk alligevel?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -1143,6 +1197,7 @@ const tI18nPhrase Phrases[] = {
     "����� %d ����� �������� ������ - ������������� ���������?",
     "Snimanje za %d minuta - svejedno isklju�iti?",
     "Salvestamine algab %d minuti p�rast - l�litan v�lja?",
+    "Optagelse om %d minutter - sluk alligevel?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken um Shutdown abzubrechen",
@@ -1163,6 +1218,7 @@ const tI18nPhrase Phrases[] = {
     "������� ����� ������ ����� �������� ����������.",
     "Pritisnite tipku ako ne �elite ugasiti sistem",
     "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks",
+    "Tryk vilk�rlig tast for at annullere sluk",
   },
   // Channel parameters:
   { "Name",
@@ -1184,6 +1240,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Naziv",
     "Nimi",
+    "Navn",
   },
   { "Frequency",
     "Frequenz",
@@ -1204,6 +1261,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Frekvencija",
     "Sagedus",
+    "Frekvens",
   },
   { "Polarization",
     "Polarisation",
@@ -1224,6 +1282,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Polarizacija",
     "Polarisatsioon",
+    "Polarisation",
   },
   { "Source",
     "Quelle",
@@ -1244,6 +1303,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Izvor",
     "Allikas",
+    "Kilde",
   },
   { "Srate",
     "Srate",
@@ -1264,6 +1324,7 @@ const tI18nPhrase Phrases[] = {
     "����. ��������",
     "Srate", // hrv
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -1284,6 +1345,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid (�����)",
     "Vpid",
     "Vpid",
+    "Vpid",
   },
   { "Ppid",
     "Ppid",
@@ -1304,6 +1366,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
+    "Ppid",
   },
   { "Apid1",
     "Apid1",
@@ -1324,6 +1387,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1 (����� 1)",
     "Apid1", // hrv
     "Apid1",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -1344,6 +1408,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2 (����� 2)",
     "Apid2", // hrv
     "Apid2",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -1364,6 +1429,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1 (AC3 1)",
     "Dpid1", // hrv
     "Dpid1",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -1384,6 +1450,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2 (AC3 2)",
     "Dpid2", // hrv
     "Dpid2",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -1404,6 +1471,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid (���������)",
     "Tpid", // hrv
     "Tpid",
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -1424,6 +1492,7 @@ const tI18nPhrase Phrases[] = {
     "CA (�������)",
     "Kodiranje (CA)",
     "CA",
+    "CA",
   },
   { "Sid",
     "Sid",
@@ -1444,6 +1513,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid", // hrv
     "Sid",
+    "Sid",
   },
   { "Inversion",
     "Inversion",
@@ -1464,6 +1534,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Inverzija",
     "Inversioon",
+    "Inversion",
   },
   { "Bandwidth",
     "Bandwidth",
@@ -1484,6 +1555,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Bandwidth", // hrv "Pojasna �irina",
     "Ribalaius",
+    "B�ndbredde",
   },
   { "CoderateH",
     "CoderateH",
@@ -1504,6 +1576,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH", // hrv
     "CoderateH",
+    "CoderateH",
   },
   { "CoderateL",
     "CoderateL",
@@ -1524,6 +1597,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL", // hrv
     "CoderateL",
+    "CoderateL",
   },
   { "Modulation",
     "Modulation",
@@ -1544,6 +1618,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "Modulacija",
     "Modulatsioon",
+    "Modulation",
   },
   { "Transmission",
     "Transmission",
@@ -1564,6 +1639,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Prijenos",
     "Transmissioon",
+    "Transmission",
   },
   { "Guard",
     "Guard",
@@ -1584,6 +1660,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Za�tita",
     "Guard",
+    "Guard",
   },
   { "Hierarchy",
     "Hierarchy",
@@ -1604,6 +1681,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "Hijerarhija",
     "Hierarhia",
+    "Hierarki",
   },
   // Timer parameters:
   { "Active",
@@ -1625,6 +1703,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Aktivan",
     "Aktiivne",
+    "Aktiv",
   },
   { "Channel",
     "Kanal",
@@ -1645,6 +1724,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Program",
     "Kanal",
+    "Kanal",
   },
   { "Day",
     "Tag",
@@ -1665,6 +1745,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Dan",
     "P�ev",
+    "Dag",
   },
   { "Start",
     "Anfang",
@@ -1685,6 +1766,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Po�etak",
     "Start",
+    "Start",
   },
   { "Stop",
     "Ende",
@@ -1705,6 +1787,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Kraj",
     "Stopp",
+    "Stop",
   },
   { "VPS",
     "VPS",
@@ -1725,6 +1808,7 @@ const tI18nPhrase Phrases[] = {
     "VPS ��������",
     "VPS", // hrv
     "VPS",
+    "VPS",
   },
   { "Priority",
     "Priorit�t",
@@ -1745,6 +1829,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "Prioritet",
     "Prioriteet",
+    "Prioritet",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1765,6 +1850,7 @@ const tI18nPhrase Phrases[] = {
     "���� ��������",
     "Trajanje",
     "Eluiga",
+    "Levetid",
   },
   { "File",
     "Datei",
@@ -1785,6 +1871,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Datoteka",
     "Fail",
+    "Fil",
   },
   { "First day",
     "Erster Tag",
@@ -1805,6 +1892,7 @@ const tI18nPhrase Phrases[] = {
     "������ ����",
     "Prvi dan",
     "Esimene p�ev",
+    "F�rste dag",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -1826,6 +1914,7 @@ const tI18nPhrase Phrases[] = {
     "����� ����� ��������!",
     "Program je trenutno zauzet terminom za snimanje",
     "Kanal on taimeri kasutuses!",
+    "Kanal anvendes af en timer!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -1846,6 +1935,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ����������� �����!",
     "Ne mogu prebaciti program!",
     "Kanali vahetus ei ole v�imalik!",
+    "Kan ikke skifte kanal!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -1866,6 +1956,7 @@ const tI18nPhrase Phrases[] = {
     "���� ������ �� �������!",
     "Snimanje po definiranom terminu!",
     "Taimeri salvestamine!",
+    "Timer optager nu!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -1886,6 +1977,7 @@ const tI18nPhrase Phrases[] = {
     "������ ������� � ������!",
     "Gre�ka pri pristupanju snimke!",
     "Salvestuse taasesitus eba�nnestus!",
+    "Fejl ved l�sning af optagelse!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -1906,6 +1998,7 @@ const tI18nPhrase Phrases[] = {
     "������ �������� ������!",
     "Gre�ka pri brisanju snimke!",
     "Salvestuse kustutamine eba�nnestus!",
+    "Fejl ved sletning af optagelse!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -1926,6 +2019,7 @@ const tI18nPhrase Phrases[] = {
     "*** ������������ ����� ***",
     "*** Neispravan program ***",
     "*** Vigane kanal ***",
+    "*** Ugyldig kanal! ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -1946,6 +2040,7 @@ const tI18nPhrase Phrases[] = {
     "��� ���������� DVB-���������� ��� ������!",
     "Nema slobodnog DVB ure�aja za snimanje!",
     "Puudub vaba DVB seade salvestamiseks!",
+    "Ingen fri DVB enhed til optagelse!",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -1966,6 +2061,7 @@ const tI18nPhrase Phrases[] = {
     "����� ����������!",
     "Program nije dostupan!",
     "Kanal ei ole k�ttesaadav!",
+    "Kanal er ikke tilg�ngelig!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -1986,6 +2082,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ �� ���������!",
     "Parametri programa nisu jednozna�ni!",
     "Kanaliseaded ei ole unikaalsed!",
+    "Kanalindstillinger er ikke entydige!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -2006,6 +2103,7 @@ const tI18nPhrase Phrases[] = {
     "����� ������������ (���� ������)!",
     "Program blokiran (snimanje)!",
     "Kanal lukus (salvestamine aktiivne)!",
+    "Kanal blokeret (optagelse i gang)",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -2026,6 +2124,7 @@ const tI18nPhrase Phrases[] = {
     "���������� �������� ����� ��������!", // ???
     "Ne mogu zapo�eti 'prijenosni' na�in!",
     "Siirdemooduse start eba�nnestus!",
+    "Kan ikke starte Transfer Mode!",
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
@@ -2046,6 +2145,7 @@ const tI18nPhrase Phrases[] = {
     "�� ������ ����� ��� �������!",
     "Nijedna prekidna to�ka nije postavljena!",
     "Redigeerimise markerid puuduvad!",
+    "Der er ikke sat nogen redigeringsm�rker!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -2066,6 +2166,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ������ ������ ������!",
     "Ne mogu zapo�eti ure�ivanje!",
     "Redigeerimise start eba�nnestus!",
+    "Kan ikke starte redigeringsprocessen!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -2086,6 +2187,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������������ ��� �������!",
     "Ure�ivanje je ve� aktivirano!",
     "Redigeerimine on juba aktiivne!",
+    "Redigeringsproces er allerede aktiv!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -2106,6 +2208,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ���������� - �� ����� �������� '-s'!",
     "Ga�enje nemogu�e - nedostaje opcija '-s'!",
     "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!",
+    "Kan ikke slukke - parameter '-s' ikke angivet!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -2126,6 +2229,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ����� �� �����!",
     "Nedovoljno prostora na disku",
     "K�vaketas peaaegu t�is!",
+    "Kun lidt diskplads tilbage!",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -2146,6 +2250,7 @@ const tI18nPhrase Phrases[] = {
     "���� CAM-������ ����������!",
     "Ne mogu otvoriti CAM izbor!",
     "Ei saa avada CAM men��d!",
+    "Kan ikke �bne CAM menuen!",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -2166,6 +2271,7 @@ const tI18nPhrase Phrases[] = {
     "������ ����������� CAM-������!",
     "Ne mogu resetirati CAM",
     "CAM mooduli taask�ivitus eba�nnestus!",
+    "Kan ikke nulstille CAM!",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt!",
@@ -2186,6 +2292,7 @@ const tI18nPhrase Phrases[] = {
     "CAM-������ �����������!",
     "CAM je resetiran!",
     "CAM mooduli taask�ivitus tehtud",
+    "CAM er blevet nulstillet",
   },
   // Setup pages:
   { "OSD",
@@ -2207,6 +2314,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "OSD",
     "Ekraanimen��",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -2227,6 +2335,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Pregled emisija (EPG)",
     "EPG",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -2247,6 +2356,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -2267,6 +2377,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "LNB",
     "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -2287,6 +2398,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ������",
     "CICAM",
     "CICAM",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -2307,6 +2419,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Snimanje",
     "Salvestamine",
+    "Optagelse",
   },
   { "Replay",
     "Wiedergabe",
@@ -2327,6 +2440,7 @@ const tI18nPhrase Phrases[] = {
     "���������������",
     "Reprodukcija",
     "Taasesitus",
+    "Afspilning",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -2347,6 +2461,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Ostalo",
     "Muud s�tted",
+    "Diverse",
   },
   { "Plugins",
     "Plugins",
@@ -2367,6 +2482,7 @@ const tI18nPhrase Phrases[] = {
     "������ ����������",
     "Dodaci (Plugins)",
     "Laiendusmoodulid",
+    "Plugins",
   },
   { "Plugin",
     "Plugin",
@@ -2387,6 +2503,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Plugin",
     "Laiendusmoodul",
+    "Plugin",
   },
   { "Restart",
     "Neustart",
@@ -2407,6 +2524,7 @@ const tI18nPhrase Phrases[] = {
     "�������������",
     "Restart sistema",
     "Restart",
+    "Genstart",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -2428,6 +2546,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Jezik",
     "Keel",
+    "Sprog",
   },
   { "Setup.OSD$Skin",
     "Oberfl�che",
@@ -2448,6 +2567,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Povr�ina",
     "Kest",
+    "Skin",
   },
   { "Setup.OSD$Theme",
     "Thema",
@@ -2468,6 +2588,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Tema",
     "Teema",
+    "Tema",
   },
   { "Setup.OSD$Left",
     "Links",
@@ -2488,6 +2609,7 @@ const tI18nPhrase Phrases[] = {
     "������ �����",
     "Lijevo",
     "Vasakule",
+    "Venstre",
   },
   { "Setup.OSD$Top",
     "Oben",
@@ -2508,6 +2630,7 @@ const tI18nPhrase Phrases[] = {
     "������ ������",
     "Gore",
     "�lesse",
+    "Top",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -2528,6 +2651,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "�irina",
     "Laius",
+    "Bredde",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -2548,6 +2672,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Visina",
     "K�rgus",
+    "H�jde",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -2568,6 +2693,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ������ ��������� (���)",
     "Vrijeme prikaza poruka (s)",
     "Kanaliteate esitusaeg (s)",
+    "Tid beskeder skal vises (s)",
   },
   { "Setup.OSD$Use small font",
     "Kleine Schrift benutzen",
@@ -2588,6 +2714,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ������ �����",
     "Koristi mala slova",
     "V�ikese fondi kasutamine",
+    "Anvend lille skrift",
   },
   { "never",
     "nie",
@@ -2608,6 +2735,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "nikada",
     "mitte kunagi",
+    "aldrig",
   },
   { "skin dependent",
     "je nach Oberfl�che",
@@ -2628,6 +2756,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ����",
     "ovisno o povr�ini",
     "kestast s�ltuv",
+    "skin afh�ngig",
   },
   { "always",
     "immer",
@@ -2648,6 +2777,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "uvijek",
     "alati",
+    "altid",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -2668,6 +2798,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ���� ���������� � ������",
     "Pozicija informacije o programu",
     "Kanaliinfo asukoht",
+    "Placering af kanalinfo",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -2688,6 +2819,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ���������� � ������",
     "Informacije kod promjene kanala",
     "N�ita kanaliteadet",
+    "Info ved kanalskift",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -2708,6 +2840,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������� ����",
     "Listaj po stranicama",
     "Lehek�lje kerimine",
+    "Rul sider",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -2728,6 +2861,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ��������",
     "Sortiraj termine",
     "Taimeri sorteerimine",
+    "Sorter timere",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -2748,6 +2882,7 @@ const tI18nPhrase Phrases[] = {
     "�������� �������� �������",
     "Imenik za snimke",
     "Salvesta kausta nime",
+    "Optagelser i foldere",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -2768,6 +2903,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ������������ �������� (�)",
     "Vrijeme do EPG pregleda (h)",
     "EPG skaneerimise viide (h)",
+    "Tid f�r EPG skanning (t)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -2788,6 +2924,7 @@ const tI18nPhrase Phrases[] = {
     "������� ��������� ������",
     "Nivo popravka EPG gre�aka",
     "EPG veaparanduse tase",
+    "Niveau for EPG fejlrettelse",
   },
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
@@ -2808,6 +2945,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ���������� ������ (���)",
     "Prika�i stare EPG podatke (min)",
     "Vana EPG viide (min)",
+    "Vise gammel EPG info (min)",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -2828,6 +2966,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ��������� �����",
     "Podesi vrijeme sistema",
     "Kella s�nkroniseerimine",
+    "Indstil system tid",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -2848,6 +2987,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ����� ������������",
     "Transponder za pode�avanje sata",
     "Kella s�nkroniseerimise transponder",
+    "Anvend tid fra transponder",
   },
   { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
@@ -2868,6 +3008,7 @@ const tI18nPhrase Phrases[] = {
     "�������������� �����",
     "Preferirani jezici",
     "Eelistatuid keeli",
+    "Foretrukne sprog",
   },
   { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
@@ -2888,6 +3029,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Preferirani jezik",
     "Eelistatud keel",
+    "Foretrukket sprog",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -2908,6 +3050,7 @@ const tI18nPhrase Phrases[] = {
     "�������� DVB-����������",
     "Primarni DVB ure�aj",
     "Esmane DVB seade",
+    "Prim�r DVB enhed",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -2928,6 +3071,7 @@ const tI18nPhrase Phrases[] = {
     "������ �����",
     "Video format",
     "TV k�lgsuhe",
+    "Video format",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -2948,6 +3092,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ��������� �������",
     "Aktualiziraj programe",
     "Kanalite uuendamine",
+    "Opdat�r kanaler",
   },
   { "names only",
     "nur Namen",
@@ -2968,6 +3113,7 @@ const tI18nPhrase Phrases[] = {
     "������ ��������",
     "samo imena",
     "ainult nimed",
+    "kun navne",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -2988,6 +3134,7 @@ const tI18nPhrase Phrases[] = {
     "�������� � PID�",
     "imena i identifikatore (PIDs)",
     "nimed ja PID-id",
+    "navne og PIDs",
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
@@ -3008,6 +3155,7 @@ const tI18nPhrase Phrases[] = {
     "����� ������",
     "dodaj nove programe",
     "lisa uued kanalid",
+    "tilf. ny kanaler",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
@@ -3028,6 +3176,7 @@ const tI18nPhrase Phrases[] = {
     "���. ������������",
     "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
     "lisa uued transponderid",
+    "tilf. ny transp.",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -3048,6 +3197,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������������ (SLOF) (���)",
     "Frekv. preklopa SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -3068,6 +3218,7 @@ const tI18nPhrase Phrases[] = {
     "������ ������� ���������� (���)",
     "Donja LNB frekv. (MHz)",
     "Alumine (LO) LNB sagedus (MHz)",
+    "Nedre LNB frekvens (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -3088,6 +3239,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������� ���������� (���)",
     "Gornja LNB frekv. (MHz)",
     "�lemine (HI) LNB sagedus (MHz)",
+    "�vre LNB frekvens (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -3108,6 +3260,7 @@ const tI18nPhrase Phrases[] = {
     "������������ DiSEqC",
     "Koristi DiSEqC",
     "DiSEqC kasutamine",
+    "Anvend DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -3128,6 +3281,7 @@ const tI18nPhrase Phrases[] = {
     "CAM-������ DVB",
     "CICAM DVB",
     "CICAM DVB",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -3148,6 +3302,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ������ ������ (���)",
     "Rezerva na po�etku snimanja (min)",
     "Salvestamise algusvaru (min)",
+    "Margin ved start (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -3168,6 +3323,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ��������� ������ (���)",
     "Rezerva na kraju (min)",
     "Salvestamise l�puvaru (min)",
+    "Margin ved stop (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -3188,6 +3344,7 @@ const tI18nPhrase Phrases[] = {
     "���. ��������� ������� ���. ����������",
     "Standardno ograni�enje",
     "Esmase seadme prioriteet",
+    "Prim�r gr�nse",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -3208,6 +3365,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������� �� ���������",
     "Standardni prioritet",
     "Vaikimisi prioriteet",
+    "Standard prioritet",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -3228,6 +3386,7 @@ const tI18nPhrase Phrases[] = {
     "���� �������� ������ �� ��������� (�)",
     "Standardno trajanje (d)",
     "Salvestuse eluiga (p�evi)",
+    "Standard levetid (d)",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
@@ -3248,6 +3407,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ����������� ���������",
     "Prioritet pauze",
     "Pausi prioriteet",
+    "Pause prioritet",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
@@ -3268,6 +3428,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ����������� ��������� (�)",
     "Trajanje pauze (d)",
     "Pausi eluiga (p�evi)",
+    "Pause levetid (d)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -3288,6 +3449,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ����� �� ��������",
     "Koristi ime epizode",
     "Kasuta episoodi nime",
+    "Anvend udsendelsesnavn",
   },
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
@@ -3308,6 +3470,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ������� VPS",
     "Koristi VPS",
     "Kasuta VPS-i",
+    "Anvend VPS",
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
@@ -3328,6 +3491,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ����� VPS (���)",
     "Vremenska rezerva kod VPS (s)",
     "VPS-i algusvaru (s)",
+    "VPS margin (s)",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -3348,6 +3512,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��������� ������� ������",
     "Ozna�i direktno snimanje",
     "M�rgista otsesalvestusi",
+    "Mark�r direkte optagelse",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -3368,6 +3533,7 @@ const tI18nPhrase Phrases[] = {
     "����� ���������� ������ �������",
     "Imenuj direktno snimanje",
     "Otsesalvestuse nimi",
+    "Navngiv direkte optagelse",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -3388,6 +3554,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ������ ������ (���)",
     "Trajanje direktnog snimanja (min)",
     "Otsesalvestuse kestus (min)",
+    "L�ngde af direkte optagelse (min)",
   },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
@@ -3408,6 +3575,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ���� Dolby Digital",
     "Snimi 'Dolby digital' ton",
     "Dolby Digital salvestamine",
+    "Optag Dolby Digital lyd",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -3428,6 +3596,7 @@ const tI18nPhrase Phrases[] = {
     "����. ������ ���������� (��)",
     "Maksimalna veli�ina datoteke (MB)",
     "Maksimaalne failisuurus (MB)",
+    "Max. video filst�rrelse (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -3448,6 +3617,7 @@ const tI18nPhrase Phrases[] = {
     "������ ����������������� �����",
     "Podijeli ure�ene datoteke",
     "T�kelda redigeeritud faile",
+    "Opdel redigerede filer",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -3468,6 +3638,7 @@ const tI18nPhrase Phrases[] = {
     "��������������� �����",
     "MultiSpeed na�in",
     "Multi-kiiruse moodus",
+    "Multi hastighedsmodus",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -3488,6 +3659,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ����� ���������������", // ???
     "Prika�i na�in prikazivanja",
     "Korduse moodus",
+    "Vis afspilningsmodus",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
@@ -3508,6 +3680,7 @@ const tI18nPhrase Phrases[] = {
     "ID ���������������", // ???
     "ID nastavka",
     "J�tkamise ID",
+    "Genoptagelses ID",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -3528,6 +3701,7 @@ const tI18nPhrase Phrases[] = {
     "���. ����� �������� ������� (���)",
     "Najmanje vrijeme pauze",
     "Min. s�ndmuse kestus (min)",
+    "Mindste h�ndelsespause (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -3548,6 +3722,7 @@ const tI18nPhrase Phrases[] = {
     "���. ����� �������� ����� (���)",
     "Najmanje vrijeme neaktivnosti (min)",
     "Min. kasutaja tegevusetus (min)",
+    "Min. bruger inaktivitet (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -3568,6 +3743,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ������ ����. SVDRP (���)",
     "SVDRP vrijeme neaktivnosti",
     "SVDRP ooteaeg (s)",
+    "SVDRP timeout (s)",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
@@ -3588,6 +3764,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ������������ ������ (���)",
     "",// hrv TODO
     "Kanalivahetuse ooteaeg (s)",
+    "Zap timeout (s)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -3609,6 +3786,7 @@ const tI18nPhrase Phrases[] = {
     "���ǿ��",
     "PUS�PSN", // hrv
     "ETKNRLP",
+    "MTOTFLS",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -3629,6 +3807,7 @@ const tI18nPhrase Phrases[] = {
     "��ݲ�������ҿ����Ѳ��",
     "PonUtoSri�etPetSubNed", // hrv
     " E  T  K  N  R  L  P ",
+    "ManTirOnsTorFreL�rS�n",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
@@ -3650,6 +3829,7 @@ const tI18nPhrase Phrases[] = {
     " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~",
     " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~", // hrv
     " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~",
+    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -3671,6 +3851,7 @@ const tI18nPhrase Phrases[] = {
     "���� ����� ������ ������",
     "U�enje k�da daljinskog upravlja�a",
     "Kaugjuhtimispuldi �petamine",
+    "L�rer fjernbetjeningstaster",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -3691,6 +3872,7 @@ const tI18nPhrase Phrases[] = {
     "��� 1: ����������� ���� ���� ������",
     "Faza 1: detektiranje k�da daljinskog upravlja�a.",
     "Aste 1: Koodeerimiss�steemi tuvastamine",
+    "Fase 1: Detekterer fjernbetjenings-kodetype",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -3711,6 +3893,7 @@ const tI18nPhrase Phrases[] = {
     "������� ����� ������ �� ������",
     "Pritisnite tipku na daljinskom upravlja�u",
     "Vajuta puldil suvalist klahvi",
+    "Tryk vilk�rlig tast p� fjernbetjeningen",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -3731,6 +3914,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ��� ������!",
     "K�d daljinskog upravlja�a je prepoznat!",
     "Koodeerimiss�steem tuvastatud!",
+    "Fjernbetjenings-kodetype fundet!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -3751,6 +3935,7 @@ const tI18nPhrase Phrases[] = {
     "�� ��������� ������...",
     "Ne pritiskajte tipku...",
     "�ra vajuta puldil �htki klahvi...",
+    "Tryk ikke p� nogen tast...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -3771,6 +3956,7 @@ const tI18nPhrase Phrases[] = {
     "��� 2: ������� ����� ��������� ������",
     "Faza 2: U�enje posebnih k�dova",
     "Aste 2: Klahvide �petamine",
+    "Fase 2: L�r individuelle tast koder",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -3791,6 +3977,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������ '%s'",
     "Pritisnite tipku za '%s'",
     "Vajuta klahvile '%s'",
+    "Tryk tasten for '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -3811,6 +3998,7 @@ const tI18nPhrase Phrases[] = {
     "������� '�����' ����� �����������",
     "Pritisnite 'Gore' za potvrdu",
     "Kinnitamiseks vajuta '�les'",
+    "Tryk 'Op' for at bekr�fte",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -3831,6 +4019,7 @@ const tI18nPhrase Phrases[] = {
     "������� '����' ����� ����������",
     "Pritisnite 'Dolje' za nastavak",
     "J�tkamiseks vajuta 'Alla'",
+    "Tryk 'Ned' for at forts�tte",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -3851,6 +4040,7 @@ const tI18nPhrase Phrases[] = {
     "(������� '�����' ����� ���������)",
     "(pritisnite 'Gore' za nazad)",
     "(tagasiminekuks vajuta '�les')",
+    "(tryk 'Op' for at g� tilbage)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -3871,6 +4061,7 @@ const tI18nPhrase Phrases[] = {
     "(������� '����' ����� ��������� ��������� ������)",
     "(pritisnite 'Dolje' za kraj)",
     "(l�petamiseks vajuta 'Alla')",
+    "(tryk 'Ned' for at afslutte indl�ringen)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -3891,6 +4082,7 @@ const tI18nPhrase Phrases[] = {
     "(������� '����' ����� ���������� ������)",
     "pritisnite 'Izbor' da presko�ite ovu tipku",
     "(selle klahvi vahelej�tmiseks vajuta 'Men��')",
+    "(tryk 'Menu' for at springe denne tast over)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -3911,6 +4103,7 @@ const tI18nPhrase Phrases[] = {
     "��� 3: ����������� ����� ������",
     "Faza 3: Spremanje k�dova tipki",
     "Aste 3: Klavhikoodide salvestamine",
+    "Fase 3: Gemmer tast koder",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -3931,6 +4124,7 @@ const tI18nPhrase Phrases[] = {
     "������� '�����' ����� ���������, '����' ����� ����������",
     "'Gore' za potvrdu, 'Dolje' za prekid",
     "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'",
+    "Tryk 'Op' for at gemme, 'Ned' for at annullere",
   },
   // Key names:
   { "Up",
@@ -3952,6 +4146,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Gore",
     "�les",
+    "Op",
   },
   { "Down",
     "Ab",
@@ -3972,6 +4167,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Dolje",
     "Alla",
+    "Ned",
   },
   { "Menu",
     "Men�",
@@ -3992,6 +4188,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Izbor",
     "Men��",
+    "Menu",
   },
   { "Ok",
     "Ok",
@@ -4012,6 +4209,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Back",
     "Zur�ck",
@@ -4032,6 +4230,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Nazad",
     "Tagasi",
+    "Tilbage",
   },
   { "Left",
     "Links",
@@ -4052,6 +4251,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Lijevo",
     "Vasakule",
+    "Venstre",
   },
   { "Right",
     "Rechts",
@@ -4072,6 +4272,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Desno",
     "Paremale",
+    "H�jre",
   },
   { "Red",
     "Rot",
@@ -4092,6 +4293,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Crveno",
     "Punane",
+    "R�d",
   },
   { "Green",
     "Gr�n",
@@ -4112,6 +4314,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "Zeleno",
     "Roheline",
+    "Gr�n",
   },
   { "Yellow",
     "Gelb",
@@ -4132,6 +4335,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "�uto",
     "Kollane",
+    "Gul",
   },
   { "Blue",
     "Blau",
@@ -4152,6 +4356,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Plavo",
     "Sinine",
+    "Bl�",
   },
   { "Play",
     "Wiedergabe",
@@ -4172,6 +4377,7 @@ const tI18nPhrase Phrases[] = {
     "���������������",
     "Start",
     "Start",
+    "Afspil",
   },
   { "Pause",
     "Pause",
@@ -4192,6 +4398,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Pauza",
     "Paus",
+    "Pause",
   },
   { "Stop",
     "Stop",
@@ -4212,6 +4419,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Stop",
     "Stopp",
+    "Stop",
   },
   { "Record",
     "Aufnehmen",
@@ -4232,6 +4440,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Snimaj",
     "Salvestamine",
+    "Optag",
   },
   { "FastFwd",
     "Vorlauf",
@@ -4252,6 +4461,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Naprijed",
     "Edasikerimine",
+    "Spol fremad",
   },
   { "FastRew",
     "R�cklauf",
@@ -4272,6 +4482,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "Nazad",
     "Tagasikerimine",
+    "Spol tilbage",
   },
   { "Power",
     "Ausschalten",
@@ -4292,6 +4503,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "Isklju�i",
     "Toide",
+    "Sluk",
   },
   { "Channel+",
     "Kanal+",
@@ -4312,6 +4524,7 @@ const tI18nPhrase Phrases[] = {
     "����� +",
     "Program +",
     "Kanal+",
+    "Kanal+",
   },
   { "Channel-",
     "Kanal-",
@@ -4332,6 +4545,7 @@ const tI18nPhrase Phrases[] = {
     "����� -",
     "Program -",
     "Kanal-",
+    "Kanal-",
   },
   { "Volume+",
     "Lautst�rke+",
@@ -4352,6 +4566,7 @@ const tI18nPhrase Phrases[] = {
     "��������� +",
     "Glasnije", // hrv "Glasnocca +"
     "Helitugevus+",
+    "Lydstyrke+",
   },
   { "Volume-",
     "Lautst�rke-",
@@ -4372,6 +4587,7 @@ const tI18nPhrase Phrases[] = {
     "��������� -",
     "Ti�e", // hrv Glasnocca -"
     "Helitugevus-",
+    "Lydstyrke-",
   },
   { "Mute",
     "Stumm",
@@ -4392,6 +4608,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ����",
     "Bez zvuka",
     "H��letu",
+    "Sluk lyd",
   },
   // Miscellaneous:
   { "yes",
@@ -4413,6 +4630,7 @@ const tI18nPhrase Phrases[] = {
     "��",
     "da",
     "jah",
+    "ja",
   },
   { "no",
     "nein",
@@ -4433,6 +4651,7 @@ const tI18nPhrase Phrases[] = {
     "���",
     "ne",
     "ei",
+    "nej",
   },
   { "off",
     "aus",
@@ -4453,6 +4672,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "ugasi",
     "v�lja",
+    "fra",
   },
   { "none",
     "keine",
@@ -4473,6 +4693,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "nijedan",
     "t�hi",
+    "ingen",
   },
   { "auto",
     "auto",
@@ -4493,6 +4714,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "automatski",
     "automaatne",
+    "automatisk",
   },
   { "top",
     "oben",
@@ -4513,6 +4735,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "gore",
     "�leval",
+    "top",
   },
   { "bottom",
     "unten",
@@ -4533,6 +4756,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "dolje",
     "all",
+    "bund",
   },
   { "Disk",
     "Disk",
@@ -4553,6 +4777,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Disk",
     "Ketas",
+    "Disk",
   },
   { "free",
     "frei",
@@ -4573,6 +4798,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "slobodno",
     "vaba",
+    "fri",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -4593,6 +4819,7 @@ const tI18nPhrase Phrases[] = {
     "�������: ",
     "Sko�i: ",
     "H�pe: ",
+    "Hop: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -4613,6 +4840,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ",
     "Glasno�a ",
     "Helitugevus ",
+    "Lydstyrke ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -4633,6 +4861,7 @@ const tI18nPhrase Phrases[] = {
     " ���������� ���������������",
     " Prekini reprodukciju",
     " L�peta kordus",
+    " Stop afspilning",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -4653,6 +4882,7 @@ const tI18nPhrase Phrases[] = {
     " ���������� ������ ",
     " Prekini snimanje ",
     " L�peta salvestamine ",
+    " Stop optagelse ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -4673,6 +4903,7 @@ const tI18nPhrase Phrases[] = {
     " �������� ������ ������",
     " Prekini ure�ivanje",
     " Katkesta monteerimine",
+    " Afbryd redigering",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -4693,6 +4924,7 @@ const tI18nPhrase Phrases[] = {
     "����� ��������� DVB-����������...",
     "Preklapanje primarnog DVB ure�aja...",
     "Esmase DVB seadme �mberl�litus...",
+    "Skifter prim�r DVB enhed...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -4713,6 +4945,7 @@ const tI18nPhrase Phrases[] = {
     "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\"",
     "Gore/Dolje na novu poziciju - zatim OK",
     "'�les/Alla' uus asukoht - 'OK' kinnitus",
+    "Op/Ned for ny placering - OK for at flytte",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -4733,6 +4966,7 @@ const tI18nPhrase Phrases[] = {
     "����� ������ ������",
     "Rezanje je zapo�eto",
     "Redigeerimine algas",
+    "Redigeringsproces startet",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -4753,6 +4987,7 @@ const tI18nPhrase Phrases[] = {
     "������ �������",
     "Rezanje zavr�eno",
     "Redigeerimine on l�petatud",
+    "Redigeringsproces afsluttet",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -4773,6 +5008,7 @@ const tI18nPhrase Phrases[] = {
     "������ �� ����� ������� ������!",
     "Rezanje neuspje�no!",
     "Redigeerimine eba�nnestus",
+    "Redigeringsproces fejlede!",
   },
   { "scanning recordings...",
     "Aufzeichnungen werden durchsucht...",
@@ -4793,6 +5029,7 @@ const tI18nPhrase Phrases[] = {
     "������������ �������...",
     "pretra�ivanje snimljenog...",
     "salvestuste skaneerimine...",
+    "skanner optagelser...",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -4813,6 +5050,7 @@ const tI18nPhrase Phrases[] = {
     "����� ����������� ���������...",
     "Zaustavljanje �ivog signala...",
     "Saate edastamise peatamine...",
+    "Pausere live udsendelse...",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -4833,6 +5071,7 @@ const tI18nPhrase Phrases[] = {
     "������ �� ����� ���������� ���������!",
     "Ovaj dodatak (Plugin) nema parametara!",
     "Sellel laienudusmoodulil ei ole seadeid!",
+    "Denne plugin har ingen parametre",
   },
   { "Classic VDR",
     "Klassischer VDR",
@@ -4853,6 +5092,7 @@ const tI18nPhrase Phrases[] = {
     "������������",
     "Klasi�cni VDR",
     "Klassikaline VDR",
+    "Klassisk VDR",
   },
   { "ST:TNG Panels",
     "ST:TNG Konsolen",
@@ -4873,6 +5113,7 @@ const tI18nPhrase Phrases[] = {
     "ST:TNG ������",
     "ST:TNG Konzole",
     "ST:TNG konsool",
+    "ST:TNG konsol",
   },
   { NULL }
   };
@@ -4982,6 +5223,12 @@ int I18nLanguageIndex(const char *Code)
 
 const char *I18nNormalizeLanguageCode(const char *Code)
 {
+  if (Code[0] && !isalnum(Code[0]) || Code[1] && !isalnum(Code[1]) || Code[2] && !isalnum(Code[2])) {
+     // ISO 639 language codes are defined as alphabetical characters, but digits are apparently
+     // also used, for instance for "2ch"
+     //dsyslog("invalid language code: '%s'", Code);
+     return "???";
+     }
   int n = I18nLanguageIndex(Code);
   return n >= 0 ? I18nLanguageCode(n) : Code;
 }
diff --git a/i18n.h b/i18n.h
index b28511a8b..719844500 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.13 2004/10/16 11:50:41 kls Exp $
+ * $Id: i18n.h 1.14 2004/11/02 17:21:19 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 19;
+const int I18nNumLanguages = 20;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/menuitems.c b/menuitems.c
index ee92dc9f7..dea202957 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.19 2004/06/19 09:45:45 kls Exp $
+ * $Id: menuitems.c 1.20 2004/11/14 16:16:21 kls Exp $
  */
 
 #include "menuitems.h"
@@ -495,7 +495,7 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
                       }
                  }
                  break;
-    default : return cMenuEditIntItem::ProcessKey(Key);
+    default: return cMenuEditIntItem::ProcessKey(Key);
     }
   return osContinue;
 }
@@ -606,7 +606,33 @@ eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
                     return cMenuEditIntItem::ProcessKey(Key);
                  Set();
                  break;
-    default : return cMenuEditIntItem::ProcessKey(Key);
+    default: {
+               if (d >= 0) {
+                  if (k1 <= Key && Key <= k7) {
+                     int v = *value ^ (1 << (Key - k1));
+                     if ((v & 0xFF) != 0) {
+                        *value = v; // can't let this become all 0
+                        Set();
+                        }
+                     break;
+                     }
+                  }
+               int v = *value;
+               eOSState result = cMenuEditIntItem::ProcessKey(Key);
+               if (result == osContinue && Key == k0) {
+                  if (d >= 0) {
+                     *value = cTimer::GetMDay(time(NULL));
+                     d = -1;
+                     Set();
+                     }
+                  else if (*value == 0 || *value == v) {
+                     d = cTimer::GetWDay(time(NULL));
+                     *value = days[d];
+                     Set();
+                     }
+                  }
+               return result;
+             }
     }
   return osContinue;
 }
diff --git a/skins.c b/skins.c
index 6872a9479..5770bd4cb 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.1 2004/05/15 12:34:38 kls Exp $
+ * $Id: skins.c 1.3 2004/11/07 09:46:46 kls Exp $
  */
 
 #include "skins.h"
@@ -183,13 +183,17 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
      if (displayMessage) {
         delete displayMessage;
         displayMessage = NULL;
+        cStatus::MsgOsdClear();
         }
-     else
+     else {
         cSkinDisplay::Current()->SetMessage(Type, NULL);
+        cStatus::MsgOsdStatusMessage(NULL);
+        }
      }
   else if (!s && displayMessage) {
      delete displayMessage;
      displayMessage = NULL;
+     cStatus::MsgOsdClear();
      }
   return k;
 }
diff --git a/timers.c b/timers.c
index 38fbf3948..501396ee6 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.16 2004/10/31 16:41:30 kls Exp $
+ * $Id: timers.c 1.17 2004/11/14 16:02:42 kls Exp $
  */
 
 #include "timers.h"
@@ -256,13 +256,13 @@ bool cTimer::IsSingleEvent(void) const
   return (day & 0x80000000) == 0;
 }
 
-int cTimer::GetMDay(time_t t) const
+int cTimer::GetMDay(time_t t)
 {
   struct tm tm_r;
   return localtime_r(&t, &tm_r)->tm_mday;
 }
 
-int cTimer::GetWDay(time_t t) const
+int cTimer::GetWDay(time_t t)
 {
   struct tm tm_r;
   int weekday = localtime_r(&t, &tm_r)->tm_wday;
diff --git a/timers.h b/timers.h
index 24f54adf9..bdf1b0d95 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.10 2004/10/31 16:41:17 kls Exp $
+ * $Id: timers.h 1.11 2004/11/14 16:02:28 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -64,8 +64,8 @@ class cTimer : public cListObject {
   bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void) const;
-  int GetMDay(time_t t) const;
-  int GetWDay(time_t t) const;
+  static int GetMDay(time_t t);
+  static int GetWDay(time_t t);
   bool DayMatches(time_t t) const;
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
diff --git a/vdr.c b/vdr.c
index d91308f57..c82f2b44c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.192 2004/10/31 10:17:23 kls Exp $
+ * $Id: vdr.c 1.193 2004/11/06 10:30:30 kls Exp $
  */
 
 #include <getopt.h>
@@ -87,6 +87,17 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
+#ifdef _CS_GNU_LIBPTHREAD_VERSION
+  // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
+  char LibPthreadVersion[128];
+  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
+     if (strstr(LibPthreadVersion, "NPTL")) {
+        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
+        return 2;
+        }
+     }
+#endif
+
   // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
   char *LangEnv;
   if ((LangEnv = getenv("LANG"))    != NULL && strcasestr(LangEnv, "utf") ||

From 630ba21dc198e3fbf8c15c59f7ea852f7174c476 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 21 Nov 2004 18:00:00 +0100
Subject: [PATCH 109/307] =?UTF-8?q?Version=201.3.17=20-=20Fixed=20cRemux::?=
 =?UTF-8?q?ScanVideoPacket()=20to=20make=20sure=20it=20doesn't=20access=20?=
 =?UTF-8?q?memory=20beyond=20=20=20the=20end=20of=20the=20given=20buffer,?=
 =?UTF-8?q?=20which=20has=20caused=20some=20unjustified=20"unknown=20=20?=
 =?UTF-8?q?=20picture=20type=20errors"=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler).=20-=20Fixed=20a=20possible=20crash=20when=20pausing?=
 =?UTF-8?q?=20live=20video=20and=20the=20recording=20was=20unable=20=20=20?=
 =?UTF-8?q?to=20start,=20maybe=20because=20there=20was=20no=20lock=20on=20?=
 =?UTF-8?q?the=20device=20(thanks=20to=20Andreas=20=20=20Brugger=20for=20r?=
 =?UTF-8?q?eporting=20this=20one).=20-=20Fixed=20some=20characters=20in=20?=
 =?UTF-8?q?the=20iso8859-2=20font=20file=20(thanks=20to=20Dino=20Ravnic).?=
 =?UTF-8?q?=20-=20Fixed=20some=20errors=20in=20the=20Croatian=20language?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Dino=20Ravnic).=20-=20Fixed=20a=20pos?=
 =?UTF-8?q?sible=20recursion=20in=20cControl::Shutdown()=20(thanks=20to=20?=
 =?UTF-8?q?Sascha=20Volkenandt).=20-=20Now=20setting=20the=20VPID=20before?=
 =?UTF-8?q?=20the=20APID=20in=20live=20mode=20to=20avoid=20unnecessary=20?=
 =?UTF-8?q?=20=20overhead=20in=20the=20firmware=20(thanks=20to=20Werner=20?=
 =?UTF-8?q?Fink).=20-=20Now=20checking=20available=20OSD=20memory=20at=20r?=
 =?UTF-8?q?untime=20(thanks=20to=20Oliver=20Endriss).=20-=20Fixed=20some?=
 =?UTF-8?q?=20typos=20in=20the=20Makefile's=20'font'=20target=20(thanks=20?=
 =?UTF-8?q?to=20Olaf=20Titz).=20-=20Fixed=20handling=20childTid=20in=20cTh?=
 =?UTF-8?q?read=20to=20avoid=20possible=20race=20conditions=20(thanks=20?=
 =?UTF-8?q?=20=20to=20Stefan=20Huelswitt=20for=20pointing=20this=20out).?=
 =?UTF-8?q?=20-=20Fixed=20toggling=20the=20"Day"=20item=20in=20the=20"Time?=
 =?UTF-8?q?rs"=20menu,=20so=20that=20it=20selects=20the=20=20=20right=20da?=
 =?UTF-8?q?y=20of=20week=20for=20timers=20in=20the=20future.=20-=20Some=20?=
 =?UTF-8?q?improvements=20to=20cPoller=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS        |  20 ++++++++
 HISTORY             |  21 +++++++++
 Makefile            |   8 ++--
 channels.conf       |  15 +++---
 config.h            |   6 +--
 dvbdevice.c         |   4 +-
 dvbosd.c            |  15 ++++--
 fontosd-iso8859-2.c | 112 ++++++++++++++++++++++----------------------
 i18n.c              |   8 ++--
 menu.c              |  10 +++-
 menuitems.c         |   9 ++--
 menuitems.h         |   6 ++-
 player.c            |   5 +-
 remux.c             |   4 +-
 runvdr              |   2 +-
 thread.c            |  13 +++--
 timers.c            |  14 +++++-
 timers.h            |   3 +-
 tools.c             |   5 +-
 19 files changed, 180 insertions(+), 100 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 000ed4604..0ee05623f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -188,6 +188,7 @@ Stefan Huelswitt <huels@iname.com>
  for reporting a bug in setting the title in the replay display of the "Classic VDR"
  skin in case a shorter title is set after a longer one
  for fixing handling of pmAudioOnlyBlack
+ for pointing out possible race conditions in handling childTid in cThread
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -260,6 +261,8 @@ Werner Fink <werner@suse.de>
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
  for suggesting to replace usleep() calls with a pthread_cond_timedwait() based wait
  for suggesting to add more checks and polling when getting frontend events
+ for setting the VPID before the APID in live mode to avoid unnecessary
+ overhead in the firmware
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -537,6 +540,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for adding a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf'
  for reporting a problem with the name of the remote control for which the keys are
  being learned overwriting the date/time in the 'classic' skin
+ for making cDvbOsd check available OSD memory at runtime
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -735,6 +739,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for pointing out a "near miss" condition in cCondVar
  for reporting a bug in cChannel::SetName() in case only the ShortName or Provider
  has changed
+ for fixing a possible recursion in cControl::Shutdown()
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -1079,6 +1084,10 @@ Marco Schl
  for fixing the cDvbSpuDecoder
  for fixing a short glitch when starting a recording on the primary device while
  in replay or transfer mode
+ for fixing cRemux::ScanVideoPacket() to make sure it doesn't access memory beyond
+ the end of the given buffer, which has caused some unjustified "unknown picture
+ type errors"
+ for some improvements to cPoller
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1149,3 +1158,14 @@ Joachim Wilke <vdr@joachim-wilke.de>
 
 Sascha Klek <sklek@gmx.de>
   for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
+
+Andreas Brugger <brougs78@gmx.net>
+  for reporting a possible crash when pausing live video and the recording was
+  unable to start, maybe because there was no lock on the device
+
+Dino Ravnic <dino.ravnic@fer.hr>
+ for fixing some characters in the iso8859-2 font file
+ for fixing some errors in the Croatian language texts
+
+Olaf Titz <olaf@bigred.inka.de>
+ for fixing some typos in the Makefile's 'font' target
diff --git a/HISTORY b/HISTORY
index 07534fbd9..e7a5cfccb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3138,3 +3138,24 @@ Video Disk Recorder Revision History
   shot" and "repeating". The keys '1'...'7' can be used to toggle the individual
   days ('1' is monday). Thanks to Sascha Klek for reporting a problem with the
   '0' key in the "Day" item of the "Timers" menu.
+
+2004-11-21: Version 1.3.17
+
+- Fixed cRemux::ScanVideoPacket() to make sure it doesn't access memory beyond
+  the end of the given buffer, which has caused some unjustified "unknown
+  picture type errors" (thanks to Marco Schl��ler).
+- Fixed a possible crash when pausing live video and the recording was unable
+  to start, maybe because there was no lock on the device (thanks to Andreas
+  Brugger for reporting this one).
+- Fixed some characters in the iso8859-2 font file (thanks to Dino Ravnic).
+- Fixed some errors in the Croatian language texts (thanks to Dino Ravnic).
+- Fixed a possible recursion in cControl::Shutdown() (thanks to Sascha Volkenandt).
+- Now setting the VPID before the APID in live mode to avoid unnecessary
+  overhead in the firmware (thanks to Werner Fink).
+- Now checking available OSD memory at runtime (thanks to Oliver Endriss).
+- Fixed some typos in the Makefile's 'font' target (thanks to Olaf Titz).
+- Fixed handling childTid in cThread to avoid possible race conditions (thanks
+  to Stefan Huelswitt for pointing this out).
+- Fixed toggling the "Day" item in the "Timers" menu, so that it selects the
+  right day of week for timers in the future.
+- Some improvements to cPoller (thanks to Marco Schl��ler).
diff --git a/Makefile b/Makefile
index d0a05334e..132768147 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.69 2004/10/30 11:51:09 kls Exp $
+# $Id: Makefile 1.72 2004/11/21 11:28:55 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -80,9 +80,9 @@ all: vdr
 font: genfontfile\
       fontfix.c fontosd.c fontsml.c\
       fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
-      fontfix_iso8859-5.c fontosd_iso8859-5.c fontsml_iso8859-5.c\
-      fontfix_iso8859-7.c fontosd_iso8859-7.c fontsml_iso8859-7.c\
-      fontfix_iso8859-15.c fontosd_iso8859-15.c fontsml_iso8859-15.c
+      fontfix-iso8859-5.c fontosd-iso8859-5.c fontsml-iso8859-5.c\
+      fontfix-iso8859-7.c fontosd-iso8859-7.c fontsml-iso8859-7.c\
+      fontfix-iso8859-15.c fontosd-iso8859-15.c fontsml-iso8859-15.c
 	@echo "font files created."
 
 # Implicit rules:
diff --git a/channels.conf b/channels.conf
index 95ccdf14a..f6db1a74c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -15,8 +15,8 @@ ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF 1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
-ORF 2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
@@ -31,7 +31,6 @@ rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
-CNBC Europe;CNBC:12610:vC56:S19.2E:22000:944:945=eng:946:0:12200:1:1112:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
@@ -48,7 +47,7 @@ PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
@@ -94,15 +93,15 @@ Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5
 ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2054:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
-Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307:2305:960,961:6201:2:2009:0
+Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
-Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0
+Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2321+2304:2322=eng,2323=NAR;2325=eng:2324:960,961:4403:2:2007:0
 Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR:2308:960,961:4402:2:2011:0
 Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:2313+2304:2314=eng,2315=NAR:2316:960,961:4503:2:2011:0
 Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR:2312:960,961:4502:2:2011:0
 Sky Movies 7;BSkyB:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
-Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:2320+2304:2321=eng,2322=NAR:2323:960,961:5502:2:2007:0
+Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:2326+2304:2327=eng,2328=NAR:2329:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
 Sky Cinema 1;BSkyB:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
 Sky Cinema 2;BSkyB:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
@@ -115,6 +114,6 @@ S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
 Olisat / Telefe;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
-EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
+Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
 :@1000 New channels
diff --git a/config.h b/config.h
index 955eb9f8b..212f87816 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.204 2004/11/02 17:20:27 kls Exp $
+ * $Id: config.h 1.205 2004/11/16 16:57:43 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.16"
-#define VDRVERSNUM   10316  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.17"
+#define VDRVERSNUM   10317  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 2702f953d..8780ac533 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.104 2004/11/07 10:27:19 kls Exp $
+ * $Id: dvbdevice.c 1.105 2004/11/20 11:41:37 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -800,7 +800,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (TurnOnLivePIDs) {
      aPid1 = Channel->Apid1();
      aPid2 = Channel->Apid2();
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Apid1(), ptAudio) && AddPid(Channel->Vpid(), ptVideo))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid1(), ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
diff --git a/dvbosd.c b/dvbosd.c
index 973298d32..fbf6f61c0 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.24 2004/07/18 13:51:42 kls Exp $
+ * $Id: dvbosd.c 1.25 2004/11/20 14:29:25 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -18,11 +18,12 @@
 // --- cDvbOsd ---------------------------------------------------------------
 
 #define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
-#define MAXOSDMEMORY  92000 // number of bytes available to the OSD (depends on firmware version, but there is no way of determining the actual value)
+#define MAXOSDMEMORY  92000 // number of bytes available to the OSD (for unmodified DVB cards)
 
 class cDvbOsd : public cOsd {
 private:
   int osdDev;
+  int osdMem;
   bool shown;
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
 public:
@@ -40,6 +41,14 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
   if (osdDev < 0)
      esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
   else {
+     osdMem = MAXOSDMEMORY;
+#ifdef OSD_CAP_MEMSIZE
+     // modified DVB cards may have more OSD memory:
+     osd_cap_t cap;
+     cap.cmd = OSD_CAP_MEMSIZE;
+     if (ioctl(osdDev, OSD_GET_CAPABILITY, &cap) == 0)
+        osdMem = cap.val;
+#endif
      // must clear all windows here to avoid flashing effects - doesn't work if done
      // in Flush() only for the windows that are actually used...
      for (int i = 0; i < MAXNUMWINDOWS; i++) {
@@ -74,7 +83,7 @@ eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
             return oeWrongAlignment;
          TotalMemory += Areas[i].Width() * Areas[i].Height() / (8 / Areas[i].bpp);
          }
-     if (TotalMemory > MAXOSDMEMORY)
+     if (TotalMemory > osdMem)
         return oeOutOfMemory;
      }
   return Result;
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index bf9c0fb9f..4b68e4e5b 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -4992,34 +4992,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
   },
   {             // 198 iso8859-2
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     17, 27,
+     0x000000E0,  // ..........***....
+     0x000000C0,  // ..........**.....
+     0x00000180,  // .........**......
+     0x00000300,  // ........**.......
+     0x00000000,  // .................
+     0x00000FC0,  // ......******.....
+     0x00003FE0,  // ....*********....
+     0x00007070,  // ...***.....***...
+     0x0000E038,  // ..***.......***..
+     0x0000C018,  // ..**.........**..
+     0x0000C000,  // ..**.............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018000,  // .**..............
+     0x00018018,  // .**..........**..
+     0x0000C018,  // ..**.........**..
+     0x0000E018,  // ..***........**..
+     0x00007030,  // ...***......**...
+     0x00007FF0,  // ...***********...
+     0x00001FC0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 199
      17, 27,
@@ -5952,34 +5952,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
   },
   {             // 230 iso8859-2
-       17, 27,
-       0x000000E0,  // ..........***....
-       0x000000C0,  // ..........**.....
-       0x00000180,  // .........**......
-       0x00000300,  // ........**.......
-       0x00000000,  // .................
-       0x00000FC0,  // ......******.....
-       0x00003FE0,  // ....*********....
-       0x00007070,  // ...***.....***...
-       0x0000E038,  // ..***.......***..
-       0x0000C018,  // ..**.........**..
-       0x0000C000,  // ..**.............
-       0x00018000,  // .**..............
-       0x00018000,  // .**..............
-       0x00018000,  // .**..............
-       0x00018000,  // .**..............
-       0x00018000,  // .**..............
-       0x00018018,  // .**..........**..
-       0x0000C018,  // ..**.........**..
-       0x0000E018,  // ..***........**..
-       0x00007030,  // ...***......**...
-       0x00007FF0,  // ...***********...
-       0x00001FC0,  // .....*******.....
-       0x00000000,  // .................
-       0x00000000,  // .................
-       0x00000000,  // .................
-       0x00000000,  // .................
-       0x00000000,  // .................
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000030,  // .......**...
+     0x00000060,  // ......**....
+     0x000000C0,  // .....**.....
+     0x00000000,  // ............
+     0x000001F0,  // ....*****...
+     0x000007F8,  // ..********..
+     0x0000061C,  // ..**....***.
+     0x00000C0C,  // .**......**.
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C00,  // .**.........
+     0x00000C0C,  // .**......**.
+     0x0000061C,  // ..**....***.
+     0x000007F8,  // ..********..
+     0x000001F0,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 231
      12, 27,
diff --git a/i18n.c b/i18n.c
index 75756041d..8121d2b05 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.163 2004/11/14 14:28:29 kls Exp $
+ * $Id: i18n.c 1.164 2004/11/20 11:23:58 kls Exp $
  *
  * Translations provided by:
  *
@@ -23,7 +23,7 @@
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
- * Croatian    Drazen Dupor <drazen.dupor@dupor.com>
+ * Croatian    Drazen Dupor <drazen.dupor@dupor.com> and Dino Ravnic <dino.ravnic@fer.hr>
  * Estonian    Arthur Konovalov <kasjas@hot.ee>
  * Danish      Mogens Elneff <mogens@elneff.dk>
  *
@@ -480,7 +480,7 @@ const tI18nPhrase Phrases[] = {
     "Be�ll�tani",
     "Editar",
     "�������������",
-    "Promjeni",
+    "Promijeni",
     "Muuda",
     "Rediger",
   },
@@ -5090,7 +5090,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "������������",
-    "Klasi�cni VDR",
+    "Klasi�ni VDR",
     "Klassikaline VDR",
     "Klassisk VDR",
   },
diff --git a/menu.c b/menu.c
index f5c3c6110..f482ad173 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.319 2004/11/01 13:49:40 kls Exp $
+ * $Id: menu.c 1.320 2004/11/20 10:49:17 kls Exp $
  */
 
 #include "menu.h"
@@ -2833,10 +2833,16 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName, Recording.Name());
         Recordings.AddByName(fileName);
+        return;
         }
      else
         DELETENULL(recorder);
      }
+  if (!Timer) {
+     Timers.Del(timer);
+     Timers.SetModified();
+     timer = NULL;
+     }
 }
 
 cRecordControl::~cRecordControl()
@@ -2928,7 +2934,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
            for (int i = 0; i < MAXRECORDCONTROLS; i++) {
                if (!RecordControls[i]) {
                   RecordControls[i] = new cRecordControl(device, Timer, Pause);
-                  return true;
+                  return RecordControls[i]->Process(time(NULL));
                   }
                }
            }
diff --git a/menuitems.c b/menuitems.c
index dea202957..9b86db4b4 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.20 2004/11/14 16:16:21 kls Exp $
+ * $Id: menuitems.c 1.21 2004/11/21 13:24:10 kls Exp $
  */
 
 #include "menuitems.h"
@@ -554,6 +554,7 @@ cMenuEditDayItem::cMenuEditDayItem(const char *Name, int *Value)
 :cMenuEditIntItem(Name, Value, -INT_MAX, 31)
 {
   d = -1;
+  md = 0;
   if (*value < 0) {
      int n = 0;
      while (days[n]) {
@@ -621,12 +622,14 @@ eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
                eOSState result = cMenuEditIntItem::ProcessKey(Key);
                if (result == osContinue && Key == k0) {
                   if (d >= 0) {
-                     *value = cTimer::GetMDay(time(NULL));
+                     *value = md ? md : cTimer::GetMDay(time(NULL));
+                     md = 0;
                      d = -1;
                      Set();
                      }
                   else if (*value == 0 || *value == v) {
-                     d = cTimer::GetWDay(time(NULL));
+                     md = v;
+                     d = cTimer::GetWDayFromMDay(v);
                      *value = days[d];
                      Set();
                      }
diff --git a/menuitems.h b/menuitems.h
index 5a2912c86..28904013c 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.9 2004/05/16 12:45:14 kls Exp $
+ * $Id: menuitems.h 1.10 2004/11/21 13:23:00 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -119,9 +119,11 @@ class cMenuEditTranItem : public cMenuEditChanItem {
   };
 
 class cMenuEditDayItem : public cMenuEditIntItem {
-protected:
+private:
   static int days[];
   int d;
+  int md;
+protected:
   virtual void Set(void);
 public:
   cMenuEditDayItem(const char *Name, int *Value);
diff --git a/player.c b/player.c
index c08e42307..2b306c0b2 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.7 2004/04/16 13:34:11 kls Exp $
+ * $Id: player.c 1.8 2004/11/20 11:33:08 kls Exp $
  */
 
 #include "player.h"
@@ -88,6 +88,7 @@ void cControl::Attach(void)
 
 void cControl::Shutdown(void)
 {
-  delete control;
+  cControl *c = control; // avoids recursions
   control = NULL;
+  delete c;
 }
diff --git a/remux.c b/remux.c
index e096f9cca..b9c04af3d 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.21 2004/10/24 09:25:33 kls Exp $
+ * $Id: remux.c 1.22 2004/11/16 16:49:03 kls Exp $
  */
 
 #include "remux.h"
@@ -451,7 +451,7 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
      if (Length >= 8) {
         int i = Offset + 8; // the minimum length of the video packet header
         i += Data[i] + 1;   // possible additional header bytes
-        for (; i < Offset + Length; i++) {
+        for (; i < Offset + Length - 5; i++) {
             if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
                switch (Data[i + 3]) {
                  case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
diff --git a/runvdr b/runvdr
index 883e16b1c..76fd5f08d 100755
--- a/runvdr
+++ b/runvdr
@@ -18,7 +18,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.12 2004/01/09 16:19:26 kls Exp $
+# $Id: runvdr 1.14 2004/11/21 11:30:00 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
diff --git a/thread.c b/thread.c
index 080be0e0d..7045e5ad4 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.36 2004/10/31 09:54:02 kls Exp $
+ * $Id: thread.c 1.37 2004/11/20 16:21:14 kls Exp $
  */
 
 #include "thread.h"
@@ -233,12 +233,15 @@ void *cThread::StartThread(cThread *Thread)
 
 bool cThread::Start(void)
 {
+  Lock();
   if (!childTid) {
      parentTid = pthread_self();
-     pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this);
-     pthread_detach(childTid); // auto-reap
-     pthread_setschedparam(childTid, SCHED_RR, 0);
+     pthread_t Tid;
+     pthread_create(&Tid, NULL, (void *(*) (void *))&StartThread, (void *)this);
+     pthread_detach(Tid); // auto-reap
+     pthread_setschedparam(Tid, SCHED_RR, 0);
      }
+  Unlock();
   return true; //XXX return value of pthread_create()???
 }
 
@@ -277,10 +280,12 @@ void cThread::Cancel(int WaitSeconds)
             }
         esyslog("ERROR: thread %ld won't end (waited %d seconds) - cancelling it...", childTid, WaitSeconds);
         }
+     Lock();
      if (childTid) {
         pthread_cancel(childTid);
         childTid = 0;
         }
+     Unlock();
      }
 }
 
diff --git a/timers.c b/timers.c
index 501396ee6..62f59d84c 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.17 2004/11/14 16:02:42 kls Exp $
+ * $Id: timers.c 1.18 2004/11/21 13:15:33 kls Exp $
  */
 
 #include "timers.h"
@@ -269,6 +269,18 @@ int cTimer::GetWDay(time_t t)
   return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
 }
 
+int cTimer::GetWDayFromMDay(int MDay)
+{
+  time_t now =  time(NULL);
+  int md = GetMDay(now);
+  for (int i = -1; i <= 28; i++) { // looking 4 weeks into the future should be enough
+      time_t t0 = IncDay(now, i);
+      if (GetMDay(t0) == MDay)
+         return GetWDay(t0);
+      }
+  return GetWDay(now); // just to return something
+}
+
 bool cTimer::DayMatches(time_t t) const
 {
   return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
diff --git a/timers.h b/timers.h
index bdf1b0d95..eceb07807 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.11 2004/11/14 16:02:28 kls Exp $
+ * $Id: timers.h 1.12 2004/11/21 12:37:33 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -66,6 +66,7 @@ class cTimer : public cListObject {
   bool IsSingleEvent(void) const;
   static int GetMDay(time_t t);
   static int GetWDay(time_t t);
+  static int GetWDayFromMDay(int MDay);
   bool DayMatches(time_t t) const;
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
diff --git a/tools.c b/tools.c
index ecb57c319..41d0c7259 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.81 2004/10/31 16:42:36 kls Exp $
+ * $Id: tools.c 1.82 2004/11/21 14:36:34 kls Exp $
  */
 
 #include "tools.h"
@@ -532,12 +532,13 @@ bool cPoller::Add(int FileHandle, bool Out)
 {
   if (FileHandle >= 0) {
      for (int i = 0; i < numFileHandles; i++) {
-         if (pfd[i].fd == FileHandle)
+         if (pfd[i].fd == FileHandle && pfd[i].events == (Out ? POLLOUT : POLLIN))
             return true;
          }
      if (numFileHandles < MaxPollFiles) {
         pfd[numFileHandles].fd = FileHandle;
         pfd[numFileHandles].events = Out ? POLLOUT : POLLIN;
+        pfd[numFileHandles].revents = 0;
         numFileHandles++;
         return true;
         }

From fb5cccb2df60361a18fe3fd572b0fe18f3a4331c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 9 Jan 2005 18:00:00 +0100
Subject: [PATCH 110/307] =?UTF-8?q?Version=201.3.18=20-=20Removed=20an=20u?=
 =?UTF-8?q?nused=20variable=20from=20cTimer::GetWDayFromMDay()=20(thanks?=
 =?UTF-8?q?=20to=20Wayne=20Keer=20=20=20for=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Some=20more=20changes=20to=20the=20'childTid'=20handling=20i?=
 =?UTF-8?q?n=20cThread=20(based=20on=20suggestions=20by=20=20=20Stefan=20H?=
 =?UTF-8?q?uelswitt).=20-=20Fixed=20the=20spelling=20of=20'canceling'=20(t?=
 =?UTF-8?q?hanks=20to=20Wayne=20Keer=20for=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Re-introduced=20a=20sleep=20to=20cDvbPlayer::Action()=20to?=
 =?UTF-8?q?=20avoid=20high=20CPU=20load=20in=20still=20=20=20picture=20mod?=
 =?UTF-8?q?e=20(thanks=20to=20Reinhard=20Nissl=20for=20reporting=20this=20?=
 =?UTF-8?q?one).=20-=20Fixed=20a=20possible=20race=20condition=20in=20gene?=
 =?UTF-8?q?rating=20the=20DVB=20device=20names=20(thanks=20to=20=20=20Rain?=
 =?UTF-8?q?er=20Zocholl=20for=20reporting=20this=20one).=20-=20Changed=20t?=
 =?UTF-8?q?he=20way=20PES=20packets=20are=20played=20to=20allow=20replay?=
 =?UTF-8?q?=20of=20AC3=20sound=20over=20the=20=20=20full=20featured=20DVB?=
 =?UTF-8?q?=20cards=20(partially=20based=20on=20a=20patch=20from=20Werner?=
 =?UTF-8?q?=20Fink).=20=20=20+=20The=20new=20function=20cDevice::PlayPes()?=
 =?UTF-8?q?=20is=20now=20called=20with=20the=20complete=20PES=20data=20=20?=
 =?UTF-8?q?=20=20=20stream=20and=20calls=20PlayVideo()=20and=20PlayAudio()?=
 =?UTF-8?q?=20as=20necessary.=20=20=20+=20cDevice::PlayVideo()=20is=20now?=
 =?UTF-8?q?=20only=20called=20with=20actual=20video=20PES=20packets.=20=20?=
 =?UTF-8?q?=20+=20cDevice::PlayAudio()=20is=20now=20called=20with=20the=20?=
 =?UTF-8?q?actual=20audio=20PES=20packets,=20which=20=20=20=20=20can=20be?=
 =?UTF-8?q?=20either=20"normal"=20audio=20or=20AC3=20data.=20You=20need=20?=
 =?UTF-8?q?at=20least=20firmware=20version=20=20=20=20=200x261d=20to=20rep?=
 =?UTF-8?q?lay=20AC3=20sound=20over=20a=20full=20featured=20DVB=20card.=20?=
 =?UTF-8?q?This=20function=20now=20=20=20=20=20has=20an=20'int'=20return?=
 =?UTF-8?q?=20value.=20=20=20+=20PlayAudio()=20of=20derived=20cDevice=20cl?=
 =?UTF-8?q?asses=20shall=20no=20longer=20call=20the=20base=20class=20=20?=
 =?UTF-8?q?=20=20=20function.=20It=20shall=20just=20play=20the=20given=20d?=
 =?UTF-8?q?ata=20as=20audio.=20=20=20+=20cPlayer::PlayVideo()=20and=20cPla?=
 =?UTF-8?q?yer::PlayAudio()=20are=20now=20obsolete=20and=20have=20been=20?=
 =?UTF-8?q?=20=20=20=20replaced=20with=20cPlayer::PlayPes().=20=20=20+=20A?=
 =?UTF-8?q?ll=20StripAudioPackets()=20functions=20are=20now=20obsolete.=20?=
 =?UTF-8?q?The=20functionality=20has=20been=20=20=20=20=20moved=20into=20c?=
 =?UTF-8?q?Device::PlayPes(),=20where=20only=20the=20video=20and=20audio?=
 =?UTF-8?q?=20packets=20that=20are=20=20=20=20=20actually=20required=20wil?=
 =?UTF-8?q?l=20be=20processed.=20=20=20+=20All=20audio=20track=20handling?=
 =?UTF-8?q?=20is=20now=20done=20by=20cDevice;=20cTransfer=20and=20cDvbPlay?=
 =?UTF-8?q?er=20no=20=20=20=20=20longer=20care=20about=20audio=20tracks.?=
 =?UTF-8?q?=20cPlayer,=20however,=20still=20has=20the=20virtual=20hooks=20?=
 =?UTF-8?q?=20=20=20=20for=20audio=20track=20handling=20in=20order=20to=20?=
 =?UTF-8?q?allow=20plugins=20to=20implement=20players=20that=20=20=20=20?=
 =?UTF-8?q?=20have=20their=20own=20idea=20about=20this.=20=20=20+=20cChann?=
 =?UTF-8?q?el::[AD]pid[12]()=20have=20been=20replaced=20with=20cChannel::[?=
 =?UTF-8?q?AD]pid(int=20i)=20to=20=20=20=20=20allow=20access=20to=20all=20?=
 =?UTF-8?q?available=20PIDs.=20-=20Escaped=20the=20'-'=20and=20'=C3=B6'=20?=
 =?UTF-8?q?characters=20in=20the=20man=20pages=20(thanks=20to=20Darren=20S?=
 =?UTF-8?q?alt=20for=20=20=20pointing=20this=20out).=20-=20Completed=20the?=
 =?UTF-8?q?=20Italian=20OSD=20texts=20(thanks=20to=20Sean=20Carlos).=20-?=
 =?UTF-8?q?=20Fixed=20setting=20'synced'=20in=20cRemux=20when=20recording?=
 =?UTF-8?q?=20radio=20channels=20(thanks=20to=20=20=20Laurence=20Abbott).?=
 =?UTF-8?q?=20-=20Removed=20the=20LOCK=5FTHREAD=20from=20the=20LIRC=20thre?=
 =?UTF-8?q?ad=20(thanks=20to=20Ludwig=20Nussel).=20-=20Fixed=20genfontfile?=
 =?UTF-8?q?.c=20(sometimes=20the=20character=20width=20was=20wrong,=20and?=
 =?UTF-8?q?=20the=20codes=20were=20=20=20shifted=20one=20too=20far=20to=20?=
 =?UTF-8?q?the=20left).=20-=20Fixed=20the=20character=20width=20and=20shif?=
 =?UTF-8?q?ted=20the=20codes=20one=20to=20the=20right=20in=20all=20font=20?=
 =?UTF-8?q?=20=20files.=20-=20Renamed=20font=3F=3F=3F.c=20to=20font=3F=3F?=
 =?UTF-8?q?=3F-iso8859-1.c=20for=20symmetry.=20-=20Switched=20the=20charac?=
 =?UTF-8?q?ter=20set=20to=20iso8859-15=20for=20English,=20German=20and=20F?=
 =?UTF-8?q?innish=20(thanks=20=20=20to=20Andreas=20Brugger=20for=20reporti?=
 =?UTF-8?q?ng=20the=20missing=20Euro=20sign=20in=20iso8859-1).=20-=20Added?=
 =?UTF-8?q?=20'channels.conf.terr'=20entries=20for=20L=C3=BCbeck=20(thanks?=
 =?UTF-8?q?=20to=20Stefan=20Hu=C3=9Ffeldt).=20-=20Fixed=20a=20race=20condi?=
 =?UTF-8?q?tion=20in=20starting=20a=20thread=20(thanks=20to=20Reinhard=20N?=
 =?UTF-8?q?issl=20for=20=20=20reporting=20this=20one).=20-=20Replaced=20no?=
 =?UTF-8?q?n-threadsafe=20library=20functions=20with=20their=20threadsafe?=
 =?UTF-8?q?=20versions=20(thanks=20=20=20to=20Rainer=20Zocholl=20for=20poi?=
 =?UTF-8?q?nting=20this=20out).=20-=20Other=20non-threadsafe=20functions?=
 =?UTF-8?q?=20have=20been=20replaced=20by=20threadsafe=20classes=20that=20?=
 =?UTF-8?q?hide=20=20=20the=20actual=20buffering.=20In=20particular=20thes?=
 =?UTF-8?q?e=20are:=20=20=20readdir()=20->=20cReadDir=20=20=20readline()?=
 =?UTF-8?q?=20->=20cReadLine=20-=20Several=20formerly=20non-threadsafe=20f?=
 =?UTF-8?q?unctions=20now=20have=20a=20return=20type=20of=20cString:=20=20?=
 =?UTF-8?q?=20cChannel::ToText()=20=20=20tChannelID::ToString()=20=20=20cE?=
 =?UTF-8?q?vent::GetDateString()=20=20=20cEvent::GetTimeString()=20=20=20c?=
 =?UTF-8?q?Event::GetEndTimeString()=20=20=20cEvent::GetVpsString()=20=20?=
 =?UTF-8?q?=20cMark::ToText()=20=20=20cTimer::ToText()=20=20=20cSource::To?=
 =?UTF-8?q?String()=20=20=20cTimer::PrintDay()=20=20=20cTimer::PrintFirstD?=
 =?UTF-8?q?ay()=20=20=20PrefixVideoFileName()=20=20=20IndexToHMSF()=20=20?=
 =?UTF-8?q?=20ChannelString()=20=20=20strescape()=20=20=20AddDirectory()?=
 =?UTF-8?q?=20=20=20itoa()=20=20=20WeekDayName()=20=20=20DayDateTime()=20?=
 =?UTF-8?q?=20=20When=20using=20these=20functions=20in=20a=20'const=20char?=
 =?UTF-8?q?=20*'=20context=20there=20is=20nothing=20special=20=20=20to=20c?=
 =?UTF-8?q?onsider,=20except=20that=20you=20can=20no=20longer=20have=20a?=
 =?UTF-8?q?=20pointer=20to=20the=20return=20value,=20=20=20as=20in=20=20?=
 =?UTF-8?q?=20const=20char=20*date=20=3D=20DayDateTime();=20=20=20Although?=
 =?UTF-8?q?=20this=20will=20compile=20without=20error=20message,=20the=20r?=
 =?UTF-8?q?esulting=20'date'=20will=20not=20=20=20be=20valid=20after=20thi?=
 =?UTF-8?q?s=20line.=20Use=20this=20instead:=20=20=20cString=20date=20=3D?=
 =?UTF-8?q?=20DayDateTime();=20=20=20In=20a=20'const=20void=20*'=20context?=
 =?UTF-8?q?=20(as=20in=20printf()=20etc.)=20the=20result=20needs=20to=20be?=
 =?UTF-8?q?=20=20=20dereferenced=20with=20a=20'*',=20as=20in=20=20=20print?=
 =?UTF-8?q?f("%s",=20*DayDateTime());=20=20=20to=20make=20it=20a=20'const?=
 =?UTF-8?q?=20char=20*'.=20-=20Removed=20delay=5Fms(),=20using=20cCondWait?=
 =?UTF-8?q?::SleepMs()=20instead.=20-=20Replaced=20time=5Fms()=20with=20a?=
 =?UTF-8?q?=20threadsafe=20and=20non-overflowing=20cTimeMs=20(thanks=20to?=
 =?UTF-8?q?=20Rainer=20=20=20Zocholl=20for=20pointing=20out=20this=20probl?=
 =?UTF-8?q?em).=20-=20Added=20cDevice::mutexReceiver=20to=20avoid=20a=20ra?=
 =?UTF-8?q?ce=20condition=20when=20attaching/detaching=20=20=20receivers?=
 =?UTF-8?q?=20from=20different=20threads.=20-=20The=20new=20remote=20contr?=
 =?UTF-8?q?ol=20button=20"Audio"=20can=20be=20used=20to=20switch=20between?=
 =?UTF-8?q?=20different=20=20=20audio=20tracks.=20The=20"Green"=20button?=
 =?UTF-8?q?=20in=20the=20"Main"=20menu=20has=20been=20changed=20from=20"La?=
 =?UTF-8?q?nguage"=20=20=20to=20"Audio",=20since=20it=20now=20also=20contr?=
 =?UTF-8?q?ols=20switching=20between=20normal=20and=20Dolby=20Digital=20?=
 =?UTF-8?q?=20=20audio=20tracks=20(see=20MANUAL=20for=20details).=20-=20Th?=
 =?UTF-8?q?e=20description=20of=20the=20audio=20tracks=20is=20now=20taken?=
 =?UTF-8?q?=20from=20the=20"component=20descriptors"=20=20=20that=20are=20?=
 =?UTF-8?q?broadcast=20in=20the=20EPG=20data.=20However=20(as=20no=20big?=
 =?UTF-8?q?=20surprise),=20not=20all=20channels=20=20=20actually=20provide?=
 =?UTF-8?q?=20useful=20data=20here,=20so=20there=20are=20now=20some=20addi?=
 =?UTF-8?q?tional=20EPG=20bugfixes,=20=20=20which=20can=20be=20activated?=
 =?UTF-8?q?=20by=20setting=20the=20"EPG=20bugfix=20level"=20to=203.=20-=20?=
 =?UTF-8?q?The=20format=20of=20the=20'epg.data'=20files=20has=20been=20ext?=
 =?UTF-8?q?ended=20by=20the=20new=20tag=20'X',=20which=20=20=20contains=20?=
 =?UTF-8?q?the=20stream=20components=20of=20an=20event=20(see=20man=20vdr(?=
 =?UTF-8?q?5)=20for=20details).=20-=20The=20cStatus=20class=20now=20has=20?=
 =?UTF-8?q?the=20new=20member=20function=20SetAudioTrack(),=20which=20can?=
 =?UTF-8?q?=20be=20=20=20used=20to=20get=20notified=20when=20the=20audio?=
 =?UTF-8?q?=20track=20has=20been=20switched,=20and=20the=20new=20member=20?=
 =?UTF-8?q?=20=20function=20SetAudioChannel()=20which=20is=20called=20when?=
 =?UTF-8?q?=20the=20audio=20channel=20is=20changed.=20-=20Skins=20need=20t?=
 =?UTF-8?q?o=20implement=20the=20new=20cSkinDisplayTrack=20class=20to=20di?=
 =?UTF-8?q?splay=20the=20audio=20=20=20track=20menu.=20-=20The=20ST:TNG=20?=
 =?UTF-8?q?skin=20now=20displays=20the=20current=20audio=20track=20descrip?=
 =?UTF-8?q?tion=20(if=20any)=20at=20the=20=20=20botton=20left=20side.=20-?=
 =?UTF-8?q?=20The=20new=20setup=20option=20"DVB/Audio=20languages"=20can?=
 =?UTF-8?q?=20be=20used=20to=20control=20which=20audio=20=20=20language=20?=
 =?UTF-8?q?shall=20be=20selected=20in=20case=20a=20channel=20broadcasts=20?=
 =?UTF-8?q?in=20different=20languages=20=20=20(see=20MANUAL=20for=20detail?=
 =?UTF-8?q?s).=20-=20The=20"Left"=20and=20"Right"=20keys=20in=20the=20"Aud?=
 =?UTF-8?q?io"=20menu=20can=20be=20used=20to=20switch=20between=20=20=20th?=
 =?UTF-8?q?e=20left=20and=20right=20stereo=20channels=20in=20case=20there?=
 =?UTF-8?q?=20are=20different=20audio=20tracks=20=20=20in=20these=20channe?=
 =?UTF-8?q?ls=20(see=20MANUAL=20for=20details).=20-=20Fixed=20a=20possible?=
 =?UTF-8?q?=20race=20condition=20in=20cDevice::Action()=20(thanks=20to=20M?=
 =?UTF-8?q?attias=20Gr=C3=B6nlund).=20-=20Fixed=20the=20default=20quality?=
 =?UTF-8?q?=20value=20when=20grabbing=20a=20JPEG=20image=20(thanks=20to=20?=
 =?UTF-8?q?Patrick=20=20=20Gleichmann).=20-=20Fixed=20deleting=20a=20menu?=
 =?UTF-8?q?=20item=20in=20case=20the=20next=20item=20is=20not=20selectable?=
 =?UTF-8?q?=20(thanks=20to=20=20=20Dino=20Ravnic).=20-=20Implemented=20dis?=
 =?UTF-8?q?playing=20mandatory=20subtitles=20in=20the=20SPU=20decoder=20(t?=
 =?UTF-8?q?hanks=20to=20Marco=20=20=20Schl=C3=BC=C3=9Fler).=20-=20The=20se?=
 =?UTF-8?q?tup=20option=20"Recording/Record=20Dolby=20Digital"=20has=20bee?=
 =?UTF-8?q?n=20renamed=20and=20moved=20to=20=20=20"DVB/Use=20Dolby=20Digit?=
 =?UTF-8?q?al".=20It=20now=20controls=20whether=20Dolby=20Digital=20is=20r?=
 =?UTF-8?q?ecorded=20and=20=20=20whether=20an=20available=20DD=20audio=20t?=
 =?UTF-8?q?rack=20will=20appear=20in=20the=20"Audio"=20menu.=20-=20Added?=
 =?UTF-8?q?=20support=20for=20circular=20polarization=20(thanks=20to=20Jon?=
 =?UTF-8?q?an=20Santiago).=20-=20Thanks=20to=20Werner=20Fink,=20Reinhard?=
 =?UTF-8?q?=20Nissl,=20Sascha=20Volkenandt=20and=20Bj=C3=B8rnar=20Nilsen?=
 =?UTF-8?q?=20for=20=20=20their=20support=20in=20testing=20and=20fine=20tu?=
 =?UTF-8?q?ning=20this=20version.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |   35 +-
 HISTORY                             |  134 +-
 MANUAL                              |   89 +-
 Makefile                            |   10 +-
 PLUGINS.html                        |   75 +-
 PLUGINS/src/skincurses/HISTORY      |    5 +
 PLUGINS/src/skincurses/skincurses.c |   81 +-
 PLUGINS/src/sky/HISTORY             |    9 +
 PLUGINS/src/sky/sky.c               |    8 +-
 README                              |    6 +-
 channels.c                          |   47 +-
 channels.conf                       |   43 +-
 channels.conf.terr                  |   23 +
 channels.h                          |   21 +-
 config.c                            |   14 +-
 config.h                            |   10 +-
 device.c                            |  312 +-
 device.h                            |  147 +-
 diseqc.c                            |    4 +-
 dvbdevice.c                         |  113 +-
 dvbdevice.h                         |   19 +-
 dvbplayer.c                         |   91 +-
 dvbspu.c                            |    8 +-
 dvbspu.h                            |    5 +-
 eit.c                               |   36 +-
 epg.c                               |  194 +-
 epg.h                               |   62 +-
 font.c                              |    8 +-
 fontfix.c => fontfix-iso8859-1.c    | 5422 ++++++++++++------------
 fontfix-iso8859-15.c                | 5508 ++++++++++++------------
 fontfix-iso8859-2.c                 | 5540 ++++++++++++------------
 fontfix-iso8859-5.c                 | 4874 +++++++++++-----------
 fontfix-iso8859-7.c                 | 5758 ++++++++++++-------------
 fontosd.c => fontosd-iso8859-1.c    | 5800 +++++++++++++-------------
 fontosd-iso8859-15.c                | 5904 +++++++++++++-------------
 fontosd-iso8859-2.c                 | 5822 +++++++++++++-------------
 fontosd-iso8859-5.c                 | 4898 +++++++++++-----------
 fontosd-iso8859-7.c                 | 6028 +++++++++++++--------------
 fontsml.c => fontsml-iso8859-1.c    | 4774 ++++++++++-----------
 fontsml-iso8859-15.c                | 4862 ++++++++++-----------
 fontsml-iso8859-2.c                 | 4908 +++++++++++-----------
 fontsml-iso8859-5.c                 | 4452 ++++++++++----------
 fontsml-iso8859-7.c                 | 4776 ++++++++++-----------
 genfontfile.c                       |   11 +-
 i18n.c                              |  178 +-
 keys.c                              |    6 +-
 keys.h                              |    3 +-
 lirc.c                              |   21 +-
 menu.c                              |  271 +-
 menu.h                              |   24 +-
 osd.c                               |    5 +-
 osdbase.c                           |   11 +-
 player.c                            |   17 +-
 player.h                            |   36 +-
 plugin.c                            |   31 +-
 rcu.c                               |   11 +-
 recorder.c                          |    4 +-
 recording.c                         |   80 +-
 recording.h                         |    8 +-
 remux.c                             |    4 +-
 skinclassic.c                       |   95 +-
 skinclassic.h                       |    3 +-
 skins.h                             |   24 +-
 skinsttng.c                         |  183 +-
 skinsttng.h                         |    3 +-
 sources.c                           |    6 +-
 sources.h                           |    4 +-
 spu.h                               |    4 +-
 status.c                            |   14 +-
 status.h                            |   10 +-
 svdrp.c                             |   59 +-
 symbols/audioleft.xpm               |   23 +
 symbols/audioright.xpm              |   23 +
 symbols/audiostereo.xpm             |   23 +
 themes.c                            |   42 +-
 thread.c                            |   49 +-
 thread.h                            |    5 +-
 timers.c                            |   27 +-
 timers.h                            |    9 +-
 tools.c                             |  173 +-
 tools.h                             |   64 +-
 transfer.c                          |   97 +-
 transfer.h                          |    9 +-
 vdr.1                               |   62 +-
 vdr.5                               |   45 +-
 vdr.c                               |   37 +-
 videodir.c                          |   34 +-
 videodir.h                          |    5 +-
 88 files changed, 42123 insertions(+), 40665 deletions(-)
 rename fontfix.c => fontfix-iso8859-1.c (53%)
 rename fontosd.c => fontosd-iso8859-1.c (51%)
 rename fontsml.c => fontsml-iso8859-1.c (52%)
 create mode 100644 symbols/audioleft.xpm
 create mode 100644 symbols/audioright.xpm
 create mode 100644 symbols/audiostereo.xpm

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0ee05623f..904f68c5b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -263,6 +263,8 @@ Werner Fink <werner@suse.de>
  for suggesting to add more checks and polling when getting frontend events
  for setting the VPID before the APID in live mode to avoid unnecessary
  overhead in the firmware
+ for a patch that was used as a base for implementing a modified PES packet
+ handling in order to play AC3 audio over full featured DVB cards
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -345,6 +347,10 @@ Rainer Zocholl <vdrcontrib@zocki.toppoint.de>
  replaying in time shift mode
  for suggesting that VDR should stop if one of the configuration files can't be
  read correctly at program startup
+ for reporting a possible race condition in generating the DVB device names
+ for pointing out that non-threadsafe functions should be replaced with their
+ threadsafe versions
+ for pointing out a threadsafe and overflow problem with time_ms()
 
 Oleg Assovski <assen@bitcom.msk.ru>
  for adding EPG scanning for another 4 days
@@ -755,8 +761,9 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for reporting a problem on systems that have UTF-8 enabled
  for pointing out a flaw in the the description of cRingBufferLinear
  for reporting a bug in cRingBufferLinear::Get() in case the buffer wraps around
- for adding some checks when cancelling a thread and removing the usleep() in
+ for adding some checks when canceling a thread and removing the usleep() in
  cThread::Start()
+ for removing the LOCK_THREAD from the LIRC thread
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -764,6 +771,7 @@ Thomas Koch <tom@harhar.net>
 
 Stefan Hu�feldt <vdr@marvin.on-luebeck.de>
  for his help in keeping 'channels.conf.cable' up to date
+ for adding 'channels.conf.terr' entries for L�beck
 
 Christoph Friederich <christoph.friederich@gmx.de>
  for reporting a bug in deleting the last recording in the "Recordings" menu, which
@@ -804,6 +812,7 @@ Wolfgang Goeller <wgoeller@heraklit.ch>
 Jonan Santiago <jonan-lists-vdr@callisia.com>
  for fixing handling EPG data where the "extended event descriptor" comes before the
  "short event" or a "time shifted event"
+ for adding support for circular polarization
 
 Juri Haberland <juri@koschikode.com>
  for his help in keeping 'channels.conf.terr' up to date
@@ -857,7 +866,7 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
  for fixing a memory leak in thread handling when using NPTL
 
 Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
- for reporting a crash when cancelling a newly created timer
+ for reporting a crash when canceling a newly created timer
  for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated
 
 Michael Walle <michael.walle@web.de>
@@ -890,6 +899,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting a a crash in the time search mechanism
  for taking the complete size of available data into account when deciding whether
  to clear the transfer buffer to avoid overflows
+ for reporting a high CPU load in still picture mode after removing the usleep()
+ call from cDvbPlayer::Action()
+ for reporting a race condition in starting a thread
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1059,6 +1071,8 @@ Wayne Keer <syphir@syphir.sytes.net>
  cDvbDevice::cDvbDevice() in case a patch references them
  for suggesting to make the "Channel not available!" message and mtInfo instead of
  mtError
+ for reporting an unused variable from cTimer::GetWDayFromMDay()
+ for reporting a spelling error in 'canceling'
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
@@ -1088,6 +1102,7 @@ Marco Schl
  the end of the given buffer, which has caused some unjustified "unknown picture
  type errors"
  for some improvements to cPoller
+ for implementing displaying mandatory subtitles in the SPU decoder
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1146,6 +1161,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
  with a plugin
+ for fixing possible race condition in cDevice::Action()
 
 Uwe Hanke <uhanke@gmx.de>
  for fixing some typos in the Makefile's 'font' target
@@ -1162,10 +1178,25 @@ Sascha Klek <sklek@gmx.de>
 Andreas Brugger <brougs78@gmx.net>
   for reporting a possible crash when pausing live video and the recording was
   unable to start, maybe because there was no lock on the device
+  for reporting the missing Euro sign in iso8859-1
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
  for fixing some errors in the Croatian language texts
+ for fixing deleting a menu item in case the next item is not selectable
 
 Olaf Titz <olaf@bigred.inka.de>
  for fixing some typos in the Makefile's 'font' target
+
+Darren Salt <linux@youmustbejoking.demon.co.uk>
+ for pointing out that the '-' and '�' characters need to be escaped in the man
+ pages
+
+Sean Carlos <seanc@libero.it>
+ for translating OSD texts to the Italian language
+
+Laurence Abbott <laz@club-burniston.co.uk>
+ for fixing setting 'synced' in cRemux when recording radio channels
+
+Patrick Gleichmann <patrick@feedface.com>
+ for fixing the default quality value when grabbing a JPEG image
diff --git a/HISTORY b/HISTORY
index e7a5cfccb..8be48f554 100644
--- a/HISTORY
+++ b/HISTORY
@@ -346,7 +346,7 @@ Video Disk Recorder Revision History
   and then renames it).
 - In case the video data stream is broken the log message will come only every
   5 seconds.
-- The current channel is now saved in the 'setup.conf' file when VDR is cancelled,
+- The current channel is now saved in the 'setup.conf' file when VDR is canceled,
   and will be restored next time it is started (thanks to Deti Fliegl).
 - The EIT scanning thread is now locked when switching channels to avoid problems.
 - Encrypted channels can now be selected even without knowing the PNR (however, it
@@ -2241,7 +2241,7 @@ Video Disk Recorder Revision History
   Gruber for reporting this one).
 - Fixed editing channels ('timers.conf' was not written after a channel has
   been modified, which could result in errors upon the next start of VDR).
-- Fixed a crash when cancelling a newly created timer (thanks to Thomas Schmidt
+- Fixed a crash when canceling a newly created timer (thanks to Thomas Schmidt
   for reporting this one).
 - Completed Hungarian language texts (thanks to Istvan Koenigsberger and Guido
   Josten).
@@ -3065,7 +3065,7 @@ Video Disk Recorder Revision History
   small packet.
 - Removed the signal handler and WakeUp() call from cThread (it is no longer
   needed).
-- Added some checks when cancelling a thread and removed the usleep() in
+- Added some checks when canceling a thread and removed the usleep() in
   cThread::Start() (suggested by Ludwig Nussel). Also removed 'running' from
   cThread and using only childTid to indicate whether a thread is actually
   running.
@@ -3159,3 +3159,131 @@ Video Disk Recorder Revision History
 - Fixed toggling the "Day" item in the "Timers" menu, so that it selects the
   right day of week for timers in the future.
 - Some improvements to cPoller (thanks to Marco Schl��ler).
+
+2005-01-09: Version 1.3.18
+
+- Removed an unused variable from cTimer::GetWDayFromMDay() (thanks to Wayne Keer
+  for reporting this one).
+- Some more changes to the 'childTid' handling in cThread (based on suggestions by
+  Stefan Huelswitt).
+- Fixed the spelling of 'canceling' (thanks to Wayne Keer for reporting this one).
+- Re-introduced a sleep to cDvbPlayer::Action() to avoid high CPU load in still
+  picture mode (thanks to Reinhard Nissl for reporting this one).
+- Fixed a possible race condition in generating the DVB device names (thanks to
+  Rainer Zocholl for reporting this one).
+- Changed the way PES packets are played to allow replay of AC3 sound over the
+  full featured DVB cards (partially based on a patch from Werner Fink).
+  + The new function cDevice::PlayPes() is now called with the complete PES data
+    stream and calls PlayVideo() and PlayAudio() as necessary.
+  + cDevice::PlayVideo() is now only called with actual video PES packets.
+  + cDevice::PlayAudio() is now called with the actual audio PES packets, which
+    can be either "normal" audio or AC3 data. You need at least firmware version
+    0x261d to replay AC3 sound over a full featured DVB card. This function now
+    has an 'int' return value.
+  + PlayAudio() of derived cDevice classes shall no longer call the base class
+    function. It shall just play the given data as audio.
+  + cPlayer::PlayVideo() and cPlayer::PlayAudio() are now obsolete and have been
+    replaced with cPlayer::PlayPes().
+  + All StripAudioPackets() functions are now obsolete. The functionality has been
+    moved into cDevice::PlayPes(), where only the video and audio packets that are
+    actually required will be processed.
+  + All audio track handling is now done by cDevice; cTransfer and cDvbPlayer no
+    longer care about audio tracks. cPlayer, however, still has the virtual hooks
+    for audio track handling in order to allow plugins to implement players that
+    have their own idea about this.
+  + cChannel::[AD]pid[12]() have been replaced with cChannel::[AD]pid(int i) to
+    allow access to all available PIDs.
+- Escaped the '-' and '�' characters in the man pages (thanks to Darren Salt for
+  pointing this out).
+- Completed the Italian OSD texts (thanks to Sean Carlos).
+- Fixed setting 'synced' in cRemux when recording radio channels (thanks to
+  Laurence Abbott).
+- Removed the LOCK_THREAD from the LIRC thread (thanks to Ludwig Nussel).
+- Fixed genfontfile.c (sometimes the character width was wrong, and the codes were
+  shifted one too far to the left).
+- Fixed the character width and shifted the codes one to the right in all font
+  files.
+- Renamed font???.c to font???-iso8859-1.c for symmetry.
+- Switched the character set to iso8859-15 for English, German and Finnish (thanks
+  to Andreas Brugger for reporting the missing Euro sign in iso8859-1).
+- Added 'channels.conf.terr' entries for L�beck (thanks to Stefan Hu�feldt).
+- Fixed a race condition in starting a thread (thanks to Reinhard Nissl for
+  reporting this one).
+- Replaced non-threadsafe library functions with their threadsafe versions (thanks
+  to Rainer Zocholl for pointing this out).
+- Other non-threadsafe functions have been replaced by threadsafe classes that hide
+  the actual buffering. In particular these are:
+  readdir() -> cReadDir
+  readline() -> cReadLine
+- Several formerly non-threadsafe functions now have a return type of cString:
+  cChannel::ToText()
+  tChannelID::ToString()
+  cEvent::GetDateString()
+  cEvent::GetTimeString()
+  cEvent::GetEndTimeString()
+  cEvent::GetVpsString()
+  cMark::ToText()
+  cTimer::ToText()
+  cSource::ToString()
+  cTimer::PrintDay()
+  cTimer::PrintFirstDay()
+  PrefixVideoFileName()
+  IndexToHMSF()
+  ChannelString()
+  strescape()
+  AddDirectory()
+  itoa()
+  WeekDayName()
+  DayDateTime()
+  When using these functions in a 'const char *' context there is nothing special
+  to consider, except that you can no longer have a pointer to the return value,
+  as in
+  const char *date = DayDateTime();
+  Although this will compile without error message, the resulting 'date' will not
+  be valid after this line. Use this instead:
+  cString date = DayDateTime();
+  In a 'const void *' context (as in printf() etc.) the result needs to be
+  dereferenced with a '*', as in
+  printf("%s", *DayDateTime());
+  to make it a 'const char *'.
+- Removed delay_ms(), using cCondWait::SleepMs() instead.
+- Replaced time_ms() with a threadsafe and non-overflowing cTimeMs (thanks to Rainer
+  Zocholl for pointing out this problem).
+- Added cDevice::mutexReceiver to avoid a race condition when attaching/detaching
+  receivers from different threads.
+- The new remote control button "Audio" can be used to switch between different
+  audio tracks. The "Green" button in the "Main" menu has been changed from "Language"
+  to "Audio", since it now also controls switching between normal and Dolby Digital
+  audio tracks (see MANUAL for details).
+- The description of the audio tracks is now taken from the "component descriptors"
+  that are broadcast in the EPG data. However (as no big surprise), not all channels
+  actually provide useful data here, so there are now some additional EPG bugfixes,
+  which can be activated by setting the "EPG bugfix level" to 3.
+- The format of the 'epg.data' files has been extended by the new tag 'X', which
+  contains the stream components of an event (see man vdr(5) for details).
+- The cStatus class now has the new member function SetAudioTrack(), which can be
+  used to get notified when the audio track has been switched, and the new member
+  function SetAudioChannel() which is called when the audio channel is changed.
+- Skins need to implement the new cSkinDisplayTrack class to display the audio
+  track menu.
+- The ST:TNG skin now displays the current audio track description (if any) at the
+  botton left side.
+- The new setup option "DVB/Audio languages" can be used to control which audio
+  language shall be selected in case a channel broadcasts in different languages
+  (see MANUAL for details). 
+- The "Left" and "Right" keys in the "Audio" menu can be used to switch between
+  the left and right stereo channels in case there are different audio tracks
+  in these channels (see MANUAL for details).
+- Fixed a possible race condition in cDevice::Action() (thanks to Mattias Gr�nlund).
+- Fixed the default quality value when grabbing a JPEG image (thanks to Patrick
+  Gleichmann).
+- Fixed deleting a menu item in case the next item is not selectable (thanks to
+  Dino Ravnic).
+- Implemented displaying mandatory subtitles in the SPU decoder (thanks to Marco
+  Schl��ler).
+- The setup option "Recording/Record Dobly Digital" has been renamed and moved to
+  "DVB/Use Dolby Digital". It now controls whether Dolby Digital is recorded and
+  whether an available DD audio track will appear in the "Audio" menu.
+- Added support for circular polarization (thanks to Jonan Santiago).
+- Thanks to Werner Fink, Reinhard Nissl, Sascha Volkenandt and Bj�rnar Nilsen for
+  their support in testing and fine tuning this version.
diff --git a/MANUAL b/MANUAL
index f5a1814c7..7743241c3 100644
--- a/MANUAL
+++ b/MANUAL
@@ -11,20 +11,20 @@ Version 1.2
   possible, several keys have different meanings in the various
   modes:
 
-  Key     Normal      VDR          Channels   Timers     Edit/New      Recordings        Replay
-
-  Up      Ch up       Crsr up      Crsr up    Crsr up    Crsr up       Crsr up           Play
-  Down    Ch down     Crsr down    Crsr down  Crsr down  Crsr down     Crsr down         Pause
-  Left    Prev group  -            Page up    Page up    Decrement     Page up           Search back
-  Right   Next group  -            Page down  Page down  Increment     Page down         Search forward
-  Ok      Ch display  Select       Switch     Edit       Accept        Play              Progress disp.
-  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu on
-  Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu
-  Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump
-  Green   -           Language     New        New        Ins/Ovr       Rewind            Skip -60s
-  Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s
-  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop
-  0..9    Ch select   -            Sort(3)    Day(4)     Numeric inp.  Exec cmd(2)       Editing
+  Key     Normal      VDR          Channels   Timers     Edit/New      Recordings        Replay           Audio
+
+  Up      Ch up       Crsr up      Crsr up    Crsr up    Crsr up       Crsr up           Play             Sel. track
+  Down    Ch down     Crsr down    Crsr down  Crsr down  Crsr down     Crsr down         Pause            Sel. track
+  Left    Prev group  -            Page up    Page up    Decrement     Page up           Search back      Sel. channel
+  Right   Next group  -            Page down  Page down  Increment     Page down         Search forward   Sel. channel
+  Ok      Ch display  Select       Switch     Edit       Accept        Play              Progress disp.   Switch & Close
+  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu on          Menu on
+  Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu  Close
+  Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump             -
+  Green   -           Audio        New        New        Ins/Ovr       Rewind            Skip -60s        -
+  Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s        -
+  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop             -
+  0..9    Ch select   -            Sort(3)    Day(4)     Numeric inp.  Exec cmd(2)       Editing          -
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
   are used to enter the data, and the Left key can be used to delete the last
@@ -49,6 +49,8 @@ Version 1.2
   Volume-     volume down
   Mute        mute
 
+  Audio       select audio track
+
   Schedule    \
   Channels    |
   Timers      | directly access the VDR
@@ -181,21 +183,36 @@ Version 1.2
   selected for at least 3 seconds.
 
   After switching to a different channel the channel number and name, as well
-  as the current time are displayed at the top of the screen. If available, the
+  as the current time are displayed in the OSD. If available, the
   'current/next' information will be displayed below this line. This display
   automatically goes away after about five seconds, or if any key is pressed.
   To bring up the channel display without switching channels you can press
   the "Ok" button.
 
-* Selecting language specific audio track
+* Selecting audio tracks
+
+  If the current channel or recording provides different audio tracks (for
+  different languages or Dolby Digital), the "Green" button in the "VDR" menu can
+  be pressed to bring up the "Audio" menu. Within this menu, the "Up" and "Down"
+  keys can be used to switch between the audio tracks. If your remote control has
+  a dedicated "Audio" button, the first press of that button brings up the "Audio"
+  menu, and every further press switches to the next available audio track.
+
+  The "Left" and "Right" keys can be used to switch between "mono left", "stereo"
+  and "mono right" for channels that broadcast different audio tracks in the
+  left and right stereo channels.
+
+  The "Ok" key explicitly switches to the selected track (in case the device
+  for some reason doesn't play it) and closes the "Audio" menu.
 
-  If the current channel provides different audio tracks (typically for
-  different languages), the "Green" button in the "VDR" menu can be pressed
-  to toggle between these. There can be two different audio PIDs per channel,
-  assuming that typically a channel broadcasts a country specific language
-  plus the movie's original soundtrack.
-  Recordings made form such channels will contain both audio tracks, and when
-  replaying the desired audio track can be selected the same way.
+  The "Audio" menu will automatically disappear after 5 seconds of user inactivity,
+  or if any key other than the ones described above is pressed.
+
+  Once a Dolby Digital track has been selected on any channel, further channel
+  switches will first search for a Dolby Digital track of one of the preferred
+  audio languages. If no such track can be found, a normal audio track will
+  be selected. Note that this only works if the broadcasters use actual language
+  codes in their PID data, not things like "dd" or "2ch".
 
 * Switching through channel groups
 
@@ -495,14 +512,15 @@ Version 1.2
                          A value of '0' completely turns off scanning on both single
                          and multiple card systems.
 
-  EPG bugfix level = 2   Some tv stations transmit weirdly formatted EPG data.
+  EPG bugfix level = 3   Some tv stations transmit weirdly formatted EPG data.
                          VDR attempts to fix these bugs up to the given level:
                          0 = no EPG fixing
                          1 = basic fixing of text location (Title, Episode and
                              Extended Description)
                          2 = removal of excess whitespace and hyphens, mapping of
                              wrongly used characters
-                         Default is '2'.
+                         3 = fix stream component descriptions
+                         Default is '3'.
                          Note that after changing the setting of this parameter
                          any EPG data that has already been received will remain
                          in its existing format - only newly received data will
@@ -570,12 +588,28 @@ Version 1.2
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
                          (4:3 or 16:9).
 
+  Use Dolby Digital = yes
+                         Turns recording of the Dolby Digital audio channels on
+                         or off. This may be useful if you don't have the equipment
+                         to replay Dolby Digital audio and want to save disk space.
+                         If turned off, Dolby Digital tracks also don't appear in the
+                         "Audio" menu.
+
   Update channels = 4    Controls the automatic channel update function. '0' means
                          no update, '1' will only update channel names, '2' will
                          update channel names and PIDs, '3' will perform all
                          updates and also add newly found channels, and '4' will
                          also add newly found transponders.
 
+  Audio languages = 0    Some tv stations broadcast various audio tracks in different
+                         languages. This option allows you to define which language(s)
+                         you prefer in such cases. By default, or if none of the
+                         preferred languages is broadcast, the first audio track will
+                         be selected when switching to such a channel. If this option
+                         is set to a non-zero value, the menu page will contain that
+                         many "Audio language" options which allow you to select the
+                         individual preferred languages.
+
   LNB:
 
   SLOF               = 11700  The switching frequency (in MHz) between low and
@@ -663,11 +697,6 @@ Version 1.2
                          instant recording can be modified at any time by editing
                          the respective timer in the "Timers" menu.
 
-  Record Dolby Digital = yes
-                         Turns recording of the Dolby Digital audio channels on
-                         or off. This may be useful if you don't have the equipment
-                         to replay Dolby Digital audio and want to save disk space.
-
   Max. video file size = 2000
                          The maximum size of a single recorded video file in MB.
                          The valid range is 100...2000. Default is 2000, but
diff --git a/Makefile b/Makefile
index 132768147..f70a2e916 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.72 2004/11/21 11:28:55 kls Exp $
+# $Id: Makefile 1.73 2004/12/18 13:39:19 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -78,7 +78,7 @@ endif
 
 all: vdr
 font: genfontfile\
-      fontfix.c fontosd.c fontsml.c\
+      fontfix-iso8859-1.c fontosd-iso8859-1.c fontsml-iso8859-1.c\
       fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
       fontfix-iso8859-5.c fontosd-iso8859-5.c fontsml-iso8859-5.c\
       fontfix-iso8859-7.c fontosd-iso8859-7.c fontsml-iso8859-7.c\
@@ -106,11 +106,11 @@ vdr: $(OBJS) $(SILIB)
 
 # The font files:
 
-fontfix.c:
+fontfix-iso8859-1.c:
 	./genfontfile "cFont::tPixelData FontFix_iso8859_1" "$(FIXFONT_ISO8859_1)" > $@
-fontosd.c:
+fontosd-iso8859-1.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@
-fontsml.c:
+fontsml-iso8859-1.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@
 
 fontfix-iso8859-2.c:
diff --git a/PLUGINS.html b/PLUGINS.html
index cfd28d129..9132aa23c 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.2.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.2.6 are marked like this.
-<!--X1.2.6--></td></tr></table>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.0 are marked like this.
 <!--X1.3.0--></td></tr></table>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.7 are marked like this.
 <!--X1.3.7--></td></tr></table>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.8 are marked like this.
 <!--X1.3.8--></td></tr></table>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.18 are marked like this.
+<!--X1.3.18--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -73,11 +73,11 @@ <h1>Table Of Contents</h1>
 <li><a href="#Status monitor">Status monitor</a>
 <li><a href="#Players">Players</a>
 <li><a href="#Receivers">Receivers</a>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Filters">Filters</a>
 <!--X1.3.0--></td></tr></table>
 <li><a href="#The On Screen Display">The On Screen Display</a>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <!--X1.3.7--></td></tr></table>
@@ -1023,17 +1023,21 @@ <h1>Table Of Contents</h1>
 Take a look at the files <tt>player.h</tt> and <tt>dvbplayer.c</tt> to see how VDR implements
 its own player for the VDR recordings.
 <p>
-To play the video data, the player needs to call its member function
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+To play the actual data, the player needs to call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-int PlayVideo(const uchar *Data, int Length);
+int PlayPes(const uchar *Data, int Length, bool VideoOnly);
 </pre></td></tr></table><p>
 
 where <tt>Data</tt> points to a block of <tt>Length</tt> bytes of a PES data
-stream. There are no prerequisites regarding the length or alignment of an
+stream containing any combination of video, audio or dolby tracks. Which audio
+or dolby track will actually be played is controlled by the device the player
+is attached to. There are no prerequisites regarding the length or alignment of an
 individual block of data. The sum of all blocks must simply result in the
-desired video data stream, and it must be delivered fast enough so that the
+desired data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
+<!--X1.3.18--></td></tr></table>
 To avoid busy loops the player should call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
@@ -1042,24 +1046,26 @@ <h1>Table Of Contents</h1>
 
 to determine whether the device is ready for further data.
 <p>
-If the player can provide more than a single audio track, it can implement the
-following functions to make them available:
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+By default all audio track handling is done by the device a player is
+attached to.
+If the player can provide more than a single audio track, and has special
+requirements in order to set a given track, it can implement the
+following function to allow the device to set a specific track:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-virtual int NumAudioTracks(void) const;
-virtual const char **GetAudioTracks(int *CurrentTrack = NULL);
-virtual void SetAudioTrack(int Index);
+virtual void SetAudioTrack(eTrackType Type, const tTrackId *TrackId)
 </pre></td></tr></table><p>
 
-<p>
-If there is an additional audio track that has to be replayed with external hardware,
-the player shall call its member function
+A player that has special requirements about audio tracks should announce its
+available audio tracks by calling
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-void PlayAudio(const uchar *Data, int Length);
+bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, uint32_t Flags = 0)
 </pre></td></tr></table><p>
 
-where <tt>Data</tt> points to a complete audio PES packet of <tt>Length</tt> bytes.
+See <tt>device.h</tt> for details about the parameters for track handling.
+<!--X1.3.18--></td></tr></table>
 <p>
 The second part needed here is a control object that receives user input from the main
 program loop and reacts on this by telling the player what to do:
@@ -1217,7 +1223,7 @@ <h1>Table Of Contents</h1>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Filters"><hr><h2>Filters</h2>
 
 <center><i><b>A Fistful of Datas</b></i></center><p>
@@ -1263,7 +1269,7 @@ <h1>Table Of Contents</h1>
 See VDR/eit.c or VDR/pat.c to learn how to process filter data.
 <!--X1.3.0--></td></tr></table>
 
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Window to the world</b></i></center><p>
@@ -1356,6 +1362,9 @@ <h1>Table Of Contents</h1>
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+  virtual cSkinDisplayMessage *DisplayTrack(int NumTracks, const char * const *Tracks);
+<!--X1.3.18--></td></tr></table>
   virtual cSkinDisplayMessage *DisplayMessage(void);
   };
 </pre></td></tr></table><p>
@@ -1375,7 +1384,7 @@ <h1>Table Of Contents</h1>
 in the <a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
 Do not delete this object, it will be automatically deleted when the program ends.
 <p>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 In order to be able to easily identify plugins that implement a skin it is recommended
 that the name of such a plugin should be
 
@@ -1484,13 +1493,15 @@ <h1>Table Of Contents</h1>
 <b>Audio selection</b>
 <p>
 If the device can provide more than a single audio track, it can implement the
-following functions to make them available:
+following function to make them available:
 
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-virtual int NumAudioTracksDevice(void) const;
-virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
-virtual void SetAudioTrackDevice(int Index);
+virtual void SetAudioTrackDevice(eTrackType Type);
+virtual int GetAudioChannelDevice(void);
+virtual void SetAudioChannelDevice(int AudioChannel);
 </pre></td></tr></table><p>
+<!--X1.3.18--></td></tr></table>
 
 <p>
 <b>Recording</b>
@@ -1527,9 +1538,7 @@ <h1>Table Of Contents</h1>
 virtual bool HasDecoder(void) const;
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
-<!--X1.2.6--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual int64_t GetSTC(void);
-<!--X1.2.6--></td></tr></table>
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
 virtual void Play(void);
@@ -1549,7 +1558,7 @@ <h1>Table Of Contents</h1>
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>Section Filtering</b>
 <p>
@@ -1579,7 +1588,7 @@ <h1>Table Of Contents</h1>
 <p>
 <b>On Screen Display</b>
 <p>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 If your device provides On Screen Display (OSD) capabilities (which every device
 that is supposed to be used as a primary device should do), it shall implement
 an "OSD provider" class, derived from <tt>cOsdProvider</tt>, which, when its <tt>CreateOsd()</tt>
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index df6735835..8ba4ae4e6 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -8,3 +8,8 @@ VDR Plugin 'skincurses' Revision History
 2004-05-31: Version 0.0.2
 
 - Fixed some default parameters.
+
+2005-01-02: Version 0.0.3
+
+- Made several functions threadsafe.
+- New audio track display.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index e2b218da7..a1c595404 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.2 2004/05/31 14:57:40 kls Exp $
+ * $Id: skincurses.c 1.5 2005/01/09 11:56:26 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -252,7 +252,7 @@ void cSkinCursesDisplayChannel::SetMessage(eMessageType Type, const char *Text)
 void cSkinCursesDisplayChannel::Flush(void)
 {
   if (!message) {
-     const char *date = DayDateTime();
+     cString date = DayDateTime();
      osd->DrawText(OsdWidth - strlen(date), 0, date, clrWhite, clrBackground, &Font);
      }
   osd->Flush();
@@ -382,11 +382,11 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
   int y = 2;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());
+  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
-     asprintf(&buffer, " VPS: %s", Event->GetVpsString());
+     asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
      osd->DrawText(OsdWidth - strlen(buffer), y, buffer, clrBlack, clrYellow, &Font);
      free(buffer);
      }
@@ -418,7 +418,7 @@ void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
 
 void cSkinCursesDisplayMenu::Flush(void)
 {
-  const char *date = DayDateTime();
+  cString date = DayDateTime();
   osd->DrawText(OsdWidth - strlen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
   osd->Flush();
 }
@@ -558,6 +558,69 @@ void cSkinCursesDisplayVolume::Flush(void)
   osd->Flush();
 }
 
+// --- cSkinCursesDisplayTracks ----------------------------------------------
+
+class cSkinCursesDisplayTracks : public cSkinDisplayTracks {
+private:
+  cOsd *osd;
+  int itemsWidth;
+  int currentIndex;
+  void SetItem(const char *Text, int Index, bool Current);
+public:
+  cSkinCursesDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
+  virtual ~cSkinCursesDisplayTracks();
+  virtual void SetTrack(int Index, const char * const *Tracks);
+  virtual void SetAudioChannel(int AudioChannel) {}
+  virtual void Flush(void);
+  };
+
+cSkinCursesDisplayTracks::cSkinCursesDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  currentIndex = -1;
+  itemsWidth = Font.Width(Title);
+  for (int i = 0; i < NumTracks; i++)
+      itemsWidth = max(itemsWidth, Font.Width(Tracks[i]));
+  itemsWidth = min(itemsWidth, OsdWidth);
+  osd = new cCursesOsd(0, 0);
+  osd->DrawRectangle(0, 0, OsdWidth - 1, OsdHeight - 1, clrBackground);
+  osd->DrawText(0, 0, Title, clrBlack, clrCyan, &Font, itemsWidth);
+  for (int i = 0; i < NumTracks; i++)
+      SetItem(Tracks[i], i, false);
+}
+
+cSkinCursesDisplayTracks::~cSkinCursesDisplayTracks()
+{
+  delete osd;
+}
+
+void cSkinCursesDisplayTracks::SetItem(const char *Text, int Index, bool Current)
+{
+  int y = 1 + Index;
+  int ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = clrBlack;
+     ColorBg = clrCyan;
+     currentIndex = Index;
+     }
+  else {
+     ColorFg = clrWhite;
+     ColorBg = clrBackground;
+     }
+  osd->DrawText(0, y, Text, ColorFg, ColorBg, &Font, itemsWidth);
+}
+
+void cSkinCursesDisplayTracks::SetTrack(int Index, const char * const *Tracks)
+{
+  if (currentIndex >= 0)
+     SetItem(Tracks[currentIndex], currentIndex, false);
+  SetItem(Tracks[Index], Index, true);
+}
+
+void cSkinCursesDisplayTracks::Flush(void)
+{
+  osd->Flush();
+}
+
 // --- cSkinCursesDisplayMessage ---------------------------------------------
 
 class cSkinCursesDisplayMessage : public cSkinDisplayMessage {
@@ -600,6 +663,7 @@ class cSkinCurses : public cSkin {
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayTracks *DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
   virtual cSkinDisplayMessage *DisplayMessage(void);
   };
 
@@ -633,6 +697,11 @@ cSkinDisplayVolume *cSkinCurses::DisplayVolume(void)
   return new cSkinCursesDisplayVolume;
 }
 
+cSkinDisplayTracks *cSkinCurses::DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  return new cSkinCursesDisplayTracks(Title, NumTracks, Tracks);
+}
+
 cSkinDisplayMessage *cSkinCurses::DisplayMessage(void)
 {
   return new cSkinCursesDisplayMessage;
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 2d15da7ea..2fed4c363 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -28,3 +28,12 @@ VDR Plugin 'sky' Revision History
 2004-10-16: Version 0.3.1
 
 - Improved buffer handling.
+
+2004-12-12: Version 0.3.2
+
+- Changed Apid access in cChannel.
+
+2004-12-19: Version 0.3.3
+
+- Made several functions threadsafe.
+- Removed delay_ms(), using cCondWait::SleepMs() instead.
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index eea697ea8..bf4fa428a 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.7 2004/10/16 09:10:06 kls Exp $
+ * $Id: sky.c 1.11 2004/12/26 12:45:22 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -14,7 +14,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.1";
+static const char *VERSION        = "0.3.3";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
@@ -113,7 +113,7 @@ void cDigiboxDevice::LircSend(const char *s)
   dsyslog(buf);//XXX
   if (write(fd_lirc, buf, strlen(buf)) < 0)
      LOG_ERROR;//XXX _STR
-  delay_ms(200);
+  cCondWait::SleepMs(200);
 }
 
 void cDigiboxDevice::LircSend(int n)
@@ -213,7 +213,7 @@ bool cDigiboxDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
      if (SkyChannel) {
         digiboxChannelNumber = SkyChannel->digiboxChannelNumber;
-        apid = Channel->Apid1();
+        apid = Channel->Apid(0);
         vpid = Channel->Vpid();
         //XXX only when recording??? -> faster channel switching!
         LircSend("SKY"); // makes sure the Digibox is "on"
diff --git a/README b/README
index 738fe3de0..5a0184892 100644
--- a/README
+++ b/README
@@ -19,10 +19,10 @@ development of VDR.
 
 The author can be contacted at kls@cadsoft.de.
 
-Yet another "set-top-box"?
+Yet another "set-top box"?
 --------------------------
 
-The "set-top-boxes" available from commercial companies all have
+The "set-top boxes" available from commercial companies all have
 one major drawback: they are not "open". This project's goal is
 to build an "open" digital satellite receiver and timer controlled
 video disk recorder, based upon open standards and freely available
@@ -31,6 +31,6 @@ driver software (of course, the hardware still has to be bought).
 The on screen menu system is simple, but shall provide all the
 possibilites necessary to perform timer controlled recording,
 file management and even "on disk editing". The menus
-of commercial set-top-boxes usually are a lot more fancy than
+of commercial set-top boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
diff --git a/channels.c b/channels.c
index 5d500ecef..9403ef52d 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.31 2004/11/02 18:07:05 kls Exp $
+ * $Id: channels.c 1.33 2004/12/26 12:34:52 kls Exp $
  */
 
 #include "channels.h"
@@ -146,10 +146,10 @@ tChannelID tChannelID::FromString(const char *s)
   return tChannelID::InvalidID;
 }
 
-const char *tChannelID::ToString(void)
+cString tChannelID::ToString(void)
 {
-  static char buffer[256];
-  snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", cSource::ToString(source), nid, tid, sid, rid);
+  char buffer[256];
+  snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", *cSource::ToString(source), nid, tid, sid, rid);
   return buffer;
 }
 
@@ -162,8 +162,6 @@ tChannelID &tChannelID::ClrPolarization(void)
 
 // -- cChannel ---------------------------------------------------------------
 
-char *cChannel::buffer = NULL;
-
 cChannel::cChannel(void)
 {
   name = strdup("");
@@ -289,7 +287,7 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
 
   if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
      if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), cSource::ToString(source), frequency, polarization, srate, coderateH, cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
+        dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), *cSource::ToString(source), frequency, polarization, srate, coderateH, *cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
         modification |= CHANNELMOD_TRANSP;
         Channels.SetModified();
         }
@@ -307,7 +305,7 @@ bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation
 {
   if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
      if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, modulation, srate, coderateH, cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
+        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, modulation, srate, coderateH, *cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
         modification |= CHANNELMOD_TRANSP;
         Channels.SetModified();
         }
@@ -324,7 +322,7 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
 {
   if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
      if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
+        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, *cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
         modification |= CHANNELMOD_TRANSP;
         Channels.SetModified();
         }
@@ -540,13 +538,13 @@ static int PrintParameter(char *p, char Name, int Value)
   return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
 }
 
-const char *cChannel::ParametersToString(void) const
+cString cChannel::ParametersToString(void) const
 {
-  char type = *cSource::ToString(source);
+  char type = **cSource::ToString(source);
   if (isdigit(type))
      type = 'S';
 #define ST(s) if (strchr(s, type))
-  static char buffer[64];
+  char buffer[64];
   char *q = buffer;
   *q = 0;
   ST(" S ")  q += sprintf(q, "%c", polarization);
@@ -600,7 +598,7 @@ bool cChannel::StringToParameters(const char *s)
   return true;
 }
 
-const char *cChannel::ToText(const cChannel *Channel)
+cString cChannel::ToText(const cChannel *Channel)
 {
   char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia
   char *q = FullName;
@@ -611,7 +609,7 @@ const char *cChannel::ToText(const cChannel *Channel)
      q += sprintf(q, ";%s", Channel->provider);
   *q = 0;
   strreplace(FullName, ':', '|');
-  free(buffer);
+  char *buffer;
   if (Channel->groupSep) {
      if (Channel->number)
         asprintf(&buffer, ":@%d %s\n", Channel->number, FullName);
@@ -637,12 +635,12 @@ const char *cChannel::ToText(const cChannel *Channel)
      q = caidbuf;
      q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->ParametersToString(), *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
 
-const char *cChannel::ToText(void) const
+cString cChannel::ToText(void) const
 {
   return ToText(this);
 }
@@ -705,7 +703,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            p = apidbuf;
            char *q;
            int NumApids = 0;
-           while ((q = strtok(p, ",")) != NULL) {
+           char *strtok_next;
+           while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
                  if (NumApids < MAXAPIDS) {
                     char *l = strchr(q, '=');
                     if (l) {
@@ -725,7 +724,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
               char *p = dpidbuf;
               char *q;
               int NumDpids = 0;
-              while ((q = strtok(p, ",")) != NULL) {
+              char *strtok_next;
+              while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
                     if (NumDpids < MAXAPIDS) {
                        char *l = strchr(q, '=');
                        if (l) {
@@ -747,7 +747,8 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
               char *p = caidbuf;
               char *q;
               int NumCaIds = 0;
-              while ((q = strtok(p, ",")) != NULL) {
+              char *strtok_next;
+              while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
                     if (NumCaIds < MAXCAIDS) {
                        caids[NumCaIds++] = strtol(q, NULL, 16) & 0xFFFF;
                        if (NumCaIds == 1 && caids[0] <= 0x00FF)
@@ -797,7 +798,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
 
 bool cChannel::Save(FILE *f)
 {
-  return fprintf(f, ToText()) > 0;
+  return fprintf(f, "%s", *ToText()) > 0;
 }
 
 // -- cChannels --------------------------------------------------------------
@@ -936,7 +937,7 @@ int cChannels::Modified(void)
 cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid, int Rid)
 {
   if (Transponder) {
-     dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
+     dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, *cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
      cChannel *NewChannel = new cChannel(*Transponder);
      NewChannel->SetId(Nid, Tid, Sid, Rid);
      NewChannel->SetName(Name, ShortName, Provider);
@@ -947,9 +948,9 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
   return NULL;
 }
 
-const char *ChannelString(const cChannel *Channel, int Number)
+cString ChannelString(const cChannel *Channel, int Number)
 {
-  static char buffer[256];
+  char buffer[256];
   if (Channel) {
      if (Channel->GroupSep())
         snprintf(buffer, sizeof(buffer), "%s", Channel->Name());
diff --git a/channels.conf b/channels.conf
index f6db1a74c..60c6feed9 100644
--- a/channels.conf
+++ b/channels.conf
@@ -27,13 +27,13 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
-TW1;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
+TW1 - 28Feb05;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
 Eurosport;ZDFvision:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
 EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
 EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
@@ -44,25 +44,25 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0
-DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0
+BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
+DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0
-PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
+PREMIERE SPORT 1,SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
+PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1702,1801,1722:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
-Liberty TV.com;Maastricht Multimedia:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
+LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
 ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
@@ -94,14 +94,14 @@ ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
-Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0
-Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0
-Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2321+2304:2322=eng,2323=NAR;2325=eng:2324:960,961:4403:2:2007:0
-Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR:2308:960,961:4402:2:2011:0
-Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:2313+2304:2314=eng,2315=NAR:2316:960,961:4503:2:2011:0
-Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:2309+2304:2310=eng,2311=NAR:2312:960,961:4502:2:2011:0
+Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
+Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,667=NAR;687=eng:583:960,961:4302:2:2007:0
+Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;688=eng:584:960,961:4403:2:2007:0
+Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4402:2:2011:0
+Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4503:2:2011:0
+Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4502:2:2011:0
 Sky Movies 7;BSkyB:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
-Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:2326+2304:2327=eng,2328=NAR:2329:960,961:5502:2:2007:0
+Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
 Sky Cinema 1;BSkyB:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
 Sky Cinema 2;BSkyB:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
@@ -116,4 +116,5 @@ BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
 Olisat / Telefe;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
+eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
 :@1000 New channels
diff --git a/channels.conf.terr b/channels.conf.terr
index 11c40b175..52ff6b668 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -89,3 +89,26 @@ Sat.1:658000:I0C23D0M16B8T8G32Y0:T:27500:385:386:391:0:16408:0:0
 N24:658000:I0C23D0M16B8T8G32Y0:T:27500:225:226:231:0:16398:0:0
 ProSieben:658000:I0C23D0M16B8T8G32Y0:T:27500:305:306:311:0:16403:0:0
 KABEL1:658000:I0C23D0M16B8T8G32Y0:T:27500:161:162:167:0:16394:0:0
+: DVB-T L�beck, Germany
+ZDF:490000:I999B8C23D23M16T8G4Y0:T:27500:545:546,547;559:551:0:514:0:0:0
+Info/3sat:490000:I999B8C23D23M16T8G4Y0:T:27500:561:562,563:567:0:515:0:0:0
+Doku/KiKa:490000:I999B8C23D23M16T8G4Y0:T:27500:593:594:599:0:517:0:0:0
+Bayerisches Fernsehen:530000:I999B8C12D999M16T8G32Y0:T:27500:5185:5186:5188:0:34:0:0:0
+MDR FERNSEHEN:530000:I999B8C12D999M16T8G32Y0:T:27500:5169:5170:5172:0:100:0:0:0
+NDR FS NDS *:530000:I999B8C12D999M16T8G32Y0:T:27500:5137:5138:5140:0:129:0:0:0
+NDR FS HH *:530000:I999B8C12D999M16T8G32Y0:T:27500:5137:5138:5140:0:130:0:0:0
+NDR FS SH:530000:I999B8C12D999M16T8G32Y0:T:27500:5137:5138:5140:0:131:0:0:0
+NDR FS MVP *:530000:I999B8C12D999M16T8G32Y0:T:27500:5137:5138:5140:0:132:0:0:0
+WDR K�ln:530000:I999B8C12D999M16T8G32Y0:T:27500:5153:5154:5156:0:262:0:0:0
+N24:546000:I999B8C12D999M16T8G32Y0:T:27500:225:226:231:0:16398:0:0:0
+ProSieben:546000:I999B8C12D999M16T8G32Y0:T:27500:305:306;312:311:0:16403:0:0:0
+KABEL1:546000:I999B8C12D999M16T8G32Y0:T:27500:161:162:167:0:16394:0:0:0
+SAT.1:546000:I999B8C12D999M16T8G32Y0:T:27500:385:386;392:391:0:16408:0:0:0
+arte:570000:I999B8C12D999M16T8G32Y0:T:27500:4385:4386,4387:4388:0:2:0:0:0
+Phoenix:570000:I999B8C12D999M16T8G32Y0:T:27500:4401:4402:4404:0:3:0:0:0
+EinsExtra:570000:I999B8C12D999M16T8G32Y0:T:27500:4417:4418:0:0:4:0:0:0
+Das Erste:570000:I999B8C12D999M16T8G32Y0:T:27500:4369:4370:4372:0:128:0:0:0
+RTL Television:626000:I999B8C23D23M16T8G4Y0:T:27500:337:338:343:0:16405:0:0:0
+RTL2:626000:I999B8C23D23M16T8G4Y0:T:27500:353:354:359:0:16406:0:0:0
+Super RTL:626000:I999B8C23D23M16T8G4Y0:T:27500:369:370:375:0:16407:0:0:0
+VOX:626000:I999B8C23D23M16T8G4Y0:T:27500:545:546:551:0:16418:0:0:0
diff --git a/channels.h b/channels.h
index 62b00c3cd..3670ad36f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.22 2004/10/31 12:54:26 kls Exp $
+ * $Id: channels.h 1.24 2004/12/26 12:15:52 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -67,7 +67,7 @@ struct tChannelID {
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   tChannelID &ClrPolarization(void);
   static tChannelID FromString(const char *s);
-  const char *ToString(void);
+  cString ToString(void);
   static const tChannelID InvalidID;
   };
 
@@ -87,8 +87,7 @@ class cLinkChannels : public cList<cLinkChannel> {
 class cChannel : public cListObject {
   friend class cMenuEditChannel;
 private:
-  static char *buffer;
-  static const char *ToText(const cChannel *Channel);
+  static cString ToText(const cChannel *Channel);
   char *name;
   char *shortName;
   char *provider;
@@ -124,14 +123,14 @@ class cChannel : public cListObject {
   int modification;
   cLinkChannels *linkChannels;
   cChannel *refChannel;
-  const char *ParametersToString(void) const;
+  cString ParametersToString(void) const;
   bool StringToParameters(const char *s);
 public:
   cChannel(void);
   cChannel(const cChannel &Channel);
   ~cChannel();
   cChannel& operator= (const cChannel &Channel);
-  const char *ToText(void) const;
+  cString ToText(void) const;
   bool Parse(const char *s, bool AllowNonUniqueID = false);
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
@@ -145,10 +144,10 @@ class cChannel : public cListObject {
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
   int Ppid(void) const { return ppid; }
-  int Apid1(void) const { return apids[0]; }
-  int Apid2(void) const { return apids[1]; }
-  int Dpid1(void) const { return dpids[0]; }
-  int Dpid2(void) const { return dpids[1]; }
+  int Apid(int i) const { return (0 <= i && i < MAXAPIDS) ? apids[i] : 0; }
+  int Dpid(int i) const { return (0 <= i && i < MAXAPIDS) ? dpids[i] : 0; }
+  const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
+  const char *Dlang(int i) const { return (0 <= i && i < MAXAPIDS) ? dlangs[i] : ""; }
   int Tpid(void) const { return tpid; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
   int Nid(void) const { return nid; }
@@ -216,6 +215,6 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
 
 extern cChannels Channels;
 
-const char *ChannelString(const cChannel *Channel, int Number);
+cString ChannelString(const cChannel *Channel, int Number);
 
 #endif //__CHANNELS_H
diff --git a/config.c b/config.c
index 36ecb1264..0e583941f 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.128 2004/10/31 16:17:39 kls Exp $
+ * $Id: config.c 1.131 2005/01/09 12:14:58 kls Exp $
  */
 
 #include "config.h"
@@ -262,6 +262,7 @@ cSetup::cSetup(void)
   TimeTransponder = 0;
   MarginStart = 2;
   MarginStop = 10;
+  AudioLanguages[0] = -1;
   EPGLanguages[0] = -1;
   EPGScanTimeout = 5;
   EPGBugfixLevel = 2;
@@ -280,7 +281,7 @@ cSetup::cSetup(void)
   RecordingDirs = 1;
   VideoFormat = 0;
   UpdateChannels = 4;
-  RecordDolbyDigital = 1;
+  UseDolbyDigital = 1;
   ChannelInfoPos = 0;
   OSDLeft = 54;
   OSDTop = 45;
@@ -297,6 +298,7 @@ cSetup::cSetup(void)
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
+  CurrentDolby = 0;
 }
 
 cSetup& cSetup::operator= (const cSetup &s)
@@ -415,6 +417,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
   else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
   else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
+  else if (!strcasecmp(Name, "AudioLanguages"))      return ParseLanguages(Value, AudioLanguages);
   else if (!strcasecmp(Name, "EPGLanguages"))        return ParseLanguages(Value, EPGLanguages);
   else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
   else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
@@ -433,7 +436,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
-  else if (!strcasecmp(Name, "RecordDolbyDigital"))  RecordDolbyDigital = atoi(Value);
+  else if (!strcasecmp(Name, "UseDolbyDigital"))     UseDolbyDigital    = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
   else if (!strcasecmp(Name, "OSDLeft"))             OSDLeft            = atoi(Value);
   else if (!strcasecmp(Name, "OSDTop"))              OSDTop             = atoi(Value);
@@ -450,6 +453,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
+  else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
   else
      return false;
   return true;
@@ -475,6 +479,7 @@ bool cSetup::Save(void)
   Store("TimeTransponder",    TimeTransponder);
   Store("MarginStart",        MarginStart);
   Store("MarginStop",         MarginStop);
+  StoreLanguages("AudioLanguages", AudioLanguages);
   StoreLanguages("EPGLanguages", EPGLanguages);
   Store("EPGScanTimeout",     EPGScanTimeout);
   Store("EPGBugfixLevel",     EPGBugfixLevel);
@@ -493,7 +498,7 @@ bool cSetup::Save(void)
   Store("RecordingDirs",      RecordingDirs);
   Store("VideoFormat",        VideoFormat);
   Store("UpdateChannels",     UpdateChannels);
-  Store("RecordDolbyDigital", RecordDolbyDigital);
+  Store("UseDolbyDigital",    UseDolbyDigital);
   Store("ChannelInfoPos",     ChannelInfoPos);
   Store("OSDLeft",            OSDLeft);
   Store("OSDTop",             OSDTop);
@@ -510,6 +515,7 @@ bool cSetup::Save(void)
   Store("ResumeID",           ResumeID);
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
+  Store("CurrentDolby",       CurrentDolby);
 
   Sort();
 
diff --git a/config.h b/config.h
index 212f87816..d6759cccb 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.205 2004/11/16 16:57:43 kls Exp $
+ * $Id: config.h 1.209 2005/01/09 12:14:33 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.17"
-#define VDRVERSNUM   10317  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.18"
+#define VDRVERSNUM   10318  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -222,6 +222,7 @@ class cSetup : public cConfig<cSetupLine> {
   int TimeSource;
   int TimeTransponder;
   int MarginStart, MarginStop;
+  int AudioLanguages[I18nNumLanguages + 1];
   int EPGLanguages[I18nNumLanguages + 1];
   int EPGScanTimeout;
   int EPGBugfixLevel;
@@ -238,7 +239,7 @@ class cSetup : public cConfig<cSetupLine> {
   int RecordingDirs;
   int VideoFormat;
   int UpdateChannels;
-  int RecordDolbyDigital;
+  int UseDolbyDigital;
   int ChannelInfoPos;
   int OSDLeft, OSDTop, OSDWidth, OSDHeight;
   int OSDMessageTime;
@@ -251,6 +252,7 @@ class cSetup : public cConfig<cSetupLine> {
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
+  int CurrentDolby;
   int __EndData__;
   cSetup(void);
   cSetup& operator= (const cSetup &s);
diff --git a/device.c b/device.c
index 5a750ca0b..9e60b70b6 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.62 2004/10/30 14:53:38 kls Exp $
+ * $Id: device.c 1.73 2005/01/09 12:36:48 kls Exp $
  */
 
 #include "device.h"
@@ -19,6 +19,87 @@
 #include "status.h"
 #include "transfer.h"
 
+// --- cPesAssembler ---------------------------------------------------------
+
+class cPesAssembler {
+private:
+  uchar *data;
+  uint32_t tag;
+  int length;
+  int size;
+  bool Realloc(int Size);
+public:
+  cPesAssembler(void);
+  ~cPesAssembler();
+  int ExpectedLength(void) { return data[4] * 256 + data[5] + 6; }
+  int Length(void) { return length; }
+  const uchar *Data(void) { return data; }
+  void Reset(void);
+  void Put(uchar c);
+  void Put(const uchar *Data, int Length);
+  bool IsPes(void);
+  };
+
+cPesAssembler::cPesAssembler(void)
+{
+  data = NULL;
+  size = 0;
+  Reset();
+}
+
+cPesAssembler::~cPesAssembler()
+{
+  free(data);
+}
+
+void cPesAssembler::Reset(void)
+{
+  tag = 0xFFFFFFFF;
+  length = 0;
+}
+
+bool cPesAssembler::Realloc(int Size)
+{
+  if (Size > size) {
+     size = max(Size, 2048);
+     data = (uchar *)realloc(data, size);
+     if (!data) {
+        esyslog("ERROR: can't allocate memory for PES assembler");
+        length = 0;
+        size = 0;
+        return false;
+        }
+     }
+  return true;
+}
+
+void cPesAssembler::Put(uchar c)
+{
+  if (!length) {
+     tag = (tag << 8) | c;
+     if ((tag & 0xFFFFFF00) == 0x00000100) {
+        if (Realloc(4)) {
+           *(uint32_t *)data = htonl(tag);
+           length = 4;
+           }
+        }
+     }
+  else if (Realloc(length + 1))
+     data[length++] = c;
+}
+
+void cPesAssembler::Put(const uchar *Data, int Length)
+{
+  while (!length && Length > 0) {
+        Put(*Data++);
+        Length--;
+        }
+  if (Length && Realloc(length + Length)) {
+     memcpy(data + length, Data, Length);
+     length += Length;
+     }
+}
+
 // --- cDevice ---------------------------------------------------------------
 
 // The default priority for non-primary devices:
@@ -53,6 +134,9 @@ cDevice::cDevice(void)
 
   ciHandler = NULL;
   player = NULL;
+  pesAssembler = new cPesAssembler;
+  ClrAvailableTracks();
+  currentAudioTrack = ttAudioFirst;
 
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
@@ -74,6 +158,7 @@ cDevice::~cDevice()
   delete patFilter;
   delete eitFilter;
   delete sectionHandler;
+  delete pesAssembler;
 }
 
 void cDevice::SetUseDevice(int n)
@@ -427,7 +512,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (CaDevice && CanReplay()) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
-           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));//XXX+
+           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid(0), Channel->Apid(1), Channel->Dpid(0), Channel->Dpid(1)));
         else
            Result = scrNoTransfer;
         }
@@ -455,8 +540,35 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      }
 
   if (Result == scrOk) {
-     if (LiveView && IsPrimaryDevice())
+     if (LiveView && IsPrimaryDevice()) {
         currentChannel = Channel->Number();
+        // Set the available audio tracks:
+        ClrAvailableTracks();
+        currentAudioTrack = ttAudioFirst;
+        for (int i = 0; i < MAXAPIDS; i++) {
+            SetAvailableTrack(ttAudio, i, Channel->Apid(i), Channel->Alang(i));
+            if (Setup.UseDolbyDigital)
+               SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i));
+            }
+        // Select the preferred audio track:
+        eTrackType PreferredTrack = ttAudioFirst;
+        int LanguagePreference = -1;
+        int StartCheck = Setup.CurrentDolby ? ttDolbyFirst : ttAudioFirst;
+        int EndCheck = ttDolbyLast;
+        for (int i = StartCheck; i <= EndCheck; i++) {
+            const tTrackId *TrackId = GetTrack(eTrackType(i));
+            if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.AudioLanguages, I18nLanguageIndex(TrackId->language), LanguagePreference))
+               PreferredTrack = eTrackType(i);
+            if (Setup.CurrentDolby && i == ttDolbyLast) {
+               i = ttAudioFirst - 1;
+               EndCheck = ttAudioLast;
+               }
+            }
+        // Make sure we're set to an available audio track:
+        const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
+        if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack())
+           SetCurrentAudioTrack(PreferredTrack);
+        }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
 
@@ -478,21 +590,24 @@ bool cDevice::HasProgramme(void)
   return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
 }
 
-void cDevice::SetVolumeDevice(int Volume)
+int cDevice::GetAudioChannelDevice(void)
 {
+  return 0;
 }
 
-int cDevice::NumAudioTracksDevice(void) const
+void cDevice::SetAudioChannelDevice(int AudioChannel)
 {
-  return 0;
 }
 
-const char **cDevice::GetAudioTracksDevice(int *CurrentTrack) const
+void cDevice::SetVolumeDevice(int Volume)
 {
-  return NULL;
 }
 
-void cDevice::SetAudioTrackDevice(int Index)
+void cDevice::SetDigitalAudioDevice(bool On)
+{
+}
+
+void cDevice::SetAudioTrackDevice(eTrackType Type)
 {
 }
 
@@ -513,6 +628,18 @@ bool cDevice::ToggleMute(void)
   return mute;
 }
 
+int cDevice::GetAudioChannel(void)
+{
+  int c = GetAudioChannelDevice();
+  return (0 <= c && c <= 2) ? c : 0;
+}
+
+void cDevice::SetAudioChannel(int AudioChannel)
+{
+  if (0 <= AudioChannel && AudioChannel <= 2)
+     SetAudioChannelDevice(AudioChannel);
+}
+
 void cDevice::SetVolume(int Volume, bool Absolute)
 {
   volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
@@ -524,22 +651,66 @@ void cDevice::SetVolume(int Volume, bool Absolute)
      }
 }
 
-int cDevice::NumAudioTracks(void) const
+void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
 {
-  return player ? player->NumAudioTracks() : NumAudioTracksDevice();
+  if (DescriptionsOnly) {
+     for (int i = ttNone; i < ttMaxTrackTypes; i++)
+         *availableTracks[i].description = 0;
+     }
+  else
+     memset(availableTracks, 0, sizeof(availableTracks));
 }
 
-const char **cDevice::GetAudioTracks(int *CurrentTrack) const
+bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language, const char *Description, uint32_t Flags)
 {
-  return player ? player->GetAudioTracks(CurrentTrack) : GetAudioTracksDevice(CurrentTrack);
+  eTrackType t = eTrackType(Type + Index);
+  if (Type == ttAudio && IS_AUDIO_TRACK(t) ||
+      Type == ttDolby && IS_DOLBY_TRACK(t)) {
+     if (Language)
+        strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language));
+     if (Description)
+        strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
+     if (Id) {
+        availableTracks[t].flags = Flags;
+        availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
+        }
+     return true;
+     }
+  else
+     esyslog("ERROR: SetAvailableTrack called with invalid Type/Index (%d/%d)", Type, Index);
+  return false;
 }
 
-void cDevice::SetAudioTrack(int Index)
+const tTrackId *cDevice::GetTrack(eTrackType Type)
 {
-  if (player)
-     player->SetAudioTrack(Index);
-  else
-     SetAudioTrackDevice(Index);
+  return (ttNone < Type && Type < ttMaxTrackTypes) ? &availableTracks[Type] : NULL;
+}
+
+int cDevice::NumAudioTracks(void) const
+{
+  int n = 0;
+  for (int i = ttAudioFirst; i <= ttDolbyLast; i++) {
+      if (availableTracks[i].id)
+         n++;
+      }
+  return n;
+}
+
+bool cDevice::SetCurrentAudioTrack(eTrackType Type)
+{
+  if (ttNone < Type && Type < ttDolbyLast) {
+     if (IS_DOLBY_TRACK(Type))
+        SetDigitalAudioDevice(true);
+     currentAudioTrack = Type;
+     if (player)
+        player->SetAudioTrack(currentAudioTrack, GetTrack(currentAudioTrack));
+     else
+        SetAudioTrackDevice(currentAudioTrack);
+     if (IS_AUDIO_TRACK(Type))
+        SetDigitalAudioDevice(false);
+     return true;
+     }
+  return false;
 }
 
 bool cDevice::CanReplay(void) const
@@ -595,6 +766,7 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (CanReplay()) {
      if (player)
         Detach(player);
+     ClrAvailableTracks();
      player = Player;
      SetPlayMode(player->playMode);
      player->device = this;
@@ -639,11 +811,107 @@ int cDevice::PlayVideo(const uchar *Data, int Length)
   return -1;
 }
 
-void cDevice::PlayAudio(const uchar *Data, int Length)
+int cDevice::PlayAudio(const uchar *Data, int Length)
+{
+  return -1;
+}
+
+int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 {
-  Audios.PlayAudio(Data, Length);
+  bool FirstLoop = true;
+  uchar c = Data[3];
+  const uchar *Start = Data;
+  const uchar *End = Start + Length;
+  while (Start < End) {
+        int d = End - Start;
+        int w = d;
+        switch (c) {
+          case 0xE0 ... 0xEF: // video
+               w = PlayVideo(Start, d);
+               break;
+          case 0xC0 ... 0xDF: // audio
+               SetAvailableTrack(ttAudio, c - 0xC0, c);
+               if (!VideoOnly && c == availableTracks[currentAudioTrack].id)
+                  w = PlayAudio(Start, d);
+               break;
+          case 0xBD: // dolby
+               if (Setup.UseDolbyDigital) {
+                  SetAvailableTrack(ttDolby, 0, c);
+                  if (!VideoOnly && c == availableTracks[currentAudioTrack].id) {
+                     w = PlayAudio(Start, d);
+                     if (FirstLoop)
+                        Audios.PlayAudio(Data, Length);
+                     }
+                  }
+               break;
+          default:
+               ;//esyslog("ERROR: unexpected packet id %02X", c);
+          }
+        if (w > 0)
+           Start += w;
+        else if (w <= 0) {
+           if (Start != Data)
+              esyslog("ERROR: incomplete PES packet write!");
+           return Start == Data ? w : Start - Data;
+           }
+        FirstLoop = false;
+        }
+  return Length;
 }
 
+int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
+{
+  if (!Data) {
+     pesAssembler->Reset();
+     return 0;
+     }
+  int Result = 0;
+  if (pesAssembler->Length()) {
+     // Make sure we have a complete PES header:
+     while (pesAssembler->Length() < 6 && Length > 0) {
+           pesAssembler->Put(*Data++);
+           Length--;
+           Result++;
+           }
+     if (pesAssembler->Length() < 6)
+        return Result; // Still no complete PES header - wait for more
+     int l = pesAssembler->ExpectedLength();
+     int Rest = min(l - pesAssembler->Length(), Length);
+     pesAssembler->Put(Data, Rest);
+     Data += Rest;
+     Length -= Rest;
+     Result += Rest;
+     if (pesAssembler->Length() < l)
+        return Result; // Still no complete PES packet - wait for more
+     // Now pesAssembler contains one complete PES packet.
+     int w = PlayPesPacket(pesAssembler->Data(), pesAssembler->Length(), VideoOnly);
+     if (w > 0)
+        pesAssembler->Reset();
+     return Result > 0 ? Result : w < 0 ? w : 0;
+     }
+  int i = 0;
+  while (i <= Length - 6) {
+        if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
+           int l = Data[i + 4] * 256 + Data[i + 5] + 6;
+           if (i + l > Length) {
+              // Store incomplete PES packet for later completion:
+              pesAssembler->Put(Data + i, Length - i);
+              return Length;
+              }
+           int w = PlayPesPacket(Data + i, l, VideoOnly);
+           if (w > 0)
+              i += l;
+           else if (w < 0)
+              return i == 0 ? w : i;
+           }
+        else
+           i++;
+        }
+  if (i < Length)
+     pesAssembler->Put(Data + i, Length - i);
+  return Length;
+ }
+
 int cDevice::Ca(void) const
 {
   int ca = 0;
@@ -722,8 +990,8 @@ bool cDevice::Receiving(bool CheckAny) const
 
 void cDevice::Action(void)
 {
+  active = true;
   if (OpenDvr()) {
-     active = true;
      for (; active;) {
          // Read data from the DVR device:
          uchar *b = NULL;
@@ -770,6 +1038,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
      esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
      return false;
      }
+  cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
          for (int n = 0; n < MAXRECEIVEPIDS; n++) {
@@ -797,6 +1066,7 @@ void cDevice::Detach(cReceiver *Receiver)
   if (!Receiver || Receiver->device != this)
      return;
   bool receiversLeft = false;
+  cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i] == Receiver) {
          Receiver->Activate(false);
diff --git a/device.h b/device.h
index 16ec2c09c..2099a223f 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.46 2004/10/30 14:49:56 kls Exp $
+ * $Id: device.h 1.51 2005/01/07 14:57:01 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -56,10 +56,37 @@ enum eVideoSystem { vsPAL,
                     vsNTSC
                   };
 
+enum eTrackType { ttNone,
+                  ttAudio,
+                  ttAudioFirst = ttAudio,
+                  ttAudioLast  = ttAudioFirst + 31/*XXX MAXAPIDS - 1*/,
+                  ttDolby,
+                  ttDolbyFirst = ttDolby,
+                  ttDolbyLast  = ttDolbyFirst + 31/*XXX MAXAPIDS - 1*/,
+                  /* future...
+                  ttSubtitle,
+                  ttSubtitleFirst = ttSubtitle,
+                  ttSubtitleLast  = ttSubtitleFirst + 31,
+                  */
+                  ttMaxTrackTypes
+                };
+
+#define IS_AUDIO_TRACK(t) (ttAudioFirst <= (t) && (t) <= ttAudioLast)
+#define IS_DOLBY_TRACK(t) (ttDolbyFirst <= (t) && (t) <= ttDolbyLast)
+
+struct tTrackId {
+  uint16_t id;          // The PES packet id or the PID.
+  char language[8];     // something like either "eng" or "deu/eng"
+  char description[32]; // something like "Dolby Digital 5.1"
+  // for future use:
+  uint32_t flags;   // Used to further identify the actual track.
+  };
+
 class cChannel;
 class cPlayer;
 class cReceiver;
 class cSpuDecoder;
+class cPesAssembler;
 
 /// The cDevice class is the base from which actual devices can be derived.
 
@@ -283,69 +310,96 @@ class cDevice : public cThread {
          ///< Returns the video system of the currently displayed material
          ///< (default is PAL).
 
+// Track facilities
+
+private:
+  tTrackId availableTracks[ttMaxTrackTypes];
+  eTrackType currentAudioTrack;
+protected:
+  virtual void SetAudioTrackDevice(eTrackType Type);
+       ///< Sets the current audio track to the given value.
+public:
+  void ClrAvailableTracks(bool DescriptionsOnly = false);
+  bool SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL, uint32_t Flags = 0);
+       ///< Sets the track of the given Type and Index to the given values.
+       ///< Type must be one of the basic eTrackType values, like ttAudio or ttDolby.
+       ///< Index tells which track of the given basic type is meant.
+       ///< If Id is 0 any existing id (and flags) will be left untouched and only the
+       ///< given Language and Description will be set.
+       ///< \return Returns true if the track was set correctly, false otherwise.
+  const tTrackId *GetTrack(eTrackType Type);
+       ///< Returns a pointer to the given track id, or NULL if Type is not
+       ///< less than ttMaxTrackTypes.
+  int NumAudioTracks(void) const;
+       ///< Returns the number of audio tracks that are currently available.
+       ///< This is just for information, to quickly find out whether there
+       ///< is more than one audio track.
+  eTrackType GetCurrentAudioTrack(void) { return currentAudioTrack; }
+  bool SetCurrentAudioTrack(eTrackType Type);
+       ///< Sets the current audio track to the given Type.
+       ///< \return Returns true if Type is a valid audio track, false otherwise.
+
 // Audio facilities
 
 private:
   bool mute;
   int volume;
 protected:
+  virtual int GetAudioChannelDevice(void);
+       ///< Gets the current audio channel, which is stereo (0), mono left (1) or
+       ///< mono right (2).
+  virtual void SetAudioChannelDevice(int AudioChannel);
+       ///< Sets the audio channel to stereo (0), mono left (1) or mono right (2).
   virtual void SetVolumeDevice(int Volume);
        ///< Sets the audio volume on this device (Volume = 0...255).
-  virtual int NumAudioTracksDevice(void) const;
-       ///< Returns the number of audio tracks that are currently available on this
-       ///< device. The default return value is 0, meaning that this device
-       ///< doesn't have multiple audio track capabilities. The return value may
-       ///< change with every call and need not necessarily be the number of list
-       ///< entries returned by GetAudioTracksDevice(). This function is mainly called to
-       ///< decide whether there should be an "Audio" button in a menu.
-  virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
-       ///< Returns a list of currently available audio tracks. The last entry in the
-       ///< list must be NULL. The number of entries does not necessarily have to be
-       ///< the same as returned by a previous call to NumAudioTracksDevice().
-       ///< If CurrentTrack is given, it will be set to the index of the current track
-       ///< in the returned list. Note that the list must not be changed after it has
-       ///< been returned by a call to GetAudioTracksDevice()! The only time the list may
-       ///< change is *inside* the GetAudioTracksDevice() function.
-       ///< By default the return value is NULL and CurrentTrack, if given, will not
-       ///< have any meaning.
-  virtual void SetAudioTrackDevice(int Index);
-       ///< Sets the current audio track to the given value, which should be within the
-       ///< range of the list returned by a previous call to GetAudioTracksDevice()
-       ///< (otherwise nothing will happen).
+  virtual void SetDigitalAudioDevice(bool On);
+       ///< Tells the actual device that digital audio output shall be switched
+       ///< on or off.
 public:
   bool IsMute(void) const { return mute; }
   bool ToggleMute(void);
        ///< Turns the volume off or on and returns the new mute state.
+  int GetAudioChannel(void);
+       ///< Gets the current audio channel, which is stereo (0), mono left (1) or
+       ///< mono right (2).
+  void SetAudioChannel(int AudioChannel);
+       ///< Sets the audio channel to stereo (0), mono left (1) or mono right (2).
+       ///< Any other values will be silently ignored.
   void SetVolume(int Volume, bool Absolute = false);
        ///< Sets the volume to the given value, either absolutely or relative to
        ///< the current volume.
   static int CurrentVolume(void) { return primaryDevice ? primaryDevice->volume : 0; }//XXX???
-  int NumAudioTracks(void) const;
-       ///< Returns the number of audio tracks that are currently available on this
-       ///< device or a player attached to it.
-  const char **GetAudioTracks(int *CurrentTrack = NULL) const;
-       ///< Returns a list of currently available audio tracks. The last entry in the
-       ///< list is NULL. The number of entries does not necessarily have to be
-       ///< the same as returned by a previous call to NumAudioTracks().
-       ///< If CurrentTrack is given, it will be set to the index of the current track
-       ///< in the returned list.
-       ///< By default the return value is NULL and CurrentTrack, if given, will not
-       ///< have any meaning.
-  void SetAudioTrack(int Index);
-       ///< Sets the current audio track to the given value, which should be within the
-       ///< range of the list returned by a previous call to GetAudioTracks() (otherwise
-       ///< nothing will happen).
 
 // Player facilities
 
 private:
   cPlayer *player;
+  cPesAssembler *pesAssembler;
 protected:
   virtual bool CanReplay(void) const;
        ///< Returns true if this device can currently start a replay session.
   virtual bool SetPlayMode(ePlayMode PlayMode);
        ///< Sets the device into the given play mode.
        ///< \return true if the operation was successful.
+  virtual int PlayVideo(const uchar *Data, int Length);
+       ///< Plays the given data block as video.
+       ///< Data points to exactly one complete PES packet of the given Length.
+       ///< PlayVideo() shall process the packet either as a whole (returning
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< \return Returns the number of bytes actually taken from Data, or -1
+       ///< in case of an error.
+  virtual int PlayAudio(const uchar *Data, int Length);
+       ///< Plays the given data block as audio.
+       ///< Data points to exactly one complete PES packet of the given Length.
+       ///< PlayAudio() shall process the packet either as a whole (returning
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< \return Returns the number of bytes actually taken from Data, or -1
+       ///< in case of an error.
+  virtual int PlayPesPacket(const uchar *Data, int Length, bool VideoOnly = false);
+       ///< Plays the single PES packet in Data with the given Length.
+       ///< If VideoOnly is true, only the video will be displayed,
+       ///< which is necessary for trick modes like 'fast forward'.
+       ///< Data must point to one single, complete PES packet.
 public:
   virtual int64_t GetSTC(void);
        ///< Gets the current System Time Counter, which can be used to
@@ -382,14 +436,16 @@ class cDevice : public cThread {
        ///< If TimeoutMs is not zero, the device will wait up to the given
        ///< number of milliseconds before returning in case there is still
        ///< data in the buffers..
-  virtual int PlayVideo(const uchar *Data, int Length);
-       ///< Actually plays the given data block as video. The data must be
-       ///< part of a PES (Packetized Elementary Stream) which can contain
-       ///< one video and one audio stream.
-  virtual void PlayAudio(const uchar *Data, int Length);
-       ///< Plays additional audio streams, like Dolby Digital.
-       ///< A derived class must call the base class function to make sure data
-       ///< is distributed to all registered cAudio objects.
+  virtual int PlayPes(const uchar *Data, int Length, bool VideoOnly = false);
+       ///< Plays all valid PES packets in Data with the given Length.
+       ///< If Data is NULL any leftover data from a previous call will be
+       ///< discarded. If VideoOnly is true, only the video will be displayed,
+       ///< which is necessary for trick modes like 'fast forward'.
+       ///< Data should point to a sequence of complete PES packets. If the
+       ///< last packet in Data is not complete, it will be copied and combined
+       ///< to a complete packet with data from the next call to PlayPes().
+       ///< That way any functions called from within PlayPes() will be
+       ///< guaranteed to always receive complete PES packets.
   bool Replaying(void) const;
        ///< Returns true if we are currently replaying.
   void StopReplay(void);
@@ -402,6 +458,7 @@ class cDevice : public cThread {
 // Receiver facilities
 
 private:
+  cMutex mutexReceiver;
   cReceiver *receiver[MAXRECEIVERS];
   int CanShift(int Ca, int Priority, int UsedCards = 0) const;
 protected:
diff --git a/diseqc.c b/diseqc.c
index 801e1cd8b..bae599600 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.3 2004/10/24 11:04:56 kls Exp $
+ * $Id: diseqc.c 1.4 2005/01/09 13:05:11 kls Exp $
  */
 
 #include "diseqc.h"
@@ -37,7 +37,7 @@ bool cDiseqc::Parse(const char *s)
      source = cSource::FromString(sourcebuf);
      if (Sources.Get(source)) {
         polarization = toupper(polarization);
-        if (polarization == 'V' || polarization == 'H') {
+        if (polarization == 'V' || polarization == 'H' || polarization == 'L' || polarization == 'R') {
            parsing = true;
            char *CurrentAction = NULL;
            while (Execute(&CurrentAction) != daNone)
diff --git a/dvbdevice.c b/dvbdevice.c
index 8780ac533..9c7fd3817 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.105 2004/11/20 11:41:37 kls Exp $
+ * $Id: dvbdevice.c 1.113 2005/01/09 13:04:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -46,16 +46,19 @@ extern "C" {
 #define DEV_DVB_AUDIO     "audio"
 #define DEV_DVB_CA        "ca"
 
-static const char *DvbName(const char *Name, int n)
-{
-  static char buffer[PATH_MAX];
-  snprintf(buffer, sizeof(buffer), "%s%d/%s%d", DEV_DVB_ADAPTER, n, Name, 0);
-  return buffer;
-}
+class cDvbName {
+private:
+  char buffer[PATH_MAX];
+public:
+  cDvbName(const char *Name, int n) {
+    snprintf(buffer, sizeof(buffer), "%s%d/%s%d", DEV_DVB_ADAPTER, n, Name, 0);
+    }
+  const char *operator*() { return buffer; }
+  };
 
 static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
 {
-  const char *FileName = DvbName(Name, n);
+  const char *FileName = *cDvbName(Name, n);
   int fd = open(FileName, Mode);
   if (fd < 0 && ReportError)
      LOG_ERROR_STR(FileName);
@@ -239,7 +242,7 @@ bool cDvbTuner::SetFrontend(void)
                frequency -= Setup.LnbFrequHi;
                tone = SEC_TONE_ON;
                }
-            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
             CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
             CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
             }
@@ -319,9 +322,9 @@ void cDvbTuner::Action(void)
                      cCiCaPmt CaPmt(channel.Source(), channel.Transponder(), channel.Sid(), ciHandler->GetCaSystemIds(Slot));
                      if (CaPmt.Valid()) {
                         CaPmt.AddPid(channel.Vpid(), 2);
-                        CaPmt.AddPid(channel.Apid1(), 4);
-                        CaPmt.AddPid(channel.Apid2(), 4);
-                        CaPmt.AddPid(channel.Dpid1(), 0);
+                        CaPmt.AddPid(channel.Apid(0), 4);
+                        CaPmt.AddPid(channel.Apid(1), 4);
+                        CaPmt.AddPid(channel.Dpid(0), 0);
                         if (ciHandler->SetCaPmt(CaPmt, Slot)) {
                            tunerStatus = tsCam;
                            startTime = 0;
@@ -349,8 +352,8 @@ cDvbDevice::cDvbDevice(int n)
   dvbTuner = NULL;
   frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   spuDecoder = NULL;
+  digitalAudio = false;
   playMode = pmNone;
-  aPid1 = aPid2 = 0;
 
   // Devices that are present on all card types:
 
@@ -406,7 +409,7 @@ cDvbDevice::cDvbDevice(int n)
      dvb_frontend_info feinfo;
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
         frontendType = feinfo.type;
-        ciHandler = cCiHandler::CreateCiHandler(DvbName(DEV_DVB_CA, n));
+        ciHandler = cCiHandler::CreateCiHandler(*cDvbName(DEV_DVB_CA, n));
         dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType, ciHandler);
         }
      else
@@ -449,7 +452,7 @@ bool cDvbDevice::Initialize(void)
   int i;
   for (i = 0; i < MAXDVBDEVICES; i++) {
       if (UseDevice(NextCardIndex())) {
-         if (Probe(DvbName(DEV_DVB_FRONTEND, i))) {
+         if (Probe(*cDvbName(DEV_DVB_FRONTEND, i))) {
             new cDvbDevice(i);
             found++;
             }
@@ -541,7 +544,7 @@ bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int Siz
                }
 
            if (Quality < 0)
-              Quality = 255; //XXX is this 'best'???
+              Quality = 100;
 
            isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
            FILE *f = fopen(FileName, "wb");
@@ -659,7 +662,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 
 int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
 {
-  const char *FileName = DvbName(DEV_DVB_DEMUX, CardIndex());
+  const char *FileName = *cDvbName(DEV_DVB_DEMUX, CardIndex());
   int f = open(FileName, O_RDWR | O_NONBLOCK);
   if (f >= 0) {
      dmx_sct_filter_params sctFilterParams;
@@ -725,7 +728,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
-           if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid1() && !HasPid(Channel->Apid1())) {
+           if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
 #ifdef DO_MULTIPLE_RECORDINGS
               if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE)
                  needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels
@@ -798,9 +801,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // PID settings:
 
   if (TurnOnLivePIDs) {
-     aPid1 = Channel->Apid1();
-     aPid2 = Channel->Apid2();
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid1(), ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached)
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
@@ -812,7 +813,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid1(), Channel->Apid2(), Channel->Dpid1(), Channel->Dpid2()));
+     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid(0), Channel->Apid(1), Channel->Dpid(0), Channel->Dpid(1)));
 
   return true;
 }
@@ -822,6 +823,22 @@ bool cDvbDevice::HasLock(int TimeoutMs)
   return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
 }
 
+int cDvbDevice::GetAudioChannelDevice(void)
+{
+  if (HasDecoder()) {
+     audio_status_t as;
+     CHECK(ioctl(fd_audio, AUDIO_GET_STATUS, &as));
+     return as.channel_select;
+     }
+  return 0;
+}
+
+void cDvbDevice::SetAudioChannelDevice(int AudioChannel)
+{
+  if (HasDecoder())
+     CHECK(ioctl(fd_audio, AUDIO_CHANNEL_SELECT, AudioChannel));
+}
+
 void cDvbDevice::SetVolumeDevice(int Volume)
 {
   if (HasDecoder()) {
@@ -832,34 +849,30 @@ void cDvbDevice::SetVolumeDevice(int Volume)
      }
 }
 
-int cDvbDevice::NumAudioTracksDevice(void) const
+void cDvbDevice::SetDigitalAudioDevice(bool On)
 {
-  int n = 0;
-  if (aPid1)
-     n++;
-  if (Ca() <= MAXDEVICES && aPid2 && aPid1 != aPid2) // a CA recording session blocks switching live audio tracks
-     n++;
-  return n;
-}
-
-const char **cDvbDevice::GetAudioTracksDevice(int *CurrentTrack) const
-{
-  if (NumAudioTracksDevice()) {
-     if (CurrentTrack)
-        *CurrentTrack = (pidHandles[ptAudio].pid == aPid1) ? 0 : 1;
-     static const char *audioTracks1[] = { "Audio 1", NULL };
-     static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
-     return NumAudioTracksDevice() > 1 ? audioTracks2 : audioTracks1;
+  if (digitalAudio != On) {
+     if (digitalAudio)
+        cCondWait::SleepMs(1000); // Wait until any leftover digital data has been flushed
+     SetVolumeDevice(On || IsMute() ? 0 : CurrentVolume());
+     digitalAudio = On;
      }
-  return NULL;
 }
 
-void cDvbDevice::SetAudioTrackDevice(int Index)
+void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
 {
-  if (0 <= Index && Index < NumAudioTracksDevice()) {
-     int Pid = Index ? aPid2 : aPid1;
-     pidHandles[ptAudio].pid = Pid;
-     SetPid(&pidHandles[ptAudio], ptAudio, true);
+  const tTrackId *TrackId = GetTrack(Type);
+  if (TrackId && TrackId->id) {
+     if (IS_AUDIO_TRACK(Type)) {
+        pidHandles[ptAudio].pid = TrackId->id;
+        SetPid(&pidHandles[ptAudio], ptAudio, true);
+        }
+     else if (IS_DOLBY_TRACK(Type)) {
+        // Currently this works only in Transfer Mode
+        cChannel *Channel = Channels.GetByNumber(CurrentChannel());
+        if (Channel)
+           SetChannelDevice(Channel, false); // this implicitly starts Transfer Mode
+        }
      }
 }
 
@@ -1117,16 +1130,12 @@ bool cDvbDevice::Flush(int TimeoutMs)
 
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
-  int fd = (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video;
-  if (fd >= 0)
-     return write(fd, Data, Length);
-  return -1;
+  return write(fd_video, Data, Length);
 }
 
-void cDvbDevice::PlayAudio(const uchar *Data, int Length)
+int cDvbDevice::PlayAudio(const uchar *Data, int Length)
 {
-  //XXX actually this function will only be needed to implement replaying AC3 over the DVB card's S/PDIF
-  cDevice::PlayAudio(Data, Length);
+  return write(fd_audio, Data, Length);
 }
 
 bool cDvbDevice::OpenDvr(void)
diff --git a/dvbdevice.h b/dvbdevice.h
index 1817f3718..233515d8c 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.30 2004/11/07 10:25:16 kls Exp $
+ * $Id: dvbdevice.h 1.32 2005/01/06 13:30:51 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -90,15 +90,20 @@ class cDvbDevice : public cDevice {
   virtual void SetVideoFormat(bool VideoFormat16_9);
   virtual eVideoSystem GetVideoSystem(void);
 
+// Track facilities
+
+protected:
+  virtual void SetAudioTrackDevice(eTrackType Type);
+
 // Audio facilities
 
 private:
-  int aPid1, aPid2;
+  bool digitalAudio;
 protected:
+  virtual int GetAudioChannelDevice(void);
+  virtual void SetAudioChannelDevice(int AudioChannel);
   virtual void SetVolumeDevice(int Volume);
-  virtual int NumAudioTracksDevice(void) const;
-  virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
-  virtual void SetAudioTrackDevice(int Index);
+  virtual void SetDigitalAudioDevice(bool On);
 
 // Player facilities
 
@@ -106,6 +111,8 @@ class cDvbDevice : public cDevice {
   ePlayMode playMode;
   virtual bool CanReplay(void) const;
   virtual bool SetPlayMode(ePlayMode PlayMode);
+  virtual int PlayVideo(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length);
 public:
   virtual int64_t GetSTC(void);
   virtual void TrickSpeed(int Speed);
@@ -116,8 +123,6 @@ class cDvbDevice : public cDevice {
   virtual void StillPicture(const uchar *Data, int Length);
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
   virtual bool Flush(int TimeoutMs = 0);
-  virtual int PlayVideo(const uchar *Data, int Length);
-  virtual void PlayAudio(const uchar *Data, int Length);
 
 // Receiver facilities
 
diff --git a/dvbplayer.c b/dvbplayer.c
index d583fe6b2..0ec068101 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.26 2004/10/23 12:39:35 kls Exp $
+ * $Id: dvbplayer.c 1.29 2004/12/26 11:45:34 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -194,13 +194,10 @@ class cDvbPlayer : public cPlayer, cThread {
   ePlayDirs playDir;
   int trickSpeed;
   int readIndex, writeIndex;
-  bool canToggleAudioTrack;
-  uchar audioTrack;
   cFrame *readFrame;
   cFrame *playFrame;
   void TrickSpeed(int Increment);
   void Empty(void);
-  void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
   bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
   int Resume(void);
   bool Save(void);
@@ -220,9 +217,6 @@ class cDvbPlayer : public cPlayer, cThread {
   void Goto(int Position, bool Still = false);
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
-  virtual int NumAudioTracks(void) const;
-  virtual const char **GetAudioTracks(int *CurrentTrack = NULL) const;
-  virtual void SetAudioTrack(int Index);
   };
 
 #define MAX_VIDEO_SLOWMOTION 63 // max. arg to pass to VIDEO_SLOWMOTION // TODO is this value correct?
@@ -245,8 +239,6 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   playMode = pmPlay;
   playDir = pdForward;
   trickSpeed = NORMAL_SPEED;
-  canToggleAudioTrack = false;
-  audioTrack = 0xC0;
   readIndex = writeIndex = -1;
   readFrame = NULL;
   playFrame = NULL;
@@ -312,41 +304,6 @@ void cDvbPlayer::Empty(void)
   firstPacket = true;
 }
 
-void cDvbPlayer::StripAudioPackets(uchar *b, int Length, uchar Except)
-{
-  if (index) {
-     for (int i = 0; i < Length - 6; i++) {
-         if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
-            uchar c = b[i + 3];
-            int l = b[i + 4] * 256 + b[i + 5] + 6;
-            switch (c) {
-              case 0xBD: // dolby
-                   if (Except)
-                      PlayAudio(&b[i], l);
-                   // continue with deleting the data - otherwise it disturbs DVB replay
-              case 0xC0 ... 0xC1: // audio
-                   if (c == 0xC1)
-                      canToggleAudioTrack = true;
-                   if (!Except || c != Except)
-                      memset(&b[i], 0x00, min(l, Length-i));
-                   break;
-              case 0xE0 ... 0xEF: // video
-                   break;
-              default:
-                   //esyslog("ERROR: unexpected packet id %02X", c);
-                   l = 0;
-              }
-            if (l)
-               i += l - 1; // the loop increments, too!
-            }
-         /*XXX
-         else
-            esyslog("ERROR: broken packet header");
-            XXX*/
-         }
-     }
-}
-
 bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset)
 {
   if (FileNumber > 0)
@@ -409,11 +366,10 @@ void cDvbPlayer::Action(void)
 
   readIndex = Resume();
   if (readIndex >= 0)
-     isyslog("resuming replay at index %d (%s)", readIndex, IndexToHMSF(readIndex, true));
+     isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true));
 
   nonBlockingFileReader = new cNonBlockingFileReader;
   int Length = 0;
-  int AudioTrack = 0; // -1 = any, 0 = none, >0 = audioTrack
 
   running = true;
   while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
@@ -449,9 +405,6 @@ void cDvbPlayer::Action(void)
                           continue;
                           }
                        readIndex = Index;
-                       AudioTrack = 0;
-                       // must clear all audio packets because the buffer is not emptied
-                       // when falling back from "fast forward" to "play" (see above)
                        }
                     else if (index) {
                        uchar FileNumber;
@@ -462,12 +415,9 @@ void cDvbPlayer::Action(void)
                           eof = true;
                           continue;
                           }
-                       AudioTrack = audioTrack;
                        }
-                    else { // allows replay even if the index file is missing
+                    else // allows replay even if the index file is missing
                        Length = MAXFRAMESIZE;
-                       AudioTrack = -1;
-                       }
                     if (Length == -1)
                        Length = MAXFRAMESIZE; // this means we read up to EOF (see cIndex)
                     else if (Length > MAXFRAMESIZE) {
@@ -478,8 +428,6 @@ void cDvbPlayer::Action(void)
                     }
                  int r = nonBlockingFileReader->Read(replayFile, b, Length);
                  if (r > 0) {
-                    if (AudioTrack == 0)
-                       StripAudioPackets(b, r);
                     readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
                     b = NULL;
                     }
@@ -490,6 +438,8 @@ void cDvbPlayer::Action(void)
                     break;
                     }
                  }
+              else
+                 cCondWait::SleepMs(1); // this keeps the CPU load low
               }
 
            // Store the frame in the buffer:
@@ -515,15 +465,14 @@ void cDvbPlayer::Action(void)
                  pc = playFrame->Count();
                  if (p) {
                     if (firstPacket) {
+                       PlayPes(NULL, 0);
                        cRemux::SetBrokenLink(p, pc);
                        firstPacket = false;
                        }
-                    if (AudioTrack > 0)
-                       StripAudioPackets(p, pc, AudioTrack);
                     }
                  }
               if (p) {
-                 int w = PlayVideo(p, pc);
+                 int w = PlayPes(p, pc, playMode != pmPlay);
                  if (w > 0) {
                     p += w;
                     pc -= w;
@@ -715,7 +664,6 @@ void cDvbPlayer::Goto(int Index, bool Still)
         if (r > 0) {
            if (playMode == pmPause)
               DevicePlay();
-           StripAudioPackets(b, r);
            DeviceStillPicture(b, r);
            }
         playMode = pmStill;
@@ -755,31 +703,6 @@ bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
   return true;
 }
 
-int cDvbPlayer::NumAudioTracks(void) const
-{
-  return canToggleAudioTrack ? 2 : 1;
-}
-
-const char **cDvbPlayer::GetAudioTracks(int *CurrentTrack) const
-{
-  if (NumAudioTracks()) {
-     if (CurrentTrack)
-        *CurrentTrack = (audioTrack == 0xC0) ? 0 : 1;
-     static const char *audioTracks1[] = { "Audio 1", NULL };
-     static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
-     return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1;
-     }
-  return NULL;
-}
-
-void cDvbPlayer::SetAudioTrack(int Index)
-{
-  if ((audioTrack == 0xC0) != (Index == 0)) {
-     audioTrack = (Index == 1) ? 0xC1 : 0xC0;
-     Empty();
-     }
-}
-
 // --- cDvbPlayerControl -----------------------------------------------------
 
 cDvbPlayerControl::cDvbPlayerControl(const char *FileName)
diff --git a/dvbspu.c b/dvbspu.c
index 696113928..44cb7b337 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.8 2004/11/06 11:50:13 kls Exp $
+ * $Id: dvbspu.c 1.11 2005/01/08 09:57:03 kls Exp $
  */
 
 #include <assert.h>
@@ -227,6 +227,7 @@ cDvbSpuDecoder::cDvbSpuDecoder()
     spu = NULL;
     osd = NULL;
     spubmp = NULL;
+    allowedShow = false;
 }
 
 cDvbSpuDecoder::~cDvbSpuDecoder()
@@ -236,7 +237,7 @@ cDvbSpuDecoder::~cDvbSpuDecoder()
     delete osd;
 }
 
-void cDvbSpuDecoder::processSPU(uint32_t pts, uint8_t * buf)
+void cDvbSpuDecoder::processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow)
 {
     setTime(pts);
 
@@ -252,6 +253,7 @@ void cDvbSpuDecoder::processSPU(uint32_t pts, uint8_t * buf)
     prev_DCSQ_offset = 0;
 
     clean = true;
+    allowedShow = AllowedShow;
 }
 
 void cDvbSpuDecoder::setScaleMode(cSpuDecoder::eScaleMode ScaleMode)
@@ -530,7 +532,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
         } else if (!clean)
             state = spSHOW;
 
-        if (state == spSHOW || state == spMENU)
+        if ((state == spSHOW && allowedShow) || state == spMENU)
             Draw();
 
         if (state == spHIDE)
diff --git a/dvbspu.h b/dvbspu.h
index 078f432e5..888123473 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.6 2004/11/06 11:42:37 kls Exp $
+ * $Id: dvbspu.h 1.7 2005/01/08 09:59:44 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -120,6 +120,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
     uint16_t prev_DCSQ_offset;
 
     cDvbSpuBitmap *spubmp;
+    bool allowedShow;
   private:
     int cmdOffs(void) {
         return ((spu[2] << 8) | spu[3]);
@@ -147,7 +148,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
     void Hide(void);
     void Draw(void);
     bool IsVisible(void) { return osd != NULL; }
-    void processSPU(uint32_t pts, uint8_t * buf);
+    void processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow);
 };
 
 // --- cDvbSpuPalette -------------------------------------------
diff --git a/eit.c b/eit.c
index ed02cf281..a7d60c498 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.100 2004/10/31 12:56:24 kls Exp $
+ * $Id: eit.c 1.102 2005/01/02 11:52:12 kls Exp $
  */
 
 #include "eit.h"
@@ -91,6 +91,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
       SI::ShortEventDescriptor *ShortEventDescriptor = NULL;
       cLinkChannels *LinkChannels = NULL;
+      int NumComponents = 0;
+      SI::ComponentDescriptor *ComponentDescriptors[MAXCOMPONENTS];
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
@@ -186,6 +188,20 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                     }
                  }
                  break;
+            case SI::ComponentDescriptorTag: {
+                 SI::ComponentDescriptor *cd = (SI::ComponentDescriptor *)d;
+                 uchar Stream = cd->getStreamContent();
+                 uchar Type = cd->getComponentType();
+                 if (1 <= Stream && Stream <= 2 && Type != 0) {
+                    if (NumComponents < MAXCOMPONENTS) {
+                       ComponentDescriptors[NumComponents++] = cd;
+                       d = NULL; // so that it is not deleted
+                       }
+                    else
+                       dsyslog("more than %d component descriptors!", MAXCOMPONENTS);
+                    }
+                 }
+                 break;
             default: ;
             }
           delete d;
@@ -205,8 +221,20 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
 
-      pEvent->FixEpgBugs();
+      if (NumComponents > 0) {
+         cComponents *Components = new cComponents(NumComponents);
+         for (int i = 0; i < NumComponents; i++) {
+             char buffer[256];
+             SI::ComponentDescriptor *cd = ComponentDescriptors[i];
+             Components->SetComponent(i, cd->getStreamContent(), cd->getComponentType(), I18nNormalizeLanguageCode(cd->languageCode), cd->description.getText(buffer, sizeof(buffer)));
+             delete cd;
+             }
+         pEvent->SetComponents(Components);
+         }
+      else
+         pEvent->SetComponents(NULL);
 
+      pEvent->FixEpgBugs();
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
       if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
@@ -245,8 +273,8 @@ cTDT::cTDT(const u_char *Data)
 
   if (abs(sattim - loctim) > 2) {
      mutex.Lock();
-     isyslog("System Time = %s (%ld)\n", ctime(&loctim), loctim);
-     isyslog("Local Time  = %s (%ld)\n", ctime(&sattim), sattim);
+     isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim);
+     isyslog("Local Time  = %s (%ld)\n", *TimeToString(sattim), sattim);
      if (stime(&sattim) < 0)
         esyslog("ERROR while setting system time: %m");
      mutex.Unlock();
diff --git a/epg.c b/epg.c
index 877ce24ce..5539ab044 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.22 2004/11/07 10:43:30 kls Exp $
+ * $Id: epg.c 1.24 2005/01/02 11:25:25 kls Exp $
  */
 
 #include "epg.h"
@@ -16,6 +16,66 @@
 #include <ctype.h>
 #include <time.h>
 
+// --- tComponent ------------------------------------------------------------
+
+cString tComponent::ToString(void)
+{
+  char buffer[256];
+  snprintf(buffer, sizeof(buffer), "%X %02X %-3s %s", stream, type, language, description ? description : "");
+  return buffer;
+}
+
+bool tComponent::FromString(const char *s)
+{
+  unsigned int Stream, Type;
+  int n = sscanf(s, "%X %02X %3c %a[^\n]", &Stream, &Type, language, &description);
+  if (n != 4)
+     description = NULL;
+  else if (isempty(description)) {
+     free(description);
+     description = NULL;
+     }
+  stream = Stream;
+  type = Type;
+  return n >= 3;
+}
+
+// --- cComponents -----------------------------------------------------------
+
+cComponents::cComponents(int NumComponents)
+{
+  numComponents = NumComponents;
+  components = MALLOC(tComponent, numComponents);
+  memset(components, 0, sizeof(tComponent) * numComponents);
+}
+
+cComponents::~cComponents(void)
+{
+  for (int i = 0; i < numComponents; i++)
+      free(components[i].description);
+  free(components);
+}
+
+bool cComponents::SetComponent(int Index, const char *s)
+{
+  if (Index < numComponents)
+     return components[Index].FromString(s);
+  return false;
+}
+
+bool cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description)
+{
+  if (Index < numComponents) {
+     tComponent *p = &components[Index];
+     p->stream = Stream;
+     p->type = Type;
+     strn0cpy(p->language, Language, sizeof(p->language));
+     p->description = strcpyrealloc(p->description, !isempty(Description) ? Description : NULL);
+     return true;
+     }
+  return false;
+}
+
 // --- cEvent ----------------------------------------------------------------
 
 cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID)
@@ -28,6 +88,7 @@ cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID)
   title = NULL;
   shortText = NULL;
   description = NULL;
+  components = NULL;
   startTime = 0;
   duration = 0;
   vps = 0;
@@ -39,6 +100,7 @@ cEvent::~cEvent()
   free(title);
   free(shortText);
   free(description);
+  delete components;
 }
 
 int cEvent::Compare(const cListObject &ListObject) const
@@ -66,7 +128,7 @@ void cEvent::SetRunningStatus(int RunningStatus, cChannel *Channel)
 {
   if (Channel && runningStatus != RunningStatus && (RunningStatus > SI::RunningStatusNotRunning || runningStatus > SI::RunningStatusUndefined))
      if (Channel->Number() <= 30)//XXX maybe log only those that have timers???
-     isyslog("channel %d (%s) event %s '%s' status %d", Channel->Number(), Channel->Name(), GetTimeString(), Title(), RunningStatus);
+     isyslog("channel %d (%s) event %s '%s' status %d", Channel->Number(), Channel->Name(), *GetTimeString(), Title(), RunningStatus);
   runningStatus = RunningStatus;
 }
 
@@ -85,6 +147,12 @@ void cEvent::SetDescription(const char *Description)
   description = strcpyrealloc(description, Description);
 }
 
+void cEvent::SetComponents(cComponents *Components)
+{
+  delete components;
+  components = Components;
+}
+
 void cEvent::SetStartTime(time_t StartTime)
 {
   startTime = StartTime;
@@ -119,9 +187,9 @@ bool cEvent::IsRunning(bool OrAboutToStart) const
   return runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
 }
 
-const char *cEvent::GetDateString(void) const
+cString cEvent::GetDateString(void) const
 {
-  static char buf[32];
+  char buf[32];
   struct tm tm_r;
   tm *tm = localtime_r(&startTime, &tm_r);
   char *p = stpcpy(buf, WeekDayName(tm->tm_wday));
@@ -130,26 +198,26 @@ const char *cEvent::GetDateString(void) const
   return buf;
 }
 
-const char *cEvent::GetTimeString(void) const
+cString cEvent::GetTimeString(void) const
 {
-  static char buf[25];
+  char buf[25];
   struct tm tm_r;
   strftime(buf, sizeof(buf), "%R", localtime_r(&startTime, &tm_r));
   return buf;
 }
 
-const char *cEvent::GetEndTimeString(void) const
+cString cEvent::GetEndTimeString(void) const
 {
-  static char buf[25];
+  char buf[25];
   time_t EndTime = startTime + duration;
   struct tm tm_r;
   strftime(buf, sizeof(buf), "%R", localtime_r(&EndTime, &tm_r));
   return buf;
 }
 
-const char *cEvent::GetVpsString(void) const
+cString cEvent::GetVpsString(void) const
 {
-  static char buf[25];
+  char buf[25];
   struct tm tm_r;
   strftime(buf, sizeof(buf), "%d.%m %R", localtime_r(&vps, &tm_r));
   return buf;
@@ -168,6 +236,12 @@ void cEvent::Dump(FILE *f, const char *Prefix) const
         fprintf(f, "%sD %s\n", Prefix, description);
         strreplace(description, '|', '\n');
         }
+     if (components) {
+        for (int i = 0; i < components->NumComponents(); i++) {
+            tComponent *p = components->Component(i);
+            fprintf(f, "%sX %s\n", Prefix, *p->ToString());
+            }
+        }
      if (vps)
         fprintf(f, "%sV %ld\n", Prefix, vps);
      fprintf(f, "%se\n", Prefix);
@@ -178,8 +252,11 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
 {
   if (Schedule) {
      cEvent *Event = NULL;
+     int NumComponents = 0;
+     char *ComponentStrings[MAXCOMPONENTS];
      char *s;
-     while ((s = readline(f)) != NULL) {
+     cReadLine ReadLine;
+     while ((s = ReadLine.Read(f)) != NULL) {
            char *t = skipspace(s + 1);
            switch (*s) {
              case 'E': if (!Event) {
@@ -198,6 +275,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                                 Event->SetDuration(Duration);
                                 }
                              }
+                          NumComponents = 0;
                           }
                        break;
              case 'T': if (Event)
@@ -211,10 +289,26 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                           Event->SetDescription(t);
                           }
                        break;
+             case 'X': if (Event) {
+                          if (NumComponents < MAXCOMPONENTS)
+                             ComponentStrings[NumComponents++] = strdup(t);
+                          else
+                             dsyslog("more than %d component descriptors!", MAXCOMPONENTS);
+                          }
+                       break;
              case 'V': if (Event)
                           Event->SetVps(atoi(t));
                        break;
-             case 'e': Event = NULL;
+             case 'e': if (Event && NumComponents > 0) {
+                          cComponents *Components = new cComponents(NumComponents);
+                          for (int i = 0; i < NumComponents; i++) {
+                              if (!Components->SetComponent(i, ComponentStrings[i]))
+                                 esyslog("ERROR: faulty component string in EPG data: '%s'", ComponentStrings[i]);
+                              free(ComponentStrings[i]);
+                              }
+                          Event->SetComponents(Components);
+                          }
+                       Event = NULL;
                        break;
              case 'c': // to keep things simple we react on 'c' here
                        return true;
@@ -227,7 +321,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 8
+#define MAXEPGBUGFIXSTATS 12
 #define MAXEPGBUGFIXCHANS 100
 struct tEpgBugFixStats {
   int hits;
@@ -475,6 +569,72 @@ void cEvent::FixEpgBugs(void)
      strreplace(title, '`', '\'');
      strreplace(shortText, '`', '\'');
      strreplace(description, '`', '\'');
+
+     if (Setup.EPGBugfixLevel <= 2)
+        return;
+
+     // The stream components have a "description" field which some channels
+     // apparently have no idea of how to set correctly:
+     if (components) {
+        for (int i = 0; i < components->NumComponents(); i++) {
+            tComponent *p = components->Component(i);
+            switch (p->stream) {
+              case 0x01: { // video
+                   if (p->description) {
+                      if (strcasecmp(p->description, "Video") == 0 ||
+                           strcasecmp(p->description, "Bildformat") == 0) {
+                         // Yes, we know it's video - that's what the 'stream' code
+                         // is for! But _which_ video is it?
+                         free(p->description);
+                         p->description = NULL;
+                         EpgBugFixStat(8, ChannelID());
+                         }
+                      }
+                   if (!p->description) {
+                      switch (p->type) {
+                        case 0x01:
+                        case 0x05: p->description = strdup("4:3"); break;
+                        case 0x02:
+                        case 0x03:
+                        case 0x06:
+                        case 0x07: p->description = strdup("16:9"); break;
+                        case 0x04:
+                        case 0x08: p->description = strdup(">16:9"); break;
+                        case 0x09:
+                        case 0x0D: p->description = strdup("HD 4:3"); break;
+                        case 0x0A:
+                        case 0x0B:
+                        case 0x0E:
+                        case 0x0F: p->description = strdup("HD 16:9"); break;
+                        case 0x0C:
+                        case 0x10: p->description = strdup("HD >16:9"); break;
+                        }
+                      EpgBugFixStat(9, ChannelID());
+                      }
+                   }
+                   break;
+              case 0x02: { // audio
+                   if (p->description) {
+                      if (strcasecmp(p->description, "Audio") == 0) {
+                         // Yes, we know it's audio - that's what the 'stream' code
+                         // is for! But _which_ audio is it?
+                         free(p->description);
+                         p->description = NULL;
+                         EpgBugFixStat(10, ChannelID());
+                         }
+                      }
+                   if (!p->description) {
+                      switch (p->type) {
+                        case 0x05: p->description = strdup("Dolby Digital"); break;
+                        // all others will just display the language
+                        }
+                      EpgBugFixStat(11, ChannelID());
+                      }
+                   }
+                   break;
+              }
+            }
+        }
      }
 }
 
@@ -604,7 +764,7 @@ void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtT
 {
   cChannel *channel = Channels.GetByChannelID(channelID, true);
   if (channel) {
-     fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelID().ToString(), channel->Name());
+     fprintf(f, "%sC %s %s\n", Prefix, *channel->GetChannelID().ToString(), channel->Name());
      const cEvent *p;
      switch (DumpMode) {
        case dmAll: {
@@ -635,8 +795,9 @@ void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtT
 bool cSchedule::Read(FILE *f, cSchedules *Schedules)
 {
   if (Schedules) {
+     cReadLine ReadLine;
      char *s;
-     while ((s = readline(f)) != NULL) {
+     while ((s = ReadLine.Read(f)) != NULL) {
            if (*s == 'C') {
               s = skipspace(s + 1);
               char *p = strchr(s, ' ');
@@ -698,8 +859,7 @@ const cSchedules *cSchedules::Schedules(cSchedulesLock &SchedulesLock)
 void cSchedules::SetEpgDataFileName(const char *FileName)
 {
   delete epgDataFileName;
-  if (FileName)
-     epgDataFileName = strdup(FileName);
+  epgDataFileName = FileName ? strdup(FileName) : NULL;
 }
 
 void cSchedules::SetModified(cSchedule *Schedule)
diff --git a/epg.h b/epg.h
index 3268b17ce..88e66029e 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.17 2004/10/31 16:17:10 kls Exp $
+ * $Id: epg.h 1.19 2005/01/02 10:44:41 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -17,26 +17,50 @@
 #include "thread.h"
 #include "tools.h"
 
-#define MAXEPGBUGFIXLEVEL 2
+#define MAXEPGBUGFIXLEVEL 3
+#define MAXCOMPONENTS 32
 
 enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
 
+struct tComponent {
+  uchar stream;
+  uchar type;
+  char language[4];
+  char *description;
+  cString ToString(void);
+  bool FromString(const char *s);
+  };
+
+class cComponents {
+private:
+  int numComponents;
+  tComponent *components;
+public:
+  cComponents(int NumComponents);
+  ~cComponents(void);
+  int NumComponents(void) const { return numComponents; }
+  bool SetComponent(int Index, const char *s);
+  bool SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
+  tComponent *Component(int Index) const { return (Index < numComponents) ? &components[Index] : NULL; }
+  };
+
 class cSchedule;
 
 class cEvent : public cListObject {
 private:
-  tChannelID channelID;  // Channel ID of program for this event
-  u_int16_t eventID;     // Event ID of this event
-  uchar tableID;         // Table ID this event came from
-  uchar version;         // Version number of section this event came from
-  int runningStatus;     // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running
-  char *title;           // Title of this event
-  char *shortText;       // Short description of this event (typically the episode name in case of a series)
-  char *description;     // Description of this event
-  time_t startTime;      // Start time of this event
-  int duration;          // Duration of this event in seconds
-  time_t vps;            // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
-  time_t seen;           // When this event was last seen in the data stream
+  tChannelID channelID;    // Channel ID of program for this event
+  u_int16_t eventID;       // Event ID of this event
+  uchar tableID;           // Table ID this event came from
+  uchar version;           // Version number of section this event came from
+  int runningStatus;       // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running
+  char *title;             // Title of this event
+  char *shortText;         // Short description of this event (typically the episode name in case of a series)
+  char *description;       // Description of this event
+  cComponents *components; // The stream components of this event (separated by '\n')
+  time_t startTime;        // Start time of this event
+  int duration;            // Duration of this event in seconds
+  time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
+  time_t seen;             // When this event was last seen in the data stream
 public:
   cEvent(tChannelID ChannelID, u_int16_t EventID);
   ~cEvent();
@@ -49,6 +73,7 @@ class cEvent : public cListObject {
   const char *Title(void) const { return title; }
   const char *ShortText(void) const { return shortText; }
   const char *Description(void) const { return description; }
+  const cComponents *Components(void) const { return components; }
   time_t StartTime(void) const { return startTime; }
   time_t EndTime(void) const { return startTime + duration; }
   int Duration(void) const { return duration; }
@@ -56,10 +81,10 @@ class cEvent : public cListObject {
   time_t Seen(void) const { return seen; }
   bool HasTimer(void) const;
   bool IsRunning(bool OrAboutToStart = false) const;
-  const char *GetDateString(void) const;
-  const char *GetTimeString(void) const;
-  const char *GetEndTimeString(void) const;
-  const char *GetVpsString(void) const;
+  cString GetDateString(void) const;
+  cString GetTimeString(void) const;
+  cString GetEndTimeString(void) const;
+  cString GetVpsString(void) const;
   void SetEventID(u_int16_t EventID);
   void SetTableID(uchar TableID);
   void SetVersion(uchar Version);
@@ -67,6 +92,7 @@ class cEvent : public cListObject {
   void SetTitle(const char *Title);
   void SetShortText(const char *ShortText);
   void SetDescription(const char *Description);
+  void SetComponents(cComponents *Components); // Will take ownership of Components!
   void SetStartTime(time_t StartTime);
   void SetDuration(int Duration);
   void SetVps(time_t Vps);
diff --git a/font.c b/font.c
index 29f949445..b99c75061 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.9 2004/10/23 14:06:01 kls Exp $
+ * $Id: font.c 1.10 2004/12/18 13:41:19 kls Exp $
  */
 
 #include "config.h"
@@ -12,9 +12,9 @@
 #include "font.h"
 #include "tools.h"
 
-#include "fontfix.c"
-#include "fontosd.c"
-#include "fontsml.c"
+#include "fontfix-iso8859-1.c"
+#include "fontosd-iso8859-1.c"
+#include "fontsml-iso8859-1.c"
 
 #include "fontfix-iso8859-2.c"
 #include "fontosd-iso8859-2.c"
diff --git a/fontfix.c b/fontfix-iso8859-1.c
similarity index 53%
rename from fontfix.c
rename to fontfix-iso8859-1.c
index 5c85e2ac1..9b806ca48 100644
--- a/fontfix.c
+++ b/fontfix-iso8859-1.c
@@ -35,22 +35,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -64,13 +64,13 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00000880,  // ....*...*......
-     0x00000880,  // ....*...*......
-     0x00000880,  // ....*...*......
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -92,25 +92,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -121,26 +121,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000F60,  // ....****.**....
-     0x00001FE0,  // ...********....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F80,  // ...******......
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00003FE0,  // ..*********....
-     0x000037C0,  // ..**.*****.....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000FC0,  // ...******......
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FF0,  // ..*********....
+     0x00001BE0,  // ..**.*****.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -152,21 +152,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000F00,  // ....****.......
-     0x00001980,  // ...**..**......
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00001980,  // ...**..**......
-     0x00000F00,  // ....****.......
-     0x00000070,  // .........***...
-     0x000003C0,  // ......****.....
-     0x00000E00,  // ....***........
-     0x000039E0,  // ..***..****....
-     0x00000330,  // ......**..**...
-     0x00000618,  // .....**....**..
-     0x00000618,  // .....**....**..
-     0x00000330,  // ......**..**...
-     0x000001E0,  // .......****....
+     0x00000780,  // ....****.......
+     0x00000CC0,  // ...**..**......
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
+     0x00000038,  // .........***...
+     0x000001E0,  // ......****.....
+     0x00000700,  // ....***........
+     0x00001CF0,  // ..***..****....
+     0x00000198,  // ......**..**...
+     0x0000030C,  // .....**....**..
+     0x0000030C,  // .....**....**..
+     0x00000198,  // ......**..**...
+     0x000000F0,  // .......****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -182,20 +182,20 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000E00,  // ....***........
-     0x00001F30,  // ...*****..**...
-     0x00001BF0,  // ...**.******...
-     0x000031E0,  // ..**...****....
-     0x000030C0,  // ..**....**.....
-     0x000031E0,  // ..**...****....
-     0x00003FF8,  // ..***********..
-     0x00001F38,  // ...*****..***..
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000700,  // ....***........
+     0x00000F98,  // ...*****..**...
+     0x00000DF8,  // ...**.******...
+     0x000018F0,  // ..**...****....
+     0x00001860,  // ..**....**.....
+     0x000018F0,  // ..**...****....
+     0x00001FFC,  // ..***********..
+     0x00000F9C,  // ...*****..***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -210,12 +210,12 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000800,  // ....*..........
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -238,26 +238,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000060,  // .........**....
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000E0,  // ........***....
-     0x00000060,  // .........**....
+     0x00000030,  // .........**....
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000070,  // ........***....
+     0x00000030,  // .........**....
      0x00000000,  // ...............
   },
   {             // 41
@@ -267,26 +267,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001C00,  // ...***.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
      0x00000000,  // ...............
   },
   {             // 42
@@ -296,17 +296,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003330,  // ..**..**..**...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
-     0x00000300,  // ......**.......
-     0x00000FC0,  // ....******.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001998,  // ..**..**..**...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -328,18 +328,18 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -367,12 +367,12 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000800,  // ....*..........
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -391,8 +391,8 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -425,9 +425,9 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -440,26 +440,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -470,22 +470,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00001860,  // ...**....**....
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000C30,  // ...**....**....
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -499,22 +499,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -528,22 +528,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
+     0x00001C00,  // ..***..........
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -557,22 +557,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000007C0,  // .....*****.....
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x00003FE0,  // ..*********....
-     0x00001FC0,  // ...*******.....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000003E0,  // .....*****.....
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001FF0,  // ..*********....
+     0x00000FE0,  // ...*******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -586,22 +586,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000007F0,  // .....*******...
-     0x000007F0,  // .....*******...
+     0x000000E0,  // .......***.....
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000003F8,  // .....*******...
+     0x000003F8,  // .....*******...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -615,22 +615,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF0,  // ...*********...
-     0x00001FF0,  // ...*********...
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BC0,  // ...**.****.....
-     0x00001FF0,  // ...*********...
-     0x00001C70,  // ...***...***...
-     0x00000038,  // ..........***..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00003038,  // ..**......***..
-     0x00003870,  // ..***....***...
-     0x00001FF0,  // ...*********...
-     0x00000FC0,  // ....******.....
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DE0,  // ...**.****.....
+     0x00000FF8,  // ...*********...
+     0x00000E38,  // ...***...***...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000181C,  // ..**......***..
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -644,22 +644,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F0,  // .......*****...
-     0x000007F0,  // .....*******...
-     0x00000F00,  // ....****.......
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
-     0x00003800,  // ..***..........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003830,  // ..***.....**...
-     0x00001C70,  // ...***...***...
-     0x00001FE0,  // ...********....
-     0x000007C0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x000003F8,  // .....*******...
+     0x00000780,  // ....****.......
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C18,  // ..***.....**...
+     0x00000E38,  // ...***...***...
+     0x00000FF0,  // ...********....
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -673,22 +673,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -702,22 +702,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -731,22 +731,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003C0,  // ......****.....
-     0x00000FF0,  // ....********...
-     0x00000C30,  // ....**....**...
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C78,  // ...***...****..
-     0x00000FD8,  // ....******.**..
-     0x00000798,  // .....****..**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001F80,  // ...******......
+     0x000001E0,  // ......****.....
+     0x000007F8,  // ....********...
+     0x00000618,  // ....**....**...
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E3C,  // ...***...****..
+     0x000007EC,  // ....******.**..
+     0x000003CC,  // .....****..**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -765,17 +765,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -794,20 +794,20 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001000,  // ...*...........
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000800,  // ...*...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -821,18 +821,18 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000001C,  // ...........***.
-     0x00000078,  // .........****..
-     0x000001E0,  // .......****....
-     0x00000780,  // .....****......
-     0x00001E00,  // ...****........
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001E00,  // ...****........
-     0x00000780,  // .....****......
-     0x000001E0,  // .......****....
-     0x00000078,  // .........****..
-     0x0000001C,  // ...........***.
+     0x0000000E,  // ...........***.
+     0x0000003C,  // .........****..
+     0x000000F0,  // .......****....
+     0x000003C0,  // .....****......
+     0x00000F00,  // ...****........
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000F00,  // ...****........
+     0x000003C0,  // .....****......
+     0x000000F0,  // .......****....
+     0x0000003C,  // .........****..
+     0x0000000E,  // ...........***.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -853,12 +853,12 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -879,18 +879,18 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007000,  // .***...........
-     0x00003C00,  // ..****.........
-     0x00000F00,  // ....****.......
-     0x000003C0,  // ......****.....
-     0x000000F0,  // ........****...
-     0x0000003C,  // ..........****.
-     0x0000003C,  // ..........****.
-     0x000000F0,  // ........****...
-     0x000003C0,  // ......****.....
-     0x00000F00,  // ....****.......
-     0x00003C00,  // ..****.........
-     0x00007000,  // .***...........
+     0x00003800,  // .***...........
+     0x00001E00,  // ..****.........
+     0x00000780,  // ....****.......
+     0x000001E0,  // ......****.....
+     0x00000078,  // ........****...
+     0x0000001E,  // ..........****.
+     0x0000001E,  // ..........****.
+     0x00000078,  // ........****...
+     0x000001E0,  // ......****.....
+     0x00000780,  // ....****.......
+     0x00001E00,  // ..****.........
+     0x00003800,  // .***...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -906,21 +906,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00001870,  // ...**....***...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000001E0,  // .......****....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x000000F0,  // .......****....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -934,24 +934,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x00003060,  // ..**.....**....
-     0x00003060,  // ..**.....**....
-     0x000031E0,  // ..**...****....
-     0x000033E0,  // ..**..*****....
-     0x00003760,  // ..**.***.**....
-     0x00003660,  // ..**.**..**....
-     0x00003660,  // ..**.**..**....
-     0x00003760,  // ..**.***.**....
-     0x000033F0,  // ..**..******...
-     0x000031F0,  // ..**...*****...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x00000380,  // .....***.......
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x000018F0,  // ..**...****....
+     0x000019F0,  // ..**..*****....
+     0x00001BB0,  // ..**.***.**....
+     0x00001B30,  // ..**.**..**....
+     0x00001B30,  // ..**.**..**....
+     0x00001BB0,  // ..**.***.**....
+     0x000019F8,  // ..**..******...
+     0x000018F8,  // ..**...*****...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -964,21 +964,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -993,21 +993,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF0,  // .***********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1022,21 +1022,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003000,  // ..**...........
-     0x00003818,  // ..***......**..
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1051,21 +1051,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1080,21 +1080,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1109,21 +1109,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x000018CC,  // ...**...**..**.
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C66,  // ...**...**..**.
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1138,21 +1138,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x000060FC,  // .**.....******.
-     0x000060FC,  // .**.....******.
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1167,21 +1167,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1196,21 +1196,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1225,21 +1225,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFC,  // ....**********.
-     0x00000FFC,  // ....**********.
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x000070E0,  // .***....***....
-     0x00003FC0,  // ..********.....
-     0x00001F80,  // ...******......
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1254,21 +1254,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCF8,  // ******..*****..
-     0x0000FCF8,  // ******..*****..
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00003F00,  // ..******.......
-     0x00003B80,  // ..***.***......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1283,21 +1283,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1312,21 +1312,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F03C,  // ****......****.
-     0x0000F03C,  // ****......****.
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006798,  // .**..****..**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1341,21 +1341,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1370,21 +1370,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1399,21 +1399,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF8,  // .************..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1428,24 +1428,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
-     0x0000070C,  // .....***....**.
-     0x00001FFC,  // ...***********.
-     0x00001CF0,  // ...***..****...
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000386,  // .....***....**.
+     0x00000FFE,  // ...***********.
+     0x00000E78,  // ...***..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1457,21 +1457,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FF80,  // *********......
-     0x0000FFE0,  // ***********....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003070,  // ..**.....***...
-     0x00003FE0,  // ..*********....
-     0x00003F80,  // ..*******......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1486,21 +1486,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1515,21 +1515,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1544,21 +1544,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1573,21 +1573,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1602,21 +1602,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006FD8,  // .**.******.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00003CF0,  // ..****..****...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001E78,  // ..****..****...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1631,21 +1631,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1660,21 +1660,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1689,21 +1689,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1717,26 +1717,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
      0x00000000,  // ...............
   },
   {             // 92
@@ -1745,26 +1745,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1775,26 +1775,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
   },
   {             // 94
@@ -1804,14 +1804,14 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1851,8 +1851,8 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFFE,  // ***************
-     0x0000FFFE,  // ***************
+     0x00007FFF,  // ***************
+     0x00007FFF,  // ***************
      0x00000000,  // ...............
   },
   {             // 96
@@ -1863,12 +1863,12 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x00000040,  // .........*.....
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000020,  // .........*.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1896,17 +1896,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1920,22 +1920,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BE0,  // ...**.*****....
-     0x00001FF8,  // ...**********..
-     0x00001E38,  // ...****...***..
-     0x00001C1C,  // ...***.....***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00001C1C,  // ...***.....***.
-     0x00001E38,  // ...****...***..
-     0x00007FF8,  // .************..
-     0x00007BE0,  // .****.*****....
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00003FFC,  // .************..
+     0x00003DF0,  // .****.*****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1954,17 +1954,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1978,22 +1978,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000F0,  // ........****...
-     0x000000F0,  // ........****...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FFC,  // ..************.
-     0x00000FBC,  // ....*****.****.
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2012,17 +2012,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2036,22 +2036,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F8,  // .......******..
-     0x000003F8,  // ......*******..
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x000000FC,  // .......******..
+     0x000001FC,  // ......*******..
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2070,22 +2070,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001FC0,  // ...*******.....
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
   },
   {             // 104
      15, 26,
@@ -2094,22 +2094,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000F000,  // ****...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2123,22 +2123,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2152,27 +2152,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FC0,  // ..********.....
-     0x00003FC0,  // ..********.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00003F80,  // ..*******......
-     0x00003F00,  // ..******.......
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
   },
   {             // 107
      15, 26,
@@ -2181,22 +2181,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x000018F0,  // ...**...****...
-     0x000018F0,  // ...**...****...
-     0x000019C0,  // ...**..***.....
-     0x00001B80,  // ...**.***......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00001B80,  // ...**.***......
-     0x000019C0,  // ...**..***.....
-     0x000018E0,  // ...**...***....
-     0x000078FC,  // .****...******.
-     0x000078FC,  // .****...******.
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C78,  // ...**...****...
+     0x00000C78,  // ...**...****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003C7E,  // .****...******.
+     0x00003C7E,  // .****...******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2210,22 +2210,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2233,7 +2233,7 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
   },
   {             // 109
-     15, 26,
+     16, 26,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2244,17 +2244,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001DEF0,  // ***.****.****...
-     0x0001FFF8,  // **************..
-     0x00007398,  // ..***..***..**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001F3DE,  // *****..****.****
-     0x0001F3DE,  // *****..****.****
+     0x0000EF78,  // ***.****.****...
+     0x0000FFFC,  // **************..
+     0x000039CC,  // ..***..***..**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000F9EF,  // *****..****.****
+     0x0000F9EF,  // *****..****.****
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2273,17 +2273,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2302,17 +2302,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2331,22 +2331,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7C0,  // ****.*****.....
-     0x0000FFF0,  // ************...
-     0x00003C70,  // ..****...***...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00003C70,  // ..****...***...
-     0x00003FF0,  // ..**********...
-     0x000037C0,  // ..**.*****.....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x0000FE00,  // *******........
-     0x0000FE00,  // *******........
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
   },
   {             // 113
      15, 26,
@@ -2360,22 +2360,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x000001FC,  // .......*******.
-     0x000001FC,  // .......*******.
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000000FE,  // .......*******.
+     0x000000FE,  // .......*******.
   },
   {             // 114
      15, 26,
@@ -2389,17 +2389,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00003FF8,  // ..***********..
-     0x00000F18,  // ....****...**..
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2418,17 +2418,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2443,21 +2443,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001C70,  // ...***...***...
-     0x00000FF0,  // ....********...
-     0x000007C0,  // .....*****.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2476,17 +2476,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2505,17 +2505,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2534,17 +2534,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00003330,  // ..**..**..**...
-     0x000037B0,  // ..**.****.**...
-     0x000037B0,  // ..**.****.**...
-     0x00003CF0,  // ..****..****...
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00001998,  // ..**..**..**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001E78,  // ..****..****...
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2563,17 +2563,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2592,22 +2592,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 122
      15, 26,
@@ -2621,17 +2621,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2645,26 +2645,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x000000E0,  // ........***....
+     0x00000070,  // ........***....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000070,  // ........***....
      0x00000000,  // ...............
   },
   {             // 124
@@ -2674,24 +2674,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2703,26 +2703,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000380,  // ......***......
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00001C00,  // ...***.........
+     0x00000E00,  // ...***.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
   },
   {             // 126
@@ -2739,10 +2739,10 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001E18,  // ...****....**..
-     0x00003F38,  // ..******..***..
-     0x000073F0,  // .***..******...
-     0x000061E0,  // .**....****....
+     0x00000F0C,  // ...****....**..
+     0x00001F9C,  // ..******..***..
+     0x000039F8,  // .***..******...
+     0x000030F0,  // .**....****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3752,22 +3752,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
      0x00000000,  // ...............
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000600,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000300,  // .....**........
   },
   {             // 162
      15, 26,
@@ -3776,22 +3776,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000F60,  // ....****.**....
-     0x00001FE0,  // ...********....
-     0x000038E0,  // ..***...***....
-     0x00003060,  // ..**.....**....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003860,  // ..***....**....
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3806,21 +3806,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00000FE0,  // ....*******....
-     0x00001C60,  // ...***...**....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x00003818,  // ..***......**..
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x000003E0,  // .....*****.....
+     0x000007F0,  // ....*******....
+     0x00000E30,  // ...***...**....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00001C0C,  // ..***......**..
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3837,17 +3837,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3864,21 +3864,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3892,24 +3892,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3921,24 +3921,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007F0,  // .....*******...
-     0x00000FF0,  // ....********...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001C00,  // ...***.........
-     0x00003F00,  // ..******.......
-     0x000067C0,  // .**..*****.....
-     0x000061F0,  // .**....*****...
-     0x00007878,  // .****....****..
-     0x00003E18,  // ..*****....**..
-     0x00000F98,  // ....*****..**..
-     0x000003F8,  // ......*******..
-     0x000000F0,  // ........****...
-     0x00000060,  // .........**....
-     0x00003060,  // ..**.....**....
-     0x000030E0,  // ..**....***....
-     0x00003FC0,  // ..********.....
-     0x00003F80,  // ..*******......
+     0x000003F8,  // .....*******...
+     0x000007F8,  // ....********...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000E00,  // ...***.........
+     0x00001F80,  // ..******.......
+     0x000033E0,  // .**..*****.....
+     0x000030F8,  // .**....*****...
+     0x00003C3C,  // .****....****..
+     0x00001F0C,  // ..*****....**..
+     0x000007CC,  // ....*****..**..
+     0x000001FC,  // ......*******..
+     0x00000078,  // ........****...
+     0x00000030,  // .........**....
+     0x00001830,  // ..**.....**....
+     0x00001870,  // ..**....***....
+     0x00001FE0,  // ..********.....
+     0x00001FC0,  // ..*******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3951,9 +3951,9 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3980,20 +3980,20 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00006798,  // .**..****..**..
-     0x00006FD8,  // .**.******.**..
-     0x0000DCCC,  // **.***..**..**.
-     0x0000D80C,  // **.**.......**.
-     0x0000D80C,  // **.**.......**.
-     0x0000DCCC,  // **.***..**..**.
-     0x00006FD8,  // .**.******.**..
-     0x00006798,  // .**..****..**..
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006E66,  // **.***..**..**.
+     0x00006C06,  // **.**.......**.
+     0x00006C06,  // **.**.......**.
+     0x00006E66,  // **.***..**..**.
+     0x000037EC,  // .**.******.**..
+     0x000033CC,  // .**..****..**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4009,17 +4009,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x000000C0,  // ........**.....
-     0x00000FC0,  // ....******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000019E0,  // ...**..****....
-     0x00000F60,  // ....****.**....
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000060,  // ........**.....
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000CF0,  // ...**..****....
+     0x000007B0,  // ....****.**....
      0x00000000,  // ...............
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4043,15 +4043,15 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000071C,  // .....***...***.
-     0x00000E38,  // ....***...***..
-     0x00001C70,  // ...***...***...
-     0x000038E0,  // ..***...***....
-     0x000071C0,  // .***...***.....
-     0x000038E0,  // ..***...***....
-     0x00001C70,  // ...***...***...
-     0x00000E38,  // ....***...***..
-     0x0000071C,  // .....***...***.
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4072,12 +4072,12 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4103,8 +4103,8 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4125,20 +4125,20 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00006F98,  // .**.*****..**..
-     0x00006FD8,  // .**.******.**..
-     0x0000CCCC,  // **..**..**..**.
-     0x0000CCCC,  // **..**..**..**.
-     0x0000CF8C,  // **..*****...**.
-     0x0000CD8C,  // **..**.**...**.
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000037CC,  // .**.*****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006666,  // **..**..**..**.
+     0x00006666,  // **..**..**..**.
+     0x000067C6,  // **..*****...**.
+     0x000066C6,  // **..**.**...**.
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4154,8 +4154,8 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4182,13 +4182,13 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4213,20 +4213,20 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4240,15 +4240,15 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000C60,  // ....**...**....
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000630,  // ....**...**....
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4269,15 +4269,15 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000000C0,  // ........**.....
-     0x000003C0,  // ......****.....
-     0x00000060,  // .........**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000001E0,  // ......****.....
+     0x00000030,  // .........**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4298,10 +4298,10 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4332,22 +4332,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00003FFC,  // ..************.
-     0x00003FBC,  // ..*******.****.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FFE,  // ..************.
+     0x00001FDE,  // ..*******.****.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
   },
   {             // 182
      15, 26,
@@ -4356,24 +4356,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FF8,  // ....*********..
-     0x00003FF8,  // ..***********..
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00003F60,  // ..******.**....
-     0x00000F60,  // ....****.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00001F78,  // ...*****.****..
-     0x00001F78,  // ...*****.****..
+     0x000007FC,  // ....*********..
+     0x00001FFC,  // ..***********..
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x00001FB0,  // ..******.**....
+     0x000007B0,  // ....****.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x00000FBC,  // ...*****.****..
+     0x00000FBC,  // ...*****.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4392,9 +4392,9 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4429,12 +4429,12 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 185
      15, 26,
@@ -4443,15 +4443,15 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4473,17 +4473,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4507,15 +4507,15 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000071C0,  // .***...***.....
-     0x000038E0,  // ..***...***....
-     0x00001C70,  // ...***...***...
-     0x00000E38,  // ....***...***..
-     0x0000071C,  // .....***...***.
-     0x00000E38,  // ....***...***..
-     0x00001C70,  // ...***...***...
-     0x000038E0,  // ..***...***....
-     0x000071C0,  // .***...***.....
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4530,22 +4530,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ...**...........
-     0x0001F002,  // *****..........*
-     0x00003006,  // ...**.........**
-     0x0000300C,  // ...**........**.
-     0x00003018,  // ...**.......**..
-     0x00003030,  // ...**......**...
-     0x00003060,  // ...**.....**....
-     0x000030C8,  // ...**....**..*..
-     0x0001FF98,  // **********..**..
-     0x00000338,  // .......**..***..
-     0x00000658,  // ......**..*.**..
-     0x00000C98,  // .....**..*..**..
-     0x00001918,  // ....**..*...**..
-     0x000031FC,  // ...**...*******.
-     0x00006018,  // ..**........**..
-     0x0000403C,  // ..*........****.
+     0x00001800,  // ..**...........
+     0x00007801,  // ****..........*
+     0x00001803,  // ..**.........**
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001818,  // ..**......**...
+     0x00001830,  // ..**.....**....
+     0x00001864,  // ..**....**..*..
+     0x00007FCC,  // *********..**..
+     0x0000019C,  // ......**..***..
+     0x0000032C,  // .....**..*.**..
+     0x0000064C,  // ....**..*..**..
+     0x00000C8C,  // ...**..*...**..
+     0x000018FE,  // ..**...*******.
+     0x0000300C,  // .**........**..
+     0x0000201E,  // .*........****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4559,22 +4559,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ...**...........
-     0x0001F002,  // *****..........*
-     0x00003006,  // ...**.........**
-     0x0000300C,  // ...**........**.
-     0x00003018,  // ...**.......**..
-     0x00003030,  // ...**......**...
-     0x00003060,  // ...**.....**....
-     0x000030FC,  // ...**....******.
-     0x0001FFE6,  // ************..**
-     0x00000346,  // .......**.*...**
-     0x0000060C,  // ......**.....**.
-     0x00000C18,  // .....**.....**..
-     0x00001830,  // ....**.....**...
-     0x00003060,  // ...**.....**....
-     0x000060C6,  // ..**.....**...**
-     0x000040FE,  // ..*......*******
+     0x00001800,  // ..**...........
+     0x00007801,  // ****..........*
+     0x00001803,  // ..**.........**
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001818,  // ..**......**...
+     0x00001830,  // ..**.....**....
+     0x0000187E,  // ..**....******.
+     0x00007FF3,  // ***********..**
+     0x000001A3,  // ......**.*...**
+     0x00000306,  // .....**.....**.
+     0x0000060C,  // ....**.....**..
+     0x00000C18,  // ...**.....**...
+     0x00001830,  // ..**.....**....
+     0x00003063,  // .**.....**...**
+     0x0000207F,  // .*......*******
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4588,22 +4588,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C00,  // .*****.........
-     0x0000C602,  // **...**.......*
-     0x0000C606,  // **...**......**
-     0x00000C0C,  // ....**......**.
-     0x00003C18,  // ..****.....**..
-     0x00000630,  // .....**...**...
-     0x0000C660,  // **...**..**....
-     0x0000C6C8,  // **...**.**..*..
-     0x00007D98,  // .*****.**..**..
-     0x00000338,  // ......**..***..
-     0x00000658,  // .....**..*.**..
-     0x00000C98,  // ....**..*..**..
-     0x00001918,  // ...**..*...**..
-     0x000031FC,  // ..**...*******.
-     0x00006018,  // .**........**..
-     0x0000403C,  // .*........****.
+     0x00003E00,  // .*****.........
+     0x00006301,  // **...**.......*
+     0x00006303,  // **...**......**
+     0x00000606,  // ....**......**.
+     0x00001E0C,  // ..****.....**..
+     0x00000318,  // .....**...**...
+     0x00006330,  // **...**..**....
+     0x00006364,  // **...**.**..*..
+     0x00003ECC,  // .*****.**..**..
+     0x0000019C,  // ......**..***..
+     0x0000032C,  // .....**..*.**..
+     0x0000064C,  // ....**..*..**..
+     0x00000C8C,  // ...**..*...**..
+     0x000018FE,  // ..**...*******.
+     0x0000300C,  // .**........**..
+     0x0000201E,  // .*........****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4622,46 +4622,46 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00001E00,  // ...****........
-     0x00003800,  // ..***..........
-     0x00003000,  // ..**...........
-     0x00003060,  // ..**.....**....
-     0x00003060,  // ..**.....**....
-     0x00003860,  // ..***....**....
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000F00,  // ...****........
+     0x00001C00,  // ..***..........
+     0x00001800,  // ..**...........
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
   },
   {             // 192
      15, 26,
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4671,26 +4671,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 193
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4699,27 +4699,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   },
   {             // 194
      15, 26,
-     0x00000600,  // .....**........
-     0x00000F00,  // ....****.......
-     0x00001F80,  // ...******......
-     0x000039C0,  // ..***..***.....
-     0x000070E0,  // .***....***....
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000FC0,  // ...******......
+     0x00001CE0,  // ..***..***.....
+     0x00003870,  // .***....***....
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4730,25 +4730,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4759,25 +4759,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4787,26 +4787,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 197
      15, 26,
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000D80,  // ....**.**......
-     0x00000880,  // ....*...*......
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4821,21 +4821,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFE,  // ....***********
-     0x00000FFE,  // ....***********
-     0x00000386,  // ......***....**
-     0x00000786,  // .....****....**
-     0x00000780,  // .....****......
-     0x00000D98,  // ....**.**..**..
-     0x000009F8,  // ....*..******..
-     0x000019F8,  // ...**..******..
-     0x00001F98,  // ...******..**..
-     0x00003F80,  // ..*******......
-     0x00003180,  // ..**...**......
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x0000F7FE,  // ****.**********
-     0x0000F7FE,  // ****.**********
+     0x000007FF,  // ....***********
+     0x000007FF,  // ....***********
+     0x000001C3,  // ......***....**
+     0x000003C3,  // .....****....**
+     0x000003C0,  // .....****......
+     0x000006CC,  // ....**.**..**..
+     0x000004FC,  // ....*..******..
+     0x00000CFC,  // ...**..******..
+     0x00000FCC,  // ...******..**..
+     0x00001FC0,  // ..*******......
+     0x000018C0,  // ..**...**......
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x00007BFF,  // ****.**********
+     0x00007BFF,  // ****.**********
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4850,50 +4850,50 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003008,  // ..**........*..
-     0x00003818,  // ..***......**..
-     0x00001FF0,  // ...*********...
-     0x000007E0,  // .....******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001804,  // ..**........*..
+     0x00001C0C,  // ..***......**..
+     0x00000FF8,  // ...*********...
+     0x000003F0,  // .....******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 200
      15, 26,
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4903,26 +4903,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 201
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4931,27 +4931,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   },
   {             // 202
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4962,25 +4962,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4990,26 +4990,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 204
      15, 26,
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5019,26 +5019,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 205
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5047,27 +5047,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   },
   {             // 206
      15, 26,
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5078,25 +5078,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5111,21 +5111,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000FE0C,  // *******.....**.
-     0x0000FE0C,  // *******.....**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00007F06,  // *******.....**.
+     0x00007F06,  // *******.....**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5136,25 +5136,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000730,  // .....***..**...
-     0x00000FE0,  // ....*******....
-     0x000019C0,  // ...**..***.....
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5164,26 +5164,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 210
      15, 26,
      0x00000000,  // ...............
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
-     0x000001C0,  // .......***.....
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5193,26 +5193,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 211
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5221,27 +5221,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   },
   {             // 212
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5252,25 +5252,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000730,  // .....***..**...
-     0x00000FE0,  // ....*******....
-     0x000019C0,  // ...**..***.....
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5281,25 +5281,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5316,18 +5316,18 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00002010,  // ..*........*...
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00002010,  // ..*........*...
+     0x00001008,  // ..*........*...
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00001008,  // ..*........*...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5341,24 +5341,24 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000000C,  // ............**.
-     0x00000018,  // ...........**..
-     0x000007F0,  // .....*******...
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003078,  // ..**.....****..
-     0x000070DC,  // .***....**.***.
-     0x0000608C,  // .**.....*...**.
-     0x0000618C,  // .**....**...**.
-     0x0000630C,  // .**...**....**.
-     0x0000620C,  // .**...*.....**.
-     0x0000660C,  // .**..**.....**.
-     0x0000741C,  // .***.*.....***.
-     0x00003C18,  // ..****.....**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000037C0,  // ..**.*****.....
-     0x00006000,  // .**............
+     0x00000006,  // ............**.
+     0x0000000C,  // ...........**..
+     0x000003F8,  // .....*******...
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x00003046,  // .**.....*...**.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x00003A0E,  // .***.*.....***.
+     0x00001E0C,  // ..****.....**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x00001BE0,  // ..**.*****.....
+     0x00003000,  // .**............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5367,26 +5367,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 217
      15, 26,
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5396,26 +5396,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 218
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5424,27 +5424,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   },
   {             // 219
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5455,25 +5455,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5483,26 +5483,26 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 221
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5517,21 +5517,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007E00,  // .******........
-     0x00007E00,  // .******........
-     0x00001800,  // ...**..........
-     0x00001FE0,  // ...********....
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00007E00,  // .******........
-     0x00007E00,  // .******........
+     0x00003F00,  // .******........
+     0x00003F00,  // .******........
+     0x00000C00,  // ...**..........
+     0x00000FF0,  // ...********....
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00003F00,  // .******........
+     0x00003F00,  // .******........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5545,22 +5545,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x000018E0,  // ...**...***....
-     0x00001BC0,  // ...**.****.....
-     0x00001BE0,  // ...**.*****....
-     0x00001870,  // ...**....***...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000019B8,  // ...**..**.***..
-     0x00007DF0,  // .*****.*****...
-     0x00007CE0,  // .*****..***....
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C70,  // ...**...***....
+     0x00000DE0,  // ...**.****.....
+     0x00000DF0,  // ...**.*****....
+     0x00000C38,  // ...**....***...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000CDC,  // ...**..**.***..
+     0x00003EF8,  // .*****.*****...
+     0x00003E70,  // .*****..***....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5574,22 +5574,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5603,22 +5603,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5632,22 +5632,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5662,21 +5662,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5691,21 +5691,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5719,22 +5719,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000D80,  // ....**.**......
-     0x00000880,  // ....*...*......
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5753,17 +5753,17 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00007FF8,  // .************..
-     0x0000679C,  // .**..****..***.
-     0x0000030C,  // ......**....**.
-     0x00001F0C,  // ...*****....**.
-     0x00007FFC,  // .*************.
-     0x0000E3FC,  // ***...********.
-     0x0000C300,  // **....**.......
-     0x0000C78C,  // **...****...**.
-     0x0000FFFC,  // **************.
-     0x00007CF0,  // .*****..****...
+     0x00001E78,  // ..****..****...
+     0x00003FFC,  // .************..
+     0x000033CE,  // .**..****..***.
+     0x00000186,  // ......**....**.
+     0x00000F86,  // ...*****....**.
+     0x00003FFE,  // .*************.
+     0x000071FE,  // ***...********.
+     0x00006180,  // **....**.......
+     0x000063C6,  // **...****...**.
+     0x00007FFE,  // **************.
+     0x00003E78,  // .*****..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5782,22 +5782,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007030,  // .***......**...
-     0x00006030,  // .**.......**...
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00000FE0,  // ....*******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x00003818,  // .***......**...
+     0x00003018,  // .**.......**...
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x000007F0,  // ....*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 232
      15, 26,
@@ -5806,22 +5806,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5835,22 +5835,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5864,22 +5864,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000007C0,  // .....*****.....
-     0x00000EE0,  // ....***.***....
-     0x00001C70,  // ...***...***...
+     0x000001C0,  // ......***......
+     0x000003E0,  // .....*****.....
+     0x00000770,  // ....***.***....
+     0x00000E38,  // ...***...***...
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5894,21 +5894,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5922,22 +5922,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5951,22 +5951,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5980,22 +5980,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6010,21 +6010,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6037,23 +6037,23 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000FC70,  // ******...***...
-     0x00000FF0,  // ....********...
-     0x00001F80,  // ...******......
-     0x00007DC0,  // .*****.***.....
-     0x000070E0,  // .***....***....
-     0x00000FF0,  // ....********...
-     0x00003FF0,  // ..**********...
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x00007800,  // ****...........
+     0x00007E38,  // ******...***...
+     0x000007F8,  // ....********...
+     0x00000FC0,  // ...******......
+     0x00003EE0,  // .*****.***.....
+     0x00003870,  // .***....***....
+     0x000007F8,  // ....********...
+     0x00001FF8,  // ..**********...
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6068,21 +6068,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6096,22 +6096,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6125,22 +6125,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6154,22 +6154,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6184,21 +6184,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6213,21 +6213,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6244,18 +6244,18 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFF8,  // *************..
-     0x0000FFF8,  // *************..
+     0x00007FFC,  // *************..
+     0x00007FFC,  // *************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6274,20 +6274,20 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000000C,  // ............**.
-     0x00000FD8,  // ....******.**..
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x000070D8,  // .***....**.**..
-     0x00006198,  // .**....**..**..
-     0x00006318,  // .**...**...**..
-     0x00006618,  // .**..**....**..
-     0x00006C38,  // .**.**....***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00003FC0,  // ..********.....
-     0x00006000,  // .**............
-     0x0000C000,  // **.............
+     0x00000006,  // ............**.
+     0x000007EC,  // ....******.**..
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000386C,  // .***....**.**..
+     0x000030CC,  // .**....**..**..
+     0x0000318C,  // .**...**...**..
+     0x0000330C,  // .**..**....**..
+     0x0000361C,  // .**.**....***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x00001FE0,  // ..********.....
+     0x00003000,  // .**............
+     0x00006000,  // **.............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6299,22 +6299,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6328,22 +6328,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6357,22 +6357,22 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6387,21 +6387,21 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6415,27 +6415,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 254
      15, 26,
@@ -6444,27 +6444,27 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BE0,  // ...**.*****....
-     0x00001FF8,  // ...**********..
-     0x00001E38,  // ...****...***..
-     0x00001C1C,  // ...***.....***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00001C1C,  // ...***.....***.
-     0x00001E38,  // ...****...***..
-     0x00001FF8,  // ...**********..
-     0x00001BE0,  // ...**.*****....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00000FFC,  // ...**********..
+     0x00000DF0,  // ...**.*****....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 255
      15, 26,
@@ -6474,25 +6474,25 @@ cFont::tPixelData FontFix_iso8859_1[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   };
diff --git a/fontfix-iso8859-15.c b/fontfix-iso8859-15.c
index 24189544b..25a1efa93 100644
--- a/fontfix-iso8859-15.c
+++ b/fontfix-iso8859-15.c
@@ -35,22 +35,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -64,13 +64,13 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00000880,  // ....*...*......
-     0x00000880,  // ....*...*......
-     0x00000880,  // ....*...*......
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -92,25 +92,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -121,26 +121,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000F60,  // ....****.**....
-     0x00001FE0,  // ...********....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F80,  // ...******......
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00003FE0,  // ..*********....
-     0x000037C0,  // ..**.*****.....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000FC0,  // ...******......
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FF0,  // ..*********....
+     0x00001BE0,  // ..**.*****.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -152,21 +152,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000F00,  // ....****.......
-     0x00001980,  // ...**..**......
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00001980,  // ...**..**......
-     0x00000F00,  // ....****.......
-     0x00000070,  // .........***...
-     0x000003C0,  // ......****.....
-     0x00000E00,  // ....***........
-     0x000039E0,  // ..***..****....
-     0x00000330,  // ......**..**...
-     0x00000618,  // .....**....**..
-     0x00000618,  // .....**....**..
-     0x00000330,  // ......**..**...
-     0x000001E0,  // .......****....
+     0x00000780,  // ....****.......
+     0x00000CC0,  // ...**..**......
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
+     0x00000038,  // .........***...
+     0x000001E0,  // ......****.....
+     0x00000700,  // ....***........
+     0x00001CF0,  // ..***..****....
+     0x00000198,  // ......**..**...
+     0x0000030C,  // .....**....**..
+     0x0000030C,  // .....**....**..
+     0x00000198,  // ......**..**...
+     0x000000F0,  // .......****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -182,20 +182,20 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000E00,  // ....***........
-     0x00001F30,  // ...*****..**...
-     0x00001BF0,  // ...**.******...
-     0x000031E0,  // ..**...****....
-     0x000030C0,  // ..**....**.....
-     0x000031E0,  // ..**...****....
-     0x00003FF8,  // ..***********..
-     0x00001F38,  // ...*****..***..
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000700,  // ....***........
+     0x00000F98,  // ...*****..**...
+     0x00000DF8,  // ...**.******...
+     0x000018F0,  // ..**...****....
+     0x00001860,  // ..**....**.....
+     0x000018F0,  // ..**...****....
+     0x00001FFC,  // ..***********..
+     0x00000F9C,  // ...*****..***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -210,12 +210,12 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000800,  // ....*..........
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -238,26 +238,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000060,  // .........**....
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000E0,  // ........***....
-     0x00000060,  // .........**....
+     0x00000030,  // .........**....
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000070,  // ........***....
+     0x00000030,  // .........**....
      0x00000000,  // ...............
   },
   {             // 41
@@ -267,26 +267,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001C00,  // ...***.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
      0x00000000,  // ...............
   },
   {             // 42
@@ -296,17 +296,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003330,  // ..**..**..**...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
-     0x00000300,  // ......**.......
-     0x00000FC0,  // ....******.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001998,  // ..**..**..**...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -328,18 +328,18 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -367,12 +367,12 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000800,  // ....*..........
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -391,8 +391,8 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -425,9 +425,9 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -440,26 +440,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -470,22 +470,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00001860,  // ...**....**....
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000C30,  // ...**....**....
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -499,22 +499,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -528,22 +528,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
+     0x00001C00,  // ..***..........
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -557,22 +557,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000007C0,  // .....*****.....
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x00003FE0,  // ..*********....
-     0x00001FC0,  // ...*******.....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000003E0,  // .....*****.....
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001FF0,  // ..*********....
+     0x00000FE0,  // ...*******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -586,22 +586,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000007F0,  // .....*******...
-     0x000007F0,  // .....*******...
+     0x000000E0,  // .......***.....
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000003F8,  // .....*******...
+     0x000003F8,  // .....*******...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -615,22 +615,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF0,  // ...*********...
-     0x00001FF0,  // ...*********...
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BC0,  // ...**.****.....
-     0x00001FF0,  // ...*********...
-     0x00001C70,  // ...***...***...
-     0x00000038,  // ..........***..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00003038,  // ..**......***..
-     0x00003870,  // ..***....***...
-     0x00001FF0,  // ...*********...
-     0x00000FC0,  // ....******.....
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DE0,  // ...**.****.....
+     0x00000FF8,  // ...*********...
+     0x00000E38,  // ...***...***...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000181C,  // ..**......***..
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -644,22 +644,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F0,  // .......*****...
-     0x000007F0,  // .....*******...
-     0x00000F00,  // ....****.......
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
-     0x00003800,  // ..***..........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003830,  // ..***.....**...
-     0x00001C70,  // ...***...***...
-     0x00001FE0,  // ...********....
-     0x000007C0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x000003F8,  // .....*******...
+     0x00000780,  // ....****.......
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C18,  // ..***.....**...
+     0x00000E38,  // ...***...***...
+     0x00000FF0,  // ...********....
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -673,22 +673,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -702,22 +702,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -731,22 +731,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003C0,  // ......****.....
-     0x00000FF0,  // ....********...
-     0x00000C30,  // ....**....**...
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C78,  // ...***...****..
-     0x00000FD8,  // ....******.**..
-     0x00000798,  // .....****..**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001F80,  // ...******......
+     0x000001E0,  // ......****.....
+     0x000007F8,  // ....********...
+     0x00000618,  // ....**....**...
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E3C,  // ...***...****..
+     0x000007EC,  // ....******.**..
+     0x000003CC,  // .....****..**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -765,17 +765,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -794,20 +794,20 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001000,  // ...*...........
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000800,  // ...*...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -821,18 +821,18 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000001C,  // ...........***.
-     0x00000078,  // .........****..
-     0x000001E0,  // .......****....
-     0x00000780,  // .....****......
-     0x00001E00,  // ...****........
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001E00,  // ...****........
-     0x00000780,  // .....****......
-     0x000001E0,  // .......****....
-     0x00000078,  // .........****..
-     0x0000001C,  // ...........***.
+     0x0000000E,  // ...........***.
+     0x0000003C,  // .........****..
+     0x000000F0,  // .......****....
+     0x000003C0,  // .....****......
+     0x00000F00,  // ...****........
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000F00,  // ...****........
+     0x000003C0,  // .....****......
+     0x000000F0,  // .......****....
+     0x0000003C,  // .........****..
+     0x0000000E,  // ...........***.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -853,12 +853,12 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -879,18 +879,18 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007000,  // .***...........
-     0x00003C00,  // ..****.........
-     0x00000F00,  // ....****.......
-     0x000003C0,  // ......****.....
-     0x000000F0,  // ........****...
-     0x0000003C,  // ..........****.
-     0x0000003C,  // ..........****.
-     0x000000F0,  // ........****...
-     0x000003C0,  // ......****.....
-     0x00000F00,  // ....****.......
-     0x00003C00,  // ..****.........
-     0x00007000,  // .***...........
+     0x00003800,  // .***...........
+     0x00001E00,  // ..****.........
+     0x00000780,  // ....****.......
+     0x000001E0,  // ......****.....
+     0x00000078,  // ........****...
+     0x0000001E,  // ..........****.
+     0x0000001E,  // ..........****.
+     0x00000078,  // ........****...
+     0x000001E0,  // ......****.....
+     0x00000780,  // ....****.......
+     0x00001E00,  // ..****.........
+     0x00003800,  // .***...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -906,21 +906,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00001870,  // ...**....***...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000001E0,  // .......****....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x000000F0,  // .......****....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -934,24 +934,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x00003060,  // ..**.....**....
-     0x00003060,  // ..**.....**....
-     0x000031E0,  // ..**...****....
-     0x000033E0,  // ..**..*****....
-     0x00003760,  // ..**.***.**....
-     0x00003660,  // ..**.**..**....
-     0x00003660,  // ..**.**..**....
-     0x00003760,  // ..**.***.**....
-     0x000033F0,  // ..**..******...
-     0x000031F0,  // ..**...*****...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x00000380,  // .....***.......
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x000018F0,  // ..**...****....
+     0x000019F0,  // ..**..*****....
+     0x00001BB0,  // ..**.***.**....
+     0x00001B30,  // ..**.**..**....
+     0x00001B30,  // ..**.**..**....
+     0x00001BB0,  // ..**.***.**....
+     0x000019F8,  // ..**..******...
+     0x000018F8,  // ..**...*****...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -964,21 +964,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -993,21 +993,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF0,  // .***********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1022,21 +1022,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003000,  // ..**...........
-     0x00003818,  // ..***......**..
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1051,21 +1051,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1080,21 +1080,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1109,21 +1109,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x000018CC,  // ...**...**..**.
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C66,  // ...**...**..**.
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1138,21 +1138,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x000060FC,  // .**.....******.
-     0x000060FC,  // .**.....******.
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1167,21 +1167,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1196,21 +1196,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1225,21 +1225,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFC,  // ....**********.
-     0x00000FFC,  // ....**********.
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x000070E0,  // .***....***....
-     0x00003FC0,  // ..********.....
-     0x00001F80,  // ...******......
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1254,21 +1254,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCF8,  // ******..*****..
-     0x0000FCF8,  // ******..*****..
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00003F00,  // ..******.......
-     0x00003B80,  // ..***.***......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1283,21 +1283,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1312,21 +1312,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F03C,  // ****......****.
-     0x0000F03C,  // ****......****.
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006798,  // .**..****..**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1341,21 +1341,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1370,21 +1370,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1399,21 +1399,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF8,  // .************..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1428,24 +1428,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
-     0x0000070C,  // .....***....**.
-     0x00001FFC,  // ...***********.
-     0x00001CF0,  // ...***..****...
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000386,  // .....***....**.
+     0x00000FFE,  // ...***********.
+     0x00000E78,  // ...***..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1457,21 +1457,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FF80,  // *********......
-     0x0000FFE0,  // ***********....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003070,  // ..**.....***...
-     0x00003FE0,  // ..*********....
-     0x00003F80,  // ..*******......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1486,21 +1486,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1515,21 +1515,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1544,21 +1544,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1573,21 +1573,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1602,21 +1602,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006FD8,  // .**.******.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00003CF0,  // ..****..****...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001E78,  // ..****..****...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1631,21 +1631,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1660,21 +1660,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1689,21 +1689,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1717,26 +1717,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
      0x00000000,  // ...............
   },
   {             // 92
@@ -1745,26 +1745,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1775,26 +1775,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
   },
   {             // 94
@@ -1804,14 +1804,14 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1851,8 +1851,8 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFFE,  // ***************
-     0x0000FFFE,  // ***************
+     0x00007FFF,  // ***************
+     0x00007FFF,  // ***************
      0x00000000,  // ...............
   },
   {             // 96
@@ -1863,12 +1863,12 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x00000040,  // .........*.....
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000020,  // .........*.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1896,17 +1896,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1920,22 +1920,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BE0,  // ...**.*****....
-     0x00001FF8,  // ...**********..
-     0x00001E38,  // ...****...***..
-     0x00001C1C,  // ...***.....***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00001C1C,  // ...***.....***.
-     0x00001E38,  // ...****...***..
-     0x00007FF8,  // .************..
-     0x00007BE0,  // .****.*****....
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00003FFC,  // .************..
+     0x00003DF0,  // .****.*****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1954,17 +1954,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1978,22 +1978,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000F0,  // ........****...
-     0x000000F0,  // ........****...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FFC,  // ..************.
-     0x00000FBC,  // ....*****.****.
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2012,17 +2012,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2036,22 +2036,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F8,  // .......******..
-     0x000003F8,  // ......*******..
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x000000FC,  // .......******..
+     0x000001FC,  // ......*******..
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2070,22 +2070,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001FC0,  // ...*******.....
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
   },
   {             // 104
      15, 26,
@@ -2094,22 +2094,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000F000,  // ****...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2123,22 +2123,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2152,27 +2152,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FC0,  // ..********.....
-     0x00003FC0,  // ..********.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00003F80,  // ..*******......
-     0x00003F00,  // ..******.......
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
   },
   {             // 107
      15, 26,
@@ -2181,22 +2181,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x000018F0,  // ...**...****...
-     0x000018F0,  // ...**...****...
-     0x000019C0,  // ...**..***.....
-     0x00001B80,  // ...**.***......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00001B80,  // ...**.***......
-     0x000019C0,  // ...**..***.....
-     0x000018E0,  // ...**...***....
-     0x000078FC,  // .****...******.
-     0x000078FC,  // .****...******.
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C78,  // ...**...****...
+     0x00000C78,  // ...**...****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003C7E,  // .****...******.
+     0x00003C7E,  // .****...******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2210,22 +2210,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2233,7 +2233,7 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
   },
   {             // 109
-     15, 26,
+     16, 26,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2244,17 +2244,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001DEF0,  // ***.****.****...
-     0x0001FFF8,  // **************..
-     0x00007398,  // ..***..***..**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001F3DE,  // *****..****.****
-     0x0001F3DE,  // *****..****.****
+     0x0000EF78,  // ***.****.****...
+     0x0000FFFC,  // **************..
+     0x000039CC,  // ..***..***..**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000F9EF,  // *****..****.****
+     0x0000F9EF,  // *****..****.****
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2273,17 +2273,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2302,17 +2302,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2331,22 +2331,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7C0,  // ****.*****.....
-     0x0000FFF0,  // ************...
-     0x00003C70,  // ..****...***...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00003C70,  // ..****...***...
-     0x00003FF0,  // ..**********...
-     0x000037C0,  // ..**.*****.....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x0000FE00,  // *******........
-     0x0000FE00,  // *******........
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
   },
   {             // 113
      15, 26,
@@ -2360,22 +2360,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x000001FC,  // .......*******.
-     0x000001FC,  // .......*******.
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000000FE,  // .......*******.
+     0x000000FE,  // .......*******.
   },
   {             // 114
      15, 26,
@@ -2389,17 +2389,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00003FF8,  // ..***********..
-     0x00000F18,  // ....****...**..
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2418,17 +2418,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2443,21 +2443,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001C70,  // ...***...***...
-     0x00000FF0,  // ....********...
-     0x000007C0,  // .....*****.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2476,17 +2476,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2505,17 +2505,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2534,17 +2534,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00003330,  // ..**..**..**...
-     0x000037B0,  // ..**.****.**...
-     0x000037B0,  // ..**.****.**...
-     0x00003CF0,  // ..****..****...
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00001998,  // ..**..**..**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001E78,  // ..****..****...
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2563,17 +2563,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2592,22 +2592,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 122
      15, 26,
@@ -2621,17 +2621,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2645,26 +2645,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x000000E0,  // ........***....
+     0x00000070,  // ........***....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000070,  // ........***....
      0x00000000,  // ...............
   },
   {             // 124
@@ -2674,24 +2674,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2703,26 +2703,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000380,  // ......***......
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00001C00,  // ...***.........
+     0x00000E00,  // ...***.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
   },
   {             // 126
@@ -2739,10 +2739,10 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001E18,  // ...****....**..
-     0x00003F38,  // ..******..***..
-     0x000073F0,  // .***..******...
-     0x000061E0,  // .**....****....
+     0x00000F0C,  // ...****....**..
+     0x00001F9C,  // ..******..***..
+     0x000039F8,  // .***..******...
+     0x000030F0,  // .**....****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3752,22 +3752,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
      0x00000000,  // ...............
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000F00,  // ....****.......
-     0x00000600,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000300,  // .....**........
   },
   {             // 162
      15, 26,
@@ -3776,22 +3776,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000F60,  // ....****.**....
-     0x00001FE0,  // ...********....
-     0x000038E0,  // ..***...***....
-     0x00003060,  // ..**.....**....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003860,  // ..***....**....
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3806,21 +3806,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00000FE0,  // ....*******....
-     0x00001C60,  // ...***...**....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x00003818,  // ..***......**..
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x000003E0,  // .....*****.....
+     0x000007F0,  // ....*******....
+     0x00000E30,  // ...***...**....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00001C0C,  // ..***......**..
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3829,32 +3829,32 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   },
   {             // 164
      17, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // .......******.**.
-     0x00001FFC,  // .....***********.
-     0x0000381C,  // ....***......***.
-     0x0000300C,  // ....**........**.
-     0x0003FFCC,  // ************..**.
-     0x0003FFC0,  // ************.....
-     0x00006000,  // ...**............
-     0x00006000,  // ...**............
-     0x0003FFC0,  // ************.....
-     0x0003FFC0,  // ************.....
-     0x00007000,  // ...***...........
-     0x0000300C,  // ....**........**.
-     0x0000381C,  // ....***......***.
-     0x00001FF8,  // .....**********..
-     0x000007E0,  // .......******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000003F6,  // .......******.**.
+     0x00000FFE,  // .....***********.
+     0x00001C0E,  // ....***......***.
+     0x00001806,  // ....**........**.
+     0x0001FFE6,  // ************..**.
+     0x0001FFE0,  // ************.....
+     0x00003000,  // ...**............
+     0x00003000,  // ...**............
+     0x0001FFE0,  // ************.....
+     0x0001FFE0,  // ************.....
+     0x00003800,  // ...***...........
+     0x00001806,  // ....**........**.
+     0x00001C0E,  // ....***......***.
+     0x00000FFC,  // .....**********..
+     0x000003F0,  // .......******....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 165
      15, 26,
@@ -3864,21 +3864,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3890,24 +3890,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003C00,  // ..****.........
-     0x00001F80,  // ...******......
-     0x000003F0,  // ......******...
-     0x00000078,  // .........****..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001E00,  // ..****.........
+     0x00000FC0,  // ...******......
+     0x000001F8,  // ......******...
+     0x0000003C,  // .........****..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3921,24 +3921,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007F0,  // .....*******...
-     0x00000FF0,  // ....********...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001C00,  // ...***.........
-     0x00003F00,  // ..******.......
-     0x000067C0,  // .**..*****.....
-     0x000061F0,  // .**....*****...
-     0x00007878,  // .****....****..
-     0x00003E18,  // ..*****....**..
-     0x00000F98,  // ....*****..**..
-     0x000003F8,  // ......*******..
-     0x000000F0,  // ........****...
-     0x00000060,  // .........**....
-     0x00003060,  // ..**.....**....
-     0x000030E0,  // ..**....***....
-     0x00003FC0,  // ..********.....
-     0x00003F80,  // ..*******......
+     0x000003F8,  // .....*******...
+     0x000007F8,  // ....********...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000E00,  // ...***.........
+     0x00001F80,  // ..******.......
+     0x000033E0,  // .**..*****.....
+     0x000030F8,  // .**....*****...
+     0x00003C3C,  // .****....****..
+     0x00001F0C,  // ..*****....**..
+     0x000007CC,  // ....*****..**..
+     0x000001FC,  // ......*******..
+     0x00000078,  // ........****...
+     0x00000030,  // .........**....
+     0x00001830,  // ..**.....**....
+     0x00001870,  // ..**....***....
+     0x00001FE0,  // ..********.....
+     0x00001FC0,  // ..*******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3951,21 +3951,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3980,20 +3980,20 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00006798,  // .**..****..**..
-     0x00006FD8,  // .**.******.**..
-     0x0000DCCC,  // **.***..**..**.
-     0x0000D80C,  // **.**.......**.
-     0x0000D80C,  // **.**.......**.
-     0x0000DCCC,  // **.***..**..**.
-     0x00006FD8,  // .**.******.**..
-     0x00006798,  // .**..****..**..
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006E66,  // **.***..**..**.
+     0x00006C06,  // **.**.......**.
+     0x00006C06,  // **.**.......**.
+     0x00006E66,  // **.***..**..**.
+     0x000037EC,  // .**.******.**..
+     0x000033CC,  // .**..****..**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4009,17 +4009,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x000000C0,  // ........**.....
-     0x00000FC0,  // ....******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000019E0,  // ...**..****....
-     0x00000F60,  // ....****.**....
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000060,  // ........**.....
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000CF0,  // ...**..****....
+     0x000007B0,  // ....****.**....
      0x00000000,  // ...............
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4043,15 +4043,15 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000071C,  // .....***...***.
-     0x00000E38,  // ....***...***..
-     0x00001C70,  // ...***...***...
-     0x000038E0,  // ..***...***....
-     0x000071C0,  // .***...***.....
-     0x000038E0,  // ..***...***....
-     0x00001C70,  // ...***...***...
-     0x00000E38,  // ....***...***..
-     0x0000071C,  // .....***...***.
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4072,12 +4072,12 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4103,8 +4103,8 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4125,20 +4125,20 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00006F98,  // .**.*****..**..
-     0x00006FD8,  // .**.******.**..
-     0x0000CCCC,  // **..**..**..**.
-     0x0000CCCC,  // **..**..**..**.
-     0x0000CF8C,  // **..*****...**.
-     0x0000CD8C,  // **..**.**...**.
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000037CC,  // .**.*****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006666,  // **..**..**..**.
+     0x00006666,  // **..**..**..**.
+     0x000067C6,  // **..*****...**.
+     0x000066C6,  // **..**.**...**.
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4154,8 +4154,8 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4182,13 +4182,13 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4213,20 +4213,20 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4240,15 +4240,15 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000C60,  // ....**...**....
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000630,  // ....**...**....
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4269,15 +4269,15 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000000C0,  // ........**.....
-     0x000003C0,  // ......****.....
-     0x00000060,  // .........**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000001E0,  // ......****.....
+     0x00000030,  // .........**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4295,25 +4295,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4332,22 +4332,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00003FFC,  // ..************.
-     0x00003FBC,  // ..*******.****.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FFE,  // ..************.
+     0x00001FDE,  // ..*******.****.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
   },
   {             // 182
      15, 26,
@@ -4356,24 +4356,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FF8,  // ....*********..
-     0x00003FF8,  // ..***********..
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00007360,  // .***..**.**....
-     0x00003F60,  // ..******.**....
-     0x00000F60,  // ....****.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00000360,  // ......**.**....
-     0x00001F78,  // ...*****.****..
-     0x00001F78,  // ...*****.****..
+     0x000007FC,  // ....*********..
+     0x00001FFC,  // ..***********..
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x00001FB0,  // ..******.**....
+     0x000007B0,  // ....****.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x00000FBC,  // ...*****.****..
+     0x00000FBC,  // ...*****.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4392,9 +4392,9 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4415,21 +4415,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4443,15 +4443,15 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4473,17 +4473,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4507,15 +4507,15 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000071C0,  // .***...***.....
-     0x000038E0,  // ..***...***....
-     0x00001C70,  // ...***...***...
-     0x00000E38,  // ....***...***..
-     0x0000071C,  // .....***...***.
-     0x00000E38,  // ....***...***..
-     0x00001C70,  // ...***...***...
-     0x000038E0,  // ..***...***....
-     0x000071C0,  // .***...***.....
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4531,21 +4531,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FFE,  // ...************
-     0x00007FFE,  // .**************
-     0x00006386,  // .**...***....**
-     0x0000C186,  // **.....**....**
-     0x0000C180,  // **.....**......
-     0x0000C198,  // **.....**..**..
-     0x0000C1F8,  // **.....******..
-     0x0000C1F8,  // **.....******..
-     0x0000C198,  // **.....**..**..
-     0x0000C180,  // **.....**......
-     0x0000C180,  // **.....**......
-     0x0000C186,  // **.....**....**
-     0x00006386,  // .**...***....**
-     0x00007FFE,  // .**************
-     0x00001FFE,  // ...************
+     0x00000FFF,  // ...************
+     0x00003FFF,  // .**************
+     0x000031C3,  // .**...***....**
+     0x000060C3,  // **.....**....**
+     0x000060C0,  // **.....**......
+     0x000060CC,  // **.....**..**..
+     0x000060FC,  // **.....******..
+     0x000060FC,  // **.....******..
+     0x000060CC,  // **.....**..**..
+     0x000060C0,  // **.....**......
+     0x000060C0,  // **.....**......
+     0x000060C3,  // **.....**....**
+     0x000031C3,  // .**...***....**
+     0x00003FFF,  // .**************
+     0x00000FFF,  // ...************
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4564,17 +4564,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF8,  // ..****..*****..
-     0x00007FFC,  // .*************.
-     0x0000E78E,  // ***..****...***
-     0x0000C306,  // **....**.....**
-     0x0000C306,  // **....**.....**
-     0x0000C3FE,  // **....*********
-     0x0000C3FE,  // **....*********
-     0x0000C300,  // **....**.......
-     0x0000E786,  // ***..****....**
-     0x00007FFE,  // .**************
-     0x00003CF8,  // ..****..*****..
+     0x00001E7C,  // ..****..*****..
+     0x00003FFE,  // .*************.
+     0x000073C7,  // ***..****...***
+     0x00006183,  // **....**.....**
+     0x00006183,  // **....**.....**
+     0x000061FF,  // **....*********
+     0x000061FF,  // **....*********
+     0x00006180,  // **....**.......
+     0x000073C3,  // ***..****....**
+     0x00003FFF,  // .**************
+     0x00001E7C,  // ..****..*****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4587,23 +4587,23 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4622,46 +4622,46 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00001E00,  // ...****........
-     0x00003800,  // ..***..........
-     0x00003000,  // ..**...........
-     0x00003060,  // ..**.....**....
-     0x00003060,  // ..**.....**....
-     0x00003860,  // ..***....**....
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000F00,  // ...****........
+     0x00001C00,  // ..***..........
+     0x00001800,  // ..**...........
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
   },
   {             // 192
      15, 26,
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4671,26 +4671,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 193
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4699,27 +4699,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   },
   {             // 194
      15, 26,
-     0x00000600,  // .....**........
-     0x00000F00,  // ....****.......
-     0x00001F80,  // ...******......
-     0x000039C0,  // ..***..***.....
-     0x000070E0,  // .***....***....
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000FC0,  // ...******......
+     0x00001CE0,  // ..***..***.....
+     0x00003870,  // .***....***....
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4730,25 +4730,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4759,25 +4759,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4787,26 +4787,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 197
      15, 26,
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000D80,  // ....**.**......
-     0x00000880,  // ....*...*......
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4821,21 +4821,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFE,  // ....***********
-     0x00000FFE,  // ....***********
-     0x00000386,  // ......***....**
-     0x00000786,  // .....****....**
-     0x00000780,  // .....****......
-     0x00000D98,  // ....**.**..**..
-     0x000009F8,  // ....*..******..
-     0x000019F8,  // ...**..******..
-     0x00001F98,  // ...******..**..
-     0x00003F80,  // ..*******......
-     0x00003180,  // ..**...**......
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x0000F7FE,  // ****.**********
-     0x0000F7FE,  // ****.**********
+     0x000007FF,  // ....***********
+     0x000007FF,  // ....***********
+     0x000001C3,  // ......***....**
+     0x000003C3,  // .....****....**
+     0x000003C0,  // .....****......
+     0x000006CC,  // ....**.**..**..
+     0x000004FC,  // ....*..******..
+     0x00000CFC,  // ...**..******..
+     0x00000FCC,  // ...******..**..
+     0x00001FC0,  // ..*******......
+     0x000018C0,  // ..**...**......
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x00007BFF,  // ****.**********
+     0x00007BFF,  // ****.**********
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4850,50 +4850,50 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003008,  // ..**........*..
-     0x00003818,  // ..***......**..
-     0x00001FF0,  // ...*********...
-     0x000007E0,  // .....******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001804,  // ..**........*..
+     0x00001C0C,  // ..***......**..
+     0x00000FF8,  // ...*********...
+     0x000003F0,  // .....******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 200
      15, 26,
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4903,26 +4903,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 201
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4931,27 +4931,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   },
   {             // 202
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4962,25 +4962,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4990,26 +4990,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 204
      15, 26,
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5019,26 +5019,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 205
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5047,27 +5047,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   },
   {             // 206
      15, 26,
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5078,25 +5078,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5111,21 +5111,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000FE0C,  // *******.....**.
-     0x0000FE0C,  // *******.....**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00007F06,  // *******.....**.
+     0x00007F06,  // *******.....**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5136,25 +5136,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000730,  // .....***..**...
-     0x00000FE0,  // ....*******....
-     0x000019C0,  // ...**..***.....
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5164,26 +5164,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 210
      15, 26,
      0x00000000,  // ...............
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
-     0x000001C0,  // .......***.....
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5193,26 +5193,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 211
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5221,27 +5221,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   },
   {             // 212
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5252,25 +5252,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000730,  // .....***..**...
-     0x00000FE0,  // ....*******....
-     0x000019C0,  // ...**..***.....
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5281,25 +5281,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5316,18 +5316,18 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00002010,  // ..*........*...
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00002010,  // ..*........*...
+     0x00001008,  // ..*........*...
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00001008,  // ..*........*...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5341,24 +5341,24 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000000C,  // ............**.
-     0x00000018,  // ...........**..
-     0x000007F0,  // .....*******...
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003078,  // ..**.....****..
-     0x000070DC,  // .***....**.***.
-     0x0000608C,  // .**.....*...**.
-     0x0000618C,  // .**....**...**.
-     0x0000630C,  // .**...**....**.
-     0x0000620C,  // .**...*.....**.
-     0x0000660C,  // .**..**.....**.
-     0x0000741C,  // .***.*.....***.
-     0x00003C18,  // ..****.....**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000037C0,  // ..**.*****.....
-     0x00006000,  // .**............
+     0x00000006,  // ............**.
+     0x0000000C,  // ...........**..
+     0x000003F8,  // .....*******...
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x00003046,  // .**.....*...**.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x00003A0E,  // .***.*.....***.
+     0x00001E0C,  // ..****.....**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x00001BE0,  // ..**.*****.....
+     0x00003000,  // .**............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5367,26 +5367,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 217
      15, 26,
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5396,26 +5396,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 218
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5424,27 +5424,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   },
   {             // 219
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5455,25 +5455,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5483,26 +5483,26 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 221
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5517,21 +5517,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007E00,  // .******........
-     0x00007E00,  // .******........
-     0x00001800,  // ...**..........
-     0x00001FE0,  // ...********....
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00007E00,  // .******........
-     0x00007E00,  // .******........
+     0x00003F00,  // .******........
+     0x00003F00,  // .******........
+     0x00000C00,  // ...**..........
+     0x00000FF0,  // ...********....
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00003F00,  // .******........
+     0x00003F00,  // .******........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5545,22 +5545,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x000018E0,  // ...**...***....
-     0x00001BC0,  // ...**.****.....
-     0x00001BE0,  // ...**.*****....
-     0x00001870,  // ...**....***...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000019B8,  // ...**..**.***..
-     0x00007DF0,  // .*****.*****...
-     0x00007CE0,  // .*****..***....
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C70,  // ...**...***....
+     0x00000DE0,  // ...**.****.....
+     0x00000DF0,  // ...**.*****....
+     0x00000C38,  // ...**....***...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000CDC,  // ...**..**.***..
+     0x00003EF8,  // .*****.*****...
+     0x00003E70,  // .*****..***....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5574,22 +5574,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5603,22 +5603,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5632,22 +5632,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5662,21 +5662,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5691,21 +5691,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5719,22 +5719,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000D80,  // ....**.**......
-     0x00000880,  // ....*...*......
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5753,17 +5753,17 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00007FF8,  // .************..
-     0x0000679C,  // .**..****..***.
-     0x0000030C,  // ......**....**.
-     0x00001F0C,  // ...*****....**.
-     0x00007FFC,  // .*************.
-     0x0000E3FC,  // ***...********.
-     0x0000C300,  // **....**.......
-     0x0000C78C,  // **...****...**.
-     0x0000FFFC,  // **************.
-     0x00007CF0,  // .*****..****...
+     0x00001E78,  // ..****..****...
+     0x00003FFC,  // .************..
+     0x000033CE,  // .**..****..***.
+     0x00000186,  // ......**....**.
+     0x00000F86,  // ...*****....**.
+     0x00003FFE,  // .*************.
+     0x000071FE,  // ***...********.
+     0x00006180,  // **....**.......
+     0x000063C6,  // **...****...**.
+     0x00007FFE,  // **************.
+     0x00003E78,  // .*****..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5782,22 +5782,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007030,  // .***......**...
-     0x00006030,  // .**.......**...
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00000FE0,  // ....*******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x00003818,  // .***......**...
+     0x00003018,  // .**.......**...
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x000007F0,  // ....*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 232
      15, 26,
@@ -5806,22 +5806,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5835,22 +5835,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5864,22 +5864,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000007C0,  // .....*****.....
-     0x00000EE0,  // ....***.***....
-     0x00001C70,  // ...***...***...
+     0x000001C0,  // ......***......
+     0x000003E0,  // .....*****.....
+     0x00000770,  // ....***.***....
+     0x00000E38,  // ...***...***...
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5894,21 +5894,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5922,22 +5922,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5951,22 +5951,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5980,22 +5980,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6010,21 +6010,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6037,23 +6037,23 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000FC70,  // ******...***...
-     0x00000FF0,  // ....********...
-     0x00001F80,  // ...******......
-     0x00007DC0,  // .*****.***.....
-     0x000070E0,  // .***....***....
-     0x00000FF0,  // ....********...
-     0x00003FF0,  // ..**********...
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x00007800,  // ****...........
+     0x00007E38,  // ******...***...
+     0x000007F8,  // ....********...
+     0x00000FC0,  // ...******......
+     0x00003EE0,  // .*****.***.....
+     0x00003870,  // .***....***....
+     0x000007F8,  // ....********...
+     0x00001FF8,  // ..**********...
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6068,21 +6068,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6096,22 +6096,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000380,  // ......***......
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6125,22 +6125,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6154,22 +6154,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6184,21 +6184,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000E60,  // ....***..**....
-     0x00001FC0,  // ...*******.....
-     0x00003380,  // ..**..***......
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6213,21 +6213,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6244,18 +6244,18 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFF8,  // *************..
-     0x0000FFF8,  // *************..
+     0x00007FFC,  // *************..
+     0x00007FFC,  // *************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6274,20 +6274,20 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000000C,  // ............**.
-     0x00000FD8,  // ....******.**..
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x000070D8,  // .***....**.**..
-     0x00006198,  // .**....**..**..
-     0x00006318,  // .**...**...**..
-     0x00006618,  // .**..**....**..
-     0x00006C38,  // .**.**....***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00003FC0,  // ..********.....
-     0x00006000,  // .**............
-     0x0000C000,  // **.............
+     0x00000006,  // ............**.
+     0x000007EC,  // ....******.**..
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000386C,  // .***....**.**..
+     0x000030CC,  // .**....**..**..
+     0x0000318C,  // .**...**...**..
+     0x0000330C,  // .**..**....**..
+     0x0000361C,  // .**.**....***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x00001FE0,  // ..********.....
+     0x00003000,  // .**............
+     0x00006000,  // **.............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6299,22 +6299,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6328,22 +6328,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6357,22 +6357,22 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6387,21 +6387,21 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6415,27 +6415,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 254
      15, 26,
@@ -6444,27 +6444,27 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BE0,  // ...**.*****....
-     0x00001FF8,  // ...**********..
-     0x00001E38,  // ...****...***..
-     0x00001C1C,  // ...***.....***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00001C1C,  // ...***.....***.
-     0x00001E38,  // ...****...***..
-     0x00001FF8,  // ...**********..
-     0x00001BE0,  // ...**.*****....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00000FFC,  // ...**********..
+     0x00000DF0,  // ...**.*****....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 255
      15, 26,
@@ -6474,25 +6474,25 @@ cFont::tPixelData FontFix_iso8859_15[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   };
diff --git a/fontfix-iso8859-2.c b/fontfix-iso8859-2.c
index 1e743bdb9..e27bbdff5 100644
--- a/fontfix-iso8859-2.c
+++ b/fontfix-iso8859-2.c
@@ -35,22 +35,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -64,13 +64,13 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00001DC0,  // ...***.***.....
-     0x00000880,  // ....*...*......
-     0x00000880,  // ....*...*......
-     0x00000880,  // ....*...*......
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -92,25 +92,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -121,26 +121,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000F60,  // ....****.**....
-     0x00001FE0,  // ...********....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F80,  // ...******......
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00003FE0,  // ..*********....
-     0x000037C0,  // ..**.*****.....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000FC0,  // ...******......
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FF0,  // ..*********....
+     0x00001BE0,  // ..**.*****.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -152,21 +152,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000F00,  // ....****.......
-     0x00001980,  // ...**..**......
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00001980,  // ...**..**......
-     0x00000F00,  // ....****.......
-     0x00000070,  // .........***...
-     0x000003C0,  // ......****.....
-     0x00000E00,  // ....***........
-     0x000039E0,  // ..***..****....
-     0x00000330,  // ......**..**...
-     0x00000618,  // .....**....**..
-     0x00000618,  // .....**....**..
-     0x00000330,  // ......**..**...
-     0x000001E0,  // .......****....
+     0x00000780,  // ....****.......
+     0x00000CC0,  // ...**..**......
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
+     0x00000038,  // .........***...
+     0x000001E0,  // ......****.....
+     0x00000700,  // ....***........
+     0x00001CF0,  // ..***..****....
+     0x00000198,  // ......**..**...
+     0x0000030C,  // .....**....**..
+     0x0000030C,  // .....**....**..
+     0x00000198,  // ......**..**...
+     0x000000F0,  // .......****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -182,20 +182,20 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000E00,  // ....***........
-     0x00001F30,  // ...*****..**...
-     0x00001BF0,  // ...**.******...
-     0x000031E0,  // ..**...****....
-     0x000030C0,  // ..**....**.....
-     0x000031E0,  // ..**...****....
-     0x00003FF8,  // ..***********..
-     0x00001F38,  // ...*****..***..
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000700,  // ....***........
+     0x00000F98,  // ...*****..**...
+     0x00000DF8,  // ...**.******...
+     0x000018F0,  // ..**...****....
+     0x00001860,  // ..**....**.....
+     0x000018F0,  // ..**...****....
+     0x00001FFC,  // ..***********..
+     0x00000F9C,  // ...*****..***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -210,13 +210,13 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000200,  // ......*........
-     0x00000200,  // ......*........
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000100,  // ......*........
+     0x00000100,  // ......*........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -238,26 +238,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000060,  // .........**....
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000E0,  // ........***....
-     0x00000060,  // .........**....
+     0x00000030,  // .........**....
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000070,  // ........***....
+     0x00000030,  // .........**....
      0x00000000,  // ...............
   },
   {             // 41
@@ -267,26 +267,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001C00,  // ...***.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
      0x00000000,  // ...............
   },
   {             // 42
@@ -296,17 +296,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003330,  // ..**..**..**...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
-     0x00000300,  // ......**.......
-     0x00000FC0,  // ....******.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001998,  // ..**..**..**...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -328,18 +328,18 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -367,12 +367,12 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000800,  // ....*..........
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -391,8 +391,8 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -425,9 +425,9 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -440,26 +440,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -470,22 +470,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00001860,  // ...**....**....
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000C30,  // ...**....**....
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -499,22 +499,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -528,22 +528,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
+     0x00001C00,  // ..***..........
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -557,22 +557,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000007C0,  // .....*****.....
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x00003FE0,  // ..*********....
-     0x00001FC0,  // ...*******.....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000003E0,  // .....*****.....
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001FF0,  // ..*********....
+     0x00000FE0,  // ...*******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -586,22 +586,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000007F0,  // .....*******...
-     0x000007F0,  // .....*******...
+     0x000000E0,  // .......***.....
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000003F8,  // .....*******...
+     0x000003F8,  // .....*******...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -615,22 +615,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF0,  // ...*********...
-     0x00001FF0,  // ...*********...
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BC0,  // ...**.****.....
-     0x00001FF0,  // ...*********...
-     0x00001C70,  // ...***...***...
-     0x00000038,  // ..........***..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00003038,  // ..**......***..
-     0x00003870,  // ..***....***...
-     0x00001FF0,  // ...*********...
-     0x00000FC0,  // ....******.....
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DE0,  // ...**.****.....
+     0x00000FF8,  // ...*********...
+     0x00000E38,  // ...***...***...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000181C,  // ..**......***..
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -644,22 +644,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F0,  // .......*****...
-     0x000007F0,  // .....*******...
-     0x00000F00,  // ....****.......
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
-     0x00003800,  // ..***..........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003830,  // ..***.....**...
-     0x00001C70,  // ...***...***...
-     0x00001FE0,  // ...********....
-     0x000007C0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x000003F8,  // .....*******...
+     0x00000780,  // ....****.......
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C18,  // ..***.....**...
+     0x00000E38,  // ...***...***...
+     0x00000FF0,  // ...********....
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -673,22 +673,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -702,22 +702,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -731,22 +731,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003C0,  // ......****.....
-     0x00000FF0,  // ....********...
-     0x00000C30,  // ....**....**...
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C78,  // ...***...****..
-     0x00000FD8,  // ....******.**..
-     0x00000798,  // .....****..**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001F80,  // ...******......
+     0x000001E0,  // ......****.....
+     0x000007F8,  // ....********...
+     0x00000618,  // ....**....**...
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E3C,  // ...***...****..
+     0x000007EC,  // ....******.**..
+     0x000003CC,  // .....****..**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -765,17 +765,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -794,20 +794,20 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001000,  // ...*...........
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000800,  // ...*...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -821,18 +821,18 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000001C,  // ...........***.
-     0x00000078,  // .........****..
-     0x000001E0,  // .......****....
-     0x00000780,  // .....****......
-     0x00001E00,  // ...****........
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001E00,  // ...****........
-     0x00000780,  // .....****......
-     0x000001E0,  // .......****....
-     0x00000078,  // .........****..
-     0x0000001C,  // ...........***.
+     0x0000000E,  // ...........***.
+     0x0000003C,  // .........****..
+     0x000000F0,  // .......****....
+     0x000003C0,  // .....****......
+     0x00000F00,  // ...****........
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000F00,  // ...****........
+     0x000003C0,  // .....****......
+     0x000000F0,  // .......****....
+     0x0000003C,  // .........****..
+     0x0000000E,  // ...........***.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -853,12 +853,12 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -879,18 +879,18 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007000,  // .***...........
-     0x00003C00,  // ..****.........
-     0x00000F00,  // ....****.......
-     0x000003C0,  // ......****.....
-     0x000000F0,  // ........****...
-     0x0000003C,  // ..........****.
-     0x0000003C,  // ..........****.
-     0x000000F0,  // ........****...
-     0x000003C0,  // ......****.....
-     0x00000F00,  // ....****.......
-     0x00003C00,  // ..****.........
-     0x00007000,  // .***...........
+     0x00003800,  // .***...........
+     0x00001E00,  // ..****.........
+     0x00000780,  // ....****.......
+     0x000001E0,  // ......****.....
+     0x00000078,  // ........****...
+     0x0000001E,  // ..........****.
+     0x0000001E,  // ..........****.
+     0x00000078,  // ........****...
+     0x000001E0,  // ......****.....
+     0x00000780,  // ....****.......
+     0x00001E00,  // ..****.........
+     0x00003800,  // .***...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -906,21 +906,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00001870,  // ...**....***...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000001E0,  // .......****....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x000000F0,  // .......****....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -934,24 +934,24 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x00003060,  // ..**.....**....
-     0x00003060,  // ..**.....**....
-     0x000031E0,  // ..**...****....
-     0x000033E0,  // ..**..*****....
-     0x00003760,  // ..**.***.**....
-     0x00003660,  // ..**.**..**....
-     0x00003660,  // ..**.**..**....
-     0x00003760,  // ..**.***.**....
-     0x000033F0,  // ..**..******...
-     0x000031F0,  // ..**...*****...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x00000380,  // .....***.......
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x000018F0,  // ..**...****....
+     0x000019F0,  // ..**..*****....
+     0x00001BB0,  // ..**.***.**....
+     0x00001B30,  // ..**.**..**....
+     0x00001B30,  // ..**.**..**....
+     0x00001BB0,  // ..**.***.**....
+     0x000019F8,  // ..**..******...
+     0x000018F8,  // ..**...*****...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -964,21 +964,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -993,21 +993,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF0,  // .***********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1022,21 +1022,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003000,  // ..**...........
-     0x00003818,  // ..***......**..
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1051,21 +1051,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1080,21 +1080,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1109,21 +1109,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x000018CC,  // ...**...**..**.
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C66,  // ...**...**..**.
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1138,21 +1138,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x000060FC,  // .**.....******.
-     0x000060FC,  // .**.....******.
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1167,21 +1167,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1196,21 +1196,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1225,21 +1225,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFC,  // ....**********.
-     0x00000FFC,  // ....**********.
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x000070E0,  // .***....***....
-     0x00003FC0,  // ..********.....
-     0x00001F80,  // ...******......
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1254,21 +1254,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCF8,  // ******..*****..
-     0x0000FCF8,  // ******..*****..
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00003F00,  // ..******.......
-     0x00003B80,  // ..***.***......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1283,21 +1283,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1312,21 +1312,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F03C,  // ****......****.
-     0x0000F03C,  // ****......****.
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006798,  // .**..****..**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1341,21 +1341,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1370,21 +1370,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1399,21 +1399,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF8,  // .************..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1428,24 +1428,24 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
-     0x0000070C,  // .....***....**.
-     0x00001FFC,  // ...***********.
-     0x00001CF0,  // ...***..****...
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000386,  // .....***....**.
+     0x00000FFE,  // ...***********.
+     0x00000E78,  // ...***..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1457,21 +1457,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FF80,  // *********......
-     0x0000FFE0,  // ***********....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003070,  // ..**.....***...
-     0x00003FE0,  // ..*********....
-     0x00003F80,  // ..*******......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1486,21 +1486,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1515,21 +1515,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1544,21 +1544,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1573,21 +1573,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1602,21 +1602,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006FD8,  // .**.******.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00003CF0,  // ..****..****...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001E78,  // ..****..****...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1631,21 +1631,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1660,21 +1660,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1689,21 +1689,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1717,26 +1717,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
      0x00000000,  // ...............
   },
   {             // 92
@@ -1745,26 +1745,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1775,26 +1775,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
   },
   {             // 94
@@ -1804,14 +1804,14 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1851,8 +1851,8 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFFE,  // ***************
-     0x0000FFFE,  // ***************
+     0x00007FFF,  // ***************
+     0x00007FFF,  // ***************
      0x00000000,  // ...............
   },
   {             // 96
@@ -1863,10 +1863,10 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1896,17 +1896,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1920,22 +1920,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BE0,  // ...**.*****....
-     0x00001FF8,  // ...**********..
-     0x00001E38,  // ...****...***..
-     0x00001C1C,  // ...***.....***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00001C1C,  // ...***.....***.
-     0x00001E38,  // ...****...***..
-     0x00007FF8,  // .************..
-     0x00007BE0,  // .****.*****....
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00003FFC,  // .************..
+     0x00003DF0,  // .****.*****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1954,17 +1954,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1978,22 +1978,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000F0,  // ........****...
-     0x000000F0,  // ........****...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FFC,  // ..************.
-     0x00000FBC,  // ....*****.****.
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2012,17 +2012,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2036,22 +2036,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F8,  // .......******..
-     0x000003F8,  // ......*******..
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x000000FC,  // .......******..
+     0x000001FC,  // ......*******..
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2070,22 +2070,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001FC0,  // ...*******.....
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
   },
   {             // 104
      15, 26,
@@ -2094,22 +2094,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000F000,  // ****...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2123,22 +2123,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2152,27 +2152,27 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FC0,  // ..********.....
-     0x00003FC0,  // ..********.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00003F80,  // ..*******......
-     0x00003F00,  // ..******.......
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
   },
   {             // 107
      15, 26,
@@ -2181,22 +2181,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x000018F0,  // ...**...****...
-     0x000018F0,  // ...**...****...
-     0x000019C0,  // ...**..***.....
-     0x00001B80,  // ...**.***......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00001B80,  // ...**.***......
-     0x000019C0,  // ...**..***.....
-     0x000018E0,  // ...**...***....
-     0x000078FC,  // .****...******.
-     0x000078FC,  // .****...******.
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C78,  // ...**...****...
+     0x00000C78,  // ...**...****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003C7E,  // .****...******.
+     0x00003C7E,  // .****...******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2210,22 +2210,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2233,7 +2233,7 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
   },
   {             // 109
-     15, 26,
+     16, 26,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2244,17 +2244,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001DEF0,  // ***.****.****...
-     0x0001FFF8,  // **************..
-     0x00007398,  // ..***..***..**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001F3DE,  // *****..****.****
-     0x0001F3DE,  // *****..****.****
+     0x0000EF78,  // ***.****.****...
+     0x0000FFFC,  // **************..
+     0x000039CC,  // ..***..***..**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000F9EF,  // *****..****.****
+     0x0000F9EF,  // *****..****.****
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2273,17 +2273,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2302,17 +2302,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2331,22 +2331,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7C0,  // ****.*****.....
-     0x0000FFF0,  // ************...
-     0x00003C70,  // ..****...***...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00003C70,  // ..****...***...
-     0x00003FF0,  // ..**********...
-     0x000037C0,  // ..**.*****.....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x0000FE00,  // *******........
-     0x0000FE00,  // *******........
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
   },
   {             // 113
      15, 26,
@@ -2360,22 +2360,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x000001FC,  // .......*******.
-     0x000001FC,  // .......*******.
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000000FE,  // .......*******.
+     0x000000FE,  // .......*******.
   },
   {             // 114
      15, 26,
@@ -2389,17 +2389,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00003FF8,  // ..***********..
-     0x00000F18,  // ....****...**..
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2418,17 +2418,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2443,21 +2443,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001C70,  // ...***...***...
-     0x00000FF0,  // ....********...
-     0x000007C0,  // .....*****.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2476,17 +2476,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2505,17 +2505,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2534,17 +2534,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00003330,  // ..**..**..**...
-     0x000037B0,  // ..**.****.**...
-     0x000037B0,  // ..**.****.**...
-     0x00003CF0,  // ..****..****...
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00001998,  // ..**..**..**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001E78,  // ..****..****...
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2563,17 +2563,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2592,22 +2592,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 122
      15, 26,
@@ -2621,17 +2621,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2645,26 +2645,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x000000E0,  // ........***....
+     0x00000070,  // ........***....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000070,  // ........***....
      0x00000000,  // ...............
   },
   {             // 124
@@ -2674,24 +2674,24 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2703,26 +2703,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000380,  // ......***......
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00001C00,  // ...***.........
+     0x00000E00,  // ...***.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
   },
   {             // 126
@@ -2739,10 +2739,10 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001E18,  // ...****....**..
-     0x00003F38,  // ..******..***..
-     0x000073F0,  // .***..******...
-     0x000061E0,  // .**....****....
+     0x00000F0C,  // ...****....**..
+     0x00001F9C,  // ..******..***..
+     0x000039F8,  // .***..******...
+     0x000030F0,  // .**....****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3748,25 +3748,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
   },
   {             // 162
@@ -3777,9 +3777,9 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3806,21 +3806,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000D80,  // ....**.**......
-     0x00000F80,  // ....*****......
-     0x00000F00,  // ....****.......
-     0x00001E00,  // ...****........
-     0x00003C00,  // ..****.........
-     0x00007C00,  // .*****.........
-     0x00006C18,  // .**.**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x000006C0,  // ....**.**......
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000F00,  // ...****........
+     0x00001E00,  // ..****.........
+     0x00003E00,  // .*****.........
+     0x0000360C,  // .**.**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3837,17 +3837,17 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3860,25 +3860,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003180,  // ..**...**......
-     0x00001B00,  // ...**.**.......
-     0x00000E00,  // ....***........
+     0x000018C0,  // ..**...**......
+     0x00000D80,  // ...**.**.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3888,26 +3888,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 166
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3921,24 +3921,24 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007F0,  // .....*******...
-     0x00000FF0,  // ....********...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001C00,  // ...***.........
-     0x00003F00,  // ..******.......
-     0x000067C0,  // .**..*****.....
-     0x000061F0,  // .**....*****...
-     0x00007878,  // .****....****..
-     0x00003E18,  // ..*****....**..
-     0x00000F98,  // ....*****..**..
-     0x000003F8,  // ......*******..
-     0x000000F0,  // ........****...
-     0x00000060,  // .........**....
-     0x00003060,  // ..**.....**....
-     0x000030E0,  // ..**....***....
-     0x00003FC0,  // ..********.....
-     0x00003F80,  // ..*******......
+     0x000003F8,  // .....*******...
+     0x000007F8,  // ....********...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000E00,  // ...***.........
+     0x00001F80,  // ..******.......
+     0x000033E0,  // .**..*****.....
+     0x000030F8,  // .**....*****...
+     0x00003C3C,  // .****....****..
+     0x00001F0C,  // ..*****....**..
+     0x000007CC,  // ....*****..**..
+     0x000001FC,  // ......*******..
+     0x00000078,  // ........****...
+     0x00000030,  // .........**....
+     0x00001830,  // ..**.....**....
+     0x00001870,  // ..**....***....
+     0x00001FE0,  // ..********.....
+     0x00001FC0,  // ..*******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3951,9 +3951,9 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3977,24 +3977,24 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003C00,  // ..****.........
-     0x00001F80,  // ...******......
-     0x000003F0,  // ......******...
-     0x00000078,  // .........****..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001E00,  // ..****.........
+     0x00000FC0,  // ...******......
+     0x000001F8,  // ......******...
+     0x0000003C,  // .........****..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4009,50 +4009,50 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 171
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4062,26 +4062,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 172
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4103,8 +4103,8 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4122,24 +4122,24 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4150,25 +4150,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4182,13 +4182,13 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4216,21 +4216,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
   },
   {             // 178
@@ -4256,10 +4256,10 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000360,  // ......**.**....
-     0x000001C0,  // .......***.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x000001B0,  // ......**.**....
+     0x000000E0,  // .......***.....
      0x00000000,  // ...............
   },
   {             // 179
@@ -4269,22 +4269,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000360,  // ......**.**....
-     0x000003E0,  // ......*****....
-     0x000003C0,  // ......****.....
-     0x00000780,  // .....****......
-     0x00000F00,  // ....****.......
-     0x00001F00,  // ...*****.......
-     0x00001B00,  // ...**.**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001B0,  // ......**.**....
+     0x000001F0,  // ......*****....
+     0x000001E0,  // ......****.....
+     0x000003C0,  // .....****......
+     0x00000780,  // ....****.......
+     0x00000F80,  // ...*****.......
+     0x00000D80,  // ...**.**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4298,10 +4298,10 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4323,26 +4323,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 181
      15, 26,
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4356,22 +4356,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4386,9 +4386,9 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4429,12 +4429,12 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 185
      15, 26,
@@ -4444,21 +4444,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4477,46 +4477,46 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 187
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00006300,  // .**...**.......
-     0x00003600,  // ..**.**........
-     0x00001C00,  // ...***.........
+     0x00003180,  // .**...**.......
+     0x00001B00,  // ..**.**........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001C70,  // ...***...***...
-     0x00000FF0,  // ....********...
-     0x000007C0,  // .....*****.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4530,22 +4530,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4560,10 +4560,10 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000CC0,  // ....**..**.....
-     0x00001980,  // ...**..**......
-     0x00003300,  // ..**..**.......
+     0x00000330,  // .....**..**....
+     0x00000660,  // ....**..**.....
+     0x00000CC0,  // ...**..**......
+     0x00001980,  // ..**..**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4589,21 +4589,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4618,21 +4618,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4642,26 +4642,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 192
      15, 26,
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x0000FF80,  // *********......
-     0x0000FFE0,  // ***********....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003070,  // ..**.....***...
-     0x00003FE0,  // ..*********....
-     0x00003F80,  // ..*******......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4671,26 +4671,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 193
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4699,27 +4699,27 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   },
   {             // 194
      15, 26,
-     0x00000600,  // .....**........
-     0x00000F00,  // ....****.......
-     0x00001F80,  // ...******......
-     0x000039C0,  // ..***..***.....
-     0x000070E0,  // .***....***....
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000FC0,  // ...******......
+     0x00001CE0,  // ..***..***.....
+     0x00003870,  // .***....***....
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4730,25 +4730,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000030C0,  // ..**....**.....
-     0x00001980,  // ...**..**......
-     0x00000F00,  // ....****.......
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4759,25 +4759,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4787,26 +4787,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 197
      15, 26,
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4816,26 +4816,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 198
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003000,  // ..**...........
-     0x00003818,  // ..***......**..
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4850,50 +4850,50 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003008,  // ..**........*..
-     0x00003818,  // ..***......**..
-     0x00001FF0,  // ...*********...
-     0x000007E0,  // .....******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001804,  // ..**........*..
+     0x00001C0C,  // ..***......**..
+     0x00000FF8,  // ...*********...
+     0x000003F0,  // .....******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 200
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x000007D8,  // .....*****.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00007018,  // .***.......**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003000,  // ..**...........
-     0x00003818,  // ..***......**..
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4903,26 +4903,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 201
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4937,50 +4937,50 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000360,  // ......**.**....
-     0x000001C0,  // .......***.....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x000001B0,  // ......**.**....
+     0x000000E0,  // .......***.....
      0x00000000,  // ...............
   },
   {             // 203
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4991,25 +4991,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018D8,  // ...**...**.**..
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5019,26 +5019,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 205
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5047,27 +5047,27 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   },
   {             // 206
      15, 26,
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5078,25 +5078,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5111,21 +5111,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000FE0C,  // *******.....**.
-     0x0000FE0C,  // *******.....**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00007F06,  // *******.....**.
+     0x00007F06,  // *******.....**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5135,26 +5135,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 209
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5165,25 +5165,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5193,26 +5193,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 211
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5221,27 +5221,27 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   },
   {             // 212
      15, 26,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000007E0,  // .....******....
-     0x00000E70,  // ....***..***...
-     0x00001C38,  // ...***....***..
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5251,26 +5251,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 213
      15, 26,
      0x00000000,  // ...............
-     0x00000198,  // .......**..**..
-     0x00000330,  // ......**..**...
-     0x00000660,  // .....**..**....
-     0x00000CC0,  // ....**..**.....
+     0x000000CC,  // .......**..**..
+     0x00000198,  // ......**..**...
+     0x00000330,  // .....**..**....
+     0x00000660,  // ....**..**.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5281,25 +5281,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5316,18 +5316,18 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00002010,  // ..*........*...
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00002010,  // ..*........*...
+     0x00001008,  // ..*........*...
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00001008,  // ..*........*...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5339,25 +5339,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000FF80,  // *********......
-     0x0000FFE0,  // ***********....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003070,  // ..**.....***...
-     0x00003FE0,  // ..*********....
-     0x00003F80,  // ..*******......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5367,26 +5367,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 217
      15, 26,
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000006C0,  // .....**.**.....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000360,  // .....**.**.....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5396,26 +5396,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 218
      15, 26,
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5425,26 +5425,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 219
      15, 26,
      0x00000000,  // ...............
-     0x00000198,  // .......**..**..
-     0x00000330,  // ......**..**...
-     0x00000660,  // .....**..**....
-     0x00000CC0,  // ....**..**.....
+     0x000000CC,  // .......**..**..
+     0x00000198,  // ......**..**...
+     0x00000330,  // .....**..**....
+     0x00000660,  // ....**..**.....
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5455,25 +5455,25 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      15, 26,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5483,26 +5483,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 221
      15, 26,
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5517,26 +5517,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 223
      15, 26,
@@ -5545,22 +5545,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x000018E0,  // ...**...***....
-     0x00001BC0,  // ...**.****.....
-     0x00001BE0,  // ...**.*****....
-     0x00001870,  // ...**....***...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000019B8,  // ...**..**.***..
-     0x00007DF0,  // .*****.*****...
-     0x00007CE0,  // .*****..***....
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C70,  // ...**...***....
+     0x00000DE0,  // ...**.****.....
+     0x00000DF0,  // ...**.*****....
+     0x00000C38,  // ...**....***...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000CDC,  // ...**..**.***..
+     0x00003EF8,  // .*****.*****...
+     0x00003E70,  // .*****..***....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5574,22 +5574,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00003FF8,  // ..***********..
-     0x00000F18,  // ....****...**..
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5603,22 +5603,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5632,22 +5632,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5662,21 +5662,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000030C0,  // ..**....**.....
-     0x00001980,  // ...**..**......
-     0x00000F00,  // ....****.......
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5691,21 +5691,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5714,27 +5714,27 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   },
   {             // 229
      15, 26,
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5748,22 +5748,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5782,22 +5782,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007030,  // .***......**...
-     0x00006030,  // .**.......**...
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00000FE0,  // ....*******....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x00003818,  // .***......**...
+     0x00003018,  // .**.......**...
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x000007F0,  // ....*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 232
      15, 26,
@@ -5807,21 +5807,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5835,22 +5835,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5869,21 +5869,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000360,  // ......**.**....
-     0x000001C0,  // .......***.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x000001B0,  // ......**.**....
+     0x000000E0,  // .......***.....
      0x00000000,  // ...............
   },
   {             // 235
@@ -5894,21 +5894,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5923,21 +5923,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5951,22 +5951,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5980,22 +5980,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6005,26 +6005,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 239
      15, 26,
      0x00000000,  // ...............
-     0x00000318,  // ......**...**..
-     0x000001B0,  // .......**.**...
-     0x000000E0,  // ........***....
+     0x0000018C,  // ......**...**..
+     0x000000D8,  // .......**.**...
+     0x00000070,  // ........***....
      0x00000000,  // ...............
-     0x000000F0,  // ........****...
-     0x000000F0,  // ........****...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FFC,  // ..************.
-     0x00000FBC,  // ....*****.****.
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6038,22 +6038,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000F0,  // ........****...
-     0x000000F0,  // ........****...
-     0x00000030,  // ..........**...
-     0x000007FE,  // .....**********
-     0x000007FE,  // .....**********
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FFC,  // ..************.
-     0x00000FBC,  // ....*****.****.
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x000003FF,  // .....**********
+     0x000003FF,  // .....**********
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6067,22 +6067,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6097,21 +6097,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6125,22 +6125,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6154,22 +6154,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000F80,  // ....*****......
-     0x00001DC0,  // ...***.***.....
-     0x000038E0,  // ..***...***....
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6183,22 +6183,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000330,  // ......**..**...
-     0x00000660,  // .....**..**....
-     0x00000CC0,  // ....**..**.....
-     0x00001980,  // ...**..**......
+     0x00000198,  // ......**..**...
+     0x00000330,  // .....**..**....
+     0x00000660,  // ....**..**.....
+     0x00000CC0,  // ...**..**......
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6213,21 +6213,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6244,18 +6244,18 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFF8,  // *************..
-     0x0000FFF8,  // *************..
+     0x00007FFC,  // *************..
+     0x00007FFC,  // *************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6271,21 +6271,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00003FF8,  // ..***********..
-     0x00000F18,  // ....****...**..
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6299,22 +6299,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000D80,  // ....**.**......
-     0x00000D80,  // ....**.**......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6328,22 +6328,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6357,22 +6357,22 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000330,  // ......**..**...
-     0x00000660,  // .....**..**....
-     0x00000CC0,  // ....**..**.....
-     0x00001980,  // ...**..**......
+     0x00000198,  // ......**..**...
+     0x00000330,  // .....**..**....
+     0x00000660,  // ....**..**.....
+     0x00000CC0,  // ...**..**......
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6387,21 +6387,21 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6415,27 +6415,27 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 254
      15, 26,
@@ -6445,26 +6445,26 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001C70,  // ...***...***...
-     0x00000FF0,  // ....********...
-     0x000007C0,  // .....*****.....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 255
      15, 26,
@@ -6474,9 +6474,9 @@ cFont::tPixelData FontFix_iso8859_2[][28] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
diff --git a/fontfix-iso8859-5.c b/fontfix-iso8859-5.c
index 51cef2409..e8cb4e5c7 100644
--- a/fontfix-iso8859-5.c
+++ b/fontfix-iso8859-5.c
@@ -31,22 +31,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -59,13 +59,13 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001CE0,  // ...***..***....
-     0x00001CE0,  // ...***..***....
-     0x00001CE0,  // ...***..***....
-     0x00001CE0,  // ...***..***....
-     0x000018C0,  // ...**...**.....
-     0x00001080,  // ...*....*......
-     0x00001080,  // ...*....*......
+     0x00000E70,  // ...***..***....
+     0x00000E70,  // ...***..***....
+     0x00000E70,  // ...***..***....
+     0x00000E70,  // ...***..***....
+     0x00000C60,  // ...**...**.....
+     0x00000840,  // ...*....*......
+     0x00000840,  // ...*....*......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -84,25 +84,25 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
-     0x00001980,  // ...**..**......
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -111,26 +111,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000F60,  // ....****.**....
-     0x00001FE0,  // ...********....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F80,  // ...******......
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00003FE0,  // ..*********....
-     0x000037C0,  // ..**.*****.....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000FC0,  // ...******......
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FF0,  // ..*********....
+     0x00001BE0,  // ..**.*****.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -140,21 +140,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000F00,  // ....****.......
-     0x00001980,  // ...**..**......
-     0x00001080,  // ...*....*......
-     0x00001080,  // ...*....*......
-     0x00001980,  // ...**..**......
-     0x00000F00,  // ....****.......
-     0x00000070,  // .........***...
-     0x000003C0,  // ......****.....
-     0x00000E00,  // ....***........
-     0x000039E0,  // ..***..****....
-     0x00000330,  // ......**..**...
-     0x00000210,  // ......*....*...
-     0x00000210,  // ......*....*...
-     0x00000330,  // ......**..**...
-     0x000001E0,  // .......****....
+     0x00000780,  // ....****.......
+     0x00000CC0,  // ...**..**......
+     0x00000840,  // ...*....*......
+     0x00000840,  // ...*....*......
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
+     0x00000038,  // .........***...
+     0x000001E0,  // ......****.....
+     0x00000700,  // ....***........
+     0x00001CF0,  // ..***..****....
+     0x00000198,  // ......**..**...
+     0x00000108,  // ......*....*...
+     0x00000108,  // ......*....*...
+     0x00000198,  // ......**..**...
+     0x000000F0,  // .......****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -168,20 +168,20 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000E00,  // ....***........
-     0x00001F30,  // ...*****..**...
-     0x00001BF0,  // ...**.******...
-     0x000031E0,  // ..**...****....
-     0x000030C0,  // ..**....**.....
-     0x000031E0,  // ..**...****....
-     0x00003FF8,  // ..***********..
-     0x00001F38,  // ...*****..***..
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000700,  // ....***........
+     0x00000F98,  // ...*****..**...
+     0x00000DF8,  // ...**.******...
+     0x000018F0,  // ..**...****....
+     0x00001860,  // ..**....**.....
+     0x000018F0,  // ..**...****....
+     0x00001FFC,  // ..***********..
+     0x00000F9C,  // ...*****..***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -194,13 +194,13 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000200,  // ......*........
-     0x00000200,  // ......*........
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000100,  // ......*........
+     0x00000100,  // ......*........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -220,26 +220,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000060,  // .........**....
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000E0,  // ........***....
-     0x00000060,  // .........**....
+     0x00000030,  // .........**....
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000070,  // ........***....
+     0x00000030,  // .........**....
      0x00000000,  // ...............
   },
   {             // 41
@@ -247,26 +247,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001C00,  // ...***.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x00001800,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
      0x00000000,  // ...............
   },
   {             // 42
@@ -274,17 +274,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003330,  // ..**..**..**...
-     0x00003B70,  // ..***.**.***...
-     0x00000FC0,  // ....******.....
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001998,  // ..**..**..**...
+     0x00001DB8,  // ..***.**.***...
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -303,20 +303,20 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -341,12 +341,12 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000800,  // ....*..........
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -363,8 +363,8 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -395,9 +395,9 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -408,26 +408,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -436,22 +436,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00001860,  // ...**....**....
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000C30,  // ...**....**....
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -463,22 +463,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00003F00,  // ..******.......
-     0x00003F00,  // ..******.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -490,22 +490,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C00,  // ...***.........
-     0x00003800,  // ..***..........
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
+     0x00001C00,  // ..***..........
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -517,22 +517,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000000E0,  // ........***....
-     0x000007C0,  // .....*****.....
-     0x000007E0,  // .....******....
-     0x00000070,  // .........***...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x00003FE0,  // ..*********....
-     0x00001FC0,  // ...*******.....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000003E0,  // .....*****.....
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001FF0,  // ..*********....
+     0x00000FE0,  // ...*******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -544,22 +544,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001C0,  // .......***.....
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00007FF0,  // .***********...
-     0x00007FF0,  // .***********...
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000007F0,  // .....*******...
-     0x000007F0,  // .....*******...
+     0x000000E0,  // .......***.....
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000003F8,  // .....*******...
+     0x000003F8,  // .....*******...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -571,22 +571,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF0,  // ...*********...
-     0x00001FF0,  // ...*********...
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001BC0,  // ...**.****.....
-     0x00001FF0,  // ...*********...
-     0x00001C70,  // ...***...***...
-     0x00000038,  // ..........***..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00003038,  // ..**......***..
-     0x00003870,  // ..***....***...
-     0x00001FF0,  // ...*********...
-     0x00000FC0,  // ....******.....
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DE0,  // ...**.****.....
+     0x00000FF8,  // ...*********...
+     0x00000E38,  // ...***...***...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000181C,  // ..**......***..
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -598,22 +598,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000F8,  // ........*****..
-     0x000003F8,  // ......*******..
-     0x00000780,  // .....****......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001C00,  // ...***.........
-     0x000019E0,  // ...**..****....
-     0x00001BF0,  // ...**.******...
-     0x00001E38,  // ...****...***..
-     0x00001C18,  // ...***.....**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001C18,  // ...***.....**..
-     0x00000E38,  // ....***...***..
-     0x00000FF0,  // ....********...
-     0x000003E0,  // ......*****....
+     0x0000007C,  // ........*****..
+     0x000001FC,  // ......*******..
+     0x000003C0,  // .....****......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000CF0,  // ...**..****....
+     0x00000DF8,  // ...**.******...
+     0x00000F1C,  // ...****...***..
+     0x00000E0C,  // ...***.....**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000E0C,  // ...***.....**..
+     0x0000071C,  // ....***...***..
+     0x000007F8,  // ....********...
+     0x000001F0,  // ......*****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -625,22 +625,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -652,22 +652,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00003870,  // ..***....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -679,22 +679,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003C0,  // ......****.....
-     0x00000FF0,  // ....********...
-     0x00000C30,  // ....**....**...
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C78,  // ...***...****..
-     0x00000FD8,  // ....******.**..
-     0x00000798,  // .....****..**..
-     0x00000018,  // ...........**..
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001F80,  // ...******......
+     0x000001E0,  // ......****.....
+     0x000007F8,  // ....********...
+     0x00000618,  // ....**....**...
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E3C,  // ...***...****..
+     0x000007EC,  // ....******.**..
+     0x000003CC,  // .....****..**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -711,17 +711,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -738,20 +738,20 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00001000,  // ...*...........
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000800,  // ...*...........
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -763,18 +763,18 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000001C,  // ...........***.
-     0x00000078,  // .........****..
-     0x000001E0,  // .......****....
-     0x00000780,  // .....****......
-     0x00001E00,  // ...****........
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001E00,  // ...****........
-     0x00000780,  // .....****......
-     0x000001E0,  // .......****....
-     0x00000078,  // .........****..
-     0x0000001C,  // ...........***.
+     0x0000000E,  // ...........***.
+     0x0000003C,  // .........****..
+     0x000000F0,  // .......****....
+     0x000003C0,  // .....****......
+     0x00000F00,  // ...****........
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000F00,  // ...****........
+     0x000003C0,  // .....****......
+     0x000000F0,  // .......****....
+     0x0000003C,  // .........****..
+     0x0000000E,  // ...........***.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -793,12 +793,12 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -817,18 +817,18 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007000,  // .***...........
-     0x00003C00,  // ..****.........
-     0x00000F00,  // ....****.......
-     0x000003C0,  // ......****.....
-     0x000000F0,  // ........****...
-     0x0000003C,  // ..........****.
-     0x0000003C,  // ..........****.
-     0x000000F0,  // ........****...
-     0x000003C0,  // ......****.....
-     0x00000F00,  // ....****.......
-     0x00003C00,  // ..****.........
-     0x00007000,  // .***...........
+     0x00003800,  // .***...........
+     0x00001E00,  // ..****.........
+     0x00000780,  // ....****.......
+     0x000001E0,  // ......****.....
+     0x00000078,  // ........****...
+     0x0000001E,  // ..........****.
+     0x0000001E,  // ..........****.
+     0x00000078,  // ........****...
+     0x000001E0,  // ......****.....
+     0x00000780,  // ....****.......
+     0x00001E00,  // ..****.........
+     0x00003800,  // .***...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -842,21 +842,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00001FE0,  // ...********....
-     0x00001870,  // ...**....***...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x000001E0,  // .......****....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x000000F0,  // .......****....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -868,24 +868,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x00003060,  // ..**.....**....
-     0x00003060,  // ..**.....**....
-     0x000031E0,  // ..**...****....
-     0x000033E0,  // ..**..*****....
-     0x00003760,  // ..**.***.**....
-     0x00003660,  // ..**.**..**....
-     0x00003660,  // ..**.**..**....
-     0x00003760,  // ..**.***.**....
-     0x000033F0,  // ..**..******...
-     0x000031F0,  // ..**...*****...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001860,  // ...**....**....
-     0x00001FE0,  // ...********....
-     0x00000780,  // .....****......
+     0x00000380,  // .....***.......
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x000018F0,  // ..**...****....
+     0x000019F0,  // ..**..*****....
+     0x00001BB0,  // ..**.***.**....
+     0x00001B30,  // ..**.**..**....
+     0x00001B30,  // ..**.**..**....
+     0x00001BB0,  // ..**.***.**....
+     0x000019F8,  // ..**..******...
+     0x000018F8,  // ..**...*****...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -896,21 +896,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F80,  // ..*******......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001FC0,  // ..*******......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -923,21 +923,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF0,  // .***********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -950,21 +950,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -977,21 +977,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFF0,  // ************...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x0000FFF0,  // ************...
-     0x0000FFE0,  // ***********....
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1004,21 +1004,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018CC,  // ...**...**..**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C66,  // ...**...**..**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1031,21 +1031,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1058,21 +1058,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x000060FC,  // .**.....******.
-     0x000060FC,  // .**.....******.
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1085,21 +1085,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1112,21 +1112,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1139,21 +1139,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFC,  // ....**********.
-     0x00000FFC,  // ....**********.
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x000070E0,  // .***....***....
-     0x00003FC0,  // ..********.....
-     0x00001F80,  // ...******......
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1166,21 +1166,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCF8,  // ******..*****..
-     0x0000FCF8,  // ******..*****..
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00003F00,  // ..******.......
-     0x00003B80,  // ..***.***......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1193,21 +1193,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1220,21 +1220,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F03C,  // ****......****.
-     0x0000F03C,  // ****......****.
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006318,  // .**...**...**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1247,21 +1247,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000787C,  // .****....*****.
-     0x0000787C,  // .****....*****.
-     0x00003C18,  // ..****.....**..
-     0x00003C18,  // ..****.....**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003078,  // ..**.....****..
-     0x00007C78,  // .*****...****..
-     0x00007C38,  // .*****....***..
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1274,21 +1274,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1301,21 +1301,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF8,  // .************..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1328,24 +1328,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
-     0x00000F0C,  // ....****....**.
-     0x00001FFC,  // ...***********.
-     0x00001CF0,  // ...***..****...
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000786,  // ....****....**.
+     0x00000FFE,  // ...***********.
+     0x00000E78,  // ...***..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1355,21 +1355,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FF80,  // *********......
-     0x0000FFE0,  // ***********....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003070,  // ..**.....***...
-     0x00003FE0,  // ..*********....
-     0x00003F80,  // ..*******......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1382,21 +1382,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1409,21 +1409,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1436,21 +1436,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1463,21 +1463,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1490,21 +1490,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006FD8,  // .**.******.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00003CF0,  // ..****..****...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
-     0x00003870,  // ..***....***...
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001E78,  // ..****..****...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1517,21 +1517,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1544,21 +1544,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1571,21 +1571,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E18,  // ....***....**..
-     0x00001C18,  // ...***.....**..
-     0x00003818,  // ..***......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1597,52 +1597,52 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x000003E0,  // ......*****....
-     0x000003E0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
      0x00000000,  // ...............
   },
   {             // 92
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -1651,26 +1651,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
   },
   {             // 94
@@ -1678,14 +1678,14 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1723,8 +1723,8 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFFE,  // ***************
-     0x0000FFFE,  // ***************
+     0x00007FFF,  // ***************
+     0x00007FFF,  // ***************
      0x00000000,  // ...............
   },
   {             // 96
@@ -1733,10 +1733,10 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1764,17 +1764,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1786,22 +1786,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000F000,  // ****...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x000037C0,  // ..**.*****.....
-     0x00003FF0,  // ..**********...
-     0x00003C70,  // ..****...***...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00003C70,  // ..****...***...
-     0x0000FFF0,  // ************...
-     0x0000F7C0,  // ****.*****.....
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF8,  // ..**********...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00007FF8,  // ************...
+     0x00007BE0,  // ****.*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1818,17 +1818,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x0000381C,  // ..***......***.
-     0x00003FFC,  // ..************.
-     0x00000FF0,  // ....********...
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C0E,  // ..***......***.
+     0x00001FFE,  // ..************.
+     0x000007F8,  // ....********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1840,22 +1840,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000F0,  // ........****...
-     0x000000F0,  // ........****...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000FB0,  // ....*****.**...
-     0x00003FF0,  // ..**********...
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FFC,  // ..************.
-     0x00000FBC,  // ....*****.****.
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1872,17 +1872,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1894,22 +1894,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000001F8,  // .......******..
-     0x000003F8,  // ......*******..
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00000600,  // .....**........
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x000000FC,  // .......******..
+     0x000001FC,  // ......*******..
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1926,44 +1926,44 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000070,  // .........***...
-     0x00001FE0,  // ...********....
-     0x00001FC0,  // ...*******.....
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
   },
   {             // 104
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F000,  // ****...........
-     0x0000F000,  // ****...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x000037C0,  // ..**.*****.....
-     0x00003FE0,  // ..*********....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1975,22 +1975,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2002,49 +2002,49 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FC0,  // ..********.....
-     0x00003FC0,  // ..********.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00003F80,  // ..*******......
-     0x00003F00,  // ..******.......
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
   },
   {             // 107
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007800,  // .****..........
-     0x00007800,  // .****..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x000018F0,  // ...**...****...
-     0x000018F0,  // ...**...****...
-     0x000019C0,  // ...**..***.....
-     0x00001B80,  // ...**.***......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00001B80,  // ...**.***......
-     0x000019C0,  // ...**..***.....
-     0x000018E0,  // ...**...***....
-     0x000078FC,  // .****...******.
-     0x000078FC,  // .****...******.
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C78,  // ...**...****...
+     0x00000C78,  // ...**...****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003C7E,  // .****...******.
+     0x00003C7E,  // .****...******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2056,22 +2056,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2079,7 +2079,7 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
   },
   {             // 109
-     15, 24,
+     16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2088,17 +2088,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001DEF0,  // ***.****.****...
-     0x0001FFF8,  // **************..
-     0x00007398,  // ..***..***..**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001F3DE,  // *****..****.****
-     0x0001F3DE,  // *****..****.****
+     0x0000EF78,  // ***.****.****...
+     0x0000FFFC,  // **************..
+     0x000039CC,  // ..***..***..**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000F9EF,  // *****..****.****
+     0x0000F9EF,  // *****..****.****
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -2115,17 +2115,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F3C0,  // ****..****.....
-     0x0000F7E0,  // ****.******....
-     0x00003C70,  // ..****...***...
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2142,17 +2142,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2169,22 +2169,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7C0,  // ****.*****.....
-     0x0000FFF0,  // ************...
-     0x00003C70,  // ..****...***...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00003C70,  // ..****...***...
-     0x00003FF0,  // ..**********...
-     0x000037C0,  // ..**.*****.....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x0000FE00,  // *******........
-     0x0000FE00,  // *******........
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
   },
   {             // 113
      15, 24,
@@ -2196,22 +2196,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FBC,  // ....*****.****.
-     0x00003FFC,  // ..************.
-     0x000038F0,  // ..***...****...
-     0x00007070,  // .***.....***...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00006030,  // .**.......**...
-     0x00007070,  // .***.....***...
-     0x000038F0,  // ..***...****...
-     0x00003FF0,  // ..**********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x000001FC,  // .......*******.
-     0x000001FC,  // .......*******.
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000000FE,  // .......*******.
+     0x000000FE,  // .......*******.
   },
   {             // 114
      15, 24,
@@ -2223,17 +2223,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003CF0,  // ..****..****...
-     0x00003FF8,  // ..***********..
-     0x00000F18,  // ....****...**..
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2250,17 +2250,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2273,21 +2273,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007FE0,  // .**********....
-     0x00007FE0,  // .**********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001C70,  // ...***...***...
-     0x00000FF0,  // ....********...
-     0x000007C0,  // .....*****.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2304,17 +2304,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F0F0,  // ****....****...
-     0x0000F0F0,  // ****....****...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FFC,  // ...***********.
-     0x00000FBC,  // ....*****.****.
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2331,17 +2331,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2358,17 +2358,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00003330,  // ..**..**..**...
-     0x000037B0,  // ..**.****.**...
-     0x000037B0,  // ..**.****.**...
-     0x00003CF0,  // ..****..****...
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00001998,  // ..**..**..**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001E78,  // ..****..****...
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2385,17 +2385,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2412,22 +2412,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 122
      15, 24,
@@ -2439,17 +2439,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00001C30,  // ...***....**...
-     0x00003830,  // ..***.....**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2461,26 +2461,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000E0,  // ........***....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x000000E0,  // ........***....
+     0x00000070,  // ........***....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000070,  // ........***....
      0x00000000,  // ...............
   },
   {             // 124
@@ -2488,24 +2488,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2515,26 +2515,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001C00,  // ...***.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000380,  // ......***......
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000600,  // .....**........
-     0x00001C00,  // ...***.........
+     0x00000E00,  // ...***.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
   },
   {             // 126
@@ -2549,10 +2549,10 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001E18,  // ...****....**..
-     0x00003F38,  // ..******..***..
-     0x000073F0,  // .***..******...
-     0x000061E0,  // .**....****....
+     0x00000F0C,  // ...****....**..
+     0x00001F9C,  // ..******..***..
+     0x000039F8,  // .***..******...
+     0x000030F0,  // .**....****....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3485,24 +3485,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
   {             // 161
      15, 24,
      0x00000000,  // ...............
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018CC,  // ...**...**..**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C66,  // ...**...**..**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3569,21 +3569,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3596,21 +3596,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00001FF8,  // ...**********..
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FE0,  // ....*******....
-     0x000001F0,  // .......*****...
-     0x00000038,  // ..........***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00006FE0,  // .**.*******....
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3623,21 +3623,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3647,24 +3647,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
   {             // 167
      15, 24,
      0x00000000,  // ...............
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3677,21 +3677,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFC,  // ....**********.
-     0x00000FFC,  // ....**********.
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00000060,  // .........**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x00006060,  // .**......**....
-     0x000070E0,  // .***....***....
-     0x00003FC0,  // ..********.....
-     0x00001F80,  // ...******......
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3819,8 +3819,8 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3835,25 +3835,25 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
   },
   {             // 174
      15, 24,
-     0x00001860,  // ...**....**....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00001C00,  // ...***.........
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3893,21 +3893,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003F00,  // ..******.......
-     0x00003F80,  // ..*******......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00001F80,  // ..******.......
+     0x00001FC0,  // ..*******......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3920,21 +3920,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001800,  // ...**..........
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C00,  // ...**..........
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3947,21 +3947,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF0,  // .***********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3974,21 +3974,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4001,24 +4001,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
-     0x0000C00C,  // **..........**.
-     0x0000C00C,  // **..........**.
-     0x0000C00C,  // **..........**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
+     0x00006006,  // **..........**.
+     0x00006006,  // **..........**.
+     0x00006006,  // **..........**.
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -4028,21 +4028,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
-     0x00001FC0,  // ...*******.....
-     0x00001FC0,  // ...*******.....
-     0x000018C0,  // ...**...**.....
-     0x000018CC,  // ...**...**..**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C66,  // ...**...**..**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4050,26 +4050,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
   },
   {             // 182
-     15, 24,
+     16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001E79E,  // ****..****..****
-     0x0001E79E,  // ****..****..****
-     0x00006318,  // ..**...**...**..
-     0x00007338,  // ..***..**..***..
-     0x00003330,  // ...**..**..**...
-     0x00001B60,  // ....**.**.**....
-     0x00001FE0,  // ....********....
-     0x00001FE0,  // ....********....
-     0x000037B0,  // ...**.****.**...
-     0x00003330,  // ...**..**..**...
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001C78E,  // ***...****...***
-     0x0001C78E,  // ***...****...***
+     0x0000F3CF,  // ****..****..****
+     0x0000F3CF,  // ****..****..****
+     0x0000318C,  // ..**...**...**..
+     0x0000399C,  // ..***..**..***..
+     0x00001998,  // ...**..**..**...
+     0x00000DB0,  // ....**.**.**....
+     0x00000FF0,  // ....********....
+     0x00000FF0,  // ....********....
+     0x00001BD8,  // ...**.****.**...
+     0x00001998,  // ...**..**..**...
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000E3C7,  // ***...****...***
+     0x0000E3C7,  // ***...****...***
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4082,21 +4082,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000037E0,  // ..**.******....
-     0x00003FF0,  // ..**********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00000038,  // ..........***..
-     0x000003F0,  // ......******...
-     0x000003F8,  // ......*******..
-     0x0000001C,  // ...........***.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007F0,  // .....*******...
+     0x00001BF0,  // ..**.******....
+     0x00001FF8,  // ..**********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000001C,  // ..........***..
+     0x000001F8,  // ......******...
+     0x000001FC,  // ......*******..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F8,  // .....*******...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4109,21 +4109,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C3C,  // .*****....****.
-     0x00007C3C,  // .*****....****.
-     0x00003078,  // ..**.....****..
-     0x00003078,  // ..**.....****..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003C18,  // ..****.....**..
-     0x00007C7C,  // .*****...*****.
-     0x0000787C,  // .****....*****.
+     0x00003E1E,  // .*****....****.
+     0x00003E1E,  // .*****....****.
+     0x0000183C,  // ..**.....****..
+     0x0000183C,  // ..**.....****..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001E0C,  // ..****.....**..
+     0x00003E3E,  // .*****...*****.
+     0x00003C3E,  // .****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4132,25 +4132,25 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
   },
   {             // 185
      15, 24,
-     0x00000C60,  // ....**...**....
-     0x000007C0,  // .....*****.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x000003E0,  // .....*****.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00007C3C,  // .*****....****.
-     0x00007C3C,  // .*****....****.
-     0x00003078,  // ..**.....****..
-     0x00003078,  // ..**.....****..
-     0x000030D8,  // ..**....**.**..
-     0x000030D8,  // ..**....**.**..
-     0x00003198,  // ..**...**..**..
-     0x00003198,  // ..**...**..**..
-     0x00003318,  // ..**..**...**..
-     0x00003318,  // ..**..**...**..
-     0x00003618,  // ..**.**....**..
-     0x00003618,  // ..**.**....**..
-     0x00003C18,  // ..****.....**..
-     0x00007C7C,  // .*****...*****.
-     0x0000787C,  // .****....*****.
+     0x00003E1E,  // .*****....****.
+     0x00003E1E,  // .*****....****.
+     0x0000183C,  // ..**.....****..
+     0x0000183C,  // ..**.....****..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001E0C,  // ..****.....**..
+     0x00003E3E,  // .*****...*****.
+     0x00003C3E,  // .****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4163,21 +4163,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCF8,  // ******..*****..
-     0x0000FCF8,  // ******..*****..
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00003F00,  // ..******.......
-     0x00003B80,  // ..***.***......
-     0x000031C0,  // ..**...***.....
-     0x000030E0,  // ..**....***....
-     0x00003060,  // ..**.....**....
-     0x00003070,  // ..**.....***...
-     0x0000FC3C,  // ******....****.
-     0x0000FC3C,  // ******....****.
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4190,21 +4190,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFE,  // ..*************
-     0x00003FFE,  // ..*************
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x0000D818,  // **.**......**..
-     0x0000F87E,  // *****....******
-     0x0000707E,  // .***.....******
+     0x00001FFF,  // ..*************
+     0x00001FFF,  // ..*************
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00006C0C,  // **.**......**..
+     0x00007C3F,  // *****....******
+     0x0000383F,  // .***.....******
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4217,21 +4217,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F03C,  // ****......****.
-     0x0000F03C,  // ****......****.
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006318,  // .**...**...**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4244,21 +4244,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4271,21 +4271,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4298,21 +4298,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4325,21 +4325,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF8,  // .************..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00001FF8,  // ...**********..
-     0x00001FE0,  // ...********....
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00007F80,  // .********......
-     0x00007F80,  // .********......
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4352,21 +4352,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007EC,  // .....******.**.
-     0x00001FFC,  // ...***********.
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4379,21 +4379,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00001FE0,  // ...********....
-     0x00001FE0,  // ...********....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4406,21 +4406,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00006018,  // .**........**..
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00003700,  // ..**.***.......
-     0x00003E00,  // ..*****........
-     0x00001C00,  // ...***.........
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00000E00,  // ...***.........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4433,21 +4433,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000FF0,  // ....********...
-     0x00003FFC,  // ..************.
-     0x0000399C,  // ..***..**..***.
-     0x0000718E,  // .***...**...***
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x0000718E,  // .***...**...***
-     0x0000399C,  // ..***..**..***.
-     0x00003FFC,  // ..************.
-     0x00000FF0,  // ....********...
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000007F8,  // ....********...
+     0x00001FFE,  // ..************.
+     0x00001CCE,  // ..***..**..***.
+     0x000038C7,  // .***...**...***
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000038C7,  // .***...**...***
+     0x00001CCE,  // ..***..**..***.
+     0x00001FFE,  // ..************.
+     0x000007F8,  // ....********...
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4460,21 +4460,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00001CE0,  // ...***..***....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001CE0,  // ...***..***....
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4487,24 +4487,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -4514,21 +4514,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007C7C,  // .*****...*****.
-     0x00007C7C,  // .*****...*****.
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001838,  // ...**.....***..
-     0x00001FF8,  // ...**********..
-     0x00000FD8,  // ....******.**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x00000018,  // ...........**..
-     0x0000007C,  // .........*****.
-     0x0000007C,  // .........*****.
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FFC,  // ...**********..
+     0x000007EC,  // ....******.**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000003E,  // .........*****.
+     0x0000003E,  // .........*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4541,21 +4541,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7BC,  // ****.****.****.
-     0x0000F7BC,  // ****.****.****.
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
+     0x00007BDE,  // ****.****.****.
+     0x00007BDE,  // ****.****.****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4568,24 +4568,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7BC,  // ****.****.****.
-     0x0000F7BC,  // ****.****.****.
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
+     0x00007BDE,  // ****.****.****.
+     0x00007BDE,  // ****.****.****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -4595,21 +4595,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FF00,  // ********.......
-     0x0000FF00,  // ********.......
-     0x0000CC00,  // **..**.........
-     0x0000CC00,  // **..**.........
-     0x0000CC00,  // **..**.........
-     0x00000C00,  // ....**.........
-     0x00000FF8,  // ....*********..
-     0x00000FFC,  // ....**********.
-     0x00000C0E,  // ....**......***
-     0x00000C06,  // ....**.......**
-     0x00000C06,  // ....**.......**
-     0x00000C06,  // ....**.......**
-     0x00000C0E,  // ....**......***
-     0x00003FFC,  // ..************.
-     0x00003FF8,  // ..***********..
+     0x00007F80,  // ********.......
+     0x00007F80,  // ********.......
+     0x00006600,  // **..**.........
+     0x00006600,  // **..**.........
+     0x00006600,  // **..**.........
+     0x00000600,  // ....**.........
+     0x000007FC,  // ....*********..
+     0x000007FE,  // ....**********.
+     0x00000607,  // ....**......***
+     0x00000603,  // ....**.......**
+     0x00000603,  // ....**.......**
+     0x00000603,  // ....**.......**
+     0x00000607,  // ....**......***
+     0x00001FFE,  // ..************.
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4622,21 +4622,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F83E,  // *****.....*****
-     0x0000F83E,  // *****.....*****
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x00007F0C,  // .*******....**.
-     0x00007F8C,  // .********...**.
-     0x000061CC,  // .**....***..**.
-     0x000060CC,  // .**.....**..**.
-     0x000060CC,  // .**.....**..**.
-     0x000060CC,  // .**.....**..**.
-     0x000061CC,  // .**....***..**.
-     0x0000FFBE,  // *********.*****
-     0x0000FF3E,  // ********..*****
+     0x00007C1F,  // *****.....*****
+     0x00007C1F,  // *****.....*****
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003F86,  // .*******....**.
+     0x00003FC6,  // .********...**.
+     0x000030E6,  // .**....***..**.
+     0x00003066,  // .**.....**..**.
+     0x00003066,  // .**.....**..**.
+     0x00003066,  // .**.....**..**.
+     0x000030E6,  // .**....***..**.
+     0x00007FDF,  // *********.*****
+     0x00007F9F,  // ********..*****
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4649,21 +4649,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007E00,  // .******........
-     0x00007E00,  // .******........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001FF0,  // ...*********...
-     0x00001FF8,  // ...**********..
-     0x0000181C,  // ...**......***.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000180C,  // ...**.......**.
-     0x0000181C,  // ...**......***.
-     0x00007FF8,  // .************..
-     0x00007FF0,  // .***********...
+     0x00003F00,  // .******........
+     0x00003F00,  // .******........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4676,21 +4676,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00006FC0,  // .**.******.....
-     0x00007FF0,  // .***********...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x0000601C,  // .**........***.
-     0x0000000C,  // ............**.
-     0x000003FC,  // ......********.
-     0x000003FC,  // ......********.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
-     0x0000001C,  // ...........***.
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000037E0,  // .**.******.....
+     0x00003FF8,  // .***********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300E,  // .**........***.
+     0x00000006,  // ............**.
+     0x000001FE,  // ......********.
+     0x000001FE,  // ......********.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
+     0x0000000E,  // ...........***.
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4703,21 +4703,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F8F0,  // *****...****...
-     0x0000F9F8,  // *****..******..
-     0x0000639C,  // .**...***..***.
-     0x0000630C,  // .**...**....**.
-     0x0000670E,  // .**..***....***
-     0x00006606,  // .**..**......**
-     0x00007E06,  // .******......**
-     0x00007E06,  // .******......**
-     0x00006606,  // .**..**......**
-     0x00006606,  // .**..**......**
-     0x0000670E,  // .**..***....***
-     0x0000630C,  // .**...**....**.
-     0x0000639C,  // .**...***..***.
-     0x0000F9F8,  // *****..******..
-     0x0000F8F0,  // *****...****...
+     0x00007C78,  // *****...****...
+     0x00007CFC,  // *****..******..
+     0x000031CE,  // .**...***..***.
+     0x00003186,  // .**...**....**.
+     0x00003387,  // .**..***....***
+     0x00003303,  // .**..**......**
+     0x00003F03,  // .******......**
+     0x00003F03,  // .******......**
+     0x00003303,  // .**..**......**
+     0x00003303,  // .**..**......**
+     0x00003387,  // .**..***....***
+     0x00003186,  // .**...**....**.
+     0x000031CE,  // .**...***..***.
+     0x00007CFC,  // *****..******..
+     0x00007C78,  // *****...****...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4730,21 +4730,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007FC,  // .....*********.
-     0x00001FFC,  // ...***********.
-     0x00003830,  // ..***.....**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003830,  // ..***.....**...
-     0x00001FF0,  // ...*********...
-     0x000007F0,  // .....*******...
-     0x00000E30,  // ....***...**...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00003830,  // ..***.....**...
-     0x0000F0FC,  // ****....******.
-     0x0000F0FC,  // ****....******.
+     0x000003FE,  // .....*********.
+     0x00000FFE,  // ...***********.
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C18,  // ..***.....**...
+     0x00000FF8,  // ...*********...
+     0x000003F8,  // .....*******...
+     0x00000718,  // ....***...**...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00001C18,  // ..***.....**...
+     0x0000787E,  // ****....******.
+     0x0000787E,  // ****....******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4761,17 +4761,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F80,  // ...******......
-     0x00003FC0,  // ..********.....
-     0x000030E0,  // ..**....***....
-     0x00000060,  // .........**....
-     0x00000FE0,  // ....*******....
-     0x00003FE0,  // ..*********....
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x000060E0,  // .**.....***....
-     0x00007FF8,  // .************..
-     0x00003F78,  // ..******.****..
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4783,22 +4783,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000018,  // ...........**..
-     0x000007F8,  // .....********..
-     0x00001FE0,  // ...********....
-     0x00003800,  // ..***..........
-     0x00003000,  // ..**...........
-     0x00006FC0,  // .**.******.....
-     0x00007FF0,  // .***********...
-     0x00007870,  // .****....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x0000000C,  // ...........**..
+     0x000003FC,  // .....********..
+     0x00000FF0,  // ...********....
+     0x00001C00,  // ..***..........
+     0x00001800,  // ..**...........
+     0x000037E0,  // .**.******.....
+     0x00003FF8,  // .***********...
+     0x00003C38,  // .****....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4815,17 +4815,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FE0,  // .**********....
-     0x00007FF0,  // .***********...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001FE0,  // ...********....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00007FF0,  // .***********...
-     0x00007FE0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FF0,  // ...********....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00003FF8,  // .***********...
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4842,17 +4842,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00000C18,  // ....**.....**..
-     0x00000C18,  // ....**.....**..
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00003F80,  // ..*******......
-     0x00003F80,  // ..*******......
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00001FC0,  // ..*******......
+     0x00001FC0,  // ..*******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4869,19 +4869,19 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4896,17 +4896,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4914,7 +4914,7 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
   },
   {             // 214
-     15, 24,
+     16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4923,17 +4923,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001E79E,  // ****..****..****
-     0x0001E79E,  // ****..****..****
-     0x00007338,  // ..***..**..***..
-     0x00003B70,  // ...***.**.***...
-     0x00001FE0,  // ....********....
-     0x00001FE0,  // ....********....
-     0x000037B0,  // ...**.****.**...
-     0x00003330,  // ...**..**..**...
-     0x00006318,  // ..**...**...**..
-     0x0001E79E,  // ****..****..****
-     0x0001C78E,  // ***...****...***
+     0x0000F3CF,  // ****..****..****
+     0x0000F3CF,  // ****..****..****
+     0x0000399C,  // ..***..**..***..
+     0x00001DB8,  // ...***.**.***...
+     0x00000FF0,  // ....********....
+     0x00000FF0,  // ....********....
+     0x00001BD8,  // ...**.****.**...
+     0x00001998,  // ...**..**..**...
+     0x0000318C,  // ..**...**...**..
+     0x0000F3CF,  // ****..****..****
+     0x0000E3C7,  // ***...****...***
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4950,17 +4950,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00006FE0,  // .**.*******....
-     0x00007FF0,  // .***********...
-     0x00007030,  // .***......**...
-     0x00006030,  // .**.......**...
-     0x000007E0,  // .....******....
-     0x000007F0,  // .....*******...
-     0x00000038,  // ..........***..
-     0x00000018,  // ...........**..
-     0x00007038,  // .***......***..
-     0x00007FF0,  // .***********...
-     0x00001FE0,  // ...********....
+     0x000037F0,  // .**.*******....
+     0x00003FF8,  // .***********...
+     0x00003818,  // .***......**...
+     0x00003018,  // .**.......**...
+     0x000003F0,  // .....******....
+     0x000003F8,  // .....*******...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4977,17 +4977,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FC7C,  // ******...*****.
-     0x0000FCFC,  // ******..******.
-     0x000030F0,  // ..**....****...
-     0x000031B0,  // ..**...**.**...
-     0x000031B0,  // ..**...**.**...
-     0x00003330,  // ..**..**..**...
-     0x00003730,  // ..**.***..**...
-     0x00003630,  // ..**.**...**...
-     0x00003C30,  // ..****....**...
-     0x0000FCFC,  // ******..******.
-     0x0000F8FC,  // *****...******.
+     0x00007E3E,  // ******...*****.
+     0x00007E7E,  // ******..******.
+     0x00001878,  // ..**....****...
+     0x000018D8,  // ..**...**.**...
+     0x000018D8,  // ..**...**.**...
+     0x00001998,  // ..**..**..**...
+     0x00001B98,  // ..**.***..**...
+     0x00001B18,  // ..**.**...**...
+     0x00001E18,  // ..****....**...
+     0x00007E7E,  // ******..******.
+     0x00007C7E,  // *****...******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5000,21 +5000,21 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
-     0x0000FC7C,  // ******...*****.
-     0x0000FCFC,  // ******..******.
-     0x000030F0,  // ..**....****...
-     0x000031B0,  // ..**...**.**...
-     0x000031B0,  // ..**...**.**...
-     0x00003330,  // ..**..**..**...
-     0x00003730,  // ..**.***..**...
-     0x00003630,  // ..**.**...**...
-     0x00003C30,  // ..****....**...
-     0x0000FCFC,  // ******..******.
-     0x0000F8FC,  // *****...******.
+     0x00007E3E,  // ******...*****.
+     0x00007E7E,  // ******..******.
+     0x00001878,  // ..**....****...
+     0x000018D8,  // ..**...**.**...
+     0x000018D8,  // ..**...**.**...
+     0x00001998,  // ..**..**..**...
+     0x00001B98,  // ..**.***..**...
+     0x00001B18,  // ..**.**...**...
+     0x00001E18,  // ..****....**...
+     0x00007E7E,  // ******..******.
+     0x00007C7E,  // *****...******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5031,17 +5031,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF0,  // .*****..****...
-     0x00007CF0,  // .*****..****...
-     0x000019C0,  // ...**..***.....
-     0x00001B80,  // ...**.***......
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00001B80,  // ...**.***......
-     0x000019C0,  // ...**..***.....
-     0x000018E0,  // ...**...***....
-     0x00007CFC,  // .*****..******.
-     0x00007CFC,  // .*****..******.
+     0x00003E78,  // .*****..****...
+     0x00003E78,  // .*****..****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003E7E,  // .*****..******.
+     0x00003E7E,  // .*****..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5058,17 +5058,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x00000C30,  // ....**....**...
-     0x0000D830,  // **.**.....**...
-     0x0000F8FC,  // *****...******.
-     0x000070FC,  // .***....******.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00000618,  // ....**....**...
+     0x00006C18,  // **.**.....**...
+     0x00007C7E,  // *****...******.
+     0x0000387E,  // .***....******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5085,17 +5085,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F03C,  // ****......****.
-     0x0000F03C,  // ****......****.
-     0x00007878,  // .****....****..
-     0x00007878,  // .****....****..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006CD8,  // .**.**..**.**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006318,  // .**...**...**..
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5112,17 +5112,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5139,17 +5139,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00007038,  // .***......***..
-     0x00003870,  // ..***....***...
-     0x00003FF0,  // ..**********...
-     0x00000FC0,  // ....******.....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5166,17 +5166,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5193,22 +5193,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F7C0,  // ****.*****.....
-     0x0000FFF0,  // ************...
-     0x00003C70,  // ..****...***...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00003C70,  // ..****...***...
-     0x00003FF0,  // ..**********...
-     0x000037C0,  // ..**.*****.....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x0000FE00,  // *******........
-     0x0000FE00,  // *******........
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
   },
   {             // 225
      15, 24,
@@ -5220,17 +5220,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x0000381C,  // ..***......***.
-     0x00003FFC,  // ..************.
-     0x00000FF0,  // ....********...
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C0E,  // ..***......***.
+     0x00001FFE,  // ..************.
+     0x000007F8,  // ....********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5247,17 +5247,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00006318,  // .**...**...**..
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000FC0,  // ....******.....
-     0x00000FC0,  // ....******.....
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5274,49 +5274,49 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 228
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00001DB8,  // ...***.**.***..
-     0x00003FFC,  // ..************.
-     0x000073CE,  // .***..****..***
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x000073CE,  // .***..****..***
-     0x00003FFC,  // ..************.
-     0x00001DB8,  // ...***.**.***..
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x000007E0,  // .....******....
-     0x000007E0,  // .....******....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000EDC,  // ...***.**.***..
+     0x00001FFE,  // ..************.
+     0x000039E7,  // .***..****..***
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000039E7,  // .***..****..***
+     0x00001FFE,  // ..************.
+     0x00000EDC,  // ...***.**.***..
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000003F0,  // .....******....
+     0x000003F0,  // .....******....
   },
   {             // 229
      15, 24,
@@ -5328,17 +5328,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000780,  // .....****......
-     0x00000CC0,  // ....**..**.....
-     0x00001860,  // ...**....**....
-     0x00007CF8,  // .*****..*****..
-     0x00007CF8,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5355,19 +5355,19 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x0000FFFC,  // **************.
-     0x0000FFFC,  // **************.
-     0x0000000C,  // ............**.
-     0x0000000C,  // ............**.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007FFE,  // **************.
+     0x00007FFE,  // **************.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5382,17 +5382,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FCFC,  // ******..******.
-     0x0000FCFC,  // ******..******.
-     0x00003030,  // ..**......**...
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001FF0,  // ...*********...
-     0x00000FB0,  // ....*****.**...
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x000000FC,  // ........******.
-     0x000000FC,  // ........******.
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000007E,  // ........******.
+     0x0000007E,  // ........******.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5400,7 +5400,7 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
   },
   {             // 232
-     15, 24,
+     16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5409,17 +5409,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001F7BE,  // *****.****.*****
-     0x0001F7BE,  // *****.****.*****
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001FFFE,  // ****************
-     0x0001FFFE,  // ****************
+     0x0000FBDF,  // *****.****.*****
+     0x0000FBDF,  // *****.****.*****
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000FFFF,  // ****************
+     0x0000FFFF,  // ****************
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5427,7 +5427,7 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ................
   },
   {             // 233
-     15, 24,
+     16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5436,19 +5436,19 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001F7BE,  // *****.****.*****
-     0x0001F7BE,  // *****.****.*****
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x00006318,  // ..**...**...**..
-     0x0001FFFE,  // ****************
-     0x0001FFFE,  // ****************
-     0x00000006,  // ..............**
-     0x00000006,  // ..............**
+     0x0000FBDF,  // *****.****.*****
+     0x0000FBDF,  // *****.****.*****
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000FFFF,  // ****************
+     0x0000FFFF,  // ****************
+     0x00000003,  // ..............**
+     0x00000003,  // ..............**
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5463,17 +5463,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FF00,  // ********.......
-     0x0000FF00,  // ********.......
-     0x0000CC00,  // **..**.........
-     0x0000CC00,  // **..**.........
-     0x00000FF0,  // ....********...
-     0x00000FF8,  // ....*********..
-     0x00000C1C,  // ....**.....***.
-     0x00000C0C,  // ....**......**.
-     0x00000C1C,  // ....**.....***.
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
+     0x00007F80,  // ********.......
+     0x00007F80,  // ********.......
+     0x00006600,  // **..**.........
+     0x00006600,  // **..**.........
+     0x000007F8,  // ....********...
+     0x000007FC,  // ....*********..
+     0x0000060E,  // ....**.....***.
+     0x00000606,  // ....**......**.
+     0x0000060E,  // ....**.....***.
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5490,17 +5490,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F83E,  // *****.....*****
-     0x0000F83E,  // *****.....*****
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x00007F0C,  // .*******....**.
-     0x00007F8C,  // .********...**.
-     0x000061CC,  // .**....***..**.
-     0x000060CC,  // .**.....**..**.
-     0x000061CC,  // .**....***..**.
-     0x0000FFBE,  // *********.*****
-     0x0000FF3E,  // ********..*****
+     0x00007C1F,  // *****.....*****
+     0x00007C1F,  // *****.....*****
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003F86,  // .*******....**.
+     0x00003FC6,  // .********...**.
+     0x000030E6,  // .**....***..**.
+     0x00003066,  // .**.....**..**.
+     0x000030E6,  // .**....***..**.
+     0x00007FDF,  // *********.*****
+     0x00007F9F,  // ********..*****
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5517,17 +5517,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007E00,  // .******........
-     0x00007E00,  // .******........
-     0x00001800,  // ...**..........
-     0x00001800,  // ...**..........
-     0x00001FE0,  // ...********....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00007FF0,  // .***********...
-     0x00007FE0,  // .**********....
+     0x00003F00,  // .******........
+     0x00003F00,  // .******........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000FF0,  // ...********....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00003FF8,  // .***********...
+     0x00003FF0,  // .**********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5544,17 +5544,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000037E0,  // ..**.******....
-     0x00003FF8,  // ..***********..
-     0x00003C38,  // ..****....***..
-     0x0000381C,  // ..***......***.
-     0x000031FC,  // ..**...*******.
-     0x000001FC,  // .......*******.
-     0x0000000C,  // ............**.
-     0x0000001C,  // ...........***.
-     0x00007038,  // .***......***..
-     0x00007FF8,  // .************..
-     0x00001FE0,  // ...********....
+     0x00001BF0,  // ..**.******....
+     0x00001FFC,  // ..***********..
+     0x00001E1C,  // ..****....***..
+     0x00001C0E,  // ..***......***.
+     0x000018FE,  // ..**...*******.
+     0x000000FE,  // .......*******.
+     0x00000006,  // ............**.
+     0x0000000E,  // ...........***.
+     0x0000381C,  // .***......***..
+     0x00003FFC,  // .************..
+     0x00000FF0,  // ...********....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5571,17 +5571,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000F1F0,  // ****...*****...
-     0x0000F3F8,  // ****..*******..
-     0x0000671C,  // .**..***...***.
-     0x0000660C,  // .**..**.....**.
-     0x00007E0C,  // .******.....**.
-     0x00007E0C,  // .******.....**.
-     0x0000660C,  // .**..**.....**.
-     0x0000660C,  // .**..**.....**.
-     0x0000671C,  // .**..***...***.
-     0x0000F3F8,  // ****..*******..
-     0x0000F1F0,  // ****...*****...
+     0x000078F8,  // ****...*****...
+     0x000079FC,  // ****..*******..
+     0x0000338E,  // .**..***...***.
+     0x00003306,  // .**..**.....**.
+     0x00003F06,  // .******.....**.
+     0x00003F06,  // .******.....**.
+     0x00003306,  // .**..**.....**.
+     0x00003306,  // .**..**.....**.
+     0x0000338E,  // .**..***...***.
+     0x000079FC,  // ****..*******..
+     0x000078F8,  // ****...*****...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5598,17 +5598,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00007060,  // .***.....**....
-     0x00006060,  // .**......**....
-     0x00007060,  // .***.....**....
-     0x00003FE0,  // ..*********....
-     0x00001FE0,  // ...********....
-     0x00001C60,  // ...***...**....
-     0x00003860,  // ..***....**....
-     0x0000F1F8,  // ****...******..
-     0x0000F1F8,  // ****...******..
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003830,  // .***.....**....
+     0x00001FF0,  // ..*********....
+     0x00000FF0,  // ...********....
+     0x00000E30,  // ...***...**....
+     0x00001C30,  // ..***....**....
+     0x000078FC,  // ****...******..
+     0x000078FC,  // ****...******..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5616,26 +5616,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
   },
   {             // 240
-     15, 24,
+     16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001E1E0,  // ****....****....
-     0x0001E1E0,  // ****....****....
-     0x0000F0DC,  // .****....**.***.
-     0x0000F0FE,  // .****....*******
-     0x0000D8F6,  // .**.**...****.**
-     0x0000D8FE,  // .**.**...*******
-     0x0000CCDC,  // .**..**..**.***.
-     0x0000CCC0,  // .**..**..**.....
-     0x0000C6FE,  // .**...**.*******
-     0x0000C6FE,  // .**...**.*******
-     0x0000C3C0,  // .**....****.....
-     0x0000C3C0,  // .**....****.....
-     0x0000C1C0,  // .**.....***.....
-     0x0001E1C0,  // ****....***.....
-     0x0001E0C0,  // ****.....**.....
+     0x0000F0F0,  // ****....****....
+     0x0000F0F0,  // ****....****....
+     0x0000786E,  // .****....**.***.
+     0x0000787F,  // .****....*******
+     0x00006C7B,  // .**.**...****.**
+     0x00006C7F,  // .**.**...*******
+     0x0000666E,  // .**..**..**.***.
+     0x00006660,  // .**..**..**.....
+     0x0000637F,  // .**...**.*******
+     0x0000637F,  // .**...**.*******
+     0x000061E0,  // .**....****.....
+     0x000061E0,  // .**....****.....
+     0x000060E0,  // .**.....***.....
+     0x0000F0E0,  // ****....***.....
+     0x0000F060,  // ****.....**.....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5649,20 +5649,20 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
      0x00000000,  // ...............
-     0x00000FC0,  // ....******.....
-     0x00003FF0,  // ..**********...
-     0x00003870,  // ..***....***...
-     0x00007038,  // .***......***..
-     0x00006018,  // .**........**..
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
-     0x00007000,  // .***...........
-     0x00003838,  // ..***.....***..
-     0x00003FF8,  // ..***********..
-     0x00000FE0,  // ....*******....
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5733,17 +5733,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FD8,  // ....******.**..
-     0x00003FF8,  // ..***********..
-     0x00003878,  // ..***....****..
-     0x00007038,  // .***......***..
-     0x00007F18,  // .*******...**..
-     0x00007F00,  // .*******.......
-     0x00006000,  // .**............
-     0x00007000,  // .***...........
-     0x0000381C,  // ..***......***.
-     0x00003FFC,  // ..************.
-     0x00000FF0,  // ....********...
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x00003F8C,  // .*******...**..
+     0x00003F80,  // .*******.......
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C0E,  // ..***......***.
+     0x00001FFE,  // ..************.
+     0x000007F8,  // ....********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5760,17 +5760,17 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FB0,  // ....*****.**...
-     0x00001FF0,  // ...*********...
-     0x00003870,  // ..***....***...
-     0x00003830,  // ..***.....**...
-     0x00001F00,  // ...*****.......
-     0x000007C0,  // .....*****.....
-     0x000001F0,  // .......*****...
-     0x00003038,  // ..**......***..
-     0x00003838,  // ..***.....***..
-     0x00003FF0,  // ..**********...
-     0x000037E0,  // ..**.******....
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5782,22 +5782,22 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
-     0x00000700,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5811,20 +5811,20 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000018C0,  // ...**...**.....
-     0x000018C0,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
      0x00000000,  // ...............
-     0x00001F00,  // ...*****.......
-     0x00001F00,  // ...*****.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00003FF0,  // ..**********...
-     0x00003FF0,  // ..**********...
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5836,27 +5836,27 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FC0,  // ..********.....
-     0x00003FC0,  // ..********.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000000C0,  // ........**.....
-     0x000001C0,  // .......***.....
-     0x00003F80,  // ..*******......
-     0x00003F00,  // ..******.......
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
   },
   {             // 249
      0, 24,
@@ -5971,24 +5971,24 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007F0,  // .....*******...
-     0x00000FF0,  // ....********...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001C00,  // ...***.........
-     0x00003F00,  // ..******.......
-     0x000067C0,  // .**..*****.....
-     0x000061F0,  // .**....*****...
-     0x00007878,  // .****....****..
-     0x00003E18,  // ..*****....**..
-     0x00000F98,  // ....*****..**..
-     0x000003F8,  // ......*******..
-     0x000000F0,  // ........****...
-     0x00000060,  // .........**....
-     0x00003060,  // ..**.....**....
-     0x000030E0,  // ..**....***....
-     0x00003FC0,  // ..********.....
-     0x00003F80,  // ..*******......
+     0x000003F8,  // .....*******...
+     0x000007F8,  // ....********...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000E00,  // ...***.........
+     0x00001F80,  // ..******.......
+     0x000033E0,  // .**..*****.....
+     0x000030F8,  // .**....*****...
+     0x00003C3C,  // .****....****..
+     0x00001F0C,  // ..*****....**..
+     0x000007CC,  // ....*****..**..
+     0x000001FC,  // ......*******..
+     0x00000078,  // ........****...
+     0x00000030,  // .........**....
+     0x00001830,  // ..**.....**....
+     0x00001870,  // ..**....***....
+     0x00001FE0,  // ..********.....
+     0x00001FC0,  // ..*******......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5999,26 +5999,26 @@ cFont::tPixelData FontFix_iso8859_5[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000CC0,  // ....**..**.....
-     0x00000FC0,  // ....******.....
-     0x00000780,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
      0x00000000,  // ...............
-     0x0000F87C,  // *****....*****.
-     0x0000F87C,  // *****....*****.
-     0x00003030,  // ..**......**...
-     0x00003870,  // ..***....***...
-     0x00001860,  // ...**....**....
-     0x00001CE0,  // ...***..***....
-     0x00000CC0,  // ....**..**.....
-     0x00000DC0,  // ....**.***.....
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000300,  // ......**.......
-     0x00000700,  // .....***.......
-     0x00000600,  // .....**........
-     0x00000E00,  // ....***........
-     0x00007F00,  // .*******.......
-     0x00007F00,  // .*******.......
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
   },
   {             // 255
      0, 24,
diff --git a/fontfix-iso8859-7.c b/fontfix-iso8859-7.c
index 6a4e6dd94..5ba6da9ac 100644
--- a/fontfix-iso8859-7.c
+++ b/fontfix-iso8859-7.c
@@ -31,22 +31,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -58,12 +58,12 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000C8,  // .**..*..
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000064,  // .**..*..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -84,23 +84,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000308,  // ....**....*..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00000210,  // ....*....*...
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000420,  // ...*....*....
-     0x00000420,  // ...*....*....
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
-     0x00000C60,  // ..**...**....
-     0x00000840,  // ..*....*.....
-     0x00000840,  // ..*....*.....
-     0x000018C0,  // .**...**.....
+     0x00000184,  // ....**....*..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00000108,  // ....*....*...
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000210,  // ...*....*....
+     0x00000210,  // ...*....*....
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000630,  // ..**...**....
+     0x00000420,  // ..*....*.....
+     0x00000420,  // ..*....*.....
+     0x00000C60,  // .**...**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -110,26 +110,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
   {             // 36
      13, 24,
      0x00000000,  // .............
-     0x00000080,  // ......*......
-     0x000001C0,  // .....***.....
-     0x000007F0,  // ...*******...
-     0x00000CB8,  // ..**..*.***..
-     0x0000189C,  // .**...*..***.
-     0x00001880,  // .**...*......
-     0x00001880,  // .**...*......
-     0x00001C80,  // .***..*......
-     0x00000F80,  // ..*****......
-     0x000007E0,  // ...******....
-     0x000000F8,  // ......*****..
-     0x0000009C,  // ......*..***.
-     0x0000008C,  // ......*...**.
-     0x0000188C,  // .**...*...**.
-     0x0000188C,  // .**...*...**.
-     0x00001C9C,  // .***..*..***.
-     0x00000EB8,  // ..***.*.***..
-     0x000007F0,  // ...*******...
-     0x00000080,  // ......*......
-     0x00000080,  // ......*......
+     0x00000040,  // ......*......
+     0x000000E0,  // .....***.....
+     0x000003F8,  // ...*******...
+     0x0000065C,  // ..**..*.***..
+     0x00000C4E,  // .**...*..***.
+     0x00000C40,  // .**...*......
+     0x00000C40,  // .**...*......
+     0x00000E40,  // .***..*......
+     0x000007C0,  // ..*****......
+     0x000003F0,  // ...******....
+     0x0000007C,  // ......*****..
+     0x0000004E,  // ......*..***.
+     0x00000046,  // ......*...**.
+     0x00000C46,  // .**...*...**.
+     0x00000C46,  // .**...*...**.
+     0x00000E4E,  // .***..*..***.
+     0x0000075C,  // ..***.*.***..
+     0x000003F8,  // ...*******...
+     0x00000040,  // ......*......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -138,23 +138,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      20, 24,
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00038040,  // ...***........*.....
-     0x0006C0C0,  // ..**.**......**.....
-     0x000C6080,  // .**...**.....*......
-     0x000C6180,  // .**...**....**......
-     0x000C6100,  // .**...**....*.......
-     0x000C6300,  // .**...**...**.......
-     0x000E6200,  // .***..**...*........
-     0x0007C600,  // ..*****...**........
-     0x00000470,  // ..........*...***...
-     0x00000CF8,  // .........**..*****..
-     0x0000198C,  // ........**..**...**.
-     0x0000118C,  // ........*...**...**.
-     0x0000318C,  // .......**...**...**.
-     0x0000218C,  // .......*....**...**.
-     0x0000618C,  // ......**....**...**.
-     0x000040C8,  // ......*......**..*..
-     0x0000C0F8,  // .....**......*****..
+     0x0001C020,  // ...***........*.....
+     0x00036060,  // ..**.**......**.....
+     0x00063040,  // .**...**.....*......
+     0x000630C0,  // .**...**....**......
+     0x00063080,  // .**...**....*.......
+     0x00063180,  // .**...**...**.......
+     0x00073100,  // .***..**...*........
+     0x0003E300,  // ..*****...**........
+     0x00000238,  // ..........*...***...
+     0x0000067C,  // .........**..*****..
+     0x00000CC6,  // ........**..**...**.
+     0x000008C6,  // ........*...**...**.
+     0x000018C6,  // .......**...**...**.
+     0x000010C6,  // .......*....**...**.
+     0x000030C6,  // ......**....**...**.
+     0x00002064,  // ......*......**..*..
+     0x0000607C,  // .....**......*****..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -165,23 +165,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000CC0,  // ....**..**.....
-     0x00000F80,  // ....*****......
-     0x00000F00,  // ....****.......
-     0x00001F80,  // ...******......
-     0x00003180,  // ..**...**......
-     0x000071D8,  // .***...***.**..
-     0x000060F8,  // .**.....*****..
-     0x00006070,  // .**......***...
-     0x00006078,  // .**......****..
-     0x000030F8,  // ..**....*****..
-     0x00003FCC,  // ..********..**.
-     0x00000F80,  // ....*****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000FC0,  // ...******......
+     0x000018C0,  // ..**...**......
+     0x000038EC,  // .***...***.**..
+     0x0000307C,  // .**.....*****..
+     0x00003038,  // .**......***...
+     0x0000303C,  // .**......****..
+     0x0000187C,  // ..**....*****..
+     0x00001FE6,  // ..********..**.
+     0x000007C0,  // ....*****......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -193,12 +193,12 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -220,66 +220,66 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000010,  // ....*...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000040,  // ..*.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000008,  // .....*..
+     0x0000000C,  // ....**..
+     0x00000008,  // ....*...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
   },
   {             // 41
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000040,  // ..*.....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000008,  // .....*..
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x00000008,  // .....*..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000010,  // ....*...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000004,  // .....*..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000008,  // ....*...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
      0x00000000,  // ........
   },
   {             // 42
      9, 24,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x000000FC,  // ..******.
-     0x000000FC,  // ..******.
-     0x00000078,  // ...****..
-     0x0000004C,  // ...*..**.
-     0x00000048,  // ...*..*..
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x0000007E,  // ..******.
+     0x0000007E,  // ..******.
+     0x0000003C,  // ...****..
+     0x00000026,  // ...*..**.
+     0x00000024,  // ...*..*..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -304,16 +304,16 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -341,11 +341,11 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
-     0x00000004,  // ....*.
-     0x00000008,  // ...*..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000004,  // ...*..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -364,8 +364,8 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -396,8 +396,8 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -405,25 +405,25 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
   },
   {             // 47
-     6, 24,
+     7, 24,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000004,  // .....*.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000008,  // ....*..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000020,  // ..*....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000040,  // .*.....
-     0x00000040,  // .*.....
-     0x000000C0,  // **.....
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -436,22 +436,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C18,  // ..**.....**..
-     0x00000C38,  // ..**....***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000060C,  // ..**.....**..
+     0x0000061C,  // ..**....***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -463,22 +463,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x000000E0,  // ......***....
-     0x000003E0,  // ....*****....
-     0x00000760,  // ...***.**....
-     0x00000460,  // ...*...**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000070,  // ......***....
+     0x000001F0,  // ....*****....
+     0x000003B0,  // ...***.**....
+     0x00000230,  // ...*...**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -489,23 +489,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000700,  // ...***.......
-     0x00000C00,  // ..**.........
-     0x00000800,  // ..*..........
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000380,  // ...***.......
+     0x00000600,  // ..**.........
+     0x00000400,  // ..*..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -516,23 +516,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C78,  // ..**...****..
-     0x00000C38,  // ..**....***..
-     0x00000038,  // ........***..
-     0x00000038,  // ........***..
-     0x00000070,  // .......***...
-     0x000001E0,  // .....****....
-     0x000000F8,  // ......*****..
-     0x00000018,  // .........**..
-     0x0000001C,  // .........***.
-     0x0000001C,  // .........***.
-     0x0000081C,  // ..*......***.
-     0x00000C1C,  // ..**.....***.
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000063C,  // ..**...****..
+     0x0000061C,  // ..**....***..
+     0x0000001C,  // ........***..
+     0x0000001C,  // ........***..
+     0x00000038,  // .......***...
+     0x000000F0,  // .....****....
+     0x0000007C,  // ......*****..
+     0x0000000C,  // .........**..
+     0x0000000E,  // .........***.
+     0x0000000E,  // .........***.
+     0x0000040E,  // ..*......***.
+     0x0000060E,  // ..**.....***.
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -544,22 +544,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000070,  // .......***...
-     0x00000070,  // .......***...
-     0x000000F0,  // ......****...
-     0x000001B0,  // .....**.**...
-     0x000003B0,  // ....***.**...
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x000001D8,  // ....***.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -571,22 +571,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000007F8,  // ...********..
-     0x000007F8,  // ...********..
-     0x00000600,  // ...**........
-     0x00000400,  // ...*.........
-     0x00000C00,  // ..**.........
-     0x00000DE0,  // ..**.****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x00001C1C,  // .***.....***.
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x000003FC,  // ...********..
+     0x00000300,  // ...**........
+     0x00000200,  // ...*.........
+     0x00000600,  // ..**.........
+     0x000006F0,  // ..**.****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000E0E,  // .***.....***.
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -597,23 +597,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007F8,  // ...********..
-     0x00000E18,  // ..***....**..
-     0x00000C0C,  // ..**......**.
-     0x00000C00,  // ..**.........
-     0x00001800,  // .**..........
-     0x000019E0,  // .**..****....
-     0x00001BF8,  // .**.*******..
-     0x00001C18,  // .***.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000E18,  // ..***....**..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070C,  // ..***....**..
+     0x00000606,  // ..**......**.
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000CF0,  // .**..****....
+     0x00000DFC,  // .**.*******..
+     0x00000E0C,  // .***.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060E,  // ..**.....***.
+     0x0000070C,  // ..***....**..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -625,22 +625,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FF8,  // .**********..
-     0x00001FF8,  // .**********..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -651,23 +651,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000618,  // ...**....**..
-     0x000003F0,  // ....******...
-     0x000007F8,  // ...********..
-     0x00000E18,  // ..***....**..
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000618,  // ...**....**..
-     0x000007F8,  // ...********..
-     0x000001E0,  // .....****....
+     0x000000F0,  // .....****....
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000030C,  // ...**....**..
+     0x000001F8,  // ....******...
+     0x000003FC,  // ...********..
+     0x0000070C,  // ..***....**..
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000030C,  // ...**....**..
+     0x000003FC,  // ...********..
+     0x000000F0,  // .....****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -678,23 +678,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001C18,  // .***.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00001C1C,  // .***.....***.
-     0x00000E3C,  // ..***...****.
-     0x000007EC,  // ...******.**.
-     0x000003CC,  // ....****..**.
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003C0,  // ....****.....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000E0C,  // .***.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x00000E0E,  // .***.....***.
+     0x0000071E,  // ..***...****.
+     0x000003F6,  // ...******.**.
+     0x000001E6,  // ....****..**.
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001E0,  // ....****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -710,8 +710,8 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -720,8 +720,8 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -737,8 +737,8 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -747,11 +747,11 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
-     0x00000004,  // ....*.
-     0x00000008,  // ...*..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000004,  // ...*..
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -763,16 +763,16 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000000C,  // ..........**.
-     0x0000007C,  // .......*****.
-     0x000001F0,  // .....*****...
-     0x00000780,  // ...****......
-     0x00001E00,  // .****........
-     0x00001E00,  // .****........
-     0x00000780,  // ...****......
-     0x000001E0,  // .....****....
-     0x0000007C,  // .......*****.
-     0x0000000C,  // ..........**.
+     0x00000006,  // ..........**.
+     0x0000003E,  // .......*****.
+     0x000000F8,  // .....*****...
+     0x000003C0,  // ...****......
+     0x00000F00,  // .****........
+     0x00000F00,  // .****........
+     0x000003C0,  // ...****......
+     0x000000F0,  // .....****....
+     0x0000003E,  // .......*****.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -791,13 +791,13 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -817,16 +817,16 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001F00,  // .*****.......
-     0x000003C0,  // ....****.....
-     0x000000F0,  // ......****...
-     0x0000003C,  // ........****.
-     0x0000001C,  // .........***.
-     0x000000F8,  // ......*****..
-     0x000003C0,  // ....****.....
-     0x00001F00,  // .*****.......
-     0x00001C00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000F80,  // .*****.......
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000001E,  // ........****.
+     0x0000000E,  // .........***.
+     0x0000007C,  // ......*****..
+     0x000001E0,  // ....****.....
+     0x00000F80,  // .*****.......
+     0x00000E00,  // .***.........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -840,23 +840,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F8,  // ...********..
-     0x0000061C,  // ...**....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x0000001C,  // .........***.
-     0x00000038,  // ........***..
-     0x00000070,  // .......***...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x000000F0,  // .....****....
+     0x000003FC,  // ...********..
+     0x0000030E,  // ...**....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x0000000E,  // .........***.
+     0x0000001C,  // ........***..
+     0x00000038,  // .......***...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -867,77 +867,77 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      23, 24,
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x00007F00,  // .........*******.......
-     0x0003FFC0,  // ......************.....
-     0x000780E0,  // .....****.......***....
-     0x000E0030,  // ....***...........**...
-     0x001C0018,  // ...***.............**..
-     0x00187998,  // ...**....****..**..**..
-     0x0031CD8C,  // ..**...***..**.**...**.
-     0x0031870C,  // ..**...**....***....**.
-     0x0063030C,  // .**...**......**....**.
-     0x0066030C,  // .**..**.......**....**.
-     0x0066030C,  // .**..**.......**....**.
-     0x00660708,  // .**..**......***....*..
-     0x00660618,  // .**..**......**....**..
-     0x00660E30,  // .**..**.....***...**...
-     0x00631E70,  // .**...**...****..***...
-     0x0033FFE0,  // ..**..*************....
-     0x0030E78E,  // ..**....***..****...***
-     0x0018000C,  // ...**...............**.
-     0x001E0038,  // ...****...........***..
-     0x000780F0,  // .....****.......****...
-     0x0003FFC0,  // ......************.....
-     0x00007F00,  // .........*******.......
+     0x00003F80,  // .........*******.......
+     0x0001FFE0,  // ......************.....
+     0x0003C070,  // .....****.......***....
+     0x00070018,  // ....***...........**...
+     0x000E000C,  // ...***.............**..
+     0x000C3CCC,  // ...**....****..**..**..
+     0x0018E6C6,  // ..**...***..**.**...**.
+     0x0018C386,  // ..**...**....***....**.
+     0x00318186,  // .**...**......**....**.
+     0x00330186,  // .**..**.......**....**.
+     0x00330186,  // .**..**.......**....**.
+     0x00330384,  // .**..**......***....*..
+     0x0033030C,  // .**..**......**....**..
+     0x00330718,  // .**..**.....***...**...
+     0x00318F38,  // .**...**...****..***...
+     0x0019FFF0,  // ..**..*************....
+     0x001873C7,  // ..**....***..****...***
+     0x000C0006,  // ...**...............**.
+     0x000F001C,  // ...****...........***..
+     0x0003C078,  // .....****.......****...
+     0x0001FFE0,  // ......************.....
+     0x00003F80,  // .........*******.......
   },
   {             // 65
-     15, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D00,  // ......**.*.......
-     0x00000D80,  // ......**.**......
-     0x00001980,  // .....**..**......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x000030E0,  // ....**....***....
-     0x00003060,  // ....**.....**....
-     0x00007FE0,  // ...**********....
-     0x00007FF0,  // ...***********...
-     0x00006030,  // ...**.......**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001801C,  // .**..........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000680,  // ......**.*.......
+     0x000006C0,  // ......**.**......
+     0x00000CC0,  // .....**..**......
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00001870,  // ....**....***....
+     0x00001830,  // ....**.....**....
+     0x00003FF0,  // ...**********....
+     0x00003FF8,  // ...***********...
+     0x00003018,  // ...**.......**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000C00E,  // .**..........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 66
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x0000301C,  // ..**.......***.
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180E,  // ..**.......***.
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -948,23 +948,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      16, 24,
      0x00000000,  // ................
      0x00000000,  // ................
-     0x000007C0,  // ......*****.....
-     0x00001FF0,  // ....*********...
-     0x00003838,  // ...***.....***..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x0000C000,  // .**.............
-     0x0000C000,  // .**.............
-     0x0000C000,  // .**.............
-     0x0000C000,  // .**.............
-     0x0000C000,  // .**.............
-     0x0000C000,  // .**.............
-     0x0000E018,  // .***........**..
-     0x00006018,  // ..**........**..
-     0x00007018,  // ..***.......**..
-     0x00003830,  // ...***.....**...
-     0x00001FE0,  // ....********....
-     0x00000FC0,  // .....******.....
+     0x000003E0,  // ......*****.....
+     0x00000FF8,  // ....*********...
+     0x00001C1C,  // ...***.....***..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x00006000,  // .**.............
+     0x00006000,  // .**.............
+     0x00006000,  // .**.............
+     0x00006000,  // .**.............
+     0x00006000,  // .**.............
+     0x00006000,  // .**.............
+     0x0000700C,  // .***........**..
+     0x0000300C,  // ..**........**..
+     0x0000380C,  // ..***.......**..
+     0x00001C18,  // ...***.....**...
+     0x00000FF0,  // ....********....
+     0x000007E0,  // .....******.....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -976,22 +976,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FE0,  // ..**********....
-     0x00007FF0,  // ..***********...
-     0x00006038,  // ..**.......***..
-     0x0000601C,  // ..**........***.
-     0x0000600C,  // ..**.........**.
-     0x0000600E,  // ..**.........***
-     0x00006006,  // ..**..........**
-     0x00006006,  // ..**..........**
-     0x00006006,  // ..**..........**
-     0x00006006,  // ..**..........**
-     0x0000600E,  // ..**.........***
-     0x0000600C,  // ..**.........**.
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00007FF0,  // ..***********...
-     0x00007FC0,  // ..*********.....
+     0x00003FF0,  // ..**********....
+     0x00003FF8,  // ..***********...
+     0x0000301C,  // ..**.......***..
+     0x0000300E,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003007,  // ..**.........***
+     0x00003003,  // ..**..........**
+     0x00003003,  // ..**..........**
+     0x00003003,  // ..**..........**
+     0x00003003,  // ..**..........**
+     0x00003007,  // ..**.........***
+     0x00003006,  // ..**.........**.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003FF8,  // ..***********...
+     0x00003FE0,  // ..*********.....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1003,22 +1003,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FE0,  // ..*********....
-     0x00003FE0,  // ..*********....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FF0,  // ..*********....
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1030,22 +1030,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FF0,  // ..*********...
-     0x00001FF0,  // ..*********...
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FF8,  // ..*********...
+     0x00000FF8,  // ..*********...
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1056,23 +1056,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001FC0,  // ......*******.....
-     0x00007FF0,  // ....***********...
-     0x0000F070,  // ...****.....***...
-     0x0001C018,  // ..***.........**..
-     0x0001801C,  // ..**..........***.
-     0x00038000,  // .***..............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x000300FC,  // .**........******.
-     0x000380FC,  // .***.......******.
-     0x0001800C,  // ..**...........**.
-     0x0001C00C,  // ..***..........**.
-     0x0000E03C,  // ...***.......****.
-     0x00007FF0,  // ....***********...
-     0x00000FC0,  // .......******.....
+     0x00000FE0,  // ......*******.....
+     0x00003FF8,  // ....***********...
+     0x00007838,  // ...****.....***...
+     0x0000E00C,  // ..***.........**..
+     0x0000C00E,  // ..**..........***.
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x0001807E,  // .**........******.
+     0x0001C07E,  // .***.......******.
+     0x0000C006,  // ..**...........**.
+     0x0000E006,  // ..***..........**.
+     0x0000701E,  // ...***.......****.
+     0x00003FF8,  // ....***********...
+     0x000007E0,  // .......******.....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1084,22 +1084,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x00007FFC,  // ..*************.
-     0x00007FFC,  // ..*************.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003FFE,  // ..*************.
+     0x00003FFE,  // ..*************.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1111,22 +1111,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1138,22 +1138,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1165,22 +1165,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000301C,  // ..**.......***.
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003F80,  // ..*******......
-     0x00003DC0,  // ..****.***.....
-     0x000038C0,  // ..***...**.....
-     0x000030E0,  // ..**....***....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003038,  // ..**......***..
-     0x0000301C,  // ..**.......***.
-     0x0000300E,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C60,  // ..***...**.....
+     0x00001870,  // ..**....***....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180E,  // ..**.......***.
+     0x00001807,  // ..**........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1192,22 +1192,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1219,22 +1219,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000E01C,  // ..***........***.
-     0x0000F01C,  // ..****.......***.
-     0x0000F03C,  // ..****......****.
-     0x0000F83C,  // ..*****.....****.
-     0x0000D86C,  // ..**.**....**.**.
-     0x0000DC6C,  // ..**.***...**.**.
-     0x0000CCCC,  // ..**..**..**..**.
-     0x0000CCCC,  // ..**..**..**..**.
-     0x0000C78C,  // ..**...****...**.
-     0x0000C78C,  // ..**...****...**.
-     0x0000C30C,  // ..**....**....**.
-     0x0000C30C,  // ..**....**....**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
+     0x0000700E,  // ..***........***.
+     0x0000780E,  // ..****.......***.
+     0x0000781E,  // ..****......****.
+     0x00007C1E,  // ..*****.....****.
+     0x00006C36,  // ..**.**....**.**.
+     0x00006E36,  // ..**.***...**.**.
+     0x00006666,  // ..**..**..**..**.
+     0x00006666,  // ..**..**..**..**.
+     0x000063C6,  // ..**...****...**.
+     0x000063C6,  // ..**...****...**.
+     0x00006186,  // ..**....**....**.
+     0x00006186,  // ..**....**....**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1246,22 +1246,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000600C,  // ..**.........**.
-     0x0000700C,  // ..***........**.
-     0x0000780C,  // ..****.......**.
-     0x00007C0C,  // ..*****......**.
-     0x00006C0C,  // ..**.**......**.
-     0x00006E0C,  // ..**.***.....**.
-     0x0000670C,  // ..**..***....**.
-     0x0000630C,  // ..**...**....**.
-     0x0000618C,  // ..**....**...**.
-     0x000061CC,  // ..**....***..**.
-     0x000060CC,  // ..**.....**..**.
-     0x0000606C,  // ..**......**.**.
-     0x0000607C,  // ..**......*****.
-     0x0000603C,  // ..**.......****.
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003806,  // ..***........**.
+     0x00003C06,  // ..****.......**.
+     0x00003E06,  // ..*****......**.
+     0x00003606,  // ..**.**......**.
+     0x00003706,  // ..**.***.....**.
+     0x00003386,  // ..**..***....**.
+     0x00003186,  // ..**...**....**.
+     0x000030C6,  // ..**....**...**.
+     0x000030E6,  // ..**....***..**.
+     0x00003066,  // ..**.....**..**.
+     0x00003036,  // ..**......**.**.
+     0x0000303E,  // ..**......*****.
+     0x0000301E,  // ..**.......****.
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1272,23 +1272,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003001C,  // .**...........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003001C,  // .**...........***.
-     0x0003001C,  // .**...........***.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x0001800E,  // .**...........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0001800E,  // .**...........***.
+     0x0001800E,  // .**...........***.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1300,22 +1300,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FFC,  // ..************.
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x00003006,  // ..**.........**
-     0x0000300E,  // ..**........***
-     0x0000301E,  // ..**.......****
-     0x00003FFC,  // ..************.
-     0x00003FF0,  // ..**********...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001FF8,  // ..**********...
+     0x00001FFE,  // ..************.
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x00001803,  // ..**.........**
+     0x00001807,  // ..**........***
+     0x0000180F,  // ..**.......****
+     0x00001FFE,  // ..************.
+     0x00001FF8,  // ..**********...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1326,24 +1326,24 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003001C,  // .**...........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003001C,  // .**...........***.
-     0x00018318,  // ..**.....**...**..
-     0x0001C3B8,  // ..***....***.***..
-     0x0000E0F0,  // ...***.....****...
-     0x00007FF0,  // ....***********...
-     0x00001F9C,  // ......******..***.
-     0x00000008,  // ...............*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001800E,  // .**...........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0001800E,  // .**...........***.
+     0x0000C18C,  // ..**.....**...**..
+     0x0000E1DC,  // ..***....***.***..
+     0x00007078,  // ...***.....****...
+     0x00003FF8,  // ....***********...
+     0x00000FCE,  // ......******..***.
+     0x00000004,  // ...............*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1354,22 +1354,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FF0,  // ..***********...
-     0x00007FF8,  // ..************..
-     0x0000601C,  // ..**........***.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000601C,  // ..**........***.
-     0x00007FF8,  // ..************..
-     0x00007FE0,  // ..**********....
-     0x000060C0,  // ..**.....**.....
-     0x000060E0,  // ..**.....***....
-     0x00006060,  // ..**......**....
-     0x00006070,  // ..**......***...
-     0x00006030,  // ..**.......**...
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x0000600C,  // ..**.........**.
+     0x00003FF8,  // ..***********...
+     0x00003FFC,  // ..************..
+     0x0000300E,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x0000300E,  // ..**........***.
+     0x00003FFC,  // ..************..
+     0x00003FF0,  // ..**********....
+     0x00003060,  // ..**.....**.....
+     0x00003070,  // ..**.....***....
+     0x00003030,  // ..**......**....
+     0x00003038,  // ..**......***...
+     0x00003018,  // ..**.......**...
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x00003006,  // ..**.........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1380,23 +1380,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007E0,  // .....******....
-     0x00001FF8,  // ...**********..
-     0x00001838,  // ...**.....***..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003000,  // ..**...........
-     0x00003C00,  // ..****.........
-     0x00001FC0,  // ...*******.....
-     0x000007F0,  // .....*******...
-     0x00000078,  // .........****..
-     0x0000000C,  // ............**.
-     0x0000300C,  // ..**........**.
-     0x00003004,  // ..**.........*.
-     0x0000380C,  // ..***.......**.
-     0x00001C18,  // ...***.....**..
-     0x00000FF8,  // ....*********..
-     0x000007E0,  // .....******....
+     0x000003F0,  // .....******....
+     0x00000FFC,  // ...**********..
+     0x00000C1C,  // ...**.....***..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001800,  // ..**...........
+     0x00001E00,  // ..****.........
+     0x00000FE0,  // ...*******.....
+     0x000003F8,  // .....*******...
+     0x0000003C,  // .........****..
+     0x00000006,  // ............**.
+     0x00001806,  // ..**........**.
+     0x00001802,  // ..**.........*.
+     0x00001C06,  // ..***.......**.
+     0x00000E0C,  // ...***.....**..
+     0x000007FC,  // ....*********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1408,22 +1408,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1435,22 +1435,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000701C,  // ..***.......***.
-     0x00003838,  // ...***.....***..
-     0x00001FF0,  // ....*********...
-     0x00000FE0,  // .....*******....
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x0000380E,  // ..***.......***.
+     0x00001C1C,  // ...***.....***..
+     0x00000FF8,  // ....*********...
+     0x000007F0,  // .....*******....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1462,22 +1462,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000E006,  // ***..........**
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x00007018,  // .***.......**..
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00001820,  // ...**.....*....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x000006C0,  // .....**.**.....
-     0x000006C0,  // .....**.**.....
-     0x000006C0,  // .....**.**.....
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
+     0x00007003,  // ***..........**
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380C,  // .***.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000C10,  // ...**.....*....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x00000360,  // .....**.**.....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1485,26 +1485,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
   },
   {             // 87
-     21, 24,
+     22, 24,
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
-     0x0070380C,  // ***......***.......**.
-     0x0030381C,  // .**......***......***.
-     0x00303C18,  // .**......****.....**..
-     0x00306C18,  // .**.....**.**.....**..
-     0x00386C18,  // .***....**.**.....**..
-     0x00186638,  // ..**....**..**...***..
-     0x00184630,  // ..**....*...**...**...
-     0x0018C630,  // ..**...**...**...**...
-     0x0008C630,  // ...*...**...**...**...
-     0x000CC360,  // ...**..**....**.**....
-     0x000D8360,  // ...**.**.....**.**....
-     0x000D8360,  // ...**.**.....**.**....
-     0x00058160,  // ....*.**......*.**....
-     0x00070140,  // ....***.......*.*.....
-     0x000701C0,  // ....***.......***.....
-     0x000701C0,  // ....***.......***.....
+     0x00381C06,  // ***......***.......**.
+     0x00181C0E,  // .**......***......***.
+     0x00181E0C,  // .**......****.....**..
+     0x0018360C,  // .**.....**.**.....**..
+     0x001C360C,  // .***....**.**.....**..
+     0x000C331C,  // ..**....**..**...***..
+     0x000C2318,  // ..**....*...**...**...
+     0x000C6318,  // ..**...**...**...**...
+     0x00046318,  // ...*...**...**...**...
+     0x000661B0,  // ...**..**....**.**....
+     0x0006C1B0,  // ...**.**.....**.**....
+     0x0006C1B0,  // ...**.**.....**.**....
+     0x0002C0B0,  // ....*.**......*.**....
+     0x000380A0,  // ....***.......*.*.....
+     0x000380E0,  // ....***.......***.....
+     0x000380E0,  // ....***.......***.....
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
@@ -1516,22 +1516,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000700C,  // .***........**.
-     0x00003818,  // ..***......**..
-     0x00001838,  // ...**.....***..
-     0x00001C70,  // ...***...***...
-     0x00000E60,  // ....***..**....
-     0x000006C0,  // .....**.**.....
-     0x000007C0,  // .....*****.....
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x000006C0,  // .....**.**.....
-     0x00000EE0,  // ....***.***....
-     0x00001C70,  // ...***...***...
-     0x00001830,  // ...**.....**...
-     0x00003838,  // ..***.....***..
-     0x0000701C,  // .***.......***.
-     0x0000E00E,  // ***.........***
+     0x00003806,  // .***........**.
+     0x00001C0C,  // ..***......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E38,  // ...***...***...
+     0x00000730,  // ....***..**....
+     0x00000360,  // .....**.**.....
+     0x000003E0,  // .....*****.....
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000360,  // .....**.**.....
+     0x00000770,  // ....***.***....
+     0x00000E38,  // ...***...***...
+     0x00000C18,  // ...**.....**...
+     0x00001C1C,  // ..***.....***..
+     0x0000380E,  // .***.......***.
+     0x00007007,  // ***.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1539,53 +1539,53 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
   },
   {             // 89
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000E00C,  // .***.........**.
-     0x00006018,  // ..**........**..
-     0x00007038,  // ..***......***..
-     0x00003830,  // ...***.....**...
-     0x00001860,  // ....**....**....
-     0x00000CE0,  // .....**..***....
-     0x00000EC0,  // .....***.**.....
-     0x00000780,  // ......****......
-     0x00000380,  // .......***......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007006,  // .***.........**.
+     0x0000300C,  // ..**........**..
+     0x0000381C,  // ..***......***..
+     0x00001C18,  // ...***.....**...
+     0x00000C30,  // ....**....**....
+     0x00000670,  // .....**..***....
+     0x00000760,  // .....***.**.....
+     0x000003C0,  // ......****......
+     0x000001C0,  // .......***......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
   {             // 90
      14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000018,  // ..........**..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00003000,  // .**...........
-     0x00007FFC,  // *************.
-     0x00007FFC,  // *************.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00001800,  // .**...........
+     0x00003FFE,  // *************.
+     0x00003FFE,  // *************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1593,54 +1593,54 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
   },
   {             // 91
-     6, 24,
+     7, 24,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000003C,  // ..****.
-     0x0000003C,  // ..****.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003C,  // ..****.
-     0x0000003C,  // ..****.
+     0x0000001E,  // ..****.
+     0x0000001E,  // ..****.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000001E,  // ..****.
+     0x0000001E,  // ..****.
      0x00000000,  // .......
   },
   {             // 92
-     6, 24,
+     7, 24,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x00000040,  // .*.....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000020,  // ..*....
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000010,  // ...*...
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000004,  // .....*.
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000008,  // ...*...
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1651,41 +1651,41 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
      0x00000000,  // ......
   },
   {             // 94
      11, 24,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000000E0,  // ....***....
-     0x000001E0,  // ...****....
-     0x000001B0,  // ...**.**...
-     0x00000330,  // ..**..**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000618,  // .**....**..
-     0x0000060C,  // .**.....**.
+     0x00000060,  // ....**.....
+     0x00000070,  // ....***....
+     0x000000F0,  // ...****....
+     0x000000D8,  // ...**.**...
+     0x00000198,  // ..**..**...
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x0000030C,  // .**....**..
+     0x00000306,  // .**.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1701,40 +1701,40 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
   },
   {             // 95
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 24,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFF,  // .*************
      0x00000000,  // ..............
-     0x00003FFE,  // .*************
-     0x00000000,  // .............
   },
   {             // 96
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000E0,  // .***....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -1763,18 +1763,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000007E0,  // ...******....
-     0x00000FF0,  // ..********...
-     0x00001C18,  // .***.....**..
-     0x00000818,  // ..*......**..
-     0x00000038,  // ........***..
-     0x000007F8,  // ...********..
-     0x00000F18,  // ..****...**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00000FF8,  // ..*********..
-     0x00000798,  // ...****..**..
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x00000E0C,  // .***.....**..
+     0x0000040C,  // ..*......**..
+     0x0000001C,  // ........***..
+     0x000003FC,  // ...********..
+     0x0000078C,  // ..****...**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x000007FC,  // ..*********..
+     0x000003CC,  // ...****..**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1786,22 +1786,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF0,  // .*********...
-     0x00001C18,  // .***.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001C38,  // .***....***..
-     0x00001FF0,  // .*********...
-     0x000019E0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FF8,  // .*********...
+     0x00000E0C,  // .***.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000E1C,  // .***....***..
+     0x00000FF8,  // .*********...
+     0x00000CF0,  // .**..****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1809,7 +1809,7 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
   },
   {             // 99
-     11, 24,
+     12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1817,18 +1817,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C08,  // .**......*..
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000003F8,  // ...*******..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000001FC,  // ...*******..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000604,  // .**......*..
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000001FC,  // ...*******..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1840,22 +1840,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001C18,  // .***.....**..
-     0x00000C38,  // ..**....***..
-     0x000007F8,  // ...********..
-     0x000003D8,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000E0C,  // .***.....**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1871,18 +1871,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C18,  // ..**.....**..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001818,  // .**......**..
-     0x00000C18,  // ..**.....**..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000060C,  // ..**.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1890,26 +1890,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
   },
   {             // 102
-     6, 24,
+     7, 24,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000000C,  // ....**.
-     0x0000001C,  // ...***.
-     0x00000038,  // ..***..
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x000000FC,  // ******.
-     0x000000FC,  // ******.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000006,  // ....**.
+     0x0000000E,  // ...***.
+     0x0000001C,  // ..***..
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000007E,  // ******.
+     0x0000007E,  // ******.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1925,45 +1925,45 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003EC,  // ....*****.**.
-     0x0000077C,  // ...***.*****.
-     0x00000C1C,  // ..**.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C1C,  // ..**.....***.
-     0x000007FC,  // ...*********.
-     0x000003CC,  // ....****..**.
-     0x0000000C,  // ..........**.
-     0x0000181C,  // .**......***.
-     0x00001C18,  // .***.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F6,  // ....*****.**.
+     0x000003BE,  // ...***.*****.
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060E,  // ..**.....***.
+     0x000003FE,  // ...*********.
+     0x000001E6,  // ....****..**.
+     0x00000006,  // ..........**.
+     0x00000C0E,  // .**......***.
+     0x00000E0C,  // .***.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
   },
   {             // 104
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x000019F0,  // .**..*****...
-     0x00001FF8,  // .**********..
-     0x00001C1C,  // .***.....***.
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000CF8,  // .**..*****...
+     0x00000FFC,  // .**********..
+     0x00000E0E,  // .***.....***.
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1975,22 +1975,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1998,53 +1998,53 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .....
   },
   {             // 106
-     5, 24,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x00000038,  // .***..
+     6, 24,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001C,  // .***..
   },
   {             // 107
      11, 24,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x0000060C,  // .**.....**.
-     0x00000618,  // .**....**..
-     0x00000630,  // .**...**...
-     0x00000660,  // .**..**....
-     0x000006C0,  // .**.**.....
-     0x000007C0,  // .*****.....
-     0x00000760,  // .***.**....
-     0x00000670,  // .**..***...
-     0x00000630,  // .**...**...
-     0x00000618,  // .**....**..
-     0x0000061C,  // .**....***.
-     0x0000060C,  // .**.....**.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000306,  // .**.....**.
+     0x0000030C,  // .**....**..
+     0x00000318,  // .**...**...
+     0x00000330,  // .**..**....
+     0x00000360,  // .**.**.....
+     0x000003E0,  // .*****.....
+     0x000003B0,  // .***.**....
+     0x00000338,  // .**..***...
+     0x00000318,  // .**...**...
+     0x0000030C,  // .**....**..
+     0x0000030E,  // .**....***.
+     0x00000306,  // .**.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2056,22 +2056,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2087,18 +2087,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x000678F0,  // .**..****...****...
-     0x0007DDF8,  // .*****.***.******..
-     0x00070F0C,  // .***....****....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
-     0x0006060C,  // .**......**.....**.
+     0x00033C78,  // .**..****...****...
+     0x0003EEFC,  // .*****.***.******..
+     0x00038786,  // .***....****....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
+     0x00030306,  // .**......**.....**.
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -2114,18 +2114,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000019E0,  // .**..****....
-     0x00001FF0,  // .*********...
-     0x00001C38,  // .***....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
+     0x00000CF0,  // .**..****....
+     0x00000FF8,  // .*********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2141,18 +2141,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C18,  // ..**.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C38,  // ..**....***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000060C,  // ..**.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000061C,  // ..**....***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2168,22 +2168,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001BE0,  // .**.*****....
-     0x00001E30,  // .****...**...
-     0x00001C18,  // .***.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001C38,  // .***....***..
-     0x00001FF0,  // .*********...
-     0x00001BE0,  // .**.*****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000F18,  // .****...**...
+     0x00000E0C,  // .***.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000E1C,  // .***....***..
+     0x00000FF8,  // .*********...
+     0x00000DF0,  // .**.*****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
      0x00000000,  // .............
   },
   {             // 113
@@ -2195,22 +2195,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000E78,  // ..***..****..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001C18,  // .***.....**..
-     0x00000C38,  // ..**....***..
-     0x000007F8,  // ...********..
-     0x000003D8,  // ....****.**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x0000073C,  // ..***..****..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000E0C,  // .***.....**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
      0x00000000,  // .............
   },
   {             // 114
@@ -2222,18 +2222,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000DC,  // .**.***.
-     0x000000FC,  // .******.
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
+     0x0000006E,  // .**.***.
+     0x0000007E,  // .******.
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -2249,18 +2249,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x000003FC,  // ..********.
-     0x0000060E,  // .**.....***
-     0x00000600,  // .**........
-     0x00000780,  // .****......
-     0x000003F8,  // ..*******..
-     0x0000007C,  // .....*****.
-     0x00000006,  // .........**
-     0x00000606,  // .**......**
-     0x00000706,  // .***.....**
-     0x000003FC,  // ..********.
-     0x000001F8,  // ...******..
+     0x000000FC,  // ...******..
+     0x000001FE,  // ..********.
+     0x00000307,  // .**.....***
+     0x00000300,  // .**........
+     0x000003C0,  // .****......
+     0x000001FC,  // ..*******..
+     0x0000003E,  // .....*****.
+     0x00000003,  // .........**
+     0x00000303,  // .**......**
+     0x00000383,  // .***.....**
+     0x000001FE,  // ..********.
+     0x000000FC,  // ...******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2268,26 +2268,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
   },
   {             // 116
-     6, 24,
+     7, 24,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000007C,  // .*****.
-     0x0000007C,  // .*****.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003C,  // ..****.
-     0x0000001C,  // ...***.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000003E,  // .*****.
+     0x0000003E,  // .*****.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000001E,  // ..****.
+     0x0000000E,  // ...***.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -2303,18 +2303,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001C38,  // .***....***..
-     0x00000FF8,  // ..*********..
-     0x00000798,  // ...****..**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007FC,  // ..*********..
+     0x000003CC,  // ...****..**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2322,7 +2322,7 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
   },
   {             // 118
-     11, 24,
+     12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2330,18 +2330,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000000C0,  // .....**.....
+     0x00000E06,  // ***......**.
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2349,7 +2349,7 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
   },
   {             // 119
-     16, 24,
+     17, 24,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -2357,18 +2357,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0003060C,  // **.....**.....**.
-     0x0001870C,  // .**....***....**.
-     0x00018F18,  // .**...****...**..
-     0x00018F18,  // .**...****...**..
-     0x00018F18,  // .**...****...**..
-     0x0000C990,  // ..**..*..**..*...
-     0x0000D9B0,  // ..**.**..**.**...
-     0x0000D9B0,  // ..**.**..**.**...
-     0x000059B0,  // ...*.**..**.**...
-     0x000070E0,  // ...***....***....
-     0x000070E0,  // ...***....***....
-     0x000030E0,  // ....**....***....
+     0x00018306,  // **.....**.....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C78C,  // .**...****...**..
+     0x0000C78C,  // .**...****...**..
+     0x0000C78C,  // .**...****...**..
+     0x000064C8,  // ..**..*..**..*...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00002CD8,  // ...*.**..**.**...
+     0x00003870,  // ...***....***....
+     0x00003870,  // ...***....***....
+     0x00001870,  // ....**....***....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -2376,7 +2376,7 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
   },
   {             // 120
-     11, 24,
+     12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2384,18 +2384,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C18,  // .**.....**..
-     0x00000638,  // ..**...***..
-     0x00000730,  // ..***..**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000360,  // ...**.**....
-     0x00000370,  // ...**.***...
-     0x00000630,  // ..**...**...
-     0x00000E18,  // .***....**..
-     0x00001C1C,  // ***.....***.
+     0x0000060C,  // .**.....**..
+     0x0000031C,  // ..**...***..
+     0x00000398,  // ..***..**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001B0,  // ...**.**....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x0000070C,  // .***....**..
+     0x00000E0E,  // ***.....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2403,7 +2403,7 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
   },
   {             // 121
-     11, 24,
+     12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2411,23 +2411,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 122
      11, 24,
@@ -2438,18 +2438,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000FFC,  // **********.
-     0x00000FFC,  // **********.
-     0x00000018,  // .......**..
-     0x00000038,  // ......***..
-     0x00000070,  // .....***...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000300,  // ..**.......
-     0x00000700,  // .***.......
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
+     0x000007FE,  // **********.
+     0x000007FE,  // **********.
+     0x0000000C,  // .......**..
+     0x0000001C,  // ......***..
+     0x00000038,  // .....***...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x00000180,  // ..**.......
+     0x00000380,  // .***.......
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2460,82 +2460,82 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x0000003C,  // ...****.
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x0000001C,  // ....***.
-     0x0000000C,  // .....**.
+     0x0000000E,  // ....***.
+     0x0000001E,  // ...****.
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000E,  // ....***.
+     0x00000006,  // .....**.
   },
   {             // 124
      6, 24,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
   },
   {             // 125
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000E0,  // .***....
-     0x000000F0,  // .****...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
+     0x00000070,  // .***....
+     0x00000078,  // .****...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
   },
   {             // 126
      13, 24,
@@ -2549,9 +2549,9 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FC4,  // .*******...*.
-     0x00001FFC,  // .***********.
-     0x00001078,  // .*.....****..
+     0x00000FE2,  // .*******...*.
+     0x00000FFE,  // .***********.
+     0x0000083C,  // .*.....****..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3491,72 +3491,72 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000010,  // ....*...
-     0x00000010,  // ....*...
-     0x00000010,  // ....*...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000008,  // ....*...
+     0x00000008,  // ....*...
+     0x00000008,  // ....*...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
   },
   {             // 162
-     15, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006700,  // ...**..***.......
-     0x0000C700,  // ..**...***.......
-     0x0000CD00,  // ..**..**.*.......
-     0x00000D80,  // ......**.**......
-     0x00001980,  // .....**..**......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x000030E0,  // ....**....***....
-     0x00003060,  // ....**.....**....
-     0x00007FE0,  // ...**********....
-     0x00007FF0,  // ...***********...
-     0x00006030,  // ...**.......**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001801C,  // .**..........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003380,  // ...**..***.......
+     0x00006380,  // ..**...***.......
+     0x00006680,  // ..**..**.*.......
+     0x000006C0,  // ......**.**......
+     0x00000CC0,  // .....**..**......
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00001870,  // ....**....***....
+     0x00001830,  // ....**.....**....
+     0x00003FF0,  // ...**********....
+     0x00003FF8,  // ...***********...
+     0x00003018,  // ...**.......**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000C00E,  // .**..........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 163
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000003F0,  // ....******...
-     0x00000618,  // ...**....**..
-     0x00000418,  // ...*.....**..
-     0x00000C08,  // ..**......*..
-     0x00000C00,  // ..**.........
-     0x00000400,  // ...*.........
-     0x00000400,  // ...*.........
-     0x00001FC0,  // .*******.....
-     0x00001FC0,  // .*******.....
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000400,  // ...*.........
-     0x00000C00,  // ..**.........
-     0x00000F80,  // ..*****......
-     0x00001FFC,  // .***********.
-     0x00000878,  // ..*....****..
+     0x000000F0,  // .....****....
+     0x000001F8,  // ....******...
+     0x0000030C,  // ...**....**..
+     0x0000020C,  // ...*.....**..
+     0x00000604,  // ..**......*..
+     0x00000600,  // ..**.........
+     0x00000200,  // ...*.........
+     0x00000200,  // ...*.........
+     0x00000FE0,  // .*******.....
+     0x00000FE0,  // .*******.....
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000200,  // ...*.........
+     0x00000600,  // ..**.........
+     0x000007C0,  // ..*****......
+     0x00000FFE,  // .***********.
+     0x0000043C,  // ..*....****..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3570,18 +3570,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000808,  // ..*.......*..
-     0x00001DFC,  // .***.*******.
-     0x00000FF8,  // ..*********..
-     0x00000630,  // ...**...**...
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
-     0x00000FF8,  // ..*********..
-     0x00001DCC,  // .***.***..**.
-     0x00000808,  // ..*.......*..
+     0x00000404,  // ..*.......*..
+     0x00000EFE,  // .***.*******.
+     0x000007FC,  // ..*********..
+     0x00000318,  // ...**...**...
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000318,  // ...**...**...
+     0x000007FC,  // ..*********..
+     0x00000EE6,  // .***.***..**.
+     0x00000404,  // ..*.......*..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3591,26 +3591,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
   },
   {             // 165
-     13, 24,
+     14, 24,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001806,  // .**........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C1C,  // ..**.....***..
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3621,63 +3621,63 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      6, 24,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
   },
   {             // 167
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x00000C18,  // ..**.....**..
-     0x00000C00,  // ..**.........
-     0x00000600,  // ...**........
-     0x00000780,  // ...****......
-     0x00000DE0,  // ..**.****....
-     0x00001870,  // .**....***...
-     0x00001838,  // .**.....***..
-     0x0000181C,  // .**......***.
-     0x00000C0C,  // ..**......**.
-     0x0000070C,  // ...***....**.
-     0x00000398,  // ....***..**..
-     0x000001F0,  // .....*****...
-     0x00000070,  // .......***...
-     0x00000038,  // ........***..
-     0x00000418,  // ...*.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000638,  // ...**...***..
-     0x000007F0,  // ...*******...
-     0x000001E0,  // .....****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x0000060C,  // ..**.....**..
+     0x00000600,  // ..**.........
+     0x00000300,  // ...**........
+     0x000003C0,  // ...****......
+     0x000006F0,  // ..**.****....
+     0x00000C38,  // .**....***...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000606,  // ..**......**.
+     0x00000386,  // ...***....**.
+     0x000001CC,  // ....***..**..
+     0x000000F8,  // .....*****...
+     0x00000038,  // .......***...
+     0x0000001C,  // ........***..
+     0x0000020C,  // ...*.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000031C,  // ...**...***..
+     0x000003F8,  // ...*******...
+     0x000000F0,  // .....****....
   },
   {             // 168
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -3702,23 +3702,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      17, 24,
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000F80,  // ......*****......
-     0x00003FE0,  // ....*********....
-     0x00006030,  // ...**.......**...
-     0x0000C018,  // ..**.........**..
-     0x00018F8C,  // .**...*****...**.
-     0x00019CC4,  // .**..***..**...*.
-     0x00033846,  // **..***....*...**
-     0x00033006,  // **..**.........**
-     0x00033002,  // **..**..........*
-     0x00033002,  // **..**..........*
-     0x00033006,  // **..**.........**
-     0x00019064,  // .**..*.....**..*.
-     0x000198C4,  // .**..**...**...*.
-     0x0000CF88,  // ..**..*****...*..
-     0x0000E018,  // ..***........**..
-     0x00007070,  // ...***.....***...
-     0x00001FC0,  // .....*******.....
+     0x000007C0,  // ......*****......
+     0x00001FF0,  // ....*********....
+     0x00003018,  // ...**.......**...
+     0x0000600C,  // ..**.........**..
+     0x0000C7C6,  // .**...*****...**.
+     0x0000CE62,  // .**..***..**...*.
+     0x00019C23,  // **..***....*...**
+     0x00019803,  // **..**.........**
+     0x00019801,  // **..**..........*
+     0x00019801,  // **..**..........*
+     0x00019803,  // **..**.........**
+     0x0000C832,  // .**..*.....**..*.
+     0x0000CC62,  // .**..**...**...*.
+     0x000067C4,  // ..**..*****...*..
+     0x0000700C,  // ..***........**..
+     0x00003838,  // ...***.....***...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -3726,18 +3726,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
   },
   {             // 170
-     8, 24,
+     9, 24,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x0000000C,  // ......**.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000000F4,  // ..****.*.
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x00000006,  // ......**.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x0000007A,  // ..****.*.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3762,16 +3762,16 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000118,  // .....*...**..
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000660,  // ...**..**....
-     0x00000CC0,  // ..**..**.....
-     0x00000CC0,  // ..**..**.....
-     0x00000C60,  // ..**...**....
-     0x00000660,  // ...**..**....
-     0x00000330,  // ....**..**...
-     0x00000310,  // ....**...*...
+     0x0000008C,  // .....*...**..
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000330,  // ...**..**....
+     0x00000660,  // ..**..**.....
+     0x00000660,  // ..**..**.....
+     0x00000630,  // ..**...**....
+     0x00000330,  // ...**..**....
+     0x00000198,  // ....**..**...
+     0x00000188,  // ....**...*...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3788,13 +3788,13 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3837,23 +3837,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      17, 24,
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000F80,  // ......*****......
-     0x00003CE0,  // ....****..***....
-     0x00006030,  // ...**.......**...
-     0x0000C018,  // ..**.........**..
-     0x00019F8C,  // .**..******...**.
-     0x000199C4,  // .**..**..***...*.
-     0x00031846,  // **...**....*...**
-     0x00031846,  // **...**....*...**
-     0x000318C2,  // **...**...**....*
-     0x00031F82,  // **...******.....*
-     0x00031982,  // **...**..**.....*
-     0x00019884,  // .**..**...*....*.
-     0x000198C4,  // .**..**...**...*.
-     0x0000D848,  // ..**.**....*..*..
-     0x0000E018,  // ..***........**..
-     0x00007070,  // ...***.....***...
-     0x00001FC0,  // .....*******.....
+     0x000007C0,  // ......*****......
+     0x00001E70,  // ....****..***....
+     0x00003018,  // ...**.......**...
+     0x0000600C,  // ..**.........**..
+     0x0000CFC6,  // .**..******...**.
+     0x0000CCE2,  // .**..**..***...*.
+     0x00018C23,  // **...**....*...**
+     0x00018C23,  // **...**....*...**
+     0x00018C61,  // **...**...**....*
+     0x00018FC1,  // **...******.....*
+     0x00018CC1,  // **...**..**.....*
+     0x0000CC42,  // .**..**...*....*.
+     0x0000CC62,  // .**..**...**...*.
+     0x00006C24,  // ..**.**....*..*..
+     0x0000700C,  // ..***........**..
+     0x00003838,  // ...***.....***...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -3861,43 +3861,43 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
   },
   {             // 175
-     12, 24,
+     14, 24,
+     0x00000000,  // ..............
+     0x00001FFF,  // .*************
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFE,  // .*************
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
   },
   {             // 176
      9, 24,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x0000010C,  // .*....**.
-     0x00000104,  // .*.....*.
-     0x0000010C,  // .*....**.
-     0x00000088,  // ..*...*..
-     0x00000070,  // ...***...
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x00000086,  // .*....**.
+     0x00000082,  // .*.....*.
+     0x00000086,  // .*....**.
+     0x00000044,  // ..*...*..
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3921,20 +3921,20 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3945,15 +3945,15 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000003C,  // ...****.
-     0x0000007E,  // ..******
-     0x000000C6,  // .**...**
-     0x00000006,  // ......**
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x000000FE,  // .*******
+     0x0000001E,  // ...****.
+     0x0000003F,  // ..******
+     0x00000063,  // .**...**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x0000007F,  // .*******
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -3972,15 +3972,15 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      8, 24,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000CC,  // .**..**.
-     0x0000000C,  // .....**.
-     0x00000038,  // ...***..
-     0x0000003C,  // ...****.
-     0x00000004,  // ......*.
-     0x00000084,  // .*....*.
-     0x000000CC,  // .**..**.
-     0x00000078,  // ..****..
+     0x0000003C,  // ..****..
+     0x00000066,  // .**..**.
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x0000001E,  // ...****.
+     0x00000002,  // ......*.
+     0x00000042,  // .*....*.
+     0x00000066,  // .**..**.
+     0x0000003C,  // ..****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4000,9 +4000,9 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4025,10 +4025,10 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
   {             // 181
      13, 24,
      0x00000000,  // .............
-     0x000000F0,  // ......****...
-     0x000000E0,  // ......***....
-     0x000019CC,  // .**..***..**.
-     0x0000198C,  // .**..**...**.
+     0x00000078,  // ......****...
+     0x00000070,  // ......***....
+     0x00000CE6,  // .**..***..**.
+     0x00000CC6,  // .**..**...**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4050,31 +4050,31 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
   },
   {             // 182
-     15, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006700,  // ...**..***.......
-     0x0000C700,  // ..**...***.......
-     0x0000CD00,  // ..**..**.*.......
-     0x00000D80,  // ......**.**......
-     0x00001980,  // .....**..**......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x000030E0,  // ....**....***....
-     0x00003060,  // ....**.....**....
-     0x00007FE0,  // ...**********....
-     0x00007FF0,  // ...***********...
-     0x00006030,  // ...**.......**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001801C,  // .**..........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003380,  // ...**..***.......
+     0x00006380,  // ..**...***.......
+     0x00006680,  // ..**..**.*.......
+     0x000006C0,  // ......**.**......
+     0x00000CC0,  // .....**..**......
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00001870,  // ....**....***....
+     0x00001830,  // ....**.....**....
+     0x00003FF0,  // ...**********....
+     0x00003FF8,  // ...***********...
+     0x00003018,  // ...**.......**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000C00E,  // .**..........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 183
      6, 24,
@@ -4085,8 +4085,8 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4108,22 +4108,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0003BFFC,  // .***.************.
-     0x00033FFC,  // .**..************.
-     0x00063000,  // **...**...........
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003FE0,  // .....*********....
-     0x00003FE0,  // .....*********....
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003000,  // .....**...........
-     0x00003FF8,  // .....***********..
-     0x00003FF8,  // .....***********..
+     0x0001DFFE,  // .***.************.
+     0x00019FFE,  // .**..************.
+     0x00031800,  // **...**...........
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001FF0,  // .....*********....
+     0x00001FF0,  // .....*********....
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001800,  // .....**...........
+     0x00001FFC,  // .....***********..
+     0x00001FFC,  // .....***********..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4135,22 +4135,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x000EC018,  // .***.**.........**..
-     0x000CC018,  // .**..**.........**..
-     0x0018C018,  // **...**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000FFF8,  // .....*************..
-     0x0000FFF8,  // .....*************..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
-     0x0000C018,  // .....**.........**..
+     0x0007600C,  // .***.**.........**..
+     0x0006600C,  // .**..**.........**..
+     0x000C600C,  // **...**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x00007FFC,  // .....*************..
+     0x00007FFC,  // .....*************..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
+     0x0000600C,  // .....**.........**..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4158,31 +4158,31 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ....................
   },
   {             // 186
-     9, 24,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000001D8,  // ..***.**..
-     0x00000198,  // ..**..**..
-     0x00000318,  // .**...**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+     10, 24,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000EC,  // ..***.**..
+     0x000000CC,  // ..**..**..
+     0x0000018C,  // .**...**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
   },
   {             // 187
      13, 24,
@@ -4194,16 +4194,16 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000008C0,  // ..*...**.....
-     0x00000C40,  // ..**...*.....
-     0x00000660,  // ...**..**....
-     0x00000630,  // ...**...**...
-     0x00000330,  // ....**..**...
-     0x00000318,  // ....**...**..
-     0x00000330,  // ....**..**...
-     0x00000660,  // ...**..**....
-     0x00000460,  // ...*...**....
-     0x00000CC0,  // ..**..**.....
+     0x00000460,  // ..*...**.....
+     0x00000620,  // ..**...*.....
+     0x00000330,  // ...**..**....
+     0x00000318,  // ...**...**...
+     0x00000198,  // ....**..**...
+     0x0000018C,  // ....**...**..
+     0x00000198,  // ....**..**...
+     0x00000330,  // ...**..**....
+     0x00000230,  // ...*...**....
+     0x00000660,  // ..**..**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4212,53 +4212,53 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
   },
   {             // 188
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00038FC0,  // .***...******.....
-     0x00033FF0,  // .**..**********...
-     0x00067038,  // **..***......***..
-     0x0000C01C,  // ...**.........***.
-     0x0000C00C,  // ...**..........**.
-     0x0001800E,  // ..**...........***
-     0x0001800E,  // ..**...........***
-     0x00018006,  // ..**............**
-     0x00018006,  // ..**............**
-     0x00018006,  // ..**............**
-     0x0001800E,  // ..**...........***
-     0x0001800E,  // ..**...........***
-     0x0000C00C,  // ...**..........**.
-     0x0000E01C,  // ...***........***.
-     0x00007038,  // ....***......***..
-     0x00003FF0,  // .....**********...
-     0x00000FC0,  // .......******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     18, 24,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0001C7E0,  // .***...******.....
+     0x00019FF8,  // .**..**********...
+     0x0003381C,  // **..***......***..
+     0x0000600E,  // ...**.........***.
+     0x00006006,  // ...**..........**.
+     0x0000C007,  // ..**...........***
+     0x0000C007,  // ..**...........***
+     0x0000C003,  // ..**............**
+     0x0000C003,  // ..**............**
+     0x0000C003,  // ..**............**
+     0x0000C007,  // ..**...........***
+     0x0000C007,  // ..**...........***
+     0x00006006,  // ...**..........**.
+     0x0000700E,  // ...***........***.
+     0x0000381C,  // ....***......***..
+     0x00001FF8,  // .....**********...
+     0x000007E0,  // .......******.....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 189
      19, 24,
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x0000C018,  // ....**.........**..
-     0x0001C030,  // ...***........**...
-     0x0003C060,  // ..****.......**....
-     0x0000C060,  // ....**.......**....
-     0x0000C0C0,  // ....**......**.....
-     0x0000C180,  // ....**.....**......
-     0x0000C100,  // ....**.....*.......
-     0x0000C300,  // ....**....**.......
-     0x0000C600,  // ....**...**........
-     0x00000C3C,  // ........**....****.
-     0x00000866,  // ........*....**..**
-     0x00001806,  // .......**........**
-     0x00003006,  // ......**.........**
-     0x0000601C,  // .....**........***.
-     0x00006038,  // .....**.......***..
-     0x0000C060,  // ....**.......**....
-     0x000180FE,  // ...**.......*******
+     0x0000600C,  // ....**.........**..
+     0x0000E018,  // ...***........**...
+     0x0001E030,  // ..****.......**....
+     0x00006030,  // ....**.......**....
+     0x00006060,  // ....**......**.....
+     0x000060C0,  // ....**.....**......
+     0x00006080,  // ....**.....*.......
+     0x00006180,  // ....**....**.......
+     0x00006300,  // ....**...**........
+     0x0000061E,  // ........**....****.
+     0x00000433,  // ........*....**..**
+     0x00000C03,  // .......**........**
+     0x00001803,  // ......**.........**
+     0x0000300E,  // .....**........***.
+     0x0000301C,  // .....**.......***..
+     0x00006030,  // ....**.......**....
+     0x0000C07F,  // ...**.......*******
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -4266,134 +4266,134 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...................
   },
   {             // 190
-     19, 24,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x000CE00C,  // ..**..***.........**.
-     0x00186018,  // .**....**........**..
-     0x00187038,  // .**....***......***..
-     0x00003830,  // ........***.....**...
-     0x00001860,  // .........**....**....
-     0x00001CE0,  // .........***..***....
-     0x00000CC0,  // ..........**..**.....
-     0x00000780,  // ...........****......
-     0x00000780,  // ...........****......
-     0x00000300,  // ............**.......
-     0x00000300,  // ............**.......
-     0x00000300,  // ............**.......
-     0x00000300,  // ............**.......
-     0x00000300,  // ............**.......
-     0x00000300,  // ............**.......
-     0x00000300,  // ............**.......
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
+     21, 24,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00067006,  // ..**..***.........**.
+     0x000C300C,  // .**....**........**..
+     0x000C381C,  // .**....***......***..
+     0x00001C18,  // ........***.....**...
+     0x00000C30,  // .........**....**....
+     0x00000E70,  // .........***..***....
+     0x00000660,  // ..........**..**.....
+     0x000003C0,  // ...........****......
+     0x000003C0,  // ...........****......
+     0x00000180,  // ............**.......
+     0x00000180,  // ............**.......
+     0x00000180,  // ............**.......
+     0x00000180,  // ............**.......
+     0x00000180,  // ............**.......
+     0x00000180,  // ............**.......
+     0x00000180,  // ............**.......
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
   },
   {             // 191
+     19, 24,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x000187C0,  // ..**....*****......
+     0x00019FF0,  // ..**..*********....
+     0x00033838,  // .**..***.....***...
+     0x0000700C,  // ....***........**..
+     0x0000600C,  // ....**.........**..
+     0x0000C006,  // ...**...........**.
+     0x0000C006,  // ...**...........**.
+     0x0000C006,  // ...**...........**.
+     0x0000C006,  // ...**...........**.
+     0x0000C006,  // ...**...........**.
+     0x0000C006,  // ...**...........**.
+     0x0000600C,  // ....**.........**..
+     0x0000600C,  // ....**.........**..
+     0x00003018,  // .....**.......**...
+     0x00001830,  // ......**.....**....
+     0x0000FC7E,  // ...******...******.
+     0x0000FC7E,  // ...******...******.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 192
+     10, 24,
+     0x00000000,  // ..........
+     0x0000001C,  // .....***..
+     0x00000018,  // .....**...
+     0x00000333,  // **..**..**
+     0x00000303,  // **......**
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 193
      17, 24,
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00030F80,  // ..**....*****......
-     0x00033FE0,  // ..**..*********....
-     0x00067070,  // .**..***.....***...
-     0x0000E018,  // ....***........**..
-     0x0000C018,  // ....**.........**..
-     0x0001800C,  // ...**...........**.
-     0x0001800C,  // ...**...........**.
-     0x0001800C,  // ...**...........**.
-     0x0001800C,  // ...**...........**.
-     0x0001800C,  // ...**...........**.
-     0x0001800C,  // ...**...........**.
-     0x0000C018,  // ....**.........**..
-     0x0000C018,  // ....**.........**..
-     0x00006030,  // .....**.......**...
-     0x00003060,  // ......**.....**....
-     0x0001F8FC,  // ...******...******.
-     0x0001F8FC,  // ...******...******.
+     0x00000000,  // .................
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000680,  // ......**.*.......
+     0x000006C0,  // ......**.**......
+     0x00000CC0,  // .....**..**......
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00001870,  // ....**....***....
+     0x00001830,  // ....**.....**....
+     0x00003FF0,  // ...**********....
+     0x00003FF8,  // ...***********...
+     0x00003018,  // ...**.......**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000C00E,  // .**..........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-  },
-  {             // 192
-     5, 24,
-     0x00000000,  // ........
-     0x00000038,  // .....***..
-     0x00000030,  // .....**...
-     0x00000666,  // **..**..**
-     0x00000606,  // **......**
-     0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 193
-     15, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D00,  // ......**.*.......
-     0x00000D80,  // ......**.**......
-     0x00001980,  // .....**..**......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x000030E0,  // ....**....***....
-     0x00003060,  // ....**.....**....
-     0x00007FE0,  // ...**********....
-     0x00007FF0,  // ...***********...
-     0x00006030,  // ...**.......**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0001801C,  // .**..........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
   },
   {             // 194
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x0000301C,  // ..**.......***.
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180E,  // ..**.......***.
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4405,22 +4405,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007FE,  // ..**********
-     0x000007FE,  // ..**********
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
+     0x000003FF,  // ..**********
+     0x000003FF,  // ..**********
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4428,53 +4428,53 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
   },
   {             // 196
-     15, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00001980,  // .....**..**......
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x000030E0,  // ....**....***....
-     0x00003060,  // ....**.....**....
-     0x00003060,  // ....**.....**....
-     0x00006030,  // ...**.......**...
-     0x00006030,  // ...**.......**...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000FFF8,  // ..*************..
-     0x0001FFFC,  // .***************.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 24,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x000006C0,  // ......**.**......
+     0x00000CC0,  // .....**..**......
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00001870,  // ....**....***....
+     0x00001830,  // ....**.....**....
+     0x00001830,  // ....**.....**....
+     0x00003018,  // ...**.......**...
+     0x00003018,  // ...**.......**...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00007FFC,  // ..*************..
+     0x0000FFFE,  // .***************.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 197
      15, 24,
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FE0,  // ..*********....
-     0x00003FE0,  // ..*********....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FF0,  // ..*********....
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4486,22 +4486,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000018,  // ..........**..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00003000,  // .**...........
-     0x00007FFC,  // *************.
-     0x00007FFC,  // *************.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00001800,  // .**...........
+     0x00003FFE,  // *************.
+     0x00003FFE,  // *************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4513,22 +4513,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x00007FFC,  // ..*************.
-     0x00007FFC,  // ..*************.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003FFE,  // ..*************.
+     0x00003FFE,  // ..*************.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4539,23 +4539,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018038,  // ..**.........***..
-     0x0003801C,  // .***..........***.
-     0x0003001C,  // .**...........***.
-     0x0003001C,  // .**...........***.
-     0x00031F8C,  // .**...******...**.
-     0x00031F8C,  // .**...******...**.
-     0x0003001C,  // .**...........***.
-     0x0003001C,  // .**...........***.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C01C,  // ..**.........***..
+     0x0001C00E,  // .***..........***.
+     0x0001800E,  // .**...........***.
+     0x0001800E,  // .**...........***.
+     0x00018FC6,  // .**...******...**.
+     0x00018FC6,  // .**...******...**.
+     0x0001800E,  // .**...........***.
+     0x0001800E,  // .**...........***.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4567,22 +4567,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4594,22 +4594,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000301C,  // ..**.......***.
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003700,  // ..**.***.......
-     0x00003F80,  // ..*******......
-     0x00003DC0,  // ..****.***.....
-     0x000038C0,  // ..***...**.....
-     0x000030E0,  // ..**....***....
-     0x00003070,  // ..**.....***...
-     0x00003030,  // ..**......**...
-     0x00003038,  // ..**......***..
-     0x0000301C,  // ..**.......***.
-     0x0000300E,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C60,  // ..***...**.....
+     0x00001870,  // ..**....***....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180E,  // ..**.......***.
+     0x00001807,  // ..**........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4621,22 +4621,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x000006C0,  // .....**.**.....
-     0x000006C0,  // .....**.**.....
-     0x000006C0,  // .....**.**.....
-     0x00000C60,  // ....**...**....
-     0x00000C60,  // ....**...**....
-     0x00001870,  // ...**....***...
-     0x00001830,  // ...**.....**...
-     0x00001830,  // ...**.....**...
-     0x00003018,  // ..**.......**..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000C00E,  // **..........***
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000360,  // .....**.**.....
+     0x00000360,  // .....**.**.....
+     0x00000360,  // .....**.**.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00006007,  // **..........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4648,22 +4648,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000E01C,  // ..***........***.
-     0x0000F01C,  // ..****.......***.
-     0x0000F03C,  // ..****......****.
-     0x0000F83C,  // ..*****.....****.
-     0x0000D86C,  // ..**.**....**.**.
-     0x0000DC6C,  // ..**.***...**.**.
-     0x0000CCCC,  // ..**..**..**..**.
-     0x0000CCCC,  // ..**..**..**..**.
-     0x0000C78C,  // ..**...****...**.
-     0x0000C78C,  // ..**...****...**.
-     0x0000C30C,  // ..**....**....**.
-     0x0000C30C,  // ..**....**....**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
+     0x0000700E,  // ..***........***.
+     0x0000780E,  // ..****.......***.
+     0x0000781E,  // ..****......****.
+     0x00007C1E,  // ..*****.....****.
+     0x00006C36,  // ..**.**....**.**.
+     0x00006E36,  // ..**.***...**.**.
+     0x00006666,  // ..**..**..**..**.
+     0x00006666,  // ..**..**..**..**.
+     0x000063C6,  // ..**...****...**.
+     0x000063C6,  // ..**...****...**.
+     0x00006186,  // ..**....**....**.
+     0x00006186,  // ..**....**....**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4675,22 +4675,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000600C,  // ..**.........**.
-     0x0000700C,  // ..***........**.
-     0x0000780C,  // ..****.......**.
-     0x00007C0C,  // ..*****......**.
-     0x00006C0C,  // ..**.**......**.
-     0x00006E0C,  // ..**.***.....**.
-     0x0000670C,  // ..**..***....**.
-     0x0000630C,  // ..**...**....**.
-     0x0000618C,  // ..**....**...**.
-     0x000061CC,  // ..**....***..**.
-     0x000060CC,  // ..**.....**..**.
-     0x0000606C,  // ..**......**.**.
-     0x0000607C,  // ..**......*****.
-     0x0000603C,  // ..**.......****.
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003806,  // ..***........**.
+     0x00003C06,  // ..****.......**.
+     0x00003E06,  // ..*****......**.
+     0x00003606,  // ..**.**......**.
+     0x00003706,  // ..**.***.....**.
+     0x00003386,  // ..**..***....**.
+     0x00003186,  // ..**...**....**.
+     0x000030C6,  // ..**....**...**.
+     0x000030E6,  // ..**....***..**.
+     0x00003066,  // ..**.....**..**.
+     0x00003036,  // ..**......**.**.
+     0x0000303E,  // ..**......*****.
+     0x0000301E,  // ..**.......****.
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4702,22 +4702,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF0,  // ...*********...
-     0x00001FF0,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FF8,  // .************..
-     0x00007FF8,  // .************..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4728,23 +4728,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003001C,  // .**...........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003001C,  // .**...........***.
-     0x0003001C,  // .**...........***.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x0001800E,  // .**...........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0001800E,  // .**...........***.
+     0x0001800E,  // .**...........***.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4756,22 +4756,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FFC,  // ..*************.
-     0x00007FFC,  // ..*************.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
+     0x00003FFE,  // ..*************.
+     0x00003FFE,  // ..*************.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4783,22 +4783,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF0,  // ..**********...
-     0x00003FFC,  // ..************.
-     0x0000300E,  // ..**........***
-     0x0000300E,  // ..**........***
-     0x00003006,  // ..**.........**
-     0x0000300E,  // ..**........***
-     0x0000301E,  // ..**.......****
-     0x00003FFC,  // ..************.
-     0x00003FF0,  // ..**********...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001FF8,  // ..**********...
+     0x00001FFE,  // ..************.
+     0x00001807,  // ..**........***
+     0x00001807,  // ..**........***
+     0x00001803,  // ..**.........**
+     0x00001807,  // ..**........***
+     0x0000180F,  // ..**.......****
+     0x00001FFE,  // ..************.
+     0x00001FF8,  // ..**********...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4810,22 +4810,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001C00,  // ..***.........
-     0x00000C00,  // ...**.........
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000001C0,  // ......***.....
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000E00,  // ..***.........
+     0x00000600,  // ...**.........
+     0x00000300,  // ....**........
+     0x00000180,  // .....**.......
+     0x000000C0,  // ......**......
+     0x00000060,  // .......**.....
+     0x000000E0,  // ......***.....
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000300,  // ....**........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4837,22 +4837,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001C00,  // ..***.........
-     0x00000C00,  // ...**.........
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000001C0,  // ......***.....
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000600,  // ....**........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000E00,  // ..***.........
+     0x00000600,  // ...**.........
+     0x00000300,  // ....**........
+     0x00000180,  // .....**.......
+     0x000000C0,  // ......**......
+     0x00000060,  // .......**.....
+     0x000000E0,  // ......***.....
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000300,  // ....**........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4864,22 +4864,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4887,53 +4887,53 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
   },
   {             // 213
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000E00C,  // .***.........**.
-     0x00006018,  // ..**........**..
-     0x00007038,  // ..***......***..
-     0x00003830,  // ...***.....**...
-     0x00001860,  // ....**....**....
-     0x00000CE0,  // .....**..***....
-     0x00000EC0,  // .....***.**.....
-     0x00000780,  // ......****......
-     0x00000380,  // .......***......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     16, 24,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00007006,  // .***.........**.
+     0x0000300C,  // ..**........**..
+     0x0000381C,  // ..***......***..
+     0x00001C18,  // ...***.....**...
+     0x00000C30,  // ....**....**....
+     0x00000670,  // .....**..***....
+     0x00000760,  // .....***.**.....
+     0x000003C0,  // ......****......
+     0x000001C0,  // .......***......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
   {             // 214
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000600,  // ........**........
-     0x00000600,  // ........**........
-     0x00003FC0,  // .....********.....
-     0x0000FFF0,  // ...************...
-     0x0001C63C,  // ..***...**...****.
-     0x0001860C,  // ..**....**.....**.
-     0x0003060E,  // .**.....**.....***
-     0x0003060E,  // .**.....**.....***
-     0x00030606,  // .**.....**......**
-     0x0003060E,  // .**.....**.....***
-     0x0003060E,  // .**.....**.....***
-     0x0001861C,  // ..**....**....***.
-     0x0001C63C,  // ..***...**...****.
-     0x0000FFF0,  // ...************...
-     0x00003FC0,  // .....********.....
-     0x00000600,  // ........**........
-     0x00000600,  // ........**........
+     0x00000300,  // ........**........
+     0x00000300,  // ........**........
+     0x00001FE0,  // .....********.....
+     0x00007FF8,  // ...************...
+     0x0000E31E,  // ..***...**...****.
+     0x0000C306,  // ..**....**.....**.
+     0x00018307,  // .**.....**.....***
+     0x00018307,  // .**.....**.....***
+     0x00018303,  // .**.....**......**
+     0x00018307,  // .**.....**.....***
+     0x00018307,  // .**.....**.....***
+     0x0000C30E,  // ..**....**....***.
+     0x0000E31E,  // ..***...**...****.
+     0x00007FF8,  // ...************...
+     0x00001FE0,  // .....********.....
+     0x00000300,  // ........**........
+     0x00000300,  // ........**........
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4945,22 +4945,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000700C,  // .***........**.
-     0x00003818,  // ..***......**..
-     0x00001838,  // ...**.....***..
-     0x00001C70,  // ...***...***...
-     0x00000E60,  // ....***..**....
-     0x000006C0,  // .....**.**.....
-     0x000007C0,  // .....*****.....
-     0x00000380,  // ......***......
-     0x00000380,  // ......***......
-     0x000006C0,  // .....**.**.....
-     0x00000EE0,  // ....***.***....
-     0x00001C70,  // ...***...***...
-     0x00001830,  // ...**.....**...
-     0x00003838,  // ..***.....***..
-     0x0000701C,  // .***.......***.
-     0x0000E00E,  // ***.........***
+     0x00003806,  // .***........**.
+     0x00001C0C,  // ..***......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E38,  // ...***...***...
+     0x00000730,  // ....***..**....
+     0x00000360,  // .....**.**.....
+     0x000003E0,  // .....*****.....
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000360,  // .....**.**.....
+     0x00000770,  // ....***.***....
+     0x00000E38,  // ...***...***...
+     0x00000C18,  // ...**.....**...
+     0x00001C1C,  // ..***.....***..
+     0x0000380E,  // .***.......***.
+     0x00007007,  // ***.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4972,22 +4972,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00060C18,  // .**.....**.....**..
-     0x00060C18,  // .**.....**.....**..
-     0x00060C18,  // .**.....**.....**..
-     0x00060C18,  // .**.....**.....**..
-     0x00060C18,  // .**.....**.....**..
-     0x00060C18,  // .**.....**.....**..
-     0x00060C18,  // .**.....**.....**..
-     0x00070C38,  // .***....**....***..
-     0x00038C70,  // ..***...**...***...
-     0x0001FFE0,  // ...************....
-     0x00007F80,  // .....********......
-     0x00000C00,  // ........**.........
-     0x00000C00,  // ........**.........
-     0x00000C00,  // ........**.........
-     0x00000C00,  // ........**.........
-     0x00000C00,  // ........**.........
+     0x0003060C,  // .**.....**.....**..
+     0x0003060C,  // .**.....**.....**..
+     0x0003060C,  // .**.....**.....**..
+     0x0003060C,  // .**.....**.....**..
+     0x0003060C,  // .**.....**.....**..
+     0x0003060C,  // .**.....**.....**..
+     0x0003060C,  // .**.....**.....**..
+     0x0003861C,  // .***....**....***..
+     0x0001C638,  // ..***...**...***...
+     0x0000FFF0,  // ...************....
+     0x00003FC0,  // .....********......
+     0x00000600,  // ........**.........
+     0x00000600,  // ........**.........
+     0x00000600,  // ........**.........
+     0x00000600,  // ........**.........
+     0x00000600,  // ........**.........
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -4998,23 +4998,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      17, 24,
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00001F80,  // .....******......
-     0x00003FC0,  // ....********.....
-     0x000070E0,  // ...***....***....
-     0x0000E070,  // ..***......***...
-     0x0000C030,  // ..**........**...
-     0x00018018,  // .**..........**..
-     0x00018018,  // .**..........**..
-     0x00018018,  // .**..........**..
-     0x00018018,  // .**..........**..
-     0x00018018,  // .**..........**..
-     0x00018018,  // .**..........**..
-     0x0000C010,  // ..**.........*...
-     0x0000C030,  // ..**........**...
-     0x00006060,  // ...**......**....
-     0x000030C0,  // ....**....**.....
-     0x0001F9F8,  // .******..******..
-     0x0001F9F8,  // .******..******..
+     0x00000FC0,  // .....******......
+     0x00001FE0,  // ....********.....
+     0x00003870,  // ...***....***....
+     0x00007038,  // ..***......***...
+     0x00006018,  // ..**........**...
+     0x0000C00C,  // .**..........**..
+     0x0000C00C,  // .**..........**..
+     0x0000C00C,  // .**..........**..
+     0x0000C00C,  // .**..........**..
+     0x0000C00C,  // .**..........**..
+     0x0000C00C,  // .**..........**..
+     0x00006008,  // ..**.........*...
+     0x00006018,  // ..**........**...
+     0x00003030,  // ...**......**....
+     0x00001860,  // ....**....**.....
+     0x0000FCFC,  // .******..******..
+     0x0000FCFC,  // .******..******..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5022,80 +5022,80 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .................
   },
   {             // 218
-     6, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000376,  // **.***.**
-     0x00000376,  // **.***.**
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     9, 24,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001BB,  // **.***.**
+     0x000001BB,  // **.***.**
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
   {             // 219
-     15, 24,
-     0x0000C00E,  // .**..........***
-     0x0000C00E,  // .**..........***
+     16, 24,
+     0x00006007,  // .**..........***
+     0x00006007,  // .**..........***
+     0x00000000,  // ................
+     0x00006007,  // .**..........***
+     0x00003006,  // ..**.........**.
+     0x0000380C,  // ..***.......**..
+     0x0000181C,  // ...**......***..
+     0x00000C38,  // ....**....***...
+     0x00000E30,  // ....***...**....
+     0x00000660,  // .....**..**.....
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C00E,  // .**..........***
-     0x0000600C,  // ..**.........**.
-     0x00007018,  // ..***.......**..
-     0x00003038,  // ...**......***..
-     0x00001870,  // ....**....***...
-     0x00001C60,  // ....***...**....
-     0x00000CC0,  // .....**..**.....
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
   },
   {             // 220
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x000007F8,  // ...********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00000C38,  // ..**....***..
-     0x00000FEE,  // ..*******.***
-     0x000003CC,  // ....****..**.
+     0x000001EC,  // ....****.**..
+     0x000003FC,  // ...********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x0000061C,  // ..**....***..
+     0x000007F7,  // ..*******.***
+     0x000001E6,  // ....****..**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5107,22 +5107,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000070,  // ....***...
-     0x00000060,  // ....**....
+     0x00000018,  // .....**...
+     0x00000038,  // ....***...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001FC,  // ..*******.
-     0x00000308,  // .**....*..
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001E0,  // ..****....
-     0x000001E0,  // ..****....
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000030C,  // .**....**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x00000184,  // .**....*..
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000F0,  // ..****....
+     0x000000F0,  // ..****....
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000186,  // .**....**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5134,49 +5134,49 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x00000040,  // .......*.....
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000020,  // .......*.....
      0x00000000,  // .............
-     0x00000DF0,  // ..**.*****...
-     0x00000FB8,  // ..*****.***..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
+     0x000006F8,  // ..**.*****...
+     0x000007DC,  // ..*****.***..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
   },
   {             // 223
-     5, 24,
+     7, 24,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000001C,  // ...***.
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
+     0x0000000E,  // ...***.
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5186,24 +5186,24 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
   {             // 224
      12, 24,
      0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x0000066C,  // ..**..**.**.
-     0x0000060C,  // ..**.....**.
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000336,  // ..**..**.**.
+     0x00000306,  // ..**.....**.
      0x00000000,  // ............
      0x00000000,  // ............
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003F8,  // ...*******..
-     0x000001F0,  // ....*****...
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x0000038E,  // ..***...***.
+     0x000001FC,  // ...*******..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5219,18 +5219,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x000007F8,  // ...********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00000C38,  // ..**....***..
-     0x00000FEE,  // ..*******.***
-     0x000003CC,  // ....****..**.
+     0x000001EC,  // ....****.**..
+     0x000003FC,  // ...********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x0000061C,  // ..**....***..
+     0x000007F7,  // ..*******.***
+     0x000001E6,  // ....****..**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5241,31 +5241,31 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F0,  // ...*******...
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C30,  // ..**....**...
-     0x00000CE0,  // ..**..***....
-     0x00000CF0,  // ..**..****...
-     0x00000C18,  // ..**.....**..
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E0C,  // ..***.....**.
-     0x00000E18,  // ..***....**..
-     0x00000DF0,  // ..**.*****...
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x000000F0,  // .....****....
+     0x000003F8,  // ...*******...
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000618,  // ..**....**...
+     0x00000670,  // ..**..***....
+     0x00000678,  // ..**..****...
+     0x0000060C,  // ..**.....**..
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000706,  // ..***.....**.
+     0x0000070C,  // ..***....**..
+     0x000006F8,  // ..**.*****...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
   },
   {             // 227
-     11, 24,
+     12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5273,22 +5273,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
   },
   {             // 228
@@ -5296,22 +5296,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FF8,  // ..*********..
-     0x00000E00,  // ..***........
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x000003E0,  // ....*****....
-     0x00000F70,  // ..****.***...
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000E18,  // ..***....**..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000700,  // ..***........
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x000001F0,  // ....*****....
+     0x000007B8,  // ..****.***...
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000070C,  // ..***....**..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5327,18 +5327,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001FC,  // ..*******.
-     0x00000308,  // .**....*..
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001E0,  // ..****....
-     0x000001E0,  // ..****....
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000030C,  // .**....**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x00000184,  // .**....*..
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000F0,  // ..****....
+     0x000000F0,  // ..****....
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000186,  // .**....**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5350,27 +5350,27 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000FE,  // ...*******
-     0x000000FE,  // ...*******
-     0x00000008,  // .......*..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x00000040,  // ....*.....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001F8,  // ..******..
-     0x000000FC,  // ...******.
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x0000001C,  // ......***.
-     0x00000010,  // ......*...
+     0x0000007F,  // ...*******
+     0x0000007F,  // ...*******
+     0x00000004,  // .......*..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000020,  // ....*.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000FC,  // ..******..
+     0x0000007E,  // ...******.
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x0000000E,  // ......***.
+     0x00000008,  // ......*...
   },
   {             // 231
      13, 24,
@@ -5381,45 +5381,45 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000DF0,  // ..**.*****...
-     0x00000FB8,  // ..*****.***..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
+     0x000006F8,  // ..**.*****...
+     0x000007DC,  // ..*****.***..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
   },
   {             // 232
      13, 24,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x00000C18,  // ..**.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x0000060C,  // ..**.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5435,18 +5435,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -5462,18 +5462,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000061C,  // .**....***.
-     0x00000638,  // .**...***..
-     0x00000670,  // .**..***...
-     0x000006E0,  // .**.***....
-     0x000007C0,  // .*****.....
-     0x000007C0,  // .*****.....
-     0x000007C0,  // .*****.....
-     0x00000660,  // .**..**....
-     0x00000670,  // .**..***...
-     0x00000638,  // .**...***..
-     0x0000061C,  // .**....***.
-     0x0000060C,  // .**.....**.
+     0x0000030E,  // .**....***.
+     0x0000031C,  // .**...***..
+     0x00000338,  // .**..***...
+     0x00000370,  // .**.***....
+     0x000003E0,  // .*****.....
+     0x000003E0,  // .*****.....
+     0x000003E0,  // .*****.....
+     0x00000330,  // .**..**....
+     0x00000338,  // .**..***...
+     0x0000031C,  // .**...***..
+     0x0000030E,  // .**....***.
+     0x00000306,  // .**.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5485,22 +5485,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000001C0,  // ...***.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000F0,  // ....****...
-     0x000001B0,  // ...**.**...
-     0x000001B8,  // ...**.***..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x0000030C,  // ..**....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000E06,  // ***......**
+     0x000000C0,  // ...**......
+     0x000000E0,  // ...***.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x00000078,  // ....****...
+     0x000000D8,  // ...**.**...
+     0x000000DC,  // ...**.***..
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000703,  // ***......**
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5516,26 +5516,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000E1C,  // ..***....***.
-     0x00000FFC,  // ..**********.
-     0x00000DEC,  // ..**.****.**.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000060E,  // ..**.....***.
+     0x0000070E,  // ..***....***.
+     0x000007FE,  // ..**********.
+     0x000006F6,  // ..**.****.**.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
   },
   {             // 237
-     11, 24,
+     12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5543,18 +5543,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000000C0,  // .....**.....
+     0x00000E06,  // ***......**.
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5566,26 +5566,26 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000001F0,  // ..*****...
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x00000180,  // ..**......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000180,  // ..**......
-     0x000000F8,  // ...*****..
-     0x0000003E,  // .....*****
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x0000003E,  // .....*****
-     0x00000038,  // .....***..
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000F8,  // ..*****...
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x000000C0,  // ..**......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C0,  // ..**......
+     0x0000007C,  // ...*****..
+     0x0000001F,  // .....*****
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x0000001F,  // .....*****
+     0x0000001C,  // .....***..
      0x00000000,  // ..........
   },
   {             // 239
@@ -5597,18 +5597,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C18,  // ..**.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C18,  // ..**.....**..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000060C,  // ..**.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060C,  // ..**.....**..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5624,18 +5624,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
+     0x000007FF,  // .***********
+     0x000007FF,  // .***********
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5651,22 +5651,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F8,  // ...********..
-     0x00000C1C,  // ..**.....***.
-     0x0000180E,  // .**.......***
-     0x0000180E,  // .**.......***
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180E,  // .**.......***
-     0x00001C0E,  // .***......***
-     0x00001C1C,  // .***.....***.
-     0x00001FF8,  // .**********..
-     0x00001BF0,  // .**.******...
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x000001F0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x0000060E,  // ..**.....***.
+     0x00000C07,  // .**.......***
+     0x00000C07,  // .**.......***
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C07,  // .**.......***
+     0x00000E07,  // .***......***
+     0x00000E0E,  // .***.....***.
+     0x00000FFC,  // .**********..
+     0x00000DF8,  // .**.******...
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
      0x00000000,  // .............
   },
   {             // 242
@@ -5678,23 +5678,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000007E,  // .....******
-     0x000000FE,  // ....*******
-     0x00000380,  // ..***......
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000700,  // .***.......
-     0x00000380,  // ..***......
-     0x000001F0,  // ...*****...
-     0x0000007C,  // .....*****.
-     0x0000000E,  // ........***
-     0x00000006,  // .........**
-     0x0000000E,  // ........***
-     0x0000007C,  // .....*****.
-     0x000000F0,  // ....****...
+     0x0000003F,  // .....******
+     0x0000007F,  // ....*******
+     0x000001C0,  // ..***......
+     0x00000180,  // ..**.......
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000380,  // .***.......
+     0x000001C0,  // ..***......
+     0x000000F8,  // ...*****...
+     0x0000003E,  // .....*****.
+     0x00000007,  // ........***
+     0x00000003,  // .........**
+     0x00000007,  // ........***
+     0x0000003E,  // .....*****.
+     0x00000078,  // ....****...
   },
   {             // 243
      14, 24,
@@ -5705,18 +5705,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007FE,  // ....**********
-     0x00000CFE,  // ...**..*******
-     0x00001830,  // ..**.....**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003838,  // .***.....***..
-     0x00001830,  // ..**.....**...
-     0x00000FE0,  // ...*******....
-     0x000007C0,  // ....*****.....
+     0x000003FF,  // ....**********
+     0x0000067F,  // ...**..*******
+     0x00000C18,  // ..**.....**...
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C1C,  // .***.....***..
+     0x00000C18,  // ..**.....**...
+     0x000007F0,  // ...*******....
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5732,18 +5732,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FE,  // .********
-     0x000001FE,  // .********
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
+     0x000000FF,  // .********
+     0x000000FF,  // .********
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5759,18 +5759,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000003F0,  // ...******...
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5786,22 +5786,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000CE0,  // ....**..***....
-     0x00001DF8,  // ...***.******..
-     0x00003198,  // ..**...**..**..
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x00003198,  // ..**...**..**..
-     0x00003998,  // ..***..**..**..
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00000670,  // ....**..***....
+     0x00000EFC,  // ...***.******..
+     0x000018CC,  // ..**...**..**..
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000018CC,  // ..**...**..**..
+     0x00001CCC,  // ..***..**..**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
   },
   {             // 247
@@ -5813,22 +5813,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000001E0,  // ....****....
-     0x00000370,  // ...**.***...
-     0x00000330,  // ...**..**...
-     0x00000638,  // ..**...***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000F0,  // ....****....
+     0x000001B8,  // ...**.***...
+     0x00000198,  // ...**..**...
+     0x0000031C,  // ..**...***..
+     0x0000030C,  // ..**....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
   },
   {             // 248
@@ -5840,22 +5840,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C31C,  // .**....**...***.
-     0x00006318,  // ..**...**...**..
-     0x00007FF8,  // ..************..
-     0x00001FE0,  // ....********....
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x0000618E,  // .**....**...***.
+     0x0000318C,  // ..**...**...**..
+     0x00003FFC,  // ..************..
+     0x00000FF0,  // ....********....
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
      0x00000000,  // ................
   },
   {             // 249
@@ -5867,18 +5867,18 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018010,  // ..**..........*...
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003061C,  // .**.....**....***.
-     0x00018F18,  // ..**...****...**..
-     0x0001F9F8,  // ..******..******..
-     0x0000F0F0,  // ...****....****...
+     0x0000C008,  // ..**..........*...
+     0x0000C00C,  // ..**..........**..
+     0x0000C00C,  // ..**..........**..
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x0001830E,  // .**.....**....***.
+     0x0000C78C,  // ..**...****...**..
+     0x0000FCFC,  // ..******..******..
+     0x00007878,  // ...****....****...
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5886,53 +5886,53 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // ..................
   },
   {             // 250
-     5, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x000000CE,  // **..***
-     0x000000CE,  // **..***
+     7, 24,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000067,  // **..***
+     0x00000067,  // **..***
+     0x00000000,  // .......
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
      0x00000000,  // .......
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
   },
   {             // 251
      12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000003E0,  // ...*****....
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000001F0,  // ...*****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5944,22 +5944,22 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000080,  // ......*......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000040,  // ......*......
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C18,  // ..**.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C18,  // ..**.....**..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000060C,  // ..**.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060C,  // ..**.....**..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5970,23 +5970,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      12, 24,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000003F0,  // ...******...
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5997,23 +5997,23 @@ cFont::tPixelData FontFix_iso8859_7[][26] = {
      18, 24,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000380,  // .........***......
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
+     0x000001C0,  // .........***......
+     0x00000180,  // .........**.......
+     0x00000300,  // ........**........
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x00018018,  // ..**..........**..
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003061C,  // .**.....**....***.
-     0x00018F18,  // ..**...****...**..
-     0x0001F9F8,  // ..******..******..
-     0x0000F0F0,  // ...****....****...
+     0x0000C00C,  // ..**..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000C00C,  // ..**..........**..
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x0001830E,  // .**.....**....***.
+     0x0000C78C,  // ..**...****...**..
+     0x0000FCFC,  // ..******..******..
+     0x00007878,  // ...****....****...
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
diff --git a/fontosd.c b/fontosd-iso8859-1.c
similarity index 51%
rename from fontosd.c
rename to fontosd-iso8859-1.c
index e7f7d48e8..f2d2ced11 100644
--- a/fontosd.c
+++ b/fontosd-iso8859-1.c
@@ -36,23 +36,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -67,12 +67,12 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x00000044,  // ..*...*.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000022,  // ..*...*.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -97,22 +97,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000118,  // .....*...**..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00000310,  // ....**...*...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000230,  // ....*...**...
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000620,  // ...**...*....
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
-     0x00000460,  // ...*...**....
-     0x00000C60,  // ..**...**....
-     0x00000C40,  // ..**...*.....
-     0x00000C40,  // ..**...*.....
+     0x0000008C,  // .....*...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00000188,  // ....**...*...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000118,  // ....*...**...
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000310,  // ...**...*....
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000230,  // ...*...**....
+     0x00000630,  // ..**...**....
+     0x00000620,  // ..**...*.....
+     0x00000620,  // ..**...*.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -125,27 +125,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000FF0,  // ..********...
-     0x00000CB8,  // ..**..*.***..
-     0x00001998,  // .**..**..**..
-     0x00001998,  // .**..**..**..
-     0x00001980,  // .**..**......
-     0x00001980,  // .**..**......
-     0x00000F80,  // ..*****......
-     0x000007E0,  // ...******....
-     0x000003F8,  // ....*******..
-     0x0000019C,  // .....**..***.
-     0x0000018C,  // .....**...**.
-     0x0000198C,  // .**..**...**.
-     0x0000198C,  // .**..**...**.
-     0x0000199C,  // .**..**..***.
-     0x00001D38,  // .***.*..***..
-     0x00000FF0,  // ..********...
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000007F8,  // ..********...
+     0x0000065C,  // ..**..*.***..
+     0x00000CCC,  // .**..**..**..
+     0x00000CCC,  // .**..**..**..
+     0x00000CC0,  // .**..**......
+     0x00000CC0,  // .**..**......
+     0x000007C0,  // ..*****......
+     0x000003F0,  // ...******....
+     0x000001FC,  // ....*******..
+     0x000000CE,  // .....**..***.
+     0x000000C6,  // .....**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CCE,  // .**..**..***.
+     0x00000E9C,  // .***.*..***..
+     0x000007F8,  // ..********...
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -157,22 +157,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00038040,  // ...***........*.....
-     0x000FE0C0,  // .*******.....**.....
-     0x001C7180,  // ***...***...**......
-     0x00183100,  // **.....**...*.......
-     0x00183300,  // **.....**..**.......
-     0x001C7200,  // ***...***..*........
-     0x000FE600,  // .*******..**........
-     0x0007C400,  // ..*****...*.........
-     0x00000C78,  // .........**...****..
-     0x000018FC,  // ........**...******.
-     0x000019CC,  // ........**..***..**.
-     0x00003186,  // .......**...**....**
-     0x00002186,  // .......*....**....**
-     0x00006186,  // ......**....**....**
-     0x0000C0FC,  // .....**......******.
-     0x0000C078,  // .....**.......****..
+     0x0001C020,  // ...***........*.....
+     0x0007F060,  // .*******.....**.....
+     0x000E38C0,  // ***...***...**......
+     0x000C1880,  // **.....**...*.......
+     0x000C1980,  // **.....**..**.......
+     0x000E3900,  // ***...***..*........
+     0x0007F300,  // .*******..**........
+     0x0003E200,  // ..*****...*.........
+     0x0000063C,  // .........**...****..
+     0x00000C7E,  // ........**...******.
+     0x00000CE6,  // ........**..***..**.
+     0x000018C3,  // .......**...**....**
+     0x000010C3,  // .......*....**....**
+     0x000030C3,  // ......**....**....**
+     0x0000607E,  // .....**......******.
+     0x0000603C,  // .....**.......****..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -187,22 +187,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000DC0,  // ....**.***.....
-     0x00000F80,  // ....*****......
-     0x00000F00,  // ....****.......
-     0x00001F98,  // ...******..**..
-     0x00003198,  // ..**...**..**..
-     0x000060D8,  // .**.....**.**..
-     0x00006070,  // .**......***...
-     0x00006070,  // .**......***...
-     0x00007078,  // .***.....****..
-     0x00003FDC,  // ..********.***.
-     0x00001F00,  // ...*****.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000006E0,  // ....**.***.....
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000FCC,  // ...******..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000306C,  // .**.....**.**..
+     0x00003038,  // .**......***...
+     0x00003038,  // .**......***...
+     0x0000383C,  // .***.....****..
+     0x00001FEE,  // ..********.***.
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -216,12 +216,12 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000004,  // ...*.
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -246,28 +246,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000010,  // ....*...
-     0x00000018,  // ....**..
-     0x00000008,  // .....*..
-     0x00000008,  // .....*..
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000008,  // ....*...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
+     0x00000004,  // .....*..
   },
   {             // 41
      8, 27,
@@ -276,28 +276,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000080,  // .*......
-     0x00000040,  // ..*.....
-     0x00000060,  // ..**....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000040,  // ..*.....
-     0x00000080,  // .*......
+     0x00000040,  // .*......
+     0x00000020,  // ..*.....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000040,  // .*......
   },
   {             // 42
      9, 27,
@@ -306,13 +306,13 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000020,  // ....*....
-     0x000001AC,  // .**.*.**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x00000088,  // ..*...*..
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
+     0x000000D6,  // .**.*.**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x00000044,  // ..*...*..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -342,17 +342,17 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -381,11 +381,11 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -407,8 +407,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -441,8 +441,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -450,29 +450,29 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
   },
   {             // 47
-     6, 27,
+     7, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000004,  // .....*.
-     0x00000004,  // .....*.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000008,  // ....*..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000010,  // ...*...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000020,  // ..*....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000040,  // .*.....
-     0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x00000080,  // *......
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000040,  // *......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -487,22 +487,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -517,22 +517,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000003C0,  // ....****.....
-     0x00000FC0,  // ..******.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001E0,  // ....****.....
+     0x000007E0,  // ..******.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -547,22 +547,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C1C,  // ..**.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000038,  // ........***..
-     0x000000F0,  // ......****...
-     0x000003C0,  // ....****.....
-     0x00000700,  // ...***.......
-     0x00000E00,  // ..***........
-     0x00000C00,  // ..**.........
-     0x00001800,  // .**..........
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000001C,  // ........***..
+     0x00000078,  // ......****...
+     0x000001E0,  // ....****.....
+     0x00000380,  // ...***.......
+     0x00000700,  // ..***........
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -577,22 +577,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000007E0,  // ...******....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x000001E0,  // .....****....
-     0x000001F8,  // .....******..
-     0x00000018,  // .........**..
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x000000F0,  // .....****....
+     0x000000FC,  // .....******..
+     0x0000000C,  // .........**..
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -607,22 +607,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000070,  // .......***...
-     0x000000F0,  // ......****...
-     0x000000F0,  // ......****...
-     0x000001B0,  // .....**.**...
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000430,  // ...*....**...
-     0x00000C30,  // ..**....**...
-     0x00001830,  // .**.....**...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000218,  // ...*....**...
+     0x00000618,  // ..**....**...
+     0x00000C18,  // .**.....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -637,22 +637,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FE0,  // ..*******....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x0000181C,  // .**......***.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C18,  // .***.....**..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007F0,  // ..*******....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0E,  // .**......***.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0C,  // .***.....**..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -667,22 +667,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E18,  // ..***....**..
-     0x00000C1C,  // ..**.....***.
-     0x00001C00,  // .***.........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000070C,  // ..***....**..
+     0x0000060E,  // ..**.....***.
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -697,22 +697,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000008,  // ..........*..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000700,  // ...***.......
-     0x00000600,  // ...**........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000004,  // ..........*..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000380,  // ...***.......
+     0x00000300,  // ...**........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -727,22 +727,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x000007E0,  // ...******....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003F0,  // ...******....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -757,22 +757,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C3C,  // .***....****.
-     0x00000FFC,  // ..**********.
-     0x000003EC,  // ....*****.**.
-     0x0000000C,  // ..........**.
-     0x0000001C,  // .........***.
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E1E,  // .***....****.
+     0x000007FE,  // ..**********.
+     0x000001F6,  // ....*****.**.
+     0x00000006,  // ..........**.
+     0x0000000E,  // .........***.
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -791,8 +791,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -801,8 +801,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -821,8 +821,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -831,11 +831,11 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -852,17 +852,17 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000004,  // ...........*.
-     0x0000001C,  // .........***.
-     0x00000078,  // .......****..
-     0x000003C0,  // ....****.....
-     0x00000F00,  // ..****.......
-     0x00001C00,  // .***.........
-     0x00001E00,  // .****........
-     0x000003C0,  // ....****.....
-     0x000000F0,  // ......****...
-     0x0000001C,  // .........***.
-     0x00000004,  // ...........*.
+     0x00000002,  // ...........*.
+     0x0000000E,  // .........***.
+     0x0000003C,  // .......****..
+     0x000001E0,  // ....****.....
+     0x00000780,  // ..****.......
+     0x00000E00,  // .***.........
+     0x00000F00,  // .****........
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000000E,  // .........***.
+     0x00000002,  // ...........*.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -885,12 +885,12 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -912,17 +912,17 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001000,  // .*...........
-     0x00001C00,  // .***.........
-     0x00000780,  // ...****......
-     0x000001E0,  // .....****....
-     0x0000007C,  // .......*****.
-     0x0000000C,  // ..........**.
-     0x0000003C,  // ........****.
-     0x000000F0,  // ......****...
-     0x00000780,  // ...****......
-     0x00001E00,  // .****........
-     0x00001000,  // .*...........
+     0x00000800,  // .*...........
+     0x00000E00,  // .***.........
+     0x000003C0,  // ...****......
+     0x000000F0,  // .....****....
+     0x0000003E,  // .......*****.
+     0x00000006,  // ..........**.
+     0x0000001E,  // ........****.
+     0x00000078,  // ......****...
+     0x000003C0,  // ...****......
+     0x00000F00,  // .****........
+     0x00000800,  // .*...........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -936,23 +936,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -966,26 +966,26 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x00007E00,  // .........******........
-     0x0003FFC0,  // ......************.....
-     0x000781E0,  // .....****......****....
-     0x000E0070,  // ....***..........***...
-     0x001C0038,  // ...***............***..
-     0x00383D18,  // ..***.....****.*...**..
-     0x0030FF9C,  // ..**....*********..***.
-     0x0031C38C,  // ..**...***....***...**.
-     0x0061830C,  // .**....**.....**....**.
-     0x0063030C,  // .**...**......**....**.
-     0x0063030C,  // .**...**......**....**.
-     0x00630618,  // .**...**.....**....**..
-     0x00630618,  // .**...**.....**....**..
-     0x00738E30,  // .***..***...***...**...
-     0x0031FFE0,  // ..**...************....
-     0x0038E3C0,  // ..***...***...****.....
-     0x001C0000,  // ...***.................
-     0x000F0000,  // ....****...............
-     0x0007FF00,  // .....***********.......
-     0x0000FE00,  // ........*******........
+     0x00003F00,  // .........******........
+     0x0001FFE0,  // ......************.....
+     0x0003C0F0,  // .....****......****....
+     0x00070038,  // ....***..........***...
+     0x000E001C,  // ...***............***..
+     0x001C1E8C,  // ..***.....****.*...**..
+     0x00187FCE,  // ..**....*********..***.
+     0x0018E1C6,  // ..**...***....***...**.
+     0x0030C186,  // .**....**.....**....**.
+     0x00318186,  // .**...**......**....**.
+     0x00318186,  // .**...**......**....**.
+     0x0031830C,  // .**...**.....**....**..
+     0x0031830C,  // .**...**.....**....**..
+     0x0039C718,  // .***..***...***...**...
+     0x0018FFF0,  // ..**...************....
+     0x001C71E0,  // ..***...***...****.....
+     0x000E0000,  // ...***.................
+     0x00078000,  // ....****...............
+     0x0003FF80,  // .....***********.......
+     0x00007F00,  // ........*******........
      0x00000000,  // .......................
      0x00000000,  // .......................
   },
@@ -996,23 +996,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1026,23 +1026,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1056,23 +1056,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x00007030,  // ...***......**...
-     0x00007FF0,  // ...***********...
-     0x00001FC0,  // .....*******.....
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1086,23 +1086,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FF80,  // ..*********......
-     0x0000FFE0,  // ..***********....
-     0x0000C0E0,  // ..**......***....
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C0E0,  // ..**......***....
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006070,  // ..**......***....
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1116,23 +1116,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1146,23 +1146,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1176,23 +1176,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C030,  // ..***........**...
-     0x00018018,  // ..**..........**..
-     0x00038000,  // .***..............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x000303F8,  // .**......*******..
-     0x000303F8,  // .**......*******..
-     0x00030018,  // .**...........**..
-     0x00038018,  // .***..........**..
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E078,  // ...***......****..
-     0x00007FD8,  // ....*********.**..
-     0x00001F88,  // ......******...*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E018,  // ..***........**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x000181FC,  // .**......*******..
+     0x000181FC,  // .**......*******..
+     0x0001800C,  // .**...........**..
+     0x0001C00C,  // .***..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x0000703C,  // ...***......****..
+     0x00003FEC,  // ....*********.**..
+     0x00000FC4,  // ......******...*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1206,23 +1206,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000FFF8,  // ..*************..
-     0x0000FFF8,  // ..*************..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00007FFC,  // ..*************..
+     0x00007FFC,  // ..*************..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1236,23 +1236,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1266,23 +1266,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00001818,  // **......**..
-     0x00001818,  // **......**..
-     0x00001C38,  // ***....***..
-     0x00000FF0,  // .********...
-     0x000007E0,  // ..******....
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000C0C,  // **......**..
+     0x00000C0C,  // **......**..
+     0x00000E1C,  // ***....***..
+     0x000007F8,  // .********...
+     0x000003F0,  // ..******....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1296,23 +1296,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000300E,  // ..**........***
-     0x0000301C,  // ..**.......***.
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003780,  // ..**.****......
-     0x00003F80,  // ..*******......
-     0x00003DC0,  // ..****.***.....
-     0x000038E0,  // ..***...***....
-     0x00003060,  // ..**.....**....
-     0x00003030,  // ..**......**...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300E,  // ..**........***
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001BC0,  // ..**.****......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001807,  // ..**........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1326,23 +1326,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1356,23 +1356,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00038038,  // ..***.........***..
-     0x00038038,  // ..***.........***..
-     0x0003C038,  // ..****........***..
-     0x0003C078,  // ..****.......****..
-     0x0003C078,  // ..****.......****..
-     0x00036058,  // ..**.**......*.**..
-     0x000360D8,  // ..**.**.....**.**..
-     0x000360D8,  // ..**.**.....**.**..
-     0x00033098,  // ..**..**....*..**..
-     0x00033198,  // ..**..**...**..**..
-     0x00033198,  // ..**..**...**..**..
-     0x00031918,  // ..**...**..*...**..
-     0x00031B18,  // ..**...**.**...**..
-     0x00031B18,  // ..**...**.**...**..
-     0x00030F18,  // ..**....****...**..
-     0x00030E18,  // ..**....***....**..
-     0x00030E18,  // ..**....***....**..
+     0x0001C01C,  // ..***.........***..
+     0x0001C01C,  // ..***.........***..
+     0x0001E01C,  // ..****........***..
+     0x0001E03C,  // ..****.......****..
+     0x0001E03C,  // ..****.......****..
+     0x0001B02C,  // ..**.**......*.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001984C,  // ..**..**....*..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x00018C8C,  // ..**...**..*...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x0001878C,  // ..**....****...**..
+     0x0001870C,  // ..**....***....**..
+     0x0001870C,  // ..**....***....**..
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -1386,23 +1386,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1416,23 +1416,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1446,23 +1446,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000301C,  // ..**.......***.
-     0x00003FF8,  // ..***********..
-     0x00003FE0,  // ..*********....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1476,24 +1476,24 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018098,  // ..**.......*..**..
-     0x0001C1F8,  // ..***.....******..
-     0x0000E0F0,  // ...***.....****...
-     0x00007FF0,  // ....***********...
-     0x00001F9C,  // ......******..***.
-     0x00000008,  // ...............*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C04C,  // ..**.......*..**..
+     0x0000E0FC,  // ..***.....******..
+     0x00007078,  // ...***.....****...
+     0x00003FF8,  // ....***********...
+     0x00000FCE,  // ......******..***.
+     0x00000004,  // ...............*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1506,23 +1506,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFC0,  // ..**********.....
-     0x0000FFF0,  // ..************...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C01C,  // ..**.........***.
+     0x00007FE0,  // ..**********.....
+     0x00007FF8,  // ..************...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00007FF0,  // ..***********....
+     0x00007FF8,  // ..************...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1536,23 +1536,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00003018,  // ..**.......**..
-     0x00003008,  // ..**........*..
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FF0,  // ....********...
-     0x000000F8,  // ........*****..
-     0x0000001C,  // ...........***.
-     0x0000000C,  // ............**.
-     0x0000600C,  // .**.........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1566,23 +1566,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1596,23 +1596,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1626,23 +1626,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000301C,  // ..**.......***.
-     0x00003818,  // ..***......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C30,  // ...***....**...
-     0x00000C30,  // ....**....**...
-     0x00000C70,  // ....**...***...
-     0x00000E60,  // ....***..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x000007C0,  // .....*****.....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001C0C,  // ..***......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E18,  // ...***....**...
+     0x00000618,  // ....**....**...
+     0x00000638,  // ....**...***...
+     0x00000730,  // ....***..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1656,23 +1656,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
-     0x0030180C,  // .**.......**.......**.
-     0x0030380C,  // .**......***.......**.
-     0x00303C1C,  // .**......****.....***.
-     0x00383C1C,  // .***.....****.....***.
-     0x00183C18,  // ..**.....****.....**..
-     0x00186618,  // ..**....**..**....**..
-     0x00186618,  // ..**....**..**....**..
-     0x001C6638,  // ..***...**..**...***..
-     0x000CC630,  // ...**..**...**...**...
-     0x000CC330,  // ...**..**....**..**...
-     0x000CC330,  // ...**..**....**..**...
-     0x000EC370,  // ...***.**....**.***...
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000781C0,  // ....****......***.....
-     0x000300C0,  // .....**........**.....
+     0x00180C06,  // .**.......**.......**.
+     0x00181C06,  // .**......***.......**.
+     0x00181E0E,  // .**......****.....***.
+     0x001C1E0E,  // .***.....****.....***.
+     0x000C1E0C,  // ..**.....****.....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000E331C,  // ..***...**..**...***..
+     0x00066318,  // ...**..**...**...**...
+     0x00066198,  // ...**..**....**..**...
+     0x00066198,  // ...**..**....**..**...
+     0x000761B8,  // ...***.**....**.***...
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0E0,  // ....****......***.....
+     0x00018060,  // .....**........**.....
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
@@ -1686,23 +1686,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000700C,  // .***........**.
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C70,  // ....**...***...
-     0x00000660,  // .....**..**....
-     0x000007C0,  // .....*****.....
-     0x000003C0,  // ......****.....
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000006C0,  // .....**.**.....
-     0x00000E60,  // ....***..**....
-     0x00001C70,  // ...***...***...
-     0x00001838,  // ...**.....***..
-     0x00003818,  // ..***......**..
-     0x0000701C,  // .***.......***.
-     0x0000600E,  // .**.........***
+     0x00003806,  // .***........**.
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000638,  // ....**...***...
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000730,  // ....***..**....
+     0x00000E38,  // ...***...***...
+     0x00000C1C,  // ...**.....***..
+     0x00001C0C,  // ..***......**..
+     0x0000380E,  // .***.......***.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1716,23 +1716,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700E,  // .***........***
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C30,  // ....**....**...
-     0x00000E60,  // ....***..**....
-     0x00000760,  // .....***.**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1746,23 +1746,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x0000001C,  // ..........***.
-     0x00000018,  // ..........**..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001C00,  // ..***.........
-     0x00003800,  // .***..........
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1776,53 +1776,53 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
   },
   {             // 92
-     6, 27,
+     7, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000080,  // *......
-     0x000000C0,  // **.....
-     0x00000040,  // .*.....
-     0x00000040,  // .*.....
-     0x00000060,  // .**....
-     0x00000020,  // ..*....
-     0x00000020,  // ..*....
-     0x00000020,  // ..*....
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x0000000C,  // ....**.
-     0x00000004,  // .....*.
-     0x00000004,  // .....*.
+     0x00000040,  // *......
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1836,28 +1836,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
   },
   {             // 94
      11, 27,
@@ -1867,14 +1867,14 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001A0,  // ...**.*....
-     0x000001B0,  // ...**.**...
-     0x00000110,  // ...*...*...
-     0x00000318,  // ..**...**..
-     0x00000218,  // ..*....**..
-     0x00000608,  // .**.....*..
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D0,  // ...**.*....
+     0x000000D8,  // ...**.**...
+     0x00000088,  // ...*...*...
+     0x0000018C,  // ..**...**..
+     0x0000010C,  // ..*....**..
+     0x00000304,  // .**.....*..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1890,34 +1890,34 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...........
   },
   {             // 95
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000000,  // .............
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x00000000,  // ..............
   },
   {             // 96
      5, 27,
@@ -1927,11 +1927,11 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1961,18 +1961,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1986,23 +1986,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000003E0,  // ....*****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2021,18 +2021,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2046,23 +2046,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007C0,  // ...*****.....
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2081,18 +2081,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2106,23 +2106,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2141,23 +2141,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x000007F8,  // ...********..
-     0x000003D8,  // ....****.**..
-     0x00000018,  // .........**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x000007C0,  // ...*****.....
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x000003E0,  // ...*****.....
   },
   {             // 104
      13, 27,
@@ -2166,23 +2166,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000DF0,  // ..**.*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2196,23 +2196,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2226,28 +2226,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
   },
   {             // 107
      12, 27,
@@ -2256,23 +2256,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C18,  // .**.....**..
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000CC0,  // .**..**.....
-     0x00000FC0,  // .******.....
-     0x00000FC0,  // .******.....
-     0x00000E60,  // .***..**....
-     0x00000C70,  // .**...***...
-     0x00000C30,  // .**....**...
-     0x00000C18,  // .**.....**..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000007E0,  // .******.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000638,  // .**...***...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2286,23 +2286,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2321,18 +2321,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00037CF8,  // ..**.*****..*****..
-     0x0003FFFC,  // ..****************.
-     0x0003870C,  // ..***....***....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
+     0x0001BE7C,  // ..**.*****..*****..
+     0x0001FFFE,  // ..****************.
+     0x0001C386,  // ..***....***....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -2351,18 +2351,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2381,18 +2381,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2411,23 +2411,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000019E0,  // .**..****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 113
      13, 27,
@@ -2441,23 +2441,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007D8,  // ...*****.**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003EC,  // ...*****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
   },
   {             // 114
      8, 27,
@@ -2471,18 +2471,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x0000007C,  // ..*****.
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x0000000E,  // ....***.
+     0x0000003E,  // ..*****.
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -2501,18 +2501,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000007F8,  // ..********..
-     0x00000C18,  // .**.....**..
-     0x00000C00,  // .**.........
-     0x00000E00,  // .***........
-     0x000007E0,  // ..******....
-     0x000001F8,  // ....******..
-     0x0000001C,  // ........***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2528,21 +2528,21 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2561,18 +2561,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2591,18 +2591,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000E18,  // .***....**..
-     0x00000638,  // ..**...***..
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
+     0x00000E06,  // ***......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000070C,  // .***....**..
+     0x0000031C,  // ..**...***..
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2621,18 +2621,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0003060C,  // **.....**.....**.
-     0x0001870C,  // .**....***....**.
-     0x00018F1C,  // .**...****...***.
-     0x00018F18,  // .**...****...**..
-     0x00018D98,  // .**...**.**..**..
-     0x0000C998,  // ..**..*..**..**..
-     0x0000D9B0,  // ..**.**..**.**...
-     0x0000D9B0,  // ..**.**..**.**...
-     0x000058F0,  // ...*.**...****...
-     0x000070F0,  // ...***....****...
-     0x000070E0,  // ...***....***....
-     0x000070E0,  // ...***....***....
+     0x00018306,  // **.....**.....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C78E,  // .**...****...***.
+     0x0000C78C,  // .**...****...**..
+     0x0000C6CC,  // .**...**.**..**..
+     0x000064CC,  // ..**..*..**..**..
+     0x00006CD8,  // ..**.**..**.**...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00002C78,  // ...*.**...****...
+     0x00003878,  // ...***....****...
+     0x00003870,  // ...***....***....
+     0x00003870,  // ...***....***....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -2651,18 +2651,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000003E0,  // ...*****....
-     0x00000370,  // ...**.***...
-     0x00000630,  // ..**...**...
-     0x00000E18,  // .***....**..
-     0x00000C1C,  // .**.....***.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x0000070C,  // .***....**..
+     0x0000060E,  // .**.....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2681,23 +2681,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 122
      12, 27,
@@ -2711,18 +2711,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2736,28 +2736,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000038,  // ...***..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000070,  // ..***...
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000038,  // ...***..
-     0x00000018,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000038,  // ..***...
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
   },
   {             // 124
      6, 27,
@@ -2766,28 +2766,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 125
      8, 27,
@@ -2796,28 +2796,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000C0,  // .**.....
-     0x000000E0,  // .***....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000038,  // ...***..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
+     0x00000060,  // .**.....
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
   },
   {             // 126
      13, 27,
@@ -2833,10 +2833,10 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000700,  // ...***.......
-     0x00000F8C,  // ..*****...**.
-     0x000008FC,  // ..*...******.
-     0x00000038,  // ........***..
+     0x00000380,  // ...***.......
+     0x000007C6,  // ..*****...**.
+     0x0000047E,  // ..*...******.
+     0x0000001C,  // ........***..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3881,23 +3881,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
   },
   {             // 162
      13, 27,
@@ -3909,23 +3909,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000003F0,  // ....******...
-     0x00000FF8,  // ..*********..
-     0x00000E58,  // ..***..*.**..
-     0x00001C4C,  // .***...*..**.
-     0x00001840,  // .**....*.....
-     0x00001840,  // .**....*.....
-     0x00001880,  // .**...*......
-     0x00001880,  // .**...*......
-     0x0000188C,  // .**...*...**.
-     0x00000C9C,  // ..**..*..***.
-     0x00000EB8,  // ..***.*.***..
-     0x000007F0,  // ...*******...
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000072C,  // ..***..*.**..
+     0x00000E26,  // .***...*..**.
+     0x00000C20,  // .**....*.....
+     0x00000C20,  // .**....*.....
+     0x00000C40,  // .**...*......
+     0x00000C40,  // .**...*......
+     0x00000C46,  // .**...*...**.
+     0x0000064E,  // ..**..*..***.
+     0x0000075C,  // ..***.*.***..
+     0x000003F8,  // ...*******...
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -3936,23 +3936,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000E00,  // ..***........
-     0x00001FC0,  // .*******.....
-     0x00001F40,  // .*****.*.....
-     0x00000700,  // ...***.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000600,  // ...**........
-     0x00000C00,  // ..**.........
-     0x00001FFC,  // .***********.
-     0x00001FF8,  // .**********..
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x00000700,  // ..***........
+     0x00000FE0,  // .*******.....
+     0x00000FA0,  // .*****.*.....
+     0x00000380,  // ...***.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000600,  // ..**.........
+     0x00000FFE,  // .***********.
+     0x00000FFC,  // .**********..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3970,16 +3970,16 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000408,  // ...*......*..
-     0x00000FD8,  // ..******.**..
-     0x00000FF8,  // ..*********..
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x00000FD8,  // ..******.**..
-     0x00000408,  // ...*......*..
+     0x00000204,  // ...*......*..
+     0x000007EC,  // ..******.**..
+     0x000007FC,  // ..*********..
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000007EC,  // ..******.**..
+     0x00000204,  // ...*......*..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3997,22 +3997,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00000C18,  // ..**.....**..
-     0x00000C30,  // ..**....**...
-     0x00000620,  // ...**...*....
-     0x00000260,  // ....*..**....
-     0x000003C0,  // ....****.....
-     0x00001DF8,  // .***.******..
-     0x00001FF8,  // .**********..
-     0x00000180,  // .....**......
-     0x00001FF8,  // .**********..
-     0x00001FF8,  // .**********..
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000618,  // ..**....**...
+     0x00000310,  // ...**...*....
+     0x00000130,  // ....*..**....
+     0x000001E0,  // ....****.....
+     0x00000EFC,  // .***.******..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4026,28 +4026,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 167
      13, 27,
@@ -4056,28 +4056,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E00,  // ..***........
-     0x00000780,  // ...****......
-     0x00000DE0,  // ..**.****....
-     0x000018F0,  // .**...****...
-     0x00001838,  // .**.....***..
-     0x0000181C,  // .**......***.
-     0x00001C0C,  // .***......**.
-     0x00000E0C,  // ..***.....**.
-     0x00000798,  // ...****..**..
-     0x000001F0,  // .....*****...
-     0x000000E0,  // ......***....
-     0x00000070,  // .......***...
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000E30,  // ..***...**...
-     0x000007E0,  // ...******....
-     0x000003C0,  // ....****.....
+     0x000000F0,  // .....****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000700,  // ..***........
+     0x000003C0,  // ...****......
+     0x000006F0,  // ..**.****....
+     0x00000C78,  // .**...****...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000E06,  // .***......**.
+     0x00000706,  // ..***.....**.
+     0x000003CC,  // ...****..**..
+     0x000000F8,  // .....*****...
+     0x00000070,  // ......***....
+     0x00000038,  // .......***...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000718,  // ..***...**...
+     0x000003F0,  // ...******....
+     0x000001E0,  // ....****.....
   },
   {             // 168
      8, 27,
@@ -4087,8 +4087,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4110,34 +4110,34 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
   },
   {             // 169
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F078,  // ...****.....****..
-     0x0001C718,  // ..***...***...**..
-     0x00038F8C,  // .***...*****...**.
-     0x000318CC,  // .**...**...**..**.
-     0x00063046,  // **...**.....*...**
-     0x00063006,  // **...**.........**
-     0x00063006,  // **...**.........**
-     0x00063006,  // **...**.........**
-     0x00063066,  // **...**.....**..**
-     0x000318C6,  // .**...**...**...**
-     0x00031FCC,  // .**...*******..**.
-     0x0001879C,  // ..**....****..***.
-     0x0000E078,  // ...***......****..
-     0x00007FF0,  // ....***********...
-     0x00001F80,  // ......******......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000E38C,  // ..***...***...**..
+     0x0001C7C6,  // .***...*****...**.
+     0x00018C66,  // .**...**...**..**.
+     0x00031823,  // **...**.....*...**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031833,  // **...**.....**..**
+     0x00018C63,  // .**...**...**...**
+     0x00018FE6,  // .**...*******..**.
+     0x0000C3CE,  // ..**....****..***.
+     0x0000703C,  // ...***......****..
+     0x00003FF8,  // ....***********...
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 170
      9, 27,
@@ -4146,16 +4146,16 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x00000018,  // .....**..
-     0x00000078,  // ...****..
-     0x00000198,  // .**..**..
-     0x00000198,  // .**..**..
-     0x000001FC,  // .*******.
-     0x000000EC,  // ..***.**.
-     0x000001F8,  // .******..
-     0x000001F8,  // .******..
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x0000000C,  // .....**..
+     0x0000003C,  // ...****..
+     0x000000CC,  // .**..**..
+     0x000000CC,  // .**..**..
+     0x000000FE,  // .*******.
+     0x00000076,  // ..***.**.
+     0x000000FC,  // .******..
+     0x000000FC,  // .******..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4183,14 +4183,14 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000110,  // .....*...*...
-     0x00000310,  // ....**...*...
-     0x00000670,  // ...**..***...
-     0x00000C40,  // ..**...*.....
-     0x00000C60,  // ..**...**....
-     0x00000730,  // ...***..**...
-     0x00000310,  // ....**...*...
-     0x00000110,  // .....*...*...
+     0x00000088,  // .....*...*...
+     0x00000188,  // ....**...*...
+     0x00000338,  // ...**..***...
+     0x00000620,  // ..**...*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000088,  // .....*...*...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4214,13 +4214,13 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4246,8 +4246,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000F8,  // .*****..
-     0x000000F8,  // .*****..
+     0x0000007C,  // .*****..
+     0x0000007C,  // .*****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4260,34 +4260,34 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
   },
   {             // 174
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F078,  // ...****.....****..
-     0x0001FF98,  // ..**********..**..
-     0x0003BFCC,  // .***.********..**.
-     0x0003306C,  // .**..**.....**.**.
-     0x00063066,  // **...**.....**..**
-     0x00063066,  // **...**.....**..**
-     0x00063FC6,  // **...********...**
-     0x00063FE6,  // **...*********..**
-     0x00063066,  // **...**.....**..**
-     0x0003306E,  // .**..**.....**.***
-     0x0003306C,  // .**..**.....**.**.
-     0x0001F07C,  // ..*****.....*****.
-     0x0000E078,  // ...***......****..
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000FFCC,  // ..**********..**..
+     0x0001DFE6,  // .***.********..**.
+     0x00019836,  // .**..**.....**.**.
+     0x00031833,  // **...**.....**..**
+     0x00031833,  // **...**.....**..**
+     0x00031FE3,  // **...********...**
+     0x00031FF3,  // **...*********..**
+     0x00031833,  // **...**.....**..**
+     0x00019837,  // .**..**.....**.***
+     0x00019836,  // .**..**.....**.**.
+     0x0000F83E,  // ..*****.....*****.
+     0x0000703C,  // ...***......****..
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 175
      8, 27,
@@ -4297,8 +4297,8 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4327,14 +4327,14 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x000007E0,  // ....******....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000007E0,  // ....******....
-     0x000003C0,  // .....****.....
+     0x000001E0,  // .....****.....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000003F0,  // ....******....
+     0x000001E0,  // .....****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4359,20 +4359,20 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4387,16 +4387,16 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FE,  // .*******
-     0x00000086,  // .*....**
-     0x00000006,  // ......**
-     0x0000000C,  // .....**.
-     0x00000030,  // ...**...
-     0x000000E0,  // .***....
-     0x00000080,  // .*......
-     0x000000FE,  // .*******
-     0x0000007E,  // ..******
+     0x0000003C,  // ..****..
+     0x0000007F,  // .*******
+     0x00000043,  // .*....**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000040,  // .*......
+     0x0000007F,  // .*******
+     0x0000003F,  // ..******
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4417,16 +4417,16 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FC,  // .******.
-     0x0000008C,  // .*...**.
-     0x0000000C,  // .....**.
-     0x00000038,  // ...***..
-     0x0000000C,  // .....**.
-     0x00000006,  // ......**
-     0x00000186,  // **....**
-     0x000000FC,  // .******.
-     0x00000078,  // ..****..
+     0x0000003C,  // ..****..
+     0x0000007E,  // .******.
+     0x00000046,  // .*...**.
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x00000006,  // .....**.
+     0x00000003,  // ......**
+     0x000000C3,  // **....**
+     0x0000007E,  // .******.
+     0x0000003C,  // ..****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4446,9 +4446,9 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x00000038,  // ...***..
-     0x00000030,  // ...**...
+     0x0000000E,  // ....***.
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4481,23 +4481,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x00001FDE,  // .*******.****
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x00000FEF,  // .*******.****
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 182
      12, 27,
@@ -4506,27 +4506,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001FE,  // ....********
-     0x000003FE,  // ...*********
-     0x000007EC,  // ..******.**.
-     0x000007EC,  // ..******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x000007EC,  // ..******.**.
-     0x000007EC,  // ..******.**.
-     0x000001EC,  // ....****.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
+     0x000000FF,  // ....********
+     0x000001FF,  // ...*********
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000000F6,  // ....****.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
      0x00000000,  // ............
   },
   {             // 183
@@ -4543,9 +4543,9 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4583,11 +4583,11 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000010,  // ....*...
-     0x00000038,  // ...***..
-     0x0000003C,  // ...****.
-     0x000000FC,  // .******.
-     0x00000038,  // ...***..
+     0x00000008,  // ....*...
+     0x0000001C,  // ...***..
+     0x0000001E,  // ...****.
+     0x0000007E,  // .******.
+     0x0000001C,  // ...***..
   },
   {             // 185
      8, 27,
@@ -4597,15 +4597,15 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000010,  // ....*...
-     0x00000070,  // ..***...
-     0x000000F0,  // .****...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000008,  // ....*...
+     0x00000038,  // ..***...
+     0x00000078,  // .****...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4626,16 +4626,16 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x0000007C,  // ..*****.
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x0000007C,  // ..*****.
-     0x00000038,  // ...***..
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000003C,  // ..****..
+     0x0000003E,  // ..*****.
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x0000003E,  // ..*****.
+     0x0000001C,  // ...***..
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4663,14 +4663,14 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000840,  // ..*....*.....
-     0x00000C60,  // ..**...**....
-     0x00000730,  // ...***..**...
-     0x00000310,  // ....**...*...
-     0x00000330,  // ....**..**...
-     0x00000E60,  // ..***..**....
-     0x00000C40,  // ..**...*.....
-     0x00000840,  // ..*....*.....
+     0x00000420,  // ..*....*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000198,  // ....**..**...
+     0x00000730,  // ..***..**....
+     0x00000620,  // ..**...*.....
+     0x00000420,  // ..*....*.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4687,22 +4687,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00030060,  // ...**.........**....
-     0x00070040,  // ..***.........*.....
-     0x000F0080,  // .****........*......
-     0x00030180,  // ...**.......**......
-     0x00030300,  // ...**......**.......
-     0x00030200,  // ...**......*........
-     0x00030618,  // ...**.....**....**..
-     0x00030C18,  // ...**....**.....**..
-     0x00030C38,  // ...**....**....***..
-     0x00001878,  // ........**....****..
-     0x000030D8,  // .......**....**.**..
-     0x00007098,  // ......***....*..**..
-     0x000061FE,  // ......**....********
-     0x0000C1FE,  // .....**.....********
-     0x0001C018,  // ....***.........**..
-     0x00018008,  // ....**...........*..
+     0x00018030,  // ...**.........**....
+     0x00038020,  // ..***.........*.....
+     0x00078040,  // .****........*......
+     0x000180C0,  // ...**.......**......
+     0x00018180,  // ...**......**.......
+     0x00018100,  // ...**......*........
+     0x0001830C,  // ...**.....**....**..
+     0x0001860C,  // ...**....**.....**..
+     0x0001861C,  // ...**....**....***..
+     0x00000C3C,  // ........**....****..
+     0x0000186C,  // .......**....**.**..
+     0x0000384C,  // ......***....*..**..
+     0x000030FF,  // ......**....********
+     0x000060FF,  // .....**.....********
+     0x0000E00C,  // ....***.........**..
+     0x0000C004,  // ....**...........*..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4717,22 +4717,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00030040,  // ...**.........*.....
-     0x00070080,  // ..***........*......
-     0x000F0180,  // .****.......**......
-     0x00030100,  // ...**.......*.......
-     0x00030300,  // ...**......**.......
-     0x00030600,  // ...**.....**........
-     0x00030C78,  // ...**....**...****..
-     0x00030CFC,  // ...**....**..******.
-     0x00031886,  // ...**...**...*....**
-     0x00003086,  // .......**....*....**
-     0x0000300C,  // .......**........**.
-     0x00006018,  // ......**........**..
-     0x0000C060,  // .....**.......**....
-     0x0000C080,  // .....**......*......
-     0x000181FE,  // ....**......********
-     0x0003007E,  // ...**.........******
+     0x00018020,  // ...**.........*.....
+     0x00038040,  // ..***........*......
+     0x000780C0,  // .****.......**......
+     0x00018080,  // ...**.......*.......
+     0x00018180,  // ...**......**.......
+     0x00018300,  // ...**.....**........
+     0x0001863C,  // ...**....**...****..
+     0x0001867E,  // ...**....**..******.
+     0x00018C43,  // ...**...**...*....**
+     0x00001843,  // .......**....*....**
+     0x00001806,  // .......**........**.
+     0x0000300C,  // ......**........**..
+     0x00006030,  // .....**.......**....
+     0x00006040,  // .....**......*......
+     0x0000C0FF,  // ....**......********
+     0x0001803F,  // ...**.........******
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4747,22 +4747,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00078020,  // ..****.........*....
-     0x000FC060,  // .******.......**....
-     0x0008C0C0,  // .*...**......**.....
-     0x0000C080,  // .....**......*......
-     0x00038180,  // ...***......**......
-     0x0000C300,  // .....**....**.......
-     0x00006218,  // ......**...*....**..
-     0x00186418,  // **....**..*.....**..
-     0x000FCC38,  // .******..**....***..
-     0x00078878,  // ..****...*....****..
-     0x000010D8,  // ........*....**.**..
-     0x00003098,  // .......**....*..**..
-     0x000021FE,  // .......*....********
-     0x000041FE,  // ......*.....********
-     0x00008018,  // .....*..........**..
-     0x00008008,  // .....*...........*..
+     0x0003C010,  // ..****.........*....
+     0x0007E030,  // .******.......**....
+     0x00046060,  // .*...**......**.....
+     0x00006040,  // .....**......*......
+     0x0001C0C0,  // ...***......**......
+     0x00006180,  // .....**....**.......
+     0x0000310C,  // ......**...*....**..
+     0x000C320C,  // **....**..*.....**..
+     0x0007E61C,  // .******..**....***..
+     0x0003C43C,  // ..****...*....****..
+     0x0000086C,  // ........*....**.**..
+     0x0000184C,  // .......**....*..**..
+     0x000010FF,  // .......*....********
+     0x000020FF,  // ......*.....********
+     0x0000400C,  // .....*..........**..
+     0x00004004,  // .....*...........*..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4781,48 +4781,48 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001C38,  // ..***....***..
-     0x00000FF0,  // ...********...
-     0x000007C0,  // ....*****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E1C,  // ..***....***..
+     0x000007F8,  // ...********...
+     0x000003E0,  // ....*****.....
   },
   {             // 192
      15, 27,
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000100,  // .......*.......
-     0x00000080,  // ........*......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000080,  // .......*.......
+     0x00000040,  // ........*......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4831,28 +4831,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 193
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4861,28 +4861,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 194
      15, 27,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000006C0,  // .....**.**.....
-     0x00000460,  // .....*...**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000230,  // .....*...**....
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4892,27 +4892,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 195
      15, 27,
      0x00000000,  // ...............
-     0x00000720,  // .....***..*....
-     0x00000FE0,  // ....*******....
-     0x00000040,  // .........*.....
+     0x00000390,  // .....***..*....
+     0x000007F0,  // ....*******....
+     0x00000020,  // .........*.....
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4922,27 +4922,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 196
      15, 27,
      0x00000000,  // ...............
-     0x000006E0,  // .....**.***....
-     0x000006E0,  // .....**.***....
+     0x00000370,  // .....**.***....
+     0x00000370,  // .....**.***....
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4951,28 +4951,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 197
      15, 27,
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x00000240,  // ......*..*.....
-     0x00000380,  // ......***......
-     0x00000180,  // .......**......
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000120,  // ......*..*.....
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4986,23 +4986,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x0001FFF8,  // .......**************..
-     0x0001FFF8,  // .......**************..
-     0x00031800,  // ......**...**..........
-     0x00031800,  // ......**...**..........
-     0x00061800,  // .....**....**..........
-     0x00061800,  // .....**....**..........
-     0x000E1800,  // ....***....**..........
-     0x000C1FF8,  // ....**.....**********..
-     0x000C1FF8,  // ....**.....**********..
-     0x00181800,  // ...**......**..........
-     0x001FF800,  // ...**********..........
-     0x003FF800,  // ..***********..........
-     0x00301800,  // ..**.......**..........
-     0x00301800,  // ..**.......**..........
-     0x00701800,  // .***.......**..........
-     0x00601FFC,  // .**........***********.
-     0x00E01FFC,  // ***........***********.
+     0x0000FFFC,  // .......**************..
+     0x0000FFFC,  // .......**************..
+     0x00018C00,  // ......**...**..........
+     0x00018C00,  // ......**...**..........
+     0x00030C00,  // .....**....**..........
+     0x00030C00,  // .....**....**..........
+     0x00070C00,  // ....***....**..........
+     0x00060FFC,  // ....**.....**********..
+     0x00060FFC,  // ....**.....**********..
+     0x000C0C00,  // ...**......**..........
+     0x000FFC00,  // ...**********..........
+     0x001FFC00,  // ..***********..........
+     0x00180C00,  // ..**.......**..........
+     0x00180C00,  // ..**.......**..........
+     0x00380C00,  // .***.......**..........
+     0x00300FFE,  // .**........***********.
+     0x00700FFE,  // ***........***********.
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
@@ -5016,53 +5016,53 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006030,  // ...**.......**...
-     0x000078F0,  // ...****...****...
-     0x00001FE0,  // .....********....
-     0x00000200,  // ........*........
-     0x00000700,  // .......***.......
-     0x00000380,  // ........***......
-     0x00000F80,  // ......*****......
-     0x00000700,  // .......***.......
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003018,  // ...**.......**...
+     0x00003C78,  // ...****...****...
+     0x00000FF0,  // .....********....
+     0x00000100,  // ........*........
+     0x00000380,  // .......***.......
+     0x000001C0,  // ........***......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
   },
   {             // 200
      15, 27,
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000080,  // ........*......
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000040,  // ........*......
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5071,28 +5071,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 201
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5101,28 +5101,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 202
      15, 27,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x00000640,  // .....**..*.....
-     0x00000460,  // .....*...**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000320,  // .....**..*.....
+     0x00000230,  // .....*...**....
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5132,27 +5132,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 203
      15, 27,
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5161,28 +5161,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 204
      6, 27,
-     0x00000070,  // ***...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5191,28 +5191,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 205
      6, 27,
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5220,29 +5220,29 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
   },
   {             // 206
-     6, 27,
-     0x00000030,  // ..**...
-     0x00000078,  // .****..
-     0x0000004C,  // .*..**.
-     0x000000C4,  // **...*.
+     7, 27,
+     0x00000018,  // ..**...
+     0x0000003C,  // .****..
+     0x00000026,  // .*..**.
+     0x00000062,  // **...*.
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5252,27 +5252,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 207
      6, 27,
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5286,23 +5286,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FF80,  // ..*********......
-     0x0000FFE0,  // ..***********....
-     0x0000C0F0,  // ..**......****...
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0003FC18,  // ********.....**..
-     0x0003FC18,  // ********.....**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C0E0,  // ..**......***....
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006078,  // ..**......****...
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0001FE0C,  // ********.....**..
+     0x0001FE0C,  // ********.....**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5312,27 +5312,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 209
      17, 27,
      0x00000000,  // .................
-     0x00000EC0,  // ......***.**.....
-     0x00001FC0,  // .....*******.....
-     0x00000180,  // .........**......
+     0x00000760,  // ......***.**.....
+     0x00000FE0,  // .....*******.....
+     0x000000C0,  // .........**......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5341,28 +5341,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 210
      18, 27,
-     0x00001800,  // ......**..........
-     0x00000C00,  // .......**.........
-     0x00000600,  // ........**........
-     0x00000200,  // .........*........
+     0x00000C00,  // ......**..........
+     0x00000600,  // .......**.........
+     0x00000300,  // ........**........
+     0x00000100,  // .........*........
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5371,28 +5371,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 211
      18, 27,
-     0x00000180,  // ..........**......
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
-     0x00000400,  // ........*.........
+     0x000000C0,  // ..........**......
+     0x00000180,  // .........**.......
+     0x00000300,  // ........**........
+     0x00000200,  // ........*.........
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5401,28 +5401,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 212
      18, 27,
-     0x00000600,  // ........**........
-     0x00000F00,  // .......****.......
-     0x00000900,  // .......*..*.......
-     0x00001080,  // ......*....*......
+     0x00000300,  // ........**........
+     0x00000780,  // .......****.......
+     0x00000480,  // .......*..*.......
+     0x00000840,  // ......*....*......
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5432,27 +5432,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 213
      18, 27,
      0x00000000,  // ..................
-     0x00001CC0,  // ......***..**.....
-     0x00001F80,  // ......******......
-     0x00000180,  // ..........**......
+     0x00000E60,  // ......***..**.....
+     0x00000FC0,  // ......******......
+     0x000000C0,  // ..........**......
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5462,27 +5462,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 214
      18, 27,
      0x00000000,  // ..................
-     0x00001980,  // ......**..**......
-     0x00001980,  // ......**..**......
+     0x00000CC0,  // ......**..**......
+     0x00000CC0,  // ......**..**......
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5503,15 +5503,15 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000408,  // ...*......*..
-     0x00000E18,  // ..***....**..
-     0x00000730,  // ...***..**...
-     0x000003E0,  // ....*****....
-     0x000001C0,  // .....***.....
-     0x000001E0,  // .....****....
-     0x00000370,  // ....**.***...
-     0x00000638,  // ...**...***..
-     0x00000418,  // ...*.....**..
+     0x00000204,  // ...*......*..
+     0x0000070C,  // ..***....**..
+     0x00000398,  // ...***..**...
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x000000F0,  // .....****....
+     0x000001B8,  // ....**.***...
+     0x0000031C,  // ...**...***..
+     0x0000020C,  // ...*.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5526,23 +5526,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F8C,  // ......******...**.
-     0x00007FE8,  // ....**********.*..
-     0x0000E070,  // ...***......***...
-     0x0001C038,  // ..***........***..
-     0x00018058,  // ..**........*.**..
-     0x0003809C,  // .***.......*..***.
-     0x0003018C,  // .**.......**...**.
-     0x0003030C,  // .**......**....**.
-     0x0003060C,  // .**.....**.....**.
-     0x00030C0C,  // .**....**......**.
-     0x0003180C,  // .**...**.......**.
-     0x0003300C,  // .**..**........**.
-     0x0001E018,  // ..****........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x0003FFE0,  // .*************....
-     0x00023F80,  // .*...*******......
+     0x00000FC6,  // ......******...**.
+     0x00003FF4,  // ....**********.*..
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C02C,  // ..**........*.**..
+     0x0001C04E,  // .***.......*..***.
+     0x000180C6,  // .**.......**...**.
+     0x00018186,  // .**......**....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018606,  // .**....**......**.
+     0x00018C06,  // .**...**.......**.
+     0x00019806,  // .**..**........**.
+     0x0000F00C,  // ..****........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x0001FFF0,  // .*************....
+     0x00011FC0,  // .*...*******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5551,28 +5551,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 217
      17, 27,
-     0x00001C00,  // .....***.........
-     0x00000C00,  // ......**.........
-     0x00000600,  // .......**........
-     0x00000300,  // ........**.......
+     0x00000E00,  // .....***.........
+     0x00000600,  // ......**.........
+     0x00000300,  // .......**........
+     0x00000180,  // ........**.......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5581,28 +5581,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 218
      17, 27,
-     0x00000180,  // .........**......
-     0x00000300,  // ........**.......
-     0x00000200,  // ........*........
-     0x00000400,  // .......*.........
+     0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
+     0x00000100,  // ........*........
+     0x00000200,  // .......*.........
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5611,28 +5611,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 219
      17, 27,
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x00000C40,  // .....**...*......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5642,27 +5642,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 220
      17, 27,
      0x00000000,  // .................
-     0x00001D80,  // .....***.**......
-     0x00001D80,  // .....***.**......
+     0x00000EC0,  // .....***.**......
+     0x00000EC0,  // .....***.**......
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5671,28 +5671,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
   },
   {             // 221
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700E,  // .***........***
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C30,  // ....**....**...
-     0x00000E60,  // ....***..**....
-     0x00000760,  // .....***.**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5706,23 +5706,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003038,  // ..**......***..
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000181C,  // ..**......***..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5736,23 +5736,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x000007F0,  // ....*******...
-     0x00000E38,  // ...***...***..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C38,  // ...**....***..
-     0x00000CE0,  // ...**..***....
-     0x00000CF0,  // ...**..****...
-     0x00000C18,  // ...**.....**..
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C18,  // ...**.....**..
-     0x00000CF8,  // ...**..*****..
-     0x00000CE0,  // ...**..***....
+     0x000001F0,  // .....*****....
+     0x000003F8,  // ....*******...
+     0x0000071C,  // ...***...***..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000061C,  // ...**....***..
+     0x00000670,  // ...**..***....
+     0x00000678,  // ...**..****...
+     0x0000060C,  // ...**.....**..
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x0000060C,  // ...**.....**..
+     0x0000067C,  // ...**..*****..
+     0x00000670,  // ...**..***....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5766,23 +5766,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5796,23 +5796,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5826,23 +5826,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5856,23 +5856,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5887,22 +5887,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000760,  // ...***.**....
-     0x00000760,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5915,24 +5915,24 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x000001C0,  // .....***.....
-     0x00000240,  // ....*..*.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x00000120,  // ....*..*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5951,18 +5951,18 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x0001F3F0,  // ....*****..******...
-     0x0007FFF8,  // ..****************..
-     0x00060E1C,  // ..**.....***....***.
-     0x00040C0C,  // ..*......**......**.
-     0x00001C0C,  // ........***......**.
-     0x0003FFFC,  // ...****************.
-     0x0007EFFC,  // ..******.**********.
-     0x000E0C00,  // .***.....**.........
-     0x000C0C0C,  // .**......**......**.
-     0x000C1E1C,  // .**.....****....***.
-     0x000FF7F8,  // .********.********..
-     0x0007C3F0,  // ..*****....******...
+     0x0000F9F8,  // ....*****..******...
+     0x0003FFFC,  // ..****************..
+     0x0003070E,  // ..**.....***....***.
+     0x00020606,  // ..*......**......**.
+     0x00000E06,  // ........***......**.
+     0x0001FFFE,  // ...****************.
+     0x0003F7FE,  // ..******.**********.
+     0x00070600,  // .***.....**.........
+     0x00060606,  // .**......**......**.
+     0x00060F0E,  // .**.....****....***.
+     0x0007FBFC,  // .********.********..
+     0x0003E1F8,  // ..*****....******...
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -5981,23 +5981,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x00000738,  // ..***..***..
-     0x000003F0,  // ...******...
-     0x00000080,  // .....*......
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000003E0,  // ...*****....
-     0x000000C0,  // .....**.....
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x0000039C,  // ..***..***..
+     0x000001F8,  // ...******...
+     0x00000040,  // .....*......
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
   },
   {             // 232
      13, 27,
@@ -6006,23 +6006,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6036,23 +6036,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x000000E0,  // ......***....
-     0x00000180,  // .....**......
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6066,23 +6066,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000160,  // .....*.**....
-     0x00000320,  // ....**..*....
+     0x000000E0,  // .....***.....
+     0x000000B0,  // .....*.**....
+     0x00000190,  // ....**..*....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6097,22 +6097,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000370,  // ....**.***...
-     0x00000370,  // ....**.***...
+     0x000001B8,  // ....**.***...
+     0x000001B8,  // ....**.***...
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6126,23 +6126,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000070,  // ***...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6156,23 +6156,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6186,23 +6186,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001C,  // ..***.
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     0x0000000E,  // ..***.
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6217,22 +6217,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6246,23 +6246,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000420,  // ...*....*....
-     0x000007C0,  // ...*****.....
-     0x00000780,  // ...****......
-     0x000004C0,  // ...*..**.....
-     0x000000E0,  // ......***....
-     0x000003F0,  // ....******...
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000210,  // ...*....*....
+     0x000003E0,  // ...*****.....
+     0x000003C0,  // ...****......
+     0x00000260,  // ...*..**.....
+     0x00000070,  // ......***....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6276,23 +6276,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6306,23 +6306,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6336,23 +6336,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6366,23 +6366,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6396,23 +6396,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6427,22 +6427,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000760,  // ...***.**....
-     0x00000760,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6462,17 +6462,17 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6491,19 +6491,19 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007C8,  // ....*****..*..
-     0x00001FF0,  // ..*********...
-     0x00001830,  // ..**.....**...
-     0x00003078,  // .**.....****..
-     0x00003098,  // .**....*..**..
-     0x00003198,  // .**...**..**..
-     0x00003318,  // .**..**...**..
-     0x00003618,  // .**.**....**..
-     0x00003438,  // .**.*....***..
-     0x00001870,  // ..**....***...
-     0x00001FE0,  // ..********....
-     0x000027C0,  // .*..*****.....
-     0x00002000,  // .*............
+     0x000003E4,  // ....*****..*..
+     0x00000FF8,  // ..*********...
+     0x00000C18,  // ..**.....**...
+     0x0000183C,  // .**.....****..
+     0x0000184C,  // .**....*..**..
+     0x000018CC,  // .**...**..**..
+     0x0000198C,  // .**..**...**..
+     0x00001B0C,  // .**.**....**..
+     0x00001A1C,  // .**.*....***..
+     0x00000C38,  // ..**....***...
+     0x00000FF0,  // ..********....
+     0x000013E0,  // .*..*****.....
+     0x00001000,  // .*............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -6516,23 +6516,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000700,  // ...***.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000380,  // ...***.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6546,23 +6546,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000E0,  // ......***....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000070,  // ......***....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6576,23 +6576,23 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6607,22 +6607,22 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000006E0,  // ...**.***....
-     0x00000260,  // ....*..**....
+     0x00000370,  // ...**.***....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6636,28 +6636,28 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
-     0x00000080,  // .....*......
+     0x00000038,  // ......***...
+     0x00000070,  // .....***....
+     0x00000040,  // .....*......
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 254
      13, 27,
@@ -6667,27 +6667,27 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000019E0,  // .**..****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 255
      12, 27,
@@ -6697,26 +6697,26 @@ cFont::tPixelData FontOsd_iso8859_1[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000370,  // ...**.***...
-     0x00000370,  // ...**.***...
+     0x000001B8,  // ...**.***...
+     0x000001B8,  // ...**.***...
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   };
diff --git a/fontosd-iso8859-15.c b/fontosd-iso8859-15.c
index c53c88c36..ee2d3b5c5 100644
--- a/fontosd-iso8859-15.c
+++ b/fontosd-iso8859-15.c
@@ -36,23 +36,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -67,12 +67,12 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x00000044,  // ..*...*.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000022,  // ..*...*.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -97,22 +97,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000118,  // .....*...**..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00000310,  // ....**...*...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000230,  // ....*...**...
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000620,  // ...**...*....
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
-     0x00000460,  // ...*...**....
-     0x00000C60,  // ..**...**....
-     0x00000C40,  // ..**...*.....
-     0x00000C40,  // ..**...*.....
+     0x0000008C,  // .....*...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00000188,  // ....**...*...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000118,  // ....*...**...
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000310,  // ...**...*....
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000230,  // ...*...**....
+     0x00000630,  // ..**...**....
+     0x00000620,  // ..**...*.....
+     0x00000620,  // ..**...*.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -125,27 +125,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000FF0,  // ..********...
-     0x00000CB8,  // ..**..*.***..
-     0x00001998,  // .**..**..**..
-     0x00001998,  // .**..**..**..
-     0x00001980,  // .**..**......
-     0x00001980,  // .**..**......
-     0x00000F80,  // ..*****......
-     0x000007E0,  // ...******....
-     0x000003F8,  // ....*******..
-     0x0000019C,  // .....**..***.
-     0x0000018C,  // .....**...**.
-     0x0000198C,  // .**..**...**.
-     0x0000198C,  // .**..**...**.
-     0x0000199C,  // .**..**..***.
-     0x00001D38,  // .***.*..***..
-     0x00000FF0,  // ..********...
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000007F8,  // ..********...
+     0x0000065C,  // ..**..*.***..
+     0x00000CCC,  // .**..**..**..
+     0x00000CCC,  // .**..**..**..
+     0x00000CC0,  // .**..**......
+     0x00000CC0,  // .**..**......
+     0x000007C0,  // ..*****......
+     0x000003F0,  // ...******....
+     0x000001FC,  // ....*******..
+     0x000000CE,  // .....**..***.
+     0x000000C6,  // .....**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CCE,  // .**..**..***.
+     0x00000E9C,  // .***.*..***..
+     0x000007F8,  // ..********...
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -157,22 +157,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00038040,  // ...***........*.....
-     0x000FE0C0,  // .*******.....**.....
-     0x001C7180,  // ***...***...**......
-     0x00183100,  // **.....**...*.......
-     0x00183300,  // **.....**..**.......
-     0x001C7200,  // ***...***..*........
-     0x000FE600,  // .*******..**........
-     0x0007C400,  // ..*****...*.........
-     0x00000C78,  // .........**...****..
-     0x000018FC,  // ........**...******.
-     0x000019CC,  // ........**..***..**.
-     0x00003186,  // .......**...**....**
-     0x00002186,  // .......*....**....**
-     0x00006186,  // ......**....**....**
-     0x0000C0FC,  // .....**......******.
-     0x0000C078,  // .....**.......****..
+     0x0001C020,  // ...***........*.....
+     0x0007F060,  // .*******.....**.....
+     0x000E38C0,  // ***...***...**......
+     0x000C1880,  // **.....**...*.......
+     0x000C1980,  // **.....**..**.......
+     0x000E3900,  // ***...***..*........
+     0x0007F300,  // .*******..**........
+     0x0003E200,  // ..*****...*.........
+     0x0000063C,  // .........**...****..
+     0x00000C7E,  // ........**...******.
+     0x00000CE6,  // ........**..***..**.
+     0x000018C3,  // .......**...**....**
+     0x000010C3,  // .......*....**....**
+     0x000030C3,  // ......**....**....**
+     0x0000607E,  // .....**......******.
+     0x0000603C,  // .....**.......****..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -187,22 +187,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000DC0,  // ....**.***.....
-     0x00000F80,  // ....*****......
-     0x00000F00,  // ....****.......
-     0x00001F98,  // ...******..**..
-     0x00003198,  // ..**...**..**..
-     0x000060D8,  // .**.....**.**..
-     0x00006070,  // .**......***...
-     0x00006070,  // .**......***...
-     0x00007078,  // .***.....****..
-     0x00003FDC,  // ..********.***.
-     0x00001F00,  // ...*****.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000006E0,  // ....**.***.....
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000FCC,  // ...******..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000306C,  // .**.....**.**..
+     0x00003038,  // .**......***...
+     0x00003038,  // .**......***...
+     0x0000383C,  // .***.....****..
+     0x00001FEE,  // ..********.***.
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -216,12 +216,12 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000004,  // ...*.
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -246,28 +246,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000010,  // ....*...
-     0x00000018,  // ....**..
-     0x00000008,  // .....*..
-     0x00000008,  // .....*..
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000008,  // ....*...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
+     0x00000004,  // .....*..
   },
   {             // 41
      8, 27,
@@ -276,28 +276,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000080,  // .*......
-     0x00000040,  // ..*.....
-     0x00000060,  // ..**....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000040,  // ..*.....
-     0x00000080,  // .*......
+     0x00000040,  // .*......
+     0x00000020,  // ..*.....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000040,  // .*......
   },
   {             // 42
      9, 27,
@@ -306,13 +306,13 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000020,  // ....*....
-     0x000001AC,  // .**.*.**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x00000088,  // ..*...*..
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
+     0x000000D6,  // .**.*.**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x00000044,  // ..*...*..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -342,17 +342,17 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -381,11 +381,11 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -407,8 +407,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -441,8 +441,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -450,29 +450,29 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
   },
   {             // 47
-     6, 27,
+     7, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000004,  // .....*.
-     0x00000004,  // .....*.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000008,  // ....*..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000010,  // ...*...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000020,  // ..*....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000040,  // .*.....
-     0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x00000080,  // *......
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000040,  // *......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -487,22 +487,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -517,22 +517,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000003C0,  // ....****.....
-     0x00000FC0,  // ..******.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001E0,  // ....****.....
+     0x000007E0,  // ..******.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -547,22 +547,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C1C,  // ..**.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000038,  // ........***..
-     0x000000F0,  // ......****...
-     0x000003C0,  // ....****.....
-     0x00000700,  // ...***.......
-     0x00000E00,  // ..***........
-     0x00000C00,  // ..**.........
-     0x00001800,  // .**..........
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000001C,  // ........***..
+     0x00000078,  // ......****...
+     0x000001E0,  // ....****.....
+     0x00000380,  // ...***.......
+     0x00000700,  // ..***........
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -577,22 +577,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000007E0,  // ...******....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x000001E0,  // .....****....
-     0x000001F8,  // .....******..
-     0x00000018,  // .........**..
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x000000F0,  // .....****....
+     0x000000FC,  // .....******..
+     0x0000000C,  // .........**..
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -607,22 +607,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000070,  // .......***...
-     0x000000F0,  // ......****...
-     0x000000F0,  // ......****...
-     0x000001B0,  // .....**.**...
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000430,  // ...*....**...
-     0x00000C30,  // ..**....**...
-     0x00001830,  // .**.....**...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000218,  // ...*....**...
+     0x00000618,  // ..**....**...
+     0x00000C18,  // .**.....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -637,22 +637,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FE0,  // ..*******....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x0000181C,  // .**......***.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C18,  // .***.....**..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007F0,  // ..*******....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0E,  // .**......***.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0C,  // .***.....**..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -667,22 +667,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E18,  // ..***....**..
-     0x00000C1C,  // ..**.....***.
-     0x00001C00,  // .***.........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000070C,  // ..***....**..
+     0x0000060E,  // ..**.....***.
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -697,22 +697,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000008,  // ..........*..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000700,  // ...***.......
-     0x00000600,  // ...**........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000004,  // ..........*..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000380,  // ...***.......
+     0x00000300,  // ...**........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -727,22 +727,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x000007E0,  // ...******....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003F0,  // ...******....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -757,22 +757,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C3C,  // .***....****.
-     0x00000FFC,  // ..**********.
-     0x000003EC,  // ....*****.**.
-     0x0000000C,  // ..........**.
-     0x0000001C,  // .........***.
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E1E,  // .***....****.
+     0x000007FE,  // ..**********.
+     0x000001F6,  // ....*****.**.
+     0x00000006,  // ..........**.
+     0x0000000E,  // .........***.
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -791,8 +791,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -801,8 +801,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -821,8 +821,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -831,11 +831,11 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -852,17 +852,17 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000004,  // ...........*.
-     0x0000001C,  // .........***.
-     0x00000078,  // .......****..
-     0x000003C0,  // ....****.....
-     0x00000F00,  // ..****.......
-     0x00001C00,  // .***.........
-     0x00001E00,  // .****........
-     0x000003C0,  // ....****.....
-     0x000000F0,  // ......****...
-     0x0000001C,  // .........***.
-     0x00000004,  // ...........*.
+     0x00000002,  // ...........*.
+     0x0000000E,  // .........***.
+     0x0000003C,  // .......****..
+     0x000001E0,  // ....****.....
+     0x00000780,  // ..****.......
+     0x00000E00,  // .***.........
+     0x00000F00,  // .****........
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000000E,  // .........***.
+     0x00000002,  // ...........*.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -885,12 +885,12 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -912,17 +912,17 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001000,  // .*...........
-     0x00001C00,  // .***.........
-     0x00000780,  // ...****......
-     0x000001E0,  // .....****....
-     0x0000007C,  // .......*****.
-     0x0000000C,  // ..........**.
-     0x0000003C,  // ........****.
-     0x000000F0,  // ......****...
-     0x00000780,  // ...****......
-     0x00001E00,  // .****........
-     0x00001000,  // .*...........
+     0x00000800,  // .*...........
+     0x00000E00,  // .***.........
+     0x000003C0,  // ...****......
+     0x000000F0,  // .....****....
+     0x0000003E,  // .......*****.
+     0x00000006,  // ..........**.
+     0x0000001E,  // ........****.
+     0x00000078,  // ......****...
+     0x000003C0,  // ...****......
+     0x00000F00,  // .****........
+     0x00000800,  // .*...........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -936,23 +936,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -966,26 +966,26 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x00007E00,  // .........******........
-     0x0003FFC0,  // ......************.....
-     0x000781E0,  // .....****......****....
-     0x000E0070,  // ....***..........***...
-     0x001C0038,  // ...***............***..
-     0x00383D18,  // ..***.....****.*...**..
-     0x0030FF9C,  // ..**....*********..***.
-     0x0031C38C,  // ..**...***....***...**.
-     0x0061830C,  // .**....**.....**....**.
-     0x0063030C,  // .**...**......**....**.
-     0x0063030C,  // .**...**......**....**.
-     0x00630618,  // .**...**.....**....**..
-     0x00630618,  // .**...**.....**....**..
-     0x00738E30,  // .***..***...***...**...
-     0x0031FFE0,  // ..**...************....
-     0x0038E3C0,  // ..***...***...****.....
-     0x001C0000,  // ...***.................
-     0x000F0000,  // ....****...............
-     0x0007FF00,  // .....***********.......
-     0x0000FE00,  // ........*******........
+     0x00003F00,  // .........******........
+     0x0001FFE0,  // ......************.....
+     0x0003C0F0,  // .....****......****....
+     0x00070038,  // ....***..........***...
+     0x000E001C,  // ...***............***..
+     0x001C1E8C,  // ..***.....****.*...**..
+     0x00187FCE,  // ..**....*********..***.
+     0x0018E1C6,  // ..**...***....***...**.
+     0x0030C186,  // .**....**.....**....**.
+     0x00318186,  // .**...**......**....**.
+     0x00318186,  // .**...**......**....**.
+     0x0031830C,  // .**...**.....**....**..
+     0x0031830C,  // .**...**.....**....**..
+     0x0039C718,  // .***..***...***...**...
+     0x0018FFF0,  // ..**...************....
+     0x001C71E0,  // ..***...***...****.....
+     0x000E0000,  // ...***.................
+     0x00078000,  // ....****...............
+     0x0003FF80,  // .....***********.......
+     0x00007F00,  // ........*******........
      0x00000000,  // .......................
      0x00000000,  // .......................
   },
@@ -996,23 +996,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1026,23 +1026,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1056,23 +1056,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x00007030,  // ...***......**...
-     0x00007FF0,  // ...***********...
-     0x00001FC0,  // .....*******.....
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1086,23 +1086,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FF80,  // ..*********......
-     0x0000FFE0,  // ..***********....
-     0x0000C0E0,  // ..**......***....
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C0E0,  // ..**......***....
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006070,  // ..**......***....
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1116,23 +1116,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1146,23 +1146,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1176,23 +1176,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C030,  // ..***........**...
-     0x00018018,  // ..**..........**..
-     0x00038000,  // .***..............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x000303F8,  // .**......*******..
-     0x000303F8,  // .**......*******..
-     0x00030018,  // .**...........**..
-     0x00038018,  // .***..........**..
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E078,  // ...***......****..
-     0x00007FD8,  // ....*********.**..
-     0x00001F88,  // ......******...*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E018,  // ..***........**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x000181FC,  // .**......*******..
+     0x000181FC,  // .**......*******..
+     0x0001800C,  // .**...........**..
+     0x0001C00C,  // .***..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x0000703C,  // ...***......****..
+     0x00003FEC,  // ....*********.**..
+     0x00000FC4,  // ......******...*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1206,23 +1206,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000FFF8,  // ..*************..
-     0x0000FFF8,  // ..*************..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00007FFC,  // ..*************..
+     0x00007FFC,  // ..*************..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1236,23 +1236,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1266,23 +1266,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00001818,  // **......**..
-     0x00001818,  // **......**..
-     0x00001C38,  // ***....***..
-     0x00000FF0,  // .********...
-     0x000007E0,  // ..******....
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000C0C,  // **......**..
+     0x00000C0C,  // **......**..
+     0x00000E1C,  // ***....***..
+     0x000007F8,  // .********...
+     0x000003F0,  // ..******....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1296,23 +1296,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000300E,  // ..**........***
-     0x0000301C,  // ..**.......***.
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003780,  // ..**.****......
-     0x00003F80,  // ..*******......
-     0x00003DC0,  // ..****.***.....
-     0x000038E0,  // ..***...***....
-     0x00003060,  // ..**.....**....
-     0x00003030,  // ..**......**...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300E,  // ..**........***
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001BC0,  // ..**.****......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001807,  // ..**........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1326,23 +1326,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1356,23 +1356,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00038038,  // ..***.........***..
-     0x00038038,  // ..***.........***..
-     0x0003C038,  // ..****........***..
-     0x0003C078,  // ..****.......****..
-     0x0003C078,  // ..****.......****..
-     0x00036058,  // ..**.**......*.**..
-     0x000360D8,  // ..**.**.....**.**..
-     0x000360D8,  // ..**.**.....**.**..
-     0x00033098,  // ..**..**....*..**..
-     0x00033198,  // ..**..**...**..**..
-     0x00033198,  // ..**..**...**..**..
-     0x00031918,  // ..**...**..*...**..
-     0x00031B18,  // ..**...**.**...**..
-     0x00031B18,  // ..**...**.**...**..
-     0x00030F18,  // ..**....****...**..
-     0x00030E18,  // ..**....***....**..
-     0x00030E18,  // ..**....***....**..
+     0x0001C01C,  // ..***.........***..
+     0x0001C01C,  // ..***.........***..
+     0x0001E01C,  // ..****........***..
+     0x0001E03C,  // ..****.......****..
+     0x0001E03C,  // ..****.......****..
+     0x0001B02C,  // ..**.**......*.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001984C,  // ..**..**....*..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x00018C8C,  // ..**...**..*...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x0001878C,  // ..**....****...**..
+     0x0001870C,  // ..**....***....**..
+     0x0001870C,  // ..**....***....**..
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -1386,23 +1386,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1416,23 +1416,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1446,23 +1446,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000301C,  // ..**.......***.
-     0x00003FF8,  // ..***********..
-     0x00003FE0,  // ..*********....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1476,24 +1476,24 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018098,  // ..**.......*..**..
-     0x0001C1F8,  // ..***.....******..
-     0x0000E0F0,  // ...***.....****...
-     0x00007FF0,  // ....***********...
-     0x00001F9C,  // ......******..***.
-     0x00000008,  // ...............*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C04C,  // ..**.......*..**..
+     0x0000E0FC,  // ..***.....******..
+     0x00007078,  // ...***.....****...
+     0x00003FF8,  // ....***********...
+     0x00000FCE,  // ......******..***.
+     0x00000004,  // ...............*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1506,23 +1506,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFC0,  // ..**********.....
-     0x0000FFF0,  // ..************...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C01C,  // ..**.........***.
+     0x00007FE0,  // ..**********.....
+     0x00007FF8,  // ..************...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00007FF0,  // ..***********....
+     0x00007FF8,  // ..************...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1536,23 +1536,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00003018,  // ..**.......**..
-     0x00003008,  // ..**........*..
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FF0,  // ....********...
-     0x000000F8,  // ........*****..
-     0x0000001C,  // ...........***.
-     0x0000000C,  // ............**.
-     0x0000600C,  // .**.........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1566,23 +1566,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1596,23 +1596,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1626,23 +1626,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000301C,  // ..**.......***.
-     0x00003818,  // ..***......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C30,  // ...***....**...
-     0x00000C30,  // ....**....**...
-     0x00000C70,  // ....**...***...
-     0x00000E60,  // ....***..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x000007C0,  // .....*****.....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001C0C,  // ..***......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E18,  // ...***....**...
+     0x00000618,  // ....**....**...
+     0x00000638,  // ....**...***...
+     0x00000730,  // ....***..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1656,23 +1656,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
-     0x0030180C,  // .**.......**.......**.
-     0x0030380C,  // .**......***.......**.
-     0x00303C1C,  // .**......****.....***.
-     0x00383C1C,  // .***.....****.....***.
-     0x00183C18,  // ..**.....****.....**..
-     0x00186618,  // ..**....**..**....**..
-     0x00186618,  // ..**....**..**....**..
-     0x001C6638,  // ..***...**..**...***..
-     0x000CC630,  // ...**..**...**...**...
-     0x000CC330,  // ...**..**....**..**...
-     0x000CC330,  // ...**..**....**..**...
-     0x000EC370,  // ...***.**....**.***...
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000781C0,  // ....****......***.....
-     0x000300C0,  // .....**........**.....
+     0x00180C06,  // .**.......**.......**.
+     0x00181C06,  // .**......***.......**.
+     0x00181E0E,  // .**......****.....***.
+     0x001C1E0E,  // .***.....****.....***.
+     0x000C1E0C,  // ..**.....****.....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000E331C,  // ..***...**..**...***..
+     0x00066318,  // ...**..**...**...**...
+     0x00066198,  // ...**..**....**..**...
+     0x00066198,  // ...**..**....**..**...
+     0x000761B8,  // ...***.**....**.***...
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0E0,  // ....****......***.....
+     0x00018060,  // .....**........**.....
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
@@ -1686,23 +1686,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000700C,  // .***........**.
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C70,  // ....**...***...
-     0x00000660,  // .....**..**....
-     0x000007C0,  // .....*****.....
-     0x000003C0,  // ......****.....
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000006C0,  // .....**.**.....
-     0x00000E60,  // ....***..**....
-     0x00001C70,  // ...***...***...
-     0x00001838,  // ...**.....***..
-     0x00003818,  // ..***......**..
-     0x0000701C,  // .***.......***.
-     0x0000600E,  // .**.........***
+     0x00003806,  // .***........**.
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000638,  // ....**...***...
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000730,  // ....***..**....
+     0x00000E38,  // ...***...***...
+     0x00000C1C,  // ...**.....***..
+     0x00001C0C,  // ..***......**..
+     0x0000380E,  // .***.......***.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1716,23 +1716,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700E,  // .***........***
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C30,  // ....**....**...
-     0x00000E60,  // ....***..**....
-     0x00000760,  // .....***.**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1746,23 +1746,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x0000001C,  // ..........***.
-     0x00000018,  // ..........**..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001C00,  // ..***.........
-     0x00003800,  // .***..........
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1776,53 +1776,53 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
   },
   {             // 92
-     6, 27,
+     7, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000080,  // *......
-     0x000000C0,  // **.....
-     0x00000040,  // .*.....
-     0x00000040,  // .*.....
-     0x00000060,  // .**....
-     0x00000020,  // ..*....
-     0x00000020,  // ..*....
-     0x00000020,  // ..*....
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x0000000C,  // ....**.
-     0x00000004,  // .....*.
-     0x00000004,  // .....*.
+     0x00000040,  // *......
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1836,28 +1836,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
   },
   {             // 94
      11, 27,
@@ -1867,14 +1867,14 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001A0,  // ...**.*....
-     0x000001B0,  // ...**.**...
-     0x00000110,  // ...*...*...
-     0x00000318,  // ..**...**..
-     0x00000218,  // ..*....**..
-     0x00000608,  // .**.....*..
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D0,  // ...**.*....
+     0x000000D8,  // ...**.**...
+     0x00000088,  // ...*...*...
+     0x0000018C,  // ..**...**..
+     0x0000010C,  // ..*....**..
+     0x00000304,  // .**.....*..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1890,34 +1890,34 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...........
   },
   {             // 95
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000000,  // .............
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x00000000,  // ..............
   },
   {             // 96
      5, 27,
@@ -1927,11 +1927,11 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1961,18 +1961,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1986,23 +1986,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000003E0,  // ....*****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2021,18 +2021,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2046,23 +2046,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007C0,  // ...*****.....
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2081,18 +2081,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2106,23 +2106,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2141,23 +2141,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x000007F8,  // ...********..
-     0x000003D8,  // ....****.**..
-     0x00000018,  // .........**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x000007C0,  // ...*****.....
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x000003E0,  // ...*****.....
   },
   {             // 104
      13, 27,
@@ -2166,23 +2166,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000DF0,  // ..**.*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2196,23 +2196,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2226,28 +2226,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
   },
   {             // 107
      12, 27,
@@ -2256,23 +2256,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C18,  // .**.....**..
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000CC0,  // .**..**.....
-     0x00000FC0,  // .******.....
-     0x00000FC0,  // .******.....
-     0x00000E60,  // .***..**....
-     0x00000C70,  // .**...***...
-     0x00000C30,  // .**....**...
-     0x00000C18,  // .**.....**..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000007E0,  // .******.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000638,  // .**...***...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2286,23 +2286,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2321,18 +2321,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00037CF8,  // ..**.*****..*****..
-     0x0003FFFC,  // ..****************.
-     0x0003870C,  // ..***....***....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
+     0x0001BE7C,  // ..**.*****..*****..
+     0x0001FFFE,  // ..****************.
+     0x0001C386,  // ..***....***....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -2351,18 +2351,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2381,18 +2381,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2411,23 +2411,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000019E0,  // .**..****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 113
      13, 27,
@@ -2441,23 +2441,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007D8,  // ...*****.**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003EC,  // ...*****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
   },
   {             // 114
      8, 27,
@@ -2471,18 +2471,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x0000007C,  // ..*****.
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x0000000E,  // ....***.
+     0x0000003E,  // ..*****.
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -2501,18 +2501,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000007F8,  // ..********..
-     0x00000C18,  // .**.....**..
-     0x00000C00,  // .**.........
-     0x00000E00,  // .***........
-     0x000007E0,  // ..******....
-     0x000001F8,  // ....******..
-     0x0000001C,  // ........***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2528,21 +2528,21 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2561,18 +2561,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2591,18 +2591,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000E18,  // .***....**..
-     0x00000638,  // ..**...***..
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
+     0x00000E06,  // ***......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000070C,  // .***....**..
+     0x0000031C,  // ..**...***..
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2621,18 +2621,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0003060C,  // **.....**.....**.
-     0x0001870C,  // .**....***....**.
-     0x00018F1C,  // .**...****...***.
-     0x00018F18,  // .**...****...**..
-     0x00018D98,  // .**...**.**..**..
-     0x0000C998,  // ..**..*..**..**..
-     0x0000D9B0,  // ..**.**..**.**...
-     0x0000D9B0,  // ..**.**..**.**...
-     0x000058F0,  // ...*.**...****...
-     0x000070F0,  // ...***....****...
-     0x000070E0,  // ...***....***....
-     0x000070E0,  // ...***....***....
+     0x00018306,  // **.....**.....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C78E,  // .**...****...***.
+     0x0000C78C,  // .**...****...**..
+     0x0000C6CC,  // .**...**.**..**..
+     0x000064CC,  // ..**..*..**..**..
+     0x00006CD8,  // ..**.**..**.**...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00002C78,  // ...*.**...****...
+     0x00003878,  // ...***....****...
+     0x00003870,  // ...***....***....
+     0x00003870,  // ...***....***....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -2651,18 +2651,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000003E0,  // ...*****....
-     0x00000370,  // ...**.***...
-     0x00000630,  // ..**...**...
-     0x00000E18,  // .***....**..
-     0x00000C1C,  // .**.....***.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x0000070C,  // .***....**..
+     0x0000060E,  // .**.....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2681,23 +2681,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 122
      12, 27,
@@ -2711,18 +2711,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2736,28 +2736,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000038,  // ...***..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000070,  // ..***...
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000038,  // ...***..
-     0x00000018,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000038,  // ..***...
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
   },
   {             // 124
      6, 27,
@@ -2766,28 +2766,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 125
      8, 27,
@@ -2796,28 +2796,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000C0,  // .**.....
-     0x000000E0,  // .***....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000038,  // ...***..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
+     0x00000060,  // .**.....
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
   },
   {             // 126
      13, 27,
@@ -2833,10 +2833,10 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000700,  // ...***.......
-     0x00000F8C,  // ..*****...**.
-     0x000008FC,  // ..*...******.
-     0x00000038,  // ........***..
+     0x00000380,  // ...***.......
+     0x000007C6,  // ..*****...**.
+     0x0000047E,  // ..*...******.
+     0x0000001C,  // ........***..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3881,23 +3881,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
   },
   {             // 162
      13, 27,
@@ -3909,23 +3909,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000003F0,  // ....******...
-     0x00000FF8,  // ..*********..
-     0x00000E58,  // ..***..*.**..
-     0x00001C4C,  // .***...*..**.
-     0x00001840,  // .**....*.....
-     0x00001840,  // .**....*.....
-     0x00001880,  // .**...*......
-     0x00001880,  // .**...*......
-     0x0000188C,  // .**...*...**.
-     0x00000C9C,  // ..**..*..***.
-     0x00000EB8,  // ..***.*.***..
-     0x000007F0,  // ...*******...
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000072C,  // ..***..*.**..
+     0x00000E26,  // .***...*..**.
+     0x00000C20,  // .**....*.....
+     0x00000C20,  // .**....*.....
+     0x00000C40,  // .**...*......
+     0x00000C40,  // .**...*......
+     0x00000C46,  // .**...*...**.
+     0x0000064E,  // ..**..*..***.
+     0x0000075C,  // ..***.*.***..
+     0x000003F8,  // ...*******...
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -3936,23 +3936,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000E00,  // ..***........
-     0x00001FC0,  // .*******.....
-     0x00001F40,  // .*****.*.....
-     0x00000700,  // ...***.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000600,  // ...**........
-     0x00000C00,  // ..**.........
-     0x00001FFC,  // .***********.
-     0x00001FF8,  // .**********..
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x00000700,  // ..***........
+     0x00000FE0,  // .*******.....
+     0x00000FA0,  // .*****.*.....
+     0x00000380,  // ...***.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000600,  // ..**.........
+     0x00000FFE,  // .***********.
+     0x00000FFC,  // .**********..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3966,23 +3966,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FF8,  // ....***********..
-     0x0000F03C,  // ..****......****.
-     0x0000E00C,  // ..***.........**.
-     0x0000E00C,  // ..***.........**.
-     0x0003FE00,  // *********........
-     0x0003FE00,  // *********........
-     0x0001C000,  // .***.............
-     0x0001C000,  // .***.............
-     0x0001C000,  // .***.............
-     0x0003FE00,  // *********........
-     0x0003FE00,  // *********........
-     0x0000E00C,  // ..***.........**.
-     0x0000F03C,  // ..****......****.
-     0x0000F03C,  // ..****......****.
-     0x00003FF8,  // ....***********..
-     0x00000FC0,  // ......******.....
+     0x000007E0,  // ......******.....
+     0x00001FFC,  // ....***********..
+     0x0000781E,  // ..****......****.
+     0x00007006,  // ..***.........**.
+     0x00007006,  // ..***.........**.
+     0x0001FF00,  // *********........
+     0x0001FF00,  // *********........
+     0x0000E000,  // .***.............
+     0x0000E000,  // .***.............
+     0x0000E000,  // .***.............
+     0x0001FF00,  // *********........
+     0x0001FF00,  // *********........
+     0x00007006,  // ..***.........**.
+     0x0000781E,  // ..****......****.
+     0x0000781E,  // ..****......****.
+     0x00001FFC,  // ....***********..
+     0x000007E0,  // ......******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -3997,22 +3997,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00000C18,  // ..**.....**..
-     0x00000C30,  // ..**....**...
-     0x00000620,  // ...**...*....
-     0x00000260,  // ....*..**....
-     0x000003C0,  // ....****.....
-     0x00001DF8,  // .***.******..
-     0x00001FF8,  // .**********..
-     0x00000180,  // .....**......
-     0x00001FF8,  // .**********..
-     0x00001FF8,  // .**********..
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000618,  // ..**....**...
+     0x00000310,  // ...**...*....
+     0x00000130,  // ....*..**....
+     0x000001E0,  // ....****.....
+     0x00000EFC,  // .***.******..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4021,28 +4021,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 166
      16, 27,
-     0x00001860,  // ....**....**....
-     0x00000CC0,  // .....**..**.....
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
+     0x00000C30,  // ....**....**....
+     0x00000660,  // .....**..**.....
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
      0x00000000,  // ................
-     0x00000FC0,  // .....******.....
-     0x00007FF8,  // ..************..
-     0x0000F03C,  // .****......****.
-     0x0000E01C,  // .***........***.
-     0x0000E01C,  // .***........***.
-     0x0000F000,  // .****...........
-     0x00007F00,  // ..*******.......
-     0x00000FC0,  // .....******.....
-     0x000000F8,  // .........*****..
-     0x000000F8,  // .........*****..
-     0x0000003C,  // ...........****.
-     0x0000001C,  // ............***.
-     0x0000E01C,  // .***........***.
-     0x0000F03C,  // .****......****.
-     0x0000F03C,  // .****......****.
-     0x00007FF8,  // ..************..
-     0x00001FC0,  // ....*******.....
+     0x000007E0,  // .....******.....
+     0x00003FFC,  // ..************..
+     0x0000781E,  // .****......****.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x00007800,  // .****...........
+     0x00003F80,  // ..*******.......
+     0x000007E0,  // .....******.....
+     0x0000007C,  // .........*****..
+     0x0000007C,  // .........*****..
+     0x0000001E,  // ...........****.
+     0x0000000E,  // ............***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00003FFC,  // ..************..
+     0x00000FE0,  // ....*******.....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4056,28 +4056,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E00,  // ..***........
-     0x00000780,  // ...****......
-     0x00000DE0,  // ..**.****....
-     0x000018F0,  // .**...****...
-     0x00001838,  // .**.....***..
-     0x0000181C,  // .**......***.
-     0x00001C0C,  // .***......**.
-     0x00000E0C,  // ..***.....**.
-     0x00000798,  // ...****..**..
-     0x000001F0,  // .....*****...
-     0x000000E0,  // ......***....
-     0x00000070,  // .......***...
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000E30,  // ..***...**...
-     0x000007E0,  // ...******....
-     0x000003C0,  // ....****.....
+     0x000000F0,  // .....****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000700,  // ..***........
+     0x000003C0,  // ...****......
+     0x000006F0,  // ..**.****....
+     0x00000C78,  // .**...****...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000E06,  // .***......**.
+     0x00000706,  // ..***.....**.
+     0x000003CC,  // ...****..**..
+     0x000000F8,  // .....*****...
+     0x00000070,  // ......***....
+     0x00000038,  // .......***...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000718,  // ..***...**...
+     0x000003F0,  // ...******....
+     0x000001E0,  // ....****.....
   },
   {             // 168
      12, 27,
@@ -4086,23 +4086,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000738,  // ..***..***..
-     0x000003E0,  // ...*****....
-     0x000000C0,  // .....**.....
+     0x0000039C,  // ..***..***..
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000007F8,  // ..********..
-     0x00000C18,  // .**.....**..
-     0x00000C00,  // .**.........
-     0x00000E00,  // .***........
-     0x000007E0,  // ..******....
-     0x000001F8,  // ....******..
-     0x0000001C,  // ........***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4110,34 +4110,34 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
   },
   {             // 169
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F078,  // ...****.....****..
-     0x0001C718,  // ..***...***...**..
-     0x00038F8C,  // .***...*****...**.
-     0x000318CC,  // .**...**...**..**.
-     0x00063046,  // **...**.....*...**
-     0x00063006,  // **...**.........**
-     0x00063006,  // **...**.........**
-     0x00063006,  // **...**.........**
-     0x00063066,  // **...**.....**..**
-     0x000318C6,  // .**...**...**...**
-     0x00031FCC,  // .**...*******..**.
-     0x0001879C,  // ..**....****..***.
-     0x0000E078,  // ...***......****..
-     0x00007FF0,  // ....***********...
-     0x00001F80,  // ......******......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000E38C,  // ..***...***...**..
+     0x0001C7C6,  // .***...*****...**.
+     0x00018C66,  // .**...**...**..**.
+     0x00031823,  // **...**.....*...**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031833,  // **...**.....**..**
+     0x00018C63,  // .**...**...**...**
+     0x00018FE6,  // .**...*******..**.
+     0x0000C3CE,  // ..**....****..***.
+     0x0000703C,  // ...***......****..
+     0x00003FF8,  // ....***********...
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 170
      9, 27,
@@ -4146,16 +4146,16 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x00000018,  // .....**..
-     0x00000078,  // ...****..
-     0x00000198,  // .**..**..
-     0x00000198,  // .**..**..
-     0x000001FC,  // .*******.
-     0x000000EC,  // ..***.**.
-     0x000001F8,  // .******..
-     0x000001F8,  // .******..
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x0000000C,  // .....**..
+     0x0000003C,  // ...****..
+     0x000000CC,  // .**..**..
+     0x000000CC,  // .**..**..
+     0x000000FE,  // .*******.
+     0x00000076,  // ..***.**.
+     0x000000FC,  // .******..
+     0x000000FC,  // .******..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4183,14 +4183,14 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000110,  // .....*...*...
-     0x00000310,  // ....**...*...
-     0x00000670,  // ...**..***...
-     0x00000C40,  // ..**...*.....
-     0x00000C60,  // ..**...**....
-     0x00000730,  // ...***..**...
-     0x00000310,  // ....**...*...
-     0x00000110,  // .....*...*...
+     0x00000088,  // .....*...*...
+     0x00000188,  // ....**...*...
+     0x00000338,  // ...**..***...
+     0x00000620,  // ..**...*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000088,  // .....*...*...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4214,13 +4214,13 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4246,8 +4246,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000F8,  // .*****..
-     0x000000F8,  // .*****..
+     0x0000007C,  // .*****..
+     0x0000007C,  // .*****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4260,34 +4260,34 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
   },
   {             // 174
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000F078,  // ...****.....****..
-     0x0001FF98,  // ..**********..**..
-     0x0003BFCC,  // .***.********..**.
-     0x0003306C,  // .**..**.....**.**.
-     0x00063066,  // **...**.....**..**
-     0x00063066,  // **...**.....**..**
-     0x00063FC6,  // **...********...**
-     0x00063FE6,  // **...*********..**
-     0x00063066,  // **...**.....**..**
-     0x0003306E,  // .**..**.....**.***
-     0x0003306C,  // .**..**.....**.**.
-     0x0001F07C,  // ..*****.....*****.
-     0x0000E078,  // ...***......****..
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000FFCC,  // ..**********..**..
+     0x0001DFE6,  // .***.********..**.
+     0x00019836,  // .**..**.....**.**.
+     0x00031833,  // **...**.....**..**
+     0x00031833,  // **...**.....**..**
+     0x00031FE3,  // **...********...**
+     0x00031FF3,  // **...*********..**
+     0x00031833,  // **...**.....**..**
+     0x00019837,  // .**..**.....**.***
+     0x00019836,  // .**..**.....**.**.
+     0x0000F83E,  // ..*****.....*****.
+     0x0000703C,  // ...***......****..
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 175
      8, 27,
@@ -4297,8 +4297,8 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4327,14 +4327,14 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x000007E0,  // ....******....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000007E0,  // ....******....
-     0x000003C0,  // .....****.....
+     0x000001E0,  // .....****.....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000003F0,  // ....******....
+     0x000001E0,  // .....****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4359,20 +4359,20 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4387,16 +4387,16 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FE,  // .*******
-     0x00000086,  // .*....**
-     0x00000006,  // ......**
-     0x0000000C,  // .....**.
-     0x00000030,  // ...**...
-     0x000000E0,  // .***....
-     0x00000080,  // .*......
-     0x000000FE,  // .*******
-     0x0000007E,  // ..******
+     0x0000003C,  // ..****..
+     0x0000007F,  // .*******
+     0x00000043,  // .*....**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000040,  // .*......
+     0x0000007F,  // .*******
+     0x0000003F,  // ..******
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4417,16 +4417,16 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FC,  // .******.
-     0x0000008C,  // .*...**.
-     0x0000000C,  // .....**.
-     0x00000038,  // ...***..
-     0x0000000C,  // .....**.
-     0x00000006,  // ......**
-     0x00000186,  // **....**
-     0x000000FC,  // .******.
-     0x00000078,  // ..****..
+     0x0000003C,  // ..****..
+     0x0000007E,  // .******.
+     0x00000046,  // .*...**.
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x00000006,  // .....**.
+     0x00000003,  // ......**
+     0x000000C3,  // **....**
+     0x0000007E,  // .******.
+     0x0000003C,  // ..****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4441,28 +4441,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 180
      15, 27,
-     0x00000C30,  // ....**....**...
-     0x00000660,  // .....**..**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
+     0x00000618,  // ....**....**...
+     0x00000330,  // .....**..**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
-     0x0000001C,  // ...........***.
-     0x00000030,  // ..........**...
-     0x00000030,  // ..........**...
-     0x00000060,  // .........**....
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000780,  // .....****......
-     0x00000780,  // .....****......
-     0x00000600,  // .....**........
-     0x00000C00,  // ....**.........
-     0x00003800,  // ..***..........
-     0x00007000,  // .***...........
-     0x00007000,  // .***...........
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x0000000E,  // ...........***.
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00001C00,  // ..***..........
+     0x00003800,  // .***...........
+     0x00003800,  // .***...........
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4481,23 +4481,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x00001FDE,  // .*******.****
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x00000FEF,  // .*******.****
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 182
      12, 27,
@@ -4506,27 +4506,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001FE,  // ....********
-     0x000003FE,  // ...*********
-     0x000007EC,  // ..******.**.
-     0x000007EC,  // ..******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x000007EC,  // ..******.**.
-     0x000007EC,  // ..******.**.
-     0x000001EC,  // ....****.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
+     0x000000FF,  // ....********
+     0x000001FF,  // ...*********
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000000F6,  // ....****.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
      0x00000000,  // ............
   },
   {             // 183
@@ -4543,9 +4543,9 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4566,23 +4566,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000738,  // ..***..***..
-     0x000003E0,  // ...*****....
-     0x000000C0,  // .....**.....
+     0x0000039C,  // ..***..***..
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4597,15 +4597,15 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000010,  // ....*...
-     0x00000070,  // ..***...
-     0x000000F0,  // .****...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000008,  // ....*...
+     0x00000038,  // ..***...
+     0x00000078,  // .****...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4626,16 +4626,16 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x0000007C,  // ..*****.
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x000000C6,  // .**...**
-     0x0000007C,  // ..*****.
-     0x00000038,  // ...***..
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000003C,  // ..****..
+     0x0000003E,  // ..*****.
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x0000003E,  // ..*****.
+     0x0000001C,  // ...***..
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4663,14 +4663,14 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000840,  // ..*....*.....
-     0x00000C60,  // ..**...**....
-     0x00000730,  // ...***..**...
-     0x00000310,  // ....**...*...
-     0x00000330,  // ....**..**...
-     0x00000E60,  // ..***..**....
-     0x00000C40,  // ..**...*.....
-     0x00000840,  // ..*....*.....
+     0x00000420,  // ..*....*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000198,  // ....**..**...
+     0x00000730,  // ..***..**....
+     0x00000620,  // ..**...*.....
+     0x00000420,  // ..*....*.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4686,23 +4686,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x0003DFFC,  // ......****.***********.
-     0x000FFFFC,  // ....******************.
-     0x003C3C00,  // ..****....****.........
-     0x00381C00,  // ..***......***.........
-     0x00381C00,  // ..***......***.........
-     0x00781C00,  // .****......***.........
-     0x00701C00,  // .***.......***.........
-     0x00701FF8,  // .***.......**********..
-     0x00701FF8,  // .***.......**********..
-     0x00701FF8,  // .***.......**********..
-     0x00701C00,  // .***.......***.........
-     0x00781C00,  // .****......***.........
-     0x00381C00,  // ..***......***.........
-     0x003C3C00,  // ..****....****.........
-     0x003C3C00,  // ..****....****.........
-     0x000FFFFC,  // ....******************.
-     0x0003DFFC,  // ......****.***********.
+     0x0001EFFE,  // ......****.***********.
+     0x0007FFFE,  // ....******************.
+     0x001E1E00,  // ..****....****.........
+     0x001C0E00,  // ..***......***.........
+     0x001C0E00,  // ..***......***.........
+     0x003C0E00,  // .****......***.........
+     0x00380E00,  // .***.......***.........
+     0x00380FFC,  // .***.......**********..
+     0x00380FFC,  // .***.......**********..
+     0x00380FFC,  // .***.......**********..
+     0x00380E00,  // .***.......***.........
+     0x003C0E00,  // .****......***.........
+     0x001C0E00,  // ..***......***.........
+     0x001E1E00,  // ..****....****.........
+     0x001E1E00,  // ..****....****.........
+     0x0007FFFE,  // ....******************.
+     0x0001EFFE,  // ......****.***********.
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
@@ -4721,18 +4721,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .....................
      0x00000000,  // .....................
      0x00000000,  // .....................
-     0x0003F3E0,  // ....******..*****....
-     0x000FFFF0,  // ..****************...
-     0x000E1C1C,  // ..***....***.....***.
-     0x001C0C1C,  // .***......**.....***.
-     0x001C0C1C,  // .***......**.....***.
-     0x001C0FFC,  // .***......**********.
-     0x001C0C00,  // .***......**.........
-     0x001C0C00,  // .***......**.........
-     0x000E1F1C,  // ..***....*****...***.
-     0x000E1F1C,  // ..***....*****...***.
-     0x000FFFFC,  // ..******************.
-     0x0003F3E0,  // ....******..*****....
+     0x0001F9F0,  // ....******..*****....
+     0x0007FFF8,  // ..****************...
+     0x00070E0E,  // ..***....***.....***.
+     0x000E060E,  // .***......**.....***.
+     0x000E060E,  // .***......**.....***.
+     0x000E07FE,  // .***......**********.
+     0x000E0600,  // .***......**.........
+     0x000E0600,  // .***......**.........
+     0x00070F8E,  // ..***....*****...***.
+     0x00070F8E,  // ..***....*****...***.
+     0x0007FFFE,  // ..******************.
+     0x0001F9F0,  // ....******..*****....
      0x00000000,  // .....................
      0x00000000,  // .....................
      0x00000000,  // .....................
@@ -4742,27 +4742,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 190
      17, 27,
      0x00000000,  // .................
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
      0x00000000,  // .................
-     0x0001C00C,  // .***..........**.
-     0x0001C00C,  // .***..........**.
-     0x0000E038,  // ..***.......***..
-     0x0000E038,  // ..***.......***..
-     0x0000E038,  // ..***.......***..
-     0x00003070,  // ....**.....***...
-     0x00003070,  // ....**.....***...
-     0x000018C0,  // .....**...**.....
-     0x00000F80,  // ......*****......
-     0x00000F80,  // ......*****......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
+     0x0000E006,  // .***..........**.
+     0x0000E006,  // .***..........**.
+     0x0000701C,  // ..***.......***..
+     0x0000701C,  // ..***.......***..
+     0x0000701C,  // ..***.......***..
+     0x00001838,  // ....**.....***...
+     0x00001838,  // ....**.....***...
+     0x00000C60,  // .....**...**.....
+     0x000007C0,  // ......*****......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4781,48 +4781,48 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001C38,  // ..***....***..
-     0x00000FF0,  // ...********...
-     0x000007C0,  // ....*****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E1C,  // ..***....***..
+     0x000007F8,  // ...********...
+     0x000003E0,  // ....*****.....
   },
   {             // 192
      15, 27,
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000100,  // .......*.......
-     0x00000080,  // ........*......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000080,  // .......*.......
+     0x00000040,  // ........*......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4831,28 +4831,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 193
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4861,28 +4861,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 194
      15, 27,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000006C0,  // .....**.**.....
-     0x00000460,  // .....*...**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000230,  // .....*...**....
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4892,27 +4892,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 195
      15, 27,
      0x00000000,  // ...............
-     0x00000720,  // .....***..*....
-     0x00000FE0,  // ....*******....
-     0x00000040,  // .........*.....
+     0x00000390,  // .....***..*....
+     0x000007F0,  // ....*******....
+     0x00000020,  // .........*.....
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4922,27 +4922,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 196
      15, 27,
      0x00000000,  // ...............
-     0x000006E0,  // .....**.***....
-     0x000006E0,  // .....**.***....
+     0x00000370,  // .....**.***....
+     0x00000370,  // .....**.***....
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4951,28 +4951,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 197
      15, 27,
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x00000240,  // ......*..*.....
-     0x00000380,  // ......***......
-     0x00000180,  // .......**......
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000120,  // ......*..*.....
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4986,23 +4986,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x0001FFF8,  // .......**************..
-     0x0001FFF8,  // .......**************..
-     0x00031800,  // ......**...**..........
-     0x00031800,  // ......**...**..........
-     0x00061800,  // .....**....**..........
-     0x00061800,  // .....**....**..........
-     0x000E1800,  // ....***....**..........
-     0x000C1FF8,  // ....**.....**********..
-     0x000C1FF8,  // ....**.....**********..
-     0x00181800,  // ...**......**..........
-     0x001FF800,  // ...**********..........
-     0x003FF800,  // ..***********..........
-     0x00301800,  // ..**.......**..........
-     0x00301800,  // ..**.......**..........
-     0x00701800,  // .***.......**..........
-     0x00601FFC,  // .**........***********.
-     0x00E01FFC,  // ***........***********.
+     0x0000FFFC,  // .......**************..
+     0x0000FFFC,  // .......**************..
+     0x00018C00,  // ......**...**..........
+     0x00018C00,  // ......**...**..........
+     0x00030C00,  // .....**....**..........
+     0x00030C00,  // .....**....**..........
+     0x00070C00,  // ....***....**..........
+     0x00060FFC,  // ....**.....**********..
+     0x00060FFC,  // ....**.....**********..
+     0x000C0C00,  // ...**......**..........
+     0x000FFC00,  // ...**********..........
+     0x001FFC00,  // ..***********..........
+     0x00180C00,  // ..**.......**..........
+     0x00180C00,  // ..**.......**..........
+     0x00380C00,  // .***.......**..........
+     0x00300FFE,  // .**........***********.
+     0x00700FFE,  // ***........***********.
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
@@ -5016,53 +5016,53 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006030,  // ...**.......**...
-     0x000078F0,  // ...****...****...
-     0x00001FE0,  // .....********....
-     0x00000200,  // ........*........
-     0x00000700,  // .......***.......
-     0x00000380,  // ........***......
-     0x00000F80,  // ......*****......
-     0x00000700,  // .......***.......
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003018,  // ...**.......**...
+     0x00003C78,  // ...****...****...
+     0x00000FF0,  // .....********....
+     0x00000100,  // ........*........
+     0x00000380,  // .......***.......
+     0x000001C0,  // ........***......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
   },
   {             // 200
      15, 27,
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x00000080,  // ........*......
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000040,  // ........*......
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5071,28 +5071,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 201
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5101,28 +5101,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 202
      15, 27,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x00000640,  // .....**..*.....
-     0x00000460,  // .....*...**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000320,  // .....**..*.....
+     0x00000230,  // .....*...**....
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5132,27 +5132,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 203
      15, 27,
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5161,28 +5161,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 204
      6, 27,
-     0x00000070,  // ***...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5191,28 +5191,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 205
      6, 27,
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5220,29 +5220,29 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
   },
   {             // 206
-     6, 27,
-     0x00000030,  // ..**...
-     0x00000078,  // .****..
-     0x0000004C,  // .*..**.
-     0x000000C4,  // **...*.
+     7, 27,
+     0x00000018,  // ..**...
+     0x0000003C,  // .****..
+     0x00000026,  // .*..**.
+     0x00000062,  // **...*.
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5252,27 +5252,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 207
      6, 27,
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5286,23 +5286,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FF80,  // ..*********......
-     0x0000FFE0,  // ..***********....
-     0x0000C0F0,  // ..**......****...
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0003FC18,  // ********.....**..
-     0x0003FC18,  // ********.....**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C0E0,  // ..**......***....
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006078,  // ..**......****...
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0001FE0C,  // ********.....**..
+     0x0001FE0C,  // ********.....**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5312,27 +5312,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 209
      17, 27,
      0x00000000,  // .................
-     0x00000EC0,  // ......***.**.....
-     0x00001FC0,  // .....*******.....
-     0x00000180,  // .........**......
+     0x00000760,  // ......***.**.....
+     0x00000FE0,  // .....*******.....
+     0x000000C0,  // .........**......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5341,28 +5341,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 210
      18, 27,
-     0x00001800,  // ......**..........
-     0x00000C00,  // .......**.........
-     0x00000600,  // ........**........
-     0x00000200,  // .........*........
+     0x00000C00,  // ......**..........
+     0x00000600,  // .......**.........
+     0x00000300,  // ........**........
+     0x00000100,  // .........*........
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5371,28 +5371,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 211
      18, 27,
-     0x00000180,  // ..........**......
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
-     0x00000400,  // ........*.........
+     0x000000C0,  // ..........**......
+     0x00000180,  // .........**.......
+     0x00000300,  // ........**........
+     0x00000200,  // ........*.........
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5401,28 +5401,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 212
      18, 27,
-     0x00000600,  // ........**........
-     0x00000F00,  // .......****.......
-     0x00000900,  // .......*..*.......
-     0x00001080,  // ......*....*......
+     0x00000300,  // ........**........
+     0x00000780,  // .......****.......
+     0x00000480,  // .......*..*.......
+     0x00000840,  // ......*....*......
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5432,27 +5432,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 213
      18, 27,
      0x00000000,  // ..................
-     0x00001CC0,  // ......***..**.....
-     0x00001F80,  // ......******......
-     0x00000180,  // ..........**......
+     0x00000E60,  // ......***..**.....
+     0x00000FC0,  // ......******......
+     0x000000C0,  // ..........**......
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5462,27 +5462,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 214
      18, 27,
      0x00000000,  // ..................
-     0x00001980,  // ......**..**......
-     0x00001980,  // ......**..**......
+     0x00000CC0,  // ......**..**......
+     0x00000CC0,  // ......**..**......
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5503,15 +5503,15 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000408,  // ...*......*..
-     0x00000E18,  // ..***....**..
-     0x00000730,  // ...***..**...
-     0x000003E0,  // ....*****....
-     0x000001C0,  // .....***.....
-     0x000001E0,  // .....****....
-     0x00000370,  // ....**.***...
-     0x00000638,  // ...**...***..
-     0x00000418,  // ...*.....**..
+     0x00000204,  // ...*......*..
+     0x0000070C,  // ..***....**..
+     0x00000398,  // ...***..**...
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x000000F0,  // .....****....
+     0x000001B8,  // ....**.***...
+     0x0000031C,  // ...**...***..
+     0x0000020C,  // ...*.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5526,23 +5526,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F8C,  // ......******...**.
-     0x00007FE8,  // ....**********.*..
-     0x0000E070,  // ...***......***...
-     0x0001C038,  // ..***........***..
-     0x00018058,  // ..**........*.**..
-     0x0003809C,  // .***.......*..***.
-     0x0003018C,  // .**.......**...**.
-     0x0003030C,  // .**......**....**.
-     0x0003060C,  // .**.....**.....**.
-     0x00030C0C,  // .**....**......**.
-     0x0003180C,  // .**...**.......**.
-     0x0003300C,  // .**..**........**.
-     0x0001E018,  // ..****........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x0003FFE0,  // .*************....
-     0x00023F80,  // .*...*******......
+     0x00000FC6,  // ......******...**.
+     0x00003FF4,  // ....**********.*..
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C02C,  // ..**........*.**..
+     0x0001C04E,  // .***.......*..***.
+     0x000180C6,  // .**.......**...**.
+     0x00018186,  // .**......**....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018606,  // .**....**......**.
+     0x00018C06,  // .**...**.......**.
+     0x00019806,  // .**..**........**.
+     0x0000F00C,  // ..****........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x0001FFF0,  // .*************....
+     0x00011FC0,  // .*...*******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5551,28 +5551,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 217
      17, 27,
-     0x00001C00,  // .....***.........
-     0x00000C00,  // ......**.........
-     0x00000600,  // .......**........
-     0x00000300,  // ........**.......
+     0x00000E00,  // .....***.........
+     0x00000600,  // ......**.........
+     0x00000300,  // .......**........
+     0x00000180,  // ........**.......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5581,28 +5581,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 218
      17, 27,
-     0x00000180,  // .........**......
-     0x00000300,  // ........**.......
-     0x00000200,  // ........*........
-     0x00000400,  // .......*.........
+     0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
+     0x00000100,  // ........*........
+     0x00000200,  // .......*.........
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5611,28 +5611,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 219
      17, 27,
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x00000C40,  // .....**...*......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5642,27 +5642,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 220
      17, 27,
      0x00000000,  // .................
-     0x00001D80,  // .....***.**......
-     0x00001D80,  // .....***.**......
+     0x00000EC0,  // .....***.**......
+     0x00000EC0,  // .....***.**......
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5671,28 +5671,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
   },
   {             // 221
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700E,  // .***........***
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C30,  // ....**....**...
-     0x00000E60,  // ....***..**....
-     0x00000760,  // .....***.**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5706,23 +5706,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x0000301C,  // ..**.......***.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003038,  // ..**......***..
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000181C,  // ..**......***..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5736,23 +5736,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x000007F0,  // ....*******...
-     0x00000E38,  // ...***...***..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C38,  // ...**....***..
-     0x00000CE0,  // ...**..***....
-     0x00000CF0,  // ...**..****...
-     0x00000C18,  // ...**.....**..
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C18,  // ...**.....**..
-     0x00000CF8,  // ...**..*****..
-     0x00000CE0,  // ...**..***....
+     0x000001F0,  // .....*****....
+     0x000003F8,  // ....*******...
+     0x0000071C,  // ...***...***..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000061C,  // ...**....***..
+     0x00000670,  // ...**..***....
+     0x00000678,  // ...**..****...
+     0x0000060C,  // ...**.....**..
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x0000060C,  // ...**.....**..
+     0x0000067C,  // ...**..*****..
+     0x00000670,  // ...**..***....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5766,23 +5766,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5796,23 +5796,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5826,23 +5826,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5856,23 +5856,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5887,22 +5887,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000760,  // ...***.**....
-     0x00000760,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5915,24 +5915,24 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x000001C0,  // .....***.....
-     0x00000240,  // ....*..*.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x00000120,  // ....*..*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5951,18 +5951,18 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x0001F3F0,  // ....*****..******...
-     0x0007FFF8,  // ..****************..
-     0x00060E1C,  // ..**.....***....***.
-     0x00040C0C,  // ..*......**......**.
-     0x00001C0C,  // ........***......**.
-     0x0003FFFC,  // ...****************.
-     0x0007EFFC,  // ..******.**********.
-     0x000E0C00,  // .***.....**.........
-     0x000C0C0C,  // .**......**......**.
-     0x000C1E1C,  // .**.....****....***.
-     0x000FF7F8,  // .********.********..
-     0x0007C3F0,  // ..*****....******...
+     0x0000F9F8,  // ....*****..******...
+     0x0003FFFC,  // ..****************..
+     0x0003070E,  // ..**.....***....***.
+     0x00020606,  // ..*......**......**.
+     0x00000E06,  // ........***......**.
+     0x0001FFFE,  // ...****************.
+     0x0003F7FE,  // ..******.**********.
+     0x00070600,  // .***.....**.........
+     0x00060606,  // .**......**......**.
+     0x00060F0E,  // .**.....****....***.
+     0x0007FBFC,  // .********.********..
+     0x0003E1F8,  // ..*****....******...
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -5981,23 +5981,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x00000738,  // ..***..***..
-     0x000003F0,  // ...******...
-     0x00000080,  // .....*......
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000003E0,  // ...*****....
-     0x000000C0,  // .....**.....
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x0000039C,  // ..***..***..
+     0x000001F8,  // ...******...
+     0x00000040,  // .....*......
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
   },
   {             // 232
      13, 27,
@@ -6006,23 +6006,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6036,23 +6036,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x000000E0,  // ......***....
-     0x00000180,  // .....**......
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6066,23 +6066,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000160,  // .....*.**....
-     0x00000320,  // ....**..*....
+     0x000000E0,  // .....***.....
+     0x000000B0,  // .....*.**....
+     0x00000190,  // ....**..*....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6097,22 +6097,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000370,  // ....**.***...
-     0x00000370,  // ....**.***...
+     0x000001B8,  // ....**.***...
+     0x000001B8,  // ....**.***...
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6126,23 +6126,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000070,  // ***...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6156,23 +6156,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6186,23 +6186,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001C,  // ..***.
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     0x0000000E,  // ..***.
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6217,22 +6217,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6246,23 +6246,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000420,  // ...*....*....
-     0x000007C0,  // ...*****.....
-     0x00000780,  // ...****......
-     0x000004C0,  // ...*..**.....
-     0x000000E0,  // ......***....
-     0x000003F0,  // ....******...
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000210,  // ...*....*....
+     0x000003E0,  // ...*****.....
+     0x000003C0,  // ...****......
+     0x00000260,  // ...*..**.....
+     0x00000070,  // ......***....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6276,23 +6276,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6306,23 +6306,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6336,23 +6336,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6366,23 +6366,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6396,23 +6396,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6427,22 +6427,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000760,  // ...***.**....
-     0x00000760,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6462,17 +6462,17 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6491,19 +6491,19 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007C8,  // ....*****..*..
-     0x00001FF0,  // ..*********...
-     0x00001830,  // ..**.....**...
-     0x00003078,  // .**.....****..
-     0x00003098,  // .**....*..**..
-     0x00003198,  // .**...**..**..
-     0x00003318,  // .**..**...**..
-     0x00003618,  // .**.**....**..
-     0x00003438,  // .**.*....***..
-     0x00001870,  // ..**....***...
-     0x00001FE0,  // ..********....
-     0x000027C0,  // .*..*****.....
-     0x00002000,  // .*............
+     0x000003E4,  // ....*****..*..
+     0x00000FF8,  // ..*********...
+     0x00000C18,  // ..**.....**...
+     0x0000183C,  // .**.....****..
+     0x0000184C,  // .**....*..**..
+     0x000018CC,  // .**...**..**..
+     0x0000198C,  // .**..**...**..
+     0x00001B0C,  // .**.**....**..
+     0x00001A1C,  // .**.*....***..
+     0x00000C38,  // ..**....***...
+     0x00000FF0,  // ..********....
+     0x000013E0,  // .*..*****.....
+     0x00001000,  // .*............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -6516,23 +6516,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000700,  // ...***.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000380,  // ...***.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6546,23 +6546,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000E0,  // ......***....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000070,  // ......***....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6576,23 +6576,23 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6607,22 +6607,22 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000006E0,  // ...**.***....
-     0x00000260,  // ....*..**....
+     0x00000370,  // ...**.***....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6636,28 +6636,28 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
-     0x00000080,  // .....*......
+     0x00000038,  // ......***...
+     0x00000070,  // .....***....
+     0x00000040,  // .....*......
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 254
      13, 27,
@@ -6667,27 +6667,27 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000019E0,  // .**..****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 255
      12, 27,
@@ -6697,26 +6697,26 @@ cFont::tPixelData FontOsd_iso8859_15[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000370,  // ...**.***...
-     0x00000370,  // ...**.***...
+     0x000001B8,  // ...**.***...
+     0x000001B8,  // ...**.***...
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   };
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index 4b68e4e5b..979c902b5 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -48,23 +48,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -79,12 +79,12 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x00000044,  // ..*...*.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000022,  // ..*...*.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -109,22 +109,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000118,  // .....*...**..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00000310,  // ....**...*...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000230,  // ....*...**...
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000620,  // ...**...*....
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
-     0x00000460,  // ...*...**....
-     0x00000C60,  // ..**...**....
-     0x00000C40,  // ..**...*.....
-     0x00000C40,  // ..**...*.....
+     0x0000008C,  // .....*...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00000188,  // ....**...*...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000118,  // ....*...**...
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000310,  // ...**...*....
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000230,  // ...*...**....
+     0x00000630,  // ..**...**....
+     0x00000620,  // ..**...*.....
+     0x00000620,  // ..**...*.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -137,27 +137,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000FF0,  // ..********...
-     0x00000CB8,  // ..**..*.***..
-     0x00001998,  // .**..**..**..
-     0x00001998,  // .**..**..**..
-     0x00001980,  // .**..**......
-     0x00001980,  // .**..**......
-     0x00000F80,  // ..*****......
-     0x000007E0,  // ...******....
-     0x000003F8,  // ....*******..
-     0x0000019C,  // .....**..***.
-     0x0000018C,  // .....**...**.
-     0x0000198C,  // .**..**...**.
-     0x0000198C,  // .**..**...**.
-     0x0000199C,  // .**..**..***.
-     0x00001D38,  // .***.*..***..
-     0x00000FF0,  // ..********...
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000007F8,  // ..********...
+     0x0000065C,  // ..**..*.***..
+     0x00000CCC,  // .**..**..**..
+     0x00000CCC,  // .**..**..**..
+     0x00000CC0,  // .**..**......
+     0x00000CC0,  // .**..**......
+     0x000007C0,  // ..*****......
+     0x000003F0,  // ...******....
+     0x000001FC,  // ....*******..
+     0x000000CE,  // .....**..***.
+     0x000000C6,  // .....**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CCE,  // .**..**..***.
+     0x00000E9C,  // .***.*..***..
+     0x000007F8,  // ..********...
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -169,22 +169,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00038040,  // ...***........*.....
-     0x000FE0C0,  // .*******.....**.....
-     0x001C7180,  // ***...***...**......
-     0x00183100,  // **.....**...*.......
-     0x00183300,  // **.....**..**.......
-     0x001C7200,  // ***...***..*........
-     0x000FE600,  // .*******..**........
-     0x0007C400,  // ..*****...*.........
-     0x00000C78,  // .........**...****..
-     0x000018FC,  // ........**...******.
-     0x000019CC,  // ........**..***..**.
-     0x00003186,  // .......**...**....**
-     0x00002186,  // .......*....**....**
-     0x00006186,  // ......**....**....**
-     0x0000C0FC,  // .....**......******.
-     0x0000C078,  // .....**.......****..
+     0x0001C020,  // ...***........*.....
+     0x0007F060,  // .*******.....**.....
+     0x000E38C0,  // ***...***...**......
+     0x000C1880,  // **.....**...*.......
+     0x000C1980,  // **.....**..**.......
+     0x000E3900,  // ***...***..*........
+     0x0007F300,  // .*******..**........
+     0x0003E200,  // ..*****...*.........
+     0x0000063C,  // .........**...****..
+     0x00000C7E,  // ........**...******.
+     0x00000CE6,  // ........**..***..**.
+     0x000018C3,  // .......**...**....**
+     0x000010C3,  // .......*....**....**
+     0x000030C3,  // ......**....**....**
+     0x0000607E,  // .....**......******.
+     0x0000603C,  // .....**.......****..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -199,22 +199,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000FC0,  // ....******.....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00001860,  // ...**....**....
-     0x00000DC0,  // ....**.***.....
-     0x00000F80,  // ....*****......
-     0x00000F00,  // ....****.......
-     0x00001F98,  // ...******..**..
-     0x00003198,  // ..**...**..**..
-     0x000060D8,  // .**.....**.**..
-     0x00006070,  // .**......***...
-     0x00006070,  // .**......***...
-     0x00007078,  // .***.....****..
-     0x00003FDC,  // ..********.***.
-     0x00001F00,  // ...*****.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000006E0,  // ....**.***.....
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000FCC,  // ...******..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000306C,  // .**.....**.**..
+     0x00003038,  // .**......***...
+     0x00003038,  // .**......***...
+     0x0000383C,  // .***.....****..
+     0x00001FEE,  // ..********.***.
+     0x00000F80,  // ...*****.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -228,12 +228,12 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000004,  // ...*.
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -258,28 +258,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000010,  // ....*...
-     0x00000018,  // ....**..
-     0x00000008,  // .....*..
-     0x00000008,  // .....*..
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000008,  // ....*...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
+     0x00000004,  // .....*..
   },
   {             // 41
      8, 27,
@@ -288,28 +288,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000080,  // .*......
-     0x00000040,  // ..*.....
-     0x00000060,  // ..**....
-     0x00000020,  // ...*....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000020,  // ...*....
-     0x00000060,  // ..**....
-     0x00000040,  // ..*.....
-     0x00000080,  // .*......
+     0x00000040,  // .*......
+     0x00000020,  // ..*.....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000040,  // .*......
   },
   {             // 42
      9, 27,
@@ -318,13 +318,13 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000020,  // ....*....
-     0x000001AC,  // .**.*.**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x00000088,  // ..*...*..
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
+     0x000000D6,  // .**.*.**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x00000044,  // ..*...*..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -354,17 +354,17 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -393,11 +393,11 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -419,8 +419,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000007F8,  // ...********..
-     0x000007F8,  // ...********..
+     0x000003FC,  // ...********..
+     0x000003FC,  // ...********..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -453,8 +453,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -462,29 +462,29 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
   },
   {             // 47
-     6, 27,
+     7, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000004,  // .....*.
-     0x00000004,  // .....*.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000008,  // ....*..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000010,  // ...*...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000020,  // ..*....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000040,  // .*.....
-     0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x00000080,  // *......
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000040,  // *......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -499,22 +499,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -529,22 +529,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000003C0,  // ....****.....
-     0x00000FC0,  // ..******.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001E0,  // ....****.....
+     0x000007E0,  // ..******.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -559,22 +559,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C1C,  // ..**.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000038,  // ........***..
-     0x000000F0,  // ......****...
-     0x000003C0,  // ....****.....
-     0x00000700,  // ...***.......
-     0x00000E00,  // ..***........
-     0x00000C00,  // ..**.........
-     0x00001800,  // .**..........
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000001C,  // ........***..
+     0x00000078,  // ......****...
+     0x000001E0,  // ....****.....
+     0x00000380,  // ...***.......
+     0x00000700,  // ..***........
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -589,22 +589,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000007E0,  // ...******....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x000001E0,  // .....****....
-     0x000001F8,  // .....******..
-     0x00000018,  // .........**..
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x000000F0,  // .....****....
+     0x000000FC,  // .....******..
+     0x0000000C,  // .........**..
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -619,22 +619,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000070,  // .......***...
-     0x000000F0,  // ......****...
-     0x000000F0,  // ......****...
-     0x000001B0,  // .....**.**...
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000430,  // ...*....**...
-     0x00000C30,  // ..**....**...
-     0x00001830,  // .**.....**...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000218,  // ...*....**...
+     0x00000618,  // ..**....**...
+     0x00000C18,  // .**.....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -649,22 +649,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FE0,  // ..*******....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x0000181C,  // .**......***.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C18,  // .***.....**..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007F0,  // ..*******....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0E,  // .**......***.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0C,  // .***.....**..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -679,22 +679,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E18,  // ..***....**..
-     0x00000C1C,  // ..**.....***.
-     0x00001C00,  // .***.........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000070C,  // ..***....**..
+     0x0000060E,  // ..**.....***.
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -709,22 +709,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000008,  // ..........*..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000700,  // ...***.......
-     0x00000600,  // ...**........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000004,  // ..........*..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000380,  // ...***.......
+     0x00000300,  // ...**........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -739,22 +739,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x000007E0,  // ...******....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003F0,  // ...******....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -769,22 +769,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C3C,  // .***....****.
-     0x00000FFC,  // ..**********.
-     0x000003EC,  // ....*****.**.
-     0x0000000C,  // ..........**.
-     0x0000001C,  // .........***.
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E1E,  // .***....****.
+     0x000007FE,  // ..**********.
+     0x000001F6,  // ....*****.**.
+     0x00000006,  // ..........**.
+     0x0000000E,  // .........***.
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -803,8 +803,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -813,8 +813,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -833,8 +833,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -843,11 +843,11 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
   },
@@ -864,17 +864,17 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000004,  // ...........*.
-     0x0000001C,  // .........***.
-     0x00000078,  // .......****..
-     0x000003C0,  // ....****.....
-     0x00000F00,  // ..****.......
-     0x00001C00,  // .***.........
-     0x00001E00,  // .****........
-     0x000003C0,  // ....****.....
-     0x000000F0,  // ......****...
-     0x0000001C,  // .........***.
-     0x00000004,  // ...........*.
+     0x00000002,  // ...........*.
+     0x0000000E,  // .........***.
+     0x0000003C,  // .......****..
+     0x000001E0,  // ....****.....
+     0x00000780,  // ..****.......
+     0x00000E00,  // .***.........
+     0x00000F00,  // .****........
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000000E,  // .........***.
+     0x00000002,  // ...........*.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -897,12 +897,12 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -924,17 +924,17 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001000,  // .*...........
-     0x00001C00,  // .***.........
-     0x00000780,  // ...****......
-     0x000001E0,  // .....****....
-     0x0000007C,  // .......*****.
-     0x0000000C,  // ..........**.
-     0x0000003C,  // ........****.
-     0x000000F0,  // ......****...
-     0x00000780,  // ...****......
-     0x00001E00,  // .****........
-     0x00001000,  // .*...........
+     0x00000800,  // .*...........
+     0x00000E00,  // .***.........
+     0x000003C0,  // ...****......
+     0x000000F0,  // .....****....
+     0x0000003E,  // .......*****.
+     0x00000006,  // ..........**.
+     0x0000001E,  // ........****.
+     0x00000078,  // ......****...
+     0x000003C0,  // ...****......
+     0x00000F00,  // .****........
+     0x00000800,  // .*...........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -948,23 +948,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -978,26 +978,26 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .......................
      0x00000000,  // .......................
      0x00000000,  // .......................
-     0x00007E00,  // .........******........
-     0x0003FFC0,  // ......************.....
-     0x000781E0,  // .....****......****....
-     0x000E0070,  // ....***..........***...
-     0x001C0038,  // ...***............***..
-     0x00383D18,  // ..***.....****.*...**..
-     0x0030FF9C,  // ..**....*********..***.
-     0x0031C38C,  // ..**...***....***...**.
-     0x0061830C,  // .**....**.....**....**.
-     0x0063030C,  // .**...**......**....**.
-     0x0063030C,  // .**...**......**....**.
-     0x00630618,  // .**...**.....**....**..
-     0x00630618,  // .**...**.....**....**..
-     0x00738E30,  // .***..***...***...**...
-     0x0031FFE0,  // ..**...************....
-     0x0038E3C0,  // ..***...***...****.....
-     0x001C0000,  // ...***.................
-     0x000F0000,  // ....****...............
-     0x0007FF00,  // .....***********.......
-     0x0000FE00,  // ........*******........
+     0x00003F00,  // .........******........
+     0x0001FFE0,  // ......************.....
+     0x0003C0F0,  // .....****......****....
+     0x00070038,  // ....***..........***...
+     0x000E001C,  // ...***............***..
+     0x001C1E8C,  // ..***.....****.*...**..
+     0x00187FCE,  // ..**....*********..***.
+     0x0018E1C6,  // ..**...***....***...**.
+     0x0030C186,  // .**....**.....**....**.
+     0x00318186,  // .**...**......**....**.
+     0x00318186,  // .**...**......**....**.
+     0x0031830C,  // .**...**.....**....**..
+     0x0031830C,  // .**...**.....**....**..
+     0x0039C718,  // .***..***...***...**...
+     0x0018FFF0,  // ..**...************....
+     0x001C71E0,  // ..***...***...****.....
+     0x000E0000,  // ...***.................
+     0x00078000,  // ....****...............
+     0x0003FF80,  // .....***********.......
+     0x00007F00,  // ........*******........
      0x00000000,  // .......................
      0x00000000,  // .......................
   },
@@ -1008,23 +1008,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1038,23 +1038,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x00003038,  // ..**......***..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF0,  // ..**********...
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003FF8,  // ..***********..
-     0x00003FF0,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1068,23 +1068,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x00007030,  // ...***......**...
-     0x00007FF0,  // ...***********...
-     0x00001FC0,  // .....*******.....
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1098,23 +1098,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FF80,  // ..*********......
-     0x0000FFE0,  // ..***********....
-     0x0000C0E0,  // ..**......***....
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C0E0,  // ..**......***....
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006070,  // ..**......***....
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1128,23 +1128,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1158,23 +1158,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1188,23 +1188,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C030,  // ..***........**...
-     0x00018018,  // ..**..........**..
-     0x00038000,  // .***..............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x000303F8,  // .**......*******..
-     0x000303F8,  // .**......*******..
-     0x00030018,  // .**...........**..
-     0x00038018,  // .***..........**..
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E078,  // ...***......****..
-     0x00007FD8,  // ....*********.**..
-     0x00001F88,  // ......******...*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E018,  // ..***........**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x000181FC,  // .**......*******..
+     0x000181FC,  // .**......*******..
+     0x0001800C,  // .**...........**..
+     0x0001C00C,  // .***..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x0000703C,  // ...***......****..
+     0x00003FEC,  // ....*********.**..
+     0x00000FC4,  // ......******...*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1218,23 +1218,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000FFF8,  // ..*************..
-     0x0000FFF8,  // ..*************..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00007FFC,  // ..*************..
+     0x00007FFC,  // ..*************..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1248,23 +1248,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1278,23 +1278,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00001818,  // **......**..
-     0x00001818,  // **......**..
-     0x00001C38,  // ***....***..
-     0x00000FF0,  // .********...
-     0x000007E0,  // ..******....
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000C0C,  // **......**..
+     0x00000C0C,  // **......**..
+     0x00000E1C,  // ***....***..
+     0x000007F8,  // .********...
+     0x000003F0,  // ..******....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1308,23 +1308,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000300E,  // ..**........***
-     0x0000301C,  // ..**.......***.
-     0x00003038,  // ..**......***..
-     0x00003070,  // ..**.....***...
-     0x000030E0,  // ..**....***....
-     0x000031C0,  // ..**...***.....
-     0x00003380,  // ..**..***......
-     0x00003780,  // ..**.****......
-     0x00003F80,  // ..*******......
-     0x00003DC0,  // ..****.***.....
-     0x000038E0,  // ..***...***....
-     0x00003060,  // ..**.....**....
-     0x00003030,  // ..**......**...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300E,  // ..**........***
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001BC0,  // ..**.****......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001807,  // ..**........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1338,23 +1338,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1368,23 +1368,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00038038,  // ..***.........***..
-     0x00038038,  // ..***.........***..
-     0x0003C038,  // ..****........***..
-     0x0003C078,  // ..****.......****..
-     0x0003C078,  // ..****.......****..
-     0x00036058,  // ..**.**......*.**..
-     0x000360D8,  // ..**.**.....**.**..
-     0x000360D8,  // ..**.**.....**.**..
-     0x00033098,  // ..**..**....*..**..
-     0x00033198,  // ..**..**...**..**..
-     0x00033198,  // ..**..**...**..**..
-     0x00031918,  // ..**...**..*...**..
-     0x00031B18,  // ..**...**.**...**..
-     0x00031B18,  // ..**...**.**...**..
-     0x00030F18,  // ..**....****...**..
-     0x00030E18,  // ..**....***....**..
-     0x00030E18,  // ..**....***....**..
+     0x0001C01C,  // ..***.........***..
+     0x0001C01C,  // ..***.........***..
+     0x0001E01C,  // ..****........***..
+     0x0001E03C,  // ..****.......****..
+     0x0001E03C,  // ..****.......****..
+     0x0001B02C,  // ..**.**......*.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001984C,  // ..**..**....*..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x00018C8C,  // ..**...**..*...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x0001878C,  // ..**....****...**..
+     0x0001870C,  // ..**....***....**..
+     0x0001870C,  // ..**....***....**..
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -1398,23 +1398,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1428,23 +1428,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1458,23 +1458,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FE0,  // ..*********....
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000301C,  // ..**.......***.
-     0x00003FF8,  // ..***********..
-     0x00003FE0,  // ..*********....
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1488,24 +1488,24 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018098,  // ..**.......*..**..
-     0x0001C1F8,  // ..***.....******..
-     0x0000E0F0,  // ...***.....****...
-     0x00007FF0,  // ....***********...
-     0x00001F9C,  // ......******..***.
-     0x00000008,  // ...............*..
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C04C,  // ..**.......*..**..
+     0x0000E0FC,  // ..***.....******..
+     0x00007078,  // ...***.....****...
+     0x00003FF8,  // ....***********...
+     0x00000FCE,  // ......******..***.
+     0x00000004,  // ...............*..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1518,23 +1518,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFC0,  // ..**********.....
-     0x0000FFF0,  // ..************...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C01C,  // ..**.........***.
+     0x00007FE0,  // ..**********.....
+     0x00007FF8,  // ..************...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00007FF0,  // ..***********....
+     0x00007FF8,  // ..************...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1548,23 +1548,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00003018,  // ..**.......**..
-     0x00003008,  // ..**........*..
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FF0,  // ....********...
-     0x000000F8,  // ........*****..
-     0x0000001C,  // ...........***.
-     0x0000000C,  // ............**.
-     0x0000600C,  // .**.........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1578,23 +1578,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1608,23 +1608,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1638,23 +1638,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000301C,  // ..**.......***.
-     0x00003818,  // ..***......**..
-     0x00001818,  // ...**......**..
-     0x00001838,  // ...**.....***..
-     0x00001C30,  // ...***....**...
-     0x00000C30,  // ....**....**...
-     0x00000C70,  // ....**...***...
-     0x00000E60,  // ....***..**....
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
-     0x000007C0,  // .....*****.....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001C0C,  // ..***......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E18,  // ...***....**...
+     0x00000618,  // ....**....**...
+     0x00000638,  // ....**...***...
+     0x00000730,  // ....***..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1668,23 +1668,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
-     0x0030180C,  // .**.......**.......**.
-     0x0030380C,  // .**......***.......**.
-     0x00303C1C,  // .**......****.....***.
-     0x00383C1C,  // .***.....****.....***.
-     0x00183C18,  // ..**.....****.....**..
-     0x00186618,  // ..**....**..**....**..
-     0x00186618,  // ..**....**..**....**..
-     0x001C6638,  // ..***...**..**...***..
-     0x000CC630,  // ...**..**...**...**...
-     0x000CC330,  // ...**..**....**..**...
-     0x000CC330,  // ...**..**....**..**...
-     0x000EC370,  // ...***.**....**.***...
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000781C0,  // ....****......***.....
-     0x000300C0,  // .....**........**.....
+     0x00180C06,  // .**.......**.......**.
+     0x00181C06,  // .**......***.......**.
+     0x00181E0E,  // .**......****.....***.
+     0x001C1E0E,  // .***.....****.....***.
+     0x000C1E0C,  // ..**.....****.....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000E331C,  // ..***...**..**...***..
+     0x00066318,  // ...**..**...**...**...
+     0x00066198,  // ...**..**....**..**...
+     0x00066198,  // ...**..**....**..**...
+     0x000761B8,  // ...***.**....**.***...
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0E0,  // ....****......***.....
+     0x00018060,  // .....**........**.....
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
@@ -1698,23 +1698,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000700C,  // .***........**.
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C70,  // ....**...***...
-     0x00000660,  // .....**..**....
-     0x000007C0,  // .....*****.....
-     0x000003C0,  // ......****.....
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000006C0,  // .....**.**.....
-     0x00000E60,  // ....***..**....
-     0x00001C70,  // ...***...***...
-     0x00001838,  // ...**.....***..
-     0x00003818,  // ..***......**..
-     0x0000701C,  // .***.......***.
-     0x0000600E,  // .**.........***
+     0x00003806,  // .***........**.
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000638,  // ....**...***...
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000730,  // ....***..**....
+     0x00000E38,  // ...***...***...
+     0x00000C1C,  // ...**.....***..
+     0x00001C0C,  // ..***......**..
+     0x0000380E,  // .***.......***.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1728,23 +1728,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700E,  // .***........***
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C30,  // ....**....**...
-     0x00000E60,  // ....***..**....
-     0x00000760,  // .....***.**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1758,23 +1758,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x0000001C,  // ..........***.
-     0x00000018,  // ..........**..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001C00,  // ..***.........
-     0x00003800,  // .***..........
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1788,53 +1788,53 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
   },
   {             // 92
-     6, 27,
+     7, 27,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000080,  // *......
-     0x000000C0,  // **.....
-     0x00000040,  // .*.....
-     0x00000040,  // .*.....
-     0x00000060,  // .**....
-     0x00000020,  // ..*....
-     0x00000020,  // ..*....
-     0x00000020,  // ..*....
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x0000000C,  // ....**.
-     0x00000004,  // .....*.
-     0x00000004,  // .....*.
+     0x00000040,  // *......
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1848,28 +1848,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
   },
   {             // 94
      11, 27,
@@ -1879,14 +1879,14 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001A0,  // ...**.*....
-     0x000001B0,  // ...**.**...
-     0x00000110,  // ...*...*...
-     0x00000318,  // ..**...**..
-     0x00000218,  // ..*....**..
-     0x00000608,  // .**.....*..
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D0,  // ...**.*....
+     0x000000D8,  // ...**.**...
+     0x00000088,  // ...*...*...
+     0x0000018C,  // ..**...**..
+     0x0000010C,  // ..*....**..
+     0x00000304,  // .**.....*..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1902,34 +1902,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...........
   },
   {             // 95
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000000,  // .............
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x00000000,  // ..............
   },
   {             // 96
      5, 27,
@@ -1939,11 +1939,11 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1973,18 +1973,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1998,23 +1998,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000003E0,  // ....*****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2033,18 +2033,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2058,23 +2058,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007C0,  // ...*****.....
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2093,18 +2093,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2118,23 +2118,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2153,23 +2153,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x000007F8,  // ...********..
-     0x000003D8,  // ....****.**..
-     0x00000018,  // .........**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x000007C0,  // ...*****.....
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x000003E0,  // ...*****.....
   },
   {             // 104
      13, 27,
@@ -2178,23 +2178,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000DF0,  // ..**.*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2208,23 +2208,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2238,28 +2238,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
   },
   {             // 107
      12, 27,
@@ -2268,23 +2268,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C18,  // .**.....**..
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000CC0,  // .**..**.....
-     0x00000FC0,  // .******.....
-     0x00000FC0,  // .******.....
-     0x00000E60,  // .***..**....
-     0x00000C70,  // .**...***...
-     0x00000C30,  // .**....**...
-     0x00000C18,  // .**.....**..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000007E0,  // .******.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000638,  // .**...***...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2298,23 +2298,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2333,18 +2333,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00037CF8,  // ..**.*****..*****..
-     0x0003FFFC,  // ..****************.
-     0x0003870C,  // ..***....***....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
-     0x0003060C,  // ..**.....**.....**.
+     0x0001BE7C,  // ..**.*****..*****..
+     0x0001FFFE,  // ..****************.
+     0x0001C386,  // ..***....***....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -2363,18 +2363,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2393,18 +2393,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2423,23 +2423,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001BE0,  // .**.*****....
-     0x00001FF8,  // .**********..
-     0x00001E38,  // .****...***..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00001E38,  // .****...***..
-     0x00001FF8,  // .**********..
-     0x000019E0,  // .**..****....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 113
      13, 27,
@@ -2453,26 +2453,26 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007D8,  // ...*****.**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003EC,  // ...*****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
   },
   {             // 114
-     8, 27,
+     10, 27,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2513,18 +2513,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000007F8,  // ..********..
-     0x00000C18,  // .**.....**..
-     0x00000C00,  // .**.........
-     0x00000E00,  // .***........
-     0x000007E0,  // ..******....
-     0x000001F8,  // ....******..
-     0x0000001C,  // ........***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2540,21 +2540,21 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2573,18 +2573,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2603,18 +2603,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000E18,  // .***....**..
-     0x00000638,  // ..**...***..
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
+     0x00000E06,  // ***......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000070C,  // .***....**..
+     0x0000031C,  // ..**...***..
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2633,18 +2633,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0003060C,  // **.....**.....**.
-     0x0001870C,  // .**....***....**.
-     0x00018F1C,  // .**...****...***.
-     0x00018F18,  // .**...****...**..
-     0x00018D98,  // .**...**.**..**..
-     0x0000C998,  // ..**..*..**..**..
-     0x0000D9B0,  // ..**.**..**.**...
-     0x0000D9B0,  // ..**.**..**.**...
-     0x000058F0,  // ...*.**...****...
-     0x000070F0,  // ...***....****...
-     0x000070E0,  // ...***....***....
-     0x000070E0,  // ...***....***....
+     0x00018306,  // **.....**.....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C78E,  // .**...****...***.
+     0x0000C78C,  // .**...****...**..
+     0x0000C6CC,  // .**...**.**..**..
+     0x000064CC,  // ..**..*..**..**..
+     0x00006CD8,  // ..**.**..**.**...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00002C78,  // ...*.**...****...
+     0x00003878,  // ...***....****...
+     0x00003870,  // ...***....***....
+     0x00003870,  // ...***....***....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -2663,18 +2663,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000003E0,  // ...*****....
-     0x00000370,  // ...**.***...
-     0x00000630,  // ..**...**...
-     0x00000E18,  // .***....**..
-     0x00000C1C,  // .**.....***.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x0000070C,  // .***....**..
+     0x0000060E,  // .**.....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2693,23 +2693,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 122
      12, 27,
@@ -2723,18 +2723,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2748,28 +2748,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000038,  // ...***..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000070,  // ..***...
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000038,  // ...***..
-     0x00000018,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000038,  // ..***...
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
   },
   {             // 124
      6, 27,
@@ -2778,28 +2778,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 125
      8, 27,
@@ -2808,28 +2808,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000C0,  // .**.....
-     0x000000E0,  // .***....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000038,  // ...***..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x000000E0,  // .***....
-     0x000000C0,  // .**.....
+     0x00000060,  // .**.....
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
   },
   {             // 126
      13, 27,
@@ -2845,10 +2845,10 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000700,  // ...***.......
-     0x00000F8C,  // ..*****...**.
-     0x000008FC,  // ..*...******.
-     0x00000038,  // ........***..
+     0x00000380,  // ...***.......
+     0x000007C6,  // ..*****...**.
+     0x0000047E,  // ..*...******.
+     0x0000001C,  // ........***..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3893,23 +3893,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
   },
   {             // 162
      13, 27,
@@ -3921,23 +3921,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000003F0,  // ....******...
-     0x00000FF8,  // ..*********..
-     0x00000E58,  // ..***..*.**..
-     0x00001C4C,  // .***...*..**.
-     0x00001840,  // .**....*.....
-     0x00001840,  // .**....*.....
-     0x00001880,  // .**...*......
-     0x00001880,  // .**...*......
-     0x0000188C,  // .**...*...**.
-     0x00000C9C,  // ..**..*..***.
-     0x00000EB8,  // ..***.*.***..
-     0x000007F0,  // ...*******...
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000072C,  // ..***..*.**..
+     0x00000E26,  // .***...*..**.
+     0x00000C20,  // .**....*.....
+     0x00000C20,  // .**....*.....
+     0x00000C40,  // .**...*......
+     0x00000C40,  // .**...*......
+     0x00000C46,  // .**...*...**.
+     0x0000064E,  // ..**..*..***.
+     0x0000075C,  // ..***.*.***..
+     0x000003F8,  // ...*******...
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -3948,23 +3948,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000E00,  // ..***........
-     0x00001FC0,  // .*******.....
-     0x00001F40,  // .*****.*.....
-     0x00000700,  // ...***.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000600,  // ...**........
-     0x00000C00,  // ..**.........
-     0x00001FFC,  // .***********.
-     0x00001FF8,  // .**********..
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x00000700,  // ..***........
+     0x00000FE0,  // .*******.....
+     0x00000FA0,  // .*****.*.....
+     0x00000380,  // ...***.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000600,  // ..**.........
+     0x00000FFE,  // .***********.
+     0x00000FFC,  // .**********..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3982,16 +3982,16 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000408,  // ...*......*..
-     0x00000FD8,  // ..******.**..
-     0x00000FF8,  // ..*********..
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x00000FD8,  // ..******.**..
-     0x00000408,  // ...*......*..
+     0x00000204,  // ...*......*..
+     0x000007EC,  // ..******.**..
+     0x000007FC,  // ..*********..
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000007EC,  // ..******.**..
+     0x00000204,  // ...*......*..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4009,22 +4009,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00000C18,  // ..**.....**..
-     0x00000C30,  // ..**....**...
-     0x00000620,  // ...**...*....
-     0x00000260,  // ....*..**....
-     0x000003C0,  // ....****.....
-     0x00001DF8,  // .***.******..
-     0x00001FF8,  // .**********..
-     0x00000180,  // .....**......
-     0x00001FF8,  // .**********..
-     0x00001FF8,  // .**********..
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000618,  // ..**....**...
+     0x00000310,  // ...**...*....
+     0x00000130,  // ....*..**....
+     0x000001E0,  // ....****.....
+     0x00000EFC,  // .***.******..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4038,28 +4038,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 167
      13, 27,
@@ -4068,28 +4068,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F0,  // ...*******...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000E00,  // ..***........
-     0x00000780,  // ...****......
-     0x00000DE0,  // ..**.****....
-     0x000018F0,  // .**...****...
-     0x00001838,  // .**.....***..
-     0x0000181C,  // .**......***.
-     0x00001C0C,  // .***......**.
-     0x00000E0C,  // ..***.....**.
-     0x00000798,  // ...****..**..
-     0x000001F0,  // .....*****...
-     0x000000E0,  // ......***....
-     0x00000070,  // .......***...
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000E30,  // ..***...**...
-     0x000007E0,  // ...******....
-     0x000003C0,  // ....****.....
+     0x000000F0,  // .....****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000700,  // ..***........
+     0x000003C0,  // ...****......
+     0x000006F0,  // ..**.****....
+     0x00000C78,  // .**...****...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000E06,  // .***......**.
+     0x00000706,  // ..***.....**.
+     0x000003CC,  // ...****..**..
+     0x000000F8,  // .....*****...
+     0x00000070,  // ......***....
+     0x00000038,  // .......***...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000718,  // ..***...**...
+     0x000003F0,  // ...******....
+     0x000001E0,  // ....****.....
   },
   {             // 168
      8, 27,
@@ -4099,8 +4099,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4123,28 +4123,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 169 iso8859-2
      15, 27,
-     0x00000C30,  // ....**....**...
-     0x00000660,  // .....**..**....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
+     0x00000618,  // ....**....**...
+     0x00000330,  // .....**..**....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00003018,  // ..**.......**..
-     0x00003008,  // ..**........*..
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FF0,  // ....********...
-     0x000000F8,  // ........*****..
-     0x0000001C,  // ...........***.
-     0x0000000C,  // ............**.
-     0x0000600C,  // .**.........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4158,53 +4158,53 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00001838,  // ...**.....***..
-     0x00003018,  // ..**.......**..
-     0x00003008,  // ..**........*..
-     0x00003000,  // ..**...........
-     0x00003800,  // ..***..........
-     0x00001F00,  // ...*****.......
-     0x00000FF0,  // ....********...
-     0x000000F8,  // ........*****..
-     0x0000001C,  // ...........***.
-     0x0000000C,  // ............**.
-     0x0000600C,  // .**.........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00001FF0,  // ...*********...
-     0x00000FE0,  // ....*******....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
      0x00000000,  // ...............
-     0x00000780,  // .....****......
-     0x00000180,  // .......**......
-     0x00000F80,  // ....*****......
-     0x00000700,  // .....***.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
   },
   {             // 171
      14, 27,
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4226,13 +4226,13 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4258,8 +4258,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000F8,  // .*****..
-     0x000000F8,  // .*****..
+     0x0000007C,  // .*****..
+     0x0000007C,  // .*****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4273,28 +4273,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 174 iso8859-2
      14, 27,
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x0000001C,  // ..........***.
-     0x00000018,  // ..........**..
-     0x00000038,  // .........***..
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001C00,  // ..***.........
-     0x00003800,  // .***..........
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4309,8 +4309,8 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4339,14 +4339,14 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x000007E0,  // ....******....
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000007E0,  // ....******....
-     0x000003C0,  // .....****.....
+     0x000001E0,  // .....****.....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000003F0,  // ....******....
+     0x000001E0,  // .....****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4371,20 +4371,20 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4399,16 +4399,16 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FE,  // .*******
-     0x00000086,  // .*....**
-     0x00000006,  // ......**
-     0x0000000C,  // .....**.
-     0x00000030,  // ...**...
-     0x000000E0,  // .***....
-     0x00000080,  // .*......
-     0x000000FE,  // .*******
-     0x0000007E,  // ..******
+     0x0000003C,  // ..****..
+     0x0000007F,  // .*******
+     0x00000043,  // .*....**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000040,  // .*......
+     0x0000007F,  // .*******
+     0x0000003F,  // ..******
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4429,16 +4429,16 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FC,  // .******.
-     0x0000008C,  // .*...**.
-     0x0000000C,  // .....**.
-     0x00000038,  // ...***..
-     0x0000000C,  // .....**.
-     0x00000006,  // ......**
-     0x00000186,  // **....**
-     0x000000FC,  // .******.
-     0x00000078,  // ..****..
+     0x0000003C,  // ..****..
+     0x0000007E,  // .******.
+     0x00000046,  // .*...**.
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x00000006,  // .....**.
+     0x00000003,  // ......**
+     0x000000C3,  // **....**
+     0x0000007E,  // .******.
+     0x0000003C,  // ..****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4458,9 +4458,9 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x00000038,  // ...***..
-     0x00000030,  // ...**...
+     0x0000000E,  // ....***.
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4493,23 +4493,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x00001FDE,  // .*******.****
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x00000FEF,  // .*******.****
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
   },
   {             // 182
      12, 27,
@@ -4518,27 +4518,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001FE,  // ....********
-     0x000003FE,  // ...*********
-     0x000007EC,  // ..******.**.
-     0x000007EC,  // ..******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x00000FEC,  // .*******.**.
-     0x000007EC,  // ..******.**.
-     0x000007EC,  // ..******.**.
-     0x000001EC,  // ....****.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
-     0x0000006C,  // ......**.**.
+     0x000000FF,  // ....********
+     0x000001FF,  // ...*********
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000000F6,  // ....****.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
      0x00000000,  // ............
   },
   {             // 183
@@ -4555,9 +4555,9 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4595,11 +4595,11 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000010,  // ....*...
-     0x00000038,  // ...***..
-     0x0000003C,  // ...****.
-     0x000000FC,  // .******.
-     0x00000038,  // ...***..
+     0x00000008,  // ....*...
+     0x0000001C,  // ...***..
+     0x0000001E,  // ...****.
+     0x0000007E,  // .******.
+     0x0000001C,  // ...***..
   },
   {             // 185 iso8859-2
      12, 27,
@@ -4609,22 +4609,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000007F8,  // ..********..
-     0x00000C18,  // .**.....**..
-     0x00000C00,  // .**.........
-     0x00000E00,  // .***........
-     0x000007E0,  // ..******....
-     0x000001F8,  // ....******..
-     0x0000001C,  // ........***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x000003F0,  // ...******...
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4632,7 +4632,7 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
   },
   {             // 186 iso8859-2
-     12, 27,
+     13, 27,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4662,34 +4662,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x000001C0,  // ....***......
   },
   {             // 187
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x00000007,  // ...***
-     0x00000003,   // ....**
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     7, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000007,  // ....***
+     0x00000007,  // ....***
+     0x00000003,  // .....**
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000003F,  // .******
+     0x0000003F,  // .******
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000F,  // ...****
+     0x0000000F,  // ...****
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
   {             // 188
      20, 27,
@@ -4699,22 +4699,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00030060,  // ...**.........**....
-     0x00070040,  // ..***.........*.....
-     0x000F0080,  // .****........*......
-     0x00030180,  // ...**.......**......
-     0x00030300,  // ...**......**.......
-     0x00030200,  // ...**......*........
-     0x00030618,  // ...**.....**....**..
-     0x00030C18,  // ...**....**.....**..
-     0x00030C38,  // ...**....**....***..
-     0x00001878,  // ........**....****..
-     0x000030D8,  // .......**....**.**..
-     0x00007098,  // ......***....*..**..
-     0x000061FE,  // ......**....********
-     0x0000C1FE,  // .....**.....********
-     0x0001C018,  // ....***.........**..
-     0x00018008,  // ....**...........*..
+     0x00018030,  // ...**.........**....
+     0x00038020,  // ..***.........*.....
+     0x00078040,  // .****........*......
+     0x000180C0,  // ...**.......**......
+     0x00018180,  // ...**......**.......
+     0x00018100,  // ...**......*........
+     0x0001830C,  // ...**.....**....**..
+     0x0001860C,  // ...**....**.....**..
+     0x0001861C,  // ...**....**....***..
+     0x00000C3C,  // ........**....****..
+     0x0000186C,  // .......**....**.**..
+     0x0000384C,  // ......***....*..**..
+     0x000030FF,  // ......**....********
+     0x000060FF,  // .....**.....********
+     0x0000E00C,  // ....***.........**..
+     0x0000C004,  // ....**...........*..
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4729,22 +4729,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00030040,  // ...**.........*.....
-     0x00070080,  // ..***........*......
-     0x000F0180,  // .****.......**......
-     0x00030100,  // ...**.......*.......
-     0x00030300,  // ...**......**.......
-     0x00030600,  // ...**.....**........
-     0x00030C78,  // ...**....**...****..
-     0x00030CFC,  // ...**....**..******.
-     0x00031886,  // ...**...**...*....**
-     0x00003086,  // .......**....*....**
-     0x0000300C,  // .......**........**.
-     0x00006018,  // ......**........**..
-     0x0000C060,  // .....**.......**....
-     0x0000C080,  // .....**......*......
-     0x000181FE,  // ....**......********
-     0x0003007E,  // ...**.........******
+     0x00018020,  // ...**.........*.....
+     0x00038040,  // ..***........*......
+     0x000780C0,  // .****.......**......
+     0x00018080,  // ...**.......*.......
+     0x00018180,  // ...**......**.......
+     0x00018300,  // ...**.....**........
+     0x0001863C,  // ...**....**...****..
+     0x0001867E,  // ...**....**..******.
+     0x00018C43,  // ...**...**...*....**
+     0x00001843,  // .......**....*....**
+     0x00001806,  // .......**........**.
+     0x0000300C,  // ......**........**..
+     0x00006030,  // .....**.......**....
+     0x00006040,  // .....**......*......
+     0x0000C0FF,  // ....**......********
+     0x0001803F,  // ...**.........******
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4759,22 +4759,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4793,48 +4793,48 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000380,  // .....***......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00000C00,  // ...**.........
-     0x00001800,  // ..**..........
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001C38,  // ..***....***..
-     0x00000FF0,  // ...********...
-     0x000007C0,  // ....*****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E1C,  // ..***....***..
+     0x000007F8,  // ...********...
+     0x000003E0,  // ....*****.....
   },
   {             // 192
      15, 27,
-     0x00000E00,  // ....***........
-     0x00000700,  // .....***.......
-     0x00000100,  // .......*.......
-     0x00000080,  // ........*......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000080,  // .......*.......
+     0x00000040,  // ........*......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4843,28 +4843,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 193 iso8859-2
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4873,28 +4873,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 194
      15, 27,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x000006C0,  // .....**.**.....
-     0x00000460,  // .....*...**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000230,  // .....*...**....
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4904,27 +4904,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 195 iso8859-2
      15, 27,
      0x00000000,  // ...............
-     0x00000C30,  // ....**...**....
-     0x00000660,  // .....**.**.....
-     0x00000380,  // ......***......
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4934,27 +4934,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 196
      15, 27,
      0x00000000,  // ...............
-     0x000006E0,  // .....**.***....
-     0x000006E0,  // .....**.***....
+     0x00000370,  // .....**.***....
+     0x00000370,  // .....**.***....
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4963,28 +4963,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 197
      15, 27,
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x00000240,  // ......*..*.....
-     0x00000380,  // ......***......
-     0x00000180,  // .......**......
-     0x00000380,  // ......***......
-     0x000003C0,  // ......****.....
-     0x000007C0,  // .....*****.....
-     0x000006C0,  // .....**.**.....
-     0x000006E0,  // .....**.***....
-     0x00000E60,  // ....***..**....
-     0x00000C60,  // ....**...**....
-     0x00000C70,  // ....**...***...
-     0x00001C30,  // ...***....**...
-     0x00001830,  // ...**.....**...
-     0x00001FF8,  // ...**********..
-     0x00003FF8,  // ..***********..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000700C,  // .***........**.
-     0x0000600C,  // .**.........**.
-     0x0000600E,  // .**.........***
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000120,  // ......*..*.....
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4993,28 +4993,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 198 iso8859-2
      17, 27,
-     0x000000E0,  // ..........***....
-     0x000000C0,  // ..........**.....
-     0x00000180,  // .........**......
-     0x00000300,  // ........**.......
+     0x00000070,  // ..........***....
+     0x00000060,  // ..........**.....
+     0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x00007030,  // ...***......**...
-     0x00007FF0,  // ...***********...
-     0x00001FC0,  // .....*******.....
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5028,53 +5028,53 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006030,  // ...**.......**...
-     0x000078F0,  // ...****...****...
-     0x00001FE0,  // .....********....
-     0x00000200,  // ........*........
-     0x00000700,  // .......***.......
-     0x00000380,  // ........***......
-     0x00000F80,  // ......*****......
-     0x00000700,  // .......***.......
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003018,  // ...**.......**...
+     0x00003C78,  // ...****...****...
+     0x00000FF0,  // .....********....
+     0x00000100,  // ........*........
+     0x00000380,  // .......***.......
+     0x000001C0,  // ........***......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
   },
   {             // 200 iso8859-2
      17, 27,
-     0x00001860,  // .....**....**....
-     0x00000CC0,  // ......**..**.....
-     0x00000780,  // .......****......
-     0x00000300,  // ........**.......
+     0x00000C30,  // .....**....**....
+     0x00000660,  // ......**..**.....
+     0x000003C0,  // .......****......
+     0x00000180,  // ........**.......
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0000C000,  // ..**.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018018,  // .**..........**..
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x00007030,  // ...***......**...
-     0x00007FF0,  // ...***********...
-     0x00001FC0,  // .....*******.....
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5083,28 +5083,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 201 iso8859-2
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5113,28 +5113,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 202
      15, 27,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x00000640,  // .....**..*.....
-     0x00000460,  // .....*...**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000320,  // .....**..*.....
+     0x00000230,  // .....*...**....
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5144,27 +5144,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 203
      15, 27,
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5173,28 +5173,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 204
      15, 27,
-     0x00000C30,  // ....**....**...
-     0x00000660,  // .....**..**....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
+     0x00000618,  // ....**....**...
+     0x00000330,  // .....**..**....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003000,  // ..**...........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5202,29 +5202,29 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ...............
   },
   {             // 205 iso8859-2
-     6, 27,
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000000,  // ......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     7, 27,
+     0x00000006,  // ....**.
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000000,  // .......
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5232,7 +5232,7 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .......
   },
   {             // 206
-     7, 27,
+     8, 27,
      0x00000030,  // ..**....
      0x00000078,  // .****...
      0x00000048,  // .*..*...
@@ -5264,27 +5264,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 207
      6, 27,
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5298,23 +5298,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FF80,  // ..*********......
-     0x0000FFE0,  // ..***********....
-     0x0000C0F0,  // ..**......****...
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0003FC18,  // ********.....**..
-     0x0003FC18,  // ********.....**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000C030,  // ..**........**...
-     0x0000C0E0,  // ..**......***....
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006078,  // ..**......****...
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0001FE0C,  // ********.....**..
+     0x0001FE0C,  // ********.....**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5324,27 +5324,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 209
      17, 27,
      0x00000000,  // .................
-     0x00000EC0,  // ......***.**.....
-     0x00001FC0,  // .....*******.....
-     0x00000180,  // .........**......
+     0x00000760,  // ......***.**.....
+     0x00000FE0,  // .....*******.....
+     0x000000C0,  // .........**......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5353,28 +5353,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 210 iso8859-2
      17, 27,
-     0x00001860,  // .....**....**....
-     0x00000CC0,  // ......**..**.....
-     0x00000780,  // .......****......
-     0x00000300,  // ........**.......
+     0x00000C30,  // .....**....**....
+     0x00000660,  // ......**..**.....
+     0x000003C0,  // .......****......
+     0x00000180,  // ........**.......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000E018,  // ..***........**..
-     0x0000F018,  // ..****.......**..
-     0x0000F018,  // ..****.......**..
-     0x0000D818,  // ..**.**......**..
-     0x0000DC18,  // ..**.***.....**..
-     0x0000CC18,  // ..**..**.....**..
-     0x0000C618,  // ..**...**....**..
-     0x0000C718,  // ..**...***...**..
-     0x0000C318,  // ..**....**...**..
-     0x0000C398,  // ..**....***..**..
-     0x0000C198,  // ..**.....**..**..
-     0x0000C0D8,  // ..**......**.**..
-     0x0000C0F8,  // ..**......*****..
-     0x0000C078,  // ..**.......****..
-     0x0000C038,  // ..**........***..
-     0x0000C038,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5383,28 +5383,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 211 iso8859-2
      18, 27,
-     0x00000180,  // ..........**......
-     0x00000300,  // .........**.......
-     0x00000600,  // ........**........
-     0x00000400,  // ........*.........
+     0x000000C0,  // ..........**......
+     0x00000180,  // .........**.......
+     0x00000300,  // ........**........
+     0x00000200,  // ........*.........
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5413,28 +5413,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 212 iso8859-2
      18, 27,
-     0x00000600,  // ........**........
-     0x00000F00,  // .......****.......
-     0x00000900,  // .......*..*.......
-     0x00001080,  // ......*....*......
+     0x00000300,  // ........**........
+     0x00000780,  // .......****.......
+     0x00000480,  // .......*..*.......
+     0x00000840,  // ......*....*......
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5444,27 +5444,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 213
      18, 27,
      0x00000000,  // ..................
-     0x00001CC0,  // ......***..**.....
-     0x00001F80,  // ......******......
-     0x00000180,  // ..........**......
+     0x00000E60,  // ......***..**.....
+     0x00000FC0,  // ......******......
+     0x000000C0,  // ..........**......
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5474,27 +5474,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 214
      18, 27,
      0x00000000,  // ..................
-     0x00001980,  // ......**..**......
-     0x00001980,  // ......**..**......
+     0x00000CC0,  // ......**..**......
+     0x00000CC0,  // ......**..**......
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E0F0,  // ...***.....****...
-     0x0001C038,  // ..***........***..
-     0x00018018,  // ..**..........**..
-     0x0003801C,  // .***..........***.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x0003000C,  // .**............**.
-     0x00018018,  // ..**..........**..
-     0x0001C038,  // ..***........***..
-     0x0000E070,  // ...***......***...
-     0x00007FE0,  // ....**********....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5515,15 +5515,15 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000408,  // ...*......*..
-     0x00000E18,  // ..***....**..
-     0x00000730,  // ...***..**...
-     0x000003E0,  // ....*****....
-     0x000001C0,  // .....***.....
-     0x000001E0,  // .....****....
-     0x00000370,  // ....**.***...
-     0x00000638,  // ...**...***..
-     0x00000418,  // ...*.....**..
+     0x00000204,  // ...*......*..
+     0x0000070C,  // ..***....**..
+     0x00000398,  // ...***..**...
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x000000F0,  // .....****....
+     0x000001B8,  // ....**.***...
+     0x0000031C,  // ...**...***..
+     0x0000020C,  // ...*.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5533,28 +5533,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 216
      17, 27,
-     0x00001860,  // .....**....**....
-     0x00000CC0,  // ......**..**.....
-     0x00000780,  // .......****......
-     0x00000300,  // ........**.......
+     0x00000C30,  // .....**....**....
+     0x00000660,  // ......**..**.....
+     0x000003C0,  // .......****......
+     0x00000180,  // ........**.......
      0x00000000,  // .................
-     0x0000FFC0,  // ..**********.....
-     0x0000FFF0,  // ..************...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C030,  // ..**........**...
-     0x0000FFE0,  // ..***********....
-     0x0000FFF0,  // ..************...
-     0x0000C030,  // ..**........**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C01C,  // ..**.........***.
+     0x00007FE0,  // ..**********.....
+     0x00007FF8,  // ..************...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00007FF0,  // ..***********....
+     0x00007FF8,  // ..************...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5564,27 +5564,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 217
      17, 27,
      0x00000780,  // ......****.......
-     0x00000C00,  // ....**....**.....
-     0x00006240,  // ....**....**.....
+     0x00001860,  // ....**....**.....
+     0x00001860,  // ....**....**.....
      0x00000780,  // ......****.......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5593,28 +5593,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 218 iso8859-2
      17, 27,
-     0x00000180,  // .........**......
-     0x00000300,  // ........**.......
-     0x00000200,  // ........*........
-     0x00000400,  // .......*.........
+     0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
+     0x00000100,  // ........*........
+     0x00000200,  // .......*.........
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5623,28 +5623,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 219
      17, 27,
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00001880,  // .....**...*......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x00000C40,  // .....**...*......
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5654,27 +5654,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 220
      17, 27,
      0x00000000,  // .................
-     0x00001D80,  // .....***.**......
-     0x00001D80,  // .....***.**......
+     0x00000EC0,  // .....***.**......
+     0x00000EC0,  // .....***.**......
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000C018,  // ..**.........**..
-     0x00006070,  // ...**......***...
-     0x00007FE0,  // ...**********....
-     0x00001FC0,  // .....*******.....
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5683,28 +5683,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 221 iso8859-2
      15, 27,
-     0x000000E0,  // ........***....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x0000600E,  // .**.........***
-     0x0000700E,  // .***........***
-     0x0000301C,  // ..**.......***.
-     0x00001818,  // ...**......**..
-     0x00001C38,  // ...***....***..
-     0x00000C30,  // ....**....**...
-     0x00000E60,  // ....***..**....
-     0x00000760,  // .....***.**....
-     0x000003C0,  // ......****.....
-     0x000003C0,  // ......****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5718,28 +5718,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x000000C0,  // .......**.....
-     0x000006C0,  // ....**.**.....
-     0x00000380,  // .....***......
+     0x000001E0,  // .....****.....
+     0x00000060,  // .......**.....
+     0x00000360,  // ....**.**.....
+     0x000001C0,  // .....***......
   },
   {             // 223
      14, 27,
@@ -5748,23 +5748,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x000007F0,  // ....*******...
-     0x00000E38,  // ...***...***..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C38,  // ...**....***..
-     0x00000CE0,  // ...**..***....
-     0x00000CF0,  // ...**..****...
-     0x00000C18,  // ...**.....**..
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C0C,  // ...**......**.
-     0x00000C18,  // ...**.....**..
-     0x00000CF8,  // ...**..*****..
-     0x00000CE0,  // ...**..***....
+     0x000001F0,  // .....*****....
+     0x000003F8,  // ....*******...
+     0x0000071C,  // ...***...***..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000061C,  // ...**....***..
+     0x00000670,  // ...**..***....
+     0x00000678,  // ...**..****...
+     0x0000060C,  // ...**.....**..
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x0000060C,  // ...**.....**..
+     0x0000067C,  // ...**..*****..
+     0x00000670,  // ...**..***....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5778,23 +5778,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x00000080,  // ......*......
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5808,23 +5808,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5838,23 +5838,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5868,23 +5868,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5899,22 +5899,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000760,  // ...***.**....
-     0x00000760,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5927,24 +5927,24 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x000001C0,  // .....***.....
-     0x00000240,  // ....*..*.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00000818,  // ..*......**..
-     0x00000018,  // .........**..
-     0x000003F8,  // ....*******..
-     0x00000F98,  // ..*****..**..
-     0x00001C18,  // .***.....**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FFC,  // .***********.
-     0x000007DC,  // ...*****.***.
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x00000120,  // ....*..*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5959,22 +5959,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5993,23 +5993,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x00000738,  // ..***..***..
-     0x000003F0,  // ...******...
-     0x00000080,  // .....*......
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000003E0,  // ...*****....
-     0x000000C0,  // .....**.....
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x0000039C,  // ..***..***..
+     0x000001F8,  // ...******...
+     0x00000040,  // .....*......
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
   },
   {             // 232 iso8859-2
      12, 27,
@@ -6019,22 +6019,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C0C,  // .**......**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -6048,23 +6048,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x000000E0,  // ......***....
-     0x00000180,  // .....**......
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6078,23 +6078,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000160,  // .....*.**....
-     0x00000320,  // ....**..*....
+     0x000000E0,  // .....***.....
+     0x000000B0,  // .....*.**....
+     0x00000190,  // ....**..*....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6109,22 +6109,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000370,  // ....**.***...
-     0x00000370,  // ....**.***...
+     0x000001B8,  // ....**.***...
+     0x000001B8,  // ....**.***...
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6138,23 +6138,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001808,  // .**.......*..
-     0x00000C18,  // ..**.....**..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6168,23 +6168,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6198,23 +6198,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001C,  // ..***.
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     0x0000000E,  // ..***.
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -6224,27 +6224,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 239
      13, 27,
      0x00000000,  // .............
-     0x00000007,  // .........***.
-     0x00000007,  // .........***.
-     0x00000003,  // ..........**.
-     0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007C0,  // ...*****.....
+     0x0000000E,  // .........***.
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000000,  // .............
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6258,23 +6258,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // ......******.
-     0x00000018,  // ......******.
-     0x00000018,  // .........**..
-     0x000003D8,  // ....****.**..
-     0x00000FF8,  // ..*********..
-     0x00000C38,  // ..**....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x000007C0,  // ...*****.....
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000007E,  // ......******.
+     0x0000007E,  // ......******.
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6288,23 +6288,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6318,23 +6318,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000009F0,  // ..*..*****...
-     0x00000FF8,  // ..*********..
-     0x00000E18,  // ..***....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6348,23 +6348,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6378,23 +6378,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6408,23 +6408,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000300,  // ....**.......
-     0x000007F0,  // ...*******...
-     0x000004E0,  // ...*..***....
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6439,22 +6439,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000760,  // ...***.**....
-     0x00000760,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF0,  // ..********...
-     0x00000C38,  // ..**....***..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C38,  // ..**....***..
-     0x00000FF0,  // ..********...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6474,17 +6474,17 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6503,18 +6503,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001C,  // ....***.
-     0x0000007C,  // ..*****.
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x0000000E,  // ....***.
+     0x0000003E,  // ..*****.
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -6533,18 +6533,18 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000210,  // ...*....*....
      0x000001E0,  // ....****.....
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6558,23 +6558,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000E0,  // ......***....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000070,  // ......***....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6588,23 +6588,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000260,  // ....*..**....
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6619,22 +6619,22 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000006E0,  // ...**.***....
-     0x00000260,  // ....*..**....
+     0x00000370,  // ...**.***....
+     0x00000130,  // ....*..**....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF8,  // .**********..
-     0x000007C0,  // ...*****.....
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6648,28 +6648,28 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000070,  // ......***...
-     0x000000E0,  // .....***....
-     0x00000080,  // .....*......
+     0x00000038,  // ......***...
+     0x00000070,  // .....***....
+     0x00000040,  // .....*......
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 254 iso8859-2
      6, 27,
@@ -6680,26 +6680,26 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
      0x00000000,  // ......
-     0x0000001E,  // ..****
-     0x00000006,  // ....**
-     0x00000036,  // .**.**
-     0x0000001C,  // ..***.
+     0x0000000F,  // ..****
+     0x00000003,  // ....**
+     0x0000001B,  // .**.**
+     0x0000000E,  // ..***.
   },
   {             // 255
      12, 27,
@@ -6709,26 +6709,26 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000370,  // ...**.***...
-     0x00000370,  // ...**.***...
+     0x000001B8,  // ...**.***...
+     0x000001B8,  // ...**.***...
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000618,  // ..**....**..
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x00000360,  // ...**.**....
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   };
diff --git a/fontosd-iso8859-5.c b/fontosd-iso8859-5.c
index 3e8e99988..a8de8fdf0 100644
--- a/fontosd-iso8859-5.c
+++ b/fontosd-iso8859-5.c
@@ -30,20 +30,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -55,11 +55,11 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -80,20 +80,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000DC,  // .....**.***.
-     0x000001D8,  // ....***.**..
-     0x00000198,  // ....**..**..
-     0x00000198,  // ....**..**..
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00001FFC,  // ***********.
-     0x00001FFC,  // ***********.
-     0x00000660,  // ..**..**....
-     0x00000660,  // ..**..**....
-     0x00000EC0,  // .***.**.....
+     0x0000006E,  // .....**.***.
+     0x000000EC,  // ....***.**..
+     0x000000CC,  // ....**..**..
+     0x000000CC,  // ....**..**..
+     0x000007FF,  // .***********
+     0x000007FF,  // .***********
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x00000FFE,  // ***********.
+     0x00000FFE,  // ***********.
+     0x00000330,  // ..**..**....
+     0x00000330,  // ..**..**....
+     0x00000760,  // .***.**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -104,23 +104,23 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000003F8,  // ...*******..
-     0x000007E8,  // ..******.*..
-     0x000006C0,  // ..**.**.....
-     0x000006C0,  // ..**.**.....
-     0x000006C0,  // ..**.**.....
-     0x000003C0,  // ...****.....
-     0x000001C0,  // ....***.....
-     0x000000E0,  // .....***....
-     0x000000F0,  // .....****...
-     0x000000D8,  // .....**.**..
-     0x000000D8,  // .....**.**..
-     0x000000D8,  // .....**.**..
-     0x000007F8,  // ..********..
-     0x000003F0,  // ...******...
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000001FC,  // ...*******..
+     0x000003F4,  // ..******.*..
+     0x00000360,  // ..**.**.....
+     0x00000360,  // ..**.**.....
+     0x00000360,  // ..**.**.....
+     0x000001E0,  // ...****.....
+     0x000000E0,  // ....***.....
+     0x00000070,  // .....***....
+     0x00000078,  // .....****...
+     0x0000006C,  // .....**.**..
+     0x0000006C,  // .....**.**..
+     0x0000006C,  // .....**.**..
+     0x000003FC,  // ..********..
+     0x000001F8,  // ...******...
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
   },
@@ -130,20 +130,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001E0E,  // .****.....***
-     0x00003F0C,  // ******....**.
-     0x00003318,  // **..**...**..
-     0x00003338,  // **..**..***..
-     0x00003F70,  // ******.***...
-     0x00001EE0,  // .****.***....
-     0x000000FC,  // ......******.
-     0x000001BC,  // .....**.****.
-     0x000003E6,  // ....*****..**
-     0x00000766,  // ...***.**..**
-     0x00000E66,  // ..***..**..**
-     0x00000C66,  // ..**...**..**
-     0x0000183C,  // .**.....****.
-     0x0000383C,  // ***.....****.
+     0x00000F07,  // .****.....***
+     0x00001F86,  // ******....**.
+     0x0000198C,  // **..**...**..
+     0x0000199C,  // **..**..***..
+     0x00001FB8,  // ******.***...
+     0x00000F70,  // .****.***....
+     0x0000007E,  // ......******.
+     0x000000DE,  // .....**.****.
+     0x000001F3,  // ....*****..**
+     0x000003B3,  // ...***.**..**
+     0x00000733,  // ..***..**..**
+     0x00000633,  // ..**...**..**
+     0x00000C1E,  // .**.....****.
+     0x00001C1E,  // ***.....****.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -155,20 +155,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003C0,  // ....****.....
-     0x000007E0,  // ...******....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x000006E0,  // ...**.***....
-     0x000007C0,  // ...*****.....
-     0x00000F00,  // ..****.......
-     0x00001D8C,  // .***.**...**.
-     0x000019CC,  // .**..***..**.
-     0x000018EC,  // .**...***.**.
-     0x00001878,  // .**....****..
-     0x00001C70,  // .***...***...
-     0x00000FF0,  // ..********...
-     0x0000079C,  // ...****..***.
+     0x000001E0,  // ....****.....
+     0x000003F0,  // ...******....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000370,  // ...**.***....
+     0x000003E0,  // ...*****.....
+     0x00000780,  // ..****.......
+     0x00000EC6,  // .***.**...**.
+     0x00000CE6,  // .**..***..**.
+     0x00000C76,  // .**...***.**.
+     0x00000C3C,  // .**....****..
+     0x00000E38,  // .***...***...
+     0x000007F8,  // ..********...
+     0x000003CE,  // ...****..***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -180,11 +180,11 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -205,24 +205,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000002,  // .....*
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000010,  // ..*...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
-     0x00000002,  // .....*
+     0x00000001,  // .....*
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000008,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000001,  // .....*
   },
   {             // 41
      6, 22,
@@ -230,24 +230,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000040,  // *.....
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000010,  // ..*...
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000060,  // **....
-     0x00000040,  // *.....
+     0x00000020,  // *.....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x00000008,  // ..*...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
+     0x00000020,  // *.....
   },
   {             // 42
      9, 22,
@@ -255,13 +255,13 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000020,  // ....*....
-     0x000001AC,  // .**.*.**.
-     0x000000D8,  // ..**.**..
-     0x00000050,  // ...*.*...
-     0x00000050,  // ...*.*...
-     0x00000088,  // ..*...*..
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
+     0x000000D6,  // .**.*.**.
+     0x0000006C,  // ..**.**..
+     0x00000028,  // ...*.*...
+     0x00000028,  // ...*.*...
+     0x00000044,  // ..*...*..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -282,18 +282,18 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00001FFE,  // ************
-     0x00001FFE,  // ************
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000FFF,  // ************
+     0x00000FFF,  // ************
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -316,13 +316,13 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001C,  // ..***.
-     0x0000001C,  // ..***.
-     0x0000001C,  // ..***.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x0000000E,  // ..***.
+     0x0000000E,  // ..***.
+     0x0000000E,  // ..***.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
   },
   {             // 45
      12, 22,
@@ -337,8 +337,8 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
+     0x000007FF,  // .***********
+     0x000007FF,  // .***********
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -367,8 +367,8 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -380,24 +380,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000006,  // .......**
-     0x00000006,  // .......**
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000018,  // .....**..
-     0x00000038,  // ....***..
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x000000E0,  // ..***....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000300,  // **.......
-     0x00000300,  // **.......
+     0x00000003,  // .......**
+     0x00000003,  // .......**
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x0000000C,  // .....**..
+     0x0000001C,  // ....***..
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000070,  // ..***....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x00000180,  // **.......
+     0x00000180,  // **.......
   },
   {             // 48
      12, 22,
@@ -405,20 +405,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x000003F0,  // ...******...
-     0x00000738,  // ..***..***..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000738,  // ..***..***..
-     0x000003F0,  // ...******...
-     0x000001E0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000001F8,  // ...******...
+     0x0000039C,  // ..***..***..
+     0x0000030C,  // ..**....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x0000039C,  // ..***..***..
+     0x000001F8,  // ...******...
+     0x000000F0,  // ....****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -430,20 +430,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003C0,  // ...****.....
-     0x000003C0,  // ...****.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000001E0,  // ...****.....
+     0x000001E0,  // ...****.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -455,20 +455,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F0,  // ..*******...
-     0x00000438,  // ..*....***..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000070,  // ......***...
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
+     0x000001F0,  // ...*****....
+     0x000003F8,  // ..*******...
+     0x0000021C,  // ..*....***..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000038,  // ......***...
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -480,20 +480,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F0,  // ..*******...
-     0x00000438,  // ..*....***..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x000003C0,  // ...****.....
-     0x000003F0,  // ...******...
-     0x00000038,  // .......***..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000438,  // ..*....***..
-     0x000007F0,  // ..*******...
-     0x000007E0,  // ..******....
+     0x000001F0,  // ...*****....
+     0x000003F8,  // ..*******...
+     0x0000021C,  // ..*....***..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x000001E0,  // ...****.....
+     0x000001F8,  // ...******...
+     0x0000001C,  // .......***..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000021C,  // ..*....***..
+     0x000003F8,  // ..*******...
+     0x000003F0,  // ..******....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -505,20 +505,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000070,  // ......***...
-     0x00000070,  // ......***...
-     0x000000F0,  // .....****...
-     0x000001F0,  // ....*****...
-     0x000003B0,  // ...***.**...
-     0x00000330,  // ...**..**...
-     0x00000630,  // ..**...**...
-     0x00000E30,  // .***...**...
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
-     0x00000030,  // .......**...
+     0x00000038,  // ......***...
+     0x00000038,  // ......***...
+     0x00000078,  // .....****...
+     0x000000F8,  // ....*****...
+     0x000001D8,  // ...***.**...
+     0x00000198,  // ...**..**...
+     0x00000318,  // ..**...**...
+     0x00000718,  // .***...**...
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -530,20 +530,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x000003F8,  // ...*******..
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
-     0x000003E0,  // ...*****....
-     0x000003F0,  // ...******...
-     0x00000038,  // .......***..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000238,  // ...*...***..
-     0x000003F0,  // ...******...
-     0x000003E0,  // ...*****....
+     0x000001FC,  // ...*******..
+     0x000001FC,  // ...*******..
+     0x00000180,  // ...**.......
+     0x00000180,  // ...**.......
+     0x00000180,  // ...**.......
+     0x000001F0,  // ...*****....
+     0x000001F8,  // ...******...
+     0x0000001C,  // .......***..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000011C,  // ...*...***..
+     0x000001F8,  // ...******...
+     0x000001F0,  // ...*****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -555,20 +555,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000003F0,  // ...******...
-     0x00000710,  // ..***...*...
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000DE0,  // .**.****....
-     0x00000FF0,  // .********...
-     0x00000E38,  // .***...***..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000418,  // ..*.....**..
-     0x00000630,  // ..**...**...
-     0x000003F0,  // ...******...
-     0x000001E0,  // ....****....
+     0x000000F8,  // ....*****...
+     0x000001F8,  // ...******...
+     0x00000388,  // ..***...*...
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000006F0,  // .**.****....
+     0x000007F8,  // .********...
+     0x0000071C,  // .***...***..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000020C,  // ..*.....**..
+     0x00000318,  // ..**...**...
+     0x000001F8,  // ...******...
+     0x000000F0,  // ....****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -580,20 +580,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x0000001C,  // ........***.
-     0x00000018,  // ........**..
-     0x00000038,  // .......***..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000380,  // ...***......
-     0x00000300,  // ...**.......
-     0x00000300,  // ...**.......
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x0000000E,  // ........***.
+     0x0000000C,  // ........**..
+     0x0000001C,  // .......***..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000180,  // ...**.......
+     0x00000180,  // ...**.......
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -605,20 +605,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000F0,  // .....****...
-     0x000001FC,  // ....*******.
-     0x0000039C,  // ...***..***.
-     0x0000030C,  // ...**....**.
-     0x0000030C,  // ...**....**.
-     0x00000190,  // ....**..*...
-     0x000001E0,  // ....****....
-     0x000003F8,  // ...*******..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003F8,  // ...*******..
-     0x000001F0,  // ....*****...
+     0x00000078,  // .....****...
+     0x000000FE,  // ....*******.
+     0x000001CE,  // ...***..***.
+     0x00000186,  // ...**....**.
+     0x00000186,  // ...**....**.
+     0x000000C8,  // ....**..*...
+     0x000000F0,  // ....****....
+     0x000001FC,  // ...*******..
+     0x0000038E,  // ..***...***.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x0000038E,  // ..***...***.
+     0x000001FC,  // ...*******..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -630,20 +630,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x000003F8,  // ...*******..
-     0x00000718,  // ..***...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000071C,  // ..***...***.
-     0x000003EC,  // ...*****.**.
-     0x000001EC,  // ....****.**.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000238,  // ...*...***..
-     0x000003F0,  // ...******...
-     0x000003E0,  // ...*****....
+     0x000000F0,  // ....****....
+     0x000001FC,  // ...*******..
+     0x0000038C,  // ..***...**..
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x0000038E,  // ..***...***.
+     0x000001F6,  // ...*****.**.
+     0x000000F6,  // ....****.**.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x0000011C,  // ...*...***..
+     0x000001F8,  // ...******...
+     0x000001F0,  // ...*****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -659,16 +659,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -684,41 +684,41 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
   },
   {             // 60
-     12, 22,
+     14, 22,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000002,  // .............*
-     0x0000000E,  // ...........***
-     0x0000003C,  // .........****.
-     0x000000F0,  // .......****...
-     0x000003C0,  // .....****.....
-     0x00001F80,  // ..******......
-     0x00000F80,  // ...*****......
-     0x000003C0,  // .....****.....
-     0x000000F0,  // .......****...
-     0x0000003C,  // .........****.
-     0x0000000E,  // ...........***
-     0x00000002,  // .............*
+     0x00000001,  // .............*
+     0x00000007,  // ...........***
+     0x0000001E,  // .........****.
+     0x00000078,  // .......****...
+     0x000001E0,  // .....****.....
+     0x00000FC0,  // ..******......
+     0x000007C0,  // ...*****......
+     0x000001E0,  // .....****.....
+     0x00000078,  // .......****...
+     0x0000001E,  // .........****.
+     0x00000007,  // ...........***
+     0x00000001,  // .............*
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -736,11 +736,11 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
+     0x000007FF,  // .***********
+     0x000007FF,  // .***********
      0x00000000,  // ............
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
+     0x000007FF,  // .***********
+     0x000007FF,  // .***********
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -750,25 +750,25 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
   },
   {             // 62
-     12, 22,
+     13, 22,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001000,  // .*...........
-     0x00001C00,  // .***.........
-     0x00000F00,  // ..****.......
-     0x000003C0,  // ....****.....
-     0x000000F0,  // ......****...
-     0x0000007C,  // .......*****.
-     0x0000007E,  // .......******
-     0x000000F0,  // ......****...
-     0x000003C0,  // ....****.....
-     0x00000F00,  // ..****.......
-     0x00001C00,  // .***.........
-     0x00001000,  // .*...........
+     0x00000800,  // .*...........
+     0x00000E00,  // .***.........
+     0x00000780,  // ..****.......
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000003E,  // .......*****.
+     0x0000003F,  // .......******
+     0x00000078,  // ......****...
+     0x000001E0,  // ....****.....
+     0x00000780,  // ..****.......
+     0x00000E00,  // .***.........
+     0x00000800,  // .*...........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -780,45 +780,45 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000F0,  // .****...
-     0x000001F8,  // ******..
-     0x0000011C,  // *...***.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000038,  // ...***..
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x00000078,  // .****...
+     0x000000FC,  // ******..
+     0x0000008E,  // *...***.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
   },
   {             // 64
-     16, 22,
+     17, 22,
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x000003E0,  // ........*****....
-     0x00000FF8,  // ......*********..
-     0x00001C1C,  // .....***.....***.
-     0x000031EE,  // ....**...****.***
-     0x000063C6,  // ...**...****...**
-     0x00006646,  // ...**..**..*...**
-     0x0000CC86,  // ..**..**..*....**
-     0x0000CD86,  // ..**..**.**....**
-     0x0000CDEC,  // ..**..**.****.**.
-     0x0000CE7C,  // ..**..***..*****.
-     0x0000EC78,  // ..***.**...****..
-     0x00007040,  // ...***.....*.....
-     0x00003FC0,  // ....********.....
-     0x00000F80,  // ......*****......
+     0x000001F0,  // ........*****....
+     0x000007FC,  // ......*********..
+     0x00000E0E,  // .....***.....***.
+     0x000018F7,  // ....**...****.***
+     0x000031E3,  // ...**...****...**
+     0x00003323,  // ...**..**..*...**
+     0x00006643,  // ..**..**..*....**
+     0x000066C3,  // ..**..**.**....**
+     0x000066F6,  // ..**..**.****.**.
+     0x0000673E,  // ..**..***..*****.
+     0x0000763C,  // ..***.**...****..
+     0x00003820,  // ...***.....*.....
+     0x00001FE0,  // ....********.....
+     0x000007C0,  // ......*****......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -830,20 +830,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x000003E0,  // ....*****....
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000380C,  // ***.......**.
-     0x00003006,  // **.........**
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001F0,  // ....*****....
+     0x000001B0,  // ....**.**....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00001C06,  // ***.......**.
+     0x00001803,  // **.........**
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -855,20 +855,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x000003E0,  // ..*****....
-     0x000003F0,  // ..******...
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003F8,  // ..*******..
-     0x000003F0,  // ..******...
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x0000018C,  // ..**...**..
+     0x000001F0,  // ..*****....
+     0x000001F8,  // ..******...
+     0x0000018E,  // ..**...***.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x000001FC,  // ..*******..
+     0x000001F8,  // ..******...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -880,20 +880,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F8,  // .....******..
-     0x000007FC,  // ...*********.
-     0x00000E04,  // ..***......*.
-     0x00000C00,  // ..**.........
-     0x00001C00,  // .***.........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C00,  // ..**.........
-     0x00000E04,  // ..***......*.
-     0x000007FC,  // ...*********.
-     0x000001F8,  // .....******..
+     0x000000FC,  // .....******..
+     0x000003FE,  // ...*********.
+     0x00000702,  // ..***......*.
+     0x00000600,  // ..**.........
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000600,  // ..**.........
+     0x00000702,  // ..***......*.
+     0x000003FE,  // ...*********.
+     0x000000FC,  // .....******..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -905,20 +905,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FC0,  // ..*******.....
-     0x00001FF0,  // ..*********...
-     0x00001838,  // ..**.....***..
-     0x00001818,  // ..**......**..
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00001FF0,  // ..*********...
-     0x00001FC0,  // ..*******.....
+     0x00000FE0,  // ..*******.....
+     0x00000FF8,  // ..*********...
+     0x00000C1C,  // ..**.....***..
+     0x00000C0C,  // ..**......**..
+     0x00000C06,  // ..**.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000C0C,  // ..**......**..
+     0x00000C1C,  // ..**.....***..
+     0x00000FF8,  // ..*********...
+     0x00000FE0,  // ..*******.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -930,20 +930,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FC,  // ..*******.
-     0x000001FC,  // ..*******.
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FE,  // ..*******.
+     0x000000FE,  // ..*******.
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -955,20 +955,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FC,  // ..*******.
-     0x000001FC,  // ..*******.
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FE,  // ..*******.
+     0x000000FE,  // ..*******.
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -980,20 +980,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003F0,  // .....******...
-     0x00000FF8,  // ...*********..
-     0x00001C08,  // ..***......*..
-     0x00001800,  // ..**..........
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001818,  // ..**......**..
-     0x00001C18,  // ..***.....**..
-     0x00000FF8,  // ...*********..
-     0x000003F0,  // .....******...
+     0x000001F8,  // .....******...
+     0x000007FC,  // ...*********..
+     0x00000E04,  // ..***......*..
+     0x00000C00,  // ..**..........
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E0C,  // ..***.....**..
+     0x000007FC,  // ...*********..
+     0x000001F8,  // .....******...
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1005,20 +1005,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1030,49 +1030,49 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
   },
   {             // 74
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x000000F8,  // *****..
-     0x000000F0,  // ****...
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x0000007C,  // *****..
+     0x00000078,  // ****...
   },
   {             // 75
      12, 22,
@@ -1080,20 +1080,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x00000670,  // ..**..***...
-     0x00000660,  // ..**..**....
-     0x000006C0,  // ..**.**.....
-     0x000007C0,  // ..*****.....
-     0x000007C0,  // ..*****.....
-     0x000006E0,  // ..**.***....
-     0x00000660,  // ..**..**....
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x0000061C,  // ..**....***.
-     0x0000060E,  // ..**.....***
+     0x00000306,  // ..**.....**.
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x00000338,  // ..**..***...
+     0x00000330,  // ..**..**....
+     0x00000360,  // ..**.**.....
+     0x000003E0,  // ..*****.....
+     0x000003E0,  // ..*****.....
+     0x00000370,  // ..**.***....
+     0x00000330,  // ..**..**....
+     0x00000318,  // ..**...**...
+     0x0000030C,  // ..**....**..
+     0x0000030E,  // ..**....***.
+     0x00000307,  // ..**.....***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1105,20 +1105,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1130,20 +1130,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000701C,  // ..***.......***.
-     0x0000701C,  // ..***.......***.
-     0x0000783C,  // ..****.....****.
-     0x0000783C,  // ..****.....****.
-     0x00007C3C,  // ..*****....****.
-     0x00006C6C,  // ..**.**...**.**.
-     0x00006C6C,  // ..**.**...**.**.
-     0x00006E6C,  // ..**.***..**.**.
-     0x000066CC,  // ..**..**.**..**.
-     0x000066CC,  // ..**..**.**..**.
-     0x000067CC,  // ..**..*****..**.
-     0x0000638C,  // ..**...***...**.
-     0x0000638C,  // ..**...***...**.
-     0x0000600C,  // ..**.........**.
+     0x0000380E,  // ..***.......***.
+     0x0000380E,  // ..***.......***.
+     0x00003C1E,  // ..****.....****.
+     0x00003C1E,  // ..****.....****.
+     0x00003E1E,  // ..*****....****.
+     0x00003636,  // ..**.**...**.**.
+     0x00003636,  // ..**.**...**.**.
+     0x00003736,  // ..**.***..**.**.
+     0x00003366,  // ..**..**.**..**.
+     0x00003366,  // ..**..**.**..**.
+     0x000033E6,  // ..**..*****..**.
+     0x000031C6,  // ..**...***...**.
+     0x000031C6,  // ..**...***...**.
+     0x00003006,  // ..**.........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1155,20 +1155,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001C18,  // ..***.....**..
-     0x00001E18,  // ..****....**..
-     0x00001E18,  // ..****....**..
-     0x00001F18,  // ..*****...**..
-     0x00001B18,  // ..**.**...**..
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x000018D8,  // ..**...**.**..
-     0x000018F8,  // ..**...*****..
-     0x00001878,  // ..**....****..
-     0x00001878,  // ..**....****..
-     0x00001838,  // ..**.....***..
-     0x00001818,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E0C,  // ..***.....**..
+     0x00000F0C,  // ..****....**..
+     0x00000F0C,  // ..****....**..
+     0x00000F8C,  // ..*****...**..
+     0x00000D8C,  // ..**.**...**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000C6C,  // ..**...**.**..
+     0x00000C7C,  // ..**...*****..
+     0x00000C3C,  // ..**....****..
+     0x00000C3C,  // ..**....****..
+     0x00000C1C,  // ..**.....***..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1180,20 +1180,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1205,20 +1205,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FC,  // ..*******.
-     0x000001FE,  // ..********
-     0x0000018E,  // ..**...***
-     0x00000186,  // ..**....**
-     0x00000186,  // ..**....**
-     0x00000186,  // ..**....**
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000001F0,  // ..*****...
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000000FE,  // ..*******.
+     0x000000FF,  // ..********
+     0x000000C7,  // ..**...***
+     0x000000C3,  // ..**....**
+     0x000000C3,  // ..**....**
+     0x000000C3,  // ..**....**
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x000000F8,  // ..*****...
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1230,24 +1230,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007E0,  // .....******....
-     0x00000078,  // .........****..
-     0x0000003E,  // ..........*****
-     0x0000001C,  // ...........***.
-     0x00000004,  // .............*.
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003F0,  // .....******....
+     0x0000003C,  // .........****..
+     0x0000001F,  // ..........*****
+     0x0000000E,  // ...........***.
+     0x00000002,  // .............*.
   },
   {             // 82
      12, 22,
@@ -1255,20 +1255,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007E0,  // ..******....
-     0x000007F0,  // ..*******...
-     0x00000638,  // ..**...***..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000610,  // ..**....*...
-     0x00000630,  // ..**...**...
-     0x000007C0,  // ..*****.....
-     0x000007E0,  // ..******....
-     0x00000670,  // ..**..***...
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x0000061C,  // ..**....***.
-     0x0000060E,  // ..**.....***
+     0x000003F0,  // ..******....
+     0x000003F8,  // ..*******...
+     0x0000031C,  // ..**...***..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x00000308,  // ..**....*...
+     0x00000318,  // ..**...**...
+     0x000003E0,  // ..*****.....
+     0x000003F0,  // ..******....
+     0x00000338,  // ..**..***...
+     0x00000318,  // ..**...**...
+     0x0000030C,  // ..**....**..
+     0x0000030E,  // ..**....***.
+     0x00000307,  // ..**.....***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1280,20 +1280,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001F8,  // ..******..
-     0x00000388,  // .***...*..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000001C0,  // ..***.....
-     0x000000F0,  // ...****...
-     0x00000078,  // ....****..
-     0x0000001C,  // ......***.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000021C,  // .*....***.
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x0000007C,  // ...*****..
+     0x000000FC,  // ..******..
+     0x000001C4,  // .***...*..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000010E,  // .*....***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1305,20 +1305,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001FFE,  // ************
-     0x00001FFE,  // ************
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000FFF,  // ************
+     0x00000FFF,  // ************
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1330,20 +1330,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003F0,  // ....******...
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1355,20 +1355,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001806,  // **........**
-     0x00001C06,  // ***.......**
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x0000061C,  // ..**....***.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000338,  // ...**..***..
-     0x00000330,  // ...**..**...
-     0x000003B0,  // ...***.**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
+     0x00000C03,  // **........**
+     0x00000E03,  // ***.......**
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000019C,  // ...**..***..
+     0x00000198,  // ...**..**...
+     0x000001D8,  // ...***.**...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1380,20 +1380,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00018306,  // **.....**.....**
-     0x00018306,  // **.....**.....**
-     0x0000C78E,  // .**...****...***
-     0x0000C78C,  // .**...****...**.
-     0x0000C78C,  // .**...****...**.
-     0x0000C78C,  // .**...****...**.
-     0x00006DD8,  // ..**.**.***.**..
-     0x00006CD8,  // ..**.**..**.**..
-     0x00006CD8,  // ..**.**..**.**..
-     0x00006CD8,  // ..**.**..**.**..
-     0x00003CF0,  // ...****..****...
-     0x00003870,  // ...***....***...
-     0x00003870,  // ...***....***...
-     0x00003870,  // ...***....***...
+     0x0000C183,  // **.....**.....**
+     0x0000C183,  // **.....**.....**
+     0x000063C7,  // .**...****...***
+     0x000063C6,  // .**...****...**.
+     0x000063C6,  // .**...****...**.
+     0x000063C6,  // .**...****...**.
+     0x000036EC,  // ..**.**.***.**..
+     0x0000366C,  // ..**.**..**.**..
+     0x0000366C,  // ..**.**..**.**..
+     0x0000366C,  // ..**.**..**.**..
+     0x00001E78,  // ...****..****...
+     0x00001C38,  // ...***....***...
+     0x00001C38,  // ...***....***...
+     0x00001C38,  // ...***....***...
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1405,20 +1405,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C1C,  // ***.....***.
-     0x00000C18,  // .**.....**..
-     0x00000638,  // ..**...***..
-     0x00000730,  // ..***..**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000003E0,  // ...*****....
-     0x00000360,  // ...**.**....
-     0x00000630,  // ..**...**...
-     0x00000E38,  // .***...***..
-     0x00000C18,  // .**.....**..
-     0x0000181C,  // **......***.
+     0x00000E0E,  // ***.....***.
+     0x0000060C,  // .**.....**..
+     0x0000031C,  // ..**...***..
+     0x00000398,  // ..***..**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B0,  // ...**.**....
+     0x00000318,  // ..**...**...
+     0x0000071C,  // .***...***..
+     0x0000060C,  // .**.....**..
+     0x00000C0E,  // **......***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1430,20 +1430,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C06,  // ***.......**
-     0x00000C0C,  // .**......**.
-     0x00000E1C,  // .***....***.
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x000003F0,  // ...******...
-     0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000E03,  // ***.......**
+     0x00000606,  // .**......**.
+     0x0000070E,  // .***....***.
+     0x0000030C,  // ..**....**..
+     0x00000198,  // ...**..**...
+     0x000001F8,  // ...******...
+     0x000000F0,  // ....****....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1455,20 +1455,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x0000000C,  // ........**.
-     0x0000001C,  // .......***.
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000070,  // .....***...
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000380,  // ..***......
-     0x00000700,  // .***.......
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
+     0x000003FF,  // .**********
+     0x000003FF,  // .**********
+     0x00000006,  // ........**.
+     0x0000000E,  // .......***.
+     0x0000000C,  // .......**..
+     0x00000018,  // ......**...
+     0x00000038,  // .....***...
+     0x00000070,  // ....***....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x000001C0,  // ..***......
+     0x00000380,  // .***.......
+     0x000003FF,  // .**********
+     0x000003FF,  // .**********
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1480,24 +1480,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000001E,  // ..****
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
   },
   {             // 92
      9, 22,
@@ -1505,24 +1505,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000300,  // **.......
-     0x00000300,  // **.......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000E0,  // ..***....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000038,  // ....***..
-     0x00000018,  // .....**..
-     0x00000018,  // .....**..
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x00000006,  // .......**
-     0x00000006,  // .......**
+     0x00000180,  // **.......
+     0x00000180,  // **.......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000070,  // ..***....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x0000001C,  // ....***..
+     0x0000000C,  // .....**..
+     0x0000000C,  // .....**..
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000003,  // .......**
+     0x00000003,  // .......**
   },
   {             // 93
      6, 22,
@@ -1530,43 +1530,43 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
   },
   {             // 94
      12, 22,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000000E0,  // .....***....
-     0x000001B0,  // ....**.**...
-     0x000001B0,  // ....**.**...
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000E0E,  // .***.....***
-     0x00000C06,  // .**.......**
+     0x00000020,  // ......*.....
+     0x00000020,  // ......*.....
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x000000D8,  // ....**.**...
+     0x000000D8,  // ....**.**...
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000707,  // .***.....***
+     0x00000603,  // .**.......**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1594,8 +1594,8 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -1605,9 +1605,9 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000300,  // ...**.......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
+     0x00000180,  // ...**.......
+     0x000000C0,  // ....**......
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1634,16 +1634,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000010C,  // ..*....**.
-     0x0000000C,  // .......**.
-     0x000000FC,  // ...******.
-     0x000001FC,  // ..*******.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FE,  // .*********
-     0x000001CE,  // ..***..***
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000086,  // ..*....**.
+     0x00000006,  // .......**.
+     0x0000007E,  // ...******.
+     0x000000FE,  // ..*******.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FF,  // .*********
+     0x000000E7,  // ..***..***
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1655,20 +1655,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x000006F0,  // ..**.****...
-     0x000007F8,  // ..********..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000718,  // ..***...**..
-     0x000007F8,  // ..********..
-     0x000006F0,  // ..**.****...
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000378,  // ..**.****...
+     0x000003FC,  // ..********..
+     0x0000038E,  // ..***...***.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x0000038C,  // ..***...**..
+     0x000003FC,  // ..********..
+     0x00000378,  // ..**.****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1684,16 +1684,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000007C,  // ....*****.
-     0x000001FC,  // ..*******.
-     0x00000180,  // ..**......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000184,  // ..**....*.
-     0x000001FC,  // ..*******.
-     0x00000078,  // ....****..
+     0x0000003E,  // ....*****.
+     0x000000FE,  // ..*******.
+     0x000000C0,  // ..**......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C2,  // ..**....*.
+     0x000000FE,  // ..*******.
+     0x0000003C,  // ....****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1705,20 +1705,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x000003D8,  // ...****.**..
-     0x000007F8,  // ..********..
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000E38,  // .***...***..
-     0x000007F8,  // ..********..
-     0x000003D8,  // ...****.**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x000001EC,  // ...****.**..
+     0x000003FC,  // ..********..
+     0x0000031C,  // ..**...***..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000071C,  // .***...***..
+     0x000003FC,  // ..********..
+     0x000001EC,  // ...****.**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1734,41 +1734,41 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001E0,  // ...****....
-     0x000003F0,  // ..******...
-     0x00000318,  // ..**...**..
-     0x00000618,  // .**....**..
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000708,  // .***....*..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F0,  // ...****....
+     0x000001F8,  // ..******...
+     0x0000018C,  // ..**...**..
+     0x0000030C,  // .**....**..
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000384,  // .***....*..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
   {             // 102
-     7, 22,
+     8, 22,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000001E,  // ....****
-     0x0000003E,  // ...*****
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x0000000F,  // ....****
+     0x0000001F,  // ...*****
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -1784,20 +1784,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003D8,  // ...****.**..
-     0x000007F8,  // ..********..
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000E38,  // .***...***..
-     0x000007D8,  // ..*****.**..
-     0x00000398,  // ...***..**..
-     0x00000018,  // ........**..
-     0x00000430,  // ..*....**...
-     0x000007F0,  // ..*******...
-     0x000007E0,  // ..******....
+     0x000001EC,  // ...****.**..
+     0x000003FC,  // ..********..
+     0x0000031C,  // ..**...***..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000071C,  // .***...***..
+     0x000003EC,  // ..*****.**..
+     0x000001CC,  // ...***..**..
+     0x0000000C,  // ........**..
+     0x00000218,  // ..*....**...
+     0x000003F8,  // ..*******...
+     0x000003F0,  // ..******....
   },
   {             // 104
      12, 22,
@@ -1805,20 +1805,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000670,  // ..**..***...
-     0x000006F8,  // ..**.*****..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000338,  // ..**..***...
+     0x0000037C,  // ..**.*****..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1830,49 +1830,49 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
   },
   {             // 106
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
+     7, 22,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000008C,  // *...**.
-     0x000000F8,  // *****..
-     0x000000F0,  // ****...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000046,  // *...**.
+     0x0000007C,  // *****..
+     0x00000078,  // ****...
   },
   {             // 107
      11, 22,
@@ -1880,20 +1880,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x0000031C,  // ..**...***.
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x00000360,  // ..**.**....
-     0x000003E0,  // ..*****....
-     0x000003E0,  // ..*****....
-     0x00000370,  // ..**.***...
-     0x00000338,  // ..**..***..
-     0x0000031C,  // ..**...***.
-     0x0000030E,  // ..**....***
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x0000018E,  // ..**...***.
+     0x0000018C,  // ..**...**..
+     0x00000198,  // ..**..**...
+     0x000001B0,  // ..**.**....
+     0x000001F0,  // ..*****....
+     0x000001F0,  // ..*****....
+     0x000001B8,  // ..**.***...
+     0x0000019C,  // ..**..***..
+     0x0000018E,  // ..**...***.
+     0x00000187,  // ..**....***
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1905,20 +1905,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1934,16 +1934,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00019C70,  // ..**..***...***...
-     0x0001BEF8,  // ..**.*****.*****..
-     0x0001C718,  // ..***...***...**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
+     0x0000CE38,  // ..**..***...***...
+     0x0000DF7C,  // ..**.*****.*****..
+     0x0000E38C,  // ..***...***...**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1959,16 +1959,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000670,  // ..**..***...
-     0x000006F8,  // ..**.*****..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
+     0x00000338,  // ..**..***...
+     0x0000037C,  // ..**.*****..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1984,16 +1984,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000001E0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000003FC,  // ..********..
+     0x0000030C,  // ..**....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000000F0,  // ....****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2009,20 +2009,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000006F0,  // ..**.****...
-     0x000007F8,  // ..********..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000718,  // ..***...**..
-     0x000007F8,  // ..********..
-     0x000006F0,  // ..**.****...
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
+     0x00000378,  // ..**.****...
+     0x000003FC,  // ..********..
+     0x0000038E,  // ..***...***.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x0000038C,  // ..***...**..
+     0x000003FC,  // ..********..
+     0x00000378,  // ..**.****...
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
   },
   {             // 113
      12, 22,
@@ -2034,20 +2034,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003D8,  // ...****.**..
-     0x000007F8,  // ..********..
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000E38,  // .***...***..
-     0x000007F8,  // ..********..
-     0x000003D8,  // ...****.**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
+     0x000001EC,  // ...****.**..
+     0x000003FC,  // ..********..
+     0x0000031C,  // ..**...***..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000071C,  // .***...***..
+     0x000003FC,  // ..********..
+     0x000001EC,  // ...****.**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
   },
   {             // 114
      8, 22,
@@ -2059,16 +2059,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000066,  // ..**..**
-     0x0000006E,  // ..**.***
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x00000033,  // ..**..**
+     0x00000037,  // ..**.***
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -2084,16 +2084,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F0,  // .******...
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001E0,  // ..****....
-     0x000000F8,  // ...*****..
-     0x00000018,  // ......**..
-     0x00000218,  // .*....**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x000001F8,  // .******...
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000000C,  // ......**..
+     0x0000010C,  // .*....**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2106,19 +2106,19 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000007E,  // .******
-     0x0000007E,  // .******
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003E,  // ..*****
-     0x0000001E,  // ...****
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000003F,  // .******
+     0x0000003F,  // .******
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000001F,  // ..*****
+     0x0000000F,  // ...****
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -2134,16 +2134,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x000007D8,  // ..*****.**..
-     0x00000398,  // ...***..**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x000003EC,  // ..*****.**..
+     0x000001CC,  // ...***..**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2159,16 +2159,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000070E,  // ***....***
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000001F0,  // ..*****...
-     0x000000F0,  // ...****...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
+     0x00000303,  // **......**
+     0x00000387,  // ***....***
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000F8,  // ..*****...
+     0x00000078,  // ...****...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2184,16 +2184,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000C30C,  // **....**....**.
-     0x0000C78C,  // **...****...**.
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006798,  // .**..****..**..
-     0x00006CF0,  // .**.**..****...
-     0x00003CF0,  // ..****..****...
-     0x00003CF0,  // ..****..****...
-     0x000038F0,  // ..***...****...
-     0x00003860,  // ..***....**....
+     0x00006186,  // **....**....**.
+     0x000063C6,  // **...****...**.
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x00003678,  // .**.**..****...
+     0x00001E78,  // ..****..****...
+     0x00001E78,  // ..****..****...
+     0x00001C78,  // ..***...****...
+     0x00001C30,  // ..***....**....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -2209,16 +2209,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000E1C,  // .***....***.
-     0x00000718,  // ..***...**..
-     0x00000330,  // ...**..**...
-     0x000001F0,  // ....*****...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000003E0,  // ...*****....
-     0x00000330,  // ...**..**...
-     0x00000638,  // ..**...***..
-     0x00000E1C,  // .***....***.
+     0x0000070E,  // .***....***.
+     0x0000038C,  // ..***...**..
+     0x00000198,  // ...**..**...
+     0x000000F8,  // ....*****...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000001F0,  // ...*****....
+     0x00000198,  // ...**..**...
+     0x0000031C,  // ..**...***..
+     0x0000070E,  // .***....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2234,20 +2234,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000030E,  // .**....***
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000000F8,  // ...*****..
-     0x000000F0,  // ...****...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000000C0,  // ...**.....
-     0x000001C0,  // ..***.....
+     0x00000303,  // **......**
+     0x00000187,  // .**....***
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000007C,  // ...*****..
+     0x00000078,  // ...****...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x000000E0,  // ..***.....
   },
   {             // 122
      11, 22,
@@ -2259,16 +2259,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000300,  // ..**.......
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x0000000C,  // .......**..
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x00000180,  // ..**.......
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2280,24 +2280,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000001C,  // ..***.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000070,  // ***...
-     0x00000078,  // ****..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001C,  // ..***.
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000E,  // ..***.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000038,  // ***...
+     0x0000003C,  // ****..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000E,  // ..***.
+     0x00000006,  // ...**.
   },
   {             // 124
      5, 22,
@@ -2305,24 +2305,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
   },
   {             // 125
      6, 22,
@@ -2330,24 +2330,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000030,  // .**...
-     0x00000038,  // .***..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000000E,  // ...***
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000038,  // .***..
-     0x00000030,  // .**...
+     0x00000018,  // .**...
+     0x0000001C,  // .***..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x00000007,  // ...***
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
   },
   {             // 126
      12, 22,
@@ -2361,11 +2361,11 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000786,  // ..****....**
-     0x000007C6,  // ..*****...**
-     0x00000CE6,  // .**..***..**
-     0x00000C7C,  // .**...*****.
-     0x00000C1C,  // .**.....***.
+     0x000003C3,  // ..****....**
+     0x000003E3,  // ..*****...**
+     0x00000673,  // .**..***..**
+     0x0000063E,  // .**...*****.
+     0x0000060E,  // .**.....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3227,23 +3227,23 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
   {             // 161
      10, 22,
      0x00000000,  // ..........
-     0x000000CC,  // ...**..**.
-     0x000000CC,  // ...**..**.
+     0x00000066,  // ...**..**.
+     0x00000066,  // ...**..**.
      0x00000000,  // ..........
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FC,  // ..*******.
-     0x000001FC,  // ..*******.
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FE,  // ..*******.
+     0x000000FE,  // ..*******.
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3255,20 +3255,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001FFE0,  // ************....
-     0x0001FFE0,  // ************....
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000DF0,  // .....**.*****...
-     0x00000FF8,  // .....*********..
-     0x00000E1C,  // .....***....***.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
-     0x00000C1C,  // .....**.....***.
-     0x00000C78,  // .....**...****..
-     0x00000C70,  // .....**...***...
+     0x0000FFF0,  // ************....
+     0x0000FFF0,  // ************....
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x000006F8,  // .....**.*****...
+     0x000007FC,  // .....*********..
+     0x0000070E,  // .....***....***.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
+     0x0000060E,  // .....**.....***.
+     0x0000063C,  // .....**...****..
+     0x00000638,  // .....**...***...
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -3276,24 +3276,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
   },
   {             // 163
      10, 22,
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3305,20 +3305,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F8,  // .....******..
-     0x000007FC,  // ...*********.
-     0x00000E04,  // ..***......*.
-     0x00000C00,  // ..**.........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001FE0,  // .********....
-     0x00001FE0,  // .********....
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C00,  // ..**.........
-     0x00000E04,  // ..***......*.
-     0x000007FC,  // ...*********.
-     0x000001F8,  // .....******..
+     0x000000FC,  // .....******..
+     0x000003FE,  // ...*********.
+     0x00000702,  // ..***......*.
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000FF0,  // .********....
+     0x00000FF0,  // .********....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000600,  // ..**.........
+     0x00000702,  // ..***......*.
+     0x000003FE,  // ...*********.
+     0x000000FC,  // .....******..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3330,20 +3330,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001F8,  // ..******..
-     0x00000388,  // .***...*..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000001C0,  // ..***.....
-     0x000000F0,  // ...****...
-     0x00000078,  // ....****..
-     0x0000001C,  // ......***.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000021C,  // .*....***.
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x0000007C,  // ...*****..
+     0x000000FC,  // ..******..
+     0x000001C4,  // .***...*..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000010E,  // .*....***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3355,20 +3355,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -3377,52 +3377,52 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
   {             // 167
      5, 22,
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
   },
   {             // 168
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x000000F8,  // *****..
-     0x000000F0,  // ****...
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x0000007C,  // *****..
+     0x00000078,  // ****...
   },
   {             // 169
      18, 22,
@@ -3430,20 +3430,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0000FF00,  // ...********.......
-     0x0000FF00,  // ...********.......
-     0x0000C300,  // ...**....**.......
-     0x0000C300,  // ...**....**.......
-     0x0000C300,  // ...**....**.......
-     0x0000C300,  // ...**....**.......
-     0x0000C3F0,  // ...**....******...
-     0x0000C3F8,  // ...**....*******..
-     0x0000C31C,  // ...**....**...***.
-     0x0000C30C,  // ...**....**....**.
-     0x0000C30C,  // ...**....**....**.
-     0x0001831C,  // ..**.....**...***.
-     0x000383FC,  // .***.....********.
-     0x000303F8,  // .**......*******..
+     0x00007F80,  // ...********.......
+     0x00007F80,  // ...********.......
+     0x00006180,  // ...**....**.......
+     0x00006180,  // ...**....**.......
+     0x00006180,  // ...**....**.......
+     0x00006180,  // ...**....**.......
+     0x000061F8,  // ...**....******...
+     0x000061FC,  // ...**....*******..
+     0x0000618E,  // ...**....**...***.
+     0x00006186,  // ...**....**....**.
+     0x00006186,  // ...**....**....**.
+     0x0000C18E,  // ..**.....**...***.
+     0x0001C1FE,  // .***.....********.
+     0x000181FC,  // .**......*******..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -3455,20 +3455,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018300,  // ..**.....**.......
-     0x00018300,  // ..**.....**.......
-     0x00018300,  // ..**.....**.......
-     0x00018300,  // ..**.....**.......
-     0x00018300,  // ..**.....**.......
-     0x00018300,  // ..**.....**.......
-     0x0001FFF0,  // ..*************...
-     0x0001FFF8,  // ..**************..
-     0x0001831C,  // ..**.....**...***.
-     0x0001830C,  // ..**.....**....**.
-     0x0001830C,  // ..**.....**....**.
-     0x0001831C,  // ..**.....**...***.
-     0x000183FC,  // ..**.....********.
-     0x000183F8,  // ..**.....*******..
+     0x0000C180,  // ..**.....**.......
+     0x0000C180,  // ..**.....**.......
+     0x0000C180,  // ..**.....**.......
+     0x0000C180,  // ..**.....**.......
+     0x0000C180,  // ..**.....**.......
+     0x0000C180,  // ..**.....**.......
+     0x0000FFF8,  // ..*************...
+     0x0000FFFC,  // ..**************..
+     0x0000C18E,  // ..**.....**...***.
+     0x0000C186,  // ..**.....**....**.
+     0x0000C186,  // ..**.....**....**.
+     0x0000C18E,  // ..**.....**...***.
+     0x0000C1FE,  // ..**.....********.
+     0x0000C1FC,  // ..**.....*******..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -3480,20 +3480,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001FFE0,  // ************....
-     0x0001FFE0,  // ************....
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000DF0,  // .....**.*****...
-     0x00000FF8,  // .....*********..
-     0x00000E1C,  // .....***....***.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
-     0x00000C0C,  // .....**......**.
+     0x0000FFF0,  // ************....
+     0x0000FFF0,  // ************....
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x000006F8,  // .....**.*****...
+     0x000007FC,  // .....*********..
+     0x0000070E,  // .....***....***.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
+     0x00000606,  // .....**......**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -3501,24 +3501,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
   },
   {             // 172
      12, 22,
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x00000670,  // ..**..***...
-     0x00000660,  // ..**..**....
-     0x000006C0,  // ..**.**.....
-     0x000007C0,  // ..*****.....
-     0x000007C0,  // ..*****.....
-     0x000006E0,  // ..**.***....
-     0x00000660,  // ..**..**....
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x0000061C,  // ..**....***.
-     0x0000060E,  // ..**.....***
+     0x00000306,  // ..**.....**.
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x00000338,  // ..**..***...
+     0x00000330,  // ..**..**....
+     0x00000360,  // ..**.**.....
+     0x000003E0,  // ..*****.....
+     0x000003E0,  // ..*****.....
+     0x00000370,  // ..**.***....
+     0x00000330,  // ..**..**....
+     0x00000318,  // ..**...**...
+     0x0000030C,  // ..**....**..
+     0x0000030E,  // ..**....***.
+     0x00000307,  // ..**.....***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3537,8 +3537,8 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3551,24 +3551,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
   },
   {             // 174
      12, 22,
-     0x00000210,  // ...*....*...
-     0x000003F0,  // ...******...
-     0x000001E0,  // ....****....
+     0x00000108,  // ...*....*...
+     0x000001F8,  // ...******...
+     0x000000F0,  // ....****....
      0x00000000,  // ............
-     0x00001C0E,  // ***......***
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x00000618,  // ..**....**..
-     0x00000318,  // ...**...**..
-     0x00000330,  // ...**..**...
-     0x000001B0,  // ....**.**...
-     0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000780,  // ..****......
-     0x00000700,  // ..***.......
+     0x00000E07,  // ***......***
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x0000030C,  // ..**....**..
+     0x0000018C,  // ...**...**..
+     0x00000198,  // ...**..**...
+     0x000000D8,  // ....**.**...
+     0x000000F0,  // ....****....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x000003C0,  // ..****......
+     0x00000380,  // ..***.......
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3580,23 +3580,23 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
   },
   {             // 176
@@ -3605,20 +3605,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x000003E0,  // ....*****....
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000C38,  // ..**....***..
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000380C,  // ***.......**.
-     0x00003006,  // **.........**
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001F0,  // ....*****....
+     0x000001B0,  // ....**.**....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00001C06,  // ***.......**.
+     0x00001803,  // **.........**
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3630,20 +3630,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x000003FC,  // ..********.
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000003F8,  // ..*******..
+     0x000001FE,  // ..********.
+     0x000001FE,  // ..********.
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x0000018E,  // ..**...***.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3655,20 +3655,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000318,  // ..**...**..
-     0x000003E0,  // ..*****....
-     0x000003F0,  // ..******...
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003F8,  // ..*******..
-     0x000003F0,  // ..******...
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x0000018C,  // ..**...**..
+     0x000001F0,  // ..*****....
+     0x000001F8,  // ..******...
+     0x0000018E,  // ..**...***.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x000001FC,  // ..*******..
+     0x000001F8,  // ..******...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3680,20 +3680,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3705,23 +3705,23 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000FF8,  // ...*********..
-     0x00000FF8,  // ...*********..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
+     0x000007FC,  // ...*********..
+     0x000007FC,  // ...*********..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
      0x00000000,  // ..............
   },
   {             // 181
@@ -3730,20 +3730,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FC,  // ..*******.
-     0x000001FC,  // ..*******.
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001FE,  // ..********
-     0x000001FE,  // ..********
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FE,  // ..*******.
+     0x000000FE,  // ..*******.
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000FF,  // ..********
+     0x000000FF,  // ..********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3755,20 +3755,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0003060C,  // .**.....**.....**.
-     0x00018618,  // ..**....**....**..
-     0x0001C638,  // ..***...**...***..
-     0x0000E670,  // ...***..**..***...
-     0x00006660,  // ....**..**..**....
-     0x000036C0,  // .....**.**.**.....
-     0x00003FC0,  // .....********.....
-     0x00003FC0,  // .....********.....
-     0x000076E0,  // ....***.**.***....
-     0x00006660,  // ....**..**..**....
-     0x0000C630,  // ...**...**...**...
-     0x00018618,  // ..**....**....**..
-     0x0003861C,  // .***....**....***.
-     0x0007060E,  // ***.....**.....***
+     0x00018306,  // .**.....**.....**.
+     0x0000C30C,  // ..**....**....**..
+     0x0000E31C,  // ..***...**...***..
+     0x00007338,  // ...***..**..***...
+     0x00003330,  // ....**..**..**....
+     0x00001B60,  // .....**.**.**.....
+     0x00001FE0,  // .....********.....
+     0x00001FE0,  // .....********.....
+     0x00003B70,  // ....***.**.***....
+     0x00003330,  // ....**..**..**....
+     0x00006318,  // ...**...**...**...
+     0x0000C30C,  // ..**....**....**..
+     0x0001C30E,  // .***....**....***.
+     0x00038307,  // ***.....**.....***
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -3780,20 +3780,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F8,  // .*******..
-     0x0000020C,  // .*.....**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x00000018,  // ......**..
-     0x000000E0,  // ...***....
-     0x000000F0,  // ...****...
-     0x0000001C,  // ......***.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000020C,  // .*.....**.
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x00000106,  // .*.....**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000070,  // ...***....
+     0x00000078,  // ...****...
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000106,  // .*.....**.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3805,20 +3805,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00001878,  // ..**....****..
-     0x00001878,  // ..**....****..
-     0x000018F8,  // ..**...*****..
-     0x000018D8,  // ..**...**.**..
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001B18,  // ..**.**...**..
-     0x00001F18,  // ..*****...**..
-     0x00001E18,  // ..****....**..
-     0x00001E18,  // ..****....**..
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C1C,  // ..**.....***..
+     0x00000C3C,  // ..**....****..
+     0x00000C3C,  // ..**....****..
+     0x00000C7C,  // ..**...*****..
+     0x00000C6C,  // ..**...**.**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D8C,  // ..**.**...**..
+     0x00000F8C,  // ..*****...**..
+     0x00000F0C,  // ..****....**..
+     0x00000F0C,  // ..****....**..
+     0x00000E0C,  // ..***.....**..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3826,24 +3826,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
   },
   {             // 185
      14, 22,
-     0x00000420,  // ....*....*....
-     0x000007E0,  // ....******....
-     0x000003C0,  // .....****.....
+     0x00000210,  // ....*....*....
+     0x000003F0,  // ....******....
+     0x000001E0,  // .....****.....
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001838,  // ..**.....***..
-     0x00001878,  // ..**....****..
-     0x00001878,  // ..**....****..
-     0x000018F8,  // ..**...*****..
-     0x000018D8,  // ..**...**.**..
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001B18,  // ..**.**...**..
-     0x00001F18,  // ..*****...**..
-     0x00001E18,  // ..****....**..
-     0x00001E18,  // ..****....**..
-     0x00001C18,  // ..***.....**..
-     0x00001818,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C1C,  // ..**.....***..
+     0x00000C3C,  // ..**....****..
+     0x00000C3C,  // ..**....****..
+     0x00000C7C,  // ..**...*****..
+     0x00000C6C,  // ..**...**.**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D8C,  // ..**.**...**..
+     0x00000F8C,  // ..*****...**..
+     0x00000F0C,  // ..****....**..
+     0x00000F0C,  // ..****....**..
+     0x00000E0C,  // ..***.....**..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3855,20 +3855,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x0000060C,  // ..**.....**.
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x00000670,  // ..**..***...
-     0x00000660,  // ..**..**....
-     0x000006C0,  // ..**.**.....
-     0x000007C0,  // ..*****.....
-     0x000007C0,  // ..*****.....
-     0x000006E0,  // ..**.***....
-     0x00000660,  // ..**..**....
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x0000061C,  // ..**....***.
-     0x0000060E,  // ..**.....***
+     0x00000306,  // ..**.....**.
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x00000338,  // ..**..***...
+     0x00000330,  // ..**..**....
+     0x00000360,  // ..**.**.....
+     0x000003E0,  // ..*****.....
+     0x000003E0,  // ..*****.....
+     0x00000370,  // ..**.***....
+     0x00000330,  // ..**..**....
+     0x00000318,  // ..**...**...
+     0x0000030C,  // ..**....**..
+     0x0000030E,  // ..**....***.
+     0x00000307,  // ..**.....***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3880,20 +3880,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000FF8,  // ...*********..
-     0x00000FF8,  // ...*********..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00000C18,  // ...**.....**..
-     0x00001818,  // ..**......**..
-     0x00003818,  // .***......**..
-     0x00003018,  // .**.......**..
+     0x000007FC,  // ...*********..
+     0x000007FC,  // ...*********..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x00000C0C,  // ..**......**..
+     0x00001C0C,  // .***......**..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3905,20 +3905,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000701C,  // ..***.......***.
-     0x0000701C,  // ..***.......***.
-     0x0000783C,  // ..****.....****.
-     0x0000783C,  // ..****.....****.
-     0x00007C3C,  // ..*****....****.
-     0x00006C6C,  // ..**.**...**.**.
-     0x00006C6C,  // ..**.**...**.**.
-     0x00006E6C,  // ..**.***..**.**.
-     0x000066CC,  // ..**..**.**..**.
-     0x000066CC,  // ..**..**.**..**.
-     0x000067CC,  // ..**..*****..**.
-     0x0000638C,  // ..**...***...**.
-     0x0000638C,  // ..**...***...**.
-     0x0000600C,  // ..**.........**.
+     0x0000380E,  // ..***.......***.
+     0x0000380E,  // ..***.......***.
+     0x00003C1E,  // ..****.....****.
+     0x00003C1E,  // ..****.....****.
+     0x00003E1E,  // ..*****....****.
+     0x00003636,  // ..**.**...**.**.
+     0x00003636,  // ..**.**...**.**.
+     0x00003736,  // ..**.***..**.**.
+     0x00003366,  // ..**..**.**..**.
+     0x00003366,  // ..**..**.**..**.
+     0x000033E6,  // ..**..*****..**.
+     0x000031C6,  // ..**...***...**.
+     0x000031C6,  // ..**...***...**.
+     0x00003006,  // ..**.........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -3930,20 +3930,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3955,20 +3955,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3980,20 +3980,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FF8,  // ..**********..
-     0x00001FF8,  // ..**********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4005,20 +4005,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FC,  // ..*******.
-     0x000001FE,  // ..********
-     0x0000018E,  // ..**...***
-     0x00000186,  // ..**....**
-     0x00000186,  // ..**....**
-     0x00000186,  // ..**....**
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000001F0,  // ..*****...
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000000FE,  // ..*******.
+     0x000000FF,  // ..********
+     0x000000C7,  // ..**...***
+     0x000000C3,  // ..**....**
+     0x000000C3,  // ..**....**
+     0x000000C3,  // ..**....**
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x000000F8,  // ..*****...
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4030,20 +4030,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F8,  // .....******..
-     0x000007FC,  // ...*********.
-     0x00000E04,  // ..***......*.
-     0x00000C00,  // ..**.........
-     0x00001C00,  // .***.........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C00,  // ..**.........
-     0x00000E04,  // ..***......*.
-     0x000007FC,  // ...*********.
-     0x000001F8,  // .....******..
+     0x000000FC,  // .....******..
+     0x000003FE,  // ...*********.
+     0x00000702,  // ..***......*.
+     0x00000600,  // ..**.........
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000600,  // ..**.........
+     0x00000702,  // ..***......*.
+     0x000003FE,  // ...*********.
+     0x000000FC,  // .....******..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4055,20 +4055,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001FFE,  // ************
-     0x00001FFE,  // ************
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000FFF,  // ************
+     0x00000FFF,  // ************
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4080,20 +4080,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0E,  // ***......***
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x00000618,  // ..**....**..
-     0x00000318,  // ...**...**..
-     0x00000330,  // ...**..**...
-     0x000001B0,  // ....**.**...
-     0x000001E0,  // ....****....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000780,  // ..****......
-     0x00000700,  // ..***.......
+     0x00000E07,  // ***......***
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x0000030C,  // ..**....**..
+     0x0000018C,  // ...**...**..
+     0x00000198,  // ...**..**...
+     0x000000D8,  // ....**.**...
+     0x000000F0,  // ....****....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x000003C0,  // ..****......
+     0x00000380,  // ..***.......
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4105,20 +4105,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00001FE0,  // ....********....
-     0x00007FF8,  // ..************..
-     0x00006318,  // ..**...**...**..
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x00006318,  // ..**...**...**..
-     0x00007FF8,  // ..************..
-     0x00001FE0,  // ....********....
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000FF0,  // ....********....
+     0x00003FFC,  // ..************..
+     0x0000318C,  // ..**...**...**..
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x0000318C,  // ..**...**...**..
+     0x00003FFC,  // ..************..
+     0x00000FF0,  // ....********....
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4130,20 +4130,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C1C,  // ***.....***.
-     0x00000C18,  // .**.....**..
-     0x00000638,  // ..**...***..
-     0x00000730,  // ..***..**...
-     0x00000360,  // ...**.**....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001C0,  // ....***.....
-     0x000003E0,  // ...*****....
-     0x00000360,  // ...**.**....
-     0x00000630,  // ..**...**...
-     0x00000E38,  // .***...***..
-     0x00000C18,  // .**.....**..
-     0x0000181C,  // **......***.
+     0x00000E0E,  // ***.....***.
+     0x0000060C,  // .**.....**..
+     0x0000031C,  // ..**...***..
+     0x00000398,  // ..***..**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B0,  // ...**.**....
+     0x00000318,  // ..**...**...
+     0x0000071C,  // .***...***..
+     0x0000060C,  // .**.....**..
+     0x00000C0E,  // **......***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4155,23 +4155,23 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000006,  // ...........**.
+     0x00000006,  // ...........**.
+     0x00000006,  // ...........**.
      0x00000000,  // ..............
   },
   {             // 199
@@ -4180,20 +4180,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001C38,  // .***....***..
-     0x00000FF8,  // ..*********..
-     0x000007D8,  // ...*****.**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007FC,  // ..*********..
+     0x000003EC,  // ...*****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4205,20 +4205,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x0001FFF8,  // ..**************..
-     0x0001FFF8,  // ..**************..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000FFFC,  // ..**************..
+     0x0000FFFC,  // ..**************..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4230,23 +4230,23 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x0001FFFC,  // ..***************.
-     0x0001FFFC,  // ..***************.
-     0x0000000C,  // ...............**.
-     0x0000000C,  // ...............**.
-     0x0000000C,  // ...............**.
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000FFFE,  // ..***************.
+     0x0000FFFE,  // ..***************.
+     0x00000006,  // ...............**.
+     0x00000006,  // ...............**.
+     0x00000006,  // ...............**.
      0x00000000,  // ..................
   },
   {             // 202
@@ -4255,20 +4255,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000F00,  // ****.......
-     0x00000F00,  // ****.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000003F8,  // ..*******..
+     0x00000780,  // ****.......
+     0x00000780,  // ****.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x0000018E,  // ..**...***.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4280,20 +4280,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00007E18,  // ..******....**..
-     0x00007F18,  // ..*******...**..
-     0x00006398,  // ..**...***..**..
-     0x00006198,  // ..**....**..**..
-     0x00006198,  // ..**....**..**..
-     0x00006398,  // ..**...***..**..
-     0x00007F98,  // ..********..**..
-     0x00007F18,  // ..*******...**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x00003F0C,  // ..******....**..
+     0x00003F8C,  // ..*******...**..
+     0x000031CC,  // ..**...***..**..
+     0x000030CC,  // ..**....**..**..
+     0x000030CC,  // ..**....**..**..
+     0x000031CC,  // ..**...***..**..
+     0x00003FCC,  // ..********..**..
+     0x00003F8C,  // ..*******...**..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4305,20 +4305,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000031C,  // ..**...***.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000003F8,  // ..*******..
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x0000018E,  // ..**...***.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4330,20 +4330,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FC0,  // ..******.....
-     0x00001FF0,  // .*********...
-     0x00001038,  // .*......***..
-     0x00000018,  // .........**..
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x000003FC,  // ....********.
-     0x000003FC,  // ....********.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00001038,  // .*......***..
-     0x00001FF0,  // .*********...
-     0x00000FC0,  // ..******.....
+     0x000007E0,  // ..******.....
+     0x00000FF8,  // .*********...
+     0x0000081C,  // .*......***..
+     0x0000000C,  // .........**..
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x000001FE,  // ....********.
+     0x000001FE,  // ....********.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000081C,  // .*......***..
+     0x00000FF8,  // .*********...
+     0x000007E0,  // ..******.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4355,20 +4355,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x000303C0,  // ..**......****.....
-     0x00030FF0,  // ..**....********...
-     0x00031C38,  // ..**...***....***..
-     0x00031818,  // ..**...**......**..
-     0x0003381C,  // ..**..***......***.
-     0x0003300C,  // ..**..**........**.
-     0x0003F00C,  // ..******........**.
-     0x0003F00C,  // ..******........**.
-     0x0003300C,  // ..**..**........**.
-     0x0003381C,  // ..**..***......***.
-     0x00031818,  // ..**...**......**..
-     0x00031C38,  // ..**...***....***..
-     0x00030FF0,  // ..**....********...
-     0x000303C0,  // ..**......****.....
+     0x000181E0,  // ..**......****.....
+     0x000187F8,  // ..**....********...
+     0x00018E1C,  // ..**...***....***..
+     0x00018C0C,  // ..**...**......**..
+     0x00019C0E,  // ..**..***......***.
+     0x00019806,  // ..**..**........**.
+     0x0001F806,  // ..******........**.
+     0x0001F806,  // ..******........**.
+     0x00019806,  // ..**..**........**.
+     0x00019C0E,  // ..**..***......***.
+     0x00018C0C,  // ..**...**......**..
+     0x00018E1C,  // ..**...***....***..
+     0x000187F8,  // ..**....********...
+     0x000181E0,  // ..**......****.....
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -4380,20 +4380,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F8,  // ....******..
-     0x000003F8,  // ...*******..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000218,  // ...*....**..
-     0x00000318,  // ...**...**..
-     0x000000F8,  // .....*****..
-     0x000001F8,  // ....******..
-     0x00000398,  // ...***..**..
-     0x00000318,  // ...**...**..
-     0x00000618,  // ..**....**..
-     0x00000E18,  // .***....**..
-     0x00001C18,  // ***.....**..
+     0x000000FC,  // ....******..
+     0x000001FC,  // ...*******..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000010C,  // ...*....**..
+     0x0000018C,  // ...**...**..
+     0x0000007C,  // .....*****..
+     0x000000FC,  // ....******..
+     0x000001CC,  // ...***..**..
+     0x0000018C,  // ...**...**..
+     0x0000030C,  // ..**....**..
+     0x0000070C,  // .***....**..
+     0x00000E0C,  // ***.....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4409,16 +4409,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000010C,  // ..*....**.
-     0x0000000C,  // .......**.
-     0x000000FC,  // ...******.
-     0x000001FC,  // ..*******.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FE,  // .*********
-     0x000001CE,  // ..***..***
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000086,  // ..*....**.
+     0x00000006,  // .......**.
+     0x0000007E,  // ...******.
+     0x000000FE,  // ..*******.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FF,  // .*********
+     0x000000E7,  // ..***..***
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4430,20 +4430,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F8,  // ....******..
-     0x000007F8,  // ..********..
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000DE0,  // .**.****....
-     0x00000FF8,  // .*********..
-     0x00000E18,  // .***....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000001E0,  // ....****....
+     0x000000FC,  // ....******..
+     0x000003FC,  // ..********..
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000006F0,  // .**.****....
+     0x000007FC,  // .*********..
+     0x0000070C,  // .***....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000000F0,  // ....****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4459,16 +4459,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000030C,  // ..**....**.
-     0x0000031C,  // ..**...***.
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x000003F8,  // ..*******..
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x00000186,  // ..**....**.
+     0x0000018E,  // ..**...***.
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x000001FE,  // ..********.
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4484,16 +4484,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000FE,  // ..*******
-     0x000000FE,  // ..*******
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
+     0x0000007F,  // ..*******
+     0x0000007F,  // ..*******
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4509,18 +4509,18 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x000003F8,  // ...*******..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x000001FC,  // ...*******..
+     0x000001FC,  // ...*******..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
   },
@@ -4534,16 +4534,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001E0,  // ...****....
-     0x000003F0,  // ..******...
-     0x00000318,  // ..**...**..
-     0x00000618,  // .**....**..
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000708,  // .***....*..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F0,  // ...****....
+     0x000001F8,  // ..******...
+     0x0000018C,  // ..**...**..
+     0x0000030C,  // .**....**..
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000384,  // .***....*..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4559,16 +4559,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000E31C,  // .***...**...***.
-     0x00006318,  // ..**...**...**..
-     0x00003330,  // ...**..**..**...
-     0x00001B60,  // ....**.**.**....
-     0x00001FE0,  // ....********....
-     0x00001FE0,  // ....********....
-     0x00003B70,  // ...***.**.***...
-     0x00007338,  // ..***..**..***..
-     0x0000E31C,  // .***...**...***.
-     0x0001C30E,  // ***....**....***
+     0x0000718E,  // .***...**...***.
+     0x0000318C,  // ..**...**...**..
+     0x00001998,  // ...**..**..**...
+     0x00000DB0,  // ....**.**.**....
+     0x00000FF0,  // ....********....
+     0x00000FF0,  // ....********....
+     0x00001DB8,  // ...***.**.***...
+     0x0000399C,  // ..***..**..***..
+     0x0000718E,  // .***...**...***.
+     0x0000E187,  // ***....**....***
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4584,16 +4584,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F8,  // .*******..
-     0x0000020C,  // .*.....**.
-     0x0000001C,  // ......***.
-     0x000000F0,  // ...****...
-     0x000000F8,  // ...*****..
-     0x0000000C,  // .......**.
-     0x0000020C,  // .*.....**.
-     0x000003FC,  // .********.
-     0x000001F8,  // ..******..
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x00000106,  // .*.....**.
+     0x0000000E,  // ......***.
+     0x00000078,  // ...****...
+     0x0000007C,  // ...*****..
+     0x00000006,  // .......**.
+     0x00000106,  // .*.....**.
+     0x000001FE,  // .********.
+     0x000000FC,  // ..******..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4609,16 +4609,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x00000678,  // ..**..****..
-     0x00000678,  // ..**..****..
-     0x000006D8,  // ..**.**.**..
-     0x000006D8,  // ..**.**.**..
-     0x00000798,  // ..****..**..
-     0x00000798,  // ..****..**..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x0000033C,  // ..**..****..
+     0x0000033C,  // ..**..****..
+     0x0000036C,  // ..**.**.**..
+     0x0000036C,  // ..**.**.**..
+     0x000003CC,  // ..****..**..
+     0x000003CC,  // ..****..**..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4630,20 +4630,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000210,  // ...*....*...
-     0x000003F0,  // ...******...
-     0x000001E0,  // ....****....
+     0x00000108,  // ...*....*...
+     0x000001F8,  // ...******...
+     0x000000F0,  // ....****....
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x00000678,  // ..**..****..
-     0x00000678,  // ..**..****..
-     0x000006D8,  // ..**.**.**..
-     0x000006D8,  // ..**.**.**..
-     0x00000798,  // ..****..**..
-     0x00000798,  // ..****..**..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x0000033C,  // ..**..****..
+     0x0000033C,  // ..**..****..
+     0x0000036C,  // ..**.**.**..
+     0x0000036C,  // ..**.**.**..
+     0x000003CC,  // ..****..**..
+     0x000003CC,  // ..****..**..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4659,16 +4659,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000031C,  // ..**...***.
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x00000360,  // ..**.**....
-     0x000003E0,  // ..*****....
-     0x000003E0,  // ..*****....
-     0x00000370,  // ..**.***...
-     0x00000338,  // ..**..***..
-     0x0000031C,  // ..**...***.
-     0x0000030E,  // ..**....***
+     0x0000018E,  // ..**...***.
+     0x0000018C,  // ..**...**..
+     0x00000198,  // ..**..**...
+     0x000001B0,  // ..**.**....
+     0x000001F0,  // ..*****....
+     0x000001F0,  // ..*****....
+     0x000001B8,  // ..**.***...
+     0x0000019C,  // ..**..***..
+     0x0000018E,  // ..**...***.
+     0x00000187,  // ..**....***
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4684,16 +4684,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x000003F8,  // ...*******..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000318,  // ...**...**..
-     0x00000F18,  // .****...**..
-     0x00000E18,  // .***....**..
+     0x000001FC,  // ...*******..
+     0x000001FC,  // ...*******..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000018C,  // ...**...**..
+     0x0000078C,  // .****...**..
+     0x0000070C,  // .***....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4709,16 +4709,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001C18,  // ..***.....**..
-     0x00001C38,  // ..***....***..
-     0x00001E38,  // ..****...***..
-     0x00001E78,  // ..****..****..
-     0x00001E78,  // ..****..****..
-     0x00001BD8,  // ..**.****.**..
-     0x00001BD8,  // ..**.****.**..
-     0x00001998,  // ..**..**..**..
-     0x00001818,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E0C,  // ..***.....**..
+     0x00000E1C,  // ..***....***..
+     0x00000F1C,  // ..****...***..
+     0x00000F3C,  // ..****..****..
+     0x00000F3C,  // ..****..****..
+     0x00000DEC,  // ..**.****.**..
+     0x00000DEC,  // ..**.****.**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000C0C,  // ..**......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4734,16 +4734,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4759,16 +4759,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000001E0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000003FC,  // ..********..
+     0x0000030C,  // ..**....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000000F0,  // ....****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4784,16 +4784,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4809,20 +4809,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000006F0,  // ..**.****...
-     0x000007F8,  // ..********..
-     0x0000071C,  // ..***...***.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000718,  // ..***...**..
-     0x000007F8,  // ..********..
-     0x000006F0,  // ..**.****...
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
+     0x00000378,  // ..**.****...
+     0x000003FC,  // ..********..
+     0x0000038E,  // ..***...***.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x0000038C,  // ..***...**..
+     0x000003FC,  // ..********..
+     0x00000378,  // ..**.****...
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
   },
   {             // 225
      10, 22,
@@ -4834,16 +4834,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000078,  // ....****..
-     0x000001FC,  // ..*******.
-     0x00000184,  // ..**....*.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000184,  // ..**....*.
-     0x000001FC,  // ..*******.
-     0x00000078,  // ....****..
+     0x0000003C,  // ....****..
+     0x000000FE,  // ..*******.
+     0x000000C2,  // ..**....*.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C2,  // ..**....*.
+     0x000000FE,  // ..*******.
+     0x0000003C,  // ....****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4859,16 +4859,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000001FE,  // ********
-     0x000001FE,  // ********
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x000000FF,  // ********
+     0x000000FF,  // ********
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4884,20 +4884,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000030E,  // .**....***
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000000F8,  // ...*****..
-     0x000000F0,  // ...****...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000000C0,  // ...**.....
-     0x000001C0,  // ..***.....
+     0x00000303,  // **......**
+     0x00000187,  // .**....***
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000007C,  // ...*****..
+     0x00000078,  // ...****...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x000000E0,  // ..***.....
   },
   {             // 228
      16, 22,
@@ -4905,24 +4905,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00003B70,  // ...***.**.***...
-     0x00007FF8,  // ..************..
-     0x00006798,  // ..**..****..**..
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x00006798,  // ..**..****..**..
-     0x00007FF8,  // ..************..
-     0x00003B70,  // ...***.**.***...
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00001DB8,  // ...***.**.***...
+     0x00003FFC,  // ..************..
+     0x000033CC,  // ..**..****..**..
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x000033CC,  // ..**..****..**..
+     0x00003FFC,  // ..************..
+     0x00001DB8,  // ...***.**.***...
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
   },
   {             // 229
      12, 22,
@@ -4934,16 +4934,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000E1C,  // .***....***.
-     0x00000718,  // ..***...**..
-     0x00000330,  // ...**..**...
-     0x000001F0,  // ....*****...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000003E0,  // ...*****....
-     0x00000330,  // ...**..**...
-     0x00000638,  // ..**...***..
-     0x00000E1C,  // .***....***.
+     0x0000070E,  // .***....***.
+     0x0000038C,  // ..***...**..
+     0x00000198,  // ...**..**...
+     0x000000F8,  // ....*****...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000001F0,  // ...*****....
+     0x00000198,  // ...**..**...
+     0x0000031C,  // ..**...***..
+     0x0000070E,  // .***....***.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4959,18 +4959,18 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000006,  // .........**.
+     0x00000006,  // .........**.
      0x00000000,  // ............
      0x00000000,  // ............
   },
@@ -4984,16 +4984,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000638,  // ..**...***..
-     0x000007F8,  // ..********..
-     0x00000398,  // ...***..**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000031C,  // ..**...***..
+     0x000003FC,  // ..********..
+     0x000001CC,  // ...***..**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5009,16 +5009,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x0001FFF8,  // ..**************..
-     0x0001FFF8,  // ..**************..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000FFFC,  // ..**************..
+     0x0000FFFC,  // ..**************..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5034,18 +5034,18 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x00018618,  // ..**....**....**..
-     0x0001FFFC,  // ..***************.
-     0x0001FFFC,  // ..***************.
-     0x0000000C,  // ...............**.
-     0x0000000C,  // ...............**.
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000C30C,  // ..**....**....**..
+     0x0000FFFE,  // ..***************.
+     0x0000FFFE,  // ..***************.
+     0x00000006,  // ...............**.
+     0x00000006,  // ...............**.
      0x00000000,  // ..................
      0x00000000,  // ..................
   },
@@ -5059,16 +5059,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000F00,  // ****.......
-     0x00000F00,  // ****.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x000003F8,  // ..*******..
+     0x00000780,  // ****.......
+     0x00000780,  // ****.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x000001FE,  // ..********.
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5084,16 +5084,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00007E18,  // ..******....**..
-     0x00007F18,  // ..*******...**..
-     0x00006198,  // ..**....**..**..
-     0x00006198,  // ..**....**..**..
-     0x00007F98,  // ..********..**..
-     0x00007F18,  // ..*******...**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x00003F0C,  // ..******....**..
+     0x00003F8C,  // ..*******...**..
+     0x000030CC,  // ..**....**..**..
+     0x000030CC,  // ..**....**..**..
+     0x00003FCC,  // ..********..**..
+     0x00003F8C,  // ..*******...**..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5109,16 +5109,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x000003F0,  // ..******...
-     0x000003F8,  // ..*******..
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x000003FC,  // ..********.
-     0x000003F8,  // ..*******..
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x000001F8,  // ..******...
+     0x000001FC,  // ..*******..
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x000001FE,  // ..********.
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5134,16 +5134,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001E0,  // ..****....
-     0x000003F8,  // .*******..
-     0x00000218,  // .*....**..
-     0x0000000C,  // .......**.
-     0x0000007C,  // ....*****.
-     0x0000007C,  // ....*****.
-     0x0000000C,  // .......**.
-     0x00000218,  // .*....**..
-     0x000003F8,  // .*******..
-     0x000001E0,  // ..****....
+     0x000000F0,  // ..****....
+     0x000001FC,  // .*******..
+     0x0000010C,  // .*....**..
+     0x00000006,  // .......**.
+     0x0000003E,  // ....*****.
+     0x0000003E,  // ....*****.
+     0x00000006,  // .......**.
+     0x0000010C,  // .*....**..
+     0x000001FC,  // .*******..
+     0x000000F0,  // ..****....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5159,16 +5159,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x000060E0,  // ..**.....***....
-     0x000063F8,  // ..**...*******..
-     0x00006318,  // ..**...**...**..
-     0x0000660C,  // ..**..**.....**.
-     0x00007E0C,  // ..******.....**.
-     0x00007E0C,  // ..******.....**.
-     0x0000660C,  // ..**..**.....**.
-     0x00006318,  // ..**...**...**..
-     0x000063F8,  // ..**...*******..
-     0x000060E0,  // ..**.....***....
+     0x00003070,  // ..**.....***....
+     0x000031FC,  // ..**...*******..
+     0x0000318C,  // ..**...**...**..
+     0x00003306,  // ..**..**.....**.
+     0x00003F06,  // ..******.....**.
+     0x00003F06,  // ..******.....**.
+     0x00003306,  // ..**..**.....**.
+     0x0000318C,  // ..**...**...**..
+     0x000031FC,  // ..**...*******..
+     0x00003070,  // ..**.....***....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5184,16 +5184,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x000007F8,  // ..********..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000003F8,  // ...*******..
-     0x000000F8,  // .....*****..
-     0x00000198,  // ....**..**..
-     0x00000318,  // ...**...**..
-     0x00000618,  // ..**....**..
-     0x00000E18,  // .***....**..
+     0x000001FC,  // ...*******..
+     0x000003FC,  // ..********..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000001FC,  // ...*******..
+     0x0000007C,  // .....*****..
+     0x000000CC,  // ....**..**..
+     0x0000018C,  // ...**...**..
+     0x0000030C,  // ..**....**..
+     0x0000070C,  // .***....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5205,20 +5205,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00030300,  // ..**......**.......
-     0x00038300,  // ..***.....**.......
-     0x0003C300,  // ..****....**.......
-     0x0003C338,  // ..****....**..***..
-     0x0003E37C,  // ..*****...**.*****.
-     0x0003636C,  // ..**.**...**.**.**.
-     0x0003336C,  // ..**..**..**.**.**.
-     0x0003337C,  // ..**..**..**.*****.
-     0x00031B38,  // ..**...**.**..***..
-     0x00031F00,  // ..**...*****.......
-     0x00030F7C,  // ..**....****.*****.
-     0x00030F7C,  // ..**....****.*****.
-     0x00030700,  // ..**.....***.......
-     0x00030300,  // ..**......**.......
+     0x00018180,  // ..**......**.......
+     0x0001C180,  // ..***.....**.......
+     0x0001E180,  // ..****....**.......
+     0x0001E19C,  // ..****....**..***..
+     0x0001F1BE,  // ..*****...**.*****.
+     0x0001B1B6,  // ..**.**...**.**.**.
+     0x000199B6,  // ..**..**..**.**.**.
+     0x000199BE,  // ..**..**..**.*****.
+     0x00018D9C,  // ..**...**.**..***..
+     0x00018F80,  // ..**...*****.......
+     0x000187BE,  // ..**....****.*****.
+     0x000187BE,  // ..**....****.*****.
+     0x00018380,  // ..**.....***.......
+     0x00018180,  // ..**......**.......
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -5231,19 +5231,19 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000330,  // ..**..**...
-     0x00000330,  // ..**..**...
+     0x00000198,  // ..**..**...
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
-     0x000001E0,  // ...****....
-     0x000003F0,  // ..******...
-     0x00000318,  // ..**...**..
-     0x00000618,  // .**....**..
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000708,  // .***....*..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F0,  // ...****....
+     0x000001F8,  // ..******...
+     0x0000018C,  // ..**...**..
+     0x0000030C,  // .**....**..
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000384,  // .***....*..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5255,24 +5255,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000FE0,  // .*******....
-     0x00000FE0,  // .*******....
-     0x00000600,  // ..**........
-     0x00000670,  // ..**..***...
-     0x000006F8,  // ..**.*****..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x000000F0,  // .....****...
-     0x000000E0,  // .....***....
+     0x00000300,  // ..**........
+     0x000007F0,  // .*******....
+     0x000007F0,  // .*******....
+     0x00000300,  // ..**........
+     0x00000338,  // ..**..***...
+     0x0000037C,  // ..**.*****..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000078,  // .....****...
+     0x00000070,  // .....***....
   },
   {             // 243
      9, 22,
@@ -5280,20 +5280,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
      0x00000000,  // .........
-     0x000000FE,  // ..*******
-     0x000000FE,  // ..*******
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
+     0x0000007F,  // ..*******
+     0x0000007F,  // ..*******
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5309,16 +5309,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000078,  // ....****..
-     0x000001FC,  // ..*******.
-     0x00000184,  // ..**....*.
-     0x00000300,  // .**.......
-     0x000003E0,  // .*****....
-     0x000003E0,  // .*****....
-     0x00000300,  // .**.......
-     0x00000184,  // ..**....*.
-     0x000001FC,  // ..*******.
-     0x00000078,  // ....****..
+     0x0000003C,  // ....****..
+     0x000000FE,  // ..*******.
+     0x000000C2,  // ..**....*.
+     0x00000180,  // .**.......
+     0x000001F0,  // .*****....
+     0x000001F0,  // .*****....
+     0x00000180,  // .**.......
+     0x000000C2,  // ..**....*.
+     0x000000FE,  // ..*******.
+     0x0000003C,  // ....****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5334,16 +5334,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F0,  // .******...
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001E0,  // ..****....
-     0x000000F8,  // ...*****..
-     0x00000018,  // ......**..
-     0x00000218,  // .*....**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x000001F8,  // .******...
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000000C,  // ......**..
+     0x0000010C,  // .*....**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5355,20 +5355,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -5380,49 +5380,49 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
   },
   {             // 248
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000008C,  // *...**.
-     0x000000F8,  // *****..
-     0x000000F0,  // ****...
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000046,  // *...**.
+     0x0000007C,  // *****..
+     0x00000078,  // ****...
   },
   {             // 249
      17, 22,
@@ -5434,16 +5434,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00007F00,  // ...*******.......
-     0x00007F00,  // ...*******.......
-     0x00006300,  // ...**...**.......
-     0x00006300,  // ...**...**.......
-     0x000063F0,  // ...**...******...
-     0x000063F8,  // ...**...*******..
-     0x0000630C,  // ...**...**....**.
-     0x0000630C,  // ...**...**....**.
-     0x0001E3FC,  // .****...********.
-     0x0001C3F8,  // .***....*******..
+     0x00003F80,  // ...*******.......
+     0x00003F80,  // ...*******.......
+     0x00003180,  // ...**...**.......
+     0x00003180,  // ...**...**.......
+     0x000031F8,  // ...**...******...
+     0x000031FC,  // ...**...*******..
+     0x00003186,  // ...**...**....**.
+     0x00003186,  // ...**...**....**.
+     0x0000F1FE,  // .****...********.
+     0x0000E1FC,  // .***....*******..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5459,16 +5459,16 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C300,  // ..**....**.......
-     0x0000C300,  // ..**....**.......
-     0x0000C300,  // ..**....**.......
-     0x0000C300,  // ..**....**.......
-     0x0000FFF0,  // ..************...
-     0x0000FFF8,  // ..*************..
-     0x0000C30C,  // ..**....**....**.
-     0x0000C30C,  // ..**....**....**.
-     0x0000C3FC,  // ..**....********.
-     0x0000C3F8,  // ..**....*******..
+     0x00006180,  // ..**....**.......
+     0x00006180,  // ..**....**.......
+     0x00006180,  // ..**....**.......
+     0x00006180,  // ..**....**.......
+     0x00007FF8,  // ..************...
+     0x00007FFC,  // ..*************..
+     0x00006186,  // ..**....**....**.
+     0x00006186,  // ..**....**....**.
+     0x000061FE,  // ..**....********.
+     0x000061FC,  // ..**....*******..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -5480,20 +5480,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000600,  // ..**........
-     0x00000FE0,  // .*******....
-     0x00000FE0,  // .*******....
-     0x00000600,  // ..**........
-     0x00000670,  // ..**..***...
-     0x000006F8,  // ..**.*****..
-     0x00000718,  // ..***...**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
+     0x00000300,  // ..**........
+     0x000007F0,  // .*******....
+     0x000007F0,  // .*******....
+     0x00000300,  // ..**........
+     0x00000338,  // ..**..***...
+     0x0000037C,  // ..**.*****..
+     0x0000038C,  // ..***...**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5505,20 +5505,20 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
      0x00000000,  // ...........
-     0x0000031C,  // ..**...***.
-     0x00000318,  // ..**...**..
-     0x00000330,  // ..**..**...
-     0x00000360,  // ..**.**....
-     0x000003E0,  // ..*****....
-     0x000003E0,  // ..*****....
-     0x00000370,  // ..**.***...
-     0x00000338,  // ..**..***..
-     0x0000031C,  // ..**...***.
-     0x0000030E,  // ..**....***
+     0x0000018E,  // ..**...***.
+     0x0000018C,  // ..**...**..
+     0x00000198,  // ..**..**...
+     0x000001B0,  // ..**.**....
+     0x000001F0,  // ..*****....
+     0x000001F0,  // ..*****....
+     0x000001B8,  // ..**.***...
+     0x0000019C,  // ..**..***..
+     0x0000018E,  // ..**...***.
+     0x00000187,  // ..**....***
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5530,24 +5530,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x00000708,  // ..***....*..
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000380,  // ...***......
-     0x000003E0,  // ...*****....
-     0x00000670,  // ..**..***...
-     0x00000618,  // ..**....**..
-     0x00000718,  // ..***...**..
-     0x00000398,  // ...***..**..
-     0x000001F0,  // ....*****...
-     0x00000070,  // ......***...
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000438,  // ..*....***..
-     0x000007F8,  // ..********..
-     0x000003E0,  // ...*****....
+     0x000000F8,  // ....*****...
+     0x000001FC,  // ...*******..
+     0x00000384,  // ..***....*..
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x000001C0,  // ...***......
+     0x000001F0,  // ...*****....
+     0x00000338,  // ..**..***...
+     0x0000030C,  // ..**....**..
+     0x0000038C,  // ..***...**..
+     0x000001CC,  // ...***..**..
+     0x000000F8,  // ....*****...
+     0x00000038,  // ......***...
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000021C,  // ..*....***..
+     0x000003FC,  // ..********..
+     0x000001F0,  // ...*****....
   },
   {             // 254
      10, 22,
@@ -5555,24 +5555,24 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000108,  // ..*....*..
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000084,  // ..*....*..
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000030E,  // .**....***
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000000F8,  // ...*****..
-     0x000000F0,  // ...****...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000000C0,  // ...**.....
-     0x000001C0,  // ..***.....
+     0x00000303,  // **......**
+     0x00000187,  // .**....***
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000007C,  // ...*****..
+     0x00000078,  // ...****...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x000000E0,  // ..***.....
   },
   {             // 255
      12, 22,
@@ -5584,18 +5584,18 @@ cFont::tPixelData FontOsd_iso8859_5[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
   },
diff --git a/fontosd-iso8859-7.c b/fontosd-iso8859-7.c
index f0ec08c01..ef49b326c 100644
--- a/fontosd-iso8859-7.c
+++ b/fontosd-iso8859-7.c
@@ -32,23 +32,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -60,12 +60,12 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CE,  // .**..***
-     0x000000CE,  // .**..***
-     0x000000CE,  // .**..***
-     0x000000CE,  // .**..***
-     0x000000CE,  // .**..***
-     0x000000C4,  // .**...*.
+     0x00000067,  // .**..***
+     0x00000067,  // .**..***
+     0x00000067,  // .**..***
+     0x00000067,  // .**..***
+     0x00000067,  // .**..***
+     0x00000062,  // .**...*.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -87,24 +87,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000010C,  // .....*....**.
-     0x0000030C,  // ....**....**.
-     0x00000308,  // ....**....*..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00000318,  // ....**...**..
-     0x00003FFE,  // *************
-     0x00003FFE,  // *************
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000430,  // ...*....**...
-     0x00003FFE,  // *************
-     0x00003FFE,  // *************
-     0x00000C60,  // ..**...**....
-     0x00000C60,  // ..**...**....
-     0x00000860,  // ..*....**....
-     0x00001840,  // .**....*.....
-     0x00001840,  // .**....*.....
+     0x00000086,  // .....*....**.
+     0x00000186,  // ....**....**.
+     0x00000184,  // ....**....*..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00001FFF,  // *************
+     0x00001FFF,  // *************
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000218,  // ...*....**...
+     0x00001FFF,  // *************
+     0x00001FFF,  // *************
+     0x00000630,  // ..**...**....
+     0x00000630,  // ..**...**....
+     0x00000430,  // ..*....**....
+     0x00000C20,  // .**....*.....
+     0x00000C20,  // .**....*.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -115,26 +115,26 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000007F0,  // ...*******...
-     0x00000FF8,  // ..*********..
-     0x00001CCC,  // .***..**..**.
-     0x000018CC,  // .**...**..**.
-     0x000018C0,  // .**...**.....
-     0x00001CC0,  // .***..**.....
-     0x00000EC0,  // ..***.**.....
-     0x000007E0,  // ...******....
-     0x000003F8,  // ....*******..
-     0x000000F8,  // ......*****..
-     0x000000CC,  // ......**..**.
-     0x000000CC,  // ......**..**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x00000CCC,  // ..**..**..**.
-     0x00000FF8,  // ..*********..
-     0x000007F0,  // ...*******...
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000003F8,  // ...*******...
+     0x000007FC,  // ..*********..
+     0x00000E66,  // .***..**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C60,  // .**...**.....
+     0x00000E60,  // .***..**.....
+     0x00000760,  // ..***.**.....
+     0x000003F0,  // ...******....
+     0x000001FC,  // ....*******..
+     0x0000007C,  // ......*****..
+     0x00000066,  // ......**..**.
+     0x00000066,  // ......**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000666,  // ..**..**..**.
+     0x000007FC,  // ..*********..
+     0x000003F8,  // ...*******...
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -143,24 +143,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      21, 25,
      0x00000000,  // .....................
      0x00000000,  // .....................
-     0x00078040,  // ...****........*.....
-     0x000FC0C0,  // ..******......**.....
-     0x00186080,  // .**....**.....*......
-     0x00186180,  // .**....**....**......
-     0x00186100,  // .**....**....*.......
-     0x00186300,  // .**....**...**.......
-     0x00186200,  // .**....**...*........
-     0x000CC600,  // ..**..**...**........
-     0x000FC400,  // ..******...*.........
-     0x00000C70,  // ..........**...***...
-     0x000008F8,  // ..........*...*****..
-     0x0000198C,  // .........**..**...**.
-     0x0000118C,  // .........*...**...**.
-     0x0000318C,  // ........**...**...**.
-     0x0000618C,  // .......**....**...**.
-     0x0000618C,  // .......**....**...**.
-     0x0000C0C8,  // ......**......**..*..
-     0x0000C0F8,  // ......**......*****..
+     0x0003C020,  // ...****........*.....
+     0x0007E060,  // ..******......**.....
+     0x000C3040,  // .**....**.....*......
+     0x000C30C0,  // .**....**....**......
+     0x000C3080,  // .**....**....*.......
+     0x000C3180,  // .**....**...**.......
+     0x000C3100,  // .**....**...*........
+     0x00066300,  // ..**..**...**........
+     0x0007E200,  // ..******...*.........
+     0x00000638,  // ..........**...***...
+     0x0000047C,  // ..........*...*****..
+     0x00000CC6,  // .........**..**...**.
+     0x000008C6,  // .........*...**...**.
+     0x000018C6,  // ........**...**...**.
+     0x000030C6,  // .......**....**...**.
+     0x000030C6,  // .......**....**...**.
+     0x00006064,  // ......**......**..*..
+     0x0000607C,  // ......**......*****..
      0x00000000,  // .....................
      0x00000000,  // .....................
      0x00000000,  // .....................
@@ -171,24 +171,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      16, 25,
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00000F80,  // .....*****......
-     0x00001FC0,  // ....*******.....
-     0x000038E0,  // ...***...***....
-     0x00003060,  // ...**.....**....
-     0x000030E0,  // ...**....***....
-     0x000038C0,  // ...***...**.....
-     0x00001FC0,  // ....*******.....
-     0x00000F00,  // .....****.......
-     0x00001F00,  // ....*****.......
-     0x00007780,  // ..***.****......
-     0x000063D8,  // ..**...****.**..
-     0x0000C1D8,  // .**.....***.**..
-     0x0000C0F8,  // .**......*****..
-     0x0000C070,  // .**.......***...
-     0x0000E078,  // .***......****..
-     0x000070FC,  // ..***....******.
-     0x00003FCE,  // ...********..***
-     0x00001F04,  // ....*****.....*.
+     0x000007C0,  // .....*****......
+     0x00000FE0,  // ....*******.....
+     0x00001C70,  // ...***...***....
+     0x00001830,  // ...**.....**....
+     0x00001870,  // ...**....***....
+     0x00001C60,  // ...***...**.....
+     0x00000FE0,  // ....*******.....
+     0x00000780,  // .....****.......
+     0x00000F80,  // ....*****.......
+     0x00003BC0,  // ..***.****......
+     0x000031EC,  // ..**...****.**..
+     0x000060EC,  // .**.....***.**..
+     0x0000607C,  // .**......*****..
+     0x00006038,  // .**.......***...
+     0x0000703C,  // .***......****..
+     0x0000387E,  // ..***....******.
+     0x00001FE7,  // ...********..***
+     0x00000F82,  // ....*****.....*.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -200,12 +200,12 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -228,68 +228,68 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000008,  // .....*..
-     0x00000018,  // ....**..
-     0x00000010,  // ....*...
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000008,  // .....*..
+     0x00000004,  // .....*..
+     0x0000000C,  // ....**..
+     0x00000008,  // ....*...
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
   },
   {             // 41
      8, 25,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000040,  // ..*.....
-     0x00000060,  // ..**....
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x0000000C,  // .....**.
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000040,  // ..*.....
+     0x00000020,  // ..*.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
      0x00000000,  // ........
   },
   {             // 42
      9, 25,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x000001FE,  // .********
-     0x000000FC,  // ..******.
-     0x00000038,  // ....***..
-     0x00000058,  // ...*.**..
-     0x000000CC,  // ..**..**.
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x000000FF,  // .********
+     0x0000007E,  // ..******.
+     0x0000001C,  // ....***..
+     0x0000002C,  // ...*.**..
+     0x00000066,  // ..**..**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -314,18 +314,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -354,11 +354,11 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x00000010,  // ...*...
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000008,  // ...*...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -378,8 +378,8 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x000000FC,  // .******.
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -411,8 +411,8 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -423,23 +423,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      7, 25,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000004,  // .....*.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000008,  // ....*..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000020,  // ..*....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000040,  // .*.....
-     0x00000040,  // .*.....
-     0x000000C0,  // **.....
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -452,23 +452,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F0,  // ...*******...
-     0x00000C38,  // ..**....***..
-     0x00000C18,  // ..**.....**..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x000007F0,  // ...*******...
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x0000060C,  // ..**.....**..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -480,23 +480,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x000000E0,  // ......***....
-     0x000003E0,  // ....*****....
-     0x00000760,  // ...***.**....
-     0x00000460,  // ...*...**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
-     0x00000060,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000070,  // ......***....
+     0x000001F0,  // ....*****....
+     0x000003B0,  // ...***.**....
+     0x00000230,  // ...*...**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -507,24 +507,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F8,  // ...********..
-     0x00000C18,  // ..**.....**..
-     0x00001C0C,  // .***......**.
-     0x0000180C,  // .**.......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000018,  // .........**..
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000001C0,  // .....***.....
-     0x00000380,  // ....***......
-     0x00000600,  // ...**........
-     0x00000C00,  // ..**.........
-     0x00000800,  // ..*..........
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
+     0x000001F0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x0000060C,  // ..**.....**..
+     0x00000E06,  // .***......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x000000E0,  // .....***.....
+     0x000001C0,  // ....***......
+     0x00000300,  // ...**........
+     0x00000600,  // ..**.........
+     0x00000400,  // ..*..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -535,24 +535,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F8,  // ...********..
-     0x00000E7C,  // ..***..*****.
-     0x00000C3C,  // ..**....****.
-     0x0000083C,  // ..*.....****.
-     0x0000003C,  // ........****.
-     0x0000003C,  // ........****.
-     0x00000078,  // .......****..
-     0x000001E0,  // .....****....
-     0x000000F8,  // ......*****..
-     0x0000001C,  // .........***.
-     0x0000001E,  // .........****
-     0x0000000E,  // ..........***
-     0x0000001E,  // .........****
-     0x00000C1E,  // ..**.....****
-     0x00000C3C,  // ..**....****.
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x000000F0,  // .....****....
+     0x000003FC,  // ...********..
+     0x0000073E,  // ..***..*****.
+     0x0000061E,  // ..**....****.
+     0x0000041E,  // ..*.....****.
+     0x0000001E,  // ........****.
+     0x0000001E,  // ........****.
+     0x0000003C,  // .......****..
+     0x000000F0,  // .....****....
+     0x0000007C,  // ......*****..
+     0x0000000E,  // .........***.
+     0x0000000F,  // .........****
+     0x00000007,  // ..........***
+     0x0000000F,  // .........****
+     0x0000060F,  // ..**.....****
+     0x0000061E,  // ..**....****.
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -564,23 +564,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000030,  // ........**...
-     0x00000070,  // .......***...
-     0x00000070,  // .......***...
-     0x000000F0,  // ......****...
-     0x000001B0,  // .....**.**...
-     0x000003B0,  // ....***.**...
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000E30,  // ..***...**...
-     0x00000C30,  // ..**....**...
-     0x00001830,  // .**.....**...
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
-     0x00000030,  // ........**...
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x000001D8,  // ....***.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000718,  // ..***...**...
+     0x00000618,  // ..**....**...
+     0x00000C18,  // .**.....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -592,23 +592,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003FC,  // ....********.
-     0x000003FC,  // ....********.
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x000006F0,  // ...**.****...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x0000000E,  // ..........***
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000006,  // ...........**
-     0x00000C06,  // ..**.......**
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001F0,  // .....*****...
+     0x000001FE,  // ....********.
+     0x000001FE,  // ....********.
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000378,  // ...**.****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000007,  // ..........***
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000603,  // ..**.......**
+     0x00000606,  // ..**......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000000F8,  // .....*****...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -619,24 +619,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000003FC,  // ....********.
-     0x0000061C,  // ...**....***.
-     0x00000C0E,  // ..**......***
-     0x00000C0E,  // ..**......***
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x000019F0,  // .**..*****...
-     0x00001BF8,  // .**.*******..
-     0x00001C1C,  // .***.....***.
-     0x00001C0E,  // .***......***
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00000C0E,  // ..**......***
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000001F0,  // .....*****...
+     0x000000F8,  // .....*****...
+     0x000001FE,  // ....********.
+     0x0000030E,  // ...**....***.
+     0x00000607,  // ..**......***
+     0x00000607,  // ..**......***
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000CF8,  // .**..*****...
+     0x00000DFC,  // .**.*******..
+     0x00000E0E,  // .***.....***.
+     0x00000E07,  // .***......***
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000607,  // ..**......***
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000000F8,  // .....*****...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -648,23 +648,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FF8,  // .**********..
-     0x00001FF8,  // .**********..
-     0x00000030,  // ........**...
-     0x00000070,  // .......***...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000300,  // ....**.......
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -675,24 +675,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007FC,  // ...*********.
-     0x00000E0E,  // ..***.....***
-     0x00000C0E,  // ..**......***
-     0x00000C0E,  // ..**......***
-     0x00000C0E,  // ..**......***
-     0x0000061C,  // ...**....***.
-     0x000003F8,  // ....*******..
-     0x000007F8,  // ...********..
-     0x0000060C,  // ...**.....**.
-     0x00000E06,  // ..***......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000E06,  // ..***......**
-     0x0000070C,  // ...***....**.
-     0x000003F8,  // ....*******..
-     0x000001F0,  // .....*****...
+     0x000000F8,  // .....*****...
+     0x000003FE,  // ...*********.
+     0x00000707,  // ..***.....***
+     0x00000607,  // ..**......***
+     0x00000607,  // ..**......***
+     0x00000607,  // ..**......***
+     0x0000030E,  // ...**....***.
+     0x000001FC,  // ....*******..
+     0x000003FC,  // ...********..
+     0x00000306,  // ...**.....**.
+     0x00000703,  // ..***......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000703,  // ..***......**
+     0x00000386,  // ...***....**.
+     0x000001FC,  // ....*******..
+     0x000000F8,  // .....*****...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -703,24 +703,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x0000180E,  // .**.......***
-     0x0000180E,  // .**.......***
-     0x0000180E,  // .**.......***
-     0x0000180E,  // .**.......***
-     0x00001C0E,  // .***......***
-     0x00000E1E,  // ..***....****
-     0x000007F6,  // ...*******.**
-     0x000003E6,  // ....*****..**
-     0x0000000E,  // ..........***
-     0x0000000C,  // ..........**.
-     0x00000C0C,  // ..**......**.
-     0x00000C18,  // ..**.....**..
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000C07,  // .**.......***
+     0x00000C07,  // .**.......***
+     0x00000C07,  // .**.......***
+     0x00000C07,  // .**.......***
+     0x00000E07,  // .***......***
+     0x0000070F,  // ..***....****
+     0x000003FB,  // ...*******.**
+     0x000001F3,  // ....*****..**
+     0x00000007,  // ..........***
+     0x00000006,  // ..........**.
+     0x00000606,  // ..**......**.
+     0x0000060C,  // ..**.....**..
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -737,8 +737,8 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -747,8 +747,8 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -765,8 +765,8 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -775,11 +775,11 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000008,  // ....*..
-     0x00000008,  // ....*..
-     0x00000010,  // ...*...
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000008,  // ...*...
      0x00000000,  // .......
      0x00000000,  // .......
   },
@@ -791,17 +791,17 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000008,  // ...........*..
-     0x00000038,  // .........***..
-     0x000000F0,  // .......****...
-     0x000007C0,  // ....*****.....
-     0x00001E00,  // ..****........
-     0x00003800,  // .***..........
-     0x00003E00,  // .*****........
-     0x00000F80,  // ...*****......
-     0x000001E0,  // ......****....
-     0x00000078,  // ........****..
-     0x00000018,  // ..........**..
+     0x00000004,  // ...........*..
+     0x0000001C,  // .........***..
+     0x00000078,  // .......****...
+     0x000003E0,  // ....*****.....
+     0x00000F00,  // ..****........
+     0x00001C00,  // .***..........
+     0x00001F00,  // .*****........
+     0x000007C0,  // ...*****......
+     0x000000F0,  // ......****....
+     0x0000003C,  // ........****..
+     0x0000000C,  // ..........**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -821,13 +821,13 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FF8,  // .***********..
-     0x00003FF8,  // .***********..
+     0x00001FFC,  // .***********..
+     0x00001FFC,  // .***********..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FF8,  // .***********..
-     0x00003FF8,  // .***********..
+     0x00001FFC,  // .***********..
+     0x00001FFC,  // .***********..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -847,17 +847,17 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00002000,  // .*............
-     0x00003C00,  // .****.........
-     0x00001F00,  // ..*****.......
-     0x000003E0,  // .....*****....
-     0x000000F8,  // .......*****..
-     0x00000018,  // ..........**..
-     0x00000078,  // ........****..
-     0x000001E0,  // ......****....
-     0x00000F80,  // ...*****......
-     0x00003E00,  // .*****........
-     0x00003000,  // .**...........
+     0x00001000,  // .*............
+     0x00001E00,  // .****.........
+     0x00000F80,  // ..*****.......
+     0x000001F0,  // .....*****....
+     0x0000007C,  // .......*****..
+     0x0000000C,  // ..........**..
+     0x0000003C,  // ........****..
+     0x000000F0,  // ......****....
+     0x000007C0,  // ...*****......
+     0x00001F00,  // .*****........
+     0x00001800,  // .**...........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -871,24 +871,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000007F8,  // ...********..
-     0x00000E18,  // ..***....**..
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x00000018,  // .........**..
-     0x00000038,  // ........***..
-     0x00000070,  // .......***...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x000000F0,  // .....****....
+     0x000003FC,  // ...********..
+     0x0000070C,  // ..***....**..
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000001C,  // ........***..
+     0x00000038,  // .......***...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -899,80 +899,80 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      24, 25,
      0x00000000,  // ........................
      0x00000000,  // ........................
-     0x0000FE00,  // .........*******........
-     0x0003FFC0,  // .......************.....
-     0x000F01E0,  // .....****.......****....
-     0x001C0070,  // ....***...........***...
-     0x00380038,  // ...***.............***..
-     0x00307998,  // ...**.....****..**..**..
-     0x0070FD8C,  // ..***....******.**...**.
-     0x0061870C,  // ..**....**....***....**.
-     0x0063030C,  // ..**...**......**....**.
-     0x00C3030C,  // .**....**......**....**.
-     0x00C6030C,  // .**...**.......**....**.
-     0x00C6030C,  // .**...**.......**....**.
-     0x00C60608,  // .**...**......**.....*..
-     0x00C60618,  // .**...**......**....**..
-     0x00C60E30,  // .**...**.....***...**...
-     0x00E31E70,  // .***...**...****..***...
-     0x0063FFC0,  // ..**...************.....
-     0x0070E780,  // ..***....***..****......
-     0x0038000C,  // ...***...............**.
-     0x001C0038,  // ....***............***..
-     0x000F00F0,  // .....****........****...
-     0x0007FFE0,  // ......**************....
-     0x0000FF00,  // .........********.......
+     0x00007F00,  // .........*******........
+     0x0001FFE0,  // .......************.....
+     0x000780F0,  // .....****.......****....
+     0x000E0038,  // ....***...........***...
+     0x001C001C,  // ...***.............***..
+     0x00183CCC,  // ...**.....****..**..**..
+     0x00387EC6,  // ..***....******.**...**.
+     0x0030C386,  // ..**....**....***....**.
+     0x00318186,  // ..**...**......**....**.
+     0x00618186,  // .**....**......**....**.
+     0x00630186,  // .**...**.......**....**.
+     0x00630186,  // .**...**.......**....**.
+     0x00630304,  // .**...**......**.....*..
+     0x0063030C,  // .**...**......**....**..
+     0x00630718,  // .**...**.....***...**...
+     0x00718F38,  // .***...**...****..***...
+     0x0031FFE0,  // ..**...************.....
+     0x003873C0,  // ..***....***..****......
+     0x001C0006,  // ...***...............**.
+     0x000E001C,  // ....***............***..
+     0x00078078,  // .....****........****...
+     0x0003FFF0,  // ......**************....
+     0x00007F80,  // .........********.......
   },
   {             // 65
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00000DC0,  // ......**.***.....
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00001860,  // .....**....**....
-     0x00003060,  // ....**.....**....
-     0x00003070,  // ....**.....***...
-     0x00007FF0,  // ...***********...
-     0x00007FF8,  // ...************..
-     0x00006038,  // ...**.......***..
-     0x0000E018,  // ..***........**..
-     0x0000C01C,  // ..**.........***.
-     0x0000C00C,  // ..**..........**.
-     0x0001C00E,  // .***..........***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x000006C0,  // ......**.**......
+     0x000006E0,  // ......**.***.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C30,  // .....**....**....
+     0x00001830,  // ....**.....**....
+     0x00001838,  // ....**.....***...
+     0x00003FF8,  // ...***********...
+     0x00003FFC,  // ...************..
+     0x0000301C,  // ...**.......***..
+     0x0000700C,  // ..***........**..
+     0x0000600E,  // ..**.........***.
+     0x00006006,  // ..**..........**.
+     0x0000E007,  // .***..........***
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 66
      16, 25,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FC0,  // ..*********.....
-     0x00007FF0,  // ..***********...
-     0x00006038,  // ..**.......***..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006030,  // ..**.......**...
-     0x00007FE0,  // ..**********....
-     0x00007FF0,  // ..***********...
-     0x00006038,  // ..**.......***..
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00007FF0,  // ..***********...
-     0x00007FE0,  // ..**********....
+     0x00003FE0,  // ..*********.....
+     0x00003FF8,  // ..***********...
+     0x0000301C,  // ..**.......***..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x00003018,  // ..**.......**...
+     0x00003FF0,  // ..**********....
+     0x00003FF8,  // ..***********...
+     0x0000301C,  // ..**.......***..
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003FF8,  // ..***********...
+     0x00003FF0,  // ..**********....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -983,24 +983,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      17, 25,
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000F80,  // ......*****......
-     0x00003FE0,  // ....*********....
-     0x00007070,  // ...***.....***...
-     0x0000E038,  // ..***.......***..
-     0x0000C018,  // ..**.........**..
-     0x0001C000,  // .***.............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x00018000,  // .**..............
-     0x0001C018,  // .***.........**..
-     0x0000C018,  // ..**.........**..
-     0x0000E030,  // ..***.......**...
-     0x00007070,  // ...***.....***...
-     0x00003FE0,  // ....*********....
-     0x00000F80,  // ......*****......
+     0x000007C0,  // ......*****......
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x0000E000,  // .***.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000E00C,  // .***.........**..
+     0x0000600C,  // ..**.........**..
+     0x00007018,  // ..***.......**...
+     0x00003838,  // ...***.....***...
+     0x00001FF0,  // ....*********....
+     0x000007C0,  // ......*****......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1012,23 +1012,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFC0,  // ..**********.....
-     0x0000FFE0,  // ..***********....
-     0x0000C070,  // ..**.......***...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C01C,  // ..**.........***.
-     0x0000C01C,  // ..**.........***.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C01C,  // ..**.........***.
-     0x0000C018,  // ..**.........**..
-     0x0000C038,  // ..**........***..
-     0x0000C070,  // ..**.......***...
-     0x0000FFE0,  // ..***********....
-     0x0000FF80,  // ..*********......
+     0x00007FE0,  // ..**********.....
+     0x00007FF0,  // ..***********....
+     0x00006038,  // ..**.......***...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
+     0x0000600E,  // ..**.........***.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x0000600E,  // ..**.........***.
+     0x0000600C,  // ..**.........**..
+     0x0000601C,  // ..**........***..
+     0x00006038,  // ..**.......***...
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1040,23 +1040,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FC0,  // ..*********.....
-     0x00007FC0,  // ..*********.....
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
+     0x00003FFC,  // ..************..
+     0x00003FFC,  // ..************..
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003FE0,  // ..*********.....
+     0x00003FE0,  // ..*********.....
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003FFC,  // ..************..
+     0x00003FFC,  // ..************..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1068,23 +1068,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001FF0,  // ..*********...
-     0x00001FF0,  // ..*********...
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FF8,  // ..*********...
+     0x00000FF8,  // ..*********...
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1095,24 +1095,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x0000F078,  // ...****.....****..
-     0x0000C038,  // ...**........***..
-     0x0001801C,  // ..**..........***.
-     0x00018000,  // ..**..............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x00030000,  // .**...............
-     0x000300FC,  // .**........******.
-     0x000300FC,  // .**........******.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0000C01C,  // ...**.........***.
-     0x0000F078,  // ...****.....****..
-     0x00003FF0,  // .....**********...
-     0x00000FC0,  // .......******.....
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000783C,  // ...****.....****..
+     0x0000601C,  // ...**........***..
+     0x0000C00E,  // ..**..........***.
+     0x0000C000,  // ..**..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x0001807E,  // .**........******.
+     0x0001807E,  // .**........******.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000600E,  // ...**.........***.
+     0x0000783C,  // ...****.....****..
+     0x00001FF8,  // .....**********...
+     0x000007E0,  // .......******.....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1124,23 +1124,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000FFFC,  // ..**************.
-     0x0000FFFC,  // ..**************.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00007FFE,  // ..**************.
+     0x00007FFE,  // ..**************.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1152,23 +1152,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1180,23 +1180,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000018,  // ........**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000E38,  // .***...***..
-     0x000007F0,  // ..*******...
-     0x000003E0,  // ...*****....
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000071C,  // .***...***..
+     0x000003F8,  // ..*******...
+     0x000001F0,  // ...*****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1208,23 +1208,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00006070,  // ..**......***...
-     0x000060E0,  // ..**.....***....
-     0x000061C0,  // ..**....***.....
-     0x00006380,  // ..**...***......
-     0x00006700,  // ..**..***.......
-     0x00006F00,  // ..**.****.......
-     0x00007F00,  // ..*******.......
-     0x00007B80,  // ..****.***......
-     0x000071C0,  // ..***...***.....
-     0x000060E0,  // ..**.....***....
-     0x000060E0,  // ..**.....***....
-     0x00006070,  // ..**......***...
-     0x00006038,  // ..**.......***..
-     0x00006038,  // ..**.......***..
-     0x0000601C,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003038,  // ..**......***...
+     0x00003070,  // ..**.....***....
+     0x000030E0,  // ..**....***.....
+     0x000031C0,  // ..**...***......
+     0x00003380,  // ..**..***.......
+     0x00003780,  // ..**.****.......
+     0x00003F80,  // ..*******.......
+     0x00003DC0,  // ..****.***......
+     0x000038E0,  // ..***...***.....
+     0x00003070,  // ..**.....***....
+     0x00003070,  // ..**.....***....
+     0x00003038,  // ..**......***...
+     0x0000301C,  // ..**.......***..
+     0x0000301C,  // ..**.......***..
+     0x0000300E,  // ..**........***.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1236,23 +1236,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1264,23 +1264,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0001C01C,  // ..***.........***.
-     0x0001E03C,  // ..****.......****.
-     0x0001E03C,  // ..****.......****.
-     0x0001F07C,  // ..*****.....*****.
-     0x0001B06C,  // ..**.**.....**.**.
-     0x0001B8EC,  // ..**.***...***.**.
-     0x000198CC,  // ..**..**...**..**.
-     0x00019DCC,  // ..**..***.***..**.
-     0x00018D8C,  // ..**...**.**...**.
-     0x00018F8C,  // ..**...*****...**.
-     0x0001870C,  // ..**....***....**.
-     0x0001870C,  // ..**....***....**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
+     0x0000E00E,  // ..***.........***.
+     0x0000F01E,  // ..****.......****.
+     0x0000F01E,  // ..****.......****.
+     0x0000F83E,  // ..*****.....*****.
+     0x0000D836,  // ..**.**.....**.**.
+     0x0000DC76,  // ..**.***...***.**.
+     0x0000CC66,  // ..**..**...**..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x0000C6C6,  // ..**...**.**...**.
+     0x0000C7C6,  // ..**...*****...**.
+     0x0000C386,  // ..**....***....**.
+     0x0000C386,  // ..**....***....**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1292,23 +1292,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000E00C,  // ..***.........**.
-     0x0000E00C,  // ..***.........**.
-     0x0000F00C,  // ..****........**.
-     0x0000F80C,  // ..*****.......**.
-     0x0000D80C,  // ..**.**.......**.
-     0x0000DC0C,  // ..**.***......**.
-     0x0000CE0C,  // ..**..***.....**.
-     0x0000C70C,  // ..**...***....**.
-     0x0000C70C,  // ..**...***....**.
-     0x0000C38C,  // ..**....***...**.
-     0x0000C1CC,  // ..**.....***..**.
-     0x0000C0CC,  // ..**......**..**.
-     0x0000C0EC,  // ..**......***.**.
-     0x0000C07C,  // ..**.......*****.
-     0x0000C03C,  // ..**........****.
-     0x0000C03C,  // ..**........****.
-     0x0000C01C,  // ..**.........***.
+     0x00007006,  // ..***.........**.
+     0x00007006,  // ..***.........**.
+     0x00007806,  // ..****........**.
+     0x00007C06,  // ..*****.......**.
+     0x00006C06,  // ..**.**.......**.
+     0x00006E06,  // ..**.***......**.
+     0x00006706,  // ..**..***.....**.
+     0x00006386,  // ..**...***....**.
+     0x00006386,  // ..**...***....**.
+     0x000061C6,  // ..**....***...**.
+     0x000060E6,  // ..**.....***..**.
+     0x00006066,  // ..**......**..**.
+     0x00006076,  // ..**......***.**.
+     0x0000603E,  // ..**.......*****.
+     0x0000601E,  // ..**........****.
+     0x0000601E,  // ..**........****.
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1319,24 +1319,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x0000F078,  // ...****.....****..
-     0x0000C038,  // ...**........***..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x00030006,  // .**.............**
-     0x00030006,  // .**.............**
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x0001800C,  // ..**...........**.
-     0x0001801C,  // ..**..........***.
-     0x0000C018,  // ...**.........**..
-     0x0000F078,  // ...****.....****..
-     0x00003FE0,  // .....*********....
-     0x00001FC0,  // ......*******.....
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000783C,  // ...****.....****..
+     0x0000601C,  // ...**........***..
+     0x0000C00E,  // ..**..........***.
+     0x0000C006,  // ..**...........**.
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x00018003,  // .**.............**
+     0x00018003,  // .**.............**
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x0000C006,  // ..**...........**.
+     0x0000C00E,  // ..**..........***.
+     0x0000600C,  // ...**.........**..
+     0x0000783C,  // ...****.....****..
+     0x00001FF0,  // .....*********....
+     0x00000FE0,  // ......*******.....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1348,23 +1348,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FE0,  // ..**********....
-     0x00007FF8,  // ..************..
-     0x0000603C,  // ..**.......****.
-     0x0000601C,  // ..**........***.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00007FF8,  // ..************..
-     0x00007FE0,  // ..**********....
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
+     0x00003FF0,  // ..**********....
+     0x00003FFC,  // ..************..
+     0x0000301E,  // ..**.......****.
+     0x0000300E,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003FFC,  // ..************..
+     0x00003FF0,  // ..**********....
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1375,25 +1375,25 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x0000F078,  // ...****.....****..
-     0x0000C038,  // ...**........***..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x00030006,  // .**.............**
-     0x00030006,  // .**.............**
-     0x00030006,  // .**.............**
-     0x0003000E,  // .**............***
-     0x0001800C,  // ..**...........**.
-     0x0001819C,  // ..**......**..***.
-     0x0000C1DC,  // ...**.....***.***.
-     0x0000F078,  // ...****.....****..
-     0x00007FF8,  // ....************..
-     0x00001F8E,  // ......******...***
-     0x00000004,  // ................*.
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000783C,  // ...****.....****..
+     0x0000601C,  // ...**........***..
+     0x0000C00E,  // ..**..........***.
+     0x0000C006,  // ..**...........**.
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x00018003,  // .**.............**
+     0x00018003,  // .**.............**
+     0x00018003,  // .**.............**
+     0x00018007,  // .**............***
+     0x0000C006,  // ..**...........**.
+     0x0000C0CE,  // ..**......**..***.
+     0x000060EE,  // ...**.....***.***.
+     0x0000783C,  // ...****.....****..
+     0x00003FFC,  // ....************..
+     0x00000FC7,  // ......******...***
+     0x00000002,  // ................*.
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1404,23 +1404,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFE0,  // ..***********....
-     0x0000FFF8,  // ..*************..
-     0x0000C01C,  // ..**.........***.
-     0x0000C01C,  // ..**.........***.
-     0x0000C00C,  // ..**..........**.
-     0x0000C01C,  // ..**.........***.
-     0x0000C03C,  // ..**........****.
-     0x0000FFF8,  // ..*************..
-     0x0000FFE0,  // ..***********....
-     0x0000C1C0,  // ..**.....***.....
-     0x0000C0C0,  // ..**......**.....
-     0x0000C0E0,  // ..**......***....
-     0x0000C070,  // ..**.......***...
-     0x0000C030,  // ..**........**...
-     0x0000C038,  // ..**........***..
-     0x0000C018,  // ..**.........**..
-     0x0000C01C,  // ..**.........***.
+     0x00007FF0,  // ..***********....
+     0x00007FFC,  // ..*************..
+     0x0000600E,  // ..**.........***.
+     0x0000600E,  // ..**.........***.
+     0x00006006,  // ..**..........**.
+     0x0000600E,  // ..**.........***.
+     0x0000601E,  // ..**........****.
+     0x00007FFC,  // ..*************..
+     0x00007FF0,  // ..***********....
+     0x000060E0,  // ..**.....***.....
+     0x00006060,  // ..**......**.....
+     0x00006070,  // ..**......***....
+     0x00006038,  // ..**.......***...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1431,24 +1431,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      16, 25,
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00000FE0,  // .....*******....
-     0x00001FF0,  // ....*********...
-     0x00003838,  // ...***.....***..
-     0x0000601C,  // ..**........***.
-     0x0000600C,  // ..**.........**.
-     0x00006000,  // ..**............
-     0x00007000,  // ..***...........
-     0x00003E00,  // ...*****........
-     0x00001FE0,  // ....********....
-     0x000003F8,  // .......*******..
-     0x00000038,  // ...........***..
-     0x0000000C,  // .............**.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000700C,  // ..***........**.
-     0x00003818,  // ...***......**..
-     0x00001FF0,  // ....*********...
-     0x000007E0,  // ......******....
+     0x000007F0,  // .....*******....
+     0x00000FF8,  // ....*********...
+     0x00001C1C,  // ...***.....***..
+     0x0000300E,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003000,  // ..**............
+     0x00003800,  // ..***...........
+     0x00001F00,  // ...*****........
+     0x00000FF0,  // ....********....
+     0x000001FC,  // .......*******..
+     0x0000001C,  // ...........***..
+     0x00000006,  // .............**.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x00003806,  // ..***........**.
+     0x00001C0C,  // ...***......**..
+     0x00000FF8,  // ....*********...
+     0x000003F0,  // ......******....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1460,23 +1460,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1488,23 +1488,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C01C,  // ..**.........***.
-     0x0000C01C,  // ..**.........***.
-     0x0000E018,  // ..***........**..
-     0x00007038,  // ...***......***..
-     0x00003FF0,  // ....**********...
-     0x00000FC0,  // ......******.....
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x0000600E,  // ..**.........***.
+     0x0000600E,  // ..**.........***.
+     0x0000700C,  // ..***........**..
+     0x0000381C,  // ...***......***..
+     0x00001FF8,  // ....**********...
+     0x000007E0,  // ......******.....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1516,23 +1516,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0001C00C,  // ***..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000C01C,  // .**.........***.
-     0x0000E018,  // .***........**..
-     0x00006018,  // ..**........**..
-     0x00006030,  // ..**.......**...
-     0x00003030,  // ...**......**...
-     0x00003070,  // ...**.....***...
-     0x00003860,  // ...***....**....
-     0x00001860,  // ....**....**....
-     0x000018C0,  // ....**...**.....
-     0x00001CC0,  // ....***..**.....
-     0x00000CC0,  // .....**..**.....
-     0x00000D80,  // .....**.**......
-     0x00000780,  // ......****......
-     0x00000700,  // ......***.......
-     0x00000700,  // ......***.......
+     0x0000E006,  // ***..........**.
+     0x00006006,  // .**..........**.
+     0x0000600E,  // .**.........***.
+     0x0000700C,  // .***........**..
+     0x0000300C,  // ..**........**..
+     0x00003018,  // ..**.......**...
+     0x00001818,  // ...**......**...
+     0x00001838,  // ...**.....***...
+     0x00001C30,  // ...***....**....
+     0x00000C30,  // ....**....**....
+     0x00000C60,  // ....**...**.....
+     0x00000E60,  // ....***..**.....
+     0x00000660,  // .....**..**.....
+     0x000006C0,  // .....**.**......
+     0x000003C0,  // ......****......
+     0x00000380,  // ......***.......
+     0x00000380,  // ......***.......
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1544,23 +1544,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
-     0x00701C06,  // ***.......***.......**
-     0x00303C0E,  // .**......****......***
-     0x00303C0C,  // .**......****......**.
-     0x00303E0C,  // .**......*****.....**.
-     0x0038360C,  // .***.....**.**.....**.
-     0x00186618,  // ..**....**..**....**..
-     0x00186618,  // ..**....**..**....**..
-     0x00186318,  // ..**....**...**...**..
-     0x001CC318,  // ..***..**....**...**..
-     0x000CC330,  // ...**..**....**..**...
-     0x000CC3B0,  // ...**..**....***.**...
-     0x000CC1B0,  // ...**..**.....**.**...
-     0x000581B0,  // ....*.**......**.**...
-     0x000781E0,  // ....****......****....
-     0x000781E0,  // ....****......****....
-     0x000700E0,  // ....***........***....
-     0x000300C0,  // .....**........**.....
+     0x00380E03,  // ***.......***.......**
+     0x00181E07,  // .**......****......***
+     0x00181E06,  // .**......****......**.
+     0x00181F06,  // .**......*****.....**.
+     0x001C1B06,  // .***.....**.**.....**.
+     0x000C330C,  // ..**....**..**....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000C318C,  // ..**....**...**...**..
+     0x000E618C,  // ..***..**....**...**..
+     0x00066198,  // ...**..**....**..**...
+     0x000661D8,  // ...**..**....***.**...
+     0x000660D8,  // ...**..**.....**.**...
+     0x0002C0D8,  // ....*.**......**.**...
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x00038070,  // ....***........***....
+     0x00018060,  // .....**........**.....
      0x00000000,  // ......................
      0x00000000,  // ......................
      0x00000000,  // ......................
@@ -1572,23 +1572,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000E01C,  // .***........***.
-     0x00007018,  // ..***.......**..
-     0x00003030,  // ...**......**...
-     0x00003870,  // ...***....***...
-     0x00001CE0,  // ....***..***....
-     0x00000CC0,  // .....**..**.....
-     0x00000F80,  // .....*****......
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000DC0,  // .....**.***.....
-     0x00001CE0,  // ....***..***....
-     0x00003860,  // ...***....**....
-     0x00003070,  // ...**.....***...
-     0x00007038,  // ..***......***..
-     0x0000E018,  // .***........**..
-     0x0001C01C,  // ***.........***.
+     0x0000700E,  // .***........***.
+     0x0000380C,  // ..***.......**..
+     0x00001818,  // ...**......**...
+     0x00001C38,  // ...***....***...
+     0x00000E70,  // ....***..***....
+     0x00000660,  // .....**..**.....
+     0x000007C0,  // .....*****......
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x000006E0,  // .....**.***.....
+     0x00000E70,  // ....***..***....
+     0x00001C30,  // ...***....**....
+     0x00001838,  // ...**.....***...
+     0x0000381C,  // ..***......***..
+     0x0000700C,  // .***........**..
+     0x0000E00E,  // ***.........***.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1600,23 +1600,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000E00C,  // .***.........**.
-     0x0000E01C,  // .***........***.
-     0x00007018,  // ..***.......**..
-     0x00003030,  // ...**......**...
-     0x00003870,  // ...***....***...
-     0x00001C60,  // ....***...**....
-     0x00000CC0,  // .....**..**.....
-     0x00000FC0,  // .....******.....
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00007006,  // .***.........**.
+     0x0000700E,  // .***........***.
+     0x0000380C,  // ..***.......**..
+     0x00001818,  // ...**......**...
+     0x00001C38,  // ...***....***...
+     0x00000E30,  // ....***...**....
+     0x00000660,  // .....**..**.....
+     0x000007E0,  // .....******.....
+     0x000003C0,  // ......****......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1628,23 +1628,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFE,  // .*************
-     0x00003FFC,  // .************.
-     0x0000000C,  // ...........**.
-     0x00000018,  // ..........**..
-     0x00000030,  // .........**...
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00001C00,  // ..***.........
-     0x00001800,  // ..**..........
-     0x00003000,  // .**...........
-     0x00007FFC,  // *************.
-     0x00007FFC,  // *************.
+     0x00001FFF,  // .*************
+     0x00001FFE,  // .************.
+     0x00000006,  // ...........**.
+     0x0000000C,  // ..........**..
+     0x00000018,  // .........**...
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000E00,  // ..***.........
+     0x00000C00,  // ..**..........
+     0x00001800,  // .**...........
+     0x00003FFE,  // *************.
+     0x00003FFE,  // *************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1656,52 +1656,52 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000003E,  // ..*****
-     0x0000003E,  // ..*****
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003E,  // ..*****
-     0x0000003E,  // ..*****
+     0x0000001F,  // ..*****
+     0x0000001F,  // ..*****
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000001F,  // ..*****
+     0x0000001F,  // ..*****
   },
   {             // 92
      7, 25,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x000000C0,  // **.....
-     0x000000C0,  // **.....
-     0x00000040,  // .*.....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000020,  // ..*....
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000010,  // ...*...
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000008,  // ....*..
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x00000004,  // .....*.
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000008,  // ...*...
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1712,42 +1712,42 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000007C,  // .*****.
-     0x0000007C,  // .*****.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000007C,  // .*****.
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
+     0x0000003E,  // .*****.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x0000003E,  // .*****.
+     0x0000003E,  // .*****.
   },
   {             // 94
      11, 25,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000A0,  // ....*.*....
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x00000050,  // ....*.*....
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1764,41 +1764,41 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...........
   },
   {             // 95
-     13, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     15, 25,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
   },
   {             // 96
      8, 25,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000E0,  // .***....
-     0x00000070,  // ..***...
-     0x00000030,  // ...**...
+     0x00000070,  // .***....
+     0x00000038,  // ..***...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -1820,7 +1820,7 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
   },
   {             // 97
-     13, 25,
+     14, 25,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1828,19 +1828,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00001FF0,  // ..*********...
-     0x00003838,  // .***.....***..
-     0x00003018,  // .**.......**..
-     0x00000018,  // ..........**..
-     0x000001F8,  // ......******..
-     0x00000FD8,  // ...******.**..
-     0x00003C18,  // .****.....**..
-     0x00003018,  // .**.......**..
-     0x00003038,  // .**......***..
-     0x00003878,  // .***....****..
-     0x00001FD8,  // ..*******.**..
-     0x00000F9C,  // ...*****..***.
+     0x000003F0,  // ....******....
+     0x00000FF8,  // ..*********...
+     0x00001C1C,  // .***.....***..
+     0x0000180C,  // .**.......**..
+     0x0000000C,  // ..........**..
+     0x000000FC,  // ......******..
+     0x000007EC,  // ...******.**..
+     0x00001E0C,  // .****.....**..
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001C3C,  // .***....****..
+     0x00000FEC,  // ..*******.**..
+     0x000007CE,  // ...*****..***.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1852,23 +1852,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000DF0,  // ..**.*****...
-     0x00000FF8,  // ..*********..
-     0x00000E1C,  // ..***....***.
-     0x00000E0E,  // ..***.....***
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000E0C,  // ..***.....**.
-     0x00000E1C,  // ..***....***.
-     0x00000FF8,  // ..*********..
-     0x00000CF0,  // ..**..****...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070E,  // ..***....***.
+     0x00000707,  // ..***.....***
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000706,  // ..***.....**.
+     0x0000070E,  // ..***....***.
+     0x000007FC,  // ..*********..
+     0x00000678,  // ..**..****...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1884,19 +1884,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000003F8,  // ...*******..
-     0x0000061C,  // ..**....***.
-     0x00000E0C,  // .***.....**.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x0000061C,  // ..**....***.
-     0x000003F8,  // ...*******..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000001FC,  // ...*******..
+     0x0000030E,  // ..**....***.
+     0x00000706,  // .***.....**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x0000030E,  // ..**....***.
+     0x000001FC,  // ...*******..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1908,23 +1908,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x000003CC,  // ....****..**.
-     0x000007FC,  // ...*********.
-     0x00000C1C,  // ..**.....***.
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000E1C,  // ..***....***.
-     0x000007FC,  // ...*********.
-     0x000003CC,  // ....****..**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x000001E6,  // ....****..**.
+     0x000003FE,  // ...*********.
+     0x0000060E,  // ..**.....***.
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060E,  // ..**.....***.
+     0x0000070E,  // ..***....***.
+     0x000003FE,  // ...*********.
+     0x000001E6,  // ....****..**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1940,19 +1940,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F8,  // ...********..
-     0x00000C18,  // ..**.....**..
-     0x0000080C,  // ..*.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001C0C,  // .***......**.
-     0x00000E18,  // ..***....**..
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x0000060C,  // ..**.....**..
+     0x00000406,  // ..*.......**.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000E06,  // .***......**.
+     0x0000070C,  // ..***....**..
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1963,24 +1963,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      7, 25,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000000C,  // ....**.
-     0x0000001C,  // ...***.
-     0x00000038,  // ..***..
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x000000FC,  // ******.
-     0x000000FC,  // ******.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000006,  // ....**.
+     0x0000000E,  // ...***.
+     0x0000001C,  // ..***..
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000007E,  // ******.
+     0x0000007E,  // ******.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1996,47 +1996,47 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003EC,  // ....*****.**.
-     0x000007FC,  // ...*********.
-     0x00000C1C,  // ..**.....***.
-     0x00000C1C,  // ..**.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C1C,  // ..**.....***.
-     0x000007FC,  // ...*********.
-     0x000003CC,  // ....****..**.
-     0x0000000C,  // ..........**.
-     0x0000181C,  // .**......***.
-     0x00001C18,  // .***.....**..
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000001F6,  // ....*****.**.
+     0x000003FE,  // ...*********.
+     0x0000060E,  // ..**.....***.
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060E,  // ..**.....***.
+     0x000003FE,  // ...*********.
+     0x000001E6,  // ....****..**.
+     0x00000006,  // ..........**.
+     0x00000C0E,  // .**......***.
+     0x00000E0C,  // .***.....**..
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
   },
   {             // 104
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000CF0,  // ..**..****...
-     0x00000FF8,  // ..*********..
-     0x00000E1C,  // ..***....***.
-     0x00000E0C,  // ..***.....**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000678,  // ..**..****...
+     0x000007FC,  // ..*********..
+     0x0000070E,  // ..***....***.
+     0x00000706,  // ..***.....**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2048,23 +2048,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2072,55 +2072,55 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .....
   },
   {             // 106
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x00000078,  // ****..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000003C,  // ****..
   },
   {             // 107
-     12, 25,
+     13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C38,  // ..**....***..
-     0x00000C70,  // ..**...***...
-     0x00000CE0,  // ..**..***....
-     0x00000DC0,  // ..**.***.....
-     0x00000F80,  // ..*****......
-     0x00000FC0,  // ..******.....
-     0x00000EC0,  // ..***.**.....
-     0x00000C60,  // ..**...**....
-     0x00000C70,  // ..**...***...
-     0x00000C30,  // ..**....**...
-     0x00000C18,  // ..**.....**..
-     0x00000C1C,  // ..**.....***.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x0000061C,  // ..**....***..
+     0x00000638,  // ..**...***...
+     0x00000670,  // ..**..***....
+     0x000006E0,  // ..**.***.....
+     0x000007C0,  // ..*****......
+     0x000007E0,  // ..******.....
+     0x00000760,  // ..***.**.....
+     0x00000630,  // ..**...**....
+     0x00000638,  // ..**...***...
+     0x00000618,  // ..**....**...
+     0x0000060C,  // ..**.....**..
+     0x0000060E,  // ..**.....***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2132,23 +2132,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -2164,19 +2164,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x0006F8F0,  // ..**.*****...****...
-     0x0007FFF8,  // ..****************..
-     0x00070E1C,  // ..***....***....***.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
-     0x00060C0C,  // ..**.....**......**.
+     0x00037C78,  // ..**.*****...****...
+     0x0003FFFC,  // ..****************..
+     0x0003870E,  // ..***....***....***.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
+     0x00030606,  // ..**.....**......**.
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -2192,19 +2192,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000CF0,  // ..**..****...
-     0x00000FF8,  // ..*********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
+     0x00000678,  // ..**..****...
+     0x000007FC,  // ..*********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2220,19 +2220,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003F0,  // ....******...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00001C0E,  // .***......***
-     0x0000180E,  // .**.......***
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180E,  // .**.......***
-     0x00001C0C,  // .***......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003F0,  // ....******...
+     0x000001F8,  // ....******...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000E07,  // .***......***
+     0x00000C07,  // .**.......***
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C07,  // .**.......***
+     0x00000E06,  // .***......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2248,23 +2248,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000DF0,  // ..**.*****...
-     0x00000FB8,  // ..*****.***..
-     0x00000E0C,  // ..***.....**.
-     0x00000E0E,  // ..***.....***
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C0E,  // ..**......***
-     0x00000E0C,  // ..***.....**.
-     0x00000F1C,  // ..****...***.
-     0x00000FF8,  // ..*********..
-     0x00000DF0,  // ..**.*****...
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007DC,  // ..*****.***..
+     0x00000706,  // ..***.....**.
+     0x00000707,  // ..***.....***
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000607,  // ..**......***
+     0x00000706,  // ..***.....**.
+     0x0000078E,  // ..****...***.
+     0x000007FC,  // ..*********..
+     0x000006F8,  // ..**.*****...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
   },
   {             // 113
@@ -2276,23 +2276,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003EC,  // ....*****.**.
-     0x0000077C,  // ...***.*****.
-     0x00000C1C,  // ..**.....***.
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000E1C,  // ..***....***.
-     0x000007FC,  // ...*********.
-     0x000003CC,  // ....****..**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
+     0x000001F6,  // ....*****.**.
+     0x000003BE,  // ...***.*****.
+     0x0000060E,  // ..**.....***.
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060E,  // ..**.....***.
+     0x0000070E,  // ..***....***.
+     0x000003FE,  // ...*********.
+     0x000001E6,  // ....****..**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
   },
   {             // 114
@@ -2304,19 +2304,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000006E,  // ..**.***
-     0x0000007E,  // ..******
-     0x00000070,  // ..***...
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
-     0x00000060,  // ..**....
+     0x00000037,  // ..**.***
+     0x0000003F,  // ..******
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -2332,19 +2332,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F0,  // ...******...
-     0x000007F8,  // ..********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000E00,  // .***........
-     0x000007C0,  // ..*****.....
-     0x000003F8,  // ...*******..
-     0x0000003C,  // .......****.
-     0x0000000C,  // .........**.
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x000007F8,  // ..********..
-     0x000003F0,  // ...******...
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000700,  // .***........
+     0x000003E0,  // ..*****.....
+     0x000001FC,  // ...*******..
+     0x0000001E,  // .......****.
+     0x00000006,  // .........**.
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x000003FC,  // ..********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2356,23 +2356,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x000000FC,  // ******.
-     0x000000FC,  // ******.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000003C,  // ..****.
-     0x0000001C,  // ...***.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000007E,  // ******.
+     0x0000007E,  // ******.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000001E,  // ..****.
+     0x0000000E,  // ...***.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -2389,18 +2389,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007FC,  // ...*********.
-     0x000003CC,  // ....****..**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000070E,  // ..***....***.
+     0x000003FE,  // ...*********.
+     0x000001E6,  // ....****..**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2417,18 +2417,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000730,  // ..***..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000000C0,  // .....**.....
+     0x00000E06,  // ***......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x00000398,  // ..***..**...
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2445,18 +2445,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00030706,  // **.....***.....**
-     0x0001870C,  // .**....***....**.
-     0x0001870C,  // .**....***....**.
-     0x00018D8C,  // .**...**.**...**.
-     0x00018D98,  // .**...**.**..**..
-     0x0000CD98,  // ..**..**.**..**..
-     0x0000C998,  // ..**..*..**..**..
-     0x0000D8D0,  // ..**.**...**.*...
-     0x000078F0,  // ...****...****...
-     0x000078F0,  // ...****...****...
-     0x000070E0,  // ...***....***....
-     0x00003060,  // ....**.....**....
+     0x00018383,  // **.....***.....**
+     0x0000C386,  // .**....***....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C6C6,  // .**...**.**...**.
+     0x0000C6CC,  // .**...**.**..**..
+     0x000066CC,  // ..**..**.**..**..
+     0x000064CC,  // ..**..*..**..**..
+     0x00006C68,  // ..**.**...**.*...
+     0x00003C78,  // ...****...****...
+     0x00003C78,  // ...****...****...
+     0x00003870,  // ...***....***....
+     0x00001830,  // ....**.....**....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -2473,18 +2473,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000730,  // ..***..**...
-     0x00000370,  // ...**.***...
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000001E0,  // ....****....
-     0x000003E0,  // ...*****....
-     0x00000330,  // ...**..**...
-     0x00000638,  // ..**...***..
-     0x00000E1C,  // .***....***.
-     0x00000C0C,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x00000398,  // ..***..**...
+     0x000001B8,  // ...**.***...
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000F0,  // ....****....
+     0x000001F0,  // ...*****....
+     0x00000198,  // ...**..**...
+     0x0000031C,  // ..**...***..
+     0x0000070E,  // .***....***.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2501,23 +2501,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000730,  // ..***..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000080,  // .....*......
-     0x00000180,  // ....**......
-     0x00000F00,  // .****.......
-     0x00000E00,  // .***........
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x00000398,  // ..***..**...
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000040,  // .....*......
+     0x000000C0,  // ....**......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
   },
   {             // 122
      12, 25,
@@ -2529,18 +2529,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001FFC,  // ***********.
-     0x00001FFC,  // ***********.
-     0x00000038,  // .......***..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000E00,  // .***........
-     0x00001FFC,  // ***********.
-     0x00001FFC,  // ***********.
+     0x00000FFE,  // ***********.
+     0x00000FFE,  // ***********.
+     0x0000001C,  // .......***..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000700,  // .***........
+     0x00000FFE,  // ***********.
+     0x00000FFE,  // ***********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -2548,88 +2548,88 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
   },
   {             // 123
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001C,  // .....***.
-     0x0000001C,  // .....***.
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x00000060,  // ...**....
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x0000001C,  // .....***.
-     0x0000001C,  // .....***.
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000000E,  // .....***.
+     0x0000000E,  // .....***.
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000030,  // ...**....
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x0000000E,  // .....***.
+     0x0000000E,  // .....***.
   },
   {             // 124
      6, 25,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
   },
   {             // 125
      8, 25,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000E0,  // .***....
-     0x000000F0,  // .****...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000018,  // ....**..
-     0x0000000C,  // .....**.
-     0x0000001C,  // ....***.
-     0x00000018,  // ....**..
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x000000E0,  // .***....
-     0x000000E0,  // .***....
+     0x00000070,  // .***....
+     0x00000078,  // .****...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x00000006,  // .....**.
+     0x0000000E,  // ....***.
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000070,  // .***....
   },
   {             // 126
      14, 25,
@@ -2643,9 +2643,9 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003F8C,  // .*******...**.
-     0x00003FFC,  // .************.
-     0x000020F8,  // .*.....*****..
+     0x00001FC6,  // .*******...**.
+     0x00001FFE,  // .************.
+     0x0000107C,  // .*.....*****..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3621,74 +3621,74 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000010,  // ....*...
-     0x00000010,  // ....*...
-     0x00000010,  // ....*...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x00000008,  // ....*...
+     0x00000008,  // ....*...
+     0x00000008,  // ....*...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
   },
   {             // 162
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006700,  // ...**..***.......
-     0x0000E700,  // ..***..***.......
-     0x0000CD80,  // ..**..**.**......
-     0x00000D80,  // ......**.**......
-     0x00000DC0,  // ......**.***.....
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00001860,  // .....**....**....
-     0x00003060,  // ....**.....**....
-     0x00003070,  // ....**.....***...
-     0x00007FF0,  // ...***********...
-     0x00007FF8,  // ...************..
-     0x00006038,  // ...**.......***..
-     0x0000E018,  // ..***........**..
-     0x0000C01C,  // ..**.........***.
-     0x0000C00C,  // ..**..........**.
-     0x0001C00E,  // .***..........***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003380,  // ...**..***.......
+     0x00007380,  // ..***..***.......
+     0x000066C0,  // ..**..**.**......
+     0x000006C0,  // ......**.**......
+     0x000006E0,  // ......**.***.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C30,  // .....**....**....
+     0x00001830,  // ....**.....**....
+     0x00001838,  // ....**.....***...
+     0x00003FF8,  // ...***********...
+     0x00003FFC,  // ...************..
+     0x0000301C,  // ...**.......***..
+     0x0000700C,  // ..***........**..
+     0x0000600E,  // ..**.........***.
+     0x00006006,  // ..**..........**.
+     0x0000E007,  // .***..........***
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 163
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001E0,  // .....****....
-     0x000003F8,  // ....*******..
-     0x00000618,  // ...**....**..
-     0x0000041C,  // ...*.....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C00,  // ..**.........
-     0x00000400,  // ...*.........
-     0x00000600,  // ...**........
-     0x00001FC0,  // .*******.....
-     0x00001FC0,  // .*******.....
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000600,  // ...**........
-     0x00000400,  // ...*.........
-     0x00000C00,  // ..**.........
-     0x00000F84,  // ..*****....*.
-     0x00001FFC,  // .***********.
-     0x0000087C,  // ..*....*****.
+     0x000000F0,  // .....****....
+     0x000001FC,  // ....*******..
+     0x0000030C,  // ...**....**..
+     0x0000020E,  // ...*.....***.
+     0x00000606,  // ..**......**.
+     0x00000600,  // ..**.........
+     0x00000200,  // ...*.........
+     0x00000300,  // ...**........
+     0x00000FE0,  // .*******.....
+     0x00000FE0,  // .*******.....
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000300,  // ...**........
+     0x00000200,  // ...*.........
+     0x00000600,  // ..**.........
+     0x000007C2,  // ..*****....*.
+     0x00000FFE,  // .***********.
+     0x0000043E,  // ..*....*****.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3702,19 +3702,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000804,  // ..*........*.
-     0x00001DEE,  // .***.****.***
-     0x00000FFC,  // ..**********.
-     0x00000738,  // ...***..***..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E0C,  // ..***.....**.
-     0x00000718,  // ...***...**..
-     0x00000FFC,  // ..**********.
-     0x00001DEE,  // .***.****.***
-     0x00000804,  // ..*........*.
+     0x00000402,  // ..*........*.
+     0x00000EF7,  // .***.****.***
+     0x000007FE,  // ..**********.
+     0x0000039C,  // ...***..***..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000706,  // ..***.....**.
+     0x0000038C,  // ...***...**..
+     0x000007FE,  // ..**********.
+     0x00000EF7,  // .***.****.***
+     0x00000402,  // ..*........*.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3724,27 +3724,27 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
   },
   {             // 165
-     13, 25,
+     14, 25,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000381C,  // .***......***.
-     0x00001818,  // ..**......**..
-     0x00001C30,  // ..***....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001806,  // .**........**.
+     0x00001C0E,  // .***......***.
+     0x00000C0C,  // ..**......**..
+     0x00000E18,  // ..***....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3755,65 +3755,65 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      6, 25,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
   },
   {             // 167
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C1C,  // ..**.....***.
-     0x00000C00,  // ..**.........
-     0x00000600,  // ...**........
-     0x00000780,  // ...****......
-     0x00000FE0,  // ..*******....
-     0x000008F0,  // ..*...****...
-     0x00001838,  // .**.....***..
-     0x0000181C,  // .**......***.
-     0x00000C0E,  // ..**......***
-     0x00000E06,  // ..***......**
-     0x00000786,  // ...****....**
-     0x000003CC,  // ....****..**.
-     0x000000F8,  // ......*****..
-     0x00000038,  // ........***..
-     0x0000001C,  // .........***.
-     0x0000040C,  // ...*......**.
-     0x00000C0C,  // ..**......**.
-     0x0000061C,  // ...**....***.
-     0x000007F8,  // ...********..
-     0x000001F0,  // .....*****...
+     0x000001F0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x0000060E,  // ..**.....***.
+     0x00000600,  // ..**.........
+     0x00000300,  // ...**........
+     0x000003C0,  // ...****......
+     0x000007F0,  // ..*******....
+     0x00000478,  // ..*...****...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000607,  // ..**......***
+     0x00000703,  // ..***......**
+     0x000003C3,  // ...****....**
+     0x000001E6,  // ....****..**.
+     0x0000007C,  // ......*****..
+     0x0000001C,  // ........***..
+     0x0000000E,  // .........***.
+     0x00000206,  // ...*......**.
+     0x00000606,  // ..**......**.
+     0x0000030E,  // ...**....***.
+     0x000003FC,  // ...********..
+     0x000000F8,  // .....*****...
   },
   {             // 168
      8, 25,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CE,  // .**..***
-     0x000000CE,  // .**..***
+     0x00000067,  // .**..***
+     0x00000067,  // .**..***
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -3836,27 +3836,27 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
   },
   {             // 169
-     17, 25,
+     18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E030,  // ...***.......**...
-     0x00018018,  // ..**..........**..
-     0x00038F0C,  // .***...****....**.
-     0x000339C4,  // .**..***..***...*.
-     0x000730C6,  // ***..**....**...**
-     0x00066006,  // **..**..........**
-     0x00066006,  // **..**..........**
-     0x00066002,  // **..**...........*
-     0x00066006,  // **..**..........**
-     0x00067046,  // **..***.....*...**
-     0x000330C4,  // .**..**....**...*.
-     0x00031F0C,  // .**...*****....**.
-     0x00018008,  // ..**...........*..
-     0x0000C010,  // ...**.........*...
-     0x00007060,  // ....***.....**....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007018,  // ...***.......**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C786,  // .***...****....**.
+     0x00019CE2,  // .**..***..***...*.
+     0x00039863,  // ***..**....**...**
+     0x00033003,  // **..**..........**
+     0x00033003,  // **..**..........**
+     0x00033001,  // **..**...........*
+     0x00033003,  // **..**..........**
+     0x00033823,  // **..***.....*...**
+     0x00019862,  // .**..**....**...*.
+     0x00018F86,  // .**...*****....**.
+     0x0000C004,  // ..**...........*..
+     0x00006008,  // ...**.........*...
+     0x00003830,  // ....***.....**....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -3867,15 +3867,15 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      9, 25,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x0000000C,  // ......**.
-     0x000000FC,  // ..******.
-     0x000001C4,  // .***...*.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000000F4,  // ..****.*.
+     0x0000003C,  // ...****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x00000006,  // ......**.
+     0x0000007E,  // ..******.
+     0x000000E2,  // .***...*.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x0000007A,  // ..****.*.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3902,16 +3902,16 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000118,  // .....*...**..
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000660,  // ...**..**....
-     0x00000CE0,  // ..**..***....
-     0x00000CE0,  // ..**..***....
-     0x00000660,  // ...**..**....
-     0x00000630,  // ...**...**...
-     0x00000330,  // ....**..**...
-     0x00000118,  // .....*...**..
+     0x0000008C,  // .....*...**..
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000330,  // ...**..**....
+     0x00000670,  // ..**..***....
+     0x00000670,  // ..**..***....
+     0x00000330,  // ...**..**....
+     0x00000318,  // ...**...**...
+     0x00000198,  // ....**..**...
+     0x0000008C,  // .....*...**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3929,13 +3929,13 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001FFC,  // ..***********.
-     0x00001FFC,  // ..***********.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
-     0x0000000C,  // ...........**.
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000006,  // ...........**.
+     0x00000006,  // ...........**.
+     0x00000006,  // ...........**.
+     0x00000006,  // ...........**.
+     0x00000006,  // ...........**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3976,27 +3976,27 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // 
   },
   {             // 174
-     17, 25,
+     18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F80,  // ......******......
-     0x00007FE0,  // ....**********....
-     0x0000E070,  // ...***......***...
-     0x0001C018,  // ..***.........**..
-     0x0003800C,  // .***...........**.
-     0x00033F84,  // .**..*******....*.
-     0x000730C6,  // ***..**....**...**
-     0x000630C6,  // **...**....**...**
-     0x000630C2,  // **...**....**....*
-     0x00063F82,  // **...*******.....*
-     0x00063302,  // **...**..**......*
-     0x00063186,  // **...**...**....**
-     0x000330C4,  // .**..**....**...*.
-     0x000330C4,  // .**..**....**...*.
-     0x00018008,  // ..**...........*..
-     0x0000C010,  // ...**.........*...
-     0x00007060,  // ....***.....**....
-     0x00001F80,  // ......******......
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E00C,  // ..***.........**..
+     0x0001C006,  // .***...........**.
+     0x00019FC2,  // .**..*******....*.
+     0x00039863,  // ***..**....**...**
+     0x00031863,  // **...**....**...**
+     0x00031861,  // **...**....**....*
+     0x00031FC1,  // **...*******.....*
+     0x00031981,  // **...**..**......*
+     0x000318C3,  // **...**...**....**
+     0x00019862,  // .**..**....**...*.
+     0x00019862,  // .**..**....**...*.
+     0x0000C004,  // ..**...........*..
+     0x00006008,  // ...**.........*...
+     0x00003830,  // ....***.....**....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4004,44 +4004,44 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
   },
   {             // 175
-     13, 25,
+     15, 25,
+     0x00000000,  // ...............
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
   },
   {             // 176
      9, 25,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000F8,  // ..*****..
-     0x0000008C,  // ..*...**.
-     0x00000084,  // ..*....*.
-     0x00000084,  // ..*....*.
-     0x000000CC,  // ..**..**.
-     0x00000078,  // ...****..
+     0x0000003C,  // ...****..
+     0x0000007C,  // ..*****..
+     0x00000046,  // ..*...**.
+     0x00000042,  // ..*....*.
+     0x00000042,  // ..*....*.
+     0x00000066,  // ..**..**.
+     0x0000003C,  // ...****..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4066,21 +4066,21 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x00003FFC,  // ************.
-     0x00003FFC,  // ************.
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4091,16 +4091,16 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      8, 25,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000003C,  // ...****.
-     0x0000007E,  // ..******
-     0x000000C6,  // .**...**
-     0x00000006,  // ......**
-     0x00000006,  // ......**
-     0x0000000C,  // .....**.
-     0x00000038,  // ...***..
-     0x00000070,  // ..***...
-     0x000000E0,  // .***....
-     0x000000FE,  // .*******
+     0x0000001E,  // ...****.
+     0x0000003F,  // ..******
+     0x00000063,  // .**...**
+     0x00000003,  // ......**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x00000038,  // ..***...
+     0x00000070,  // .***....
+     0x0000007F,  // .*******
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4119,16 +4119,16 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      8, 25,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000003C,  // ...****.
-     0x0000007E,  // ..******
-     0x00000046,  // ..*...**
-     0x00000006,  // ......**
-     0x0000001C,  // ....***.
-     0x0000001E,  // ....****
-     0x00000002,  // .......*
-     0x000000C2,  // .**....*
-     0x00000066,  // ..**..**
-     0x0000003C,  // ...****.
+     0x0000001E,  // ...****.
+     0x0000003F,  // ..******
+     0x00000023,  // ..*...**
+     0x00000003,  // ......**
+     0x0000000E,  // ....***.
+     0x0000000F,  // ....****
+     0x00000001,  // .......*
+     0x00000061,  // .**....*
+     0x00000033,  // ..**..**
+     0x0000001E,  // ...****.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4148,9 +4148,9 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000038,  // ...***..
-     0x00000030,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4175,10 +4175,10 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000E0,  // ......***....
-     0x000000E0,  // ......***....
-     0x000019CC,  // .**..***..**.
-     0x0000198C,  // .**..**...**.
+     0x00000070,  // ......***....
+     0x00000070,  // ......***....
+     0x00000CE6,  // .**..***..**.
+     0x00000CC6,  // .**..**...**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4200,32 +4200,32 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
   },
   {             // 182
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006700,  // ...**..***.......
-     0x0000E700,  // ..***..***.......
-     0x0000CD80,  // ..**..**.**......
-     0x00000D80,  // ......**.**......
-     0x00000DC0,  // ......**.***.....
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00001860,  // .....**....**....
-     0x00003060,  // ....**.....**....
-     0x00003070,  // ....**.....***...
-     0x00007FF0,  // ...***********...
-     0x00007FF8,  // ...************..
-     0x00006038,  // ...**.......***..
-     0x0000E018,  // ..***........**..
-     0x0000C01C,  // ..**.........***.
-     0x0000C00C,  // ..**..........**.
-     0x0001C00E,  // .***..........***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003380,  // ...**..***.......
+     0x00007380,  // ..***..***.......
+     0x000066C0,  // ..**..**.**......
+     0x000006C0,  // ......**.**......
+     0x000006E0,  // ......**.***.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C30,  // .....**....**....
+     0x00001830,  // ....**.....**....
+     0x00001838,  // ....**.....***...
+     0x00003FF8,  // ...***********...
+     0x00003FFC,  // ...************..
+     0x0000301C,  // ...**.......***..
+     0x0000700C,  // ..***........**..
+     0x0000600E,  // ..**.........***.
+     0x00006006,  // ..**..........**.
+     0x0000E007,  // .***..........***
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 183
      7, 25,
@@ -4237,8 +4237,8 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -4256,83 +4256,83 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
   },
   {             // 184
-     19, 25,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00077FF8,  // ..***.************..
-     0x00067FF8,  // ..**..************..
-     0x000C6000,  // .**...**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00007FC0,  // ......*********.....
-     0x00007FC0,  // ......*********.....
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00006000,  // ......**............
-     0x00007FF8,  // ......************..
-     0x00007FF8,  // ......************..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
+     20, 25,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0003BFFC,  // ..***.************..
+     0x00033FFC,  // ..**..************..
+     0x00063000,  // .**...**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003FE0,  // ......*********.....
+     0x00003FE0,  // ......*********.....
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003000,  // ......**............
+     0x00003FFC,  // ......************..
+     0x00003FFC,  // ......************..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
   {             // 185
-     21, 25,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x001D8018,  // ..***.**..........**..
-     0x00198018,  // ..**..**..........**..
-     0x00318018,  // .**...**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x0001FFF8,  // ......**************..
-     0x0001FFF8,  // ......**************..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00018018,  // ......**..........**..
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
+     22, 25,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x000EC00C,  // ..***.**..........**..
+     0x000CC00C,  // ..**..**..........**..
+     0x0018C00C,  // .**...**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000FFFC,  // ......**************..
+     0x0000FFFC,  // ......**************..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x0000C00C,  // ......**..........**..
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
   },
   {             // 186
      9, 25,
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000CC,  // ..**..**.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
+     0x00000066,  // ..**..**.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4350,16 +4350,16 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C40,  // ..**...*.....
-     0x00000660,  // ...**..**....
-     0x00000630,  // ...**...**...
-     0x00000330,  // ....**..**...
-     0x00000398,  // ....***..**..
-     0x00000398,  // ....***..**..
-     0x00000330,  // ....**..**...
-     0x00000630,  // ...**...**...
-     0x00000460,  // ...*...**....
-     0x00000CC0,  // ..**..**.....
+     0x00000620,  // ..**...*.....
+     0x00000330,  // ...**..**....
+     0x00000318,  // ...**...**...
+     0x00000198,  // ....**..**...
+     0x000001CC,  // ....***..**..
+     0x000001CC,  // ....***..**..
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000230,  // ...*...**....
+     0x00000660,  // ..**..**.....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4368,55 +4368,55 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
   },
   {             // 188
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00071FC0,  // ..***...*******.....
-     0x00063FF0,  // ..**...**********...
-     0x000CE078,  // .**..***......****..
-     0x0000C01C,  // .....**.........***.
-     0x0001801C,  // ....**..........***.
-     0x0001800C,  // ....**...........**.
-     0x0003000E,  // ...**............***
-     0x0003000E,  // ...**............***
-     0x0003000E,  // ...**............***
-     0x0003000E,  // ...**............***
-     0x0003000E,  // ...**............***
-     0x0003000E,  // ...**............***
-     0x0001800C,  // ....**...........**.
-     0x0001801C,  // ....**..........***.
-     0x0000C018,  // .....**.........**..
-     0x0000F078,  // .....****.....****..
-     0x00003FF0,  // .......**********...
-     0x00001FC0,  // ........*******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     20, 25,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00038FE0,  // ..***...*******.....
+     0x00031FF8,  // ..**...**********...
+     0x0006703C,  // .**..***......****..
+     0x0000600E,  // .....**.........***.
+     0x0000C00E,  // ....**..........***.
+     0x0000C006,  // ....**...........**.
+     0x00018007,  // ...**............***
+     0x00018007,  // ...**............***
+     0x00018007,  // ...**............***
+     0x00018007,  // ...**............***
+     0x00018007,  // ...**............***
+     0x00018007,  // ...**............***
+     0x0000C006,  // ....**...........**.
+     0x0000C00E,  // ....**..........***.
+     0x0000600C,  // .....**.........**..
+     0x0000783C,  // .....****.....****..
+     0x00001FF8,  // .......**********...
+     0x00000FE0,  // ........*******.....
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
   {             // 189
      20, 25,
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x00018018,  // ....**..........**..
-     0x00038030,  // ...***.........**...
-     0x000F8060,  // .*****........**....
-     0x000D80C0,  // .**.**.......**.....
-     0x000180C0,  // ....**.......**.....
-     0x00018180,  // ....**......**......
-     0x00018300,  // ....**.....**.......
-     0x00018200,  // ....**.....*........
-     0x00018600,  // ....**....**........
-     0x00018C00,  // ....**...**.........
-     0x0000187C,  // ........**....*****.
-     0x000018C6,  // ........**...**...**
-     0x00003006,  // .......**.........**
-     0x00006006,  // ......**..........**
-     0x0000C01C,  // .....**.........***.
-     0x0000C030,  // .....**........**...
-     0x00018060,  // ....**........**....
-     0x000300FE,  // ...**........*******
+     0x0000C00C,  // ....**..........**..
+     0x0001C018,  // ...***.........**...
+     0x0007C030,  // .*****........**....
+     0x0006C060,  // .**.**.......**.....
+     0x0000C060,  // ....**.......**.....
+     0x0000C0C0,  // ....**......**......
+     0x0000C180,  // ....**.....**.......
+     0x0000C100,  // ....**.....*........
+     0x0000C300,  // ....**....**........
+     0x0000C600,  // ....**...**.........
+     0x00000C3E,  // ........**....*****.
+     0x00000C63,  // ........**...**...**
+     0x00001803,  // .......**.........**
+     0x00003003,  // ......**..........**
+     0x0000600E,  // .....**.........***.
+     0x00006018,  // .....**........**...
+     0x0000C030,  // ....**........**....
+     0x0001807F,  // ...**........*******
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -4424,139 +4424,139 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ....................
   },
   {             // 190
-     20, 25,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x001CC00C,  // ..***..**..........**.
-     0x0018E01C,  // ..**...***........***.
-     0x00307018,  // .**.....***.......**..
-     0x00003030,  // .........**......**...
-     0x00003870,  // .........***....***...
-     0x00001C60,  // ..........***...**....
-     0x00000CC0,  // ...........**..**.....
-     0x00000FC0,  // ...........******.....
-     0x00000780,  // ............****......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000300,  // .............**.......
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
+     22, 25,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x000E6006,  // ..***..**..........**.
+     0x000C700E,  // ..**...***........***.
+     0x0018380C,  // .**.....***.......**..
+     0x00001818,  // .........**......**...
+     0x00001C38,  // .........***....***...
+     0x00000E30,  // ..........***...**....
+     0x00000660,  // ...........**..**.....
+     0x000007E0,  // ...........******.....
+     0x000003C0,  // ............****......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000180,  // .............**.......
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
   },
   {             // 191
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00061F00,  // ..**....*****.......
-     0x00067FC0,  // ..**..*********.....
-     0x000CE0E0,  // .**..***.....***....
-     0x0001C070,  // ....***.......***...
-     0x00018030,  // ....**.........**...
-     0x00038038,  // ...***.........***..
-     0x00030018,  // ...**...........**..
-     0x00030018,  // ...**...........**..
-     0x00030018,  // ...**...........**..
-     0x00030018,  // ...**...........**..
-     0x00030018,  // ...**...........**..
-     0x00030018,  // ...**...........**..
-     0x00018030,  // ....**.........**...
-     0x00018030,  // ....**.........**...
-     0x0000C060,  // .....**.......**....
-     0x000060C0,  // ......**.....**.....
-     0x0003F1F8,  // ...******...******..
-     0x0003F1F8,  // ...******...******..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
+     20, 25,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00030F80,  // ..**....*****.......
+     0x00033FE0,  // ..**..*********.....
+     0x00067070,  // .**..***.....***....
+     0x0000E038,  // ....***.......***...
+     0x0000C018,  // ....**.........**...
+     0x0001C01C,  // ...***.........***..
+     0x0001800C,  // ...**...........**..
+     0x0001800C,  // ...**...........**..
+     0x0001800C,  // ...**...........**..
+     0x0001800C,  // ...**...........**..
+     0x0001800C,  // ...**...........**..
+     0x0001800C,  // ...**...........**..
+     0x0000C018,  // ....**.........**...
+     0x0000C018,  // ....**.........**...
+     0x00006030,  // .....**.......**....
+     0x00003060,  // ......**.....**.....
+     0x0001F8FC,  // ...******...******..
+     0x0001F8FC,  // ...******...******..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
   },
   {             // 192
-     5, 25,
-     0x00000000,  // .........
-     0x00000070,  // .....***...
-     0x00000060,  // .....**....
-     0x00000CCE,  // **..**..***
-     0x00000C0E,  // **......***
+     11, 25,
+     0x00000000,  // ...........
+     0x00000038,  // .....***...
+     0x00000030,  // .....**....
+     0x00000667,  // **..**..***
+     0x00000607,  // **......***
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
   },
   {             // 193
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000D80,  // ......**.**......
-     0x00000D80,  // ......**.**......
-     0x00000DC0,  // ......**.***.....
-     0x000018C0,  // .....**...**.....
-     0x000018C0,  // .....**...**.....
-     0x00001860,  // .....**....**....
-     0x00003060,  // ....**.....**....
-     0x00003070,  // ....**.....***...
-     0x00007FF0,  // ...***********...
-     0x00007FF8,  // ...************..
-     0x00006038,  // ...**.......***..
-     0x0000E018,  // ..***........**..
-     0x0000C01C,  // ..**.........***.
-     0x0000C00C,  // ..**..........**.
-     0x0001C00E,  // .***..........***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x000006C0,  // ......**.**......
+     0x000006E0,  // ......**.***.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C30,  // .....**....**....
+     0x00001830,  // ....**.....**....
+     0x00001838,  // ....**.....***...
+     0x00003FF8,  // ...***********...
+     0x00003FFC,  // ...************..
+     0x0000301C,  // ...**.......***..
+     0x0000700C,  // ..***........**..
+     0x0000600E,  // ..**.........***.
+     0x00006006,  // ..**..........**.
+     0x0000E007,  // .***..........***
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 194
      16, 25,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FC0,  // ..*********.....
-     0x00007FF0,  // ..***********...
-     0x00006038,  // ..**.......***..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006018,  // ..**........**..
-     0x00006030,  // ..**.......**...
-     0x00007FE0,  // ..**********....
-     0x00007FF0,  // ..***********...
-     0x00006038,  // ..**.......***..
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00007FF0,  // ..***********...
-     0x00007FE0,  // ..**********....
+     0x00003FE0,  // ..*********.....
+     0x00003FF8,  // ..***********...
+     0x0000301C,  // ..**.......***..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x0000300C,  // ..**........**..
+     0x00003018,  // ..**.......**...
+     0x00003FF0,  // ..**********....
+     0x00003FF8,  // ..***********...
+     0x0000301C,  // ..**.......***..
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003FF8,  // ..***********...
+     0x00003FF0,  // ..**********....
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4568,23 +4568,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4592,55 +4592,55 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
   },
   {             // 196
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000700,  // .......***.......
-     0x00000700,  // .......***.......
-     0x00000580,  // .......*.**......
-     0x00000D80,  // ......**.**......
-     0x00000DC0,  // ......**.***.....
-     0x00001CC0,  // .....***..**.....
-     0x000018C0,  // .....**...**.....
-     0x00001860,  // .....**....**....
-     0x00003060,  // ....**.....**....
-     0x00003070,  // ....**.....***...
-     0x00007030,  // ...***......**...
-     0x00006038,  // ...**.......***..
-     0x00006038,  // ...**.......***..
-     0x0000E018,  // ..***........**..
-     0x0000C01C,  // ..**.........***.
-     0x0000FFFC,  // ..**************.
-     0x0001FFFE,  // .****************
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 25,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000002C0,  // .......*.**......
+     0x000006C0,  // ......**.**......
+     0x000006E0,  // ......**.***.....
+     0x00000E60,  // .....***..**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C30,  // .....**....**....
+     0x00001830,  // ....**.....**....
+     0x00001838,  // ....**.....***...
+     0x00003818,  // ...***......**...
+     0x0000301C,  // ...**.......***..
+     0x0000301C,  // ...**.......***..
+     0x0000700C,  // ..***........**..
+     0x0000600E,  // ..**.........***.
+     0x00007FFE,  // ..**************.
+     0x0000FFFF,  // .****************
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 197
      16, 25,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FC0,  // ..*********.....
-     0x00007FC0,  // ..*********.....
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00007FF8,  // ..************..
-     0x00007FF8,  // ..************..
+     0x00003FFC,  // ..************..
+     0x00003FFC,  // ..************..
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003FE0,  // ..*********.....
+     0x00003FE0,  // ..*********.....
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003FFC,  // ..************..
+     0x00003FFC,  // ..************..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4652,23 +4652,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FFE,  // .*************
-     0x00003FFC,  // .************.
-     0x0000000C,  // ...........**.
-     0x00000018,  // ..........**..
-     0x00000030,  // .........**...
-     0x00000070,  // ........***...
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
-     0x00000700,  // ....***.......
-     0x00000E00,  // ...***........
-     0x00001C00,  // ..***.........
-     0x00001800,  // ..**..........
-     0x00003000,  // .**...........
-     0x00007FFC,  // *************.
-     0x00007FFC,  // *************.
+     0x00001FFF,  // .*************
+     0x00001FFE,  // .************.
+     0x00000006,  // ...........**.
+     0x0000000C,  // ..........**..
+     0x00000018,  // .........**...
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000E00,  // ..***.........
+     0x00000C00,  // ..**..........
+     0x00001800,  // .**...........
+     0x00003FFE,  // *************.
+     0x00003FFE,  // *************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4680,23 +4680,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000FFFC,  // ..**************.
-     0x0000FFFC,  // ..**************.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00007FFE,  // ..**************.
+     0x00007FFE,  // ..**************.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4707,24 +4707,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x0000F0F8,  // ...****....*****..
-     0x0000C038,  // ...**........***..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x00031FC6,  // .**...*******...**
-     0x00031FC6,  // .**...*******...**
-     0x0003000E,  // .**............***
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0000C018,  // ...**.........**..
-     0x0000E078,  // ...***......****..
-     0x00003FF0,  // .....**********...
-     0x00001FC0,  // ......*******.....
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000787C,  // ...****....*****..
+     0x0000601C,  // ...**........***..
+     0x0000C00E,  // ..**..........***.
+     0x0000C006,  // ..**...........**.
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x00018FE3,  // .**...*******...**
+     0x00018FE3,  // .**...*******...**
+     0x00018007,  // .**............***
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000600C,  // ...**.........**..
+     0x0000703C,  // ...***......****..
+     0x00001FF8,  // .....**********...
+     0x00000FE0,  // ......*******.....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4736,23 +4736,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -4764,23 +4764,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00006070,  // ..**......***...
-     0x000060E0,  // ..**.....***....
-     0x000061C0,  // ..**....***.....
-     0x00006380,  // ..**...***......
-     0x00006700,  // ..**..***.......
-     0x00006F00,  // ..**.****.......
-     0x00007F00,  // ..*******.......
-     0x00007B80,  // ..****.***......
-     0x000071C0,  // ..***...***.....
-     0x000060E0,  // ..**.....***....
-     0x000060E0,  // ..**.....***....
-     0x00006070,  // ..**......***...
-     0x00006038,  // ..**.......***..
-     0x00006038,  // ..**.......***..
-     0x0000601C,  // ..**........***.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003038,  // ..**......***...
+     0x00003070,  // ..**.....***....
+     0x000030E0,  // ..**....***.....
+     0x000031C0,  // ..**...***......
+     0x00003380,  // ..**..***.......
+     0x00003780,  // ..**.****.......
+     0x00003F80,  // ..*******.......
+     0x00003DC0,  // ..****.***......
+     0x000038E0,  // ..***...***.....
+     0x00003070,  // ..**.....***....
+     0x00003070,  // ..**.....***....
+     0x00003038,  // ..**......***...
+     0x0000301C,  // ..**.......***..
+     0x0000301C,  // ..**.......***..
+     0x0000300E,  // ..**........***.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4792,23 +4792,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00000300,  // .......**.......
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000D80,  // .....**.**......
-     0x00000CC0,  // .....**..**.....
-     0x00000CC0,  // .....**..**.....
-     0x000018E0,  // ....**...***....
-     0x00001860,  // ....**....**....
-     0x00003860,  // ...***....**....
-     0x00003070,  // ...**.....***...
-     0x00003030,  // ...**......**...
-     0x00006030,  // ..**.......**...
-     0x00006038,  // ..**.......***..
-     0x0000E018,  // .***........**..
-     0x0000C01C,  // .**.........***.
-     0x0000C00C,  // .**..........**.
-     0x0001C00C,  // ***..........**.
+     0x00000180,  // .......**.......
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x000006C0,  // .....**.**......
+     0x00000660,  // .....**..**.....
+     0x00000660,  // .....**..**.....
+     0x00000C70,  // ....**...***....
+     0x00000C30,  // ....**....**....
+     0x00001C30,  // ...***....**....
+     0x00001838,  // ...**.....***...
+     0x00001818,  // ...**......**...
+     0x00003018,  // ..**.......**...
+     0x0000301C,  // ..**.......***..
+     0x0000700C,  // .***........**..
+     0x0000600E,  // .**.........***.
+     0x00006006,  // .**..........**.
+     0x0000E006,  // ***..........**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4820,23 +4820,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0001C01C,  // ..***.........***.
-     0x0001E03C,  // ..****.......****.
-     0x0001E03C,  // ..****.......****.
-     0x0001F07C,  // ..*****.....*****.
-     0x0001B06C,  // ..**.**.....**.**.
-     0x0001B8EC,  // ..**.***...***.**.
-     0x000198CC,  // ..**..**...**..**.
-     0x00019DCC,  // ..**..***.***..**.
-     0x00018D8C,  // ..**...**.**...**.
-     0x00018F8C,  // ..**...*****...**.
-     0x0001870C,  // ..**....***....**.
-     0x0001870C,  // ..**....***....**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
+     0x0000E00E,  // ..***.........***.
+     0x0000F01E,  // ..****.......****.
+     0x0000F01E,  // ..****.......****.
+     0x0000F83E,  // ..*****.....*****.
+     0x0000D836,  // ..**.**.....**.**.
+     0x0000DC76,  // ..**.***...***.**.
+     0x0000CC66,  // ..**..**...**..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x0000C6C6,  // ..**...**.**...**.
+     0x0000C7C6,  // ..**...*****...**.
+     0x0000C386,  // ..**....***....**.
+     0x0000C386,  // ..**....***....**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4848,23 +4848,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000E00C,  // ..***.........**.
-     0x0000E00C,  // ..***.........**.
-     0x0000F00C,  // ..****........**.
-     0x0000F80C,  // ..*****.......**.
-     0x0000D80C,  // ..**.**.......**.
-     0x0000DC0C,  // ..**.***......**.
-     0x0000CE0C,  // ..**..***.....**.
-     0x0000C70C,  // ..**...***....**.
-     0x0000C70C,  // ..**...***....**.
-     0x0000C38C,  // ..**....***...**.
-     0x0000C1CC,  // ..**.....***..**.
-     0x0000C0CC,  // ..**......**..**.
-     0x0000C0EC,  // ..**......***.**.
-     0x0000C07C,  // ..**.......*****.
-     0x0000C03C,  // ..**........****.
-     0x0000C03C,  // ..**........****.
-     0x0000C01C,  // ..**.........***.
+     0x00007006,  // ..***.........**.
+     0x00007006,  // ..***.........**.
+     0x00007806,  // ..****........**.
+     0x00007C06,  // ..*****.......**.
+     0x00006C06,  // ..**.**.......**.
+     0x00006E06,  // ..**.***......**.
+     0x00006706,  // ..**..***.....**.
+     0x00006386,  // ..**...***....**.
+     0x00006386,  // ..**...***....**.
+     0x000061C6,  // ..**....***...**.
+     0x000060E6,  // ..**.....***..**.
+     0x00006066,  // ..**......**..**.
+     0x00006076,  // ..**......***.**.
+     0x0000603E,  // ..**.......*****.
+     0x0000601E,  // ..**........****.
+     0x0000601E,  // ..**........****.
+     0x0000600E,  // ..**.........***.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4876,23 +4876,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00001FF8,  // ...**********..
-     0x00001FF8,  // ...**********..
+     0x00000FFC,  // ...**********..
+     0x00000FFC,  // ...**********..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007FFC,  // .*************.
-     0x00007FFC,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4903,24 +4903,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x0000F078,  // ...****.....****..
-     0x0000C038,  // ...**........***..
-     0x0001801C,  // ..**..........***.
-     0x0001800C,  // ..**...........**.
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x00030006,  // .**.............**
-     0x00030006,  // .**.............**
-     0x0003000E,  // .**............***
-     0x0003000E,  // .**............***
-     0x0001800C,  // ..**...........**.
-     0x0001801C,  // ..**..........***.
-     0x0000C018,  // ...**.........**..
-     0x0000F078,  // ...****.....****..
-     0x00003FE0,  // .....*********....
-     0x00001FC0,  // ......*******.....
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000783C,  // ...****.....****..
+     0x0000601C,  // ...**........***..
+     0x0000C00E,  // ..**..........***.
+     0x0000C006,  // ..**...........**.
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x00018003,  // .**.............**
+     0x00018003,  // .**.............**
+     0x00018007,  // .**............***
+     0x00018007,  // .**............***
+     0x0000C006,  // ..**...........**.
+     0x0000C00E,  // ..**..........***.
+     0x0000600C,  // ...**.........**..
+     0x0000783C,  // ...****.....****..
+     0x00001FF0,  // .....*********....
+     0x00000FE0,  // ......*******.....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4932,23 +4932,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000FFFC,  // ..**************.
-     0x0000FFFC,  // ..**************.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
-     0x0000C00C,  // ..**..........**.
+     0x00007FFE,  // ..**************.
+     0x00007FFE,  // ..**************.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
+     0x00006006,  // ..**..........**.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4960,23 +4960,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007FE0,  // ..**********....
-     0x00007FF8,  // ..************..
-     0x0000603C,  // ..**.......****.
-     0x0000601C,  // ..**........***.
-     0x0000600C,  // ..**.........**.
-     0x0000600C,  // ..**.........**.
-     0x0000601C,  // ..**........***.
-     0x00006038,  // ..**.......***..
-     0x00007FF8,  // ..************..
-     0x00007FE0,  // ..**********....
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
-     0x00006000,  // ..**............
+     0x00003FF0,  // ..**********....
+     0x00003FFC,  // ..************..
+     0x0000301E,  // ..**.......****.
+     0x0000300E,  // ..**........***.
+     0x00003006,  // ..**.........**.
+     0x00003006,  // ..**.........**.
+     0x0000300E,  // ..**........***.
+     0x0000301C,  // ..**.......***..
+     0x00003FFC,  // ..************..
+     0x00003FF0,  // ..**********....
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
+     0x00003000,  // ..**............
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4988,23 +4988,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00003800,  // ..***..........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5016,23 +5016,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003FF8,  // ..***********..
-     0x00003FF8,  // ..***********..
-     0x00003800,  // ..***..........
-     0x00001C00,  // ...***.........
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
-     0x00000180,  // .......**......
-     0x000001C0,  // .......***.....
-     0x00000380,  // ......***......
-     0x00000700,  // .....***.......
-     0x00000E00,  // ....***........
-     0x00000C00,  // ....**.........
-     0x00001800,  // ...**..........
-     0x00003800,  // ..***..........
-     0x00003FFC,  // ..************.
-     0x00003FFC,  // ..************.
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5044,23 +5044,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00007FFE,  // **************
-     0x00007FFE,  // **************
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5072,23 +5072,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000E00C,  // .***.........**.
-     0x0000E01C,  // .***........***.
-     0x00007018,  // ..***.......**..
-     0x00003030,  // ...**......**...
-     0x00003870,  // ...***....***...
-     0x00001C60,  // ....***...**....
-     0x00000CC0,  // .....**..**.....
-     0x00000FC0,  // .....******.....
-     0x00000780,  // ......****......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00007006,  // .***.........**.
+     0x0000700E,  // .***........***.
+     0x0000380C,  // ..***.......**..
+     0x00001818,  // ...**......**...
+     0x00001C38,  // ...***....***...
+     0x00000E30,  // ....***...**....
+     0x00000660,  // .....**..**.....
+     0x000007E0,  // .....******.....
+     0x000003C0,  // ......****......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5099,24 +5099,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      19, 25,
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00000C00,  // ........**.........
-     0x00000C00,  // ........**.........
-     0x00007F80,  // .....********......
-     0x0001FFE0,  // ...************....
-     0x00038C78,  // ..***...**...****..
-     0x00030C38,  // ..**....**....***..
-     0x00070C1C,  // .***....**.....***.
-     0x00060C1C,  // .**.....**.....***.
-     0x00060C0C,  // .**.....**......**.
-     0x00060C0C,  // .**.....**......**.
-     0x00060C1C,  // .**.....**.....***.
-     0x00070C1C,  // .***....**.....***.
-     0x00030C38,  // ..**....**....***..
-     0x0003CC70,  // ..****..**...***...
-     0x0001FFE0,  // ...************....
-     0x00007F80,  // .....********......
-     0x00000C00,  // ........**.........
-     0x00000C00,  // ........**.........
+     0x00000600,  // ........**.........
+     0x00000600,  // ........**.........
+     0x00003FC0,  // .....********......
+     0x0000FFF0,  // ...************....
+     0x0001C63C,  // ..***...**...****..
+     0x0001861C,  // ..**....**....***..
+     0x0003860E,  // .***....**.....***.
+     0x0003060E,  // .**.....**.....***.
+     0x00030606,  // .**.....**......**.
+     0x00030606,  // .**.....**......**.
+     0x0003060E,  // .**.....**.....***.
+     0x0003860E,  // .***....**.....***.
+     0x0001861C,  // ..**....**....***..
+     0x0001E638,  // ..****..**...***...
+     0x0000FFF0,  // ...************....
+     0x00003FC0,  // .....********......
+     0x00000600,  // ........**.........
+     0x00000600,  // ........**.........
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -5128,23 +5128,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000E01C,  // .***........***.
-     0x00007018,  // ..***.......**..
-     0x00003030,  // ...**......**...
-     0x00003870,  // ...***....***...
-     0x00001CE0,  // ....***..***....
-     0x00000CC0,  // .....**..**.....
-     0x00000F80,  // .....*****......
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000780,  // ......****......
-     0x00000DC0,  // .....**.***.....
-     0x00001CE0,  // ....***..***....
-     0x00003860,  // ...***....**....
-     0x00003070,  // ...**.....***...
-     0x00007038,  // ..***......***..
-     0x0000E018,  // .***........**..
-     0x0001C01C,  // ***.........***.
+     0x0000700E,  // .***........***.
+     0x0000380C,  // ..***.......**..
+     0x00001818,  // ...**......**...
+     0x00001C38,  // ...***....***...
+     0x00000E70,  // ....***..***....
+     0x00000660,  // .....**..**.....
+     0x000007C0,  // .....*****......
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x000006E0,  // .....**.***.....
+     0x00000E70,  // ....***..***....
+     0x00001C30,  // ...***....**....
+     0x00001838,  // ...**.....***...
+     0x0000381C,  // ..***......***..
+     0x0000700C,  // .***........**..
+     0x0000E00E,  // ***.........***.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5156,23 +5156,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
-     0x000C0C18,  // .**......**.....**..
-     0x000C0C18,  // .**......**.....**..
-     0x000C0C18,  // .**......**.....**..
-     0x000C0C18,  // .**......**.....**..
-     0x000C0C18,  // .**......**.....**..
-     0x000C0C18,  // .**......**.....**..
-     0x000C0C18,  // .**......**.....**..
-     0x000E0C38,  // .***.....**....***..
-     0x00060C30,  // ..**.....**....**...
-     0x00078C70,  // ..****...**...***...
-     0x0003FFE0,  // ...*************....
-     0x00007F80,  // ......********......
-     0x00000C00,  // .........**.........
-     0x00000C00,  // .........**.........
-     0x00000C00,  // .........**.........
-     0x00000C00,  // .........**.........
-     0x00000C00,  // .........**.........
+     0x0006060C,  // .**......**.....**..
+     0x0006060C,  // .**......**.....**..
+     0x0006060C,  // .**......**.....**..
+     0x0006060C,  // .**......**.....**..
+     0x0006060C,  // .**......**.....**..
+     0x0006060C,  // .**......**.....**..
+     0x0006060C,  // .**......**.....**..
+     0x0007061C,  // .***.....**....***..
+     0x00030618,  // ..**.....**....**...
+     0x0003C638,  // ..****...**...***...
+     0x0001FFF0,  // ...*************....
+     0x00003FC0,  // ......********......
+     0x00000600,  // .........**.........
+     0x00000600,  // .........**.........
+     0x00000600,  // .........**.........
+     0x00000600,  // .........**.........
+     0x00000600,  // .........**.........
      0x00000000,  // ....................
      0x00000000,  // ....................
      0x00000000,  // ....................
@@ -5183,24 +5183,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      18, 25,
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001F00,  // ......*****.......
-     0x00007FC0,  // ....*********.....
-     0x0000E0E0,  // ...***.....***....
-     0x0001C070,  // ..***.......***...
-     0x00018030,  // ..**.........**...
-     0x00038038,  // .***.........***..
-     0x00030018,  // .**...........**..
-     0x00030018,  // .**...........**..
-     0x00030018,  // .**...........**..
-     0x00030018,  // .**...........**..
-     0x00030018,  // .**...........**..
-     0x00030018,  // .**...........**..
-     0x00018030,  // ..**.........**...
-     0x00018030,  // ..**.........**...
-     0x0000C060,  // ...**.......**....
-     0x000060C0,  // ....**.....**.....
-     0x0003F1F8,  // .******...******..
-     0x0003F1F8,  // .******...******..
+     0x00000F80,  // ......*****.......
+     0x00003FE0,  // ....*********.....
+     0x00007070,  // ...***.....***....
+     0x0000E038,  // ..***.......***...
+     0x0000C018,  // ..**.........**...
+     0x0001C01C,  // .***.........***..
+     0x0001800C,  // .**...........**..
+     0x0001800C,  // .**...........**..
+     0x0001800C,  // .**...........**..
+     0x0001800C,  // .**...........**..
+     0x0001800C,  // .**...........**..
+     0x0001800C,  // .**...........**..
+     0x0000C018,  // ..**.........**...
+     0x0000C018,  // ..**.........**...
+     0x00006030,  // ...**.......**....
+     0x00003060,  // ....**.....**.....
+     0x0001F8FC,  // .******...******..
+     0x0001F8FC,  // .******...******..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -5208,83 +5208,83 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
   },
   {             // 218
-     7, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000376,  // **.***.**
-     0x00000376,  // **.***.**
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000001BB,  // **.***.**
+     0x000001BB,  // **.***.**
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
   },
   {             // 219
-     16, 25,
-     0x00000000,  // ................
-     0x0001800E,  // .**...........***
-     0x0001800E,  // .**...........***
-     0x00000000,  // .................
-     0x0001800E,  // .**...........***
-     0x0000C00C,  // ..**..........**.
-     0x0000E018,  // ..***........**..
-     0x00007038,  // ...***......***..
-     0x00003870,  // ....***....***...
-     0x00001C60,  // .....***...**....
-     0x00000CC0,  // ......**..**.....
-     0x00000F80,  // ......*****......
-     0x00000780,  // .......****......
-     0x00000300,  // ........**.......
-     0x00000300,  // ........**.......
-     0x00000300,  // ........**.......
-     0x00000300,  // ........**.......
-     0x00000300,  // ........**.......
-     0x00000300,  // ........**.......
-     0x00000300,  // ........**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
+     17, 25,
+     0x00000000,  // .................
+     0x0000C007,  // .**...........***
+     0x0000C007,  // .**...........***
+     0x00000000,  // .................
+     0x0000C007,  // .**...........***
+     0x00006006,  // ..**..........**.
+     0x0000700C,  // ..***........**..
+     0x0000381C,  // ...***......***..
+     0x00001C38,  // ....***....***...
+     0x00000E30,  // .....***...**....
+     0x00000660,  // ......**..**.....
+     0x000007C0,  // ......*****......
+     0x000003C0,  // .......****......
+     0x00000180,  // ........**.......
+     0x00000180,  // ........**.......
+     0x00000180,  // ........**.......
+     0x00000180,  // ........**.......
+     0x00000180,  // ........**.......
+     0x00000180,  // ........**.......
+     0x00000180,  // ........**.......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 220
      14, 25,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000000E0,  // .......***....
-     0x000001C0,  // ......***.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
      0x00000000,  // ..............
-     0x00000FD8,  // ...******.**..
-     0x00001EF8,  // ..****.*****..
-     0x00001838,  // ..**.....***..
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003838,  // .***.....***..
-     0x00001878,  // ..**....****..
-     0x00000FEE,  // ...*******.***
-     0x000007CC,  // ....*****..**.
+     0x000007EC,  // ...******.**..
+     0x00000F7C,  // ..****.*****..
+     0x00000C1C,  // ..**.....***..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C1C,  // .***.....***..
+     0x00000C3C,  // ..**....****..
+     0x000007F7,  // ...*******.***
+     0x000003E6,  // ....*****..**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5296,23 +5296,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000038,  // .....***..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000001C,  // .....***..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001FC,  // ..*******.
-     0x00000388,  // .***...*..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001E0,  // ..****....
-     0x000001E0,  // ..****....
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x000001C4,  // .***...*..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000F0,  // ..****....
+     0x000000F0,  // ..****....
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5324,51 +5324,51 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
+     0x00000038,  // .......***...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00000CF0,  // ..**..****...
-     0x00000FF8,  // ..*********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
+     0x00000678,  // ..**..****...
+     0x000007FC,  // ..*********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
   },
   {             // 223
-     5, 25,
+     7, 25,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000001C,  // ...***.
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
+     0x0000000E,  // ...***.
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5378,25 +5378,25 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
   {             // 224
      13, 25,
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x000000E0,  // ......***....
-     0x00000CCC,  // ..**..**..**.
-     0x00000C0C,  // ..**......**.
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x00000666,  // ..**..**..**.
+     0x00000606,  // ..**......**.
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000618,  // ...**....**..
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000030C,  // ...**....**..
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5413,18 +5413,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000FD8,  // ...******.**..
-     0x00001EF8,  // ..****.*****..
-     0x00001838,  // ..**.....***..
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003838,  // .***.....***..
-     0x00001878,  // ..**....****..
-     0x00000FEE,  // ...*******.***
-     0x000007CC,  // ....*****..**.
+     0x000007EC,  // ...******.**..
+     0x00000F7C,  // ..****.*****..
+     0x00000C1C,  // ..**.....***..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C1C,  // .***.....***..
+     0x00000C3C,  // ..**....****..
+     0x000007F7,  // ...*******.***
+     0x000003E6,  // ....*****..**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5435,28 +5435,28 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      14, 25,
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000FF0,  // ...********...
-     0x00000C38,  // ...**....***..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001870,  // ..**....***...
-     0x000019E0,  // ..**..****....
-     0x000018F0,  // ..**...****...
-     0x00001818,  // ..**......**..
-     0x0000181C,  // ..**......***.
-     0x0000180C,  // ..**.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00001E18,  // ..****....**..
-     0x00001FF8,  // ..**********..
-     0x000019E0,  // ..**..****....
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x000001E0,  // .....****.....
+     0x000007F8,  // ...********...
+     0x0000061C,  // ...**....***..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C38,  // ..**....***...
+     0x00000CF0,  // ..**..****....
+     0x00000C78,  // ..**...****...
+     0x00000C0C,  // ..**......**..
+     0x00000C0E,  // ..**......***.
+     0x00000C06,  // ..**.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x00000F0C,  // ..****....**..
+     0x00000FFC,  // ..**********..
+     0x00000CF0,  // ..**..****....
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
   },
   {             // 227
@@ -5469,46 +5469,46 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000738,  // ..***..***..
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000039C,  // ..***..***..
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
   },
   {             // 228
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000E00,  // ..***........
-     0x00000300,  // ....**.......
-     0x000001C0,  // .....***.....
-     0x000003E0,  // ....*****....
-     0x000007F8,  // ...********..
-     0x00000C1C,  // ..**.....***.
-     0x00001C0C,  // .***......**.
-     0x0000180E,  // .**.......***
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180E,  // .**.......***
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003F0,  // ....******...
+     0x000007FE,  // ..**********.
+     0x00000700,  // ..***........
+     0x00000180,  // ....**.......
+     0x000000E0,  // .....***.....
+     0x000001F0,  // ....*****....
+     0x000003FC,  // ...********..
+     0x0000060E,  // ..**.....***.
+     0x00000E06,  // .***......**.
+     0x00000C07,  // .**.......***
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C07,  // .**.......***
+     0x00000606,  // ..**......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5524,19 +5524,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x00000308,  // .**....*..
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001E0,  // ..****....
-     0x000001E0,  // ..****....
-     0x00000380,  // .***......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000184,  // .**....*..
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000F0,  // ..****....
+     0x000000F0,  // ..****....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5548,28 +5548,28 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000FE,  // ...*******
-     0x000000FE,  // ...*******
-     0x0000000C,  // .......**.
-     0x00000010,  // ......*...
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000380,  // .***......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000380,  // .***......
-     0x000001F8,  // ..******..
-     0x000000FC,  // ...******.
-     0x0000000E,  // .......***
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x0000001C,  // ......***.
-     0x00000018,  // ......**..
+     0x0000007F,  // ...*******
+     0x0000007F,  // ...*******
+     0x00000006,  // .......**.
+     0x00000008,  // ......*...
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C0,  // .***......
+     0x000000FC,  // ..******..
+     0x0000007E,  // ...******.
+     0x00000007,  // .......***
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x0000000E,  // ......***.
+     0x0000000C,  // ......**..
   },
   {             // 231
      13, 25,
@@ -5580,47 +5580,47 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000DF0,  // ..**.*****...
-     0x00000FF8,  // ..*********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
-     0x0000000C,  // ..........**.
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
   },
   {             // 232
      13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0E,  // ..**......***
-     0x0000180E,  // .**.......***
-     0x0000180E,  // .**.......***
-     0x00001806,  // .**........**
-     0x00001FFE,  // .************
-     0x00001FFE,  // .************
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180E,  // .**.......***
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000607,  // ..**......***
+     0x00000C07,  // .**.......***
+     0x00000C07,  // .**.......***
+     0x00000C03,  // .**........**
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C07,  // .**.......***
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5637,18 +5637,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -5656,7 +5656,7 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .....
   },
   {             // 234
-     12, 25,
+     13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5665,18 +5665,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C38,  // ..**....***..
-     0x00000C70,  // ..**...***...
-     0x00000CE0,  // ..**..***....
-     0x00000DC0,  // ..**.***.....
-     0x00000F80,  // ..*****......
-     0x00000F80,  // ..*****......
-     0x00000FC0,  // ..******.....
-     0x00000CC0,  // ..**..**.....
-     0x00000C60,  // ..**...**....
-     0x00000C70,  // ..**...***...
-     0x00000C38,  // ..**....***..
-     0x00000C1C,  // ..**.....***.
+     0x0000061C,  // ..**....***..
+     0x00000638,  // ..**...***...
+     0x00000670,  // ..**..***....
+     0x000006E0,  // ..**.***.....
+     0x000007C0,  // ..*****......
+     0x000007C0,  // ..*****......
+     0x000007E0,  // ..******.....
+     0x00000660,  // ..**..**.....
+     0x00000630,  // ..**...**....
+     0x00000638,  // ..**...***...
+     0x0000061C,  // ..**....***..
+     0x0000060E,  // ..**.....***.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5688,23 +5688,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000300,  // ...**.......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000003E0,  // ...*****....
-     0x00000370,  // ...**.***...
-     0x00000330,  // ...**..**...
-     0x00000630,  // ..**...**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00001C0C,  // ***......**.
+     0x00000180,  // ...**.......
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000001F0,  // ...*****....
+     0x000001B8,  // ...**.***...
+     0x00000198,  // ...**..**...
+     0x00000318,  // ..**...**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000E06,  // ***......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5721,22 +5721,22 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001C38,  // ..***....***..
-     0x00001FF8,  // ..**********..
-     0x00001BD8,  // ..**.****.**..
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
-     0x00001800,  // ..**..........
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E1C,  // ..***....***..
+     0x00000FFC,  // ..**********..
+     0x00000DEC,  // ..**.****.**..
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
      0x00000000,  // ..............
   },
   {             // 237
@@ -5749,18 +5749,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001C0C,  // ***......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x00000730,  // ..***..**...
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x000001C0,  // ....***.....
-     0x000000C0,  // .....**.....
+     0x00000E06,  // ***......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x00000398,  // ..***..**...
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5772,28 +5772,28 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000300,  // ..**.......
-     0x000001F0,  // ...*****...
-     0x000000F0,  // ....****...
-     0x00000180,  // ...**......
-     0x00000300,  // ..**.......
-     0x00000700,  // .***.......
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000700,  // .***.......
-     0x000003E0,  // ..*****....
-     0x000000FC,  // ....******.
-     0x0000001E,  // .......****
-     0x00000006,  // .........**
-     0x0000000E,  // ........***
-     0x0000007C,  // .....*****.
-     0x00000070,  // .....***...
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000180,  // ..**.......
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000180,  // ..**.......
+     0x000000F8,  // ...*****...
+     0x00000078,  // ....****...
+     0x000000C0,  // ...**......
+     0x00000180,  // ..**.......
+     0x00000380,  // .***.......
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000380,  // .***.......
+     0x000001F0,  // ..*****....
+     0x0000007E,  // ....******.
+     0x0000000F,  // .......****
+     0x00000003,  // .........**
+     0x00000007,  // ........***
+     0x0000003E,  // .....*****.
+     0x00000038,  // .....***...
   },
   {             // 239
      13, 25,
@@ -5804,19 +5804,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003F0,  // ....******...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00001C0E,  // .***......***
-     0x0000180E,  // .**.......***
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180E,  // .**.......***
-     0x00001C0C,  // .***......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003F0,  // ....******...
+     0x000001F8,  // ....******...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000E07,  // .***......***
+     0x00000C07,  // .**.......***
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C07,  // .**.......***
+     0x00000E06,  // .***......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5833,18 +5833,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
-     0x00000C18,  // ..**.....**..
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5860,23 +5860,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000003F8,  // ....*******..
-     0x0000061C,  // ...**....***.
-     0x00000E0C,  // ..***.....**.
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000C06,  // ..**.......**
-     0x00000E0C,  // ..***.....**.
-     0x00000E1C,  // ..***....***.
-     0x00000FF8,  // ..*********..
-     0x00000DF0,  // ..**.*****...
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x000000F8,  // .....*****...
+     0x000001FC,  // ....*******..
+     0x0000030E,  // ...**....***.
+     0x00000706,  // ..***.....**.
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000603,  // ..**.......**
+     0x00000706,  // ..***.....**.
+     0x0000070E,  // ..***....***.
+     0x000007FC,  // ..*********..
+     0x000006F8,  // ..**.*****...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
   },
   {             // 242
@@ -5888,24 +5888,24 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000003E,  // ......*****
-     0x000000FE,  // ....*******
-     0x000001C0,  // ...***.....
-     0x00000300,  // ..**.......
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000700,  // .***.......
-     0x000003C0,  // ..****.....
-     0x000001F8,  // ...******..
-     0x0000007E,  // .....******
-     0x0000000E,  // ........***
-     0x00000006,  // .........**
-     0x0000000E,  // ........***
-     0x0000007C,  // .....*****.
-     0x00000070,  // .....***...
+     0x0000001F,  // ......*****
+     0x0000007F,  // ....*******
+     0x000000E0,  // ...***.....
+     0x00000180,  // ..**.......
+     0x00000180,  // ..**.......
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000380,  // .***.......
+     0x000001E0,  // ..****.....
+     0x000000FC,  // ...******..
+     0x0000003F,  // .....******
+     0x00000007,  // ........***
+     0x00000003,  // .........**
+     0x00000007,  // ........***
+     0x0000003E,  // .....*****.
+     0x00000038,  // .....***...
   },
   {             // 243
      15, 25,
@@ -5916,19 +5916,19 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000FFE,  // ....***********
-     0x00001FFE,  // ...************
-     0x00003070,  // ..**.....***...
-     0x00003038,  // ..**......***..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006018,  // .**........**..
-     0x00006038,  // .**.......***..
-     0x00007030,  // .***......**...
-     0x00003870,  // ..***....***...
-     0x00001FE0,  // ...********....
-     0x00000FC0,  // ....******.....
+     0x000007FF,  // ....***********
+     0x00000FFF,  // ...************
+     0x00001838,  // ..**.....***...
+     0x0000181C,  // ..**......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000301C,  // .**.......***..
+     0x00003818,  // .***......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5945,18 +5945,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FE,  // .********
-     0x000001FE,  // .********
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
+     0x000000FF,  // .********
+     0x000000FF,  // .********
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5973,18 +5973,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6000,27 +6000,27 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00000CF0,  // ....**..****...
-     0x00001DF8,  // ...***.******..
-     0x0000318C,  // ..**...**...**.
-     0x0000618E,  // .**....**...***
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x00006186,  // .**....**....**
-     0x0000618E,  // .**....**...***
-     0x0000718C,  // .***...**...**.
-     0x0000319C,  // ..**...**..***.
-     0x00003DB8,  // ..****.**.***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
-     0x00000180,  // .......**......
+     0x00000678,  // ....**..****...
+     0x00000EFC,  // ...***.******..
+     0x000018C6,  // ..**...**...**.
+     0x000030C7,  // .**....**...***
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x000030C7,  // .**....**...***
+     0x000038C6,  // .***...**...**.
+     0x000018CE,  // ..**...**..***.
+     0x00001EDC,  // ..****.**.***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
   },
   {             // 247
-     12, 25,
+     13, 25,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6029,23 +6029,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000181C,  // .**......***.
-     0x00001C18,  // .***.....**..
-     0x00000C38,  // ..**....***..
-     0x00000E30,  // ..***...**...
-     0x00000660,  // ...**..**....
-     0x00000760,  // ...***.**....
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x000001C0,  // .....***.....
-     0x000003C0,  // ....****.....
-     0x000003E0,  // ....*****....
-     0x00000660,  // ...**..**....
-     0x00000630,  // ...**...**...
-     0x00000C30,  // ..**....**...
-     0x00000C18,  // ..**.....**..
-     0x00001818,  // .**......**..
-     0x0000380C,  // ***.......**.
+     0x00000C0E,  // .**......***.
+     0x00000E0C,  // .***.....**..
+     0x0000061C,  // ..**....***..
+     0x00000718,  // ..***...**...
+     0x00000330,  // ...**..**....
+     0x000003B0,  // ...***.**....
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x000000E0,  // .....***.....
+     0x000001E0,  // ....****.....
+     0x000001F0,  // ....*****....
+     0x00000330,  // ...**..**....
+     0x00000318,  // ...**...**...
+     0x00000618,  // ..**....**...
+     0x0000060C,  // ..**.....**..
+     0x00000C0C,  // .**......**..
+     0x00001C06,  // ***.......**.
   },
   {             // 248
      17, 25,
@@ -6057,22 +6057,22 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001860C,  // .**....**.....**.
-     0x0001860C,  // .**....**.....**.
-     0x0001860C,  // .**....**.....**.
-     0x0001861C,  // .**....**....***.
-     0x0001C61C,  // .***...**....***.
-     0x0000C638,  // ..**...**...***..
-     0x0000FFF8,  // ..*************..
-     0x00003FE0,  // ....*********....
-     0x00000600,  // .......**........
-     0x00000600,  // .......**........
-     0x00000600,  // .......**........
-     0x00000600,  // .......**........
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000C306,  // .**....**.....**.
+     0x0000C306,  // .**....**.....**.
+     0x0000C306,  // .**....**.....**.
+     0x0000C30E,  // .**....**....***.
+     0x0000E30E,  // .***...**....***.
+     0x0000631C,  // ..**...**...***..
+     0x00007FFC,  // ..*************..
+     0x00001FF0,  // ....*********....
+     0x00000300,  // .......**........
+     0x00000300,  // .......**........
+     0x00000300,  // .......**........
+     0x00000300,  // .......**........
      0x00000000,  // .................
   },
   {             // 249
@@ -6085,18 +6085,18 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0000C00C,  // ...**..........**.
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00038706,  // .***....***.....**
-     0x0001878C,  // ..**....****...**.
-     0x0001FCFC,  // ..*******..******.
-     0x00007878,  // ....****....****..
+     0x00006006,  // ...**..........**.
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x0001C383,  // .***....***.....**
+     0x0000C3C6,  // ..**....****...**.
+     0x0000FE7E,  // ..*******..******.
+     0x00003C3C,  // ....****....****..
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -6104,32 +6104,32 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
   },
   {             // 250
-     5, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000019E,  // .**..****
-     0x0000019E,  // .**..****
+     9, 25,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CF,  // .**..****
+     0x000000CF,  // .**..****
+     0x00000000,  // .........
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
   },
   {             // 251
      13, 25,
@@ -6137,22 +6137,22 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E18,  // ..***....**..
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000070C,  // ..***....**..
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6164,23 +6164,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x000000E0,  // ......***....
-     0x000000C0,  // ......**.....
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x000003F0,  // ....******...
-     0x000007F8,  // ...********..
-     0x00000E1C,  // ..***....***.
-     0x00001C0E,  // .***......***
-     0x0000180E,  // .**.......***
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180E,  // .**.......***
-     0x00001C0C,  // .***......**.
-     0x00000E1C,  // ..***....***.
-     0x000007F8,  // ...********..
-     0x000003F0,  // ....******...
+     0x000001F8,  // ....******...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000E07,  // .***......***
+     0x00000C07,  // .**.......***
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C07,  // .**.......***
+     0x00000E06,  // .***......**.
+     0x0000070E,  // ..***....***.
+     0x000003FC,  // ...********..
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6192,23 +6192,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000070,  // .......***...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
+     0x00000038,  // .......***...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000E18,  // ..***....**..
-     0x000007F8,  // ...********..
-     0x000003E0,  // ....*****....
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000070C,  // ..***....**..
+     0x000003FC,  // ...********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -6220,23 +6220,23 @@ cFont::tPixelData FontOsd_iso8859_7[][27] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x000001C0,  // ..........***.....
-     0x00000380,  // .........***......
-     0x00000300,  // .........**.......
+     0x000000E0,  // ..........***.....
+     0x000001C0,  // .........***......
+     0x00000180,  // .........**.......
      0x00000000,  // ..................
-     0x0000C018,  // ...**.........**..
-     0x0001800C,  // ..**...........**.
-     0x0001800C,  // ..**...........**.
-     0x0003830E,  // .***.....**....***
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x00030306,  // .**......**.....**
-     0x0003870E,  // .***....***....***
-     0x0001878C,  // ..**....****...**.
-     0x0001FCFC,  // ..*******..******.
-     0x00007870,  // ....****....***...
+     0x0000600C,  // ...**.........**..
+     0x0000C006,  // ..**...........**.
+     0x0000C006,  // ..**...........**.
+     0x0001C187,  // .***.....**....***
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x00018183,  // .**......**.....**
+     0x0001C387,  // .***....***....***
+     0x0000C3C6,  // ..**....****...**.
+     0x0000FE7E,  // ..*******..******.
+     0x00003C38,  // ....****....***...
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
diff --git a/fontsml.c b/fontsml-iso8859-1.c
similarity index 52%
rename from fontsml.c
rename to fontsml-iso8859-1.c
index fae029da6..d9c80a0a3 100644
--- a/fontsml.c
+++ b/fontsml-iso8859-1.c
@@ -30,20 +30,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000010,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -55,11 +55,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -81,19 +81,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000090,  // ...*..*...
-     0x00000090,  // ...*..*...
-     0x00000090,  // ...*..*...
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
-     0x00000120,  // ..*..*....
-     0x00000120,  // ..*..*....
-     0x00000120,  // ..*..*....
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -105,22 +105,22 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000020,  // .....*....
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000032C,  // .**..*.**.
-     0x00000320,  // .**..*....
-     0x000003A0,  // .***.*....
-     0x000001E0,  // ..****....
-     0x000000F8,  // ...*****..
-     0x0000003C,  // .....****.
-     0x00000026,  // .....*..**
-     0x00000326,  // .**..*..**
-     0x000003AE,  // .***.*.***
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000020,  // .....*....
-     0x00000020,  // .....*....
+     0x00000010,  // .....*....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000196,  // .**..*.**.
+     0x00000190,  // .**..*....
+     0x000001D0,  // .***.*....
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000001E,  // .....****.
+     0x00000013,  // .....*..**
+     0x00000193,  // .**..*..**
+     0x000001D7,  // .***.*.***
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000010,  // .....*....
+     0x00000010,  // .....*....
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -131,19 +131,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007860,  // ..****....**....
-     0x0000CCC0,  // .**..**..**.....
-     0x0000CCC0,  // .**..**..**.....
-     0x0000CD80,  // .**..**.**......
-     0x0000CD80,  // .**..**.**......
-     0x00007B00,  // ..****.**.......
-     0x00000300,  // .......**.......
-     0x00000678,  // ......**..****..
-     0x000006CC,  // ......**.**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x000018CC,  // ....**...**..**.
-     0x00001878,  // ....**....****..
+     0x00003C30,  // ..****....**....
+     0x00006660,  // .**..**..**.....
+     0x00006660,  // .**..**..**.....
+     0x000066C0,  // .**..**.**......
+     0x000066C0,  // .**..**.**......
+     0x00003D80,  // ..****.**.......
+     0x00000180,  // .......**.......
+     0x0000033C,  // ......**..****..
+     0x00000366,  // ......**.**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000C66,  // ....**...**..**.
+     0x00000C3C,  // ....**....****..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -156,19 +156,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000780,  // ...****......
-     0x00000FC0,  // ..******.....
-     0x00000CC0,  // ..**..**.....
-     0x00000CC0,  // ..**..**.....
-     0x00000780,  // ...****......
-     0x00000F80,  // ..*****......
-     0x00001DD8,  // .***.***.**..
-     0x000018D8,  // .**...**.**..
-     0x00001878,  // .**....****..
-     0x00001870,  // .**....***...
-     0x00001CF8,  // .***..*****..
-     0x00000FDC,  // ..******.***.
-     0x0000078E,  // ...****...***
+     0x000003C0,  // ...****......
+     0x000007E0,  // ..******.....
+     0x00000660,  // ..**..**.....
+     0x00000660,  // ..**..**.....
+     0x000003C0,  // ...****......
+     0x000007C0,  // ..*****......
+     0x00000EEC,  // .***.***.**..
+     0x00000C6C,  // .**...**.**..
+     0x00000C3C,  // .**....****..
+     0x00000C38,  // .**....***...
+     0x00000E7C,  // .***..*****..
+     0x000007EE,  // ..******.***.
+     0x000003C7,  // ...****...***
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -180,11 +180,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...
      0x00000000,  // ...
      0x00000000,  // ...
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
      0x00000000,  // ...
      0x00000000,  // ...
      0x00000000,  // ...
@@ -205,24 +205,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
   },
   {             // 41
      6, 22,
@@ -230,24 +230,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000020,  // .*....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000020,  // .*....
+     0x00000010,  // .*....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000010,  // .*....
   },
   {             // 42
      7, 22,
@@ -255,13 +255,13 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000010,  // ...*...
-     0x00000054,  // .*.*.*.
-     0x0000007C,  // .*****.
-     0x00000010,  // ...*...
-     0x0000007C,  // .*****.
-     0x00000054,  // .*.*.*.
-     0x00000010,  // ...*...
+     0x00000008,  // ...*...
+     0x0000002A,  // .*.*.*.
+     0x0000003E,  // .*****.
+     0x00000008,  // ...*...
+     0x0000003E,  // .*****.
+     0x0000002A,  // .*.*.*.
+     0x00000008,  // ...*...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -284,16 +284,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -317,11 +317,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
   },
   {             // 45
@@ -337,8 +337,8 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000007C,  // *****. added by hand to avoid flickering!!!
-     0x0000007C,  // *****.
+     0x0000003E,  // *****. added by hand to avoid flickering!!!
+     0x0000003E,  // *****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -367,8 +367,8 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -380,20 +380,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -406,19 +406,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -431,19 +431,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x000001F0,  // ..*****...
-     0x000001F0,  // ..*****...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
+     0x00000018,  // .....**...
+     0x000000F8,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -456,19 +456,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000000C,  // .......**.
-     0x0000001C,  // ......***.
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x000001C0,  // ..***.....
-     0x00000380,  // .***......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000078,  // ...****...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000006,  // .......**.
+     0x0000000E,  // ......***.
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -481,19 +481,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000018,  // ......**..
-     0x00000070,  // ....***...
-     0x00000078,  // ....****..
-     0x0000001C,  // ......***.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000000C,  // ......**..
+     0x00000038,  // ....***...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -506,19 +506,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000038,  // .....***..
-     0x00000078,  // ....****..
-     0x000000D8,  // ...**.**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000318,  // .**...**..
-     0x00000618,  // **....**..
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000001C,  // .....***..
+     0x0000003C,  // ....****..
+     0x0000006C,  // ...**.**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000018C,  // .**...**..
+     0x0000030C,  // **....**..
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -531,19 +531,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003F8,  // .*******..
-     0x000003F8,  // .*******..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003F0,  // .******...
-     0x000003F8,  // .*******..
-     0x0000031C,  // .**...***.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001F8,  // .******...
+     0x000001FC,  // .*******..
+     0x0000018E,  // .**...***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -556,19 +556,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000370,  // .**.***...
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000038C,  // .***...**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -581,19 +581,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x0000000C,  // .......**.
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -606,19 +606,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -631,19 +631,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000001FC,  // ..*******.
-     0x000000EC,  // ...***.**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x00000318,  // .**...**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -659,16 +659,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -684,19 +684,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
   },
   {             // 60
@@ -710,15 +710,15 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000003C,  // .....****.
-     0x000000F0,  // ...****...
-     0x000001C0,  // ..***.....
-     0x00000300,  // .**.......
-     0x000001C0,  // ..***.....
-     0x000000F0,  // ...****...
-     0x0000003C,  // .....****.
-     0x0000000C,  // .......**.
+     0x00000006,  // .......**.
+     0x0000001E,  // .....****.
+     0x00000078,  // ...****...
+     0x000000E0,  // ..***.....
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000001E,  // .....****.
+     0x00000006,  // .......**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -737,11 +737,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -760,15 +760,15 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x000003C0,  // .****.....
-     0x000000F0,  // ...****...
-     0x00000038,  // .....***..
-     0x0000000C,  // .......**.
-     0x00000038,  // .....***..
-     0x000000F0,  // ...****...
-     0x000003C0,  // .****.....
-     0x00000300,  // .**.......
+     0x00000180,  // .**.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -780,20 +780,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F8,  // .*******..
-     0x00000318,  // .**...**..
-     0x00000318,  // .**...**..
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -805,23 +805,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x00007038,  // ....***......***..
-     0x0000C018,  // ...**.........**..
-     0x00018F4C,  // ..**...****.*..**.
-     0x00019DCC,  // ..**..***.***..**.
-     0x000318CC,  // .**...**...**..**.
-     0x0003318C,  // .**..**...**...**.
-     0x00033198,  // .**..**...**..**..
-     0x00033198,  // .**..**...**..**..
-     0x00033330,  // .**..**..**..**...
-     0x00033FE0,  // .**..*********....
-     0x00019DC0,  // ..**..***.***.....
-     0x0001C000,  // ..***.............
-     0x0000E000,  // ...***............
-     0x00007FC0,  // ....*********.....
-     0x00001F80,  // ......******......
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000381C,  // ....***......***..
+     0x0000600C,  // ...**.........**..
+     0x0000C7A6,  // ..**...****.*..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x00018C66,  // .**...**...**..**.
+     0x000198C6,  // .**..**...**...**.
+     0x000198CC,  // .**..**...**..**..
+     0x000198CC,  // .**..**...**..**..
+     0x00019998,  // .**..**..**..**...
+     0x00019FF0,  // .**..*********....
+     0x0000CEE0,  // ..**..***.***.....
+     0x0000E000,  // ..***.............
+     0x00007000,  // ...***............
+     0x00003FE0,  // ....*********.....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
   },
   {             // 65
@@ -830,20 +830,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -855,20 +855,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FE0,  // .********....
-     0x00001FF0,  // .*********...
-     0x00001838,  // .**.....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001830,  // .**.....**...
-     0x00001FF0,  // .*********...
-     0x00001FF8,  // .**********..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00001FF8,  // .**********..
-     0x00001FF0,  // .*********...
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C18,  // .**.....**...
+     0x00000FF8,  // .*********...
+     0x00000FFC,  // .**********..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x00000FFC,  // .**********..
+     0x00000FF8,  // .*********...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -880,20 +880,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -905,20 +905,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FE0,  // .*********....
-     0x00003FF0,  // .**********...
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00003018,  // .**.......**..
-     0x00003038,  // .**......***..
-     0x00003FF0,  // .**********...
-     0x00003FE0,  // .*********....
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -930,20 +930,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -955,20 +955,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -980,20 +980,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007E0,  // .....******....
-     0x00001FF8,  // ...**********..
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x0000607C,  // .**......*****.
-     0x0000607C,  // .**......*****.
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FFC,  // ...***********.
-     0x000007EC,  // .....******.**.
+     0x000003F0,  // .....******....
+     0x00000FFC,  // ...**********..
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000303E,  // .**......*****.
+     0x0000303E,  // .**......*****.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFE,  // ...***********.
+     0x000003F6,  // .....******.**.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1005,20 +1005,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003FF8,  // .***********..
-     0x00003FF8,  // .***********..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001FFC,  // .***********..
+     0x00001FFC,  // .***********..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1030,20 +1030,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1055,45 +1055,45 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000618,  // **....**..
-     0x00000618,  // **....**..
-     0x00000738,  // ***..***..
-     0x000003F0,  // .******...
-     0x000001E0,  // ..****....
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000030C,  // **....**..
+     0x0000030C,  // **....**..
+     0x0000039C,  // ***..***..
+     0x000001F8,  // .******...
+     0x000000F0,  // ..****....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 75
-     13, 22,
+     14, 22,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000181C,  // ..**......***.
-     0x00001838,  // ..**.....***..
-     0x00001870,  // ..**....***...
-     0x000018E0,  // ..**...***....
-     0x000019C0,  // ..**..***.....
-     0x00001B80,  // ..**.***......
-     0x00001F00,  // ..*****.......
-     0x00001F80,  // ..******......
-     0x000019C0,  // ..**..***.....
-     0x000018E0,  // ..**...***....
-     0x00001870,  // ..**....***...
-     0x00001838,  // ..**.....***..
-     0x0000181C,  // ..**......***.
-     0x0000180E,  // ..**.......***
+     0x00000C0E,  // ..**......***.
+     0x00000C1C,  // ..**.....***..
+     0x00000C38,  // ..**....***...
+     0x00000C70,  // ..**...***....
+     0x00000CE0,  // ..**..***.....
+     0x00000DC0,  // ..**.***......
+     0x00000F80,  // ..*****.......
+     0x00000FC0,  // ..******......
+     0x00000CE0,  // ..**..***.....
+     0x00000C70,  // ..**...***....
+     0x00000C38,  // ..**....***...
+     0x00000C1C,  // ..**.....***..
+     0x00000C0E,  // ..**......***.
+     0x00000C07,  // ..**.......***
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1105,20 +1105,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1130,20 +1130,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x0000E01C,  // .***........***.
-     0x0000F03C,  // .****......****.
-     0x0000F03C,  // .****......****.
-     0x0000D86C,  // .**.**....**.**.
-     0x0000D86C,  // .**.**....**.**.
-     0x0000CCCC,  // .**..**..**..**.
-     0x0000CCCC,  // .**..**..**..**.
-     0x0000C48C,  // .**...*..*...**.
-     0x0000C78C,  // .**...****...**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00006C36,  // .**.**....**.**.
+     0x00006C36,  // .**.**....**.**.
+     0x00006666,  // .**..**..**..**.
+     0x00006666,  // .**..**..**..**.
+     0x00006246,  // .**...*..*...**.
+     0x000063C6,  // .**...****...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1155,20 +1155,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003818,  // .***......**..
-     0x00003C18,  // .****.....**..
-     0x00003C18,  // .****.....**..
-     0x00003618,  // .**.**....**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x00003198,  // .**...**..**..
-     0x00003198,  // .**...**..**..
-     0x000030D8,  // .**....**.**..
-     0x00003078,  // .**.....****..
-     0x00003078,  // .**.....****..
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1180,20 +1180,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1205,20 +1205,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FF0,  // ..********...
-     0x00000FF8,  // ..*********..
-     0x00000C1C,  // ..**.....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000FF8,  // ..*********..
-     0x00000FF0,  // ..********...
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x000007F8,  // ..********...
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000060E,  // ..**.....***.
+     0x000007FC,  // ..*********..
+     0x000007F8,  // ..********...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1230,21 +1230,21 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x000070DC,  // .***....**.***.
-     0x000030D8,  // ..**....**.**..
-     0x00003878,  // ..***....****..
-     0x00001FF0,  // ...*********...
-     0x000007D8,  // .....*****.**..
-     0x00000018,  // ...........**..
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000386E,  // .***....**.***.
+     0x0000186C,  // ..**....**.**..
+     0x00001C3C,  // ..***....****..
+     0x00000FF8,  // ...*********...
+     0x000003EC,  // .....*****.**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1255,20 +1255,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FE0,  // .*********....
-     0x00003FF0,  // .**********...
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003038,  // .**......***..
-     0x00003FF0,  // .**********...
-     0x00003FE0,  // .*********....
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
+     0x00001818,  // .**......**...
+     0x00001818,  // .**......**...
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1280,20 +1280,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003C0,  // ....****.....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x00001818,  // .**......**..
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000070,  // .......***...
-     0x00000038,  // ........***..
-     0x00000018,  // .........**..
-     0x00001818,  // .**......**..
-     0x00001C38,  // .***....***..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000001E0,  // ....****.....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x00000038,  // .......***...
+     0x0000001C,  // ........***..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1305,20 +1305,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1330,20 +1330,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1355,20 +1355,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1380,20 +1380,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x00030F0C,  // .**....****....**.
-     0x00018F18,  // ..**...****...**..
-     0x00018918,  // ..**...*..*...**..
-     0x00019998,  // ..**..**..**..**..
-     0x00019998,  // ..**..**..**..**..
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D0B0,  // ...**.*....*.**...
-     0x000070E0,  // ....***....***....
-     0x00006060,  // ....**......**....
-     0x00006060,  // ....**......**....
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018786,  // .**....****....**.
+     0x0000C78C,  // ..**...****...**..
+     0x0000C48C,  // ..**...*..*...**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006858,  // ...**.*....*.**...
+     0x00003870,  // ....***....***....
+     0x00003030,  // ....**......**....
+     0x00003030,  // ....**......**....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1405,20 +1405,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x00000360,  // ....**.**....
-     0x00000630,  // ...**...**...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1430,20 +1430,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000E70,  // ..***..***...
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1455,20 +1455,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1480,24 +1480,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
   },
   {             // 92
      5, 22,
@@ -1505,20 +1505,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1530,24 +1530,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
   },
   {             // 94
      9, 22,
@@ -1556,12 +1556,12 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x000000D8,  // ..**.**..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
+     0x00000010,  // ....*....
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1596,8 +1596,8 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
   },
   {             // 96
      4, 22,
@@ -1605,9 +1605,9 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000018,  // **..
-     0x0000000C,  // .**.
-     0x00000006,  // ..**
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1634,16 +1634,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1655,20 +1655,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1684,16 +1684,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1705,20 +1705,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1734,16 +1734,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1755,20 +1755,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1784,20 +1784,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
-     0x0000000C,  // ........**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000000E0,  // ....***....
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x00000070,  // ....***....
   },
   {             // 104
      10, 22,
@@ -1805,20 +1805,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1830,49 +1830,49 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 106
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
   },
   {             // 107
      9, 22,
@@ -1880,20 +1880,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x0000018C,  // .**...**.
-     0x00000198,  // .**..**..
-     0x000001B0,  // .**.**...
-     0x000001E0,  // .****....
-     0x000001F0,  // .*****...
-     0x000001B0,  // .**.**...
-     0x00000198,  // .**..**..
-     0x0000019C,  // .**..***.
-     0x0000018C,  // .**...**.
-     0x0000018E,  // .**...***
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C6,  // .**...**.
+     0x000000CC,  // .**..**..
+     0x000000D8,  // .**.**...
+     0x000000F0,  // .****....
+     0x000000F8,  // .*****...
+     0x000000D8,  // .**.**...
+     0x000000CC,  // .**..**..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1905,20 +1905,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1934,16 +1934,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000DE78,  // .**.****..****..
-     0x0000FFFC,  // .**************.
-     0x0000E38C,  // .***...***...**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
+     0x00006F3C,  // .**.****..****..
+     0x00007FFE,  // .**************.
+     0x000071C6,  // .***...***...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1959,16 +1959,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1984,16 +1984,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2009,20 +2009,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 113
      11, 22,
@@ -2034,20 +2034,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
   },
   {             // 114
      6, 22,
@@ -2059,16 +2059,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000036,  // .**.**
-     0x00000036,  // .**.**
-     0x00000038,  // .***..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2084,16 +2084,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2106,19 +2106,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000000E,  // ...***
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x00000007,  // ...***
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2134,16 +2134,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2159,16 +2159,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2184,16 +2184,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001A58,  // ..**.*..*.**..
-     0x00000A50,  // ...*.*..*.*...
-     0x00000E70,  // ...***..***...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D2C,  // ..**.*..*.**..
+     0x00000528,  // ...*.*..*.*...
+     0x00000738,  // ...***..***...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -2209,16 +2209,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2234,20 +2234,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   {             // 122
      9, 22,
@@ -2259,45 +2259,45 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 123
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ....**.
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000060,  // .**....
-     0x000000C0,  // **.....
-     0x00000060,  // .**....
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000018,  // ...**..
-     0x0000000C,  // ....**.
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000030,  // .**....
+     0x00000060,  // **.....
+     0x00000030,  // .**....
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000000C,  // ...**..
+     0x00000006,  // ....**.
   },
   {             // 124
      5, 22,
@@ -2305,24 +2305,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
   },
   {             // 125
      6, 22,
@@ -2330,24 +2330,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000060,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
   },
   {             // 126
      10, 22,
@@ -2362,9 +2362,9 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001CC,  // ..***..**.
-     0x000003FC,  // .********.
-     0x00000338,  // .**..***..
+     0x000000E6,  // ..***..**.
+     0x000001FE,  // .********.
+     0x0000019C,  // .**..***..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3234,20 +3234,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 162
      10, 22,
@@ -3257,20 +3257,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000010,  // ......*...
-     0x00000010,  // ......*...
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x000001AC,  // ..**.*.**.
-     0x00000320,  // .**..*....
-     0x00000320,  // .**..*....
-     0x00000320,  // .**..*....
-     0x00000320,  // .**..*....
-     0x000001AC,  // ..**.*.**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000040,  // ....*.....
-     0x00000040,  // ....*.....
+     0x00000008,  // ......*...
+     0x00000008,  // ......*...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000D6,  // ..**.*.**.
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x000000D6,  // ..**.*.**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000020,  // ....*.....
+     0x00000020,  // ....*.....
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -3281,19 +3281,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000300,  // .**.......
-     0x00000180,  // ..**......
-     0x000003F0,  // .******...
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000304,  // .**.....*.
-     0x000007FC,  // *********.
-     0x000006F8,  // **.*****..
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000180,  // .**.......
+     0x000000C0,  // ..**......
+     0x000001F8,  // .******...
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x00000182,  // .**.....*.
+     0x000003FE,  // *********.
+     0x0000037C,  // **.*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3309,13 +3309,13 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3331,19 +3331,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3355,24 +3355,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
   },
   {             // 167
      10, 22,
@@ -3380,24 +3380,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003C0,  // .****.....
-     0x000001F0,  // ..*****...
-     0x000001B8,  // ..**.***..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x0000038C,  // .***...**.
-     0x000001CC,  // ..***..**.
-     0x000000F8,  // ...*****..
-     0x00000038,  // .....***..
-     0x0000001C,  // ......***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001E0,  // .****.....
+     0x000000F8,  // ..*****...
+     0x000000DC,  // ..**.***..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000E6,  // ..***..**.
+     0x0000007C,  // ...*****..
+     0x0000001C,  // .....***..
+     0x0000000E,  // ......***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
   },
   {             // 168
      6, 22,
@@ -3405,8 +3405,8 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000006C,  // **.**.
-     0x0000006C,  // **.**.
+     0x00000036,  // **.**.
+     0x00000036,  // **.**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3430,20 +3430,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001830,  // ...**.....**...
-     0x00002008,  // ..*.........*..
-     0x00002388,  // ..*...***...*..
-     0x00004444,  // .*...*...*...*.
-     0x00004844,  // .*..*....*...*.
-     0x00004804,  // .*..*........*.
-     0x00004804,  // .*..*........*.
-     0x00004804,  // .*..*........*.
-     0x00004444,  // .*...*...*...*.
-     0x00002388,  // ..*...***...*..
-     0x00002008,  // ..*.........*..
-     0x00001830,  // ...**.....**...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000C18,  // ...**.....**...
+     0x00001004,  // ..*.........*..
+     0x000011C4,  // ..*...***...*..
+     0x00002222,  // .*...*...*...*.
+     0x00002422,  // .*..*....*...*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002222,  // .*...*...*...*.
+     0x000011C4,  // ..*...***...*..
+     0x00001004,  // ..*.........*..
+     0x00000C18,  // ...**.....**...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3455,14 +3455,14 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000004C,  // .*..**.
-     0x0000001C,  // ...***.
-     0x00000024,  // ..*..*.
-     0x0000006C,  // .**.**.
-     0x00000034,  // ..**.*.
+     0x0000001C,  // ..***..
+     0x00000026,  // .*..**.
+     0x0000000E,  // ...***.
+     0x00000012,  // ..*..*.
+     0x00000036,  // .**.**.
+     0x0000001A,  // ..**.*.
      0x00000000,  // .......
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3486,12 +3486,12 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000006C,  // ...**.**.
-     0x000000D8,  // ..**.**..
-     0x000001B0,  // .**.**...
-     0x000001B0,  // .**.**...
-     0x000000D8,  // ..**.**..
-     0x0000006C,  // ...**.**.
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3511,11 +3511,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3538,7 +3538,7 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000007C,  // *****.
+     0x0000003E,  // *****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3555,20 +3555,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00001830,  // ..**.....**...
-     0x00002008,  // .*.........*..
-     0x000027C8,  // .*..*****..*..
-     0x00004424,  // *...*....*..*.
-     0x00004424,  // *...*....*..*.
-     0x00004424,  // *...*....*..*.
-     0x000047C4,  // *...*****...*.
-     0x00004484,  // *...*..*....*.
-     0x00004444,  // *...*...*...*.
-     0x00002428,  // .*..*....*.*..
-     0x00002008,  // .*.........*..
-     0x00001830,  // ..**.....**...
-     0x000007C0,  // ....*****.....
+     0x000003E0,  // ....*****.....
+     0x00000C18,  // ..**.....**...
+     0x00001004,  // .*.........*..
+     0x000013E4,  // .*..*****..*..
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x000023E2,  // *...*****...*.
+     0x00002242,  // *...*..*....*.
+     0x00002222,  // *...*...*...*.
+     0x00001214,  // .*..*....*.*..
+     0x00001004,  // .*.........*..
+     0x00000C18,  // ..**.....**...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3581,7 +3581,7 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003E,  // *****
+     0x0000001F,  // *****
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -3606,11 +3606,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000006C,  // .**.**.
-     0x00000044,  // .*...*.
-     0x0000006C,  // .**.**.
-     0x00000038,  // ..***..
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3633,17 +3633,17 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3656,14 +3656,14 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000038,  // .***..
-     0x0000007C,  // *****.
-     0x0000004C,  // *..**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x0000007C,  // *****.
-     0x0000007C,  // *****.
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x0000003E,  // *****.
+     0x0000003E,  // *****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3681,14 +3681,14 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000038,  // .***..
-     0x0000007C,  // *****.
-     0x0000004C,  // *..**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000004C,  // *..**.
-     0x0000007C,  // *****.
-     0x00000038,  // .***..
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000026,  // *..**.
+     0x0000003E,  // *****.
+     0x0000001C,  // .***..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3705,9 +3705,9 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000006,  // ..**
-     0x0000000C,  // .**.
-     0x00000018,  // **..
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -3734,20 +3734,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000003FC,  // .********.
-     0x0000036C,  // .**.**.**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FE,  // .********.
+     0x000001B6,  // .**.**.**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
   },
   {             // 182
      10, 22,
@@ -3755,24 +3755,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000FC,  // ...******.
-     0x000001C8,  // ..***..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000001C8,  // ..***..*..
-     0x000000C8,  // ...**..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
+     0x0000007E,  // ...******.
+     0x000000E4,  // ..***..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000000E4,  // ..***..*..
+     0x00000064,  // ...**..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
   },
   {             // 183
      4, 22,
@@ -3788,8 +3788,8 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -3818,11 +3818,11 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x0000001C,  // .***.
-     0x00000006,  // ...**
-     0x00000036,  // **.**
-     0x0000003C,  // ****.
+     0x0000000C,  // .**..
+     0x0000000E,  // .***.
+     0x00000003,  // ...**
+     0x0000001B,  // **.**
+     0x0000001E,  // ****.
   },
   {             // 185
      6, 22,
@@ -3831,14 +3831,14 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000078,  // ****..
-     0x00000078,  // ****..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003C,  // ****..
+     0x0000003C,  // ****..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3855,14 +3855,14 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000006C,  // .**.**.
-     0x00000044,  // .*...*.
-     0x00000044,  // .*...*.
-     0x0000006C,  // .**.**.
-     0x00000038,  // ..***..
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
      0x00000000,  // .......
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3886,12 +3886,12 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001B0,  // .**.**...
-     0x000000D8,  // ..**.**..
-     0x0000006C,  // ...**.**.
-     0x0000006C,  // ...**.**.
-     0x000000D8,  // ..**.**..
-     0x000001B0,  // .**.**...
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3906,19 +3906,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003030,  // ..**......**...
-     0x0000F030,  // ****......**...
-     0x0000F060,  // ****.....**....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00003188,  // ..**...**...*..
-     0x00003118,  // ..**...*...**..
-     0x00003338,  // ..**..**..***..
-     0x00000678,  // .....**..****..
-     0x000006D8,  // .....**.**.**..
-     0x00000CFC,  // ....**..******.
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
+     0x00001818,  // ..**......**...
+     0x00007818,  // ****......**...
+     0x00007830,  // ****.....**....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x000018C4,  // ..**...**...*..
+     0x0000188C,  // ..**...*...**..
+     0x0000199C,  // ..**..**..***..
+     0x0000033C,  // .....**..****..
+     0x0000036C,  // .....**.**.**..
+     0x0000067E,  // ....**..******.
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3931,19 +3931,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003030,  // ..**......**...
-     0x0000F030,  // ****......**...
-     0x0000F060,  // ****.....**....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x000031B8,  // ..**...**.***..
-     0x0000317C,  // ..**...*.*****.
-     0x0000334C,  // ..**..**.*..**.
-     0x0000060C,  // .....**.....**.
-     0x00000618,  // .....**....**..
-     0x00000C30,  // ....**....**...
-     0x0000187C,  // ...**....*****.
-     0x0000187C,  // ...**....*****.
+     0x00001818,  // ..**......**...
+     0x00007818,  // ****......**...
+     0x00007830,  // ****.....**....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x000018DC,  // ..**...**.***..
+     0x000018BE,  // ..**...*.*****.
+     0x000019A6,  // ..**..**.*..**.
+     0x00000306,  // .....**.....**.
+     0x0000030C,  // .....**....**..
+     0x00000618,  // ....**....**...
+     0x00000C3E,  // ...**....*****.
+     0x00000C3E,  // ...**....*****.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3956,19 +3956,19 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00007030,  // .***......**...
-     0x0000F830,  // *****.....**...
-     0x00009860,  // *..**....**....
-     0x000030C0,  // ..**....**.....
-     0x000030C0,  // ..**....**.....
-     0x00009988,  // *..**..**...*..
-     0x0000F918,  // *****..*...**..
-     0x00007338,  // .***..**..***..
-     0x00000678,  // .....**..****..
-     0x000006D8,  // .....**.**.**..
-     0x00000CFC,  // ....**..******.
-     0x00001818,  // ...**......**..
-     0x00001818,  // ...**......**..
+     0x00003818,  // .***......**...
+     0x00007C18,  // *****.....**...
+     0x00004C30,  // *..**....**....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00004CC4,  // *..**..**...*..
+     0x00007C8C,  // *****..*...**..
+     0x0000399C,  // .***..**..***..
+     0x0000033C,  // .....**..****..
+     0x0000036C,  // .....**.**.**..
+     0x0000067E,  // ....**..******.
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3984,41 +3984,41 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000001C0,  // ..***.....
-     0x00000380,  // .***......
-     0x00000318,  // .**...**..
-     0x00000318,  // .**...**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
   },
   {             // 192
      13, 22,
-     0x00000600,  // ...**........
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
+     0x00000300,  // ...**........
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4026,24 +4026,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 193
      13, 22,
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4051,24 +4051,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 194
      13, 22,
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4076,24 +4076,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 195
      13, 22,
-     0x00000320,  // ....**..*....
-     0x000005A0,  // ...*.**.*....
-     0x000004C0,  // ...*..**.....
+     0x00000190,  // ....**..*....
+     0x000002D0,  // ...*.**.*....
+     0x00000260,  // ...*..**.....
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4102,23 +4102,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 196
      13, 22,
      0x00000000,  // .............
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4127,23 +4127,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 197
      13, 22,
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000240,  // ....*..*.....
-     0x00000240,  // ....*..*.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x00000120,  // ....*..*.....
+     0x00000120,  // ....*..*.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4155,20 +4155,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001FFC,  // ......***********.
-     0x00001FFC,  // ......***********.
-     0x00003600,  // .....**.**........
-     0x00003600,  // .....**.**........
-     0x00006600,  // ....**..**........
-     0x00006600,  // ....**..**........
-     0x0000C7F8,  // ...**...********..
-     0x0000C7F8,  // ...**...********..
-     0x0000FE00,  // ...*******........
-     0x0001FE00,  // ..********........
-     0x00018600,  // ..**....**........
-     0x00018600,  // ..**....**........
-     0x000307FC,  // .**.....*********.
-     0x000307FC,  // .**.....*********.
+     0x00000FFE,  // ......***********.
+     0x00000FFE,  // ......***********.
+     0x00001B00,  // .....**.**........
+     0x00001B00,  // .....**.**........
+     0x00003300,  // ....**..**........
+     0x00003300,  // ....**..**........
+     0x000063FC,  // ...**...********..
+     0x000063FC,  // ...**...********..
+     0x00007F00,  // ...*******........
+     0x0000FF00,  // ..********........
+     0x0000C300,  // ..**....**........
+     0x0000C300,  // ..**....**........
+     0x000183FE,  // .**.....*********.
+     0x000183FE,  // .**.....*********.
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4180,45 +4180,45 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000006C0,  // ....**.**.....
-     0x00000780,  // ....****......
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x000000C0,  // ......**......
+     0x00000060,  // .......**.....
+     0x00000360,  // ....**.**.....
+     0x000003C0,  // ....****......
   },
   {             // 200
      13, 22,
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x000000C0,  // ......**.....
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4226,24 +4226,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 201
      13, 22,
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4251,24 +4251,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 202
      13, 22,
-     0x000000C0,  // ......**.....
-     0x000001E0,  // .....****....
-     0x00000330,  // ....**..**...
+     0x00000060,  // ......**.....
+     0x000000F0,  // .....****....
+     0x00000198,  // ....**..**...
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4277,23 +4277,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 203
      13, 22,
      0x00000000,  // .............
-     0x00000330,  // ....**..**...
-     0x00000330,  // ....**..**...
+     0x00000198,  // ....**..**...
+     0x00000198,  // ....**..**...
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4301,24 +4301,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 204
      6, 22,
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4326,24 +4326,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 205
      6, 22,
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4351,24 +4351,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 206
      6, 22,
-     0x00000018,  // ..**..
-     0x0000003C,  // .****.
-     0x00000042,  // *....*
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000021,  // *....*
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4377,73 +4377,73 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 207
      6, 22,
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 208
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FE0,  // ..*********....
-     0x00003FF0,  // ..**********...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000FE0C,  // *******.....**.
-     0x0000FE0C,  // *******.....**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x00003FF0,  // ..**********...
-     0x00003FE0,  // ..*********....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ..*********....
+     0x00001FF8,  // ..**********...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00007F06,  // *******.....**.
+     0x00007F06,  // *******.....**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00001FF8,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 209
      14, 22,
-     0x00000320,  // .....**..*....
-     0x000005A0,  // ....*.**.*....
-     0x000004C0,  // ....*..**.....
+     0x00000190,  // .....**..*....
+     0x000002D0,  // ....*.**.*....
+     0x00000260,  // ....*..**.....
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003818,  // .***......**..
-     0x00003C18,  // .****.....**..
-     0x00003C18,  // .****.....**..
-     0x00003618,  // .**.**....**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x00003198,  // .**...**..**..
-     0x00003198,  // .**...**..**..
-     0x000030D8,  // .**....**.**..
-     0x00003078,  // .**.....****..
-     0x00003078,  // .**.....****..
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4451,24 +4451,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 210
      15, 22,
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4476,24 +4476,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 211
      15, 22,
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4501,24 +4501,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 212
      15, 22,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x00000660,  // .....**..**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4526,24 +4526,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 213
      15, 22,
-     0x00000320,  // ......**..*....
-     0x000005A0,  // .....*.**.*....
-     0x000004C0,  // .....*..**.....
+     0x00000190,  // ......**..*....
+     0x000002D0,  // .....*.**.*....
+     0x00000260,  // .....*..**.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4552,23 +4552,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 214
      15, 22,
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4585,15 +4585,15 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x00000606,  // **......**
+     0x00000303,  // **......**
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000303,  // **......**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4605,20 +4605,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007CC,  // .....*****..**.
-     0x00001FF8,  // ...**********..
-     0x00003830,  // ..***.....**...
-     0x00003078,  // ..**.....****..
-     0x000070DC,  // .***....**.***.
-     0x0000618C,  // .**....**...**.
-     0x0000630C,  // .**...**....**.
-     0x0000620C,  // .**...*.....**.
-     0x0000660C,  // .**..**.....**.
-     0x00006C1C,  // .**.**.....***.
-     0x00003818,  // ..***......**..
-     0x00003838,  // ..***.....***..
-     0x00006FF0,  // .**.********...
-     0x0000C7C0,  // **...*****.....
+     0x000003E6,  // .....*****..**.
+     0x00000FFC,  // ...**********..
+     0x00001C18,  // ..***.....**...
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x0000360E,  // .**.**.....***.
+     0x00001C0C,  // ..***......**..
+     0x00001C1C,  // ..***.....***..
+     0x000037F8,  // .**.********...
+     0x000063E0,  // **...*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4626,24 +4626,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 217
      14, 22,
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
+     0x00000300,  // ....**........
+     0x00000180,  // .....**.......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4651,24 +4651,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 218
      14, 22,
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4676,24 +4676,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 219
      14, 22,
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x00000660,  // ....**..**....
+     0x000000C0,  // ......**......
+     0x000001E0,  // .....****.....
+     0x00000330,  // ....**..**....
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4702,23 +4702,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 220
      14, 22,
      0x00000000,  // ..............
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
+     0x00000630,  // ...**...**....
+     0x00000630,  // ...**...**....
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4726,24 +4726,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
   },
   {             // 221
      13, 22,
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000E70,  // ..***..***...
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4755,20 +4755,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4780,20 +4780,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001B8,  // .**.***..
-     0x000001B8,  // .**.***..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001BC,  // .**.****.
-     0x000001B8,  // .**.***..
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DC,  // .**.***..
+     0x000000DC,  // .**.***..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DE,  // .**.****.
+     0x000000DC,  // .**.***..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4805,20 +4805,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4830,20 +4830,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4855,20 +4855,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000001E0,  // ...****....
-     0x00000330,  // ..**..**...
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4880,20 +4880,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000190,  // ...**..*...
-     0x000002D0,  // ..*.**.*...
-     0x00000260,  // ..*..**....
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4905,20 +4905,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000330,  // ..**..**...
-     0x00000330,  // ..**..**...
+     0x00000198,  // ..**..**...
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4930,20 +4930,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x00000120,  // ...*..*....
-     0x00000120,  // ...*..*....
-     0x000000C0,  // ....**.....
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x00000060,  // ....**.....
+     0x00000090,  // ...*..*....
+     0x00000090,  // ...*..*....
+     0x00000060,  // ....**.....
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4959,16 +4959,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00007EF0,  // ...******.****...
-     0x0000E7F8,  // ..***..********..
-     0x0000C30C,  // ..**....**....**.
-     0x0000070C,  // .......***....**.
-     0x00007FFC,  // ...*************.
-     0x0000E300,  // ..***...**.......
-     0x0000C300,  // ..**....**.......
-     0x0000C38C,  // ..**....***...**.
-     0x0000E7FC,  // ..***..*********.
-     0x00007AF0,  // ...****.*.****...
+     0x00003F78,  // ...******.****...
+     0x000073FC,  // ..***..********..
+     0x00006186,  // ..**....**....**.
+     0x00000386,  // .......***....**.
+     0x00003FFE,  // ...*************.
+     0x00007180,  // ..***...**.......
+     0x00006180,  // ..**....**.......
+     0x000061C6,  // ..**....***...**.
+     0x000073FE,  // ..***..*********.
+     0x00003D78,  // ...****.*.****...
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4984,20 +4984,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000060,  // ....**....
-     0x00000030,  // .....**...
-     0x000001B0,  // ..**.**...
-     0x000001E0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x000000D8,  // ..**.**...
+     0x000000F0,  // ..****....
   },
   {             // 232
      10, 22,
@@ -5005,20 +5005,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x00000060,  // ....**....
-     0x00000030,  // .....**...
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5030,20 +5030,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5055,20 +5055,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5080,20 +5080,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5105,20 +5105,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000018,  // **..
-     0x0000000C,  // .**.
-     0x00000006,  // ..**
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -5130,70 +5130,70 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000006,  // ..**
-     0x0000000C,  // .**.
-     0x00000018,  // **..
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 238
-     4, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // ..**..
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
   },
   {             // 239
-     4, 22,
+     5, 22,
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -5205,20 +5205,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x000001B0,  // ...**.**...
-     0x000001C0,  // ...***.....
-     0x00000260,  // ..*..**....
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x00000180,  // ..**.......
+     0x000000D8,  // ...**.**...
+     0x000000E0,  // ...***.....
+     0x00000130,  // ..*..**....
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5230,20 +5230,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C8,  // ...**..*..
-     0x00000168,  // ..*.**.*..
-     0x00000130,  // ..*..**...
+     0x00000064,  // ...**..*..
+     0x000000B4,  // ..*.**.*..
+     0x00000098,  // ..*..**...
      0x00000000,  // ..........
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5255,20 +5255,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5280,20 +5280,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5305,20 +5305,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000001E0,  // ...****....
-     0x00000330,  // ..**..**...
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5330,20 +5330,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000190,  // ...**..*...
-     0x000002D0,  // ..*.**.*...
-     0x00000260,  // ..*..**....
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5355,20 +5355,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
+     0x000000CC,  // ...**..**..
+     0x000000CC,  // ...**..**..
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5385,14 +5385,14 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5409,16 +5409,16 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E6,  // ....***..**
-     0x000003FC,  // ..********.
-     0x00000318,  // ..**...**..
-     0x0000063C,  // .**...****.
-     0x0000066C,  // .**..**.**.
-     0x000006CC,  // .**.**..**.
-     0x0000078C,  // .****...**.
-     0x00000318,  // ..**...**..
-     0x000007F8,  // .********..
-     0x00000CE0,  // **..***....
+     0x00000073,  // ....***..**
+     0x000001FE,  // ..********.
+     0x0000018C,  // ..**...**..
+     0x0000031E,  // .**...****.
+     0x00000336,  // .**..**.**.
+     0x00000366,  // .**.**..**.
+     0x000003C6,  // .****...**.
+     0x0000018C,  // ..**...**..
+     0x000003FC,  // .********..
+     0x00000670,  // **..***....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5430,20 +5430,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x00000060,  // ....**....
-     0x00000030,  // .....**...
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5455,20 +5455,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5480,20 +5480,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5505,20 +5505,20 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5530,24 +5530,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   {             // 254
      11, 22,
@@ -5555,24 +5555,24 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 255
      10, 22,
@@ -5580,23 +5580,23 @@ cFont::tPixelData FontSml_iso8859_1[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   };
diff --git a/fontsml-iso8859-15.c b/fontsml-iso8859-15.c
index e17aa1162..55776d2fe 100644
--- a/fontsml-iso8859-15.c
+++ b/fontsml-iso8859-15.c
@@ -30,20 +30,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000010,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -55,11 +55,11 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -81,19 +81,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000090,  // ...*..*...
-     0x00000090,  // ...*..*...
-     0x00000090,  // ...*..*...
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
-     0x00000120,  // ..*..*....
-     0x00000120,  // ..*..*....
-     0x00000120,  // ..*..*....
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -105,22 +105,22 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000020,  // .....*....
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000032C,  // .**..*.**.
-     0x00000320,  // .**..*....
-     0x000003A0,  // .***.*....
-     0x000001E0,  // ..****....
-     0x000000F8,  // ...*****..
-     0x0000003C,  // .....****.
-     0x00000026,  // .....*..**
-     0x00000326,  // .**..*..**
-     0x000003AE,  // .***.*.***
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000020,  // .....*....
-     0x00000020,  // .....*....
+     0x00000010,  // .....*....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000196,  // .**..*.**.
+     0x00000190,  // .**..*....
+     0x000001D0,  // .***.*....
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000001E,  // .....****.
+     0x00000013,  // .....*..**
+     0x00000193,  // .**..*..**
+     0x000001D7,  // .***.*.***
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000010,  // .....*....
+     0x00000010,  // .....*....
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -131,19 +131,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007860,  // ..****....**....
-     0x0000CCC0,  // .**..**..**.....
-     0x0000CCC0,  // .**..**..**.....
-     0x0000CD80,  // .**..**.**......
-     0x0000CD80,  // .**..**.**......
-     0x00007B00,  // ..****.**.......
-     0x00000300,  // .......**.......
-     0x00000678,  // ......**..****..
-     0x000006CC,  // ......**.**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x000018CC,  // ....**...**..**.
-     0x00001878,  // ....**....****..
+     0x00003C30,  // ..****....**....
+     0x00006660,  // .**..**..**.....
+     0x00006660,  // .**..**..**.....
+     0x000066C0,  // .**..**.**......
+     0x000066C0,  // .**..**.**......
+     0x00003D80,  // ..****.**.......
+     0x00000180,  // .......**.......
+     0x0000033C,  // ......**..****..
+     0x00000366,  // ......**.**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000C66,  // ....**...**..**.
+     0x00000C3C,  // ....**....****..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -156,19 +156,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000780,  // ...****......
-     0x00000FC0,  // ..******.....
-     0x00000CC0,  // ..**..**.....
-     0x00000CC0,  // ..**..**.....
-     0x00000780,  // ...****......
-     0x00000F80,  // ..*****......
-     0x00001DD8,  // .***.***.**..
-     0x000018D8,  // .**...**.**..
-     0x00001878,  // .**....****..
-     0x00001870,  // .**....***...
-     0x00001CF8,  // .***..*****..
-     0x00000FDC,  // ..******.***.
-     0x0000078E,  // ...****...***
+     0x000003C0,  // ...****......
+     0x000007E0,  // ..******.....
+     0x00000660,  // ..**..**.....
+     0x00000660,  // ..**..**.....
+     0x000003C0,  // ...****......
+     0x000007C0,  // ..*****......
+     0x00000EEC,  // .***.***.**..
+     0x00000C6C,  // .**...**.**..
+     0x00000C3C,  // .**....****..
+     0x00000C38,  // .**....***...
+     0x00000E7C,  // .***..*****..
+     0x000007EE,  // ..******.***.
+     0x000003C7,  // ...****...***
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -180,11 +180,11 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...
      0x00000000,  // ...
      0x00000000,  // ...
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
      0x00000000,  // ...
      0x00000000,  // ...
      0x00000000,  // ...
@@ -205,24 +205,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
   },
   {             // 41
      6, 22,
@@ -230,24 +230,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000020,  // .*....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000020,  // .*....
+     0x00000010,  // .*....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000010,  // .*....
   },
   {             // 42
      7, 22,
@@ -255,13 +255,13 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000010,  // ...*...
-     0x00000054,  // .*.*.*.
-     0x0000007C,  // .*****.
-     0x00000010,  // ...*...
-     0x0000007C,  // .*****.
-     0x00000054,  // .*.*.*.
-     0x00000010,  // ...*...
+     0x00000008,  // ...*...
+     0x0000002A,  // .*.*.*.
+     0x0000003E,  // .*****.
+     0x00000008,  // ...*...
+     0x0000003E,  // .*****.
+     0x0000002A,  // .*.*.*.
+     0x00000008,  // ...*...
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -284,16 +284,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -317,11 +317,11 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
   },
   {             // 45
@@ -337,8 +337,8 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000007C,  // *****. added by hand to avoid flickering!!!
-     0x0000007C,  // *****.
+     0x0000003E,  // *****. added by hand to avoid flickering!!!
+     0x0000003E,  // *****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -367,8 +367,8 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -380,20 +380,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -406,19 +406,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -431,19 +431,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x000001F0,  // ..*****...
-     0x000001F0,  // ..*****...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
+     0x00000018,  // .....**...
+     0x000000F8,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -456,19 +456,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000000C,  // .......**.
-     0x0000001C,  // ......***.
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x000001C0,  // ..***.....
-     0x00000380,  // .***......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000078,  // ...****...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000006,  // .......**.
+     0x0000000E,  // ......***.
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -481,19 +481,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000018,  // ......**..
-     0x00000070,  // ....***...
-     0x00000078,  // ....****..
-     0x0000001C,  // ......***.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000000C,  // ......**..
+     0x00000038,  // ....***...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -506,19 +506,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000038,  // .....***..
-     0x00000078,  // ....****..
-     0x000000D8,  // ...**.**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000318,  // .**...**..
-     0x00000618,  // **....**..
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000001C,  // .....***..
+     0x0000003C,  // ....****..
+     0x0000006C,  // ...**.**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000018C,  // .**...**..
+     0x0000030C,  // **....**..
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -531,19 +531,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003F8,  // .*******..
-     0x000003F8,  // .*******..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003F0,  // .******...
-     0x000003F8,  // .*******..
-     0x0000031C,  // .**...***.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001F8,  // .******...
+     0x000001FC,  // .*******..
+     0x0000018E,  // .**...***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -556,19 +556,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000370,  // .**.***...
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000038C,  // .***...**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -581,19 +581,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x0000000C,  // .......**.
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -606,19 +606,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -631,19 +631,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000001FC,  // ..*******.
-     0x000000EC,  // ...***.**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x00000318,  // .**...**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -659,16 +659,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -684,19 +684,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
   },
   {             // 60
@@ -710,15 +710,15 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000003C,  // .....****.
-     0x000000F0,  // ...****...
-     0x000001C0,  // ..***.....
-     0x00000300,  // .**.......
-     0x000001C0,  // ..***.....
-     0x000000F0,  // ...****...
-     0x0000003C,  // .....****.
-     0x0000000C,  // .......**.
+     0x00000006,  // .......**.
+     0x0000001E,  // .....****.
+     0x00000078,  // ...****...
+     0x000000E0,  // ..***.....
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000001E,  // .....****.
+     0x00000006,  // .......**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -737,11 +737,11 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -760,15 +760,15 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x000003C0,  // .****.....
-     0x000000F0,  // ...****...
-     0x00000038,  // .....***..
-     0x0000000C,  // .......**.
-     0x00000038,  // .....***..
-     0x000000F0,  // ...****...
-     0x000003C0,  // .****.....
-     0x00000300,  // .**.......
+     0x00000180,  // .**.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -780,20 +780,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F8,  // .*******..
-     0x00000318,  // .**...**..
-     0x00000318,  // .**...**..
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -805,23 +805,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x00007038,  // ....***......***..
-     0x0000C018,  // ...**.........**..
-     0x00018F4C,  // ..**...****.*..**.
-     0x00019DCC,  // ..**..***.***..**.
-     0x000318CC,  // .**...**...**..**.
-     0x0003318C,  // .**..**...**...**.
-     0x00033198,  // .**..**...**..**..
-     0x00033198,  // .**..**...**..**..
-     0x00033330,  // .**..**..**..**...
-     0x00033FE0,  // .**..*********....
-     0x00019DC0,  // ..**..***.***.....
-     0x0001C000,  // ..***.............
-     0x0000E000,  // ...***............
-     0x00007FC0,  // ....*********.....
-     0x00001F80,  // ......******......
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000381C,  // ....***......***..
+     0x0000600C,  // ...**.........**..
+     0x0000C7A6,  // ..**...****.*..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x00018C66,  // .**...**...**..**.
+     0x000198C6,  // .**..**...**...**.
+     0x000198CC,  // .**..**...**..**..
+     0x000198CC,  // .**..**...**..**..
+     0x00019998,  // .**..**..**..**...
+     0x00019FF0,  // .**..*********....
+     0x0000CEE0,  // ..**..***.***.....
+     0x0000E000,  // ..***.............
+     0x00007000,  // ...***............
+     0x00003FE0,  // ....*********.....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
   },
   {             // 65
@@ -830,20 +830,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -855,20 +855,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FE0,  // .********....
-     0x00001FF0,  // .*********...
-     0x00001838,  // .**.....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001830,  // .**.....**...
-     0x00001FF0,  // .*********...
-     0x00001FF8,  // .**********..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00001FF8,  // .**********..
-     0x00001FF0,  // .*********...
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C18,  // .**.....**...
+     0x00000FF8,  // .*********...
+     0x00000FFC,  // .**********..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x00000FFC,  // .**********..
+     0x00000FF8,  // .*********...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -880,20 +880,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -905,20 +905,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FE0,  // .*********....
-     0x00003FF0,  // .**********...
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00003018,  // .**.......**..
-     0x00003038,  // .**......***..
-     0x00003FF0,  // .**********...
-     0x00003FE0,  // .*********....
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -930,20 +930,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -955,20 +955,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
-     0x00000600,  // ..**........
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -980,20 +980,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007E0,  // .....******....
-     0x00001FF8,  // ...**********..
-     0x0000381C,  // ..***......***.
-     0x0000300C,  // ..**........**.
-     0x0000700C,  // .***........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x0000607C,  // .**......*****.
-     0x0000607C,  // .**......*****.
-     0x0000700C,  // .***........**.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FFC,  // ...***********.
-     0x000007EC,  // .....******.**.
+     0x000003F0,  // .....******....
+     0x00000FFC,  // ...**********..
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000303E,  // .**......*****.
+     0x0000303E,  // .**......*****.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFE,  // ...***********.
+     0x000003F6,  // .....******.**.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1005,20 +1005,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003FF8,  // .***********..
-     0x00003FF8,  // .***********..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001FFC,  // .***********..
+     0x00001FFC,  // .***********..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1030,20 +1030,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1055,45 +1055,45 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000618,  // **....**..
-     0x00000618,  // **....**..
-     0x00000738,  // ***..***..
-     0x000003F0,  // .******...
-     0x000001E0,  // ..****....
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000030C,  // **....**..
+     0x0000030C,  // **....**..
+     0x0000039C,  // ***..***..
+     0x000001F8,  // .******...
+     0x000000F0,  // ..****....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 75
-     13, 22,
+     14, 22,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000181C,  // ..**......***.
-     0x00001838,  // ..**.....***..
-     0x00001870,  // ..**....***...
-     0x000018E0,  // ..**...***....
-     0x000019C0,  // ..**..***.....
-     0x00001B80,  // ..**.***......
-     0x00001F00,  // ..*****.......
-     0x00001F80,  // ..******......
-     0x000019C0,  // ..**..***.....
-     0x000018E0,  // ..**...***....
-     0x00001870,  // ..**....***...
-     0x00001838,  // ..**.....***..
-     0x0000181C,  // ..**......***.
-     0x0000180E,  // ..**.......***
+     0x00000C0E,  // ..**......***.
+     0x00000C1C,  // ..**.....***..
+     0x00000C38,  // ..**....***...
+     0x00000C70,  // ..**...***....
+     0x00000CE0,  // ..**..***.....
+     0x00000DC0,  // ..**.***......
+     0x00000F80,  // ..*****.......
+     0x00000FC0,  // ..******......
+     0x00000CE0,  // ..**..***.....
+     0x00000C70,  // ..**...***....
+     0x00000C38,  // ..**....***...
+     0x00000C1C,  // ..**.....***..
+     0x00000C0E,  // ..**......***.
+     0x00000C07,  // ..**.......***
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1105,20 +1105,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1130,20 +1130,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x0000E01C,  // .***........***.
-     0x0000F03C,  // .****......****.
-     0x0000F03C,  // .****......****.
-     0x0000D86C,  // .**.**....**.**.
-     0x0000D86C,  // .**.**....**.**.
-     0x0000CCCC,  // .**..**..**..**.
-     0x0000CCCC,  // .**..**..**..**.
-     0x0000C48C,  // .**...*..*...**.
-     0x0000C78C,  // .**...****...**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00006C36,  // .**.**....**.**.
+     0x00006C36,  // .**.**....**.**.
+     0x00006666,  // .**..**..**..**.
+     0x00006666,  // .**..**..**..**.
+     0x00006246,  // .**...*..*...**.
+     0x000063C6,  // .**...****...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1155,20 +1155,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003818,  // .***......**..
-     0x00003C18,  // .****.....**..
-     0x00003C18,  // .****.....**..
-     0x00003618,  // .**.**....**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x00003198,  // .**...**..**..
-     0x00003198,  // .**...**..**..
-     0x000030D8,  // .**....**.**..
-     0x00003078,  // .**.....****..
-     0x00003078,  // .**.....****..
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1180,20 +1180,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1205,20 +1205,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000FF0,  // ..********...
-     0x00000FF8,  // ..*********..
-     0x00000C1C,  // ..**.....***.
-     0x00000C0C,  // ..**......**.
-     0x00000C0C,  // ..**......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000FF8,  // ..*********..
-     0x00000FF0,  // ..********...
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
+     0x000007F8,  // ..********...
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000060E,  // ..**.....***.
+     0x000007FC,  // ..*********..
+     0x000007F8,  // ..********...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1230,21 +1230,21 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x000070DC,  // .***....**.***.
-     0x000030D8,  // ..**....**.**..
-     0x00003878,  // ..***....****..
-     0x00001FF0,  // ...*********...
-     0x000007D8,  // .....*****.**..
-     0x00000018,  // ...........**..
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000386E,  // .***....**.***.
+     0x0000186C,  // ..**....**.**..
+     0x00001C3C,  // ..***....****..
+     0x00000FF8,  // ...*********...
+     0x000003EC,  // .....*****.**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1255,20 +1255,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FE0,  // .*********....
-     0x00003FF0,  // .**********...
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003038,  // .**......***..
-     0x00003FF0,  // .**********...
-     0x00003FE0,  // .*********....
-     0x00003030,  // .**......**...
-     0x00003030,  // .**......**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
+     0x00001818,  // .**......**...
+     0x00001818,  // .**......**...
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1280,20 +1280,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003C0,  // ....****.....
-     0x00000FF0,  // ..********...
-     0x00001C38,  // .***....***..
-     0x00001818,  // .**......**..
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000070,  // .......***...
-     0x00000038,  // ........***..
-     0x00000018,  // .........**..
-     0x00001818,  // .**......**..
-     0x00001C38,  // .***....***..
-     0x00000FF0,  // ..********...
-     0x000007E0,  // ...******....
+     0x000001E0,  // ....****.....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x00000038,  // .......***...
+     0x0000001C,  // ........***..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1305,20 +1305,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1330,20 +1330,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1355,20 +1355,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1380,20 +1380,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x00030F0C,  // .**....****....**.
-     0x00018F18,  // ..**...****...**..
-     0x00018918,  // ..**...*..*...**..
-     0x00019998,  // ..**..**..**..**..
-     0x00019998,  // ..**..**..**..**..
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D0B0,  // ...**.*....*.**...
-     0x000070E0,  // ....***....***....
-     0x00006060,  // ....**......**....
-     0x00006060,  // ....**......**....
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018786,  // .**....****....**.
+     0x0000C78C,  // ..**...****...**..
+     0x0000C48C,  // ..**...*..*...**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006858,  // ...**.*....*.**...
+     0x00003870,  // ....***....***....
+     0x00003030,  // ....**......**....
+     0x00003030,  // ....**......**....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1405,20 +1405,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x00000360,  // ....**.**....
-     0x00000630,  // ...**...**...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1430,20 +1430,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000E70,  // ..***..***...
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1455,20 +1455,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1480,24 +1480,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
   },
   {             // 92
      5, 22,
@@ -1505,20 +1505,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000006,  // ...**
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1530,24 +1530,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
   },
   {             // 94
      9, 22,
@@ -1556,12 +1556,12 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x000000D8,  // ..**.**..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
+     0x00000010,  // ....*....
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1596,8 +1596,8 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
   },
   {             // 96
      4, 22,
@@ -1605,9 +1605,9 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000018,  // **..
-     0x0000000C,  // .**.
-     0x00000006,  // ..**
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1634,16 +1634,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1655,20 +1655,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1684,16 +1684,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1705,20 +1705,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1734,16 +1734,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1755,20 +1755,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1784,20 +1784,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
-     0x0000000C,  // ........**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000000E0,  // ....***....
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x00000070,  // ....***....
   },
   {             // 104
      10, 22,
@@ -1805,20 +1805,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1830,49 +1830,49 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 106
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
   },
   {             // 107
      9, 22,
@@ -1880,20 +1880,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x0000018C,  // .**...**.
-     0x00000198,  // .**..**..
-     0x000001B0,  // .**.**...
-     0x000001E0,  // .****....
-     0x000001F0,  // .*****...
-     0x000001B0,  // .**.**...
-     0x00000198,  // .**..**..
-     0x0000019C,  // .**..***.
-     0x0000018C,  // .**...**.
-     0x0000018E,  // .**...***
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C6,  // .**...**.
+     0x000000CC,  // .**..**..
+     0x000000D8,  // .**.**...
+     0x000000F0,  // .****....
+     0x000000F8,  // .*****...
+     0x000000D8,  // .**.**...
+     0x000000CC,  // .**..**..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1905,20 +1905,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1934,16 +1934,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000DE78,  // .**.****..****..
-     0x0000FFFC,  // .**************.
-     0x0000E38C,  // .***...***...**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
+     0x00006F3C,  // .**.****..****..
+     0x00007FFE,  // .**************.
+     0x000071C6,  // .***...***...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1959,16 +1959,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1984,16 +1984,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2009,20 +2009,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 113
      11, 22,
@@ -2034,20 +2034,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
   },
   {             // 114
      6, 22,
@@ -2059,16 +2059,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000036,  // .**.**
-     0x00000036,  // .**.**
-     0x00000038,  // .***..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2084,16 +2084,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2106,19 +2106,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000000E,  // ...***
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x00000007,  // ...***
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2134,16 +2134,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2159,16 +2159,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2184,16 +2184,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001A58,  // ..**.*..*.**..
-     0x00000A50,  // ...*.*..*.*...
-     0x00000E70,  // ...***..***...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D2C,  // ..**.*..*.**..
+     0x00000528,  // ...*.*..*.*...
+     0x00000738,  // ...***..***...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -2209,16 +2209,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2234,20 +2234,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   {             // 122
      9, 22,
@@ -2259,45 +2259,45 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 123
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ....**.
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000060,  // .**....
-     0x000000C0,  // **.....
-     0x00000060,  // .**....
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000018,  // ...**..
-     0x0000000C,  // ....**.
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000030,  // .**....
+     0x00000060,  // **.....
+     0x00000030,  // .**....
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000000C,  // ...**..
+     0x00000006,  // ....**.
   },
   {             // 124
      5, 22,
@@ -2305,24 +2305,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
   },
   {             // 125
      6, 22,
@@ -2330,24 +2330,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000060,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
   },
   {             // 126
      10, 22,
@@ -2362,9 +2362,9 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001CC,  // ..***..**.
-     0x000003FC,  // .********.
-     0x00000338,  // .**..***..
+     0x000000E6,  // ..***..**.
+     0x000001FE,  // .********.
+     0x0000019C,  // .**..***..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3234,20 +3234,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
   },
   {             // 162
      10, 22,
@@ -3257,20 +3257,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000010,  // ......*...
-     0x00000010,  // ......*...
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x000001AC,  // ..**.*.**.
-     0x00000320,  // .**..*....
-     0x00000320,  // .**..*....
-     0x00000320,  // .**..*....
-     0x00000320,  // .**..*....
-     0x000001AC,  // ..**.*.**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000040,  // ....*.....
-     0x00000040,  // ....*.....
+     0x00000008,  // ......*...
+     0x00000008,  // ......*...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000D6,  // ..**.*.**.
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x000000D6,  // ..**.*.**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000020,  // ....*.....
+     0x00000020,  // ....*.....
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -3281,19 +3281,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000300,  // .**.......
-     0x00000180,  // ..**......
-     0x000003F0,  // .******...
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000304,  // .**.....*.
-     0x000007FC,  // *********.
-     0x000006F8,  // **.*****..
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000180,  // .**.......
+     0x000000C0,  // ..**......
+     0x000001F8,  // .******...
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x00000182,  // .**.....*.
+     0x000003FE,  // *********.
+     0x0000037C,  // **.*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3305,20 +3305,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00007F00,  // *******.......
-     0x00007F00,  // *******.......
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00007F00,  // *******.......
-     0x00007F00,  // *******.......
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00003F80,  // *******.......
+     0x00003F80,  // *******.......
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00003F80,  // *******.......
+     0x00003F80,  // *******.......
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3331,19 +3331,19 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3351,24 +3351,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 166
      13, 22,
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000078,  // .......****..
-     0x0000001C,  // .........***.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x0000003C,  // .......****..
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3380,24 +3380,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003C0,  // .****.....
-     0x000001F0,  // ..*****...
-     0x000001B8,  // ..**.***..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x0000038C,  // .***...**.
-     0x000001CC,  // ..***..**.
-     0x000000F8,  // ...*****..
-     0x00000038,  // .....***..
-     0x0000001C,  // ......***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001E0,  // .****.....
+     0x000000F8,  // ..*****...
+     0x000000DC,  // ..**.***..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000E6,  // ..***..**.
+     0x0000007C,  // ...*****..
+     0x0000001C,  // .....***..
+     0x0000000E,  // ......***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
   },
   {             // 168
      9, 22,
@@ -3405,20 +3405,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000198,  // .**..**..
-     0x000000F0,  // ..****...
-     0x00000060,  // ...**....
+     0x000000CC,  // .**..**..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3430,20 +3430,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001830,  // ...**.....**...
-     0x00002008,  // ..*.........*..
-     0x00002388,  // ..*...***...*..
-     0x00004444,  // .*...*...*...*.
-     0x00004844,  // .*..*....*...*.
-     0x00004804,  // .*..*........*.
-     0x00004804,  // .*..*........*.
-     0x00004804,  // .*..*........*.
-     0x00004444,  // .*...*...*...*.
-     0x00002388,  // ..*...***...*..
-     0x00002008,  // ..*.........*..
-     0x00001830,  // ...**.....**...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000C18,  // ...**.....**...
+     0x00001004,  // ..*.........*..
+     0x000011C4,  // ..*...***...*..
+     0x00002222,  // .*...*...*...*.
+     0x00002422,  // .*..*....*...*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002222,  // .*...*...*...*.
+     0x000011C4,  // ..*...***...*..
+     0x00001004,  // ..*.........*..
+     0x00000C18,  // ...**.....**...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3455,14 +3455,14 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000004C,  // .*..**.
-     0x0000001C,  // ...***.
-     0x00000024,  // ..*..*.
-     0x0000006C,  // .**.**.
-     0x00000034,  // ..**.*.
+     0x0000001C,  // ..***..
+     0x00000026,  // .*..**.
+     0x0000000E,  // ...***.
+     0x00000012,  // ..*..*.
+     0x00000036,  // .**.**.
+     0x0000001A,  // ..**.*.
      0x00000000,  // .......
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3486,12 +3486,12 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000006C,  // ...**.**.
-     0x000000D8,  // ..**.**..
-     0x000001B0,  // .**.**...
-     0x000001B0,  // .**.**...
-     0x000000D8,  // ..**.**..
-     0x0000006C,  // ...**.**.
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3511,11 +3511,11 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3538,7 +3538,7 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000007C,  // *****.
+     0x0000003E,  // *****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3555,20 +3555,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007C0,  // ....*****.....
-     0x00001830,  // ..**.....**...
-     0x00002008,  // .*.........*..
-     0x000027C8,  // .*..*****..*..
-     0x00004424,  // *...*....*..*.
-     0x00004424,  // *...*....*..*.
-     0x00004424,  // *...*....*..*.
-     0x000047C4,  // *...*****...*.
-     0x00004484,  // *...*..*....*.
-     0x00004444,  // *...*...*...*.
-     0x00002428,  // .*..*....*.*..
-     0x00002008,  // .*.........*..
-     0x00001830,  // ..**.....**...
-     0x000007C0,  // ....*****.....
+     0x000003E0,  // ....*****.....
+     0x00000C18,  // ..**.....**...
+     0x00001004,  // .*.........*..
+     0x000013E4,  // .*..*****..*..
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x000023E2,  // *...*****...*.
+     0x00002242,  // *...*..*....*.
+     0x00002222,  // *...*...*...*.
+     0x00001214,  // .*..*....*.*..
+     0x00001004,  // .*.........*..
+     0x00000C18,  // ..**.....**...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3581,7 +3581,7 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003E,  // *****
+     0x0000001F,  // *****
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -3606,11 +3606,11 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000006C,  // .**.**.
-     0x00000044,  // .*...*.
-     0x0000006C,  // .**.**.
-     0x00000038,  // ..***..
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3633,17 +3633,17 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3656,14 +3656,14 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000038,  // .***..
-     0x0000007C,  // *****.
-     0x0000004C,  // *..**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x0000007C,  // *****.
-     0x0000007C,  // *****.
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x0000003E,  // *****.
+     0x0000003E,  // *****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3681,14 +3681,14 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000038,  // .***..
-     0x0000007C,  // *****.
-     0x0000004C,  // *..**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000004C,  // *..**.
-     0x0000007C,  // *****.
-     0x00000038,  // .***..
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000026,  // *..**.
+     0x0000003E,  // *****.
+     0x0000001C,  // .***..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3701,24 +3701,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 180
      12, 22,
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
+     0x0000018C,  // ...**...**..
+     0x000000D8,  // ....**.**...
+     0x00000070,  // .....***....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3734,20 +3734,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000003FC,  // .********.
-     0x0000036C,  // .**.**.**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FE,  // .********.
+     0x000001B6,  // .**.**.**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
   },
   {             // 182
      10, 22,
@@ -3755,24 +3755,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000FC,  // ...******.
-     0x000001C8,  // ..***..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000003C8,  // .****..*..
-     0x000001C8,  // ..***..*..
-     0x000000C8,  // ...**..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
+     0x0000007E,  // ...******.
+     0x000000E4,  // ..***..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000000E4,  // ..***..*..
+     0x00000064,  // ...**..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
   },
   {             // 183
      4, 22,
@@ -3788,8 +3788,8 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -3805,20 +3805,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000198,  // .**..**..
-     0x000000F0,  // ..****...
-     0x00000060,  // ...**....
+     0x000000CC,  // .**..**..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3831,14 +3831,14 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000078,  // ****..
-     0x00000078,  // ****..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003C,  // ****..
+     0x0000003C,  // ****..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3855,14 +3855,14 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000006C,  // .**.**.
-     0x00000044,  // .*...*.
-     0x00000044,  // .*...*.
-     0x0000006C,  // .**.**.
-     0x00000038,  // ..***..
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
      0x00000000,  // .......
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3886,12 +3886,12 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001B0,  // .**.**...
-     0x000000D8,  // ..**.**..
-     0x0000006C,  // ...**.**.
-     0x0000006C,  // ...**.**.
-     0x000000D8,  // ..**.**..
-     0x000001B0,  // .**.**...
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3905,20 +3905,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x000077FC,  // .....***.*********.
-     0x0001FFFC,  // ...***************.
-     0x00038E00,  // ..***...***........
-     0x00030600,  // ..**.....**........
-     0x00070600,  // .***.....**........
-     0x00060600,  // .**......**........
-     0x000607F8,  // .**......********..
-     0x000607F8,  // .**......********..
-     0x00060600,  // .**......**........
-     0x00070600,  // .***.....**........
-     0x00030600,  // ..**.....**........
-     0x00038E00,  // ..***...***........
-     0x0001FFFC,  // ...***************.
-     0x000077FC,  // .....***.*********.
+     0x00003BFE,  // .....***.*********.
+     0x0000FFFE,  // ...***************.
+     0x0001C700,  // ..***...***........
+     0x00018300,  // ..**.....**........
+     0x00038300,  // .***.....**........
+     0x00030300,  // .**......**........
+     0x000303FC,  // .**......********..
+     0x000303FC,  // .**......********..
+     0x00030300,  // .**......**........
+     0x00038300,  // .***.....**........
+     0x00018300,  // ..**.....**........
+     0x0001C700,  // ..***...***........
+     0x0000FFFE,  // ...***************.
+     0x00003BFE,  // .....***.*********.
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -3934,16 +3934,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00007CF0,  // ...*****..****...
-     0x0000FFF8,  // ..*************..
-     0x0000C70C,  // ..**...***....**.
-     0x0001830C,  // .**.....**....**.
-     0x000183FC,  // .**.....********.
-     0x00018300,  // .**.....**.......
-     0x00018300,  // .**.....**.......
-     0x0000C78C,  // ..**...****...**.
-     0x0000FFFC,  // ..**************.
-     0x00007CF0,  // ...*****..****...
+     0x00003E78,  // ...*****..****...
+     0x00007FFC,  // ..*************..
+     0x00006386,  // ..**...***....**.
+     0x0000C186,  // .**.....**....**.
+     0x0000C1FE,  // .**.....********.
+     0x0000C180,  // .**.....**.......
+     0x0000C180,  // .**.....**.......
+     0x000063C6,  // ..**...****...**.
+     0x00007FFE,  // ..**************.
+     0x00003E78,  // ...*****..****...
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -3952,23 +3952,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 190
      14, 22,
      0x00000000,  // ..............
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3984,41 +3984,41 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000001C0,  // ..***.....
-     0x00000380,  // .***......
-     0x00000318,  // .**...**..
-     0x00000318,  // .**...**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
   },
   {             // 192
      13, 22,
-     0x00000600,  // ...**........
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
+     0x00000300,  // ...**........
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4026,24 +4026,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 193
      13, 22,
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4051,24 +4051,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 194
      13, 22,
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4076,24 +4076,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 195
      13, 22,
-     0x00000320,  // ....**..*....
-     0x000005A0,  // ...*.**.*....
-     0x000004C0,  // ...*..**.....
+     0x00000190,  // ....**..*....
+     0x000002D0,  // ...*.**.*....
+     0x00000260,  // ...*..**.....
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4102,23 +4102,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 196
      13, 22,
      0x00000000,  // .............
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4127,23 +4127,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 197
      13, 22,
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x00000240,  // ....*..*.....
-     0x00000240,  // ....*..*.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x000003C0,  // ....****.....
-     0x000003C0,  // ....****.....
-     0x00000660,  // ...**..**....
-     0x00000660,  // ...**..**....
-     0x00000C30,  // ..**....**...
-     0x00000C30,  // ..**....**...
-     0x00000FF0,  // ..********...
-     0x00001FF8,  // .**********..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x00000120,  // ....*..*.....
+     0x00000120,  // ....*..*.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4155,20 +4155,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00001FFC,  // ......***********.
-     0x00001FFC,  // ......***********.
-     0x00003600,  // .....**.**........
-     0x00003600,  // .....**.**........
-     0x00006600,  // ....**..**........
-     0x00006600,  // ....**..**........
-     0x0000C7F8,  // ...**...********..
-     0x0000C7F8,  // ...**...********..
-     0x0000FE00,  // ...*******........
-     0x0001FE00,  // ..********........
-     0x00018600,  // ..**....**........
-     0x00018600,  // ..**....**........
-     0x000307FC,  // .**.....*********.
-     0x000307FC,  // .**.....*********.
+     0x00000FFE,  // ......***********.
+     0x00000FFE,  // ......***********.
+     0x00001B00,  // .....**.**........
+     0x00001B00,  // .....**.**........
+     0x00003300,  // ....**..**........
+     0x00003300,  // ....**..**........
+     0x000063FC,  // ...**...********..
+     0x000063FC,  // ...**...********..
+     0x00007F00,  // ...*******........
+     0x0000FF00,  // ..********........
+     0x0000C300,  // ..**....**........
+     0x0000C300,  // ..**....**........
+     0x000183FE,  // .**.....*********.
+     0x000183FE,  // .**.....*********.
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4180,45 +4180,45 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
-     0x00000180,  // ......**......
-     0x000000C0,  // .......**.....
-     0x000006C0,  // ....**.**.....
-     0x00000780,  // ....****......
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x000000C0,  // ......**......
+     0x00000060,  // .......**.....
+     0x00000360,  // ....**.**.....
+     0x000003C0,  // ....****......
   },
   {             // 200
      13, 22,
-     0x00000300,  // ....**.......
-     0x00000180,  // .....**......
-     0x000000C0,  // ......**.....
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4226,24 +4226,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 201
      13, 22,
-     0x00000030,  // ........**...
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4251,24 +4251,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 202
      13, 22,
-     0x000000C0,  // ......**.....
-     0x000001E0,  // .....****....
-     0x00000330,  // ....**..**...
+     0x00000060,  // ......**.....
+     0x000000F0,  // .....****....
+     0x00000198,  // ....**..**...
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4277,23 +4277,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 203
      13, 22,
      0x00000000,  // .............
-     0x00000330,  // ....**..**...
-     0x00000330,  // ....**..**...
+     0x00000198,  // ....**..**...
+     0x00000198,  // ....**..**...
      0x00000000,  // .............
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FF8,  // ..*********..
-     0x00000FF8,  // ..*********..
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000C00,  // ..**.........
-     0x00000FFC,  // ..**********.
-     0x00000FFC,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4301,24 +4301,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 204
      6, 22,
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4326,24 +4326,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 205
      6, 22,
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4351,24 +4351,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 206
      6, 22,
-     0x00000018,  // ..**..
-     0x0000003C,  // .****.
-     0x00000042,  // *....*
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000021,  // *....*
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4377,73 +4377,73 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 207
      6, 22,
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 208
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FE0,  // ..*********....
-     0x00003FF0,  // ..**********...
-     0x00003038,  // ..**......***..
-     0x00003018,  // ..**.......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000FE0C,  // *******.....**.
-     0x0000FE0C,  // *******.....**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00003018,  // ..**.......**..
-     0x00003038,  // ..**......***..
-     0x00003FF0,  // ..**********...
-     0x00003FE0,  // ..*********....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ..*********....
+     0x00001FF8,  // ..**********...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00007F06,  // *******.....**.
+     0x00007F06,  // *******.....**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00001FF8,  // ..**********...
+     0x00001FF0,  // ..*********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 209
      14, 22,
-     0x00000320,  // .....**..*....
-     0x000005A0,  // ....*.**.*....
-     0x000004C0,  // ....*..**.....
+     0x00000190,  // .....**..*....
+     0x000002D0,  // ....*.**.*....
+     0x00000260,  // ....*..**.....
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003818,  // .***......**..
-     0x00003C18,  // .****.....**..
-     0x00003C18,  // .****.....**..
-     0x00003618,  // .**.**....**..
-     0x00003318,  // .**..**...**..
-     0x00003318,  // .**..**...**..
-     0x00003198,  // .**...**..**..
-     0x00003198,  // .**...**..**..
-     0x000030D8,  // .**....**.**..
-     0x00003078,  // .**.....****..
-     0x00003078,  // .**.....****..
-     0x00003038,  // .**......***..
-     0x00003018,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4451,24 +4451,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 210
      15, 22,
-     0x00000C00,  // ....**.........
-     0x00000600,  // .....**........
-     0x00000300,  // ......**.......
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4476,24 +4476,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 211
      15, 22,
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
-     0x00000300,  // ......**.......
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4501,24 +4501,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 212
      15, 22,
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x00000660,  // .....**..**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4526,24 +4526,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 213
      15, 22,
-     0x00000320,  // ......**..*....
-     0x000005A0,  // .....*.**.*....
-     0x000004C0,  // .....*..**.....
+     0x00000190,  // ......**..*....
+     0x000002D0,  // .....*.**.*....
+     0x00000260,  // .....*..**.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4552,23 +4552,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 214
      15, 22,
      0x00000000,  // ...............
-     0x00000660,  // .....**..**....
-     0x00000660,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4585,15 +4585,15 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x00000606,  // **......**
+     0x00000303,  // **......**
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000303,  // **......**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4605,20 +4605,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007CC,  // .....*****..**.
-     0x00001FF8,  // ...**********..
-     0x00003830,  // ..***.....**...
-     0x00003078,  // ..**.....****..
-     0x000070DC,  // .***....**.***.
-     0x0000618C,  // .**....**...**.
-     0x0000630C,  // .**...**....**.
-     0x0000620C,  // .**...*.....**.
-     0x0000660C,  // .**..**.....**.
-     0x00006C1C,  // .**.**.....***.
-     0x00003818,  // ..***......**..
-     0x00003838,  // ..***.....***..
-     0x00006FF0,  // .**.********...
-     0x0000C7C0,  // **...*****.....
+     0x000003E6,  // .....*****..**.
+     0x00000FFC,  // ...**********..
+     0x00001C18,  // ..***.....**...
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x0000360E,  // .**.**.....***.
+     0x00001C0C,  // ..***......**..
+     0x00001C1C,  // ..***.....***..
+     0x000037F8,  // .**.********...
+     0x000063E0,  // **...*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4626,24 +4626,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 217
      14, 22,
-     0x00000600,  // ....**........
-     0x00000300,  // .....**.......
-     0x00000180,  // ......**......
+     0x00000300,  // ....**........
+     0x00000180,  // .....**.......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4651,24 +4651,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 218
      14, 22,
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
-     0x00000300,  // .....**.......
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4676,24 +4676,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 219
      14, 22,
-     0x00000180,  // ......**......
-     0x000003C0,  // .....****.....
-     0x00000660,  // ....**..**....
+     0x000000C0,  // ......**......
+     0x000001E0,  // .....****.....
+     0x00000330,  // ....**..**....
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4702,23 +4702,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 220
      14, 22,
      0x00000000,  // ..............
-     0x00000C60,  // ...**...**....
-     0x00000C60,  // ...**...**....
+     0x00000630,  // ...**...**....
+     0x00000630,  // ...**...**....
      0x00000000,  // ..............
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x00001830,  // ..**.....**...
-     0x00001FF0,  // ..*********...
-     0x000007C0,  // ....*****.....
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4726,24 +4726,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
   },
   {             // 221
      13, 22,
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000300C,  // **........**.
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00000C30,  // ..**....**...
-     0x00000E70,  // ..***..***...
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4755,20 +4755,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4780,20 +4780,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001B8,  // .**.***..
-     0x000001B8,  // .**.***..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001BC,  // .**.****.
-     0x000001B8,  // .**.***..
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DC,  // .**.***..
+     0x000000DC,  // .**.***..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DE,  // .**.****.
+     0x000000DC,  // .**.***..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4805,20 +4805,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4830,20 +4830,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4855,20 +4855,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000001E0,  // ...****....
-     0x00000330,  // ..**..**...
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4880,20 +4880,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000190,  // ...**..*...
-     0x000002D0,  // ..*.**.*...
-     0x00000260,  // ..*..**....
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4905,20 +4905,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000330,  // ..**..**...
-     0x00000330,  // ..**..**...
+     0x00000198,  // ..**..**...
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4930,20 +4930,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x00000120,  // ...*..*....
-     0x00000120,  // ...*..*....
-     0x000000C0,  // ....**.....
-     0x000003F0,  // ..******...
-     0x00000738,  // .***..***..
-     0x00000618,  // .**....**..
-     0x00000038,  // ......***..
-     0x000003F8,  // ..*******..
-     0x00000718,  // .***...**..
-     0x00000618,  // .**....**..
-     0x00000618,  // .**....**..
-     0x0000073C,  // .***..****.
-     0x000003CC,  // ..****..**.
+     0x00000060,  // ....**.....
+     0x00000090,  // ...*..*....
+     0x00000090,  // ...*..*....
+     0x00000060,  // ....**.....
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4959,16 +4959,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00007EF0,  // ...******.****...
-     0x0000E7F8,  // ..***..********..
-     0x0000C30C,  // ..**....**....**.
-     0x0000070C,  // .......***....**.
-     0x00007FFC,  // ...*************.
-     0x0000E300,  // ..***...**.......
-     0x0000C300,  // ..**....**.......
-     0x0000C38C,  // ..**....***...**.
-     0x0000E7FC,  // ..***..*********.
-     0x00007AF0,  // ...****.*.****...
+     0x00003F78,  // ...******.****...
+     0x000073FC,  // ..***..********..
+     0x00006186,  // ..**....**....**.
+     0x00000386,  // .......***....**.
+     0x00003FFE,  // ...*************.
+     0x00007180,  // ..***...**.......
+     0x00006180,  // ..**....**.......
+     0x000061C6,  // ..**....***...**.
+     0x000073FE,  // ..***..*********.
+     0x00003D78,  // ...****.*.****...
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4984,20 +4984,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000060,  // ....**....
-     0x00000030,  // .....**...
-     0x000001B0,  // ..**.**...
-     0x000001E0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x000000D8,  // ..**.**...
+     0x000000F0,  // ..****....
   },
   {             // 232
      10, 22,
@@ -5005,20 +5005,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x00000060,  // ....**....
-     0x00000030,  // .....**...
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5030,20 +5030,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5055,20 +5055,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5080,20 +5080,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5105,20 +5105,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000018,  // **..
-     0x0000000C,  // .**.
-     0x00000006,  // ..**
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -5130,70 +5130,70 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000006,  // ..**
-     0x0000000C,  // .**.
-     0x00000018,  // **..
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 238
-     4, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // ..**..
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
   },
   {             // 239
-     4, 22,
+     5, 22,
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -5205,20 +5205,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000300,  // ..**.......
-     0x000001B0,  // ...**.**...
-     0x000001C0,  // ...***.....
-     0x00000260,  // ..*..**....
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x00000180,  // ..**.......
+     0x000000D8,  // ...**.**...
+     0x000000E0,  // ...***.....
+     0x00000130,  // ..*..**....
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5230,20 +5230,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C8,  // ...**..*..
-     0x00000168,  // ..*.**.*..
-     0x00000130,  // ..*..**...
+     0x00000064,  // ...**..*..
+     0x000000B4,  // ..*.**.*..
+     0x00000098,  // ..*..**...
      0x00000000,  // ..........
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5255,20 +5255,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000180,  // ...**......
-     0x000000C0,  // ....**.....
-     0x00000060,  // .....**....
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5280,20 +5280,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5305,20 +5305,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000C0,  // ....**.....
-     0x000001E0,  // ...****....
-     0x00000330,  // ..**..**...
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5330,20 +5330,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000190,  // ...**..*...
-     0x000002D0,  // ..*.**.*...
-     0x00000260,  // ..*..**....
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5355,20 +5355,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
+     0x000000CC,  // ...**..**..
+     0x000000CC,  // ...**..**..
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5385,14 +5385,14 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5409,16 +5409,16 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E6,  // ....***..**
-     0x000003FC,  // ..********.
-     0x00000318,  // ..**...**..
-     0x0000063C,  // .**...****.
-     0x0000066C,  // .**..**.**.
-     0x000006CC,  // .**.**..**.
-     0x0000078C,  // .****...**.
-     0x00000318,  // ..**...**..
-     0x000007F8,  // .********..
-     0x00000CE0,  // **..***....
+     0x00000073,  // ....***..**
+     0x000001FE,  // ..********.
+     0x0000018C,  // ..**...**..
+     0x0000031E,  // .**...****.
+     0x00000336,  // .**..**.**.
+     0x00000366,  // .**.**..**.
+     0x000003C6,  // .****...**.
+     0x0000018C,  // ..**...**..
+     0x000003FC,  // .********..
+     0x00000670,  // **..***....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5430,20 +5430,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x00000060,  // ....**....
-     0x00000030,  // .....**...
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5455,20 +5455,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5480,20 +5480,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5505,20 +5505,20 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5530,24 +5530,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   {             // 254
      11, 22,
@@ -5555,24 +5555,24 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 255
      10, 22,
@@ -5580,23 +5580,23 @@ cFont::tPixelData FontSml_iso8859_15[][24] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   };
diff --git a/fontsml-iso8859-2.c b/fontsml-iso8859-2.c
index ce5b35ee0..9f09d3bbc 100644
--- a/fontsml-iso8859-2.c
+++ b/fontsml-iso8859-2.c
@@ -32,20 +32,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000010,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -58,11 +58,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000036,  // **.**
-     0x00000024,  // *..*.
-     0x00000024,  // *..*.
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x00000012,  // *..*.
+     0x00000012,  // *..*.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -85,19 +85,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x00000048,  // ....*..*..
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000090,  // ...*..*...
-     0x00000090,  // ...*..*...
-     0x00000090,  // ...*..*...
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
-     0x00000120,  // ..*..*....
-     0x00000120,  // ..*..*....
-     0x00000120,  // ..*..*....
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -110,22 +110,22 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000020,  // .....*....
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000032C,  // .**..*.**.
-     0x00000320,  // .**..*....
-     0x000003A0,  // .***.*....
-     0x000001E0,  // ..****....
-     0x000000F8,  // ...*****..
-     0x0000003C,  // .....****.
-     0x00000026,  // .....*..**
-     0x00000326,  // .**..*..**
-     0x000003AE,  // .***.*.***
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x00000020,  // .....*....
-     0x00000020,  // .....*....
+     0x00000010,  // .....*....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000196,  // .**..*.**.
+     0x00000190,  // .**..*....
+     0x000001D0,  // .***.*....
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000001E,  // .....****.
+     0x00000013,  // .....*..**
+     0x00000193,  // .**..*..**
+     0x000001D7,  // .***.*.***
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000010,  // .....*....
+     0x00000010,  // .....*....
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -137,19 +137,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007860,  // ..****....**....
-     0x0000FCC0,  // .******..**.....
-     0x0000CCC0,  // .**..**..**.....
-     0x0000CD80,  // .**..**.**......
-     0x0000FD80,  // .******.**......
-     0x00007B00,  // ..****.**.......
-     0x00000300,  // .......**.......
-     0x00000678,  // ......**..****..
-     0x000006FC,  // ......**.******.
-     0x00000CCC,  // .....**..**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x000018FC,  // ....**...******.
-     0x00001878,  // ....**....****..
+     0x00003C30,  // ..****....**....
+     0x00007E60,  // .******..**.....
+     0x00006660,  // .**..**..**.....
+     0x000066C0,  // .**..**.**......
+     0x00007EC0,  // .******.**......
+     0x00003D80,  // ..****.**.......
+     0x00000180,  // .......**.......
+     0x0000033C,  // ......**..****..
+     0x0000037E,  // ......**.******.
+     0x00000666,  // .....**..**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000C7E,  // ....**...******.
+     0x00000C3C,  // ....**....****..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -163,19 +163,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000780,  // ...****......
-     0x00000FC0,  // ..******.....
-     0x00000CC0,  // ..**..**.....
-     0x00000CC0,  // ..**..**.....
-     0x00000780,  // ...****......
-     0x00000F80,  // ..*****......
-     0x00001DD8,  // .***.***.**..
-     0x000018D8,  // .**...**.**..
-     0x00001878,  // .**....****..
-     0x00001870,  // .**....***...
-     0x00001CF8,  // .***..*****..
-     0x00000FDC,  // ..******.***.
-     0x0000078E,  // ...****...***
+     0x000003C0,  // ...****......
+     0x000007E0,  // ..******.....
+     0x00000660,  // ..**..**.....
+     0x00000660,  // ..**..**.....
+     0x000003C0,  // ...****......
+     0x000007C0,  // ..*****......
+     0x00000EEC,  // .***.***.**..
+     0x00000C6C,  // .**...**.**..
+     0x00000C3C,  // .**....****..
+     0x00000C38,  // .**....***...
+     0x00000E7C,  // .***..*****..
+     0x000007EE,  // ..******.***.
+     0x000003C7,  // ...****...***
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -188,11 +188,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...
      0x00000000,  // ...
      0x00000000,  // ...
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
-     0x00000004,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
      0x00000000,  // ...
      0x00000000,  // ...
      0x00000000,  // ...
@@ -214,24 +214,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
   },
   {             // 41
      6, 23,
@@ -240,24 +240,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000020,  // .*....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000020,  // .*....
+     0x00000010,  // .*....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000010,  // .*....
   },
   {             // 42
      7, 23,
@@ -266,12 +266,12 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000010,  // ...*...
-     0x00000010,  // ...*...
-     0x0000007C,  // .*****.
-     0x00000038,  // ..***..
-     0x00000038,  // ..***..
-     0x00000044,  // .*...*.
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x0000003E,  // .*****.
+     0x0000001C,  // ..***..
+     0x0000001C,  // ..***..
+     0x00000022,  // .*...*.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -296,16 +296,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -330,11 +330,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
   },
   {             // 45
@@ -352,8 +352,8 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000007C,  // .*****.
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
+     0x0000003E,  // .*****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -382,8 +382,8 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -396,20 +396,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000006,  // ...**
-     0x00000006,  // ...**
-     0x00000004,  // ...*.
-     0x00000004,  // ...*.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000010,  // .*...
-     0x00000010,  // .*...
-     0x00000030,  // **...
-     0x00000030,  // **...
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000008,  // .*...
+     0x00000008,  // .*...
+     0x00000018,  // **...
+     0x00000018,  // **...
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -423,19 +423,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -449,19 +449,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x000001F0,  // ..*****...
-     0x000001F0,  // ..*****...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
+     0x00000018,  // .....**...
+     0x000000F8,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -475,19 +475,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000000C,  // .......**.
-     0x0000001C,  // ......***.
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x000001C0,  // ..***.....
-     0x00000380,  // .***......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000078,  // ...****...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000006,  // .......**.
+     0x0000000E,  // ......***.
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -501,19 +501,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000018,  // ......**..
-     0x00000070,  // ....***...
-     0x00000078,  // ....****..
-     0x0000001C,  // ......***.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000000C,  // ......**..
+     0x00000038,  // ....***...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -527,19 +527,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000001C,  // ......***.
-     0x0000003C,  // .....****.
-     0x0000006C,  // ....**.**.
-     0x000000CC,  // ...**..**.
-     0x000000CC,  // ...**..**.
-     0x0000018C,  // ..**...**.
-     0x0000030C,  // .**....**.
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
+     0x00000006,  // .......**.
+     0x0000000E,  // ......***.
+     0x0000001E,  // .....****.
+     0x00000036,  // ....**.**.
+     0x00000066,  // ...**..**.
+     0x00000066,  // ...**..**.
+     0x000000C6,  // ..**...**.
+     0x00000186,  // .**....**.
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -553,19 +553,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003F8,  // .*******..
-     0x000003F8,  // .*******..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003F0,  // .******...
-     0x000003F8,  // .*******..
-     0x0000031C,  // .**...***.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001F8,  // .******...
+     0x000001FC,  // .*******..
+     0x0000018E,  // .**...***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -579,19 +579,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000370,  // .**.***...
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000038C,  // .***...**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -605,19 +605,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x0000000C,  // .......**.
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -631,19 +631,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000001F8,  // ..******..
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -657,19 +657,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000001FC,  // ..*******.
-     0x000000EC,  // ...***.**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x00000318,  // .**...**..
-     0x000003F8,  // .*******..
-     0x000001F0,  // ..*****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -686,16 +686,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -712,19 +712,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
   },
   {             // 60
@@ -739,15 +739,15 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000003C,  // .....****.
-     0x000000F0,  // ...****...
-     0x000001C0,  // ..***.....
-     0x00000300,  // .**.......
-     0x000001C0,  // ..***.....
-     0x000000F0,  // ...****...
-     0x0000003C,  // .....****.
-     0x0000000C,  // .......**.
+     0x00000006,  // .......**.
+     0x0000001E,  // .....****.
+     0x00000078,  // ...****...
+     0x000000E0,  // ..***.....
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000001E,  // .....****.
+     0x00000006,  // .......**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -766,12 +766,12 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -791,15 +791,15 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x000003C0,  // .****.....
-     0x000000F0,  // ...****...
-     0x00000038,  // .....***..
-     0x0000000C,  // .......**.
-     0x00000038,  // .....***..
-     0x000000F0,  // ...****...
-     0x000003C0,  // .****.....
-     0x00000300,  // .**.......
+     0x00000180,  // .**.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -812,20 +812,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001F0,  // ..*****...
-     0x000003F8,  // .*******..
-     0x00000318,  // .**...**..
-     0x00000318,  // .**...**..
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x000000E0,  // ...***....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -838,23 +838,23 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00000FC0,  // .......******.....
-     0x00003FF0,  // .....**********...
-     0x00007038,  // ....***......***..
-     0x0000C018,  // ...**.........**..
-     0x00018ECC,  // ..**...***.**..**.
-     0x00019DCC,  // ..**..***.***..**.
-     0x000318CC,  // .**...**...**..**.
-     0x0003318C,  // .**..**...**...**.
-     0x00033198,  // .**..**...**..**..
-     0x00033198,  // .**..**...**..**..
-     0x00033330,  // .**..**..**..**...
-     0x00033FE0,  // .**..*********....
-     0x00019DC0,  // ..**..***.***.....
-     0x0001C000,  // ..***.............
-     0x0000E000,  // ...***............
-     0x00007FC0,  // ....*********.....
-     0x00001F80,  // ......******......
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000381C,  // ....***......***..
+     0x0000600C,  // ...**.........**..
+     0x0000C766,  // ..**...***.**..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x00018C66,  // .**...**...**..**.
+     0x000198C6,  // .**..**...**...**.
+     0x000198CC,  // .**..**...**..**..
+     0x000198CC,  // .**..**...**..**..
+     0x00019998,  // .**..**..**..**...
+     0x00019FF0,  // .**..*********....
+     0x0000CEE0,  // ..**..***.***.....
+     0x0000E000,  // ..***.............
+     0x00007000,  // ...***............
+     0x00003FE0,  // ....*********.....
+     0x00000FC0,  // ......******......
      0x00000000,  // ..................
   },
   {             // 65
@@ -864,20 +864,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001806,  // **........**
-     0x00001806,  // **........**
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -890,20 +890,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FE0,  // .********....
-     0x00001FF0,  // .*********...
-     0x00001838,  // .**.....***..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x00001830,  // .**.....**...
-     0x00001FF0,  // .*********...
-     0x00001FF8,  // .**********..
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000181C,  // .**......***.
-     0x00001FF8,  // .**********..
-     0x00001FF0,  // .*********...
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C18,  // .**.....**...
+     0x00000FF8,  // .*********...
+     0x00000FFC,  // .**********..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x00000FFC,  // .**********..
+     0x00000FF8,  // .*********...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -916,20 +916,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -942,20 +942,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FE0,  // .********....
-     0x00001FF0,  // .*********...
-     0x00001838,  // .**.....***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF0,  // .*********...
-     0x00001FE0,  // .********....
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FF8,  // .*********...
+     0x00000FF0,  // .********....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -968,20 +968,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -994,20 +994,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1020,20 +1020,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x0000380C,  // .***.......**.
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x0000307C,  // .**.....*****.
-     0x0000307C,  // .**.....*****.
-     0x0000380C,  // .***.......**.
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FFC,  // ...**********.
-     0x000003EC,  // .....*****.**.
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C06,  // .***.......**.
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x0000183E,  // .**.....*****.
+     0x0000183E,  // .**.....*****.
+     0x00001C06,  // .***.......**.
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FE,  // ...**********.
+     0x000001F6,  // .....*****.**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1046,20 +1046,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1072,20 +1072,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1098,20 +1098,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1124,20 +1124,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000181C,  // .**......***.
-     0x00001838,  // .**.....***..
-     0x00001870,  // .**....***...
-     0x000018E0,  // .**...***....
-     0x000019C0,  // .**..***.....
-     0x00001B80,  // .**.***......
-     0x00001F00,  // .*****.......
-     0x00001F80,  // .******......
-     0x000019C0,  // .**..***.....
-     0x000018E0,  // .**...***....
-     0x00001870,  // .**....***...
-     0x00001838,  // .**.....***..
-     0x0000181C,  // .**......***.
-     0x0000180E,  // .**.......***
+     0x00000C0E,  // .**......***.
+     0x00000C1C,  // .**.....***..
+     0x00000C38,  // .**....***...
+     0x00000C70,  // .**...***....
+     0x00000CE0,  // .**..***.....
+     0x00000DC0,  // .**.***......
+     0x00000F80,  // .*****.......
+     0x00000FC0,  // .******......
+     0x00000CE0,  // .**..***.....
+     0x00000C70,  // .**...***....
+     0x00000C38,  // .**....***...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000C07,  // .**.......***
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1150,20 +1150,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1176,20 +1176,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C00C,  // .**..........**.
-     0x0000C00C,  // .**..........**.
-     0x0000E01C,  // .***........***.
-     0x0000E01C,  // .***........***.
-     0x0000F03C,  // .****......****.
-     0x0000F03C,  // .****......****.
-     0x0000D86C,  // .**.**....**.**.
-     0x0000D86C,  // .**.**....**.**.
-     0x0000CCCC,  // .**..**..**..**.
-     0x0000CCCC,  // .**..**..**..**.
-     0x0000C48C,  // .**...*..*...**.
-     0x0000C78C,  // .**...****...**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00006C36,  // .**.**....**.**.
+     0x00006C36,  // .**.**....**.**.
+     0x00006666,  // .**..**..**..**.
+     0x00006666,  // .**..**..**..**.
+     0x00006246,  // .**...*..*...**.
+     0x000063C6,  // .**...****...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1202,20 +1202,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00001E0C,  // .****.....**.
-     0x00001E0C,  // .****.....**.
-     0x00001B0C,  // .**.**....**.
-     0x0000198C,  // .**..**...**.
-     0x0000198C,  // .**..**...**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x0000186C,  // .**....**.**.
-     0x0000183C,  // .**.....****.
-     0x0000183C,  // .**.....****.
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x00000F06,  // .****.....**.
+     0x00000F06,  // .****.....**.
+     0x00000D86,  // .**.**....**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000C66,  // .**...**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C36,  // .**....**.**.
+     0x00000C1E,  // .**.....****.
+     0x00000C1E,  // .**.....****.
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1228,20 +1228,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1254,20 +1254,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1280,21 +1280,21 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x000070DC,  // .***....**.***.
-     0x000030D8,  // ..**....**.**..
-     0x00003878,  // ..***....****..
-     0x00001FF0,  // ...*********...
-     0x000007D8,  // .....*****.**..
-     0x00000018,  // ...........**..
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000386E,  // .***....**.***.
+     0x0000186C,  // ..**....**.**..
+     0x00001C3C,  // ..***....****..
+     0x00000FF8,  // ...*********...
+     0x000003EC,  // .....*****.**..
+     0x0000000C,  // ...........**..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1306,20 +1306,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1332,20 +1332,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000078,  // .......****..
-     0x0000001C,  // .........***.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x0000003C,  // .......****..
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1358,20 +1358,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1384,20 +1384,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1410,20 +1410,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1436,20 +1436,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x0003060C,  // .**.....**.....**.
-     0x00030F0C,  // .**....****....**.
-     0x00018F18,  // ..**...****...**..
-     0x00018918,  // ..**...*..*...**..
-     0x00019998,  // ..**..**..**..**..
-     0x00019998,  // ..**..**..**..**..
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D9B0,  // ...**.**..**.**...
-     0x0000D0B0,  // ...**.*....*.**...
-     0x000070E0,  // ....***....***....
-     0x00006060,  // ....**......**....
-     0x00006060,  // ....**......**....
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018786,  // .**....****....**.
+     0x0000C78C,  // ..**...****...**..
+     0x0000C48C,  // ..**...*..*...**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006858,  // ...**.*....*.**...
+     0x00003870,  // ....***....***....
+     0x00003030,  // ....**......**....
+     0x00003030,  // ....**......**....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -1462,20 +1462,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C18,  // ..**.....**..
-     0x00000E38,  // ..***...***..
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x00000360,  // ....**.**....
-     0x00000630,  // ...**...**...
-     0x00000E38,  // ..***...***..
-     0x00000C18,  // ..**.....**..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1488,20 +1488,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1514,20 +1514,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1540,24 +1540,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000001E,  // .****
-     0x0000001E,  // .****
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x0000001E,  // .****
-     0x0000001E,  // .****
+     0x0000000F,  // .****
+     0x0000000F,  // .****
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000F,  // .****
+     0x0000000F,  // .****
   },
   {             // 92
      5, 23,
@@ -1566,20 +1566,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000030,  // **...
-     0x00000030,  // **...
-     0x00000010,  // .*...
-     0x00000010,  // .*...
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000004,  // ...*.
-     0x00000004,  // ...*.
-     0x00000006,  // ...**
-     0x00000006,  // ...**
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000008,  // .*...
+     0x00000008,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000003,  // ...**
+     0x00000003,  // ...**
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -1592,24 +1592,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x0000003C,  // ****.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
   },
   {             // 94
      9, 23,
@@ -1619,11 +1619,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x0000018C,  // .**...**.
-     0x00000104,  // .*.....*.
+     0x00000010,  // ....*....
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x000000C6,  // .**...**.
+     0x00000082,  // .*.....*.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1660,8 +1660,8 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000007FE,  // **********
-     0x000007FE,  // **********
+     0x000003FF,  // **********
+     0x000003FF,  // **********
   },
   {             // 96
      4, 23,
@@ -1670,9 +1670,9 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000018,  // **..
-     0x0000000C,  // .**.
-     0x00000006,  // ..**
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1700,16 +1700,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
-     0x0000001C,  // .....***.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000EC,  // ..***.**.
+     0x0000007C,  // ..*****..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
+     0x0000000E,  // .....***.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x00000076,  // ..***.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1722,20 +1722,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1752,16 +1752,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1774,20 +1774,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1804,16 +1804,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1826,20 +1826,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001E,  // ..****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1856,20 +1856,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
-     0x0000000C,  // ........**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000000E0,  // ....***....
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x00000070,  // ....***....
   },
   {             // 104
      10, 23,
@@ -1878,20 +1878,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000338,  // .**..***..
-     0x0000037C,  // .**.*****.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x0000019C,  // .**..***..
+     0x000001BE,  // .**.*****.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1904,50 +1904,50 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 106
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
+     5, 23,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
   },
   {             // 107
      9, 23,
@@ -1956,20 +1956,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x0000018C,  // .**...**.
-     0x00000198,  // .**..**..
-     0x000001B0,  // .**.**...
-     0x000001E0,  // .****....
-     0x000001F0,  // .*****...
-     0x000001B0,  // .**.**...
-     0x00000198,  // .**..**..
-     0x0000019C,  // .**..***.
-     0x0000018C,  // .**...**.
-     0x0000018E,  // .**...***
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C6,  // .**...**.
+     0x000000CC,  // .**..**..
+     0x000000D8,  // .**.**...
+     0x000000F0,  // .****....
+     0x000000F8,  // .*****...
+     0x000000D8,  // .**.**...
+     0x000000CC,  // .**..**..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1982,20 +1982,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -2012,16 +2012,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003318,  // .**..**...**..
-     0x000037BC,  // .**.****.****.
-     0x000039CC,  // .***..***..**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
+     0x0000198C,  // .**..**...**..
+     0x00001BDE,  // .**.****.****.
+     0x00001CE6,  // .***..***..**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -2038,16 +2038,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000338,  // .**..***..
-     0x0000037C,  // .**.*****.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x0000019C,  // .**..***..
+     0x000001BE,  // .**.*****.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2064,16 +2064,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2090,20 +2090,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x00000718,  // .***...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F8,  // .********..
-     0x000006F0,  // .**.****...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 113
      11, 23,
@@ -2116,20 +2116,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
   },
   {             // 114
      9, 23,
@@ -2168,16 +2168,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2191,19 +2191,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001C,  // ..***.
-     0x0000000C,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000E,  // ..***.
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2220,16 +2220,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003EC,  // .*****.**.
-     0x000001CC,  // ..***..**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001F6,  // .*****.**.
+     0x000000E6,  // ..***..**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2246,16 +2246,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2272,16 +2272,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00001998,  // ..**..**..**..
-     0x00001998,  // ..**..**..**..
-     0x00001A58,  // ..**.*..*.**..
-     0x00000A50,  // ...*.*..*.*...
-     0x00000E70,  // ...***..***...
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D2C,  // ..**.*..*.**..
+     0x00000528,  // ...*.*..*.*...
+     0x00000738,  // ...***..***...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -2298,16 +2298,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2324,20 +2324,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   {             // 122
      9, 23,
@@ -2350,16 +2350,16 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2372,24 +2372,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
   },
   {             // 124
      4, 23,
@@ -2398,24 +2398,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
   },
   {             // 125
      6, 23,
@@ -2424,24 +2424,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000060,  // **....
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000060,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
   },
   {             // 126
      10, 23,
@@ -2457,9 +2457,9 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000CC,  // ...**..**.
-     0x000001F8,  // ..******..
-     0x00000330,  // .**..**...
+     0x00000066,  // ...**..**.
+     0x000000FC,  // ..******..
+     0x00000198,  // .**..**...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3360,24 +3360,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001806,  // **........**
-     0x00001866,  // **....**..**
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x000000E0,  // .....***....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000C03,  // **........**
+     0x00000C33,  // **....**..**
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x00000070,  // .....***....
   },
   {             // 162
      6, 23,
@@ -3386,9 +3386,9 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000042,  // *....*
-     0x00000066,  // **..**
-     0x0000003C,  // .****.
+     0x00000021,  // *....*
+     0x00000033,  // **..**
+     0x0000001E,  // .****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3412,20 +3412,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000360,  // .**.**....
-     0x000003E0,  // .*****....
-     0x00000780,  // ****......
-     0x00000700,  // ***.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B0,  // .**.**....
+     0x000001F0,  // .*****....
+     0x000003C0,  // ****......
+     0x00000380,  // ***.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3442,13 +3442,13 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3464,20 +3464,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00003004,  // .**.........*.
-     0x00003004,  // .**.........*.
-     0x00003008,  // .**........*..
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003FC0,  // .********.....
-     0x00003FC0,  // .********.....
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001802,  // .**.........*.
+     0x00001802,  // .**.........*.
+     0x00001804,  // .**........*..
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001FE0,  // .********.....
+     0x00001FE0,  // .********.....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3486,24 +3486,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 166
      13, 23,
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000078,  // .......****..
-     0x0000001C,  // .........***.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x0000003C,  // .......****..
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3516,24 +3516,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003C0,  // .****.....
-     0x000001F0,  // ..*****...
-     0x000001B8,  // ..**.***..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x0000038C,  // .***...**.
-     0x000001CC,  // ..***..**.
-     0x000000F8,  // ...*****..
-     0x00000038,  // .....***..
-     0x0000001C,  // ......***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001E0,  // .****.....
+     0x000000F8,  // ..*****...
+     0x000000DC,  // ..**.***..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000E6,  // ..***..**.
+     0x0000007C,  // ...*****..
+     0x0000001C,  // .....***..
+     0x0000000E,  // ......***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
   },
   {             // 168
      6, 23,
@@ -3543,8 +3543,8 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000006C,  // **.**.
-     0x0000006C,  // **.**.
+     0x00000036,  // **.**.
+     0x00000036,  // **.**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3564,24 +3564,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 169
      13, 23,
      0x00000000,  // .............
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000078,  // .......****..
-     0x0000001C,  // .........***.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x0000003C,  // .......****..
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3594,46 +3594,46 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00001C1C,  // .***.....***.
-     0x0000180C,  // .**.......**.
-     0x00001C00,  // .***.........
-     0x00000F80,  // ..*****......
-     0x000003E0,  // ....*****....
-     0x00000078,  // .......****..
-     0x0000001C,  // .........***.
-     0x0000000C,  // ..........**.
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000FF8,  // ..*********..
-     0x000007E0,  // ...******....
-     0x000001C0,  // .....***.....
-     0x00000060,  // .......**....
-     0x00000360,  // ....**.**....
-     0x000003C0,  // ....****.....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x0000003C,  // .......****..
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
+     0x000000E0,  // .....***.....
+     0x00000030,  // .......**....
+     0x000001B0,  // ....**.**....
+     0x000001E0,  // ....****.....
   },
   {             // 171
      12, 23,
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3642,24 +3642,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 172
      12, 23,
      0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3680,8 +3680,8 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000007C,  // .*****.
-     0x0000007C,  // .*****.
+     0x0000003E,  // .*****.
+     0x0000003E,  // .*****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3694,24 +3694,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 174
      12, 23,
      0x00000000,  // ............
-     0x00000318,  // ...**...**..
-     0x000001B0,  // ....**.**...
-     0x000000E0,  // .....***....
+     0x0000018C,  // ...**...**..
+     0x000000D8,  // ....**.**...
+     0x00000070,  // .....***....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3721,23 +3721,23 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x0000000C,  // .........**.
-     0x00000018,  // ........**..
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x000001C0,  // ....***.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3751,11 +3751,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000038,  // ..***..
-     0x0000006C,  // .**.**.
-     0x00000044,  // .*...*.
-     0x0000006C,  // .**.**.
-     0x00000038,  // ..***..
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3780,20 +3780,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
-     0x0000001C,  // .....***.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000FC,  // ..******.
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x00000070,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
+     0x0000000E,  // .....***.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x0000007E,  // ..******.
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000038,  // ...***...
   },
   {             // 178
      6, 23,
@@ -3815,11 +3815,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000E,  // ...***
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000007,  // ...***
   },
   {             // 179
      4, 23,
@@ -3828,20 +3828,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000E,  // .***
-     0x0000001E,  // ****
-     0x0000001C,  // ***.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000007,  // .***
+     0x0000000F,  // ****
+     0x0000000E,  // ***.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -3854,9 +3854,9 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000006,  // ..**
-     0x0000000C,  // .**.
-     0x00000018,  // **..
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -3880,20 +3880,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000C4,  // .**...*.
-     0x000000C4,  // .**...*.
-     0x000000C8,  // .**..*..
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000062,  // .**...*.
+     0x00000062,  // .**...*.
+     0x00000064,  // .**..*..
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -3906,20 +3906,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3932,9 +3932,9 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x0000003C,  // .****.
-     0x00000018,  // ..**..
+     0x00000033,  // **..**
+     0x0000001E,  // .****.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3971,11 +3971,11 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x0000001C,  // .***.
-     0x00000006,  // ...**
-     0x00000036,  // **.**
-     0x0000003C,  // ****.
+     0x0000000C,  // .**..
+     0x0000000E,  // .***.
+     0x00000003,  // ...**
+     0x0000001B,  // **.**
+     0x0000001E,  // ****.
   },
   {             // 185
      9, 23,
@@ -3984,20 +3984,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000198,  // .**..**..
-     0x000000F0,  // ..****...
-     0x00000060,  // ...**....
+     0x000000CC,  // .**..**..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4014,20 +4014,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x0000018C,  // .**...**.
-     0x00000180,  // .**......
-     0x000001F8,  // .******..
-     0x0000007C,  // ...*****.
-     0x0000000C,  // ......**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
-     0x00000070,  // ...***...
-     0x00000018,  // .....**..
-     0x000000D8,  // ..**.**..
-     0x000000F0,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
+     0x00000038,  // ...***...
+     0x0000000C,  // .....**..
+     0x0000006C,  // ..**.**..
+     0x00000078,  // ..****...
   },
   {             // 187
      10, 23,
@@ -4036,20 +4036,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000018C,  // ..**...**.
-     0x00000184,  // ..**....*.
-     0x00000184,  // ..**....*.
-     0x000007E8,  // ******.*..
-     0x000007E0,  // ******....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x000001C0,  // ..***.....
-     0x000000C0,  // ...**.....
+     0x00000006,  // .......**.
+     0x000000C6,  // ..**...**.
+     0x000000C2,  // ..**....*.
+     0x000000C2,  // ..**....*.
+     0x000003F4,  // ******.*..
+     0x000003F0,  // ******....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000E0,  // ..***.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4062,50 +4062,50 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 189
-     5, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000036,  // ..**.**
-     0x0000006C,  // .**.**.
-     0x000000D8,  // **.**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     7, 23,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001B,  // ..**.**
+     0x00000036,  // .**.**.
+     0x0000006C,  // **.**..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
   },
   {             // 190
      9, 23,
@@ -4114,20 +4114,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000198,  // .**..**..
-     0x000000F0,  // ..****...
-     0x00000060,  // ...**....
-     0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000CC,  // .**..**..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
+     0x00000000,  // .........
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4141,19 +4141,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4162,24 +4162,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 192
      12, 23,
      0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4188,24 +4188,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 193
      12, 23,
      0x00000000,  // ............
-     0x00000030,  // .......**...
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001806,  // **........**
-     0x00001806,  // **........**
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4214,24 +4214,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 194
      12, 23,
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001806,  // **........**
-     0x00001806,  // **........**
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4240,24 +4240,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 195
      12, 23,
      0x00000000,  // ............
-     0x00000210,  // ...*....*...
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
+     0x00000108,  // ...*....*...
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001806,  // **........**
-     0x00001806,  // **........**
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4267,23 +4267,23 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      12, 23,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
      0x00000000,  // ............
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000001E0,  // ....****....
-     0x000001E0,  // ....****....
-     0x00000330,  // ...**..**...
-     0x00000330,  // ...**..**...
-     0x00000618,  // ..**....**..
-     0x00000618,  // ..**....**..
-     0x000007F8,  // ..********..
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001806,  // **........**
-     0x00001806,  // **........**
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x000000F0,  // ....****....
+     0x000000F0,  // ....****....
+     0x00000198,  // ...**..**...
+     0x00000198,  // ...**..**...
+     0x0000030C,  // ..**....**..
+     0x0000030C,  // ..**....**..
+     0x000003FC,  // ..********..
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4292,24 +4292,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 197
      10, 23,
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4318,24 +4318,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 198
      14, 23,
      0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
+     0x00000030,  // ........**....
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4348,46 +4348,46 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
-     0x00000380,  // .....***......
-     0x000000C0,  // .......**.....
-     0x000006C0,  // ....**.**.....
-     0x00000780,  // ....****......
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x000001C0,  // .....***......
+     0x00000060,  // .......**.....
+     0x00000360,  // ....**.**.....
+     0x000003C0,  // ....****......
   },
   {             // 200
      14, 23,
      0x00000000,  // ..............
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x000003E0,  // .....*****....
-     0x00000FF8,  // ...*********..
-     0x00001C1C,  // ..***.....***.
-     0x0000180C,  // ..**.......**.
-     0x00003800,  // .***..........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003000,  // .**...........
-     0x00003800,  // .***..........
-     0x0000180C,  // ..**.......**.
-     0x00001C1C,  // ..***.....***.
-     0x00000FF8,  // ...*********..
-     0x000003E0,  // .....*****....
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4396,24 +4396,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 201
      11, 23,
      0x00000000,  // ...........
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
+     0x0000000C,  // .......**..
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4426,46 +4426,46 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000180,  // ...**......
-     0x000000E0,  // ....***....
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x000000C0,  // ...**......
+     0x00000070,  // ....***....
   },
   {             // 203
      11, 23,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
+     0x000000CC,  // ...**..**..
+     0x000000CC,  // ...**..**..
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4474,24 +4474,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 204
      11, 23,
      0x00000000,  // ...........
-     0x00000330,  // ..**..**...
-     0x000001E0,  // ...****....
-     0x000000C0,  // ....**.....
+     0x00000198,  // ..**..**...
+     0x000000F0,  // ...****....
+     0x00000060,  // ....**.....
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F8,  // .********..
-     0x000007F8,  // .********..
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FC,  // .********..
+     0x000003FC,  // .********..
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4500,24 +4500,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 205
      6, 23,
      0x00000000,  // ......
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4526,24 +4526,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 206
      6, 23,
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -4552,24 +4552,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 207
      13, 23,
      0x00000000,  // .............
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x00001FE0,  // .********....
-     0x00001FF0,  // .*********...
-     0x00001838,  // .**.....***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF0,  // .*********...
-     0x00001FE0,  // .********....
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FF8,  // .*********...
+     0x00000FF0,  // .********....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4582,20 +4582,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FE0,  // .********....
-     0x00001FF0,  // .*********...
-     0x00001838,  // .**.....***..
-     0x00001818,  // .**......**..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00003F0C,  // ******....**.
-     0x00003F0C,  // ******....**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00001838,  // .**.....***..
-     0x00001FF0,  // .*********...
-     0x00001FE0,  // .********....
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00001F86,  // ******....**.
+     0x00001F86,  // ******....**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FF8,  // .*********...
+     0x00000FF0,  // .********....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4604,24 +4604,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 209
      13, 23,
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00001E0C,  // .****.....**.
-     0x00001E0C,  // .****.....**.
-     0x00001B0C,  // .**.**....**.
-     0x0000198C,  // .**..**...**.
-     0x0000198C,  // .**..**...**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x0000186C,  // .**....**.**.
-     0x0000183C,  // .**.....****.
-     0x0000183C,  // .**.....****.
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x00000F06,  // .****.....**.
+     0x00000F06,  // .****.....**.
+     0x00000D86,  // .**.**....**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000C66,  // .**...**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C36,  // .**....**.**.
+     0x00000C1E,  // .**.....****.
+     0x00000C1E,  // .**.....****.
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4630,24 +4630,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 210
      13, 23,
      0x00000000,  // .............
-     0x00000660,  // ...**..**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00001E0C,  // .****.....**.
-     0x00001E0C,  // .****.....**.
-     0x00001B0C,  // .**.**....**.
-     0x0000198C,  // .**..**...**.
-     0x0000198C,  // .**..**...**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x0000186C,  // .**....**.**.
-     0x0000183C,  // .**.....****.
-     0x0000183C,  // .**.....****.
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x00000F06,  // .****.....**.
+     0x00000F06,  // .****.....**.
+     0x00000D86,  // .**.**....**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000C66,  // .**...**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C36,  // .**....**.**.
+     0x00000C1E,  // .**.....****.
+     0x00000C1E,  // .**.....****.
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4656,24 +4656,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 211
      15, 23,
      0x00000000,  // ...............
-     0x00000060,  // .........**....
-     0x000000C0,  // ........**.....
-     0x00000180,  // .......**......
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4682,24 +4682,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 212
      15, 23,
      0x00000000,  // ...............
-     0x00000180,  // .......**......
-     0x000003C0,  // ......****.....
-     0x00000660,  // .....**..**....
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000330,  // .....**..**....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4708,24 +4708,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 213
      15, 23,
      0x00000000,  // ...............
-     0x000001B0,  // .......**.**...
-     0x00000360,  // ......**.**....
-     0x000006C0,  // .....**.**.....
+     0x000000D8,  // .......**.**...
+     0x000001B0,  // ......**.**....
+     0x00000360,  // .....**.**.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4735,23 +4735,23 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      15, 23,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000006C0,  // .....**.**.....
-     0x000006C0,  // .....**.**.....
+     0x00000360,  // .....**.**.....
+     0x00000360,  // .....**.**.....
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000701C,  // .***.......***.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000701C,  // .***.......***.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4769,15 +4769,15 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000606,  // **......**
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
-     0x00000606,  // **......**
+     0x00000303,  // **......**
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000303,  // **......**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4786,24 +4786,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 216
      12, 23,
      0x00000000,  // ............
-     0x00000330,  // ...**..**...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
+     0x00000198,  // ...**..**...
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4811,25 +4811,25 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   },
   {             // 217
      13, 23,
-     0x000001C0,  // .....***.....
-     0x00000360,  // ....**.**....
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001B0,  // ....**.**....
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4838,24 +4838,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 218
      13, 23,
      0x00000000,  // .............
-     0x00000060,  // .......**....
-     0x000000C0,  // ......**.....
-     0x00000180,  // .....**......
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4864,24 +4864,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 219
      13, 23,
      0x00000000,  // .............
-     0x000000D8,  // ......**.**..
-     0x000001B0,  // .....**.**...
-     0x00000360,  // ....**.**....
+     0x0000006C,  // ......**.**..
+     0x000000D8,  // .....**.**...
+     0x000001B0,  // ....**.**....
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4891,23 +4891,23 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      13, 23,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000330,  // ....**..**...
-     0x00000330,  // ....**..**...
+     0x00000198,  // ....**..**...
+     0x00000198,  // ....**..**...
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4916,24 +4916,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 221
      14, 23,
      0x00000000,  // ..............
-     0x00000060,  // ........**....
-     0x000000C0,  // .......**.....
-     0x00000180,  // ......**......
+     0x00000030,  // ........**....
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00000C30,  // ...**....**...
-     0x00000660,  // ....**..**....
-     0x000003C0,  // .....****.....
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
-     0x00000180,  // ......**......
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4946,24 +4946,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000E0,  // .....***....
-     0x00000030,  // .......**...
-     0x000001B0,  // ....**.**...
-     0x000001E0,  // ....****....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000070,  // .....***....
+     0x00000018,  // .......**...
+     0x000000D8,  // ....**.**...
+     0x000000F0,  // ....****....
   },
   {             // 223
      9, 23,
@@ -4972,20 +4972,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001B8,  // .**.***..
-     0x000001B8,  // .**.***..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001BC,  // .**.****.
-     0x000001B8,  // .**.***..
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DC,  // .**.***..
+     0x000000DC,  // .**.***..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DE,  // .**.****.
+     0x000000DC,  // .**.***..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4998,20 +4998,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000036,  // .**.**
-     0x00000036,  // .**.**
-     0x00000038,  // .***..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5024,20 +5024,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
-     0x0000001C,  // .....***.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000EC,  // ..***.**.
+     0x0000007C,  // ..*****..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
+     0x0000000E,  // .....***.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x00000076,  // ..***.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5050,20 +5050,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000078,  // ...****..
-     0x000000CC,  // ..**..**.
+     0x00000018,  // ....**...
+     0x0000003C,  // ...****..
+     0x00000066,  // ..**..**.
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
-     0x0000001C,  // .....***.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000EC,  // ..***.**.
+     0x0000007C,  // ..*****..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
+     0x0000000E,  // .....***.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x00000076,  // ..***.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5076,20 +5076,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000084,  // ..*....*.
-     0x000000CC,  // ..**..**.
-     0x00000078,  // ...****..
+     0x00000042,  // ..*....*.
+     0x00000066,  // ..**..**.
+     0x0000003C,  // ...****..
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
-     0x0000001C,  // .....***.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000EC,  // ..***.**.
+     0x0000007C,  // ..*****..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
+     0x0000000E,  // .....***.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x00000076,  // ..***.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5103,45 +5103,45 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000D8,  // ..**.**..
-     0x000000D8,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
-     0x0000001C,  // .....***.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000EC,  // ..***.**.
+     0x0000007C,  // ..*****..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
+     0x0000000E,  // .....***.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x00000076,  // ..***.**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 229
-     4, 23,
+     5, 23,
      0x00000000,  // .....
-     0x00000006,  // ...**
-     0x0000000C,  // ..**.
-     0x00000018,  // .**..
+     0x00000003,  // ...**
+     0x00000006,  // ..**.
+     0x0000000C,  // .**..
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -5154,20 +5154,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5184,20 +5184,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
-     0x000000E0,  // ...***....
-     0x00000030,  // .....**...
-     0x000001B0,  // ..**.**...
-     0x000001E0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000070,  // ...***....
+     0x00000018,  // .....**...
+     0x000000D8,  // ..**.**...
+     0x000000F0,  // ..****....
   },
   {             // 232
      10, 23,
@@ -5206,20 +5206,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001FC,  // ..*******.
-     0x0000018C,  // ..**...**.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000018C,  // ..**...**.
-     0x000001FC,  // ..*******.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5232,20 +5232,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5262,20 +5262,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000070,  // ....***...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000038,  // ....***...
   },
   {             // 235
      10, 23,
@@ -5285,19 +5285,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000D8,  // ...**.**..
-     0x000000D8,  // ...**.**..
+     0x0000006C,  // ...**.**..
+     0x0000006C,  // ...**.**..
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5310,20 +5310,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000038C,  // .***...**.
-     0x000001FC,  // ..*******.
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5336,20 +5336,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x00000006,  // ..**
-     0x0000000C,  // .**.
-     0x00000018,  // **..
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -5362,20 +5362,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x0000003C,  // .****.
-     0x00000066,  // **..**
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5388,20 +5388,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000006C,  // ........**.**.
-     0x0000006C,  // ........**.**.
-     0x00000064,  // ........**..*.
-     0x00000064,  // ........**..*.
-     0x00000F68,  // ...****.**.*..
-     0x00001FE0,  // ..********....
-     0x000018E0,  // ..**...***....
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x000018E0,  // ..**...***....
-     0x00001FE0,  // ..********....
-     0x00000F60,  // ...****.**....
+     0x00000036,  // ........**.**.
+     0x00000036,  // ........**.**.
+     0x00000032,  // ........**..*.
+     0x00000032,  // ........**..*.
+     0x000007B4,  // ...****.**.*..
+     0x00000FF0,  // ..********....
+     0x00000C70,  // ..**...***....
+     0x00001830,  // .**.....**....
+     0x00001830,  // .**.....**....
+     0x00001830,  // .**.....**....
+     0x00001830,  // .**.....**....
+     0x00000C70,  // ..**...***....
+     0x00000FF0,  // ..********....
+     0x000007B0,  // ...****.**....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5414,20 +5414,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x000000FC,  // ....******.
-     0x000000FC,  // ....******.
-     0x000001EC,  // ...****.**.
-     0x000003FC,  // ..********.
-     0x0000031C,  // ..**...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000031C,  // ..**...***.
-     0x000003FC,  // ..********.
-     0x000001EC,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x0000007E,  // ....******.
+     0x0000007E,  // ....******.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5440,20 +5440,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x00000338,  // .**..***..
-     0x0000037C,  // .**.*****.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x0000019C,  // .**..***..
+     0x000001BE,  // .**.*****.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5466,20 +5466,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x00000338,  // .**..***..
-     0x0000037C,  // .**.*****.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x0000019C,  // .**..***..
+     0x000001BE,  // .**.*****.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5492,20 +5492,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000C0,  // ....**.....
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5518,20 +5518,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x000000F0,  // ....****...
-     0x00000198,  // ...**..**..
+     0x00000030,  // .....**....
+     0x00000078,  // ....****...
+     0x000000CC,  // ...**..**..
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5544,20 +5544,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000006C,  // .....**.**.
-     0x000000D8,  // ....**.**..
-     0x000001B0,  // ...**.**...
+     0x00000036,  // .....**.**.
+     0x0000006C,  // ....**.**..
+     0x000000D8,  // ...**.**...
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5571,19 +5571,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5601,14 +5601,14 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5622,20 +5622,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x0000003C,  // .****.
-     0x00000018,  // ..**..
+     0x00000033,  // **..**
+     0x0000001E,  // .****.
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000036,  // .**.**
-     0x00000036,  // .**.**
-     0x00000038,  // .***..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -5647,21 +5647,21 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000070,  // ....***...
-     0x000000D8,  // ...**.**..
-     0x000000D8,  // ...**.**..
-     0x00000070,  // ....***...
+     0x00000038,  // ....***...
+     0x0000006C,  // ...**.**..
+     0x0000006C,  // ...**.**..
+     0x00000038,  // ....***...
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003EC,  // .*****.**.
-     0x000001CC,  // ..***..**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001F6,  // .*****.**.
+     0x000000E6,  // ..***..**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5674,20 +5674,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003EC,  // .*****.**.
-     0x000001CC,  // ..***..**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001F6,  // .*****.**.
+     0x000000E6,  // ..***..**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5700,20 +5700,20 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000006C,  // ....**.**.
-     0x000000D8,  // ...**.**..
-     0x000001B0,  // ..**.**...
+     0x00000036,  // ....**.**.
+     0x0000006C,  // ...**.**..
+     0x000000D8,  // ..**.**...
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003EC,  // .*****.**.
-     0x000001CC,  // ..***..**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001F6,  // .*****.**.
+     0x000000E6,  // ..***..**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5727,19 +5727,19 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003EC,  // .*****.**.
-     0x000001CC,  // ..***..**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001F6,  // .*****.**.
+     0x000000E6,  // ..***..**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5752,24 +5752,24 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000090,  // ...*..*...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000001C0,  // ..***.....
-     0x000001C0,  // ..***.....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
   },
   {             // 254
      6, 23,
@@ -5779,23 +5779,23 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000007E,  // ******
-     0x0000007E,  // ******
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001C,  // ..***.
-     0x0000001C,  // ..***.
-     0x0000001C,  // ..***.
-     0x00000006,  // ....**
-     0x00000036,  // .**.**
-     0x0000003C,  // .****.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000E,  // ..***.
+     0x0000000E,  // ..***.
+     0x0000000E,  // ..***.
+     0x00000003,  // ....**
+     0x0000001B,  // .**.**
+     0x0000001E,  // .****.
   },
   {             // 255
      6, 23,
@@ -5805,8 +5805,8 @@ cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
diff --git a/fontsml-iso8859-5.c b/fontsml-iso8859-5.c
index 957203459..f7b57d321 100644
--- a/fontsml-iso8859-5.c
+++ b/fontsml-iso8859-5.c
@@ -35,18 +35,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -63,10 +63,10 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
-     0x000000CC,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -84,25 +84,25 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ........
   },
   {             // 35
-     9, 25,
+     10, 25,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000006C,  // ....**.**.
-     0x0000006C,  // ....**.**.
-     0x000000D8,  // ...**.**..
-     0x000007FE,  // **********
-     0x000007FE,  // **********
-     0x000000D8,  // ...**.**..
-     0x000001B0,  // ..**.**...
-     0x000007FE,  // **********
-     0x000007FE,  // **********
-     0x000001B0,  // ..**.**...
-     0x00000360,  // .**.**....
-     0x00000360,  // .**.**....
+     0x00000036,  // ....**.**.
+     0x00000036,  // ....**.**.
+     0x0000006C,  // ...**.**..
+     0x000003FF,  // **********
+     0x000003FF,  // **********
+     0x0000006C,  // ...**.**..
+     0x000000D8,  // ..**.**...
+     0x000003FF,  // **********
+     0x000003FF,  // **********
+     0x000000D8,  // ..**.**...
+     0x000001B0,  // .**.**....
+     0x000001B0,  // .**.**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -118,21 +118,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000020,  // ....*....
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x000001AC,  // .**.*.**.
-     0x000001A0,  // .**.*....
-     0x000001E0,  // .****....
-     0x000000F0,  // ..****...
-     0x00000078,  // ...****..
-     0x0000003C,  // ....****.
-     0x000001AC,  // .**.*.**.
-     0x000001AC,  // .**.*.**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
-     0x00000020,  // ....*....
-     0x00000020,  // ....*....
+     0x00000010,  // ....*....
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000D6,  // .**.*.**.
+     0x000000D0,  // .**.*....
+     0x000000F0,  // .****....
+     0x00000078,  // ..****...
+     0x0000003C,  // ...****..
+     0x0000001E,  // ....****.
+     0x000000D6,  // .**.*.**.
+     0x000000D6,  // .**.*.**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -147,18 +147,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000F060,  // .****.....**....
-     0x000198C0,  // **..**...**.....
-     0x000198C0,  // **..**...**.....
-     0x00019980,  // **..**..**......
-     0x00019B00,  // **..**.**.......
-     0x0000F300,  // .****..**.......
-     0x00000678,  // ......**..****..
-     0x000006CC,  // ......**.**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x00000CCC,  // .....**..**..**.
-     0x000018CC,  // ....**...**..**.
-     0x00003078,  // ...**.....****..
+     0x00007830,  // .****.....**....
+     0x0000CC60,  // **..**...**.....
+     0x0000CC60,  // **..**...**.....
+     0x0000CCC0,  // **..**..**......
+     0x0000CD80,  // **..**.**.......
+     0x00007980,  // .****..**.......
+     0x0000033C,  // ......**..****..
+     0x00000366,  // ......**.**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000C66,  // ....**...**..**.
+     0x0000183C,  // ...**.....****..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -175,18 +175,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F0,  // ..*******...
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x000003E0,  // ...*****....
-     0x000003C0,  // ...****.....
-     0x000006E8,  // ..**.***.*..
-     0x00000CEC,  // .**..***.**.
-     0x00000C78,  // .**...****..
-     0x00000C3C,  // .**....****.
-     0x000007FE,  // ..**********
-     0x000003C4,  // ...****...*.
+     0x000001F0,  // ...*****....
+     0x000003F8,  // ..*******...
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x000001F0,  // ...*****....
+     0x000001E0,  // ...****.....
+     0x00000374,  // ..**.***.*..
+     0x00000676,  // .**..***.**.
+     0x0000063C,  // .**...****..
+     0x0000061E,  // .**....****.
+     0x000003FF,  // ..**********
+     0x000001E2,  // ...****...*.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -203,10 +203,10 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -231,21 +231,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -259,21 +259,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -287,11 +287,11 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000010,  // ...*...
-     0x0000007C,  // .*****.
-     0x00000010,  // ...*...
-     0x00000028,  // ..*.*..
-     0x0000006C,  // .**.**.
+     0x00000008,  // ...*...
+     0x0000003E,  // .*****.
+     0x00000008,  // ...*...
+     0x00000014,  // ..*.*..
+     0x00000036,  // .**.**.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -317,14 +317,14 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -353,11 +353,11 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000008,  // ..*..
-     0x00000008,  // ..*..
-     0x00000010,  // .*...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -378,8 +378,8 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -409,8 +409,8 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -420,32 +420,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .....
   },
   {             // 47
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 48
      9, 25,
@@ -455,18 +455,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x0000039C,  // ***..***.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000039C,  // ***..***.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x000001CE,  // ***..***.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x000001CE,  // ***..***.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -483,18 +483,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000070,  // ...***...
-     0x000000F0,  // ..****...
-     0x000001B0,  // .**.**...
-     0x00000130,  // .*..**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
+     0x00000018,  // ....**...
+     0x00000038,  // ...***...
+     0x00000078,  // ..****...
+     0x000000D8,  // .**.**...
+     0x00000098,  // .*..**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -511,18 +511,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x0000038C,  // ***...**.
-     0x0000030C,  // **....**.
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000038,  // ....***..
-     0x00000070,  // ...***...
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000003FC,  // ********.
-     0x000003FC,  // ********.
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x000001C6,  // ***...**.
+     0x00000186,  // **....**.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x0000001C,  // ....***..
+     0x00000038,  // ...***...
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000001FE,  // ********.
+     0x000001FE,  // ********.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -539,18 +539,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000038C,  // ***...**.
-     0x0000000C,  // ......**.
-     0x00000078,  // ...****..
-     0x00000078,  // ...****..
-     0x0000001C,  // .....***.
-     0x0000000C,  // ......**.
-     0x0000030C,  // **....**.
-     0x0000039C,  // ***..***.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000001C6,  // ***...**.
+     0x00000006,  // ......**.
+     0x0000003C,  // ...****..
+     0x0000003C,  // ...****..
+     0x0000000E,  // .....***.
+     0x00000006,  // ......**.
+     0x00000186,  // **....**.
+     0x000001CE,  // ***..***.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -567,18 +567,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000018,  // .....**..
-     0x00000038,  // ....***..
-     0x00000038,  // ....***..
-     0x00000078,  // ...****..
-     0x000000D8,  // ..**.**..
-     0x000000D8,  // ..**.**..
-     0x00000198,  // .**..**..
-     0x00000318,  // **...**..
-     0x000003FC,  // ********.
-     0x000003FC,  // ********.
-     0x00000018,  // .....**..
-     0x00000018,  // .....**..
+     0x0000000C,  // .....**..
+     0x0000001C,  // ....***..
+     0x0000001C,  // ....***..
+     0x0000003C,  // ...****..
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x000000CC,  // .**..**..
+     0x0000018C,  // **...**..
+     0x000001FE,  // ********.
+     0x000001FE,  // ********.
+     0x0000000C,  // .....**..
+     0x0000000C,  // .....**..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -595,18 +595,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001F8,  // .******..
-     0x000001F8,  // .******..
-     0x00000180,  // .**......
-     0x00000300,  // **.......
-     0x000003F0,  // ******...
-     0x000003F8,  // *******..
-     0x0000031C,  // **...***.
-     0x0000000C,  // ......**.
-     0x0000030C,  // **....**.
-     0x0000039C,  // ***..***.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x000000FC,  // .******..
+     0x000000FC,  // .******..
+     0x000000C0,  // .**......
+     0x00000180,  // **.......
+     0x000001F8,  // ******...
+     0x000001FC,  // *******..
+     0x0000018E,  // **...***.
+     0x00000006,  // ......**.
+     0x00000186,  // **....**.
+     0x000001CE,  // ***..***.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -623,18 +623,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x00000300,  // **.......
-     0x00000370,  // **.***...
-     0x000003F8,  // *******..
-     0x0000039C,  // ***..***.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000018C,  // .**...**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x00000180,  // **.......
+     0x000001B8,  // **.***...
+     0x000001FC,  // *******..
+     0x000001CE,  // ***..***.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -651,18 +651,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000003FC,  // ********.
-     0x000003FC,  // ********.
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
-     0x000000C0,  // ..**.....
+     0x000001FE,  // ********.
+     0x000001FE,  // ********.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
+     0x00000060,  // ..**.....
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -679,18 +679,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x000001F8,  // .******..
-     0x000001F8,  // .******..
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x000000FC,  // .******..
+     0x000000FC,  // .******..
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -707,18 +707,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x00000318,  // **...**..
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x0000039C,  // ***..***.
-     0x000001FC,  // .*******.
-     0x000000EC,  // ..***.**.
-     0x0000000C,  // ......**.
-     0x00000318,  // **...**..
-     0x000003F8,  // *******..
-     0x000001F0,  // .*****...
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x0000018C,  // **...**..
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x000001CE,  // ***..***.
+     0x000000FE,  // .*******.
+     0x00000076,  // ..***.**.
+     0x00000006,  // ......**.
+     0x0000018C,  // **...**..
+     0x000001FC,  // *******..
+     0x000000F8,  // .*****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -738,15 +738,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -766,18 +766,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000010,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000008,  // ..*...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -793,15 +793,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000008,  // .......*..
-     0x00000038,  // .....***..
-     0x000000F0,  // ...****...
-     0x000003C0,  // .****.....
-     0x00000700,  // ***.......
-     0x000003C0,  // .****.....
-     0x000000F0,  // ...****...
-     0x00000038,  // .....***..
-     0x00000008,  // .......*..
+     0x00000004,  // .......*..
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000380,  // ***.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000004,  // .......*..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -822,12 +822,12 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000007FC,  // *********.
-     0x000007FC,  // *********.
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -849,15 +849,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000400,  // *.........
-     0x00000700,  // ***.......
-     0x000003C0,  // .****.....
-     0x000000F0,  // ...****...
-     0x00000038,  // .....***..
-     0x000000F0,  // ...****...
-     0x000003C0,  // .****.....
-     0x00000700,  // ***.......
-     0x00000400,  // *.........
+     0x00000200,  // *.........
+     0x00000380,  // ***.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000380,  // ***.......
+     0x00000200,  // *.........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -875,18 +875,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000001C,  // ......***.
-     0x00000038,  // .....***..
-     0x00000070,  // ....***...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x0000000E,  // ......***.
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -903,22 +903,22 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00000FC0,  // ......******.....
-     0x00003FF0,  // ....**********...
-     0x00007038,  // ...***......***..
-     0x0000EED8,  // ..***.***.**.**..
-     0x0000DFCC,  // ..**.*******..**.
-     0x0001D9CC,  // .***.**..***..**.
-     0x0001B1CC,  // .**.**...***..**.
-     0x0001B18C,  // .**.**...**...**.
-     0x0001B19C,  // .**.**...**..***.
-     0x0001B3B8,  // .**.**..***.***..
-     0x0001BFF0,  // .**.**********...
-     0x0000DDE0,  // ..**.***.****....
-     0x0000E00E,  // ..***.........***
-     0x0000703C,  // ...***......****.
-     0x00003FF8,  // ....***********..
-     0x00000FE0,  // ......*******....
+     0x000007E0,  // ......******.....
+     0x00001FF8,  // ....**********...
+     0x0000381C,  // ...***......***..
+     0x0000776C,  // ..***.***.**.**..
+     0x00006FE6,  // ..**.*******..**.
+     0x0000ECE6,  // .***.**..***..**.
+     0x0000D8E6,  // .**.**...***..**.
+     0x0000D8C6,  // .**.**...**...**.
+     0x0000D8CE,  // .**.**...**..***.
+     0x0000D9DC,  // .**.**..***.***..
+     0x0000DFF8,  // .**.**********...
+     0x00006EF0,  // ..**.***.****....
+     0x00007007,  // ..***.........***
+     0x0000381E,  // ...***......****.
+     0x00001FFC,  // ....***********..
+     0x000007F0,  // ......*******....
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -931,18 +931,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000007FC,  // .*********.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000C06,  // **.......**
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000003FE,  // .*********.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000603,  // **.......**
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -959,18 +959,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -987,18 +987,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000E08,  // .***.....*..
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000E08,  // .***.....*..
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000704,  // .***.....*..
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000704,  // .***.....*..
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1015,18 +1015,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FE0,  // .*******....
-     0x00000FF8,  // .*********..
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C18,  // .**.....**..
-     0x00000FF8,  // .*********..
-     0x00000FE0,  // .*******....
+     0x000007F0,  // .*******....
+     0x000007FC,  // .*********..
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060C,  // .**.....**..
+     0x000007FC,  // .*********..
+     0x000007F0,  // .*******....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1043,18 +1043,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1071,18 +1071,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003F8,  // .*******..
-     0x000003F8,  // .*******..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1099,18 +1099,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003F0,  // ....******...
-     0x00000FF8,  // ..*********..
-     0x00000C1C,  // ..**.....***.
-     0x00001C08,  // .***......*..
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x0000187C,  // .**....*****.
-     0x0000187C,  // .**....*****.
-     0x00001C0C,  // .***......**.
-     0x00000C1C,  // ..**.....***.
-     0x00000FFC,  // ..**********.
-     0x000003F0,  // ....******...
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000E04,  // .***......*..
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C3E,  // .**....*****.
+     0x00000C3E,  // .**....*****.
+     0x00000E06,  // .***......**.
+     0x0000060E,  // ..**.....***.
+     0x000007FE,  // ..**********.
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1127,18 +1127,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1155,18 +1155,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1183,18 +1183,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000030C,  // **....**.
-     0x0000031C,  // **...***.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000186,  // **....**.
+     0x0000018E,  // **...***.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1211,18 +1211,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C1C,  // .**.....***.
-     0x00000C18,  // .**.....**..
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000CC0,  // .**..**.....
-     0x00000DE0,  // .**.****....
-     0x00000F70,  // .****.***...
-     0x00000E30,  // .***...**...
-     0x00000C38,  // .**....***..
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000006F0,  // .**.****....
+     0x000007B8,  // .****.***...
+     0x00000718,  // .***...**...
+     0x0000061C,  // .**....***..
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1239,18 +1239,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1267,18 +1267,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001C1C,  // .***.....***.
-     0x00001C1C,  // .***.....***.
-     0x00001E3C,  // .****...****.
-     0x00001E3C,  // .****...****.
-     0x00001A2C,  // .**.*...*.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x000019CC,  // .**..***..**.
-     0x000019CC,  // .**..***..**.
-     0x000019CC,  // .**..***..**.
-     0x0000188C,  // .**...*...**.
+     0x00000E0E,  // .***.....***.
+     0x00000E0E,  // .***.....***.
+     0x00000F1E,  // .****...****.
+     0x00000F1E,  // .****...****.
+     0x00000D16,  // .**.*...*.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000CE6,  // .**..***..**.
+     0x00000CE6,  // .**..***..**.
+     0x00000CE6,  // .**..***..**.
+     0x00000C46,  // .**...*...**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1295,18 +1295,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x00000F0C,  // .****....**.
-     0x00000F0C,  // .****....**.
-     0x00000D8C,  // .**.**...**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000C6C,  // .**...**.**.
-     0x00000C3C,  // .**....****.
-     0x00000C3C,  // .**....****.
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x00000786,  // .****....**.
+     0x00000786,  // .****....**.
+     0x000006C6,  // .**.**...**.
+     0x00000666,  // .**..**..**.
+     0x00000666,  // .**..**..**.
+     0x00000636,  // .**...**.**.
+     0x0000061E,  // .**....****.
+     0x0000061E,  // .**....****.
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1323,18 +1323,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00001C0C,  // .***......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x00000E06,  // .***......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1351,18 +1351,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x000007F8,  // .********..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000061C,  // .**....***.
-     0x000007F8,  // .********..
-     0x000007F0,  // .*******...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x000003F8,  // .*******...
+     0x000003FC,  // .********..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000030E,  // .**....***.
+     0x000003FC,  // .********..
+     0x000003F8,  // .*******...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1379,19 +1379,19 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00001C0C,  // .***......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x000018DC,  // .**...**.***.
-     0x00000C78,  // ..**...****..
-     0x00000FF8,  // ..*********..
-     0x000003D8,  // ....****.**..
-     0x0000000C,  // ..........**.
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x00000E06,  // .***......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C6E,  // .**...**.***.
+     0x0000063C,  // ..**...****..
+     0x000007FC,  // ..*********..
+     0x000001EC,  // ....****.**..
+     0x00000006,  // ..........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1407,18 +1407,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FE0,  // .*******....
-     0x00000C70,  // .**...***...
-     0x00000C38,  // .**....***..
-     0x00000C18,  // .**.....**..
-     0x00000C1C,  // .**.....***.
-     0x00000C0E,  // .**......***
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F0,  // .*******....
+     0x00000638,  // .**...***...
+     0x0000061C,  // .**....***..
+     0x0000060C,  // .**.....**..
+     0x0000060E,  // .**.....***.
+     0x00000607,  // .**......***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1435,18 +1435,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x0000071C,  // .***...***.
-     0x0000060C,  // .**.....**.
-     0x00000780,  // .****......
-     0x000003F0,  // ..******...
-     0x000000F8,  // ....*****..
-     0x0000001C,  // .......***.
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000038E,  // .***...***.
+     0x00000306,  // .**.....**.
+     0x000003C0,  // .****......
+     0x000001F8,  // ..******...
+     0x0000007C,  // ....*****..
+     0x0000000E,  // .......***.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1463,18 +1463,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000007FE,  // **********
-     0x000007FE,  // **********
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x000003FF,  // **********
+     0x000003FF,  // **********
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1491,18 +1491,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000E1C,  // .***....***.
-     0x000007F8,  // ..********..
-     0x000003F0,  // ...******...
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000070E,  // .***....***.
+     0x000003FC,  // ..********..
+     0x000001F8,  // ...******...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1519,18 +1519,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000C06,  // **.......**
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000003B8,  // ..***.***..
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
+     0x00000603,  // **.......**
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x000001DC,  // ..***.***..
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1547,18 +1547,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x00030706,  // **.....***.....**
-     0x0003870E,  // ***....***....***
-     0x00018F8C,  // .**...*****...**.
-     0x00018D8C,  // .**...**.**...**.
-     0x00018D8C,  // .**...**.**...**.
-     0x0000DDD8,  // ..**.***.***.**..
-     0x0000D8D8,  // ..**.**...**.**..
-     0x0000D8D8,  // ..**.**...**.**..
-     0x000078F8,  // ...****...*****..
-     0x00007070,  // ...***.....***...
-     0x00007070,  // ...***.....***...
-     0x00007070,  // ...***.....***...
+     0x00018383,  // **.....***.....**
+     0x0001C387,  // ***....***....***
+     0x0000C7C6,  // .**...*****...**.
+     0x0000C6C6,  // .**...**.**...**.
+     0x0000C6C6,  // .**...**.**...**.
+     0x00006EEC,  // ..**.***.***.**..
+     0x00006C6C,  // ..**.**...**.**..
+     0x00006C6C,  // ..**.**...**.**..
+     0x00003C7C,  // ...****...*****..
+     0x00003838,  // ...***.....***...
+     0x00003838,  // ...***.....***...
+     0x00003838,  // ...***.....***...
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -1575,18 +1575,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x00000318,  // ..**...**..
-     0x000001B0,  // ...**.**...
-     0x000001F0,  // ...*****...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001F0,  // ...*****...
-     0x000001B0,  // ...**.**...
-     0x00000318,  // ..**...**..
-     0x0000071C,  // .***...***.
-     0x0000060C,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x0000018C,  // ..**...**..
+     0x000000D8,  // ...**.**...
+     0x000000F8,  // ...*****...
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000F8,  // ...*****...
+     0x000000D8,  // ...**.**...
+     0x0000018C,  // ..**...**..
+     0x0000038E,  // .***...***.
+     0x00000306,  // .**.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1596,32 +1596,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
   },
   {             // 89
-     10, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000C0C,  // .**......**.
-     0x00000E1C,  // .***....***.
-     0x00000618,  // ..**....**..
-     0x00000330,  // ...**..**...
-     0x00000370,  // ...**.***...
-     0x000001E0,  // ....****....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     12, 25,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000606,  // .**......**.
+     0x0000070E,  // .***....***.
+     0x0000030C,  // ..**....**..
+     0x00000198,  // ...**..**...
+     0x000001B8,  // ...**.***...
+     0x000000F0,  // ....****....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 90
      9, 25,
@@ -1631,18 +1631,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FE,  // .********
-     0x000001FE,  // .********
-     0x0000000C,  // ......**.
-     0x00000018,  // .....**..
-     0x00000038,  // ....***..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000E0,  // ..***....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x000003FE,  // *********
-     0x000003FE,  // *********
+     0x000000FF,  // .********
+     0x000000FF,  // .********
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x0000001C,  // ....***..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000070,  // ..***....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000001FF,  // *********
+     0x000001FF,  // *********
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1659,53 +1659,53 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
   },
   {             // 92
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 93
      6, 25,
@@ -1715,21 +1715,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x0000003C,  // .****.
-     0x0000003C,  // .****.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1743,13 +1743,13 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x000000F0,  // ...****...
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x0000030C,  // .**....**.
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1784,8 +1784,8 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000003FE,  // *********
-     0x000003FE,  // *********
+     0x000001FF,  // *********
+     0x000001FF,  // *********
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1799,8 +1799,8 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1830,15 +1830,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x0000003C,  // ....****.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000000F6,  // ..****.**
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x0000001E,  // ....****.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x0000007B,  // ..****.**
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1855,18 +1855,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000370,  // .**.***...
-     0x000003F8,  // .*******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000003F8,  // .*******..
-     0x00000370,  // .**.***...
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FC,  // .*******..
+     0x000001B8,  // .**.***...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1886,15 +1886,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x000001CC,  // .***..**.
-     0x000000FC,  // ..******.
-     0x00000078,  // ...****..
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000E6,  // .***..**.
+     0x0000007E,  // ..******.
+     0x0000003C,  // ...****..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1911,18 +1911,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x000000EC,  // ...***.**.
-     0x000001FC,  // ..*******.
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001FC,  // ..*******.
-     0x000000EC,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000076,  // ...***.**.
+     0x000000FE,  // ..*******.
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1942,15 +1942,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x00000180,  // .**......
-     0x000001CC,  // .***..**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000C0,  // .**......
+     0x000000E6,  // .***..**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1960,25 +1960,25 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
   },
   {             // 102
-     5, 25,
+     6, 25,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001E,  // ..****
-     0x0000003E,  // .*****
-     0x00000030,  // .**...
-     0x0000007C,  // *****.
-     0x0000007C,  // *****.
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
+     0x0000000F,  // ..****
+     0x0000001F,  // .*****
+     0x00000018,  // .**...
+     0x0000003E,  // *****.
+     0x0000003E,  // *****.
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1998,18 +1998,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000EC,  // ...***.**.
-     0x000001FC,  // ..*******.
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001FC,  // ..*******.
-     0x000000EC,  // ...***.**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000001F8,  // ..******..
+     0x00000076,  // ...***.**.
+     0x000000FE,  // ..*******.
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000000FC,  // ..******..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2023,18 +2023,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2051,18 +2051,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -2072,32 +2072,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
   },
   {             // 106
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     5, 25,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
   },
   {             // 107
      9, 25,
@@ -2107,18 +2107,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x0000018C,  // .**...**.
-     0x00000198,  // .**..**..
-     0x000001B0,  // .**.**...
-     0x000001F0,  // .*****...
-     0x000001F8,  // .******..
-     0x000001D8,  // .***.**..
-     0x00000198,  // .**..**..
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C6,  // .**...**.
+     0x000000CC,  // .**..**..
+     0x000000D8,  // .**.**...
+     0x000000F8,  // .*****...
+     0x000000FC,  // .******..
+     0x000000EC,  // .***.**..
+     0x000000CC,  // .**..**..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2135,18 +2135,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -2166,15 +2166,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003738,  // .**.***..***..
-     0x00003FFC,  // .************.
-     0x000039CC,  // .***..***..**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
+     0x00001B9C,  // .**.***..***..
+     0x00001FFE,  // .************.
+     0x00001CE6,  // .***..***..**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -2194,15 +2194,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2222,15 +2222,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2250,18 +2250,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000370,  // .**.***...
-     0x000003F8,  // .*******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000003F8,  // .*******..
-     0x00000370,  // .**.***...
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FC,  // .*******..
+     0x000001B8,  // .**.***...
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2278,18 +2278,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000EC,  // ...***.**.
-     0x000001FC,  // ..*******.
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001FC,  // ..*******.
-     0x000000EC,  // ...***.**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
+     0x00000076,  // ...***.**.
+     0x000000FE,  // ..*******.
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2306,15 +2306,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000006E,  // .**.***
-     0x0000007E,  // .******
-     0x00000070,  // .***...
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
+     0x00000037,  // .**.***
+     0x0000003F,  // .******
+     0x00000038,  // .***...
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -2334,15 +2334,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x000001E0,  // .****....
-     0x000000F8,  // ..*****..
-     0x0000001C,  // .....***.
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000000F8,  // ..*****..
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x000000F0,  // .****....
+     0x0000007C,  // ..*****..
+     0x0000000E,  // .....***.
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x0000007C,  // ..*****..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2359,18 +2359,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000010,  // ..*...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x0000007C,  // *****.
-     0x0000007C,  // *****.
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x0000003C,  // .****.
-     0x0000001C,  // ..***.
+     0x00000008,  // ..*...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000003E,  // *****.
+     0x0000003E,  // *****.
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001E,  // .****.
+     0x0000000E,  // ..***.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -2390,15 +2390,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x000003FC,  // .********.
-     0x000001EC,  // ..****.**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -2418,15 +2418,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x0000018C,  // .**...**.
-     0x000000D8,  // ..**.**..
-     0x000000D8,  // ..**.**..
-     0x000000D8,  // ..**.**..
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2446,15 +2446,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000031C6,  // **...***...**
-     0x000031C6,  // **...***...**
-     0x000019CC,  // .**..***..**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00000E38,  // ..***...***..
-     0x00000E38,  // ..***...***..
-     0x00000E38,  // ..***...***..
+     0x000018E3,  // **...***...**
+     0x000018E3,  // **...***...**
+     0x00000CE6,  // .**..***..**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x0000071C,  // ..***...***..
+     0x0000071C,  // ..***...***..
+     0x0000071C,  // ..***...***..
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -2474,15 +2474,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000D8,  // ..**.**..
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x0000006C,  // ..**.**..
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2492,32 +2492,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
   },
   {             // 121
-     9, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x000001F0,  // ...*****...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x000003C0,  // ..****.....
-     0x00000380,  // ..***......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x000000F8,  // ...*****...
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x00000060,  // ....**.....
+     0x000001E0,  // ..****.....
+     0x000001C0,  // ..***......
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
   {             // 122
      9, 25,
@@ -2530,15 +2530,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x00000018,  // .....**..
-     0x00000038,  // ....***..
-     0x00000070,  // ...***...
-     0x000000E0,  // ..***....
-     0x000000C0,  // ..**.....
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x0000000C,  // .....**..
+     0x0000001C,  // ....***..
+     0x00000038,  // ...***...
+     0x00000070,  // ..***....
+     0x00000060,  // ..**.....
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -2555,21 +2555,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000000E,  // ....***
-     0x0000001E,  // ...****
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000070,  // .***...
-     0x00000070,  // .***...
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x0000001E,  // ...****
-     0x0000000E,  // ....***
+     0x00000007,  // ....***
+     0x0000000F,  // ...****
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000038,  // .***...
+     0x00000038,  // .***...
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000F,  // ...****
+     0x00000007,  // ....***
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -2583,22 +2583,22 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -2611,21 +2611,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x000000E0,  // ***....
-     0x000000F0,  // ****...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x0000001C,  // ...***.
-     0x0000001C,  // ...***.
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x00000030,  // ..**...
-     0x000000F0,  // ****...
-     0x000000E0,  // ***....
+     0x00000070,  // ***....
+     0x00000078,  // ****...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000000E,  // ...***.
+     0x0000000E,  // ...***.
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000078,  // ****...
+     0x00000070,  // ***....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -2644,9 +2644,9 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003C4,  // .****...*.
-     0x000007FC,  // *********.
-     0x00000478,  // *...****..
+     0x000001E2,  // .****...*.
+     0x000003FE,  // *********.
+     0x0000023C,  // *...****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3616,21 +3616,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000198,  // ...**..**..
-     0x00000198,  // ...**..**..
+     0x000000CC,  // ...**..**..
+     0x000000CC,  // ...**..**..
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3647,18 +3647,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFC0,  // **********.....
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000DF0,  // ....**.*****...
-     0x00000FF8,  // ....*********..
-     0x00000E1C,  // ....***....***.
-     0x00000C0C,  // ....**......**.
-     0x00000C0C,  // ....**......**.
-     0x00000C1C,  // ....**.....***.
-     0x00000CF8,  // ....**..*****..
-     0x00000CF0,  // ....**..****...
+     0x00007FE0,  // **********.....
+     0x00007FE0,  // **********.....
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x000006F8,  // ....**.*****...
+     0x000007FC,  // ....*********..
+     0x0000070E,  // ....***....***.
+     0x00000606,  // ....**......**.
+     0x00000606,  // ....**......**.
+     0x0000060E,  // ....**.....***.
+     0x0000067C,  // ....**..*****..
+     0x00000678,  // ....**..****...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3672,21 +3672,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3703,18 +3703,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000C08,  // .**......*..
-     0x00000C00,  // .**.........
-     0x00000FC0,  // .******.....
-     0x00000FC0,  // .******.....
-     0x00000C00,  // .**.........
-     0x00000C08,  // .**......*..
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000604,  // .**......*..
+     0x00000600,  // .**.........
+     0x000007E0,  // .******.....
+     0x000007E0,  // .******.....
+     0x00000600,  // .**.........
+     0x00000604,  // .**......*..
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3731,18 +3731,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003F8,  // ..*******..
-     0x0000071C,  // .***...***.
-     0x0000060C,  // .**.....**.
-     0x00000780,  // .****......
-     0x000003F0,  // ..******...
-     0x000000F8,  // ....*****..
-     0x0000001C,  // .......***.
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000038E,  // .***...***.
+     0x00000306,  // .**.....**.
+     0x000003C0,  // .****......
+     0x000001F8,  // ..******...
+     0x0000007C,  // ....*****..
+     0x0000000E,  // .......***.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3759,18 +3759,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -3780,32 +3780,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
   },
   {             // 167
-     4, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000066,  // **..**
-     0x00000066,  // **..**
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 168
      9, 25,
@@ -3815,18 +3815,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000030C,  // **....**.
-     0x0000031C,  // **...***.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000186,  // **....**.
+     0x0000018E,  // **...***.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -3843,18 +3843,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x0003FC00,  // ..********.........
-     0x0003FC00,  // ..********.........
-     0x00030C00,  // ..**....**.........
-     0x00030C00,  // ..**....**.........
-     0x00030C00,  // ..**....**.........
-     0x00030FF0,  // ..**....********...
-     0x00030FF8,  // ..**....*********..
-     0x00030C1C,  // ..**....**.....***.
-     0x00030C0C,  // ..**....**......**.
-     0x00030C1C,  // ..**....**.....***.
-     0x000F0FF8,  // ****....*********..
-     0x000E0FF0,  // ***.....********...
+     0x0001FE00,  // ..********.........
+     0x0001FE00,  // ..********.........
+     0x00018600,  // ..**....**.........
+     0x00018600,  // ..**....**.........
+     0x00018600,  // ..**....**.........
+     0x000187F8,  // ..**....********...
+     0x000187FC,  // ..**....*********..
+     0x0001860E,  // ..**....**.....***.
+     0x00018606,  // ..**....**......**.
+     0x0001860E,  // ..**....**.....***.
+     0x000787FC,  // ****....*********..
+     0x000707F8,  // ***.....********...
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -3871,18 +3871,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x00030C00,  // .**....**.........
-     0x00030C00,  // .**....**.........
-     0x00030C00,  // .**....**.........
-     0x00030C00,  // .**....**.........
-     0x00030C00,  // .**....**.........
-     0x0003FFF0,  // .**************...
-     0x0003FFF8,  // .***************..
-     0x00030C1C,  // .**....**.....***.
-     0x00030C0C,  // .**....**......**.
-     0x00030C1C,  // .**....**.....***.
-     0x00030FF8,  // .**....*********..
-     0x00030FF0,  // .**....********...
+     0x00018600,  // .**....**.........
+     0x00018600,  // .**....**.........
+     0x00018600,  // .**....**.........
+     0x00018600,  // .**....**.........
+     0x00018600,  // .**....**.........
+     0x0001FFF8,  // .**************...
+     0x0001FFFC,  // .***************..
+     0x0001860E,  // .**....**.....***.
+     0x00018606,  // .**....**......**.
+     0x0001860E,  // .**....**.....***.
+     0x000187FC,  // .**....*********..
+     0x000187F8,  // .**....********...
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -3899,18 +3899,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FFC0,  // **********.....
-     0x0000FFC0,  // **********.....
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000FF0,  // ....********...
-     0x00000FF8,  // ....*********..
-     0x00000C1C,  // ....**.....***.
-     0x00000C0C,  // ....**......**.
-     0x00000C0C,  // ....**......**.
-     0x00000C0C,  // ....**......**.
-     0x00000C0C,  // ....**......**.
-     0x00000C0C,  // ....**......**.
+     0x00007FE0,  // **********.....
+     0x00007FE0,  // **********.....
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x000007F8,  // ....********...
+     0x000007FC,  // ....*********..
+     0x0000060E,  // ....**.....***.
+     0x00000606,  // ....**......**.
+     0x00000606,  // ....**......**.
+     0x00000606,  // ....**......**.
+     0x00000606,  // ....**......**.
+     0x00000606,  // ....**......**.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3924,21 +3924,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x0000030E,  // .**....***
-     0x0000031E,  // .**...****
-     0x00000338,  // .**..***..
-     0x00000330,  // .**..**...
-     0x00000370,  // .**.***...
-     0x000003E0,  // .*****....
-     0x000003F0,  // .******...
-     0x00000338,  // .**..***..
-     0x00000318,  // .**...**..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000306,  // .**.....**
+     0x00000187,  // .**....***
+     0x0000018F,  // .**...****
+     0x0000019C,  // .**..***..
+     0x00000198,  // .**..**...
+     0x000001B8,  // .**.***...
+     0x000001F0,  // .*****....
+     0x000001F8,  // .******...
+     0x0000019C,  // .**..***..
+     0x0000018C,  // .**...**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000183,  // .**.....**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3962,8 +3962,8 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3976,32 +3976,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ......
   },
   {             // 174
-     11, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000220,  // ....*...*....
-     0x000001C0,  // .....***.....
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000110,  // ....*...*....
+     0x000000E0,  // .....***.....
+     0x00000000,  // .............
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060C,  // ..**.....**..
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x00000040,  // ......*......
+     0x000000C0,  // .....**......
+     0x000003C0,  // ...****......
+     0x00000380,  // ...***.......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000003E0,  // ....*****....
-     0x000001C0,  // .....***.....
-     0x00000080,  // ......*......
-     0x00000180,  // .....**......
-     0x00000780,  // ...****......
-     0x00000700,  // ...***.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
   },
   {             // 175
      12, 25,
@@ -4011,21 +4011,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4039,18 +4039,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000003F8,  // ..*******..
-     0x000007FC,  // .*********.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000C06,  // **.......**
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000003FE,  // .*********.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000603,  // **.......**
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4067,18 +4067,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4095,18 +4095,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4123,18 +4123,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4151,21 +4151,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00001FFE,  // ************
-     0x00001FFE,  // ************
-     0x00001806,  // **........**
-     0x00001806,  // **........**
-     0x00001806,  // **........**
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000FFF,  // ************
+     0x00000FFF,  // ************
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
+     0x00000C03,  // **........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4179,18 +4179,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4207,18 +4207,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000718E,  // ***...**...***
-     0x0000799E,  // ****..**..****
-     0x00001998,  // ..**..**..**..
-     0x00000DB8,  // ...**.**.***..
-     0x00000DB0,  // ...**.**.**...
-     0x000007E0,  // ....******....
-     0x00000FF0,  // ...********...
-     0x00001DB8,  // ..***.**.***..
-     0x00001998,  // ..**..**..**..
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00006186,  // **....**....**
+     0x000038C7,  // ***...**...***
+     0x00003CCF,  // ****..**..****
+     0x00000CCC,  // ..**..**..**..
+     0x000006DC,  // ...**.**.***..
+     0x000006D8,  // ...**.**.**...
+     0x000003F0,  // ....******....
+     0x000007F8,  // ...********...
+     0x00000EDC,  // ..***.**.***..
+     0x00000CCC,  // ..**..**..**..
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000030C3,  // **....**....**
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4235,18 +4235,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F0,  // ..******...
-     0x000007F8,  // .********..
-     0x00000E1C,  // ***....***.
-     0x0000040C,  // .*......**.
-     0x00000018,  // .......**..
-     0x00000070,  // .....***...
-     0x00000078,  // .....****..
-     0x0000000C,  // ........**.
-     0x0000040C,  // .*......**.
-     0x00000E1C,  // ***....***.
-     0x000007F8,  // .********..
-     0x000003F0,  // ..******...
+     0x000001F8,  // ..******...
+     0x000003FC,  // .********..
+     0x0000070E,  // ***....***.
+     0x00000206,  // .*......**.
+     0x0000000C,  // .......**..
+     0x00000038,  // .....***...
+     0x0000003C,  // .....****..
+     0x00000006,  // ........**.
+     0x00000206,  // .*......**.
+     0x0000070E,  // ***....***.
+     0x000003FC,  // .********..
+     0x000001F8,  // ..******...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4263,18 +4263,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C3C,  // .**....****.
-     0x00000C3C,  // .**....****.
-     0x00000C6C,  // .**...**.**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000D8C,  // .**.**...**.
-     0x00000F0C,  // .****....**.
-     0x00000F0C,  // .****....**.
-     0x00000E0C,  // .***.....**.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000061E,  // .**....****.
+     0x0000061E,  // .**....****.
+     0x00000636,  // .**...**.**.
+     0x00000666,  // .**..**..**.
+     0x00000666,  // .**..**..**.
+     0x000006C6,  // .**.**...**.
+     0x00000786,  // .****....**.
+     0x00000786,  // .****....**.
+     0x00000706,  // .***.....**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4288,21 +4288,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000110,  // ....*...*...
-     0x000000E0,  // .....***....
+     0x00000088,  // ....*...*...
+     0x00000070,  // .....***....
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000C3C,  // .**....****.
-     0x00000C3C,  // .**....****.
-     0x00000C6C,  // .**...**.**.
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x00000D8C,  // .**.**...**.
-     0x00000F0C,  // .****....**.
-     0x00000F0C,  // .****....**.
-     0x00000E0C,  // .***.....**.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000061E,  // .**....****.
+     0x0000061E,  // .**....****.
+     0x00000636,  // .**...**.**.
+     0x00000666,  // .**..**..**.
+     0x00000666,  // .**..**..**.
+     0x000006C6,  // .**.**...**.
+     0x00000786,  // .****....**.
+     0x00000786,  // .****....**.
+     0x00000706,  // .***.....**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4319,18 +4319,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030E,  // .**....***
-     0x0000031E,  // .**...****
-     0x00000338,  // .**..***..
-     0x00000330,  // .**..**...
-     0x00000370,  // .**.***...
-     0x000003E0,  // .*****....
-     0x000003F0,  // .******...
-     0x00000338,  // .**..***..
-     0x00000318,  // .**...**..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000306,  // .**.....**
+     0x00000187,  // .**....***
+     0x0000018F,  // .**...****
+     0x0000019C,  // .**..***..
+     0x00000198,  // .**..**...
+     0x000001B8,  // .**.***...
+     0x000001F0,  // .*****....
+     0x000001F8,  // .******...
+     0x0000019C,  // .**..***..
+     0x0000018C,  // .**...**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000183,  // .**.....**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4347,18 +4347,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007FC,  // ..*********.
-     0x000007FC,  // ..*********.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x0000060C,  // ..**.....**.
-     0x00001E0C,  // ****.....**.
-     0x00001C0C,  // ***......**.
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000306,  // ..**.....**.
+     0x00000F06,  // ****.....**.
+     0x00000E06,  // ***......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4375,18 +4375,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001C1C,  // .***.....***.
-     0x00001C1C,  // .***.....***.
-     0x00001E3C,  // .****...****.
-     0x00001E3C,  // .****...****.
-     0x00001A2C,  // .**.*...*.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x000019CC,  // .**..***..**.
-     0x000019CC,  // .**..***..**.
-     0x000019CC,  // .**..***..**.
-     0x0000188C,  // .**...*...**.
+     0x00000E0E,  // .***.....***.
+     0x00000E0E,  // .***.....***.
+     0x00000F1E,  // .****...****.
+     0x00000F1E,  // .****...****.
+     0x00000D16,  // .**.*...*.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000CE6,  // .**..***..**.
+     0x00000CE6,  // .**..***..**.
+     0x00000CE6,  // .**..***..**.
+     0x00000C46,  // .**...*...**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4403,18 +4403,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4431,18 +4431,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000003E0,  // ....*****....
-     0x00000FF8,  // ..*********..
-     0x00000C18,  // ..**.....**..
-     0x00001C0C,  // .***......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x00000E06,  // .***......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4459,18 +4459,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4487,18 +4487,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007F0,  // .*******...
-     0x000007F8,  // .********..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000061C,  // .**....***.
-     0x000007F8,  // .********..
-     0x000007F0,  // .*******...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x000003F8,  // .*******...
+     0x000003FC,  // .********..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000030E,  // .**....***.
+     0x000003FC,  // .********..
+     0x000003F8,  // .*******...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4515,18 +4515,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007F8,  // ..********..
-     0x0000061C,  // ..**....***.
-     0x00000E08,  // .***.....*..
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000E08,  // .***.....*..
-     0x0000061C,  // ..**....***.
-     0x000007F8,  // ..********..
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000704,  // .***.....*..
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000704,  // .***.....*..
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4543,18 +4543,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000007FE,  // **********
-     0x000007FE,  // **********
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x000003FF,  // **********
+     0x000003FF,  // **********
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4564,32 +4564,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
   },
   {             // 195
-     11, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000180C,  // .**.......**.
-     0x00001C1C,  // .***.....***.
-     0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000003E0,  // ....*****....
-     0x000001C0,  // .....***.....
-     0x00000080,  // ......*......
-     0x00000180,  // .....**......
-     0x00000780,  // ...****......
-     0x00000700,  // ...***.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
+     13, 25,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x0000060C,  // ..**.....**..
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x00000040,  // ......*......
+     0x000000C0,  // .....**......
+     0x000003C0,  // ...****......
+     0x00000380,  // ...***.......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
   },
   {             // 196
      14, 25,
@@ -4599,18 +4599,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00000180,  // ......**......
-     0x000007E0,  // ....******....
-     0x00001FF8,  // ..**********..
-     0x00001998,  // ..**..**..**..
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00001998,  // ..**..**..**..
-     0x00001FF8,  // ..**********..
-     0x000007E0,  // ....******....
-     0x00000180,  // ......**......
+     0x000000C0,  // ......**......
+     0x000003F0,  // ....******....
+     0x00000FFC,  // ..**********..
+     0x00000CCC,  // ..**..**..**..
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00000CCC,  // ..**..**..**..
+     0x00000FFC,  // ..**********..
+     0x000003F0,  // ....******....
+     0x000000C0,  // ......**......
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -4627,18 +4627,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x00000318,  // ..**...**..
-     0x000001B0,  // ...**.**...
-     0x000001F0,  // ...*****...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000001F0,  // ...*****...
-     0x000001B0,  // ...**.**...
-     0x00000318,  // ..**...**..
-     0x0000071C,  // .***...***.
-     0x0000060C,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x0000018C,  // ..**...**..
+     0x000000D8,  // ...**.**...
+     0x000000F8,  // ...*****...
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000F8,  // ...*****...
+     0x000000D8,  // ...**.**...
+     0x0000018C,  // ..**...**..
+     0x0000038E,  // .***...***.
+     0x00000306,  // .**.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4655,21 +4655,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FFE,  // .***********
-     0x00000FFE,  // .***********
-     0x00000006,  // ..........**
-     0x00000006,  // ..........**
-     0x00000006,  // ..........**
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FF,  // .***********
+     0x000007FF,  // .***********
+     0x00000003,  // ..........**
+     0x00000003,  // ..........**
+     0x00000003,  // ..........**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4683,18 +4683,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x000007FC,  // ..*********.
-     0x000003FC,  // ...********.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
-     0x0000000C,  // .........**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x000003FE,  // ..*********.
+     0x000001FE,  // ...********.
+     0x00000006,  // .........**.
+     0x00000006,  // .........**.
+     0x00000006,  // .........**.
+     0x00000006,  // .........**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4711,18 +4711,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000FFFC,  // .**************.
-     0x0000FFFC,  // .**************.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00007FFE,  // .**************.
+     0x00007FFE,  // .**************.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4739,21 +4739,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000FFFE,  // .***************
-     0x0000FFFE,  // .***************
-     0x00000006,  // ..............**
-     0x00000006,  // ..............**
-     0x00000006,  // ..............**
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00007FFF,  // .***************
+     0x00007FFF,  // .***************
+     0x00000003,  // ..............**
+     0x00000003,  // ..............**
+     0x00000003,  // ..............**
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4767,18 +4767,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x0000FC00,  // ******.........
-     0x0000FC00,  // ******.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000C00,  // ....**.........
-     0x00000FF0,  // ....********...
-     0x00000FF8,  // ....*********..
-     0x00000C1C,  // ....**.....***.
-     0x00000C0C,  // ....**......**.
-     0x00000C1C,  // ....**.....***.
-     0x00000FF8,  // ....*********..
-     0x00000FF0,  // ....********...
+     0x00007E00,  // ******.........
+     0x00007E00,  // ******.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x000007F8,  // ....********...
+     0x000007FC,  // ....*********..
+     0x0000060E,  // ....**.....***.
+     0x00000606,  // ....**......**.
+     0x0000060E,  // ....**.....***.
+     0x000007FC,  // ....*********..
+     0x000007F8,  // ....********...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4795,18 +4795,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001800C,  // .**...........**.
-     0x0001FE0C,  // .********.....**.
-     0x0001FF0C,  // .*********....**.
-     0x0001838C,  // .**.....***...**.
-     0x0001818C,  // .**......**...**.
-     0x0001838C,  // .**.....***...**.
-     0x0001FF0C,  // .*********....**.
-     0x0001FE0C,  // .********.....**.
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000C006,  // .**...........**.
+     0x0000FF06,  // .********.....**.
+     0x0000FF86,  // .*********....**.
+     0x0000C1C6,  // .**.....***...**.
+     0x0000C0C6,  // .**......**...**.
+     0x0000C1C6,  // .**.....***...**.
+     0x0000FF86,  // .*********....**.
+     0x0000FF06,  // .********.....**.
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -4823,18 +4823,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FF0,  // .********...
-     0x00000FF8,  // .*********..
-     0x00000C1C,  // .**.....***.
-     0x00000C0C,  // .**......**.
-     0x00000C1C,  // .**.....***.
-     0x00000FF8,  // .*********..
-     0x00000FF0,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007F8,  // .********...
+     0x000007FC,  // .*********..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x000007FC,  // .*********..
+     0x000007F8,  // .********...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4851,18 +4851,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003E0,  // ...*****....
-     0x000007F0,  // ..*******...
-     0x00000E18,  // .***....**..
-     0x0000040C,  // ..*......**.
-     0x0000000C,  // .........**.
-     0x000000FC,  // .....******.
-     0x000000FC,  // .....******.
-     0x0000000C,  // .........**.
-     0x0000040C,  // ..*......**.
-     0x00000E18,  // .***....**..
-     0x000007F8,  // ..********..
-     0x000003E0,  // ...*****....
+     0x000001F0,  // ...*****....
+     0x000003F8,  // ..*******...
+     0x0000070C,  // .***....**..
+     0x00000206,  // ..*......**.
+     0x00000006,  // .........**.
+     0x0000007E,  // .....******.
+     0x0000007E,  // .....******.
+     0x00000006,  // .........**.
+     0x00000206,  // ..*......**.
+     0x0000070C,  // .***....**..
+     0x000003FC,  // ..********..
+     0x000001F0,  // ...*****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4879,18 +4879,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x000303E0,  // .**......*****....
-     0x00030FF8,  // .**....*********..
-     0x00030C18,  // .**....**.....**..
-     0x0003180C,  // .**...**.......**.
-     0x0003180C,  // .**...**.......**.
-     0x0003F80C,  // .*******.......**.
-     0x0003F80C,  // .*******.......**.
-     0x0003180C,  // .**...**.......**.
-     0x0003180C,  // .**...**.......**.
-     0x00030C18,  // .**....**.....**..
-     0x00030FF8,  // .**....*********..
-     0x000303E0,  // .**......*****....
+     0x000181F0,  // .**......*****....
+     0x000187FC,  // .**....*********..
+     0x0001860C,  // .**....**.....**..
+     0x00018C06,  // .**...**.......**.
+     0x00018C06,  // .**...**.......**.
+     0x0001FC06,  // .*******.......**.
+     0x0001FC06,  // .*******.......**.
+     0x00018C06,  // .**...**.......**.
+     0x00018C06,  // .**...**.......**.
+     0x0001860C,  // .**....**.....**..
+     0x000187FC,  // .**....*********..
+     0x000181F0,  // .**......*****....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
@@ -4907,18 +4907,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003FC,  // ...********.
-     0x000007FC,  // ..*********.
-     0x00000E0C,  // .***.....**.
-     0x00000C0C,  // .**......**.
-     0x00000E0C,  // .***.....**.
-     0x000007FC,  // ..*********.
-     0x000001FC,  // ....*******.
-     0x0000038C,  // ...***...**.
-     0x0000070C,  // ..***....**.
-     0x0000060C,  // ..**.....**.
-     0x00000E0C,  // .***.....**.
-     0x00001C0C,  // ***......**.
+     0x000001FE,  // ...********.
+     0x000003FE,  // ..*********.
+     0x00000706,  // .***.....**.
+     0x00000606,  // .**......**.
+     0x00000706,  // .***.....**.
+     0x000003FE,  // ..*********.
+     0x000000FE,  // ....*******.
+     0x000001C6,  // ...***...**.
+     0x00000386,  // ..***....**.
+     0x00000306,  // ..**.....**.
+     0x00000706,  // .***.....**.
+     0x00000E06,  // ***......**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4938,15 +4938,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x0000003C,  // ....****.
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000000F6,  // ..****.**
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x0000001E,  // ....****.
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x0000007B,  // ..****.**
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -4963,18 +4963,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001FC,  // ...*******.
-     0x000003F8,  // ..*******..
-     0x00000700,  // .***.......
-     0x000006F0,  // .**.****...
-     0x000007F8,  // .********..
-     0x0000071C,  // .***...***.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x000003F8,  // ..*******..
-     0x000001F0,  // ...*****...
+     0x000000FE,  // ...*******.
+     0x000001FC,  // ..*******..
+     0x00000380,  // .***.......
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038E,  // .***...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -4994,15 +4994,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003F8,  // .*******..
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
-     0x000003F8,  // .*******..
-     0x000003F8,  // .*******..
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000003F8,  // .*******..
+     0x000001FC,  // .*******..
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000001FC,  // .*******..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5022,15 +5022,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000007E,  // .******
-     0x0000007E,  // .******
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
+     0x0000003F,  // .******
+     0x0000003F,  // .******
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5050,17 +5050,17 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003F8,  // ..*******..
-     0x000003F8,  // ..*******..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x00000618,  // .**....**..
-     0x00000FFC,  // **********.
-     0x00000FFC,  // **********.
-     0x00000C0C,  // **......**.
-     0x00000C0C,  // **......**.
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x0000030C,  // .**....**..
+     0x000007FE,  // **********.
+     0x000007FE,  // **********.
+     0x00000606,  // **......**.
+     0x00000606,  // **......**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5078,15 +5078,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x00000180,  // .**......
-     0x000001CC,  // .***..**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000C0,  // .**......
+     0x000000E6,  // .***..**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5106,15 +5106,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00001CCE,  // ***..**..***
-     0x00001EDE,  // ****.**.****
-     0x000006D8,  // ..**.**.**..
-     0x000003F0,  // ...******...
-     0x000003F0,  // ...******...
-     0x000006D8,  // ..**.**.**..
-     0x00000CCC,  // .**..**..**.
-     0x00000CCC,  // .**..**..**.
-     0x000018C6,  // **...**...**
+     0x00000E67,  // ***..**..***
+     0x00000F6F,  // ****.**.****
+     0x0000036C,  // ..**.**.**..
+     0x000001F8,  // ...******...
+     0x000001F8,  // ...******...
+     0x0000036C,  // ..**.**.**..
+     0x00000666,  // .**..**..**.
+     0x00000666,  // .**..**..**.
+     0x00000C63,  // **...**...**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5134,15 +5134,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FC,  // .******.
-     0x000000CC,  // .**..**.
-     0x00000018,  // ....**..
-     0x00000018,  // ....**..
-     0x0000000C,  // .....**.
-     0x000000CC,  // .**..**.
-     0x000000FC,  // .******.
-     0x00000078,  // ..****..
+     0x0000003C,  // ..****..
+     0x0000007E,  // .******.
+     0x00000066,  // .**..**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000006,  // .....**.
+     0x00000066,  // .**..**.
+     0x0000007E,  // .******.
+     0x0000003C,  // ..****..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -5162,15 +5162,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x0000033C,  // .**..****.
-     0x0000033C,  // .**..****.
-     0x0000036C,  // .**.**.**.
-     0x000003CC,  // .****..**.
-     0x000003CC,  // .****..**.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x0000019E,  // .**..****.
+     0x0000019E,  // .**..****.
+     0x000001B6,  // .**.**.**.
+     0x000001E6,  // .****..**.
+     0x000001E6,  // .****..**.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5187,18 +5187,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000088,  // ...*...*..
-     0x00000070,  // ....***...
+     0x00000044,  // ...*...*..
+     0x00000038,  // ....***...
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000031C,  // .**...***.
-     0x0000033C,  // .**..****.
-     0x0000033C,  // .**..****.
-     0x0000036C,  // .**.**.**.
-     0x000003CC,  // .****..**.
-     0x000003CC,  // .****..**.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x0000019E,  // .**..****.
+     0x0000019E,  // .**..****.
+     0x000001B6,  // .**.**.**.
+     0x000001E6,  // .****..**.
+     0x000001E6,  // .****..**.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5218,15 +5218,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000018E,  // .**...***
-     0x0000019E,  // .**..****
-     0x00000198,  // .**..**..
-     0x000001B8,  // .**.***..
-     0x000001F0,  // .*****...
-     0x000001F8,  // .******..
-     0x0000019C,  // .**..***.
-     0x0000018C,  // .**...**.
-     0x0000018E,  // .**...***
+     0x000000C7,  // .**...***
+     0x000000CF,  // .**..****
+     0x000000CC,  // .**..**..
+     0x000000DC,  // .**.***..
+     0x000000F8,  // .*****...
+     0x000000FC,  // .******..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5246,15 +5246,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000003FC,  // ..********.
-     0x000003FC,  // ..********.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x0000030C,  // ..**....**.
-     0x00000F0C,  // ****....**.
-     0x00000E0C,  // ***.....**.
+     0x000001FE,  // ..********.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000186,  // ..**....**.
+     0x00000786,  // ****....**.
+     0x00000706,  // ***.....**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -5274,15 +5274,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001C1C,  // .***.....***.
-     0x00001C1C,  // .***.....***.
-     0x00001E3C,  // .****...****.
-     0x00001E3C,  // .****...****.
-     0x00001B6C,  // .**.**.**.**.
-     0x00001B6C,  // .**.**.**.**.
-     0x000019CC,  // .**..***..**.
-     0x000019CC,  // .**..***..**.
-     0x0000188C,  // .**...*...**.
+     0x00000E0E,  // .***.....***.
+     0x00000E0E,  // .***.....***.
+     0x00000F1E,  // .****...****.
+     0x00000F1E,  // .****...****.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000DB6,  // .**.**.**.**.
+     0x00000CE6,  // .**..***..**.
+     0x00000CE6,  // .**..***..**.
+     0x00000C46,  // .**...*...**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -5302,15 +5302,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5330,15 +5330,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001F8,  // ..******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000001F8,  // ..******..
-     0x000000F0,  // ...****...
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5358,15 +5358,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5386,18 +5386,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000370,  // .**.***...
-     0x000003F8,  // .*******..
-     0x0000039C,  // .***..***.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000039C,  // .***..***.
-     0x000003F8,  // .*******..
-     0x00000370,  // .**.***...
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FC,  // .*******..
+     0x000001B8,  // .**.***...
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5414,15 +5414,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000000FC,  // ..******.
-     0x000001CC,  // .***..**.
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x000001CC,  // .***..**.
-     0x000000FC,  // ..******.
-     0x00000078,  // ...****..
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000E6,  // .***..**.
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000E6,  // .***..**.
+     0x0000007E,  // ..******.
+     0x0000003C,  // ...****..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5442,15 +5442,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000001FE,  // ********
-     0x000001FE,  // ********
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x000000FF,  // ********
+     0x000000FF,  // ********
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -5460,32 +5460,32 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ........
   },
   {             // 227
-     9, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x000001F0,  // ...*****...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x000003C0,  // ..****.....
-     0x00000380,  // ..***......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x000000F8,  // ...*****...
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x00000060,  // ....**.....
+     0x000001E0,  // ..****.....
+     0x000001C0,  // ..***......
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
   },
   {             // 228
      16, 25,
@@ -5495,21 +5495,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00003B70,  // ...***.**.***...
-     0x00007FF8,  // ..************..
-     0x0000E79C,  // .***..****..***.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000E79C,  // .***..****..***.
-     0x00007FF8,  // ..************..
-     0x00003B70,  // ...***.**.***...
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00001DB8,  // ...***.**.***...
+     0x00003FFC,  // ..************..
+     0x000073CE,  // .***..****..***.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x000073CE,  // .***..****..***.
+     0x00003FFC,  // ..************..
+     0x00001DB8,  // ...***.**.***...
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -5526,15 +5526,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000018C,  // .**...**.
-     0x000001DC,  // .***.***.
-     0x000000D8,  // ..**.**..
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x00000070,  // ...***...
-     0x000000D8,  // ..**.**..
-     0x000001DC,  // .***.***.
-     0x0000018C,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000EE,  // .***.***.
+     0x0000006C,  // ..**.**..
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x000000EE,  // .***.***.
+     0x000000C6,  // .**...**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5554,17 +5554,17 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000006,  // ........**
-     0x00000006,  // ........**
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000003,  // ........**
+     0x00000003,  // ........**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5582,15 +5582,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000001FC,  // ..*******.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000000FE,  // ..*******.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5610,15 +5610,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00003FFC,  // .************.
-     0x00003FFC,  // .************.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5638,17 +5638,17 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x0000318C,  // .**...**...**.
-     0x00003FFE,  // .*************
-     0x00003FFE,  // .*************
-     0x00000006,  // ............**
-     0x00000006,  // ............**
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00001FFF,  // .*************
+     0x00001FFF,  // .*************
+     0x00000003,  // ............**
+     0x00000003,  // ............**
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5666,15 +5666,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000F80,  // .*****......
-     0x00000F80,  // .*****......
-     0x00000180,  // ....**......
-     0x00000180,  // ....**......
-     0x000001F8,  // ....******..
-     0x000001FC,  // ....*******.
-     0x0000018C,  // ....**...**.
-     0x000001FC,  // ....*******.
-     0x000001F8,  // ....******..
+     0x000007C0,  // .*****......
+     0x000007C0,  // .*****......
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000000FC,  // ....******..
+     0x000000FE,  // ....*******.
+     0x000000C6,  // ....**...**.
+     0x000000FE,  // ....*******.
+     0x000000FC,  // ....******..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -5694,15 +5694,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00003F8C,  // .*******...**.
-     0x00003FCC,  // .********..**.
-     0x000030CC,  // .**....**..**.
-     0x000030CC,  // .**....**..**.
-     0x00003FCC,  // .********..**.
-     0x00003F8C,  // .*******...**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001FC6,  // .*******...**.
+     0x00001FE6,  // .********..**.
+     0x00001866,  // .**....**..**.
+     0x00001866,  // .**....**..**.
+     0x00001FE6,  // .********..**.
+     0x00001FC6,  // .*******...**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -5722,15 +5722,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003F8,  // .*******..
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000003F8,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FC,  // .*******..
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000001FC,  // .*******..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5750,15 +5750,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x0000003C,  // ....****.
-     0x0000003C,  // ....****.
-     0x0000000C,  // ......**.
-     0x0000019C,  // .**..***.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
+     0x00000078,  // ..****...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x0000001E,  // ....****.
+     0x0000001E,  // ....****.
+     0x00000006,  // ......**.
+     0x000000CE,  // .**..***.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5778,15 +5778,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000061F0,  // .**....*****...
-     0x000063F8,  // .**...*******..
-     0x0000671C,  // .**..***...***.
-     0x0000660C,  // .**..**.....**.
-     0x00007E0C,  // .******.....**.
-     0x00007E0C,  // .******.....**.
-     0x0000671C,  // .**..***...***.
-     0x000063F8,  // .**...*******..
-     0x000061F0,  // .**....*****...
+     0x000030F8,  // .**....*****...
+     0x000031FC,  // .**...*******..
+     0x0000338E,  // .**..***...***.
+     0x00003306,  // .**..**.....**.
+     0x00003F06,  // .******.....**.
+     0x00003F06,  // .******.....**.
+     0x0000338E,  // .**..***...***.
+     0x000031FC,  // .**...*******..
+     0x000030F8,  // .**....*****...
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -5806,15 +5806,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FC,  // ..*******.
-     0x000003FC,  // .********.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000001FC,  // ..*******.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000070C,  // ***....**.
+     0x000000FE,  // ..*******.
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000000FE,  // ..*******.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000386,  // ***....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5831,18 +5831,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00060C00,  // .**.....**.........
-     0x00070C70,  // .***....**...***...
-     0x00070CF8,  // .***....**..*****..
-     0x00078D8C,  // .****...**.**...**.
-     0x0006CD8C,  // .**.**..**.**...**.
-     0x0006CD8C,  // .**.**..**.**...**.
-     0x00066CF8,  // .**..**.**..*****..
-     0x00066C70,  // .**..**.**...***...
-     0x00063C00,  // .**...****.........
-     0x00061DFC,  // .**....***.*******.
-     0x00061DFC,  // .**....***.*******.
-     0x00060C00,  // .**.....**.........
+     0x00030600,  // .**.....**.........
+     0x00038638,  // .***....**...***...
+     0x0003867C,  // .***....**..*****..
+     0x0003C6C6,  // .****...**.**...**.
+     0x000366C6,  // .**.**..**.**...**.
+     0x000366C6,  // .**.**..**.**...**.
+     0x0003367C,  // .**..**.**..*****..
+     0x00033638,  // .**..**.**...***...
+     0x00031E00,  // .**...****.........
+     0x00030EFE,  // .**....***.*******.
+     0x00030EFE,  // .**....***.*******.
+     0x00030600,  // .**.....**.........
      0x00000000,  // ...................
      0x00000000,  // ...................
      0x00000000,  // ...................
@@ -5859,18 +5859,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000CC,  // ..**..**.
-     0x000000CC,  // ..**..**.
+     0x00000066,  // ..**..**.
+     0x00000066,  // ..**..**.
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000001FC,  // .*******.
-     0x00000180,  // .**......
-     0x000001CC,  // .***..**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x000000C0,  // .**......
+     0x000000E6,  // .***..**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5887,21 +5887,21 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x000007E0,  // ******....
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000000C,  // .......**.
-     0x0000003C,  // .....****.
-     0x00000038,  // .....***..
+     0x00000180,  // .**.......
+     0x000003F0,  // ******....
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000006,  // .......**.
+     0x0000001E,  // .....****.
+     0x0000001C,  // .....***..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5915,18 +5915,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x00000018,  // ...**..
-     0x00000030,  // ..**...
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
      0x00000000,  // .......
-     0x0000007E,  // .******
-     0x0000007E,  // .******
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
+     0x0000003F,  // .******
+     0x0000003F,  // .******
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -5946,15 +5946,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000070,  // ...***...
-     0x000000F8,  // ..*****..
-     0x0000018C,  // .**...**.
-     0x000001E0,  // .****....
-     0x000001E0,  // .****....
-     0x00000180,  // .**......
-     0x000001CC,  // .***..**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000F0,  // .****....
+     0x000000F0,  // .****....
+     0x000000C0,  // .**......
+     0x000000E6,  // .***..**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5974,15 +5974,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F8,  // ..*****..
-     0x000001FC,  // .*******.
-     0x0000018C,  // .**...**.
-     0x000001E0,  // .****....
-     0x000000F8,  // ..*****..
-     0x0000001C,  // .....***.
-     0x0000018C,  // .**...**.
-     0x000001FC,  // .*******.
-     0x000000F8,  // ..*****..
+     0x0000007C,  // ..*****..
+     0x000000FE,  // .*******.
+     0x000000C6,  // .**...**.
+     0x000000F0,  // .****....
+     0x0000007C,  // ..*****..
+     0x0000000E,  // .....***.
+     0x000000C6,  // .**...**.
+     0x000000FE,  // .*******.
+     0x0000007C,  // ..*****..
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -5999,18 +5999,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -6020,60 +6020,60 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ....
   },
   {             // 247
-     4, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 25,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 248
+     5, 25,
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x00000066,  // **..**
-     0x00000066,  // **..**
-     0x00000000,  // ......
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-  },
-  {             // 248
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
-     0x00000038,  // ***..
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
   },
   {             // 249
      16, 25,
@@ -6086,15 +6086,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00007F00,  // ..*******.......
-     0x00007F00,  // ..*******.......
-     0x00006300,  // ..**...**.......
-     0x000063F8,  // ..**...*******..
-     0x000063FC,  // ..**...********.
-     0x0000630C,  // ..**...**....**.
-     0x0000630C,  // ..**...**....**.
-     0x0001E3FC,  // ****...********.
-     0x0001C3F8,  // ***....*******..
+     0x00003F80,  // ..*******.......
+     0x00003F80,  // ..*******.......
+     0x00003180,  // ..**...**.......
+     0x000031FC,  // ..**...*******..
+     0x000031FE,  // ..**...********.
+     0x00003186,  // ..**...**....**.
+     0x00003186,  // ..**...**....**.
+     0x0000F1FE,  // ****...********.
+     0x0000E1FC,  // ***....*******..
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -6114,15 +6114,15 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00006300,  // .**...**.......
-     0x00006300,  // .**...**.......
-     0x00006300,  // .**...**.......
-     0x00007FF8,  // .************..
-     0x00007FFC,  // .*************.
-     0x0000630C,  // .**...**....**.
-     0x0000630C,  // .**...**....**.
-     0x000063FC,  // .**...********.
-     0x000063F8,  // .**...*******..
+     0x00003180,  // .**...**.......
+     0x00003180,  // .**...**.......
+     0x00003180,  // .**...**.......
+     0x00003FFC,  // .************..
+     0x00003FFE,  // .*************.
+     0x00003186,  // .**...**....**.
+     0x00003186,  // .**...**....**.
+     0x000031FE,  // .**...********.
+     0x000031FC,  // .**...*******..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -6139,18 +6139,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x000007E0,  // ******....
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x0000038C,  // .***...**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000180,  // .**.......
+     0x000003F0,  // ******....
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -6167,18 +6167,18 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
      0x00000000,  // .........
-     0x0000018E,  // .**...***
-     0x0000019E,  // .**..****
-     0x00000198,  // .**..**..
-     0x000001B8,  // .**.***..
-     0x000001F0,  // .*****...
-     0x000001F8,  // .******..
-     0x0000019C,  // .**..***.
-     0x0000018C,  // .**...**.
-     0x0000018E,  // .**...***
+     0x000000C7,  // .**...***
+     0x000000CF,  // .**..****
+     0x000000CC,  // .**..**..
+     0x000000DC,  // .**.***..
+     0x000000F8,  // .*****...
+     0x000000FC,  // .******..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -6195,53 +6195,53 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000000F0,  // ..****...
-     0x000001F8,  // .******..
-     0x00000198,  // .**..**..
-     0x000001C0,  // .***.....
-     0x000000E0,  // ..***....
-     0x000001F0,  // .*****...
-     0x00000338,  // **..***..
-     0x0000031C,  // **...***.
-     0x0000038C,  // ***...**.
-     0x000001CC,  // .***..**.
-     0x000000F8,  // ..*****..
-     0x00000070,  // ...***...
-     0x00000038,  // ....***..
-     0x00000198,  // .**..**..
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x000000CC,  // .**..**..
+     0x000000E0,  // .***.....
+     0x00000070,  // ..***....
+     0x000000F8,  // .*****...
+     0x0000019C,  // **..***..
+     0x0000018E,  // **...***.
+     0x000001C6,  // ***...**.
+     0x000000E6,  // .***..**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x0000001C,  // ....***..
+     0x000000CC,  // .**..**..
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 254
-     9, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000110,  // ...*...*...
-     0x000000E0,  // ....***....
+     11, 25,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000088,  // ...*...*...
+     0x00000070,  // ....***....
+     0x00000000,  // ...........
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x0000018C,  // ..**...**..
+     0x000000D8,  // ...**.**...
+     0x000000D8,  // ...**.**...
+     0x000000F8,  // ...*****...
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x00000060,  // ....**.....
+     0x000001E0,  // ..****.....
+     0x000001C0,  // ..***......
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x00000318,  // ..**...**..
-     0x000001B0,  // ...**.**...
-     0x000001B0,  // ...**.**...
-     0x000001F0,  // ...*****...
-     0x000000E0,  // ....***....
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x000003C0,  // ..****.....
-     0x00000380,  // ..***......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
   },
   {             // 255
      10, 25,
@@ -6254,17 +6254,17 @@ cFont::tPixelData FontSml_iso8859_5[][27] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x000003FC,  // .********.
-     0x000003FC,  // .********.
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
diff --git a/fontsml-iso8859-7.c b/fontsml-iso8859-7.c
index a7936ba04..cd8d6935c 100644
--- a/fontsml-iso8859-7.c
+++ b/fontsml-iso8859-7.c
@@ -27,19 +27,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -50,11 +50,11 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
-     0x0000006C,  // .**.**.
-     0x0000004C,  // .*..**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000036,  // .**.**.
+     0x00000026,  // .*..**.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -69,23 +69,23 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .......
   },
   {             // 35
-     10, 20,
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000088,  // ....*...*..
-     0x00000188,  // ...**...*..
-     0x00000198,  // ...**..**..
-     0x00000118,  // ...*...**..
-     0x00000FFC,  // **********.
-     0x00000110,  // ...*...*...
-     0x00000310,  // ..**...*...
-     0x00000310,  // ..**...*...
-     0x00000230,  // ..*...**...
-     0x00000FFC,  // **********.
-     0x00000220,  // ..*...*....
-     0x00000620,  // .**...*....
-     0x00000660,  // .**..**....
-     0x00000460,  // .*...**....
+     0x00000044,  // ....*...*..
+     0x000000C4,  // ...**...*..
+     0x000000CC,  // ...**..**..
+     0x0000008C,  // ...*...**..
+     0x000007FE,  // **********.
+     0x00000088,  // ...*...*...
+     0x00000188,  // ..**...*...
+     0x00000188,  // ..**...*...
+     0x00000118,  // ..*...**...
+     0x000007FE,  // **********.
+     0x00000110,  // ..*...*....
+     0x00000310,  // .**...*....
+     0x00000330,  // .**..**....
+     0x00000230,  // .*...**....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -94,23 +94,23 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
   {             // 36
      10, 20,
      0x00000000,  // ..........
-     0x00000020,  // .....*....
-     0x00000070,  // ....***...
-     0x000001FC,  // ..*******.
-     0x00000326,  // .**..*..**
-     0x00000326,  // .**..*..**
-     0x00000320,  // .**..*....
-     0x000003A0,  // .***.*....
-     0x000001F0,  // ..*****...
-     0x0000007C,  // ....*****.
-     0x0000002E,  // .....*.***
-     0x00000026,  // .....*..**
-     0x00000326,  // .**..*..**
-     0x00000326,  // .**..*..**
-     0x000001AC,  // ..**.*.**.
-     0x000000F8,  // ...*****..
-     0x00000020,  // .....*....
-     0x00000020,  // .....*....
+     0x00000010,  // .....*....
+     0x00000038,  // ....***...
+     0x000000FE,  // ..*******.
+     0x00000193,  // .**..*..**
+     0x00000193,  // .**..*..**
+     0x00000190,  // .**..*....
+     0x000001D0,  // .***.*....
+     0x000000F8,  // ..*****...
+     0x0000003E,  // ....*****.
+     0x00000017,  // .....*.***
+     0x00000013,  // .....*..**
+     0x00000193,  // .**..*..**
+     0x00000193,  // .**..*..**
+     0x000000D6,  // ..**.*.**.
+     0x0000007C,  // ...*****..
+     0x00000010,  // .....*....
+     0x00000010,  // .....*....
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
@@ -118,20 +118,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      17, 20,
      0x00000000,  // .................
      0x00000000,  // .................
-     0x0000F020,  // ..****......*....
-     0x00019840,  // .**..**....*.....
-     0x00019840,  // .**..**....*.....
-     0x00019880,  // .**..**...*......
-     0x00019880,  // .**..**...*......
-     0x00019900,  // .**..**..*.......
-     0x0000F100,  // ..****...*.......
-     0x00000278,  // ........*..****..
-     0x0000064C,  // .......**..*..**.
-     0x000004C4,  // .......*..**...*.
-     0x00000CC4,  // ......**..**...*.
-     0x000008C4,  // ......*...**...*.
-     0x0000104C,  // .....*.....*..**.
-     0x00001078,  // .....*.....****..
+     0x00007810,  // ..****......*....
+     0x0000CC20,  // .**..**....*.....
+     0x0000CC20,  // .**..**....*.....
+     0x0000CC40,  // .**..**...*......
+     0x0000CC40,  // .**..**...*......
+     0x0000CC80,  // .**..**..*.......
+     0x00007880,  // ..****...*.......
+     0x0000013C,  // ........*..****..
+     0x00000326,  // .......**..*..**.
+     0x00000262,  // .......*..**...*.
+     0x00000662,  // ......**..**...*.
+     0x00000462,  // ......*...**...*.
+     0x00000826,  // .....*.....*..**.
+     0x0000083C,  // .....*.....****..
      0x00000000,  // .................
      0x00000000,  // .................
      0x00000000,  // .................
@@ -141,20 +141,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001E0,  // ....****....
-     0x00000370,  // ...**.***...
-     0x00000630,  // ..**...**...
-     0x00000630,  // ..**...**...
-     0x00000330,  // ...**..**...
-     0x000003E0,  // ...*****....
-     0x00000380,  // ...***......
-     0x000006C0,  // ..**.**.....
-     0x00000C68,  // .**...**.*..
-     0x0000087C,  // .*....*****.
-     0x00001838,  // **.....***..
-     0x00000C18,  // .**.....**..
-     0x00000C3C,  // .**....****.
-     0x000007E6,  // ..******..**
+     0x000000F0,  // ....****....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001F0,  // ...*****....
+     0x000001C0,  // ...***......
+     0x00000360,  // ..**.**.....
+     0x00000634,  // .**...**.*..
+     0x0000043E,  // .*....*****.
+     0x00000C1C,  // **.....***..
+     0x0000060C,  // .**.....**..
+     0x0000061E,  // .**....****.
+     0x000003F3,  // ..******..**
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -165,11 +165,11 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x00000008,  // .*..
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000004,  // .*..
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -188,57 +188,57 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000030,  // .**...
-     0x00000010,  // ..*...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000004,  // ....*.
-     0x00000006,  // ....**
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000008,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000002,  // ....*.
+     0x00000003,  // ....**
   },
   {             // 41
      6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000010,  // ..*...
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000006,  // ....**
-     0x00000004,  // ....*.
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000010,  // ..*...
+     0x00000008,  // ..*...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000003,  // ....**
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x00000008,  // ..*...
      0x00000000,  // ......
   },
   {             // 42
-     7, 20,
+     8, 20,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000030,  // ...**...
-     0x00000034,  // ...**.*.
-     0x000000FC,  // .******.
-     0x00000030,  // ...**...
-     0x00000058,  // ..*.**..
-     0x00000048,  // ..*..*..
+     0x00000018,  // ...**...
+     0x0000001A,  // ...**.*.
+     0x0000007E,  // .******.
+     0x00000018,  // ...**...
+     0x0000002C,  // ..*.**..
+     0x00000024,  // ..*..*..
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -258,15 +258,15 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
-     0x00000060,  // .....**....
+     0x00000030,  // .....**....
+     0x00000030,  // .....**....
+     0x00000030,  // .....**....
+     0x00000030,  // .....**....
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000030,  // .....**....
+     0x00000030,  // .....**....
+     0x00000030,  // .....**....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -291,10 +291,10 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000004,  // ...*.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
   },
@@ -310,8 +310,8 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003E,  // .*****
-     0x0000003E,  // .*****
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -337,31 +337,31 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
   },
   {             // 47
-     5, 20,
+     6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000004,  // ....*.
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000010,  // ..*...
-     0x00000010,  // ..*...
-     0x00000030,  // .**...
-     0x00000020,  // .*....
-     0x00000020,  // .*....
-     0x00000020,  // .*....
-     0x00000060,  // **....
-     0x00000040,  // *.....
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
+     0x00000018,  // .**...
+     0x00000010,  // .*....
+     0x00000010,  // .*....
+     0x00000010,  // .*....
+     0x00000030,  // **....
+     0x00000020,  // *.....
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -372,19 +372,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000184,  // ..**....*.
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000104,  // ..*.....*.
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x000000C2,  // ..**....*.
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000082,  // ..*.....*.
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -395,19 +395,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000010,  // ......*...
-     0x00000030,  // .....**...
-     0x000000F0,  // ...****...
-     0x000001F0,  // ..*****...
-     0x00000130,  // ..*..**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
-     0x00000030,  // .....**...
+     0x00000008,  // ......*...
+     0x00000018,  // .....**...
+     0x00000078,  // ...****...
+     0x000000F8,  // ..*****...
+     0x00000098,  // ..*..**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -417,20 +417,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001CC,  // ..***..**.
-     0x00000306,  // .**.....**
-     0x00000302,  // .**......*
-     0x00000002,  // .........*
-     0x00000006,  // ........**
-     0x0000000C,  // .......**.
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x00000180,  // ..**......
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
+     0x0000007C,  // ...*****..
+     0x000000E6,  // ..***..**.
+     0x00000183,  // .**.....**
+     0x00000181,  // .**......*
+     0x00000001,  // .........*
+     0x00000003,  // ........**
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -440,20 +440,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000070,  // ....***...
-     0x000000D8,  // ...**.**..
-     0x0000018C,  // ..**...**.
-     0x0000018C,  // ..**...**.
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x00000038,  // .....***..
-     0x0000000C,  // .......**.
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000186,  // ..**....**
-     0x0000008C,  // ...*...**.
-     0x000000F8,  // ...*****..
+     0x00000038,  // ....***...
+     0x0000006C,  // ...**.**..
+     0x000000C6,  // ..**...**.
+     0x000000C6,  // ..**...**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x000000C3,  // ..**....**
+     0x00000046,  // ...*...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -464,19 +464,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000038,  // .....***..
-     0x00000078,  // ....****..
-     0x000000D8,  // ...**.**..
-     0x00000198,  // ..**..**..
-     0x00000198,  // ..**..**..
-     0x00000318,  // .**...**..
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
-     0x00000018,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000001C,  // .....***..
+     0x0000003C,  // ....****..
+     0x0000006C,  // ...**.**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000018C,  // .**...**..
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -487,19 +487,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000FC,  // ...******.
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000178,  // ..*.****..
-     0x000001FC,  // ..*******.
-     0x00000306,  // .**.....**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000306,  // .**.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007E,  // ...******.
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000BC,  // ..*.****..
+     0x000000FE,  // ..*******.
+     0x00000183,  // .**.....**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000183,  // .**.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -509,20 +509,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000078,  // ....****..
-     0x000000DC,  // ...**.***.
-     0x00000186,  // ..**....**
-     0x00000106,  // ..*.....**
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003FC,  // .********.
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000106,  // ..*.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000003C,  // ....****..
+     0x0000006E,  // ...**.***.
+     0x000000C3,  // ..**....**
+     0x00000083,  // ..*.....**
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000083,  // ..*.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -533,19 +533,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FE,  // .*********
-     0x000003FC,  // .********.
-     0x0000000C,  // .......**.
-     0x00000018,  // ......**..
-     0x00000010,  // ......*...
-     0x00000030,  // .....**...
-     0x00000020,  // .....*....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
+     0x000001FF,  // .*********
+     0x000001FE,  // .********.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000008,  // ......*...
+     0x00000018,  // .....**...
+     0x00000010,  // .....*....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -555,20 +555,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
-     0x000001CC,  // ..***..**.
-     0x00000386,  // .***....**
-     0x00000302,  // .**......*
-     0x00000302,  // .**......*
-     0x00000306,  // .**.....**
-     0x00000184,  // ..**....*.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
+     0x000000E6,  // ..***..**.
+     0x000001C3,  // .***....**
+     0x00000181,  // .**......*
+     0x00000181,  // .**......*
+     0x00000183,  // .**.....**
+     0x000000C2,  // ..**....*.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -578,20 +578,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001DC,  // ..***.***.
-     0x00000384,  // .***....*.
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018E,  // ..**...***
-     0x000000F6,  // ...****.**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000104,  // ..*.....*.
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x00000078,  // ...****...
+     0x000000EE,  // ..***.***.
+     0x000001C2,  // .***....*.
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C7,  // ..**...***
+     0x0000007B,  // ...****.**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000082,  // ..*.....*.
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -605,16 +605,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -628,19 +628,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000004,  // ...*.
-     0x00000004,  // ...*.
-     0x00000008,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
      0x00000000,  // .....
   },
   {             // 60
@@ -650,15 +650,15 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000000C,  // ........**.
-     0x0000003C,  // ......****.
-     0x000000E0,  // ....***....
-     0x00000780,  // .****......
-     0x00000600,  // .**........
-     0x00000380,  // ..***......
-     0x000000F0,  // ....****...
-     0x0000003C,  // ......****.
-     0x00000004,  // .........*.
+     0x00000006,  // ........**.
+     0x0000001E,  // ......****.
+     0x00000070,  // ....***....
+     0x000003C0,  // .****......
+     0x00000300,  // .**........
+     0x000001C0,  // ..***......
+     0x00000078,  // ....****...
+     0x0000001E,  // ......****.
+     0x00000002,  // .........*.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -674,12 +674,12 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -696,15 +696,15 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000400,  // .*.........
-     0x00000780,  // .****......
-     0x000001E0,  // ...****....
-     0x0000003C,  // ......****.
-     0x0000000C,  // ........**.
-     0x00000078,  // .....****..
-     0x000001E0,  // ...****....
-     0x00000700,  // .***.......
-     0x00000400,  // .*.........
+     0x00000200,  // .*.........
+     0x000003C0,  // .****......
+     0x000000F0,  // ...****....
+     0x0000001E,  // ......****.
+     0x00000006,  // ........**.
+     0x0000003C,  // .....****..
+     0x000000F0,  // ...****....
+     0x00000380,  // .***.......
+     0x00000200,  // .*.........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -716,20 +716,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000006,  // ........**
-     0x0000000E,  // .......***
-     0x0000001C,  // ......***.
-     0x00000030,  // .....**...
-     0x00000020,  // .....*....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000003,  // ........**
+     0x00000007,  // .......***
+     0x0000000E,  // ......***.
+     0x00000018,  // .....**...
+     0x00000010,  // .....*....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -739,66 +739,66 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      19, 20,
      0x00000000,  // ...................
      0x00000000,  // ...................
-     0x00001F80,  // .......******......
-     0x000079E0,  // .....****..****....
-     0x0000C030,  // ....**........**...
-     0x00018018,  // ...**..........**..
-     0x00031ECC,  // ..**...****.**..**.
-     0x000331CC,  // ..**..**...***..**.
-     0x00066184,  // .**..**....**....*.
-     0x00064184,  // .**..*.....**....*.
-     0x0006C18C,  // .**.**.....**...**.
-     0x0006C18C,  // .**.**.....**...**.
-     0x0006C118,  // .**.**.....*...**..
-     0x00066330,  // .**..**...**..**...
-     0x00067FE0,  // .**..**********....
-     0x000319C4,  // ..**...**..***...*.
-     0x0003000C,  // ..**............**.
-     0x0001C018,  // ...***.........**..
-     0x0000F070,  // ....****.....***...
-     0x00001FC0,  // .......*******.....
+     0x00000FC0,  // .......******......
+     0x00003CF0,  // .....****..****....
+     0x00006018,  // ....**........**...
+     0x0000C00C,  // ...**..........**..
+     0x00018F66,  // ..**...****.**..**.
+     0x000198E6,  // ..**..**...***..**.
+     0x000330C2,  // .**..**....**....*.
+     0x000320C2,  // .**..*.....**....*.
+     0x000360C6,  // .**.**.....**...**.
+     0x000360C6,  // .**.**.....**...**.
+     0x0003608C,  // .**.**.....*...**..
+     0x00033198,  // .**..**...**..**...
+     0x00033FF0,  // .**..**********....
+     0x00018CE2,  // ..**...**..***...*.
+     0x00018006,  // ..**............**.
+     0x0000E00C,  // ...***.........**..
+     0x00007838,  // ....****.....***...
+     0x00000FE0,  // .......*******.....
   },
   {             // 65
-     12, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ......**......
-     0x000001C0,  // ......***.....
-     0x000003C0,  // .....****.....
-     0x00000240,  // .....*..*.....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000430,  // ....*....**...
-     0x00000C30,  // ...**....**...
-     0x00000FF8,  // ...*********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000100C,  // ..*........**.
-     0x0000300C,  // .**........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000E0,  // ......***.....
+     0x000001E0,  // .....****.....
+     0x00000120,  // .....*..*.....
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000218,  // ....*....**...
+     0x00000618,  // ...**....**...
+     0x000007FC,  // ...*********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000806,  // ..*........**.
+     0x00001806,  // .**........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 66
      12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000C38,  // .**....***..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF0,  // .********...
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000FF0,  // .********...
+     0x000007F8,  // .********...
+     0x0000061C,  // .**....***..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007F8,  // .********...
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000606,  // .**......**.
+     0x000007FE,  // .**********.
+     0x000007F8,  // .********...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -808,20 +808,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // .....*****...
-     0x000007F8,  // ...********..
-     0x00000E0C,  // ..***.....**.
-     0x00000C0C,  // ..**......**.
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00001800,  // .**..........
-     0x00000C04,  // ..**.......*.
-     0x00000C0C,  // ..**......**.
-     0x00000618,  // ...**....**..
-     0x000003F0,  // ....******...
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x00000706,  // ..***.....**.
+     0x00000606,  // ..**......**.
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000602,  // ..**.......*.
+     0x00000606,  // ..**......**.
+     0x0000030C,  // ...**....**..
+     0x000001F8,  // ....******...
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -832,19 +832,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FF0,  // .*********...
-     0x00001FF8,  // .**********..
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FF8,  // .**********..
-     0x00001FE0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000FFC,  // .**********..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000FFC,  // .**********..
+     0x00000FF0,  // .********....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -855,19 +855,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FF0,  // .********...
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007F8,  // .********...
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -878,19 +878,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x000007F0,  // .*******...
-     0x000007F0,  // .*******...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003F8,  // .*******...
+     0x000003F8,  // .*******...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -900,20 +900,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      15, 20,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007E0,  // .....******....
-     0x00001FF0,  // ...*********...
-     0x00003818,  // ..***......**..
-     0x0000300C,  // ..**........**.
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x00006000,  // .**............
-     0x0000607C,  // .**......*****.
-     0x0000607C,  // .**......*****.
-     0x0000300C,  // ..**........**.
-     0x0000381C,  // ..***......***.
-     0x00001FF8,  // ...**********..
-     0x000007E0,  // .....******....
+     0x000003F0,  // .....******....
+     0x00000FF8,  // ...*********...
+     0x00001C0C,  // ..***......**..
+     0x00001806,  // ..**........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000303E,  // .**......*****.
+     0x0000303E,  // .**......*****.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -924,19 +924,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -947,19 +947,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -970,19 +970,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000000C,  // ......**.
-     0x0000030C,  // **....**.
-     0x0000030C,  // **....**.
-     0x000001F8,  // .******..
-     0x000000F0,  // ..****...
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000006,  // ......**.
+     0x00000186,  // **....**.
+     0x00000186,  // **....**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -993,19 +993,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C18,  // .**.....**..
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000CC0,  // .**..**.....
-     0x00000DC0,  // .**.***.....
-     0x00000FC0,  // .******.....
-     0x00000E60,  // .***..**....
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0E,  // .**......***
+     0x00000606,  // .**......**.
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000006E0,  // .**.***.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000618,  // .**....**...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000607,  // .**......***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1016,19 +1016,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1039,19 +1039,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000380E,  // .***.......***
-     0x00003C0E,  // .****......***
-     0x00003C1E,  // .****.....****
-     0x0000361E,  // .**.**....****
-     0x00003636,  // .**.**...**.**
-     0x00003336,  // .**..**..**.**
-     0x00003366,  // .**..**.**..**
-     0x000031C6,  // .**...***...**
-     0x000031C6,  // .**...***...**
-     0x00003086,  // .**....*....**
-     0x00003006,  // .**.........**
-     0x00003006,  // .**.........**
-     0x00003006,  // .**.........**
+     0x00001C07,  // .***.......***
+     0x00001E07,  // .****......***
+     0x00001E0F,  // .****.....****
+     0x00001B0F,  // .**.**....****
+     0x00001B1B,  // .**.**...**.**
+     0x0000199B,  // .**..**..**.**
+     0x000019B3,  // .**..**.**..**
+     0x000018E3,  // .**...***...**
+     0x000018E3,  // .**...***...**
+     0x00001843,  // .**....*....**
+     0x00001803,  // .**.........**
+     0x00001803,  // .**.........**
+     0x00001803,  // .**.........**
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1062,19 +1062,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00001E0C,  // .****.....**.
-     0x00001B0C,  // .**.**....**.
-     0x00001B0C,  // .**.**....**.
-     0x0000198C,  // .**..**...**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x0000186C,  // .**....**.**.
-     0x0000183C,  // .**.....****.
-     0x0000183C,  // .**.....****.
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x00000F06,  // .****.....**.
+     0x00000D86,  // .**.**....**.
+     0x00000D86,  // .**.**....**.
+     0x00000CC6,  // .**..**...**.
+     0x00000C66,  // .**...**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C36,  // .**....**.**.
+     0x00000C1E,  // .**.....****.
+     0x00000C1E,  // .**.....****.
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1084,20 +1084,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      15, 20,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -1108,19 +1108,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000C3C,  // .**....****.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C0E,  // .**......***
-     0x00000FFC,  // .**********.
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x000007FC,  // .*********..
+     0x0000061E,  // .**....****.
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000607,  // .**......***
+     0x000007FE,  // .**********.
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1130,43 +1130,43 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      15, 20,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x000030D8,  // ..**....**.**..
-     0x00003878,  // ..***....****..
-     0x00001FF8,  // ...**********..
-     0x000007CC,  // .....*****..**.
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000186C,  // ..**....**.**..
+     0x00001C3C,  // ..***....****..
+     0x00000FFC,  // ...**********..
+     0x000003E6,  // .....*****..**.
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
   {             // 82
-     13, 20,
+     14, 20,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00003FF0,  // .**********...
-     0x00003018,  // .**.......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000301C,  // .**.......***.
-     0x00003FF8,  // .***********..
-     0x00003FC0,  // .********.....
-     0x00003060,  // .**.....**....
-     0x00003060,  // .**.....**....
-     0x00003030,  // .**......**...
-     0x00003018,  // .**.......**..
-     0x00003018,  // .**.......**..
-     0x0000300C,  // .**........**.
+     0x00001FF8,  // .**********...
+     0x0000180C,  // .**.......**..
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x0000180E,  // .**.......***.
+     0x00001FFC,  // .***********..
+     0x00001FE0,  // .********.....
+     0x00001830,  // .**.....**....
+     0x00001830,  // .**.....**....
+     0x00001818,  // .**......**...
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001806,  // .**........**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -1176,43 +1176,43 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000001F0,  // ....*****...
-     0x000007FC,  // ..*********.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C00,  // .**.........
-     0x00000700,  // ..***.......
-     0x000003F0,  // ...******...
-     0x0000003C,  // .......****.
-     0x00000006,  // ..........**
-     0x00000C02,  // .**........*
-     0x00000C02,  // .**........*
-     0x00000606,  // ..**......**
-     0x000007FC,  // ..*********.
-     0x000001F0,  // ....*****...
+     0x000000F8,  // ....*****...
+     0x000003FE,  // ..*********.
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000600,  // .**.........
+     0x00000380,  // ..***.......
+     0x000001F8,  // ...******...
+     0x0000001E,  // .......****.
+     0x00000003,  // ..........**
+     0x00000601,  // .**........*
+     0x00000601,  // .**........*
+     0x00000303,  // ..**......**
+     0x000003FE,  // ..*********.
+     0x000000F8,  // ....*****...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 84
-     11, 20,
+     12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -1223,42 +1223,42 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000FF8,  // ..*********..
-     0x000003E0,  // ....*****....
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 86
-     12, 20,
+     13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000300C,  // **........**.
-     0x0000180C,  // .**.......**.
-     0x00001808,  // .**.......*..
-     0x00001818,  // .**......**..
-     0x00000C10,  // ..**.....*...
-     0x00000C30,  // ..**....**...
-     0x00000430,  // ...*....**...
-     0x00000620,  // ...**...*....
-     0x00000660,  // ...**..**....
-     0x00000240,  // ....*..*.....
-     0x000003C0,  // ....****.....
-     0x000001C0,  // .....***.....
-     0x00000180,  // .....**......
+     0x00001806,  // **........**.
+     0x00000C06,  // .**.......**.
+     0x00000C04,  // .**.......*..
+     0x00000C0C,  // .**......**..
+     0x00000608,  // ..**.....*...
+     0x00000618,  // ..**....**...
+     0x00000218,  // ...*....**...
+     0x00000310,  // ...**...*....
+     0x00000330,  // ...**..**....
+     0x00000120,  // ....*..*.....
+     0x000001E0,  // ....****.....
+     0x000000E0,  // .....***.....
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1269,65 +1269,65 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
-     0x0006060C,  // **......**.....**.
-     0x00020E0C,  // .*.....***.....**.
-     0x00030F0C,  // .**....****....**.
-     0x00030B08,  // .**....*.**....*..
-     0x00031918,  // .**...**..*...**..
-     0x00011998,  // ..*...**..**..**..
-     0x00019198,  // ..**..*...**..**..
-     0x00019190,  // ..**..*...**..*...
-     0x0000B0B0,  // ...*.**....*.**...
-     0x0000B0F0,  // ...*.**....****...
-     0x0000E0E0,  // ...***.....***....
-     0x0000E060,  // ...***......**....
-     0x00006060,  // ....**......**....
+     0x00030306,  // **......**.....**.
+     0x00010706,  // .*.....***.....**.
+     0x00018786,  // .**....****....**.
+     0x00018584,  // .**....*.**....*..
+     0x00018C8C,  // .**...**..*...**..
+     0x00008CCC,  // ..*...**..**..**..
+     0x0000C8CC,  // ..**..*...**..**..
+     0x0000C8C8,  // ..**..*...**..*...
+     0x00005858,  // ...*.**....*.**...
+     0x00005878,  // ...*.**....****...
+     0x00007070,  // ...***.....***....
+     0x00007030,  // ...***......**....
+     0x00003030,  // ....**......**....
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
      0x00000000,  // ..................
   },
   {             // 88
-     12, 20,
+     13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
-     0x00000660,  // ...**..**....
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x000003C0,  // ....****.....
-     0x00000760,  // ...***.**....
-     0x00000630,  // ...**...**...
-     0x00000C30,  // ..**....**...
-     0x00001818,  // .**......**..
-     0x0000380C,  // ***.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x00000318,  // ...**...**...
+     0x00000330,  // ...**..**....
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001E0,  // ....****.....
+     0x000003B0,  // ...***.**....
+     0x00000318,  // ...**...**...
+     0x00000618,  // ..**....**...
+     0x00000C0C,  // .**......**..
+     0x00001C06,  // ***.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 89
-     12, 20,
+     13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000380C,  // ***.......**.
-     0x00001818,  // .**......**..
-     0x00000C18,  // ..**.....**..
-     0x00000E30,  // ..***...**...
-     0x00000660,  // ...**..**....
-     0x00000340,  // ....**.*.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00001C06,  // ***.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000718,  // ..***...**...
+     0x00000330,  // ...**..**....
+     0x000001A0,  // ....**.*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -1338,19 +1338,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x0000000C,  // ........**.
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
+     0x000003FF,  // .**********
+     0x000003FF,  // .**********
+     0x00000006,  // ........**.
+     0x0000000C,  // .......**..
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000070,  // ....***....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x00000180,  // ..**.......
+     0x00000300,  // .**........
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1361,43 +1361,43 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000001E,  // .****
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x0000001E,  // .****
+     0x0000000F,  // .****
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000F,  // .****
   },
   {             // 92
-     5, 20,
+     6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000040,  // *.....
-     0x00000060,  // **....
-     0x00000020,  // .*....
-     0x00000020,  // .*....
-     0x00000020,  // .*....
-     0x00000030,  // .**...
-     0x00000010,  // ..*...
-     0x00000010,  // ..*...
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x0000000C,  // ...**.
-     0x0000000C,  // ...**.
-     0x00000004,  // ....*.
+     0x00000020,  // *.....
+     0x00000030,  // **....
+     0x00000010,  // .*....
+     0x00000010,  // .*....
+     0x00000010,  // .*....
+     0x00000018,  // .**...
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1407,35 +1407,35 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000003C,  // ****.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000003C,  // ****.
+     0x0000001E,  // ****.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
   },
   {             // 94
      9, 20,
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000060,  // ...**....
-     0x00000070,  // ...***...
-     0x00000050,  // ...*.*...
-     0x000000D8,  // ..**.**..
-     0x00000098,  // ..*..**..
-     0x00000188,  // .**...*..
-     0x0000018C,  // .**...**.
+     0x00000030,  // ...**....
+     0x00000038,  // ...***...
+     0x00000028,  // ...*.*...
+     0x0000006C,  // ..**.**..
+     0x0000004C,  // ..*..**..
+     0x000000C4,  // .**...*..
+     0x000000C6,  // .**...**.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
@@ -1449,36 +1449,36 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .........
   },
   {             // 95
-     10, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
+     12, 20,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFE,  // .***********
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FF,  // .***********
   },
   {             // 96
      6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000030,  // .**...
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1495,23 +1495,23 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ......
   },
   {             // 97
-     10, 20,
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F8,  // ...******..
-     0x0000039C,  // ..***..***.
-     0x0000060C,  // .**.....**.
-     0x0000000C,  // ........**.
-     0x000000FC,  // ....******.
-     0x000003EC,  // ..*****.**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000061C,  // .**....***.
-     0x000003E4,  // ..*****..*.
+     0x000000FC,  // ...******..
+     0x000001CE,  // ..***..***.
+     0x00000306,  // .**.....**.
+     0x00000006,  // ........**.
+     0x0000007E,  // ....******.
+     0x000001F6,  // ..*****.**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000030E,  // .**....***.
+     0x000001F2,  // ..*****..*.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -1522,42 +1522,42 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000378,  // .**.****..
-     0x000003DC,  // .****.***.
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000038C,  // .***...**.
-     0x00000378,  // .**.****..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001EE,  // .****.***.
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000001C6,  // .***...**.
+     0x000001BC,  // .**.****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 99
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000384,  // .***....*.
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000304,  // .**.....*.
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x000001C2,  // .***....*.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000182,  // .**.....*.
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1568,65 +1568,65 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x000000F6,  // ...****.**
-     0x000001DE,  // ..***.****
-     0x00000106,  // ..*.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018E,  // ..**...***
-     0x000000FE,  // ...*******
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x0000007B,  // ...****.**
+     0x000000EF,  // ..***.****
+     0x00000083,  // ..*.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C7,  // ..**...***
+     0x0000007F,  // ...*******
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 101
-     10, 20,
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x00000398,  // ..***..**..
-     0x0000020C,  // ..*.....**.
-     0x0000060C,  // .**.....**.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x0000060C,  // .**.....**.
-     0x00000318,  // ..**...**..
-     0x000001F0,  // ...*****...
+     0x000000F8,  // ...*****...
+     0x000001CC,  // ..***..**..
+     0x00000106,  // ..*.....**.
+     0x00000306,  // .**.....**.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000000F8,  // ...*****...
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
   },
   {             // 102
-     5, 20,
+     6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000E,  // ...***
-     0x0000001C,  // ..***.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000003E,  // .*****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000007,  // ...***
+     0x0000000E,  // ..***.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000001F,  // .*****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -1640,39 +1640,39 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F6,  // ...****.**
-     0x0000018E,  // ..**...***
-     0x00000106,  // ..*.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x000001DE,  // ..***.****
-     0x000000F6,  // ...****.**
-     0x00000006,  // ........**
-     0x00000306,  // .**.....**
-     0x0000038C,  // .***...**.
-     0x000000F8,  // ...*****..
+     0x0000007B,  // ...****.**
+     0x000000C7,  // ..**...***
+     0x00000083,  // ..*.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000EF,  // ..***.****
+     0x0000007B,  // ...****.**
+     0x00000003,  // ........**
+     0x00000183,  // .**.....**
+     0x000001C6,  // .***...**.
+     0x0000007C,  // ...*****..
   },
   {             // 104
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x0000037C,  // .**.*****.
-     0x000003CE,  // .****..***
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BE,  // .**.*****.
+     0x000001E7,  // .****..***
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1683,65 +1683,65 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 106
-     4, 20,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x00000038,  // ***..
+     5, 20,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001C,  // ***..
   },
   {             // 107
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000318,  // .**...**..
-     0x00000330,  // .**..**...
-     0x00000360,  // .**.**....
-     0x000003E0,  // .*****....
-     0x000003E0,  // .*****....
-     0x00000330,  // .**..**...
-     0x00000318,  // .**...**..
-     0x00000318,  // .**...**..
-     0x0000030C,  // .**....**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x0000018C,  // .**...**..
+     0x00000198,  // .**..**...
+     0x000001B0,  // .**.**....
+     0x000001F0,  // .*****....
+     0x000001F0,  // .*****....
+     0x00000198,  // .**..**...
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1752,19 +1752,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
@@ -1778,16 +1778,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000DE78,  // .**.****..****..
-     0x0000E38C,  // .***...***...**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
+     0x00006F3C,  // .**.****..****..
+     0x000071C6,  // .***...***...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -1801,16 +1801,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000037C,  // .**.*****.
-     0x000003CE,  // .****..***
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
+     0x000001BE,  // .**.*****.
+     0x000001E7,  // .****..***
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1824,16 +1824,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -1847,20 +1847,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000378,  // .**.****..
-     0x0000038C,  // .***...**.
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000038C,  // .***...**.
-     0x000003F8,  // .*******..
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001C6,  // .***...**.
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000001C6,  // .***...**.
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
   },
   {             // 113
      10, 20,
@@ -1870,39 +1870,39 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F6,  // ...****.**
-     0x0000018E,  // ..**...***
-     0x00000106,  // ..*.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000106,  // ..*.....**
-     0x0000018E,  // ..**...***
-     0x000000FE,  // ...*******
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
+     0x0000007B,  // ...****.**
+     0x000000C7,  // ..**...***
+     0x00000083,  // ..*.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000083,  // ..*.....**
+     0x000000C7,  // ..**...***
+     0x0000007F,  // ...*******
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
   },
   {             // 114
-     6, 20,
+     7, 20,
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000006C,  // .**.**.
-     0x0000007C,  // .*****.
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
-     0x00000060,  // .**....
+     0x00000036,  // .**.**.
+     0x0000003E,  // .*****.
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -1916,43 +1916,43 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x00000078,  // ...****..
-     0x000001CE,  // .***..***
-     0x00000186,  // .**....**
-     0x00000180,  // .**......
-     0x000000F8,  // ..*****..
-     0x0000007C,  // ...*****.
-     0x00000006,  // .......**
-     0x00000182,  // .**.....*
-     0x00000186,  // .**....**
-     0x000000FC,  // ..******.
+     0x0000003C,  // ...****..
+     0x000000E7,  // .***..***
+     0x000000C3,  // .**....**
+     0x000000C0,  // .**......
+     0x0000007C,  // ..*****..
+     0x0000003E,  // ...*****.
+     0x00000003,  // .......**
+     0x000000C1,  // .**.....*
+     0x000000C3,  // .**....**
+     0x0000007E,  // ..******.
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 116
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000003E,  // .*****
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x0000001E,  // ..****
-     0x0000000E,  // ...***
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000001F,  // .*****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x00000007,  // ...***
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 117
      10, 20,
@@ -1962,112 +1962,112 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018E,  // ..**...***
-     0x000001F6,  // ..*****.**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C7,  // ..**...***
+     0x000000FB,  // ..*****.**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 118
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000060C,  // **.....**.
-     0x0000020C,  // .*.....**.
-     0x00000308,  // .**....*..
-     0x00000118,  // ..*...**..
-     0x00000190,  // ..**..*...
-     0x000001B0,  // ..**.**...
-     0x000000B0,  // ...*.**...
-     0x000000E0,  // ...***....
-     0x000000E0,  // ...***....
-     0x00000060,  // ....**....
+     0x00000306,  // **.....**.
+     0x00000106,  // .*.....**.
+     0x00000184,  // .**....*..
+     0x0000008C,  // ..*...**..
+     0x000000C8,  // ..**..*...
+     0x000000D8,  // ..**.**...
+     0x00000058,  // ...*.**...
+     0x00000070,  // ...***....
+     0x00000070,  // ...***....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 119
-     13, 20,
+     14, 20,
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x00006184,  // **....**....*.
-     0x0000238C,  // .*...***...**.
-     0x0000238C,  // .*...***...**.
-     0x00003288,  // .**..*.*...*..
-     0x000032D8,  // .**..*.**.**..
-     0x000016D8,  // ..*.**.**.**..
-     0x00001650,  // ..*.**..*.*...
-     0x00001C50,  // ..***...*.*...
-     0x00000C70,  // ...**...***...
-     0x00000C60,  // ...**...**....
+     0x000030C2,  // **....**....*.
+     0x000011C6,  // .*...***...**.
+     0x000011C6,  // .*...***...**.
+     0x00001944,  // .**..*.*...*..
+     0x0000196C,  // .**..*.**.**..
+     0x00000B6C,  // ..*.**.**.**..
+     0x00000B28,  // ..*.**..*.*...
+     0x00000E28,  // ..***...*.*...
+     0x00000638,  // ...**...***...
+     0x00000630,  // ...**...**....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
   {             // 120
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x00000318,  // .**...**..
-     0x000001B0,  // ..**.**...
-     0x000000E0,  // ...***....
-     0x000000E0,  // ...***....
-     0x000000E0,  // ...***....
-     0x000000B0,  // ...*.**...
-     0x00000190,  // ..**..*...
-     0x00000318,  // .**...**..
-     0x0000060C,  // **.....**.
+     0x00000186,  // .**....**.
+     0x0000018C,  // .**...**..
+     0x000000D8,  // ..**.**...
+     0x00000070,  // ...***....
+     0x00000070,  // ...***....
+     0x00000070,  // ...***....
+     0x00000058,  // ...*.**...
+     0x000000C8,  // ..**..*...
+     0x0000018C,  // .**...**..
+     0x00000306,  // **.....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 121
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000060C,  // **.....**.
-     0x0000030C,  // .**....**.
-     0x00000308,  // .**....*..
-     0x00000118,  // ..*...**..
-     0x00000190,  // ..**..*...
-     0x000001B0,  // ..**.**...
-     0x000000B0,  // ...*.**...
-     0x000000E0,  // ...***....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000040,  // ....*.....
-     0x000000C0,  // ...**.....
-     0x00000380,  // .***......
-     0x00000300,  // .**.......
+     0x00000306,  // **.....**.
+     0x00000186,  // .**....**.
+     0x00000184,  // .**....*..
+     0x0000008C,  // ..*...**..
+     0x000000C8,  // ..**..*...
+     0x000000D8,  // ..**.**...
+     0x00000058,  // ...*.**...
+     0x00000070,  // ...***....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000020,  // ....*.....
+     0x00000060,  // ...**.....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
   },
   {             // 122
      9, 20,
@@ -2077,89 +2077,89 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000003FE,  // *********
-     0x0000000C,  // ......**.
-     0x00000008,  // ......*..
-     0x00000018,  // .....**..
-     0x00000030,  // ....**...
-     0x00000060,  // ...**....
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x00000100,  // .*.......
-     0x000003FE,  // *********
+     0x000001FF,  // *********
+     0x00000006,  // ......**.
+     0x00000004,  // ......*..
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x00000080,  // .*.......
+     0x000001FF,  // *********
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
   },
   {             // 123
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ....***
-     0x0000000E,  // ....***
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000010,  // ...*...
-     0x00000020,  // ..*....
-     0x00000010,  // ...*...
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000018,  // ...**..
-     0x00000008,  // ....*..
-     0x0000000E,  // ....***
+     7, 20,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000007,  // ....***
+     0x00000007,  // ....***
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000010,  // ..*....
+     0x00000008,  // ...*...
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000004,  // ....*..
+     0x00000007,  // ....***
   },
   {             // 124
      5, 20,
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
   },
   {             // 125
      6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000030,  // .**...
-     0x00000038,  // .***..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000008,  // ...*..
-     0x0000000C,  // ...**.
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
+     0x00000018,  // .**...
+     0x0000001C,  // .***..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
   },
   {             // 126
      11, 20,
@@ -2171,9 +2171,9 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007C4,  // .*****...*.
-     0x000007FC,  // .*********.
-     0x00000038,  // ......***..
+     0x000003E2,  // .*****...*.
+     0x000003FE,  // .*********.
+     0x0000001C,  // ......***..
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -2974,62 +2974,62 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
      0x00000000,  // ......
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000008,  // ...*..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
      0x00000000,  // ......
   },
   {             // 162
-     12, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001980,  // ..**..**......
-     0x000019C0,  // ..**..***.....
-     0x000003C0,  // .....****.....
-     0x00000240,  // .....*..*.....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000430,  // ....*....**...
-     0x00000C30,  // ...**....**...
-     0x00000FF8,  // ...*********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000100C,  // ..*........**.
-     0x0000300C,  // .**........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000CC0,  // ..**..**......
+     0x00000CE0,  // ..**..***.....
+     0x000001E0,  // .....****.....
+     0x00000120,  // .....*..*.....
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000218,  // ....*....**...
+     0x00000618,  // ...**....**...
+     0x000007FC,  // ...*********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000806,  // ..*........**.
+     0x00001806,  // .**........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 163
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000078,  // ....****..
-     0x0000019C,  // ..**..***.
-     0x0000010C,  // ..*....**.
-     0x00000100,  // ..*.......
-     0x00000100,  // ..*.......
-     0x00000100,  // ..*.......
-     0x000003E0,  // .*****....
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000180,  // ..**......
-     0x00000100,  // ..*.......
-     0x00000300,  // .**.......
-     0x000003FC,  // .********.
-     0x0000023E,  // .*...*****
+     0x0000003C,  // ....****..
+     0x000000CE,  // ..**..***.
+     0x00000086,  // ..*....**.
+     0x00000080,  // ..*.......
+     0x00000080,  // ..*.......
+     0x00000080,  // ..*.......
+     0x000001F0,  // .*****....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x00000080,  // ..*.......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x0000011F,  // .*...*****
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3041,16 +3041,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000004,  // ........*.
-     0x000003F6,  // .******.**
-     0x000001DC,  // ..***.***.
-     0x0000030C,  // .**....**.
-     0x00000304,  // .**.....*.
-     0x0000030C,  // .**....**.
-     0x0000018C,  // ..**...**.
-     0x000003FC,  // .********.
-     0x00000376,  // .**.***.**
-     0x00000004,  // ........*.
+     0x00000002,  // ........*.
+     0x000001FB,  // .******.**
+     0x000000EE,  // ..***.***.
+     0x00000186,  // .**....**.
+     0x00000182,  // .**.....*.
+     0x00000186,  // .**....**.
+     0x000000C6,  // ..**...**.
+     0x000001FE,  // .********.
+     0x000001BB,  // .**.***.**
+     0x00000002,  // ........*.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3059,23 +3059,23 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
   },
   {             // 165
-     10, 20,
+     11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x00000C0C,  // **......**.
-     0x00000608,  // .**.....*..
-     0x00000218,  // ..*....**..
-     0x00000330,  // ..**..**...
-     0x00000130,  // ...*..**...
-     0x000001E0,  // ...****....
-     0x000007FC,  // .*********.
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000007FC,  // .*********.
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
-     0x000000C0,  // ....**.....
+     0x00000606,  // **......**.
+     0x00000304,  // .**.....*..
+     0x0000010C,  // ..*....**..
+     0x00000198,  // ..**..**...
+     0x00000098,  // ...*..**...
+     0x000000F0,  // ...****....
+     0x000003FE,  // .*********.
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x000003FE,  // .*********.
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
+     0x00000060,  // ....**.....
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3085,55 +3085,55 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      5, 20,
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
   },
   {             // 167
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F0,  // ...****...
-     0x000001D8,  // ..***.**..
-     0x0000018C,  // ..**...**.
-     0x00000180,  // ..**......
-     0x000000C0,  // ...**.....
-     0x000000E0,  // ...***....
-     0x00000138,  // ..*..***..
-     0x0000031C,  // .**...***.
-     0x0000030C,  // .**....**.
-     0x00000186,  // ..**....**
-     0x000001C6,  // ..***...**
-     0x00000064,  // ....**..*.
-     0x00000038,  // .....***..
-     0x0000000C,  // .......**.
-     0x0000000C,  // .......**.
-     0x00000184,  // ..**....*.
-     0x000000CC,  // ...**..**.
-     0x00000078,  // ....****..
+     0x00000078,  // ...****...
+     0x000000EC,  // ..***.**..
+     0x000000C6,  // ..**...**.
+     0x000000C0,  // ..**......
+     0x00000060,  // ...**.....
+     0x00000070,  // ...***....
+     0x0000009C,  // ..*..***..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x000000C3,  // ..**....**
+     0x000000E3,  // ..***...**
+     0x00000032,  // ....**..*.
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x000000C2,  // ..**....*.
+     0x00000066,  // ...**..**.
+     0x0000003C,  // ....****..
   },
   {             // 168
      6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x00000066,  // **..**
-     0x00000066,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3154,36 +3154,36 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      14, 20,
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00000C30,  // ...**....**...
-     0x00001808,  // ..**.......*..
-     0x000033C4,  // .**..****...*.
-     0x00006626,  // **..**...*..**
-     0x00006C02,  // **.**........*
-     0x00006C02,  // **.**........*
-     0x00006C02,  // **.**........*
-     0x00006C22,  // **.**....*...*
-     0x00006626,  // **..**...*..**
-     0x000033C4,  // .**..****...*.
-     0x00001808,  // ..**.......*..
-     0x00000C10,  // ...**.....*...
-     0x000007E0,  // ....******....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000C04,  // ..**.......*..
+     0x000019E2,  // .**..****...*.
+     0x00003313,  // **..**...*..**
+     0x00003601,  // **.**........*
+     0x00003601,  // **.**........*
+     0x00003601,  // **.**........*
+     0x00003611,  // **.**....*...*
+     0x00003313,  // **..**...*..**
+     0x000019E2,  // .**..****...*.
+     0x00000C04,  // ..**.......*..
+     0x00000608,  // ...**.....*...
+     0x000003F0,  // ....******....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
   {             // 170
-     7, 20,
+     8, 20,
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000F8,  // .*****..
-     0x000001CC,  // ***..**.
-     0x00000004,  // ......*.
-     0x000000FC,  // .******.
-     0x0000018C,  // **...**.
-     0x0000018C,  // **...**.
-     0x000000F4,  // .****.*.
+     0x0000007C,  // .*****..
+     0x000000E6,  // ***..**.
+     0x00000002,  // ......*.
+     0x0000007E,  // .******.
+     0x000000C6,  // **...**.
+     0x000000C6,  // **...**.
+     0x0000007A,  // .****.*.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -3205,14 +3205,14 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000004C,  // ....*..**.
-     0x000000C8,  // ...**..*..
-     0x00000198,  // ..**..**..
-     0x00000130,  // ..*..**...
-     0x00000330,  // .**..**...
-     0x00000190,  // ..**..*...
-     0x00000098,  // ...*..**..
-     0x0000004C,  // ....*..**.
+     0x00000026,  // ....*..**.
+     0x00000064,  // ...**..*..
+     0x000000CC,  // ..**..**..
+     0x00000098,  // ..*..**...
+     0x00000198,  // .**..**...
+     0x000000C8,  // ..**..*...
+     0x0000004C,  // ...*..**..
+     0x00000026,  // ....*..**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3227,12 +3227,12 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FC,  // .*********.
-     0x000007FC,  // .*********.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
-     0x0000000C,  // ........**.
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3269,57 +3269,57 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      14, 20,
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000007E0,  // ....******....
-     0x00000C30,  // ...**....**...
-     0x00001808,  // ..**.......*..
-     0x000037C4,  // .**.*****...*.
-     0x00006666,  // **..**..**..**
-     0x00006622,  // **..**...*...*
-     0x00006622,  // **..**...*...*
-     0x000067C2,  // **..*****....*
-     0x00006642,  // **..**..*....*
-     0x00006666,  // **..**..**..**
-     0x00003624,  // .**.**...*..*.
-     0x00001808,  // ..**.......*..
-     0x00000C10,  // ...**.....*...
-     0x000007E0,  // ....******....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000C04,  // ..**.......*..
+     0x00001BE2,  // .**.*****...*.
+     0x00003333,  // **..**..**..**
+     0x00003311,  // **..**...*...*
+     0x00003311,  // **..**...*...*
+     0x000033E1,  // **..*****....*
+     0x00003321,  // **..**..*....*
+     0x00003333,  // **..**..**..**
+     0x00001B12,  // .**.**...*..*.
+     0x00000C04,  // ..**.......*..
+     0x00000608,  // ...**.....*...
+     0x000003F0,  // ....******....
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
   {             // 175
-     10, 20,
+     12, 20,
+     0x00000000,  // ............
+     0x000007FF,  // .***********
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFE,  // .***********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
   },
   {             // 176
      7, 20,
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000003C,  // ..****.
-     0x00000046,  // .*...**
-     0x00000042,  // .*....*
-     0x00000046,  // .*...**
-     0x0000003C,  // ..****.
+     0x0000001E,  // ..****.
+     0x00000023,  // .*...**
+     0x00000021,  // .*....*
+     0x00000023,  // .*...**
+     0x0000001E,  // ..****.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3340,18 +3340,18 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3361,13 +3361,13 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000003C,  // .****.
-     0x00000026,  // .*..**
-     0x00000002,  // .....*
-     0x00000004,  // ....*.
-     0x00000018,  // ..**..
-     0x00000030,  // .**...
-     0x0000003E,  // .*****
+     0x0000001E,  // .****.
+     0x00000013,  // .*..**
+     0x00000001,  // .....*
+     0x00000002,  // ....*.
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x0000001F,  // .*****
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3384,13 +3384,13 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      6, 20,
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000001C,  // ..***.
-     0x00000036,  // .**.**
-     0x00000006,  // ....**
-     0x0000000C,  // ...**.
-     0x00000002,  // .....*
-     0x00000022,  // .*...*
-     0x0000003C,  // .****.
+     0x0000000E,  // ..***.
+     0x0000001B,  // .**.**
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000001,  // .....*
+     0x00000011,  // .*...*
+     0x0000001E,  // .****.
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3408,9 +3408,9 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
-     0x0000000C,  // ...**.
-     0x00000008,  // ...*..
-     0x00000010,  // ..*...
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x00000008,  // ..*...
      0x00000000,  // ......
      0x00000000,  // ......
      0x00000000,  // ......
@@ -3430,9 +3430,9 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000038,  // .....***..
-     0x00000336,  // .**..**.**
-     0x00000366,  // .**.**..**
+     0x0000001C,  // .....***..
+     0x0000019B,  // .**..**.**
+     0x000001B3,  // .**.**..**
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3450,27 +3450,27 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
   },
   {             // 182
-     12, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001980,  // ..**..**......
-     0x000019C0,  // ..**..***.....
-     0x000003C0,  // .....****.....
-     0x00000240,  // .....*..*.....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000430,  // ....*....**...
-     0x00000C30,  // ...**....**...
-     0x00000FF8,  // ...*********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000100C,  // ..*........**.
-     0x0000300C,  // .**........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000CC0,  // ..**..**......
+     0x00000CE0,  // ..**..***.....
+     0x000001E0,  // .....****.....
+     0x00000120,  // .....*..*.....
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000218,  // ....*....**...
+     0x00000618,  // ...**....**...
+     0x000007FC,  // ...*********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000806,  // ..*........**.
+     0x00001806,  // .**........**.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 183
      5, 20,
@@ -3480,8 +3480,8 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -3496,46 +3496,46 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
   },
   {             // 184
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00006FFC,  // ..**.**********.
-     0x0000CC00,  // .**..**.........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000FF0,  // .....********...
-     0x00000FF0,  // .....********...
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000C00,  // .....**.........
-     0x00000FFC,  // .....**********.
-     0x00000FFC,  // .....**********.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     16, 20,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x000037FE,  // ..**.**********.
+     0x00006600,  // .**..**.........
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x000007F8,  // .....********...
+     0x000007F8,  // .....********...
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x00000600,  // .....**.........
+     0x000007FE,  // .....**********.
+     0x000007FE,  // .....**********.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
   },
   {             // 185
      16, 20,
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000D80C,  // .**.**.......**.
-     0x0000980C,  // .*..**.......**.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
-     0x00001FFC,  // ....***********.
-     0x00001FFC,  // ....***********.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
-     0x0000180C,  // ....**.......**.
+     0x00006C06,  // .**.**.......**.
+     0x00004C06,  // .*..**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000FFE,  // ....***********.
+     0x00000FFE,  // ....***********.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
+     0x00000C06,  // ....**.......**.
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -3546,19 +3546,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
-     0x0000006C,  // .**.**.
-     0x0000004C,  // .*..**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
-     0x0000000C,  // ....**.
+     0x00000036,  // .**.**.
+     0x00000026,  // .*..**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
      0x00000000,  // .......
      0x00000000,  // .......
      0x00000000,  // .......
@@ -3573,14 +3573,14 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000120,  // ..*..*....
-     0x00000190,  // ..**..*...
-     0x00000098,  // ...*..**..
-     0x000000CC,  // ...**..**.
-     0x000000CC,  // ...**..**.
-     0x000000D8,  // ...**.**..
-     0x00000190,  // ..**..*...
-     0x00000130,  // ..*..**...
+     0x00000090,  // ..*..*....
+     0x000000C8,  // ..**..*...
+     0x0000004C,  // ...*..**..
+     0x00000066,  // ...**..**.
+     0x00000066,  // ...**..**.
+     0x0000006C,  // ...**.**..
+     0x000000C8,  // ..**..*...
+     0x00000098,  // ..*..**...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -3588,161 +3588,161 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
   },
   {             // 188
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000063E0,  // .**...*****....
-     0x00006E38,  // .**.***...***..
-     0x0000D80C,  // **.**.......**.
-     0x0000180C,  // ...**.......**.
-     0x00003006,  // ..**.........**
-     0x00003006,  // ..**.........**
-     0x00003006,  // ..**.........**
-     0x00003006,  // ..**.........**
-     0x00003006,  // ..**.........**
-     0x00003006,  // ..**.........**
-     0x0000180C,  // ...**.......**.
-     0x00001C1C,  // ...***.....***.
-     0x00000FF8,  // ....*********..
-     0x000003E0,  // ......*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000031F0,  // .**...*****....
+     0x0000371C,  // .**.***...***..
+     0x00006C06,  // **.**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00001803,  // ..**.........**
+     0x00001803,  // ..**.........**
+     0x00001803,  // ..**.........**
+     0x00001803,  // ..**.........**
+     0x00001803,  // ..**.........**
+     0x00001803,  // ..**.........**
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x000007FC,  // ....*********..
+     0x000001F0,  // ......*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 189
      16, 20,
      0x00000000,  // ................
      0x00000000,  // ................
-     0x00003018,  // ...**.......**..
-     0x00007010,  // ..***.......*...
-     0x0000B020,  // .*.**......*....
-     0x00003060,  // ...**.....**....
-     0x000030C0,  // ...**....**.....
-     0x00003080,  // ...**....*......
-     0x00003100,  // ...**...*.......
-     0x0000033C,  // .......**..****.
-     0x00000626,  // ......**...*..**
-     0x00000406,  // ......*.......**
-     0x00000804,  // .....*........*.
-     0x00001818,  // ....**......**..
-     0x00003030,  // ...**......**...
-     0x0000207E,  // ...*......******
+     0x0000180C,  // ...**.......**..
+     0x00003808,  // ..***.......*...
+     0x00005810,  // .*.**......*....
+     0x00001830,  // ...**.....**....
+     0x00001860,  // ...**....**.....
+     0x00001840,  // ...**....*......
+     0x00001880,  // ...**...*.......
+     0x0000019E,  // .......**..****.
+     0x00000313,  // ......**...*..**
+     0x00000203,  // ......*.......**
+     0x00000402,  // .....*........*.
+     0x00000C0C,  // ....**......**..
+     0x00001818,  // ...**......**...
+     0x0000103F,  // ...*......******
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
   },
   {             // 190
-     16, 20,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0001B80C,  // ..**.***.......**.
-     0x00031818,  // .**...**......**..
-     0x00000C18,  // .......**.....**..
-     0x00000630,  // ........**...**...
-     0x00000660,  // ........**..**....
-     0x00000340,  // .........**.*.....
-     0x000001C0,  // ..........***.....
-     0x00000180,  // ..........**......
-     0x00000180,  // ..........**......
-     0x00000180,  // ..........**......
-     0x00000180,  // ..........**......
-     0x00000180,  // ..........**......
-     0x00000180,  // ..........**......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
+     18, 20,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x0000DC06,  // ..**.***.......**.
+     0x00018C0C,  // .**...**......**..
+     0x0000060C,  // .......**.....**..
+     0x00000318,  // ........**...**...
+     0x00000330,  // ........**..**....
+     0x000001A0,  // .........**.*.....
+     0x000000E0,  // ..........***.....
+     0x000000C0,  // ..........**......
+     0x000000C0,  // ..........**......
+     0x000000C0,  // ..........**......
+     0x000000C0,  // ..........**......
+     0x000000C0,  // ..........**......
+     0x000000C0,  // ..........**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
   },
   {             // 191
+     15, 20,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000031F0,  // .**...*****....
+     0x00003738,  // .**.***..***...
+     0x00006C0C,  // **.**......**..
+     0x00000C0C,  // ...**......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00000804,  // ...*........*..
+     0x00000C0C,  // ...**......**..
+     0x00000618,  // ....**....**...
+     0x00001F3E,  // ..*****..*****.
+     0x00001F3E,  // ..*****..*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 192
+     9, 20,
+     0x00000000,  // .........
+     0x00000018,  // ....**...
+     0x000001B3,  // **.**..**
+     0x00000183,  // **.....**
+     0x00000000,  // .........
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000030,  // ...**....
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 193
      14, 20,
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000063E0,  // .**...*****....
-     0x00006E70,  // .**.***..***...
-     0x0000D818,  // **.**......**..
-     0x00001818,  // ...**......**..
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x0000300C,  // ..**........**.
-     0x00001008,  // ...*........*..
-     0x00001818,  // ...**......**..
-     0x00000C30,  // ....**....**...
-     0x00003E7C,  // ..*****..*****.
-     0x00003E7C,  // ..*****..*****.
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000E0,  // ......***.....
+     0x000001E0,  // .....****.....
+     0x00000120,  // .....*..*.....
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000218,  // ....*....**...
+     0x00000618,  // ...**....**...
+     0x000007FC,  // ...*********..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000806,  // ..*........**.
+     0x00001806,  // .**........**.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-  },
-  {             // 192
-     4, 20,
-     0x00000000,  // .........
-     0x00000030,  // ....**...
-     0x00000366,  // **.**..**
-     0x00000306,  // **.....**
-     0x00000000,  // .........
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000060,  // ...**....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 193
-     12, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ......**......
-     0x000001C0,  // ......***.....
-     0x000003C0,  // .....****.....
-     0x00000240,  // .....*..*.....
-     0x00000660,  // ....**..**....
-     0x00000660,  // ....**..**....
-     0x00000430,  // ....*....**...
-     0x00000C30,  // ...**....**...
-     0x00000FF8,  // ...*********..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x0000100C,  // ..*........**.
-     0x0000300C,  // .**........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
   },
   {             // 194
      12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF0,  // .********...
-     0x00000C38,  // .**....***..
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000C0C,  // .**......**.
-     0x00000FF0,  // .********...
-     0x00000FFC,  // .**********.
-     0x00000C0C,  // .**......**.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C0C,  // .**......**.
-     0x00000FFC,  // .**********.
-     0x00000FF0,  // .********...
+     0x000007F8,  // .********...
+     0x0000061C,  // .**....***..
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007F8,  // .********...
+     0x000007FE,  // .**********.
+     0x00000606,  // .**......**.
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000606,  // .**......**.
+     0x000007FE,  // .**********.
+     0x000007F8,  // .********...
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3753,65 +3753,65 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
-     0x00000300,  // .**.......
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 196
-     12, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ......**......
-     0x000001C0,  // ......***.....
-     0x000003C0,  // .....****.....
-     0x00000240,  // .....*..*.....
-     0x00000660,  // ....**..**....
-     0x00000620,  // ....**...*....
-     0x00000430,  // ....*....**...
-     0x00000C30,  // ...**....**...
-     0x00000C18,  // ...**.....**..
-     0x00001818,  // ..**......**..
-     0x00001818,  // ..**......**..
-     0x00001FFC,  // ..***********.
-     0x00003FFC,  // .************.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 20,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000E0,  // ......***.....
+     0x000001E0,  // .....****.....
+     0x00000120,  // .....*..*.....
+     0x00000330,  // ....**..**....
+     0x00000310,  // ....**...*....
+     0x00000218,  // ....*....**...
+     0x00000618,  // ...**....**...
+     0x0000060C,  // ...**.....**..
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000FFE,  // ..***********.
+     0x00001FFE,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 197
      12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FF0,  // .********...
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007F8,  // .********...
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -3822,19 +3822,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000007FE,  // .**********
-     0x000007FE,  // .**********
-     0x0000000C,  // ........**.
-     0x00000018,  // .......**..
-     0x00000030,  // ......**...
-     0x00000060,  // .....**....
-     0x000000E0,  // ....***....
-     0x000000C0,  // ....**.....
-     0x00000180,  // ...**......
-     0x00000300,  // ..**.......
-     0x00000600,  // .**........
-     0x00000FFE,  // ***********
-     0x00000FFE,  // ***********
+     0x000003FF,  // .**********
+     0x000003FF,  // .**********
+     0x00000006,  // ........**.
+     0x0000000C,  // .......**..
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000070,  // ....***....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x00000180,  // ..**.......
+     0x00000300,  // .**........
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
@@ -3845,19 +3845,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3867,20 +3867,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      15, 20,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x000067CC,  // .**..*****..**.
-     0x000067CC,  // .**..*****..**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x000033E6,  // .**..*****..**.
+     0x000033E6,  // .**..*****..**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -3891,19 +3891,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
-     0x0000000C,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -3914,42 +3914,42 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000C0C,  // .**......**.
-     0x00000C18,  // .**.....**..
-     0x00000C30,  // .**....**...
-     0x00000C60,  // .**...**....
-     0x00000CC0,  // .**..**.....
-     0x00000DC0,  // .**.***.....
-     0x00000FC0,  // .******.....
-     0x00000E60,  // .***..**....
-     0x00000C30,  // .**....**...
-     0x00000C30,  // .**....**...
-     0x00000C18,  // .**.....**..
-     0x00000C0C,  // .**......**.
-     0x00000C0E,  // .**......***
+     0x00000606,  // .**......**.
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000006E0,  // .**.***.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000618,  // .**....**...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x00000606,  // .**......**.
+     0x00000607,  // .**......***
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 203
-     12, 20,
+     13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // .....**......
-     0x000001C0,  // .....***.....
-     0x00000340,  // ....**.*.....
-     0x00000360,  // ....**.**....
-     0x00000660,  // ...**..**....
-     0x00000620,  // ...**...*....
-     0x00000430,  // ...*....**...
-     0x00000C30,  // ..**....**...
-     0x00000C18,  // ..**.....**..
-     0x00001818,  // .**......**..
-     0x00001818,  // .**......**..
-     0x0000100C,  // .*........**.
-     0x0000300C,  // **........**.
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x000001B0,  // ....**.**....
+     0x00000330,  // ...**..**....
+     0x00000310,  // ...**...*....
+     0x00000218,  // ...*....**...
+     0x00000618,  // ..**....**...
+     0x0000060C,  // ..**.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000806,  // .*........**.
+     0x00001806,  // **........**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -3960,19 +3960,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x0000380E,  // .***.......***
-     0x00003C0E,  // .****......***
-     0x00003C1E,  // .****.....****
-     0x0000361E,  // .**.**....****
-     0x00003636,  // .**.**...**.**
-     0x00003336,  // .**..**..**.**
-     0x00003366,  // .**..**.**..**
-     0x000031C6,  // .**...***...**
-     0x000031C6,  // .**...***...**
-     0x00003086,  // .**....*....**
-     0x00003006,  // .**.........**
-     0x00003006,  // .**.........**
-     0x00003006,  // .**.........**
+     0x00001C07,  // .***.......***
+     0x00001E07,  // .****......***
+     0x00001E0F,  // .****.....****
+     0x00001B0F,  // .**.**....****
+     0x00001B1B,  // .**.**...**.**
+     0x0000199B,  // .**..**..**.**
+     0x000019B3,  // .**..**.**..**
+     0x000018E3,  // .**...***...**
+     0x000018E3,  // .**...***...**
+     0x00001843,  // .**....*....**
+     0x00001803,  // .**.........**
+     0x00001803,  // .**.........**
+     0x00001803,  // .**.........**
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
@@ -3983,19 +3983,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001C0C,  // .***......**.
-     0x00001E0C,  // .****.....**.
-     0x00001B0C,  // .**.**....**.
-     0x00001B0C,  // .**.**....**.
-     0x0000198C,  // .**..**...**.
-     0x000018CC,  // .**...**..**.
-     0x000018CC,  // .**...**..**.
-     0x0000186C,  // .**....**.**.
-     0x0000183C,  // .**.....****.
-     0x0000183C,  // .**.....****.
-     0x0000181C,  // .**......***.
-     0x0000180C,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E06,  // .***......**.
+     0x00000F06,  // .****.....**.
+     0x00000D86,  // .**.**....**.
+     0x00000D86,  // .**.**....**.
+     0x00000CC6,  // .**..**...**.
+     0x00000C66,  // .**...**..**.
+     0x00000C66,  // .**...**..**.
+     0x00000C36,  // .**....**.**.
+     0x00000C1E,  // .**.....****.
+     0x00000C1E,  // .**.....****.
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4006,19 +4006,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000007F8,  // ..********..
-     0x000007F8,  // ..********..
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4028,20 +4028,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      15, 20,
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000007C0,  // .....*****.....
-     0x00001FF0,  // ...*********...
-     0x00003838,  // ..***.....***..
-     0x00003018,  // ..**.......**..
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x0000600C,  // .**.........**.
-     0x00003018,  // ..**.......**..
-     0x00003838,  // ..***.....***..
-     0x00001FF0,  // ...*********...
-     0x000007C0,  // .....*****.....
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
@@ -4052,19 +4052,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001FFC,  // .***********.
-     0x00001FFC,  // .***********.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
-     0x0000180C,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4075,19 +4075,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000C3C,  // .**....****.
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C06,  // .**.......**
-     0x00000C0E,  // .**......***
-     0x00000FFC,  // .**********.
-     0x00000FF0,  // .********...
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
-     0x00000C00,  // .**.........
+     0x000007FC,  // .*********..
+     0x0000061E,  // .**....****.
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000603,  // .**.......**
+     0x00000607,  // .**......***
+     0x000007FE,  // .**********.
+     0x000007F8,  // .********...
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4098,19 +4098,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000600,  // ..**........
-     0x00000300,  // ...**.......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000300,  // ..**........
+     0x00000180,  // ...**.......
+     0x000000C0,  // ....**......
+     0x00000060,  // .....**.....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4121,65 +4121,65 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FF8,  // .*********..
-     0x00000FF8,  // .*********..
-     0x00000600,  // ..**........
-     0x00000300,  // ...**.......
-     0x00000180,  // ....**......
-     0x000000C0,  // .....**.....
-     0x000000E0,  // .....***....
-     0x000000C0,  // .....**.....
-     0x00000180,  // ....**......
-     0x00000300,  // ...**.......
-     0x00000600,  // ..**........
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000300,  // ..**........
+     0x00000180,  // ...**.......
+     0x000000C0,  // ....**......
+     0x00000060,  // .....**.....
+     0x00000070,  // .....***....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 212
-     11, 20,
+     12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000FFC,  // .**********.
-     0x00000FFC,  // .**********.
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
-     0x000000C0,  // .....**.....
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 213
-     12, 20,
+     13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000380C,  // ***.......**.
-     0x00001818,  // .**......**..
-     0x00000C18,  // ..**.....**..
-     0x00000E30,  // ..***...**...
-     0x00000660,  // ...**..**....
-     0x00000340,  // ....**.*.....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00001C06,  // ***.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000718,  // ..***...**...
+     0x00000330,  // ...**..**....
+     0x000001A0,  // ....**.*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4188,44 +4188,44 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
   {             // 214
      15, 20,
      0x00000000,  // ...............
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
-     0x00000FE0,  // ....*******....
-     0x00003FF8,  // ..***********..
-     0x0000331C,  // ..**..**...***.
-     0x0000630E,  // .**...**....***
-     0x00006306,  // .**...**.....**
-     0x00006306,  // .**...**.....**
-     0x00006306,  // .**...**.....**
-     0x00006306,  // .**...**.....**
-     0x0000230C,  // ..*...**....**.
-     0x00003318,  // ..**..**...**..
-     0x00000FF0,  // ....********...
-     0x00000300,  // ......**.......
-     0x00000300,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007F0,  // ....*******....
+     0x00001FFC,  // ..***********..
+     0x0000198E,  // ..**..**...***.
+     0x00003187,  // .**...**....***
+     0x00003183,  // .**...**.....**
+     0x00003183,  // .**...**.....**
+     0x00003183,  // .**...**.....**
+     0x00003183,  // .**...**.....**
+     0x00001186,  // ..*...**....**.
+     0x0000198C,  // ..**..**...**..
+     0x000007F8,  // ....********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
   {             // 215
-     12, 20,
+     13, 20,
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00000C18,  // ..**.....**..
-     0x00000630,  // ...**...**...
-     0x00000660,  // ...**..**....
-     0x00000360,  // ....**.**....
-     0x000001C0,  // .....***.....
-     0x000001C0,  // .....***.....
-     0x000003C0,  // ....****.....
-     0x00000760,  // ...***.**....
-     0x00000630,  // ...**...**...
-     0x00000C30,  // ..**....**...
-     0x00001818,  // .**......**..
-     0x0000380C,  // ***.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x00000318,  // ...**...**...
+     0x00000330,  // ...**..**....
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001E0,  // ....****.....
+     0x000003B0,  // ...***.**....
+     0x00000318,  // ...**...**...
+     0x00000618,  // ..**....**...
+     0x00000C0C,  // .**......**..
+     0x00001C06,  // ***.......**.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4236,19 +4236,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C30C,  // .**....**....**.
-     0x0000C31C,  // .**....**...***.
-     0x00006338,  // ..**...**..***..
-     0x00003FF0,  // ...**********...
-     0x00001FE0,  // ....********....
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
-     0x00000300,  // .......**.......
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x0000618E,  // .**....**...***.
+     0x0000319C,  // ..**...**..***..
+     0x00001FF8,  // ...**********...
+     0x00000FF0,  // ....********....
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
+     0x00000180,  // .......**.......
      0x00000000,  // ................
      0x00000000,  // ................
      0x00000000,  // ................
@@ -4258,89 +4258,89 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      14, 20,
      0x00000000,  // ..............
      0x00000000,  // ..............
-     0x000003C0,  // .....****.....
-     0x00000FF0,  // ...********...
-     0x00001C38,  // ..***....***..
-     0x00001818,  // ..**......**..
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x0000300C,  // .**........**.
-     0x00001008,  // ..*........*..
-     0x00001818,  // ..**......**..
-     0x00000C30,  // ...**....**...
-     0x00003E7C,  // .*****..*****.
-     0x00003E7C,  // .*****..*****.
+     0x000001E0,  // .....****.....
+     0x000007F8,  // ...********...
+     0x00000E1C,  // ..***....***..
+     0x00000C0C,  // ..**......**..
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00000804,  // ..*........*..
+     0x00000C0C,  // ..**......**..
+     0x00000618,  // ...**....**...
+     0x00001F3E,  // .*****..*****.
+     0x00001F3E,  // .*****..*****.
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
      0x00000000,  // ..............
   },
   {             // 218
-     5, 20,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x000001B6,  // **.**.**
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
+     8, 20,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x000000DB,  // **.**.**
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 219
-     12, 20,
+     13, 20,
      0x00000000,  // .............
-     0x00003006,  // **.........**
+     0x00001803,  // **.........**
      0x00000000,  // .............
      0x00000000,  // .............
-     0x0000180C,  // .**.......**.
-     0x00001818,  // .**......**..
-     0x00000C38,  // ..**....***..
-     0x00000630,  // ...**...**...
-     0x00000360,  // ....**.**....
-     0x000003C0,  // ....****.....
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
-     0x00000180,  // .....**......
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
   },
   {             // 220
-     11, 20,
+     12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000060,  // ......**....
-     0x000000C0,  // .....**.....
-     0x00000080,  // .....*......
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x00000040,  // .....*......
      0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000638,  // ..**...***..
-     0x000003EC,  // ...*****.**.
+     0x000001FC,  // ...*******..
+     0x0000031C,  // ..**...***..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000031C,  // ..**...***..
+     0x000001F6,  // ...*****.**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4351,19 +4351,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000018,  // ....**..
-     0x00000010,  // ....*...
+     0x0000000C,  // ....**..
+     0x00000008,  // ....*...
      0x00000000,  // ........
-     0x00000078,  // ..****..
-     0x000000FE,  // .*******
-     0x000000C4,  // .**...*.
-     0x000000C0,  // .**.....
-     0x00000040,  // ..*.....
-     0x00000030,  // ...**...
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C6,  // .**...**
-     0x0000007C,  // ..*****.
+     0x0000003C,  // ..****..
+     0x0000007F,  // .*******
+     0x00000062,  // .**...*.
+     0x00000060,  // .**.....
+     0x00000020,  // ..*.....
+     0x00000018,  // ...**...
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000063,  // .**...**
+     0x0000003E,  // ..*****.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4374,42 +4374,42 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000018,  // ......**..
-     0x00000030,  // .....**...
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
      0x00000000,  // ..........
-     0x0000037C,  // .**.*****.
-     0x0000038E,  // .***...***
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
+     0x000001BE,  // .**.*****.
+     0x000001C7,  // .***...***
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
      0x00000000,  // ..........
   },
   {             // 223
-     4, 20,
+     5, 20,
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
-     0x0000000C,  // ..**.
-     0x00000008,  // ..*..
+     0x00000006,  // ..**.
+     0x00000004,  // ..*..
      0x00000000,  // .....
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
-     0x00000018,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
      0x00000000,  // .....
      0x00000000,  // .....
      0x00000000,  // .....
@@ -4419,27 +4419,27 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000364,  // .**.**..*.
-     0x00000300,  // .**.......
+     0x00000018,  // .....**...
+     0x000001B2,  // .**.**..*.
+     0x00000180,  // .**.......
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000010C,  // ..*....**.
-     0x00000188,  // ..**...*..
-     0x000000F8,  // ...*****..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000086,  // ..*....**.
+     0x000000C4,  // ..**...*..
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 225
-     11, 20,
+     12, 20,
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4447,15 +4447,15 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003F8,  // ...*******..
-     0x00000638,  // ..**...***..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000638,  // ..**...***..
-     0x000003EC,  // ...*****.**.
+     0x000001FC,  // ...*******..
+     0x0000031C,  // ..**...***..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000031C,  // ..**...***..
+     0x000001F6,  // ...*****.**.
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
@@ -4465,46 +4465,46 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      11, 20,
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001E0,  // ...****....
-     0x000003B8,  // ..***.***..
-     0x00000618,  // .**....**..
-     0x00000608,  // .**.....*..
-     0x00000608,  // .**.....*..
-     0x00000618,  // .**....**..
-     0x000006E0,  // .**.***....
-     0x00000638,  // .**...***..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000006F0,  // .**.****...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x000000F0,  // ...****....
+     0x000001DC,  // ..***.***..
+     0x0000030C,  // .**....**..
+     0x00000304,  // .**.....*..
+     0x00000304,  // .**.....*..
+     0x0000030C,  // .**....**..
+     0x00000370,  // .**.***....
+     0x0000031C,  // .**...***..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
      0x00000000,  // ...........
   },
   {             // 227
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000204,  // .*......*.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000118,  // ..*...**..
-     0x00000198,  // ..**..**..
-     0x00000190,  // ..**..*...
-     0x000000F0,  // ...****...
-     0x000000F0,  // ...****...
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
-     0x00000060,  // ....**....
+     0x00000102,  // .*......*.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000008C,  // ..*...**..
+     0x000000CC,  // ..**..**..
+     0x000000C8,  // ..**..*...
+     0x00000078,  // ...****...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
   },
   {             // 228
@@ -4512,19 +4512,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000001FC,  // ..*******.
-     0x000000C0,  // ...**.....
-     0x00000060,  // ....**....
-     0x000000F0,  // ...****...
-     0x0000018C,  // ..**...**.
-     0x00000304,  // .**.....*.
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000C6,  // ..**...**.
+     0x00000182,  // .**.....*.
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4538,16 +4538,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000007C,  // ..*****.
-     0x000000EC,  // .***.**.
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x00000070,  // ..***...
-     0x00000070,  // ..***...
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C6,  // .**...**
-     0x0000007C,  // ..*****.
+     0x0000003E,  // ..*****.
+     0x00000076,  // .***.**.
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000038,  // ..***...
+     0x00000038,  // ..***...
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000063,  // .**...**
+     0x0000003E,  // ..*****.
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4558,23 +4558,23 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x0000003E,  // ...*****
-     0x00000004,  // ......*.
-     0x00000008,  // .....*..
-     0x00000010,  // ....*...
-     0x00000030,  // ...**...
-     0x00000060,  // ..**....
-     0x00000040,  // ..*.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000C0,  // .**.....
-     0x000000F0,  // .****...
-     0x0000007E,  // ..******
-     0x00000006,  // ......**
-     0x00000006,  // ......**
-     0x0000000E,  // .....***
-     0x00000008,  // .....*..
+     0x0000001F,  // ...*****
+     0x00000002,  // ......*.
+     0x00000004,  // .....*..
+     0x00000008,  // ....*...
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000060,  // .**.....
+     0x00000078,  // .****...
+     0x0000003F,  // ..******
+     0x00000003,  // ......**
+     0x00000003,  // ......**
+     0x00000007,  // .....***
+     0x00000004,  // .....*..
   },
   {             // 231
      10, 20,
@@ -4584,39 +4584,39 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000037C,  // .**.*****.
-     0x0000038E,  // .***...***
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
-     0x00000006,  // ........**
+     0x000001BE,  // .**.*****.
+     0x000001C7,  // .***...***
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
+     0x00000003,  // ........**
      0x00000000,  // ..........
   },
   {             // 232
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x0000018C,  // ..**...**.
-     0x00000184,  // ..**....*.
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x000003FE,  // .*********
-     0x000003FE,  // .*********
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000104,  // ..*.....*.
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000C6,  // ..**...**.
+     0x000000C2,  // ..**....*.
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000082,  // ..*.....*.
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4630,62 +4630,62 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
-     0x0000000C,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
      0x00000000,  // ....
   },
   {             // 234
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000031C,  // .**...***.
-     0x00000338,  // .**..***..
-     0x00000360,  // .**.**....
-     0x000003C0,  // .****.....
-     0x000003C0,  // .****.....
-     0x00000360,  // .**.**....
-     0x00000330,  // .**..**...
-     0x00000330,  // .**..**...
-     0x00000318,  // .**...**..
-     0x0000030C,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x0000019C,  // .**..***..
+     0x000001B0,  // .**.**....
+     0x000001E0,  // .****.....
+     0x000001E0,  // .****.....
+     0x000001B0,  // .**.**....
+     0x00000198,  // .**..**...
+     0x00000198,  // .**..**...
+     0x0000018C,  // .**...**..
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
   },
   {             // 235
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000080,  // ...*......
-     0x000000C0,  // ...**.....
-     0x000000C0,  // ...**.....
-     0x00000040,  // ....*.....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000000B0,  // ...*.**...
-     0x000001B0,  // ..**.**...
-     0x00000190,  // ..**..*...
-     0x00000118,  // ..*...**..
-     0x00000318,  // .**...**..
-     0x00000308,  // .**....*..
-     0x0000060C,  // **.....**.
+     0x00000040,  // ...*......
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000020,  // ....*.....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x00000058,  // ...*.**...
+     0x000000D8,  // ..**.**...
+     0x000000C8,  // ..**..*...
+     0x0000008C,  // ..*...**..
+     0x0000018C,  // .**...**..
+     0x00000184,  // .**....*..
+     0x00000306,  // **.....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4699,39 +4699,39 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000071C,  // .***...***.
-     0x000007FC,  // .*********.
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038E,  // .***...***.
+     0x000003FE,  // .*********.
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 237
-     9, 20,
+     10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000060C,  // **.....**.
-     0x0000020C,  // .*.....**.
-     0x00000308,  // .**....*..
-     0x00000118,  // ..*...**..
-     0x00000190,  // ..**..*...
-     0x000001B0,  // ..**.**...
-     0x000000B0,  // ...*.**...
-     0x000000E0,  // ...***....
-     0x000000E0,  // ...***....
-     0x00000060,  // ....**....
+     0x00000306,  // **.....**.
+     0x00000106,  // .*.....**.
+     0x00000184,  // .**....*..
+     0x0000008C,  // ..*...**..
+     0x000000C8,  // ..**..*...
+     0x000000D8,  // ..**.**...
+     0x00000058,  // ...*.**...
+     0x00000070,  // ...***....
+     0x00000070,  // ...***....
+     0x00000030,  // ....**....
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4742,22 +4742,22 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x000001FC,  // .*******.
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x000000F8,  // ..*****..
-     0x00000038,  // ....***..
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x000000F0,  // ..****...
-     0x0000003E,  // ....*****
-     0x00000006,  // .......**
-     0x00000006,  // .......**
-     0x0000001C,  // .....***.
+     0x000000FE,  // .*******.
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x0000007C,  // ..*****..
+     0x0000001C,  // ....***..
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x00000078,  // ..****...
+     0x0000001F,  // ....*****
+     0x00000003,  // .......**
+     0x00000003,  // .......**
+     0x0000000E,  // .....***.
      0x00000000,  // .........
   },
   {             // 239
@@ -4768,16 +4768,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4791,16 +4791,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x000007FE,  // **********
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x000003FF,  // **********
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4814,20 +4814,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...........
      0x00000000,  // ...........
      0x00000000,  // ...........
-     0x000001F0,  // ...*****...
-     0x000003B8,  // ..***.***..
-     0x00000308,  // ..**....*..
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x0000060C,  // .**.....**.
-     0x00000718,  // .***...**..
-     0x000007F0,  // .*******...
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
-     0x00000600,  // .**........
+     0x000000F8,  // ...*****...
+     0x000001DC,  // ..***.***..
+     0x00000184,  // ..**....*..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003F8,  // .*******...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
   },
   {             // 242
      9, 20,
@@ -4837,20 +4837,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .........
      0x00000000,  // .........
      0x00000000,  // .........
-     0x0000003E,  // ....*****
-     0x00000072,  // ...***..*
-     0x000000C0,  // ..**.....
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x00000180,  // .**......
-     0x000000C0,  // ..**.....
-     0x00000070,  // ...***...
-     0x0000001C,  // .....***.
-     0x00000006,  // .......**
-     0x00000006,  // .......**
-     0x0000003E,  // ....*****
-     0x00000038,  // ....***..
+     0x0000001F,  // ....*****
+     0x00000039,  // ...***..*
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x00000060,  // ..**.....
+     0x00000038,  // ...***...
+     0x0000000E,  // .....***.
+     0x00000003,  // .......**
+     0x00000003,  // .......**
+     0x0000001F,  // ....*****
+     0x0000001C,  // ....***..
   },
   {             // 243
      12, 20,
@@ -4860,39 +4860,39 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000003FC,  // ...********.
-     0x00000630,  // ..**...**...
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000C18,  // .**.....**..
-     0x00000630,  // ..**...**...
-     0x000003E0,  // ...*****....
+     0x000001FE,  // ...********.
+     0x00000318,  // ..**...**...
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x0000060C,  // .**.....**..
+     0x00000318,  // ..**...**...
+     0x000001F0,  // ...*****....
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 244
-     7, 20,
+     8, 20,
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x000000FC,  // .******.
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
-     0x00000030,  // ...**...
+     0x0000007E,  // .******.
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4906,16 +4906,16 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000188,  // ..**...*..
-     0x000000F0,  // ...****...
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000C4,  // ..**...*..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -4929,20 +4929,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x00000378,  // ...**.****..
-     0x0000064C,  // ..**..*..**.
-     0x00000C46,  // .**...*...**
-     0x00000C46,  // .**...*...**
-     0x00000C46,  // .**...*...**
-     0x00000C46,  // .**...*...**
-     0x00000C46,  // .**...*...**
-     0x0000064C,  // ..**..*..**.
-     0x00000778,  // ..***.****..
-     0x000001F0,  // ....*****...
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
-     0x00000040,  // ......*.....
+     0x000001BC,  // ...**.****..
+     0x00000326,  // ..**..*..**.
+     0x00000623,  // .**...*...**
+     0x00000623,  // .**...*...**
+     0x00000623,  // .**...*...**
+     0x00000623,  // .**...*...**
+     0x00000623,  // .**...*...**
+     0x00000326,  // ..**..*..**.
+     0x000003BC,  // ..***.****..
+     0x000000F8,  // ....*****...
+     0x00000020,  // ......*.....
+     0x00000020,  // ......*.....
+     0x00000020,  // ......*.....
+     0x00000020,  // ......*.....
   },
   {             // 247
      10, 20,
@@ -4952,19 +4952,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000020C,  // .*.....**.
-     0x0000030C,  // .**....**.
-     0x00000118,  // ..*...**..
-     0x00000198,  // ..**..**..
-     0x000000B0,  // ...*.**...
-     0x000000E0,  // ...***....
-     0x00000060,  // ....**....
-     0x000000E0,  // ...***....
-     0x000000F0,  // ...****...
-     0x00000190,  // ..**..*...
-     0x00000118,  // ..*...**..
-     0x0000030C,  // .**....**.
-     0x0000020C,  // .*.....**.
+     0x00000106,  // .*.....**.
+     0x00000186,  // .**....**.
+     0x0000008C,  // ..*...**..
+     0x000000CC,  // ..**..**..
+     0x00000058,  // ...*.**...
+     0x00000070,  // ...***....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x00000078,  // ...****...
+     0x000000C8,  // ..**..*...
+     0x0000008C,  // ..*...**..
+     0x00000186,  // .**....**.
+     0x00000106,  // .*.....**.
      0x00000000,  // ..........
   },
   {             // 248
@@ -4975,20 +4975,20 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x00001806,  // .**........**
-     0x000018C6,  // .**...**...**
-     0x000018C6,  // .**...**...**
-     0x000018C6,  // .**...**...**
-     0x000018C6,  // .**...**...**
-     0x00000CCC,  // ..**..**..**.
-     0x000007F8,  // ...********..
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
-     0x000000C0,  // ......**.....
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C03,  // .**........**
+     0x00000C63,  // .**...**...**
+     0x00000C63,  // .**...**...**
+     0x00000C63,  // .**...**...**
+     0x00000C63,  // .**...**...**
+     0x00000666,  // ..**..**..**.
+     0x000003FC,  // ...********..
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
   },
   {             // 249
      15, 20,
@@ -4998,62 +4998,62 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x00003008,  // ..**........*..
-     0x00003008,  // ..**........*..
-     0x0000600C,  // .**.........**.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x00006184,  // .**....**....*.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x000033C8,  // ..**..****..*..
-     0x00001E78,  // ...****..****..
+     0x00001804,  // ..**........*..
+     0x00001804,  // ..**........*..
+     0x00003006,  // .**.........**.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000030C2,  // .**....**....*.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000019E4,  // ..**..****..*..
+     0x00000F3C,  // ...****..****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
   {             // 250
-     4, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000006E,  // **.***
-     0x00000060,  // **....
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000018,  // ..**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
+     6, 20,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000037,  // **.***
+     0x00000030,  // **....
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 251
      10, 20,
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000188,  // ..**...*..
-     0x000000F0,  // ...****...
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000C4,  // ..**...*..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5064,19 +5064,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000010,  // ......*...
-     0x00000030,  // .....**...
+     0x00000008,  // ......*...
+     0x00000018,  // .....**...
      0x00000000,  // ..........
-     0x000000F8,  // ...*****..
-     0x000001DC,  // ..***.***.
-     0x00000386,  // .***....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x00000306,  // .**.....**
-     0x0000018C,  // ..**...**.
-     0x000000F8,  // ...*****..
+     0x0000007C,  // ...*****..
+     0x000000EE,  // ..***.***.
+     0x000001C3,  // .***....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x00000183,  // .**.....**
+     0x000000C6,  // ..**...**.
+     0x0000007C,  // ...*****..
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5087,19 +5087,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
-     0x00000030,  // .....**...
-     0x00000020,  // .....*....
+     0x00000018,  // .....**...
+     0x00000010,  // .....*....
      0x00000000,  // ..........
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x0000030C,  // .**....**.
-     0x00000188,  // ..**...*..
-     0x000000F0,  // ...****...
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000C4,  // ..**...*..
+     0x00000078,  // ...****...
      0x00000000,  // ..........
      0x00000000,  // ..........
      0x00000000,  // ..........
@@ -5110,19 +5110,19 @@ cFont::tPixelData FontSml_iso8859_7[][22] = {
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
-     0x000000C0,  // ........**.....
-     0x00000080,  // ........*......
+     0x00000060,  // ........**.....
+     0x00000040,  // ........*......
      0x00000000,  // ...............
-     0x00001018,  // ...*.......**..
-     0x00003008,  // ..**........*..
-     0x0000200C,  // ..*.........**.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x00006184,  // .**....**....*.
-     0x0000618C,  // .**....**...**.
-     0x0000618C,  // .**....**...**.
-     0x000033C8,  // ..**..****..*..
-     0x00001E78,  // ...****..****..
+     0x0000080C,  // ...*.......**..
+     0x00001804,  // ..**........*..
+     0x00001006,  // ..*.........**.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000030C2,  // .**....**....*.
+     0x000030C6,  // .**....**...**.
+     0x000030C6,  // .**....**...**.
+     0x000019E4,  // ..**..****..*..
+     0x00000F3C,  // ...****..****..
      0x00000000,  // ...............
      0x00000000,  // ...............
      0x00000000,  // ...............
diff --git a/genfontfile.c b/genfontfile.c
index bc171cf25..af45ad5d2 100644
--- a/genfontfile.c
+++ b/genfontfile.c
@@ -240,7 +240,7 @@ printGlyph(FontInfoPtr font, int c)
 {
   PerGlyphInfoPtr glyph;
   unsigned char *bitmapData;
-  int width, height, spanLength;
+  int width, height, spanLength, charWidth;
   int x, y, l;
   char buf[1000], *b;
 
@@ -253,12 +253,15 @@ printGlyph(FontInfoPtr font, int c)
     width = glyph->width;
     spanLength = (width + 7) / 8;
     height = glyph->height;
+    charWidth = glyph->xoffset + width;
+    if (charWidth < glyph->advance)
+       charWidth = glyph->advance;
 
     printf("  {             // %d\n", c);
-    printf("     %d, %d,\n", glyph->advance, font->max_ascent + font->max_descent);
+    printf("     %d, %d,\n", charWidth, font->max_ascent + font->max_descent);
     for (y = 0; y < font->max_ascent - glyph->yoffset - height; y++) {
         printf("     0x%08X,  // ", 0);
-        for (x = 0; x < glyph->xoffset + width || x < glyph->advance; x++)
+        for (x = 0; x < charWidth; x++)
             putchar('.');
         putchar('\n');
         }
@@ -269,13 +272,13 @@ printGlyph(FontInfoPtr font, int c)
             *b++ = '.';
         if (bitmapData) {
            for (x = 0; x < width; x++) {
+               l <<= 1;
                if (bitmapData[y * spanLength + x / 8] & (1 << (x & 7))) {
                   *b++ = '*';
                   l |= 1;
                   }
                else
                   *b++ = '.';
-               l <<= 1;
                }
            for (x = 0; x < glyph->advance - width - glyph->xoffset; x++) {
                *b++ = '.';
diff --git a/i18n.c b/i18n.c
index 8121d2b05..911dd2339 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,26 +4,26 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.164 2004/11/20 11:23:58 kls Exp $
+ * $Id: i18n.c 1.169 2005/01/09 12:17:44 kls Exp $
  *
  * Translations provided by:
  *
- * Slovenian   Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
- * Italian     Alberto Carraro <bertocar@tin.it> and Antonio Ospite <ospite@studenti.unina.it>
- * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com> and Hans Dingemans <hans.dingemans@tacticalops.nl>
+ * Slovenian   Miha Setina <mihasetina@softhome.net>, Matjaz Thaler <matjaz.thaler@guest.arnes.si>
+ * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>
+ * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
- * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com> and Gregoire Favre <greg@magma.unil.ch>
- * Norwegian   J�rgen Tvedt <pjtvedt@online.no> and Truls Slevigen <truls@slevigen.no>
- * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
+ * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>
+ * Norwegian   J�rgen Tvedt <pjtvedt@online.no>, Truls Slevigen <truls@slevigen.no>
+ * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi>, Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  * Polish      Michael Rakowski <mrak@gmx.de>
  * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
- * Swedish     Tomas Prybil <tomas@prybil.se> and Jan Ekholm <chakie@infa.abo.fi>
+ * Swedish     Tomas Prybil <tomas@prybil.se>, Jan Ekholm <chakie@infa.abo.fi>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
- * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com> and Guido Josten <guido.josten@t-online.de>
- * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
+ * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
+ * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com>, Jordi Vil� <jvila@tinet.org>
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
- * Croatian    Drazen Dupor <drazen.dupor@dupor.com> and Dino Ravnic <dino.ravnic@fer.hr>
+ * Croatian    Drazen Dupor <drazen.dupor@dupor.com>, Dino Ravnic <dino.ravnic@fer.hr>
  * Estonian    Arthur Konovalov <kasjas@hot.ee>
  * Danish      Mogens Elneff <mogens@elneff.dk>
  *
@@ -103,15 +103,15 @@ const tI18nPhrase Phrases[] = {
     "Dansk",
   },
   // The character set needed for this language (this MUST be the second phrase!):
-  { "iso8859-1",
-    "iso8859-1",
-    "iso8859-1",
+  { "iso8859-15",
+    "iso8859-15",
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
+    "iso8859-15",
     "iso8859-1",
     "iso8859-1",
     "iso8859-7",
@@ -907,7 +907,7 @@ const tI18nPhrase Phrases[] = {
   { "Menu",
     "Men�",
     "Meni",
-    "Menu",
+    "Men�",
     "Menu",
     "Menu",
     "Menu",
@@ -949,7 +949,7 @@ const tI18nPhrase Phrases[] = {
   { "Scan",
     "Scan",
     "",//TODO
-    "",//TODO
+    "Scansione",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1792,7 +1792,7 @@ const tI18nPhrase Phrases[] = {
   { "VPS",
     "VPS",
     "",// TODO
-    "",// TODO
+    "VPS",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2294,6 +2294,27 @@ const tI18nPhrase Phrases[] = {
     "CAM mooduli taask�ivitus tehtud",
     "CAM er blevet nulstillet",
   },
+  { "No audio available!",
+    "Kein Audio verf�gbar!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   // Setup pages:
   { "OSD",
     "OSD",
@@ -2319,7 +2340,7 @@ const tI18nPhrase Phrases[] = {
   { "EPG",
     "EPG",
     "Programski vodnik",
-    "EPG",
+    "Guida programmi EPG",
     "EPG",
     "EPG",
     "Guide des programmes",
@@ -2382,7 +2403,7 @@ const tI18nPhrase Phrases[] = {
   { "CICAM",
     "CICAM",
     "CICAM",
-    "CICAM",
+    "Accesso condizionato CICAM",
     "CICAM",
     "CICAM",
     "Acc�s conditionnel",
@@ -2551,7 +2572,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Skin",
     "Oberfl�che",
     "",// TODO
-    "",// TODO
+    "Superficie Skin",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2572,7 +2593,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Theme",
     "Thema",
     "",// TODO
-    "",// TODO
+    "Tema",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2593,7 +2614,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Left",
     "Links",
     "",// TODO
-    "",// TODO
+    "Sinistra",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2614,7 +2635,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Top",
     "Oben",
     "",// TODO
-    "",// TODO
+    "Cima",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2698,7 +2719,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Use small font",
     "Kleine Schrift benutzen",
     "",// TODO
-    "",// TODO
+    "Utilizzare caratteri piccoli",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2719,7 +2740,7 @@ const tI18nPhrase Phrases[] = {
   { "never",
     "nie",
     "",// TODO
-    "",// TODO
+    "mai",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2740,7 +2761,7 @@ const tI18nPhrase Phrases[] = {
   { "skin dependent",
     "je nach Oberfl�che",
     "",// TODO
-    "",// TODO
+    "in base alla superficie",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2761,7 +2782,7 @@ const tI18nPhrase Phrases[] = {
   { "always",
     "immer",
     "",// TODO
-    "",// TODO
+    "sempre",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2887,7 +2908,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
     "Cas do EPG pregleda (h)",
-    "Timeout scansione EPG (h)",
+    "Timeout scansione aggiornamento EPG (ore)",
     "EPG-scan Timeout (h)",
     "Expirou o EPG (h)",
     "Inactivit� avant rech. EPG (h)",
@@ -2929,7 +2950,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
     "",// TODO
-    "",// TODO
+    "Visualizzazione dati vecchi (min)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2992,7 +3013,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
     "",// TODO
-    "",// TODO
+    "Lingue preferite",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3013,7 +3034,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
     "",// TODO
-    "",// TODO
+    "Lingua preferita",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3073,10 +3094,31 @@ const tI18nPhrase Phrases[] = {
     "TV k�lgsuhe",
     "Video format",
   },
+  { "Setup.DVB$Use Dolby Digital",
+    "Dolby Digital Ton benutzen",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
     "",// TODO
-    "",// TODO
+    "Aggiornare i canali",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3097,7 +3139,7 @@ const tI18nPhrase Phrases[] = {
   { "names only",
     "nur Namen",
     "",// TODO
-    "",// TODO
+    "solo nomi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3118,7 +3160,7 @@ const tI18nPhrase Phrases[] = {
   { "names and PIDs",
     "Namen und PIDs",
     "",// TODO
-    "",// TODO
+    "nomi e PIDs",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3139,7 +3181,7 @@ const tI18nPhrase Phrases[] = {
   { "add new channels",
     "neue Kan�le hinzuf�gen",
     "",// TODO
-    "",// TODO
+    "aggiungere canali nuovi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3160,7 +3202,7 @@ const tI18nPhrase Phrases[] = {
   { "add new transponders",
     "neue Transponder hinzuf�gen",
     "",// TODO
-    "",// TODO
+    "aggiungere transponder nuovi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3454,7 +3496,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
     "",// TODO
-    "",// TODO
+    "Utilizzare VPS",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3475,7 +3517,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
     "",// TODO
-    "",// TODO
+    "Margine VPS",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3556,27 +3598,6 @@ const tI18nPhrase Phrases[] = {
     "Otsesalvestuse kestus (min)",
     "L�ngde af direkte optagelse (min)",
   },
-  { "Setup.Recording$Record Dolby Digital",
-    "Dolby Digital Ton aufzeichnen",
-    "Posnemi dolby digital",
-    "Registra Dolby Digital",
-    "Dolby Digital geluid opnamen",
-    "Gravar em Dolby Digital",
-    "Enregistrer en Dolby Digital",
-    "Ta opp Dolby Digital lyd",
-    "Dolby Digital tallennus",
-    "Nagrywac Dolby Digital",
-    "Grabar sonido Dolby Digital",
-    "������� ��� Dolby Digital ����",
-    "Spela in ljudet med Dolby Digital",
-    "�nregistreaz� Dolby Digital",
-    "Dolby Digit�l felv�tel",
-    "Gravar el so en Dolby Digital",
-    "���������� ���� Dolby Digital",
-    "Snimi 'Dolby digital' ton",
-    "Dolby Digital salvestamine",
-    "Optag Dolby Digital lyd",
-  },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
     "Najvecja velikost datoteke (MB)",
@@ -3664,7 +3685,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
     "Predvajalni ID",
-    "Resume ID",// TODO
+    "ID Ripresa",
     "Hervattings ID",
     "Resume ID",// TODO
     "ID de reprise",
@@ -3685,7 +3706,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
     "Najmanjsi cas dogodka (min)",
-    "Tempo minimo di pausa (min)", // ??? i don't know...
+    "Spegnimento: controllo prossimo evento (m)",
     "Minimale event time-out (min)",
     "Per�odo m�nimo de pausa (min)",
     "MinEventTimeout (min)",
@@ -3706,7 +3727,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
     "Najmanjsi cas neaktivnosti (min)",
-    "Tempo minimo di inattivita' (min)",
+    "Spegnimento: tempo minimo di inattivit� (m)",
     "Minimum gebruikers inactiviteit (min)",
     "Per�odo m�nimo de inactividade (min)",
     "Dur�e minimale d'inact. (min)",
@@ -3748,7 +3769,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
     "",// TODO
-    "",// TODO
+    "Timeout Zapping",
     "Zap timeout (s)",
     "",// TODO
     "",// TODO
@@ -4151,7 +4172,7 @@ const tI18nPhrase Phrases[] = {
   { "Down",
     "Ab",
     "Dol",
-    "Giu",
+    "Gi�",
     "Omlaag",
     "Baixo",
     "Bas",
@@ -4172,7 +4193,7 @@ const tI18nPhrase Phrases[] = {
   { "Menu",
     "Men�",
     "Meni",
-    "Menu",
+    "Men�",
     "Menu",
     "Menu",
     "Menu",
@@ -4610,6 +4631,27 @@ const tI18nPhrase Phrases[] = {
     "H��letu",
     "Sluk lyd",
   },
+  { "Audio",
+    "Audio",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   // Miscellaneous:
   { "yes",
     "ja",
@@ -4929,7 +4971,7 @@ const tI18nPhrase Phrases[] = {
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
     "Gor/Dol za novo poz. - Ok za premik",
-    "Su/Giu per nuova posizione - OK per muovere",
+    "Su/Gi� per nuova posizione - OK per muovere",
     "Gebruik Omhoog/Omlaag - daarna Ok",
     "Cima/Baixo para nova localiza��o - Ok para mover",
     "Haut/Bas -> nouvelle place - OK -> d�placer",
@@ -5076,7 +5118,7 @@ const tI18nPhrase Phrases[] = {
   { "Classic VDR",
     "Klassischer VDR",
     "",// TODO
-    "",// TODO
+    "VDR Classico",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5097,7 +5139,7 @@ const tI18nPhrase Phrases[] = {
   { "ST:TNG Panels",
     "ST:TNG Konsolen",
     "",// TODO
-    "",// TODO
+    "Consolles ST:TNG",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/keys.c b/keys.c
index 5529f3231..8a8a104e1 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.5 2003/09/14 10:07:47 kls Exp $
+ * $Id: keys.c 1.7 2004/12/27 11:08:34 kls Exp $
  */
 
 #include "keys.h"
@@ -44,6 +44,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kVolUp,         "Volume+"    },
                     { kVolDn,         "Volume-"    },
                     { kMute,          "Mute"       },
+                    { kAudio,         "Audio"      },
                     { kSchedule,      "Schedule"   },
                     { kChannels,      "Channels"   },
                     { kTimers,        "Timers"     },
@@ -195,7 +196,8 @@ bool cKeyMacro::Parse(char *s)
 {
   int n = 0;
   char *p;
-  while ((p = strtok(s, " \t")) != NULL) {
+  char *strtok_next;
+  while ((p = strtok_r(s, " \t", &strtok_next)) != NULL) {
         if (n < MAXKEYSINMACRO) {
            if (*p == '@') {
               if (plugin) {
diff --git a/keys.h b/keys.h
index eb4b5b349..09b2c8be0 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.5 2002/12/14 15:49:42 kls Exp $
+ * $Id: keys.h 1.6 2004/12/27 11:10:59 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -38,6 +38,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kVolUp,
              kVolDn,
              kMute,
+             kAudio,
              kSchedule,
              kChannels,
              kTimers,
diff --git a/lirc.c b/lirc.c
index d1aa4e598..8fe585ab6 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.7 2003/10/18 11:34:02 kls Exp $
+ * $Id: lirc.c 1.9 2004/12/19 18:05:13 kls Exp $
  */
 
 #include "lirc.h"
@@ -41,6 +41,8 @@ cLircRemote::cLircRemote(char *DeviceName)
 cLircRemote::~cLircRemote()
 {
   Cancel();
+  if (f >= 0)
+     close(f);
 }
 
 bool cLircRemote::Ready(void)
@@ -50,8 +52,8 @@ bool cLircRemote::Ready(void)
 
 void cLircRemote::Action(void)
 {
-  int FirstTime = 0;
-  int LastTime = 0;
+  cTimeMs FirstTime;
+  cTimeMs LastTime;
   char buf[LIRC_BUFFER_SIZE];
   char LastKeyName[LIRC_KEY_BUF] = "";
   bool repeat = false;
@@ -59,8 +61,6 @@ void cLircRemote::Action(void)
 
   for (; f >= 0;) {
 
-      LOCK_THREAD;
-
       bool ready = cFile::FileReady(f, timeout);
       int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
 
@@ -75,28 +75,27 @@ void cLircRemote::Action(void)
          int count;
          char KeyName[LIRC_KEY_BUF];
          sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
-         int Now = time_ms();
          if (count == 0) {
-            if (strcmp(KeyName, LastKeyName) == 0 && Now - FirstTime < KEYPRESSDELAY)
+            if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < KEYPRESSDELAY)
                continue; // skip keys coming in too fast
             if (repeat)
                Put(LastKeyName, false, true);
             strcpy(LastKeyName, KeyName);
             repeat = false;
-            FirstTime = Now;
+            FirstTime.Set();
             timeout = -1;
             }
          else {
-            if (Now - FirstTime < REPEATDELAY)
+            if (FirstTime.Elapsed() < REPEATDELAY)
                continue; // repeat function kicks in after a short delay
             repeat = true;
             timeout = REPEATDELAY;
             }
-         LastTime = Now;
+         LastTime.Set();
          Put(KeyName, repeat);
          }
       else if (repeat) { // the last one was a repeat, so let's generate a release
-         if (time_ms() - LastTime >= REPEATDELAY) {
+         if (LastTime.Elapsed() >= REPEATDELAY) {
             Put(LastKeyName, false, true);
             repeat = false;
             *LastKeyName = 0;
diff --git a/menu.c b/menu.c
index f482ad173..6f8ef2831 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.320 2004/11/20 10:49:17 kls Exp $
+ * $Id: menu.c 1.334 2005/01/09 13:04:49 kls Exp $
  */
 
 #include "menu.h"
@@ -116,7 +116,7 @@ void cMenuEditSrcItem::Set(void)
 {
   if (source) {
      char *buffer = NULL;
-     asprintf(&buffer, "%s - %s", cSource::ToString(source->Code()), source->Description());
+     asprintf(&buffer, "%s - %s", *cSource::ToString(source->Code()), source->Description());
      SetValue(buffer);
      free(buffer);
      }
@@ -249,7 +249,7 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 void cMenuEditChannel::Setup(void)
 {
   int current = Current();
-  char type = *cSource::ToString(data.source);
+  char type = **cSource::ToString(data.source);
 #define ST(s) if (strchr(s, type))
 
   Clear();
@@ -274,7 +274,7 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Rid"),          &data.rid, 0));
   XXX*/
   // Parameters for specific types of sources:
-  ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
+  ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr"));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
   ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues, tr("off")));
   ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues, tr("none")));
@@ -300,7 +300,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
            data.name = strcpyrealloc(data.name, name);
            if (channel) {
               *channel = data;
-              isyslog("edited channel %d %s", channel->Number(), data.ToText());
+              isyslog("edited channel %d %s", channel->Number(), *data.ToText());
               state = osBack;
               }
            else {
@@ -308,7 +308,7 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
               *channel = data;
               Channels.Add(channel);
               Channels.ReNumber();
-              isyslog("added channel %d %s", channel->Number(), data.ToText());
+              isyslog("added channel %d %s", channel->Number(), *data.ToText());
               state = osUser1;
               }
            Channels.SetModified(true);
@@ -737,9 +737,9 @@ void cMenuTimerItem::Set(void)
   asprintf(&buffer, "%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
-                    timer->IsSingleEvent() ? WeekDayName(timer->StartTime()) : "",
+                    timer->IsSingleEvent() ? *WeekDayName(timer->StartTime()) : "",
                     timer->IsSingleEvent() ? " " : "",
-                    timer->PrintDay(timer->Day()),
+                    *timer->PrintDay(timer->Day()),
                     timer->Start() / 100,
                     timer->Start() % 100,
                     timer->Stop() / 100,
@@ -795,7 +795,7 @@ eOSState cMenuTimers::OnOff(void)
      RefreshCurrent();
      DisplayCurrent(true);
      if (timer->FirstDay())
-        isyslog("timer %d first day set to %s", timer->Index() + 1, timer->PrintFirstDay());
+        isyslog("timer %d first day set to %s", timer->Index() + 1, *timer->PrintFirstDay());
      else
         isyslog("timer %d %sactivated", timer->Index() + 1, timer->HasFlags(tfActive) ? "" : "de");
      Timers.SetModified();
@@ -969,7 +969,7 @@ cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel)
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
   char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), event->GetTimeString(), t, v, r, event->Title());
+  asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), *event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1087,7 +1087,7 @@ cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event)
   char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
   char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
   char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, event->GetDateString(), event->GetTimeString(), t, v, r, event->Title());
+  asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
   SetText(buffer, false);
 }
 
@@ -1911,6 +1911,9 @@ eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
 
 class cMenuSetupDVB : public cMenuSetupBase {
 private:
+  int originalNumAudioLanguages;
+  int numAudioLanguages;
+  void Setup(void);
   const char *updateChannelsTexts[5];
 public:
   cMenuSetupDVB(void);
@@ -1919,6 +1922,9 @@ class cMenuSetupDVB : public cMenuSetupBase {
 
 cMenuSetupDVB::cMenuSetupDVB(void)
 {
+  for (numAudioLanguages = 0; numAudioLanguages < I18nNumLanguages && data.AudioLanguages[numAudioLanguages] >= 0; numAudioLanguages++)
+      ;
+  originalNumAudioLanguages = numAudioLanguages;
   updateChannelsTexts[0] = tr("no");
   updateChannelsTexts[1] = tr("names only");
   updateChannelsTexts[2] = tr("names and PIDs");
@@ -1926,22 +1932,59 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   updateChannelsTexts[4] = tr("add new transponders");
 
   SetSection(tr("DVB"));
+  Setup();
+}
+
+void cMenuSetupDVB::Setup(void)
+{
+  int current = Current();
+
+  Clear();
+
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
+  Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"),     &data.UseDolbyDigital));
   Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 5, updateChannelsTexts));
+  Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nNumLanguages));
+  for (int i = 0; i < numAudioLanguages; i++)
+     Add(new cMenuEditStraItem(tr("Setup.EPG$Audio language"),     &data.AudioLanguages[i], I18nNumLanguages, I18nLanguages()));
+
+  SetCurrent(Get(current));
+  Display();
 }
 
 eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 {
-  int oldPrimaryDVB = Setup.PrimaryDVB;
-  bool oldVideoFormat = Setup.VideoFormat;
+  int oldPrimaryDVB = ::Setup.PrimaryDVB;
+  bool oldVideoFormat = ::Setup.VideoFormat;
+  int oldnumAudioLanguages = numAudioLanguages;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
+  if (Key != kNone) {
+     if (numAudioLanguages != oldnumAudioLanguages) {
+        for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
+            data.AudioLanguages[i] = 0;
+            for (int l = 0; l < I18nNumLanguages; l++) {
+                int k;
+                for (k = 0; k < oldnumAudioLanguages; k++) {
+                    if (data.AudioLanguages[k] == l)
+                       break;
+                    }
+                if (k >= oldnumAudioLanguages) {
+                   data.AudioLanguages[i] = l;
+                   break;
+                   }
+                }
+            }
+        data.AudioLanguages[numAudioLanguages] = -1;
+        Setup();
+        }
+     }
   if (state == osBack && Key == kOk) {
-     if (Setup.PrimaryDVB != oldPrimaryDVB)
+     if (::Setup.PrimaryDVB != oldPrimaryDVB)
         state = osSwitchDvb;
-     if (Setup.VideoFormat != oldVideoFormat)
-        cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat);
+     if (::Setup.VideoFormat != oldVideoFormat)
+        cDevice::PrimaryDevice()->SetVideoFormat(::Setup.VideoFormat);
      }
   return state;
 }
@@ -2111,7 +2154,6 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
   Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
-  Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"),      &data.RecordDolbyDigital));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
 }
@@ -2410,7 +2452,7 @@ void cMenuMain::Set(const char *Plugin)
 
   // Color buttons:
 
-  SetHelp(!replaying ? tr("Record") : NULL, cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(!replaying ? tr("Record") : NULL, cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Audio") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -2471,13 +2513,8 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 state = replaying ? osContinue : osRecord;
                              break;
                case kGreen:  if (!HadSubMenu) {
-                                int CurrentAudioTrack = -1;
-                                const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&CurrentAudioTrack);
-                                if (AudioTracks) {
-                                   const char **at = &AudioTracks[CurrentAudioTrack];
-                                   if (!*++at)
-                                      at = AudioTracks;
-                                   cDevice::PrimaryDevice()->SetAudioTrack(at - AudioTracks);
+                                if (cDevice::PrimaryDevice()->NumAudioTracks() > 1) {
+                                   cRemote::Put(kAudio, true);
                                    state = osEnd;
                                    }
                                 }
@@ -2504,6 +2541,40 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- SetTrackDescriptions --------------------------------------------------
+
+static void SetTrackDescriptions(void)
+{
+  cDevice::PrimaryDevice()->ClrAvailableTracks(true);
+  cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  if (Channel) {
+     cSchedulesLock SchedulesLock;
+     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+     if (Schedules) {
+        const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+        if (Schedule) {
+           const cEvent *Present = Schedule->GetPresentEvent(true);
+           if (Present) {
+              const cComponents *Components = Present->Components();
+              if (Components) {
+                 int indexAudio = 0;
+                 int indexDolby = 0;
+                 for (int i = 0; i < Components->NumComponents(); i++) {
+                     const tComponent *p = Components->Component(i);
+                     if (p->stream == 2) {
+                        if (p->type == 0x05)
+                           cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, NULL, p->description);
+                        else
+                           cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, NULL, p->description);
+                        }
+                     }
+                 }
+              }
+           }
+        }
+     }
+}
+
 // --- cDisplayChannel -------------------------------------------------------
 
 #define DIRECTCHANNELTIMEOUT 1000 //ms
@@ -2523,7 +2594,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
      DisplayInfo();
      displayChannel->Flush();
      }
-  lastTime = time_ms();
+  lastTime.Set();
 }
 
 cDisplayChannel::cDisplayChannel(eKeys FirstKey)
@@ -2532,7 +2603,7 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   group = -1;
   number = 0;
   lastPresent = lastFollowing = NULL;
-  lastTime = time_ms();
+  lastTime.Set();
   withInfo = Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
   ProcessKey(FirstKey);
@@ -2562,6 +2633,7 @@ void cDisplayChannel::DisplayInfo(void)
            const cEvent *Present = Schedule->GetPresentEvent(true);
            const cEvent *Following = Schedule->GetFollowingEvent(true);
            if (Present != lastPresent || Following != lastFollowing) {
+              SetTrackDescriptions();
               displayChannel->SetEvents(Present, Following);
               cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
               lastPresent = Present;
@@ -2577,7 +2649,7 @@ void cDisplayChannel::Refresh(void)
   channel = Channels.GetByNumber(cDevice::CurrentChannel());
   DisplayChannel();
   displayChannel->SetEvents(NULL, NULL);
-  lastTime = time_ms();
+  lastTime.Set();
 }
 
 eOSState cDisplayChannel::ProcessKey(eKeys Key)
@@ -2597,7 +2669,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                displayChannel->SetEvents(NULL, NULL);
                withInfo = false;
                DisplayChannel();
-               lastTime = time_ms();
+               lastTime.Set();
                // Lets see if there can be any useful further input:
                int n = channel ? number * 10 : 0;
                cChannel *ch = channel;
@@ -2646,7 +2718,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                   group = -1;
                }
             }
-         lastTime = time_ms();
+         lastTime.Set();
          break;
     case kUp|k_Repeat:
     case kUp:
@@ -2663,14 +2735,14 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
          Refresh();
          break;
     case kNone:
-         if (number && time_ms() - lastTime > DIRECTCHANNELTIMEOUT) {
+         if (number && lastTime.Elapsed() > DIRECTCHANNELTIMEOUT) {
             if (Channels.GetByNumber(number))
                Channels.SwitchTo(number);
             else {
                number = 0;
                channel = NULL;
                DisplayChannel();
-               lastTime = time_ms();
+               lastTime.Set();
                return osContinue;
                }
             return osEnd;
@@ -2694,7 +2766,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      return osEnd;
                      }
     };
-  if (time_ms() - lastTime < INFOTIMEOUT) {
+  if (lastTime.Elapsed() < INFOTIMEOUT) {
      if (!number && group < 0 && channel && channel->Number() != cDevice::CurrentChannel())
         Refresh(); // makes sure a channel switch through the SVDRP CHAN command is displayed
      DisplayInfo();
@@ -2715,7 +2787,7 @@ cDisplayVolume::cDisplayVolume(void)
 :cOsdObject(true)
 {
   currentDisplayVolume = this;
-  timeout = time_ms() + (cDevice::PrimaryDevice()->IsMute() ? MUTETIMEOUT : VOLUMETIMEOUT);
+  timeout.Set(cDevice::PrimaryDevice()->IsMute() ? MUTETIMEOUT : VOLUMETIMEOUT);
   displayVolume = Skins.Current()->DisplayVolume();
   Show();
 }
@@ -2752,15 +2824,15 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
     case kVolDn|k_Repeat:
     case kVolDn:
          Show();
-         timeout = time_ms() + VOLUMETIMEOUT;
+         timeout.Set(VOLUMETIMEOUT);
          break;
     case kMute:
          if (cDevice::PrimaryDevice()->IsMute()) {
             Show();
-            timeout = time_ms() + MUTETIMEOUT;
+            timeout.Set(MUTETIMEOUT);
             }
          else
-            timeout = 0;
+            timeout.Set();
          break;
     case kNone: break;
     default: if ((Key & k_Release) == 0) {
@@ -2768,7 +2840,128 @@ eOSState cDisplayVolume::ProcessKey(eKeys Key)
                 return osEnd;
                 }
     }
-  return time_ms() < timeout ? osContinue : osEnd;
+  return timeout.TimedOut() ? osEnd : osContinue;
+}
+
+// --- cDisplayTracks --------------------------------------------------------
+
+#define TRACKTIMEOUT 5000 //ms
+
+cDisplayTracks *cDisplayTracks::currentDisplayTracks = NULL;
+
+cDisplayTracks::cDisplayTracks(void)
+:cOsdObject(true)
+{
+  // Get the actual audio track descriptions from the EPG if we're not replaying:
+  if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice())
+     SetTrackDescriptions();
+  currentDisplayTracks = this;
+  numTracks = track = 0;
+  audioChannel = cDevice::PrimaryDevice()->GetAudioChannel();
+  eTrackType CurrentAudioTrack = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+  for (int i = ttAudioFirst; i <= ttDolbyLast; i++) {
+      const tTrackId *TrackId = cDevice::PrimaryDevice()->GetTrack(eTrackType(i));
+      if (TrackId && TrackId->id) {
+         types[numTracks] = eTrackType(i);
+         descriptions[numTracks] = strdup(*TrackId->description ? TrackId->description : *TrackId->language ? TrackId->language : *itoa(i));
+         if (i == CurrentAudioTrack)
+            track = numTracks;
+         numTracks++;
+         }
+      }
+  timeout.Set(TRACKTIMEOUT);
+  displayTracks = Skins.Current()->DisplayTracks(tr("Audio"), numTracks, descriptions);
+  Show();
+}
+
+cDisplayTracks::~cDisplayTracks()
+{
+  delete displayTracks;
+  currentDisplayTracks = NULL;
+  for (int i = 0; i < numTracks; i++)
+      free(descriptions[i]);
+  cStatus::MsgOsdClear();
+}
+
+void cDisplayTracks::Show(void)
+{
+  int ac = IS_AUDIO_TRACK(types[track]) ? audioChannel : -1;
+  displayTracks->SetTrack(track, descriptions);
+  displayTracks->SetAudioChannel(ac);
+  displayTracks->Flush();
+  cStatus::MsgSetAudioTrack(track, descriptions);
+  cStatus::MsgSetAudioChannel(ac);
+}
+
+cDisplayTracks *cDisplayTracks::Create(void)
+{
+  if (cDevice::PrimaryDevice()->NumAudioTracks() > 0) {
+     if (!currentDisplayTracks)
+        new cDisplayTracks;
+     return currentDisplayTracks;
+     }
+  Skins.Message(mtWarning, tr("No audio available!"));
+  return NULL;
+}
+
+void cDisplayTracks::Process(eKeys Key)
+{
+  if (currentDisplayTracks)
+     currentDisplayTracks->ProcessKey(Key);
+}
+
+eOSState cDisplayTracks::ProcessKey(eKeys Key)
+{
+  int oldTrack = track;
+  int oldAudioChannel = audioChannel;
+  switch (Key) {
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:
+         if (NORMALKEY(Key) == kUp && track > 0)
+            track--;
+         else if (NORMALKEY(Key) == kDown && track < numTracks - 1)
+            track++;
+         timeout.Set(TRACKTIMEOUT);
+         break;
+    case kLeft|k_Repeat:
+    case kLeft:
+    case kRight|k_Repeat:
+    case kRight: if (IS_AUDIO_TRACK(types[track])) {
+                    static int ac[] = { 1, 0, 2 };
+                    audioChannel = ac[cDevice::PrimaryDevice()->GetAudioChannel()];
+                    if (NORMALKEY(Key) == kLeft && audioChannel > 0)
+                       audioChannel--;
+                    else if (NORMALKEY(Key) == kRight && audioChannel < 2)
+                       audioChannel++;
+                    audioChannel = ac[audioChannel];
+                    timeout.Set(TRACKTIMEOUT);
+                    }
+         break;
+    case kAudio:
+         if (++track >= numTracks)
+            track = 0;
+         timeout.Set(TRACKTIMEOUT);
+         break;
+    case kOk:
+         if (track != cDevice::PrimaryDevice()->GetCurrentAudioTrack())
+            oldTrack = -1; // make sure we explicitly switch to that track
+         timeout.Set();
+         break;
+    case kNone: break;
+    default: if ((Key & k_Release) == 0)
+                return osEnd;
+    }
+  if (track != oldTrack || audioChannel != oldAudioChannel)
+     Show();
+  if (track != oldTrack) {
+     cDevice::PrimaryDevice()->SetCurrentAudioTrack(types[track]);
+     Setup.CurrentDolby = IS_DOLBY_TRACK(types[track]);
+     }
+  if (audioChannel != oldAudioChannel)
+     cDevice::PrimaryDevice()->SetAudioChannel(audioChannel);
+  return timeout.TimedOut() ? osEnd : osContinue;
 }
 
 // --- cRecordControl --------------------------------------------------------
@@ -2826,7 +3019,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   isyslog("record %s", fileName);
   if (MakeDirs(fileName, true)) {
      const cChannel *ch = timer->Channel();
-     recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid1(), ch->Apid2(), ch->Dpid1(), ch->Dpid2());
+     recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid(0), ch->Apid(1), ch->Dpid(0), ch->Dpid(1));
      if (device->AttachReceiver(recorder)) {
         Recording.WriteSummary();
         cStatus::MsgRecording(device, Recording.Name());
diff --git a/menu.h b/menu.h
index 5990a2ea9..d63fdafa2 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.64 2004/06/13 11:46:03 kls Exp $
+ * $Id: menu.h 1.68 2005/01/08 15:48:57 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -46,7 +46,7 @@ class cDisplayChannel : public cOsdObject {
   cSkinDisplayChannel *displayChannel;
   int group;
   bool withInfo;
-  int lastTime;
+  cTimeMs lastTime;
   int number;
   cChannel *channel;
   const cEvent *lastPresent;
@@ -64,7 +64,7 @@ class cDisplayChannel : public cOsdObject {
 class cDisplayVolume : public cOsdObject {
 private:
   cSkinDisplayVolume *displayVolume;
-  int timeout;
+  cTimeMs timeout;
   static cDisplayVolume *currentDisplayVolume;
   virtual void Show(void);
   cDisplayVolume(void);
@@ -75,6 +75,24 @@ class cDisplayVolume : public cOsdObject {
   eOSState ProcessKey(eKeys Key);
   };
 
+class cDisplayTracks : public cOsdObject {
+private:
+  cSkinDisplayTracks *displayTracks;
+  cTimeMs timeout;
+  eTrackType types[ttMaxTrackTypes];
+  char *descriptions[ttMaxTrackTypes];
+  int numTracks, track, audioChannel;
+  static cDisplayTracks *currentDisplayTracks;
+  virtual void Show(void);
+  cDisplayTracks(void);
+public:
+  virtual ~cDisplayTracks();
+  static bool IsOpen(void) { return currentDisplayTracks != NULL; }
+  static cDisplayTracks *Create(void);
+  static void Process(eKeys Key);
+  eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuCam : public cOsdMenu {
 private:
   cCiMenu *ciMenu;
diff --git a/osd.c b/osd.c
index 23a997f16..ff0b5657f 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.58 2004/10/16 10:31:34 kls Exp $
+ * $Id: osd.c 1.59 2004/12/19 12:27:38 kls Exp $
  */
 
 #include "osd.h"
@@ -197,7 +197,8 @@ bool cBitmap::LoadXpm(const char *FileName)
      int lines = 0;
      int index = 0;
      char *s;
-     while ((s = readline(f)) != NULL) {
+     cReadLine ReadLine;
+     while ((s = ReadLine.Read(f)) != NULL) {
            s = skipspace(s);
            if (!isXpm) {
               if (strcmp(s, "/* XPM */") != 0) {
diff --git a/osdbase.c b/osdbase.c
index 42fda30e0..ec04adb8a 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.14 2004/07/17 13:29:13 kls Exp $
+ * $Id: osdbase.c 1.15 2005/01/07 16:16:41 kls Exp $
  */
 
 #include "osdbase.h"
@@ -149,8 +149,13 @@ void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, c
 void cOsdMenu::Del(int Index)
 {
   cList<cOsdItem>::Del(Get(Index));
-  if (current == Count())
-     current--;
+  int count = Count();
+  while (current < count && !SelectableItem(current)) 
+        current++;
+  if (current == count) {
+     while (current > 0 && !SelectableItem(current))  
+           current--;
+     }
   if (Index == first && first > 0)
      first--;
 }
diff --git a/player.c b/player.c
index 2b306c0b2..80e384fa8 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.8 2004/11/20 11:33:08 kls Exp $
+ * $Id: player.c 1.9 2004/12/12 11:21:07 kls Exp $
  */
 
 #include "player.h"
@@ -23,23 +23,14 @@ cPlayer::~cPlayer()
   Detach();
 }
 
-int cPlayer::PlayVideo(const uchar *Data, int Length)
+int cPlayer::PlayPes(const uchar *Data, int Length, bool VideoOnly)
 {
   if (device)
-     return device->PlayVideo(Data, Length);
-  esyslog("ERROR: attempt to use cPlayer::PlayVideo() without attaching to a cDevice!");
+     return device->PlayPes(Data, Length, VideoOnly);
+  esyslog("ERROR: attempt to use cPlayer::PlayPes() without attaching to a cDevice!");
   return -1;
 }
 
-void cPlayer::PlayAudio(const uchar *Data, int Length)
-{
-  if (device) {
-     device->PlayAudio(Data, Length);
-     return;
-     }
-  esyslog("ERROR: attempt to use cPlayer::PlayAudio() without attaching to a cDevice!");
-}
-
 void cPlayer::Detach(void)
 {
   if (device)
diff --git a/player.h b/player.h
index 8c5392aea..0f73d9b08 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.12 2004/06/19 08:53:07 kls Exp $
+ * $Id: player.h 1.14 2004/12/30 10:44:34 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -19,6 +19,7 @@ class cPlayer {
   cDevice *device;
   ePlayMode playMode;
 protected:
+  bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL, uint32_t Flags = 0) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description, Flags) : false; }
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
@@ -32,12 +33,10 @@ class cPlayer {
        // This function is called right after the cPlayer has been attached to
        // (On == true) or before it gets detached from (On == false) a cDevice.
        // It can be used to do things like starting/stopping a thread.
-  int PlayVideo(const uchar *Data, int Length);
-       // Sends the given Data to the video device and returns the number of
-       // bytes that have actually been accepted by the video device (or a
+  int PlayPes(const uchar *Data, int Length, bool VideoOnly = false);
+       // Sends the given PES Data to the device and returns the number of
+       // bytes that have actually been accepted by the device (or a
        // negative value in case of an error).
-  void PlayAudio(const uchar *Data, int Length);
-       // Plays additional audio streams, like Dolby Digital.
 public:
   cPlayer(ePlayMode PlayMode = pmAudioVideo);
   virtual ~cPlayer();
@@ -51,27 +50,10 @@ class cPlayer {
        // we are going forward or backward and 'Speed' is -1 if this is normal
        // play/pause mode, 0 if it is single speed fast/slow forward/back mode
        // and >0 if this is multi speed mode.
-  virtual int NumAudioTracks(void) const { return 0; }
-       // Returns the number of audio tracks that are currently available on this
-       // player. The default return value is 0, meaning that this player
-       // doesn't have multiple audio track capabilities. The return value may
-       // change with every call and need not necessarily be the number of list
-       // entries returned by GetAudioTracks(). This function is mainly called to
-       // decide whether there should be an "Audio" button in a menu.
-  virtual const char **GetAudioTracks(int *CurrentTrack = NULL) const { return NULL; }
-       // Returns a list of currently available audio tracks. The last entry in the
-       // list must be NULL. The number of entries does not necessarily have to be
-       // the same as returned by a previous call to NumAudioTracks().
-       // If CurrentTrack is given, it will be set to the index of the current track
-       // in the returned list. Note that the list must not be changed after it has
-       // been returned by a call to GetAudioTracks()! The only time the list may
-       // change is *inside* the GetAudioTracks() function.
-       // By default the return value is NULL and CurrentTrack, if given, will not
-       // have any meaning.
-  virtual void SetAudioTrack(int Index) {}
-       // Sets the current audio track to the given value, which should be within the
-       // range of the list returned by a previous call to GetAudioTracks()
-       // (otherwise nothing will happen).
+  virtual void SetAudioTrack(eTrackType Type, const tTrackId *TrackId) {}
+       // Sets the current audio track to the given value.
+       // This is just a virtual hook for players that need to do special things
+       // in order to switch audio tracks.
   };
 
 class cControl : public cOsdObject {
diff --git a/plugin.c b/plugin.c
index 7f211b3ce..a06d003c3 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.11 2004/05/22 11:25:22 kls Exp $
+ * $Id: plugin.c 1.12 2004/12/19 12:05:28 kls Exp $
  */
 
 #include "plugin.h"
@@ -256,26 +256,23 @@ void cPluginManager::SetDirectory(const char *Directory)
 void cPluginManager::AddPlugin(const char *Args)
 {
   if (strcmp(Args, "*") == 0) {
-     DIR *d = opendir(directory);
-     if (d) {
-        struct dirent *e;
-        while ((e = readdir(d)) != NULL) {
-              if (strstr(e->d_name, LIBVDR_PREFIX) == e->d_name) {
-                 char *p = strstr(e->d_name, SO_INDICATOR);
-                 if (p) {
-                    *p = 0;
-                    p += strlen(SO_INDICATOR);
-                    if (strcmp(p, VDRVERSION) == 0) {
-                       char *name = e->d_name + strlen(LIBVDR_PREFIX);
-                       if (strcmp(name, "*") != 0) { // let's not get into a loop!
-                          AddPlugin(e->d_name + strlen(LIBVDR_PREFIX));
-                          }
+     cReadDir d(directory);
+     struct dirent *e;
+     while ((e = d.Next()) != NULL) {
+           if (strstr(e->d_name, LIBVDR_PREFIX) == e->d_name) {
+              char *p = strstr(e->d_name, SO_INDICATOR);
+              if (p) {
+                 *p = 0;
+                 p += strlen(SO_INDICATOR);
+                 if (strcmp(p, VDRVERSION) == 0) {
+                    char *name = e->d_name + strlen(LIBVDR_PREFIX);
+                    if (strcmp(name, "*") != 0) { // let's not get into a loop!
+                       AddPlugin(e->d_name + strlen(LIBVDR_PREFIX));
                        }
                     }
                  }
               }
-        closedir(d);
-        }
+           }
      return;
      }
   char *s = strdup(skipspace(Args));
diff --git a/rcu.c b/rcu.c
index 43dc480a0..4ea80d9e9 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.6 2003/10/18 11:34:30 kls Exp $
+ * $Id: rcu.c 1.8 2004/12/19 18:06:00 kls Exp $
  */
 
 #include "rcu.h"
@@ -94,7 +94,7 @@ void cRcuRemote::Action(void)
 #pragma pack()
 
   time_t LastCodeRefresh = 0;
-  int FirstTime = 0;
+  cTimeMs FirstTime;
   uint64 LastCommand = 0;
   bool repeat = false;
 
@@ -116,15 +116,14 @@ void cRcuRemote::Action(void)
                       // This remote control sends the above command before and after
                       // each keypress - let's just drop this:
                       break;
-                   int Now = time_ms();
                    Command |= uint64(Address) << 32;
                    if (Command != LastCommand) {
                       LastCommand = Command;
                       repeat = false;
-                      FirstTime = Now;
+                      FirstTime.Set();
                       }
                    else {
-                      if (Now - FirstTime < REPEATDELAY)
+                      if (FirstTime.Elapsed() < REPEATDELAY)
                          break; // repeat function kicks in after a short delay
                       repeat = true;
                       }
@@ -295,7 +294,7 @@ bool cRcuRemote::DetectCode(unsigned char *Code)
      sprintf(buf, "C0D%c", *Code);
      String(buf);
      SetCode(*Code);
-     delay_ms(2 * REPEATDELAY);
+     cCondWait::SleepMs(2 * REPEATDELAY);
      if (receivedCommand) {
         SetMode(modeB);
         String("----");
diff --git a/recorder.c b/recorder.c
index 3508b0ae5..ded60e8c7 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.11 2004/10/16 09:23:01 kls Exp $
+ * $Id: recorder.c 1.12 2005/01/09 12:16:36 kls Exp $
  */
 
 #include <stdarg.h>
@@ -128,7 +128,7 @@ void cFileWriter::Action(void)
 }
 
 cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cReceiver(Ca, Priority, Setup.RecordDolbyDigital ? 5 : 3, VPid, APid1, APid2, DPid1, DPid2)
+:cReceiver(Ca, Priority, Setup.UseDolbyDigital ? 5 : 3, VPid, APid1, APid2, DPid1, DPid2)
 ,cThread("recording")
 {
   active = false;
diff --git a/recording.c b/recording.c
index 5a703db2d..7ba93b324 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.92 2004/11/01 14:04:47 kls Exp $
+ * $Id: recording.c 1.94 2004/12/26 11:55:24 kls Exp $
  */
 
 #include "recording.h"
@@ -157,7 +157,7 @@ cResumeFile::cResumeFile(const char *FileName)
   fileName = MALLOC(char, strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1);
   if (fileName) {
      strcpy(fileName, FileName);
-     sprintf(fileName + strlen(fileName), RESUMEFILESUFFIX, Setup.ResumeID ? "." : "", Setup.ResumeID ? itoa(Setup.ResumeID) : "");
+     sprintf(fileName + strlen(fileName), RESUMEFILESUFFIX, Setup.ResumeID ? "." : "", Setup.ResumeID ? *itoa(Setup.ResumeID) : "");
      }
   else
      esyslog("ERROR: can't allocate memory for resume file name");
@@ -541,8 +541,8 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
 
 const char *cRecording::PrefixFileName(char Prefix)
 {
-  const char *p = PrefixVideoFileName(FileName(), Prefix);
-  if (p) {
+  cString p = PrefixVideoFileName(FileName(), Prefix);
+  if (*p) {
      free(fileName);
      fileName = strdup(p);
      return fileName;
@@ -628,42 +628,39 @@ cRecordings::cRecordings(bool Deleted)
 
 void cRecordings::ScanVideoDir(const char *DirName)
 {
-  DIR *d = opendir(DirName);
-  if (d) {
-     struct dirent *e;
-     while ((e = readdir(d)) != NULL) {
-           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-              char *buffer;
-              asprintf(&buffer, "%s/%s", DirName, e->d_name);
-              struct stat st;
-              if (stat(buffer, &st) == 0) {
-                 if (S_ISLNK(st.st_mode)) {
+  cReadDir d(DirName);
+  struct dirent *e;
+  while ((e = d.Next()) != NULL) {
+        if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+           char *buffer;
+           asprintf(&buffer, "%s/%s", DirName, e->d_name);
+           struct stat st;
+           if (stat(buffer, &st) == 0) {
+              if (S_ISLNK(st.st_mode)) {
+                 free(buffer);
+                 buffer = ReadLink(buffer);
+                 if (!buffer)
+                    continue;
+                 if (stat(buffer, &st) != 0) {
                     free(buffer);
-                    buffer = ReadLink(buffer);
-                    if (!buffer)
-                       continue;
-                    if (stat(buffer, &st) != 0) {
-                       free(buffer);
-                       continue;
-                       }
+                    continue;
                     }
-                 if (S_ISDIR(st.st_mode)) {
-                    if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
-                       cRecording *r = new cRecording(buffer);
-                       if (r->Name())
-                          Add(r);
-                       else
-                          delete r;
-                       }
+                 }
+              if (S_ISDIR(st.st_mode)) {
+                 if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
+                    cRecording *r = new cRecording(buffer);
+                    if (r->Name())
+                       Add(r);
                     else
-                       ScanVideoDir(buffer);
+                       delete r;
                     }
+                 else
+                    ScanVideoDir(buffer);
                  }
-              free(buffer);
               }
+           free(buffer);
            }
-     closedir(d);
-     }
+        }
 }
 
 bool cRecordings::NeedsUpdate(void)
@@ -707,8 +704,6 @@ void cRecordings::DelByName(const char *FileName)
 
 // --- cMark -----------------------------------------------------------------
 
-char *cMark::buffer = NULL;
-
 cMark::cMark(int Position, const char *Comment)
 {
   position = Position;
@@ -720,10 +715,10 @@ cMark::~cMark()
   free(comment);
 }
 
-const char *cMark::ToText(void)
+cString cMark::ToText(void)
 {
-  free(buffer);
-  asprintf(&buffer, "%s%s%s\n", IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
+  char *buffer;
+  asprintf(&buffer, "%s%s%s\n", *IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
   return buffer;
 }
 
@@ -750,8 +745,7 @@ bool cMark::Save(FILE *f)
 
 bool cMarks::Load(const char *RecordingFileName)
 {
-  const char *MarksFile = AddDirectory(RecordingFileName, MARKSFILESUFFIX);
-  if (cConfig<cMark>::Load(MarksFile)) {
+  if (cConfig<cMark>::Load(AddDirectory(RecordingFileName, MARKSFILESUFFIX))) {
      Sort();
      return true;
      }
@@ -815,7 +809,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 {
   if (command) {
      char *cmd;
-     asprintf(&cmd, "%s %s \"%s\"", command, State, strescape(RecordingFileName, "\"$"));
+     asprintf(&cmd, "%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\"$"));
      isyslog("executing '%s'", cmd);
      SystemExec(cmd);
      free(cmd);
@@ -1156,9 +1150,9 @@ int cFileName::NextFile(void)
 
 // --- Index stuff -----------------------------------------------------------
 
-const char *IndexToHMSF(int Index, bool WithFrame)
+cString IndexToHMSF(int Index, bool WithFrame)
 {
-  static char buffer[16];
+  char buffer[16];
   int f = (Index % FRAMESPERSEC) + 1;
   int s = (Index / FRAMESPERSEC);
   int m = s / 60 % 60;
diff --git a/recording.h b/recording.h
index 184f49efe..a0f864f35 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.32 2004/10/31 16:24:38 kls Exp $
+ * $Id: recording.h 1.33 2004/12/26 11:47:35 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -86,14 +86,12 @@ class cRecordings : public cList<cRecording> {
 extern cRecordings Recordings;
 
 class cMark : public cListObject {
-private:
-  static char *buffer;
 public:
   int position;
   char *comment;
   cMark(int Position = 0, const char *Comment = NULL);
   ~cMark();
-  const char *ToText(void);
+  cString ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
   };
@@ -176,7 +174,7 @@ class cFileName {
   int NextFile(void);
   };
 
-const char *IndexToHMSF(int Index, bool WithFrame = false);
+cString IndexToHMSF(int Index, bool WithFrame = false);
       // Converts the given index to a string, optionally containing the frame number.
 int HMSFToIndex(const char *HMSF);
       // Converts the given string (format: "hh:mm:ss.ff") to an index.
diff --git a/remux.c b/remux.c
index b9c04af3d..554359c54 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.22 2004/11/16 16:49:03 kls Exp $
+ * $Id: remux.c 1.23 2004/12/18 13:15:02 kls Exp $
  */
 
 #include "remux.h"
@@ -541,6 +541,8 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
      // XXX actually '0' should be enough, but '1' must be used with encrypted channels (driver bug?)
      // XXX also allowing 0x1FFF to not break Michael Paar's original patch,
      // XXX but it would probably be best to only use '0'
+     // Force syncing of radio channels to avoid "no useful data" error
+     synced = true;
      if (PictureType)
         *PictureType = I_FRAME;
      return resultBuffer->Get(Count);
diff --git a/skinclassic.c b/skinclassic.c
index 8fd6fe94b..7eb0513b9 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.7 2004/05/29 14:04:50 kls Exp $
+ * $Id: skinclassic.c 1.11 2005/01/09 11:56:29 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -141,7 +141,7 @@ void cSkinClassicDisplayChannel::SetMessage(eMessageType Type, const char *Text)
 void cSkinClassicDisplayChannel::Flush(void)
 {
   if (!message) {
-     const char *date = DayDateTime();
+     cString date = DayDateTime();
      osd->DrawText(osd->Width() - cFont::GetFont(fontSml)->Width(date) - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml));
      }
   osd->Flush();
@@ -299,11 +299,11 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
   int y = y2;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());
+  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
-     asprintf(&buffer, " VPS: %s", Event->GetVpsString());
+     asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
      const cFont *font = cFont::GetFont(fontSml);
      osd->DrawText(x1 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font);
      free(buffer);
@@ -338,7 +338,7 @@ void cSkinClassicDisplayMenu::SetText(const char *Text, bool FixedFont)
 
 void cSkinClassicDisplayMenu::Flush(void)
 {
-  const char *date = DayDateTime();
+  cString date = DayDateTime();
   const cFont *font = cFont::GetFont(fontOsd);
   osd->DrawText(x1 - font->Width(date) - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font);
   osd->Flush();
@@ -502,6 +502,85 @@ void cSkinClassicDisplayVolume::Flush(void)
   osd->Flush();
 }
 
+// --- cSkinClassicDisplayTracks ---------------------------------------------
+
+class cSkinClassicDisplayTracks : public cSkinDisplayTracks {
+private:
+  cOsd *osd;
+  int x0, x1;
+  int y0, y1, y2;
+  int lineHeight;
+  int currentIndex;
+  void SetItem(const char *Text, int Index, bool Current);
+public:
+  cSkinClassicDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
+  virtual ~cSkinClassicDisplayTracks();
+  virtual void SetTrack(int Index, const char * const *Tracks);
+  virtual void SetAudioChannel(int AudioChannel) {}
+  virtual void Flush(void);
+  };
+
+cSkinClassicDisplayTracks::cSkinClassicDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  currentIndex = -1;
+  int ItemsWidth = font->Width(Title);
+  for (int i = 0; i < NumTracks; i++)
+      ItemsWidth = max(ItemsWidth, font->Width(Tracks[i]));
+  ItemsWidth += 10;
+  x0 = 0;
+  x1 = Setup.OSDWidth;
+  int d = x1 - x0;
+  if (d > ItemsWidth) {
+     d = (d - ItemsWidth) & ~0x07; // must be multiple of 8
+     x1 -= d;
+     }
+  y0 = 0;
+  y1 = lineHeight;
+  y2 = y1 + NumTracks * lineHeight;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y2);
+  tArea Areas[] = { { x0, y0, x1 - 1, y2 - 1, 4 } };
+  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x1 - x0);
+  for (int i = 0; i < NumTracks; i++)
+      SetItem(Tracks[i], i, false);
+}
+
+cSkinClassicDisplayTracks::~cSkinClassicDisplayTracks()
+{
+  delete osd;
+}
+
+void cSkinClassicDisplayTracks::SetItem(const char *Text, int Index, bool Current)
+{
+  int y = y1 + Index * lineHeight;
+  tColor ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = Theme.Color(clrMenuItemCurrentFg);
+     ColorBg = Theme.Color(clrMenuItemCurrentBg);
+     currentIndex = Index;
+     }
+  else {
+     ColorFg = Theme.Color(clrMenuItemSelectable);
+     ColorBg = Theme.Color(clrBackground);
+     }
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(x0, y, Text, ColorFg, ColorBg, font, x1 - x0);
+}
+
+void cSkinClassicDisplayTracks::SetTrack(int Index, const char * const *Tracks)
+{
+  if (currentIndex >= 0)
+     SetItem(Tracks[currentIndex], currentIndex, false);
+  SetItem(Tracks[Index], Index, true);
+}
+
+void cSkinClassicDisplayTracks::Flush(void)
+{
+  osd->Flush();
+}
+
 // --- cSkinClassicDisplayMessage --------------------------------------------
 
 class cSkinClassicDisplayMessage : public cSkinDisplayMessage {
@@ -571,6 +650,12 @@ cSkinDisplayVolume *cSkinClassic::DisplayVolume(void)
   return new cSkinClassicDisplayVolume;
 }
 
+
+cSkinDisplayTracks *cSkinClassic::DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  return new cSkinClassicDisplayTracks(Title, NumTracks, Tracks);
+}
+
 cSkinDisplayMessage *cSkinClassic::DisplayMessage(void)
 {
   return new cSkinClassicDisplayMessage;
diff --git a/skinclassic.h b/skinclassic.h
index e990b5880..2ac69b1b4 100644
--- a/skinclassic.h
+++ b/skinclassic.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.h 1.1 2004/04/18 09:38:02 kls Exp $
+ * $Id: skinclassic.h 1.2 2005/01/02 14:38:56 kls Exp $
  */
 
 #ifndef __SKINCLASSIC_H
@@ -20,6 +20,7 @@ class cSkinClassic : public cSkin {
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayTracks *DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
   virtual cSkinDisplayMessage *DisplayMessage(void);
   };
 
diff --git a/skins.h b/skins.h
index 814780c17..ae2733c4a 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.3 2004/05/29 13:13:21 kls Exp $
+ * $Id: skins.h 1.6 2005/01/09 11:49:37 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -66,9 +66,6 @@ class cSkinDisplayChannel : public cSkinDisplay {
     Red    = Video options
     Green  = Info now
     Yellow = Info next
-    Blue   = Audio options
-  AudioOptions
-  VideoOptions
   */
   };
 
@@ -99,7 +96,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< Returns the offset of the given tab from the left border of the
        ///< item display area. The value returned is in pixel.//XXX ncurses???
   const char *GetTabbedText(const char *s, int Tab);
-       ///< Returns the that part of the given string, that follows the given
+       ///< Returns the part of the given string that follows the given
        ///< Tab (where 0 indicates the beginning of the string). If no such
        ///< part can be found, NULL will be returned.
 public:
@@ -223,6 +220,17 @@ class cSkinDisplayVolume : public cSkinDisplay {
        ///< indicator shall be displayed.
   };
 
+class cSkinDisplayTracks : public cSkinDisplay {
+       ///< This class implements the track display.
+public:
+  virtual void SetTrack(int Index, const char * const *Tracks) = 0;
+       ///< Sets the current track to the one given by Index, which
+       ///< points into the Tracks array of strings.
+  virtual void SetAudioChannel(int AudioChannel) = 0;
+       ///< Sets the audio channel indicator.
+       ///< 0=stereo, 1=left, 2=right, -1=don't display the audio channel indicator.
+  };
+
 class cSkinDisplayMessage : public cSkinDisplay {
        ///< This class implements a simple message display.
 public:
@@ -275,6 +283,12 @@ class cSkin : public cListObject {
   virtual cSkinDisplayVolume *DisplayVolume(void) = 0;
        ///< Creates and returns a new object for displaying the current volume.
        ///< The caller must delete the object after use.
+  virtual cSkinDisplayTracks *DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks) = 0;
+       ///< Creates and returns a new object for displaying the available tracks.
+       ///< NumTracks indicates how many entries in Tracks are available.
+       ///< Tracks will be valid throughout the entire lifetime of the returned
+       ///< cSkinDisplayTrack object.
+       ///< The caller must delete the object after use.
   virtual cSkinDisplayMessage *DisplayMessage(void) = 0;
        ///< Creates and returns a new object for displaying a message.
        ///< The caller must delete the object after use.
diff --git a/skinsttng.c b/skinsttng.c
index f80175f80..94a4b66ff 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.6 2004/07/18 11:32:42 kls Exp $
+ * $Id: skinsttng.c 1.12 2005/01/08 15:37:55 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -20,6 +20,9 @@
 #include "symbols/arrowdown.xpm"
 #include "symbols/arrowup.xpm"
 #include "symbols/audio.xpm"
+#include "symbols/audioleft.xpm"
+#include "symbols/audioright.xpm"
+#include "symbols/audiostereo.xpm"
 #include "symbols/dolbydigital.xpm"
 #include "symbols/encrypted.xpm"
 #include "symbols/ffwd.xpm"
@@ -233,14 +236,14 @@ void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
      x -= bmEncrypted.Width() + d;
      osd->DrawBitmap(x, y0 + (y1 - y0 - bmEncrypted.Height()) / 2, bmEncrypted, Theme.Color(Channel->Ca() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
      x -= bmDolbyDigital.Width() + d;
-     osd->DrawBitmap(x, y0 + (y1 - y0 - bmDolbyDigital.Height()) / 2, bmDolbyDigital, Theme.Color(Channel->Dpid1() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     osd->DrawBitmap(x, y0 + (y1 - y0 - bmDolbyDigital.Height()) / 2, bmDolbyDigital, Theme.Color(Channel->Dpid(0) ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
      x -= bmAudio.Width() + d;
-     osd->DrawBitmap(x, y0 + (y1 - y0 - bmAudio.Height()) / 2, bmAudio, Theme.Color(Channel->Apid2() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     osd->DrawBitmap(x, y0 + (y1 - y0 - bmAudio.Height()) / 2, bmAudio, Theme.Color(Channel->Apid(1) ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
      if (Channel->Vpid()) {
         x -= bmTeletext.Width() + d;
         osd->DrawBitmap(x, y0 + (y1 - y0 - bmTeletext.Height()) / 2, bmTeletext, Theme.Color(Channel->Tpid() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
         }
-     else if (Channel->Apid1()) {
+     else if (Channel->Apid(0)) {
         x -= bmRadio.Width() + d;
         osd->DrawBitmap(x, y0 + (y1 - y0 - bmRadio.Height()) / 2, bmRadio, Theme.Color(clrChannelSymbolOn), frameColor);
         }
@@ -265,6 +268,9 @@ void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fo
          osd->DrawText(x3 + 2, y3 + (2 * i + 1) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), x4 - x3 - 2);
          }
       }
+  cDevice *Device = cDevice::PrimaryDevice();
+  const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
+  osd->DrawText(x3 + 2, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontSml), x4 - x3 - 2);
 }
 
 void cSkinSTTNGDisplayChannel::SetMessage(eMessageType Type, const char *Text)
@@ -289,7 +295,7 @@ void cSkinSTTNGDisplayChannel::Flush(void)
 {
   if (withInfo) {
      if (!message) {
-        const char *date = DayDateTime();
+        cString date = DayDateTime();
         const cFont *font = cFont::GetFont(fontSml);
         osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
         }
@@ -456,7 +462,7 @@ void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
 
 void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
-  const char *date = DayDateTime();
+  cString date = DayDateTime();
   const cFont *font = cFont::GetFont(fontSml);
   int d = 10;
   int d2 = d / 2;
@@ -533,11 +539,11 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
   int y = y3;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString());
+  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
-     asprintf(&buffer, " VPS: %s", Event->GetVpsString());
+     asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
      const cFont *font = cFont::GetFont(fontSml);
      osd->DrawText(x4 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVps), frameColor, font);
      int yb = y + font->Height();
@@ -583,7 +589,7 @@ void cSkinSTTNGDisplayMenu::SetText(const char *Text, bool FixedFont)
 void cSkinSTTNGDisplayMenu::Flush(void)
 {
   if (!message) {
-     const char *date = DayDateTime();
+     cString date = DayDateTime();
      const cFont *font = cFont::GetFont(fontSml);
      osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrMenuDate), frameColor, font);
      }
@@ -822,6 +828,160 @@ void cSkinSTTNGDisplayVolume::Flush(void)
   osd->Flush();
 }
 
+// --- cSkinSTTNGDisplayTracks -----------------------------------------------
+
+class cSkinSTTNGDisplayTracks : public cSkinDisplayTracks {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1, y2, y3, y4, y5, y6, y7;
+  int lineHeight;
+  tColor frameColor;
+  int currentIndex;
+  static cBitmap bmAudioLeft, bmAudioRight, bmAudioStereo;
+  void SetItem(const char *Text, int Index, bool Current);
+public:
+  cSkinSTTNGDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
+  virtual ~cSkinSTTNGDisplayTracks();
+  virtual void SetTrack(int Index, const char * const *Tracks);
+  virtual void SetAudioChannel(int AudioChannel);
+  virtual void Flush(void);
+  };
+
+cBitmap cSkinSTTNGDisplayTracks::bmAudioLeft(audioleft_xpm);
+cBitmap cSkinSTTNGDisplayTracks::bmAudioRight(audioright_xpm);
+cBitmap cSkinSTTNGDisplayTracks::bmAudioStereo(audiostereo_xpm);
+
+cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  frameColor = Theme.Color(clrMenuFrame);
+  currentIndex = -1;
+  int ItemsWidth = font->Width(Title);
+  for (int i = 0; i < NumTracks; i++)
+      ItemsWidth = max(ItemsWidth, font->Width(Tracks[i]));
+  ItemsWidth += 10;
+  x0 = 0;
+  x1 = lineHeight / 2;
+  x3 = (x1 + Roundness + Gap + 7) & ~0x07; // must be multiple of 8
+  x2 = x3 - Gap;
+  x7 = Setup.OSDWidth;
+  x6 = x7 - lineHeight / 2;
+  x4 = (x6 - lineHeight / 2 - Gap) & ~0x07; // must be multiple of 8
+  x5 = x4 + Gap;
+  int d = x4 - x3;
+  if (d > ItemsWidth) {
+     d = (d - ItemsWidth) & ~0x07; // must be multiple of 8
+     x4 -= d;
+     x5 -= d;
+     x6 -= d;
+     x7 -= d;
+     }
+  y0 = 0;
+  y1 = lineHeight;
+  y2 = y1 + Roundness;
+  y3 = y2 + Gap;
+  // limit to Setup.OSDHeight? - what if height is too big???
+  y4 = y3 + NumTracks * lineHeight + 2 * Roundness;
+  y5 = y4 + Gap;
+  y6 = y5 + Roundness;
+  y7 = y6 + cFont::GetFont(fontSml)->Height();
+  int yt = (y0 + y1) / 2;
+  int yb = (y6 + y7) / 2;
+  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y7);
+  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
+                       { x0, y3, x3 - 1, y4 - 1, 1 },
+                       { x3, y3, x4 - 1, y4 - 1, 2 },
+                       { x4, y3, x7 - 1, y4 - 1, 2 },
+                       { x0, y4, x7 - 1, y7 - 1, 4 }
+                     };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
+  osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+  osd->DrawRectangle(x0, y6, x1 - 1, y7 - 1, clrTransparent);
+  osd->DrawRectangle(x6, y0, x7 - 1, yt - 1, clrTransparent);
+  osd->DrawRectangle(x6, yb, x7 - 1, y7 - 1, clrTransparent);
+  osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 2);
+  osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+  osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+  osd->DrawRectangle(x0, y1, x1 - 1, y6 - 1, frameColor);
+  osd->DrawEllipse  (x1, y1, x2 - 1, y2 - 1, frameColor, -2);
+  osd->DrawEllipse  (x1, y5, x2 - 1, y6 - 1, frameColor, -3);
+  osd->DrawEllipse  (x0, y6, x1 - 1, y7 - 1, frameColor, 3);
+  osd->DrawRectangle(x1, y6, x2 - 1, y7 - 1, frameColor);
+  osd->DrawRectangle(x3, y6, x4 - 1, y7 - 1, frameColor);
+  osd->DrawRectangle(x5, y6, x6 - 1, y7 - 1, frameColor);
+  osd->DrawEllipse  (x6, y6, x7 - 1, y7 - 1, frameColor, 5);
+  osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - x3 - 5);
+  for (int i = 0; i < NumTracks; i++)
+      SetItem(Tracks[i], i, false);
+}
+
+cSkinSTTNGDisplayTracks::~cSkinSTTNGDisplayTracks()
+{
+  delete osd;
+}
+
+void cSkinSTTNGDisplayTracks::SetItem(const char *Text, int Index, bool Current)
+{
+  int y = y3 + Roundness + Index * lineHeight;
+  tColor ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = Theme.Color(clrMenuItemCurrentFg);
+     ColorBg = Theme.Color(clrMenuItemCurrentBg);
+     osd->DrawEllipse  (x1, y - Roundness,  x2 - 1, y - 1, frameColor, -3);
+     osd->DrawRectangle(x1, y,              x2 - 1, y + lineHeight - 1, frameColor);
+     osd->DrawEllipse  (x1, y + lineHeight, x2 - 1, y + lineHeight + Roundness - 1, frameColor, -2);
+     osd->DrawRectangle(x3, y,              x4 - 1, y + lineHeight - 1, ColorBg);
+     currentIndex = Index;
+     }
+  else {
+     ColorFg = Theme.Color(clrMenuItemSelectable);
+     ColorBg = Theme.Color(clrBackground);
+     if (currentIndex == Index) {
+        osd->DrawRectangle(x1, y - Roundness,  x2 - 1, y + lineHeight + Roundness - 1, Theme.Color(clrBackground));
+        osd->DrawRectangle(x3, y,              x4 - 1, y + lineHeight - 1, Theme.Color(clrBackground));
+        }
+     }
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xt = x3 + 5;
+  osd->DrawText(xt, y, Text, ColorFg, ColorBg, font, x4 - xt);
+}
+
+void cSkinSTTNGDisplayTracks::SetTrack(int Index, const char * const *Tracks)
+{
+  if (currentIndex >= 0)
+     SetItem(Tracks[currentIndex], currentIndex, false);
+  SetItem(Tracks[Index], Index, true);
+}
+
+void cSkinSTTNGDisplayTracks::SetAudioChannel(int AudioChannel)
+{
+  cBitmap *bm = NULL;
+  switch (AudioChannel) {
+    case 0: bm = &bmAudioStereo; break;
+    case 1: bm = &bmAudioLeft;   break;
+    case 2: bm = &bmAudioRight;  break;
+    }
+  if (bm)
+     osd->DrawBitmap(x3 + 5, y6 + (y7 - y6 - bm->Height()) / 2, *bm, Theme.Color(clrChannelSymbolOn), frameColor);
+  else
+     osd->DrawRectangle(x3, y6, x4 - 1, y7 - 1, frameColor);
+}
+
+void cSkinSTTNGDisplayTracks::Flush(void)
+{
+  osd->Flush();
+}
+
 // --- cSkinSTTNGDisplayMessage ----------------------------------------------
 
 class cSkinSTTNGDisplayMessage : public cSkinDisplayMessage {
@@ -909,6 +1069,11 @@ cSkinDisplayVolume *cSkinSTTNG::DisplayVolume(void)
   return new cSkinSTTNGDisplayVolume;
 }
 
+cSkinDisplayTracks *cSkinSTTNG::DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  return new cSkinSTTNGDisplayTracks(Title, NumTracks, Tracks);
+}
+
 cSkinDisplayMessage *cSkinSTTNG::DisplayMessage(void)
 {
   return new cSkinSTTNGDisplayMessage;
diff --git a/skinsttng.h b/skinsttng.h
index 82b259954..11a964221 100644
--- a/skinsttng.h
+++ b/skinsttng.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.h 1.1 2004/04/18 09:38:47 kls Exp $
+ * $Id: skinsttng.h 1.2 2005/01/02 14:39:29 kls Exp $
  */
 
 #ifndef __SKINSTTNG_H
@@ -20,6 +20,7 @@ class cSkinSTTNG : public cSkin {
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayTracks *DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
   virtual cSkinDisplayMessage *DisplayMessage(void);
   };
 
diff --git a/sources.c b/sources.c
index a9c314881..2f08debda 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 1.2 2004/01/11 10:36:57 kls Exp $
+ * $Id: sources.c 1.3 2004/12/26 11:58:52 kls Exp $
  */
 
 #include "sources.h"
@@ -32,9 +32,9 @@ bool cSource::Parse(const char *s)
   return code != stNone && description && *description;
 }
 
-const char *cSource::ToString(int Code)
+cString cSource::ToString(int Code)
 {
-  static char buffer[16];
+  char buffer[16];
   char *q = buffer;
   switch (Code & st_Mask) {
     case stCable: *q++ = 'C'; break;
diff --git a/sources.h b/sources.h
index 3e9abc7fc..22076ea76 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 1.2 2004/01/11 10:35:36 kls Exp $
+ * $Id: sources.h 1.3 2004/12/26 11:59:21 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -32,7 +32,7 @@ class cSource : public cListObject {
   int Code(void) const { return code; }
   const char *Description(void) const { return description; }
   bool Parse(const char *s);
-  static const char *ToString(int Code);
+  static cString ToString(int Code);
   static int FromString(const char *s);
   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
   };
diff --git a/spu.h b/spu.h
index 053cf1a9d..9ab4da5be 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 1.2 2004/06/12 12:56:27 kls Exp $
+ * $Id: spu.h 1.3 2005/01/08 09:58:35 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
@@ -35,7 +35,7 @@ class cSpuDecoder {
     virtual void Hide(void) = 0;
     virtual void Draw(void) = 0;
     virtual bool IsVisible(void) = 0;
-    virtual void processSPU(uint32_t pts, uint8_t * buf) = 0;
+    virtual void processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow = true) = 0;
 };
 
 #endif                          // __SPU_VDR_H
diff --git a/status.c b/status.c
index 3dbe85432..5fd4f8ec4 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 1.5 2003/05/03 14:47:44 kls Exp $
+ * $Id: status.c 1.7 2005/01/09 11:51:04 kls Exp $
  */
 
 #include "status.h"
@@ -47,6 +47,18 @@ void cStatus::MsgSetVolume(int Volume, bool Absolute)
       sm->SetVolume(Volume, Absolute);
 }
 
+void cStatus::MsgSetAudioTrack(int Index, const char * const *Tracks)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->SetAudioTrack(Index, Tracks);
+}
+
+void cStatus::MsgSetAudioChannel(int AudioChannel)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->SetAudioChannel(AudioChannel);
+}
+
 void cStatus::MsgOsdClear(void)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
diff --git a/status.h b/status.h
index de0d9256a..58aec57eb 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.6 2003/05/03 14:43:18 kls Exp $
+ * $Id: status.h 1.8 2005/01/09 11:50:21 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -36,6 +36,12 @@ class cStatus : public cListObject {
   virtual void SetVolume(int Volume, bool Absolute) {}
                // The volume has been set to the given value, either
                // absolutely or relative to the current volume.
+  virtual void SetAudioTrack(int Index, const char * const *Tracks) {}
+               // The audio track has been set to the one given by Index, which
+               // points into the Tracks array of strings.
+  virtual void SetAudioChannel(int AudioChannel) {}
+               // The audio channel has been set to the given value.
+               // 0=stereo, 1=left, 2=right, -1=no information available.
   virtual void OsdClear(void) {}
                // The OSD has been cleared.
   virtual void OsdTitle(const char *Title) {}
@@ -67,6 +73,8 @@ class cStatus : public cListObject {
   static void MsgRecording(const cDevice *Device, const char *Name);
   static void MsgReplaying(const cControl *Control, const char *Name);
   static void MsgSetVolume(int Volume, bool Absolute);
+  static void MsgSetAudioTrack(int Index, const char * const *Tracks);
+  static void MsgSetAudioChannel(int AudioChannel);
   static void MsgOsdClear(void);
   static void MsgOsdTitle(const char *Title);
   static void MsgOsdStatusMessage(const char *Message);
diff --git a/svdrp.c b/svdrp.c
index eec6869c7..1981f6e8e 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.65 2004/10/31 10:09:53 kls Exp $
+ * $Id: svdrp.c 1.67 2004/12/26 12:23:55 kls Exp $
  */
 
 #include "svdrp.h"
@@ -555,8 +555,9 @@ void cSVDRP::CmdGRAB(const char *Option)
      char buf[strlen(Option) + 1];
      char *p = strcpy(buf, Option);
      const char *delim = " \t";
-     FileName = strtok(p, delim);
-     if ((p = strtok(NULL, delim)) != NULL) {
+     char *strtok_next;
+     FileName = strtok_r(p, delim, &strtok_next);
+     if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
         if (strcasecmp(p, "JPEG") == 0)
            Jpeg = true;
         else if (strcasecmp(p, "PNM") == 0)
@@ -566,7 +567,7 @@ void cSVDRP::CmdGRAB(const char *Option)
            return;
            }
         }
-     if ((p = strtok(NULL, delim)) != NULL) {
+     if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
         if (isnumber(p))
            Quality = atoi(p);
         else {
@@ -574,14 +575,14 @@ void cSVDRP::CmdGRAB(const char *Option)
            return;
            }
         }
-     if ((p = strtok(NULL, delim)) != NULL) {
+     if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
         if (isnumber(p))
            SizeX = atoi(p);
         else {
            Reply(501, "Illegal sizex \"%s\"", p);
            return;
            }
-        if ((p = strtok(NULL, delim)) != NULL) {
+        if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
            if (isnumber(p))
               SizeY = atoi(p);
            else {
@@ -594,7 +595,7 @@ void cSVDRP::CmdGRAB(const char *Option)
            return;
            }
         }
-     if ((p = strtok(NULL, delim)) != NULL) {
+     if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
         Reply(501, "Unexpected parameter \"%s\"", p);
         return;
         }
@@ -672,7 +673,7 @@ void cSVDRP::CmdLSTC(const char *Option)
      if (isnumber(Option)) {
         cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
         if (channel)
-           Reply(250, "%d %s", channel->Number(), channel->ToText());
+           Reply(250, "%d %s", channel->Number(), *channel->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
@@ -684,7 +685,7 @@ void cSVDRP::CmdLSTC(const char *Option)
               if (channel) {
                  if (strcasestr(channel->Name(), Option)) {
                     if (next)
-                       Reply(-250, "%d %s", next->Number(), next->ToText());
+                       Reply(-250, "%d %s", next->Number(), *next->ToText());
                     next = channel;
                     }
                  }
@@ -695,7 +696,7 @@ void cSVDRP::CmdLSTC(const char *Option)
               i = channel->Number() + 1;
               }
         if (next)
-           Reply(250, "%d %s", next->Number(), next->ToText());
+           Reply(250, "%d %s", next->Number(), *next->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
@@ -705,7 +706,7 @@ void cSVDRP::CmdLSTC(const char *Option)
      while (i <= Channels.MaxNumber()) {
            cChannel *channel = Channels.GetByNumber(i, 1);
            if (channel)
-              Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), channel->ToText());
+              Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), *channel->ToText());
            else
               Reply(501, "Channel \"%d\" not found", i);
            i = channel->Number() + 1;
@@ -727,7 +728,8 @@ void cSVDRP::CmdLSTE(const char *Option)
         char buf[strlen(Option) + 1];
         strcpy(buf, Option);
         const char *delim = " \t";
-        char *p = strtok(buf, delim);
+        char *strtok_next;
+        char *p = strtok_r(buf, delim, &strtok_next);
         while (p && DumpMode == dmAll) {
               if (strcasecmp(p, "NOW") == 0)
                  DumpMode = dmPresent;
@@ -735,7 +737,7 @@ void cSVDRP::CmdLSTE(const char *Option)
                  DumpMode = dmFollowing;
               else if (strcasecmp(p, "AT") == 0) {
                  DumpMode = dmAtTime;
-                 if ((p = strtok(NULL, delim)) != NULL) {
+                 if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
                     if (isnumber(p))
                        AtTime = strtol(p, NULL, 10);
                     else {
@@ -770,7 +772,7 @@ void cSVDRP::CmdLSTE(const char *Option)
                  Reply(501, "Unknown option: \"%s\"", p);
                  return;
                  }
-              p = strtok(NULL, delim);
+              p = strtok_r(NULL, delim, &strtok_next);
               }
         }
      FILE *f = fdopen(file, "w");
@@ -828,7 +830,7 @@ void cSVDRP::CmdLSTT(const char *Option)
      if (isnumber(Option)) {
         cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
         if (timer)
-           Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
         else
            Reply(501, "Timer \"%s\" not defined", Option);
         }
@@ -839,7 +841,7 @@ void cSVDRP::CmdLSTT(const char *Option)
      for (int i = 0; i < Timers.Count(); i++) {
          cTimer *timer = Timers.Get(i);
         if (timer)
-           Reply(i < Timers.Count() - 1 ? -250 : 250, "%d %s", timer->Index() + 1, timer->ToText());
+           Reply(i < Timers.Count() - 1 ? -250 : 250, "%d %s", timer->Index() + 1, *timer->ToText());
         else
            Reply(501, "Timer \"%d\" not found", i + 1);
          }
@@ -877,8 +879,8 @@ void cSVDRP::CmdMODC(const char *Option)
                  *channel = ch;
                  Channels.ReNumber();
                  Channels.SetModified(true);
-                 isyslog("modifed channel %d %s", channel->Number(), channel->ToText());
-                 Reply(250, "%d %s", channel->Number(), channel->ToText());
+                 isyslog("modifed channel %d %s", channel->Number(), *channel->ToText());
+                 Reply(250, "%d %s", channel->Number(), *channel->ToText());
                  }
               else
                  Reply(501, "Channel settings are not unique");
@@ -917,7 +919,7 @@ void cSVDRP::CmdMODT(const char *Option)
            *timer = t;
            Timers.SetModified();
            isyslog("timer %d modified (%s)", timer->Index() + 1, timer->HasFlags(tfActive) ? "active" : "inactive");
-           Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
            }
         else
            Reply(501, "Timer \"%d\" not defined", n);
@@ -952,8 +954,8 @@ void cSVDRP::CmdNEWC(const char *Option)
            Channels.Add(channel);
            Channels.ReNumber();
            Channels.SetModified(true);
-           isyslog("new channel %d %s", channel->Number(), channel->ToText());
-           Reply(250, "%d %s", channel->Number(), channel->ToText());
+           isyslog("new channel %d %s", channel->Number(), *channel->ToText());
+           Reply(250, "%d %s", channel->Number(), *channel->ToText());
            }
         else
            Reply(501, "Channel settings are not unique");
@@ -975,11 +977,11 @@ void cSVDRP::CmdNEWT(const char *Option)
            Timers.Add(timer);
            Timers.SetModified();
            isyslog("timer %d added", timer->Index() + 1);
-           Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
            return;
            }
         else
-           Reply(550, "Timer already defined: %d %s", t->Index() + 1, t->ToText());
+           Reply(550, "Timer already defined: %d %s", t->Index() + 1, *t->ToText());
         }
      else
         Reply(501, "Error in timer settings");
@@ -995,11 +997,8 @@ void cSVDRP::CmdNEXT(const char *Option)
   if (t) {
      time_t Start = t->StartTime();
      int Number = t->Index() + 1;
-     if (!*Option) {
-        char *s = ctime(&Start);
-        s[strlen(s) - 1] = 0; // strip trailing newline
-        Reply(250, "%d %s", Number, s);
-        }
+     if (!*Option)
+        Reply(250, "%d %s", Number, *TimeToString(Start));
      else if (strcasecmp(Option, "ABS") == 0)
         Reply(250, "%d %ld", Number, Start);
      else if (strcasecmp(Option, "REL") == 0)
@@ -1058,7 +1057,7 @@ void cSVDRP::CmdUPDT(const char *Option)
            isyslog("timer %d added", timer->Index() + 1);
            }
         Timers.SetModified();
-        Reply(250, "%d %s", timer->Index() + 1, timer->ToText());
+        Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
         return;
         }
      else
@@ -1152,7 +1151,7 @@ bool cSVDRP::Process(void)
         char buffer[BUFSIZ];
         gethostname(buffer, sizeof(buffer));
         time_t now = time(NULL);
-        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, ctime(&now));
+        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, *TimeToString(now));
         }
      if (NewConnection)
         lastActivity = time(NULL);
diff --git a/symbols/audioleft.xpm b/symbols/audioleft.xpm
new file mode 100644
index 000000000..3536c25a1
--- /dev/null
+++ b/symbols/audioleft.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * audioleft_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"...........................",
+"...........................",
+".....++++.........++++.....",
+"...++++++++.....++++++++...",
+"...++++++++.....++....++...",
+"..++++++++++...++......++..",
+"..++++++++++...++......++..",
+"..++++++++++...++......++..",
+"..++++++++++...++......++..",
+"...++++++++.....++....++...",
+"...++++++++.....++++++++...",
+".....++++.........++++.....",
+"...........................",
+"...........................",
+"...........................",
+"..........................."};
diff --git a/symbols/audioright.xpm b/symbols/audioright.xpm
new file mode 100644
index 000000000..fc03cd3d7
--- /dev/null
+++ b/symbols/audioright.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * audioright_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"...........................",
+"...........................",
+".....++++.........++++.....",
+"...++++++++.....++++++++...",
+"...++....++.....++++++++...",
+"..++......++...++++++++++..",
+"..++......++...++++++++++..",
+"..++......++...++++++++++..",
+"..++......++...++++++++++..",
+"...++....++.....++++++++...",
+"...++++++++.....++++++++...",
+".....++++.........++++.....",
+"...........................",
+"...........................",
+"...........................",
+"..........................."};
diff --git a/symbols/audiostereo.xpm b/symbols/audiostereo.xpm
new file mode 100644
index 000000000..fdd7b8456
--- /dev/null
+++ b/symbols/audiostereo.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * audiostereo_xpm[] = {
+"27 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"...........................",
+"...........................",
+"...........................",
+"...........................",
+".....++++.........++++.....",
+"...++++++++.....++++++++...",
+"...++++++++.....++++++++...",
+"..++++++++++...++++++++++..",
+"..++++++++++...++++++++++..",
+"..++++++++++...++++++++++..",
+"..++++++++++...++++++++++..",
+"...++++++++.....++++++++...",
+"...++++++++.....++++++++...",
+".....++++.........++++.....",
+"...........................",
+"...........................",
+"...........................",
+"..........................."};
diff --git a/themes.c b/themes.c
index 0a9b951d8..69af61ff0 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.3 2004/06/18 15:05:07 kls Exp $
+ * $Id: themes.c 1.5 2004/12/24 17:00:41 kls Exp $
  */
 
 #include "themes.h"
@@ -96,7 +96,8 @@ bool cTheme::Load(const char *FileName, bool OnlyDescriptions)
      result = true;
      char *s;
      const char *error = NULL;
-     while ((s = readline(f)) != NULL) {
+     cReadLine ReadLine;
+     while ((s = ReadLine.Read(f)) != NULL) {
            line++;
            char *p = strchr(s, '#');
            if (p)
@@ -242,29 +243,26 @@ bool cThemes::Load(const char *SkinName)
 {
   Clear();
   if (themesDirectory) {
-     DIR *d = opendir(themesDirectory);
-     if (d) {
-        struct dirent *e;
-        while ((e = readdir(d)) != NULL) {
-              if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-                 if (strstr(e->d_name, SkinName) == e->d_name && e->d_name[strlen(SkinName)] == '-') {
-                    const char *FileName = AddDirectory(themesDirectory, e->d_name);
-                    cTheme Theme;
-                    if (Theme.Load(FileName, true)) {
-                       names = (char **)realloc(names, (numThemes + 1) * sizeof(char *));
-                       names[numThemes] = strdup(Theme.Name());
-                       fileNames = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *));
-                       fileNames[numThemes] = strdup(FileName);
-                       descriptions = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *));
-                       descriptions[numThemes] = strdup(Theme.Description());
-                       numThemes++;
-                       }
+     cReadDir d(themesDirectory);
+     struct dirent *e;
+     while ((e = d.Next()) != NULL) {
+           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+              if (strstr(e->d_name, SkinName) == e->d_name && e->d_name[strlen(SkinName)] == '-') {
+                 cString FileName = AddDirectory(themesDirectory, e->d_name);
+                 cTheme Theme;
+                 if (Theme.Load(*FileName, true)) {
+                    names = (char **)realloc(names, (numThemes + 1) * sizeof(char *));
+                    names[numThemes] = strdup(Theme.Name());
+                    fileNames = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *));
+                    fileNames[numThemes] = strdup(*FileName);
+                    descriptions = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *));
+                    descriptions[numThemes] = strdup(Theme.Description());
+                    numThemes++;
                     }
                  }
               }
-        closedir(d);
-        return numThemes > 0;
-        }
+           }
+     return numThemes > 0;
      }
   return false;
 }
diff --git a/thread.c b/thread.c
index 7045e5ad4..fe3359bf2 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.37 2004/11/20 16:21:14 kls Exp $
+ * $Id: thread.c 1.40 2004/12/19 10:43:14 kls Exp $
  */
 
 #include "thread.h"
@@ -197,7 +197,8 @@ bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(const char *Description)
 {
-  parentTid = childTid = 0;
+  running = false;
+  childTid = 0;
   description = NULL;
   SetDescription(Description);
 }
@@ -221,33 +222,35 @@ void cThread::SetDescription(const char *Description, ...)
 
 void *cThread::StartThread(cThread *Thread)
 {
-  Thread->childTid = pthread_self();
   if (Thread->description)
-     dsyslog("%s thread started (pid=%d, tid=%ld)", Thread->description, getpid(), Thread->childTid);
+     dsyslog("%s thread started (pid=%d, tid=%ld)", Thread->description, getpid(), pthread_self());
   Thread->Action();
   if (Thread->description)
-     dsyslog("%s thread ended (pid=%d, tid=%ld)", Thread->description, getpid(), Thread->childTid);
-  Thread->childTid = 0;
+     dsyslog("%s thread ended (pid=%d, tid=%ld)", Thread->description, getpid(), pthread_self());
+  Thread->running = false;
   return NULL;
 }
 
 bool cThread::Start(void)
 {
-  Lock();
-  if (!childTid) {
-     parentTid = pthread_self();
-     pthread_t Tid;
-     pthread_create(&Tid, NULL, (void *(*) (void *))&StartThread, (void *)this);
-     pthread_detach(Tid); // auto-reap
-     pthread_setschedparam(Tid, SCHED_RR, 0);
+  if (!running) {
+     running = true;
+     if (pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this) == 0) {
+        pthread_detach(childTid); // auto-reap
+        pthread_setschedparam(childTid, SCHED_RR, 0);
+        }
+     else {
+        LOG_ERROR;
+        running = false;
+        return false;
+        }
      }
-  Unlock();
-  return true; //XXX return value of pthread_create()???
+  return true;
 }
 
 bool cThread::Active(void)
 {
-  if (childTid) {
+  if (running) {
      //
      // Single UNIX Spec v2 says:
      //
@@ -262,6 +265,7 @@ bool cThread::Active(void)
         if (err != ESRCH)
            LOG_ERROR;
         childTid = 0;
+        running = false;
         }
      else
         return true;
@@ -271,21 +275,18 @@ bool cThread::Active(void)
 
 void cThread::Cancel(int WaitSeconds)
 {
-  if (childTid) {
+  if (running) {
      if (WaitSeconds > 0) {
         for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
             if (!Active())
                return;
             cCondWait::SleepMs(10);
             }
-        esyslog("ERROR: thread %ld won't end (waited %d seconds) - cancelling it...", childTid, WaitSeconds);
-        }
-     Lock();
-     if (childTid) {
-        pthread_cancel(childTid);
-        childTid = 0;
+        esyslog("ERROR: thread %ld won't end (waited %d seconds) - canceling it...", childTid, WaitSeconds);
         }
-     Unlock();
+     pthread_cancel(childTid);
+     childTid = 0;
+     running = false;
      }
 }
 
diff --git a/thread.h b/thread.h
index 2cc623bf7..6e096a64a 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.24 2004/10/24 11:00:32 kls Exp $
+ * $Id: thread.h 1.26 2004/12/19 10:43:10 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -73,7 +73,8 @@ class cMutex {
 class cThread {
   friend class cThreadLock;
 private:
-  pthread_t parentTid, childTid;
+  bool running;
+  pthread_t childTid;
   cMutex mutex;
   char *description;
   static bool emergencyExitRequested;
diff --git a/timers.c b/timers.c
index 62f59d84c..96a2cc918 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.18 2004/11/21 13:15:33 kls Exp $
+ * $Id: timers.c 1.21 2004/12/26 12:35:33 kls Exp $
  */
 
 #include "timers.h"
@@ -19,8 +19,6 @@
 
 // -- cTimer -----------------------------------------------------------------
 
-char *cTimer::buffer = NULL;
-
 cTimer::cTimer(bool Instant, bool Pause)
 {
   startTime = stopTime = 0;
@@ -106,12 +104,12 @@ int cTimer::Compare(const cListObject &ListObject) const
   return r;
 }
 
-const char *cTimer::ToText(bool UseChannelID)
+cString cTimer::ToText(bool UseChannelID)
 {
-  free(buffer);
+  char *buffer;
   strreplace(file, ':', '|');
   strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? Channel()->GetChannelID().ToString() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
+  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
   return buffer;
@@ -162,10 +160,10 @@ int cTimer::ParseDay(const char *s, time_t *FirstDay)
   return d;
 }
 
-const char *cTimer::PrintDay(int d, time_t FirstDay)
+cString cTimer::PrintDay(int d, time_t FirstDay)
 {
 #define DAYBUFFERSIZE 32
-  static char buffer[DAYBUFFERSIZE];
+  char buffer[DAYBUFFERSIZE];
   if ((d & 0x80000000) != 0) {
      char *b = buffer;
      const char *w = tr("MTWTFSS");
@@ -186,12 +184,12 @@ const char *cTimer::PrintDay(int d, time_t FirstDay)
   return buffer;
 }
 
-const char *cTimer::PrintFirstDay(void)
+cString cTimer::PrintFirstDay(void)
 {
   if (firstday) {
-     const char *s = PrintDay(day, firstday);
+     cString s = PrintDay(day, firstday);
      if (strlen(s) == 18)
-        return s + 8;
+        return *s + 8;
      }
   return ""; // not NULL, so the caller can always use the result
 }
@@ -248,7 +246,7 @@ bool cTimer::Parse(const char *s)
 
 bool cTimer::Save(FILE *f)
 {
-  return fprintf(f, ToText(true)) > 0;
+  return fprintf(f, "%s", *ToText(true)) > 0;
 }
 
 bool cTimer::IsSingleEvent(void) const
@@ -272,7 +270,6 @@ int cTimer::GetWDay(time_t t)
 int cTimer::GetWDayFromMDay(int MDay)
 {
   time_t now =  time(NULL);
-  int md = GetMDay(now);
   for (int i = -1; i <= 28; i++) { // looking 4 weeks into the future should be enough
       time_t t0 = IncDay(now, i);
       if (GetMDay(t0) == MDay)
@@ -398,8 +395,8 @@ void cTimer::SetEvent(const cEvent *Event)
      if (Event) {
         char vpsbuf[64] = "";
         if (Event->Vps())
-           sprintf(vpsbuf, "(VPS: %s) ", Event->GetVpsString());
-        isyslog("timer %d (%d %04d-%04d '%s') set to event %s %s-%s %s'%s'", Index() + 1, Channel()->Number(), start, stop, file, Event->GetDateString(), Event->GetTimeString(), Event->GetEndTimeString(), vpsbuf, Event->Title());
+           sprintf(vpsbuf, "(VPS: %s) ", *Event->GetVpsString());
+        isyslog("timer %d (%d %04d-%04d '%s') set to event %s %s-%s %s'%s'", Index() + 1, Channel()->Number(), start, stop, file, *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString(), vpsbuf, Event->Title());
         }
      else
         isyslog("timer %d (%d %04d-%04d '%s') set to no event", Index() + 1, Channel()->Number(), start, stop, file);
diff --git a/timers.h b/timers.h
index eceb07807..7dcaf16a1 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.12 2004/11/21 12:37:33 kls Exp $
+ * $Id: timers.h 1.13 2004/12/26 12:21:29 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -27,7 +27,6 @@ class cTimer : public cListObject {
   friend class cMenuEditTimer;
 private:
   mutable time_t startTime, stopTime;
-  static char *buffer;
   bool recording, pending, inVpsMargin;
   int flags;
   cChannel *channel;
@@ -59,7 +58,7 @@ class cTimer : public cListObject {
   const char *File(void) { return file; }
   time_t FirstDay(void) { return firstday; }
   const char *Summary(void) { return summary; }
-  const char *ToText(bool UseChannelID = false);
+  cString ToText(bool UseChannelID = false);
   const cEvent *Event(void) { return event; }
   bool Parse(const char *s);
   bool Save(FILE *f);
@@ -85,10 +84,10 @@ class cTimer : public cListObject {
   bool HasFlags(int Flags) const;
   void Skip(void);
   void OnOff(void);
-  const char *PrintFirstDay(void);
+  cString PrintFirstDay(void);
   static int TimeToInt(int t);
   static int ParseDay(const char *s, time_t *FirstDay = NULL);
-  static const char *PrintDay(int d, time_t FirstDay = 0);
+  static cString PrintDay(int d, time_t FirstDay = 0);
   };
 
 class cTimers : public cConfig<cTimer> {
diff --git a/tools.c b/tools.c
index 41d0c7259..af2a73c3a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.82 2004/11/21 14:36:34 kls Exp $
+ * $Id: tools.c 1.87 2005/01/04 11:06:45 kls Exp $
  */
 
 #include "tools.h"
@@ -65,18 +65,6 @@ void writechar(int filedes, char c)
   safe_write(filedes, &c, sizeof(c));
 }
 
-char *readline(FILE *f)
-{
-  static char buffer[MAXPARSEBUFFER];
-  if (fgets(buffer, sizeof(buffer), f) > 0) {
-     int l = strlen(buffer) - 1;
-     if (l >= 0 && buffer[l] == '\n')
-        buffer[l] = 0;
-     return buffer;
-     }
-  return NULL;
-}
-
 char *strcpyrealloc(char *dest, const char *src)
 {
   if (src) {
@@ -167,15 +155,15 @@ char *compactspace(char *s)
   return s;
 }
 
-const char *strescape(const char *s, const char *chars)
+cString strescape(const char *s, const char *chars)
 {
-  static char *buffer = NULL;
+  char *buffer;
   const char *p = s;
   char *t = NULL;
   while (*p) {
         if (strchr(chars, *p)) {
            if (!t) {
-              buffer = (char *)realloc(buffer, 2 * strlen(s) + 1);
+              buffer = MALLOC(char, 2 * strlen(s) + 1);
               t = buffer + (p - s);
               s = strcpy(buffer, s);
               }
@@ -222,25 +210,6 @@ int numdigits(int n)
   return strlen(buf);
 }
 
-int time_ms(void)
-{
-  static time_t t0 = 0;
-  struct timeval t;
-  if (gettimeofday(&t, NULL) == 0) {
-     if (t0 == 0)
-        t0 = t.tv_sec; // this avoids an overflow (we only work with deltas)
-     return (t.tv_sec - t0) * 1000 + t.tv_usec / 1000;
-     }
-  return 0;
-}
-
-void delay_ms(int ms)
-{
-  int t0 = time_ms();
-  while (time_ms() - t0 < ms)
-        ;
-}
-
 bool isnumber(const char *s)
 {
   if (!*s)
@@ -253,18 +222,17 @@ bool isnumber(const char *s)
   return true;
 }
 
-const char *itoa(int n)
+cString AddDirectory(const char *DirName, const char *FileName)
 {
-  static char buf[16];
-  snprintf(buf, sizeof(buf), "%d", n);
+  char *buf;
+  asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
   return buf;
 }
 
-const char *AddDirectory(const char *DirName, const char *FileName)
+cString itoa(int n)
 {
-  static char *buf = NULL;
-  free(buf);
-  asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%d", n);
   return buf;
 }
 
@@ -336,10 +304,10 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
   struct stat st;
   if (stat(FileName, &st) == 0) {
      if (S_ISDIR(st.st_mode)) {
-        DIR *d = opendir(FileName);
-        if (d) {
+        cReadDir d(FileName);
+        if (d.Ok()) {
            struct dirent *e;
-           while ((e = readdir(d)) != NULL) {
+           while ((e = d.Next()) != NULL) {
                  if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
                     char *buffer;
                     asprintf(&buffer, "%s/%s", FileName, e->d_name);
@@ -367,7 +335,6 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                     free(buffer);
                     }
                  }
-           closedir(d);
            }
         else {
            LOG_ERROR_STR(FileName);
@@ -389,11 +356,11 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
 
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
 {
-  DIR *d = opendir(DirName);
-  if (d) {
+  cReadDir d(DirName);
+  if (d.Ok()) {
      bool empty = true;
      struct dirent *e;
-     while ((e = readdir(d)) != NULL) {
+     while ((e = d.Next()) != NULL) {
            if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..") && strcmp(e->d_name, "lost+found")) {
               char *buffer;
               asprintf(&buffer, "%s/%s", DirName, e->d_name);
@@ -414,7 +381,6 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
               free(buffer);
               }
            }
-     closedir(d);
      if (RemoveThis && empty) {
         dsyslog("removing %s", DirName);
         if (remove(DirName) < 0) {
@@ -451,7 +417,7 @@ char *ReadLink(const char *FileName)
 
 bool SpinUpDisk(const char *FileName)
 {
-  static char *buf = NULL;
+  char *buf = NULL;
   for (int n = 0; n < 10; n++) {
       free(buf);
       if (DirectoryOk(FileName))
@@ -471,12 +437,14 @@ bool SpinUpDisk(const char *FileName)
             double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0;
             if (seconds > 0.5)
                dsyslog("SpinUpDisk took %.2f seconds\n", seconds);
+            free(buf);
             return true;
             }
          else
             LOG_ERROR_STR(buf);
          }
       }
+  free(buf);
   esyslog("ERROR: SpinUpDisk failed");
   return false;
 }
@@ -489,37 +457,108 @@ time_t LastModifiedTime(const char *FileName)
   return 0;
 }
 
-const char *WeekDayName(int WeekDay)
+// --- cTimeMs ---------------------------------------------------------------
+
+cTimeMs::cTimeMs(void)
+{
+  Set();
+}
+
+uint64 cTimeMs::Now(void)
+{
+  struct timeval t;
+  if (gettimeofday(&t, NULL) == 0)
+     return (uint64(t.tv_sec)) * 1000 + t.tv_usec / 1000;
+  return 0;
+}
+
+void cTimeMs::Set(int Ms)
+{
+  begin = Now() + Ms;
+}
+
+bool cTimeMs::TimedOut(void)
+{
+  return Now() >= begin;
+}
+
+uint64 cTimeMs::Elapsed(void)
 {
-  static char buffer[4];
+  return Now() - begin;
+}
+
+// --- cString ---------------------------------------------------------------
+
+cString::cString(const char *S)
+{
+  s = S ? strdup(S) : NULL;
+}
+
+cString::~cString()
+{
+  free(s);
+}
+
+cString &cString::operator=(const cString &String)
+{
+  s = String.s ? strdup(String.s) : NULL;
+  return *this;
+}
+
+cString WeekDayName(int WeekDay)
+{
+  char buffer[4];
   WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with monday==0!
   if (0 <= WeekDay && WeekDay <= 6) {
      const char *day = tr("MonTueWedThuFriSatSun");
      day += WeekDay * 3;
-     strncpy(buffer, day, 3);
+     strn0cpy(buffer, day, sizeof(buffer));
      return buffer;
      }
   else
      return "???";
 }
 
-const char *WeekDayName(time_t t)
+cString WeekDayName(time_t t)
 {
   struct tm tm_r;
   return WeekDayName(localtime_r(&t, &tm_r)->tm_wday);
 }
 
-const char *DayDateTime(time_t t)
+cString DayDateTime(time_t t)
 {
-  static char buffer[32];
+  char buffer[32];
   if (t == 0)
      time(&t);
   struct tm tm_r;
   tm *tm = localtime_r(&t, &tm_r);
-  snprintf(buffer, sizeof(buffer), "%s %2d.%02d %02d:%02d", WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
+  snprintf(buffer, sizeof(buffer), "%s %2d.%02d %02d:%02d", *WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
   return buffer;
 }
 
+cString TimeToString(time_t t)
+{
+  char buffer[32];
+  if (ctime_r(&t, buffer)) {
+     buffer[strlen(buffer) - 1] = 0; // strip trailing newline
+     return buffer;
+     }
+  return "???";
+}
+
+// --- cReadLine -------------------------------------------------------------
+
+char *cReadLine::Read(FILE *f)
+{
+  if (fgets(buffer, sizeof(buffer), f) > 0) {
+     int l = strlen(buffer) - 1;
+     if (l >= 0 && buffer[l] == '\n')
+        buffer[l] = 0;
+     return buffer;
+     }
+  return NULL;
+}
+
 // --- cPoller ---------------------------------------------------------------
 
 cPoller::cPoller(int FileHandle, bool Out)
@@ -557,6 +596,24 @@ bool cPoller::Poll(int TimeoutMs)
   return false;
 }
 
+// --- cReadDir --------------------------------------------------------------
+
+cReadDir::cReadDir(const char *Directory)
+{
+  directory = opendir(Directory);
+}
+
+cReadDir::~cReadDir()
+{
+  if (directory)
+     closedir(directory);
+}
+
+struct dirent *cReadDir::Next(void)
+{
+  return directory && readdir_r(directory, &u.d, &result) == 0 ? result : NULL;
+}
+
 // --- cFile -----------------------------------------------------------------
 
 bool cFile::files[FD_SETSIZE] = { false };
diff --git a/tools.h b/tools.h
index 9e0abff46..621e589ba 100644
--- a/tools.h
+++ b/tools.h
@@ -4,15 +4,17 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.58 2004/10/31 16:16:37 kls Exp $
+ * $Id: tools.h 1.64 2005/01/04 11:09:51 kls Exp $
  */
 
 #ifndef __TOOLS_H
 #define __TOOLS_H
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
@@ -55,10 +57,20 @@ template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
 int BCD2INT(int x);
 
+class cString {
+private:
+  char *s;
+public:
+  cString(const char *S = NULL);
+  virtual ~cString();
+  operator const char * () const { return s; } // for use in (const char *) context
+  const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
+  cString &operator=(const cString &String);
+  };
+
 ssize_t safe_read(int filedes, void *buffer, size_t size);
 ssize_t safe_write(int filedes, const void *buffer, size_t size);
 void writechar(int filedes, char c);
-char *readline(FILE *f);
 char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
@@ -66,16 +78,14 @@ char *strreplace(char *s, const char *s1, const char *s2); ///< re-allocates 's'
 char *skipspace(const char *s);
 char *stripspace(char *s);
 char *compactspace(char *s);
-const char *strescape(const char *s, const char *chars); ///< \warning returns a statically allocated string!
+cString strescape(const char *s, const char *chars);
 bool startswith(const char *s, const char *p);
 bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
 int numdigits(int n);
-int time_ms(void);
-void delay_ms(int ms);
 bool isnumber(const char *s);
-const char *itoa(int n); ///< \warning returns a statically allocated string!
-const char *AddDirectory(const char *DirName, const char *FileName); ///< \warning returns a statically allocated string!
+cString itoa(int n);
+cString AddDirectory(const char *DirName, const char *FileName);
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
@@ -84,9 +94,28 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
 char *ReadLink(const char *FileName);
 bool SpinUpDisk(const char *FileName);
 time_t LastModifiedTime(const char *FileName);
-const char *WeekDayName(int WeekDay); ///< \warning returns a statically allocated string!
-const char *WeekDayName(time_t t); ///< \warning returns a statically allocated string!
-const char *DayDateTime(time_t t = 0); ///< \warning returns a statically allocated string!
+cString WeekDayName(int WeekDay);
+cString WeekDayName(time_t t);
+cString DayDateTime(time_t t = 0);
+cString TimeToString(time_t t);
+
+class cTimeMs {
+private:
+  uint64 begin;
+public:
+  cTimeMs(void);
+  static uint64 Now(void);
+  void Set(int Ms = 0);
+  bool TimedOut(void);
+  uint64 Elapsed(void);
+  };
+
+class cReadLine {
+private:
+  char buffer[MAXPARSEBUFFER];
+public:
+  char *Read(FILE *f);
+  };
 
 class cPoller {
 private:
@@ -99,6 +128,21 @@ class cPoller {
   bool Poll(int TimeoutMs = 0);
   };
   
+class cReadDir {
+private:
+  DIR *directory;
+  struct dirent *result;
+  union { // according to "The GNU C Library Reference Manual"
+    struct dirent d;
+    char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];
+    } u;
+public:
+  cReadDir(const char *Directory);
+  ~cReadDir();
+  bool Ok(void) { return directory != NULL; }
+  struct dirent *Next(void);
+  };
+
 class cFile {
 private:
   static bool files[];
diff --git a/transfer.c b/transfer.c
index d4ccee208..4a54da4fe 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.18 2004/10/23 13:35:08 kls Exp $
+ * $Id: transfer.c 1.22 2005/01/07 15:44:30 kls Exp $
  */
 
 #include "transfer.h"
@@ -20,8 +20,7 @@ cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
 {
   ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
   remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
-  canToggleAudioTrack = false;
-  audioTrack = 0xC0;
+  needsBufferReserve = VPid != 0 && DPid1 != 0;
   active = false;
 }
 
@@ -60,8 +59,36 @@ void cTransfer::Action(void)
   int PollTimeouts = 0;
   uchar *p = NULL;
   int Result = 0;
+#define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+  bool Cleared = false;
+  bool GotBufferReserve = false;
+#endif
   active = true;
   while (active) {
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+        if (needsBufferReserve) {
+           if (IsAttached() && !Cleared) {
+              PlayPes(NULL, 0);
+              Cleared = true;
+              }
+           //XXX For dolby we've to fill the buffer because the firmware does
+           //XXX not decode dolby but use a PCM stream for transport, therefore
+           //XXX the firmware has not enough buffer for noiseless skipping early
+           //XXX PCM samples (each dolby frame requires 6144 bytes in PCM and
+           //XXX audio is mostly to early in comparison to video).
+           //XXX To resolve this, the remuxer or PlayPes() should synchronize
+           //XXX audio with the video frames. 2004/09/09 Werner
+           if (!GotBufferReserve) {
+              if (ringBuffer->Available() < 3 * MAXFRAMESIZE / 2) {
+                 cCondWait::SleepMs(20); // allow the buffer to collect some reserve
+                 continue;
+                 }
+              else
+                 GotBufferReserve = true;
+              }
+           }
+#endif
         int Count;
         uchar *b = ringBuffer->Get(Count);
         if (b) {
@@ -80,13 +107,13 @@ void cTransfer::Action(void)
            if (Count)
               ringBuffer->Del(Count);
            }
-        if (!p && (p = remux->Get(Result)) != NULL)
-           StripAudioPackets(p, Result, audioTrack);
+        if (!p)
+           p = remux->Get(Result);
         if (p) {
            cPoller Poller;
            if (DevicePoll(Poller, 100)) {
               PollTimeouts = 0;
-              int w = PlayVideo(p, Result);
+              int w = PlayPes(p, Result);
               if (w > 0) {
                  p += w;
                  Result -= w;
@@ -112,64 +139,6 @@ void cTransfer::Action(void)
   active = false;
 }
 
-void cTransfer::StripAudioPackets(uchar *b, int Length, uchar Except)
-{
-  for (int i = 0; i < Length - 6; i++) {
-      if (b[i] == 0x00 && b[i + 1] == 0x00 && b[i + 2] == 0x01) {
-         uchar c = b[i + 3];
-         int l = b[i + 4] * 256 + b[i + 5] + 6;
-         switch (c) {
-           case 0xBD: // dolby
-                if (Except)
-                   PlayAudio(&b[i], l);
-                // continue with deleting the data - otherwise it disturbs DVB replay
-           case 0xC0 ... 0xC1: // audio
-                if (c == 0xC1)
-                   canToggleAudioTrack = true;
-                if (!Except || c != Except)
-                   memset(&b[i], 0x00, min(l, Length-i));
-                break;
-           case 0xE0 ... 0xEF: // video
-                break;
-           default:
-                //esyslog("ERROR: unexpected packet id %02X", c);
-                l = 0;
-           }
-         if (l)
-            i += l - 1; // the loop increments, too!
-         }
-      /*XXX
-      else
-         esyslog("ERROR: broken packet header");
-         XXX*/
-      }
-}
-
-int cTransfer::NumAudioTracks(void) const
-{
-  return canToggleAudioTrack ? 2 : 1;
-}
-
-const char **cTransfer::GetAudioTracks(int *CurrentTrack) const
-{
-  if (NumAudioTracks()) {
-     if (CurrentTrack)
-        *CurrentTrack = (audioTrack == 0xC0) ? 0 : 1;
-     static const char *audioTracks1[] = { "Audio 1", NULL };
-     static const char *audioTracks2[] = { "Audio 1", "Audio 2", NULL };
-     return NumAudioTracks() > 1 ? audioTracks2 : audioTracks1;
-     }
-  return NULL;
-}
-
-void cTransfer::SetAudioTrack(int Index)
-{
-  if ((audioTrack == 0xC0) != (Index == 0)) {
-     audioTrack = (Index == 1) ? 0xC1 : 0xC0;
-     DeviceClear();
-     }
-}
-
 // --- cTransferControl ------------------------------------------------------
 
 cDevice *cTransferControl::receiverDevice = NULL;
diff --git a/transfer.h b/transfer.h
index f33cb27b9..bbe53a5b2 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.5 2004/10/15 12:39:54 kls Exp $
+ * $Id: transfer.h 1.8 2005/01/07 15:44:32 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -20,10 +20,8 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
 private:
   cRingBufferLinear *ringBuffer;
   cRemux *remux;
-  bool canToggleAudioTrack;
-  uchar audioTrack;
+  bool needsBufferReserve;
   bool active;
-  void StripAudioPackets(uchar *b, int Length, uchar Except = 0x00);
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
@@ -31,9 +29,6 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
 public:
   cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2);
   virtual ~cTransfer();
-  virtual int NumAudioTracks(void) const;
-  virtual const char **GetAudioTracks(int *CurrentTrack = NULL) const;
-  virtual void SetAudioTrack(int Index);
   };
 
 class cTransferControl : public cControl {
diff --git a/vdr.1 b/vdr.1
index 106b1d3fe..a67839696 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2003 Klaus Schmidinger
+.\" Copyright (C) 2004 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.11 2004/06/13 14:48:03 kls Exp $
+.\" $Id: vdr.1 1.13 2004/12/19 09:36:25 kls Exp $
 .\"
-.TH vdr 1 "1 June 2003" "1.2.0" "Video Disk Recorder"
+.TH vdr 1 "19 Dec 2004" "1.3.18" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -18,7 +18,7 @@ vdr - the Video Disk Recorder
 [options]
 .SH DESCRIPTION
 .B vdr
-implements a complete digital Set-Top-Box and Video Recorder.
+implements a complete digital Set-Top Box and Video Recorder.
 It can work with signals received from satellites (DVB-S) as
 well as cable (DVB-C) and terrestrial (DVB-T) signals.
 
@@ -38,31 +38,31 @@ Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP),
 which can be accessed on port 2001, for instance by \fBtelnet\fR.
 .SH OPTIONS
 .TP
-.BI -a\  cmd ,\ --audio= cmd
+.BI \-a\  cmd ,\ \-\-audio= cmd
 Send Dolby Digital audio to stdin of command \fIcmd\fR.
 .TP
-.BI -c\  dir ,\ --config= dir
+.BI \-c\  dir ,\ \-\-config= dir
 Read config files from directory \fIdir\fR
 (default is to read them from the video directory).
 .TP
-.B -d, --daemon
+.B \-d, \-\-daemon
 Run in daemon mode.
 .TP
-.BI -D\  num ,\ --device= num
+.BI \-D\  num ,\ \-\-device= num
 Use only the given DVB device (\fInum\fR = 0, 1, 2...).
-There may be several \fB-D\fR options (by default all DVB devices will be used).
+There may be several \fB\-D\fR options (by default all DVB devices will be used).
 .TP
-.BI -E\  file ,\ --epgfile= file
+.BI \-E\  file ,\ \-\-epgfile= file
 Write the EPG data into the given \fIfile\fR
 (default is \fI/video/epg.data\fR).
-Use \fB-E-\fR to disable this.
+Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
 .TP
-.B -h, --help
+.B \-h, \-\-help
 Print a help message and exit.
 .TP
-.BI -l\  level ,\ --log= level
+.BI \-l\  level ,\ \-\-log= level
 Set logging to \fIlevel\fR.
 \fB0\fR\ =\ no logging, \fB1\fR\ =\ errors only,
 \fB2\fR\ =\ errors and info, \fB3\fR\ =\ errors, info and debug.
@@ -70,54 +70,54 @@ The default logging level is \fB3\fR.
 If logging should be done to LOG_LOCALn instead of
 LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
 .TP
-.BI -L\  dir ,\ --lib= dir
+.BI \-L\  dir ,\ \-\-lib= dir
 Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
-There can be several \fB-L\fR options with different \fIdir\fR values.
-Each of them will apply to the \fB-P\fR options following it.
+There can be several \fB\-L\fR options with different \fIdir\fR values.
+Each of them will apply to the \fB\-P\fR options following it.
 .TP
-.B -m, --mute
+.B \-m, \-\-mute
 Mute audio of the primary DVB device at startup.
 .TP
-.BI -p\  port ,\ --port= port
+.BI \-p\  port ,\ \-\-port= port
 Use \fIport\fR for SVDRP. A value of \fB0\fR turns off SVDRP.
 The default SVDRP port is \fB2001\fR.
 You need to edit the file \fIsvdrphosts.conf\fR in order to enable
 access to the SVDRP port.
 .TP
-.BI -P\  options ,\ --plugin= options
+.BI \-P\  options ,\ \-\-plugin= options
 Load a plugin, defined by the given \fIoptions\fR.
 The first word in \fIoptions\fR must be the name of an existing \fBvdr\fR
 plugin, optionally followed by a blank separated list of command line options
 for that plugin. If \fIoptions\fR contains any blanks, you need to enclose it
 in quotes, like for example
 
-\fBvdr -P "abc -a -b xyz"\fR
+\fBvdr \-P "abc \-a \-b xyz"\fR
 
 which would load a plugin named \fBabc\fR, giving it the command line options
-\fB-a\ -b\ xyz\fR. If you want to load all available plugins (without any
+\fB\-a\ \-b\ xyz\fR. If you want to load all available plugins (without any
 particular options) you can use
 
-\fBvdr -P "*"\fR
+\fBvdr \-P "*"\fR
 
 (note the quotes around the asterisk to prevent wildcard expansion).
 .TP
-.BI -r\  cmd ,\ --record= cmd
+.BI \-r\  cmd ,\ \-\-record= cmd
 Call \fIcmd\fR before and after a recording.
 .TP
-.BI -s\  cmd ,\ --shutdown= cmd
+.BI \-s\  cmd ,\ \-\-shutdown= cmd
 Call \fIcmd\fR to shutdown the computer.
 .TP
-.BI -t\  tty ,\ --terminal= tty
+.BI \-t\  tty ,\ \-\-terminal= tty
 Set the controlling terminal.
 .TP
-.BI -v\  dir ,\ --video= dir
+.BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
 The default is \fI/video\fR.
 .TP
-.B -V, --version
+.B \-V, \-\-version
 Print version information and exit.
 .TP
-.BI -w\  sec ,\ --watchdog= sec
+.BI \-w\  sec ,\ \-\-watchdog= sec
 Activate the watchdog timer with a timeout of \fIsec\fR seconds.
 A value of \fB0\fR (default) disables the watchdog.
 .SH EXIT STATUS
@@ -127,7 +127,7 @@ Successful program execution.
 .TP
 .B 1
 An error has been detected which requires the DVB driver and \fBvdr\fR
-to be re-loaded.
+to be reloaded.
 .TP
 .B 2
 An non-recoverable error has been detected, \fBvdr\fR has given up.
@@ -186,9 +186,9 @@ be used to trigger an update of the list of recordings in the "Recordings" menu.
 Written by Klaus Schmidinger, with contributions from many others.
 See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
-Report bugs to <vdr-bugs@cadsoft.de>.
+Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2003 Klaus Schmidinger.
+Copyright \(co 2004 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index 311094ffb..44ea3e68b 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.29 2004/10/31 12:13:43 kls Exp $
+.\" $Id: vdr.5 1.32 2005/01/09 13:16:40 kls Exp $
 .\"
-.TH vdr 5 "31 Oct 2004" "1.3.15" "Video Disk Recorder Files"
+.TH vdr 5 "19 Dec 2004" "1.3.18" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -89,7 +89,9 @@ l l.
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
+\fBL\fR@Left circular polarization
 \fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
+\fBR\fR@Right circular polarization
 \fBT\fR@Transmission mode (2, 8)
 \fBV\fR@Vertical polarization
 \fBY\fR@Hierarchy (0, 1, 2, 4)
@@ -174,12 +176,12 @@ NID, TID and SID are all equal).
 A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
 which is a string that looks like this:
 
-\fBS19.2E-1-1089-12003-0\fR
+\fBS19.2E\-1\-1089\-12003\-0\fR
 
 The components of this string are the \fBSource\fR (S19.2E), \fBNID\fR
 (1), \fBTID\fR (1089), \fBSID\fR (12003) and \fBRID\fR (0) as defined above.
 The last part can be omitted if it is \fB0\fR,
-so the above example could also be written as S19.2E-1-1089-12003).
+so the above example could also be written as S19.2E\-1\-1089\-12003).
 .br
 The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
 files to properly identify the channels.
@@ -195,7 +197,7 @@ The file \fItimers.conf\fR contains the timer setup.
 Each line contains one timer definition, with individual fields
 separated by ':' characters. Example:
 
-\fB1:10:-T-----:2058:2150:50:5:Quarks & Co:\fR
+\fB1:10:\-T\-\-\-\-\-:2058:2150:50:5:Quarks & Co:\fR
 
 The fields in a timer definition have the following meaning (from left
 to right):
@@ -234,21 +236,21 @@ timer shall record. This must be in the range \fB1...31\fR.
 
 In case of a `repeating' timer this is a string consisting of exactly seven
 characters, where each character position corresponds to one day of the week
-(with Monday being the first day). The character '-' at a certain position
+(with Monday being the first day). The character '\-' at a certain position
 means that the timer shall not record on that day. Any other character will
 cause the timer to record on that day. Example:
 
-.B MTWTF--
+.B MTWTF\-\-
 
 will define a timer that records on Monday thru Friday and does not record
-on weekends. The same result could be achieved with \fBABCDE--\fR (this is
+on weekends. The same result could be achieved with \fBABCDE\-\-\fR (this is
 used to allow setting the days with language specific characters).
 
 The day definition of a `repeating' timer may be followed by the date when that
-timer shall hit for the first time. The format for this is \fB@YYYY-MM-DD\fR,
+timer shall hit for the first time. The format for this is \fB@YYYY\-MM\-DD\fR,
 so a complete definition could look like this:
 
-\fBMTWTF--@2002-02-18\fR
+\fBMTWTF\-\-@2002\-02\-18\fR
 
 which would implement a timer that records Moday thru Friday, and will hit
 for the first time on or after February 18, 2002.
@@ -416,7 +418,7 @@ and can be one of \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR or
 keys, which will be executed just as if they had been pressed in the given
 sequence. The optional \fB@plugin\fR can be used to automatically select
 the given plugin from the main menu (provided that plugin has a main menu
-entry). \fBplugin\fR is the name of the plugin, exactly as given in the -P
+entry). \fBplugin\fR is the name of the plugin, exactly as given in the \-P
 option when starting VDR. There can be only one \fB@plugin\fR per key macro,
 and it implicitly adds an \fIOk\fR key to the macro definition (in order to
 actually select the plugins main menu entry), which counts against the total
@@ -465,12 +467,12 @@ Check for new mail?: /usr/local/bin/checkmail 2>&1
 .br
 CPU status: /usr/local/bin/cpustatus 2>&1
 .br
-Disk space: df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+Disk space: df \-h | grep '/video' | awk '{ print 100 \- $5 "% free"; }'
 .br
 Calendar: date;echo;cal
 
 Note that the commands 'checkmail' and 'cpustatus' are only \fBexamples\fR!
-Don't send emails to the author asking where to find these ;-)
+Don't send emails to the author asking where to find these ;\-)
 .br
 The '?' at the end of the "Check for new mail?" entry will prompt the user
 whether this command shall really be executed.
@@ -511,7 +513,7 @@ The file \fIsetup.conf\fR contains the basic configuration options for \fBvdr\fR
 Each line contains one option in the format "Name = Value".
 See the MANUAL file for a description of the available options.
 .SS THEMES
-The files \fIthemes/<skin>-<theme>.theme\fR in the config directory contain the
+The files \fIthemes/<skin>\-<theme>.theme\fR in the config directory contain the
 color theme definitions for the various skins. In the actual file names \fI<skin>\fR
 will be replaced by the name if the skin this theme belongs to, and \fI<theme>\fR
 will be the name of this theme.
@@ -545,7 +547,7 @@ you can provide language specific descriptions as
 
 \fBDescription.eng = Shades of blue\fR
 .br
-\fBDescription.ger = Blaut�ne\fR
+\fBDescription.ger = Blaut\(:one\fR
 
 where the language code (as defined in VDR/i18n.c) is added to the keyword
 "Description", separated by a dot. You can enter as many language specific
@@ -613,6 +615,7 @@ l l.
 \fBT\fR@<title>
 \fBS\fR@<short text>
 \fBD\fR@<description>
+\fBX\fR@<stream> <type> <language> <descr>
 \fBV\fR@<vps time>
 \fBe\fR@
 \fBc\fR@
@@ -622,8 +625,10 @@ Lowercase characters mark the end of a sequence that was started by the
 corresponding uppercase character. The outer frame consists of a sequence
 of one or more \fBC\fR...\fBc\fR (Channel) entries. Inside these any number of
 \fBE\fR...\fBe\fR (Event) entries are allowed.
-The \fBT\fR, \fBS\fR and \fBD\fR entries are optional (although every event
+All other tags are optional (although every event
 should at least have a \fBT\fR entry).
+There may be several \fBX\fR tags, depending on the number of tracks (video, audio etc.)
+the event provides.
 
 .TS
 tab (@);
@@ -636,6 +641,10 @@ l l.
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
+<stream>       @is the stream content (1 = video, 2 = audio)
+<type>         @is the stream type according to ETSI EN 300 468
+<language>     @is the three letter language code
+<descr>        @is the description of this stream component
 <vps time>     @is the Video Programming Service time of this event
 .TE
 
@@ -646,9 +655,9 @@ previous EPG scans.
 .SH AUTHOR
 Written by Klaus Schmidinger.
 .SH REPORTING BUGS
-Report bugs to <vdr-bugs@cadsoft.de>.
+Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2003 Klaus Schmidinger.
+Copyright \(co 2004 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index c82f2b44c..5c8237241 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.193 2004/11/06 10:30:30 kls Exp $
+ * $Id: vdr.c 1.198 2005/01/06 14:36:40 kls Exp $
  */
 
 #include <getopt.h>
@@ -405,13 +405,16 @@ int main(int argc, char *argv[])
   // EPG data:
 
   if (EpgDataFileName) {
-     if (DirectoryOk(EpgDataFileName))
-        EpgDataFileName = AddDirectory(EpgDataFileName, DEFAULTEPGDATAFILENAME);
+     const char *EpgDirectory = NULL;
+     if (DirectoryOk(EpgDataFileName)) {
+        EpgDirectory = EpgDataFileName;
+        EpgDataFileName = DEFAULTEPGDATAFILENAME;
+        }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
-        EpgDataFileName = AddDirectory(VideoDirectory, EpgDataFileName);
+        EpgDirectory = VideoDirectory;
+     cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     cSchedules::Read();
      }
-  cSchedules::SetEpgDataFileName(EpgDataFileName);
-  cSchedules::Read();
 
   // DVB interfaces:
 
@@ -532,7 +535,7 @@ int main(int argc, char *argv[])
            static time_t lastTime = 0;
            if (time(NULL) - lastTime > MINCHANNELWAIT) {
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
-              if (Channel && (Channel->Vpid() || Channel->Apid1())) {
+              if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
                  if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
                      && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
                      && !cDevice::SwitchChannel(1) // ...or the next higher available one...
@@ -675,7 +678,7 @@ int main(int argc, char *argv[])
           case kChanDn:
                cDevice::SwitchChannel(NORMALKEY(key) == kChanUp ? 1 : -1);
                break;
-          // Volume Control:
+          // Volume control:
           case kVolUp|k_Repeat:
           case kVolUp:
           case kVolDn|k_Repeat:
@@ -694,6 +697,20 @@ int main(int argc, char *argv[])
                cDisplayVolume::Process(key);
                key = kNone; // nobody else needs to see these keys
                break;
+          // Audio track control:
+          case kAudio:
+               if (cControl::Control())
+                  cControl::Control()->Hide();
+               if (Temp && !cDisplayTracks::IsOpen()) {
+                  DELETENULL(Menu);
+                  Temp = NULL;
+                  }
+               if (!Menu && !cOsd::IsOpen())
+                  Menu = Temp = cDisplayTracks::Create();
+               else
+                  cDisplayTracks::Process(key);
+               key = kNone;
+               break;
           // Pausing live video:
           case kPause:
                if (!cControl::Control()) {
@@ -867,7 +884,7 @@ int main(int argc, char *argv[])
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
                     if (timer)
-                       dsyslog("next timer event at %s", ctime(&Next));
+                       dsyslog("next timer event at %s", *TimeToString(Next));
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
@@ -875,7 +892,7 @@ int main(int argc, char *argv[])
                        const char *File = timer ? timer->File() : "";
                        Delta = Next - time(NULL); // compensates for Confirm() timeout
                        char *cmd;
-                       asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, strescape(File, "\"$"), UserShutdown);
+                       asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, *strescape(File, "\"$"), UserShutdown);
                        isyslog("executing '%s'", cmd);
                        SystemExec(cmd);
                        free(cmd);
diff --git a/videodir.c b/videodir.c
index 94e7141ae..f0e54fe72 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.10 2003/08/02 13:43:28 kls Exp $
+ * $Id: videodir.c 1.11 2004/12/26 11:52:12 kls Exp $
  */
 
 #include "videodir.h"
@@ -197,27 +197,23 @@ int VideoDiskSpace(int *FreeMB, int *UsedMB)
   return (free + used) ? used * 100 / (free + used) : 0;
 }
 
-const char *PrefixVideoFileName(const char *FileName, char Prefix)
+cString PrefixVideoFileName(const char *FileName, char Prefix)
 {
-  static char *PrefixedName = NULL;
-
-  if (!PrefixedName || strlen(PrefixedName) <= strlen(FileName))
-     PrefixedName = (char *)realloc(PrefixedName, strlen(FileName) + 2);
-  if (PrefixedName) {
-     const char *p = FileName + strlen(FileName); // p points at the terminating 0
-     int n = 2;
-     while (p-- > FileName && n > 0) {
-           if (*p == '/') {
-              if (--n == 0) {
-                 int l = p - FileName + 1;
-                 strncpy(PrefixedName, FileName, l);
-                 PrefixedName[l] = Prefix;
-                 strcpy(PrefixedName + l + 1, p + 1);
-                 return PrefixedName;
-                 }
+  char PrefixedName[strlen(FileName) + 2];
+
+  const char *p = FileName + strlen(FileName); // p points at the terminating 0
+  int n = 2;
+  while (p-- > FileName && n > 0) {
+        if (*p == '/') {
+           if (--n == 0) {
+              int l = p - FileName + 1;
+              strncpy(PrefixedName, FileName, l);
+              PrefixedName[l] = Prefix;
+              strcpy(PrefixedName + l + 1, p + 1);
+              return PrefixedName;
               }
            }
-     }
+        }
   return NULL;
 }
 
diff --git a/videodir.h b/videodir.h
index a719c5e04..b9e38cb45 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.4 2002/01/27 12:37:20 kls Exp $
+ * $Id: videodir.h 1.5 2004/12/26 11:52:56 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
 #define __VIDEODIR_H
 
 #include <stdlib.h>
+#include "tools.h"
 
 extern const char *VideoDirectory;
 
@@ -20,7 +21,7 @@ bool RenameVideoFile(const char *OldName, const char *NewName);
 bool RemoveVideoFile(const char *FileName);
 bool VideoFileSpaceAvailable(int SizeMB);
 int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
-const char *PrefixVideoFileName(const char *FileName, char Prefix);
+cString PrefixVideoFileName(const char *FileName, char Prefix);
 void RemoveEmptyVideoDirectories(void);
 
 #endif //__VIDEODIR_H

From e36fe18c483b8e520752f61975e44ddd0317a332 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Jan 2005 18:00:00 +0100
Subject: [PATCH 111/307] =?UTF-8?q?Version=201.3.19=20-=20Making=20sure=20?=
 =?UTF-8?q?at=20least=20the=20default=20skin=20is=20available=20at=20progr?=
 =?UTF-8?q?am=20start=20in=20case=20a=20=20=20plugin=20needs=20to=20issue?=
 =?UTF-8?q?=20an=20error=20message=20(thanks=20to=20Achim=20Tuffentshammer?=
 =?UTF-8?q?=20for=20=20=20reporting=20a=20crash=20in=20such=20a=20case).?=
 =?UTF-8?q?=20Also=20checking=20if=20there=20is=20a=20current=20skin=20=20?=
 =?UTF-8?q?=20in=20cSkins::Message().=20-=20Completed=20the=20Finnish=20OS?=
 =?UTF-8?q?D=20texts=20and=20fixed=20internationalization=20of=20the=20tex?=
 =?UTF-8?q?t=20=20=20for=20"Setup/DVB/Audio=20language(s)"=20(thanks=20to?=
 =?UTF-8?q?=20Rolf=20Ahrenberg).=20-=20Completed=20the=20Estonian=20OSD=20?=
 =?UTF-8?q?texts=20and=20switched=20to=20iso8859-13=20character=20set=20?=
 =?UTF-8?q?=20=20(thanks=20to=20Arthur=20Konovalov).=20-=20Made=20cCondWai?=
 =?UTF-8?q?t::SleepMs()=20sleep=20at=20least=203ms=20to=20avoid=20a=20poss?=
 =?UTF-8?q?ible=20busy=20wait.=20-=20Fixed=20canceling=20the=20LIRC=20thre?=
 =?UTF-8?q?ad=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler=20for=20pointin?=
 =?UTF-8?q?g=20out=20=20=20this=20one).=20-=20The=20"Green"=20button=20in?=
 =?UTF-8?q?=20the=20"Main"=20menu=20is=20now=20always=20"Audio",=20since?=
 =?UTF-8?q?=20the=20audio=20=20=20channel=20might=20be=20changed=20even=20?=
 =?UTF-8?q?if=20there=20is=20only=20one=20actual=20audio=20PID.=20-=20Fixe?=
 =?UTF-8?q?d=20handling=20the=20'-E'=20option=20which=20was=20broken=20in?=
 =?UTF-8?q?=20version=201.3.18=20(thanks=20to=20=20=20Christian=20Jacobsen?=
 =?UTF-8?q?=20for=20reporting=20this=20one).=20-=20Added=20'channels.conf.?=
 =?UTF-8?q?terr'=20entries=20for=20Mainz=20(thanks=20to=20Michael=20Heyse)?=
 =?UTF-8?q?.=20-=20Implemented=20cDolbyRepacker=20for=20better=20handling?=
 =?UTF-8?q?=20of=20Dolby=20Digital=20PES=20packets=20=20=20(thanks=20to=20?=
 =?UTF-8?q?Reinhard=20Nissl).=20-=20Fixed=20playing=20files=20with=20PES?=
 =?UTF-8?q?=20packets=20longer=20than=202048=20byte=20through=20the=20full?=
 =?UTF-8?q?=20=20=20featured=20DVB=20card=20(thanks=20to=20Marco=20Kremer?=
 =?UTF-8?q?=20for=20reporting=20this=20one=20and=20providing=20=20=20a=20t?=
 =?UTF-8?q?est=20sample).=20-=20Recording=20and=20Transfer=20Mode=20now=20?=
 =?UTF-8?q?handle=20more=20than=202=20audio=20PIDs.=20For=20this=20the=20?=
 =?UTF-8?q?=20=20interfaces=20of=20the=20following=20functions=20have=20be?=
 =?UTF-8?q?en=20changed:=20=20=20cTransferControl::cTransferControl()=20?=
 =?UTF-8?q?=20=20cTransfer::cTransfer()=20=20=20cRecorder::cRecorder()=20?=
 =?UTF-8?q?=20=20cReceiver::cReceiver()=20=20=20cRemux::cRemux()=20-=20Fix?=
 =?UTF-8?q?ed=20a=20possible=20race=20condition=20in=20cDevice::Action()?=
 =?UTF-8?q?=20and=20cTSBuffer::Action()=20=20=20(thanks=20to=20Stefan=20Hu?=
 =?UTF-8?q?elswitt).=20-=20Extended=20some=20buffer=20sizes=20to=20allow?=
 =?UTF-8?q?=20handling=20HDTV=20streams=20(thanks=20to=20Reinhard=20=20=20?=
 =?UTF-8?q?Nissl).=20-=20Added=20'channels.conf.terr'=20entries=20for=20D?=
 =?UTF-8?q?=C3=BCsseldorf=20and=20K=C3=B6ln=20(thanks=20to=20Walter=20Koch?=
 =?UTF-8?q?).=20-=20Falling=20back=20to=20'stereo'=20when=20switching=20ch?=
 =?UTF-8?q?annels=20in=20case=20the=20user=20had=20switched=20=20=20to=20'?=
 =?UTF-8?q?left'=20or=20'right'=20(suggested=20by=20Rolf=20Groppe).=20-=20?=
 =?UTF-8?q?Completed=20the=20Danish=20OSD=20texts=20(thanks=20to=20Mogens?=
 =?UTF-8?q?=20Elneff).=20-=20Recording=20and=20Transfer=20Mode=20can=20now?=
 =?UTF-8?q?=20handle=20up=20to=208=20Dolby=20Digital=20tracks=20(thanks=20?=
 =?UTF-8?q?=20=20to=20Marco=20Schl=C3=BC=C3=9Fler=20for=20a=20patch=20that?=
 =?UTF-8?q?=20implements=20substream=20handling=20into=20=20=20cDevice::Pl?=
 =?UTF-8?q?ayPesPacket(),=20and=20Reinhard=20Nissl=20for=20adding=20substr?=
 =?UTF-8?q?eam=20handling=20to=20=20=20cDolbyRepacker).=20-=20Added=20Play?=
 =?UTF-8?q?Pes(NULL,=200)=20to=20cTransfer::Action()=20when=20clearing=20t?=
 =?UTF-8?q?he=20transfer=20buffer=20=20=20to=20avoid=20overflows=20(thanks?=
 =?UTF-8?q?=20to=20Marco=20Schl=C3=BC=C3=9Fler=20for=20pointing=20this=20o?=
 =?UTF-8?q?ut).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         |   33 +-
 HISTORY              |   45 +
 PLUGINS.html         |   38 +-
 channels.c           |   13 +-
 channels.conf        |   14 +-
 channels.conf.terr   |   69 +
 channels.h           |   23 +-
 config.h             |    6 +-
 device.c             |   77 +-
 device.h             |   11 +-
 dvbdevice.c          |   10 +-
 dvbplayer.c          |    4 +-
 font.c               |    9 +-
 font.h               |    3 +-
 fontfix-iso8859-13.c | 6498 ++++++++++++++++++++++++++++++++++++++++
 fontosd-iso8859-13.c | 6722 ++++++++++++++++++++++++++++++++++++++++++
 fontsml-iso8859-13.c | 5602 +++++++++++++++++++++++++++++++++++
 i18n.c               |   66 +-
 lirc.c               |    8 +-
 menu.c               |    8 +-
 pat.c                |    8 +-
 receiver.c           |   37 +-
 receiver.h           |   42 +-
 recorder.c           |    8 +-
 recorder.h           |    4 +-
 recording.h          |    6 +-
 remux.c              |  412 ++-
 remux.h              |   16 +-
 skins.c              |    5 +-
 thread.c             |    4 +-
 thread.h             |    4 +-
 tools.c              |   26 +-
 tools.h              |    6 +-
 transfer.c           |   17 +-
 transfer.h           |    6 +-
 vdr.5                |    8 +-
 vdr.c                |   18 +-
 37 files changed, 19664 insertions(+), 222 deletions(-)
 create mode 100644 fontfix-iso8859-13.c
 create mode 100644 fontosd-iso8859-13.c
 create mode 100644 fontsml-iso8859-13.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 904f68c5b..48b54d4c7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -189,6 +189,7 @@ Stefan Huelswitt <huels@iname.com>
  skin in case a shorter title is set after a longer one
  for fixing handling of pmAudioOnlyBlack
  for pointing out possible race conditions in handling childTid in cThread
+ for fixing a possible race condition in cDevice::Action() and cTSBuffer::Action()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -791,6 +792,7 @@ Benjamin Harling <benjamin.harling@web.de>
 
 Christian Jacobsen <christian.jacobsen@stageholding.de>
  for making the LIRC interface skip keys that come in too fast
+ for reporting a problem in handling the '-E' options in version 1.3.18
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
@@ -835,9 +837,13 @@ Lars Bl
  for reporting a bug in EPG bugfix statistics which made log entires for undefined
  channels
 
-Niko Tarnanen <niko.tarnanen@hut.fi> and Rolf Ahrenberg <rahrenbe@cc.hut.fi>
+Niko Tarnanen <niko.tarnanen@hut.fi>
  for translating OSD texts to the Finnish language
 
+Rolf Ahrenberg <rahrenbe@cc.hut.fi>
+ for translating OSD texts to the Finnish language
+ for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
+
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
  for reporting a bug in handling a channels.conf that contains a ":@nnn" line as
@@ -902,6 +908,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting a high CPU load in still picture mode after removing the usleep()
  call from cDvbPlayer::Action()
  for reporting a race condition in starting a thread
+ for implementing cDolbyRepacker for better handling of Dolby Digital PES packets
+ for extending some buffer sizes to allow handling HDTV streams
+ for adding substream handling to cDolbyRepacker
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1103,6 +1112,10 @@ Marco Schl
  type errors"
  for some improvements to cPoller
  for implementing displaying mandatory subtitles in the SPU decoder
+ for pointing out a problem with canceling the LIRC thread
+ for a patch that implements substream handling into cDevice::PlayPesPacket()
+ for pointing out that PlayPes(NULL, 0) needs to be called in cTransfer::Action()
+ when clearing the transfer buffer to avoid overflows
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1200,3 +1213,21 @@ Laurence Abbott <laz@club-burniston.co.uk>
 
 Patrick Gleichmann <patrick@feedface.com>
  for fixing the default quality value when grabbing a JPEG image
+
+Achim Tuffentsammer <a.tuffentsammer@web.de>
+ for reporting a crash in case a plugin needs to issue an error message before the
+ skin has been set up
+
+Michael Heyse <mhk@designassembly.de>
+ for his help in keeping 'channels.conf.terr' up to date
+
+Marco Kremer <vdr.hgm.bg@gmx.net>
+ for reporting a problem with playing files with PES packets longer than 2048 byte
+ through the full featured DVB card
+
+Walter Koch <koch@u32.de>
+ for adding channels for DVB-T D�sseldorf and K�ln (Germany) to channels.cont.terr
+
+Rolf Groppe <rolf@groppe.de>
+ for suggesting to fall back to 'stereo' when switching channels in case the user
+ had switched to 'left' or 'right'
diff --git a/HISTORY b/HISTORY
index 8be48f554..47255f978 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3287,3 +3287,48 @@ Video Disk Recorder Revision History
 - Added support for circular polarization (thanks to Jonan Santiago).
 - Thanks to Werner Fink, Reinhard Nissl, Sascha Volkenandt and Bj�rnar Nilsen for
   their support in testing and fine tuning this version.
+
+2005-01-23: Version 1.3.19
+
+- Making sure at least the default skin is available at program start in case a
+  plugin needs to issue an error message (thanks to Achim Tuffentshammer for
+  reporting a crash in such a case). Also checking if there is a current skin
+  in cSkins::Message().
+- Completed the Finnish OSD texts and fixed internationalization of the text
+  for "Setup/DVB/Audio language(s)" (thanks to Rolf Ahrenberg).
+- Completed the Estonian OSD texts and switched to iso8859-13 character set
+  (thanks to Arthur Konovalov).
+- Made cCondWait::SleepMs() sleep at least 3ms to avoid a possible busy wait.
+- Fixed canceling the LIRC thread (thanks to Marco Schl��ler for pointing out
+  this one).
+- The "Green" button in the "Main" menu is now always "Audio", since the audio
+  channel might be changed even if there is only one actual audio PID.
+- Fixed handling the '-E' option which was broken in version 1.3.18 (thanks to
+  Christian Jacobsen for reporting this one).
+- Added 'channels.conf.terr' entries for Mainz (thanks to Michael Heyse).
+- Implemented cDolbyRepacker for better handling of Dolby Digital PES packets
+  (thanks to Reinhard Nissl).
+- Fixed playing files with PES packets longer than 2048 byte through the full
+  featured DVB card (thanks to Marco Kremer for reporting this one and providing
+  a test sample).
+- Recording and Transfer Mode now handle more than 2 audio PIDs. For this the
+  interfaces of the following functions have been changed:
+  cTransferControl::cTransferControl()
+  cTransfer::cTransfer()
+  cRecorder::cRecorder()
+  cReceiver::cReceiver()
+  cRemux::cRemux()
+- Fixed a possible race condition in cDevice::Action() and cTSBuffer::Action()
+  (thanks to Stefan Huelswitt).
+- Extended some buffer sizes to allow handling HDTV streams (thanks to Reinhard
+  Nissl).
+- Added 'channels.conf.terr' entries for D�sseldorf and K�ln (thanks to Walter Koch).
+- Falling back to 'stereo' when switching channels in case the user had switched
+  to 'left' or 'right' (suggested by Rolf Groppe).
+- Completed the Danish OSD texts (thanks to Mogens Elneff).
+- Recording and Transfer Mode can now handle up to 8 Dolby Digital tracks (thanks
+  to Marco Schl��ler for a patch that implements substream handling into
+  cDevice::PlayPesPacket(), and Reinhard Nissl for adding substream handling to
+  cDolbyRepacker).
+- Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
+  to avoid overflows (thanks to Marco Schl��ler for pointing this out).
diff --git a/PLUGINS.html b/PLUGINS.html
index 9132aa23c..e8f456a60 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.0 are marked like this.
-<!--X1.3.0--></td></tr></table>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.7 are marked like this.
 <!--X1.3.7--></td></tr></table>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.8 are marked like this.
 <!--X1.3.8--></td></tr></table>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.18 are marked like this.
 <!--X1.3.18--></td></tr></table>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.19 are marked like this.
+<!--X1.3.19--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -73,11 +73,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Status monitor">Status monitor</a>
 <li><a href="#Players">Players</a>
 <li><a href="#Receivers">Receivers</a>
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Filters">Filters</a>
-<!--X1.3.0--></td></tr></table>
 <li><a href="#The On Screen Display">The On Screen Display</a>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <!--X1.3.7--></td></tr></table>
@@ -1023,7 +1021,7 @@ <h1>Table Of Contents</h1>
 Take a look at the files <tt>player.h</tt> and <tt>dvbplayer.c</tt> to see how VDR implements
 its own player for the VDR recordings.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 To play the actual data, the player needs to call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
@@ -1046,7 +1044,7 @@ <h1>Table Of Contents</h1>
 
 to determine whether the device is ready for further data.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 By default all audio track handling is done by the device a player is
 attached to.
 If the player can provide more than a single audio track, and has special
@@ -1183,7 +1181,9 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-:cReceiver(0, -1, 1, Pid)
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+:cReceiver(0, -1, Pid)
+<!--X1.3.19--></td></tr></table>
 {
 }
 
@@ -1223,7 +1223,6 @@ <h1>Table Of Contents</h1>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Filters"><hr><h2>Filters</h2>
 
 <center><i><b>A Fistful of Datas</b></i></center><p>
@@ -1267,9 +1266,8 @@ <h1>Table Of Contents</h1>
 and will automatically detach itself from the <tt>cDevice</tt>.
 <p>
 See VDR/eit.c or VDR/pat.c to learn how to process filter data.
-<!--X1.3.0--></td></tr></table>
 
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Window to the world</b></i></center><p>
@@ -1362,7 +1360,7 @@ <h1>Table Of Contents</h1>
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
   virtual cSkinDisplayMessage *DisplayTrack(int NumTracks, const char * const *Tracks);
 <!--X1.3.18--></td></tr></table>
   virtual cSkinDisplayMessage *DisplayMessage(void);
@@ -1384,7 +1382,7 @@ <h1>Table Of Contents</h1>
 in the <a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
 Do not delete this object, it will be automatically deleted when the program ends.
 <p>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 In order to be able to easily identify plugins that implement a skin it is recommended
 that the name of such a plugin should be
 
@@ -1495,7 +1493,7 @@ <h1>Table Of Contents</h1>
 If the device can provide more than a single audio track, it can implement the
 following function to make them available:
 
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual void SetAudioTrackDevice(eTrackType Type);
 virtual int GetAudioChannelDevice(void);
@@ -1558,7 +1556,6 @@ <h1>Table Of Contents</h1>
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
 
-<!--X1.3.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>Section Filtering</b>
 <p>
@@ -1583,12 +1580,11 @@ <h1>Table Of Contents</h1>
 <p>
 See <a href="#Filters">Filters</a> on how to set up actual filters that can
 handle section data.
-<!--X1.3.0--></td></tr></table>
 
 <p>
 <b>On Screen Display</b>
 <p>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 If your device provides On Screen Display (OSD) capabilities (which every device
 that is supposed to be used as a primary device should do), it shall implement
 an "OSD provider" class, derived from <tt>cOsdProvider</tt>, which, when its <tt>CreateOsd()</tt>
diff --git a/channels.c b/channels.c
index 9403ef52d..5c0456b6e 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.33 2004/12/26 12:34:52 kls Exp $
+ * $Id: channels.c 1.34 2005/01/16 13:49:30 kls Exp $
  */
 
 #include "channels.h"
@@ -193,6 +193,7 @@ cChannel::cChannel(const cChannel &Channel)
   ppid         = 0;
   apids[0]     = 0;
   dpids[0]     = 0;
+  spids[0]     = 0;
   tpid         = 0;
   caids[0]     = 0;
   nid          = 0;
@@ -421,8 +422,8 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dp
   if (!modified)
      modified = IntArraysDiffer(apids, Apids, alangs, ALangs) || IntArraysDiffer(dpids, Dpids, dlangs, DLangs);
   if (modified) {
-     char OldApidsBuf[MAXAPIDS * 2 * 10 + 10]; // 2: Apids and Dpids, 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
-     char NewApidsBuf[MAXAPIDS * 2 * 10 + 10];
+     char OldApidsBuf[(MAXAPIDS + MAXDPIDS) * 10 + 10]; // 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
+     char NewApidsBuf[(MAXAPIDS + MAXDPIDS) * 10 + 10];
      char *q = OldApidsBuf;
      q += IntArrayToString(q, apids, 10, alangs);
      if (dpids[0]) {
@@ -443,6 +444,8 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dp
      for (int i = 0; i <= MAXAPIDS; i++) { // <= to copy the terminating 0
          apids[i] = Apids[i];
          strn0cpy(alangs[i], ALangs[i], 4);
+         }
+     for (int i = 0; i <= MAXDPIDS; i++) { // <= to copy the terminating 0
          dpids[i] = Dpids[i];
          strn0cpy(dlangs[i], DLangs[i], 4);
          }
@@ -623,7 +626,7 @@ cString cChannel::ToText(const cChannel *Channel)
      if (Channel->ppid && Channel->ppid != Channel->vpid)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
      *q = 0;
-     char apidbuf[MAXAPIDS * 2 * 10 + 10]; // 2: Apids and Dpids, 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
+     char apidbuf[(MAXAPIDS + MAXDPIDS) * 10 + 10]; // 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
      q = apidbuf;
      q += IntArrayToString(q, Channel->apids, 10, Channel->alangs);
      if (Channel->dpids[0]) {
@@ -726,7 +729,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
               int NumDpids = 0;
               char *strtok_next;
               while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
-                    if (NumDpids < MAXAPIDS) {
+                    if (NumDpids < MAXDPIDS) {
                        char *l = strchr(q, '=');
                        if (l) {
                           *l++ = 0;
diff --git a/channels.conf b/channels.conf
index 60c6feed9..67c319c90 100644
--- a/channels.conf
+++ b/channels.conf
@@ -26,7 +26,7 @@ NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:3
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:2:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
@@ -47,8 +47,8 @@ PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
@@ -58,8 +58,8 @@ PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2
 BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
 DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-PREMIERE SPORT 1,SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
-PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1702,1801,1722:27:133:4:0
+Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
+PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1801,1722:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -113,8 +113,8 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-Olisat / Telefe;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
+ADRIATICOSAT;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
-Astra HD:12441:vC34:S19.2E:27500:133+80:134:0:FF:29700:0:0:0
+Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
 :@1000 New channels
diff --git a/channels.conf.terr b/channels.conf.terr
index 52ff6b668..5a264fade 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -112,3 +112,72 @@ RTL Television:626000:I999B8C23D23M16T8G4Y0:T:27500:337:338:343:0:16405:0:0:0
 RTL2:626000:I999B8C23D23M16T8G4Y0:T:27500:353:354:359:0:16406:0:0:0
 Super RTL:626000:I999B8C23D23M16T8G4Y0:T:27500:369:370:375:0:16407:0:0:0
 VOX:626000:I999B8C23D23M16T8G4Y0:T:27500:545:546:551:0:16418:0:0:0
+: DVB-T Mainz, Germany
+Das Erste:198500000:C34D12M16B7T8G4Y0:T:27500:101:102=deu:104:0:1:8468:9985:0
+arte:198500000:C34D12M16B7T8G4Y0:T:27500:201:202=deu,203=fra:204:0:2:8468:9985:0
+PHOENIX:198500000:C34D12M16B7T8G4Y0:T:27500:301:302=deu:304:0:3:8468:9985:0
+ZDF:482000000:C23D23M16B8T8G4Y0:T:27500:545:546=deu,547=2ch;559=deu:551:0:514:8468:514:0
+Info/3sat:482000000:C23D23M16B8T8G4Y0:T:27500:561:562=deu,563=2ch:567:0:515:8468:514:0
+Doku/KiKa:482000000:C23D23M16B8T8G4Y0:T:27500:593:594=deu:599:0:517:8468:514:0
+RTL,RTL Television:578000000:C23D23M16B8T8G4Y0:T:27500:337:338=deu:343:0:16405:8468:8706:0
+RTL2:578000000:C23D23M16B8T8G4Y0:T:27500:353:354=deu:359:0:16406:8468:8706:0
+S RTL,Super RTL:578000000:C23D23M16B8T8G4Y0:T:27500:369:370=deu:375:0:16411:8468:8706:0
+VOX:578000000:C23D23M16B8T8G4Y0:T:27500:545:546=deu:551:0:16418:8468:8706:0
+N24:738000000:C23D23M16B8T8G4Y0:T:27500:225:226=deu:231:0:16398:8468:8705:0
+ProSieben:738000000:C23D23M16B8T8G4Y0:T:27500:305:306=deu;312=deu:311:0:16403:8468:8705:0
+KABEL1:738000000:C23D23M16B8T8G4Y0:T:27500:161:162=deu:167:0:16394:8468:8705:0
+SAT.1:738000000:C23D23M16B8T8G4Y0:T:27500:385:386=deu;392=deu:391:0:16408:8468:8705:0
+EinsFestival:762000000:C23D12M16B8T8G4Y0:T:27500:701:702=deu:0:0:5:8468:10241:0
+Bayerisches FS:762000000:C23D12M16B8T8G4Y0:T:27500:501:502=deu:504:0:33:8468:10241:0
+hr-fernsehen:762000000:C23D12M16B8T8G4Y0:T:27500:401:402=deu:404:0:65:8468:10241:0
+S�DWEST RP:762000000:C23D12M16B8T8G4Y0:T:27500:601:602=deu:604:0:226:8468:10241:0
+rheinmaintv:818000000:C23D23M16B8T8G4Y0:T:27500:2817:2818=deu:2823:0:19200:8468:8707:0
+TERRA NOVA:818000000:C23D23M16B8T8G4Y0:T:27500:609:610=deu,611=fra:615:0:16422:8468:8707:0
+Eurosport:818000000:C23D23M16B8T8G4Y0:T:27500:577:578=deu:583:0:16420:8468:8707:0
+tvnah:818000000:C23D23M16B8T8G4Y0:T:27500:2833:2834=eng:0:0:19216:8468:8707:0
+: DVB-T D�sseldorf, Germany
+RTL Television,RTL;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:337:338=deu:343:0:16405:8468:8706:0
+RTL2;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:353:354=deu:359:0:16406:8468:8706:0
+Super RTL,S RTL;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:433:434=deu:439:0:16411:8468:8706:0
+VOX;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:545:546=deu:551:0:16418:8468:8706:0
+ZDF:586000:I0C23D23M16B8T8G4Y0:T:27500:545:546=deu,547=2ch;559=dd:551:0:514:0:0:0
+Info/3sat:586000:I0C23D23M16B8T8G4Y0:T:27500:561:562=deu:567:0:515:0:0:0
+Doku/KiKa:586000:I0C23D23M16B8T8G4Y0:T:27500:593:594=deu:599:0:517:0:0:0
+ProSieben;ProSiebenSat.1:746000000:I0C23D23M16B8T8G4Y0:T:27500:305:306=deu;312=deu:311:0:16403:8468:8705:0
+SAT.1;ProSiebenSat.1:746000000:I0C23D23M16B8T8G4Y0:T:27500:385:386=deu;392=deu:391:0:16408:8468:8705:0
+KABEL1;ProSiebenSat.1:746000000:I0C23D23M16B8T8G4Y0:T:27500:161:162=deu:167:0:16394:8468:8705:0
+N24;ProSiebenSat.1:746000000:I0C23D23M16B8T8G4Y0:T:27500:225:226=deu:231:0:16398:8468:8705:0
+arte;ARD:818000000:I0C23D23M16B8T8G4Y0:T:27500:4897:4898=deu,4899=fra:4900:0:2:8468:6656:0
+Phoenix;ARD:818000000:I0C23D23M16B8T8G4Y0:T:27500:4913:4914=deu:4916:0:3:8468:6656:0
+Das Erste;ARD:818000000:I0C23D23M16B8T8G4Y0:T:27500:4881:4882=deu,4883=mis:4884:0:256:8468:6656:0
+WDR Dortmund;ARD:818000000:I0C23D23M16B8T8G4Y0:T:27500:4929:4930=deu,4931=mis:4932:0:259:8468:6656:0
+WDR D�sseldorf;ARD:818000000:I0C23D23M16B8T8G4Y0:T:27500:4929:4930=deu,4931=mis:4932:0:260:8468:6656:0
+WDR Essen;ARD:818000000:I0C23D23M16B8T8G4Y0:T:27500:4929:4930=deu,4931=mis:4932:0:261:8468:6656:0
+Eurosport;ZDFvision:834000:I0C23D23M16B8T8G4Y0:T:27500:577:578=deu:583:0:16420:8468:8707:0
+VIVA;VIVA Fernsehen GmbH & Co. KG:834000:I0C23D23M16B8T8G4Y0:T:27500:513:514=deu:519:0:16416:8468:8707:0
+TERRA NOVA;ABSAT:834000:I0C23D23M16B8T8G4Y0:T:27500:609:610=deu,611=fra:615:0:16422:8468:8707:0
+CNN Int.;CNN:834000:I0C23D23M16B8T8G4Y0:T:27500:97:98=eng:103:0:16390:8468:8707:0
+: DVB-T, K�ln, Germany
+RTL Television,RTL;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:337:338=deu:343:0:16405:8468:8706:0
+RTL2;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:353:354=deu:359:0:16406:8468:8706:0
+Super RTL,S RTL;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:433:434=deu:439:0:16411:8468:8706:0
+VOX;RTL World:538000000:I0C23D23M16B8T8G4Y0:T:27500:545:546=deu:551:0:16418:8468:8706:0
+ZDF;ZDFmobil:514000000:I0C23D23M16B8T8G4Y0:T:27500:545:546=deu,547=2ch;559=dd:551:0:514:8468:514:0
+Info/3sat;ZDFmobil:514000000:I0C23D23M16B8T8G4Y0:T:27500:561:562=deu:567:0:515:8468:514:0
+Doku/KiKa;ZDFmobil:514000000:I0C23D23M16B8T8G4Y0:T:27500:593:594=deu:599:0:517:8468:514:0
+KABEL1:650000:I0C23D23M16B8T8G4Y0:T:27500:161:162=deu:167:0:16394:0:0:0
+N24:650000:I0C23D23M16B8T8G4Y0:T:27500:225:226=deu:231:0:16398:0:0:0
+ProSieben:650000:I0C23D23M16B8T8G4Y0:T:27500:305:306=deu;312=deu:311:0:16403:0:0:0
+SAT.1:650000:I0C23D23M16B8T8G4Y0:T:27500:385:386=deu;392=deu:391:0:16408:0:0:0
+WDR K�ln;ARD:698000000:I0C23D23M16B8T8G4Y0:T:27500:4625:4626=deu,4627=mis:4628:0:262:8468:6400:0
+NDR FS NDS;ARD:698000000:I0C23D23M16B8T8G4Y0:T:27500:4641:4642=deu:4644:0:129:8468:6400:0
+S�DWEST RP;ARD:698000000:I0C23D23M16B8T8G4Y0:T:27500:4673:4674=deu:4676:0:226:8468:6400:0
+MDR Fernsehen;ARD:698000000:I0C23D23M16B8T8G4Y0:T:27500:4657:4658=deu:4660:0:100:8468:6400:0
+Das Erste;ARD:826000000:I0C23D23M16B8T8G4Y0:T:27500:4369:4370=deu,4371=mis:4372:0:256:8468:6144:0
+arte;ARD:826000000:I0C23D23M16B8T8G4Y0:T:27500:4385:4386=deu,4387=fra:4388:0:2:8468:6144:0
+Phoenix;ARD:826000000:I0C23D23M16B8T8G4Y0:T:27500:4401:4402=deu:4404:0:3:8468:6144:0
+EinsMuXx;ARD:826000000:I0C23D23M16B8T8G4Y0:T:27500:4417:4418=deu:4372:0:6:8468:6144:0
+Eurosport;ZDFvision:834000:I0C23D23M16B8T8G4Y0:T:27500:577:578=deu:583:0:16420:8468:8707:0
+VIVA;VIVA Fernsehen GmbH & Co. KG:834000:I0C23D23M16B8T8G4Y0:T:27500:513:514=deu:519:0:16416:8468:8707:0
+TERRA NOVA;ABSAT:834000:I0C23D23M16B8T8G4Y0:T:27500:609:610=deu,611=fra:615:0:16422:8468:8707:0
+CNN Int.;CNN:834000:I0C23D23M16B8T8G4Y0:T:27500:97:98=eng:103:0:16390:8468:8707:0
diff --git a/channels.h b/channels.h
index 3670ad36f..472003f4c 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.24 2004/12/26 12:15:52 kls Exp $
+ * $Id: channels.h 1.25 2005/01/16 13:46:41 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -30,8 +30,10 @@
 #define CHANNELSMOD_AUTO    1
 #define CHANNELSMOD_USER    2
 
-#define MAXAPIDS 32
-#define MAXCAIDS  8
+#define MAXAPIDS 32 // audio
+#define MAXDPIDS  8 // dolby
+#define MAXSPIDS  8 // subtitles
+#define MAXCAIDS  8 // conditional access
 
 struct tChannelParameterMap {
   int userValue;
@@ -100,8 +102,10 @@ class cChannel : public cListObject {
   int ppid;
   int apids[MAXAPIDS + 1]; // list is zero-terminated
   char alangs[MAXAPIDS][4];
-  int dpids[MAXAPIDS + 1]; // list is zero-terminated
-  char dlangs[MAXAPIDS][4];
+  int dpids[MAXDPIDS + 1]; // list is zero-terminated
+  char dlangs[MAXDPIDS][4];
+  int spids[MAXSPIDS + 1]; // list is zero-terminated
+  char slangs[MAXSPIDS][4];
   int tpid;
   int caids[MAXCAIDS + 1]; // list is zero-terminated
   int nid;
@@ -144,10 +148,15 @@ class cChannel : public cListObject {
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
   int Ppid(void) const { return ppid; }
+  const int *Apids(void) const { return apids; }
+  const int *Dpids(void) const { return dpids; }
+  const int *Spids(void) const { return spids; }
   int Apid(int i) const { return (0 <= i && i < MAXAPIDS) ? apids[i] : 0; }
-  int Dpid(int i) const { return (0 <= i && i < MAXAPIDS) ? dpids[i] : 0; }
+  int Dpid(int i) const { return (0 <= i && i < MAXDPIDS) ? dpids[i] : 0; }
+  int Spid(int i) const { return (0 <= i && i < MAXSPIDS) ? spids[i] : 0; }
   const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
-  const char *Dlang(int i) const { return (0 <= i && i < MAXAPIDS) ? dlangs[i] : ""; }
+  const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
+  const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
   int Tpid(void) const { return tpid; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
   int Nid(void) const { return nid; }
diff --git a/config.h b/config.h
index d6759cccb..5dacc6fb1 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.209 2005/01/09 12:14:33 kls Exp $
+ * $Id: config.h 1.210 2005/01/09 16:50:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.18"
-#define VDRVERSNUM   10318  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.19"
+#define VDRVERSNUM   10319  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 9e60b70b6..dcb6989b1 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.73 2005/01/09 12:36:48 kls Exp $
+ * $Id: device.c 1.78 2005/01/23 15:41:05 kls Exp $
  */
 
 #include "device.h"
@@ -512,7 +512,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (CaDevice && CanReplay()) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
-           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apid(0), Channel->Apid(1), Channel->Dpid(0), Channel->Dpid(1)));
+           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
         else
            Result = scrNoTransfer;
         }
@@ -545,11 +545,12 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         // Set the available audio tracks:
         ClrAvailableTracks();
         currentAudioTrack = ttAudioFirst;
-        for (int i = 0; i < MAXAPIDS; i++) {
+        for (int i = 0; i < MAXAPIDS; i++)
             SetAvailableTrack(ttAudio, i, Channel->Apid(i), Channel->Alang(i));
-            if (Setup.UseDolbyDigital)
+        if (Setup.UseDolbyDigital) {
+           for (int i = 0; i < MAXDPIDS; i++)
                SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i));
-            }
+           }
         // Select the preferred audio track:
         eTrackType PreferredTrack = ttAudioFirst;
         int LanguagePreference = -1;
@@ -568,6 +569,8 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
         if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack())
            SetCurrentAudioTrack(PreferredTrack);
+        // Fall back to stereo:
+        SetAudioChannel(0);
         }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
@@ -657,8 +660,10 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
      for (int i = ttNone; i < ttMaxTrackTypes; i++)
          *availableTracks[i].description = 0;
      }
-  else
+  else {
      memset(availableTracks, 0, sizeof(availableTracks));
+     pre_1_3_19_PrivateStream = false;
+     }
 }
 
 bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language, const char *Description, uint32_t Flags)
@@ -834,22 +839,49 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                if (!VideoOnly && c == availableTracks[currentAudioTrack].id)
                   w = PlayAudio(Start, d);
                break;
-          case 0xBD: // dolby
-               if (Setup.UseDolbyDigital) {
-                  SetAvailableTrack(ttDolby, 0, c);
-                  if (!VideoOnly && c == availableTracks[currentAudioTrack].id) {
-                     w = PlayAudio(Start, d);
-                     if (FirstLoop)
-                        Audios.PlayAudio(Data, Length);
-                     }
+          case 0xBD: { // private stream 1
+               int PayloadOffset = Data[8] + 9;
+               uchar SubStreamId = Data[PayloadOffset];
+               uchar SubStreamType = SubStreamId & 0xE0;
+               uchar SubStreamIndex = SubStreamId & 0x1F;
+
+               // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
+               //TODO apparently this doesn't work for old ORF Dolby Digital recordings
+               if (!pre_1_3_19_PrivateStream && (Data[6] & 4) && Data[PayloadOffset] == 0x0B && Data[PayloadOffset + 1] == 0x77)
+                  pre_1_3_19_PrivateStream = true;
+               if (pre_1_3_19_PrivateStream) {
+                  SubStreamId = c;
+                  SubStreamType = 0x80;
+                  SubStreamIndex = 0;
                   }
+
+               switch (SubStreamType) {
+                 case 0x20: // SPU
+                      break;
+                 case 0x80: // AC3 & DTS
+                      if (Setup.UseDolbyDigital) {
+                         SetAvailableTrack(ttDolby, SubStreamIndex, SubStreamId);
+                         if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
+                            w = PlayAudio(Start, d);
+                            if (FirstLoop && !(SubStreamId & 0x08)) // no DTS
+                               Audios.PlayAudio(Data, Length);
+                            }
+                         }
+                      break;
+                 case 0xA0: // LPCM
+                      SetAvailableTrack(ttAudio, SubStreamIndex, SubStreamId);
+                      if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id)
+                         w = PlayAudio(Start, d);
+                      break;
+                 }
+               }
                break;
           default:
                ;//esyslog("ERROR: unexpected packet id %02X", c);
           }
         if (w > 0)
            Start += w;
-        else if (w <= 0) {
+        else {
            if (Start != Data)
               esyslog("ERROR: incomplete PES packet write!");
            return Start == Data ? w : Start - Data;
@@ -990,8 +1022,7 @@ bool cDevice::Receiving(bool CheckAny) const
 
 void cDevice::Action(void)
 {
-  active = true;
-  if (OpenDvr()) {
+  if (active && OpenDvr()) {
      for (; active;) {
          // Read data from the DVR device:
          uchar *b = NULL;
@@ -1041,7 +1072,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
-         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
+         for (int n = 0; n < Receiver->numPids; n++) {
              if (!AddPid(Receiver->pids[n])) {
                 for ( ; n-- > 0; )
                     DelPid(Receiver->pids[n]);
@@ -1053,7 +1084,10 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Receiver->device = this;
          receiver[i] = Receiver;
          Unlock();
-         Start();
+         if (!active) {
+            active = true;
+            Start();
+            }
          return true;
          }
       }
@@ -1074,7 +1108,7 @@ void cDevice::Detach(cReceiver *Receiver)
          receiver[i] = NULL;
          Receiver->device = NULL;
          Unlock();
-         for (int n = 0; n < MAXRECEIVEPIDS; n++)
+         for (int n = 0; n < Receiver->numPids; n++)
              DelPid(Receiver->pids[n]);
          }
       else if (receiver[i])
@@ -1093,10 +1127,10 @@ cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
   SetDescription("TS buffer on device %d", CardIndex);
   f = File;
   cardIndex = CardIndex;
-  active = false;
   delivered = false;
   ringBuffer = new cRingBufferLinear(Size, TS_SIZE, true, "TS");
   ringBuffer->SetTimeouts(100, 100);
+  active = true;
   Start();
 }
 
@@ -1112,7 +1146,6 @@ void cTSBuffer::Action(void)
   if (ringBuffer) {
      bool firstRead = true;
      cPoller Poller(f);
-     active = true;
      for (; active;) {
          if (firstRead || Poller.Poll(100)) {
             firstRead = false;
diff --git a/device.h b/device.h
index 2099a223f..9ab15c9f7 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.51 2005/01/07 14:57:01 kls Exp $
+ * $Id: device.h 1.53 2005/01/22 14:58:07 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -22,7 +22,7 @@
 #include "tools.h"
 
 #define MAXDEVICES         16 // the maximum number of devices in the system
-#define MAXPIDHANDLES      16 // the maximum number of different PIDs per device
+#define MAXPIDHANDLES      64 // the maximum number of different PIDs per device
 #define MAXRECEIVERS       16 // the maximum number of receivers per device
 #define MAXVOLUME         255
 #define VOLUMEDELTA         5 // used to increase/decrease the volume
@@ -59,14 +59,14 @@ enum eVideoSystem { vsPAL,
 enum eTrackType { ttNone,
                   ttAudio,
                   ttAudioFirst = ttAudio,
-                  ttAudioLast  = ttAudioFirst + 31/*XXX MAXAPIDS - 1*/,
+                  ttAudioLast  = ttAudioFirst + 31, // MAXAPIDS - 1
                   ttDolby,
                   ttDolbyFirst = ttDolby,
-                  ttDolbyLast  = ttDolbyFirst + 31/*XXX MAXAPIDS - 1*/,
+                  ttDolbyLast  = ttDolbyFirst + 8, // MAXDPIDS - 1
                   /* future...
                   ttSubtitle,
                   ttSubtitleFirst = ttSubtitle,
-                  ttSubtitleLast  = ttSubtitleFirst + 31,
+                  ttSubtitleLast  = ttSubtitleFirst + 8, // MAXSPIDS - 1
                   */
                   ttMaxTrackTypes
                 };
@@ -315,6 +315,7 @@ class cDevice : public cThread {
 private:
   tTrackId availableTracks[ttMaxTrackTypes];
   eTrackType currentAudioTrack;
+  bool pre_1_3_19_PrivateStream;
 protected:
   virtual void SetAudioTrackDevice(eTrackType Type);
        ///< Sets the current audio track to the given value.
diff --git a/dvbdevice.c b/dvbdevice.c
index 9c7fd3817..e8862cb47 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.113 2005/01/09 13:04:20 kls Exp $
+ * $Id: dvbdevice.c 1.116 2005/01/16 12:05:13 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -813,7 +813,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid(0), Channel->Apid(1), Channel->Dpid(0), Channel->Dpid(1)));
+     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
 
   return true;
 }
@@ -1111,7 +1111,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
 #define MIN_IFRAME 400000
   for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
       safe_write(fd_video, Data, Length);
-      cCondWait::SleepMs(1); // allows the buffer to be displayed in case the progress display is active
+      cCondWait::SleepMs(3); // allows the buffer to be displayed in case the progress display is active
       }
 #endif
 }
@@ -1130,12 +1130,12 @@ bool cDvbDevice::Flush(int TimeoutMs)
 
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
-  return write(fd_video, Data, Length);
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
 int cDvbDevice::PlayAudio(const uchar *Data, int Length)
 {
-  return write(fd_audio, Data, Length);
+  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
 }
 
 bool cDvbDevice::OpenDvr(void)
diff --git a/dvbplayer.c b/dvbplayer.c
index 0ec068101..8605268ba 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.29 2004/12/26 11:45:34 kls Exp $
+ * $Id: dvbplayer.c 1.30 2005/01/14 14:00:56 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -439,7 +439,7 @@ void cDvbPlayer::Action(void)
                     }
                  }
               else
-                 cCondWait::SleepMs(1); // this keeps the CPU load low
+                 cCondWait::SleepMs(3); // this keeps the CPU load low
               }
 
            // Store the frame in the buffer:
diff --git a/font.c b/font.c
index b99c75061..6269f2b5d 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.10 2004/12/18 13:41:19 kls Exp $
+ * $Id: font.c 1.11 2005/01/14 13:25:35 kls Exp $
  */
 
 #include "config.h"
@@ -28,10 +28,13 @@
 #include "fontosd-iso8859-7.c"
 #include "fontsml-iso8859-7.c"
 
+#include "fontfix-iso8859-13.c"
+#include "fontosd-iso8859-13.c"
+#include "fontsml-iso8859-13.c"
+
 #include "fontfix-iso8859-15.c"
 #include "fontosd-iso8859-15.c"
 #include "fontsml-iso8859-15.c"
-
 // --- cFont -----------------------------------------------------------------
 
 static void *FontData[eDvbCodeSize][eDvbFontSize] = {
@@ -39,6 +42,7 @@ static void *FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_2,  FontFix_iso8859_2,  FontSml_iso8859_2 },
   { FontOsd_iso8859_5,  FontFix_iso8859_5,  FontSml_iso8859_5 },
   { FontOsd_iso8859_7,  FontFix_iso8859_7,  FontSml_iso8859_7 },
+  { FontOsd_iso8859_13, FontFix_iso8859_13, FontSml_iso8859_13 },
   { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15 },
   };
 
@@ -47,6 +51,7 @@ static const char *FontCode[eDvbCodeSize] = {
   "iso8859-2",
   "iso8859-5",
   "iso8859-7",
+  "iso8859-13",
   "iso8859-15",
   };
 
diff --git a/font.h b/font.h
index 5d74f66c7..012f6c544 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.9 2004/10/23 14:06:37 kls Exp $
+ * $Id: font.h 1.10 2005/01/14 13:25:35 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -24,6 +24,7 @@ enum eDvbCode {
   code_iso8859_2,
   code_iso8859_5,
   code_iso8859_7,
+  code_iso8859_13,
   code_iso8859_15,
 #define eDvbCodeSize (code_iso8859_15 + 1)
   };
diff --git a/fontfix-iso8859-13.c b/fontfix-iso8859-13.c
new file mode 100644
index 000000000..f6b3abea3
--- /dev/null
+++ b/fontfix-iso8859-13.c
@@ -0,0 +1,6498 @@
+cFont::tPixelData FontFix_iso8859_13[][28] = {
+  {             // 32
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 33
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 34
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 35
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 36
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000FC0,  // ...******......
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FF0,  // ..*********....
+     0x00001BE0,  // ..**.*****.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 37
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // ....****.......
+     0x00000CC0,  // ...**..**......
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
+     0x00000038,  // .........***...
+     0x000001E0,  // ......****.....
+     0x00000700,  // ....***........
+     0x00001CF0,  // ..***..****....
+     0x00000198,  // ......**..**...
+     0x0000030C,  // .....**....**..
+     0x0000030C,  // .....**....**..
+     0x00000198,  // ......**..**...
+     0x000000F0,  // .......****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 38
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000700,  // ....***........
+     0x00000F98,  // ...*****..**...
+     0x00000DF8,  // ...**.******...
+     0x000018F0,  // ..**...****....
+     0x00001860,  // ..**....**.....
+     0x000018F0,  // ..**...****....
+     0x00001FFC,  // ..***********..
+     0x00000F9C,  // ...*****..***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 40
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000030,  // .........**....
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000070,  // ........***....
+     0x00000030,  // .........**....
+     0x00000000,  // ...............
+  },
+  {             // 41
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C00,  // ...**..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00000000,  // ...............
+  },
+  {             // 42
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001998,  // ..**..**..**...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 43
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 44
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 45
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 46
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 47
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 48
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000C30,  // ...**....**....
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 49
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 50
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
+     0x00001C00,  // ..***..........
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 51
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000003E0,  // .....*****.....
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001FF0,  // ..*********....
+     0x00000FE0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 52
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // .......***.....
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000003F8,  // .....*******...
+     0x000003F8,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 53
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DE0,  // ...**.****.....
+     0x00000FF8,  // ...*********...
+     0x00000E38,  // ...***...***...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000181C,  // ..**......***..
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 54
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F8,  // .......*****...
+     0x000003F8,  // .....*******...
+     0x00000780,  // ....****.......
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C18,  // ..***.....**...
+     0x00000E38,  // ...***...***...
+     0x00000FF0,  // ...********....
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 55
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 56
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 57
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001E0,  // ......****.....
+     0x000007F8,  // ....********...
+     0x00000618,  // ....**....**...
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E3C,  // ...***...****..
+     0x000007EC,  // ....******.**..
+     0x000003CC,  // .....****..**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FC0,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 58
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 59
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000800,  // ...*...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 60
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000E,  // ...........***.
+     0x0000003C,  // .........****..
+     0x000000F0,  // .......****....
+     0x000003C0,  // .....****......
+     0x00000F00,  // ...****........
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000F00,  // ...****........
+     0x000003C0,  // .....****......
+     0x000000F0,  // .......****....
+     0x0000003C,  // .........****..
+     0x0000000E,  // ...........***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // .***...........
+     0x00001E00,  // ..****.........
+     0x00000780,  // ....****.......
+     0x000001E0,  // ......****.....
+     0x00000078,  // ........****...
+     0x0000001E,  // ..........****.
+     0x0000001E,  // ..........****.
+     0x00000078,  // ........****...
+     0x000001E0,  // ......****.....
+     0x00000780,  // ....****.......
+     0x00001E00,  // ..****.........
+     0x00003800,  // .***...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x000000F0,  // .......****....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 64
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x000018F0,  // ..**...****....
+     0x000019F0,  // ..**..*****....
+     0x00001BB0,  // ..**.***.**....
+     0x00001B30,  // ..**.**..**....
+     0x00001B30,  // ..**.**..**....
+     0x00001BB0,  // ..**.***.**....
+     0x000019F8,  // ..**..******...
+     0x000018F8,  // ..**...*****...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 65
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 68
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 69
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C66,  // ...**...**..**.
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 71
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 73
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 74
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 75
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 77
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 78
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 79
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000386,  // .....***....**.
+     0x00000FFE,  // ...***********.
+     0x00000E78,  // ...***..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 83
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 85
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 86
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001E78,  // ..****..****...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 88
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000000,  // ...............
+  },
+  {             // 92
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 93
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000000,  // ...............
+  },
+  {             // 94
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 95
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFF,  // ***************
+     0x00007FFF,  // ***************
+     0x00000000,  // ...............
+  },
+  {             // 96
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000020,  // .........*.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 97
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 98
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00003FFC,  // .************..
+     0x00003DF0,  // .****.*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 99
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 100
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 101
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 102
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000FC,  // .......******..
+     0x000001FC,  // ......*******..
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 103
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
+  },
+  {             // 104
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 105
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 106
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
+  },
+  {             // 107
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C78,  // ...**...****...
+     0x00000C78,  // ...**...****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003C7E,  // .****...******.
+     0x00003C7E,  // .****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 108
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 109
+     16, 26,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000EF78,  // ***.****.****...
+     0x0000FFFC,  // **************..
+     0x000039CC,  // ..***..***..**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000F9EF,  // *****..****.****
+     0x0000F9EF,  // *****..****.****
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 111
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 112
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
+  },
+  {             // 113
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000000FE,  // .......*******.
+     0x000000FE,  // .......*******.
+  },
+  {             // 114
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 115
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 116
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 117
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 118
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 119
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00001998,  // ..**..**..**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001E78,  // ..****..****...
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 121
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
+  },
+  {             // 122
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 123
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000070,  // ........***....
+     0x00000000,  // ...............
+  },
+  {             // 124
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 125
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000E00,  // ...***.........
+     0x00000000,  // ...............
+  },
+  {             // 126
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F0C,  // ...****....**..
+     0x00001F9C,  // ..******..***..
+     0x000039F8,  // .***..******...
+     0x000030F0,  // .**....****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 127
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 26,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 161
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000000,  // ...............
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000300,  // .....**........
+  },
+  {             // 162
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 163
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x000007F0,  // ....*******....
+     0x00000E30,  // ...***...**....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00001C0C,  // ..***......**..
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 164
+     17, 26,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000003F6,  // .......******.**.
+     0x00000FFE,  // .....***********.
+     0x00001C0E,  // ....***......***.
+     0x00001806,  // ....**........**.
+     0x0001FFE6,  // ************..**.
+     0x0001FFE0,  // ************.....
+     0x00003000,  // ...**............
+     0x00003000,  // ...**............
+     0x0001FFE0,  // ************.....
+     0x0001FFE0,  // ************.....
+     0x00003800,  // ...***...........
+     0x00001806,  // ....**........**.
+     0x00001C0E,  // ....***......***.
+     0x00000FFC,  // .....**********..
+     0x000003F0,  // .......******....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 165
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 166
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 167
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003F8,  // .....*******...
+     0x000007F8,  // ....********...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000E00,  // ...***.........
+     0x00001F80,  // ..******.......
+     0x000033E0,  // .**..*****.....
+     0x000030F8,  // .**....*****...
+     0x00003C3C,  // .****....****..
+     0x00001F0C,  // ..*****....**..
+     0x000007CC,  // ....*****..**..
+     0x000001FC,  // ......*******..
+     0x00000078,  // ........****...
+     0x00000030,  // .........**....
+     0x00001830,  // ..**.....**....
+     0x00001870,  // ..**....***....
+     0x00001FE0,  // ..********.....
+     0x00001FC0,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 168
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x0000000C,  // ...........**..
+     0x000003F8,  // .....*******...
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x00003046,  // .**.....*...**.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x00003A0E,  // .***.*.....***.
+     0x00001E0C,  // ..****.....**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x00001BE0,  // ..**.*****.....
+     0x00003000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006E66,  // **.***..**..**.
+     0x00006C06,  // **.**.......**.
+     0x00006C06,  // **.**.......**.
+     0x00006E66,  // **.***..**..**.
+     0x000037EC,  // .**.******.**..
+     0x000033CC,  // .**..****..**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000060,  // ........**.....
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000CF0,  // ...**..****....
+     0x000007B0,  // ....****.**....
+     0x00000000,  // ...............
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 171
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 172
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 173
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 174
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000037CC,  // .**.*****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006666,  // **..**..**..**.
+     0x00006666,  // **..**..**..**.
+     0x000067C6,  // **..*****...**.
+     0x000066C6,  // **..**.**...**.
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 176
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 177
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 178
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000630,  // ....**...**....
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 179
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000001E0,  // ......****.....
+     0x00000030,  // .........**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 180
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FFE,  // ..************.
+     0x00001FDE,  // ..*******.****.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+  },
+  {             // 182
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FC,  // ....*********..
+     0x00001FFC,  // ..***********..
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x00001FB0,  // ..******.**....
+     0x000007B0,  // ....****.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x00000FBC,  // ...*****.****..
+     0x00000FBC,  // ...*****.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 183
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 184
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x000007EC,  // ....******.**..
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000386C,  // .***....**.**..
+     0x000030CC,  // .**....**..**..
+     0x0000318C,  // .**...**...**..
+     0x0000330C,  // .**..**....**..
+     0x0000361C,  // .**.**....***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x00001FE0,  // ..********.....
+     0x00003000,  // .**............
+     0x00006000,  // **.............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 185
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 186
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 187
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 188
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FFF,  // ...************
+     0x00003FFF,  // .**************
+     0x000031C3,  // .**...***....**
+     0x000060C3,  // **.....**....**
+     0x000060C0,  // **.....**......
+     0x000060CC,  // **.....**..**..
+     0x000060FC,  // **.....******..
+     0x000060FC,  // **.....******..
+     0x000060CC,  // **.....**..**..
+     0x000060C0,  // **.....**......
+     0x000060C0,  // **.....**......
+     0x000060C3,  // **.....**....**
+     0x000031C3,  // .**...***....**
+     0x00003FFF,  // .**************
+     0x00000FFF,  // ...************
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E7C,  // ..****..*****..
+     0x00003FFE,  // .*************.
+     0x000073C7,  // ***..****...***
+     0x00006183,  // **....**.....**
+     0x00006183,  // **....**.....**
+     0x000061FF,  // **....*********
+     0x000061FF,  // **....*********
+     0x00006180,  // **....**.......
+     0x000073C3,  // ***..****....**
+     0x00003FFF,  // .**************
+     0x00001E7C,  // ..****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000F00,  // ...****........
+     0x00001C00,  // ..***..........
+     0x00001800,  // ..**...........
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+  },
+  {             // 192
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 26,
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000FC0,  // ...******......
+     0x00001CE0,  // ..***..***.....
+     0x00003870,  // .***....***....
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 26,
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FF,  // ....***********
+     0x000007FF,  // ....***********
+     0x000001C3,  // ......***....**
+     0x000003C3,  // .....****....**
+     0x000003C0,  // .....****......
+     0x000006CC,  // ....**.**..**..
+     0x000004FC,  // ....*..******..
+     0x00000CFC,  // ...**..******..
+     0x00000FCC,  // ...******..**..
+     0x00001FC0,  // ..*******......
+     0x000018C0,  // ..**...**......
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x00007BFF,  // ****.**********
+     0x00007BFF,  // ****.**********
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 199
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001804,  // ..**........*..
+     0x00001C0C,  // ..***......**..
+     0x00000FF8,  // ...*********...
+     0x000003F0,  // .....******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 200
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 26,
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 26,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 205
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 206
+     15, 26,
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 207
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000360,  // .....**.**.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001E00,  // ..****.........
+     0x00000FC0,  // ...******......
+     0x000001F8,  // ......******...
+     0x0000003C,  // .........****..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     15, 26,
+     0x00000000,  // ...............
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 26,
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 26,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001008,  // ..*........*...
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00001008,  // ..*........*...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x0000000C,  // ...........**..
+     0x000003F8,  // .....*******...
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x00003046,  // .**.....*...**.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x00003A0E,  // .***.*.....***.
+     0x00001E0C,  // ..****.....**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x00001BE0,  // ..**.*****.....
+     0x00003000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 218
+     15, 26,
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 219
+     15, 26,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 221
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C70,  // ...**...***....
+     0x00000DE0,  // ...**.****.....
+     0x00000DF0,  // ...**.*****....
+     0x00000C38,  // ...**....***...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000CDC,  // ...**..**.***..
+     0x00003EF8,  // .*****.*****...
+     0x00003E70,  // .*****..***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 225
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 226
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 227
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 228
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 229
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 230
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E78,  // ..****..****...
+     0x00003FFC,  // .************..
+     0x000033CE,  // .**..****..***.
+     0x00000186,  // ......**....**.
+     0x00000F86,  // ...*****....**.
+     0x00003FFE,  // .*************.
+     0x000071FE,  // ***...********.
+     0x00006180,  // **....**.......
+     0x000063C6,  // **...****...**.
+     0x00007FFE,  // **************.
+     0x00003E78,  // .*****..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 231
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x00003818,  // .***......**...
+     0x00003018,  // .**.......**...
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x000007F0,  // ....*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 232
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 233
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 234
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000003E0,  // .....*****.....
+     0x00000770,  // ....***.***....
+     0x00000E38,  // ...***...***...
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 235
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 236
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 237
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 238
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 240
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 241
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 242
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 243
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 244
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 245
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 246
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 247
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // *************..
+     0x00007FFC,  // *************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 248
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x000007EC,  // ....******.**..
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000386C,  // .***....**.**..
+     0x000030CC,  // .**....**..**..
+     0x0000318C,  // .**...**...**..
+     0x0000330C,  // .**..**....**..
+     0x0000361C,  // .**.**....***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x00001FE0,  // ..********.....
+     0x00003000,  // .**............
+     0x00006000,  // **.............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 249
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 250
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 251
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 252
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 253
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
+  },
+  {             // 254
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 255
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
+  },
+  };
diff --git a/fontosd-iso8859-13.c b/fontosd-iso8859-13.c
new file mode 100644
index 000000000..1179ebab7
--- /dev/null
+++ b/fontosd-iso8859-13.c
@@ -0,0 +1,6722 @@
+cFont::tPixelData FontOsd_iso8859_13[][29] = {
+  {             // 32
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 33
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000022,  // ..*...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000008C,  // .....*...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00000188,  // ....**...*...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000118,  // ....*...**...
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000310,  // ...**...*....
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000230,  // ...*...**....
+     0x00000630,  // ..**...**....
+     0x00000620,  // ..**...*.....
+     0x00000620,  // ..**...*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 36
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000007F8,  // ..********...
+     0x0000065C,  // ..**..*.***..
+     0x00000CCC,  // .**..**..**..
+     0x00000CCC,  // .**..**..**..
+     0x00000CC0,  // .**..**......
+     0x00000CC0,  // .**..**......
+     0x000007C0,  // ..*****......
+     0x000003F0,  // ...******....
+     0x000001FC,  // ....*******..
+     0x000000CE,  // .....**..***.
+     0x000000C6,  // .....**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CCE,  // .**..**..***.
+     0x00000E9C,  // .***.*..***..
+     0x000007F8,  // ..********...
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0001C020,  // ...***........*.....
+     0x0007F060,  // .*******.....**.....
+     0x000E38C0,  // ***...***...**......
+     0x000C1880,  // **.....**...*.......
+     0x000C1980,  // **.....**..**.......
+     0x000E3900,  // ***...***..*........
+     0x0007F300,  // .*******..**........
+     0x0003E200,  // ..*****...*.........
+     0x0000063C,  // .........**...****..
+     0x00000C7E,  // ........**...******.
+     0x00000CE6,  // ........**..***..**.
+     0x000018C3,  // .......**...**....**
+     0x000010C3,  // .......*....**....**
+     0x000030C3,  // ......**....**....**
+     0x0000607E,  // .....**......******.
+     0x0000603C,  // .....**.......****..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 38
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000006E0,  // ....**.***.....
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000FCC,  // ...******..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000306C,  // .**.....**.**..
+     0x00003038,  // .**......***...
+     0x00003038,  // .**......***...
+     0x0000383C,  // .***.....****..
+     0x00001FEE,  // ..********.***.
+     0x00000F80,  // ...*****.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 40
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000008,  // ....*...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
+     0x00000004,  // .....*..
+  },
+  {             // 41
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000040,  // .*......
+     0x00000020,  // ..*.....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000040,  // .*......
+  },
+  {             // 42
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
+     0x000000D6,  // .**.*.**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x00000044,  // ..*...*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 44
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 45
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 46
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     7, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000040,  // *......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001E0,  // ....****.....
+     0x000007E0,  // ..******.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000001C,  // ........***..
+     0x00000078,  // ......****...
+     0x000001E0,  // ....****.....
+     0x00000380,  // ...***.......
+     0x00000700,  // ..***........
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x000000F0,  // .....****....
+     0x000000FC,  // .....******..
+     0x0000000C,  // .........**..
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000218,  // ...*....**...
+     0x00000618,  // ..**....**...
+     0x00000C18,  // .**.....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007F0,  // ..*******....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0E,  // .**......***.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0C,  // .***.....**..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000070C,  // ..***....**..
+     0x0000060E,  // ..**.....***.
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000004,  // ..........*..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000380,  // ...***.......
+     0x00000300,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003F0,  // ...******....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E1E,  // .***....****.
+     0x000007FE,  // ..**********.
+     0x000001F6,  // ....*****.**.
+     0x00000006,  // ..........**.
+     0x0000000E,  // .........***.
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 60
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000002,  // ...........*.
+     0x0000000E,  // .........***.
+     0x0000003C,  // .......****..
+     0x000001E0,  // ....****.....
+     0x00000780,  // ..****.......
+     0x00000E00,  // .***.........
+     0x00000F00,  // .****........
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000000E,  // .........***.
+     0x00000002,  // ...........*.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 61
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 62
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000800,  // .*...........
+     0x00000E00,  // .***.........
+     0x000003C0,  // ...****......
+     0x000000F0,  // .....****....
+     0x0000003E,  // .......*****.
+     0x00000006,  // ..........**.
+     0x0000001E,  // ........****.
+     0x00000078,  // ......****...
+     0x000003C0,  // ...****......
+     0x00000F00,  // .****........
+     0x00000800,  // .*...........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00003F00,  // .........******........
+     0x0001FFE0,  // ......************.....
+     0x0003C0F0,  // .....****......****....
+     0x00070038,  // ....***..........***...
+     0x000E001C,  // ...***............***..
+     0x001C1E8C,  // ..***.....****.*...**..
+     0x00187FCE,  // ..**....*********..***.
+     0x0018E1C6,  // ..**...***....***...**.
+     0x0030C186,  // .**....**.....**....**.
+     0x00318186,  // .**...**......**....**.
+     0x00318186,  // .**...**......**....**.
+     0x0031830C,  // .**...**.....**....**..
+     0x0031830C,  // .**...**.....**....**..
+     0x0039C718,  // .***..***...***...**...
+     0x0018FFF0,  // ..**...************....
+     0x001C71E0,  // ..***...***...****.....
+     0x000E0000,  // ...***.................
+     0x00078000,  // ....****...............
+     0x0003FF80,  // .....***********.......
+     0x00007F00,  // ........*******........
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 65
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 68
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006070,  // ..**......***....
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 69
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E018,  // ..***........**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x000181FC,  // .**......*******..
+     0x000181FC,  // .**......*******..
+     0x0001800C,  // .**...........**..
+     0x0001C00C,  // .***..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x0000703C,  // ...***......****..
+     0x00003FEC,  // ....*********.**..
+     0x00000FC4,  // ......******...*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 72
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00007FFC,  // ..*************..
+     0x00007FFC,  // ..*************..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 73
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000C0C,  // **......**..
+     0x00000C0C,  // **......**..
+     0x00000E1C,  // ***....***..
+     0x000007F8,  // .********...
+     0x000003F0,  // ..******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 75
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001BC0,  // ..**.****......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001807,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 77
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x0001C01C,  // ..***.........***..
+     0x0001C01C,  // ..***.........***..
+     0x0001E01C,  // ..****........***..
+     0x0001E03C,  // ..****.......****..
+     0x0001E03C,  // ..****.......****..
+     0x0001B02C,  // ..**.**......*.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001984C,  // ..**..**....*..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x00018C8C,  // ..**...**..*...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x0001878C,  // ..**....****...**..
+     0x0001870C,  // ..**....***....**..
+     0x0001870C,  // ..**....***....**..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 78
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 79
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C04C,  // ..**.......*..**..
+     0x0000E0FC,  // ..***.....******..
+     0x00007078,  // ...***.....****...
+     0x00003FF8,  // ....***********...
+     0x00000FCE,  // ......******..***.
+     0x00000004,  // ...............*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007FE0,  // ..**********.....
+     0x00007FF8,  // ..************...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00007FF0,  // ..***********....
+     0x00007FF8,  // ..************...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 83
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 86
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003007,  // .**.........***
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001C0C,  // ..***......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E18,  // ...***....**...
+     0x00000618,  // ....**....**...
+     0x00000638,  // ....**...***...
+     0x00000730,  // ....***..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     22, 27,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00180C06,  // .**.......**.......**.
+     0x00181C06,  // .**......***.......**.
+     0x00181E0E,  // .**......****.....***.
+     0x001C1E0E,  // .***.....****.....***.
+     0x000C1E0C,  // ..**.....****.....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000E331C,  // ..***...**..**...***..
+     0x00066318,  // ...**..**...**...**...
+     0x00066198,  // ...**..**....**..**...
+     0x00066198,  // ...**..**....**..**...
+     0x000761B8,  // ...***.**....**.***...
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0E0,  // ....****......***.....
+     0x00018060,  // .....**........**.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003806,  // .***........**.
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000638,  // ....**...***...
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000730,  // ....***..**....
+     0x00000E38,  // ...***...***...
+     0x00000C1C,  // ...**.....***..
+     0x00001C0C,  // ..***......**..
+     0x0000380E,  // .***.......***.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 91
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+  },
+  {             // 92
+     7, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000040,  // *......
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 93
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+  },
+  {             // 94
+     11, 27,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D0,  // ...**.*....
+     0x000000D8,  // ...**.**...
+     0x00000088,  // ...*...*...
+     0x0000018C,  // ..**...**..
+     0x0000010C,  // ..*....**..
+     0x00000304,  // .**.....*..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 95
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x00000000,  // ..............
+  },
+  {             // 96
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 97
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 98
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 99
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 100
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 101
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 102
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x000003E0,  // ...*****.....
+  },
+  {             // 104
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 106
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
+  },
+  {             // 107
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000007E0,  // .******.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000638,  // .**...***...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 108
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 109
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x0001BE7C,  // ..**.*****..*****..
+     0x0001FFFE,  // ..****************.
+     0x0001C386,  // ..***....***....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 110
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 111
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 112
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+  },
+  {             // 113
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003EC,  // ...*****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+  },
+  {             // 114
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000E,  // ....***.
+     0x0000003E,  // ..*****.
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 115
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 116
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 118
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E06,  // ***......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000070C,  // .***....**..
+     0x0000031C,  // ..**...***..
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 119
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00018306,  // **.....**.....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C78E,  // .**...****...***.
+     0x0000C78C,  // .**...****...**..
+     0x0000C6CC,  // .**...**.**..**..
+     0x000064CC,  // ..**..*..**..**..
+     0x00006CD8,  // ..**.**..**.**...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00002C78,  // ...*.**...****...
+     0x00003878,  // ...***....****...
+     0x00003870,  // ...***....***....
+     0x00003870,  // ...***....***....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 120
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x0000070C,  // .***....**..
+     0x0000060E,  // .**.....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
+  },
+  {             // 122
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 123
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000038,  // ..***...
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+  },
+  {             // 124
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+  },
+  {             // 125
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000060,  // .**.....
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+  },
+  {             // 126
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000380,  // ...***.......
+     0x000007C6,  // ..*****...**.
+     0x0000047E,  // ..*...******.
+     0x0000001C,  // ........***..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 127
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     0, 27,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 161
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+  },
+  {             // 162
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000072C,  // ..***..*.**..
+     0x00000E26,  // .***...*..**.
+     0x00000C20,  // .**....*.....
+     0x00000C20,  // .**....*.....
+     0x00000C40,  // .**...*......
+     0x00000C40,  // .**...*......
+     0x00000C46,  // .**...*...**.
+     0x0000064E,  // ..**..*..***.
+     0x0000075C,  // ..***.*.***..
+     0x000003F8,  // ...*******...
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 163
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x00000700,  // ..***........
+     0x00000FE0,  // .*******.....
+     0x00000FA0,  // .*****.*.....
+     0x00000380,  // ...***.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000600,  // ..**.........
+     0x00000FFE,  // .***********.
+     0x00000FFC,  // .**********..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 164
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000007E0,  // ......******.....
+     0x00001FFC,  // ....***********..
+     0x0000781E,  // ..****......****.
+     0x00007006,  // ..***.........**.
+     0x00007006,  // ..***.........**.
+     0x0001FF00,  // *********........
+     0x0001FF00,  // *********........
+     0x0000E000,  // .***.............
+     0x0000E000,  // .***.............
+     0x0000E000,  // .***.............
+     0x0001FF00,  // *********........
+     0x0001FF00,  // *********........
+     0x00007006,  // ..***.........**.
+     0x0000781E,  // ..****......****.
+     0x0000781E,  // ..****......****.
+     0x00001FFC,  // ....***********..
+     0x000007E0,  // ......******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 165
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000618,  // ..**....**...
+     0x00000310,  // ...**...*....
+     0x00000130,  // ....*..**....
+     0x000001E0,  // ....****.....
+     0x00000EFC,  // .***.******..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 166
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+  },
+  {             // 167
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000F0,  // .....****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000700,  // ..***........
+     0x000003C0,  // ...****......
+     0x000006F0,  // ..**.****....
+     0x00000C78,  // .**...****...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000E06,  // .***......**.
+     0x00000706,  // ..***.....**.
+     0x000003CC,  // ...****..**..
+     0x000000F8,  // .....*****...
+     0x00000070,  // ......***....
+     0x00000038,  // .......***...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000718,  // ..***...**...
+     0x000003F0,  // ...******....
+     0x000001E0,  // ....****.....
+  },
+  {             // 168
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC6,  // ......******...**.
+     0x00003FF4,  // ....**********.*..
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C02C,  // ..**........*.**..
+     0x0001C04E,  // .***.......*..***.
+     0x000180C6,  // .**.......**...**.
+     0x00018186,  // .**......**....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018606,  // .**....**......**.
+     0x00018C06,  // .**...**.......**.
+     0x00019806,  // .**..**........**.
+     0x0000F00C,  // ..****........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x0001FFF0,  // .*************....
+     0x00011FC0,  // .*...*******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 169
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000E38C,  // ..***...***...**..
+     0x0001C7C6,  // .***...*****...**.
+     0x00018C66,  // .**...**...**..**.
+     0x00031823,  // **...**.....*...**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031833,  // **...**.....**..**
+     0x00018C63,  // .**...**...**...**
+     0x00018FE6,  // .**...*******..**.
+     0x0000C3CE,  // ..**....****..***.
+     0x0000703C,  // ...***......****..
+     0x00003FF8,  // ....***********...
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 170
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x0000000C,  // .....**..
+     0x0000003C,  // ...****..
+     0x000000CC,  // .**..**..
+     0x000000CC,  // .**..**..
+     0x000000FE,  // .*******.
+     0x00000076,  // ..***.**.
+     0x000000FC,  // .******..
+     0x000000FC,  // .******..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 171
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000088,  // .....*...*...
+     0x00000188,  // ....**...*...
+     0x00000338,  // ...**..***...
+     0x00000620,  // ..**...*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000088,  // .....*...*...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 172
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 173
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000007C,  // .*****..
+     0x0000007C,  // .*****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 174
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000FFCC,  // ..**********..**..
+     0x0001DFE6,  // .***.********..**.
+     0x00019836,  // .**..**.....**.**.
+     0x00031833,  // **...**.....**..**
+     0x00031833,  // **...**.....**..**
+     0x00031FE3,  // **...********...**
+     0x00031FF3,  // **...*********..**
+     0x00031833,  // **...**.....**..**
+     0x00019837,  // .**..**.....**.***
+     0x00019836,  // .**..**.....**.**.
+     0x0000F83E,  // ..*****.....*****.
+     0x0000703C,  // ...***......****..
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 175
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 176
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001E0,  // .....****.....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000003F0,  // ....******....
+     0x000001E0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 177
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 178
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ..****..
+     0x0000007F,  // .*******
+     0x00000043,  // .*....**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000040,  // .*......
+     0x0000007F,  // .*******
+     0x0000003F,  // ..******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ..****..
+     0x0000007E,  // .******.
+     0x00000046,  // .*...**.
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x00000006,  // .....**.
+     0x00000003,  // ......**
+     0x000000C3,  // **....**
+     0x0000007E,  // .******.
+     0x0000003C,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000022,  // ..*...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 181
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x00000FEF,  // .*******.****
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+  },
+  {             // 182
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000FF,  // ....********
+     0x000001FF,  // ...*********
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000000F6,  // ....****.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000000,  // ............
+  },
+  {             // 183
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E4,  // ....*****..*..
+     0x00000FF8,  // ..*********...
+     0x00000C18,  // ..**.....**...
+     0x0000183C,  // .**.....****..
+     0x0000184C,  // .**....*..**..
+     0x000018CC,  // .**...**..**..
+     0x0000198C,  // .**..**...**..
+     0x00001B0C,  // .**.**....**..
+     0x00001A1C,  // .**.*....***..
+     0x00000C38,  // ..**....***...
+     0x00000FF0,  // ..********....
+     0x000013E0,  // .*..*****.....
+     0x00001000,  // .*............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 185
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000008,  // ....*...
+     0x00000038,  // ..***...
+     0x00000078,  // .****...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 186
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ..****..
+     0x0000003E,  // ..*****.
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x0000003E,  // ..*****.
+     0x0000001C,  // ...***..
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 187
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000420,  // ..*....*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000198,  // ....**..**...
+     0x00000730,  // ..***..**....
+     0x00000620,  // ..**...*.....
+     0x00000420,  // ..*....*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 188
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x0001EFFE,  // ......****.***********.
+     0x0007FFFE,  // ....******************.
+     0x001E1E00,  // ..****....****.........
+     0x001C0E00,  // ..***......***.........
+     0x001C0E00,  // ..***......***.........
+     0x003C0E00,  // .****......***.........
+     0x00380E00,  // .***.......***.........
+     0x00380FFC,  // .***.......**********..
+     0x00380FFC,  // .***.......**********..
+     0x00380FFC,  // .***.......**********..
+     0x00380E00,  // .***.......***.........
+     0x003C0E00,  // .****......***.........
+     0x001C0E00,  // ..***......***.........
+     0x001E1E00,  // ..****....****.........
+     0x001E1E00,  // ..****....****.........
+     0x0007FFFE,  // ....******************.
+     0x0001EFFE,  // ......****.***********.
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 189
+     21, 27,
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x0001F9F0,  // ....******..*****....
+     0x0007FFF8,  // ..****************...
+     0x00070E0E,  // ..***....***.....***.
+     0x000E060E,  // .***......**.....***.
+     0x000E060E,  // .***......**.....***.
+     0x000E07FE,  // .***......**********.
+     0x000E0600,  // .***......**.........
+     0x000E0600,  // .***......**.........
+     0x00070F8E,  // ..***....*****...***.
+     0x00070F8E,  // ..***....*****...***.
+     0x0007FFFE,  // ..******************.
+     0x0001F9F0,  // ....******..*****....
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+     0x00000000,  // .....................
+  },
+  {             // 190
+     17, 27,
+     0x00000000,  // .................
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000C60,  // .....**...**.....
+     0x00000000,  // .................
+     0x0000E006,  // .***..........**.
+     0x0000E006,  // .***..........**.
+     0x0000701C,  // ..***.......***..
+     0x0000701C,  // ..***.......***..
+     0x0000701C,  // ..***.......***..
+     0x00001838,  // ....**.....***...
+     0x00001838,  // ....**.....***...
+     0x00000C60,  // .....**...**.....
+     0x000007C0,  // ......*****......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 191
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E1C,  // ..***....***..
+     0x000007F8,  // ...********...
+     0x000003E0,  // ....*****.....
+  },
+  {             // 192
+     15, 27,
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000080,  // .......*.......
+     0x00000040,  // ........*......
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 27,
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 27,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000230,  // .....*...**....
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 27,
+     0x00000000,  // ...............
+     0x00000390,  // .....***..*....
+     0x000007F0,  // ....*******....
+     0x00000020,  // .........*.....
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 27,
+     0x00000000,  // ...............
+     0x00000370,  // .....**.***....
+     0x00000370,  // .....**.***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 27,
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000120,  // ......*..*.....
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x0000FFFC,  // .......**************..
+     0x0000FFFC,  // .......**************..
+     0x00018C00,  // ......**...**..........
+     0x00018C00,  // ......**...**..........
+     0x00030C00,  // .....**....**..........
+     0x00030C00,  // .....**....**..........
+     0x00070C00,  // ....***....**..........
+     0x00060FFC,  // ....**.....**********..
+     0x00060FFC,  // ....**.....**********..
+     0x000C0C00,  // ...**......**..........
+     0x000FFC00,  // ...**********..........
+     0x001FFC00,  // ..***********..........
+     0x00180C00,  // ..**.......**..........
+     0x00180C00,  // ..**.......**..........
+     0x00380C00,  // .***.......**..........
+     0x00300FFE,  // .**........***********.
+     0x00700FFE,  // ***........***********.
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 199
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003018,  // ...**.......**...
+     0x00003C78,  // ...****...****...
+     0x00000FF0,  // .....********....
+     0x00000100,  // ........*........
+     0x00000380,  // .......***.......
+     0x000001C0,  // ........***......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
+  },
+  {             // 200
+     15, 27,
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000040,  // ........*......
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 27,
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 27,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000320,  // .....**..*.....
+     0x00000230,  // .....*...**....
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 27,
+     0x00000000,  // ...............
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     6, 27,
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 27,
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     7, 27,
+     0x00000018,  // ..**...
+     0x0000003C,  // .****..
+     0x00000026,  // .*..**.
+     0x00000062,  // **...*.
+     0x00000000,  // .......
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 207
+     6, 27,
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     16, 27,
+     0x00000C30,  // ....**....**....
+     0x00000660,  // .....**..**.....
+     0x000003C0,  // ......****......
+     0x000003C0,  // ......****......
+     0x00000000,  // ................
+     0x000007E0,  // .....******.....
+     0x00003FFC,  // ..************..
+     0x0000781E,  // .****......****.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x00007800,  // .****...........
+     0x00003F80,  // ..*******.......
+     0x000007E0,  // .....******.....
+     0x0000007C,  // .........*****..
+     0x0000007C,  // .........*****..
+     0x0000001E,  // ...........****.
+     0x0000000E,  // ............***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00003FFC,  // ..************..
+     0x00000FE0,  // ....*******.....
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 209
+     17, 27,
+     0x00000000,  // .................
+     0x00000760,  // ......***.**.....
+     0x00000FE0,  // .....*******.....
+     0x000000C0,  // .........**......
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 210
+     18, 27,
+     0x00000C00,  // ......**..........
+     0x00000600,  // .......**.........
+     0x00000300,  // ........**........
+     0x00000100,  // .........*........
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 211
+     18, 27,
+     0x000000C0,  // ..........**......
+     0x00000180,  // .........**.......
+     0x00000300,  // ........**........
+     0x00000200,  // ........*.........
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 212
+     18, 27,
+     0x00000300,  // ........**........
+     0x00000780,  // .......****.......
+     0x00000480,  // .......*..*.......
+     0x00000840,  // ......*....*......
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 213
+     18, 27,
+     0x00000000,  // ..................
+     0x00000E60,  // ......***..**.....
+     0x00000FC0,  // ......******......
+     0x000000C0,  // ..........**......
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 214
+     18, 27,
+     0x00000000,  // ..................
+     0x00000CC0,  // ......**..**......
+     0x00000CC0,  // ......**..**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 215
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000204,  // ...*......*..
+     0x0000070C,  // ..***....**..
+     0x00000398,  // ...***..**...
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x000000F0,  // .....****....
+     0x000001B8,  // ....**.***...
+     0x0000031C,  // ...**...***..
+     0x0000020C,  // ...*.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 216
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC6,  // ......******...**.
+     0x00003FF4,  // ....**********.*..
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C02C,  // ..**........*.**..
+     0x0001C04E,  // .***.......*..***.
+     0x000180C6,  // .**.......**...**.
+     0x00018186,  // .**......**....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018606,  // .**....**......**.
+     0x00018C06,  // .**...**.......**.
+     0x00019806,  // .**..**........**.
+     0x0000F00C,  // ..****........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x0001FFF0,  // .*************....
+     0x00011FC0,  // .*...*******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 217
+     17, 27,
+     0x00000E00,  // .....***.........
+     0x00000600,  // ......**.........
+     0x00000300,  // .......**........
+     0x00000180,  // ........**.......
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 218
+     17, 27,
+     0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
+     0x00000100,  // ........*........
+     0x00000200,  // .......*.........
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 219
+     17, 27,
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x00000C40,  // .....**...*......
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 220
+     17, 27,
+     0x00000000,  // .................
+     0x00000EC0,  // .....***.**......
+     0x00000EC0,  // .....***.**......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 221
+     15, 27,
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 27,
+     0x00000618,  // ....**....**...
+     0x00000330,  // .....**..**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x00000000,  // ...............
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x0000000E,  // ...........***.
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00001C00,  // ..***..........
+     0x00003800,  // .***...........
+     0x00003800,  // .***...........
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 223
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000003F8,  // ....*******...
+     0x0000071C,  // ...***...***..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000061C,  // ...**....***..
+     0x00000670,  // ...**..***....
+     0x00000678,  // ...**..****...
+     0x0000060C,  // ...**.....**..
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x0000060C,  // ...**.....**..
+     0x0000067C,  // ...**..*****..
+     0x00000670,  // ...**..***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 224
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 225
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 226
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 227
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 228
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x00000120,  // ....*..*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 230
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0000F9F8,  // ....*****..******...
+     0x0003FFFC,  // ..****************..
+     0x0003070E,  // ..**.....***....***.
+     0x00020606,  // ..*......**......**.
+     0x00000E06,  // ........***......**.
+     0x0001FFFE,  // ...****************.
+     0x0003F7FE,  // ..******.**********.
+     0x00070600,  // .***.....**.........
+     0x00060606,  // .**......**......**.
+     0x00060F0E,  // .**.....****....***.
+     0x0007FBFC,  // .********.********..
+     0x0003E1F8,  // ..*****....******...
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 231
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x0000039C,  // ..***..***..
+     0x000001F8,  // ...******...
+     0x00000040,  // .....*......
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
+  },
+  {             // 232
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 233
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 234
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000000B0,  // .....*.**....
+     0x00000190,  // ....**..*....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 235
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001B8,  // ....**.***...
+     0x000001B8,  // ....**.***...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 236
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 237
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 238
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ..***.
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 239
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 240
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000039C,  // ..***..***..
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 241
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 242
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 243
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 244
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 245
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 246
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 247
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 248
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E4,  // ....*****..*..
+     0x00000FF8,  // ..*********...
+     0x00000C18,  // ..**.....**...
+     0x0000183C,  // .**.....****..
+     0x0000184C,  // .**....*..**..
+     0x000018CC,  // .**...**..**..
+     0x0000198C,  // .**..**...**..
+     0x00001B0C,  // .**.**....**..
+     0x00001A1C,  // .**.*....***..
+     0x00000C38,  // ..**....***...
+     0x00000FF0,  // ..********....
+     0x000013E0,  // .*..*****.....
+     0x00001000,  // .*............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 249
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000380,  // ...***.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 250
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // ......***....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 251
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 252
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000370,  // ...**.***....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 253
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000038,  // ......***...
+     0x00000070,  // .....***....
+     0x00000040,  // .....*......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
+  },
+  {             // 254
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000039C,  // ..***..***..
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 255
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001B8,  // ...**.***...
+     0x000001B8,  // ...**.***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
+  },
+  };
diff --git a/fontsml-iso8859-13.c b/fontsml-iso8859-13.c
new file mode 100644
index 000000000..061b5cce0
--- /dev/null
+++ b/fontsml-iso8859-13.c
@@ -0,0 +1,5602 @@
+cFont::tPixelData FontSml_iso8859_13[][24] = {
+  {             // 32
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 33
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 35
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 36
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000010,  // .....*....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000196,  // .**..*.**.
+     0x00000190,  // .**..*....
+     0x000001D0,  // .***.*....
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000001E,  // .....****.
+     0x00000013,  // .....*..**
+     0x00000193,  // .**..*..**
+     0x000001D7,  // .***.*.***
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000010,  // .....*....
+     0x00000010,  // .....*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 37
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00003C30,  // ..****....**....
+     0x00006660,  // .**..**..**.....
+     0x00006660,  // .**..**..**.....
+     0x000066C0,  // .**..**.**......
+     0x000066C0,  // .**..**.**......
+     0x00003D80,  // ..****.**.......
+     0x00000180,  // .......**.......
+     0x0000033C,  // ......**..****..
+     0x00000366,  // ......**.**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000C66,  // ....**...**..**.
+     0x00000C3C,  // ....**....****..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 38
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003C0,  // ...****......
+     0x000007E0,  // ..******.....
+     0x00000660,  // ..**..**.....
+     0x00000660,  // ..**..**.....
+     0x000003C0,  // ...****......
+     0x000007C0,  // ..*****......
+     0x00000EEC,  // .***.***.**..
+     0x00000C6C,  // .**...**.**..
+     0x00000C3C,  // .**....****..
+     0x00000C38,  // .**....***...
+     0x00000E7C,  // .***..*****..
+     0x000007EE,  // ..******.***.
+     0x000003C7,  // ...****...***
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 39
+     3, 22,
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+  },
+  {             // 40
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+  },
+  {             // 41
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000010,  // .*....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000010,  // .*....
+  },
+  {             // 42
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000008,  // ...*...
+     0x0000002A,  // .*.*.*.
+     0x0000003E,  // .*****.
+     0x00000008,  // ...*...
+     0x0000003E,  // .*****.
+     0x0000002A,  // .*.*.*.
+     0x00000008,  // ...*...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 43
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 44
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 45
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // *****. added by hand to avoid flickering!!!
+     0x0000003E,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 46
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 48
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 49
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // .....**...
+     0x000000F8,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 50
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000006,  // .......**.
+     0x0000000E,  // ......***.
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 51
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000000C,  // ......**..
+     0x00000038,  // ....***...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 52
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x0000001C,  // .....***..
+     0x0000003C,  // ....****..
+     0x0000006C,  // ...**.**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000018C,  // .**...**..
+     0x0000030C,  // **....**..
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 53
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001F8,  // .******...
+     0x000001FC,  // .*******..
+     0x0000018E,  // .**...***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 54
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 55
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 56
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 57
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 58
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 59
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 60
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000006,  // .......**.
+     0x0000001E,  // .....****.
+     0x00000078,  // ...****...
+     0x000000E0,  // ..***.....
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000001E,  // .....****.
+     0x00000006,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 61
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x00000000,  // ...........
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 62
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000180,  // .**.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000180,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 63
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 64
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000381C,  // ....***......***..
+     0x0000600C,  // ...**.........**..
+     0x0000C7A6,  // ..**...****.*..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x00018C66,  // .**...**...**..**.
+     0x000198C6,  // .**..**...**...**.
+     0x000198CC,  // .**..**...**..**..
+     0x000198CC,  // .**..**...**..**..
+     0x00019998,  // .**..**..**..**...
+     0x00019FF0,  // .**..*********....
+     0x0000CEE0,  // ..**..***.***.....
+     0x0000E000,  // ..***.............
+     0x00007000,  // ...***............
+     0x00003FE0,  // ....*********.....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+  },
+  {             // 65
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 66
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C18,  // .**.....**...
+     0x00000FF8,  // .*********...
+     0x00000FFC,  // .**********..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x00000FFC,  // .**********..
+     0x00000FF8,  // .*********...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 67
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 68
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 69
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 70
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 71
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003F0,  // .....******....
+     0x00000FFC,  // ...**********..
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000303E,  // .**......*****.
+     0x0000303E,  // .**......*****.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFE,  // ...***********.
+     0x000003F6,  // .....******.**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001FFC,  // .***********..
+     0x00001FFC,  // .***********..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 73
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000030C,  // **....**..
+     0x0000030C,  // **....**..
+     0x0000039C,  // ***..***..
+     0x000001F8,  // .******...
+     0x000000F0,  // ..****....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 75
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C0E,  // ..**......***.
+     0x00000C1C,  // ..**.....***..
+     0x00000C38,  // ..**....***...
+     0x00000C70,  // ..**...***....
+     0x00000CE0,  // ..**..***.....
+     0x00000DC0,  // ..**.***......
+     0x00000F80,  // ..*****.......
+     0x00000FC0,  // ..******......
+     0x00000CE0,  // ..**..***.....
+     0x00000C70,  // ..**...***....
+     0x00000C38,  // ..**....***...
+     0x00000C1C,  // ..**.....***..
+     0x00000C0E,  // ..**......***.
+     0x00000C07,  // ..**.......***
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 76
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 77
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00006C36,  // .**.**....**.**.
+     0x00006C36,  // .**.**....**.**.
+     0x00006666,  // .**..**..**..**.
+     0x00006666,  // .**..**..**..**.
+     0x00006246,  // .**...*..*...**.
+     0x000063C6,  // .**...****...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 78
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 79
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007F8,  // ..********...
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000060E,  // ..**.....***.
+     0x000007FC,  // ..*********..
+     0x000007F8,  // ..********...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 81
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000386E,  // .***....**.***.
+     0x0000186C,  // ..**....**.**..
+     0x00001C3C,  // ..***....****..
+     0x00000FF8,  // ...*********...
+     0x000003EC,  // .....*****.**..
+     0x0000000C,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
+     0x00001818,  // .**......**...
+     0x00001818,  // .**......**...
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 83
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // ....****.....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x00000038,  // .......***...
+     0x0000001C,  // ........***..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 84
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 86
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 87
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018786,  // .**....****....**.
+     0x0000C78C,  // ..**...****...**..
+     0x0000C48C,  // ..**...*..*...**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006858,  // ...**.*....*.**...
+     0x00003870,  // ....***....***....
+     0x00003030,  // ....**......**....
+     0x00003030,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 88
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 89
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 90
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 91
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+  },
+  {             // 92
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 93
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+  },
+  {             // 94
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000010,  // ....*....
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 95
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
+  },
+  {             // 96
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 97
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 98
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 99
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 101
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 102
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x00000070,  // ....***....
+  },
+  {             // 104
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 105
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 106
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
+  },
+  {             // 107
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C6,  // .**...**.
+     0x000000CC,  // .**..**..
+     0x000000D8,  // .**.**...
+     0x000000F0,  // .****....
+     0x000000F8,  // .*****...
+     0x000000D8,  // .**.**...
+     0x000000CC,  // .**..**..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 108
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 109
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006F3C,  // .**.****..****..
+     0x00007FFE,  // .**************.
+     0x000071C6,  // .***...***...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 111
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 112
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+  },
+  {             // 113
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+  },
+  {             // 114
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 115
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x00000007,  // ...***
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D2C,  // ..**.*..*.**..
+     0x00000528,  // ...*.*..*.*...
+     0x00000738,  // ...***..***...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 121
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
+  },
+  {             // 122
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000030,  // .**....
+     0x00000060,  // **.....
+     0x00000030,  // .**....
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000000C,  // ...**..
+     0x00000006,  // ....**.
+  },
+  {             // 124
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+  },
+  {             // 125
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
+  },
+  {             // 126
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000E6,  // ..***..**.
+     0x000001FE,  // .********.
+     0x0000019C,  // .**..***..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 127
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 128
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 129
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 130
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 131
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 132
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 133
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 134
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 135
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 136
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 137
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 138
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 139
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 140
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 141
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 142
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 143
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 144
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 145
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 146
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 147
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 148
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 149
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 150
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 151
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 152
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 153
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 154
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 155
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 156
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 157
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 158
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 159
+     0, 22,
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+     0x00000000,  //
+  },
+  {             // 160
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 161
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+  },
+  {             // 162
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000008,  // ......*...
+     0x00000008,  // ......*...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000D6,  // ..**.*.**.
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x000000D6,  // ..**.*.**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000020,  // ....*.....
+     0x00000020,  // ....*.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 163
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000180,  // .**.......
+     0x000000C0,  // ..**......
+     0x000001F8,  // .******...
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x00000182,  // .**.....*.
+     0x000003FE,  // *********.
+     0x0000037C,  // **.*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00003F80,  // *******.......
+     0x00003F80,  // *******.......
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00003F80,  // *******.......
+     0x00003F80,  // *******.......
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 165
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 166
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+  },
+  {             // 167
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001E0,  // .****.....
+     0x000000F8,  // ..*****...
+     0x000000DC,  // ..**.***..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000E6,  // ..***..**.
+     0x0000007C,  // ...*****..
+     0x0000001C,  // .....***..
+     0x0000000E,  // ......***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+  },
+  {             // 168
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E6,  // .....*****..**.
+     0x00000FFC,  // ...**********..
+     0x00001C18,  // ..***.....**...
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x0000360E,  // .**.**.....***.
+     0x00001C0C,  // ..***......**..
+     0x00001C1C,  // ..***.....***..
+     0x000037F8,  // .**.********...
+     0x000063E0,  // **...*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000C18,  // ...**.....**...
+     0x00001004,  // ..*.........*..
+     0x000011C4,  // ..*...***...*..
+     0x00002222,  // .*...*...*...*.
+     0x00002422,  // .*..*....*...*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002222,  // .*...*...*...*.
+     0x000011C4,  // ..*...***...*..
+     0x00001004,  // ..*.........*..
+     0x00000C18,  // ...**.....**...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ..***..
+     0x00000026,  // .*..**.
+     0x0000000E,  // ...***.
+     0x00000012,  // ..*..*.
+     0x00000036,  // .**.**.
+     0x0000001A,  // ..**.*.
+     0x00000000,  // .......
+     0x0000003E,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 171
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 172
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 173
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 174
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // ....*****.....
+     0x00000C18,  // ..**.....**...
+     0x00001004,  // .*.........*..
+     0x000013E4,  // .*..*****..*..
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x000023E2,  // *...*****...*.
+     0x00002242,  // *...*..*....*.
+     0x00002222,  // *...*...*...*.
+     0x00001214,  // .*..*....*.*..
+     0x00001004,  // .*.........*..
+     0x00000C18,  // ..**.....**...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 175
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001F,  // *****
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 176
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 177
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 178
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x0000003E,  // *****.
+     0x0000003E,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 179
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000026,  // *..**.
+     0x0000003E,  // *****.
+     0x0000001C,  // .***..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 180
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 181
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FE,  // .********.
+     0x000001B6,  // .**.**.**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+  },
+  {             // 182
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007E,  // ...******.
+     0x000000E4,  // ..***..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000000E4,  // ..***..*..
+     0x00000064,  // ...**..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+  },
+  {             // 183
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 184
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000073,  // ....***..**
+     0x000001FE,  // ..********.
+     0x0000018C,  // ..**...**..
+     0x0000031E,  // .**...****.
+     0x00000336,  // .**..**.**.
+     0x00000366,  // .**.**..**.
+     0x000003C6,  // .****...**.
+     0x0000018C,  // ..**...**..
+     0x000003FC,  // .********..
+     0x00000670,  // **..***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 185
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000003C,  // ****..
+     0x0000003C,  // ****..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 186
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
+     0x00000000,  // .......
+     0x0000003E,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 187
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 188
+     19, 22,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00003BFE,  // .....***.*********.
+     0x0000FFFE,  // ...***************.
+     0x0001C700,  // ..***...***........
+     0x00018300,  // ..**.....**........
+     0x00038300,  // .***.....**........
+     0x00030300,  // .**......**........
+     0x000303FC,  // .**......********..
+     0x000303FC,  // .**......********..
+     0x00030300,  // .**......**........
+     0x00038300,  // .***.....**........
+     0x00018300,  // ..**.....**........
+     0x0001C700,  // ..***...***........
+     0x0000FFFE,  // ...***************.
+     0x00003BFE,  // .....***.*********.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 189
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003E78,  // ...*****..****...
+     0x00007FFC,  // ..*************..
+     0x00006386,  // ..**...***....**.
+     0x0000C186,  // .**.....**....**.
+     0x0000C1FE,  // .**.....********.
+     0x0000C180,  // .**.....**.......
+     0x0000C180,  // .**.....**.......
+     0x000063C6,  // ..**...****...**.
+     0x00007FFE,  // ..**************.
+     0x00003E78,  // ...*****..****...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 190
+     14, 22,
+     0x00000000,  // ..............
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000000,  // ..............
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000001E0,  // .....****.....
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 191
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
+  },
+  {             // 192
+     13, 22,
+     0x00000300,  // ...**........
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 193
+     13, 22,
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 194
+     13, 22,
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 195
+     13, 22,
+     0x00000190,  // ....**..*....
+     0x000002D0,  // ...*.**.*....
+     0x00000260,  // ...*..**.....
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 196
+     13, 22,
+     0x00000000,  // .............
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 197
+     13, 22,
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x00000120,  // ....*..*.....
+     0x00000120,  // ....*..*.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 198
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FFE,  // ......***********.
+     0x00000FFE,  // ......***********.
+     0x00001B00,  // .....**.**........
+     0x00001B00,  // .....**.**........
+     0x00003300,  // ....**..**........
+     0x00003300,  // ....**..**........
+     0x000063FC,  // ...**...********..
+     0x000063FC,  // ...**...********..
+     0x00007F00,  // ...*******........
+     0x0000FF00,  // ..********........
+     0x0000C300,  // ..**....**........
+     0x0000C300,  // ..**....**........
+     0x000183FE,  // .**.....*********.
+     0x000183FE,  // .**.....*********.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 199
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x000000C0,  // ......**......
+     0x00000060,  // .......**.....
+     0x00000360,  // ....**.**.....
+     0x000003C0,  // ....****......
+  },
+  {             // 200
+     13, 22,
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 201
+     13, 22,
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 202
+     13, 22,
+     0x00000060,  // ......**.....
+     0x000000F0,  // .....****....
+     0x00000198,  // ....**..**...
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 203
+     13, 22,
+     0x00000000,  // .............
+     0x00000198,  // ....**..**...
+     0x00000198,  // ....**..**...
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 204
+     6, 22,
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 22,
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 22,
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000021,  // *....*
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 207
+     6, 22,
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     13, 22,
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x0000003C,  // .......****..
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 209
+     14, 22,
+     0x00000190,  // .....**..*....
+     0x000002D0,  // ....*.**.*....
+     0x00000260,  // ....*..**.....
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 210
+     15, 22,
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 22,
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 22,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000330,  // .....**..**....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 22,
+     0x00000190,  // ......**..*....
+     0x000002D0,  // .....*.**.*....
+     0x00000260,  // .....*..**.....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 22,
+     0x00000000,  // ...............
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000303,  // **......**
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000303,  // **......**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 216
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E6,  // .....*****..**.
+     0x00000FFC,  // ...**********..
+     0x00001C18,  // ..***.....**...
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x0000360E,  // .**.**.....***.
+     0x00001C0C,  // ..***......**..
+     0x00001C1C,  // ..***.....***..
+     0x000037F8,  // .**.********...
+     0x000063E0,  // **...*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     14, 22,
+     0x00000300,  // ....**........
+     0x00000180,  // .....**.......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 218
+     14, 22,
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 219
+     14, 22,
+     0x000000C0,  // ......**......
+     0x000001E0,  // .....****.....
+     0x00000330,  // ....**..**....
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 220
+     14, 22,
+     0x00000000,  // ..............
+     0x00000630,  // ...**...**....
+     0x00000630,  // ...**...**....
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 221
+     13, 22,
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 222
+     12, 22,
+     0x0000018C,  // ...**...**..
+     0x000000D8,  // ....**.**...
+     0x00000070,  // .....***....
+     0x00000000,  // ............
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 223
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DC,  // .**.***..
+     0x000000DC,  // .**.***..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DE,  // .**.****.
+     0x000000DC,  // .**.***..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 224
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 225
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 226
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 227
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 228
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ..**..**...
+     0x00000198,  // ..**..**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 229
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x00000090,  // ...*..*....
+     0x00000090,  // ...*..*....
+     0x00000060,  // ....**.....
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 230
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003F78,  // ...******.****...
+     0x000073FC,  // ..***..********..
+     0x00006186,  // ..**....**....**.
+     0x00000386,  // .......***....**.
+     0x00003FFE,  // ...*************.
+     0x00007180,  // ..***...**.......
+     0x00006180,  // ..**....**.......
+     0x000061C6,  // ..**....***...**.
+     0x000073FE,  // ..***..*********.
+     0x00003D78,  // ...****.*.****...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 231
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x000000D8,  // ..**.**...
+     0x000000F0,  // ..****....
+  },
+  {             // 232
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 233
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 234
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 235
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 236
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 237
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 238
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 239
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 240
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CC,  // .**..**..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
+     0x00000000,  // .........
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 241
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000064,  // ...**..*..
+     0x000000B4,  // ..*.**.*..
+     0x00000098,  // ..*..**...
+     0x00000000,  // ..........
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 242
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 243
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 244
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 245
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 246
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000CC,  // ...**..**..
+     0x000000CC,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 247
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 248
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000073,  // ....***..**
+     0x000001FE,  // ..********.
+     0x0000018C,  // ..**...**..
+     0x0000031E,  // .**...****.
+     0x00000336,  // .**..**.**.
+     0x00000366,  // .**.**..**.
+     0x000003C6,  // .****...**.
+     0x0000018C,  // ..**...**..
+     0x000003FC,  // .********..
+     0x00000670,  // **..***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 249
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 250
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 251
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 252
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 253
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
+  },
+  {             // 254
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000CC,  // .**..**..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
+     0x00000000,  // .........
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 255
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
+  },
+  };
diff --git a/i18n.c b/i18n.c
index 911dd2339..3d9f787aa 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.169 2005/01/09 12:17:44 kls Exp $
+ * $Id: i18n.c 1.172 2005/01/22 10:38:44 kls Exp $
  *
  * Translations provided by:
  *
@@ -121,7 +121,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-5",
     "iso8859-2",
-    "iso8859-15", // or iso8859-1 as alternative
+    "iso8859-13",
     "iso8859-1",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
@@ -1029,7 +1029,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������?",
     "Obrisati snimku?",
     "Kustutan salvestuse?",
-    "Slet optagelse",
+    "Slet optagelse?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -2302,6 +2302,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "��nen kieli ei ole valittavissa!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2311,9 +2312,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Audio k�ttesaamatu!",
+    "Ingen lyd tilg�ngelig!",
   },
   // Setup pages:
   { "OSD",
@@ -3102,6 +3102,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "K�yt� Dolby Digital -��nt�",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3111,9 +3112,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Dolby Digital kasutamine",
+    "Anvend Dolby Digital",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -3220,6 +3220,48 @@ const tI18nPhrase Phrases[] = {
     "lisa uued transponderid",
     "tilf. ny transp.",
   },
+  { "Setup.DVB$Audio languages",  // note the plural
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "��nen kielet",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "Setup.DVB$Audio language",  // note the singular
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "��nen kieli",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
     "Frekvenca preklopa (MHz)",
@@ -4639,6 +4681,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "��ni",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4648,9 +4691,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Audio",
+    "Audio",
   },
   // Miscellaneous:
   { "yes",
diff --git a/lirc.c b/lirc.c
index 8fe585ab6..dbda75c29 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.9 2004/12/19 18:05:13 kls Exp $
+ * $Id: lirc.c 1.10 2005/01/14 14:18:42 kls Exp $
  */
 
 #include "lirc.h"
@@ -40,9 +40,11 @@ cLircRemote::cLircRemote(char *DeviceName)
 
 cLircRemote::~cLircRemote()
 {
+  int fh = f;
+  f = -1;
   Cancel();
-  if (f >= 0)
-     close(f);
+  if (fh >= 0)
+     close(fh);
 }
 
 bool cLircRemote::Ready(void)
diff --git a/menu.c b/menu.c
index 6f8ef2831..a0316615b 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.334 2005/01/09 13:04:49 kls Exp $
+ * $Id: menu.c 1.337 2005/01/15 16:32:34 kls Exp $
  */
 
 #include "menu.h"
@@ -1947,7 +1947,7 @@ void cMenuSetupDVB::Setup(void)
   Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 5, updateChannelsTexts));
   Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nNumLanguages));
   for (int i = 0; i < numAudioLanguages; i++)
-     Add(new cMenuEditStraItem(tr("Setup.EPG$Audio language"),     &data.AudioLanguages[i], I18nNumLanguages, I18nLanguages()));
+      Add(new cMenuEditStraItem(tr("Setup.DVB$Audio language"),    &data.AudioLanguages[i], I18nNumLanguages, I18nLanguages()));
 
   SetCurrent(Get(current));
   Display();
@@ -2452,7 +2452,7 @@ void cMenuMain::Set(const char *Plugin)
 
   // Color buttons:
 
-  SetHelp(!replaying ? tr("Record") : NULL, cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Audio") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+  SetHelp(!replaying ? tr("Record") : NULL, tr("Audio"), replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
   lastActivity = time(NULL);
 }
@@ -3019,7 +3019,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   isyslog("record %s", fileName);
   if (MakeDirs(fileName, true)) {
      const cChannel *ch = timer->Channel();
-     recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apid(0), ch->Apid(1), ch->Dpid(0), ch->Dpid(1));
+     recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apids(), ch->Dpids(), ch->Spids());
      if (device->AttachReceiver(recorder)) {
         Recording.WriteSummary();
         cStatus::MsgRecording(device, Recording.Name());
diff --git a/pat.c b/pat.c
index a0124f7b1..48ea715f3 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.10 2004/10/16 10:01:12 kls Exp $
+ * $Id: pat.c 1.11 2005/01/16 13:54:34 kls Exp $
  */
 
 #include "pat.h"
@@ -325,9 +325,9 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Vpid = 0;
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS] = { 0 };
-        int Dpids[MAXAPIDS] = { 0 };
+        int Dpids[MAXDPIDS] = { 0 };
         char ALangs[MAXAPIDS][4] = { "" };
-        char DLangs[MAXAPIDS][4] = { "" };
+        char DLangs[MAXDPIDS][4] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
@@ -386,7 +386,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                           delete d;
                           }
                       if (dpid) {
-                         if (NumDpids < MAXAPIDS) {
+                         if (NumDpids < MAXDPIDS) {
                             Dpids[NumDpids] = dpid;
                             strn0cpy(DLangs[NumDpids], lang, 4);
                             NumDpids++;
diff --git a/receiver.c b/receiver.c
index e9efac155..2fc36c9f9 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.3 2002/07/28 15:14:49 kls Exp $
+ * $Id: receiver.c 1.4 2005/01/16 14:03:01 kls Exp $
  */
 
 #include <stdarg.h>
@@ -12,25 +12,28 @@
 #include "receiver.h"
 #include "tools.h"
 
-cReceiver::cReceiver(int Ca, int Priority, int NumPids, ...)
+cReceiver::cReceiver(int Ca, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
 {
   device = NULL;
   ca = Ca;
   priority = Priority;
-  for (int i = 0; i < MAXRECEIVEPIDS; i++)
-      pids[i] = 0;
-  if (NumPids) {
-     va_list ap;
-     va_start(ap, NumPids);
-     int n = 0;
-     while (n < MAXRECEIVEPIDS && NumPids--) {
-           if ((pids[n] = va_arg(ap, int)) != 0)
-              n++;
-           }
-     va_end(ap);
+  numPids = 0;
+  if (Pid)
+     pids[numPids++] = Pid;
+  if (Pids1) {
+     while (*Pids1 && numPids < MAXRECEIVEPIDS)
+           pids[numPids++] = *Pids1++;
      }
-  else
-     esyslog("ERROR: cReceiver called without a PID!");
+  if (Pids2) {
+     while (*Pids2 && numPids < MAXRECEIVEPIDS)
+           pids[numPids++] = *Pids2++;
+     }
+  if (Pids3) {
+     while (*Pids3 && numPids < MAXRECEIVEPIDS)
+           pids[numPids++] = *Pids3++;
+     }
+  if (numPids >= MAXRECEIVEPIDS)
+     dsyslog("too many PIDs in cReceiver");
 }
 
 cReceiver::~cReceiver()
@@ -41,11 +44,9 @@ cReceiver::~cReceiver()
 bool cReceiver::WantsPid(int Pid)
 {
   if (Pid) {
-     for (int i = 0; i < MAXRECEIVEPIDS; i++) {
+     for (int i = 0; i < numPids; i++) {
          if (pids[i] == Pid)
             return true;
-         if (!pids[i])
-            break;
          }
      }
   return false;
diff --git a/receiver.h b/receiver.h
index 8ad8bc065..959f6d61e 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 1.2 2002/07/28 11:22:01 kls Exp $
+ * $Id: receiver.h 1.3 2005/01/16 14:05:10 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -12,7 +12,7 @@
 
 #include "device.h"
 
-#define MAXRECEIVEPIDS  16 // the maximum number of PIDs per receiver
+#define MAXRECEIVEPIDS  64 // the maximum number of PIDs per receiver
 
 class cReceiver {
   friend class cDevice;
@@ -21,30 +21,32 @@ class cReceiver {
   int ca;
   int priority;
   int pids[MAXRECEIVEPIDS];
+  int numPids;
   bool WantsPid(int Pid);
 protected:
   void Detach(void);
   virtual void Activate(bool On) {}
-               // This function is called just before the cReceiver gets attached to
-               // (On == true) or detached from (On == false) a cDevice. It can be used
-               // to do things like starting/stopping a thread.
-               // It is guaranteed that Receive() will not be called before Activate(true).
+               ///< This function is called just before the cReceiver gets attached to
+               ///< (On == true) or detached from (On == false) a cDevice. It can be used
+               ///< to do things like starting/stopping a thread.
+               ///< It is guaranteed that Receive() will not be called before Activate(true).
   virtual void Receive(uchar *Data, int Length) = 0;
-               // This function is called from the cDevice we are attached to, and
-               // delivers one TS packet from the set of PIDs the cReceiver has requested.
-               // The data packet must be accepted immediately, and the call must return
-               // as soon as possible, without any unnecessary delay. Each TS packet
-               // will be delivered only ONCE, so the cReceiver must make sure that
-               // it will be able to buffer the data if necessary.
+               ///< This function is called from the cDevice we are attached to, and
+               ///< delivers one TS packet from the set of PIDs the cReceiver has requested.
+               ///< The data packet must be accepted immediately, and the call must return
+               ///< as soon as possible, without any unnecessary delay. Each TS packet
+               ///< will be delivered only ONCE, so the cReceiver must make sure that
+               ///< it will be able to buffer the data if necessary.
 public:
-  cReceiver(int Ca, int Priority, int NumPids, ...);
-               // Creates a new receiver that requires conditional access Ca and has
-               // the given Priority. NumPids defines the number of PIDs that follow
-               // this parameter. If any of these PIDs are 0, they will be silently ignored.
-               // The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
-               // Priority may be any value in the range 0..99. Negative values indicate
-               // that this cReceiver may be detached at any time (without blocking the
-               // cDevice it is attached to).
+  cReceiver(int Ca, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
+               ///< Creates a new receiver that requires conditional access Ca and has
+               ///< the given Priority. Pid is a single PID (typically the video PID), while
+               ///< Pids1...Pids3 are pointers to zero terminated lists of PIDs.
+               ///< If any of these PIDs are 0, they will be silently ignored.
+               ///< The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
+               ///< Priority may be any value in the range 0..99. Negative values indicate
+               ///< that this cReceiver may be detached at any time (without blocking the
+               ///< cDevice it is attached to).
   virtual ~cReceiver();
   };
 
diff --git a/recorder.c b/recorder.c
index ded60e8c7..dd3f4f605 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.12 2005/01/09 12:16:36 kls Exp $
+ * $Id: recorder.c 1.13 2005/01/16 12:53:17 kls Exp $
  */
 
 #include <stdarg.h>
@@ -127,8 +127,8 @@ void cFileWriter::Action(void)
   active = false;
 }
 
-cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cReceiver(Ca, Priority, Setup.UseDolbyDigital ? 5 : 3, VPid, APid1, APid2, DPid1, DPid2)
+cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
+:cReceiver(Ca, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
 ,cThread("recording")
 {
   active = false;
@@ -139,7 +139,7 @@ cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, int A
 
   ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
   ringBuffer->SetTimeouts(0, 100);
-  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2, true);
+  remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids, true);
   writer = new cFileWriter(FileName, remux);
 }
 
diff --git a/recorder.h b/recorder.h
index 2a0875dd6..70e501572 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 1.2 2004/10/10 11:22:38 kls Exp $
+ * $Id: recorder.h 1.3 2005/01/15 16:35:53 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -29,7 +29,7 @@ class cRecorder : public cReceiver, cThread {
   virtual void Receive(uchar *Data, int Length);
   virtual void Action(void);
 public:
-  cRecorder(const char *FileName, int Ca, int Priority, int VPid, int APid1, int APid2, int DPid1, int DPid2);
+  cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids);
                // Creates a new recorder that requires conditional access Ca, has
                // the given Priority and will record the given PIDs into the file FileName.
   virtual ~cRecorder();
diff --git a/recording.h b/recording.h
index a0f864f35..be1a5c44c 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.33 2004/12/26 11:47:35 kls Exp $
+ * $Id: recording.h 1.34 2005/01/16 15:11:31 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -121,8 +121,8 @@ class cRecordingUserCommand {
 //XXX+
 #define FRAMESPERSEC 25
 
-// The maximum size of a single frame:
-#define MAXFRAMESIZE  KILOBYTE(192)
+// The maximum size of a single frame (up to HDTV 1920x1080):
+#define MAXFRAMESIZE  KILOBYTE(512)
 
 // The maximum file size is limited by the range that can be covered
 // with 'int'. 4GB might be possible (if the range is considered
diff --git a/remux.c b/remux.c
index 554359c54..06fb13bd7 100644
--- a/remux.c
+++ b/remux.c
@@ -8,14 +8,296 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * $Id: remux.c 1.23 2004/12/18 13:15:02 kls Exp $
+ * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
+ * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
+ *
+ * $Id: remux.c 1.27 2005/01/23 12:56:39 kls Exp $
  */
 
 #include "remux.h"
 #include <stdlib.h>
+#include "channels.h"
 #include "thread.h"
 #include "tools.h"
 
+// --- cRepacker -------------------------------------------------------------
+
+class cRepacker {
+protected:
+  uint8_t subStreamId;
+public:
+  cRepacker(void) { subStreamId = 0; }
+  virtual ~cRepacker() {}
+  virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
+  virtual int BreakAt(const uchar *Data, int Count) = 0;
+  void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
+  };
+
+// --- cDolbyRepacker --------------------------------------------------------
+
+class cDolbyRepacker : public cRepacker {
+private:
+  static int frameSizes[];
+  uchar fragmentData[6 + 65535];
+  int fragmentLen;
+  uchar pesHeader[6 + 3 + 255 + 4 + 4];
+  int pesHeaderLen;
+  uchar chk1;
+  uchar chk2;
+  int ac3todo;
+  enum {
+    find_0b,
+    find_77,
+    store_chk1,
+    store_chk2,
+    get_length
+    } state;
+  void Reset(void);
+public:
+  cDolbyRepacker(void);
+  virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+  virtual int BreakAt(const uchar *Data, int Count);
+  };
+
+int cDolbyRepacker::frameSizes[] = {
+  // fs = 48 kHz
+    64,   64,   80,   80,   96,   96,  112,  112,  128,  128,  160,  160,  192,  192,  224,  224,
+   256,  256,  320,  320,  384,  384,  448,  448,  512,  512,  640,  640,  768,  768,  896,  896,
+  1024, 1024, 1152, 1152, 1280, 1280,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  // fs = 44.1 kHz
+    69,   70,   87,   88,  104,  105,  121,  122,  139,  140,  174,  175,  208,  209,  243,  244,
+   278,  279,  348,  349,  417,  418,  487,  488,  557,  558,  696,  697,  835,  836,  975,  976,
+  1114, 1115, 1253, 1254, 1393, 1394,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  // fs = 32 kHz
+    96,   96,  120,  120,  144,  144,  168,  168,  192,  192,  240,  240,  288,  288,  336,  336,
+   384,  384,  480,  480,  576,  576,  672,  672,  768,  768,  960,  960, 1152, 1152, 1344, 1344,
+  1536, 1536, 1728, 1728, 1920, 1920,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  //
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  };
+
+cDolbyRepacker::cDolbyRepacker(void)
+{
+  pesHeader[0] = 0x00;
+  pesHeader[1] = 0x00;
+  pesHeader[2] = 0x01;
+  pesHeader[3] = 0xBD;
+  pesHeader[4] = 0x00;
+  pesHeader[5] = 0x00;
+  Reset();
+}
+
+void cDolbyRepacker::Reset()
+{
+  state = find_0b;
+  pesHeader[6] = 0x80;
+  pesHeader[7] = 0x00;
+  pesHeader[8] = 0x00;
+  pesHeaderLen = 9;
+  ac3todo = 0;
+  chk1 = 0;
+  chk2 = 0;
+  fragmentLen = 0;
+}
+
+int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+{
+  // check for MPEG 2
+  if ((Data[6] & 0xC0) != 0x80)
+     return 0;
+  // copy header information for later use
+  if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
+     pesHeaderLen = Data[8] + 6 + 3;
+     memcpy(pesHeader, Data, pesHeaderLen);
+     }
+
+  const uchar *data = Data + pesHeaderLen;
+  int done = pesHeaderLen;
+  int todo = Count - done;
+
+  // finish remainder of ac3 frame
+  if (ac3todo > 0) {
+     int bite;
+     // enough data available to put PES packet into buffer?
+     if (ac3todo <= todo) {
+        // output a previous fragment first
+        if (fragmentLen > 0) {
+           bite = fragmentLen;
+           int n = ResultBuffer->Put(fragmentData, bite);
+           if (bite != n) {
+              Reset();
+              return done;
+              }
+           fragmentLen = 0;
+           }
+        bite = ac3todo;
+        int n = ResultBuffer->Put(data, bite);
+        if (bite != n) {
+           Reset();
+           return done + n;
+           }
+        }
+     else {
+        // copy the fragment into separate buffer for later processing
+        bite = todo;
+        if (fragmentLen + bite > (int)sizeof(fragmentData)) {
+           Reset();
+           return done;
+           }
+        memcpy(fragmentData + fragmentLen, data, bite);
+        fragmentLen += bite;
+        }
+     data += bite;
+     done += bite;
+     todo -= bite;
+     ac3todo -= bite;
+     }
+
+  // look for 0x0B 0x77 <chk1> <chk2> <frameSize>
+  while (todo > 0) {
+        switch (state) {
+          case find_0b:
+               if (*data == 0x0B)
+                  ++(int &)state;
+               data++;
+               done++;
+               todo--;
+               continue;
+          case find_77:
+               if (*data != 0x77) {
+                  state = find_0b;
+                  continue;
+                  }
+               data++;
+               done++;
+               todo--;
+               ++(int &)state;
+               continue;
+          case store_chk1:
+               chk1 = *data++;
+               done++;
+               todo--;
+               ++(int &)state;
+               continue;
+          case store_chk2:
+               chk2 = *data++;
+               done++;
+               todo--;
+               ++(int &)state;
+               continue;
+          case get_length: {
+               ac3todo = 2 * frameSizes[*data];
+               // frameSizeCode was invalid => restart searching
+               if (ac3todo <= 0) {
+                  if (chk1 == 0x0B) {
+                     if (chk2 == 0x77) {
+                        state = store_chk1;
+                        continue;
+                        }
+                     if (chk2 == 0x0B) {
+                        state = find_77;
+                        continue;
+                        }
+                     state = find_0b;
+                     continue;
+                     }
+                  if (chk2 == 0x0B) {
+                     state = find_77;
+                     continue;
+                     }
+                  state = find_0b;
+                  continue;
+                  }
+               // adjust PES packet length and output packet
+               if (subStreamId) {
+                  pesHeader[pesHeaderLen++] = subStreamId;
+                  pesHeader[pesHeaderLen++] = 0x00;
+                  pesHeader[pesHeaderLen++] = 0x00;
+                  pesHeader[pesHeaderLen++] = 0x00;
+                  }
+               int packetLen = pesHeaderLen - 6 + ac3todo;
+               pesHeader[4] = packetLen >> 8;
+               pesHeader[5] = packetLen & 0xFF;
+               pesHeader[pesHeaderLen + 0] = 0x0B;
+               pesHeader[pesHeaderLen + 1] = 0x77;
+               pesHeader[pesHeaderLen + 2] = chk1;
+               pesHeader[pesHeaderLen + 3] = chk2;
+               ac3todo -= 4;
+               int bite = pesHeaderLen + 4;
+               // enough data available to put PES packet into buffer?
+               if (ac3todo <= todo) {
+                  int n = ResultBuffer->Put(pesHeader, bite);
+                  if (bite != n) {
+                     Reset();
+                     return done;
+                     }
+                  bite = ac3todo;
+                  n = ResultBuffer->Put(data, bite);
+                  if (bite != n) {
+                     Reset();
+                     return done + n;
+                     }
+                  }
+               else {
+                  // copy the fragment into separate buffer for later processing
+                  if (fragmentLen + bite > (int)sizeof(fragmentData)) {
+                     Reset();
+                     return done;
+                     }
+                  memcpy(fragmentData + fragmentLen, pesHeader, bite);
+                  fragmentLen += bite;
+                  bite = todo;
+                  if (fragmentLen + bite > (int)sizeof(fragmentData)) {
+                     Reset();
+                     return done;
+                     }
+                  memcpy(fragmentData + fragmentLen, data, bite);
+                  fragmentLen += bite;
+                  }
+               data += bite;
+               done += bite;
+               todo -= bite;
+               ac3todo -= bite;
+               // prepare for next packet
+               pesHeader[6] = 0x80;
+               pesHeader[7] = 0x00;
+               pesHeader[8] = 0x00;
+               pesHeaderLen = 9;
+               state = find_0b;
+               }
+          }
+        }
+  return Count;
+}
+
+int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
+{
+  // enough data for test?
+  if (Count < 6 + 3)
+     return -1;
+  // check for MPEG 2
+  if ((Data[6] & 0xC0) != 0x80)
+     return -1;
+  int headerLen = Data[8] + 6 + 3;
+  // break after fragment tail?
+  if (ac3todo > 0)
+     return headerLen + ac3todo;
+  // enough data for test?
+  if (Count < headerLen + 5)
+     return -1;
+  const uchar *data = Data + headerLen;
+  // break after ac3 frame?
+  if (data[0] == 0x0B && data[1] == 0x77 && frameSizes[data[4]] > 0)
+     return headerLen + frameSizes[data[4]];
+  return -1;
+}
+
 // --- cTS2PES ---------------------------------------------------------------
 
 #include <netinet/in.h>
@@ -52,7 +334,7 @@
 #define ADAPT_FIELD    0x20
 
 #define MAX_PLENGTH  0xFFFF          // the maximum PES packet length (theoretically)
-#define MMAX_PLENGTH (8*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland
+#define MMAX_PLENGTH (64*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland or HDTV 1920x1080
 
 #define IPACKS 2048
 
@@ -64,12 +346,14 @@
 
 class cTS2PES {
 private:
+  int pid;
   int size;
   int found;
   int count;
   uint8_t *buf;
   uint8_t cid;
   uint8_t audioCid;
+  uint8_t subStreamId;
   int plength;
   uint8_t plen[2];
   uint8_t flag1;
@@ -83,6 +367,7 @@ class cTS2PES {
   int tsErrors;
   int ccErrors;
   int ccCounter;
+  cRepacker *repacker;
   static uint8_t headr[];
   void store(uint8_t *Data, int Count);
   void reset_ipack(void);
@@ -90,19 +375,25 @@ class cTS2PES {
   void write_ipack(const uint8_t *Data, int Count);
   void instant_repack(const uint8_t *Buf, int Count);
 public:
-  cTS2PES(cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid = 0x00);
+  cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid = 0x00, uint8_t SubStreamId = 0x00, cRepacker *Repacker = NULL);
   ~cTS2PES();
+  int Pid(void) { return pid; }
   void ts_to_pes(const uint8_t *Buf); // don't need count (=188)
   void Clear(void);
   };
 
 uint8_t cTS2PES::headr[] = { 0x00, 0x00, 0x01 };
 
-cTS2PES::cTS2PES(cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid)
+cTS2PES::cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid, uint8_t SubStreamId, cRepacker *Repacker)
 {
+  pid = Pid;
   resultBuffer = ResultBuffer;
   size = Size;
   audioCid = AudioCid;
+  subStreamId = SubStreamId;
+  repacker = Repacker;
+  if (repacker)
+     repacker->SetSubStreamId(subStreamId);
 
   tsErrors = 0;
   ccErrors = 0;
@@ -119,6 +410,7 @@ cTS2PES::~cTS2PES()
   if (tsErrors || ccErrors)
      dsyslog("cTS2PES got %d TS errors, %d TS continuity errors", tsErrors, ccErrors);
   free(buf);
+  delete repacker;
 }
 
 void cTS2PES::Clear(void)
@@ -128,7 +420,7 @@ void cTS2PES::Clear(void)
 
 void cTS2PES::store(uint8_t *Data, int Count)
 {
-  int n = resultBuffer->Put(Data, Count);
+  int n = repacker ? repacker->Put(resultBuffer, Data, Count) : resultBuffer->Put(Data, Count);
   if (n != Count)
      esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
 }
@@ -178,17 +470,48 @@ void cTS2PES::write_ipack(const uint8_t *Data, int Count)
      count = 6;
      }
 
-  if (count + Count < size) {
-     memcpy(buf + count, Data, Count);
-     count += Count;
+  // determine amount of data to process
+  int bite = Count;
+  if (count + bite > size)
+     bite = size - count;
+  if (repacker) {
+     int breakAt = repacker->BreakAt(buf, count);
+     // avoid memcpy of data after break location
+     if (0 <= breakAt && breakAt < count + bite) {
+        bite = breakAt - count;
+        if (bite < 0) // should never happen
+           bite = 0;
+        }
+     }
+
+  memcpy(buf + count, Data, bite);
+  count += bite;
+
+  if (repacker) {
+     // determine break location
+     int breakAt = repacker->BreakAt(buf, count);
+     if (breakAt > size) // won't fit into packet?
+        breakAt = -1;
+     if (breakAt > count) // not enough data?
+        breakAt = -1;
+     // push out data before break location
+     if (breakAt > 0) {
+        // adjust bite if above memcpy was to large
+        bite -= count - breakAt;
+        count = breakAt;
+        send_ipack();
+        // recurse for data after break location
+        if (Count - bite > 0)
+           write_ipack(Data + bite, Count - bite);
+        }
      }
-  else {
-     int rest = size - count;
-     memcpy(buf + count, Data, rest);
-     count += rest;
+
+  // push out data when buffer is full
+  if (count >= size) {
      send_ipack();
-     if (Count - rest > 0)
-        write_ipack(Data + rest, Count - rest);
+     // recurse for remaining data
+     if (Count - bite > 0)
+        write_ipack(Data + bite, Count - bite);
      }
 }
 
@@ -395,35 +718,42 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
 
 #define RESULTBUFFERSIZE KILOBYTE(256)
 
-cRemux::cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure)
+cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure)
 {
-  vPid = VPid;
-  aPid1 = APid1;
-  aPid2 = APid2;
-  dPid1 = DPid1;
-  dPid2 = DPid2;
   exitOnFailure = ExitOnFailure;
+  isRadio = VPid == 0 || VPid == 1 || VPid == 0x1FFF;
   numUPTerrors = 0;
   synced = false;
   skipped = 0;
+  numTracks = 0;
   resultSkipped = 0;
   resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
   resultBuffer->SetTimeouts(0, 100);
-  vTS2PES  =         new cTS2PES(resultBuffer, IPACKS);
-  aTS2PES1 =         new cTS2PES(resultBuffer, IPACKS, 0xC0);
-  aTS2PES2 = aPid2 ? new cTS2PES(resultBuffer, IPACKS, 0xC1) : NULL;
-  dTS2PES1 = dPid1 ? new cTS2PES(resultBuffer, IPACKS)       : NULL;
-  //XXX don't yet know how to tell apart primary and secondary DD data...
-  dTS2PES2 = /*XXX dPid2 ? new cTS2PES(resultBuffer, IPACKS) : XXX*/ NULL;
+  if (VPid)
+     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);
+  if (APids) {
+     int n = 0;
+     while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS)
+           ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n++);
+     }
+  if (DPids) {
+     int n = 0;
+     while (*DPids && numTracks < MAXTRACKS && n < MAXDPIDS)
+           ts2pes[numTracks++] = new cTS2PES(*DPids++, resultBuffer, IPACKS, 0x00, 0x80 + n++, new cDolbyRepacker);
+     }
+  /* future...
+  if (SPids) {
+     int n = 0;
+     while (*SPids && numTracks < MAXTRACKS && n < MAXSPIDS)
+           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, IPACKS, 0x00, 0x28 + n++);
+     }
+  */
 }
 
 cRemux::~cRemux()
 {
-  delete vTS2PES;
-  delete aTS2PES1;
-  delete aTS2PES2;
-  delete dTS2PES1;
-  delete dTS2PES2;
+  for (int t = 0; t < numTracks; t++)
+      delete ts2pes[t];
   delete resultBuffer;
 }
 
@@ -495,11 +825,12 @@ int cRemux::Put(const uchar *Data, int Count)
          break; // A cTS2PES might write one full packet and also a small rest
       int pid = GetPid(Data + i + 1);
       if (Data[i + 3] & 0x10) { // got payload
-         if      (pid == vPid)              vTS2PES->ts_to_pes(Data + i);
-         else if (pid == aPid1)             aTS2PES1->ts_to_pes(Data + i);
-         else if (pid == aPid2 && aTS2PES2) aTS2PES2->ts_to_pes(Data + i);
-         else if (pid == dPid1 && dTS2PES1) dTS2PES1->ts_to_pes(Data + i);
-         else if (pid == dPid2 && dTS2PES2) dTS2PES2->ts_to_pes(Data + i);
+         for (int t = 0; t < numTracks; t++) {
+             if (ts2pes[t]->Pid() == pid) {
+                ts2pes[t]->ts_to_pes(Data + i);
+                break;
+                }
+             }
          }
       used += TS_SIZE;
       }
@@ -537,7 +868,7 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
 
   // Special VPID case to enable recording radio channels:
 
-  if (vPid == 0 || vPid == 1 || vPid == 0x1FFF) {
+  if (isRadio) {
      // XXX actually '0' should be enough, but '1' must be used with encrypted channels (driver bug?)
      // XXX also allowing 0x1FFF to not break Michael Paar's original patch,
      // XXX but it would probably be best to only use '0'
@@ -615,11 +946,8 @@ void cRemux::Del(int Count)
 
 void cRemux::Clear(void)
 {
-  if (vTS2PES)  vTS2PES->Clear();
-  if (aTS2PES1) aTS2PES1->Clear();
-  if (aTS2PES2) aTS2PES2->Clear();
-  if (dTS2PES1) dTS2PES1->Clear();
-  if (dTS2PES2) dTS2PES2->Clear();
+  for (int t = 0; t < numTracks; t++)
+      ts2pes[t]->Clear();
   resultBuffer->Clear();
 }
 
diff --git a/remux.h b/remux.h
index 0475c0127..fef5980e8 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.12 2004/10/15 12:31:16 kls Exp $
+ * $Id: remux.h 1.13 2005/01/16 13:15:17 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -21,23 +21,31 @@
 #define P_FRAME    2
 #define B_FRAME    3
 
+#define MAXTRACKS 64
+
 class cTS2PES;
 
 class cRemux {
 private:
   bool exitOnFailure;
+  bool isRadio;
   int numUPTerrors;
   bool synced;
   int skipped;
-  int vPid, aPid1, aPid2, dPid1, dPid2;
-  cTS2PES *vTS2PES, *aTS2PES1, *aTS2PES2, *dTS2PES1, *dTS2PES2;
+  cTS2PES *ts2pes[MAXTRACKS];
+  int numTracks;
   cRingBufferLinear *resultBuffer;
   int resultSkipped;
   int GetPid(const uchar *Data);
   int GetPacketLength(const uchar *Data, int Count, int Offset);
   int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
 public:
-  cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
+  cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure = false);
+       ///< Creates a new remuxer for the given PIDs. VPid is the video PID, while
+       ///< APids, DPids and SPids are pointers to zero terminated lists of audio,
+       ///< dolby and subtitle PIDs (the pointers may be NULL if there is no such
+       ///< PID). If ExitOnFailure is true, the remuxer will initiate an "emergency
+       ///< exit" in case of problems with the data stream.
   ~cRemux();
   int Put(const uchar *Data, int Count);
        ///< Puts at most Count bytes of Data into the remuxer.
diff --git a/skins.c b/skins.c
index 5770bd4cb..fb21ed386 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.3 2004/11/07 09:46:46 kls Exp $
+ * $Id: skins.c 1.4 2005/01/14 13:07:19 kls Exp $
  */
 
 #include "skins.h"
@@ -130,6 +130,7 @@ cSkin::cSkin(const char *Name, cTheme *Theme)
   if (theme)
      cThemes::Save(name, theme);
   Skins.Add(this);
+  Skins.SetCurrent(Name);
 }
 
 cSkin::~cSkin()
@@ -172,6 +173,8 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
     case mtError: esyslog("ERROR: %s", s); break;
     default: ;
     }
+  if (!Current())
+     return kNone;
   if (!cSkinDisplay::Current() && !displayMessage)
      displayMessage = Current()->DisplayMessage();
   cSkinDisplay::Current()->SetMessage(Type, s);
diff --git a/thread.c b/thread.c
index fe3359bf2..eb009f146 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.40 2004/12/19 10:43:14 kls Exp $
+ * $Id: thread.c 1.41 2005/01/14 13:59:48 kls Exp $
  */
 
 #include "thread.h"
@@ -36,7 +36,7 @@ cCondWait::~cCondWait()
 void cCondWait::SleepMs(int TimeoutMs)
 {
   cCondWait w;
-  w.Wait(TimeoutMs);
+  w.Wait(max(TimeoutMs, 3)); // making sure the time is >2ms to avoid a possible busy wait
 }
 
 bool cCondWait::Wait(int TimeoutMs)
diff --git a/thread.h b/thread.h
index 6e096a64a..2c0ebcba0 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.26 2004/12/19 10:43:10 kls Exp $
+ * $Id: thread.h 1.27 2005/01/14 14:02:14 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -26,6 +26,8 @@ class cCondWait {
        ///< Creates a cCondWait object and uses it to sleep for TimeoutMs
        ///< milliseconds, immediately giving up the calling thread's time
        ///< slice and thus avoiding a "busy wait".
+       ///< In order to avoid a possible busy wait, TimeoutMs will be automatically
+       ///< limited to values >2.
   bool Wait(int TimeoutMs = 0);
        ///< Waits at most TimeoutMs milliseconds for a call to Signal(), or
        ///< forever if TimeoutMs is 0.
diff --git a/tools.c b/tools.c
index af2a73c3a..2f130c78a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.87 2005/01/04 11:06:45 kls Exp $
+ * $Id: tools.c 1.88 2005/01/16 11:47:44 kls Exp $
  */
 
 #include "tools.h"
@@ -65,6 +65,30 @@ void writechar(int filedes, char c)
   safe_write(filedes, &c, sizeof(c));
 }
 
+int WriteAllOrNothing(int fd, const uchar *Data, int Length, int TimeoutMs, int RetryMs)
+{
+  int written = 0;
+  while (Length > 0) {
+        int w = write(fd, Data + written, Length);
+        if (w > 0) {
+           Length -= w;
+           written += w;
+           }
+        else if (written > 0 && !FATALERRNO) {
+           // we've started writing, so we must finish it!
+           cTimeMs t;
+           cPoller Poller(fd, true);
+           Poller.Poll(RetryMs);
+           if (TimeoutMs > 0 && (TimeoutMs -= t.Elapsed()) <= 0)
+              break;
+           }
+        else
+           // nothing written yet (or fatal error), so we can just return the error code:
+           return w;
+        }
+  return written;
+}
+
 char *strcpyrealloc(char *dest, const char *src)
 {
   if (src) {
diff --git a/tools.h b/tools.h
index 621e589ba..9067eb8d4 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.64 2005/01/04 11:09:51 kls Exp $
+ * $Id: tools.h 1.65 2005/01/16 11:39:58 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -71,6 +71,10 @@ class cString {
 ssize_t safe_read(int filedes, void *buffer, size_t size);
 ssize_t safe_write(int filedes, const void *buffer, size_t size);
 void writechar(int filedes, char c);
+int WriteAllOrNothing(int fd, const uchar *Data, int Length, int TimeoutMs = 0, int RetryMs = 0);
+    ///< Writes either all Data to the given file descriptor, or nothing at all.
+    ///< If TimeoutMs is greater than 0, it will only retry for that long, otherwise
+    ///< it will retry forever. RetryMs defines the time between two retries.
 char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
diff --git a/transfer.c b/transfer.c
index 4a54da4fe..b3cbec45d 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.22 2005/01/07 15:44:30 kls Exp $
+ * $Id: transfer.c 1.25 2005/01/23 14:27:40 kls Exp $
  */
 
 #include "transfer.h"
@@ -14,13 +14,13 @@
 
 // --- cTransfer -------------------------------------------------------------
 
-cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cReceiver(0, -1, 5, VPid, APid1, APid2, DPid1, DPid2)
+cTransfer::cTransfer(int VPid, const int *APids, const int *DPids, const int *SPids)
+:cReceiver(0, -1, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
 ,cThread("transfer")
 {
   ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
-  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
-  needsBufferReserve = VPid != 0 && DPid1 != 0;
+  remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids);
+  needsBufferReserve = Setup.UseDolbyDigital && VPid != 0 && DPids && DPids[0] != 0;
   active = false;
 }
 
@@ -80,7 +80,7 @@ void cTransfer::Action(void)
            //XXX To resolve this, the remuxer or PlayPes() should synchronize
            //XXX audio with the video frames. 2004/09/09 Werner
            if (!GotBufferReserve) {
-              if (ringBuffer->Available() < 3 * MAXFRAMESIZE / 2) {
+              if (ringBuffer->Available() < 3 * KILOBYTE(192) / 2) { // used to be MAXFRAMESIZE, but the HDTV value of KILOBYTE(512) is way too much here
                  cCondWait::SleepMs(20); // allow the buffer to collect some reserve
                  continue;
                  }
@@ -100,6 +100,7 @@ void cTransfer::Action(void)
               dsyslog("clearing transfer buffer to avoid overflows");
               ringBuffer->Clear();
               remux->Clear();
+              PlayPes(NULL, 0);
               p = NULL;
               continue;
               }
@@ -143,8 +144,8 @@ void cTransfer::Action(void)
 
 cDevice *cTransferControl::receiverDevice = NULL;
 
-cTransferControl::cTransferControl(cDevice *ReceiverDevice, int VPid, int APid1, int APid2, int DPid1, int DPid2)
-:cControl(transfer = new cTransfer(VPid, APid1, APid2, DPid1, DPid2), true)
+cTransferControl::cTransferControl(cDevice *ReceiverDevice, int VPid, const int *APids, const int *DPids, const int *SPids)
+:cControl(transfer = new cTransfer(VPid, APids, DPids, SPids), true)
 {
   ReceiverDevice->AttachReceiver(transfer);
   receiverDevice = ReceiverDevice;
diff --git a/transfer.h b/transfer.h
index bbe53a5b2..70bbeb76c 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.8 2005/01/07 15:44:32 kls Exp $
+ * $Id: transfer.h 1.9 2005/01/15 16:39:39 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -27,7 +27,7 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
   virtual void Receive(uchar *Data, int Length);
   virtual void Action(void);
 public:
-  cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2);
+  cTransfer(int VPid, const int *APids, const int *DPids, const int *SPids);
   virtual ~cTransfer();
   };
 
@@ -36,7 +36,7 @@ class cTransferControl : public cControl {
   cTransfer *transfer;
   static cDevice *receiverDevice;
 public:
-  cTransferControl(cDevice *ReceiverDevice, int VPid, int APid1, int APid2, int DPid1, int DPid2);
+  cTransferControl(cDevice *ReceiverDevice, int VPid, const int *APids, const int *DPids, const int *SPids);
   ~cTransferControl();
   virtual void Hide(void) {}
   static cDevice *ReceiverDevice(void) { return receiverDevice; }
diff --git a/vdr.5 b/vdr.5
index 44ea3e68b..04bdb9950 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.32 2005/01/09 13:16:40 kls Exp $
+.\" $Id: vdr.5 1.34 2005/01/23 14:16:12 kls Exp $
 .\"
 .TH vdr 5 "19 Dec 2004" "1.3.18" "Video Disk Recorder Files"
 .SH NAME
@@ -559,8 +559,10 @@ The files \fI001.vdr\fR...\fI255.vdr\fR are the actual recorded MPEG data
 files. In order to keep the size of an individual file below a given limit,
 a recording is split into several files. The contents of these files is
 \fBPacketized Elementary Stream\fR (PES) and contains ES packets with ids
-0xE0 for video, 0xC0 for audio 1 and 0xC1 for audio 2 (if available).
-Dolby Digital data is stored in packets with ids 0xBD.
+0xE0...0xEF for video (only one of these may actually occur in a file),
+0xC0...0xDF for audio 1...32 (up to 32 audio tracks may occur).
+Dolby Digital data is stored in packets with ids 0xBD ("Private Stream 1")
+and substream ids 0x80...0x87.
 .SS INDEX
 The file \fIindex.vdr\fR (if present in a recording directory) contains
 the (binary) index data into each of the the recording files
diff --git a/vdr.c b/vdr.c
index 5c8237241..d1f8c4aed 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.198 2005/01/06 14:36:40 kls Exp $
+ * $Id: vdr.c 1.200 2005/01/14 16:50:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -412,7 +412,10 @@ int main(int argc, char *argv[])
         }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
         EpgDirectory = VideoDirectory;
-     cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     if (EpgDirectory)
+        cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     else
+        cSchedules::SetEpgDataFileName(EpgDataFileName);
      cSchedules::Read();
      }
 
@@ -460,15 +463,20 @@ int main(int argc, char *argv[])
 
   Interface = new cInterface(SVDRPport);
 
+  // Default skins:
+
+  new cSkinClassic;
+  new cSkinSTTNG;
+  Skins.SetCurrent(Setup.OSDSkin);
+  cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+
   // Start plugins:
 
   if (!PluginManager.StartPlugins())
      EXIT(2);
 
-  // Skins:
+  // Set skin and theme in case they're implemented by a plugin:
 
-  new cSkinClassic;
-  new cSkinSTTNG;
   Skins.SetCurrent(Setup.OSDSkin);
   cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
 

From 4d477cd144c8df2b3791b60f15337448292066fe Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Feb 2005 18:00:00 +0100
Subject: [PATCH 112/307] =?UTF-8?q?Version=201.3.20=20-=20Fixed=20displayi?=
 =?UTF-8?q?ng=20the=20"Audio"=20menu=20with=20the=20"Green"=20button=20fro?=
 =?UTF-8?q?m=20the=20"Main"=20menu=20=20=20in=20case=20there=20is=20only?=
 =?UTF-8?q?=20one=20audio=20track=20(thanks=20to=20Sascha=20Volkenandt=20f?=
 =?UTF-8?q?or=20reporting=20=20=20this=20one).=20-=20Now=20setting=20prima?=
 =?UTF-8?q?ryDevice=20=3D=20NULL=20before=20deleting=20the=20devices=20in?=
 =?UTF-8?q?=20cDevice::Shutdown()=20=20=20to=20avoid=20problems=20in=20cas?=
 =?UTF-8?q?e=20other=20threads=20access=20it=20(thanks=20to=20Wolfgang=20R?=
 =?UTF-8?q?ohdewald=20for=20=20=20pointing=20this=20out).=20-=20Fixed=20a?=
 =?UTF-8?q?=20buffer=20overflow=20in=20case=20a=20station=20defines=20all?=
 =?UTF-8?q?=2032=20audio=20PIDs=20(thanks=20to=20=20=20Christian=20Jacobse?=
 =?UTF-8?q?n=20for=20reporting=20this=20one).=20-=20Fixed=20masking=20SubS?=
 =?UTF-8?q?treamType=20in=20cDevice::PlayPesPacket()=20(thanks=20to=20Wern?=
 =?UTF-8?q?er=20Fink=20=20=20for=20pointing=20out=20this=20one).=20-=20The?=
 =?UTF-8?q?=20new=20function=20cPlugin::Stop()=20shall=20be=20used=20to=20?=
 =?UTF-8?q?stop=20any=20background=20activities=20=20=20of=20a=20plugin.?=
 =?UTF-8?q?=20Previously=20this=20was=20done=20in=20the=20plugin's=20destr?=
 =?UTF-8?q?uctor,=20but=20it=20is=20=20=20better=20to=20do=20this=20in=20a?=
 =?UTF-8?q?=20dedicated=20function=20that=20can=20be=20called=20early=20wh?=
 =?UTF-8?q?en=20shutting=20=20=20down.=20-=20Moved=20the=20call=20to=20Set?=
 =?UTF-8?q?AudioChannel(0)=20into=20cDevice::ClrAvailableTracks()=20to=20h?=
 =?UTF-8?q?ave=20it=20=20=20executed=20also=20when=20starting=20a=20replay?=
 =?UTF-8?q?.=20-=20Completed=20the=20Danish=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Mogens=20Elneff).=20-=20Completed=20the=20French=20OSD=20tex?=
 =?UTF-8?q?ts=20(thanks=20to=20Olivier=20Jacques).=20-=20The=20new=20setup?=
 =?UTF-8?q?=20option=20"OSD/Channel=20info=20time"=20can=20be=20used=20to?=
 =?UTF-8?q?=20define=20the=20time=20after=20=20=20which=20the=20channel=20?=
 =?UTF-8?q?display=20is=20removed=20if=20no=20key=20has=20been=20pressed?=
 =?UTF-8?q?=20(thanks=20to=20=20=20Olivier=20Jacques).=20-=20Modified=20cD?=
 =?UTF-8?q?olbyRepacker=20to=20make=20sure=20PES=20packets=20don't=20excee?=
 =?UTF-8?q?d=20the=20requested=20length=20=20=20(thanks=20to=20Reinhard=20?=
 =?UTF-8?q?Nissl).=20-=20Fixed=20several=20memory=20leaks=20that=20were=20?=
 =?UTF-8?q?introduced=20through=20the=20use=20of=20cString=20(thanks=20=20?=
 =?UTF-8?q?=20to=20Stefan=20Huelswitt=20for=20reporting=20these).=20-=20Ad?=
 =?UTF-8?q?ded=20CMD=5FSPU=5FCHG=5FCOLCON=20to=20cDvbSpuDecoder::setTime()?=
 =?UTF-8?q?=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Making=20?=
 =?UTF-8?q?sure=20the=20current=20audio=20track=20is=20actually=20one=20of?=
 =?UTF-8?q?=20the=20ones=20available=20in=20a=20=20=20recording=20(thanks?=
 =?UTF-8?q?=20to=20Sascha=20Volkenandt=20for=20reporting=20a=20problem=20w?=
 =?UTF-8?q?hen=20starting=20=20=20replay=20of=20a=20recording=20that=20has?=
 =?UTF-8?q?=20no=20Dolby=20Digital=20audio=20after=20switching=20to=20a=20?=
 =?UTF-8?q?channel=20=20=20that=20has=20DD=20and=20selecting=20the=20DD=20?=
 =?UTF-8?q?audio=20track).=20-=20Removed=20'flags'=20from=20tTrackId=20(th?=
 =?UTF-8?q?ought=20we=20would=20need=20this,=20but=20apparently=20we=20don?=
 =?UTF-8?q?'t).=20-=20Making=20sure=20the=20"Mute"=20and=20"Volume+/-"=20k?=
 =?UTF-8?q?eys=20don't=20interfere=20with=20digital=20audio.=20-=20Fixed?=
 =?UTF-8?q?=20the=20"pre=201.3.19"=20compatibility=20mode=20for=20old=20Do?=
 =?UTF-8?q?lby=20Digital=20recordings=20(thanks=20=20=20to=20Werner=20Fink?=
 =?UTF-8?q?=20for=20pointing=20out=20that=20this=20can=20be=20triggered=20?=
 =?UTF-8?q?in=20the=20default=20branch).=20-=20Calling=20pesAssembler->Res?=
 =?UTF-8?q?et()=20in=20cDevice::AttachPlayer()=20to=20avoid=20problems=20w?=
 =?UTF-8?q?ith=20=20=20residual=20data=20in=20replay=20and=20Transfer=20Mo?=
 =?UTF-8?q?de=20(thanks=20to=20Werner=20Fink=20for=20pointing=20this=20=20?=
 =?UTF-8?q?=20out).=20-=20Added=20MPEG1=20replay=20capability=20to=20cPesA?=
 =?UTF-8?q?ssembler=20(thanks=20to=20Stefan=20Huelswitt).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  23 ++++-
 HISTORY       |  41 ++++++++
 MANUAL        |   3 +
 PLUGINS.html  |  59 ++++++++----
 channels.c    |   4 +-
 channels.conf |   8 +-
 config.c      |   5 +-
 config.h      |   7 +-
 device.c      | 115 +++++++++++++++-------
 device.h      |  13 ++-
 dvbdevice.c   |   6 +-
 dvbspu.c      |   9 +-
 i18n.c        |  81 ++++++++++------
 menu.c        |  13 ++-
 newplugin     |   8 +-
 pat.c         |  10 +-
 player.h      |   4 +-
 plugin.c      |  30 ++++--
 plugin.h      |   8 +-
 recording.c   |   4 +-
 remux.c       | 260 ++++++++++++++++++++++++++++++--------------------
 timers.c      |   4 +-
 tools.c       |  10 +-
 tools.h       |   4 +-
 vdr.c         |   5 +-
 25 files changed, 494 insertions(+), 240 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 48b54d4c7..0c29e35b4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -190,10 +190,11 @@ Stefan Huelswitt <huels@iname.com>
  for fixing handling of pmAudioOnlyBlack
  for pointing out possible race conditions in handling childTid in cThread
  for fixing a possible race condition in cDevice::Action() and cTSBuffer::Action()
+ for reporting several memory leaks that were introduced through the use of cString
+ for adding MPEG1 replay capability to cPesAssembler
 
 Ulrich R�der <roeder@efr-net.de>
- for pointing out that there are channels that have a symbol rate higher than
- 27500
+ for pointing out that there are channels that have a symbol rate higher than 27500
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
 Mel Sch�chner <schaechner@yahoo.com>
@@ -266,6 +267,11 @@ Werner Fink <werner@suse.de>
  overhead in the firmware
  for a patch that was used as a base for implementing a modified PES packet
  handling in order to play AC3 audio over full featured DVB cards
+ for pointing out an error in masking SubStreamType in cDevice::PlayPesPacket()
+ for pointing out that the "pre 1.3.19" compatibility mode for old Dolby Digital
+ recordings can be triggered in the default branch
+ for pointing out that pesAssembler->Reset() needs to be called between subsequent
+ Transfer Modes
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -747,6 +753,11 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for reporting a bug in cChannel::SetName() in case only the ShortName or Provider
  has changed
  for fixing a possible recursion in cControl::Shutdown()
+ for reporting that the "Audio" menu is not displayed with the "Green" button from
+ the "Main" menu in case there is only one audio track
+ for reporting a problem when starting replay of a recording that has no Dolby
+ Digital audio after switching to a channel that has DD and selecting the DD audio
+ track
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -793,6 +804,7 @@ Benjamin Harling <benjamin.harling@web.de>
 Christian Jacobsen <christian.jacobsen@stageholding.de>
  for making the LIRC interface skip keys that come in too fast
  for reporting a problem in handling the '-E' options in version 1.3.18
+ for reporting a problem in case a station defines all 32 audio PIDs
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
@@ -800,6 +812,7 @@ Andreas Mair <Andreas.Mair@linogate.com>
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
+ for implementing the setup option "OSD/Channel info time"
 
 Kai Moeller <moeller.ki@gmx.de>
  for reporting a double call to MainMenuAction() of a plugin if invoked via a hotkey
@@ -911,6 +924,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for implementing cDolbyRepacker for better handling of Dolby Digital PES packets
  for extending some buffer sizes to allow handling HDTV streams
  for adding substream handling to cDolbyRepacker
+ for modifying cDolbyRepacker to make sure PES packets don't exceed the requested length
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1116,6 +1130,7 @@ Marco Schl
  for a patch that implements substream handling into cDevice::PlayPesPacket()
  for pointing out that PlayPes(NULL, 0) needs to be called in cTransfer::Action()
  when clearing the transfer buffer to avoid overflows
+ for adding CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime()
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1231,3 +1246,7 @@ Walter Koch <koch@u32.de>
 Rolf Groppe <rolf@groppe.de>
  for suggesting to fall back to 'stereo' when switching channels in case the user
  had switched to 'left' or 'right'
+
+Wolfgang Rohdewald <wolfgang@rohdewald.de>
+ for pointing out that primaryDevice = NULL should be done before deleting the devices
+ in cDevice::Shutdown()
diff --git a/HISTORY b/HISTORY
index 47255f978..2beb808dd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3332,3 +3332,44 @@ Video Disk Recorder Revision History
   cDolbyRepacker).
 - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
   to avoid overflows (thanks to Marco Schl��ler for pointing this out).
+
+2005-02-06: Version 1.3.20
+
+- Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu
+  in case there is only one audio track (thanks to Sascha Volkenandt for reporting
+  this one).
+- Now setting primaryDevice = NULL before deleting the devices in cDevice::Shutdown()
+  to avoid problems in case other threads access it (thanks to Wolfgang Rohdewald for
+  pointing this out).
+- Fixed a buffer overflow in case a station defines all 32 audio PIDs (thanks to
+  Christian Jacobsen for reporting this one).
+- Fixed masking SubStreamType in cDevice::PlayPesPacket() (thanks to Werner Fink
+  for pointing out this one).
+- The new function cPlugin::Stop() shall be used to stop any background activities
+  of a plugin. Previously this was done in the plugin's desctructor, but it is
+  better to do this in a dedicated function that can be called early when shutting
+  down.
+- Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks() to have it
+  executed also when starting a replay.
+- Completed the Danish OSD texts (thanks to Mogens Elneff).
+- Completed the French OSD texts (thanks to Olivier Jacques).
+- The new setup option "OSD/Channel info time" can be used to define the time after
+  which the channel display is removed if no key has been pressed (thanks to
+  Olivier Jacques).
+- Modified cDolbyRepacker to make sure PES packets don't exceed the requested length
+  (thanks to Reinhard Nissl).
+- Fixed several memory leaks that were introduced through the use of cString (thanks
+  to Stefan Huelswitt for reporting these).
+- Added CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime() (thanks to Marco Schl��ler).
+- Making sure the current audio track is actually one of the ones available in a
+  recording (thanks to Sascha Volkenandt for reporting a problem when starting
+  replay of a recording that has no Dolby Digital audio after switching to a channel
+  that has DD and selecting the DD audio track).
+- Removed 'flags' from tTrackId (thought we would need this, but apparently we don't).
+- Making sure the "Mute" and "Volume+/-" keys don't interfere with digital audio.
+- Fixed the "pre 1.3.19" compatibility mode for old Dolby Digital recordings (thanks
+  to Werner Fink for pointing out that this can be triggered in the default branch).
+- Calling pesAssembler->Reset() in cDevice::AttachPlayer() to avoid problems with
+  residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this
+  out).
+- Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
diff --git a/MANUAL b/MANUAL
index 7743241c3..a03f72cbf 100644
--- a/MANUAL
+++ b/MANUAL
@@ -482,6 +482,9 @@ Version 1.2
                          The position of the channel info window in the OSD
                          (either 'bottom' or 'top').
 
+  Channel info time = 5  The time (in seconds) after which the channel info display
+                         is removed if no key has been pressed.
+
   Info on channel switch = yes
                          Turns the display of the current/next information on
                          or off when switching the channel. The information is
diff --git a/PLUGINS.html b/PLUGINS.html
index e8f456a60..df6d0fad8 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.7 are marked like this.
-<!--X1.3.7--></td></tr></table>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.8 are marked like this.
 <!--X1.3.8--></td></tr></table>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.18 are marked like this.
 <!--X1.3.18--></td></tr></table>
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.19 are marked like this.
 <!--X1.3.19--></td></tr></table>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.20 are marked like this.
+<!--X1.3.20--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -58,6 +58,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line arguments">Command line arguments</a>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Shutting down">Shutting down</a>
+<!--X1.3.20--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
 <li><a href="#User interaction">User interaction</a>
 <li><a href="#Housekeeping">Housekeeping</a>
@@ -75,10 +78,8 @@ <h1>Table Of Contents</h1>
 <li><a href="#Receivers">Receivers</a>
 <li><a href="#Filters">Filters</a>
 <li><a href="#The On Screen Display">The On Screen Display</a>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
-<!--X1.3.7--></td></tr></table>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Dolby Digital">Dolby Digital</a>
 <li><a href="#Remote Control">Remote Control</a>
@@ -304,8 +305,11 @@ <h1>Table Of Contents</h1>
 since VDR, for instance, has to create the plugin objects in order to get their
 command line help - and after that immediately destroys them again.
 <p>
-The <b>destructor</b> has to clean up any data created by the plugin, and has to
-take care that any threads the plugin may have created will be stopped.
+The <b>destructor</b> has to clean up any data created by the plugin.
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Any threads the plugin may have created shall be stopped in the
+<a href="#Shutting down"><tt>Stop()</tt></a> function.
+<!--X1.3.20--></td></tr></table>
 <p>
 Of course, if your plugin doesn't define any member variables that need to be
 initialized (and deleted), you don't need to implement either of these functions.
@@ -500,6 +504,25 @@ <h1>Table Of Contents</h1>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement either of these functions.
 
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Shutting down"><hr><h2>Shutting down</h2>
+
+<center><i><b>Stop it, right there!</b></i></center><p>
+
+If a plugin performs any background tasks, it shall implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual void Stop(void);
+</pre></td></tr></table><p>
+
+in which it shall stop them.
+<p>
+The <tt>Stop()</tt> function will only be called if a previous call to the 
+<a href="#Getting started"><tt>Start()</tt></a> function of that plugin has
+returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
+as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
+<!--X1.3.20--></td></tr></table>
+
 <a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
 <center><i><b>Today's special is...</b></i></center><p>
@@ -1021,7 +1044,7 @@ <h1>Table Of Contents</h1>
 Take a look at the files <tt>player.h</tt> and <tt>dvbplayer.c</tt> to see how VDR implements
 its own player for the VDR recordings.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 To play the actual data, the player needs to call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
@@ -1044,7 +1067,7 @@ <h1>Table Of Contents</h1>
 
 to determine whether the device is ready for further data.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 By default all audio track handling is done by the device a player is
 attached to.
 If the player can provide more than a single audio track, and has special
@@ -1181,7 +1204,7 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 :cReceiver(0, -1, Pid)
 <!--X1.3.19--></td></tr></table>
 {
@@ -1267,7 +1290,6 @@ <h1>Table Of Contents</h1>
 <p>
 See VDR/eit.c or VDR/pat.c to learn how to process filter data.
 
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Window to the world</b></i></center><p>
@@ -1360,7 +1382,7 @@ <h1>Table Of Contents</h1>
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
   virtual cSkinDisplayMessage *DisplayTrack(int NumTracks, const char * const *Tracks);
 <!--X1.3.18--></td></tr></table>
   virtual cSkinDisplayMessage *DisplayMessage(void);
@@ -1382,7 +1404,7 @@ <h1>Table Of Contents</h1>
 in the <a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
 Do not delete this object, it will be automatically deleted when the program ends.
 <p>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 In order to be able to easily identify plugins that implement a skin it is recommended
 that the name of such a plugin should be
 
@@ -1441,7 +1463,6 @@ <h1>Table Of Contents</h1>
 By default this will use the colors that have been defined in the respective
 <tt>THEME_CLR()</tt> line, but may be overwritten through user supplied theme
 files (see <tt>man vdr(5)</tt> for information about the format of a theme file).
-<!--X1.3.7--></td></tr></table>
 
 <a name="Devices"><hr><h2>Devices</h2>
 
@@ -1493,7 +1514,7 @@ <h1>Table Of Contents</h1>
 If the device can provide more than a single audio track, it can implement the
 following function to make them available:
 
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual void SetAudioTrackDevice(eTrackType Type);
 virtual int GetAudioChannelDevice(void);
@@ -1584,7 +1605,6 @@ <h1>Table Of Contents</h1>
 <p>
 <b>On Screen Display</b>
 <p>
-<!--X1.3.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 If your device provides On Screen Display (OSD) capabilities (which every device
 that is supposed to be used as a primary device should do), it shall implement
 an "OSD provider" class, derived from <tt>cOsdProvider</tt>, which, when its <tt>CreateOsd()</tt>
@@ -1618,7 +1638,6 @@ <h1>Table Of Contents</h1>
 user - whether this goes through OSD facilities of the physical device (like
 a "full featured" DVB card) or through a graphics adapter that overlays its
 output with the video signal, doesn't matter.
-<!--X1.3.7--></td></tr></table>
 
 <p>
 <b>Initializing new devices</b>
diff --git a/channels.c b/channels.c
index 5c0456b6e..dd230dae3 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.34 2005/01/16 13:49:30 kls Exp $
+ * $Id: channels.c 1.35 2005/02/06 09:44:53 kls Exp $
  */
 
 #include "channels.h"
@@ -640,7 +640,7 @@ cString cChannel::ToText(const cChannel *Channel)
      *q = 0;
      asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->ParametersToString(), *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
-  return buffer;
+  return cString(buffer, true);
 }
 
 cString cChannel::ToText(void) const
diff --git a/channels.conf b/channels.conf
index 67c319c90..836e3be62 100644
--- a/channels.conf
+++ b/channels.conf
@@ -26,7 +26,7 @@ NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:3
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:2:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
@@ -48,10 +48,10 @@ PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:3
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1801,1722,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
@@ -113,7 +113,7 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-ADRIATICOSAT;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
+JOLLY FILM;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
diff --git a/config.c b/config.c
index 0e583941f..900d039d1 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.131 2005/01/09 12:14:58 kls Exp $
+ * $Id: config.c 1.132 2005/02/05 10:43:04 kls Exp $
  */
 
 #include "config.h"
@@ -283,6 +283,7 @@ cSetup::cSetup(void)
   UpdateChannels = 4;
   UseDolbyDigital = 1;
   ChannelInfoPos = 0;
+  ChannelInfoTime = 5;
   OSDLeft = 54;
   OSDTop = 45;
   OSDWidth = 624;
@@ -438,6 +439,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
   else if (!strcasecmp(Name, "UseDolbyDigital"))     UseDolbyDigital    = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
+  else if (!strcasecmp(Name, "ChannelInfoTime"))     ChannelInfoTime    = atoi(Value);
   else if (!strcasecmp(Name, "OSDLeft"))             OSDLeft            = atoi(Value);
   else if (!strcasecmp(Name, "OSDTop"))              OSDTop             = atoi(Value);
   else if (!strcasecmp(Name, "OSDWidth"))          { OSDWidth           = atoi(Value); if (OSDWidth  < 100) OSDWidth  *= 12; OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
@@ -500,6 +502,7 @@ bool cSetup::Save(void)
   Store("UpdateChannels",     UpdateChannels);
   Store("UseDolbyDigital",    UseDolbyDigital);
   Store("ChannelInfoPos",     ChannelInfoPos);
+  Store("ChannelInfoTime",    ChannelInfoTime);
   Store("OSDLeft",            OSDLeft);
   Store("OSDTop",             OSDTop);
   Store("OSDWidth",           OSDWidth);
diff --git a/config.h b/config.h
index 5dacc6fb1..64ebe7ccd 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.210 2005/01/09 16:50:11 kls Exp $
+ * $Id: config.h 1.212 2005/02/05 10:43:22 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.19"
-#define VDRVERSNUM   10319  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.20"
+#define VDRVERSNUM   10320  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -241,6 +241,7 @@ class cSetup : public cConfig<cSetupLine> {
   int UpdateChannels;
   int UseDolbyDigital;
   int ChannelInfoPos;
+  int ChannelInfoTime;
   int OSDLeft, OSDTop, OSDWidth, OSDHeight;
   int OSDMessageTime;
   int UseSmallFont;
diff --git a/device.c b/device.c
index dcb6989b1..46e23bc5a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.78 2005/01/23 15:41:05 kls Exp $
+ * $Id: device.c 1.87 2005/02/06 14:10:37 kls Exp $
  */
 
 #include "device.h"
@@ -31,7 +31,8 @@ class cPesAssembler {
 public:
   cPesAssembler(void);
   ~cPesAssembler();
-  int ExpectedLength(void) { return data[4] * 256 + data[5] + 6; }
+  int ExpectedLength(void) { return PacketSize(data); }
+  static int PacketSize(const uchar *data);
   int Length(void) { return length; }
   const uchar *Data(void) { return data; }
   void Reset(void);
@@ -100,6 +101,38 @@ void cPesAssembler::Put(const uchar *Data, int Length)
      }
 }
 
+int cPesAssembler::PacketSize(const uchar *data)
+{
+  // we need atleast 6 bytes of data here !!!
+  switch (data[3]) {
+    default:
+    case 0x00 ... 0xB8: // video stream start codes
+    case 0xB9: // Program end
+    case 0xBC: // Programm stream map
+    case 0xF0 ... 0xFF: // reserved
+         return 6;
+
+    case 0xBA: // Pack header
+         if ((data[4] & 0xC0) == 0x40) // MPEG2
+            return 14;
+         // to be absolutely correct we would have to add the stuffing bytes
+         // as well, but at this point we only may have 6 bytes of data avail-
+         // able. So it's up to the higher level to resync...
+         //return 14 + (data[13] & 0x07); // add stuffing bytes
+         else // MPEG1
+            return 12;
+
+    case 0xBB: // System header
+    case 0xBD: // Private stream1
+    case 0xBE: // Padding stream
+    case 0xBF: // Private stream2 (navigation data)
+    case 0xC0 ... 0xCF: // all the rest (the real packets)
+    case 0xD0 ... 0xDF:
+    case 0xE0 ... 0xEF:
+         return 6 + data[4] * 256 + data[5];
+    }
+}
+
 // --- cDevice ---------------------------------------------------------------
 
 // The default priority for non-primary devices:
@@ -137,6 +170,7 @@ cDevice::cDevice(void)
   pesAssembler = new cPesAssembler;
   ClrAvailableTracks();
   currentAudioTrack = ttAudioFirst;
+  currentAudioTrackMissingCount = 0;
 
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
@@ -281,11 +315,11 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
 
 void cDevice::Shutdown(void)
 {
+  primaryDevice = NULL;
   for (int i = 0; i < numDevices; i++) {
       delete device[i];
       device[i] = NULL;
       }
-  primaryDevice = NULL;
 }
 
 bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
@@ -551,26 +585,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
            for (int i = 0; i < MAXDPIDS; i++)
                SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i));
            }
-        // Select the preferred audio track:
-        eTrackType PreferredTrack = ttAudioFirst;
-        int LanguagePreference = -1;
-        int StartCheck = Setup.CurrentDolby ? ttDolbyFirst : ttAudioFirst;
-        int EndCheck = ttDolbyLast;
-        for (int i = StartCheck; i <= EndCheck; i++) {
-            const tTrackId *TrackId = GetTrack(eTrackType(i));
-            if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.AudioLanguages, I18nLanguageIndex(TrackId->language), LanguagePreference))
-               PreferredTrack = eTrackType(i);
-            if (Setup.CurrentDolby && i == ttDolbyLast) {
-               i = ttAudioFirst - 1;
-               EndCheck = ttAudioLast;
-               }
-            }
-        // Make sure we're set to an available audio track:
-        const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
-        if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack())
-           SetCurrentAudioTrack(PreferredTrack);
-        // Fall back to stereo:
-        SetAudioChannel(0);
+        EnsureAudioTrack(true);
         }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
@@ -663,10 +678,12 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
   else {
      memset(availableTracks, 0, sizeof(availableTracks));
      pre_1_3_19_PrivateStream = false;
+     SetAudioChannel(0); // fall back to stereo
+     currentAudioTrackMissingCount = 0;
      }
 }
 
-bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language, const char *Description, uint32_t Flags)
+bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language, const char *Description)
 {
   eTrackType t = eTrackType(Type + Index);
   if (Type == ttAudio && IS_AUDIO_TRACK(t) ||
@@ -675,10 +692,12 @@ bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const c
         strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language));
      if (Description)
         strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
-     if (Id) {
-        availableTracks[t].flags = Flags;
+     if (Id)
         availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
-        }
+     if (t == currentAudioTrack)
+        currentAudioTrackMissingCount = 0;
+     else if (!availableTracks[currentAudioTrack].id && currentAudioTrackMissingCount++ > NumAudioTracks() * 10)
+        EnsureAudioTrack();
      return true;
      }
   else
@@ -718,6 +737,31 @@ bool cDevice::SetCurrentAudioTrack(eTrackType Type)
   return false;
 }
 
+void cDevice::EnsureAudioTrack(bool Force)
+{
+  if (Force || !availableTracks[currentAudioTrack].id) {
+     eTrackType PreferredTrack = ttAudioFirst;
+     int LanguagePreference = -1;
+     int StartCheck = Setup.CurrentDolby ? ttDolbyFirst : ttAudioFirst;
+     int EndCheck = ttDolbyLast;
+     for (int i = StartCheck; i <= EndCheck; i++) {
+         const tTrackId *TrackId = GetTrack(eTrackType(i));
+         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.AudioLanguages, I18nLanguageIndex(TrackId->language), LanguagePreference))
+            PreferredTrack = eTrackType(i);
+         if (Setup.CurrentDolby && i == ttDolbyLast) {
+            i = ttAudioFirst - 1;
+            EndCheck = ttAudioLast;
+            }
+         }
+     // Make sure we're set to an available audio track:
+     const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
+     if (Force || !Track || !Track->id || PreferredTrack != GetCurrentAudioTrack()) {
+        dsyslog("setting audio track to %d", PreferredTrack);
+        SetCurrentAudioTrack(PreferredTrack);
+        }
+     }
+}
+
 bool cDevice::CanReplay(void) const
 {
   return HasDecoder();
@@ -772,6 +816,7 @@ bool cDevice::AttachPlayer(cPlayer *Player)
      if (player)
         Detach(player);
      ClrAvailableTracks();
+     pesAssembler->Reset();
      player = Player;
      SetPlayMode(player->playMode);
      player->device = this;
@@ -831,6 +876,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
         int d = End - Start;
         int w = d;
         switch (c) {
+          case 0xBE:          // padding stream, needed for MPEG1
           case 0xE0 ... 0xEF: // video
                w = PlayVideo(Start, d);
                break;
@@ -842,13 +888,10 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
           case 0xBD: { // private stream 1
                int PayloadOffset = Data[8] + 9;
                uchar SubStreamId = Data[PayloadOffset];
-               uchar SubStreamType = SubStreamId & 0xE0;
+               uchar SubStreamType = SubStreamId & 0xF0;
                uchar SubStreamIndex = SubStreamId & 0x1F;
 
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
-               //TODO apparently this doesn't work for old ORF Dolby Digital recordings
-               if (!pre_1_3_19_PrivateStream && (Data[6] & 4) && Data[PayloadOffset] == 0x0B && Data[PayloadOffset + 1] == 0x77)
-                  pre_1_3_19_PrivateStream = true;
                if (pre_1_3_19_PrivateStream) {
                   SubStreamId = c;
                   SubStreamType = 0x80;
@@ -857,6 +900,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 
                switch (SubStreamType) {
                  case 0x20: // SPU
+                 case 0x30: // SPU
                       break;
                  case 0x80: // AC3 & DTS
                       if (Setup.UseDolbyDigital) {
@@ -873,6 +917,13 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                       if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id)
                          w = PlayAudio(Start, d);
                       break;
+                 default:
+                      // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
+                      if (!pre_1_3_19_PrivateStream) {
+                         dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode");
+                         ClrAvailableTracks();
+                         pre_1_3_19_PrivateStream = true;
+                         }
                  }
                }
                break;
@@ -924,7 +975,7 @@ int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
   int i = 0;
   while (i <= Length - 6) {
         if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
-           int l = Data[i + 4] * 256 + Data[i + 5] + 6;
+           int l = cPesAssembler::PacketSize(&Data[i]);
            if (i + l > Length) {
               // Store incomplete PES packet for later completion:
               pesAssembler->Put(Data + i, Length - i);
diff --git a/device.h b/device.h
index 9ab15c9f7..80587992c 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.53 2005/01/22 14:58:07 kls Exp $
+ * $Id: device.h 1.55 2005/02/06 11:43:04 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -78,8 +78,6 @@ struct tTrackId {
   uint16_t id;          // The PES packet id or the PID.
   char language[8];     // something like either "eng" or "deu/eng"
   char description[32]; // something like "Dolby Digital 5.1"
-  // for future use:
-  uint32_t flags;   // Used to further identify the actual track.
   };
 
 class cChannel;
@@ -315,17 +313,18 @@ class cDevice : public cThread {
 private:
   tTrackId availableTracks[ttMaxTrackTypes];
   eTrackType currentAudioTrack;
+  int currentAudioTrackMissingCount;
   bool pre_1_3_19_PrivateStream;
 protected:
   virtual void SetAudioTrackDevice(eTrackType Type);
        ///< Sets the current audio track to the given value.
 public:
   void ClrAvailableTracks(bool DescriptionsOnly = false);
-  bool SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL, uint32_t Flags = 0);
+  bool SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL);
        ///< Sets the track of the given Type and Index to the given values.
        ///< Type must be one of the basic eTrackType values, like ttAudio or ttDolby.
        ///< Index tells which track of the given basic type is meant.
-       ///< If Id is 0 any existing id (and flags) will be left untouched and only the
+       ///< If Id is 0 any existing id will be left untouched and only the
        ///< given Language and Description will be set.
        ///< \return Returns true if the track was set correctly, false otherwise.
   const tTrackId *GetTrack(eTrackType Type);
@@ -339,6 +338,10 @@ class cDevice : public cThread {
   bool SetCurrentAudioTrack(eTrackType Type);
        ///< Sets the current audio track to the given Type.
        ///< \return Returns true if Type is a valid audio track, false otherwise.
+  void EnsureAudioTrack(bool Force = false);
+       ///< Makes sure an audio track is selected that is actually available.
+       ///< If Force is true, the language and Dolby Digital settings will
+       ///< be verified even if the current audio track is available.
 
 // Audio facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index e8862cb47..269c0a299 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.116 2005/01/16 12:05:13 kls Exp $
+ * $Id: dvbdevice.c 1.117 2005/02/06 12:30:14 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -842,6 +842,8 @@ void cDvbDevice::SetAudioChannelDevice(int AudioChannel)
 void cDvbDevice::SetVolumeDevice(int Volume)
 {
   if (HasDecoder()) {
+     if (digitalAudio)
+        Volume = 0;
      audio_mixer_t am;
      // conversion for linear volume response:
      am.volume_left = am.volume_right = 2 * Volume - Volume * Volume / 255;
@@ -854,8 +856,8 @@ void cDvbDevice::SetDigitalAudioDevice(bool On)
   if (digitalAudio != On) {
      if (digitalAudio)
         cCondWait::SleepMs(1000); // Wait until any leftover digital data has been flushed
-     SetVolumeDevice(On || IsMute() ? 0 : CurrentVolume());
      digitalAudio = On;
+     SetVolumeDevice(On || IsMute() ? 0 : CurrentVolume());
      }
 }
 
diff --git a/dvbspu.c b/dvbspu.c
index 44cb7b337..3ca780aaf 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.11 2005/01/08 09:57:03 kls Exp $
+ * $Id: dvbspu.c 1.12 2005/02/06 09:54:51 kls Exp $
  */
 
 #include <assert.h>
@@ -216,6 +216,7 @@ void cDvbSpuBitmap::putFieldData(int field, uint8_t * data, uint8_t * endp)
 #define CMD_SPU_SET_ALPHA       0x04
 #define CMD_SPU_SET_SIZE        0x05
 #define CMD_SPU_SET_PXD_OFFSET  0x06
+#define CMD_SPU_CHG_COLCON      0x07
 #define CMD_SPU_EOF             0xff
 
 #define spuU32(i)  ((spu[i] << 8) + spu[i+1])
@@ -509,6 +510,12 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
                     i += 5;
                     break;
 
+                case CMD_SPU_CHG_COLCON: {
+                    int size = spuU32(i + 1);
+                    i += 1 + size;
+                    }
+                    break;
+
                 case CMD_SPU_MENU:
                     DEBUG("\tspu menu\n");
                     state = spMENU;
diff --git a/i18n.c b/i18n.c
index 3d9f787aa..b6c8800be 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.172 2005/01/22 10:38:44 kls Exp $
+ * $Id: i18n.c 1.175 2005/02/05 10:46:30 kls Exp $
  *
  * Translations provided by:
  *
@@ -952,7 +952,7 @@ const tI18nPhrase Phrases[] = {
     "Scansione",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Scan",
     "",//TODO
     "P�ivit�",
     "",//TODO
@@ -1668,7 +1668,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarchy",
     "Hierarchy",
     "Hierarchy",
-    "Hierarchie",
+    "Hi�rarchie",
     "Hierarchy",
     "Hierarkia",
     "Hierachia",
@@ -1795,7 +1795,7 @@ const tI18nPhrase Phrases[] = {
     "VPS",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "VPS",
     "",// TODO
     "VPS",
     "",// TODO
@@ -2306,7 +2306,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Pas d'audio disponible!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2575,7 +2575,7 @@ const tI18nPhrase Phrases[] = {
     "Superficie Skin",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Skin",
     "",// TODO
     "Ulkoasu",
     "",// TODO
@@ -2596,7 +2596,7 @@ const tI18nPhrase Phrases[] = {
     "Tema",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Th�me",
     "",// TODO
     "Teema",
     "",// TODO
@@ -2617,7 +2617,7 @@ const tI18nPhrase Phrases[] = {
     "Sinistra",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Gauche",
     "",// TODO
     "Vaakakeskitys",
     "",// TODO
@@ -2638,7 +2638,7 @@ const tI18nPhrase Phrases[] = {
     "Cima",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Haut",
     "",// TODO
     "Pystykeskitys",
     "",// TODO
@@ -2701,7 +2701,7 @@ const tI18nPhrase Phrases[] = {
     "Tempo del messaggio (s)",
     "Weergave duur van berichten (s)",
     "Mostrar contador (s)",
-    "Dur�e affichage �cran (s)",
+    "Dur�e affichage message (s)",
     "Tid meldinger skal vises (s)",
     "Viestien esitysaika (s)",
     "Czas wyswietlania wiadomosci (s)",
@@ -2722,7 +2722,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizzare caratteri piccoli",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Utiliser les petits caract�res",
     "",// TODO
     "K�yt� pieni� kirjasimia",
     "",// TODO
@@ -2743,7 +2743,7 @@ const tI18nPhrase Phrases[] = {
     "mai",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "jamais",
     "",// TODO
     "ei koskaan",
     "",// TODO
@@ -2764,7 +2764,7 @@ const tI18nPhrase Phrases[] = {
     "in base alla superficie",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "D�pend du skin",
     "",// TODO
     "ulkoasun mukaan",
     "",// TODO
@@ -2785,7 +2785,7 @@ const tI18nPhrase Phrases[] = {
     "sempre",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "toujours",
     "",// TODO
     "aina",
     "",// TODO
@@ -2821,6 +2821,27 @@ const tI18nPhrase Phrases[] = {
     "Kanaliinfo asukoht",
     "Placering af kanalinfo",
   },
+  { "Setup.OSD$Channel info time (s)",
+    "Anzeigedauer f�r Kanal-Info (s)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Dur�e affichage infos cha�nes (s)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
     "Pokazi naziv kanala",
@@ -2953,7 +2974,7 @@ const tI18nPhrase Phrases[] = {
     "Visualizzazione dati vecchi (min)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Montrer l'EPG plus vieux de m min",
     "",// TODO
     "Vanha tieto n�kyy (min)",
     "",// TODO
@@ -3016,7 +3037,7 @@ const tI18nPhrase Phrases[] = {
     "Lingue preferite",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Langues pr�f�r�es",
     "",// TODO
     "Suosikkikielet",
     "",// TODO
@@ -3037,7 +3058,7 @@ const tI18nPhrase Phrases[] = {
     "Lingua preferita",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Langue pr�f�r�e",
     "",// TODO
     "Suosikkikieli",
     "",// TODO
@@ -3106,7 +3127,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Utiliser le Dolby Digital",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3121,7 +3142,7 @@ const tI18nPhrase Phrases[] = {
     "Aggiornare i canali",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Mettre � jour les cha�nes",
     "",// TODO
     "P�ivit� kanavat",
     "",// TODO
@@ -3142,7 +3163,7 @@ const tI18nPhrase Phrases[] = {
     "solo nomi",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Seulement les noms",
     "",// TODO
     "vain nimet",
     "",// TODO
@@ -3163,7 +3184,7 @@ const tI18nPhrase Phrases[] = {
     "nomi e PIDs",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Noms et PIDs",
     "",// TODO
     "nimet ja PID:it",
     "",// TODO
@@ -3184,7 +3205,7 @@ const tI18nPhrase Phrases[] = {
     "aggiungere canali nuovi",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Ajouter les nouvelles cha�nes",
     "",// TODO
     "lis�� uudet kanavat",
     "",// TODO
@@ -3205,7 +3226,7 @@ const tI18nPhrase Phrases[] = {
     "aggiungere transponder nuovi",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Ajouter les nouveaux transpondeurs",
     "",// TODO
     "lis�� uudet transponderit",
     "",// TODO
@@ -3239,7 +3260,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Audio sprog (ant.)",
   },
   { "Setup.DVB$Audio language",  // note the singular
     "",//TODO
@@ -3260,7 +3281,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Audio sprog",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -3541,7 +3562,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizzare VPS",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Utiliser le VPS",
     "",// TODO
     "K�yt� VPS-toimintoa",
     "",// TODO
@@ -3562,7 +3583,7 @@ const tI18nPhrase Phrases[] = {
     "Margine VPS",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Marge VPS",
     "",// TODO
     "VPS-toiminnon aloitusmarginaali (s)",
     "",// TODO
@@ -3814,7 +3835,7 @@ const tI18nPhrase Phrases[] = {
     "Timeout Zapping",
     "Zap timeout (s)",
     "",// TODO
-    "",// TODO
+    "Prise en compte derni�re cha�ne (s)",
     "",// TODO
     "Kanavavalinnan odotusaika (s)",
     "",// TODO
@@ -4685,7 +4706,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Audio",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4743,7 +4764,7 @@ const tI18nPhrase Phrases[] = {
     "off",
     "uit",
     "off",
-    "",// TODO
+    "off",
     "",// TODO
     "pois",
     "wyl.",
diff --git a/menu.c b/menu.c
index a0316615b..a438b7993 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.337 2005/01/15 16:32:34 kls Exp $
+ * $Id: menu.c 1.340 2005/02/06 11:33:13 kls Exp $
  */
 
 #include "menu.h"
@@ -1769,6 +1769,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Use small font"),         &data.UseSmallFont, 3, useSmallFontTexts));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Channel info time (s)"),  &data.ChannelInfoTime, 1, 60));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
@@ -2513,10 +2514,8 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 state = replaying ? osContinue : osRecord;
                              break;
                case kGreen:  if (!HadSubMenu) {
-                                if (cDevice::PrimaryDevice()->NumAudioTracks() > 1) {
-                                   cRemote::Put(kAudio, true);
-                                   state = osEnd;
-                                   }
+                                cRemote::Put(kAudio, true);
+                                state = osEnd;
                                 }
                              break;
                case kYellow: if (!HadSubMenu)
@@ -2578,7 +2577,6 @@ static void SetTrackDescriptions(void)
 // --- cDisplayChannel -------------------------------------------------------
 
 #define DIRECTCHANNELTIMEOUT 1000 //ms
-#define INFOTIMEOUT          5000 //ms
 
 cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 :cOsdObject(true)
@@ -2766,7 +2764,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      return osEnd;
                      }
     };
-  if (lastTime.Elapsed() < INFOTIMEOUT) {
+  if (lastTime.Elapsed() < (uint64)(Setup.ChannelInfoTime * 1000)) {
      if (!number && group < 0 && channel && channel->Number() != cDevice::CurrentChannel())
         Refresh(); // makes sure a channel switch through the SVDRP CHAN command is displayed
      DisplayInfo();
@@ -2852,6 +2850,7 @@ cDisplayTracks *cDisplayTracks::currentDisplayTracks = NULL;
 cDisplayTracks::cDisplayTracks(void)
 :cOsdObject(true)
 {
+  cDevice::PrimaryDevice()->EnsureAudioTrack();
   // Get the actual audio track descriptions from the EPG if we're not replaying:
   if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice())
      SetTrackDescriptions();
diff --git a/newplugin b/newplugin
index 07d3f685d..4a92159df 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.17 2004/10/16 12:12:43 kls Exp $
+# $Id: newplugin 1.18 2005/01/30 13:50:05 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -164,6 +164,7 @@ public:
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Initialize(void);
   virtual bool Start(void);
+  virtual void Stop(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
   virtual cOsdObject *MainMenuAction(void);
@@ -207,6 +208,11 @@ bool cPlugin${PLUGIN_CLASS}::Start(void)
   return true;
 }
 
+void cPlugin${PLUGIN_CLASS}::Stop(void)
+{
+  // Stop any background activities the plugin shall perform.
+}
+
 void cPlugin${PLUGIN_CLASS}::Housekeeping(void)
 {
   // Perform any cleanup or other regular tasks.
diff --git a/pat.c b/pat.c
index 48ea715f3..356e28efd 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.11 2005/01/16 13:54:34 kls Exp $
+ * $Id: pat.c 1.12 2005/01/25 21:02:11 kls Exp $
  */
 
 #include "pat.h"
@@ -324,10 +324,10 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         SI::PMT::Stream stream;
         int Vpid = 0;
         int Ppid = pmt.getPCRPid();
-        int Apids[MAXAPIDS] = { 0 };
-        int Dpids[MAXDPIDS] = { 0 };
-        char ALangs[MAXAPIDS][4] = { "" };
-        char DLangs[MAXDPIDS][4] = { "" };
+        int Apids[MAXAPIDS + 1] = { 0 };
+        int Dpids[MAXDPIDS + 1] = { 0 };
+        char ALangs[MAXAPIDS + 1][4] = { "" };
+        char DLangs[MAXDPIDS + 1][4] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
diff --git a/player.h b/player.h
index 0f73d9b08..3ffc7e36c 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.14 2004/12/30 10:44:34 kls Exp $
+ * $Id: player.h 1.15 2005/02/06 11:44:56 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -19,7 +19,7 @@ class cPlayer {
   cDevice *device;
   ePlayMode playMode;
 protected:
-  bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL, uint32_t Flags = 0) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description, Flags) : false; }
+  bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description) : false; }
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
diff --git a/plugin.c b/plugin.c
index a06d003c3..b7ebf3729 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.12 2004/12/19 12:05:28 kls Exp $
+ * $Id: plugin.c 1.13 2005/01/30 14:05:20 kls Exp $
  */
 
 #include "plugin.h"
@@ -28,6 +28,7 @@ char *cPlugin::configDirectory = NULL;
 cPlugin::cPlugin(void) 
 {
   name = NULL;
+  started = false;
 }
 
 cPlugin::~cPlugin()
@@ -60,6 +61,10 @@ bool cPlugin::Start(void)
   return true;
 }
 
+void cPlugin::Stop(void)
+{
+}
+
 void cPlugin::Housekeeping(void)
 {
 }
@@ -322,6 +327,7 @@ bool cPluginManager::StartPlugins(void)
          Setup.OSDLanguage = Language;
          if (!p->Start())
             return false;
+         p->started = true;
          }
       }
   return true;
@@ -366,15 +372,25 @@ cPlugin *cPluginManager::GetPlugin(const char *Name)
   return NULL;
 }
 
-void cPluginManager::Shutdown(bool Log)
+void cPluginManager::StopPlugins(void)
+{
+  for (cDll *dll = dlls.Last(); dll; dll = dlls.Prev(dll)) {
+      cPlugin *p = dll->Plugin();
+      if (p && p->started) {
+         isyslog("stopping plugin: %s", p->Name());
+         p->Stop();
+         p->started = false;
+         }
+      }
+}
+
+void cPluginManager::Shutdown(void)
 {
   cDll *dll;
   while ((dll = dlls.Last()) != NULL) {
-        if (Log) {
-           cPlugin *p = dll->Plugin();
-           if (p)
-              isyslog("stopping plugin: %s", p->Name());
-           }
+        cPlugin *p = dll->Plugin();
+        if (p)
+           isyslog("deleting plugin: %s", p->Name());
         dlls.Del(dll);
         }
 }
diff --git a/plugin.h b/plugin.h
index 2d1cf5d0c..3d56b1759 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.7 2004/04/30 13:46:21 kls Exp $
+ * $Id: plugin.h 1.8 2005/01/30 14:03:48 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -19,9 +19,11 @@
 
 class cPlugin {
   friend class cDll;
+  friend class cPluginManager;
 private:
   static char *configDirectory;
   const char *name;
+  bool started;
   void SetName(const char *s);
 public:
   cPlugin(void);
@@ -35,6 +37,7 @@ class cPlugin {
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Initialize(void);
   virtual bool Start(void);
+  virtual void Stop(void);
   virtual void Housekeeping(void);
 
   virtual const char *MainMenuEntry(void);
@@ -85,7 +88,8 @@ class cPluginManager {
   static bool HasPlugins(void);
   static cPlugin *GetPlugin(int Index);
   static cPlugin *GetPlugin(const char *Name);
-  void Shutdown(bool Log = false);
+  void StopPlugins(void);
+  void Shutdown(void);
   };
 
 #endif //__PLUGIN_H
diff --git a/recording.c b/recording.c
index 7ba93b324..c6460f273 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.94 2004/12/26 11:55:24 kls Exp $
+ * $Id: recording.c 1.95 2005/02/06 09:46:31 kls Exp $
  */
 
 #include "recording.h"
@@ -719,7 +719,7 @@ cString cMark::ToText(void)
 {
   char *buffer;
   asprintf(&buffer, "%s%s%s\n", *IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
-  return buffer;
+  return cString(buffer, true);
 }
 
 bool cMark::Parse(const char *s)
diff --git a/remux.c b/remux.c
index 06fb13bd7..49bd89891 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.27 2005/01/23 12:56:39 kls Exp $
+ * $Id: remux.c 1.28 2005/02/05 11:56:42 kls Exp $
  */
 
 #include "remux.h"
@@ -24,12 +24,14 @@
 
 class cRepacker {
 protected:
+  int maxPacketSize;
   uint8_t subStreamId;
 public:
-  cRepacker(void) { subStreamId = 0; }
+  cRepacker(void) { maxPacketSize = 6 + 65535; subStreamId = 0; }
   virtual ~cRepacker() {}
   virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
   virtual int BreakAt(const uchar *Data, int Count) = 0;
+  void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
   void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
   };
 
@@ -40,6 +42,7 @@ class cDolbyRepacker : public cRepacker {
   static int frameSizes[];
   uchar fragmentData[6 + 65535];
   int fragmentLen;
+  int fragmentTodo;
   uchar pesHeader[6 + 3 + 255 + 4 + 4];
   int pesHeaderLen;
   uchar chk1;
@@ -50,15 +53,21 @@ class cDolbyRepacker : public cRepacker {
     find_77,
     store_chk1,
     store_chk2,
-    get_length
+    get_length,
+    output_packet
     } state;
   void Reset(void);
+  void ResetPesHeader(void);
+  void AppendSubStreamID(void);
+  bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
+  bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
 public:
   cDolbyRepacker(void);
   virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
   virtual int BreakAt(const uchar *Data, int Count);
   };
 
+// frameSizes are in words, i. e. multiply them by 2 to get bytes
 int cDolbyRepacker::frameSizes[] = {
   // fs = 48 kHz
     64,   64,   80,   80,   96,   96,  112,  112,  128,  128,  160,  160,  192,  192,  224,  224,
@@ -93,78 +102,152 @@ cDolbyRepacker::cDolbyRepacker(void)
   Reset();
 }
 
-void cDolbyRepacker::Reset()
+void cDolbyRepacker::AppendSubStreamID(void)
+{
+  if (subStreamId) {
+     pesHeader[pesHeaderLen++] = subStreamId;
+     pesHeader[pesHeaderLen++] = 0x00;
+     pesHeader[pesHeaderLen++] = 0x00;
+     pesHeader[pesHeaderLen++] = 0x00;
+     }
+}
+
+void cDolbyRepacker::ResetPesHeader(void)
 {
-  state = find_0b;
   pesHeader[6] = 0x80;
   pesHeader[7] = 0x00;
   pesHeader[8] = 0x00;
   pesHeaderLen = 9;
+  AppendSubStreamID();
+}
+
+void cDolbyRepacker::Reset(void)
+{
+  ResetPesHeader();
+  state = find_0b;
   ac3todo = 0;
   chk1 = 0;
   chk2 = 0;
   fragmentLen = 0;
+  fragmentTodo = 0;
 }
 
-int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite)
 {
-  // check for MPEG 2
-  if ((Data[6] & 0xC0) != 0x80)
-     return 0;
-  // copy header information for later use
-  if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
-     pesHeaderLen = Data[8] + 6 + 3;
-     memcpy(pesHeader, Data, pesHeaderLen);
-     }
-
-  const uchar *data = Data + pesHeaderLen;
-  int done = pesHeaderLen;
-  int todo = Count - done;
-
-  // finish remainder of ac3 frame
-  if (ac3todo > 0) {
-     int bite;
-     // enough data available to put PES packet into buffer?
-     if (ac3todo <= todo) {
-        // output a previous fragment first
-        if (fragmentLen > 0) {
-           bite = fragmentLen;
-           int n = ResultBuffer->Put(fragmentData, bite);
-           if (bite != n) {
-              Reset();
-              return done;
-              }
-           fragmentLen = 0;
-           }
-        bite = ac3todo;
-        int n = ResultBuffer->Put(data, bite);
-        if (bite != n) {
+  // enough data available to put PES packet into buffer?
+  if (fragmentTodo <= Todo) {
+     // output a previous fragment first
+     if (fragmentLen > 0) {
+        Bite = fragmentLen;
+        int n = ResultBuffer->Put(fragmentData, Bite);
+        if (Bite != n) {
            Reset();
-           return done + n;
+           return false;
            }
+        fragmentLen = 0;
         }
-     else {
-        // copy the fragment into separate buffer for later processing
-        bite = todo;
-        if (fragmentLen + bite > (int)sizeof(fragmentData)) {
-           Reset();
-           return done;
-           }
-        memcpy(fragmentData + fragmentLen, data, bite);
-        fragmentLen += bite;
+     Bite = fragmentTodo;
+     int n = ResultBuffer->Put(Data, Bite);
+     if (Bite != n) {
+        Reset();
+        Done += n;
+        return false;
+        }
+     fragmentTodo = 0;
+     // ac3 frame completely processed?
+     if (Bite >= ac3todo)
+        state = find_0b; // go on with finding start of next packet
+     }
+  else {
+     // copy the fragment into separate buffer for later processing
+     Bite = Todo;
+     if (fragmentLen + Bite > (int)sizeof(fragmentData)) {
+        Reset();
+        return false;
+        }
+     memcpy(fragmentData + fragmentLen, Data, Bite);
+     fragmentLen += Bite;
+     fragmentTodo -= Bite;
+     }
+  return true;
+}
+
+bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite)
+{
+  int packetLen = pesHeaderLen + ac3todo;
+  // limit packet to maximum size
+  if (packetLen > maxPacketSize)
+     packetLen = maxPacketSize;
+  pesHeader[4] = (packetLen - 6) >> 8;
+  pesHeader[5] = (packetLen - 6) & 0xFF;
+  Bite = pesHeaderLen;
+  // enough data available to put PES packet into buffer?
+  if (packetLen - pesHeaderLen <= Todo) {
+     int n = ResultBuffer->Put(pesHeader, Bite);
+     if (Bite != n) {
+        Reset();
+        return false;
         }
-     data += bite;
-     done += bite;
-     todo -= bite;
-     ac3todo -= bite;
+     Bite = packetLen - pesHeaderLen;
+     n = ResultBuffer->Put(Data, Bite);
+     if (Bite != n) {
+        Reset();
+        Done += n;
+        return false;
+        }
+     // ac3 frame completely processed?
+     if (Bite >= ac3todo)
+        state = find_0b; // go on with finding start of next packet
      }
+  else {
+     fragmentTodo = packetLen;
+     // copy the pesheader into separate buffer for later processing
+     if (fragmentLen + Bite > (int)sizeof(fragmentData)) {
+        Reset();
+        return false;
+        }
+     memcpy(fragmentData + fragmentLen, pesHeader, Bite);
+     fragmentLen += Bite;
+     fragmentTodo -= Bite;
+     // copy the fragment into separate buffer for later processing
+     Bite = Todo;
+     if (fragmentLen + Bite > (int)sizeof(fragmentData)) {
+        Reset();
+        return false;
+        }
+     memcpy(fragmentData + fragmentLen, Data, Bite);
+     fragmentLen += Bite;
+     fragmentTodo -= Bite;
+     }
+  return true;
+}
+
+int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+{
+  // check for MPEG 2
+  if ((Data[6] & 0xC0) != 0x80)
+     return 0;
 
+  // skip PES header
+  int done = 6 + 3 + Data[8];
+  int todo = Count - done;
+  const uchar *data = Data + done;
+  bool headerCopied = false;
+  
   // look for 0x0B 0x77 <chk1> <chk2> <frameSize>
   while (todo > 0) {
         switch (state) {
           case find_0b:
-               if (*data == 0x0B)
+               if (*data == 0x0B) {
                   ++(int &)state;
+                  // copy header information once for later use
+                  if (!headerCopied) {
+                     headerCopied = true;
+                     pesHeaderLen = 6 + 3 + Data[8];
+                     memcpy(pesHeader, Data, pesHeaderLen);
+                     AppendSubStreamID();
+                     }
+                  }
                data++;
                done++;
                todo--;
@@ -191,10 +274,13 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                todo--;
                ++(int &)state;
                continue;
-          case get_length: {
+          case get_length:
                ac3todo = 2 * frameSizes[*data];
                // frameSizeCode was invalid => restart searching
                if (ac3todo <= 0) {
+                  // reset PES header instead of using/copying a wrong one
+                  ResetPesHeader();
+                  headerCopied = true;
                   if (chk1 == 0x0B) {
                      if (chk2 == 0x77) {
                         state = store_chk1;
@@ -214,62 +300,32 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                   state = find_0b;
                   continue;
                   }
-               // adjust PES packet length and output packet
-               if (subStreamId) {
-                  pesHeader[pesHeaderLen++] = subStreamId;
-                  pesHeader[pesHeaderLen++] = 0x00;
-                  pesHeader[pesHeaderLen++] = 0x00;
-                  pesHeader[pesHeaderLen++] = 0x00;
-                  }
-               int packetLen = pesHeaderLen - 6 + ac3todo;
-               pesHeader[4] = packetLen >> 8;
-               pesHeader[5] = packetLen & 0xFF;
-               pesHeader[pesHeaderLen + 0] = 0x0B;
-               pesHeader[pesHeaderLen + 1] = 0x77;
-               pesHeader[pesHeaderLen + 2] = chk1;
-               pesHeader[pesHeaderLen + 3] = chk2;
+               // append read data to header for common output processing
+               pesHeader[pesHeaderLen++] = 0x0B;
+               pesHeader[pesHeaderLen++] = 0x77;
+               pesHeader[pesHeaderLen++] = chk1;
+               pesHeader[pesHeaderLen++] = chk2;
                ac3todo -= 4;
-               int bite = pesHeaderLen + 4;
-               // enough data available to put PES packet into buffer?
-               if (ac3todo <= todo) {
-                  int n = ResultBuffer->Put(pesHeader, bite);
-                  if (bite != n) {
-                     Reset();
+               ++(int &)state;
+               // fall through to output
+          case output_packet: {
+               int bite = 0;
+               // finish remainder of ac3 frame?
+               if (fragmentTodo > 0) {
+                  if (!FinishRemainder(ResultBuffer, data, todo, done, bite))
                      return done;
-                     }
-                  bite = ac3todo;
-                  n = ResultBuffer->Put(data, bite);
-                  if (bite != n) {
-                     Reset();
-                     return done + n;
-                     }
                   }
                else {
-                  // copy the fragment into separate buffer for later processing
-                  if (fragmentLen + bite > (int)sizeof(fragmentData)) {
-                     Reset();
-                     return done;
-                     }
-                  memcpy(fragmentData + fragmentLen, pesHeader, bite);
-                  fragmentLen += bite;
-                  bite = todo;
-                  if (fragmentLen + bite > (int)sizeof(fragmentData)) {
-                     Reset();
+                  // start a new packet
+                  if (!StartNewPacket(ResultBuffer, data, todo, done, bite))
                      return done;
-                     }
-                  memcpy(fragmentData + fragmentLen, data, bite);
-                  fragmentLen += bite;
+                  // prepare for next packet
+                  ResetPesHeader();
                   }
                data += bite;
                done += bite;
                todo -= bite;
                ac3todo -= bite;
-               // prepare for next packet
-               pesHeader[6] = 0x80;
-               pesHeader[7] = 0x00;
-               pesHeader[8] = 0x00;
-               pesHeaderLen = 9;
-               state = find_0b;
                }
           }
         }
@@ -294,7 +350,7 @@ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
   const uchar *data = Data + headerLen;
   // break after ac3 frame?
   if (data[0] == 0x0B && data[1] == 0x77 && frameSizes[data[4]] > 0)
-     return headerLen + frameSizes[data[4]];
+     return headerLen + 2 * frameSizes[data[4]];
   return -1;
 }
 
@@ -392,8 +448,10 @@ cTS2PES::cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t Aud
   audioCid = AudioCid;
   subStreamId = SubStreamId;
   repacker = Repacker;
-  if (repacker)
+  if (repacker) {
+     repacker->SetMaxPacketSize(size);
      repacker->SetSubStreamId(subStreamId);
+     }
 
   tsErrors = 0;
   ccErrors = 0;
diff --git a/timers.c b/timers.c
index 96a2cc918..9edc6c3bb 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.21 2004/12/26 12:35:33 kls Exp $
+ * $Id: timers.c 1.22 2005/02/06 09:45:52 kls Exp $
  */
 
 #include "timers.h"
@@ -112,7 +112,7 @@ cString cTimer::ToText(bool UseChannelID)
   asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
-  return buffer;
+  return cString(buffer, true);
 }
 
 int cTimer::TimeToInt(int t)
diff --git a/tools.c b/tools.c
index 2f130c78a..0501d76d1 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.88 2005/01/16 11:47:44 kls Exp $
+ * $Id: tools.c 1.89 2005/02/05 10:10:30 kls Exp $
  */
 
 #include "tools.h"
@@ -199,7 +199,7 @@ cString strescape(const char *s, const char *chars)
         }
   if (t)
      *t = 0;
-  return s;
+  return cString(s, t != NULL);
 }
 
 bool startswith(const char *s, const char *p)
@@ -250,7 +250,7 @@ cString AddDirectory(const char *DirName, const char *FileName)
 {
   char *buf;
   asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
-  return buf;
+  return cString(buf, true);
 }
 
 cString itoa(int n)
@@ -513,9 +513,9 @@ uint64 cTimeMs::Elapsed(void)
 
 // --- cString ---------------------------------------------------------------
 
-cString::cString(const char *S)
+cString::cString(const char *S, bool TakePointer)
 {
-  s = S ? strdup(S) : NULL;
+  s = TakePointer ? (char *)S : S ? strdup(S) : NULL;
 }
 
 cString::~cString()
diff --git a/tools.h b/tools.h
index 9067eb8d4..bf190890d 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.65 2005/01/16 11:39:58 kls Exp $
+ * $Id: tools.h 1.66 2005/02/05 10:00:22 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -61,7 +61,7 @@ class cString {
 private:
   char *s;
 public:
-  cString(const char *S = NULL);
+  cString(const char *S = NULL, bool TakePointer = false);
   virtual ~cString();
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
diff --git a/vdr.c b/vdr.c
index d1f8c4aed..6b2ac3793 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.200 2005/01/14 16:50:39 kls Exp $
+ * $Id: vdr.c 1.201 2005/01/30 14:15:50 kls Exp $
  */
 
 #include <getopt.h>
@@ -928,6 +928,7 @@ int main(int argc, char *argv[])
 
 Exit:
 
+  PluginManager.StopPlugins();
   cRecordControls::Shutdown();
   cCutter::Stop();
   delete Menu;
@@ -941,7 +942,7 @@ int main(int argc, char *argv[])
   Setup.CurrentVolume  = cDevice::CurrentVolume();
   Setup.Save();
   cDevice::Shutdown();
-  PluginManager.Shutdown(true);
+  PluginManager.Shutdown();
   ReportEpgBugFixStats();
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);

From dbacda8274e2d76b0ea42f90b94353b672fa9343 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Feb 2005 18:00:00 +0100
Subject: [PATCH 113/307] =?UTF-8?q?Version=201.3.21=20-=20Fixed=20cDvbDevi?=
 =?UTF-8?q?ce::SetAudioTrackDevice()=20to=20avoid=20a=20blank=20screen=20a?=
 =?UTF-8?q?fter=20switching=20=20=20back=20to=20live=20mode=20if=20a=20rec?=
 =?UTF-8?q?ording=20is=20currently=20active=20on=20the=20primary=20device.?=
 =?UTF-8?q?=20-=20Fixed=20a=20possible=20freeze=20in=20pause=20mode=20in?=
 =?UTF-8?q?=20case=20a=20device's=20PlayPesPacket()=20function=20=20=20per?=
 =?UTF-8?q?manently=20returns=200=20(thanks=20to=20Reinhard=20Nissl=20and?=
 =?UTF-8?q?=20Olaf=20Titz).=20-=20Completed=20the=20Finnish=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Restricted=20the=20"?=
 =?UTF-8?q?setting=20audio=20track"=20log=20message=20to=20automatic=20cha?=
 =?UTF-8?q?nges=20during=20replay.=20-=20Fixed=20handling=20Transfer=20Mod?=
 =?UTF-8?q?e=20for=20radio=20channels=20(thanks=20to=20Andreas=20Regel=20f?=
 =?UTF-8?q?or=20=20=20reporting=20this=20one).=20-=20Fixed=20handling=20sy?=
 =?UTF-8?q?mbolic=20links=20in=20cRecordings::ScanVideoDir()=20(thanks=20t?=
 =?UTF-8?q?o=20Stefan=20=20=20Huelswitt).=20-=20Completed=20the=20Danish?=
 =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Mogens=20Elneff).=20-=20Forcing?=
 =?UTF-8?q?=20a=20new=20resync=20after=20a=20call=20to=20cRemux::Clear()?=
 =?UTF-8?q?=20(suggested=20by=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20The=20?=
 =?UTF-8?q?cAudio::Play()=20function=20now=20has=20an=20additional=20param?=
 =?UTF-8?q?eter=20'uchar=20Id'=20which=20tells=20=20=20the=20function=20th?=
 =?UTF-8?q?e=20substream=20id=20of=20the=20given=20audio=20packet,=20so=20?=
 =?UTF-8?q?that=20a=20plugin=20can=20=20=20take=20the=20right=20action=20f?=
 =?UTF-8?q?or=20the=20various=20kinds=20if=20audio=20data=20-=20which=20no?=
 =?UTF-8?q?w=20also=20includes=20=20=20"normal"=20audio=20with=20ids=200xC?=
 =?UTF-8?q?0...0xDF=20(based=20on=20suggestions=20by=20Werner=20Fink=20and?=
 =?UTF-8?q?=20Macro=20=20=20Schl=C3=BC=C3=9Fler).=20-=20Removed=20the=20"C?=
 =?UTF-8?q?leared/PlayPes(NULL,=200)"=20handling=20from=20cTransfer::Actio?=
 =?UTF-8?q?n(),=20since=20this=20=20=20is=20now=20done=20when=20attaching?=
 =?UTF-8?q?=20the=20player=20to=20the=20device=20(thanks=20to=20Marco=20Sc?=
 =?UTF-8?q?hl=C3=BC=C3=9Fler).=20-=20Making=20sure=20the=20buffer=20reserv?=
 =?UTF-8?q?e=20in=20cTransfer::Action()=20is=20re-established=20after=20?=
 =?UTF-8?q?=20=20clearing=20the=20buffer.=20-=20Added=20DeviceClrAvailable?=
 =?UTF-8?q?Tracks()=20and=20DeviceSetCurrentAudioTrack()=20to=20cPlayer=20?=
 =?UTF-8?q?=20=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fixed?=
 =?UTF-8?q?=20a=20typo=20in=20detecting=20UTF-8=20(thanks=20to=20Reinhard?=
 =?UTF-8?q?=20Nissl).=20-=20Now=20using=20twice=20the=20buffer=20reserve?=
 =?UTF-8?q?=20in=20cTransfer=20if=20the=20primary=20DVB=20card=20is=20an?=
 =?UTF-8?q?=20=20=20unmodified=20version=20with=20only=202MB=20of=20SDRAM,?=
 =?UTF-8?q?=20to=20avoid=20audio=20stuttering=20when=20=20=20playing=20Dol?=
 =?UTF-8?q?by=20Digital=20over=20the=20DVB=20card=20(thanks=20to=20Christi?=
 =?UTF-8?q?an=20Jacobsen=20and=20Chad=20=20=20Flynt=20for=20suggestions=20?=
 =?UTF-8?q?and=20experiments=20in=20that=20area).=20-=20Making=20sure=20th?=
 =?UTF-8?q?e=20first=20audio=20packet=20is=20not=20dropped=20when=20switch?=
 =?UTF-8?q?ing=20to=20"pre=201.3.19=20=20=20Dolby=20Digital=20compatibilit?=
 =?UTF-8?q?y=20mode".=20-=20The=20'plugins-clean'=20target=20of=20the=20Ma?=
 =?UTF-8?q?kefile=20now=20only=20deletes=20the=20actual=20plugin=20=20=20l?=
 =?UTF-8?q?ibrary=20files=20from=20this=20version=20of=20VDR=20(suggested?=
 =?UTF-8?q?=20by=20Andreas=20Brachold).=20-=20Added=20a=20missing=20'resul?=
 =?UTF-8?q?tSkipped=20=3D=200'=20to=20cRemux::Clear()=20(thanks=20to=20Mar?=
 =?UTF-8?q?co=20Schl=C3=BC=C3=9Fler=20=20=20for=20reporting=20this=20one).?=
 =?UTF-8?q?=20-=20The=20new=20function=20cDvbDevice::SetTransferModeForDol?=
 =?UTF-8?q?byDigital()=20can=20be=20used=20by=20=20=20plugins=20that=20imp?=
 =?UTF-8?q?lement=20Dolby=20Digital=20output=20and=20thus=20want=20to=20pr?=
 =?UTF-8?q?event=20the=20cDvbDevice=20=20=20from=20starting=20Transfer=20M?=
 =?UTF-8?q?ode=20in=20order=20to=20replay=20DD=20over=20the=20DVB=20device?=
 =?UTF-8?q?.=20-=20Added=20missing=20reset=20of=20the=20'repacker'=20to=20?=
 =?UTF-8?q?cTS2PES::Clear()=20(thanks=20to=20Marco=20=20=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler=20for=20reporting=20this=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  | 23 ++++++++++++++++++++++-
 HISTORY       | 42 ++++++++++++++++++++++++++++++++++++++++++
 INSTALL       |  2 +-
 Makefile      | 10 +++++++---
 PLUGINS.html  | 41 +++++++++++++++++++++--------------------
 audio.c       | 35 +++++++++++++++++------------------
 audio.h       | 23 ++++++++++++-----------
 channels.conf | 10 +++++-----
 config.h      |  6 +++---
 device.c      | 23 ++++++++++++++++-------
 dvbdevice.c   | 20 +++++++++++++++-----
 dvbdevice.h   |  5 ++++-
 dvbosd.c      |  9 ++++++++-
 i18n.c        |  6 +++---
 player.h      |  4 +++-
 recording.c   |  7 ++++---
 remux.c       | 10 ++++++++--
 tools.h       |  4 ++--
 transfer.c    | 38 +++++++++++++++++++++++---------------
 vdr.c         |  6 +++---
 20 files changed, 219 insertions(+), 105 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0c29e35b4..94258a468 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -192,6 +192,7 @@ Stefan Huelswitt <huels@iname.com>
  for fixing a possible race condition in cDevice::Action() and cTSBuffer::Action()
  for reporting several memory leaks that were introduced through the use of cString
  for adding MPEG1 replay capability to cPesAssembler
+ for fixing handling symbolic links in cRecordings::ScanVideoDir()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -272,6 +273,7 @@ Werner Fink <werner@suse.de>
  recordings can be triggered in the default branch
  for pointing out that pesAssembler->Reset() needs to be called between subsequent
  Transfer Modes
+ for suggestions that led to the addition of the 'Id' parameter to cAudio::Play().
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -789,10 +791,12 @@ Christoph Friederich <christoph.friederich@gmx.de>
  for reporting a bug in deleting the last recording in the "Recordings" menu, which
  started pausing live video
 
-Andreas Brachold <andy03@deltab.de>
+Andreas Brachold <vdr04@deltab.de>
  for his support in keeping 'channels.conf.terr' up to date
  for fixing 'newplugin' and libsi/Makefile to use the compiler defined in $(CXX)
  for generating file dependencies
+ for suggesting that the 'plugins-clean' target of the Makefile should only delete
+ the actual plugin library files from this version of VDR
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -805,6 +809,7 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for making the LIRC interface skip keys that come in too fast
  for reporting a problem in handling the '-E' options in version 1.3.18
  for reporting a problem in case a station defines all 32 audio PIDs
+ for suggestions and experiments regarding the buffer reserve in cTransfer
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
@@ -925,6 +930,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for extending some buffer sizes to allow handling HDTV streams
  for adding substream handling to cDolbyRepacker
  for modifying cDolbyRepacker to make sure PES packets don't exceed the requested length
+ for fixing a possible freeze in pause mode in case a device's PlayPesPacket()
+ function permanently returns 0
+ for fixing a typo in detecting UTF-8
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1042,6 +1050,7 @@ Andreas Regel <andreas.regel@gmx.de>
  video directory is empty
  for pointing out a missing call to cStatus::MsgOsdtatusMessage(NULL) in
  cSkins::Message()
+ for reporting a problem in handling Transfer Mode for radio channels
 
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1131,6 +1140,13 @@ Marco Schl
  for pointing out that PlayPes(NULL, 0) needs to be called in cTransfer::Action()
  when clearing the transfer buffer to avoid overflows
  for adding CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime()
+ for suggesting to force a new resync after a call to cRemux::Clear()
+ for suggestions that led to the addition of the 'Id' parameter to cAudio::Play().
+ for removing the "Cleared/PlayPes(NULL, 0)" handling from cTransfer::Action(), since
+ this is now done when attaching the player to the device
+ for adding DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer
+ for reporting a missing 'resultSkipped = 0' in cRemux::Clear()
+ for reporting a missing reset of the 'repacker' in cTS2PES::Clear()
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1215,6 +1231,8 @@ Dino Ravnic <dino.ravnic@fer.hr>
 
 Olaf Titz <olaf@bigred.inka.de>
  for fixing some typos in the Makefile's 'font' target
+ for reporting a problem and some advice in fixing a possible freeze in pause mode
+ in case a device's PlayPesPacket() function permanently returns 0
 
 Darren Salt <linux@youmustbejoking.demon.co.uk>
  for pointing out that the '-' and '�' characters need to be escaped in the man
@@ -1250,3 +1268,6 @@ Rolf Groppe <rolf@groppe.de>
 Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for pointing out that primaryDevice = NULL should be done before deleting the devices
  in cDevice::Shutdown()
+
+Chad Flynt <hoochster@sofnet.com>
+ for suggestions and experiments regarding the buffer reserve in cTransfer
diff --git a/HISTORY b/HISTORY
index 2beb808dd..41b36ebd0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3373,3 +3373,45 @@ Video Disk Recorder Revision History
   residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this
   out).
 - Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
+
+2005-02-13: Version 1.3.21
+
+- Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching
+  back to live mode if a recording is currently active on the primary device.
+- Fixed a possible freeze in pause mode in case a device's PlayPesPacket() function
+  permanently returns 0 (thanks to Reinhard Nissl and Olaf Titz).
+- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Restricted the "setting audio track" log message to automatic changes during replay.
+- Fixed handling Transfer Mode for radio channels (thanks to Andreas Regel for
+  reporting this one).
+- Fixed handling symbolic links in cRecordings::ScanVideoDir() (thanks to Stefan
+  Huelswitt).
+- Completed the Danish OSD texts (thanks to Mogens Elneff).
+- Forcing a new resync after a call to cRemux::Clear() (suggested by Marco Schl��ler).
+- The cAudio::Play() function now has an additional parameter 'uchar Id' which tells
+  the function the substream id of the given audio packet, so that a plugin can
+  take the right action for the various kinds if audio data - which now also includes
+  "normal" audio with ids 0xC0...0xDF (based on suggestions by Werner Fink and Macro
+  Schl��ler).
+- Removed the "Cleared/PlayPes(NULL, 0)" handling from cTransfer::Action(), since this
+  is now done when attaching the player to the device (thanks to Marco Schl��ler).
+- Making sure the buffer reserve in cTransfer::Action() is re-established after
+  clearing the buffer.
+- Added DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer
+  (thanks to Marco Schl��ler).
+- Fixed a typo in detecting UTF-8 (thanks to Reinhard Nissl).
+- Now using twice the buffer reserve in cTransfer if the primary DVB card is an
+  unmodified version with only 2MB of SDRAM, to avoid audio stuttering when
+  playing Dolby Digital over the DVB card (thanks to Christian Jacobsen and Chad
+  Flynt for suggestions and experiments in that area).
+- Making sure the first audio packet is not dropped when switching to "pre 1.3.19
+  Dolby Digital compatibility mode".
+- The 'plugins-clean' target of the Makefile now only deletes the actual plugin
+  library files from this version of VDR (suggested by Andreas Brachold).
+- Added a missing 'resultSkipped = 0' to cRemux::Clear() (thanks to Marco Schl��ler
+  for reporting this one).
+- The new function cDvbDevice::SetTransferModeForDolbyDigital() can be used by
+  plugins that implement Dolby Digital output and thus want to prevent the cDvbDevice
+  from starting Transfer Mode in order to replay DD over the DVB device.
+- Added missing reset of the 'repacker' to cTS2PES::Clear() (thanks to Marco
+  Schl��ler for reporting this one).
diff --git a/INSTALL b/INSTALL
index f054d7ab3..df57170c5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -268,7 +268,7 @@ name you use with '-v' is a clean and absolute path name (no '..' or
 multiple slashes).
 
 Note that the file system need not be 64-bit proof, since the 'vdr'
-program splits video files into chunks of about 1GB. You should use
+program splits video files into chunks of about 2GB. You should use
 a disk with several gigabytes of free space. One GB can store roughly
 half an hour of video data.
 
diff --git a/Makefile b/Makefile
index f70a2e916..59e7e787e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.73 2004/12/18 13:39:19 kls Exp $
+# $Id: Makefile 1.74 2005/02/13 10:13:45 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -71,6 +71,10 @@ DEFINES += -D_GNU_SOURCE
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
+# The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
 ifdef VFAT
 # for people who want their video directory on a VFAT partition
 DEFINES += -DVFAT
@@ -166,7 +170,7 @@ plugins: include-dir
 
 plugins-clean:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
-	@-rm -f $(PLUGINLIBDIR)/*
+	@-rm -f $(PLUGINLIBDIR)/libvdr-*.so.$(VDRVERSION)
 
 # Install the files:
 
@@ -183,7 +187,7 @@ install:
 
 srcdoc:
 	@cp $(DOXYFILE) $(DOXYFILE).tmp
-	@echo PROJECT_NUMBER = `grep VDRVERSION config.h | awk '{ print $$3 }'` >> $(DOXYFILE).tmp
+	@echo PROJECT_NUMBER = $(VDRVERSION) >> $(DOXYFILE).tmp
 	$(DOXYGEN) $(DOXYFILE).tmp
 	@rm $(DOXYFILE).tmp
 
diff --git a/PLUGINS.html b/PLUGINS.html
index df6d0fad8..67b96d936 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.8 are marked like this.
-<!--X1.3.8--></td></tr></table>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.18 are marked like this.
 <!--X1.3.18--></td></tr></table>
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.19 are marked like this.
 <!--X1.3.19--></td></tr></table>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.20 are marked like this.
 <!--X1.3.20--></td></tr></table>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.21 are marked like this.
+<!--X1.3.21--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -58,7 +58,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line arguments">Command line arguments</a>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Shutting down">Shutting down</a>
 <!--X1.3.20--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
@@ -81,7 +81,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<li><a href="#Dolby Digital">Dolby Digital</a>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Audio">Audio</a>
+<!--X1.3.21--></td></tr></table>
 <li><a href="#Remote Control">Remote Control</a>
 </ul>
 </ul>
@@ -306,7 +308,7 @@ <h1>Table Of Contents</h1>
 command line help - and after that immediately destroys them again.
 <p>
 The <b>destructor</b> has to clean up any data created by the plugin.
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Any threads the plugin may have created shall be stopped in the
 <a href="#Shutting down"><tt>Stop()</tt></a> function.
 <!--X1.3.20--></td></tr></table>
@@ -504,7 +506,7 @@ <h1>Table Of Contents</h1>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement either of these functions.
 
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="Shutting down"><hr><h2>Shutting down</h2>
 
 <center><i><b>Stop it, right there!</b></i></center><p>
@@ -1044,7 +1046,7 @@ <h1>Table Of Contents</h1>
 Take a look at the files <tt>player.h</tt> and <tt>dvbplayer.c</tt> to see how VDR implements
 its own player for the VDR recordings.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 To play the actual data, the player needs to call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
@@ -1067,7 +1069,7 @@ <h1>Table Of Contents</h1>
 
 to determine whether the device is ready for further data.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 By default all audio track handling is done by the device a player is
 attached to.
 If the player can provide more than a single audio track, and has special
@@ -1204,7 +1206,7 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 :cReceiver(0, -1, Pid)
 <!--X1.3.19--></td></tr></table>
 {
@@ -1382,7 +1384,7 @@ <h1>Table Of Contents</h1>
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
   virtual cSkinDisplayMessage *DisplayTrack(int NumTracks, const char * const *Tracks);
 <!--X1.3.18--></td></tr></table>
   virtual cSkinDisplayMessage *DisplayMessage(void);
@@ -1404,7 +1406,6 @@ <h1>Table Of Contents</h1>
 in the <a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
 Do not delete this object, it will be automatically deleted when the program ends.
 <p>
-<!--X1.3.8--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 In order to be able to easily identify plugins that implement a skin it is recommended
 that the name of such a plugin should be
 
@@ -1414,8 +1415,6 @@ <h1>Table Of Contents</h1>
 
 where <tt>xyz</tt> is the actual name of the skin.
 
-<!--X1.3.8--></td></tr></table>
-
 <a name="Themes"><hr><h2>Themes</h2>
 
 <center><i><b>Eye of the beholder...</b></i></center><p>
@@ -1514,7 +1513,7 @@ <h1>Table Of Contents</h1>
 If the device can provide more than a single audio track, it can implement the
 following function to make them available:
 
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual void SetAudioTrackDevice(eTrackType Type);
 virtual int GetAudioChannelDevice(void);
@@ -1659,7 +1658,7 @@ <h1>Table Of Contents</h1>
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<a name="Dolby Digital"><hr><h2>Dolby Digital</h2>
+<a name="Audio"><hr><h2>Audio</h2>
 
 <center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
 
@@ -1679,7 +1678,9 @@ <h1>Table Of Contents</h1>
   virtual void Action(void);
 public:
   cMyAudio(void);
-  virtual void Play(const uchar *Data, int Length);
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+  virtual void Play(const uchar *Data, int Length, uchar Id);
+<!--X1.3.21--></td></tr></table>
   virtual void Mute(bool On);
   virtual void Clear(void);
   };
diff --git a/audio.c b/audio.c
index c958256d9..742c50b4c 100644
--- a/audio.c
+++ b/audio.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 1.2 2002/11/03 11:53:34 kls Exp $
+ * $Id: audio.c 1.3 2005/02/12 12:40:51 kls Exp $
  */
 
 #include "audio.h"
@@ -25,10 +25,10 @@ cAudio::~cAudio()
 
 cAudios Audios;
 
-void cAudios::PlayAudio(const uchar *Data, int Length)
+void cAudios::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
   for (cAudio *audio = First(); audio; audio = Next(audio))
-      audio->Play(Data, Length);
+      audio->Play(Data, Length, Id);
 }
 
 void cAudios::MuteAudio(bool On)
@@ -56,25 +56,24 @@ cExternalAudio::~cExternalAudio()
   free(command);
 }
 
-void cExternalAudio::Play(const uchar *Data, int Length)
+void cExternalAudio::Play(const uchar *Data, int Length, uchar Id)
 {
   if (command && !mute) {
      if (pipe || pipe.Open(command, "w")) {
-        if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01) {
-           if (Data[3] == 0xBD) { // dolby
-              //XXX??? int written = Data[8] + (skipAC3bytes ? 13 : 9); // skips the PES header
-              int written = Data[8] + 9; // skips the PES header
-              Length -= written;
-              while (Length > 0) {
-                    int w = fwrite(Data + written, 1, Length, pipe);
-                    if (w < 0) {
-                       LOG_ERROR;
-                       break;
-                       }
-                    Length -= w;
-                    written += w;
+        if (0x80 <= Id && Id <= 0x87 || Id == 0xBD) { // AC3
+           int written = Data[8] + 9; // skips the PES header
+           if (Id != 0xBD)
+              written += 4; // skips AC3 bytes
+           Length -= written;
+           while (Length > 0) {
+                 int w = fwrite(Data + written, 1, Length, pipe);
+                 if (w < 0) {
+                    LOG_ERROR;
+                    break;
                     }
-              }
+                 Length -= w;
+                 written += w;
+                 }
            }
         }
      else {
diff --git a/audio.h b/audio.h
index 565bd9721..03ec01dbc 100644
--- a/audio.h
+++ b/audio.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.h 1.2 2002/11/03 11:50:02 kls Exp $
+ * $Id: audio.h 1.3 2005/02/12 12:20:19 kls Exp $
  */
 
 #ifndef __AUDIO_H
@@ -18,21 +18,22 @@ class cAudio : public cListObject {
   cAudio(void);
 public:
   virtual ~cAudio();
-  virtual void Play(const uchar *Data, int Length) = 0;
-       // Plays the given block of audio Data. Must return as soon as possible.
-       // If the entire block of data can't be processed immediately, it must
-       // be copied and processed in a separate thread. The Data is always a
-       // complete PES audio packet.
+  virtual void Play(const uchar *Data, int Length, uchar Id) = 0;
+       ///< Plays the given block of audio Data. Must return as soon as possible.
+       ///< If the entire block of data can't be processed immediately, it must
+       ///< be copied and processed in a separate thread. The Data is always a
+       ///< complete PES audio packet. Id indicates the type of audio data this
+       ///< packet holds.
   virtual void Mute(bool On) = 0;
-       // Immediately sets the audio device to be silent (On==true) or to
-       // normal replay (On==false).
+       ///< Immediately sets the audio device to be silent (On==true) or to
+       ///< normal replay (On==false).
   virtual void Clear(void) = 0;
-       // Clears all data that might still be awaiting processing.
+       ///< Clears all data that might still be awaiting processing.
   };
 
 class cAudios : public cList<cAudio> {
 public:
-  void PlayAudio(const uchar *Data, int Length);
+  void PlayAudio(const uchar *Data, int Length, uchar Id);
   void MuteAudio(bool On);
   void ClearAudio(void);
   };
@@ -47,7 +48,7 @@ class cExternalAudio : public cAudio {
 public:
   cExternalAudio(const char *Command);
   virtual ~cExternalAudio();
-  virtual void Play(const uchar *Data, int Length);
+  virtual void Play(const uchar *Data, int Length, uchar Id);
   virtual void Mute(bool On);
   virtual void Clear(void);
   };
diff --git a/channels.conf b/channels.conf
index 836e3be62..d05e25213 100644
--- a/channels.conf
+++ b/channels.conf
@@ -45,21 +45,21 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1801,1722,1702:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
 DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
-PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1801,1722:27:133:4:0
+Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
+PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
diff --git a/config.h b/config.h
index 64ebe7ccd..7dffe1401 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.212 2005/02/05 10:43:22 kls Exp $
+ * $Id: config.h 1.213 2005/02/08 11:22:14 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.20"
-#define VDRVERSNUM   10320  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.21"
+#define VDRVERSNUM   10321  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 46e23bc5a..f270b5a46 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.87 2005/02/06 14:10:37 kls Exp $
+ * $Id: device.c 1.92 2005/02/13 09:51:48 kls Exp $
  */
 
 #include "device.h"
@@ -756,7 +756,8 @@ void cDevice::EnsureAudioTrack(bool Force)
      // Make sure we're set to an available audio track:
      const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
      if (Force || !Track || !Track->id || PreferredTrack != GetCurrentAudioTrack()) {
-        dsyslog("setting audio track to %d", PreferredTrack);
+        if (!Force) // only log this for automatic changes
+           dsyslog("setting audio track to %d", PreferredTrack);
         SetCurrentAudioTrack(PreferredTrack);
         }
      }
@@ -882,8 +883,11 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                break;
           case 0xC0 ... 0xDF: // audio
                SetAvailableTrack(ttAudio, c - 0xC0, c);
-               if (!VideoOnly && c == availableTracks[currentAudioTrack].id)
+               if (!VideoOnly && c == availableTracks[currentAudioTrack].id) {
                   w = PlayAudio(Start, d);
+                  if (FirstLoop)
+                     Audios.PlayAudio(Data, Length, c);
+                  }
                break;
           case 0xBD: { // private stream 1
                int PayloadOffset = Data[8] + 9;
@@ -892,6 +896,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                uchar SubStreamIndex = SubStreamId & 0x1F;
 
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
+pre_1_3_19_PrivateStreamDeteced:
                if (pre_1_3_19_PrivateStream) {
                   SubStreamId = c;
                   SubStreamType = 0x80;
@@ -907,15 +912,18 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                          SetAvailableTrack(ttDolby, SubStreamIndex, SubStreamId);
                          if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
                             w = PlayAudio(Start, d);
-                            if (FirstLoop && !(SubStreamId & 0x08)) // no DTS
-                               Audios.PlayAudio(Data, Length);
+                            if (FirstLoop)
+                               Audios.PlayAudio(Data, Length, SubStreamId);
                             }
                          }
                       break;
                  case 0xA0: // LPCM
                       SetAvailableTrack(ttAudio, SubStreamIndex, SubStreamId);
-                      if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id)
+                      if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
                          w = PlayAudio(Start, d);
+                         if (FirstLoop)
+                            Audios.PlayAudio(Data, Length, SubStreamId);
+                         }
                       break;
                  default:
                       // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
@@ -923,6 +931,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                          dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode");
                          ClrAvailableTracks();
                          pre_1_3_19_PrivateStream = true;
+                         goto pre_1_3_19_PrivateStreamDeteced;
                          }
                  }
                }
@@ -984,7 +993,7 @@ int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
            int w = PlayPesPacket(Data + i, l, VideoOnly);
            if (w > 0)
               i += l;
-           else if (w < 0)
+           else
               return i == 0 ? w : i;
            }
         else
diff --git a/dvbdevice.c b/dvbdevice.c
index 269c0a299..741848a89 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.117 2005/02/06 12:30:14 kls Exp $
+ * $Id: dvbdevice.c 1.120 2005/02/13 14:26:37 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -346,6 +346,7 @@ void cDvbTuner::Action(void)
 // --- cDvbDevice ------------------------------------------------------------
 
 int cDvbDevice::devVideoOffset = -1;
+bool cDvbDevice::setTransferModeForDolbyDigital = true;
 
 cDvbDevice::cDvbDevice(int n)
 {
@@ -768,8 +769,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                             );
 
   bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune
-                           && (LiveView && HasPid(Channel->Vpid()) && pidHandles[ptVideo].pid != Channel->Vpid() // the PID is already set as DMX_PES_OTHER
-                              || !LiveView && pidHandles[ptVideo].pid == Channel->Vpid() // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                           && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || pidHandles[ptAudio].pid != Channel->Apid(0))// the PID is already set as DMX_PES_OTHER
+                              || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
 
   bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode
@@ -861,15 +862,24 @@ void cDvbDevice::SetDigitalAudioDevice(bool On)
      }
 }
 
+void cDvbDevice::SetTransferModeForDolbyDigital(bool On)
+{
+  setTransferModeForDolbyDigital = On;
+}
+
 void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
 {
   const tTrackId *TrackId = GetTrack(Type);
   if (TrackId && TrackId->id) {
      if (IS_AUDIO_TRACK(Type)) {
-        pidHandles[ptAudio].pid = TrackId->id;
-        SetPid(&pidHandles[ptAudio], ptAudio, true);
+        if (pidHandles[ptAudio].pid) {
+           pidHandles[ptAudio].pid = TrackId->id;
+           SetPid(&pidHandles[ptAudio], ptAudio, true);
+           }
         }
      else if (IS_DOLBY_TRACK(Type)) {
+        if (!setTransferModeForDolbyDigital)
+           return;
         // Currently this works only in Transfer Mode
         cChannel *Channel = Channels.GetByNumber(CurrentChannel());
         if (Channel)
diff --git a/dvbdevice.h b/dvbdevice.h
index 233515d8c..99456e732 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.32 2005/01/06 13:30:51 kls Exp $
+ * $Id: dvbdevice.h 1.33 2005/02/13 14:14:31 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -99,11 +99,14 @@ class cDvbDevice : public cDevice {
 
 private:
   bool digitalAudio;
+  static bool setTransferModeForDolbyDigital;
 protected:
   virtual int GetAudioChannelDevice(void);
   virtual void SetAudioChannelDevice(int AudioChannel);
   virtual void SetVolumeDevice(int Volume);
   virtual void SetDigitalAudioDevice(bool On);
+public:
+  static void SetTransferModeForDolbyDigital(bool On);
 
 // Player facilities
 
diff --git a/dvbosd.c b/dvbosd.c
index fbf6f61c0..360825fca 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.25 2004/11/20 14:29:25 kls Exp $
+ * $Id: dvbosd.c 1.26 2005/02/12 15:36:31 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -48,6 +48,13 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
      cap.cmd = OSD_CAP_MEMSIZE;
      if (ioctl(osdDev, OSD_GET_CAPABILITY, &cap) == 0)
         osdMem = cap.val;
+     #define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+     #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+     //XXX This is a very ugly hack to allow cDvbOsd to reduce the buffer
+     //XXX requirements in cTransfer if it detects a 4MB full featured DVB card.
+     extern bool DvbCardWith4MBofSDRAM;
+     DvbCardWith4MBofSDRAM = osdMem >= 1000000;
+     #endif
 #endif
      // must clear all windows here to avoid flashing effects - doesn't work if done
      // in Flush() only for the windows that are actually used...
diff --git a/i18n.c b/i18n.c
index b6c8800be..9d7417c01 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.175 2005/02/05 10:46:30 kls Exp $
+ * $Id: i18n.c 1.177 2005/02/12 10:26:51 kls Exp $
  *
  * Translations provided by:
  *
@@ -2829,6 +2829,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Dur�e affichage infos cha�nes (s)",
     "",// TODO
+    "Kanavatiedon esitysaika (s)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2839,8 +2840,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Tid kanalinfo skal vises (s)",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
diff --git a/player.h b/player.h
index 3ffc7e36c..6b08178fa 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.15 2005/02/06 11:44:56 kls Exp $
+ * $Id: player.h 1.16 2005/02/12 14:45:29 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -19,7 +19,9 @@ class cPlayer {
   cDevice *device;
   ePlayMode playMode;
 protected:
+  void DeviceClrAvailableTracks(bool DescriptionsOnly = false) { if (device) device->ClrAvailableTracks(DescriptionsOnly); }
   bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description) : false; }
+  bool DeviceSetCurrentAudioTrack(eTrackType Type) { return device ? device->SetCurrentAudioTrack(Type) : false; }
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
diff --git a/recording.c b/recording.c
index c6460f273..e50dfcb75 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.95 2005/02/06 09:46:31 kls Exp $
+ * $Id: recording.c 1.96 2005/02/12 10:17:47 kls Exp $
  */
 
 #include "recording.h"
@@ -637,8 +637,9 @@ void cRecordings::ScanVideoDir(const char *DirName)
            struct stat st;
            if (stat(buffer, &st) == 0) {
               if (S_ISLNK(st.st_mode)) {
-                 free(buffer);
-                 buffer = ReadLink(buffer);
+                 char *old = buffer;
+                 buffer = ReadLink(old);
+                 free(old);
                  if (!buffer)
                     continue;
                  if (stat(buffer, &st) != 0) {
diff --git a/remux.c b/remux.c
index 49bd89891..ca65a61e2 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.28 2005/02/05 11:56:42 kls Exp $
+ * $Id: remux.c 1.31 2005/02/13 14:36:23 kls Exp $
  */
 
 #include "remux.h"
@@ -29,6 +29,7 @@ class cRepacker {
 public:
   cRepacker(void) { maxPacketSize = 6 + 65535; subStreamId = 0; }
   virtual ~cRepacker() {}
+  virtual void Reset(void) {}
   virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
   virtual int BreakAt(const uchar *Data, int Count) = 0;
   void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
@@ -56,13 +57,13 @@ class cDolbyRepacker : public cRepacker {
     get_length,
     output_packet
     } state;
-  void Reset(void);
   void ResetPesHeader(void);
   void AppendSubStreamID(void);
   bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
   bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
 public:
   cDolbyRepacker(void);
+  virtual void Reset(void);
   virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
   virtual int BreakAt(const uchar *Data, int Count);
   };
@@ -474,6 +475,8 @@ cTS2PES::~cTS2PES()
 void cTS2PES::Clear(void)
 {
   reset_ipack();
+  if (repacker)
+     repacker->Reset();
 }
 
 void cTS2PES::store(uint8_t *Data, int Count)
@@ -1007,6 +1010,9 @@ void cRemux::Clear(void)
   for (int t = 0; t < numTracks; t++)
       ts2pes[t]->Clear();
   resultBuffer->Clear();
+  synced = false;
+  skipped = 0;
+  resultSkipped = 0;
 }
 
 void cRemux::SetBrokenLink(uchar *Data, int Length)
diff --git a/tools.h b/tools.h
index bf190890d..be8782bf8 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.66 2005/02/05 10:00:22 kls Exp $
+ * $Id: tools.h 1.67 2005/02/12 10:17:14 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -95,7 +95,7 @@ bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
-char *ReadLink(const char *FileName);
+char *ReadLink(const char *FileName); ///< returns a new strings allocated on the heap, which the caller must delete (or NULL in case of an error)
 bool SpinUpDisk(const char *FileName);
 time_t LastModifiedTime(const char *FileName);
 cString WeekDayName(int WeekDay);
diff --git a/transfer.c b/transfer.c
index b3cbec45d..331ac62b7 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.25 2005/01/23 14:27:40 kls Exp $
+ * $Id: transfer.c 1.27 2005/02/12 15:54:06 kls Exp $
  */
 
 #include "transfer.h"
@@ -54,24 +54,26 @@ void cTransfer::Receive(uchar *Data, int Length)
      }
 }
 
+#define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+//XXX This is a very ugly hack to allow cDvbOsd to reduce the buffer
+//XXX requirements in cTransfer if it detects a 4MB full featured DVB card.
+bool DvbCardWith4MBofSDRAM = false;
+#endif
+
 void cTransfer::Action(void)
 {
   int PollTimeouts = 0;
   uchar *p = NULL;
   int Result = 0;
-#define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
 #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-  bool Cleared = false;
   bool GotBufferReserve = false;
+  int RequiredBufferReserve = KILOBYTE(DvbCardWith4MBofSDRAM ? 288 : 576);
 #endif
   active = true;
   while (active) {
 #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-        if (needsBufferReserve) {
-           if (IsAttached() && !Cleared) {
-              PlayPes(NULL, 0);
-              Cleared = true;
-              }
+        if (needsBufferReserve && !GotBufferReserve) {
            //XXX For dolby we've to fill the buffer because the firmware does
            //XXX not decode dolby but use a PCM stream for transport, therefore
            //XXX the firmware has not enough buffer for noiseless skipping early
@@ -79,14 +81,12 @@ void cTransfer::Action(void)
            //XXX audio is mostly to early in comparison to video).
            //XXX To resolve this, the remuxer or PlayPes() should synchronize
            //XXX audio with the video frames. 2004/09/09 Werner
-           if (!GotBufferReserve) {
-              if (ringBuffer->Available() < 3 * KILOBYTE(192) / 2) { // used to be MAXFRAMESIZE, but the HDTV value of KILOBYTE(512) is way too much here
-                 cCondWait::SleepMs(20); // allow the buffer to collect some reserve
-                 continue;
-                 }
-              else
-                 GotBufferReserve = true;
+           if (ringBuffer->Available() < RequiredBufferReserve) { // used to be MAXFRAMESIZE, but the HDTV value of KILOBYTE(512) is way too much here
+              cCondWait::SleepMs(20); // allow the buffer to collect some reserve
+              continue;
               }
+           else
+              GotBufferReserve = true;
            }
 #endif
         int Count;
@@ -98,10 +98,14 @@ void cTransfer::Action(void)
               // So let's clear the buffer instead of suffering from permanent
               // overflows.
               dsyslog("clearing transfer buffer to avoid overflows");
+              DeviceClear();
               ringBuffer->Clear();
               remux->Clear();
               PlayPes(NULL, 0);
               p = NULL;
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+              GotBufferReserve = false;
+#endif
               continue;
               }
            Count = remux->Put(b, Count);
@@ -132,7 +136,11 @@ void cTransfer::Action(void)
                  DeviceClear();
                  ringBuffer->Clear();
                  remux->Clear();
+                 PlayPes(NULL, 0);
                  p = NULL;
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+                 GotBufferReserve = false;
+#endif
                  }
               }
            }
diff --git a/vdr.c b/vdr.c
index 6b2ac3793..15aff9493 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.201 2005/01/30 14:15:50 kls Exp $
+ * $Id: vdr.c 1.202 2005/02/12 15:06:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -100,8 +100,8 @@ int main(int argc, char *argv[])
 
   // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
   char *LangEnv;
-  if ((LangEnv = getenv("LANG"))    != NULL && strcasestr(LangEnv, "utf") ||
-      (LangEnv = getenv("LC_TYPE")) != NULL && strcasestr(LangEnv, "utf")) {
+  if ((LangEnv = getenv("LANG"))     != NULL && strcasestr(LangEnv, "utf") ||
+      (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
      fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
      return 2;
      }

From 05402c740765e6e0ca2aaf1760c77d9e3d3ed5a5 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Feb 2005 18:00:00 +0100
Subject: [PATCH 114/307] =?UTF-8?q?Version=201.3.22=20-=20Removed=20some?=
 =?UTF-8?q?=20unneeded=20code=20and=20fixed=20access=20to=20unallocated=20?=
 =?UTF-8?q?memory=20in=20=20=20cEvent::FixEpgBugs()=20(thanks=20to=20Wolfg?=
 =?UTF-8?q?ang=20Rohdewald).=20-=20Avoiding=20unnecessary=20calls=20to=20S?=
 =?UTF-8?q?etPid()=20in=20cDvbDevice::SetAudioTrackDevice()=20=20=20(thank?=
 =?UTF-8?q?s=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20No=20longer=20call?=
 =?UTF-8?q?ing=20EnsureAudioTrack()=20in=20cDevice::SetChannel()=20if=20a?=
 =?UTF-8?q?=20Transfer=20Mode=20is=20=20=20started,=20to=20avoid=20setting?=
 =?UTF-8?q?=20the=20audio=20PID=20on=20the=20primary=20device=20(thanks=20?=
 =?UTF-8?q?to=20Marco=20=20=20Schl=C3=BC=C3=9Fler=20for=20pointing=20this?=
 =?UTF-8?q?=20out).=20-=20Replaced=20the=20call=20to=20system("sync")=20in?=
 =?UTF-8?q?=20SpinUpDisk()=20with=20fdatasync(f)=20to=20avoid=20=20=20prob?=
 =?UTF-8?q?lems=20on=20NPTL=20systems=20(thanks=20to=20Chris=20Warren=20fo?=
 =?UTF-8?q?r=20pointing=20this=20out).=20-=20Increased=20POLLTIMEOUTS=5FBE?=
 =?UTF-8?q?FORE=5FDEVICECLEAR=20in=20transfer.c=20to=206=20to=20avoid=20pr?=
 =?UTF-8?q?oblems=20=20=20with=20the=20larger=20buffer=20reserve=20(thanks?=
 =?UTF-8?q?=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fixed=20the=20call?=
 =?UTF-8?q?=20to=20SetVideoFormat()=20in=20cDvbDevice::cDvbDevice()=20(par?=
 =?UTF-8?q?ameter=20is=20=5Fbool=5F).=20-=20Added=20support=20for=20settin?=
 =?UTF-8?q?g=20the=20video=20display=20mode=20(thanks=20to=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20The=20new=20setup=20option=20"DVB/Video?=
 =?UTF-8?q?=20display=20format"=20can=20be=20used=20to=20define=20which=20?=
 =?UTF-8?q?display=20=20=20format=20to=20use=20for=20playing=20wide=20scre?=
 =?UTF-8?q?en=20video=20on=20a=204:3=20tv=20set.=20-=20Changed=20MAXDPIDS?=
 =?UTF-8?q?=20to=2016=20(8xAC3=20+=208xDTS)=20(thanks=20to=20Werner=20Fink?=
 =?UTF-8?q?=20for=20pointing=20this=20out).=20-=20Completed=20Dutch=20lang?=
 =?UTF-8?q?uage=20texts=20(thanks=20to=20Hans=20Dingemans).=20-=20Added=20?=
 =?UTF-8?q?'smi'=20to=20the=20Finnish=20language=20codes=20(thanks=20to=20?=
 =?UTF-8?q?Rolf=20Ahrenberg).=20-=20Fixed=20ensuring=20there=20is=20a=20cu?=
 =?UTF-8?q?rrent=20audio=20track=20in=20case=20there=20is=20only=20one=20t?=
 =?UTF-8?q?rack=20=20=20(thanks=20to=20Werner=20Fink=20for=20reporting=20t?=
 =?UTF-8?q?his=20one).=20-=20Improved=20automatic=20audio=20track=20select?=
 =?UTF-8?q?ion.=20-=20Keeping=20the=20track=20language=20codes=20and=20des?=
 =?UTF-8?q?criptions=20in=20Transfer=20Mode=20(thanks=20to=20=20=20Luca=20?=
 =?UTF-8?q?Olivetti).=20-=20Fixed=20handling=20repeated=20kAudio=20keys.?=
 =?UTF-8?q?=20-=20Improved=20displaying=20the=20the=20current=20audio=20tr?=
 =?UTF-8?q?ack=20in=20the=20ST:TNG=20channel=20display.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  21 ++++++++
 HISTORY       |  28 ++++++++++
 INSTALL       |   4 +-
 MANUAL        |   4 ++
 channels.conf |  16 +++---
 channels.h    |   4 +-
 config.c      |   5 +-
 config.h      |   7 +--
 device.c      |  53 +++++++++++++-----
 device.h      |  17 ++++--
 dvbdevice.c   |  33 ++++++++++--
 dvbdevice.h   |   3 +-
 dvbspu.h      |   3 +-
 epg.c         |   4 +-
 i18n.c        | 146 +++++++++++++++++++++++++++++++++++++++-----------
 menu.c        |  11 +++-
 skins.h       |   4 +-
 skinsttng.c   |  13 ++---
 spu.h         |   5 +-
 tools.c       |   5 +-
 transfer.c    |   4 +-
 21 files changed, 304 insertions(+), 86 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 94258a468..52d522444 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -274,6 +274,9 @@ Werner Fink <werner@suse.de>
  for pointing out that pesAssembler->Reset() needs to be called between subsequent
  Transfer Modes
  for suggestions that led to the addition of the 'Id' parameter to cAudio::Play().
+ for pointing out that MAXDPIDS needs to be to 16 (8xAC3 + 8xDTS)
+ for reporting a problem with ensuring there is a current audio track in case there
+ is only one track
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -1147,6 +1150,14 @@ Marco Schl
  for adding DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer
  for reporting a missing 'resultSkipped = 0' in cRemux::Clear()
  for reporting a missing reset of the 'repacker' in cTS2PES::Clear()
+ for avoiding unnecessary calls to SetPid() in cDvbDevice::SetAudioTrackDevice()
+ for pointing out that EnsureAudioTrack() in cDevice::SetChannel() should not be
+ called if a Transfer Mode is started, to avoid setting the audio PID on the primary
+ device
+ for fixing calling cStatus::MsgChannelSwitch() in cDevice::SetChannel()
+ for increasing POLLTIMEOUTS_BEFORE_DEVICECLEAR in transfer.c to 6 to avoid problems
+ with the larger buffer reserve
+ for adding support for setting the video display mode
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1268,6 +1279,16 @@ Rolf Groppe <rolf@groppe.de>
 Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for pointing out that primaryDevice = NULL should be done before deleting the devices
  in cDevice::Shutdown()
+ for removing some unneeded code and fixing access to unallocated memory in
+ cEvent::FixEpgBugs()
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
+
+Chris Warren <dvb@ixalon.net>
+ for pointing out that the call to system("sync") in SpinUpDisk() should be
+ replaced with fsync(f) to avoid problems on NPTL systems
+
+Luca Olivetti <luca@ventoso.org>
+ for making cDevice::AttachPlayer() keep the track language codes and descriptions
+ in Transfer Mode
diff --git a/HISTORY b/HISTORY
index 41b36ebd0..a8099c4f8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3415,3 +3415,31 @@ Video Disk Recorder Revision History
   from starting Transfer Mode in order to replay DD over the DVB device.
 - Added missing reset of the 'repacker' to cTS2PES::Clear() (thanks to Marco
   Schl��ler for reporting this one).
+
+2005-02-27: Version 1.3.22
+
+- Removed some unneeded code and fixed access to unallocated memory in
+  cEvent::FixEpgBugs() (thanks to Wolfgang Rohdewald).
+- Avoiding unnecessary calls to SetPid() in cDvbDevice::SetAudioTrackDevice()
+  (thanks to Marco Schl��ler).
+- No longer calling EnsureAudioTrack() in cDevice::SetChannel() if a Transfer Mode is
+  started, to avoid setting the audio PID on the primary device (thanks to Marco
+  Schl��ler for pointing this out).
+- Replaced the call to system("sync") in SpinUpDisk() with fdatasync(f) to avoid
+  problems on NPTL systems (thanks to Chris Warren for pointing this out).
+- Increased POLLTIMEOUTS_BEFORE_DEVICECLEAR in transfer.c to 6 to avoid problems
+  with the larger buffer reserve (thanks to Marco Schl��ler).
+- Fixed the call to SetVideoFormat() in cDvbDevice::cDvbDevice() (parameter is _bool_).
+- Added support for setting the video display mode (thanks to Marco Schl��ler).
+- The new setup option "DVB/Video display format" can be used to define which display
+  format to use for playing wide screen video on a 4:3 tv set.
+- Changed MAXDPIDS to 16 (8xAC3 + 8xDTS) (thanks to Werner Fink for pointing this out).
+- Completed dutch language texts (thanks to Hans Dingemans).
+- Added 'smi' to the Finnish language codes (thanks to Rolf Ahrenberg).
+- Fixed ensuring there is a current audio track in case there is only one track
+  (thanks to Werner Fink for reporting this one).
+- Improved automatic audio track selection.
+- Keeping the track language codes and descriptions in Transfer Mode (thanks to
+  Luca Olivetti).
+- Fixed handling repeated kAudio keys.
+- Improved displaying the the current audio track in the ST:TNG channel display.
diff --git a/INSTALL b/INSTALL
index df57170c5..e894e8db3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -250,7 +250,9 @@ Use "vdr --help" for a list of available command line options.
 Replaying Dolby Digital audio:
 ------------------------------
 
-To replay Dolby Digital audio you need a program that reads the DD data
+If you have a "full featured" DVB card with SPDIF output you can replay
+Dolby Digital audio directly through the DVB card.
+You can also use an external program that reads the DD data
 from stdin and processes it in a way suitable for your audio hardware.
 This program must be given to VDR with the '-a' option, as in
 
diff --git a/MANUAL b/MANUAL
index a03f72cbf..e95b94faa 100644
--- a/MANUAL
+++ b/MANUAL
@@ -588,6 +588,10 @@ Version 1.2
                          from the primary DVB interface, so that the viewer will
                          be disturbed as little as possible.
 
+  Video display format = letterbox
+                         The display format to use for playing wide screen video on
+                         a 4:3 tv set ("pan & scan", "letterbox" or "center cut out").
+
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
                          (4:3 or 16:9).
 
diff --git a/channels.conf b/channels.conf
index d05e25213..e0fc70fa0 100644
--- a/channels.conf
+++ b/channels.conf
@@ -29,7 +29,7 @@ Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:11
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
-Veronica/FoxKids;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
+Veronica/JETIX;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
@@ -44,14 +44,14 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1801,1702:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
@@ -110,7 +110,7 @@ Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:200
 WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
 Going Places:10920:hC56:S28.2E:22000:2310+2304:2311=eng:2312:0:5008:2:2055:0
 Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
-S1T;BSkyB:12285:vC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2307:960,961:4409:2:2030:0
+S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
 JOLLY FILM;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
diff --git a/channels.h b/channels.h
index 472003f4c..e94be1769 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.25 2005/01/16 13:46:41 kls Exp $
+ * $Id: channels.h 1.26 2005/02/20 14:05:24 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -31,7 +31,7 @@
 #define CHANNELSMOD_USER    2
 
 #define MAXAPIDS 32 // audio
-#define MAXDPIDS  8 // dolby
+#define MAXDPIDS 16 // dolby (AC3 + DTS)
 #define MAXSPIDS  8 // subtitles
 #define MAXCAIDS  8 // conditional access
 
diff --git a/config.c b/config.c
index 900d039d1..971f16715 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.132 2005/02/05 10:43:04 kls Exp $
+ * $Id: config.c 1.133 2005/02/20 12:52:59 kls Exp $
  */
 
 #include "config.h"
@@ -279,6 +279,7 @@ cSetup::cSetup(void)
   UseVps = 0;
   VpsMargin = 120;
   RecordingDirs = 1;
+  VideoDisplayFormat = 1;
   VideoFormat = 0;
   UpdateChannels = 4;
   UseDolbyDigital = 1;
@@ -435,6 +436,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UseVps"))              UseVps             = atoi(Value);
   else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
+  else if (!strcasecmp(Name, "VideoDisplayFormat"))  VideoDisplayFormat = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
   else if (!strcasecmp(Name, "UseDolbyDigital"))     UseDolbyDigital    = atoi(Value);
@@ -498,6 +500,7 @@ bool cSetup::Save(void)
   Store("UseVps",             UseVps);
   Store("VpsMargin",          VpsMargin);
   Store("RecordingDirs",      RecordingDirs);
+  Store("VideoDisplayFormat", VideoDisplayFormat);
   Store("VideoFormat",        VideoFormat);
   Store("UpdateChannels",     UpdateChannels);
   Store("UseDolbyDigital",    UseDolbyDigital);
diff --git a/config.h b/config.h
index 7dffe1401..a94f90663 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.213 2005/02/08 11:22:14 kls Exp $
+ * $Id: config.h 1.215 2005/02/20 12:50:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.21"
-#define VDRVERSNUM   10321  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.22"
+#define VDRVERSNUM   10322  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -237,6 +237,7 @@ class cSetup : public cConfig<cSetupLine> {
   int UseVps;
   int VpsMargin;
   int RecordingDirs;
+  int VideoDisplayFormat;
   int VideoFormat;
   int UpdateChannels;
   int UseDolbyDigital;
diff --git a/device.c b/device.c
index f270b5a46..d6ab89111 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.92 2005/02/13 09:51:48 kls Exp $
+ * $Id: device.c 1.99 2005/02/27 13:55:15 kls Exp $
  */
 
 #include "device.h"
@@ -169,7 +169,7 @@ cDevice::cDevice(void)
   player = NULL;
   pesAssembler = new cPesAssembler;
   ClrAvailableTracks();
-  currentAudioTrack = ttAudioFirst;
+  currentAudioTrack = ttNone;
   currentAudioTrackMissingCount = 0;
 
   for (int i = 0; i < MAXRECEIVERS; i++)
@@ -235,6 +235,7 @@ bool cDevice::SetPrimaryDevice(int n)
         primaryDevice->MakePrimaryDevice(false);
      primaryDevice = device[n];
      primaryDevice->MakePrimaryDevice(true);
+     primaryDevice->SetVideoFormat(Setup.VideoFormat);
      return true;
      }
   esyslog("ERROR: invalid primary device number: %d", n + 1);
@@ -327,6 +328,28 @@ bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX,
   return false;
 }
 
+void cDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
+{
+  cSpuDecoder *spuDecoder = GetSpuDecoder();
+  if (spuDecoder) {
+     if (Setup.VideoFormat)
+        spuDecoder->setScaleMode(cSpuDecoder::eSpuNormal);
+     else {
+        switch (VideoDisplayFormat) {
+               case vdfPanAndScan:
+                    spuDecoder->setScaleMode(cSpuDecoder::eSpuPanAndScan);
+                    break;
+               case vdfLetterBox:
+                    spuDecoder->setScaleMode(cSpuDecoder::eSpuLetterBox);
+                    break;
+               case vdfCenterCutOut:
+                    spuDecoder->setScaleMode(cSpuDecoder::eSpuNormal);
+                    break;
+               }
+        }
+     }
+}
+
 void cDevice::SetVideoFormat(bool VideoFormat16_9)
 {
 }
@@ -578,14 +601,14 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         currentChannel = Channel->Number();
         // Set the available audio tracks:
         ClrAvailableTracks();
-        currentAudioTrack = ttAudioFirst;
         for (int i = 0; i < MAXAPIDS; i++)
             SetAvailableTrack(ttAudio, i, Channel->Apid(i), Channel->Alang(i));
         if (Setup.UseDolbyDigital) {
            for (int i = 0; i < MAXDPIDS; i++)
                SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i));
            }
-        EnsureAudioTrack(true);
+        if (!NeedsTransferMode)
+           EnsureAudioTrack(true);
         }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
@@ -680,6 +703,7 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
      pre_1_3_19_PrivateStream = false;
      SetAudioChannel(0); // fall back to stereo
      currentAudioTrackMissingCount = 0;
+     currentAudioTrack = ttNone;
      }
 }
 
@@ -692,12 +716,14 @@ bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const c
         strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language));
      if (Description)
         strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
-     if (Id)
+     if (Id) {
         availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
-     if (t == currentAudioTrack)
-        currentAudioTrackMissingCount = 0;
-     else if (!availableTracks[currentAudioTrack].id && currentAudioTrackMissingCount++ > NumAudioTracks() * 10)
-        EnsureAudioTrack();
+        int numAudioTracks = NumAudioTracks();
+        if (!availableTracks[currentAudioTrack].id && numAudioTracks && currentAudioTrackMissingCount++ > numAudioTracks * 10)
+           EnsureAudioTrack();
+        else if (t == currentAudioTrack)
+           currentAudioTrackMissingCount = 0;
+        }
      return true;
      }
   else
@@ -816,7 +842,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (CanReplay()) {
      if (player)
         Detach(player);
-     ClrAvailableTracks();
+     if (!dynamic_cast<cTransfer *>(Player))
+        ClrAvailableTracks();
      pesAssembler->Reset();
      player = Player;
      SetPlayMode(player->playMode);
@@ -834,6 +861,7 @@ void cDevice::Detach(cPlayer *Player)
      player->device = NULL;
      player = NULL;
      SetPlayMode(pmNone);
+     SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
      Audios.ClearAudio();
      }
 }
@@ -894,7 +922,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                uchar SubStreamId = Data[PayloadOffset];
                uchar SubStreamType = SubStreamId & 0xF0;
                uchar SubStreamIndex = SubStreamId & 0x1F;
-
+        
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
 pre_1_3_19_PrivateStreamDeteced:
                if (pre_1_3_19_PrivateStream) {
@@ -902,7 +930,6 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                   SubStreamType = 0x80;
                   SubStreamIndex = 0;
                   }
-
                switch (SubStreamType) {
                  case 0x20: // SPU
                  case 0x30: // SPU
@@ -1002,7 +1029,7 @@ int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
   if (i < Length)
      pesAssembler->Put(Data + i, Length - i);
   return Length;
- }
+}
 
 int cDevice::Ca(void) const
 {
diff --git a/device.h b/device.h
index 80587992c..02fa35ccf 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.55 2005/02/06 11:43:04 kls Exp $
+ * $Id: device.h 1.57 2005/02/20 14:06:28 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -18,6 +18,7 @@
 #include "ringbuffer.h"
 #include "sdt.h"
 #include "sections.h"
+#include "spu.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -56,17 +57,22 @@ enum eVideoSystem { vsPAL,
                     vsNTSC
                   };
 
+enum eVideoDisplayFormat { vdfPanAndScan,
+                           vdfLetterBox,
+                           vdfCenterCutOut
+                         };
+
 enum eTrackType { ttNone,
                   ttAudio,
                   ttAudioFirst = ttAudio,
                   ttAudioLast  = ttAudioFirst + 31, // MAXAPIDS - 1
                   ttDolby,
                   ttDolbyFirst = ttDolby,
-                  ttDolbyLast  = ttDolbyFirst + 8, // MAXDPIDS - 1
+                  ttDolbyLast  = ttDolbyFirst + 15, // MAXDPIDS - 1
                   /* future...
                   ttSubtitle,
                   ttSubtitleFirst = ttSubtitle,
-                  ttSubtitleLast  = ttSubtitleFirst + 8, // MAXSPIDS - 1
+                  ttSubtitleLast  = ttSubtitleFirst + 7, // MAXSPIDS - 1
                   */
                   ttMaxTrackTypes
                 };
@@ -83,7 +89,6 @@ struct tTrackId {
 class cChannel;
 class cPlayer;
 class cReceiver;
-class cSpuDecoder;
 class cPesAssembler;
 
 /// The cDevice class is the base from which actual devices can be derived.
@@ -301,6 +306,10 @@ class cDevice : public cThread {
 // Video format facilities
 
 public:
+  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
+         ///< Sets the video display format to the given one (only useful
+         ///< if this device has an MPEG decoder).
+         ///< A derived class must first call the base class function!
   virtual void SetVideoFormat(bool VideoFormat16_9);
          ///< Sets the output video format to either 16:9 or 4:3 (only useful
          ///< if this device has an MPEG decoder).
diff --git a/dvbdevice.c b/dvbdevice.c
index 741848a89..c2311229e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.120 2005/02/13 14:26:37 kls Exp $
+ * $Id: dvbdevice.c 1.124 2005/02/20 13:35:28 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -402,7 +402,7 @@ cDvbDevice::cDvbDevice(int n)
 
   // Video format:
 
-  SetVideoFormat(Setup.VideoFormat ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3);
+  SetVideoFormat(Setup.VideoFormat);
 
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
@@ -599,10 +599,35 @@ bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int Siz
   return false;
 }
 
+void cDvbDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
+{
+  cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
+  if (HasDecoder()) {
+     if (Setup.VideoFormat) {
+        CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT));
+        }
+     else {
+        switch (VideoDisplayFormat) {
+          case vdfPanAndScan:
+               CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_PAN_SCAN));
+               break;
+          case vdfLetterBox:
+               CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
+               break;
+          case vdfCenterCutOut:
+               CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT));
+               break;
+          }
+        }
+     }
+}
+
 void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
 {
-  if (HasDecoder())
+  if (HasDecoder()) {
      CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
+     SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
+     }
 }
 
 eVideoSystem cDvbDevice::GetVideoSystem(void)
@@ -872,7 +897,7 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
   const tTrackId *TrackId = GetTrack(Type);
   if (TrackId && TrackId->id) {
      if (IS_AUDIO_TRACK(Type)) {
-        if (pidHandles[ptAudio].pid) {
+        if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
            pidHandles[ptAudio].pid = TrackId->id;
            SetPid(&pidHandles[ptAudio], ptAudio, true);
            }
diff --git a/dvbdevice.h b/dvbdevice.h
index 99456e732..4a705367a 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.33 2005/02/13 14:14:31 kls Exp $
+ * $Id: dvbdevice.h 1.34 2005/02/20 11:17:07 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -87,6 +87,7 @@ class cDvbDevice : public cDevice {
 // Video format facilities
 
 public:
+  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
   virtual void SetVideoFormat(bool VideoFormat16_9);
   virtual eVideoSystem GetVideoSystem(void);
 
diff --git a/dvbspu.h b/dvbspu.h
index 888123473..c60567a34 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.7 2005/01/08 09:59:44 kls Exp $
+ * $Id: dvbspu.h 1.8 2005/02/20 11:20:43 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -139,6 +139,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
 
     int setTime(uint32_t pts);
 
+    cSpuDecoder::eScaleMode getScaleMode(void) { return scaleMode; }
     void setScaleMode(cSpuDecoder::eScaleMode ScaleMode);
     void setPalette(uint32_t * pal);
     void setHighlight(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey,
diff --git a/epg.c b/epg.c
index 5539ab044..df267f638 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.24 2005/01/02 11:25:25 kls Exp $
+ * $Id: epg.c 1.25 2005/02/19 11:35:00 kls Exp $
  */
 
 #include "epg.h"
@@ -525,7 +525,7 @@ void cEvent::FixEpgBugs(void)
      if (description) {
         char *p = description;
         while (*p && *(p + 1) && *(p + 2)) {
-              if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
+              if (*p == '-' && *(p + 1) == ' ' && p != description && islower(*(p - 1)) && islower(*(p + 2))) {
                  if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
                     memmove(p, p + 2, strlen(p + 2) + 1);
                     EpgBugFixStat(5, ChannelID());
diff --git a/i18n.c b/i18n.c
index 9d7417c01..a265cd0eb 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.177 2005/02/12 10:26:51 kls Exp $
+ * $Id: i18n.c 1.181 2005/02/27 09:45:57 kls Exp $
  *
  * Translations provided by:
  *
@@ -133,7 +133,7 @@ const tI18nPhrase Phrases[] = {
     "por",
     "fra,fre",
     "nor",
-    "fin",
+    "fin,smi",
     "pol",
     "esl,spa",
     "ell,gre",
@@ -950,7 +950,7 @@ const tI18nPhrase Phrases[] = {
     "Scan",
     "",//TODO
     "Scansione",
-    "",//TODO
+    "Scan",
     "",//TODO
     "Scan",
     "",//TODO
@@ -1793,7 +1793,7 @@ const tI18nPhrase Phrases[] = {
     "VPS",
     "",// TODO
     "VPS",
-    "",// TODO
+    "VPS",
     "",// TODO
     "VPS",
     "",// TODO
@@ -2298,7 +2298,7 @@ const tI18nPhrase Phrases[] = {
     "Kein Audio verf�gbar!",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Geen audio beschikbaar!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2573,7 +2573,7 @@ const tI18nPhrase Phrases[] = {
     "Oberfl�che",
     "",// TODO
     "Superficie Skin",
-    "",// TODO
+    "Skin",
     "",// TODO
     "Skin",
     "",// TODO
@@ -2594,7 +2594,7 @@ const tI18nPhrase Phrases[] = {
     "Thema",
     "",// TODO
     "Tema",
-    "",// TODO
+    "Thema",
     "",// TODO
     "Th�me",
     "",// TODO
@@ -2615,7 +2615,7 @@ const tI18nPhrase Phrases[] = {
     "Links",
     "",// TODO
     "Sinistra",
-    "",// TODO
+    "Links",
     "",// TODO
     "Gauche",
     "",// TODO
@@ -2636,7 +2636,7 @@ const tI18nPhrase Phrases[] = {
     "Oben",
     "",// TODO
     "Cima",
-    "",// TODO
+    "Boven",
     "",// TODO
     "Haut",
     "",// TODO
@@ -2720,7 +2720,7 @@ const tI18nPhrase Phrases[] = {
     "Kleine Schrift benutzen",
     "",// TODO
     "Utilizzare caratteri piccoli",
-    "",// TODO
+    "Klein lettertype gebruiken",
     "",// TODO
     "Utiliser les petits caract�res",
     "",// TODO
@@ -2741,7 +2741,7 @@ const tI18nPhrase Phrases[] = {
     "nie",
     "",// TODO
     "mai",
-    "",// TODO
+    "nooit",
     "",// TODO
     "jamais",
     "",// TODO
@@ -2762,7 +2762,7 @@ const tI18nPhrase Phrases[] = {
     "je nach Oberfl�che",
     "",// TODO
     "in base alla superficie",
-    "",// TODO
+    "skin afhankelijk",
     "",// TODO
     "D�pend du skin",
     "",// TODO
@@ -2783,7 +2783,7 @@ const tI18nPhrase Phrases[] = {
     "immer",
     "",// TODO
     "sempre",
-    "",// TODO
+    "altijd",
     "",// TODO
     "toujours",
     "",// TODO
@@ -2825,7 +2825,7 @@ const tI18nPhrase Phrases[] = {
     "Anzeigedauer f�r Kanal-Info (s)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Duur tonen kanaal-informatie (s)",
     "",// TODO
     "Dur�e affichage infos cha�nes (s)",
     "",// TODO
@@ -2972,7 +2972,7 @@ const tI18nPhrase Phrases[] = {
     "Alte EPG-Daten anzeigen (min)",// TODO
     "",// TODO
     "Visualizzazione dati vecchi (min)",
-    "",// TODO
+    "Oude EPG data tonen (min)",
     "",// TODO
     "Montrer l'EPG plus vieux de m min",
     "",// TODO
@@ -3035,7 +3035,7 @@ const tI18nPhrase Phrases[] = {
     "Bevorzugte Sprachen",
     "",// TODO
     "Lingue preferite",
-    "",// TODO
+    "Voorkeurstalen",
     "",// TODO
     "Langues pr�f�r�es",
     "",// TODO
@@ -3056,7 +3056,7 @@ const tI18nPhrase Phrases[] = {
     "Bevorzugte Sprache",
     "",// TODO
     "Lingua preferita",
-    "",// TODO
+    "Voorkeurstaal",
     "",// TODO
     "Langue pr�f�r�e",
     "",// TODO
@@ -3094,6 +3094,90 @@ const tI18nPhrase Phrases[] = {
     "Esmane DVB seade",
     "Prim�r DVB enhed",
   },
+  { "Setup.DVB$Video display format",
+    "Video Anzeige-Format",
+    "",//TODO
+    "",//TODO
+    "Video display format",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+    "pan&scan",
+  },
+  { "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+    "letterbox",
+  },
+  { "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+    "center cut out",
+  },
   { "Setup.DVB$Video format",
     "Video Format",
     "Video format",
@@ -3119,7 +3203,7 @@ const tI18nPhrase Phrases[] = {
     "Dolby Digital Ton benutzen",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Dolby Digital gebruiken",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3140,7 +3224,7 @@ const tI18nPhrase Phrases[] = {
     "Kan�le aktualisieren",
     "",// TODO
     "Aggiornare i canali",
-    "",// TODO
+    "Kanalen actualiseren",
     "",// TODO
     "Mettre � jour les cha�nes",
     "",// TODO
@@ -3161,7 +3245,7 @@ const tI18nPhrase Phrases[] = {
     "nur Namen",
     "",// TODO
     "solo nomi",
-    "",// TODO
+    "alleen namen",
     "",// TODO
     "Seulement les noms",
     "",// TODO
@@ -3182,7 +3266,7 @@ const tI18nPhrase Phrases[] = {
     "Namen und PIDs",
     "",// TODO
     "nomi e PIDs",
-    "",// TODO
+    "namen en PIDs",
     "",// TODO
     "Noms et PIDs",
     "",// TODO
@@ -3203,7 +3287,7 @@ const tI18nPhrase Phrases[] = {
     "neue Kan�le hinzuf�gen",
     "",// TODO
     "aggiungere canali nuovi",
-    "",// TODO
+    "nieuwe kanalen toevoegen",
     "",// TODO
     "Ajouter les nouvelles cha�nes",
     "",// TODO
@@ -3224,7 +3308,7 @@ const tI18nPhrase Phrases[] = {
     "neue Transponder hinzuf�gen",
     "",// TODO
     "aggiungere transponder nuovi",
-    "",// TODO
+    "nieuwe transponders toevoegen",
     "",// TODO
     "Ajouter les nouveaux transpondeurs",
     "",// TODO
@@ -3245,7 +3329,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Audio talen",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3266,7 +3350,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Audio taal",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3560,7 +3644,7 @@ const tI18nPhrase Phrases[] = {
     "VPS benutzen",
     "",// TODO
     "Utilizzare VPS",
-    "",// TODO
+    "VPS gebruiken",
     "",// TODO
     "Utiliser le VPS",
     "",// TODO
@@ -3581,7 +3665,7 @@ const tI18nPhrase Phrases[] = {
     "Zeitpuffer bei VPS (s)",
     "",// TODO
     "Margine VPS",
-    "",// TODO
+    "Marge VPS (s)",
     "",// TODO
     "Marge VPS",
     "",// TODO
@@ -3898,7 +3982,7 @@ const tI18nPhrase Phrases[] = {
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcde��fghi�jklmnopqrstu�vwxyz0123456789-.#~",
-    "",// TODO
+    " abcdefghijklmnopqrstuvwxyz0123456789-.#~����������",
     "",// TODO
     " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~",
     "",// TODO
@@ -4698,7 +4782,7 @@ const tI18nPhrase Phrases[] = {
     "Audio",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Audio",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5182,7 +5266,7 @@ const tI18nPhrase Phrases[] = {
     "Klassischer VDR",
     "",// TODO
     "VDR Classico",
-    "",// TODO
+    "VDR Klassiek",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5203,7 +5287,7 @@ const tI18nPhrase Phrases[] = {
     "ST:TNG Konsolen",
     "",// TODO
     "Consolles ST:TNG",
-    "",// TODO
+    "ST:TNG Consoles",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/menu.c b/menu.c
index a438b7993..e31686332 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.340 2005/02/06 11:33:13 kls Exp $
+ * $Id: menu.c 1.342 2005/02/27 14:09:00 kls Exp $
  */
 
 #include "menu.h"
@@ -1915,6 +1915,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
   int originalNumAudioLanguages;
   int numAudioLanguages;
   void Setup(void);
+  const char *videoDisplayFormatTexts[3];
   const char *updateChannelsTexts[5];
 public:
   cMenuSetupDVB(void);
@@ -1926,6 +1927,9 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   for (numAudioLanguages = 0; numAudioLanguages < I18nNumLanguages && data.AudioLanguages[numAudioLanguages] >= 0; numAudioLanguages++)
       ;
   originalNumAudioLanguages = numAudioLanguages;
+  videoDisplayFormatTexts[0] = tr("pan&scan");
+  videoDisplayFormatTexts[1] = tr("letterbox");
+  videoDisplayFormatTexts[2] = tr("center cut out");
   updateChannelsTexts[0] = tr("no");
   updateChannelsTexts[1] = tr("names only");
   updateChannelsTexts[2] = tr("names and PIDs");
@@ -1943,6 +1947,7 @@ void cMenuSetupDVB::Setup(void)
   Clear();
 
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
+  Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"),  &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"),     &data.UseDolbyDigital));
   Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 5, updateChannelsTexts));
@@ -1957,6 +1962,7 @@ void cMenuSetupDVB::Setup(void)
 eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 {
   int oldPrimaryDVB = ::Setup.PrimaryDVB;
+  int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
   bool oldVideoFormat = ::Setup.VideoFormat;
   int oldnumAudioLanguages = numAudioLanguages;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
@@ -1984,6 +1990,8 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
   if (state == osBack && Key == kOk) {
      if (::Setup.PrimaryDVB != oldPrimaryDVB)
         state = osSwitchDvb;
+     if (::Setup.VideoDisplayFormat != oldVideoDisplayFormat)
+        cDevice::PrimaryDevice()->SetVideoDisplayFormat(eVideoDisplayFormat(::Setup.VideoDisplayFormat));
      if (::Setup.VideoFormat != oldVideoFormat)
         cDevice::PrimaryDevice()->SetVideoFormat(::Setup.VideoFormat);
      }
@@ -2938,6 +2946,7 @@ eOSState cDisplayTracks::ProcessKey(eKeys Key)
                     timeout.Set(TRACKTIMEOUT);
                     }
          break;
+    case kAudio|k_Repeat:
     case kAudio:
          if (++track >= numTracks)
             track = 0;
diff --git a/skins.h b/skins.h
index ae2733c4a..add8d56ad 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.6 2005/01/09 11:49:37 kls Exp $
+ * $Id: skins.h 1.7 2005/02/27 14:37:37 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -54,7 +54,7 @@ class cSkinDisplayChannel : public cSkinDisplay {
        ///< user is in the process of entering a channel number, which must
        ///< be displayed accordingly.
   virtual void SetEvents(const cEvent *Present, const cEvent *Following) = 0;
-       ///< Sets the Present and Following EPG events. It either of these
+       ///< Sets the Present and Following EPG events. If either of these
        ///< is not available, NULL will be given.
   virtual void SetMessage(eMessageType Type, const char *Text) = 0;
        ///< Sets a one line message Text, with the given Type. Type can be used
diff --git a/skinsttng.c b/skinsttng.c
index 94a4b66ff..3760ad4da 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.12 2005/01/08 15:37:55 kls Exp $
+ * $Id: skinsttng.c 1.13 2005/02/27 14:45:19 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -268,9 +268,6 @@ void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fo
          osd->DrawText(x3 + 2, y3 + (2 * i + 1) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), x4 - x3 - 2);
          }
       }
-  cDevice *Device = cDevice::PrimaryDevice();
-  const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
-  osd->DrawText(x3 + 2, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontSml), x4 - x3 - 2);
 }
 
 void cSkinSTTNGDisplayChannel::SetMessage(eMessageType Type, const char *Text)
@@ -295,9 +292,13 @@ void cSkinSTTNGDisplayChannel::Flush(void)
 {
   if (withInfo) {
      if (!message) {
-        cString date = DayDateTime();
         const cFont *font = cFont::GetFont(fontSml);
-        osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
+        cString date = DayDateTime();
+        int w = font->Width(date);
+        osd->DrawText(x4 - w - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
+        cDevice *Device = cDevice::PrimaryDevice();
+        const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
+        osd->DrawText(x3 + 2, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 4);
         }
 
      int seen = 0;
diff --git a/spu.h b/spu.h
index 9ab4da5be..0437a322c 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 1.3 2005/01/08 09:58:35 kls Exp $
+ * $Id: spu.h 1.4 2005/02/20 11:21:31 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
@@ -21,10 +21,11 @@ class cSpuDecoder {
     typedef enum { eSpuNormal, eSpuLetterBox, eSpuPanAndScan } eScaleMode;
   public:
     //    cSpuDecoder();
-     virtual ~ cSpuDecoder();
+    virtual ~cSpuDecoder();
 
     virtual int setTime(uint32_t pts) = 0;
 
+    virtual cSpuDecoder::eScaleMode getScaleMode(void) = 0;
     virtual void setScaleMode(cSpuDecoder::eScaleMode ScaleMode) = 0;
     virtual void setPalette(uint32_t * pal) = 0;
     virtual void setHighlight(uint16_t sx, uint16_t sy,
diff --git a/tools.c b/tools.c
index 0501d76d1..aee71ecf7 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.89 2005/02/05 10:10:30 kls Exp $
+ * $Id: tools.c 1.90 2005/02/19 13:43:03 kls Exp $
  */
 
 #include "tools.h"
@@ -454,8 +454,9 @@ bool SpinUpDisk(const char *FileName)
          int f = open(buf, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
          // O_SYNC doesn't work on all file systems
          if (f >= 0) {
+            if (fdatasync(f) < 0)
+               LOG_ERROR_STR(buf);
             close(f);
-            system("sync");
             remove(buf);
             gettimeofday(&tp2, NULL);
             double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0;
diff --git a/transfer.c b/transfer.c
index 331ac62b7..c214b88ff 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.27 2005/02/12 15:54:06 kls Exp $
+ * $Id: transfer.c 1.28 2005/02/19 14:38:55 kls Exp $
  */
 
 #include "transfer.h"
 
 #define TRANSFERBUFSIZE  MEGABYTE(2)
-#define POLLTIMEOUTS_BEFORE_DEVICECLEAR 3
+#define POLLTIMEOUTS_BEFORE_DEVICECLEAR 6
 
 // --- cTransfer -------------------------------------------------------------
 

From 782b517c51eaa6d2641fe9b6801afdad50be8586 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 20 Mar 2005 18:00:00 +0100
Subject: [PATCH 115/307] =?UTF-8?q?Version=201.3.23=20-=20The=20setup=20op?=
 =?UTF-8?q?tion=20"DVB/Video=20display=20format"=20is=20now=20only=20avail?=
 =?UTF-8?q?able=20if=20"Video=20format"=20=20=20is=20set=20to=20"4:3"=20(s?=
 =?UTF-8?q?uggested=20by=20Mikko=20Salo).=20-=20Updated=20the=20Russian=20?=
 =?UTF-8?q?OSD=20texts=20(thanks=20to=20Vyacheslav=20Dikonov).=20-=20Dropp?=
 =?UTF-8?q?ed=20CA=20support=20for=20the=20old=20'-icam'=20firmware.=20-?=
 =?UTF-8?q?=20Updated=20the=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).=20-=20Updated=20the=20Swedish=20OSD=20texts=20(t?=
 =?UTF-8?q?hanks=20to=20Tomas=20Prybil).=20-=20Fixed=20a=20few=20French=20?=
 =?UTF-8?q?OSD=20texts=20that=20were=20in=20the=20wrong=20place.=20-=20Imp?=
 =?UTF-8?q?roved=20matching=20timers=20to=20EPG=20events,=20especially=20i?=
 =?UTF-8?q?n=20case=20there=20are=20several=20events=20=20=20with=20the=20?=
 =?UTF-8?q?same=20VPS=20time.=20-=20Fixed=20cDolbyRepacker=20to=20allow=20?=
 =?UTF-8?q?recording=20ProSieben=20HD=20broadcasts=20(thanks=20to=20Reinha?=
 =?UTF-8?q?rd=20=20=20Nissl).=20-=20Fixed=20cDvbDevice::SetVideoDisplayFor?=
 =?UTF-8?q?mat()=20in=20case=20of=2016:9=20(thanks=20to=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20The=20running=20status=20of=20a=20VPS?=
 =?UTF-8?q?=20event=20is=20now=20only=20taken=20seriously=20if=20that=20ev?=
 =?UTF-8?q?ent=20has=20been=20=20=20seen=20within=20the=20last=2030=20seco?=
 =?UTF-8?q?nds=20-=20otherwise=20recording=20is=20done=20as=20if=20no=20VP?=
 =?UTF-8?q?S=20was=20=20=20available.=20-=20The=20day=20of=20a=20timer=20i?=
 =?UTF-8?q?s=20now=20stored=20as=20a=20full=20date=20in=20ISO=20notation?=
 =?UTF-8?q?=20("YYYY-MM-DD")=20in=20=20=20'timers.conf'=20and=20for=20the?=
 =?UTF-8?q?=20result=20of=20the=20SVDRP=20command=20LSTT=20(based=20in=20p?=
 =?UTF-8?q?arts=20on=20a=20=20=20patch=20by=20Roman=20Krenick=C3=BD).=20-?=
 =?UTF-8?q?=20Some=20fixes=20to=20avoid=20compiler=20warnings=20in=20gcc?=
 =?UTF-8?q?=204.0=20(thanks=20to=20Ville=20Skytt=C3=A4=20for=20reporting?=
 =?UTF-8?q?=20=20=20these).=20-=20Single=20shot=20timers=20are=20now=20rel?=
 =?UTF-8?q?iably=20deleted=20when=20they=20have=20expired.=20-=20Fixed=20s?=
 =?UTF-8?q?etting=20the=20colored=20button=20help=20after=20deleting=20a?=
 =?UTF-8?q?=20recording=20in=20case=20the=20next=20=20=20menu=20entry=20is?=
 =?UTF-8?q?=20a=20directory=20(thanks=20to=20Steffen=20Beyer).=20-=20Impro?=
 =?UTF-8?q?ved=20falling=20back=20to=20normal=20recording=20if=20the=20VPS?=
 =?UTF-8?q?=20data=20hasn't=20been=20seen=20for=20more=20=20=20than=2030?=
 =?UTF-8?q?=20seconds.=20-=20Added=20a=20missing=20cMutexLock=20to=20cRemo?=
 =?UTF-8?q?te::HasKeys()=20(thanks=20to=20Wolfgang=20Rohdewald).=20-=20All?=
 =?UTF-8?q?=20log=20entries=20regarding=20timers=20now=20contain=20a=20sho?=
 =?UTF-8?q?rt=20description=20of=20the=20timer.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  15 +++
 HISTORY       |  30 +++++
 MANUAL        |  18 +--
 channels.c    |  11 +-
 channels.conf |   8 +-
 config.h      |   6 +-
 dvbdevice.c   |  21 ++--
 eit.c         |   4 +-
 epg.c         |   5 +-
 epg.h         |   7 +-
 font.h        |   3 +-
 i18n.c        |  90 +++++++--------
 menu.c        |  75 +++++++-----
 menu.h        |   5 +-
 menuitems.c   | 202 +++++++++++++++------------------
 menuitems.h   |  20 +---
 remote.c      |   3 +-
 remux.c       |  46 +++++---
 svdrp.c       |  15 +--
 timers.c      | 309 +++++++++++++++++++++++++++++++-------------------
 timers.h      |  50 ++++----
 tools.c       |   4 +-
 tools.h       |   4 +-
 vdr.5         |  14 ++-
 vdr.c         |   4 +-
 25 files changed, 555 insertions(+), 414 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 52d522444..26d52c499 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1281,6 +1281,7 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  in cDevice::Shutdown()
  for removing some unneeded code and fixing access to unallocated memory in
  cEvent::FixEpgBugs()
+ for adding a missing cMutexLock to cRemote::HasKeys()
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
@@ -1292,3 +1293,17 @@ Chris Warren <dvb@ixalon.net>
 Luca Olivetti <luca@ventoso.org>
  for making cDevice::AttachPlayer() keep the track language codes and descriptions
  in Transfer Mode
+
+Mikko Salo <mikko.salo@ppe.inet.fi>
+ for suggesting to make the setup option "DVB/Video display format" available only
+ if "Video format" is set to "4:3"
+
+Roman Krenick� <free-rtk@gmx.de>
+ for a patch that was used a a basis for changing a timer's day handling to full date
+
+Ville Skytt� <ville.skytta@iki.fi>
+ for reporting several compiler warnings in gcc 4.0
+
+Steffen Beyer <cpunk@reactor.de>
+ for fixing setting the colored button help after deleting a recording in case the next
+ menu entry is a directory
diff --git a/HISTORY b/HISTORY
index a8099c4f8..a5e824743 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3443,3 +3443,33 @@ Video Disk Recorder Revision History
   Luca Olivetti).
 - Fixed handling repeated kAudio keys.
 - Improved displaying the the current audio track in the ST:TNG channel display.
+
+2005-03-20: Version 1.3.23
+
+- The setup option "DVB/Video display format" is now only available if "Video format"
+  is set to "4:3" (suggested by Mikko Salo).
+- Updated the Russian OSD texts (thanks to Vyacheslav Dikonov).
+- Dropped CA support for the old '-icam' firmware.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Swedish OSD texts (thanks to Tomas Prybil).
+- Fixed a few French OSD texts that were in the wrong place.
+- Improved matching timers to EPG events, especially in case there are several events
+  with the same VPS time.
+- Fixed cDolbyRepacker to allow recording ProSieben HD broadcasts (thanks to Reinhard
+  Nissl).
+- Fixed cDvbDevice::SetVideoDisplayFormat() in case of 16:9 (thanks to Marco Schl��ler).
+- The running status of a VPS event is now only taken seriously if that event has been
+  seen within the last 30 seconds - otherwise recording is done as if no VPS was
+  available.
+- The day of a timer is now stored as a full date in ISO notation ("YYYY-MM-DD") in
+  'timers.conf' and for the result of the SVDRP command LSTT (based in parts on a
+  patch by Roman Krenick�).
+- Some fixes to avoid compiler warnings in gcc 4.0 (thanks to Ville Skytt� for reporting
+  these).
+- Single shot timers are now reliably deleted when they have expired.
+- Fixed setting the colored button help after deleting a recording in case the next
+  menu entry is a directory (thanks to Steffen Beyer).
+- Improved falling back to normal recording if the VPS data hasn't been seen for more
+  than 30 seconds.
+- Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald).
+- All log entries regarding timers now contain a short description of the timer.
diff --git a/MANUAL b/MANUAL
index e95b94faa..ebf8ce025 100644
--- a/MANUAL
+++ b/MANUAL
@@ -381,10 +381,9 @@ Version 1.2
              Any changes made in the "Channels" list (like renaming or
              reordering channels) will be automatically reflected in the
              timers settings.
-  Day:       The day on which this timer shall start. This can be either a
-             "day of month" (1..31), which allows programming a "single shot"
-             timer that hits once and is deleted after it ends. Single shot
-             timers can be programmed up to one month into the future.
+  Day:       The day on which this timer shall start. This can be a
+             date (like 2005-03-19), which allows programming a "single shot"
+             timer that hits once and is deleted after it ends.
              Another option here are "repeating timers" which are defined
              by listing the days of the week on which they shall record.
              For example, a timer that shall record every monday and wednesday
@@ -392,6 +391,9 @@ Version 1.2
              The '0' key toggles between a single shot and a repeating timer.
              If "Day" indicates a repeating timer, the keys '1'...'7' can be
              used to toggle the individual days ('1' is monday).
+             You can also switch to a set of predefined repeating timer settings
+             by pressing the "Left" key when the day is the present day. To return
+             to the single shot mode just press "Right" until a date is displayed.
   Start:     The start time of the timer in hh:mm as 24 hour ("military") time.
   Stop:      The stop time of the timer.
   VPS:       Defines whether the timer shall use VPS (if available). If this
@@ -588,12 +590,14 @@ Version 1.2
                          from the primary DVB interface, so that the viewer will
                          be disturbed as little as possible.
 
+  Video format = 4:3     The video format (or aspect ratio) of the tv set in use
+                         (4:3 or 16:9).
+
   Video display format = letterbox
                          The display format to use for playing wide screen video on
                          a 4:3 tv set ("pan & scan", "letterbox" or "center cut out").
-
-  Video format = 4:3     The video format (or aspect ratio) of the tv set in use
-                         (4:3 or 16:9).
+                         This option is only available if "Video format" is set to
+                         4:3.
 
   Use Dolby Digital = yes
                          Turns recording of the Dolby Digital audio channels on
diff --git a/channels.c b/channels.c
index dd230dae3..3392d9aa8 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.35 2005/02/06 09:44:53 kls Exp $
+ * $Id: channels.c 1.36 2005/03/19 15:56:38 kls Exp $
  */
 
 #include "channels.h"
@@ -694,9 +694,12 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            char *p = strchr(vpidbuf, '+');
            if (p)
               *p++ = 0;
-           sscanf(vpidbuf, "%d", &vpid);
-           if (p)
-              sscanf(p, "%d", &ppid);
+           if (sscanf(vpidbuf, "%d", &vpid) != 1)
+              return false;
+           if (p) {
+              if (sscanf(p, "%d", &ppid) != 1)
+                 return false;
+              }
            else
               ppid = vpid;
 
diff --git a/channels.conf b/channels.conf
index e0fc70fa0..21763de1c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -48,7 +48,7 @@ PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:3
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
@@ -90,9 +90,9 @@ TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
 Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5104:2:2027:0
-ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2054:0
-Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0
-Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0
+ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng:2353:960,961:10240:2:2054:0
+Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2320+2304:2321=eng:2322:960,961:4905:2:2023:0
+Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,667=NAR;687=eng:583:960,961:4302:2:2007:0
diff --git a/config.h b/config.h
index a94f90663..833022ea9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.215 2005/02/20 12:50:37 kls Exp $
+ * $Id: config.h 1.216 2005/03/05 15:44:35 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.22"
-#define VDRVERSNUM   10322  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.23"
+#define VDRVERSNUM   10323  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbdevice.c b/dvbdevice.c
index c2311229e..9c8a0ac4a 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.124 2005/02/20 13:35:28 kls Exp $
+ * $Id: dvbdevice.c 1.127 2005/03/20 10:10:38 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -577,7 +577,7 @@ bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int Siz
               else {
                  // write PNM file:
                  if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
-                     fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) {
+                     fwrite(mem, vm.width * vm.height * 3, 1, f) != 1) {
                     LOG_ERROR_STR(FileName);
                     result |= 1;
                     }
@@ -604,7 +604,7 @@ void cDvbDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
   cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
   if (HasDecoder()) {
      if (Setup.VideoFormat) {
-        CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT));
+        CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
         }
      else {
         switch (VideoDisplayFormat) {
@@ -757,8 +757,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
 #ifdef DO_MULTIPLE_RECORDINGS
               if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE)
-                 needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels
-                                        || Ca() != Channel->Ca();
+                 needsDetachReceivers = Ca() != Channel->Ca();
               else if (!IsPrimaryDevice())
                  result = true;
 #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
@@ -781,27 +780,21 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  bool IsEncrypted = Channel->Ca() > CACONFBASE && !ciHandler; // only LL-firmware can do non-live CA channels
-
   bool DoTune = !dvbTuner->IsTunedTo(Channel);
 
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
-                            || IsEncrypted && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode
                             || !IsPrimaryDevice()
                             || LiveView // for a new live view the old PIDs need to be turned off
                             || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                             );
 
-  bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune
+  bool StartTransferMode = IsPrimaryDevice() && !DoTune
                            && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || pidHandles[ptAudio].pid != Channel->Apid(0))// the PID is already set as DMX_PES_OTHER
                               || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
 
-  bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode
-                        && (IsEncrypted // CA channels can only be decrypted in "live" mode
-                           || LiveView
-                           );
+  bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode && LiveView;
 
 #ifndef DO_MULTIPLE_RECORDINGS
   TurnOffLivePIDs = TurnOnLivePIDs = true;
@@ -919,7 +912,7 @@ bool cDvbDevice::CanReplay(void) const
   if (Receiving())
      return false;
 #endif
-  return cDevice::CanReplay() && (Ca() <= MAXDEVICES || ciHandler); // with non-LL-firmware we can only replay if there is no CA recording going on
+  return cDevice::CanReplay();
 }
 
 bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
diff --git a/eit.c b/eit.c
index a7d60c498..6c6381b1d 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.102 2005/01/02 11:52:12 kls Exp $
+ * $Id: eit.c 1.103 2005/03/20 12:33:51 kls Exp $
  */
 
 #include "eit.h"
@@ -246,6 +246,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
   if (Empty && Tid == 0x4E && getSectionNumber() == 0)
      // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
      pSchedule->ClrRunningStatus(channel);
+  if (Tid == 0x4E)
+     pSchedule->SetPresentSeen();
   if (Modified) {
      pSchedule->Sort();
      Schedules->SetModified(pSchedule);
diff --git a/epg.c b/epg.c
index df267f638..7b0fcd901 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.25 2005/02/19 11:35:00 kls Exp $
+ * $Id: epg.c 1.27 2005/03/20 12:34:19 kls Exp $
  */
 
 #include "epg.h"
@@ -645,6 +645,7 @@ cSchedule::cSchedule(tChannelID ChannelID)
   channelID = ChannelID;
   hasRunning = false;;
   modified = 0;
+  presentSeen = 0;
 }
 
 cEvent *cSchedule::AddEvent(cEvent *Event)
@@ -663,7 +664,7 @@ const cEvent *cSchedule::GetPresentEvent(bool CheckRunningStatus) const
          if (!CheckRunningStatus)
             break;
          }
-      if (CheckRunningStatus && time(NULL) - p->Seen() < 30 && p->RunningStatus() >= SI::RunningStatusPausing)
+      if (CheckRunningStatus && p->SeenWithin(30) && p->RunningStatus() >= SI::RunningStatusPausing)
          return p;
       }
   return pe;
diff --git a/epg.h b/epg.h
index 88e66029e..6668a6145 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.19 2005/01/02 10:44:41 kls Exp $
+ * $Id: epg.h 1.21 2005/03/20 12:32:36 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -79,6 +79,7 @@ class cEvent : public cListObject {
   int Duration(void) const { return duration; }
   time_t Vps(void) const { return vps; }
   time_t Seen(void) const { return seen; }
+  bool SeenWithin(int Seconds) const { return time(NULL) - seen < Seconds; }
   bool HasTimer(void) const;
   bool IsRunning(bool OrAboutToStart = false) const;
   cString GetDateString(void) const;
@@ -110,11 +111,15 @@ class cSchedule : public cListObject  {
   cList<cEvent> events;
   bool hasRunning;
   time_t modified;
+  time_t presentSeen;
 public:
   cSchedule(tChannelID ChannelID);
   tChannelID ChannelID(void) const { return channelID; }
   time_t Modified(void) const { return modified; }
+  time_t PresentSeen(void) const { return presentSeen; }
+  bool PresentSeenWithin(int Seconds) const { return time(NULL) - presentSeen < Seconds; }
   void SetModified(void) { modified = time(NULL); }
+  void SetPresentSeen(void) { presentSeen = time(NULL); }
   void SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel = NULL);
   void ClrRunningStatus(cChannel *Channel = NULL);
   void ResetVersions(void);
diff --git a/font.h b/font.h
index 012f6c544..b5a21a3a8 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.10 2005/01/14 13:25:35 kls Exp $
+ * $Id: font.h 1.11 2005/03/19 15:51:19 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -44,6 +44,7 @@ class cFont {
   int height;
 public:
   cFont(void *Data);
+  virtual ~cFont() {}
   void SetData(void *Data);
   virtual int Width(unsigned char c) const { return data[c]->width; }
       ///< Returns the width of the given character.
diff --git a/i18n.c b/i18n.c
index a265cd0eb..572166676 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.181 2005/02/27 09:45:57 kls Exp $
+ * $Id: i18n.c 1.185 2005/03/12 10:43:16 kls Exp $
  *
  * Translations provided by:
  *
@@ -958,7 +958,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Skanna",
     "C�utare canale",
     "",//TODO
     "",//TODO
@@ -1801,7 +1801,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "VPS",
     "VPS",
     "",// TODO
     "",// TODO
@@ -2301,16 +2301,16 @@ const tI18nPhrase Phrases[] = {
     "Geen audio beschikbaar!",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Pas d'audio disponible!",
     "��nen kieli ei ole valittavissa!",
     "",//TODO
     "",//TODO
     "",//TODO
-    "Pas d'audio disponible!",
-    "",//TODO
+    "Ljud saknas!"
     "",//TODO
     "",//TODO
     "",//TODO
+    "����������� ����!",
     "",//TODO
     "Audio k�ttesaamatu!",
     "Ingen lyd tilg�ngelig!",
@@ -2581,7 +2581,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Skin",
     "Skin",
     "",// TODO
     "",// TODO
@@ -2602,7 +2602,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Tema",
     "Tem�",
     "",// TODO
     "",// TODO
@@ -2623,7 +2623,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "V�nster",
     "St�nga",
     "",// TODO
     "",// TODO
@@ -2644,7 +2644,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�vre",
     "Sus",
     "",// TODO
     "",// TODO
@@ -2728,7 +2728,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Anv�nd liten font",
     "Utilizare fonturi mici",
     "",// TODO
     "",// TODO
@@ -2749,7 +2749,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "aldrig",
     "niciodat�",
     "",// TODO
     "",// TODO
@@ -2770,7 +2770,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "skin beroende",
     "dep. de skin",
     "",// TODO
     "",// TODO
@@ -2791,7 +2791,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "alltid",
     "�ntotdeauna",
     "",// TODO
     "",// TODO
@@ -2833,11 +2833,11 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Kanal information (s)",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "����� ���������� � ������ (���)",
     "",// TODO
     "",// TODO
     "Tid kanalinfo skal vises (s)",
@@ -3043,11 +3043,11 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�nskade spr�k",
     "Limbi preferate",
     "",// TODO
     "",// TODO
-    "�������������� �����",
+    "�������������� ����� (�������)",
     "Preferirani jezici",
     "Eelistatuid keeli",
     "Foretrukne sprog",
@@ -3064,7 +3064,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�nskat spr�k",
     "Limba preferat�",
     "",// TODO
     "",// TODO
@@ -3102,15 +3102,15 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "N�ytt�muoto",
     "",//TODO
     "",//TODO
     "",//TODO
+    "Format f�r Video display",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "�������������� �����������",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3131,7 +3131,7 @@ const tI18nPhrase Phrases[] = {
     "pan&scan",
     "pan&scan",
     "pan&scan",
-    "pan&scan",
+    "��������������",
     "pan&scan",
     "pan&scan",
     "pan&scan",
@@ -3152,7 +3152,7 @@ const tI18nPhrase Phrases[] = {
     "letterbox",
     "letterbox",
     "letterbox",
-    "letterbox",
+    "���������",
     "letterbox",
     "letterbox",
     "letterbox",
@@ -3173,7 +3173,7 @@ const tI18nPhrase Phrases[] = {
     "center cut out",
     "center cut out",
     "center cut out",
-    "center cut out",
+    "�������� �����",
     "center cut out",
     "center cut out",
     "center cut out",
@@ -3205,17 +3205,17 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Dolby Digital gebruiken",
     "",//TODO
-    "",//TODO
+    "Utiliser le Dolby Digital",
     "",//TODO
     "K�yt� Dolby Digital -��nt�",
     "",//TODO
     "",//TODO
     "",//TODO
-    "Utiliser le Dolby Digital",
-    "",//TODO
+    "Anv�nd Dolby Digital",
     "",//TODO
     "",//TODO
     "",//TODO
+    "�������� Dolby Digital",
     "",//TODO
     "Dolby Digital kasutamine",
     "Anvend Dolby Digital",
@@ -3232,7 +3232,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Uppdatera kanaler",
     "Actualizare canale",
     "",// TODO
     "",// TODO
@@ -3253,7 +3253,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "bara namn",
     "doar numele",
     "",// TODO
     "",// TODO
@@ -3274,7 +3274,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "namn och PIDdar",
     "nume si PID-uri",
     "",// TODO
     "",// TODO
@@ -3295,7 +3295,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "l�gg till nya kanaler",
     "ad�ugare canale noi",
     "",// TODO
     "",// TODO
@@ -3316,7 +3316,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "l�gg till nya transponders",
     "ad�ugare transpondere noi",
     "",// TODO
     "",// TODO
@@ -3337,11 +3337,11 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Antal ljudspr�k",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "�������������� ����� (����)",
     "",//TODO
     "",//TODO
     "Audio sprog (ant.)",
@@ -3358,11 +3358,11 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Ljudspr�k",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "������",
     "",//TODO
     "",//TODO
     "Audio sprog",
@@ -3652,7 +3652,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Anv�nd VPS",
     "Utilizeaz� VPS",
     "",// TODO
     "",// TODO
@@ -3673,7 +3673,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "VPS marginal (s)",
     "Marj� de timp la utilizare VPS (s)",
     "",// TODO
     "",// TODO
@@ -3925,7 +3925,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "������� ������� (�)",
-    "",// TODO
+    "Zap timeout(s)",
     "Interval zapping (s)",
     "",// TODO
     "",// TODO
@@ -4784,17 +4784,17 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Audio",
     "",// TODO
-    "",// TODO
+    "Audio",
     "",// TODO
     "��ni",
     "",// TODO
     "",// TODO
     "",// TODO
-    "Audio",
-    "",// TODO
+    "Ljud",
     "",// TODO
     "",// TODO
     "",// TODO
+    "����",
     "",// TODO
     "Audio",
     "Audio",
@@ -5274,7 +5274,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Klassisk VDR",
     "VDR clasic",
     "",// TODO
     "",// TODO
@@ -5295,7 +5295,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ST:TNG konsol",
     "Cons. ST:TNG",
     "",// TODO
     "",// TODO
diff --git a/menu.c b/menu.c
index e31686332..30183dfc8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.342 2005/02/27 14:09:00 kls Exp $
+ * $Id: menu.c 1.348 2005/03/20 15:14:51 kls Exp $
  */
 
 #include "menu.h"
@@ -632,7 +632,7 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
      channel = data.Channel()->Number();
      Add(new cMenuEditBitItem( tr("Active"),       &data.flags, tfActive));
      Add(new cMenuEditChanItem(tr("Channel"),      &channel));
-     Add(new cMenuEditDayItem( tr("Day"),          &data.day));
+     Add(new cMenuEditDateItem(tr("Day"),          &data.day, &data.weekdays));
      Add(new cMenuEditTimeItem(tr("Start"),        &data.start));
      Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop));
      Add(new cMenuEditBitItem( tr("VPS"),          &data.flags, tfVps));
@@ -654,13 +654,12 @@ cMenuEditTimer::~cMenuEditTimer()
 void cMenuEditTimer::SetFirstDayItem(void)
 {
   if (!firstday && !data.IsSingleEvent()) {
-     Add(firstday = new cMenuEditDateItem(tr("First day"), &data.firstday));
+     Add(firstday = new cMenuEditDateItem(tr("First day"), &data.day));
      Display();
      }
   else if (firstday && data.IsSingleEvent()) {
      Del(firstday->Index());
      firstday = NULL;
-     data.firstday = 0;
      Display();
      }
 }
@@ -691,7 +690,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                              Timers.Add(timer);
                           timer->Matches();
                           Timers.SetModified();
-                          isyslog("timer %d %s (%s)", timer->Index() + 1, addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
+                          isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
                           }
                      }
@@ -733,13 +732,28 @@ int cMenuTimerItem::Compare(const cListObject &ListObject) const
 
 void cMenuTimerItem::Set(void)
 {
+  cString day, name("");
+  if (timer->WeekDays())
+     day = timer->PrintDay(0, timer->WeekDays());
+  else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {
+     day = itoa(timer->GetMDay(timer->Day()));
+     name = WeekDayName(timer->Day());
+     }
+  else {
+     struct tm tm_r;
+     time_t Day = timer->Day();
+     localtime_r(&Day, &tm_r);
+     char buffer[16];
+     strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
+     day = buffer;
+     }
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
-                    timer->IsSingleEvent() ? *WeekDayName(timer->StartTime()) : "",
-                    timer->IsSingleEvent() ? " " : "",
-                    *timer->PrintDay(timer->Day()),
+                    *name,
+                    *name && **name ? " " : "",
+                    *day,
                     timer->Start() / 100,
                     timer->Start() % 100,
                     timer->Stop() / 100,
@@ -795,9 +809,9 @@ eOSState cMenuTimers::OnOff(void)
      RefreshCurrent();
      DisplayCurrent(true);
      if (timer->FirstDay())
-        isyslog("timer %d first day set to %s", timer->Index() + 1, *timer->PrintFirstDay());
+        isyslog("timer %s first day set to %s", *timer->ToDescr(), *timer->PrintFirstDay());
      else
-        isyslog("timer %d %sactivated", timer->Index() + 1, timer->HasFlags(tfActive) ? "" : "de");
+        isyslog("timer %s %sactivated", *timer->ToDescr(), timer->HasFlags(tfActive) ? "" : "de");
      Timers.SetModified();
      }
   return osContinue;
@@ -807,7 +821,7 @@ eOSState cMenuTimers::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog("editing timer %d", CurrentTimer()->Index() + 1);
+  isyslog("editing timer %s", *CurrentTimer()->ToDescr());
   return AddSubMenu(new cMenuEditTimer(CurrentTimer()));
 }
 
@@ -832,12 +846,11 @@ eOSState cMenuTimers::Delete(void)
            else
               return osContinue;
            }
-        int Index = ti->Index();
+        isyslog("deleting timer %s", *ti->ToDescr());
         Timers.Del(ti);
         cOsdMenu::Del(Current());
         Timers.SetModified();
         Display();
-        isyslog("timer %d deleted", Index + 1);
         }
      }
   return osContinue;
@@ -1603,9 +1616,8 @@ eOSState cMenuRecordings::Delete(void)
                  timer->Skip();
                  cRecordControls::Process(time(NULL));
                  if (timer->IsSingleEvent()) {
-                    int Index = timer->Index();
+                    isyslog("deleting timer %s", *timer->ToDescr());
                     Timers.Del(timer);
-                    isyslog("timer %d deleted", Index + 1);
                     }
                  Timers.SetModified();
                  }
@@ -1619,6 +1631,7 @@ eOSState cMenuRecordings::Delete(void)
               cReplayControl::ClearLastReplayed(ri->FileName());
               cOsdMenu::Del(Current());
               Recordings.Del(recording);
+              SetHelpKeys();
               Display();
               if (!Count())
                  return osBack;
@@ -1947,8 +1960,9 @@ void cMenuSetupDVB::Setup(void)
   Clear();
 
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
-  Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"),  &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
+  if (data.VideoFormat == 0)
+     Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"),     &data.UseDolbyDigital));
   Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 5, updateChannelsTexts));
   Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nNumLanguages));
@@ -1964,10 +1978,12 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
   int oldPrimaryDVB = ::Setup.PrimaryDVB;
   int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
   bool oldVideoFormat = ::Setup.VideoFormat;
+  bool newVideoFormat = data.VideoFormat;
   int oldnumAudioLanguages = numAudioLanguages;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (Key != kNone) {
+     bool DoSetup = data.VideoFormat != newVideoFormat;
      if (numAudioLanguages != oldnumAudioLanguages) {
         for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
             data.AudioLanguages[i] = 0;
@@ -1984,8 +2000,10 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
                 }
             }
         data.AudioLanguages[numAudioLanguages] = -1;
-        Setup();
+        DoSetup = true;
         }
+     if (DoSetup)
+        Setup();
      }
   if (state == osBack && Key == kOk) {
      if (::Setup.PrimaryDVB != oldPrimaryDVB)
@@ -3048,7 +3066,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
 
 cRecordControl::~cRecordControl()
 {
-  Stop(true);
+  Stop();
   free(instantId);
   free(fileName);
 }
@@ -3083,16 +3101,11 @@ bool cRecordControl::GetEvent(void)
   return false;
 }
 
-void cRecordControl::Stop(bool KeepInstant)
+void cRecordControl::Stop(void)
 {
   if (timer) {
      DELETENULL(recorder);
      timer->SetRecording(false);
-     if ((IsInstant() && !KeepInstant) || (timer->IsSingleEvent() && timer->StopTime() <= time(NULL))) {
-        isyslog("deleting timer %d", timer->Index() + 1);
-        Timers.Del(timer);
-        Timers.SetModified();
-        }
      timer = NULL;
      cStatus::MsgRecording(device, NULL);
      cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
@@ -3153,8 +3166,16 @@ void cRecordControls::Stop(const char *InstantId)
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          const char *id = RecordControls[i]->InstantId();
-         if (id && strcmp(id, InstantId) == 0)
+         if (id && strcmp(id, InstantId) == 0) {
+            cTimer *timer = RecordControls[i]->Timer();
             RecordControls[i]->Stop();
+            if (timer) {
+               isyslog("deleting timer %s", *timer->ToDescr());
+               Timers.Del(timer);
+               Timers.SetModified();
+               }
+            break;
+            }
          }
       }
 }
@@ -3165,7 +3186,7 @@ void cRecordControls::Stop(cDevice *Device)
       if (RecordControls[i]) {
          if (RecordControls[i]->Device() == Device) {
             isyslog("stopping recording on DVB device %d due to higher priority", Device->CardIndex() + 1);
-            RecordControls[i]->Stop(true);
+            RecordControls[i]->Stop();
             }
          }
       }
@@ -3242,7 +3263,7 @@ void cRecordControls::ChannelDataModified(cChannel *Channel)
          if (RecordControls[i]->Timer() && RecordControls[i]->Timer()->Channel() == Channel) {
             if (RecordControls[i]->Device()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
                isyslog("stopping recording due to modification of channel %d", Channel->Number());
-               RecordControls[i]->Stop(true);
+               RecordControls[i]->Stop();
                // This will restart the recording, maybe even from a different
                // device in case conditional access has changed.
                }
diff --git a/menu.h b/menu.h
index d63fdafa2..d142bbc45 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.68 2005/01/08 15:48:57 kls Exp $
+ * $Id: menu.h 1.69 2005/03/20 10:57:29 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -155,8 +155,7 @@ class cRecordControl {
   virtual ~cRecordControl();
   bool Process(time_t t);
   cDevice *Device(void) { return device; }
-  void Stop(bool KeepInstant = false);
-  bool IsInstant(void) { return instantId; }
+  void Stop(void);
   const char *InstantId(void) { return instantId; }
   const char *FileName(void) { return fileName; }
   cTimer *Timer(void) { return timer; }
diff --git a/menuitems.c b/menuitems.c
index 9b86db4b4..18b001ee2 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.21 2004/11/21 13:24:10 kls Exp $
+ * $Id: menuitems.c 1.22 2005/03/19 15:33:34 kls Exp $
  */
 
 #include "menuitems.h"
@@ -535,117 +535,35 @@ eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuEditDayItem ------------------------------------------------------
-
-int cMenuEditDayItem::days[] ={ cTimer::ParseDay("M------"),
-                                cTimer::ParseDay("-T-----"),
-                                cTimer::ParseDay("--W----"),
-                                cTimer::ParseDay("---T---"),
-                                cTimer::ParseDay("----F--"),
-                                cTimer::ParseDay("-----S-"),
-                                cTimer::ParseDay("------S"),
-                                cTimer::ParseDay("MTWTF--"),
-                                cTimer::ParseDay("MTWTFS-"),
-                                cTimer::ParseDay("MTWTFSS"),
-                                cTimer::ParseDay("-----SS"),
-                                0 };
-
-cMenuEditDayItem::cMenuEditDayItem(const char *Name, int *Value)
-:cMenuEditIntItem(Name, Value, -INT_MAX, 31)
-{
-  d = -1;
-  md = 0;
-  if (*value < 0) {
-     int n = 0;
-     while (days[n]) {
-           if (days[n] == *value) {
-              d = n;
-              break;
-              }
-           n++;
-           }
-     }
-  Set();
-}
-
-void cMenuEditDayItem::Set(void)
-{
-  SetValue(cTimer::PrintDay(*value));
-}
+// --- cMenuEditDateItem -----------------------------------------------------
 
-eOSState cMenuEditDayItem::ProcessKey(eKeys Key)
+static int ParseWeekDays(const char *s)
 {
-  switch (Key) {
-    case kLeft|k_Repeat:
-    case kLeft:  if (d > 0)
-                    *value = days[--d];
-                 else if (d == 0) {
-                    *value = 31;
-                    d = -1;
-                    }
-                 else if (*value == 1) {
-                    d = sizeof(days) / sizeof(int) - 2;
-                    *value = days[d];
-                    }
-                 else
-                    return cMenuEditIntItem::ProcessKey(Key);
-                 Set();
-                 break;
-    case kRight|k_Repeat:
-    case kRight: if (d >= 0) {
-                    *value = days[++d];
-                    if (*value == 0) {
-                       *value = 1;
-                       d = -1;
-                       }
-                    }
-                 else if (*value == 31) {
-                    d = 0;
-                    *value = days[d];
-                    }
-                 else
-                    return cMenuEditIntItem::ProcessKey(Key);
-                 Set();
-                 break;
-    default: {
-               if (d >= 0) {
-                  if (k1 <= Key && Key <= k7) {
-                     int v = *value ^ (1 << (Key - k1));
-                     if ((v & 0xFF) != 0) {
-                        *value = v; // can't let this become all 0
-                        Set();
-                        }
-                     break;
-                     }
-                  }
-               int v = *value;
-               eOSState result = cMenuEditIntItem::ProcessKey(Key);
-               if (result == osContinue && Key == k0) {
-                  if (d >= 0) {
-                     *value = md ? md : cTimer::GetMDay(time(NULL));
-                     md = 0;
-                     d = -1;
-                     Set();
-                     }
-                  else if (*value == 0 || *value == v) {
-                     md = v;
-                     d = cTimer::GetWDayFromMDay(v);
-                     *value = days[d];
-                     Set();
-                     }
-                  }
-               return result;
-             }
-    }
-  return osContinue;
+  time_t day;
+  int weekdays;
+  return cTimer::ParseDay(s, day, weekdays) ? weekdays : 0;
 }
 
-// --- cMenuEditDateItem -----------------------------------------------------
+int cMenuEditDateItem::days[] = { ParseWeekDays("M------"),
+                                  ParseWeekDays("-T-----"),
+                                  ParseWeekDays("--W----"),
+                                  ParseWeekDays("---T---"),
+                                  ParseWeekDays("----F--"),
+                                  ParseWeekDays("-----S-"),
+                                  ParseWeekDays("------S"),
+                                  ParseWeekDays("MTWTF--"),
+                                  ParseWeekDays("MTWTFS-"),
+                                  ParseWeekDays("MTWTFSS"),
+                                  ParseWeekDays("-----SS"),
+                                  0 };
 
-cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value)
+cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value, int *WeekDays)
 :cMenuEditItem(Name)
 {
   value = Value;
+  weekdays = WeekDays;
+  oldvalue = 0;
+  dayindex = 0;
   Set();
 }
 
@@ -653,7 +571,11 @@ void cMenuEditDateItem::Set(void)
 {
 #define DATEBUFFERSIZE 32
   char buf[DATEBUFFERSIZE];
-  if (*value) {
+  if (weekdays && *weekdays) {
+     SetValue(cTimer::PrintDay(0, *weekdays));
+     return;
+     }
+  else if (*value) {
      struct tm tm_r;
      localtime_r(value, &tm_r);
      strftime(buf, DATEBUFFERSIZE, "%Y-%m-%d ", &tm_r);
@@ -669,15 +591,73 @@ eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
   eOSState state = cMenuEditItem::ProcessKey(Key);
 
   if (state == osUnknown) {
+     time_t now = time(NULL);
      if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        *value -= SECSINDAY;
-        if (*value < time(NULL))
-           *value = 0;
+        if (!weekdays || !*weekdays) {
+           // Decrement single day:
+           time_t v = *value;
+           v -= SECSINDAY;
+           if (v < now) {
+              if (now <= v + SECSINDAY) { // switched from tomorrow to today
+                 if (!weekdays)
+                    v = 0;
+                 }
+              else if (weekdays) { // switched from today to yesterday, so enter weekdays mode
+                 v = 0;
+                 dayindex = sizeof(days) / sizeof(int) - 2;
+                 *weekdays = days[dayindex];
+                 }
+              else // don't go before today
+                 v = *value;
+              }
+           *value = v;
+           }
+        else {
+           // Decrement weekday index:
+           if (dayindex > 0)
+              *weekdays = days[--dayindex];
+           }
         }
      else if (NORMALKEY(Key) == kRight) {
-        if (!*value)
-           *value = cTimer::SetTime(time(NULL), 0);
-        *value += SECSINDAY;
+        if (!weekdays || !*weekdays) {
+           // Increment single day:
+           if (!*value)
+              *value = cTimer::SetTime(now, 0);
+           *value += SECSINDAY;
+           }
+        else {
+           // Increment weekday index:
+           *weekdays = days[++dayindex];
+           if (!*weekdays) { // was last weekday entry, so switch to today
+              *value = cTimer::SetTime(now, 0);
+              dayindex = 0;
+              }
+           }
+        }
+     else if (weekdays) {
+        if (Key == k0) {
+           // Toggle between weekdays and single day:
+           if (*weekdays) {
+              *value = cTimer::SetTime(oldvalue ? oldvalue : now, 0);
+              oldvalue = 0;
+              *weekdays = 0;
+              }
+           else {
+              *weekdays = days[cTimer::GetWDay(*value)];
+              oldvalue = *value;
+              *value = 0;
+              }
+           }
+        else if (k1 <= Key && Key <= k7) {
+           // Toggle individual weekdays:
+           if (*weekdays) {
+              int v = *weekdays ^ (1 << (Key - k1));
+              if (v != 0)
+                 *weekdays = v; // can't let this become all 0
+              }
+           }
+        else
+           return state;
         }
      else
         return state;
diff --git a/menuitems.h b/menuitems.h
index 28904013c..b45fc9604 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.10 2004/11/21 13:23:00 kls Exp $
+ * $Id: menuitems.h 1.11 2005/03/19 15:02:57 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -118,24 +118,16 @@ class cMenuEditTranItem : public cMenuEditChanItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-class cMenuEditDayItem : public cMenuEditIntItem {
+class cMenuEditDateItem : public cMenuEditItem {
 private:
   static int days[];
-  int d;
-  int md;
-protected:
-  virtual void Set(void);
-public:
-  cMenuEditDayItem(const char *Name, int *Value);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-class cMenuEditDateItem : public cMenuEditItem {
-protected:
   time_t *value;
+  int *weekdays;
+  time_t oldvalue;
+  int dayindex;
   virtual void Set(void);
 public:
-  cMenuEditDateItem(const char *Name, time_t *Value);
+  cMenuEditDateItem(const char *Name, time_t *Value, int *WeekDays = NULL);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/remote.c b/remote.c
index 2d382e0b0..448d5530e 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.41 2004/10/31 14:05:12 kls Exp $
+ * $Id: remote.c 1.42 2005/03/20 13:25:31 kls Exp $
  */
 
 #include "remote.h"
@@ -145,6 +145,7 @@ bool cRemote::Put(const char *Code, bool Repeat, bool Release)
 
 bool cRemote::HasKeys(void)
 {
+  cMutexLock MutexLock(&mutex);
   return in != out && !(keys[out] & k_Repeat);
 }
 
diff --git a/remux.c b/remux.c
index ca65a61e2..135fa7977 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.31 2005/02/13 14:36:23 kls Exp $
+ * $Id: remux.c 1.33 2005/03/20 13:18:15 kls Exp $
  */
 
 #include "remux.h"
@@ -46,6 +46,8 @@ class cDolbyRepacker : public cRepacker {
   int fragmentTodo;
   uchar pesHeader[6 + 3 + 255 + 4 + 4];
   int pesHeaderLen;
+  uchar pesHeaderBackup[6 + 3 + 255];
+  int pesHeaderBackupLen;
   uchar chk1;
   uchar chk2;
   int ac3todo;
@@ -57,8 +59,8 @@ class cDolbyRepacker : public cRepacker {
     get_length,
     output_packet
     } state;
-  void ResetPesHeader(void);
-  void AppendSubStreamID(void);
+  void ResetPesHeader(bool ContinuationFrame = false);
+  void AppendSubStreamID(bool ContinuationFrame = false);
   bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
   bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
 public:
@@ -103,23 +105,26 @@ cDolbyRepacker::cDolbyRepacker(void)
   Reset();
 }
 
-void cDolbyRepacker::AppendSubStreamID(void)
+void cDolbyRepacker::AppendSubStreamID(bool ContinuationFrame)
 {
   if (subStreamId) {
      pesHeader[pesHeaderLen++] = subStreamId;
+     // number of ac3 frames "starting" in this packet (1 by design).
+     pesHeader[pesHeaderLen++] = 0x01;
+     // offset to start of first ac3 frame (0 means "no ac3 frame starting"
+     // so 1 (by design) addresses the first byte after the next two bytes).
      pesHeader[pesHeaderLen++] = 0x00;
-     pesHeader[pesHeaderLen++] = 0x00;
-     pesHeader[pesHeaderLen++] = 0x00;
+     pesHeader[pesHeaderLen++] = (ContinuationFrame ? 0x00 : 0x01);
      }
 }
 
-void cDolbyRepacker::ResetPesHeader(void)
+void cDolbyRepacker::ResetPesHeader(bool ContinuationFrame)
 {
   pesHeader[6] = 0x80;
   pesHeader[7] = 0x00;
   pesHeader[8] = 0x00;
   pesHeaderLen = 9;
-  AppendSubStreamID();
+  AppendSubStreamID(ContinuationFrame);
 }
 
 void cDolbyRepacker::Reset(void)
@@ -131,6 +136,7 @@ void cDolbyRepacker::Reset(void)
   chk2 = 0;
   fragmentLen = 0;
   fragmentTodo = 0;
+  pesHeaderBackupLen = 0;
 }
 
 bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite)
@@ -229,12 +235,17 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
   if ((Data[6] & 0xC0) != 0x80)
      return 0;
 
+  // backup PES header
+  if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
+     pesHeaderBackupLen = 6 + 3 + Data[8];
+     memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
+     }
+
   // skip PES header
   int done = 6 + 3 + Data[8];
   int todo = Count - done;
   const uchar *data = Data + done;
-  bool headerCopied = false;
-  
+
   // look for 0x0B 0x77 <chk1> <chk2> <frameSize>
   while (todo > 0) {
         switch (state) {
@@ -242,10 +253,10 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                if (*data == 0x0B) {
                   ++(int &)state;
                   // copy header information once for later use
-                  if (!headerCopied) {
-                     headerCopied = true;
-                     pesHeaderLen = 6 + 3 + Data[8];
-                     memcpy(pesHeader, Data, pesHeaderLen);
+                  if (pesHeaderBackupLen > 0) {
+                     pesHeaderLen = pesHeaderBackupLen;
+                     pesHeaderBackupLen = 0;
+                     memcpy(pesHeader, pesHeaderBackup, pesHeaderLen);
                      AppendSubStreamID();
                      }
                   }
@@ -279,9 +290,8 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                ac3todo = 2 * frameSizes[*data];
                // frameSizeCode was invalid => restart searching
                if (ac3todo <= 0) {
-                  // reset PES header instead of using/copying a wrong one
+                  // reset PES header instead of using a wrong one
                   ResetPesHeader();
-                  headerCopied = true;
                   if (chk1 == 0x0B) {
                      if (chk2 == 0x77) {
                         state = store_chk1;
@@ -320,8 +330,8 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                   // start a new packet
                   if (!StartNewPacket(ResultBuffer, data, todo, done, bite))
                      return done;
-                  // prepare for next packet
-                  ResetPesHeader();
+                  // prepare for next (continuation) packet
+                  ResetPesHeader(state == output_packet);
                   }
                data += bite;
                done += bite;
diff --git a/svdrp.c b/svdrp.c
index 1981f6e8e..71015023a 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.67 2004/12/26 12:23:55 kls Exp $
+ * $Id: svdrp.c 1.69 2005/03/20 15:04:00 kls Exp $
  */
 
 #include "svdrp.h"
@@ -111,7 +111,8 @@ int cSocket::Accept(void)
         bool accepted = SVDRPhosts.Acceptable(clientname.sin_addr.s_addr);
         if (!accepted) {
            const char *s = "Access denied!\n";
-           write(newsock, s, strlen(s));
+           if (write(newsock, s, strlen(s)) < 0)
+              LOG_ERROR;
            close(newsock);
            newsock = -1;
            }
@@ -528,9 +529,9 @@ void cSVDRP::CmdDELT(const char *Option)
         cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
         if (timer) {
            if (!timer->Recording()) {
+              isyslog("deleting timer %s", *timer->ToDescr());
               Timers.Del(timer);
               Timers.SetModified();
-              isyslog("timer %s deleted", Option);
               Reply(250, "Timer \"%s\" deleted", Option);
               }
            else
@@ -918,7 +919,7 @@ void cSVDRP::CmdMODT(const char *Option)
               }
            *timer = t;
            Timers.SetModified();
-           isyslog("timer %d modified (%s)", timer->Index() + 1, timer->HasFlags(tfActive) ? "active" : "inactive");
+           isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
            Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
            }
         else
@@ -976,7 +977,7 @@ void cSVDRP::CmdNEWT(const char *Option)
         if (!t) {
            Timers.Add(timer);
            Timers.SetModified();
-           isyslog("timer %d added", timer->Index() + 1);
+           isyslog("timer %s added", *timer->ToDescr());
            Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
            return;
            }
@@ -1050,11 +1051,11 @@ void cSVDRP::CmdUPDT(const char *Option)
            t->Parse(Option);
            delete timer;
            timer = t;
-           isyslog("timer %d updated", timer->Index() + 1);
+           isyslog("timer %s updated", *timer->ToDescr());
            }
         else {
            Timers.Add(timer);
-           isyslog("timer %d added", timer->Index() + 1);
+           isyslog("timer %s added", *timer->ToDescr());
            }
         Timers.SetModified();
         Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
diff --git a/timers.c b/timers.c
index 9edc6c3bb..2dded66e6 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.22 2005/02/06 09:45:52 kls Exp $
+ * $Id: timers.c 1.30 2005/03/20 14:50:37 kls Exp $
  */
 
 #include "timers.h"
@@ -30,7 +30,8 @@ cTimer::cTimer(bool Instant, bool Pause)
   time_t t = time(NULL);
   struct tm tm_r;
   struct tm *now = localtime_r(&t, &tm_r);
-  day = now->tm_mday;
+  day = SetTime(t, 0);
+  weekdays = 0;
   start = now->tm_hour * 100 + now->tm_min;
   stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
   stop = (stop / 60) * 100 + (stop % 60);
@@ -39,7 +40,6 @@ cTimer::cTimer(bool Instant, bool Pause)
   priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
   lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
   *file = 0;
-  firstday = 0;
   summary = NULL;
   event = NULL;
   if (Instant && channel)
@@ -62,7 +62,8 @@ cTimer::cTimer(const cEvent *Event)
      }
   struct tm tm_r;
   struct tm *time = localtime_r(&tstart, &tm_r);
-  day = time->tm_mday;
+  day = SetTime(tstart, 0);
+  weekdays = 0;
   start = time->tm_hour * 100 + time->tm_min;
   time = localtime_r(&tstop, &tm_r);
   stop = time->tm_hour * 100 + time->tm_min;
@@ -74,7 +75,6 @@ cTimer::cTimer(const cEvent *Event)
   const char *Title = Event->Title();
   if (!isempty(Title))
      strn0cpy(file, Event->Title(), sizeof(file));
-  firstday = 0;
   summary = NULL;
   event = Event;
 }
@@ -109,85 +109,111 @@ cString cTimer::ToText(bool UseChannelID)
   char *buffer;
   strreplace(file, ':', '|');
   strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
+  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
   return cString(buffer, true);
 }
 
+cString cTimer::ToDescr(void) const
+{
+  char *buffer;
+  asprintf(&buffer, "%d (%d %04d-%04d '%s')", Index() + 1, Channel()->Number(), start, stop, file);
+  return cString(buffer, true);
+}
+
 int cTimer::TimeToInt(int t)
 {
   return (t / 100 * 60 + t % 100) * 60;
 }
 
-int cTimer::ParseDay(const char *s, time_t *FirstDay)
-{
-  char *tail;
-  int d = strtol(s, &tail, 10);
-  if (FirstDay)
-     *FirstDay = 0;
-  if (tail && *tail) {
-     d = 0;
-     if (tail == s) {
-        const char *first = strchr(s, '@');
-        int l = first ? first - s : strlen(s);
-        if (l == 7) {
-           for (const char *p = s + 6; p >= s; p--) {
-               d <<= 1;
-               d |= (*p != '-');
-               }
-           d |= 0x80000000;
-           }
-        if (FirstDay && first) {
-           ++first;
-           if (strlen(first) == 10) {
-              struct tm tm_r;
-              if (3 == sscanf(first, "%d-%d-%d", &tm_r.tm_year, &tm_r.tm_mon, &tm_r.tm_mday)) {
-                 tm_r.tm_year -= 1900;
-                 tm_r.tm_mon--;
-                 tm_r.tm_hour = tm_r.tm_min = tm_r.tm_sec = 0;
-                 tm_r.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
-                 *FirstDay = mktime(&tm_r);
-                 }
-              }
-           else
-              d = 0;
+bool cTimer::ParseDay(const char *s, time_t &Day, int &WeekDays)
+{
+  // possible formats are:
+  // 19
+  // 2005-03-19
+  // MTWTFSS
+  // MTWTFSS@19
+  // MTWTFSS@2005-03-19
+
+  Day = 0;
+  WeekDays = 0;
+  s = skipspace(s);
+  if (!*s)
+     return false;
+  const char *a = strchr(s, '@');
+  const char *d = a ? a + 1 : isdigit(*s) ? s : NULL;
+  if (d) {
+     if (strlen(d) == 10) {
+        struct tm tm_r;
+        if (3 == sscanf(d, "%d-%d-%d", &tm_r.tm_year, &tm_r.tm_mon, &tm_r.tm_mday)) {
+           tm_r.tm_year -= 1900;
+           tm_r.tm_mon--;
+           tm_r.tm_hour = tm_r.tm_min = tm_r.tm_sec = 0;
+           tm_r.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+           Day = mktime(&tm_r);
            }
+        else
+           return false;
+        }
+     else {
+        // handle "day of month" for compatibility with older versions:
+        char *tail = NULL;
+        int day = strtol(s, &tail, 10);
+        if (tail && *tail || day < 1 || day > 31)
+           return false;
+        time_t t = time(NULL);
+        int DaysToCheck = 61; // 61 to handle months with 31/30/31
+        for (int i = -1; i <= DaysToCheck; i++) {
+            time_t t0 = IncDay(t, i);
+            if (GetMDay(t0) == day) {
+               Day = SetTime(t0, 0);
+               break;
+               }
+            }
         }
      }
-  else if (d < 1 || d > 31)
-     d = 0;
-  return d;
+  if (a || !isdigit(*s)) {
+     if ((a && a - s == 7) || strlen(s) == 7) {
+        for (const char *p = s + 6; p >= s; p--) {
+            WeekDays <<= 1;
+            WeekDays |= (*p != '-');
+            }
+        }
+     else
+        return false;
+     }
+  return true;
 }
 
-cString cTimer::PrintDay(int d, time_t FirstDay)
+cString cTimer::PrintDay(time_t Day, int WeekDays)
 {
 #define DAYBUFFERSIZE 32
   char buffer[DAYBUFFERSIZE];
-  if ((d & 0x80000000) != 0) {
-     char *b = buffer;
+  char *b = buffer;
+  if (WeekDays) {
      const char *w = tr("MTWTFSS");
      while (*w) {
-           *b++ = (d & 1) ? *w : '-';
-           d >>= 1;
+           *b++ = (WeekDays & 1) ? *w : '-';
+           WeekDays >>= 1;
            w++;
            }
-     if (FirstDay) {
-        struct tm tm_r;
-        localtime_r(&FirstDay, &tm_r);
-        b += strftime(b, DAYBUFFERSIZE - (b - buffer), "@%Y-%m-%d", &tm_r);
-        }
-     *b = 0;
+     if (Day)
+        *b++ = '@';
      }
-  else
-     sprintf(buffer, "%d", d);
+  if (Day) {
+     struct tm tm_r;
+     localtime_r(&Day, &tm_r);
+     b += strftime(b, DAYBUFFERSIZE - (b - buffer), "%Y-%m-%d", &tm_r);
+     }
+  *b = 0;
   return buffer;
 }
 
-cString cTimer::PrintFirstDay(void)
+cString cTimer::PrintFirstDay(void) const
 {
-  if (firstday) {
-     cString s = PrintDay(day, firstday);
+  if (weekdays) {
+     cString s = PrintDay(day, weekdays);
      if (strlen(s) == 18)
         return *s + 8;
      }
@@ -223,8 +249,7 @@ bool cTimer::Parse(const char *s)
         summary = NULL;
         }
      //TODO add more plausibility checks
-     day = ParseDay(daybuffer, &firstday);
-     result = day != 0;
+     result = ParseDay(daybuffer, day, weekdays);
      strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
@@ -251,7 +276,7 @@ bool cTimer::Save(FILE *f)
 
 bool cTimer::IsSingleEvent(void) const
 {
-  return (day & 0x80000000) == 0;
+  return !weekdays;
 }
 
 int cTimer::GetMDay(time_t t)
@@ -267,20 +292,9 @@ int cTimer::GetWDay(time_t t)
   return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
 }
 
-int cTimer::GetWDayFromMDay(int MDay)
-{
-  time_t now =  time(NULL);
-  for (int i = -1; i <= 28; i++) { // looking 4 weeks into the future should be enough
-      time_t t0 = IncDay(now, i);
-      if (GetMDay(t0) == MDay)
-         return GetWDay(t0);
-      }
-  return GetWDay(now); // just to return something
-}
-
 bool cTimer::DayMatches(time_t t) const
 {
-  return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
+  return IsSingleEvent() ? SetTime(t, 0) == day : (weekdays & (1 << GetWDay(t))) != 0;
 }
 
 time_t cTimer::IncDay(time_t t, int Days)
@@ -324,26 +338,31 @@ bool cTimer::Matches(time_t t, bool Directly) const
   if (length < 0)
      length += SECSINDAY;
 
-  int DaysToCheck = IsSingleEvent() ? 61 : 7; // 61 to handle months with 31/30/31
-  for (int i = -1; i <= DaysToCheck; i++) {
-      time_t t0 = IncDay(t, i);
-      if (DayMatches(t0)) {
-         time_t a = SetTime(t0, begin);
-         time_t b = a + length;
-         if ((!firstday || a >= firstday) && t <= b) {
-            startTime = a;
-            stopTime = b;
-            break;
+  if (IsSingleEvent()) {
+     startTime = SetTime(day, begin);
+     stopTime = startTime + length;
+     }
+  else {
+     for (int i = -1; i <= 7; i++) {
+         time_t t0 = IncDay(t, i);
+         if (DayMatches(t0)) {
+            time_t a = SetTime(t0, begin);
+            time_t b = a + length;
+            if ((!day || a >= day) && t <= b) {
+               startTime = a;
+               stopTime = b;
+               break;
+               }
             }
          }
-      }
-  if (!startTime)
-     startTime = firstday; // just to have something that's more than a week in the future
-  else if (!Directly && (t > startTime || t > firstday + SECSINDAY + 3600)) // +3600 in case of DST change
-     firstday = 0;
+     if (!startTime)
+        startTime = day; // just to have something that's more than a week in the future
+     else if (!Directly && (t > startTime || t > day + SECSINDAY + 3600)) // +3600 in case of DST change
+        day = 0;
+     }
 
   if (HasFlags(tfActive)) {
-     if (HasFlags(tfVps) && !Directly && event && event->Vps()) {
+     if (HasFlags(tfVps) && !Directly && event && event->Vps() && schedule && schedule->PresentSeenWithin(30)) {
         startTime = event->StartTime();
         stopTime = event->EndTime();
         return event->IsRunning(true);
@@ -353,28 +372,42 @@ bool cTimer::Matches(time_t t, bool Directly) const
   return false;
 }
 
-int cTimer::Matches(const cEvent *Event)
+#define FULLMATCH 1000
+
+int cTimer::Matches(const cEvent *Event, int *Overlap) const
 {
-  if (channel->GetChannelID() == Event->ChannelID()) {
+  // Overlap is the percentage of the Event's duration that is covered by
+  // this timer (based on FULLMATCH for finer granularity than just 100).
+  // To make sure a VPS timer can be distinguished from a plain 100% overlap,
+  // it gets an additional 100 added, and a VPS event that is actually running
+  // gets 200 added to the FULLMATCH.
+  if (HasFlags(tfActive) && channel->GetChannelID() == Event->ChannelID()) {
      bool UseVps = HasFlags(tfVps) && Event->Vps();
-     time_t t1 = UseVps ? Event->Vps() : Event->StartTime();
-     time_t t2 = t1 + Event->Duration();
-     bool m1 = Matches(t1, true);
-     bool m2 = UseVps ? m1 : Matches(t2, true);
+     Matches(UseVps ? Event->Vps() : Event->StartTime(), true);
+     int overlap;
+     if (UseVps)
+        overlap = (startTime == Event->Vps()) ? FULLMATCH + (Event->IsRunning() ? 200 : 100) : 0;
+     else if (startTime <= Event->StartTime() && Event->EndTime() <= stopTime)
+        overlap = FULLMATCH;
+     else if (stopTime <= Event->StartTime() || Event->EndTime() <= startTime)
+        overlap = 0;
+     else
+        overlap = (min(stopTime, Event->EndTime()) - max(startTime, Event->StartTime())) * FULLMATCH / max(Event->Duration(), 1);
      startTime = stopTime = 0;
-     if (m1 && m2) {
-        if (UseVps && Event->IsRunning(true))
-           return tmFull;
-        if (time(NULL) > Event->EndTime())
-           return tmNone;
-        return tmFull;
-        }
-     if ((m1 || m2) && time(NULL) <= Event->EndTime())
-        return tmPartial;
+     if (Overlap)
+        *Overlap = overlap;
+     return overlap >= 1000 ? tmFull : overlap > 0 ? tmPartial : tmNone;
      }
   return tmNone;
 }
 
+#define EXPIRELATENCY 60 // seconds (just in case there's a short glitch in the VPS signal)
+
+bool cTimer::Expired(void) const
+{
+  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL);
+}
+
 time_t cTimer::StartTime(void) const
 {
   if (!startTime)
@@ -389,17 +422,18 @@ time_t cTimer::StopTime(void) const
   return stopTime;
 }
 
-void cTimer::SetEvent(const cEvent *Event)
+void cTimer::SetEvent(const cSchedule *Schedule, const cEvent *Event)
 {
   if (event != Event) { //XXX TODO check event data, too???
      if (Event) {
         char vpsbuf[64] = "";
         if (Event->Vps())
            sprintf(vpsbuf, "(VPS: %s) ", *Event->GetVpsString());
-        isyslog("timer %d (%d %04d-%04d '%s') set to event %s %s-%s %s'%s'", Index() + 1, Channel()->Number(), start, stop, file, *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString(), vpsbuf, Event->Title());
+        isyslog("timer %s set to event %s %s-%s %s'%s'", *ToDescr(), *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString(), vpsbuf, Event->Title());
         }
      else
-        isyslog("timer %d (%d %04d-%04d '%s') set to no event", Index() + 1, Channel()->Number(), start, stop, file);
+        isyslog("timer %s set to no event", *ToDescr());
+     schedule = Event ? Schedule : NULL;
      event = Event;
      }
 }
@@ -407,7 +441,7 @@ void cTimer::SetEvent(const cEvent *Event)
 void cTimer::SetRecording(bool Recording)
 {
   recording = Recording;
-  isyslog("timer %d (%d %04d-%04d '%s') %s", Index() + 1, Channel()->Number(), start, stop, file, recording ? "start" : "stop");
+  isyslog("timer %s %s", *ToDescr(), recording ? "start" : "stop");
 }
 
 void cTimer::SetPending(bool Pending)
@@ -418,7 +452,7 @@ void cTimer::SetPending(bool Pending)
 void cTimer::SetInVpsMargin(bool InVpsMargin)
 {
   if (InVpsMargin && !inVpsMargin)
-     isyslog("timer %d (%d %04d-%04d '%s') entered VPS margin", Index() + 1, Channel()->Number(), start, stop, file);
+     isyslog("timer %s entered VPS margin", *ToDescr());
   inVpsMargin = InVpsMargin;
 }
 
@@ -444,7 +478,7 @@ bool cTimer::HasFlags(int Flags) const
 
 void cTimer::Skip(void)
 {
-  firstday = IncDay(SetTime(StartTime(), 0), 1);
+  day = IncDay(SetTime(StartTime(), 0), 1);
   event = NULL;
 }
 
@@ -452,8 +486,8 @@ void cTimer::OnOff(void)
 {
   if (IsSingleEvent())
      InvFlags(tfActive);
-  else if (firstday) {
-     firstday = 0;
+  else if (day) {
+     day = 0;
      ClrFlags(tfActive);
      }
   else if (HasFlags(tfActive))
@@ -536,6 +570,9 @@ bool cTimers::Modified(void)
   return Result;
 }
 
+#define EPGLIMITPAST   (2 * 3600) // time in seconds around now, within which EPG events will be taken into consideration
+#define EPGLIMITFUTURE (4 * 3600)
+
 void cTimers::SetEvents(void)
 {
   if (time(NULL) - lastSetEvents < 5)
@@ -549,20 +586,40 @@ void cTimers::SetEvents(void)
             if (Schedule) {
                if (!lastSetEvents || Schedule->Modified() >= lastSetEvents) {
                   const cEvent *Event = NULL;
-                  int Match = tmNone;
+                  int Overlap = 0;
+                  int Distance = INT_MIN;
+                  time_t now = time(NULL);
                   for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
                       if (cRemote::HasKeys())
                          return; // react immediately on user input
-                      int m = ti->Matches(e);
-                      if (m > Match) {
-                         Match = m;
+                      if (e->EndTime() < now - EPGLIMITPAST)
+                         continue; // skip old events
+                      if (e->StartTime() > now + EPGLIMITFUTURE)
+                         break; // no need to process events too far in the future
+                      int overlap = 0;
+                      ti->Matches(e, &overlap);
+                      if (overlap && overlap >= Overlap) {
+                         int distance = 0;
+                         if (now < e->StartTime())
+                            distance = e->StartTime() - now;
+                         else if (now > e->EndTime())
+                            distance = e->EndTime() - now;
+                         if (Event && overlap == Overlap) {
+                            if (Overlap > FULLMATCH) { // this means VPS
+                               if (abs(Distance) < abs(distance)) 
+                                  break; // we've already found the closest VPS event
+                               }
+                            else if (e->Duration() <= Event->Duration())
+                               continue; // if overlap is the same, we take the longer event
+                            }
+                         Overlap = overlap;
+                         Distance = distance;
                          Event = e;
-                         if (Match == tmFull)
-                            break;
-                            //XXX what if there's another event with the same VPS time???
                          }
                       }
-                  ti->SetEvent(Event);
+                  if (Event && Event->EndTime() < now - EXPIRELATENCY && !Event->IsRunning())
+                     Event = NULL;
+                  ti->SetEvent(Schedule, Event);
                   }
                }
             }
@@ -570,3 +627,17 @@ void cTimers::SetEvents(void)
      }
   lastSetEvents = time(NULL);
 }
+
+void cTimers::DeleteExpired(void)
+{
+  cTimer *ti = First();
+  while (ti) {
+        cTimer *next = Next(ti);
+        if (ti->Expired()) {
+           isyslog("deleting timer %s", *ti->ToDescr());
+           Del(ti);
+           SetModified();
+           }
+        ti = next;
+        }
+}
diff --git a/timers.h b/timers.h
index 7dcaf16a1..ae83f5b62 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.13 2004/12/26 12:21:29 kls Exp $
+ * $Id: timers.h 1.18 2005/03/20 14:47:45 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -30,14 +30,15 @@ class cTimer : public cListObject {
   bool recording, pending, inVpsMargin;
   int flags;
   cChannel *channel;
-  int day;
+  mutable time_t day; ///< midnight of the day this timer shall hit, or of the first day it shall hit in case of a repeating timer
+  int weekdays;       ///< bitmask, lowest bits: SSFTWTM  (the 'M' is the LSB)
   int start;
   int stop;
   int priority;
   int lifetime;
   char file[MaxFileName];
-  mutable time_t firstday;
   char *summary;
+  const cSchedule *schedule;
   const cEvent *event;
 public:
   cTimer(bool Instant = false, bool Pause = false);
@@ -45,36 +46,38 @@ class cTimer : public cListObject {
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
   virtual int Compare(const cListObject &ListObject) const;
-  bool Recording(void) { return recording; }
-  bool Pending(void) { return pending; }
-  bool InVpsMargin(void) { return inVpsMargin; }
-  int Flags(void) { return flags; }
-  const cChannel *Channel(void) { return channel; }
-  int Day(void) { return day; }
-  int Start(void) { return start; }
-  int Stop(void) { return stop; }
-  int Priority(void) { return priority; }
-  int Lifetime(void) { return lifetime; }
-  const char *File(void) { return file; }
-  time_t FirstDay(void) { return firstday; }
-  const char *Summary(void) { return summary; }
+  bool Recording(void) const { return recording; }
+  bool Pending(void) const { return pending; }
+  bool InVpsMargin(void) const { return inVpsMargin; }
+  int Flags(void) const { return flags; }
+  const cChannel *Channel(void) const { return channel; }
+  time_t Day(void) const { return day; }
+  int WeekDays(void) const { return weekdays; }
+  int Start(void) const { return start; }
+  int Stop(void) const { return stop; }
+  int Priority(void) const { return priority; }
+  int Lifetime(void) const { return lifetime; }
+  const char *File(void) const { return file; }
+  time_t FirstDay(void) const { return weekdays ? day : 0; }
+  const char *Summary(void) const { return summary; }
   cString ToText(bool UseChannelID = false);
-  const cEvent *Event(void) { return event; }
+  cString ToDescr(void) const;
+  const cEvent *Event(void) const { return event; }
   bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void) const;
   static int GetMDay(time_t t);
   static int GetWDay(time_t t);
-  static int GetWDayFromMDay(int MDay);
   bool DayMatches(time_t t) const;
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
   char *SetFile(const char *File);
   bool Matches(time_t t = 0, bool Directly = false) const;
-  int Matches(const cEvent *Event);
+  int Matches(const cEvent *Event, int *Overlap = NULL) const;
+  bool Expired(void) const;
   time_t StartTime(void) const;
   time_t StopTime(void) const;
-  void SetEvent(const cEvent *Event);
+  void SetEvent(const cSchedule *Schedule, const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
   void SetInVpsMargin(bool InVpsMargin);
@@ -84,10 +87,10 @@ class cTimer : public cListObject {
   bool HasFlags(int Flags) const;
   void Skip(void);
   void OnOff(void);
-  cString PrintFirstDay(void);
+  cString PrintFirstDay(void) const;
   static int TimeToInt(int t);
-  static int ParseDay(const char *s, time_t *FirstDay = NULL);
-  static cString PrintDay(int d, time_t FirstDay = 0);
+  static bool ParseDay(const char *s, time_t &Day, int &WeekDays);
+  static cString PrintDay(time_t Day, int WeekDays);
   };
 
 class cTimers : public cConfig<cTimer> {
@@ -109,6 +112,7 @@ class cTimers : public cConfig<cTimer> {
       ///< Returns true if any of the timers have been modified.
       ///< Calling this function resets the 'modified' flag to false.
   void SetEvents(void);
+  void DeleteExpired(void);
   };
 
 extern cTimers Timers;
diff --git a/tools.c b/tools.c
index aee71ecf7..28ea2afce 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.90 2005/02/19 13:43:03 kls Exp $
+ * $Id: tools.c 1.91 2005/03/20 14:44:33 kls Exp $
  */
 
 #include "tools.h"
@@ -896,7 +896,7 @@ void cListObject::Unlink(void)
   next = prev = NULL;
 }
 
-int cListObject::Index(void)
+int cListObject::Index(void) const
 {
   cListObject *p = prev;
   int i = 0;
diff --git a/tools.h b/tools.h
index be8782bf8..d9e85f3eb 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.67 2005/02/12 10:17:14 kls Exp $
+ * $Id: tools.h 1.68 2005/03/20 14:44:24 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -202,7 +202,7 @@ class cListObject {
   void Append(cListObject *Object);
   void Insert(cListObject *Object);
   void Unlink(void);
-  int Index(void);
+  int Index(void) const;
   cListObject *Prev(void) const { return prev; }
   cListObject *Next(void) const { return next; }
   };
diff --git a/vdr.5 b/vdr.5
index 04bdb9950..5333be7c2 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.34 2005/01/23 14:16:12 kls Exp $
+.\" $Id: vdr.5 1.35 2005/03/19 15:20:47 kls Exp $
 .\"
-.TH vdr 5 "19 Dec 2004" "1.3.18" "Video Disk Recorder Files"
+.TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -231,8 +231,13 @@ commands, the channels are given as numbers.
 .B Day
 The day when this timer shall record.
 
-If this is a `single-shot' timer, this is the day of month on which this
-timer shall record. This must be in the range \fB1...31\fR.
+If this is a `single-shot' timer, this is the date on which this
+timer shall record, given in ISO notation (\fBYYYY-MM-DD\fR), as in:
+
+.B 2005-03-19
+
+For compatibility with earlier versions of VDR this may also be just the day of month
+on which this timer shall record (must be in the range \fB1...31\fR).
 
 In case of a `repeating' timer this is a string consisting of exactly seven
 characters, where each character position corresponds to one day of the week
@@ -245,6 +250,7 @@ cause the timer to record on that day. Example:
 will define a timer that records on Monday thru Friday and does not record
 on weekends. The same result could be achieved with \fBABCDE\-\-\fR (this is
 used to allow setting the days with language specific characters).
+Note that only letters may be used here, no digits.
 
 The day definition of a `repeating' timer may be followed by the date when that
 timer shall hit for the first time. The format for this is \fB@YYYY\-MM\-DD\fR,
diff --git a/vdr.c b/vdr.c
index 15aff9493..72975e3bd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.202 2005/02/12 15:06:16 kls Exp $
+ * $Id: vdr.c 1.203 2005/03/20 10:58:59 kls Exp $
  */
 
 #include <getopt.h>
@@ -606,6 +606,8 @@ int main(int argc, char *argv[])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
+           // Delete expired timers:
+           Timers.DeleteExpired();
            // Assign events to timers:
            Timers.SetEvents();
            // Must do all following calls with the exact same time!

From c23522ade253e23b5bf6141d7d7e7335d6abcd1d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 May 2005 18:00:00 +0200
Subject: [PATCH 116/307] =?UTF-8?q?Version=201.3.24=20-=20Now=20including?=
 =?UTF-8?q?=20the=20optional=20user=20defined=20Make.config=20from=20the?=
 =?UTF-8?q?=20'libsi'=20Makefile=20=20=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4).=20-=20Updated=20the=20Danish=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Mogens=20Elneff).=20-=20Fixed=20a=20memory=20leak=20in?=
 =?UTF-8?q?=20tComponent=20(thanks=20to=20Stefan=20Huelswitt=20and=20Danie?=
 =?UTF-8?q?l=20Thompson).=20-=20Fixed=20a=20memory=20leak=20in=20cDvbPlaye?=
 =?UTF-8?q?r=20(thanks=20to=20Stefan=20Huelswitt).=20-=20Added=20missing?=
 =?UTF-8?q?=20text=20internationalization=20for=20"Starting=20EPG=20scan"?=
 =?UTF-8?q?=20(thanks=20to=20=20=20Matthias=20L=C3=B6tzke).=20-=20Updated?=
 =?UTF-8?q?=20the=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenber?=
 =?UTF-8?q?g).=20-=20Fixed=20handling=20transparent=20areas=20in=20cDvbSpu?=
 =?UTF-8?q?Bitmap=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Now?=
 =?UTF-8?q?=20also=20considering=20the=20"EPG=20linger=20time"=20when=20sa?=
 =?UTF-8?q?ving=20the=20EPG=20data=20to=20file=20or=20=20=20listing=20it?=
 =?UTF-8?q?=20via=20LSTE=20(thanks=20to=20Roman=20Krenick=C3=BD).=20-=20Fi?=
 =?UTF-8?q?xed=20handling=20fragments=20of=20less=20than=204=20byte=20in?=
 =?UTF-8?q?=20cPesAssembler=20(thanks=20to=20=20=20Reinhard=20Nissl).=20-?=
 =?UTF-8?q?=20Fixed=20a=20bug=20in=20libsi's=20SubtitlingDescriptor::getLe?=
 =?UTF-8?q?ngth()=20(thanks=20to=20Marco=20=20=20Schl=C3=BC=C3=9Fler).=20-?=
 =?UTF-8?q?=20When=20reading=20the=20channels.conf=20file,=20duplicate=20c?=
 =?UTF-8?q?hannels=20(i.e.=20ones=20that=20have=20=20=20the=20same=20chann?=
 =?UTF-8?q?el=20ID)=20are=20now=20automatically=20deleted=20and=20only=20t?=
 =?UTF-8?q?he=20first=20one=20is=20=20=20actually=20stored.=20-=20Fixed=20?=
 =?UTF-8?q?handling=20lifetime=20when=20deciding=20whether=20to=20delete?=
 =?UTF-8?q?=20a=20recording=20(thanks=20to=20=20=20Udo=20Richter).=20-=20F?=
 =?UTF-8?q?ixed=20timeout=20handling=20in=20cRwLock::Lock()=20(thanks=20to?=
 =?UTF-8?q?=20Sascha=20Volkenandt=20for=20reporting=20=20=20this=20one).?=
 =?UTF-8?q?=20-=20Since=20there=20are=20several=20places=20in=20thread.c?=
 =?UTF-8?q?=20where=20a=20timeout=20value=20is=20calculated,=20=20=20this?=
 =?UTF-8?q?=20has=20been=20put=20into=20a=20separate=20function.=20-=20The?=
 =?UTF-8?q?=20timer=20status=20now=20has=20a=20new=20bit=20that=20is=20set?=
 =?UTF-8?q?=20when=20that=20timer=20is=20currently=20=20=20recording=20(su?=
 =?UTF-8?q?ggested=20by=20Matthias=20Schniedermeyer).=20See=20man=20vdr(5)?=
 =?UTF-8?q?=20for=20details.=20-=20Removed=20scaling=20coordinates=20in=20?=
 =?UTF-8?q?letterbox=20mode=20from=20cDvbSpu=20-=20the=20DVD=20plugin,=20w?=
 =?UTF-8?q?hich=20=20=20was=20the=20only=20one=20needing=20this,=20doesn't?=
 =?UTF-8?q?=20need=20it=20any=20more=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler).=20-=20No=20longer=20retuning=20or=20restarting=20a?=
 =?UTF-8?q?=20recording=20if=20only=20the=20language=20code=20of=20an=20?=
 =?UTF-8?q?=20=20audio=20or=20Dolby=20PID=20changes.=20-=20Now=20preferrin?=
 =?UTF-8?q?g=20budget=20cards=20when=20selecting=20a=20DVB=20device=20for?=
 =?UTF-8?q?=20recording.=20-=20Recordings=20now=20avoid=20zero=20sized=20v?=
 =?UTF-8?q?ideo=20data=20files=20(thanks=20to=20Wolfgang=20Fitz).=20-=20So?=
 =?UTF-8?q?me=20rearrangements=20in=20cDvbPlayer::Action()=20to=20avoid=20?=
 =?UTF-8?q?lockups=20on=20NPTL=20systems=20=20=20(thanks=20to=20Reinhard?=
 =?UTF-8?q?=20Nissl).=20-=20Fixed=20a=20wrong=20inheritance=20in=20libsi's?=
 =?UTF-8?q?=20SubtitlingDescriptor::Subtitling=20(thanks=20to=20=20=20Marc?=
 =?UTF-8?q?o=20Schl=C3=BC=C3=9Fler).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS       | 24 +++++++++++++++++
 HISTORY            | 39 +++++++++++++++++++++++++++
 channels.c         | 66 +++++++++++++++++++++++++++++++++-------------
 channels.conf      | 14 +++++-----
 channels.h         |  6 +++--
 config.h           |  6 ++---
 device.c           | 24 ++++++++++-------
 dvbplayer.c        | 27 ++++++++++++-------
 dvbspu.c           | 35 +++++-------------------
 dvbspu.h           |  4 +--
 eitscan.c          |  4 +--
 epg.c              |  8 +++---
 i18n.c             | 43 ++++++++++++++++++++++--------
 libsi/Makefile     |  4 ++-
 libsi/descriptor.h |  6 ++---
 recording.c        | 21 ++++++++++++---
 svdrp.c            |  6 ++---
 thread.c           | 46 ++++++++++++++++----------------
 timers.c           |  6 ++++-
 timers.h           |  3 ++-
 vdr.5              |  3 ++-
 21 files changed, 257 insertions(+), 138 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 26d52c499..cc5bdb44f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -64,6 +64,8 @@ Matthias Schniedermeyer <ms@citd.de>
  for suggesting the SVDRP command CLRE
  for reporting a bug in handling one-shot timers that were already recording
  and had their start time changed into the future
+ for suggesting to give the timer status a bit that is set when that timer
+ is currently recording
 
 Miha Setina <mihasetina@softhome.net>
  for translating OSD texts to the Slovenian language
@@ -193,6 +195,8 @@ Stefan Huelswitt <huels@iname.com>
  for reporting several memory leaks that were introduced through the use of cString
  for adding MPEG1 replay capability to cPesAssembler
  for fixing handling symbolic links in cRecordings::ScanVideoDir()
+ for reporting a memory leak in tComponent
+ for fixing a memory leak in cDvbPlayer
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -763,6 +767,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for reporting a problem when starting replay of a recording that has no Dolby
  Digital audio after switching to a channel that has DD and selecting the DD audio
  track
+ for reporting a bug in timeout handling in cRwLock::Lock()
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -936,6 +941,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing a possible freeze in pause mode in case a device's PlayPesPacket()
  function permanently returns 0
  for fixing a typo in detecting UTF-8
+ for fixing handling fragments of less than 3 byte in cPesAssembler
+ for some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1158,6 +1165,10 @@ Marco Schl
  for increasing POLLTIMEOUTS_BEFORE_DEVICECLEAR in transfer.c to 6 to avoid problems
  with the larger buffer reserve
  for adding support for setting the video display mode
+ for fixing handling transparent areas in cDvbSpuBitmap
+ for fixing a bug in libsi's SubtitlingDescriptor::getLength()
+ for removing scaling coordinates in letterbox mode from cDvbSpu
+ for fixing a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1202,6 +1213,7 @@ Milos Kapoun <m.kapoun@cra.cz>
 
 Udo Richter <udo_richter@gmx.de>
  for refining the formula for making volume control more linear
+ for fixing handling lifetime when deciding whether to delete a recording
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1300,10 +1312,22 @@ Mikko Salo <mikko.salo@ppe.inet.fi>
 
 Roman Krenick� <free-rtk@gmx.de>
  for a patch that was used a a basis for changing a timer's day handling to full date
+ for considering the "EPG linger time" when saving the EPG data to file or listing
+ it via LSTE
 
 Ville Skytt� <ville.skytta@iki.fi>
  for reporting several compiler warnings in gcc 4.0
+ for including the optional user defined Make.config from the 'libsi' Makefile
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
  menu entry is a directory
+
+Daniel Thompson <daniel.thompson@st.com>
+ for fixing a memory leak in tComponent
+
+Matthias L�tzke <Matthias@Loetzke.de>
+ for adding missing text internationalization for "Starting EPG scan"
+
+Wolfgang Fritz <wolfgang.fritz@gmx.net>
+ for making recordings avoid zero sized video data files
diff --git a/HISTORY b/HISTORY
index a5e824743..0b30015bb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3473,3 +3473,42 @@ Video Disk Recorder Revision History
   than 30 seconds.
 - Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald).
 - All log entries regarding timers now contain a short description of the timer.
+
+2005-05-08: Version 1.3.24
+
+- Now including the optional user defined Make.config from the 'libsi' Makefile
+  (thanks to Ville Skytt�).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Fixed a memory leak in tComponent (thanks to Stefan Huelswitt and Daniel Thompson).
+- Fixed a memory leak in cDvbPlayer (thanks to Stefan Huelswitt).
+- Added missing text internationalization for "Starting EPG scan" (thanks to
+  Matthias L�tzke).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling transparent areas in cDvbSpuBitmap (thanks to Marco Schl��ler).
+- Now also considering the "EPG linger time" when saving the EPG data to file or
+  listing it via LSTE (thanks to Roman Krenick�).
+- Fixed handling fragments of less than 3 byte in cPesAssembler (thanks to
+  Reinhard Nissl).
+- Fixed a bug in libsi's SubtitlingDescriptor::getLength() (thanks to Marco
+  Schl��ler).
+- When reading the channels.conf file, duplicate channels (i.e. ones that have
+  the same channel ID) are now automatically deleted and only the first one is
+  actually stored.
+- Fixed handling lifetime when deciding whether to delete a recording (thanks to
+  Udo Richter).
+- Fixed timeout handling in cRwLock::Lock() (thanks to Sascha Volkenandt for reporting
+  this one).
+- Since there are several places in thread.c where a timeout value is calculated,
+  this has been put into a separate function.
+- The timer status now has a new bit that is set when that timer is currently
+  recording (suggested by Matthias Schniedermeyer). See man vdr(5) for details.
+- Removed scaling coordinates in letterbox mode from cDvbSpu - the DVD plugin, which
+  was the only one needing this, doesn't need it any more (thanks to Marco Schl��ler).
+- No longer retuning or restarting a recording if only the language code of an
+  audio or dolby PID changes.
+- Now preferring budget cards when selecting a DVB device for recording.
+- Recordings now avoid zero sized video data files (thanks to Wolfgang Fitz).
+- Some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems
+  (thanks to Reinhard Nissl).
+- Fixed a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling (thanks to
+  Marco Schl��ler).
diff --git a/channels.c b/channels.c
index 3392d9aa8..e571aed25 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.36 2005/03/19 15:56:38 kls Exp $
+ * $Id: channels.c 1.38 2005/05/07 13:14:32 kls Exp $
  */
 
 #include "channels.h"
@@ -389,15 +389,21 @@ void cChannel::SetPortalName(const char *PortalName)
      }
 }
 
-static bool IntArraysDiffer(const int *a, const int *b, const char na[][4] = NULL, const char nb[][4] = NULL)
+#define STRDIFF 0x01
+#define VALDIFF 0x02
+
+static int IntArraysDiffer(const int *a, const int *b, const char na[][4] = NULL, const char nb[][4] = NULL)
 {
-  int i = 0;
-  while (a[i] && b[i]) {
-        if (a[i] != b[i] || na && nb && strcmp(na[i], nb[i]) != 0)
-           return true;
-        i++;
-        }
-  return a[i] != b[i] || a[i] && na && nb && strcmp(na[i], nb[i]) != 0;
+  int result = 0;
+  for (int i = 0; a[i] || b[i]; i++) {
+      if (a[i] && na && nb && strcmp(na[i], nb[i]) != 0)
+         result |= STRDIFF;
+      if (a[i] != b[i])
+         result |= VALDIFF;
+      if (!a[i] || !b[i])
+         break;
+      }
+  return result;
 }
 
 static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[][4] = NULL)
@@ -418,10 +424,15 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
 
 void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid)
 {
-  bool modified = vpid != Vpid || ppid != Ppid || tpid != Tpid;
-  if (!modified)
-     modified = IntArraysDiffer(apids, Apids, alangs, ALangs) || IntArraysDiffer(dpids, Dpids, dlangs, DLangs);
-  if (modified) {
+  int mod = CHANNELMOD_NONE;
+  if (vpid != Vpid || ppid != Ppid || tpid != Tpid)
+     mod |= CHANNELMOD_PIDS;
+  int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs);
+  if (m & STRDIFF)
+     mod |= CHANNELMOD_LANGS;
+  if (m & VALDIFF)
+     mod |= CHANNELMOD_PIDS;
+  if (mod) {
      char OldApidsBuf[(MAXAPIDS + MAXDPIDS) * 10 + 10]; // 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
      char NewApidsBuf[(MAXAPIDS + MAXDPIDS) * 10 + 10];
      char *q = OldApidsBuf;
@@ -450,7 +461,7 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dp
          strn0cpy(dlangs[i], DLangs[i], 4);
          }
      tpid = Tpid;
-     modification |= CHANNELMOD_PIDS;
+     modification |= mod;
      Channels.SetModified();
      }
 }
@@ -648,7 +659,7 @@ cString cChannel::ToText(void) const
   return ToText(this);
 }
 
-bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
+bool cChannel::Parse(const char *s)
 {
   bool ok = true;
   if (*s == ':') {
@@ -791,10 +802,6 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
            esyslog("ERROR: channel data results in invalid ID!");
            return false;
            }
-        if (!AllowNonUniqueID && Channels.GetByChannelID(GetChannelID())) {
-           esyslog("ERROR: channel data not unique!");
-           return false;
-           }
         }
      else
         return false;
@@ -817,9 +824,30 @@ cChannels::cChannels(void)
   modified = CHANNELSMOD_NONE;
 }
 
+void cChannels::DeleteDuplicateChannels(void)
+{
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (!channel->GroupSep()) {
+         tChannelID ChannelID = channel->GetChannelID();
+         cChannel *other = Next(channel);
+         while (other) {
+               cChannel *d = NULL;
+               if (!other->GroupSep() && other->GetChannelID() == ChannelID)
+                  d = other;
+               other = Next(other);
+               if (d) {
+                  dsyslog("deleting duplicate channel %s", *d->ToText());
+                  Del(d);
+                  }
+               }
+         }
+      }
+}
+
 bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
 {
   if (cConfig<cChannel>::Load(FileName, AllowComments, MustExist)) {
+     DeleteDuplicateChannels();
      ReNumber();
      return true;
      }
diff --git a/channels.conf b/channels.conf
index 21763de1c..9f83d12f7 100644
--- a/channels.conf
+++ b/channels.conf
@@ -29,7 +29,7 @@ Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:11
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
-Veronica/JETIX;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,602,100:5020:53:1109:0
+Veronica/JETIX;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
@@ -37,7 +37,7 @@ TW1 - 28Feb05;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
 Eurosport;ZDFvision:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
 EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
 EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
-EinsMuXx;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
+EinsPlus;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
 ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:130:0:28016:1:1079:0
 ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
@@ -51,7 +51,7 @@ PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1801,1702:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
@@ -69,7 +69,7 @@ Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
 FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
-LCP;CSAT:12207:vC34:S19.2E:27500:165:100=fra:0:0:8506:1:1090:0
+LCP;CSAT:12207:vC34:S19.2E:27500:2047+8191:0:0:0:8506:1:1090:0
 ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
 Best of Shopping;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
 ASTRA-Mosaic;ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
@@ -89,9 +89,9 @@ QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
-Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5104:2:2027:0
+Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2314:960,961:5104:2:2027:0
 ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng:2353:960,961:10240:2:2054:0
-Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2320+2304:2321=eng:2322:960,961:4905:2:2023:0
+Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
@@ -113,7 +113,7 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-JOLLY FILM;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
+BTL TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
diff --git a/channels.h b/channels.h
index e94be1769..86fffe045 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.26 2005/02/20 14:05:24 kls Exp $
+ * $Id: channels.h 1.28 2005/05/07 13:07:09 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -24,6 +24,7 @@
 #define CHANNELMOD_ID       0x04
 #define CHANNELMOD_CA       0x10
 #define CHANNELMOD_TRANSP   0x20
+#define CHANNELMOD_LANGS    0x40
 #define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA | CHANNELMOD_TRANSP)
 
 #define CHANNELSMOD_NONE    0
@@ -135,7 +136,7 @@ class cChannel : public cListObject {
   ~cChannel();
   cChannel& operator= (const cChannel &Channel);
   cString ToText(void) const;
-  bool Parse(const char *s, bool AllowNonUniqueID = false);
+  bool Parse(const char *s);
   bool Save(FILE *f);
   const char *Name(void) const { return name; }
   const char *ShortName(bool OrName = false) const { return (OrName && isempty(shortName)) ? name : shortName; }
@@ -198,6 +199,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   int maxNumber;
   int modified;
   int beingEdited;
+  void DeleteDuplicateChannels(void);
 public:
   cChannels(void);
   bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
diff --git a/config.h b/config.h
index 833022ea9..d44e865e5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.216 2005/03/05 15:44:35 kls Exp $
+ * $Id: config.h 1.217 2005/05/05 11:04:18 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.23"
-#define VDRVERSNUM   10323  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.24"
+#define VDRVERSNUM   10324  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index d6ab89111..806c13705 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.99 2005/02/27 13:55:15 kls Exp $
+ * $Id: device.c 1.101 2005/05/07 15:04:17 kls Exp $
  */
 
 #include "device.h"
@@ -34,7 +34,7 @@ class cPesAssembler {
   int ExpectedLength(void) { return PacketSize(data); }
   static int PacketSize(const uchar *data);
   int Length(void) { return length; }
-  const uchar *Data(void) { return data; }
+  const uchar *Data(void) { return data; } // only valid if Length() >= 4
   void Reset(void);
   void Put(uchar c);
   void Put(const uchar *Data, int Length);
@@ -76,7 +76,7 @@ bool cPesAssembler::Realloc(int Size)
 
 void cPesAssembler::Put(uchar c)
 {
-  if (!length) {
+  if (length < 4) {
      tag = (tag << 8) | c;
      if ((tag & 0xFFFFFF00) == 0x00000100) {
         if (Realloc(4)) {
@@ -84,6 +84,8 @@ void cPesAssembler::Put(uchar c)
            length = 4;
            }
         }
+     else if (length < 3)
+        length++;
      }
   else if (Realloc(length + 1))
      data[length++] = c;
@@ -91,7 +93,7 @@ void cPesAssembler::Put(uchar c)
 
 void cPesAssembler::Put(const uchar *Data, int Length)
 {
-  while (!length && Length > 0) {
+  while (length < 4 && Length > 0) {
         Put(*Data++);
         Length--;
         }
@@ -268,7 +270,7 @@ cDevice *cDevice::GetDevice(int Index)
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
   cDevice *d = NULL;
-  int select = 7, pri;
+  int select = 8, pri;
 
   for (int i = 0; i < numDevices; i++) {
       bool ndr;
@@ -277,16 +279,18 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
             pri = 0; // receiving and allows additional receivers
          else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
             pri = 1; // free and fewer Ca's
+         else if (!device[i]->Receiving() && !device[i]->HasDecoder())
+            pri = 2; // free and not a full featured card
          else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice())
-            pri = 2; // free and not the primary device
+            pri = 3; // free and not the primary device
          else if (!device[i]->Receiving())
-            pri = 3; // free
+            pri = 4; // free
          else if (d && device[i]->Priority() < d->Priority())
-            pri = 4; // receiving but priority is lower
+            pri = 5; // receiving but priority is lower
          else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
-            pri = 5; // receiving with same priority but fewer Ca's
+            pri = 6; // receiving with same priority but fewer Ca's
          else
-            pri = 6; // all others
+            pri = 7; // all others
          if (pri < select) {
             select = pri;
             d = device[i];
diff --git a/dvbplayer.c b/dvbplayer.c
index 8605268ba..477a6c068 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.30 2005/01/14 14:00:56 kls Exp $
+ * $Id: dvbplayer.c 1.33 2005/05/08 14:52:49 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -263,6 +263,7 @@ cDvbPlayer::~cDvbPlayer()
 {
   Detach();
   Save();
+  delete readFrame; // might not have been stored in the buffer in Action()
   delete index;
   delete fileName;
   delete backTrace;
@@ -296,6 +297,7 @@ void cDvbPlayer::Empty(void)
      nonBlockingFileReader->Clear();
   if ((readIndex = backTrace->Get(playDir == pdForward)) < 0)
      readIndex = writeIndex;
+  delete readFrame; // might not have been stored in the buffer in Action()
   readFrame = NULL;
   playFrame = NULL;
   ringBuffer->Clear();
@@ -370,9 +372,14 @@ void cDvbPlayer::Action(void)
 
   nonBlockingFileReader = new cNonBlockingFileReader;
   int Length = 0;
+  bool Sleep = false;
 
   running = true;
   while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
+        if (Sleep) {
+           cCondWait::SleepMs(3); // this keeps the CPU load low
+           Sleep = false;
+           }
         cPoller Poller;
         if (DevicePoll(Poller, 100)) {
 
@@ -380,8 +387,8 @@ void cDvbPlayer::Action(void)
 
            // Read the next frame from the file:
 
-           if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
-              if (playMode != pmStill) {
+           if (playMode != pmStill && playMode != pmPause) {
+              if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
                  if (!nonBlockingFileReader->Reading()) {
                     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
                        uchar FileNumber;
@@ -438,16 +445,16 @@ void cDvbPlayer::Action(void)
                     break;
                     }
                  }
-              else
-                 cCondWait::SleepMs(3); // this keeps the CPU load low
-              }
 
-           // Store the frame in the buffer:
+              // Store the frame in the buffer:
 
-           if (readFrame) {
-              if (ringBuffer->Put(readFrame))
-                 readFrame = NULL;
+              if (readFrame) {
+                 if (ringBuffer->Put(readFrame))
+                    readFrame = NULL;
+                 }
               }
+           else
+              Sleep = true;
 
            // Get the next frame from the buffer:
 
diff --git a/dvbspu.c b/dvbspu.c
index 3ca780aaf..9c8da3b42 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.12 2005/02/06 09:54:51 kls Exp $
+ * $Id: dvbspu.c 1.14 2005/05/07 11:13:48 kls Exp $
  */
 
 #include <assert.h>
@@ -143,6 +143,8 @@ bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
     if (ret)
         DEBUG("MinSize: (%d, %d) x (%d, %d)\n",
               size.x1, size.y1, size.x2, size.y2);
+    if (size.x1 > size.x2 || size.y1 > size.y2)
+       return false;
 
     return ret;
 }
@@ -304,24 +306,6 @@ void cDvbSpuDecoder::clearHighlight(void)
     hlpsize.y2 = -1;
 }
 
-int cDvbSpuDecoder::ScaleYcoord(int value)
-{
-    if (scaleMode == eSpuLetterBox) {
-        int offset = cDevice::PrimaryDevice()->GetVideoSystem() == vsPAL ? 72 : 60;
-        return lround((value * 3.0) / 4.0) + offset;
-        }
-    else
-        return value;
-}
-
-int cDvbSpuDecoder::ScaleYres(int value)
-{
-    if (scaleMode == eSpuLetterBox)
-        return lround((value * 3.0) / 4.0);
-    else
-        return value;
-}
-
 sDvbSpuRect cDvbSpuDecoder::CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDvbSpuRect bgsize, cBitmap *bgbmp)
 {
     sDvbSpuRect size;
@@ -365,22 +349,15 @@ void cDvbSpuDecoder::Draw(void)
     sDvbSpuRect hlsize;
 
     hlsize.x1 = hlpsize.x1;
-    hlsize.y1 = ScaleYcoord(hlpsize.y1);
+    hlsize.y1 = hlpsize.y1;
     hlsize.x2 = hlpsize.x2;
-    hlsize.y2 = ScaleYcoord(hlpsize.y2);
+    hlsize.y2 = hlpsize.y2;
 
     if (highlight)
         fg = spubmp->getBitmap(hlpDescr, palette, hlsize);
 
-    if (spubmp->getMinSize(palDescr, bgsize)) {
+    if (spubmp->getMinSize(palDescr, bgsize))
         bg = spubmp->getBitmap(palDescr, palette, bgsize);
-        if (scaleMode == eSpuLetterBox) {
-            // the coordinates have to be modified for letterbox
-            int y1 = ScaleYres(bgsize.y1) + bgsize.height();
-            bgsize.y2 = y1 + bgsize.height();
-            bgsize.y1 = y1;
-        }
-    }
 
     sDvbSpuRect areaSize = CalcAreaSize(hlsize, fg, bgsize, bg);
 
diff --git a/dvbspu.h b/dvbspu.h
index c60567a34..8a7d90517 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.8 2005/02/20 11:20:43 kls Exp $
+ * $Id: dvbspu.h 1.9 2005/05/07 11:14:03 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -129,8 +129,6 @@ class cDvbSpuDecoder:public cSpuDecoder {
         return ((spu[0] << 8) | spu[1]);
     };
 
-    int ScaleYcoord(int value);
-    int ScaleYres(int value);
     sDvbSpuRect CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDvbSpuRect bgsize, cBitmap *bgbmp);
 
   public:
diff --git a/eitscan.c b/eitscan.c
index a1bff662e..e69ae0552 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.23 2004/10/31 16:19:49 kls Exp $
+ * $Id: eitscan.c 1.24 2005/05/05 13:05:00 kls Exp $
  */
 
 #include "eitscan.h"
@@ -152,7 +152,7 @@ void cEITScanner::Process(void)
                                   if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) {
                                      if (Device == cDevice::PrimaryDevice() && !currentChannel) {
                                         currentChannel = Device->CurrentChannel();
-                                        Skins.Message(mtInfo, "Starting EPG scan");
+                                        Skins.Message(mtInfo, tr("Starting EPG scan"));
                                         }
                                      currentDevice = Device;//XXX see also dvbdevice.c!!!
                                      Device->SwitchChannel(Channel, false);
diff --git a/epg.c b/epg.c
index 7b0fcd901..21bdeb5b3 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.27 2005/03/20 12:34:19 kls Exp $
+ * $Id: epg.c 1.29 2005/05/05 13:53:19 kls Exp $
  */
 
 #include "epg.h"
@@ -29,9 +29,7 @@ bool tComponent::FromString(const char *s)
 {
   unsigned int Stream, Type;
   int n = sscanf(s, "%X %02X %3c %a[^\n]", &Stream, &Type, language, &description);
-  if (n != 4)
-     description = NULL;
-  else if (isempty(description)) {
+  if (n != 4 || isempty(description)) {
      free(description);
      description = NULL;
      }
@@ -225,7 +223,7 @@ cString cEvent::GetVpsString(void) const
 
 void cEvent::Dump(FILE *f, const char *Prefix) const
 {
-  if (startTime + duration >= time(NULL)) {
+  if (startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
      fprintf(f, "%sE %u %ld %d %X\n", Prefix, eventID, startTime, duration, tableID);
      if (!isempty(title))
         fprintf(f, "%sT %s\n", Prefix, title);
diff --git a/i18n.c b/i18n.c
index 572166676..1d755f130 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.185 2005/03/12 10:43:16 kls Exp $
+ * $Id: i18n.c 1.188 2005/05/05 13:12:54 kls Exp $
  *
  * Translations provided by:
  *
@@ -89,7 +89,7 @@ const tI18nPhrase Phrases[] = {
     "Portugu�s",
     "Fran�ais",
     "Norsk",
-    "suomi", // this is not a typo - it's really lowercase!
+    "suomi", // Finnish (this is not a typo - it's really lowercase!)
     "Polski",
     "Espa�ol",
     "��������", // Greek
@@ -1334,7 +1334,7 @@ const tI18nPhrase Phrases[] = {
     "PID de V�deo",
     "PID Vid�o",
     "Vpid",
-    "Kuva PID",
+    "Kuva-PID",
     "Vpid",
     "Vpid",
     "B����� PID",
@@ -1355,7 +1355,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
-    "Aikatieto PID",
+    "Aikatieto-PID",
     "Ppid",
     "Ppid",
     "Ppid",
@@ -1376,7 +1376,7 @@ const tI18nPhrase Phrases[] = {
     "PID �udio (1)",
     "PID Audio (1)",
     "Apid1",
-    "��ni PID1",
+    "��ni-PID (1)",
     "Apid1",
     "Apid1",
     "Apid1",
@@ -1397,7 +1397,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "PID Audio (2)",
     "Apid2",
-    "��ni PID2",
+    "��ni-PID (2)",
     "Apid2",
     "Apid2",
     "Apid2",
@@ -1418,7 +1418,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (1)",
     "PID AC3 (1)",
     "AC3pid1",
-    "Dolby PID1",
+    "Dolby-PID (1)",
     "Dpid1",
     "Dpid1",
     "Dpid1",
@@ -1439,7 +1439,7 @@ const tI18nPhrase Phrases[] = {
     "PID AC3 (2)",
     "PID AC3 (2)",
     "AC3pid2",
-    "Dolby PID2",
+    "Dolby-PID (2)",
     "Dpid2",
     "Dpid2",
     "Dpid2",
@@ -1460,7 +1460,7 @@ const tI18nPhrase Phrases[] = {
     "PID Teletexto",
     "PID T�l�texte",
     "Tekst-TV pid",
-    "Teksti-TV PID",
+    "Teksti-TV-PID",
     "Tpid",
     "Tpid",
     "Tpid",
@@ -1502,7 +1502,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid",
-    "Palvelu ID",
+    "Palvelu-ID",
     "Sid",
     "Sid",
     "Sid",
@@ -3113,7 +3113,7 @@ const tI18nPhrase Phrases[] = {
     "�������������� �����������",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Video display format",
   },
   { "pan&scan",
     "pan&scan",
@@ -5241,6 +5241,27 @@ const tI18nPhrase Phrases[] = {
     "Saate edastamise peatamine...",
     "Pausere live udsendelse...",
   },
+  { "Starting EPG scan",
+    "Beginne mit EPG-Scan",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Ohjelmaoppaan p�ivitys aloitettu",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
     "Ta plugin nima nastavitvenih parametrov!",
diff --git a/libsi/Makefile b/libsi/Makefile
index 2d8713b3e..fdc630d2d 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 1.3 2004/10/16 13:31:50 kls Exp $
+# $Id: Makefile 1.4 2005/05/05 11:01:46 kls Exp $
 
 ### The C++ compiler and options:
 
@@ -11,6 +11,8 @@ AR = ar
 ARFLAGS = ru
 RANLIB = ranlib
 
+-include ../Make.config
+
 ### The directory environment:
 
 INCLUDES +=
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 949592313..73fd10594 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.10 2004/06/06 13:51:29 kls Exp $
+ *   $Id: descriptor.h 1.12 2005/05/08 14:08:19 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -283,13 +283,13 @@ class ComponentDescriptor : public Descriptor {
 
 class SubtitlingDescriptor : public Descriptor {
 public:
-   class Subtitling : public Descriptor {
+   class Subtitling : public LoopElement {
    public:
       char languageCode[4];
       int getSubtitlingType() const;
       int getCompositionPageId() const;
       int getAncillaryPageId() const;
-      virtual int getLength() { return sizeof(item_nvod_reference); }
+      virtual int getLength() { return sizeof(item_subtitling); }
    protected:
       virtual void Parse();
    private:
diff --git a/recording.c b/recording.c
index e50dfcb75..ed74c462c 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.96 2005/02/12 10:17:47 kls Exp $
+ * $Id: recording.c 1.98 2005/05/07 15:25:15 kls Exp $
  */
 
 #include "recording.h"
@@ -126,7 +126,7 @@ void AssertFreeDiskSpace(int Priority)
            while (r) {
                  if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
                     if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
-                        (time(NULL) - r->start) / SECSINDAY > r->lifetime) { // the recording's guaranteed lifetime has expired
+                        (r->lifetime > 0 && (time(NULL) - r->start) / SECSINDAY >= r->lifetime)) { // the recording's guaranteed lifetime has expired
                        if (r0) {
                           if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
                              r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
@@ -1124,8 +1124,21 @@ int cFileName::SetOffset(int Number, int Offset)
      fileNumber = Number;
      sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
      if (record) {
-        if (access(fileName, F_OK) == 0) // file exists, let's try next suffix
-           return SetOffset(Number + 1);
+        if (access(fileName, F_OK) == 0) {
+           // files exists, check if it has non-zero size
+           struct stat buf;
+           if (stat(fileName, &buf) == 0) {
+              if (buf.st_size != 0)
+                 return SetOffset(Number + 1); // file exists and has non zero size, let's try next suffix
+              else {
+                 // zero size file, remove it
+                 dsyslog ("cFileName::SetOffset: removing zero-sized file %s\n", fileName);
+                 unlink (fileName);
+                 }
+              }
+           else
+              return SetOffset(Number + 1); // error with fstat - should not happen, just to be on the safe side
+           }
         else if (errno != ENOENT) { // something serious has happened
            LOG_ERROR_STR(fileName);
            return -1;
diff --git a/svdrp.c b/svdrp.c
index 71015023a..5104026f5 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.69 2005/03/20 15:04:00 kls Exp $
+ * $Id: svdrp.c 1.70 2005/05/06 13:47:39 kls Exp $
  */
 
 #include "svdrp.h"
@@ -875,7 +875,7 @@ void cSVDRP::CmdMODC(const char *Option)
         cChannel *channel = Channels.GetByNumber(n);
         if (channel) {
            cChannel ch;
-           if (ch.Parse(tail, true)) {
+           if (ch.Parse(tail)) {
               if (Channels.HasUniqueChannelID(&ch, channel)) {
                  *channel = ch;
                  Channels.ReNumber();
@@ -948,7 +948,7 @@ void cSVDRP::CmdNEWC(const char *Option)
 {
   if (*Option) {
      cChannel ch;
-     if (ch.Parse(Option, true)) {
+     if (ch.Parse(Option)) {
         if (Channels.HasUniqueChannelID(&ch)) {
            cChannel *channel = new cChannel;
            *channel = ch;
diff --git a/thread.c b/thread.c
index eb009f146..013b21793 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.41 2005/01/14 13:59:48 kls Exp $
+ * $Id: thread.c 1.42 2005/05/06 14:39:15 kls Exp $
  */
 
 #include "thread.h"
@@ -17,6 +17,22 @@
 #include <unistd.h>
 #include "tools.h"
 
+static bool GetAbsTime(struct timespec *Abstime, int MillisecondsFromNow)
+{
+  struct timeval now;
+  if (gettimeofday(&now, NULL) == 0) {           // get current time
+     now.tv_usec += MillisecondsFromNow * 1000;  // add the timeout
+     while (now.tv_usec >= 1000000) {            // take care of an overflow
+           now.tv_sec++;
+           now.tv_usec -= 1000000;
+           }
+     Abstime->tv_sec = now.tv_sec;          // seconds
+     Abstime->tv_nsec = now.tv_usec * 1000; // nano seconds
+     return true;
+     }
+  return false;
+}
+
 // --- cCondWait -------------------------------------------------------------
 
 cCondWait::cCondWait(void)
@@ -44,15 +60,8 @@ bool cCondWait::Wait(int TimeoutMs)
   pthread_mutex_lock(&mutex);
   if (!signaled) {
      if (TimeoutMs) {
-        struct timeval now;
-        if (gettimeofday(&now, NULL) == 0) {  // get current time
-           now.tv_usec += TimeoutMs * 1000;   // add the timeout
-           int sec = now.tv_usec / 1000000;
-           now.tv_sec += sec;
-           now.tv_usec -= sec * 1000000;
-           struct timespec abstime;              // build timespec for timedwait
-           abstime.tv_sec = now.tv_sec;          // seconds
-           abstime.tv_nsec = now.tv_usec * 1000; // nano seconds
+        struct timespec abstime;
+        if (GetAbsTime(&abstime, TimeoutMs)) {
            while (!signaled) {
                  if (pthread_cond_timedwait(&cond, &mutex, &abstime) == ETIMEDOUT)
                     break;
@@ -105,17 +114,8 @@ bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
   bool r = true; // true = condition signaled false = timeout
 
   if (Mutex.locked) {
-     struct timeval now;                   // unfortunately timedwait needs the absolute time, not the delta :-(
-     if (gettimeofday(&now, NULL) == 0) {  // get current time
-        now.tv_usec += TimeoutMs * 1000;   // add the timeout
-        while (now.tv_usec >= 1000000) {   // take care of an overflow
-              now.tv_sec++;
-              now.tv_usec -= 1000000;
-              }
-        struct timespec abstime;              // build timespec for timedwait
-        abstime.tv_sec = now.tv_sec;          // seconds
-        abstime.tv_nsec = now.tv_usec * 1000; // nano seconds
-
+     struct timespec abstime;
+     if (GetAbsTime(&abstime, TimeoutMs)) {
         int locked = Mutex.locked;
         Mutex.locked = 0; // have to clear the locked count here, as pthread_cond_timedwait
                           // does an implizit unlock of the mutex.
@@ -150,8 +150,8 @@ bool cRwLock::Lock(bool Write, int TimeoutMs)
   int Result = 0;
   struct timespec abstime;
   if (TimeoutMs) {
-     abstime.tv_sec = TimeoutMs / 1000;
-     abstime.tv_nsec = (TimeoutMs % 1000) * 1000000;
+     if (!GetAbsTime(&abstime, TimeoutMs))
+        TimeoutMs = 0;
      }
   if (Write)
      Result = TimeoutMs ? pthread_rwlock_timedwrlock(&rwlock, &abstime) : pthread_rwlock_wrlock(&rwlock);
diff --git a/timers.c b/timers.c
index 2dded66e6..9e31f604b 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.30 2005/03/20 14:50:37 kls Exp $
+ * $Id: timers.c 1.31 2005/05/07 11:10:56 kls Exp $
  */
 
 #include "timers.h"
@@ -441,6 +441,10 @@ void cTimer::SetEvent(const cSchedule *Schedule, const cEvent *Event)
 void cTimer::SetRecording(bool Recording)
 {
   recording = Recording;
+  if (recording)
+     SetFlags(tfRecording);
+  else
+     ClrFlags(tfRecording);
   isyslog("timer %s %s", *ToDescr(), recording ? "start" : "stop");
 }
 
diff --git a/timers.h b/timers.h
index ae83f5b62..28b3dd507 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.18 2005/03/20 14:47:45 kls Exp $
+ * $Id: timers.h 1.19 2005/05/07 10:36:35 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -19,6 +19,7 @@ enum eTimerFlags { tfNone      = 0x0000,
                    tfActive    = 0x0001,
                    tfInstant   = 0x0002,
                    tfVps       = 0x0004,
+                   tfRecording = 0x0008,
                    tfAll       = 0xFFFF,
                  };
 enum eTimerMatch { tmNone, tmPartial, tmFull };
diff --git a/vdr.5 b/vdr.5
index 5333be7c2..96136a1ad 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.35 2005/03/19 15:20:47 kls Exp $
+.\" $Id: vdr.5 1.36 2005/05/07 10:40:23 kls Exp $
 .\"
 .TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
 .SH NAME
@@ -210,6 +210,7 @@ l l.
 \fB1\fR@the timer is active (and will record if it hits)
 \fB2\fR@this is an instant recording timer
 \fB4\fR@this timer uses VPS
+\fB8\fR@this timer is currently recording (may only be up-to-date with SVDRP)
 .TE
 Bits other than these can be used by external programs to mark active timers
 and recognize if the user has modified them. When a user modifies an active

From f8367110245149a1333e47118c41827288c814c3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 29 May 2005 18:00:00 +0200
Subject: [PATCH 117/307] Version 1.3.25 - Updated the Estonian OSD texts
 (thanks to Arthur Konovalov). - Some cable providers don't mark short channel
 names according to the standard,   but rather go their own way and use
 "name>short name". VDR now splits at this   character for cable channels
 (thanks to Gerhard Steiner for reporting this one). - Added a check for
 Setup.DiSEqC in cDvbDevice::ProvidesTransponder(), otherwise   the EPG scan
 didn't work on systems that don't use DiSEqC (thanks to Michael   Reinelt for
 reporting this one). - Made the Makefile patch friendlier (thanks to Ludwig
 Nussel). - Made cOsd::isOpen an integer counter to avoid problems with
 messages when a   cOsdObject uses the raw OSD (thanks to Andreas Regel for
 reporting this one). - Updated the Danish OSD texts (thanks to Mogens
 Elneff). - The file 'summary.vdr' has been replaced with 'info.vdr' and now
 contains the   information about a recording, in the same format as the
 events are stored in   'epg.data' (see man vdr(5) for details). Existing
 summary files can be converted   to the new format by running the Perl script
 'summary2info.pl', as in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  summary2info.pl /video

  (the parameter given has to be the video directory). If there is no 'info.vdr'
  file for a recording, an attempt is made to read a 'summary.vdr'.
- The "Summary" button in the "Recordings" menu has been renamed to "Info", and
  the page it brings up now shows the recording's information, much like the EPG
  event page. Therefore it now no longer uses the skin's SetText() function, but
  rather the SetRecording() function. Skin plugins may need to adjust that function
  accordingly (see skinsttng.c, for instance).
- The SVDRP command LSTR now lists the recording information in the same tagged
  format as the LSTE command lists the EPG data.
- The audio track menu now contains track descriptions when replaying (provided
  such descriptions were available in the EPG data when the recording was made,
  and are stored in the info.vdr file).
- Avoiding extra blanks at the end of names of instant recordings.
- Removed converting byte order on big endian systems from cDvbOsd::Flush(),
  which, according to Johannes Stezenbach and Paavo Hartikainen, is wrong.
- Added cPlayer::DeviceSetVideoDisplayFormat() (thanks to Marco Schlüßler).
- No longer saving the setup in case of a fatal error, to keep the volume level
  from being set to a wrong value (thanks to Marco Schlüßler).
- Fixed a possible hangup when ending a replay session while cIndexFile::CatchUp()
  is waiting (thanks to Marco Schlüßler).
- The SVDRP command DELR no longer deletes recordings that are currently being
  written to by a timer (thanks to Sascha Volkenandt for pointing out this one).
- Pressing the "Play" key in live viewing mode now resumes a previous replay
  session (thanks to Mirko Dölle).
- Now dropping EPG events that have a zero start time or duration (thanks to
  Oliver Endriss).
- No longer stopping Transfer Mode or replay immediately when the Power button
  is pressed (thanks to Rolf Ahrenberg).
- Moved the NPTL and UTF-8 checks after the version and help output (thanks to
  Andreas Kool for pointing out that 'vdr --version' failed on an UTF-8 system).
- Made tChannelID::operator==() inline for better performance (thanks to Georg
  Acher).
- Introduced cListBase::count for better performance (thanks to Georg Acher).
- cEvent no longer stores the channelID directly, but rather has a pointer to
  the schedule it is in.
- Now using hash tables to speed up cSchedule::GetEvent() (partially based on
  a patch from Georg Acher).
- Avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the
  '& 0xff' in CRC32::crc32() of libsi/util.c (thanks to Georg Acher).
- Speeded up deleting duplicate channels.
- Fixed listing recordings with empty episode names in the LSTR command (thanks
  to Stefan Huelswitt for pointing this out).
- Added cThread::SetPriority() and using it in cSectionHandler::Action() to
  reduce the priority of the section handler threads (as suggested by Georg Acher).
---
 CONTRIBUTORS                        |  38 ++++-
 HISTORY                             |  67 ++++++++-
 MANUAL                              |   2 +-
 Make.config.template                |   4 +-
 Makefile                            |  10 +-
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/skincurses.c |  29 +++-
 channels.c                          |  57 ++++----
 channels.conf                       |  32 ++---
 channels.h                          |  16 +--
 config.h                            |   6 +-
 cutter.c                            |   4 +-
 dvbdevice.c                         |   4 +-
 dvbosd.c                            |   6 +-
 dvbplayer.c                         |   4 +-
 eit.c                               |  37 ++---
 epg.c                               | 203 +++++++++++++++------------
 epg.h                               |  27 ++--
 i18n.c                              |  39 ++++--
 libsi/Makefile                      |   4 +-
 libsi/si.c                          |  35 +++--
 libsi/util.c                        |   5 +-
 menu.c                              | 161 +++++++++++++++-------
 menu.h                              |   4 +-
 osd.c                               |   8 +-
 osd.h                               |   6 +-
 player.h                            |   3 +-
 recording.c                         | 206 ++++++++++++++++++++--------
 recording.h                         |  30 +++-
 sdt.c                               |  11 +-
 sections.c                          |   3 +-
 skinclassic.c                       |  30 +++-
 skins.h                             |   4 +-
 skinsttng.c                         |  36 ++++-
 sources.h                           |   5 +-
 summary2info.pl                     |  47 +++++++
 svdrp.c                             |  32 +++--
 thread.c                            |   8 +-
 thread.h                            |   3 +-
 tools.c                             |  91 ++++++++++--
 tools.h                             |  39 +++++-
 vdr.5                               |  10 +-
 vdr.c                               |  58 ++++----
 43 files changed, 1015 insertions(+), 413 deletions(-)
 create mode 100755 summary2info.pl

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cc5bdb44f..eff35c7b0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -197,6 +197,8 @@ Stefan Huelswitt <huels@iname.com>
  for fixing handling symbolic links in cRecordings::ScanVideoDir()
  for reporting a memory leak in tComponent
  for fixing a memory leak in cDvbPlayer
+ for pointing out that recordings with empty episode names were not listed correctly
+ in the LSTR command
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -408,6 +410,7 @@ Mirko D
  change in Daylight Saving Time
  for suggesting to avoid the external 'find' command to scan the video directory
  for reporting a problem with inconsistent channel and timer lists
+ for making the "Play" key in live viewing mode resume a previous replay session
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -563,6 +566,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting a problem with the name of the remote control for which the keys are
  being learned overwriting the date/time in the 'classic' skin
  for making cDvbOsd check available OSD memory at runtime
+ for making cEIT::cEIT() drop EPG events that have a zero start time or duration
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -603,6 +607,8 @@ Gerhard Steiner <steiner@mail.austria.com>
  for reporting a problem with newly created timers in case they are not confirmed
  with "Ok"
  for reporting an occasional "Broken pipe" error in SVDRP connections
+ for reporting that some cable channels don't mark short channel names according
+ to the standard
 
 Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
@@ -642,6 +648,7 @@ Andreas Kool <akool@akool.de>
  for fixing detecting the /dev/videoN devices for GRAB in case there are others
  before the DVB devices
  for fixing a possible NULL pointer access in cEITScanner::Process()
+ for pointing out that 'vdr --version' failed on an UTF-8 system
 
 Guy Roussin <guy.roussin@teledetection.fr>
  for suggesting not to display channel group delimiters without text
@@ -768,6 +775,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
  Digital audio after switching to a channel that has DD and selecting the DD audio
  track
  for reporting a bug in timeout handling in cRwLock::Lock()
+ for pointing out that the SVDRP command DELR deleted recordings that are currently
+ being written to by a timer
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -786,6 +795,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for adding some checks when canceling a thread and removing the usleep() in
  cThread::Start()
  for removing the LOCK_THREAD from the LIRC thread
+ for making the Makefile patch friendlier
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -869,6 +879,7 @@ Niko Tarnanen <niko.tarnanen@hut.fi>
 Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
+ for making pressing the Power button not stop Transfer Mode or replay immediately
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -941,7 +952,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing a possible freeze in pause mode in case a device's PlayPesPacket()
  function permanently returns 0
  for fixing a typo in detecting UTF-8
- for fixing handling fragments of less than 3 byte in cPesAssembler
+ for fixing handling fragments of less than 4 byte in cPesAssembler
  for some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems
 
 Richard Robson <richard_robson@beeb.net>
@@ -1061,6 +1072,7 @@ Andreas Regel <andreas.regel@gmx.de>
  for pointing out a missing call to cStatus::MsgOsdtatusMessage(NULL) in
  cSkins::Message()
  for reporting a problem in handling Transfer Mode for radio channels
+ for reporting a problem with messages when a cOsdObject uses the raw OSD
 
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1169,6 +1181,11 @@ Marco Schl
  for fixing a bug in libsi's SubtitlingDescriptor::getLength()
  for removing scaling coordinates in letterbox mode from cDvbSpu
  for fixing a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling
+ for adding cPlayer::DeviceSetVideoDisplayFormat()
+ for making the setup not being saved in case of a fatal error, to keep the volume
+ level from being set to a wrong value
+ for fixing a possible hangup when ending a replay session while cIndexFile::CatchUp()
+ is waiting
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1331,3 +1348,22 @@ Matthias L
 
 Wolfgang Fritz <wolfgang.fritz@gmx.net>
  for making recordings avoid zero sized video data files
+
+Michael Reinelt <reinelt@eunet.at>
+ for reporting a problem with the EPG scan on systems that don't use DiSEqC
+
+Johannes Stezenbach <js@linuxtv.org>
+ for pointing out that the byte swap for big endian systems in cDvbOsd::Flush()
+ is wrong
+
+Paavo Hartikainen <pahartik@sci.fi>
+ for verifying that the byte swap for big endian systems in cDvbOsd::Flush() was
+ wrong
+
+Georg Acher <acher@baycom.de>
+ for making tChannelID::operator==() inline for better performance
+ for introducing cListBase::count for better performance
+ for a patch that was used to implement hash tables to speed up cSchedule::GetEvent()
+ for avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the
+ '& 0xff' in CRC32::crc32() of libsi/util.c
+ for suggesting to reduce the priority of the section handler threads
diff --git a/HISTORY b/HISTORY
index 0b30015bb..2e5778ae8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3487,7 +3487,7 @@ Video Disk Recorder Revision History
 - Fixed handling transparent areas in cDvbSpuBitmap (thanks to Marco Schl��ler).
 - Now also considering the "EPG linger time" when saving the EPG data to file or
   listing it via LSTE (thanks to Roman Krenick�).
-- Fixed handling fragments of less than 3 byte in cPesAssembler (thanks to
+- Fixed handling fragments of less than 4 byte in cPesAssembler (thanks to
   Reinhard Nissl).
 - Fixed a bug in libsi's SubtitlingDescriptor::getLength() (thanks to Marco
   Schl��ler).
@@ -3512,3 +3512,68 @@ Video Disk Recorder Revision History
   (thanks to Reinhard Nissl).
 - Fixed a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling (thanks to
   Marco Schl��ler).
+
+2005-05-29: Version 1.3.25
+
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Some cable providers don't mark short channel names according to the standard,
+  but rather go their own way and use "name>short name". VDR now splits at this
+  character for cable channels (thanks to Gerhard Steiner for reporting this one).
+- Added a check for Setup.DiSEqC in cDvbDevice::ProvidesTransponder(), otherwise
+  the EPG scan didn't work on systems that don't use DiSEqC (thanks to Michael
+  Reinelt for reporting this one).
+- Made the Makefile patch friendlier (thanks to Ludwig Nussel).
+- Made cOsd::isOpen an integer counter to avoid problems with messages when a
+  cOsdObject uses the raw OSD (thanks to Andreas Regel for reporting this one).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- The file 'summary.vdr' has been replaced with 'info.vdr' and now contains the
+  information about a recording, in the same format as the events are stored in
+  'epg.data' (see man vdr(5) for details). Existing summary files can be converted
+  to the new format by running the Perl script 'summary2info.pl', as in
+
+  summary2info.pl /video
+
+  (the parameter given has to be the video directory). If there is no 'info.vdr'
+  file for a recording, an attempt is made to read a 'summary.vdr'.
+- The "Summary" button in the "Recordings" menu has been renamed to "Info", and
+  the page it brings up now shows the recording's information, much like the EPG
+  event page. Therefore it now no longer uses the skin's SetText() function, but
+  rather the SetRecording() function. Skin plugins may need to adjust that function
+  accordingly (see skinsttng.c, for instance).
+- The SVDRP command LSTR now lists the recording information in the same tagged
+  format as the LSTE command lists the EPG data.
+- The audio track menu now contains track descriptions when replaying (provided
+  such descriptions were available in the EPG data when the recording was made,
+  and are stored in the info.vdr file).
+- Avoiding extra blanks at the end of names of instant recordings.
+- Removed converting byte order on big endian systems from cDvbOsd::Flush(),
+  which, according to Johannes Stezenbach and Paavo Hartikainen, is wrong.
+- Added cPlayer::DeviceSetVideoDisplayFormat() (thanks to Marco Schl��ler).
+- No longer saving the setup in case of a fatal error, to keep the volume level
+  from being set to a wrong value (thanks to Marco Schl��ler).
+- Fixed a possible hangup when ending a replay session while cIndexFile::CatchUp()
+  is waiting (thanks to Marco Schl��ler).
+- The SVDRP command DELR no longer deletes recordings that are currently being
+  written to by a timer (thanks to Sascha Volkenandt for pointing out this one).
+- Pressing the "Play" key in live viewing mode now resumes a previous replay
+  session (thanks to Mirko D�lle).
+- Now dropping EPG events that have a zero start time or duration (thanks to
+  Oliver Endriss).
+- No longer stopping Transfer Mode or replay immediately when the Power button
+  is pressed (thanks to Rolf Ahrenberg).
+- Moved the NPTL and UTF-8 checks after the version and help output (thanks to
+  Andreas Kool for pointing out that 'vdr --version' failed on an UTF-8 system).
+- Made tChannelID::operator==() inline for better performance (thanks to Georg
+  Acher).
+- Introduced cListBase::count for better performance (thanks to Georg Acher).
+- cEvent no longer stores the channelID directly, but rather has a pointer to
+  the schedule it is in.
+- Now using hash tables to speed up cSchedule::GetEvent() (partially based on
+  a patch from Georg Acher).
+- Avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the
+  '& 0xff' in CRC32::crc32() of libsi/util.c (thanks to Georg Acher).
+- Speeded up deleting duplicate channels.
+- Fixed listing recordings with empty episode names in the LSTR command (thanks
+  to Stefan Huelswitt for pointing this out).
+- Added cThread::SetPriority() and using it in cSectionHandler::Action() to
+  reduce the priority of the section handler threads (as suggested by Georg Acher).
diff --git a/MANUAL b/MANUAL
index ebf8ce025..8a65809e2 100644
--- a/MANUAL
+++ b/MANUAL
@@ -23,7 +23,7 @@ Version 1.2
   Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump             -
   Green   -           Audio        New        New        Ins/Ovr       Rewind            Skip -60s        -
   Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s        -
-  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary           Stop             -
+  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Info              Stop             -
   0..9    Ch select   -            Sort(3)    Day(4)     Numeric inp.  Exec cmd(2)       Editing          -
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
diff --git a/Make.config.template b/Make.config.template
index b39b1f4c1..3c429e77d 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.3 2003/08/09 11:03:25 kls Exp $
+# $Id: Make.config.template 1.4 2005/05/14 10:32:33 kls Exp $
 
 ### The C compiler and options:
 
@@ -14,7 +14,7 @@ CC       = gcc
 CFLAGS   = -O2
 
 CXX      = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/Makefile b/Makefile
index 59e7e787e..7bc8a57d2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.74 2005/02/13 10:13:45 kls Exp $
+# $Id: Makefile 1.75 2005/05/14 10:32:13 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -12,12 +12,14 @@ CC       ?= gcc
 CFLAGS   ?= -O2
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 DVBDIR   = ../DVB
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
+LIBS     = -ljpeg -lpthread -ldl
+INCLUDES =
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
@@ -29,7 +31,7 @@ DOXYFILE = Doxyfile
 
 -include Make.config
 
-INCLUDES = -I$(DVBDIR)/include
+INCLUDES += -I$(DVBDIR)/include
 
 SILIB    = $(LSIDIR)/libsi.a
 
@@ -106,7 +108,7 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(SILIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
 
 # The font files:
 
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 8ba4ae4e6..33119f4a8 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -13,3 +13,7 @@ VDR Plugin 'skincurses' Revision History
 
 - Made several functions threadsafe.
 - New audio track display.
+
+2005-05-16: Version 0.0.4
+
+- New "recording info" display.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index a1c595404..ad1a26b44 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.5 2005/01/09 11:56:26 kls Exp $
+ * $Id: skincurses.c 1.6 2005/05/16 10:45:12 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -407,7 +407,30 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
 
 void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
 {
-  SetText(Recording->Summary(), false); //TODO
+  if (!Recording)
+     return;
+  const cRecordingInfo *Info = Recording->Info();
+  int y = 2;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
+  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
+  y += ts.Height();
+  y += 1;
+  const char *Title = Info->Title();
+  if (isempty(Title))
+     Title = Recording->Name();
+  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Title, &Font, clrCyan, clrBackground);
+  y += ts.Height();
+  if (!isempty(Info->ShortText())) {
+     ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Info->ShortText(), &Font, clrYellow, clrBackground);
+     y += ts.Height();
+     }
+  y += 1;
+  if (!isempty(Info->Description())) {
+     textScroller.Set(osd, 0, y, OsdWidth - 2, OsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground);
+     SetScrollbar();
+     }
 }
 
 void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
diff --git a/channels.c b/channels.c
index e571aed25..b2d741e6c 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.38 2005/05/07 13:14:32 kls Exp $
+ * $Id: channels.c 1.42 2005/05/29 10:32:38 kls Exp $
  */
 
 #include "channels.h"
@@ -124,11 +124,6 @@ int MapToDriver(int Value, const tChannelParameterMap *Map)
 
 const tChannelID tChannelID::InvalidID;
 
-bool tChannelID::operator== (const tChannelID &arg) const
-{
-  return source == arg.source && nid == arg.nid && tid == arg.tid && sid == arg.sid && rid == arg.rid;
-}
-
 tChannelID tChannelID::FromString(const char *s)
 {
   char *sourcebuf = NULL;
@@ -146,7 +141,7 @@ tChannelID tChannelID::FromString(const char *s)
   return tChannelID::InvalidID;
 }
 
-cString tChannelID::ToString(void)
+cString tChannelID::ToString(void) const
 {
   char buffer[256];
   snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", *cSource::ToString(source), nid, tid, sid, rid);
@@ -263,11 +258,6 @@ int cChannel::Transponder(void) const
   return tf;
 }
 
-tChannelID cChannel::GetChannelID(void) const
-{
-  return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid);
-}
-
 int cChannel::Modification(int Mask)
 {
   int Result = modification & Mask;
@@ -814,6 +804,22 @@ bool cChannel::Save(FILE *f)
   return fprintf(f, "%s", *ToText()) > 0;
 }
 
+// -- cChannelSorter ---------------------------------------------------------
+
+class cChannelSorter : public cListObject {
+public:
+  cChannel *channel;
+  tChannelID channelID;
+  cChannelSorter(cChannel *Channel) {
+    channel = Channel;
+    channelID = channel->GetChannelID();
+    }
+  virtual int Compare(const cListObject &ListObject) const {
+    cChannelSorter *cs = (cChannelSorter *)&ListObject;
+    return memcmp(&channelID, &cs->channelID, sizeof(channelID));
+    }
+  };
+
 // -- cChannels --------------------------------------------------------------
 
 cChannels Channels;
@@ -826,22 +832,21 @@ cChannels::cChannels(void)
 
 void cChannels::DeleteDuplicateChannels(void)
 {
+  cList<cChannelSorter> ChannelSorter;
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep()) {
-         tChannelID ChannelID = channel->GetChannelID();
-         cChannel *other = Next(channel);
-         while (other) {
-               cChannel *d = NULL;
-               if (!other->GroupSep() && other->GetChannelID() == ChannelID)
-                  d = other;
-               other = Next(other);
-               if (d) {
-                  dsyslog("deleting duplicate channel %s", *d->ToText());
-                  Del(d);
-                  }
-               }
-         }
+      if (!channel->GroupSep())
+         ChannelSorter.Add(new cChannelSorter(channel));
       }
+  ChannelSorter.Sort();
+  cChannelSorter *cs = ChannelSorter.First();
+  while (cs) {
+        cChannelSorter *next = ChannelSorter.Next(cs);
+        if (next && cs->channelID == next->channelID) {
+           dsyslog("deleting duplicate channel %s", *next->channel->ToText());
+           Del(next->channel);
+           }
+        cs = next;
+        }
 }
 
 bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
diff --git a/channels.conf b/channels.conf
index 9f83d12f7..f62e0fe72 100644
--- a/channels.conf
+++ b/channels.conf
@@ -26,14 +26,14 @@ NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:3
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
-TW1 - 28Feb05;ORF:12692:hC56:S19.2E:22000:166:167=deu:168:0:13013:1:1117:0
+TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
 Eurosport;ZDFvision:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
 EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
 EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
@@ -45,10 +45,10 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
@@ -58,7 +58,7 @@ PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2
 BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
 DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
+F1-Portal:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
 PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
@@ -72,14 +72,14 @@ FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
 LCP;CSAT:12207:vC34:S19.2E:27500:2047+8191:0:0:0:8506:1:1090:0
 ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
 Best of Shopping;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
-ASTRA-Mosaic;ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
-ASTRA-Mosaic 2;ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
-ASTRA-Mosaic 3;ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
-ASTRA-Mosaic 4;ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
-ASTRA-Mosaic 5;ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
+ASTRA-Mosaic;SES ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
+ASTRA-Mosaic 2;SES ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
+ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
+ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
+ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
-Yorin;CANAL+:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,602,100:5010:53:1109:0
+Yorin;CANAL+:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
@@ -88,9 +88,9 @@ VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
-Sky One;BSkyB:12226:hC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4705:2:2027:0
-Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2311+2304:2312=eng,2313=NAR:2314:960,961:5104:2:2027:0
-ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng:2353:960,961:10240:2:2054:0
+Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
+Sky Mix;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
+ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2374=UND:2353:960,961:10240:2:2054:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
@@ -113,7 +113,7 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-BTL TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
+Bethel TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
diff --git a/channels.h b/channels.h
index 86fffe045..3cb7e8f8f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.28 2005/05/07 13:07:09 kls Exp $
+ * $Id: channels.h 1.32 2005/05/28 13:57:08 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -65,12 +65,12 @@ struct tChannelID {
 public:
   tChannelID(void) { source = nid = tid = sid = rid = 0; }
   tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
-  bool operator== (const tChannelID &arg) const;
-  bool Valid(void) { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
+  bool operator== (const tChannelID &arg) const { return source == arg.source && nid == arg.nid && tid == arg.tid && sid == arg.sid && rid == arg.rid; }
+  bool Valid(void) const { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   tChannelID &ClrPolarization(void);
   static tChannelID FromString(const char *s);
-  cString ToString(void);
+  cString ToString(void) const;
   static const tChannelID InvalidID;
   };
 
@@ -176,10 +176,10 @@ class cChannel : public cListObject {
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
-  bool IsCable(void) const { return (source & cSource::st_Mask) == cSource::stCable; }
-  bool IsSat(void) const { return (source & cSource::st_Mask) == cSource::stSat; }
-  bool IsTerr(void) const { return (source & cSource::st_Mask) == cSource::stTerr; }
-  tChannelID GetChannelID(void) const;
+  bool IsCable(void) const { return cSource::IsCable(source); }
+  bool IsSat(void) const { return cSource::IsSat(source); }
+  bool IsTerr(void) const { return cSource::IsTerr(source); }
+  tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
   int Modification(int Mask = CHANNELMOD_ALL);
   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
diff --git a/config.h b/config.h
index d44e865e5..ebe212381 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.217 2005/05/05 11:04:18 kls Exp $
+ * $Id: config.h 1.218 2005/05/14 09:18:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.24"
-#define VDRVERSNUM   10324  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.25"
+#define VDRVERSNUM   10325  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index c8ed60ecb..82c7fe5b7 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.7 2004/06/13 16:04:08 kls Exp $
+ * $Id: cutter.c 1.8 2005/05/15 14:21:08 kls Exp $
  */
 
 #include "cutter.h"
@@ -204,7 +204,7 @@ bool cCutter::Start(const char *FileName)
         free(s);
         // XXX
         editedVersionName = strdup(evn);
-        Recording.WriteSummary();
+        Recording.WriteInfo();
         Recordings.AddByName(editedVersionName);
         cuttingThread = new cCuttingThread(FileName, editedVersionName);
         return true;
diff --git a/dvbdevice.c b/dvbdevice.c
index 9c8a0ac4a..3a3b19bd3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.127 2005/03/20 10:10:38 kls Exp $
+ * $Id: dvbdevice.c 1.129 2005/05/16 15:23:43 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -741,7 +741,7 @@ bool cDvbDevice::ProvidesSource(int Source) const
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 {
-  return ProvidesSource(Channel->Source()) && ((Channel->Source() & cSource::st_Mask) != cSource::stSat || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()));
+  return ProvidesSource(Channel->Source()) && (!cSource::IsSat(Channel->Source()) || !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()));
 }
 
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
diff --git a/dvbosd.c b/dvbosd.c
index 360825fca..458ec9ce8 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.26 2005/02/12 15:36:31 kls Exp $
+ * $Id: dvbosd.c 1.27 2005/05/22 10:57:45 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -151,10 +151,6 @@ void cDvbOsd::Flush(void)
             for (int i = 0; i < NumColors; i++) {
                 // convert AARRGGBB to AABBGGRR (the driver expects the colors the wrong way):
                 colors[i] = (Colors[i] & 0xFF000000) | ((Colors[i] & 0x0000FF) << 16) | (Colors[i] & 0x00FF00) | ((Colors[i] & 0xFF0000) >> 16);
-#if __BYTE_ORDER == __BIG_ENDIAN
-                // actually the driver itself should access the bytes according to the current endianness!
-                colors[i] = ((colors[i] & 0xFF) << 24) | ((colors[i] & 0xFF00) << 8) | ((colors[i] & 0xFF0000) >> 8) | ((colors[i] & 0xFF000000) >> 24);
-#endif
                 }
             Colors = colors;
             //TODO end of stuff that should be fixed in the driver
diff --git a/dvbplayer.c b/dvbplayer.c
index 477a6c068..2d4e1e48b 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.33 2005/05/08 14:52:49 kls Exp $
+ * $Id: dvbplayer.c 1.34 2005/05/22 11:26:51 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -355,7 +355,7 @@ void cDvbPlayer::Activate(bool On)
      }
   else if (active) {
      running = false;
-     Cancel(3);
+     Cancel(9);
      active = false;
      }
 }
diff --git a/eit.c b/eit.c
index 6c6381b1d..a8ac9df28 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.103 2005/03/20 12:33:51 kls Exp $
+ * $Id: eit.c 1.107 2005/05/28 11:35:55 kls Exp $
  */
 
 #include "eit.h"
@@ -48,12 +48,16 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
+      // Drop bogus events.
+      if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getDuration() == 0)
+         continue;
       Empty = false;
+      cEvent *newEvent = NULL;
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
       if (!pEvent) {
          // If we don't have that event yet, we create a new one.
          // Otherwise we copy the information into the existing event anyway, because the data might have changed.
-         pEvent = pSchedule->AddEvent(new cEvent(channelID, SiEitEvent.getEventId()));
+         pEvent = newEvent = new cEvent(SiEitEvent.getEventId());
          if (!pEvent)
             continue;
          }
@@ -91,8 +95,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
       SI::ShortEventDescriptor *ShortEventDescriptor = NULL;
       cLinkChannels *LinkChannels = NULL;
-      int NumComponents = 0;
-      SI::ComponentDescriptor *ComponentDescriptors[MAXCOMPONENTS];
+      cComponents *Components = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
@@ -193,12 +196,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  uchar Stream = cd->getStreamContent();
                  uchar Type = cd->getComponentType();
                  if (1 <= Stream && Stream <= 2 && Type != 0) {
-                    if (NumComponents < MAXCOMPONENTS) {
-                       ComponentDescriptors[NumComponents++] = cd;
-                       d = NULL; // so that it is not deleted
-                       }
-                    else
-                       dsyslog("more than %d component descriptors!", MAXCOMPONENTS);
+                    if (!Components)
+                       Components = new cComponents;
+                    char buffer[256];
+                    Components->SetComponent(Components->NumComponents(), cd->getStreamContent(), cd->getComponentType(), I18nNormalizeLanguageCode(cd->languageCode), cd->description.getText(buffer, sizeof(buffer)));
                     }
                  }
                  break;
@@ -221,18 +222,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
 
-      if (NumComponents > 0) {
-         cComponents *Components = new cComponents(NumComponents);
-         for (int i = 0; i < NumComponents; i++) {
-             char buffer[256];
-             SI::ComponentDescriptor *cd = ComponentDescriptors[i];
-             Components->SetComponent(i, cd->getStreamContent(), cd->getComponentType(), I18nNormalizeLanguageCode(cd->languageCode), cd->description.getText(buffer, sizeof(buffer)));
-             delete cd;
-             }
-         pEvent->SetComponents(Components);
-         }
-      else
-         pEvent->SetComponents(NULL);
+      if (newEvent)
+         pSchedule->AddEvent(newEvent);
+
+      pEvent->SetComponents(Components);
 
       pEvent->FixEpgBugs();
       if (LinkChannels)
diff --git a/epg.c b/epg.c
index 21bdeb5b3..509b702a1 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.29 2005/05/05 13:53:19 kls Exp $
+ * $Id: epg.c 1.34 2005/05/29 10:19:48 kls Exp $
  */
 
 #include "epg.h"
@@ -40,11 +40,10 @@ bool tComponent::FromString(const char *s)
 
 // --- cComponents -----------------------------------------------------------
 
-cComponents::cComponents(int NumComponents)
+cComponents::cComponents(void)
 {
-  numComponents = NumComponents;
-  components = MALLOC(tComponent, numComponents);
-  memset(components, 0, sizeof(tComponent) * numComponents);
+  numComponents = 0;
+  components = NULL;
 }
 
 cComponents::~cComponents(void)
@@ -54,31 +53,37 @@ cComponents::~cComponents(void)
   free(components);
 }
 
-bool cComponents::SetComponent(int Index, const char *s)
+void cComponents::Realloc(int Index)
 {
-  if (Index < numComponents)
-     return components[Index].FromString(s);
-  return false;
+  if (Index >= numComponents) {
+     int n = numComponents;
+     numComponents = Index + 1;
+     components = (tComponent *)realloc(components, numComponents * sizeof(tComponent));
+     memset(&components[n], 0, sizeof(tComponent) * (numComponents - n));
+     }
 }
 
-bool cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description)
+void cComponents::SetComponent(int Index, const char *s)
 {
-  if (Index < numComponents) {
-     tComponent *p = &components[Index];
-     p->stream = Stream;
-     p->type = Type;
-     strn0cpy(p->language, Language, sizeof(p->language));
-     p->description = strcpyrealloc(p->description, !isempty(Description) ? Description : NULL);
-     return true;
-     }
-  return false;
+  Realloc(Index);
+  components[Index].FromString(s);
+}
+
+void cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description)
+{
+  Realloc(Index);
+  tComponent *p = &components[Index];
+  p->stream = Stream;
+  p->type = Type;
+  strn0cpy(p->language, Language, sizeof(p->language));
+  p->description = strcpyrealloc(p->description, !isempty(Description) ? Description : NULL);
 }
 
 // --- cEvent ----------------------------------------------------------------
 
-cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID)
+cEvent::cEvent(u_int16_t EventID)
 {
-  channelID = ChannelID;
+  schedule = NULL;
   eventID = EventID;
   tableID = 0;
   version = 0xFF; // actual version numbers are 0..31
@@ -107,9 +112,20 @@ int cEvent::Compare(const cListObject &ListObject) const
   return startTime - e->startTime;
 }
 
+tChannelID cEvent::ChannelID(void) const
+{
+  return schedule ? schedule->ChannelID() : tChannelID();
+}
+
 void cEvent::SetEventID(u_int16_t EventID)
 {
-  eventID = EventID;
+  if (eventID != EventID) {
+     if (schedule)
+        schedule->UnhashEvent(this);
+     eventID = EventID;
+     if (schedule)
+        schedule->HashEvent(this);
+     }
 }
 
 void cEvent::SetTableID(uchar TableID)
@@ -153,7 +169,13 @@ void cEvent::SetComponents(cComponents *Components)
 
 void cEvent::SetStartTime(time_t StartTime)
 {
-  startTime = StartTime;
+  if (startTime != StartTime) {
+     if (schedule)
+        schedule->UnhashEvent(this);
+     startTime = StartTime;
+     if (schedule)
+        schedule->HashEvent(this);
+     }
 }
 
 void cEvent::SetDuration(int Duration)
@@ -187,30 +209,17 @@ bool cEvent::IsRunning(bool OrAboutToStart) const
 
 cString cEvent::GetDateString(void) const
 {
-  char buf[32];
-  struct tm tm_r;
-  tm *tm = localtime_r(&startTime, &tm_r);
-  char *p = stpcpy(buf, WeekDayName(tm->tm_wday));
-  *p++ = ' ';
-  strftime(p, sizeof(buf) - (p - buf), "%d.%m.%Y", tm);
-  return buf;
+  return DateString(startTime);
 }
 
 cString cEvent::GetTimeString(void) const
 {
-  char buf[25];
-  struct tm tm_r;
-  strftime(buf, sizeof(buf), "%R", localtime_r(&startTime, &tm_r));
-  return buf;
+  return TimeString(startTime);
 }
 
 cString cEvent::GetEndTimeString(void) const
 {
-  char buf[25];
-  time_t EndTime = startTime + duration;
-  struct tm tm_r;
-  strftime(buf, sizeof(buf), "%R", localtime_r(&EndTime, &tm_r));
-  return buf;
+  return TimeString(startTime + duration);
 }
 
 cString cEvent::GetVpsString(void) const
@@ -221,10 +230,11 @@ cString cEvent::GetVpsString(void) const
   return buf;
 }
 
-void cEvent::Dump(FILE *f, const char *Prefix) const
+void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
 {
-  if (startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
-     fprintf(f, "%sE %u %ld %d %X\n", Prefix, eventID, startTime, duration, tableID);
+  if (InfoOnly || startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
+     if (!InfoOnly)
+        fprintf(f, "%sE %u %ld %d %X\n", Prefix, eventID, startTime, duration, tableID);
      if (!isempty(title))
         fprintf(f, "%sT %s\n", Prefix, title);
      if (!isempty(shortText))
@@ -240,18 +250,40 @@ void cEvent::Dump(FILE *f, const char *Prefix) const
             fprintf(f, "%sX %s\n", Prefix, *p->ToString());
             }
         }
-     if (vps)
+     if (!InfoOnly && vps)
         fprintf(f, "%sV %ld\n", Prefix, vps);
-     fprintf(f, "%se\n", Prefix);
+     if (!InfoOnly)
+        fprintf(f, "%se\n", Prefix);
      }
 }
 
+bool cEvent::Parse(char *s)
+{
+  char *t = skipspace(s + 1);
+  switch (*s) {
+    case 'T': SetTitle(t);
+              break;
+    case 'S': SetShortText(t);
+              break;
+    case 'D': strreplace(t, '|', '\n');
+              SetDescription(t);
+              break;
+    case 'X': if (!components)
+                 components = new cComponents;
+              components->SetComponent(components->NumComponents(), t);
+              break;
+    case 'V': SetVps(atoi(t));
+              break;
+    default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
+              return false;
+    }
+  return true;
+}
+
 bool cEvent::Read(FILE *f, cSchedule *Schedule)
 {
   if (Schedule) {
      cEvent *Event = NULL;
-     int NumComponents = 0;
-     char *ComponentStrings[MAXCOMPONENTS];
      char *s;
      cReadLine ReadLine;
      while ((s = ReadLine.Read(f)) != NULL) {
@@ -265,53 +297,25 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                           int n = sscanf(t, "%u %ld %d %X", &EventID, &StartTime, &Duration, &TableID);
                           if (n == 3 || n == 4) {
                              Event = (cEvent *)Schedule->GetEvent(EventID, StartTime);
+                             cEvent *newEvent = NULL;
                              if (!Event)
-                                Event = Schedule->AddEvent(new cEvent(Schedule->ChannelID(), EventID));
+                                Event = newEvent = new cEvent(EventID);
                              if (Event) {
                                 Event->SetTableID(TableID);
                                 Event->SetStartTime(StartTime);
                                 Event->SetDuration(Duration);
+                                if (newEvent)
+                                   Schedule->AddEvent(newEvent);
                                 }
                              }
-                          NumComponents = 0;
-                          }
-                       break;
-             case 'T': if (Event)
-                          Event->SetTitle(t);
-                       break;
-             case 'S': if (Event)
-                          Event->SetShortText(t);
-                       break;
-             case 'D': if (Event) {
-                          strreplace(t, '|', '\n');
-                          Event->SetDescription(t);
-                          }
-                       break;
-             case 'X': if (Event) {
-                          if (NumComponents < MAXCOMPONENTS)
-                             ComponentStrings[NumComponents++] = strdup(t);
-                          else
-                             dsyslog("more than %d component descriptors!", MAXCOMPONENTS);
                           }
                        break;
-             case 'V': if (Event)
-                          Event->SetVps(atoi(t));
-                       break;
-             case 'e': if (Event && NumComponents > 0) {
-                          cComponents *Components = new cComponents(NumComponents);
-                          for (int i = 0; i < NumComponents; i++) {
-                              if (!Components->SetComponent(i, ComponentStrings[i]))
-                                 esyslog("ERROR: faulty component string in EPG data: '%s'", ComponentStrings[i]);
-                              free(ComponentStrings[i]);
-                              }
-                          Event->SetComponents(Components);
-                          }
-                       Event = NULL;
+             case 'e': Event = NULL;
                        break;
              case 'c': // to keep things simple we react on 'c' here
                        return true;
-             default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
-                       return false;
+             default:  if (Event && !Event->Parse(s))
+                          return false;
              }
            }
      esyslog("ERROR: unexpected end of file while reading EPG data");
@@ -649,9 +653,34 @@ cSchedule::cSchedule(tChannelID ChannelID)
 cEvent *cSchedule::AddEvent(cEvent *Event)
 {
   events.Add(Event);
+  Event->schedule = this;
+  HashEvent(Event);
   return Event;
 }
 
+void cSchedule::DelEvent(cEvent *Event)
+{
+  if (Event->schedule == this) {
+     UnhashEvent(Event);
+     events.Del(Event);
+     Event->schedule = NULL;
+     }
+}
+
+void cSchedule::HashEvent(cEvent *Event)
+{
+  eventsHashID.Add(Event, Event->EventID());
+  if (Event->StartTime() > 0) // 'StartTime < 0' is apparently used with NVOD channels
+     eventsHashStartTime.Add(Event, Event->StartTime());
+}
+
+void cSchedule::UnhashEvent(cEvent *Event)
+{
+  eventsHashID.Del(Event, Event->EventID());
+  if (Event->StartTime() > 0) // 'StartTime < 0' is apparently used with NVOD channels
+     eventsHashStartTime.Del(Event, Event->StartTime());
+}
+
 const cEvent *cSchedule::GetPresentEvent(bool CheckRunningStatus) const
 {
   const cEvent *pe = NULL;
@@ -680,13 +709,9 @@ const cEvent *cSchedule::GetEvent(u_int16_t EventID, time_t StartTime) const
 {
   // Returns either the event info with the given EventID or, if that one can't
   // be found, the one with the given StartTime (or NULL if neither can be found)
-  cEvent *pt = NULL;
-  for (cEvent *pe = events.First(); pe; pe = events.Next(pe)) {
-      if (pe->EventID() == EventID)
-         return pe;
-      if (StartTime > 0 && pe->StartTime() == StartTime) // 'StartTime < 0' is apparently used with NVOD channels
-         pt = pe;
-      }
+  cEvent *pt = eventsHashID.Get(EventID);
+  if (!pt && StartTime > 0) // 'StartTime < 0' is apparently used with NVOD channels
+     pt = eventsHashStartTime.Get(StartTime);
   return pt;
 }
 
@@ -753,7 +778,7 @@ void cSchedule::Cleanup(time_t Time)
       if (!Event)
          break;
       if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
-         events.Del(Event);
+         DelEvent(Event);
          a--;
          }
       }
diff --git a/epg.h b/epg.h
index 6668a6145..83ae0d21a 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.21 2005/03/20 12:32:36 kls Exp $
+ * $Id: epg.h 1.25 2005/05/28 11:32:36 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -18,7 +18,6 @@
 #include "tools.h"
 
 #define MAXEPGBUGFIXLEVEL 3
-#define MAXCOMPONENTS 32
 
 enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
 
@@ -35,20 +34,22 @@ class cComponents {
 private:
   int numComponents;
   tComponent *components;
+  void Realloc(int Index);
 public:
-  cComponents(int NumComponents);
+  cComponents(void);
   ~cComponents(void);
   int NumComponents(void) const { return numComponents; }
-  bool SetComponent(int Index, const char *s);
-  bool SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
+  void SetComponent(int Index, const char *s);
+  void SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
   tComponent *Component(int Index) const { return (Index < numComponents) ? &components[Index] : NULL; }
   };
 
 class cSchedule;
 
 class cEvent : public cListObject {
+  friend class cSchedule;
 private:
-  tChannelID channelID;    // Channel ID of program for this event
+  cSchedule *schedule;     // The Schedule this event belongs to
   u_int16_t eventID;       // Event ID of this event
   uchar tableID;           // Table ID this event came from
   uchar version;           // Version number of section this event came from
@@ -56,16 +57,16 @@ class cEvent : public cListObject {
   char *title;             // Title of this event
   char *shortText;         // Short description of this event (typically the episode name in case of a series)
   char *description;       // Description of this event
-  cComponents *components; // The stream components of this event (separated by '\n')
+  cComponents *components; // The stream components of this event
   time_t startTime;        // Start time of this event
   int duration;            // Duration of this event in seconds
   time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
   time_t seen;             // When this event was last seen in the data stream
 public:
-  cEvent(tChannelID ChannelID, u_int16_t EventID);
+  cEvent(u_int16_t EventID);
   ~cEvent();
   virtual int Compare(const cListObject &ListObject) const;
-  tChannelID ChannelID(void) const { return channelID; }
+  tChannelID ChannelID(void) const;
   u_int16_t EventID(void) const { return eventID; }
   uchar TableID(void) const { return tableID; }
   uchar Version(void) const { return version; }
@@ -98,7 +99,8 @@ class cEvent : public cListObject {
   void SetDuration(int Duration);
   void SetVps(time_t Vps);
   void SetSeen(void);
-  void Dump(FILE *f, const char *Prefix = "") const;
+  void Dump(FILE *f, const char *Prefix = "", bool InfoOnly = false) const;
+  bool Parse(char *s);
   static bool Read(FILE *f, cSchedule *Schedule);
   void FixEpgBugs(void);
   };
@@ -109,6 +111,8 @@ class cSchedule : public cListObject  {
 private:
   tChannelID channelID;
   cList<cEvent> events;
+  cHash<cEvent> eventsHashID;
+  cHash<cEvent> eventsHashStartTime;
   bool hasRunning;
   time_t modified;
   time_t presentSeen;
@@ -127,6 +131,9 @@ class cSchedule : public cListObject  {
   void Cleanup(time_t Time);
   void Cleanup(void);
   cEvent *AddEvent(cEvent *Event);
+  void DelEvent(cEvent *Event);
+  void cSchedule::HashEvent(cEvent *Event);
+  void cSchedule::UnhashEvent(cEvent *Event);
   const cList<cEvent> *Events(void) const { return &events; }
   const cEvent *GetPresentEvent(bool CheckRunningStatus = false) const;
   const cEvent *GetFollowingEvent(bool CheckRunningStatus = false) const;
diff --git a/i18n.c b/i18n.c
index 1d755f130..e1a187dea 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.188 2005/05/05 13:12:54 kls Exp $
+ * $Id: i18n.c 1.191 2005/05/15 14:37:59 kls Exp $
  *
  * Translations provided by:
  *
@@ -399,6 +399,27 @@ const tI18nPhrase Phrases[] = {
     "Kokkuv�te",
     "Omtale",
   },
+  { "Info",
+    "Info",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Schedule - %s",
     "Programm - %s",
     "Program - %s",
@@ -3112,7 +3133,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "�������������� �����������",
     "",//TODO
-    "",//TODO
+    "Video kuvamise formaat",
     "Video display format",
   },
   { "pan&scan",
@@ -3343,7 +3364,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "�������������� ����� (����)",
     "",//TODO
-    "",//TODO
+    "Audio keeled",
     "Audio sprog (ant.)",
   },
   { "Setup.DVB$Audio language",  // note the singular
@@ -3364,7 +3385,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "������",
     "",//TODO
-    "",//TODO
+    "Audio keel",
     "Audio sprog",
   },
   { "Setup.LNB$SLOF (MHz)",
@@ -4039,7 +4060,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 1: Detectant el tipus de receptor",
     "��� 1: ����������� ���� ���� ������",
     "Faza 1: detektiranje k�da daljinskog upravlja�a.",
-    "Aste 1: Koodeerimiss�steemi tuvastamine",
+    "Aste 1: Kodeerimiss�steemi tuvastamine",
     "Fase 1: Detekterer fjernbetjenings-kodetype",
   },
   { "Press any key on the RC unit",
@@ -4081,7 +4102,7 @@ const tI18nPhrase Phrases[] = {
     "Codi detectat!",
     "��������� ��� ������!",
     "K�d daljinskog upravlja�a je prepoznat!",
-    "Koodeerimiss�steem tuvastatud!",
+    "Kodeerimiss�steem tuvastatud!",
     "Fjernbetjenings-kodetype fundet!",
   },
   { "Do not press any key...",
@@ -5049,7 +5070,7 @@ const tI18nPhrase Phrases[] = {
     " Aturar la reproducci�",
     " ���������� ���������������",
     " Prekini reprodukciju",
-    " L�peta kordus",
+    " L�peta taasesitamine",
     " Stop afspilning",
   },
   { " Stop recording ", // note the leading and trailing blanks!
@@ -5259,8 +5280,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "EPG skaneerimine k�ivitatud",
+    "Starter EPG skanning",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
diff --git a/libsi/Makefile b/libsi/Makefile
index fdc630d2d..155421797 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,12 +1,12 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 1.4 2005/05/05 11:01:46 kls Exp $
+# $Id: Makefile 1.5 2005/05/29 11:47:12 kls Exp $
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
 AR = ar
 ARFLAGS = ru
 RANLIB = ranlib
diff --git a/libsi/si.c b/libsi/si.c
index ba97c6e92..90d403032 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.13 2004/10/16 15:12:57 kls Exp $
+ *   $Id: si.c 1.14 2005/05/28 14:11:16 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -114,9 +114,10 @@ Descriptor *DescriptorLoop::getNext(Iterator &it) {
 
 Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool returnUnimplemetedDescriptor) {
    Descriptor *d=0;
-   if (isValid() && it.i<getLength()) {
+   int len;
+   if (isValid() && it.i<(len=getLength())) {
       const unsigned char *p=data.getData(it.i);
-      const unsigned char *end=p+getLength()-it.i;
+      const unsigned char *end=p+len-it.i;
       while (p < end) {
          if (Descriptor::getDescriptorTag(p) == tag) {
             d=createDescriptor(it.i, returnUnimplemetedDescriptor);
@@ -132,9 +133,10 @@ Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag tag, bool return
 
 Descriptor *DescriptorLoop::getNext(Iterator &it, DescriptorTag *tags, int arrayLength, bool returnUnimplementedDescriptor) {
    Descriptor *d=0;
-   if (isValid() && it.i<getLength()) {
+   int len;
+   if (isValid() && it.i<(len=getLength())) {
       const unsigned char *p=data.getData(it.i);
-      const unsigned char *end=p+getLength()-it.i;
+      const unsigned char *end=p+len-it.i;
       while (p < end) {
          for (int u=0; u<arrayLength;u++)
             if (Descriptor::getDescriptorTag(p) == tags[u]) {
@@ -211,15 +213,17 @@ bool DescriptorGroup::isComplete() {
 }
 
 char *String::getText() {
-   if (getLength() < 0 || getLength() >4095)
+   int len=getLength();
+   if (len < 0 || len > 4095)
       return strdup("text error"); // caller will delete it!
-   char *data=new char(getLength()+1);
-   decodeText(data, getLength()+1);
+   char *data=new char(len+1);
+   decodeText(data, len+1);
    return data;
 }
 
 char *String::getText(char *buffer, int size) {
-   if (getLength() < 0 || getLength() >= size) {
+   int len=getLength();
+   if (len < 0 || len >= size) {
       strncpy(buffer, "text error", size);
       buffer[size-1] = 0;
       return buffer;
@@ -230,7 +234,8 @@ char *String::getText(char *buffer, int size) {
 
 //taken from VDR, Copyright Klaus Schmidinger <kls@cadsoft.de>
 char *String::getText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion) {
-   if (getLength() < 0 || getLength() >= sizeBuffer) {
+   int len=getLength();
+   if (len < 0 || len >= sizeBuffer) {
       strncpy(buffer, "text error", sizeBuffer);
       buffer[sizeBuffer-1] = 0;
       *shortVersion = 0;
@@ -254,7 +259,8 @@ void String::decodeText(char *buffer, int size) {
    if (*from == 0x10)
       from += 3; // skips code table info
 
-   for (int i = 0; i < getLength(); i++) {
+   int len=getLength();
+   for (int i = 0; i < len; i++) {
       if (*from == 0)
          break;
       if (    ((' ' <= *from) && (*from <= '~'))
@@ -281,9 +287,8 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
    if (*from == 0x10)
       from += 3; // skips code table info
 
-   for (int i = 0; i < getLength(); i++) {
-      if (*from == 0)
-         break;
+   int len=getLength();
+   for (int i = 0; i < len; i++) {
       if (    ((' ' <= *from) && (*from <= '~'))
            || (*from == '\n')
            || (0xA0 <= *from)
@@ -299,6 +304,8 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
          IsShortName++;
       else if (*from == 0x87)
          IsShortName--;
+      else if (*from == 0)
+         break;
       from++;
       if (to - buffer >= sizeBuffer - 1 || toShort - shortVersion >= sizeShortVersion - 1)
          break;
diff --git a/libsi/util.c b/libsi/util.c
index c6ad234ad..346579489 100644
--- a/libsi/util.c
+++ b/libsi/util.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.c 1.4 2004/10/16 09:58:41 kls Exp $
+ *   $Id: util.c 1.5 2005/05/28 14:15:29 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -263,9 +263,10 @@ u_int32_t CRC32::crc_table[256] = {
 u_int32_t CRC32::crc32 (const char *d, int len, u_int32_t crc)
 {
    register int i;
+   const unsigned char *u=(unsigned char*)d; // Saves '& 0xff'
 
    for (i=0; i<len; i++)
-      crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *d++) & 0xff];
+      crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *u++)];
 
    return crc;
 }
diff --git a/menu.c b/menu.c
index 30183dfc8..e36cc65f0 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.348 2005/03/20 15:14:51 kls Exp $
+ * $Id: menu.c 1.349 2005/05/16 13:59:03 kls Exp $
  */
 
 #include "menu.h"
@@ -872,7 +872,6 @@ eOSState cMenuTimers::Summary(void)
   cTimer *ti = CurrentTimer();
   if (ti && !isempty(ti->Summary()))
      return AddSubMenu(new cMenuText(tr("Summary"), ti->Summary()));
-     //XXX cSkin::SetRecording()???
   return Edit(); // convenience for people not using the Summary feature ;-)
 }
 
@@ -1297,8 +1296,12 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:  return Execute();
-       default:   break;
+       case kRed:
+       case kGreen:
+       case kYellow:
+       case kBlue:   return osContinue;
+       case kOk:     return Execute();
+       default:      break;
        }
      }
   return state;
@@ -1430,6 +1433,63 @@ cOsdObject *CamControl(void)
   return NULL;
 }
 
+// --- cMenuRecording --------------------------------------------------------
+
+class cMenuRecording : public cOsdMenu {
+private:
+  const cRecording *recording;
+public:
+  cMenuRecording(const cRecording *Recording);
+  virtual void Display(void);
+  virtual eOSState ProcessKey(eKeys Key);
+};
+
+cMenuRecording::cMenuRecording(const cRecording *Recording)
+:cOsdMenu(tr("Recording"))
+{
+  recording = Recording;
+  if (recording)
+     SetHelp(tr("Play"), tr("Rewind"));
+}
+
+void cMenuRecording::Display(void)
+{
+  cOsdMenu::Display();
+  DisplayMenu()->SetRecording(recording);
+  cStatus::MsgOsdTextItem(recording->Info()->Description());
+}
+
+eOSState cMenuRecording::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:
+    case kLeft|k_Repeat:
+    case kLeft:
+    case kRight|k_Repeat:
+    case kRight:
+                  DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
+                  return osContinue;
+    default: break;
+    }
+
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kRed:    Key = kOk; // will play the recording, even if recording commands are defined
+       case kGreen:  cRemote::Put(Key, true);
+                     // continue with osBack to close the info menu and process the key
+       case kOk:     return osBack;
+       default: break;
+       }
+     }
+  return state;
+}
+
 // --- cMenuRecordingItem ----------------------------------------------------
 
 class cMenuRecordingItem : public cOsdItem {
@@ -1530,7 +1590,7 @@ void cMenuRecordings::SetHelpKeys(void)
      else {
         NewHelpKeys = 2;
         cRecording *recording = GetRecording(ri);
-        if (recording && recording->Summary())
+        if (recording && recording->Info()->Title())
            NewHelpKeys = 3;
         }
      }
@@ -1539,7 +1599,7 @@ void cMenuRecordings::SetHelpKeys(void)
        case 0: SetHelp(NULL); break;
        case 1: SetHelp(tr("Open")); break;
        case 2:
-       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Summary") : NULL);
+       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Info") : NULL);
        }
      helpKeys = NewHelpKeys;
      }
@@ -1644,15 +1704,15 @@ eOSState cMenuRecordings::Delete(void)
   return osContinue;
 }
 
-eOSState cMenuRecordings::Summary(void)
+eOSState cMenuRecordings::Info(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
      cRecording *recording = GetRecording(ri);
-     if (recording && recording->Summary() && *recording->Summary())
-        return AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
+     if (recording && recording->Info()->Title())
+        return AddSubMenu(new cMenuRecording(recording));
      }
   return osContinue;
 }
@@ -1689,7 +1749,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kRed:    return (helpKeys > 1 && RecordingCommands.Count()) ? Commands() : Play();
        case kGreen:  return Rewind();
        case kYellow: return Delete();
-       case kBlue:   return Summary();
+       case kBlue:   return Info();
        case k1...k9: return Commands(Key);
        default: break;
        }
@@ -2568,36 +2628,43 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 
 // --- SetTrackDescriptions --------------------------------------------------
 
-static void SetTrackDescriptions(void)
+static void SetTrackDescriptions(bool Live)
 {
   cDevice::PrimaryDevice()->ClrAvailableTracks(true);
-  cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
-  if (Channel) {
-     cSchedulesLock SchedulesLock;
-     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-     if (Schedules) {
-        const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
-        if (Schedule) {
-           const cEvent *Present = Schedule->GetPresentEvent(true);
-           if (Present) {
-              const cComponents *Components = Present->Components();
-              if (Components) {
-                 int indexAudio = 0;
-                 int indexDolby = 0;
-                 for (int i = 0; i < Components->NumComponents(); i++) {
-                     const tComponent *p = Components->Component(i);
-                     if (p->stream == 2) {
-                        if (p->type == 0x05)
-                           cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, NULL, p->description);
-                        else
-                           cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, NULL, p->description);
-                        }
-                     }
-                 }
+  const cComponents *Components = NULL;
+  cSchedulesLock SchedulesLock;
+  if (Live) {
+     cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
+     if (Channel) {
+        const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+        if (Schedules) {
+           const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+           if (Schedule) {
+              const cEvent *Present = Schedule->GetPresentEvent(true);
+              if (Present)
+                 Components = Present->Components();
               }
            }
         }
      }
+  else if (cReplayControl::LastReplayed()) {
+     cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
+     if (Recording)
+        Components = Recording->Info()->Components();
+     }
+  if (Components) {
+     int indexAudio = 0;
+     int indexDolby = 0;
+     for (int i = 0; i < Components->NumComponents(); i++) {
+         const tComponent *p = Components->Component(i);
+         if (p->stream == 2) {
+            if (p->type == 0x05)
+               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, NULL, p->description);
+            else
+               cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, NULL, p->description);
+            }
+         }
+     }
 }
 
 // --- cDisplayChannel -------------------------------------------------------
@@ -2657,7 +2724,7 @@ void cDisplayChannel::DisplayInfo(void)
            const cEvent *Present = Schedule->GetPresentEvent(true);
            const cEvent *Following = Schedule->GetFollowingEvent(true);
            if (Present != lastPresent || Following != lastFollowing) {
-              SetTrackDescriptions();
+              SetTrackDescriptions(true);
               displayChannel->SetEvents(Present, Following);
               cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
               lastPresent = Present;
@@ -2877,9 +2944,7 @@ cDisplayTracks::cDisplayTracks(void)
 :cOsdObject(true)
 {
   cDevice::PrimaryDevice()->EnsureAudioTrack();
-  // Get the actual audio track descriptions from the EPG if we're not replaying:
-  if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice())
-     SetTrackDescriptions();
+  SetTrackDescriptions(!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice());
   currentDisplayTracks = this;
   numTracks = track = 0;
   audioChannel = cDevice::PrimaryDevice()->GetAudioChannel();
@@ -2994,6 +3059,11 @@ eOSState cDisplayTracks::ProcessKey(eKeys Key)
 
 cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
 {
+  // We're going to manipulate an event here, so we need to prevent
+  // others from modifying any EPG data:
+  cSchedulesLock SchedulesLock;
+  cSchedules::Schedules(SchedulesLock);
+
   event = NULL;
   instantId = NULL;
   fileName = NULL;
@@ -3011,16 +3081,9 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   timer->SetRecording(true);
   event = timer->Event();
 
-  const char *Title = NULL;
-  const char *Subtitle = NULL;
-  const char *Summary = NULL;
-  if (event || GetEvent()) {
-     Title = event->Title();
-     Subtitle = event->ShortText();
-     Summary = event->Description();
-     dsyslog("Title: '%s' Subtitle: '%s'", Title, Subtitle);
-     }
-  cRecording Recording(timer, Title, Subtitle, Summary);
+  if (event || GetEvent())
+     dsyslog("Title: '%s' Subtitle: '%s'", event->Title(), event->ShortText());
+  cRecording Recording(timer, event);
   fileName = strdup(Recording.FileName());
 
   // crude attempt to avoid duplicate recordings:
@@ -3047,7 +3110,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      const cChannel *ch = timer->Channel();
      recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apids(), ch->Dpids(), ch->Spids());
      if (device->AttachReceiver(recorder)) {
-        Recording.WriteSummary();
+        Recording.WriteInfo();
         cStatus::MsgRecording(device, Recording.Name());
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName, Recording.Name());
diff --git a/menu.h b/menu.h
index d142bbc45..93712e4e7 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.69 2005/03/20 10:57:29 kls Exp $
+ * $Id: menu.h 1.70 2005/05/15 14:34:54 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -133,7 +133,7 @@ class cMenuRecordings : public cOsdMenu {
   eOSState Play(void);
   eOSState Rewind(void);
   eOSState Delete(void);
-  eOSState Summary(void);
+  eOSState Info(void);
   eOSState Commands(eKeys Key = kNone);
 public:
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
diff --git a/osd.c b/osd.c
index ff0b5657f..2d125971d 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.59 2004/12/19 12:27:38 kls Exp $
+ * $Id: osd.c 1.60 2005/05/14 11:16:30 kls Exp $
  */
 
 #include "osd.h"
@@ -574,7 +574,7 @@ const tIndex *cBitmap::Data(int x, int y)
 
 // --- cOsd ------------------------------------------------------------------
 
-bool cOsd::isOpen = false;
+int cOsd::isOpen = 0;
 
 cOsd::cOsd(int Left, int Top)
 {
@@ -585,7 +585,7 @@ cOsd::cOsd(int Left, int Top)
   left = Left;
   top = Top;
   width = height = 0;
-  isOpen = true;
+  isOpen++;
 }
 
 cOsd::~cOsd()
@@ -593,7 +593,7 @@ cOsd::~cOsd()
   for (int i = 0; i < numBitmaps; i++)
       delete bitmaps[i];
   delete savedRegion;
-  isOpen = false;
+  isOpen--;
 }
 
 cBitmap *cOsd::GetBitmap(int Area)
diff --git a/osd.h b/osd.h
index bd69084f7..2f5de4d0a 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.47 2004/10/16 10:33:44 kls Exp $
+ * $Id: osd.h 1.48 2005/05/14 11:15:55 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -210,7 +210,7 @@ struct tArea {
 class cOsd {
   friend class cOsdProvider;
 private:
-  static bool isOpen;
+  static int isOpen;
   cBitmap *savedRegion;
   cBitmap *bitmaps[MAXOSDAREAS];
   int numBitmaps;
@@ -235,7 +235,7 @@ class cOsd {
 public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
-  static bool IsOpen(void) { return isOpen; }
+  static int IsOpen(void) { return isOpen; }
   int Left(void) { return left; }
   int Top(void) { return top; }
   int Width(void) { return width; }
diff --git a/player.h b/player.h
index 6b08178fa..4316a7534 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.16 2005/02/12 14:45:29 kls Exp $
+ * $Id: player.h 1.17 2005/05/22 11:07:42 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -29,6 +29,7 @@ class cPlayer {
   void DevicePlay(void) { if (device) device->Play(); }
   void DeviceFreeze(void) { if (device) device->Freeze(); }
   void DeviceMute(void) { if (device) device->Mute(); }
+  void DeviceSetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat) { if (device) device->SetVideoDisplayFormat(VideoDisplayFormat); }
   void DeviceStillPicture(const uchar *Data, int Length) { if (device) device->StillPicture(Data, Length); }
   void Detach(void);
   virtual void Activate(bool On) {}
diff --git a/recording.c b/recording.c
index ed74c462c..93b0af8f8 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.98 2005/05/07 15:25:15 kls Exp $
+ * $Id: recording.c 1.107 2005/05/29 11:16:57 kls Exp $
  */
 
 #include "recording.h"
@@ -23,6 +23,8 @@
 #include "tools.h"
 #include "videodir.h"
 
+#define SUMMARYFALLBACK
+
 #define RECEXT       ".rec"
 #define DELEXT       ".del"
 /* This was the original code, which works fine in a Linux only environment.
@@ -45,7 +47,10 @@
 // end of implementation for brain dead systems
 
 #define RESUMEFILESUFFIX  "/resume%s%s.vdr"
+#ifdef SUMMARYFALLBACK
 #define SUMMARYFILESUFFIX "/summary.vdr"
+#endif
+#define INFOFILESUFFIX    "/info.vdr"
 #define MARKSFILESUFFIX   "/marks.vdr"
 
 #define MINDISKSPACE 1024 // MB
@@ -213,6 +218,68 @@ void cResumeFile::Delete(void)
      }
 }
 
+// --- cRecordingInfo --------------------------------------------------------
+
+cRecordingInfo::cRecordingInfo(const cEvent *Event)
+{
+  if (Event) {
+     event = Event;
+     channelID = event->ChannelID();
+     ownEvent = NULL;
+     }
+  else
+     event = ownEvent = new cEvent(0);
+}
+
+cRecordingInfo::~cRecordingInfo()
+{
+  delete ownEvent;
+}
+
+void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description)
+{
+  if (!isempty(Title))
+     ((cEvent *)event)->SetTitle(Title);
+  if (!isempty(ShortText))
+     ((cEvent *)event)->SetShortText(ShortText);
+  if (!isempty(Description))
+     ((cEvent *)event)->SetDescription(Description);
+}
+
+bool cRecordingInfo::Read(FILE *f)
+{
+  if (ownEvent) {
+     cReadLine ReadLine;
+     char *s;
+     while ((s = ReadLine.Read(f)) != NULL) {
+           char *t = skipspace(s + 1);
+           switch (*s) {
+             case 'C': {
+                         char *p = strchr(t, ' ');
+                         if (p)
+                            *p = 0; // strips optional channel name
+                         if (*t)
+                            channelID = tChannelID::FromString(t);
+                       }
+                       break;
+             default: if (!ownEvent->Parse(s))
+                         return false;
+                      break;
+             }
+           }
+     return true;
+     }
+  return false;
+}
+
+bool cRecordingInfo::Write(FILE *f, const char *Prefix) const
+{
+  if (channelID.Valid())
+     fprintf(f, "%sC %s\n", Prefix, *channelID.ToString());
+  event->Dump(f, Prefix, true);
+  return true;
+}
+
 // --- cRecording ------------------------------------------------------------
 
 #define RESUME_NOT_INITIALIZED (-2)
@@ -308,7 +375,7 @@ static char *ExchangeChars(char *s, bool ToFileSystem)
   return s;
 }
 
-cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, const char *Summary)
+cRecording::cRecording(cTimer *Timer, const cEvent *Event)
 {
   resume = RESUME_NOT_INITIALIZED;
   titleBuffer = NULL;
@@ -316,7 +383,8 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   fileName = NULL;
   name = NULL;
   // set up the actual name:
-  const char *OriginalSubtitle = Subtitle;
+  const char *Title = Event ? Event->Title() : NULL;
+  const char *Subtitle = Event ? Event->ShortText() : NULL;
   char SubtitleBuffer[MAX_SUBTITLE_LENGTH];
   if (isempty(Title))
      Title = Timer->Channel()->Name();
@@ -333,6 +401,14 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
      name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
      name = strreplace(name, TIMERMACRO_EPISODE, Subtitle);
+     // avoid blanks at the end:
+     int l = strlen(name);
+     while (l-- > 2) {
+           if (name[l] == ' ' && name[l - 1] != '~')
+              name[l] = 0;
+           else
+              break;
+           }
      if (Timer->IsSingleEvent()) {
         Timer->SetFile(name); // this was an instant recording, so let's set the actual data
         Timers.SetModified();
@@ -347,17 +423,13 @@ cRecording::cRecording(cTimer *Timer, const char *Title, const char *Subtitle, c
   start = Timer->StartTime();
   priority = Timer->Priority();
   lifetime = Timer->Lifetime();
-  // handle summary:
-  summary = !isempty(Timer->Summary()) ? strdup(Timer->Summary()) : NULL;
-  if (!summary) {
-     Subtitle = OriginalSubtitle;
-     if (isempty(Subtitle))
-        Subtitle = "";
-     if (isempty(Summary))
-        Summary = "";
-     if (*Subtitle || *Summary)
-        asprintf(&summary, "%s\n\n%s%s%s", Title, Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
-     }
+  // handle info:
+  info = new cRecordingInfo(Event);
+  // this is a somewhat ugly hack to get the 'summary' information from the
+  // timer into the recording info, but it saves us from having to actually
+  // copy the entire event data:
+  if (!isempty(Timer->Summary()))
+     info->SetData(isempty(info->Title()) ? Timer->File() : NULL, NULL, Timer->Summary());
 }
 
 cRecording::cRecording(const char *FileName)
@@ -370,7 +442,7 @@ cRecording::cRecording(const char *FileName)
   char *p = strrchr(FileName, '/');
 
   name = NULL;
-  summary = NULL;
+  info = new cRecordingInfo;
   if (p) {
      time_t now = time(NULL);
      struct tm tm_r;
@@ -386,39 +458,57 @@ cRecording::cRecording(const char *FileName)
         name[p - FileName] = 0;
         name = ExchangeChars(name, false);
         }
-     // read an optional summary file:
-     char *SummaryFileName = NULL;
-     asprintf(&SummaryFileName, "%s%s", fileName, SUMMARYFILESUFFIX);
-     int f = open(SummaryFileName, O_RDONLY);
-     if (f >= 0) {
-        struct stat buf;
-        if (fstat(f, &buf) == 0) {
-           int size = buf.st_size;
-           summary = MALLOC(char, size + 1); // +1 for terminating 0
-           if (summary) {
-              int rbytes = safe_read(f, summary, size);
-              if (rbytes >= 0) {
-                 summary[rbytes] = 0;
-                 if (rbytes != size)
-                    esyslog("%s: expected %d bytes but read %d", SummaryFileName, size, rbytes);
-                 }
-              else {
-                 LOG_ERROR_STR(SummaryFileName);
-                 free(summary);
-                 summary = NULL;
+     // read an optional info file:
+     char *InfoFileName = NULL;
+     asprintf(&InfoFileName, "%s%s", fileName, INFOFILESUFFIX);
+     FILE *f = fopen(InfoFileName, "r");
+     if (f) {
+        info->Read(f);
+        fclose(f);
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR_STR(InfoFileName);
+     free(InfoFileName);
+#ifdef SUMMARYFALLBACK
+     // fall back to the old 'summary.vdr' if there was no 'info.vdr':
+     if (isempty(info->Title())) {
+        char *SummaryFileName = NULL;
+        asprintf(&SummaryFileName, "%s%s", fileName, SUMMARYFILESUFFIX);
+        FILE *f = fopen(SummaryFileName, "r");
+        if (f) {
+           int line = 0;
+           char *data[3] = { NULL };
+           cReadLine ReadLine;
+           char *s;
+           while ((s = ReadLine.Read(f)) != NULL && line < 3) {
+                 if (*s) {
+                    if (data[line]) {
+                       int len = strlen(s);
+                       len += strlen(data[line]) + 1;
+                       data[line] = (char *)realloc(data[line], len + 1);
+                       strcat(data[line], "\n");
+                       strcat(data[line], s);
+                       }
+                    else
+                       data[line] = strdup(s);
+                    }
+                 else
+                    line++;
                  }
-
+           fclose(f);
+           if (line == 1) {
+              data[2] = data[1];
+              data[1] = NULL;
               }
-           else
-              esyslog("can't allocate %d byte of memory for summary file '%s'", size + 1, SummaryFileName);
-           close(f);
+           info->SetData(data[0], data[1], data[2]);
+           for (int i = 0; i < 3; i ++)
+               free(data[i]);
            }
-        else
+        else if (errno != ENOENT)
            LOG_ERROR_STR(SummaryFileName);
+        free(SummaryFileName);
         }
-     else if (errno != ENOENT)
-        LOG_ERROR_STR(SummaryFileName);
-     free(SummaryFileName);
+#endif
      }
 }
 
@@ -428,7 +518,7 @@ cRecording::~cRecording()
   free(sortBuffer);
   free(fileName);
   free(name);
-  free(summary);
+  delete info;
 }
 
 char *cRecording::StripEpisodeName(char *s)
@@ -513,7 +603,8 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
                             Delimiter,
                             s);
      // let's not display a trailing '~':
-     stripspace(titleBuffer);
+     if (!NewIndicator)
+        stripspace(titleBuffer);
      s = &titleBuffer[strlen(titleBuffer) - 1];
      if (*s == '~')
         *s = 0;
@@ -568,21 +659,18 @@ bool cRecording::IsEdited(void) const
   return *s == '%';
 }
 
-bool cRecording::WriteSummary(void)
+bool cRecording::WriteInfo(void)
 {
-  if (summary) {
-     char *SummaryFileName = NULL;
-     asprintf(&SummaryFileName, "%s%s", fileName, SUMMARYFILESUFFIX);
-     FILE *f = fopen(SummaryFileName, "w");
-     if (f) {
-        if (fputs(summary, f) < 0)
-           LOG_ERROR_STR(SummaryFileName);
-        fclose(f);
-        }
-     else
-        LOG_ERROR_STR(SummaryFileName);
-     free(SummaryFileName);
+  char *InfoFileName = NULL;
+  asprintf(&InfoFileName, "%s%s", fileName, INFOFILESUFFIX);
+  FILE *f = fopen(InfoFileName, "w");
+  if (f) {
+     info->Write(f);
+     fclose(f);
      }
+  else
+     LOG_ERROR_STR(InfoFileName);
+  free(InfoFileName);
   return true;
 }
 
@@ -956,7 +1044,7 @@ bool cIndexFile::CatchUp(int Index)
             LOG_ERROR_STR(fileName);
          if (Index < last - (i ? 2 * INDEXSAFETYLIMIT : 0) || Index > 10 * INDEXSAFETYLIMIT) // keep off the end in case of "Pause live video"
             break;
-         sleep(1);
+         cCondWait::SleepMs(1000);
          }
      }
   return index != NULL;
diff --git a/recording.h b/recording.h
index be1a5c44c..0adb036ea 100644
--- a/recording.h
+++ b/recording.h
@@ -4,14 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.34 2005/01/16 15:11:31 kls Exp $
+ * $Id: recording.h 1.38 2005/05/28 09:34:07 kls Exp $
  */
 
 #ifndef __RECORDING_H
 #define __RECORDING_H
 
 #include <time.h>
+#include "channels.h"
 #include "config.h"
+#include "epg.h"
 #include "thread.h"
 #include "timers.h"
 #include "tools.h"
@@ -32,6 +34,24 @@ class cResumeFile {
   void Delete(void);
   };
 
+class cRecordingInfo {
+  friend class cRecording;
+private:
+  tChannelID channelID;
+  const cEvent *event;
+  cEvent *ownEvent;
+  cRecordingInfo(const cEvent *Event = NULL);
+  void SetData(const char *Title, const char *ShortText, const char *Description);
+public:
+  ~cRecordingInfo();
+  const char *Title(void) const { return event->Title(); }
+  const char *ShortText(void) const { return event->ShortText(); }
+  const char *Description(void) const { return event->Description(); }
+  const cComponents *Components(void) const { return event->Components(); }
+  bool Read(FILE *f);
+  bool Write(FILE *f, const char *Prefix = "") const;
+  };
+
 class cRecording : public cListObject {
 private:
   mutable int resume;
@@ -39,7 +59,7 @@ class cRecording : public cListObject {
   mutable char *sortBuffer;
   mutable char *fileName;
   mutable char *name;
-  char *summary;
+  cRecordingInfo *info;
   static char *StripEpisodeName(char *s);
   char *SortName(void) const;
   int GetResume(void) const;
@@ -47,19 +67,19 @@ class cRecording : public cListObject {
   time_t start;
   int priority;
   int lifetime;
-  cRecording(cTimer *Timer, const char *Title, const char *Subtitle, const char *Summary);
+  cRecording(cTimer *Timer, const cEvent *Event);
   cRecording(const char *FileName);
   ~cRecording();
   virtual int Compare(const cListObject &ListObject) const;
   const char *Name(void) const { return name; }
   const char *FileName(void) const;
   const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
-  const char *Summary(void) const { return summary; }
+  const cRecordingInfo *Info(void) const { return info; }
   const char *PrefixFileName(char Prefix);
   int HierarchyLevels(void) const;
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
-  bool WriteSummary(void);
+  bool WriteInfo(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
        // Returns false in case of error
diff --git a/sdt.c b/sdt.c
index 8bb700928..dcf6dc1bc 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.13 2004/10/31 12:10:20 kls Exp $
+ * $Id: sdt.c 1.14 2005/05/14 09:39:46 kls Exp $
  */
 
 #include "sdt.h"
@@ -62,6 +62,15 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         sd->serviceName.getText(NameBuf, ShortNameBuf, sizeof(NameBuf), sizeof(ShortNameBuf));
                         char *pn = compactspace(NameBuf);
                         char *ps = compactspace(ShortNameBuf);
+                        if (!*ps && cSource::IsCable(Source())) {
+                           // Some cable providers don't mark short channel names according to the
+                           // standard, but rather go their own way and use "name>short name":
+                           char *p = strchr(pn, '>');
+                           if (p && p > pn) {
+                              *p++ = 0;
+                              strcpy(ShortNameBuf, p);
+                              }
+                           }
                         sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
                         char *pp = compactspace(ProviderNameBuf);
                         if (channel) {
diff --git a/sections.c b/sections.c
index 7c42a6efa..6552d56ea 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.10 2004/10/24 11:05:12 kls Exp $
+ * $Id: sections.c 1.11 2005/05/29 11:43:17 kls Exp $
  */
 
 #include "sections.h"
@@ -167,6 +167,7 @@ void cSectionHandler::SetStatus(bool On)
 void cSectionHandler::Action(void)
 {
   active = true;
+  SetPriority(19);
   while (active) {
 
         Lock();
diff --git a/skinclassic.c b/skinclassic.c
index 7eb0513b9..fd3ab0b1a 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.11 2005/01/09 11:56:29 kls Exp $
+ * $Id: skinclassic.c 1.12 2005/05/16 10:45:07 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -326,7 +326,33 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
 
 void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
 {
-  SetText(Recording->Summary(), false); //TODO
+  if (!Recording)
+     return;
+  const cRecordingInfo *Info = Recording->Info();
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xl = x0 + 10;
+  int y = y2;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
+  ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
+  y += ts.Height();
+  y += font->Height();
+  const char *Title = Info->Title();
+  if (isempty(Title))
+     Title = Recording->Name();
+  ts.Set(osd, xl, y, x1 - xl, y3 - y, Title, font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (!isempty(Info->ShortText())) {
+     const cFont *font = cFont::GetFont(fontSml);
+     ts.Set(osd, xl, y, x1 - xl, y3 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+     y += ts.Height();
+     }
+  y += font->Height();
+  if (!isempty(Info->Description())) {
+     textScroller.Set(osd, xl, y, x1 - xl - 2 * ScrollWidth, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
+     SetScrollbar();
+     }
 }
 
 void cSkinClassicDisplayMenu::SetText(const char *Text, bool FixedFont)
diff --git a/skins.h b/skins.h
index add8d56ad..5fc634430 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.7 2005/02/27 14:37:37 kls Exp $
+ * $Id: skins.h 1.8 2005/05/15 14:41:41 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -150,7 +150,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< that text if necessary.
   virtual void SetRecording(const cRecording *Recording) = 0;
        ///< Sets the Recording that shall be displayed, using the entire central area
-       ///< of the menu. The Recording's 'summary' shall be displayed using a
+       ///< of the menu. The Recording's 'description' shall be displayed using a
        ///< cTextScroller, and the Scroll() function will be called to drive scrolling
        ///< that text if necessary.
   virtual void SetText(const char *Text, bool FixedFont) = 0;
diff --git a/skinsttng.c b/skinsttng.c
index 3760ad4da..b9d9ccbbb 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.13 2005/02/27 14:45:19 kls Exp $
+ * $Id: skinsttng.c 1.14 2005/05/16 10:44:58 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -576,7 +576,39 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
 
 void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
 {
-  SetText(Recording->Summary(), false); //XXX
+  if (!Recording)
+     return;
+  const cRecordingInfo *Info = Recording->Info();
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xl = x3 + 5;
+  int y = y3;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
+  ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
+  y += ts.Height();
+  y += font->Height();
+  const char *Title = Info->Title();
+  if (isempty(Title))
+     Title = Recording->Name();
+  ts.Set(osd, xl, y, x4 - xl, y4 - y, Title, font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (!isempty(Info->ShortText())) {
+     const cFont *font = cFont::GetFont(fontSml);
+     ts.Set(osd, xl, y, x4 - xl, y4 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+     y += ts.Height();
+     }
+  y += font->Height();
+  if (!isempty(Info->Description())) {
+     int yt = y;
+     int yb = y4 - Roundness;
+     textScroller.Set(osd, xl, yt, x4 - xl, yb - yt, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
+     yb = yt + textScroller.Height();
+     osd->DrawEllipse  (x1, yt - Roundness, x2, yt,             frameColor, -3);
+     osd->DrawRectangle(x1, yt,             x2, yb,             frameColor);
+     osd->DrawEllipse  (x1, yb,             x2, yb + Roundness, frameColor, -2);
+     SetScrollbar();
+     }
 }
 
 void cSkinSTTNGDisplayMenu::SetText(const char *Text, bool FixedFont)
diff --git a/sources.h b/sources.h
index 22076ea76..ae941f84f 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 1.3 2004/12/26 11:59:21 kls Exp $
+ * $Id: sources.h 1.4 2005/05/14 09:30:41 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -35,6 +35,9 @@ class cSource : public cListObject {
   static cString ToString(int Code);
   static int FromString(const char *s);
   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
+  static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
+  static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
+  static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }
   };
 
 class cSources : public cConfig<cSource> {
diff --git a/summary2info.pl b/summary2info.pl
new file mode 100755
index 000000000..8e80abe08
--- /dev/null
+++ b/summary2info.pl
@@ -0,0 +1,47 @@
+#!/usr/bin/perl
+
+# Convert 'summary.vdr' files to 'info.vdr'
+#
+# Converts all 'summary.vdr' files in the video directory to the
+# 'info.vdr' format as used from VDR version 1.3.25 upward.
+#
+# Usage: summary2info.pl /video
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: summary2info.pl 1.2 2005/05/22 10:37:47 kls Exp $
+
+$VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
+
+@SummaryFiles = `find "$VideoDir" -name summary.vdr`;
+
+for $SummaryFile (@SummaryFiles) {
+    chomp($SummaryFile);
+    print STDERR "converting $SummaryFile...";
+    open(F, $SummaryFile) || die "$SummaryFile: $!\n";
+    $line = 0;
+    @data = ();
+    while (<F>) {
+          chomp;
+          if ($_) {
+             $data[$line] .= '|' if ($data[$line]);
+             $data[$line] .= $_;
+             }
+          else {
+             $line++;
+             }
+          }
+    close(F);
+    if ($line == 1) {
+       $data[2] = $data[1];
+       $data[1] = "";
+       }
+    ($InfoFile = $SummaryFile) =~ s/summary\.vdr$/info.vdr/;
+    open(F, ">$InfoFile") || die "$InfoFile: $!\n";
+    print F "T $data[0]\n" if ($data[0]);
+    print F "S $data[1]\n" if ($data[1]);
+    print F "D $data[2]\n" if ($data[2]);
+    close(F);
+    print STDERR "done.\n";
+    }
diff --git a/svdrp.c b/svdrp.c
index 5104026f5..a63a575d0 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.70 2005/05/06 13:47:39 kls Exp $
+ * $Id: svdrp.c 1.72 2005/05/26 09:59:09 kls Exp $
  */
 
 #include "svdrp.h"
@@ -31,6 +31,7 @@
 #include "device.h"
 #include "eitscan.h"
 #include "keys.h"
+#include "menu.h"
 #include "remote.h"
 #include "timers.h"
 #include "tools.h"
@@ -214,7 +215,7 @@ const char *HelpPages[] = {
   "    events at the given time (which must be in time_t form).",
   "LSTR [ <number> ]\n"
   "    List recordings. Without option, all recordings are listed. Otherwise\n"
-  "    the summary for the given recording is listed.",
+  "    the information for the given recording is listed.",
   "LSTT [ <number> ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed.",
@@ -281,7 +282,7 @@ const char *HelpPages[] = {
 /* SVDRP Reply Codes:
 
  214 Help message
- 215 EPG data record
+ 215 EPG or recording data record
  220 VDR service ready
  221 VDR service closing transmission channel
  250 Requested VDR action okay, completed
@@ -505,12 +506,17 @@ void cSVDRP::CmdDELR(const char *Option)
      if (isnumber(Option)) {
         cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
-           if (recording->Delete()) {
-              Reply(250, "Recording \"%s\" deleted", Option);
-              ::Recordings.Load(); // must make sure the global recordings list is updated
+           cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
+           if (!rc) {
+              if (recording->Delete()) {
+                 Reply(250, "Recording \"%s\" deleted", Option);
+                 ::Recordings.Load(); // must make sure the global recordings list is updated
+                 }
+              else
+                 Reply(554, "Error while deleting recording!");
               }
            else
-              Reply(554, "Error while deleting recording!");
+              Reply(550, "Recording \"%s\" is in use by timer %d", Option, rc->Timer()->Index() + 1);
            }
         else
            Reply(550, "Recording \"%s\" not found%s", Option, Recordings.Count() ? "" : " (use LSTR before deleting)");
@@ -800,13 +806,15 @@ void cSVDRP::CmdLSTR(const char *Option)
      if (isnumber(Option)) {
         cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
-           if (recording->Summary()) {
-              char *summary = strdup(recording->Summary());
-              Reply(250, "%s", strreplace(summary,'\n','|'));
-              free(summary);
+           FILE *f = fdopen(file, "w");
+           if (f) {
+              recording->Info()->Write(f, "215-");
+              fflush(f);
+              Reply(215, "End of recording information");
+              // don't 'fclose(f)' here!
               }
            else
-              Reply(550, "No summary available");
+              Reply(451, "Can't open file connection");
            }
         else
            Reply(550, "Recording \"%s\" not found", Option);
diff --git a/thread.c b/thread.c
index 013b21793..9ac1b7ef6 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.42 2005/05/06 14:39:15 kls Exp $
+ * $Id: thread.c 1.43 2005/05/29 11:40:30 kls Exp $
  */
 
 #include "thread.h"
@@ -208,6 +208,12 @@ cThread::~cThread()
   free(description);
 }
 
+void cThread::SetPriority(int Priority)
+{
+  if (setpriority(PRIO_PROCESS, 0, Priority) < 0)
+     LOG_ERROR;
+}
+
 void cThread::SetDescription(const char *Description, ...)
 {
   free(description);
diff --git a/thread.h b/thread.h
index 2c0ebcba0..48d049908 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.27 2005/01/14 14:02:14 kls Exp $
+ * $Id: thread.h 1.28 2005/05/29 11:31:24 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -82,6 +82,7 @@ class cThread {
   static bool emergencyExitRequested;
   static void *StartThread(cThread *Thread);
 protected:
+  void SetPriority(int Priority);
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
   virtual void Action(void) = 0;
diff --git a/tools.c b/tools.c
index 28ea2afce..55612165d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.91 2005/03/20 14:44:33 kls Exp $
+ * $Id: tools.c 1.95 2005/05/29 10:18:26 kls Exp $
  */
 
 #include "tools.h"
@@ -571,6 +571,25 @@ cString TimeToString(time_t t)
   return "???";
 }
 
+cString DateString(time_t t)
+{
+  char buf[32];
+  struct tm tm_r;
+  tm *tm = localtime_r(&t, &tm_r);
+  char *p = stpcpy(buf, WeekDayName(tm->tm_wday));
+  *p++ = ' ';
+  strftime(p, sizeof(buf) - (p - buf), "%d.%m.%Y", tm);
+  return buf;
+}
+
+cString TimeString(time_t t)
+{
+  char buf[25];
+  struct tm tm_r;
+  strftime(buf, sizeof(buf), "%R", localtime_r(&t, &tm_r));
+  return buf;
+}
+
 // --- cReadLine -------------------------------------------------------------
 
 char *cReadLine::Read(FILE *f)
@@ -913,6 +932,7 @@ int cListObject::Index(void) const
 cListBase::cListBase(void)
 { 
   objects = lastObject = NULL;
+  count = 0;
 }
 
 cListBase::~cListBase()
@@ -933,6 +953,7 @@ void cListBase::Add(cListObject *Object, cListObject *After)
         objects = Object;
      lastObject = Object;
      }
+  count++;
 }
 
 void cListBase::Ins(cListObject *Object, cListObject *Before)
@@ -948,6 +969,7 @@ void cListBase::Ins(cListObject *Object, cListObject *Before)
         lastObject = Object;
      objects = Object;
      }
+  count++;
 }
 
 void cListBase::Del(cListObject *Object, bool DeleteObject)
@@ -959,6 +981,7 @@ void cListBase::Del(cListObject *Object, bool DeleteObject)
   Object->Unlink();
   if (DeleteObject)
      delete Object;
+  count--;
 }
 
 void cListBase::Move(int From, int To)
@@ -998,6 +1021,7 @@ void cListBase::Clear(void)
         objects = object;
         }
   objects = lastObject = NULL;
+  count = 0;
 }
 
 cListObject *cListBase::Get(int Index) const
@@ -1010,18 +1034,6 @@ cListObject *cListBase::Get(int Index) const
   return object;
 }
 
-int cListBase::Count(void) const
-{
-  int n = 0;
-  cListObject *object = objects;
-
-  while (object) {
-        n++;
-        object = object->Next();
-        }
-  return n;
-}
-
 static int CompareListObjects(const void *a, const void *b)
 {
   const cListObject *la = *(const cListObject **)a;
@@ -1043,7 +1055,60 @@ void cListBase::Sort(void)
   objects = lastObject = NULL;
   for (i = 0; i < n; i++) {
       a[i]->Unlink();
+      count--;
       Add(a[i]);
       }
 }
 
+// --- cHashBase -------------------------------------------------------------
+
+cHashBase::cHashBase(int Size)
+{
+  size = Size;
+  hashTable = (cList<cHashObject>**)calloc(size, sizeof(cList<cHashObject>*));
+}
+
+cHashBase::~cHashBase(void)
+{
+  for (int i = 0; i < size; i++)
+      delete hashTable[i];
+  free(hashTable);
+}
+
+void cHashBase::Add(cListObject *Object, unsigned int Id)
+{
+  unsigned int hash = hashfn(Id);
+  if (!hashTable[hash])
+     hashTable[hash] = new cList<cHashObject>;
+  hashTable[hash]->Add(new cHashObject(Object, Id));
+}
+
+void cHashBase::Del(cListObject *Object, unsigned int Id)
+{
+  cList<cHashObject> *list = hashTable[hashfn(Id)];
+  if (list) {
+     for (cHashObject *hob = list->First(); hob; hob = list->Next(hob)) {
+         if (hob->object == Object) {
+            list->Del(hob);
+            break;
+            }
+         }
+     }
+}
+
+cListObject *cHashBase::Get(unsigned int Id) const
+{
+  cList<cHashObject> *list = hashTable[hashfn(Id)];
+  if (list) {
+     for (cHashObject *hob = list->First(); hob; hob = list->Next(hob)) {
+         if (hob->id == Id)
+            return hob->object;
+         }
+     }
+  return NULL;
+}
+
+cList<cHashObject> *cHashBase::GetList(unsigned int Id) const
+{
+  return hashTable[hashfn(Id)];
+}
diff --git a/tools.h b/tools.h
index d9e85f3eb..079e58d0b 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.68 2005/03/20 14:44:24 kls Exp $
+ * $Id: tools.h 1.72 2005/05/29 10:24:54 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -102,6 +102,8 @@ cString WeekDayName(int WeekDay);
 cString WeekDayName(time_t t);
 cString DayDateTime(time_t t = 0);
 cString TimeToString(time_t t);
+cString DateString(time_t t);
+cString TimeString(time_t t);
 
 class cTimeMs {
 private:
@@ -211,6 +213,7 @@ class cListBase {
 protected:
   cListObject *objects, *lastObject;
   cListBase(void);
+  int count;
 public:
   virtual ~cListBase();
   void Add(cListObject *Object, cListObject *After = NULL);
@@ -220,7 +223,7 @@ class cListBase {
   void Move(cListObject *From, cListObject *To);
   virtual void Clear(void);
   cListObject *Get(int Index) const;
-  int Count(void) const;
+  int Count(void) const { return count; }
   void Sort(void);
   };
 
@@ -233,4 +236,36 @@ template<class T> class cList : public cListBase {
   T *Next(const T *object) const { return (T *)object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
   };
 
+class cHashObject : public cListObject {
+  friend class cHashBase;
+private:
+  unsigned int id;
+  cListObject *object;
+public:
+  cHashObject(cListObject *Object, unsigned int Id) { object = Object; id = Id; }
+  };
+
+class cHashBase {
+private:
+  cList<cHashObject> **hashTable;
+  int size;
+  unsigned int hashfn(unsigned int Id) const { return Id % size; }
+protected:
+  cHashBase(int Size);
+public:
+  virtual ~cHashBase();
+  void Add(cListObject *Object, unsigned int Id);
+  void Del(cListObject *Object, unsigned int Id);
+  cListObject *Get(unsigned int Id) const;
+  cList<cHashObject> *GetList(unsigned int Id) const;
+  };
+
+#define HASHSIZE 512
+
+template<class T> class cHash : public cHashBase {
+public:
+  cHash(int Size = HASHSIZE) : cHashBase(Size) {}
+  T *Get(unsigned int Id) const { return (T *)cHashBase::Get(Id); }
+};
+
 #endif //__TOOLS_H
diff --git a/vdr.5 b/vdr.5
index 96136a1ad..5be6da8cb 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.36 2005/05/07 10:40:23 kls Exp $
+.\" $Id: vdr.5 1.37 2005/05/16 14:16:48 kls Exp $
 .\"
 .TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
 .SH NAME
@@ -578,11 +578,13 @@ the current position within the recording, and to implement skipping
 and fast forward/back functions.
 See the definition of the \fBcIndexFile\fR class for details about the
 actual contents of this file.
-.SS SUMMARY
-The file \fIsummary.vdr\fR (if present in a recording directory) contains
+.SS INFO
+The file \fIinfo.vdr\fR (if present in a recording directory) contains
 a description of the recording, derived from the EPG data at recording time
 (if such data was available) or the \fBSummary\fR field of the corresponding
-timer. This is a plain ASCII file and can contain arbitrary text.
+timer. This is a plain ASCII file and contains tagged lines like the \fBEPG DATA\fR
+file (see the description of the \fIepg.data\fR file). Note that the tags
+c, E, e and V will not appear in an \fIinfo.vdr\fR file.
 .SS RESUME
 The file \fIresume.vdr\fR (if present in a recording directory) contains
 the position within the recording where the last replay session left off.
diff --git a/vdr.c b/vdr.c
index 72975e3bd..10a5888f3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.203 2005/03/20 10:58:59 kls Exp $
+ * $Id: vdr.c 1.207 2005/05/26 10:45:29 kls Exp $
  */
 
 #include <getopt.h>
@@ -87,25 +87,6 @@ static void Watchdog(int signum)
 
 int main(int argc, char *argv[])
 {
-#ifdef _CS_GNU_LIBPTHREAD_VERSION
-  // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
-  char LibPthreadVersion[128];
-  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
-     if (strstr(LibPthreadVersion, "NPTL")) {
-        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
-        return 2;
-        }
-     }
-#endif
-
-  // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
-  char *LangEnv;
-  if ((LangEnv = getenv("LANG"))     != NULL && strcasestr(LangEnv, "utf") ||
-      (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
-     fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
-     return 2;
-     }
-
   // Save terminal settings:
 
   struct termios savedTm;
@@ -321,6 +302,25 @@ int main(int argc, char *argv[])
      return 0;
      }
 
+#ifdef _CS_GNU_LIBPTHREAD_VERSION
+  // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
+  char LibPthreadVersion[128];
+  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
+     if (strstr(LibPthreadVersion, "NPTL")) {
+        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
+        return 2;
+        }
+     }
+#endif
+
+  // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
+  char *LangEnv;
+  if ((LangEnv = getenv("LANG"))     != NULL && strcasestr(LangEnv, "utf") ||
+      (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
+     fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
+     return 2;
+     }
+
   // Log file:
 
   if (SysLogLevel > 0)
@@ -744,7 +744,6 @@ int main(int argc, char *argv[])
           // Power off:
           case kPower: isyslog("Power button pressed");
                        DELETENULL(Menu);
-                       cControl::Shutdown();
                        Temp = NULL;
                        if (!Shutdown) {
                           Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
@@ -846,6 +845,14 @@ int main(int argc, char *argv[])
                   break;
              // Viewing Control:
              case kOk:   LastChannel = -1; break; // forces channel display
+             // Instant resume of the last viewed recording:
+             case kPlay:
+                  if (cReplayControl::LastReplayed()) {
+                     cControl::Shutdown();
+                     Temp = NULL;
+                     cControl::Launch(new cReplayControl);
+                     }
+                  break;
              // Key macros:
              case kRed:
              case kGreen:
@@ -898,6 +905,7 @@ int main(int argc, char *argv[])
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
+                       cControl::Shutdown();
                        int Channel = timer ? timer->Channel()->Number() : 0;
                        const char *File = timer ? timer->File() : "";
                        Delta = Next - time(NULL); // compensates for Confirm() timeout
@@ -940,9 +948,11 @@ int main(int argc, char *argv[])
   Remotes.Clear();
   Audios.Clear();
   Skins.Clear();
-  Setup.CurrentChannel = cDevice::CurrentChannel();
-  Setup.CurrentVolume  = cDevice::CurrentVolume();
-  Setup.Save();
+  if (ExitCode != 2) {
+     Setup.CurrentChannel = cDevice::CurrentChannel();
+     Setup.CurrentVolume  = cDevice::CurrentVolume();
+     Setup.Save();
+     }
   cDevice::Shutdown();
   PluginManager.Shutdown();
   ReportEpgBugFixStats();

From a616d4b8597cfb69af7a8f0e0a96da2143970ffe Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 12 Jun 2005 18:00:00 +0200
Subject: [PATCH 118/307] =?UTF-8?q?Version=201.3.26=20-=20Updated=20the=20?=
 =?UTF-8?q?Estonian=20OSD=20texts=20(thanks=20to=20Arthur=20Konovalov).=20?=
 =?UTF-8?q?-=20Updated=20the=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).=20-=20Fixed=20handling=20'summary.vdr'=20files?=
 =?UTF-8?q?=20with=20more=20than=20two=20empty=20lines=20(thanks=20to=20?=
 =?UTF-8?q?=20=20Christian=20Jacobsen=20for=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Improved=20resetting=20CAM=20connections=20(thanks=20to=20Ma?=
 =?UTF-8?q?rco=20Schl=C3=BC=C3=9Fler).=20-=20Implemented=20cVideoRepacker?=
 =?UTF-8?q?=20in=20remux.c=20to=20make=20sure=20every=20PES=20packet=20con?=
 =?UTF-8?q?tains=20=20=20only=20data=20from=20one=20frame=20(thanks=20to?=
 =?UTF-8?q?=20Reinhard=20Nissl).=20=20=20NOTE:=20currently=20this=20doesn'?=
 =?UTF-8?q?t=20work=20with=20MPEG1,=20so=20if=20you=20use=20MPEG1=20you=20?=
 =?UTF-8?q?may=20want=20=20=20to=20change=20line=201158=20in=20remux.c=20t?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);

  as it was before.
- EPG events without a title now display "No title" instead of "(null)" (thanks
  to Rolf Ahrenberg).
- A device can now detach all receivers for a given PID, as is necessary, e.g.,
  for the bitstreamout plugin (thanks to Werner Fink).
- Added the year (two digits) to recording dates in LSTR, and thus also in menus
  (suggested by Jan Ekholm).
- Fixed the call to Channels.Unlock() in cEITScanner::Process() (thanks to
  Reinhard Nissl).
- Fixed handling timers with a day given as MTWTF--@6, i.e. a repeating timer with
  first day not as full date, but just day of month (thanks to Henrik Niehaus for
  reporting this one).
- Removed an unnecessary #include from osd.c (thanks to Wolfgang Rohdewald).
- Fixed dropping EPG events that have a zero start time or duration, in case it's
  an NVOD event (thanks to Chris Warren).
- Fixed handling page up/down in menu lists in case there are several non selectable
  items in a row (thanks to Udo Richter for reporting this one).
- Added cOsdMenu::SetCols() to allow adjusting the menu columns.
- Modified cEITScanner::Process() so that it works on systems with only budget cards
  or a mix of DVB-S, DVB-C or DVB-T cards.
---
 CONTRIBUTORS    |  17 +++
 HISTORY         |  35 +++++
 channels.conf   |  15 +-
 ci.c            |  21 ++-
 config.h        |   6 +-
 device.c        |  27 +++-
 device.h        |   7 +-
 dvbdevice.c     |  11 +-
 eit.c           |   6 +-
 eitscan.c       |  53 ++++---
 epg.c           |   9 +-
 i18n.c          |  47 +++++--
 menu.c          |   4 +-
 osd.c           |   3 +-
 osdbase.c       |  82 +++++++----
 osdbase.h       |   3 +-
 recording.c     |   9 +-
 remux.c         | 358 +++++++++++++++++++++++++++++++++++++++++++++++-
 summary2info.pl |   4 +-
 timers.c        |   4 +-
 20 files changed, 618 insertions(+), 103 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index eff35c7b0..92c680118 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -283,6 +283,7 @@ Werner Fink <werner@suse.de>
  for pointing out that MAXDPIDS needs to be to 16 (8xAC3 + 8xDTS)
  for reporting a problem with ensuring there is a current audio track in case there
  is only one track
+ for enabling a device to detach all receivers for a given PID
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -713,6 +714,7 @@ Jan Ekholm <chakie@infa.abo.fi>
  for reporting a compiler warning in g++ 3.2.3 regarding cReplayControl::Show()
  for reporting and helping to debug a problem in frequency handling when setting
  the CA descriptors in cDvbTuner::Action()
+ for suggesting to add the year to recording dates in LSTR
 
 Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for pointing out a problem with high CPU load during replay
@@ -828,6 +830,7 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for reporting a problem in handling the '-E' options in version 1.3.18
  for reporting a problem in case a station defines all 32 audio PIDs
  for suggestions and experiments regarding the buffer reserve in cTransfer
+ for reporting a problem with 'summary.vdr' files with more than two empty lines
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
@@ -880,6 +883,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
  for making pressing the Power button not stop Transfer Mode or replay immediately
+ for making EPG events without a title display "No title" instead of "(null)"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -954,6 +958,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing a typo in detecting UTF-8
  for fixing handling fragments of less than 4 byte in cPesAssembler
  for some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems
+ for implementing cVideoRepacker in remux.c to make sure every PES packet contains
+ only data from one frame
+ for fixing the call to Channels.Unlock() in cEITScanner::Process()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1186,6 +1193,7 @@ Marco Schl
  level from being set to a wrong value
  for fixing a possible hangup when ending a replay session while cIndexFile::CatchUp()
  is waiting
+ for improving resetting CAM connections
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1231,6 +1239,8 @@ Milos Kapoun <m.kapoun@cra.cz>
 Udo Richter <udo_richter@gmx.de>
  for refining the formula for making volume control more linear
  for fixing handling lifetime when deciding whether to delete a recording
+ for reporting a problem in handling page up/down in menu lists in case there are
+ several non selectable items in a row
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1311,6 +1321,7 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for removing some unneeded code and fixing access to unallocated memory in
  cEvent::FixEpgBugs()
  for adding a missing cMutexLock to cRemote::HasKeys()
+ for removing an unnecessary #include from osd.c
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
@@ -1318,6 +1329,8 @@ Chad Flynt <hoochster@sofnet.com>
 Chris Warren <dvb@ixalon.net>
  for pointing out that the call to system("sync") in SpinUpDisk() should be
  replaced with fsync(f) to avoid problems on NPTL systems
+ for fixing dropping EPG events that have a zero start time or duration, in case it's
+ an NVOD event
 
 Luca Olivetti <luca@ventoso.org>
  for making cDevice::AttachPlayer() keep the track language codes and descriptions
@@ -1367,3 +1380,7 @@ Georg Acher <acher@baycom.de>
  for avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the
  '& 0xff' in CRC32::crc32() of libsi/util.c
  for suggesting to reduce the priority of the section handler threads
+
+Henrik Niehaus <henrik.niehaus@gmx.de>
+ for reporting a problem with timers with a day given as MTWTF--@6, i.e. a repeating
+ timer with first day not as full date, but just day of month
diff --git a/HISTORY b/HISTORY
index 2e5778ae8..278bf37c2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3577,3 +3577,38 @@ Video Disk Recorder Revision History
   to Stefan Huelswitt for pointing this out).
 - Added cThread::SetPriority() and using it in cSectionHandler::Action() to
   reduce the priority of the section handler threads (as suggested by Georg Acher).
+
+2005-06-12: Version 1.3.26
+
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling 'summary.vdr' files with more than two empty lines (thanks to
+  Christian Jacobsen for reporting this one).
+- Improved resetting CAM connections (thanks to Marco Schl��ler).
+- Implemented cVideoRepacker in remux.c to make sure every PES packet contains
+  only data from one frame (thanks to Reinhard Nissl).
+  NOTE: currently this doesn't work with MPEG1, so if you use MPEG1 you may want
+  to change line 1158 in remux.c to
+
+  ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);
+
+  as it was before.
+- EPG events without a title now display "No title" instead of "(null)" (thanks
+  to Rolf Ahrenberg).
+- A device can now detach all receivers for a given PID, as is necessary, e.g.,
+  for the bitstreamout plugin (thanks to Werner Fink).
+- Added the year (two digits) to recording dates in LSTR, and thus also in menus
+  (suggested by Jan Ekholm).
+- Fixed the call to Channels.Unlock() in cEITScanner::Process() (thanks to
+  Reinhard Nissl).
+- Fixed handling timers with a day given as MTWTF--@6, i.e. a repeating timer with
+  first day not as full date, but just day of month (thanks to Henrik Niehaus for
+  reporting this one).
+- Removed an unnecessary #include from osd.c (thanks to Wolfgang Rohdewald).
+- Fixed dropping EPG events that have a zero start time or duration, in case it's
+  an NVOD event (thanks to Chris Warren).
+- Fixed handling page up/down in menu lists in case there are several non selectable
+  items in a row (thanks to Udo Richter for reporting this one).
+- Added cOsdMenu::SetCols() to allow adjusting the menu columns.
+- Modified cEITScanner::Process() so that it works on systems with only budget cards
+  or a mix of DVB-S, DVB-C or DVB-T cards.
diff --git a/channels.conf b/channels.conf
index f62e0fe72..01caab7f4 100644
--- a/channels.conf
+++ b/channels.conf
@@ -26,7 +26,7 @@ NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:3
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
@@ -45,9 +45,9 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1722,1801,1702:11:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
@@ -55,11 +55,11 @@ DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,180
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:21:133:1:0
+BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1801,1722,1702:21:133:17:0
 DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
-F1-Portal:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
-PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0
+PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
+.,.;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1702,1801:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -69,7 +69,7 @@ Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
 FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
-LCP;CSAT:12207:vC34:S19.2E:27500:2047+8191:0:0:0:8506:1:1090:0
+LCP;ABSAT:12285:vC34:S19.2E:27500:167:108:0:0:17027:1:1094:0
 ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
 Best of Shopping;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
 ASTRA-Mosaic;SES ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
@@ -82,7 +82,6 @@ RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:399
 Yorin;CANAL+:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-Via 1 - Sch�ner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
 VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
 VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
diff --git a/ci.c b/ci.c
index ac232b9bc..ff5203af0 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.23 2004/07/17 14:30:17 kls Exp $
+ * $Id: ci.c 1.24 2005/06/04 11:57:05 kls Exp $
  */
 
 #include "ci.h"
@@ -287,6 +287,7 @@ class cCiTransportConnection {
   int RecvData(void);
   const uint8_t *Data(int &Length);
   //XXX Close()
+  void Reset(void);
   };
 
 cCiTransportConnection::cCiTransportConnection(void)
@@ -428,6 +429,11 @@ int cCiTransportConnection::Poll(void)
   return ERROR;
 }
 
+void cCiTransportConnection::Reset(void)
+{
+  Init(-1, 0, 0);
+}
+
 // --- cCiTransportLayer -----------------------------------------------------
 
 #define MAX_CI_CONNECT  16 // maximum possible value is 254
@@ -440,7 +446,7 @@ class cCiTransportLayer {
 public:
   cCiTransportLayer(int Fd, int NumSlots);
   cCiTransportConnection *NewConnection(int Slot);
-  bool ResetSlot(int Slot);
+  bool ResetSlot(int Slot, bool Wait = false);
   bool ModuleReady(int Slot);
   cCiTransportConnection *Process(int Slot);
   };
@@ -451,6 +457,7 @@ cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
   numSlots = NumSlots;
   for (int s = 0; s < numSlots; s++)
       ResetSlot(s);
+  cCondWait::SleepMs(2000);
 }
 
 cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot)
@@ -467,10 +474,16 @@ cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot)
   return NULL;
 }
 
-bool cCiTransportLayer::ResetSlot(int Slot)
+bool cCiTransportLayer::ResetSlot(int Slot, bool Wait)
 {
+  for (int i = 0; i < MAX_CI_CONNECT; i++) {
+      if (tc[i].State() != stIDLE && tc[i].Slot() == Slot)
+         tc[i].Reset();
+      }
   dbgprotocol("Resetting slot %d...", Slot);
   if (ioctl(fd, CA_RESET, 1 << Slot) != -1) {
+     if (Wait)
+        cCondWait::SleepMs(2000);
      dbgprotocol("ok.\n");
      return true;
      }
@@ -1602,5 +1615,5 @@ bool cCiHandler::Reset(int Slot)
 {
   cMutexLock MutexLock(&mutex);
   CloseAllSessions(Slot);
-  return tpl->ResetSlot(Slot);
+  return tpl->ResetSlot(Slot, true);
 }
diff --git a/config.h b/config.h
index ebe212381..17e6255c0 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.218 2005/05/14 09:18:08 kls Exp $
+ * $Id: config.h 1.219 2005/06/03 12:39:16 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.25"
-#define VDRVERSNUM   10325  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.26"
+#define VDRVERSNUM   10326  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 806c13705..c79f7db39 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.101 2005/05/07 15:04:17 kls Exp $
+ * $Id: device.c 1.103 2005/06/12 13:39:11 kls Exp $
  */
 
 #include "device.h"
@@ -397,6 +397,8 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
            PRINTPIDS("A");
            if (!SetPid(&pidHandles[n], n, true)) {
               esyslog("ERROR: can't set PID %d on device %d", Pid, CardIndex() + 1);
+              if (PidType <= ptTeletext)
+                 DetachAll(Pid);
               DelPid(Pid, PidType);
               return false;
               }
@@ -422,6 +424,8 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
         PRINTPIDS("C");
         if (!SetPid(&pidHandles[n], n, true)) {
            esyslog("ERROR: can't set PID %d on device %d", Pid, CardIndex() + 1);
+           if (PidType <= ptTeletext)
+              DetachAll(Pid);
            DelPid(Pid, PidType);
            return false;
            }
@@ -501,6 +505,15 @@ bool cDevice::ProvidesTransponder(const cChannel *Channel) const
   return false;
 }
 
+bool cDevice::ProvidesTransponderExclusively(const cChannel *Channel) const
+{
+  for (int i = 0; i < numDevices; i++) {
+      if (device[i] && device[i] != this && device[i]->ProvidesTransponder(Channel))
+         return false;
+      }
+  return true;
+}
+
 bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   return false;
@@ -1211,6 +1224,18 @@ void cDevice::Detach(cReceiver *Receiver)
      }
 }
 
+void cDevice::DetachAll(int Pid)
+{
+  if (Pid) {
+     cMutexLock MutexLock(&mutexReceiver);
+     for (int i = 0; i < MAXRECEIVERS; i++) {
+         cReceiver *Receiver = receiver[i];
+         if (Receiver && Receiver->WantsPid(Pid))
+            Detach(Receiver);
+         }
+     }
+}
+
 // --- cTSBuffer -------------------------------------------------------------
 
 cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
diff --git a/device.h b/device.h
index 02fa35ccf..06380fe9c 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.57 2005/02/20 14:06:28 kls Exp $
+ * $Id: device.h 1.59 2005/06/12 13:35:47 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -186,6 +186,9 @@ class cDevice : public cThread {
          ///< Returns true if this device can provide the given source.
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
          ///< XXX -> PLUGINS.html!
+  virtual bool ProvidesTransponderExclusively(const cChannel *Channel) const;
+         ///< Returns true if this is the only device that is able to provide
+         ///< the given channel's transponder.
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
          ///< Returns true if this device can provide the given channel.
          ///< In case the device has cReceivers attached to it or it is the primary
@@ -500,6 +503,8 @@ class cDevice : public cThread {
        ///< Attaches the given receiver to this device.
   void Detach(cReceiver *Receiver);
        ///< Detaches the given receiver from this device.
+  void DetachAll(int Pid);
+       ///< Detaches all receivers from this device for this pid.
   };
 
 /// Derived cDevice classes that can receive channels will have to provide
diff --git a/dvbdevice.c b/dvbdevice.c
index 3a3b19bd3..88afdffa3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.129 2005/05/16 15:23:43 kls Exp $
+ * $Id: dvbdevice.c 1.130 2005/06/05 13:05:55 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -654,8 +654,10 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
      if (On) {
         if (Handle->handle < 0) {
            Handle->handle = DvbOpen(DEV_DVB_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
-           if (Handle->handle < 0)
+           if (Handle->handle < 0) {
+              LOG_ERROR;
               return false;
+              }
            }
         pesFilterParams.pid     = Handle->pid;
         pesFilterParams.input   = DMX_IN_FRONTEND;
@@ -722,6 +724,10 @@ void cDvbDevice::TurnOffLiveMode(bool LiveView)
 
   // Turn off live PIDs:
 
+  DetachAll(pidHandles[ptAudio].pid);
+  DetachAll(pidHandles[ptVideo].pid);
+  DetachAll(pidHandles[ptPcr].pid);
+  DetachAll(pidHandles[ptTeletext].pid);
   DelPid(pidHandles[ptAudio].pid);
   DelPid(pidHandles[ptVideo].pid);
   DelPid(pidHandles[ptPcr].pid, ptPcr);
@@ -891,6 +897,7 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
   if (TrackId && TrackId->id) {
      if (IS_AUDIO_TRACK(Type)) {
         if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
+           DetachAll(pidHandles[ptAudio].pid);
            pidHandles[ptAudio].pid = TrackId->id;
            SetPid(&pidHandles[ptAudio], ptAudio, true);
            }
diff --git a/eit.c b/eit.c
index a8ac9df28..ef21e3272 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.107 2005/05/28 11:35:55 kls Exp $
+ * $Id: eit.c 1.108 2005/06/11 15:31:21 kls Exp $
  */
 
 #include "eit.h"
@@ -48,8 +48,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
-      // Drop bogus events.
-      if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getDuration() == 0)
+      // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
+      if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getStartTime() > 0 && SiEitEvent.getDuration() == 0)
          continue;
       Empty = false;
       cEvent *newEvent = NULL;
diff --git a/eitscan.c b/eitscan.c
index e69ae0552..6b5f02248 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.24 2005/05/05 13:05:00 kls Exp $
+ * $Id: eitscan.c 1.26 2005/06/12 14:09:45 kls Exp $
  */
 
 #include "eitscan.h"
@@ -12,6 +12,7 @@
 #include "channels.h"
 #include "dvbdevice.h"
 #include "skins.h"
+#include "transfer.h"
 
 // --- cScanData -------------------------------------------------------------
 
@@ -139,51 +140,47 @@ void cEITScanner::Process(void)
                  transponderList = NULL;
                  }
               }
-           for (bool AnyDeviceSwitched = false; !AnyDeviceSwitched; ) {
-               cScanData *ScanData = NULL;
-               for (int i = 0; i < cDevice::NumDevices(); i++) {
-                   if (ScanData || (ScanData = scanList->First()) != NULL) {
-                      cDevice *Device = cDevice::GetDevice(i);
-                      if (Device) {
-                         if (Device != cDevice::PrimaryDevice() || (cDevice::NumDevices() == 1 && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                            if (!(Device->Receiving(true) || Device->Replaying())) {
-                               const cChannel *Channel = ScanData->GetChannel();
-                               if (Channel) {
-                                  if ((!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) && Device->ProvidesTransponder(Channel)) {
-                                     if (Device == cDevice::PrimaryDevice() && !currentChannel) {
+           bool AnyDeviceSwitched = false;
+           for (int i = 0; i < cDevice::NumDevices(); i++) {
+               cDevice *Device = cDevice::GetDevice(i);
+               if (Device) {
+                  for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
+                      const cChannel *Channel = ScanData->GetChannel();
+                      if (Channel) {
+                         if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
+                            if (Device->ProvidesTransponder(Channel)) {
+                               if (!Device->Receiving()) {
+                                  if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
+                                     if (Device == cDevice::ActualDevice() && !currentChannel) {
+                                        if (cTransferControl::ReceiverDevice())
+                                           cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                                         currentChannel = Device->CurrentChannel();
                                         Skins.Message(mtInfo, tr("Starting EPG scan"));
                                         }
                                      currentDevice = Device;//XXX see also dvbdevice.c!!!
+                                     //dsyslog("EIT scan: device %d  source  %-8s tp %5d", Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder());
                                      Device->SwitchChannel(Channel, false);
                                      currentDevice = NULL;
                                      scanList->Del(ScanData);
-                                     ScanData = NULL;
                                      AnyDeviceSwitched = true;
+                                     break;
                                      }
                                   }
                                }
                             }
                          }
                       }
-                   else
-                      break;
-                   }
-               if (ScanData && !AnyDeviceSwitched) {
-                  scanList->Del(ScanData);
-                  ScanData = NULL;
-                  }
-               if (!scanList->Count()) {
-                  delete scanList;
-                  scanList = NULL;
-                  if (lastActivity == 0) // this was a triggered scan
-                     Activity();
-                  break;
                   }
                }
+           if (!scanList->Count() || !AnyDeviceSwitched) {
+              delete scanList;
+              scanList = NULL;
+              if (lastActivity == 0) // this was a triggered scan
+                 Activity();
+              }
+           Channels.Unlock();
            }
         lastScan = time(NULL);
-        Channels.Unlock();
         }
      }
 }
diff --git a/epg.c b/epg.c
index 509b702a1..05c6d742f 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.34 2005/05/29 10:19:48 kls Exp $
+ * $Id: epg.c 1.35 2005/06/05 12:17:15 kls Exp $
  */
 
 #include "epg.h"
@@ -323,7 +323,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 12
+#define MAXEPGBUGFIXSTATS 13
 #define MAXEPGBUGFIXCHANS 100
 struct tEpgBugFixStats {
   int hits;
@@ -638,6 +638,11 @@ void cEvent::FixEpgBugs(void)
             }
         }
      }
+  else {
+     // we don't want any "(null)" titles
+     title = strcpyrealloc(title, tr("No title"));
+     EpgBugFixStat(12, ChannelID());
+     }
 }
 
 // --- cSchedule -------------------------------------------------------------
diff --git a/i18n.c b/i18n.c
index e1a187dea..e5358d241 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.191 2005/05/15 14:37:59 kls Exp $
+ * $Id: i18n.c 1.194 2005/06/05 11:59:09 kls Exp $
  *
  * Translations provided by:
  *
@@ -386,7 +386,7 @@ const tI18nPhrase Phrases[] = {
     "Resumo",
     "R�sum�",
     "Sammendrag",
-    "Tiedot",
+    "Yhteenveto",
     "Zawartosc",
     "Res�men",
     "�����������",
@@ -407,6 +407,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Tiedot",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -416,8 +417,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Info",
     "",//TODO
   },
   { "Schedule - %s",
@@ -964,7 +964,7 @@ const tI18nPhrase Phrases[] = {
     "Reiniciar",
     "�����",
     "Reset",
-    "Reset",
+    "Nullimine",
     "Nulstille",
   },
   { "Scan",
@@ -2734,7 +2734,7 @@ const tI18nPhrase Phrases[] = {
     "Durada dels missatges (s)",
     "������������ ������ ��������� (���)",
     "Vrijeme prikaza poruka (s)",
-    "Kanaliteate esitusaeg (s)",
+    "Teate esitusaeg (s)",
     "Tid beskeder skal vises (s)",
   },
   { "Setup.OSD$Use small font",
@@ -2860,7 +2860,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "����� ���������� � ������ (���)",
     "",// TODO
-    "",// TODO
+    "Kanaliteate esitusaeg (s)",
     "Tid kanalinfo skal vises (s)",
   },
   { "Setup.OSD$Info on channel switch",
@@ -2881,7 +2881,7 @@ const tI18nPhrase Phrases[] = {
     "Informaci� del canvi de canal",
     "���������� ���������� � ������",
     "Informacije kod promjene kanala",
-    "N�ita kanaliteadet",
+    "Kanaliteate n�itamine",
     "Info ved kanalskift",
   },
   { "Setup.OSD$Scroll pages",
@@ -2944,7 +2944,7 @@ const tI18nPhrase Phrases[] = {
     "Gravacions en subcarpetes",
     "�������� �������� �������",
     "Imenik za snimke",
-    "Salvesta kausta nime",
+    "Kausta nime salvestamine",
     "Optagelser i foldere",
   },
   { "Setup.EPG$EPG scan timeout (h)",
@@ -3658,7 +3658,7 @@ const tI18nPhrase Phrases[] = {
     "Utilitzar el nom de l'episodi",
     "������������ ����� �� ��������",
     "Koristi ime epizode",
-    "Kasuta episoodi nime",
+    "Episoodi nime kasutamine",
     "Anvend udsendelsesnavn",
   },
   { "Setup.Recording$Use VPS",
@@ -3679,7 +3679,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "������������ ������� VPS",
     "Koristi VPS",
-    "Kasuta VPS-i",
+    "VPS-i kasutamine",
     "Anvend VPS",
   },
   { "Setup.Recording$VPS margin (s)",
@@ -3721,7 +3721,7 @@ const tI18nPhrase Phrases[] = {
     "Marcar gravaci� instant�nia",
     "�������� ��������� ������� ������",
     "Ozna�i direktno snimanje",
-    "M�rgista otsesalvestusi",
+    "Otsesalvestuse m�rgistamine",
     "Mark�r direkte optagelse",
   },
   { "Setup.Recording$Name instant recording",
@@ -3805,7 +3805,7 @@ const tI18nPhrase Phrases[] = {
     "Separar arxius",
     "������ ����������������� �����",
     "Podijeli ure�ene datoteke",
-    "T�kelda redigeeritud faile",
+    "Redigeeritud failide t�keldamine",
     "Opdel redigerede filer",
   },
   { "Setup.Replay$Multi speed mode",
@@ -5346,6 +5346,27 @@ const tI18nPhrase Phrases[] = {
     "ST:TNG konsool",
     "ST:TNG konsol",
   },
+  { "No title",
+    "Kein Titel",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Ei esityst�",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { NULL }
   };
 
diff --git a/menu.c b/menu.c
index e36cc65f0..0ca55f50f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.349 2005/05/16 13:59:03 kls Exp $
+ * $Id: menu.c 1.350 2005/06/05 14:11:54 kls Exp $
  */
 
 #include "menu.h"
@@ -1537,7 +1537,7 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 int cMenuRecordings::helpKeys = -1;
 
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
-:cOsdMenu(Base ? Base : tr("Recordings"), 6, 6)
+:cOsdMenu(Base ? Base : tr("Recordings"), 8, 6)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
diff --git a/osd.c b/osd.c
index 2d125971d..2e74a11cb 100644
--- a/osd.c
+++ b/osd.c
@@ -4,12 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.60 2005/05/14 11:16:30 kls Exp $
+ * $Id: osd.c 1.61 2005/06/11 14:31:36 kls Exp $
  */
 
 #include "osd.h"
 #include <math.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/osdbase.c b/osdbase.c
index ec04adb8a..7d03dbd0f 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.15 2005/01/07 16:16:41 kls Exp $
+ * $Id: osdbase.c 1.17 2005/06/12 10:44:22 kls Exp $
  */
 
 #include "osdbase.h"
@@ -74,11 +74,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   hasHotkeys = false;
   title = NULL;
   SetTitle(Title);
-  cols[0] = c0;
-  cols[1] = c1;
-  cols[2] = c2;
-  cols[3] = c3;
-  cols[4] = c4;
+  SetCols(c0, c1, c2, c3, c4);
   first = 0;
   current = marked = -1;
   subMenu = NULL;
@@ -116,6 +112,15 @@ const char *cOsdMenu::hk(const char *s)
   return s;
 }
 
+void cOsdMenu::SetCols(int c0, int c1, int c2, int c3, int c4)
+{
+  cols[0] = c0;
+  cols[1] = c1;
+  cols[2] = c2;
+  cols[3] = c3;
+  cols[4] = c4;
+}
+
 void cOsdMenu::SetHasHotkeys(void)
 {
   hasHotkeys = true;
@@ -258,7 +263,8 @@ void cOsdMenu::CursorUp(void)
 {
   if (current > 0) {
      int tmpCurrent = current;
-     while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent));
+     while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent))
+           ;
      if (tmpCurrent < 0)
         return;
      if (tmpCurrent >= first)
@@ -282,7 +288,8 @@ void cOsdMenu::CursorDown(void)
 
   if (current < last) {
      int tmpCurrent = current;
-     while (++tmpCurrent <= last && !SelectableItem(tmpCurrent));
+     while (++tmpCurrent <= last && !SelectableItem(tmpCurrent))
+           ;
      if (tmpCurrent > last)
         return;
      if (tmpCurrent <= lastOnScreen)
@@ -306,33 +313,62 @@ void cOsdMenu::CursorDown(void)
 
 void cOsdMenu::PageUp(void)
 {
+  int oldCurrent = current;
+  int oldFirst = first;
   current -= displayMenuItems;
   first -= displayMenuItems;
+  int last = Count() - 1;
+  if (current < 0)
+     current = 0;
   if (first < 0)
-     first = current = 0;
-  if (!SelectableItem(current)) {
-     current -= (current > 0) ? 1 : -1;
-     first = min(first, current - 1);
+     first = 0;
+  int tmpCurrent = current;
+  while (!SelectableItem(tmpCurrent) && --tmpCurrent >= 0)
+        ;
+  if (tmpCurrent < 0) {
+     tmpCurrent = current;
+     while (++tmpCurrent <= last && !SelectableItem(tmpCurrent))
+           ;
+     }
+  current = tmpCurrent <= last ? tmpCurrent : -1;
+  if (current >= 0) {
+     if (current < first)
+        first = current;
+     else if (current - first >= displayMenuItems)
+        first = current - displayMenuItems + 1;
+     }
+  if (current != oldCurrent || first != oldFirst) {
+     Display();
+     DisplayCurrent(true);
      }
-  Display();
-  DisplayCurrent(true);
 }
 
 void cOsdMenu::PageDown(void) 
 {
+  int oldCurrent = current;
+  int oldFirst = first;
   current += displayMenuItems;
   first += displayMenuItems;
-  int count = Count();
-  if (current > count - 1) {
-     current = count - 1;
-     first = max(0, count - displayMenuItems);
+  int last = Count() - 1;
+  int tmpCurrent = current;
+  while (!SelectableItem(tmpCurrent) && ++tmpCurrent <= last)
+        ;
+  if (tmpCurrent > last) {
+     tmpCurrent = current;
+     while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent))
+           ;
      }
-  if (!SelectableItem(current)) {
-     current += (current < count - 1) ? 1 : -1;
-     first = max(first, current - displayMenuItems);
+  current = tmpCurrent > 0 ? tmpCurrent : -1;
+  if (current >= 0) {
+     if (current < first)
+        first = current;
+     else if (current - first >= displayMenuItems)
+        first = current - displayMenuItems + 1;
+     }
+  if (current != oldCurrent || first != oldFirst) {
+     Display();
+     DisplayCurrent(true);
      }
-  Display();
-  DisplayCurrent(true);
 }
 
 void cOsdMenu::Mark(void)
diff --git a/osdbase.h b/osdbase.h
index 53fbf6b83..bcb3c404e 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.10 2004/04/30 13:40:11 kls Exp $
+ * $Id: osdbase.h 1.11 2005/06/12 10:46:34 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -98,6 +98,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 protected:
   cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
   const char *hk(const char *s);
+  void SetCols(int c0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   void SetHasHotkeys(void);
   virtual void Clear(void);
   bool SelectableItem(int idx);
diff --git a/recording.c b/recording.c
index 93b0af8f8..462b16000 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.107 2005/05/29 11:16:57 kls Exp $
+ * $Id: recording.c 1.109 2005/06/05 14:11:45 kls Exp $
  */
 
 #include "recording.h"
@@ -480,8 +480,8 @@ cRecording::cRecording(const char *FileName)
            char *data[3] = { NULL };
            cReadLine ReadLine;
            char *s;
-           while ((s = ReadLine.Read(f)) != NULL && line < 3) {
-                 if (*s) {
+           while ((s = ReadLine.Read(f)) != NULL) {
+                 if (*s || line > 1) {
                     if (data[line]) {
                        int len = strlen(s);
                        len += strlen(data[line]) + 1;
@@ -593,9 +593,10 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
         s++;
      else
         s = name;
-     asprintf(&titleBuffer, "%02d.%02d%c%02d:%02d%c%c%s",
+     asprintf(&titleBuffer, "%02d.%02d.%02d%c%02d:%02d%c%c%s",
                             t->tm_mday,
                             t->tm_mon + 1,
+                            t->tm_year % 100,
                             Delimiter,
                             t->tm_hour,
                             t->tm_min,
diff --git a/remux.c b/remux.c
index 135fa7977..83d135659 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.33 2005/03/20 13:18:15 kls Exp $
+ * $Id: remux.c 1.34 2005/06/04 14:49:25 kls Exp $
  */
 
 #include "remux.h"
@@ -32,10 +32,363 @@ class cRepacker {
   virtual void Reset(void) {}
   virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
   virtual int BreakAt(const uchar *Data, int Count) = 0;
+  virtual int QuerySnoopSize(void) { return 0; }
   void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
   void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
   };
 
+// --- cVideoRepacker --------------------------------------------------------
+
+class cVideoRepacker : public cRepacker {
+private:
+  int skippedBytes;
+  int packetTodo;
+  uchar fragmentData[6 + 65535 + 3];
+  int fragmentLen;
+  uchar pesHeader[6 + 3 + 255 + 3];
+  int pesHeaderLen;
+  uchar pesHeaderBackup[6 + 3 + 255];
+  int pesHeaderBackupLen;
+  uint32_t scanner;
+  enum eState {
+    syncing,
+    findPicture,
+    scanPicture
+    } state;
+  uint32_t localScanner;
+  int localStart;
+  bool PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+public:
+  cVideoRepacker(void);
+  virtual void Reset(void);
+  virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+  virtual int BreakAt(const uchar *Data, int Count);
+  virtual int QuerySnoopSize() { return 4; }
+  };
+
+cVideoRepacker::cVideoRepacker(void)
+{
+  Reset();
+}
+
+void cVideoRepacker::Reset(void)
+{
+  skippedBytes = 0;
+  packetTodo = maxPacketSize - 6 - 3;
+  fragmentLen = 0;
+  pesHeaderLen = 0;
+  pesHeaderBackupLen = 0;
+  scanner = 0xFFFFFFFF;
+  state = syncing;
+  localStart = -1;
+}
+
+bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+{
+  // enter packet length into PES header ...
+  if (fragmentLen > 0) { // ... which is contained in the fragment buffer
+     // determine PES packet payload
+     int PacketLen = fragmentLen + Count - 6;
+     fragmentData[ 4 ] = PacketLen >> 8;
+     fragmentData[ 5 ] = PacketLen & 0xFF;
+     // amount of data to put into result buffer: a negative Count value means
+     // to strip off any partially contained start code.
+     int Bite = fragmentLen + (Count >= 0 ? 0 : Count);
+     // put data into result buffer
+     int n = ResultBuffer->Put(fragmentData, Bite);
+     if (n != Bite) {
+        Reset();
+        return false;
+        }
+     fragmentLen = 0;
+     }
+  else if (pesHeaderLen > 0) { // ... which is contained in the PES header buffer
+     int PacketLen = pesHeaderLen + Count - 6;
+     pesHeader[ 4 ] = PacketLen >> 8;
+     pesHeader[ 5 ] = PacketLen & 0xFF;
+     // amount of data to put into result buffer: a negative Count value means
+     // to strip off any partially contained start code.
+     int Bite = pesHeaderLen + (Count >= 0 ? 0 : Count);
+     // put data into result buffer
+     int n = ResultBuffer->Put(pesHeader, Bite);
+     if (n != Bite) {
+        Reset();
+        return false;
+        }
+     pesHeaderLen = 0;
+     }
+  // append further payload
+  if (Count > 0) {
+     // amount of data to put into result buffer
+     int Bite = Count;
+     // put data into result buffer
+     int n = ResultBuffer->Put(Data, Bite);
+     if (n != Bite) {
+        Reset();
+        return false;
+        }
+     }
+  // we did it ;-)
+  return true;
+}
+
+int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+{
+  // reset local scanner
+  localStart = -1;
+ 
+  // check for MPEG 2
+  if ((Data[6] & 0xC0) != 0x80)
+     return 0;
+
+  // backup PES header
+  if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
+     pesHeaderBackupLen = 6 + 3 + Data[8];
+     memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
+     }
+
+  // skip PES header
+  int done = 6 + 3 + Data[8];
+  int todo = Count - done;
+  const uchar *data = Data + done;
+  // remember start of the data
+  const uchar *payload = data;
+
+  while (todo > 0) {
+        // collect number of skipped bytes while syncing
+        if (state <= syncing)
+           skippedBytes++;
+        // did we reach a start code?
+        scanner <<= 8;
+        if (scanner != 0x00000100)
+           scanner |= *data;
+        else {
+           scanner |= *data;
+
+           // which kind of start code have we got?
+           switch (*data) {
+             case 0xB9 ... 0xFF: // system start codes
+                  esyslog("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
+                  Reset();
+                  break;
+             case 0xB0 ... 0xB1: // reserved start codes
+             case 0xB6:
+                  esyslog("cVideoRepacker: found reserved start code: stream seems to be scrambled");
+                  Reset();
+                  break;
+             case 0xB4: // sequence error code
+                  isyslog("cVideoRepacker: found sequence error code: stream seems to be damaged");
+             case 0xB2: // user data start code
+             case 0xB5: // extension start code
+                  break;
+             case 0xB7: // sequence end code
+             case 0xB3: // sequence header code
+             case 0xB8: // group start code
+             case 0x00: // picture start code
+                  if (state == scanPicture) {
+                     // the above start codes indicate that the current picture is done. So
+                     // push out the packet to start a new packet for the next picuture. If
+                     // the byte count get's negative then the current buffer ends in a
+                     // partitial start code that must be stripped off, as it shall be put
+                     // in the next packet.
+                     if (!PushOutPacket(ResultBuffer, payload, data - 3 - payload))
+                        return done - 3;
+                     // go on with syncing to the next picture
+                     state = syncing;
+                     }
+                  if (state == syncing) {
+                     // report that syncing dropped some bytes
+                     if (skippedBytes > 4)
+                        esyslog("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - 4);
+                     skippedBytes = 0;
+                     // if there is a PES header available, then use it ...
+                     if (pesHeaderBackupLen > 0) {
+                        // ISO 13818-1 says:
+                        // In the case of video, if a PTS is present in a PES packet header
+                        // it shall refer to the access unit containing the first picture start
+                        // code that commences in this PES packet. A picture start code commences
+                        // in PES packet if the first byte of the picture start code is present
+                        // in the PES packet.
+                        memcpy(pesHeader, pesHeaderBackup, pesHeaderBackupLen);
+                        pesHeaderLen = pesHeaderBackupLen;
+                        pesHeaderBackupLen = 0;
+                        }
+                     else {
+                        // ... otherwise create a continuation PES header
+                        pesHeaderLen = 0;
+                        pesHeader[pesHeaderLen++] = 0x00;
+                        pesHeader[pesHeaderLen++] = 0x00;
+                        pesHeader[pesHeaderLen++] = 0x01;
+                        pesHeader[pesHeaderLen++] = Data[3]; // video stream ID
+                        pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+                        pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+                        pesHeader[pesHeaderLen++] = 0x80;
+                        pesHeader[pesHeaderLen++] = 0x00;
+                        pesHeader[pesHeaderLen++] = 0x00;
+                        }
+                     // append the first three bytes of the start code
+                     pesHeader[pesHeaderLen++] = 0x00;
+                     pesHeader[pesHeaderLen++] = 0x00;
+                     pesHeader[pesHeaderLen++] = 0x01;
+                     // the next packet's payload will begin with the fourth byte of
+                     // the start code (= the actual code)
+                     payload = data;
+                     // as there is no length information available, assume the
+                     // maximum we can hold in one PES packet
+                     packetTodo = maxPacketSize - pesHeaderLen;
+                     // go on with finding the picture data
+                     ((int &)state)++;
+                     }
+                  break;
+             case 0x01 ... 0xAF: // slice start codes
+                  if (state == findPicture) {
+                     // go on with scanning the picture data
+                     ((int &)state)++;
+                     }
+                  break;
+             }
+           }
+        data++;
+        done++;
+        todo--;
+        // do we have to start a new packet as there is no more space left?
+        if (--packetTodo <= 0) {
+           // we connot start a new packet here if the current might end in a start
+           // code and this start code shall possibly be put in the next packet. So
+           // overfill the current packet until we can safely detect that we won't
+           // break a start code into pieces:
+           //
+           // A) the last four bytes were a start code.
+           // B) the current byte introduces a start code.
+           // C) the last three bytes begin a start code.
+           //
+           // Todo : Data                          : Rule : Result
+           // -----:-------------------------------:------:-------
+           //      : XX 00 00 00 01 YY|YY YY YY YY :      :
+           //    0 :                ^^|            : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX 00 00 00 01|YY YY YY YY :      :
+           //    0 :                ^^|            : B    : wait
+           //   -1 :                  |^^          : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX XX 00 00 00|01 YY YY YY :      :
+           //    0 :                ^^|            : C    : wait
+           //   -1 :                  |^^          : B    : wait
+           //   -2 :                  |   ^^       : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX XX XX 00 00|00 01 YY YY :      :
+           //    0 :                ^^|            : C    : wait
+           //   -1 :                  |^^          : C    : wait
+           //   -2 :                  |   ^^       : B    : wait
+           //   -3 :                  |      ^^    : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX XX XX XX 00|00 00 01 YY :      :
+           //    0 :                ^^|            : C    : wait
+           //   -1 :                  |^^          : C    : wait
+           //   -2 :                  |   ^^       :      : push
+           // -----:-------------------------------:------:-------
+           bool A = ((scanner & 0xFFFFFF00) == 0x00000100);
+           bool B = ((scanner &   0xFFFFFF) ==   0x000001);
+           bool C = ((scanner &       0xFF) ==       0x00) && (packetTodo >= -1);
+           if (A || (!B && !C)) {
+              // actually we cannot push out an overfull packet. So we'll have to
+              // adjust the byte count and payload start as necessary. If the byte
+              // count get's negative we'll have to append the excess from fragment's
+              // tail to the next PES header.
+              int bite = data + packetTodo - payload;
+              const uchar *excessData = fragmentData + fragmentLen + bite;
+              // a negative byte count means to drop some bytes from the current
+              // fragment's tail, to not exceed the maximum packet size.
+              if (!PushOutPacket(ResultBuffer, payload, bite))
+                 return done;
+              // create a continuation PES header
+              pesHeaderLen = 0;
+              pesHeader[pesHeaderLen++] = 0x00;
+              pesHeader[pesHeaderLen++] = 0x00;
+              pesHeader[pesHeaderLen++] = 0x01;
+              pesHeader[pesHeaderLen++] = Data[3]; // video stream ID
+              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+              pesHeader[pesHeaderLen++] = 0x80;
+              pesHeader[pesHeaderLen++] = 0x00;
+              pesHeader[pesHeaderLen++] = 0x00;
+              // copy any excess data
+              while (bite++ < 0) {
+                    // append the excess data here
+                    pesHeader[pesHeaderLen++] = *excessData++;
+                    packetTodo++;
+                    }
+              // the next packet's payload will begin here
+              payload = data + packetTodo;
+              // as there is no length information available, assume the
+              // maximum we can hold in one PES packet
+              packetTodo += maxPacketSize - pesHeaderLen;
+              }
+           }
+        }
+  // the packet is done. Now store any remaining data into fragment buffer
+  // if we are no longer syncing.
+  if (state != syncing) {
+     // append the PES header ...
+     int bite = pesHeaderLen;
+     pesHeaderLen = 0;
+     if (bite > 0) {
+        memcpy(fragmentData + fragmentLen, pesHeader, bite);
+        fragmentLen += bite;
+        }
+     // append payload. It may contain part of a start code at it's end,
+     // which will be removed when the next packet gets processed.
+     bite = data - payload;
+     if (bite > 0) {
+        memcpy(fragmentData + fragmentLen, payload, bite);
+        fragmentLen += bite;
+        }
+     }
+  // we've eaten the whole packet ;-)
+  return Count;
+}
+
+int cVideoRepacker::BreakAt(const uchar *Data, int Count)
+{
+  // enough data for test?
+  if (Count < 6 + 3)
+     return -1;
+  // check for MPEG 2
+  if ((Data[6] & 0xC0) != 0x80)
+     return -1;
+  int headerLen = Data[8] + 6 + 3;
+  // enough data for test?
+  if (Count < headerLen)
+     return -1;
+  // just detect end of picture
+  if (state == scanPicture) {
+     // setup local scanner
+     if (localStart < 0) {
+        localScanner = scanner;
+        localStart = 0;
+        }
+     // start where we've stopped at the last run
+     const uchar *data = Data + headerLen + localStart;
+     const uchar *limit = Data + Count;
+     // scan data
+     while (data < limit) {
+           localStart++;
+           localScanner <<= 8;
+           localScanner |= *data++;
+           // check start codes which follow picture data
+           switch (localScanner) {
+             case 0x00000100: // picture start code
+             case 0x000001B8: // group start code
+             case 0x000001B3: // sequence header code
+             case 0x000001B7: // sequence end code
+                  return data - Data;
+             }
+           }
+     }
+  // just fill up packet and append next start code
+  return headerLen + packetTodo + 4;
+}
+
 // --- cDolbyRepacker --------------------------------------------------------
 
 class cDolbyRepacker : public cRepacker {
@@ -462,6 +815,7 @@ cTS2PES::cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t Aud
   if (repacker) {
      repacker->SetMaxPacketSize(size);
      repacker->SetSubStreamId(subStreamId);
+     size += repacker->QuerySnoopSize();
      }
 
   tsErrors = 0;
@@ -801,7 +1155,7 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
   resultBuffer->SetTimeouts(0, 100);
   if (VPid)
-     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);
+     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0x00, 0x00, new cVideoRepacker);
   if (APids) {
      int n = 0;
      while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS)
diff --git a/summary2info.pl b/summary2info.pl
index 8e80abe08..f757ac365 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 1.2 2005/05/22 10:37:47 kls Exp $
+# $Id: summary2info.pl 1.3 2005/06/04 11:33:09 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
@@ -24,7 +24,7 @@
     @data = ();
     while (<F>) {
           chomp;
-          if ($_) {
+          if ($_ || $line > 1) {
              $data[$line] .= '|' if ($data[$line]);
              $data[$line] .= $_;
              }
diff --git a/timers.c b/timers.c
index 9e31f604b..b6307e068 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.31 2005/05/07 11:10:56 kls Exp $
+ * $Id: timers.c 1.32 2005/06/11 14:19:58 kls Exp $
  */
 
 #include "timers.h"
@@ -159,7 +159,7 @@ bool cTimer::ParseDay(const char *s, time_t &Day, int &WeekDays)
      else {
         // handle "day of month" for compatibility with older versions:
         char *tail = NULL;
-        int day = strtol(s, &tail, 10);
+        int day = strtol(d, &tail, 10);
         if (tail && *tail || day < 1 || day > 31)
            return false;
         time_t t = time(NULL);

From fef3aa3a7fff0e3b4745532a6b1a157b45cb9643 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 19 Jun 2005 18:00:00 +0200
Subject: [PATCH 119/307] Version 1.3.27 - Fixed handling 'page down', which
 was broken in version 1.3.26 (thanks to Udo   Richter). - Modified page
 scrolling behaviour (based on a suggestion by Patrick Gleichmann). - The new
 setup option "OSD/Scroll wraps" can be used to activate wrapping around   in
 menu lists (based on a suggestion by Patrick Gleichmann). - Removed the NPTL
 check at startup, since several users have reported that VDR   now runs fine
 with NPTL. - Fixed handling VPS timers, so that they only record if the event
 they are assigned   to actually has the given VPS time. - Disabled
 cVideoRepacker in remux.c, because it has caused several problems   during
 recording. If you want to test (and maybe debug) it, activate the line

  //#define TEST_cVideoRepacker

  in remux.c.
- When drawing a bitmap to the OSD, the existing palette of the target can now be
  replaced with the new one instead of adding the new entries (thanks to Andreas
  Regel).
---
 CONTRIBUTORS  |  4 +++
 HISTORY       | 21 +++++++++++
 INSTALL       |  9 +----
 MANUAL        | 17 ++++++---
 channels.conf |  6 ++--
 config.c      |  6 ++--
 config.h      |  7 ++--
 dvbdevice.c   |  3 +-
 i18n.c        | 23 +++++++++++-
 menu.c        |  3 +-
 osd.c         | 36 +++++++++++++------
 osd.h         |  9 +++--
 osdbase.c     | 96 ++++++++++++++++++++++++++++++---------------------
 remux.c       |  7 +++-
 timers.c      | 20 ++++++-----
 vdr.c         | 13 +------
 16 files changed, 182 insertions(+), 98 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 92c680118..cc43b028c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1080,6 +1080,7 @@ Andreas Regel <andreas.regel@gmx.de>
  cSkins::Message()
  for reporting a problem in handling Transfer Mode for radio channels
  for reporting a problem with messages when a cOsdObject uses the raw OSD
+ for implementing palette replace mode in the OSD bitmaps
 
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1241,6 +1242,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing handling lifetime when deciding whether to delete a recording
  for reporting a problem in handling page up/down in menu lists in case there are
  several non selectable items in a row
+ for fixing handling 'page down' after it was broken in version 1.3.26
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1296,6 +1298,8 @@ Laurence Abbott <laz@club-burniston.co.uk>
 
 Patrick Gleichmann <patrick@feedface.com>
  for fixing the default quality value when grabbing a JPEG image
+ for suggestiong a modified page scrolling behaviour
+ for suggesting wrapping around in menu lists
 
 Achim Tuffentsammer <a.tuffentsammer@web.de>
  for reporting a crash in case a plugin needs to issue an error message before the
diff --git a/HISTORY b/HISTORY
index 278bf37c2..cf24ffbe7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3612,3 +3612,24 @@ Video Disk Recorder Revision History
 - Added cOsdMenu::SetCols() to allow adjusting the menu columns.
 - Modified cEITScanner::Process() so that it works on systems with only budget cards
   or a mix of DVB-S, DVB-C or DVB-T cards.
+
+2005-06-19: Version 1.3.27
+
+- Fixed handling 'page down', which was broken in version 1.3.26 (thanks to Udo
+  Richter).
+- Modified page scrolling behaviour (based on a suggestion by Patrick Gleichmann).
+- The new setup option "OSD/Scroll wraps" can be used to activate wrapping around
+  in menu lists (based on a suggestion by Patrick Gleichmann).
+- Removed the NPTL check at startup, since several users have reported that VDR
+  now runs fine with NPTL.
+- Fixed handling VPS timers, so that they only record if the event they are assigned
+  to actually has the given VPS time.
+- Disabled cVideoRepacker in remux.c, because it has caused several problems
+  during recording. If you want to test (and maybe debug) it, activate the line
+
+  //#define TEST_cVideoRepacker
+
+  in remux.c.
+- When drawing a bitmap to the OSD, the existing palette of the target can now be
+  replaced with the new one instead of adding the new entries (thanks to Andreas
+  Regel).
diff --git a/INSTALL b/INSTALL
index e894e8db3..581a5d919 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,14 +7,7 @@ Version 1.3
 IMPORTANT NOTES:
 ----------------
 
-VDR currently doesn't work with NPTL ("Native Posix Thread Library").
-Either don't use NPTL, or set the environment variable
-
-  LD_ASSUME_KERNEL=2.4.1
-  
-before running VDR.
-
-Also, please make sure your environment is NOT set to use UTF-8 or
+Please make sure your environment is NOT set to use UTF-8 or
 any other multibyte character representation. Check the value of your
 $LANG or $LC_CTYPE environment variable, and if it contains something
 like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"
diff --git a/MANUAL b/MANUAL
index 8a65809e2..532e954e9 100644
--- a/MANUAL
+++ b/MANUAL
@@ -495,11 +495,18 @@ Version 1.2
 
   Scroll pages = yes     no  = when pressing the "Down" ("Up") key while the cursor
                                is on the last (first) line of a list page, the
-                               list is advanced by a full page and the cursor will
-                               be at the top (bottom) of that page
-                         yes = dto., but the cursor remains at the bottom (top) of
-                               the page (this mode allows for faster scrolling
-                               through long lists).
+                               list is scrolled down (up) a single line and the cursor will
+                               remain at the bottom (top) of that page
+                         yes = the list is scrolled down (up) a full page and the cursor
+                               will be at the top (bottom) of that page (this mode allows
+                               for faster scrolling through long lists).
+
+  Scroll wraps = no      no  = when the end (beginning) of a list is reached while
+                               moving the cursor through it, the cursor stays at the
+                               last (first) line of the list
+                         yes = the cursor "wraps around" and moves from the last
+                               (first) line of the list directly to the first (last)
+                               one.
 
   Sort timers = yes      Turns sorting the timers in the "Timers" menu on/off.
                          Timers are sorted by ascending start times, with the
diff --git a/channels.conf b/channels.conf
index 01caab7f4..7243e9c87 100644
--- a/channels.conf
+++ b/channels.conf
@@ -48,7 +48,7 @@ PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:3
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1801,1722,1702:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
@@ -89,7 +89,7 @@ TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Mix;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2374=UND:2353:960,961:10240:2:2054:0
+ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng:2353:960,961:10240:2:2054:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
@@ -112,7 +112,7 @@ Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
-Bethel TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414=ita:0:0:4733:318:13400:0
+Bethel TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
diff --git a/config.c b/config.c
index 971f16715..88457779c 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.133 2005/02/20 12:52:59 kls Exp $
+ * $Id: config.c 1.134 2005/06/18 10:30:02 kls Exp $
  */
 
 #include "config.h"
@@ -250,6 +250,7 @@ cSetup::cSetup(void)
   PrimaryDVB = 1;
   ShowInfoOnChSwitch = 1;
   MenuScrollPage = 1;
+  MenuScrollWrap = 0;
   MarkInstantRecord = 1;
   strcpy(NameInstantRecord, "TITLE EPISODE");
   InstantRecordTime = 180;
@@ -407,6 +408,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
   else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
+  else if (!strcasecmp(Name, "MenuScrollWrap"))      MenuScrollWrap     = atoi(Value);
   else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
   else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
   else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
@@ -470,7 +472,7 @@ bool cSetup::Save(void)
   Store("OSDTheme",           OSDTheme);
   Store("PrimaryDVB",         PrimaryDVB);
   Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch);
-  Store("MenuScrollPage",     MenuScrollPage);
+  Store("MenuScrollWrap",     MenuScrollWrap);
   Store("MarkInstantRecord",  MarkInstantRecord);
   Store("NameInstantRecord",  NameInstantRecord);
   Store("InstantRecordTime",  InstantRecordTime);
diff --git a/config.h b/config.h
index 17e6255c0..439e8f032 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.219 2005/06/03 12:39:16 kls Exp $
+ * $Id: config.h 1.221 2005/06/18 10:29:25 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.26"
-#define VDRVERSNUM   10326  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.27"
+#define VDRVERSNUM   10327  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -211,6 +211,7 @@ class cSetup : public cConfig<cSetupLine> {
   int PrimaryDVB;
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
+  int MenuScrollWrap;
   int MarkInstantRecord;
   char NameInstantRecord[MaxFileName];
   int InstantRecordTime;
diff --git a/dvbdevice.c b/dvbdevice.c
index 88afdffa3..8a25adb4a 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.130 2005/06/05 13:05:55 kls Exp $
+ * $Id: dvbdevice.c 1.131 2005/06/19 11:00:43 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -742,7 +742,6 @@ bool cDvbDevice::ProvidesSource(int Source) const
       || type == cSource::stCable && frontendType == FE_QAM
       || type == cSource::stSat   && frontendType == FE_QPSK
       || type == cSource::stTerr  && frontendType == FE_OFDM;
-  return true;
 }
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
diff --git a/i18n.c b/i18n.c
index e5358d241..1bc798b0b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.194 2005/06/05 11:59:09 kls Exp $
+ * $Id: i18n.c 1.195 2005/06/18 10:42:31 kls Exp $
  *
  * Translations provided by:
  *
@@ -2905,6 +2905,27 @@ const tI18nPhrase Phrases[] = {
     "Lehek�lje kerimine",
     "Rul sider",
   },
+  { "Setup.OSD$Scroll wraps",
+    "Rundum scrollen",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
     "Sortiraj termine",
diff --git a/menu.c b/menu.c
index 0ca55f50f..d9b92b79a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.350 2005/06/05 14:11:54 kls Exp $
+ * $Id: menu.c 1.351 2005/06/18 10:31:52 kls Exp $
  */
 
 #include "menu.h"
@@ -1845,6 +1845,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.OSD$Channel info time (s)"),  &data.ChannelInfoTime, 1, 60));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   SetCurrent(Get(current));
diff --git a/osd.c b/osd.c
index 2e74a11cb..104393d11 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.61 2005/06/11 14:31:36 kls Exp $
+ * $Id: osd.c 1.62 2005/06/19 10:43:04 kls Exp $
  */
 
 #include "osd.h"
@@ -86,6 +86,13 @@ void cPalette::Take(const cPalette &Palette, tIndexes *Indexes, tColor ColorFg,
       }
 }
 
+void cPalette::Replace(const cPalette &Palette)
+{
+  for (int i = 0; i < Palette.numColors; i++)
+      SetColor(i, Palette.color[i]);
+  numColors = Palette.numColors;
+}
+
 // --- cBitmap ---------------------------------------------------------------
 
 cBitmap::cBitmap(int Width, int Height, int Bpp, int X0, int Y0)
@@ -337,19 +344,28 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
      SetIndex(x, y, Index(Color));
 }
 
-void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)
+void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette)
 {
   if (bitmap && Bitmap.bitmap && Intersects(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1)) {
      if (Covers(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1))
         Reset();
      x -= x0;
      y -= y0;
-     tIndexes Indexes;
-     Take(Bitmap, &Indexes, ColorFg, ColorBg);
-     for (int ix = 0; ix < Bitmap.width; ix++) {
-         for (int iy = 0; iy < Bitmap.height; iy++)
-             SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
-         }
+     if (ReplacePalette && Covers(x + x0, y + y0, x + x0 + Bitmap.Width() - 1, y + y0 + Bitmap.Height() - 1)) {
+        Replace(Bitmap);
+        for (int ix = 0; ix < Bitmap.width; ix++) {
+            for (int iy = 0; iy < Bitmap.height; iy++)
+                SetIndex(x + ix, y + iy, Bitmap.bitmap[Bitmap.width * iy + ix]);
+            }
+        }
+     else {
+        tIndexes Indexes;
+        Take(Bitmap, &Indexes, ColorFg, ColorBg);
+        for (int ix = 0; ix < Bitmap.width; ix++) {
+            for (int iy = 0; iy < Bitmap.height; iy++)
+                SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
+            }
+        }
      }
 }
 
@@ -665,10 +681,10 @@ void cOsd::DrawPixel(int x, int y, tColor Color)
       bitmaps[i]->DrawPixel(x, y, Color);
 }
 
-void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)
+void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette)
 {
   for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg);
+      bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette);
 }
 
 void cOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
diff --git a/osd.h b/osd.h
index 2f5de4d0a..083d0f4ae 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.48 2005/05/14 11:15:55 kls Exp $
+ * $Id: osd.h 1.49 2005/06/19 10:35:25 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -84,6 +84,9 @@ class cPalette {
         ///< palette. If either of ColorFg or ColorBg is not zero, the first color
         ///< in Palette will be taken as ColorBg, and the second color will become
         ///< ColorFg.
+  void Replace(const cPalette &Palette);
+        ///< Replaces the colors of this palette with the colors from the given
+        ///< palette.
   };
 
 enum eTextAlignment { taCenter  = 0x00,
@@ -153,7 +156,7 @@ class cBitmap : public cPalette {
        ///< Sets the pixel at the given coordinates to the given Color, which is
        ///< a full 32 bit ARGB value.
        ///< If the coordinates are outside the bitmap area, no pixel will be set.
-  void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0);
+  void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false);
        ///< Sets the pixels in this bitmap with the data from the given
        ///< Bitmap, putting the upper left corner of the Bitmap at (x, y).
        ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
@@ -274,7 +277,7 @@ class cOsd {
        ///< If the OSD area has been divided into separate sub-areas, and the
        ///< given coordinates don't fall into any of these sub-areas, no pixel will
        ///< be set.
-  virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0);
+  virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false);
        ///< Sets the pixels in the OSD with the data from the given
        ///< Bitmap, putting the upper left corner of the Bitmap at (x, y).
        ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
diff --git a/osdbase.c b/osdbase.c
index 7d03dbd0f..98307cd3f 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.17 2005/06/12 10:44:22 kls Exp $
+ * $Id: osdbase.c 1.20 2005/06/18 10:30:51 kls Exp $
  */
 
 #include "osdbase.h"
@@ -261,54 +261,64 @@ bool cOsdMenu::SelectableItem(int idx)
 
 void cOsdMenu::CursorUp(void)
 {
-  if (current > 0) {
-     int tmpCurrent = current;
-     while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent))
-           ;
-     if (tmpCurrent < 0)
-        return;
-     if (tmpCurrent >= first)
-        DisplayCurrent(false);
-     current = tmpCurrent;
-     if (current < first) {
-        first = first > displayMenuItems - 1 ? first - (displayMenuItems - 1) : 0;
-        if (Setup.MenuScrollPage)
-           current = !SelectableItem(first) ? first + 1 : first;
-        Display();
+  int tmpCurrent = current;
+  int lastOnScreen = first + displayMenuItems - 1;
+  int last = Count() - 1;
+  while (--tmpCurrent != current) {
+        if (tmpCurrent < 0) {
+           if (Setup.MenuScrollWrap)
+              tmpCurrent = last;
+           else
+              return;
+           }
+        if (SelectableItem(tmpCurrent))
+           break;
         }
-     else
-        DisplayCurrent(true);
+  if (first <= tmpCurrent && tmpCurrent <= lastOnScreen)
+     DisplayCurrent(false);
+  current = tmpCurrent;
+  if (current < first) {
+     first = Setup.MenuScrollPage ? max(0, current - displayMenuItems + 1) : current;
+     Display();
      }
+  else if (current > lastOnScreen) {
+     first = max(0, current - displayMenuItems + 1);
+     Display();
+     }
+  else
+     DisplayCurrent(true);
 }
 
 void cOsdMenu::CursorDown(void)
 {
-  int last = Count() - 1;
+  int tmpCurrent = current;
   int lastOnScreen = first + displayMenuItems - 1;
-
-  if (current < last) {
-     int tmpCurrent = current;
-     while (++tmpCurrent <= last && !SelectableItem(tmpCurrent))
-           ;
-     if (tmpCurrent > last)
-        return;
-     if (tmpCurrent <= lastOnScreen)
-        DisplayCurrent(false);
-     current = tmpCurrent;
-     if (current > lastOnScreen) {
-        first += displayMenuItems - 1;
-        lastOnScreen = first + displayMenuItems - 1;
-        if (lastOnScreen > last) {
-           first = last - (displayMenuItems - 1);
-           lastOnScreen = last;
+  int last = Count() - 1;
+  while (++tmpCurrent != current) {
+        if (tmpCurrent > last) {
+           if (Setup.MenuScrollWrap)
+              tmpCurrent = 0;
+           else
+              return;
            }
-        if (Setup.MenuScrollPage)
-           current = !SelectableItem(lastOnScreen) ? lastOnScreen - 1 : lastOnScreen;
-        Display();
+        if (SelectableItem(tmpCurrent))
+           break;
         }
-     else
-        DisplayCurrent(true);
+  if (first <= tmpCurrent && tmpCurrent <= lastOnScreen)
+     DisplayCurrent(false);
+  current = tmpCurrent;
+  if (current > lastOnScreen) {
+     first = Setup.MenuScrollPage ? current : max(0, current - displayMenuItems + 1);
+     if (first + displayMenuItems > last)
+        first = max(0, last - displayMenuItems + 1);
+     Display();
      }
+  else if (current < first) {
+     first = current;
+     Display();
+     }
+  else
+     DisplayCurrent(true);
 }
 
 void cOsdMenu::PageUp(void)
@@ -341,6 +351,8 @@ void cOsdMenu::PageUp(void)
      Display();
      DisplayCurrent(true);
      }
+  else if (Setup.MenuScrollWrap)
+     CursorUp();
 }
 
 void cOsdMenu::PageDown(void) 
@@ -350,6 +362,10 @@ void cOsdMenu::PageDown(void)
   current += displayMenuItems;
   first += displayMenuItems;
   int last = Count() - 1;
+  if (current > last)
+     current = last;
+  if (first + displayMenuItems > last)
+     first = max(0, last - displayMenuItems + 1);
   int tmpCurrent = current;
   while (!SelectableItem(tmpCurrent) && ++tmpCurrent <= last)
         ;
@@ -369,6 +385,8 @@ void cOsdMenu::PageDown(void)
      Display();
      DisplayCurrent(true);
      }
+  else if (Setup.MenuScrollWrap)
+     CursorDown();
 }
 
 void cOsdMenu::Mark(void)
diff --git a/remux.c b/remux.c
index 83d135659..c4e7b2037 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.34 2005/06/04 14:49:25 kls Exp $
+ * $Id: remux.c 1.35 2005/06/19 10:17:00 kls Exp $
  */
 
 #include "remux.h"
@@ -1155,7 +1155,12 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
   resultBuffer->SetTimeouts(0, 100);
   if (VPid)
+//#define TEST_cVideoRepacker
+#ifdef TEST_cVideoRepacker
      ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0x00, 0x00, new cVideoRepacker);
+#else
+     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);
+#endif
   if (APids) {
      int n = 0;
      while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS)
diff --git a/timers.c b/timers.c
index b6307e068..f69033673 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.32 2005/06/11 14:19:58 kls Exp $
+ * $Id: timers.c 1.33 2005/06/18 12:49:55 kls Exp $
  */
 
 #include "timers.h"
@@ -363,6 +363,8 @@ bool cTimer::Matches(time_t t, bool Directly) const
 
   if (HasFlags(tfActive)) {
      if (HasFlags(tfVps) && !Directly && event && event->Vps() && schedule && schedule->PresentSeenWithin(30)) {
+        if (startTime != event->Vps())
+           return false;
         startTime = event->StartTime();
         stopTime = event->EndTime();
         return event->IsRunning(true);
@@ -384,15 +386,17 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
   if (HasFlags(tfActive) && channel->GetChannelID() == Event->ChannelID()) {
      bool UseVps = HasFlags(tfVps) && Event->Vps();
      Matches(UseVps ? Event->Vps() : Event->StartTime(), true);
-     int overlap;
+     int overlap = 0;
      if (UseVps)
         overlap = (startTime == Event->Vps()) ? FULLMATCH + (Event->IsRunning() ? 200 : 100) : 0;
-     else if (startTime <= Event->StartTime() && Event->EndTime() <= stopTime)
-        overlap = FULLMATCH;
-     else if (stopTime <= Event->StartTime() || Event->EndTime() <= startTime)
-        overlap = 0;
-     else
-        overlap = (min(stopTime, Event->EndTime()) - max(startTime, Event->StartTime())) * FULLMATCH / max(Event->Duration(), 1);
+     if (!overlap) {
+        if (startTime <= Event->StartTime() && Event->EndTime() <= stopTime)
+           overlap = FULLMATCH;
+        else if (stopTime <= Event->StartTime() || Event->EndTime() <= startTime)
+           overlap = 0;
+        else
+           overlap = (min(stopTime, Event->EndTime()) - max(startTime, Event->StartTime())) * FULLMATCH / max(Event->Duration(), 1);
+        }
      startTime = stopTime = 0;
      if (Overlap)
         *Overlap = overlap;
diff --git a/vdr.c b/vdr.c
index 10a5888f3..bd9de2fdc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.207 2005/05/26 10:45:29 kls Exp $
+ * $Id: vdr.c 1.208 2005/06/18 11:19:07 kls Exp $
  */
 
 #include <getopt.h>
@@ -302,17 +302,6 @@ int main(int argc, char *argv[])
      return 0;
      }
 
-#ifdef _CS_GNU_LIBPTHREAD_VERSION
-  // Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
-  char LibPthreadVersion[128];
-  if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
-     if (strstr(LibPthreadVersion, "NPTL")) {
-        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
-        return 2;
-        }
-     }
-#endif
-
   // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
   char *LangEnv;
   if ((LangEnv = getenv("LANG"))     != NULL && strcasestr(LangEnv, "utf") ||

From 4c5de2888331fb4372eba0b0f4364fd9a0197b17 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 7 Aug 2005 18:00:00 +0200
Subject: [PATCH 120/307] =?UTF-8?q?Version=201.3.28=20-=20Added=20a=20slee?=
 =?UTF-8?q?p=20in=20cDvbPlayer::Action()=20in=20case=20there=20is=20no=20d?=
 =?UTF-8?q?ata=20to=20send=20to=20the=20=20=20device,=20which=20avoids=20a?=
 =?UTF-8?q?=20busy=20loop=20on=20very=20fast=20machines=20(thanks=20to=20M?=
 =?UTF-8?q?artin=20Wache).=20-=20Modified=20the=20description=20of=20cDevi?=
 =?UTF-8?q?ce::Poll()=20to=20avoid=20misunderstandings.=20-=20Updated=20Cr?=
 =?UTF-8?q?oatian=20language=20texts=20(thanks=20to=20Drazen=20Dupor).=20-?=
 =?UTF-8?q?=20cDvbPlayer::Goto()=20now=20appends=20a=20Sequence=20End=20Co?=
 =?UTF-8?q?de=20to=20get=20the=20image=20shown=20=20=20immediately=20with?=
 =?UTF-8?q?=20softdevices=20(thanks=20to=20Reinhard=20Nissl).=20-=20Reacti?=
 =?UTF-8?q?vated=20cVideoRepacker=20in=20remux.c=20after=20some=20fixes=20?=
 =?UTF-8?q?(thanks=20to=20Reinhard=20Nissl).=20-=20Removed=20the=20fix=20f?=
 =?UTF-8?q?or=20handling=20VPS=20timers,=20so=20that=20they=20only=20recor?=
 =?UTF-8?q?d=20if=20the=20event=20=20=20they=20are=20assigned=20to=20actua?=
 =?UTF-8?q?lly=20has=20the=20given=20VPS=20time.=20This=20has=20caused=20r?=
 =?UTF-8?q?epeating=20=20=20VPS=20timers=20to=20stop=20recording=20prematu?=
 =?UTF-8?q?rely.=20-=20Avoiding=20duplicate=20components=20in=20EPG=20even?=
 =?UTF-8?q?ts=20when=20reading=20epg.data=20or=20in=20the=20=20=20PUTE=20S?=
 =?UTF-8?q?VDRP=20command=20(thanks=20to=20Olaf=20Titz=20for=20reporting?=
 =?UTF-8?q?=20this=20one).=20-=20Added=20the=20command=20line=20options=20?=
 =?UTF-8?q?'--lirc',=20'--rcu'=20and=20'--no-kbd'=20to=20allow=20setting?=
 =?UTF-8?q?=20=20=20the=20remote=20control=20at=20runtime=20(based=20on=20?=
 =?UTF-8?q?a=20patch=20by=20Darren=20Salt).=20-=20Now=20checking=20whether?=
 =?UTF-8?q?=20timers=20or=20channels=20are=20currently=20being=20edited=20?=
 =?UTF-8?q?via=20the=20menu=20=20=20before=20making=20changes=20through=20?=
 =?UTF-8?q?SVDRP=20(thanks=20to=20Andreas=20Brugger=20for=20reporting=20a?=
 =?UTF-8?q?=20=20=20problem=20with=20this).=20-=20Files=20and=20directorie?=
 =?UTF-8?q?s=20are=20now=20created=20with=20rights=20according=20to=20the?=
 =?UTF-8?q?=20shell's=20=20=20umask=20settings=20(thanks=20to=20Andreas=20?=
 =?UTF-8?q?Brachold).=20-=20Fixed=20the=20cChannel=20copy=20constructor=20?=
 =?UTF-8?q?(thanks=20to=20Marcel=20Wiesweg=20for=20pointing=20out=20=20=20?=
 =?UTF-8?q?a=20problem=20with=20it).=20-=20Fixed=20an=20out-of-bounds=20me?=
 =?UTF-8?q?mory=20access=20with=20audio=20language=20ids=20(thanks=20to=20?=
 =?UTF-8?q?=20=20Matthias=20Lenk=20for=20reporting,=20and=20Udo=20Richter?=
 =?UTF-8?q?=20for=20suggesting=20a=20fix).=20-=20Updated=20the=20Finnish?=
 =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Added?=
 =?UTF-8?q?=20missing=20storing=20of=20the=20MenuScrollPage=20parameter=20?=
 =?UTF-8?q?(thanks=20to=20Frank=20Kr=C3=B6mmelbein).=20-=20Added=20cRemux:?=
 =?UTF-8?q?:SetTimeouts()=20for=20better=20use=20of=20cRemux=20in=20a=20si?=
 =?UTF-8?q?ngle=20thread=20(thanks=20=20=20to=20Udo=20Richter=20for=20repo?=
 =?UTF-8?q?rting=20a=20problem=20with=20this).=20-=20Modified=20cEITScanne?=
 =?UTF-8?q?r::Process()=20so=20that=20it=20uses=20the=20primary=20device?=
 =?UTF-8?q?=20if=20it=20is=20=20=20replaying=20and=20is=20the=20only=20dev?=
 =?UTF-8?q?ice=20that=20provides=20the=20given=20transponder,=20and=20that?=
 =?UTF-8?q?=20=20=20a=20forced=20EPG=20scan=20works=20even=20if=20EPG=20sc?=
 =?UTF-8?q?an=20timeout=20is=20set=20to=200=20(thanks=20to=20=20=20Bernhar?=
 =?UTF-8?q?d=20Stegmaier=20for=20reporting=20a=20problem=20with=20this).?=
 =?UTF-8?q?=20-=20Fixed=20cDvbSpuBitmap::putPixel()=20(thanks=20to=20Reinh?=
 =?UTF-8?q?ard=20Nissl).=20-=20Fixed=20setting=20system=20time=20to=20avoi?=
 =?UTF-8?q?d=20time=20jumps=20in=20case=20of=20faulty=20data=20(thanks=20?=
 =?UTF-8?q?=20=20to=20Andreas=20B=C3=B6ttger).=20-=20Fixed=20a=20memory=20?=
 =?UTF-8?q?leak=20in=20the=20SVDRP=20command=20LSTE=20(thanks=20to=20Stefa?=
 =?UTF-8?q?n=20Huelswitt).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                      |  37 ++++-
 HISTORY                           |  38 +++++
 INSTALL                           |  16 +-
 Make.config.template              |   7 +-
 Makefile                          |  10 +-
 PLUGINS/src/sky/channels.conf.sky |   8 +-
 channels.c                        |  53 ++++---
 channels.conf                     |  43 +++---
 channels.h                        |   3 +-
 config.c                          |   3 +-
 config.h                          |   6 +-
 device.h                          |   5 +-
 dvbplayer.c                       |  29 +++-
 dvbspu.c                          |   4 +-
 eit.c                             |  18 ++-
 eitscan.c                         |   9 +-
 epg.c                             |   4 +-
 i18n.c                            |  30 ++--
 lirc.c                            |   4 +-
 lirc.h                            |   4 +-
 pat.c                             |   8 +-
 rcu.c                             |   4 +-
 rcu.h                             |   4 +-
 recording.c                       |   6 +-
 remux.c                           | 241 ++++++++++++++++++++++--------
 remux.h                           |   8 +-
 svdrp.c                           | 177 ++++++++++++----------
 timers.c                          |   4 +-
 tools.c                           |   8 +-
 tools.h                           |   4 +-
 vdr.1                             |  15 +-
 vdr.c                             |  47 ++++--
 videodir.c                        |   4 +-
 33 files changed, 589 insertions(+), 272 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cc43b028c..770a08077 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -199,6 +199,7 @@ Stefan Huelswitt <huels@iname.com>
  for fixing a memory leak in cDvbPlayer
  for pointing out that recordings with empty episode names were not listed correctly
  in the LSTR command
+ for fixing a memory leak in the SVDRP command LSTE
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -469,6 +470,7 @@ Oliver Lorei <oliverlorei@cityweb.de>
 
 Andreas B�ttger <fboettger@t-online.de>
  for reporting a bug in skipping forward in time shift mode near the end of the recording
+ for fixing setting system time to avoid time jumps in case of faulty data
 
 Onno Kreuzinger <ok@solutas.net>
  for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
@@ -731,6 +733,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for adding a few missing initializations
  for adding play mode pmVideoOnly
  for fixing a possible crash with inconsistent SI data
+ for pointing out a problem with the cChannel copy constructor
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -817,6 +820,8 @@ Andreas Brachold <vdr04@deltab.de>
  for generating file dependencies
  for suggesting that the 'plugins-clean' target of the Makefile should only delete
  the actual plugin library files from this version of VDR
+ for making files and directories created with rights according to the shell's
+ umask settings
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -961,6 +966,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for implementing cVideoRepacker in remux.c to make sure every PES packet contains
  only data from one frame
  for fixing the call to Channels.Unlock() in cEITScanner::Process()
+ for making cDvbPlayer::Goto() append a Sequence End Code to get the image shown
+ immediately with softdevices
+ for fixing cDvbSpuBitmap::putPixel()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1243,6 +1251,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a problem in handling page up/down in menu lists in case there are
  several non selectable items in a row
  for fixing handling 'page down' after it was broken in version 1.3.26
+ for suggesting a fix for an out-of-bounds memory access with audio language ids
+ for reporting a problem with cRemux in a single thread
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1269,12 +1279,14 @@ Joachim Wilke <vdr@joachim-wilke.de>
  for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
 
 Sascha Klek <sklek@gmx.de>
-  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
+ for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
 
 Andreas Brugger <brougs78@gmx.net>
-  for reporting a possible crash when pausing live video and the recording was
-  unable to start, maybe because there was no lock on the device
-  for reporting the missing Euro sign in iso8859-1
+ for reporting a possible crash when pausing live video and the recording was
+ unable to start, maybe because there was no lock on the device
+ for reporting the missing Euro sign in iso8859-1
+ for reporting a problem with making changes to timers through SVDRP while they
+ are being edited via the menu
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
@@ -1285,10 +1297,13 @@ Olaf Titz <olaf@bigred.inka.de>
  for fixing some typos in the Makefile's 'font' target
  for reporting a problem and some advice in fixing a possible freeze in pause mode
  in case a device's PlayPesPacket() function permanently returns 0
+ for reporting excess memory consumption due to duplicate components in EPG events
 
 Darren Salt <linux@youmustbejoking.demon.co.uk>
  for pointing out that the '-' and '�' characters need to be escaped in the man
  pages
+ for a patch that was used to add the command line options '--lirc', '--rcu' and
+ '--no-kbd'
 
 Sean Carlos <seanc@libero.it>
  for translating OSD texts to the Italian language
@@ -1388,3 +1403,17 @@ Georg Acher <acher@baycom.de>
 Henrik Niehaus <henrik.niehaus@gmx.de>
  for reporting a problem with timers with a day given as MTWTF--@6, i.e. a repeating
  timer with first day not as full date, but just day of month
+
+Martin Wache <M.Wache@gmx.net>
+ for adding a sleep in cDvbPlayer::Action() in case there is no data to send to the
+ device, which avoids a busy loop on very fast machines
+
+Matthias Lenk <matthias.lenk@amd.com>
+ for reporting an out-of-bounds memory access with audio language ids
+
+Frank Kr�mmelbein <kroemmelbein@gmx.de>
+ for adding missing storing of the MenuScrollPage parameter
+
+Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
+ for reporting a problem in cEITScanner::Process() with forced EPG scans if EPG
+ scan timeout is set to 0
diff --git a/HISTORY b/HISTORY
index cf24ffbe7..c55f6fd23 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3633,3 +3633,41 @@ Video Disk Recorder Revision History
 - When drawing a bitmap to the OSD, the existing palette of the target can now be
   replaced with the new one instead of adding the new entries (thanks to Andreas
   Regel).
+
+2005-08-07: Version 1.3.28
+
+- Added a sleep in cDvbPlayer::Action() in case there is no data to send to the
+  device, which avoids a busy loop on very fast machines (thanks to Martin Wache).
+- Modified the description of cDevice::Poll() to avoid misunderstandings.
+- Updated Croatian language texts (thanks to Drazen Dupor).
+- cDvbPlayer::Goto() now appends a Sequence End Code to get the image shown
+  immediately with softdevices (thanks to Reinhard Nissl).
+- Reactivated cVideoRepacker in remux.c after some fixes (thanks to Reinhard Nissl).
+- Removed the fix for handling VPS timers, so that they only record if the event
+  they are assigned to actually has the given VPS time. This has caused repeating
+  VPS timers to stop recording prematurely.
+- Avoiding duplicate components in EPG events when reading epg.data or in the
+  PUTE SVDRP command (thanks to Olaf Titz for reporting this one).
+- Added the command line options '--lirc', '--rcu' and '--no-kbd' to allow setting
+  the remote control at runtime (based on a patch by Darren Salt).
+- Now checking whether timers or channels are currently being edited via the menu
+  before making changes through SVDRP (thanks to Andreas Brugger for reporting a
+  problem with this).
+- Files and directories are now created with rights according to the shell's
+  umask settings (thanks to Andreas Brachold).
+- Fixed the cChannel copy constructor (thanks to Marcel Wiesweg for pointing out
+  a problem with it).
+- Fixed an out-of-bounds memory access with audio language ids (thanks to
+  Matthias Lenk for reporting, and Udo Richter for suggesting a fix).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added missing storing of the MenuScrollPage parameter (thanks to Frank Kr�mmelbein).
+- Added cRemux::SetTimeouts() for better use of cRemux in a single thread (thanks
+  to Udo Richter for reporting a problem with this).
+- Modified cEITScanner::Process() so that it uses the primary device if it is
+  replaying and is the only device that provides the given transponder, and that
+  a forced EPG scan works even if EPG scan timeout is set to 0 (thanks to
+  Bernhard Stegmaier for reporting a problem with this).
+- Fixed cDvbSpuBitmap::putPixel() (thanks to Reinhard Nissl).
+- Fixed setting system time to avoid time jumps in case of faulty data (thanks
+  to Andreas B�ttger).
+- Fixed a memory leak in the SVDRP command LSTE (thanks to Stefan Huelswitt).
diff --git a/INSTALL b/INSTALL
index 581a5d919..778dd6c19 100644
--- a/INSTALL
+++ b/INSTALL
@@ -45,17 +45,23 @@ installed.
 IMPORTANT: See "Configuration files" below for information on how
 =========  to set up the configuration files at the proper location!
 
-By default the 'vdr' program can be controlled via the PC keyboard. If you have
-an infrared remote control unit you can define the REMOTE macro to one of the
-following values in the 'make' call to activate the respective control mode:
+By default the 'vdr' program can be controlled via the PC keyboard.
+If you want to disable control via the keyboard, you can add NO_KBD=1
+to the 'make' call, or use the '--no-kbd' option at runtime.
+
+If you have an infrared remote control unit you can define the REMOTE macro
+to one of the following values in the 'make' call to make the respective control
+the default:
 
   REMOTE=RCU    control via the "Remote Control Unit" receiver
                 (see http://www.cadsoft.de/vdr/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
 
-If you want to disable control via the PC keyboard, you can add NO_KBD=1
-to the 'make' call.
+Alternatively you can use the '--rcu' or '--lirc' options at runtime.
+These options accept an optional path to the remote control device,
+which's defaults can be set via the RCU_DEVICE and LIRC_DEVICE macros,
+respectively.
 
 If your video directory will be on a VFAT partition, add the compile
 time switch
diff --git a/Make.config.template b/Make.config.template
index 3c429e77d..149ce9861 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.4 2005/05/14 10:32:33 kls Exp $
+# $Id: Make.config.template 1.5 2005/07/31 11:35:28 kls Exp $
 
 ### The C compiler and options:
 
@@ -25,3 +25,8 @@ BINDIR   = /usr/local/bin
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
 VIDEODIR = /video
+
+### The remote control:
+
+LIRC_DEVICE = /dev/lircd
+RCU_DEVICE  = /dev/ttyS1
diff --git a/Makefile b/Makefile
index 7bc8a57d2..121423906 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.75 2005/05/14 10:32:13 kls Exp $
+# $Id: Makefile 1.76 2005/07/31 11:20:20 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -65,8 +65,14 @@ SMLFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
 endif
-
+ifdef REMOTE
 DEFINES += -DREMOTE_$(REMOTE)
+endif
+
+LIRC_DEVICE ?= /dev/lircd
+RCU_DEVICE  ?= /dev/ttyS1
+
+DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
 
 DEFINES += -D_GNU_SOURCE
 
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
index d40837fc9..52d1a8731 100644
--- a/PLUGINS/src/sky/channels.conf.sky
+++ b/PLUGINS/src/sky/channels.conf.sky
@@ -18,17 +18,17 @@
 #
 S28.2E-2-2027-4705:106:sky_one
 S28.2E-2-2027-5104:107:sky_one_mix
-S28.2E-2-2054-10240:118:itv2
+S28.2E-2-2044-10070:118:itv2
 S28.2E-2-2023-4905:130:scifi
 S28.2E-2-2025-5904:127:paramount
 S28.2E-2-2009-6201:551:discovery
-S28.2E-2-2020-4809:310:sky_cinema
+S28.2E-2-2030-4809:310:sky_cinema
 S28.2E-2-2007-4303:301:sky_movies1
 S28.2E-2-2007-4302:302:sky_movies2
 S28.2E-2-2007-4403:303:sky_movies3
 S28.2E-2-2011-4402:304:sky_movies4
 S28.2E-2-2011-4503:305:sky_movies5
 S28.2E-2-2011-4502:306:sky_movies6
-S28.2E-2-2020-4603:307:sky_movies7
+S28.2E-2-2030-4603:307:sky_movies7
 S28.2E-2-2007-5502:308:sky_movies8
-S28.2E-2-2020-4602:309:x
+S28.2E-2-2030-4602:309:sky_movies9
diff --git a/channels.c b/channels.c
index b2d741e6c..85778526f 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.42 2005/05/29 10:32:38 kls Exp $
+ * $Id: channels.c 1.44 2005/08/06 12:22:41 kls Exp $
  */
 
 #include "channels.h"
@@ -179,27 +179,13 @@ cChannel::cChannel(void)
 
 cChannel::cChannel(const cChannel &Channel)
 {
-  name = strdup("");
-  shortName = strdup("");
-  provider = strdup("");
-  portalName = strdup("");
-  *this = Channel;
-  vpid         = 0;
-  ppid         = 0;
-  apids[0]     = 0;
-  dpids[0]     = 0;
-  spids[0]     = 0;
-  tpid         = 0;
-  caids[0]     = 0;
-  nid          = 0;
-  tid          = 0;
-  sid          = 0;
-  rid          = 0;
-  number       = 0;
-  groupSep     = false;
-  modification = CHANNELMOD_NONE;
+  name = NULL;
+  shortName = NULL;
+  provider = NULL;
+  portalName = NULL;
   linkChannels = NULL;
   refChannel   = NULL;
+  *this = Channel;
 }
 
 cChannel::~cChannel()
@@ -265,6 +251,24 @@ int cChannel::Modification(int Mask)
   return Result;
 }
 
+void cChannel::CopyTransponderData(const cChannel *Channel)
+{
+  if (Channel) {
+     frequency    = Channel->frequency;
+     source       = Channel->source;
+     srate        = Channel->srate;
+     polarization = Channel->polarization;
+     inversion    = Channel->inversion;
+     bandwidth    = Channel->bandwidth;
+     coderateH    = Channel->coderateH;
+     coderateL    = Channel->coderateL;
+     modulation   = Channel->modulation;
+     transmission = Channel->transmission;
+     guard        = Channel->guard;
+     hierarchy    = Channel->hierarchy;
+     }
+}
+
 bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
 {
   // Workarounds for broadcaster stupidity:
@@ -442,14 +446,16 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dp
      dsyslog("changing pids of channel %d from %d+%d:%s:%d to %d+%d:%s:%d", Number(), vpid, ppid, OldApidsBuf, tpid, Vpid, Ppid, NewApidsBuf, Tpid);
      vpid = Vpid;
      ppid = Ppid;
-     for (int i = 0; i <= MAXAPIDS; i++) { // <= to copy the terminating 0
+     for (int i = 0; i < MAXAPIDS; i++) {
          apids[i] = Apids[i];
          strn0cpy(alangs[i], ALangs[i], 4);
          }
-     for (int i = 0; i <= MAXDPIDS; i++) { // <= to copy the terminating 0
+     apids[MAXAPIDS] = 0;
+     for (int i = 0; i < MAXDPIDS; i++) {
          dpids[i] = Dpids[i];
          strn0cpy(dlangs[i], DLangs[i], 4);
          }
+     dpids[MAXDPIDS] = 0;
      tpid = Tpid;
      modification |= mod;
      Channels.SetModified();
@@ -977,7 +983,8 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
 {
   if (Transponder) {
      dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, *cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
-     cChannel *NewChannel = new cChannel(*Transponder);
+     cChannel *NewChannel = new cChannel;
+     NewChannel->CopyTransponderData(Transponder);
      NewChannel->SetId(Nid, Tid, Sid, Rid);
      NewChannel->SetName(Name, ShortName, Provider);
      Add(NewChannel);
diff --git a/channels.conf b/channels.conf
index 7243e9c87..c48bd9486 100644
--- a/channels.conf
+++ b/channels.conf
@@ -6,10 +6,10 @@ Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
-SR Fernsehen S�dwest;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
+SR S�DWEST Ferns.;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
-S�DWEST BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
+S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch:230:0:28007:1:1079:0
@@ -23,14 +23,14 @@ Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:
 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
 NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
-DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0
+DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
-Veronica/JETIX;CANAL+:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
-BVN;CANAL+:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
+Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
+BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
@@ -44,13 +44,13 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1722,1702,1801:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1801,1722,1702:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1801,1702:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
@@ -59,12 +59,12 @@ BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1801,1722
 DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
 :Sportsworld
 PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
-.,.;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1702,1801:27:133:4:0
+PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1801,1702:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
+ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
@@ -79,7 +79,7 @@ ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
-Yorin;CANAL+:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
+Yorin;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
@@ -89,7 +89,7 @@ TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Mix;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng:2353:960,961:10240:2:2054:0
+ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng:2317:960,961:10070:2:2044:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
@@ -99,19 +99,18 @@ Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;688=eng:584:
 Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4402:2:2011:0
 Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4503:2:2011:0
 Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4502:2:2011:0
-Sky Movies 7;BSkyB:12090:vC23:S28.2E:27500:2312+2304:2313=eng,2314=NAR:2315:960,961:4603:2:2020:0
+Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4603:2:2030:0
 Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:5502:2:2007:0
-Sky Movies 9;BSkyB:12090:vC23:S28.2E:27500:2308+2304:2309=eng,2310=NAR:2311:960,961:4602:2:2020:0
-Sky Cinema 1;BSkyB:12090:vC23:S28.2E:27500:2305+2304:2306=eng:2307:960,961:4809:2:2020:0
-Sky Cinema 2;BSkyB:12090:vC23:S28.2E:27500:2316+2304:2317=eng:2318:960,961:4802:2:2020:0
+Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,666=NAR:582:960,961:4602:2:2030:0
+Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:4809:2:2030:0
+Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
 WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
-Going Places:10920:hC56:S28.2E:22000:2310+2304:2311=eng:2312:0:5008:2:2055:0
 Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
-BBC PARL'MNT:12129:vC23:S28.2E:27500:2304:2306=eng,2307=eng:2305:0:7300:2:2022:0
+BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 Bethel TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
diff --git a/channels.h b/channels.h
index 3cb7e8f8f..537204241 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.32 2005/05/28 13:57:08 kls Exp $
+ * $Id: channels.h 1.33 2005/08/06 11:23:32 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -181,6 +181,7 @@ class cChannel : public cListObject {
   bool IsTerr(void) const { return cSource::IsTerr(source); }
   tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
   int Modification(int Mask = CHANNELMOD_ALL);
+  void CopyTransponderData(const cChannel *Channel);
   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
   bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
diff --git a/config.c b/config.c
index 88457779c..15e5f424a 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.134 2005/06/18 10:30:02 kls Exp $
+ * $Id: config.c 1.135 2005/08/07 09:03:00 kls Exp $
  */
 
 #include "config.h"
@@ -472,6 +472,7 @@ bool cSetup::Save(void)
   Store("OSDTheme",           OSDTheme);
   Store("PrimaryDVB",         PrimaryDVB);
   Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch);
+  Store("MenuScrollPage",     MenuScrollPage);
   Store("MenuScrollWrap",     MenuScrollWrap);
   Store("MarkInstantRecord",  MarkInstantRecord);
   Store("NameInstantRecord",  NameInstantRecord);
diff --git a/config.h b/config.h
index 439e8f032..cce09e9ef 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.221 2005/06/18 10:29:25 kls Exp $
+ * $Id: config.h 1.222 2005/07/30 09:19:25 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.27"
-#define VDRVERSNUM   10327  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.28"
+#define VDRVERSNUM   10328  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.h b/device.h
index 06380fe9c..70092a9a1 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.59 2005/06/12 13:35:47 kls Exp $
+ * $Id: device.h 1.60 2005/07/30 09:31:53 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -444,8 +444,7 @@ class cDevice : public cThread {
        ///< Returns true if the device itself or any of the file handles in
        ///< Poller is ready for further action.
        ///< If TimeoutMs is not zero, the device will wait up to the given number
-       ///< of milleseconds before returning in case there is no immediate
-       ///< need for data.
+       ///< of milleseconds before returning in case it can't accept any data.
   virtual bool Flush(int TimeoutMs = 0);
        ///< Returns true if the device's output buffers are empty, i. e. any
        ///< data which was bufferd so far has been processed.
diff --git a/dvbplayer.c b/dvbplayer.c
index 2d4e1e48b..cd002a778 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.34 2005/05/22 11:26:51 kls Exp $
+ * $Id: dvbplayer.c 1.36 2005/07/30 10:00:24 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -497,6 +497,8 @@ void cDvbPlayer::Action(void)
                  p = NULL;
                  }
               }
+           else
+              Sleep = true;
            }
         }
   active = running = false;
@@ -666,11 +668,34 @@ void cDvbPlayer::Goto(int Index, bool Still)
      int FileOffset, Length;
      Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
      if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
-        uchar b[MAXFRAMESIZE];
+        uchar b[MAXFRAMESIZE + 4 + 5 + 4];
         int r = ReadFrame(replayFile, b, Length, sizeof(b));
         if (r > 0) {
            if (playMode == pmPause)
               DevicePlay();
+           // append sequence end code to get the image shown immediately with softdevices
+           if (r > 6) { // should be always true
+              b[r++] = 0x00;
+              b[r++] = 0x00;
+              b[r++] = 0x01;
+              b[r++] = b[3];
+              if (b[6] & 0x80) { // MPEG 2
+                 b[r++] = 0x00;
+                 b[r++] = 0x07;
+                 b[r++] = 0x80;
+                 b[r++] = 0x00;
+                 b[r++] = 0x00;
+                 }
+              else { // MPEG 1
+                 b[r++] = 0x00;
+                 b[r++] = 0x05;
+                 b[r++] = 0x0F;
+                 }
+              b[r++] = 0x00;
+              b[r++] = 0x00;
+              b[r++] = 0x01;
+              b[r++] = 0xB7;
+              }
            DeviceStillPicture(b, r);
            }
         playMode = pmStill;
diff --git a/dvbspu.c b/dvbspu.c
index 9c8da3b42..d9730c570 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.14 2005/05/07 11:13:48 kls Exp $
+ * $Id: dvbspu.c 1.15 2005/08/07 12:06:32 kls Exp $
  */
 
 #include <assert.h>
@@ -155,7 +155,7 @@ void cDvbSpuBitmap::putPixel(int xp, int yp, int len, uint8_t colorid)
     setMin(minsize[colorid].x1, xp);
     setMin(minsize[colorid].y1, yp);
     setMax(minsize[colorid].x2, xp + len - 1);
-    setMax(minsize[colorid].y2, yp + len - 1);
+    setMax(minsize[colorid].y2, yp);
 }
 
 static uint8_t getBits(uint8_t * &data, uint8_t & bitf)
diff --git a/eit.c b/eit.c
index ef21e3272..42229f8f9 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.108 2005/06/11 15:31:21 kls Exp $
+ * $Id: eit.c 1.109 2005/08/07 13:52:29 kls Exp $
  */
 
 #include "eit.h"
@@ -252,11 +252,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
 class cTDT : public SI::TDT {
 private:
   static cMutex mutex;
+  static int lastDiff;
 public:
   cTDT(const u_char *Data);
   };
 
 cMutex cTDT::mutex;
+int cTDT::lastDiff = 0;
 
 cTDT::cTDT(const u_char *Data)
 :SI::TDT(Data, false)
@@ -266,12 +268,16 @@ cTDT::cTDT(const u_char *Data)
   time_t sattim = getTime();
   time_t loctim = time(NULL);
 
-  if (abs(sattim - loctim) > 2) {
+  int diff = abs(sattim - loctim);
+  if (diff > 2) {
      mutex.Lock();
-     isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim);
-     isyslog("Local Time  = %s (%ld)\n", *TimeToString(sattim), sattim);
-     if (stime(&sattim) < 0)
-        esyslog("ERROR while setting system time: %m");
+     if (abs(diff - lastDiff) < 3) {
+        isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim);
+        isyslog("Local Time  = %s (%ld)\n", *TimeToString(sattim), sattim);
+        if (stime(&sattim) < 0)
+           esyslog("ERROR while setting system time: %m");
+        }
+     lastDiff = diff;
      mutex.Unlock();
      }
 }
diff --git a/eitscan.c b/eitscan.c
index 6b5f02248..3894bcac2 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.26 2005/06/12 14:09:45 kls Exp $
+ * $Id: eitscan.c 1.27 2005/08/07 11:29:54 kls Exp $
  */
 
 #include "eitscan.h"
@@ -127,7 +127,7 @@ void cEITScanner::Activity(void)
 
 void cEITScanner::Process(void)
 {
-  if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
+  if ((Setup.EPGScanTimeout || !lastActivity) && Channels.MaxNumber() > 1) { // !lastActivity means a scan was forced
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         if (Channels.Lock(false, 10)) {
@@ -150,8 +150,9 @@ void cEITScanner::Process(void)
                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
                             if (Device->ProvidesTransponder(Channel)) {
                                if (!Device->Receiving()) {
-                                  if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && Setup.EPGScanTimeout && now - lastActivity > Setup.EPGScanTimeout * 3600)) {
-                                     if (Device == cDevice::ActualDevice() && !currentChannel) {
+                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying();
+                                  if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
+                                     if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
                                         if (cTransferControl::ReceiverDevice())
                                            cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                                         currentChannel = Device->CurrentChannel();
diff --git a/epg.c b/epg.c
index 05c6d742f..038f9c60d 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.35 2005/06/05 12:17:15 kls Exp $
+ * $Id: epg.c 1.36 2005/07/30 14:44:54 kls Exp $
  */
 
 #include "epg.h"
@@ -298,6 +298,8 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                           if (n == 3 || n == 4) {
                              Event = (cEvent *)Schedule->GetEvent(EventID, StartTime);
                              cEvent *newEvent = NULL;
+                             if (Event)
+                                DELETENULL(Event->components);
                              if (!Event)
                                 Event = newEvent = new cEvent(EventID);
                              if (Event) {
diff --git a/i18n.c b/i18n.c
index 1bc798b0b..aeb174fc8 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.195 2005/06/18 10:42:31 kls Exp $
+ * $Id: i18n.c 1.197 2005/08/06 16:09:44 kls Exp $
  *
  * Translations provided by:
  *
@@ -416,7 +416,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Info",
     "Info",
     "",//TODO
   },
@@ -2332,7 +2332,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "����������� ����!",
-    "",//TODO
+    "Audio nedostupan",
     "Audio k�ttesaamatu!",
     "Ingen lyd tilg�ngelig!",
   },
@@ -2859,7 +2859,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "����� ���������� � ������ (���)",
-    "",// TODO
+    "Vrijeme prikaza informacije o programu (s)",
     "Kanaliteate esitusaeg (s)",
     "Tid kanalinfo skal vises (s)",
   },
@@ -2892,7 +2892,7 @@ const tI18nPhrase Phrases[] = {
     "Scroll da p�gina no menu",
     "Scrolling par pages",
     "Rask rulling i menyer",
-    "Valikkosivujen pikaselaus",
+    "Valikoiden vieritys sivuttain",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
     "������ �������",
@@ -2913,6 +2913,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Valikoiden vieritys ymp�ri",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2921,8 +2922,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "S kraja sko�i na po�etak",
     "",// TODO
     "",// TODO
   },
@@ -3153,7 +3153,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "�������������� �����������",
-    "",//TODO
+    "Format video prikaza",
     "Video kuvamise formaat",
     "Video display format",
   },
@@ -3258,7 +3258,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "�������� Dolby Digital",
-    "",//TODO
+    "Koristi Dolby Digital",
     "Dolby Digital kasutamine",
     "Anvend Dolby Digital",
   },
@@ -3384,7 +3384,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "�������������� ����� (����)",
-    "",//TODO
+    "Audio jezici",
     "Audio keeled",
     "Audio sprog (ant.)",
   },
@@ -3405,7 +3405,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "������",
-    "",//TODO
+    "Audio jezik",
     "Audio keel",
     "Audio sprog",
   },
@@ -3909,7 +3909,7 @@ const tI18nPhrase Phrases[] = {
     "Min. esem�ny sz�net (min)",
     "Temps m�nim en pausa (min)",
     "���. ����� �������� ������� (���)",
-    "Najmanje vrijeme pauze",
+    "Minimalno vrijeme pauze",
     "Min. s�ndmuse kestus (min)",
     "Mindste h�ndelsespause (min)",
   },
@@ -3930,7 +3930,7 @@ const tI18nPhrase Phrases[] = {
     "Min. kezel�si aktivit�s (min)",
     "Temps m�nim d'inactivitat (min)",
     "���. ����� �������� ����� (���)",
-    "Najmanje vrijeme neaktivnosti (min)",
+    "Minimalno vrijeme neaktivnosti (min)",
     "Min. kasutaja tegevusetus (min)",
     "Min. bruger inaktivitet (min)",
   },
@@ -5300,7 +5300,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Po�injem EPG-scan",
     "EPG skaneerimine k�ivitatud",
     "Starter EPG skanning",
   },
@@ -5384,7 +5384,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Bez titla",
     "",// TODO
     "",// TODO
   },
diff --git a/lirc.c b/lirc.c
index dbda75c29..0714049bb 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.10 2005/01/14 14:18:42 kls Exp $
+ * $Id: lirc.c 1.11 2005/07/31 10:18:09 kls Exp $
  */
 
 #include "lirc.h"
@@ -18,7 +18,7 @@
 #define REPEATDELAY 350 // ms
 #define KEYPRESSDELAY 150 // ms
 
-cLircRemote::cLircRemote(char *DeviceName)
+cLircRemote::cLircRemote(const char *DeviceName)
 :cRemote("LIRC")
 ,cThread("LIRC remote control")
 {
diff --git a/lirc.h b/lirc.h
index cd3c780d0..25b743feb 100644
--- a/lirc.h
+++ b/lirc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 1.2 2003/04/12 14:15:20 kls Exp $
+ * $Id: lirc.h 1.3 2005/07/31 10:18:15 kls Exp $
  */
 
 #ifndef __LIRC_H
@@ -19,7 +19,7 @@ class cLircRemote : public cRemote, private cThread {
   int f;
   virtual void Action(void);
 public:
-  cLircRemote(char *DeviceName);
+  cLircRemote(const char *DeviceName);
   virtual ~cLircRemote();
   virtual bool Ready(void);
   };
diff --git a/pat.c b/pat.c
index 356e28efd..e6b48cc11 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.12 2005/01/25 21:02:11 kls Exp $
+ * $Id: pat.c 1.13 2005/08/06 12:23:51 kls Exp $
  */
 
 #include "pat.h"
@@ -324,10 +324,10 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         SI::PMT::Stream stream;
         int Vpid = 0;
         int Ppid = pmt.getPCRPid();
-        int Apids[MAXAPIDS + 1] = { 0 };
+        int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
         int Dpids[MAXDPIDS + 1] = { 0 };
-        char ALangs[MAXAPIDS + 1][4] = { "" };
-        char DLangs[MAXDPIDS + 1][4] = { "" };
+        char ALangs[MAXAPIDS][4] = { "" };
+        char DLangs[MAXDPIDS][4] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
diff --git a/rcu.c b/rcu.c
index 4ea80d9e9..fea31ec38 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.8 2004/12/19 18:06:00 kls Exp $
+ * $Id: rcu.c 1.9 2005/07/31 10:17:45 kls Exp $
  */
 
 #include "rcu.h"
@@ -16,7 +16,7 @@
 #define REPEATLIMIT  20 // ms
 #define REPEATDELAY 350 // ms
 
-cRcuRemote::cRcuRemote(char *DeviceName)
+cRcuRemote::cRcuRemote(const char *DeviceName)
 :cRemote("RCU")
 ,cThread("RCU remote control")
 {
diff --git a/rcu.h b/rcu.h
index 534ca3da5..be5c64afd 100644
--- a/rcu.h
+++ b/rcu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.h 1.3 2003/04/12 14:36:09 kls Exp $
+ * $Id: rcu.h 1.4 2005/07/31 10:18:00 kls Exp $
  */
 
 #ifndef __RCU_H
@@ -37,7 +37,7 @@ class cRcuRemote : public cRemote, private cThread, private cStatus {
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
   virtual void Recording(const cDevice *Device, const char *Name);
 public:
-  cRcuRemote(char *DeviceName);
+  cRcuRemote(const char *DeviceName);
   virtual ~cRcuRemote();
   virtual bool Ready(void);
   virtual bool Initialize(void);
diff --git a/recording.c b/recording.c
index 462b16000..081f9e610 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.109 2005/06/05 14:11:45 kls Exp $
+ * $Id: recording.c 1.110 2005/08/06 09:53:21 kls Exp $
  */
 
 #include "recording.h"
@@ -199,7 +199,7 @@ int cResumeFile::Read(void)
 bool cResumeFile::Save(int Index)
 {
   if (fileName) {
-     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, DEFFILEMODE);
      if (f >= 0) {
         if (safe_write(f, &Index, sizeof(Index)) < 0)
            LOG_ERROR_STR(fileName);
@@ -974,7 +974,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
         else if (!Record)
            isyslog("missing index file %s", fileName);
         if (Record) {
-           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
+           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, DEFFILEMODE)) >= 0) {
               if (delta) {
                  esyslog("ERROR: padding index file with %d '0' bytes", delta);
                  while (delta--)
diff --git a/remux.c b/remux.c
index c4e7b2037..4a8682b70 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.35 2005/06/19 10:17:00 kls Exp $
+ * $Id: remux.c 1.36 2005/07/30 10:23:00 kls Exp $
  */
 
 #include "remux.h"
@@ -26,17 +26,92 @@ class cRepacker {
 protected:
   int maxPacketSize;
   uint8_t subStreamId;
+  static void DroppedData(const char *Reason, int Count) { esyslog("%s (dropped %d bytes)", Reason, Count); }
+  static int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+  {
+    int n = ResultBuffer->Put(Data, Count);
+    if (n != Count)
+       esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
+    return n;
+  }
+  static int AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader = 0);
 public:
   cRepacker(void) { maxPacketSize = 6 + 65535; subStreamId = 0; }
   virtual ~cRepacker() {}
   virtual void Reset(void) {}
-  virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
+  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
   virtual int BreakAt(const uchar *Data, int Count) = 0;
   virtual int QuerySnoopSize(void) { return 0; }
   void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
   void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
   };
 
+int cRepacker::AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
+{
+  if (Count < 7)
+     return -1; // too short
+
+  if ((Data[6] & 0xC0) == 0x80) { // MPEG 2
+     if (Count < 9)
+        return -1; // too short
+
+     PesPayloadOffset = 6 + 3 + Data[8];
+     if (Count < PesPayloadOffset)
+        return -1; // too short
+
+     if (ContinuationHeader)
+        *ContinuationHeader = ((Data[6] == 0x80) && !Data[7] && !Data[8]);
+
+     return 2; // MPEG 2
+     }
+
+  // check for MPEG 1 ...
+  PesPayloadOffset = 6;
+
+  // skip up to 16 stuffing bytes
+  for (int i = 0; i < 16; i++) {
+      if (Data[PesPayloadOffset] != 0xFF)
+         break;
+
+      if (Count <= ++PesPayloadOffset)
+         return -1; // too short
+      }
+
+  // skip STD_buffer_scale/size
+  if ((Data[PesPayloadOffset] & 0xC0) == 0x40) {
+     PesPayloadOffset += 2;
+
+     if (Count <= PesPayloadOffset)
+        return -1; // too short
+     }
+
+  if (ContinuationHeader)
+     *ContinuationHeader = false;
+
+  if ((Data[PesPayloadOffset] & 0xF0) == 0x20) {
+     // skip PTS only
+     PesPayloadOffset += 5;
+     }
+  else if ((Data[PesPayloadOffset] & 0xF0) == 0x30) {
+     // skip PTS and DTS
+     PesPayloadOffset += 10;
+     }
+  else if (Data[PesPayloadOffset] == 0x0F) {
+     // continuation header
+     PesPayloadOffset++;
+
+     if (ContinuationHeader)
+        *ContinuationHeader = true;
+     }
+  else
+     return 0; // unknown
+
+  if (Count < PesPayloadOffset)
+     return -1; // too short
+
+  return 1; // MPEG 1
+}
+
 // --- cVideoRepacker --------------------------------------------------------
 
 class cVideoRepacker : public cRepacker {
@@ -61,7 +136,7 @@ class cVideoRepacker : public cRepacker {
 public:
   cVideoRepacker(void);
   virtual void Reset(void);
-  virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
   virtual int BreakAt(const uchar *Data, int Count);
   virtual int QuerySnoopSize() { return 4; }
   };
@@ -95,7 +170,7 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      // to strip off any partially contained start code.
      int Bite = fragmentLen + (Count >= 0 ? 0 : Count);
      // put data into result buffer
-     int n = ResultBuffer->Put(fragmentData, Bite);
+     int n = Put(ResultBuffer, fragmentData, Bite);
      if (n != Bite) {
         Reset();
         return false;
@@ -110,7 +185,7 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      // to strip off any partially contained start code.
      int Bite = pesHeaderLen + (Count >= 0 ? 0 : Count);
      // put data into result buffer
-     int n = ResultBuffer->Put(pesHeader, Bite);
+     int n = Put(ResultBuffer, pesHeader, Bite);
      if (n != Bite) {
         Reset();
         return false;
@@ -122,7 +197,7 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      // amount of data to put into result buffer
      int Bite = Count;
      // put data into result buffer
-     int n = ResultBuffer->Put(Data, Bite);
+     int n = Put(ResultBuffer, Data, Bite);
      if (n != Bite) {
         Reset();
         return false;
@@ -132,23 +207,29 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
   return true;
 }
 
-int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
 {
+  // synchronisation is detected some bytes after frame start.
+  const int SkippedBytesLimit = 4;
+
   // reset local scanner
   localStart = -1;
- 
-  // check for MPEG 2
-  if ((Data[6] & 0xC0) != 0x80)
-     return 0;
 
-  // backup PES header
-  if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
-     pesHeaderBackupLen = 6 + 3 + Data[8];
-     memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
+  int pesPayloadOffset = 0;
+  bool continuationHeader = false;
+  int mpegLevel = AnalyzePesHeader(Data, Count, pesPayloadOffset, &continuationHeader);
+  if (mpegLevel <= 0) {
+     DroppedData("cVideoRepacker: no valid PES packet header found", Count);
+     return;
      }
+  if (!continuationHeader) {
+    // backup PES header
+    pesHeaderBackupLen = pesPayloadOffset;
+    memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
+    }
 
   // skip PES header
-  int done = 6 + 3 + Data[8];
+  int done = pesPayloadOffset;
   int todo = Count - done;
   const uchar *data = Data + done;
   // remember start of the data
@@ -191,15 +272,17 @@ int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                      // the byte count get's negative then the current buffer ends in a
                      // partitial start code that must be stripped off, as it shall be put
                      // in the next packet.
-                     if (!PushOutPacket(ResultBuffer, payload, data - 3 - payload))
-                        return done - 3;
+                     if (!PushOutPacket(ResultBuffer, payload, data - 3 - payload)) {
+                        DroppedData("cVideoRepacker: result buffer overflow", Count - (done - 3));
+                        return;
+                        }
                      // go on with syncing to the next picture
                      state = syncing;
                      }
                   if (state == syncing) {
                      // report that syncing dropped some bytes
-                     if (skippedBytes > 4)
-                        esyslog("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - 4);
+                     if (skippedBytes > SkippedBytesLimit)
+                        esyslog("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
                      skippedBytes = 0;
                      // if there is a PES header available, then use it ...
                      if (pesHeaderBackupLen > 0) {
@@ -222,9 +305,14 @@ int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                         pesHeader[pesHeaderLen++] = Data[3]; // video stream ID
                         pesHeader[pesHeaderLen++] = 0x00; // length still unknown
                         pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-                        pesHeader[pesHeaderLen++] = 0x80;
-                        pesHeader[pesHeaderLen++] = 0x00;
-                        pesHeader[pesHeaderLen++] = 0x00;
+
+                        if (mpegLevel == 2) {
+                           pesHeader[pesHeaderLen++] = 0x80;
+                           pesHeader[pesHeaderLen++] = 0x00;
+                           pesHeader[pesHeaderLen++] = 0x00;
+                           }
+                        else
+                           pesHeader[pesHeaderLen++] = 0x0F;
                         }
                      // append the first three bytes of the start code
                      pesHeader[pesHeaderLen++] = 0x00;
@@ -299,8 +387,10 @@ int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
               const uchar *excessData = fragmentData + fragmentLen + bite;
               // a negative byte count means to drop some bytes from the current
               // fragment's tail, to not exceed the maximum packet size.
-              if (!PushOutPacket(ResultBuffer, payload, bite))
-                 return done;
+              if (!PushOutPacket(ResultBuffer, payload, bite)) {
+                 DroppedData("cVideoRepacker: result buffer overflow", Count - done);
+                 return;
+                 }
               // create a continuation PES header
               pesHeaderLen = 0;
               pesHeader[pesHeaderLen++] = 0x00;
@@ -309,9 +399,15 @@ int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
               pesHeader[pesHeaderLen++] = Data[3]; // video stream ID
               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-              pesHeader[pesHeaderLen++] = 0x80;
-              pesHeader[pesHeaderLen++] = 0x00;
-              pesHeader[pesHeaderLen++] = 0x00;
+
+              if (mpegLevel == 2) {
+                 pesHeader[pesHeaderLen++] = 0x80;
+                 pesHeader[pesHeaderLen++] = 0x00;
+                 pesHeader[pesHeaderLen++] = 0x00;
+                 }
+              else
+                 pesHeader[pesHeaderLen++] = 0x0F;
+
               // copy any excess data
               while (bite++ < 0) {
                     // append the excess data here
@@ -344,22 +440,20 @@ int cVideoRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
         fragmentLen += bite;
         }
      }
-  // we've eaten the whole packet ;-)
-  return Count;
+  // report that syncing dropped some bytes
+  if (skippedBytes > SkippedBytesLimit) {
+     esyslog("cVideoRepacker: skipped %d bytes while syncing on next picture", skippedBytes - SkippedBytesLimit);
+     skippedBytes = SkippedBytesLimit;
+     }
 }
 
 int cVideoRepacker::BreakAt(const uchar *Data, int Count)
 {
-  // enough data for test?
-  if (Count < 6 + 3)
-     return -1;
-  // check for MPEG 2
-  if ((Data[6] & 0xC0) != 0x80)
-     return -1;
-  int headerLen = Data[8] + 6 + 3;
-  // enough data for test?
-  if (Count < headerLen)
-     return -1;
+  int PesPayloadOffset = 0;
+
+  if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= 0)
+     return -1; // not enough data for test
+
   // just detect end of picture
   if (state == scanPicture) {
      // setup local scanner
@@ -368,7 +462,7 @@ int cVideoRepacker::BreakAt(const uchar *Data, int Count)
         localStart = 0;
         }
      // start where we've stopped at the last run
-     const uchar *data = Data + headerLen + localStart;
+     const uchar *data = Data + PesPayloadOffset + localStart;
      const uchar *limit = Data + Count;
      // scan data
      while (data < limit) {
@@ -386,7 +480,7 @@ int cVideoRepacker::BreakAt(const uchar *Data, int Count)
            }
      }
   // just fill up packet and append next start code
-  return headerLen + packetTodo + 4;
+  return PesPayloadOffset + packetTodo + 4;
 }
 
 // --- cDolbyRepacker --------------------------------------------------------
@@ -412,6 +506,7 @@ class cDolbyRepacker : public cRepacker {
     get_length,
     output_packet
     } state;
+  int skippedBytes;
   void ResetPesHeader(bool ContinuationFrame = false);
   void AppendSubStreamID(bool ContinuationFrame = false);
   bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
@@ -419,7 +514,7 @@ class cDolbyRepacker : public cRepacker {
 public:
   cDolbyRepacker(void);
   virtual void Reset(void);
-  virtual int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
   virtual int BreakAt(const uchar *Data, int Count);
   };
 
@@ -490,6 +585,7 @@ void cDolbyRepacker::Reset(void)
   fragmentLen = 0;
   fragmentTodo = 0;
   pesHeaderBackupLen = 0;
+  skippedBytes = 0;
 }
 
 bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite)
@@ -499,7 +595,7 @@ bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const ucha
      // output a previous fragment first
      if (fragmentLen > 0) {
         Bite = fragmentLen;
-        int n = ResultBuffer->Put(fragmentData, Bite);
+        int n = Put(ResultBuffer, fragmentData, Bite);
         if (Bite != n) {
            Reset();
            return false;
@@ -507,7 +603,7 @@ bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const ucha
         fragmentLen = 0;
         }
      Bite = fragmentTodo;
-     int n = ResultBuffer->Put(Data, Bite);
+     int n = Put(ResultBuffer, Data, Bite);
      if (Bite != n) {
         Reset();
         Done += n;
@@ -543,13 +639,13 @@ bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar
   Bite = pesHeaderLen;
   // enough data available to put PES packet into buffer?
   if (packetLen - pesHeaderLen <= Todo) {
-     int n = ResultBuffer->Put(pesHeader, Bite);
+     int n = Put(ResultBuffer, pesHeader, Bite);
      if (Bite != n) {
         Reset();
         return false;
         }
      Bite = packetLen - pesHeaderLen;
-     n = ResultBuffer->Put(Data, Bite);
+     n = Put(ResultBuffer, Data, Bite);
      if (Bite != n) {
         Reset();
         Done += n;
@@ -582,11 +678,16 @@ bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar
   return true;
 }
 
-int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
 {
+  // synchronisation is detected some bytes after frame start.
+  const int SkippedBytesLimit = 4;
+
   // check for MPEG 2
-  if ((Data[6] & 0xC0) != 0x80)
-     return 0;
+  if ((Data[6] & 0xC0) != 0x80) {
+     DroppedData("cDolbyRepacker: MPEG 2 PES header expected", Count);
+     return;
+     }
 
   // backup PES header
   if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
@@ -616,6 +717,7 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                data++;
                done++;
                todo--;
+               skippedBytes++; // collect number of skipped bytes while syncing
                continue;
           case find_77:
                if (*data != 0x77) {
@@ -625,18 +727,21 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                data++;
                done++;
                todo--;
+               skippedBytes++; // collect number of skipped bytes while syncing
                ++(int &)state;
                continue;
           case store_chk1:
                chk1 = *data++;
                done++;
                todo--;
+               skippedBytes++; // collect number of skipped bytes while syncing
                ++(int &)state;
                continue;
           case store_chk2:
                chk2 = *data++;
                done++;
                todo--;
+               skippedBytes++; // collect number of skipped bytes while syncing
                ++(int &)state;
                continue;
           case get_length:
@@ -664,6 +769,10 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                   state = find_0b;
                   continue;
                   }
+               // report that syncing dropped some bytes
+               if (skippedBytes > SkippedBytesLimit)
+                  esyslog("cDolbyRepacker: skipped %d bytes to sync on next AC3 frame", skippedBytes - SkippedBytesLimit);
+               skippedBytes = 0;
                // append read data to header for common output processing
                pesHeader[pesHeaderLen++] = 0x0B;
                pesHeader[pesHeaderLen++] = 0x77;
@@ -676,13 +785,17 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                int bite = 0;
                // finish remainder of ac3 frame?
                if (fragmentTodo > 0) {
-                  if (!FinishRemainder(ResultBuffer, data, todo, done, bite))
-                     return done;
+                  if (!FinishRemainder(ResultBuffer, data, todo, done, bite)) {
+                     DroppedData("cDolbyRepacker: result buffer overflow", Count - done);
+                     return;
+                     }
                   }
                else {
                   // start a new packet
-                  if (!StartNewPacket(ResultBuffer, data, todo, done, bite))
-                     return done;
+                  if (!StartNewPacket(ResultBuffer, data, todo, done, bite)) {
+                     DroppedData("cDolbyRepacker: result buffer overflow", Count - done);
+                     return;
+                     }
                   // prepare for next (continuation) packet
                   ResetPesHeader(state == output_packet);
                   }
@@ -693,7 +806,11 @@ int cDolbyRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int
                }
           }
         }
-  return Count;
+  // report that syncing dropped some bytes
+  if (skippedBytes > SkippedBytesLimit) {
+     esyslog("cDolbyRepacker: skipped %d bytes while syncing on next AC3 frame", skippedBytes - 4);
+     skippedBytes = SkippedBytesLimit;
+     }
 }
 
 int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
@@ -845,9 +962,13 @@ void cTS2PES::Clear(void)
 
 void cTS2PES::store(uint8_t *Data, int Count)
 {
-  int n = repacker ? repacker->Put(resultBuffer, Data, Count) : resultBuffer->Put(Data, Count);
-  if (n != Count)
-     esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
+  if (repacker)
+     repacker->Repack(resultBuffer, Data, Count);
+  else {
+     int n = resultBuffer->Put(Data, Count);
+     if (n != Count)
+        esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
+     }
 }
 
 void cTS2PES::reset_ipack(void)
@@ -867,7 +988,7 @@ void cTS2PES::reset_ipack(void)
 
 void cTS2PES::send_ipack(void)
 {
-  if (count < 10)
+  if (count <= ((mpeg == 2) ? 9 : 7)) // skip empty packets
      return;
   buf[3] = (AUDIO_STREAM_S <= cid && cid <= AUDIO_STREAM_E && audioCid) ? audioCid : cid;
   buf[4] = (uint8_t)(((count - 6) & 0xFF00) >> 8);
@@ -1155,7 +1276,7 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
   resultBuffer->SetTimeouts(0, 100);
   if (VPid)
-//#define TEST_cVideoRepacker
+#define TEST_cVideoRepacker
 #ifdef TEST_cVideoRepacker
      ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0x00, 0x00, new cVideoRepacker);
 #else
diff --git a/remux.h b/remux.h
index fef5980e8..0cd570e0b 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.13 2005/01/16 13:15:17 kls Exp $
+ * $Id: remux.h 1.14 2005/08/07 10:28:07 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -47,6 +47,12 @@ class cRemux {
        ///< PID). If ExitOnFailure is true, the remuxer will initiate an "emergency
        ///< exit" in case of problems with the data stream.
   ~cRemux();
+  void SetTimeouts(int PutTimeout, int GetTimeout) { resultBuffer->SetTimeouts(PutTimeout, GetTimeout); }
+       ///< By default cRemux assumes that Put() and Get() are called from different
+       ///< threads, and uses a timeout in the Get() function in case there is no
+       ///< data available. SetTimeouts() can be used to modify these timeouts.
+       ///< Especially if Put() and Get() are called from the same thread, setting
+       ///< both timeouts to 0 is recommended.
   int Put(const uchar *Data, int Count);
        ///< Puts at most Count bytes of Data into the remuxer.
        ///< \return Returns the number of bytes actually consumed from Data.
diff --git a/svdrp.c b/svdrp.c
index a63a575d0..093bd997f 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.72 2005/05/26 09:59:09 kls Exp $
+ * $Id: svdrp.c 1.74 2005/08/07 14:20:41 kls Exp $
  */
 
 #include "svdrp.h"
@@ -209,7 +209,7 @@ const char *HelpPages[] = {
   "    containing the given string as part of their name are listed.",
   "LSTE [ <channel> ] [ now | next | at <time> ]\n"
   "    List EPG data. Without any parameters all data of all channels is\n"
-  "    listed. If a channel is given (either by number of by channel ID),\n"
+  "    listed. If a channel is given (either by number or by channel ID),\n"
   "    only data for that channel is listed. 'now', 'next', or 'at <time>'\n"
   "    restricts the returned data to present events, following events, or\n"
   "    events at the given time (which must be in time_t form).",
@@ -476,22 +476,26 @@ void cSVDRP::CmdDELC(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
-        if (channel) {
-           for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
-               if (timer->Channel() == channel) {
-                  Reply(550, "Channel \"%s\" is in use by timer %d", Option, timer->Index() + 1);
-                  return;
+        if (!Channels.BeingEdited()) {
+           cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
+           if (channel) {
+              for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
+                  if (timer->Channel() == channel) {
+                     Reply(550, "Channel \"%s\" is in use by timer %d", Option, timer->Index() + 1);
+                     return;
+                     }
                   }
-               }
-           Channels.Del(channel);
-           Channels.ReNumber();
-           Channels.SetModified(true);
-           isyslog("channel %s deleted", Option);
-           Reply(250, "Channel \"%s\" deleted", Option);
+              Channels.Del(channel);
+              Channels.ReNumber();
+              Channels.SetModified(true);
+              isyslog("channel %s deleted", Option);
+              Reply(250, "Channel \"%s\" deleted", Option);
+              }
+           else
+              Reply(501, "Channel \"%s\" not defined", Option);
            }
         else
-           Reply(501, "Channel \"%s\" not defined", Option);
+           Reply(550, "Channels are being edited - try again later");
         }
      else
         Reply(501, "Error in channel number \"%s\"", Option);
@@ -532,19 +536,23 @@ void cSVDRP::CmdDELT(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
-        if (timer) {
-           if (!timer->Recording()) {
-              isyslog("deleting timer %s", *timer->ToDescr());
-              Timers.Del(timer);
-              Timers.SetModified();
-              Reply(250, "Timer \"%s\" deleted", Option);
+        if (!Timers.BeingEdited()) {
+           cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
+           if (timer) {
+              if (!timer->Recording()) {
+                 isyslog("deleting timer %s", *timer->ToDescr());
+                 Timers.Del(timer);
+                 Timers.SetModified();
+                 Reply(250, "Timer \"%s\" deleted", Option);
+                 }
+              else
+                 Reply(550, "Timer \"%s\" is recording", Option);
               }
            else
-              Reply(550, "Timer \"%s\" is recording", Option);
+              Reply(501, "Timer \"%s\" not defined", Option);
            }
         else
-           Reply(501, "Timer \"%s\" not defined", Option);
+           Reply(550, "Timers are being edited - try again later");
         }
      else
         Reply(501, "Error in timer number \"%s\"", Option);
@@ -782,18 +790,25 @@ void cSVDRP::CmdLSTE(const char *Option)
               p = strtok_r(NULL, delim, &strtok_next);
               }
         }
-     FILE *f = fdopen(file, "w");
-     if (f) {
-        if (Schedule)
-           Schedule->Dump(f, "215-", DumpMode, AtTime);
-        else
-           Schedules->Dump(f, "215-", DumpMode, AtTime);
-        fflush(f);
-        Reply(215, "End of EPG data");
-        // don't 'fclose(f)' here!
+     int fd = dup(file);
+     if (fd) {
+        FILE *f = fdopen(fd, "w");
+        if (f) {
+           if (Schedule)
+              Schedule->Dump(f, "215-", DumpMode, AtTime);
+           else
+              Schedules->Dump(f, "215-", DumpMode, AtTime);
+           fflush(f);
+           Reply(215, "End of EPG data");
+           fclose(f);
+           }
+        else {
+           Reply(451, "Can't open file connection");
+           close(fd);
+           }
         }
      else
-        Reply(451, "Can't open file connection");
+        Reply(451, "Can't dup stream descriptor");
      }
   else
      Reply(451, "Can't get EPG data");
@@ -880,25 +895,29 @@ void cSVDRP::CmdMODC(const char *Option)
      int n = strtol(Option, &tail, 10);
      if (tail && tail != Option) {
         tail = skipspace(tail);
-        cChannel *channel = Channels.GetByNumber(n);
-        if (channel) {
-           cChannel ch;
-           if (ch.Parse(tail)) {
-              if (Channels.HasUniqueChannelID(&ch, channel)) {
-                 *channel = ch;
-                 Channels.ReNumber();
-                 Channels.SetModified(true);
-                 isyslog("modifed channel %d %s", channel->Number(), *channel->ToText());
-                 Reply(250, "%d %s", channel->Number(), *channel->ToText());
+        if (!Channels.BeingEdited()) {
+           cChannel *channel = Channels.GetByNumber(n);
+           if (channel) {
+              cChannel ch;
+              if (ch.Parse(tail)) {
+                 if (Channels.HasUniqueChannelID(&ch, channel)) {
+                    *channel = ch;
+                    Channels.ReNumber();
+                    Channels.SetModified(true);
+                    isyslog("modifed channel %d %s", channel->Number(), *channel->ToText());
+                    Reply(250, "%d %s", channel->Number(), *channel->ToText());
+                    }
+                 else
+                    Reply(501, "Channel settings are not unique");
                  }
               else
-                 Reply(501, "Channel settings are not unique");
+                 Reply(501, "Error in channel settings");
               }
            else
-              Reply(501, "Error in channel settings");
+              Reply(501, "Channel \"%d\" not defined", n);
            }
         else
-           Reply(501, "Channel \"%d\" not defined", n);
+           Reply(550, "Channels are being edited - try again later");
         }
      else
         Reply(501, "Error in channel number");
@@ -914,24 +933,28 @@ void cSVDRP::CmdMODT(const char *Option)
      int n = strtol(Option, &tail, 10);
      if (tail && tail != Option) {
         tail = skipspace(tail);
-        cTimer *timer = Timers.Get(n - 1);
-        if (timer) {
-           cTimer t = *timer;
-           if (strcasecmp(tail, "ON") == 0)
-              t.SetFlags(tfActive);
-           else if (strcasecmp(tail, "OFF") == 0)
-              t.ClrFlags(tfActive);
-           else if (!t.Parse(tail)) {
-              Reply(501, "Error in timer settings");
-              return;
+        if (!Timers.BeingEdited()) {
+           cTimer *timer = Timers.Get(n - 1);
+           if (timer) {
+              cTimer t = *timer;
+              if (strcasecmp(tail, "ON") == 0)
+                 t.SetFlags(tfActive);
+              else if (strcasecmp(tail, "OFF") == 0)
+                 t.ClrFlags(tfActive);
+              else if (!t.Parse(tail)) {
+                 Reply(501, "Error in timer settings");
+                 return;
+                 }
+              *timer = t;
+              Timers.SetModified();
+              isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
+              Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
               }
-           *timer = t;
-           Timers.SetModified();
-           isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
-           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
+           else
+              Reply(501, "Timer \"%d\" not defined", n);
            }
         else
-           Reply(501, "Timer \"%d\" not defined", n);
+           Reply(550, "Timers are being edited - try again later");
         }
      else
         Reply(501, "Error in timer number");
@@ -1054,20 +1077,24 @@ void cSVDRP::CmdUPDT(const char *Option)
   if (*Option) {
      cTimer *timer = new cTimer;
      if (timer->Parse(Option)) {
-        cTimer *t = Timers.GetTimer(timer);
-        if (t) {
-           t->Parse(Option);
-           delete timer;
-           timer = t;
-           isyslog("timer %s updated", *timer->ToDescr());
-           }
-        else {
-           Timers.Add(timer);
-           isyslog("timer %s added", *timer->ToDescr());
+        if (!Timers.BeingEdited()) {
+           cTimer *t = Timers.GetTimer(timer);
+           if (t) {
+              t->Parse(Option);
+              delete timer;
+              timer = t;
+              isyslog("timer %s updated", *timer->ToDescr());
+              }
+           else {
+              Timers.Add(timer);
+              isyslog("timer %s added", *timer->ToDescr());
+              }
+           Timers.SetModified();
+           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
+           return;
            }
-        Timers.SetModified();
-        Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
-        return;
+        else
+           Reply(550, "Timers are being edited - try again later");
         }
      else
         Reply(501, "Error in timer settings");
diff --git a/timers.c b/timers.c
index f69033673..9e80b4942 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.33 2005/06/18 12:49:55 kls Exp $
+ * $Id: timers.c 1.34 2005/07/30 13:03:51 kls Exp $
  */
 
 #include "timers.h"
@@ -363,8 +363,6 @@ bool cTimer::Matches(time_t t, bool Directly) const
 
   if (HasFlags(tfActive)) {
      if (HasFlags(tfVps) && !Directly && event && event->Vps() && schedule && schedule->PresentSeenWithin(30)) {
-        if (startTime != event->Vps())
-           return false;
         startTime = event->StartTime();
         stopTime = event->EndTime();
         return event->IsRunning(true);
diff --git a/tools.c b/tools.c
index 55612165d..ca4b0b80a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.95 2005/05/29 10:18:26 kls Exp $
+ * $Id: tools.c 1.96 2005/08/06 09:53:21 kls Exp $
  */
 
 #include "tools.h"
@@ -308,7 +308,7 @@ bool MakeDirs(const char *FileName, bool IsDirectory)
         struct stat fs;
         if (stat(s, &fs) != 0 || !S_ISDIR(fs.st_mode)) {
            dsyslog("creating directory %s", s);
-           if (mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {
+           if (mkdir(s, ACCESSPERMS) == -1) {
               LOG_ERROR_STR(s);
               result = false;
               break;
@@ -451,7 +451,7 @@ bool SpinUpDisk(const char *FileName)
       if (access(buf, F_OK) != 0) { // the file does not exist
          timeval tp1, tp2;
          gettimeofday(&tp1, NULL);
-         int f = open(buf, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+         int f = open(buf, O_WRONLY | O_CREAT, DEFFILEMODE);
          // O_SYNC doesn't work on all file systems
          if (f >= 0) {
             if (fdatasync(f) < 0)
@@ -843,7 +843,7 @@ bool cLockFile::Lock(int WaitSeconds)
   if (f < 0 && fileName) {
      time_t Timeout = time(NULL) + WaitSeconds;
      do {
-        f = open(fileName, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+        f = open(fileName, O_WRONLY | O_CREAT | O_EXCL, DEFFILEMODE);
         if (f < 0) {
            if (errno == EEXIST) {
               struct stat fs;
diff --git a/tools.h b/tools.h
index 079e58d0b..0644f4e6c 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.72 2005/05/29 10:24:54 kls Exp $
+ * $Id: tools.h 1.73 2005/08/06 09:53:21 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -158,7 +158,7 @@ class cFile {
   cFile(void);
   ~cFile();
   operator int () { return f; }
-  bool Open(const char *FileName, int Flags, mode_t Mode = S_IRUSR | S_IWUSR | S_IRGRP);
+  bool Open(const char *FileName, int Flags, mode_t Mode = DEFFILEMODE);
   bool Open(int FileDes);
   void Close(void);
   bool IsOpen(void) { return f >= 0; }
diff --git a/vdr.1 b/vdr.1
index a67839696..af8ce1274 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.13 2004/12/19 09:36:25 kls Exp $
+.\" $Id: vdr.1 1.14 2005/07/31 10:49:35 kls Exp $
 .\"
 .TH vdr 1 "19 Dec 2004" "1.3.18" "Video Disk Recorder"
 .SH NAME
@@ -46,7 +46,7 @@ Read config files from directory \fIdir\fR
 (default is to read them from the video directory).
 .TP
 .B \-d, \-\-daemon
-Run in daemon mode.
+Run in daemon mode (implies \-\-no\-kbd).
 .TP
 .BI \-D\  num ,\ \-\-device= num
 Use only the given DVB device (\fInum\fR = 0, 1, 2...).
@@ -75,9 +75,16 @@ Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
 There can be several \fB\-L\fR options with different \fIdir\fR values.
 Each of them will apply to the \fB\-P\fR options following it.
 .TP
+.BI \-\-lirc[= path ]
+Use a LIRC remote control device.
+If \fIpath\fR is omitted, vdr uses \fI/dev/lircd\fR.
+.TP
 .B \-m, \-\-mute
 Mute audio of the primary DVB device at startup.
 .TP
+.B \-\-no\-kbd
+Don't use the keyboard as an input device.
+.TP
 .BI \-p\  port ,\ \-\-port= port
 Use \fIport\fR for SVDRP. A value of \fB0\fR turns off SVDRP.
 The default SVDRP port is \fB2001\fR.
@@ -101,6 +108,10 @@ particular options) you can use
 
 (note the quotes around the asterisk to prevent wildcard expansion).
 .TP
+.BI \-\-rcu[= path ]
+Use a serial port remote control device.
+If \fIpath\fR is omitted, vdr uses \fI/dev/ttyS1\fR.
+.TP
 .BI \-r\  cmd ,\ \-\-record= cmd
 Call \fIcmd\fR before and after a recording.
 .TP
diff --git a/vdr.c b/vdr.c
index bd9de2fdc..f58d02bf3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.208 2005/06/18 11:19:07 kls Exp $
+ * $Id: vdr.c 1.209 2005/07/31 11:25:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -115,6 +115,19 @@ int main(int argc, char *argv[])
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
   const char *Shutdown = NULL;
+
+  bool UseKbd = true;
+  const char *LircDevice = NULL;
+  const char *RcuDevice = NULL;
+#if !defined(REMOTE_KBD)
+  UseKbd = false;
+#endif
+#if defined(REMOTE_LIRC)
+  LircDevice = LIRC_DEVICE;
+#elif defined(REMOTE_RCU)
+  RcuDevice = RCU_DEVICE;
+#endif
+
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
   int ExitCode = 0;
 
@@ -126,10 +139,13 @@ int main(int argc, char *argv[])
       { "epgfile",  required_argument, NULL, 'E' },
       { "help",     no_argument,       NULL, 'h' },
       { "lib",      required_argument, NULL, 'L' },
+      { "lirc",     optional_argument, NULL, 'l' | 0x100 },
       { "log",      required_argument, NULL, 'l' },
       { "mute",     no_argument,       NULL, 'm' },
+      { "no-kbd",   no_argument,       NULL, 'n' | 0x100 },
       { "plugin",   required_argument, NULL, 'P' },
       { "port",     required_argument, NULL, 'p' },
+      { "rcu",      optional_argument, NULL, 'r' | 0x100 },
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
@@ -194,8 +210,14 @@ int main(int argc, char *argv[])
                        return 2;
                        }
                     break;
+          case 'l' | 0x100:
+                    LircDevice = optarg ? : LIRC_DEVICE;
+                    break;
           case 'm': MuteAudio = true;
                     break;
+          case 'n' | 0x100:
+                    UseKbd = false;
+                    break;
           case 'p': if (isnumber(optarg))
                        SVDRPport = atoi(optarg);
                     else {
@@ -205,6 +227,9 @@ int main(int argc, char *argv[])
                     break;
           case 'P': PluginManager.AddPlugin(optarg);
                     break;
+          case 'r' | 0x100:
+                    RcuDevice = optarg ? : RCU_DEVICE;
+                    break;
           case 'r': cRecordingUserCommand::SetCommand(optarg);
                     break;
           case 's': Shutdown = optarg;
@@ -261,10 +286,15 @@ int main(int argc, char *argv[])
                "                           if logging should be done to LOG_LOCALn instead of\n"
                "                           LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7)\n"
                "  -L DIR,   --lib=DIR      search for plugins in DIR (default is %s)\n"
+               "            --lirc[=PATH]  use a LIRC remote control device, attached to PATH\n"
+               "                           (default: %s)\n"
                "  -m,       --mute         mute audio of the primary DVB device at startup\n"
+               "            --no-kbd       don't use the keyboard as an input device\n"
                "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                "                           0 turns off SVDRP\n"
                "  -P OPT,   --plugin=OPT   load a plugin defined by the given options\n"
+               "            --rcu[=PATH]   use a remote control device, attached to PATH\n"
+               "                           (default: %s)\n"
                "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "  -t TTY,   --terminal=TTY controlling tty\n"
@@ -275,7 +305,9 @@ int main(int argc, char *argv[])
                "\n",
                DEFAULTEPGDATAFILENAME,
                DEFAULTPLUGINDIR,
+               LIRC_DEVICE,
                DEFAULTSVDRPPORT,
+               RCU_DEVICE,
                VideoDirectory,
                DEFAULTWATCHDOG
                );
@@ -470,15 +502,12 @@ int main(int argc, char *argv[])
   cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
 
   // Remote Controls:
-#if defined(REMOTE_RCU)
-  new cRcuRemote("/dev/ttyS1");
-#elif defined(REMOTE_LIRC)
-  new cLircRemote("/dev/lircd");
-#endif
-#if defined(REMOTE_KBD)
-  if (!DaemonMode && HasStdin)
+  if (RcuDevice)
+     new cRcuRemote(RcuDevice);
+  if (LircDevice)
+     new cLircRemote(LircDevice);
+  if (!DaemonMode && HasStdin && UseKbd)
      new cKbdRemote;
-#endif
   Interface->LearnKeys();
 
   // External audio:
diff --git a/videodir.c b/videodir.c
index f0e54fe72..cb3d29a82 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.11 2004/12/26 11:52:12 kls Exp $
+ * $Id: videodir.c 1.12 2005/08/06 09:53:21 kls Exp $
  */
 
 #include "videodir.h"
@@ -137,7 +137,7 @@ int OpenVideoFile(const char *FileName, int Flags)
            }
         }
      }
-  int Result = open(ActualFileName, Flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+  int Result = open(ActualFileName, Flags, DEFFILEMODE);
   if (ActualFileName != FileName)
      free((char *)ActualFileName);
   return Result;

From ddd1e13e53c4970058884e2af31c2681617e7bf3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 15 Aug 2005 18:00:00 +0200
Subject: [PATCH 121/307] =?UTF-8?q?Version=201.3.29=20-=20Fixed=20a=20race?=
 =?UTF-8?q?=20condition=20in=20cTransfer=20(thanks=20to=20Klaus=20Heppenhe?=
 =?UTF-8?q?imer=20for=20reporting=20this=20one).=20=20=20In=20doing=20so,?=
 =?UTF-8?q?=20the=20'active'=20variables=20used=20by=20the=20actual=20deri?=
 =?UTF-8?q?ved=20cThread=20classes=20=20=20have=20been=20replaced=20by=20t?=
 =?UTF-8?q?he=20cThread::Running()=20function.=20=20=20Plugin=20authors=20?=
 =?UTF-8?q?may=20want=20to=20check=20their=20derived=20cThread=20classes?=
 =?UTF-8?q?=20and=20replace=20any=20'active'=20=20=20variables=20the=20sam?=
 =?UTF-8?q?e=20way=20as,=20for=20instance,=20done=20in=20transfer.c.=20-?=
 =?UTF-8?q?=20Fixed=20handling=20EPG=20data=20for=20time=20shifted=20event?=
 =?UTF-8?q?s=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Increase?=
 =?UTF-8?q?d=20the=20default=20value=20for=20'Min.=20user=20inactivity'=20?=
 =?UTF-8?q?to=20300=20minutes=20(suggested=20=20=20by=20Helmut=20Auer).=20?=
 =?UTF-8?q?-=20Now=20storing=20the=20channel=20id=20in=20the=20info.vdr=20?=
 =?UTF-8?q?file=20even=20if=20there=20is=20no=20EPG=20info=20=20=20availab?=
 =?UTF-8?q?le=20(thanks=20to=20Andreas=20Brachold=20for=20reporting=20that?=
 =?UTF-8?q?=20there=20are=20empty=20info.vdr=20=20=20files=20created=20in?=
 =?UTF-8?q?=20that=20case).=20-=20Added=20some=20'mkdir=20-p'=20to=20the?=
 =?UTF-8?q?=20Makefile's=20'install'=20target=20(thanks=20to=20Wayne=20Kee?=
 =?UTF-8?q?r).=20-=20Changed=20the=20title=20of=20the=20recording=20info?=
 =?UTF-8?q?=20menu=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Fixed=20handl?=
 =?UTF-8?q?ing=20the=20frame=20number=20display=20if=20'7'=20is=20pressed?=
 =?UTF-8?q?=20before=20the=20first=20editing=20=20=20mark,=20or=20'9'=20af?=
 =?UTF-8?q?ter=20the=20last=20one=20(thanks=20to=20Thomas=20G=C3=BCnther).?=
 =?UTF-8?q?=20-=20Now=20discarding=20any=20previous=20numerical=20input=20?=
 =?UTF-8?q?to=20switch=20channels=20if=20Up,=20Down,=20Channel+,=20=20=20C?=
 =?UTF-8?q?hannel-,=20Left=20or=20Right=20is=20pressed=20(thanks=20to=20Wo?=
 =?UTF-8?q?lfgang=20Rohdewald=20for=20reporting=20a=20=20=20problem=20with?=
 =?UTF-8?q?=20this).=20-=20Pressing=20Ok=20while=20entering=20a=20channel?=
 =?UTF-8?q?=20number=20now=20immediately=20switches=20to=20that=20=20=20ch?=
 =?UTF-8?q?annel,=20without=20waiting=20for=20further=20input.=20-=20Avoid?=
 =?UTF-8?q?ing=20unnecessary=20OSD=20draw=20operations=20caused=20by=20the?=
 =?UTF-8?q?=20audio=20track=20description=20=20=20display=20in=20the=20ST:?=
 =?UTF-8?q?TNG=20skin's=20channel=20display=20(thanks=20to=20Oliver=20Endr?=
 =?UTF-8?q?iss=20for=20reporting=20=20=20this).=20-=20Removed=20the=20VIDE?=
 =?UTF-8?q?O=5FSTILLPICTURE=5FWORKS=5FWITH=5FVDR=5FFRAMES=20stuff=20from?=
 =?UTF-8?q?=20=20=20cDvbDevice::StillPicture(),=20since=20apparently=20the?=
 =?UTF-8?q?=20VIDEO=5FSTILLPICTURE=20call=20works.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  17 ++++++++
 HISTORY       |  28 ++++++++++++++
 MANUAL        |   2 +-
 Makefile      |   9 ++++-
 channels.conf |  18 +++++----
 config.c      |   4 +-
 config.h      |   6 +--
 cutter.c      |  10 ++---
 device.c      |  80 +++++++++++++++++---------------------
 device.h      |   4 +-
 dvbdevice.c   |  31 +--------------
 dvbplayer.c   |  23 +++--------
 eit.c         |   5 +--
 i18n.c        |  23 ++++++++++-
 lirc.c        |  84 ++++++++++++++++++++--------------------
 menu.c        |  13 +++++--
 rcu.c         | 105 +++++++++++++++++++++++++-------------------------
 recorder.c    |  25 ++++--------
 recorder.h    |   3 +-
 recording.c   |   8 ++--
 recording.h   |   4 +-
 remote.c      |   9 ++---
 remote.h      |   3 +-
 sections.c    |   7 +---
 sections.h    |   3 +-
 skinsttng.c   |   9 ++++-
 thread.c      |  21 +++++-----
 thread.h      |  20 +++++++++-
 transfer.c    |  21 ++++------
 transfer.h    |   3 +-
 30 files changed, 310 insertions(+), 288 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 770a08077..9c704dc3a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -520,6 +520,7 @@ Helmut Auer <vdr@helmutauer.de>
  for fixing a frequency/transponder handling mixup when setting the time from the
  DVB data stream
  for implementing a default cRemote::Initialize()
+ for suggesting to increase the default value for 'Min. user inactivity' to 300 minutes
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -570,6 +571,8 @@ Oliver Endriss <o.endriss@gmx.de>
  being learned overwriting the date/time in the 'classic' skin
  for making cDvbOsd check available OSD memory at runtime
  for making cEIT::cEIT() drop EPG events that have a zero start time or duration
+ for reporting an unnecessary OSD draw operation caused by the audio track description
+ display in the ST:TNG skin's channel display
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -822,6 +825,8 @@ Andreas Brachold <vdr04@deltab.de>
  the actual plugin library files from this version of VDR
  for making files and directories created with rights according to the shell's
  umask settings
+ for reporting that there are empty info.vdr files created if there is no EPG
+ info available
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -889,6 +894,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
  for making pressing the Power button not stop Transfer Mode or replay immediately
  for making EPG events without a title display "No title" instead of "(null)"
+ for changing the title of the recording info menu
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1143,6 +1149,7 @@ Wayne Keer <syphir@syphir.sytes.net>
  mtError
  for reporting an unused variable from cTimer::GetWDayFromMDay()
  for reporting a spelling error in 'canceling'
+ for adding some 'mkdir -p' to the Makefile's 'install' target
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
@@ -1203,6 +1210,7 @@ Marco Schl
  for fixing a possible hangup when ending a replay session while cIndexFile::CatchUp()
  is waiting
  for improving resetting CAM connections
+ for fixing handling EPG data for time shifted events
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1341,6 +1349,8 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  cEvent::FixEpgBugs()
  for adding a missing cMutexLock to cRemote::HasKeys()
  for removing an unnecessary #include from osd.c
+ for reporting a problem with with numerical input to switch channels if Up, Down,
+ Channel+ or Channel- is pressed
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
@@ -1417,3 +1427,10 @@ Frank Kr
 Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
  for reporting a problem in cEITScanner::Process() with forced EPG scans if EPG
  scan timeout is set to 0
+
+Klaus ??? <klaus@reel-multimedia.com>
+ for reporting a race condition in cTransfer.
+
+Thomas G�nther <tom1@toms-cafe.de>
+ for fixing handling the frame number display if '7' is pressed before the first
+ editing mark, or '9' after the last one
diff --git a/HISTORY b/HISTORY
index c55f6fd23..a932b6d70 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3671,3 +3671,31 @@ Video Disk Recorder Revision History
 - Fixed setting system time to avoid time jumps in case of faulty data (thanks
   to Andreas B�ttger).
 - Fixed a memory leak in the SVDRP command LSTE (thanks to Stefan Huelswitt).
+
+2005-08-15: Version 1.3.29
+
+- Fixed a race condition in cTransfer (thanks to Klaus ??? for reporting this one).
+  In doing so, the 'active' variables used by the actual derived cThread classes
+  have been replaced by the cThread::Running() function.
+  Plugin authors may want to check their derived cThread classes and replace any 'active'
+  variables the same way as, for instance, done in transfer.c.
+- Fixed handling EPG data for time shifted events (thanks to Marco Schl��ler).
+- Increased the default value for 'Min. user inactivity' to 300 minutes (suggested
+  by Helmut Auer).
+- Now storing the channel id in the info.vdr file even if there is no EPG info
+  available (thanks to Andreas Brachold for reporting that there are empty info.vdr
+  files created in that case).
+- Added some 'mkdir -p' to the Makefile's 'install' target (thanks to Wayne Keer).
+- Changed the title of the recording info menu (thanks to Rolf Ahrenberg).
+- Fixed handling the frame number display if '7' is pressed before the first editing
+  mark, or '9' after the last one (thanks to Thomas G�nther).
+- Now discarding any previous numerical input to switch channels if Up, Down, Channel+,
+  Channel-, Left or Right is pressed (thanks to Wolfgang Rohdewald for reporting a
+  problem with this).
+- Pressing Ok while entering a channel number now immediately switches to that
+  channel, without waiting for further input.
+- Avoiding unnecessary OSD draw operations caused by the audio track description
+  display in the ST:TNG skin's channel display (thanks to Oliver Endriss for reporting
+  this).
+- Removed the VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES stuff from
+  cDvbDevice::StillPicture(), since apparently the VIDEO_STILLPICTURE call works.
diff --git a/MANUAL b/MANUAL
index 532e954e9..9468d6eed 100644
--- a/MANUAL
+++ b/MANUAL
@@ -746,7 +746,7 @@ Version 1.2
   Miscellaneous:
 
   Min. event timeout = 30
-  Min. user inactivity = 120
+  Min. user inactivity = 300
                          If the command line option '-s' has been set, VDR will
                          automatically shutdown the computer if the next timer
                          event is at least MinEventTimeout minutes in the future,
diff --git a/Makefile b/Makefile
index 121423906..28569b6e9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.76 2005/07/31 11:20:20 kls Exp $
+# $Id: Makefile 1.77 2005/08/14 11:42:20 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -183,11 +183,16 @@ plugins-clean:
 # Install the files:
 
 install:
+	@mkdir -p $(BINDIR)
 	@cp vdr runvdr $(BINDIR)
+	@mkdir -p $(BINDIR)/$(PLUGINLIBDIR)
+	@cp $(PLUGINLIBDIR)/* $(BINDIR)/$(PLUGINLIBDIR)
+	@mkdir -p $(MANDIR)/man1
+	@mkdir -p $(MANDIR)/man5
 	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
 	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
 	@if [ ! -d $(VIDEODIR) ]; then\
-            mkdir $(VIDEODIR);\
+            mkdir -p $(VIDEODIR);\
             cp *.conf $(VIDEODIR);\
             fi
 
diff --git a/channels.conf b/channels.conf
index c48bd9486..9690dd37a 100644
--- a/channels.conf
+++ b/channels.conf
@@ -8,7 +8,7 @@ hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Ferns.;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
@@ -26,9 +26,9 @@ NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:3
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
-Sky News;BSkyB:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
+Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
@@ -46,9 +46,9 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1722,1702,1801:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1801,1722,1702:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1801,1702:29:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1801,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
@@ -64,7 +64,7 @@ PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1801,170
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
+ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
@@ -79,7 +79,7 @@ ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
-Yorin;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
+RTL7.;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
@@ -92,6 +92,8 @@ Sky Mix;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:
 ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng:2317:960,961:10070:2:2044:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
+Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
+Paramount 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,667=NAR;687=eng:583:960,961:4302:2:2007:0
diff --git a/config.c b/config.c
index 15e5f424a..6f9e09813 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.135 2005/08/07 09:03:00 kls Exp $
+ * $Id: config.c 1.136 2005/08/13 13:47:08 kls Exp $
  */
 
 #include "config.h"
@@ -295,7 +295,7 @@ cSetup::cSetup(void)
   MaxVideoFileSize = MAXVIDEOFILESIZE;
   SplitEditedFiles = 0;
   MinEventTimeout = 30;
-  MinUserInactivity = 120;
+  MinUserInactivity = 300;
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
   ResumeID = 0;
diff --git a/config.h b/config.h
index cce09e9ef..57eed3006 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.222 2005/07/30 09:19:25 kls Exp $
+ * $Id: config.h 1.223 2005/08/13 09:43:27 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.28"
-#define VDRVERSNUM   10328  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.29"
+#define VDRVERSNUM   10329  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index 82c7fe5b7..9bbb0d407 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.8 2005/05/15 14:21:08 kls Exp $
+ * $Id: cutter.c 1.10 2005/08/14 10:51:54 kls Exp $
  */
 
 #include "cutter.h"
@@ -18,7 +18,6 @@
 class cCuttingThread : public cThread {
 private:
   const char *error;
-  bool active;
   int fromFile, toFile;
   cFileName *fromFileName, *toFileName;
   cIndexFile *fromIndex, *toIndex;
@@ -35,7 +34,6 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
 :cThread("video cutting")
 {
   error = NULL;
-  active = false;
   fromFile = toFile = -1;
   fromFileName = toFileName = NULL;
   fromIndex = toIndex = NULL;
@@ -53,7 +51,6 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
 
 cCuttingThread::~cCuttingThread()
 {
-  active = false;
   Cancel(3);
   delete fromFileName;
   delete toFileName;
@@ -67,7 +64,8 @@ void cCuttingThread::Action(void)
   if (Mark) {
      fromFile = fromFileName->Open();
      toFile = toFileName->Open();
-     active = fromFile >= 0 && toFile >= 0;
+     if (fromFile < 0 || toFile < 0)
+        return;
      int Index = Mark->position;
      Mark = fromMarks.Next(Mark);
      int FileSize = 0;
@@ -78,7 +76,7 @@ void cCuttingThread::Action(void)
      uchar buffer[MAXFRAMESIZE];
      bool LastMark = false;
      bool cutIn = true;
-     while (active) {
+     while (Running()) {
            uchar FileNumber;
            int FileOffset, Length;
            uchar PictureType;
diff --git a/device.c b/device.c
index c79f7db39..9fcc420b8 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.103 2005/06/12 13:39:11 kls Exp $
+ * $Id: device.c 1.105 2005/08/14 10:52:08 kls Exp $
  */
 
 #include "device.h"
@@ -156,8 +156,6 @@ cDevice::cDevice(void)
 
   SetVideoFormat(Setup.VideoFormat);
 
-  active = false;
-
   mute = false;
   volume = Setup.CurrentVolume;
 
@@ -1126,25 +1124,25 @@ bool cDevice::Receiving(bool CheckAny) const
 
 void cDevice::Action(void)
 {
-  if (active && OpenDvr()) {
-     for (; active;) {
-         // Read data from the DVR device:
-         uchar *b = NULL;
-         if (GetTSPacket(b)) {
-            if (b) {
-               int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
-               // Distribute the packet to all attached receivers:
-               Lock();
-               for (int i = 0; i < MAXRECEIVERS; i++) {
-                   if (receiver[i] && receiver[i]->WantsPid(Pid))
-                      receiver[i]->Receive(b, TS_SIZE);
-                   }
-               Unlock();
-               }
-            }
-         else
-            break;
-         }
+  if (Running() && OpenDvr()) {
+     while (Running()) {
+           // Read data from the DVR device:
+           uchar *b = NULL;
+           if (GetTSPacket(b)) {
+              if (b) {
+                 int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
+                 // Distribute the packet to all attached receivers:
+                 Lock();
+                 for (int i = 0; i < MAXRECEIVERS; i++) {
+                     if (receiver[i] && receiver[i]->WantsPid(Pid))
+                        receiver[i]->Receive(b, TS_SIZE);
+                     }
+                 Unlock();
+                 }
+              }
+           else
+              break;
+           }
      CloseDvr();
      }
 }
@@ -1188,10 +1186,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Receiver->device = this;
          receiver[i] = Receiver;
          Unlock();
-         if (!active) {
-            active = true;
+         if (!Running())
             Start();
-            }
          return true;
          }
       }
@@ -1218,10 +1214,8 @@ void cDevice::Detach(cReceiver *Receiver)
       else if (receiver[i])
          receiversLeft = true;
       }
-  if (!receiversLeft) {
-     active = false;
+  if (!receiversLeft)
      Cancel(3);
-     }
 }
 
 void cDevice::DetachAll(int Pid)
@@ -1246,13 +1240,11 @@ cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
   delivered = false;
   ringBuffer = new cRingBufferLinear(Size, TS_SIZE, true, "TS");
   ringBuffer->SetTimeouts(100, 100);
-  active = true;
   Start();
 }
 
 cTSBuffer::~cTSBuffer()
 {
-  active = false;
   Cancel(3);
   delete ringBuffer;
 }
@@ -1262,20 +1254,20 @@ void cTSBuffer::Action(void)
   if (ringBuffer) {
      bool firstRead = true;
      cPoller Poller(f);
-     for (; active;) {
-         if (firstRead || Poller.Poll(100)) {
-            firstRead = false;
-            int r = ringBuffer->Read(f);
-            if (r < 0 && FATALERRNO) {
-               if (errno == EOVERFLOW)
-                  esyslog("ERROR: driver buffer overflow on device %d", cardIndex);
-               else {
-                  LOG_ERROR;
-                  break;
-                  }
-               }
-            }
-         }
+     while (Running()) {
+           if (firstRead || Poller.Poll(100)) {
+              firstRead = false;
+              int r = ringBuffer->Read(f);
+              if (r < 0 && FATALERRNO) {
+                 if (errno == EOVERFLOW)
+                    esyslog("ERROR: driver buffer overflow on device %d", cardIndex);
+                 else {
+                    LOG_ERROR;
+                    break;
+                    }
+                 }
+              }
+           }
      }
 }
 
diff --git a/device.h b/device.h
index 70092a9a1..fc9ba3a1b 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.60 2005/07/30 09:31:53 kls Exp $
+ * $Id: device.h 1.61 2005/08/13 11:44:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -233,7 +233,6 @@ class cDevice : public cThread {
 // PID handle facilities
 
 private:
-  bool active;
   virtual void Action(void);
 protected:
   enum ePidType { ptAudio, ptVideo, ptPcr, ptTeletext, ptDolby, ptOther };
@@ -518,7 +517,6 @@ class cTSBuffer : public cThread {
 private:
   int f;
   int cardIndex;
-  bool active;
   bool delivered;
   cRingBufferLinear *ringBuffer;
   virtual void Action(void);
diff --git a/dvbdevice.c b/dvbdevice.c
index 8a25adb4a..ccd9a982a 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.131 2005/06/19 11:00:43 kls Exp $
+ * $Id: dvbdevice.c 1.134 2005/08/15 14:05:23 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -76,7 +76,6 @@ class cDvbTuner : public cThread {
   cCiHandler *ciHandler;
   cChannel channel;
   const char *diseqcCommands;
-  bool active;
   bool useCa;
   time_t startTime;
   eTunerStatus tunerStatus;
@@ -101,7 +100,6 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   frontendType = FrontendType;
   ciHandler = CiHandler;
   diseqcCommands = NULL;
-  active = false;
   useCa = false;
   tunerStatus = tsIdle;
   startTime = time(NULL);
@@ -113,7 +111,6 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
 
 cDvbTuner::~cDvbTuner()
 {
-  active = false;
   tunerStatus = tsIdle;
   newSet.Signal();
   Cancel(3);
@@ -294,8 +291,7 @@ bool cDvbTuner::SetFrontend(void)
 void cDvbTuner::Action(void)
 {
   dvb_frontend_event event;
-  active = true;
-  while (active) {
+  while (Running()) {
         Lock();
         if (tunerStatus == tsSet) {
            while (GetFrontendEvent(event))
@@ -1056,22 +1052,6 @@ void cDvbDevice::Mute(void)
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
 {
-/* Using the VIDEO_STILLPICTURE ioctl call would be the
-   correct way to display a still frame, but unfortunately this
-   doesn't work with frames from VDR. So let's do pretty much the
-   same here as in DVB/driver/dvb.c's play_iframe() - I have absolutely
-   no idea why it works this way, but doesn't work with VIDEO_STILLPICTURE.
-   If anybody ever finds out what could be changed so that VIDEO_STILLPICTURE
-   could be used, please let me know!
-   kls 2002-03-23
-   2003-08-30: apparently the driver can't handle PES data, so Oliver Endriss
-               <o.endriss@gmx.de> has changed this to strip all PES headers
-               and send pure ES data to the driver. Seems to work just fine!
-               Let's drop the VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES stuff
-               once this has proven to work in all cases.
-*/
-#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-#ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
   if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
      // PES data
      char *buf = MALLOC(char, Length);
@@ -1143,13 +1123,6 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
      video_still_picture sp = { (char *)Data, Length };
      CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
      }
-#else
-#define MIN_IFRAME 400000
-  for (int i = MIN_IFRAME / Length + 1; i > 0; i--) {
-      safe_write(fd_video, Data, Length);
-      cCondWait::SleepMs(3); // allows the buffer to be displayed in case the progress display is active
-      }
-#endif
 }
 
 bool cDvbDevice::Poll(cPoller &Poller, int TimeoutMs)
diff --git a/dvbplayer.c b/dvbplayer.c
index cd002a778..feb82d8ea 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.36 2005/07/30 10:00:24 kls Exp $
+ * $Id: dvbplayer.c 1.38 2005/08/14 10:52:45 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -79,7 +79,6 @@ class cNonBlockingFileReader : public cThread {
   int wanted;
   int length;
   bool hasData;
-  bool active;
   cCondWait newSet;
 protected:
   void Action(void);
@@ -98,13 +97,11 @@ cNonBlockingFileReader::cNonBlockingFileReader(void)
   buffer = NULL;
   wanted = length = 0;
   hasData = false;
-  active = false;
   Start();
 }
 
 cNonBlockingFileReader::~cNonBlockingFileReader()
 {
-  active = false;
   newSet.Signal();
   Cancel(3);
   free(buffer);
@@ -147,8 +144,7 @@ int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
 
 void cNonBlockingFileReader::Action(void)
 {
-  active = true;
-  while (active) {
+  while (Running()) {
         Lock();
         if (!hasData && f >= 0 && buffer) {
            int r = safe_read(f, buffer + length, wanted - length);
@@ -187,8 +183,6 @@ class cDvbPlayer : public cPlayer, cThread {
   cIndexFile *index;
   int replayFile;
   bool eof;
-  bool active;
-  bool running;
   bool firstPacket;
   ePlayModes playMode;
   ePlayDirs playDir;
@@ -207,7 +201,7 @@ class cDvbPlayer : public cPlayer, cThread {
 public:
   cDvbPlayer(const char *FileName);
   virtual ~cDvbPlayer();
-  bool Active(void) { return active; }
+  bool Active(void) { return cThread::Running(); }
   void Pause(void);
   void Play(void);
   void Forward(void);
@@ -233,8 +227,6 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   backTrace = NULL;
   index = NULL;
   eof = false;
-  active = true;
-  running = false;
   firstPacket = true;
   playMode = pmPlay;
   playDir = pdForward;
@@ -353,11 +345,8 @@ void cDvbPlayer::Activate(bool On)
      if (replayFile >= 0)
         Start();
      }
-  else if (active) {
-     running = false;
+  else
      Cancel(9);
-     active = false;
-     }
 }
 
 void cDvbPlayer::Action(void)
@@ -374,8 +363,7 @@ void cDvbPlayer::Action(void)
   int Length = 0;
   bool Sleep = false;
 
-  running = true;
-  while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
+  while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
         if (Sleep) {
            cCondWait::SleepMs(3); // this keeps the CPU load low
            Sleep = false;
@@ -501,7 +489,6 @@ void cDvbPlayer::Action(void)
               Sleep = true;
            }
         }
-  active = running = false;
 
   cNonBlockingFileReader *nbfr = nonBlockingFileReader;
   nonBlockingFileReader = NULL;
diff --git a/eit.c b/eit.c
index 42229f8f9..702a8e89b 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.109 2005/08/07 13:52:29 kls Exp $
+ * $Id: eit.c 1.110 2005/08/13 13:27:34 kls Exp $
  */
 
 #include "eit.h"
@@ -35,8 +35,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
   if (!channel)
      return; // only collect data for known channels
 
-  cEvent *rEvent = NULL;
-
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channelID);
   if (!pSchedule) {
      pSchedule = new cSchedule(channelID);
@@ -53,6 +51,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          continue;
       Empty = false;
       cEvent *newEvent = NULL;
+      cEvent *rEvent = NULL;
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
       if (!pEvent) {
          // If we don't have that event yet, we create a new one.
diff --git a/i18n.c b/i18n.c
index aeb174fc8..d7c687339 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.197 2005/08/06 16:09:44 kls Exp $
+ * $Id: i18n.c 1.198 2005/08/14 12:03:47 kls Exp $
  *
  * Translations provided by:
  *
@@ -252,6 +252,27 @@ const tI18nPhrase Phrases[] = {
     "Salvestused",
     "Optagelser",
   },
+  { "Recording info",
+    "Aufzeichnung",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Tallenteen tiedot",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup",
     "Einstellungen",
     "Nastavitve",
diff --git a/lirc.c b/lirc.c
index 0714049bb..2eee9cc0d 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.11 2005/07/31 10:18:09 kls Exp $
+ * $Id: lirc.c 1.12 2005/08/15 12:28:10 kls Exp $
  */
 
 #include "lirc.h"
@@ -61,48 +61,48 @@ void cLircRemote::Action(void)
   bool repeat = false;
   int timeout = -1;
 
-  for (; f >= 0;) {
+  while (Running() && f >= 0) {
 
-      bool ready = cFile::FileReady(f, timeout);
-      int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
+        bool ready = cFile::FileReady(f, timeout);
+        int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
 
-      if (ready && ret <= 0 ) {
-         esyslog("ERROR: lircd connection lost");
-         close(f);
-         f = -1;
-         break;
-         }
+        if (ready && ret <= 0 ) {
+           esyslog("ERROR: lircd connection lost");
+           close(f);
+           f = -1;
+           break;
+           }
 
-      if (ready && ret > 21) {
-         int count;
-         char KeyName[LIRC_KEY_BUF];
-         sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
-         if (count == 0) {
-            if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < KEYPRESSDELAY)
-               continue; // skip keys coming in too fast
-            if (repeat)
-               Put(LastKeyName, false, true);
-            strcpy(LastKeyName, KeyName);
-            repeat = false;
-            FirstTime.Set();
-            timeout = -1;
-            }
-         else {
-            if (FirstTime.Elapsed() < REPEATDELAY)
-               continue; // repeat function kicks in after a short delay
-            repeat = true;
-            timeout = REPEATDELAY;
-            }
-         LastTime.Set();
-         Put(KeyName, repeat);
-         }
-      else if (repeat) { // the last one was a repeat, so let's generate a release
-         if (LastTime.Elapsed() >= REPEATDELAY) {
-            Put(LastKeyName, false, true);
-            repeat = false;
-            *LastKeyName = 0;
-            timeout = -1;
-            }
-         }
-      }
+        if (ready && ret > 21) {
+           int count;
+           char KeyName[LIRC_KEY_BUF];
+           sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
+           if (count == 0) {
+              if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < KEYPRESSDELAY)
+                 continue; // skip keys coming in too fast
+              if (repeat)
+                 Put(LastKeyName, false, true);
+              strcpy(LastKeyName, KeyName);
+              repeat = false;
+              FirstTime.Set();
+              timeout = -1;
+              }
+           else {
+              if (FirstTime.Elapsed() < REPEATDELAY)
+                 continue; // repeat function kicks in after a short delay
+              repeat = true;
+              timeout = REPEATDELAY;
+              }
+           LastTime.Set();
+           Put(KeyName, repeat);
+           }
+        else if (repeat) { // the last one was a repeat, so let's generate a release
+           if (LastTime.Elapsed() >= REPEATDELAY) {
+              Put(LastKeyName, false, true);
+              repeat = false;
+              *LastKeyName = 0;
+              timeout = -1;
+              }
+           }
+        }
 }
diff --git a/menu.c b/menu.c
index d9b92b79a..33857073a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.351 2005/06/18 10:31:52 kls Exp $
+ * $Id: menu.c 1.355 2005/08/14 15:14:29 kls Exp $
  */
 
 #include "menu.h"
@@ -1445,7 +1445,7 @@ class cMenuRecording : public cOsdMenu {
 };
 
 cMenuRecording::cMenuRecording(const cRecording *Recording)
-:cOsdMenu(tr("Recording"))
+:cOsdMenu(tr("Recording info"))
 {
   recording = Recording;
   if (recording)
@@ -2789,6 +2789,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
          withInfo = false;
+         number = 0;
          if (group < 0) {
             cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
             if (channel)
@@ -2824,6 +2825,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kChanDn:
          withInfo = true;
          group = -1;
+         number = 0;
          Refresh();
          break;
     case kNone:
@@ -2852,6 +2854,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      Refresh();
                      break;
                      }
+                  else if (number > 0 && channel)
+                     Channels.SwitchTo(number);
                   return osEnd;
     default:      if ((Key & (k_Repeat | k_Release)) == 0) {
                      cRemote::Put(Key);
@@ -3596,10 +3600,11 @@ void cReplayControl::MarkJump(bool Forward)
      int Current, Total;
      if (GetIndex(Current, Total)) {
         cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
-        if (m)
+        if (m) {
            Goto(m->position, true);
+           displayFrames = true;
+           }
         }
-     displayFrames = true;
      }
 }
 
diff --git a/rcu.c b/rcu.c
index fea31ec38..f1f0de565 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.9 2005/07/31 10:17:45 kls Exp $
+ * $Id: rcu.c 1.10 2005/08/15 12:30:21 kls Exp $
  */
 
 #include "rcu.h"
@@ -98,60 +98,59 @@ void cRcuRemote::Action(void)
   uint64 LastCommand = 0;
   bool repeat = false;
 
-  //XXX
-  for (; f >= 0;) {
+  while (Running() && f >= 0) {
 
-      LOCK_THREAD;
+        LOCK_THREAD;
 
-      if (ReceiveByte(REPEATLIMIT) == 'X') {
-         for (int i = 0; i < 6; i++) {
-             int b = ReceiveByte();
-             if (b >= 0) {
-                buffer.raw[i] = b;
-                if (i == 5) {
-                   unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
-                   uint64         Command = ntohl(buffer.data.command);
-                   if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
-                      // Well, well, if it isn't the "d-box"...
-                      // This remote control sends the above command before and after
-                      // each keypress - let's just drop this:
-                      break;
-                   Command |= uint64(Address) << 32;
-                   if (Command != LastCommand) {
-                      LastCommand = Command;
-                      repeat = false;
-                      FirstTime.Set();
-                      }
-                   else {
-                      if (FirstTime.Elapsed() < REPEATDELAY)
-                         break; // repeat function kicks in after a short delay
-                      repeat = true;
-                      }
-                   Put(Command, repeat);
-                   receivedCommand = true;
-                   }
-                }
-             else
-                break;
-             }
-         }
-      else if (repeat) { // the last one was a repeat, so let's generate a release
-         Put(LastCommand, false, true);
-         repeat = false;
-         LastCommand = 0;
-         }
-      else {
-         LastCommand = 0;
-         if (numberToSend >= 0) {
-            Number(numberToSend);
-            numberToSend = -1;
-            }
-         }
-      if (code && time(NULL) - LastCodeRefresh > 60) {
-         SendCommand(code); // in case the PIC listens to the wrong code
-         LastCodeRefresh = time(NULL);
-         }
-      }
+        if (ReceiveByte(REPEATLIMIT) == 'X') {
+           for (int i = 0; i < 6; i++) {
+               int b = ReceiveByte();
+               if (b >= 0) {
+                  buffer.raw[i] = b;
+                  if (i == 5) {
+                     unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
+                     uint64         Command = ntohl(buffer.data.command);
+                     if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
+                        // Well, well, if it isn't the "d-box"...
+                        // This remote control sends the above command before and after
+                        // each keypress - let's just drop this:
+                        break;
+                     Command |= uint64(Address) << 32;
+                     if (Command != LastCommand) {
+                        LastCommand = Command;
+                        repeat = false;
+                        FirstTime.Set();
+                        }
+                     else {
+                        if (FirstTime.Elapsed() < REPEATDELAY)
+                           break; // repeat function kicks in after a short delay
+                        repeat = true;
+                        }
+                     Put(Command, repeat);
+                     receivedCommand = true;
+                     }
+                  }
+               else
+                  break;
+               }
+           }
+        else if (repeat) { // the last one was a repeat, so let's generate a release
+           Put(LastCommand, false, true);
+           repeat = false;
+           LastCommand = 0;
+           }
+        else {
+           LastCommand = 0;
+           if (numberToSend >= 0) {
+              Number(numberToSend);
+              numberToSend = -1;
+              }
+           }
+        if (code && time(NULL) - LastCodeRefresh > 60) {
+           SendCommand(code); // in case the PIC listens to the wrong code
+           LastCodeRefresh = time(NULL);
+           }
+        }
 }
 
 int cRcuRemote::ReceiveByte(int TimeoutMs)
diff --git a/recorder.c b/recorder.c
index dd3f4f605..34236fcab 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.13 2005/01/16 12:53:17 kls Exp $
+ * $Id: recorder.c 1.15 2005/08/14 10:53:28 kls Exp $
  */
 
 #include <stdarg.h>
@@ -29,7 +29,6 @@ class cFileWriter : public cThread {
   uchar pictureType;
   int fileSize;
   int recordFile;
-  bool active;
   time_t lastDiskSpaceCheck;
   bool RunningLowOnDiskSpace(void);
   bool NextFile(void);
@@ -43,7 +42,6 @@ class cFileWriter : public cThread {
 cFileWriter::cFileWriter(const char *FileName, cRemux *Remux)
 :cThread("file writer")
 {
-  active = false;
   fileName = NULL;
   remux = Remux;
   index = NULL;
@@ -63,7 +61,6 @@ cFileWriter::cFileWriter(const char *FileName, cRemux *Remux)
 
 cFileWriter::~cFileWriter()
 {
-  active = false;
   Cancel(3);
   delete index;
   delete fileName;
@@ -96,13 +93,11 @@ bool cFileWriter::NextFile(void)
 void cFileWriter::Action(void)
 {
   time_t t = time(NULL);
-  active = true;
-  while (active) {
+  while (Running()) {
         int Count;
         uchar *p = remux->Get(Count, &pictureType);
         if (p) {
-           //XXX+ active??? see old version (Busy)
-           if (!active && pictureType == I_FRAME) // finish the recording before the next 'I' frame
+           if (!Running() && pictureType == I_FRAME) // finish the recording before the next 'I' frame
               break;
            if (NextFile()) {
               if (index && pictureType != NO_PICTURE)
@@ -124,15 +119,12 @@ void cFileWriter::Action(void)
            t = time(NULL);
            }
         }
-  active = false;
 }
 
 cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
 :cReceiver(Ca, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
 ,cThread("recording")
 {
-  active = false;
-
   // Make sure the disk is up and running:
 
   SpinUpDisk(FileName);
@@ -157,25 +149,22 @@ void cRecorder::Activate(bool On)
      writer->Start();
      Start();
      }
-  else if (active) {
-     active = false;
+  else
      Cancel(3);
-     }
 }
 
 void cRecorder::Receive(uchar *Data, int Length)
 {
-  if (active) {
+  if (Running()) {
      int p = ringBuffer->Put(Data, Length);
-     if (p != Length && active)
+     if (p != Length && Running())
         ringBuffer->ReportOverflow(Length - p);
      }
 }
 
 void cRecorder::Action(void)
 {
-  active = true;
-  while (active) {
+  while (Running()) {
         int r;
         uchar *b = ringBuffer->Get(r);
         if (b) {
diff --git a/recorder.h b/recorder.h
index 70e501572..c4aebbf35 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 1.3 2005/01/15 16:35:53 kls Exp $
+ * $Id: recorder.h 1.4 2005/08/13 11:31:18 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -23,7 +23,6 @@ class cRecorder : public cReceiver, cThread {
   cRingBufferLinear *ringBuffer;
   cRemux *remux;
   cFileWriter *writer;
-  bool active;
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
diff --git a/recording.c b/recording.c
index 081f9e610..f9c424cd1 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.110 2005/08/06 09:53:21 kls Exp $
+ * $Id: recording.c 1.111 2005/08/13 14:00:48 kls Exp $
  */
 
 #include "recording.h"
@@ -220,11 +220,11 @@ void cResumeFile::Delete(void)
 
 // --- cRecordingInfo --------------------------------------------------------
 
-cRecordingInfo::cRecordingInfo(const cEvent *Event)
+cRecordingInfo::cRecordingInfo(tChannelID ChannelID, const cEvent *Event)
 {
+  channelID = ChannelID;
   if (Event) {
      event = Event;
-     channelID = event->ChannelID();
      ownEvent = NULL;
      }
   else
@@ -424,7 +424,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   priority = Timer->Priority();
   lifetime = Timer->Lifetime();
   // handle info:
-  info = new cRecordingInfo(Event);
+  info = new cRecordingInfo(Timer->Channel()->GetChannelID(), Event);
   // this is a somewhat ugly hack to get the 'summary' information from the
   // timer into the recording info, but it saves us from having to actually
   // copy the entire event data:
diff --git a/recording.h b/recording.h
index 0adb036ea..05c34e28c 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.38 2005/05/28 09:34:07 kls Exp $
+ * $Id: recording.h 1.39 2005/08/13 14:09:50 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -40,7 +40,7 @@ class cRecordingInfo {
   tChannelID channelID;
   const cEvent *event;
   cEvent *ownEvent;
-  cRecordingInfo(const cEvent *Event = NULL);
+  cRecordingInfo(tChannelID ChannelID = tChannelID::InvalidID, const cEvent *Event = NULL);
   void SetData(const char *Title, const char *ShortText, const char *Description);
 public:
   ~cRecordingInfo();
diff --git a/remote.c b/remote.c
index 448d5530e..325c3a217 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.42 2005/03/20 13:25:31 kls Exp $
+ * $Id: remote.c 1.44 2005/08/14 10:53:55 kls Exp $
  */
 
 #include "remote.h"
@@ -213,7 +213,6 @@ cKbdRemote::cKbdRemote(void)
 :cRemote("KBD")
 ,cThread("KBD remote control")
 {
-  active = false;
   tcgetattr(STDIN_FILENO, &savedTm);
   struct termios tm;
   if (tcgetattr(STDIN_FILENO, &tm) == 0) {
@@ -230,7 +229,6 @@ cKbdRemote::cKbdRemote(void)
 cKbdRemote::~cKbdRemote()
 {
   kbdAvailable = false;
-  active = false;
   Cancel(3);
   tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
 }
@@ -261,12 +259,11 @@ int cKbdRemote::MapCodeToFunc(uint64 Code)
 void cKbdRemote::Action(void)
 {
   cPoller Poller(STDIN_FILENO);
-  active = true;
-  while (active) {
+  while (Running()) {
         if (Poller.Poll(100)) {
            uint64 Command = 0;
            uint i = 0;
-           while (active && i < sizeof(Command)) {
+           while (Running() && i < sizeof(Command)) {
                  uchar ch;
                  int r = read(STDIN_FILENO, &ch, 1);
                  if (r == 1) {
diff --git a/remote.h b/remote.h
index 2ef206f22..995aa6cd9 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.29 2004/05/28 14:14:02 kls Exp $
+ * $Id: remote.h 1.30 2005/08/13 11:28:10 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -81,7 +81,6 @@ enum eKbdFunc {
 
 class cKbdRemote : public cRemote, private cThread {
 private:
-  bool active;
   static bool kbdAvailable;
   static bool rawMode;
   struct termios savedTm;
diff --git a/sections.c b/sections.c
index 6552d56ea..acf4dac2e 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.11 2005/05/29 11:43:17 kls Exp $
+ * $Id: sections.c 1.13 2005/08/14 10:54:39 kls Exp $
  */
 
 #include "sections.h"
@@ -44,7 +44,6 @@ cSectionHandler::cSectionHandler(cDevice *Device)
 {
   shp = new cSectionHandlerPrivate;
   device = Device;
-  active = false;
   statusCount = 0;
   on = false;
   waitForLock = false;
@@ -54,7 +53,6 @@ cSectionHandler::cSectionHandler(cDevice *Device)
 
 cSectionHandler::~cSectionHandler()
 {
-  active = false;
   Cancel(3);
   cFilter *fi;
   while ((fi = filters.First()) != NULL)
@@ -166,9 +164,8 @@ void cSectionHandler::SetStatus(bool On)
 
 void cSectionHandler::Action(void)
 {
-  active = true;
   SetPriority(19);
-  while (active) {
+  while (Running()) {
 
         Lock();
         if (waitForLock)
diff --git a/sections.h b/sections.h
index 0b2b5bdf6..f11f4794e 100644
--- a/sections.h
+++ b/sections.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.h 1.4 2004/08/08 13:44:17 kls Exp $
+ * $Id: sections.h 1.5 2005/08/13 11:23:55 kls Exp $
  */
 
 #ifndef __SECTIONS_H
@@ -25,7 +25,6 @@ class cSectionHandler : public cThread {
 private:
   cSectionHandlerPrivate *shp;
   cDevice *device;
-  bool active;
   int statusCount;
   bool on, waitForLock;
   time_t lastIncompleteSection;
diff --git a/skinsttng.c b/skinsttng.c
index b9d9ccbbb..e7f3d8b8f 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.14 2005/05/16 10:44:58 kls Exp $
+ * $Id: skinsttng.c 1.15 2005/08/15 11:14:59 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -130,6 +130,7 @@ class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel {
   bool message;
   const cEvent *present;
   int lastSeen;
+  tTrackId lastTrackId;
   static cBitmap bmTeletext, bmRadio, bmAudio, bmDolbyDigital, bmEncrypted, bmRecording;
 public:
   cSkinSTTNGDisplayChannel(bool WithInfo);
@@ -151,6 +152,7 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
 {
   present = NULL;
   lastSeen = -1;
+  memset(&lastTrackId, 0, sizeof(lastTrackId));
   const cFont *font = cFont::GetFont(fontOsd);
   withInfo = WithInfo;
   lineHeight = font->Height();
@@ -298,7 +300,10 @@ void cSkinSTTNGDisplayChannel::Flush(void)
         osd->DrawText(x4 - w - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
         cDevice *Device = cDevice::PrimaryDevice();
         const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
-        osd->DrawText(x3 + 2, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 4);
+        if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
+           osd->DrawText(x3 + 2, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 4);
+           strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
+           }
         }
 
      int seen = 0;
diff --git a/thread.c b/thread.c
index 9ac1b7ef6..3fa410065 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.43 2005/05/29 11:40:30 kls Exp $
+ * $Id: thread.c 1.45 2005/08/14 11:15:42 kls Exp $
  */
 
 #include "thread.h"
@@ -197,7 +197,7 @@ bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(const char *Description)
 {
-  running = false;
+  active = running = false;
   childTid = 0;
   description = NULL;
   SetDescription(Description);
@@ -205,6 +205,7 @@ cThread::cThread(const char *Description)
 
 cThread::~cThread()
 {
+  Cancel(); // just in case the derived class didn't call it
   free(description);
 }
 
@@ -234,20 +235,21 @@ void *cThread::StartThread(cThread *Thread)
   if (Thread->description)
      dsyslog("%s thread ended (pid=%d, tid=%ld)", Thread->description, getpid(), pthread_self());
   Thread->running = false;
+  Thread->active = false;
   return NULL;
 }
 
 bool cThread::Start(void)
 {
-  if (!running) {
-     running = true;
+  if (!active) {
+     active = running = true;
      if (pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this) == 0) {
         pthread_detach(childTid); // auto-reap
         pthread_setschedparam(childTid, SCHED_RR, 0);
         }
      else {
         LOG_ERROR;
-        running = false;
+        active = running = false;
         return false;
         }
      }
@@ -256,7 +258,7 @@ bool cThread::Start(void)
 
 bool cThread::Active(void)
 {
-  if (running) {
+  if (active) {
      //
      // Single UNIX Spec v2 says:
      //
@@ -271,7 +273,7 @@ bool cThread::Active(void)
         if (err != ESRCH)
            LOG_ERROR;
         childTid = 0;
-        running = false;
+        active = running = false;
         }
      else
         return true;
@@ -281,7 +283,8 @@ bool cThread::Active(void)
 
 void cThread::Cancel(int WaitSeconds)
 {
-  if (running) {
+  running = false;
+  if (active) {
      if (WaitSeconds > 0) {
         for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
             if (!Active())
@@ -292,7 +295,7 @@ void cThread::Cancel(int WaitSeconds)
         }
      pthread_cancel(childTid);
      childTid = 0;
-     running = false;
+     active = false;
      }
 }
 
diff --git a/thread.h b/thread.h
index 48d049908..4eb09a105 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.28 2005/05/29 11:31:24 kls Exp $
+ * $Id: thread.h 1.30 2005/08/14 11:21:48 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -75,6 +75,7 @@ class cMutex {
 class cThread {
   friend class cThreadLock;
 private:
+  bool active;
   bool running;
   pthread_t childTid;
   cMutex mutex;
@@ -86,13 +87,30 @@ class cThread {
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
   virtual void Action(void) = 0;
+       ///< A derived cThread class must implement the code it wants to
+       ///< execute as a separate thread in this function. If this is
+       ///< a loop, it must check Running() repeatedly to see whether
+       ///< it's time to stop.
+  bool Running(void) { return running; }
+       ///< Returns false if a derived cThread object shall leave its Action()
+       ///< function.
   void Cancel(int WaitSeconds = 0);
+       ///< Cancels the thread by first setting 'running' to false, so that
+       ///< the Action() loop can finish in an orderly fashion and then waiting
+       ///< up to WaitSeconds seconds for the thread to actually end. If the
+       ///< thread doesn't end by itself, it is killed.
 public:
   cThread(const char *Description = NULL);
+       ///< Creates a new thread.
+       ///< If Description is present, a log file entry will be made when
+       ///< the thread starts and stops. The Start() function must be called 
+       ///< to actually start the thread.
   virtual ~cThread();
   void SetDescription(const char *Description, ...);
   bool Start(void);
+       ///< Actually starts the thread.
   bool Active(void);
+       ///< Checks whether the thread is still alive.
   static bool EmergencyExit(bool Request = false);
   };
 
diff --git a/transfer.c b/transfer.c
index c214b88ff..f34dea7d6 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.28 2005/02/19 14:38:55 kls Exp $
+ * $Id: transfer.c 1.30 2005/08/14 10:55:03 kls Exp $
  */
 
 #include "transfer.h"
@@ -21,7 +21,6 @@ cTransfer::cTransfer(int VPid, const int *APids, const int *DPids, const int *SP
   ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
   remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids);
   needsBufferReserve = Setup.UseDolbyDigital && VPid != 0 && DPids && DPids[0] != 0;
-  active = false;
 }
 
 cTransfer::~cTransfer()
@@ -34,21 +33,17 @@ cTransfer::~cTransfer()
 
 void cTransfer::Activate(bool On)
 {
-  if (On) {
-     if (!active)
-        Start();
-     }
-  else if (active) {
-     active = false;
+  if (On)
+     Start();
+  else
      Cancel(3);
-     }
 }
 
 void cTransfer::Receive(uchar *Data, int Length)
 {
-  if (IsAttached() && active) {
+  if (IsAttached() && Running()) {
      int p = ringBuffer->Put(Data, Length);
-     if (p != Length && active)
+     if (p != Length && Running())
         ringBuffer->ReportOverflow(Length - p);
      return;
      }
@@ -70,8 +65,7 @@ void cTransfer::Action(void)
   bool GotBufferReserve = false;
   int RequiredBufferReserve = KILOBYTE(DvbCardWith4MBofSDRAM ? 288 : 576);
 #endif
-  active = true;
-  while (active) {
+  while (Running()) {
 #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
         if (needsBufferReserve && !GotBufferReserve) {
            //XXX For dolby we've to fill the buffer because the firmware does
@@ -145,7 +139,6 @@ void cTransfer::Action(void)
               }
            }
         }
-  active = false;
 }
 
 // --- cTransferControl ------------------------------------------------------
diff --git a/transfer.h b/transfer.h
index 70bbeb76c..fa88f122c 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.9 2005/01/15 16:39:39 kls Exp $
+ * $Id: transfer.h 1.10 2005/08/13 10:16:02 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -21,7 +21,6 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
   cRingBufferLinear *ringBuffer;
   cRemux *remux;
   bool needsBufferReserve;
-  bool active;
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);

From dab203efe9e24f1dade33ee1da6a39b26f8501f0 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 21 Aug 2005 18:00:00 +0200
Subject: [PATCH 122/307] Version 1.3.30 - Improved responsiveness inside CAM
 menus. - Added handling of the 'Close MMI' tag to avoid error log messages
 with CAMs   that actually use it. - Now waiting at startup until all DVB
 devices are ready. This includes having   all CAMs initialized and ready to
 decrypt, so that no more "channel not   available" happens if VDR is started
 with the current channel being an encrypted   one, or a timer on such a
 channel hits right after starting VDR. - Fixed cVideoRepacker to better
 handle errors in data (thanks to Reinhard Nissl). - Fixed cDvbTuner to avoid
 lockups on NPTL systems (thanks to Marcel Wiesweg). - Added 'Service'
 functions to the plugin interface (thanks to Udo Richter).   See
 PLUGINS.html, section "Custom services" for details. - Replaced the
 get/put_unaligned() macros from <asm/unaligned.h> with own inline   functions
 to avoid problems on platforms that don't provide these (thanks to   David
 Woodhouse for his help).

---
 CONTRIBUTORS                     |   8 +-
 HISTORY                          |  19 +-
 PLUGINS.html                     | 117 ++++++++---
 PLUGINS/src/servicedemo/COPYING  | 340 +++++++++++++++++++++++++++++++
 PLUGINS/src/servicedemo/HISTORY  |   6 +
 PLUGINS/src/servicedemo/Makefile |  87 ++++++++
 PLUGINS/src/servicedemo/README   |  16 ++
 PLUGINS/src/servicedemo/svccli.c |  90 ++++++++
 PLUGINS/src/servicedemo/svcsvr.c |  57 ++++++
 channels.conf                    |  10 +-
 ci.c                             |  32 ++-
 ci.h                             |   5 +-
 config.h                         |   6 +-
 device.c                         |  21 +-
 device.h                         |  13 +-
 dvbdevice.c                      |  74 ++++---
 dvbdevice.h                      |   3 +-
 newplugin                        |   9 +-
 plugin.c                         |  32 ++-
 plugin.h                         |   6 +-
 remux.c                          |  20 +-
 tools.h                          |  17 +-
 vdr.c                            |  17 +-
 23 files changed, 911 insertions(+), 94 deletions(-)
 create mode 100644 PLUGINS/src/servicedemo/COPYING
 create mode 100644 PLUGINS/src/servicedemo/HISTORY
 create mode 100644 PLUGINS/src/servicedemo/Makefile
 create mode 100644 PLUGINS/src/servicedemo/README
 create mode 100644 PLUGINS/src/servicedemo/svccli.c
 create mode 100644 PLUGINS/src/servicedemo/svcsvr.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9c704dc3a..ff546dd4b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -737,6 +737,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for adding play mode pmVideoOnly
  for fixing a possible crash with inconsistent SI data
  for pointing out a problem with the cChannel copy constructor
+ for fixing cDvbTuner to avoid lockups on NPTL systems
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -1261,6 +1262,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing handling 'page down' after it was broken in version 1.3.26
  for suggesting a fix for an out-of-bounds memory access with audio language ids
  for reporting a problem with cRemux in a single thread
+ for adding 'Service' functions to the plugin interface
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1428,9 +1430,13 @@ Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
  for reporting a problem in cEITScanner::Process() with forced EPG scans if EPG
  scan timeout is set to 0
 
-Klaus ??? <klaus@reel-multimedia.com>
+Klaus Heppenheimer <klaus@reel-multimedia.com>
  for reporting a race condition in cTransfer.
 
 Thomas G�nther <tom1@toms-cafe.de>
  for fixing handling the frame number display if '7' is pressed before the first
  editing mark, or '9' after the last one
+
+David Woodhouse <dwmw2@infradead.org>
+ for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
+ own inline functions to avoid problems on platforms that don't provide these
diff --git a/HISTORY b/HISTORY
index a932b6d70..016b6f5b7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3674,7 +3674,7 @@ Video Disk Recorder Revision History
 
 2005-08-15: Version 1.3.29
 
-- Fixed a race condition in cTransfer (thanks to Klaus ??? for reporting this one).
+- Fixed a race condition in cTransfer (thanks to Klaus Heppenheimer for reporting this one).
   In doing so, the 'active' variables used by the actual derived cThread classes
   have been replaced by the cThread::Running() function.
   Plugin authors may want to check their derived cThread classes and replace any 'active'
@@ -3699,3 +3699,20 @@ Video Disk Recorder Revision History
   this).
 - Removed the VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES stuff from
   cDvbDevice::StillPicture(), since apparently the VIDEO_STILLPICTURE call works.
+
+2005-08-21: Version 1.3.30
+
+- Improved responsiveness inside CAM menus.
+- Added handling of the 'Close MMI' tag to avoid error log messages with CAMs
+  that actually use it.
+- Now waiting at startup until all DVB devices are ready. This includes having
+  all CAMs initialized and ready to decrypt, so that no more "channel not
+  available" happens if VDR is started with the current channel being an encrypted
+  one, or a timer on such a channel hits right after starting VDR.
+- Fixed cVideoRepacker to better handle errors in data (thanks to Reinhard Nissl).
+- Fixed cDvbTuner to avoid lockups on NPTL systems (thanks to Marcel Wiesweg).
+- Added 'Service' functions to the plugin interface (thanks to Udo Richter).
+  See PLUGINS.html, section "Custom services" for details.
+- Replaced the get/put_unaligned() macros from <asm/unaligned.h> with own inline
+  functions to avoid problems on platforms that don't provide these (thanks to
+  David Woodhouse for his help).
diff --git a/PLUGINS.html b/PLUGINS.html
index 67b96d936..29d83513b 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -9,23 +9,23 @@
 <center><b>Version 1.3</b></center>
 <p>
 <center>
-Copyright &copy; 2004 Klaus Schmidinger<br>
+Copyright &copy; 2005 Klaus Schmidinger<br>
 <a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.18 are marked like this.
-<!--X1.3.18--></td></tr></table>
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.19 are marked like this.
 <!--X1.3.19--></td></tr></table>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.20 are marked like this.
 <!--X1.3.20--></td></tr></table>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.21 are marked like this.
 <!--X1.3.21--></td></tr></table>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.30 are marked like this.
+<!--X1.3.30--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -58,7 +58,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line arguments">Command line arguments</a>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Shutting down">Shutting down</a>
 <!--X1.3.20--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
@@ -68,6 +68,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
 <li><a href="#Internationalization">Internationalization</a>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Custom services">Custom services</a>
+<!--X1.3.30--></td></tr></table>
 <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
 <li><a href="#Building the distribution package">Building the distribution package</a>
 </ul>
@@ -81,7 +84,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Audio">Audio</a>
 <!--X1.3.21--></td></tr></table>
 <li><a href="#Remote Control">Remote Control</a>
@@ -308,7 +311,7 @@ <h1>Table Of Contents</h1>
 command line help - and after that immediately destroys them again.
 <p>
 The <b>destructor</b> has to clean up any data created by the plugin.
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Any threads the plugin may have created shall be stopped in the
 <a href="#Shutting down"><tt>Stop()</tt></a> function.
 <!--X1.3.20--></td></tr></table>
@@ -506,7 +509,7 @@ <h1>Table Of Contents</h1>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement either of these functions.
 
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Shutting down"><hr><h2>Shutting down</h2>
 
 <center><i><b>Stop it, right there!</b></i></center><p>
@@ -866,6 +869,77 @@ <h1>Table Of Contents</h1>
 and then in the global VDR texts. So a plugin can make use of texts defined by the
 core VDR code.
 
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Custom services"><hr><h2>Custom services</h2>
+
+<center><i><b>What can I do for you?</b></i></center><p>
+
+In some situations, two plugins may want to communicate directly, talking about things
+that VDR doesn't handle itself. For example, a plugin may want to use features
+that some other plugin offers, or it may want to inform other plugins about important
+things it does. To receive requests or messages, a plugin can implement the
+following function:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual bool Service(const char *Id, void *Data = NULL);
+</pre></td></tr></table><p>
+
+<tt>Id</tt> is a unique identification string that identifies the service protocol.
+To avoid collisions, the string should contain a service name, the plugin name (unless
+the service is not related to a single plugin) and a protocol version number.
+<tt>Data</tt> points to a custom data structure. For each id string
+there should be a specification that describes the format of the data
+structure, and any change to the format should  be reflected by a change
+of the id string.
+<p>
+The function shall return <i>true</i> for any service id string it handles, and <i>false</i>
+otherwise. The plugins have to agreee in which situations the service
+may be called, for example whether the service may be called from every thread, or
+just from the main thread. A possible implementation could look like this:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+struct Hello_SetGreetingTime_v1_0 {
+  int NewGreetingTime;
+  };
+
+bool cPluginHello::Service(const char *Id, void *Data)
+{
+  if (strcmp(Id, "Hello-SetGreetingTime-v1.0") == 0) {
+     if (Data == NULL)
+        return true;
+     GreetingTime = ((Hello_SetGreetingTime_v1_0*)Data)-&gt;NewGreetingTime;
+     return true;
+     }
+  return false;
+}
+</pre></td></tr></table><p>
+
+Plugins should expect to be called with <tt>Data</tt> set to <tt>NULL</tt> and may use
+this as a 'service supported' check without performing any actions.
+<p>
+To send messages to, or request services from a specific plugin, one plugin can directly
+call another plugin's service function:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+Hello_SetGreetingTime_v1_0 hellodata;
+hellodata.NewGreetingTime = 3;
+cPlugin *Plugin = cPluginManager::GetPlugin("hello");
+if (Plugin)
+   Plugin-&gt;Service("Hello-SetGreetingTime-v1.0", &gt;hellodata);
+</pre></td></tr></table><p>
+
+To send messages to, or request services from some plugin that offers the protocol, a
+plugin can call the function <tt>cPluginManager::CallFirstService()</tt>. This function
+will send the request to all plugins until one plugin handles it.
+The function returns a pointer to the plugin that handled the request, or <tt>NULL</tt>
+if no plugin handled it.
+<p>
+To send a messages to all plugins, a plugin can call the function
+<tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if
+any plugin handled the request, or <tt>false</tt> if no plugin handled the request.
+
+<!--X1.3.30--></td></tr></table>
+
 <a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2>
 
 <center><i><b>Saddling up!</b></i></center><p>
@@ -1046,7 +1120,6 @@ <h1>Table Of Contents</h1>
 Take a look at the files <tt>player.h</tt> and <tt>dvbplayer.c</tt> to see how VDR implements
 its own player for the VDR recordings.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 To play the actual data, the player needs to call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
@@ -1060,7 +1133,6 @@ <h1>Table Of Contents</h1>
 individual block of data. The sum of all blocks must simply result in the
 desired data stream, and it must be delivered fast enough so that the
 DVB device doesn't run out of data.
-<!--X1.3.18--></td></tr></table>
 To avoid busy loops the player should call its member function
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
@@ -1069,7 +1141,6 @@ <h1>Table Of Contents</h1>
 
 to determine whether the device is ready for further data.
 <p>
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 By default all audio track handling is done by the device a player is
 attached to.
 If the player can provide more than a single audio track, and has special
@@ -1088,7 +1159,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 See <tt>device.h</tt> for details about the parameters for track handling.
-<!--X1.3.18--></td></tr></table>
 <p>
 The second part needed here is a control object that receives user input from the main
 program loop and reacts on this by telling the player what to do:
@@ -1206,7 +1276,7 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.19--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 :cReceiver(0, -1, Pid)
 <!--X1.3.19--></td></tr></table>
 {
@@ -1384,9 +1454,7 @@ <h1>Table Of Contents</h1>
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
   virtual cSkinDisplayMessage *DisplayTrack(int NumTracks, const char * const *Tracks);
-<!--X1.3.18--></td></tr></table>
   virtual cSkinDisplayMessage *DisplayMessage(void);
   };
 </pre></td></tr></table><p>
@@ -1513,13 +1581,11 @@ <h1>Table Of Contents</h1>
 If the device can provide more than a single audio track, it can implement the
 following function to make them available:
 
-<!--X1.3.18--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual void SetAudioTrackDevice(eTrackType Type);
 virtual int GetAudioChannelDevice(void);
 virtual void SetAudioChannelDevice(int AudioChannel);
 </pre></td></tr></table><p>
-<!--X1.3.18--></td></tr></table>
 
 <p>
 <b>Recording</b>
@@ -1539,15 +1605,6 @@ <h1>Table Of Contents</h1>
 packets that are all 188 bytes in size. Each call to <tt>GetTSPacket()</tt>
 must deliver exactly one such packet (if one is currently available).
 <p>
-If this device allows receiving several different data streams, it can
-implement
-
-<p><table><tr><td bgcolor=#F0F0F0><pre>
-virtual bool CanBeReUsed(int Frequency, int Vpid);
-</pre></td></tr></table><p>
-
-to indicate this to VDR.
-<p>
 <b>Replaying</b>
 <p>
 The functions to implement replaying capabilites are
@@ -1678,7 +1735,7 @@ <h1>Table Of Contents</h1>
   virtual void Action(void);
 public:
   cMyAudio(void);
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
   virtual void Play(const uchar *Data, int Length, uchar Id);
 <!--X1.3.21--></td></tr></table>
   virtual void Mute(bool On);
diff --git a/PLUGINS/src/servicedemo/COPYING b/PLUGINS/src/servicedemo/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/src/servicedemo/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
new file mode 100644
index 000000000..16a0c4302
--- /dev/null
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'servicedemo' Revision History
+-----------------------------------------
+
+2005-08-21: Version 0.1.1
+
+- Initial revision.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
new file mode 100644
index 000000000..a7678fff5
--- /dev/null
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -0,0 +1,87 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2005/08/21 10:43:12 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN1 = svccli
+PLUGIN2 = svcsvr
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = svcintf-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN1).o $(PLUGIN2).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
+
+libvdr-$(PLUGIN1).so: $(PLUGIN1).o
+	$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+libvdr-$(PLUGIN2).so: $(PLUGIN2).o
+	$(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/servicedemo/README b/PLUGINS/src/servicedemo/README
new file mode 100644
index 000000000..16dfbfb6b
--- /dev/null
+++ b/PLUGINS/src/servicedemo/README
@@ -0,0 +1,16 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Udo Richter <udo_richter@gmx.de>
+
+Project's homepage:          www.cadsoft.de/vdr
+
+Latest version available at: www.cadsoft.de/vdr
+
+See the file COPYING for license information.
+
+Description:
+
+Demonstration of how plugins can communicate with each other.
+
+Run VDR with '-Psvcsvr -Psvccli' and select the main menu
+option "Service demo" to run the demo.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
new file mode 100644
index 000000000..9a4ed4440
--- /dev/null
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -0,0 +1,90 @@
+/*
+ * svccli.c: Sample service client plugin
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: svccli.c 1.1 2005/08/21 10:44:29 kls Exp $
+ */
+
+#include <stdlib.h>
+#include <vdr/interface.h>
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "0.1.1";
+static const char *DESCRIPTION    = "Service demo client";
+static const char *MAINMENUENTRY  = "Service demo";
+
+class cPluginSvcCli : public cPlugin {
+public:
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdObject *MainMenuAction(void);
+  virtual bool Service(const char *Id, void *Data);
+  };
+
+struct ReportBoredPlugin_v1_0 {
+  cPlugin *BoredPlugin;
+  };
+
+struct AddService_v1_0 {
+  int a, b;
+  int sum;
+  };
+
+// --- cPluginSvcCli ----------------------------------------------------------
+
+cOsdObject *cPluginSvcCli::MainMenuAction(void)
+{
+  char s[128];
+  cPlugin *p;
+
+  // Inform server plugin that we are bored
+  // (directed communication)
+  ReportBoredPlugin_v1_0 rbp;
+  rbp.BoredPlugin = this;
+  p = cPluginManager::GetPlugin("svcsvr");
+  if (p)
+     p->Service("ReportBoredPlugin-v1.0", &rbp);
+
+  // See if any plugin can add
+  // (detect capability)
+  p = cPluginManager::CallFirstService("AddService-v1.0", NULL);
+  if (p) {
+     snprintf(s, sizeof(s), "Plugin %s can add", p->Name());
+     Interface->Confirm(s);
+     }
+
+  // Perform add
+  // (use general service)
+  AddService_v1_0 adds;
+  adds.a = 1;
+  adds.b = 1;
+  if (cPluginManager::CallFirstService("AddService-v1.0", &adds)) {
+     snprintf(s, sizeof(s), "Plugin thinks that 1+1=%i", adds.sum);
+     Interface->Confirm(s);
+     }
+
+  // Inform other plugins that we are bored
+  // (broadcast)
+  rbp.BoredPlugin = this;
+  cPluginManager::CallAllServices("ReportBoredPlugin-v1.0", &rbp);
+
+  return NULL;
+}
+
+bool cPluginSvcCli::Service(const char *Id, void *Data)
+{
+  if (strcmp(Id, "ReportBoredPlugin-v1.0") == 0) {
+     if (Data) {
+        ReportBoredPlugin_v1_0 *rbp = (ReportBoredPlugin_v1_0*)Data;
+        char s[128];
+        snprintf(s, sizeof(s), "Plugin %s informed client that it is bored.", rbp->BoredPlugin->Name());
+        Interface->Confirm(s);
+        }
+     return true;
+     }
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginSvcCli); // Don't touch this!
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
new file mode 100644
index 000000000..7aff2b98d
--- /dev/null
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -0,0 +1,57 @@
+/*
+ * svcsvr.c: Sample service server plugin
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: svcsvr.c 1.1 2005/08/21 10:44:24 kls Exp $
+ */
+
+#include <stdlib.h>
+#include <vdr/interface.h>
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "0.1.1";
+static const char *DESCRIPTION    = "Service demo server";
+
+class cPluginSvcSvr : public cPlugin {
+public:
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual bool Service(const char *Id, void *Data);
+  };
+
+struct ReportBoredPlugin_v1_0 {
+  cPlugin *BoredPlugin;
+  };
+
+struct AddService_v1_0 {
+  int a, b;
+  int sum;
+  };
+
+// --- cPluginSvcSvr ----------------------------------------------------------
+
+bool cPluginSvcSvr::Service(const char *Id, void *Data)
+{
+  if (strcmp(Id,"ReportBoredPlugin-v1.0") == 0) {
+     if (Data) {
+        ReportBoredPlugin_v1_0 *rbp = (ReportBoredPlugin_v1_0*)Data;
+        char s[128];
+        snprintf(s, sizeof(s), "Plugin %s informed server that it is bored.", rbp->BoredPlugin->Name());
+        Interface->Confirm(s);
+        }
+     return true;
+     }
+
+  if (strcmp(Id,"AddService-v1.0") == 0) {
+     if (Data) {
+        AddService_v1_0 *data = (AddService_v1_0*)Data;
+        data->sum = data->a + data->b;
+        }
+     return true;
+     }
+
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginSvcSvr); // Don't touch this!
diff --git a/channels.conf b/channels.conf
index 9690dd37a..872bbbe41 100644
--- a/channels.conf
+++ b/channels.conf
@@ -8,7 +8,7 @@ hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Ferns.;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
@@ -43,9 +43,9 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1722,1702,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1801,1722,1702:11:133:2:0
+PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1801,1702:29:133:2:0
@@ -64,7 +64,7 @@ PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1801,170
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu:36:0:20002:1:1082:0
+ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
 ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
diff --git a/ci.c b/ci.c
index ff5203af0..94a5cd63a 100644
--- a/ci.c
+++ b/ci.c
@@ -4,11 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.24 2005/06/04 11:57:05 kls Exp $
+ * $Id: ci.c 1.27 2005/08/21 14:10:27 kls Exp $
  */
 
 #include "ci.h"
-#include <asm/unaligned.h>
 #include <ctype.h>
 #include <linux/dvb/ca.h>
 #include <malloc.h>
@@ -1136,6 +1135,19 @@ bool cCiMMI::Process(int Length, const uint8_t *Data)
                }
             }
             break;
+       case AOT_CLOSE_MMI: {
+            int id = -1;
+            int delay = -1;
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 0) {
+               id = *d++;
+               if (l > 1)
+                  delay = *d;
+               }
+            dbgprotocol("%d: <== Close MMI  id = %02X  delay = %d\n", SessionId(), id, delay);
+            }
+            break;
        default: esyslog("ERROR: CI MMI: unknown tag %06X", Tag);
                 return false;
        }
@@ -1341,6 +1353,8 @@ cCiHandler::cCiHandler(int Fd, int NumSlots)
   hasUserIO = false;
   for (int i = 0; i < MAX_CI_SESSION; i++)
       sessions[i] = NULL;
+  for (int i = 0; i < MAX_CI_SLOT; i++)
+      moduleReady[i] = false;
   tpl = new cCiTransportLayer(Fd, numSlots);
   tc = NULL;
 }
@@ -1493,6 +1507,19 @@ int cCiHandler::CloseAllSessions(int Slot)
   return result;
 }
 
+bool cCiHandler::Ready(void)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      if (moduleReady[Slot]) {
+         cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+         if (!cas || !*cas->GetCaSystemIds())
+            return false;
+         }
+      }
+  return true;
+}
+
 bool cCiHandler::Process(void)
 {
   bool result = true;
@@ -1530,6 +1557,7 @@ bool cCiHandler::Process(void)
          }
       else if (tpl->ModuleReady(Slot)) {
          dbgprotocol("Module ready in slot %d\n", Slot);
+         moduleReady[Slot] = true;
          tpl->NewConnection(Slot);
          }
       }
diff --git a/ci.h b/ci.h
index 7ae2b96ec..9d718951f 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.13 2004/02/08 14:36:23 kls Exp $
+ * $Id: ci.h 1.14 2005/08/20 14:56:11 kls Exp $
  */
 
 #ifndef __CI_H
@@ -77,6 +77,7 @@ class cCiCaPmt {
   };
 
 #define MAX_CI_SESSION  16 //XXX
+#define MAX_CI_SLOT     16
 
 class cCiSession;
 class cCiTransportLayer;
@@ -89,6 +90,7 @@ class cCiHandler {
   int numSlots;
   bool newCaSupport;
   bool hasUserIO;
+  bool moduleReady[MAX_CI_SLOT];
   cCiSession *sessions[MAX_CI_SESSION];
   cCiTransportLayer *tpl;
   cCiTransportConnection *tc;
@@ -105,6 +107,7 @@ class cCiHandler {
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
   int NumSlots(void) { return numSlots; }
+  bool Ready(void);
   bool Process(void);
   bool HasUserIO(void) { return hasUserIO; }
   bool EnterMenu(int Slot);
diff --git a/config.h b/config.h
index 57eed3006..a2e6c35cf 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.223 2005/08/13 09:43:27 kls Exp $
+ * $Id: config.h 1.224 2005/08/20 10:29:35 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.29"
-#define VDRVERSNUM   10329  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.30"
+#define VDRVERSNUM   10330  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 9fcc420b8..2f6149883 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.105 2005/08/14 10:52:08 kls Exp $
+ * $Id: device.c 1.106 2005/08/21 08:56:49 kls Exp $
  */
 
 #include "device.h"
@@ -195,6 +195,20 @@ cDevice::~cDevice()
   delete pesAssembler;
 }
 
+bool cDevice::WaitForAllDevicesReady(int Timeout)
+{
+  for (time_t t0 = time(NULL); time(NULL) - t0 < Timeout; ) {
+      bool ready = true;
+      for (int i = 0; i < numDevices; i++) {
+          if (device[i] && !device[i]->Ready())
+             ready = false;
+          }
+      if (ready)
+         return true;
+      }
+  return false;
+}
+
 void cDevice::SetUseDevice(int n)
 {
   if (n < MAXDEVICES)
@@ -1103,6 +1117,11 @@ int cDevice::CanShift(int Ca, int Priority, int UsedCards) const
   XXX*/
 }
 
+bool cDevice::Ready(void)
+{
+  return true;
+}
+
 int cDevice::ProvidesCa(const cChannel *Channel) const
 {
   int Ca = Channel->Ca();
diff --git a/device.h b/device.h
index fc9ba3a1b..c7075cbd7 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.61 2005/08/13 11:44:13 kls Exp $
+ * $Id: device.h 1.62 2005/08/21 08:52:20 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -102,6 +102,12 @@ class cDevice : public cThread {
 public:
   static int NumDevices(void) { return numDevices; }
          ///< Returns the total number of devices.
+  static bool WaitForAllDevicesReady(int Timeout = 0);
+         ///< Waits until all devices have become ready, or the given Timeout
+         ///< (seconds) has expired. While waiting, the Ready() function of each
+         ///< device is called in turn, until they all return true.
+         ///< \return True if all devices have become ready within the given
+         ///< timeout.
   static void SetUseDevice(int n);
          ///< Sets the 'useDevice' flag of the given device.
          ///< If this function is not called before initializing, all devices
@@ -136,6 +142,11 @@ class cDevice : public cThread {
 protected:
   cDevice(void);
   virtual ~cDevice();
+  virtual bool Ready(void);
+         ///< Returns true if this device is ready. Devices with conditional
+         ///< access hardware may need some time until they are up and running.
+         ///< This function is called in a loop at startup until all devices
+         ///< are ready (see WaitForAllDevicesReady()).
   static int NextCardIndex(int n = 0);
          ///< Calculates the next card index.
          ///< Each device in a given machine must have a unique card index, which
diff --git a/dvbdevice.c b/dvbdevice.c
index ccd9a982a..3f9e144e1 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.134 2005/08/15 14:05:23 kls Exp $
+ * $Id: dvbdevice.c 1.136 2005/08/21 09:17:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -81,7 +81,7 @@ class cDvbTuner : public cThread {
   eTunerStatus tunerStatus;
   cMutex mutex;
   cCondVar locked;
-  cCondWait newSet;
+  cCondVar newSet;
   bool GetFrontendEvent(dvb_frontend_event &Event, int TimeoutMs = 0);
   bool SetFrontend(void);
   virtual void Action(void);
@@ -112,7 +112,8 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
 cDvbTuner::~cDvbTuner()
 {
   tunerStatus = tsIdle;
-  newSet.Signal();
+  newSet.Broadcast();
+  locked.Broadcast();
   Cancel(3);
 }
 
@@ -123,7 +124,7 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 
 void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
 {
-  Lock();
+  cMutexLock MutexLock(&mutex);
   if (Tune)
      tunerStatus = tsSet;
   else if (tunerStatus == tsCam)
@@ -132,12 +133,15 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
   if (Channel->Ca() && tunerStatus != tsCam)
      startTime = time(NULL);
   channel = *Channel;
-  Unlock();
-  newSet.Signal();
+  newSet.Broadcast();
 }
 
 bool cDvbTuner::Locked(int TimeoutMs)
 {
+  bool isLocked = (tunerStatus >= tsLocked);
+  if (isLocked || !TimeoutMs)
+     return isLocked;
+
   cMutexLock MutexLock(&mutex);
   if (TimeoutMs && tunerStatus < tsLocked)
      locked.TimedWait(mutex, TimeoutMs);
@@ -292,25 +296,33 @@ void cDvbTuner::Action(void)
 {
   dvb_frontend_event event;
   while (Running()) {
-        Lock();
-        if (tunerStatus == tsSet) {
-           while (GetFrontendEvent(event))
-                 ; // discard stale events
-           tunerStatus = SetFrontend() ? tsTuned : tsIdle;
-           }
-        if (tunerStatus != tsIdle) {
-           while (GetFrontendEvent(event, 10)) {
-                 if (event.status & FE_REINIT) {
-                    tunerStatus = tsSet;
-                    esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
-                    }
-                 if (event.status & FE_HAS_LOCK) {
-                    cMutexLock MutexLock(&mutex);
-                    tunerStatus = tsLocked;
-                    locked.Broadcast();
-                    }
-                 }
-           }
+        bool hasEvent = GetFrontendEvent(event, 1);
+
+        cMutexLock MutexLock(&mutex);
+        switch (tunerStatus) {
+          case tsIdle:
+               break;
+          case tsSet:
+               if (hasEvent)
+                  continue;
+               tunerStatus = SetFrontend() ? tsTuned : tsIdle;
+               continue;
+          case tsTuned:
+          case tsLocked:
+          case tsCam:
+               if (hasEvent) {
+                  if (event.status & FE_REINIT) {
+                     tunerStatus = tsSet;
+                     esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
+                     }
+                  if (event.status & FE_HAS_LOCK) {
+                     tunerStatus = tsLocked;
+                     locked.Broadcast();
+                     }
+                  continue;
+                  }
+          }
+
         if (ciHandler) {
            if (ciHandler->Process() && useCa) {
               if (tunerStatus == tsLocked) {
@@ -332,10 +344,9 @@ void cDvbTuner::Action(void)
            else if (tunerStatus > tsLocked)
               tunerStatus = tsLocked;
            }
-        Unlock();
         // in the beginning we loop more often to let the CAM connection start up fast
         if (tunerStatus != tsTuned)
-           newSet.Wait((ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
+           newSet.TimedWait(mutex, (ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
         }
 }
 
@@ -478,6 +489,15 @@ bool cDvbDevice::HasDecoder(void) const
   return fd_video >= 0 && fd_audio >= 0;
 }
 
+bool cDvbDevice::Ready(void)
+{
+  if (ciHandler) {
+     ciHandler->Process();
+     return ciHandler->Ready();
+     }
+  return true;
+}
+
 int cDvbDevice::ProvidesCa(const cChannel *Channel) const
 {
   if (Channel->Ca() >= 0x0100 && ciHandler) {
diff --git a/dvbdevice.h b/dvbdevice.h
index 4a705367a..7da7e4f11 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.34 2005/02/20 11:17:07 kls Exp $
+ * $Id: dvbdevice.h 1.35 2005/08/20 15:20:15 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -42,6 +42,7 @@ class cDvbDevice : public cDevice {
 public:
   cDvbDevice(int n);
   virtual ~cDvbDevice();
+  virtual bool Ready(void);
   virtual int ProvidesCa(const cChannel *Channel) const;
   virtual bool HasDecoder(void) const;
 
diff --git a/newplugin b/newplugin
index 4a92159df..8badddfba 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.18 2005/01/30 13:50:05 kls Exp $
+# $Id: newplugin 1.19 2005/08/21 09:32:08 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -170,6 +170,7 @@ public:
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
+  virtual bool Service(const char *Id, void *Data = NULL);
   };
 
 cPlugin${PLUGIN_CLASS}::cPlugin$PLUGIN_CLASS(void)
@@ -236,6 +237,12 @@ bool cPlugin${PLUGIN_CLASS}::SetupParse(const char *Name, const char *Value)
   return false;
 }
 
+bool cPlugin${PLUGIN_CLASS}::Service(const char *Id, void *Data)
+{
+  // Handle custom service requests from other plugins
+  return false;
+}
+
 VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
 };
 
diff --git a/plugin.c b/plugin.c
index b7ebf3729..8a316cc05 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.13 2005/01/30 14:05:20 kls Exp $
+ * $Id: plugin.c 1.14 2005/08/21 09:35:28 kls Exp $
  */
 
 #include "plugin.h"
@@ -99,6 +99,11 @@ void cPlugin::SetupStore(const char *Name, int Value)
   Setup.Store(Name, Value, this->Name());
 }
 
+bool cPlugin::Service(const char *Id, void *Data)
+{
+  return false;
+}
+
 void cPlugin::RegisterI18n(const tI18nPhrase * const Phrases)
 {
   I18nRegister(Phrases, Name());
@@ -372,6 +377,31 @@ cPlugin *cPluginManager::GetPlugin(const char *Name)
   return NULL;
 }
 
+cPlugin *cPluginManager::CallFirstService(const char *Id, void *Data)
+{
+  if (pluginManager) {
+     for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
+         cPlugin *p = dll->Plugin();
+         if (p && p->Service(Id, Data))
+            return p;
+         }
+     }
+  return NULL;
+}
+
+bool cPluginManager::CallAllServices(const char *Id, void *Data)
+{
+  bool found=false;
+  if (pluginManager) {
+     for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
+         cPlugin *p = dll->Plugin();
+         if (p && p->Service(Id, Data))
+            found = true;
+         }
+     }
+  return found;
+}
+
 void cPluginManager::StopPlugins(void)
 {
   for (cDll *dll = dlls.Last(); dll; dll = dlls.Prev(dll)) {
diff --git a/plugin.h b/plugin.h
index 3d56b1759..3befbbba9 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.8 2005/01/30 14:03:48 kls Exp $
+ * $Id: plugin.h 1.9 2005/08/21 09:32:08 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -50,6 +50,8 @@ class cPlugin {
 
   void RegisterI18n(const tI18nPhrase * const Phrases);
 
+  virtual bool Service(const char *Id, void *Data = NULL);
+
   static void SetConfigDirectory(const char *Dir);
   static const char *ConfigDirectory(const char *PluginName = NULL);
   };
@@ -88,6 +90,8 @@ class cPluginManager {
   static bool HasPlugins(void);
   static cPlugin *GetPlugin(int Index);
   static cPlugin *GetPlugin(const char *Name);
+  static cPlugin *CallFirstService(const char *Id, void *Data = NULL);
+  static bool CallAllServices(const char *Id, void *Data = NULL);
   void StopPlugins(void);
   void Shutdown(void);
   };
diff --git a/remux.c b/remux.c
index 4a8682b70..c980bd830 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.36 2005/07/30 10:23:00 kls Exp $
+ * $Id: remux.c 1.37 2005/08/21 08:58:58 kls Exp $
  */
 
 #include "remux.h"
@@ -171,11 +171,9 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int Bite = fragmentLen + (Count >= 0 ? 0 : Count);
      // put data into result buffer
      int n = Put(ResultBuffer, fragmentData, Bite);
-     if (n != Bite) {
-        Reset();
-        return false;
-        }
      fragmentLen = 0;
+     if (n != Bite)
+        return false;
      }
   else if (pesHeaderLen > 0) { // ... which is contained in the PES header buffer
      int PacketLen = pesHeaderLen + Count - 6;
@@ -186,11 +184,9 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int Bite = pesHeaderLen + (Count >= 0 ? 0 : Count);
      // put data into result buffer
      int n = Put(ResultBuffer, pesHeader, Bite);
-     if (n != Bite) {
-        Reset();
-        return false;
-        }
      pesHeaderLen = 0;
+     if (n != Bite)
+        return false;
      }
   // append further payload
   if (Count > 0) {
@@ -198,10 +194,8 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int Bite = Count;
      // put data into result buffer
      int n = Put(ResultBuffer, Data, Bite);
-     if (n != Bite) {
-        Reset();
+     if (n != Bite)
         return false;
-        }
      }
   // we did it ;-)
   return true;
@@ -250,12 +244,10 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
            switch (*data) {
              case 0xB9 ... 0xFF: // system start codes
                   esyslog("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
-                  Reset();
                   break;
              case 0xB0 ... 0xB1: // reserved start codes
              case 0xB6:
                   esyslog("cVideoRepacker: found reserved start code: stream seems to be scrambled");
-                  Reset();
                   break;
              case 0xB4: // sequence error code
                   isyslog("cVideoRepacker: found sequence error code: stream seems to be damaged");
diff --git a/tools.h b/tools.h
index 0644f4e6c..0a8ee8b6a 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.73 2005/08/06 09:53:21 kls Exp $
+ * $Id: tools.h 1.74 2005/08/21 14:06:38 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -57,6 +57,21 @@ template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
 int BCD2INT(int x);
 
+// Unfortunately there are no platform independent macros for unaligned
+// access. so we do it this way:
+
+template<class T> inline T get_unaligned(T *p)
+{
+  struct s { T v; } __attribute__((packed));
+  return ((s *)p)->v;
+}
+
+template<class T> inline void put_unaligned(unsigned int v, T* p)
+{
+  struct s { T v; } __attribute__((packed));
+  ((s *)p)->v = v;
+}
+
 class cString {
 private:
   char *s;
diff --git a/vdr.c b/vdr.c
index f58d02bf3..c98ee0d6b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.209 2005/07/31 11:25:16 kls Exp $
+ * $Id: vdr.c 1.211 2005/08/21 08:47:06 kls Exp $
  */
 
 #include <getopt.h>
@@ -63,6 +63,9 @@
 #define SHUTDOWNWAIT      300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART       600 // seconds the next timer must be in the future to assume manual start
 #define CHANNELSAVEDELTA  600 // seconds before saving channels.conf after automatic modifications
+#define LASTCAMMENUTIMEOUT  3 // seconds to run the main loop 'fast' after a CAM menu has been closed
+                              // in order to react on a possible new CAM menu as soon as possible
+#define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
 
 #define EXIT(v) { ExitCode = (v); goto Exit; }
 
@@ -389,6 +392,7 @@ int main(int argc, char *argv[])
   int PreviousChannelIndex = 0;
   time_t LastChannelChanged = time(NULL);
   time_t LastActivity = 0;
+  time_t LastCamMenu = 0;
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
   bool UserShutdown = false;
@@ -517,6 +521,8 @@ int main(int argc, char *argv[])
 
   // Channel:
 
+  if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
+     dsyslog("not all devices ready after %d seconds", DEVICEREADYTIMEOUT);
   Channels.SwitchTo(Setup.CurrentChannel);
   if (MuteAudio)
      cDevice::PrimaryDevice()->ToggleMute();
@@ -660,11 +666,16 @@ int main(int argc, char *argv[])
         if (!Menu && Recordings.NeedsUpdate())
            Recordings.Load();
         // CAM control:
-        if (!Menu && !cOsd::IsOpen())
+        if (!Menu && !cOsd::IsOpen()) {
            Menu = CamControl();
+           if (Menu)
+              LastCamMenu = 0;
+           else if (!LastCamMenu)
+              LastCamMenu = time(NULL);
+           }
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
-        eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
+        eKeys key = Interface->GetKey((!Interact || !Interact->NeedsFastResponse()) && time(NULL) - LastCamMenu > LASTCAMMENUTIMEOUT);
         if (NORMALKEY(key) != kNone) {
            EITScanner.Activity();
            LastActivity = time(NULL);

From ad40eaa28e6e9f0fa594937453b5ae53b88dce75 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 28 Aug 2005 18:00:00 +0200
Subject: [PATCH 123/307] =?UTF-8?q?Version=201.3.31=20-=20Added=20missing?=
 =?UTF-8?q?=20German=20OSD=20texts=20for=20'Audio=20language'.=20-=20The?=
 =?UTF-8?q?=20Setup/CICAM=20menu=20now=20only=20contains=20the=20devices?=
 =?UTF-8?q?=20that=20actually=20have=20a=20CI=20and=20=20=20dynamically=20?=
 =?UTF-8?q?detects=20the=20number=20of=20slots=20a=20CI=20provides.=20-=20?=
 =?UTF-8?q?Implemented=20cAudioRepacker=20for=20better=20handling=20of=20a?=
 =?UTF-8?q?udio=20PES=20packets=20(thanks=20to=20=20=20Reinhard=20Nissl).?=
 =?UTF-8?q?=20-=20Modified=20handling=20of=20audio=20packets=20for=20radio?=
 =?UTF-8?q?=20channels=20in=20remux.c=20(thanks=20to=20=20=20Reinhard=20Ni?=
 =?UTF-8?q?ssl).=20-=20Updated=20the=20Danish=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Mogens=20Elneff).=20-=20Fixed=20the=20EPG=20scan,=20so=20tha?=
 =?UTF-8?q?t=20it=20doesn't=20use=20the=20primary=20device=20if=20that=20i?=
 =?UTF-8?q?s=20=20=20currently=20in=20Transfer-Mode=20from=20itself=20(tha?=
 =?UTF-8?q?nks=20to=20Marcus=20Hilbrich=20for=20a=20bug=20=20=20report=20t?=
 =?UTF-8?q?hat=20lead=20to=20this).=20-=20Removed=20the=20TUNER=5FLOCK=5FT?=
 =?UTF-8?q?IMEOUT=20in=20cDevice::AttachReceiver()=20since=20it=20caused?=
 =?UTF-8?q?=20more=20=20=20trouble=20than=20it=20fixed.=20-=20Fixed=20dete?=
 =?UTF-8?q?cting=20short=20channel=20names=20for=20"Kabel=20Deutschland",?=
 =?UTF-8?q?=20who=20uses=20a=20comma=20=20=20as=20delimiter=20(thanks=20to?=
 =?UTF-8?q?=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Moved=20cMenuEditTimer?=
 =?UTF-8?q?=20and=20cMenuEvent=20to=20menu.h=20so=20that=20plugins=20can?=
 =?UTF-8?q?=20use=20it=20(suggested=20=20=20by=20Thomas=20G=C3=BCnther).?=
 =?UTF-8?q?=20-=20The=20new=20static=20function=20cString::sprintf()=20can?=
 =?UTF-8?q?=20be=20used=20to=20easily=20create=20a=20formatted=20=20=20str?=
 =?UTF-8?q?ing.=20-=20Plugins=20can=20now=20implement=20their=20own=20SVDR?=
 =?UTF-8?q?P=20commands=20(based=20on=20a=20patch=20from=20Hardy=20=20=20F?=
 =?UTF-8?q?lor).=20See=20PLUGINS.html,=20section=20"SVDRP=20commands"=20fo?=
 =?UTF-8?q?r=20details.=20The=20SVDRP=20commands=20=20=20of=20a=20plugin?=
 =?UTF-8?q?=20are=20accessed=20through=20the=20new=20SVDRP=20command=20PLU?=
 =?UTF-8?q?G.=20=20=20See=20PLUGINS/src/svdrpdemo=20for=20an=20example=20o?=
 =?UTF-8?q?f=20how=20to=20use=20this=20feature.=20-=20The=20new=20SVDRP=20?=
 =?UTF-8?q?command=20PLAY=20can=20be=20used=20to=20start=20replaying=20a?=
 =?UTF-8?q?=20recording=20(thanks=20to=20=20=20Hardy=20Flor).=20-=20The=20?=
 =?UTF-8?q?new=20SVDRP=20command=20EDIT=20can=20be=20used=20to=20start=20t?=
 =?UTF-8?q?he=20editing=20process=20of=20a=20recording=20=20=20(based=20on?=
 =?UTF-8?q?=20the=20CUTR=20patch=20by=20Harald=20Milz).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                      |  16 +
 HISTORY                           |  30 ++
 PLUGINS.html                      | 127 ++++-
 PLUGINS/src/svdrpdemo/COPYING     | 340 ++++++++++++++
 PLUGINS/src/svdrpdemo/HISTORY     |   6 +
 PLUGINS/src/svdrpdemo/Makefile    |  82 ++++
 PLUGINS/src/svdrpdemo/README      |  13 +
 PLUGINS/src/svdrpdemo/svdrpdemo.c |  60 +++
 channels.conf                     |  18 +-
 config.h                          |   6 +-
 device.c                          |   7 +-
 eitscan.c                         |   4 +-
 i18n.c                            |  14 +-
 menu.c                            | 128 ++---
 menu.h                            |  26 +-
 newplugin                         |  16 +-
 plugin.c                          |  12 +-
 plugin.h                          |   4 +-
 remux.c                           | 749 +++++++++++++++++++++++-------
 remux.h                           |  11 +-
 sdt.c                             |  11 +-
 svdrp.c                           | 253 ++++++++--
 svdrp.h                           |   6 +-
 tools.c                           |  12 +-
 tools.h                           |   3 +-
 25 files changed, 1616 insertions(+), 338 deletions(-)
 create mode 100644 PLUGINS/src/svdrpdemo/COPYING
 create mode 100644 PLUGINS/src/svdrpdemo/HISTORY
 create mode 100644 PLUGINS/src/svdrpdemo/Makefile
 create mode 100644 PLUGINS/src/svdrpdemo/README
 create mode 100644 PLUGINS/src/svdrpdemo/svdrpdemo.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ff546dd4b..0a9c8ae20 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -976,6 +976,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for making cDvbPlayer::Goto() append a Sequence End Code to get the image shown
  immediately with softdevices
  for fixing cDvbSpuBitmap::putPixel()
+ for implementing cAudioRepacker in remux.c
+ for modifying handling of audio packets for radio channels in remux.c
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1212,6 +1214,7 @@ Marco Schl
  is waiting
  for improving resetting CAM connections
  for fixing handling EPG data for time shifted events
+ for fixing detecting short channel names for "Kabel Deutschland"
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1436,7 +1439,20 @@ Klaus Heppenheimer <klaus@reel-multimedia.com>
 Thomas G�nther <tom1@toms-cafe.de>
  for fixing handling the frame number display if '7' is pressed before the first
  editing mark, or '9' after the last one
+ for suggesting to move cMenuEditTimer and cMenuEvent to menu.h so that plugins
+ can use it
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
  own inline functions to avoid problems on platforms that don't provide these
+
+Marcus Hilbrich <s4440288@mail.inf.tu-dresden.de>
+ for a bug report that lead to fixing the EPG scan, so that it doesn't use the
+ primary device if that is currently in Transfer-Mode from itself
+
+Hardy Flor <HFlor@web.de>
+ for a patch that was used as a base to implement SVDRP commands for plugins
+ for implementing the SVDRP command PLAY
+
+Harald Milz <hm@seneca.muc.de>
+ for his CUTR patch, which was used as a base to implement the SVDRP command EDIT
diff --git a/HISTORY b/HISTORY
index 016b6f5b7..dda7c8675 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3716,3 +3716,33 @@ Video Disk Recorder Revision History
 - Replaced the get/put_unaligned() macros from <asm/unaligned.h> with own inline
   functions to avoid problems on platforms that don't provide these (thanks to
   David Woodhouse for his help).
+
+2005-08-28: Version 1.3.31
+
+- Added missing German OSD texts for 'Audio language'.
+- The Setup/CICAM menu now only contains the devices that actually have a CI and
+  dynamically detects the number of slots a CI provides.
+- Implemented cAudioRepacker for better handling of audio PES packets (thanks to
+  Reinhard Nissl).
+- Modified handling of audio packets for radio channels in remux.c (thanks to
+  Reinhard Nissl).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Fixed the EPG scan, so that it doesn't use the primary device if that is
+  currently in Transfer-Mode from itself (thanks to Marcus Hilbrich for a bug
+  report that lead to this).
+- Removed the TUNER_LOCK_TIMEOUT in cDevice::AttachReceiver() since it caused more
+  trouble than it fixed.
+- Fixed detecting short channel names for "Kabel Deutschland", who uses a comma
+  as delimiter (thanks to Marco Schl��ler).
+- Moved cMenuEditTimer and cMenuEvent to menu.h so that plugins can use it (suggested
+  by Thomas G�nther).
+- The new static function cString::sprintf() can be used to easily create a formatted
+  string.
+- Plugins can now implement their own SVDRP commands (based on a patch from Hardy
+  Flor). See PLUGINS.html, section "SVDRP commands" for details. The SVDRP commands
+  of a plugin are accessed through the new SVDRP command PLUG.
+  See PLUGINS/src/svdrpdemo for an example of how to use this feature.
+- The new SVDRP command PLAY can be used to start replaying a recording (thanks to
+  Hardy Flor).
+- The new SVDRP command EDIT can be used to start the editing process of a recording
+  (based on the CUTR patch by Harald Milz).
diff --git a/PLUGINS.html b/PLUGINS.html
index 29d83513b..203d8706e 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.19 are marked like this.
-<!--X1.3.19--></td></tr></table>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.20 are marked like this.
 <!--X1.3.20--></td></tr></table>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.21 are marked like this.
 <!--X1.3.21--></td></tr></table>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.30 are marked like this.
 <!--X1.3.30--></td></tr></table>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.31 are marked like this.
+<!--X1.3.31--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -58,7 +58,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line arguments">Command line arguments</a>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Shutting down">Shutting down</a>
 <!--X1.3.20--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
@@ -68,9 +68,12 @@ <h1>Table Of Contents</h1>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
 <li><a href="#Internationalization">Internationalization</a>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Custom services">Custom services</a>
 <!--X1.3.30--></td></tr></table>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#SVDRP commands">SVDRP commands</a>
+<!--X1.3.31--></td></tr></table>
 <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
 <li><a href="#Building the distribution package">Building the distribution package</a>
 </ul>
@@ -84,7 +87,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Audio">Audio</a>
 <!--X1.3.21--></td></tr></table>
 <li><a href="#Remote Control">Remote Control</a>
@@ -311,7 +314,7 @@ <h1>Table Of Contents</h1>
 command line help - and after that immediately destroys them again.
 <p>
 The <b>destructor</b> has to clean up any data created by the plugin.
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Any threads the plugin may have created shall be stopped in the
 <a href="#Shutting down"><tt>Stop()</tt></a> function.
 <!--X1.3.20--></td></tr></table>
@@ -509,7 +512,7 @@ <h1>Table Of Contents</h1>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement either of these functions.
 
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Shutting down"><hr><h2>Shutting down</h2>
 
 <center><i><b>Stop it, right there!</b></i></center><p>
@@ -869,7 +872,7 @@ <h1>Table Of Contents</h1>
 and then in the global VDR texts. So a plugin can make use of texts defined by the
 core VDR code.
 
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="Custom services"><hr><h2>Custom services</h2>
 
 <center><i><b>What can I do for you?</b></i></center><p>
@@ -934,12 +937,106 @@ <h1>Table Of Contents</h1>
 The function returns a pointer to the plugin that handled the request, or <tt>NULL</tt>
 if no plugin handled it.
 <p>
-To send a messages to all plugins, a plugin can call the function
+To send a message to all plugins, a plugin can call the function
 <tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if
 any plugin handled the request, or <tt>false</tt> if no plugin handled the request.
 
 <!--X1.3.30--></td></tr></table>
 
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
+
+<center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
+
+A plugin can implement its own SVDRP commands through the two functions
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual const char **SVDRPHelpPages(void);
+virtual cString SVDRPCommand(const char *Cmd, const char *Option, int &ReplyCode);
+</pre></td></tr></table><p>
+
+The <tt>SVDRPHelpPages()</tt> function must return a pointer to a list of help
+strings for all of the plugin's SVDRP commands, like this
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+const char **cPluginSvdrpdemo::SVDRPHelpPages(void)
+{
+  static const char *HelpPages[] = {
+    "DATE\n"
+    "    Print the current date.",
+    "TIME [ raw ]\n"
+    "    Print the current time.\n"
+    "    If the optional keyword 'raw' is given, the result will be the\n"
+    "    raw time_t data.",
+    NULL
+    };
+  return HelpPages;
+}
+</pre></td></tr></table><p>
+
+Note that the first line of each entry contains the actual command and its
+parameters, while the following lines explain what the command does and what
+the parameters (if any) mean. All lines of the explanation shall be indented
+by exactly 4 blanks (no tabs), and none of them shall be longer than 79 characters
+(to avoid messy output on 80 character wide terminals). The last entry in the
+list must be NULL.
+<p>
+The command names <tt>HELP</tt> and <tt>MAIN</tt> are reserverd and cannot
+be used by a plugin.
+<p>
+The actual processing of SVDRP commands for a plugin is done in its
+<tt>SVDRPCommand()</tt> function.
+Here's an example of such a function, which implements the commands advertised in
+the above help texts:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+cString cPluginSvdrpdemo::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+{
+  if (strcasecmp(Command, "DATE") == 0) {
+     // we use the default reply code here
+     return DateString(time(NULL));
+     }
+  else if (strcasecmp(Command, "TIME") == 0) {
+     ReplyCode = 901;
+     if (*Option) {
+        if (strcasecmp(Option, "RAW") == 0)
+           return cString::sprintf("%ld\nThis is the number of seconds since the epoch\n"
+                                   "and a demo of a multi-line reply", time(NULL));
+        else {
+           ReplyCode = 504;
+           return cString::sprintf("Unknown option: \"%s\"", Option);
+           }
+        }
+     return TimeString(time(NULL));
+     }
+  return NULL;
+}
+</pre></td></tr></table><p>
+
+The command is given to this function in the <tt>Command</tt> parameter, and any optional parameters
+are given in the <tt>Option</tt> string. <tt>Command</tt> always points to an actual, non-empty string, while
+<tt>Option</tt> may point to an empty string (it is never NULL, though).
+<p>
+If a plugin doesn't implement the given command, it shall return NULL, and VDR will
+automatically issue a proper error message. If it encounters an unknown or invalid
+option, it shall set the <tt>ReplyCode</tt> to one of the codes defined in <tt>VDR/svdrp.c</tt>
+and return a proper error message.
+<p>
+The default <tt>ReplyCode</tt> is 900, and if the plugin doesn't care about reply
+codes, it doesn't have to set it to anything else (unless there is an error, of
+course). The codes in the range 901..999 are reserved for plugins that want
+to use special reply codes. Any plugin can use any of these values and doesn't
+have to coordinate this with any other plugin, since the caller knows which
+plugin was called, and will therefore process the values according to the
+particular plugin's definitions.
+<p>
+The returned string may consist of several lines, separated by the newline character
+('<tt>\n</tt>'). Each of these lines will be preceeded with the <tt>ReplyCode</tt>
+when presenting them to the caller, and the continuation character ('<tt>-</tt>')
+will be set for all but the last one.
+
+<!--X1.3.31--></td></tr></table>
+
 <a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2>
 
 <center><i><b>Saddling up!</b></i></center><p>
@@ -1276,9 +1373,7 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-<!--X1.3.19--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 :cReceiver(0, -1, Pid)
-<!--X1.3.19--></td></tr></table>
 {
 }
 
@@ -1735,7 +1830,7 @@ <h1>Table Of Contents</h1>
   virtual void Action(void);
 public:
   cMyAudio(void);
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
   virtual void Play(const uchar *Data, int Length, uchar Id);
 <!--X1.3.21--></td></tr></table>
   virtual void Mute(bool On);
diff --git a/PLUGINS/src/svdrpdemo/COPYING b/PLUGINS/src/svdrpdemo/COPYING
new file mode 100644
index 000000000..5b6e7c66c
--- /dev/null
+++ b/PLUGINS/src/svdrpdemo/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
new file mode 100644
index 000000000..78014f204
--- /dev/null
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'svdrpdemo' Revision History
+---------------------------------------
+
+2005-08-27: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
new file mode 100644
index 000000000..5714bdc6a
--- /dev/null
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2005/08/27 11:26:49 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = svdrpdemo
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = $(CXX) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/svdrpdemo/README b/PLUGINS/src/svdrpdemo/README
new file mode 100644
index 000000000..27b767a57
--- /dev/null
+++ b/PLUGINS/src/svdrpdemo/README
@@ -0,0 +1,13 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
+
+Project's homepage:          http://www.cadsoft.de/vdr
+
+Latest version available at: http://www.cadsoft.de/vdr
+
+See the file COPYING for license information.
+
+Description:
+
+This plugin shows how to add SVDRP support to a plugin.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
new file mode 100644
index 000000000..b6ee9a708
--- /dev/null
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -0,0 +1,60 @@
+/*
+ * svdrpdemo.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: svdrpdemo.c 1.1 2005/08/27 16:28:58 kls Exp $
+ */
+
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
+static const char *MAINMENUENTRY  = NULL;
+
+class cPluginSvdrpdemo : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char **SVDRPHelpPages(void);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
+  };
+
+const char **cPluginSvdrpdemo::SVDRPHelpPages(void)
+{
+  static const char *HelpPages[] = {
+    "DATE\n"
+    "    Print the current date.",
+    "TIME [ raw ]\n"
+    "    Print the current time.\n"
+    "    If the optional keyword 'raw' is given, the result will be the\n"
+    "    raw time_t data.",
+    NULL
+    };
+  return HelpPages;
+}
+
+cString cPluginSvdrpdemo::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+{
+  if (strcasecmp(Command, "DATE") == 0) {
+     // we use the default reply code here
+     return DateString(time(NULL));
+     }
+  else if (strcasecmp(Command, "TIME") == 0) {
+     ReplyCode = 901;
+     if (*Option) {
+        if (strcasecmp(Option, "RAW") == 0)
+           return cString::sprintf("%ld\nThis is the number of seconds since the epoch\nand a demo of a multi-line reply", time(NULL));
+        else {
+           ReplyCode = 504;
+           return cString::sprintf("Unknown option: \"%s\"", Option);
+           }
+        }
+     return TimeString(time(NULL));
+     }
+  return NULL;
+}
+
+VDRPLUGINCREATOR(cPluginSvdrpdemo); // Don't touch this!
diff --git a/channels.conf b/channels.conf
index 872bbbe41..a6034e2ad 100644
--- a/channels.conf
+++ b/channels.conf
@@ -5,18 +5,18 @@ RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
 Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
-NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
+NDR FS MV;ARD:12109:hC34:S19.2E:27500:301:302=deu:2404:0:28224:1:1073:0
 SR S�DWEST Ferns.;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
-3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch:230:0:28007:1:1079:0
+3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:3:13001:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:3:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
@@ -27,7 +27,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -44,9 +44,9 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1722,1801,1702:43:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1801,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
@@ -108,7 +108,7 @@ Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
+WDR M�nster;ARD:12421:hC34:S19.2E:27500:701:702=deu:104:0:28310:1:1201:0
 Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
diff --git a/config.h b/config.h
index a2e6c35cf..8bfbc85d8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.224 2005/08/20 10:29:35 kls Exp $
+ * $Id: config.h 1.225 2005/08/26 12:28:40 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.30"
-#define VDRVERSNUM   10330  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.31"
+#define VDRVERSNUM   10331  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 2f6149883..23808030e 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.106 2005/08/21 08:56:49 kls Exp $
+ * $Id: device.c 1.107 2005/08/27 09:01:09 kls Exp $
  */
 
 #include "device.h"
@@ -139,7 +139,6 @@ int cPesAssembler::PacketSize(const uchar *data)
 
 // The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -1
-#define TUNER_LOCK_TIMEOUT 5000 // ms
 
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
@@ -1186,10 +1185,6 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
      return false;
   if (Receiver->device == this)
      return true;
-  if (!HasLock(TUNER_LOCK_TIMEOUT)) {
-     esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
-     return false;
-     }
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
diff --git a/eitscan.c b/eitscan.c
index 3894bcac2..10739c31a 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.27 2005/08/07 11:29:54 kls Exp $
+ * $Id: eitscan.c 1.28 2005/08/26 15:37:06 kls Exp $
  */
 
 #include "eitscan.h"
@@ -150,7 +150,7 @@ void cEITScanner::Process(void)
                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
                             if (Device->ProvidesTransponder(Channel)) {
                                if (!Device->Receiving()) {
-                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying();
+                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying() && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
                                   if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
                                      if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
                                         if (cTransferControl::ReceiverDevice())
diff --git a/i18n.c b/i18n.c
index d7c687339..346ad863d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.198 2005/08/14 12:03:47 kls Exp $
+ * $Id: i18n.c 1.200 2005/08/26 13:39:07 kls Exp $
  *
  * Translations provided by:
  *
@@ -271,7 +271,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Optagelses info",
   },
   { "Setup",
     "Einstellungen",
@@ -2924,7 +2924,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������� ����",
     "Listaj po stranicama",
     "Lehek�lje kerimine",
-    "Rul sider",
+    "Scroll sidevis",
   },
   { "Setup.OSD$Scroll wraps",
     "Rundum scrollen",
@@ -2945,7 +2945,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "S kraja sko�i na po�etak",
     "",// TODO
-    "",// TODO
+    "Scroll rundt",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -3389,7 +3389,7 @@ const tI18nPhrase Phrases[] = {
     "tilf. ny transp.",
   },
   { "Setup.DVB$Audio languages",  // note the plural
-    "",//TODO
+    "Audio Sprachen",
     "",//TODO
     "",//TODO
     "Audio talen",
@@ -3410,7 +3410,7 @@ const tI18nPhrase Phrases[] = {
     "Audio sprog (ant.)",
   },
   { "Setup.DVB$Audio language",  // note the singular
-    "",//TODO
+    "Audio Sprache",
     "",//TODO
     "",//TODO
     "Audio taal",
@@ -5407,7 +5407,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Bez titla",
     "",// TODO
-    "",// TODO
+    "Ingen titel",
   },
   { NULL }
   };
diff --git a/menu.c b/menu.c
index 33857073a..1e5147497 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.355 2005/08/14 15:14:29 kls Exp $
+ * $Id: menu.c 1.357 2005/08/27 09:37:23 kls Exp $
  */
 
 #include "menu.h"
@@ -19,7 +19,6 @@
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
-#include "menuitems.h"
 #include "plugin.h"
 #include "recording.h"
 #include "remote.h"
@@ -605,20 +604,6 @@ eOSState cMenuText::ProcessKey(eKeys Key)
 
 // --- cMenuEditTimer --------------------------------------------------------
 
-class cMenuEditTimer : public cOsdMenu {
-private:
-  cTimer *timer;
-  cTimer data;
-  int channel;
-  bool addIfConfirmed;
-  cMenuEditDateItem *firstday;
-  void SetFirstDayItem(void);
-public:
-  cMenuEditTimer(cTimer *Timer, bool New = false);
-  virtual ~cMenuEditTimer();
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
 cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
@@ -904,15 +889,6 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
 
 // --- cMenuEvent ------------------------------------------------------------
 
-class cMenuEvent : public cOsdMenu {
-private:
-  const cEvent *event;
-public:
-  cMenuEvent(const cEvent *Event, bool CanSwitch = false);
-  virtual void Display(void);
-  virtual eOSState ProcessKey(eKeys Key);
-};
-
 cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
 :cOsdMenu(tr("Event"))
 {
@@ -2122,11 +2098,28 @@ eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
 
 // --- cMenuSetupCICAM -------------------------------------------------------
 
+class cMenuSetupCICAMItem : public cOsdItem {
+private:
+  cCiHandler *ciHandler;
+  int slot;
+public:
+  cMenuSetupCICAMItem(int Device, cCiHandler *CiHandler, int Slot);
+  cCiHandler *CiHandler(void) { return ciHandler; }
+  int Slot(void) { return slot; }
+  };
+
+cMenuSetupCICAMItem::cMenuSetupCICAMItem(int Device, cCiHandler *CiHandler, int Slot)
+{
+  ciHandler = CiHandler;
+  slot = Slot;
+  char buffer[32];
+  const char *CamName = CiHandler->GetCamName(slot);
+  snprintf(buffer, sizeof(buffer), "%s%d %d\t%s", tr("Setup.CICAM$CICAM DVB"), Device + 1, slot + 1, CamName ? CamName : "-");
+  SetText(buffer);
+}
+
 class cMenuSetupCICAM : public cMenuSetupBase {
 private:
-  int helpKeys;
-  void SetHelpKeys(void);
-  cCiHandler *GetCurrentCiHandler(int *Slot = NULL);
   eOSState Menu(void);
   eOSState Reset(void);
 public:
@@ -2136,66 +2129,43 @@ class cMenuSetupCICAM : public cMenuSetupBase {
 
 cMenuSetupCICAM::cMenuSetupCICAM(void)
 {
-  helpKeys = -1;
   SetSection(tr("CICAM"));
   for (int d = 0; d < cDevice::NumDevices(); d++) {
       cDevice *Device = cDevice::GetDevice(d);
-      cCiHandler *CiHandler = Device->CiHandler();
-      for (int Slot = 0; Slot < 2; Slot++) {
-          char buffer[32];
-          int CardIndex = Device->CardIndex();
-          const char *CamName = CiHandler ? CiHandler->GetCamName(Slot) : NULL;
-          if (!CamName)
-             CamName = "-";
-          snprintf(buffer, sizeof(buffer), "%s%d %d\t%s", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, Slot + 1, CamName);
-          Add(new cOsdItem(buffer));
-          }
+      if (Device) {
+         cCiHandler *CiHandler = Device->CiHandler();
+         if (CiHandler) {
+            for (int Slot = 0; Slot < CiHandler->NumSlots(); Slot++)
+                Add(new cMenuSetupCICAMItem(Device->CardIndex(), CiHandler, Slot));
+            }
+         }
       }
-  SetHelpKeys();
-}
-
-cCiHandler *cMenuSetupCICAM::GetCurrentCiHandler(int *Slot)
-{
-  cDevice *Device = cDevice::GetDevice(Current() / 2);
-  if (Slot)
-     *Slot = Current() % 2;
-  return Device ? Device->CiHandler() : NULL;
-}
-
-void cMenuSetupCICAM::SetHelpKeys(void)
-{
-  int NewHelpKeys = helpKeys;
-  NewHelpKeys = GetCurrentCiHandler() ? 1 : 0;
-  if (NewHelpKeys != helpKeys) {
-     switch (NewHelpKeys) {
-       case 0: SetHelp(NULL); break;
-       case 1: SetHelp(tr("Menu"), tr("Reset"));
-       }
-     helpKeys = NewHelpKeys;
-     }
+  SetHelp(tr("Menu"), tr("Reset"));
 }
 
 eOSState cMenuSetupCICAM::Menu(void)
 {
-  int Slot = 0;
-  cCiHandler *CiHandler = GetCurrentCiHandler(&Slot);
-  if (CiHandler && CiHandler->EnterMenu(Slot))
-     return osEnd; // the CAM menu will be executed explicitly from the main loop
-  else
-     Skins.Message(mtError, tr("Can't open CAM menu!"));
+  cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
+  if (item) {
+     if (item->CiHandler()->EnterMenu(item->Slot()))
+        return osEnd; // the CAM menu will be executed explicitly from the main loop
+     else
+        Skins.Message(mtError, tr("Can't open CAM menu!"));
+     }
   return osContinue;
 }
 
 eOSState cMenuSetupCICAM::Reset(void)
 {
-  int Slot = 0;
-  cCiHandler *CiHandler = GetCurrentCiHandler(&Slot);
-  if (CiHandler && CiHandler->Reset(Slot)) {
-     Skins.Message(mtInfo, tr("CAM has been reset"));
-     return osEnd;
+  cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
+  if (item) {
+     if (item->CiHandler()->Reset(item->Slot())) {
+        Skins.Message(mtInfo, tr("CAM has been reset"));
+        return osEnd;
+        }
+     else
+        Skins.Message(mtError, tr("Can't reset CAM!"));
      }
-  else
-     Skins.Message(mtError, tr("Can't reset CAM!"));
   return osContinue;
 }
 
@@ -2205,17 +2175,11 @@ eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kRed:    if (helpKeys == 1)
-                        return Menu();
-                     break;
-       case kGreen:  if (helpKeys == 1)
-                        return Reset();
-                     break;
+       case kRed:    return Menu();
+       case kGreen:  return Reset();
        default: break;
        }
      }
-  if (Key != kNone)
-     SetHelpKeys();
   return state;
 }
 
diff --git a/menu.h b/menu.h
index 93712e4e7..f32781133 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.70 2005/05/15 14:34:54 kls Exp $
+ * $Id: menu.h 1.71 2005/08/27 09:37:33 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -15,6 +15,7 @@
 #include "epg.h"
 #include "osdbase.h"
 #include "dvbplayer.h"
+#include "menuitems.h"
 #include "recorder.h"
 #include "skins.h"
 
@@ -29,6 +30,29 @@ class cMenuText : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuEditTimer : public cOsdMenu {
+private:
+  cTimer *timer;
+  cTimer data;
+  int channel;
+  bool addIfConfirmed;
+  cMenuEditDateItem *firstday;
+  void SetFirstDayItem(void);
+public:
+  cMenuEditTimer(cTimer *Timer, bool New = false);
+  virtual ~cMenuEditTimer();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+class cMenuEvent : public cOsdMenu {
+private:
+  const cEvent *event;
+public:
+  cMenuEvent(const cEvent *Event, bool CanSwitch = false);
+  virtual void Display(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
diff --git a/newplugin b/newplugin
index 8badddfba..90d6113ae 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.19 2005/08/21 09:32:08 kls Exp $
+# $Id: newplugin 1.20 2005/08/27 16:13:29 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -171,6 +171,8 @@ public:
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   virtual bool Service(const char *Id, void *Data = NULL);
+  virtual const char **SVDRPHelpPages(void);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
   };
 
 cPlugin${PLUGIN_CLASS}::cPlugin$PLUGIN_CLASS(void)
@@ -243,6 +245,18 @@ bool cPlugin${PLUGIN_CLASS}::Service(const char *Id, void *Data)
   return false;
 }
 
+const char **cPlugin${PLUGIN_CLASS}::SVDRPHelpPages(vo<F3>id)
+{
+  // Return help text for SVDRP commands this plugin implements
+  return NULL;
+}
+
+const char *cPlugin${PLUGIN_CLASS}::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+{
+  // Process SVDRP commands this plugin implements
+  return NULL;
+}
+
 VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
 };
 
diff --git a/plugin.c b/plugin.c
index 8a316cc05..991631349 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.14 2005/08/21 09:35:28 kls Exp $
+ * $Id: plugin.c 1.15 2005/08/27 16:13:24 kls Exp $
  */
 
 #include "plugin.h"
@@ -104,6 +104,16 @@ bool cPlugin::Service(const char *Id, void *Data)
   return false;
 }
 
+const char **cPlugin::SVDRPHelpPages(void)
+{
+  return NULL;
+}
+
+cString cPlugin::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+{
+  return NULL;
+}
+
 void cPlugin::RegisterI18n(const tI18nPhrase * const Phrases)
 {
   I18nRegister(Phrases, Name());
diff --git a/plugin.h b/plugin.h
index 3befbbba9..2d9f98330 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.9 2005/08/21 09:32:08 kls Exp $
+ * $Id: plugin.h 1.10 2005/08/27 16:13:17 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -51,6 +51,8 @@ class cPlugin {
   void RegisterI18n(const tI18nPhrase * const Phrases);
 
   virtual bool Service(const char *Id, void *Data = NULL);
+  virtual const char **SVDRPHelpPages(void);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
 
   static void SetConfigDirectory(const char *Dir);
   static const char *ConfigDirectory(const char *PluginName = NULL);
diff --git a/remux.c b/remux.c
index c980bd830..102805016 100644
--- a/remux.c
+++ b/remux.c
@@ -8,10 +8,10 @@
  * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
  * VDR's needs.
  *
- * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
+ * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.37 2005/08/21 08:58:58 kls Exp $
+ * $Id: remux.c 1.42 2005/08/28 11:46:44 kls Exp $
  */
 
 #include "remux.h"
@@ -20,49 +20,23 @@
 #include "thread.h"
 #include "tools.h"
 
-// --- cRepacker -------------------------------------------------------------
-
-class cRepacker {
-protected:
-  int maxPacketSize;
-  uint8_t subStreamId;
-  static void DroppedData(const char *Reason, int Count) { esyslog("%s (dropped %d bytes)", Reason, Count); }
-  static int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
-  {
-    int n = ResultBuffer->Put(Data, Count);
-    if (n != Count)
-       esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
-    return n;
-  }
-  static int AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader = 0);
-public:
-  cRepacker(void) { maxPacketSize = 6 + 65535; subStreamId = 0; }
-  virtual ~cRepacker() {}
-  virtual void Reset(void) {}
-  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
-  virtual int BreakAt(const uchar *Data, int Count) = 0;
-  virtual int QuerySnoopSize(void) { return 0; }
-  void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
-  void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
-  };
-
-int cRepacker::AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
+ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
 {
   if (Count < 7)
-     return -1; // too short
+     return phNeedMoreData; // too short
 
   if ((Data[6] & 0xC0) == 0x80) { // MPEG 2
      if (Count < 9)
-        return -1; // too short
+        return phNeedMoreData; // too short
 
      PesPayloadOffset = 6 + 3 + Data[8];
      if (Count < PesPayloadOffset)
-        return -1; // too short
+        return phNeedMoreData; // too short
 
      if (ContinuationHeader)
         *ContinuationHeader = ((Data[6] == 0x80) && !Data[7] && !Data[8]);
 
-     return 2; // MPEG 2
+     return phMPEG2; // MPEG 2
      }
 
   // check for MPEG 1 ...
@@ -74,7 +48,7 @@ int cRepacker::AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOff
          break;
 
       if (Count <= ++PesPayloadOffset)
-         return -1; // too short
+         return phNeedMoreData; // too short
       }
 
   // skip STD_buffer_scale/size
@@ -82,7 +56,7 @@ int cRepacker::AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOff
      PesPayloadOffset += 2;
 
      if (Count <= PesPayloadOffset)
-        return -1; // too short
+        return phNeedMoreData; // too short
      }
 
   if (ContinuationHeader)
@@ -104,18 +78,50 @@ int cRepacker::AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOff
         *ContinuationHeader = true;
      }
   else
-     return 0; // unknown
+     return phInvalid; // unknown
 
   if (Count < PesPayloadOffset)
-     return -1; // too short
+     return phNeedMoreData; // too short
 
-  return 1; // MPEG 1
+  return phMPEG1; // MPEG 1
 }
 
-// --- cVideoRepacker --------------------------------------------------------
+// --- cRepacker -------------------------------------------------------------
 
-class cVideoRepacker : public cRepacker {
-private:
+class cRepacker {
+protected:
+  bool initiallySyncing;
+  int maxPacketSize;
+  uint8_t subStreamId;
+  static void DroppedData(const char *Reason, int Count) { esyslog("%s (dropped %d bytes)", Reason, Count); }
+public:
+  static int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded);
+  cRepacker(void) { initiallySyncing = true; maxPacketSize = 6 + 65535; subStreamId = 0; }
+  virtual ~cRepacker() {}
+  virtual void Reset(void) { /* initiallySyncing = true; */ }
+  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
+  virtual int BreakAt(const uchar *Data, int Count) = 0;
+  virtual int QuerySnoopSize(void) { return 0; }
+  void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
+  void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
+  };
+
+int cRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded)
+{
+  if (CapacityNeeded >= Count && ResultBuffer->Free() < CapacityNeeded) {
+     esyslog("ERROR: possible result buffer overflow, dropped %d out of %d byte", CapacityNeeded, CapacityNeeded);
+     return 0;
+     }
+  int n = ResultBuffer->Put(Data, Count);
+  if (n != Count)
+     esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
+  return n;
+}
+
+// --- cCommonRepacker --------------------------------------------------------
+
+class cCommonRepacker : public cRepacker {
+protected:
   int skippedBytes;
   int packetTodo;
   uchar fragmentData[6 + 65535 + 3];
@@ -125,40 +131,25 @@ class cVideoRepacker : public cRepacker {
   uchar pesHeaderBackup[6 + 3 + 255];
   int pesHeaderBackupLen;
   uint32_t scanner;
-  enum eState {
-    syncing,
-    findPicture,
-    scanPicture
-    } state;
   uint32_t localScanner;
   int localStart;
   bool PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
-public:
-  cVideoRepacker(void);
-  virtual void Reset(void);
-  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
-  virtual int BreakAt(const uchar *Data, int Count);
   virtual int QuerySnoopSize() { return 4; }
+  virtual void Reset(void);
   };
 
-cVideoRepacker::cVideoRepacker(void)
-{
-  Reset();
-}
-
-void cVideoRepacker::Reset(void)
+void cCommonRepacker::Reset(void)
 {
+  cRepacker::Reset();
   skippedBytes = 0;
   packetTodo = maxPacketSize - 6 - 3;
   fragmentLen = 0;
   pesHeaderLen = 0;
   pesHeaderBackupLen = 0;
-  scanner = 0xFFFFFFFF;
-  state = syncing;
   localStart = -1;
 }
 
-bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+bool cCommonRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
 {
   // enter packet length into PES header ...
   if (fragmentLen > 0) { // ... which is contained in the fragment buffer
@@ -166,11 +157,17 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int PacketLen = fragmentLen + Count - 6;
      fragmentData[ 4 ] = PacketLen >> 8;
      fragmentData[ 5 ] = PacketLen & 0xFF;
+     // just skip packets with no payload
+     int PesPayloadOffset = 0;
+     if (AnalyzePesHeader(fragmentData, fragmentLen, PesPayloadOffset) <= phInvalid)
+        esyslog("cCommonRepacker: invalid PES packet encountered in fragment buffer!");
+     else if (6 + PacketLen <= PesPayloadOffset)
+        return true; // skip empty packet
      // amount of data to put into result buffer: a negative Count value means
      // to strip off any partially contained start code.
      int Bite = fragmentLen + (Count >= 0 ? 0 : Count);
      // put data into result buffer
-     int n = Put(ResultBuffer, fragmentData, Bite);
+     int n = Put(ResultBuffer, fragmentData, Bite, 6 + PacketLen);
      fragmentLen = 0;
      if (n != Bite)
         return false;
@@ -179,11 +176,17 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int PacketLen = pesHeaderLen + Count - 6;
      pesHeader[ 4 ] = PacketLen >> 8;
      pesHeader[ 5 ] = PacketLen & 0xFF;
+     // just skip packets with no payload
+     int PesPayloadOffset = 0;
+     if (AnalyzePesHeader(pesHeader, pesHeaderLen, PesPayloadOffset) <= phInvalid)
+        esyslog("cCommonRepacker: invalid PES packet encountered in header buffer!");
+     else if (6 + PacketLen <= PesPayloadOffset)
+        return true; // skip empty packet
      // amount of data to put into result buffer: a negative Count value means
      // to strip off any partially contained start code.
      int Bite = pesHeaderLen + (Count >= 0 ? 0 : Count);
      // put data into result buffer
-     int n = Put(ResultBuffer, pesHeader, Bite);
+     int n = Put(ResultBuffer, pesHeader, Bite, 6 + PacketLen);
      pesHeaderLen = 0;
      if (n != Bite)
         return false;
@@ -193,7 +196,7 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      // amount of data to put into result buffer
      int Bite = Count;
      // put data into result buffer
-     int n = Put(ResultBuffer, Data, Bite);
+     int n = Put(ResultBuffer, Data, Bite, Bite);
      if (n != Bite)
         return false;
      }
@@ -201,6 +204,34 @@ bool cVideoRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
   return true;
 }
 
+// --- cVideoRepacker --------------------------------------------------------
+
+class cVideoRepacker : public cCommonRepacker {
+private:
+  enum eState {
+    syncing,
+    findPicture,
+    scanPicture
+    } state;
+public:
+  cVideoRepacker(void);
+  virtual void Reset(void);
+  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+  virtual int BreakAt(const uchar *Data, int Count);
+  };
+
+cVideoRepacker::cVideoRepacker(void)
+{
+  Reset();
+}
+
+void cVideoRepacker::Reset(void)
+{
+  cCommonRepacker::Reset();
+  scanner = 0xFFFFFFFF;
+  state = syncing;
+}
+
 void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
 {
   // synchronisation is detected some bytes after frame start.
@@ -211,8 +242,8 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
 
   int pesPayloadOffset = 0;
   bool continuationHeader = false;
-  int mpegLevel = AnalyzePesHeader(Data, Count, pesPayloadOffset, &continuationHeader);
-  if (mpegLevel <= 0) {
+  ePesHeader mpegLevel = AnalyzePesHeader(Data, Count, pesPayloadOffset, &continuationHeader);
+  if (mpegLevel <= phInvalid) {
      DroppedData("cVideoRepacker: no valid PES packet header found", Count);
      return;
      }
@@ -264,16 +295,14 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                      // the byte count get's negative then the current buffer ends in a
                      // partitial start code that must be stripped off, as it shall be put
                      // in the next packet.
-                     if (!PushOutPacket(ResultBuffer, payload, data - 3 - payload)) {
-                        DroppedData("cVideoRepacker: result buffer overflow", Count - (done - 3));
-                        return;
-                        }
+                     PushOutPacket(ResultBuffer, payload, data - 3 - payload);
                      // go on with syncing to the next picture
                      state = syncing;
                      }
                   if (state == syncing) {
-                     // report that syncing dropped some bytes
-                     if (skippedBytes > SkippedBytesLimit)
+                     if (initiallySyncing) // omit report for the typical initial case
+                        initiallySyncing = false;
+                     else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
                         esyslog("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
                      skippedBytes = 0;
                      // if there is a PES header available, then use it ...
@@ -298,7 +327,7 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                         pesHeader[pesHeaderLen++] = 0x00; // length still unknown
                         pesHeader[pesHeaderLen++] = 0x00; // length still unknown
 
-                        if (mpegLevel == 2) {
+                        if (mpegLevel == phMPEG2) {
                            pesHeader[pesHeaderLen++] = 0x80;
                            pesHeader[pesHeaderLen++] = 0x00;
                            pesHeader[pesHeaderLen++] = 0x00;
@@ -379,10 +408,7 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
               const uchar *excessData = fragmentData + fragmentLen + bite;
               // a negative byte count means to drop some bytes from the current
               // fragment's tail, to not exceed the maximum packet size.
-              if (!PushOutPacket(ResultBuffer, payload, bite)) {
-                 DroppedData("cVideoRepacker: result buffer overflow", Count - done);
-                 return;
-                 }
+              PushOutPacket(ResultBuffer, payload, bite);
               // create a continuation PES header
               pesHeaderLen = 0;
               pesHeader[pesHeaderLen++] = 0x00;
@@ -392,7 +418,7 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
 
-              if (mpegLevel == 2) {
+              if (mpegLevel == phMPEG2) {
                  pesHeader[pesHeaderLen++] = 0x80;
                  pesHeader[pesHeaderLen++] = 0x00;
                  pesHeader[pesHeaderLen++] = 0x00;
@@ -434,7 +460,8 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
      }
   // report that syncing dropped some bytes
   if (skippedBytes > SkippedBytesLimit) {
-     esyslog("cVideoRepacker: skipped %d bytes while syncing on next picture", skippedBytes - SkippedBytesLimit);
+     if (!initiallySyncing) // omit report for the typical initial case
+        esyslog("cVideoRepacker: skipped %d bytes while syncing on next picture", skippedBytes - SkippedBytesLimit);
      skippedBytes = SkippedBytesLimit;
      }
 }
@@ -443,7 +470,7 @@ int cVideoRepacker::BreakAt(const uchar *Data, int Count)
 {
   int PesPayloadOffset = 0;
 
-  if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= 0)
+  if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= phInvalid)
      return -1; // not enough data for test
 
   // just detect end of picture
@@ -475,6 +502,381 @@ int cVideoRepacker::BreakAt(const uchar *Data, int Count)
   return PesPayloadOffset + packetTodo + 4;
 }
 
+// --- cAudioRepacker --------------------------------------------------------
+
+class cAudioRepacker : public cCommonRepacker {
+private:
+  static int bitRates[2][3][16];
+  enum eState {
+    syncing,
+    scanFrame
+    } state;
+  int frameTodo;
+  int frameSize;
+  static bool IsValidAudioHeader(uint32_t Header, bool Mpeg2, int *FrameSize = NULL);
+public:
+  cAudioRepacker(void);
+  virtual void Reset(void);
+  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
+  virtual int BreakAt(const uchar *Data, int Count);
+  };
+
+int cAudioRepacker::bitRates[2][3][16] = { // all values are specified as kbits/s
+  // MPEG 1, Layer I
+  0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1,
+  // MPEG 1, Layer II
+  0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, -1,
+  // MPEG 1, Layer III
+  0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, -1,
+  // MPEG 2, Layer I
+  0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1,
+  // MPEG 2, Layer II/III
+  0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1,
+  // MPEG 2, Layer II/III
+  0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1
+  };
+
+cAudioRepacker::cAudioRepacker(void)
+{
+  Reset();
+}
+
+void cAudioRepacker::Reset(void)
+{
+  cCommonRepacker::Reset();
+  scanner = 0;
+  state = syncing;
+  frameTodo = 0;
+  frameSize = 0;
+}
+
+bool cAudioRepacker::IsValidAudioHeader(uint32_t Header, bool Mpeg2, int *FrameSize)
+{
+  int syncword           = (Header & 0xFFF00000) >> 20;
+  int id                 = (Header & 0x00080000) >> 19;
+  int layer              = (Header & 0x00060000) >> 17;
+//int protection_bit     = (Header & 0x00010000) >> 16;
+  int bitrate_index      = (Header & 0x0000F000) >> 12;
+  int sampling_frequency = (Header & 0x00000C00) >> 10;
+  int padding_bit        = (Header & 0x00000200) >>  9;
+//int private_bit        = (Header & 0x00000100) >>  8;
+//int mode               = (Header & 0x000000C0) >>  6;
+//int mode_extension     = (Header & 0x00000030) >>  4;
+//int copyright          = (Header & 0x00000008) >>  3;
+//int orignal_copy       = (Header & 0x00000004) >>  2;
+  int emphasis           = (Header & 0x00000003);
+
+  if (syncword != 0xFFF)
+     return false;
+
+  if (id == 0 && !Mpeg2) // reserved in MPEG 1
+     return false;
+
+  if (layer == 0) // reserved
+     return false;
+
+  if (bitrate_index == 0xF) // forbidden
+     return false;
+
+  if (sampling_frequency == 3) // reserved
+     return false;
+
+  if (emphasis == 2) // reserved
+     return false;
+
+  if (FrameSize) {
+     if (bitrate_index == 0)
+        *FrameSize = 0;
+     else {
+        static int samplingFrequencies[2][4] = { // all values are specified in Hz
+          // MPEG 1
+          44100, 48000, 32000, -1,
+          // MPEG 2
+          22050, 24000, 16000, -1
+          };
+
+        static int slots_per_frame[2][3] = {
+          // MPEG 1, Layer I, II, III
+          12, 144, 144,
+          // MPEG 2, Layer I, II, III
+          12, 144,  72
+          };
+
+        int mpegIndex = 1 - id;
+        int layerIndex = 3 - layer;
+
+        // Layer I (i. e., layerIndex == 0) has a larger slot size
+        int slotSize = (layerIndex == 0) ? 4 : 1; // bytes
+
+        int br = 1000 * bitRates[mpegIndex][layerIndex][bitrate_index]; // bits/s
+        int sf = samplingFrequencies[mpegIndex][sampling_frequency];
+
+        int N = slots_per_frame[mpegIndex][layerIndex] * br / sf; // slots
+
+        *FrameSize = (N + padding_bit) * slotSize; // bytes
+        }
+     }
+
+  return true;
+}
+
+void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
+{
+  // synchronisation is detected some bytes after frame start.
+  const int SkippedBytesLimit = 4;
+
+  // reset local scanner
+  localStart = -1;
+
+  int pesPayloadOffset = 0;
+  bool continuationHeader = false;
+  ePesHeader mpegLevel = AnalyzePesHeader(Data, Count, pesPayloadOffset, &continuationHeader);
+  if (mpegLevel <= phInvalid) {
+     DroppedData("cAudioRepacker: no valid PES packet header found", Count);
+     return;
+     }
+  if (!continuationHeader) {
+     // backup PES header
+     pesHeaderBackupLen = pesPayloadOffset;
+     memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
+     }
+
+  // skip PES header
+  int done = pesPayloadOffset;
+  int todo = Count - done;
+  const uchar *data = Data + done;
+  // remember start of the data
+  const uchar *payload = data;
+
+  while (todo > 0) {
+        // collect number of skipped bytes while syncing
+        if (state <= syncing)
+           skippedBytes++;
+        else if (frameTodo > 0) {
+           frameTodo--;
+           if (frameTodo == 0 && state == scanFrame) {
+              // the current audio frame is is done now. So push out the packet to
+              // start a new packet for the next audio frame.
+              PushOutPacket(ResultBuffer, payload, data - payload);
+              // go on with syncing to the next audio frame
+              state = syncing;
+              }
+           }
+        // did we reach an audio frame header?
+        scanner <<= 8;
+        scanner |= *data;
+        if ((scanner & 0xFFF00000) == 0xFFF00000) {
+           if (frameTodo <= 0 && IsValidAudioHeader(scanner, mpegLevel == phMPEG2, &frameSize)) {
+              if (state == scanFrame) {
+                 // As a new audio frame starts here, the previous one is done. So push
+                 // out the packet to start a new packet for the next audio frame. If
+                 // the byte count gets negative then the current buffer ends in a
+                 // partitial audio frame header that must be stripped off, as it shall
+                 // be put in the next packet.
+                 PushOutPacket(ResultBuffer, payload, data - 3 - payload);
+                 // go on with syncing to the next audio frame
+                 state = syncing;
+                 }
+              if (state == syncing) {
+                 if (initiallySyncing) // omit report for the typical initial case
+                    initiallySyncing = false;
+                 else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
+                    esyslog("cAudioRepacker: skipped %d bytes to sync on next audio frame", skippedBytes - SkippedBytesLimit);
+                 skippedBytes = 0;
+                 // if there is a PES header available, then use it ...
+                 if (pesHeaderBackupLen > 0) {
+                    // ISO 13818-1 says:
+                    // In the case of audio, if a PTS is present in a PES packet header
+                    // it shall refer to the access unit commencing in the PES packet. An
+                    // audio access unit commences in a PES packet if the first byte of
+                    // the audio access unit is present in the PES packet.
+                    memcpy(pesHeader, pesHeaderBackup, pesHeaderBackupLen);
+                    pesHeaderLen = pesHeaderBackupLen;
+                    pesHeaderBackupLen = 0;
+                    }
+                 else {
+                    // ... otherwise create a continuation PES header
+                    pesHeaderLen = 0;
+                    pesHeader[pesHeaderLen++] = 0x00;
+                    pesHeader[pesHeaderLen++] = 0x00;
+                    pesHeader[pesHeaderLen++] = 0x01;
+                    pesHeader[pesHeaderLen++] = Data[3]; // audio stream ID
+                    pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+                    pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+
+                    if (mpegLevel == phMPEG2) {
+                       pesHeader[pesHeaderLen++] = 0x80;
+                       pesHeader[pesHeaderLen++] = 0x00;
+                       pesHeader[pesHeaderLen++] = 0x00;
+                       }
+                    else
+                       pesHeader[pesHeaderLen++] = 0x0F;
+                    }
+                 // append the first three bytes of the audio frame header
+                 pesHeader[pesHeaderLen++] = 0xFF;
+                 pesHeader[pesHeaderLen++] = (scanner >> 16) & 0xFF;
+                 pesHeader[pesHeaderLen++] = (scanner >>  8) & 0xFF;
+                 // the next packet's payload will begin with the fourth byte of
+                 // the audio frame header (= the actual byte)
+                 payload = data;
+                 // maximum we can hold in one PES packet
+                 packetTodo = maxPacketSize - pesHeaderLen;
+                 // expected remainder of audio frame: so far we have read 3 bytes from the frame header 
+                 frameTodo = frameSize - 3;
+                 // go on with collecting the frame's data
+                 ((int &)state)++;
+                 }
+              }
+           }
+        data++;
+        done++;
+        todo--;
+        // do we have to start a new packet as there is no more space left?
+        if (--packetTodo <= 0) {
+           // We connot start a new packet here if the current might end in an audio
+           // frame header and this header shall possibly be put in the next packet. So
+           // overfill the current packet until we can safely detect that we won't
+           // break an audio frame header into pieces:
+           //
+           // A) the last four bytes were an audio frame header.
+           // B) the last three bytes introduce an audio frame header.
+           // C) the last two bytes introduce an audio frame header.
+           // D) the last byte introduces an audio frame header.
+           //
+           // Todo : Data                          : Rule : Result
+           // -----:-------------------------------:------:-------
+           //      : XX XX FF Fz zz zz|YY YY YY YY :      :
+           //    0 :                ^^|            : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX XX FF Fz zz|zz YY YY YY :      :
+           //    0 :                ^^|            : B    : wait
+           //   -1 :                  |^^          : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX XX XX FF Fz|zz zz YY YY :      :
+           //    0 :                ^^|            : C    : wait
+           //   -1 :                  |^^          : B    : wait
+           //   -2 :                  |   ^^       : A    : push
+           // -----:-------------------------------:------:-------
+           //      : XX XX XX XX XX FF|Fz zz zz YY :      :
+           //    0 :                ^^|            : D    : wait
+           //   -1 :                  |^^          : C    : wait
+           //   -2 :                  |   ^^       : B    : wait
+           //   -3 :                  |      ^^    : A    : push
+           // -----:-------------------------------:------:-------
+           bool A = ((scanner & 0xFFF00000) == 0xFFF00000);
+           bool B = ((scanner &   0xFFF000) ==   0xFFF000);
+           bool C = ((scanner &     0xFFF0) ==     0xFFF0);
+           bool D = ((scanner &       0xFF) ==       0xFF);
+           if (A || (!B && !C && !D)) {
+              // Actually we cannot push out an overfull packet. So we'll have to
+              // adjust the byte count and payload start as necessary. If the byte
+              // count gets negative we'll have to append the excess from fragment's
+              // tail to the next PES header.
+              int bite = data + packetTodo - payload;
+              const uchar *excessData = fragmentData + fragmentLen + bite;
+              // A negative byte count means to drop some bytes from the current
+              // fragment's tail, to not exceed the maximum packet size.
+              PushOutPacket(ResultBuffer, payload, bite);
+              // create a continuation PES header
+              pesHeaderLen = 0;
+              pesHeader[pesHeaderLen++] = 0x00;
+              pesHeader[pesHeaderLen++] = 0x00;
+              pesHeader[pesHeaderLen++] = 0x01;
+              pesHeader[pesHeaderLen++] = Data[3]; // audio stream ID
+              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+
+              if (mpegLevel == phMPEG2) {
+                 pesHeader[pesHeaderLen++] = 0x80;
+                 pesHeader[pesHeaderLen++] = 0x00;
+                 pesHeader[pesHeaderLen++] = 0x00;
+                 }
+              else
+                 pesHeader[pesHeaderLen++] = 0x0F;
+
+              // copy any excess data
+              while (bite++ < 0) {
+                    // append the excess data here
+                    pesHeader[pesHeaderLen++] = *excessData++;
+                    packetTodo++;
+                    }
+              // the next packet's payload will begin here
+              payload = data + packetTodo;
+              // as there is no length information available, assume the
+              // maximum we can hold in one PES packet
+              packetTodo += maxPacketSize - pesHeaderLen;
+              }
+           }
+        }
+  // The packet is done. Now store any remaining data into fragment buffer
+  // if we are no longer syncing.
+  if (state != syncing) {
+     // append the PES header ...
+     int bite = pesHeaderLen;
+     pesHeaderLen = 0;
+     if (bite > 0) {
+        memcpy(fragmentData + fragmentLen, pesHeader, bite);
+        fragmentLen += bite;
+        }
+     // append payload. It may contain part of an audio frame header at it's
+     // end, which will be removed when the next packet gets processed.
+     bite = data - payload;
+     if (bite > 0) {
+        memcpy(fragmentData + fragmentLen, payload, bite);
+        fragmentLen += bite;
+        }
+     }
+  // report that syncing dropped some bytes
+  if (skippedBytes > SkippedBytesLimit) {
+     if (!initiallySyncing) // omit report for the typical initial case
+        esyslog("cAudioRepacker: skipped %d bytes while syncing on next audio frame", skippedBytes - SkippedBytesLimit);
+     skippedBytes = SkippedBytesLimit;
+     }
+}
+
+int cAudioRepacker::BreakAt(const uchar *Data, int Count)
+{
+  int PesPayloadOffset = 0;
+
+  ePesHeader MpegLevel = AnalyzePesHeader(Data, Count, PesPayloadOffset);
+  if (MpegLevel <= phInvalid)
+     return -1; // not enough data for test
+
+  // determine amount of data to fill up packet and to append next audio frame header
+  int packetRemainder = PesPayloadOffset + packetTodo + 4;
+
+  // just detect end of an audio frame
+  if (state == scanFrame) {
+     // when remaining audio frame size is known, then omit scanning
+     if (frameTodo > 0) {
+        // determine amount of data to fill up audio frame and to append next audio frame header
+        int remaining = PesPayloadOffset + frameTodo + 4;
+        if (remaining < packetRemainder)
+           return remaining;
+        return packetRemainder;
+        }
+     // setup local scanner
+     if (localStart < 0) {
+        localScanner = scanner;
+        localStart = 0;
+        }
+     // start where we've stopped at the last run
+     const uchar *data = Data + PesPayloadOffset + localStart;
+     const uchar *limit = Data + Count;
+     // scan data
+     while (data < limit) {
+           localStart++;
+           localScanner <<= 8;
+           localScanner |= *data++;
+           // check whether the next audio frame follows
+           if (((localScanner & 0xFFF00000) == 0xFFF00000) && IsValidAudioHeader(localScanner, MpegLevel == phMPEG2))
+              return data - Data;
+           }
+     }
+  // just fill up packet and append next audio frame header
+  return packetRemainder;
+}
+
 // --- cDolbyRepacker --------------------------------------------------------
 
 class cDolbyRepacker : public cRepacker {
@@ -501,8 +903,8 @@ class cDolbyRepacker : public cRepacker {
   int skippedBytes;
   void ResetPesHeader(bool ContinuationFrame = false);
   void AppendSubStreamID(bool ContinuationFrame = false);
-  bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
-  bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite);
+  bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite);
+  bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite);
 public:
   cDolbyRepacker(void);
   virtual void Reset(void);
@@ -569,6 +971,7 @@ void cDolbyRepacker::ResetPesHeader(bool ContinuationFrame)
 
 void cDolbyRepacker::Reset(void)
 {
+  cRepacker::Reset();
   ResetPesHeader();
   state = find_0b;
   ac3todo = 0;
@@ -580,26 +983,24 @@ void cDolbyRepacker::Reset(void)
   skippedBytes = 0;
 }
 
-bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite)
+bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite)
 {
+  bool success = true;
   // enough data available to put PES packet into buffer?
   if (fragmentTodo <= Todo) {
      // output a previous fragment first
      if (fragmentLen > 0) {
         Bite = fragmentLen;
-        int n = Put(ResultBuffer, fragmentData, Bite);
-        if (Bite != n) {
-           Reset();
-           return false;
-           }
+        int n = Put(ResultBuffer, fragmentData, Bite, fragmentLen + fragmentTodo);
+        if (Bite != n)
+           success = false;
         fragmentLen = 0;
         }
      Bite = fragmentTodo;
-     int n = Put(ResultBuffer, Data, Bite);
-     if (Bite != n) {
-        Reset();
-        Done += n;
-        return false;
+     if (success) {
+        int n = Put(ResultBuffer, Data, Bite, Bite);
+        if (Bite != n)
+           success = false;
         }
      fragmentTodo = 0;
      // ac3 frame completely processed?
@@ -609,19 +1010,16 @@ bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const ucha
   else {
      // copy the fragment into separate buffer for later processing
      Bite = Todo;
-     if (fragmentLen + Bite > (int)sizeof(fragmentData)) {
-        Reset();
-        return false;
-        }
      memcpy(fragmentData + fragmentLen, Data, Bite);
      fragmentLen += Bite;
      fragmentTodo -= Bite;
      }
-  return true;
+  return success;
 }
 
-bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Done, int &Bite)
+bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite)
 {
+  bool success = true;
   int packetLen = pesHeaderLen + ac3todo;
   // limit packet to maximum size
   if (packetLen > maxPacketSize)
@@ -631,17 +1029,14 @@ bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar
   Bite = pesHeaderLen;
   // enough data available to put PES packet into buffer?
   if (packetLen - pesHeaderLen <= Todo) {
-     int n = Put(ResultBuffer, pesHeader, Bite);
-     if (Bite != n) {
-        Reset();
-        return false;
-        }
+     int n = Put(ResultBuffer, pesHeader, Bite, packetLen);
+     if (Bite != n)
+        success = false;
      Bite = packetLen - pesHeaderLen;
-     n = Put(ResultBuffer, Data, Bite);
-     if (Bite != n) {
-        Reset();
-        Done += n;
-        return false;
+     if (success) {
+        n = Put(ResultBuffer, Data, Bite, Bite);
+        if (Bite != n)
+           success = false;
         }
      // ac3 frame completely processed?
      if (Bite >= ac3todo)
@@ -650,24 +1045,16 @@ bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar
   else {
      fragmentTodo = packetLen;
      // copy the pesheader into separate buffer for later processing
-     if (fragmentLen + Bite > (int)sizeof(fragmentData)) {
-        Reset();
-        return false;
-        }
      memcpy(fragmentData + fragmentLen, pesHeader, Bite);
      fragmentLen += Bite;
      fragmentTodo -= Bite;
      // copy the fragment into separate buffer for later processing
      Bite = Todo;
-     if (fragmentLen + Bite > (int)sizeof(fragmentData)) {
-        Reset();
-        return false;
-        }
      memcpy(fragmentData + fragmentLen, Data, Bite);
      fragmentLen += Bite;
      fragmentTodo -= Bite;
      }
-  return true;
+  return success;
 }
 
 void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
@@ -761,8 +1148,9 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                   state = find_0b;
                   continue;
                   }
-               // report that syncing dropped some bytes
-               if (skippedBytes > SkippedBytesLimit)
+               if (initiallySyncing) // omit report for the typical initial case
+                  initiallySyncing = false;
+               else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
                   esyslog("cDolbyRepacker: skipped %d bytes to sync on next AC3 frame", skippedBytes - SkippedBytesLimit);
                skippedBytes = 0;
                // append read data to header for common output processing
@@ -776,18 +1164,11 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
           case output_packet: {
                int bite = 0;
                // finish remainder of ac3 frame?
-               if (fragmentTodo > 0) {
-                  if (!FinishRemainder(ResultBuffer, data, todo, done, bite)) {
-                     DroppedData("cDolbyRepacker: result buffer overflow", Count - done);
-                     return;
-                     }
-                  }
+               if (fragmentTodo > 0)
+                  FinishRemainder(ResultBuffer, data, todo, bite);
                else {
                   // start a new packet
-                  if (!StartNewPacket(ResultBuffer, data, todo, done, bite)) {
-                     DroppedData("cDolbyRepacker: result buffer overflow", Count - done);
-                     return;
-                     }
+                  StartNewPacket(ResultBuffer, data, todo, bite);
                   // prepare for next (continuation) packet
                   ResetPesHeader(state == output_packet);
                   }
@@ -800,7 +1181,8 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
         }
   // report that syncing dropped some bytes
   if (skippedBytes > SkippedBytesLimit) {
-     esyslog("cDolbyRepacker: skipped %d bytes while syncing on next AC3 frame", skippedBytes - 4);
+     if (!initiallySyncing) // omit report for the typical initial case
+        esyslog("cDolbyRepacker: skipped %d bytes while syncing on next AC3 frame", skippedBytes - 4);
      skippedBytes = SkippedBytesLimit;
      }
 }
@@ -890,7 +1272,8 @@ class cTS2PES {
   uint8_t hlength;
   int mpeg;
   uint8_t check;
-  int which;
+  int mpeg1_required;
+  int mpeg1_stuffing;
   bool done;
   cRingBufferLinear *resultBuffer;
   int tsErrors;
@@ -956,11 +1339,8 @@ void cTS2PES::store(uint8_t *Data, int Count)
 {
   if (repacker)
      repacker->Repack(resultBuffer, Data, Count);
-  else {
-     int n = resultBuffer->Put(Data, Count);
-     if (n != Count)
-        esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
-     }
+  else
+     cRepacker::Put(resultBuffer, Data, Count, Count);
 }
 
 void cTS2PES::reset_ipack(void)
@@ -973,7 +1353,8 @@ void cTS2PES::reset_ipack(void)
   hlength = 0;
   mpeg = 0;
   check = 0;
-  which = 0;
+  mpeg1_required = 0;
+  mpeg1_stuffing = 0;
   done = false;
   count = 0;
 }
@@ -1057,7 +1438,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
 {
   int c = 0;
 
-  while (c < Count && (mpeg == 0 || (mpeg == 1 && found < 7) || (mpeg == 2 && found < 9)) && (found < 5 || !done)) {
+  while (c < Count && (mpeg == 0 || (mpeg == 1 && found < mpeg1_required) || (mpeg == 2 && found < 9)) && (found < 5 || !done)) {
         switch (found ) {
           case 0:
           case 1:
@@ -1103,6 +1484,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                      plength = ntohs(*pl);
                      c += 2;
                      found += 2;
+                     mpeg1_stuffing = 0;
                      }
                   else {
                      plen[0] = Buf[c];
@@ -1115,32 +1497,54 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                     unsigned short *pl = (unsigned short *)plen;
                     plength = ntohs(*pl);
                     found++;
+                    mpeg1_stuffing = 0;
                   }
                   break;
           case 6:
                   if (!done) {
                      flag1 = Buf[c++];
                      found++;
-                     if ((flag1 & 0xC0) == 0x80 )
-                        mpeg = 2;
-                     else {
-                        hlength = 0;
-                        which = 0;
-                        mpeg = 1;
-                        flag2 = 0;
+                     if (mpeg1_stuffing == 0) { // first stuffing iteration: determine MPEG level
+                        if ((flag1 & 0xC0) == 0x80)
+                           mpeg = 2;
+                        else {
+                           mpeg = 1;
+                           mpeg1_required = 7;
+                           }
+                        }
+                     if (mpeg == 1) {
+                        if (flag1 == 0xFF) { // MPEG1 stuffing
+                           if (++mpeg1_stuffing > 16)
+                              found = 0; // invalid MPEG1 header
+                           else { // ignore stuffing
+                              found--;
+                              if (plength > 0)
+                                 plength--;
+                              }
+                           }
+                        else if ((flag1 & 0xC0) == 0x40) // STD_buffer_scale/size
+                           mpeg1_required += 2;
+                        else if (flag1 != 0x0F && (flag1 & 0xF0) != 0x20 && (flag1 & 0xF0) != 0x30)
+                           found = 0; // invalid MPEG1 header
+                        else {
+                           flag2 = 0;
+                           hlength = 0;
+                           }
                         }
                      }
                   break;
           case 7:
-                  if (!done && mpeg == 2) {
+                  if (!done && (mpeg == 2 || mpeg1_required > 7)) {
                      flag2 = Buf[c++];
                      found++;
                      }
                   break;
           case 8:
-                  if (!done && mpeg == 2) {
+                  if (!done && (mpeg == 2 || mpeg1_required > 7)) {
                      hlength = Buf[c++];
                      found++;
+                     if (mpeg == 1 && hlength != 0x0F && (hlength & 0xF0) != 0x20 && (hlength & 0xF0) != 0x30)
+                        found = 0; // invalid MPEG1 header
                      }
                   break;
           default:
@@ -1151,7 +1555,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
   if (!plength)
      plength = MMAX_PLENGTH - 6;
 
-  if (done || ((mpeg == 2 && found >= 9) || (mpeg == 1 && found >= 7))) {
+  if (done || ((mpeg == 2 && found >= 9) || (mpeg == 1 && found >= mpeg1_required))) {
      switch (cid) {
        case AUDIO_STREAM_S ... AUDIO_STREAM_E:
        case VIDEO_STREAM_S ... VIDEO_STREAM_E:
@@ -1163,8 +1567,13 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                write_ipack(&hlength, 1);
                }
 
-            if (mpeg == 1 && found == 7)
+            if (mpeg == 1 && found == mpeg1_required) {
                write_ipack(&flag1, 1);
+               if (mpeg1_required > 7) {
+                  write_ipack(&flag2, 1);
+                  write_ipack(&hlength, 1);
+                  }
+               }
 
             if (mpeg == 2 && (flag2 & PTS_ONLY) && found < 14) {
                while (c < Count && found < 14) {
@@ -1277,7 +1686,12 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   if (APids) {
      int n = 0;
      while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS)
+#define TEST_cAudioRepacker
+#ifdef TEST_cAudioRepacker
+           ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n++, 0x00, new cAudioRepacker);
+#else
            ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n++);
+#endif
      }
   if (DPids) {
      int n = 0;
@@ -1321,10 +1735,9 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
   // If the return value is -1 the packet was not completely in the buffer.
   int Length = GetPacketLength(Data, Count, Offset);
   if (Length > 0) {
-     if (Length >= 8) {
-        int i = Offset + 8; // the minimum length of the video packet header
-        i += Data[i] + 1;   // possible additional header bytes
-        for (; i < Offset + Length - 5; i++) {
+     int PesPayloadOffset = 0;
+     if (AnalyzePesHeader(Data + Offset, Length, PesPayloadOffset) >= phMPEG1) {
+        for (int i = Offset + PesPayloadOffset; i < Offset + Length - 5; i++) {
             if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
                switch (Data[i + 3]) {
                  case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
@@ -1409,19 +1822,6 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
   return resultBuffer->Get(Count);
 #endif
 
-  // Special VPID case to enable recording radio channels:
-
-  if (isRadio) {
-     // XXX actually '0' should be enough, but '1' must be used with encrypted channels (driver bug?)
-     // XXX also allowing 0x1FFF to not break Michael Paar's original patch,
-     // XXX but it would probably be best to only use '0'
-     // Force syncing of radio channels to avoid "no useful data" error
-     synced = true;
-     if (PictureType)
-        *PictureType = I_FRAME;
-     return resultBuffer->Get(Count);
-     }
-
   // Check for frame borders:
 
   if (PictureType)
@@ -1466,6 +1866,18 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
                l = GetPacketLength(data, resultCount, i);
                if (l < 0)
                   return resultData;
+               if (isRadio) {
+                  if (!synced) {
+                     if (PictureType)
+                        *PictureType = I_FRAME;
+                     resultSkipped = i; // will drop everything before this position
+                     synced = true;
+                     }
+                  else if (Count)
+                     return resultData;
+                  else if (PictureType)
+                     *PictureType = I_FRAME;
+                  }
                }
             if (synced) {
                if (!Count)
@@ -1499,8 +1911,9 @@ void cRemux::Clear(void)
 
 void cRemux::SetBrokenLink(uchar *Data, int Length)
 {
-  if (Length > 9 && Data[0] == 0 && Data[1] == 0 && Data[2] == 1 && (Data[3] & 0xF0) == VIDEO_STREAM_S) {
-     for (int i = Data[8] + 9; i < Length - 7; i++) { // +9 to skip video packet header
+  int PesPayloadOffset = 0;
+  if (AnalyzePesHeader(Data, Length, PesPayloadOffset) >= phMPEG1 && (Data[3] & 0xF0) == VIDEO_STREAM_S) {
+     for (int i = PesPayloadOffset; i < Length - 7; i++) {
          if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1 && Data[i + 3] == 0xB8) {
             if (!(Data[i + 7] & 0x40)) // set flag only if GOP is not closed
                Data[i + 7] |= 0x20;
diff --git a/remux.h b/remux.h
index 0cd570e0b..ab296553a 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.14 2005/08/07 10:28:07 kls Exp $
+ * $Id: remux.h 1.15 2005/08/26 13:22:19 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -15,6 +15,15 @@
 #include "ringbuffer.h"
 #include "tools.h"
 
+enum ePesHeader {
+  phNeedMoreData = -1,
+  phInvalid = 0,
+  phMPEG1 = 1,
+  phMPEG2 = 2
+  };
+
+ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader = NULL);
+
 // Picture types:
 #define NO_PICTURE 0
 #define I_FRAME    1
diff --git a/sdt.c b/sdt.c
index dcf6dc1bc..74c55032f 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.14 2005/05/14 09:39:46 kls Exp $
+ * $Id: sdt.c 1.15 2005/08/27 09:27:47 kls Exp $
  */
 
 #include "sdt.h"
@@ -64,11 +64,14 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         char *ps = compactspace(ShortNameBuf);
                         if (!*ps && cSource::IsCable(Source())) {
                            // Some cable providers don't mark short channel names according to the
-                           // standard, but rather go their own way and use "name>short name":
-                           char *p = strchr(pn, '>');
+                           // standard, but rather go their own way and use "name>short name" or
+                           // "name, short name":
+                           char *p = strchr(pn, '>'); // fix for UPC Wien
+                           if (!p)
+                              p = strchr(pn, ','); // fix for "Kabel Deutschland"
                            if (p && p > pn) {
                               *p++ = 0;
-                              strcpy(ShortNameBuf, p);
+                              strcpy(ShortNameBuf, skipspace(p));
                               }
                            }
                         sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
diff --git a/svdrp.c b/svdrp.c
index 093bd997f..889ffe413 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.74 2005/08/07 14:20:41 kls Exp $
+ * $Id: svdrp.c 1.77 2005/08/28 14:12:00 kls Exp $
  */
 
 #include "svdrp.h"
@@ -28,10 +28,12 @@
 #include <unistd.h>
 #include "channels.h"
 #include "config.h"
+#include "cutter.h"
 #include "device.h"
 #include "eitscan.h"
 #include "keys.h"
 #include "menu.h"
+#include "plugin.h"
 #include "remote.h"
 #include "timers.h"
 #include "tools.h"
@@ -194,6 +196,10 @@ const char *HelpPages[] = {
   "    RECORDING - BE SURE YOU KNOW WHAT YOU ARE DOING!",
   "DELT <number>\n"
   "    Delete timer.",
+  "EDIT <number>\n"
+  "    Edit the recording with the given number. Before a recording can be\n"
+  "    edited, an LSTR command must have been executed in order to retrieve\n"
+  "    the recording numbers.",
   "GRAB <filename> [ jpeg | pnm [ <quality> [ <sizex> <sizey> ] ] ]\n"
   "    Grab the current frame and save it to the given file. Images can\n"
   "    be stored as JPEG (default) or PNM, at the given quality (default\n"
@@ -253,6 +259,22 @@ const char *HelpPages[] = {
   "    zero, this means that the timer is currently recording and has started\n"
   "    at the given time. The first value in the resulting line is the number\n"
   "    of the timer.",
+  "PLAY <number> [ begin | <position> ]\n"
+  "    Play the recording with the given number. Before a recording can be\n"
+  "    played, an LSTR command must have been executed in order to retrieve\n"
+  "    the recording numbers.\n"
+  "    The keyword 'begin' plays the recording from its very beginning, while\n"
+  "    a <position> (given as hh:mm:ss[.ff] or framenumber) starts at that\n"
+  "    position. If neither 'begin' nor a <position> are given, replay is resumed\n"
+  "    at the position where any previous replay was stopped, or from the beginning\n"
+  "    by default. To control or stop the replay session, use the usual remote\n"
+  "    control keypresses via the HITK command.",
+  "PLUG <name> [ <command> [ <options> ]]\n"
+  "    Send a command to a plugin.\n"
+  "    The PLUG command without any parameters lists all plugins.\n"
+  "    If only a name is given, all commands known to that plugin are listed.\n"
+  "    If a command is given (optionally followed by parameters), that command\n"
+  "    is sent to the plugin, and the result will be displayed.",
   "PUTE\n"
   "    Put data into the EPG list. The data entered has to strictly follow the\n"
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
@@ -294,6 +316,8 @@ const char *HelpPages[] = {
  504 Command parameter not implemented
  550 Requested action not taken
  554 Transaction failed
+ 900 Default plugin reply code
+ 901..999 Plugin specific reply codes
 
 */
 
@@ -315,15 +339,16 @@ const char *GetHelpTopic(const char *HelpPage)
   return NULL;
 }
 
-const char *GetHelpPage(const char *Cmd)
+const char *GetHelpPage(const char *Cmd, const char **p)
 {
-  const char **p = HelpPages;
-  while (*p) {
-        const char *t = GetHelpTopic(*p);
-        if (strcasecmp(Cmd, t) == 0)
-           return *p;
-        p++;
-        }
+  if (p) {
+     while (*p) {
+           const char *t = GetHelpTopic(*p);
+           if (strcasecmp(Cmd, t) == 0)
+              return *p;
+           p++;
+           }
+     }
   return NULL;
 }
 
@@ -376,14 +401,14 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
         va_start(ap, fmt);
         char *buffer;
         vasprintf(&buffer, fmt, ap);
-        char *nl = strchr(buffer, '\n');
-        if (Code > 0 && nl && *(nl + 1)) // trailing newlines don't count!
-           Code = -Code;
-        char number[16];
-        sprintf(number, "%03d%c", abs(Code), Code < 0 ? '-' : ' ');
         const char *s = buffer;
         while (s && *s) {
               const char *n = strchr(s, '\n');
+              char cont = ' ';
+              if (Code < 0 || n && *(n + 1)) // trailing newlines don't count!
+                 cont = '-';
+              char number[16];
+              sprintf(number, "%03d%c", abs(Code), cont);
               if (!(Send(number) && Send(s, n ? n - s : -1) && Send("\r\n"))) {
                  Close();
                  break;
@@ -400,6 +425,32 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
      }
 }
 
+void cSVDRP::PrintHelpTopics(const char **hp)
+{
+  int NumPages = 0;
+  if (hp) {
+     while (*hp) {
+           NumPages++;
+           hp++;
+           }
+     hp -= NumPages;
+     }
+  const int TopicsPerLine = 5;
+  int x = 0;
+  for (int y = 0; (y * TopicsPerLine + x) < NumPages; y++) {
+      char buffer[TopicsPerLine * MAXHELPTOPIC + 5];
+      char *q = buffer;
+      q += sprintf(q, "    ");
+      for (x = 0; x < TopicsPerLine && (y * TopicsPerLine + x) < NumPages; x++) {
+          const char *topic = GetHelpTopic(hp[(y * TopicsPerLine + x)]);
+          if (topic)
+             q += sprintf(q, "%*s", -MAXHELPTOPIC, topic);
+          }
+      x = 0;
+      Reply(-214, buffer);
+      }
+}
+
 void cSVDRP::CmdCHAN(const char *Option)
 {
   if (*Option) {
@@ -561,6 +612,36 @@ void cSVDRP::CmdDELT(const char *Option)
      Reply(501, "Missing timer number");
 }
 
+void cSVDRP::CmdEDIT(const char *Option)
+{
+  if (*Option) {
+     if (isnumber(Option)) {
+        cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
+        if (recording) {
+           cMarks Marks;
+           if (Marks.Load(recording->FileName()) && Marks.Count()) {
+              if (!cCutter::Active()) {
+                 if (cCutter::Start(recording->FileName()))
+                    Reply(250, "Editing recording \"%s\" [%s]", Option, recording->Title());
+                 else
+                    Reply(554, "Can't start editing process");
+                 }
+              else
+                 Reply(554, "Editing process already active");
+              }
+           else
+              Reply(554, "No editing marks defined");
+           }
+        else
+           Reply(550, "Recording \"%s\" not found%s", Option, Recordings.Count() ? "" : " (use LSTR before editing)");
+        }
+     else
+        Reply(501, "Error in recording number \"%s\"", Option);
+     }
+  else
+     Reply(501, "Missing recording number");
+}
+
 void cSVDRP::CmdGRAB(const char *Option)
 {
   char *FileName = NULL;
@@ -626,7 +707,7 @@ void cSVDRP::CmdGRAB(const char *Option)
 void cSVDRP::CmdHELP(const char *Option)
 {
   if (*Option) {
-     const char *hp = GetHelpPage(Option);
+     const char *hp = GetHelpPage(Option, HelpPages);
      if (hp)
         Reply(214, hp);
      else {
@@ -637,24 +718,13 @@ void cSVDRP::CmdHELP(const char *Option)
   else {
      Reply(-214, "This is VDR version %s", VDRVERSION);
      Reply(-214, "Topics:");
-     const char **hp = HelpPages;
-     int NumPages = 0;
-     while (*hp) {
-           NumPages++;
-           hp++;
-           }
-     const int TopicsPerLine = 5;
-     int x = 0;
-     for (int y = 0; (y * TopicsPerLine + x) < NumPages; y++) {
-         char buffer[TopicsPerLine * (MAXHELPTOPIC + 5)];
-         char *q = buffer;
-         for (x = 0; x < TopicsPerLine && (y * TopicsPerLine + x) < NumPages; x++) {
-             const char *topic = GetHelpTopic(HelpPages[(y * TopicsPerLine + x)]);
-             if (topic)
-                q += sprintf(q, "    %s", topic);
-             }
-         x = 0;
-         Reply(-214, buffer);
+     PrintHelpTopics(HelpPages);
+     cPlugin *plugin;
+     for (int i = 0; (plugin = cPluginManager::GetPlugin(i)) != NULL; i++) {
+         const char **hp = plugin->SVDRPHelpPages();
+         if (hp)
+            Reply(-214, "Plugin %s v%s - %s", plugin->Name(), plugin->Version(), plugin->Description());
+         PrintHelpTopics(hp);
          }
      Reply(-214, "To report bugs in the implementation send email to");
      Reply(-214, "    vdr-bugs@cadsoft.de");
@@ -1042,6 +1112,120 @@ void cSVDRP::CmdNEXT(const char *Option)
      Reply(550, "No active timers");
 }
 
+void cSVDRP::CmdPLAY(const char *Option)
+{
+  if (*Option) {
+     char *opt = strdup(Option);
+     char *num = skipspace(opt);
+     char *option = num;
+     while (*option && !isspace(*option))
+           option++;
+     char c = *option;
+     *option = 0;
+     if (isnumber(num)) {
+        cRecording *recording = Recordings.Get(strtol(num, NULL, 10) - 1);
+        if (recording) {
+           if (c)
+              option = skipspace(++option);
+           cReplayControl::SetRecording(NULL, NULL);
+           cControl::Shutdown();
+           if (*option) {
+              int pos = 0;
+              if (strcasecmp(option, "BEGIN") != 0) {
+                 int h, m = 0, s = 0, f = 1;
+                 int x = sscanf(option, "%d:%d:%d.%d", &h, &m, &s, &f);
+                 if (x == 1)
+                    pos = h;
+                 else if (x >= 3)
+                    pos = (h * 3600 + m * 60 + s) * FRAMESPERSEC + f - 1;
+                 }
+              cResumeFile resume(recording->FileName());
+              if (pos <= 0)
+                 resume.Delete();
+              else
+                 resume.Save(pos);
+              }
+           cReplayControl::SetRecording(recording->FileName(), recording->Title());
+           cControl::Launch(new cReplayControl);
+           cControl::Attach();
+           Reply(250, "Playing recording \"%s\" [%s]", num, recording->Title());
+           }
+        else
+           Reply(550, "Recording \"%s\" not found%s", num, Recordings.Count() ? "" : " (use LSTR before playing)");
+        }
+     else
+        Reply(501, "Error in recording number \"%s\"", num);
+     free(opt);
+     }
+  else
+     Reply(501, "Missing recording number");
+}
+
+void cSVDRP::CmdPLUG(const char *Option)
+{
+  if (*Option) {
+     char *opt = strdup(Option);
+     char *name = skipspace(opt);
+     char *option = name;
+     while (*option && !isspace(*option))
+        option++;
+     char c = *option;
+     *option = 0;
+     cPlugin *plugin = cPluginManager::GetPlugin(name);
+     if (plugin) {
+        if (c)
+           option = skipspace(++option);
+        char *cmd = option;
+        while (*option && !isspace(*option))
+              option++;
+        if (*option) {
+           *option++ = 0;
+           option = skipspace(option);
+           }
+        if (!*cmd || strcasecmp(cmd, "HELP") == 0) {
+           if (*cmd && *option) {
+              const char *hp = GetHelpPage(option, plugin->SVDRPHelpPages());
+              if (hp) {
+                 Reply(-214, hp);
+                 Reply(214, "End of HELP info");
+                 }
+              else
+                 Reply(504, "HELP topic \"%s\" for plugin \"%s\" unknown", option, plugin->Name());
+              }
+           else {
+              Reply(-214, "Plugin %s v%s - %s", plugin->Name(), plugin->Version(), plugin->Description());
+              const char **hp = plugin->SVDRPHelpPages();
+              if (hp) {
+                 Reply(-214, "SVDRP commands:");
+                 PrintHelpTopics(hp);
+                 Reply(214, "End of HELP info");
+                 }
+              else
+                 Reply(214, "This plugin has no SVDRP commands");
+              }
+           }
+        else {
+           int ReplyCode = 900;
+           cString s = plugin->SVDRPCommand(cmd, option, ReplyCode);
+           if (s)
+              Reply(abs(ReplyCode), *s);
+           else
+              Reply(500, "Command unrecognized: \"%s\"", cmd);
+           }
+        }
+     else
+        Reply(550, "Plugin \"%s\" not found (use PLUG for a list of plugins)", name);
+     free(opt);
+     }
+  else {
+     Reply(-214, "Available plugins:");
+     cPlugin *plugin;
+     for (int i = 0; (plugin = cPluginManager::GetPlugin(i)) != NULL; i++)
+         Reply(-214, "%s v%s - %s", plugin->Name(), plugin->Version(), plugin->Description());
+     Reply(214, "End of plugin list");
+     }
+}
+
 void cSVDRP::CmdPUTE(const char *Option)
 {
   delete PUTEhandler;
@@ -1152,6 +1336,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("DELC"))  CmdDELC(s);
   else if (CMD("DELR"))  CmdDELR(s);
   else if (CMD("DELT"))  CmdDELT(s);
+  else if (CMD("EDIT"))  CmdEDIT(s);
   else if (CMD("GRAB"))  CmdGRAB(s);
   else if (CMD("HELP"))  CmdHELP(s);
   else if (CMD("HITK"))  CmdHITK(s);
@@ -1167,6 +1352,8 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
+  else if (CMD("PLAY"))  CmdPLAY(s);
+  else if (CMD("PLUG"))  CmdPLUG(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
   else if (CMD("STAT"))  CmdSTAT(s);
diff --git a/svdrp.h b/svdrp.h
index 815c91efe..baa4fb337 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.20 2004/01/17 13:30:52 kls Exp $
+ * $Id: svdrp.h 1.23 2005/08/28 14:10:32 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -52,11 +52,13 @@ class cSVDRP {
   void Close(bool Timeout = false);
   bool Send(const char *s, int length = -1);
   void Reply(int Code, const char *fmt, ...);
+  void PrintHelpTopics(const char **hp);
   void CmdCHAN(const char *Option);
   void CmdCLRE(const char *Option);
   void CmdDELC(const char *Option);
   void CmdDELR(const char *Option);
   void CmdDELT(const char *Option);
+  void CmdEDIT(const char *Option);
   void CmdGRAB(const char *Option);
   void CmdHELP(const char *Option);
   void CmdHITK(const char *Option);
@@ -72,6 +74,8 @@ class cSVDRP {
   void CmdNEWC(const char *Option);
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
+  void CmdPLAY(const char *Option);
+  void CmdPLUG(const char *Option);
   void CmdPUTE(const char *Option);
   void CmdSCAN(const char *Option);
   void CmdSTAT(const char *Option);
diff --git a/tools.c b/tools.c
index ca4b0b80a..46d3ce262 100644
--- a/tools.c
+++ b/tools.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.96 2005/08/06 09:53:21 kls Exp $
+ * $Id: tools.c 1.97 2005/08/27 14:43:55 kls Exp $
  */
 
 #include "tools.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/vfs.h>
@@ -530,6 +531,15 @@ cString &cString::operator=(const cString &String)
   return *this;
 }
 
+cString cString::sprintf(const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  char *buffer;
+  vasprintf(&buffer, fmt, ap);
+  return cString(buffer, true);
+}
+
 cString WeekDayName(int WeekDay)
 {
   char buffer[4];
diff --git a/tools.h b/tools.h
index 0a8ee8b6a..41a004985 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.74 2005/08/21 14:06:38 kls Exp $
+ * $Id: tools.h 1.75 2005/08/27 14:40:08 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -81,6 +81,7 @@ class cString {
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
   cString &operator=(const cString &String);
+  static cString sprintf(const char *fmt, ...);
   };
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);

From d5c85f5ff84ffea666c63eca5dbe04632283cb04 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 11 Sep 2005 18:00:00 +0200
Subject: [PATCH 124/307] =?UTF-8?q?Version=201.3.32=20-=20Added=20some=20m?=
 =?UTF-8?q?issing=20braces=20in=20remux.c=20(thanks=20to=20Wayne=20Keer=20?=
 =?UTF-8?q?for=20reporting=20this=20one).=20-=20Removed=20unused=20MAINMEN?=
 =?UTF-8?q?UENTRY=20from=20svdrpdemo.c=20(thanks=20to=20Udo=20Richter=20fo?=
 =?UTF-8?q?r=20reporting=20=20=20this=20one).=20-=20Fixed=20appending=20se?=
 =?UTF-8?q?quence=20end=20code=20in=20cDvbPlayer::Goto()=20(thanks=20to=20?=
 =?UTF-8?q?Reinhard=20Nissl).=20-=20Fixed=20syncing=20in=20cRepacker=20(th?=
 =?UTF-8?q?anks=20to=20Reinhard=20Nissl).=20-=20Now=20always=20using=20str?=
 =?UTF-8?q?eam=20id=200xE0=20for=20the=20video=20stream,=20to=20avoid=20pr?=
 =?UTF-8?q?oblems=20with=20=20=20post=20processing=20tools=20that=20choke?=
 =?UTF-8?q?=20on=20different=20ids=20(suggested=20by=20Reinhard=20Nissl).?=
 =?UTF-8?q?=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to=20?=
 =?UTF-8?q?Arthur=20Konovalov).=20-=20Fixed=20cDvbPlayer::SkipFrames()=20t?=
 =?UTF-8?q?o=20properly=20handle=20radio=20recordings=20(thanks=20to=20=20?=
 =?UTF-8?q?=20Reinhard=20Nissl).=20-=20Updated=20the=20Swedish=20OSD=20tex?=
 =?UTF-8?q?ts=20(thanks=20to=20Tomas=20Prybil).=20-=20Updated=20the=20Slov?=
 =?UTF-8?q?enian=20OSD=20texts=20(thanks=20to=20Matjaz=20Thaler).=20-=20Up?=
 =?UTF-8?q?dated=20the=20Danish=20OSD=20texts=20(thanks=20to=20Mogens=20El?=
 =?UTF-8?q?neff).=20-=20Made=20LIRC=20command=20parsing=20more=20robust=20?=
 =?UTF-8?q?(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Introduced=20a=20sep?=
 =?UTF-8?q?arate=20'plugins-install'=20target=20in=20the=20Makefile=20(tha?=
 =?UTF-8?q?nks=20to=20Daniel=20=20=20Thompson).=20-=20Re-introduced=20the?=
 =?UTF-8?q?=20code=20that=20waits=20for=20a=20tuner=20lock=20in=20VDR/devi?=
 =?UTF-8?q?ce.c,=20since=20=20=20apparently=20some=20users=20actually=20ne?=
 =?UTF-8?q?ed=20it.=20It's=20not=20active=20by=20default,=20you'll=20have?=
 =?UTF-8?q?=20=20=20to=20define=20the=20WAIT=5FFOR=5FTUNER=5FLOCK=20macro?=
 =?UTF-8?q?=20in=20that=20file=20if=20you=20need=20it=20(suggested=20=20?=
 =?UTF-8?q?=20by=20Malcolm=20Caldwell).=20-=20Adjusted=20the=20Makefile=20?=
 =?UTF-8?q?to=20the=20dvb-kernel=20driver=20on=20kernel=202.6=20and=20up?=
 =?UTF-8?q?=20(thanks=20to=20=20=20Lauri=20Tischler).=20-=20Repeat=20keys?=
 =?UTF-8?q?=20are=20now=20ignored=20when=20waiting=20for=20a=20keypress=20?=
 =?UTF-8?q?to=20cancel=20an=20operation=20=20=20(thanks=20to=20Marko=20M?=
 =?UTF-8?q?=C3=A4kel=C3=A4).=20-=20The=20main=20menu=20function=20of=20a?=
 =?UTF-8?q?=20plugin=20can=20now=20be=20activated=20through=20a=20key=20ma?=
 =?UTF-8?q?cro=20of=20=20=20the=20form=20"@plugin"=20even=20if=20that=20pl?=
 =?UTF-8?q?ugin=20doesn't=20have=20a=20main=20menu=20entry=20(using=20=20?=
 =?UTF-8?q?=20part=20of=20a=20patch=20by=20Hardy=20Flor,=20which=20origina?=
 =?UTF-8?q?lly=20implemented=20calling=20plugins=20from=20=20=20SVDRP).=20?=
 =?UTF-8?q?-=20The=20menu=20timeout=20handling=20is=20now=20done=20central?=
 =?UTF-8?q?ly=20in=20the=20main=20program=20loop.=20-=20Added=20missing=20?=
 =?UTF-8?q?help=20for=20the=20'help'=20keyword=20in=20the=20SVDRP=20comman?=
 =?UTF-8?q?d=20PLUG.=20-=20The=20main=20menu=20function=20of=20a=20plugin?=
 =?UTF-8?q?=20can=20now=20be=20called=20programmatically=20through=20=20?=
 =?UTF-8?q?=20the=20static=20function=20cRemote::CallPlugin().=20-=20The?=
 =?UTF-8?q?=20SVDRP=20command=20PLUG=20now=20has=20a=20new=20option=20'mai?=
 =?UTF-8?q?n'=20which=20can=20be=20used=20to=20initiate=20=20=20a=20call?=
 =?UTF-8?q?=20to=20the=20main=20menu=20function=20of=20a=20plugin=20(using?=
 =?UTF-8?q?=20part=20of=20a=20patch=20by=20Hardy=20Flor).=20-=20The=20new?=
 =?UTF-8?q?=20command=20line=20option=20'--vfat'=20can=20be=20used=20to=20?=
 =?UTF-8?q?make=20VDR=20encode=20special=20=20=20characters=20in=20recordi?=
 =?UTF-8?q?ng=20file=20names,=20even=20if=20it=20wasn't=20compiled=20with?=
 =?UTF-8?q?=20VFAT=3D1=20=20=20(suggested=20by=20Peter=20Bieringer).=20The?=
 =?UTF-8?q?=20compile=20time=20option=20VFAT=20still=20exists=20and=20=20?=
 =?UTF-8?q?=20creates=20a=20VDR=20that=20always=20behaves=20as=20if=20it?=
 =?UTF-8?q?=20were=20called=20with=20'--vfat'.=20-=20Replaced=20the=20':'?=
 =?UTF-8?q?=20delimiter=20between=20hour=20and=20minute=20in=20recording?=
 =?UTF-8?q?=20file=20names=20with=20=20=20a=20'.'=20under=20Linux,=20too.?=
 =?UTF-8?q?=20Existing=20recordings=20with=20':'=20as=20delimiter=20will?=
 =?UTF-8?q?=20still=20work.=20-=20Implemented=20the=20SVDRP=20command=20MO?=
 =?UTF-8?q?VC=20(thanks=20to=20Andreas=20Brachold).=20-=20Added=20support?=
 =?UTF-8?q?=20for=20multiple=20audio=20language=20codes=20in=20ISO639Langu?=
 =?UTF-8?q?ageDescriptors=20to=20=20=20'libsi'=20(thanks=20to=20Marcel=20W?=
 =?UTF-8?q?iesweg).=20-=20Changed=20the=20audio=20PID=20language=20codes?=
 =?UTF-8?q?=20to=20hold=20up=20to=20two=203=20letter=20codes,=20separated?=
 =?UTF-8?q?=20=20=20by=20'+',=20to=20store=20separate=20languages=20broadc?=
 =?UTF-8?q?ast=20in=20two=20channel=20audio=20mode.=20-=20If=20the=20prefe?=
 =?UTF-8?q?rred=20audio=20language=20is=20broadcast=20on=20a=20PID=20that?=
 =?UTF-8?q?=20has=20two=20different=20=20=20languages=20in=20the=20two=20s?=
 =?UTF-8?q?tereo=20channels,=20the=20audio=20channel=20is=20now=20properly?=
 =?UTF-8?q?=20set=20when=20=20=20switching=20to=20such=20a=20channel=20(th?=
 =?UTF-8?q?anks=20to=20Mogens=20Elneff=20for=20his=20help=20in=20testing?=
 =?UTF-8?q?=20this).=20-=20Fixed=20some=20typos=20in=20MANUAL=20(thanks=20?=
 =?UTF-8?q?to=20Ville=20Skytt=C3=A4).=20-=20Fixed=20the=20default=20value?=
 =?UTF-8?q?=20for=20"Setup/EPG=20bugfix=20level"=20(thanks=20to=20Ville=20?=
 =?UTF-8?q?Skytt=C3=A4=20for=20=20=20reporting=20this=20one).=20-=20Fixed?=
 =?UTF-8?q?=20defining=20timers=20that=20only=20differ=20in=20the=20day=20?=
 =?UTF-8?q?of=20week=20(thanks=20to=20Patrick=20=20=20Rother=20for=20repor?=
 =?UTF-8?q?ting=20this=20one).=20-=20Fixed=20converting=20summary.vdr=20fi?=
 =?UTF-8?q?les=20that=20would=20result=20in=20a=20very=20long=20'short=20t?=
 =?UTF-8?q?ext'=20=20=20(thanks=20to=20Carsten=20Koch).=20-=20Implemented?=
 =?UTF-8?q?=20a=20hash=20for=20the=20channels=20to=20reduce=20the=20system?=
 =?UTF-8?q?=20load=20in=20the=20EIT=20scanning=20=20=20thread=20(based=20o?=
 =?UTF-8?q?n=20a=20patch=20by=20Georg=20Acher).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                      |  23 +++
 HISTORY                           |  62 +++++-
 INSTALL                           |  26 +--
 MANUAL                            |  12 +-
 Make.config.template              |   4 +-
 Makefile                          |  19 +-
 PLUGINS.html                      |   6 +-
 PLUGINS/src/svdrpdemo/HISTORY     |   4 +
 PLUGINS/src/svdrpdemo/svdrpdemo.c |   5 +-
 channels.c                        |  89 ++++++---
 channels.conf                     |  24 +--
 channels.h                        |  21 +-
 config.c                          |   5 +-
 config.h                          |   7 +-
 device.c                          |  20 +-
 device.h                          |  12 +-
 dvbplayer.c                       |   9 +-
 eit.c                             |   6 +-
 eitscan.h                         |   4 +-
 epg.c                             |   4 +-
 epg.h                             |   6 +-
 i18n.c                            | 316 ++++++++++++++++--------------
 i18n.h                            |  18 +-
 interface.c                       |   4 +-
 keys.c                            |   3 +-
 libsi/descriptor.c                |  24 ++-
 libsi/descriptor.h                |  15 +-
 libsi/headers.h                   |   6 +-
 libsi/si.h                        |   8 +-
 lirc.c                            |   7 +-
 menu.c                            |  26 +--
 menu.h                            |   9 +-
 pat.c                             |  29 ++-
 recording.c                       | 166 ++++++++--------
 recording.h                       |   4 +-
 remote.c                          |   8 +-
 remote.h                          |   6 +-
 remux.c                           | 112 ++++++-----
 summary2info.pl                   |  11 +-
 svdrp.c                           |  61 +++++-
 timers.c                          |   8 +-
 tools.c                           |  13 +-
 tools.h                           |   4 +-
 vdr.5                             |   7 +-
 vdr.c                             |  42 +++-
 45 files changed, 821 insertions(+), 454 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0a9c8ae20..2b6b4e413 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -13,6 +13,7 @@ Carsten Koch <Carsten.Koch@icem.de>
  for suggesting that the "Back" button in replay mode should bring up the "Recordings" menu
  for fixing the watchdog timer if the program hangs in OSD activities
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
+ for fixing converting summary.vdr files that would result in a very long 'short text'
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -588,6 +589,7 @@ Lauri Tischler <lauri.tischler@efore.fi>
  unavailable due to a recording on a different transponder
  for reporting a compiler warning about virtual cConfig::Load() functions
  for reporting a warning about character comparison in libsi/si.c
+ for adjusting the Makefile to the dvb-kernel driver on kernel 2.6 and up
 
 Andy Carter <fruit@ukgateway.net>
  for helping to test new DVB-T handling
@@ -791,6 +793,7 @@ Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
  for reporting a crash in creating a new timer in case there is no device in the
  system that can actually receive any channel
+ for suggesting to re-introduced the code that waits for a tuner lock in VDR/device.c
 
 Ludwig Nussel <ludwig.nussel@web.de>
  for making the LIRC thread avoid high CPU load in case the connection to LIRC gets lost
@@ -828,6 +831,7 @@ Andreas Brachold <vdr04@deltab.de>
  umask settings
  for reporting that there are empty info.vdr files created if there is no EPG
  info available
+ for implementing the SVDRP command MOVC
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -908,6 +912,7 @@ Hermann Gausterer <mrq1@gmx.net>
 
 Peter Bieringer <pb@bieringer.de>
  for reporting a problem with duplicate recordings with the same file name
+ for suggesting to implement the command line option '--vfat'
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
@@ -978,6 +983,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing cDvbSpuBitmap::putPixel()
  for implementing cAudioRepacker in remux.c
  for modifying handling of audio packets for radio channels in remux.c
+ for suggesting to always use stream id 0xE0 for the video stream, to avoid problems
+ with post processing tools that choke on different ids
+ for fixing cDvbPlayer::SkipFrames() to properly handle radio recordings
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1153,6 +1161,7 @@ Wayne Keer <syphir@syphir.sytes.net>
  for reporting an unused variable from cTimer::GetWDayFromMDay()
  for reporting a spelling error in 'canceling'
  for adding some 'mkdir -p' to the Makefile's 'install' target
+ for reporting some missing braces in remux.c
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
@@ -1266,6 +1275,7 @@ Udo Richter <udo_richter@gmx.de>
  for suggesting a fix for an out-of-bounds memory access with audio language ids
  for reporting a problem with cRemux in a single thread
  for adding 'Service' functions to the plugin interface
+ for reporting an unused MAINMENUENTRY in svdrpdemo.c
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1287,6 +1297,8 @@ Uwe Hanke <uhanke@gmx.de>
 
 Mogens Elneff <mogens@elneff.dk>
  for translating OSD texts to the Danish language
+ for his help in testing automatically selecting the proper audio channel when
+ switching to a channel with two different languages on the same PID
 
 Joachim Wilke <vdr@joachim-wilke.de>
  for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
@@ -1382,6 +1394,9 @@ Roman Krenick
 Ville Skytt� <ville.skytta@iki.fi>
  for reporting several compiler warnings in gcc 4.0
  for including the optional user defined Make.config from the 'libsi' Makefile
+ for making LIRC command parsing more robust
+ for fixing some typos in MANUAL
+ for reporting that the default value for "Setup/EPG bugfix level" was wrong
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1389,6 +1404,7 @@ Steffen Beyer <cpunk@reactor.de>
 
 Daniel Thompson <daniel.thompson@st.com>
  for fixing a memory leak in tComponent
+ for introducing a separate 'plugins-install' target in the Makefile
 
 Matthias L�tzke <Matthias@Loetzke.de>
  for adding missing text internationalization for "Starting EPG scan"
@@ -1414,6 +1430,7 @@ Georg Acher <acher@baycom.de>
  for avoiding unnecessary calls to getLength() in libsi/si.c, and avoiding the
  '& 0xff' in CRC32::crc32() of libsi/util.c
  for suggesting to reduce the priority of the section handler threads
+ for a patch that was used to implement a hash for the channels
 
 Henrik Niehaus <henrik.niehaus@gmx.de>
  for reporting a problem with timers with a day given as MTWTF--@6, i.e. a repeating
@@ -1456,3 +1473,9 @@ Hardy Flor <HFlor@web.de>
 
 Harald Milz <hm@seneca.muc.de>
  for his CUTR patch, which was used as a base to implement the SVDRP command EDIT
+
+Marko M�kel� <marko.makela@hut.fi>
+ for making repeat keys be ignored when waiting for a keypress to cancel an operation
+
+Patrick Rother <krd-vdr@gulu.net>
+ for reporting a bug in defining timers that only differ in the day of week
diff --git a/HISTORY b/HISTORY
index dda7c8675..302afb27d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1114,7 +1114,7 @@ Video Disk Recorder Revision History
   Please check if your system provides 'killall' - if it doesn't, please change
   this back in 'runvdr' and report this (thanks to Achim Lange).
 - The "Commands" menu now automatically assigns number keys as hotkeys to the
-  commands. If you have preceeded your commands with digits you may want to
+  commands. If you have preceded your commands with digits you may want to
   remove these from your 'commands.conf' file.
 - The new Setup item "Restart" can be used to force a complete restart of VDR,
   including reloading the driver. Note that this can only work if VDR and the
@@ -3746,3 +3746,63 @@ Video Disk Recorder Revision History
   Hardy Flor).
 - The new SVDRP command EDIT can be used to start the editing process of a recording
   (based on the CUTR patch by Harald Milz).
+
+2005-09-11: Version 1.3.32
+
+- Added some missing braces in remux.c (thanks to Wayne Keer for reporting this one).
+- Removed unused MAINMENUENTRY from svdrpdemo.c (thanks to Udo Richter for reporting
+  this one).
+- Fixed appending sequence end code in cDvbPlayer::Goto() (thanks to Reinhard Nissl).
+- Fixed syncing in cRepacker (thanks to Reinhard Nissl).
+- Now always using stream id 0xE0 for the video stream, to avoid problems with
+  post processing tools that choke on different ids (suggested by Reinhard Nissl).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed cDvbPlayer::SkipFrames() to properly handle radio recordings (thanks to
+  Reinhard Nissl).
+- Updated the Swedish OSD texts (thanks to Tomas Prybil).
+- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Made LIRC command parsing more robust (thanks to Ville Skytt�).
+- Introduced a separate 'plugins-install' target in the Makefile (thanks to Daniel
+  Thompson).
+- Re-introduced the code that waits for a tuner lock in VDR/device.c, since
+  apparently some users actually need it. It's not active by default, you'll have
+  to define the WAIT_FOR_TUNER_LOCK macro in that file if you need it (suggested
+  by Malcolm Caldwell).
+- Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to
+  Lauri Tischler).
+- Repeat keys are now ignored when waiting for a keypress to cancel an operation
+  (thanks to Marko M�kel�).
+- The main menu function of a plugin can now be activated through a key macro of
+  the form "@plugin" even if that plugin doesn't have a main menu entry (using
+  part of a patch by Hardy Flor, which originally implemented calling plugins from
+  SVDRP).
+- The menu timeout handling is now done centrally in the main program loop.
+- Added missing help for the 'help' keyword in the SVDRP command PLUG.
+- The main menu function of a plugin can now be called programmatically through
+  the static function cRemote::CallPlugin().
+- The SVDRP command PLUG now has a new option 'main' which can be used to initiate
+  a call to the main menu function of a plugin (using part of a patch by Hardy Flor).
+- The new command line option '--vfat' can be used to make VDR encode special
+  characters in recording file names, even if it wasn't compiled with VFAT=1
+  (suggested by Peter Bieringer). The compile time option VFAT still exists and
+  creates a VDR that always behaves as if it were called with '--vfat'.
+- Replaced the ':' delimiter between hour and minute in recording file names with
+  a '.' under Linux, too. Existing recordings with ':' as delimiter will still work.
+- Implemented the SVDRP command MOVC (thanks to Andreas Brachold).
+- Added support for multiple audio language codes in ISO639LanguageDescriptors to
+  'libsi' (thanks to Marcel Wiesweg).
+- Changed the audio PID language codes to hold up to two 3 letter codes, separated
+  by '+', to store separate languages broadcast in two channel audio mode.
+- If the preferred audio language is broadcast on a PID that has two different
+  languages in the two stereo channels, the audio channel is now properly set when
+  switching to such a channel (thanks to Mogens Elneff for his help in testing this).
+- Fixed some typos in MANUAL (thanks to Ville Skytt�).
+- Fixed the default value for "Setup/EPG bugfix level" (thanks to Ville Skytt� for
+  reporting this one).
+- Fixed defining timers that only differ in the day of week (thanks to Patrick
+  Rother for reporting this one).
+- Fixed converting summary.vdr files that would result in a very long 'short text'
+  (thanks to Carsten Koch).
+- Implemented a hash for the channels to reduce the system load in the EIT scanning
+  thread (based on a patch by Georg Acher).
diff --git a/INSTALL b/INSTALL
index 778dd6c19..540b45f2d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,18 +23,21 @@ mode you want.
 Compiling and running the program:
 ----------------------------------
 
-Make sure the files from this package are located in a
-directory that is "parallel" to the DVB directory of the
-driver source for the Siemens DVB-S PCI card (refer to
-http://linuxtv.org/dvb/siemens_dvb.html for more information
-about that driver). For example, if the DVB driver was 
-extracted into the directory /home/kls/vdr/DVB, then this
-package should be extracted into /home/kls/vdr/VDR.
+VDR requires the Linux-DVB driver header files to compile.
+As of kernel 2.6 these are part of the official Linux kernel
+distribution, and VDR's Makefile will automatically locate
+them. If you are using kernel 2.4 or earlier, you should
+install the files from this package in a directory that is
+"parallel" to the DVB directory of the driver source (refer to
+http://linuxtv.org for more information about that driver).
+For example, if the DVB driver was extracted into the directory
+/home/kls/vdr/DVB, then this package should be extracted into
+/home/kls/vdr/VDR.
 If you have the DVB driver source in a different location
-you will have to change the definition of DVBDIR in the
-Makefile (see the file Make.config.template).
+you can rename the file Make.config.template to Make.config and
+adjust the definition of DVBDIR in that file.
 
-VDR requires the Linux-DVB card driver version dated 2003-08-23 or higher
+VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
@@ -68,7 +71,8 @@ time switch
 
   VFAT=1
 
-to the 'make' command.
+to the 'make' command. Alternatively, you can call VDR with the command
+line option '--vfat'.
 
 When running, the 'vdr' program writes status information into the
 system log file (/var/log/messages). You may want to watch these
diff --git a/MANUAL b/MANUAL
index 9468d6eed..3d53d4f79 100644
--- a/MANUAL
+++ b/MANUAL
@@ -77,7 +77,7 @@ Version 1.2
       "by name" and "by provider".
   (4) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
       a single shot and a repeating timer. If "Day" indicates a repeating timer,
-      the keys '1'...'7' can be used to toggle the individual days ('1' is monday).
+      the keys '1'...'7' can be used to toggle the individual days ('1' is Monday).
 
 * Navigating through the On Screen Menus
 
@@ -342,7 +342,7 @@ Version 1.2
   mark, and a triangle at the bottom means that this is an "end" mark.
   The cutting process will save all video data between "start" and "end" marks
   into a new file (the original recording remains untouched). The new file will
-  have the same name as the original recording, preceeded with a '%' character
+  have the same name as the original recording, preceded with a '%' character
   (imagine the '%' somehow looking like a pair of scissors ;-). Red bars in the
   progress display indicate which video sequences will be saved by the cutting
   process.
@@ -376,7 +376,7 @@ Version 1.2
   The parameters in the "Edit Timer" menu have the following meanings:
 
   Active:    Defines whether the timer will be processed (set it to 'no' to
-             temporarily desable a timer).
+             temporarily disable a timer).
   Channel:   The channel to be recorded (as defined in the "Channels" list).
              Any changes made in the "Channels" list (like renaming or
              reordering channels) will be automatically reflected in the
@@ -386,11 +386,11 @@ Version 1.2
              timer that hits once and is deleted after it ends.
              Another option here are "repeating timers" which are defined
              by listing the days of the week on which they shall record.
-             For example, a timer that shall record every monday and wednesday
+             For example, a timer that shall record every Monday and Wednesday
              would have a Day setting of "M-W----".
              The '0' key toggles between a single shot and a repeating timer.
              If "Day" indicates a repeating timer, the keys '1'...'7' can be
-             used to toggle the individual days ('1' is monday).
+             used to toggle the individual days ('1' is Monday).
              You can also switch to a set of predefined repeating timer settings
              by pressing the "Left" key when the day is the present day. To return
              to the single shot mode just press "Right" until a date is displayed.
@@ -545,7 +545,7 @@ Version 1.2
   Set system time = no   Defines whether the system time will be set according to
                          the time received from the DVB data stream.
                          Note that this works only if VDR is running under a user
-                         id that has permisson to set the system time. You also
+                         id that has permission to set the system time. You also
                          need to set the option "Use time from transponder" to a
                          channel that you trust to transmit a reliable time base
                          (not all channels seem to have access to a correct time
diff --git a/Make.config.template b/Make.config.template
index 149ce9861..5cbf42bfe 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.5 2005/07/31 11:35:28 kls Exp $
+# $Id: Make.config.template 1.6 2005/09/02 14:24:31 kls Exp $
 
 ### The C compiler and options:
 
@@ -18,7 +18,7 @@ CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR   = ../DVB
+#DVBDIR   = ../DVB
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
diff --git a/Makefile b/Makefile
index 28569b6e9..b268a788d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.77 2005/08/14 11:42:20 kls Exp $
+# $Id: Makefile 1.79 2005/09/02 14:23:38 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -14,7 +14,16 @@ CFLAGS   ?= -O2
 CXX      ?= g++
 CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
-DVBDIR   = ../DVB
+LINUX_VERSION := $(shell uname -r | cut -c-3)
+LINUX         := $(shell uname -r)
+DVBDIR        := /lib/modules/$(LINUX)/build
+ifeq ($(LINUX_VERSION), 2.4)
+   DVBDIR = ../DVB
+endif
+ifeq ($(LINUX_VERSION), 2.2)
+   DVBDIR = ../DVB
+endif
+
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
@@ -185,8 +194,6 @@ plugins-clean:
 install:
 	@mkdir -p $(BINDIR)
 	@cp vdr runvdr $(BINDIR)
-	@mkdir -p $(BINDIR)/$(PLUGINLIBDIR)
-	@cp $(PLUGINLIBDIR)/* $(BINDIR)/$(PLUGINLIBDIR)
 	@mkdir -p $(MANDIR)/man1
 	@mkdir -p $(MANDIR)/man5
 	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
@@ -196,6 +203,10 @@ install:
             cp *.conf $(VIDEODIR);\
             fi
 
+plugins-install:
+	@mkdir -p $(BINDIR)/$(PLUGINLIBDIR)
+	@cp $(PLUGINLIBDIR)/* $(BINDIR)/$(PLUGINLIBDIR)
+
 # Source documentation:
 
 srcdoc:
diff --git a/PLUGINS.html b/PLUGINS.html
index 203d8706e..c44e6523b 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -273,7 +273,7 @@ <h1>Table Of Contents</h1>
 
 The example shown here is the way VDR does this in its core source files.
 It takes the header file's name, converts it to all uppercase, replaces the
-dot with an underline and preceedes the whole thing with two underlines.
+dot with an underline and precedes the whole thing with two underlines.
 The GNU library header files do this pretty much the same way, except that they
 usually precede the name with only one underline (there are exceptions, though).
 <p>
@@ -655,7 +655,7 @@ <h1>Table Of Contents</h1>
 <p>
 The plugin's setup parameters are stored in the same file as VDR's parameters.
 In order to allow each plugin (and VDR itself) to have its own set of parameters,
-the <tt>Name</tt> of each parameter will be preceeded with the plugin's
+the <tt>Name</tt> of each parameter will be preceded with the plugin's
 name, as in
 <p>
 <tt>hello.GreetingTime = 3</tt>
@@ -1031,7 +1031,7 @@ <h1>Table Of Contents</h1>
 particular plugin's definitions.
 <p>
 The returned string may consist of several lines, separated by the newline character
-('<tt>\n</tt>'). Each of these lines will be preceeded with the <tt>ReplyCode</tt>
+('<tt>\n</tt>'). Each of these lines will be preceded with the <tt>ReplyCode</tt>
 when presenting them to the caller, and the continuation character ('<tt>-</tt>')
 will be set for all but the last one.
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index 78014f204..efdc82651 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2005-08-27: Version 0.0.1
 
 - Initial revision.
+
+2005-08-28: Version 0.0.2
+
+- Removed unused MAINMENUENTRY.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index b6ee9a708..66dc25b9a 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,14 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 1.1 2005/08/27 16:28:58 kls Exp $
+ * $Id: svdrpdemo.c 1.2 2005/08/28 21:11:14 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
-static const char *MAINMENUENTRY  = NULL;
 
 class cPluginSvdrpdemo : public cPlugin {
 private:
diff --git a/channels.c b/channels.c
index 85778526f..939c29fef 100644
--- a/channels.c
+++ b/channels.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.44 2005/08/06 12:22:41 kls Exp $
+ * $Id: channels.c 1.46 2005/09/11 14:22:24 kls Exp $
  */
 
 #include "channels.h"
 #include <linux/dvb/frontend.h>
 #include <ctype.h>
+#include "device.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -341,11 +342,14 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
         dsyslog("changing id of channel %d from %d-%d-%d-%d to %d-%d-%d-%d", Number(), nid, tid, sid, rid, Nid, Tid, Sid, Rid);
         modification |= CHANNELMOD_ID;
         Channels.SetModified();
+        Channels.UnhashChannel(this);
         }
      nid = Nid;
      tid = Tid;
      sid = Sid;
      rid = Rid;
+     if (Number())
+        Channels.HashChannel(this);
      }
 }
 
@@ -386,7 +390,7 @@ void cChannel::SetPortalName(const char *PortalName)
 #define STRDIFF 0x01
 #define VALDIFF 0x02
 
-static int IntArraysDiffer(const int *a, const int *b, const char na[][4] = NULL, const char nb[][4] = NULL)
+static int IntArraysDiffer(const int *a, const int *b, const char na[][MAXLANGCODE2] = NULL, const char nb[][MAXLANGCODE2] = NULL)
 {
   int result = 0;
   for (int i = 0; a[i] || b[i]; i++) {
@@ -400,7 +404,7 @@ static int IntArraysDiffer(const int *a, const int *b, const char na[][4] = NULL
   return result;
 }
 
-static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[][4] = NULL)
+static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[][MAXLANGCODE2] = NULL)
 {
   char *q = s;
   int i = 0;
@@ -416,7 +420,7 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
   return q - s;
 }
 
-void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid)
+void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid)
 {
   int mod = CHANNELMOD_NONE;
   if (vpid != Vpid || ppid != Ppid || tpid != Tpid)
@@ -427,8 +431,9 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dp
   if (m & VALDIFF)
      mod |= CHANNELMOD_PIDS;
   if (mod) {
-     char OldApidsBuf[(MAXAPIDS + MAXDPIDS) * 10 + 10]; // 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
-     char NewApidsBuf[(MAXAPIDS + MAXDPIDS) * 10 + 10];
+     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia
+     char OldApidsBuf[BufferSize];
+     char NewApidsBuf[BufferSize];
      char *q = OldApidsBuf;
      q += IntArrayToString(q, apids, 10, alangs);
      if (dpids[0]) {
@@ -448,12 +453,12 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dp
      ppid = Ppid;
      for (int i = 0; i < MAXAPIDS; i++) {
          apids[i] = Apids[i];
-         strn0cpy(alangs[i], ALangs[i], 4);
+         strn0cpy(alangs[i], ALangs[i], MAXLANGCODE2);
          }
      apids[MAXAPIDS] = 0;
      for (int i = 0; i < MAXDPIDS; i++) {
          dpids[i] = Dpids[i];
-         strn0cpy(dlangs[i], DLangs[i], 4);
+         strn0cpy(dlangs[i], DLangs[i], MAXLANGCODE2);
          }
      dpids[MAXDPIDS] = 0;
      tpid = Tpid;
@@ -633,7 +638,8 @@ cString cChannel::ToText(const cChannel *Channel)
      if (Channel->ppid && Channel->ppid != Channel->vpid)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
      *q = 0;
-     char apidbuf[(MAXAPIDS + MAXDPIDS) * 10 + 10]; // 10: 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
+     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia
+     char apidbuf[BufferSize];
      q = apidbuf;
      q += IntArrayToString(q, Channel->apids, 10, Channel->alangs);
      if (Channel->dpids[0]) {
@@ -722,7 +728,7 @@ bool cChannel::Parse(const char *s)
                     char *l = strchr(q, '=');
                     if (l) {
                        *l++ = 0;
-                       strn0cpy(alangs[NumApids], l, 4);
+                       strn0cpy(alangs[NumApids], l, MAXLANGCODE2);
                        }
                     else
                        *alangs[NumApids] = 0;
@@ -743,7 +749,7 @@ bool cChannel::Parse(const char *s)
                        char *l = strchr(q, '=');
                        if (l) {
                           *l++ = 0;
-                          strn0cpy(dlangs[NumDpids], l, 4);
+                          strn0cpy(dlangs[NumDpids], l, MAXLANGCODE2);
                           }
                        else
                           *dlangs[NumDpids] = 0;
@@ -865,6 +871,16 @@ bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
   return false;
 }
 
+void cChannels::HashChannel(cChannel *Channel)
+{
+  channelsHashSid.Add(Channel, Channel->Sid());
+}
+
+void cChannels::UnhashChannel(cChannel *Channel)
+{
+  channelsHashSid.Del(Channel, Channel->Sid());
+}
+
 int cChannels::GetNextGroup(int Idx)
 {
   cChannel *channel = Get(++Idx);
@@ -891,6 +907,7 @@ int cChannels::GetNextNormal(int Idx)
 
 void cChannels::ReNumber( void )
 {
+  channelsHashSid.Clear();
   int Number = 1;
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (channel->GroupSep()) {
@@ -898,6 +915,7 @@ void cChannels::ReNumber( void )
             Number = channel->Number();
          }
       else {
+         HashChannel(channel);
          maxNumber = Number;
          channel->SetNumber(Number++);
          }
@@ -921,32 +939,43 @@ cChannel *cChannels::GetByNumber(int Number, int SkipGap)
 
 cChannel *cChannels::GetByServiceID(int Source, int Transponder, unsigned short ServiceID)
 {
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep() && channel->Source() == Source && ISTRANSPONDER(channel->Transponder(), Transponder) && channel->Sid() == ServiceID)
-         return channel;
-      }
+  cList<cHashObject> *list = channelsHashSid.GetList(ServiceID);
+  if (list) {
+     for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
+         cChannel *channel = (cChannel *)hobj->Object();
+         if (channel->Sid() == ServiceID && channel->Source() == Source && ISTRANSPONDER(channel->Transponder(), Transponder))
+            return channel;
+         }
+     }
   return NULL;
 }
 
 cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid, bool TryWithoutPolarization)
 {
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep() && channel->GetChannelID() == ChannelID)
-         return channel;
-      }
-  if (TryWithoutRid) {
-     ChannelID.ClrRid();
-     for (cChannel *channel = First(); channel; channel = Next(channel)) {
-         if (!channel->GroupSep() && channel->GetChannelID().ClrRid() == ChannelID)
-            return channel;
-         }
-     }
-  if (TryWithoutPolarization) {
-     ChannelID.ClrPolarization();
-     for (cChannel *channel = First(); channel; channel = Next(channel)) {
-         if (!channel->GroupSep() && channel->GetChannelID().ClrPolarization() == ChannelID)
+  int sid = ChannelID.Sid();
+  cList<cHashObject> *list = channelsHashSid.GetList(sid);
+  if (list) {
+     for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
+         cChannel *channel = (cChannel *)hobj->Object();
+         if (channel->Sid() == sid && channel->GetChannelID() == ChannelID)
             return channel;
          }
+     if (TryWithoutRid) {
+        ChannelID.ClrRid();
+        for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
+            cChannel *channel = (cChannel *)hobj->Object();
+            if (channel->Sid() == sid && channel->GetChannelID().ClrRid() == ChannelID)
+               return channel;
+            }
+        }
+     if (TryWithoutPolarization) {
+        ChannelID.ClrPolarization();
+        for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
+            cChannel *channel = (cChannel *)hobj->Object();
+            if (channel->Sid() == sid && channel->GetChannelID().ClrPolarization() == ChannelID)
+               return channel;
+            }
+        }
      }
   return NULL;
 }
diff --git a/channels.conf b/channels.conf
index a6034e2ad..2041ae1d0 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,12 +1,12 @@
 RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
-ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
+ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:0:0:0:0:898:133:33:0
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
 Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
-NDR FS MV;ARD:12109:hC34:S19.2E:27500:301:302=deu:2404:0:28224:1:1073:0
-SR S�DWEST Ferns.;ARD:11836:hC34:S19.2E:27500:501:502=deu:504:0:28110:1:1101:0
+NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
+SR S�DWEST Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
 BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
@@ -15,7 +15,7 @@ ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:3:13001:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
 ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:3:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
@@ -27,7 +27,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -45,9 +45,9 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1801,1702:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
@@ -56,7 +56,7 @@ DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,180
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1801,1722,1702:21:133:17:0
-DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1801,1702:513:133:4:0
+DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702:513:133:4:0
 :Sportsworld
 PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
 PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1801,1702:27:133:4:0
@@ -79,8 +79,8 @@ ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
-RTL7.;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
-MTV2 Pop Channel;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
+Test;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
+Nickelodeon;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
 VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
@@ -108,12 +108,12 @@ Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-WDR M�nster;ARD:12421:hC34:S19.2E:27500:701:702=deu:104:0:28310:1:1201:0
+WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
 Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
-Bethel TV;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+JGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
diff --git a/channels.h b/channels.h
index 537204241..c2e1efc2b 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.33 2005/08/06 11:23:32 kls Exp $
+ * $Id: channels.h 1.35 2005/09/11 11:17:19 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -36,6 +36,9 @@
 #define MAXSPIDS  8 // subtitles
 #define MAXCAIDS  8 // conditional access
 
+#define MAXLANGCODE1 4 // a 3 letter language code, zero terminated
+#define MAXLANGCODE2 8 // up to two 3 letter language codes, separated by '+' and zero terminated
+
 struct tChannelParameterMap {
   int userValue;
   int driverValue;
@@ -69,6 +72,11 @@ struct tChannelID {
   bool Valid(void) const { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   tChannelID &ClrPolarization(void);
+  int Source(void) { return source; }
+  int Nid(void) { return nid; }
+  int Tid(void) { return tid; }
+  int Sid(void) { return sid; }
+  int Rid(void) { return rid; }
   static tChannelID FromString(const char *s);
   cString ToString(void) const;
   static const tChannelID InvalidID;
@@ -102,11 +110,11 @@ class cChannel : public cListObject {
   int vpid;
   int ppid;
   int apids[MAXAPIDS + 1]; // list is zero-terminated
-  char alangs[MAXAPIDS][4];
+  char alangs[MAXAPIDS][MAXLANGCODE2];
   int dpids[MAXDPIDS + 1]; // list is zero-terminated
-  char dlangs[MAXDPIDS][4];
+  char dlangs[MAXDPIDS][MAXLANGCODE2];
   int spids[MAXSPIDS + 1]; // list is zero-terminated
-  char slangs[MAXSPIDS][4];
+  char slangs[MAXSPIDS][MAXLANGCODE2];
   int tpid;
   int caids[MAXCAIDS + 1]; // list is zero-terminated
   int nid;
@@ -188,7 +196,7 @@ class cChannel : public cListObject {
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
-  void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid);
+  void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
   void SetLinkChannels(cLinkChannels *LinkChannels);
@@ -200,10 +208,13 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   int maxNumber;
   int modified;
   int beingEdited;
+  cHash<cChannel> channelsHashSid;
   void DeleteDuplicateChannels(void);
 public:
   cChannels(void);
   bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
+  void HashChannel(cChannel *Channel);
+  void UnhashChannel(cChannel *Channel);
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
diff --git a/config.c b/config.c
index 6f9e09813..ecd91af28 100644
--- a/config.c
+++ b/config.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.136 2005/08/13 13:47:08 kls Exp $
+ * $Id: config.c 1.138 2005/09/09 15:08:59 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
+#include "device.h"
 #include "i18n.h"
 #include "interface.h"
 #include "plugin.h"
@@ -266,7 +267,7 @@ cSetup::cSetup(void)
   AudioLanguages[0] = -1;
   EPGLanguages[0] = -1;
   EPGScanTimeout = 5;
-  EPGBugfixLevel = 2;
+  EPGBugfixLevel = 3;
   EPGLinger = 0;
   SVDRPTimeout = 300;
   ZapTimeout = 3;
diff --git a/config.h b/config.h
index 8bfbc85d8..8113c193a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.225 2005/08/26 12:28:40 kls Exp $
+ * $Id: config.h 1.227 2005/09/04 10:49:24 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -16,12 +16,11 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include "device.h"
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.31"
-#define VDRVERSNUM   10331  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.32"
+#define VDRVERSNUM   10332  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 23808030e..8673cf057 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.107 2005/08/27 09:01:09 kls Exp $
+ * $Id: device.c 1.109 2005/09/04 14:28:16 kls Exp $
  */
 
 #include "device.h"
@@ -795,13 +795,17 @@ void cDevice::EnsureAudioTrack(bool Force)
 {
   if (Force || !availableTracks[currentAudioTrack].id) {
      eTrackType PreferredTrack = ttAudioFirst;
+     int PreferredAudioChannel = 0;
      int LanguagePreference = -1;
      int StartCheck = Setup.CurrentDolby ? ttDolbyFirst : ttAudioFirst;
      int EndCheck = ttDolbyLast;
      for (int i = StartCheck; i <= EndCheck; i++) {
          const tTrackId *TrackId = GetTrack(eTrackType(i));
-         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.AudioLanguages, I18nLanguageIndex(TrackId->language), LanguagePreference))
+         int pos = 0;
+         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.AudioLanguages, TrackId->language, LanguagePreference, &pos)) {
             PreferredTrack = eTrackType(i);
+            PreferredAudioChannel = pos;
+            }
          if (Setup.CurrentDolby && i == ttDolbyLast) {
             i = ttAudioFirst - 1;
             EndCheck = ttAudioLast;
@@ -811,8 +815,9 @@ void cDevice::EnsureAudioTrack(bool Force)
      const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
      if (Force || !Track || !Track->id || PreferredTrack != GetCurrentAudioTrack()) {
         if (!Force) // only log this for automatic changes
-           dsyslog("setting audio track to %d", PreferredTrack);
+           dsyslog("setting audio track to %d (%d)", PreferredTrack, PreferredAudioChannel);
         SetCurrentAudioTrack(PreferredTrack);
+        SetAudioChannel(PreferredAudioChannel);
         }
      }
 }
@@ -1185,6 +1190,15 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
      return false;
   if (Receiver->device == this)
      return true;
+// activate the following line if you need it - actually the driver should be fixed!
+//#define WAIT_FOR_TUNER_LOCK
+#ifdef WAIT_FOR_TUNER_LOCK
+#define TUNER_LOCK_TIMEOUT 5000 // ms
+  if (!HasLock(TUNER_LOCK_TIMEOUT)) {
+     esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
+     return false;
+     }
+#endif
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
diff --git a/device.h b/device.h
index c7075cbd7..484f0be53 100644
--- a/device.h
+++ b/device.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.62 2005/08/21 08:52:20 kls Exp $
+ * $Id: device.h 1.64 2005/09/10 11:54:02 kls Exp $
  */
 
 #ifndef __DEVICE_H
 #define __DEVICE_H
 
+#include "channels.h"
 #include "ci.h"
 #include "eit.h"
 #include "filter.h"
@@ -81,12 +82,11 @@ enum eTrackType { ttNone,
 #define IS_DOLBY_TRACK(t) (ttDolbyFirst <= (t) && (t) <= ttDolbyLast)
 
 struct tTrackId {
-  uint16_t id;          // The PES packet id or the PID.
-  char language[8];     // something like either "eng" or "deu/eng"
-  char description[32]; // something like "Dolby Digital 5.1"
+  uint16_t id;                  // The PES packet id or the PID.
+  char language[MAXLANGCODE2];  // something like either "eng" or "deu+eng"
+  char description[32];         // something like "Dolby Digital 5.1"
   };
 
-class cChannel;
 class cPlayer;
 class cReceiver;
 class cPesAssembler;
@@ -266,7 +266,7 @@ class cDevice : public cThread {
          ///< On indicates whether the PID shall be added or deleted.
          ///< Handle->handle can be used by the device to store information it
          ///< needs to receive this PID (for instance a file handle).
-         ///< Handle->used indicated how many receivers are using this PID.
+         ///< Handle->used indicates how many receivers are using this PID.
          ///< Type indicates some special types of PIDs, which the device may
          ///< need to set in a specific way.
 
diff --git a/dvbplayer.c b/dvbplayer.c
index feb82d8ea..8f76ab6c7 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.38 2005/08/14 10:52:45 kls Exp $
+ * $Id: dvbplayer.c 1.40 2005/08/29 15:43:30 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -621,7 +621,10 @@ int cDvbPlayer::SkipFrames(int Frames)
      int Current, Total;
      GetIndex(Current, Total, true);
      int OldCurrent = Current;
-     Current = index->GetNextIFrame(Current + Frames, Frames > 0);
+     // As GetNextIFrame() increments/decrements at least once, the 
+     // destination frame (= Current + Frames) must be adjusted by
+     // -1/+1 respectively.
+     Current = index->GetNextIFrame(Current + Frames + (Frames > 0 ? -1 : 1), Frames > 0);
      return Current >= 0 ? Current : OldCurrent;
      }
   return -1;
@@ -661,7 +664,7 @@ void cDvbPlayer::Goto(int Index, bool Still)
            if (playMode == pmPause)
               DevicePlay();
            // append sequence end code to get the image shown immediately with softdevices
-           if (r > 6) { // should be always true
+           if (r > 6 && (b[3] & 0xF0) == 0xE0) { // make sure to append it only to a video packet
               b[r++] = 0x00;
               b[r++] = 0x00;
               b[r++] = 0x01;
diff --git a/eit.c b/eit.c
index 702a8e89b..0145baf5c 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.110 2005/08/13 13:27:34 kls Exp $
+ * $Id: eit.c 1.111 2005/09/04 11:36:30 kls Exp $
  */
 
 #include "eit.h"
@@ -99,7 +99,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
                  SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
-                 if (I18nIsPreferredLanguage(Setup.EPGLanguages, I18nLanguageIndex(eed->languageCode), LanguagePreferenceExt) || !ExtendedEventDescriptors) {
+                 if (I18nIsPreferredLanguage(Setup.EPGLanguages, eed->languageCode, LanguagePreferenceExt) || !ExtendedEventDescriptors) {
                     delete ExtendedEventDescriptors;
                     ExtendedEventDescriptors = new SI::ExtendedEventDescriptors;
                     UseExtendedEventDescriptor = true;
@@ -114,7 +114,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  break;
             case SI::ShortEventDescriptorTag: {
                  SI::ShortEventDescriptor *sed = (SI::ShortEventDescriptor *)d;
-                 if (I18nIsPreferredLanguage(Setup.EPGLanguages, I18nLanguageIndex(sed->languageCode), LanguagePreferenceShort) || !ShortEventDescriptor) {
+                 if (I18nIsPreferredLanguage(Setup.EPGLanguages, sed->languageCode, LanguagePreferenceShort) || !ShortEventDescriptor) {
                     delete ShortEventDescriptor;
                     ShortEventDescriptor = sed;
                     d = NULL; // so that it is not deleted
diff --git a/eitscan.h b/eitscan.h
index c5116cb97..8f6e391da 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,14 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.8 2004/01/17 15:36:24 kls Exp $
+ * $Id: eitscan.h 1.9 2005/09/04 10:51:35 kls Exp $
  */
 
 #ifndef __EITSCAN_H
 #define __EITSCAN_H
 
 #include <time.h>
+#include "channels.h"
 #include "config.h"
+#include "device.h"
 
 class cScanList;
 class cTransponderList;
diff --git a/epg.c b/epg.c
index 038f9c60d..4377c6d31 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.36 2005/07/30 14:44:54 kls Exp $
+ * $Id: epg.c 1.37 2005/09/09 15:14:11 kls Exp $
  */
 
 #include "epg.h"
@@ -471,7 +471,7 @@ void cEvent::FixEpgBugs(void)
            }
         }
 
-     // Some channels put the Description into the ShortText (preceeded
+     // Some channels put the Description into the ShortText (preceded
      // by a blank) if there is no actual ShortText and the Description
      // is short enough:
      //
diff --git a/epg.h b/epg.h
index 83ae0d21a..9cefcb270 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.25 2005/05/28 11:32:36 kls Exp $
+ * $Id: epg.h 1.26 2005/09/11 12:54:30 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -132,8 +132,8 @@ class cSchedule : public cListObject  {
   void Cleanup(void);
   cEvent *AddEvent(cEvent *Event);
   void DelEvent(cEvent *Event);
-  void cSchedule::HashEvent(cEvent *Event);
-  void cSchedule::UnhashEvent(cEvent *Event);
+  void HashEvent(cEvent *Event);
+  void UnhashEvent(cEvent *Event);
   const cList<cEvent> *Events(void) const { return &events; }
   const cEvent *GetPresentEvent(bool CheckRunningStatus = false) const;
   const cEvent *GetFollowingEvent(bool CheckRunningStatus = false) const;
diff --git a/i18n.c b/i18n.c
index 346ad863d..701a8fc9e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.200 2005/08/26 13:39:07 kls Exp $
+ * $Id: i18n.c 1.208 2005/09/10 10:20:48 kls Exp $
  *
  * Translations provided by:
  *
@@ -66,7 +66,7 @@
  *    it included in the next version of VDR.
  *
  * In case an English phrase is used in more than one context (and might need
- * different translations in other languages) it can be preceeded with an
+ * different translations in other languages) it can be preceded with an
  * arbitrary string to describe its context, separated from the actual phrase
  * by a '$' character (see for instance "Button$Stop" vs. "Stop").
  * Of course this means that no English phrase may contain the '$' character!
@@ -105,7 +105,7 @@ const tI18nPhrase Phrases[] = {
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-15",
     "iso8859-15",
-    "iso8859-1",
+    "iso8859-2",
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
@@ -127,7 +127,7 @@ const tI18nPhrase Phrases[] = {
   // The 3-letter names of the language (this MUST be the third phrase!):
   { "eng,dos",
     "deu,ger",
-    "slv",
+    "slv,slo",
     "ita",
     "dut,nla,nld",
     "por",
@@ -254,7 +254,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Recording info",
     "Aufzeichnung",
-    "",// TODO
+    "Podatki o snemanju",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -264,7 +264,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Inspelning",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -422,7 +422,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Info",
     "Info",
-    "",//TODO
+    "Info",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -432,14 +432,14 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Info",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "Info",
     "Info",
-    "",//TODO
+    "Info",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -474,14 +474,14 @@ const tI18nPhrase Phrases[] = {
     "Program biezacy",
     "�Qu� hay ahora?",
     "������ ���������",
-    "Vilket program s�nds nu?",
+    "Vad s�nds nu?",
     "Ce emisiuni sunt acum?",
     "Mi megy most?",
     "Qu� fan ara?",
     "������ � �����:",
     "�to je trenutno na programu?",
     "Hetkel eetris",
-    "Hvilket program vises nu?",
+    "Hvad vises nu?",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -502,7 +502,7 @@ const tI18nPhrase Phrases[] = {
     "����� � ���������:",
     "�to slijedi?",
     "J�rgmisena eetris",
-    "Hvilket n�ste program vises?",
+    "Hvad vises som det n�ste?",
   },
   // Button texts (should not be more than 10 characters!):
   { "Edit",
@@ -549,7 +549,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Delete",
     "L�schen",
-    "Izbrisi",
+    "Izbri�i",
     "Cancella",
     "Verwijder",
     "Apagar",
@@ -570,7 +570,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Mark",
     "Markieren",
-    "Oznaci",
+    "Ozna�i",
     "Marca",
     "Verplaats",
     "Marcar",
@@ -654,7 +654,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Rewind",
     "Anfang",
-    "Na zacetek",
+    "Na za�etek",
     "Da inizio",
     "Naar begin",
     "Rebobinar",
@@ -864,7 +864,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Eject",
     "Auswerfen",
-    "Izvrzi",
+    "Izvr�i",
     "Eject",
     "Eject",
     "Ejectar",
@@ -927,7 +927,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Overwrite",
     "�berschreiben",
-    "Prepisi",
+    "Prepi�i",
     "Sovrascrivi",
     "Overschrijven",
     "",// TODO
@@ -990,7 +990,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Scan",
     "Scan",
-    "",//TODO
+    "I��i",
     "Scansione",
     "Scan",
     "",//TODO
@@ -1012,7 +1012,7 @@ const tI18nPhrase Phrases[] = {
   // Confirmations:
   { "Delete channel?",
     "Kanal l�schen?",
-    "Izbrisi kanal?",
+    "Izbri�i kanal?",
     "Cancello il canale?",
     "Kanaal verwijderen?",
     "Apagar o canal?",
@@ -1033,7 +1033,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Delete timer?",
     "Timer l�schen?",
-    "Izbrisi termin?",
+    "Izbri�i termin?",
     "Cancello il timer?",
     "Timer verwijderen?",
     "Apagar o timer?",
@@ -1054,7 +1054,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
-    "Izbrisi posnetek?",
+    "Izbri�i posnetek?",
     "Cancello la registrazione?",
     "Opname verwijderen?",
     "Apagar a grava��o?",
@@ -1075,7 +1075,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
-    "Snemanje po terminu - zares izbrisi?",
+    "Snemanje po terminu - zares izbri�i?",
     "Timer in registrazione - cancello?",
     "Timer neemt nog op - toch verwijderen?",
     "Timer activo - t�m a certeza que quer apagar?",
@@ -1096,7 +1096,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
-    "Koncaj snemanje?",
+    "Prekini snemanje?",
     "Fermo la registrazione?",
     "Opname stoppen?",
     "Parar Grava��o?",
@@ -1138,7 +1138,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
-    "Zelite prekiniti urejanje?",
+    "�elite prekiniti urejanje?",
     "Annullo la modifica?",
     "Bewerken afbreken?",
     "Cancelar Modifica��es?",
@@ -1222,7 +1222,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
-    "Snemanje cez %d minut, zares izklopi?",
+    "Snemanje �ez %d minut, zares izklopi?",
     "Registrazione fra %d minuti - spengo comunque?",
     "Opname in %d minuten - toch uitschakelen?",
     "Em grava��o dentro de %d minutos - quer mesmo desligar?",
@@ -1265,7 +1265,7 @@ const tI18nPhrase Phrases[] = {
   // Channel parameters:
   { "Name",
     "Name",
-    "Naziv",
+    "Ime",
     "Nome",
     "Naam",
     "Nome",
@@ -1359,7 +1359,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Srate",
-    "Symbolrate",
+    "Srate",
     "Rat� simboluri",
     "Srate",
     "Srate",
@@ -1380,7 +1380,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "B����� PID",
-    "Video PID",
+    "VPID",
     "PID Video",
     "Vpid",
     "PID V�deo",
@@ -1422,7 +1422,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1",
     "Apid1",
     "Apid1",
-    "Audio PID1",
+    "APID1",
     "PID Audio (1)",
     "Apid1",
     "PID �udio (1)",
@@ -1443,7 +1443,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "Apid2",
-    "Audio PID2",
+    "APID2",
     "PID Audio (2)",
     "Apid2",
     "PID �udio (2)",
@@ -1464,7 +1464,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1",
     "Dpid1",
     "Dpid1",
-    "Dpid1",
+    "DPID1",
     "PID AC3 (1)",
     "Dpid1",
     "PID AC3 (1)",
@@ -1485,7 +1485,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2",
     "Dpid2",
     "Dpid2",
-    "Dpid2",
+    "DPID2",
     "PID AC3 (2)",
     "Dpid2",
     "PID AC3 (2)",
@@ -1506,7 +1506,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid",
     "Tpid",
     "Tpid",
-    "Teletext PID",
+    "TPID",
     "PID Teletext",
     "Tpid",
     "PID Teletext",
@@ -1580,7 +1580,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Bandwidth",
     "Bandwidth",
-    "Pasovna sirina",
+    "Pasovna �irina",
     "Bandwidth",
     "Bandwidth",
     "Bandwidth",
@@ -1685,7 +1685,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Guard",
     "Guard",
-    "Zascita",
+    "Za��ita",
     "Guard",
     "Guard",
     "Guard",
@@ -1749,7 +1749,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel",
     "Kanal",
-    "Kanal",
+    "Program",
     "Canale",
     "Kanaal",
     "Canal",
@@ -1791,7 +1791,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Start",
     "Anfang",
-    "Zacetek",
+    "Za�etek",
     "Inizio",
     "Begin",
     "Inicio",
@@ -1833,7 +1833,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "VPS",
     "VPS",
-    "",// TODO
+    "VPS",
     "VPS",
     "VPS",
     "",// TODO
@@ -1939,7 +1939,7 @@ const tI18nPhrase Phrases[] = {
   // Error messages:
   { "Channel is being used by a timer!",
     "Kanal wird von einem Timer benutzt!",
-    "Kanal uporablja termin za snemanje!",
+    "Kanal je zavzet s terminom za snemanje!",
     "Canale occupato da un timer!",
     "Kanaal wordt gebruikt door een timer!",
     "Canal a ser utilizador por um timer!",
@@ -2086,7 +2086,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
-    "Kanal ni razpolozljiv!",
+    "Kanal ni razpolo�ljiv!",
     "Canale non disponibile!",
     "Kanaal niet beschikbaar",
     "",//TODO
@@ -2096,7 +2096,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal jest niedostepny!",
     "!Canal no disponible!",
     "�� ������ ��� ����� ���������!",
-    "Kanalen ej tillg�nglig!",
+    "Kanalen �r inte tillg�nglig!",
     "Canal indisponibil",
     "A csatorna nem el�rhet�",
     "Canal no disponible!",
@@ -2149,7 +2149,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
-    "Ne morem zaceti z prenosnim nacinom",
+    "Ne morem za�eti s prenosnim na�inom",
     "Impossibile iniziare la modalita' di trasferimento!",
     "Kan Transfer-Mode niet starten",
     "Imposs�vel iniciar modo de transfer�ncia!",
@@ -2170,7 +2170,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
-    "Nobena tocka ni definirana!",
+    "Nobena prekinitvena to�ka ni definirana!",
     "Nessun marcatore di modifica definito!",
     "Geen bewerkingsmarkeringen gedefinieerd!",
     "",//TODO
@@ -2191,7 +2191,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
-    "Ne morem zaceti urejanja!",
+    "Ne morem za�eti urejanja!",
     "Impossibile iniziare processo di modifica!",
     "Kan niet beginnen met bewerken!",
     "N�o pode iniciar a modifica��o!",
@@ -2212,7 +2212,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
-    "Urejanje je ze aktivno!",
+    "Urejanje je �e aktivno!",
     "Processo di modifica gia` attivo!",
     "Bewerken is al actief!",
     "Processo de modifica��o j� activo!",
@@ -2254,7 +2254,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Low disk space!",
     "Platte beinahe voll!",
-    "Zmanjkuje prostora na disku",
+    "Premalo prostora na disku!",
     "Poco spazio su disco!",
     "Disk bijna vol!",
     "Espa�o em disco reduzido!",
@@ -2338,7 +2338,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "No audio available!",
     "Kein Audio verf�gbar!",
-    "",//TODO
+    "Zvok ni dosegljiv",
     "",//TODO
     "Geen audio beschikbaar!",
     "",//TODO
@@ -2391,7 +2391,7 @@ const tI18nPhrase Phrases[] = {
     "EPG",
     "Gu�a de Programaci�n",
     "������ ������������",
-    "Elektronisk programguide",
+    "EPG",
     "EPG",
     "EPG",
     "Guia de Programes",
@@ -2613,7 +2613,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Skin",
     "Oberfl�che",
-    "",// TODO
+    "Preobleka",
     "Superficie Skin",
     "Skin",
     "",// TODO
@@ -2634,7 +2634,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Theme",
     "Thema",
-    "",// TODO
+    "Tema",
     "Tema",
     "Thema",
     "",// TODO
@@ -2655,7 +2655,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Left",
     "Links",
-    "",// TODO
+    "Levo",
     "Sinistra",
     "Links",
     "",// TODO
@@ -2676,7 +2676,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Top",
     "Oben",
-    "",// TODO
+    "Zgoraj",
     "Cima",
     "Boven",
     "",// TODO
@@ -2697,7 +2697,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Width",
     "Breite",
-    "Sirina",
+    "�irina",
     "Larghezza OSD",
     "Breedte",
     "Largura",
@@ -2718,7 +2718,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Height",
     "H�he",
-    "Visina",
+    "Vi�ina",
     "Altezza OSD",
     "Hoogte",
     "Altura",
@@ -2739,7 +2739,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
-    "Cas sporocila (s)",
+    "�as prikaza sporo�ila (s)",
     "Tempo del messaggio (s)",
     "Weergave duur van berichten (s)",
     "Mostrar contador (s)",
@@ -2760,7 +2760,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Use small font",
     "Kleine Schrift benutzen",
-    "",// TODO
+    "Uporabi male �rke",
     "Utilizzare caratteri piccoli",
     "Klein lettertype gebruiken",
     "",// TODO
@@ -2781,7 +2781,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "never",
     "nie",
-    "",// TODO
+    "nikoli",
     "mai",
     "nooit",
     "",// TODO
@@ -2802,7 +2802,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "skin dependent",
     "je nach Oberfl�che",
-    "",// TODO
+    "odvisno od preobleke",
     "in base alla superficie",
     "skin afhankelijk",
     "",// TODO
@@ -2823,7 +2823,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "always",
     "immer",
-    "",// TODO
+    "vedno",
     "sempre",
     "altijd",
     "",// TODO
@@ -2865,7 +2865,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Channel info time (s)",
     "Anzeigedauer f�r Kanal-Info (s)",
-    "",// TODO
+    "�as prikaza podatka o programu (s)",
     "",// TODO
     "Duur tonen kanaal-informatie (s)",
     "",// TODO
@@ -2886,7 +2886,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
-    "Pokazi naziv kanala",
+    "Poka�i naziv kanala",
     "Mostra info al cambio canale",
     "Kanaal info tonen",
     "Mostrar info ao mudar de Canal",
@@ -2928,7 +2928,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Scroll wraps",
     "Rundum scrollen",
-    "",// TODO
+    "Iz konca sko�i na za�etek",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -2938,13 +2938,13 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Rulla texten",
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
     "S kraja sko�i na po�etak",
-    "",// TODO
+    "Ridade kerimine",
     "Scroll rundt",
   },
   { "Setup.OSD$Sort timers",
@@ -2991,7 +2991,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
-    "Cas do EPG pregleda (h)",
+    "�as do EPG pregleda (h)",
     "Timeout scansione aggiornamento EPG (ore)",
     "EPG-scan Timeout (h)",
     "Expirou o EPG (h)",
@@ -3033,7 +3033,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
-    "",// TODO
+    "Prika�i stare EPG podatke (min)",
     "Visualizzazione dati vecchi (min)",
     "Oude EPG data tonen (min)",
     "",// TODO
@@ -3043,7 +3043,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "Visa gammal info (min)",
+    "Visa gammal information (min)",
     "Date EPG expirate cel mult (min)",
     "",// TODO
     "",// TODO
@@ -3054,7 +3054,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
-    "Nastavi sistemski cas",
+    "Nastavi sistemski �as",
     "Settaggio orario automatico",
     "Systeem klok instellen",
     "Ajustar rel�gio do sistema",
@@ -3075,7 +3075,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
-    "Transponder za nastavitev casa",
+    "Transponder za nastavitev �asa",
     "Utilizza orario da transponder",
     "Gebruik transponder tijd voor systeem",
     "Usar rel�gio do transponder",
@@ -3096,7 +3096,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
-    "",// TODO
+    "Prednostni jeziki",
     "Lingue preferite",
     "Voorkeurstalen",
     "",// TODO
@@ -3117,7 +3117,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
-    "",// TODO
+    "Prednostni jezik",
     "Lingua preferita",
     "Voorkeurstaal",
     "",// TODO
@@ -3159,7 +3159,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.DVB$Video display format",
     "Video Anzeige-Format",
-    "",//TODO
+    "Format video prikaza",
     "",//TODO
     "Video display format",
     "",//TODO
@@ -3169,7 +3169,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "Format f�r Video display",
+    "Format f�r video display",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3264,7 +3264,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.DVB$Use Dolby Digital",
     "Dolby Digital Ton benutzen",
-    "",//TODO
+    "Uporabljaj Dolby Digital",
     "",//TODO
     "Dolby Digital gebruiken",
     "",//TODO
@@ -3285,7 +3285,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
-    "",// TODO
+    "Posodobi kanale",
     "Aggiornare i canali",
     "Kanalen actualiseren",
     "",// TODO
@@ -3306,7 +3306,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "names only",
     "nur Namen",
-    "",// TODO
+    "samo imena",
     "solo nomi",
     "alleen namen",
     "",// TODO
@@ -3327,7 +3327,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "names and PIDs",
     "Namen und PIDs",
-    "",// TODO
+    "imena in PIDe",
     "nomi e PIDs",
     "namen en PIDs",
     "",// TODO
@@ -3337,7 +3337,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "namn och PIDdar",
+    "namn och PID",
     "nume si PID-uri",
     "",// TODO
     "",// TODO
@@ -3348,7 +3348,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
-    "",// TODO
+    "dodaj nove programe",
     "aggiungere canali nuovi",
     "nieuwe kanalen toevoegen",
     "",// TODO
@@ -3369,7 +3369,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
-    "",// TODO
+    "dodaj nove oddajnike",
     "aggiungere transponder nuovi",
     "nieuwe transponders toevoegen",
     "",// TODO
@@ -3390,7 +3390,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.DVB$Audio languages",  // note the plural
     "Audio Sprachen",
-    "",//TODO
+    "Jeziki za zvok",
     "",//TODO
     "Audio talen",
     "",//TODO
@@ -3411,7 +3411,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.DVB$Audio language",  // note the singular
     "Audio Sprache",
-    "",//TODO
+    "Jezik za zvok",
     "",//TODO
     "Audio taal",
     "",//TODO
@@ -3537,7 +3537,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
-    "Premor pred zacetkom (min)",
+    "Premik za�etka snemanja (min)",
     "Margine iniziale (min)",
     "Tijd marge begin (min)",
     "Margem inicial (min)",
@@ -3558,7 +3558,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
-    "Premor za koncem (min)",
+    "Zamik konca snemanja (min)",
     "Margine finale (min)",
     "Tijd marge eind (min)",
     "Margem final (min)",
@@ -3579,7 +3579,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
-    "Osnovna meja",
+    "Primarna meja",
     "Limite primario",
     "Eerste grens",
     "Limite Prim�rio",
@@ -3600,7 +3600,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
-    "Osnovna prioriteta",
+    "Privzeta prioriteta",
     "Priorita' predefinita",
     "Standaard prioriteit",
     "Prioridade por defeito",
@@ -3621,7 +3621,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
-    "Osnovni zivljenski cas (d)",
+    "Privzeti �ivljenski �as (d)",
     "Durata predefinita (gg)",
     "Standaard levensduur (d)",
     "Validade por defeito (d)",
@@ -3663,7 +3663,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
-    "Cas pavze (d)",
+    "�as pavze (d)",
     "Durata pausa (gg)",
     "Pauze levensduur (d)",
     "",// TODO
@@ -3705,7 +3705,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
-    "",// TODO
+    "Uporabi VPS",
     "Utilizzare VPS",
     "VPS gebruiken",
     "",// TODO
@@ -3726,7 +3726,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
-    "",// TODO
+    "�asovna rezerva pri VPS (s)",
     "Margine VPS",
     "Marge VPS (s)",
     "",// TODO
@@ -3747,7 +3747,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
-    "Oznaci direktno snemanje",
+    "Ozna�i direktno snemanje",
     "Marca la registrazione",
     "Direkte opnamen markeren",
     "Marca de grava��o r�pida",
@@ -3789,7 +3789,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
-    "Cas direktnega snemanja (min)",
+    "�as direktnega snemanja (min)",
     "Tempo registrazione istantanea (min)",
     "Duur van de directe opname (min)",
     "",//TODO
@@ -3810,7 +3810,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
-    "Najvecja velikost datoteke (MB)",
+    "Najve�ja velikost datoteke (MB)",
     "Dimensione massima file video (MB)",
     "Maximale omvang video file (MB)",
     "Tamanho m�ximo dos ficheiros (MB)",
@@ -3852,7 +3852,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
-    "Rezim z vec hitrostmi",
+    "Re�im z ve� hitrostmi",
     "Modalita' multispeed",
     "Multi-speed mode",
     "Modo de multi-speed",
@@ -3873,7 +3873,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
-    "Prikazi rezim predvajanja",
+    "Prika�i re�im predvajanja",
     "Modalita' di visualizz su replay",
     "Weergave mode aangeven",
     "Mostrar modo de replay",
@@ -3883,7 +3883,7 @@ const tI18nPhrase Phrases[] = {
     "Wyswietlac status odtwarzania",
     "Mostrar modo de replay",
     "������� ���������� ������������",
-    "Visa uppspelnings l�ge",
+    "Visa uppspelningsl�ge",
     "Afi�eaz� redarea",
     "Lej�tsz�s felt�ntet�se",
     "Mostrar mode de reproducci�",
@@ -3894,7 +3894,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
-    "Predvajalni ID",
+    "ID za predvajanje",
     "ID Ripresa",
     "Hervattings ID",
     "Resume ID",// TODO
@@ -3915,7 +3915,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
-    "Najmanjsi cas dogodka (min)",
+    "Najmanj�i �as dogodka (min)",
     "Spegnimento: controllo prossimo evento (m)",
     "Minimale event time-out (min)",
     "Per�odo m�nimo de pausa (min)",
@@ -3936,7 +3936,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
-    "Najmanjsi cas neaktivnosti (min)",
+    "Najmanj�i �as neaktivnosti (min)",
     "Spegnimento: tempo minimo di inattivit� (m)",
     "Minimum gebruikers inactiviteit (min)",
     "Per�odo m�nimo de inactividade (min)",
@@ -3946,7 +3946,7 @@ const tI18nPhrase Phrases[] = {
     "Min. brak aktywnosci uzytkownika (min)",
     "Tiempo m�nimo inactividad (min)",
     "��������� ������ �������� (�����)",
-    "Minsta an�ndar-inaktivitet (min)",
+    "Minsta anv�ndar-inaktivitet (min)",
     "Durata minim� de inactivitate (min)",
     "Min. kezel�si aktivit�s (min)",
     "Temps m�nim d'inactivitat (min)",
@@ -3957,7 +3957,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
-    "SVDRP cas neaktivnosti (s)",
+    "SVDRP �as neaktivnosti (s)",
     "Timeout SVDRP (s)",
     "SVDRP Timeout (s)",
     "Timeout SVDRP (s)",
@@ -3967,7 +3967,7 @@ const tI18nPhrase Phrases[] = {
     "Min. brak aktywnosci SVDRP (s)",
     "SVDRP Timeout (s)",
     "SVDRP ������� (�)",
-    "SVDRP Timeout (d)",
+    "SVDRP Timeout (s)",
     "Timeout SVDRP (sec)",
     "SVDRP Timeout (s)",
     "SVDRP Timeout (s)",
@@ -3978,7 +3978,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
-    "",// TODO
+    "�as ugla�evanja (s)",
     "Timeout Zapping",
     "Zap timeout (s)",
     "",// TODO
@@ -4043,7 +4043,7 @@ const tI18nPhrase Phrases[] = {
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~",
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
+    " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~",
     " a�bcde��fghi�jklmnopqrstu�vwxyz0123456789-.#~",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~����������",
     "",// TODO
@@ -4065,7 +4065,7 @@ const tI18nPhrase Phrases[] = {
   // Learning keys:
   { "Learning Remote Control Keys",
     "Fernbedienungs-Codes lernen",
-    "Ucenje kod upravljalca",
+    "U�enje kod upravljalca",
     "Apprendimento tasti unita` remota",
     "Leren toetsen afstandsbediening",
     "Aprender as teclas do telecomando",
@@ -4096,7 +4096,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 1: Detekcja typu kodu",
     "Fase 1: Detectando tipo de receptor",
     "���� 1: ��������� ������ RC",
-    "Steg1: identifiering av RC kod",
+    "Steg1: identifiering av kod",
     "Faza 1: Detec�ia tipului telecomenzii",
     "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
     "Fase 1: Detectant el tipus de receptor",
@@ -4138,7 +4138,7 @@ const tI18nPhrase Phrases[] = {
     "Kod pilota zostal poznany!",
     "�C�digo detectado!",
     "������� ������� RC!",
-    "RC koden detekterad!",
+    "Koden detekterad!",
     "S-a detectat tipul telecomenzii!",
     "T�vir�ny�t� k�dja felismerve!",
     "Codi detectat!",
@@ -4170,7 +4170,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
-    "Faza 2: Ucenje posebnih kod",
+    "Faza 2: U�enje posebnih kod",
     "Fase 2: Codici specifici dei tasti",
     "Fase 2: Leren specifieke toets-codes",
     "Fase 2: A aprender c�digos especificos",
@@ -4180,7 +4180,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 2: Nauka pojedynczych klawiszy",
     "Fase 2: Aprendiendo c�digos espec�ficos",
     "���� 2: �������� ����������� ��������",
-    "Fas 2: Inl�rning av specifika knapp koder",
+    "Fas 2: Inl�rning av specifika knapp-koder",
     "Faza 2: �nv��area codurilor anumitor taste",
     "M�sodik l�p�s: az egyes gombok betan�t�sa",
     "Fase 2: Aprenentantge de les funcions",
@@ -4285,7 +4285,7 @@ const tI18nPhrase Phrases[] = {
     "(Nacisnac 'Dol' by zakonczyc)",
     "(Pulse 'Abajo' para terminar programaci�n teclas)",
     "(����� '����' ��� ���������� �������� ��������)",
-    "(Tryck 'Ner' f�r att avsluta knapp definition)",
+    "(Tryck 'Ner' f�r att avsluta inl�rningen)",
     "(Ap�sa�i 'Jos' pentru terminare)",
     "('Le' megnyom�sa a befejez�shez)",
     "(Premeu 'Avall' per finalitzar l'aprenentatge)",
@@ -4306,7 +4306,7 @@ const tI18nPhrase Phrases[] = {
     "(Nacisnac 'Menu' by ominac klawisz)",
     "Pulse 'Menu' para saltarse esta tecla",
     "���� '�����' ��� ���������� ����� ��� ��������",
-    "Tryck 'Meny' f�r att hoppa �ver denna knapp.",
+    "(Tryck 'Meny' f�r att hoppa �ver knappen.)",
     "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�",
     "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
     "Premeu 'Men�' per obviar aquesta tecla",
@@ -4348,7 +4348,7 @@ const tI18nPhrase Phrases[] = {
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guardar, 'Abajo' para anular",
     "'����' ����������, '����' �������",
-    "Tryck 'Upp' f�r att spara, 'Ner' f�r att avsluta",
+    "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta.",
     "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
     "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
@@ -4507,7 +4507,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Red",
     "Rot",
-    "Rdeca",
+    "Rde�a",
     "Rosso",
     "Rood",
     "Vermelho",
@@ -4738,7 +4738,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel+",
     "Kanal+",
-    "Kanal+",
+    "Program+",
     "Canale +",
     "Kanaal+",
     "",// TODO
@@ -4759,7 +4759,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Channel-",
     "Kanal-",
-    "Kanal-",
+    "Program-",
     "Canale -",
     "Kanaal-",
     "",// TODO
@@ -4843,7 +4843,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Audio",
     "Audio",
-    "",// TODO
+    "Zvok",
     "",// TODO
     "Audio",
     "",// TODO
@@ -5054,7 +5054,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
-    "Skoci: ",
+    "Sko�i: ",
     "Vai a: ",
     "Springen: ",
     "Saltar: ",
@@ -5096,7 +5096,7 @@ const tI18nPhrase Phrases[] = {
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
-    " Prekini ponavljanje",
+    " Prekini predvajanje",
     " Interrompi riproduzione",
     " Stop afspelen",
     " Parar reprodu��o",
@@ -5159,7 +5159,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
-    "Preklapljanje primarne naprave...",
+    "Preklapljanje primarne DVB naprave...",
     "Cambio su card DVB primaria...",
     "Eerste DVB-kaart wordt omgeschakeld...",
     "A mudar interface DVB prim�rio...",
@@ -5190,7 +5190,7 @@ const tI18nPhrase Phrases[] = {
     "Gora/Dol na nowa pozycje - Ok zmienia",
     "Arriba/Abajo para el nuevo lugar - OK para mover",
     "����/���� ��� ��� ����. ���� ��",
-    "Upp/Ner f�r ny plats - OK f�r att flytta",
+    "Upp/Ner f�r nya platsen - d�refter OK f�r att flytta",
     "Sus/Jos pentru noua loca�ie - OK pentru a muta",
     "Fel/Le egy uj opci��rt - azt�n OK",
     "Amunt/Avall per una nova localitzaci� - OK per moure",
@@ -5201,7 +5201,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Editing process started",
     "Schnitt gestartet",
-    "Urejanje se je zacelo",
+    "Urejanje se je za�elo",
     "Processo di modifica iniziato",
     "Bewerken is gestart",
     "Processo de modifica��o iniciado",
@@ -5211,7 +5211,7 @@ const tI18nPhrase Phrases[] = {
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
     "���� ������������",
-    "Redigering startad",
+    "Redigeringen startar",
     "Montajul �nregistr�rii a �nceput",
     "V�g�s elind�tva",
     "Proc�s d'edici� iniciat",
@@ -5222,7 +5222,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Editing process finished",
     "Schnitt beendet",
-    "Proces urejanja je koncan",
+    "Proces urejanja je kon�an",
     "Processo di modifica terminato",
     "Bewerken is klaar",
     "Processo de modifica��o terminado",
@@ -5243,7 +5243,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
-    "Napaka pri procesu urejenja!",
+    "Napaka pri procesu urejanja!",
     "Processo di modifica fallito!",
     "Bewerken is mislukt!",
     "Falha no processo de modifica��o",
@@ -5285,7 +5285,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
-    "Ustavljanje predvajanja v zivo...",
+    "Ustavljanje predvajanja v �ivo...",
     "Pausa del canale in visione...",
     "Pauzeren live uitzending...",
     "",// TODO
@@ -5306,7 +5306,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Starting EPG scan",
     "Beginne mit EPG-Scan",
-    "",// TODO
+    "Pri�enjam EPG-scan",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5316,7 +5316,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "P�b�rjar EPG skanning",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5348,7 +5348,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Classic VDR",
     "Klassischer VDR",
-    "",// TODO
+    "Klasi�ni VDR",
     "VDR Classico",
     "VDR Klassiek",
     "",// TODO
@@ -5369,7 +5369,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "ST:TNG Panels",
     "ST:TNG Konsolen",
-    "",// TODO
+    "ST:TNG Konsola",
     "Consolles ST:TNG",
     "ST:TNG Consoles",
     "",// TODO
@@ -5379,7 +5379,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "ST:TNG konsol",
+    "ST:TNG konsoll",
     "Cons. ST:TNG",
     "",// TODO
     "",// TODO
@@ -5390,7 +5390,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "No title",
     "Kein Titel",
-    "",// TODO
+    "Brez naziva",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5400,7 +5400,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ingen titel",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5500,7 +5500,7 @@ const char * const * I18nCharSets(void)
   return &Phrases[1][0];
 }
 
-const char * I18nLanguageCode(int Index)
+const char *I18nLanguageCode(int Index)
 {
   return 0 <= Index && Index < I18nNumLanguages ? Phrases[2][Index] : NULL;
 }
@@ -5508,8 +5508,17 @@ const char * I18nLanguageCode(int Index)
 int I18nLanguageIndex(const char *Code)
 {
   for (int i = 0; i < I18nNumLanguages; i++) {
-      if (strcasestr(Phrases[2][i], Code))
-         return i;
+      const char *s = Phrases[2][i];
+      while (*s) {
+            int l = 0;
+            for ( ; l < 3 && Code[l]; l++) {
+                if (s[l] != tolower(Code[l]))
+                   break;
+                }
+            if (l == 3)
+               return i;
+            s++;
+            }
       }
   //dsyslog("unknown language code: '%s'", Code);
   return -1;
@@ -5527,22 +5536,35 @@ const char *I18nNormalizeLanguageCode(const char *Code)
   return n >= 0 ? I18nLanguageCode(n) : Code;
 }
 
-bool I18nIsPreferredLanguage(int *PreferredLanguages, int LanguageIndex, int &OldPreference)
+bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position)
 {
-  for (int i = 0; i < I18nNumLanguages; i++) {
-      if (PreferredLanguages[i] < 0)
-         break; // the language is not a preferred one
-      if (PreferredLanguages[i] == LanguageIndex) {
-         if (OldPreference < 0 || i < OldPreference) {
-            OldPreference = i;
-            return true;
+  int pos = 1;
+  bool found = false;
+  while (LanguageCode) {
+        int LanguageIndex = I18nLanguageIndex(LanguageCode);
+        for (int i = 0; i < I18nNumLanguages; i++) {
+            if (PreferredLanguages[i] < 0)
+               break; // the language is not a preferred one
+            if (PreferredLanguages[i] == LanguageIndex) {
+               if (OldPreference < 0 || i < OldPreference) {
+                  OldPreference = i;
+                  if (Position)
+                     *Position = pos;
+                  found = true;
+                  break;
+                  }
+               }
             }
-         break;
-         }
-      }
+        if ((LanguageCode = strchr(LanguageCode, '+')) != NULL) {
+           LanguageCode++;
+           pos++;
+           }
+        else if (pos == 1 && Position)
+           *Position = 0;
+        }
   if (OldPreference < 0) {
      OldPreference = I18nNumLanguages; // higher than the maximum possible value
      return true; // if we don't find a preferred one, we take the first one
      }
-  return false;
+  return found;
 }
diff --git a/i18n.h b/i18n.h
index 719844500..a17951462 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.14 2004/11/02 17:21:19 kls Exp $
+ * $Id: i18n.h 1.16 2005/09/09 14:50:35 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -22,10 +22,22 @@ const char *I18nTranslate(const char *s, const char *Plugin = NULL);
 
 const char * const * I18nLanguages(void);
 const char * const * I18nCharSets(void);
-const char * I18nLanguageCode(int Index);
+const char *I18nLanguageCode(int Index);
 int I18nLanguageIndex(const char *Code);
 const char *I18nNormalizeLanguageCode(const char *Code);
-bool I18nIsPreferredLanguage(int *PreferredLanguages, int LanguageIndex, int &OldPreference);
+   ///< Returns a 3 letter language code that may not be zero terminated.
+   ///< If no normalized language code can be found, the given Code is returned.
+   ///< Make sure at most 3 characters are copied when using it!
+bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position = NULL);
+   ///< Checks the given LanguageCode (which may be something like "eng" or "eng+deu")
+   ///< against the PreferredLanguages and returns true if one is found that has an index
+   ///< smaller than OldPreference (which should be initialized to -1 before the first
+   ///< call to this function in a sequence of checks). If LanguageCode is not any of
+   ///< the PreferredLanguages, and OldPreference is less than zero, OldPreference will
+   ///< be set to a value higher than the highest language index.  If Position is given,
+   ///< it will return 0 if this was a single language code (like "eng"), 1 if it was
+   ///< the first of two language codes (like "eng" out of "eng+deu") and 2 if it was
+   ///< the second one (like "deu" out of ""eng+deu").
 
 #ifdef PLUGIN_NAME_I18N
 #define tr(s)  I18nTranslate(s, PLUGIN_NAME_I18N)
diff --git a/interface.c b/interface.c
index 337374338..4f18ddda4 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.68 2004/11/01 14:23:28 kls Exp $
+ * $Id: interface.c 1.69 2005/09/03 09:07:23 kls Exp $
  */
 
 #include "interface.h"
@@ -56,7 +56,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
   time_t timeout = time(NULL) + Seconds;
   for (;;) {
       Key = GetKey();
-      if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout || interrupted)
+      if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted)
          break;
       }
   if (KeepChar && ISRAWKEY(Key))
diff --git a/keys.c b/keys.c
index 8a8a104e1..8d1c607d5 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.7 2004/12/27 11:08:34 kls Exp $
+ * $Id: keys.c 1.8 2005/09/03 11:28:34 kls Exp $
  */
 
 #include "keys.h"
@@ -210,7 +210,6 @@ bool cKeyMacro::Parse(char *s)
                  }
               macro[n++] = k_Plugin;
               if (n < MAXKEYSINMACRO) {
-                 macro[n] = kOk;
                  plugin = strdup(p + 1);
                  if (!cPluginManager::GetPlugin(plugin)) {
                     esyslog("ERROR: unknown plugin '%s'", plugin);
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 207b7c25b..cc3a01692 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.14 2004/10/16 09:51:05 kls Exp $
+ *   $Id: descriptor.c 1.15 2005/09/03 15:16:49 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -655,14 +655,32 @@ LinkageType LinkageDescriptor::getLinkageType() const {
 }
 
 void ISO639LanguageDescriptor::Parse() {
-   unsigned int offset=0;
-   data.setPointerAndOffset<const descr_iso_639_language>(s, offset);
+   languageLoop.setData(data+sizeof(descr_iso_639_language), getLength()-sizeof(descr_iso_639_language));
+   
+   //all this is for backwards compatibility only
+   Loop::Iterator it;
+   Language first;
+   if (languageLoop.getNext(first, it)) {
+      languageCode[0]=first.languageCode[0];
+      languageCode[1]=first.languageCode[1];
+      languageCode[2]=first.languageCode[2];
+      languageCode[3]=0;
+   } else
+      languageCode[0]=0;
+}
+
+void ISO639LanguageDescriptor::Language::Parse() {
+   s=data.getData<const descr_iso_639_language_loop>();
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
    languageCode[2]=s->lang_code3;
    languageCode[3]=0;
 }
 
+AudioType ISO639LanguageDescriptor::Language::getAudioType() {
+   return (AudioType)s->audio_type;
+}
+
 void PDCDescriptor::Parse() {
    unsigned int offset=0;
    data.setPointerAndOffset<const descr_pdc>(s, offset);
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 73fd10594..476da3fbf 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.12 2005/05/08 14:08:19 kls Exp $
+ *   $Id: descriptor.h 1.13 2005/09/03 15:17:35 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -392,7 +392,18 @@ class LinkageDescriptor : public Descriptor {
 
 class ISO639LanguageDescriptor : public Descriptor {
 public:
-   char languageCode[4];
+   char languageCode[4]; //for backwards compatibility
+   class Language : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(descr_iso_639_language_loop); }
+      char languageCode[4];
+      AudioType getAudioType();
+   protected:
+      virtual void Parse();
+   private:
+      const descr_iso_639_language_loop *s;
+   };
+   StructureLoop<Language> languageLoop;
 protected:
    virtual void Parse();
 private:
diff --git a/libsi/headers.h b/libsi/headers.h
index ff3e0f95e..69350cdd7 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.4 2004/02/22 11:12:46 kls Exp $
+ *   $Id: headers.h 1.5 2005/09/03 15:18:16 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -821,9 +821,13 @@ struct descr_ca {
 struct descr_iso_639_language {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
+};
+
+struct descr_iso_639_language_loop {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
+   u_char audio_type                             :8;
 };
 
 /* 0x13 carousel_identifier_descriptor */
diff --git a/libsi/si.h b/libsi/si.h
index 8f89c3432..3836b2fb7 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.11 2004/10/16 09:58:10 kls Exp $
+ *   $Id: si.h 1.12 2005/09/03 15:19:00 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -166,6 +166,12 @@ enum LinkageType { LinkageTypeInformationService = 0x01,
                    LinkageTypeTSContainingSsuBatOrNit = 0x0A
                  };
 
+enum AudioType { AudioTypeUndefined = 0x00,
+                 AudioTypeCleanEffects = 0x01,
+                 AudioTypeHearingImpaired = 0x02,
+                 AudioTypeVisualImpairedCommentary = 0x03
+               };
+
 /* Some principles:
    - Objects that return references to other objects contained in their data must make sure
      that the returned objects have been parsed.
diff --git a/lirc.c b/lirc.c
index 2eee9cc0d..ac9de010f 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.12 2005/08/15 12:28:10 kls Exp $
+ * $Id: lirc.c 1.13 2005/09/02 12:51:35 kls Exp $
  */
 
 #include "lirc.h"
@@ -76,7 +76,10 @@ void cLircRemote::Action(void)
         if (ready && ret > 21) {
            int count;
            char KeyName[LIRC_KEY_BUF];
-           sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
+           if (sscanf(buf, "%*x %x %29s", &count, KeyName) != 2) { // '29' in '%29s' is LIRC_KEY_BUF-1!
+              esyslog("ERROR: unparseable lirc command: %s", buf);
+              continue;
+              }
            if (count == 0) {
               if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < KEYPRESSDELAY)
                  continue; // skip keys coming in too fast
diff --git a/menu.c b/menu.c
index 1e5147497..9709212d6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.357 2005/08/27 09:37:23 kls Exp $
+ * $Id: menu.c 1.359 2005/09/03 11:42:27 kls Exp $
  */
 
 #include "menu.h"
@@ -29,7 +29,6 @@
 #include "transfer.h"
 #include "videodir.h"
 
-#define MENUTIMEOUT     120 // seconds
 #define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
 
@@ -1300,7 +1299,6 @@ cMenuCam::cMenuCam(cCiMenu *CiMenu)
   Add(new cOsdItem(ciMenu->BottomText()));
   Display();
   dsyslog("CAM: Menu - %s", ciMenu->TitleText());
-  lastActivity = time(NULL);
 }
 
 cMenuCam::~cMenuCam()
@@ -1329,10 +1327,6 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
        default: break;
        }
      }
-  if (Key != kNone)
-     lastActivity = time(NULL);
-  else if (time(NULL) - lastActivity > MENUTIMEOUT)
-     state = osEnd;
   return state;
 }
 
@@ -1350,7 +1344,6 @@ cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
   SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
   Add(new cMenuEditNumItem("Input", input, Length, ciEnquiry->Blind()));
   Display();
-  lastActivity = time(NULL);
 }
 
 cMenuCamEnquiry::~cMenuCamEnquiry()
@@ -1379,10 +1372,6 @@ eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
        default: break;
        }
      }
-  if (Key != kNone)
-     lastActivity = time(NULL);
-  else if (time(NULL) - lastActivity > MENUTIMEOUT)
-     state = osEnd;
   return state;
 }
 
@@ -2402,11 +2391,11 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 
 cOsdObject *cMenuMain::pluginOsdObject = NULL;
 
-cMenuMain::cMenuMain(bool Replaying, eOSState State, const char *Plugin)
+cMenuMain::cMenuMain(bool Replaying, eOSState State)
 :cOsdMenu("")
 {
   replaying = Replaying;
-  Set(Plugin);
+  Set();
 
   // Initial submenus:
 
@@ -2417,7 +2406,6 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State, const char *Plugin)
     case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
     case osSetup:      AddSubMenu(new cMenuSetup); break;
     case osCommands:   AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
-    case osPlugin:     break; // the actual work is done in Set()
     default: break;
     }
 }
@@ -2429,7 +2417,7 @@ cOsdObject *cMenuMain::PluginOsdObject(void)
   return o;
 }
 
-void cMenuMain::Set(const char *Plugin)
+void cMenuMain::Set(void)
 {
   Clear();
   //XXX //SetTitle("VDR"); // this is done below, including disk usage
@@ -2463,7 +2451,7 @@ void cMenuMain::Set(const char *Plugin)
       if (p) {
          const char *item = p->MainMenuEntry();
          if (item)
-            Add(new cMenuPluginItem(hk(item), i), Plugin && strcmp(Plugin, p->Name()) == 0);
+            Add(new cMenuPluginItem(hk(item), i));
          }
       else
          break;
@@ -2506,7 +2494,6 @@ void cMenuMain::Set(const char *Plugin)
 
   SetHelp(!replaying ? tr("Record") : NULL, tr("Audio"), replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
   Display();
-  lastActivity = time(NULL);
 }
 
 eOSState cMenuMain::ProcessKey(eKeys Key)
@@ -2579,15 +2566,12 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                }
     }
   if (Key != kNone) {
-     lastActivity = time(NULL);
      if (Setup.OSDLanguage != osdLanguage) {
         Set();
         if (!HasSubMenu())
            Display();
         }
      }
-  else if (time(NULL) - lastActivity > MENUTIMEOUT)
-     state = osEnd;
   return state;
 }
 
diff --git a/menu.h b/menu.h
index f32781133..9d0ecbd96 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.71 2005/08/27 09:37:33 kls Exp $
+ * $Id: menu.h 1.73 2005/09/03 11:41:41 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -55,12 +55,11 @@ class cMenuEvent : public cOsdMenu {
 
 class cMenuMain : public cOsdMenu {
 private:
-  time_t lastActivity;
   bool replaying;
   static cOsdObject *pluginOsdObject;
-  void Set(const char *Plugin = NULL);
+  void Set(void);
 public:
-  cMenuMain(bool Replaying, eOSState State = osUnknown, const char *Plugin = NULL);
+  cMenuMain(bool Replaying, eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
   static cOsdObject *PluginOsdObject(void);
   };
@@ -120,7 +119,6 @@ class cDisplayTracks : public cOsdObject {
 class cMenuCam : public cOsdMenu {
 private:
   cCiMenu *ciMenu;
-  time_t lastActivity;
   bool selected;
   eOSState Select(void);
 public:
@@ -132,7 +130,6 @@ class cMenuCam : public cOsdMenu {
 class cMenuCamEnquiry : public cOsdMenu {
 private:
   cCiEnquiry *ciEnquiry;
-  time_t lastActivity;
   char *input;
   bool replied;
   eOSState Reply(void);
diff --git a/pat.c b/pat.c
index e6b48cc11..83031db49 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.13 2005/08/06 12:23:51 kls Exp $
+ * $Id: pat.c 1.14 2005/09/04 14:32:39 kls Exp $
  */
 
 #include "pat.h"
@@ -326,8 +326,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
         int Dpids[MAXDPIDS + 1] = { 0 };
-        char ALangs[MAXAPIDS][4] = { "" };
-        char DLangs[MAXDPIDS][4] = { "" };
+        char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
+        char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
@@ -347,10 +347,19 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                              switch (d->getDescriptorTag()) {
                                case SI::ISO639LanguageDescriptorTag: {
                                     SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                    if (*ld->languageCode != '-') { // some use "---" to indicate "none"
-                                       strn0cpy(ALangs[NumApids], I18nNormalizeLanguageCode(ld->languageCode), 4);
-                                       ALangs[NumApids][4] = 0;
-                                       }
+                                    SI::ISO639LanguageDescriptor::Language l;
+                                    char *s = ALangs[NumApids];
+                                    int n = 0;
+                                    for (SI::Loop::Iterator it; ld->languageLoop.getNext(l, it); ) {
+                                        if (*ld->languageCode != '-') { // some use "---" to indicate "none"
+                                           if (n > 0)
+                                              *s++ = '+';
+                                           strn0cpy(s, I18nNormalizeLanguageCode(l.languageCode), MAXLANGCODE1);
+                                           s += strlen(s);
+                                           if (n++ > 1)
+                                              break;
+                                           }
+                                        }
                                     }
                                     break;
                                default: ;
@@ -366,7 +375,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               //XXX case 8: // STREAMTYPE_13818_DSMCC
                       {
                       int dpid = 0;
-                      char lang[4] = { 0 };
+                      char lang[MAXLANGCODE1] = { 0 };
                       SI::Descriptor *d;
                       for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                           switch (d->getDescriptorTag()) {
@@ -378,7 +387,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                  break;
                             case SI::ISO639LanguageDescriptorTag: {
                                  SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), 4);
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
                                  }
                                  break;
                             default: ;
@@ -388,7 +397,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       if (dpid) {
                          if (NumDpids < MAXDPIDS) {
                             Dpids[NumDpids] = dpid;
-                            strn0cpy(DLangs[NumDpids], lang, 4);
+                            strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
                             NumDpids++;
                             }
                          }
diff --git a/recording.c b/recording.c
index f9c424cd1..3640a8e92 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.111 2005/08/13 14:00:48 kls Exp $
+ * $Id: recording.c 1.113 2005/09/10 12:36:48 kls Exp $
  */
 
 #include "recording.h"
@@ -36,15 +36,8 @@
 #define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
 */
-// start of implementation for brain dead systems
 #define DATAFORMAT   "%4d-%02d-%02d.%02d%*c%02d.%02d.%02d" RECEXT
-#ifdef VFAT
-#define nameFORMAT   "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
-#else
-#define nameFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
-#endif
-#define NAMEFORMAT   "%s/%s/" nameFORMAT
-// end of implementation for brain dead systems
+#define NAMEFORMAT   "%s/%s/" "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
 
 #define RESUMEFILESUFFIX  "/resume%s%s.vdr"
 #ifdef SUMMARYFALLBACK
@@ -65,6 +58,8 @@
 
 #define MAX_SUBTITLE_LENGTH  40
 
+bool VfatFileSystem = false;
+
 void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
@@ -297,79 +292,80 @@ static char *ExchangeChars(char *s, bool ToFileSystem)
 {
   char *p = s;
   while (*p) {
-#ifdef VFAT
-        // The VFAT file system can't handle all characters, so we
-        // have to take extra efforts to encode/decode them:
-        if (ToFileSystem) {
-           switch (*p) {
-                  // characters that can be used "as is":
-                  case '!':
-                  case '@':
-                  case '$':
-                  case '%':
-                  case '&':
-                  case '(':
-                  case ')':
-                  case '+':
-                  case ',':
-                  case '-':
-                  case ';':
-                  case '=':
-                  case '0' ... '9':
-                  case 'a' ... 'z':
-                  case 'A' ... 'Z':
-                  case '�': case '�':
-                  case '�': case '�':
-                  case '�': case '�':
-                  case '�':
-                       break;
-                  // characters that can be mapped to other characters:
-                  case ' ': *p = '_'; break;
-                  case '~': *p = '/'; break;
-                  // characters that have to be encoded:
-                  default:
-                    if (*p != '.' || !*(p + 1) || *(p + 1) == '~') { // Windows can't handle '.' at the end of directory names
-                       int l = p - s;
-                       s = (char *)realloc(s, strlen(s) + 10);
-                       p = s + l;
-                       char buf[4];
-                       sprintf(buf, "#%02X", (unsigned char)*p);
-                       memmove(p + 2, p, strlen(p) + 1);
-                       strncpy(p, buf, 3);
-                       p += 2;
-                       }
-                  }
+        if (VfatFileSystem) {
+           // The VFAT file system can't handle all characters, so we
+           // have to take extra efforts to encode/decode them:
+           if (ToFileSystem) {
+              switch (*p) {
+                     // characters that can be used "as is":
+                     case '!':
+                     case '@':
+                     case '$':
+                     case '%':
+                     case '&':
+                     case '(':
+                     case ')':
+                     case '+':
+                     case ',':
+                     case '-':
+                     case ';':
+                     case '=':
+                     case '0' ... '9':
+                     case 'a' ... 'z':
+                     case 'A' ... 'Z':
+                     case '�': case '�':
+                     case '�': case '�':
+                     case '�': case '�':
+                     case '�':
+                          break;
+                     // characters that can be mapped to other characters:
+                     case ' ': *p = '_'; break;
+                     case '~': *p = '/'; break;
+                     // characters that have to be encoded:
+                     default:
+                       if (*p != '.' || !*(p + 1) || *(p + 1) == '~') { // Windows can't handle '.' at the end of directory names
+                          int l = p - s;
+                          s = (char *)realloc(s, strlen(s) + 10);
+                          p = s + l;
+                          char buf[4];
+                          sprintf(buf, "#%02X", (unsigned char)*p);
+                          memmove(p + 2, p, strlen(p) + 1);
+                          strncpy(p, buf, 3);
+                          p += 2;
+                          }
+                     }
+              }
+           else {
+              switch (*p) {
+                // mapped characters:
+                case '_': *p = ' '; break;
+                case '/': *p = '~'; break;
+                // encodes characters:
+                case '#': {
+                     if (strlen(p) > 2) {
+                        char buf[3];
+                        sprintf(buf, "%c%c", *(p + 1), *(p + 2));
+                        unsigned char c = strtol(buf, NULL, 16);
+                        *p = c;
+                        memmove(p + 1, p + 3, strlen(p) - 2);
+                        }
+                     }
+                     break;
+                // backwards compatibility:
+                case '\x01': *p = '\''; break;
+                case '\x02': *p = '/';  break;
+                case '\x03': *p = ':';  break;
+                }
+              }
            }
         else {
-           switch (*p) {
-             // mapped characters:
-             case '_': *p = ' '; break;
-             case '/': *p = '~'; break;
-             // encodes characters:
-             case '#': {
-                  if (strlen(p) > 2) {
-                     char buf[3];
-                     sprintf(buf, "%c%c", *(p + 1), *(p + 2));
-                     unsigned char c = strtol(buf, NULL, 16);
-                     *p = c;
-                     memmove(p + 1, p + 3, strlen(p) - 2);
-                     }
-                  }
+           for (struct tCharExchange *ce = CharExchange; ce->a && ce->b; ce++) {
+               if (*p == (ToFileSystem ? ce->a : ce->b)) {
+                  *p = ToFileSystem ? ce->b : ce->a;
                   break;
-             // backwards compatibility:
-             case '\x01': *p = '\''; break;
-             case '\x02': *p = '/';  break;
-             case '\x03': *p = ':';  break;
-             }
-           }
-#else
-        for (struct tCharExchange *ce = CharExchange; ce->a && ce->b; ce++) {
-            if (*p == (ToFileSystem ? ce->a : ce->b)) {
-               *p = ToFileSystem ? ce->b : ce->a;
-               break;
+                  }
                }
-            }
-#endif
+           }
         p++;
         }
   return s;
@@ -500,6 +496,20 @@ cRecording::cRecording(const char *FileName)
               data[2] = data[1];
               data[1] = NULL;
               }
+           else if (line == 2) {
+              // if line 1 is too long, it can't be the short text,
+              // so assume the short text is missing and concatenate
+              // line 1 and line 2 to be the long text:
+              int len = strlen(data[1]);
+              if (len > 80) { 
+                 data[1] = (char *)realloc(data[1], len + 1 + strlen(data[2]) + 1);
+                 strcat(data[1], "\n");
+                 strcat(data[1], data[2]);
+                 free(data[2]);
+                 data[2] = data[1];
+                 data[1] = NULL;
+                 }
+              }
            info->SetData(data[0], data[1], data[2]);
            for (int i = 0; i < 3; i ++)
                free(data[i]);
diff --git a/recording.h b/recording.h
index 05c34e28c..567c6c41a 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.39 2005/08/13 14:09:50 kls Exp $
+ * $Id: recording.h 1.40 2005/09/03 13:04:41 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -18,6 +18,8 @@
 #include "timers.h"
 #include "tools.h"
 
+extern bool VfatFileSystem;
+
 void RemoveDeletedRecordings(void);
 void AssertFreeDiskSpace(int Priority = 0);
      ///< The special Priority value -1 means that we shall get rid of any
diff --git a/remote.c b/remote.c
index 325c3a217..a5f8ff94c 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.44 2005/08/14 10:53:55 kls Exp $
+ * $Id: remote.c 1.45 2005/09/03 12:29:48 kls Exp $
  */
 
 #include "remote.h"
@@ -143,6 +143,12 @@ bool cRemote::Put(const char *Code, bool Repeat, bool Release)
   return false;
 }
 
+void cRemote::CallPlugin(const char *Plugin)
+{
+  plugin = Plugin;
+  Put(k_Plugin);
+}
+
 bool cRemote::HasKeys(void)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/remote.h b/remote.h
index 995aa6cd9..f7917baaf 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.30 2005/08/13 11:28:10 kls Exp $
+ * $Id: remote.h 1.31 2005/09/03 12:28:42 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -44,6 +44,10 @@ class cRemote : public cListObject {
   static void Clear(void);
   static bool Put(eKeys Key, bool AtFront = false);
   static bool PutMacro(eKeys Key);
+  static void CallPlugin(const char *Plugin);
+      ///< Initiates calling the given plugin's main menu function.
+      ///< The Plugin parameter is the name of the plugin, and must be
+      ///< a static string.
   static const char *GetPlugin(void) { return plugin; }
   static bool HasKeys(void);
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
diff --git a/remux.c b/remux.c
index 102805016..e9997a5cf 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.42 2005/08/28 11:46:44 kls Exp $
+ * $Id: remux.c 1.47 2005/09/11 13:26:50 kls Exp $
  */
 
 #include "remux.h"
@@ -98,7 +98,7 @@ class cRepacker {
   static int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded);
   cRepacker(void) { initiallySyncing = true; maxPacketSize = 6 + 65535; subStreamId = 0; }
   virtual ~cRepacker() {}
-  virtual void Reset(void) { /* initiallySyncing = true; */ }
+  virtual void Reset(void) { initiallySyncing = true; }
   virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
   virtual int BreakAt(const uchar *Data, int Count) = 0;
   virtual int QuerySnoopSize(void) { return 0; }
@@ -142,7 +142,7 @@ void cCommonRepacker::Reset(void)
 {
   cRepacker::Reset();
   skippedBytes = 0;
-  packetTodo = maxPacketSize - 6 - 3;
+  packetTodo = 0;
   fragmentLen = 0;
   pesHeaderLen = 0;
   pesHeaderBackupLen = 0;
@@ -161,8 +161,10 @@ bool cCommonRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int PesPayloadOffset = 0;
      if (AnalyzePesHeader(fragmentData, fragmentLen, PesPayloadOffset) <= phInvalid)
         esyslog("cCommonRepacker: invalid PES packet encountered in fragment buffer!");
-     else if (6 + PacketLen <= PesPayloadOffset)
+     else if (6 + PacketLen <= PesPayloadOffset) {
+        fragmentLen = 0;
         return true; // skip empty packet
+        }
      // amount of data to put into result buffer: a negative Count value means
      // to strip off any partially contained start code.
      int Bite = fragmentLen + (Count >= 0 ? 0 : Count);
@@ -180,8 +182,10 @@ bool cCommonRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      int PesPayloadOffset = 0;
      if (AnalyzePesHeader(pesHeader, pesHeaderLen, PesPayloadOffset) <= phInvalid)
         esyslog("cCommonRepacker: invalid PES packet encountered in header buffer!");
-     else if (6 + PacketLen <= PesPayloadOffset)
+     else if (6 + PacketLen <= PesPayloadOffset) {
+        pesHeaderLen = 0;
         return true; // skip empty packet
+        }
      // amount of data to put into result buffer: a negative Count value means
      // to strip off any partially contained start code.
      int Bite = pesHeaderLen + (Count >= 0 ? 0 : Count);
@@ -361,7 +365,7 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
         done++;
         todo--;
         // do we have to start a new packet as there is no more space left?
-        if (--packetTodo <= 0) {
+        if (state != syncing && --packetTodo <= 0) {
            // we connot start a new packet here if the current might end in a start
            // code and this start code shall possibly be put in the next packet. So
            // overfill the current packet until we can safely detect that we won't
@@ -468,6 +472,9 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
 
 int cVideoRepacker::BreakAt(const uchar *Data, int Count)
 {
+  if (initiallySyncing)
+     return -1; // fill the packet buffer completely until we have synced once
+
   int PesPayloadOffset = 0;
 
   if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= phInvalid)
@@ -513,31 +520,31 @@ class cAudioRepacker : public cCommonRepacker {
     } state;
   int frameTodo;
   int frameSize;
+  int cid;
   static bool IsValidAudioHeader(uint32_t Header, bool Mpeg2, int *FrameSize = NULL);
 public:
-  cAudioRepacker(void);
+  cAudioRepacker(int Cid);
   virtual void Reset(void);
   virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
   virtual int BreakAt(const uchar *Data, int Count);
   };
 
 int cAudioRepacker::bitRates[2][3][16] = { // all values are specified as kbits/s
-  // MPEG 1, Layer I
-  0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1,
-  // MPEG 1, Layer II
-  0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, -1,
-  // MPEG 1, Layer III
-  0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, -1,
-  // MPEG 2, Layer I
-  0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1,
-  // MPEG 2, Layer II/III
-  0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1,
-  // MPEG 2, Layer II/III
-  0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1
+  {
+    { 0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 }, // MPEG 1, Layer I
+    { 0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, -1 }, // MPEG 1, Layer II
+    { 0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, -1 }  // MPEG 1, Layer III
+  },
+  {
+    { 0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1 }, // MPEG 2, Layer I
+    { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1 }, // MPEG 2, Layer II/III
+    { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1 }  // MPEG 2, Layer II/III
+  }
   };
 
-cAudioRepacker::cAudioRepacker(void)
+cAudioRepacker::cAudioRepacker(int Cid)
 {
+  cid = Cid;
   Reset();
 }
 
@@ -589,17 +596,13 @@ bool cAudioRepacker::IsValidAudioHeader(uint32_t Header, bool Mpeg2, int *FrameS
         *FrameSize = 0;
      else {
         static int samplingFrequencies[2][4] = { // all values are specified in Hz
-          // MPEG 1
-          44100, 48000, 32000, -1,
-          // MPEG 2
-          22050, 24000, 16000, -1
+          { 44100, 48000, 32000, -1 }, // MPEG 1
+          { 22050, 24000, 16000, -1 }  // MPEG 2
           };
 
         static int slots_per_frame[2][3] = {
-          // MPEG 1, Layer I, II, III
-          12, 144, 144,
-          // MPEG 2, Layer I, II, III
-          12, 144,  72
+          { 12, 144, 144 }, // MPEG 1, Layer I, II, III
+          { 12, 144,  72 }  // MPEG 2, Layer I, II, III
           };
 
         int mpegIndex = 1 - id;
@@ -652,21 +655,11 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
         // collect number of skipped bytes while syncing
         if (state <= syncing)
            skippedBytes++;
-        else if (frameTodo > 0) {
-           frameTodo--;
-           if (frameTodo == 0 && state == scanFrame) {
-              // the current audio frame is is done now. So push out the packet to
-              // start a new packet for the next audio frame.
-              PushOutPacket(ResultBuffer, payload, data - payload);
-              // go on with syncing to the next audio frame
-              state = syncing;
-              }
-           }
         // did we reach an audio frame header?
         scanner <<= 8;
         scanner |= *data;
         if ((scanner & 0xFFF00000) == 0xFFF00000) {
-           if (frameTodo <= 0 && IsValidAudioHeader(scanner, mpegLevel == phMPEG2, &frameSize)) {
+           if (frameTodo <= 0 && (frameSize == 0 || skippedBytes >= 4) && IsValidAudioHeader(scanner, mpegLevel == phMPEG2, &frameSize)) {
               if (state == scanFrame) {
                  // As a new audio frame starts here, the previous one is done. So push
                  // out the packet to start a new packet for the next audio frame. If
@@ -681,7 +674,7 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                  if (initiallySyncing) // omit report for the typical initial case
                     initiallySyncing = false;
                  else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                    esyslog("cAudioRepacker: skipped %d bytes to sync on next audio frame", skippedBytes - SkippedBytesLimit);
+                    esyslog("cAudioRepacker(0x%02X): skipped %d bytes to sync on next audio frame", cid, skippedBytes - SkippedBytesLimit);
                  skippedBytes = 0;
                  // if there is a PES header available, then use it ...
                  if (pesHeaderBackupLen > 0) {
@@ -731,8 +724,18 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
         data++;
         done++;
         todo--;
+        // do we have to start a new packet as the current is done?
+        if (frameTodo > 0) {
+           if (--frameTodo == 0) {
+              // the current audio frame is is done now. So push out the packet to
+              // start a new packet for the next audio frame.
+              PushOutPacket(ResultBuffer, payload, data - payload);
+              // go on with syncing to the next audio frame
+              state = syncing;
+              }
+           }
         // do we have to start a new packet as there is no more space left?
-        if (--packetTodo <= 0) {
+        if (state != syncing && --packetTodo <= 0) {
            // We connot start a new packet here if the current might end in an audio
            // frame header and this header shall possibly be put in the next packet. So
            // overfill the current packet until we can safely detect that we won't
@@ -829,13 +832,16 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
   // report that syncing dropped some bytes
   if (skippedBytes > SkippedBytesLimit) {
      if (!initiallySyncing) // omit report for the typical initial case
-        esyslog("cAudioRepacker: skipped %d bytes while syncing on next audio frame", skippedBytes - SkippedBytesLimit);
+        esyslog("cAudioRepacker(0x%02X): skipped %d bytes while syncing on next audio frame", cid, skippedBytes - SkippedBytesLimit);
      skippedBytes = SkippedBytesLimit;
      }
 }
 
 int cAudioRepacker::BreakAt(const uchar *Data, int Count)
 {
+  if (initiallySyncing)
+     return -1; // fill the packet buffer completely until we have synced once
+
   int PesPayloadOffset = 0;
 
   ePesHeader MpegLevel = AnalyzePesHeader(Data, Count, PesPayloadOffset);
@@ -1189,6 +1195,8 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
 
 int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
 {
+  if (initiallySyncing)
+     return -1; // fill the packet buffer completely until we have synced once
   // enough data for test?
   if (Count < 6 + 3)
      return -1;
@@ -1263,7 +1271,7 @@ class cTS2PES {
   int count;
   uint8_t *buf;
   uint8_t cid;
-  uint8_t audioCid;
+  uint8_t rewriteCid;
   uint8_t subStreamId;
   int plength;
   uint8_t plen[2];
@@ -1287,7 +1295,7 @@ class cTS2PES {
   void write_ipack(const uint8_t *Data, int Count);
   void instant_repack(const uint8_t *Buf, int Count);
 public:
-  cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid = 0x00, uint8_t SubStreamId = 0x00, cRepacker *Repacker = NULL);
+  cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t RewriteCid = 0x00, uint8_t SubStreamId = 0x00, cRepacker *Repacker = NULL);
   ~cTS2PES();
   int Pid(void) { return pid; }
   void ts_to_pes(const uint8_t *Buf); // don't need count (=188)
@@ -1296,12 +1304,12 @@ class cTS2PES {
 
 uint8_t cTS2PES::headr[] = { 0x00, 0x00, 0x01 };
 
-cTS2PES::cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t AudioCid, uint8_t SubStreamId, cRepacker *Repacker)
+cTS2PES::cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t RewriteCid, uint8_t SubStreamId, cRepacker *Repacker)
 {
   pid = Pid;
   resultBuffer = ResultBuffer;
   size = Size;
-  audioCid = AudioCid;
+  rewriteCid = RewriteCid;
   subStreamId = SubStreamId;
   repacker = Repacker;
   if (repacker) {
@@ -1363,7 +1371,7 @@ void cTS2PES::send_ipack(void)
 {
   if (count <= ((mpeg == 2) ? 9 : 7)) // skip empty packets
      return;
-  buf[3] = (AUDIO_STREAM_S <= cid && cid <= AUDIO_STREAM_E && audioCid) ? audioCid : cid;
+  buf[3] = rewriteCid ? rewriteCid : cid;
   buf[4] = (uint8_t)(((count - 6) & 0xFF00) >> 8);
   buf[5] = (uint8_t)((count - 6) & 0x00FF);
   store(buf, count);
@@ -1679,19 +1687,21 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   if (VPid)
 #define TEST_cVideoRepacker
 #ifdef TEST_cVideoRepacker
-     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0x00, 0x00, new cVideoRepacker);
+     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0xE0, 0x00, new cVideoRepacker);
 #else
-     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);
+     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0xE0);
 #endif
   if (APids) {
      int n = 0;
-     while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS)
+     while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS) {
 #define TEST_cAudioRepacker
 #ifdef TEST_cAudioRepacker
-           ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n++, 0x00, new cAudioRepacker);
+           ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n, 0x00, new cAudioRepacker(0xC0 + n));
+           n++;
 #else
            ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n++);
 #endif
+           }
      }
   if (DPids) {
      int n = 0;
diff --git a/summary2info.pl b/summary2info.pl
index f757ac365..429067745 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 1.3 2005/06/04 11:33:09 kls Exp $
+# $Id: summary2info.pl 1.4 2005/09/10 12:40:40 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
@@ -37,6 +37,15 @@
        $data[2] = $data[1];
        $data[1] = "";
        }
+    elsif ($line == 2) {
+       # if line 1 is too long, it can't be the short text,
+       # so assume the short text is missing and concatenate
+       # line 1 and line 2 to be the long text:
+       if (length($data[1]) > 80) { 
+          $data[2] = $data[1] . "|" . $data[2];
+          $data[1] = "";
+          }
+       }
     ($InfoFile = $SummaryFile) =~ s/summary\.vdr$/info.vdr/;
     open(F, ">$InfoFile") || die "$InfoFile: $!\n";
     print F "T $data[0]\n" if ($data[0]);
diff --git a/svdrp.c b/svdrp.c
index 889ffe413..2c567aa18 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.77 2005/08/28 14:12:00 kls Exp $
+ * $Id: svdrp.c 1.80 2005/09/03 14:09:02 kls Exp $
  */
 
 #include "svdrp.h"
@@ -269,12 +269,16 @@ const char *HelpPages[] = {
   "    at the position where any previous replay was stopped, or from the beginning\n"
   "    by default. To control or stop the replay session, use the usual remote\n"
   "    control keypresses via the HITK command.",
-  "PLUG <name> [ <command> [ <options> ]]\n"
+  "PLUG <name> [ help | main ] [ <command> [ <options> ]]\n"
   "    Send a command to a plugin.\n"
   "    The PLUG command without any parameters lists all plugins.\n"
   "    If only a name is given, all commands known to that plugin are listed.\n"
   "    If a command is given (optionally followed by parameters), that command\n"
-  "    is sent to the plugin, and the result will be displayed.",
+  "    is sent to the plugin, and the result will be displayed.\n"
+  "    The keyword 'help' lists all the SVDRP commands known to the named plugin.\n"
+  "    If 'help' is followed by a command, the detailed help for that command is\n"
+  "    given. The keyword 'main' initiates a call to the main menu function of the\n"
+  "    given plugin.\n",
   "PUTE\n"
   "    Put data into the EPG list. The data entered has to strictly follow the\n"
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
@@ -1035,8 +1039,51 @@ void cSVDRP::CmdMODT(const char *Option)
 
 void cSVDRP::CmdMOVC(const char *Option)
 {
-  //TODO combine this with menu action (timers must be updated)
-  Reply(502, "MOVC not yet implemented");
+  if (*Option) {
+     if (!Channels.BeingEdited() && !Timers.BeingEdited()) {
+        char *tail;
+        int From = strtol(Option, &tail, 10);
+        if (tail && tail != Option) {
+           tail = skipspace(tail);
+           if (tail && tail != Option) {
+              int To = strtol(tail, NULL, 10);
+              int CurrentChannelNr = cDevice::CurrentChannel();
+              cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
+              cChannel *FromChannel = Channels.GetByNumber(From);
+              if (FromChannel) {
+                 cChannel *ToChannel = Channels.GetByNumber(To);
+                 if (ToChannel) {
+                    int FromNumber = FromChannel->Number();
+                    int ToNumber = ToChannel->Number();
+                    if (FromNumber != ToNumber) {
+                       Channels.Move(FromChannel, ToChannel);
+                       Channels.ReNumber();
+                       Channels.SetModified(true);
+                       if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr)
+                          Channels.SwitchTo(CurrentChannel->Number());
+                       isyslog("channel %d moved to %d", FromNumber, ToNumber);
+                       Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
+                       }
+                    else
+                       Reply(501, "Can't move channel to same postion");
+                    }
+                 else
+                    Reply(501, "Channel \"%d\" not defined", To);
+                 }
+              else
+                 Reply(501, "Channel \"%d\" not defined", From);
+              }
+           else
+              Reply(501, "Error in channel number");
+           }
+        else
+           Reply(501, "Error in channel number");
+        }
+     else
+        Reply(550, "Channels or timers are being edited - try again later");
+     }
+  else
+     Reply(501, "Missing channel number");
 }
 
 void cSVDRP::CmdMOVT(const char *Option)
@@ -1204,6 +1251,10 @@ void cSVDRP::CmdPLUG(const char *Option)
                  Reply(214, "This plugin has no SVDRP commands");
               }
            }
+        else if (strcasecmp(cmd, "MAIN") == 0) {
+           cRemote::CallPlugin(plugin->Name());
+           Reply(250, "Initiated call to main menu function of plugin \"%s\"", plugin->Name());
+           }
         else {
            int ReplyCode = 900;
            cString s = plugin->SVDRPCommand(cmd, option, ReplyCode);
diff --git a/timers.c b/timers.c
index 9e80b4942..ff51f1094 100644
--- a/timers.c
+++ b/timers.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.34 2005/07/30 13:03:51 kls Exp $
+ * $Id: timers.c 1.36 2005/09/09 15:22:33 kls Exp $
  */
 
 #include "timers.h"
 #include <ctype.h>
 #include "channels.h"
+#include "device.h"
 #include "i18n.h"
 #include "remote.h"
 
@@ -518,7 +519,10 @@ cTimers::cTimers(void)
 cTimer *cTimers::GetTimer(cTimer *Timer)
 {
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if (ti->Channel() == Timer->Channel() && ti->Day() == Timer->Day() && ti->Start() == Timer->Start() && ti->Stop() == Timer->Stop())
+      if (ti->Channel() == Timer->Channel() &&
+          (ti->WeekDays() && ti->WeekDays() == Timer->WeekDays() || !ti->WeekDays() && ti->Day() == Timer->Day()) &&
+          ti->Start() == Timer->Start() &&
+          ti->Stop() == Timer->Stop())
          return ti;
       }
   return NULL;
diff --git a/tools.c b/tools.c
index 46d3ce262..28b2bbed6 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.97 2005/08/27 14:43:55 kls Exp $
+ * $Id: tools.c 1.98 2005/09/11 13:11:05 kls Exp $
  */
 
 #include "tools.h"
@@ -1080,8 +1080,7 @@ cHashBase::cHashBase(int Size)
 
 cHashBase::~cHashBase(void)
 {
-  for (int i = 0; i < size; i++)
-      delete hashTable[i];
+  Clear();
   free(hashTable);
 }
 
@@ -1106,6 +1105,14 @@ void cHashBase::Del(cListObject *Object, unsigned int Id)
      }
 }
 
+void cHashBase::Clear(void)
+{
+  for (int i = 0; i < size; i++) {
+      delete hashTable[i];
+      hashTable[i] = NULL;
+      }
+}
+
 cListObject *cHashBase::Get(unsigned int Id) const
 {
   cList<cHashObject> *list = hashTable[hashfn(Id)];
diff --git a/tools.h b/tools.h
index 41a004985..9d18d534e 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.75 2005/08/27 14:40:08 kls Exp $
+ * $Id: tools.h 1.76 2005/09/11 13:04:03 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -259,6 +259,7 @@ class cHashObject : public cListObject {
   cListObject *object;
 public:
   cHashObject(cListObject *Object, unsigned int Id) { object = Object; id = Id; }
+  cListObject *Object(void) { return object; }
   };
 
 class cHashBase {
@@ -272,6 +273,7 @@ class cHashBase {
   virtual ~cHashBase();
   void Add(cListObject *Object, unsigned int Id);
   void Del(cListObject *Object, unsigned int Id);
+  void Clear(void);
   cListObject *Get(unsigned int Id) const;
   cList<cHashObject> *GetList(unsigned int Id) const;
   };
diff --git a/vdr.5 b/vdr.5
index 5be6da8cb..32676175d 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.37 2005/05/16 14:16:48 kls Exp $
+.\" $Id: vdr.5 1.38 2005/09/04 14:43:42 kls Exp $
 .\"
 .TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
 .SH NAME
@@ -136,6 +136,11 @@ by an '=' sign, as in
 
 .B ...:101=deu,102=eng;103=deu,104=eng:...
 
+Some channels broadcast two different languages in the two stereo channels, which
+can be indicated by adding a second language code, delimited by a '+' sign, as in
+
+.B ...:101=deu,102=eng+spa;103=deu,104=eng:...
+
 .TP
 .B TPID
 The teletext PID.
diff --git a/vdr.c b/vdr.c
index c98ee0d6b..0e0e4288c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.211 2005/08/21 08:47:06 kls Exp $
+ * $Id: vdr.c 1.216 2005/09/04 08:57:15 kls Exp $
  */
 
 #include <getopt.h>
@@ -66,6 +66,7 @@
 #define LASTCAMMENUTIMEOUT  3 // seconds to run the main loop 'fast' after a CAM menu has been closed
                               // in order to react on a possible new CAM menu as soon as possible
 #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
+#define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
 
 #define EXIT(v) { ExitCode = (v); goto Exit; }
 
@@ -130,6 +131,9 @@ int main(int argc, char *argv[])
 #elif defined(REMOTE_RCU)
   RcuDevice = RCU_DEVICE;
 #endif
+#if defined(VFAT)
+  VfatFileSystem = true;
+#endif
 
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
   int ExitCode = 0;
@@ -153,6 +157,7 @@ int main(int argc, char *argv[])
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
       { "version",  no_argument,       NULL, 'V' },
+      { "vfat",     no_argument,       NULL, 'v' | 0x100 },
       { "video",    required_argument, NULL, 'v' },
       { "watchdog", required_argument, NULL, 'w' },
       { NULL }
@@ -245,6 +250,9 @@ int main(int argc, char *argv[])
                     break;
           case 'V': DisplayVersion = true;
                     break;
+          case 'v' | 0x100:
+                    VfatFileSystem = true;
+                    break;
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
@@ -303,6 +311,8 @@ int main(int argc, char *argv[])
                "  -t TTY,   --terminal=TTY controlling tty\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
+               "            --vfat         encode special characters in recording names to\n"
+               "                           avoid problems with VFAT file systems\n"
                "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                "                           seconds (default: %d); '0' disables the watchdog\n"
                "\n",
@@ -695,7 +705,7 @@ int main(int argc, char *argv[])
                Menu = new cMenuMain(cControl::Control());
                Temp = NULL;
                break;
-          #define DirectMainFunction(function...)\
+          #define DirectMainFunction(function)\
             DELETENULL(Menu);\
             if (cControl::Control())\
                cControl::Control()->Hide();\
@@ -709,7 +719,25 @@ int main(int argc, char *argv[])
           case kSetup:      DirectMainFunction(osSetup); break;
           case kCommands:   DirectMainFunction(osCommands); break;
           case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
-          case k_Plugin:    DirectMainFunction(osPlugin, cRemote::GetPlugin()); break;
+          case k_Plugin: {
+               DELETENULL(Menu);
+               Temp = NULL;
+               if (cControl::Control())
+                  cControl::Control()->Hide();
+               cPlugin *plugin = cPluginManager::GetPlugin(cRemote::GetPlugin());
+               if (plugin) {
+                  Menu = Temp = plugin->MainMenuAction();
+                  if (Menu) {
+                     Menu->Show();
+                     if (Menu->IsMenu())
+                        ((cOsdMenu*)Menu)->Display();
+                     }
+                  }
+               else
+                  esyslog("ERROR: unknown plugin '%s'", cRemote::GetPlugin());
+               key = kNone; // nobody else needs to see these keys
+               }
+               break;
           // Channel up/down:
           case kChanUp|k_Repeat:
           case kChanUp:
@@ -790,8 +818,12 @@ int main(int argc, char *argv[])
         Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
         if (Interact) {
            eOSState state = Interact->ProcessKey(key);
-           if (state == osUnknown && ISMODELESSKEY(key) && cControl::Control() && Interact != cControl::Control())
-              state = cControl::Control()->ProcessKey(key);
+           if (state == osUnknown && Interact != cControl::Control()) {
+              if (ISMODELESSKEY(key) && cControl::Control())
+                 state = cControl::Control()->ProcessKey(key);
+              else if (time(NULL) - LastActivity > MENUTIMEOUT)
+                 state = osEnd;
+              }
            switch (state) {
              case osPause:  DELETENULL(Menu);
                             cControl::Shutdown(); // just in case

From c16bbf7422f37108580e559ca849e5aafbdac672 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 Sep 2005 18:00:00 +0200
Subject: [PATCH 125/307] =?UTF-8?q?Version=201.3.33=20-=20Fixed=20two=20er?=
 =?UTF-8?q?rors=20in=20'newplugin'=20(thanks=20to=20Alexander=20Rieger).?=
 =?UTF-8?q?=20-=20Fixed=20converting=20arbitrarily=20formatted=20summary.v?=
 =?UTF-8?q?dr=20files=20(thanks=20to=20Thomas=20G=C3=BCnther).=20-=20Fixed?=
 =?UTF-8?q?=20handling=20color=20buttons=20in=20cMenuEditStrItem=20(thanks?=
 =?UTF-8?q?=20to=20Alexander=20Rieger).=20-=20Added=20cChannel::LinkChanne?=
 =?UTF-8?q?ls()=20and=20cChannel::RefChannel()=20(suggested=20by=20Helmut?=
 =?UTF-8?q?=20Auer).=20=20=20Note=20that=20VDR=20itself=20doesn't=20actual?=
 =?UTF-8?q?ly=20use=20the=20linked=20channels,=20yet,=20so=20there=20is=20?=
 =?UTF-8?q?=20=20no=20guarantee=20that=20this=20really=20works=20under=20a?=
 =?UTF-8?q?ll=20circumstances.=20-=20Added=20a=20missing=20include=20state?=
 =?UTF-8?q?ment=20to=20the=20'sky'=20plugin=20(thanks=20to=20Alfred=20Zast?=
 =?UTF-8?q?row=20=20=20for=20reporting=20this=20one).=20-=20Fixed=20handli?=
 =?UTF-8?q?ng=20key=20macros=20with=20keys=20after=20@plugin=20(thanks=20t?=
 =?UTF-8?q?o=20Rolf=20Ahrenberg=20for=20=20=20reporting=20this=20one).=20-?=
 =?UTF-8?q?=20Fixed=20error=20handling=20in=20cCiTransportConnection::Recv?=
 =?UTF-8?q?TPDU()=20(thanks=20to=20Georg=20Acher=20=20=20for=20reporting?=
 =?UTF-8?q?=20this=20one).=20-=20Removed=20obsolete=20'shift'=20code=20in?=
 =?UTF-8?q?=20device.[hc].=20-=20The=20SVDRP=20command=20DELR=20no=20longe?=
 =?UTF-8?q?r=20triggers=20a=20complete=20reload=20of=20the=20global=20Reco?=
 =?UTF-8?q?rdings=20=20=20list,=20but=20rather=20deletes=20that=20particul?=
 =?UTF-8?q?ar=20entry.=20-=20The=20list=20of=20recordings=20is=20now=20rea?=
 =?UTF-8?q?d=20in=20a=20separate=20thread,=20resulting=20in=20a=20faster?=
 =?UTF-8?q?=20=20=20startup=20if=20there=20are=20a=20great=20many=20of=20r?=
 =?UTF-8?q?ecordings,=20or=20the=20disk(s)=20have=20to=20spin=20up.=20=20?=
 =?UTF-8?q?=20If=20the=20Recordings=20menu=20is=20opened=20while=20the=20l?=
 =?UTF-8?q?ist=20of=20recordings=20is=20still=20being=20read,=20=20=20the?=
 =?UTF-8?q?=20menu=20will=20be=20updated=20accordingly.=20=20=20Plugins=20?=
 =?UTF-8?q?that=20access=20the=20global=20Recordings=20variable=20should?=
 =?UTF-8?q?=20lock=20the=20thread=20=20=20by=20putting=20something=20like?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    cThreadLock RecordingsLock(&Recordings);

  into the respective code block. Thanks to Carsten Koch for his help in testing
  and debugging this.
- The 'new' indicator in the Recordings menu is now kept up-to-date (thanks to
  Thomas Günther).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
- The '.update' file in the video directory is now touched when a recording is
  added or deleted, so that other VDR instances can update their lists (thanks to
  Alexander Rieger).
- Made the function ExchangeChars() public (suggested by Lucian Muresan).
---
 CONTRIBUTORS            |  15 +++++
 HISTORY                 |  43 ++++++++++++++
 PLUGINS/src/sky/HISTORY |   4 ++
 PLUGINS/src/sky/sky.c   |   5 +-
 channels.conf           |  18 +++---
 channels.h              |   4 +-
 ci.c                    |   6 +-
 config.h                |   6 +-
 device.c                |  55 +----------------
 device.h                |   3 +-
 i18n.c                  |  40 ++++++-------
 keys.c                  |   4 +-
 menu.c                  |  85 +++++++++++++++++---------
 menu.h                  |   4 +-
 menuitems.c             |  23 +++++--
 newplugin               |   6 +-
 recording.c             | 129 +++++++++++++++++++++++++++++++++-------
 recording.h             |  42 ++++++++++---
 sections.c              |   4 +-
 summary2info.pl         |   6 +-
 svdrp.c                 |   6 +-
 tools.c                 |   9 ++-
 tools.h                 |   5 +-
 vdr.c                   |  12 ++--
 24 files changed, 356 insertions(+), 178 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2b6b4e413..2a9dd18d0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -14,6 +14,8 @@ Carsten Koch <Carsten.Koch@icem.de>
  for fixing the watchdog timer if the program hangs in OSD activities
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
  for fixing converting summary.vdr files that would result in a very long 'short text'
+ for his help in testing and debugging reading the list of recordings in a
+ separate thread
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -522,6 +524,7 @@ Helmut Auer <vdr@helmutauer.de>
  DVB data stream
  for implementing a default cRemote::Initialize()
  for suggesting to increase the default value for 'Min. user inactivity' to 300 minutes
+ for suggesting to add cChannel::LinkChannels() and cChannel::RefChannel()
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -880,6 +883,7 @@ Alfred Zastrow <vdr@zastrow4u.de>
  for reporting a bug in handling menu status messages when the list contents is scrolled
  for reporting that without the usleep() call in cDvbPlayer::Action() VDR runs on NPTL
  systems
+ for reporting a missing include statement in the 'sky' plugin
 
 Matthias Raus <matthias-raus@web.de>
  for reporting a problem with starting the editing process if no marks have been set
@@ -900,6 +904,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making pressing the Power button not stop Transfer Mode or replay immediately
  for making EPG events without a title display "No title" instead of "(null)"
  for changing the title of the recording info menu
+ for reporting a bug in handling key macros with keys after @plugin
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1286,6 +1291,7 @@ Stefan Meyknecht <stefan@meyknecht.org>
 Lucian Muresan <lucianm@users.sourceforge.net>
  for updating the Romanian language texts and the iso8859-2 fonts
  for making VDR actually use the iso8859-15 fonts
+ for suggesting to make the function ExchangeChars()
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -1431,6 +1437,7 @@ Georg Acher <acher@baycom.de>
  '& 0xff' in CRC32::crc32() of libsi/util.c
  for suggesting to reduce the priority of the section handler threads
  for a patch that was used to implement a hash for the channels
+ for reporting a problem with error handling in cCiTransportConnection::RecvTPDU()
 
 Henrik Niehaus <henrik.niehaus@gmx.de>
  for reporting a problem with timers with a day given as MTWTF--@6, i.e. a repeating
@@ -1458,6 +1465,8 @@ Thomas G
  editing mark, or '9' after the last one
  for suggesting to move cMenuEditTimer and cMenuEvent to menu.h so that plugins
  can use it
+ for fixing converting arbitrarily formatted summary.vdr files
+ for making the 'new' indicator in the Recordings menu kept up-to-date
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -1479,3 +1488,9 @@ Marko M
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
+
+Alexander Rieger <Alexander.Rieger@inka.de>
+ for fixing two errors in 'newplugin'
+ for fixing handling color buttons in cMenuEditStrItem
+ for making the '.update' file in the video directory be touched when a recording is
+ added or deleted, so that other VDR instances can update their lists
diff --git a/HISTORY b/HISTORY
index 302afb27d..9eb14b8b2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3806,3 +3806,46 @@ Video Disk Recorder Revision History
   (thanks to Carsten Koch).
 - Implemented a hash for the channels to reduce the system load in the EIT scanning
   thread (based on a patch by Georg Acher).
+
+2005-09-25: Version 1.3.33
+
+- Fixed two errors in 'newplugin' (thanks to Alexander Rieger).
+- Fixed converting arbitrarily formatted summary.vdr files (thanks to Thomas G�nther).
+- Fixed handling color buttons in cMenuEditStrItem (thanks to Alexander Rieger).
+- Added cChannel::LinkChannels() and cChannel::RefChannel() (suggested by Helmut Auer).
+  Note that VDR itself doesn't actually use the linked channels, yet, so there is
+  no guarantee that this really works under all circumstances.
+- Added a missing include statement to the 'sky' plugin (thanks to Alfred Zastrow
+  for reporting this one).
+- Fixed handling key macros with keys after @plugin (thanks to Rolf Ahrenberg for
+  reporting this one).
+- Fixed error handling in cCiTransportConnection::RecvTPDU() (thanks to Georg Acher
+  for reporting this one).
+- Removed obsolete 'shift' code in device.[hc].
+- The SVDRP command DELR no longer triggers a complete reload of the global Recordings
+  list, but rather deletes that particular entry.
+- The list of recordings is now read in a separate thread, resulting in a faster
+  startup if there are a great many of recordings, or the disk(s) have to spin up.
+  If the Recordings menu is opened while the list of recordings is still being read,
+  the menu will be updated accordingly.
+  Plugins that access the global Recordings variable should lock the thread, either
+  by calling
+
+    Recordings.Lock();
+    ...
+    Recordings.Unlock();
+
+  or by putting something like
+
+    cThreadLock RecordingsLock(&Recordings);
+
+  into the respective code block. Thanks to Carsten Koch for his help in testing
+  and debugging this.
+- The 'new' indicator in the Recordings menu is now kept up-to-date (thanks to
+  Thomas G�nther).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the Russian OSD texts (thanks to Oleg ???).
+- The '.update' file in the video directory is now touched when a recording is
+  added or deleted, so that other VDR instances can update their lists (thanks to
+  Alexander Rieger).
+- Made the function ExchangeChars() public (suggested by Lucian Muresan).
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 2fed4c363..9d4057511 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -37,3 +37,7 @@ VDR Plugin 'sky' Revision History
 
 - Made several functions threadsafe.
 - Removed delay_ms(), using cCondWait::SleepMs() instead.
+
+2005-09-17: Version 0.3.4
+
+- Added a missing include statement.
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index bf4fa428a..cbb927bbe 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.11 2004/12/26 12:45:22 kls Exp $
+ * $Id: sky.c 1.12 2005/09/17 10:39:35 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -11,10 +11,11 @@
 #include <sys/time.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include <vdr/device.h>
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.3";
+static const char *VERSION        = "0.3.4";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
diff --git a/channels.conf b/channels.conf
index 2041ae1d0..0b35a9c2f 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,6 +1,6 @@
 RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
-ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:0:0:0:0:898:133:33:0
+ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
 Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
@@ -46,11 +46,11 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1801,1702:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1702,1801,1722:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
@@ -79,8 +79,8 @@ ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
-Test;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
-Nickelodeon;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
+Nick/Talpa;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
+NICK;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
 VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
@@ -108,12 +108,12 @@ Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
+WDR M�nster;ARD:12421:hC34:S19.2E:27500:701:702=deu:104:0:28310:1:1201:0
 Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
-JGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0
+IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
diff --git a/channels.h b/channels.h
index c2e1efc2b..62cb52e31 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.35 2005/09/11 11:17:19 kls Exp $
+ * $Id: channels.h 1.36 2005/09/17 09:59:14 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -184,6 +184,8 @@ class cChannel : public cListObject {
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
+  const cLinkChannels* LinkChannels(void) const { return linkChannels; }
+  const cChannel *RefChannel(void) const { return refChannel; }
   bool IsCable(void) const { return cSource::IsCable(source); }
   bool IsSat(void) const { return cSource::IsSat(source); }
   bool IsTerr(void) const { return cSource::IsTerr(source); }
diff --git a/ci.c b/ci.c
index 94a5cd63a..4e341d758 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.27 2005/08/21 14:10:27 kls Exp $
+ * $Id: ci.c 1.28 2005/09/17 11:43:08 kls Exp $
  */
 
 #include "ci.h"
@@ -358,8 +358,8 @@ int cCiTransportConnection::RecvTPDU(void)
                         break;
        }
      }
-  else {
-     esyslog("ERROR: CAM: Read failed: slot %d, tcid %d\n", slot, tcid);
+  else if (FATALERRNO) {
+     esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m\n", slot, tcid);
      Init(-1, slot, tcid);
      }
   return lastResponse;
diff --git a/config.h b/config.h
index 8113c193a..fa11391e9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.227 2005/09/04 10:49:24 kls Exp $
+ * $Id: config.h 1.228 2005/09/14 16:04:09 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.32"
-#define VDRVERSNUM   10332  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.33"
+#define VDRVERSNUM   10333  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 8673cf057..dcd05a315 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.109 2005/09/04 14:28:16 kls Exp $
+ * $Id: device.c 1.110 2005/09/17 14:29:44 kls Exp $
  */
 
 #include "device.h"
@@ -310,22 +310,6 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
             }
          }
       }
-
-  /*XXX+ too complex with multiple recordings per device
-  if (!d && Ca > MAXDEVICES) {
-     // We didn't find one the easy way, so now we have to try harder:
-     int ShiftLevel = -1;
-     for (int i = 0; i < numDevices; i++) {
-         if (Provides[i]) { // this device is basicly able to do the job, but for some reason we didn't get it above
-            int sl = device[i]->CanShift(Ca, Priority); // asks this device to shift its job to another device
-            if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
-               d = device[i]; // found one that can be shifted with the fewest number of subsequent shifts
-               ShiftLevel = sl;
-               }
-            }
-         }
-     }
-  XXX*/
   return d;
 }
 
@@ -1084,43 +1068,6 @@ int cDevice::Priority(void) const
   return priority;
 }
 
-int cDevice::CanShift(int Ca, int Priority, int UsedCards) const
-{
-  return -1;//XXX+ too complex with multiple recordings per device
-  /*XXX
-  // Test whether a receiver on this device can be shifted to another one
-  // in order to perform a new receiving with the given Ca and Priority on this device:
-  int ShiftLevel = -1; // default means this device can't be shifted
-  if (UsedCards & (1 << CardIndex()) != 0)
-     return ShiftLevel; // otherwise we would get into a loop
-  if (Receiving()) {
-     if (ProvidesCa(Ca) // this device provides the requested Ca
-        && (Ca != this->Ca() // the requested Ca is different from the one currently used...
-           || Priority > this->Priority())) { // ...or the request comes from a higher priority
-        cDevice *d = NULL;
-        int Provides[MAXDEVICES];
-        UsedCards |= (1 << CardIndex());
-        for (int i = 0; i < numDevices; i++) {
-            if ((Provides[i] = device[i]->ProvidesCa(this->Ca())) != 0) { // this device is basicly able to do the job
-               if (device[i] != this) { // it is not _this_ device
-                  int sl = device[i]->CanShift(this->Ca(), Priority, UsedCards); // this is the original Priority!
-                  if (sl >= 0 && (ShiftLevel < 0 || sl < ShiftLevel)) {
-                     d = device[i];
-                     ShiftLevel = sl;
-                     }
-                  }
-               }
-            }
-        if (ShiftLevel >= 0)
-           ShiftLevel++; // adds the device's own shift
-        }
-     }
-  else if (Priority > this->Priority())
-     ShiftLevel = 0; // no shifting necessary, this device can do the job
-  return ShiftLevel;
-  XXX*/
-}
-
 bool cDevice::Ready(void)
 {
   return true;
diff --git a/device.h b/device.h
index 484f0be53..d13b896cf 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.64 2005/09/10 11:54:02 kls Exp $
+ * $Id: device.h 1.65 2005/09/17 14:29:28 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -485,7 +485,6 @@ class cDevice : public cThread {
 private:
   cMutex mutexReceiver;
   cReceiver *receiver[MAXRECEIVERS];
-  int CanShift(int Ca, int Priority, int UsedCards = 0) const;
 protected:
   int Priority(void) const;
       ///< Returns the priority of the current receiving session (0..MAXPRIORITY),
diff --git a/i18n.c b/i18n.c
index 701a8fc9e..ca5d77eb5 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.208 2005/09/10 10:20:48 kls Exp $
+ * $Id: i18n.c 1.210 2005/09/25 11:57:04 kls Exp $
  *
  * Translations provided by:
  *
@@ -265,10 +265,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Inspelning",
+    "Detaliile �nregistr�rii",
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "���� � ������",
     "",// TODO
     "",// TODO
     "Optagelses info",
@@ -328,7 +328,7 @@ const tI18nPhrase Phrases[] = {
     "�rdenes de grabaci�n",
     "������� ��� ��������",
     "Inspelningskommandon",
-    "Comenzi �nregistrare",
+    "Comenzi pentru �nregistr�ri",
     "Parancsok a felvett filmekhez",
     "Ordres de gravaci�",
     "������� ������",
@@ -433,10 +433,10 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Info",
+    "Info",
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "����",
     "Info",
     "Info",
     "Info",
@@ -2349,7 +2349,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Ljud saknas!"
-    "",//TODO
+    "Lipse�te sunetul!",
     "",//TODO
     "",//TODO
     "����������� ����!",
@@ -2876,7 +2876,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Kanal information (s)",
-    "",// TODO
+    "Durata afi��rii info-canal (s)",
     "",// TODO
     "",// TODO
     "����� ���������� � ������ (���)",
@@ -2939,10 +2939,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Rulla texten",
+    "Derulare circular�",
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "����������� ���������",
     "S kraja sko�i na po�etak",
     "Ridade kerimine",
     "Scroll rundt",
@@ -3170,7 +3170,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Format f�r video display",
-    "",//TODO
+    "Formatul red�rii video",
     "",//TODO
     "",//TODO
     "�������������� �����������",
@@ -3275,7 +3275,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Anv�nd Dolby Digital",
-    "",//TODO
+    "Sunet Dolby Digital",
     "",//TODO
     "",//TODO
     "�������� Dolby Digital",
@@ -3401,7 +3401,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Antal ljudspr�k",
-    "",//TODO
+    "Limbi sunet",
     "",//TODO
     "",//TODO
     "�������������� ����� (����)",
@@ -3422,7 +3422,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Ljudspr�k",
-    "",//TODO
+    "Limba sunetului",
     "",//TODO
     "",//TODO
     "������",
@@ -4079,7 +4079,7 @@ const tI18nPhrase Phrases[] = {
     "�nv��are taste telecomand�",
     "T�vir�ny�t� betan�t�sa",
     "Aprenent les tecles del comandament a dist�ncia",
-    "���� ����� ������ ������",
+    "�������� ������",
     "U�enje k�da daljinskog upravlja�a",
     "Kaugjuhtimispuldi �petamine",
     "L�rer fjernbetjeningstaster",
@@ -4854,7 +4854,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Ljud",
-    "",// TODO
+    "Sunet",
     "",// TODO
     "",// TODO
     "����",
@@ -5317,10 +5317,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "P�b�rjar EPG skanning",
+    "Pornesc achizi�ia EPG",
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "������� EPG-������������",
     "Po�injem EPG-scan",
     "EPG skaneerimine k�ivitatud",
     "Starter EPG skanning",
@@ -5401,10 +5401,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "ingen titel",
+    "F�r� titlu",
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "��� ��������",
     "Bez titla",
     "",// TODO
     "Ingen titel",
diff --git a/keys.c b/keys.c
index 8d1c607d5..57b4f13ee 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.8 2005/09/03 11:28:34 kls Exp $
+ * $Id: keys.c 1.9 2005/09/17 11:27:40 kls Exp $
  */
 
 #include "keys.h"
@@ -208,7 +208,7 @@ bool cKeyMacro::Parse(char *s)
                  esyslog("ERROR: @plugin can't be first in macro");
                  return false;
                  }
-              macro[n++] = k_Plugin;
+              macro[n] = k_Plugin;
               if (n < MAXKEYSINMACRO) {
                  plugin = strdup(p + 1);
                  if (!cPluginManager::GetPlugin(plugin)) {
diff --git a/menu.c b/menu.c
index 9709212d6..a28c8a8bc 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.359 2005/09/03 11:42:27 kls Exp $
+ * $Id: menu.c 1.362 2005/09/25 13:37:21 kls Exp $
  */
 
 #include "menu.h"
@@ -1506,35 +1506,12 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
+  Recordings.StateChanged(recordingsState); // just to get the current state
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
-  const char *LastReplayed = cReplayControl::LastReplayed();
-  cMenuRecordingItem *LastItem = NULL;
-  char *LastItemText = NULL;
-  if (!Base)
-     Recordings.Sort();
-  for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
-      if (!Base || (strstr(recording->Name(), Base) == recording->Name() && recording->Name()[strlen(Base)] == '~')) {
-         cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-         if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
-            Add(Item);
-            LastItem = Item;
-            free(LastItemText);
-            LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
-            }
-         else
-            delete Item;
-         if (LastItem) {
-            if (LastReplayed && strcmp(LastReplayed, recording->FileName()) == 0)
-               SetCurrent(LastItem);
-            if (LastItem->IsDirectory())
-               LastItem->IncrementCounter(recording->IsNew());
-            }
-         }
-      }
-  free(LastItemText);
+  Set();
   if (Current() < 0)
      SetCurrent(First());
-  else if (OpenSubMenus && Open(true))
+  else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
      return;
   SetHelpKeys();
 }
@@ -1570,6 +1547,45 @@ void cMenuRecordings::SetHelpKeys(void)
      }
 }
 
+void cMenuRecordings::Set(bool Refresh)
+{
+  const char *CurrentRecording = cReplayControl::LastReplayed();
+  cMenuRecordingItem *LastItem = NULL;
+  char *LastItemText = NULL;
+  cThreadLock RecordingsLock(&Recordings);
+  if (Refresh) {
+     cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+     if (ri) {
+        cRecording *Recording = GetRecording(ri);
+        if (Recording)
+           CurrentRecording = Recording->FileName();
+        }
+     }
+  Clear();
+  Recordings.Sort();
+  for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
+      if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == '~')) {
+         cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
+         if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
+            Add(Item);
+            LastItem = Item;
+            free(LastItemText);
+            LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
+            }
+         else
+            delete Item;
+         if (LastItem) {
+            if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
+               SetCurrent(LastItem);
+            if (LastItem->IsDirectory())
+               LastItem->IncrementCounter(recording->IsNew());
+            }
+         }
+      }
+  free(LastItemText);
+  Display();
+}
+
 cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
 {
   cRecording *recording = Recordings.GetByName(Item->FileName());
@@ -1654,8 +1670,8 @@ eOSState cMenuRecordings::Delete(void)
         if (recording) {
            if (recording->Delete()) {
               cReplayControl::ClearLastReplayed(ri->FileName());
+              Recordings.DelByName(ri->FileName());
               cOsdMenu::Del(Current());
-              Recordings.Del(recording);
               SetHelpKeys();
               Display();
               if (!Count())
@@ -1716,6 +1732,9 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kYellow: return Delete();
        case kBlue:   return Info();
        case k1...k9: return Commands(Key);
+       case kNone:   if (Recordings.StateChanged(recordingsState))
+                        Set(true);
+                     break;
        default: break;
        }
      }
@@ -2202,6 +2221,8 @@ cMenuSetupRecord::cMenuSetupRecord(void)
 // --- cMenuSetupReplay ------------------------------------------------------
 
 class cMenuSetupReplay : public cMenuSetupBase {
+protected:
+  virtual void Store(void);
 public:
   cMenuSetupReplay(void);
   };
@@ -2214,6 +2235,13 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
+void cMenuSetupReplay::Store(void)
+{
+  if (Setup.ResumeID != data.ResumeID)
+     Recordings.ResetResume();
+  cMenuSetupBase::Store();
+}
+
 // --- cMenuSetupMisc --------------------------------------------------------
 
 class cMenuSetupMisc : public cMenuSetupBase {
@@ -2597,6 +2625,7 @@ static void SetTrackDescriptions(bool Live)
         }
      }
   else if (cReplayControl::LastReplayed()) {
+     cThreadLock RecordingsLock(&Recordings);
      cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
      if (Recording)
         Components = Recording->Info()->Components();
diff --git a/menu.h b/menu.h
index 9d0ecbd96..a122fa394 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.73 2005/09/03 11:41:41 kls Exp $
+ * $Id: menu.h 1.74 2005/09/25 09:03:32 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -147,8 +147,10 @@ class cMenuRecordings : public cOsdMenu {
 private:
   char *base;
   int level;
+  int recordingsState;
   static int helpKeys;
   void SetHelpKeys(void);
+  void Set(bool Refresh = false);
   cRecording *GetRecording(cMenuRecordingItem *Item);
   bool Open(bool OpenSubMenus = false);
   eOSState Play(void);
diff --git a/menuitems.c b/menuitems.c
index 18b001ee2..1f2cc14ae 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.22 2005/03/19 15:33:34 kls Exp $
+ * $Id: menuitems.c 1.23 2005/09/17 09:36:31 kls Exp $
  */
 
 #include "menuitems.h"
@@ -322,10 +322,14 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
   switch (Key) {
     case kRed:   // Switch between upper- and lowercase characters
-                 if (pos >= 0 && (!insert || !newchar)) {
-                    uppercase = !uppercase;
-                    value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]);
+                 if (pos >= 0) {
+                    if (!insert || !newchar) {
+                       uppercase = !uppercase;
+                       value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]);
+                       }
                     }
+                 else
+                    return osUnknown;
                  break;
     case kGreen: // Toggle insert/overwrite modes
                  if (pos >= 0) {
@@ -333,6 +337,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     newchar = true;
                     SetHelpKeys();
                     }
+                 else
+                    return osUnknown;
                  break;
     case kYellow|k_Repeat:
     case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
@@ -350,6 +356,15 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        uppercase = isupper(value[pos]);
                     newchar = true;
                     }
+                 else
+                    return osUnknown;
+                 break;
+    case kBlue|k_Repeat:
+    case kBlue:  // consume the key only if in edit-mode
+                 if (pos >= 0)
+                    ;
+                 else
+                    return osUnknown;
                  break;
     case kLeft|k_Repeat:
     case kLeft:  if (pos > 0) {
diff --git a/newplugin b/newplugin
index 90d6113ae..92bc0d46c 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.20 2005/08/27 16:13:29 kls Exp $
+# $Id: newplugin 1.21 2005/09/14 16:02:06 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -245,13 +245,13 @@ bool cPlugin${PLUGIN_CLASS}::Service(const char *Id, void *Data)
   return false;
 }
 
-const char **cPlugin${PLUGIN_CLASS}::SVDRPHelpPages(vo<F3>id)
+const char **cPlugin${PLUGIN_CLASS}::SVDRPHelpPages(void)
 {
   // Return help text for SVDRP commands this plugin implements
   return NULL;
 }
 
-const char *cPlugin${PLUGIN_CLASS}::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+cString cPlugin${PLUGIN_CLASS}::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
 {
   // Process SVDRP commands this plugin implements
   return NULL;
diff --git a/recording.c b/recording.c
index 3640a8e92..8b21cdd21 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.113 2005/09/10 12:36:48 kls Exp $
+ * $Id: recording.c 1.119 2005/09/25 14:29:49 kls Exp $
  */
 
 #include "recording.h"
@@ -60,17 +60,23 @@
 
 bool VfatFileSystem = false;
 
+static cRecordings DeletedRecordings(true);
+
 void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
-  if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
+  if (LastRemoveCheck == 0) {
+     DeletedRecordings.Update();
+     LastRemoveCheck = time(NULL) - REMOVECHECKDELTA * 9 / 10;
+     }
+  else if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
      // Make sure only one instance of VDR does this:
      cLockFile LockFile(VideoDirectory);
      if (!LockFile.Lock())
         return;
      // Remove the oldest file that has been "deleted":
-     cRecordings DeletedRecordings(true);
-     if (DeletedRecordings.Load()) {
+     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+     if (DeletedRecordings.Count()) {
         cRecording *r = DeletedRecordings.First();
         cRecording *r0 = r;
         while (r) {
@@ -80,11 +86,14 @@ void RemoveDeletedRecordings(void)
               }
         if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 3600) {
            r0->Remove();
+           DeletedRecordings.Del(r0);
            RemoveEmptyVideoDirectories();
            LastRemoveCheck += REMOVELATENCY;
            return;
            }
         }
+     else
+        DeletedRecordings.Update();
      LastRemoveCheck = time(NULL);
      }
 }
@@ -104,8 +113,8 @@ void AssertFreeDiskSpace(int Priority)
            return;
         // Remove the oldest file that has been "deleted":
         isyslog("low disk space while recording, trying to remove a deleted recording...");
-        cRecordings DeletedRecordings(true);
-        if (DeletedRecordings.Load()) {
+        cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+        if (DeletedRecordings.Count()) {
            cRecording *r = DeletedRecordings.First();
            cRecording *r0 = r;
            while (r) {
@@ -114,13 +123,20 @@ void AssertFreeDiskSpace(int Priority)
                  r = DeletedRecordings.Next(r);
                  }
            if (r0 && r0->Remove()) {
+              DeletedRecordings.Del(r0);
               LastFreeDiskCheck += REMOVELATENCY / Factor;
               return;
               }
            }
+        // DeletedRecordings was empty, so to be absolutely sure there are no
+        // deleted recordings we need to double check:
+        DeletedRecordings.Update(true);
+        if (DeletedRecordings.Count())
+           return; // the next call will actually remove it
         // No "deleted" files to remove, so let's see if we can delete a recording:
         isyslog("...no deleted recording found, trying to delete an old recording...");
-        if (Recordings.Load()) {
+        cThreadLock RecordingsLock(&Recordings);
+        if (Recordings.Count()) {
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
@@ -199,6 +215,7 @@ bool cResumeFile::Save(int Index)
         if (safe_write(f, &Index, sizeof(Index)) < 0)
            LOG_ERROR_STR(fileName);
         close(f);
+        Recordings.ResetResume(fileName);
         return true;
         }
      }
@@ -210,6 +227,7 @@ void cResumeFile::Delete(void)
   if (fileName) {
      if (remove(fileName) < 0 && errno != ENOENT)
         LOG_ERROR_STR(fileName);
+     Recordings.ResetResume(fileName);
      }
 }
 
@@ -288,7 +306,7 @@ tCharExchange CharExchange[] = {
   { 0, 0 }
   };
 
-static char *ExchangeChars(char *s, bool ToFileSystem)
+char *ExchangeChars(char *s, bool ToFileSystem)
 {
   char *p = s;
   while (*p) {
@@ -454,6 +472,7 @@ cRecording::cRecording(const char *FileName)
         name[p - FileName] = 0;
         name = ExchangeChars(name, false);
         }
+     GetResume();
      // read an optional info file:
      char *InfoFileName = NULL;
      asprintf(&InfoFileName, "%s%s", fileName, INFOFILESUFFIX);
@@ -492,11 +511,11 @@ cRecording::cRecording(const char *FileName)
                     line++;
                  }
            fclose(f);
-           if (line == 1) {
+           if (!data[2]) {
               data[2] = data[1];
               data[1] = NULL;
               }
-           else if (line == 2) {
+           else if (data[1] && data[2]) {
               // if line 1 is too long, it can't be the short text,
               // so assume the short text is missing and concatenate
               // line 1 and line 2 to be the long text:
@@ -715,21 +734,50 @@ bool cRecording::Remove(void)
   return RemoveVideoFile(FileName());
 }
 
+void cRecording::ResetResume(void) const
+{
+  resume = RESUME_NOT_INITIALIZED;
+}
+
 // --- cRecordings -----------------------------------------------------------
 
 cRecordings Recordings;
 
 cRecordings::cRecordings(bool Deleted)
+:cThread("video directory scanner")
 {
+  updateFileName = strdup(AddDirectory(VideoDirectory, ".update"));
   deleted = Deleted;
   lastUpdate = 0;
+  state = 0;
+}
+
+cRecordings::~cRecordings()
+{
+  Cancel(3);
+  free(updateFileName);
+}
+
+void cRecordings::Action(void)
+{
+  Refresh();
+}
+
+void cRecordings::Refresh(bool Foreground)
+{
+  lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
+  Lock();
+  Clear();
+  ChangeState();
+  Unlock();
+  ScanVideoDir(VideoDirectory, Foreground);
 }
 
-void cRecordings::ScanVideoDir(const char *DirName)
+void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
 {
   cReadDir d(DirName);
   struct dirent *e;
-  while ((e = d.Next()) != NULL) {
+  while ((Foreground || Running()) && (e = d.Next()) != NULL) {
         if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
            char *buffer;
            asprintf(&buffer, "%s/%s", DirName, e->d_name);
@@ -749,13 +797,17 @@ void cRecordings::ScanVideoDir(const char *DirName)
               if (S_ISDIR(st.st_mode)) {
                  if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
                     cRecording *r = new cRecording(buffer);
-                    if (r->Name())
+                    if (r->Name()) {
+                       Lock();
                        Add(r);
+                       ChangeState();
+                       Unlock();
+                       }
                     else
                        delete r;
                     }
                  else
-                    ScanVideoDir(buffer);
+                    ScanVideoDir(buffer, Foreground);
                  }
               }
            free(buffer);
@@ -763,18 +815,34 @@ void cRecordings::ScanVideoDir(const char *DirName)
         }
 }
 
+bool cRecordings::StateChanged(int &State)
+{
+  int NewState = state;
+  bool Result = State != NewState;
+  State = state;
+  return Result;
+}
+
+void cRecordings::TouchUpdate(void)
+{
+  TouchFile(updateFileName);
+  lastUpdate = time(NULL); // make sure we don't tigger ourselves
+}
+
 bool cRecordings::NeedsUpdate(void)
 {
-  return lastUpdate <= LastModifiedTime(AddDirectory(VideoDirectory, ".update"));
+  return lastUpdate < LastModifiedTime(updateFileName);
 }
 
-bool cRecordings::Load(void)
+bool cRecordings::Update(bool Wait)
 {
-  lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
-  Clear();
-  ScanVideoDir(VideoDirectory);
-  Sort();
-  return Count() > 0;
+  if (Wait) {
+     Refresh(true);
+     return Count() > 0;
+     }
+  else
+     Start();
+  return false;
 }
 
 cRecording *cRecordings::GetByName(const char *FileName)
@@ -788,18 +856,35 @@ cRecording *cRecordings::GetByName(const char *FileName)
 
 void cRecordings::AddByName(const char *FileName)
 {
+  LOCK_THREAD;
   cRecording *recording = GetByName(FileName);
   if (!recording) {
      recording = new cRecording(FileName);
      Add(recording);
+     ChangeState();
+     TouchUpdate();
      }
 }
 
 void cRecordings::DelByName(const char *FileName)
 {
+  LOCK_THREAD;
   cRecording *recording = GetByName(FileName);
-  if (recording)
+  if (recording) {
      Del(recording);
+     ChangeState();
+     TouchUpdate();
+     }
+}
+
+void cRecordings::ResetResume(const char *ResumeFileName)
+{
+  LOCK_THREAD;
+  for (cRecording *recording = First(); recording; recording = Next(recording)) {
+      if (!ResumeFileName || strncmp(ResumeFileName, recording->FileName(), strlen(recording->FileName())) == 0)
+         recording->ResetResume();
+      }
+  ChangeState();
 }
 
 // --- cMark -----------------------------------------------------------------
diff --git a/recording.h b/recording.h
index 567c6c41a..96bb4b546 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.40 2005/09/03 13:04:41 kls Exp $
+ * $Id: recording.h 1.44 2005/09/25 14:30:13 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -71,7 +71,7 @@ class cRecording : public cListObject {
   int lifetime;
   cRecording(cTimer *Timer, const cEvent *Event);
   cRecording(const char *FileName);
-  ~cRecording();
+  virtual ~cRecording();
   virtual int Compare(const cListObject &ListObject) const;
   const char *Name(void) const { return name; }
   const char *FileName(void) const;
@@ -79,6 +79,7 @@ class cRecording : public cListObject {
   const cRecordingInfo *Info(void) const { return info; }
   const char *PrefixFileName(char Prefix);
   int HierarchyLevels(void) const;
+  void ResetResume(void) const;
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool WriteInfo(void);
@@ -90,16 +91,37 @@ class cRecording : public cListObject {
        // Returns false in case of error
   };
 
-class cRecordings : public cList<cRecording> {
+class cRecordings : public cList<cRecording>, public cThread {
 private:
+  char *updateFileName;
   bool deleted;
   time_t lastUpdate;
-  void ScanVideoDir(const char *DirName);
+  int state;
+  void Refresh(bool Foreground = false);
+  void ScanVideoDir(const char *DirName, bool Foreground = false);
+protected:
+  void Action(void);
 public:
   cRecordings(bool Deleted = false);
-  bool Load(void);
-  void TriggerUpdate(void) { lastUpdate = 0; }
+  virtual ~cRecordings();
+  bool Load(void) { return Update(true); }
+       ///< Loads the current list of recordings and returns true if there
+       ///< is anything in it (for compatibility with older plugins - use
+       ///< Update(true) instead).
+  bool Update(bool Wait = false);
+       ///< Triggers an update of the list of recordings, which will run
+       ///< as a separate thread if Wait is false. If Wait is true, the
+       ///< function returns only after the update has completed.
+       ///< Returns true if Wait is true and there is anyting in the list
+       ///< of recordings, false otherwise.
+  void TouchUpdate(void);
+       ///< Touches the '.update' file in the video directory, so that other
+       ///< instances of VDR that access the same video directory can be triggered
+       ///< to update their recordings list.
   bool NeedsUpdate(void);
+  void ChangeState(void) { state++; }
+  bool StateChanged(int &State);
+  void ResetResume(const char *ResumeFileName = NULL);
   cRecording *GetByName(const char *FileName);
   void AddByName(const char *FileName);
   void DelByName(const char *FileName);
@@ -112,7 +134,7 @@ class cMark : public cListObject {
   int position;
   char *comment;
   cMark(int Position = 0, const char *Comment = NULL);
-  ~cMark();
+  virtual ~cMark();
   cString ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
@@ -205,4 +227,10 @@ int SecondsToFrames(int Seconds); //XXX+ ->player???
 
 int ReadFrame(int f, uchar *b, int Length, int Max);
 
+char *ExchangeChars(char *s, bool ToFileSystem);
+      // Exchanges the characters in the given string to or from a file system
+      // specific representation (depending on ToFileSystem). The given string will
+      // be modified and may be reallocated if more space is needed. The return
+      // value points to the resulting string, which may be different from s.
+
 #endif //__RECORDING_H
diff --git a/sections.c b/sections.c
index acf4dac2e..4df6c2599 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.13 2005/08/14 10:54:39 kls Exp $
+ * $Id: sections.c 1.14 2005/09/18 11:30:29 kls Exp $
  */
 
 #include "sections.h"
@@ -40,7 +40,7 @@ class cSectionHandlerPrivate {
 // --- cSectionHandler -------------------------------------------------------
 
 cSectionHandler::cSectionHandler(cDevice *Device)
-:cThread("Section handler")
+:cThread("section handler")
 {
   shp = new cSectionHandlerPrivate;
   device = Device;
diff --git a/summary2info.pl b/summary2info.pl
index 429067745..5d68d7944 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 1.4 2005/09/10 12:40:40 kls Exp $
+# $Id: summary2info.pl 1.5 2005/09/17 09:20:31 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
@@ -33,11 +33,11 @@
              }
           }
     close(F);
-    if ($line == 1) {
+    if (!$data[2]) {
        $data[2] = $data[1];
        $data[1] = "";
        }
-    elsif ($line == 2) {
+    elsif ($data[1] && $data[2]) {
        # if line 1 is too long, it can't be the short text,
        # so assume the short text is missing and concatenate
        # line 1 and line 2 to be the long text:
diff --git a/svdrp.c b/svdrp.c
index 2c567aa18..cc5df706b 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.80 2005/09/03 14:09:02 kls Exp $
+ * $Id: svdrp.c 1.82 2005/09/25 10:36:59 kls Exp $
  */
 
 #include "svdrp.h"
@@ -569,7 +569,7 @@ void cSVDRP::CmdDELR(const char *Option)
            if (!rc) {
               if (recording->Delete()) {
                  Reply(250, "Recording \"%s\" deleted", Option);
-                 ::Recordings.Load(); // must make sure the global recordings list is updated
+                 ::Recordings.DelByName(recording->FileName());
                  }
               else
                  Reply(554, "Error while deleting recording!");
@@ -890,7 +890,7 @@ void cSVDRP::CmdLSTE(const char *Option)
 
 void cSVDRP::CmdLSTR(const char *Option)
 {
-  bool recordings = Recordings.Load();
+  bool recordings = Recordings.Update(true);
   if (*Option) {
      if (isnumber(Option)) {
         cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
diff --git a/tools.c b/tools.c
index 28b2bbed6..dbd78c973 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.98 2005/09/11 13:11:05 kls Exp $
+ * $Id: tools.c 1.99 2005/09/25 12:56:06 kls Exp $
  */
 
 #include "tools.h"
@@ -17,6 +17,7 @@
 #include <sys/vfs.h>
 #include <time.h>
 #include <unistd.h>
+#include <utime.h>
 #include "i18n.h"
 
 int SysLogLevel = 3;
@@ -475,6 +476,12 @@ bool SpinUpDisk(const char *FileName)
   return false;
 }
 
+void TouchFile(const char *FileName)
+{
+  if (utime(FileName, NULL) == -1 && errno != ENOENT)
+     LOG_ERROR_STR(FileName);
+}
+
 time_t LastModifiedTime(const char *FileName)
 {
   struct stat fs;
diff --git a/tools.h b/tools.h
index 9d18d534e..7ad3e7637 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.76 2005/09/11 13:04:03 kls Exp $
+ * $Id: tools.h 1.78 2005/09/25 12:54:58 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -111,8 +111,9 @@ bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
-char *ReadLink(const char *FileName); ///< returns a new strings allocated on the heap, which the caller must delete (or NULL in case of an error)
+char *ReadLink(const char *FileName); ///< returns a new string allocated on the heap, which the caller must delete (or NULL in case of an error)
 bool SpinUpDisk(const char *FileName);
+void TouchFile(const char *FileName);
 time_t LastModifiedTime(const char *FileName);
 cString WeekDayName(int WeekDay);
 cString WeekDayName(time_t t);
diff --git a/vdr.c b/vdr.c
index 0e0e4288c..0fab18990 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.216 2005/09/04 08:57:15 kls Exp $
+ * $Id: vdr.c 1.217 2005/09/24 13:27:26 kls Exp $
  */
 
 #include <getopt.h>
@@ -437,6 +437,10 @@ int main(int argc, char *argv[])
 
   cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
 
+  // Recordings:
+
+  Recordings.Update();
+
   // EPG data:
 
   if (EpgDataFileName) {
@@ -539,10 +543,6 @@ int main(int argc, char *argv[])
   else
      cDevice::PrimaryDevice()->SetVolume(Setup.CurrentVolume, true);
 
-  // Recordings:
-
-  Recordings.Load();
-
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);
@@ -674,7 +674,7 @@ int main(int argc, char *argv[])
                }
            }
         if (!Menu && Recordings.NeedsUpdate())
-           Recordings.Load();
+           Recordings.Update();
         // CAM control:
         if (!Menu && !cOsd::IsOpen()) {
            Menu = CamControl();

From 88d8d634089bae65bdfea8238a847b7883058072 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 3 Oct 2005 18:00:00 +0200
Subject: [PATCH 126/307] =?UTF-8?q?Version=201.3.34=20-=20Fixed=20a=20left?=
 =?UTF-8?q?over=20'summary.vdr'=20in=20vdr.5=20(thanks=20to=20Peter=20Bier?=
 =?UTF-8?q?inger=20for=20reporting=20=20=20this=20one).=20-=20Fixed=20open?=
 =?UTF-8?q?ing=20recording=20folders=20in=20case=20the=20last=20replayed?=
 =?UTF-8?q?=20recording=20no=20longer=20=20=20exists=20(reported=20by=20Ud?=
 =?UTF-8?q?o=20Richter).=20-=20Fixed=20an=20unjustified=20"Error=20while?=
 =?UTF-8?q?=20accessing=20recording!"=20after=20deleting=20a=20recording?=
 =?UTF-8?q?=20=20=20from=20a=20subfolder.=20-=20Fixed=20handling=20the=20'?=
 =?UTF-8?q?.update'=20file=20in=20case=20the=20video=20directory=20is=20no?=
 =?UTF-8?q?t=20at=20the=20default=20=20=20location=20(reported=20by=20Jon?=
 =?UTF-8?q?=20Burgess).=20-=20Fixed=20a=20crash=20in=20cConfig::Load()=20w?=
 =?UTF-8?q?hen=20compiling=20on=20the=20PPC=20(thanks=20to=20Sascha=20=20?=
 =?UTF-8?q?=20Volkenandt).=20-=20Fixed=20the=20FATALERRNO=20macro=20to=20c?=
 =?UTF-8?q?heck=20for=20a=20non-zero=20errno=20value=20(reported=20by=20Ma?=
 =?UTF-8?q?rco=20=20=20Schl=C3=BC=C3=9Fler).=20-=20Added=20a=20check=20aga?=
 =?UTF-8?q?inst=20MAXOSDAREAS=20in=20cOsd::CanHandleAreas()=20(reported=20?=
 =?UTF-8?q?by=20Udo=20=20=20Richter).=20-=20Fixed=20setting=20current=20me?=
 =?UTF-8?q?nu=20item=20if=20the=20first=20one=20is=20non-selectable.=20-?=
 =?UTF-8?q?=20cOsdItem::cOsdItem()=20now=20has=20a=20'Selectable'=20parame?=
 =?UTF-8?q?ter.=20-=20Improved=20displaying=20'sub-title'=20and=20'bottom?=
 =?UTF-8?q?=20text'=20in=20the=20CAM=20menu.=20-=20Added=20status=20messag?=
 =?UTF-8?q?e=20"Resetting=20CAM..."=20for=20an=20immediate=20feedback=20wh?=
 =?UTF-8?q?en=20the=20CAM=20=20=20reset=20has=20been=20triggered.=20-=20Th?=
 =?UTF-8?q?e=20CAM=20menu=20now=20automatically=20updates=20itself=20in=20?=
 =?UTF-8?q?case=20of=20a=20progress=20display=20(as=20=20=20used,=20for=20?=
 =?UTF-8?q?instance,=20when=20updating=20the=20firmware=20via=20satellite)?=
 =?UTF-8?q?.=20-=20Now=20skipping=20some=20funny=20characters=20sent=20by?=
 =?UTF-8?q?=20some=20CAMs=20at=20the=20beginning=20of=20strings.=20-=20The?=
 =?UTF-8?q?=20CAM=20menu=20is=20now=20completely=20closed=20when=20pressin?=
 =?UTF-8?q?g=20the=20Menu=20key=20while=20inside=20=20=20a=20sub=20menu.?=
 =?UTF-8?q?=20-=20Reduced=20MAX=5FCONNECT=5FRETRIES=20in=20ci.c=20to=202?=
 =?UTF-8?q?=20(waiting=20too=20long=20made=20the=20whole=20thing=20=20=20a?=
 =?UTF-8?q?ppear=20hanging).=20-=20Added=20status=20message=20"Opening=20C?=
 =?UTF-8?q?AM=20menu..."=20for=20an=20immediate=20feedback=20when=20the=20?=
 =?UTF-8?q?CAM=20=20=20menu=20has=20been=20requested.=20-=20Speeded=20up?=
 =?UTF-8?q?=20initial=20opening=20of=20the=20CAM=20menu.=20-=20Fixed=20han?=
 =?UTF-8?q?dling=20of=20menus=20with=20no=20selectable=20items.=20-=20The?=
 =?UTF-8?q?=20character=200x8A=20in=20CAM=20menu=20strings=20is=20now=20ma?=
 =?UTF-8?q?pped=20to=20a=20real=20newline.=20-=20The=20'sub-title'=20and?=
 =?UTF-8?q?=20'bottom=20text'=20in=20the=20CAM=20menu=20can=20now=20consis?=
 =?UTF-8?q?t=20of=20several=20lines.=20-=20Improved=20the=20CAM=20enquiry?=
 =?UTF-8?q?=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                   |  8 +++
 HISTORY                        | 38 +++++++++++++-
 PLUGINS/src/skincurses/HISTORY |  4 ++
 PLUGINS/src/skincurses/README  |  8 +++
 channels.conf                  | 34 ++++++------
 ci.c                           | 37 ++++++++++++-
 ci.h                           |  5 +-
 config.h                       |  8 +--
 i18n.c                         | 79 +++++++++++++++++++++++++---
 menu.c                         | 95 +++++++++++++++++++++++++++-------
 menu.h                         |  4 +-
 osd.c                          |  4 +-
 osdbase.c                      | 16 +++---
 osdbase.h                      |  4 +-
 recording.c                    | 17 ++++--
 recording.h                    |  5 +-
 skins.c                        |  7 +--
 tools.h                        |  4 +-
 vdr.5                          |  4 +-
 19 files changed, 305 insertions(+), 76 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2a9dd18d0..36f15b727 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -791,6 +791,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for reporting a bug in timeout handling in cRwLock::Lock()
  for pointing out that the SVDRP command DELR deleted recordings that are currently
  being written to by a timer
+ for fixing a crash in cConfig::Load() when compiling on the PPC
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -918,6 +919,7 @@ Hermann Gausterer <mrq1@gmx.net>
 Peter Bieringer <pb@bieringer.de>
  for reporting a problem with duplicate recordings with the same file name
  for suggesting to implement the command line option '--vfat'
+ for reporting a leftover 'summary.vdr' in vdr.5
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
@@ -933,6 +935,8 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
  for pointing out a problem with NPTL ("Native Posix Thread Library")
  for changing thread handling to make it work with NPTL ("Native Posix Thread Library")
  for fixing a memory leak in thread handling when using NPTL
+ for reporting a bug in handling the '.update' file in case the video directory is
+ not at the default location
 
 Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
  for reporting a crash when canceling a newly created timer
@@ -1229,6 +1233,7 @@ Marco Schl
  for improving resetting CAM connections
  for fixing handling EPG data for time shifted events
  for fixing detecting short channel names for "Kabel Deutschland"
+ for reporting that the FATALERRNO macro needs to check for a non-zero errno value
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1281,6 +1286,9 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a problem with cRemux in a single thread
  for adding 'Service' functions to the plugin interface
  for reporting an unused MAINMENUENTRY in svdrpdemo.c
+ for reporting a bug in opening recording folders in case the last replayed recording
+ no longer exists
+ for reporting a missing check against MAXOSDAREAS in cOsd::CanHandleAreas()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 9eb14b8b2..58e8278d8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -45,7 +45,7 @@ Video Disk Recorder Revision History
   a prepended '@' character.
 - If an instant recording is currently active, the "Main" menu now contains
   an option to stop that recording.
-- Timers are now only processed when the Menu is not active. So after editing
+- Timers are now only processed when the menu is not active. So after editing
   a timer the effect will take place only after the menu has been closed.
   In order to avoid missing a timer event by inadvertently leaving the menu
   open, the menu will be closed automatically after about two minutes of
@@ -3849,3 +3849,39 @@ Video Disk Recorder Revision History
   added or deleted, so that other VDR instances can update their lists (thanks to
   Alexander Rieger).
 - Made the function ExchangeChars() public (suggested by Lucian Muresan).
+
+2005-10-03: Version 1.3.34
+
+- Fixed a leftover 'summary.vdr' in vdr.5 (thanks to Peter Bieringer for reporting
+  this one).
+- Fixed opening recording folders in case the last replayed recording no longer
+  exists (reported by Udo Richter).
+- Fixed an unjustified "Error while accessing recording!" after deleting a recording
+  from a subfolder.
+- Fixed handling the '.update' file in case the video directory is not at the default
+  location (reported by Jon Burgess).
+- Fixed a crash in cConfig::Load() when compiling on the PPC (thanks to Sascha
+  Volkenandt).
+- Fixed the FATALERRNO macro to check for a non-zero errno value (reported by Marco
+  Schl��ler).
+- Added a check against MAXOSDAREAS in cOsd::CanHandleAreas() (reported by Udo
+  Richter).
+- Fixed setting current menu item if the first one is non-selectable.
+- cOsdItem::cOsdItem() now has a 'Selectable' parameter.
+- Improved displaying 'sub-title' and 'bottom text' in the CAM menu.
+- Added status message "Resetting CAM..." for an immediate feedback when the CAM
+  reset has been triggered.
+- The CAM menu now automatically updates itself in case of a progress display (as
+  used, for instance, when updating the firmware via satellite).
+- Now skipping some funny characters sent by some CAMs at the beginning of strings.
+- The CAM menu is now completely closed when pressing the Menu key while inside
+  a sub menu.
+- Reduced MAX_CONNECT_RETRIES in ci.c to 2 (waiting too long made the whole thing
+  appear hanging).
+- Added status message "Opening CAM menu..." for an immediate feedback when the CAM
+  menu has been requested.
+- Speeded up initial opening of the CAM menu.
+- Fixed handling of menus with no selectable items.
+- The character 0x8A in CAM menu strings is now mapped to a real newline.
+- The 'sub-title' and 'bottom text' in the CAM menu can now consist of several lines.
+- Improved the CAM enquiry menu.
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 33119f4a8..3af01ccac 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -17,3 +17,7 @@ VDR Plugin 'skincurses' Revision History
 2005-05-16: Version 0.0.4
 
 - New "recording info" display.
+
+2005-10-01:
+
+- Added a note about using this skin to the README file.
diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README
index 7e82b22c5..ff82b0e77 100644
--- a/PLUGINS/src/skincurses/README
+++ b/PLUGINS/src/skincurses/README
@@ -14,3 +14,11 @@ The 'skincurses' plugin implements a VDR skin that works in a
 shell window, using only plain text output. It re-implements
 what used to be available by compiling VDR versions before 1.3.7
 with the DEBUG_OSD macro set.
+
+To activate this skin you can either select it in the Setup/OSD
+menu, or put the line
+
+OSDSkin = curses
+
+into your 'setup.conf' file before starting VDR. Make sure this
+is the only OSDSkin line in that file.
diff --git a/channels.conf b/channels.conf
index 0b35a9c2f..c34b8b4a2 100644
--- a/channels.conf
+++ b/channels.conf
@@ -8,26 +8,27 @@ hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
 ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:3:13002:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
+DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:133:5:0
 NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,98=por,99=deu,91=rus:0:0:8004:1:1070:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -44,22 +45,22 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1702,1801,1722:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1801,1722,1702:21:133:17:0
-DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702:513:133:4:0
+BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1722,1702,1801:21:133:17:0
+DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1801,1722,1702:513:133:4:0
 :Sportsworld
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1801,1722:17:133:3:0
-PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1722,1801,1702:27:133:4:0
+PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1722,1702,1801:17:133:3:0
+PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1801,1702,1722:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -89,9 +90,9 @@ TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Mix;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng:2317:960,961:10070:2:2044:0
+ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:960,961:10070:2:2044:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
-Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2317=eng,2318=NAR:2315:960,961:5904:2:2025:0
+Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2326=eng,2327=NAR:2315:960,961:5904:2:2025:0
 Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 Paramount 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
@@ -108,7 +109,7 @@ Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-WDR M�nster;ARD:12421:hC34:S19.2E:27500:701:702=deu:104:0:28310:1:1201:0
+WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
 Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
@@ -117,4 +118,5 @@ IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
 Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
+TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:2:1:65535:1:0
 :@1000 New channels
diff --git a/ci.c b/ci.c
index 4e341d758..9e86c6135 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.28 2005/09/17 11:43:08 kls Exp $
+ * $Id: ci.c 1.36 2005/10/03 12:58:22 kls Exp $
  */
 
 #include "ci.h"
@@ -92,9 +92,17 @@ static char *CopyString(int Length, const uint8_t *Data)
 ///< Copies the string at Data.
 ///< \return Returns a pointer to a newly allocated string.
 {
+  // Some CAMs send funny characters at the beginning of strings.
+  // Let's just skip them:
+  while (Length > 0 && (*Data == ' ' || *Data == 0x05 || *Data == 0x96 || *Data == 0x97)) {
+        Length--;
+        Data++;
+        }
   char *s = MALLOC(char, Length + 1);
   strncpy(s, (char *)Data, Length);
   s[Length] = 0;
+  // The character 0x8A is used as newline, so let's put a real '\n' in there:
+  strreplace(s, 0x8A, '\n');
   return s;
 }
 
@@ -394,7 +402,7 @@ const uint8_t *cCiTransportConnection::Data(int &Length)
   return tpdu->Data(Length);
 }
 
-#define MAX_CONNECT_RETRIES  20
+#define MAX_CONNECT_RETRIES  2
 
 int cCiTransportConnection::CreateConnection(void)
 {
@@ -1026,6 +1034,7 @@ class cCiMMI : public cCiSession {
   cCiEnquiry *Enquiry(bool Clear = false);
   bool SendMenuAnswer(uint8_t Selection);
   bool SendAnswer(const char *Text);
+  bool SendCloseMMI(void);
   };
 
 cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc)
@@ -1198,6 +1207,14 @@ bool cCiMMI::SendAnswer(const char *Text)
   return true;
 }
 
+bool cCiMMI::SendCloseMMI(void)
+{
+  dbgprotocol("%d: ==> Close MMI\n", SessionId());
+  SendData(AOT_CLOSE_MMI, 0);
+  //XXX return value of all SendData() calls???
+  return true;
+}
+
 // --- cCiMenu ---------------------------------------------------------------
 
 cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable)
@@ -1229,6 +1246,12 @@ bool cCiMenu::AddEntry(char *s)
   return false;
 }
 
+bool cCiMenu::HasUpdate(void)
+{
+  // If the mmi is gone, the menu shall be closed, which also qualifies as 'update'.
+  return !mmi || mmi->HasUserIO();
+}
+
 bool cCiMenu::Select(int Index)
 {
   cMutexLock MutexLock(&mutex);
@@ -1242,6 +1265,11 @@ bool cCiMenu::Cancel(void)
   return Select(-1);
 }
 
+bool cCiMenu::Abort(void)
+{
+  return mmi && mmi->SendCloseMMI();
+}
+
 // --- cCiEnquiry ------------------------------------------------------------
 
 cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
@@ -1271,6 +1299,11 @@ bool cCiEnquiry::Cancel(void)
   return Reply(NULL);
 }
 
+bool cCiEnquiry::Abort(void)
+{
+  return mmi && mmi->SendCloseMMI();
+}
+
 // --- cCiCaPmt --------------------------------------------------------------
 
 // Ca Pmt List Management:
diff --git a/ci.h b/ci.h
index 9d718951f..6c35e6f0a 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.14 2005/08/20 14:56:11 kls Exp $
+ * $Id: ci.h 1.17 2005/10/03 12:49:52 kls Exp $
  */
 
 #ifndef __CI_H
@@ -40,6 +40,8 @@ class cCiMenu {
   bool Selectable(void) { return selectable; }
   bool Select(int Index);
   bool Cancel(void);
+  bool Abort(void);
+  bool HasUpdate(void);
   };
 
 class cCiEnquiry {
@@ -58,6 +60,7 @@ class cCiEnquiry {
   int ExpectedLength(void) { return expectedLength; }
   bool Reply(const char *s);
   bool Cancel(void);
+  bool Abort(void);
   };
 
 class cCiCaPmt {
diff --git a/config.h b/config.h
index fa11391e9..d33de6ad8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.228 2005/09/14 16:04:09 kls Exp $
+ * $Id: config.h 1.230 2005/10/01 10:41:33 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.33"
-#define VDRVERSNUM   10333  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.34"
+#define VDRVERSNUM   10334  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -91,7 +91,7 @@ template<class T> class cConfig : public cList<T> {
   const char *FileName(void) { return fileName; }
   bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
   {
-    Clear();
+    cConfig<T>::Clear();
     if (FileName) {
        free(fileName);
        fileName = strdup(FileName);
diff --git a/i18n.c b/i18n.c
index ca5d77eb5..33f49e14e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.210 2005/09/25 11:57:04 kls Exp $
+ * $Id: i18n.c 1.213 2005/10/03 12:27:15 kls Exp $
  *
  * Translations provided by:
  *
@@ -2273,6 +2273,27 @@ const tI18nPhrase Phrases[] = {
     "K�vaketas peaaegu t�is!",
     "Kun lidt diskplads tilbage!",
   },
+  { "Opening CAM menu...",
+    "CAM-Men� wird ge�ffnet...",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
     "Ne morem odpreti CAM menija!",
@@ -2294,6 +2315,27 @@ const tI18nPhrase Phrases[] = {
     "Ei saa avada CAM men��d!",
     "Kan ikke �bne CAM menuen!",
   },
+  { "Resetting CAM...",
+    "CAM wird zur�ckgesetzt...",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
     "Ne morem resetirati CAM-a",
@@ -2316,26 +2358,47 @@ const tI18nPhrase Phrases[] = {
     "Kan ikke nulstille CAM!",
   },
   { "CAM has been reset",
-    "CAM wurde zur�ckgesetzt!",
-    "CAM je resetiran!",
-    "Modulo CAM reimpostato!",
-    "CAM is herstart!",
+    "CAM wurde zur�ckgesetzt",
+    "CAM je resetiran",
+    "Modulo CAM reimpostato",
+    "CAM is herstart",
     "",//TODO
     "La CAM a �t� r�initialis�e",
     "",//TODO
     "Salausmoduuli alustettu",
-    "CAM-Reset wykonany!",
+    "CAM-Reset wykonany",
     "CAM reiniciada",
     "��� CAM ����� ���������",
     "CA modulen har �terst�llts",
     "CAM-ul a fost resetat",
     "A CAM vissza lett �ll�tva",
     "CAM reiniciada",
-    "CAM-������ �����������!",
-    "CAM je resetiran!",
+    "CAM-������ �����������",
+    "CAM je resetiran",
     "CAM mooduli taask�ivitus tehtud",
     "CAM er blevet nulstillet",
   },
+  { "Please enter %d digits!",
+    "Bitte geben Sie %d Ziffern ein!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "No audio available!",
     "Kein Audio verf�gbar!",
     "Zvok ni dosegljiv",
diff --git a/menu.c b/menu.c
index a28c8a8bc..19079bec1 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.362 2005/09/25 13:37:21 kls Exp $
+ * $Id: menu.c 1.374 2005/10/03 12:53:51 kls Exp $
  */
 
 #include "menu.h"
@@ -34,6 +34,7 @@
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
+#define MAXWAITFORCAMMENU 4 // seconds to wait for the CAM menu to open
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
@@ -1287,33 +1288,59 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 cMenuCam::cMenuCam(cCiMenu *CiMenu)
 :cOsdMenu("")
 {
+  dsyslog("CAM: Menu ------------------");
   ciMenu = CiMenu;
   selected = false;
+  offset = 0;
   if (ciMenu->Selectable())
      SetHasHotkeys();
-  SetTitle(ciMenu->TitleText() ? ciMenu->TitleText() : "CAM");
-  for (int i = 0; i < ciMenu->NumEntries(); i++)
-      Add(new cOsdItem(hk(ciMenu->Entry(i))));
-  //XXX implement a clean way of displaying this:
-  Add(new cOsdItem(ciMenu->SubTitleText()));
-  Add(new cOsdItem(ciMenu->BottomText()));
+  SetTitle(*ciMenu->TitleText() ? ciMenu->TitleText() : "CAM");
+  dsyslog("CAM: '%s'", ciMenu->TitleText());
+  if (*ciMenu->SubTitleText()) {
+     dsyslog("CAM: '%s'", ciMenu->SubTitleText());
+     AddMultiLineItem(ciMenu->SubTitleText());
+     offset = Count();
+     }
+  for (int i = 0; i < ciMenu->NumEntries(); i++) {
+      Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable()));
+      dsyslog("CAM: '%s'", ciMenu->Entry(i));
+      }
+  if (*ciMenu->BottomText()) {
+     AddMultiLineItem(ciMenu->BottomText());
+     dsyslog("CAM: '%s'", ciMenu->BottomText());
+     }
   Display();
-  dsyslog("CAM: Menu - %s", ciMenu->TitleText());
 }
 
 cMenuCam::~cMenuCam()
 {
   if (!selected)
-     ciMenu->Cancel();
+     ciMenu->Abort();
   delete ciMenu;
 }
 
+void cMenuCam::AddMultiLineItem(const char *s)
+{
+  while (s && *s) {
+        const char *p = strchr(s, '\n');
+        int l = p ? p - s : strlen(s);
+        cOsdItem *item = new cOsdItem;
+        item->SetSelectable(false);
+        item->SetText(strndup(s, l), false);
+        Add(item);
+        s = p ? p + 1 : p;
+        }
+}
+
 eOSState cMenuCam::Select(void)
 {
   if (ciMenu->Selectable()) {
-     ciMenu->Select(Current());
-     selected = true;
+     ciMenu->Select(Current() - offset);
+     dsyslog("CAM: select %d", Current() - offset);
      }
+  else
+     ciMenu->Cancel();
+  selected = true;
   return osEnd;
 }
 
@@ -1327,36 +1354,51 @@ eOSState cMenuCam::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  else if (state == osBack) {
+     ciMenu->Cancel();
+     selected = true;
+     return osEnd;
+     }
+  if (ciMenu->HasUpdate()) {
+     selected = true;
+     return osEnd;
+     }
   return state;
 }
 
 // --- cMenuCamEnquiry -------------------------------------------------------
 
-//XXX this is just quick and dirty - make this a separate display object
 cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
-:cOsdMenu("", 10)
+:cOsdMenu("", 1)
 {
   ciEnquiry = CiEnquiry;
   int Length = ciEnquiry->ExpectedLength();
   input = MALLOC(char, Length + 1);
   *input = 0;
   replied = false;
-  SetTitle(ciEnquiry->Text() ? ciEnquiry->Text() : "CAM");
-  Add(new cMenuEditNumItem("Input", input, Length, ciEnquiry->Blind()));
+  SetTitle("CAM");
+  Add(new cOsdItem(ciEnquiry->Text(), osUnknown, false));
+  Add(new cOsdItem("", osUnknown, false));
+  Add(new cMenuEditNumItem("", input, Length, ciEnquiry->Blind()));
   Display();
 }
 
 cMenuCamEnquiry::~cMenuCamEnquiry()
 {
   if (!replied)
-     ciEnquiry->Cancel();
+     ciEnquiry->Abort();
   free(input);
   delete ciEnquiry;
 }
 
 eOSState cMenuCamEnquiry::Reply(void)
 {
-  //XXX check length???
+  if (ciEnquiry->ExpectedLength() < 0xFF && int(strlen(input)) != ciEnquiry->ExpectedLength()) {
+     char buffer[64];
+     snprintf(buffer, sizeof(buffer), tr("Please enter %d digits!"), ciEnquiry->ExpectedLength());
+     Skins.Message(mtError, buffer);
+     return osContinue;
+     }
   ciEnquiry->Reply(input);
   replied = true;
   return osEnd;
@@ -1372,6 +1414,11 @@ eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  else if (state == osBack) {
+     ciEnquiry->Cancel();
+     replied = true;
+     return osEnd;
+     }
   return state;
 }
 
@@ -1513,6 +1560,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
      SetCurrent(First());
   else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
      return;
+  Display();
   SetHelpKeys();
 }
 
@@ -1556,7 +1604,7 @@ void cMenuRecordings::Set(bool Refresh)
   if (Refresh) {
      cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
      if (ri) {
-        cRecording *Recording = GetRecording(ri);
+        cRecording *Recording = Recordings.GetByName(ri->FileName());
         if (Recording)
            CurrentRecording = Recording->FileName();
         }
@@ -1583,7 +1631,8 @@ void cMenuRecordings::Set(bool Refresh)
          }
       }
   free(LastItemText);
-  Display();
+  if (Refresh)
+     Display();
 }
 
 cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
@@ -2155,8 +2204,13 @@ eOSState cMenuSetupCICAM::Menu(void)
 {
   cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
   if (item) {
-     if (item->CiHandler()->EnterMenu(item->Slot()))
+     if (item->CiHandler()->EnterMenu(item->Slot())) {
+        Skins.Message(mtWarning, tr("Opening CAM menu..."));
+        time_t t = time(NULL);
+        while (time(NULL) - t < MAXWAITFORCAMMENU && !item->CiHandler()->HasUserIO())
+              item->CiHandler()->Process();
         return osEnd; // the CAM menu will be executed explicitly from the main loop
+        }
      else
         Skins.Message(mtError, tr("Can't open CAM menu!"));
      }
@@ -2167,6 +2221,7 @@ eOSState cMenuSetupCICAM::Reset(void)
 {
   cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
   if (item) {
+     Skins.Message(mtWarning, tr("Resetting CAM..."));
      if (item->CiHandler()->Reset(item->Slot())) {
         Skins.Message(mtInfo, tr("CAM has been reset"));
         return osEnd;
diff --git a/menu.h b/menu.h
index a122fa394..33e05b82d 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.74 2005/09/25 09:03:32 kls Exp $
+ * $Id: menu.h 1.76 2005/10/03 10:39:08 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -120,6 +120,8 @@ class cMenuCam : public cOsdMenu {
 private:
   cCiMenu *ciMenu;
   bool selected;
+  int offset;
+  void AddMultiLineItem(const char *s);
   eOSState Select(void);
 public:
   cMenuCam(cCiMenu *CiMenu);
diff --git a/osd.c b/osd.c
index 104393d11..83042e290 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.62 2005/06/19 10:43:04 kls Exp $
+ * $Id: osd.c 1.63 2005/10/02 08:47:13 kls Exp $
  */
 
 #include "osd.h"
@@ -618,6 +618,8 @@ cBitmap *cOsd::GetBitmap(int Area)
 
 eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
+  if (NumAreas > MAXOSDAREAS)
+     return oeTooManyAreas;
   eOsdError Result = oeOk;
   for (int i = 0; i < NumAreas; i++) {
       if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)
diff --git a/osdbase.c b/osdbase.c
index 98307cd3f..9646bcc43 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.20 2005/06/18 10:30:51 kls Exp $
+ * $Id: osdbase.c 1.22 2005/10/02 15:00:40 kls Exp $
  */
 
 #include "osdbase.h"
@@ -25,12 +25,12 @@ cOsdItem::cOsdItem(eOSState State)
   fresh = true;
 }
 
-cOsdItem::cOsdItem(const char *Text, eOSState State)
+cOsdItem::cOsdItem(const char *Text, eOSState State, bool Selectable)
 {
   text = NULL;
   offset = -1;
   state = State;
-  selectable = true;
+  selectable = Selectable;
   fresh = true;
   SetText(Text);
 }
@@ -196,8 +196,11 @@ void cOsdMenu::Display(void)
   int count = Count();
   if (count > 0) {
      int ni = 0;
-     for (cOsdItem *item = First(); item; item = Next(item))
+     for (cOsdItem *item = First(); item; item = Next(item)) {
          cStatus::MsgOsdItem(item->Text(), ni++);
+         if (current < 0 && item->Selectable())
+            current = item->Index();
+         }
      if (current < 0)
         current = 0; // just for safety - there HAS to be a current item!
      if (current - first >= displayMenuItems || current < first) {
@@ -210,8 +213,9 @@ void cOsdMenu::Display(void)
      int i = first;
      int n = 0;
      for (cOsdItem *item = Get(first); item; item = Next(item)) {
-         displayMenu->SetItem(item->Text(), i - first, i == current, item->Selectable());
-         if (i == current)
+         bool CurrentSelectable = (i == current) && item->Selectable();
+         displayMenu->SetItem(item->Text(), i - first, CurrentSelectable, item->Selectable());
+         if (CurrentSelectable)
             cStatus::MsgOsdCurrentItem(item->Text());
          if (++n == displayMenuItems)
             break;
diff --git a/osdbase.h b/osdbase.h
index bcb3c404e..ec545ae91 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.11 2005/06/12 10:46:34 kls Exp $
+ * $Id: osdbase.h 1.12 2005/10/02 09:18:20 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -56,7 +56,7 @@ class cOsdItem : public cListObject {
   bool fresh;
 public:
   cOsdItem(eOSState State = osUnknown);
-  cOsdItem(const char *Text, eOSState State = osUnknown);
+  cOsdItem(const char *Text, eOSState State = osUnknown, bool Selectable = true);
   virtual ~cOsdItem();
   bool Selectable(void) { return selectable; }
   void SetText(const char *Text, bool Copy = true);
diff --git a/recording.c b/recording.c
index 8b21cdd21..9e9692243 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.119 2005/09/25 14:29:49 kls Exp $
+ * $Id: recording.c 1.120 2005/10/01 10:29:02 kls Exp $
  */
 
 #include "recording.h"
@@ -743,10 +743,11 @@ void cRecording::ResetResume(void) const
 
 cRecordings Recordings;
 
+char *cRecordings::updateFileName = NULL;
+
 cRecordings::cRecordings(bool Deleted)
 :cThread("video directory scanner")
 {
-  updateFileName = strdup(AddDirectory(VideoDirectory, ".update"));
   deleted = Deleted;
   lastUpdate = 0;
   state = 0;
@@ -755,7 +756,6 @@ cRecordings::cRecordings(bool Deleted)
 cRecordings::~cRecordings()
 {
   Cancel(3);
-  free(updateFileName);
 }
 
 void cRecordings::Action(void)
@@ -763,6 +763,13 @@ void cRecordings::Action(void)
   Refresh();
 }
 
+const char *cRecordings::UpdateFileName(void)
+{
+  if (!updateFileName)
+     updateFileName = strdup(AddDirectory(VideoDirectory, ".update"));
+  return updateFileName;
+}
+
 void cRecordings::Refresh(bool Foreground)
 {
   lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
@@ -825,13 +832,13 @@ bool cRecordings::StateChanged(int &State)
 
 void cRecordings::TouchUpdate(void)
 {
-  TouchFile(updateFileName);
+  TouchFile(UpdateFileName());
   lastUpdate = time(NULL); // make sure we don't tigger ourselves
 }
 
 bool cRecordings::NeedsUpdate(void)
 {
-  return lastUpdate < LastModifiedTime(updateFileName);
+  return lastUpdate < LastModifiedTime(UpdateFileName());
 }
 
 bool cRecordings::Update(bool Wait)
diff --git a/recording.h b/recording.h
index 96bb4b546..341284f28 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.44 2005/09/25 14:30:13 kls Exp $
+ * $Id: recording.h 1.45 2005/10/01 10:24:41 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -93,10 +93,11 @@ class cRecording : public cListObject {
 
 class cRecordings : public cList<cRecording>, public cThread {
 private:
-  char *updateFileName;
+  static char *updateFileName;
   bool deleted;
   time_t lastUpdate;
   int state;
+  const char *UpdateFileName(void);
   void Refresh(bool Foreground = false);
   void ScanVideoDir(const char *DirName, bool Foreground = false);
 protected:
diff --git a/skins.c b/skins.c
index fb21ed386..e81e8825a 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.4 2005/01/14 13:07:19 kls Exp $
+ * $Id: skins.c 1.5 2005/10/02 10:12:10 kls Exp $
  */
 
 #include "skins.h"
@@ -169,8 +169,9 @@ bool cSkins::SetCurrent(const char *Name)
 eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
 {
   switch (Type) {
-    case mtInfo:  isyslog("info: %s", s); break;
-    case mtError: esyslog("ERROR: %s", s); break;
+    case mtInfo:    isyslog("info: %s", s); break;
+    case mtWarning: isyslog("warning: %s", s); break;
+    case mtError:   esyslog("ERROR: %s", s); break;
     default: ;
     }
   if (!Current())
diff --git a/tools.h b/tools.h
index 7ad3e7637..97f426261 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.78 2005/09/25 12:54:58 kls Exp $
+ * $Id: tools.h 1.79 2005/10/01 12:43:31 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -45,7 +45,7 @@ extern int SysLogLevel;
 #define DELETENULL(p) (delete (p), p = NULL)
 
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
-#define FATALERRNO (errno != EAGAIN && errno != EINTR)
+#define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
 
 #ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
 template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
diff --git a/vdr.5 b/vdr.5
index 32676175d..f139556b8 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.38 2005/09/04 14:43:42 kls Exp $
+.\" $Id: vdr.5 1.39 2005/09/26 21:38:44 kls Exp $
 .\"
 .TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
 .SH NAME
@@ -325,7 +325,7 @@ of these cannot be determined, \fBTITLE\fR will default to the channel name, and
 Arbitrary text that describes the recording made by this timer.
 Any newline characters in the summary have to be replaced by '|', and
 the summary may contain ':' characters. If this field is not empty, its
-contents will be written into the \fIsummary.vdr\fR file of the recording.
+contents will be written into the \fIinfo.vdr\fR file of the recording.
 .SS SOURCES
 The file \fIsources.conf\fR defines the codes to be used in the \fBSource\fR field
 of channels in \fIchannels.conf\fR and assigns descriptive texts to them.

From 99e3c093f404b55683a90e38bbe74e1f51c35316 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 31 Oct 2005 18:00:00 +0100
Subject: [PATCH 127/307] =?UTF-8?q?Version=201.3.35=20-=20Updated=20'sourc?=
 =?UTF-8?q?es.conf'=20(thanks=20to=20Philip=20Prindeville).=20-=20Now=20us?=
 =?UTF-8?q?ing=20daemon()=20instead=20of=20fork()=20to=20run=20VDR=20in=20?=
 =?UTF-8?q?daemon=20mode=20(thanks=20to=20=20=20Enrico=20Scholz).=20-=20Fi?=
 =?UTF-8?q?xed=20a=20possible=20endless=20loop=20in=20a=20menu=20with=20no?=
 =?UTF-8?q?=20selectable=20items=20if=20=20=20Setup.MenuScrollWrap=20is=20?=
 =?UTF-8?q?true=20(thanks=20to=20Enrico=20Scholz).=20-=20Making=20sure=20n?=
 =?UTF-8?q?o=20item=20is=20displayed=20as=20"current"=20if=20Up,=20Down,?=
 =?UTF-8?q?=20Left=20or=20Right=20is=20=20=20pressed=20in=20a=20menu=20wit?=
 =?UTF-8?q?h=20no=20selectable=20items.=20-=20Added=20'=5F=5Fattribute=5F?=
 =?UTF-8?q?=5F'=20to=20functions=20that=20use=20printf()=20like=20paramete?=
 =?UTF-8?q?rs=20(thanks=20=20=20to=20Darren=20Salt).=20-=20Updated=20the?=
 =?UTF-8?q?=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20?=
 =?UTF-8?q?-=20Fixed=20a=20leftover=20'summary.vdr'=20in=20vdr.1=20(report?=
 =?UTF-8?q?ed=20by=20Christoph=20Hermanns).=20-=20Added=20more=20error=20m?=
 =?UTF-8?q?essages=20and=20line=20numbers=20when=20reading=20EPG=20data=20?=
 =?UTF-8?q?and=20info.vdr=20=20=20(thanks=20to=20Peter=20Bieringer).=20-?=
 =?UTF-8?q?=20Updated=20the=20Danish=20OSD=20texts=20(thanks=20to=20Mogens?=
 =?UTF-8?q?=20Elneff).=20-=20Updated=20the=20Estonian=20OSD=20texts=20(tha?=
 =?UTF-8?q?nks=20to=20Arthur=20Konovalov).=20-=20Added=20missing=20mutex?=
 =?UTF-8?q?=20locks=20to=20cCiMenu::Abort()=20and=20cCiEnquiry::Abort()=20?=
 =?UTF-8?q?(reported=20=20=20by=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fixe?=
 =?UTF-8?q?d=20lock=20handling=20in=20CAM=20communication=20to=20avoid=20p?=
 =?UTF-8?q?roblems=20with=20multiple=20CAMs=20=20=20per=20device=20or=20CA?=
 =?UTF-8?q?Ms=20with=20more=20than=20one=20smart=20card.=20-=20Updated=20t?=
 =?UTF-8?q?he=20Greek=20OSD=20texts=20(thanks=20to=20Dimitrios=20Dimitrako?=
 =?UTF-8?q?s).=20-=20Updated=20the=20French=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Nicolas=20Huillard).=20-=20Fixed=20the=20cFilter=20example?=
 =?UTF-8?q?=20in=20PLUGINS.html=20(reported=20by=20Patrick=20Fischer).=20-?=
 =?UTF-8?q?=20The=20new=20class=20cUnbufferedFile=20is=20used=20for=20the?=
 =?UTF-8?q?=20recording=20files=20to=20avoid=20=20=20trashing=20the=20file?=
 =?UTF-8?q?=20system=20cache=20(based=20on=20a=20patch=20by=20Ralf=20M?=
 =?UTF-8?q?=C3=BCller).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |  21 ++++++
 HISTORY       |  27 +++++++
 PLUGINS.html  |   2 +-
 channels.conf |  16 ++--
 ci.c          |  47 +++++++-----
 ci.h          |   8 +-
 config.h      |   6 +-
 cutter.c      |  12 +--
 dvbplayer.c   |  30 ++++----
 epg.c         |   8 +-
 i18n.c        | 204 +++++++++++++++++++++++++-------------------------
 menu.c        |   4 +-
 osdbase.c     |  18 +++--
 recorder.c    |  12 +--
 recording.c   |  47 ++++++------
 recording.h   |  12 +--
 sources.conf  |  15 +++-
 svdrp.h       |   4 +-
 thread.h      |   4 +-
 tools.c       | 125 ++++++++++++++++++++++++++++++-
 tools.h       |  25 ++++++-
 vdr.1         |   4 +-
 vdr.c         |  10 +--
 videodir.c    |  21 +++---
 videodir.h    |   6 +-
 25 files changed, 454 insertions(+), 234 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 36f15b727..ab323d2ce 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -920,6 +920,7 @@ Peter Bieringer <pb@bieringer.de>
  for reporting a problem with duplicate recordings with the same file name
  for suggesting to implement the command line option '--vfat'
  for reporting a leftover 'summary.vdr' in vdr.5
+ for adding more error messages and line numbers when reading EPG data and info.vdr
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
@@ -1024,6 +1025,7 @@ Rene Bartsch <ml@bartschnet.de>
 Christoph Hermanns <christoph.hermanns@gmx.de>
  for reporting a bug in handling the "Red" button in the "Schedules" menu in case
  there are no events listed for a particular channel
+ for reporting a leftover 'summary.vdr' in vdr.1
 
 Oskar Signell <oskar@signell.net>
  for pointing out a problem with setting an editing mark while in "Pause" mode,
@@ -1234,6 +1236,7 @@ Marco Schl
  for fixing handling EPG data for time shifted events
  for fixing detecting short channel names for "Kabel Deutschland"
  for reporting that the FATALERRNO macro needs to check for a non-zero errno value
+ for reporting missing mutex locks in cCiMenu::Abort() and cCiEnquiry::Abort()
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1343,6 +1346,7 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
  pages
  for a patch that was used to add the command line options '--lirc', '--rcu' and
  '--no-kbd'
+ for adding '__attribute__' to functions that use printf() like parameters
 
 Sean Carlos <seanc@libero.it>
  for translating OSD texts to the Italian language
@@ -1502,3 +1506,20 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for fixing handling color buttons in cMenuEditStrItem
  for making the '.update' file in the video directory be touched when a recording is
  added or deleted, so that other VDR instances can update their lists
+
+Philip Prindeville <philipp_subx@redfish-solutions.com>
+ for updates to 'sources.conf'
+
+Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+ for making VDR use use daemon() instead of fork() to run in daemon mode
+ for fixing a possible endless loop in a menu with no selectable items if
+ Setup.MenuScrollWrap is true (thanks to Enrico Scholz).
+
+Nicolas Huillard <nhuillard@e-dition.fr>
+ for translating OSD texts to the French language
+
+Patrick Fischer <patrick_fischer@gmx.de>
+ for reporting an error in the cFilter example in PLUGINS.html
+
+Ralf M�ller <ralf@bj-ig.de>
+ for a patch that was used to implement cUnbufferedFile
diff --git a/HISTORY b/HISTORY
index 58e8278d8..6ebe05626 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3885,3 +3885,30 @@ Video Disk Recorder Revision History
 - The character 0x8A in CAM menu strings is now mapped to a real newline.
 - The 'sub-title' and 'bottom text' in the CAM menu can now consist of several lines.
 - Improved the CAM enquiry menu.
+
+2005-10-31: Version 1.3.35
+
+- Updated 'sources.conf' (thanks to Philip Prindeville).
+- Now using daemon() instead of fork() to run VDR in daemon mode (thanks to
+  Enrico Scholz).
+- Fixed a possible endless loop in a menu with no selectable items if
+  Setup.MenuScrollWrap is true (thanks to Enrico Scholz).
+- Making sure no item is displayed as "current" if Up, Down, Left or Right is
+  pressed in a menu with no selectable items.
+- Added '__attribute__' to functions that use printf() like parameters (thanks
+  to Darren Salt).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed a leftover 'summary.vdr' in vdr.1 (reported by Christoph Hermanns).
+- Added more error messages and line numbers when reading EPG data and info.vdr
+  (thanks to Peter Bieringer).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Added missing mutex locks to cCiMenu::Abort() and cCiEnquiry::Abort() (reported
+  by Marco Schl��ler).
+- Fixed lock handling in CAM communication to avoid problems with multiple CAMs
+  per device or CAMs with more than one smart card.
+- Updated the Greek OSD texts (thanks to Dimitrios Dimitrakos).
+- Updated the French OSD texts (thanks to Nicolas Huillard).
+- Fixed the cFilter example in PLUGINS.html (reported by Patrick Fischer).
+- The new class cUnbufferedFile is used for the recording files to avoid
+  trashing the file system cache (based on a patch by Ralf M�ller).
diff --git a/PLUGINS.html b/PLUGINS.html
index c44e6523b..12317cc34 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1447,7 +1447,7 @@ <h1>Table Of Contents</h1>
 which it shall receive data, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-cMyFilter Filter;
+cMyFilter *Filter = new cMyFilter();
 
 cDevice::ActualDevice()-&gt;AttachFilter(Filter);
 </pre></td></tr></table><p>
diff --git a/channels.conf b/channels.conf
index c34b8b4a2..4c6e58bd7 100644
--- a/channels.conf
+++ b/channels.conf
@@ -8,12 +8,12 @@ hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320:330:0:28008:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
 ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
 ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
@@ -27,8 +27,8 @@ NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:3
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,98=por,99=deu,91=rus:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -45,13 +45,13 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1722,1702:20:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
@@ -89,7 +89,7 @@ QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
-Sky Mix;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
+Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
 ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:960,961:10070:2:2044:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2326=eng,2327=NAR:2315:960,961:5904:2:2025:0
diff --git a/ci.c b/ci.c
index 9e86c6135..4e63fde49 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.36 2005/10/03 12:58:22 kls Exp $
+ * $Id: ci.c 1.38 2005/10/30 13:04:10 kls Exp $
  */
 
 #include "ci.h"
@@ -156,7 +156,7 @@ class cTPDU {
   uint8_t Status(void);
   int Write(int fd);
   int Read(int fd);
-  void Dump(bool Outgoing);
+  void Dump(int fd, bool Outgoing);
   };
 
 cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t *Data)
@@ -207,9 +207,9 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t
 
 int cTPDU::Write(int fd)
 {
-  Dump(true);
+  Dump(fd, true);
   if (size)
-     return write(fd, data, size) == size ? OK : ERROR;
+     return safe_write(fd, data, size) == size ? OK : ERROR;
   esyslog("ERROR: attemp to write TPDU with zero size");
   return ERROR;
 }
@@ -222,20 +222,20 @@ int cTPDU::Read(int fd)
      size = 0;
      return ERROR;
      }
-  Dump(false);
+  Dump(fd, false);
   return OK;
 }
 
-void cTPDU::Dump(bool Outgoing)
+void cTPDU::Dump(int fd, bool Outgoing)
 {
   if (DumpTPDUDataTransfer) {
 #define MAX_DUMP 256
-     fprintf(stderr, "%s ", Outgoing ? "-->" : "<--");
+     fprintf(stderr, "%2d %s ", fd, Outgoing ? "-->" : "<--");
      for (int i = 0; i < size && i < MAX_DUMP; i++)
          fprintf(stderr, "%02X ", data[i]);
      fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : "");
      if (!Outgoing) {
-        fprintf(stderr, "   ");
+        fprintf(stderr, "      ");
         for (int i = 0; i < size && i < MAX_DUMP; i++)
             fprintf(stderr, "%2c ", isprint(data[i]) ? data[i] : '.');
         fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : "");
@@ -1048,12 +1048,12 @@ cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc)
 cCiMMI::~cCiMMI()
 {
   if (fetchedMenu) {
-     cMutexLock MutexLock(&fetchedMenu->mutex);
+     cMutexLock MutexLock(fetchedMenu->mutex);
      fetchedMenu->mmi = NULL;
      }
   delete menu;
   if (fetchedEnquiry) {
-     cMutexLock MutexLock(&fetchedEnquiry->mutex);
+     cMutexLock MutexLock(fetchedEnquiry->mutex);
      fetchedEnquiry->mmi = NULL;
      }
   delete enquiry;
@@ -1227,7 +1227,7 @@ cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable)
 
 cCiMenu::~cCiMenu()
 {
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(mutex);
   if (mmi)
      mmi->Menu(true);
   free(titleText);
@@ -1254,7 +1254,8 @@ bool cCiMenu::HasUpdate(void)
 
 bool cCiMenu::Select(int Index)
 {
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(mutex);
+  dbgprotocol("%d: ==> Select %d\n", mmi ? mmi->SessionId() : -1, Index);
   if (mmi && -1 <= Index && Index < numEntries)
      return mmi->SendMenuAnswer(Index + 1);
   return false;
@@ -1267,6 +1268,7 @@ bool cCiMenu::Cancel(void)
 
 bool cCiMenu::Abort(void)
 {
+  cMutexLock MutexLock(mutex);
   return mmi && mmi->SendCloseMMI();
 }
 
@@ -1282,7 +1284,7 @@ cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
 
 cCiEnquiry::~cCiEnquiry()
 {
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(mutex);
   if (mmi)
      mmi->Enquiry(true);
   free(text);
@@ -1290,7 +1292,7 @@ cCiEnquiry::~cCiEnquiry()
 
 bool cCiEnquiry::Reply(const char *s)
 {
-  cMutexLock MutexLock(&mutex);
+  cMutexLock MutexLock(mutex);
   return mmi ? mmi->SendAnswer(s) : false;
 }
 
@@ -1301,6 +1303,7 @@ bool cCiEnquiry::Cancel(void)
 
 bool cCiEnquiry::Abort(void)
 {
+  cMutexLock MutexLock(mutex);
   return mmi && mmi->SendCloseMMI();
 }
 
@@ -1617,8 +1620,12 @@ cCiMenu *cCiHandler::GetMenu(void)
   cMutexLock MutexLock(&mutex);
   for (int Slot = 0; Slot < numSlots; Slot++) {
       cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot);
-      if (mmi)
-         return mmi->Menu();
+      if (mmi) {
+         cCiMenu *Menu = mmi->Menu();
+         if (Menu)
+            Menu->mutex = &mutex;
+         return Menu;
+         }
       }
   return NULL;
 }
@@ -1628,8 +1635,12 @@ cCiEnquiry *cCiHandler::GetEnquiry(void)
   cMutexLock MutexLock(&mutex);
   for (int Slot = 0; Slot < numSlots; Slot++) {
       cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot);
-      if (mmi)
-         return mmi->Enquiry();
+      if (mmi) {
+         cCiEnquiry *Enquiry = mmi->Enquiry();
+         if (Enquiry)
+            Enquiry->mutex = &mutex;
+         return Enquiry;
+         }
       }
   return NULL;
 }
diff --git a/ci.h b/ci.h
index 6c35e6f0a..ae7601551 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.17 2005/10/03 12:49:52 kls Exp $
+ * $Id: ci.h 1.18 2005/10/30 12:31:14 kls Exp $
  */
 
 #ifndef __CI_H
@@ -17,11 +17,12 @@
 class cCiMMI;
 
 class cCiMenu {
+  friend class cCiHandler;
   friend class cCiMMI;
 private:
   enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum?
   cCiMMI *mmi;
-  cMutex mutex;
+  cMutex *mutex;
   bool selectable;
   char *titleText;
   char *subTitleText;
@@ -45,10 +46,11 @@ class cCiMenu {
   };
 
 class cCiEnquiry {
+  friend class cCiHandler;
   friend class cCiMMI;
 private:
   cCiMMI *mmi;
-  cMutex mutex;
+  cMutex *mutex;
   char *text;
   bool blind;
   int expectedLength;
diff --git a/config.h b/config.h
index d33de6ad8..9b17ad454 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.230 2005/10/01 10:41:33 kls Exp $
+ * $Id: config.h 1.231 2005/10/08 08:48:38 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.34"
-#define VDRVERSNUM   10334  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.35"
+#define VDRVERSNUM   10335  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index 9bbb0d407..f656bbddf 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.10 2005/08/14 10:51:54 kls Exp $
+ * $Id: cutter.c 1.11 2005/10/31 12:26:44 kls Exp $
  */
 
 #include "cutter.h"
@@ -18,7 +18,7 @@
 class cCuttingThread : public cThread {
 private:
   const char *error;
-  int fromFile, toFile;
+  cUnbufferedFile *fromFile, *toFile;
   cFileName *fromFileName, *toFileName;
   cIndexFile *fromIndex, *toIndex;
   cMarks fromMarks, toMarks;
@@ -34,7 +34,7 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
 :cThread("video cutting")
 {
   error = NULL;
-  fromFile = toFile = -1;
+  fromFile = toFile = NULL;
   fromFileName = toFileName = NULL;
   fromIndex = toIndex = NULL;
   if (fromMarks.Load(FromFileName) && fromMarks.Count()) {
@@ -64,7 +64,7 @@ void cCuttingThread::Action(void)
   if (Mark) {
      fromFile = fromFileName->Open();
      toFile = toFileName->Open();
-     if (fromFile < 0 || toFile < 0)
+     if (!fromFile || !toFile)
         return;
      int Index = Mark->position;
      Mark = fromMarks.Next(Mark);
@@ -92,7 +92,7 @@ void cCuttingThread::Action(void)
                  fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
                  CurrentFileNumber = FileNumber;
                  }
-              if (fromFile >= 0) {
+              if (fromFile) {
                  int len = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
                  if (len < 0) {
                     error = "ReadFrame";
@@ -131,7 +131,7 @@ void cCuttingThread::Action(void)
                  cutIn = false;
                  }
               }
-           if (safe_write(toFile, buffer, Length) < 0) {
+           if (toFile->Write(buffer, Length) < 0) {
               error = "safe_write";
               break;
               }
diff --git a/dvbplayer.c b/dvbplayer.c
index 8f76ab6c7..fd640d3c9 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.40 2005/08/29 15:43:30 kls Exp $
+ * $Id: dvbplayer.c 1.41 2005/10/31 12:33:48 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -74,7 +74,7 @@ int cBackTrace::Get(bool Forward)
 
 class cNonBlockingFileReader : public cThread {
 private:
-  int f;
+  cUnbufferedFile *f;
   uchar *buffer;
   int wanted;
   int length;
@@ -86,14 +86,14 @@ class cNonBlockingFileReader : public cThread {
   cNonBlockingFileReader(void);
   ~cNonBlockingFileReader();
   void Clear(void);
-  int Read(int FileHandle, uchar *Buffer, int Length);
+  int Read(cUnbufferedFile *File, uchar *Buffer, int Length);
   bool Reading(void) { return buffer; }
   };
 
 cNonBlockingFileReader::cNonBlockingFileReader(void)
 :cThread("non blocking file reader")
 {
-  f = -1;
+  f = NULL;
   buffer = NULL;
   wanted = length = 0;
   hasData = false;
@@ -110,7 +110,7 @@ cNonBlockingFileReader::~cNonBlockingFileReader()
 void cNonBlockingFileReader::Clear(void)
 {
   Lock();
-  f = -1;
+  f = NULL;
   free(buffer);
   buffer = NULL;
   wanted = length = 0;
@@ -119,7 +119,7 @@ void cNonBlockingFileReader::Clear(void)
   newSet.Signal();
 }
 
-int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
+int cNonBlockingFileReader::Read(cUnbufferedFile *File, uchar *Buffer, int Length)
 {
   if (hasData && buffer) {
      if (buffer != Buffer) {
@@ -131,7 +131,7 @@ int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length)
      return length;
      }
   if (!buffer) {
-     f = FileHandle;
+     f = File;
      buffer = Buffer;
      wanted = Length;
      length = 0;
@@ -146,8 +146,8 @@ void cNonBlockingFileReader::Action(void)
 {
   while (Running()) {
         Lock();
-        if (!hasData && f >= 0 && buffer) {
-           int r = safe_read(f, buffer + length, wanted - length);
+        if (!hasData && f && buffer) {
+           int r = f->Read(buffer + length, wanted - length);
            if (r >= 0) {
               length += r;
               if (!r || length == wanted) // r == 0 means EOF
@@ -181,7 +181,7 @@ class cDvbPlayer : public cPlayer, cThread {
   cBackTrace *backTrace;
   cFileName *fileName;
   cIndexFile *index;
-  int replayFile;
+  cUnbufferedFile *replayFile;
   bool eof;
   bool firstPacket;
   ePlayModes playMode;
@@ -237,7 +237,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   isyslog("replay %s", FileName);
   fileName = new cFileName(FileName, false);
   replayFile = fileName->Open();
-  if (replayFile < 0)
+  if (!replayFile)
      return;
   ringBuffer = new cRingBufferFrame(PLAYERBUFSIZE);
   // Create the index file:
@@ -302,10 +302,10 @@ bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset)
 {
   if (FileNumber > 0)
      replayFile = fileName->SetOffset(FileNumber, FileOffset);
-  else if (replayFile >= 0 && eof)
+  else if (replayFile && eof)
      replayFile = fileName->NextFile();
   eof = false;
-  return replayFile >= 0;
+  return replayFile != NULL;
 }
 
 int cDvbPlayer::Resume(void)
@@ -342,7 +342,7 @@ bool cDvbPlayer::Save(void)
 void cDvbPlayer::Activate(bool On)
 {
   if (On) {
-     if (replayFile >= 0)
+     if (replayFile)
         Start();
      }
   else
@@ -376,7 +376,7 @@ void cDvbPlayer::Action(void)
            // Read the next frame from the file:
 
            if (playMode != pmStill && playMode != pmPause) {
-              if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
+              if (!readFrame && (replayFile || readIndex >= 0)) {
                  if (!nonBlockingFileReader->Reading()) {
                     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
                        uchar FileNumber;
diff --git a/epg.c b/epg.c
index 4377c6d31..0bdd185c7 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.37 2005/09/09 15:14:11 kls Exp $
+ * $Id: epg.c 1.38 2005/10/09 12:57:55 kls Exp $
  */
 
 #include "epg.h"
@@ -285,8 +285,10 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
   if (Schedule) {
      cEvent *Event = NULL;
      char *s;
+     int line = 0;
      cReadLine ReadLine;
      while ((s = ReadLine.Read(f)) != NULL) {
+           line++;
            char *t = skipspace(s + 1);
            switch (*s) {
              case 'E': if (!Event) {
@@ -316,8 +318,10 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                        break;
              case 'c': // to keep things simple we react on 'c' here
                        return true;
-             default:  if (Event && !Event->Parse(s))
+             default:  if (Event && !Event->Parse(s)) {
+                          esyslog("ERROR: EPG data problem in line %d", line);
                           return false;
+                          }
              }
            }
      esyslog("ERROR: unexpected end of file while reading EPG data");
diff --git a/i18n.c b/i18n.c
index 33f49e14e..f21a320e3 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.213 2005/10/03 12:27:15 kls Exp $
+ * $Id: i18n.c 1.218 2005/10/30 13:37:57 kls Exp $
  *
  * Translations provided by:
  *
@@ -12,7 +12,7 @@
  * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>
  * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
- * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>
+ * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no>, Truls Slevigen <truls@slevigen.no>
  * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi>, Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  * Polish      Michael Rakowski <mrak@gmx.de>
@@ -218,7 +218,7 @@ const tI18nPhrase Phrases[] = {
     "Timers",
     "Programmation",
     "Timere",
-    "Ajastin",
+    "Ajastimet",
     "Timery",
     "Timer",
     "��������������",
@@ -258,19 +258,19 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Infos sur l'enregistrement",
     "",// TODO
     "Tallenteen tiedot",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������",
     "Inspelning",
     "Detaliile �nregistr�rii",
     "",// TODO
     "",// TODO
     "���� � ������",
     "",// TODO
-    "",// TODO
+    "Salvestuse info",
     "Optagelses info",
   },
   { "Setup",
@@ -323,7 +323,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Commandes d'enregistrement",
     "",// TODO
-    "Tallennuskomennot",
+    "Tallennekomennot",
     "Rozkazy Nagran",
     "�rdenes de grabaci�n",
     "������� ��� ��������",
@@ -426,12 +426,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Info",
     "",//TODO
     "Tiedot",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "�����������",
     "Info",
     "Info",
     "",//TODO
@@ -537,7 +537,7 @@ const tI18nPhrase Phrases[] = {
     "Uusi",
     "Nowy",
     "Nuevo",
-    "���",
+    "N��",
     "Ny",
     "Nou",
     "�j",
@@ -910,7 +910,7 @@ const tI18nPhrase Phrases[] = {
     "Inserisci",
     "Invoegen",
     "",// TODO
-    "Ins�rt",
+    "Ins�rer",
     "",// TODO
     "Lis��",
     "Wstawiac",
@@ -975,7 +975,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "R�initialisation",
     "",//TODO
-    "Alusta",
+    "Nollaa",
     "Reset",
     "Reiniciar",
     "���������",
@@ -999,7 +999,7 @@ const tI18nPhrase Phrases[] = {
     "P�ivit�",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������",
     "Skanna",
     "C�utare canale",
     "",//TODO
@@ -1081,7 +1081,7 @@ const tI18nPhrase Phrases[] = {
     "Timer activo - t�m a certeza que quer apagar?",
     "Enregistrement en cours - confirmez la suppression",
     "Timer gj�r opptak - vil du slette likevel?",
-    "Ajastettu tallennus k�ynniss� - keskeytet��nk�?",
+    "Ajastettu tallennus k�ynniss� - poistetaanko silti?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
     "�������������� �� ������� - �������� �������?",
@@ -1123,7 +1123,7 @@ const tI18nPhrase Phrases[] = {
     "no interface prim�rio",
     "sur la carte primaire",
     "p� f�rste enhet",
-    "p��vastaanottimella",
+    "ensisijaisella sovittimella",
     "na pierwszym interfejsie",
     "en interface primario",
     "���� ����� �����",
@@ -1231,7 +1231,7 @@ const tI18nPhrase Phrases[] = {
     "Tallennus alkaa %d min kuluttua - sammutetaanko?",
     "Nagrywanie za %d minut - mimo to wylaczyc?",
     "Grabando en %d minutos, �de verdad apagar?",
-    "���������� ������� �� %d ����� - ������ �� �����������?",
+    "���������� ������� �� %d ����� - ������ �� �����������?",
     "Inspelning startar om %d minuter, vill du avsluta?",
     "�nregistrez peste %d minute - �nchid, totu�i?",
     "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
@@ -1397,7 +1397,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
-    "Aikatieto-PID",
+    "PCR-PID",
     "Ppid",
     "Ppid",
     "Ppid",
@@ -1523,7 +1523,7 @@ const tI18nPhrase Phrases[] = {
     "Encripta��o",
     "Cryptage",
     "Kortleser",
-    "Salaus",
+    "Salaus (CA)",
     "CA",
     "CA",
     "CA",
@@ -1607,7 +1607,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
-    "Yl�suojaustaso",
+    "Suojaustaso (HP)",
     "CoderateH",
     "CoderateH",
     "CoderateH",
@@ -1628,7 +1628,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
-    "Alasuojaustaso",
+    "Suojaustaso (LP)",
     "CoderateL",
     "CoderateL",
     "CoderateL",
@@ -1670,7 +1670,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmission",
     "Transmission",
-    "L�hetystila",
+    "Transmissio",
     "Transmisja",
     "Transmission",
     "Transmission",
@@ -1715,7 +1715,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarkia",
     "Hierachia",
     "Hierarchy",
-    "Hierarchy",
+    "���������",
     "Hierarchy",
     "Ierarhie",
     "Hierarchy",
@@ -1842,7 +1842,7 @@ const tI18nPhrase Phrases[] = {
     "VPS",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "VPS",
     "VPS",
     "VPS",
     "",// TODO
@@ -2071,7 +2071,7 @@ const tI18nPhrase Phrases[] = {
     "Nenhuma placa DVB disponivel para gravar!",
     "Pas de carte DVB disponible pour l'enregistrement!",
     "Ingen ledige DVB enheter for opptak!",
-    "Ei vapaata vastaanotinta tallennukselle!",
+    "Ei vapaata DVB-viritint� tallennukselle!",
     "Brak wolnej karty DVB do nagrywania!",
     "�No hay dispositivo DVB disponible para grabar!",
     "���������� DVB ������ ��� �������!",
@@ -2281,18 +2281,18 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Avataan CA-moduulin valikkoa...",
     "",//TODO
     "",//TODO
     "",//TODO
+    "������� CAM �����",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "CAM-men�� avamine...",
+    "�bner CAM menu...",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -2302,7 +2302,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Impossible d'ouvrir le menu CAM!",
     "",//TODO
-    "Salausmoduulin valikko ei saatavilla",
+    "CA-moduulin valikko ei saatavilla",
     "CAM-Menu niedostepne!",
     "�No pudeo acceder al men� de la CAM!",
     "������� � �������� ��� CAM �����!",
@@ -2323,18 +2323,18 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "CA-moduuli palautetaan alkutilaan...",
     "",//TODO
     "",//TODO
     "",//TODO
+    "��������� CAM",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "CAM mooduli taask�ivitus...",
+    "Nulstiller CAM...",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -2344,7 +2344,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Impossible de r�initialiser la CAM!",
     "",//TODO
-    "Salausmoduulin alustus ep�onnistui!",
+    "CA-moduulin palautus alkutilaan ep�onnistui!",
     "Nieudany CAM-Reset!",
     "�No puedo reiniciar la CAM!",
     "������� �� ����� ��������� ��� CAM",
@@ -2365,7 +2365,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "La CAM a �t� r�initialis�e",
     "",//TODO
-    "Salausmoduuli alustettu",
+    "CA-moduuli palautettu alkutilaan",
     "CAM-Reset wykonany",
     "CAM reiniciada",
     "��� CAM ����� ���������",
@@ -2386,18 +2386,18 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Sy�t� %d numeroa!",
     "",//TODO
     "",//TODO
     "",//TODO
+    "�������� ��������������� %d �������",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Palun sisesta %d numbrit!",
+    "Indtast venligst %d cifre!",
   },
   { "No audio available!",
     "Kein Audio verf�gbar!",
@@ -2410,7 +2410,7 @@ const tI18nPhrase Phrases[] = {
     "��nen kieli ei ole valittavissa!",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "���������� ����",
     "Ljud saknas!"
     "Lipse�te sunetul!",
     "",//TODO
@@ -2513,7 +2513,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "Acc�s conditionnel",
     "CICAM",
-    "CI-moduuli",
+    "CICAM",
     "CICAM",
     "CICAM",
     "CICAM",
@@ -2685,7 +2685,7 @@ const tI18nPhrase Phrases[] = {
     "Ulkoasu",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "���������",
     "Skin",
     "Skin",
     "",// TODO
@@ -2706,7 +2706,7 @@ const tI18nPhrase Phrases[] = {
     "Teema",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����",
     "Tema",
     "Tem�",
     "",// TODO
@@ -2727,7 +2727,7 @@ const tI18nPhrase Phrases[] = {
     "Vaakakeskitys",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "��������",
     "V�nster",
     "St�nga",
     "",// TODO
@@ -2748,7 +2748,7 @@ const tI18nPhrase Phrases[] = {
     "Pystykeskitys",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�����",
     "�vre",
     "Sus",
     "",// TODO
@@ -2832,7 +2832,7 @@ const tI18nPhrase Phrases[] = {
     "K�yt� pieni� kirjasimia",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������������� ������ ��������������",
     "Anv�nd liten font",
     "Utilizare fonturi mici",
     "",// TODO
@@ -2853,7 +2853,7 @@ const tI18nPhrase Phrases[] = {
     "ei koskaan",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����"
     "aldrig",
     "niciodat�",
     "",// TODO
@@ -2869,12 +2869,12 @@ const tI18nPhrase Phrases[] = {
     "in base alla superficie",
     "skin afhankelijk",
     "",// TODO
-    "D�pend du skin",
+    "d�pend du skin",
     "",// TODO
     "ulkoasun mukaan",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������� ��� ��� ���������",
     "skin beroende",
     "dep. de skin",
     "",// TODO
@@ -2895,7 +2895,7 @@ const tI18nPhrase Phrases[] = {
     "aina",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�����",
     "alltid",
     "�ntotdeauna",
     "",// TODO
@@ -2937,7 +2937,7 @@ const tI18nPhrase Phrases[] = {
     "Kanavatiedon esitysaika (s)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ��������� ����������� �������� �� (�)",
     "Kanal information (s)",
     "Durata afi��rii info-canal (s)",
     "",// TODO
@@ -2974,7 +2974,7 @@ const tI18nPhrase Phrases[] = {
     "Scorri pagina nel menu",
     "Scrollen per pagina",
     "Scroll da p�gina no menu",
-    "Scrolling par pages",
+    "D�filement par pages",
     "Rask rulling i menyer",
     "Valikoiden vieritys sivuttain",
     "Przesuwac stronami",
@@ -2995,12 +2995,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "D�filement rotatif",
     "",// TODO
     "Valikoiden vieritys ymp�ri",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ����-����",
     "Rulla texten",
     "Derulare circular�",
     "",// TODO
@@ -3039,7 +3039,7 @@ const tI18nPhrase Phrases[] = {
     "Directorias de grava��o",
     "Dossiers d'enregistrements",
     "Kataloger til opptak",
-    "Tallennehakemistot",
+    "N�yt� tallennehakemistot",
     "Wykaz nagran",
     "Gracaciones en directorios",
     "������� ��������",
@@ -3100,12 +3100,12 @@ const tI18nPhrase Phrases[] = {
     "Visualizzazione dati vecchi (min)",
     "Oude EPG data tonen (min)",
     "",// TODO
-    "Montrer l'EPG plus vieux de m min",
+    "Montrer l'EPG p�rim� (min)",
     "",// TODO
     "Vanha tieto n�kyy (min)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������� ������������ ����������� (�����)",
     "Visa gammal information (min)",
     "Date EPG expirate cel mult (min)",
     "",// TODO
@@ -3123,7 +3123,7 @@ const tI18nPhrase Phrases[] = {
     "Ajustar rel�gio do sistema",
     "Ajuster l'heure du syst�me",
     "Juster system-klokken",
-    "Aseta kellonaika",
+    "Tahdista kellonaika",
     "Ustawianie czasu",
     "Ajustar reloj de sistema",
     "����������� ���� ����������",
@@ -3168,7 +3168,7 @@ const tI18nPhrase Phrases[] = {
     "Suosikkikielet",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������������ ������",
     "�nskade spr�k",
     "Limbi preferate",
     "",// TODO
@@ -3189,7 +3189,7 @@ const tI18nPhrase Phrases[] = {
     "Suosikkikieli",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����������� �����",
     "�nskat spr�k",
     "Limba preferat�",
     "",// TODO
@@ -3207,7 +3207,7 @@ const tI18nPhrase Phrases[] = {
     "Interface DVB prim�rio",
     "Carte DVB primaire",
     "Hoved DVB-enhet",
-    "P��vastaanotin",
+    "Ensisijainen DVB-sovitin",
     "Pierwotny interfejs DVB",
     "Primer interface DVB",
     "����� DVB �����",
@@ -3226,12 +3226,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Video display format",
     "",//TODO
-    "",//TODO
+    "Format d'affichage",
     "",//TODO
     "N�ytt�muoto",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "����� ��������� ������",
     "Format f�r video display",
     "Formatul red�rii video",
     "",//TODO
@@ -3315,7 +3315,7 @@ const tI18nPhrase Phrases[] = {
     "Kuvasuhde",
     "Format telewizyjny",
     "Formato V�deo",
-    "����� ������",
+    "����� ������",
     "Video format",
     "Format video",
     "Video form�tum",
@@ -3336,7 +3336,7 @@ const tI18nPhrase Phrases[] = {
     "K�yt� Dolby Digital -��nt�",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������������� ���� Dolby Digital",
     "Anv�nd Dolby Digital",
     "Sunet Dolby Digital",
     "",//TODO
@@ -3357,7 +3357,7 @@ const tI18nPhrase Phrases[] = {
     "P�ivit� kanavat",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "�������� ��������",
     "Uppdatera kanaler",
     "Actualizare canale",
     "",// TODO
@@ -3373,12 +3373,12 @@ const tI18nPhrase Phrases[] = {
     "solo nomi",
     "alleen namen",
     "",// TODO
-    "Seulement les noms",
+    "noms uniquement",
     "",// TODO
     "vain nimet",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "���� �����",
     "bara namn",
     "doar numele",
     "",// TODO
@@ -3394,12 +3394,12 @@ const tI18nPhrase Phrases[] = {
     "nomi e PIDs",
     "namen en PIDs",
     "",// TODO
-    "Noms et PIDs",
+    "noms et PIDs",
     "",// TODO
     "nimet ja PID:it",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����� ��� PID",
     "namn och PID",
     "nume si PID-uri",
     "",// TODO
@@ -3415,12 +3415,12 @@ const tI18nPhrase Phrases[] = {
     "aggiungere canali nuovi",
     "nieuwe kanalen toevoegen",
     "",// TODO
-    "Ajouter les nouvelles cha�nes",
-    "",// TODO
-    "lis�� uudet kanavat",
+    "ajouter cha�nes",
     "",// TODO
+    "uudet kanavat",
     "",// TODO
     "",// TODO
+    "�������� ���� ��������",
     "l�gg till nya kanaler",
     "ad�ugare canale noi",
     "",// TODO
@@ -3436,12 +3436,12 @@ const tI18nPhrase Phrases[] = {
     "aggiungere transponder nuovi",
     "nieuwe transponders toevoegen",
     "",// TODO
-    "Ajouter les nouveaux transpondeurs",
-    "",// TODO
-    "lis�� uudet transponderit",
+    "ajouter transpondeurs",
     "",// TODO
+    "uudet transponderit",
     "",// TODO
     "",// TODO
+    "�������� ���� transponder",
     "l�gg till nya transponders",
     "ad�ugare transpondere noi",
     "",// TODO
@@ -3457,12 +3457,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Audio talen",
     "",//TODO
-    "",//TODO
+    "Langues audio",
     "",//TODO
     "��nen kielet",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������ ����",
     "Antal ljudspr�k",
     "Limbi sunet",
     "",//TODO
@@ -3478,12 +3478,12 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Audio taal",
     "",//TODO
-    "",//TODO
+    "Langue audio",
     "",//TODO
     "��nen kieli",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "����� ����",
     "Ljudspr�k",
     "Limba sunetului",
     "",//TODO
@@ -3501,7 +3501,7 @@ const tI18nPhrase Phrases[] = {
     "Limite de bandas LNB (MHz)",
     "Limite de bandes LNB (MHz)",
     "LO-grensefrekvens (MHz)",
-    "LNB rajataajuus (MHz)",
+    "LNB-rajataajuus (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
@@ -3522,7 +3522,7 @@ const tI18nPhrase Phrases[] = {
     "Frequ�ncia base LNB (MHz)",
     "Fr�quence basse LNB (MHz)",
     "LO-frekvens i lavb�ndet (MHz)",
-    "LNB alempi taajuus (MHz)",
+    "LNB-alataajuus (MHz)",
     "Dolna czestotliwosc LNB (MHz)",
     "Frecuencia baja LNB (MHz)",
     "���� LNB-��������� (MHz)",
@@ -3543,7 +3543,7 @@ const tI18nPhrase Phrases[] = {
     "Frequ�ncia alta LNB (MHz)",
     "Fr�quence haute LNB (MHz)",
     "LO-frekvens i h�yb�ndet (MHz)",
-    "LNB ylempi taajuus (MHz)",
+    "LNB-yl�taajuus (MHz)",
     "Gorna czestotliwosc LNB (MHz)",
     "Frecuencia alta LNB (MHz)",
     "��� LNB-��������� (MHz)",
@@ -3564,7 +3564,7 @@ const tI18nPhrase Phrases[] = {
     "Utilizar DiSEqC",
     "Utiliser le DiSEqC",
     "Bruk DiSEqC",
-    "DiSEqC k�yt�ss�",
+    "K�yt� DiSEqC-kytkint�",
     "Uzywac DiSEqC",
     "Utilizar DiSEqC",
     "������������ DiSEqC",
@@ -3585,7 +3585,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "Acc�s conditionnel",
     "CICAM DVB",
-    "CI-moduuli DVB",
+    "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
@@ -3648,7 +3648,7 @@ const tI18nPhrase Phrases[] = {
     "Limite Prim�rio",
     "Limite primaire",
     "Prioritetsgrense HovedDVB",
-    "P��vastaanottimen prioriteetti",
+    "Ensisijaisen sovittimen prioriteettiraja",
     "Pierwotny limit",
     "L�mite primario",
     "�������� ����",
@@ -3777,7 +3777,7 @@ const tI18nPhrase Phrases[] = {
     "K�yt� VPS-toimintoa",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����� VPS",
     "Anv�nd VPS",
     "Utilizeaz� VPS",
     "",// TODO
@@ -3798,7 +3798,7 @@ const tI18nPhrase Phrases[] = {
     "VPS-toiminnon aloitusmarginaali (s)",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "��������� VPS (�)",
     "VPS marginal (s)",
     "Marj� de timp la utilizare VPS (s)",
     "",// TODO
@@ -3921,7 +3921,7 @@ const tI18nPhrase Phrases[] = {
     "Modo de multi-speed",
     "Mode multi-vitesses",
     "Multispeed modus",
-    "Moninopeustila",
+    "K�yt� toiston moninopeustilaa",
     "Tryb wielopredkosciowy",
     "Modo multi-velocidad",
     "������� ��������� ���������",
@@ -4026,7 +4026,7 @@ const tI18nPhrase Phrases[] = {
     "Timeout SVDRP (s)",
     "Temps maxi SVDRP (s)",
     "Ubrukt SVDRP-levetid (s)",
-    "SVDRP odotusaika (s)",
+    "SVDRP-komennon odotusaika (s)",
     "Min. brak aktywnosci SVDRP (s)",
     "SVDRP Timeout (s)",
     "SVDRP ������� (�)",
@@ -4045,7 +4045,7 @@ const tI18nPhrase Phrases[] = {
     "Timeout Zapping",
     "Zap timeout (s)",
     "",// TODO
-    "Prise en compte derni�re cha�ne (s)",
+    "Prise en compte cha�ne (s)",
     "",// TODO
     "Kanavavalinnan odotusaika (s)",
     "",// TODO
@@ -4915,7 +4915,7 @@ const tI18nPhrase Phrases[] = {
     "��ni",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����",
     "Ljud",
     "Sunet",
     "",// TODO
@@ -5228,7 +5228,7 @@ const tI18nPhrase Phrases[] = {
     "A mudar interface DVB prim�rio...",
     "Changement de carte DVB primaire...",
     "Bytter f�rste DVB-enhet...",
-    "Vaihdetaan p��vastaanottimelle...",
+    "Vaihdetaan ensisijaista DVB-sovitinta...",
     "Pierwszy interfejs DVB przelacza...",
     "Cambio al interface DVB primario...",
     "� ����� DVB ����� �������...",
@@ -5373,12 +5373,12 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Mise � jour du guide des programmes",
     "",// TODO
     "Ohjelmaoppaan p�ivitys aloitettu",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "���� ������ EPG",
     "P�b�rjar EPG skanning",
     "Pornesc achizi�ia EPG",
     "",// TODO
@@ -5415,12 +5415,12 @@ const tI18nPhrase Phrases[] = {
     "VDR Classico",
     "VDR Klassiek",
     "",// TODO
-    "",// TODO
+    "VDR Classique",// TODO
     "",// TODO
     "Klassinen VDR",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������� VDR",
     "Klassisk VDR",
     "VDR clasic",
     "",// TODO
@@ -5436,12 +5436,12 @@ const tI18nPhrase Phrases[] = {
     "Consolles ST:TNG",
     "ST:TNG Consoles",
     "",// TODO
-    "",// TODO
+    "Consoles ST:TNG",
     "",// TODO
     "ST:TNG konsoli",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ST:TNG",
     "ST:TNG konsoll",
     "Cons. ST:TNG",
     "",// TODO
@@ -5457,19 +5457,19 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Sans titre",
     "",// TODO
     "Ei esityst�",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "��� �����",
     "ingen titel",
     "F�r� titlu",
     "",// TODO
     "",// TODO
     "��� ��������",
     "Bez titla",
-    "",// TODO
+    "Pealkiri puudub",
     "Ingen titel",
   },
   { NULL }
diff --git a/menu.c b/menu.c
index 19079bec1..c280b4585 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.374 2005/10/03 12:53:51 kls Exp $
+ * $Id: menu.c 1.375 2005/10/09 11:22:03 kls Exp $
  */
 
 #include "menu.h"
@@ -230,7 +230,7 @@ class cMenuEditChannel : public cOsdMenu {
   };
 
 cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
-:cOsdMenu(tr("Edit channel"), 14)
+:cOsdMenu(tr("Edit channel"), 16)
 {
   channel = Channel;
   if (channel) {
diff --git a/osdbase.c b/osdbase.c
index 9646bcc43..e99c986ab 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.22 2005/10/02 15:00:40 kls Exp $
+ * $Id: osdbase.c 1.24 2005/10/09 10:56:26 kls Exp $
  */
 
 #include "osdbase.h"
@@ -242,8 +242,8 @@ void cOsdMenu::DisplayCurrent(bool Current)
 {
   cOsdItem *item = Get(current);
   if (item) {
-     displayMenu->SetItem(item->Text(), current - first, Current, item->Selectable());
-     if (Current)
+     displayMenu->SetItem(item->Text(), current - first, Current && item->Selectable(), item->Selectable());
+     if (Current && item->Selectable())
         cStatus::MsgOsdCurrentItem(item->Text());
      if (!Current)
         item->SetFresh(true); // leaving the current item resets 'fresh'
@@ -268,14 +268,16 @@ void cOsdMenu::CursorUp(void)
   int tmpCurrent = current;
   int lastOnScreen = first + displayMenuItems - 1;
   int last = Count() - 1;
+  if (last < 0)
+     return;
   while (--tmpCurrent != current) {
         if (tmpCurrent < 0) {
            if (Setup.MenuScrollWrap)
-              tmpCurrent = last;
+              tmpCurrent = last + 1;
            else
               return;
            }
-        if (SelectableItem(tmpCurrent))
+        else if (SelectableItem(tmpCurrent))
            break;
         }
   if (first <= tmpCurrent && tmpCurrent <= lastOnScreen)
@@ -298,14 +300,16 @@ void cOsdMenu::CursorDown(void)
   int tmpCurrent = current;
   int lastOnScreen = first + displayMenuItems - 1;
   int last = Count() - 1;
+  if (last < 0)
+     return;
   while (++tmpCurrent != current) {
         if (tmpCurrent > last) {
            if (Setup.MenuScrollWrap)
-              tmpCurrent = 0;
+              tmpCurrent = -1;
            else
               return;
            }
-        if (SelectableItem(tmpCurrent))
+        else if (SelectableItem(tmpCurrent))
            break;
         }
   if (first <= tmpCurrent && tmpCurrent <= lastOnScreen)
diff --git a/recorder.c b/recorder.c
index 34236fcab..35a8e56d8 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.15 2005/08/14 10:53:28 kls Exp $
+ * $Id: recorder.c 1.16 2005/10/31 12:35:29 kls Exp $
  */
 
 #include <stdarg.h>
@@ -28,7 +28,7 @@ class cFileWriter : public cThread {
   cIndexFile *index;
   uchar pictureType;
   int fileSize;
-  int recordFile;
+  cUnbufferedFile *recordFile;
   time_t lastDiskSpaceCheck;
   bool RunningLowOnDiskSpace(void);
   bool NextFile(void);
@@ -50,7 +50,7 @@ cFileWriter::cFileWriter(const char *FileName, cRemux *Remux)
   lastDiskSpaceCheck = time(NULL);
   fileName = new cFileName(FileName, true);
   recordFile = fileName->Open();
-  if (recordFile < 0)
+  if (!recordFile)
      return;
   // Create the index file:
   index = new cIndexFile(FileName, true);
@@ -81,13 +81,13 @@ bool cFileWriter::RunningLowOnDiskSpace(void)
 
 bool cFileWriter::NextFile(void)
 {
-  if (recordFile >= 0 && pictureType == I_FRAME) { // every file shall start with an I_FRAME
+  if (recordFile && pictureType == I_FRAME) { // every file shall start with an I_FRAME
      if (fileSize > MEGABYTE(Setup.MaxVideoFileSize) || RunningLowOnDiskSpace()) {
         recordFile = fileName->NextFile();
         fileSize = 0;
         }
      }
-  return recordFile >= 0;
+  return recordFile != NULL;
 }
 
 void cFileWriter::Action(void)
@@ -102,7 +102,7 @@ void cFileWriter::Action(void)
            if (NextFile()) {
               if (index && pictureType != NO_PICTURE)
                  index->Write(pictureType, fileName->Number(), fileSize);
-              if (safe_write(recordFile, p, Count) < 0) {
+              if (recordFile->Write(p, Count) < 0) {
                  LOG_ERROR_STR(fileName->Name());
                  break;
                  }
diff --git a/recording.c b/recording.c
index 9e9692243..c90e54da2 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.120 2005/10/01 10:29:02 kls Exp $
+ * $Id: recording.c 1.122 2005/10/31 12:27:58 kls Exp $
  */
 
 #include "recording.h"
@@ -264,7 +264,9 @@ bool cRecordingInfo::Read(FILE *f)
   if (ownEvent) {
      cReadLine ReadLine;
      char *s;
+     int line = 0;
      while ((s = ReadLine.Read(f)) != NULL) {
+           ++line;
            char *t = skipspace(s + 1);
            switch (*s) {
              case 'C': {
@@ -275,8 +277,10 @@ bool cRecordingInfo::Read(FILE *f)
                             channelID = tChannelID::FromString(t);
                        }
                        break;
-             default: if (!ownEvent->Parse(s))
+             default: if (!ownEvent->Parse(s)) {
+                         esyslog("ERROR: EPG data problem in line %d", line);
                          return false;
+                         }
                       break;
              }
            }
@@ -478,7 +482,8 @@ cRecording::cRecording(const char *FileName)
      asprintf(&InfoFileName, "%s%s", fileName, INFOFILESUFFIX);
      FILE *f = fopen(InfoFileName, "r");
      if (f) {
-        info->Read(f);
+        if (!info->Read(f))
+           esyslog("ERROR: EPG data problem in file %s", InfoFileName);
         fclose(f);
         }
      else if (errno != ENOENT)
@@ -1253,7 +1258,7 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
 
 cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
 {
-  file = -1;
+  file = NULL;
   fileNumber = 0;
   record = Record;
   blocking = Blocking;
@@ -1274,21 +1279,21 @@ cFileName::~cFileName()
   free(fileName);
 }
 
-int cFileName::Open(void)
+cUnbufferedFile *cFileName::Open(void)
 {
-  if (file < 0) {
+  if (!file) {
      int BlockingFlag = blocking ? 0 : O_NONBLOCK;
      if (record) {
         dsyslog("recording to '%s'", fileName);
         file = OpenVideoFile(fileName, O_RDWR | O_CREAT | BlockingFlag);
-        if (file < 0)
+        if (!file)
            LOG_ERROR_STR(fileName);
         }
      else {
         if (access(fileName, R_OK) == 0) {
            dsyslog("playing '%s'", fileName);
-           file = open(fileName, O_RDONLY | BlockingFlag);
-           if (file < 0)
+           file = cUnbufferedFile::Create(fileName, O_RDONLY | BlockingFlag);
+           if (!file)
               LOG_ERROR_STR(fileName);
            }
         else if (errno != ENOENT)
@@ -1300,14 +1305,14 @@ int cFileName::Open(void)
 
 void cFileName::Close(void)
 {
-  if (file >= 0) {
-     if ((record && CloseVideoFile(file) < 0) || (!record && close(file) < 0))
+  if (file) {
+     if ((record && CloseVideoFile(file) < 0) || (!record && file->Close() < 0))
         LOG_ERROR_STR(fileName);
-     file = -1;
+     file = NULL;
      }
 }
 
-int cFileName::SetOffset(int Number, int Offset)
+cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
 {
   if (fileNumber != Number)
      Close();
@@ -1332,23 +1337,23 @@ int cFileName::SetOffset(int Number, int Offset)
            }
         else if (errno != ENOENT) { // something serious has happened
            LOG_ERROR_STR(fileName);
-           return -1;
+           return NULL;
            }
         // found a non existing file suffix
         }
      if (Open() >= 0) {
-        if (!record && Offset >= 0 && lseek(file, Offset, SEEK_SET) != Offset) {
+        if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) {
            LOG_ERROR_STR(fileName);
-           return -1;
+           return NULL;
            }
         }
      return file;
      }
   esyslog("ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
-  return -1;
+  return NULL;
 }
 
-int cFileName::NextFile(void)
+cUnbufferedFile *cFileName::NextFile(void)
 {
   return SetOffset(fileNumber + 1);
 }
@@ -1382,7 +1387,7 @@ int SecondsToFrames(int Seconds)
 
 // --- ReadFrame -------------------------------------------------------------
 
-int ReadFrame(int f, uchar *b, int Length, int Max)
+int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max)
 {
   if (Length == -1)
      Length = Max; // this means we read up to EOF (see cIndex)
@@ -1390,10 +1395,8 @@ int ReadFrame(int f, uchar *b, int Length, int Max)
      esyslog("ERROR: frame larger than buffer (%d > %d)", Length, Max);
      Length = Max;
      }
-  int r = safe_read(f, b, Length);
+  int r = f->Read(b, Length);
   if (r < 0)
      LOG_ERROR;
   return r;
 }
-
-
diff --git a/recording.h b/recording.h
index 341284f28..28a1cd25f 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.45 2005/10/01 10:24:41 kls Exp $
+ * $Id: recording.h 1.46 2005/10/31 12:27:12 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -203,7 +203,7 @@ class cIndexFile {
 
 class cFileName {
 private:
-  int file;
+  cUnbufferedFile *file;
   int fileNumber;
   char *fileName, *pFileNumber;
   bool record;
@@ -213,10 +213,10 @@ class cFileName {
   ~cFileName();
   const char *Name(void) { return fileName; }
   int Number(void) { return fileNumber; }
-  int Open(void);
+  cUnbufferedFile *Open(void);
   void Close(void);
-  int SetOffset(int Number, int Offset = 0);
-  int NextFile(void);
+  cUnbufferedFile *SetOffset(int Number, int Offset = 0);
+  cUnbufferedFile *NextFile(void);
   };
 
 cString IndexToHMSF(int Index, bool WithFrame = false);
@@ -226,7 +226,7 @@ int HMSFToIndex(const char *HMSF);
 int SecondsToFrames(int Seconds); //XXX+ ->player???
       // Returns the number of frames corresponding to the given number of seconds.
 
-int ReadFrame(int f, uchar *b, int Length, int Max);
+int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max);
 
 char *ExchangeChars(char *s, bool ToFileSystem);
       // Exchanges the characters in the given string to or from a file system
diff --git a/sources.conf b/sources.conf
index 3ba2f508c..b318468e8 100644
--- a/sources.conf
+++ b/sources.conf
@@ -91,13 +91,22 @@ S58W    PAS 9
 S61.5W  Echostar 3
 S79W    AMC5
 S82W    Nimiq 2
+S85W    AMC2
 S87W    AMC3
-S91W    Nimiq 1
+S89W    Intelsat 808
+S91W    Galaxy 11 & Nimiq 1/3
+S93W    Intelsat 806
+S95W    Galaxy 3C
 S97W    Telestar 5
-S105W   AMC2
+S99W    Galaxy 4R
+S101W   AMC4
+S103W   AMC1
+S105W   AMC15
 S110W   Echostar 6/8
 S119W   Echostar 7
-S121W   Echostar 9
+S121W   Echostar 9 & Intelsat 813
+S123W   Galaxy 10R
+S129W   Intelsat 807
 S148W   Echostar 1/2
 S157W   Echostar 4
 
diff --git a/svdrp.h b/svdrp.h
index baa4fb337..9275bf279 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.23 2005/08/28 14:10:32 kls Exp $
+ * $Id: svdrp.h 1.24 2005/10/09 11:11:59 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -51,7 +51,7 @@ class cSVDRP {
   time_t lastActivity;
   void Close(bool Timeout = false);
   bool Send(const char *s, int length = -1);
-  void Reply(int Code, const char *fmt, ...);
+  void Reply(int Code, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
   void PrintHelpTopics(const char **hp);
   void CmdCHAN(const char *Option);
   void CmdCLRE(const char *Option);
diff --git a/thread.h b/thread.h
index 4eb09a105..e72677f3d 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.30 2005/08/14 11:21:48 kls Exp $
+ * $Id: thread.h 1.31 2005/10/09 11:12:32 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -106,7 +106,7 @@ class cThread {
        ///< the thread starts and stops. The Start() function must be called 
        ///< to actually start the thread.
   virtual ~cThread();
-  void SetDescription(const char *Description, ...);
+  void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
   bool Start(void);
        ///< Actually starts the thread.
   bool Active(void);
diff --git a/tools.c b/tools.c
index dbd78c973..aa20e6edc 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.99 2005/09/25 12:56:06 kls Exp $
+ * $Id: tools.c 1.100 2005/10/31 12:56:15 kls Exp $
  */
 
 #include "tools.h"
@@ -836,6 +836,129 @@ bool cSafeFile::Close(void)
   return result;
 }
 
+// --- cUnbufferedFile -------------------------------------------------------
+
+#define READ_AHEAD MEGABYTE(2)
+#define WRITE_BUFFER MEGABYTE(10)
+
+cUnbufferedFile::cUnbufferedFile(void)
+{
+  fd = -1;
+}
+
+cUnbufferedFile::~cUnbufferedFile()
+{
+  Close();
+}
+
+int cUnbufferedFile::Open(const char *FileName, int Flags, mode_t Mode)
+{
+  Close();
+  fd = open(FileName, Flags, Mode);
+  begin = end = ahead = -1;
+  written = 0;
+  return fd;
+}
+
+int cUnbufferedFile::Close(void)
+{
+  if (fd >= 0) {
+     if (ahead > end)
+        end = ahead;
+     if (begin >= 0 && end > begin) {
+        //dsyslog("close buffer: %d (flush: %d bytes, %ld-%ld)", fd, written, begin, end);
+        if (written)
+           fdatasync(fd);
+        posix_fadvise(fd, begin, end - begin, POSIX_FADV_DONTNEED);
+        }
+     begin = end = ahead = -1;
+     written = 0;
+     }
+  int OldFd = fd;
+  fd = -1;
+  return close(OldFd);
+}
+
+off_t cUnbufferedFile::Seek(off_t Offset, int Whence)
+{
+  if (fd >= 0)
+     return lseek(fd, Offset, Whence);
+  return -1;
+}
+
+ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
+{
+  if (fd >= 0) {
+     off_t pos = lseek(fd, 0, SEEK_CUR);
+     // jump forward - adjust end position
+     if (pos > end)
+        end = pos;
+     // after adjusting end - don't clear more than previously requested
+     if (end > ahead)
+        end = ahead;
+     // jump backward - drop read ahead of previous run
+     if (pos < begin)
+        end = ahead;
+     if (begin >= 0 && end > begin)
+        posix_fadvise(fd, begin - KILOBYTE(200), end - begin + KILOBYTE(200), POSIX_FADV_DONTNEED);//XXX macros/parameters???
+     begin = pos;
+     ssize_t bytesRead = safe_read(fd, Data, Size);
+     if (bytesRead > 0) {
+        pos += bytesRead;
+        end = pos;
+        // this seems to trigger a non blocking read - this
+        // may or may not have been finished when we will be called next time.
+        // If it is not finished we can't release the not yet filled buffers.
+        // So this is commented out till we find a better solution.
+        //posix_fadvise(fd, pos, READ_AHEAD, POSIX_FADV_WILLNEED);
+        ahead = pos + READ_AHEAD;
+        }
+     else
+        end = pos;
+     return bytesRead;
+     }
+  return -1;
+}
+
+ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
+{
+  if (fd >=0) {
+     off_t pos = lseek(fd, 0, SEEK_CUR);
+     ssize_t bytesWritten = safe_write(fd, Data, Size);
+     if (bytesWritten >= 0) {
+        written += bytesWritten;
+        if (begin >= 0) {
+           if (pos < begin)
+              begin = pos;
+           }
+        else
+           begin = pos;
+        if (pos + bytesWritten > end)
+           end = pos + bytesWritten;
+        if (written > WRITE_BUFFER) {
+           //dsyslog("flush buffer: %d (%d bytes, %ld-%ld)", fd, written, begin, end);
+           fdatasync(fd);
+           if (begin >= 0 && end > begin)
+              posix_fadvise(fd, begin, end - begin, POSIX_FADV_DONTNEED);
+           begin = end = -1;
+           written = 0;
+           }
+        }
+     return bytesWritten;
+     }
+  return -1;
+}
+
+cUnbufferedFile *cUnbufferedFile::Create(const char *FileName, int Flags, mode_t Mode)
+{
+  cUnbufferedFile *File = new cUnbufferedFile;
+  if (File->Open(FileName, Flags, Mode) < 0) {
+     delete File;
+     File = NULL;
+     }
+  return File;
+}
+
 // --- cLockFile -------------------------------------------------------------
 
 #define LOCKFILENAME      ".lock-vdr"
diff --git a/tools.h b/tools.h
index 97f426261..f348b2e51 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.79 2005/10/01 12:43:31 kls Exp $
+ * $Id: tools.h 1.81 2005/10/31 12:54:36 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -81,7 +81,7 @@ class cString {
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
   cString &operator=(const cString &String);
-  static cString sprintf(const char *fmt, ...);
+  static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
   };
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);
@@ -198,6 +198,27 @@ class cSafeFile {
   bool Close(void);
   };
 
+/// cUnbufferedFile is used for large files that are mainly written or read
+/// in a streaming manner, and thus should not be cached.
+
+class cUnbufferedFile {
+private:
+  int fd;
+  off_t begin;
+  off_t end;
+  off_t ahead;
+  ssize_t written;
+public:
+  cUnbufferedFile(void);
+  ~cUnbufferedFile();
+  int Open(const char *FileName, int Flags, mode_t Mode = DEFFILEMODE);
+  int Close(void);
+  off_t Seek(off_t Offset, int Whence);
+  ssize_t Read(void *Data, size_t Size);
+  ssize_t Write(const void *Data, size_t Size);
+  static cUnbufferedFile *Create(const char *FileName, int Flags, mode_t Mode = DEFFILEMODE);
+  };
+
 class cLockFile {
 private:
   char *fileName;
diff --git a/vdr.1 b/vdr.1
index af8ce1274..f50db90d6 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.14 2005/07/31 10:49:35 kls Exp $
+.\" $Id: vdr.1 1.15 2005/10/09 12:31:03 kls Exp $
 .\"
 .TH vdr 1 "19 Dec 2004" "1.3.18" "Video Disk Recorder"
 .SH NAME
@@ -166,7 +166,7 @@ access to the SVDRP port.
 .I marks.vdr
 Contains the editing marks defined for a recording.
 .TP
-.I summary.vdr
+.I info.vdr
 Contains a description of the recording.
 .TP
 .I resume.vdr
diff --git a/vdr.c b/vdr.c
index 0fab18990..9d84d84ee 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.217 2005/09/24 13:27:26 kls Exp $
+ * $Id: vdr.c 1.218 2005/10/09 10:01:45 kls Exp $
  */
 
 #include <getopt.h>
@@ -370,17 +370,11 @@ int main(int argc, char *argv[])
   // Daemon mode:
 
   if (DaemonMode) {
-     pid_t pid = fork();
-     if (pid < 0) {
+     if (daemon(1, 0) == -1) {
         fprintf(stderr, "%m\n");
         esyslog("ERROR: %m");
         return 2;
         }
-     if (pid != 0)
-        return 0; // initial program immediately returns
-     fclose(stdin);
-     fclose(stdout);
-     fclose(stderr);
      }
   else if (Terminal) {
      // Claim new controlling terminal
diff --git a/videodir.c b/videodir.c
index cb3d29a82..5206d0c7a 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.12 2005/08/06 09:53:21 kls Exp $
+ * $Id: videodir.c 1.13 2005/10/31 12:07:41 kls Exp $
  */
 
 #include "videodir.h"
@@ -102,7 +102,7 @@ const char *cVideoDirectory::Adjust(const char *FileName)
   return NULL;
 }
 
-int OpenVideoFile(const char *FileName, int Flags)
+cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags)
 {
   const char *ActualFileName = FileName;
 
@@ -110,7 +110,7 @@ int OpenVideoFile(const char *FileName, int Flags)
   if (strstr(FileName, VideoDirectory) != FileName) {
      esyslog("ERROR: %s not in %s", FileName, VideoDirectory);
      errno = ENOENT; // must set 'errno' - any ideas for a better value?
-     return -1;
+     return NULL;
      }
   // Are we going to create a new file?
   if ((Flags & O_CREAT) != 0) {
@@ -128,25 +128,26 @@ int OpenVideoFile(const char *FileName, int Flags)
         if (Dir.Stored()) {
            ActualFileName = Dir.Adjust(FileName);
            if (!MakeDirs(ActualFileName, false))
-              return -1; // errno has been set by MakeDirs()
+              return NULL; // errno has been set by MakeDirs()
            if (symlink(ActualFileName, FileName) < 0) {
               LOG_ERROR_STR(FileName);
-              return -1;
+              return NULL;
               }
            ActualFileName = strdup(ActualFileName); // must survive Dir!
            }
         }
      }
-  int Result = open(ActualFileName, Flags, DEFFILEMODE);
+  cUnbufferedFile *File = cUnbufferedFile::Create(ActualFileName, Flags, DEFFILEMODE);
   if (ActualFileName != FileName)
      free((char *)ActualFileName);
-  return Result;
+  return File;
 }
 
-int CloseVideoFile(int FileHandle)
+int CloseVideoFile(cUnbufferedFile *File)
 {
-  // just in case we ever decide to do something special when closing the file!
-  return close(FileHandle);
+  int Result = File->Close();
+  delete File;
+  return Result;
 }
 
 bool RenameVideoFile(const char *OldName, const char *NewName)
diff --git a/videodir.h b/videodir.h
index b9e38cb45..6dd2d8c1f 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.5 2004/12/26 11:52:56 kls Exp $
+ * $Id: videodir.h 1.6 2005/10/31 11:50:23 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -15,8 +15,8 @@
 
 extern const char *VideoDirectory;
 
-int OpenVideoFile(const char *FileName, int Flags);
-int CloseVideoFile(int FileHandle);
+cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags);
+int CloseVideoFile(cUnbufferedFile *File);
 bool RenameVideoFile(const char *OldName, const char *NewName);
 bool RemoveVideoFile(const char *FileName);
 bool VideoFileSpaceAvailable(int SizeMB);

From 812ab9018c7be7feb901eface4c6431b483ca9ec Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Nov 2005 18:00:00 +0100
Subject: [PATCH 128/307] =?UTF-8?q?Version=201.3.36=20-=20Fixed=20a=20NULL?=
 =?UTF-8?q?=20pointer=20access=20with=20the=20cUnbufferedFile=20when=20a?=
 =?UTF-8?q?=20replay=20session=20runs=20=20=20all=20the=20way=20until=20th?=
 =?UTF-8?q?e=20end=20of=20the=20recording=20(thanks=20to=20Joachim=20Wilke?=
 =?UTF-8?q?).=20-=20A=20menu=20is=20no=20longer=20automatically=20closed?=
 =?UTF-8?q?=20when=20a=20replay=20ends=20(reported=20by=20=20=20Marko=20M?=
 =?UTF-8?q?=C3=A4kel=C3=A4).=20-=20Removed=20'\n'=20from=20several=20syslo?=
 =?UTF-8?q?g()=20calls=20(reported=20by=20Sascha=20Volkenandt).=20-=20Fixe?=
 =?UTF-8?q?d=20missing=20'&'=20in=20the=20SetAreas()=20example=20in=20PLUG?=
 =?UTF-8?q?INS.html=20(reported=20by=20=20=20Sascha=20Volkenandt).=20-=20F?=
 =?UTF-8?q?ixed=20a=20memory=20leak=20in=20cString::operator=3D()=20(repor?=
 =?UTF-8?q?ted=20by=20Sascha=20Volkenandt).=20-=20Updated=20the=20Dutch=20?=
 =?UTF-8?q?OSD=20texts=20(thanks=20to=20Maarten=20Wisse).=20-=20cReadLine?=
 =?UTF-8?q?=20now=20dynamically=20allocates=20its=20buffer,=20so=20that=20?=
 =?UTF-8?q?it=20can=20handle=20lines=20=20=20of=20any=20length.=20-=20Chan?=
 =?UTF-8?q?ged=20cConfig::Load()=20to=20use=20cReadLine=20instead=20of=20a?=
 =?UTF-8?q?=20fixed=20buffer=20(thanks=20=20=20to=20Andreas=20Mair=20for?=
 =?UTF-8?q?=20reporting=20a=20problem=20with=20extremely=20long=20summary?=
 =?UTF-8?q?=20fields=20=20=20in=20timers).=20-=20cSVDRP=20now=20dynamicall?=
 =?UTF-8?q?y=20allocates=20its=20command=20buffer=20in=20order=20to=20hand?=
 =?UTF-8?q?le=20=20=20commands=20of=20any=20length.=20The=20MAXPARSEBUFFER?=
 =?UTF-8?q?=20macro=20is=20now=20obsolete=20and=20has=20=20=20been=20remov?=
 =?UTF-8?q?ed.=20If=20a=20plugin=20has=20used=20that=20macro,=20it=20shoul?=
 =?UTF-8?q?d=20either=20define=20=20=20a=20buffer=20size=20of=20its=20own,?=
 =?UTF-8?q?=20or=20use=20cReadLine=20when=20reading=20files.=20-=20Fixed?=
 =?UTF-8?q?=20a=20race=20condition=20in=20the=20SPU=20decoder=20(thanks=20?=
 =?UTF-8?q?to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20The=20EPG=20scan=20no?=
 =?UTF-8?q?=20longer=20disturbs=20players=20that=20have=20also=20set=20liv?=
 =?UTF-8?q?e=20PIDs=20=20=20(reported=20by=20Stefan=20Huelswitt).=20-=20Fi?=
 =?UTF-8?q?xed=20setting=20the=20help=20key=20display=20in=20the=20Recordi?=
 =?UTF-8?q?ngs=20menu=20in=20case=20of=20several=20=20=20layers=20of=20sub?=
 =?UTF-8?q?directories.=20-=20Removed=20EPG=20bugfix=20#0,=20because=20it?=
 =?UTF-8?q?=20removed=20actually=20important=20data.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  | 13 +++++++++++++
 HISTORY       | 31 +++++++++++++++++++++++++++++--
 PLUGINS.html  |  4 ++--
 channels.conf | 12 ++++++------
 ci.c          |  4 ++--
 config.h      | 21 +++++++++++----------
 device.c      |  7 ++++++-
 device.h      |  5 ++++-
 dvbspu.c      |  6 ++++--
 dvbspu.h      |  5 +++--
 eit.c         |  6 +++---
 eitscan.c     | 15 ++++++++-------
 epg.c         | 28 +---------------------------
 i18n.c        | 26 +++++++++++++-------------
 menu.c        |  7 +++----
 menu.h        |  4 ++--
 osd.c         |  4 ++--
 recording.c   |  6 +++---
 svdrp.c       | 21 ++++++++++++++-------
 svdrp.h       |  7 ++++---
 themes.c      |  4 ++--
 tools.c       | 25 +++++++++++++++++++------
 tools.h       |  9 +++++----
 vdr.c         | 10 ++++++++--
 24 files changed, 167 insertions(+), 113 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ab323d2ce..25276027c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -203,6 +203,8 @@ Stefan Huelswitt <huels@iname.com>
  for pointing out that recordings with empty episode names were not listed correctly
  in the LSTR command
  for fixing a memory leak in the SVDRP command LSTE
+ for reporting a problem with the EPG scan disturbing players that have also set
+ live PIDs
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -792,6 +794,9 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for pointing out that the SVDRP command DELR deleted recordings that are currently
  being written to by a timer
  for fixing a crash in cConfig::Load() when compiling on the PPC
+ for reporting '\n' in an esyslog() call in osd.c
+ for reporting missing '&' in the SetAreas() example in PLUGINS.html
+ for reporting a memory leak in cString::operator=()
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -854,6 +859,7 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
  is started through a user defined key macro
+ for reporting a problem with extremely long summary fields in timers
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1237,6 +1243,7 @@ Marco Schl
  for fixing detecting short channel names for "Kabel Deutschland"
  for reporting that the FATALERRNO macro needs to check for a non-zero errno value
  for reporting missing mutex locks in cCiMenu::Abort() and cCiEnquiry::Abort()
+ for fixing a race condition in the SPU decoder
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1319,6 +1326,8 @@ Mogens Elneff <mogens@elneff.dk>
 
 Joachim Wilke <vdr@joachim-wilke.de>
  for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
+ for fixing a NULL pointer access with the cUnbufferedFile when a replay session
+ runs all the way until the end of the recording
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -1497,6 +1506,7 @@ Harald Milz <hm@seneca.muc.de>
 
 Marko M�kel� <marko.makela@hut.fi>
  for making repeat keys be ignored when waiting for a keypress to cancel an operation
+ for reporting that a menu was automatically closed when a replay ends
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
@@ -1523,3 +1533,6 @@ Patrick Fischer <patrick_fischer@gmx.de>
 
 Ralf M�ller <ralf@bj-ig.de>
  for a patch that was used to implement cUnbufferedFile
+
+Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
+ for translating OSD texts to the Dutch language
diff --git a/HISTORY b/HISTORY
index 6ebe05626..1bcc2cf66 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2386,7 +2386,7 @@ Video Disk Recorder Revision History
 - Fixed the URL to the 'Doxygen' tool in INSTALL (thanks to Dirk Essl).
 - Removed the obsolete chapter "Stopping a recording on the primary DVB interface"
   from MANUAL.
-- Completed dutch language texts (thanks to Hans Dingemans).
+- Completed Dutch language texts (thanks to Hans Dingemans).
 - Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated (thanks to
   Thomas Schmidt).
 - VDR now starts up even if 'keymacros.conf' references a plugin that is currently
@@ -3434,7 +3434,7 @@ Video Disk Recorder Revision History
 - The new setup option "DVB/Video display format" can be used to define which display
   format to use for playing wide screen video on a 4:3 tv set.
 - Changed MAXDPIDS to 16 (8xAC3 + 8xDTS) (thanks to Werner Fink for pointing this out).
-- Completed dutch language texts (thanks to Hans Dingemans).
+- Completed Dutch language texts (thanks to Hans Dingemans).
 - Added 'smi' to the Finnish language codes (thanks to Rolf Ahrenberg).
 - Fixed ensuring there is a current audio track in case there is only one track
   (thanks to Werner Fink for reporting this one).
@@ -3912,3 +3912,30 @@ Video Disk Recorder Revision History
 - Fixed the cFilter example in PLUGINS.html (reported by Patrick Fischer).
 - The new class cUnbufferedFile is used for the recording files to avoid
   trashing the file system cache (based on a patch by Ralf M�ller).
+
+2005-11-06: Version 1.3.36
+
+- Fixed a NULL pointer access with the cUnbufferedFile when a replay session runs
+  all the way until the end of the recording (thanks to Joachim Wilke).
+- A menu is no longer automatically closed when a replay ends (reported by
+  Marko M�kel�).
+- Removed '\n' from several syslog() calls (reported by Sascha Volkenandt).
+- Fixed missing '&' in the SetAreas() example in PLUGINS.html (reported by
+  Sascha Volkenandt).
+- Fixed a memory leak in cString::operator=() (reported by Sascha Volkenandt).
+- Updated the Dutch OSD texts (thanks to Maarten Wisse).
+- cReadLine now dynamically allocates its buffer, so that it can handle lines
+  of any length.
+- Changed cConfig::Load() to use cReadLine instead of a fixed buffer (thanks
+  to Andreas Mair for reporting a problem with extremely long summary fields
+  in timers).
+- cSVDRP now dynamically allocates its command buffer in order to handle
+  commands of any length. The MAXPARSEBUFFER macros is now obsolete and has
+  been removed. If a plugin has used that macro, it should either define
+  a buffer size of its own, or use cReadLine when reading files.
+- Fixed a race condition in the SPU decoder (thanks to Marco Schl��ler).
+- The EPG scan no longer disturbs players that have also set live PIDs
+  (reported by Stefan Huelswitt).
+- Fixed setting the help key display in the Recordings menu in case of several
+  layers of subdirectories.
+- Removed EPG bugfix #0, because it removed actually important data.
diff --git a/PLUGINS.html b/PLUGINS.html
index 12317cc34..d1c787b36 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1476,7 +1476,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 tArea Area = { 0, 0, 100, 100, 4 };
-MyOsd-&gt;SetAreas(Area, 1);
+MyOsd-&gt;SetAreas(&amp;Area, 1);
 </pre></td></tr></table><p>
 
 to define an actual OSD drawing area (see VDR/osd.h for the declarations
@@ -1496,7 +1496,7 @@ <h1>Table Of Contents</h1>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 tArea Area = { 0, 0, 99, 99, 4 };
 if (osd-&gt;CanHandleAreas(Area, 1) == oeOk)
-   osd-&gt;SetAreas(Area, 1);
+   osd-&gt;SetAreas(&amp;Area, 1);
 else {
    tArea Areas[] = { { 0,  0, 99, 19, 2 },
                      { 0, 20, 99, 79, 2 },
diff --git a/channels.conf b/channels.conf
index 4c6e58bd7..80ec3ff87 100644
--- a/channels.conf
+++ b/channels.conf
@@ -28,7 +28,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -49,7 +49,7 @@ PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:3
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
@@ -57,10 +57,10 @@ DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,180
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1722,1702,1801:21:133:17:0
-DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1801,1722,1702:513:133:4:0
+EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1810,1801,1702,1722:513:133:4:0
 :Sportsworld
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1722,1702,1801:17:133:3:0
-PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:1801,1702,1722:27:133:4:0
+PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
+PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:0:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -115,7 +115,7 @@ S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:20
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
-Euro1080;EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0
+Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:FF:21100:1:1088:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
 TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:2:1:65535:1:0
diff --git a/ci.c b/ci.c
index 4e63fde49..3fe321e6a 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.38 2005/10/30 13:04:10 kls Exp $
+ * $Id: ci.c 1.39 2005/11/04 14:18:52 kls Exp $
  */
 
 #include "ci.h"
@@ -367,7 +367,7 @@ int cCiTransportConnection::RecvTPDU(void)
        }
      }
   else if (FATALERRNO) {
-     esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m\n", slot, tcid);
+     esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m", slot, tcid);
      Init(-1, slot, tcid);
      }
   return lastResponse;
diff --git a/config.h b/config.h
index 9b17ad454..ef84cf97d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.231 2005/10/08 08:48:38 kls Exp $
+ * $Id: config.h 1.234 2005/11/04 15:55:05 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.35"
-#define VDRVERSNUM   10335  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.36"
+#define VDRVERSNUM   10336  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -102,23 +102,24 @@ template<class T> class cConfig : public cList<T> {
        isyslog("loading %s", fileName);
        FILE *f = fopen(fileName, "r");
        if (f) {
+          char *s;
           int line = 0;
-          char buffer[MAXPARSEBUFFER];
+          cReadLine ReadLine;
           result = true;
-          while (fgets(buffer, sizeof(buffer), f) > 0) {
+          while ((s = ReadLine.Read(f)) != NULL) {
                 line++;
                 if (allowComments) {
-                   char *p = strchr(buffer, '#');
+                   char *p = strchr(s, '#');
                    if (p)
                       *p = 0;
                    }
-                stripspace(buffer);
-                if (!isempty(buffer)) {
+                stripspace(s);
+                if (!isempty(s)) {
                    T *l = new T;
-                   if (l->Parse(buffer))
+                   if (l->Parse(s))
                       Add(l);
                    else {
-                      esyslog("ERROR: error in %s, line %d\n", fileName, line);
+                      esyslog("ERROR: error in %s, line %d", fileName, line);
                       delete l;
                       result = false;
                       break;
diff --git a/device.c b/device.c
index dcd05a315..0da5a492e 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.110 2005/09/17 14:29:44 kls Exp $
+ * $Id: device.c 1.111 2005/11/05 15:23:58 kls Exp $
  */
 
 #include "device.h"
@@ -514,6 +514,11 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
   return false;
 }
 
+bool cDevice::MaySwitchTransponder(void)
+{
+  return !Receiving(true) && !(pidHandles[ptAudio].pid || pidHandles[ptVideo].pid || pidHandles[ptDolby].pid);
+}
+
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
 {
   if (LiveView)
diff --git a/device.h b/device.h
index d13b896cf..43d386bf0 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.65 2005/09/17 14:29:28 kls Exp $
+ * $Id: device.h 1.66 2005/11/05 15:25:41 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -215,6 +215,9 @@ class cDevice : public cThread {
          ///< function itself actually returns true.
          ///< The default implementation always returns false, so a derived cDevice
          ///< class that can provide channels must implement this function.
+  virtual bool MaySwitchTransponder(void);
+         ///< Returns true if it is ok to switch the transponder on this device,
+         ///< without disturbing any other activities.
   bool SwitchChannel(const cChannel *Channel, bool LiveView);
          ///< Switches the device to the given Channel, initiating transfer mode
          ///< if necessary.
diff --git a/dvbspu.c b/dvbspu.c
index d9730c570..9887cc05c 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.15 2005/08/07 12:06:32 kls Exp $
+ * $Id: dvbspu.c 1.17 2005/11/05 12:08:15 kls Exp $
  */
 
 #include <assert.h>
@@ -338,6 +338,7 @@ sDvbSpuRect cDvbSpuDecoder::CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDv
 
 void cDvbSpuDecoder::Draw(void)
 {
+    cMutexLock MutexLock(&mutex);
     if (!spubmp) {
         Hide();
         return;
@@ -390,6 +391,7 @@ void cDvbSpuDecoder::Draw(void)
 
 void cDvbSpuDecoder::Hide(void)
 {
+    cMutexLock MutexLock(&mutex);
     delete osd;
     osd = NULL;
 }
@@ -501,7 +503,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
                     break;
 
                 default:
-                    esyslog("invalid sequence in control header (%.2x)\n",
+                    esyslog("invalid sequence in control header (%.2x)",
                             spu[i]);
                     assert(0);
                     i++;
diff --git a/dvbspu.h b/dvbspu.h
index 8a7d90517..e018c702e 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.9 2005/05/07 11:14:03 kls Exp $
+ * $Id: dvbspu.h 1.10 2005/11/05 12:08:47 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -91,7 +91,8 @@ class cDvbSpuBitmap {
 
 class cDvbSpuDecoder:public cSpuDecoder {
   private:
-    cOsd * osd;
+    cOsd *osd;
+    cMutex mutex;
 
     // processing state
     uint8_t *spu;
diff --git a/eit.c b/eit.c
index 0145baf5c..4a643685f 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.111 2005/09/04 11:36:30 kls Exp $
+ * $Id: eit.c 1.112 2005/11/04 14:19:16 kls Exp $
  */
 
 #include "eit.h"
@@ -271,8 +271,8 @@ cTDT::cTDT(const u_char *Data)
   if (diff > 2) {
      mutex.Lock();
      if (abs(diff - lastDiff) < 3) {
-        isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim);
-        isyslog("Local Time  = %s (%ld)\n", *TimeToString(sattim), sattim);
+        isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim);
+        isyslog("Local Time  = %s (%ld)", *TimeToString(sattim), sattim);
         if (stime(&sattim) < 0)
            esyslog("ERROR while setting system time: %m");
         }
diff --git a/eitscan.c b/eitscan.c
index 10739c31a..7a89141bf 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.28 2005/08/26 15:37:06 kls Exp $
+ * $Id: eitscan.c 1.29 2005/11/05 15:24:36 kls Exp $
  */
 
 #include "eitscan.h"
@@ -150,13 +150,14 @@ void cEITScanner::Process(void)
                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
                             if (Device->ProvidesTransponder(Channel)) {
                                if (!Device->Receiving()) {
-                                  bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying() && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
-                                  if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
-                                     if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
-                                        if (cTransferControl::ReceiverDevice())
+                                  bool MaySwitchTransponder = Device->MaySwitchTransponder();
+                                  if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
+                                     if (!MaySwitchTransponder) {
+                                        if (Device == cDevice::ActualDevice() && !currentChannel) {
                                            cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
-                                        currentChannel = Device->CurrentChannel();
-                                        Skins.Message(mtInfo, tr("Starting EPG scan"));
+                                           currentChannel = Device->CurrentChannel();
+                                           Skins.Message(mtInfo, tr("Starting EPG scan"));
+                                           }
                                         }
                                      currentDevice = Device;//XXX see also dvbdevice.c!!!
                                      //dsyslog("EIT scan: device %d  source  %-8s tp %5d", Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder());
diff --git a/epg.c b/epg.c
index 0bdd185c7..72dc3346b 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.38 2005/10/09 12:57:55 kls Exp $
+ * $Id: epg.c 1.39 2005/11/06 10:31:58 kls Exp $
  */
 
 #include "epg.h"
@@ -425,32 +425,6 @@ void cEvent::FixEpgBugs(void)
   // EPG data. Let's fix their bugs as good as we can:
   if (title) {
 
-     // Some channels put too much information into the ShortText and leave the
-     // Description empty:
-     //
-     // Title
-     // (NAT, Year Min')[ ["ShortText". ]Description]
-     //
-     if (shortText && !description) {
-        if (*shortText == '(') {
-           char *e = strchr(shortText + 1, ')');
-           if (e) {
-              if (*(e + 1)) {
-                 if (*++e == ' ')
-                    if (*(e + 1) == '"')
-                       e++;
-                 }
-              else
-                 e = NULL;
-              char *s = e ? strdup(e) : NULL;
-              free(shortText);
-              shortText = s;
-              EpgBugFixStat(0, ChannelID());
-              // now the fixes #1 and #2 below will handle the rest
-              }
-           }
-        }
-
      // Some channels put the ShortText in quotes and use either the ShortText
      // or the Description field, depending on how long the string is:
      //
diff --git a/i18n.c b/i18n.c
index f21a320e3..ff25ac8ae 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.218 2005/10/30 13:37:57 kls Exp $
+ * $Id: i18n.c 1.220 2005/11/04 14:36:27 kls Exp $
  *
  * Translations provided by:
  *
  * Slovenian   Miha Setina <mihasetina@softhome.net>, Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>
- * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>
+ * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>, Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
  * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no>, Truls Slevigen <truls@slevigen.no>
@@ -107,7 +107,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-15",
     "iso8859-2",
     "iso8859-1",
-    "iso8859-1",
+    "iso8859-15",
     "iso8859-1",
     "iso8859-1",
     "iso8859-1",
@@ -256,7 +256,7 @@ const tI18nPhrase Phrases[] = {
     "Aufzeichnung",
     "Podatki o snemanju",
     "",// TODO
-    "",// TODO
+    "Opname info",
     "",// TODO
     "Infos sur l'enregistrement",
     "",// TODO
@@ -424,7 +424,7 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "Info",
     "",//TODO
-    "",//TODO
+    "Info",
     "",//TODO
     "Info",
     "",//TODO
@@ -2277,7 +2277,7 @@ const tI18nPhrase Phrases[] = {
     "CAM-Men� wird ge�ffnet...",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM-menu wordt geopend...",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2319,7 +2319,7 @@ const tI18nPhrase Phrases[] = {
     "CAM wird zur�ckgesetzt...",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM wordt herstart...",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2382,7 +2382,7 @@ const tI18nPhrase Phrases[] = {
     "Bitte geben Sie %d Ziffern ein!",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Vul %d cijfers in!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2993,7 +2993,7 @@ const tI18nPhrase Phrases[] = {
     "Rundum scrollen",
     "Iz konca sko�i na za�etek",
     "",// TODO
-    "",// TODO
+    "Rondom scrollen",
     "",// TODO
     "D�filement rotatif",
     "",// TODO
@@ -3224,7 +3224,7 @@ const tI18nPhrase Phrases[] = {
     "Video Anzeige-Format",
     "Format video prikaza",
     "",//TODO
-    "Video display format",
+    "Video display formaat",
     "",//TODO
     "Format d'affichage",
     "",//TODO
@@ -5371,7 +5371,7 @@ const tI18nPhrase Phrases[] = {
     "Beginne mit EPG-Scan",
     "Pri�enjam EPG-scan",
     "",// TODO
-    "",// TODO
+    "Bezig met starten EPG scan",
     "",// TODO
     "Mise � jour du guide des programmes",
     "",// TODO
@@ -5455,7 +5455,7 @@ const tI18nPhrase Phrases[] = {
     "Kein Titel",
     "Brez naziva",
     "",// TODO
-    "",// TODO
+    "Geen titel",
     "",// TODO
     "Sans titre",
     "",// TODO
@@ -5547,7 +5547,7 @@ const char *I18nTranslate(const char *s, const char *Plugin)
              }
          p = Phrases;
          }
-     esyslog("%s%sno translation found for '%s' in language %d (%s)\n", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
+     esyslog("%s%sno translation found for '%s' in language %d (%s)", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
      }
   const char *p = strchr(s, '$');
   return p ? p + 1 : s;
diff --git a/menu.c b/menu.c
index c280b4585..0bb7598be 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.375 2005/10/09 11:22:03 kls Exp $
+ * $Id: menu.c 1.376 2005/11/05 17:29:22 kls Exp $
  */
 
 #include "menu.h"
@@ -1546,14 +1546,13 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 
 // --- cMenuRecordings -------------------------------------------------------
 
-int cMenuRecordings::helpKeys = -1;
-
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 :cOsdMenu(Base ? Base : tr("Recordings"), 8, 6)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
   Recordings.StateChanged(recordingsState); // just to get the current state
+  helpKeys = -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   Set();
   if (Current() < 0)
@@ -1573,7 +1572,7 @@ cMenuRecordings::~cMenuRecordings()
 void cMenuRecordings::SetHelpKeys(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  int NewHelpKeys = helpKeys;
+  int NewHelpKeys = 0;
   if (ri) {
      if (ri->IsDirectory())
         NewHelpKeys = 1;
diff --git a/menu.h b/menu.h
index 33e05b82d..729d37596 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.76 2005/10/03 10:39:08 kls Exp $
+ * $Id: menu.h 1.77 2005/11/05 17:26:09 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -150,7 +150,7 @@ class cMenuRecordings : public cOsdMenu {
   char *base;
   int level;
   int recordingsState;
-  static int helpKeys;
+  int helpKeys;
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
   cRecording *GetRecording(cMenuRecordingItem *Item);
diff --git a/osd.c b/osd.c
index 83042e290..501154353 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.63 2005/10/02 08:47:13 kls Exp $
+ * $Id: osd.c 1.64 2005/11/04 14:19:31 kls Exp $
  */
 
 #include "osd.h"
@@ -649,7 +649,7 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
         }
      }
   if (Result != oeOk)
-     esyslog("ERROR: cOsd::SetAreas returned %d\n", Result);
+     esyslog("ERROR: cOsd::SetAreas returned %d", Result);
   return Result;
 }
 
diff --git a/recording.c b/recording.c
index c90e54da2..7a81d7765 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.122 2005/10/31 12:27:58 kls Exp $
+ * $Id: recording.c 1.124 2005/11/04 14:19:44 kls Exp $
  */
 
 #include "recording.h"
@@ -1328,7 +1328,7 @@ cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
                  return SetOffset(Number + 1); // file exists and has non zero size, let's try next suffix
               else {
                  // zero size file, remove it
-                 dsyslog ("cFileName::SetOffset: removing zero-sized file %s\n", fileName);
+                 dsyslog ("cFileName::SetOffset: removing zero-sized file %s", fileName);
                  unlink (fileName);
                  }
               }
@@ -1342,7 +1342,7 @@ cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
         // found a non existing file suffix
         }
      if (Open() >= 0) {
-        if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) {
+        if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) {
            LOG_ERROR_STR(fileName);
            return NULL;
            }
diff --git a/svdrp.c b/svdrp.c
index cc5df706b..8e09d41cb 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.82 2005/09/25 10:36:59 kls Exp $
+ * $Id: svdrp.c 1.83 2005/11/05 11:21:38 kls Exp $
  */
 
 #include "svdrp.h"
@@ -361,6 +361,8 @@ cSVDRP::cSVDRP(int Port)
 {
   PUTEhandler = NULL;
   numChars = 0;
+  length = BUFSIZ;
+  cmdLine = MALLOC(char, length);
   message = NULL;
   lastActivity = 0;
   isyslog("SVDRP listening on port %d", Port);
@@ -370,6 +372,7 @@ cSVDRP::~cSVDRP()
 {
   Close();
   free(message);
+  free(cmdLine);
 }
 
 void cSVDRP::Close(bool Timeout)
@@ -1442,6 +1445,11 @@ bool cSVDRP::Process(void)
                  // showtime!
                  Execute(cmdLine);
                  numChars = 0;
+                 if (length > BUFSIZ) {
+                    free(cmdLine); // let's not tie up too much memory
+                    length = BUFSIZ;
+                    cmdLine = MALLOC(char, length);
+                    }
                  }
               else if (c == 0x04 && numChars == 0) {
                  // end of file (only at beginning of line)
@@ -1455,15 +1463,14 @@ bool cSVDRP::Process(void)
               else if (c <= 0x03 || c == 0x0D) {
                  // ignore control characters
                  }
-              else if (numChars < sizeof(cmdLine) - 1) {
+              else {
+                 if (numChars >= length - 1) {
+                    length += BUFSIZ;
+                    cmdLine = (char *)realloc(cmdLine, length);
+                    }
                  cmdLine[numChars++] = c;
                  cmdLine[numChars] = 0;
                  }
-              else {
-                 Reply(501, "Command line too long");
-                 esyslog("SVDRP: command line too long: '%s'", cmdLine);
-                 numChars = 0;
-                 }
               lastActivity = time(NULL);
               }
            else if (r < 0) {
diff --git a/svdrp.h b/svdrp.h
index 9275bf279..2e182f211 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.24 2005/10/09 11:11:59 kls Exp $
+ * $Id: svdrp.h 1.25 2005/11/05 10:54:22 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -45,8 +45,9 @@ class cSVDRP {
   cFile file;
   cRecordings Recordings;
   cPUTEhandler *PUTEhandler;
-  uint numChars;
-  char cmdLine[MAXPARSEBUFFER];
+  int numChars;
+  int length;
+  char *cmdLine;
   char *message;
   time_t lastActivity;
   void Close(bool Timeout = false);
diff --git a/themes.c b/themes.c
index 69af61ff0..45fc17256 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.5 2004/12/24 17:00:41 kls Exp $
+ * $Id: themes.c 1.6 2005/11/04 14:19:54 kls Exp $
  */
 
 #include "themes.h"
@@ -152,7 +152,7 @@ bool cTheme::Load(const char *FileName, bool OnlyDescriptions)
               }
            }
      if (!result)
-        esyslog("ERROR: error in %s, line %d%s%s\n", FileName, line, error ? ": " : "", error ? error : "");
+        esyslog("ERROR: error in %s, line %d%s%s", FileName, line, error ? ": " : "", error ? error : "");
      fclose(f);
      }
   else
diff --git a/tools.c b/tools.c
index aa20e6edc..832f42938 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.100 2005/10/31 12:56:15 kls Exp $
+ * $Id: tools.c 1.103 2005/11/04 16:33:18 kls Exp $
  */
 
 #include "tools.h"
@@ -463,7 +463,7 @@ bool SpinUpDisk(const char *FileName)
             gettimeofday(&tp2, NULL);
             double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0;
             if (seconds > 0.5)
-               dsyslog("SpinUpDisk took %.2f seconds\n", seconds);
+               dsyslog("SpinUpDisk took %.2f seconds", seconds);
             free(buf);
             return true;
             }
@@ -534,6 +534,7 @@ cString::~cString()
 
 cString &cString::operator=(const cString &String)
 {
+  free(s);
   s = String.s ? strdup(String.s) : NULL;
   return *this;
 }
@@ -609,12 +610,24 @@ cString TimeString(time_t t)
 
 // --- cReadLine -------------------------------------------------------------
 
+cReadLine::cReadLine(void)
+{
+  size = 0;
+  buffer = NULL;
+}
+
+cReadLine::~cReadLine()
+{
+  free(buffer);
+}
+
 char *cReadLine::Read(FILE *f)
 {
-  if (fgets(buffer, sizeof(buffer), f) > 0) {
-     int l = strlen(buffer) - 1;
-     if (l >= 0 && buffer[l] == '\n')
-        buffer[l] = 0;
+  int n = getline(&buffer, &size, f);
+  if (n > 0) {
+     n--;
+     if (buffer[n] == '\n')
+        buffer[n] = 0;
      return buffer;
      }
   return NULL;
diff --git a/tools.h b/tools.h
index f348b2e51..c344fce2f 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.81 2005/10/31 12:54:36 kls Exp $
+ * $Id: tools.h 1.83 2005/11/05 10:54:39 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -38,8 +38,6 @@ extern int SysLogLevel;
 #define KILOBYTE(n) ((n) * 1024)
 #define MEGABYTE(n) ((n) * 1024 * 1024)
 
-#define MAXPARSEBUFFER KILOBYTE(10)
-
 #define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
 
 #define DELETENULL(p) (delete (p), p = NULL)
@@ -135,8 +133,11 @@ class cTimeMs {
 
 class cReadLine {
 private:
-  char buffer[MAXPARSEBUFFER];
+  size_t size;
+  char *buffer;
 public:
+  cReadLine(void);
+  ~cReadLine();
   char *Read(FILE *f);
   };
 
diff --git a/vdr.c b/vdr.c
index 9d84d84ee..5cf737518 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.218 2005/10/09 10:01:45 kls Exp $
+ * $Id: vdr.c 1.219 2005/11/04 13:48:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -813,8 +813,14 @@ int main(int argc, char *argv[])
         if (Interact) {
            eOSState state = Interact->ProcessKey(key);
            if (state == osUnknown && Interact != cControl::Control()) {
-              if (ISMODELESSKEY(key) && cControl::Control())
+              if (ISMODELESSKEY(key) && cControl::Control()) {
                  state = cControl::Control()->ProcessKey(key);
+                 if (state == osEnd) {
+                    // let's not close a menu when replay ends:
+                    cControl::Shutdown();
+                    continue;
+                    }
+                 }
               else if (time(NULL) - LastActivity > MENUTIMEOUT)
                  state = osEnd;
               }

From 8c63e0fd967a7ac037872ca5af378dc92f0410fa Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Nov 2005 18:00:00 +0100
Subject: [PATCH 129/307] =?UTF-8?q?Version=201.3.37=20-=20Added=20compiler?=
 =?UTF-8?q?=20options=20"-fPIC=20-g"=20to=20all=20plugins=20(thanks=20to?=
 =?UTF-8?q?=20Rolf=20Ahrenberg).=20-=20Fixed=20initializing=20the=20day=20?=
 =?UTF-8?q?index=20when=20editing=20the=20weekday=20parameter=20of=20a=20?=
 =?UTF-8?q?=20=20repeating=20timer=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler).=20-=20No=20longer=20removing=20superfluous=20hyphen?=
 =?UTF-8?q?s=20in=20EPG=20data=20-=20would=20become=20too=20=20=20language?=
 =?UTF-8?q?=20dependent=20to=20handle=20all=20kinds=20of=20exceptions.=20-?=
 =?UTF-8?q?=20Modified=20switching=20to=20Dolby=20Digital=20audio=20in=20l?=
 =?UTF-8?q?ive=20mode,=20if=20the=20driver=20=20=20and=20firmware=20can=20?=
 =?UTF-8?q?handle=20live=20DD=20without=20the=20need=20of=20a=20Transfer?=
 =?UTF-8?q?=20Mode=20(thanks=20=20=20to=20Werner=20Fink).=20Live=20DD=20mo?=
 =?UTF-8?q?de=20requires=20a=20full=20featured=20DVB=20card=20and=20a=20?=
 =?UTF-8?q?=20=20LinuxDVB=20driver=20with=20firmware=20version=200x2622=20?=
 =?UTF-8?q?or=20higher.=20Older=20versions=20will=20=20=20use=20Transfer?=
 =?UTF-8?q?=20Mode=20just=20like=20before.=20-=20Implemented=20handling=20?=
 =?UTF-8?q?of=20the=20"CA=20PMT=20Reply"=20for=20CAMs=20(thanks=20to=20Mar?=
 =?UTF-8?q?co=20=20=20Schl=C3=BC=C3=9Fler=20for=20figuring=20out=20some=20?=
 =?UTF-8?q?obscure=20length=20bytes=20in=20the=20CA=20PMT=20Reply=20=20=20?=
 =?UTF-8?q?data=20of=20AlphaCrypt=20CAMs).=20-=20Some=20preparations=20for?=
 =?UTF-8?q?=20being=20able=20to=20record=20several=20encrypted=20channels?=
 =?UTF-8?q?=20from=20=20=20the=20same=20transponder=20at=20the=20same=20ti?=
 =?UTF-8?q?me=20(or=20record=20and=20view=20different=20encrypted=20=20=20?=
 =?UTF-8?q?channels),=20provided=20the=20CAM=20in=20use=20can=20handle=20t?=
 =?UTF-8?q?his.=20This=20is=20work=20in=20progress=20=20=20and=20isn't=20a?=
 =?UTF-8?q?ctively=20used,=20yet.=20-=20Fixed=20SetProgress()=20in=20the?=
 =?UTF-8?q?=20'skincurses'=20plugin=20in=20case=20Total=20is=200=20(report?=
 =?UTF-8?q?ed=20=20=20by=20Stefan=20Huelswitt).=20-=20Added=20a=20copy=20c?=
 =?UTF-8?q?onstructor=20to=20cString=20and=20fixed=20its=20assignment=20op?=
 =?UTF-8?q?erator=20=20=20(thanks=20to=20Holger=20Brunn).=20-=20The=20new?=
 =?UTF-8?q?=20function=20Skins.QueueMessage()=20can=20be=20called=20from?=
 =?UTF-8?q?=20a=20background=20thread=20=20=20to=20queue=20a=20message=20f?=
 =?UTF-8?q?or=20display.=20See=20VDR/skins.h=20for=20details.=20-=20The=20?=
 =?UTF-8?q?SVDRP=20command=20MESG=20uses=20the=20new=20message=20queueing?=
 =?UTF-8?q?=20facility,=20so=20MESG=20=20=20commands=20may=20now=20be=20ex?=
 =?UTF-8?q?ecuted=20at=20any=20time,=20and=20the=20message=20will=20be=20d?=
 =?UTF-8?q?isplayed=20=20=20(no=20more=20"pending=20message").?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  11 +
 HISTORY                             |  41 ++-
 PLUGINS.html                        |  46 +--
 PLUGINS/src/hello/Makefile          |   4 +-
 PLUGINS/src/osddemo/Makefile        |   4 +-
 PLUGINS/src/servicedemo/Makefile    |   4 +-
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/Makefile     |   4 +-
 PLUGINS/src/skincurses/skincurses.c |   6 +-
 PLUGINS/src/sky/Makefile            |   4 +-
 PLUGINS/src/status/Makefile         |   4 +-
 PLUGINS/src/svdrpdemo/Makefile      |   4 +-
 channels.conf                       |  28 +-
 ci.c                                | 454 ++++++++++++++++++++--------
 ci.h                                |  67 ++--
 config.h                            |   6 +-
 device.c                            |  34 ++-
 dvbdevice.c                         |  63 ++--
 dvbdevice.h                         |   4 +-
 epg.c                               |  15 +-
 interface.c                         |   9 +-
 menuitems.c                         |  12 +-
 menuitems.h                         |   3 +-
 newplugin                           |   4 +-
 skins.c                             | 129 +++++++-
 skins.h                             |  33 +-
 svdrp.c                             |  32 +-
 svdrp.h                             |   4 +-
 thread.c                            |   3 +-
 thread.h                            |   7 +-
 tools.c                             |   9 +-
 tools.h                             |   3 +-
 vdr.c                               |   5 +-
 33 files changed, 757 insertions(+), 303 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 25276027c..c4173a034 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -205,6 +205,8 @@ Stefan Huelswitt <huels@iname.com>
  for fixing a memory leak in the SVDRP command LSTE
  for reporting a problem with the EPG scan disturbing players that have also set
  live PIDs
+ for reporting a problem in SetProgress() of the 'skincurses' plugin in case Total
+ is 0
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -290,6 +292,8 @@ Werner Fink <werner@suse.de>
  for reporting a problem with ensuring there is a current audio track in case there
  is only one track
  for enabling a device to detach all receivers for a given PID
+ for modifying switching to Dolby Digital audio in live mode, if the driver
+ and firmware can handle live DD without the need of a Transfer Mode
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -912,6 +916,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making EPG events without a title display "No title" instead of "(null)"
  for changing the title of the recording info menu
  for reporting a bug in handling key macros with keys after @plugin
+ for adding compiler options "-fPIC -g" to all plugins
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1244,6 +1249,9 @@ Marco Schl
  for reporting that the FATALERRNO macro needs to check for a non-zero errno value
  for reporting missing mutex locks in cCiMenu::Abort() and cCiEnquiry::Abort()
  for fixing a race condition in the SPU decoder
+ for fixing initializing the day index when editing the weekday parameter of a
+ repeating timer
+ for figuring out some obscure length bytes the the CA PMT Reply data of AlphaCrypt CAMs
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1536,3 +1544,6 @@ Ralf M
 
 Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
  for translating OSD texts to the Dutch language
+
+Holger Brunn <holger.brunn@stud.uni-karlsruhe.de>
+ for adding a copy constructor to cString and fixing its assignment operator
diff --git a/HISTORY b/HISTORY
index 1bcc2cf66..24b23c97d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3828,14 +3828,8 @@ Video Disk Recorder Revision History
   startup if there are a great many of recordings, or the disk(s) have to spin up.
   If the Recordings menu is opened while the list of recordings is still being read,
   the menu will be updated accordingly.
-  Plugins that access the global Recordings variable should lock the thread, either
-  by calling
-
-    Recordings.Lock();
-    ...
-    Recordings.Unlock();
-
-  or by putting something like
+  Plugins that access the global Recordings variable should lock the thread
+  by putting something like
 
     cThreadLock RecordingsLock(&Recordings);
 
@@ -3930,7 +3924,7 @@ Video Disk Recorder Revision History
   to Andreas Mair for reporting a problem with extremely long summary fields
   in timers).
 - cSVDRP now dynamically allocates its command buffer in order to handle
-  commands of any length. The MAXPARSEBUFFER macros is now obsolete and has
+  commands of any length. The MAXPARSEBUFFER macro is now obsolete and has
   been removed. If a plugin has used that macro, it should either define
   a buffer size of its own, or use cReadLine when reading files.
 - Fixed a race condition in the SPU decoder (thanks to Marco Schl��ler).
@@ -3939,3 +3933,32 @@ Video Disk Recorder Revision History
 - Fixed setting the help key display in the Recordings menu in case of several
   layers of subdirectories.
 - Removed EPG bugfix #0, because it removed actually important data.
+
+2005-11-27: Version 1.3.37
+
+- Added compiler options "-fPIC -g" to all plugins (thanks to Rolf Ahrenberg).
+- Fixed initializing the day index when editing the weekday parameter of a
+  repeating timer (thanks to Marco Schl��ler).
+- No longer removing superfluous hyphens in EPG data - would become too
+  language dependent to handle all kinds of exceptions.
+- Modified switching to Dolby Digital audio in live mode, if the driver
+  and firmware can handle live DD without the need of a Transfer Mode (thanks
+  to Werner Fink). Live DD mode requires a full featured DVB card and a
+  LinuxDVB driver with firmware version 0x2622 or higher. Older versions will
+  use Transfer Mode just like before.
+- Implemented handling of the "CA PMT Reply" for CAMs (thanks to Marco
+  Schl��ler for figuring out some obscure length bytes in the CA PMT Reply
+  data of AlphaCrypt CAMs).
+- Some preparations for being able to record several encrypted channels from
+  the same transponder at the same time (or record and view different encrypted
+  channels), provided the CAM in use can handle this. This is work in progress
+  and isn't actively used, yet.
+- Fixed SetProgress() in the 'skincurses' plugin in case Total is 0 (reported
+  by Stefan Huelswitt).
+- Added a copy constructor to cString and fixed its assignment operator
+  (thanks to Holger Brunn).
+- The new function Skins.QueueMessage() can be called from a background thread
+  to queue a message for display. See VDR/skins.h for details.
+- The SVDRP command MESG uses the new message queueing facility, so MESG
+  commands may now be executed at any time, and the message will be displayed
+  (no more "pending message").
diff --git a/PLUGINS.html b/PLUGINS.html
index d1c787b36..bdaf1efb0 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.20 are marked like this.
-<!--X1.3.20--></td></tr></table>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.21 are marked like this.
 <!--X1.3.21--></td></tr></table>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.30 are marked like this.
 <!--X1.3.30--></td></tr></table>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.31 are marked like this.
 <!--X1.3.31--></td></tr></table>
+<!--X1.3.37--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.37 are marked like this.
+<!--X1.3.37--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -58,9 +58,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line arguments">Command line arguments</a>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Shutting down">Shutting down</a>
-<!--X1.3.20--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
 <li><a href="#User interaction">User interaction</a>
 <li><a href="#Housekeeping">Housekeeping</a>
@@ -68,10 +66,10 @@ <h1>Table Of Contents</h1>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
 <li><a href="#Internationalization">Internationalization</a>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Custom services">Custom services</a>
 <!--X1.3.30--></td></tr></table>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#SVDRP commands">SVDRP commands</a>
 <!--X1.3.31--></td></tr></table>
 <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
@@ -87,7 +85,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Audio">Audio</a>
 <!--X1.3.21--></td></tr></table>
 <li><a href="#Remote Control">Remote Control</a>
@@ -314,10 +312,8 @@ <h1>Table Of Contents</h1>
 command line help - and after that immediately destroys them again.
 <p>
 The <b>destructor</b> has to clean up any data created by the plugin.
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Any threads the plugin may have created shall be stopped in the
 <a href="#Shutting down"><tt>Stop()</tt></a> function.
-<!--X1.3.20--></td></tr></table>
 <p>
 Of course, if your plugin doesn't define any member variables that need to be
 initialized (and deleted), you don't need to implement either of these functions.
@@ -512,7 +508,6 @@ <h1>Table Of Contents</h1>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement either of these functions.
 
-<!--X1.3.20--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Shutting down"><hr><h2>Shutting down</h2>
 
 <center><i><b>Stop it, right there!</b></i></center><p>
@@ -529,7 +524,6 @@ <h1>Table Of Contents</h1>
 <a href="#Getting started"><tt>Start()</tt></a> function of that plugin has
 returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
 as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
-<!--X1.3.20--></td></tr></table>
 
 <a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
@@ -872,7 +866,7 @@ <h1>Table Of Contents</h1>
 and then in the global VDR texts. So a plugin can make use of texts defined by the
 core VDR code.
 
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Custom services"><hr><h2>Custom services</h2>
 
 <center><i><b>What can I do for you?</b></i></center><p>
@@ -943,7 +937,7 @@ <h1>Table Of Contents</h1>
 
 <!--X1.3.30--></td></tr></table>
 
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
 
 <center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
@@ -1521,6 +1515,22 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 
+<!--X1.3.37--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<p>
+Directly accessing the OSD is only allowed from the foreground thread, which
+restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
+function, or any of the skin classes a plugin might implement.
+<p>
+If a plugin runs a separate thread and wants to issue a message directly from
+within that tread, it can call
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+int cSkins::QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
+</pre></td></tr></table><p>
+
+to queue that message for display. See <tt>VDR/skins.h</tt> for details.
+<!--X1.3.37--></td></tr></table>
+
 <a name="Skins"><hr><h2>Skins</h2>
 
 <center><i><b>The emperor's new clothes</b></i></center><p>
@@ -1830,7 +1840,7 @@ <h1>Table Of Contents</h1>
   virtual void Action(void);
 public:
   cMyAudio(void);
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.21--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
   virtual void Play(const uchar *Data, int Length, uchar Id);
 <!--X1.3.21--></td></tr></table>
   virtual void Mute(bool On);
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 9f35d2096..cab396ed6 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2003/12/21 15:47:22 kls Exp $
+# $Id: Makefile 1.10 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 8116d0542..fb7d423d8 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.3 2003/12/21 15:47:26 kls Exp $
+# $Id: Makefile 1.4 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index a7678fff5..675a86dbc 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2005/08/21 10:43:12 kls Exp $
+# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 3af01ccac..80779eb9e 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -21,3 +21,7 @@ VDR Plugin 'skincurses' Revision History
 2005-10-01:
 
 - Added a note about using this skin to the README file.
+
+2005-11-26: Version 0.0.5
+
+- Fixed SetProgress() in case Total is 0.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 794863b3c..6117ee3db 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2004/05/29 14:44:58 kls Exp $
+# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index ad1a26b44..522d7cfcc 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.6 2005/05/16 10:45:12 kls Exp $
+ * $Id: skincurses.c 1.7 2005/11/26 13:52:39 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "0.0.5";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -500,7 +500,7 @@ void cSkinCursesDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
 
 void cSkinCursesDisplayReplay::SetProgress(int Current, int Total)
 {
-  int p = OsdWidth * Current / Total;
+  int p = Total > 0 ? OsdWidth * Current / Total : 0;
   osd->DrawRectangle(0, 1, p, 1, clrGreen);
   osd->DrawRectangle(p, 1, OsdWidth, 1, clrWhite);
 }
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 13d623ba8..aeeed4df1 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.3 2003/12/21 15:47:31 kls Exp $
+# $Id: Makefile 1.4 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 4216e75d5..d53468861 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2003/12/21 15:47:41 kls Exp $
+# $Id: Makefile 1.8 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 5714bdc6a..316a6d5cb 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2005/08/27 11:26:49 kls Exp $
+# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/channels.conf b/channels.conf
index 80ec3ff87..e54bfcb24 100644
--- a/channels.conf
+++ b/channels.conf
@@ -6,14 +6,14 @@ Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
-SR S�DWEST Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
+SR S�DWEST Ferns.;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320:0:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
 ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
 ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
@@ -45,14 +45,14 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1722,1801:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1801,1722:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1702,1722:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
@@ -90,12 +90,12 @@ TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:960,961:10070:2:2044:0
+ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:0:10070:2:2044:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
-Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2326=eng,2327=NAR:2315:960,961:5904:2:2025:0
+Paramount;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
 Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 Paramount 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
-Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0
+Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,667=NAR;687=eng:583:960,961:4302:2:2007:0
 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;688=eng:584:960,961:4403:2:2007:0
@@ -110,7 +110,7 @@ Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
 WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
-Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2314+2307:2315=eng:0:960,961:50002:2:2019:0
+Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
diff --git a/ci.c b/ci.c
index 3fe321e6a..163ad9704 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.39 2005/11/04 14:18:52 kls Exp $
+ * $Id: ci.c 1.40 2005/11/26 13:36:51 kls Exp $
  */
 
 #include "ci.h"
@@ -845,10 +845,118 @@ bool cCiApplicationInformation::EnterMenu(void)
   return false;
 }
 
+// --- cCiCaPmt --------------------------------------------------------------
+
+// Ca Pmt List Management:
+
+#define CPLM_MORE    0x00
+#define CPLM_FIRST   0x01
+#define CPLM_LAST    0x02
+#define CPLM_ONLY    0x03
+#define CPLM_ADD     0x04
+#define CPLM_UPDATE  0x05
+
+// Ca Pmt Cmd Ids:
+
+#define CPCI_OK_DESCRAMBLING  0x01
+#define CPCI_OK_MMI           0x02
+#define CPCI_QUERY            0x03
+#define CPCI_NOT_SELECTED     0x04
+
+class cCiCaPmt : public cListObject {
+  friend class cCiConditionalAccessSupport;
+private:
+  uint8_t cmdId;
+  int length;
+  int esInfoLengthPos;
+  uint8_t capmt[2048]; ///< XXX is there a specified maximum?
+  int caDescriptorsLength;
+  uint8_t caDescriptors[2048];
+  bool streamFlag;
+  void AddCaDescriptors(int Length, const uint8_t *Data);
+public:
+  cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds);
+  void SetListManagement(uint8_t ListManagement);
+  bool Valid(void);
+  void AddPid(int Pid, uint8_t StreamType);
+  };
+
+cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds)
+{
+  cmdId = CmdId;
+  caDescriptorsLength = GetCaDescriptors(Source, Transponder, ProgramNumber, CaSystemIds, sizeof(caDescriptors), caDescriptors, streamFlag);
+  length = 0;
+  capmt[length++] = CPLM_ONLY;
+  capmt[length++] = (ProgramNumber >> 8) & 0xFF;
+  capmt[length++] =  ProgramNumber       & 0xFF;
+  capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
+  esInfoLengthPos = length;
+  capmt[length++] = 0x00; // program_info_length H (at program level)
+  capmt[length++] = 0x00; // program_info_length L
+  if (!streamFlag)
+     AddCaDescriptors(caDescriptorsLength, caDescriptors);
+}
+
+void cCiCaPmt::SetListManagement(uint8_t ListManagement)
+{
+  capmt[0] = ListManagement;
+}
+
+bool cCiCaPmt::Valid(void)
+{
+  return caDescriptorsLength > 0;
+}
+
+void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
+{
+  if (Pid) {
+     //XXX buffer overflow check???
+     capmt[length++] = StreamType;
+     capmt[length++] = (Pid >> 8) & 0xFF;
+     capmt[length++] =  Pid       & 0xFF;
+     esInfoLengthPos = length;
+     capmt[length++] = 0x00; // ES_info_length H (at ES level)
+     capmt[length++] = 0x00; // ES_info_length L
+     if (streamFlag)
+        AddCaDescriptors(caDescriptorsLength, caDescriptors);
+     }
+}
+
+void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
+{
+  if (esInfoLengthPos) {
+     if (length + Length < int(sizeof(capmt))) {
+        capmt[length++] = cmdId;
+        memcpy(capmt + length, Data, Length);
+        length += Length;
+        int l = length - esInfoLengthPos - 2;
+        capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
+        capmt[esInfoLengthPos + 1] =  l       & 0xFF;
+        }
+     else
+        esyslog("ERROR: buffer overflow in CA descriptor");
+     esInfoLengthPos = 0;
+     }
+  else
+     esyslog("ERROR: adding CA descriptor without Pid!");
+}
+
 // --- cCiConditionalAccessSupport -------------------------------------------
 
 #define MAXCASYSTEMIDS 16
 
+// CA Enable Ids:
+
+#define CAEI_POSSIBLE                  0x01
+#define CAEI_POSSIBLE_COND_PURCHASE    0x02
+#define CAEI_POSSIBLE_COND_TECHNICAL   0x03
+#define CAEI_NOT_POSSIBLE_ENTITLEMENT  0x71
+#define CAEI_NOT_POSSIBLE_TECHNICAL    0x73
+
+#define CA_ENABLE_FLAG                 0x80
+
+#define CA_ENABLE(x) (((x) & CA_ENABLE_FLAG) ? (x) & ~CA_ENABLE_FLAG : 0)
+
 class cCiConditionalAccessSupport : public cCiSession {
 private:
   int state;
@@ -858,14 +966,15 @@ class cCiConditionalAccessSupport : public cCiSession {
   cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   const unsigned short *GetCaSystemIds(void) { return caSystemIds; }
-  bool SendPMT(cCiCaPmt &CaPmt);
+  bool SendPMT(cCiCaPmt *CaPmt);
+  bool ReceivedReply(bool CanDescramble = false);
   };
 
 cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_CONDITIONAL_ACCESS_SUPPORT, Tc)
 {
   dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
-  state = 0;
+  state = 0; // inactive
   caSystemIds[numCaSystemIds = 0] = 0;
 }
 
@@ -892,7 +1001,58 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                   }
             dbgprotocol("\n");
             }
-            state = 2;
+            state = 2; // got ca info
+            break;
+       case AOT_CA_PMT_REPLY: {
+            dbgprotocol("%d: <== Ca Pmt Reply", SessionId());
+            state = 4; // got ca pmt reply
+            int l = 0;
+            const uint8_t *d = GetData(Data, l);
+            if (l > 1) {
+               unsigned short pnr = ((unsigned short)(*d) << 8) | *(d + 1);
+               dbgprotocol(" %d", pnr);
+               d += 2;
+               l -= 2;
+               if (l > 0) {
+                  dbgprotocol(" %02X", *d);
+                  d += 1;
+                  l -= 1;
+                  if (l > 0) {
+                     if (l % 3 == 0 && l > 1) {
+                        // The EN50221 standard defines that the next byte is supposed
+                        // to be the CA_enable value at programme level. However, there are
+                        // CAMs (for instance the AlphaCrypt with firmware <= 3.05) that
+                        // insert a two byte length field here.
+                        // This is a workaround to skip this length field:
+                        unsigned short len = ((unsigned short)(*d) << 8) | *(d + 1);
+                        if (len == l - 2) {
+                           d += 2;
+                           l -= 2;
+                           }
+                        }
+                     unsigned char caepl = *d;
+                     dbgprotocol(" %02X", caepl);
+                     d += 1;
+                     l -= 1;
+                     bool ok = true;
+                     if (l <= 2)
+                        ok = CA_ENABLE(caepl) == CAEI_POSSIBLE;
+                     while (l > 2) {
+                           unsigned short pid = ((unsigned short)(*d) << 8) | *(d + 1);
+                           unsigned char caees = *(d + 2);
+                           dbgprotocol(" %d=%02X", pid, caees);
+                           d += 3;
+                           l -= 3;
+                           if (CA_ENABLE(caees) != CAEI_POSSIBLE)
+                              ok = false;
+                           }
+                     if (ok)
+                        state = 5; // descrambling possible
+                     }
+                  }
+               }
+            dbgprotocol("\n");
+            }
             break;
        default: esyslog("ERROR: CI conditional access support: unknown tag %06X", Tag);
                 return false;
@@ -901,20 +1061,27 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
   else if (state == 0) {
      dbgprotocol("%d: ==> Ca Info Enq\n", SessionId());
      SendData(AOT_CA_INFO_ENQ);
-     state = 1;
+     state = 1; // enquired ca info
      }
   return true;
 }
 
-bool cCiConditionalAccessSupport::SendPMT(cCiCaPmt &CaPmt)
+bool cCiConditionalAccessSupport::SendPMT(cCiCaPmt *CaPmt)
 {
-  if (state == 2) {
-     SendData(AOT_CA_PMT, CaPmt.length, CaPmt.capmt);
+  if (CaPmt && state >= 2) {
+     dbgprotocol("%d: ==> Ca Pmt\n", SessionId());
+     SendData(AOT_CA_PMT, CaPmt->length, CaPmt->capmt);
+     state = 3; // sent ca pmt
      return true;
      }
   return false;
 }
 
+bool cCiConditionalAccessSupport::ReceivedReply(bool CanDescramble)
+{
+  return state >= (CanDescramble ? 5 : 4);
+}
+
 // --- cCiDateTime -----------------------------------------------------------
 
 class cCiDateTime : public cCiSession {
@@ -1307,78 +1474,6 @@ bool cCiEnquiry::Abort(void)
   return mmi && mmi->SendCloseMMI();
 }
 
-// --- cCiCaPmt --------------------------------------------------------------
-
-// Ca Pmt List Management:
-
-#define CPLM_MORE    0x00
-#define CPLM_FIRST   0x01
-#define CPLM_LAST    0x02
-#define CPLM_ONLY    0x03
-#define CPLM_ADD     0x04
-#define CPLM_UPDATE  0x05
-
-// Ca Pmt Cmd Ids:
-
-#define CPCI_OK_DESCRAMBLING  0x01
-#define CPCI_OK_MMI           0x02
-#define CPCI_QUERY            0x03
-#define CPCI_NOT_SELECTED     0x04
-
-cCiCaPmt::cCiCaPmt(int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds)
-{
-  caDescriptorsLength = GetCaDescriptors(Source, Transponder, ProgramNumber, CaSystemIds, sizeof(caDescriptors), caDescriptors, streamFlag);
-  length = 0;
-  capmt[length++] = CPLM_ONLY;
-  capmt[length++] = (ProgramNumber >> 8) & 0xFF;
-  capmt[length++] =  ProgramNumber       & 0xFF;
-  capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
-  esInfoLengthPos = length;
-  capmt[length++] = 0x00; // program_info_length H (at program level)
-  capmt[length++] = 0x00; // program_info_length L
-  if (!streamFlag)
-     AddCaDescriptors(caDescriptorsLength, caDescriptors);
-}
-
-bool cCiCaPmt::Valid(void)
-{
-  return caDescriptorsLength > 0;
-}
-
-void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
-{
-  if (Pid) {
-     //XXX buffer overflow check???
-     capmt[length++] = StreamType;
-     capmt[length++] = (Pid >> 8) & 0xFF;
-     capmt[length++] =  Pid       & 0xFF;
-     esInfoLengthPos = length;
-     capmt[length++] = 0x00; // ES_info_length H (at ES level)
-     capmt[length++] = 0x00; // ES_info_length L
-     if (streamFlag)
-        AddCaDescriptors(caDescriptorsLength, caDescriptors);
-     }
-}
-
-void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
-{
-  if (esInfoLengthPos) {
-     if (length + Length < int(sizeof(capmt))) {
-        capmt[length++] = CPCI_OK_DESCRAMBLING;
-        memcpy(capmt + length, Data, Length);
-        length += Length;
-        int l = length - esInfoLengthPos - 2;
-        capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
-        capmt[esInfoLengthPos + 1] =  l       & 0xFF;
-        }
-     else
-        esyslog("ERROR: buffer overflow in CA descriptor");
-     esInfoLengthPos = 0;
-     }
-  else
-     esyslog("ERROR: adding CA descriptor without Pid!");
-}
-
 // -- cCiHandler -------------------------------------------------------------
 
 cCiHandler::cCiHandler(int Fd, int NumSlots)
@@ -1393,6 +1488,7 @@ cCiHandler::cCiHandler(int Fd, int NumSlots)
       moduleReady[i] = false;
   tpl = new cCiTransportLayer(Fd, numSlots);
   tc = NULL;
+  source = transponder = 0;
 }
 
 cCiHandler::~cCiHandler()
@@ -1556,58 +1652,98 @@ bool cCiHandler::Ready(void)
   return true;
 }
 
-bool cCiHandler::Process(void)
+bool cCiHandler::Process(int Slot)
 {
   bool result = true;
   cMutexLock MutexLock(&mutex);
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      tc = tpl->Process(Slot);
-      if (tc) {
-         int Length;
-         const uint8_t *Data = tc->Data(Length);
-         if (Data && Length > 1) {
-            switch (*Data) {
-              case ST_SESSION_NUMBER:          if (Length > 4) {
-                                                  int SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
-                                                  cCiSession *Session = GetSessionBySessionId(SessionId);
-                                                  if (Session)
-                                                     Session->Process(Length - 4, Data + 4);
-                                                  else
-                                                     esyslog("ERROR: unknown session id: %d", SessionId);
-                                                  }
-                                               break;
-              case ST_OPEN_SESSION_REQUEST:    OpenSession(Length, Data);
-                                               break;
-              case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
-                                                  CloseSession(ntohs(get_unaligned((uint16_t *)&Data[2])));
-                                               break;
-              case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
-              case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
-              default: esyslog("ERROR: unknown session tag: %02X", *Data);
-              }
+  for (int slot = 0; slot < numSlots; slot++) {
+      if (Slot < 0 || slot == Slot) {
+         tc = tpl->Process(slot);
+         if (tc) {
+            int Length;
+            const uint8_t *Data = tc->Data(Length);
+            if (Data && Length > 1) {
+               switch (*Data) {
+                 case ST_SESSION_NUMBER:          if (Length > 4) {
+                                                     int SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
+                                                     cCiSession *Session = GetSessionBySessionId(SessionId);
+                                                     if (Session)
+                                                        Session->Process(Length - 4, Data + 4);
+                                                     else
+                                                        esyslog("ERROR: unknown session id: %d", SessionId);
+                                                     }
+                                                  break;
+                 case ST_OPEN_SESSION_REQUEST:    OpenSession(Length, Data);
+                                                  break;
+                 case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
+                                                     CloseSession(ntohs(get_unaligned((uint16_t *)&Data[2])));
+                                                  break;
+                 case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
+                 case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
+                 default: esyslog("ERROR: unknown session tag: %02X", *Data);
+                 }
+               }
+            }
+         else if (CloseAllSessions(slot)) {
+            tpl->ResetSlot(slot);
+            result = false;
+            }
+         else if (tpl->ModuleReady(slot)) {
+            dbgprotocol("Module ready in slot %d\n", slot);
+            moduleReady[slot] = true;
+            tpl->NewConnection(slot);
             }
-         }
-      else if (CloseAllSessions(Slot)) {
-         tpl->ResetSlot(Slot);
-         result = false;
-         }
-      else if (tpl->ModuleReady(Slot)) {
-         dbgprotocol("Module ready in slot %d\n", Slot);
-         moduleReady[Slot] = true;
-         tpl->NewConnection(Slot);
          }
       }
+  SendCaPmt();
   bool UserIO = false;
   for (int i = 0; i < MAX_CI_SESSION; i++) {
       if (sessions[i] && sessions[i]->Process())
          UserIO |= sessions[i]->HasUserIO();
       }
   hasUserIO = UserIO;
-  if (newCaSupport)
-     newCaSupport = result = false; // triggers new SetCaPmt at caller!
   return result;
 }
 
+void cCiHandler::SendCaPmt(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (newCaSupport) {
+     newCaSupport = false;
+     for (int Slot = 0; Slot < numSlots; Slot++) {
+         cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+         if (cas) {
+            // build the list of CA_PMT data:
+            cList<cCiCaPmt> CaPmtList;
+            for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+                bool Active = false;
+                cCiCaPmt *CaPmt = new cCiCaPmt(CPCI_OK_DESCRAMBLING, source, transponder, p->programNumber, GetCaSystemIds(Slot));
+                if (CaPmt->Valid()) {
+                   for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+                       if (q->active) {
+                          CaPmt->AddPid(q->pid, q->streamType);
+                          Active = true;
+                          }
+                       }
+                   }
+                if (Active)
+                   CaPmtList.Add(CaPmt);
+                else
+                   delete CaPmt;
+                }
+            // send the CA_PMT data:
+            uint8_t ListManagement = CaPmtList.Count() > 1 ? CPLM_FIRST : CPLM_ONLY;
+            for (cCiCaPmt *CaPmt = CaPmtList.First(); CaPmt; CaPmt = CaPmtList.Next(CaPmt)) {
+                CaPmt->SetListManagement(ListManagement);
+                if (!cas->SendPMT(CaPmt))
+                   newCaSupport = true;
+                ListManagement = CaPmt->Next() && CaPmt->Next()->Next() ? CPLM_MORE : CPLM_LAST;
+                }
+            }
+         }
+     }
+}
+
 bool cCiHandler::EnterMenu(int Slot)
 {
   cMutexLock MutexLock(&mutex);
@@ -1676,11 +1812,89 @@ bool cCiHandler::ProvidesCa(const unsigned short *CaSystemIds)
   return false;
 }
 
-bool cCiHandler::SetCaPmt(cCiCaPmt &CaPmt, int Slot)
+void cCiHandler::SetSource(int Source, int Transponder)
 {
   cMutexLock MutexLock(&mutex);
-  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-  return cas && cas->SendPMT(CaPmt);
+  if (source != Source || transponder != Transponder) {
+     //XXX if there are active entries, send an empty CA_PMT
+     caProgramList.Clear();
+     }
+  source = Source;
+  transponder = Transponder;
+}
+
+void cCiHandler::AddPid(int ProgramNumber, int Pid, int StreamType)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiCaProgramData *ProgramData = NULL;
+  for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+      if (p->programNumber == ProgramNumber) {
+         ProgramData = p;
+         for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+             if (q->pid == Pid)
+                return;
+             }
+         }
+      }
+  if (!ProgramData)
+     caProgramList.Add(ProgramData = new cCiCaProgramData(ProgramNumber));
+  ProgramData->pidList.Add(new cCiCaPidData(Pid, StreamType));
+}
+
+void cCiHandler::SetPid(int Pid, bool Active)
+{
+  cMutexLock MutexLock(&mutex);
+  for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+      for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+          if (q->pid == Pid) {
+             q->active = Active;
+             return;
+             }
+         }
+      }
+}
+
+bool cCiHandler::CanDecrypt(int ProgramNumber)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int Slot = 0; Slot < numSlots; Slot++) {
+      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+      if (cas) {
+         for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+             if (p->programNumber == ProgramNumber) {
+                cCiCaPmt CaPmt(CPCI_QUERY, source, transponder, p->programNumber, GetCaSystemIds(Slot));//XXX???
+                if (CaPmt.Valid()) {
+                   for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+//XXX                       if (q->active)
+                          CaPmt.AddPid(q->pid, q->streamType);
+                       }
+                   }
+                if (!cas->SendPMT(&CaPmt))
+                   return false;//XXX
+                //XXX
+                time_t timeout = time(NULL) + 3;//XXX
+                while (time(NULL) <= timeout) {
+                      Process(Slot);
+                      cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+                      if (!cas)
+                         return false;//XXX
+                      if (cas->ReceivedReply(true))
+                         return true;
+                      //XXX remember if a slot doesn't receive a reply
+                      }
+                break;
+                }
+             }
+         }
+      }
+  return false;
+}
+
+void cCiHandler::StartDecrypting(void)
+{
+  cMutexLock MutexLock(&mutex);
+  newCaSupport = true;
+  SendCaPmt();
 }
 
 bool cCiHandler::Reset(int Slot)
diff --git a/ci.h b/ci.h
index ae7601551..f1e289ad4 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.18 2005/10/30 12:31:14 kls Exp $
+ * $Id: ci.h 1.19 2005/11/26 13:37:42 kls Exp $
  */
 
 #ifndef __CI_H
@@ -13,6 +13,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "thread.h"
+#include "tools.h"
 
 class cCiMMI;
 
@@ -65,24 +66,31 @@ class cCiEnquiry {
   bool Abort(void);
   };
 
-class cCiCaPmt {
-  friend class cCiConditionalAccessSupport;
-private:
-  int length;
-  int esInfoLengthPos;
-  uint8_t capmt[2048]; ///< XXX is there a specified maximum?
-  int caDescriptorsLength;
-  uint8_t caDescriptors[2048];
-  bool streamFlag;
-  void AddCaDescriptors(int Length, const uint8_t *Data);
+#define MAX_CI_SESSION  16 //XXX
+#define MAX_CI_SLOT     16
+
+class cCiCaPidData : public cListObject {
 public:
-  cCiCaPmt(int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds);
-  bool Valid(void);
-  void AddPid(int Pid, uint8_t StreamType);
+  bool active;
+  int pid;
+  int streamType;
+  cCiCaPidData(int Pid, int StreamType)
+  {
+    active = false;
+    pid = Pid;
+    streamType = StreamType;
+  }
   };
 
-#define MAX_CI_SESSION  16 //XXX
-#define MAX_CI_SLOT     16
+class cCiCaProgramData : public cListObject {
+public:
+  int programNumber;
+  cList<cCiCaPidData> pidList;
+  cCiCaProgramData(int ProgramNumber)
+  {
+    programNumber = ProgramNumber;
+  }
+  };
 
 class cCiSession;
 class cCiTransportLayer;
@@ -99,6 +107,9 @@ class cCiHandler {
   cCiSession *sessions[MAX_CI_SESSION];
   cCiTransportLayer *tpl;
   cCiTransportConnection *tc;
+  int source;
+  int transponder;
+  cList<cCiCaProgramData> caProgramList;
   int ResourceIdToInt(const uint8_t *Data);
   bool Send(uint8_t Tag, int SessionId, int ResourceId = 0, int Status = -1);
   cCiSession *GetSessionBySessionId(int SessionId);
@@ -108,12 +119,15 @@ class cCiHandler {
   bool CloseSession(int SessionId);
   int CloseAllSessions(int Slot);
   cCiHandler(int Fd, int NumSlots);
+  void SendCaPmt(void);
 public:
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
   int NumSlots(void) { return numSlots; }
   bool Ready(void);
-  bool Process(void);
+  bool Process(int Slot = -1);
+       ///< Processes the given Slot. If Slot is -1, all slots are processed.
+       ///< Returns false in case of an error.
   bool HasUserIO(void) { return hasUserIO; }
   bool EnterMenu(int Slot);
   cCiMenu *GetMenu(void);
@@ -121,7 +135,24 @@ class cCiHandler {
   const char *GetCamName(int Slot);
   const unsigned short *GetCaSystemIds(int Slot);
   bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot???
-  bool SetCaPmt(cCiCaPmt &CaPmt, int Slot);
+  void SetSource(int Source, int Transponder);
+       ///< Sets the Source and Transponder of the device this cCiHandler is
+       ///< currently tuned to. If Source or Transponder are different than
+       ///< what was given in a previous call to SetSource(), any previously
+       ///< added PIDs will be cleared.
+  void AddPid(int ProgramNumber, int Pid, int StreamType);
+       ///< Adds the given PID information to the list of PIDs. A later call
+       ///< to SetPid() will (de)activate one of these entries.
+  void SetPid(int Pid, bool Active);
+       ///< Sets the given Pid (which has previously been added through a
+       ///< call to AddPid()) to Active. If Active is true, a later call to
+       ///< StartDecrypting() will send the full list of currently active CA_PMT
+       ///< entries to the CAM, including this one.
+  bool CanDecrypt(int ProgramNumber);
+       ///< XXX
+  void StartDecrypting(void);
+       ///< Triggers sending all currently active CA_PMT entries to the CAM,
+       ///< so that it will start decrypting.
   bool Reset(int Slot);
   };
 
diff --git a/config.h b/config.h
index ef84cf97d..733b959ae 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.234 2005/11/04 15:55:05 kls Exp $
+ * $Id: config.h 1.235 2005/11/11 13:22:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.36"
-#define VDRVERSNUM   10336  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.37"
+#define VDRVERSNUM   10337  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 0da5a492e..1b4cec458 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.111 2005/11/05 15:23:58 kls Exp $
+ * $Id: device.c 1.112 2005/11/26 12:56:09 kls Exp $
  */
 
 #include "device.h"
@@ -397,6 +397,8 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
               DelPid(Pid, PidType);
               return false;
               }
+           if (ciHandler)
+              ciHandler->SetPid(Pid, true);
            }
         PRINTPIDS("a");
         return true;
@@ -424,6 +426,8 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
            DelPid(Pid, PidType);
            return false;
            }
+        if (ciHandler)
+           ciHandler->SetPid(Pid, true);
         }
      }
   return true;
@@ -450,6 +454,8 @@ void cDevice::DelPid(int Pid, ePidType PidType)
            if (pidHandles[n].used == 0) {
               pidHandles[n].handle = -1;
               pidHandles[n].pid = 0;
+              if (ciHandler)
+                 ciHandler->SetPid(Pid, false);
               }
            }
         PRINTPIDS("E");
@@ -601,12 +607,34 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         sectionHandler->SetStatus(false);
         sectionHandler->SetChannel(NULL);
         }
+     // Tell the ciHandler about the channel switch and add all PIDs of this
+     // channel to it, for possible later decryption:
+     if (ciHandler) {
+        ciHandler->SetSource(Channel->Source(), Channel->Transponder());
+// Men at work - please stand clear! ;-)
+#ifdef XXX_DO_MULTIPLE_CA_CHANNELS
+        if (Channel->Ca() > CACONFBASE) {
+#endif
+           ciHandler->AddPid(Channel->Sid(), Channel->Vpid(), 2);
+           for (const int *Apid = Channel->Apids(); *Apid; Apid++)
+               ciHandler->AddPid(Channel->Sid(), *Apid, 4);
+           for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
+               ciHandler->AddPid(Channel->Sid(), *Dpid, 0);
+#ifdef XXX_DO_MULTIPLE_CA_CHANNELS
+           bool CanDecrypt = ciHandler->CanDecrypt(Channel->Sid());//XXX
+           dsyslog("CanDecrypt %d %d %d %s", CardIndex() + 1, CanDecrypt, Channel->Number(), Channel->Name());//XXX
+           }
+#endif
+        }
      if (SetChannelDevice(Channel, LiveView)) {
         // Start section handling:
         if (sectionHandler) {
            sectionHandler->SetChannel(Channel);
            sectionHandler->SetStatus(true);
            }
+        // Start decrypting any PIDs the might have been set in SetChannelDevice():
+        if (ciHandler)
+           ciHandler->StartDecrypting();
         }
      else
         Result = scrFailed;
@@ -1168,6 +1196,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Unlock();
          if (!Running())
             Start();
+         if (ciHandler)
+            ciHandler->StartDecrypting();
          return true;
          }
       }
@@ -1194,6 +1224,8 @@ void cDevice::Detach(cReceiver *Receiver)
       else if (receiver[i])
          receiversLeft = true;
       }
+  if (ciHandler)
+     ciHandler->StartDecrypting();
   if (!receiversLeft)
      Cancel(3);
 }
diff --git a/dvbdevice.c b/dvbdevice.c
index 3f9e144e1..30ce1e4ae 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.136 2005/08/21 09:17:20 kls Exp $
+ * $Id: dvbdevice.c 1.138 2005/11/26 13:23:11 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -35,6 +35,7 @@ extern "C" {
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
+//#define DO_MULTIPLE_CA_CHANNELS
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -69,15 +70,13 @@ static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
 
 class cDvbTuner : public cThread {
 private:
-  enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked, tsCam };
+  enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
   int fd_frontend;
   int cardIndex;
   fe_type_t frontendType;
   cCiHandler *ciHandler;
   cChannel channel;
   const char *diseqcCommands;
-  bool useCa;
-  time_t startTime;
   eTunerStatus tunerStatus;
   cMutex mutex;
   cCondVar locked;
@@ -89,7 +88,7 @@ class cDvbTuner : public cThread {
   cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
-  void Set(const cChannel *Channel, bool Tune, bool UseCa);
+  void Set(const cChannel *Channel, bool Tune);
   bool Locked(int TimeoutMs = 0);
   };
 
@@ -100,9 +99,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   frontendType = FrontendType;
   ciHandler = CiHandler;
   diseqcCommands = NULL;
-  useCa = false;
   tunerStatus = tsIdle;
-  startTime = time(NULL);
   if (frontendType == FE_QPSK)
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
@@ -122,16 +119,11 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Transponder() == Channel->Transponder();
 }
 
-void cDvbTuner::Set(const cChannel *Channel, bool Tune, bool UseCa)
+void cDvbTuner::Set(const cChannel *Channel, bool Tune)
 {
   cMutexLock MutexLock(&mutex);
   if (Tune)
      tunerStatus = tsSet;
-  else if (tunerStatus == tsCam)
-     tunerStatus = tsLocked;
-  useCa = UseCa;
-  if (Channel->Ca() && tunerStatus != tsCam)
-     startTime = time(NULL);
   channel = *Channel;
   newSet.Broadcast();
 }
@@ -309,7 +301,6 @@ void cDvbTuner::Action(void)
                continue;
           case tsTuned:
           case tsLocked:
-          case tsCam:
                if (hasEvent) {
                   if (event.status & FE_REINIT) {
                      tunerStatus = tsSet;
@@ -323,30 +314,10 @@ void cDvbTuner::Action(void)
                   }
           }
 
-        if (ciHandler) {
-           if (ciHandler->Process() && useCa) {
-              if (tunerStatus == tsLocked) {
-                 for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) {
-                     cCiCaPmt CaPmt(channel.Source(), channel.Transponder(), channel.Sid(), ciHandler->GetCaSystemIds(Slot));
-                     if (CaPmt.Valid()) {
-                        CaPmt.AddPid(channel.Vpid(), 2);
-                        CaPmt.AddPid(channel.Apid(0), 4);
-                        CaPmt.AddPid(channel.Apid(1), 4);
-                        CaPmt.AddPid(channel.Dpid(0), 0);
-                        if (ciHandler->SetCaPmt(CaPmt, Slot)) {
-                           tunerStatus = tsCam;
-                           startTime = 0;
-                           }
-                        }
-                     }
-                 }
-              }
-           else if (tunerStatus > tsLocked)
-              tunerStatus = tsLocked;
-           }
-        // in the beginning we loop more often to let the CAM connection start up fast
+        if (ciHandler)
+           ciHandler->Process();
         if (tunerStatus != tsTuned)
-           newSet.TimedWait(mutex, (ciHandler && (time(NULL) - startTime < 20)) ? 100 : 1000);
+           newSet.TimedWait(mutex, 1000);
         }
 }
 
@@ -659,6 +630,11 @@ eVideoSystem cDvbDevice::GetVideoSystem(void)
   return VideoSystem;
 }
 
+bool cDvbDevice::SetAudioBypass(bool On)
+{
+  return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
+}
+
 //                            ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
 dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_PCR, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
 
@@ -777,9 +753,12 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
         if (dvbTuner->IsTunedTo(Channel)) {
            if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
 #ifdef DO_MULTIPLE_RECORDINGS
+#ifndef DO_MULTIPLE_CA_CHANNELS
               if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE)
                  needsDetachReceivers = Ca() != Channel->Ca();
-              else if (!IsPrimaryDevice())
+              else
+#endif
+              if (!IsPrimaryDevice())
                  result = true;
 #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
               else
@@ -829,18 +808,19 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   // Set the tuner:
 
-  dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
+  dvbTuner->Set(Channel, DoTune);
 
   // If this channel switch was requested by the EITScanner we don't wait for
   // a lock and don't set any live PIDs (the EITScanner will wait for the lock
   // by itself before setting any filters):
 
-  if (EITScanner.UsesDevice(this))
+  if (EITScanner.UsesDevice(this)) //XXX
      return true;
 
   // PID settings:
 
   if (TurnOnLivePIDs) {
+     SetAudioBypass(false);
      if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
@@ -910,7 +890,8 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
 {
   const tTrackId *TrackId = GetTrack(Type);
   if (TrackId && TrackId->id) {
-     if (IS_AUDIO_TRACK(Type)) {
+     SetAudioBypass(false);
+     if (IS_AUDIO_TRACK(Type) || (IS_DOLBY_TRACK(Type) && SetAudioBypass(true))) {
         if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
            DetachAll(pidHandles[ptAudio].pid);
            pidHandles[ptAudio].pid = TrackId->id;
diff --git a/dvbdevice.h b/dvbdevice.h
index 7da7e4f11..ed0cef8a8 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.35 2005/08/20 15:20:15 kls Exp $
+ * $Id: dvbdevice.h 1.36 2005/11/11 14:51:38 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -69,6 +69,8 @@ class cDvbDevice : public cDevice {
 
 // PID handle facilities
 
+private:
+  bool SetAudioBypass(bool On);
 protected:
   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 
diff --git a/epg.c b/epg.c
index 72dc3346b..e6e039cee 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.39 2005/11/06 10:31:58 kls Exp $
+ * $Id: epg.c 1.40 2005/11/11 13:37:43 kls Exp $
  */
 
 #include "epg.h"
@@ -503,19 +503,6 @@ void cEvent::FixEpgBugs(void)
      title = compactspace(title);
      shortText = compactspace(shortText);
      description = compactspace(description);
-     // Remove superfluous hyphens:
-     if (description) {
-        char *p = description;
-        while (*p && *(p + 1) && *(p + 2)) {
-              if (*p == '-' && *(p + 1) == ' ' && p != description && islower(*(p - 1)) && islower(*(p + 2))) {
-                 if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
-                    memmove(p, p + 2, strlen(p + 2) + 1);
-                    EpgBugFixStat(5, ChannelID());
-                    }
-                 }
-              p++;
-              }
-        }
 
 #define MAX_USEFUL_EPISODE_LENGTH 40
      // Some channels put a whole lot of information in the ShortText and leave
diff --git a/interface.c b/interface.c
index 4f18ddda4..560847844 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.69 2005/09/03 09:07:23 kls Exp $
+ * $Id: interface.c 1.70 2005/11/27 15:31:06 kls Exp $
  */
 
 #include "interface.h"
@@ -36,13 +36,6 @@ eKeys cInterface::GetKey(bool Wait)
   if (SVDRP) {
      if (SVDRP->Process())
         Wait = false;
-     if (!Skins.IsOpen()) {
-        char *message = SVDRP->GetMessage();
-        if (message) {
-           Skins.Message(mtInfo, message);
-           free(message);
-           }
-        }
      }
   return cRemote::Get(Wait ? 1000 : 10);
 }
diff --git a/menuitems.c b/menuitems.c
index 1f2cc14ae..4b4e5f2db 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.23 2005/09/17 09:36:31 kls Exp $
+ * $Id: menuitems.c 1.24 2005/11/12 12:22:10 kls Exp $
  */
 
 #include "menuitems.h"
@@ -578,10 +578,18 @@ cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value, int *WeekD
   value = Value;
   weekdays = WeekDays;
   oldvalue = 0;
-  dayindex = 0;
+  dayindex = weekdays ? FindDayIndex(*weekdays) : 0;
   Set();
 }
 
+int cMenuEditDateItem::FindDayIndex(int WeekDays)
+{
+  for (unsigned int i = 0; i < sizeof(days) / sizeof(int); i++)
+      if (WeekDays == days[i])
+         return i;
+  return 0;
+}
+
 void cMenuEditDateItem::Set(void)
 {
 #define DATEBUFFERSIZE 32
diff --git a/menuitems.h b/menuitems.h
index b45fc9604..f9afc1511 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.11 2005/03/19 15:02:57 kls Exp $
+ * $Id: menuitems.h 1.12 2005/11/11 13:26:51 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -125,6 +125,7 @@ class cMenuEditDateItem : public cMenuEditItem {
   int *weekdays;
   time_t oldvalue;
   int dayindex;
+  int FindDayIndex(int WeekDays);
   virtual void Set(void);
 public:
   cMenuEditDateItem(const char *Name, time_t *Value, int *WeekDays = NULL);
diff --git a/newplugin b/newplugin
index 92bc0d46c..1800b7f4c 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.21 2005/09/14 16:02:06 kls Exp $
+# $Id: newplugin 1.22 2005/11/11 13:20:14 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -71,7 +71,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/skins.c b/skins.c
index e81e8825a..c6213cf10 100644
--- a/skins.c
+++ b/skins.c
@@ -4,13 +4,49 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.5 2005/10/02 10:12:10 kls Exp $
+ * $Id: skins.c 1.6 2005/11/27 15:52:25 kls Exp $
  */
 
 #include "skins.h"
 #include "interface.h"
 #include "status.h"
-#include "tools.h"
+
+// --- cSkinQueuedMessage ----------------------------------------------------
+
+class cSkinQueuedMessage : public cListObject {
+  friend class cSkins;
+private:
+  eMessageType type;
+  char *message;
+  int seconds;
+  int timeout;
+  tThreadId threadId;
+  eKeys key;
+  int state;
+  cMutex mutex;
+  cCondVar condVar;
+public:
+  cSkinQueuedMessage(eMessageType Type, const char *s, int Seconds, int Timeout);
+  virtual ~cSkinQueuedMessage();
+  };
+
+cSkinQueuedMessage::cSkinQueuedMessage(eMessageType Type, const char *s, int Seconds, int Timeout)
+{
+  type = Type;
+  message = s ? strdup(s) : NULL;
+  seconds = Seconds;
+  timeout = Timeout;
+  threadId = cThread::ThreadId();
+  key = kNone;
+  state = 0; // waiting
+}
+
+cSkinQueuedMessage::~cSkinQueuedMessage()
+{
+  free(message);
+}
+
+cList<cSkinQueuedMessage> SkinQueuedMessages;
 
 // --- cSkinDisplay ----------------------------------------------------------
 
@@ -202,6 +238,95 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
   return k;
 }
 
+int cSkins::QueueMessage(eMessageType Type, const char *s, int Seconds, int Timeout)
+{
+  if (Type == mtStatus) {
+     dsyslog("cSkins::QueueMessage() called with mtStatus - ignored!");
+     return kNone;
+     }
+  if (isempty(s)) {
+     dsyslog("cSkins::QueueMessage() called with empty message - ignored!");
+     return kNone;
+     }
+  int k = kNone;
+  if (Timeout > 0) {
+     if (cThread::IsMainThread()) {
+        dsyslog("cSkins::QueueMessage() called from main thread with Timeout = %d - ignored!", Timeout);
+        return k;
+        }
+     cSkinQueuedMessage *m = new cSkinQueuedMessage(Type, s, Seconds, Timeout);
+     queueMessageMutex.Lock();
+     SkinQueuedMessages.Add(m);
+     m->mutex.Lock();
+     queueMessageMutex.Unlock();
+     if (m->condVar.TimedWait(m->mutex, Timeout * 1000))
+        k = m->key;
+     else
+        k = -1; // timeout, nothing has been displayed
+     m->state = 2; // done
+     m->mutex.Unlock();
+     }
+  else {
+     queueMessageMutex.Lock();
+     // Check if there is a waiting message w/o timeout for this thread:
+     if (Timeout == -1) {
+        for (cSkinQueuedMessage *m = SkinQueuedMessages.Last(); m; m = SkinQueuedMessages.Prev(m)) {
+            if (m->threadId == cThread::ThreadId()) {
+               if (m->state == 0 && m->timeout == -1)
+                  m->state = 2; // done
+               break;
+               }
+            }
+         }
+     // Add the new message:
+     SkinQueuedMessages.Add(new cSkinQueuedMessage(Type, s, Seconds, Timeout));
+     queueMessageMutex.Unlock();
+     }
+  return k;
+}
+
+void cSkins::ProcessQueuedMessages(void)
+{
+  if (!cThread::IsMainThread()) {
+     dsyslog("cSkins::ProcessQueuedMessages() called from background thread - ignored!");
+     return;
+     }
+  cSkinQueuedMessage *msg = NULL;
+  // Get the first waiting message:
+  queueMessageMutex.Lock();
+  for (cSkinQueuedMessage *m = SkinQueuedMessages.First(); m; m = SkinQueuedMessages.Next(m)) {
+      if (m->state == 0) { // waiting
+         m->state = 1; // active
+         msg = m;
+         break;
+         }
+      }
+  queueMessageMutex.Unlock();
+  // Display the message:
+  if (msg) {
+     msg->mutex.Lock();
+     if (msg->state == 1) { // might have changed since we got it
+        msg->key = Skins.Message(msg->type, msg->message, msg->seconds);
+        if (msg->timeout == 0)
+           msg->state = 2; // done
+        else
+           msg->condVar.Broadcast();
+        }
+     msg->mutex.Unlock();
+     }
+  // Remove done messages from the queue:
+  queueMessageMutex.Lock();
+  for (;;) {
+      cSkinQueuedMessage *m = SkinQueuedMessages.First();
+      if (m && m->state == 2) { // done
+         SkinQueuedMessages.Del(m);
+         }
+      else
+         break;
+      } 
+  queueMessageMutex.Unlock();
+}
+
 void cSkins::Flush(void)
 {
   if (cSkinDisplay::Current())
diff --git a/skins.h b/skins.h
index 5fc634430..90ed0c3a0 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.8 2005/05/15 14:41:41 kls Exp $
+ * $Id: skins.h 1.9 2005/11/27 15:41:44 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -16,6 +16,7 @@
 #include "osd.h"
 #include "recording.h"
 #include "themes.h"
+#include "thread.h"
 #include "tools.h"
 
 enum eMessageType { mtStatus = 0, mtInfo, mtWarning, mtError }; // will be used to calculate color offsets!
@@ -298,6 +299,7 @@ class cSkins : public cList<cSkin> {
 private:
   cSkin *current;
   cSkinDisplayMessage *displayMessage;
+  cMutex queueMessageMutex;
 public:
   cSkins(void);
   ~cSkins();
@@ -312,6 +314,35 @@ class cSkins : public cList<cSkin> {
        ///< Displays the given message, either through a currently visible
        ///< display object that is capable of doing so, or by creating a
        ///< temporary cSkinDisplayMessage object.
+       ///< The return value is the key pressed by the user. If no user input
+       ///< has been received within Seconds (the default value of 0 results
+       ///< in the ///< value defined for "Message time" in the setup), kNone
+       ///< will be returned.
+  int QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
+       ///< Like Message(), but this function may be called from a background
+       ///< thread. The given message is put into a queue and the main program
+       ///< loop will display it as soon as this is suitable. If Timeout is 0,
+       ///< QueueMessage() returns immediately and the return value will be kNone.
+       ///< If a positive Timeout is given, the thread will wait at most the given
+       ///< number of seconds for the message to be actually displayed (note that
+       ///< the user may currently be doing something that doesn't allow for
+       ///< queued messages to be displayed immediately). If the timeout expires
+       ///< and the message hasn't been displayed yet, the return value is -1
+       ///< and the message will be removed from the queue without being displayed.
+       ///< Positive values of Timeout are only allowed for background threads.
+       ///< If QueueMessage() is called from the foreground thread with a Timeout
+       ///< greater than 0, the call is ignored and nothing is displayed.
+       ///< Queued messages will be displayed in the sequence they have been
+       ///< put into the queue, so messages from different threads may appear
+       ///< mingled. If a particular thread queues a message with a Timeout of
+       ///< -1, and the previous message from the same thread also had a Timeout
+       ///< of -1, only the last message will be displayed. This can be used for
+       ///< progress displays, where only the most recent message is actually
+       ///< important.
+       ///< Type may only be mtInfo, mtWarning or mtError. A call with mtStatus
+       ///< will be ignored, as will be one with an empty message.
+  void ProcessQueuedMessages(void);
+       ///< Processes the first queued message, if any.
   void Flush(void);
        ///< Flushes the currently active cSkinDisplay, if any.
   };
diff --git a/svdrp.c b/svdrp.c
index 8e09d41cb..78b759aa9 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.83 2005/11/05 11:21:38 kls Exp $
+ * $Id: svdrp.c 1.84 2005/11/27 15:29:28 kls Exp $
  */
 
 #include "svdrp.h"
@@ -35,6 +35,7 @@
 #include "menu.h"
 #include "plugin.h"
 #include "remote.h"
+#include "skins.h"
 #include "timers.h"
 #include "tools.h"
 #include "videodir.h"
@@ -225,12 +226,9 @@ const char *HelpPages[] = {
   "LSTT [ <number> ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed.",
-  "MESG [ <message> ]\n"
-  "    Displays the given message on the OSD. If message is omitted, the\n"
-  "    currently pending message (if any) will be returned. The message\n"
-  "    will be displayed for a few seconds as soon as the OSD has become\n"
-  "    idle. If a new MESG command is entered while the previous message\n"
-  "    has not yet been displayed, the old message will be overwritten.",
+  "MESG <message>\n"
+  "    Displays the given message on the OSD. The message will be queued\n"
+  "    and displayed whenever this is suitable.\n",
   "MODC <number> <settings>\n"
   "    Modify a channel. Settings must be in the same format as returned\n"
   "    by the LSTC command.",
@@ -363,7 +361,6 @@ cSVDRP::cSVDRP(int Port)
   numChars = 0;
   length = BUFSIZ;
   cmdLine = MALLOC(char, length);
-  message = NULL;
   lastActivity = 0;
   isyslog("SVDRP listening on port %d", Port);
 }
@@ -371,7 +368,6 @@ cSVDRP::cSVDRP(int Port)
 cSVDRP::~cSVDRP()
 {
   Close();
-  free(message);
   free(cmdLine);
 }
 
@@ -954,15 +950,12 @@ void cSVDRP::CmdLSTT(const char *Option)
 void cSVDRP::CmdMESG(const char *Option)
 {
   if (*Option) {
-     free(message);
-     message = strdup(Option);
-     isyslog("SVDRP message: '%s'", message);
-     Reply(250, "Message stored");
+     isyslog("SVDRP message: '%s'", Option);
+     Skins.QueueMessage(mtInfo, Option);
+     Reply(250, "Message queued");
      }
-  else if (message)
-     Reply(250, "%s", message);
   else
-     Reply(550, "No pending message");
+     Reply(501, "Missing message");
 }
 
 void cSVDRP::CmdMODC(const char *Option)
@@ -1489,11 +1482,4 @@ bool cSVDRP::Process(void)
   return false;
 }
 
-char *cSVDRP::GetMessage(void)
-{
-  char *s = message;
-  message = NULL;
-  return s;
-}
-
 //TODO more than one connection???
diff --git a/svdrp.h b/svdrp.h
index 2e182f211..469c47a51 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.25 2005/11/05 10:54:22 kls Exp $
+ * $Id: svdrp.h 1.26 2005/11/27 15:26:42 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -48,7 +48,6 @@ class cSVDRP {
   int numChars;
   int length;
   char *cmdLine;
-  char *message;
   time_t lastActivity;
   void Close(bool Timeout = false);
   bool Send(const char *s, int length = -1);
@@ -88,7 +87,6 @@ class cSVDRP {
   ~cSVDRP();
   bool HasConnection(void) { return file.IsOpen(); }
   bool Process(void);
-  char *GetMessage(void);
   };
 
 #endif //__SVDRP_H
diff --git a/thread.c b/thread.c
index 3fa410065..52747730e 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.45 2005/08/14 11:15:42 kls Exp $
+ * $Id: thread.c 1.46 2005/11/27 15:15:53 kls Exp $
  */
 
 #include "thread.h"
@@ -193,6 +193,7 @@ void cMutex::Unlock(void)
 
 // --- cThread ---------------------------------------------------------------
 
+tThreadId cThread::mainThreadId = cThread::ThreadId();
 bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(const char *Description)
diff --git a/thread.h b/thread.h
index e72677f3d..1b6200cec 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.31 2005/10/09 11:12:32 kls Exp $
+ * $Id: thread.h 1.32 2005/11/27 15:16:50 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -72,6 +72,8 @@ class cMutex {
   void Unlock(void);
   };
 
+typedef pthread_t tThreadId;
+
 class cThread {
   friend class cThreadLock;
 private:
@@ -80,6 +82,7 @@ class cThread {
   pthread_t childTid;
   cMutex mutex;
   char *description;
+  static tThreadId mainThreadId;
   static bool emergencyExitRequested;
   static void *StartThread(cThread *Thread);
 protected:
@@ -112,6 +115,8 @@ class cThread {
   bool Active(void);
        ///< Checks whether the thread is still alive.
   static bool EmergencyExit(bool Request = false);
+  static tThreadId ThreadId(void) { return pthread_self(); }
+  static tThreadId IsMainThread(void) { return ThreadId() == mainThreadId; }
   };
 
 // cMutexLock can be used to easily set a lock on mutex and make absolutely
diff --git a/tools.c b/tools.c
index 832f42938..4a4a3aa6b 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.103 2005/11/04 16:33:18 kls Exp $
+ * $Id: tools.c 1.104 2005/11/26 14:12:31 kls Exp $
  */
 
 #include "tools.h"
@@ -527,6 +527,11 @@ cString::cString(const char *S, bool TakePointer)
   s = TakePointer ? (char *)S : S ? strdup(S) : NULL;
 }
 
+cString::cString(const cString &String)
+{
+  s = String.s ? strdup(String.s) : NULL;
+}
+
 cString::~cString()
 {
   free(s);
@@ -534,6 +539,8 @@ cString::~cString()
 
 cString &cString::operator=(const cString &String)
 {
+  if (this == &String)
+     return *this;
   free(s);
   s = String.s ? strdup(String.s) : NULL;
   return *this;
diff --git a/tools.h b/tools.h
index c344fce2f..833ba8472 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.83 2005/11/05 10:54:39 kls Exp $
+ * $Id: tools.h 1.84 2005/11/26 14:03:47 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -75,6 +75,7 @@ class cString {
   char *s;
 public:
   cString(const char *S = NULL, bool TakePointer = false);
+  cString(const cString &String);
   virtual ~cString();
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
diff --git a/vdr.c b/vdr.c
index 5cf737518..8b206f978 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.219 2005/11/04 13:48:39 kls Exp $
+ * $Id: vdr.c 1.220 2005/11/27 15:56:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -677,6 +677,9 @@ int main(int argc, char *argv[])
            else if (!LastCamMenu)
               LastCamMenu = time(NULL);
            }
+        // Queued messages:
+        if (!Skins.IsOpen())
+           Skins.ProcessQueuedMessages();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
         eKeys key = Interface->GetKey((!Interact || !Interact->NeedsFastResponse()) && time(NULL) - LastCamMenu > LASTCAMMENUTIMEOUT);

From da948a50d2318fd9c818a4b969b74555ce577b1e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Jan 2006 18:00:00 +0100
Subject: [PATCH 130/307] =?UTF-8?q?Version=201.3.38=20-=20Fixed=20handling?=
 =?UTF-8?q?=20second=20audio=20and=20Dolby=20Digital=20PIDs=20for=20encryp?=
 =?UTF-8?q?ted=20channels=20=20=20(was=20broken=20in=20version=201.3.37).?=
 =?UTF-8?q?=20-=20Improved=20TS/PES=20conversion=20to=20better=20handle=20?=
 =?UTF-8?q?lost=20TS=20packets=20(thanks=20to=20=20=20Reinhard=20Nissl).?=
 =?UTF-8?q?=20-=20Limited=20the=20frequency=20of=20log=20messages=20from?=
 =?UTF-8?q?=20the=20cRepackers.=20-=20Now=20using=20the=20gettid()=20sysca?=
 =?UTF-8?q?ll=20to=20get=20a=20thread's=20pid,=20so=20that=20we=20get=20a?=
 =?UTF-8?q?=20=20=20useful=20value=20on=20NPTL=20systems=20(suggested=20by?=
 =?UTF-8?q?=20Johannes=20Stezenbach).=20-=20Fixed=20the=20RCU=20remote=20c?=
 =?UTF-8?q?ontrol=20handling=20to=20avoid=20problems=20with=20NPTL=20(than?=
 =?UTF-8?q?ks=20=20=20to=20Andreas=20Share=20for=20reporting=20a=20lockup?=
 =?UTF-8?q?=20with=20the=20RCU=20on=20NPTL=20systems).=20-=20When=20displa?=
 =?UTF-8?q?ying=20the=20amount=20of=20free=20disk=20space,=20the=20space?=
 =?UTF-8?q?=20consumed=20by=20=20=20recordings=20that=20have=20been=20"del?=
 =?UTF-8?q?eted"=20but=20not=20yet=20actually=20"removed"=20is=20now=20=20?=
 =?UTF-8?q?=20taken=20into=20account=20(suggested=20by=20Christian=20Vogt)?=
 =?UTF-8?q?.=20-=20Now=20avoiding=20unnecessary=20disk=20access=20when=20c?=
 =?UTF-8?q?hecking=20if=20there=20are=20deleted=20=20=20recordings=20that?=
 =?UTF-8?q?=20need=20to=20be=20removed=20(reported=20by=20Carsten=20Koch).?=
 =?UTF-8?q?=20-=20Fixed=20handling=20the=20DELETEDLIFETIME=20when=20removi?=
 =?UTF-8?q?ng=20deleted=20recordings.=20Now=20=20=20a=20deleted=20recordin?=
 =?UTF-8?q?g=20is=20retained=20at=20least=20DELETEDLIFETIME=20seconds=20be?=
 =?UTF-8?q?fore=20=20=20actually=20removing=20it.=20=20=20The=20value=20of?=
 =?UTF-8?q?=20DELETEDLIFETIME=20has=20been=20changed=20to=20300.=20So=20af?=
 =?UTF-8?q?ter=20(possibly=20=20=20inadvertently)=20deleting=20a=20recordi?=
 =?UTF-8?q?ng,=20there=20will=20be=20at=20least=205=20minutes=20=20=20in?=
 =?UTF-8?q?=20which=20it=20can=20be=20recovered=20(unless=20a=20new=20reco?=
 =?UTF-8?q?rding=20immediately=20requires=20=20=20the=20disk=20space).=20T?=
 =?UTF-8?q?he=20count=20starts=20again=20at=200=20every=20time=20VDR=20is?=
 =?UTF-8?q?=20started.=20-=20Fixed=20a=20possible=20crash=20when=20display?=
 =?UTF-8?q?ing=20the=20"Low=20disk=20space!"=20message=20from=20=20=20a=20?=
 =?UTF-8?q?background=20thread=20(thanks=20to=20Christof=20Steininger).=20?=
 =?UTF-8?q?-=20Fixed=20handling=20OSD=20areas=20that=20have=20invalid=20si?=
 =?UTF-8?q?zes=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Added?=
 =?UTF-8?q?=20a=20mutex=20to=20AssertFreeDiskSpace()=20to=20make=20sure=20?=
 =?UTF-8?q?calls=20from=20foreground=20=20=20and=20background=20threads=20?=
 =?UTF-8?q?won't=20interfere.=20-=20The=20main=20menu=20now=20dynamically?=
 =?UTF-8?q?=20updates=20its=20contents=20in=20case=20an=20instant=20=20=20?=
 =?UTF-8?q?recording=20or=20replay=20stops,=20etc.=20-=20The=20version=20n?=
 =?UTF-8?q?umber=20of=20EPG=20events=20is=20now=20also=20stored=20in=20the?=
 =?UTF-8?q?=20epg.data=20file=20=20=20(thanks=20to=20Kendy=20Kutzner).=20-?=
 =?UTF-8?q?=20EPG=20events=20that=20are=20no=20longer=20in=20the=20current?=
 =?UTF-8?q?ly=20broadcasted=20data=20stream=20are=20=20=20now=20automatica?=
 =?UTF-8?q?lly=20deleted.=20-=20Removed=20an=20invalid=20access=20to=20Eve?=
 =?UTF-8?q?nt->schedule=20in=20cSchedule::DelEvent().=20-=20Modified=20cSc?=
 =?UTF-8?q?hedule::Cleanup()=20(events=20are=20always=20sorted=20by=20time?=
 =?UTF-8?q?).=20-=20Schedules=20are=20now=20cleaned=20up=20once=20every=20?=
 =?UTF-8?q?hour=20(not=20only=20at=2005:00).=20-=20The=20"Schedule"=20and?=
 =?UTF-8?q?=20"What's=20on=20now/next=3F"=20menus=20are=20now=20updated=20?=
 =?UTF-8?q?if=20a=20timer=20=20=20is=20set=20or=20modified.=20-=20cTimer?=
 =?UTF-8?q?=20no=20longer=20has=20its=20own=20'schedule'=20member,=20it=20?=
 =?UTF-8?q?rather=20uses=20that=20of=20the=20=20=20event=20it=20has=20been?=
 =?UTF-8?q?=20set=20to.=20-=20The=20"Red"=20button=20in=20the=20"Schedule"?=
 =?UTF-8?q?,=20"What's=20on=20now/next=3F"=20and=20"Event"=20menus=20=20?=
 =?UTF-8?q?=20now=20immediately=20creates=20a=20timer=20for=20the=20select?=
 =?UTF-8?q?ed=20event=20and=20marks=20it=20with=20'T'.=20=20=20If=20the=20?=
 =?UTF-8?q?event=20is=20already=20marked=20with=20'T',=20the=20"Red"=20but?=
 =?UTF-8?q?ton=20opens=20the=20"Edit=20=20=20timer"=20menu=20for=20that=20?=
 =?UTF-8?q?timer.=20-=20Removing=20deleted=20recordings=20is=20now=20done?=
 =?UTF-8?q?=20in=20a=20separate=20thread.=20-=20Dropped=20the=20unused=20"?=
 =?UTF-8?q?stop=20recording=20on=20primary=20interface"=20stuff.=20-=20Con?=
 =?UTF-8?q?verting=20a=20grabbed=20image=20to=20JPEG=20is=20now=20done=20w?=
 =?UTF-8?q?ith=20the=20new=20function=20=20=20RgbToJpeg()=20(see=20tools.h?=
 =?UTF-8?q?).=20-=20The=20SVDRP=20command=20GRAB=20now=20determines=20the?=
 =?UTF-8?q?=20image=20type=20(JPEG=20or=20PNM)=20from=20the=20=20=20extens?=
 =?UTF-8?q?ion=20(".jpg",=20".jpeg"=20or=20".pnm")=20of=20the=20given=20fi?=
 =?UTF-8?q?le=20name.=20The=20explicit=20=20=20'jpeg'=20or=20'pnm'=20param?=
 =?UTF-8?q?eter=20is=20still=20accepted=20for=20backward=20compatibility,?=
 =?UTF-8?q?=20but=20=20=20has=20no=20meaning=20any=20more.=20-=20The=20fun?=
 =?UTF-8?q?ction=20cDevice::GrabImage()=20no=20longer=20writes=20the=20gra?=
 =?UTF-8?q?bbed=20image=20to=20a=20=20=20file,=20but=20rather=20returns=20?=
 =?UTF-8?q?a=20pointer=20to=20the=20image=20in=20memory.=20The=20wrapper?=
 =?UTF-8?q?=20=20=20function=20cDevice::GrabImageFile()=20can=20be=20used?=
 =?UTF-8?q?=20to=20write=20the=20grabbed=20image=20=20=20directly=20to=20a?=
 =?UTF-8?q?=20file.=20Plugins=20that=20used=20the=20old=20version=20of=20c?=
 =?UTF-8?q?Device::GrabImage()=20=20=20need=20to=20be=20adapted=20to=20the?=
 =?UTF-8?q?=20new=20interface.=20-=20The=20new=20class=20cBase64Encoder=20?=
 =?UTF-8?q?(see=20tools.h)=20can=20be=20used=20to=20encode=20data=20in=20?=
 =?UTF-8?q?=20=20base64=20(thanks=20to=20Bob=20Withers=20for=20publishing?=
 =?UTF-8?q?=20his=20Base64=20class).=20-=20The=20SVDRP=20command=20GRAB=20?=
 =?UTF-8?q?now=20writes=20the=20image=20data=20to=20the=20SVDRP=20connecti?=
 =?UTF-8?q?on=20=20=20(encoded=20in=20base64)=20if=20the=20given=20file=20?=
 =?UTF-8?q?name=20consists=20of=20only=20the=20file=20=20=20extension=20("?=
 =?UTF-8?q?.jpg",=20".jpeg"=20or=20".pnm"),=20or=20if=20only=20"-"=20is=20?=
 =?UTF-8?q?given=20as=20file=20=20=20name=20(based=20on=20a=20suggestion?=
 =?UTF-8?q?=20from=20Darren=20Salt).=20=20=20A=20simple=20way=20of=20viewi?=
 =?UTF-8?q?ng=20a=20grabbed=20image=20on=20a=20remote=20host=20is:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  svdrpsend.pl -d <hostname> 'grab -' | sed -n -e 's/^216-//p' -e '1ibegin-base64 644 -' -e '$a====' | uudecode | display -

- The new command line option '-g' must be given if the SVDRP command GRAB
  shall be allowed to write image files to disk. The parameter to this option
  must be the full path name of an existing directory, without any "..", double
  '/' or symlinks. By default, or if "-g- is given, grabbing to files is
  not allowed any more because of potential security risks.
- Modified the way the SVDRP command GRAB writes the grabbed image to a file
  to avoid a security hole (CAN-2005-0071, reported by Javier Fernández-Sanguino
  Peña):
  + The file handle is now opened in a way that it won't follow symbolic links
    (suggested by Darren Salt).
  + The given file name is now canonicalized, so that it won't contain any
    ".." or symlinks (suggested by Darren Salt).
  + Grabbing to files is limited to the directory given in the the command
    line option '-g'. By default grabbing to files is not allowed any more.
- Updated the Greek OSD texts (thanks to Dimitrios Dimitrakos).
- Changed all "illegal" to "invalid" in error messages (there's nothing "illegal"
  in VDR ;-).
- When started as user 'root' VDR now switches to a lesser privileged user id,
  keeping the capability to set the system time (based on a patch from Ludwig
  Nussel). By default the user id 'vdr' is used, which can be changed through
  the new command line option '-u'. Note that for security reasons VDR will no
  longer run as user 'root' (unless you explicitly start it with '-u root',
  but this is not recommended!). The 'runvdr' script has been changed to
  use the '-u' option.
- Changed the API of the functions cStatus::Recording() and cStatus::Replaying(),
  so that they can provide the full file name of the recording. Plugins that use
  these (or the related cStatus::Msg...() functions) need to be adapted
  (suggested by Andreas Brugger).
- The DVB devices now retune (and, if applicable, resend the DiSEqC data) if
  the lock is lost (based on a patch from Reinhard Nissl).
- Fixed handling multi byte key sequences in cKbdRemote (based on a patch from
  Jürgen Schneider).
- Removed unused variables in skinclassic.c and skinsttng.c (thanks to Marco
  Schlüßler).
- Made the static cControl functions thread safe (thanks to Patrick Fischer).
- Fixed initializing pthread_mutexattr_t and pthread_rwlockattr_t to avoid
  warnings with g++ 4.1.0 (thanks to Ville Skyttä).
- Fixed incrementing the 'state' variables in the repacker classes in remux.c
  to avoid warnings with g++ 4.1.0 (reported by Ville Skyttä).
- The Makefile now reports a summary of failed plugins (thanks to Udo Richter).
- The cTimer constructor can now take an optional cChannel (suggested by
  Patrick Fischer).
- Fixed setting the main thread id if VDR is running as a daemon.
- Fixed handling TS packets in cTS2PES (thanks to Reinhard Nissl).
- Added cTimer::SetPriority() to set a timer's priority (suggested by Kendy Kutzner).
- Added cMenuEditStrItem::InEditMode() (suggested by Christian Wieninger).
- Now using FE_READ_STATUS to read the current frontend status (suggested by
  Holger Wächtler).
- The "Menu" key now behaves consistently. If there is anything on the OSD, it
  is closed when the "Menu" key is pressed, and if there is nothing on the OSD,
  the "Menu" key opens the main menu (suggested by Luca Olivetti).
- The new option "Setup/OSD/Timeout requested channel info" can be used to turn
  off the automatic timeout of the channel display in case it was invoked by
  a press of the "Ok" key (suggested by Thiemo Gehrke).
- A message is now given when an instant recording is started (suggested by
  Helmut Auer). Actually the code was already there, just commented out - don't
  remember why it wasn't active...
- Removed an obsolete "Summary" text from i18n.c and preceded all key definition
  texts with "Key$" to avoid duplicates (reported by Lucian Muresan).
- Preceded all button texts with "Button$".
- Removed obsolete "Eject", "Language" and "scanning recordings..." texts.
- Added missing #include "thread.h" to dvbspu.c (reported by Gavin Hamill).
- Disabled the use of "fadvise" in cUnbufferedFile because there have been
  several reports that it causes more problems than it solves (suggested by
  Petri Hintukainen). If you want to use "fadvise", you can activate the line
  //#define USE_FADVISE
  in tools.c.
- Removed unused 'offset' member from cOsdItem.
- In the "Channels" menu the numeric keys now position the cursor to the channel
  with the given number (see MANUAL, section "Remote Control Keys", note (3) for
  details).
- The "Mark/Move" function in the "Channels" menu now also works in the non-numeric
  sort modes.
- The default cOsdObject::Show() now automatically calls cOsdMenu::Display() if
  this is a menu.
- The new "Info" key brings up information on the currently viewed programme
  or recording. For a live programme this is the same as "Schedule/Ok", i.e. the
  description of the current EPG event. For a recording this is the same as shown
  by the "Info" button in the "Recordings" menu. Plugins that implement players
  can overwrite their cControl::GetInfo() function to show their own info (see
  PLUGINS.html for details). Pressing the "Info" key again while the info is
  displayed will close the OSD. In order to assign this new key to an existing
  remote control setup, the remote.conf file needs to be deleted and VDR has
  to be restarted to go through the process of learning the remote control keys.
- Any cReceivers still attached to a cDevice when that device switches to a
  different transponder are now automatically detached (suggested by Patrick
  Fischer).
- The "flags" of a timer are now handled as an unsigned integer value. In order
  to do this, the interface of cMenuEditBitItem also had to be changed.
- In string entry fields (like, e.g., the file name of a recording) the characters
  can now be entered by pressing the numeric keys, the same way as on a
  telephone keypad (based on the "Easy Input" patch from Marcel Schaeben).
- Fixed the "Day" field of the "Edit timer" menu when pressing '0' to switch
  from "single shot" to "weekly", followed by the "Right" key (reported by
  Andreas Böttger).
- The file 'ca.conf' is obsolete and has been removed.
- Revised all descriptions regarding CICAM.
- Adapted c(Dvb)Device::ProvidesCa() to the dynamic CA handling.
- Added a mutex to synchronize cDevice::PlayPesPacket() and SetCurrentAudioTrack()
  (thanks to Reinhard Nissl).
- Added a SleepMs() in cRecorder::Action() to avoid a busy loop (thanks to Ingo
  Schneider).
- Cleaned up some trailing white space.
---
 CONTRIBUTORS                      |  80 ++++-
 HISTORY                           | 186 +++++++++-
 INSTALL                           |  13 +
 MANUAL                            |  47 ++-
 Makefile                          |  11 +-
 PLUGINS.html                      |  43 ++-
 PLUGINS/src/sky/channels.conf.sky |   2 +-
 PLUGINS/src/sky/getskyepg.pl      |   4 +-
 PLUGINS/src/status/HISTORY        |   4 +
 PLUGINS/src/status/status.c       |  16 +-
 ca.conf                           |  17 -
 channels.c                        |   4 +-
 channels.conf                     |  37 +-
 channels.h                        |  10 +-
 ci.c                              |  15 +-
 ci.h                              |  31 +-
 config.c                          |  38 +-
 config.h                          |  27 +-
 device.c                          |  71 +++-
 device.h                          |  39 +-
 diseqc.c                          |   6 +-
 dvbdevice.c                       | 264 +++++++-------
 dvbdevice.h                       |   4 +-
 dvbosd.c                          |   6 +-
 dvbplayer.c                       |   4 +-
 dvbspu.c                          |   9 +-
 dvbspu.h                          |   4 +-
 eit.c                             |   8 +-
 eitscan.c                         |   4 +-
 epg.c                             |  58 ++-
 epg.h                             |   4 +-
 genfontfile.c                     |   4 +-
 i18n.c                            | 568 +++++++++++++++++-------------
 interface.c                       |   6 +-
 keymacros.conf                    |   1 +
 keys.c                            |   3 +-
 keys.h                            |   3 +-
 menu.c                            | 460 ++++++++++++++++--------
 menu.h                            |  17 +-
 menuitems.c                       |  65 +++-
 menuitems.h                       |  13 +-
 osd.c                             |   4 +-
 osd.h                             |   3 +-
 osdbase.c                         |  21 +-
 osdbase.h                         |   5 +-
 player.c                          |  12 +-
 player.h                          |   4 +-
 plugin.c                          |   4 +-
 rcu.c                             |  92 ++---
 rcu.h                             |  18 +-
 recorder.c                        |   6 +-
 recording.c                       | 122 +++++--
 recording.h                       |   7 +-
 remote.c                          |  99 ++++--
 remote.h                          |   4 +-
 remux.c                           | 105 ++++--
 ringbuffer.c                      |  10 +-
 ringbuffer.h                      |   4 +-
 runvdr                            |   8 +-
 skinclassic.c                     |   9 +-
 skins.c                           |   4 +-
 skins.h                           |   4 +-
 skinsttng.c                       |   9 +-
 status.c                          |  10 +-
 status.h                          |  24 +-
 svdrp.c                           | 126 ++++++-
 svdrp.h                           |   4 +-
 thread.c                          |  36 +-
 thread.h                          |  10 +-
 timers.c                          |  32 +-
 timers.h                          |  20 +-
 tools.c                           | 202 ++++++++++-
 tools.h                           |  38 +-
 vdr.1                             |  22 +-
 vdr.5                             |  37 +-
 vdr.c                             | 214 +++++++----
 videodir.c                        |   8 +-
 77 files changed, 2408 insertions(+), 1135 deletions(-)
 delete mode 100644 ca.conf

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c4173a034..d524a3031 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -16,6 +16,8 @@ Carsten Koch <Carsten.Koch@icem.de>
  for fixing converting summary.vdr files that would result in a very long 'short text'
  for his help in testing and debugging reading the list of recordings in a
  separate thread
+ for reporting some unnecessary disk access when checking if there are deleted
+ recordings that need to be removed
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -310,6 +312,7 @@ Andreas Share <a.share@t-online.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
  for pointing out that section filters should only be set if the device actually has
  a lock
+ for reporting a lockup with the RCU on NPTL systems
 
 Simon Bauschulte <SemiSchwabe@Brutzel.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -480,6 +483,8 @@ Oliver Lorei <oliverlorei@cityweb.de>
 Andreas B�ttger <fboettger@t-online.de>
  for reporting a bug in skipping forward in time shift mode near the end of the recording
  for fixing setting system time to avoid time jumps in case of faulty data
+ for reporting a bug in the "Day" field of the "Edit timer" menu when pressing
+ '0' to switch from "single shot" to "weekly", followed by the "Right" key
 
 Onno Kreuzinger <ok@solutas.net>
  for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
@@ -517,8 +522,9 @@ Christian Rienecker <C.Rienecker@gmx.net>
 Joerg Riechardt <J.Riechardt@gmx.de>
  for filling in some missing teletext PIDs
 
-Holger W�chtler <holger@convergence.de>
+Holger W�chtler <holger@qanu.de>
  for some valuable advice during adapting to the NEWSTRUCT driver
+ for suggesting to use FE_READ_STATUS to read the current frontend status
 
 J�rgen Zimmermann <jnzimmer@informatik.uni-kl.de>
  for adding some missing #includes to files in libdtv for gcc 3.2
@@ -531,6 +537,7 @@ Helmut Auer <vdr@helmutauer.de>
  for implementing a default cRemote::Initialize()
  for suggesting to increase the default value for 'Min. user inactivity' to 300 minutes
  for suggesting to add cChannel::LinkChannels() and cChannel::RefChannel()
+ for suggesting to give a message when an instant recording is started
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -821,6 +828,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  cThread::Start()
  for removing the LOCK_THREAD from the LIRC thread
  for making the Makefile patch friendlier
+ for a patch that was used for implementing setting the user id
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -1007,6 +1015,11 @@ Reinhard Nissl <rnissl@gmx.de>
  for suggesting to always use stream id 0xE0 for the video stream, to avoid problems
  with post processing tools that choke on different ids
  for fixing cDvbPlayer::SkipFrames() to properly handle radio recordings
+ for improving TS/PES conversion to better handle lost TS packets
+ for suggesting to make the DVB devices retune (and, if applicable, resend the
+ DiSEqC data) if the lock is lost
+ for fixing handling TS packets in cTS2PES
+ for adding a mutex to synchronize cDevice::PlayPesPacket() and SetCurrentAudioTrack()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1252,6 +1265,8 @@ Marco Schl
  for fixing initializing the day index when editing the weekday parameter of a
  repeating timer
  for figuring out some obscure length bytes the the CA PMT Reply data of AlphaCrypt CAMs
+ for fixing handling OSD areas that have invalid sizes
+ for removing unused variables in skinclassic.c and skinsttng.c
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1307,6 +1322,7 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a bug in opening recording folders in case the last replayed recording
  no longer exists
  for reporting a missing check against MAXOSDAREAS in cOsd::CanHandleAreas()
+ for making the Makefile report a summary of failed plugins
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1318,6 +1334,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
  for updating the Romanian language texts and the iso8859-2 fonts
  for making VDR actually use the iso8859-15 fonts
  for suggesting to make the function ExchangeChars()
+ for reporting duplicate texts in i18n.c
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -1346,6 +1363,8 @@ Andreas Brugger <brougs78@gmx.net>
  for reporting the missing Euro sign in iso8859-1
  for reporting a problem with making changes to timers through SVDRP while they
  are being edited via the menu
+ for suggesting to change the API of the functions cStatus::Recording() and
+ cStatus::Replaying(), so that they can provide the full file name of the recording
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
@@ -1364,6 +1383,9 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
  for a patch that was used to add the command line options '--lirc', '--rcu' and
  '--no-kbd'
  for adding '__attribute__' to functions that use printf() like parameters
+ for suggesting to write grabbed images to the SVDRP connection encoded in base64
+ for suggesting to open the file handle in the SVDRP GRAB command in a way that
+ it won't follow symbolic links, and to canonicalize the file name
 
 Sean Carlos <seanc@libero.it>
  for translating OSD texts to the Italian language
@@ -1416,6 +1438,7 @@ Chris Warren <dvb@ixalon.net>
 Luca Olivetti <luca@ventoso.org>
  for making cDevice::AttachPlayer() keep the track language codes and descriptions
  in Transfer Mode
+ for suggesting to make the "Menu" key behave consistently
 
 Mikko Salo <mikko.salo@ppe.inet.fi>
  for suggesting to make the setup option "DVB/Video display format" available only
@@ -1432,6 +1455,10 @@ Ville Skytt
  for making LIRC command parsing more robust
  for fixing some typos in MANUAL
  for reporting that the default value for "Setup/EPG bugfix level" was wrong
+ for fixing initializing pthread_mutexattr_t and pthread_rwlockattr_t to avoid
+ warnings with g++ 4.1.0
+ for reporting warnings with g++ 4.1.0 regarding incrementing the 'state' variables
+ in the repacker classes in remux.c
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1453,6 +1480,8 @@ Michael Reinelt <reinelt@eunet.at>
 Johannes Stezenbach <js@linuxtv.org>
  for pointing out that the byte swap for big endian systems in cDvbOsd::Flush()
  is wrong
+ for suggesting to use gettid() syscall to get a thread's pid, so that we get a
+ useful value on NPTL systems
 
 Paavo Hartikainen <pahartik@sci.fi>
  for verifying that the byte swap for big endian systems in cDvbOsd::Flush() was
@@ -1538,6 +1567,10 @@ Nicolas Huillard <nhuillard@e-dition.fr>
 
 Patrick Fischer <patrick_fischer@gmx.de>
  for reporting an error in the cFilter example in PLUGINS.html
+ for making the static cControl functions thread safe
+ for suggesting that the cTimer constructor should take an optional cChannel
+ for suggesting that any cReceivers still attached to a cDevice when that device
+ switches to a different transponder shall be automatically detached
 
 Ralf M�ller <ralf@bj-ig.de>
  for a patch that was used to implement cUnbufferedFile
@@ -1547,3 +1580,48 @@ Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
 
 Holger Brunn <holger.brunn@stud.uni-karlsruhe.de>
  for adding a copy constructor to cString and fixing its assignment operator
+
+Christian Vogt <c.v@nexgo.de>
+ for suggesting to take deleted recordings into account when displaying the
+ amount of free disk space
+
+Christof Steininger <christof.steininger@t-online.de>
+ for fixing a possible crash when displaying the "Low disk space!" message from
+ a background thread
+
+Kendy Kutzner <kutzner@ira.uka.de>
+ for making the version number of EPG events be stored in the epg.data file
+ for suggesting to add cTimer::SetPriority() to set a timer's priority
+
+Bob Withers <bwit@pobox.com>
+ for publishing a Base64 encoder at http://www.ruffboy.com/download.htm
+ (http://www.ruffboy.com/code/Base64.zip), part of which was used when writing
+ the cBase64Encoder class
+
+Javier Fern�ndez-Sanguino Pe�a <jfs@computer.org>
+ for reporting a security hole in the way the SVDRP command GRAB writes the
+ image file
+
+J�rgen Schneider <ivory7@gmx.de>
+ for a patch that was used as a base to fix handling multi byte key sequences
+ in cKbdRemote
+
+Christian Wieninger <cwieninger@gmx.de>
+ for suggesting to add cMenuEditStrItem::InEditMode()
+
+Thiemo Gehrke <tgehrke@reel-multimedia.com>
+ for suggesting to add a setup option to turn off the automatic timeout of the
+ channel display in case it was invoked by a press of the "Ok" key
+
+Gavin Hamill <gdh@acentral.co.uk>
+ for reporting a missing #include "thread.h" in dvbspu.c
+
+Petri Hintukainen <Petri.Hintukainen@hut.fi>
+ for suggesting to disable the use of "fadvise" in cUnbufferedFile because there
+ have been several reports that it causes more problems than it solves
+
+Marcel Schaeben <mts280@gmx.de>
+ for his "Easy Input" patch
+
+Ingo Schneider <mail@ingo-schneider.de>
+ for adding a SleepMs() in cRecorder::Action() to avoid a busy loop
diff --git a/HISTORY b/HISTORY
index 24b23c97d..49201ddce 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1491,9 +1491,9 @@ Video Disk Recorder Revision History
   --- Makefile    2002/06/10 16:24:06     1.4
   +++ Makefile    2002/09/17 15:36:36     1.5
   @@ -15,7 +15,12 @@
- 
+
    ### The directory environment:
- 
+
   +ifdef NEWSTRUCT
   +DVBDIR = ../../../../DVB/include
   +DEFINES += -DNEWSTRUCT
@@ -1504,12 +1504,12 @@ Video Disk Recorder Revision History
    VDRINC = $(VDRDIR)/include
    LIBDIR = ../../lib
   @@ -34,7 +39,7 @@
- 
+
    INCLUDES = -I$(VDRINC) -I$(DVBDIR)
- 
+
   -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
   +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
+
    ### The object files (add further files here):
   -------------------------------------------------------
 
@@ -2705,7 +2705,7 @@ Video Disk Recorder Revision History
 - Timers can now be set to use the VPS information to control recording a programme.
   The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
   the "VPS" option in the individual timers, can be used to control this feature
-  (see MANUAL for details). 
+  (see MANUAL for details).
   Note that this feature will certainly need a lot of testing before it can be
   called "safe"!
 - The "Schedule" and "What's on now/next?" menus now have an additional column
@@ -3270,7 +3270,7 @@ Video Disk Recorder Revision History
   botton left side.
 - The new setup option "DVB/Audio languages" can be used to control which audio
   language shall be selected in case a channel broadcasts in different languages
-  (see MANUAL for details). 
+  (see MANUAL for details).
 - The "Left" and "Right" keys in the "Audio" menu can be used to switch between
   the left and right stereo channels in case there are different audio tracks
   in these channels (see MANUAL for details).
@@ -3962,3 +3962,175 @@ Video Disk Recorder Revision History
 - The SVDRP command MESG uses the new message queueing facility, so MESG
   commands may now be executed at any time, and the message will be displayed
   (no more "pending message").
+
+2006-01-08: Version 1.3.38
+
+- Fixed handling second audio and Dolby Digital PIDs for encrypted channels
+  (was broken in version 1.3.37).
+- Improved TS/PES conversion to better handle lost TS packets (thanks to
+  Reinhard Nissl).
+- Limited the frequency of log messages from the cRepackers.
+- Now using the gettid() syscall to get a thread's pid, so that we get a
+  useful value on NPTL systems (suggested by Johannes Stezenbach).
+- Fixed the RCU remote control handling to avoid problems with NPTL (thanks
+  to Andreas Share for reporting a lockup with the RCU on NPTL systems).
+- When displaying the amount of free disk space, the space consumed by
+  recordings that have been "deleted" but not yet actually "removed" is now
+  taken into account (suggested by Christian Vogt).
+- Now avoiding unnecessary disk access when checking if there are deleted
+  recordings that need to be removed (reported by Carsten Koch).
+- Fixed handling the DELETEDLIFETIME when removing deleted recordings. Now
+  a deleted recording is retained at least DELETEDLIFETIME seconds before
+  actually removing it.
+  The value of DELETEDLIFETIME has been changed to 300. So after (possibly
+  inadvertently) deleting a recording, there will be at least 5 minutes
+  in which it can be recovered (unless a new recording immediately requires
+  the disk space). The count starts again at 0 every time VDR is started.
+- Fixed a possible crash when displaying the "Low disk space!" message from
+  a background thread (thanks to Christof Steininger).
+- Fixed handling OSD areas that have invalid sizes (thanks to Marco Schl��ler).
+- Added a mutex to AssertFreeDiskSpace() to make sure calls from foreground
+  and background threads won't interfere.
+- The main menu now dynamically updates its contents in case an instant
+  recording or replay stops, etc.
+- The version number of EPG events is now also stored in the epg.data file
+  (thanks to Kendy Kutzner).
+- EPG events that are no longer in the currently broadcasted data stream are
+  now automatically deleted.
+- Removed an invalid access to Event->schedule in cSchedule::DelEvent().
+- Modified cSchedule::Cleanup() (events are always sorted by time).
+- Schedules are now cleaned up once every hour (not only at 05:00).
+- The "Schedule" and "What's on now/next?" menus are now updated if a timer
+  is set or modified.
+- cTimer no longer has its own 'schedule' member, it rather uses that of the
+  event it has been set to.
+- The "Red" button in the "Schedule", "What's on now/next?" and "Event" menus
+  now immediately creates a timer for the selected event and marks it with 'T'.
+  If the event is already marked with 'T', the "Red" button opens the "Edit
+  timer" menu for that timer.
+- Removing deleted recordings is now done in a separate thread.
+- Dropped the unused "stop recording on primary interface" stuff.
+- Converting a grabbed image to JPEG is now done with the new function
+  RgbToJpeg() (see tools.h).
+- The SVDRP command GRAB now determines the image type (JPEG or PNM) from the
+  extension (".jpg", ".jpeg" or ".pnm") of the given file name. The explicit
+  'jpeg' or 'pnm' parameter is still accepted for backward compatibility, but
+  has no meaning any more.
+- The function cDevice::GrabImage() no longer writes the grabbed image to a
+  file, but rather returns a pointer to the image in memory. The wrapper
+  function cDevice::GrabImageFile() can be used to write the grabbed image
+  directly to a file. Plugins that used the old version of cDevice::GrabImage()
+  need to be adapted to the new interface.
+- The new class cBase64Encoder (see tools.h) can be used to encode data in
+  base64 (thanks to Bob Withers for publishing his Base64 class).
+- The SVDRP command GRAB now writes the image data to the SVDRP connection
+  (encoded in base64) if the given file name consists of only the file
+  extension (".jpg", ".jpeg" or ".pnm"), or if only "-" is given as file
+  name (based on a suggestion from Darren Salt).
+  A simple way of viewing a grabbed image on a remote host is:
+
+  svdrpsend.pl -d <hostname> 'grab -' | sed -n -e 's/^216-//p' -e '1ibegin-base64 644 -' -e '$a====' | uudecode | display
+
+- The new command line option '-g' must be given if the SVDRP command GRAB
+  shall be allowed to write image files to disk. The parameter to this option
+  must be the full path name of an existing directory, without any "..", double
+  '/' or symlinks. By default, or if "-g- is given, grabbing to files is
+  not allowed any more because of potential security risks.
+- Modified the way the SVDRP command GRAB writes the grabbed image to a file
+  to avoid a security hole (CAN-2005-0071, reported by Javier Fern�ndez-Sanguino
+  Pe�a):
+  + The file handle is now opened in a way that it won't follow symbolic links
+    (suggested by Darren Salt).
+  + The given file name is now canonicalized, so that it won't contain any
+    ".." or symlinks (suggested by Darren Salt).
+  + Grabbing to files is limited to the directory given in the the command
+    line option '-g'. By default grabbing to files is not allowed any more.
+- Updated the Greek OSD texts (thanks to Dimitrios Dimitrakos).
+- Changed all "illegal" to "invalid" in error messages (there's nothing "illegal"
+  in VDR ;-).
+- When started as user 'root' VDR now switches to a lesser privileged user id,
+  keeping the capability to set the system time (based on a patch from Ludwig
+  Nussel). By default the user id 'vdr' is used, which can be changed through
+  the new command line option '-u'. Note that for security reasons VDR will no
+  longer run as user 'root' (unless you explicitly start it with '-u root',
+  but this is not recommended!). The 'runvdr' script has been changed to
+  use the '-u' option.
+- Changed the API of the functions cStatus::Recording() and cStatus::Replaying(),
+  so that they can provide the full file name of the recording. Plugins that use
+  these (or the related cStatus::Msg...() functions) need to be adapted
+  (suggested by Andreas Brugger).
+- The DVB devices now retune (and, if applicable, resend the DiSEqC data) if
+  the lock is lost (based on a patch from Reinhard Nissl).
+- Fixed handling multi byte key sequences in cKbdRemote (based on a patch from
+  J�rgen Schneider).
+- Removed unused variables in skinclassic.c and skinsttng.c (thanks to Marco
+  Schl��ler).
+- Made the static cControl functions thread safe (thanks to Patrick Fischer).
+- Fixed initializing pthread_mutexattr_t and pthread_rwlockattr_t to avoid
+  warnings with g++ 4.1.0 (thanks to Ville Skytt�).
+- Fixed incrementing the 'state' variables in the repacker classes in remux.c
+  to avoid warnings with g++ 4.1.0 (reported by Ville Skytt�).
+- The Makefile now reports a summary of failed plugins (thanks to Udo Richter).
+- The cTimer constructor can now take an optional cChannel (suggested by
+  Patrick Fischer).
+- Fixed setting the main thread id if VDR is running as a daemon.
+- Fixed handling TS packets in cTS2PES (thanks to Reinhard Nissl).
+- Added cTimer::SetPriority() to set a timer's priority (suggested by Kendy Kutzner).
+- Added cMenuEditStrItem::InEditMode() (suggested by Christian Wieninger).
+- Now using FE_READ_STATUS to read the current frontend status (suggested by
+  Holger W�chtler).
+- The "Menu" key now behaves consistently. If there is anything on the OSD, it
+  is closed when the "Menu" key is pressed, and if there is nothing on the OSD,
+  the "Menu" key opens the main menu (suggested by Luca Olivetti).
+- The new option "Setup/OSD/Timeout requested channel info" can be used to turn
+  off the automatic timeout of the channel display in case it was invoked by
+  a press of the "Ok" key (suggested by Thiemo Gehrke).
+- A message is now given when an instant recording is started (suggested by
+  Helmut Auer). Actually the code was already there, just commented out - don't
+  remember why it wasn't active...
+- Removed an obsolete "Summary" text from i18n.c and preceded all key definition
+  texts with "Key$" to avoid duplicates (reported by Lucian Muresan).
+- Preceded all button texts with "Button$".
+- Removed obsolete "Eject", "Language" and "scanning recordings..." texts.
+- Added missing #include "thread.h" to dvbspu.c (reported by Gavin Hamill).
+- Disabled the use of "fadvise" in cUnbufferedFile because there have been
+  several reports that it causes more problems than it solves (suggested by
+  Petri Hintukainen). If you want to use "fadvise", you can activate the line
+  //#define USE_FADVISE
+  in tools.c.
+- Removed unused 'offset' member from cOsdItem.
+- In the "Channels" menu the numeric keys now position the cursor to the channel
+  with the given number (see MANUAL, section "Remote Control Keys", note (3) for
+  details).
+- The "Mark/Move" function in the "Channels" menu now also works in the non-numeric
+  sort modes.
+- The default cOsdObject::Show() now automatically calls cOsdMenu::Display() if
+  this is a menu.
+- The new "Info" key brings up information on the currently viewed programme
+  or recording. For a live programme this is the same as "Schedule/Ok", i.e. the
+  description of the current EPG event. For a recording this is the same as shown
+  by the "Info" button in the "Recordings" menu. Plugins that implement players
+  can overwrite their cControl::GetInfo() function to show their own info (see
+  PLUGINS.html for details). Pressing the "Info" key again while the info is
+  displayed will close the OSD. In order to assign this new key to an existing
+  remote control setup, the remote.conf file needs to be deleted and VDR has
+  to be restarted to go through the process of learning the remote control keys.
+- Any cReceivers still attached to a cDevice when that device switches to a
+  different transponder are now automatically detached (suggested by Patrick
+  Fischer).
+- The "flags" of a timer are now handled as an unsigned integer value. In order
+  to do this, the interface of cMenuEditBitItem also had to be changed.
+- In string entry fields (like, e.g., the file name of a recording) the characters
+  can now be entered by pressing the numeric keys, the same way as on a
+  telephone keypad (based on the "Easy Input" patch from Marcel Schaeben).
+- Fixed the "Day" field of the "Edit timer" menu when pressing '0' to switch
+  from "single shot" to "weekly", followed by the "Right" key (reported by
+  Andreas B�ttger).
+- The file 'ca.conf' is obsolete and has been removed.
+- Revised all descriptions regarding CICAM.
+- Adapted c(Dvb)Device::ProvidesCa() to the dynamic CA handling.
+- Added a mutex to synchronize cDevice::PlayPesPacket() and SetCurrentAudioTrack()
+  (thanks to Reinhard Nissl).
+- Added a SleepMs() in cRecorder::Action() to avoid a busy loop (thanks to Ingo
+  Schneider).
+- Cleaned up some trailing white space.
diff --git a/INSTALL b/INSTALL
index 540b45f2d..8290c259a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -132,6 +132,19 @@ call to the VDR program, be sure to NOT use the '-d' option! Otherwise
 VDR will go into 'deamon' mode and the initial program call will return
 immediately!
 
+Setting the system time:
+------------------------
+
+If you want VDR to set the system time according to the data received
+from the transponder, you need to start VDR as user 'root'. VDR will
+then only keep the capability to set the system time, and set its
+user id to a lesser privileged one ('vdr' by default, can be set
+to a different value with the '-u' option).
+You also need to enable the "EPG/Set system time" option in VDR's
+Setup menu, and select a transponder from which you want to receive
+the time in "Use time from transponder". Make sure you select a transponder
+that has a reliable clock - some transponders are quite off.
+
 Automatic shutdown:
 -------------------
 
diff --git a/MANUAL b/MANUAL
index 3d53d4f79..6028b75eb 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,7 +1,7 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
-Version 1.2
+Version 1.3
 -----------
 
 * Remote Control Keys
@@ -18,7 +18,7 @@ Version 1.2
   Left    Prev group  -            Page up    Page up    Decrement     Page up           Search back      Sel. channel
   Right   Next group  -            Page down  Page down  Increment     Page down         Search forward   Sel. channel
   Ok      Ch display  Select       Switch     Edit       Accept        Play              Progress disp.   Switch & Close
-  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu on          Menu on
+  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu off         Menu off
   Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu  Close
   Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump             -
   Green   -           Audio        New        New        Ins/Ovr       Rewind            Skip -60s        -
@@ -30,9 +30,14 @@ Version 1.2
   are used to enter the data, and the Left key can be used to delete the last
   entered digit.
 
+  In a text input field (like, e.g., the file name of a recording) the characters
+  can be entered by pressing the numeric keys, the same way as on a telephone
+  keypad.
+
   If your remote control provides additional keys, they can be used for the
   following functions:
 
+  Info        display information on the currently viewed programme or recording
   Play        resume normal replay
   Pause       pause replay or live video
   Stop        stop replay
@@ -74,7 +79,12 @@ Version 1.2
       to "mark" a timer for moving.
   (2) See "Processing Recordings" below.
   (3) In the "Channels" menu the '0' key switches the sort mode through "by number",
-      "by name" and "by provider".
+      "by name" and "by provider". Other numeric input positions the cursor to
+      the channel with the number entered so far. If there is no channel with that
+      number, nothing happens. While entering a channel number, the '0' key will
+      be treated as part of that number, not as a sort mode toggle. If no numeric
+      key has been pressed for more than one second, the number is reset and '0'
+      functions as sort mode toggle again.
   (4) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
       a single shot and a repeating timer. If "Day" indicates a repeating timer,
       the keys '1'...'7' can be used to toggle the individual days ('1' is Monday).
@@ -141,14 +151,17 @@ Version 1.2
   "Schedule" menu of the current channel in the list.
 
   The "Red" button allows you to instantly program a timer to record the
-  selected programme. You will get into the "Edit Timer" menu in which
-  everything has already been filled in, and you can make any modifications
+  selected programme. After pressing this button, the current event will
+  be marked with 'T', and the function of the "Red" button will change from
+  "Record" to "Timer". Pressing "Red" on an event marked with 'T' will open
+  the "Edit timer" menu for this timer, where you can make any modifications
   you may want to apply. Note that the Start and Stop time are offset by the
   MarginStart and MarginStop parameters (see Setup) in order to make sure the
   entire programme is recorded in case it doesn't exactly adhere to its
   published start/stop times. Of course, no guarantee can be given that the
   default margin values will be sufficient, so in case this recording is
-  really important you may want to add an extra margin ;-)
+  really important you may want to add an extra margin ;-). VPS recordings
+  will use the exact Start (or VPS) and Stop times as given in the event.
 
   The "Blue" button can be pressed to switch to the channel with the selected
   programme.
@@ -373,7 +386,7 @@ Version 1.2
 * Programming the Timer
 
   Use the "Timer" menu to maintain your list of timer controlled recordings.
-  The parameters in the "Edit Timer" menu have the following meanings:
+  The parameters in the "Edit timer" menu have the following meanings:
 
   Active:    Defines whether the timer will be processed (set it to 'no' to
              temporarily disable a timer).
@@ -493,6 +506,10 @@ Version 1.2
                          always displayed when pressing the "Ok" button in
                          normal viewing mode.
 
+  Timeout requested channel info = yes
+                         Turns the automatic timeout of the channel display (when
+                         invoked by a press of the "Ok" key) on or off.
+
   Scroll pages = yes     no  = when pressing the "Down" ("Up") key while the cursor
                                is on the last (first) line of a list page, the
                                list is scrolled down (up) a single line and the cursor will
@@ -639,17 +656,11 @@ Version 1.2
 
   CICAM:
 
-  CICAM DVBn m           Defines the "Conditional Access" capabilities of the DVB
-                         card 'n'. Each DVB card can provide up to two CICAM
-                         methods ('m' = [1, 2]).
-
-                         In the 'setup.conf' file the value consists of the card
-                         number, followed by a list of decryption method values
-                         (defined in 'ca.conf').
-                         For instance
-                           CaCaps = 3 101 102
-                         would define that card number 3 is able to decrypt
-                         "Premiere World" and the "ORF".
+  CICAM DVBn m           Shows the CAMs that each device contains, where 'n' is
+                         the number of the device, and 'm' is the number of the
+                         Common Interface slot of that device. The "Red" key
+                         can be pressed to enter the CAM menu, and the "Green" key
+                         triggers a reset of the selected CAM.
 
   Recording:
 
diff --git a/Makefile b/Makefile
index b268a788d..8df6d7f12 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.79 2005/09/02 14:23:38 kls Exp $
+# $Id: Makefile 1.81 2006/01/01 15:12:05 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -27,7 +27,7 @@ endif
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
-LIBS     = -ljpeg -lpthread -ldl
+LIBS     = -ljpeg -lpthread -ldl -lcap
 INCLUDES =
 
 PLUGINDIR= ./PLUGINS
@@ -183,7 +183,12 @@ include-dir:
 # Plugins:
 
 plugins: include-dir
-	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" all; done
+	@failed="";\
+	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
+	    echo "Plugin $$i:";\
+	    $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\
+	    done;\
+	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; fi
 
 plugins-clean:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
diff --git a/PLUGINS.html b/PLUGINS.html
index bdaf1efb0..bec512787 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -9,23 +9,23 @@
 <center><b>Version 1.3</b></center>
 <p>
 <center>
-Copyright &copy; 2005 Klaus Schmidinger<br>
+Copyright &copy; 2006 Klaus Schmidinger<br>
 <a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.21 are marked like this.
-<!--X1.3.21--></td></tr></table>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.30 are marked like this.
 <!--X1.3.30--></td></tr></table>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.31 are marked like this.
 <!--X1.3.31--></td></tr></table>
-<!--X1.3.37--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.37--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.37 are marked like this.
 <!--X1.3.37--></td></tr></table>
+<!--X1.3.38--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.38 are marked like this.
+<!--X1.3.38--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -66,10 +66,10 @@ <h1>Table Of Contents</h1>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
 <li><a href="#Internationalization">Internationalization</a>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Custom services">Custom services</a>
 <!--X1.3.30--></td></tr></table>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#SVDRP commands">SVDRP commands</a>
 <!--X1.3.31--></td></tr></table>
 <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
@@ -85,9 +85,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Audio">Audio</a>
-<!--X1.3.21--></td></tr></table>
 <li><a href="#Remote Control">Remote Control</a>
 </ul>
 </ul>
@@ -520,7 +518,7 @@ <h1>Table Of Contents</h1>
 
 in which it shall stop them.
 <p>
-The <tt>Stop()</tt> function will only be called if a previous call to the 
+The <tt>Stop()</tt> function will only be called if a previous call to the
 <a href="#Getting started"><tt>Start()</tt></a> function of that plugin has
 returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
 as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
@@ -866,7 +864,7 @@ <h1>Table Of Contents</h1>
 and then in the global VDR texts. So a plugin can make use of texts defined by the
 core VDR code.
 
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.30--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Custom services"><hr><h2>Custom services</h2>
 
 <center><i><b>What can I do for you?</b></i></center><p>
@@ -937,7 +935,7 @@ <h1>Table Of Contents</h1>
 
 <!--X1.3.30--></td></tr></table>
 
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
 
 <center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
@@ -1264,6 +1262,9 @@ <h1>Table Of Contents</h1>
   cMyControl(void);
   virtual ~cMyControl();
   virtual void Hide(void);
+<!--X1.3.38--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+  virtual cOsdObject *GetInfo(void);
+<!--X1.3.38--></td></tr></table>
   virtual eOSState ProcessKey(eKeys Key);
   };
 </pre></td></tr></table><p>
@@ -1292,8 +1293,14 @@ <h1>Table Of Contents</h1>
 A derived <tt>cControl</tt> <b>must</b> implement the <tt>Hide()</tt> function, in which
 it has to hide itself from the OSD, in case it uses it. <tt>Hide()</tt> may be called at
 any time, and it may be called even if the <tt>cControl</tt> is not visible at the moment.
-The reason for this is that the <tt>Menu</tt> button shall always bring up the main VDR
-menu, so any active <tt>cControl</tt> needs to be hidden when that button is pressed.
+<p>
+<!--X1.3.38--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+The <tt>GetInfo()</tt> function is called when the user presses the <tt>Info</tt> button,
+and shall return a pointer to a <tt>cOsdObject</tt> that contains information
+about the currently played programme. The caller takes ownership of the returned
+pointer and will delete it when it is no longer used. If no information is available,
+<tt>NULL</tt> shall be returned.
+<!--X1.3.38--></td></tr></table>
 <p>
 Finally, to get things going, a plugin that implements a player (and the surrounding
 infrastructure like displaying a list of playable stuff etc) simply has to call the
@@ -1515,7 +1522,7 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 
-<!--X1.3.37--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.37--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <p>
 Directly accessing the OSD is only allowed from the foreground thread, which
 restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
@@ -1840,9 +1847,7 @@ <h1>Table Of Contents</h1>
   virtual void Action(void);
 public:
   cMyAudio(void);
-<!--X1.3.21--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
   virtual void Play(const uchar *Data, int Length, uchar Id);
-<!--X1.3.21--></td></tr></table>
   virtual void Mute(bool On);
   virtual void Clear(void);
   };
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
index 52d1a8731..5f0b77360 100644
--- a/PLUGINS/src/sky/channels.conf.sky
+++ b/PLUGINS/src/sky/channels.conf.sky
@@ -17,7 +17,7 @@
 #         page exists, 'x' is entered.
 #
 S28.2E-2-2027-4705:106:sky_one
-S28.2E-2-2027-5104:107:sky_one_mix
+S28.2E-2-2027-5104:107:sky_two
 S28.2E-2-2044-10070:118:itv2
 S28.2E-2-2023-4905:130:scifi
 S28.2E-2-2025-5904:127:paramount
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index 77768ade7..26dbc0a02 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 1.3 2004/02/15 13:35:52 kls Exp $
+# $Id: getskyepg.pl 1.4 2006/01/08 10:21:32 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
@@ -151,7 +151,7 @@ sub GetEpgData
              $gmt[1] = $m; # minutes
              $gmt[2] = $h; # hours
              $time = timegm(@gmt) + ($day - 1) * $SecsInDay + ($h < 12 ? $dt : 0);
-             # comensate for DST:
+             # compensate for DST:
              $time += $DST if (localtime($time))[8];
              # create EPG data:
              if ($Time) {
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 1c399aaba..998e23dfc 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -31,3 +31,7 @@ VDR Plugin 'status' Revision History
 2002-12-13: Version 0.1.0
 
 - Changed setting of CXX and CXXFLAGS variables in Makefile.
+
+2005-12-31: Version 0.2.0
+
+- API change in cStatus.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index a0346591b..71639279c 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.7 2002/12/13 15:01:53 kls Exp $
+ * $Id: status.c 1.8 2005/12/31 15:19:45 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.2.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -18,8 +18,8 @@ static const char *MAINMENUENTRY  = NULL;
 class cStatusTest : public cStatus {
 protected:
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-  virtual void Recording(const cDevice *Device, const char *Name);
-  virtual void Replaying(const cControl *Control, const char *Name);
+  virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
+  virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
   virtual void SetVolume(int Volume, bool Absolute);
   virtual void OsdClear(void);
   virtual void OsdTitle(const char *Title);
@@ -36,14 +36,14 @@ void cStatusTest::ChannelSwitch(const cDevice *Device, int ChannelNumber)
   dsyslog("status: cStatusTest::ChannelSwitch  %d %d", Device->CardIndex(), ChannelNumber);
 }
 
-void cStatusTest::Recording(const cDevice *Device, const char *Name)
+void cStatusTest::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
 {
-  dsyslog("status: cStatusTest::Recording  %d %s", Device->CardIndex(), Name);
+  dsyslog("status: cStatusTest::Recording  %d %s %s %d", Device->CardIndex(), Name, FileName, On);
 }
 
-void cStatusTest::Replaying(const cControl *Control, const char *Name)
+void cStatusTest::Replaying(const cControl *Control, const char *Name, const char *FileName, bool On)
 {
-  dsyslog("status: cStatusTest::Replaying  %s", Name);
+  dsyslog("status: cStatusTest::Replaying  %s %s %d", Name, FileName, On);
 }
 
 void cStatusTest::SetVolume(int Volume, bool Absolute)
diff --git a/ca.conf b/ca.conf
deleted file mode 100644
index e4bab6681..000000000
--- a/ca.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Conditional Access configuration for VDR
-#
-# Format:
-#
-# number  description
-#
-# Please contact kls@cadsoft.de before assigning a new number
-# to a description, in order to keep them unique.
-
-0      Free To Air
-
-# Special values to "hard code" a channel to a specific DVB card:
-
-1      DVB 1
-2      DVB 2
-3      DVB 3
-4      DVB 4
diff --git a/channels.c b/channels.c
index 939c29fef..a4f844912 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.46 2005/09/11 14:22:24 kls Exp $
+ * $Id: channels.c 1.47 2005/12/30 15:41:24 kls Exp $
  */
 
 #include "channels.h"
@@ -586,7 +586,7 @@ static const char *ParseParameter(const char *s, int &Value, const tChannelParam
            return p;
         }
      }
-  esyslog("ERROR: illegal value for parameter '%c'", *(s - 1));
+  esyslog("ERROR: invalid value for parameter '%c'", *(s - 1));
   return NULL;
 }
 
diff --git a/channels.conf b/channels.conf
index e54bfcb24..e4f0fa44c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -2,18 +2,18 @@ RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
 ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
-Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu:104:0:28106:1:1101:0
+Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu;106=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Ferns.;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;703:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320:0:0:28008:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
 ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
 ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
@@ -28,14 +28,14 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
-Eurosport;ZDFvision:11953:hC34:S19.2E:27500:410:420=deu:430:0:28009:1:1079:0
+Eurosport;SES Astra:12226:hC34:S19.2E:27500:101+8190:103=deu:102:0:31200:1:1091:0
 EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
 EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
 EinsPlus;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
@@ -44,11 +44,11 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1722,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1801,1722:11:133:2:0
+PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1702:8:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1801,1722,1702:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
@@ -57,10 +57,10 @@ DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,170
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1722,1702,1801:21:133:17:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1810,1801,1702,1722:513:133:4:0
+EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
 :Sportsworld
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1702,1722,1801:17:133:3:0
-PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:32:0:27:133:4:0
+PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1722,1801,1702:17:133:3:0
+PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
@@ -92,9 +92,9 @@ Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
 ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:0:10070:2:2044:0
 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
-Paramount;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
+ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
 Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
-Paramount 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
+ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,667=NAR;687=eng:583:960,961:4302:2:2007:0
@@ -115,8 +115,11 @@ S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:20
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
-Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:FF:21100:1:1088:0
-Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:FF:29700:0:0:0
+Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
+Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
+SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
+Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
-TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:2:1:65535:1:0
+Challenger Tv;Telespazio:11304:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
+TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:3:1:65535:1:0
 :@1000 New channels
diff --git a/channels.h b/channels.h
index 62cb52e31..b4882522f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.36 2005/09/17 09:59:14 kls Exp $
+ * $Id: channels.h 1.37 2006/01/07 13:00:43 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -39,6 +39,14 @@
 #define MAXLANGCODE1 4 // a 3 letter language code, zero terminated
 #define MAXLANGCODE2 8 // up to two 3 letter language codes, separated by '+' and zero terminated
 
+#define CA_FTA           0x0000
+#define CA_DVB_MIN       0x0001
+#define CA_DVB_MAX       0x000F
+#define CA_USER_MIN      0x0010
+#define CA_USER_MAX      0x00FF
+#define CA_ENCRYPTED_MIN 0x0100
+#define CA_ENCRYPTED_MAX 0xFFFF
+
 struct tChannelParameterMap {
   int userValue;
   int driverValue;
diff --git a/ci.c b/ci.c
index 163ad9704..863be5331 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.40 2005/11/26 13:36:51 kls Exp $
+ * $Id: ci.c 1.42 2006/01/07 15:07:16 kls Exp $
  */
 
 #include "ci.h"
@@ -185,7 +185,7 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t
             size = 6;
             }
          else
-            esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+            esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d", Tag, Length);
          break;
     case T_DATA_LAST:
     case T_DATA_MORE:
@@ -198,7 +198,7 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t
             size = Length + (p - data);
             }
          else
-            esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+            esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d", Tag, Length);
          break;
     default:
          esyslog("ERROR: unknown TPDU tag: 0x%02X", Tag);
@@ -1639,6 +1639,15 @@ int cCiHandler::CloseAllSessions(int Slot)
   return result;
 }
 
+int cCiHandler::NumCams(void)
+{
+  int result = 0;
+  for (int i = 0; i < MAX_CI_SLOT; i++)
+      if (moduleReady[i])
+         result++;
+  return result;
+}
+
 bool cCiHandler::Ready(void)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/ci.h b/ci.h
index f1e289ad4..3817a89b2 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.19 2005/11/26 13:37:42 kls Exp $
+ * $Id: ci.h 1.21 2006/01/07 15:03:05 kls Exp $
  */
 
 #ifndef __CI_H
@@ -112,6 +112,7 @@ class cCiHandler {
   cList<cCiCaProgramData> caProgramList;
   int ResourceIdToInt(const uint8_t *Data);
   bool Send(uint8_t Tag, int SessionId, int ResourceId = 0, int Status = -1);
+  const unsigned short *GetCaSystemIds(int Slot);
   cCiSession *GetSessionBySessionId(int SessionId);
   cCiSession *GetSessionByResourceId(int ResourceId, int Slot);
   cCiSession *CreateSession(int ResourceId);
@@ -123,18 +124,35 @@ class cCiHandler {
 public:
   ~cCiHandler();
   static cCiHandler *CreateCiHandler(const char *FileName);
+       ///< Creates a new cCiHandler for the given CA device.
   int NumSlots(void) { return numSlots; }
+       ///< Returns the number of CAM slots provided by this CA device.
+  int NumCams(void);
+       ///< Returns the number of actual CAMs inserted into this CA device.
   bool Ready(void);
+       ///< Returns true if all CAMs in this CA device are ready.
   bool Process(int Slot = -1);
        ///< Processes the given Slot. If Slot is -1, all slots are processed.
        ///< Returns false in case of an error.
   bool HasUserIO(void) { return hasUserIO; }
+       ///< Returns true if there is a pending user interaction, which shall
+       ///< be retrieved via GetMenu() or GetEnquiry().
   bool EnterMenu(int Slot);
+       ///< Requests the CAM in the given Slot to start its menu.
   cCiMenu *GetMenu(void);
+       ///< Gets a pending menu, or NULL if there is no menu.
   cCiEnquiry *GetEnquiry(void);
+       ///< Gets a pending enquiry, or NULL if there is no enquiry.
   const char *GetCamName(int Slot);
-  const unsigned short *GetCaSystemIds(int Slot);
+       ///< Returns the name of the CAM in the given Slot, or NULL if there
+       ///< is no CAM in that slot.
   bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot???
+       ///< Returns true if any of the CAMs can provide one of the given
+       ///< CaSystemIds. This doesn't necessarily mean that it will be
+       ///< possible to actually decrypt such a programme, since CAMs
+       ///< usually advertise several CA system ids, while the actual
+       ///< decryption is controlled by the smart card inserted into
+       ///< the CAM.
   void SetSource(int Source, int Transponder);
        ///< Sets the Source and Transponder of the device this cCiHandler is
        ///< currently tuned to. If Source or Transponder are different than
@@ -145,11 +163,14 @@ class cCiHandler {
        ///< to SetPid() will (de)activate one of these entries.
   void SetPid(int Pid, bool Active);
        ///< Sets the given Pid (which has previously been added through a
-       ///< call to AddPid()) to Active. If Active is true, a later call to
-       ///< StartDecrypting() will send the full list of currently active CA_PMT
-       ///< entries to the CAM, including this one.
+       ///< call to AddPid()) to Active. A later call to StartDecrypting() will
+       ///< send the full list of currently active CA_PMT entries to the CAM.
   bool CanDecrypt(int ProgramNumber);
        ///< XXX
+       ///< Returns true if there is a CAM in this CA device that is able
+       ///< to decrypt the programme with the given ProgramNumber. The PIDs
+       ///< for this ProgramNumber must have been set through previous calls
+       ///< to SetPid().
   void StartDecrypting(void);
        ///< Triggers sending all currently active CA_PMT entries to the CAM,
        ///< so that it will start decrypting.
diff --git a/config.c b/config.c
index ecd91af28..ec06a3292 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.138 2005/09/09 15:08:59 kls Exp $
+ * $Id: config.c 1.140 2006/01/07 12:28:49 kls Exp $
  */
 
 #include "config.h"
@@ -120,24 +120,6 @@ bool cSVDRPhost::Accepts(in_addr_t Address)
   return (Address & mask) == addr.s_addr;
 }
 
-// -- cCaDefinition ----------------------------------------------------------
-
-cCaDefinition::cCaDefinition(void)
-{
-  number = 0;
-  description = NULL;
-}
-
-cCaDefinition::~cCaDefinition()
-{
-  free(description);
-}
-
-bool cCaDefinition::Parse(const char *s)
-{
-  return 2 == sscanf(s, "%d %a[^\n]", &number, &description) && description && *description;
-}
-
 // -- cCommands --------------------------------------------------------------
 
 cCommands Commands;
@@ -158,21 +140,6 @@ bool cSVDRPhosts::Acceptable(in_addr_t Address)
   return false;
 }
 
-// -- cCaDefinitions ---------------------------------------------------------
-
-cCaDefinitions CaDefinitions;
-
-const cCaDefinition *cCaDefinitions::Get(int Number)
-{
-  cCaDefinition *p = First();
-  while (p) {
-        if (p->Number() == Number)
-           return p;
-        p = (cCaDefinition *)p->Next();
-        }
-  return NULL;
-}
-
 // -- cSetupLine -------------------------------------------------------------
 
 cSetupLine::cSetupLine(void)
@@ -250,6 +217,7 @@ cSetup::cSetup(void)
   strcpy(OSDTheme, "default");
   PrimaryDVB = 1;
   ShowInfoOnChSwitch = 1;
+  TimeoutRequChInfo = 1;
   MenuScrollPage = 1;
   MenuScrollWrap = 0;
   MarkInstantRecord = 1;
@@ -408,6 +376,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "OSDTheme"))            strn0cpy(OSDTheme, Value, MaxThemeName);
   else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
   else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
+  else if (!strcasecmp(Name, "TimeoutRequChInfo"))   TimeoutRequChInfo  = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollWrap"))      MenuScrollWrap     = atoi(Value);
   else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
@@ -473,6 +442,7 @@ bool cSetup::Save(void)
   Store("OSDTheme",           OSDTheme);
   Store("PrimaryDVB",         PrimaryDVB);
   Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch);
+  Store("TimeoutRequChInfo",  TimeoutRequChInfo);
   Store("MenuScrollPage",     MenuScrollPage);
   Store("MenuScrollWrap",     MenuScrollWrap);
   Store("MarkInstantRecord",  MarkInstantRecord);
diff --git a/config.h b/config.h
index 733b959ae..73c3d7d61 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.235 2005/11/11 13:22:02 kls Exp $
+ * $Id: config.h 1.238 2006/01/07 12:57:42 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.37"
-#define VDRVERSNUM   10337  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.38"
+#define VDRVERSNUM   10338  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -61,20 +61,6 @@ class cSVDRPhost : public cListObject {
   bool Accepts(in_addr_t Address);
   };
 
-#define CACONFBASE 100
-
-class cCaDefinition : public cListObject {
-private:
-  int number;
-  char *description;
-public:
-  cCaDefinition(void);
-  ~cCaDefinition();
-  bool Parse(const char *s);
-  int Number(void) const { return number; }
-  const char *Description(void) const { return description; }
-  };
-
 template<class T> class cConfig : public cList<T> {
 private:
   char *fileName;
@@ -166,15 +152,9 @@ class cSVDRPhosts : public cConfig<cSVDRPhost> {
   bool Acceptable(in_addr_t Address);
   };
 
-class cCaDefinitions : public cConfig<cCaDefinition> {
-public:
-  const cCaDefinition *Get(int Number);
-  };
-
 extern cCommands Commands;
 extern cCommands RecordingCommands;
 extern cSVDRPhosts SVDRPhosts;
-extern cCaDefinitions CaDefinitions;
 
 class cSetupLine : public cListObject {
 private:
@@ -210,6 +190,7 @@ class cSetup : public cConfig<cSetupLine> {
   char OSDTheme[MaxThemeName];
   int PrimaryDVB;
   int ShowInfoOnChSwitch;
+  int TimeoutRequChInfo;
   int MenuScrollPage;
   int MenuScrollWrap;
   int MarkInstantRecord;
diff --git a/device.c b/device.c
index 1b4cec458..0f19e3b1f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.112 2005/11/26 12:56:09 kls Exp $
+ * $Id: device.c 1.121 2006/01/08 11:39:37 kls Exp $
  */
 
 #include "device.h"
@@ -222,7 +222,7 @@ int cDevice::NextCardIndex(int n)
         esyslog("ERROR: nextCardIndex too big (%d)", nextCardIndex);
      }
   else if (n < 0)
-     esyslog("ERROR: illegal value in IncCardIndex(%d)", n);
+     esyslog("ERROR: invalid value in IncCardIndex(%d)", n);
   return nextCardIndex;
 }
 
@@ -302,7 +302,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
             pri = 6; // receiving with same priority but fewer Ca's
          else
             pri = 7; // all others
-         if (pri < select) {
+         if (pri <= select) {
             select = pri;
             d = device[i];
             if (NeedsDetachReceivers)
@@ -322,9 +322,36 @@ void cDevice::Shutdown(void)
       }
 }
 
-bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
+uchar *cDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  return false;
+  return NULL;
+}
+
+bool cDevice::GrabImageFile(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
+{
+  int result = 0;
+  int fd = open(FileName, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, DEFFILEMODE);
+  if (fd >= 0) {
+     int ImageSize;
+     uchar *Image = GrabImage(ImageSize, Jpeg, Quality, SizeX, SizeY);
+     if (Image) {
+        if (safe_write(fd, Image, ImageSize) == ImageSize)
+           isyslog("grabbed image to %s", FileName);
+        else {
+           LOG_ERROR_STR(FileName);
+           result |= 1;
+           }
+        free(Image);
+        }
+     else
+        result |= 1;
+     close(fd);
+     }
+  else {
+     LOG_ERROR_STR(FileName);
+     result |= 1;
+     }
+  return result == 0;
 }
 
 void cDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
@@ -577,10 +604,14 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   if (LiveView)
      StopReplay();
 
+  // If this card is switched to an other transponder, any receivers still
+  // attached to it ineed to be automatically detached:
+  bool NeedsDetachReceivers = false;
+
   // If this card can't receive this channel, we must not actually switch
   // the channel here, because that would irritate the driver when we
   // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (LiveView && IsPrimaryDevice() && !ProvidesChannel(Channel, Setup.PrimaryLimit));
+  bool NeedsTransferMode = (LiveView && IsPrimaryDevice() && !ProvidesChannel(Channel, Setup.PrimaryLimit, &NeedsDetachReceivers));
 
   eSetChannelResult Result = scrOk;
 
@@ -588,11 +619,14 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   // use the card that actually can receive it and transfer data from there:
 
   if (NeedsTransferMode) {
-     cDevice *CaDevice = GetDevice(Channel, 0);
+     cDevice *CaDevice = GetDevice(Channel, 0, &NeedsDetachReceivers);
      if (CaDevice && CanReplay()) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
-        if (CaDevice->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
+        if (CaDevice->SetChannel(Channel, false) == scrOk) { // calling SetChannel() directly, not SwitchChannel()!
+           if (NeedsDetachReceivers)
+              CaDevice->DetachAllReceivers();
            cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+           }
         else
            Result = scrNoTransfer;
         }
@@ -613,7 +647,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         ciHandler->SetSource(Channel->Source(), Channel->Transponder());
 // Men at work - please stand clear! ;-)
 #ifdef XXX_DO_MULTIPLE_CA_CHANNELS
-        if (Channel->Ca() > CACONFBASE) {
+        if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
 #endif
            ciHandler->AddPid(Channel->Sid(), Channel->Vpid(), 2);
            for (const int *Apid = Channel->Apids(); *Apid; Apid++)
@@ -626,13 +660,15 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
            }
 #endif
         }
+     if (NeedsDetachReceivers)
+        DetachAllReceivers();
      if (SetChannelDevice(Channel, LiveView)) {
         // Start section handling:
         if (sectionHandler) {
            sectionHandler->SetChannel(Channel);
            sectionHandler->SetStatus(true);
            }
-        // Start decrypting any PIDs the might have been set in SetChannelDevice():
+        // Start decrypting any PIDs that might have been set in SetChannelDevice():
         if (ciHandler)
            ciHandler->StartDecrypting();
         }
@@ -794,6 +830,7 @@ int cDevice::NumAudioTracks(void) const
 bool cDevice::SetCurrentAudioTrack(eTrackType Type)
 {
   if (ttNone < Type && Type < ttDolbyLast) {
+     cMutexLock MutexLock(&mutexCurrentAudioTrack);
      if (IS_DOLBY_TRACK(Type))
         SetDigitalAudioDevice(true);
      currentAudioTrack = Type;
@@ -947,6 +984,7 @@ int cDevice::PlayAudio(const uchar *Data, int Length)
 
 int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 {
+  cMutexLock MutexLock(&mutexCurrentAudioTrack);
   bool FirstLoop = true;
   uchar c = Data[3];
   const uchar *Start = Data;
@@ -972,7 +1010,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                uchar SubStreamId = Data[PayloadOffset];
                uchar SubStreamType = SubStreamId & 0xF0;
                uchar SubStreamIndex = SubStreamId & 0x1F;
-        
+
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
 pre_1_3_19_PrivateStreamDeteced:
                if (pre_1_3_19_PrivateStream) {
@@ -1111,7 +1149,7 @@ int cDevice::ProvidesCa(const cChannel *Channel) const
   int Ca = Channel->Ca();
   if (Ca == CardIndex() + 1)
      return 1; // exactly _this_ card was requested
-  if (Ca && Ca <= MAXDEVICES)
+  if (Ca && Ca <= CA_DVB_MAX)
      return 0; // a specific card was requested, but not _this_ one
   return !Ca; // by default every card can provide FTA
 }
@@ -1242,6 +1280,15 @@ void cDevice::DetachAll(int Pid)
      }
 }
 
+void cDevice::DetachAllReceivers(void)
+{
+  cMutexLock MutexLock(&mutexReceiver);
+  for (int i = 0; i < MAXRECEIVERS; i++) {
+      if (receiver[i])
+         Detach(receiver[i]);
+      }
+}
+
 // --- cTSBuffer -------------------------------------------------------------
 
 cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
diff --git a/device.h b/device.h
index 43d386bf0..eb409f9c4 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.66 2005/11/05 15:25:41 kls Exp $
+ * $Id: device.h 1.70 2006/01/08 10:10:26 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -170,14 +170,16 @@ class cDevice : public cThread {
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
          ///< Returns the number of this device (0 ... MAXDEVICES - 1).
-  virtual int ProvidesCa(const cChannel *Channel) const;//XXX PLUGINS.html!!!
-         //XXX describe changed functionality!!!
-         ///< Checks whether this device provides the given value in its
-         ///< caCaps. Returns 0 if the value is not provided, 1 if only this
-         ///< value is provided, and > 1 if this and other values are provided.
-         ///< If the given value is equal to the number of this device,
-         ///< 1 is returned. If it is 0 (FTA), 1 plus the number of other values
-         ///< in caCaps is returned.
+  virtual int ProvidesCa(const cChannel *Channel) const;
+         ///< Checks whether this device provides the conditional access
+         ///< facilities to decrypt the given Channel.
+         ///< Returns 0 if the Channel can't be decrypted, 1 if this is a
+         ///< Free To Air channel or only exactly this device can decrypt it,
+         ///< and > 1 if this device can decrypt the Channel.
+         ///< If the result is greater than 1 and the device has more than one
+         ///< CAM, the value will be increased by the number of CAMs, which
+         ///< allows to select the device with the smallest number of CAMs
+         ///< in order to preserve resources for other recordings.
   virtual bool HasDecoder(void) const;
          ///< Tells whether this device has an MPEG decoder.
 
@@ -305,11 +307,9 @@ class cDevice : public cThread {
 // Image Grab facilities
 
 public:
-  virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-         ///< Capture a single frame as an image.
-         ///< Grabs the currently visible screen image into the given file, with the
-         ///< given parameters.
-         ///< \param FileName The name of the file to write. Should include the proper extension.
+  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+         ///< Grabs the currently visible screen image.
+         ///< \param Size The size of the returned data block.
          ///< \param Jpeg If true will write a JPEG file. Otherwise a PNM file will be written.
          ///< \param Quality The compression factor for JPEG. 1 will create a very blocky
          ///<        and small image, 70..80 will yield reasonable quality images while keeping the
@@ -317,7 +317,13 @@ class cDevice : public cThread {
          ///<        but very high quality image.
          ///< \param SizeX The number of horizontal pixels in the frame (default is the current screen width).
          ///< \param SizeY The number of vertical pixels in the frame (default is the current screen height).
-         ///< \return True if all went well. */
+         ///< \return A pointer to the grabbed image data, or NULL in case of an error.
+         ///< The caller takes ownership of the returned memory and must free() it once it isn't needed any more.
+  bool GrabImageFile(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+         ///< Calls GrabImage() and stores the resulting image in a file with the given name.
+         ///< \return True if all went well.
+         ///< The caller is responsible for making sure that the given file name
+         ///< doesn't lead to overwriting any important other file.
 
 // Video format facilities
 
@@ -338,6 +344,7 @@ class cDevice : public cThread {
 private:
   tTrackId availableTracks[ttMaxTrackTypes];
   eTrackType currentAudioTrack;
+  cMutex mutexCurrentAudioTrack;
   int currentAudioTrackMissingCount;
   bool pre_1_3_19_PrivateStream;
 protected:
@@ -516,6 +523,8 @@ class cDevice : public cThread {
        ///< Detaches the given receiver from this device.
   void DetachAll(int Pid);
        ///< Detaches all receivers from this device for this pid.
+  void DetachAllReceivers(void);
+       ///< Detaches all receivers from this device.
   };
 
 /// Derived cDevice classes that can receive channels will have to provide
diff --git a/diseqc.c b/diseqc.c
index bae599600..7dc308b68 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.4 2005/01/09 13:05:11 kls Exp $
+ * $Id: diseqc.c 1.5 2005/12/30 15:41:48 kls Exp $
  */
 
 #include "diseqc.h"
@@ -65,7 +65,7 @@ char *cDiseqc::Wait(char *s)
         cCondWait::SleepMs(n);
      return p;
      }
-  esyslog("ERROR: illegal value for wait time in '%s'", s - 1);
+  esyslog("ERROR: invalid value for wait time in '%s'", s - 1);
   return NULL;
 }
 
@@ -85,7 +85,7 @@ char *cDiseqc::Codes(char *s)
                  t = skipspace(p);
                  }
               else {
-                 esyslog("ERROR: illegal code at '%s'", t);
+                 esyslog("ERROR: invalid code at '%s'", t);
                  return NULL;
                  }
               }
diff --git a/dvbdevice.c b/dvbdevice.c
index 30ce1e4ae..7fa39ccec 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,18 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.138 2005/11/26 13:23:11 kls Exp $
+ * $Id: dvbdevice.c 1.149 2006/01/07 15:15:01 kls Exp $
  */
 
 #include "dvbdevice.h"
 #include <errno.h>
-extern "C" {
-#ifdef boolean
-#define HAVE_BOOLEAN
-#endif
-#include <jpeglib.h>
-#undef boolean
-}
 #include <limits.h>
 #include <linux/videodev.h>
 #include <linux/dvb/audio.h>
@@ -47,6 +40,13 @@ extern "C" {
 #define DEV_DVB_AUDIO     "audio"
 #define DEV_DVB_CA        "ca"
 
+#define DVBS_TUNE_TIMEOUT  2000 //ms
+#define DVBS_LOCK_TIMEOUT  2000 //ms
+#define DVBC_TUNE_TIMEOUT  5000 //ms
+#define DVBC_LOCK_TIMEOUT  2000 //ms
+#define DVBT_TUNE_TIMEOUT  9000 //ms
+#define DVBT_LOCK_TIMEOUT  2000 //ms
+
 class cDvbName {
 private:
   char buffer[PATH_MAX];
@@ -73,6 +73,9 @@ class cDvbTuner : public cThread {
   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
   int fd_frontend;
   int cardIndex;
+  int tuneTimeout;
+  int lockTimeout;
+  time_t lastTimeoutReport;
   fe_type_t frontendType;
   cCiHandler *ciHandler;
   cChannel channel;
@@ -81,7 +84,7 @@ class cDvbTuner : public cThread {
   cMutex mutex;
   cCondVar locked;
   cCondVar newSet;
-  bool GetFrontendEvent(dvb_frontend_event &Event, int TimeoutMs = 0);
+  bool GetFrontendStatus(fe_status_t &Status, int TimeoutMs = 0);
   bool SetFrontend(void);
   virtual void Action(void);
 public:
@@ -98,6 +101,9 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCi
   cardIndex = CardIndex;
   frontendType = FrontendType;
   ciHandler = CiHandler;
+  tuneTimeout = 0;
+  lockTimeout = 0;
+  lastTimeoutReport = 0;
   diseqcCommands = NULL;
   tunerStatus = tsIdle;
   if (frontendType == FE_QPSK)
@@ -125,6 +131,7 @@ void cDvbTuner::Set(const cChannel *Channel, bool Tune)
   if (Tune)
      tunerStatus = tsSet;
   channel = *Channel;
+  lastTimeoutReport = 0;
   newSet.Broadcast();
 }
 
@@ -140,26 +147,18 @@ bool cDvbTuner::Locked(int TimeoutMs)
   return tunerStatus >= tsLocked;
 }
 
-bool cDvbTuner::GetFrontendEvent(dvb_frontend_event &Event, int TimeoutMs)
+bool cDvbTuner::GetFrontendStatus(fe_status_t &Status, int TimeoutMs)
 {
   if (TimeoutMs) {
-     struct pollfd pfd;
-     pfd.fd = fd_frontend;
-     pfd.events = POLLIN | POLLPRI;
-     do {
-        int stat = poll(&pfd, 1, TimeoutMs);
-        if (stat == 1)
-           break;
-        if (stat < 0) {
-           if (errno == EINTR)
-              continue;
-           esyslog("ERROR: frontend %d poll failed: %m", cardIndex);
-           }
-        return false;
-        } while (0);
+     cPoller Poller(fd_frontend);
+     if (Poller.Poll(TimeoutMs)) {
+        dvb_frontend_event Event;
+        while (ioctl(fd_frontend, FE_GET_EVENT, &Event) == 0)
+              ; // just to clear the event queue - we'll read the actual status below
+        }
      }
   do {
-     int stat = ioctl(fd_frontend, FE_GET_EVENT, &Event);
+     int stat = ioctl(fd_frontend, FE_READ_STATUS, &Status);
      if (stat == 0)
         return true;
      if (stat < 0) {
@@ -245,6 +244,9 @@ bool cDvbTuner::SetFrontend(void)
          Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
          Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL;
          Frontend.u.qpsk.fec_inner = fe_code_rate_t(channel.CoderateH());
+
+         tuneTimeout = DVBS_TUNE_TIMEOUT;
+         lockTimeout = DVBS_LOCK_TIMEOUT;
          }
          break;
     case FE_QAM: { // DVB-C
@@ -256,6 +258,9 @@ bool cDvbTuner::SetFrontend(void)
          Frontend.u.qam.symbol_rate = channel.Srate() * 1000UL;
          Frontend.u.qam.fec_inner = fe_code_rate_t(channel.CoderateH());
          Frontend.u.qam.modulation = fe_modulation_t(channel.Modulation());
+
+         tuneTimeout = DVBC_TUNE_TIMEOUT;
+         lockTimeout = DVBC_LOCK_TIMEOUT;
          }
          break;
     case FE_OFDM: { // DVB-T
@@ -271,6 +276,9 @@ bool cDvbTuner::SetFrontend(void)
          Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(channel.Transmission());
          Frontend.u.ofdm.guard_interval = fe_guard_interval_t(channel.Guard());
          Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(channel.Hierarchy());
+
+         tuneTimeout = DVBT_TUNE_TIMEOUT;
+         lockTimeout = DVBT_LOCK_TIMEOUT;
          }
          break;
     default:
@@ -286,30 +294,54 @@ bool cDvbTuner::SetFrontend(void)
 
 void cDvbTuner::Action(void)
 {
-  dvb_frontend_event event;
+  cTimeMs Timer;
+  bool LostLock = false;
+  fe_status_t Status = (fe_status_t)0;
   while (Running()) {
-        bool hasEvent = GetFrontendEvent(event, 1);
-
+        fe_status_t NewStatus;
+        if (GetFrontendStatus(NewStatus, 10))
+           Status = NewStatus;
         cMutexLock MutexLock(&mutex);
         switch (tunerStatus) {
           case tsIdle:
                break;
           case tsSet:
-               if (hasEvent)
-                  continue;
                tunerStatus = SetFrontend() ? tsTuned : tsIdle;
+               Timer.Set(tuneTimeout);
                continue;
           case tsTuned:
-          case tsLocked:
-               if (hasEvent) {
-                  if (event.status & FE_REINIT) {
-                     tunerStatus = tsSet;
-                     esyslog("ERROR: frontend %d was reinitialized - re-tuning", cardIndex);
+               if (Timer.TimedOut()) {
+                  tunerStatus = tsSet;
+                  diseqcCommands = NULL;
+                  if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
+                     esyslog("ERROR: frontend %d timed out while tuning to channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                     lastTimeoutReport = time(NULL);
                      }
-                  if (event.status & FE_HAS_LOCK) {
-                     tunerStatus = tsLocked;
-                     locked.Broadcast();
+                  continue;
+                  }
+          case tsLocked:
+               if (Status & FE_REINIT) {
+                  tunerStatus = tsSet;
+                  diseqcCommands = NULL;
+                  esyslog("ERROR: frontend %d was reinitialized", cardIndex);
+                  lastTimeoutReport = 0;
+                  continue;
+                  }
+               else if (Status & FE_HAS_LOCK) {
+                  if (LostLock) {
+                     esyslog("frontend %d regained lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                     LostLock = false;
                      }
+                  tunerStatus = tsLocked;
+                  locked.Broadcast();
+                  lastTimeoutReport = 0;
+                  }
+               else if (tunerStatus == tsLocked) {
+                  LostLock = true;
+                  esyslog("ERROR: frontend %d lost lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                  tunerStatus = tsTuned;
+                  Timer.Set(lockTimeout);
+                  lastTimeoutReport = 0;
                   continue;
                   }
           }
@@ -471,13 +503,21 @@ bool cDvbDevice::Ready(void)
 
 int cDvbDevice::ProvidesCa(const cChannel *Channel) const
 {
-  if (Channel->Ca() >= 0x0100 && ciHandler) {
-     unsigned short ids[MAXCAIDS + 1];
-     for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0!
-         ids[i] = Channel->Ca(i);
-     return ciHandler->ProvidesCa(ids);
+  int NumCams = 0;
+  if (ciHandler) {
+     NumCams = ciHandler->NumCams();
+     if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
+        unsigned short ids[MAXCAIDS + 1];
+        for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0!
+            ids[i] = Channel->Ca(i);
+        if (ciHandler->ProvidesCa(ids))
+           return NumCams + 1;
+        }
      }
-  return cDevice::ProvidesCa(Channel);
+  int result = cDevice::ProvidesCa(Channel);
+  if (result > 0)
+     result += NumCams;
+  return result;
 }
 
 cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
@@ -487,103 +527,84 @@ cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
   return spuDecoder;
 }
 
-bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
+uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
   if (devVideoIndex < 0)
-     return false;
+     return NULL;
   char buffer[PATH_MAX];
   snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, devVideoIndex);
   int videoDev = open(buffer, O_RDWR);
-  if (videoDev < 0)
-     LOG_ERROR_STR(buffer);
   if (videoDev >= 0) {
-     int result = 0;
+     uchar *result = NULL;
      struct video_mbuf mbuf;
-     result |= ioctl(videoDev, VIDIOCGMBUF, &mbuf);
-     if (result == 0) {
+     if (ioctl(videoDev, VIDIOCGMBUF, &mbuf) == 0) {
         int msize = mbuf.size;
         unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
         if (mem && mem != (unsigned char *)-1) {
            // set up the size and RGB
            struct video_capability vc;
-           result |= ioctl(videoDev, VIDIOCGCAP, &vc);
-           struct video_mmap vm;
-           vm.frame = 0;
-           if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
-               (SizeY > 0) && (SizeY <= vc.maxheight)) {
-              vm.width = SizeX;
-              vm.height = SizeY;
-              }
-           else {
-              vm.width = vc.maxwidth;
-              vm.height = vc.maxheight;
-              }
-           vm.format = VIDEO_PALETTE_RGB24;
-           result |= ioctl(videoDev, VIDIOCMCAPTURE, &vm);
-           result |= ioctl(videoDev, VIDIOCSYNC, &vm.frame);
-           // make RGB out of BGR:
-           int memsize = vm.width * vm.height;
-           unsigned char *mem1 = mem;
-           for (int i = 0; i < memsize; i++) {
-               unsigned char tmp = mem1[2];
-               mem1[2] = mem1[0];
-               mem1[0] = tmp;
-               mem1 += 3;
-               }
-
-           if (Quality < 0)
-              Quality = 100;
-
-           isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
-           FILE *f = fopen(FileName, "wb");
-           if (f) {
-              if (Jpeg) {
-                 // write JPEG file:
-                 struct jpeg_compress_struct cinfo;
-                 struct jpeg_error_mgr jerr;
-                 cinfo.err = jpeg_std_error(&jerr);
-                 jpeg_create_compress(&cinfo);
-                 jpeg_stdio_dest(&cinfo, f);
-                 cinfo.image_width = vm.width;
-                 cinfo.image_height = vm.height;
-                 cinfo.input_components = 3;
-                 cinfo.in_color_space = JCS_RGB;
-
-                 jpeg_set_defaults(&cinfo);
-                 jpeg_set_quality(&cinfo, Quality, true);
-                 jpeg_start_compress(&cinfo, true);
-
-                 int rs = vm.width * 3;
-                 JSAMPROW rp[vm.height];
-                 for (int k = 0; k < vm.height; k++)
-                     rp[k] = &mem[rs * k];
-                 jpeg_write_scanlines(&cinfo, rp, vm.height);
-                 jpeg_finish_compress(&cinfo);
-                 jpeg_destroy_compress(&cinfo);
+           if (ioctl(videoDev, VIDIOCGCAP, &vc) == 0) {
+              struct video_mmap vm;
+              vm.frame = 0;
+              if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
+                  (SizeY > 0) && (SizeY <= vc.maxheight)) {
+                 vm.width = SizeX;
+                 vm.height = SizeY;
                  }
               else {
-                 // write PNM file:
-                 if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 ||
-                     fwrite(mem, vm.width * vm.height * 3, 1, f) != 1) {
-                    LOG_ERROR_STR(FileName);
-                    result |= 1;
+                 vm.width = vc.maxwidth;
+                 vm.height = vc.maxheight;
+                 }
+              vm.format = VIDEO_PALETTE_RGB24;
+              if (ioctl(videoDev, VIDIOCMCAPTURE, &vm) == 0 && ioctl(videoDev, VIDIOCSYNC, &vm.frame) == 0) {
+                 // make RGB out of BGR:
+                 int memsize = vm.width * vm.height;
+                 unsigned char *mem1 = mem;
+                 for (int i = 0; i < memsize; i++) {
+                     unsigned char tmp = mem1[2];
+                     mem1[2] = mem1[0];
+                     mem1[0] = tmp;
+                     mem1 += 3;
+                     }
+
+                 if (Quality < 0)
+                    Quality = 100;
+
+                 isyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+                 if (Jpeg) {
+                    // convert to JPEG:
+                    result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality);
+                    if (!result)
+                       esyslog("ERROR: failed to convert image to JPEG");
+                    }
+                 else {
+                    // convert to PNM:
+                    char buf[32];
+                    snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", vm.width, vm.height);
+                    int l = strlen(buf);
+                    int bytes = memsize * 3;
+                    Size = l + bytes;
+                    result = MALLOC(uchar, Size);
+                    if (result) {
+                       memcpy(result, buf, l);
+                       memcpy(result + l, mem, bytes);
+                       }
+                    else
+                       esyslog("ERROR: failed to convert image to PNM");
                     }
                  }
-              fclose(f);
-              }
-           else {
-              LOG_ERROR_STR(FileName);
-              result |= 1;
               }
            munmap(mem, msize);
            }
         else
-           result |= 1;
+           esyslog("ERROR: failed to memmap video device");
         }
      close(videoDev);
-     return result == 0;
+     return result;
      }
-  return false;
+  else
+     LOG_ERROR_STR(buffer);
+  return NULL;
 }
 
 void cDvbDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
@@ -754,7 +775,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
 #ifdef DO_MULTIPLE_RECORDINGS
 #ifndef DO_MULTIPLE_CA_CHANNELS
-              if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE)
+              if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN)
                  needsDetachReceivers = Ca() != Channel->Ca();
               else
 #endif
@@ -825,6 +846,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
+     //XXX quick workaround for additional live audio PIDs:
+     if (ciHandler) {
+        ciHandler->SetPid(Channel->Apid(1), true);
+        ciHandler->SetPid(Channel->Dpid(0), true);
+        }
      if (IsPrimaryDevice())
         AddPid(Channel->Tpid(), ptTeletext);
      CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schl��ler <marco@lordzodiac.de> this works
diff --git a/dvbdevice.h b/dvbdevice.h
index ed0cef8a8..cc9d126a4 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.36 2005/11/11 14:51:38 kls Exp $
+ * $Id: dvbdevice.h 1.37 2005/12/29 13:33:12 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -85,7 +85,7 @@ class cDvbDevice : public cDevice {
   static int devVideoOffset;
   int devVideoIndex;
 public:
-  virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
 
 // Video format facilities
 
diff --git a/dvbosd.c b/dvbosd.c
index 458ec9ce8..76afecbfd 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.27 2005/05/22 10:57:45 kls Exp $
+ * $Id: dvbosd.c 1.29 2005/12/30 15:41:54 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -39,7 +39,7 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
   osdDev = OsdDev;
   shown = false;
   if (osdDev < 0)
-     esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
+     esyslog("ERROR: invalid OSD device handle (%d)!", osdDev);
   else {
      osdMem = MAXOSDMEMORY;
 #ifdef OSD_CAP_MEMSIZE
@@ -88,6 +88,8 @@ eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
             return oeBppNotSupported;
          if ((Areas[i].Width() & (8 / Areas[i].bpp - 1)) != 0)
             return oeWrongAlignment;
+         if (Areas[i].Width() < 1 || Areas[i].Height() < 1 || Areas[i].Width() > 720 || Areas[i].Height() > 576)
+            return oeWrongAreaSize;
          TotalMemory += Areas[i].Width() * Areas[i].Height() / (8 / Areas[i].bpp);
          }
      if (TotalMemory > osdMem)
diff --git a/dvbplayer.c b/dvbplayer.c
index fd640d3c9..efd767f11 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.41 2005/10/31 12:33:48 kls Exp $
+ * $Id: dvbplayer.c 1.42 2006/01/08 11:39:41 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -621,7 +621,7 @@ int cDvbPlayer::SkipFrames(int Frames)
      int Current, Total;
      GetIndex(Current, Total, true);
      int OldCurrent = Current;
-     // As GetNextIFrame() increments/decrements at least once, the 
+     // As GetNextIFrame() increments/decrements at least once, the
      // destination frame (= Current + Frames) must be adjusted by
      // -1/+1 respectively.
      Current = index->GetNextIFrame(Current + Frames + (Frames > 0 ? -1 : 1), Frames > 0);
diff --git a/dvbspu.c b/dvbspu.c
index 9887cc05c..745af8b23 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,16 +8,15 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.17 2005/11/05 12:08:15 kls Exp $
+ * $Id: dvbspu.c 1.19 2006/01/08 11:39:46 kls Exp $
  */
 
+#include "dvbspu.h"
 #include <assert.h>
 #include <string.h>
 #include <inttypes.h>
 #include <math.h>
-
 #include "device.h"
-#include "dvbspu.h"
 
 /*
  * cDvbSpubitmap:
@@ -28,7 +27,7 @@
  * Inputs:
  *  - a SPU rle encoded image on creation, which will be decoded into
  *    the full screen indexed bitmap
- *  
+ *
  * Output:
  *  - a minimal sized cDvbSpuBitmap a given palette, the indexed bitmap
  *    will be scanned to get the smallest possible resulting bitmap considering
@@ -436,7 +435,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
 
             prev_DCSQ_offset = DCSQ_offset;
             DCSQ_offset = spuU32(i);
-            DEBUG("offs = %d, DCSQ = %d, prev_DCSQ = %d\n", 
+            DEBUG("offs = %d, DCSQ = %d, prev_DCSQ = %d\n",
                            i, DCSQ_offset, prev_DCSQ_offset);
             i += 2;
 
diff --git a/dvbspu.h b/dvbspu.h
index e018c702e..487264a13 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,16 +8,16 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.10 2005/11/05 12:08:47 kls Exp $
+ * $Id: dvbspu.h 1.11 2006/01/05 10:18:31 kls Exp $
  */
 
 #ifndef __DVBSPU_H
 #define __DVBSPU_H
 
 #include <inttypes.h>
-
 #include "osd.h"
 #include "spu.h"
+#include "thread.h"
 
 typedef struct sDvbSpuPalDescr {
     uint8_t index;
diff --git a/eit.c b/eit.c
index 4a643685f..a343a696d 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.112 2005/11/04 14:19:16 kls Exp $
+ * $Id: eit.c 1.113 2005/12/26 11:50:09 kls Exp $
  */
 
 #include "eit.h"
@@ -43,6 +43,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
 
   bool Empty = true;
   bool Modified = false;
+  time_t SegmentStart = 0;
+  time_t SegmentEnd = 0;
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
@@ -50,6 +52,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getStartTime() > 0 && SiEitEvent.getDuration() == 0)
          continue;
       Empty = false;
+      if (!SegmentStart)
+         SegmentStart = SiEitEvent.getStartTime();
+      SegmentEnd = SiEitEvent.getStartTime() + SiEitEvent.getDuration();
       cEvent *newEvent = NULL;
       cEvent *rEvent = NULL;
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
@@ -242,6 +247,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
      pSchedule->SetPresentSeen();
   if (Modified) {
      pSchedule->Sort();
+     pSchedule->DropOutdated(SegmentStart, SegmentEnd, Tid, getVersionNumber());
      Schedules->SetModified(pSchedule);
      }
 }
diff --git a/eitscan.c b/eitscan.c
index 7a89141bf..5966f50f4 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.29 2005/11/05 15:24:36 kls Exp $
+ * $Id: eitscan.c 1.30 2006/01/07 14:10:17 kls Exp $
  */
 
 #include "eitscan.h"
@@ -147,7 +147,7 @@ void cEITScanner::Process(void)
                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
                       const cChannel *Channel = ScanData->GetChannel();
                       if (Channel) {
-                         if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
+                         if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
                             if (Device->ProvidesTransponder(Channel)) {
                                if (!Device->Receiving()) {
                                   bool MaySwitchTransponder = Device->MaySwitchTransponder();
diff --git a/epg.c b/epg.c
index e6e039cee..7b2cb0ea2 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.40 2005/11/11 13:37:43 kls Exp $
+ * $Id: epg.c 1.47 2005/12/30 15:41:59 kls Exp $
  */
 
 #include "epg.h"
@@ -234,7 +234,7 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
 {
   if (InfoOnly || startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
      if (!InfoOnly)
-        fprintf(f, "%sE %u %ld %d %X\n", Prefix, eventID, startTime, duration, tableID);
+        fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version);
      if (!isempty(title))
         fprintf(f, "%sT %s\n", Prefix, title);
      if (!isempty(shortText))
@@ -296,8 +296,9 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                           time_t StartTime;
                           int Duration;
                           unsigned int TableID = 0;
-                          int n = sscanf(t, "%u %ld %d %X", &EventID, &StartTime, &Duration, &TableID);
-                          if (n == 3 || n == 4) {
+                          unsigned int Version = 0xFF;
+                          int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
+                          if (n >= 3 && n <= 5) {
                              Event = (cEvent *)Schedule->GetEvent(EventID, StartTime);
                              cEvent *newEvent = NULL;
                              if (Event)
@@ -306,6 +307,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                                 Event = newEvent = new cEvent(EventID);
                              if (Event) {
                                 Event->SetTableID(TableID);
+                                Event->SetVersion(Version);
                                 Event->SetStartTime(StartTime);
                                 Event->SetDuration(Duration);
                                 if (newEvent)
@@ -635,7 +637,6 @@ void cSchedule::DelEvent(cEvent *Event)
   if (Event->schedule == this) {
      UnhashEvent(Event);
      events.Del(Event);
-     Event->schedule = NULL;
      }
 }
 
@@ -737,6 +738,31 @@ void cSchedule::Sort(void)
   events.Sort();
 }
 
+void cSchedule::DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version)
+{
+  if (SegmentStart > 0 && SegmentEnd > 0) {
+     for (cEvent *p = events.First(); p; p = events.Next(p)) {
+         if (p->EndTime() > SegmentStart) {
+            if (p->StartTime() < SegmentEnd) {
+               // The event overlaps with the given time segment.
+               if (p->TableID() > TableID || p->TableID() == TableID && p->Version() != Version) {
+                  // The segment overwrites all events from tables with higher ids, and
+                  // within the same table id all events must have the same version.
+                  // We can't delete the event right here because a timer might have
+                  // a pointer to it, so let's set its id and start time to 0 to have it
+                  // "phased out":
+                  UnhashEvent(p);
+                  p->eventID = 0;
+                  p->startTime = 0;
+                  }
+               }
+            else
+               break;
+            }
+         }
+     }
+}
+
 void cSchedule::Cleanup(void)
 {
   Cleanup(time(NULL));
@@ -745,15 +771,12 @@ void cSchedule::Cleanup(void)
 void cSchedule::Cleanup(time_t Time)
 {
   cEvent *Event;
-  for (int a = 0; true ; a++) {
-      Event = events.Get(a);
-      if (!Event)
-         break;
-      if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
-         DelEvent(Event);
-         a--;
-         }
-      }
+  while ((Event = events.First()) != NULL) {
+        if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) // adding one hour for safety
+           DelEvent(Event);
+        else
+           break;
+        }
 }
 
 void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime) const
@@ -811,7 +834,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
                        }
                     }
                  else {
-                    esyslog("ERROR: illegal channel ID: %s", s);
+                    esyslog("ERROR: invalid channel ID: %s", s);
                     return false;
                     }
                  }
@@ -871,7 +894,7 @@ void cSchedules::Cleanup(bool Force)
   time_t now = time(NULL);
   struct tm tm_r;
   struct tm *ptm = localtime_r(&now, &tm_r);
-  if (now - lastCleanup > 3600 && ptm->tm_hour == 5) {
+  if (now - lastCleanup > 3600) {
      isyslog("cleaning up schedules data");
      cSchedulesLock SchedulesLock(true, 1000);
      cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
@@ -880,7 +903,8 @@ void cSchedules::Cleanup(bool Force)
             p->Cleanup(now);
         }
      lastCleanup = now;
-     ReportEpgBugFixStats(true);
+     if (ptm->tm_hour == 5)
+        ReportEpgBugFixStats(true);
      }
   if (epgDataFileName && now - lastDump > 600) {
      cSafeFile f(epgDataFileName);
diff --git a/epg.h b/epg.h
index 9cefcb270..04b63bfb4 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.26 2005/09/11 12:54:30 kls Exp $
+ * $Id: epg.h 1.28 2005/12/27 14:31:24 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -67,6 +67,7 @@ class cEvent : public cListObject {
   ~cEvent();
   virtual int Compare(const cListObject &ListObject) const;
   tChannelID ChannelID(void) const;
+  const cSchedule *Schedule(void) const { return schedule; }
   u_int16_t EventID(void) const { return eventID; }
   uchar TableID(void) const { return tableID; }
   uchar Version(void) const { return version; }
@@ -128,6 +129,7 @@ class cSchedule : public cListObject  {
   void ClrRunningStatus(cChannel *Channel = NULL);
   void ResetVersions(void);
   void Sort(void);
+  void DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
   void Cleanup(time_t Time);
   void Cleanup(void);
   cEvent *AddEvent(cEvent *Event);
diff --git a/genfontfile.c b/genfontfile.c
index af45ad5d2..9189167e1 100644
--- a/genfontfile.c
+++ b/genfontfile.c
@@ -154,9 +154,9 @@ SuckGlyphsFromServer(Display * dpy, Font font)
     character.byte2 = (i + fontinfo->min_char_or_byte2) & 255;
     character.byte1 = (i + fontinfo->min_char_or_byte2) >> 8;
 
-    /* XXX we could use XDrawImageString16 which would also paint the backing 
+    /* XXX we could use XDrawImageString16 which would also paint the backing
 
-       rectangle but X server bugs in some scalable font rasterizers makes it 
+       rectangle but X server bugs in some scalable font rasterizers makes it
 
        more effective to do XFillRectangles to clear the pixmap and
        XDrawImage16 for the text.  */
diff --git a/i18n.c b/i18n.c
index ff25ac8ae..e28bbf0e5 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.220 2005/11/04 14:36:27 kls Exp $
+ * $Id: i18n.c 1.230 2006/01/08 11:56:31 kls Exp $
  *
  * Translations provided by:
  *
@@ -221,7 +221,7 @@ const tI18nPhrase Phrases[] = {
     "Ajastimet",
     "Timery",
     "Timer",
-    "��������������",
+    "��������������������",
     "Timers",
     "Timer-e",
     "Felv�tel beprogramoz�sa",
@@ -263,7 +263,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen tiedot",
     "",// TODO
     "",// TODO
-    "�������",
+    "����������� E�������",
     "Inspelning",
     "Detaliile �nregistr�rii",
     "",// TODO
@@ -347,7 +347,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa kanavaa",
     "Ustawienie kanalu",
     "Modificar canal",
-    "����������� ��������",
+    "����������� ��������",
     "�ndra kanal",
     "Modificare canal",
     "Csatorn�k be�ll�t�sa",
@@ -368,7 +368,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaa ajastinta",
     "Ustawienie timerow",
     "Modificar timer",
-    "���������� �������������",
+    "����������� ��������������������",
     "�ndra timer",
     "Modificare timer",
     "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
@@ -399,27 +399,6 @@ const tI18nPhrase Phrases[] = {
     "S�ndmus",
     "Udsendelse",
   },
-  { "Summary",
-    "Inhalt",
-    "Vsebina",
-    "Sommario",
-    "Inhoud",
-    "Resumo",
-    "R�sum�",
-    "Sammendrag",
-    "Yhteenveto",
-    "Zawartosc",
-    "Res�men",
-    "�����������",
-    "Sammanfattning",
-    "Detalii",
-    "Tartalom",
-    "Sinopsi",
-    "��������",
-    "Sadr�aj",
-    "Kokkuv�te",
-    "Omtale",
-  },
   { "Info",
     "Info",
     "Info",
@@ -504,8 +483,29 @@ const tI18nPhrase Phrases[] = {
     "J�rgmisena eetris",
     "Hvad vises som det n�ste?",
   },
+  { "Summary",
+    "Inhalt",
+    "Vsebina",
+    "Sommario",
+    "Inhoud",
+    "Resumo",
+    "R�sum�",
+    "Sammendrag",
+    "Yhteenveto",
+    "Zawartosc",
+    "Resumen",
+    "�����������",
+    "Sammanfattning",
+    "Cuprins",
+    "Tartalom",
+    "Resum",
+    "��������",
+    "Sadr�aj",
+    "Kokkuv�te",
+    "Omtale",
+  },
   // Button texts (should not be more than 10 characters!):
-  { "Edit",
+  { "Button$Edit",
     "Editieren",
     "Uredi",
     "Modifica",
@@ -526,7 +526,7 @@ const tI18nPhrase Phrases[] = {
     "Muuda",
     "Rediger",
   },
-  { "New",
+  { "Button$New",
     "Neu",
     "Novo",
     "Nuovo",
@@ -547,7 +547,7 @@ const tI18nPhrase Phrases[] = {
     "Uus",
     "Ny",
   },
-  { "Delete",
+  { "Button$Delete",
     "L�schen",
     "Izbri�i",
     "Cancella",
@@ -568,7 +568,7 @@ const tI18nPhrase Phrases[] = {
     "Kustuta",
     "Slet",
   },
-  { "Mark",
+  { "Button$Mark",
     "Markieren",
     "Ozna�i",
     "Marca",
@@ -589,7 +589,7 @@ const tI18nPhrase Phrases[] = {
     "Siirda",
     "Mark�r",
   },
-  { "On/Off",
+  { "Button$On/Off",
     "Ein/Aus",
     "Vklop/Izklop",
     "On/Off",
@@ -610,7 +610,7 @@ const tI18nPhrase Phrases[] = {
     "Sees/V�ljas",
     "Til/Fra",
   },
-  { "Record",
+  { "Button$Record",
     "Aufnehmen",
     "Posnemi",
     "Registra",
@@ -631,7 +631,7 @@ const tI18nPhrase Phrases[] = {
     "Salvesta",
     "Optag",
   },
-  { "Play",
+  { "Button$Play",
     "Wiedergabe",
     "Predvajaj",
     "Riproduci",
@@ -642,7 +642,7 @@ const tI18nPhrase Phrases[] = {
     "Toista",
     "Odtwarzac",
     "Play",
-    "�����������",
+    "�����������",
     "Spela upp",
     "Redare",
     "Lej�tszani",
@@ -652,7 +652,28 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Afspil",
   },
-  { "Rewind",
+  { "Button$Pause",
+    "Pause",
+    "Pavza",
+    "Pausa",
+    "Pauze",
+    "",// TODO
+    "Pause",
+    "",// TODO
+    "Tauko",
+    "Przerwa",
+    "Pausa",
+    "�����",
+    "Pausa",
+    "Pauz�",
+    "Sz�net",
+    "Pausa",
+    "�����",
+    "Pauza",
+    "Paus",
+    "Pause",
+  },
+  { "Button$Rewind",
     "Anfang",
     "Na za�etek",
     "Da inizio",
@@ -663,7 +684,7 @@ const tI18nPhrase Phrases[] = {
     "Alkuun",
     "Poczatek",
     "Rebobinar",
-    "����",
+    "�������� ���� ����",
     "�terspolning",
     "�napoi",
     "Vissza az elej�re",
@@ -694,7 +715,7 @@ const tI18nPhrase Phrases[] = {
     "Stopp",
     "Stop",
   },
-  { "Resume",
+  { "Button$Resume",
     "Weiter",
     "Nadaljuj",
     "Riprendi",
@@ -705,7 +726,7 @@ const tI18nPhrase Phrases[] = {
     "Jatka",
     "Dalej",
     "Continuar",
-    "��������",
+    "���������",
     "Forts�tt",
     "Revenire",
     "Tov�bb",
@@ -715,28 +736,7 @@ const tI18nPhrase Phrases[] = {
     "J�tka",
     "Forts�t",
   },
-  { "Summary",
-    "Inhalt",
-    "Vsebina",
-    "Sommario",
-    "Inhoud",
-    "Resumo",
-    "R�sum�",
-    "Sammendrag",
-    "Yhteenveto",
-    "Zawartosc",
-    "Resumen",
-    "�����������",
-    "Sammanfattning",
-    "Cuprins",
-    "Tartalom",
-    "Resum",
-    "��������",
-    "Sadr�aj",
-    "Kokkuv�te",
-    "Omtale",
-  },
-  { "Open",
+  { "Button$Open",
     "�ffnen",
     "Odpri",
     "Apri",
@@ -747,7 +747,7 @@ const tI18nPhrase Phrases[] = {
     "Avaa",
     "Otworzyc",
     "Abrir",
-    "�������",
+    "�������",
     "�ppna",
     "Deschide",
     "Kinyitni",
@@ -757,7 +757,7 @@ const tI18nPhrase Phrases[] = {
     "Ava",
     "�bn",
   },
-  { "Switch",
+  { "Button$Switch",
     "Umschalten",
     "Preklopi",
     "Cambia",
@@ -778,7 +778,7 @@ const tI18nPhrase Phrases[] = {
     "Vali",
     "Skift",
   },
-  { "Now",
+  { "Button$Now",
     "Jetzt",
     "Sedaj",
     "Adesso",
@@ -799,7 +799,7 @@ const tI18nPhrase Phrases[] = {
     "N��d",
     "Nu",
   },
-  { "Next",
+  { "Button$Next",
     "N�chste",
     "Sledi",
     "Prossimo",
@@ -841,49 +841,7 @@ const tI18nPhrase Phrases[] = {
     "Kava",
     "Program",
   },
-  { "Language",
-    "Sprache",
-    "Jezik",
-    "Linguaggio",
-    "Taal",
-    "Linguagem",
-    "Langue",
-    "Spr�k",
-    "Kieli",
-    "Jezyk",
-    "Idioma",
-    "������",
-    "Spr�k",
-    "Limba",
-    "Nyelv",
-    "Idioma",
-    "����",
-    "Jezik",
-    "Keel",
-    "Sprog",
-  },
-  { "Eject",
-    "Auswerfen",
-    "Izvr�i",
-    "Eject",
-    "Eject",
-    "Ejectar",
-    "Ejection",
-    "Eject",
-    "Avaa",
-    "Wyrzucenie",
-    "Expulsar",
-    "�������",
-    "Mata ut",
-    "Ejecteaz�",
-    "Kidobni",
-    "Expulsar",
-    "�������",
-    "Izbaci",
-    "Ava",
-    "Skub ud",
-  },
-  { "ABC/abc",
+  { "Button$ABC/abc",
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
@@ -904,7 +862,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
   },
-  { "Insert",
+  { "Button$Insert",
     "Einf�gen",
     "Vstavi",
     "Inserisci",
@@ -925,7 +883,7 @@ const tI18nPhrase Phrases[] = {
     "Lisa (INS)",
     "Inds�t",
   },
-  { "Overwrite",
+  { "Button$Overwrite",
     "�berschreiben",
     "Prepi�i",
     "Sovrascrivi",
@@ -946,7 +904,7 @@ const tI18nPhrase Phrases[] = {
     "Asenda (OVR)",
     "Overskriv",
   },
-  { "Menu",
+  { "Button$Menu",
     "Men�",
     "Meni",
     "Men�",
@@ -967,7 +925,7 @@ const tI18nPhrase Phrases[] = {
     "Men��",
     "Menu",
   },
-  { "Reset",
+  { "Button$Reset",
     "Reset",
     "Reset",
     "Reset",
@@ -988,7 +946,7 @@ const tI18nPhrase Phrases[] = {
     "Nullimine",
     "Nulstille",
   },
-  { "Scan",
+  { "Button$Scan",
     "Scan",
     "I��i",
     "Scansione",
@@ -1009,6 +967,27 @@ const tI18nPhrase Phrases[] = {
     "Uuenda",
     "Skan",
   },
+  { "Button$Audio",
+    "Audio",
+    "Zvok",
+    "",// TODO
+    "Audio",
+    "",// TODO
+    "Audio",
+    "",// TODO
+    "��ni",
+    "",// TODO
+    "",// TODO
+    "����",
+    "Ljud",
+    "Sunet",
+    "",// TODO
+    "",// TODO
+    "����",
+    "",// TODO
+    "Audio",
+    "Audio",
+  },
   // Confirmations:
   { "Delete channel?",
     "Kanal l�schen?",
@@ -1042,7 +1021,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko ajastin?",
     "Usunac timer?",
     "�Eliminar timer?",
-    "�������� �������������?",
+    "�������� ��������������������;?",
     "Ta bort timern?",
     "�terg timer-ul?",
     "Felv�tel beprogramoz�s�nak t�rl�se?",
@@ -1063,7 +1042,7 @@ const tI18nPhrase Phrases[] = {
     "Poistetaanko tallenne?",
     "Usunac nagranie?",
     "�Eliminar grabacion?",
-    "�������� �������?",
+    "�������� ��������?",
     "Ta bort inspelningen?",
     "�terg �nregistrarea?",
     "Felv�tel t�rl�se?",
@@ -1084,7 +1063,7 @@ const tI18nPhrase Phrases[] = {
     "Ajastettu tallennus k�ynniss� - poistetaanko silti?",
     "Nagrywanie w trakcie - napewno usunac?",
     "�Timer activo - de verdad eliminarlo?",
-    "�������������� �� ������� - �������� �������?",
+    "�������������������� �� ������� - �������� �������?",
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
     "Timer-ul tocmai �nregistreaz� - �terg, totu�i?",
     "Felv�tel folyamatban van - m�gis t�r�lni?",
@@ -1115,27 +1094,6 @@ const tI18nPhrase Phrases[] = {
     "L�petan salvestamise?",
     "Stop optagelse?",
   },
-  { "on primary interface",
-    "auf dem prim�ren Interface",
-    "na primarni napravi",
-    "su interfaccia primaria",
-    "op eerste interface",
-    "no interface prim�rio",
-    "sur la carte primaire",
-    "p� f�rste enhet",
-    "ensisijaisella sovittimella",
-    "na pierwszym interfejsie",
-    "en interface primario",
-    "���� ����� �����",
-    "fr�n den f�rsta enheten?",
-    "pe prima interfa��",
-    "az els� k�rty�n",
-    "a la interf�cie prim�ria",
-    "�� �������� ����������",
-    "na primarnom ure�aju",
-    "peavastuv�tjal",
-    "p� prim�r enhed",
-  },
   { "Cancel editing?",
     "Schneiden abbrechen?",
     "�elite prekiniti urejanje?",
@@ -1337,7 +1295,7 @@ const tI18nPhrase Phrases[] = {
     "L�hde",
     "Zrodlo",
     "",//TODO
-    "����������",
+    "����",
     "K�lla",
     "Surs�",
     "Forr�s",
@@ -1536,6 +1494,48 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "CA",
   },
+  { "Free To Air",
+    "frei empfangbar",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "encrypted",
+    "verschl�sselt",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Sid",
     "Sid",
     "Sid",
@@ -1568,7 +1568,7 @@ const tI18nPhrase Phrases[] = {
     "Inversio",
     "Inversion",
     "Inversion",
-    "Inversion",
+    "����������",
     "Inversion",
     "Inversiune",
     "Inversion",
@@ -1589,7 +1589,7 @@ const tI18nPhrase Phrases[] = {
     "Kaistanleveys",
     "Szerokosc pasma",
     "Bandwidth",
-    "Bandwidth",
+    "����� ����������",
     "Bandbredd",
     "L�rgime de band�",
     "Bandwidth",
@@ -1610,7 +1610,7 @@ const tI18nPhrase Phrases[] = {
     "Suojaustaso (HP)",
     "CoderateH",
     "CoderateH",
-    "CoderateH",
+    "������ ������ H",
     "CoderateH",
     "CoderateH",
     "CoderateH",
@@ -1631,7 +1631,7 @@ const tI18nPhrase Phrases[] = {
     "Suojaustaso (LP)",
     "CoderateL",
     "CoderateL",
-    "CoderateL",
+    "������ ������ L",
     "CoderateL",
     "CoderateL",
     "CoderateL",
@@ -1652,7 +1652,7 @@ const tI18nPhrase Phrases[] = {
     "Modulaatio",
     "Modulacja",
     "Modulation",
-    "Modulation",
+    "����������",
     "Modulation",
     "Modula�ie",
     "Modulation",
@@ -1673,7 +1673,7 @@ const tI18nPhrase Phrases[] = {
     "Transmissio",
     "Transmisja",
     "Transmission",
-    "Transmission",
+    "��������",
     "Transmission",
     "Transmisiune",
     "Transmission",
@@ -1694,7 +1694,7 @@ const tI18nPhrase Phrases[] = {
     "Suojav�li",
     "Guard",
     "Guard",
-    "Guard",
+    "���������",
     "Guard",
     "Guard",
     "Guard",
@@ -1948,7 +1948,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava on ajastimen k�yt�ss�!",
     "Kanal jest zajety przez timer nagran",
     "�Canal est� ocupado por un timer!",
-    "�� ������ ��������������� ��� �������������!",
+    "�� ������ ��������������� ��� �������������������!",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
     "Csatorn�t m�s haszn�lja!",
@@ -2053,7 +2053,7 @@ const tI18nPhrase Phrases[] = {
     "*** Virheellinen kanavavalinta! ***",
     "*** Niewazny kanal ***",
     "*** Canal inv�lido ***",
-    "*** ����� ������ ***",
+    "*** ����� ������ ***",
     "*** Felaktig kanal ***",
     "*** Canal invalid ***",
     "*** �rv�nytelen csatorna ***",
@@ -2347,7 +2347,7 @@ const tI18nPhrase Phrases[] = {
     "CA-moduulin palautus alkutilaan ep�onnistui!",
     "Nieudany CAM-Reset!",
     "�No puedo reiniciar la CAM!",
-    "������� �� ����� ��������� ��� CAM",
+    "������� � ��������� ��� CAM",
     "Kan inte �terst�lla CAM!",
     "Nu pot reseta CAM",
     "A CAM-Reset nem siker�lt",
@@ -2368,7 +2368,7 @@ const tI18nPhrase Phrases[] = {
     "CA-moduuli palautettu alkutilaan",
     "CAM-Reset wykonany",
     "CAM reiniciada",
-    "��� CAM ����� ���������",
+    "����� ��������� ��� CAM",
     "CA modulen har �terst�llts",
     "CAM-ul a fost resetat",
     "A CAM vissza lett �ll�tva",
@@ -2410,7 +2410,7 @@ const tI18nPhrase Phrases[] = {
     "��nen kieli ei ole valittavissa!",
     "",//TODO
     "",//TODO
-    "���������� ����",
+    "�� ���������� ����",
     "Ljud saknas!"
     "Lipse�te sunetul!",
     "",//TODO
@@ -2453,7 +2453,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmaopas",
     "EPG",
     "Gu�a de Programaci�n",
-    "������ ������������",
+    "������������ ������ ������������",
     "EPG",
     "EPG",
     "EPG",
@@ -2558,7 +2558,7 @@ const tI18nPhrase Phrases[] = {
     "Toisto",
     "Odtwarzanie",
     "Opciones de Reproducci�n",
-    "�����������",
+    "�����������",
     "Uppspelning",
     "Redare",
     "Lej�tsz�s",
@@ -2600,7 +2600,7 @@ const tI18nPhrase Phrases[] = {
     "Laajennokset",
     "Plugins",
     "Plugins",
-    "�������",
+    "����������",
     "Moduler",
     "Plugin-uri",
     "Plugins",
@@ -2621,7 +2621,7 @@ const tI18nPhrase Phrases[] = {
     "Laajennos",
     "Plugin",
     "Plugin",
-    "�����",
+    "��������",
     "Modul",
     "Plugin (modul adi�ional)",
     "Plugin",
@@ -2968,6 +2968,27 @@ const tI18nPhrase Phrases[] = {
     "Kanaliteate n�itamine",
     "Info ved kanalskift",
   },
+  { "Setup.OSD$Timeout requested channel info",
+    "Angeforderte Kanalinfo schlie�en",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
     "Drsni meni",
@@ -2979,7 +3000,7 @@ const tI18nPhrase Phrases[] = {
     "Valikoiden vieritys sivuttain",
     "Przesuwac stronami",
     "Desplazar p�gina entera",
-    "������ �������",
+    "������ �������",
     "Bl�ddra sidor",
     "Deruleaz� pagini",
     "Oldalank�nt l�ptetmi",
@@ -3000,7 +3021,7 @@ const tI18nPhrase Phrases[] = {
     "Valikoiden vieritys ymp�ri",
     "",// TODO
     "",// TODO
-    "������ ����-����",
+    "������ ����-����",
     "Rulla texten",
     "Derulare circular�",
     "",// TODO
@@ -3021,7 +3042,7 @@ const tI18nPhrase Phrases[] = {
     "J�rjest� ajastimet",
     "Sortowanie timerow",
     "Ordenar timers",
-    "�������� ����������������",
+    "�������� ��������������������",
     "Sortera timers",
     "Sortare timer-e",
     "A beprogramozott felv�telek elrendez�se",
@@ -3063,7 +3084,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmaoppaan taustap�ivitys (h)",
     "Czas do skanu EPG (h)",
     "Tiempo hasta exploraci�n EPG (h)",
-    "������ ����� ������� EPG �� ����",
+    "������ ��������� �������� EPG �� ����",
     "EPG s�kning timeout",
     "Interval achizi�ie EPG (h)",
     "Fennmaradt id� az EPG-g (h)",
@@ -3084,7 +3105,7 @@ const tI18nPhrase Phrases[] = {
     "Ohjelmaoppaan korjaustaso",
     "Poziom bledow EPG",
     "Nivel para arreglar EPG",
-    "������ ��������� ������ EPG",
+    "������ ��������� ������ EPG",
     "Niv� f�r EPG bugfix",
     "Nivel corec�ie EPG",
     "EPG hibaelh�r�t�s",
@@ -3105,7 +3126,7 @@ const tI18nPhrase Phrases[] = {
     "Vanha tieto n�kyy (min)",
     "",// TODO
     "",// TODO
-    "�������� ������������ ����������� (�����)",
+    "������� ������������ ����������� (�����)",
     "Visa gammal information (min)",
     "Date EPG expirate cel mult (min)",
     "",// TODO
@@ -3168,7 +3189,7 @@ const tI18nPhrase Phrases[] = {
     "Suosikkikielet",
     "",// TODO
     "",// TODO
-    "������������ ������",
+    "������������� �������",
     "�nskade spr�k",
     "Limbi preferate",
     "",// TODO
@@ -3189,7 +3210,7 @@ const tI18nPhrase Phrases[] = {
     "Suosikkikieli",
     "",// TODO
     "",// TODO
-    "����������� �����",
+    "������������ ������",
     "�nskat spr�k",
     "Limba preferat�",
     "",// TODO
@@ -3231,7 +3252,7 @@ const tI18nPhrase Phrases[] = {
     "N�ytt�muoto",
     "",//TODO
     "",//TODO
-    "����� ��������� ������",
+    "����� ����������� ������",
     "Format f�r video display",
     "Formatul red�rii video",
     "",//TODO
@@ -3336,7 +3357,7 @@ const tI18nPhrase Phrases[] = {
     "K�yt� Dolby Digital -��nt�",
     "",//TODO
     "",//TODO
-    "������������� ���� Dolby Digital",
+    "����� ���� Dolby Digital",
     "Anv�nd Dolby Digital",
     "Sunet Dolby Digital",
     "",//TODO
@@ -3357,7 +3378,7 @@ const tI18nPhrase Phrases[] = {
     "P�ivit� kanavat",
     "",// TODO
     "",// TODO
-    "�������� ��������",
+    "��������� ��������",
     "Uppdatera kanaler",
     "Actualizare canale",
     "",// TODO
@@ -3378,7 +3399,7 @@ const tI18nPhrase Phrases[] = {
     "vain nimet",
     "",// TODO
     "",// TODO
-    "���� �����",
+    "���� �������",
     "bara namn",
     "doar numele",
     "",// TODO
@@ -3399,7 +3420,7 @@ const tI18nPhrase Phrases[] = {
     "nimet ja PID:it",
     "",// TODO
     "",// TODO
-    "����� ��� PID",
+    "������� ��� PIDs",
     "namn och PID",
     "nume si PID-uri",
     "",// TODO
@@ -3420,7 +3441,7 @@ const tI18nPhrase Phrases[] = {
     "uudet kanavat",
     "",// TODO
     "",// TODO
-    "�������� ���� ��������",
+    "�������� ���� ��������",
     "l�gg till nya kanaler",
     "ad�ugare canale noi",
     "",// TODO
@@ -3441,7 +3462,7 @@ const tI18nPhrase Phrases[] = {
     "uudet transponderit",
     "",// TODO
     "",// TODO
-    "�������� ���� transponder",
+    "�������� ���� �����������",
     "l�gg till nya transponders",
     "ad�ugare transpondere noi",
     "",// TODO
@@ -3462,7 +3483,7 @@ const tI18nPhrase Phrases[] = {
     "��nen kielet",
     "",//TODO
     "",//TODO
-    "������ ����",
+    "������� ����",
     "Antal ljudspr�k",
     "Limbi sunet",
     "",//TODO
@@ -3483,7 +3504,7 @@ const tI18nPhrase Phrases[] = {
     "��nen kieli",
     "",//TODO
     "",//TODO
-    "����� ����",
+    "������ ����",
     "Ljudspr�k",
     "Limba sunetului",
     "",//TODO
@@ -3609,7 +3630,7 @@ const tI18nPhrase Phrases[] = {
     "Aloitusmarginaali (min)",
     "Poczatkowy czas buforowy (min)",
     "Comenzar grabaci�n antes (min)",
-    "��������� ������ ���� ���� (�����)",
+    "��������� ������ ���� ���� (�����)",
     "Marginal f�r start (min)",
     "Marj� la pornire (min)",
     "Id�eltol�d�s a kezd�sn�l (min)",
@@ -3672,7 +3693,7 @@ const tI18nPhrase Phrases[] = {
     "Tallenteen oletusprioriteetti",
     "Priorytet pierwotny",
     "Prioridad predefinida",
-    "�������������",
+    "�������������� �������������",
     "Normal prioritet",
     "Prioritate implicit�",
     "Default priority",
@@ -3798,7 +3819,7 @@ const tI18nPhrase Phrases[] = {
     "VPS-toiminnon aloitusmarginaali (s)",
     "",// TODO
     "",// TODO
-    "��������� VPS (�)",
+    "��������� VPS (�)",
     "VPS marginal (s)",
     "Marj� de timp la utilizare VPS (s)",
     "",// TODO
@@ -4104,26 +4125,48 @@ const tI18nPhrase Phrases[] = {
     "ManTirOnsTorFreL�rS�n",
   },
   // The allowed characters in strings:
-  { " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
-    " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~",
-    " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~",
-    " a�bcde��fghi�jklmnopqrstu�vwxyz0123456789-.#~",
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~����������",
-    "",// TODO
-    " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~",
-    "",// TODO
-    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~",
-    " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~",
-    " ��������������������������������0123456789-.#~abcdefghijklmnopqrstuvwxyz",
-    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
-    " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~",
-    " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~",
-    " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~_�",
-    " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~",
-    " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~", // hrv
-    " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~",
-    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~",
+  { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
+    " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@",
+    " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@",
+    " a�bcde��fghi�jklmnopqrstu�vwxyz0123456789-.#~,/_@",
+    " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������",
+    "",// TODO
+    " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@",
+    "",// TODO
+    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
+    " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
+    " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@",
+    " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz",
+    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
+    " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@",
+    " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~,/_@",
+    " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~,/_@�",
+    " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@",
+    " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@", // hrv
+    " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~,/_@",
+    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
+  },
+  // The character maps for entering letters via the numeric keys:
+  { " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
+    " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -4221,7 +4264,7 @@ const tI18nPhrase Phrases[] = {
     "�l� paina kaukos��timen n�pp�imi�...",
     "Nie naciskac klawiszy...",
     "No pulse ninguna tecla...",
-    "��� ������� �������...",
+    "��� ����� �������...",
     "Tryck inte p� n�gon knapp...",
     "Nu ap�sa�i nici o tast�...",
     "Ne nyomjon meg gombot...",
@@ -4368,7 +4411,7 @@ const tI18nPhrase Phrases[] = {
     "n�pp�imen puuttuessa paina 'Valikko'",
     "(Nacisnac 'Menu' by ominac klawisz)",
     "Pulse 'Menu' para saltarse esta tecla",
-    "���� '�����' ��� ���������� ����� ��� ��������",
+    "����� '�����' ��� ���������� ����� ��� ��������",
     "(Tryck 'Meny' f�r att hoppa �ver knappen.)",
     "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�",
     "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
@@ -4389,7 +4432,7 @@ const tI18nPhrase Phrases[] = {
     "Vaihe 3: N�pp�inkoodien tallentaminen",
     "Faza 3: Zapamietac Kod",
     "Fase 3: Guardar c�digos de teclas",
-    "���� 3: ���������� �������",
+    "���� 3: ���������� �������",
     "Fas 3: Spara knappkoder",
     "Faza 3: Salvarea codurilor de taste",
     "Harmadik l�p�s: k�d ment�se",
@@ -4410,7 +4453,7 @@ const tI18nPhrase Phrases[] = {
     "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi",
     "'Gora' zapamietuje, 'Dol' przerywa",
     "Pulse 'Arriba' para guardar, 'Abajo' para anular",
-    "'����' ����������, '����' �������",
+    "����� '����' ��� ����������, '����' ��� �������",
     "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta.",
     "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare",
     "'Fel' ment�s, 'Le� m�gse",
@@ -4421,7 +4464,7 @@ const tI18nPhrase Phrases[] = {
     "Tryk 'Op' for at gemme, 'Ned' for at annullere",
   },
   // Key names:
-  { "Up",
+  { "Key$Up",
     "Auf",
     "Gor",
     "Su",
@@ -4442,7 +4485,7 @@ const tI18nPhrase Phrases[] = {
     "�les",
     "Op",
   },
-  { "Down",
+  { "Key$Down",
     "Ab",
     "Dol",
     "Gi�",
@@ -4463,7 +4506,7 @@ const tI18nPhrase Phrases[] = {
     "Alla",
     "Ned",
   },
-  { "Menu",
+  { "Key$Menu",
     "Men�",
     "Meni",
     "Men�",
@@ -4484,7 +4527,7 @@ const tI18nPhrase Phrases[] = {
     "Men��",
     "Menu",
   },
-  { "Ok",
+  { "Key$Ok",
     "Ok",
     "Ok",
     "Ok",
@@ -4505,7 +4548,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
   },
-  { "Back",
+  { "Key$Back",
     "Zur�ck",
     "Nazaj",
     "Indietro",
@@ -4526,7 +4569,7 @@ const tI18nPhrase Phrases[] = {
     "Tagasi",
     "Tilbage",
   },
-  { "Left",
+  { "Key$Left",
     "Links",
     "Levo",
     "Sinistra",
@@ -4547,7 +4590,7 @@ const tI18nPhrase Phrases[] = {
     "Vasakule",
     "Venstre",
   },
-  { "Right",
+  { "Key$Right",
     "Rechts",
     "Desno",
     "Destra",
@@ -4568,7 +4611,7 @@ const tI18nPhrase Phrases[] = {
     "Paremale",
     "H�jre",
   },
-  { "Red",
+  { "Key$Red",
     "Rot",
     "Rde�a",
     "Rosso",
@@ -4589,7 +4632,7 @@ const tI18nPhrase Phrases[] = {
     "Punane",
     "R�d",
   },
-  { "Green",
+  { "Key$Green",
     "Gr�n",
     "Zelena",
     "Verde",
@@ -4610,7 +4653,7 @@ const tI18nPhrase Phrases[] = {
     "Roheline",
     "Gr�n",
   },
-  { "Yellow",
+  { "Key$Yellow",
     "Gelb",
     "Rumena",
     "Giallo",
@@ -4631,7 +4674,7 @@ const tI18nPhrase Phrases[] = {
     "Kollane",
     "Gul",
   },
-  { "Blue",
+  { "Key$Blue",
     "Blau",
     "Modra",
     "Blu",
@@ -4652,7 +4695,28 @@ const tI18nPhrase Phrases[] = {
     "Sinine",
     "Bl�",
   },
-  { "Play",
+  { "Key$Info",
+    "Info",
+    "Info",
+    "",//TODO
+    "Info",
+    "",//TODO
+    "Info",
+    "",//TODO
+    "Tiedot",
+    "",//TODO
+    "",//TODO
+    "�����������",
+    "Info",
+    "Info",
+    "",//TODO
+    "",//TODO
+    "����",
+    "Info",
+    "Info",
+    "Info",
+  },
+  { "Key$Play",
     "Wiedergabe",
     "Predvajaj",
     "Riproduci",
@@ -4663,7 +4727,7 @@ const tI18nPhrase Phrases[] = {
     "Toista",
     "Odtworzenie",
     "Reproducir",
-    "A����������",
+    "�����������",
     "Spela upp",
     "Redare",
     "Lej�tsz�s",
@@ -4673,7 +4737,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Afspil",
   },
-  { "Pause",
+  { "Key$Pause",
     "Pause",
     "Pavza",
     "Pausa",
@@ -4684,7 +4748,7 @@ const tI18nPhrase Phrases[] = {
     "Tauko",
     "Przerwa",
     "Pausa",
-    "���������",
+    "�����",
     "Pausa",
     "Pauz�",
     "Sz�net",
@@ -4694,7 +4758,7 @@ const tI18nPhrase Phrases[] = {
     "Paus",
     "Pause",
   },
-  { "Stop",
+  { "Key$Stop",
     "Stop",
     "Ustavi",
     "Stop",
@@ -4715,7 +4779,7 @@ const tI18nPhrase Phrases[] = {
     "Stopp",
     "Stop",
   },
-  { "Record",
+  { "Key$Record",
     "Aufnehmen",
     "Snemaj",
     "Registra",
@@ -4736,7 +4800,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine",
     "Optag",
   },
-  { "FastFwd",
+  { "Key$FastFwd",
     "Vorlauf",
     "Hitro naprej",
     "Avanti Veloce",
@@ -4747,7 +4811,7 @@ const tI18nPhrase Phrases[] = {
     "Pikakelaus >>",
     "Naprzod",
     "Adelante r�pido",
-    "�������� ������",
+    "�������� ������",
     "Snabbspolning fram�t",
     "Derulare �nainte",
     "El�re p�rgetni",
@@ -4757,7 +4821,7 @@ const tI18nPhrase Phrases[] = {
     "Edasikerimine",
     "Spol fremad",
   },
-  { "FastRew",
+  { "Key$FastRew",
     "R�cklauf",
     "Hitro nazaj",
     "Indietro Veloce",
@@ -4768,7 +4832,7 @@ const tI18nPhrase Phrases[] = {
     "Pikakelaus <<",
     "Wstecz",
     "Atr�s r�pido",
-    "�������� ����",
+    "�������� ����",
     "Snabbspolning bak�t",
     "Derulare �napoi",
     "Vissza p�rgetni",
@@ -4778,7 +4842,7 @@ const tI18nPhrase Phrases[] = {
     "Tagasikerimine",
     "Spol tilbage",
   },
-  { "Power",
+  { "Key$Power",
     "Ausschalten",
     "Izklop",
     "Power",
@@ -4799,7 +4863,7 @@ const tI18nPhrase Phrases[] = {
     "Toide",
     "Sluk",
   },
-  { "Channel+",
+  { "Key$Channel+",
     "Kanal+",
     "Program+",
     "Canale +",
@@ -4820,7 +4884,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal+",
     "Kanal+",
   },
-  { "Channel-",
+  { "Key$Channel-",
     "Kanal-",
     "Program-",
     "Canale -",
@@ -4831,7 +4895,7 @@ const tI18nPhrase Phrases[] = {
     "Kanava -",
     "Kanal-",
     "Canal -",
-    "������-",
+    "������-",
     "Kanal-",
     "Canal-",
     "Csatorna-",
@@ -4841,7 +4905,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal-",
     "Kanal-",
   },
-  { "Volume+",
+  { "Key$Volume+",
     "Lautst�rke+",
     "Glasnost+",
     "Volume +",
@@ -4862,7 +4926,7 @@ const tI18nPhrase Phrases[] = {
     "Helitugevus+",
     "Lydstyrke+",
   },
-  { "Volume-",
+  { "Key$Volume-",
     "Lautst�rke-",
     "Glasnost-",
     "Volume -",
@@ -4883,7 +4947,7 @@ const tI18nPhrase Phrases[] = {
     "Helitugevus-",
     "Lydstyrke-",
   },
-  { "Mute",
+  { "Key$Mute",
     "Stumm",
     "Izklop zvoka",
     "Mute",
@@ -4904,7 +4968,7 @@ const tI18nPhrase Phrases[] = {
     "H��letu",
     "Sluk lyd",
   },
-  { "Audio",
+  { "Key$Audio",
     "Audio",
     "Zvok",
     "",// TODO
@@ -5105,7 +5169,7 @@ const tI18nPhrase Phrases[] = {
     "vapaana",
     "pozostalo",
     "libre",
-    "����",
+    "���������",
     "ledigt",
     "liber",
     "szabad",
@@ -5168,7 +5232,7 @@ const tI18nPhrase Phrases[] = {
     " Lopeta toisto",
     " Zatrzymac odtwarzanie",
     " Parar reproduci�n",
-    " ����� ������������",
+    " ����� ������������",
     " Avsluta uppspelning",
     " Opre�te redarea",
     " Lej�tsz�st befejzni",
@@ -5273,7 +5337,7 @@ const tI18nPhrase Phrases[] = {
     "Muokkaus aloitettu",
     "Uruchomiony proces montazu",
     "Proceso modificaci�n iniciado",
-    "���� ������������",
+    "������ � �����������",
     "Redigeringen startar",
     "Montajul �nregistr�rii a �nceput",
     "V�g�s elind�tva",
@@ -5325,26 +5389,26 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimine eba�nnestus",
     "Redigeringsproces fejlede!",
   },
-  { "scanning recordings...",
-    "Aufzeichnungen werden durchsucht...",
-    "iskanje posnetkov...",
-    "scansione registrazioni...",
-    "Doorzoeken opnames...",
-    "A pesquisar grava��es...",
-    "Recherche des enregistrements...",
-    "G�r igjennom opptakene...",
-    "haetaan tallenteita...",
-    "Skan nagran...",
-    "buscando grabaciones...",
-    "������� ��������...",
-    "S�ker igenom inspelningarna...",
-    "Caut �nregistr�ri...",
-    "Felvett ad�sok b�ng�sz�se...",
-    "cercant gravacions...",
-    "������������ �������...",
-    "pretra�ivanje snimljenog...",
-    "salvestuste skaneerimine...",
-    "skanner optagelser...",
+  { "Recording started",
+    "Aufzeichnung gestartet",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -5357,7 +5421,7 @@ const tI18nPhrase Phrases[] = {
     "Pys�ytet��n l�hetys...",
     "Zatrzymany program biezacy...",
     "Emisi�n en directo parada...",
-    "��������� �������� �������",
+    "������ �������� �������",
     "Pausar direktinspelningen",
     "Trec �n pauz� emisiunea transmis�...",
     "Az �l� ad�s meg�ll�tva...",
@@ -5399,7 +5463,7 @@ const tI18nPhrase Phrases[] = {
     "T�ll� laajennoksella ei ole asetuksia!",
     "Ten plugin niema parametrow!",
     "Este plugin no admite configuraci�n",
-    "���� �� ����� ��� ���� �����������",
+    "���� � �������� ��� ���� �����������!",
     "Den h�r modulen har inga parametrar",
     "Acest plugin nu se configureaz�!",
     "Ennek a plugin-nak nincs setup-parametere!",
@@ -5462,7 +5526,7 @@ const tI18nPhrase Phrases[] = {
     "Ei esityst�",
     "",// TODO
     "",// TODO
-    "��� �����",
+    "����� �����",
     "ingen titel",
     "F�r� titlu",
     "",// TODO
diff --git a/interface.c b/interface.c
index 560847844..b2e842daa 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.70 2005/11/27 15:31:06 kls Exp $
+ * $Id: interface.c 1.71 2006/01/04 15:44:19 kls Exp $
  */
 
 #include "interface.h"
@@ -84,7 +84,9 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
      eKeys NewKey = kUp;
      while (NewKey != kNone) {
            char *Prompt;
-           asprintf(&Prompt, tr("Press key for '%s'"), tr(cKey::ToString(NewKey)));
+           char buf[32];
+           snprintf(buf, sizeof(buf), "Key$%s", cKey::ToString(NewKey));
+           asprintf(&Prompt, tr("Press key for '%s'"), tr(buf));
            DisplayMenu->SetItem(Prompt, 4, false, false);
            free(Prompt);
            cRemote::Clear();
diff --git a/keymacros.conf b/keymacros.conf
index 42cddc26e..4b74542e4 100644
--- a/keymacros.conf
+++ b/keymacros.conf
@@ -9,4 +9,5 @@
 
 Red       Recordings
 Green     Schedule
+Yellow    Info
 Blue      Timers
diff --git a/keys.c b/keys.c
index 57b4f13ee..4215d7be0 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.9 2005/09/17 11:27:40 kls Exp $
+ * $Id: keys.c 1.10 2006/01/05 15:39:26 kls Exp $
  */
 
 #include "keys.h"
@@ -32,6 +32,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { k7,             "7"          },
                     { k8,             "8"          },
                     { k9,             "9"          },
+                    { kInfo,          "Info"       },
                     { kPlay,          "Play"       },
                     { kPause,         "Pause"      },
                     { kStop,          "Stop"       },
diff --git a/keys.h b/keys.h
index 09b2c8be0..73e061e3d 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.6 2004/12/27 11:10:59 kls Exp $
+ * $Id: keys.h 1.7 2006/01/05 15:39:06 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -26,6 +26,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kYellow,
              kBlue,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+             kInfo,
              kPlay,
              kPause,
              kStop,
diff --git a/menu.c b/menu.c
index 0bb7598be..e21f230ba 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.376 2005/11/05 17:29:22 kls Exp $
+ * $Id: menu.c 1.390 2006/01/08 11:39:57 kls Exp $
  */
 
 #include "menu.h"
@@ -31,6 +31,7 @@
 
 #define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
+#define DISKSPACECHEK     5 // seconds between disk space checks in the main menu
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
@@ -41,28 +42,25 @@
 // --- cMenuEditCaItem -------------------------------------------------------
 
 class cMenuEditCaItem : public cMenuEditIntItem {
-private:
-  const cCaDefinition *ca;
-  bool allowCardNr;
 protected:
   virtual void Set(void);
 public:
-  cMenuEditCaItem(const char *Name, int *Value, bool AllowCardNr = false);
+  cMenuEditCaItem(const char *Name, int *Value);
   eOSState ProcessKey(eKeys Key);
   };
 
-cMenuEditCaItem::cMenuEditCaItem(const char *Name, int *Value, bool AllowCardNr)
+cMenuEditCaItem::cMenuEditCaItem(const char *Name, int *Value)
 :cMenuEditIntItem(Name, Value, 0)
 {
-  ca = CaDefinitions.Get(*Value);
-  allowCardNr = AllowCardNr;
   Set();
 }
 
 void cMenuEditCaItem::Set(void)
 {
-  if (ca)
-     SetValue(ca->Description());
+  if (*value == CA_FTA)
+     SetValue(tr("Free To Air"));
+  else if (*value >= CA_ENCRYPTED_MIN)
+     SetValue(tr("encrypted"));
   else
      cMenuEditIntItem::Set();
 }
@@ -72,18 +70,8 @@ eOSState cMenuEditCaItem::ProcessKey(eKeys Key)
   eOSState state = cMenuEditItem::ProcessKey(Key);
 
   if (state == osUnknown) {
-     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        if (ca && ca->Prev()) {
-           ca = (cCaDefinition *)ca->Prev();
-           *value = ca->Number();
-           }
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (ca && ca->Next() && (allowCardNr || ((cCaDefinition *)ca->Next())->Number() > MAXDEVICES)) {
-           ca = (cCaDefinition *)ca->Next();
-           *value = ca->Number();
-           }
-        }
+     if (NORMALKEY(Key) == kLeft && *value >= CA_ENCRYPTED_MIN)
+        *value = CA_FTA;
      else
         return cMenuEditIntItem::ProcessKey(Key);
      Set();
@@ -265,7 +253,7 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpids[0], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpids[1], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
-  Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0], true));//XXX
+  Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0]));
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 1, 0xFFFF));
   /* XXX not yet used
   Add(new cMenuEditIntItem( tr("Nid"),          &data.nid, 0));
@@ -380,12 +368,17 @@ void cMenuChannelItem::Set(void)
 
 // --- cMenuChannels ---------------------------------------------------------
 
+#define CHANNELNUMBERTIMEOUT 1000 //ms
+
 class cMenuChannels : public cOsdMenu {
 private:
+  int number;
+  cTimeMs numberTimer;
   void Setup(void);
   cChannel *GetChannel(int Index);
   void Propagate(void);
 protected:
+  eOSState Number(eKeys Key);
   eOSState Switch(void);
   eOSState Edit(void);
   eOSState New(void);
@@ -400,6 +393,7 @@ class cMenuChannels : public cOsdMenu {
 cMenuChannels::cMenuChannels(void)
 :cOsdMenu(tr("Channels"), CHNUMWIDTH)
 {
+  number = 0;
   Setup();
   Channels.IncBeingEdited();
 }
@@ -427,7 +421,7 @@ void cMenuChannels::Setup(void)
   if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
      Sort();
   SetCurrent(currentItem);
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber ? tr("Mark") : NULL);
+  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), tr("Button$Mark"));
   Display();
 }
 
@@ -446,6 +440,30 @@ void cMenuChannels::Propagate(void)
   Channels.SetModified(true);
 }
 
+eOSState cMenuChannels::Number(eKeys Key)
+{
+  if (HasSubMenu())
+     return osContinue;
+  if (numberTimer.TimedOut())
+     number = 0;
+  if (!number && Key == k0) {
+     cMenuChannelItem::IncSortMode();
+     Setup();
+     }
+  else {
+     number = number * 10 + Key - k0;
+     for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next()) {
+         if (!ci->Channel()->GroupSep() && ci->Channel()->Number() == number) {
+            SetCurrent(ci);
+            Display();
+            break;
+            }
+         }
+     numberTimer.Set(CHANNELNUMBERTIMEOUT);
+     }
+  return osContinue;
+}
+
 eOSState cMenuChannels::Switch(void)
 {
   if (HasSubMenu())
@@ -530,14 +548,13 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
     default:
          if (state == osUnknown) {
             switch (Key) {
-              case k0:      cMenuChannelItem::IncSortMode();
-                            Setup();
-                            break;
+              case k0 ... k9:
+                            return Number(Key);
               case kOk:     return Switch();
               case kRed:    return Edit();
               case kGreen:  return New();
               case kYellow: return Delete();
-              case kBlue:   if (!HasSubMenu() && cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber)
+              case kBlue:   if (!HasSubMenu())
                                Mark();
                             break;
               default: break;
@@ -771,7 +788,7 @@ cMenuTimers::cMenuTimers(void)
       Add(new cMenuTimerItem(timer));
   if (Setup.SortTimers)
      Sort();
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? tr("On/Off") : tr("Mark"));
+  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), Setup.SortTimers ? tr("Button$On/Off") : tr("Button$Mark"));
   Timers.IncBeingEdited();
 }
 
@@ -897,7 +914,9 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
      cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
      if (channel) {
         SetTitle(channel->Name());
-        SetHelp(tr("Record"), NULL, NULL, CanSwitch ? tr("Switch") : NULL);
+        int TimerMatch = tmNone;
+        Timers.GetMatch(event, &TimerMatch);
+        SetHelp(TimerMatch == tmFull ? tr("Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
         }
      }
 }
@@ -939,36 +958,59 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuWhatsOnItem ------------------------------------------------------
+// --- cMenuScheduleItem -----------------------------------------------------
 
-class cMenuWhatsOnItem : public cOsdItem {
+class cMenuScheduleItem : public cOsdItem {
 public:
   const cEvent *event;
   const cChannel *channel;
-  cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel);
+  int timerMatch;
+  cMenuScheduleItem(const cEvent *Event, cChannel *Channel = NULL);
+  bool Update(bool Force = false);
 };
 
-cMenuWhatsOnItem::cMenuWhatsOnItem(const cEvent *Event, cChannel *Channel)
+cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event, cChannel *Channel)
 {
   event = Event;
   channel = Channel;
-  char *buffer = NULL;
-  int TimerMatch;
-  char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
-  char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
-  char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), *event->GetTimeString(), t, v, r, event->Title());
-  SetText(buffer, false);
+  timerMatch = tmNone;
+  Update(true);
+}
+
+static char *TimerMatchChars = " tT";
+
+bool cMenuScheduleItem::Update(bool Force)
+{
+  bool result = false;
+  int OldTimerMatch = timerMatch;
+  Timers.GetMatch(event, &timerMatch);
+  if (Force || timerMatch != OldTimerMatch) {
+     char *buffer = NULL;
+     char t = TimerMatchChars[timerMatch];
+     char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
+     char r = event->IsRunning() ? '*' : ' ';
+     if (channel)
+        asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), *event->GetTimeString(), t, v, r, event->Title());
+     else
+        asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
+     SetText(buffer, false);
+     result = true;
+     }
+  return result;
 }
 
 // --- cMenuWhatsOn ----------------------------------------------------------
 
 class cMenuWhatsOn : public cOsdMenu {
 private:
+  bool now;
+  int helpKeys;
   eOSState Record(void);
   eOSState Switch(void);
   static int currentChannel;
   static const cEvent *scheduleEvent;
+  bool Update(void);
+  void SetHelpKeys(void);
 public:
   cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr);
   static int CurrentChannel(void) { return currentChannel; }
@@ -983,18 +1025,47 @@ const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
 :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6, 4)
 {
+  now = Now;
+  helpKeys = -1;
   for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
       if (!Channel->GroupSep()) {
          const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
          if (Schedule) {
             const cEvent *Event = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
             if (Event)
-               Add(new cMenuWhatsOnItem(Event, Channel), Channel->Number() == CurrentChannelNr);
+               Add(new cMenuScheduleItem(Event, Channel), Channel->Number() == CurrentChannelNr);
             }
          }
       }
   currentChannel = CurrentChannelNr;
-  SetHelp(Count() ? tr("Record") : NULL, Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
+  SetHelpKeys();
+}
+
+bool cMenuWhatsOn::Update(void)
+{
+  bool result = false;
+  for (cOsdItem *item = First(); item; item = Next(item)) {
+      if (((cMenuScheduleItem *)item)->Update())
+         result = true;
+      }
+  return result;
+}
+
+void cMenuWhatsOn::SetHelpKeys(void)
+{
+  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
+  int NewHelpKeys = 0;
+  if (item) {
+     if (item->timerMatch == tmFull)
+        NewHelpKeys = 2;
+     else
+        NewHelpKeys = 1;
+     }
+  if (NewHelpKeys != helpKeys) {
+     const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
+     SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
+     helpKeys = NewHelpKeys;
+     }
 }
 
 const cEvent *cMenuWhatsOn::ScheduleEvent(void)
@@ -1006,7 +1077,7 @@ const cEvent *cMenuWhatsOn::ScheduleEvent(void)
 
 eOSState cMenuWhatsOn::Switch(void)
 {
-  cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
+  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
      cChannel *channel = Channels.GetByChannelID(item->event->ChannelID(), true);
      if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
@@ -1018,21 +1089,39 @@ eOSState cMenuWhatsOn::Switch(void)
 
 eOSState cMenuWhatsOn::Record(void)
 {
-  cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
+  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
+     if (item->timerMatch == tmFull) {
+        int tm = tmNone;
+        cTimer *timer = Timers.GetMatch(item->event, &tm);
+        if (timer)
+           return AddSubMenu(new cMenuEditTimer(timer));
+        }
      cTimer *timer = new cTimer(item->event);
      cTimer *t = Timers.GetTimer(timer);
      if (t) {
         delete timer;
         timer = t;
+        return AddSubMenu(new cMenuEditTimer(timer));
+        }
+     else {
+        Timers.Add(timer);
+        timer->Matches();
+        Timers.SetModified();
+        isyslog("timer %s added (active)", *timer->ToDescr());
+        if (HasSubMenu())
+           CloseSubMenu();
+        if (Update())
+           Display();
+        SetHelpKeys();
         }
-     return AddSubMenu(new cMenuEditTimer(timer, !t));
      }
   return osContinue;
 }
 
 eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
 {
+  bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1042,7 +1131,7 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
        case kYellow: state = osBack;
                      // continue with kGreen
        case kGreen:  {
-                       cMenuWhatsOnItem *mi = (cMenuWhatsOnItem *)Get(Current());
+                       cMenuScheduleItem *mi = (cMenuScheduleItem *)Get(Current());
                        if (mi) {
                           scheduleEvent = mi->event;
                           currentChannel = mi->channel->Number();
@@ -1051,34 +1140,20 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                      break;
        case kBlue:   return Switch();
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuWhatsOnItem *)Get(Current()))->event, true));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true));
                      break;
        default:      break;
        }
      }
+  else if (!HasSubMenu()) {
+     if (HadSubMenu && Update())
+        Display();
+     if (Key != kNone)
+        SetHelpKeys();
+     }
   return state;
 }
 
-// --- cMenuScheduleItem -----------------------------------------------------
-
-class cMenuScheduleItem : public cOsdItem {
-public:
-  const cEvent *event;
-  cMenuScheduleItem(const cEvent *Event);
-};
-
-cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event)
-{
-  event = Event;
-  char *buffer = NULL;
-  int TimerMatch;
-  char t = Timers.GetMatch(Event, &TimerMatch) ? (TimerMatch == tmFull) ? 'T' : 't' : ' ';
-  char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
-  char r = event->IsRunning() ? '*' : ' ';
-  asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
-  SetText(buffer, false);
-}
-
 // --- cMenuSchedule ---------------------------------------------------------
 
 class cMenuSchedule : public cOsdMenu {
@@ -1087,9 +1162,12 @@ class cMenuSchedule : public cOsdMenu {
   const cSchedules *schedules;
   bool now, next;
   int otherChannel;
+  int helpKeys;
   eOSState Record(void);
   eOSState Switch(void);
   void PrepareSchedule(cChannel *Channel);
+  bool Update(void);
+  void SetHelpKeys(void);
 public:
   cMenuSchedule(void);
   virtual ~cMenuSchedule();
@@ -1101,12 +1179,13 @@ cMenuSchedule::cMenuSchedule(void)
 {
   now = next = false;
   otherChannel = 0;
+  helpKeys = -1;
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel) {
      cMenuWhatsOn::SetCurrentChannel(channel->Number());
      schedules = cSchedules::Schedules(schedulesLock);
      PrepareSchedule(channel);
-     SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"));
+     SetHelpKeys();
      }
 }
 
@@ -1135,17 +1214,61 @@ void cMenuSchedule::PrepareSchedule(cChannel *Channel)
      }
 }
 
+bool cMenuSchedule::Update(void)
+{
+  bool result = false;
+  for (cOsdItem *item = First(); item; item = Next(item)) {
+      if (((cMenuScheduleItem *)item)->Update())
+         result = true;
+      }
+  return result;
+}
+
+void cMenuSchedule::SetHelpKeys(void)
+{
+  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
+  int NewHelpKeys = 0;
+  if (item) {
+     if (item->timerMatch == tmFull)
+        NewHelpKeys = 2;
+     else
+        NewHelpKeys = 1;
+     }
+  if (NewHelpKeys != helpKeys) {
+     const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
+     SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
+     helpKeys = NewHelpKeys;
+     }
+}
+
 eOSState cMenuSchedule::Record(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
+     if (item->timerMatch == tmFull) {
+        int tm = tmNone;
+        cTimer *timer = Timers.GetMatch(item->event, &tm);
+        if (timer)
+           return AddSubMenu(new cMenuEditTimer(timer));
+        }
      cTimer *timer = new cTimer(item->event);
      cTimer *t = Timers.GetTimer(timer);
      if (t) {
         delete timer;
         timer = t;
+        return AddSubMenu(new cMenuEditTimer(timer));
+        }
+     else {
+        Timers.Add(timer);
+        timer->Matches();
+        Timers.SetModified();
+        isyslog("timer %s added (active)", *timer->ToDescr());
+        if (HasSubMenu())
+           CloseSubMenu();
+        if (Update())
+           Display();
+        SetHelpKeys();
         }
-     return AddSubMenu(new cMenuEditTimer(timer, !t));
      }
   return osContinue;
 }
@@ -1162,6 +1285,7 @@ eOSState cMenuSchedule::Switch(void)
 
 eOSState cMenuSchedule::ProcessKey(eKeys Key)
 {
+  bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -1204,11 +1328,15 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
            PrepareSchedule(channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
               otherChannel = channel->Number();
-              SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"), tr("Switch"));
+              SetHelp(Count() ? tr("Button$Record") : NULL, tr("Button$Now"), tr("Button$Next"), tr("Button$Switch"));
               }
            Display();
            }
         }
+     else if (HadSubMenu && Update())
+        Display();
+     if (Key != kNone)
+        SetHelpKeys();
      }
   return state;
 }
@@ -1461,7 +1589,7 @@ cMenuRecording::cMenuRecording(const cRecording *Recording)
 {
   recording = Recording;
   if (recording)
-     SetHelp(tr("Play"), tr("Rewind"));
+     SetHelp(tr("Button$Play"), tr("Button$Rewind"));
 }
 
 void cMenuRecording::Display(void)
@@ -1586,9 +1714,9 @@ void cMenuRecordings::SetHelpKeys(void)
   if (NewHelpKeys != helpKeys) {
      switch (NewHelpKeys) {
        case 0: SetHelp(NULL); break;
-       case 1: SetHelp(tr("Open")); break;
+       case 1: SetHelp(tr("Button$Open")); break;
        case 2:
-       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Info") : NULL);
+       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), NewHelpKeys == 3 ? tr("Info") : NULL);
        }
      helpKeys = NewHelpKeys;
      }
@@ -1876,6 +2004,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Channel info time (s)"),  &data.ChannelInfoTime, 1, 60));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Timeout requested channel info"), &data.TimeoutRequChInfo));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
@@ -1918,7 +2047,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
            themeIndex = d ? themes.GetThemeIndex(d) : 0;
         free(d);
         }
-     
+
      Set();
      Setup.OSDLanguage = OriginalOSDLanguage;
      }
@@ -1943,7 +2072,7 @@ cMenuSetupEPG::cMenuSetupEPG(void)
       ;
   originalNumLanguages = numLanguages;
   SetSection(tr("EPG"));
-  SetHelp(tr("Scan"));
+  SetHelp(tr("Button$Scan"));
   Setup();
 }
 
@@ -2196,7 +2325,7 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
             }
          }
       }
-  SetHelp(tr("Menu"), tr("Reset"));
+  SetHelp(tr("Button$Menu"), tr("Button$Reset"));
 }
 
 eOSState cMenuSetupCICAM::Menu(void)
@@ -2469,14 +2598,19 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 // --- cMenuMain -------------------------------------------------------------
 
 #define STOP_RECORDING tr(" Stop recording ")
-#define ON_PRIMARY_INTERFACE tr("on primary interface")
 
 cOsdObject *cMenuMain::pluginOsdObject = NULL;
 
-cMenuMain::cMenuMain(bool Replaying, eOSState State)
+cMenuMain::cMenuMain(eOSState State)
 :cOsdMenu("")
 {
-  replaying = Replaying;
+  lastDiskSpaceCheck = 0;
+  lastFreeMB = 0;
+  replaying = false;
+  stopReplayItem = NULL;
+  cancelEditingItem = NULL;
+  stopRecordingItem = NULL;
+  recordControlsState = 0;
   Set();
 
   // Initial submenus:
@@ -2502,23 +2636,9 @@ cOsdObject *cMenuMain::PluginOsdObject(void)
 void cMenuMain::Set(void)
 {
   Clear();
-  //XXX //SetTitle("VDR"); // this is done below, including disk usage
+  SetTitle("VDR");
   SetHasHotkeys();
 
-  // Title with disk usage:
-
-#define MB_PER_MINUTE 25.75 // this is just an estimate!
-
-  char buffer[40];
-  int FreeMB;
-  int Percent = VideoDiskSpace(&FreeMB);
-  int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
-  int Hours = Minutes / 60;
-  Minutes %= 60;
-  snprintf(buffer, sizeof(buffer), "%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free"));
-  //XXX -> skin function!!!
-  SetTitle(buffer);
-
   // Basic menu items:
 
   Add(new cOsdItem(hk(tr("Schedule")),   osSchedule));
@@ -2545,37 +2665,82 @@ void cMenuMain::Set(void)
   if (Commands.Count())
      Add(new cOsdItem(hk(tr("Commands")),  osCommands));
 
-  // Replay control:
+  Update(true);
 
-  if (replaying)
-     Add(new cOsdItem(tr(" Stop replaying"), osStopReplay));
+  Display();
+}
 
-  // Record control:
+#define MB_PER_MINUTE 25.75 // this is just an estimate!
 
-  if (cRecordControls::StopPrimary()) {
-     char *buffer = NULL;
-     asprintf(&buffer, "%s%s", STOP_RECORDING, ON_PRIMARY_INTERFACE);
-     Add(new cOsdItem(buffer, osStopRecord));
-     free(buffer);
-     }
+bool cMenuMain::Update(bool Force)
+{
+  bool result = false;
 
-  const char *s = NULL;
-  while ((s = cRecordControls::GetInstantId(s)) != NULL) {
-        char *buffer = NULL;
-        asprintf(&buffer, "%s%s", STOP_RECORDING, s);
-        Add(new cOsdItem(buffer, osStopRecord));
-        free(buffer);
+  // Title with disk usage:
+  if (Force || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK) {
+     int FreeMB;
+     int Percent = VideoDiskSpace(&FreeMB);
+     if (Force || FreeMB != lastFreeMB) {
+        int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+        int Hours = Minutes / 60;
+        Minutes %= 60;
+        char buffer[40];
+        snprintf(buffer, sizeof(buffer), "%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free"));
+        //XXX -> skin function!!!
+        SetTitle(buffer);
+        result = true;
+        }
+     lastDiskSpaceCheck = time(NULL);
+     }
+
+  bool NewReplaying = cControl::Control() != NULL;
+  if (Force || NewReplaying != replaying) {
+     replaying = NewReplaying;
+     // Replay control:
+     if (replaying && !stopReplayItem)
+        Add(stopReplayItem = new cOsdItem(tr(" Stop replaying"), osStopReplay));
+     else if (stopReplayItem && !replaying) {
+        Del(stopReplayItem->Index());
+        stopReplayItem = NULL;
         }
+     // Color buttons:
+     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : NULL);
+     result = true;
+     }
 
   // Editing control:
+  bool CutterActive = cCutter::Active();
+  if (CutterActive && !cancelEditingItem) {
+     Add(cancelEditingItem = new cOsdItem(tr(" Cancel editing"), osCancelEdit));
+     result = true;
+     }
+  else if (cancelEditingItem && !CutterActive) {
+     Del(cancelEditingItem->Index());
+     cancelEditingItem = NULL;
+     result = true;
+     }
 
-  if (cCutter::Active())
-     Add(new cOsdItem(tr(" Cancel editing"), osCancelEdit));
-
-  // Color buttons:
+  // Record control:
+  if (cRecordControls::StateChanged(recordControlsState)) {
+     while (stopRecordingItem) {
+           cOsdItem *it = Next(stopRecordingItem);
+           Del(stopRecordingItem->Index());
+           stopRecordingItem = it;
+           }
+     const char *s = NULL;
+     while ((s = cRecordControls::GetInstantId(s)) != NULL) {
+           char *buffer = NULL;
+           asprintf(&buffer, "%s%s", STOP_RECORDING, s);
+           cOsdItem *item = new cOsdItem(osStopRecord);
+           item->SetText(buffer, false);
+           Add(item);
+           if (!stopRecordingItem)
+              stopRecordingItem = item;
+           }
+     result = true;
+     }
 
-  SetHelp(!replaying ? tr("Record") : NULL, tr("Audio"), replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
-  Display();
+  return result;
 }
 
 eOSState cMenuMain::ProcessKey(eKeys Key)
@@ -2595,11 +2760,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
                           cOsdItem *item = Get(Current());
                           if (item) {
-                             const char *s = item->Text() + strlen(STOP_RECORDING);
-                             if (strcmp(s, ON_PRIMARY_INTERFACE) == 0)
-                                cRecordControls::StopPrimary(true);
-                             else
-                                cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
+                             cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
                              return osEnd;
                              }
                           }
@@ -2647,6 +2808,8 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                default:      break;
                }
     }
+  if (!HasSubMenu() && Update(HadSubMenu))
+     Display();
   if (Key != kNone) {
      if (Setup.OSDLanguage != osdLanguage) {
         Set();
@@ -2710,6 +2873,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
   number = 0;
+  timeout = Switched || Setup.TimeoutRequChInfo;
   channel = Channels.GetByNumber(Number);
   lastPresent = lastFollowing = NULL;
   if (channel) {
@@ -2893,7 +3057,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      return osEnd;
                      }
     };
-  if (lastTime.Elapsed() < (uint64)(Setup.ChannelInfoTime * 1000)) {
+  if (!timeout || lastTime.Elapsed() < (uint64)(Setup.ChannelInfoTime * 1000)) {
      if (!number && group < 0 && channel && channel->Number() != cDevice::CurrentChannel())
         Refresh(); // makes sure a channel switch through the SVDRP CHAN command is displayed
      DisplayInfo();
@@ -2996,7 +3160,7 @@ cDisplayTracks::cDisplayTracks(void)
          }
       }
   timeout.Set(TRACKTIMEOUT);
-  displayTracks = Skins.Current()->DisplayTracks(tr("Audio"), numTracks, descriptions);
+  displayTracks = Skins.Current()->DisplayTracks(tr("Button$Audio"), numTracks, descriptions);
   Show();
 }
 
@@ -3147,7 +3311,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apids(), ch->Dpids(), ch->Spids());
      if (device->AttachReceiver(recorder)) {
         Recording.WriteInfo();
-        cStatus::MsgRecording(device, Recording.Name());
+        cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName, Recording.Name());
         Recordings.AddByName(fileName);
@@ -3206,7 +3370,7 @@ void cRecordControl::Stop(void)
      DELETENULL(recorder);
      timer->SetRecording(false);
      timer = NULL;
-     cStatus::MsgRecording(device, NULL);
+     cStatus::MsgRecording(device, NULL, fileName, false);
      cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
      }
 }
@@ -3222,9 +3386,11 @@ bool cRecordControl::Process(time_t t)
 // --- cRecordControls -------------------------------------------------------
 
 cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL };
+int cRecordControls::state = 0;
 
 bool cRecordControls::Start(cTimer *Timer, bool Pause)
 {
+  ChangeState();
   int ch = Timer ? Timer->Channel()->Number() : cDevice::CurrentChannel();
   cChannel *channel = Channels.GetByNumber(ch);
 
@@ -3262,6 +3428,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
 
 void cRecordControls::Stop(const char *InstantId)
 {
+  ChangeState();
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          const char *id = RecordControls[i]->InstantId();
@@ -3281,6 +3448,7 @@ void cRecordControls::Stop(const char *InstantId)
 
 void cRecordControls::Stop(cDevice *Device)
 {
+  ChangeState();
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          if (RecordControls[i]->Device() == Device) {
@@ -3291,20 +3459,6 @@ void cRecordControls::Stop(cDevice *Device)
       }
 }
 
-bool cRecordControls::StopPrimary(bool DoIt)
-{
-  if (cDevice::PrimaryDevice()->Receiving()) {
-     //XXX+ disabled for the moment - might become obsolete with DVB_DRIVER_VERSION >= 2002090101
-     cDevice *device = NULL;//XXX cDevice::GetDevice(cDevice::PrimaryDevice()->Ca(), 0);
-     if (device) {
-        if (DoIt)
-           Stop(cDevice::PrimaryDevice());
-        return true;
-        }
-     }
-  return false;
-}
-
 bool cRecordControls::PauseLiveVideo(void)
 {
   Skins.Message(mtStatus, tr("Pausing live video..."));
@@ -3349,8 +3503,10 @@ void cRecordControls::Process(time_t t)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
-         if (!RecordControls[i]->Process(t))
+         if (!RecordControls[i]->Process(t)) {
             DELETENULL(RecordControls[i]);
+            ChangeState();
+            }
          }
       }
 }
@@ -3365,6 +3521,7 @@ void cRecordControls::ChannelDataModified(cChannel *Channel)
                RecordControls[i]->Stop();
                // This will restart the recording, maybe even from a different
                // device in case conditional access has changed.
+               ChangeState();
                }
             }
          }
@@ -3384,6 +3541,15 @@ void cRecordControls::Shutdown(void)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++)
       DELETENULL(RecordControls[i]);
+  ChangeState();
+}
+
+bool cRecordControls::StateChanged(int &State)
+{
+  int NewState = state;
+  bool Result = State != NewState;
+  State = state;
+  return Result;
 }
 
 // --- cReplayControl --------------------------------------------------------
@@ -3403,13 +3569,13 @@ cReplayControl::cReplayControl(void)
   timeSearchActive = false;
   marks.Load(fileName);
   cRecording Recording(fileName);
-  cStatus::MsgReplaying(this, Recording.Name());
+  cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
 }
 
 cReplayControl::~cReplayControl()
 {
   Hide();
-  cStatus::MsgReplaying(this, NULL);
+  cStatus::MsgReplaying(this, NULL, fileName, false);
   Stop();
 }
 
@@ -3698,6 +3864,14 @@ void cReplayControl::EditTest(void)
      }
 }
 
+cOsdObject *cReplayControl::GetInfo(void)
+{
+  cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
+  if (Recording)
+     return new cMenuRecording(Recording);
+  return NULL;
+}
+
 eOSState cReplayControl::ProcessKey(eKeys Key)
 {
   if (!Active())
diff --git a/menu.h b/menu.h
index 729d37596..f88a597da 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.77 2005/11/05 17:26:09 kls Exp $
+ * $Id: menu.h 1.81 2006/01/06 11:30:38 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -55,11 +55,18 @@ class cMenuEvent : public cOsdMenu {
 
 class cMenuMain : public cOsdMenu {
 private:
+  time_t lastDiskSpaceCheck;
+  int lastFreeMB;
   bool replaying;
+  cOsdItem *stopReplayItem;
+  cOsdItem *cancelEditingItem;
+  cOsdItem *stopRecordingItem;
+  int recordControlsState;
   static cOsdObject *pluginOsdObject;
   void Set(void);
+  bool Update(bool Force = false);
 public:
-  cMenuMain(bool Replaying, eOSState State = osUnknown);
+  cMenuMain(eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
   static cOsdObject *PluginOsdObject(void);
   };
@@ -71,6 +78,7 @@ class cDisplayChannel : public cOsdObject {
   bool withInfo;
   cTimeMs lastTime;
   int number;
+  bool timeout;
   cChannel *channel;
   const cEvent *lastPresent;
   const cEvent *lastFollowing;
@@ -189,11 +197,11 @@ class cRecordControl {
 class cRecordControls {
 private:
   static cRecordControl *RecordControls[];
+  static int state;
 public:
   static bool Start(cTimer *Timer = NULL, bool Pause = false);
   static void Stop(const char *InstantId);
   static void Stop(cDevice *Device);
-  static bool StopPrimary(bool DoIt = false);
   static bool PauseLiveVideo(void);
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
@@ -201,6 +209,8 @@ class cRecordControls {
   static void ChannelDataModified(cChannel *Channel);
   static bool Active(void);
   static void Shutdown(void);
+  static void ChangeState(void) { state++; }
+  static bool StateChanged(int &State);
   };
 
 class cReplayControl : public cDvbPlayerControl {
@@ -230,6 +240,7 @@ class cReplayControl : public cDvbPlayerControl {
 public:
   cReplayControl(void);
   virtual ~cReplayControl();
+  virtual cOsdObject *GetInfo(void);
   virtual eOSState ProcessKey(eKeys Key);
   virtual void Show(void);
   virtual void Hide(void);
diff --git a/menuitems.c b/menuitems.c
index 4b4e5f2db..88e8a50d2 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.24 2005/11/12 12:22:10 kls Exp $
+ * $Id: menuitems.c 1.29 2006/01/07 15:37:03 kls Exp $
  */
 
 #include "menuitems.h"
@@ -15,7 +15,7 @@
 #include "skins.h"
 #include "status.h"
 
-const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
+const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@";
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -116,7 +116,7 @@ void cMenuEditBoolItem::Set(void)
 
 // --- cMenuEditBitItem ------------------------------------------------------
 
-cMenuEditBitItem::cMenuEditBitItem(const char *Name, int *Value, int Mask, const char *FalseString, const char *TrueString)
+cMenuEditBitItem::cMenuEditBitItem(const char *Name, uint *Value, uint Mask, const char *FalseString, const char *TrueString)
 :cMenuEditBoolItem(Name, &bit, FalseString, TrueString)
 {
   value = Value;
@@ -243,6 +243,9 @@ cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, co
   pos = -1;
   insert = uppercase = false;
   newchar = true;
+  charMap = tr(" 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9");
+  currentChar = NULL;
+  lastKey = kNone;
   Set();
 }
 
@@ -253,8 +256,8 @@ cMenuEditStrItem::~cMenuEditStrItem()
 
 void cMenuEditStrItem::SetHelpKeys(void)
 {
-  if (pos >= 0)
-     cSkinDisplay::Current()->SetButtons(tr("ABC/abc"), tr(insert ? "Overwrite" : "Insert"), tr("Delete"));
+  if (InEditMode())
+     cSkinDisplay::Current()->SetButtons(tr("Button$ABC/abc"), tr(insert ? "Button$Overwrite" : "Button$Insert"), tr("Button$Delete"));
   else
      cSkinDisplay::Current()->SetButtons(NULL);
 }
@@ -264,7 +267,7 @@ void cMenuEditStrItem::Set(void)
   char buf[1000];
   const char *fmt = insert && newchar ? "[]%c%s" : "[%c]%s";
 
-  if (pos >= 0) {
+  if (InEditMode()) {
      const cFont *font = cFont::GetFont(fontOsd);
      strncpy(buf, value, pos);
      snprintf(buf + pos, sizeof(buf) - pos - 2, fmt, *(value + pos), value + pos + 1);
@@ -320,9 +323,12 @@ char cMenuEditStrItem::Inc(char c, bool Up)
 
 eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
+  bool SameKey = Key == lastKey;
+  if (Key != kNone)
+     lastKey = Key;
   switch (Key) {
     case kRed:   // Switch between upper- and lowercase characters
-                 if (pos >= 0) {
+                 if (InEditMode()) {
                     if (!insert || !newchar) {
                        uppercase = !uppercase;
                        value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]);
@@ -332,7 +338,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     return osUnknown;
                  break;
     case kGreen: // Toggle insert/overwrite modes
-                 if (pos >= 0) {
+                 if (InEditMode()) {
                     insert = !insert;
                     newchar = true;
                     SetHelpKeys();
@@ -342,7 +348,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  break;
     case kYellow|k_Repeat:
     case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
-                 if (pos >= 0) {
+                 if (InEditMode()) {
                     if (strlen(value) > 1) {
                        if (!insert || pos < int(strlen(value)) - 1)
                           memmove(value + pos, value + pos + 1, strlen(value) - pos);
@@ -361,7 +367,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  break;
     case kBlue|k_Repeat:
     case kBlue:  // consume the key only if in edit-mode
-                 if (pos >= 0)
+                 if (InEditMode())
                     ;
                  else
                     return osUnknown;
@@ -395,7 +401,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
-    case kDown:  if (pos >= 0) {
+    case kDown:  if (InEditMode()) {
                     if (insert && newchar) {
                        // create a new character in insert mode
                        if (int(strlen(value)) < length - 1) {
@@ -412,7 +418,39 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  else
                     return cMenuEditItem::ProcessKey(Key);
                  break;
-    case kOk:    if (pos >= 0) {
+    case k0 ... k9: {
+                 if (!SameKey)
+                    currentChar = NULL;
+                 if (InEditMode()) {
+                    if (insert && newchar) {
+                       // create a new character in insert mode
+                       if (int(strlen(value)) < length - 1) {
+                          memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
+                          value[pos] = ' ';
+                          }
+                       }
+                    if (!currentChar || !*currentChar || *currentChar == '\t') {
+                       // find the beginning of the character map entry for Key
+                       int n = Key - k0;
+                       currentChar = charMap;
+                       while (n > 0 && *currentChar) {
+                             if (*currentChar++ == '\t')
+                                n--;
+                             }
+                       }
+                    if (*currentChar && *currentChar != '\t') {
+                       value[pos] = *currentChar;
+                       if (uppercase)
+                          value[pos] = toupper(value[pos]);
+                       currentChar++;
+                       }
+                    newchar = false;
+                    }
+                 else
+                    return cMenuEditItem::ProcessKey(Key);
+                 }
+                 break;
+    case kOk:    if (InEditMode()) {
                     pos = -1;
                     newchar = true;
                     stripspace(value);
@@ -420,7 +458,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     break;
                     }
                  // run into default
-    default:     if (pos >= 0 && BASICKEY(Key) == kKbd) {
+    default:     if (InEditMode() && BASICKEY(Key) == kKbd) {
                     int c = KEYKBD(Key);
                     if (c <= 0xFF) {
                        const char *p = strchr(allowed, tolower(c));
@@ -667,6 +705,7 @@ eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
               }
            else {
               *weekdays = days[cTimer::GetWDay(*value)];
+              dayindex = FindDayIndex(*weekdays);
               oldvalue = *value;
               *value = 0;
               }
diff --git a/menuitems.h b/menuitems.h
index f9afc1511..bfaf43626 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.12 2005/11/11 13:26:51 kls Exp $
+ * $Id: menuitems.h 1.15 2006/01/06 15:16:25 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -44,12 +44,12 @@ class cMenuEditBoolItem : public cMenuEditIntItem {
 
 class cMenuEditBitItem : public cMenuEditBoolItem {
 protected:
-  int *value;
+  uint *value;
+  uint mask;
   int bit;
-  int mask;
   virtual void Set(void);
 public:
-  cMenuEditBitItem(const char *Name, int *Value, int Mask, const char *FalseString = NULL, const char *TrueString = NULL);
+  cMenuEditBitItem(const char *Name, uint *Value, uint Mask, const char *FalseString = NULL, const char *TrueString = NULL);
   };
 
 class cMenuEditNumItem : public cMenuEditItem {
@@ -82,9 +82,14 @@ class cMenuEditStrItem : public cMenuEditItem {
   char *allowed;
   int pos;
   bool insert, newchar, uppercase;
+  const char *charMap;
+  const char *currentChar;
+  eKeys lastKey;
   void SetHelpKeys(void);
   virtual void Set(void);
   char Inc(char c, bool Up);
+protected:
+  bool InEditMode(void) { return pos >= 0; }
 public:
   cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
   ~cMenuEditStrItem();
diff --git a/osd.c b/osd.c
index 501154353..46f0a74b0 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.64 2005/11/04 14:19:31 kls Exp $
+ * $Id: osd.c 1.65 2005/12/30 15:42:04 kls Exp $
  */
 
 #include "osd.h"
@@ -145,7 +145,7 @@ void cBitmap::SetSize(int Width, int Height)
         esyslog("ERROR: can't allocate bitmap!");
      }
   else
-     esyslog("ERROR: illegal bitmap parameters (%d, %d)!", width, height);
+     esyslog("ERROR: invalid bitmap parameters (%d, %d)!", width, height);
 }
 
 bool cBitmap::Contains(int x, int y) const
diff --git a/osd.h b/osd.h
index 083d0f4ae..9156393ee 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.49 2005/06/19 10:35:25 kls Exp $
+ * $Id: osd.h 1.50 2005/12/18 12:56:21 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -37,6 +37,7 @@ enum eOsdError { oeOk,
                  oeAreasOverlap,
                  oeWrongAlignment,
                  oeOutOfMemory,
+                 oeWrongAreaSize,
                  oeUnknown,
                };
 
diff --git a/osdbase.c b/osdbase.c
index e99c986ab..d81c33b94 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.24 2005/10/09 10:56:26 kls Exp $
+ * $Id: osdbase.c 1.28 2006/01/08 11:40:02 kls Exp $
  */
 
 #include "osdbase.h"
@@ -19,7 +19,6 @@
 cOsdItem::cOsdItem(eOSState State)
 {
   text = NULL;
-  offset = -1;
   state = State;
   selectable = true;
   fresh = true;
@@ -28,7 +27,6 @@ cOsdItem::cOsdItem(eOSState State)
 cOsdItem::cOsdItem(const char *Text, eOSState State, bool Selectable)
 {
   text = NULL;
-  offset = -1;
   state = State;
   selectable = Selectable;
   fresh = true;
@@ -61,6 +59,14 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
   return Key == kOk ? state : osUnknown;
 }
 
+// --- cOsdObject ------------------------------------------------------------
+
+void cOsdObject::Show(void)
+{
+  if (isMenu)
+     ((cOsdMenu *)this)->Display();
+}
+
 // --- cOsdMenu --------------------------------------------------------------
 
 cSkinDisplayMenu *cOsdMenu::displayMenu = NULL;
@@ -155,10 +161,10 @@ void cOsdMenu::Del(int Index)
 {
   cList<cOsdItem>::Del(Get(Index));
   int count = Count();
-  while (current < count && !SelectableItem(current)) 
+  while (current < count && !SelectableItem(current))
         current++;
   if (current == count) {
-     while (current > 0 && !SelectableItem(current))  
+     while (current > 0 && !SelectableItem(current))
            current--;
      }
   if (Index == first && first > 0)
@@ -252,6 +258,8 @@ void cOsdMenu::DisplayCurrent(bool Current)
 
 void cOsdMenu::Clear(void)
 {
+  if (marked >= 0)
+     SetStatus(NULL);
   first = 0;
   current = marked = -1;
   cList<cOsdItem>::Clear();
@@ -363,7 +371,7 @@ void cOsdMenu::PageUp(void)
      CursorUp();
 }
 
-void cOsdMenu::PageDown(void) 
+void cOsdMenu::PageDown(void)
 {
   int oldCurrent = current;
   int oldFirst = first;
@@ -455,6 +463,7 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
         }
      }
   switch (Key) {
+    case k0:      return osUnknown;
     case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
     case kUp|k_Repeat:
     case kUp:   CursorUp();   break;
diff --git a/osdbase.h b/osdbase.h
index ec545ae91..0ca284bad 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.12 2005/10/02 09:18:20 kls Exp $
+ * $Id: osdbase.h 1.14 2006/01/06 11:55:30 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -49,7 +49,6 @@ enum eOSState { osUnknown,
 class cOsdItem : public cListObject {
 private:
   char *text;
-  int offset;
   eOSState state;
   bool selectable;
 protected:
@@ -78,7 +77,7 @@ class cOsdObject {
   virtual ~cOsdObject() {}
   bool NeedsFastResponse(void) { return needsFastResponse; }
   bool IsMenu(void) { return isMenu; }
-  virtual void Show(void) {}
+  virtual void Show(void);
   virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
   };
 
diff --git a/player.c b/player.c
index 80e384fa8..f29302073 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.9 2004/12/12 11:21:07 kls Exp $
+ * $Id: player.c 1.11 2006/01/06 11:30:07 kls Exp $
  */
 
 #include "player.h"
@@ -40,6 +40,7 @@ void cPlayer::Detach(void)
 // --- cControl --------------------------------------------------------------
 
 cControl *cControl::control = NULL;
+cMutex cControl::mutex;
 
 cControl::cControl(cPlayer *Player, bool Hidden)
 {
@@ -54,19 +55,27 @@ cControl::~cControl()
      control = NULL;
 }
 
+cOsdObject *cControl::GetInfo(void)
+{
+  return NULL;
+}
+
 cControl *cControl::Control(void)
 {
+  cMutexLock MutexLock(&mutex);
   return (control && !control->hidden) ? control : NULL;
 }
 
 void cControl::Launch(cControl *Control)
 {
+  cMutexLock MutexLock(&mutex);
   delete control;
   control = Control;
 }
 
 void cControl::Attach(void)
 {
+  cMutexLock MutexLock(&mutex);
   if (control && !control->attached && control->player && !control->player->IsAttached()) {
      if (cDevice::PrimaryDevice()->AttachPlayer(control->player))
         control->attached = true;
@@ -79,6 +88,7 @@ void cControl::Attach(void)
 
 void cControl::Shutdown(void)
 {
+  cMutexLock MutexLock(&mutex);
   cControl *c = control; // avoids recursions
   control = NULL;
   delete c;
diff --git a/player.h b/player.h
index 4316a7534..11d16563b 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.17 2005/05/22 11:07:42 kls Exp $
+ * $Id: player.h 1.19 2006/01/06 11:29:27 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -62,6 +62,7 @@ class cPlayer {
 class cControl : public cOsdObject {
 private:
   static cControl *control;
+  static cMutex mutex;
   bool attached;
   bool hidden;
 protected:
@@ -70,6 +71,7 @@ class cControl : public cOsdObject {
   cControl(cPlayer *Player, bool Hidden = false);
   virtual ~cControl();
   virtual void Hide(void) = 0;
+  virtual cOsdObject *GetInfo(void);
   bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
   bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
   static void Launch(cControl *Control);
diff --git a/plugin.c b/plugin.c
index 991631349..fdb38e823 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.15 2005/08/27 16:13:24 kls Exp $
+ * $Id: plugin.c 1.16 2006/01/08 11:40:05 kls Exp $
  */
 
 #include "plugin.h"
@@ -25,7 +25,7 @@
 
 char *cPlugin::configDirectory = NULL;
 
-cPlugin::cPlugin(void) 
+cPlugin::cPlugin(void)
 {
   name = NULL;
   started = false;
diff --git a/rcu.c b/rcu.c
index f1f0de565..bc95e5c09 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.10 2005/08/15 12:30:21 kls Exp $
+ * $Id: rcu.c 1.13 2006/01/08 11:40:09 kls Exp $
  */
 
 #include "rcu.h"
@@ -23,8 +23,8 @@ cRcuRemote::cRcuRemote(const char *DeviceName)
   dp = 0;
   mode = modeB;
   code = 0;
-  numberToSend = -1;
-  lastNumber = 0;
+  number = 0;
+  data = 0;
   receivedCommand = false;
   if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
      struct termios t;
@@ -32,7 +32,7 @@ cRcuRemote::cRcuRemote(const char *DeviceName)
         cfsetspeed(&t, B9600);
         cfmakeraw(&t);
         if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
-           Number(0);//XXX 8888???
+           SetNumber(8888);
            const char *Setup = GetSetup();
            if (Setup) {
               code = *Setup;
@@ -95,13 +95,12 @@ void cRcuRemote::Action(void)
 
   time_t LastCodeRefresh = 0;
   cTimeMs FirstTime;
+  unsigned char LastCode = 0, LastMode = 0;
   uint64 LastCommand = 0;
+  unsigned int LastData = 0;
   bool repeat = false;
 
   while (Running() && f >= 0) {
-
-        LOCK_THREAD;
-
         if (ReceiveByte(REPEATLIMIT) == 'X') {
            for (int i = 0; i < 6; i++) {
                int b = ReceiveByte();
@@ -140,11 +139,22 @@ void cRcuRemote::Action(void)
            LastCommand = 0;
            }
         else {
-           LastCommand = 0;
-           if (numberToSend >= 0) {
-              Number(numberToSend);
-              numberToSend = -1;
+           unsigned int d = data;
+           if (d != LastData) {
+              SendData(d);
+              LastData = d;
               }
+           unsigned char c = code;
+           if (c != LastCode) {
+              SendCommand(c);
+              LastCode = c;
+              }
+           unsigned char m = mode;
+           if (m != LastMode) {
+              SendCommand(m);
+              LastMode = m;
+              }
+           LastCommand = 0;
            }
         if (code && time(NULL) - LastCodeRefresh > 60) {
            SendCommand(code); // in case the PIC listens to the wrong code
@@ -192,8 +202,6 @@ bool cRcuRemote::SendByteHandshake(unsigned char c)
 
 bool cRcuRemote::SendByte(unsigned char c)
 {
-  LOCK_THREAD;
-
   for (int retry = 5; retry--;) {
       if (SendByteHandshake(c))
          return true;
@@ -201,32 +209,34 @@ bool cRcuRemote::SendByte(unsigned char c)
   return false;
 }
 
-bool cRcuRemote::SetCode(unsigned char Code)
+bool cRcuRemote::SendData(unsigned int n)
+{
+  for (int i = 0; i < 4; i++) {
+      if (!SendByte(n & 0x7F))
+         return false;
+      n >>= 8;
+      }
+  return SendCommand(mode);
+}
+
+void cRcuRemote::SetCode(unsigned char Code)
 {
   code = Code;
-  return SendCommand(code);
 }
 
-bool cRcuRemote::SetMode(unsigned char Mode)
+void cRcuRemote::SetMode(unsigned char Mode)
 {
   mode = Mode;
-  return SendCommand(mode);
 }
 
 bool cRcuRemote::SendCommand(unsigned char Cmd)
-{ 
+{
   return SendByte(Cmd | 0x80);
 }
 
-bool cRcuRemote::Digit(int n, int v)
-{ 
-  return SendByte(((n & 0x03) << 5) | (v & 0x0F) | (((dp >> n) & 0x01) << 4));
-}
-
-bool cRcuRemote::Number(int n, bool Hex)
+void cRcuRemote::SetNumber(int n, bool Hex)
 {
-  LOCK_THREAD;
-
+  number = n;
   if (!Hex) {
      char buf[8];
      sprintf(buf, "%4d", n & 0xFFFF);
@@ -237,19 +247,17 @@ bool cRcuRemote::Number(int n, bool Hex)
          n = (n << 4) | ((*d - '0') & 0x0F);
          }
      }
-  lastNumber = n;
+  unsigned int m = 0;
   for (int i = 0; i < 4; i++) {
-      if (!Digit(i, n))
-         return false;
+      m <<= 8;
+      m |= ((i & 0x03) << 5) | (n & 0x0F) | (((dp >> i) & 0x01) << 4);
       n >>= 4;
       }
-  return SendCommand(mode);
+  data = m;
 }
 
-bool cRcuRemote::String(char *s)
+void cRcuRemote::SetString(char *s)
 {
-  LOCK_THREAD;
-
   const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
   int n = 0;
 
@@ -262,16 +270,16 @@ bool cRcuRemote::String(char *s)
              }
           }
       }
-  return Number(n, true);
+  SetNumber(n, true);
 }
 
 void cRcuRemote::SetPoints(unsigned char Dp, bool On)
-{ 
+{
   if (On)
      dp |= Dp;
   else
      dp &= ~Dp;
-  Number(lastNumber, true);
+  SetNumber(number);
 }
 
 bool cRcuRemote::DetectCode(unsigned char *Code)
@@ -291,12 +299,12 @@ bool cRcuRemote::DetectCode(unsigned char *Code)
      SetMode(modeH);
      char buf[5];
      sprintf(buf, "C0D%c", *Code);
-     String(buf);
+     SetString(buf);
      SetCode(*Code);
      cCondWait::SleepMs(2 * REPEATDELAY);
      if (receivedCommand) {
         SetMode(modeB);
-        String("----");
+        SetString("----");
         return true;
         }
      if (*Code < 'D') {
@@ -310,13 +318,11 @@ bool cRcuRemote::DetectCode(unsigned char *Code)
 
 void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
 {
-  if (ChannelNumber && Device->IsPrimaryDevice()) {
-     LOCK_THREAD;
-     numberToSend = cDevice::CurrentChannel();
-     }
+  if (ChannelNumber && Device->IsPrimaryDevice())
+     SetNumber(cDevice::CurrentChannel());
 }
 
-void cRcuRemote::Recording(const cDevice *Device, const char *Name)
+void cRcuRemote::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
 {
   SetPoints(1 << Device->DeviceNumber(), Device->Receiving());
 }
diff --git a/rcu.h b/rcu.h
index be5c64afd..7592dc2b1 100644
--- a/rcu.h
+++ b/rcu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.h 1.4 2005/07/31 10:18:00 kls Exp $
+ * $Id: rcu.h 1.6 2005/12/31 15:09:25 kls Exp $
  */
 
 #ifndef __RCU_H
@@ -19,23 +19,23 @@ class cRcuRemote : public cRemote, private cThread, private cStatus {
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
   int f;
   unsigned char dp, code, mode;
-  int numberToSend;
-  int lastNumber;
+  int number;
+  unsigned int data;
   bool receivedCommand;
   bool SendCommand(unsigned char Cmd);
   int ReceiveByte(int TimeoutMs = 0);
   bool SendByteHandshake(unsigned char c);
   bool SendByte(unsigned char c);
-  bool Digit(int n, int v);
-  bool SetCode(unsigned char Code);
-  bool SetMode(unsigned char Mode);
-  bool Number(int n, bool Hex = false);
+  bool SendData(unsigned int n);
+  void SetCode(unsigned char Code);
+  void SetMode(unsigned char Mode);
+  void SetNumber(int n, bool Hex = false);
   void SetPoints(unsigned char Dp, bool On);
-  bool String(char *s);
+  void SetString(char *s);
   bool DetectCode(unsigned char *Code);
   virtual void Action(void);
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-  virtual void Recording(const cDevice *Device, const char *Name);
+  virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
 public:
   cRcuRemote(const char *DeviceName);
   virtual ~cRcuRemote();
diff --git a/recorder.c b/recorder.c
index 35a8e56d8..8bb16212c 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.16 2005/10/31 12:35:29 kls Exp $
+ * $Id: recorder.c 1.17 2006/01/08 11:01:25 kls Exp $
  */
 
+#include "recorder.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "recorder.h"
 
 #define RECORDERBUFSIZE  MEGABYTE(5)
 
@@ -171,6 +171,8 @@ void cRecorder::Action(void)
            int Count = remux->Put(b, r);
            if (Count)
               ringBuffer->Del(Count);
+           else
+              cCondWait::SleepMs(100); // avoid busy loop when resultBuffer is full in cRemux::Put()
            }
         }
 }
diff --git a/recording.c b/recording.c
index 7a81d7765..0f704afc7 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.124 2005/11/04 14:19:44 kls Exp $
+ * $Id: recording.c 1.132 2006/01/08 11:40:13 kls Exp $
  */
 
 #include "recording.h"
@@ -48,8 +48,8 @@
 
 #define MINDISKSPACE 1024 // MB
 
-#define DELETEDLIFETIME     1 // hours after which a deleted recording will be actually removed
-#define REMOVECHECKDELTA 3600 // seconds between checks for removing deleted files
+#define REMOVECHECKDELTA   60 // seconds between checks for removing deleted files
+#define DELETEDLIFETIME   300 // seconds after which a deleted recording will be actually removed
 #define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 
@@ -60,46 +60,67 @@
 
 bool VfatFileSystem = false;
 
-static cRecordings DeletedRecordings(true);
+cRecordings DeletedRecordings(true);
+
+// --- cRemoveDeletedRecordingsThread ----------------------------------------
+
+class cRemoveDeletedRecordingsThread : public cThread {
+protected:
+  virtual void Action(void);
+public:
+  cRemoveDeletedRecordingsThread(void);
+  };
+
+cRemoveDeletedRecordingsThread::cRemoveDeletedRecordingsThread(void)
+:cThread("remove deleted recordings")
+{
+}
+
+void cRemoveDeletedRecordingsThread::Action(void)
+{
+  // Make sure only one instance of VDR does this:
+  cLockFile LockFile(VideoDirectory);
+  if (LockFile.Lock()) {
+     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+     for (cRecording *r = DeletedRecordings.First(); r; ) {
+         if (r->deleted && time(NULL) - r->deleted > DELETEDLIFETIME) {
+            cRecording *next = DeletedRecordings.Next(r);
+            r->Remove();
+            DeletedRecordings.Del(r);
+            r = next;
+            RemoveEmptyVideoDirectories();
+            continue;
+            }
+         r = DeletedRecordings.Next(r);
+         }
+     }
+}
+
+static cRemoveDeletedRecordingsThread RemoveDeletedRecordingsThread;
+
+// ---
 
 void RemoveDeletedRecordings(void)
 {
   static time_t LastRemoveCheck = 0;
-  if (LastRemoveCheck == 0) {
-     DeletedRecordings.Update();
-     LastRemoveCheck = time(NULL) - REMOVECHECKDELTA * 9 / 10;
-     }
-  else if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
-     // Make sure only one instance of VDR does this:
-     cLockFile LockFile(VideoDirectory);
-     if (!LockFile.Lock())
-        return;
-     // Remove the oldest file that has been "deleted":
-     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
-     if (DeletedRecordings.Count()) {
-        cRecording *r = DeletedRecordings.First();
-        cRecording *r0 = r;
-        while (r) {
-              if (r->start < r0->start)
-                 r0 = r;
-              r = DeletedRecordings.Next(r);
-              }
-        if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 3600) {
-           r0->Remove();
-           DeletedRecordings.Del(r0);
-           RemoveEmptyVideoDirectories();
-           LastRemoveCheck += REMOVELATENCY;
-           return;
-           }
+  if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
+     if (!RemoveDeletedRecordingsThread.Active()) {
+        cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+        for (cRecording *r = DeletedRecordings.First(); r; r = DeletedRecordings.Next(r)) {
+            if (r->deleted && time(NULL) - r->deleted > DELETEDLIFETIME) {
+               RemoveDeletedRecordingsThread.Start();
+               break;
+               }
+            }
         }
-     else
-        DeletedRecordings.Update();
      LastRemoveCheck = time(NULL);
      }
 }
 
 void AssertFreeDiskSpace(int Priority)
 {
+  static cMutex Mutex;
+  cMutexLock MutexLock(&Mutex);
   // With every call to this function we try to actually remove
   // a file, or mark a file for removal ("delete" it), so that
   // it will get removed during the next call.
@@ -160,7 +181,7 @@ void AssertFreeDiskSpace(int Priority)
            }
         // Unable to free disk space, but there's nothing we can do about that...
         isyslog("...no old recording found, giving up");
-        Interface->Confirm(tr("Low disk space!"), 30);
+        Skins.QueueMessage(mtWarning, tr("Low disk space!"), 5, -1);
         }
      LastFreeDiskCheck = time(NULL);
      }
@@ -400,6 +421,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   sortBuffer = NULL;
   fileName = NULL;
   name = NULL;
+  fileSizeMB = -1; // unknown
+  deleted = 0;
   // set up the actual name:
   const char *Title = Event ? Event->Title() : NULL;
   const char *Subtitle = Event ? Event->ShortText() : NULL;
@@ -453,6 +476,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
 cRecording::cRecording(const char *FileName)
 {
   resume = RESUME_NOT_INITIALIZED;
+  fileSizeMB = -1; // unknown
+  deleted = 0;
   titleBuffer = NULL;
   sortBuffer = NULL;
   fileName = strdup(FileName);
@@ -525,7 +550,7 @@ cRecording::cRecording(const char *FileName)
               // so assume the short text is missing and concatenate
               // line 1 and line 2 to be the long text:
               int len = strlen(data[1]);
-              if (len > 80) { 
+              if (len > 80) {
                  data[1] = (char *)realloc(data[1], len + 1 + strlen(data[2]) + 1);
                  strcat(data[1], "\n");
                  strcat(data[1], data[2]);
@@ -714,7 +739,7 @@ bool cRecording::Delete(void)
   bool result = true;
   char *NewName = strdup(FileName());
   char *ext = strrchr(NewName, '.');
-  if (strcmp(ext, RECEXT) == 0) {
+  if (ext && strcmp(ext, RECEXT) == 0) {
      strncpy(ext, DELEXT, strlen(ext));
      if (access(NewName, F_OK) == 0) {
         // the new name already exists, so let's remove that one first:
@@ -814,6 +839,10 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
                        Add(r);
                        ChangeState();
                        Unlock();
+                       if (deleted) {
+                          r->fileSizeMB = DirSizeMB(buffer);
+                          r->deleted = time(NULL);
+                          }
                        }
                     else
                        delete r;
@@ -883,12 +912,33 @@ void cRecordings::DelByName(const char *FileName)
   LOCK_THREAD;
   cRecording *recording = GetByName(FileName);
   if (recording) {
-     Del(recording);
+     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+     Del(recording, false);
+     char *ext = strrchr(recording->FileName(), '.');
+     if (ext) {
+        strncpy(ext, DELEXT, strlen(ext));
+        recording->fileSizeMB = DirSizeMB(recording->FileName());
+        recording->deleted = time(NULL);
+        DeletedRecordings.Add(recording);
+        }
+     else
+        delete recording;
      ChangeState();
      TouchUpdate();
      }
 }
 
+int cRecordings::TotalFileSizeMB(void)
+{
+  int size = 0;
+  LOCK_THREAD;
+  for (cRecording *recording = First(); recording; recording = Next(recording)) {
+      if (recording->fileSizeMB > 0)
+         size += recording->fileSizeMB;
+      }
+  return size;
+}
+
 void cRecordings::ResetResume(const char *ResumeFileName)
 {
   LOCK_THREAD;
diff --git a/recording.h b/recording.h
index 28a1cd25f..d79b6b4dd 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.46 2005/10/31 12:27:12 kls Exp $
+ * $Id: recording.h 1.48 2005/12/18 11:26:51 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -55,12 +55,14 @@ class cRecordingInfo {
   };
 
 class cRecording : public cListObject {
+  friend class cRecordings;
 private:
   mutable int resume;
   mutable char *titleBuffer;
   mutable char *sortBuffer;
   mutable char *fileName;
   mutable char *name;
+  mutable int fileSizeMB;
   cRecordingInfo *info;
   static char *StripEpisodeName(char *s);
   char *SortName(void) const;
@@ -69,6 +71,7 @@ class cRecording : public cListObject {
   time_t start;
   int priority;
   int lifetime;
+  time_t deleted;
   cRecording(cTimer *Timer, const cEvent *Event);
   cRecording(const char *FileName);
   virtual ~cRecording();
@@ -126,9 +129,11 @@ class cRecordings : public cList<cRecording>, public cThread {
   cRecording *GetByName(const char *FileName);
   void AddByName(const char *FileName);
   void DelByName(const char *FileName);
+  int TotalFileSizeMB(void); ///< Only for deleted recordings!
   };
 
 extern cRecordings Recordings;
+extern cRecordings DeletedRecordings;
 
 class cMark : public cListObject {
 public:
diff --git a/remote.c b/remote.c
index a5f8ff94c..a59ecfe8f 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.45 2005/09/03 12:29:48 kls Exp $
+ * $Id: remote.c 1.46 2006/01/01 14:21:07 kls Exp $
  */
 
 #include "remote.h"
@@ -262,43 +262,72 @@ int cKbdRemote::MapCodeToFunc(uint64 Code)
   return (Code <= 0xFF) ? Code : kfNone;
 }
 
-void cKbdRemote::Action(void)
+int cKbdRemote::ReadKey(void)
 {
   cPoller Poller(STDIN_FILENO);
+  if (Poller.Poll(50)) {
+     uchar ch = 0;
+     int r = safe_read(STDIN_FILENO, &ch, 1);
+     if (r == 1)
+        return ch;
+     if (r < 0)
+        LOG_ERROR_STR("cKbdRemote");
+     }
+  return -1;
+}
+
+uint64 cKbdRemote::ReadKeySequence(void)
+{
+  uint64 k = 0;
+  int key1;
+
+  if ((key1 = ReadKey()) >= 0) {
+     k = key1;
+     if (key1 == 0x1B) {
+         // Start of escape sequence
+         if ((key1 = ReadKey()) >= 0) {
+            k <<= 8;
+            k |= key1 & 0xFF;
+            switch (key1) {
+              case 0x4F: // 3-byte sequence
+                   if ((key1 = ReadKey()) >= 0) {
+                      k <<= 8;
+                      k |= key1 & 0xFF;
+                      }
+                   break;
+              case 0x5B: // 3- or more-byte sequence
+                   if ((key1 = ReadKey()) >= 0) {
+                      k <<= 8;
+                      k |= key1 & 0xFF;
+                      switch (key1) {
+                        case 0x31 ... 0x3F: // more-byte sequence
+                             while (key1 != 0x7E) {
+                                   k <<= 8;
+                                   k |= key1 & 0xFF;
+                                   if ((key1 = ReadKey()) < 0)
+                                      break; // Sequence ends here
+                                   }
+                             break;
+                        }
+                      }
+                   break;
+              }
+            }
+        }
+     }
+  return k;
+}
+
+void cKbdRemote::Action(void)
+{
   while (Running()) {
-        if (Poller.Poll(100)) {
-           uint64 Command = 0;
-           uint i = 0;
-           while (Running() && i < sizeof(Command)) {
-                 uchar ch;
-                 int r = read(STDIN_FILENO, &ch, 1);
-                 if (r == 1) {
-                    Command <<= 8;
-                    Command |= ch;
-                    i++;
-                    }
-                 else if (r == 0) {
-                    // don't know why, but sometimes special keys that start with
-                    // 0x1B ('ESC') cause a short gap between the 0x1B and the rest
-                    // of their codes, so we'll need to wait some 100ms to see if
-                    // there is more coming up - or whether this really is the 'ESC'
-                    // key (if somebody knows how to clean this up, please let me know):
-                    if (Command == 0x1B && Poller.Poll(100))
-                       continue;
-                    if (Command) {
-                       if (rawMode || !Put(Command)) {
-                          int func = MapCodeToFunc(Command);
-                          if (func)
-                             Put(KBDKEY(func));
-                          }
-                       }
-                    break;
-                    }
-                 else {
-                    LOG_ERROR;
-                    break;
-                    }
-                 }
+        uint64 Command = ReadKeySequence();
+        if (Command) {
+           if (rawMode || !Put(Command)) {
+              int func = MapCodeToFunc(Command);
+              if (func)
+                 Put(KBDKEY(func));
+              }
            }
         }
 }
diff --git a/remote.h b/remote.h
index f7917baaf..4fd26d8eb 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.31 2005/09/03 12:28:42 kls Exp $
+ * $Id: remote.h 1.32 2006/01/01 14:00:50 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -89,6 +89,8 @@ class cKbdRemote : public cRemote, private cThread {
   static bool rawMode;
   struct termios savedTm;
   virtual void Action(void);
+  int ReadKey(void);
+  uint64 ReadKeySequence(void);
   int MapCodeToFunc(uint64 Code);
 public:
   cKbdRemote(void);
diff --git a/remux.c b/remux.c
index e9997a5cf..c48e5f97d 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.47 2005/09/11 13:26:50 kls Exp $
+ * $Id: remux.c 1.53 2006/01/08 11:40:16 kls Exp $
  */
 
 #include "remux.h"
@@ -88,15 +88,21 @@ ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset,
 
 // --- cRepacker -------------------------------------------------------------
 
+#define MIN_LOG_INTERVAL 10 // min. # of seconds between two consecutive log messages of a cRepacker
+#define LOG(a...) (LogAllowed() && (esyslog(a), true))
+
 class cRepacker {
 protected:
   bool initiallySyncing;
   int maxPacketSize;
   uint8_t subStreamId;
-  static void DroppedData(const char *Reason, int Count) { esyslog("%s (dropped %d bytes)", Reason, Count); }
+  time_t lastLog;
+  int suppressedLogMessages;
+  bool LogAllowed(void);
+  void DroppedData(const char *Reason, int Count) { LOG("%s (dropped %d bytes)", Reason, Count); }
 public:
   static int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded);
-  cRepacker(void) { initiallySyncing = true; maxPacketSize = 6 + 65535; subStreamId = 0; }
+  cRepacker(void);
   virtual ~cRepacker() {}
   virtual void Reset(void) { initiallySyncing = true; }
   virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
@@ -106,6 +112,30 @@ class cRepacker {
   void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
   };
 
+cRepacker::cRepacker(void)
+{
+  initiallySyncing = true;
+  maxPacketSize = 6 + 65535;
+  subStreamId = 0;
+  suppressedLogMessages = 0;;
+  lastLog = 0;
+}
+
+bool cRepacker::LogAllowed(void)
+{
+  bool Allowed = time(NULL) - lastLog >= MIN_LOG_INTERVAL;
+  lastLog = time(NULL);
+  if (Allowed) {
+     if (suppressedLogMessages) {
+        esyslog("%d cRepacker messages suppressed", suppressedLogMessages);
+        suppressedLogMessages = 0;
+        }
+     }
+  else
+     suppressedLogMessages++;
+  return Allowed;
+}
+
 int cRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded)
 {
   if (CapacityNeeded >= Count && ResultBuffer->Free() < CapacityNeeded) {
@@ -160,7 +190,7 @@ bool cCommonRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      // just skip packets with no payload
      int PesPayloadOffset = 0;
      if (AnalyzePesHeader(fragmentData, fragmentLen, PesPayloadOffset) <= phInvalid)
-        esyslog("cCommonRepacker: invalid PES packet encountered in fragment buffer!");
+        LOG("cCommonRepacker: invalid PES packet encountered in fragment buffer!");
      else if (6 + PacketLen <= PesPayloadOffset) {
         fragmentLen = 0;
         return true; // skip empty packet
@@ -181,7 +211,7 @@ bool cCommonRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar
      // just skip packets with no payload
      int PesPayloadOffset = 0;
      if (AnalyzePesHeader(pesHeader, pesHeaderLen, PesPayloadOffset) <= phInvalid)
-        esyslog("cCommonRepacker: invalid PES packet encountered in header buffer!");
+        LOG("cCommonRepacker: invalid PES packet encountered in header buffer!");
      else if (6 + PacketLen <= PesPayloadOffset) {
         pesHeaderLen = 0;
         return true; // skip empty packet
@@ -216,7 +246,8 @@ class cVideoRepacker : public cCommonRepacker {
     syncing,
     findPicture,
     scanPicture
-    } state;
+    };
+  int state;
 public:
   cVideoRepacker(void);
   virtual void Reset(void);
@@ -278,14 +309,14 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
            // which kind of start code have we got?
            switch (*data) {
              case 0xB9 ... 0xFF: // system start codes
-                  esyslog("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
+                  LOG("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
                   break;
              case 0xB0 ... 0xB1: // reserved start codes
              case 0xB6:
-                  esyslog("cVideoRepacker: found reserved start code: stream seems to be scrambled");
+                  LOG("cVideoRepacker: found reserved start code: stream seems to be scrambled");
                   break;
              case 0xB4: // sequence error code
-                  isyslog("cVideoRepacker: found sequence error code: stream seems to be damaged");
+                  LOG("cVideoRepacker: found sequence error code: stream seems to be damaged");
              case 0xB2: // user data start code
              case 0xB5: // extension start code
                   break;
@@ -307,7 +338,7 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                      if (initiallySyncing) // omit report for the typical initial case
                         initiallySyncing = false;
                      else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                        esyslog("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
+                        LOG("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
                      skippedBytes = 0;
                      // if there is a PES header available, then use it ...
                      if (pesHeaderBackupLen > 0) {
@@ -350,13 +381,13 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                      // maximum we can hold in one PES packet
                      packetTodo = maxPacketSize - pesHeaderLen;
                      // go on with finding the picture data
-                     ((int &)state)++;
+                     state++;
                      }
                   break;
              case 0x01 ... 0xAF: // slice start codes
                   if (state == findPicture) {
                      // go on with scanning the picture data
-                     ((int &)state)++;
+                     state++;
                      }
                   break;
              }
@@ -465,7 +496,7 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
   // report that syncing dropped some bytes
   if (skippedBytes > SkippedBytesLimit) {
      if (!initiallySyncing) // omit report for the typical initial case
-        esyslog("cVideoRepacker: skipped %d bytes while syncing on next picture", skippedBytes - SkippedBytesLimit);
+        LOG("cVideoRepacker: skipped %d bytes while syncing on next picture", skippedBytes - SkippedBytesLimit);
      skippedBytes = SkippedBytesLimit;
      }
 }
@@ -517,7 +548,8 @@ class cAudioRepacker : public cCommonRepacker {
   enum eState {
     syncing,
     scanFrame
-    } state;
+    };
+  int state;
   int frameTodo;
   int frameSize;
   int cid;
@@ -674,7 +706,7 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                  if (initiallySyncing) // omit report for the typical initial case
                     initiallySyncing = false;
                  else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                    esyslog("cAudioRepacker(0x%02X): skipped %d bytes to sync on next audio frame", cid, skippedBytes - SkippedBytesLimit);
+                    LOG("cAudioRepacker(0x%02X): skipped %d bytes to sync on next audio frame", cid, skippedBytes - SkippedBytesLimit);
                  skippedBytes = 0;
                  // if there is a PES header available, then use it ...
                  if (pesHeaderBackupLen > 0) {
@@ -714,10 +746,10 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                  payload = data;
                  // maximum we can hold in one PES packet
                  packetTodo = maxPacketSize - pesHeaderLen;
-                 // expected remainder of audio frame: so far we have read 3 bytes from the frame header 
+                 // expected remainder of audio frame: so far we have read 3 bytes from the frame header
                  frameTodo = frameSize - 3;
                  // go on with collecting the frame's data
-                 ((int &)state)++;
+                 state++;
                  }
               }
            }
@@ -832,7 +864,7 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
   // report that syncing dropped some bytes
   if (skippedBytes > SkippedBytesLimit) {
      if (!initiallySyncing) // omit report for the typical initial case
-        esyslog("cAudioRepacker(0x%02X): skipped %d bytes while syncing on next audio frame", cid, skippedBytes - SkippedBytesLimit);
+        LOG("cAudioRepacker(0x%02X): skipped %d bytes while syncing on next audio frame", cid, skippedBytes - SkippedBytesLimit);
      skippedBytes = SkippedBytesLimit;
      }
 }
@@ -898,14 +930,15 @@ class cDolbyRepacker : public cRepacker {
   uchar chk1;
   uchar chk2;
   int ac3todo;
-  enum {
+  enum eState {
     find_0b,
     find_77,
     store_chk1,
     store_chk2,
     get_length,
     output_packet
-    } state;
+    };
+  int state;
   int skippedBytes;
   void ResetPesHeader(bool ContinuationFrame = false);
   void AppendSubStreamID(bool ContinuationFrame = false);
@@ -1090,7 +1123,7 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
         switch (state) {
           case find_0b:
                if (*data == 0x0B) {
-                  ++(int &)state;
+                  state++;
                   // copy header information once for later use
                   if (pesHeaderBackupLen > 0) {
                      pesHeaderLen = pesHeaderBackupLen;
@@ -1113,21 +1146,21 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                done++;
                todo--;
                skippedBytes++; // collect number of skipped bytes while syncing
-               ++(int &)state;
+               state++;
                continue;
           case store_chk1:
                chk1 = *data++;
                done++;
                todo--;
                skippedBytes++; // collect number of skipped bytes while syncing
-               ++(int &)state;
+               state++;
                continue;
           case store_chk2:
                chk2 = *data++;
                done++;
                todo--;
                skippedBytes++; // collect number of skipped bytes while syncing
-               ++(int &)state;
+               state++;
                continue;
           case get_length:
                ac3todo = 2 * frameSizes[*data];
@@ -1157,7 +1190,7 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                if (initiallySyncing) // omit report for the typical initial case
                   initiallySyncing = false;
                else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                  esyslog("cDolbyRepacker: skipped %d bytes to sync on next AC3 frame", skippedBytes - SkippedBytesLimit);
+                  LOG("cDolbyRepacker: skipped %d bytes to sync on next AC3 frame", skippedBytes - SkippedBytesLimit);
                skippedBytes = 0;
                // append read data to header for common output processing
                pesHeader[pesHeaderLen++] = 0x0B;
@@ -1165,7 +1198,7 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
                pesHeader[pesHeaderLen++] = chk1;
                pesHeader[pesHeaderLen++] = chk2;
                ac3todo -= 4;
-               ++(int &)state;
+               state++;
                // fall through to output
           case output_packet: {
                int bite = 0;
@@ -1188,7 +1221,7 @@ void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
   // report that syncing dropped some bytes
   if (skippedBytes > SkippedBytesLimit) {
      if (!initiallySyncing) // omit report for the typical initial case
-        esyslog("cDolbyRepacker: skipped %d bytes while syncing on next AC3 frame", skippedBytes - 4);
+        LOG("cDolbyRepacker: skipped %d bytes while syncing on next AC3 frame", skippedBytes - 4);
      skippedBytes = SkippedBytesLimit;
      }
 }
@@ -1248,9 +1281,10 @@ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
 #define CONT_CNT_MASK  0x0F
 
 // Flags:
+#define PAY_LOAD       0x10
+#define ADAPT_FIELD    0x20
 #define PAY_START      0x40
 #define TS_ERROR       0x80
-#define ADAPT_FIELD    0x20
 
 #define MAX_PLENGTH  0xFFFF          // the maximum PES packet length (theoretically)
 #define MMAX_PLENGTH (64*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland or HDTV 1920x1080
@@ -1635,7 +1669,11 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
 
   if (Buf[1] & TS_ERROR)
      tsErrors++;
-  if ((Buf[3] ^ ccCounter) & CONT_CNT_MASK) {
+
+  if (!(Buf[3] & (ADAPT_FIELD | PAY_LOAD)))
+     return; // discard TS packet with adaption_field_control set to '00'.
+
+  if ((Buf[3] & PAY_LOAD) && ((Buf[3] ^ ccCounter) & CONT_CNT_MASK)) {
      // This should check duplicates and packets which do not increase the counter.
      // But as the errors usually come in bursts this should be enough to
      // show you there is something wrong with signal quality.
@@ -1650,12 +1688,14 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
      }
 
   if (Buf[1] & PAY_START) {
-     if (plength == MMAX_PLENGTH - 6 && found > 6) {
+     if (found > 6) {
+        if (plength != MMAX_PLENGTH - 6 && plength != found - 6)
+           dsyslog("PES packet shortened to %d bytes (expected: %d bytes)", found, plength + 6);
         plength = found - 6;
-        found = 0;
         send_ipack();
         reset_ipack();
         }
+     found = 0;
      }
 
   uint8_t off = 0;
@@ -1666,7 +1706,8 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
         return;
      }
 
-  instant_repack(Buf + 4 + off, TS_SIZE - 4 - off);
+  if (Buf[3] & PAY_LOAD)
+     instant_repack(Buf + 4 + off, TS_SIZE - 4 - off);
 }
 
 // --- cRemux ----------------------------------------------------------------
diff --git a/ringbuffer.c b/ringbuffer.c
index 3473a9e7e..e00a524f1 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.21 2004/10/15 13:49:25 kls Exp $
+ * $Id: ringbuffer.c 1.23 2005/12/30 15:42:08 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -46,7 +46,7 @@ void cRingBuffer::UpdatePercentage(int Fill)
   int percent = Fill * 100 / (Size() - 1) / PERCENTAGEDELTA * PERCENTAGEDELTA;
   if (percent != lastPercent) {
      if (percent >= PERCENTAGETHRESHOLD && percent > lastPercent || percent < PERCENTAGETHRESHOLD && lastPercent >= PERCENTAGETHRESHOLD) {
-        dsyslog("buffer usage: %d%% (tid=%ld)", percent, getThreadTid);
+        dsyslog("buffer usage: %d%% (tid=%d)", percent, getThreadTid);
         lastPercent = percent;
         }
      }
@@ -165,10 +165,10 @@ cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics, cons
         Clear();
         }
      else
-        esyslog("ERROR: illegal margin for ring buffer (%d > %d)", Margin, Size / 2);
+        esyslog("ERROR: invalid margin for ring buffer (%d > %d)", Margin, Size / 2);
      }
   else
-     esyslog("ERROR: illegal size for ring buffer (%d)", Size);
+     esyslog("ERROR: invalid size for ring buffer (%d)", Size);
 #ifdef DEBUGRINGBUFFERS
   lastHead = head;
   lastTail = tail;
@@ -286,7 +286,7 @@ uchar *cRingBufferLinear::Get(int &Count)
   uchar *p = NULL;
   int Head = head;
   if (getThreadTid <= 0)
-     getThreadTid = pthread_self();
+     getThreadTid = cThread::ThreadId();
   int rest = Size() - tail;
   if (rest < margin && Head < tail) {
      int t = margin - rest;
diff --git a/ringbuffer.h b/ringbuffer.h
index c47aac3f5..dba0e6193 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.16 2004/10/15 13:50:46 kls Exp $
+ * $Id: ringbuffer.h 1.17 2005/12/10 10:54:51 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -23,7 +23,7 @@ class cRingBuffer {
   int overflowCount;
   int overflowBytes;
 protected:
-  pthread_t getThreadTid;
+  tThreadId getThreadTid;
   int maxFill;//XXX
   int lastPercent;
   bool statistics;//XXX
diff --git a/runvdr b/runvdr
index 76fd5f08d..b03a63bba 100755
--- a/runvdr
+++ b/runvdr
@@ -7,7 +7,7 @@
 #
 # Set the environment variable VDRUSR to the user id you
 # want VDR to run with. If VDRUSR is not set, VDR will run
-# as 'root', which is not necessarily advisable.
+# as user 'vdr'.
 #
 # Since this script loads the DVB driver, it must be started
 # as user 'root'.
@@ -18,11 +18,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.14 2004/11/21 11:30:00 kls Exp $
+# $Id: runvdr 1.15 2005/12/31 16:04:53 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
-VDRCMD="$VDRPRG -w 60 $*"
+VDRCMD="$VDRPRG -u $VDRUSR -w 60 $*"
 
 LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
 KILL="/usr/bin/killall -q -TERM"
@@ -33,7 +33,7 @@ if [ $LSMOD -eq 0 ] ; then
    fi
 
 while (true) do
-      su $VDRUSR -c "$VDRCMD"
+      $VDRCMD
       if test $? -eq 0 -o $? -eq 2; then exit; fi
       date
       echo "restarting VDR"
diff --git a/skinclassic.c b/skinclassic.c
index fd3ab0b1a..18851a8ee 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.12 2005/05/16 10:45:07 kls Exp $
+ * $Id: skinclassic.c 1.13 2006/01/01 14:37:58 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -378,7 +378,6 @@ class cSkinClassicDisplayReplay : public cSkinDisplayReplay {
   int x0, x1;
   int y0, y1, y2, y3;
   int lastCurrentWidth;
-  bool message;
 public:
   cSkinClassicDisplayReplay(bool ModeOnly);
   virtual ~cSkinClassicDisplayReplay();
@@ -397,7 +396,6 @@ cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly)
   const cFont *font = cFont::GetFont(fontOsd);
   int lineHeight = font->Height();
   lastCurrentWidth = 0;
-  message = false;
   x0 = 0;
   x1 = Setup.OSDWidth;
   y0 = 0;
@@ -467,12 +465,9 @@ void cSkinClassicDisplayReplay::SetMessage(eMessageType Type, const char *Text)
   if (Text) {
      osd->SaveRegion(x0, y2, x1 - 1, y3 - 1);
      osd->DrawText(x0, y2, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x1 - x0, y3 - y2, taCenter);
-     message = true;
      }
-  else {
+  else
      osd->RestoreRegion();
-     message = false;
-     }
 }
 
 void cSkinClassicDisplayReplay::Flush(void)
diff --git a/skins.c b/skins.c
index c6213cf10..e65d29023 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.6 2005/11/27 15:52:25 kls Exp $
+ * $Id: skins.c 1.7 2006/01/08 11:40:18 kls Exp $
  */
 
 #include "skins.h"
@@ -323,7 +323,7 @@ void cSkins::ProcessQueuedMessages(void)
          }
       else
          break;
-      } 
+      }
   queueMessageMutex.Unlock();
 }
 
diff --git a/skins.h b/skins.h
index 90ed0c3a0..f862cc136 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.9 2005/11/27 15:41:44 kls Exp $
+ * $Id: skins.h 1.10 2006/01/08 11:40:21 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -197,7 +197,7 @@ class cSkinDisplayReplay : public cSkinDisplay {
        ///< take care that it is erased from the display when a Current string
        ///< _with_ ".ff" is followed by one without it.
   virtual void SetTotal(const char *Total) = 0;
-       ///< Sets the total length of the recording, as a user readable 
+       ///< Sets the total length of the recording, as a user readable
        ///< string if the form "h:mm:ss".
   virtual void SetJump(const char *Jump) = 0;
        ///< Sets the prompt that allows the user to enter a jump point.
diff --git a/skinsttng.c b/skinsttng.c
index e7f3d8b8f..1e2d8cdc8 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.15 2005/08/15 11:14:59 kls Exp $
+ * $Id: skinsttng.c 1.16 2006/01/01 14:38:14 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -643,7 +643,6 @@ class cSkinSTTNGDisplayReplay : public cSkinDisplayReplay {
   int y0, y1, y2, y3, y4, y5, y6, y7;
   tColor frameColor;
   int lastCurrentWidth;
-  bool message;
 public:
   cSkinSTTNGDisplayReplay(bool ModeOnly);
   virtual ~cSkinSTTNGDisplayReplay();
@@ -666,7 +665,6 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   int lineHeight = font->Height();
   frameColor = Theme.Color(clrReplayFrame);
   lastCurrentWidth = 0;
-  message = false;
   cBitmap bm(play_xpm);
   x0 = 0;
   x1 = max(SymbolWidth, bm.Width());
@@ -772,12 +770,9 @@ void cSkinSTTNGDisplayReplay::SetMessage(eMessageType Type, const char *Text)
      osd->SaveRegion(x2, y6, x4 - 1, y7 - 1);
      osd->DrawRectangle(x2, y6, x3 - 1, y7 - 1, Theme.Color(clrBackground));
      osd->DrawText(x3, y6, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x4 - x3, 0, taCenter);
-     message = true;
      }
-  else {
+  else
      osd->RestoreRegion();
-     message = false;
-     }
 }
 
 void cSkinSTTNGDisplayReplay::Flush(void)
diff --git a/status.c b/status.c
index 5fd4f8ec4..4a7da49a8 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 1.7 2005/01/09 11:51:04 kls Exp $
+ * $Id: status.c 1.8 2005/12/31 15:10:10 kls Exp $
  */
 
 #include "status.h"
@@ -29,16 +29,16 @@ void cStatus::MsgChannelSwitch(const cDevice *Device, int ChannelNumber)
       sm->ChannelSwitch(Device, ChannelNumber);
 }
 
-void cStatus::MsgRecording(const cDevice *Device, const char *Name)
+void cStatus::MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
-      sm->Recording(Device, Name);
+      sm->Recording(Device, Name, FileName, On);
 }
 
-void cStatus::MsgReplaying(const cControl *Control, const char *Name)
+void cStatus::MsgReplaying(const cControl *Control, const char *Name, const char *FileName, bool On)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
-      sm->Replaying(Control, Name);
+      sm->Replaying(Control, Name, FileName, On);
 }
 
 void cStatus::MsgSetVolume(int Volume, bool Absolute)
diff --git a/status.h b/status.h
index 58aec57eb..57e4b9195 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.8 2005/01/09 11:50:21 kls Exp $
+ * $Id: status.h 1.9 2005/12/31 15:15:25 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -24,15 +24,17 @@ class cStatus : public cListObject {
                // Indicates a channel switch on the given DVB device.
                // If ChannelNumber is 0, this is before the channel is being switched,
                // otherwise ChannelNumber is the number of the channel that has been switched to.
-  virtual void Recording(const cDevice *Device, const char *Name) {}
-               // The given DVB device has started recording Name. Name is the name of the
-               // recording, without any directory path.
-               // If Name is NULL, the recording has ended. 
-  virtual void Replaying(const cControl *Control, const char *Name) {}
-               // The given player control has started replaying Name. Name is the name of the
-               // recording, without any directory path. In case of a player that can't provide
+  virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On) {}
+               // The given DVB device has started (On = true) or stopped (On = false) recording Name.
+               // Name is the name of the recording, without any directory path. The full file name
+               // of the recording is given in FileName, which may be NULL in case there is no
+               // actual file involved. If On is false, Name may be NULL.
+  virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On) {}
+               // The given player control has started (On = true) or stopped (On = false) replaying Name.
+               // Name is the name of the recording, without any directory path. In case of a player that can't provide
                // a name, Name can be a string that identifies the player type (like, e.g., "DVD").
-               // If Name is NULL, the replay has ended. 
+               // The full file name of the recording is given in FileName, which may be NULL in case there is no
+               // actual file involved. If On is false, Name may be NULL.
   virtual void SetVolume(int Volume, bool Absolute) {}
                // The volume has been set to the given value, either
                // absolutely or relative to the current volume.
@@ -70,8 +72,8 @@ class cStatus : public cListObject {
   virtual ~cStatus();
   // These functions are called whenever the related status information changes:
   static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber);
-  static void MsgRecording(const cDevice *Device, const char *Name);
-  static void MsgReplaying(const cControl *Control, const char *Name);
+  static void MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On);
+  static void MsgReplaying(const cControl *Control, const char *Name, const char *FileName, bool On);
   static void MsgSetVolume(int Volume, bool Absolute);
   static void MsgSetAudioTrack(int Index, const char * const *Tracks);
   static void MsgSetAudioChannel(int AudioChannel);
diff --git a/svdrp.c b/svdrp.c
index 78b759aa9..086b01cb4 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.84 2005/11/27 15:29:28 kls Exp $
+ * $Id: svdrp.c 1.89 2005/12/30 15:42:29 kls Exp $
  */
 
 #include "svdrp.h"
@@ -201,10 +201,16 @@ const char *HelpPages[] = {
   "    Edit the recording with the given number. Before a recording can be\n"
   "    edited, an LSTR command must have been executed in order to retrieve\n"
   "    the recording numbers.",
-  "GRAB <filename> [ jpeg | pnm [ <quality> [ <sizex> <sizey> ] ] ]\n"
+  "GRAB <filename> [ <quality> [ <sizex> <sizey> ] ]\n"
   "    Grab the current frame and save it to the given file. Images can\n"
-  "    be stored as JPEG (default) or PNM, at the given quality (default\n"
-  "    is 'maximum', only applies to JPEG) and size (default is full screen).",
+  "    be stored as JPEG or PNM, depending on the given file name extension.\n"
+  "    The quality of the grabbed image can be in the range 0..100, where 100\n"
+  "    (the default) means \"best\" (only applies to JPEG). The size parameters\n"
+  "    define the size of the resulting image (default is full screen).\n"
+  "    If the file name is just an extension (.jpg, .jpeg or .pnm) the image\n"
+  "    data will be sent to the SVDRP connection encoded in base64. The same\n"
+  "    happens if '-' (a minus sign) is given as file name, in which case the\n"
+  "    image format defaults to JPEG.",
   "HELP [ <topic> ]\n"
   "    The HELP command gives help info.",
   "HITK [ <key> ]\n"
@@ -307,6 +313,7 @@ const char *HelpPages[] = {
 
  214 Help message
  215 EPG or recording data record
+ 216 Image grab data (base 64)
  220 VDR service ready
  221 VDR service closing transmission channel
  250 Requested VDR action okay, completed
@@ -354,6 +361,8 @@ const char *GetHelpPage(const char *Cmd, const char **p)
   return NULL;
 }
 
+char *cSVDRP::grabImageDir = NULL;
+
 cSVDRP::cSVDRP(int Port)
 :socket(Port)
 {
@@ -656,36 +665,54 @@ void cSVDRP::CmdGRAB(const char *Option)
      const char *delim = " \t";
      char *strtok_next;
      FileName = strtok_r(p, delim, &strtok_next);
-     if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
-        if (strcasecmp(p, "JPEG") == 0)
+     // image type:
+     char *Extension = strrchr(FileName, '.');
+     if (Extension) {
+        if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
            Jpeg = true;
-        else if (strcasecmp(p, "PNM") == 0)
+        else if (strcasecmp(Extension, ".pnm") == 0)
            Jpeg = false;
         else {
-           Reply(501, "Unknown image type \"%s\"", p);
+           Reply(501, "Unknown image type \"%s\"", Extension + 1);
            return;
            }
+        if (Extension == FileName)
+           FileName = NULL;
+        }
+     else if (strcmp(FileName, "-") == 0)
+        FileName = NULL;
+     else {
+        Reply(501, "Missing filename extension in \"%s\"", FileName);
+        return;
         }
+     // image quality (and obsolete type):
      if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
-        if (isnumber(p))
-           Quality = atoi(p);
-        else {
-           Reply(501, "Illegal quality \"%s\"", p);
-           return;
+        if (strcasecmp(p, "JPEG") == 0 || strcasecmp(p, "PNM") == 0) {
+           // tolerate for backward compatibility
+           p = strtok_r(NULL, delim, &strtok_next);
+           }
+        if (p) {
+           if (isnumber(p))
+              Quality = atoi(p);
+           else {
+              Reply(501, "Invalid quality \"%s\"", p);
+              return;
+              }
            }
         }
+     // image size:
      if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
         if (isnumber(p))
            SizeX = atoi(p);
         else {
-           Reply(501, "Illegal sizex \"%s\"", p);
+           Reply(501, "Invalid sizex \"%s\"", p);
            return;
            }
         if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
            if (isnumber(p))
               SizeY = atoi(p);
            else {
-              Reply(501, "Illegal sizey \"%s\"", p);
+              Reply(501, "Invalid sizey \"%s\"", p);
               return;
               }
            }
@@ -698,8 +725,67 @@ void cSVDRP::CmdGRAB(const char *Option)
         Reply(501, "Unexpected parameter \"%s\"", p);
         return;
         }
-     if (cDevice::PrimaryDevice()->GrabImage(FileName, Jpeg, Quality, SizeX, SizeY))
-        Reply(250, "Grabbed image %s", Option);
+     // canonicalize the file name:
+     char RealFileName[PATH_MAX];
+     if (FileName) {
+        if (grabImageDir) {
+           char *s;
+           asprintf(&s, "%s/%s", grabImageDir, FileName);
+           FileName = s;
+           char *slash = strrchr(FileName, '/'); // there definitely is one
+           *slash = 0;
+           char *r = realpath(FileName, RealFileName);
+           *slash = '/';
+           if (!r) {
+              LOG_ERROR_STR(FileName);
+              Reply(501, "Invalid file name \"%s\"", FileName);
+              free(s);
+              return;
+              }
+           strcat(RealFileName, slash);
+           FileName = RealFileName;
+           free(s);
+           if (strncmp(FileName, grabImageDir, strlen(grabImageDir)) != 0) {
+              Reply(501, "Invalid file name \"%s\"", FileName);
+              return;
+              }
+           }
+        else {
+           Reply(550, "Grabbing to file not allowed (use \"GRAB -\" instead)");
+           return;
+           }
+        }
+     // actual grabbing:
+     int ImageSize;
+     uchar *Image = cDevice::PrimaryDevice()->GrabImage(ImageSize, Jpeg, Quality, SizeX, SizeY);
+     if (Image) {
+        if (FileName) {
+           int fd = open(FileName, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, DEFFILEMODE);
+           if (fd >= 0) {
+              if (safe_write(fd, Image, ImageSize) == ImageSize) {
+                 isyslog("grabbed image to %s", FileName);
+                 Reply(250, "Grabbed image %s", Option);
+                 }
+              else {
+                 LOG_ERROR_STR(FileName);
+                 Reply(451, "Can't write to '%s'", FileName);
+                 }
+              close(fd);
+              }
+           else {
+              LOG_ERROR_STR(FileName);
+              Reply(451, "Can't open '%s'", FileName);
+              }
+           }
+        else {
+           cBase64Encoder Base64(Image, ImageSize);
+           const char *s;
+           while ((s = Base64.NextLine()) != NULL)
+                 Reply(-216, s);
+           Reply(216, "Grabbed image %s", Option);
+           }
+        free(Image);
+        }
      else
         Reply(451, "Grab image failed");
      }
@@ -1482,4 +1568,10 @@ bool cSVDRP::Process(void)
   return false;
 }
 
+void cSVDRP::SetGrabImageDir(const char *GrabImageDir)
+{
+  free(grabImageDir);
+  grabImageDir = GrabImageDir ? strdup(GrabImageDir) : NULL;
+}
+
 //TODO more than one connection???
diff --git a/svdrp.h b/svdrp.h
index 469c47a51..1229f8ef2 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.26 2005/11/27 15:26:42 kls Exp $
+ * $Id: svdrp.h 1.27 2005/12/30 14:46:38 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -49,6 +49,7 @@ class cSVDRP {
   int length;
   char *cmdLine;
   time_t lastActivity;
+  static char *grabImageDir;
   void Close(bool Timeout = false);
   bool Send(const char *s, int length = -1);
   void Reply(int Code, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
@@ -87,6 +88,7 @@ class cSVDRP {
   ~cSVDRP();
   bool HasConnection(void) { return file.IsOpen(); }
   bool Process(void);
+  static void SetGrabImageDir(const char *GrabImageDir);
   };
 
 #endif //__SVDRP_H
diff --git a/thread.c b/thread.c
index 52747730e..2355e674b 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.46 2005/11/27 15:15:53 kls Exp $
+ * $Id: thread.c 1.50 2006/01/04 15:01:22 kls Exp $
  */
 
 #include "thread.h"
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdarg.h>
 #include <sys/resource.h>
+#include <sys/syscall.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -136,7 +137,9 @@ void cCondVar::Broadcast(void)
 
 cRwLock::cRwLock(bool PreferWriter)
 {
-  pthread_rwlockattr_t attr = { PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP };
+  pthread_rwlockattr_t attr;
+  pthread_rwlockattr_init(&attr);
+  pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP);
   pthread_rwlock_init(&rwlock, &attr);
 }
 
@@ -170,7 +173,9 @@ void cRwLock::Unlock(void)
 cMutex::cMutex(void)
 {
   locked = 0;
-  pthread_mutexattr_t attr = { PTHREAD_MUTEX_ERRORCHECK_NP };
+  pthread_mutexattr_t attr;
+  pthread_mutexattr_init(&attr);
+  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
   pthread_mutex_init(&mutex, &attr);
 }
 
@@ -193,13 +198,14 @@ void cMutex::Unlock(void)
 
 // --- cThread ---------------------------------------------------------------
 
-tThreadId cThread::mainThreadId = cThread::ThreadId();
+tThreadId cThread::mainThreadId = 0;
 bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(const char *Description)
 {
   active = running = false;
   childTid = 0;
+  childThreadId = 0;
   description = NULL;
   SetDescription(Description);
 }
@@ -230,11 +236,12 @@ void cThread::SetDescription(const char *Description, ...)
 
 void *cThread::StartThread(cThread *Thread)
 {
+  Thread->childThreadId = ThreadId();
   if (Thread->description)
-     dsyslog("%s thread started (pid=%d, tid=%ld)", Thread->description, getpid(), pthread_self());
+     dsyslog("%s thread started (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
   Thread->Action();
   if (Thread->description)
-     dsyslog("%s thread ended (pid=%d, tid=%ld)", Thread->description, getpid(), pthread_self());
+     dsyslog("%s thread ended (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
   Thread->running = false;
   Thread->active = false;
   return NULL;
@@ -292,7 +299,7 @@ void cThread::Cancel(int WaitSeconds)
                return;
             cCondWait::SleepMs(10);
             }
-        esyslog("ERROR: thread %ld won't end (waited %d seconds) - canceling it...", childTid, WaitSeconds);
+        esyslog("ERROR: thread %d won't end (waited %d seconds) - canceling it...", childThreadId, WaitSeconds);
         }
      pthread_cancel(childTid);
      childTid = 0;
@@ -308,6 +315,21 @@ bool cThread::EmergencyExit(bool Request)
   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
 }
 
+_syscall0(pid_t, gettid)
+
+tThreadId cThread::ThreadId(void)
+{
+  return gettid();
+}
+
+void cThread::SetMainThreadId(void)
+{
+  if (mainThreadId == 0)
+     mainThreadId = ThreadId();
+  else
+     esyslog("ERROR: attempt to set main thread id to %d while it already is %d", ThreadId(), mainThreadId);
+}
+
 // --- cMutexLock ------------------------------------------------------------
 
 cMutexLock::cMutexLock(cMutex *Mutex)
diff --git a/thread.h b/thread.h
index 1b6200cec..341e87d04 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.32 2005/11/27 15:16:50 kls Exp $
+ * $Id: thread.h 1.36 2006/01/08 11:40:23 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -72,7 +72,7 @@ class cMutex {
   void Unlock(void);
   };
 
-typedef pthread_t tThreadId;
+typedef pid_t tThreadId;
 
 class cThread {
   friend class cThreadLock;
@@ -80,6 +80,7 @@ class cThread {
   bool active;
   bool running;
   pthread_t childTid;
+  tThreadId childThreadId;
   cMutex mutex;
   char *description;
   static tThreadId mainThreadId;
@@ -106,7 +107,7 @@ class cThread {
   cThread(const char *Description = NULL);
        ///< Creates a new thread.
        ///< If Description is present, a log file entry will be made when
-       ///< the thread starts and stops. The Start() function must be called 
+       ///< the thread starts and stops. The Start() function must be called
        ///< to actually start the thread.
   virtual ~cThread();
   void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
@@ -115,8 +116,9 @@ class cThread {
   bool Active(void);
        ///< Checks whether the thread is still alive.
   static bool EmergencyExit(bool Request = false);
-  static tThreadId ThreadId(void) { return pthread_self(); }
+  static tThreadId ThreadId(void);
   static tThreadId IsMainThread(void) { return ThreadId() == mainThreadId; }
+  static void SetMainThreadId(void);
   };
 
 // cMutexLock can be used to easily set a lock on mutex and make absolutely
diff --git a/timers.c b/timers.c
index ff51f1094..906efbbc0 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.36 2005/09/09 15:22:33 kls Exp $
+ * $Id: timers.c 1.41 2006/01/08 11:40:29 kls Exp $
  */
 
 #include "timers.h"
@@ -20,14 +20,14 @@
 
 // -- cTimer -----------------------------------------------------------------
 
-cTimer::cTimer(bool Instant, bool Pause)
+cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
 {
   startTime = stopTime = 0;
   recording = pending = inVpsMargin = false;
   flags = tfNone;
   if (Instant)
      SetFlags(tfActive | tfInstant);
-  channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  channel = Channel ? Channel : Channels.GetByNumber(cDevice::CurrentChannel());
   time_t t = time(NULL);
   struct tm tm_r;
   struct tm *now = localtime_r(&t, &tm_r);
@@ -110,7 +110,7 @@ cString cTimer::ToText(bool UseChannelID)
   char *buffer;
   strreplace(file, ':', '|');
   strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays), start, stop, priority, lifetime, file, summary ? summary : "");
+  asprintf(&buffer, "%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
   return cString(buffer, true);
@@ -244,7 +244,7 @@ bool cTimer::Parse(const char *s)
      s = s2;
      }
   bool result = false;
-  if (8 <= sscanf(s, "%d :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
+  if (8 <= sscanf(s, "%u :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
      if (summary && !*skipspace(summary)) {
         free(summary);
         summary = NULL;
@@ -363,7 +363,7 @@ bool cTimer::Matches(time_t t, bool Directly) const
      }
 
   if (HasFlags(tfActive)) {
-     if (HasFlags(tfVps) && !Directly && event && event->Vps() && schedule && schedule->PresentSeenWithin(30)) {
+     if (HasFlags(tfVps) && !Directly && event && event->Vps() && event->Schedule() && event->Schedule()->PresentSeenWithin(30)) {
         startTime = event->StartTime();
         stopTime = event->EndTime();
         return event->IsRunning(true);
@@ -425,7 +425,7 @@ time_t cTimer::StopTime(void) const
   return stopTime;
 }
 
-void cTimer::SetEvent(const cSchedule *Schedule, const cEvent *Event)
+void cTimer::SetEvent(const cEvent *Event)
 {
   if (event != Event) { //XXX TODO check event data, too???
      if (Event) {
@@ -436,7 +436,6 @@ void cTimer::SetEvent(const cSchedule *Schedule, const cEvent *Event)
         }
      else
         isyslog("timer %s set to no event", *ToDescr());
-     schedule = Event ? Schedule : NULL;
      event = Event;
      }
 }
@@ -463,22 +462,27 @@ void cTimer::SetInVpsMargin(bool InVpsMargin)
   inVpsMargin = InVpsMargin;
 }
 
-void cTimer::SetFlags(int Flags)
+void cTimer::SetPriority(int Priority)
+{
+  priority = Priority;
+}
+
+void cTimer::SetFlags(uint Flags)
 {
   flags |= Flags;
 }
 
-void cTimer::ClrFlags(int Flags)
+void cTimer::ClrFlags(uint Flags)
 {
   flags &= ~Flags;
 }
 
-void cTimer::InvFlags(int Flags)
+void cTimer::InvFlags(uint Flags)
 {
   flags ^= Flags;
 }
 
-bool cTimer::HasFlags(int Flags) const
+bool cTimer::HasFlags(uint Flags) const
 {
   return (flags & Flags) == Flags;
 }
@@ -616,7 +620,7 @@ void cTimers::SetEvents(void)
                             distance = e->EndTime() - now;
                          if (Event && overlap == Overlap) {
                             if (Overlap > FULLMATCH) { // this means VPS
-                               if (abs(Distance) < abs(distance)) 
+                               if (abs(Distance) < abs(distance))
                                   break; // we've already found the closest VPS event
                                }
                             else if (e->Duration() <= Event->Duration())
@@ -629,7 +633,7 @@ void cTimers::SetEvents(void)
                       }
                   if (Event && Event->EndTime() < now - EXPIRELATENCY && !Event->IsRunning())
                      Event = NULL;
-                  ti->SetEvent(Schedule, Event);
+                  ti->SetEvent(Event);
                   }
                }
             }
diff --git a/timers.h b/timers.h
index 28b3dd507..4ad28bb4b 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.19 2005/05/07 10:36:35 kls Exp $
+ * $Id: timers.h 1.23 2006/01/06 14:13:17 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -29,7 +29,7 @@ class cTimer : public cListObject {
 private:
   mutable time_t startTime, stopTime;
   bool recording, pending, inVpsMargin;
-  int flags;
+  uint flags;
   cChannel *channel;
   mutable time_t day; ///< midnight of the day this timer shall hit, or of the first day it shall hit in case of a repeating timer
   int weekdays;       ///< bitmask, lowest bits: SSFTWTM  (the 'M' is the LSB)
@@ -39,10 +39,9 @@ class cTimer : public cListObject {
   int lifetime;
   char file[MaxFileName];
   char *summary;
-  const cSchedule *schedule;
   const cEvent *event;
 public:
-  cTimer(bool Instant = false, bool Pause = false);
+  cTimer(bool Instant = false, bool Pause = false, cChannel *Channel = NULL);
   cTimer(const cEvent *Event);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
@@ -50,7 +49,7 @@ class cTimer : public cListObject {
   bool Recording(void) const { return recording; }
   bool Pending(void) const { return pending; }
   bool InVpsMargin(void) const { return inVpsMargin; }
-  int Flags(void) const { return flags; }
+  uint Flags(void) const { return flags; }
   const cChannel *Channel(void) const { return channel; }
   time_t Day(void) const { return day; }
   int WeekDays(void) const { return weekdays; }
@@ -78,14 +77,15 @@ class cTimer : public cListObject {
   bool Expired(void) const;
   time_t StartTime(void) const;
   time_t StopTime(void) const;
-  void SetEvent(const cSchedule *Schedule, const cEvent *Event);
+  void SetEvent(const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
   void SetInVpsMargin(bool InVpsMargin);
-  void SetFlags(int Flags);
-  void ClrFlags(int Flags);
-  void InvFlags(int Flags);
-  bool HasFlags(int Flags) const;
+  void SetPriority(int Priority);
+  void SetFlags(uint Flags);
+  void ClrFlags(uint Flags);
+  void InvFlags(uint Flags);
+  bool HasFlags(uint Flags) const;
   void Skip(void);
   void OnOff(void);
   cString PrintFirstDay(void) const;
diff --git a/tools.c b/tools.c
index 4a4a3aa6b..68a706b2c 100644
--- a/tools.c
+++ b/tools.c
@@ -4,13 +4,20 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.104 2005/11/26 14:12:31 kls Exp $
+ * $Id: tools.c 1.109 2006/01/08 11:40:35 kls Exp $
  */
 
 #include "tools.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
+extern "C" {
+#ifdef boolean
+#define HAVE_BOOLEAN
+#endif
+#include <jpeglib.h>
+#undef boolean
+}
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/time.h>
@@ -421,6 +428,42 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
   return false;
 }
 
+int DirSizeMB(const char *DirName)
+{
+  cReadDir d(DirName);
+  if (d.Ok()) {
+     int size = 0;
+     struct dirent *e;
+     while (size >= 0 && (e = d.Next()) != NULL) {
+           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+              char *buffer;
+              asprintf(&buffer, "%s/%s", DirName, e->d_name);
+              struct stat st;
+              if (stat(buffer, &st) == 0) {
+                 if (S_ISDIR(st.st_mode)) {
+                    int n = DirSizeMB(buffer);
+                    if (n >= 0)
+                       size += n;
+                    else
+                       size = -1;
+                    }
+                 else
+                    size += st.st_size / MEGABYTE(1);
+                 }
+              else {
+                 LOG_ERROR_STR(buffer);
+                 size = -1;
+                 }
+              free(buffer);
+              }
+           }
+     return size;
+     }
+  else
+     LOG_ERROR_STR(DirName);
+  return -1;
+}
+
 char *ReadLink(const char *FileName)
 {
   char RealName[PATH_MAX];
@@ -615,6 +658,145 @@ cString TimeString(time_t t)
   return buf;
 }
 
+// --- RgbToJpeg -------------------------------------------------------------
+
+#define JPEGCOMPRESSMEM 500000
+
+struct tJpegCompressData {
+  int size;
+  uchar *mem;
+  };
+
+static void JpegCompressInitDestination(j_compress_ptr cinfo)
+{
+  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
+  if (jcd) {
+     cinfo->dest->free_in_buffer = jcd->size = JPEGCOMPRESSMEM;
+     cinfo->dest->next_output_byte = jcd->mem = MALLOC(uchar, jcd->size);
+     }
+}
+
+static boolean JpegCompressEmptyOutputBuffer(j_compress_ptr cinfo)
+{
+  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
+  if (jcd) {
+     int Used = jcd->size;
+     jcd->size += JPEGCOMPRESSMEM;
+     jcd->mem = (uchar *)realloc(jcd->mem, jcd->size);
+     if (jcd->mem) {
+        cinfo->dest->next_output_byte = jcd->mem + Used;
+        cinfo->dest->free_in_buffer = jcd->size - Used;
+        return TRUE;
+        }
+     }
+  return FALSE;
+}
+
+static void JpegCompressTermDestination(j_compress_ptr cinfo)
+{
+  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
+  if (jcd) {
+     int Used = cinfo->dest->next_output_byte - jcd->mem;
+     if (Used < jcd->size) {
+        jcd->size = Used;
+        jcd->mem = (uchar *)realloc(jcd->mem, jcd->size);
+        }
+     }
+}
+
+uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality)
+{
+  if (Quality < 0)
+     Quality = 0;
+  else if (Quality > 100)
+     Quality = 100;
+
+  jpeg_destination_mgr jdm;
+
+  jdm.init_destination = JpegCompressInitDestination;
+  jdm.empty_output_buffer = JpegCompressEmptyOutputBuffer;
+  jdm.term_destination = JpegCompressTermDestination;
+
+  struct jpeg_compress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  cinfo.err = jpeg_std_error(&jerr);
+  jpeg_create_compress(&cinfo);
+  cinfo.dest = &jdm;
+  tJpegCompressData jcd;
+  cinfo.client_data = &jcd;
+  cinfo.image_width = Width;
+  cinfo.image_height = Height;
+  cinfo.input_components = 3;
+  cinfo.in_color_space = JCS_RGB;
+
+  jpeg_set_defaults(&cinfo);
+  jpeg_set_quality(&cinfo, Quality, true);
+  jpeg_start_compress(&cinfo, true);
+
+  int rs = Width * 3;
+  JSAMPROW rp[Height];
+  for (int k = 0; k < Height; k++)
+      rp[k] = &Mem[rs * k];
+  jpeg_write_scanlines(&cinfo, rp, Height);
+  jpeg_finish_compress(&cinfo);
+  jpeg_destroy_compress(&cinfo);
+
+  Size = jcd.size;
+  return jcd.mem;
+}
+
+// --- cBase64Encoder --------------------------------------------------------
+
+const char *cBase64Encoder::b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+cBase64Encoder::cBase64Encoder(const uchar *Data, int Length, int MaxResult)
+{
+  data = Data;
+  length = Length;
+  maxResult = MaxResult;
+  i = 0;
+  result = MALLOC(char, maxResult + 1);
+}
+
+cBase64Encoder::~cBase64Encoder()
+{
+  free(result);
+}
+
+const char *cBase64Encoder::NextLine(void)
+{
+  int r = 0;
+  while (i < length && r < maxResult - 3) {
+        result[r++] = b64[(data[i] >> 2) & 0x3F];
+        char c = (data[i] << 4) & 0x3F;
+        if (++i < length)
+           c |= (data[i] >> 4) & 0x0F;
+        result[r++] = b64[c];
+        if (i < length) {
+           c = (data[i] << 2) & 0x3F;
+           if (++i < length)
+              c |= (data[i] >> 6) & 0x03;
+           result[r++] = b64[c];
+           }
+        else {
+           i++;
+           result[r++] = '=';
+           }
+        if (i < length) {
+           c = data[i] & 0x3F;
+           result[r++] = b64[c];
+           }
+        else
+           result[r++] = '=';
+        i++;
+        }
+  if (r > 0) {
+     result[r] = 0;
+     return result;
+     }
+  return NULL;
+}
+
 // --- cReadLine -------------------------------------------------------------
 
 cReadLine::cReadLine(void)
@@ -858,6 +1040,8 @@ bool cSafeFile::Close(void)
 
 // --- cUnbufferedFile -------------------------------------------------------
 
+//#define USE_FADVISE
+
 #define READ_AHEAD MEGABYTE(2)
 #define WRITE_BUFFER MEGABYTE(10)
 
@@ -882,6 +1066,7 @@ int cUnbufferedFile::Open(const char *FileName, int Flags, mode_t Mode)
 
 int cUnbufferedFile::Close(void)
 {
+#ifdef USE_FADVISE
   if (fd >= 0) {
      if (ahead > end)
         end = ahead;
@@ -894,6 +1079,7 @@ int cUnbufferedFile::Close(void)
      begin = end = ahead = -1;
      written = 0;
      }
+#endif
   int OldFd = fd;
   fd = -1;
   return close(OldFd);
@@ -909,6 +1095,7 @@ off_t cUnbufferedFile::Seek(off_t Offset, int Whence)
 ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
 {
   if (fd >= 0) {
+#ifdef USE_FADVISE
      off_t pos = lseek(fd, 0, SEEK_CUR);
      // jump forward - adjust end position
      if (pos > end)
@@ -922,7 +1109,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
      if (begin >= 0 && end > begin)
         posix_fadvise(fd, begin - KILOBYTE(200), end - begin + KILOBYTE(200), POSIX_FADV_DONTNEED);//XXX macros/parameters???
      begin = pos;
+#endif
      ssize_t bytesRead = safe_read(fd, Data, Size);
+#ifdef USE_FADVISE
      if (bytesRead > 0) {
         pos += bytesRead;
         end = pos;
@@ -935,6 +1124,7 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
         }
      else
         end = pos;
+#endif
      return bytesRead;
      }
   return -1;
@@ -943,8 +1133,11 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
 ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
 {
   if (fd >=0) {
+#ifdef USE_FADVISE
      off_t pos = lseek(fd, 0, SEEK_CUR);
+#endif
      ssize_t bytesWritten = safe_write(fd, Data, Size);
+#ifdef USE_FADVISE
      if (bytesWritten >= 0) {
         written += bytesWritten;
         if (begin >= 0) {
@@ -964,6 +1157,7 @@ ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
            written = 0;
            }
         }
+#endif
      return bytesWritten;
      }
   return -1;
@@ -1090,7 +1284,7 @@ int cListObject::Index(void) const
 // --- cListBase -------------------------------------------------------------
 
 cListBase::cListBase(void)
-{ 
+{
   objects = lastObject = NULL;
   count = 0;
 }
@@ -1101,7 +1295,7 @@ cListBase::~cListBase()
 }
 
 void cListBase::Add(cListObject *Object, cListObject *After)
-{ 
+{
   if (After && After != lastObject) {
      After->Next()->Insert(Object);
      After->Append(Object);
@@ -1117,7 +1311,7 @@ void cListBase::Add(cListObject *Object, cListObject *After)
 }
 
 void cListBase::Ins(cListObject *Object, cListObject *Before)
-{ 
+{
   if (Before && Before != objects) {
      Before->Prev()->Append(Object);
      Before->Insert(Object);
diff --git a/tools.h b/tools.h
index 833ba8472..23afea567 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.84 2005/11/26 14:03:47 kls Exp $
+ * $Id: tools.h 1.89 2006/01/08 11:40:37 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -110,6 +110,7 @@ bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
+int DirSizeMB(const char *DirName); ///< returns the total size of the files in the given directory, or -1 in case of an error
 char *ReadLink(const char *FileName); ///< returns a new string allocated on the heap, which the caller must delete (or NULL in case of an error)
 bool SpinUpDisk(const char *FileName);
 void TouchFile(const char *FileName);
@@ -120,6 +121,39 @@ cString DayDateTime(time_t t = 0);
 cString TimeToString(time_t t);
 cString DateString(time_t t);
 cString TimeString(time_t t);
+uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality = 100);
+    ///< Converts the given Memory to a JPEG image and returns a pointer
+    ///< to the resulting image. Mem must point to a data block of exactly
+    ///< (Width * Height) triplets of RGB image data bytes. Upon return, Size
+    ///< will hold the number of bytes of the resulting JPEG data.
+    ///< Quality can be in the range 0..100 and controls the quality of the
+    ///< resulting image, where 100 is "best". The caller takes ownership of
+    ///< the result and has to delete it once it is no longer needed.
+    ///< The result may be NULL in case of an error.
+
+class cBase64Encoder {
+private:
+  const uchar *data;
+  int length;
+  int maxResult;
+  int i;
+  char *result;
+  static const char *b64;
+public:
+  cBase64Encoder(const uchar *Data, int Length, int MaxResult = 64);
+      ///< Sets up a new base 64 encoder for the given Data, with the given Length.
+      ///< Data will not be copied and must be valid as long as NextLine() will be
+      ///< called. MaxResult defines the maximum number of characters in any
+      ///< result line. The resulting lines may be shorter than MaxResult in case
+      ///< its value is not a multiple of 4.
+  ~cBase64Encoder();
+  const char *NextLine(void);
+      ///< Returns the next line of encoded data (terminated by '\0'), or NULL if
+      ///< there is no more encoded data. The caller must call NextLine() and process
+      ///< each returned line until NULL is returned, in order to get the entire
+      ///< data encoded. The returned data is only valid until the next time NextLine()
+      ///< is called, or until the object is destroyed.
+  };
 
 class cTimeMs {
 private:
@@ -152,7 +186,7 @@ class cPoller {
   bool Add(int FileHandle, bool Out);
   bool Poll(int TimeoutMs = 0);
   };
-  
+
 class cReadDir {
 private:
   DIR *directory;
diff --git a/vdr.1 b/vdr.1
index f50db90d6..9ea300d32 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2004 Klaus Schmidinger
+.\" Copyright (C) 2006 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.15 2005/10/09 12:31:03 kls Exp $
+.\" $Id: vdr.1 1.20 2006/01/08 11:51:36 kls Exp $
 .\"
-.TH vdr 1 "19 Dec 2004" "1.3.18" "Video Disk Recorder"
+.TH vdr 1 "08 Jan 2006" "1.3.38" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -59,6 +59,13 @@ Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
 .TP
+.BI \-g,\ \-\-grab= dir
+Write images from the SVDRP command GRAB into the
+given directory \fIdir\fR. \fIdir\fR must be the full path name of an
+existing directory, without any "..", double '/'
+or symlinks. By default, or if \fB\-g\-\fR is given,
+grabbing images to disk is disabled.
+.TP
 .B \-h, \-\-help
 Print a help message and exit.
 .TP
@@ -121,6 +128,13 @@ Call \fIcmd\fR to shutdown the computer.
 .BI \-t\  tty ,\ \-\-terminal= tty
 Set the controlling terminal.
 .TP
+.BI \-u\  user ,\ \-\-user= user
+Run as user \fIuser\fR in case vdr was started as user 'root'.
+Starting vdr as 'root' is necessary if the system time shall
+be set from the transponder data, but for security reasons
+during normal operation vdr switches to a lesser privileged
+user id. By default the user 'vdr' is used.
+.TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
 The default is \fI/video\fR.
@@ -199,7 +213,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2004 Klaus Schmidinger.
+Copyright \(co 2006 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index f139556b8..6103369cc 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2004 Klaus Schmidinger
+.\" Copyright (C) 2006 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.39 2005/09/26 21:38:44 kls Exp $
+.\" $Id: vdr.5 1.45 2006/01/08 11:52:03 kls Exp $
 .\"
-.TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
+.TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -152,7 +152,7 @@ tab (@);
 l l.
 \fB0000\fR@Free To Air
 \fB0001...000F\fR@explicitly requires the device with the given number
-\fB0010...00FF\fR@reserved for user defined assignments defined in \fIca.conf\fR
+\fB0010...00FF\fR@reserved for user defined assignments
 \fB0100...FFFF\fR@specific decryption methods as broadcast in the data stream\fR
 .TE
 Values in the range 0001...00FF will not be overwritten, all other values
@@ -207,7 +207,7 @@ separated by ':' characters. Example:
 The fields in a timer definition have the following meaning (from left
 to right):
 .TP
-.B Status
+.B Flags
 The individual bits in this field have the following meaning:
 .TS
 tab (@);
@@ -219,7 +219,7 @@ l l.
 .TE
 Bits other than these can be used by external programs to mark active timers
 and recognize if the user has modified them. When a user modifies an active
-timer, the upper 16 bits of this 32 bit parameter will be explicitly set to 0.
+timer, the upper 16 bits of this unsigned 32 bit parameter will be explicitly set to 0.
 
 Note: in order to allow future extensibility, external programs using the
 \fBstatus\fR parameter should only use the upper 16 bit of this 32 bit parameter
@@ -227,7 +227,7 @@ and leave the lower 16 bit untouched.
 .TP
 .B Channel
 The channel to record from. This is either the channel number as shown in the
-on-screen menus, or a complete channel ID. When reading \fItimers.conf\fR 
+on-screen menus, or a complete channel ID. When reading \fItimers.conf\fR
 any channel numbers will be mapped to the respective channel ids and when
 the file is written again, there will only be channel ids. Channel numbers
 are accepted as input in order to allow easier creation of timers when
@@ -389,24 +389,6 @@ l l.
 There can be any number of actions in a line, including none at all - in which case
 the entry would be used only to set the LOF to use for the given frequency range
 and polarization.
-.SS CONDITIONAL ACCESS
-The file \fIca.conf\fR defines the numbers to be used in the \fBConditional access\fR
-field of channels in \fIchannels.conf\fR and assigns descriptive texts to them.
-Example:
-
-\fB101    Premiere World\fR
-
-Anything after (and including) a '#' character is comment.
-
-Value lines consist of an integer number, followed by a text describing
-this decryption method (typically the name of the pay tv service using this
-decryption method).
-
-The special value \fB0\fR means \fBFree To Air\fR, which can be used for
-channels that don't require additional decryption hardware.
-
-The values \fB1...4\fR can be used for channels that for some reason explicitly
-need a given DVB card (for backward compatibility).
 .SS REMOTE CONTROL KEYS
 The file \fIremote.conf\fR contains the key assignments for all remote control
 units. Each line consists of one key assignment in the following format:
@@ -627,7 +609,7 @@ The following tag characters are defined:
 tab (@);
 l l.
 \fBC\fR@<channel id> <channel name>
-\fBE\fR@<event id> <start time> <duration> <table id>
+\fBE\fR@<event id> <start time> <duration> <table id> <version>
 \fBT\fR@<title>
 \fBS\fR@<short text>
 \fBD\fR@<description>
@@ -654,6 +636,7 @@ l l.
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
 <table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
+<version>      @is a hex number that indicates the event's version number inside its table (optional)
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
@@ -673,7 +656,7 @@ Written by Klaus Schmidinger.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2004 Klaus Schmidinger.
+Copyright \(co 2006 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index 8b206f978..a476a25bc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1,7 +1,7 @@
 /*
  * vdr.c: Video Disk Recorder main program
  *
- * Copyright (C) 2000, 2003 Klaus Schmidinger
+ * Copyright (C) 2000, 2003, 2006 Klaus Schmidinger
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,13 +22,17 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.220 2005/11/27 15:56:18 kls Exp $
+ * $Id: vdr.c 1.233 2006/01/08 11:49:03 kls Exp $
  */
 
 #include <getopt.h>
+#include <grp.h>
 #include <locale.h>
+#include <pwd.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <sys/capability.h>
+#include <sys/prctl.h>
 #include <termios.h>
 #include <unistd.h>
 #include "audio.h"
@@ -72,6 +76,57 @@
 
 static int Interrupted = 0;
 
+static bool SetUser(const char *UserName)
+{
+  if (UserName) {
+     struct passwd *user = getpwnam(UserName);
+     if (!user) {
+        fprintf(stderr, "vdr: unknown user: '%s'\n", UserName);
+        return false;
+        }
+     if (setgid(user->pw_gid) < 0) {
+        fprintf(stderr, "vdr: cannot set group id %u: %s\n", (unsigned int)user->pw_gid, strerror(errno));
+        return false;
+        }
+     if (initgroups(user->pw_name, user->pw_gid) < 0) {
+        fprintf(stderr, "vdr: cannot set supplemental group ids for user %s: %s\n", user->pw_name, strerror(errno));
+        return false;
+        }
+     if (setuid(user->pw_uid) < 0) {
+        fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
+        return false;
+        }
+     }
+  return true;
+}
+
+static bool SetCapSysTime(void)
+{
+  // drop all capabilities except cap_sys_time
+  cap_t caps = cap_from_text("= cap_sys_time=ep");
+  if (!caps) {
+     fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
+     return false;
+     }
+  if (cap_set_proc(caps) == -1) {
+     fprintf(stderr, "vdr: cap_set_proc failed: %s\n", strerror(errno));
+     cap_free(caps);
+     return false;
+     }
+  cap_free(caps);
+  return true;
+}
+
+static bool SetKeepCaps(bool On)
+{
+  // set keeping capabilities during setuid() on/off
+  if (prctl(PR_SET_KEEPCAPS, On ? 1 : 0, 0, 0, 0) != 0) {
+     fprintf(stderr, "vdr: prctl failed\n");
+     return false;
+     }
+  return true;
+}
+
 static void SignalHandler(int signum)
 {
   if (signum != SIGPIPE) {
@@ -102,11 +157,14 @@ int main(int argc, char *argv[])
 
   // Command line options:
 
+#define DEFAULTVDRUSER   "vdr"
 #define DEFAULTSVDRPPORT 2001
 #define DEFAULTWATCHDOG     0 // seconds
 #define DEFAULTPLUGINDIR PLUGINDIR
 #define DEFAULTEPGDATAFILENAME "epg.data"
 
+  bool StartedAsRoot = false;
+  const char *VdrUser = DEFAULTVDRUSER;
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *AudioCommand = NULL;
   const char *ConfigDirectory = NULL;
@@ -144,6 +202,7 @@ int main(int argc, char *argv[])
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
       { "epgfile",  required_argument, NULL, 'E' },
+      { "grab",     required_argument, NULL, 'g' },
       { "help",     no_argument,       NULL, 'h' },
       { "lib",      required_argument, NULL, 'L' },
       { "lirc",     optional_argument, NULL, 'l' | 0x100 },
@@ -156,6 +215,7 @@ int main(int argc, char *argv[])
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
+      { "user",     required_argument, NULL, 'u' },
       { "version",  no_argument,       NULL, 'V' },
       { "vfat",     no_argument,       NULL, 'v' | 0x100 },
       { "video",    required_argument, NULL, 'v' },
@@ -164,7 +224,7 @@ int main(int argc, char *argv[])
     };
 
   int c;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:hl:L:mp:P:r:s:t:v:Vw:", long_options, NULL)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:g:hl:L:mp:P:r:s:t:u:v:Vw:", long_options, NULL)) != -1) {
         switch (c) {
           case 'a': AudioCommand = optarg;
                     break;
@@ -183,6 +243,8 @@ int main(int argc, char *argv[])
                     break;
           case 'E': EpgDataFileName = (*optarg != '-' ? optarg : NULL);
                     break;
+          case 'g': cSVDRP::SetGrabImageDir(*optarg != '-' ? optarg : NULL);
+                    break;
           case 'h': DisplayHelp = true;
                     break;
           case 'l': {
@@ -248,6 +310,9 @@ int main(int argc, char *argv[])
                        return 2;
                        }
                     break;
+          case 'u': if (*optarg)
+                       VdrUser = optarg;
+                    break;
           case 'V': DisplayVersion = true;
                     break;
           case 'v' | 0x100:
@@ -270,6 +335,20 @@ int main(int argc, char *argv[])
           }
         }
 
+  // Set user id in case we were started as root:
+
+  if (getuid() == 0) {
+     StartedAsRoot = true;
+     if (!SetKeepCaps(true))
+        return 2;
+     if (!SetUser(VdrUser))
+        return 2;
+     if (!SetKeepCaps(false))
+        return 2;
+     if (!SetCapSysTime())
+        return 2;
+     }
+
   // Help and version info:
 
   if (DisplayHelp || DisplayVersion) {
@@ -285,11 +364,15 @@ int main(int argc, char *argv[])
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
                "                           there may be several -D options (default: all DVB\n"
                "                           devices will be used)\n"
-               "  -E FILE   --epgfile=FILE write the EPG data into the given FILE (default is\n"
+               "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
                "                           '%s' in the video directory)\n"
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
+               "  -g DIR,   --grab=DIR     write images from the SVDRP command GRAB into the\n"
+               "                           given DIR; DIR must be the full path name of an\n"
+               "                           existing directory, without any \"..\", double '/'\n"
+               "                           or symlinks (default: none, same as -g-)\n"
                "  -h,       --help         print this help and exit\n"
                "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                "                           0 = no logging, 1 = errors only,\n"
@@ -309,6 +392,8 @@ int main(int argc, char *argv[])
                "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "  -t TTY,   --terminal=TTY controlling tty\n"
+               "  -u USER,  --user=USER    run as user USER (default: %s); only applicable\n"
+               "                           if started as root\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
                "            --vfat         encode special characters in recording names to\n"
@@ -321,6 +406,7 @@ int main(int argc, char *argv[])
                LIRC_DEVICE,
                DEFAULTSVDRPPORT,
                RCU_DEVICE,
+               DEFAULTVDRUSER,
                VideoDirectory,
                DEFAULTWATCHDOG
                );
@@ -371,7 +457,7 @@ int main(int argc, char *argv[])
 
   if (DaemonMode) {
      if (daemon(1, 0) == -1) {
-        fprintf(stderr, "%m\n");
+        fprintf(stderr, "vdr: %m\n");
         esyslog("ERROR: %m");
         return 2;
         }
@@ -385,12 +471,16 @@ int main(int argc, char *argv[])
      }
 
   isyslog("VDR version %s started", VDRVERSION);
+  if (StartedAsRoot)
+     isyslog("switched to user '%s'", VdrUser);
+  if (DaemonMode)
+     dsyslog("running as daemon (tid=%d)", cThread::ThreadId());
+  cThread::SetMainThreadId();
 
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
   cOsdObject *Menu = NULL;
-  cOsdObject *Temp = NULL;
-  int LastChannel = -1;
+  int LastChannel = 0;
   int LastTimerChannel = -1;
   int PreviousChannel[2] = { 1, 1 };
   int PreviousChannelIndex = 0;
@@ -401,6 +491,7 @@ int main(int argc, char *argv[])
   bool ForceShutdown = false;
   bool UserShutdown = false;
   bool TimerInVpsMargin = false;
+  bool IsInfoMenu = false;
 
   // Load plugins:
 
@@ -423,7 +514,6 @@ int main(int argc, char *argv[])
         Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&
         RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true) &&
         SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true) &&
-        CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true) &&
         Keys.Load(AddDirectory(ConfigDirectory, "remote.conf")) &&
         KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true)
         ))
@@ -434,6 +524,7 @@ int main(int argc, char *argv[])
   // Recordings:
 
   Recordings.Update();
+  DeletedRecordings.Update();
 
   // EPG data:
 
@@ -555,6 +646,8 @@ int main(int argc, char *argv[])
 
   // Main program loop:
 
+#define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
+
   while (!Interrupted) {
         // Handle emergency exits:
         if (cThread::EmergencyExit()) {
@@ -576,8 +669,8 @@ int main(int argc, char *argv[])
                      && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
                      && !cDevice::SwitchChannel(1) // ...or the next higher available one...
                      && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
-                    ; 
-                 }   
+                    ;
+                 }
               lastTime = time(NULL); // don't do this too often
               LastTimerChannel = -1;
               }
@@ -626,7 +719,7 @@ int main(int argc, char *argv[])
         // Channel display:
         if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
            if (!Menu)
-              Menu = Temp = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel > 0);
+              Menu = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel >= 0);
            LastChannel = cDevice::CurrentChannel();
            LastChannelChanged = time(NULL);
            }
@@ -667,8 +760,10 @@ int main(int argc, char *argv[])
                   TimerInVpsMargin = true;
                }
            }
-        if (!Menu && Recordings.NeedsUpdate())
+        if (!Menu && Recordings.NeedsUpdate()) {
            Recordings.Update();
+           DeletedRecordings.Update();
+           }
         // CAM control:
         if (!Menu && !cOsd::IsOpen()) {
            Menu = CamControl();
@@ -692,22 +787,39 @@ int main(int argc, char *argv[])
           // Menu control:
           case kMenu:
                key = kNone; // nobody else needs to see this key
-               if (Menu) {
-                  DELETENULL(Menu);
-                  if (!Temp)
-                     break;
-                  }
-               if (cControl::Control())
+               if (Menu)
+                  DELETE_MENU;
+               else if (cControl::Control() && cOsd::IsOpen())
                   cControl::Control()->Hide();
-               Menu = new cMenuMain(cControl::Control());
-               Temp = NULL;
+               else
+                  Menu = new cMenuMain;
+               break;
+          // Info:
+          case kInfo: {
+               bool WasInfoMenu = IsInfoMenu;
+               DELETE_MENU;
+               if (!WasInfoMenu) {
+                  IsInfoMenu = true;
+                  if (cControl::Control()) {
+                     cControl::Control()->Hide();
+                     Menu = cControl::Control()->GetInfo();
+                     if (Menu)
+                        Menu->Show();
+                     else
+                        IsInfoMenu = false;
+                     }
+                  else {
+                     cRemote::Put(kOk, true);
+                     cRemote::Put(kSchedule, true);
+                     }
+                  }
+               }
                break;
           #define DirectMainFunction(function)\
-            DELETENULL(Menu);\
+            DELETE_MENU;\
             if (cControl::Control())\
                cControl::Control()->Hide();\
-            Menu = new cMenuMain(cControl::Control(), function);\
-            Temp = NULL;\
+            Menu = new cMenuMain(function);\
             key = kNone; // nobody else needs to see this key
           case kSchedule:   DirectMainFunction(osSchedule); break;
           case kChannels:   DirectMainFunction(osChannels); break;
@@ -717,18 +829,14 @@ int main(int argc, char *argv[])
           case kCommands:   DirectMainFunction(osCommands); break;
           case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
           case k_Plugin: {
-               DELETENULL(Menu);
-               Temp = NULL;
+               DELETE_MENU;
                if (cControl::Control())
                   cControl::Control()->Hide();
                cPlugin *plugin = cPluginManager::GetPlugin(cRemote::GetPlugin());
                if (plugin) {
-                  Menu = Temp = plugin->MainMenuAction();
-                  if (Menu) {
+                  Menu = plugin->MainMenuAction();
+                  if (Menu)
                      Menu->Show();
-                     if (Menu->IsMenu())
-                        ((cOsdMenu*)Menu)->Display();
-                     }
                   }
                else
                   esyslog("ERROR: unknown plugin '%s'", cRemote::GetPlugin());
@@ -757,7 +865,7 @@ int main(int argc, char *argv[])
                else
                   cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
                if (!Menu && !cOsd::IsOpen())
-                  Menu = Temp = cDisplayVolume::Create();
+                  Menu = cDisplayVolume::Create();
                cDisplayVolume::Process(key);
                key = kNone; // nobody else needs to see these keys
                break;
@@ -765,12 +873,10 @@ int main(int argc, char *argv[])
           case kAudio:
                if (cControl::Control())
                   cControl::Control()->Hide();
-               if (Temp && !cDisplayTracks::IsOpen()) {
-                  DELETENULL(Menu);
-                  Temp = NULL;
+               if (!cDisplayTracks::IsOpen()) {
+                  DELETE_MENU;
+                  Menu = cDisplayTracks::Create();
                   }
-               if (!Menu && !cOsd::IsOpen())
-                  Menu = Temp = cDisplayTracks::Create();
                else
                   cDisplayTracks::Process(key);
                key = kNone;
@@ -778,8 +884,7 @@ int main(int argc, char *argv[])
           // Pausing live video:
           case kPause:
                if (!cControl::Control()) {
-                  DELETENULL(Menu);
-                  Temp = NULL;
+                  DELETE_MENU;
                   if (!cRecordControls::PauseLiveVideo())
                      Skins.Message(mtError, tr("No free DVB device to record!"));
                   key = kNone; // nobody else needs to see this key
@@ -797,8 +902,7 @@ int main(int argc, char *argv[])
                break;
           // Power off:
           case kPower: isyslog("Power button pressed");
-                       DELETENULL(Menu);
-                       Temp = NULL;
+                       DELETE_MENU;
                        if (!Shutdown) {
                           Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
                           break;
@@ -828,53 +932,46 @@ int main(int argc, char *argv[])
                  state = osEnd;
               }
            switch (state) {
-             case osPause:  DELETENULL(Menu);
+             case osPause:  DELETE_MENU;
                             cControl::Shutdown(); // just in case
-                            Temp = NULL;
                             if (!cRecordControls::PauseLiveVideo())
                                Skins.Message(mtError, tr("No free DVB device to record!"));
                             break;
-             case osRecord: DELETENULL(Menu);
-                            Temp = NULL;
+             case osRecord: DELETE_MENU;
                             if (cRecordControls::Start())
-                               ;//XXX Skins.Message(mtInfo, tr("Recording"));
+                               Skins.Message(mtInfo, tr("Recording started"));
                             else
                                Skins.Message(mtError, tr("No free DVB device to record!"));
                             break;
              case osRecordings:
-                            DELETENULL(Menu);
+                            DELETE_MENU;
                             cControl::Shutdown();
-                            Temp = NULL;
-                            Menu = new cMenuMain(false, osRecordings);
+                            Menu = new cMenuMain(osRecordings);
                             break;
-             case osReplay: DELETENULL(Menu);
+             case osReplay: DELETE_MENU;
                             cControl::Shutdown();
-                            Temp = NULL;
                             cControl::Launch(new cReplayControl);
                             break;
              case osStopReplay:
-                            DELETENULL(Menu);
+                            DELETE_MENU;
                             cControl::Shutdown();
-                            Temp = NULL;
                             break;
              case osSwitchDvb:
-                            DELETENULL(Menu);
+                            DELETE_MENU;
                             cControl::Shutdown();
-                            Temp = NULL;
                             Skins.Message(mtInfo, tr("Switching primary DVB..."));
                             cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                             break;
-             case osPlugin: DELETENULL(Menu);
-                            Menu = Temp = cMenuMain::PluginOsdObject();
+             case osPlugin: DELETE_MENU;
+                            Menu = cMenuMain::PluginOsdObject();
                             if (Menu)
                                Menu->Show();
                             break;
              case osBack:
              case osEnd:    if (Interact == Menu)
-                               DELETENULL(Menu);
+                               DELETE_MENU;
                             else
                                cControl::Shutdown();
-                            Temp = NULL;
                             break;
              default:       ;
              }
@@ -913,7 +1010,6 @@ int main(int argc, char *argv[])
              case kPlay:
                   if (cReplayControl::LastReplayed()) {
                      cControl::Shutdown();
-                     Temp = NULL;
                      cControl::Launch(new cReplayControl);
                      }
                   break;
diff --git a/videodir.c b/videodir.c
index 5206d0c7a..a07ed28eb 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.13 2005/10/31 12:07:41 kls Exp $
+ * $Id: videodir.c 1.14 2005/12/18 10:33:20 kls Exp $
  */
 
 #include "videodir.h"
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "recording.h"
 #include "tools.h"
 
 const char *VideoDirectory = VIDEODIR;
@@ -185,12 +186,17 @@ bool VideoFileSpaceAvailable(int SizeMB)
 int VideoDiskSpace(int *FreeMB, int *UsedMB)
 {
   int free = 0, used = 0;
+  int deleted = DeletedRecordings.TotalFileSizeMB();
   cVideoDirectory Dir;
   do {
      int u;
      free += Dir.FreeMB(&u);
      used += u;
      } while (Dir.Next());
+  if (deleted > used)
+     deleted = used; // let's not get beyond 100%
+  free += deleted;
+  used -= deleted;
   if (FreeMB)
      *FreeMB = free;
   if (UsedMB)

From 78e3da813cb4345e57934a9a60f6316f1e257307 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 15 Jan 2006 18:00:00 +0100
Subject: [PATCH 131/307] =?UTF-8?q?Version=201.3.39=20-=20The=20SVDRP=20co?=
 =?UTF-8?q?mmand=20LSTT=20now=20accepts=20the=20new=20option=20'id'=20to?=
 =?UTF-8?q?=20have=20the=20channels=20=20=20of=20the=20timers=20listed=20w?=
 =?UTF-8?q?ith=20their=20unique=20channel=20ids=20instead=20of=20their=20n?=
 =?UTF-8?q?umbers=20=20=20(suggested=20by=20Matthias=20Schniedermeyer).=20?=
 =?UTF-8?q?-=20Added=20a=20missing=20#include=20<linux/unistd.h>=20to=20th?=
 =?UTF-8?q?read.c=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Fixed=20the?=
 =?UTF-8?q?=20"plugins-clean"=20and=20"plugins-install"=20targets=20in=20t?=
 =?UTF-8?q?he=20Makefile=20(thanks=20=20=20to=20Andreas=20Brachold).=20-?=
 =?UTF-8?q?=20Fixed=20handling=20"more=20than=203=20byte"=20key=20sequence?=
 =?UTF-8?q?s=20in=20cKbdRemote::ReadKeySequence()=20=20=20(thanks=20to=20P?=
 =?UTF-8?q?eter=20Bieringer).=20If=20you=20are=20using=20the=20PC=20keyboa?=
 =?UTF-8?q?rd=20as=20remote=20control=20=20=20input=20you=20may=20need=20t?=
 =?UTF-8?q?o=20make=20VDR=20newly=20learn=20the=20keys=20by=20removing=20t?=
 =?UTF-8?q?he=20remote.conf=20=20=20file.=20-=20To=20avoid=20problems=20wi?=
 =?UTF-8?q?th=20access=20rights=20when=20VDR=20shall=20run=20as=20'root'?=
 =?UTF-8?q?=20it=20now=20skips=20=20=20all=20SetCaps()=20and=20SetUser()?=
 =?UTF-8?q?=20calls=20when=20it=20is=20started=20as=20'root'=20and=20"-u?=
 =?UTF-8?q?=20root"=20=20=20is=20given.=20-=20Added=20missing=20i18n=20ent?=
 =?UTF-8?q?ry=20for=20the=20"Timer"=20button=20(thanks=20to=20Ville=20Skyt?=
 =?UTF-8?q?t=C3=A4)=20-=20Updated=20the=20Finnish=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Rolf=20Ahrenberg).=20-=20Making=20the=20"Menu"=20key=20?=
 =?UTF-8?q?behave=20consistently=20has=20not=20been=20well=20received=20by?=
 =?UTF-8?q?=20several=20=20=20users,=20so=20the=20new=20option=20"Setup/OS?=
 =?UTF-8?q?D/Menu=20button=20closes"=20can=20be=20used=20to=20get=20the=20?=
 =?UTF-8?q?=20=20old=20behavior=20back=20(which=20also=20is=20the=20defaul?=
 =?UTF-8?q?t=20value=20of=20this=20option).=20-=20Dropped=20the=20default?=
 =?UTF-8?q?=20vdr=20user.=20The=20program=20now=20always=20runs=20under=20?=
 =?UTF-8?q?the=20user=20id=20=20=20it=20was=20started=20from,=20unless=20t?=
 =?UTF-8?q?he=20'-u'=20option=20is=20given=20and=20it=20was=20started=20fr?=
 =?UTF-8?q?om=20=20=20the=20'root'=20user.=20If=20you=20want=20to=20have?=
 =?UTF-8?q?=20a=20default=20vdr=20user,=20you=20can=20activate=20and=20=20?=
 =?UTF-8?q?=20adjust=20the=20"VDR=5FUSER=20=3D=20vdr"=20line=20in=20your?=
 =?UTF-8?q?=20Make.config=20file=20(from=20the=20original=20=20=20patch=20?=
 =?UTF-8?q?by=20Ludwig=20Nussel).=20-=20Key=20macros=20can=20now=20be=20de?=
 =?UTF-8?q?fined=20for=20all=20non-modeless=20keys=20(suggested=20by=20Mir?=
 =?UTF-8?q?ko=20D=C3=B6lle).=20-=20Adjusted=20the=20"KEY=20MACROS"=20secti?=
 =?UTF-8?q?on=20of=20vdr.5=20to=20the=20new=20plugin=20calling=20mechanism?=
 =?UTF-8?q?=20=20=20introduced=20in=20version=201.3.32.=20-=20Removed=20th?=
 =?UTF-8?q?e=20now=20obsolete=20"ca.conf"=20section=20from=20vdr.1=20(than?=
 =?UTF-8?q?ks=20to=20Ville=20Skytt=C3=A4).=20-=20Added=20missing=20descrip?=
 =?UTF-8?q?tion=20of=20L=20and=20R=20circular=20polarization=20to=20'diseq?=
 =?UTF-8?q?c.conf'.=20-=20Added=20a=20note=20about=20"modprobe=20capabilit?=
 =?UTF-8?q?y"=20to=20INSTALL=20(suggested=20by=20Patrick=20Cernko).=20-=20?=
 =?UTF-8?q?Fixed=20canonicalizing=20the=20file=20name=20in=20the=20SVDRP?=
 =?UTF-8?q?=20command=20GRAB=20to=20allow=20full=20path=20=20=20names=20(t?=
 =?UTF-8?q?hanks=20to=20Stefan=20Huelswitt).=20-=20Added=20a=20missing=20'?=
 =?UTF-8?q?-'=20to=20the=20example=20for=20viewing=20a=20grabbed=20image?=
 =?UTF-8?q?=20on=20a=20remote=20host=20=20=20(reported=20by=20Philippe=20G?=
 =?UTF-8?q?ramoull=C3=A9).=20-=20Made=20the=20"What's=20on=20now/next=3F"?=
 =?UTF-8?q?=20menus=20a=20lot=20faster=20by=20storing=20a=20pointer=20to?=
 =?UTF-8?q?=20each=20=20=20channel's=20schedule=20in=20the=20cChannel=20da?=
 =?UTF-8?q?ta.=20-=20Made=20the=20log=20messages=20regarding=20lost=20lock?=
 =?UTF-8?q?=20of=20devices=20"info"=20instead=20of=20"error"=20=20=20(sugg?=
 =?UTF-8?q?ested=20by=20Andreas=20Brachold).=20-=20The=20SVDRP=20command?=
 =?UTF-8?q?=20GRAB=20allows=20file=20names=20without=20extension=20again?=
 =?UTF-8?q?=20(suggested=20by=20=20=20Stefan=20Huelswitt).=20-=20Pressing?=
 =?UTF-8?q?=20'0'=20in=20the=20"Schedule"=20menu=20now=20rotates=20through?=
 =?UTF-8?q?=20displaying=20"This=20event=20on=20=20=20this=20channel",=20"?=
 =?UTF-8?q?This=20event=20on=20all=20channels"=20and=20"All=20events=20on?=
 =?UTF-8?q?=20all=20channels".=20=20=20This=20can=20be=20used=20to=20find?=
 =?UTF-8?q?=20reruns=20of=20a=20given=20show,=20or=20the=20episodes=20of?=
 =?UTF-8?q?=20a=20series.=20=20=20Note=20that=20if=20there=20are=20many=20?=
 =?UTF-8?q?channels=20in=20your=20channels.conf,=20displaying=20the=20=20?=
 =?UTF-8?q?=20"All=20events=20on=20all=20channels"=20page=20may=20take=20a?=
 =?UTF-8?q?=20while.=20-=20The=20status=20markers=20in=20the=20"Schedule"?=
 =?UTF-8?q?=20menu=20are=20now=20only=20updated=20if=20a=20submenu=20is=20?=
 =?UTF-8?q?=20=20closed=20in=20which=20a=20timer=20has=20been=20modified,?=
 =?UTF-8?q?=20which=20speeds=20up=20closing=20submenus.=20-=20Now=20only?=
 =?UTF-8?q?=20writing=20Dolby=20Digital=20tracks=20into=20the=20'info.vdr'?=
 =?UTF-8?q?=20file=20of=20a=20recording=20=20=20if=20Setup.UseDolbyDigital?=
 =?UTF-8?q?=20is=20true=20(suggested=20by=20Andr=C3=A9=20Weidemann).=20-?=
 =?UTF-8?q?=20Added=20a=20leading=20'0'=20to=20the=20day=20in=20the=20DayD?=
 =?UTF-8?q?ateTime()=20function=20(thanks=20to=20Rolf=20=20=20Ahrenberg).?=
 =?UTF-8?q?=20-=20No=20longer=20displaying=20color=20buttons=20in=20the=20?=
 =?UTF-8?q?recording=20info=20menu=20if=20it=20has=20been=20=20=20invoked?=
 =?UTF-8?q?=20from=20a=20player=20(reported=20by=20J=C3=BCrgen=20Schilling?=
 =?UTF-8?q?).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         |  30 +++++++
 HISTORY              |  57 +++++++++++-
 INSTALL              |  14 ++-
 MANUAL               |  14 +++
 Make.config.template |   5 +-
 Makefile             |  11 ++-
 README.vps           |   1 +
 channels.c           |   9 +-
 channels.conf        |   6 +-
 channels.h           |   6 +-
 config.c             |   5 +-
 config.h             |   7 +-
 diseqc.conf          |   2 +-
 dvbdevice.c          |  10 +--
 eit.c                |   8 +-
 epg.c                |  20 ++++-
 epg.h                |   3 +-
 i18n.c               | 119 +++++++++++++++++++++++--
 menu.c               | 204 +++++++++++++++++++++++++++++++++++--------
 remote.c             |  15 ++--
 svdrp.c              |  59 ++++++++-----
 thread.c             |   3 +-
 timers.c             |  14 +--
 timers.h             |  11 +--
 tools.c              |   4 +-
 vdr.1                |   9 +-
 vdr.5                |  17 ++--
 vdr.c                |  54 +++++++-----
 28 files changed, 558 insertions(+), 159 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d524a3031..dadcf8c91 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -71,6 +71,8 @@ Matthias Schniedermeyer <ms@citd.de>
  and had their start time changed into the future
  for suggesting to give the timer status a bit that is set when that timer
  is currently recording
+ for suggesting to make the SVDRP command LSTT optionally list the channels
+ of the timers with their unique channel ids instead of their numbers
 
 Miha Setina <mihasetina@softhome.net>
  for translating OSD texts to the Slovenian language
@@ -209,6 +211,10 @@ Stefan Huelswitt <huels@iname.com>
  live PIDs
  for reporting a problem in SetProgress() of the 'skincurses' plugin in case Total
  is 0
+ for fixing canonicalizing the file name in the SVDRP command GRAB to allow full
+ path names
+ for suggesting that the SVDRP command GRAB should allow file names without extension
+ again
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -425,6 +431,7 @@ Mirko D
  for suggesting to avoid the external 'find' command to scan the video directory
  for reporting a problem with inconsistent channel and timer lists
  for making the "Play" key in live viewing mode resume a previous replay session
+ for suggesting to allow defining key macros for all non-modeless keys
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -853,6 +860,9 @@ Andreas Brachold <vdr04@deltab.de>
  for reporting that there are empty info.vdr files created if there is no EPG
  info available
  for implementing the SVDRP command MOVC
+ for fixing the "plugins-clean" and "plugins-install" targets in the Makefile
+ for suggesting to make the log messages regarding lost lock of devices "info"
+ instead of "error"
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -925,6 +935,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for changing the title of the recording info menu
  for reporting a bug in handling key macros with keys after @plugin
  for adding compiler options "-fPIC -g" to all plugins
+ for adding a leading '0' to the day in the DayDateTime() function
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -940,6 +951,7 @@ Peter Bieringer <pb@bieringer.de>
  for suggesting to implement the command line option '--vfat'
  for reporting a leftover 'summary.vdr' in vdr.5
  for adding more error messages and line numbers when reading EPG data and info.vdr
+ for fixing handling "more than 3 byte" key sequences in cKbdRemote::ReadKeySequence()
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
@@ -1459,6 +1471,9 @@ Ville Skytt
  warnings with g++ 4.1.0
  for reporting warnings with g++ 4.1.0 regarding incrementing the 'state' variables
  in the repacker classes in remux.c
+ for adding a missing #include <linux/unistd.h> to thread.c
+ for adding missing i18n entry for the "Timer" button
+ for removing the obsolete "ca.conf" section from vdr.1
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1625,3 +1640,18 @@ Marcel Schaeben <mts280@gmx.de>
 
 Ingo Schneider <mail@ingo-schneider.de>
  for adding a SleepMs() in cRecorder::Action() to avoid a busy loop
+
+Patrick Cernko <errror@errror.org>
+ for suggesting to add a note about "modprobe capability" to INSTALL
+
+Philippe Gramoull� <philippe@gramoulle.com>
+ for reporting a a missing '-' in the example for viewing a grabbed image on a remote
+ host
+
+Andr� Weidemann <Andre.Weidemann@web.de>
+ for suggesting to only write Dolby Digital tracks into the 'info.vdr' file of a
+ recording if Setup.UseDolbyDigital is true
+
+J�rgen Schilling <juergen_schilling@web.de>
+ for reporting that color buttons were displayed in the recording info menu if it
+ has been invoked from a player
diff --git a/HISTORY b/HISTORY
index 49201ddce..3a657c0e5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4029,7 +4029,7 @@ Video Disk Recorder Revision History
   name (based on a suggestion from Darren Salt).
   A simple way of viewing a grabbed image on a remote host is:
 
-  svdrpsend.pl -d <hostname> 'grab -' | sed -n -e 's/^216-//p' -e '1ibegin-base64 644 -' -e '$a====' | uudecode | display
+  svdrpsend.pl -d <hostname> 'grab -' | sed -n -e 's/^216-//p' -e '1ibegin-base64 644 -' -e '$a====' | uudecode | display -
 
 - The new command line option '-g' must be given if the SVDRP command GRAB
   shall be allowed to write image files to disk. The parameter to this option
@@ -4134,3 +4134,58 @@ Video Disk Recorder Revision History
 - Added a SleepMs() in cRecorder::Action() to avoid a busy loop (thanks to Ingo
   Schneider).
 - Cleaned up some trailing white space.
+
+2006-01-15: Version 1.3.39
+
+- The SVDRP command LSTT now accepts the new option 'id' to have the channels
+  of the timers listed with their unique channel ids instead of their numbers
+  (suggested by Matthias Schniedermeyer).
+- Added a missing #include <linux/unistd.h> to thread.c (thanks to Ville Skytt�).
+- Fixed the "plugins-clean" and "plugins-install" targets in the Makefile (thanks
+  to Andreas Brachold).
+- Fixed handling "more than 3 byte" key sequences in cKbdRemote::ReadKeySequence()
+  (thanks to Peter Bieringer). If you are using the PC keyboard as remote control
+  input you may need to make VDR newly learn the keys by removing the remote.conf
+  file.
+- To avoid problems with access rights when VDR shall run as 'root' it now skips
+  all SetCaps() and SetUser() calls when it is started as 'root' and "-u root"
+  is given.
+- Added missing i18n entry for the "Timer" button (thanks to Ville Skytt�)
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Making the "Menu" key behave consistently has not been well received by several
+  users, so the new option "Setup/OSD/Menu button closes" can be used to get the
+  old behavior back (which also is the default value of this option).
+- Dropped the default vdr user. The program now always runs under the user id
+  it was started from, unless the '-u' option is given and it was started from
+  the 'root' user. If you want to have a default vdr user, you can activate and
+  adjust the "VDR_USER = vdr" line in your Make.config file (from the original
+  patch by Ludwig Nussel).
+- Key macros can now be defined for all non-modeless keys (suggested by Mirko D�lle).
+- Adjusted the "KEY MACROS" section of vdr.5 to the new plugin calling mechanism
+  introduced in version 1.3.32.
+- Removed the now obsolete "ca.conf" section from vdr.1 (thanks to Ville Skytt�).
+- Added missing description of L and R circular polarization to 'diseqc.conf'.
+- Added a note about "modprobe capability" to INSTALL (suggested by Patrick Cernko).
+- Fixed canonicalizing the file name in the SVDRP command GRAB to allow full path
+  names (thanks to Stefan Huelswitt).
+- Added a missing '-' to the example for viewing a grabbed image on a remote host
+  (reported by Philippe Gramoull�).
+- Made the "What's on now/next?" menus a lot faster by storing a pointer to each
+  channel's schedule in the cChannel data.
+- Made the log messages regarding lost lock of devices "info" instead of "error"
+  (suggested by Andreas Brachold).
+- The SVDRP command GRAB allows file names without extension again (suggested by
+  Stefan Huelswitt).
+- Pressing '0' in the "Schedule" menu now rotates through displaying "This event on
+  this channel", "This event on all channels" and "All events on all channels".
+  This can be used to find reruns of a given show, or the episodes of a series.
+  Note that if there are many channels in your channels.conf, displaying the
+  "All events on all channels" page may take a while.
+- The status markers in the "Schedule" menu are now only updated if a submenu is
+  closed in which a timer has been modified, which speeds up closing submenus.
+- Now only writing Dolby Digital tracks into the 'info.vdr' file of a recording
+  if Setup.UseDolbyDigital is true (suggested by Andr� Weidemann).
+- Added a leading '0' to the day in the DayDateTime() function (thanks to Rolf
+  Ahrenberg).
+- No longer displaying color buttons in the recording info menu if it has been
+  invoked from a player (reported by J�rgen Schilling).
diff --git a/INSTALL b/INSTALL
index 8290c259a..3be9c34e4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,6 +40,12 @@ adjust the definition of DVBDIR in that file.
 VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
 to work properly.
 
+You will also need to install the "libjpeg" and "libcap" libraries,
+as well as their "devel" packages to get the necessary header files
+for compiling VDR. If the "capability" module is not compiled into
+your kernel, you may need to do "modprobe capability" before running
+VDR.
+
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
 named 'vdr', which can be run after the DVB driver has been
@@ -136,10 +142,10 @@ Setting the system time:
 ------------------------
 
 If you want VDR to set the system time according to the data received
-from the transponder, you need to start VDR as user 'root'. VDR will
-then only keep the capability to set the system time, and set its
-user id to a lesser privileged one ('vdr' by default, can be set
-to a different value with the '-u' option).
+from the transponder, you need to start VDR as user 'root'. For security
+reasons you should then use the '-u' option to define a lesser privileged
+user id under which VDR should actually run. It will then only keep the
+capability to set the system time, and set its user id to the given one.
 You also need to enable the "EPG/Set system time" option in VDR's
 Setup menu, and select a transponder from which you want to receive
 the time in "Use time from transponder". Make sure you select a transponder
diff --git a/MANUAL b/MANUAL
index 6028b75eb..cd86d7313 100644
--- a/MANUAL
+++ b/MANUAL
@@ -72,6 +72,7 @@ Version 1.3
 
   Red       Recordings menu
   Green     Schedule menu
+  Yellow    Info
   Blue      Timers menu
 
   (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
@@ -176,6 +177,12 @@ Version 1.3
      whether there is currently a DVB card receiving the transponder this channel
      is on).
 
+  Pressing '0' in the "Schedule" menu rotates through displaying "This event on
+  this channel", "This event on all channels" and "All events on all channels".
+  This can be used to find reruns of a given show, or the episodes of a series.
+  Note that if there are many channels in your channels.conf, displaying the
+  "All events on all channels" page may take a while.
+
 * Selecting a Channel
 
   There are four ways to select a channel:
@@ -525,6 +532,13 @@ Version 1.3
                                (first) line of the list directly to the first (last)
                                one.
 
+  Menu button closes = no
+                         If set to "yes", pressing the "Menu" button while there is
+                         anything displayed on the OSD will close the OSD. If set
+                         to "no", the "Menu" button will open the main menu after
+                         closing a temporary display, like, for instance, the channel
+                         display.
+
   Sort timers = yes      Turns sorting the timers in the "Timers" menu on/off.
                          Timers are sorted by ascending start times, with the
                          first one being the next timer that will start.
diff --git a/Make.config.template b/Make.config.template
index 5cbf42bfe..fcf607c77 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.6 2005/09/02 14:24:31 kls Exp $
+# $Id: Make.config.template 1.7 2006/01/13 16:06:11 kls Exp $
 
 ### The C compiler and options:
 
@@ -30,3 +30,6 @@ VIDEODIR = /video
 
 LIRC_DEVICE = /dev/lircd
 RCU_DEVICE  = /dev/ttyS1
+
+## Define if you want vdr to not run as root
+#VDR_USER = vdr
diff --git a/Makefile b/Makefile
index 8df6d7f12..f1b61e780 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.81 2006/01/01 15:12:05 kls Exp $
+# $Id: Makefile 1.83 2006/01/13 16:04:56 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -77,6 +77,9 @@ endif
 ifdef REMOTE
 DEFINES += -DREMOTE_$(REMOTE)
 endif
+ifdef VDR_USER
+DEFINES += -DVDR_USER=\"$(VDR_USER)\"
+endif
 
 LIRC_DEVICE ?= /dev/lircd
 RCU_DEVICE  ?= /dev/ttyS1
@@ -192,7 +195,7 @@ plugins: include-dir
 
 plugins-clean:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
-	@-rm -f $(PLUGINLIBDIR)/libvdr-*.so.$(VDRVERSION)
+	@-rm -f $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION)
 
 # Install the files:
 
@@ -209,8 +212,8 @@ install:
             fi
 
 plugins-install:
-	@mkdir -p $(BINDIR)/$(PLUGINLIBDIR)
-	@cp $(PLUGINLIBDIR)/* $(BINDIR)/$(PLUGINLIBDIR)
+	@mkdir -p $(PLUGINLIBDIR)
+	@cp $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION) $(PLUGINLIBDIR)
 
 # Source documentation:
 
diff --git a/README.vps b/README.vps
index d81f5d1a2..ee8909e6c 100644
--- a/README.vps
+++ b/README.vps
@@ -134,3 +134,4 @@ Contact:
 
 ARD Digital: http://www.ard-digital.de/home/index.php?id=16&languageid=1
 ZDF vision:  http://www.zdf.de/ZDFde/inhalt/1/0,1872,1021601,00.html (select "zdfvision")
+             phone: 06131/706754
diff --git a/channels.c b/channels.c
index a4f844912..bf1230bde 100644
--- a/channels.c
+++ b/channels.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.47 2005/12/30 15:41:24 kls Exp $
+ * $Id: channels.c 1.48 2006/01/14 15:51:02 kls Exp $
  */
 
 #include "channels.h"
 #include <linux/dvb/frontend.h>
 #include <ctype.h>
 #include "device.h"
+#include "epg.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -174,6 +175,7 @@ cChannel::cChannel(void)
   guard        = GUARD_INTERVAL_AUTO;
   hierarchy    = HIERARCHY_AUTO;
   modification = CHANNELMOD_NONE;
+  schedule     = NULL;
   linkChannels = NULL;
   refChannel   = NULL;
 }
@@ -184,6 +186,7 @@ cChannel::cChannel(const cChannel &Channel)
   shortName = NULL;
   provider = NULL;
   portalName = NULL;
+  schedule     = NULL;
   linkChannels = NULL;
   refChannel   = NULL;
   *this = Channel;
@@ -293,6 +296,7 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
      srate = Srate;
      coderateH = CoderateH;
      modulation = QPSK;
+     schedule = NULL;
      }
   return true;
 }
@@ -310,6 +314,7 @@ bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation
      modulation = Modulation;
      srate = Srate;
      coderateH = CoderateH;
+     schedule = NULL;
      }
   return true;
 }
@@ -331,6 +336,7 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
      coderateL = CoderateL;
      guard = Guard;
      transmission = Transmission;
+     schedule = NULL;
      }
   return true;
 }
@@ -350,6 +356,7 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
      rid = Rid;
      if (Number())
         Channels.HashChannel(this);
+     schedule = NULL;
      }
 }
 
diff --git a/channels.conf b/channels.conf
index e4f0fa44c..c4276287e 100644
--- a/channels.conf
+++ b/channels.conf
@@ -45,11 +45,11 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1801,1722,1702:10:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1722,1702:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1702,1722:34:133:17:0
@@ -57,7 +57,7 @@ DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,170
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1722,1702,1801:21:133:17:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
+EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1801,1702,1722,1810:513:133:4:0
 :Sportsworld
 PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1722,1801,1702:17:133:3:0
 PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
diff --git a/channels.h b/channels.h
index b4882522f..22dc6feb6 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.37 2006/01/07 13:00:43 kls Exp $
+ * $Id: channels.h 1.38 2006/01/14 15:51:26 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -103,7 +103,10 @@ class cLinkChannel : public cListObject {
 class cLinkChannels : public cList<cLinkChannel> {
   };
 
+class cSchedule;
+
 class cChannel : public cListObject {
+  friend class cSchedules;
   friend class cMenuEditChannel;
 private:
   static cString ToText(const cChannel *Channel);
@@ -142,6 +145,7 @@ class cChannel : public cListObject {
   int hierarchy;
   int __EndData__;
   int modification;
+  mutable const cSchedule *schedule;
   cLinkChannels *linkChannels;
   cChannel *refChannel;
   cString ParametersToString(void) const;
diff --git a/config.c b/config.c
index ec06a3292..4e469ab91 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.140 2006/01/07 12:28:49 kls Exp $
+ * $Id: config.c 1.141 2006/01/13 15:19:37 kls Exp $
  */
 
 #include "config.h"
@@ -220,6 +220,7 @@ cSetup::cSetup(void)
   TimeoutRequChInfo = 1;
   MenuScrollPage = 1;
   MenuScrollWrap = 0;
+  MenuButtonCloses = 0;
   MarkInstantRecord = 1;
   strcpy(NameInstantRecord, "TITLE EPISODE");
   InstantRecordTime = 180;
@@ -379,6 +380,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "TimeoutRequChInfo"))   TimeoutRequChInfo  = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollWrap"))      MenuScrollWrap     = atoi(Value);
+  else if (!strcasecmp(Name, "MenuButtonCloses"))    MenuButtonCloses   = atoi(Value);
   else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
   else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
   else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
@@ -445,6 +447,7 @@ bool cSetup::Save(void)
   Store("TimeoutRequChInfo",  TimeoutRequChInfo);
   Store("MenuScrollPage",     MenuScrollPage);
   Store("MenuScrollWrap",     MenuScrollWrap);
+  Store("MenuButtonCloses",   MenuButtonCloses);
   Store("MarkInstantRecord",  MarkInstantRecord);
   Store("NameInstantRecord",  NameInstantRecord);
   Store("InstantRecordTime",  InstantRecordTime);
diff --git a/config.h b/config.h
index 73c3d7d61..3d63ec620 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.238 2006/01/07 12:57:42 kls Exp $
+ * $Id: config.h 1.240 2006/01/13 15:17:19 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.38"
-#define VDRVERSNUM   10338  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.39"
+#define VDRVERSNUM   10339  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -193,6 +193,7 @@ class cSetup : public cConfig<cSetupLine> {
   int TimeoutRequChInfo;
   int MenuScrollPage;
   int MenuScrollWrap;
+  int MenuButtonCloses;
   int MarkInstantRecord;
   char NameInstantRecord[MaxFileName];
   int InstantRecordTime;
diff --git a/diseqc.conf b/diseqc.conf
index d4526d86e..9708327c0 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -8,7 +8,7 @@
 # slof:           switch frequency of LNB; the first entry with
 #                 an slof greater than the actual transponder
 #                 frequency will be used
-# polarization:   V = vertical, H = horizontal
+# polarization:   V = vertical, H = horizontal, L = Left circular, R = Right circular
 # lof:            the local oscillator frequency to subtract from
 #                 the actual transponder frequency
 # command:
diff --git a/dvbdevice.c b/dvbdevice.c
index 7fa39ccec..fe32298a4 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.149 2006/01/07 15:15:01 kls Exp $
+ * $Id: dvbdevice.c 1.150 2006/01/14 15:57:36 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -314,7 +314,7 @@ void cDvbTuner::Action(void)
                   tunerStatus = tsSet;
                   diseqcCommands = NULL;
                   if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
-                     esyslog("ERROR: frontend %d timed out while tuning to channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                     isyslog("frontend %d timed out while tuning to channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
                      }
                   continue;
@@ -323,13 +323,13 @@ void cDvbTuner::Action(void)
                if (Status & FE_REINIT) {
                   tunerStatus = tsSet;
                   diseqcCommands = NULL;
-                  esyslog("ERROR: frontend %d was reinitialized", cardIndex);
+                  isyslog("frontend %d was reinitialized", cardIndex);
                   lastTimeoutReport = 0;
                   continue;
                   }
                else if (Status & FE_HAS_LOCK) {
                   if (LostLock) {
-                     esyslog("frontend %d regained lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                     isyslog("frontend %d regained lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
                      LostLock = false;
                      }
                   tunerStatus = tsLocked;
@@ -338,7 +338,7 @@ void cDvbTuner::Action(void)
                   }
                else if (tunerStatus == tsLocked) {
                   LostLock = true;
-                  esyslog("ERROR: frontend %d lost lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                  isyslog("frontend %d lost lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
                   tunerStatus = tsTuned;
                   Timer.Set(lockTimeout);
                   lastTimeoutReport = 0;
diff --git a/eit.c b/eit.c
index a343a696d..4a0f59ded 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.113 2005/12/26 11:50:09 kls Exp $
+ * $Id: eit.c 1.114 2006/01/14 15:41:21 kls Exp $
  */
 
 #include "eit.h"
@@ -35,11 +35,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
   if (!channel)
      return; // only collect data for known channels
 
-  cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channelID);
-  if (!pSchedule) {
-     pSchedule = new cSchedule(channelID);
-     Schedules->Add(pSchedule);
-     }
+  cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
 
   bool Empty = true;
   bool Modified = false;
diff --git a/epg.c b/epg.c
index 7b2cb0ea2..79c11762c 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.47 2005/12/30 15:41:59 kls Exp $
+ * $Id: epg.c 1.49 2006/01/15 13:58:30 kls Exp $
  */
 
 #include "epg.h"
@@ -247,6 +247,8 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
      if (components) {
         for (int i = 0; i < components->NumComponents(); i++) {
             tComponent *p = components->Component(i);
+            if (!Setup.UseDolbyDigital && p->stream == 0x02 && p->type == 0x05)
+               continue;
             fprintf(f, "%sX %s\n", Prefix, *p->ToString());
             }
         }
@@ -997,3 +999,19 @@ const cSchedule *cSchedules::GetSchedule(tChannelID ChannelID) const
   return NULL;
 }
 
+const cSchedule *cSchedules::GetSchedule(const cChannel *Channel, bool AddIfMissing) const
+{
+  // This is not very beautiful, but it dramatically speeds up the
+  // "What's on now/next?" menus.
+  static cSchedule DummySchedule(tChannelID::InvalidID);
+  if (!Channel->schedule)
+     Channel->schedule = GetSchedule(Channel->GetChannelID());
+  if (!Channel->schedule)
+     Channel->schedule = &DummySchedule;
+  if (Channel->schedule == &DummySchedule && AddIfMissing) {
+     cSchedule *Schedule = new cSchedule(Channel->GetChannelID());
+     ((cSchedules *)this)->Add(Schedule);
+     Channel->schedule = Schedule;
+     }
+  return Channel->schedule != &DummySchedule? Channel->schedule : NULL;
+}
diff --git a/epg.h b/epg.h
index 04b63bfb4..443b56009 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.28 2005/12/27 14:31:24 kls Exp $
+ * $Id: epg.h 1.29 2006/01/14 15:45:24 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -179,6 +179,7 @@ class cSchedules : public cList<cSchedule> {
   static bool Read(FILE *f = NULL);
   cSchedule *AddSchedule(tChannelID ChannelID);
   const cSchedule *GetSchedule(tChannelID ChannelID) const;
+  const cSchedule *GetSchedule(const cChannel *Channel, bool AddIfMissing = false) const;
   };
 
 void ReportEpgBugFixStats(bool Reset = false);
diff --git a/i18n.c b/i18n.c
index e28bbf0e5..4080fd123 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.230 2006/01/08 11:56:31 kls Exp $
+ * $Id: i18n.c 1.235 2006/01/15 12:22:15 kls Exp $
  *
  * Translations provided by:
  *
@@ -441,6 +441,69 @@ const tI18nPhrase Phrases[] = {
     "Programm - %s",
     "Program - %s",
   },
+  { "This event - %s",
+    "Diese Sendung - %s",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "This event - all channels",
+    "Diese Sendung - alle Kan�le",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "All events - all channels",
+    "Alle Sendungen - alle Kan�le",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "What's on now?",
     "Was l�uft jetzt?",
     "Kaj je na sporedu?",
@@ -610,6 +673,27 @@ const tI18nPhrase Phrases[] = {
     "Sees/V�ljas",
     "Til/Fra",
   },
+  { "Timer",
+    "Timer",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Ajastin",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Button$Record",
     "Aufnehmen",
     "Posnemi",
@@ -1200,7 +1284,7 @@ const tI18nPhrase Phrases[] = {
     "Optagelse om %d minutter - sluk alligevel?",
   },
   { "Press any key to cancel shutdown",
-    "Taste dr�cken um Shutdown abzubrechen",
+    "Taste dr�cken, um Shutdown abzubrechen",
     "Pritisni katerikoli gumb za preklic izklopa",
     "Un tasto per annullare lo spegnimento",
     "Druk een toets om shutdown af te breken",
@@ -2260,7 +2344,7 @@ const tI18nPhrase Phrases[] = {
     "Espa�o em disco reduzido!",
     "Disque presque plein!",
     "Lite ledig diskplass!",
-    "Kovalevy l�hes t�ynn�!",
+    "Tallennustila loppumassa!",
     "Dysk wkrotce pelny!",
     "�Disco casi lleno",
     "� ������� �������� �� �������!",
@@ -2955,7 +3039,7 @@ const tI18nPhrase Phrases[] = {
     "Mostrar info ao mudar de Canal",
     "Affichage progr. en cours",
     "Info ved kanalskifte",
-    "N�yt� kanavatieto",
+    "N�yt� kanavatieto vaihdettaessa",
     "Informacja przy zmianie kanalu",
     "Informaci�n para cambio de canal",
     "����������� ���� ������ ��������",
@@ -2976,7 +3060,7 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Sulje kanavatieto pyydett�ess�",
     "", // TODO
     "", // TODO
     "", // TODO
@@ -3031,6 +3115,27 @@ const tI18nPhrase Phrases[] = {
     "Ridade kerimine",
     "Scroll rundt",
   },
+  { "Setup.OSD$Menu button closes",
+    "Menu-Taste schlie�t",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
     "Sortiraj termine",
@@ -4155,7 +4260,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -5397,7 +5502,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Tallennus aloitettu",
     "",//TODO
     "",//TODO
     "",//TODO
diff --git a/menu.c b/menu.c
index e21f230ba..dff190984 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.390 2006/01/08 11:39:57 kls Exp $
+ * $Id: menu.c 1.396 2006/01/15 15:02:36 kls Exp $
  */
 
 #include "menu.h"
@@ -323,10 +323,10 @@ class cMenuChannelItem : public cOsdItem {
   cMenuChannelItem(cChannel *Channel);
   static void SetSortMode(eChannelSortMode SortMode) { sortMode = SortMode; }
   static void IncSortMode(void) { sortMode = eChannelSortMode((sortMode == csmProvider) ? csmNumber : sortMode + 1); }
+  static eChannelSortMode SortMode(void) { return sortMode; }
   virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
   cChannel *Channel(void) { return channel; }
-  static eChannelSortMode SortMode(void) { return sortMode; }
   };
 
 cMenuChannelItem::eChannelSortMode cMenuChannelItem::sortMode = csmNumber;
@@ -916,7 +916,7 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
         SetTitle(channel->Name());
         int TimerMatch = tmNone;
         Timers.GetMatch(event, &TimerMatch);
-        SetHelp(TimerMatch == tmFull ? tr("Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
+        SetHelp(TimerMatch == tmFull ? tr("Button$Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
         }
      }
 }
@@ -961,22 +961,45 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
 // --- cMenuScheduleItem -----------------------------------------------------
 
 class cMenuScheduleItem : public cOsdItem {
+public:
+  enum eScheduleSortMode { ssmAllThis, ssmThisThis, ssmThisAll, ssmAllAll }; // "which event(s) on which channel(s)"
+private:
+  static eScheduleSortMode sortMode;
 public:
   const cEvent *event;
   const cChannel *channel;
+  bool withDate;
   int timerMatch;
-  cMenuScheduleItem(const cEvent *Event, cChannel *Channel = NULL);
+  cMenuScheduleItem(const cEvent *Event, cChannel *Channel = NULL, bool WithDate = false);
+  static void SetSortMode(eScheduleSortMode SortMode) { sortMode = SortMode; }
+  static void IncSortMode(void) { sortMode = eScheduleSortMode((sortMode == ssmAllAll) ? ssmAllThis : sortMode + 1); }
+  static eScheduleSortMode SortMode(void) { return sortMode; }
+  virtual int Compare(const cListObject &ListObject) const;
   bool Update(bool Force = false);
-};
+  };
+
+cMenuScheduleItem::eScheduleSortMode cMenuScheduleItem::sortMode = ssmAllThis;
 
-cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event, cChannel *Channel)
+cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event, cChannel *Channel, bool WithDate)
 {
   event = Event;
   channel = Channel;
+  withDate = WithDate;
   timerMatch = tmNone;
   Update(true);
 }
 
+int cMenuScheduleItem::Compare(const cListObject &ListObject) const
+{
+  cMenuScheduleItem *p = (cMenuScheduleItem *)&ListObject;
+  int r = -1;
+  if (sortMode != ssmAllThis)
+     r = strcoll(event->Title(), p->event->Title());
+  if (sortMode == ssmAllThis || r == 0)
+     r = event->StartTime() - p->event->StartTime();
+  return r;
+}
+
 static char *TimerMatchChars = " tT";
 
 bool cMenuScheduleItem::Update(bool Force)
@@ -989,7 +1012,9 @@ bool cMenuScheduleItem::Update(bool Force)
      char t = TimerMatchChars[timerMatch];
      char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
      char r = event->IsRunning() ? '*' : ' ';
-     if (channel)
+     if (channel && withDate)
+        asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
+     else if (channel)
         asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), *event->GetTimeString(), t, v, r, event->Title());
      else
         asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
@@ -1005,6 +1030,7 @@ class cMenuWhatsOn : public cOsdMenu {
 private:
   bool now;
   int helpKeys;
+  int timerState;
   eOSState Record(void);
   eOSState Switch(void);
   static int currentChannel;
@@ -1027,9 +1053,11 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 {
   now = Now;
   helpKeys = -1;
+  timerState = 0;
+  Timers.Modified(timerState);
   for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
       if (!Channel->GroupSep()) {
-         const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+         const cSchedule *Schedule = Schedules->GetSchedule(Channel);
          if (Schedule) {
             const cEvent *Event = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
             if (Event)
@@ -1044,10 +1072,12 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 bool cMenuWhatsOn::Update(void)
 {
   bool result = false;
-  for (cOsdItem *item = First(); item; item = Next(item)) {
-      if (((cMenuScheduleItem *)item)->Update())
-         result = true;
-      }
+  if (Timers.Modified(timerState)) {
+     for (cOsdItem *item = First(); item; item = Next(item)) {
+         if (((cMenuScheduleItem *)item)->Update())
+            result = true;
+         }
+     }
   return result;
 }
 
@@ -1163,9 +1193,14 @@ class cMenuSchedule : public cOsdMenu {
   bool now, next;
   int otherChannel;
   int helpKeys;
+  int timerState;
+  eOSState Number(void);
   eOSState Record(void);
   eOSState Switch(void);
-  void PrepareSchedule(cChannel *Channel);
+  void PrepareScheduleAllThis(const cEvent *Event, const cChannel *Channel);
+  void PrepareScheduleThisThis(const cEvent *Event, const cChannel *Channel);
+  void PrepareScheduleThisAll(const cEvent *Event, const cChannel *Channel);
+  void PrepareScheduleAllAll(const cEvent *Event, const cChannel *Channel);
   bool Update(void);
   void SetHelpKeys(void);
 public:
@@ -1175,16 +1210,19 @@ class cMenuSchedule : public cOsdMenu {
   };
 
 cMenuSchedule::cMenuSchedule(void)
-:cOsdMenu("", 7, 6, 4)
+:cOsdMenu("")
 {
   now = next = false;
   otherChannel = 0;
   helpKeys = -1;
+  timerState = 0;
+  Timers.Modified(timerState);
+  cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   if (channel) {
      cMenuWhatsOn::SetCurrentChannel(channel->Number());
      schedules = cSchedules::Schedules(schedulesLock);
-     PrepareSchedule(channel);
+     PrepareScheduleAllThis(NULL, channel);
      SetHelpKeys();
      }
 }
@@ -1194,33 +1232,94 @@ cMenuSchedule::~cMenuSchedule()
   cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared
 }
 
-void cMenuSchedule::PrepareSchedule(cChannel *Channel)
+void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel *Channel)
 {
   Clear();
+  SetCols(7, 6, 4);
   char *buffer = NULL;
   asprintf(&buffer, tr("Schedule - %s"), Channel->Name());
   SetTitle(buffer);
   free(buffer);
-  if (schedules) {
-     const cSchedule *Schedule = schedules->GetSchedule(Channel->GetChannelID());
+  if (schedules && Channel) {
+     const cSchedule *Schedule = schedules->GetSchedule(Channel);
+     if (Schedule) {
+        const cEvent *PresentEvent = Event ? Event : Schedule->GetPresentEvent(Channel->Number() == cDevice::CurrentChannel());
+        time_t now = time(NULL) - Setup.EPGLinger * 60;
+        for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
+            if (ev->EndTime() > now || ev == PresentEvent)
+               Add(new cMenuScheduleItem(ev), ev == PresentEvent);
+            }
+        }
+     }
+}
+
+void cMenuSchedule::PrepareScheduleThisThis(const cEvent *Event, const cChannel *Channel)
+{
+  Clear();
+  SetCols(7, 6, 4);
+  char *buffer = NULL;
+  asprintf(&buffer, tr("This event - %s"), Channel->Name());
+  SetTitle(buffer);
+  free(buffer);
+  if (schedules && Channel && Event) {
+     const cSchedule *Schedule = schedules->GetSchedule(Channel);
      if (Schedule) {
-        const cEvent *PresentEvent = Schedule->GetPresentEvent(Channel->Number() == cDevice::CurrentChannel());
         time_t now = time(NULL) - Setup.EPGLinger * 60;
-        for (const cEvent *Event = Schedule->Events()->First(); Event; Event = Schedule->Events()->Next(Event)) {
-            if (Event->EndTime() > now || Event == PresentEvent)
-               Add(new cMenuScheduleItem(Event), Event == PresentEvent);
+        for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
+            if ((ev->EndTime() > now || ev == Event) && !strcmp(ev->Title(), Event->Title()))
+               Add(new cMenuScheduleItem(ev), ev == Event);
             }
         }
      }
 }
 
+void cMenuSchedule::PrepareScheduleThisAll(const cEvent *Event, const cChannel *Channel)
+{
+  Clear();
+  SetCols(CHNUMWIDTH, 7, 7, 6, 4);
+  SetTitle(tr("This event - all channels"));
+  if (schedules && Event) {
+     for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
+         const cSchedule *Schedule = schedules->GetSchedule(ch);
+         if (Schedule) {
+            time_t now = time(NULL) - Setup.EPGLinger * 60;
+            for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
+                if ((ev->EndTime() > now || ev == Event) && !strcmp(ev->Title(), Event->Title()))
+                   Add(new cMenuScheduleItem(ev, ch, true), ev == Event && ch == Channel);
+                }
+            }
+         }
+     }
+}
+
+void cMenuSchedule::PrepareScheduleAllAll(const cEvent *Event, const cChannel *Channel)
+{
+  Clear();
+  SetCols(CHNUMWIDTH, 7, 7, 6, 4);
+  SetTitle(tr("All events - all channels"));
+  if (schedules) {
+     for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
+         const cSchedule *Schedule = schedules->GetSchedule(ch);
+         if (Schedule) {
+            time_t now = time(NULL) - Setup.EPGLinger * 60;
+            for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
+                if (ev->EndTime() > now || ev == Event)
+                   Add(new cMenuScheduleItem(ev, ch, true), ev == Event && ch == Channel);
+                }
+            }
+         }
+     }
+}
+
 bool cMenuSchedule::Update(void)
 {
   bool result = false;
-  for (cOsdItem *item = First(); item; item = Next(item)) {
-      if (((cMenuScheduleItem *)item)->Update())
-         result = true;
-      }
+  if (Timers.Modified(timerState)) {
+     for (cOsdItem *item = First(); item; item = Next(item)) {
+         if (((cMenuScheduleItem *)item)->Update())
+            result = true;
+         }
+     }
   return result;
 }
 
@@ -1241,6 +1340,29 @@ void cMenuSchedule::SetHelpKeys(void)
      }
 }
 
+eOSState cMenuSchedule::Number(void)
+{
+  cMenuScheduleItem::IncSortMode();
+  cMenuScheduleItem *CurrentItem = (cMenuScheduleItem *)Get(Current());
+  const cChannel *Channel = NULL;
+  const cEvent *Event = NULL;
+  if (CurrentItem) {
+     Event = CurrentItem->event;
+     Channel = Channels.GetByChannelID(Event->ChannelID(), true);
+     }
+  switch (cMenuScheduleItem::SortMode()) {
+    case cMenuScheduleItem::ssmAllThis:  PrepareScheduleAllThis(Event, Channel); break;
+    case cMenuScheduleItem::ssmThisThis: PrepareScheduleThisThis(Event, Channel); break;
+    case cMenuScheduleItem::ssmThisAll:  PrepareScheduleThisAll(Event, Channel); break;
+    case cMenuScheduleItem::ssmAllAll:   PrepareScheduleAllAll(Event, Channel); break;
+    }
+  CurrentItem = (cMenuScheduleItem *)Get(Current());
+  Sort();
+  SetCurrent(CurrentItem);
+  Display();
+  return osContinue;
+}
+
 eOSState cMenuSchedule::Record(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
@@ -1290,6 +1412,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
+       case k0:      return Number();
        case kRecord:
        case kRed:    return Record();
        case kGreen:  if (schedules) {
@@ -1325,7 +1448,8 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
      if (ei) {
         cChannel *channel = Channels.GetByChannelID(ei->ChannelID(), true);
         if (channel) {
-           PrepareSchedule(channel);
+           cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
+           PrepareScheduleAllThis(NULL, channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
               otherChannel = channel->Number();
               SetHelp(Count() ? tr("Button$Record") : NULL, tr("Button$Now"), tr("Button$Next"), tr("Button$Switch"));
@@ -1578,17 +1702,19 @@ cOsdObject *CamControl(void)
 class cMenuRecording : public cOsdMenu {
 private:
   const cRecording *recording;
+  bool withButtons;
 public:
-  cMenuRecording(const cRecording *Recording);
+  cMenuRecording(const cRecording *Recording, bool WithButtons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
 };
 
-cMenuRecording::cMenuRecording(const cRecording *Recording)
+cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
 :cOsdMenu(tr("Recording info"))
 {
   recording = Recording;
-  if (recording)
+  withButtons = WithButtons;
+  if (withButtons)
      SetHelp(tr("Button$Play"), tr("Button$Rewind"));
 }
 
@@ -1620,8 +1746,11 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kRed:    Key = kOk; // will play the recording, even if recording commands are defined
-       case kGreen:  cRemote::Put(Key, true);
+       case kRed:    if (withButtons)
+                        Key = kOk; // will play the recording, even if recording commands are defined
+       case kGreen:  if (!withButtons)
+                        break;
+                     cRemote::Put(Key, true);
                      // continue with osBack to close the info menu and process the key
        case kOk:     return osBack;
        default: break;
@@ -1869,7 +1998,7 @@ eOSState cMenuRecordings::Info(void)
   if (ri && !ri->IsDirectory()) {
      cRecording *recording = GetRecording(ri);
      if (recording && recording->Info()->Title())
-        return AddSubMenu(new cMenuRecording(recording));
+        return AddSubMenu(new cMenuRecording(recording, true));
      }
   return osContinue;
 }
@@ -2007,6 +2136,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Timeout requested channel info"), &data.TimeoutRequChInfo));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu button closes"),     &data.MenuButtonCloses));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   SetCurrent(Get(current));
@@ -2832,7 +2962,7 @@ static void SetTrackDescriptions(bool Live)
      if (Channel) {
         const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
         if (Schedules) {
-           const cSchedule *Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+           const cSchedule *Schedule = Schedules->GetSchedule(Channel);
            if (Schedule) {
               const cEvent *Present = Schedule->GetPresentEvent(true);
               if (Present)
@@ -2915,7 +3045,7 @@ void cDisplayChannel::DisplayInfo(void)
      cSchedulesLock SchedulesLock;
      const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
      if (Schedules) {
-        const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+        const cSchedule *Schedule = Schedules->GetSchedule(channel);
         if (Schedule) {
            const cEvent *Present = Schedule->GetPresentEvent(true);
            const cEvent *Following = Schedule->GetFollowingEvent(true);
@@ -3345,7 +3475,7 @@ bool cRecordControl::GetEvent(void)
         cSchedulesLock SchedulesLock;
         const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
         if (Schedules) {
-           const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+           const cSchedule *Schedule = Schedules->GetSchedule(channel);
            if (Schedule) {
               event = Schedule->GetEventAround(Time);
               if (event) {
@@ -3868,7 +3998,7 @@ cOsdObject *cReplayControl::GetInfo(void)
 {
   cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
   if (Recording)
-     return new cMenuRecording(Recording);
+     return new cMenuRecording(Recording, false);
   return NULL;
 }
 
diff --git a/remote.c b/remote.c
index a59ecfe8f..7d7b4a54f 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.46 2006/01/01 14:21:07 kls Exp $
+ * $Id: remote.c 1.48 2006/01/15 15:17:40 kls Exp $
  */
 
 #include "remote.h"
@@ -301,12 +301,13 @@ uint64 cKbdRemote::ReadKeySequence(void)
                       k |= key1 & 0xFF;
                       switch (key1) {
                         case 0x31 ... 0x3F: // more-byte sequence
-                             while (key1 != 0x7E) {
-                                   k <<= 8;
-                                   k |= key1 & 0xFF;
-                                   if ((key1 = ReadKey()) < 0)
-                                      break; // Sequence ends here
-                                   }
+                        case 0x5B: // strange, may apparently occur
+                             do {
+                                if ((key1 = ReadKey()) < 0)
+                                   break; // Sequence ends here
+                                k <<= 8;
+                                k |= key1 & 0xFF;
+                                } while (key1 != 0x7E);
                              break;
                         }
                       }
diff --git a/svdrp.c b/svdrp.c
index 086b01cb4..9fa61ea98 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.89 2005/12/30 15:42:29 kls Exp $
+ * $Id: svdrp.c 1.93 2006/01/14 16:08:20 kls Exp $
  */
 
 #include "svdrp.h"
@@ -229,9 +229,11 @@ const char *HelpPages[] = {
   "LSTR [ <number> ]\n"
   "    List recordings. Without option, all recordings are listed. Otherwise\n"
   "    the information for the given recording is listed.",
-  "LSTT [ <number> ]\n"
+  "LSTT [ <number> ] [ id ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
-  "    only the given timer is listed.",
+  "    only the given timer is listed. If the keyword 'id' is given, the\n"
+  "    channels will be listed with their unique channel ids instead of\n"
+  "    their numbers.",
   "MESG <message>\n"
   "    Displays the given message on the OSD. The message will be queued\n"
   "    and displayed whenever this is suitable.\n",
@@ -681,10 +683,6 @@ void cSVDRP::CmdGRAB(const char *Option)
         }
      else if (strcmp(FileName, "-") == 0)
         FileName = NULL;
-     else {
-        Reply(501, "Missing filename extension in \"%s\"", FileName);
-        return;
-        }
      // image quality (and obsolete type):
      if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
         if (strcasecmp(p, "JPEG") == 0 || strcasecmp(p, "PNM") == 0) {
@@ -729,10 +727,13 @@ void cSVDRP::CmdGRAB(const char *Option)
      char RealFileName[PATH_MAX];
      if (FileName) {
         if (grabImageDir) {
-           char *s;
-           asprintf(&s, "%s/%s", grabImageDir, FileName);
-           FileName = s;
-           char *slash = strrchr(FileName, '/'); // there definitely is one
+           char *s = 0;
+           char *slash = strrchr(FileName, '/');
+           if (!slash) {
+              asprintf(&s, "%s/%s", grabImageDir, FileName);
+              FileName = s;
+              }
+           slash = strrchr(FileName, '/'); // there definitely is one
            *slash = 0;
            char *r = realpath(FileName, RealFileName);
            *slash = '/';
@@ -931,7 +932,7 @@ void cSVDRP::CmdLSTE(const char *Option)
                  else
                     Channel = Channels.GetByChannelID(tChannelID::FromString(Option));
                  if (Channel) {
-                    Schedule = Schedules->GetSchedule(Channel->GetChannelID());
+                    Schedule = Schedules->GetSchedule(Channel);
                     if (!Schedule) {
                        Reply(550, "No schedule found");
                        return;
@@ -1009,22 +1010,38 @@ void cSVDRP::CmdLSTR(const char *Option)
 
 void cSVDRP::CmdLSTT(const char *Option)
 {
+  int Number = 0;
+  bool Id = false;
   if (*Option) {
-     if (isnumber(Option)) {
-        cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
-        if (timer)
-           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
-        else
-           Reply(501, "Timer \"%s\" not defined", Option);
-        }
+     char buf[strlen(Option) + 1];
+     strcpy(buf, Option);
+     const char *delim = " \t";
+     char *strtok_next;
+     char *p = strtok_r(buf, delim, &strtok_next);
+     while (p) {
+           if (isnumber(p))
+              Number = strtol(p, NULL, 10);
+           else if (strcasecmp(p, "ID") == 0)
+              Id = true;
+           else {
+              Reply(501, "Unknown option: \"%s\"", p);
+              return;
+              }
+           p = strtok_r(NULL, delim, &strtok_next);
+           }
+     }
+  if (Number) {
+     cTimer *timer = Timers.Get(Number - 1);
+     if (timer)
+        Reply(250, "%d %s", timer->Index() + 1, *timer->ToText(Id));
      else
-        Reply(501, "Error in timer number \"%s\"", Option);
+        Reply(501, "Timer \"%s\" not defined", Option);
      }
   else if (Timers.Count()) {
      for (int i = 0; i < Timers.Count(); i++) {
          cTimer *timer = Timers.Get(i);
         if (timer)
-           Reply(i < Timers.Count() - 1 ? -250 : 250, "%d %s", timer->Index() + 1, *timer->ToText());
+           Reply(i < Timers.Count() - 1 ? -250 : 250, "%d %s", timer->Index() + 1, *timer->ToText(Id));
         else
            Reply(501, "Timer \"%d\" not found", i + 1);
          }
diff --git a/thread.c b/thread.c
index 2355e674b..4fcfc277b 100644
--- a/thread.c
+++ b/thread.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.50 2006/01/04 15:01:22 kls Exp $
+ * $Id: thread.c 1.51 2006/01/08 16:03:56 kls Exp $
  */
 
 #include "thread.h"
 #include <errno.h>
+#include <linux/unistd.h>
 #include <malloc.h>
 #include <stdarg.h>
 #include <sys/resource.h>
diff --git a/timers.c b/timers.c
index 906efbbc0..a168cc1db 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.41 2006/01/08 11:40:29 kls Exp $
+ * $Id: timers.c 1.43 2006/01/15 13:31:11 kls Exp $
  */
 
 #include "timers.h"
@@ -515,7 +515,7 @@ cTimers Timers;
 
 cTimers::cTimers(void)
 {
-  modified = false;
+  state = 0;
   beingEdited = 0;;
   lastSetEvents = 0;
 }
@@ -574,13 +574,13 @@ cTimer *cTimers::GetNextActiveTimer(void)
 
 void cTimers::SetModified(void)
 {
-  modified = true;
+  state++;
 }
 
-bool cTimers::Modified(void)
+bool cTimers::Modified(int &State)
 {
-  bool Result = modified;
-  modified = false;
+  bool Result = state != State;
+  State = state;
   return Result;
 }
 
@@ -596,7 +596,7 @@ void cTimers::SetEvents(void)
   if (Schedules) {
      if (!lastSetEvents || Schedules->Modified() >= lastSetEvents) {
         for (cTimer *ti = First(); ti; ti = Next(ti)) {
-            const cSchedule *Schedule = Schedules->GetSchedule(ti->Channel()->GetChannelID());
+            const cSchedule *Schedule = Schedules->GetSchedule(ti->Channel());
             if (Schedule) {
                if (!lastSetEvents || Schedule->Modified() >= lastSetEvents) {
                   const cEvent *Event = NULL;
diff --git a/timers.h b/timers.h
index 4ad28bb4b..73b951d11 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.23 2006/01/06 14:13:17 kls Exp $
+ * $Id: timers.h 1.24 2006/01/15 13:29:44 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -96,7 +96,7 @@ class cTimer : public cListObject {
 
 class cTimers : public cConfig<cTimer> {
 private:
-  bool modified;
+  int state;
   int beingEdited;
   time_t lastSetEvents;
 public:
@@ -109,9 +109,10 @@ class cTimers : public cConfig<cTimer> {
   void IncBeingEdited(void) { beingEdited++; }
   void DecBeingEdited(void) { if (!--beingEdited) lastSetEvents = 0; }
   void SetModified(void);
-  bool Modified(void);
-      ///< Returns true if any of the timers have been modified.
-      ///< Calling this function resets the 'modified' flag to false.
+  bool Modified(int &State);
+      ///< Returns true if any of the timers have been modified, which
+      ///< is detected by State being different than the internal state.
+      ///< Upon return the internal state will be stored in State.
   void SetEvents(void);
   void DeleteExpired(void);
   };
diff --git a/tools.c b/tools.c
index 68a706b2c..33b2ec62a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.109 2006/01/08 11:40:35 kls Exp $
+ * $Id: tools.c 1.110 2006/01/15 14:31:45 kls Exp $
  */
 
 #include "tools.h"
@@ -625,7 +625,7 @@ cString DayDateTime(time_t t)
      time(&t);
   struct tm tm_r;
   tm *tm = localtime_r(&t, &tm_r);
-  snprintf(buffer, sizeof(buffer), "%s %2d.%02d %02d:%02d", *WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
+  snprintf(buffer, sizeof(buffer), "%s %02d.%02d %02d:%02d", *WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
   return buffer;
 }
 
diff --git a/vdr.1 b/vdr.1
index 9ea300d32..9bc5b4fb1 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.20 2006/01/08 11:51:36 kls Exp $
+.\" $Id: vdr.1 1.22 2006/01/14 11:09:08 kls Exp $
 .\"
 .TH vdr 1 "08 Jan 2006" "1.3.38" "Video Disk Recorder"
 .SH NAME
@@ -132,8 +132,8 @@ Set the controlling terminal.
 Run as user \fIuser\fR in case vdr was started as user 'root'.
 Starting vdr as 'root' is necessary if the system time shall
 be set from the transponder data, but for security reasons
-during normal operation vdr switches to a lesser privileged
-user id. By default the user 'vdr' is used.
+vdr can switch to a lesser privileged user id during normal
+operation.
 .TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
@@ -161,9 +161,6 @@ An non-recoverable error has been detected, \fBvdr\fR has given up.
 .I channels.conf
 Channel configuration.
 .TP
-.I ca.conf
-Conditional access configuration.
-.TP
 .I timers.conf
 Timer configuration.
 .TP
diff --git a/vdr.5 b/vdr.5
index 6103369cc..caabe51ce 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.45 2006/01/08 11:52:03 kls Exp $
+.\" $Id: vdr.5 1.47 2006/01/14 10:57:37 kls Exp $
 .\"
 .TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files"
 .SH NAME
@@ -407,16 +407,15 @@ whenever the given key is pressed. The format is
 \fBmacrokey  [@plugin] key1 key2 key3...\fR
 
 where \fBmacrokey\fR is the key that shall initiate execution of this macro
-and can be one of \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR or
-\fIUser1\fR...\fIUser9\fR. The rest of the line consists of a set of
+and can be one of \fIUp\fR, \fIDown\fR, \fIOk\fR, \fIBack\fR, \fILeft\fR,
+\fIRight\fR, \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR, \fI0\fR...\fI9\fR
+or \fIUser1\fR...\fIUser9\fR. The rest of the line consists of a set of
 keys, which will be executed just as if they had been pressed in the given
 sequence. The optional \fB@plugin\fR can be used to automatically select
-the given plugin from the main menu (provided that plugin has a main menu
-entry). \fBplugin\fR is the name of the plugin, exactly as given in the \-P
-option when starting VDR. There can be only one \fB@plugin\fR per key macro,
-and it implicitly adds an \fIOk\fR key to the macro definition (in order to
-actually select the plugins main menu entry), which counts against the total
-number of keys in the macro. For instance
+the given plugin.
+\fBplugin\fR is the name of the plugin, exactly as given in the \-P
+option when starting VDR. There can be only one \fB@plugin\fR per key macro.
+For instance
 
 \fBUser1 @abc Down Down Ok\fR
 
diff --git a/vdr.c b/vdr.c
index a476a25bc..bd4f95045 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.233 2006/01/08 11:49:03 kls Exp $
+ * $Id: vdr.c 1.238 2006/01/15 13:31:57 kls Exp $
  */
 
 #include <getopt.h>
@@ -157,14 +157,13 @@ int main(int argc, char *argv[])
 
   // Command line options:
 
-#define DEFAULTVDRUSER   "vdr"
 #define DEFAULTSVDRPPORT 2001
 #define DEFAULTWATCHDOG     0 // seconds
 #define DEFAULTPLUGINDIR PLUGINDIR
 #define DEFAULTEPGDATAFILENAME "epg.data"
 
   bool StartedAsRoot = false;
-  const char *VdrUser = DEFAULTVDRUSER;
+  const char *VdrUser = NULL;
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *AudioCommand = NULL;
   const char *ConfigDirectory = NULL;
@@ -192,6 +191,9 @@ int main(int argc, char *argv[])
 #if defined(VFAT)
   VfatFileSystem = true;
 #endif
+#if defined(VDR_USER)
+  VdrUser = VDR_USER;
+#endif
 
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
   int ExitCode = 0;
@@ -337,16 +339,18 @@ int main(int argc, char *argv[])
 
   // Set user id in case we were started as root:
 
-  if (getuid() == 0) {
+  if (VdrUser && getuid() == 0) {
      StartedAsRoot = true;
-     if (!SetKeepCaps(true))
-        return 2;
-     if (!SetUser(VdrUser))
-        return 2;
-     if (!SetKeepCaps(false))
-        return 2;
-     if (!SetCapSysTime())
-        return 2;
+     if (strcmp(VdrUser, "root")) {
+        if (!SetKeepCaps(true))
+           return 2;
+        if (!SetUser(VdrUser))
+           return 2;
+        if (!SetKeepCaps(false))
+           return 2;
+        if (!SetCapSysTime())
+           return 2;
+        }
      }
 
   // Help and version info:
@@ -392,8 +396,8 @@ int main(int argc, char *argv[])
                "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "  -t TTY,   --terminal=TTY controlling tty\n"
-               "  -u USER,  --user=USER    run as user USER (default: %s); only applicable\n"
-               "                           if started as root\n"
+               "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
+               "                           root\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
                "            --vfat         encode special characters in recording names to\n"
@@ -406,7 +410,6 @@ int main(int argc, char *argv[])
                LIRC_DEVICE,
                DEFAULTSVDRPPORT,
                RCU_DEVICE,
-               DEFAULTVDRUSER,
                VideoDirectory,
                DEFAULTWATCHDOG
                );
@@ -471,7 +474,7 @@ int main(int argc, char *argv[])
      }
 
   isyslog("VDR version %s started", VDRVERSION);
-  if (StartedAsRoot)
+  if (StartedAsRoot && VdrUser)
      isyslog("switched to user '%s'", VdrUser);
   if (DaemonMode)
      dsyslog("running as daemon (tid=%d)", cThread::ThreadId());
@@ -687,9 +690,10 @@ int main(int argc, char *argv[])
         if (!Channels.BeingEdited() && !Timers.BeingEdited()) {
            int modified = Channels.Modified();
            static time_t ChannelSaveTimeout = 0;
+           static int TimerState = 0;
            // Channels and timers need to be stored in a consistent manner,
            // therefore if one of them is changed, we save both.
-           if (modified == CHANNELSMOD_USER || Timers.Modified())
+           if (modified == CHANNELSMOD_USER || Timers.Modified(TimerState))
               ChannelSaveTimeout = 1; // triggers an immediate save
            else if (modified && !ChannelSaveTimeout)
               ChannelSaveTimeout = time(NULL) + CHANNELSAVEDELTA;
@@ -785,14 +789,17 @@ int main(int argc, char *argv[])
         // Keys that must work independent of any interactive mode:
         switch (key) {
           // Menu control:
-          case kMenu:
+          case kMenu: {
                key = kNone; // nobody else needs to see this key
+               bool WasOpen = Interact != NULL;
+               bool WasMenu = Interact && Interact->IsMenu();
                if (Menu)
                   DELETE_MENU;
                else if (cControl::Control() && cOsd::IsOpen())
                   cControl::Control()->Hide();
-               else
+               if (!WasOpen || !WasMenu && !Setup.MenuButtonCloses)
                   Menu = new cMenuMain;
+               }
                break;
           // Info:
           case kInfo: {
@@ -978,6 +985,10 @@ int main(int argc, char *argv[])
            }
         else {
            // Key functions in "normal" viewing mode:
+           if (KeyMacros.Get(key)) {
+              cRemote::PutMacro(key);
+              key = kNone;
+              }
            switch (key) {
              // Toggle channels:
              case k0: {
@@ -1013,11 +1024,6 @@ int main(int argc, char *argv[])
                      cControl::Launch(new cReplayControl);
                      }
                   break;
-             // Key macros:
-             case kRed:
-             case kGreen:
-             case kYellow:
-             case kBlue: cRemote::PutMacro(key); break;
              default:    break;
              }
            }

From 446b0e8e0b94b997293aef2f63220c5f8a68bf0f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 22 Jan 2006 18:00:00 +0100
Subject: [PATCH 132/307] =?UTF-8?q?Version=201.3.40=20-=20Fixed=20a=20seco?=
 =?UTF-8?q?nd=20place=20where=20a=20message=20should=20be=20given=20when?=
 =?UTF-8?q?=20an=20instant=20recording=20=20=20is=20started=20(reported=20?=
 =?UTF-8?q?by=20Jesus=20Bravo=20Alvarez).=20-=20Modified=20logging=20so=20?=
 =?UTF-8?q?that=20even=20on=20NPTL=20systems=20each=20line=20in=20the=20lo?=
 =?UTF-8?q?g=20file=20shows=20=20=20the=20individual=20thread's=20pid=20(b?=
 =?UTF-8?q?ased=20on=20a=20suggestion=20from=20Francois-Xavier=20Kowalski)?=
 =?UTF-8?q?.=20-=20Fixed=20a=20problem=20with=20@plugin=20in=20keymacros.c?=
 =?UTF-8?q?onf=20in=20case=20the=20named=20plugin=20is=20not=20=20=20loade?=
 =?UTF-8?q?d=20(reported=20by=20Franz=20Gangkofer).=20-=20Fixed=20a=20cras?=
 =?UTF-8?q?h=20after=20executing=20the=20SVDRP=20command=20CLRE,=20caused?=
 =?UTF-8?q?=20by=20dangling=20'schedule'=20=20=20pointers=20from=20cChanne?=
 =?UTF-8?q?l=20objects=20(reported=20by=20Malte=20Schr=C3=B6der).=20-=20Up?=
 =?UTF-8?q?dated=20the=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahr?=
 =?UTF-8?q?enberg).=20-=20Improved=20NULL=20checking=20in=20strreplace().?=
 =?UTF-8?q?=20-=20Fixed=20a=20crash=20in=20the=20Schedule=20menu=20with=20?=
 =?UTF-8?q?events=20that=20have=20no=20title=20(reported=20by=20=20=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).=20cEvent::FixEpgBugs()=20now=20assigns=20a=20"No?=
 =?UTF-8?q?=20title"=20string=20to=20events=20=20=20that=20have=20no=20tit?=
 =?UTF-8?q?le.=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Arthur=20Konovalov).=20-=20Recordings=20are=20now=20only=20s?=
 =?UTF-8?q?tarted=20if=20there=20is=20at=20least=20300MB=20free=20disk=20s?=
 =?UTF-8?q?pace=20=20=20(suggested=20by=20Markus=20Hahn).=20-=20When=20ent?=
 =?UTF-8?q?ering=20text=20via=20the=20numeric=20keys,=20the=20cursor=20now?=
 =?UTF-8?q?=20automatically=20advances=20=20=20(based=20on=20a=20patch=20f?=
 =?UTF-8?q?rom=20Rolf=20Ahrenberg).=20-=20Updated=20the=20Polish=20OSD=20t?=
 =?UTF-8?q?exts=20and=20the=20fontosd-iso8859-2.c=20file=20(thanks=20to=20?=
 =?UTF-8?q?Jaroslaw=20=20=20Swierczynski).=20-=20Disabled=20the=20"buffer?=
 =?UTF-8?q?=20reserve"=20in=20Transfer=20Mode.=20Last=20chance=20to=20comp?=
 =?UTF-8?q?lain=20if=20you=20=20=20really=20need=20it=20-=20it=20will=20be?=
 =?UTF-8?q?=20completely=20removed=20in=20the=20next=20version.=20If=20you?=
 =?UTF-8?q?=20are=20=20=20experiencing=20problems=20with=20a/v=20running?=
 =?UTF-8?q?=20out=20of=20sync,=20try=20the=20latest=20driver=20and=20=20?=
 =?UTF-8?q?=20firmware=20(if=20you=20are=20using=20a=20full=20featured=20D?=
 =?UTF-8?q?VB=20card).=20-=20Switching=20channels=20with=20the=20Up/Down?=
 =?UTF-8?q?=20or=20Channel+/Channel-=20keys=20now=20works=20a=20lot=20=20?=
 =?UTF-8?q?=20faster=20when=20the=20repeat=20function=20kicks=20in,=20by?=
 =?UTF-8?q?=20not=20actually=20switching=20the=20=20=20channel=20every=20t?=
 =?UTF-8?q?ime,=20but=20rather=20only=20displaying=20the=20channel=20info?=
 =?UTF-8?q?=20and=20doing=20=20=20the=20final=20switch=20when=20the=20key?=
 =?UTF-8?q?=20is=20released.=20-=20The=20channel=20display=20is=20now=20up?=
 =?UTF-8?q?dated=20=5Fbefore=5F=20the=20channel=20is=20switched.=20-=20Add?=
 =?UTF-8?q?ed=20a=20missing=20initialization=20of=20'timeout'=20in=20the?=
 =?UTF-8?q?=20cDisplayChannel=20constructor.=20-=20Fixed=20detecting=20if?=
 =?UTF-8?q?=20there=20can=20be=20any=20useful=20further=20input=20when=20e?=
 =?UTF-8?q?ntering=20channel=20=20=20numbers=20(thanks=20to=20Thomas=20Ber?=
 =?UTF-8?q?gwinkl).=20-=20Updated=20the=20Spanish=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Jesus=20Bravo=20Alvarez).=20-=20Fixed=20handling=20the?=
 =?UTF-8?q?=20'0'=20key=20for=20switching=20between=20the=20last=20two=20c?=
 =?UTF-8?q?hannels=20(thanks=20=20=20to=20Thomas=20Bergwinkl).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS        |  30 +-
 HISTORY             |  38 +++
 channels.conf       |  29 +-
 config.h            |   6 +-
 epg.c               | 334 +++++++++----------
 fontosd-iso8859-2.c | 452 ++++++++++++-------------
 i18n.c              | 779 +++++++++++++++++++++++---------------------
 keys.c              |  12 +-
 menu.c              | 181 ++++++----
 menu.h              |   5 +-
 menuitems.c         |  53 ++-
 menuitems.h         |   4 +-
 recording.c         |   6 +-
 recording.h         |   6 +-
 tools.c             |  30 +-
 tools.h             |  10 +-
 transfer.c          |   3 +-
 vdr.c               |  31 +-
 18 files changed, 1111 insertions(+), 898 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dadcf8c91..5b460ca9d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -936,6 +936,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a bug in handling key macros with keys after @plugin
  for adding compiler options "-fPIC -g" to all plugins
  for adding a leading '0' to the day in the DayDateTime() function
+ for reporting a crash in the Schedule menu with events that have no title
+ for a patch that was used to implement automatic cursor advance when entering text
+ via the numeric keys
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1154,11 +1157,14 @@ Andreas Regel <andreas.regel@gmx.de>
  for reporting a problem with messages when a cOsdObject uses the raw OSD
  for implementing palette replace mode in the OSD bitmaps
 
-Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
+Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
  with value 0
  for pointing out that transponder handling didn't work with satellites that provide
  two transponders on the same frequency, with different polarization
+ for fixing detecting if there can be any useful further input when entering channel
+ numbers
+ for fixing handling the '0' key for switching between the last two channels
 
 St�phane Est�-Gracias <sestegra@free.fr>
  for fixing a typo in libsi/si.h
@@ -1655,3 +1661,25 @@ Andr
 J�rgen Schilling <juergen_schilling@web.de>
  for reporting that color buttons were displayed in the recording info menu if it
  has been invoked from a player
+
+Jesus Bravo Alvarez <jba@pobox.com>
+ for reporting a second place where a message should be given when an instant
+ recording is started
+ for updating the Spanish OSD texts
+
+Francois-Xavier Kowalski <francois-xavier.kowalski@hp.com>
+ for suggesting how to modify logging so that even on NPTL systems each line in
+ the log file shows the individual thread's pid
+
+Franz Gangkofer <Franz.Gangkofer@cadsoft.de>
+ for reporting a problem with @plugin in keymacros.conf in case the named plugin
+ is not loaded
+
+Malte Schr�der <MalteSch@gmx.de>
+ for reporting a crash after executing the SVDRP command CLRE
+
+Markus Hahn <mhahn@reel-multimedia.com>
+ for suggesting to only start recordings if there is at least 300MB free disk space
+
+Jaroslaw Swierczynski <swiergot@gmail.com>
+ for updating the Polish OSD texts and the fontosd-iso8859-2.c file
diff --git a/HISTORY b/HISTORY
index 3a657c0e5..18e56369c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4189,3 +4189,41 @@ Video Disk Recorder Revision History
   Ahrenberg).
 - No longer displaying color buttons in the recording info menu if it has been
   invoked from a player (reported by J�rgen Schilling).
+
+2006-01-22: Version 1.3.40
+
+- Fixed a second place where a message should be given when an instant recording
+  is started (reported by Jesus Bravo Alvarez).
+- Modified logging so that even on NPTL systems each line in the log file shows
+  the individual thread's pid (based on a suggestion from Francois-Xavier Kowalski).
+- Fixed a problem with @plugin in keymacros.conf in case the named plugin is not
+  loaded (reported by Franz Gangkofer).
+- Fixed a crash after executing the SVDRP command CLRE, caused by dangling 'schedule'
+  pointers from cChannel objects (reported by Malte Schr�der).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Improved NULL checking in strreplace().
+- Fixed a crash in the Schedule menu with events that have no title (reported by
+  Rolf Ahrenberg). cEvent::FixEpgBugs() now assigns a "No title" string to events
+  that have no title.
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Recordings are now only started if there is at least 300MB free disk space
+  (suggested by Markus Hahn).
+- When entering text via the numeric keys, the cursor now automatically advances
+  (based on a patch from Rolf Ahrenberg).
+- Updated the Polish OSD texts and the fontosd-iso8859-2.c file (thanks to Jaroslaw
+  Swierczynski).
+- Disabled the "buffer reserve" in Transfer Mode. Last chance to complain if you
+  really need it - it will be completely removed in the next version. If you are
+  experiencing problems with a/v running out of sync, try the latest driver and
+  firmware (if you are using a full featured DVB card).
+- Switching channels with the Up/Down or Channel+/Channel- keys now works a lot
+  faster when the repeat function kicks in, by not actually switching the
+  channel every time, but rather only displaying the channel info and doing
+  the final switch when the key is released.
+- The channel display is now updated _before_ the channel is switched.
+- Added a missing initialization of 'timeout' in the cDisplayChannel constructor.
+- Fixed detecting if there can be any useful further input when entering channel
+  numbers (thanks to Thomas Bergwinkl).
+- Updated the Spanish OSD texts (thanks to Jesus Bravo Alvarez).
+- Fixed handling the '0' key for switching between the last two channels (thanks
+  to Thomas Bergwinkl).
diff --git a/channels.conf b/channels.conf
index c4276287e..e15663d73 100644
--- a/channels.conf
+++ b/channels.conf
@@ -23,7 +23,7 @@ Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:
 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
 KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
 DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:133:5:0
-NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
+9Live;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
@@ -46,7 +46,7 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1702:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1722,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
@@ -65,6 +65,7 @@ PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
+m�nchen.TV/RFO,m�TV/RFO;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
 ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
@@ -83,10 +84,26 @@ RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:399
 Nick/Talpa;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 NICK;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-VIVA;VIVA Fernsehen GmbH & Co. KG:12669:vC56:S19.2E:22000:309:310=deu:311:0:12732:1:1116:0
-VIVA PLUS;VIVA Fernsehen GmbH & Co. KG:12551:vC56:S19.2E:22000:171:172=deu:173:0:12120:1:1108:0
+VIVA;MTV Networks:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
+VIVA PLUS;MTV Networks:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
+:NTSC
+Venevision;T-Systems/MTI:11200:vC56:S13.0E:27500:922:923=und:0:0:4750:0:13400:0
+EBC.1;T-Systems/MTI:11200:vC56:S13.0E:27500:373:374=eng:0:0:4747:0:13400:0
+:HDTV
+HDFORUM;TF1:11242:vC34:S13.0E:27500:33:36=fra:0:0:13809:100:200:0
+HDFORUM;TF1:11242:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
+Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
+Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
+SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
+SMD HD:12699:V:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0
+Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
+TV HD;CSAT:12581:vC56:S19.2E:22000:165:100=fra;101=fra:0:0:9306:1:1110:0
+C M HD;Telenor:11261:hC78:S1.0W:24500:517:660=eng;661=eng:0:B00:3306:70:33:0
+C MORE HD;Telenor:11389:hC78:S1.0W:24500:512:640;641=eng:0:B00:3306:70:34:0
+HELLAS-HDTV;Scopus Network Technologies:11642:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
+TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:0
 :@201 Sky
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
@@ -115,10 +132,6 @@ S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:20
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
-Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
-Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
-SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
-Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
 Challenger Tv;Telespazio:11304:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
 TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:3:1:65535:1:0
diff --git a/config.h b/config.h
index 3d63ec620..03e445160 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.240 2006/01/13 15:17:19 kls Exp $
+ * $Id: config.h 1.241 2006/01/15 16:01:48 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.39"
-#define VDRVERSNUM   10339  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.40"
+#define VDRVERSNUM   10340  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/epg.c b/epg.c
index 79c11762c..384f86b3a 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.49 2006/01/15 13:58:30 kls Exp $
+ * $Id: epg.c 1.51 2006/01/20 14:09:48 kls Exp $
  */
 
 #include "epg.h"
@@ -422,197 +422,196 @@ void cEvent::FixEpgBugs(void)
   strreplace(description, '\x86', ' ');
   strreplace(description, '\x87', ' ');
 
+  if (!title) {
+     // we don't want any "(null)" titles
+     title = strcpyrealloc(title, tr("No title"));
+     EpgBugFixStat(12, ChannelID());
+     }
+
   if (Setup.EPGBugfixLevel == 0)
      return;
 
   // Some TV stations apparently have their own idea about how to fill in the
   // EPG data. Let's fix their bugs as good as we can:
-  if (title) {
-
-     // Some channels put the ShortText in quotes and use either the ShortText
-     // or the Description field, depending on how long the string is:
-     //
-     // Title
-     // "ShortText". Description
-     //
-     if ((shortText == NULL) != (description == NULL)) {
-        char *p = shortText ? shortText : description;
-        if (*p == '"') {
-           const char *delim = "\".";
-           char *e = strstr(p + 1, delim);
-           if (e) {
-              *e = 0;
-              char *s = strdup(p + 1);
-              char *d = strdup(e + strlen(delim));
-              free(shortText);
-              free(description);
-              shortText = s;
-              description = d;
-              EpgBugFixStat(1, ChannelID());
-              }
-           }
-        }
 
-     // Some channels put the Description into the ShortText (preceded
-     // by a blank) if there is no actual ShortText and the Description
-     // is short enough:
-     //
-     // Title
-     //  Description
-     //
-     if (shortText && !description) {
-        if (*shortText == ' ') {
-           memmove(shortText, shortText + 1, strlen(shortText));
-           description = shortText;
-           shortText = NULL;
-           EpgBugFixStat(2, ChannelID());
+  // Some channels put the ShortText in quotes and use either the ShortText
+  // or the Description field, depending on how long the string is:
+  //
+  // Title
+  // "ShortText". Description
+  //
+  if ((shortText == NULL) != (description == NULL)) {
+     char *p = shortText ? shortText : description;
+     if (*p == '"') {
+        const char *delim = "\".";
+        char *e = strstr(p + 1, delim);
+        if (e) {
+           *e = 0;
+           char *s = strdup(p + 1);
+           char *d = strdup(e + strlen(delim));
+           free(shortText);
+           free(description);
+           shortText = s;
+           description = d;
+           EpgBugFixStat(1, ChannelID());
            }
         }
+     }
 
-     // Sometimes they repeat the Title in the ShortText:
-     //
-     // Title
-     // Title
-     //
-     if (shortText && strcmp(title, shortText) == 0) {
-        free(shortText);
+  // Some channels put the Description into the ShortText (preceded
+  // by a blank) if there is no actual ShortText and the Description
+  // is short enough:
+  //
+  // Title
+  //  Description
+  //
+  if (shortText && !description) {
+     if (*shortText == ' ') {
+        memmove(shortText, shortText + 1, strlen(shortText));
+        description = shortText;
         shortText = NULL;
-        EpgBugFixStat(3, ChannelID());
+        EpgBugFixStat(2, ChannelID());
         }
+     }
 
-     // Some channels put the ShortText between double quotes, which is nothing
-     // but annoying (some even put a '.' after the closing '"'):
-     //
-     // Title
-     // "ShortText"[.]
-     //
-     if (shortText && *shortText == '"') {
-        int l = strlen(shortText);
-        if (l > 2 && (shortText[l - 1] == '"' || (shortText[l - 1] == '.' && shortText[l - 2] == '"'))) {
-           memmove(shortText, shortText + 1, l);
-           char *p = strrchr(shortText, '"');
-           if (p)
-              *p = 0;
-           EpgBugFixStat(4, ChannelID());
-           }
+  // Sometimes they repeat the Title in the ShortText:
+  //
+  // Title
+  // Title
+  //
+  if (shortText && strcmp(title, shortText) == 0) {
+     free(shortText);
+     shortText = NULL;
+     EpgBugFixStat(3, ChannelID());
+     }
+
+  // Some channels put the ShortText between double quotes, which is nothing
+  // but annoying (some even put a '.' after the closing '"'):
+  //
+  // Title
+  // "ShortText"[.]
+  //
+  if (shortText && *shortText == '"') {
+     int l = strlen(shortText);
+     if (l > 2 && (shortText[l - 1] == '"' || (shortText[l - 1] == '.' && shortText[l - 2] == '"'))) {
+        memmove(shortText, shortText + 1, l);
+        char *p = strrchr(shortText, '"');
+        if (p)
+           *p = 0;
+        EpgBugFixStat(4, ChannelID());
         }
+     }
 
-     if (Setup.EPGBugfixLevel <= 1)
-        return;
+  if (Setup.EPGBugfixLevel <= 1)
+     return;
 
-     // Some channels apparently try to do some formatting in the texts,
-     // which is a bad idea because they have no way of knowing the width
-     // of the window that will actually display the text.
-     // Remove excess whitespace:
-     title = compactspace(title);
-     shortText = compactspace(shortText);
-     description = compactspace(description);
+  // Some channels apparently try to do some formatting in the texts,
+  // which is a bad idea because they have no way of knowing the width
+  // of the window that will actually display the text.
+  // Remove excess whitespace:
+  title = compactspace(title);
+  shortText = compactspace(shortText);
+  description = compactspace(description);
 
 #define MAX_USEFUL_EPISODE_LENGTH 40
-     // Some channels put a whole lot of information in the ShortText and leave
-     // the Description totally empty. So if the ShortText length exceeds
-     // MAX_USEFUL_EPISODE_LENGTH, let's put this into the Description
-     // instead:
-     if (!isempty(shortText) && isempty(description)) {
-        if (strlen(shortText) > MAX_USEFUL_EPISODE_LENGTH) {
-           free(description);
-           description = shortText;
-           shortText = NULL;
-           EpgBugFixStat(6, ChannelID());
-           }
+  // Some channels put a whole lot of information in the ShortText and leave
+  // the Description totally empty. So if the ShortText length exceeds
+  // MAX_USEFUL_EPISODE_LENGTH, let's put this into the Description
+  // instead:
+  if (!isempty(shortText) && isempty(description)) {
+     if (strlen(shortText) > MAX_USEFUL_EPISODE_LENGTH) {
+        free(description);
+        description = shortText;
+        shortText = NULL;
+        EpgBugFixStat(6, ChannelID());
         }
+     }
 
-     // Some channels put the same information into ShortText and Description.
-     // In that case we delete one of them:
-     if (shortText && description && strcmp(shortText, description) == 0) {
-        if (strlen(shortText) > MAX_USEFUL_EPISODE_LENGTH) {
-           free(shortText);
-           shortText = NULL;
-           }
-        else {
-           free(description);
-           description = NULL;
-           }
-        EpgBugFixStat(7, ChannelID());
+  // Some channels put the same information into ShortText and Description.
+  // In that case we delete one of them:
+  if (shortText && description && strcmp(shortText, description) == 0) {
+     if (strlen(shortText) > MAX_USEFUL_EPISODE_LENGTH) {
+        free(shortText);
+        shortText = NULL;
+        }
+     else {
+        free(description);
+        description = NULL;
         }
+     EpgBugFixStat(7, ChannelID());
+     }
 
-     // Some channels use the ` ("backtick") character, where a ' (single quote)
-     // would be normally used. Actually, "backticks" in normal text don't make
-     // much sense, so let's replace them:
-     strreplace(title, '`', '\'');
-     strreplace(shortText, '`', '\'');
-     strreplace(description, '`', '\'');
+  // Some channels use the ` ("backtick") character, where a ' (single quote)
+  // would be normally used. Actually, "backticks" in normal text don't make
+  // much sense, so let's replace them:
+  strreplace(title, '`', '\'');
+  strreplace(shortText, '`', '\'');
+  strreplace(description, '`', '\'');
 
-     if (Setup.EPGBugfixLevel <= 2)
-        return;
+  if (Setup.EPGBugfixLevel <= 2)
+     return;
 
-     // The stream components have a "description" field which some channels
-     // apparently have no idea of how to set correctly:
-     if (components) {
-        for (int i = 0; i < components->NumComponents(); i++) {
-            tComponent *p = components->Component(i);
-            switch (p->stream) {
-              case 0x01: { // video
-                   if (p->description) {
-                      if (strcasecmp(p->description, "Video") == 0 ||
-                           strcasecmp(p->description, "Bildformat") == 0) {
-                         // Yes, we know it's video - that's what the 'stream' code
-                         // is for! But _which_ video is it?
-                         free(p->description);
-                         p->description = NULL;
-                         EpgBugFixStat(8, ChannelID());
-                         }
-                      }
-                   if (!p->description) {
-                      switch (p->type) {
-                        case 0x01:
-                        case 0x05: p->description = strdup("4:3"); break;
-                        case 0x02:
-                        case 0x03:
-                        case 0x06:
-                        case 0x07: p->description = strdup("16:9"); break;
-                        case 0x04:
-                        case 0x08: p->description = strdup(">16:9"); break;
-                        case 0x09:
-                        case 0x0D: p->description = strdup("HD 4:3"); break;
-                        case 0x0A:
-                        case 0x0B:
-                        case 0x0E:
-                        case 0x0F: p->description = strdup("HD 16:9"); break;
-                        case 0x0C:
-                        case 0x10: p->description = strdup("HD >16:9"); break;
-                        }
-                      EpgBugFixStat(9, ChannelID());
+  // The stream components have a "description" field which some channels
+  // apparently have no idea of how to set correctly:
+  if (components) {
+     for (int i = 0; i < components->NumComponents(); i++) {
+         tComponent *p = components->Component(i);
+         switch (p->stream) {
+           case 0x01: { // video
+                if (p->description) {
+                   if (strcasecmp(p->description, "Video") == 0 ||
+                        strcasecmp(p->description, "Bildformat") == 0) {
+                      // Yes, we know it's video - that's what the 'stream' code
+                      // is for! But _which_ video is it?
+                      free(p->description);
+                      p->description = NULL;
+                      EpgBugFixStat(8, ChannelID());
                       }
                    }
-                   break;
-              case 0x02: { // audio
-                   if (p->description) {
-                      if (strcasecmp(p->description, "Audio") == 0) {
-                         // Yes, we know it's audio - that's what the 'stream' code
-                         // is for! But _which_ audio is it?
-                         free(p->description);
-                         p->description = NULL;
-                         EpgBugFixStat(10, ChannelID());
-                         }
-                      }
-                   if (!p->description) {
-                      switch (p->type) {
-                        case 0x05: p->description = strdup("Dolby Digital"); break;
-                        // all others will just display the language
-                        }
-                      EpgBugFixStat(11, ChannelID());
+                if (!p->description) {
+                   switch (p->type) {
+                     case 0x01:
+                     case 0x05: p->description = strdup("4:3"); break;
+                     case 0x02:
+                     case 0x03:
+                     case 0x06:
+                     case 0x07: p->description = strdup("16:9"); break;
+                     case 0x04:
+                     case 0x08: p->description = strdup(">16:9"); break;
+                     case 0x09:
+                     case 0x0D: p->description = strdup("HD 4:3"); break;
+                     case 0x0A:
+                     case 0x0B:
+                     case 0x0E:
+                     case 0x0F: p->description = strdup("HD 16:9"); break;
+                     case 0x0C:
+                     case 0x10: p->description = strdup("HD >16:9"); break;
+                     }
+                   EpgBugFixStat(9, ChannelID());
+                   }
+                }
+                break;
+           case 0x02: { // audio
+                if (p->description) {
+                   if (strcasecmp(p->description, "Audio") == 0) {
+                      // Yes, we know it's audio - that's what the 'stream' code
+                      // is for! But _which_ audio is it?
+                      free(p->description);
+                      p->description = NULL;
+                      EpgBugFixStat(10, ChannelID());
                       }
                    }
-                   break;
-              }
-            }
-        }
-     }
-  else {
-     // we don't want any "(null)" titles
-     title = strcpyrealloc(title, tr("No title"));
-     EpgBugFixStat(12, ChannelID());
+                if (!p->description) {
+                   switch (p->type) {
+                     case 0x05: p->description = strdup("Dolby Digital"); break;
+                     // all others will just display the language
+                     }
+                   EpgBugFixStat(11, ChannelID());
+                   }
+                }
+                break;
+           }
+         }
      }
 }
 
@@ -935,7 +934,10 @@ bool cSchedules::ClearAll(void)
   cSchedulesLock SchedulesLock(true, 1000);
   cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
   if (s) {
-     s->Clear();
+     for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
+         Timer->SetEvent(NULL);
+     for (cSchedule *Schedule = s->First(); Schedule; Schedule = s->Next(Schedule))
+         Schedule->Cleanup(INT_MAX);
      return true;
      }
   return false;
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index 979c902b5..e61e9a876 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -3948,23 +3948,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x00000700,  // ..***........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000FE0,  // .*******.....
      0x00000FE0,  // .*******.....
-     0x00000FA0,  // .*****.*.....
-     0x00000380,  // ...***.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
      0x00000600,  // ..**.........
-     0x00000FFE,  // .***********.
-     0x00000FFC,  // .**********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
@@ -4032,34 +4032,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
   },
   {             // 166
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
+     15, 27,
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
   },
   {             // 167
      13, 27,
@@ -4212,34 +4212,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
   },
   {             // 172
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     14, 27,
+     0x00000000,  // ..............
+     0x00000030,  // ........**....
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 173
      8, 27,
@@ -4302,34 +4302,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ..............
   },
   {             // 175
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
   },
   {             // 176
      14, 27,
@@ -4371,23 +4371,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x0000000E,  // .........***.
+     0x0000000E,  // .........***.
+     0x00000006,  // ..........**.
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -4428,23 +4428,23 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007E,  // .******.
-     0x00000046,  // .*...**.
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x00000006,  // .....**.
-     0x00000003,  // ......**
-     0x000000C3,  // **....**
-     0x0000007E,  // .******.
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x0000001E,  // ...****.
      0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
      0x00000000,  // ........
      0x00000000,  // ........
      0x00000000,  // ........
@@ -4518,27 +4518,27 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
      0x00000000,  // ............
      0x00000000,  // ............
-     0x000000FF,  // ....********
-     0x000001FF,  // ...*********
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000000F6,  // ....****.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
      0x00000000,  // ............
   },
   {             // 183
@@ -4692,34 +4692,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .......
   },
   {             // 188
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00018030,  // ...**.........**....
-     0x00038020,  // ..***.........*.....
-     0x00078040,  // .****........*......
-     0x000180C0,  // ...**.......**......
-     0x00018180,  // ...**......**.......
-     0x00018100,  // ...**......*........
-     0x0001830C,  // ...**.....**....**..
-     0x0001860C,  // ...**....**.....**..
-     0x0001861C,  // ...**....**....***..
-     0x00000C3C,  // ........**....****..
-     0x0000186C,  // .......**....**.**..
-     0x0000384C,  // ......***....*..**..
-     0x000030FF,  // ......**....********
-     0x000060FF,  // .....**.....********
-     0x0000E00C,  // ....***.........**..
-     0x0000C004,  // ....**...........*..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 189
      20, 27,
@@ -4782,34 +4782,34 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ............
   },
   {             // 191
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E1C,  // ..***....***..
-     0x000007F8,  // ...********...
-     0x000003E0,  // ....*****.....
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
   },
   {             // 192
      15, 27,
@@ -5113,10 +5113,10 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 202
      15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000320,  // .....**..*.....
-     0x00000230,  // .....*...**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
      0x00000000,  // ...............
      0x00001FFE,  // ..************.
      0x00001FFE,  // ..************.
@@ -5135,9 +5135,9 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00001800,  // ..**...........
      0x00001FFE,  // ..************.
      0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
+     0x00000006,  // ............**.
      0x00000000,  // ...............
      0x00000000,  // ...............
   },
@@ -5323,10 +5323,10 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
   },
   {             // 209
      17, 27,
-     0x00000000,  // .................
-     0x00000760,  // ......***.**.....
-     0x00000FE0,  // .....*******.....
+     0x00000070,  // ..........***....
+     0x00000060,  // ..........**.....
      0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
      0x00000000,  // .................
      0x0000600C,  // ..**.........**..
      0x0000700C,  // ..***........**..
@@ -6078,9 +6078,9 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000B0,  // .....*.**....
-     0x00000190,  // ....**..*....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
      0x000001F0,  // ....*****....
@@ -6095,9 +6095,9 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x0000060C,  // ..**.....**..
      0x000007F8,  // ..********...
      0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x00000038,  // .......***...
      0x00000000,  // .............
      0x00000000,  // .............
   },
@@ -6288,9 +6288,9 @@ cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // .............
      0x00000000,  // .............
      0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
      0x00000000,  // .............
      0x00000000,  // .............
      0x000004F8,  // ..*..*****...
diff --git a/i18n.c b/i18n.c
index 4080fd123..1bd20daee 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.235 2006/01/15 12:22:15 kls Exp $
+ * $Id: i18n.c 1.240 2006/01/22 15:55:28 kls Exp $
  *
  * Translations provided by:
  *
@@ -15,8 +15,8 @@
  * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no>, Truls Slevigen <truls@slevigen.no>
  * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi>, Rolf Ahrenberg <rahrenbe@cc.hut.fi>
- * Polish      Michael Rakowski <mrak@gmx.de>
- * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>
+ * Polish      Michael Rakowski <mrak@gmx.de>, Jaroslaw Swierczynski <swiergot@gmail.com>
+ * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>, Jesus Bravo Alvarez <jba@pobox.com>
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
  * Swedish     Tomas Prybil <tomas@prybil.se>, Jan Ekholm <chakie@infa.abo.fi>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
@@ -112,8 +112,8 @@ const tI18nPhrase Phrases[] = {
     "iso8859-1",
     "iso8859-1",
     "iso8859-15",
-    "iso8859-1",
-    "iso8859-1",
+    "iso8859-2",
+    "iso8859-15",
     "iso8859-7",
     "iso8859-1",
     "iso8859-2",
@@ -198,7 +198,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�nes",
     "Kanaler",
     "Kanavat",
-    "Kanaly",
+    "Kana�y",
     "Canales",
     "�������",
     "Kanaler",
@@ -220,7 +220,7 @@ const tI18nPhrase Phrases[] = {
     "Timere",
     "Ajastimet",
     "Timery",
-    "Timer",
+    "Programar grabaciones",
     "��������������������",
     "Timers",
     "Timer-e",
@@ -261,8 +261,8 @@ const tI18nPhrase Phrases[] = {
     "Infos sur l'enregistrement",
     "",// TODO
     "Tallenteen tiedot",
-    "",// TODO
-    "",// TODO
+    "Informacje o nagraniu",
+    "Informaci�n de grabaci�n",
     "����������� E�������",
     "Inspelning",
     "Detaliile �nregistr�rii",
@@ -282,7 +282,7 @@ const tI18nPhrase Phrases[] = {
     "Configuration",
     "Konfigurasjon",
     "Asetukset",
-    "Nastawy",
+    "Ustawienia",
     "Configuraci�n",
     "���������",
     "Inst�llningar",
@@ -303,7 +303,7 @@ const tI18nPhrase Phrases[] = {
     "Commandes",
     "Kommandoer",
     "Komennot",
-    "Rozkazy",
+    "Polecenia",
     "�rdenes",
     "�������",
     "Kommandon",
@@ -324,7 +324,7 @@ const tI18nPhrase Phrases[] = {
     "Commandes d'enregistrement",
     "",// TODO
     "Tallennekomennot",
-    "Rozkazy Nagran",
+    "Polecenia nagra�",
     "�rdenes de grabaci�n",
     "������� ��� ��������",
     "Inspelningskommandon",
@@ -345,7 +345,7 @@ const tI18nPhrase Phrases[] = {
     "Modifier une cha�ne",
     "Editer kanal",
     "Muokkaa kanavaa",
-    "Ustawienie kanalu",
+    "Edycja kana�u",
     "Modificar canal",
     "����������� ��������",
     "�ndra kanal",
@@ -366,8 +366,8 @@ const tI18nPhrase Phrases[] = {
     "Changer la programmation",
     "Editer timer",
     "Muokkaa ajastinta",
-    "Ustawienie timerow",
-    "Modificar timer",
+    "Edycja timera",
+    "Modificar programaci�n",
     "����������� ��������������������",
     "�ndra timer",
     "Modificare timer",
@@ -408,8 +408,8 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "",//TODO
     "Tiedot",
-    "",//TODO
-    "",//TODO
+    "Info",
+    "Info",
     "�����������",
     "Info",
     "Info",
@@ -430,7 +430,7 @@ const tI18nPhrase Phrases[] = {
     "Program Guide - %s",
     "Ohjelmisto - %s",
     "Program - %s",
-    "Programa - %s",
+    "Gu�a de programaci�n - %s",
     "��������� - %s",
     "Program - %s",
     "Programul canalului %s",
@@ -438,7 +438,7 @@ const tI18nPhrase Phrases[] = {
     "Guia de Programaci� - %s",
     "��������� - %s",
     "Raspored - %s",
-    "Programm - %s",
+    "Ajakava - %s",
     "Program - %s",
   },
   { "This event - %s",
@@ -449,17 +449,17 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "T�m� tapahtuma - %s",
     "",//TODO
+    "Este evento - %s",
     "",//TODO
+    "Ta audycja - %s",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "See s�ndmus - %s",
     "",//TODO
   },
   { "This event - all channels",
@@ -470,17 +470,17 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "T�m� tapahtuma - kaikki kanavat",
     "",//TODO
+    "Este evento - todos los canales",
     "",//TODO
+    "Ta audycja - wszystkie kana�y",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "See s�ndmus - k�ik kanalid",
     "",//TODO
   },
   { "All events - all channels",
@@ -491,17 +491,17 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Kaikki tapahtumat - kaikki kanavat",
     "",//TODO
+    "Todos los eventos - todos los canales",
     "",//TODO
+    "Wszystkie audycje - wszystkie kana�y",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "K�ik s�ndmused - k�ik kanalid",
     "",//TODO
   },
   { "What's on now?",
@@ -513,7 +513,7 @@ const tI18nPhrase Phrases[] = {
     "Programmes en cours",
     "Hvilket program sendes n�?",
     "Menossa nyt",
-    "Program biezacy",
+    "Program bie��cy",
     "�Qu� hay ahora?",
     "������ ���������",
     "Vad s�nds nu?",
@@ -534,8 +534,8 @@ const tI18nPhrase Phrases[] = {
     "Prochains programmes",
     "Hvilket program er neste?",
     "Tulossa seuraavaksi",
-    "Program nastepny",
-    "�Qu� hay proximo?",
+    "Nast�pne audycje",
+    "�Qu� hay despu�s?",
     "������� ���������",
     "Vilket �r n�sta program?",
     "Ce emisiuni urmeaz�?",
@@ -555,7 +555,7 @@ const tI18nPhrase Phrases[] = {
     "R�sum�",
     "Sammendrag",
     "Yhteenveto",
-    "Zawartosc",
+    "Podsumowanie",
     "Resumen",
     "�����������",
     "Sammanfattning",
@@ -564,7 +564,7 @@ const tI18nPhrase Phrases[] = {
     "Resum",
     "��������",
     "Sadr�aj",
-    "Kokkuv�te",
+    "�levaade",
     "Omtale",
   },
   // Button texts (should not be more than 10 characters!):
@@ -577,7 +577,7 @@ const tI18nPhrase Phrases[] = {
     "Modifier",
     "Editer",
     "Muokkaa",
-    "Edycja",
+    "Edytuj",
     "Modificar",
     "����������",
     "�ndra",
@@ -619,7 +619,7 @@ const tI18nPhrase Phrases[] = {
     "Supprimer",
     "Slett",
     "Poista",
-    "Usunac",
+    "Usu�",
     "Borrar",
     "��������",
     "Ta bort",
@@ -640,7 +640,7 @@ const tI18nPhrase Phrases[] = {
     "Marquer",
     "Marker",
     "Siirr�",
-    "Zaznaczyc",
+    "Zaznacz",
     "Marcar",
     "�������",
     "M�rk",
@@ -661,7 +661,7 @@ const tI18nPhrase Phrases[] = {
     "Marche/Arr",
     "Av/P�",
     "P��ll�/Pois",
-    "Zal./ Wyl.",
+    "W�/Wy�",
     "On/Off",
     "A����/K������",
     "P�/Av",
@@ -670,7 +670,7 @@ const tI18nPhrase Phrases[] = {
     "On/Off",
     "���/����",
     "De-/Aktiviraj",
-    "Sees/V�ljas",
+    "On/Off",
     "Til/Fra",
   },
   { "Timer",
@@ -682,6 +682,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Ajastin",
+    "Timer",// TODO
+    "Programa",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -689,9 +691,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Taimer",
     "",// TODO
   },
   { "Button$Record",
@@ -703,7 +703,7 @@ const tI18nPhrase Phrases[] = {
     "Enregistre",
     "Ta opp",
     "Tallenna",
-    "Nagrywac",
+    "Nagraj",
     "Grabar",
     "�������",
     "Inspelning",
@@ -724,7 +724,7 @@ const tI18nPhrase Phrases[] = {
     "Lire",
     "Spill av",
     "Toista",
-    "Odtwarzac",
+    "Odtw�rz",
     "Play",
     "�����������",
     "Spela upp",
@@ -745,7 +745,7 @@ const tI18nPhrase Phrases[] = {
     "Pause",
     "",// TODO
     "Tauko",
-    "Przerwa",
+    "Pauza",
     "Pausa",
     "�����",
     "Pausa",
@@ -766,7 +766,7 @@ const tI18nPhrase Phrases[] = {
     "Retour",
     "Spol tilbake",
     "Alkuun",
-    "Poczatek",
+    "Pocz�tek",
     "Rebobinar",
     "�������� ���� ����",
     "�terspolning",
@@ -787,7 +787,7 @@ const tI18nPhrase Phrases[] = {
     "Arr�t",
     "Stopp",
     "Lopeta",
-    "Zakonczyc",
+    "Zatrzymaj",
     "Parar",
     "�����",
     "Stopp",
@@ -808,7 +808,7 @@ const tI18nPhrase Phrases[] = {
     "Reprendre",
     "Fortsett",
     "Jatka",
-    "Dalej",
+    "Wzn�w",
     "Continuar",
     "���������",
     "Forts�tt",
@@ -829,7 +829,7 @@ const tI18nPhrase Phrases[] = {
     "Ouvrir",
     "�pne",
     "Avaa",
-    "Otworzyc",
+    "Otw�rz",
     "Abrir",
     "�������",
     "�ppna",
@@ -850,7 +850,7 @@ const tI18nPhrase Phrases[] = {
     "Regarder",
     "Skift til",
     "Valitse",
-    "Przelaczyc",
+    "Prze��cz",
     "Cambiar",
     "A�����",
     "Byt",
@@ -892,8 +892,8 @@ const tI18nPhrase Phrases[] = {
     "Apr�s",
     "Neste",
     "Seuraavaksi",
-    "Nastepny",
-    "Siguiente",
+    "Nast�pnie",
+    "Despu�s",
     "�������",
     "N�sta",
     "Urm�tor",
@@ -901,7 +901,7 @@ const tI18nPhrase Phrases[] = {
     "Seg�ent",
     "�����",
     "Slijedi",
-    "J�rgmine",
+    "Tulekul",
     "N�ste",
   },
   { "Button$Schedule",
@@ -914,7 +914,7 @@ const tI18nPhrase Phrases[] = {
     "Programmer",
     "Ohjelmisto",
     "Program",
-    "Programa",
+    "Gu�a",
     "���������",
     "Program",
     "Program",
@@ -922,7 +922,7 @@ const tI18nPhrase Phrases[] = {
     "Programar",
     "���������",
     "Raspored",
-    "Kava",
+    "Ajakava",
     "Program",
   },
   { "Button$ABC/abc",
@@ -955,7 +955,7 @@ const tI18nPhrase Phrases[] = {
     "Ins�rer",
     "",// TODO
     "Lis��",
-    "Wstawiac",
+    "Wstaw",
     "Insertar",
     "��������",
     "Infoga",
@@ -976,7 +976,7 @@ const tI18nPhrase Phrases[] = {
     "�craser",
     "",// TODO
     "Korvaa",
-    "Przepisac",
+    "Nadpisz",
     "Sobreescribir",
     "�������������",
     "Skriv �ver",
@@ -1039,8 +1039,8 @@ const tI18nPhrase Phrases[] = {
     "Scan",
     "",//TODO
     "P�ivit�",
-    "",//TODO
-    "",//TODO
+    "Skanuj",
+    "Escanear",
     "������",
     "Skanna",
     "C�utare canale",
@@ -1060,8 +1060,8 @@ const tI18nPhrase Phrases[] = {
     "Audio",
     "",// TODO
     "��ni",
-    "",// TODO
-    "",// TODO
+    "D�wi�k",
+    "Audio",
     "����",
     "Ljud",
     "Sunet",
@@ -1082,7 +1082,7 @@ const tI18nPhrase Phrases[] = {
     "Supprimer la cha�ne?",
     "Slette kanal?",
     "Poistetaanko kanava?",
-    "Usunac kanal?",
+    "Usun�� kana�?",
     "�Eliminar canal?",
     "�������� ��������?",
     "Ta bort kanalen?",
@@ -1103,8 +1103,8 @@ const tI18nPhrase Phrases[] = {
     "Supprimer la programmation?",
     "Slette timer?",
     "Poistetaanko ajastin?",
-    "Usunac timer?",
-    "�Eliminar timer?",
+    "Usun�� timer?",
+    "�Eliminar programaci�n?",
     "�������� ��������������������;?",
     "Ta bort timern?",
     "�terg timer-ul?",
@@ -1124,7 +1124,7 @@ const tI18nPhrase Phrases[] = {
     "Supprimer l'enregistrement?",
     "Slette opptak?",
     "Poistetaanko tallenne?",
-    "Usunac nagranie?",
+    "Usun�� nagranie?",
     "�Eliminar grabacion?",
     "�������� ��������?",
     "Ta bort inspelningen?",
@@ -1145,8 +1145,8 @@ const tI18nPhrase Phrases[] = {
     "Enregistrement en cours - confirmez la suppression",
     "Timer gj�r opptak - vil du slette likevel?",
     "Ajastettu tallennus k�ynniss� - poistetaanko silti?",
-    "Nagrywanie w trakcie - napewno usunac?",
-    "�Timer activo - de verdad eliminarlo?",
+    "Trwa nagrywanie - na pewno usun��?",
+    "Todav�a est� grabando - �eliminar realmente?",
     "�������������������� �� ������� - �������� �������?",
     "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
     "Timer-ul tocmai �nregistreaz� - �terg, totu�i?",
@@ -1166,7 +1166,7 @@ const tI18nPhrase Phrases[] = {
     "Arr�ter l'enregistrement?",
     "Stoppe opptak?",
     "Lopetetaanko tallennus?",
-    "Zakonczyc nagranie?",
+    "Zatrzyma� nagrywanie?",
     "�Parar grabaci�n?",
     "������� ��������?",
     "Stanna inspelning?",
@@ -1187,8 +1187,8 @@ const tI18nPhrase Phrases[] = {
     "Annuler les modifications?",
     "Avbryte redigering?",
     "Perutaanko muokkaus?",
-    "Zakonczyc montaz?",
-    "�Cancelar modificaci�n?",
+    "Anulowa� monta�?",
+    "�Cancelar edici�n?",
     "A������ ������������?",
     "Avbryta redigeringen?",
     "Opresc montajul �nregistr�rii?",
@@ -1208,8 +1208,8 @@ const tI18nPhrase Phrases[] = {
     "Red�marrer?",
     "Vil du virkelig starte p� nytt?",
     "K�ynnistet��nk� uudelleen?",
-    "Rzeczywiscie nowy start?",
-    "�De verdad reiniciar?",
+    "Na pewno zrestartowa�?",
+    "�Reiniciar realmente?",
     "N� ����� ������� ������������?",
     "Vill du verkligen starta om?",
     "Sigur repornesc?",
@@ -1229,8 +1229,8 @@ const tI18nPhrase Phrases[] = {
     "Enregistrement en cours - red�marrer?",
     "Gj�r opptak - starte p� nytt likevel?",
     "Tallennus kesken - k�ynnistet��nk� uudelleen?",
-    "Nagrywanie w trakcie - rzeczywiscie nowy start?",
-    "Grabando - �reiniciar?",
+    "Trwa nagrywanie - zrestartowa� mimo to?",
+    "Grabaci�n en curso - �reiniciar igualmente?",
     "������� ������� - ������ �� ����� ������������?",
     "Inspelning p�g�r, vill du �nd� starta om?",
     "Tocmai se �nregistreaz� - repornesc, totu�i?",
@@ -1250,8 +1250,8 @@ const tI18nPhrase Phrases[] = {
     "Enregistrement en cours - confirmez l'arr�t",
     "Gj�r opptak - sl� av likevel?",
     "Tallennus kesken - sammutetaanko?",
-    "Nagrywanie w trakcie - mimo to wylaczyc?",
-    "Grabando - �apagar?",
+    "Trwa nagrywanie - wy��czy� mimo to?",
+    "Grabaci�n en curso - �apagar igualmente?",
     "������� ������� - ������ �� ����� �����������?",
     "Inspelning p�g�r, vill du �nd� avbryta?",
     "Tocmai se �nregistreaz� - �nchid, totu�i?",
@@ -1271,8 +1271,8 @@ const tI18nPhrase Phrases[] = {
     "Enregistrement dans %d minutes - confirmez l'arr�t",
     "Skal gj�re opptak om %d minutter - sl� av likevel?",
     "Tallennus alkaa %d min kuluttua - sammutetaanko?",
-    "Nagrywanie za %d minut - mimo to wylaczyc?",
-    "Grabando en %d minutos, �de verdad apagar?",
+    "Nagrywanie za %d minut - wy��czy� mimo to?",
+    "Grabaci�n dentro de %d minutos, �apagar realmente?",
     "���������� ������� �� %d ����� - ������ �� �����������?",
     "Inspelning startar om %d minuter, vill du avsluta?",
     "�nregistrez peste %d minute - �nchid, totu�i?",
@@ -1292,7 +1292,7 @@ const tI18nPhrase Phrases[] = {
     "Appuyez sur une touche pour annuler l'arr�t",
     "Trykk en tast for ikke � sl� av",
     "Peru sammutus painamalla mit� tahansa n�pp�int�",
-    "Dowolny przycisk zatrzyma wylaczanie",
+    "Naci�nij dowolny klawisz aby nie wy��cza�",
     "Pulse una tecla para interrumpir apagar",
     "����� ��� ������� ��� ������� �����������",
     "Tryck valfri knapp f�r att �terkalla avst�ngningen",
@@ -1335,7 +1335,7 @@ const tI18nPhrase Phrases[] = {
     "Fr�quence",
     "Frekvens",
     "Taajuus",
-    "Czestotliwosc",
+    "Cz�stotliwo��",
     "Frecuencia",
     "���������",
     "Frekvens",
@@ -1377,8 +1377,8 @@ const tI18nPhrase Phrases[] = {
     "Source",
     "",//TODO
     "L�hde",
-    "Zrodlo",
-    "",//TODO
+    "�r�d�o",
+    "Fuente",
     "����",
     "K�lla",
     "Surs�",
@@ -1399,7 +1399,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Symbolinopeus",
     "Srate",
-    "Srate",
+    "T.s�mbolos",
     "Srate",
     "Srate",
     "Rat� simboluri",
@@ -1567,7 +1567,7 @@ const tI18nPhrase Phrases[] = {
     "Kortleser",
     "Salaus (CA)",
     "CA",
-    "CA",
+    "Acceso condicional (CA)",
     "CA",
     "Kortl�sare",
     "CA (Acces Condi�ional)",
@@ -1586,17 +1586,17 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "vapaa",
     "",//TODO
+    "en abierto",
     "",//TODO
+    "Otwarta transmisja",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "FTA",
     "",//TODO
   },
   { "encrypted",
@@ -1607,17 +1607,17 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "salattu",
     "",//TODO
+    "cifrado",
     "",//TODO
+    "szyfrowany",
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "kr�ptitud",
     "",//TODO
   },
   { "Sid",
@@ -1650,7 +1650,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
     "Inversion",
     "Inversio",
-    "Inversion",
+    "Inwersja",
     "Inversion",
     "����������",
     "Inversion",
@@ -1671,8 +1671,8 @@ const tI18nPhrase Phrases[] = {
     "Bande passante",
     "Bandwidth",
     "Kaistanleveys",
-    "Szerokosc pasma",
-    "Bandwidth",
+    "Pasmo",
+    "Ancho de banda",
     "����� ����������",
     "Bandbredd",
     "L�rgime de band�",
@@ -1735,7 +1735,7 @@ const tI18nPhrase Phrases[] = {
     "Modulation",
     "Modulaatio",
     "Modulacja",
-    "Modulation",
+    "Modulaci�n",
     "����������",
     "Modulation",
     "Modula�ie",
@@ -1756,7 +1756,7 @@ const tI18nPhrase Phrases[] = {
     "Transmission",
     "Transmissio",
     "Transmisja",
-    "Transmission",
+    "Transmisi�n",
     "��������",
     "Transmission",
     "Transmisiune",
@@ -1777,7 +1777,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
     "Suojav�li",
     "Guard",
-    "Guard",
+    "Int.Guarda",
     "���������",
     "Guard",
     "Guard",
@@ -1797,8 +1797,8 @@ const tI18nPhrase Phrases[] = {
     "Hi�rarchie",
     "Hierarchy",
     "Hierarkia",
-    "Hierachia",
-    "Hierarchy",
+    "Hierarchia",
+    "Jerarqu�a",
     "���������",
     "Hierarchy",
     "Ierarhie",
@@ -1840,7 +1840,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne",
     "Kanal",
     "Kanava",
-    "Kanal",
+    "Kana�",
     "Canal",
     "������",
     "Kanal",
@@ -1861,7 +1861,7 @@ const tI18nPhrase Phrases[] = {
     "Jour",
     "Dag",
     "P�iv�",
-    "Dzien",
+    "Dzie�",
     "D�a",
     "�����",
     "Dag",
@@ -1882,7 +1882,7 @@ const tI18nPhrase Phrases[] = {
     "D�but",
     "Start",
     "Aloitus",
-    "Poczatek",
+    "Pocz�tek",
     "Comienzo",
     "����",
     "B�rjar",
@@ -1924,8 +1924,8 @@ const tI18nPhrase Phrases[] = {
     "VPS",
     "",// TODO
     "VPS",
-    "",// TODO
-    "",// TODO
+    "VPS",
+    "VPS",
     "VPS",
     "VPS",
     "VPS",
@@ -1966,8 +1966,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e de vie",
     "Levetid",
     "Elinik�",
-    "Trwalosc dni",
-    "Durabilidad",
+    "Czas �ycia",
+    "Duraci�n",
     "�������� ���������",
     "Livstid",
     "Timp de p�strare",
@@ -2008,7 +2008,7 @@ const tI18nPhrase Phrases[] = {
     "Premier jour",
     "F�rste dag",
     "1. p�iv�",
-    "Pierwszy dzien",
+    "Pierwszy dzie�",
     "Primer d�a",
     "����� ����",
     "F�rsta dag",
@@ -2030,8 +2030,8 @@ const tI18nPhrase Phrases[] = {
     "Cette cha�ne est en cours d'utilisation!",
     "Kanalen er i bruk av en timer!",
     "Kanava on ajastimen k�yt�ss�!",
-    "Kanal jest zajety przez timer nagran",
-    "�Canal est� ocupado por un timer!",
+    "Kana� jest u�ywany przez timer!",
+    "�Hay una grabaci�n programada para este canal!",
     "�� ������ ��������������� ��� �������������������!",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
@@ -2051,8 +2051,8 @@ const tI18nPhrase Phrases[] = {
     "Impossible de changer de cha�ne!",
     "Ikke mulig � skifte kanal!",
     "Kanavan vaihtaminen ei mahdollista!",
-    "Kanal nie moze byc teraz przelaczony!",
-    "�No puedo cambiar canal!",
+    "Nie mo�na prze��czy� kana�u!",
+    "�No se puede cambiar de canal!",
     "������ �������� �������!",
     "Om�jligt att byta kanal!",
     "Nu pot comuta canalul!",
@@ -2073,7 +2073,7 @@ const tI18nPhrase Phrases[] = {
     "Timer gj�r opptak!",
     "Ajastintallennus k�ynniss�!",
     "Timer nagrywa!",
-    "�Timer esta grabando!",
+    "�Grabaci�n en curso!",
     "������� ��������������� �������!",
     "Timerstyrd inspelning p�g�r!",
     "Timer-ul tocmai �nregistreaz�!",
@@ -2081,7 +2081,7 @@ const tI18nPhrase Phrases[] = {
     "El temporitzador est� gravant!",
     "���� ������ �� �������!",
     "Snimanje po definiranom terminu!",
-    "Taimeri salvestamine!",
+    "Taimeriga salvestamine aktiivne!",
     "Timer optager nu!",
   },
   { "Error while accessing recording!",
@@ -2093,7 +2093,7 @@ const tI18nPhrase Phrases[] = {
     "Impossible d'acc�der � l'enregistrement",
     "Feil under lesing av opptak!",
     "Tallenteen toistaminen ep�onnistui!",
-    "Blad - brak dostepu do nagrania!",
+    "Bl�d podczas dost�pu do nagrania!",
     "�Error al acceder a la grabaci�n!",
     "�������� ���� ���������� ��������!",
     "Inspelningen g�r inte att l�sa!",
@@ -2114,7 +2114,7 @@ const tI18nPhrase Phrases[] = {
     "Erreur de suppression de l'enregistrement!",
     "Feil under sletting av opptak!",
     "Tallenteen poistaminen ep�onnistui!",
-    "Blad przy usuwaniu nagrania!",
+    "Bl�d podczas usuwania nagrania!",
     "�Error al borrar la grabaci�n!",
     "����� ���� ��� �������� ��� �������!",
     "Inspelningen g�r inte att ta bort!",
@@ -2135,8 +2135,8 @@ const tI18nPhrase Phrases[] = {
     "*** Cha�ne invalide! ***",
     "*** Ugyldig Kanal! ***",
     "*** Virheellinen kanavavalinta! ***",
-    "*** Niewazny kanal ***",
-    "*** Canal inv�lido ***",
+    "*** Niepoprawny kana� ***",
+    "*** Canal no v�lido ***",
     "*** ����� ������ ***",
     "*** Felaktig kanal ***",
     "*** Canal invalid ***",
@@ -2157,7 +2157,7 @@ const tI18nPhrase Phrases[] = {
     "Ingen ledige DVB enheter for opptak!",
     "Ei vapaata DVB-viritint� tallennukselle!",
     "Brak wolnej karty DVB do nagrywania!",
-    "�No hay dispositivo DVB disponible para grabar!",
+    "�Ning�n dispositivo DVB disponible para grabar!",
     "���������� DVB ������ ��� �������!",
     "Det finns ingen ledig DVB enhet f�r inspelning!",
     "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!",
@@ -2177,7 +2177,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne non disponible!",
     "",//TODO
     "Kanava ei ole k�ytett�viss�!",
-    "Kanal jest niedostepny!",
+    "Kana� nie jest dost�pny!",
     "!Canal no disponible!",
     "�� ������ ��� ����� ���������!",
     "Kanalen �r inte tillg�nglig!",
@@ -2198,7 +2198,7 @@ const tI18nPhrase Phrases[] = {
     "Caract�ristiques des cha�nes ne sont pas uniques",
     "",//TODO
     "Kanava-asetukset eiv�t ole yksil�lliset!",
-    "Nastawy kanalu sa niejednoznaczne!",
+    "Ustawienia kana�u nie s� unikalne!",
     "!Propiedades de canal duplicadas!",
     "�� ��������� ��� �������� ����������������!",
     "Kanalinst�llningarna �r ej unika!",
@@ -2219,7 +2219,7 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne verrouill�e (enregistrement en cours)!",
     "Kanalen er l�st (opptak)!",
     "Kanava lukittu (tallennus k�ynniss�)!",
-    "Kanal zablokowany (nagrywanie w toku)!",
+    "Kana� zablokowany (trwa nagrywanie)!",
     "�Canal bloqueado (grabando)!",
     "�� ������ ����� ������������ (������ �������)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
@@ -2240,8 +2240,8 @@ const tI18nPhrase Phrases[] = {
     "Impossible d'utiliser le mode transfert!",
     "Kan ikke starte transfer modus!",
     "Siirtotilan aloitus ep�onnistui!",
-    "Tryb transferowy jest niemozliwy!",
-    "�No puedo iniciar modo de transferencia!",
+    "Nie mo�na uruchomi� trybu transferu!",
+    "�No se puede iniciar el modo de transferencia!",
     "�������� ��������� ���������� ���������!",
     "Kan inte starta Transfer Mode!",
     "Nu pot porni modul de transfer!",
@@ -2261,8 +2261,8 @@ const tI18nPhrase Phrases[] = {
     "Pas de marques d'�dition d�finies!",
     "",//TODO
     "Muokkausmerkinn�t puuttuvat!",
-    "Brak znakow montazowych!",
-    "",//TODO
+    "Nie zdefiniowano znacznik�w monta�u!",
+    "�No se definieron marcas de edici�n!",
     "��� ����� ������� ������ ������������",
     "Det finns inga redigeringsm�rken",//TODO
     "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare",
@@ -2282,8 +2282,8 @@ const tI18nPhrase Phrases[] = {
     "Impossible de commencer le montage!",
     "Kan ikke starte redigeringsprosessen!",
     "Muokkauksen aloitus ep�onnistui!",
-    "Uruchamianie montazu jest niemozliwe!",
-    "�No puedo iniciar proceso de modificaci�n!",
+    "Nie mo�na uruchomi� procesu edycji!",
+    "�No se puede iniciar el proceso de edici�n!",
     "�������� ��������� ��� ������������!",
     "Kan inte starta redigering!",
     "Nu pot porni montajul �nregistr�rii!",
@@ -2303,8 +2303,8 @@ const tI18nPhrase Phrases[] = {
     "Montage d�j� en cours!",
     "Redigeringsprosessen er allerede aktiv!",
     "Muokkaus on jo k�ynniss�!",
-    "Montaz w toku!",
-    "�Proceso de modificaci�n ya fue iniciado!",
+    "Proces edycji jest ju� aktywny!",
+    "�El proceso de edici�n ya est� activo!",
     "����������� ��������� �� �������!",
     "Redigeringen �r redan aktiv!",
     "Montajul �nregistr�rii este deja activ!",
@@ -2312,7 +2312,7 @@ const tI18nPhrase Phrases[] = {
     "Proc�s d'edici� iniciat anteriorment!",
     "������� ������������ ��� �������!",
     "Ure�ivanje je ve� aktivirano!",
-    "Redigeerimine on juba aktiivne!",
+    "Redigeerimine juba aktiivne!",
     "Redigeringsproces er allerede aktiv!",
   },
   { "Can't shutdown - option '-s' not given!",
@@ -2324,8 +2324,8 @@ const tI18nPhrase Phrases[] = {
     "Arr�t impossible - option '-s' absente!",
     "Kan ikke sl� av - startet uten parameteret '-s'!",
     "Sammutus ei onnistu - '-s' parametri puuttuu!",
-    "Wylaczenie niemozliwe - brak opcji '-s'!",
-    "�No puedo apagar - opci�n '-s' ausente!",
+    "Nie mo�na wy��czy� - nie podano opcji '-s'!",
+    "�No se puede apagar - falta el par�metro '-s'!",
     "�������� �� ����� �����������. ��������� � ���������� '-s'!",
     "Kan inte avsluta, m�ste anv�nda parameter '-s'",
     "Nu pot �nchide - vezi op�iunea '-s'",
@@ -2336,6 +2336,27 @@ const tI18nPhrase Phrases[] = {
     "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!",
     "Kan ikke slukke - parameter '-s' ikke angivet!",
   },
+  { "Not enough disk space to start recording!",
+    "Nicht gen�gend Plattenplatz f�r Aufnahme!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Low disk space!",
     "Platte beinahe voll!",
     "Premalo prostora na disku!",
@@ -2345,8 +2366,8 @@ const tI18nPhrase Phrases[] = {
     "Disque presque plein!",
     "Lite ledig diskplass!",
     "Tallennustila loppumassa!",
-    "Dysk wkrotce pelny!",
-    "�Disco casi lleno",
+    "Ma�o miejsca na dysku!",
+    "�Poco espacio en disco!",
     "� ������� �������� �� �������!",
     "L�gt diskutrymme!",
     "Spa�iul pe disc e foarte sc�zut!",
@@ -2354,7 +2375,7 @@ const tI18nPhrase Phrases[] = {
     "Disc gaireb� ple!",
     "������������ ����� �� �����!",
     "Nedovoljno prostora na disku",
-    "K�vaketas peaaegu t�is!",
+    "K�vaketas t�is!",
     "Kun lidt diskplads tilbage!",
   },
   { "Opening CAM menu...",
@@ -2366,8 +2387,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Avataan CA-moduulin valikkoa...",
-    "",//TODO
-    "",//TODO
+    "Otwieram menu CAM...",
+    "Abriendo el men� CAM...",
     "",//TODO
     "������� CAM �����",
     "",//TODO
@@ -2387,8 +2408,8 @@ const tI18nPhrase Phrases[] = {
     "Impossible d'ouvrir le menu CAM!",
     "",//TODO
     "CA-moduulin valikko ei saatavilla",
-    "CAM-Menu niedostepne!",
-    "�No pudeo acceder al men� de la CAM!",
+    "Nie mo�na otworzy� menu CAM!",
+    "�No se puede abrir el men� CAM!",
     "������� � �������� ��� CAM �����!",
     "Det g�r inte att �ppna CAM menyn!",
     "Nu pot deschide meniul CAM",
@@ -2408,8 +2429,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "CA-moduuli palautetaan alkutilaan...",
-    "",//TODO
-    "",//TODO
+    "Resetuj� CAM...",
+    "Reiniciando CAM...",
     "",//TODO
     "��������� CAM",
     "",//TODO
@@ -2429,8 +2450,8 @@ const tI18nPhrase Phrases[] = {
     "Impossible de r�initialiser la CAM!",
     "",//TODO
     "CA-moduulin palautus alkutilaan ep�onnistui!",
-    "Nieudany CAM-Reset!",
-    "�No puedo reiniciar la CAM!",
+    "Nie mo�na zresetowa� CAM!",
+    "�No se puede reiniciar CAM!",
     "������� � ��������� ��� CAM",
     "Kan inte �terst�lla CAM!",
     "Nu pot reseta CAM",
@@ -2450,8 +2471,8 @@ const tI18nPhrase Phrases[] = {
     "La CAM a �t� r�initialis�e",
     "",//TODO
     "CA-moduuli palautettu alkutilaan",
-    "CAM-Reset wykonany",
-    "CAM reiniciada",
+    "CAM zosta� zresetowany",
+    "CAM reiniciado",
     "����� ��������� ��� CAM",
     "CA modulen har �terst�llts",
     "CAM-ul a fost resetat",
@@ -2471,8 +2492,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Sy�t� %d numeroa!",
-    "",//TODO
-    "",//TODO
+    "Prosz� poda� %d cyfr!",
+    "�Escriba %d d�gitos!",
     "",//TODO
     "�������� ��������������� %d �������",
     "",//TODO
@@ -2492,8 +2513,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Pas d'audio disponible!",
     "��nen kieli ei ole valittavissa!",
-    "",//TODO
-    "",//TODO
+    "D�wi�k nie jest dost�pny!",
+    "�No hay audio disponible!",
     "�� ���������� ����",
     "Ljud saknas!"
     "Lipse�te sunetul!",
@@ -2620,7 +2641,7 @@ const tI18nPhrase Phrases[] = {
     "Opptak",
     "Tallennus",
     "Nagranie",
-    "Opciones de Grabaci�n",
+    "Opciones de grabaci�n",
     "�������",
     "Inspelning",
     "�nregistrare",
@@ -2641,7 +2662,7 @@ const tI18nPhrase Phrases[] = {
     "Spill av",
     "Toisto",
     "Odtwarzanie",
-    "Opciones de Reproducci�n",
+    "Opciones de reproducci�n",
     "�����������",
     "Uppspelning",
     "Redare",
@@ -2661,7 +2682,7 @@ const tI18nPhrase Phrases[] = {
     "Divers",
     "Forskjellig",
     "Sekalaiset",
-    "Pozostale",
+    "R�ne",
     "Varios",
     "�������",
     "Diverse",
@@ -2682,7 +2703,7 @@ const tI18nPhrase Phrases[] = {
     "Plugins",
     "Plugins",
     "Laajennokset",
-    "Plugins",
+    "Wtyczki",
     "Plugins",
     "����������",
     "Moduler",
@@ -2703,7 +2724,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Plugin",
     "Laajennos",
-    "Plugin",
+    "Wtyczka",
     "Plugin",
     "��������",
     "Modul",
@@ -2724,7 +2745,7 @@ const tI18nPhrase Phrases[] = {
     "Red�marrer",
     "Start p� nytt",
     "K�ynnist� uudelleen",
-    "Zastartowac",
+    "Restart",
     "Reiniciar",
     "������������",
     "Omstart",
@@ -2746,7 +2767,7 @@ const tI18nPhrase Phrases[] = {
     "Langue",
     "Spr�k",
     "Kieli",
-    "Jezyk",
+    "J�zyk",
     "Idioma",
     "������",
     "Spr�k",
@@ -2767,8 +2788,8 @@ const tI18nPhrase Phrases[] = {
     "Skin",
     "",// TODO
     "Ulkoasu",
-    "",// TODO
-    "",// TODO
+    "Sk�rka",
+    "Skin",
     "���������",
     "Skin",
     "Skin",
@@ -2788,8 +2809,8 @@ const tI18nPhrase Phrases[] = {
     "Th�me",
     "",// TODO
     "Teema",
-    "",// TODO
-    "",// TODO
+    "Motyw",
+    "Tema",
     "����",
     "Tema",
     "Tem�",
@@ -2809,8 +2830,8 @@ const tI18nPhrase Phrases[] = {
     "Gauche",
     "",// TODO
     "Vaakakeskitys",
-    "",// TODO
-    "",// TODO
+    "Od lewej",
+    "Izquierda",
     "��������",
     "V�nster",
     "St�nga",
@@ -2830,8 +2851,8 @@ const tI18nPhrase Phrases[] = {
     "Haut",
     "",// TODO
     "Pystykeskitys",
-    "",// TODO
-    "",// TODO
+    "Od g�ry",
+    "Arriba",
     "�����",
     "�vre",
     "Sus",
@@ -2851,7 +2872,7 @@ const tI18nPhrase Phrases[] = {
     "Largeur",
     "Bredde",
     "Leveys",
-    "Szerokosc",
+    "Szeroko��",
     "Anchura",
     "������",
     "Bredd",
@@ -2872,7 +2893,7 @@ const tI18nPhrase Phrases[] = {
     "Hauteur",
     "H�yde",
     "Korkeus",
-    "Wysokosc",
+    "Wysoko��",
     "Altura",
     "����",
     "H�jd",
@@ -2893,8 +2914,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e affichage message (s)",
     "Tid meldinger skal vises (s)",
     "Viestien esitysaika (s)",
-    "Czas wyswietlania wiadomosci (s)",
-    "Duraci�n muestra mensajes (s)",
+    "Czas trwania wiadomo�ci (s)",
+    "Duraci�n de los mensajes (sg)",
     "������ �������� ��������� (�)",
     "Tid f�r meddelanden (sek)",
     "Timp afi�are mesaje (sec)",
@@ -2914,8 +2935,8 @@ const tI18nPhrase Phrases[] = {
     "Utiliser les petits caract�res",
     "",// TODO
     "K�yt� pieni� kirjasimia",
-    "",// TODO
-    "",// TODO
+    "U�ywaj ma�ej czcionki",
+    "Usar letra peque�a",
     "������������� ������ ��������������",
     "Anv�nd liten font",
     "Utilizare fonturi mici",
@@ -2935,8 +2956,8 @@ const tI18nPhrase Phrases[] = {
     "jamais",
     "",// TODO
     "ei koskaan",
-    "",// TODO
-    "",// TODO
+    "nigdy",
+    "nunca",
     "����"
     "aldrig",
     "niciodat�",
@@ -2956,8 +2977,8 @@ const tI18nPhrase Phrases[] = {
     "d�pend du skin",
     "",// TODO
     "ulkoasun mukaan",
-    "",// TODO
-    "",// TODO
+    "zal. od sk�rki",
+    "seg�n skin",
     "�������� ��� ��� ���������",
     "skin beroende",
     "dep. de skin",
@@ -2977,8 +2998,8 @@ const tI18nPhrase Phrases[] = {
     "toujours",
     "",// TODO
     "aina",
-    "",// TODO
-    "",// TODO
+    "zawsze",
+    "siempre",
     "�����",
     "alltid",
     "�ntotdeauna",
@@ -2998,8 +3019,8 @@ const tI18nPhrase Phrases[] = {
     "Position infos cha�nes",
     "Posisjon p� kanalinformasjon",
     "Kanavatiedon sijainti",
-    "Lokalizacja informacji o kanale",
-    "Posici�n para informaci�n canal",
+    "Pozycja informacji o kanale",
+    "Posici�n para informaci�n de canal",
     "���� ����������� ��������",
     "Placering av kanalinformation",
     "Pozi�ia informa�iilor despre canal",
@@ -3019,8 +3040,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e affichage infos cha�nes (s)",
     "",// TODO
     "Kanavatiedon esitysaika (s)",
-    "",// TODO
-    "",// TODO
+    "Czas trwania informacji o kanale (s)",
+    "Tiempo de informaci�n de canal (sg)",
     "������ ��������� ����������� �������� �� (�)",
     "Kanal information (s)",
     "Durata afi��rii info-canal (s)",
@@ -3028,7 +3049,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "����� ���������� � ������ (���)",
     "Vrijeme prikaza informacije o programu (s)",
-    "Kanaliteate esitusaeg (s)",
+    "Kanaliinfo esitusaeg (s)",
     "Tid kanalinfo skal vises (s)",
   },
   { "Setup.OSD$Info on channel switch",
@@ -3040,8 +3061,8 @@ const tI18nPhrase Phrases[] = {
     "Affichage progr. en cours",
     "Info ved kanalskifte",
     "N�yt� kanavatieto vaihdettaessa",
-    "Informacja przy zmianie kanalu",
-    "Informaci�n para cambio de canal",
+    "Informacja przy zmianie kana�u",
+    "Mostrar info al cambiar de canal",
     "����������� ���� ������ ��������",
     "Information vid kanalbyte",
     "Informa�ii la comutarea canalului",
@@ -3049,7 +3070,7 @@ const tI18nPhrase Phrases[] = {
     "Informaci� del canvi de canal",
     "���������� ���������� � ������",
     "Informacije kod promjene kanala",
-    "Kanaliteate n�itamine",
+    "Kanaliinfo n�itamine",
     "Info ved kanalskift",
   },
   { "Setup.OSD$Timeout requested channel info",
@@ -3061,6 +3082,8 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "Sulje kanavatieto pyydett�ess�",
+    "Czas oczekiwania na informacje",
+    "Auto-cerrar al solicitar info de canal",
     "", // TODO
     "", // TODO
     "", // TODO
@@ -3068,9 +3091,7 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
-    "", // TODO
-    "", // TODO
+    "Kanaliinfo kuvamise ajapiirang",
     "", // TODO
   },
   { "Setup.OSD$Scroll pages",
@@ -3082,8 +3103,8 @@ const tI18nPhrase Phrases[] = {
     "D�filement par pages",
     "Rask rulling i menyer",
     "Valikoiden vieritys sivuttain",
-    "Przesuwac stronami",
-    "Desplazar p�gina entera",
+    "Przesuwaj stronami",
+    "Deslizar p�ginas enteras",
     "������ �������",
     "Bl�ddra sidor",
     "Deruleaz� pagini",
@@ -3103,8 +3124,8 @@ const tI18nPhrase Phrases[] = {
     "D�filement rotatif",
     "",// TODO
     "Valikoiden vieritys ymp�ri",
-    "",// TODO
-    "",// TODO
+    "Skrajne pozycje s�siaduj�",
+    "Rotar arriba/abajo al deslizar",
     "������ ����-����",
     "Rulla texten",
     "Derulare circular�",
@@ -3123,17 +3144,17 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Sulje valikkon�pp�imell�",
     "",// TODO
+    "Cerrar al pulsar bot�n de men�",
     "",// TODO
+    "Klawisz Menu zamyka",
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Sulgemine Men�� klahviga",
     "",// TODO
   },
   { "Setup.OSD$Sort timers",
@@ -3145,8 +3166,8 @@ const tI18nPhrase Phrases[] = {
     "Trier les programmations",
     "Sorter timere",
     "J�rjest� ajastimet",
-    "Sortowanie timerow",
-    "Ordenar timers",
+    "Sortuj timery",
+    "Ordenar programas de grabaci�n",
     "�������� ��������������������",
     "Sortera timers",
     "Sortare timer-e",
@@ -3166,8 +3187,8 @@ const tI18nPhrase Phrases[] = {
     "Dossiers d'enregistrements",
     "Kataloger til opptak",
     "N�yt� tallennehakemistot",
-    "Wykaz nagran",
-    "Gracaciones en directorios",
+    "Katalogi nagra�",
+    "Mostrar directorios de grabaciones",
     "������� ��������",
     "Kataloger f�r inspelningar",
     "Directoare �nregistr�ri",
@@ -3187,8 +3208,8 @@ const tI18nPhrase Phrases[] = {
     "Inactivit� avant rech. EPG (h)",
     "Ledig tid f�r EPG-s�k (h)",
     "Ohjelmaoppaan taustap�ivitys (h)",
-    "Czas do skanu EPG (h)",
-    "Tiempo hasta exploraci�n EPG (h)",
+    "Czas skanowania EPG (h)",
+    "Tiempo de exploraci�n de EPG (h)",
     "������ ��������� �������� EPG �� ����",
     "EPG s�kning timeout",
     "Interval achizi�ie EPG (h)",
@@ -3208,8 +3229,8 @@ const tI18nPhrase Phrases[] = {
     "Niveau de correction EPG",
     "Niv� for EPG-feilretting",
     "Ohjelmaoppaan korjaustaso",
-    "Poziom bledow EPG",
-    "Nivel para arreglar EPG",
+    "Stopie� poprawek b��d�w EPG",
+    "Nivel de correcci�n de EPG",
     "������ ��������� ������ EPG",
     "Niv� f�r EPG bugfix",
     "Nivel corec�ie EPG",
@@ -3229,8 +3250,8 @@ const tI18nPhrase Phrases[] = {
     "Montrer l'EPG p�rim� (min)",
     "",// TODO
     "Vanha tieto n�kyy (min)",
-    "",// TODO
-    "",// TODO
+    "Czas przechowywania EPG (min)",
+    "Mostrar datos antiguos de EPG (m)",
     "������� ������������ ����������� (�����)",
     "Visa gammal information (min)",
     "Date EPG expirate cel mult (min)",
@@ -3250,7 +3271,7 @@ const tI18nPhrase Phrases[] = {
     "Ajuster l'heure du syst�me",
     "Juster system-klokken",
     "Tahdista kellonaika",
-    "Ustawianie czasu",
+    "Ustawiaj czas systemowy",
     "Ajustar reloj de sistema",
     "����������� ���� ����������",
     "St�ll in systemtid",
@@ -3271,8 +3292,8 @@ const tI18nPhrase Phrases[] = {
     "Utiliser l'heure de la cha�ne",
     "Bruk klokke fra transponder",
     "Vastaanota kellonaika transponderilta",
-    "Transponder do ustawiania czasu",
-    "Transponder para reloj de sistema",
+    "U�yj czasu z transpondera",
+    "Transponder del que tomar la hora",
     "������������ ����������� ����",
     "Anv�nd klockan fr�n transponder",
     "Preia ora din transponder",
@@ -3292,8 +3313,8 @@ const tI18nPhrase Phrases[] = {
     "Langues pr�f�r�es",
     "",// TODO
     "Suosikkikielet",
-    "",// TODO
-    "",// TODO
+    "Preferowanych j�zyk�w",
+    "Idiomas preferidos",
     "������������� �������",
     "�nskade spr�k",
     "Limbi preferate",
@@ -3313,8 +3334,8 @@ const tI18nPhrase Phrases[] = {
     "Langue pr�f�r�e",
     "",// TODO
     "Suosikkikieli",
-    "",// TODO
-    "",// TODO
+    "Preferowany j�zyk",
+    "Idioma preferido",
     "������������ ������",
     "�nskat spr�k",
     "Limba preferat�",
@@ -3334,8 +3355,8 @@ const tI18nPhrase Phrases[] = {
     "Carte DVB primaire",
     "Hoved DVB-enhet",
     "Ensisijainen DVB-sovitin",
-    "Pierwotny interfejs DVB",
-    "Primer interface DVB",
+    "Pierwszy interfejs DVB",
+    "Interfaz DVB primario",
     "����� DVB �����",
     "Prim�r DVB enhet",
     "Dispozitiv DVB primar",
@@ -3355,8 +3376,8 @@ const tI18nPhrase Phrases[] = {
     "Format d'affichage",
     "",//TODO
     "N�ytt�muoto",
-    "",//TODO
-    "",//TODO
+    "Format wy�wietlania obrazu",
+    "Formato de visualizaci�n",
     "����� ����������� ������",
     "Format f�r video display",
     "Formatul red�rii video",
@@ -3439,8 +3460,8 @@ const tI18nPhrase Phrases[] = {
     "Format vid�o",
     "TV-Format",
     "Kuvasuhde",
-    "Format telewizyjny",
-    "Formato V�deo",
+    "Format obrazu",
+    "Formato de v�deo",
     "����� ������",
     "Video format",
     "Format video",
@@ -3460,8 +3481,8 @@ const tI18nPhrase Phrases[] = {
     "Utiliser le Dolby Digital",
     "",//TODO
     "K�yt� Dolby Digital -��nt�",
-    "",//TODO
-    "",//TODO
+    "U�ywaj Dolby Digital",
+    "Usar Dolby Digital",
     "����� ���� Dolby Digital",
     "Anv�nd Dolby Digital",
     "Sunet Dolby Digital",
@@ -3481,8 +3502,8 @@ const tI18nPhrase Phrases[] = {
     "Mettre � jour les cha�nes",
     "",// TODO
     "P�ivit� kanavat",
-    "",// TODO
-    "",// TODO
+    "Aktualizuj kana�y",
+    "Actualizar canales",
     "��������� ��������",
     "Uppdatera kanaler",
     "Actualizare canale",
@@ -3502,8 +3523,8 @@ const tI18nPhrase Phrases[] = {
     "noms uniquement",
     "",// TODO
     "vain nimet",
-    "",// TODO
-    "",// TODO
+    "tylko nazwy",
+    "s�lo nombres",
     "���� �������",
     "bara namn",
     "doar numele",
@@ -3523,8 +3544,8 @@ const tI18nPhrase Phrases[] = {
     "noms et PIDs",
     "",// TODO
     "nimet ja PID:it",
-    "",// TODO
-    "",// TODO
+    "nazwy i PID-y",
+    "nombres y PIDs",
     "������� ��� PIDs",
     "namn och PID",
     "nume si PID-uri",
@@ -3532,7 +3553,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "�������� � PID�",
     "imena i identifikatore (PIDs)",
-    "nimed ja PID-id",
+    "nimi ja PID-id",
     "navne og PIDs",
   },
   { "add new channels",
@@ -3544,8 +3565,8 @@ const tI18nPhrase Phrases[] = {
     "ajouter cha�nes",
     "",// TODO
     "uudet kanavat",
-    "",// TODO
-    "",// TODO
+    "dodawaj nowe kana�y",
+    "a�adir canales",
     "�������� ���� ��������",
     "l�gg till nya kanaler",
     "ad�ugare canale noi",
@@ -3565,8 +3586,8 @@ const tI18nPhrase Phrases[] = {
     "ajouter transpondeurs",
     "",// TODO
     "uudet transponderit",
-    "",// TODO
-    "",// TODO
+    "dodawaj nowe transpondery",
+    "a�adir transponders",
     "�������� ���� �����������",
     "l�gg till nya transponders",
     "ad�ugare transpondere noi",
@@ -3586,8 +3607,8 @@ const tI18nPhrase Phrases[] = {
     "Langues audio",
     "",//TODO
     "��nen kielet",
-    "",//TODO
-    "",//TODO
+    "J�zyk�w d�wi�ku",
+    "Idiomas de audio",
     "������� ����",
     "Antal ljudspr�k",
     "Limbi sunet",
@@ -3607,8 +3628,8 @@ const tI18nPhrase Phrases[] = {
     "Langue audio",
     "",//TODO
     "��nen kieli",
-    "",//TODO
-    "",//TODO
+    "J�zyk d�wi�ku",
+    "Idioma de audio",
     "������ ����",
     "Ljudspr�k",
     "Limba sunetului",
@@ -3649,8 +3670,8 @@ const tI18nPhrase Phrases[] = {
     "Fr�quence basse LNB (MHz)",
     "LO-frekvens i lavb�ndet (MHz)",
     "LNB-alataajuus (MHz)",
-    "Dolna czestotliwosc LNB (MHz)",
-    "Frecuencia baja LNB (MHz)",
+    "Dolna cz�stotliwo�� LNB (MHz)",
+    "Frecuencia inferior del LNB (MHz)",
     "���� LNB-��������� (MHz)",
     "Undre LNB frekvens (MHz)",
     "Frecvn�� LNB inferioar� (Mhz)",
@@ -3670,8 +3691,8 @@ const tI18nPhrase Phrases[] = {
     "Fr�quence haute LNB (MHz)",
     "LO-frekvens i h�yb�ndet (MHz)",
     "LNB-yl�taajuus (MHz)",
-    "Gorna czestotliwosc LNB (MHz)",
-    "Frecuencia alta LNB (MHz)",
+    "G�rna cz�stotliwo�� LNB (MHz)",
+    "Frecuencia superior del LNB (MHz)",
     "��� LNB-��������� (MHz)",
     "�vre LNB frekvens (MHz)",
     "Frecvn�� LNB superioar� (MHz)",
@@ -3691,7 +3712,7 @@ const tI18nPhrase Phrases[] = {
     "Utiliser le DiSEqC",
     "Bruk DiSEqC",
     "K�yt� DiSEqC-kytkint�",
-    "Uzywac DiSEqC",
+    "U�ywaj DiSEqC",
     "Utilizar DiSEqC",
     "������������ DiSEqC",
     "Anv�nd DiSEqC",
@@ -3733,7 +3754,7 @@ const tI18nPhrase Phrases[] = {
     "Marge ant�rieure (min)",
     "Opptaksmargin start (min)",
     "Aloitusmarginaali (min)",
-    "Poczatkowy czas buforowy (min)",
+    "Margines na pocz�tku (min)",
     "Comenzar grabaci�n antes (min)",
     "��������� ������ ���� ���� (�����)",
     "Marginal f�r start (min)",
@@ -3754,8 +3775,8 @@ const tI18nPhrase Phrases[] = {
     "Marge post�rieure (min)",
     "Opptaksmargin slutt (min)",
     "Lopetusmarginaali (min)",
-    "Koncowy czas buforowy (min)",
-    "Cortar grabaci�n despu�s (min)",
+    "Margines na ko�cu (min)",
+    "Acabar grabaci�n despu�s (min)",
     "��������� ������ ��� ����� (�����)",
     "Marginal f�r stopp (min)",
     "Marj� la oprire (min)",
@@ -3775,7 +3796,7 @@ const tI18nPhrase Phrases[] = {
     "Limite primaire",
     "Prioritetsgrense HovedDVB",
     "Ensisijaisen sovittimen prioriteettiraja",
-    "Pierwotny limit",
+    "Podstawowy limit",
     "L�mite primario",
     "�������� ����",
     "Prim�r gr�ns",
@@ -3784,7 +3805,7 @@ const tI18nPhrase Phrases[] = {
     "L�mit primari",
     "���. ��������� ������� ���. ����������",
     "Standardno ograni�enje",
-    "Esmase seadme prioriteet",
+    "Esmane prioriteet",
     "Prim�r gr�nse",
   },
   { "Setup.Recording$Default priority",
@@ -3796,8 +3817,8 @@ const tI18nPhrase Phrases[] = {
     "Priorit� par d�faut",
     "Normal prioritet (Timer)",
     "Tallenteen oletusprioriteetti",
-    "Priorytet pierwotny",
-    "Prioridad predefinida",
+    "Domy�lny priorytet",
+    "Prioridad por defecto",
     "�������������� �������������",
     "Normal prioritet",
     "Prioritate implicit�",
@@ -3817,8 +3838,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e de vie par d�faut (j)",
     "Normal levetid timer (d)",
     "Tallenteen oletuselinik� (d)",
-    "Pierwotna trwalosc (d)",
-    "Duraci�n predefinida",
+    "Domy�lny czas �ycia (d)",
+    "Duraci�n por defecto (d�as)",
     "�������������� �������� ��������� (������)",
     "Normal livstid (dagar)",
     "Timp de p�strare predefinit (zile)",
@@ -3838,8 +3859,8 @@ const tI18nPhrase Phrases[] = {
     "Priorit� des pauses",
     "",// TODO
     "Taukotallenteen prioriteetti",
-    "Priorytet przerwy",
-    "",// TODO
+    "Priorytet pauzy",
+    "Prioridad en modo pausa",
     "������������� ������������",
     "Prioritet f�r direktinspelning",
     "Prioritate pauz�",
@@ -3859,8 +3880,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e de vie des pauses (j)",
     "",// TODO
     "Taukotallenteen elinik� (d)",
-    "Okres trwania przerwy (d)",
-    "",// TODO
+    "Czas �ycia pauzy (d)",
+    "Duraci�n en modo pausa (d�as)",
     "�������� �����������",
     "Livstid f�r direktinspelning (dagar)",
     "P�strarea emisiunilor 'pauzate' (zile)",
@@ -3880,7 +3901,7 @@ const tI18nPhrase Phrases[] = {
     "Utiliser le nom de l'�pisode",
     "Bruk episodenavn",
     "K�yt� jakson nime�",
-    "Czy uzywac nazwe epizodu",
+    "U�ywaj nazwy epizodu",
     "Utilizar nombre de episodo",
     "����� �������� ����������",
     "Anv�nd episodnamn",
@@ -3901,8 +3922,8 @@ const tI18nPhrase Phrases[] = {
     "Utiliser le VPS",
     "",// TODO
     "K�yt� VPS-toimintoa",
-    "",// TODO
-    "",// TODO
+    "U�ywaj VPS",
+    "Usar servicio VPS",
     "����� VPS",
     "Anv�nd VPS",
     "Utilizeaz� VPS",
@@ -3922,8 +3943,8 @@ const tI18nPhrase Phrases[] = {
     "Marge VPS",
     "",// TODO
     "VPS-toiminnon aloitusmarginaali (s)",
-    "",// TODO
-    "",// TODO
+    "Margines VPS (s)",
+    "Margen VPS (sg)",
     "��������� VPS (�)",
     "VPS marginal (s)",
     "Marj� de timp la utilizare VPS (s)",
@@ -3943,8 +3964,8 @@ const tI18nPhrase Phrases[] = {
     "Marquage enregistr. imm�diats",
     "Markere direkteopptak",
     "Merkitse pikatallenne",
-    "Zaznaczyc natychm. nagranie",
-    "Marcar grabaciones instant�neas",
+    "Zaznaczaj natychm. nagrywanie",
+    "Marcar grabaciones inmediatas",
     "������� ��������� ��������",
     "M�rk direktinspelning",
     "Marcheaz� �nregistrare imediat�",
@@ -3964,8 +3985,8 @@ const tI18nPhrase Phrases[] = {
     "Noms enregistr. imm�diats",
     "Navngi direkteopptak",
     "Nime� pikatallenne",
-    "Nazwac natychm. nagranie",
-    "Nombrar grabaciones instant�neas",
+    "Nazywaj natychm. nagrywanie",
+    "Nombrar grabaciones inmediatas",
     "�������� ��������� ��������",
     "Namnge direktinspelning",
     "Nume �nregistrare imediat�",
@@ -3985,8 +4006,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e enregistr. imm�diat (min)",
     "",//TODO
     "Pikatallennuksen kesto (min)",
-    "Dlugosc bezposredniego nagrania (min)",
-    "Tiempo de grabaci�n instant�nea (min)",
+    "Czas natychm. nagrywania (min)",
+    "Tiempo de grabaci�n inmediata (min)",
     "�������� ��������� �������� (�����)",
     "Direktinspelning l�ngd (min)",
     "Timpul de �nregistare imediat� (min)",
@@ -4006,8 +4027,8 @@ const tI18nPhrase Phrases[] = {
     "Taille maxi des fichiers (MB)",
     "Maksimal st�rrelse p� videofiler (MB)",
     "Suurin tiedostokoko (Mt)",
-    "Maks. wielkosc pliku (MB)",
-    "Tama�o m�x. de fichero (MB)",
+    "Maksymalny rozmiar pliku (MB)",
+    "Tama�o m�ximo de fichero (MB)",
     "������� ������� ������� (MB)",
     "Maximal filstorlek f�r inspelning (MB)",
     "Dimensiune maxim� a fi�ierului video (MB)",
@@ -4027,8 +4048,8 @@ const tI18nPhrase Phrases[] = {
     "S�parer les s�quences �dit�es",
     "Splitt redigerte filer",
     "Jaottele muokatut tallenteet",
-    "Dzielic montowane pliki",
-    "Quebrar ficheros",
+    "Dziel edytowane pliki",
+    "Partir ficheros editados",
     "����������� �������������� �������",
     "Dela upp redigerade filer",
     "Separare fi�iere montate",
@@ -4048,7 +4069,7 @@ const tI18nPhrase Phrases[] = {
     "Mode multi-vitesses",
     "Multispeed modus",
     "K�yt� toiston moninopeustilaa",
-    "Tryb wielopredkosciowy",
+    "Tryb wielopr�dko�ciowy",
     "Modo multi-velocidad",
     "������� ��������� ���������",
     "Multispeed mode",
@@ -4069,8 +4090,8 @@ const tI18nPhrase Phrases[] = {
     "Affichage mode de lecture",
     "Vis avspillingsmodus",
     "N�yt� toiston tila",
-    "Wyswietlac status odtwarzania",
-    "Mostrar modo de replay",
+    "Pokazuj tryb odtwarzania",
+    "Mostrar modo de reproducci�n",
     "������� ���������� ������������",
     "Visa uppspelningsl�ge",
     "Afi�eaz� redarea",
@@ -4090,8 +4111,8 @@ const tI18nPhrase Phrases[] = {
     "ID de reprise",
     "Resume ID",// TODO
     "Tallenteen paluutunniste",
-    "ID odtwarzania",
-    "Continuar ID",
+    "ID wznowienia",
+    "ID de continuaci�n",
     "ID ������������",
     "�teruppta ID",
     "Identificator continuare",
@@ -4111,8 +4132,8 @@ const tI18nPhrase Phrases[] = {
     "MinEventTimeout (min)",
     "Minste hendelsespause (min)",
     "Tapahtuman odotusaika (min)",
-    "Min. czas do nast. akcji (Event) (min)",
-    "Tiempo m�nimo pausa (min)",
+    "Minimalny czas audycji (min)",
+    "Tiempo m�n. antes de un evento (m)",
     "��������� ������ ���������� (�����)",
     "Minsta h�ndelse-pause (min)",
     "Durat� minim� emisiuni (min)",
@@ -4132,8 +4153,8 @@ const tI18nPhrase Phrases[] = {
     "Dur�e minimale d'inact. (min)",
     "Minimumstid med inaktivitet (min)",
     "K�ytt�j�toiminnon odotusaika (min)",
-    "Min. brak aktywnosci uzytkownika (min)",
-    "Tiempo m�nimo inactividad (min)",
+    "Minimalny czas nieaktywno�ci (min)",
+    "Tiempo m�n. de inactividad (m)",
     "��������� ������ �������� (�����)",
     "Minsta anv�ndar-inaktivitet (min)",
     "Durata minim� de inactivitate (min)",
@@ -4153,8 +4174,8 @@ const tI18nPhrase Phrases[] = {
     "Temps maxi SVDRP (s)",
     "Ubrukt SVDRP-levetid (s)",
     "SVDRP-komennon odotusaika (s)",
-    "Min. brak aktywnosci SVDRP (s)",
-    "SVDRP Timeout (s)",
+    "Czas oczekiwania na SVDRP (s)",
+    "Tiempo de espera de SVDRP (sg)",
     "SVDRP ������� (�)",
     "SVDRP Timeout (s)",
     "Timeout SVDRP (sec)",
@@ -4174,8 +4195,8 @@ const tI18nPhrase Phrases[] = {
     "Prise en compte cha�ne (s)",
     "",// TODO
     "Kanavavalinnan odotusaika (s)",
-    "",// TODO
-    "",// TODO
+    "Czas oczekiwania na zap (s)",
+    "Considerar canal como visto (sg)",
     "������� ������� (�)",
     "Zap timeout(s)",
     "Interval zapping (s)",
@@ -4196,8 +4217,8 @@ const tI18nPhrase Phrases[] = {
     "LMMJVSD",
     "MTOTFLS",
     "MTKTPLS",
-    "PWSCPSN",
-    "LMMJVSD",
+    "PW�CPSN",
+    "LMXJVSD",
     "�������",
     "MTOTFLS",
     "LMMJVSD",
@@ -4217,7 +4238,7 @@ const tI18nPhrase Phrases[] = {
     "LunMarMerJeuVenSamDim",
     "ManTirOnsTorFreL�rS�n",
     "Ma Ti Ke To Pe La Su ",
-    "PonWtoSroCzwPiaSobNie",
+    "PonWto�roCzwPi�SobNie",
     "LunMarMieJueVieSabDom",
     "������������������K��",
     "M�nTisOnsTorFreL�rS�n",
@@ -4239,8 +4260,8 @@ const tI18nPhrase Phrases[] = {
     " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@",
     "",// TODO
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
-    " a�bcde�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@",
+    " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.#~,/_@",
+    " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@",
     " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
     " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@",
@@ -4261,6 +4282,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
+    " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��",
+    " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -4268,9 +4291,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9",
     "",//TODO
   },
   // Learning keys:
@@ -4283,8 +4304,8 @@ const tI18nPhrase Phrases[] = {
     "Apprentissage des codes de t�l�commande",
     "L�re fjernkontrolltaster",
     "Kaukos��timen opettaminen",
-    "Nauka kodu pilota",
-    "Aprendiendo teclas del telemando",
+    "Nauka klawiszy pilota",
+    "Aprendiendo teclas del mando",
     "�������� �������� �������������",
     "Inl�rning av fj�rrkontrollsknappar",
     "�nv��are taste telecomand�",
@@ -4304,8 +4325,8 @@ const tI18nPhrase Phrases[] = {
     "Phase 1: D�tection du type de code",
     "Fase 1: Finne fjernkontroll-kodetype",
     "Vaihe 1: Koodauksen tunnistaminen",
-    "Faza 1: Detekcja typu kodu",
-    "Fase 1: Detectando tipo de receptor",
+    "Etap 1: Wykrywanie rodzaju kodu pilota",
+    "Fase 1: Detectando tipo de mando",
     "���� 1: ��������� ������ RC",
     "Steg1: identifiering av kod",
     "Faza 1: Detec�ia tipului telecomenzii",
@@ -4325,8 +4346,8 @@ const tI18nPhrase Phrases[] = {
     "Appuyer sur une touche de la t�l�commande",
     "Trykk en av tastene p� fjernkontrollen",
     "Paina mit� tahansa kaukos��timen n�pp�int�",
-    "Nacisnac klawisz pilota",
-    "Pulse una tecla en el telemando",
+    "Naci�nij dowolny klawisz na pilocie",
+    "Pulse cualquier tecla en el mando",
     "����� ��� ������� ��� ���������������",
     "Tryck valfri tangent p� fj�rrkontrollen",
     "Ap�sa�i o tast� pe telecomand�",
@@ -4346,8 +4367,8 @@ const tI18nPhrase Phrases[] = {
     "Code de la t�l�commande d�tect�!",
     "Fjernkontroll-kodetype funnet!",
     "N�pp�inpainallus vastaanotettu!",
-    "Kod pilota zostal poznany!",
-    "�C�digo detectado!",
+    "Wykryto kod pilota!",
+    "�C�digo RC detectado!",
     "������� ������� RC!",
     "Koden detekterad!",
     "S-a detectat tipul telecomenzii!",
@@ -4367,7 +4388,7 @@ const tI18nPhrase Phrases[] = {
     "N'appuyer sur aucune touche ...",
     "Ikke trykk p� noen av tastene...",
     "�l� paina kaukos��timen n�pp�imi�...",
-    "Nie naciskac klawiszy...",
+    "Nie naciskaj teraz �adnego klawisza...",
     "No pulse ninguna tecla...",
     "��� ����� �������...",
     "Tryck inte p� n�gon knapp...",
@@ -4388,7 +4409,7 @@ const tI18nPhrase Phrases[] = {
     "Phase 2: Apprentissage des codes des touches",
     "Fase 2: L�re spesifikke tastekoder",
     "Vaihe 2: N�pp�inkoodien opettelu",
-    "Faza 2: Nauka pojedynczych klawiszy",
+    "Etap 2: Nauka konkretnych kod�w klawiszy",
     "Fase 2: Aprendiendo c�digos espec�ficos",
     "���� 2: �������� ����������� ��������",
     "Fas 2: Inl�rning av specifika knapp-koder",
@@ -4409,8 +4430,8 @@ const tI18nPhrase Phrases[] = {
     "Appuyer sur la touche '%s'",
     "Trykk tasten for '%s'",
     "Paina n�pp�int� toiminnolle '%s'",
-    "Nacisnac klawisz dla '%s'",
-    "Pulsar tecla para '%s'",
+    "Naci�nij klawisz dla '%s'",
+    "Pulse la tecla para '%s'",
     "����� �� ������� ��� '%s'",
     "Tryck p� knappen f�r '%s'",
     "Ap�sa�i tasta pentru '%s'",
@@ -4430,7 +4451,7 @@ const tI18nPhrase Phrases[] = {
     "Appuyer sur 'Haut' pour confirmer",
     "Trykk 'Opp' for � bekrefte",
     "Hyv�ksy painamalla 'Yl�s'",
-    "Nacisnac 'Gora' do potwierdzenia",
+    "Naci�nij 'Do g�ry' aby potwierdzi�",
     "Pulse 'Arriba' para confirmar",
     "����� '����' ��� �������",
     "Tryck 'Upp' f�r att bekr�fta",
@@ -4451,8 +4472,8 @@ const tI18nPhrase Phrases[] = {
     "Appuyer sur 'Bas' pour continuer",
     "Trykk Ned' for � fortsette",
     "Jatka painamalla 'Alas'",
-    "Nacisnac 'Dol' zeby kontynuowac",
-    "Pulse 'Abajo' para confirmar",
+    "Naci�nij 'Na d�' aby kontynuowa�",
+    "Pulse 'Abajo' para continuar",
     "����� '����' ��� ��������",
     "Tryck 'Ner' f�r att bekr�fta",
     "Ap�sa�i 'Jos' pentru continuare",
@@ -4472,7 +4493,7 @@ const tI18nPhrase Phrases[] = {
     "(Appuyer sur 'Haut' pour revenir en arri�re)",
     "(trykk 'Opp' for � g� tilbake)",
     "(palaa takaisin painamalla 'Yl�s')",
-    "(Nacisnac 'Gora' cofa)",
+    "(naci�nij 'Do g�ry' aby si� cofn��)",
     "(Pulse 'Arriba' para retornar)",
     "(����� '����' ��� ���������",
     "(Tryck 'Upp' f�r att backa)",
@@ -4493,8 +4514,8 @@ const tI18nPhrase Phrases[] = {
     "(Appuyer sur 'Bas' pour terminer)",
     "(trykk 'Ned' for � avslutte innl�ring)",
     "(lopeta opettaminen painamalla 'Alas')",
-    "(Nacisnac 'Dol' by zakonczyc)",
-    "(Pulse 'Abajo' para terminar programaci�n teclas)",
+    "(naci�nij 'Na d�' aby zako�czy� definiowanie)",
+    "(Pulse 'Abajo' para terminar el aprendizaje)",
     "(����� '����' ��� ���������� �������� ��������)",
     "(Tryck 'Ner' f�r att avsluta inl�rningen)",
     "(Ap�sa�i 'Jos' pentru terminare)",
@@ -4514,8 +4535,8 @@ const tI18nPhrase Phrases[] = {
     "('Menu' pour passer cette touche)",
     "",// TODO
     "n�pp�imen puuttuessa paina 'Valikko'",
-    "(Nacisnac 'Menu' by ominac klawisz)",
-    "Pulse 'Menu' para saltarse esta tecla",
+    "(naci�nij 'Menu' aby pomin�� ten klawisz)",
+    "Pulse 'Men�' para omitir esta tecla",
     "����� '�����' ��� ���������� ����� ��� ��������",
     "(Tryck 'Meny' f�r att hoppa �ver knappen.)",
     "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�",
@@ -4535,8 +4556,8 @@ const tI18nPhrase Phrases[] = {
     "Phase 3: Sauvegarde des codes des touches",
     "Fase 3: Lagre tastekoder",
     "Vaihe 3: N�pp�inkoodien tallentaminen",
-    "Faza 3: Zapamietac Kod",
-    "Fase 3: Guardar c�digos de teclas",
+    "Etap 3: Zapisywanie kod�w klawiszy",
+    "Fase 3: Guardando los c�digos de teclas",
     "���� 3: ���������� �������",
     "Fas 3: Spara knappkoder",
     "Faza 3: Salvarea codurilor de taste",
@@ -4556,7 +4577,7 @@ const tI18nPhrase Phrases[] = {
     "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler",
     "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
     "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi",
-    "'Gora' zapamietuje, 'Dol' przerywa",
+    "Naci�nij 'Do g�ry' aby zapisa�, 'Na d�' - aby anulowa�",
     "Pulse 'Arriba' para guardar, 'Abajo' para anular",
     "����� '����' ��� ����������, '����' ��� �������",
     "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta.",
@@ -4578,7 +4599,7 @@ const tI18nPhrase Phrases[] = {
     "Haut",
     "Opp",
     "Yl�s",
-    "Gora",
+    "Do g�ry",
     "Arriba",
     "����",
     "Upp",
@@ -4599,7 +4620,7 @@ const tI18nPhrase Phrases[] = {
     "Bas",
     "Ned",
     "Alas",
-    "Dol",
+    "Na d�",
     "Abajo",
     "����",
     "Ner",
@@ -4621,7 +4642,7 @@ const tI18nPhrase Phrases[] = {
     "Meny",
     "Valikko",
     "Menu",
-    "Menu",
+    "Men�",
     "�����",
     "Meny",
     "Meniu",
@@ -4683,7 +4704,7 @@ const tI18nPhrase Phrases[] = {
     "Gauche",
     "Venstre",
     "Vasemmalle",
-    "Lewo",
+    "W lewo",
     "Izquierda",
     "��������",
     "V�nster",
@@ -4704,7 +4725,7 @@ const tI18nPhrase Phrases[] = {
     "Droite",
     "H�yre",
     "Oikealle",
-    "Prawo",
+    "W prawo",
     "Derecha",
     "�����",
     "H�ger",
@@ -4767,7 +4788,7 @@ const tI18nPhrase Phrases[] = {
     "Jaune",
     "Gul",
     "Keltainen",
-    "Zolty",
+    "��ty",
     "Amarillo",
     "�������",
     "Gul",
@@ -4809,8 +4830,8 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "",//TODO
     "Tiedot",
-    "",//TODO
-    "",//TODO
+    "Info",
+    "Info",
     "�����������",
     "Info",
     "Info",
@@ -4830,7 +4851,7 @@ const tI18nPhrase Phrases[] = {
     "Lecture",
     "",// TODO
     "Toista",
-    "Odtworzenie",
+    "Odtw�rz",
     "Reproducir",
     "�����������",
     "Spela upp",
@@ -4851,7 +4872,7 @@ const tI18nPhrase Phrases[] = {
     "Pause",
     "",// TODO
     "Tauko",
-    "Przerwa",
+    "Pauza",
     "Pausa",
     "�����",
     "Pausa",
@@ -4893,7 +4914,7 @@ const tI18nPhrase Phrases[] = {
     "Enregistrement",
     "",// TODO
     "Tallenna",
-    "Nagrywac",
+    "Nagrywaj",
     "Grabar",
     "E������",
     "Spela in",
@@ -4914,8 +4935,8 @@ const tI18nPhrase Phrases[] = {
     "Avance rapide",
     "",// TODO
     "Pikakelaus >>",
-    "Naprzod",
-    "Adelante r�pido",
+    "Do przodu",
+    "Avance r�pido",
     "�������� ������",
     "Snabbspolning fram�t",
     "Derulare �nainte",
@@ -4935,8 +4956,8 @@ const tI18nPhrase Phrases[] = {
     "Retour rapide",
     "",// TODO
     "Pikakelaus <<",
-    "Wstecz",
-    "Atr�s r�pido",
+    "Do ty�u",
+    "Retroceso r�pido",
     "�������� ����",
     "Snabbspolning bak�t",
     "Derulare �napoi",
@@ -4956,8 +4977,8 @@ const tI18nPhrase Phrases[] = {
     "Veille", // This one caused some bug reports ;)
     "Power",
     "Virtakytkin",
-    "Wylaczyc",
-    "Corriente",
+    "Wy��cz",
+    "Apagar",
     "K�������",
     "P�/Av",
     "�nchidere",
@@ -4977,8 +4998,8 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne+",
     "",// TODO
     "Kanava +",
-    "Kanal+",
-    "Canal +",
+    "Kana�+",
+    "Canal+",
     "������+",
     "Kanal+",
     "Canal+",
@@ -4998,8 +5019,8 @@ const tI18nPhrase Phrases[] = {
     "Cha�ne-",
     "",// TODO
     "Kanava -",
-    "Kanal-",
-    "Canal -",
+    "Kana�-",
+    "Canal-",
     "������-",
     "Kanal-",
     "Canal-",
@@ -5019,7 +5040,7 @@ const tI18nPhrase Phrases[] = {
     "Volume+",
     "Volum+",
     "��nenvoimakkuus +",
-    "Glosnej",
+    "G�o�niej",
     "Volumen+",
     "������+",
     "Volym+",
@@ -5061,7 +5082,7 @@ const tI18nPhrase Phrases[] = {
     "Coupure du son",
     "Lyd av",
     "��net�n",
-    "Cisza",
+    "Wycisz",
     "Mudo",
     "�������",
     "Ljud Av",
@@ -5082,8 +5103,8 @@ const tI18nPhrase Phrases[] = {
     "Audio",
     "",// TODO
     "��ni",
-    "",// TODO
-    "",// TODO
+    "D�wi�k",
+    "Audio",
     "����",
     "Ljud",
     "Sunet",
@@ -5146,7 +5167,7 @@ const tI18nPhrase Phrases[] = {
     "off",
     "",// TODO
     "pois",
-    "wyl.",
+    "wy��cz",
     "off",
     "�������",
     "av",
@@ -5167,7 +5188,7 @@ const tI18nPhrase Phrases[] = {
     "aucun",
     "",// TODO
     "tyhj�",
-    "zaden",
+    "brak",
     "ninguno",
     "������",
     "ingen",
@@ -5209,8 +5230,8 @@ const tI18nPhrase Phrases[] = {
     "haut",
     "�vre",
     "yl�reuna",
-    "gora",
-    "parte superior",
+    "g�ra",
+    "arriba",
     "����",
     "�vre",
     "sus",
@@ -5230,8 +5251,8 @@ const tI18nPhrase Phrases[] = {
     "bas",
     "nedre",
     "alareuna",
-    "dol",
-    "parte inferior",
+    "d�",
+    "abajo",
     "����",
     "undre",
     "jos",
@@ -5251,7 +5272,7 @@ const tI18nPhrase Phrases[] = {
     "Disque",
     "Disk",
     "Levy",
-    "Disk",
+    "Dysk",
     "Disco",
     "������",
     "Disk",
@@ -5272,7 +5293,7 @@ const tI18nPhrase Phrases[] = {
     "restant",
     "ledig",
     "vapaana",
-    "pozostalo",
+    "wolnego",
     "libre",
     "���������",
     "ledigt",
@@ -5294,7 +5315,7 @@ const tI18nPhrase Phrases[] = {
     "Hopp: ",
     "Siirry: ",
     "Skok: ",
-    "Salta a: ",
+    "Saltar: ",
     "����������: ",
     "Hopp: ",
     "Salt la: ",
@@ -5314,7 +5335,7 @@ const tI18nPhrase Phrases[] = {
     "Volume ",
     "Volum ",
     "��nenvoimakkuus ",
-    "Glosnosc ",
+    "G�o�no�� ",
     "Volumen ",
     "������ ",
     "Volym ",
@@ -5335,7 +5356,7 @@ const tI18nPhrase Phrases[] = {
     " Arr�ter la lecture",
     " Stopp avspilling",
     " Lopeta toisto",
-    " Zatrzymac odtwarzanie",
+    " Zatrzymaj odtwarzanie",
     " Parar reproduci�n",
     " ����� ������������",
     " Avsluta uppspelning",
@@ -5356,7 +5377,7 @@ const tI18nPhrase Phrases[] = {
     " Arr�ter l'enregistrement ",
     " Stopp opptak fra ",
     " Lopeta tallennus ",
-    " Zatrzymac nagrywanie ",
+    " Zatrzymaj nagrywanie ",
     " Parar grabaci�n ",
     " ����� ������� ",
     " Avsluta inspelning ",
@@ -5377,8 +5398,8 @@ const tI18nPhrase Phrases[] = {
     " Annuler le montage",
     " Avbryt redigering",
     " Peru muokkaus",
-    " Przerwac montaz",
-    " Anular modificaci�n ",
+    " Anuluj edycj�",
+    " Anular edici�n",
     " ������� ������������",
     " Avbryt redigering",
     " Opre�te montajul �nregistr�rii",
@@ -5398,8 +5419,8 @@ const tI18nPhrase Phrases[] = {
     "Changement de carte DVB primaire...",
     "Bytter f�rste DVB-enhet...",
     "Vaihdetaan ensisijaista DVB-sovitinta...",
-    "Pierwszy interfejs DVB przelacza...",
-    "Cambio al interface DVB primario...",
+    "Prz곱czam na pierwszy interfejs DVB...",
+    "Cambiando el interfaz DVB primario...",
     "� ����� DVB ����� �������...",
     "Byter prim�r DVB enhet...",
     "Comut dispozitiv DVB primar...",
@@ -5419,8 +5440,8 @@ const tI18nPhrase Phrases[] = {
     "Haut/Bas -> nouvelle place - OK -> d�placer",
     "Opp/Ned for ny plass - OK for � flytte",
     "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy",
-    "Gora/Dol na nowa pozycje - Ok zmienia",
-    "Arriba/Abajo para el nuevo lugar - OK para mover",
+    "Do g�ry/Na d� na now� pozycj� - Ok zatwierdza",
+    "Arriba/Abajo para mover - OK para confirmar",
     "����/���� ��� ��� ����. ���� ��",
     "Upp/Ner f�r nya platsen - d�refter OK f�r att flytta",
     "Sus/Jos pentru noua loca�ie - OK pentru a muta",
@@ -5440,8 +5461,8 @@ const tI18nPhrase Phrases[] = {
     "Op�ration de montage lanc�e",
     "Redigeringsprosess startet",
     "Muokkaus aloitettu",
-    "Uruchomiony proces montazu",
-    "Proceso modificaci�n iniciado",
+    "Proces edycji rozpocz�ty",
+    "Proceso de edici�n iniciado",
     "������ � �����������",
     "Redigeringen startar",
     "Montajul �nregistr�rii a �nceput",
@@ -5461,8 +5482,8 @@ const tI18nPhrase Phrases[] = {
     "Montage termin�",
     "Redigeringsprosess avsluttet",
     "Muokkaus valmis",
-    "Proces montazu zakonczony",
-    "Proceso de modificaci�n terminado",
+    "Proces edycji zako�czony",
+    "Proceso de edici�n terminado",
     "� ����������� ��������",
     "Redigering avslutad",
     "Montajul �nregistr�rii s-a terminat",
@@ -5470,7 +5491,7 @@ const tI18nPhrase Phrases[] = {
     "Proc�s d'edici� finalitzat",
     "������ �������",
     "Rezanje zavr�eno",
-    "Redigeerimine on l�petatud",
+    "Redigeerimine l�petatud",
     "Redigeringsproces afsluttet",
   },
   { "Editing process failed!",
@@ -5482,8 +5503,8 @@ const tI18nPhrase Phrases[] = {
     "Echec du montage!",
     "Feil under redigering!",
     "Muokkaus ep�onnistui!",
-    "Bledny proces montazu!",
-    "Modificaci�n ha fallado!",
+    "Proces edycji nie powi�d� si�!",
+    "�Proceso de edici�n fallido!",
     "� ����������� �������!",
     "Redigeringsprocessen misslyckades",
     "Montajul �nregistr�rii a e�uat",
@@ -5503,6 +5524,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Tallennus aloitettu",
+    "Rozpocz�to nagrywanie",
+    "Iniciando grabaci�n",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -5510,9 +5533,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Salvestamine algas",
     "",//TODO
   },
   { "Pausing live video...",
@@ -5524,8 +5545,8 @@ const tI18nPhrase Phrases[] = {
     "Pause de l'�mission en direct...",
     "",// TODO
     "Pys�ytet��n l�hetys...",
-    "Zatrzymany program biezacy...",
-    "Emisi�n en directo parada...",
+    "Pauzuj� program na �ywo...",
+    "Pausa de la emisi�n en directo...",
     "������ �������� �������",
     "Pausar direktinspelningen",
     "Trec �n pauz� emisiunea transmis�...",
@@ -5545,8 +5566,8 @@ const tI18nPhrase Phrases[] = {
     "Mise � jour du guide des programmes",
     "",// TODO
     "Ohjelmaoppaan p�ivitys aloitettu",
-    "",// TODO
-    "",// TODO
+    "Rozpoczynam skanowanie EPG",
+    "Iniciando la exploraci�n de EPG",
     "���� ������ EPG",
     "P�b�rjar EPG skanning",
     "Pornesc achizi�ia EPG",
@@ -5566,7 +5587,7 @@ const tI18nPhrase Phrases[] = {
     "Ce plugin n'a pas de param�tres!",
     "",// TODO
     "T�ll� laajennoksella ei ole asetuksia!",
-    "Ten plugin niema parametrow!",
+    "Ta wtyczka nie ma �adnych ustawie�!",
     "Este plugin no admite configuraci�n",
     "���� � �������� ��� ���� �����������!",
     "Den h�r modulen har inga parametrar",
@@ -5587,8 +5608,8 @@ const tI18nPhrase Phrases[] = {
     "VDR Classique",// TODO
     "",// TODO
     "Klassinen VDR",
-    "",// TODO
-    "",// TODO
+    "Klasyczny VDR",
+    "VDR cl�sico",
     "������� VDR",
     "Klassisk VDR",
     "VDR clasic",
@@ -5608,8 +5629,8 @@ const tI18nPhrase Phrases[] = {
     "Consoles ST:TNG",
     "",// TODO
     "ST:TNG konsoli",
-    "",// TODO
-    "",// TODO
+    "Panel ST:TNG",
+    "Paneles ST:TNG",
     "������ ST:TNG",
     "ST:TNG konsoll",
     "Cons. ST:TNG",
@@ -5629,8 +5650,8 @@ const tI18nPhrase Phrases[] = {
     "Sans titre",
     "",// TODO
     "Ei esityst�",
-    "",// TODO
-    "",// TODO
+    "Bez tytu�u",
+    "Sin t�tulo",
     "����� �����",
     "ingen titel",
     "F�r� titlu",
diff --git a/keys.c b/keys.c
index 4215d7be0..9fd5552f4 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.10 2006/01/05 15:39:26 kls Exp $
+ * $Id: keys.c 1.11 2006/01/16 17:01:25 kls Exp $
  */
 
 #include "keys.h"
@@ -250,9 +250,11 @@ cKeyMacros KeyMacros;
 
 const cKeyMacro *cKeyMacros::Get(eKeys Key)
 {
-  for (cKeyMacro *k = First(); k; k = Next(k)) {
-      if (*k->Macro() == Key)
-         return k;
-      }
+  if (Key != kNone) {
+     for (cKeyMacro *k = First(); k; k = Next(k)) {
+         if (*k->Macro() == Key)
+            return k;
+         }
+     }
   return NULL;
 }
diff --git a/menu.c b/menu.c
index dff190984..ec49b1cee 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.396 2006/01/15 15:02:36 kls Exp $
+ * $Id: menu.c 1.403 2006/01/22 16:06:39 kls Exp $
  */
 
 #include "menu.h"
@@ -36,6 +36,8 @@
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
 #define MAXWAITFORCAMMENU 4 // seconds to wait for the CAM menu to open
+#define MINFREEDISK       300 // minimum free disk space required to start recording
+#define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
@@ -2996,9 +2998,12 @@ static void SetTrackDescriptions(bool Live)
 
 #define DIRECTCHANNELTIMEOUT 1000 //ms
 
+cDisplayChannel *cDisplayChannel::currentDisplayChannel = NULL;
+
 cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 :cOsdObject(true)
 {
+  currentDisplayChannel = this;
   group = -1;
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
@@ -3017,12 +3022,15 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 cDisplayChannel::cDisplayChannel(eKeys FirstKey)
 :cOsdObject(true)
 {
+  currentDisplayChannel = this;
   group = -1;
   number = 0;
+  timeout = true;
   lastPresent = lastFollowing = NULL;
   lastTime.Set();
   withInfo = Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
+  channel = Channels.GetByNumber(cDevice::CurrentChannel());
   ProcessKey(FirstKey);
 }
 
@@ -3030,6 +3038,7 @@ cDisplayChannel::~cDisplayChannel()
 {
   delete displayChannel;
   cStatus::MsgOsdClear();
+  currentDisplayChannel = NULL;
 }
 
 void cDisplayChannel::DisplayChannel(void)
@@ -3063,14 +3072,27 @@ void cDisplayChannel::DisplayInfo(void)
 
 void cDisplayChannel::Refresh(void)
 {
-  channel = Channels.GetByNumber(cDevice::CurrentChannel());
   DisplayChannel();
   displayChannel->SetEvents(NULL, NULL);
-  lastTime.Set();
+}
+
+cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction)
+{
+  if (Direction) {
+     while (Channel) {
+           Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
+           if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0))
+              return Channel;
+           }
+     }
+  return NULL;
 }
 
 eOSState cDisplayChannel::ProcessKey(eKeys Key)
 {
+  cChannel *NewChannel = NULL;
+  if (Key != kNone)
+     lastTime.Set();
   switch (Key) {
     case k0:
          if (number == 0) {
@@ -3081,31 +3103,32 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case k1 ... k9:
          if (number >= 0) {
             number = number * 10 + Key - k0;
-            if (number > 0) {
-               channel = Channels.GetByNumber(number);
-               displayChannel->SetEvents(NULL, NULL);
-               withInfo = false;
-               DisplayChannel();
-               lastTime.Set();
-               // Lets see if there can be any useful further input:
-               int n = channel ? number * 10 : 0;
-               cChannel *ch = channel;
-               while (ch && (ch = Channels.Next(ch)) != NULL) {
-                     if (!ch->GroupSep()) {
-                        if (n <= ch->Number() && ch->Number() <= n + 9) {
-                           n = 0;
-                           break;
-                           }
-                        if (ch->Number() > n)
-                           n *= 10;
+            channel = Channels.GetByNumber(number);
+            displayChannel->SetEvents(NULL, NULL);
+            withInfo = false;
+            DisplayChannel();
+            // Lets see if there can be any useful further input:
+            int n = channel ? number * 10 : 0;
+            int m = 10;
+            cChannel *ch = channel;
+            while (ch && (ch = Channels.Next(ch)) != NULL) {
+                  if (!ch->GroupSep()) {
+                     if (n <= ch->Number() && ch->Number() < n + m) {
+                        n = 0;
+                        break;
+                        }
+                     if (ch->Number() > n) {
+                        n *= 10;
+                        m *= 10;
                         }
                      }
-               if (n > 0) {
-                  // This channel is the only one that fits the input, so let's take it right away:
-                  displayChannel->Flush(); // makes sure the user sees his last input
-                  Channels.SwitchTo(number);
-                  return osEnd;
                   }
+            if (n > 0) {
+               // This channel is the only one that fits the input, so let's take it right away:
+               displayChannel->Flush(); // makes sure the user sees his last input
+               NewChannel = channel;
+               withInfo = true;
+               number = 0;
                }
             }
          break;
@@ -3136,18 +3159,27 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                   group = -1;
                }
             }
-         lastTime.Set();
          break;
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
     case kDown:
-         cDevice::SwitchChannel(NORMALKEY(Key) == kUp ? 1 : -1);
-         // no break here
     case kChanUp|k_Repeat:
     case kChanUp:
     case kChanDn|k_Repeat:
-    case kChanDn:
+    case kChanDn: {
+         eKeys k = NORMALKEY(Key);
+         cChannel *ch = NextAvailableChannel(channel, (k == kUp || k == kChanUp) ? 1 : -1);
+         if (ch)
+            channel = ch;
+         }
+         // no break here
+    case kUp|k_Release:
+    case kDown|k_Release:
+    case kChanUp|k_Release:
+    case kChanDn|k_Release:
+         if (!(Key & k_Repeat) && channel)
+            NewChannel = channel;
          withInfo = true;
          group = -1;
          number = 0;
@@ -3155,43 +3187,57 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
          break;
     case kNone:
          if (number && lastTime.Elapsed() > DIRECTCHANNELTIMEOUT) {
-            if (Channels.GetByNumber(number))
-               Channels.SwitchTo(number);
-            else {
-               number = 0;
-               channel = NULL;
-               DisplayChannel();
-               lastTime.Set();
-               return osContinue;
-               }
-            return osEnd;
+            channel = Channels.GetByNumber(number);
+            if (channel)
+               NewChannel = channel;
+            withInfo = true;
+            number = 0;
+            Refresh();
+            lastTime.Set();
             }
          break;
     //TODO
     //XXX case kGreen:  return osEventNow;
     //XXX case kYellow: return osEventNext;
-    case kOk:     if (group >= 0) {
-                     channel = Channels.Get(Channels.GetNextNormal(group));
-                     if (channel)
-                        Channels.SwitchTo(channel->Number());
-                     withInfo = true;
-                     group = -1;
-                     Refresh();
-                     break;
-                     }
-                  else if (number > 0 && channel)
-                     Channels.SwitchTo(number);
-                  return osEnd;
-    default:      if ((Key & (k_Repeat | k_Release)) == 0) {
-                     cRemote::Put(Key);
-                     return osEnd;
-                     }
+    case kOk:
+         if (group >= 0) {
+            channel = Channels.Get(Channels.GetNextNormal(group));
+            if (channel)
+               NewChannel = channel;
+            withInfo = true;
+            group = -1;
+            Refresh();
+            }
+         else if (number > 0) {
+            channel = Channels.GetByNumber(number);
+            if (channel)
+               NewChannel = channel;
+            withInfo = true;
+            number = 0;
+            Refresh();
+            }
+         else
+            return osEnd;
+         break;
+    default:
+         if ((Key & (k_Repeat | k_Release)) == 0) {
+            cRemote::Put(Key);
+            return osEnd;
+            }
     };
   if (!timeout || lastTime.Elapsed() < (uint64)(Setup.ChannelInfoTime * 1000)) {
-     if (!number && group < 0 && channel && channel->Number() != cDevice::CurrentChannel())
-        Refresh(); // makes sure a channel switch through the SVDRP CHAN command is displayed
+     if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
+        // makes sure a channel switch through the SVDRP CHAN command is displayed
+        channel = Channels.GetByNumber(cDevice::CurrentChannel());
+        Refresh();
+        lastTime.Set();
+        }
      DisplayInfo();
      displayChannel->Flush();
+     if (NewChannel) {
+        Channels.SwitchTo(NewChannel->Number());
+        channel = NewChannel;
+        }
      return osContinue;
      }
   return osEnd;
@@ -3520,6 +3566,23 @@ int cRecordControls::state = 0;
 
 bool cRecordControls::Start(cTimer *Timer, bool Pause)
 {
+  static time_t LastNoDiskSpaceMessage = 0;
+  int FreeMB = 0;
+  if (Timer) {
+     AssertFreeDiskSpace(Timer->Priority(), !Timer->Pending());
+     Timer->SetPending(true);
+     }
+  VideoDiskSpace(&FreeMB);
+  if (FreeMB < MINFREEDISK) {
+     if (!Timer || time(NULL) - LastNoDiskSpaceMessage > NODISKSPACEDELTA) {
+        isyslog("not enough disk space to start recording%s%s", Timer ? " timer " : "", Timer ? *Timer->ToDescr() : "");
+        Skins.Message(mtWarning, tr("Not enough disk space to start recording!"));
+        LastNoDiskSpaceMessage = time(NULL);
+        }
+     return false;
+     }
+  LastNoDiskSpaceMessage = 0;
+
   ChangeState();
   int ch = Timer ? Timer->Channel()->Number() : cDevice::CurrentChannel();
   cChannel *channel = Channels.GetByNumber(ch);
@@ -3548,8 +3611,10 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
                }
            }
         }
-     else if (!Timer || (Timer->Priority() >= Setup.PrimaryLimit && !Timer->Pending()))
+     else if (!Timer || (Timer->Priority() >= Setup.PrimaryLimit && !Timer->Pending())) {
         isyslog("no free DVB device to record channel %d!", ch);
+        Skins.Message(mtError, tr("No free DVB device to record!"));
+        }
      }
   else
      esyslog("ERROR: channel %d not defined!", ch);
diff --git a/menu.h b/menu.h
index f88a597da..55d179c73 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.81 2006/01/06 11:30:38 kls Exp $
+ * $Id: menu.h 1.82 2006/01/22 14:24:31 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -82,14 +82,17 @@ class cDisplayChannel : public cOsdObject {
   cChannel *channel;
   const cEvent *lastPresent;
   const cEvent *lastFollowing;
+  static cDisplayChannel *currentDisplayChannel;
   void DisplayChannel(void);
   void DisplayInfo(void);
   void Refresh(void);
+  cChannel *NextAvailableChannel(cChannel *Channel, int Direction);
 public:
   cDisplayChannel(int Number, bool Switched);
   cDisplayChannel(eKeys FirstKey);
   virtual ~cDisplayChannel();
   virtual eOSState ProcessKey(eKeys Key);
+  static bool IsOpen(void) { return currentDisplayChannel != NULL; }
   };
 
 class cDisplayVolume : public cOsdObject {
diff --git a/menuitems.c b/menuitems.c
index 88e8a50d2..455070d1b 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.29 2006/01/07 15:37:03 kls Exp $
+ * $Id: menuitems.c 1.30 2006/01/21 12:27:14 kls Exp $
  */
 
 #include "menuitems.h"
@@ -15,6 +15,8 @@
 #include "skins.h"
 #include "status.h"
 
+#define AUTO_ADVANCE_TIMEOUT  1500 // ms before auto advance when entering characters via numeric keys
+
 const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@";
 
 // --- cMenuEditItem ---------------------------------------------------------
@@ -262,6 +264,23 @@ void cMenuEditStrItem::SetHelpKeys(void)
      cSkinDisplay::Current()->SetButtons(NULL);
 }
 
+void cMenuEditStrItem::AdvancePos(void)
+{
+  if (pos < length - 2 && pos < int(strlen(value)) ) {
+     if (++pos >= int(strlen(value))) {
+        if (pos >= 2 && value[pos - 1] == ' ' && value[pos - 2] == ' ')
+           pos--; // allow only two blanks at the end
+        else {
+           value[pos] = ' ';
+           value[pos + 1] = 0;
+           }
+        }
+     }
+  newchar = true;
+  if (!insert && isalpha(value[pos]))
+     uppercase = isupper(value[pos]);
+}
+
 void cMenuEditStrItem::Set(void)
 {
   char buf[1000];
@@ -326,6 +345,13 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
   bool SameKey = Key == lastKey;
   if (Key != kNone)
      lastKey = Key;
+  else if (!newchar && autoAdvanceTimeout.TimedOut()) {
+     AdvancePos();
+     newchar = true;
+     currentChar = NULL;
+     Set();
+     return osContinue;
+     }
   switch (Key) {
     case kRed:   // Switch between upper- and lowercase characters
                  if (InEditMode()) {
@@ -382,19 +408,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     uppercase = isupper(value[pos]);
                  break;
     case kRight|k_Repeat:
-    case kRight: if (pos < length - 2 && pos < int(strlen(value)) ) {
-                    if (++pos >= int(strlen(value))) {
-                       if (pos >= 2 && value[pos - 1] == ' ' && value[pos - 2] == ' ')
-                          pos--; // allow only two blanks at the end
-                       else {
-                          value[pos] = ' ';
-                          value[pos + 1] = 0;
-                          }
-                       }
-                    }
-                 newchar = true;
-                 if (!insert && isalpha(value[pos]))
-                    uppercase = isupper(value[pos]);
+    case kRight: AdvancePos();
                  if (pos == 0)
                     SetHelpKeys();
                  break;
@@ -413,15 +427,19 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        value[pos] = toupper(Inc(tolower(value[pos]), NORMALKEY(Key) == kUp));
                     else
                        value[pos] =         Inc(        value[pos],  NORMALKEY(Key) == kUp);
-                    newchar = false;
+                    newchar = true;
                     }
                  else
                     return cMenuEditItem::ProcessKey(Key);
                  break;
+    case k0|k_Repeat ... k9|k_Repeat:
     case k0 ... k9: {
-                 if (!SameKey)
-                    currentChar = NULL;
                  if (InEditMode()) {
+                    if (!SameKey) {
+                       if (!newchar)
+                          AdvancePos();
+                       currentChar = NULL;
+                       }
                     if (insert && newchar) {
                        // create a new character in insert mode
                        if (int(strlen(value)) < length - 1) {
@@ -445,6 +463,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        currentChar++;
                        }
                     newchar = false;
+                    autoAdvanceTimeout.Set(AUTO_ADVANCE_TIMEOUT);
                     }
                  else
                     return cMenuEditItem::ProcessKey(Key);
diff --git a/menuitems.h b/menuitems.h
index bfaf43626..ec8e08f19 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.15 2006/01/06 15:16:25 kls Exp $
+ * $Id: menuitems.h 1.16 2006/01/21 10:45:55 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -85,7 +85,9 @@ class cMenuEditStrItem : public cMenuEditItem {
   const char *charMap;
   const char *currentChar;
   eKeys lastKey;
+  cTimeMs autoAdvanceTimeout;
   void SetHelpKeys(void);
+  void AdvancePos(void);
   virtual void Set(void);
   char Inc(char c, bool Up);
 protected:
diff --git a/recording.c b/recording.c
index 0f704afc7..5c57e1872 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.132 2006/01/08 11:40:13 kls Exp $
+ * $Id: recording.c 1.133 2006/01/20 17:18:59 kls Exp $
  */
 
 #include "recording.h"
@@ -117,7 +117,7 @@ void RemoveDeletedRecordings(void)
      }
 }
 
-void AssertFreeDiskSpace(int Priority)
+void AssertFreeDiskSpace(int Priority, bool Force)
 {
   static cMutex Mutex;
   cMutexLock MutexLock(&Mutex);
@@ -126,7 +126,7 @@ void AssertFreeDiskSpace(int Priority)
   // it will get removed during the next call.
   static time_t LastFreeDiskCheck = 0;
   int Factor = (Priority == -1) ? 10 : 1;
-  if (time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA / Factor) {
+  if (Force || time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA / Factor) {
      if (!VideoFileSpaceAvailable(MINDISKSPACE)) {
         // Make sure only one instance of VDR does this:
         cLockFile LockFile(VideoDirectory);
diff --git a/recording.h b/recording.h
index d79b6b4dd..7eaddcc36 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.48 2005/12/18 11:26:51 kls Exp $
+ * $Id: recording.h 1.49 2006/01/20 17:18:28 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -21,9 +21,11 @@
 extern bool VfatFileSystem;
 
 void RemoveDeletedRecordings(void);
-void AssertFreeDiskSpace(int Priority = 0);
+void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
      ///< The special Priority value -1 means that we shall get rid of any
      ///< deleted recordings faster than normal (because we're cutting).
+     ///< If Force is true, the check will be done even if the timeout
+     ///< hasn't expired yet.
 
 class cResumeFile {
 private:
diff --git a/tools.c b/tools.c
index 33b2ec62a..031c120ab 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.110 2006/01/15 14:31:45 kls Exp $
+ * $Id: tools.c 1.112 2006/01/20 14:01:28 kls Exp $
  */
 
 #include "tools.h"
@@ -26,9 +26,22 @@ extern "C" {
 #include <unistd.h>
 #include <utime.h>
 #include "i18n.h"
+#include "thread.h"
 
 int SysLogLevel = 3;
 
+#define MAXSYSLOGBUF 256
+
+void syslog_with_tid(int priority, const char *format, ...)
+{
+  va_list ap;
+  char fmt[MAXSYSLOGBUF];
+  snprintf(fmt, sizeof(fmt), "[%d] %s", cThread::ThreadId(), format);
+  va_start(ap, format);
+  vsyslog(priority, fmt, ap);
+  va_end(ap); 
+}
+
 int BCD2INT(int x)
 {
   return ((1000000 * BCDCHARTOINT((x >> 24) & 0xFF)) +
@@ -125,13 +138,14 @@ char *strn0cpy(char *dest, const char *src, size_t n)
 
 char *strreplace(char *s, char c1, char c2)
 {
-  char *p = s;
-
-  while (p && *p) {
-        if (*p == c1)
-           *p = c2;
-        p++;
-        }
+  if (s) {
+     char *p = s;
+     while (*p) {
+           if (*p == c1)
+              *p = c2;
+           p++;
+           }
+     }
   return s;
 }
 
diff --git a/tools.h b/tools.h
index 23afea567..7e57744be 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.89 2006/01/08 11:40:37 kls Exp $
+ * $Id: tools.h 1.90 2006/01/15 16:19:56 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -26,9 +26,9 @@ typedef unsigned long long int uint64;
 
 extern int SysLogLevel;
 
-#define esyslog(a...) void( (SysLogLevel > 0) ? syslog(LOG_ERR,   a) : void() )
-#define isyslog(a...) void( (SysLogLevel > 1) ? syslog(LOG_INFO,  a) : void() )
-#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog(LOG_DEBUG, a) : void() )
+#define esyslog(a...) void( (SysLogLevel > 0) ? syslog_with_tid(LOG_ERR,   a) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? syslog_with_tid(LOG_INFO,  a) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_DEBUG, a) : void() )
 
 #define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
 #define LOG_ERROR_STR(s)  esyslog("ERROR: %s: %m", s)
@@ -52,6 +52,8 @@ template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #endif
 
+void syslog_with_tid(int priority, const char *format, ...);
+
 #define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
 int BCD2INT(int x);
 
diff --git a/transfer.c b/transfer.c
index f34dea7d6..8a0db4d69 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.30 2005/08/14 10:55:03 kls Exp $
+ * $Id: transfer.c 1.31 2006/01/21 14:13:16 kls Exp $
  */
 
 #include "transfer.h"
@@ -63,6 +63,7 @@ void cTransfer::Action(void)
   int Result = 0;
 #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
   bool GotBufferReserve = false;
+  GotBufferReserve = true; //XXX remove this line if you absolutely need the buffer reserve
   int RequiredBufferReserve = KILOBYTE(DvbCardWith4MBofSDRAM ? 288 : 576);
 #endif
   while (Running()) {
diff --git a/vdr.c b/vdr.c
index bd4f95045..16585903f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.238 2006/01/15 13:31:57 kls Exp $
+ * $Id: vdr.c 1.244 2006/01/22 15:59:13 kls Exp $
  */
 
 #include <getopt.h>
@@ -447,7 +447,7 @@ int main(int argc, char *argv[])
   // Log file:
 
   if (SysLogLevel > 0)
-     openlog("vdr", LOG_PID | LOG_CONS, SysLogTarget);
+     openlog("vdr", LOG_CONS, SysLogTarget); // LOG_PID doesn't work as expected under NPTL
 
   // Check the video directory:
 
@@ -727,7 +727,7 @@ int main(int argc, char *argv[])
            LastChannel = cDevice::CurrentChannel();
            LastChannelChanged = time(NULL);
            }
-        if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
+        if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
@@ -822,6 +822,7 @@ int main(int argc, char *argv[])
                   }
                }
                break;
+          // Direct main menu functions:
           #define DirectMainFunction(function)\
             DELETE_MENU;\
             if (cControl::Control())\
@@ -855,7 +856,15 @@ int main(int argc, char *argv[])
           case kChanUp:
           case kChanDn|k_Repeat:
           case kChanDn:
-               cDevice::SwitchChannel(NORMALKEY(key) == kChanUp ? 1 : -1);
+               if (!Interact)
+                  Menu = new cDisplayChannel(NORMALKEY(key));
+               else if (cDisplayChannel::IsOpen()) {
+                  Interact->ProcessKey(key);
+                  continue;
+                  }
+               else
+                  cDevice::SwitchChannel(NORMALKEY(key) == kChanUp ? 1 : -1);
+               key = kNone; // nobody else needs to see these keys
                break;
           // Volume control:
           case kVolUp|k_Repeat:
@@ -901,9 +910,7 @@ int main(int argc, char *argv[])
           case kRecord:
                if (!cControl::Control()) {
                   if (cRecordControls::Start())
-                     ;//XXX Skins.Message(mtInfo, tr("Recording"));
-                  else
-                     Skins.Message(mtError, tr("No free DVB device to record!"));
+                     Skins.Message(mtInfo, tr("Recording started"));
                   key = kNone; // nobody else needs to see this key
                   }
                break;
@@ -947,8 +954,6 @@ int main(int argc, char *argv[])
              case osRecord: DELETE_MENU;
                             if (cRecordControls::Start())
                                Skins.Message(mtInfo, tr("Recording started"));
-                            else
-                               Skins.Message(mtError, tr("No free DVB device to record!"));
                             break;
              case osRecordings:
                             DELETE_MENU;
@@ -985,7 +990,7 @@ int main(int argc, char *argv[])
            }
         else {
            // Key functions in "normal" viewing mode:
-           if (KeyMacros.Get(key)) {
+           if (key != kNone && KeyMacros.Get(key)) {
               cRemote::PutMacro(key);
               key = kNone;
               }
@@ -999,21 +1004,17 @@ int main(int argc, char *argv[])
                   }
              // Direct Channel Select:
              case k1 ... k9:
-                  Menu = new cDisplayChannel(key);
-                  break;
              // Left/Right rotates trough channel groups:
              case kLeft|k_Repeat:
              case kLeft:
              case kRight|k_Repeat:
              case kRight:
-                  Menu = new cDisplayChannel(NORMALKEY(key));
-                  break;
              // Up/Down Channel Select:
              case kUp|k_Repeat:
              case kUp:
              case kDown|k_Repeat:
              case kDown:
-                  cDevice::SwitchChannel(NORMALKEY(key) == kUp ? 1 : -1);
+                  Menu = new cDisplayChannel(NORMALKEY(key));
                   break;
              // Viewing Control:
              case kOk:   LastChannel = -1; break; // forces channel display

From c37734080c45ef7ba60d589df0d88fb9a6064c1b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 29 Jan 2006 18:00:00 +0100
Subject: [PATCH 133/307] =?UTF-8?q?Version=201.3.41=20-=20EPG=20events=20f?=
 =?UTF-8?q?rom=20epg.data=20or=20SVDRP's=20PUTE=20command=20now=20have=20t?=
 =?UTF-8?q?heir=20Title=20set=20to=20=20=20"No=20Title"=20if=20none=20was?=
 =?UTF-8?q?=20set.=20-=20Fixed=20checking=20toFile=20in=20cCuttingThread::?=
 =?UTF-8?q?Action()=20(found=20in=20a=20larger=20patch=20from=20=20=20Artu?=
 =?UTF-8?q?r=20Skawina).=20-=20Fixed=20a=20crash=20when=20pressing=20'0'?=
 =?UTF-8?q?=20in=20the=20"Schedule"=20menu=20on=20a=20channel=20that=20doe?=
 =?UTF-8?q?sn't=20=20=20have=20any=20EPG=20data=20(reported=20ny=20Alexand?=
 =?UTF-8?q?er=20Hans).=20-=20Updated=20the=20Danish=20OSD=20texts=20(thank?=
 =?UTF-8?q?s=20to=20Mogens=20Elneff).=20-=20Fixed=20a=20missing=20','=20in?=
 =?UTF-8?q?=20the=20Greek=20OSD=20texts=20(thanks=20to=20Arthur=20Konovalo?=
 =?UTF-8?q?v).=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Arthur=20Konovalov).=20-=20Fixed=20handling=20the=20tfRecord?=
 =?UTF-8?q?ing=20flag=20when=20reading=20timers=20(bug=20reported=20by=20A?=
 =?UTF-8?q?ndreas=20=20=20Mair).=20-=20Now=20checking=20whether=20the=20ch?=
 =?UTF-8?q?annel=20exists=20before=20setting=20the=20PMT=20filter=20in=20?=
 =?UTF-8?q?=20=20cPatFilter::Process()=20(thanks=20to=20Thomas=20Bergwinkl?=
 =?UTF-8?q?).=20-=20Now=20trying=20to=20reestablish=20the=20connection=20t?=
 =?UTF-8?q?o=20the=20LIRC=20daemon=20in=20case=20it=20breaks=20=20=20(than?=
 =?UTF-8?q?ks=20to=20Ville=20Skytt=C3=A4).=20-=20Updated=20the=20Finnish?=
 =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Fixed?=
 =?UTF-8?q?=20channel=20switching=20with=20the=20Down=20(Up)=20key=20in=20?=
 =?UTF-8?q?case=20the=20current=20channel=20is=20=20=20already=20the=20fir?=
 =?UTF-8?q?st=20(last)=20in=20the=20list=20(reported=20by=20Frank=20Kr?=
 =?UTF-8?q?=C3=B6mmelbein).=20-=20Removed=20the=20"buffer=20reserve"=20in?=
 =?UTF-8?q?=20Transfer=20Mode=20-=20it's=20no=20longer=20necessary=20with?=
 =?UTF-8?q?=20=20=20recent=20driver/firmware=20versions.=20-=20The=20epg.d?=
 =?UTF-8?q?ata=20file=20is=20now=20written=20when=20VDR=20exits=20(suggest?=
 =?UTF-8?q?ed=20by=20Daniel=20Karsubka).=20-=20Fixed=20cTimers::GetNextAct?=
 =?UTF-8?q?iveTimer()=20so=20that=20it=20won't=20return=20an=20expired=20t?=
 =?UTF-8?q?imer=20=20=20(reported=20by=20Rolf=20Ahrenberg).=20-=20Changed?=
 =?UTF-8?q?=20DVBS=5FTUNE=5FTIMEOUT=20and=20DVBC=5FTUNE=5FTIMEOUT=20to=209?=
 =?UTF-8?q?000ms=20to=20avoid=20problems=20with=20=20=20channels=20that=20?=
 =?UTF-8?q?have=20low=20symbol=20rates=20(reported=20by=20Suur=20Karu).=20?=
 =?UTF-8?q?-=20Fixed=20displaying=20the=20current=20audio=20track=20in=20t?=
 =?UTF-8?q?he=20channel=20display.=20-=20When=20reading=20epg.data=20(or?=
 =?UTF-8?q?=20data=20from=20PUTE),=20the=20version=20number=20of=20events?=
 =?UTF-8?q?=20with=20=20=20table=20IDs=20smaller=20than=200x50=20is=20now?=
 =?UTF-8?q?=20ignored=20because=20otherwise=20the=20current=20=20=20runnin?=
 =?UTF-8?q?g=20status=20would=20not=20be=20set=20after=20a=20restart=20of?=
 =?UTF-8?q?=20VDR.=20-=20Implemented=20a=20timeout=20for=20remote=20contro?=
 =?UTF-8?q?ls=20that=20don't=20deliver=20"repeat"=20keypresses=20=20=20ver?=
 =?UTF-8?q?y=20fast=20(based=20on=20a=20suggestion=20by=20Luca=20Olivetti;?=
 =?UTF-8?q?=20problem=20with=20the=20new=20handling=20=20=20of=20k=5FRepea?=
 =?UTF-8?q?t=20keypresses=20in=20channel=20switching=20reported=20by=20Udo?=
 =?UTF-8?q?=20Richter).=20-=20When=20looking=20for=20the=20present=20or=20?=
 =?UTF-8?q?following=20EPG=20event,=20the=20running=20status=20is=20now=20?=
 =?UTF-8?q?=20=20always=20taken=20into=20account.=20-=20Now=20initializing?=
 =?UTF-8?q?=20the=20channels'=20schedule=20pointers=20when=20reading=20the?=
 =?UTF-8?q?=20epg.data=20file,=20=20=20so=20that=20the=20first=20WhatsOn?=
 =?UTF-8?q?=20menu=20will=20come=20up=20faster.=20-=20If=20a=20shutdown=20?=
 =?UTF-8?q?is=20requested,=20but=20the=20shutdown=20script=20doesn't=20act?=
 =?UTF-8?q?ually=20halt=20the=20=20=20system,=20it=20is=20now=20tried=20ag?=
 =?UTF-8?q?ain=20after=205=20minutes=20(suggested=20by=20Helmut=20Auer).?=
 =?UTF-8?q?=20-=20Separated=20the=20'install'=20target=20into=20several=20?=
 =?UTF-8?q?individual=20targets;=20renamed=20the=20=20=20'plugins-install'?=
 =?UTF-8?q?=20target=20to=20'install-plugins'=20(thanks=20to=20Helmut=20Au?=
 =?UTF-8?q?er).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  | 27 +++++++++++++++++++++++++++
 HISTORY       | 43 +++++++++++++++++++++++++++++++++++++++++++
 Makefile      | 28 +++++++++++++++++++++-------
 channels.conf |  8 ++++----
 config.h      |  6 +++---
 cutter.c      |  6 +++---
 dvbdevice.c   |  6 +++---
 dvbosd.c      |  9 +--------
 epg.c         | 31 +++++++++++++++++++------------
 epg.h         |  6 +++---
 i18n.c        | 32 ++++++++++++++++----------------
 interface.c   |  2 +-
 lirc.c        | 41 +++++++++++++++++++++++++++--------------
 lirc.h        |  5 ++++-
 menu.c        | 28 +++++++++++++++++-----------
 pat.c         |  4 ++--
 remote.c      | 10 +++++++---
 remote.h      |  3 ++-
 thread.c      |  8 ++++----
 timers.c      |  5 +++--
 transfer.c    | 37 +------------------------------------
 vdr.5         |  4 ++--
 vdr.c         |  6 ++++--
 23 files changed, 217 insertions(+), 138 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5b460ca9d..b6234d2e5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -269,6 +269,7 @@ Matjaz Thaler <matjaz.thaler@guest.arnes.si>
 Artur Skawina <skawina@geocities.com>
  for improving the font file generation in the Makefile
  for pointing out a problem with the ERR macro defined by ncurses.h
+ for a patch that contained a fix for checking toFile in cCuttingThread::Action()
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
@@ -545,6 +546,8 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to increase the default value for 'Min. user inactivity' to 300 minutes
  for suggesting to add cChannel::LinkChannels() and cChannel::RefChannel()
  for suggesting to give a message when an instant recording is started
+ fpr suggesting to retry a shutdown after a while
+ for separating the 'install' target into several individual targets
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -882,6 +885,7 @@ Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
  is started through a user defined key macro
  for reporting a problem with extremely long summary fields in timers
+ for reporting a bug in handling the tfRecording flag when reading timers
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -939,6 +943,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a crash in the Schedule menu with events that have no title
  for a patch that was used to implement automatic cursor advance when entering text
  via the numeric keys
+ for reporting a problem with expired timers when shutting down via the Power key
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1165,6 +1170,8 @@ Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing detecting if there can be any useful further input when entering channel
  numbers
  for fixing handling the '0' key for switching between the last two channels
+ for making cPatFilter::Process() check whether the channel exists before setting
+ the PMT filter
 
 St�phane Est�-Gracias <sestegra@free.fr>
  for fixing a typo in libsi/si.h
@@ -1322,6 +1329,7 @@ Kimmo Tykkala <tykkala@iki.fi>
 
 Arthur Konovalov <kasjas@hot.ee>
  for translating OSD texts to the Estonian language
+ for fixing a missing ',' in the Greek OSD texts
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -1341,6 +1349,8 @@ Udo Richter <udo_richter@gmx.de>
  no longer exists
  for reporting a missing check against MAXOSDAREAS in cOsd::CanHandleAreas()
  for making the Makefile report a summary of failed plugins
+ for reporting a problem with the new handling of k_Repeat keypresses in channel
+ switching
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1457,6 +1467,8 @@ Luca Olivetti <luca@ventoso.org>
  for making cDevice::AttachPlayer() keep the track language codes and descriptions
  in Transfer Mode
  for suggesting to make the "Menu" key behave consistently
+ for suggesting to implement a timeout for remote controls that don't deliver
+ "repeat" keypresses very fast
 
 Mikko Salo <mikko.salo@ppe.inet.fi>
  for suggesting to make the setup option "DVB/Video display format" available only
@@ -1480,6 +1492,8 @@ Ville Skytt
  for adding a missing #include <linux/unistd.h> to thread.c
  for adding missing i18n entry for the "Timer" button
  for removing the obsolete "ca.conf" section from vdr.1
+ for making the cLircRemote try to reestablish the connection to the LIRC daemon
+ in case it breaks
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1531,6 +1545,8 @@ Matthias Lenk <matthias.lenk@amd.com>
 
 Frank Kr�mmelbein <kroemmelbein@gmx.de>
  for adding missing storing of the MenuScrollPage parameter
+ for reporting a problem with channel switching with the Down (Up) key in case the
+ current channel is already the first (last) in the list
 
 Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
  for reporting a problem in cEITScanner::Process() with forced EPG scans if EPG
@@ -1683,3 +1699,14 @@ Markus Hahn <mhahn@reel-multimedia.com>
 
 Jaroslaw Swierczynski <swiergot@gmail.com>
  for updating the Polish OSD texts and the fontosd-iso8859-2.c file
+
+Alexander Hans <cleditor@arcor.de>
+ fpr reporting a crash when pressing '0' in the "Schedule" menu on a channel that
+ doesn't have any EPG data 
+
+Daniel Karsubka <dkar@gmx.de>
+ for suggesting to write the epg.data file when VDR exits
+
+Suur Karu <suurkaru@fastmail.fm>
+ for reporting a problem with the tuning timeout for channels that have low symbol
+ rates
diff --git a/HISTORY b/HISTORY
index 18e56369c..62ab4db64 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4227,3 +4227,46 @@ Video Disk Recorder Revision History
 - Updated the Spanish OSD texts (thanks to Jesus Bravo Alvarez).
 - Fixed handling the '0' key for switching between the last two channels (thanks
   to Thomas Bergwinkl).
+
+2006-01-29: Version 1.3.41
+
+- EPG events from epg.data or SVDRP's PUTE command now have their Title set to
+  "No Title" if none was set.
+- Fixed checking toFile in cCuttingThread::Action() (found in a larger patch from
+  Artur Skawina).
+- Fixed a crash when pressing '0' in the "Schedule" menu on a channel that doesn't
+  have any EPG data (reported ny Alexander Hans).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Fixed a missing ',' in the Greek OSD texts (thanks to Arthur Konovalov).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed handling the tfRecording flag when reading timers (bug reported by Andreas
+  Mair).
+- Now checking whether the channel exists before setting the PMT filter in
+  cPatFilter::Process() (thanks to Thomas Bergwinkl).
+- Now trying to reestablish the connection to the LIRC daemon in case it breaks
+  (thanks to Ville Skytt�).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed channel switching with the Down (Up) key in case the current channel is
+  already the first (last) in the list (reported by Frank Kr�mmelbein).
+- Removed the "buffer reserve" in Transfer Mode - it's no longer necessary with
+  recent driver/firmware versions.
+- The epg.data file is now written when VDR exits (suggested by Daniel Karsubka).
+- Fixed cTimers::GetNextActiveTimer() so that it won't return an expired timer
+  (reported by Rolf Ahrenberg).
+- Changed DVBS_TUNE_TIMEOUT and DVBC_TUNE_TIMEOUT to 9000ms to avoid problems with
+  channels that have low symbol rates (reported by Suur Karu).
+- Fixed displaying the current audio track in the channel display.
+- When reading epg.data (or data from PUTE), the version number of events with
+  table IDs smaller than 0x50 is now ignored because otherwise the current
+  running status would not be set after a restart of VDR.
+- Implemented a timeout for remote controls that don't deliver "repeat" keypresses
+  very fast (based on a suggestion by Luca Olivetti; problem with the new handling
+  of k_Repeat keypresses in channel switching reported by Udo Richter).
+- When looking for the present or following EPG event, the running status is now
+  always taken into account.
+- Now initializing the channels' schedule pointers when reading the epg.data file,
+  so that the first WhatsOn menu will come up faster.
+- If a shutdown is requested, but the shutdown script doesn't actually halt the
+  system, it is now tried again after 5 minutes (suggested by Helmut Auer).
+- Separated the 'install' target into several individual targets; renamed the
+  'plugins-install' target to 'install-plugins' (thanks to Helmut Auer).
diff --git a/Makefile b/Makefile
index f1b61e780..a6427518e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.83 2006/01/13 16:04:56 kls Exp $
+# $Id: Makefile 1.84 2006/01/29 14:50:34 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -199,19 +199,33 @@ plugins-clean:
 
 # Install the files:
 
-install:
+install: install-bin install-conf install-doc install-plugins
+
+# VDR binary:
+
+install-bin: vdr
 	@mkdir -p $(BINDIR)
 	@cp vdr runvdr $(BINDIR)
+
+# Configuration files:
+
+install-conf:
+	@if [ ! -d $(VIDEODIR) ]; then\
+	    mkdir -p $(VIDEODIR);\
+	    cp *.conf $(VIDEODIR);\
+	    fi
+
+# Documentation:
+
+install-doc:
 	@mkdir -p $(MANDIR)/man1
 	@mkdir -p $(MANDIR)/man5
 	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
 	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
-	@if [ ! -d $(VIDEODIR) ]; then\
-            mkdir -p $(VIDEODIR);\
-            cp *.conf $(VIDEODIR);\
-            fi
 
-plugins-install:
+# Plugins:
+
+install-plugins: plugins
 	@mkdir -p $(PLUGINLIBDIR)
 	@cp $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION) $(PLUGINLIBDIR)
 
diff --git a/channels.conf b/channels.conf
index e15663d73..f1fdbc9dc 100644
--- a/channels.conf
+++ b/channels.conf
@@ -45,14 +45,14 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1801,1722,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1801,1722,1702:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1702,1722:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
diff --git a/config.h b/config.h
index 03e445160..9920d00b2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.241 2006/01/15 16:01:48 kls Exp $
+ * $Id: config.h 1.242 2006/01/27 13:27:41 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.40"
-#define VDRVERSNUM   10340  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.41"
+#define VDRVERSNUM   10341  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index f656bbddf..6d3a152da 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.11 2005/10/31 12:26:44 kls Exp $
+ * $Id: cutter.c 1.12 2006/01/27 13:45:00 kls Exp $
  */
 
 #include "cutter.h"
@@ -118,7 +118,7 @@ void cCuttingThread::Action(void)
                  break;
               if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
                  toFile = toFileName->NextFile();
-                 if (toFile < 0) {
+                 if (!toFile) {
                     error = "toFile 1";
                     break;
                     }
@@ -158,7 +158,7 @@ void cCuttingThread::Action(void)
                  cutIn = true;
                  if (Setup.SplitEditedFiles) {
                     toFile = toFileName->NextFile();
-                    if (toFile < 0) {
+                    if (!toFile) {
                        error = "toFile 2";
                        break;
                        }
diff --git a/dvbdevice.c b/dvbdevice.c
index fe32298a4..ee8c6235c 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.150 2006/01/14 15:57:36 kls Exp $
+ * $Id: dvbdevice.c 1.151 2006/01/28 15:37:01 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -40,9 +40,9 @@
 #define DEV_DVB_AUDIO     "audio"
 #define DEV_DVB_CA        "ca"
 
-#define DVBS_TUNE_TIMEOUT  2000 //ms
+#define DVBS_TUNE_TIMEOUT  9000 //ms
 #define DVBS_LOCK_TIMEOUT  2000 //ms
-#define DVBC_TUNE_TIMEOUT  5000 //ms
+#define DVBC_TUNE_TIMEOUT  9000 //ms
 #define DVBC_LOCK_TIMEOUT  2000 //ms
 #define DVBT_TUNE_TIMEOUT  9000 //ms
 #define DVBT_LOCK_TIMEOUT  2000 //ms
diff --git a/dvbosd.c b/dvbosd.c
index 76afecbfd..469ef1fbe 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.29 2005/12/30 15:41:54 kls Exp $
+ * $Id: dvbosd.c 1.30 2006/01/28 14:24:04 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -48,13 +48,6 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
      cap.cmd = OSD_CAP_MEMSIZE;
      if (ioctl(osdDev, OSD_GET_CAPABILITY, &cap) == 0)
         osdMem = cap.val;
-     #define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-     #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-     //XXX This is a very ugly hack to allow cDvbOsd to reduce the buffer
-     //XXX requirements in cTransfer if it detects a 4MB full featured DVB card.
-     extern bool DvbCardWith4MBofSDRAM;
-     DvbCardWith4MBofSDRAM = osdMem >= 1000000;
-     #endif
 #endif
      // must clear all windows here to avoid flashing effects - doesn't work if done
      // in Flush() only for the windows that are actually used...
diff --git a/epg.c b/epg.c
index 384f86b3a..d69158e29 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.51 2006/01/20 14:09:48 kls Exp $
+ * $Id: epg.c 1.57 2006/01/29 14:17:33 kls Exp $
  */
 
 #include "epg.h"
@@ -16,6 +16,8 @@
 #include <ctype.h>
 #include <time.h>
 
+#define RUNNINGSTATUSTIMEOUT 30 // seconds before the running status is considered unknown
+
 // --- tComponent ------------------------------------------------------------
 
 cString tComponent::ToString(void)
@@ -204,7 +206,7 @@ bool cEvent::HasTimer(void) const
 
 bool cEvent::IsRunning(bool OrAboutToStart) const
 {
-  return runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
+  return SeenWithin(RUNNINGSTATUSTIMEOUT) && runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
 }
 
 cString cEvent::GetDateString(void) const
@@ -309,7 +311,8 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                                 Event = newEvent = new cEvent(EventID);
                              if (Event) {
                                 Event->SetTableID(TableID);
-                                Event->SetVersion(Version);
+                                if (TableID >= 0x50) // makes sure the running status flag is set from the actual data stream
+                                   Event->SetVersion(Version);
                                 Event->SetStartTime(StartTime);
                                 Event->SetDuration(Duration);
                                 if (newEvent)
@@ -318,7 +321,9 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                              }
                           }
                        break;
-             case 'e': Event = NULL;
+             case 'e': if (!Event->Title())
+                          Event->SetTitle(tr("No title"));
+                       Event = NULL;
                        break;
              case 'c': // to keep things simple we react on 'c' here
                        return true;
@@ -655,25 +660,22 @@ void cSchedule::UnhashEvent(cEvent *Event)
      eventsHashStartTime.Del(Event, Event->StartTime());
 }
 
-const cEvent *cSchedule::GetPresentEvent(bool CheckRunningStatus) const
+const cEvent *cSchedule::GetPresentEvent(void) const
 {
   const cEvent *pe = NULL;
   time_t now = time(NULL);
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
-      if (p->StartTime() <= now && now < p->EndTime()) {
+      if (p->StartTime() <= now && now < p->EndTime())
          pe = p;
-         if (!CheckRunningStatus)
-            break;
-         }
-      if (CheckRunningStatus && p->SeenWithin(30) && p->RunningStatus() >= SI::RunningStatusPausing)
+      if (p->SeenWithin(RUNNINGSTATUSTIMEOUT) && p->RunningStatus() >= SI::RunningStatusPausing)
          return p;
       }
   return pe;
 }
 
-const cEvent *cSchedule::GetFollowingEvent(bool CheckRunningStatus) const
+const cEvent *cSchedule::GetFollowingEvent(void) const
 {
-  const cEvent *p = GetPresentEvent(CheckRunningStatus);
+  const cEvent *p = GetPresentEvent();
   if (p)
      p = events.Next(p);
   return p;
@@ -975,6 +977,11 @@ bool cSchedules::Read(FILE *f)
      bool result = cSchedule::Read(f, s);
      if (OwnFile)
         fclose(f);
+     if (result) {
+        // Initialize the channels' schedule pointers, so that the first WhatsOn menu will come up faster:
+        for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel))
+            s->GetSchedule(Channel);
+        }
      return result;
      }
   return false;
diff --git a/epg.h b/epg.h
index 443b56009..ad245243d 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.29 2006/01/14 15:45:24 kls Exp $
+ * $Id: epg.h 1.30 2006/01/29 14:03:13 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -137,8 +137,8 @@ class cSchedule : public cListObject  {
   void HashEvent(cEvent *Event);
   void UnhashEvent(cEvent *Event);
   const cList<cEvent> *Events(void) const { return &events; }
-  const cEvent *GetPresentEvent(bool CheckRunningStatus = false) const;
-  const cEvent *GetFollowingEvent(bool CheckRunningStatus = false) const;
+  const cEvent *GetPresentEvent(void) const;
+  const cEvent *GetFollowingEvent(void) const;
   const cEvent *GetEvent(u_int16_t EventID, time_t StartTime = 0) const;
   const cEvent *GetEventAround(time_t Time) const;
   void Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0) const;
diff --git a/i18n.c b/i18n.c
index 1bd20daee..c061a1abf 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.240 2006/01/22 15:55:28 kls Exp $
+ * $Id: i18n.c 1.244 2006/01/28 10:38:33 kls Exp $
  *
  * Translations provided by:
  *
@@ -460,7 +460,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "See s�ndmus - %s",
-    "",//TODO
+    "Denne udsendelse - %s",
   },
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
@@ -481,7 +481,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "See s�ndmus - k�ik kanalid",
-    "",//TODO
+    "Denne udsendelse - alle kanaler",
   },
   { "All events - all channels",
     "Alle Sendungen - alle Kan�le",
@@ -502,7 +502,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "K�ik s�ndmused - k�ik kanalid",
-    "",//TODO
+    "Alle udsendelser - alle kanaler",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -692,7 +692,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Taimer",
-    "",// TODO
+    "Timer",
   },
   { "Button$Record",
     "Aufnehmen",
@@ -1597,7 +1597,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "FTA",
-    "",//TODO
+    "Free To Air",
   },
   { "encrypted",
     "verschl�sselt",
@@ -1618,7 +1618,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "kr�ptitud",
-    "",//TODO
+    "kodet",
   },
   { "Sid",
     "Sid",
@@ -2344,6 +2344,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "Tallennustilan puute est�� tallennuksen!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2353,9 +2354,8 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "Ebapiisavalt kettaruumi salvestamise alustamiseks!",
+    "For lidt harddisk plads til optagelse!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -2958,7 +2958,7 @@ const tI18nPhrase Phrases[] = {
     "ei koskaan",
     "nigdy",
     "nunca",
-    "����"
+    "����",
     "aldrig",
     "niciodat�",
     "",// TODO
@@ -3092,7 +3092,7 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "Kanaliinfo kuvamise ajapiirang",
-    "", // TODO
+    "Timeout ved anmodet kanal info",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -3155,7 +3155,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Sulgemine Men�� klahviga",
-    "",// TODO
+    "Menu taste lukker",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -3616,7 +3616,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "�������������� ����� (����)",
     "Audio jezici",
-    "Audio keeled",
+    "Audio keeli",
     "Audio sprog (ant.)",
   },
   { "Setup.DVB$Audio language",  // note the singular
@@ -4292,7 +4292,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9",
-    "",//TODO
+    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -5534,7 +5534,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Salvestamine algas",
-    "",//TODO
+    "Optagelse startet",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
diff --git a/interface.c b/interface.c
index b2e842daa..4b74db95b 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.71 2006/01/04 15:44:19 kls Exp $
+ * $Id: interface.c 1.73 2006/01/29 12:35:50 kls Exp $
  */
 
 #include "interface.h"
diff --git a/lirc.c b/lirc.c
index ac9de010f..9bb83287f 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,35 +6,28 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.13 2005/09/02 12:51:35 kls Exp $
+ * $Id: lirc.c 1.14 2006/01/27 15:59:47 kls Exp $
  */
 
 #include "lirc.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 
 #define REPEATLIMIT  20 // ms
 #define REPEATDELAY 350 // ms
 #define KEYPRESSDELAY 150 // ms
+#define RECONNECTDELAY 3000 // ms
 
 cLircRemote::cLircRemote(const char *DeviceName)
 :cRemote("LIRC")
 ,cThread("LIRC remote control")
 {
-  struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
   strcpy(addr.sun_path, DeviceName);
-  if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
-     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
-        Start();
-        return;
-        }
-     LOG_ERROR_STR(DeviceName);
-     close(f);
+  if (Connect()) {
+     Start();
+     return;
      }
-  else
-     LOG_ERROR_STR(DeviceName);
   f = -1;
 }
 
@@ -47,6 +40,20 @@ cLircRemote::~cLircRemote()
      close(fh);
 }
 
+bool cLircRemote::Connect(void)
+{
+  if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
+     if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0)
+        return true;
+     LOG_ERROR_STR(addr.sun_path);
+     close(f);
+     f = -1;
+     }
+  else
+     LOG_ERROR_STR(addr.sun_path);
+  return false;
+}
+
 bool cLircRemote::Ready(void)
 {
   return f >= 0;
@@ -67,10 +74,16 @@ void cLircRemote::Action(void)
         int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
 
         if (ready && ret <= 0 ) {
-           esyslog("ERROR: lircd connection lost");
+           esyslog("ERROR: lircd connection broken, trying to reconnect every %.1f seconds", float(RECONNECTDELAY) / 1000);
            close(f);
            f = -1;
-           break;
+           while (Running() && f < 0) {
+                 cCondWait::SleepMs(RECONNECTDELAY);
+                 if (Connect()) {
+                    isyslog("reconnected to lircd");
+                    break;
+                    }
+                 }
            }
 
         if (ready && ret > 21) {
diff --git a/lirc.h b/lirc.h
index 25b743feb..3c4735a88 100644
--- a/lirc.h
+++ b/lirc.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 1.3 2005/07/31 10:18:15 kls Exp $
+ * $Id: lirc.h 1.4 2006/01/27 16:00:19 kls Exp $
  */
 
 #ifndef __LIRC_H
 #define __LIRC_H
 
+#include <sys/un.h>
 #include "remote.h"
 #include "thread.h"
 
@@ -17,7 +18,9 @@ class cLircRemote : public cRemote, private cThread {
 private:
   enum { LIRC_KEY_BUF = 30, LIRC_BUFFER_SIZE = 128 };
   int f;
+  struct sockaddr_un addr;
   virtual void Action(void);
+  bool Connect(void);
 public:
   cLircRemote(const char *DeviceName);
   virtual ~cLircRemote();
diff --git a/menu.c b/menu.c
index ec49b1cee..4aa539777 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.403 2006/01/22 16:06:39 kls Exp $
+ * $Id: menu.c 1.407 2006/01/29 14:04:37 kls Exp $
  */
 
 #include "menu.h"
@@ -1245,7 +1245,7 @@ void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel *
   if (schedules && Channel) {
      const cSchedule *Schedule = schedules->GetSchedule(Channel);
      if (Schedule) {
-        const cEvent *PresentEvent = Event ? Event : Schedule->GetPresentEvent(Channel->Number() == cDevice::CurrentChannel());
+        const cEvent *PresentEvent = Event ? Event : Schedule->GetPresentEvent();
         time_t now = time(NULL) - Setup.EPGLinger * 60;
         for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
             if (ev->EndTime() > now || ev == PresentEvent)
@@ -1352,6 +1352,8 @@ eOSState cMenuSchedule::Number(void)
      Event = CurrentItem->event;
      Channel = Channels.GetByChannelID(Event->ChannelID(), true);
      }
+  else
+     Channel = Channels.GetByNumber(cDevice::CurrentChannel());
   switch (cMenuScheduleItem::SortMode()) {
     case cMenuScheduleItem::ssmAllThis:  PrepareScheduleAllThis(Event, Channel); break;
     case cMenuScheduleItem::ssmThisThis: PrepareScheduleThisThis(Event, Channel); break;
@@ -2954,19 +2956,19 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
 
 // --- SetTrackDescriptions --------------------------------------------------
 
-static void SetTrackDescriptions(bool Live)
+static void SetTrackDescriptions(int LiveChannel)
 {
   cDevice::PrimaryDevice()->ClrAvailableTracks(true);
   const cComponents *Components = NULL;
   cSchedulesLock SchedulesLock;
-  if (Live) {
-     cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  if (LiveChannel) {
+     cChannel *Channel = Channels.GetByNumber(LiveChannel);
      if (Channel) {
         const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
         if (Schedules) {
            const cSchedule *Schedule = Schedules->GetSchedule(Channel);
            if (Schedule) {
-              const cEvent *Present = Schedule->GetPresentEvent(true);
+              const cEvent *Present = Schedule->GetPresentEvent();
               if (Present)
                  Components = Present->Components();
               }
@@ -3056,10 +3058,10 @@ void cDisplayChannel::DisplayInfo(void)
      if (Schedules) {
         const cSchedule *Schedule = Schedules->GetSchedule(channel);
         if (Schedule) {
-           const cEvent *Present = Schedule->GetPresentEvent(true);
-           const cEvent *Following = Schedule->GetFollowingEvent(true);
+           const cEvent *Present = Schedule->GetPresentEvent();
+           const cEvent *Following = Schedule->GetFollowingEvent();
            if (Present != lastPresent || Following != lastFollowing) {
-              SetTrackDescriptions(true);
+              SetTrackDescriptions(channel->Number());
               displayChannel->SetEvents(Present, Following);
               cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
               lastPresent = Present;
@@ -3172,13 +3174,15 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
          cChannel *ch = NextAvailableChannel(channel, (k == kUp || k == kChanUp) ? 1 : -1);
          if (ch)
             channel = ch;
+         else if (channel && channel->Number() != cDevice::CurrentChannel())
+            Key = k; // immediately switches channel when hitting the beginning/end of the channel list with k_Repeat
          }
          // no break here
     case kUp|k_Release:
     case kDown|k_Release:
     case kChanUp|k_Release:
     case kChanDn|k_Release:
-         if (!(Key & k_Repeat) && channel)
+         if (!(Key & k_Repeat) && channel && channel->Number() != cDevice::CurrentChannel())
             NewChannel = channel;
          withInfo = true;
          group = -1;
@@ -3235,7 +3239,9 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
      DisplayInfo();
      displayChannel->Flush();
      if (NewChannel) {
+        SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
         Channels.SwitchTo(NewChannel->Number());
+        SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
         channel = NewChannel;
         }
      return osContinue;
@@ -3320,7 +3326,7 @@ cDisplayTracks::cDisplayTracks(void)
 :cOsdObject(true)
 {
   cDevice::PrimaryDevice()->EnsureAudioTrack();
-  SetTrackDescriptions(!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice());
+  SetTrackDescriptions(!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice() ? cDevice::CurrentChannel() : 0);
   currentDisplayTracks = this;
   numTracks = track = 0;
   audioChannel = cDevice::PrimaryDevice()->GetAudioChannel();
diff --git a/pat.c b/pat.c
index 83031db49..a7216b8cb 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.14 2005/09/04 14:32:39 kls Exp $
+ * $Id: pat.c 1.15 2006/01/27 15:48:29 kls Exp $
  */
 
 #include "pat.h"
@@ -287,7 +287,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
            int Index = 0;
            for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
                if (!assoc.isNITPid()) {
-                  if (Index++ == pmtIndex) {
+                  if (Index++ >= pmtIndex && Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId())) {
                      pmtPid = assoc.getPid();
                      Add(pmtPid, 0x02);
                      break;
diff --git a/remote.c b/remote.c
index 7d7b4a54f..4504533c3 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.48 2006/01/15 15:17:40 kls Exp $
+ * $Id: remote.c 1.49 2006/01/29 14:43:07 kls Exp $
  */
 
 #include "remote.h"
@@ -18,11 +18,13 @@
 
 // --- cRemote ---------------------------------------------------------------
 
-#define INITTIMEOUT 10000 // ms
+#define INITTIMEOUT   10000 // ms
+#define REPEATTIMEOUT  1000 // ms
 
 eKeys cRemote::keys[MaxKeys];
 int cRemote::in = 0;
 int cRemote::out = 0;
+cTimeMs cRemote::repeatTimeout;
 cRemote *cRemote::learning = NULL;
 char *cRemote::unknownCode = NULL;
 cMutex cRemote::mutex;
@@ -163,9 +165,11 @@ eKeys cRemote::Get(int WaitMs, char **UnknownCode)
          eKeys k = keys[out];
          if (++out >= MaxKeys)
             out = 0;
+         if ((k & k_Repeat) != 0)
+            repeatTimeout.Set(REPEATTIMEOUT);
          return k;
          }
-      else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs)) {
+      else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut()) {
          if (learning && UnknownCode) {
             *UnknownCode = unknownCode;
             unknownCode = NULL;
diff --git a/remote.h b/remote.h
index 4fd26d8eb..0213b0cff 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.32 2006/01/01 14:00:50 kls Exp $
+ * $Id: remote.h 1.33 2006/01/29 12:27:08 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -23,6 +23,7 @@ class cRemote : public cListObject {
   static eKeys keys[MaxKeys];
   static int in;
   static int out;
+  static cTimeMs repeatTimeout;
   static cRemote *learning;
   static char *unknownCode;
   static cMutex mutex;
diff --git a/thread.c b/thread.c
index 4fcfc277b..5d5e18bd1 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.51 2006/01/08 16:03:56 kls Exp $
+ * $Id: thread.c 1.52 2006/01/28 11:34:35 kls Exp $
  */
 
 #include "thread.h"
@@ -105,7 +105,7 @@ void cCondVar::Wait(cMutex &Mutex)
   if (Mutex.locked) {
      int locked = Mutex.locked;
      Mutex.locked = 0; // have to clear the locked count here, as pthread_cond_wait
-                       // does an implizit unlock of the mutex
+                       // does an implicit unlock of the mutex
      pthread_cond_wait(&cond, &Mutex.mutex);
      Mutex.locked = locked;
      }
@@ -113,14 +113,14 @@ void cCondVar::Wait(cMutex &Mutex)
 
 bool cCondVar::TimedWait(cMutex &Mutex, int TimeoutMs)
 {
-  bool r = true; // true = condition signaled false = timeout
+  bool r = true; // true = condition signaled, false = timeout
 
   if (Mutex.locked) {
      struct timespec abstime;
      if (GetAbsTime(&abstime, TimeoutMs)) {
         int locked = Mutex.locked;
         Mutex.locked = 0; // have to clear the locked count here, as pthread_cond_timedwait
-                          // does an implizit unlock of the mutex.
+                          // does an implicit unlock of the mutex.
         if (pthread_cond_timedwait(&cond, &Mutex.mutex, &abstime) == ETIMEDOUT)
            r = false;
         Mutex.locked = locked;
diff --git a/timers.c b/timers.c
index a168cc1db..ab426802a 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.43 2006/01/15 13:31:11 kls Exp $
+ * $Id: timers.c 1.45 2006/01/28 15:09:05 kls Exp $
  */
 
 #include "timers.h"
@@ -245,6 +245,7 @@ bool cTimer::Parse(const char *s)
      }
   bool result = false;
   if (8 <= sscanf(s, "%u :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
+     ClrFlags(tfRecording);
      if (summary && !*skipspace(summary)) {
         free(summary);
         summary = NULL;
@@ -566,7 +567,7 @@ cTimer *cTimers::GetNextActiveTimer(void)
 {
   cTimer *t0 = NULL;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if ((ti->HasFlags(tfActive)) && (!t0 || ti->Compare(*t0) < 0))
+      if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
          t0 = ti;
       }
   return t0;
diff --git a/transfer.c b/transfer.c
index 8a0db4d69..b8313df07 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.31 2006/01/21 14:13:16 kls Exp $
+ * $Id: transfer.c 1.32 2006/01/28 14:23:38 kls Exp $
  */
 
 #include "transfer.h"
@@ -49,41 +49,12 @@ void cTransfer::Receive(uchar *Data, int Length)
      }
 }
 
-#define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-//XXX This is a very ugly hack to allow cDvbOsd to reduce the buffer
-//XXX requirements in cTransfer if it detects a 4MB full featured DVB card.
-bool DvbCardWith4MBofSDRAM = false;
-#endif
-
 void cTransfer::Action(void)
 {
   int PollTimeouts = 0;
   uchar *p = NULL;
   int Result = 0;
-#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-  bool GotBufferReserve = false;
-  GotBufferReserve = true; //XXX remove this line if you absolutely need the buffer reserve
-  int RequiredBufferReserve = KILOBYTE(DvbCardWith4MBofSDRAM ? 288 : 576);
-#endif
   while (Running()) {
-#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-        if (needsBufferReserve && !GotBufferReserve) {
-           //XXX For dolby we've to fill the buffer because the firmware does
-           //XXX not decode dolby but use a PCM stream for transport, therefore
-           //XXX the firmware has not enough buffer for noiseless skipping early
-           //XXX PCM samples (each dolby frame requires 6144 bytes in PCM and
-           //XXX audio is mostly to early in comparison to video).
-           //XXX To resolve this, the remuxer or PlayPes() should synchronize
-           //XXX audio with the video frames. 2004/09/09 Werner
-           if (ringBuffer->Available() < RequiredBufferReserve) { // used to be MAXFRAMESIZE, but the HDTV value of KILOBYTE(512) is way too much here
-              cCondWait::SleepMs(20); // allow the buffer to collect some reserve
-              continue;
-              }
-           else
-              GotBufferReserve = true;
-           }
-#endif
         int Count;
         uchar *b = ringBuffer->Get(Count);
         if (b) {
@@ -98,9 +69,6 @@ void cTransfer::Action(void)
               remux->Clear();
               PlayPes(NULL, 0);
               p = NULL;
-#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-              GotBufferReserve = false;
-#endif
               continue;
               }
            Count = remux->Put(b, Count);
@@ -133,9 +101,6 @@ void cTransfer::Action(void)
                  remux->Clear();
                  PlayPes(NULL, 0);
                  p = NULL;
-#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-                 GotBufferReserve = false;
-#endif
                  }
               }
            }
diff --git a/vdr.5 b/vdr.5
index caabe51ce..214aac81c 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.47 2006/01/14 10:57:37 kls Exp $
+.\" $Id: vdr.5 1.48 2006/01/29 11:31:58 kls Exp $
 .\"
 .TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files"
 .SH NAME
@@ -635,7 +635,7 @@ l l.
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
 <table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
-<version>      @is a hex number that indicates the event's version number inside its table (optional)
+<version>      @is a hex number that indicates the event's version number inside its table (optional, only processed for table IDs smaller than 0x50)
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
diff --git a/vdr.c b/vdr.c
index 16585903f..3913f6255 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.244 2006/01/22 15:59:13 kls Exp $
+ * $Id: vdr.c 1.246 2006/01/29 14:35:31 kls Exp $
  */
 
 #include <getopt.h>
@@ -71,6 +71,7 @@
                               // in order to react on a possible new CAM menu as soon as possible
 #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
 #define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
+#define SHUTDOWNRETRY     300 // seconds before trying again to shut down
 
 #define EXIT(v) { ExitCode = (v); goto Exit; }
 
@@ -1087,7 +1088,7 @@ int main(int argc, char *argv[])
                        if (signal(SIGALRM, Watchdog) == SIG_IGN)
                           signal(SIGALRM, SIG_IGN);
                        }
-                    LastActivity = time(NULL); // don't try again too soon
+                    LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
                     UserShutdown = false;
                     continue; // skip the rest of the housekeeping for now
                     }
@@ -1122,6 +1123,7 @@ int main(int argc, char *argv[])
      }
   cDevice::Shutdown();
   PluginManager.Shutdown();
+  cSchedules::Cleanup(true);
   ReportEpgBugFixStats();
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);

From c23992b807aca1cea08193b773f80eee0cb8f829 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 5 Feb 2006 18:00:00 +0100
Subject: [PATCH 134/307] =?UTF-8?q?Version=201.3.42=20-=20Removed=20leftov?=
 =?UTF-8?q?er=20'needsBufferReserve'=20variable=20from=20cTransfer=20(than?=
 =?UTF-8?q?ks=20to=20Marco=20=20=20Schl=C3=BC=C3=9Fler).=20-=20Fixed=20set?=
 =?UTF-8?q?ting=20"No=20title"=20for=20broken=20event=20data=20(reported?=
 =?UTF-8?q?=20by=20Ronny=20Kornexl).=20-=20Fixed=20channel=20up/down=20swi?=
 =?UTF-8?q?tching=20on=20single=20card=20systems=20(reported=20by=20Stefan?=
 =?UTF-8?q?=20=20=20Huelswitt).=20-=20Fixed=20handling=20"pending"=20timer?=
 =?UTF-8?q?s=20that=20blocked=20others=20that=20actually=20could=20record?=
 =?UTF-8?q?=20=20=20(reported=20by=20Thomas=20Koch).=20-=20Speeded=20up=20?=
 =?UTF-8?q?cVideoRepacker=20(thanks=20to=20Reinhard=20Nissl).=20-=20Added?=
 =?UTF-8?q?=20an=20'Id'=20parameter=20to=20cDevice::PlayAudio()=20to=20all?=
 =?UTF-8?q?ow=20plugins=20to=20easier=20=20=20process=20the=20audio=20data?=
 =?UTF-8?q?=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Added=20C?=
 =?UTF-8?q?zech=20language=20texts=20(thanks=20to=20Vladim=C3=ADr=20B?=
 =?UTF-8?q?=C3=A1rta).=20=20=20Plugin=20authors=20may=20want=20to=20add=20?=
 =?UTF-8?q?the=20new=20entries=20to=20their=20I18N=20texts=20and=20contact?=
 =?UTF-8?q?=20=20=20the=20translators=20to=20have=20their=20texts=20transl?=
 =?UTF-8?q?ated.=20Note=20that=20there=20are=20now=2021=20=20=20different?=
 =?UTF-8?q?=20OSD=20languages,=20so=20please=20make=20sure=20you=20have=20?=
 =?UTF-8?q?21=20versions=20for=20each=20of=20=20=20your=20texts.=20-=20Upd?=
 =?UTF-8?q?ated=20the=20Polish=20OSD=20texts=20(thanks=20to=20Jaroslaw=20S?=
 =?UTF-8?q?wierczynski).=20-=20Fixed=20auto=20advance=20in=20string=20entr?=
 =?UTF-8?q?y=20fields=20when=20pressing=20Up/Down=20in=20insert=20mode=20?=
 =?UTF-8?q?=20=20(reported=20by=20Udo=20Richter).=20-=20Fixed=20handling?=
 =?UTF-8?q?=20the=20"Setup/OSD/Menu=20button=20closes"=20option=20when=20s?=
 =?UTF-8?q?et=20to=20'yes'=20in=20=20=20case=20a=20replay=20is=20active=20?=
 =?UTF-8?q?(thanks=20to=20Udo=20Richter).=20-=20Improved=20cUnbufferedFile?=
 =?UTF-8?q?;=20USE=5FFADVISE=20is=20now=20defined=20in=20tools.c=20by=20de?=
 =?UTF-8?q?fault,=20so=20=20=20if=20you=20don't=20want=20to=20use=20"fadvi?=
 =?UTF-8?q?se"=20you=20need=20to=20comment=20out=20that=20line=20(thanks?=
 =?UTF-8?q?=20to=20=20=20Artur=20Skawina).=20-=20Fixed=20a=20missing=20','?=
 =?UTF-8?q?=20in=20the=20Swedish=20OSD=20texts=20(thanks=20to=20Arthur=20K?=
 =?UTF-8?q?onovalov).=20-=20cDevice::Transferring()=20can=20now=20be=20use?=
 =?UTF-8?q?d=20to=20determine=20whether=20the=20(primary)=20=20=20device?=
 =?UTF-8?q?=20is=20currently=20playing=20in=20Transfer=20Mode=20(based=20o?=
 =?UTF-8?q?n=20a=20suggestion=20by=20=20=20Reinhard=20Nissl).=20-=20The=20?=
 =?UTF-8?q?'runvdr'=20script=20no=20longer=20uses=20the=20$VDRUSR=20enviro?=
 =?UTF-8?q?nment=20variable=20to=20set=20=20=20the=20user=20id=20under=20w?=
 =?UTF-8?q?hich=20'vdr'=20shall=20run.=20Just=20add=20the=20'-u=20username?=
 =?UTF-8?q?'=20option=20=20=20when=20you=20call=20'runvdr'.=20-=20Fixed=20?=
 =?UTF-8?q?multiple=20entries=20of=20the=20same=20subdirectory=20in=20the?=
 =?UTF-8?q?=20"Recordings"=20menu=20=20=20(reported=20by=20Christian=20Jac?=
 =?UTF-8?q?obsen).=20-=20Enabled=20generating=20a=20core=20dump=20if=20VDR?=
 =?UTF-8?q?=20is=20run=20with=20a=20different=20user=20id=20(thanks=20=20?=
 =?UTF-8?q?=20to=20Ville=20Skytt=C3=A4).=20-=20Fixed=20handling=20the=20"B?=
 =?UTF-8?q?lue"=20key=20in=20the=20"Schedule"=20menu=20for=20the=20current?=
 =?UTF-8?q?=20channel=20=20=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Rena?=
 =?UTF-8?q?med=20the=20Makefile=20target=20'plugins-clean'=20to=20'clean-p?=
 =?UTF-8?q?lugins'=20(suggested=20by=20=20=20Sebastian=20Frei).=20-=20Made?=
 =?UTF-8?q?=20all=20font=20and=20image=20data=20'const'=20(thanks=20to=20D?=
 =?UTF-8?q?arren=20Salt).=20-=20Fixed=20scrolling=20with=20Up/Down=20in=20?=
 =?UTF-8?q?case=20there=20are=20non-selectable=20items=20at=20the=20=20=20?=
 =?UTF-8?q?beginning=20or=20end=20of=20the=20menu=20(reported=20by=20Helmu?=
 =?UTF-8?q?t=20Auer).=20-=20Added=20cSkin::GetTextAreaWidth()=20and=20cSki?=
 =?UTF-8?q?n::GetTextAreaFont(),=20so=20that=20a=20plugin=20=20=20that=20w?=
 =?UTF-8?q?ants=20to=20do=20special=20text=20formatting=20can=20do=20so=20?=
 =?UTF-8?q?(thanks=20to=20Alexander=20Rieger).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS             |  28 ++++
 HISTORY                  |  46 ++++++
 INSTALL                  |   3 +-
 Makefile                 |   4 +-
 PLUGINS.html             |   4 +-
 PLUGINS/src/hello/i18n.c |  26 ++-
 channels.conf            |  26 +--
 config.h                 |   6 +-
 cutter.c                 |   5 +-
 device.c                 |  17 +-
 device.h                 |   7 +-
 dvbdevice.c              |   4 +-
 dvbdevice.h              |   4 +-
 epg.c                    |   4 +-
 font.c                   |  11 +-
 font.h                   |   8 +-
 fontfix-iso8859-1.c      |   2 +-
 fontfix-iso8859-13.c     |   2 +-
 fontfix-iso8859-15.c     |   2 +-
 fontfix-iso8859-2.c      |   2 +-
 fontfix-iso8859-5.c      |   2 +-
 fontfix-iso8859-7.c      |   2 +-
 fontosd-iso8859-1.c      |   2 +-
 fontosd-iso8859-13.c     |   2 +-
 fontosd-iso8859-15.c     |   2 +-
 fontosd-iso8859-2.c      |   3 +-
 fontosd-iso8859-5.c      |   2 +-
 fontosd-iso8859-7.c      |   2 +-
 fontsml-iso8859-1.c      |   2 +-
 fontsml-iso8859-13.c     |   2 +-
 fontsml-iso8859-15.c     |   2 +-
 fontsml-iso8859-2.c      |   2 +-
 fontsml-iso8859-5.c      |   2 +-
 fontsml-iso8859-7.c      |   2 +-
 genfontfile.c            |   2 +-
 i18n.c                   | 276 ++++++++++++++++++++++++++++++-
 i18n.h                   |   4 +-
 menu.c                   |   8 +-
 menuitems.c              |   6 +-
 osd.c                    |   8 +-
 osd.h                    |   6 +-
 osdbase.c                |  14 +-
 recording.c              |   3 +-
 remux.c                  | 349 +++++++++++++++++++++++++++------------
 runvdr                   |  11 +-
 skinclassic.c            |  17 +-
 skins.c                  |  12 +-
 skins.h                  |  15 +-
 skinsttng.c              |  20 ++-
 symbols/arrowdown.xpm    |   2 +-
 symbols/arrowup.xpm      |   2 +-
 symbols/audio.xpm        |   2 +-
 symbols/audioleft.xpm    |   2 +-
 symbols/audioright.xpm   |   2 +-
 symbols/audiostereo.xpm  |   2 +-
 symbols/dolbydigital.xpm |   2 +-
 symbols/encrypted.xpm    |   2 +-
 symbols/ffwd.xpm         |   2 +-
 symbols/ffwd1.xpm        |   2 +-
 symbols/ffwd2.xpm        |   2 +-
 symbols/ffwd3.xpm        |   2 +-
 symbols/frew.xpm         |   2 +-
 symbols/frew1.xpm        |   2 +-
 symbols/frew2.xpm        |   2 +-
 symbols/frew3.xpm        |   2 +-
 symbols/mute.xpm         |   2 +-
 symbols/pause.xpm        |   2 +-
 symbols/play.xpm         |   2 +-
 symbols/radio.xpm        |   2 +-
 symbols/recording.xpm    |   2 +-
 symbols/sfwd.xpm         |   2 +-
 symbols/sfwd1.xpm        |   2 +-
 symbols/sfwd2.xpm        |   2 +-
 symbols/sfwd3.xpm        |   2 +-
 symbols/srew.xpm         |   2 +-
 symbols/srew1.xpm        |   2 +-
 symbols/srew2.xpm        |   2 +-
 symbols/srew3.xpm        |   2 +-
 symbols/teletext.xpm     |   2 +-
 symbols/volume.xpm       |   2 +-
 timers.c                 |  11 +-
 tools.c                  | 174 ++++++++++++-------
 tools.h                  |  13 +-
 transfer.c               |   3 +-
 transfer.h               |   3 +-
 vdr.c                    |  16 +-
 86 files changed, 962 insertions(+), 311 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b6234d2e5..7a65ceeae 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -215,6 +215,7 @@ Stefan Huelswitt <huels@iname.com>
  path names
  for suggesting that the SVDRP command GRAB should allow file names without extension
  again
+ for reporting a problem with channel up/down switching on single card systems
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -270,6 +271,7 @@ Artur Skawina <skawina@geocities.com>
  for improving the font file generation in the Makefile
  for pointing out a problem with the ERR macro defined by ncurses.h
  for a patch that contained a fix for checking toFile in cCuttingThread::Action()
+ for improving cUnbufferedFile
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
@@ -548,6 +550,8 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to give a message when an instant recording is started
  fpr suggesting to retry a shutdown after a while
  for separating the 'install' target into several individual targets
+ for reporting a problem with scrolling with Up/Down in case there are non-selectable
+ items at the beginning of the menu
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -843,6 +847,8 @@ Ludwig Nussel <ludwig.nussel@web.de>
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
  for implementing the SVDRP command STAT
+ for reporting a problem with "pending" timers that blocked others that actually
+ could record
 
 Stefan Hu�feldt <vdr@marvin.on-luebeck.de>
  for his help in keeping 'channels.conf.cable' up to date
@@ -880,6 +886,8 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for reporting a problem in case a station defines all 32 audio PIDs
  for suggestions and experiments regarding the buffer reserve in cTransfer
  for reporting a problem with 'summary.vdr' files with more than two empty lines
+ for reporting a problem with multiple entries of the same subdirectory in the
+ "Recordings" menu
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
@@ -944,6 +952,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for a patch that was used to implement automatic cursor advance when entering text
  via the numeric keys
  for reporting a problem with expired timers when shutting down via the Power key
+ for fixing handling the "Blue" key in the "Schedule" menu for the current channel
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1040,6 +1049,7 @@ Reinhard Nissl <rnissl@gmx.de>
  DiSEqC data) if the lock is lost
  for fixing handling TS packets in cTS2PES
  for adding a mutex to synchronize cDevice::PlayPesPacket() and SetCurrentAudioTrack()
+ for a suggestion that lead to implementing cDevice::Transferring()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1061,6 +1071,7 @@ Robert Bartl <robert@bartl.priv.at>
 
 Sebastian Frei <sebastian@schnapsleichen.de>
  for his support in keeping 'channels.conf' up-to-date.
+ for suggesting to rename the Makefile target 'plugins-clean' to 'clean-plugins'
 
 Rene Bartsch <ml@bartschnet.de>
  for reporting a bug in setting the primary device in case none of the devices
@@ -1292,6 +1303,9 @@ Marco Schl
  for figuring out some obscure length bytes the the CA PMT Reply data of AlphaCrypt CAMs
  for fixing handling OSD areas that have invalid sizes
  for removing unused variables in skinclassic.c and skinsttng.c
+ for removing leftover 'needsBufferReserve' variable from cTransfer
+ for adding an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier
+ process the audio data
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1330,6 +1344,7 @@ Kimmo Tykkala <tykkala@iki.fi>
 Arthur Konovalov <kasjas@hot.ee>
  for translating OSD texts to the Estonian language
  for fixing a missing ',' in the Greek OSD texts
+ for fixing a missing ',' in the Swedish OSD texts
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -1351,6 +1366,10 @@ Udo Richter <udo_richter@gmx.de>
  for making the Makefile report a summary of failed plugins
  for reporting a problem with the new handling of k_Repeat keypresses in channel
  switching
+ for reporting a problem with auto advance in string entry fields when pressing
+ Up/Down in insert mode
+ for fixing handling the "Setup/OSD/Menu button closes" option when set to 'yes' in
+ case a replay is active
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1414,6 +1433,7 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
  for suggesting to write grabbed images to the SVDRP connection encoded in base64
  for suggesting to open the file handle in the SVDRP GRAB command in a way that
  it won't follow symbolic links, and to canonicalize the file name
+ for making all font and image data 'const'
 
 Sean Carlos <seanc@libero.it>
  for translating OSD texts to the Italian language
@@ -1494,6 +1514,7 @@ Ville Skytt
  for removing the obsolete "ca.conf" section from vdr.1
  for making the cLircRemote try to reestablish the connection to the LIRC daemon
  in case it breaks
+ for enabling generating a core dump if VDR is run with a different user id
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1590,6 +1611,7 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for fixing handling color buttons in cMenuEditStrItem
  for making the '.update' file in the video directory be touched when a recording is
  added or deleted, so that other VDR instances can update their lists
+ for adding cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont()
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
@@ -1710,3 +1732,9 @@ Daniel Karsubka <dkar@gmx.de>
 Suur Karu <suurkaru@fastmail.fm>
  for reporting a problem with the tuning timeout for channels that have low symbol
  rates
+
+Ronny Kornexl <ronny.kornexl@online.de>
+ for reporting a problem with setting "No title" for broken event data
+
+B�rta Vladim�r <vladimir.barta@k2atmitec.cz>
+ for translating OSD texts to the Czech language
diff --git a/HISTORY b/HISTORY
index 62ab4db64..0302c8fd5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4270,3 +4270,49 @@ Video Disk Recorder Revision History
   system, it is now tried again after 5 minutes (suggested by Helmut Auer).
 - Separated the 'install' target into several individual targets; renamed the
   'plugins-install' target to 'install-plugins' (thanks to Helmut Auer).
+
+2006-02-05: Version 1.3.42
+
+- Removed leftover 'needsBufferReserve' variable from cTransfer (thanks to Marco
+  Schl��ler).
+- Fixed setting "No title" for broken event data (reported by Ronny Kornexl).
+- Fixed channel up/down switching on single card systems (reported by Stefan
+  Huelswitt).
+- Fixed handling "pending" timers that blocked others that actually could record
+  (reported by Thomas Koch).
+- Speeded up cVideoRepacker (thanks to Reinhard Nissl).
+- Added an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier
+  process the audio data (thanks to Marco Schl��ler).
+- Added Czech language texts (thanks to B�rta Vladim�r).
+  Plugin authors may want to add the new entries to their I18N texts and contact
+  the translators to have their texts translated. Note that there are now 21
+  different OSD languages, so please make sure you have 21 versions for each of
+  your texts.
+- Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski).
+- Fixed auto advance in string entry fields when pressing Up/Down in insert mode
+  (reported by Udo Richter).
+- Fixed handling the "Setup/OSD/Menu button closes" option when set to 'yes' in
+  case a replay is active (thanks to Udo Richter).
+- Improved cUnbufferedFile; USE_FADVISE is now defined in tools.c by default, so
+  if you don't want to use "fadvise" you need to comment out that line (thanks to
+  Artur Skawina).
+- Fixed a missing ',' in the Swedish OSD texts (thanks to Arthur Konovalov).
+- cDevice::Transferring() can now be used to determine whether the (primary)
+  device is currently playing in Transfer Mode (based on a suggestion by
+  Reinhard Nissl).
+- The 'runvdr' script no longer uses the $VDRUSR environment variable to set
+  the user id under which 'vdr' shall run. Just add the '-u username' option
+  when you call 'runvdr'.
+- Fixed multiple entries of the same subdirectory in the "Recordings" menu
+  (reported by Christian Jacobsen).
+- Enabled generating a core dump if VDR is run with a different user id (thanks
+  to Ville Skytt�).
+- Fixed handling the "Blue" key in the "Schedule" menu for the current channel
+  (thanks to Rolf Ahrenberg).
+- Renamed the Makefile target 'plugins-clean' to 'clean-plugins' (suggested by
+  Sebastian Frei).
+- Made all font and image data 'const' (thanks to Darren Salt).
+- Fixed scrolling with Up/Down in case there are non-selectable items at the
+  beginning or end of the menu (reported by Helmut Auer).
+- Added cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont(), so that a plugin
+  that wants to do special text formatting can do so (thanks to Alexander Rieger).
diff --git a/INSTALL b/INSTALL
index 3be9c34e4..c4b2a59ea 100644
--- a/INSTALL
+++ b/INSTALL
@@ -136,7 +136,8 @@ watchdog timer to restart the program in case something happens that
 causes a program hangup. If you change the command line options for the
 call to the VDR program, be sure to NOT use the '-d' option! Otherwise
 VDR will go into 'deamon' mode and the initial program call will return
-immediately!
+immediately! 'runvdr' needs to be started as user 'root'. Use the '-u'
+option to run the actual 'vdr' program under a different user id.
 
 Setting the system time:
 ------------------------
diff --git a/Makefile b/Makefile
index a6427518e..60373a38c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.84 2006/01/29 14:50:34 kls Exp $
+# $Id: Makefile 1.85 2006/02/05 13:37:11 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -193,7 +193,7 @@ plugins: include-dir
 	    done;\
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; fi
 
-plugins-clean:
+clean-plugins:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
 	@-rm -f $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION)
 
diff --git a/PLUGINS.html b/PLUGINS.html
index bec512787..9515174f4 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -175,7 +175,7 @@ <h1>Table Of Contents</h1>
 <p>
 The VDR <tt>Makefile</tt> contains the target <tt>plugins</tt>, which calls
 <tt>make all</tt> in every directory found under <tt>VDR/PLUGINS/src</tt>,
-plus the target <tt>plugins-clean</tt>, which calls <tt>make clean</tt> in
+plus the target <tt>clean-plugins</tt>, which calls <tt>make clean</tt> in
 each of these directories.
 <p>
 If you download a plugin <a href="#Building the distribution package">package</a>
@@ -187,7 +187,7 @@ <h1>Table Of Contents</h1>
 <p>
 <tt>hello-0.0.1</tt>
 <p>
-To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
+To use the <tt>plugins</tt> and <tt>clean-plugins</tt> targets from the VDR <tt>Makefile</tt>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/src</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
diff --git a/PLUGINS/src/hello/i18n.c b/PLUGINS/src/hello/i18n.c
index 304233ba8..62446a647 100644
--- a/PLUGINS/src/hello/i18n.c
+++ b/PLUGINS/src/hello/i18n.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.c 1.4 2004/01/16 13:28:23 kls Exp $
+ * $Id: i18n.c 1.5 2006/02/04 10:51:41 kls Exp $
  */
 
 #include "i18n.h"
@@ -26,6 +26,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "������!",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Ahoj",
   },
   { "Hello world!",
     "Hallo Welt!",
@@ -44,6 +48,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "���������� ���!",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Ahoj sv�te!",
   },
   { "Howdy folks!",
     "Tach zusammen!",
@@ -62,6 +70,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "��� ���������?",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Nazdar vespolek!",
   },
   { "A friendly greeting",
     "Ein freundlicher Gru�",
@@ -80,6 +92,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "��������� �����������",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "P��telsk� pozdrav",
   },
   { "Greeting time (s)",
     "Dauer des Gru�es (s)",
@@ -98,6 +114,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "����������������� �����������",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "�as pozdravu (s)",
   },
   { "Use alternate greeting",
     "Alternativen Gru� verwenden",
@@ -116,6 +136,10 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "�������������� �����������",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Pou��t alternativn� pozdrav",
   },
   { NULL }
   };
diff --git a/channels.conf b/channels.conf
index f1fdbc9dc..54550c4c2 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,3 +1,5 @@
+: first line
+: second line
 RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
 ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
@@ -13,10 +15,10 @@ S
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320:0:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:0:13001:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu,502=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
@@ -28,7 +30,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -45,14 +47,14 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1801,1722,1702:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1:9:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1722,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
@@ -113,14 +115,14 @@ ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:
 Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0
-Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;686=eng:582:960,961:4303:2:2007:0
-Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,667=NAR;687=eng:583:960,961:4302:2:2007:0
-Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;688=eng:584:960,961:4403:2:2007:0
+Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;666=eng:582:960,961:4303:2:2007:0
+Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,655=NAR;667=eng:583:960,961:4302:2:2007:0
+Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;668=eng:584:960,961:4403:2:2007:0
 Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4402:2:2011:0
 Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4503:2:2011:0
 Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4502:2:2011:0
 Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4603:2:2030:0
-Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:5502:2:2007:0
+Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,666=NAR:582:960,961:4602:2:2030:0
 Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:4809:2:2030:0
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
diff --git a/config.h b/config.h
index 9920d00b2..187767feb 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.242 2006/01/27 13:27:41 kls Exp $
+ * $Id: config.h 1.243 2006/01/29 17:24:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.41"
-#define VDRVERSNUM   10341  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.42"
+#define VDRVERSNUM   10342  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index 6d3a152da..cb5afd398 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.12 2006/01/27 13:45:00 kls Exp $
+ * $Id: cutter.c 1.14 2006/02/05 11:06:47 kls Exp $
  */
 
 #include "cutter.h"
@@ -66,6 +66,8 @@ void cCuttingThread::Action(void)
      toFile = toFileName->Open();
      if (!fromFile || !toFile)
         return;
+     fromFile->SetReadAhead(MEGABYTE(20));
+     toFile->SetReadAhead(MEGABYTE(20));
      int Index = Mark->position;
      Mark = fromMarks.Next(Mark);
      int FileSize = 0;
@@ -90,6 +92,7 @@ void cCuttingThread::Action(void)
            if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
               if (FileNumber != CurrentFileNumber) {
                  fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
+                 fromFile->SetReadAhead(MEGABYTE(20));
                  CurrentFileNumber = FileNumber;
                  }
               if (fromFile) {
diff --git a/device.c b/device.c
index 0f19e3b1f..6a03ade07 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.121 2006/01/08 11:39:37 kls Exp $
+ * $Id: device.c 1.123 2006/02/04 14:58:24 kls Exp $
  */
 
 #include "device.h"
@@ -924,12 +924,17 @@ bool cDevice::Replaying(void) const
   return player != NULL;
 }
 
+bool cDevice::Transferring(void) const
+{
+  return dynamic_cast<cTransfer *>(player) != NULL;
+}
+
 bool cDevice::AttachPlayer(cPlayer *Player)
 {
   if (CanReplay()) {
      if (player)
         Detach(player);
-     if (!dynamic_cast<cTransfer *>(Player))
+     if (!Transferring())
         ClrAvailableTracks();
      pesAssembler->Reset();
      player = Player;
@@ -977,7 +982,7 @@ int cDevice::PlayVideo(const uchar *Data, int Length)
   return -1;
 }
 
-int cDevice::PlayAudio(const uchar *Data, int Length)
+int cDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
   return -1;
 }
@@ -1000,7 +1005,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
           case 0xC0 ... 0xDF: // audio
                SetAvailableTrack(ttAudio, c - 0xC0, c);
                if (!VideoOnly && c == availableTracks[currentAudioTrack].id) {
-                  w = PlayAudio(Start, d);
+                  w = PlayAudio(Start, d, c);
                   if (FirstLoop)
                      Audios.PlayAudio(Data, Length, c);
                   }
@@ -1026,7 +1031,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                       if (Setup.UseDolbyDigital) {
                          SetAvailableTrack(ttDolby, SubStreamIndex, SubStreamId);
                          if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
-                            w = PlayAudio(Start, d);
+                            w = PlayAudio(Start, d, SubStreamId);
                             if (FirstLoop)
                                Audios.PlayAudio(Data, Length, SubStreamId);
                             }
@@ -1035,7 +1040,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                  case 0xA0: // LPCM
                       SetAvailableTrack(ttAudio, SubStreamIndex, SubStreamId);
                       if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
-                         w = PlayAudio(Start, d);
+                         w = PlayAudio(Start, d, SubStreamId);
                          if (FirstLoop)
                             Audios.PlayAudio(Data, Length, SubStreamId);
                          }
diff --git a/device.h b/device.h
index eb409f9c4..e6e436b25 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.70 2006/01/08 10:10:26 kls Exp $
+ * $Id: device.h 1.72 2006/02/04 14:22:08 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -424,9 +424,10 @@ class cDevice : public cThread {
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
        ///< \return Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
-  virtual int PlayAudio(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
        ///< Plays the given data block as audio.
        ///< Data points to exactly one complete PES packet of the given Length.
+       ///< Id indicates the type of audio data this packet holds.
        ///< PlayAudio() shall process the packet either as a whole (returning
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
        ///< \return Returns the number of bytes actually taken from Data, or -1
@@ -483,6 +484,8 @@ class cDevice : public cThread {
        ///< guaranteed to always receive complete PES packets.
   bool Replaying(void) const;
        ///< Returns true if we are currently replaying.
+  bool Transferring(void) const;
+       ///< Returns true if we are currently in Transfer Mode.
   void StopReplay(void);
        ///< Stops the current replay session (if any).
   bool AttachPlayer(cPlayer *Player);
diff --git a/dvbdevice.c b/dvbdevice.c
index ee8c6235c..f5f5f4e29 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.151 2006/01/28 15:37:01 kls Exp $
+ * $Id: dvbdevice.c 1.152 2006/02/04 10:21:51 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1169,7 +1169,7 @@ int cDvbDevice::PlayVideo(const uchar *Data, int Length)
   return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
-int cDvbDevice::PlayAudio(const uchar *Data, int Length)
+int cDvbDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
   return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index cc9d126a4..ac84a946f 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.37 2005/12/29 13:33:12 kls Exp $
+ * $Id: dvbdevice.h 1.38 2006/02/04 10:21:51 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -119,7 +119,7 @@ class cDvbDevice : public cDevice {
   virtual bool CanReplay(void) const;
   virtual bool SetPlayMode(ePlayMode PlayMode);
   virtual int PlayVideo(const uchar *Data, int Length);
-  virtual int PlayAudio(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
 public:
   virtual int64_t GetSTC(void);
   virtual void TrickSpeed(int Speed);
diff --git a/epg.c b/epg.c
index d69158e29..efc5455fa 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.57 2006/01/29 14:17:33 kls Exp $
+ * $Id: epg.c 1.58 2006/02/03 13:16:54 kls Exp $
  */
 
 #include "epg.h"
@@ -321,7 +321,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                              }
                           }
                        break;
-             case 'e': if (!Event->Title())
+             case 'e': if (Event && !Event->Title())
                           Event->SetTitle(tr("No title"));
                        Event = NULL;
                        break;
diff --git a/font.c b/font.c
index 6269f2b5d..87440d28f 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.11 2005/01/14 13:25:35 kls Exp $
+ * $Id: font.c 1.12 2006/02/05 13:49:10 kls Exp $
  */
 
 #include "config.h"
@@ -35,9 +35,10 @@
 #include "fontfix-iso8859-15.c"
 #include "fontosd-iso8859-15.c"
 #include "fontsml-iso8859-15.c"
+
 // --- cFont -----------------------------------------------------------------
 
-static void *FontData[eDvbCodeSize][eDvbFontSize] = {
+static const void *const FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_1,  FontFix_iso8859_1,  FontSml_iso8859_1 },
   { FontOsd_iso8859_2,  FontFix_iso8859_2,  FontSml_iso8859_2 },
   { FontOsd_iso8859_5,  FontFix_iso8859_5,  FontSml_iso8859_5 },
@@ -58,12 +59,12 @@ static const char *FontCode[eDvbCodeSize] = {
 eDvbCode cFont::code = code_iso8859_1;
 cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
-cFont::cFont(void *Data)
+cFont::cFont(const void *Data)
 {
   SetData(Data);
 }
 
-void cFont::SetData(void *Data)
+void cFont::SetData(const void *Data)
 {
   if (Data) {
      height = ((tCharData *)Data)->height;
@@ -112,7 +113,7 @@ void cFont::SetCode(eDvbCode Code)
      }
 }
 
-void cFont::SetFont(eDvbFont Font, void *Data)
+void cFont::SetFont(eDvbFont Font, const void *Data)
 {
   delete fonts[Font];
   fonts[Font] = new cFont(Data ? Data : FontData[code][Font]);
diff --git a/font.h b/font.h
index b5a21a3a8..2a1042942 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.11 2005/03/19 15:51:19 kls Exp $
+ * $Id: font.h 1.12 2006/02/05 13:46:36 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -43,9 +43,9 @@ class cFont {
   const tCharData *data[NUMCHARS];
   int height;
 public:
-  cFont(void *Data);
+  cFont(const void *Data);
   virtual ~cFont() {}
-  void SetData(void *Data);
+  void SetData(const void *Data);
   virtual int Width(unsigned char c) const { return data[c]->width; }
       ///< Returns the width of the given character.
   virtual int Width(const char *s) const;
@@ -59,7 +59,7 @@ class cFont {
   const tCharData *CharData(unsigned char c) const { return data[c]; }
   static bool SetCode(const char *Code);
   static void SetCode(eDvbCode Code);
-  static void SetFont(eDvbFont Font, void *Data = NULL);
+  static void SetFont(eDvbFont Font, const void *Data = NULL);
   static const cFont *GetFont(eDvbFont Font);
   };
 
diff --git a/fontfix-iso8859-1.c b/fontfix-iso8859-1.c
index 9b806ca48..42a4c992b 100644
--- a/fontfix-iso8859-1.c
+++ b/fontfix-iso8859-1.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix_iso8859_1[][28] = {
+static const cFont::tPixelData FontFix_iso8859_1[][28] = {
   {             // 32
      15, 26,
      0x00000000,  // ...............
diff --git a/fontfix-iso8859-13.c b/fontfix-iso8859-13.c
index f6b3abea3..f42be8dd2 100644
--- a/fontfix-iso8859-13.c
+++ b/fontfix-iso8859-13.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix_iso8859_13[][28] = {
+static const cFont::tPixelData FontFix_iso8859_13[][28] = {
   {             // 32
      15, 26,
      0x00000000,  // ...............
diff --git a/fontfix-iso8859-15.c b/fontfix-iso8859-15.c
index 25a1efa93..c4c5aa078 100644
--- a/fontfix-iso8859-15.c
+++ b/fontfix-iso8859-15.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix_iso8859_15[][28] = {
+static const cFont::tPixelData FontFix_iso8859_15[][28] = {
   {             // 32
      15, 26,
      0x00000000,  // ...............
diff --git a/fontfix-iso8859-2.c b/fontfix-iso8859-2.c
index e27bbdff5..c5862d715 100644
--- a/fontfix-iso8859-2.c
+++ b/fontfix-iso8859-2.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix_iso8859_2[][28] = {
+static const cFont::tPixelData FontFix_iso8859_2[][28] = {
   {             // 32
      15, 26,
      0x00000000,  // ...............
diff --git a/fontfix-iso8859-5.c b/fontfix-iso8859-5.c
index e8cb4e5c7..b9939c951 100644
--- a/fontfix-iso8859-5.c
+++ b/fontfix-iso8859-5.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix_iso8859_5[][26] = {
+static const cFont::tPixelData FontFix_iso8859_5[][26] = {
   {             // 32
      15, 24,
      0x00000000,  // ...............
diff --git a/fontfix-iso8859-7.c b/fontfix-iso8859-7.c
index 5ba6da9ac..3ef21c222 100644
--- a/fontfix-iso8859-7.c
+++ b/fontfix-iso8859-7.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontFix_iso8859_7[][26] = {
+static const cFont::tPixelData FontFix_iso8859_7[][26] = {
   {             // 32
      11, 24,
      0x00000000,  // ...........
diff --git a/fontosd-iso8859-1.c b/fontosd-iso8859-1.c
index f2d2ced11..67e286d2d 100644
--- a/fontosd-iso8859-1.c
+++ b/fontosd-iso8859-1.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontOsd_iso8859_1[][29] = {
+static const cFont::tPixelData FontOsd_iso8859_1[][29] = {
   {             // 32
      6, 27,
      0x00000000,  // ......
diff --git a/fontosd-iso8859-13.c b/fontosd-iso8859-13.c
index 1179ebab7..29a5d7894 100644
--- a/fontosd-iso8859-13.c
+++ b/fontosd-iso8859-13.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontOsd_iso8859_13[][29] = {
+static const cFont::tPixelData FontOsd_iso8859_13[][29] = {
   {             // 32
      6, 27,
      0x00000000,  // ......
diff --git a/fontosd-iso8859-15.c b/fontosd-iso8859-15.c
index ee2d3b5c5..f3008b7e4 100644
--- a/fontosd-iso8859-15.c
+++ b/fontosd-iso8859-15.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontOsd_iso8859_15[][29] = {
+static const cFont::tPixelData FontOsd_iso8859_15[][29] = {
   {             // 32
      6, 27,
      0x00000000,  // ......
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index e61e9a876..c5f664080 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -1,4 +1,3 @@
-
 /*
  * iso8859-2 modified iso8859-1 (Drazen Dupor 23.05.2004).
  *
@@ -10,7 +9,7 @@
  *
  */
 
-cFont::tPixelData FontOsd_iso8859_2[][29] = {
+static const cFont::tPixelData FontOsd_iso8859_2[][29] = {
   {             // 32
      6, 27,
      0x00000000,  // ......
diff --git a/fontosd-iso8859-5.c b/fontosd-iso8859-5.c
index a8de8fdf0..d155a3289 100644
--- a/fontosd-iso8859-5.c
+++ b/fontosd-iso8859-5.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontOsd_iso8859_5[][24] = {
+static const cFont::tPixelData FontOsd_iso8859_5[][24] = {
   {             // 32
      6, 22,
      0x00000000,  // ......
diff --git a/fontosd-iso8859-7.c b/fontosd-iso8859-7.c
index ef49b326c..4fd47fbdb 100644
--- a/fontosd-iso8859-7.c
+++ b/fontosd-iso8859-7.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontOsd_iso8859_7[][27] = {
+static const cFont::tPixelData FontOsd_iso8859_7[][27] = {
   {             // 32
      12, 25,
      0x00000000,  // ............
diff --git a/fontsml-iso8859-1.c b/fontsml-iso8859-1.c
index d9c80a0a3..028d1521a 100644
--- a/fontsml-iso8859-1.c
+++ b/fontsml-iso8859-1.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontSml_iso8859_1[][24] = {
+static const cFont::tPixelData FontSml_iso8859_1[][24] = {
   {             // 32
      5, 22,
      0x00000000,  // .....
diff --git a/fontsml-iso8859-13.c b/fontsml-iso8859-13.c
index 061b5cce0..738816a72 100644
--- a/fontsml-iso8859-13.c
+++ b/fontsml-iso8859-13.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontSml_iso8859_13[][24] = {
+static const cFont::tPixelData FontSml_iso8859_13[][24] = {
   {             // 32
      5, 22,
      0x00000000,  // .....
diff --git a/fontsml-iso8859-15.c b/fontsml-iso8859-15.c
index 55776d2fe..27333bd4f 100644
--- a/fontsml-iso8859-15.c
+++ b/fontsml-iso8859-15.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontSml_iso8859_15[][24] = {
+static const cFont::tPixelData FontSml_iso8859_15[][24] = {
   {             // 32
      5, 22,
      0x00000000,  // .....
diff --git a/fontsml-iso8859-2.c b/fontsml-iso8859-2.c
index 9f09d3bbc..af1d8a8b6 100644
--- a/fontsml-iso8859-2.c
+++ b/fontsml-iso8859-2.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontSml_iso8859_2[][25] = {
+static const cFont::tPixelData FontSml_iso8859_2[][25] = {
   {             // 32
      5, 23,
      0x00000000,  // .....
diff --git a/fontsml-iso8859-5.c b/fontsml-iso8859-5.c
index f7b57d321..786b07036 100644
--- a/fontsml-iso8859-5.c
+++ b/fontsml-iso8859-5.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontSml_iso8859_5[][27] = {
+static const cFont::tPixelData FontSml_iso8859_5[][27] = {
   {             // 32
      5, 25,
      0x00000000,  // .....
diff --git a/fontsml-iso8859-7.c b/fontsml-iso8859-7.c
index cd8d6935c..a95f8f10d 100644
--- a/fontsml-iso8859-7.c
+++ b/fontsml-iso8859-7.c
@@ -1,4 +1,4 @@
-cFont::tPixelData FontSml_iso8859_7[][22] = {
+static const cFont::tPixelData FontSml_iso8859_7[][22] = {
   {             // 32
      9, 20,
      0x00000000,  // .........
diff --git a/genfontfile.c b/genfontfile.c
index 9189167e1..9dc6bce4e 100644
--- a/genfontfile.c
+++ b/genfontfile.c
@@ -371,7 +371,7 @@ main(int argc, char *argv[])
     exit(1);
   }
 
-  printf("%s[][%d] = {\n", varname, fontinfo->max_ascent + fontinfo->max_descent + 2);
+  printf("static const %s[][%d] = {\n", varname, fontinfo->max_ascent + fontinfo->max_descent + 2);
   for (c = 32; c < 256; c++) {
       getMetric(fontinfo, c, &tgi);
       printGlyph(fontinfo, c);
diff --git a/i18n.c b/i18n.c
index c061a1abf..ad9b797e4 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.244 2006/01/28 10:38:33 kls Exp $
+ * $Id: i18n.c 1.247 2006/02/04 14:17:54 kls Exp $
  *
  * Translations provided by:
  *
@@ -26,6 +26,7 @@
  * Croatian    Drazen Dupor <drazen.dupor@dupor.com>, Dino Ravnic <dino.ravnic@fer.hr>
  * Estonian    Arthur Konovalov <kasjas@hot.ee>
  * Danish      Mogens Elneff <mogens@elneff.dk>
+ * Czech       Vladim�r B�rta <vladimir.barta@k2atmitec.cz>
  *
  */
 
@@ -101,6 +102,7 @@ const tI18nPhrase Phrases[] = {
     "Hrvatski",
     "Eesti",
     "Dansk",
+    "�esky", //Czech
   },
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-15",
@@ -123,6 +125,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-2",
     "iso8859-13",
     "iso8859-1",
+    "iso8859-2",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
   { "eng,dos",
@@ -145,6 +148,7 @@ const tI18nPhrase Phrases[] = {
     "hrv",
     "est",
     "dan",
+    "cze,ces",
   },
   // Menu titles:
   { "VDR",
@@ -167,6 +171,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -188,6 +193,7 @@ const tI18nPhrase Phrases[] = {
     "Raspored",
     "Kava",
     "Programoversigt",
+    "Program (EPG)",
   },
   { "Channels",
     "Kan�le",
@@ -209,6 +215,7 @@ const tI18nPhrase Phrases[] = {
     "Programi",
     "Kanalid",
     "Kanaler",
+    "Kan�ly",
   },
   { "Timers",
     "Timer",
@@ -230,6 +237,7 @@ const tI18nPhrase Phrases[] = {
     "Termini",
     "Taimer",
     "Timere",
+    "�asova�e",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -251,6 +259,7 @@ const tI18nPhrase Phrases[] = {
     "Snimke",
     "Salvestused",
     "Optagelser",
+    "Nahr�vky",
   },
   { "Recording info",
     "Aufzeichnung",
@@ -272,6 +281,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Salvestuse info",
     "Optagelses info",
+    "Detail nahr�vky",
   },
   { "Setup",
     "Einstellungen",
@@ -293,6 +303,7 @@ const tI18nPhrase Phrases[] = {
     "Konfiguracija",
     "S�tted",
     "Indstillinger",
+    "Nastaven�",
   },
   { "Commands",
     "Befehle",
@@ -314,6 +325,7 @@ const tI18nPhrase Phrases[] = {
     "Naredbe",
     "K�sud",
     "Kommandoer",
+    "P��kazy",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -335,6 +347,7 @@ const tI18nPhrase Phrases[] = {
     "Naredbe za snimanje",
     "Salvestuse k�sud",
     "Optage kommandoer",
+    "P��kazy nahr�v�n�",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -356,6 +369,7 @@ const tI18nPhrase Phrases[] = {
     "Ure�ivanje programa",
     "Kanali muutmine",
     "Rediger kanal",
+    "Editace kan�lu",
   },
   { "Edit timer",
     "Timer editieren",
@@ -377,6 +391,7 @@ const tI18nPhrase Phrases[] = {
     "Ure�ivanje termina",
     "Taimeri muutmine",
     "Rediger timer",
+    "Editace �asova�e",
   },
   { "Event",
     "Sendung",
@@ -398,6 +413,7 @@ const tI18nPhrase Phrases[] = {
     "Emisija",
     "S�ndmus",
     "Udsendelse",
+    "Ud�lost",
   },
   { "Info",
     "Info",
@@ -419,6 +435,7 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "Info",
     "Info",
+    "Info",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -440,6 +457,7 @@ const tI18nPhrase Phrases[] = {
     "Raspored - %s",
     "Ajakava - %s",
     "Program - %s",
+    "Program - %s",
   },
   { "This event - %s",
     "Diese Sendung - %s",
@@ -461,6 +479,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "See s�ndmus - %s",
     "Denne udsendelse - %s",
+    "Tato ud�lost - %s",
   },
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
@@ -482,6 +501,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "See s�ndmus - k�ik kanalid",
     "Denne udsendelse - alle kanaler",
+    "Tato ud�lost - v�echny kan�ly",
   },
   { "All events - all channels",
     "Alle Sendungen - alle Kan�le",
@@ -503,6 +523,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "K�ik s�ndmused - k�ik kanalid",
     "Alle udsendelser - alle kanaler",
+    "V�echny ud�lost - v�echny kan�ly",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -524,6 +545,7 @@ const tI18nPhrase Phrases[] = {
     "�to je trenutno na programu?",
     "Hetkel eetris",
     "Hvad vises nu?",
+    "Aktu�ln� program",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -545,6 +567,7 @@ const tI18nPhrase Phrases[] = {
     "�to slijedi?",
     "J�rgmisena eetris",
     "Hvad vises som det n�ste?",
+    "N�sleduj�c� program",
   },
   { "Summary",
     "Inhalt",
@@ -566,6 +589,7 @@ const tI18nPhrase Phrases[] = {
     "Sadr�aj",
     "�levaade",
     "Omtale",
+    "Obsah",
   },
   // Button texts (should not be more than 10 characters!):
   { "Button$Edit",
@@ -588,6 +612,7 @@ const tI18nPhrase Phrases[] = {
     "Promijeni",
     "Muuda",
     "Rediger",
+    "Editace",
   },
   { "Button$New",
     "Neu",
@@ -609,6 +634,7 @@ const tI18nPhrase Phrases[] = {
     "Novi",
     "Uus",
     "Ny",
+    "Nov�",
   },
   { "Button$Delete",
     "L�schen",
@@ -630,6 +656,7 @@ const tI18nPhrase Phrases[] = {
     "Obri�i",
     "Kustuta",
     "Slet",
+    "Smazat",
   },
   { "Button$Mark",
     "Markieren",
@@ -651,6 +678,7 @@ const tI18nPhrase Phrases[] = {
     "Ozna�i",
     "Siirda",
     "Mark�r",
+    "Ozna�it",
   },
   { "Button$On/Off",
     "Ein/Aus",
@@ -672,6 +700,7 @@ const tI18nPhrase Phrases[] = {
     "De-/Aktiviraj",
     "On/Off",
     "Til/Fra",
+    "Zap./Vyp.",
   },
   { "Timer",
     "Timer",
@@ -682,7 +711,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "Ajastin",
-    "Timer",// TODO
+    "Timer",
     "Programa",
     "",// TODO
     "",// TODO
@@ -693,6 +722,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Taimer",
     "Timer",
+    "�asova�",
   },
   { "Button$Record",
     "Aufnehmen",
@@ -714,6 +744,7 @@ const tI18nPhrase Phrases[] = {
     "Snimi",
     "Salvesta",
     "Optag",
+    "Nahr�t",
   },
   { "Button$Play",
     "Wiedergabe",
@@ -735,6 +766,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Start",
     "Afspil",
+    "P�ehr�t",
   },
   { "Button$Pause",
     "Pause",
@@ -756,6 +788,7 @@ const tI18nPhrase Phrases[] = {
     "Pauza",
     "Paus",
     "Pause",
+    "Zastavit",
   },
   { "Button$Rewind",
     "Anfang",
@@ -777,6 +810,7 @@ const tI18nPhrase Phrases[] = {
     "Na po�etak",
     "Algusesse",
     "Forfra",
+    "Na za��tek",
   },
   { "Button$Stop",
     "Beenden",
@@ -798,6 +832,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "Stopp",
     "Stop",
+    "Ukon�it",
   },
   { "Button$Resume",
     "Weiter",
@@ -819,6 +854,7 @@ const tI18nPhrase Phrases[] = {
     "Nastavi",
     "J�tka",
     "Forts�t",
+    "Pokra�ovat",
   },
   { "Button$Open",
     "�ffnen",
@@ -840,6 +876,7 @@ const tI18nPhrase Phrases[] = {
     "Otvori",
     "Ava",
     "�bn",
+    "Otev��t",
   },
   { "Button$Switch",
     "Umschalten",
@@ -861,6 +898,7 @@ const tI18nPhrase Phrases[] = {
     "Prebaci",
     "Vali",
     "Skift",
+    "P�epnout",
   },
   { "Button$Now",
     "Jetzt",
@@ -882,6 +920,7 @@ const tI18nPhrase Phrases[] = {
     "Trenutno",
     "N��d",
     "Nu",
+    "Nyn�",
   },
   { "Button$Next",
     "N�chste",
@@ -903,6 +942,7 @@ const tI18nPhrase Phrases[] = {
     "Slijedi",
     "Tulekul",
     "N�ste",
+    "Dal��",
   },
   { "Button$Schedule",
     "Programm",
@@ -924,6 +964,7 @@ const tI18nPhrase Phrases[] = {
     "Raspored",
     "Ajakava",
     "Program",
+    "Program",
   },
   { "Button$ABC/abc",
     "ABC/abc",
@@ -945,6 +986,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
+    "ABC/abc",
   },
   { "Button$Insert",
     "Einf�gen",
@@ -966,6 +1008,7 @@ const tI18nPhrase Phrases[] = {
     "Umetni",
     "Lisa (INS)",
     "Inds�t",
+    "Vlo�it",
   },
   { "Button$Overwrite",
     "�berschreiben",
@@ -987,6 +1030,7 @@ const tI18nPhrase Phrases[] = {
     "Prepi�i",
     "Asenda (OVR)",
     "Overskriv",
+    "P�epsat",
   },
   { "Button$Menu",
     "Men�",
@@ -1008,6 +1052,7 @@ const tI18nPhrase Phrases[] = {
     "Izbor",
     "Men��",
     "Menu",
+    "Menu",
   },
   { "Button$Reset",
     "Reset",
@@ -1029,6 +1074,7 @@ const tI18nPhrase Phrases[] = {
     "Reset",
     "Nullimine",
     "Nulstille",
+    "Reset",
   },
   { "Button$Scan",
     "Scan",
@@ -1050,6 +1096,7 @@ const tI18nPhrase Phrases[] = {
     "Pretra�i",
     "Uuenda",
     "Skan",
+    "Sn�mat",
   },
   { "Button$Audio",
     "Audio",
@@ -1071,6 +1118,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Audio",
     "Audio",
+    "Zvuk",
   },
   // Confirmations:
   { "Delete channel?",
@@ -1093,6 +1141,7 @@ const tI18nPhrase Phrases[] = {
     "Obrisati program?",
     "Kustutan kanali?",
     "Slet kanal?",
+    "Smazat kan�l?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -1114,6 +1163,7 @@ const tI18nPhrase Phrases[] = {
     "Obrisati termin?",
     "Kustutan taimeri?",
     "Slet timer?",
+    "Smazat �asova�?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -1135,6 +1185,7 @@ const tI18nPhrase Phrases[] = {
     "Obrisati snimku?",
     "Kustutan salvestuse?",
     "Slet optagelse?",
+    "Smazat nahr�vku?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -1156,6 +1207,7 @@ const tI18nPhrase Phrases[] = {
     "Jo� snimam - zaista obrisati?",
     "Salvestus aktiivne - kustutan?",
     "Timerstyret optagelse i gang - slet alligevel?",
+    "Prob�h� nahr�v�n� - opravdu smazat?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -1177,6 +1229,7 @@ const tI18nPhrase Phrases[] = {
     "Zaustaviti snimanje?",
     "L�petan salvestamise?",
     "Stop optagelse?",
+    "Ukon�it nahr�v�n�?",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -1198,6 +1251,7 @@ const tI18nPhrase Phrases[] = {
     "Otkazati ure�ivanje?",
     "T�histan muudatuse?",
     "Afbryd redigering?",
+    "Zru�it editaci?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -1219,6 +1273,7 @@ const tI18nPhrase Phrases[] = {
     "Zaista ponovo pokrenuti?",
     "Restart?",
     "Vil du virkelig genstarte?",
+    "Opravdu restartovat?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -1240,6 +1295,7 @@ const tI18nPhrase Phrases[] = {
     "Snimanje traje - svejedno restart sistema?",
     "Salvestamine aktiivne - restart?",
     "Optagelse igang - genstart alligevel?",
+    "Syst�m je zanepr�zdn�n - p�esto restartovat?",
   },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
@@ -1261,6 +1317,7 @@ const tI18nPhrase Phrases[] = {
     "Snimanje traje - svejedno isklju�iti?",
     "Salvestamine aktiivne - l�litan v�lja?",
     "Optagelse igang - sluk alligevel?",
+    "Syst�m je zanepr�zdn�n - p�esto vypnout?",
   },
   { "Recording in %d minutes, shut down anyway?",
     "Aufnahme in %d Minuten - trotzdem ausschalten?",
@@ -1282,6 +1339,7 @@ const tI18nPhrase Phrases[] = {
     "Snimanje za %d minuta - svejedno isklju�iti?",
     "Salvestamine algab %d minuti p�rast - l�litan v�lja?",
     "Optagelse om %d minutter - sluk alligevel?",
+    "Nahr�v�n� za�ne za %d minut - p�esto vypnout?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken, um Shutdown abzubrechen",
@@ -1303,6 +1361,7 @@ const tI18nPhrase Phrases[] = {
     "Pritisnite tipku ako ne �elite ugasiti sistem",
     "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks",
     "Tryk vilk�rlig tast for at annullere sluk",
+    "Jak�koliv kl�vesa zru�� vypnut�",
   },
   // Channel parameters:
   { "Name",
@@ -1325,6 +1384,7 @@ const tI18nPhrase Phrases[] = {
     "Naziv",
     "Nimi",
     "Navn",
+    "N�zev",
   },
   { "Frequency",
     "Frequenz",
@@ -1346,6 +1406,7 @@ const tI18nPhrase Phrases[] = {
     "Frekvencija",
     "Sagedus",
     "Frekvens",
+    "Frekvence",
   },
   { "Polarization",
     "Polarisation",
@@ -1367,6 +1428,7 @@ const tI18nPhrase Phrases[] = {
     "Polarizacija",
     "Polarisatsioon",
     "Polarisation",
+    "Polarizace",
   },
   { "Source",
     "Quelle",
@@ -1388,6 +1450,7 @@ const tI18nPhrase Phrases[] = {
     "Izvor",
     "Allikas",
     "Kilde",
+    "Zdroj",
   },
   { "Srate",
     "Srate",
@@ -1409,6 +1472,7 @@ const tI18nPhrase Phrases[] = {
     "Srate", // hrv
     "Srate",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -1430,6 +1494,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "Vpid",
+    "Vpid",
   },
   { "Ppid",
     "Ppid",
@@ -1451,6 +1516,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
+    "Ppid",
   },
   { "Apid1",
     "Apid1",
@@ -1472,6 +1538,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1", // hrv
     "Apid1",
     "Apid1",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -1493,6 +1560,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2", // hrv
     "Apid2",
     "Apid2",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -1514,6 +1582,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1", // hrv
     "Dpid1",
     "Dpid1",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -1535,6 +1604,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2", // hrv
     "Dpid2",
     "Dpid2",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -1556,6 +1626,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid", // hrv
     "Tpid",
     "Tpid",
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -1577,6 +1648,7 @@ const tI18nPhrase Phrases[] = {
     "Kodiranje (CA)",
     "CA",
     "CA",
+    "CA",
   },
   { "Free To Air",
     "frei empfangbar",
@@ -1590,7 +1662,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "en abierto",
     "",//TODO
-    "Otwarta transmisja",
+    "otwarty przekaz",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1598,6 +1670,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "FTA",
     "Free To Air",
+    "voln�",
   },
   { "encrypted",
     "verschl�sselt",
@@ -1619,6 +1692,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "kr�ptitud",
     "kodet",
+    "k�dovan�",
   },
   { "Sid",
     "Sid",
@@ -1640,6 +1714,7 @@ const tI18nPhrase Phrases[] = {
     "Sid", // hrv
     "Sid",
     "Sid",
+    "Sid",
   },
   { "Inversion",
     "Inversion",
@@ -1661,6 +1736,7 @@ const tI18nPhrase Phrases[] = {
     "Inverzija",
     "Inversioon",
     "Inversion",
+    "Inversion",
   },
   { "Bandwidth",
     "Bandwidth",
@@ -1682,6 +1758,7 @@ const tI18nPhrase Phrases[] = {
     "Bandwidth", // hrv "Pojasna �irina",
     "Ribalaius",
     "B�ndbredde",
+    "���ka p�sma",
   },
   { "CoderateH",
     "CoderateH",
@@ -1703,6 +1780,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH", // hrv
     "CoderateH",
     "CoderateH",
+    "CoderateH",
   },
   { "CoderateL",
     "CoderateL",
@@ -1724,6 +1802,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL", // hrv
     "CoderateL",
     "CoderateL",
+    "CoderateL",
   },
   { "Modulation",
     "Modulation",
@@ -1745,6 +1824,7 @@ const tI18nPhrase Phrases[] = {
     "Modulacija",
     "Modulatsioon",
     "Modulation",
+    "Modulace",
   },
   { "Transmission",
     "Transmission",
@@ -1766,6 +1846,7 @@ const tI18nPhrase Phrases[] = {
     "Prijenos",
     "Transmissioon",
     "Transmission",
+    "P�enos",
   },
   { "Guard",
     "Guard",
@@ -1787,6 +1868,7 @@ const tI18nPhrase Phrases[] = {
     "Za�tita",
     "Guard",
     "Guard",
+    "Guard",
   },
   { "Hierarchy",
     "Hierarchy",
@@ -1808,6 +1890,7 @@ const tI18nPhrase Phrases[] = {
     "Hijerarhija",
     "Hierarhia",
     "Hierarki",
+    "Hierarchy",
   },
   // Timer parameters:
   { "Active",
@@ -1830,6 +1913,7 @@ const tI18nPhrase Phrases[] = {
     "Aktivan",
     "Aktiivne",
     "Aktiv",
+    "Aktivn�",
   },
   { "Channel",
     "Kanal",
@@ -1851,6 +1935,7 @@ const tI18nPhrase Phrases[] = {
     "Program",
     "Kanal",
     "Kanal",
+    "Kan�l",
   },
   { "Day",
     "Tag",
@@ -1872,6 +1957,7 @@ const tI18nPhrase Phrases[] = {
     "Dan",
     "P�ev",
     "Dag",
+    "Den",
   },
   { "Start",
     "Anfang",
@@ -1893,6 +1979,7 @@ const tI18nPhrase Phrases[] = {
     "Po�etak",
     "Start",
     "Start",
+    "Za��tek",
   },
   { "Stop",
     "Ende",
@@ -1914,6 +2001,7 @@ const tI18nPhrase Phrases[] = {
     "Kraj",
     "Stopp",
     "Stop",
+    "Konec",
   },
   { "VPS",
     "VPS",
@@ -1935,6 +2023,7 @@ const tI18nPhrase Phrases[] = {
     "VPS", // hrv
     "VPS",
     "VPS",
+    "VPS",
   },
   { "Priority",
     "Priorit�t",
@@ -1956,6 +2045,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritet",
     "Prioriteet",
     "Prioritet",
+    "Priorita",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -1977,6 +2067,7 @@ const tI18nPhrase Phrases[] = {
     "Trajanje",
     "Eluiga",
     "Levetid",
+    "�ivotnost",
   },
   { "File",
     "Datei",
@@ -1998,6 +2089,7 @@ const tI18nPhrase Phrases[] = {
     "Datoteka",
     "Fail",
     "Fil",
+    "Soubor",
   },
   { "First day",
     "Erster Tag",
@@ -2019,6 +2111,7 @@ const tI18nPhrase Phrases[] = {
     "Prvi dan",
     "Esimene p�ev",
     "F�rste dag",
+    "Prvn� den",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -2041,6 +2134,7 @@ const tI18nPhrase Phrases[] = {
     "Program je trenutno zauzet terminom za snimanje",
     "Kanal on taimeri kasutuses!",
     "Kanal anvendes af en timer!",
+    "Kan�l je dr�en� �asova�em nahr�vek!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -2062,6 +2156,7 @@ const tI18nPhrase Phrases[] = {
     "Ne mogu prebaciti program!",
     "Kanali vahetus ei ole v�imalik!",
     "Kan ikke skifte kanal!",
+    "Kan�l nelze p�epnout!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -2083,6 +2178,7 @@ const tI18nPhrase Phrases[] = {
     "Snimanje po definiranom terminu!",
     "Taimeriga salvestamine aktiivne!",
     "Timer optager nu!",
+    "�asova� pr�v� nahr�v�!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -2104,6 +2200,7 @@ const tI18nPhrase Phrases[] = {
     "Gre�ka pri pristupanju snimke!",
     "Salvestuse taasesitus eba�nnestus!",
     "Fejl ved l�sning af optagelse!",
+    "Chyba p�i p��stupu k nahr�vk�m!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -2125,6 +2222,7 @@ const tI18nPhrase Phrases[] = {
     "Gre�ka pri brisanju snimke!",
     "Salvestuse kustutamine eba�nnestus!",
     "Fejl ved sletning af optagelse!",
+    "Chyba p�i maz�n� nahr�vky!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -2146,6 +2244,7 @@ const tI18nPhrase Phrases[] = {
     "*** Neispravan program ***",
     "*** Vigane kanal ***",
     "*** Ugyldig kanal! ***",
+    "*** Neplatn� kan�l ***",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -2167,6 +2266,7 @@ const tI18nPhrase Phrases[] = {
     "Nema slobodnog DVB ure�aja za snimanje!",
     "Puudub vaba DVB seade salvestamiseks!",
     "Ingen fri DVB enhed til optagelse!",
+    "��dn� DVB karta nen� voln� pro nahr�v�n�",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -2188,6 +2288,7 @@ const tI18nPhrase Phrases[] = {
     "Program nije dostupan!",
     "Kanal ei ole k�ttesaadav!",
     "Kanal er ikke tilg�ngelig!",
+    "Kan�l nen� dostupn�!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -2209,6 +2310,7 @@ const tI18nPhrase Phrases[] = {
     "Parametri programa nisu jednozna�ni!",
     "Kanaliseaded ei ole unikaalsed!",
     "Kanalindstillinger er ikke entydige!",
+    "Nastaven� kan�l� nejsou unik�tn�!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -2230,6 +2332,7 @@ const tI18nPhrase Phrases[] = {
     "Program blokiran (snimanje)!",
     "Kanal lukus (salvestamine aktiivne)!",
     "Kanal blokeret (optagelse i gang)",
+    "Kan�l je blokovan� (nahr�v� se)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -2251,6 +2354,7 @@ const tI18nPhrase Phrases[] = {
     "Ne mogu zapo�eti 'prijenosni' na�in!",
     "Siirdemooduse start eba�nnestus!",
     "Kan ikke starte Transfer Mode!",
+    "Nelze za��t s p�enosem",
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
@@ -2272,6 +2376,7 @@ const tI18nPhrase Phrases[] = {
     "Nijedna prekidna to�ka nije postavljena!",
     "Redigeerimise markerid puuduvad!",
     "Der er ikke sat nogen redigeringsm�rker!",
+    "Nejsou definov�ny edita�n� zna�ky!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -2293,6 +2398,7 @@ const tI18nPhrase Phrases[] = {
     "Ne mogu zapo�eti ure�ivanje!",
     "Redigeerimise start eba�nnestus!",
     "Kan ikke starte redigeringsprocessen!",
+    "Nelze za��t edita�n� proces!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -2314,6 +2420,7 @@ const tI18nPhrase Phrases[] = {
     "Ure�ivanje je ve� aktivirano!",
     "Redigeerimine juba aktiivne!",
     "Redigeringsproces er allerede aktiv!",
+    "Edita�n� proces je ji� aktivn�!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Shutdown unm�glich - Option '-s' fehlt!",
@@ -2335,6 +2442,7 @@ const tI18nPhrase Phrases[] = {
     "Ga�enje nemogu�e - nedostaje opcija '-s'!",
     "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!",
     "Kan ikke slukke - parameter '-s' ikke angivet!",
+    "Vypnut� nen� mo�n� - chb� volba '-s'!",
   },
   { "Not enough disk space to start recording!",
     "Nicht gen�gend Plattenplatz f�r Aufnahme!",
@@ -2345,7 +2453,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "Tallennustilan puute est�� tallennuksen!",
-    "",//TODO
+    "Brak miejsca na dysku do nagrywania!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2356,6 +2464,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Ebapiisavalt kettaruumi salvestamise alustamiseks!",
     "For lidt harddisk plads til optagelse!",
+    "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -2377,6 +2486,7 @@ const tI18nPhrase Phrases[] = {
     "Nedovoljno prostora na disku",
     "K�vaketas t�is!",
     "Kun lidt diskplads tilbage!",
+    "Disk bude brzy zapln�n!",
   },
   { "Opening CAM menu...",
     "CAM-Men� wird ge�ffnet...",
@@ -2398,6 +2508,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "CAM-men�� avamine...",
     "�bner CAM menu...",
+    "Otev�r� se menu CAM...",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -2419,6 +2530,7 @@ const tI18nPhrase Phrases[] = {
     "Ne mogu otvoriti CAM izbor!",
     "Ei saa avada CAM men��d!",
     "Kan ikke �bne CAM menuen!",
+    "Menu CAM nen� dostupn�",
   },
   { "Resetting CAM...",
     "CAM wird zur�ckgesetzt...",
@@ -2440,6 +2552,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "CAM mooduli taask�ivitus...",
     "Nulstiller CAM...",
+    "Restartuje se CAM...",
   },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
@@ -2461,6 +2574,7 @@ const tI18nPhrase Phrases[] = {
     "Ne mogu resetirati CAM",
     "CAM mooduli taask�ivitus eba�nnestus!",
     "Kan ikke nulstille CAM!",
+    "CAM modul nelze restartovat!",
   },
   { "CAM has been reset",
     "CAM wurde zur�ckgesetzt",
@@ -2482,6 +2596,7 @@ const tI18nPhrase Phrases[] = {
     "CAM je resetiran",
     "CAM mooduli taask�ivitus tehtud",
     "CAM er blevet nulstillet",
+    "CAM byl restartov�n",
   },
   { "Please enter %d digits!",
     "Bitte geben Sie %d Ziffern ein!",
@@ -2503,6 +2618,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Palun sisesta %d numbrit!",
     "Indtast venligst %d cifre!",
+    "Pros�m vlo�te %d znak�!",
   },
   { "No audio available!",
     "Kein Audio verf�gbar!",
@@ -2516,7 +2632,7 @@ const tI18nPhrase Phrases[] = {
     "D�wi�k nie jest dost�pny!",
     "�No hay audio disponible!",
     "�� ���������� ����",
-    "Ljud saknas!"
+    "Ljud saknas!",
     "Lipse�te sunetul!",
     "",//TODO
     "",//TODO
@@ -2524,6 +2640,7 @@ const tI18nPhrase Phrases[] = {
     "Audio nedostupan",
     "Audio k�ttesaamatu!",
     "Ingen lyd tilg�ngelig!",
+    "Zvuk nen� dostupn�!",
   },
   // Setup pages:
   { "OSD",
@@ -2546,6 +2663,7 @@ const tI18nPhrase Phrases[] = {
     "OSD",
     "Ekraanimen��",
     "OSD",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -2567,6 +2685,7 @@ const tI18nPhrase Phrases[] = {
     "Pregled emisija (EPG)",
     "EPG",
     "EPG",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -2588,6 +2707,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -2609,6 +2729,7 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "LNB",
   },
   { "CICAM",
     "CICAM",
@@ -2630,6 +2751,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM",
     "CICAM",
     "CICAM",
+    "CICAM",
   },
   { "Recording",
     "Aufnahme",
@@ -2651,6 +2773,7 @@ const tI18nPhrase Phrases[] = {
     "Snimanje",
     "Salvestamine",
     "Optagelse",
+    "Nahr�v�n�",
   },
   { "Replay",
     "Wiedergabe",
@@ -2672,6 +2795,7 @@ const tI18nPhrase Phrases[] = {
     "Reprodukcija",
     "Taasesitus",
     "Afspilning",
+    "P�ehr�v�n�",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -2693,6 +2817,7 @@ const tI18nPhrase Phrases[] = {
     "Ostalo",
     "Muud s�tted",
     "Diverse",
+    "R�zn�",
   },
   { "Plugins",
     "Plugins",
@@ -2714,6 +2839,7 @@ const tI18nPhrase Phrases[] = {
     "Dodaci (Plugins)",
     "Laiendusmoodulid",
     "Plugins",
+    "Moduly",
   },
   { "Plugin",
     "Plugin",
@@ -2735,6 +2861,7 @@ const tI18nPhrase Phrases[] = {
     "Plugin",
     "Laiendusmoodul",
     "Plugin",
+    "Modul",
   },
   { "Restart",
     "Neustart",
@@ -2756,6 +2883,7 @@ const tI18nPhrase Phrases[] = {
     "Restart sistema",
     "Restart",
     "Genstart",
+    "Restart",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -2778,6 +2906,7 @@ const tI18nPhrase Phrases[] = {
     "Jezik",
     "Keel",
     "Sprog",
+    "Jazyk",
   },
   { "Setup.OSD$Skin",
     "Oberfl�che",
@@ -2799,6 +2928,7 @@ const tI18nPhrase Phrases[] = {
     "Povr�ina",
     "Kest",
     "Skin",
+    "Vzhled",
   },
   { "Setup.OSD$Theme",
     "Thema",
@@ -2820,6 +2950,7 @@ const tI18nPhrase Phrases[] = {
     "Tema",
     "Teema",
     "Tema",
+    "T�ma",
   },
   { "Setup.OSD$Left",
     "Links",
@@ -2841,6 +2972,7 @@ const tI18nPhrase Phrases[] = {
     "Lijevo",
     "Vasakule",
     "Venstre",
+    "Vlevo",
   },
   { "Setup.OSD$Top",
     "Oben",
@@ -2862,6 +2994,7 @@ const tI18nPhrase Phrases[] = {
     "Gore",
     "�lesse",
     "Top",
+    "Naho�e",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -2883,6 +3016,7 @@ const tI18nPhrase Phrases[] = {
     "�irina",
     "Laius",
     "Bredde",
+    "���ka",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -2904,6 +3038,7 @@ const tI18nPhrase Phrases[] = {
     "Visina",
     "K�rgus",
     "H�jde",
+    "V��ka",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -2925,6 +3060,7 @@ const tI18nPhrase Phrases[] = {
     "Vrijeme prikaza poruka (s)",
     "Teate esitusaeg (s)",
     "Tid beskeder skal vises (s)",
+    "�as zobrazen� zp�vy (s)",
   },
   { "Setup.OSD$Use small font",
     "Kleine Schrift benutzen",
@@ -2946,6 +3082,7 @@ const tI18nPhrase Phrases[] = {
     "Koristi mala slova",
     "V�ikese fondi kasutamine",
     "Anvend lille skrift",
+    "Pou��vat mal� p�smo",
   },
   { "never",
     "nie",
@@ -2967,6 +3104,7 @@ const tI18nPhrase Phrases[] = {
     "nikada",
     "mitte kunagi",
     "aldrig",
+    "nikdy",
   },
   { "skin dependent",
     "je nach Oberfl�che",
@@ -2988,6 +3126,7 @@ const tI18nPhrase Phrases[] = {
     "ovisno o povr�ini",
     "kestast s�ltuv",
     "skin afh�ngig",
+    "podle vzhledu",
   },
   { "always",
     "immer",
@@ -3009,6 +3148,7 @@ const tI18nPhrase Phrases[] = {
     "uvijek",
     "alati",
     "altid",
+    "v�dy",
   },
   { "Setup.OSD$Channel info position",
     "Kanal-Info Position",
@@ -3030,6 +3170,7 @@ const tI18nPhrase Phrases[] = {
     "Pozicija informacije o programu",
     "Kanaliinfo asukoht",
     "Placering af kanalinfo",
+    "Pozice informace o kan�lu",
   },
   { "Setup.OSD$Channel info time (s)",
     "Anzeigedauer f�r Kanal-Info (s)",
@@ -3051,6 +3192,7 @@ const tI18nPhrase Phrases[] = {
     "Vrijeme prikaza informacije o programu (s)",
     "Kanaliinfo esitusaeg (s)",
     "Tid kanalinfo skal vises (s)",
+    "�as zobr. informace o kan�lu (s)",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -3072,6 +3214,7 @@ const tI18nPhrase Phrases[] = {
     "Informacije kod promjene kanala",
     "Kanaliinfo n�itamine",
     "Info ved kanalskift",
+    "Informace p�i zm�n� kan�lu",
   },
   { "Setup.OSD$Timeout requested channel info",
     "Angeforderte Kanalinfo schlie�en",
@@ -3093,6 +3236,7 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "Kanaliinfo kuvamise ajapiirang",
     "Timeout ved anmodet kanal info",
+    "�asov� limit informace o kan�lu",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -3114,6 +3258,7 @@ const tI18nPhrase Phrases[] = {
     "Listaj po stranicama",
     "Lehek�lje kerimine",
     "Scroll sidevis",
+    "Rolovat strany",
   },
   { "Setup.OSD$Scroll wraps",
     "Rundum scrollen",
@@ -3135,6 +3280,7 @@ const tI18nPhrase Phrases[] = {
     "S kraja sko�i na po�etak",
     "Ridade kerimine",
     "Scroll rundt",
+    "Z konce na za��tek",
   },
   { "Setup.OSD$Menu button closes",
     "Menu-Taste schlie�t",
@@ -3156,6 +3302,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Sulgemine Men�� klahviga",
     "Menu taste lukker",
+    "Kl�vesa Menu zav�r�",
   },
   { "Setup.OSD$Sort timers",
     "Timer sortieren",
@@ -3177,6 +3324,7 @@ const tI18nPhrase Phrases[] = {
     "Sortiraj termine",
     "Taimeri sorteerimine",
     "Sorter timere",
+    "T��d�n� �asova��",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -3198,6 +3346,7 @@ const tI18nPhrase Phrases[] = {
     "Imenik za snimke",
     "Kausta nime salvestamine",
     "Optagelser i foldere",
+    "Seznam nahr�vek",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis EPG Scan (h)",
@@ -3219,6 +3368,7 @@ const tI18nPhrase Phrases[] = {
     "Vrijeme do EPG pregleda (h)",
     "EPG skaneerimise viide (h)",
     "Tid f�r EPG skanning (t)",
+    "�asov� limit pro sn�m�n� EPG (h)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG Fehlerbereinigung",
@@ -3240,6 +3390,7 @@ const tI18nPhrase Phrases[] = {
     "Nivo popravka EPG gre�aka",
     "EPG veaparanduse tase",
     "Niveau for EPG fejlrettelse",
+    "EPG �rove� chyb",
   },
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
@@ -3261,6 +3412,7 @@ const tI18nPhrase Phrases[] = {
     "Prika�i stare EPG podatke (min)",
     "Vana EPG viide (min)",
     "Vise gammel EPG info (min)",
+    "Ukazovat star�� EPG data (min)",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -3282,6 +3434,7 @@ const tI18nPhrase Phrases[] = {
     "Podesi vrijeme sistema",
     "Kella s�nkroniseerimine",
     "Indstil system tid",
+    "Nastavit syst�mov� �as",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -3303,6 +3456,7 @@ const tI18nPhrase Phrases[] = {
     "Transponder za pode�avanje sata",
     "Kella s�nkroniseerimise transponder",
     "Anvend tid fra transponder",
+    "Pou��t �as z kan�lu",
   },
   { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
@@ -3324,6 +3478,7 @@ const tI18nPhrase Phrases[] = {
     "Preferirani jezici",
     "Eelistatuid keeli",
     "Foretrukne sprog",
+    "Preferovan� jazyky",
   },
   { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
@@ -3345,6 +3500,7 @@ const tI18nPhrase Phrases[] = {
     "Preferirani jezik",
     "Eelistatud keel",
     "Foretrukket sprog",
+    "Preferovan� jazyk",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB Interface",
@@ -3366,6 +3522,7 @@ const tI18nPhrase Phrases[] = {
     "Primarni DVB ure�aj",
     "Esmane DVB seade",
     "Prim�r DVB enhed",
+    "Prim�rn� DVB interface",
   },
   { "Setup.DVB$Video display format",
     "Video Anzeige-Format",
@@ -3387,6 +3544,7 @@ const tI18nPhrase Phrases[] = {
     "Format video prikaza",
     "Video kuvamise formaat",
     "Video display format",
+    "Form�t zobrazen� videa",
   },
   { "pan&scan",
     "pan&scan",
@@ -3408,6 +3566,7 @@ const tI18nPhrase Phrases[] = {
     "pan&scan",
     "pan&scan",
     "pan&scan",
+    "pan&scan",
   },
   { "letterbox",
     "letterbox",
@@ -3429,6 +3588,7 @@ const tI18nPhrase Phrases[] = {
     "letterbox",
     "letterbox",
     "letterbox",
+    "letterbox",
   },
   { "center cut out",
     "center cut out",
@@ -3450,6 +3610,7 @@ const tI18nPhrase Phrases[] = {
     "center cut out",
     "center cut out",
     "center cut out",
+    "dost�edu o��znout",
   },
   { "Setup.DVB$Video format",
     "Video Format",
@@ -3471,6 +3632,7 @@ const tI18nPhrase Phrases[] = {
     "Video format",
     "TV k�lgsuhe",
     "Video format",
+    "Form�t videa",
   },
   { "Setup.DVB$Use Dolby Digital",
     "Dolby Digital Ton benutzen",
@@ -3492,6 +3654,7 @@ const tI18nPhrase Phrases[] = {
     "Koristi Dolby Digital",
     "Dolby Digital kasutamine",
     "Anvend Dolby Digital",
+    "Pou��vat zvuk v Dolby Digital",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -3513,6 +3676,7 @@ const tI18nPhrase Phrases[] = {
     "Aktualiziraj programe",
     "Kanalite uuendamine",
     "Opdat�r kanaler",
+    "Aktualizace kan�l�",
   },
   { "names only",
     "nur Namen",
@@ -3534,6 +3698,7 @@ const tI18nPhrase Phrases[] = {
     "samo imena",
     "ainult nimed",
     "kun navne",
+    "jen n�zvy",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -3555,6 +3720,7 @@ const tI18nPhrase Phrases[] = {
     "imena i identifikatore (PIDs)",
     "nimi ja PID-id",
     "navne og PIDs",
+    "n�zvy a PIDs",
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
@@ -3576,6 +3742,7 @@ const tI18nPhrase Phrases[] = {
     "dodaj nove programe",
     "lisa uued kanalid",
     "tilf. ny kanaler",
+    "p�idat nov� kan�ly",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
@@ -3597,6 +3764,7 @@ const tI18nPhrase Phrases[] = {
     "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
     "lisa uued transponderid",
     "tilf. ny transp.",
+    "p�idat nov� transpond�ry",
   },
   { "Setup.DVB$Audio languages",  // note the plural
     "Audio Sprachen",
@@ -3618,6 +3786,7 @@ const tI18nPhrase Phrases[] = {
     "Audio jezici",
     "Audio keeli",
     "Audio sprog (ant.)",
+    "Jazyky zvuku",
   },
   { "Setup.DVB$Audio language",  // note the singular
     "Audio Sprache",
@@ -3639,6 +3808,7 @@ const tI18nPhrase Phrases[] = {
     "Audio jezik",
     "Audio keel",
     "Audio sprog",
+    "Jazyk zvuku",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -3660,6 +3830,7 @@ const tI18nPhrase Phrases[] = {
     "Frekv. preklopa SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -3681,6 +3852,7 @@ const tI18nPhrase Phrases[] = {
     "Donja LNB frekv. (MHz)",
     "Alumine (LO) LNB sagedus (MHz)",
     "Nedre LNB frekvens (MHz)",
+    "Doln� frekvence LNB (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -3702,6 +3874,7 @@ const tI18nPhrase Phrases[] = {
     "Gornja LNB frekv. (MHz)",
     "�lemine (HI) LNB sagedus (MHz)",
     "�vre LNB frekvens (MHz)",
+    "Horn� frekvence LNB (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -3723,6 +3896,7 @@ const tI18nPhrase Phrases[] = {
     "Koristi DiSEqC",
     "DiSEqC kasutamine",
     "Anvend DiSEqC",
+    "Pou��vat DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
     "CICAM DVB",
@@ -3744,6 +3918,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
+    "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
     "Zeitpuffer bei Anfang (min)",
@@ -3765,6 +3940,7 @@ const tI18nPhrase Phrases[] = {
     "Rezerva na po�etku snimanja (min)",
     "Salvestamise algusvaru (min)",
     "Margin ved start (min)",
+    "Nahr�vat p�ed za��tkem (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Zeitpuffer bei Ende (min)",
@@ -3786,6 +3962,7 @@ const tI18nPhrase Phrases[] = {
     "Rezerva na kraju (min)",
     "Salvestamise l�puvaru (min)",
     "Margin ved stop (min)",
+    "Nahr�vat po konci (min)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -3807,6 +3984,7 @@ const tI18nPhrase Phrases[] = {
     "Standardno ograni�enje",
     "Esmane prioriteet",
     "Prim�r gr�nse",
+    "Prim�rn� limit",
   },
   { "Setup.Recording$Default priority",
     "Default Priorit�t",
@@ -3828,6 +4006,7 @@ const tI18nPhrase Phrases[] = {
     "Standardni prioritet",
     "Vaikimisi prioriteet",
     "Standard prioritet",
+    "V�choz� priorita",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default Lebensdauer (d)",
@@ -3849,6 +4028,7 @@ const tI18nPhrase Phrases[] = {
     "Standardno trajanje (d)",
     "Salvestuse eluiga (p�evi)",
     "Standard levetid (d)",
+    "V�choz� �ivotnost",
   },
   { "Setup.Recording$Pause priority",
     "Pause Priorit�t",
@@ -3870,6 +4050,7 @@ const tI18nPhrase Phrases[] = {
     "Prioritet pauze",
     "Pausi prioriteet",
     "Pause prioritet",
+    "Priorita p�eru�en�",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause Lebensdauer (d)",
@@ -3891,6 +4072,7 @@ const tI18nPhrase Phrases[] = {
     "Trajanje pauze (d)",
     "Pausi eluiga (p�evi)",
     "Pause levetid (d)",
+    "�ivotnost p�eru�en� (d)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -3912,6 +4094,7 @@ const tI18nPhrase Phrases[] = {
     "Koristi ime epizode",
     "Episoodi nime kasutamine",
     "Anvend udsendelsesnavn",
+    "Pou��vat n�zev epizody",
   },
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
@@ -3933,6 +4116,7 @@ const tI18nPhrase Phrases[] = {
     "Koristi VPS",
     "VPS-i kasutamine",
     "Anvend VPS",
+    "Pou��vat VPS",
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitpuffer bei VPS (s)",
@@ -3954,6 +4138,7 @@ const tI18nPhrase Phrases[] = {
     "Vremenska rezerva kod VPS (s)",
     "VPS-i algusvaru (s)",
     "VPS margin (s)",
+    "�asov� rezerva pro VPS (s)",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -3975,6 +4160,7 @@ const tI18nPhrase Phrases[] = {
     "Ozna�i direktno snimanje",
     "Otsesalvestuse m�rgistamine",
     "Mark�r direkte optagelse",
+    "Ozna�it okam�it� nahr�vky",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -3996,6 +4182,7 @@ const tI18nPhrase Phrases[] = {
     "Imenuj direktno snimanje",
     "Otsesalvestuse nimi",
     "Navngiv direkte optagelse",
+    "Pojmenovat okam�it� nahr�vky",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -4017,6 +4204,7 @@ const tI18nPhrase Phrases[] = {
     "Trajanje direktnog snimanja (min)",
     "Otsesalvestuse kestus (min)",
     "L�ngde af direkte optagelse (min)",
+    "D�lka okam�it�ho nahr�v�n� (min)",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Video Dateigr��e (MB)",
@@ -4038,6 +4226,7 @@ const tI18nPhrase Phrases[] = {
     "Maksimalna veli�ina datoteke (MB)",
     "Maksimaalne failisuurus (MB)",
     "Max. video filst�rrelse (MB)",
+    "Maxim�ln� velikost nahr�vky (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -4059,6 +4248,7 @@ const tI18nPhrase Phrases[] = {
     "Podijeli ure�ene datoteke",
     "Redigeeritud failide t�keldamine",
     "Opdel redigerede filer",
+    "D�lit editovan� soubory",
   },
   { "Setup.Replay$Multi speed mode",
     "MultiSpeed Modus",
@@ -4080,6 +4270,7 @@ const tI18nPhrase Phrases[] = {
     "MultiSpeed na�in",
     "Multi-kiiruse moodus",
     "Multi hastighedsmodus",
+    "V�cerychlostn� m�d",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -4101,6 +4292,7 @@ const tI18nPhrase Phrases[] = {
     "Prika�i na�in prikazivanja",
     "Korduse moodus",
     "Vis afspilningsmodus",
+    "Zobrazit re�im p�ehr�v�n�",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe ID",
@@ -4122,6 +4314,7 @@ const tI18nPhrase Phrases[] = {
     "ID nastavka",
     "J�tkamise ID",
     "Genoptagelses ID",
+    "ID obnoven�",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Mindest Event Pause (min)",
@@ -4143,6 +4336,7 @@ const tI18nPhrase Phrases[] = {
     "Minimalno vrijeme pauze",
     "Min. s�ndmuse kestus (min)",
     "Mindste h�ndelsespause (min)",
+    "Min. pauza mezi ud�lostmi (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "Mindest Benutzer-Inaktivit�t (min)",
@@ -4164,6 +4358,7 @@ const tI18nPhrase Phrases[] = {
     "Minimalno vrijeme neaktivnosti (min)",
     "Min. kasutaja tegevusetus (min)",
     "Min. bruger inaktivitet (min)",
+    "�asov� limit neaktivnosti (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP Timeout (s)",
@@ -4185,6 +4380,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP vrijeme neaktivnosti",
     "SVDRP ooteaeg (s)",
     "SVDRP timeout (s)",
+    "�asov� limit SVDRP (s)",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Zap Timeout (s)",
@@ -4206,6 +4402,7 @@ const tI18nPhrase Phrases[] = {
     "",// hrv TODO
     "Kanalivahetuse ooteaeg (s)",
     "Zap timeout (s)",
+    "�asov� limit Zap (s)",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -4228,6 +4425,7 @@ const tI18nPhrase Phrases[] = {
     "PUS�PSN", // hrv
     "ETKNRLP",
     "MTOTFLS",
+    "PUS�PSN",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -4249,6 +4447,7 @@ const tI18nPhrase Phrases[] = {
     "PonUtoSri�etPetSubNed", // hrv
     " E  T  K  N  R  L  P ",
     "ManTirOnsTorFreL�rS�n",
+    "Po �t St �t P� So Ne ",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
@@ -4271,6 +4470,7 @@ const tI18nPhrase Phrases[] = {
     " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@", // hrv
     " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~,/_@",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
+    " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.#~,/_@",
   },
   // The character maps for entering letters via the numeric keys:
   { " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
@@ -4293,6 +4493,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9",
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
+    " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -4315,6 +4516,7 @@ const tI18nPhrase Phrases[] = {
     "U�enje k�da daljinskog upravlja�a",
     "Kaugjuhtimispuldi �petamine",
     "L�rer fjernbetjeningstaster",
+    "U�en� k�d� d�lkov�ho ovl�d�n�",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: FB Code feststellen",
@@ -4336,6 +4538,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 1: detektiranje k�da daljinskog upravlja�a.",
     "Aste 1: Kodeerimiss�steemi tuvastamine",
     "Fase 1: Detekterer fjernbetjenings-kodetype",
+    "F�ze 1: Detekce typu k�du",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der FB dr�cken",
@@ -4357,6 +4560,7 @@ const tI18nPhrase Phrases[] = {
     "Pritisnite tipku na daljinskom upravlja�u",
     "Vajuta puldil suvalist klahvi",
     "Tryk vilk�rlig tast p� fjernbetjeningen",
+    "Stiskn�te libovolnou kl�vesu ovl�d�n�",
   },
   { "RC code detected!",
     "FB Code erkannt!",
@@ -4378,6 +4582,7 @@ const tI18nPhrase Phrases[] = {
     "K�d daljinskog upravlja�a je prepoznat!",
     "Kodeerimiss�steem tuvastatud!",
     "Fjernbetjenings-kodetype fundet!",
+    "K�d byl detekov�n!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -4399,6 +4604,7 @@ const tI18nPhrase Phrases[] = {
     "Ne pritiskajte tipku...",
     "�ra vajuta puldil �htki klahvi...",
     "Tryk ikke p� nogen tast...",
+    "Nema�kejte ��dn� kl�vesy...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Einzelne Tastencodes lernen",
@@ -4420,6 +4626,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 2: U�enje posebnih k�dova",
     "Aste 2: Klahvide �petamine",
     "Fase 2: L�r individuelle tast koder",
+    "F�ze 2: U�en� konkr�tn�ho k�du kl�ves",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -4441,6 +4648,7 @@ const tI18nPhrase Phrases[] = {
     "Pritisnite tipku za '%s'",
     "Vajuta klahvile '%s'",
     "Tryk tasten for '%s'",
+    "Stiskn�te kl�vesu pro '%s'",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -4462,6 +4670,7 @@ const tI18nPhrase Phrases[] = {
     "Pritisnite 'Gore' za potvrdu",
     "Kinnitamiseks vajuta '�les'",
     "Tryk 'Op' for at bekr�fte",
+    "Stiskn�te 'Nahoru' pro potvrzen�",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -4483,6 +4692,7 @@ const tI18nPhrase Phrases[] = {
     "Pritisnite 'Dolje' za nastavak",
     "J�tkamiseks vajuta 'Alla'",
     "Tryk 'Ned' for at forts�tte",
+    "Stiskn�te 'Dol�' pro pokra�ov�n�",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken um zur�ckzugehen)",
@@ -4504,6 +4714,7 @@ const tI18nPhrase Phrases[] = {
     "(pritisnite 'Gore' za nazad)",
     "(tagasiminekuks vajuta '�les')",
     "(tryk 'Op' for at g� tilbage)",
+    "(stiskn�te 'Nahoru' pro zp�t)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -4525,6 +4736,7 @@ const tI18nPhrase Phrases[] = {
     "(pritisnite 'Dolje' za kraj)",
     "(l�petamiseks vajuta 'Alla')",
     "(tryk 'Ned' for at afslutte indl�ringen)",
+    "(stiskn�te 'Dol�' pro ukon�en�)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -4546,6 +4758,7 @@ const tI18nPhrase Phrases[] = {
     "pritisnite 'Izbor' da presko�ite ovu tipku",
     "(selle klahvi vahelej�tmiseks vajuta 'Men��')",
     "(tryk 'Menu' for at springe denne tast over)",
+    "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Codes abspeichern",
@@ -4567,6 +4780,7 @@ const tI18nPhrase Phrases[] = {
     "Faza 3: Spremanje k�dova tipki",
     "Aste 3: Klavhikoodide salvestamine",
     "Fase 3: Gemmer tast koder",
+    "F�ze 3: Ulo�en� k�d�",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -4588,6 +4802,7 @@ const tI18nPhrase Phrases[] = {
     "'Gore' za potvrdu, 'Dolje' za prekid",
     "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'",
     "Tryk 'Op' for at gemme, 'Ned' for at annullere",
+    "Stiskn�te 'Nahoru' pro ulo�en�, 'Dol�' pro zru�en�",
   },
   // Key names:
   { "Key$Up",
@@ -4610,6 +4825,7 @@ const tI18nPhrase Phrases[] = {
     "Gore",
     "�les",
     "Op",
+    "Nahoru",
   },
   { "Key$Down",
     "Ab",
@@ -4631,6 +4847,7 @@ const tI18nPhrase Phrases[] = {
     "Dolje",
     "Alla",
     "Ned",
+    "Dol�",
   },
   { "Key$Menu",
     "Men�",
@@ -4652,6 +4869,7 @@ const tI18nPhrase Phrases[] = {
     "Izbor",
     "Men��",
     "Menu",
+    "Menu",
   },
   { "Key$Ok",
     "Ok",
@@ -4673,6 +4891,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Ok",
   },
   { "Key$Back",
     "Zur�ck",
@@ -4694,6 +4913,7 @@ const tI18nPhrase Phrases[] = {
     "Nazad",
     "Tagasi",
     "Tilbage",
+    "Zp�t",
   },
   { "Key$Left",
     "Links",
@@ -4715,6 +4935,7 @@ const tI18nPhrase Phrases[] = {
     "Lijevo",
     "Vasakule",
     "Venstre",
+    "Vlevo",
   },
   { "Key$Right",
     "Rechts",
@@ -4736,6 +4957,7 @@ const tI18nPhrase Phrases[] = {
     "Desno",
     "Paremale",
     "H�jre",
+    "Vpravo",
   },
   { "Key$Red",
     "Rot",
@@ -4757,6 +4979,7 @@ const tI18nPhrase Phrases[] = {
     "Crveno",
     "Punane",
     "R�d",
+    "�erven�",
   },
   { "Key$Green",
     "Gr�n",
@@ -4778,6 +5001,7 @@ const tI18nPhrase Phrases[] = {
     "Zeleno",
     "Roheline",
     "Gr�n",
+    "Zelen�",
   },
   { "Key$Yellow",
     "Gelb",
@@ -4799,6 +5023,7 @@ const tI18nPhrase Phrases[] = {
     "�uto",
     "Kollane",
     "Gul",
+    "�lut�",
   },
   { "Key$Blue",
     "Blau",
@@ -4820,6 +5045,7 @@ const tI18nPhrase Phrases[] = {
     "Plavo",
     "Sinine",
     "Bl�",
+    "Modr�",
   },
   { "Key$Info",
     "Info",
@@ -4841,6 +5067,7 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "Info",
     "Info",
+    "Info",
   },
   { "Key$Play",
     "Wiedergabe",
@@ -4862,6 +5089,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Start",
     "Afspil",
+    "P�ehr�t",
   },
   { "Key$Pause",
     "Pause",
@@ -4883,6 +5111,7 @@ const tI18nPhrase Phrases[] = {
     "Pauza",
     "Paus",
     "Pause",
+    "P�eru�it",
   },
   { "Key$Stop",
     "Stop",
@@ -4904,6 +5133,7 @@ const tI18nPhrase Phrases[] = {
     "Stop",
     "Stopp",
     "Stop",
+    "Zastavit",
   },
   { "Key$Record",
     "Aufnehmen",
@@ -4925,6 +5155,7 @@ const tI18nPhrase Phrases[] = {
     "Snimaj",
     "Salvestamine",
     "Optag",
+    "Nahr�t",
   },
   { "Key$FastFwd",
     "Vorlauf",
@@ -4946,6 +5177,7 @@ const tI18nPhrase Phrases[] = {
     "Naprijed",
     "Edasikerimine",
     "Spol fremad",
+    "Dop�edu",
   },
   { "Key$FastRew",
     "R�cklauf",
@@ -4967,6 +5199,7 @@ const tI18nPhrase Phrases[] = {
     "Nazad",
     "Tagasikerimine",
     "Spol tilbage",
+    "Dozadu",
   },
   { "Key$Power",
     "Ausschalten",
@@ -4988,6 +5221,7 @@ const tI18nPhrase Phrases[] = {
     "Isklju�i",
     "Toide",
     "Sluk",
+    "Vyp�na�",
   },
   { "Key$Channel+",
     "Kanal+",
@@ -5009,6 +5243,7 @@ const tI18nPhrase Phrases[] = {
     "Program +",
     "Kanal+",
     "Kanal+",
+    "Kan�l+",
   },
   { "Key$Channel-",
     "Kanal-",
@@ -5030,6 +5265,7 @@ const tI18nPhrase Phrases[] = {
     "Program -",
     "Kanal-",
     "Kanal-",
+    "Kan�l-",
   },
   { "Key$Volume+",
     "Lautst�rke+",
@@ -5051,6 +5287,7 @@ const tI18nPhrase Phrases[] = {
     "Glasnije", // hrv "Glasnocca +"
     "Helitugevus+",
     "Lydstyrke+",
+    "Hlasitost+",
   },
   { "Key$Volume-",
     "Lautst�rke-",
@@ -5072,6 +5309,7 @@ const tI18nPhrase Phrases[] = {
     "Ti�e", // hrv Glasnocca -"
     "Helitugevus-",
     "Lydstyrke-",
+    "Hlasitost-",
   },
   { "Key$Mute",
     "Stumm",
@@ -5093,6 +5331,7 @@ const tI18nPhrase Phrases[] = {
     "Bez zvuka",
     "H��letu",
     "Sluk lyd",
+    "Ticho",
   },
   { "Key$Audio",
     "Audio",
@@ -5114,6 +5353,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Audio",
     "Audio",
+    "Zvuk",
   },
   // Miscellaneous:
   { "yes",
@@ -5136,6 +5376,7 @@ const tI18nPhrase Phrases[] = {
     "da",
     "jah",
     "ja",
+    "ano",
   },
   { "no",
     "nein",
@@ -5157,6 +5398,7 @@ const tI18nPhrase Phrases[] = {
     "ne",
     "ei",
     "nej",
+    "ne",
   },
   { "off",
     "aus",
@@ -5178,6 +5420,7 @@ const tI18nPhrase Phrases[] = {
     "ugasi",
     "v�lja",
     "fra",
+    "vyp.",
   },
   { "none",
     "keine",
@@ -5199,6 +5442,7 @@ const tI18nPhrase Phrases[] = {
     "nijedan",
     "t�hi",
     "ingen",
+    "��dn�",
   },
   { "auto",
     "auto",
@@ -5220,6 +5464,7 @@ const tI18nPhrase Phrases[] = {
     "automatski",
     "automaatne",
     "automatisk",
+    "auto",
   },
   { "top",
     "oben",
@@ -5241,6 +5486,7 @@ const tI18nPhrase Phrases[] = {
     "gore",
     "�leval",
     "top",
+    "haho�e",
   },
   { "bottom",
     "unten",
@@ -5262,6 +5508,7 @@ const tI18nPhrase Phrases[] = {
     "dolje",
     "all",
     "bund",
+    "dole",
   },
   { "Disk",
     "Disk",
@@ -5283,6 +5530,7 @@ const tI18nPhrase Phrases[] = {
     "Disk",
     "Ketas",
     "Disk",
+    "Disk",
   },
   { "free",
     "frei",
@@ -5304,6 +5552,7 @@ const tI18nPhrase Phrases[] = {
     "slobodno",
     "vaba",
     "fri",
+    "volno",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -5325,6 +5574,7 @@ const tI18nPhrase Phrases[] = {
     "Sko�i: ",
     "H�pe: ",
     "Hop: ",
+    "Skok: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -5346,6 +5596,7 @@ const tI18nPhrase Phrases[] = {
     "Glasno�a ",
     "Helitugevus ",
     "Lydstyrke ",
+    "Hlasitost ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -5367,6 +5618,7 @@ const tI18nPhrase Phrases[] = {
     " Prekini reprodukciju",
     " L�peta taasesitamine",
     " Stop afspilning",
+    " Zastavit p�ehr�v�n�",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -5388,6 +5640,7 @@ const tI18nPhrase Phrases[] = {
     " Prekini snimanje ",
     " L�peta salvestamine ",
     " Stop optagelse ",
+    " Zastavit nahr�v�n� ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -5409,6 +5662,7 @@ const tI18nPhrase Phrases[] = {
     " Prekini ure�ivanje",
     " Katkesta monteerimine",
     " Afbryd redigering",
+    " Zru�it editaci",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -5430,6 +5684,7 @@ const tI18nPhrase Phrases[] = {
     "Preklapanje primarnog DVB ure�aja...",
     "Esmase DVB seadme �mberl�litus...",
     "Skifter prim�r DVB enhed...",
+    "P�epnout prim�rn� DVB...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -5451,6 +5706,7 @@ const tI18nPhrase Phrases[] = {
     "Gore/Dolje na novu poziciju - zatim OK",
     "'�les/Alla' uus asukoht - 'OK' kinnitus",
     "Op/Ned for ny placering - OK for at flytte",
+    "Nahoru/Dolu pro novou pozici - Ok p�esune",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -5472,6 +5728,7 @@ const tI18nPhrase Phrases[] = {
     "Rezanje je zapo�eto",
     "Redigeerimine algas",
     "Redigeringsproces startet",
+    "Edita�n� proces za�al",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -5493,6 +5750,7 @@ const tI18nPhrase Phrases[] = {
     "Rezanje zavr�eno",
     "Redigeerimine l�petatud",
     "Redigeringsproces afsluttet",
+    "Edita�n� proces skon�il",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -5514,6 +5772,7 @@ const tI18nPhrase Phrases[] = {
     "Rezanje neuspje�no!",
     "Redigeerimine eba�nnestus",
     "Redigeringsproces fejlede!",
+    "Edita�n� proces selhal!",
   },
   { "Recording started",
     "Aufzeichnung gestartet",
@@ -5535,6 +5794,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Salvestamine algas",
     "Optagelse startet",
+    "Za�alo nahr�v�n�",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -5556,6 +5816,7 @@ const tI18nPhrase Phrases[] = {
     "Zaustavljanje �ivog signala...",
     "Saate edastamise peatamine...",
     "Pausere live udsendelse...",
+    "P�eru�uje se b��c� program ...",
   },
   { "Starting EPG scan",
     "Beginne mit EPG-Scan",
@@ -5577,6 +5838,7 @@ const tI18nPhrase Phrases[] = {
     "Po�injem EPG-scan",
     "EPG skaneerimine k�ivitatud",
     "Starter EPG skanning",
+    "Za��n� prohled�v�n� EPG",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Setup-Parameter!",
@@ -5598,6 +5860,7 @@ const tI18nPhrase Phrases[] = {
     "Ovaj dodatak (Plugin) nema parametara!",
     "Sellel laienudusmoodulil ei ole seadeid!",
     "Denne plugin har ingen parametre",
+    "Modul nem� konfigura�n� parametry!",
   },
   { "Classic VDR",
     "Klassischer VDR",
@@ -5619,6 +5882,7 @@ const tI18nPhrase Phrases[] = {
     "Klasi�ni VDR",
     "Klassikaline VDR",
     "Klassisk VDR",
+    "Klasick� VDR",
   },
   { "ST:TNG Panels",
     "ST:TNG Konsolen",
@@ -5640,6 +5904,7 @@ const tI18nPhrase Phrases[] = {
     "ST:TNG Konzole",
     "ST:TNG konsool",
     "ST:TNG konsol",
+    "ST:TNG konzola",
   },
   { "No title",
     "Kein Titel",
@@ -5661,6 +5926,7 @@ const tI18nPhrase Phrases[] = {
     "Bez titla",
     "Pealkiri puudub",
     "Ingen titel",
+    "Bez n�zvu",
   },
   { NULL }
   };
diff --git a/i18n.h b/i18n.h
index a17951462..0cbf72817 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.16 2005/09/09 14:50:35 kls Exp $
+ * $Id: i18n.h 1.17 2006/02/04 10:41:16 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 20;
+const int I18nNumLanguages = 21;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/menu.c b/menu.c
index 4aa539777..d9c6b04c8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.407 2006/01/29 14:04:37 kls Exp $
+ * $Id: menu.c 1.410 2006/02/05 13:31:08 kls Exp $
  */
 
 #include "menu.h"
@@ -1437,7 +1437,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        case kYellow: if (schedules)
                         return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
                      break;
-       case kBlue:   if (Count())
+       case kBlue:   if (Count() && otherChannel)
                         return Switch();
                      break;
        case kOk:     if (Count())
@@ -3083,7 +3083,7 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction
   if (Direction) {
      while (Channel) {
            Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
-           if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0))
+           if (Channel && !Channel->GroupSep() && (cDevice::PrimaryDevice()->ProvidesChannel(Channel, Setup.PrimaryLimit) || cDevice::GetDevice(Channel, 0)))
               return Channel;
            }
      }
@@ -3326,7 +3326,7 @@ cDisplayTracks::cDisplayTracks(void)
 :cOsdObject(true)
 {
   cDevice::PrimaryDevice()->EnsureAudioTrack();
-  SetTrackDescriptions(!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice() ? cDevice::CurrentChannel() : 0);
+  SetTrackDescriptions(!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring() ? cDevice::CurrentChannel() : 0);
   currentDisplayTracks = this;
   numTracks = track = 0;
   audioChannel = cDevice::PrimaryDevice()->GetAudioChannel();
diff --git a/menuitems.c b/menuitems.c
index 455070d1b..e23806631 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.30 2006/01/21 12:27:14 kls Exp $
+ * $Id: menuitems.c 1.31 2006/02/04 12:47:08 kls Exp $
  */
 
 #include "menuitems.h"
@@ -345,7 +345,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
   bool SameKey = Key == lastKey;
   if (Key != kNone)
      lastKey = Key;
-  else if (!newchar && autoAdvanceTimeout.TimedOut()) {
+  else if (!newchar && k0 <= NORMALKEY(lastKey) && NORMALKEY(lastKey) <= k9 && autoAdvanceTimeout.TimedOut()) {
      AdvancePos();
      newchar = true;
      currentChar = NULL;
@@ -427,7 +427,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        value[pos] = toupper(Inc(tolower(value[pos]), NORMALKEY(Key) == kUp));
                     else
                        value[pos] =         Inc(        value[pos],  NORMALKEY(Key) == kUp);
-                    newchar = true;
+                    newchar = false;
                     }
                  else
                     return cMenuEditItem::ProcessKey(Key);
diff --git a/osd.c b/osd.c
index 46f0a74b0..40b60e1bb 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.65 2005/12/30 15:42:04 kls Exp $
+ * $Id: osd.c 1.66 2006/02/05 13:46:37 kls Exp $
  */
 
 #include "osd.h"
@@ -112,7 +112,7 @@ cBitmap::cBitmap(const char *FileName)
   LoadXpm(FileName);
 }
 
-cBitmap::cBitmap(char *Xpm[])
+cBitmap::cBitmap(const char *const Xpm[])
 {
   bitmap = NULL;
   x0 = 0;
@@ -251,9 +251,9 @@ bool cBitmap::LoadXpm(const char *FileName)
   return Result;
 }
 
-bool cBitmap::SetXpm(char *Xpm[], bool IgnoreNone)
+bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
 {
-  char **p = Xpm;
+  const char *const *p = Xpm;
   int w, h, n, c;
   if (4 != sscanf(*p, "%d %d %d %d", &w, &h, &n, &c)) {
      esyslog("ERROR: faulty 'values' line in XPM: '%s'", *p);
diff --git a/osd.h b/osd.h
index 9156393ee..d716df844 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.50 2005/12/18 12:56:21 kls Exp $
+ * $Id: osd.h 1.51 2006/02/05 13:46:37 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -112,7 +112,7 @@ class cBitmap : public cPalette {
        ///< this offset (unless specified otherwise).
   cBitmap(const char *FileName);
        ///< Creates a bitmap and loads an XPM image from the given file.
-  cBitmap(char *Xpm[]);
+  cBitmap(const char *const Xpm[]);
        ///< Creates a bitmap from the given XPM data.
   virtual ~cBitmap();
   int X0(void) const { return x0; }
@@ -140,7 +140,7 @@ class cBitmap : public cPalette {
   bool LoadXpm(const char *FileName);
        ///< Calls SetXpm() with the data from the file FileName.
        ///< Returns true if the operation was successful.
-  bool SetXpm(char *Xpm[], bool IgnoreNone = false);
+  bool SetXpm(const char *const Xpm[], bool IgnoreNone = false);
        ///< Sets this bitmap to the given XPM data. Any previous bitmap or
        ///< palette data will be overwritten with the new data.
        ///< If IgnoreNone is true, a "none" color entry will be ignored.
diff --git a/osdbase.c b/osdbase.c
index d81c33b94..65b66cb81 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.28 2006/01/08 11:40:02 kls Exp $
+ * $Id: osdbase.c 1.29 2006/02/05 14:37:03 kls Exp $
  */
 
 #include "osdbase.h"
@@ -280,6 +280,12 @@ void cOsdMenu::CursorUp(void)
      return;
   while (--tmpCurrent != current) {
         if (tmpCurrent < 0) {
+           if (first > 0) {
+              // make non-selectable items at the beginning visible:
+              first = 0;
+              Display();
+              return;
+              }
            if (Setup.MenuScrollWrap)
               tmpCurrent = last + 1;
            else
@@ -312,6 +318,12 @@ void cOsdMenu::CursorDown(void)
      return;
   while (++tmpCurrent != current) {
         if (tmpCurrent > last) {
+           if (first < last - displayMenuItems) {
+              // make non-selectable items at the end visible:
+              first = last - displayMenuItems + 1;
+              Display();
+              return;
+              }
            if (Setup.MenuScrollWrap)
               tmpCurrent = -1;
            else
diff --git a/recording.c b/recording.c
index 5c57e1872..e7efba0b9 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.133 2006/01/20 17:18:59 kls Exp $
+ * $Id: recording.c 1.134 2006/02/05 12:34:08 kls Exp $
  */
 
 #include "recording.h"
@@ -604,6 +604,7 @@ char *cRecording::SortName(void) const
 {
   if (!sortBuffer) {
      char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+     strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      sortBuffer = MALLOC(char, l);
      strxfrm(sortBuffer, s, l);
diff --git a/remux.c b/remux.c
index c48e5f97d..31ad719d1 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.53 2006/01/08 11:40:16 kls Exp $
+ * $Id: remux.c 1.54 2006/02/03 16:19:02 kls Exp $
  */
 
 #include "remux.h"
@@ -248,6 +248,14 @@ class cVideoRepacker : public cCommonRepacker {
     scanPicture
     };
   int state;
+  void HandleStartCode(const uchar *const Data, cRingBufferLinear *const ResultBuffer, const uchar *&Payload, const uchar StreamID, const ePesHeader MpegLevel);
+  inline bool ScanDataForStartCodeSlow(const uchar *const Data);
+  inline bool ScanDataForStartCodeFast(const uchar *&Data, const uchar *Limit);
+  inline bool ScanDataForStartCode(const uchar *&Data, int &Done, int &Todo);
+  inline void AdjustCounters(const int Delta, int &Done, int &Todo);
+  inline bool ScanForEndOfPictureSlow(const uchar *&Data);
+  inline bool ScanForEndOfPictureFast(const uchar *&Data, const uchar *Limit);
+  inline bool ScanForEndOfPicture(const uchar *&Data, const uchar *Limit);
 public:
   cVideoRepacker(void);
   virtual void Reset(void);
@@ -267,6 +275,162 @@ void cVideoRepacker::Reset(void)
   state = syncing;
 }
 
+void cVideoRepacker::HandleStartCode(const uchar *const Data, cRingBufferLinear *const ResultBuffer, const uchar *&Payload, const uchar StreamID, const ePesHeader MpegLevel)
+{
+  // synchronisation is detected some bytes after frame start.
+  const int SkippedBytesLimit = 4;
+
+  // which kind of start code have we got?
+  switch (*Data) {
+    case 0xB9 ... 0xFF: // system start codes
+         LOG("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
+         break;
+    case 0xB0 ... 0xB1: // reserved start codes
+    case 0xB6:
+         LOG("cVideoRepacker: found reserved start code: stream seems to be scrambled");
+         break;
+    case 0xB4: // sequence error code
+         LOG("cVideoRepacker: found sequence error code: stream seems to be damaged");
+    case 0xB2: // user data start code
+    case 0xB5: // extension start code
+         break;
+    case 0xB7: // sequence end code
+    case 0xB3: // sequence header code
+    case 0xB8: // group start code
+    case 0x00: // picture start code
+         if (state == scanPicture) {
+            // the above start codes indicate that the current picture is done. So
+            // push out the packet to start a new packet for the next picuture. If
+            // the byte count get's negative then the current buffer ends in a
+            // partitial start code that must be stripped off, as it shall be put
+            // in the next packet.
+            PushOutPacket(ResultBuffer, Payload, Data - 3 - Payload);
+            // go on with syncing to the next picture
+            state = syncing;
+            }
+         if (state == syncing) {
+            if (initiallySyncing) // omit report for the typical initial case
+               initiallySyncing = false;
+            else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
+               LOG("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
+            skippedBytes = 0;
+            // if there is a PES header available, then use it ...
+            if (pesHeaderBackupLen > 0) {
+               // ISO 13818-1 says:
+               // In the case of video, if a PTS is present in a PES packet header
+               // it shall refer to the access unit containing the first picture start
+               // code that commences in this PES packet. A picture start code commences
+               // in PES packet if the first byte of the picture start code is present
+               // in the PES packet.
+               memcpy(pesHeader, pesHeaderBackup, pesHeaderBackupLen);
+               pesHeaderLen = pesHeaderBackupLen;
+               pesHeaderBackupLen = 0;
+               }
+            else {
+               // ... otherwise create a continuation PES header
+               pesHeaderLen = 0;
+               pesHeader[pesHeaderLen++] = 0x00;
+               pesHeader[pesHeaderLen++] = 0x00;
+               pesHeader[pesHeaderLen++] = 0x01;
+               pesHeader[pesHeaderLen++] = StreamID; // video stream ID
+               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
+
+               if (MpegLevel == phMPEG2) {
+                  pesHeader[pesHeaderLen++] = 0x80;
+                  pesHeader[pesHeaderLen++] = 0x00;
+                  pesHeader[pesHeaderLen++] = 0x00;
+                  }
+               else
+                  pesHeader[pesHeaderLen++] = 0x0F;
+               }
+            // append the first three bytes of the start code
+            pesHeader[pesHeaderLen++] = 0x00;
+            pesHeader[pesHeaderLen++] = 0x00;
+            pesHeader[pesHeaderLen++] = 0x01;
+            // the next packet's payload will begin with the fourth byte of
+            // the start code (= the actual code)
+            Payload = Data;
+            // as there is no length information available, assume the
+            // maximum we can hold in one PES packet
+            packetTodo = maxPacketSize - pesHeaderLen;
+            // go on with finding the picture data
+            state++;
+            }
+         break;
+    case 0x01 ... 0xAF: // slice start codes
+         if (state == findPicture) {
+            // go on with scanning the picture data
+            state++;
+            }
+         break;
+    }
+}
+
+bool cVideoRepacker::ScanDataForStartCodeSlow(const uchar *const Data)
+{
+  scanner <<= 8;
+  bool FoundStartCode = (scanner == 0x00000100);
+  scanner |= *Data;
+  return FoundStartCode;
+}
+
+bool cVideoRepacker::ScanDataForStartCodeFast(const uchar *&Data, const uchar *Limit)
+{
+  Limit--;
+
+  while (Data < Limit && (Data = (const uchar *)memchr(Data, 0x01, Limit - Data))) {
+        if (Data[-2] || Data[-1])
+           Data += 3;
+        else {
+           scanner = 0x00000100 | *++Data;
+           return true;
+           }
+        }
+
+  Data = Limit;
+  unsigned long *Scanner = (unsigned long *)(Data - 3);
+  scanner = ntohl(*Scanner);
+  return false;
+}
+
+bool cVideoRepacker::ScanDataForStartCode(const uchar *&Data, int &Done, int &Todo)
+{
+  const uchar *const DataOrig = Data;
+  const int MinDataSize = 4;
+
+  if (Todo < MinDataSize || (state != syncing && packetTodo < MinDataSize))
+     return ScanDataForStartCodeSlow(Data);
+
+  int Limit = Todo;
+  if (state != syncing && Limit > packetTodo)
+     Limit = packetTodo;
+
+  if (ScanDataForStartCodeSlow(Data))
+     return true;
+
+  if (ScanDataForStartCodeSlow(++Data)) {
+     AdjustCounters(1, Done, Todo);
+     return true;
+     }
+  ++Data;
+
+  bool FoundStartCode = ScanDataForStartCodeFast(Data, DataOrig + Limit);
+  AdjustCounters(Data - DataOrig, Done, Todo);
+  return FoundStartCode;
+}
+
+void cVideoRepacker::AdjustCounters(const int Delta, int &Done, int &Todo)
+{
+  Done += Delta;
+  Todo -= Delta;
+
+  if (state <= syncing)
+     skippedBytes += Delta;
+  else
+     packetTodo -= Delta;
+}
+
 void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
 {
   // synchronisation is detected some bytes after frame start.
@@ -300,98 +464,9 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
         if (state <= syncing)
            skippedBytes++;
         // did we reach a start code?
-        scanner <<= 8;
-        if (scanner != 0x00000100)
-           scanner |= *data;
-        else {
-           scanner |= *data;
-
-           // which kind of start code have we got?
-           switch (*data) {
-             case 0xB9 ... 0xFF: // system start codes
-                  LOG("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
-                  break;
-             case 0xB0 ... 0xB1: // reserved start codes
-             case 0xB6:
-                  LOG("cVideoRepacker: found reserved start code: stream seems to be scrambled");
-                  break;
-             case 0xB4: // sequence error code
-                  LOG("cVideoRepacker: found sequence error code: stream seems to be damaged");
-             case 0xB2: // user data start code
-             case 0xB5: // extension start code
-                  break;
-             case 0xB7: // sequence end code
-             case 0xB3: // sequence header code
-             case 0xB8: // group start code
-             case 0x00: // picture start code
-                  if (state == scanPicture) {
-                     // the above start codes indicate that the current picture is done. So
-                     // push out the packet to start a new packet for the next picuture. If
-                     // the byte count get's negative then the current buffer ends in a
-                     // partitial start code that must be stripped off, as it shall be put
-                     // in the next packet.
-                     PushOutPacket(ResultBuffer, payload, data - 3 - payload);
-                     // go on with syncing to the next picture
-                     state = syncing;
-                     }
-                  if (state == syncing) {
-                     if (initiallySyncing) // omit report for the typical initial case
-                        initiallySyncing = false;
-                     else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                        LOG("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
-                     skippedBytes = 0;
-                     // if there is a PES header available, then use it ...
-                     if (pesHeaderBackupLen > 0) {
-                        // ISO 13818-1 says:
-                        // In the case of video, if a PTS is present in a PES packet header
-                        // it shall refer to the access unit containing the first picture start
-                        // code that commences in this PES packet. A picture start code commences
-                        // in PES packet if the first byte of the picture start code is present
-                        // in the PES packet.
-                        memcpy(pesHeader, pesHeaderBackup, pesHeaderBackupLen);
-                        pesHeaderLen = pesHeaderBackupLen;
-                        pesHeaderBackupLen = 0;
-                        }
-                     else {
-                        // ... otherwise create a continuation PES header
-                        pesHeaderLen = 0;
-                        pesHeader[pesHeaderLen++] = 0x00;
-                        pesHeader[pesHeaderLen++] = 0x00;
-                        pesHeader[pesHeaderLen++] = 0x01;
-                        pesHeader[pesHeaderLen++] = Data[3]; // video stream ID
-                        pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-                        pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-
-                        if (mpegLevel == phMPEG2) {
-                           pesHeader[pesHeaderLen++] = 0x80;
-                           pesHeader[pesHeaderLen++] = 0x00;
-                           pesHeader[pesHeaderLen++] = 0x00;
-                           }
-                        else
-                           pesHeader[pesHeaderLen++] = 0x0F;
-                        }
-                     // append the first three bytes of the start code
-                     pesHeader[pesHeaderLen++] = 0x00;
-                     pesHeader[pesHeaderLen++] = 0x00;
-                     pesHeader[pesHeaderLen++] = 0x01;
-                     // the next packet's payload will begin with the fourth byte of
-                     // the start code (= the actual code)
-                     payload = data;
-                     // as there is no length information available, assume the
-                     // maximum we can hold in one PES packet
-                     packetTodo = maxPacketSize - pesHeaderLen;
-                     // go on with finding the picture data
-                     state++;
-                     }
-                  break;
-             case 0x01 ... 0xAF: // slice start codes
-                  if (state == findPicture) {
-                     // go on with scanning the picture data
-                     state++;
-                     }
-                  break;
-             }
-           }
+        if (ScanDataForStartCode(data, done, todo))
+           HandleStartCode(data, ResultBuffer, payload, Data[3], mpegLevel);
+        // move on
         data++;
         done++;
         todo--;
@@ -501,6 +576,79 @@ void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
      }
 }
 
+bool cVideoRepacker::ScanForEndOfPictureSlow(const uchar *&Data)
+{
+  localScanner <<= 8;
+  localScanner |= *Data++;
+  // check start codes which follow picture data
+  switch (localScanner) {
+    case 0x00000100: // picture start code
+    case 0x000001B8: // group start code
+    case 0x000001B3: // sequence header code
+    case 0x000001B7: // sequence end code
+         return true;
+    }
+  return false;
+}
+
+bool cVideoRepacker::ScanForEndOfPictureFast(const uchar *&Data, const uchar *Limit)
+{
+  Limit--;
+
+  while (Data < Limit && (Data = (const uchar *)memchr(Data, 0x01, Limit - Data))) {
+        if (Data[-2] || Data[-1])
+           Data += 3;
+        else {
+           localScanner = 0x00000100 | *++Data;
+           // check start codes which follow picture data
+           switch (localScanner) {
+             case 0x00000100: // picture start code
+             case 0x000001B8: // group start code
+             case 0x000001B3: // sequence header code
+             case 0x000001B7: // sequence end code
+                  Data++;
+                  return true;
+             default:
+                  Data += 3;
+             }
+           }
+        }
+
+  Data = Limit + 1;
+  unsigned long *LocalScanner = (unsigned long *)(Data - 4);
+  localScanner = ntohl(*LocalScanner);
+  return false;
+}
+
+bool cVideoRepacker::ScanForEndOfPicture(const uchar *&Data, const uchar *Limit)
+{
+  const uchar *const DataOrig = Data;
+  const int MinDataSize = 4;
+  bool FoundEndOfPicture;
+
+  if (Limit - Data <= MinDataSize) {
+     FoundEndOfPicture = false;
+     while (Data < Limit) {
+           if (ScanForEndOfPictureSlow(Data)) {
+              FoundEndOfPicture = true;
+              break;
+              }
+           }
+     }
+  else {
+     FoundEndOfPicture = true;
+     if (!ScanForEndOfPictureSlow(Data)) {
+        if (!ScanForEndOfPictureSlow(Data)) {
+           if (!ScanForEndOfPictureFast(Data, Limit))
+              FoundEndOfPicture = false;
+           }
+        }
+     }
+
+  localStart += (Data - DataOrig);
+  return FoundEndOfPicture;
+}
+
 int cVideoRepacker::BreakAt(const uchar *Data, int Count)
 {
   if (initiallySyncing)
@@ -522,19 +670,8 @@ int cVideoRepacker::BreakAt(const uchar *Data, int Count)
      const uchar *data = Data + PesPayloadOffset + localStart;
      const uchar *limit = Data + Count;
      // scan data
-     while (data < limit) {
-           localStart++;
-           localScanner <<= 8;
-           localScanner |= *data++;
-           // check start codes which follow picture data
-           switch (localScanner) {
-             case 0x00000100: // picture start code
-             case 0x000001B8: // group start code
-             case 0x000001B3: // sequence header code
-             case 0x000001B7: // sequence end code
-                  return data - Data;
-             }
-           }
+     if (ScanForEndOfPicture(data, limit))
+        return data - Data;
      }
   // just fill up packet and append next start code
   return PesPayloadOffset + packetTodo + 4;
diff --git a/runvdr b/runvdr
index b03a63bba..355549cb3 100755
--- a/runvdr
+++ b/runvdr
@@ -5,12 +5,9 @@
 # If VDR exits abnormally, the driver will be reloaded
 # and VDR restarted.
 #
-# Set the environment variable VDRUSR to the user id you
-# want VDR to run with. If VDRUSR is not set, VDR will run
-# as user 'vdr'.
-#
 # Since this script loads the DVB driver, it must be started
-# as user 'root'.
+# as user 'root'. Add the option "-u username" to run VDR
+# under the given user name.
 #
 # Any command line parameters will be passed on to the
 # actual 'vdr' program.
@@ -18,11 +15,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.15 2005/12/31 16:04:53 kls Exp $
+# $Id: runvdr 1.16 2006/02/04 15:20:48 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
-VDRCMD="$VDRPRG -u $VDRUSR -w 60 $*"
+VDRCMD="$VDRPRG -w 60 $*"
 
 LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
 KILL="/usr/bin/killall -q -TERM"
diff --git a/skinclassic.c b/skinclassic.c
index 18851a8ee..f471b3031 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.13 2006/01/01 14:37:58 kls Exp $
+ * $Id: skinclassic.c 1.14 2006/02/05 14:51:39 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -169,6 +169,8 @@ class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
   virtual void SetEvent(const cEvent *Event);
   virtual void SetRecording(const cRecording *Recording);
   virtual void SetText(const char *Text, bool FixedFont);
+  virtual int GetTextAreaWidth(void) const;
+  virtual const cFont *GetTextAreaFont(bool FixedFont) const;
   virtual void Flush(void);
   };
 
@@ -357,11 +359,20 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
 
 void cSkinClassicDisplayMenu::SetText(const char *Text, bool FixedFont)
 {
-  const cFont *font = cFont::GetFont(FixedFont ? fontFix : fontOsd);
-  textScroller.Set(osd, x0, y2, x1 - x0 - 2 * ScrollWidth, y3 - y2, Text, font, Theme.Color(clrMenuText), Theme.Color(clrBackground));
+  textScroller.Set(osd, x0, y2, GetTextAreaWidth(), y3 - y2, Text, GetTextAreaFont(FixedFont), Theme.Color(clrMenuText), Theme.Color(clrBackground));
   SetScrollbar();
 }
 
+int cSkinClassicDisplayMenu::GetTextAreaWidth(void) const
+{
+  return x1 - x0 - 2 * ScrollWidth;
+}
+
+const cFont *cSkinClassicDisplayMenu::GetTextAreaFont(bool FixedFont) const
+{
+  return cFont::GetFont(FixedFont ? fontFix : fontOsd);
+}
+
 void cSkinClassicDisplayMenu::Flush(void)
 {
   cString date = DayDateTime();
diff --git a/skins.c b/skins.c
index e65d29023..0952b118f 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.7 2006/01/08 11:40:18 kls Exp $
+ * $Id: skins.c 1.8 2006/02/05 14:53:04 kls Exp $
  */
 
 #include "skins.h"
@@ -108,6 +108,16 @@ const char *cSkinDisplayMenu::GetTabbedText(const char *s, int Tab)
   return buffer;
 }
 
+int cSkinDisplayMenu::GetTextAreaWidth(void) const
+{
+  return 0;
+}
+
+const cFont *cSkinDisplayMenu::GetTextAreaFont(bool) const
+{
+  return NULL;
+}
+
 // --- cSkinDisplayReplay::cProgressBar --------------------------------------
 
 cSkinDisplayReplay::cProgressBar::cProgressBar(int Width, int Height, int Current, int Total, const cMarks *Marks, tColor ColorSeen, tColor ColorRest, tColor ColorSelected, tColor ColorMark, tColor ColorCurrent)
diff --git a/skins.h b/skins.h
index f862cc136..96f28219d 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.10 2006/01/08 11:40:21 kls Exp $
+ * $Id: skins.h 1.11 2006/02/05 14:59:57 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -160,6 +160,19 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< the Scroll() function will be called to drive scrolling that text if
        ///< necessary.
   //XXX ??? virtual void SetHelp(const char *Help) = 0;
+  virtual int GetTextAreaWidth(void) const;
+       ///< Returns the width in pixel of the area which is used to display text
+       ///< with SetText(). The width of the area is the width of the central area
+       ///< minus the width of any possibly displayed scroll-bar or other decoration.
+       ///< The default implementation returns 0. Therefore a caller of this method
+       ///< must be prepared to receive 0 if the plugin doesn't implement this method.
+  virtual const cFont *GetTextAreaFont(bool FixedFont) const;
+       ///< Returns a pointer to the font which is used to display text with SetText().
+       ///< The parameter FixedFont has the same meaning as in SetText(). The default
+       ///< implementation returns NULL. Therefore a caller of this method must be
+       ///< prepared to receive NULL if the plugin doesn't implement this method.
+       ///< The returned pointer is valid a long as the instance of cSkinDisplayMenu
+       ///< exists.
   };
 
 class cSkinDisplayReplay : public cSkinDisplay {
diff --git a/skinsttng.c b/skinsttng.c
index 1e2d8cdc8..97e8fc8b9 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.16 2006/01/01 14:38:14 kls Exp $
+ * $Id: skinsttng.c 1.18 2006/02/05 14:51:39 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -347,6 +347,8 @@ class cSkinSTTNGDisplayMenu : public cSkinDisplayMenu {
   virtual void SetEvent(const cEvent *Event);
   virtual void SetRecording(const cRecording *Recording);
   virtual void SetText(const char *Text, bool FixedFont);
+  virtual int GetTextAreaWidth(void) const;
+  virtual const cFont *GetTextAreaFont(bool FixedFont) const;
   virtual void Flush(void);
   };
 
@@ -617,11 +619,21 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
 }
 
 void cSkinSTTNGDisplayMenu::SetText(const char *Text, bool FixedFont)
+{
+  textScroller.Set(osd, x3, y3, GetTextAreaWidth(), y4 - y3, Text, GetTextAreaFont(FixedFont), Theme.Color(clrMenuText), Theme.Color(clrBackground));
+  SetScrollbar();
+}
+
+int cSkinSTTNGDisplayMenu::GetTextAreaWidth(void) const
+{
+  return x4 - x3;
+}
+
+const cFont *cSkinSTTNGDisplayMenu::GetTextAreaFont(bool FixedFont) const
 {
   const cFont *font = cFont::GetFont(FixedFont ? fontFix : fontOsd);
   font = cFont::GetFont(fontSml);//XXX -> make a way to let the text define which font to use
-  textScroller.Set(osd, x3, y3, x4 - x3, y4 - y3, Text, font, Theme.Color(clrMenuText), Theme.Color(clrBackground));
-  SetScrollbar();
+  return font;
 }
 
 void cSkinSTTNGDisplayMenu::Flush(void)
@@ -721,7 +733,7 @@ void cSkinSTTNGDisplayReplay::SetTitle(const char *Title)
   osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrReplayTitle), frameColor, cFont::GetFont(fontSml), x4 - x3 - 5);
 }
 
-static char **ReplaySymbols[2][2][5] = {
+static const char *const *ReplaySymbols[2][2][5] = {
   { { pause_xpm, srew_xpm, srew1_xpm, srew2_xpm, srew3_xpm },
     { pause_xpm, sfwd_xpm, sfwd1_xpm, sfwd2_xpm, sfwd3_xpm }, },
   { { play_xpm,  frew_xpm, frew1_xpm, frew2_xpm, frew3_xpm },
diff --git a/symbols/arrowdown.xpm b/symbols/arrowdown.xpm
index a3f49cdfa..8ef6b0aa7 100644
--- a/symbols/arrowdown.xpm
+++ b/symbols/arrowdown.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * arrowdown_xpm[] = {
+static const char *const arrowdown_xpm[] = {
 "12 12 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/arrowup.xpm b/symbols/arrowup.xpm
index a177b4a27..9ee2e6c0d 100644
--- a/symbols/arrowup.xpm
+++ b/symbols/arrowup.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * arrowup_xpm[] = {
+static const char *const arrowup_xpm[] = {
 "12 12 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/audio.xpm b/symbols/audio.xpm
index 26f7cabf1..44021adc7 100644
--- a/symbols/audio.xpm
+++ b/symbols/audio.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audio_xpm[] = {
+static const char *const audio_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/audioleft.xpm b/symbols/audioleft.xpm
index 3536c25a1..8f683605c 100644
--- a/symbols/audioleft.xpm
+++ b/symbols/audioleft.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audioleft_xpm[] = {
+static const char *const audioleft_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/audioright.xpm b/symbols/audioright.xpm
index fc03cd3d7..b349792c6 100644
--- a/symbols/audioright.xpm
+++ b/symbols/audioright.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audioright_xpm[] = {
+static const char *const audioright_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/audiostereo.xpm b/symbols/audiostereo.xpm
index fdd7b8456..4c59a5ebb 100644
--- a/symbols/audiostereo.xpm
+++ b/symbols/audiostereo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * audiostereo_xpm[] = {
+static const char *const audiostereo_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/dolbydigital.xpm b/symbols/dolbydigital.xpm
index e51709ea7..432b4762f 100644
--- a/symbols/dolbydigital.xpm
+++ b/symbols/dolbydigital.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital_xpm[] = {
+static const char *const dolbydigital_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/encrypted.xpm b/symbols/encrypted.xpm
index f2ae082a8..fc3178b0b 100644
--- a/symbols/encrypted.xpm
+++ b/symbols/encrypted.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * encrypted_xpm[] = {
+static const char *const encrypted_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/ffwd.xpm b/symbols/ffwd.xpm
index 7d1edc2c8..fb3932935 100644
--- a/symbols/ffwd.xpm
+++ b/symbols/ffwd.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd_xpm[] = {
+static const char *const ffwd_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/ffwd1.xpm b/symbols/ffwd1.xpm
index f78db80c1..4b81436bc 100644
--- a/symbols/ffwd1.xpm
+++ b/symbols/ffwd1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd1_xpm[] = {
+static const char *const ffwd1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/ffwd2.xpm b/symbols/ffwd2.xpm
index f117fc25e..19e62d17f 100644
--- a/symbols/ffwd2.xpm
+++ b/symbols/ffwd2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd2_xpm[] = {
+static const char *const ffwd2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/ffwd3.xpm b/symbols/ffwd3.xpm
index 8b9e9b0d9..2bc65bdbb 100644
--- a/symbols/ffwd3.xpm
+++ b/symbols/ffwd3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ffwd3_xpm[] = {
+static const char *const ffwd3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/frew.xpm b/symbols/frew.xpm
index d8a6c4747..3583735f8 100644
--- a/symbols/frew.xpm
+++ b/symbols/frew.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew_xpm[] = {
+static const char *const frew_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/frew1.xpm b/symbols/frew1.xpm
index 493c229d3..4aab79238 100644
--- a/symbols/frew1.xpm
+++ b/symbols/frew1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew1_xpm[] = {
+static const char *const frew1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/frew2.xpm b/symbols/frew2.xpm
index 81fc0ee65..707edfce8 100644
--- a/symbols/frew2.xpm
+++ b/symbols/frew2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew2_xpm[] = {
+static const char *const frew2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/frew3.xpm b/symbols/frew3.xpm
index 19b183cd9..95a3d1539 100644
--- a/symbols/frew3.xpm
+++ b/symbols/frew3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * frew3_xpm[] = {
+static const char *const frew3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/mute.xpm b/symbols/mute.xpm
index 0f1292f5c..90fb79ccc 100644
--- a/symbols/mute.xpm
+++ b/symbols/mute.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mute_xpm[] = {
+static const char *const mute_xpm[] = {
 "26 20 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/pause.xpm b/symbols/pause.xpm
index c1d82c326..945b79409 100644
--- a/symbols/pause.xpm
+++ b/symbols/pause.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pause_xpm[] = {
+static const char *const pause_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/play.xpm b/symbols/play.xpm
index 0e088f862..ca27fa32c 100644
--- a/symbols/play.xpm
+++ b/symbols/play.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * play_xpm[] = {
+static const char *const play_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/radio.xpm b/symbols/radio.xpm
index f4d1fc936..a14b0a9de 100644
--- a/symbols/radio.xpm
+++ b/symbols/radio.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * radio_xpm[] = {
+static const char *const radio_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/recording.xpm b/symbols/recording.xpm
index ea7bbd6db..155df6159 100644
--- a/symbols/recording.xpm
+++ b/symbols/recording.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * recording_xpm[] = {
+static const char *const recording_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/sfwd.xpm b/symbols/sfwd.xpm
index 38468e5d4..e79c69ba5 100644
--- a/symbols/sfwd.xpm
+++ b/symbols/sfwd.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd_xpm[] = {
+static const char *const sfwd_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/sfwd1.xpm b/symbols/sfwd1.xpm
index f07801b0e..67cf6ce30 100644
--- a/symbols/sfwd1.xpm
+++ b/symbols/sfwd1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd1_xpm[] = {
+static const char *const sfwd1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/sfwd2.xpm b/symbols/sfwd2.xpm
index 784744a1c..a90bb92e2 100644
--- a/symbols/sfwd2.xpm
+++ b/symbols/sfwd2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd2_xpm[] = {
+static const char *const sfwd2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/sfwd3.xpm b/symbols/sfwd3.xpm
index 05abde6be..e03965cf4 100644
--- a/symbols/sfwd3.xpm
+++ b/symbols/sfwd3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sfwd3_xpm[] = {
+static const char *const sfwd3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/srew.xpm b/symbols/srew.xpm
index 4dbae7e58..05b9dc15b 100644
--- a/symbols/srew.xpm
+++ b/symbols/srew.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew_xpm[] = {
+static const char *const srew_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/srew1.xpm b/symbols/srew1.xpm
index 101cdf734..43de690f9 100644
--- a/symbols/srew1.xpm
+++ b/symbols/srew1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew1_xpm[] = {
+static const char *const srew1_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/srew2.xpm b/symbols/srew2.xpm
index f664532bc..f06a1e39b 100644
--- a/symbols/srew2.xpm
+++ b/symbols/srew2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew2_xpm[] = {
+static const char *const srew2_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/srew3.xpm b/symbols/srew3.xpm
index b82a6c724..b8819804d 100644
--- a/symbols/srew3.xpm
+++ b/symbols/srew3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * srew3_xpm[] = {
+static const char *const srew3_xpm[] = {
 "28 26 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/teletext.xpm b/symbols/teletext.xpm
index 49fc3c248..345ab9ed4 100644
--- a/symbols/teletext.xpm
+++ b/symbols/teletext.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * teletext_xpm[] = {
+static const char *const teletext_xpm[] = {
 "27 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/symbols/volume.xpm b/symbols/volume.xpm
index 9cbc0b258..c6186feea 100644
--- a/symbols/volume.xpm
+++ b/symbols/volume.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * volume_xpm[] = {
+static const char *const volume_xpm[] = {
 "28 14 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
diff --git a/timers.c b/timers.c
index ab426802a..e5b9ea613 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.45 2006/01/28 15:09:05 kls Exp $
+ * $Id: timers.c 1.46 2006/02/03 15:20:14 kls Exp $
  */
 
 #include "timers.h"
@@ -535,13 +535,22 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
 
 cTimer *cTimers::GetMatch(time_t t)
 {
+  static int LastPending = -1;
   cTimer *t0 = NULL;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
       if (!ti->Recording() && ti->Matches(t)) {
+         if (ti->Pending()) {
+            if (ti->Index() > LastPending)
+               LastPending = ti->Index();
+            else
+               continue;
+            }
          if (!t0 || ti->Priority() > t0->Priority())
             t0 = ti;
          }
       }
+  if (!t0)
+     LastPending = -1;
   return t0;
 }
 
diff --git a/tools.c b/tools.c
index 031c120ab..fb8878933 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.112 2006/01/20 14:01:28 kls Exp $
+ * $Id: tools.c 1.114 2006/02/05 11:05:56 kls Exp $
  */
 
 #include "tools.h"
@@ -1054,10 +1054,9 @@ bool cSafeFile::Close(void)
 
 // --- cUnbufferedFile -------------------------------------------------------
 
-//#define USE_FADVISE
+#define USE_FADVISE
 
-#define READ_AHEAD MEGABYTE(2)
-#define WRITE_BUFFER MEGABYTE(10)
+#define WRITE_BUFFER KILOBYTE(800)
 
 cUnbufferedFile::cUnbufferedFile(void)
 {
@@ -1073,8 +1072,17 @@ int cUnbufferedFile::Open(const char *FileName, int Flags, mode_t Mode)
 {
   Close();
   fd = open(FileName, Flags, Mode);
-  begin = end = ahead = -1;
+  curpos = 0;
+#ifdef USE_FADVISE
+  begin = lastpos = ahead = 0;
+  cachedstart = 0;
+  cachedend = 0;
+  readahead = KILOBYTE(128);
   written = 0;
+  totwritten = 0;
+  if (fd >= 0)
+     posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM); // we could use POSIX_FADV_SEQUENTIAL, but we do our own readahead, disabling the kernel one.
+#endif
   return fd;
 }
 
@@ -1082,16 +1090,9 @@ int cUnbufferedFile::Close(void)
 {
 #ifdef USE_FADVISE
   if (fd >= 0) {
-     if (ahead > end)
-        end = ahead;
-     if (begin >= 0 && end > begin) {
-        //dsyslog("close buffer: %d (flush: %d bytes, %ld-%ld)", fd, written, begin, end);
-        if (written)
-           fdatasync(fd);
-        posix_fadvise(fd, begin, end - begin, POSIX_FADV_DONTNEED);
-        }
-     begin = end = ahead = -1;
-     written = 0;
+     if (totwritten)    // if we wrote anything make sure the data has hit the disk before
+        fdatasync(fd);  // calling fadvise, as this is our last chance to un-cache it.
+     posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
      }
 #endif
   int OldFd = fd;
@@ -1099,45 +1100,84 @@ int cUnbufferedFile::Close(void)
   return close(OldFd);
 }
 
+// When replaying and going e.g. FF->PLAY the position jumps back 2..8M
+// hence we do not want to drop recently accessed data at once.
+// We try to handle the common cases such as PLAY->FF->PLAY, small
+// jumps, moving editing marks etc.
+
+#define FADVGRAN   KILOBYTE(4) // AKA fadvise-chunk-size; PAGE_SIZE or getpagesize(2) would also work.
+#define READCHUNK  MEGABYTE(8)
+
+void cUnbufferedFile::SetReadAhead(size_t ra)
+{
+  readahead = ra;
+}
+
+int cUnbufferedFile::FadviseDrop(off_t Offset, off_t Len)
+{
+  // rounding up the window to make sure that not PAGE_SIZE-aligned data gets freed.
+  return posix_fadvise(fd, Offset - (FADVGRAN - 1), Len + (FADVGRAN - 1) * 2, POSIX_FADV_DONTNEED);
+}
+
 off_t cUnbufferedFile::Seek(off_t Offset, int Whence)
 {
-  if (fd >= 0)
-     return lseek(fd, Offset, Whence);
-  return -1;
+  if (Whence == SEEK_SET && Offset == curpos)
+     return curpos;
+  curpos = lseek(fd, Offset, Whence);
+  return curpos;
 }
 
 ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
 {
   if (fd >= 0) {
 #ifdef USE_FADVISE
-     off_t pos = lseek(fd, 0, SEEK_CUR);
-     // jump forward - adjust end position
-     if (pos > end)
-        end = pos;
-     // after adjusting end - don't clear more than previously requested
-     if (end > ahead)
-        end = ahead;
-     // jump backward - drop read ahead of previous run
-     if (pos < begin)
-        end = ahead;
-     if (begin >= 0 && end > begin)
-        posix_fadvise(fd, begin - KILOBYTE(200), end - begin + KILOBYTE(200), POSIX_FADV_DONTNEED);//XXX macros/parameters???
-     begin = pos;
+     off_t jumped = curpos-lastpos; // nonzero means we're not at the last offset
+     if ((cachedstart < cachedend) && (curpos < cachedstart || curpos > cachedend)) {
+        // current position is outside the cached window -- invalidate it.
+        FadviseDrop(cachedstart, cachedend-cachedstart);
+        cachedstart = curpos;
+        cachedend = curpos;
+        }
+     cachedstart = min(cachedstart, curpos);
 #endif
      ssize_t bytesRead = safe_read(fd, Data, Size);
 #ifdef USE_FADVISE
      if (bytesRead > 0) {
-        pos += bytesRead;
-        end = pos;
-        // this seems to trigger a non blocking read - this
-        // may or may not have been finished when we will be called next time.
-        // If it is not finished we can't release the not yet filled buffers.
-        // So this is commented out till we find a better solution.
-        //posix_fadvise(fd, pos, READ_AHEAD, POSIX_FADV_WILLNEED);
-        ahead = pos + READ_AHEAD;
+        curpos += bytesRead;
+        cachedend = max(cachedend, curpos);
+
+        // Read ahead:
+        // no jump? (allow small forward jump still inside readahead window).
+        if (jumped >= 0 && jumped <= (off_t)readahead) {
+           // Trigger the readahead IO, but only if we've used at least
+           // 1/2 of the previously requested area. This avoids calling
+           // fadvise() after every read() call.
+           if (ahead - curpos < (off_t)(readahead / 2)) {
+              posix_fadvise(fd, curpos, readahead, POSIX_FADV_WILLNEED);
+              ahead = curpos + readahead;
+              cachedend = max(cachedend, ahead);
+              }
+           if (readahead < Size * 32) { // automagically tune readahead size.
+              readahead = Size * 32;
+              }
+           }
+        else
+           ahead = curpos; // jumped -> we really don't want any readahead, otherwise e.g. fast-rewind gets in trouble.
         }
-     else
-        end = pos;
+
+     if (cachedstart < cachedend) {
+        if (curpos - cachedstart > READCHUNK * 2) {
+           // current position has moved forward enough, shrink tail window.
+           FadviseDrop(cachedstart, curpos - READCHUNK - cachedstart);
+           cachedstart = curpos - READCHUNK;
+           }
+        else if (cachedend > ahead && cachedend - curpos > READCHUNK * 2) {
+           // current position has moved back enough, shrink head window.
+           FadviseDrop(curpos + READCHUNK, cachedend - curpos + READCHUNK);
+           cachedend = curpos + READCHUNK;
+           }
+        }
+     lastpos = curpos;
 #endif
      return bytesRead;
      }
@@ -1147,28 +1187,46 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
 ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
 {
   if (fd >=0) {
-#ifdef USE_FADVISE
-     off_t pos = lseek(fd, 0, SEEK_CUR);
-#endif
      ssize_t bytesWritten = safe_write(fd, Data, Size);
 #ifdef USE_FADVISE
-     if (bytesWritten >= 0) {
+     if (bytesWritten > 0) {
+        begin = min(begin, curpos);
+        curpos += bytesWritten;
         written += bytesWritten;
-        if (begin >= 0) {
-           if (pos < begin)
-              begin = pos;
-           }
-        else
-           begin = pos;
-        if (pos + bytesWritten > end)
-           end = pos + bytesWritten;
+        lastpos = max(lastpos, curpos);
         if (written > WRITE_BUFFER) {
-           //dsyslog("flush buffer: %d (%d bytes, %ld-%ld)", fd, written, begin, end);
-           fdatasync(fd);
-           if (begin >= 0 && end > begin)
-              posix_fadvise(fd, begin, end - begin, POSIX_FADV_DONTNEED);
-           begin = end = -1;
+           if (lastpos > begin) {
+              // Now do three things:
+              // 1) Start writeback of begin..lastpos range
+              // 2) Drop the already written range (by the previous fadvise call)
+              // 3) Handle nonpagealigned data.
+              //    This is why we double the WRITE_BUFFER; the first time around the
+              //    last (partial) page might be skipped, writeback will start only after
+              //    second call; the third call will still include this page and finally
+              //    drop it from cache.
+              off_t headdrop = min(begin, WRITE_BUFFER * 2L);
+              posix_fadvise(fd, begin - headdrop, lastpos - begin + headdrop, POSIX_FADV_DONTNEED);
+              }
+           begin = lastpos = curpos;
+           totwritten += written;
            written = 0;
+           // The above fadvise() works when writing slowly (recording), but could
+           // leave cached data around when writing at a high rate, e.g. when cutting,
+           // because by the time we try to flush the cached pages (above) the data
+           // can still be dirty - we are faster than the disk I/O.
+           // So we do another round of flushing, just like above, but at larger
+           // intervals -- this should catch any pages that couldn't be released
+           // earlier.
+           if (totwritten > MEGABYTE(32)) {
+              // It seems in some setups, fadvise() does not trigger any I/O and
+              // a fdatasync() call would be required do all the work (reiserfs with some
+              // kind of write gathering enabled), but the syncs cause (io) load..
+              // Uncomment the next line if you think you need them.
+              //fdatasync(fd);
+              off_t headdrop = min(curpos - totwritten, totwritten * 2L);
+              posix_fadvise(fd, curpos - totwritten - headdrop, totwritten + headdrop, POSIX_FADV_DONTNEED);
+              totwritten = 0;
+              }
            }
         }
 #endif
diff --git a/tools.h b/tools.h
index 7e57744be..a52ced81f 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.90 2006/01/15 16:19:56 kls Exp $
+ * $Id: tools.h 1.92 2006/02/04 14:27:05 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -242,15 +242,22 @@ class cSafeFile {
 class cUnbufferedFile {
 private:
   int fd;
+  off_t curpos;
+  off_t cachedstart;
+  off_t cachedend;
   off_t begin;
-  off_t end;
+  off_t lastpos;
   off_t ahead;
-  ssize_t written;
+  size_t readahead;
+  size_t written;
+  size_t totwritten;
+  int FadviseDrop(off_t Offset, off_t Len);
 public:
   cUnbufferedFile(void);
   ~cUnbufferedFile();
   int Open(const char *FileName, int Flags, mode_t Mode = DEFFILEMODE);
   int Close(void);
+  void SetReadAhead(size_t ra);
   off_t Seek(off_t Offset, int Whence);
   ssize_t Read(void *Data, size_t Size);
   ssize_t Write(const void *Data, size_t Size);
diff --git a/transfer.c b/transfer.c
index b8313df07..afaccd15e 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.32 2006/01/28 14:23:38 kls Exp $
+ * $Id: transfer.c 1.33 2006/01/29 17:24:39 kls Exp $
  */
 
 #include "transfer.h"
@@ -20,7 +20,6 @@ cTransfer::cTransfer(int VPid, const int *APids, const int *DPids, const int *SP
 {
   ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
   remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids);
-  needsBufferReserve = Setup.UseDolbyDigital && VPid != 0 && DPids && DPids[0] != 0;
 }
 
 cTransfer::~cTransfer()
diff --git a/transfer.h b/transfer.h
index fa88f122c..7210ac077 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.10 2005/08/13 10:16:02 kls Exp $
+ * $Id: transfer.h 1.11 2006/01/29 17:24:43 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -20,7 +20,6 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
 private:
   cRingBufferLinear *ringBuffer;
   cRemux *remux;
-  bool needsBufferReserve;
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
diff --git a/vdr.c b/vdr.c
index 3913f6255..5e17a37df 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.246 2006/01/29 14:35:31 kls Exp $
+ * $Id: vdr.c 1.249 2006/02/05 12:57:10 kls Exp $
  */
 
 #include <getopt.h>
@@ -97,6 +97,10 @@ static bool SetUser(const char *UserName)
         fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
         return false;
         }
+     if (prctl(PR_SET_DUMPABLE, 2, 0, 0, 0) < 0) {
+        fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
+        // always non-fatal, and will not work with kernel < 2.6.13
+        }
      }
   return true;
 }
@@ -709,7 +713,7 @@ int main(int argc, char *argv[])
                   if (Channel->Modification(CHANNELMOD_RETUNE)) {
                      cRecordControls::ChannelDataModified(Channel);
                      if (Channel->Number() == cDevice::CurrentChannel()) {
-                        if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice()) {
+                        if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) {
                            if (cDevice::ActualDevice()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
                               isyslog("retuning due to modification of channel %d", Channel->Number());
                               Channels.SwitchTo(Channel->Number());
@@ -796,8 +800,12 @@ int main(int argc, char *argv[])
                bool WasMenu = Interact && Interact->IsMenu();
                if (Menu)
                   DELETE_MENU;
-               else if (cControl::Control() && cOsd::IsOpen())
-                  cControl::Control()->Hide();
+               else if (cControl::Control()) {
+                  if (cOsd::IsOpen())
+                     cControl::Control()->Hide();
+                  else
+                     WasOpen = false;
+                  }
                if (!WasOpen || !WasMenu && !Setup.MenuButtonCloses)
                   Menu = new cMenuMain;
                }

From b9bfba20f25a0562d22bb57d611abc3918e1c147 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 19 Feb 2006 18:00:00 +0100
Subject: [PATCH 135/307] =?UTF-8?q?Version=201.3.43=20-=20Removed=20an=20u?=
 =?UTF-8?q?nnecessary=20toFile->SetReadAhead()=20from=20cutter.c=20(thanks?=
 =?UTF-8?q?=20to=20Artur=20=20=20Skawina).=20-=20The=20"Back"=20key=20now?=
 =?UTF-8?q?=20restores=20the=20original=20string=20when=20pressed=20while?=
 =?UTF-8?q?=20editing=20a=20=20=20string=20item=20(suggested=20by=20Markus?=
 =?UTF-8?q?=20Hahn).=20-=20Now=20stopping=20scanning=20the=20video=20direc?=
 =?UTF-8?q?tory=20if=20there=20are=20too=20many=20levels=20of=20=20=20symb?=
 =?UTF-8?q?olic=20links,=20which=20might=20indicate=20a=20recursive=20link?=
 =?UTF-8?q?=20loop=20(based=20on=20a=20patch=20=20=20from=20Helmut=20Auer)?=
 =?UTF-8?q?.=20-=20Improved=20OSD=20area=20handling=20in=20cDvbSpuDecoder?=
 =?UTF-8?q?=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Now=20log?=
 =?UTF-8?q?ging=20the=20description=20(if=20present)=20in=20case=20a=20thr?=
 =?UTF-8?q?ead=20is=20canceled=20(suggested=20=20=20by=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20cMenuText=20now=20uses=20the=20given=20?=
 =?UTF-8?q?font=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20The=20ST:TNG=20s?=
 =?UTF-8?q?kin=20now=20uses=20the=20fixed=20font=20if=20requested=20when?=
 =?UTF-8?q?=20displaying=20texts.=20-=20Fixed=20some=20typos=20in=20the=20?=
 =?UTF-8?q?CONTRIBUTORS=20file=20(thanks=20to=20Frank=20Kr=C3=B6mmelbein).?=
 =?UTF-8?q?=20-=20Changed=20offset=20and=20size=20handling=20in=20'libsi'?=
 =?UTF-8?q?=20from=20'unsigned'=20to=20'signed',=20so=20that=20=20=20overf?=
 =?UTF-8?q?lows=20can=20be=20better=20detected=20(thanks=20to=20Marcel=20W?=
 =?UTF-8?q?iesweg).=20-=20Checking=20data=20size=20in=20CaDescriptor::Pars?=
 =?UTF-8?q?e()=20and=20LinkageDescriptor::Parse()=20of=20=20=20'libsi'=20t?=
 =?UTF-8?q?o=20avoid=20crashes=20with=20invalid=20data=20(thanks=20to=20Ma?=
 =?UTF-8?q?rcel=20Wiesweg).=20-=20Made=20CharArray::DataOwnData::assign()?=
 =?UTF-8?q?=20in=20'libsi'=20more=20robust=20against=20invalid=20=20=20dat?=
 =?UTF-8?q?a=20(suggested=20by=20Oliver=20Endriss).=20Also=20changed=20Cha?=
 =?UTF-8?q?rArray::DataOwnData::Delete()=20=20=20so=20that=20it=20sets=20'?=
 =?UTF-8?q?size'=20and=20'data'=20to=200.=20-=20Now=20resetting=20the=20ch?=
 =?UTF-8?q?annel=20number=20if=20the=20number=20entered=20through=20the=20?=
 =?UTF-8?q?numeric=20keys=20=20=20exceeds=20the=20maximum=20channel=20numb?=
 =?UTF-8?q?er=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20The=20language=20c?=
 =?UTF-8?q?ode=20in=20the=20'X'=20component=20records=20of=20EPG=20data=20?=
 =?UTF-8?q?can=20now=20consist=20of=20=20=20two=20codes,=20separated=20by?=
 =?UTF-8?q?=20'+'.=20-=20If=20a=20recording=20starts=20and=20there=20is=20?=
 =?UTF-8?q?no=20EPG=20data=20available=20for=20the=20recorded=20channel,?=
 =?UTF-8?q?=20=20=20the=20'X'=20audio=20component=20records=20for=20the=20?=
 =?UTF-8?q?'info.vdr'=20file=20are=20now=20generated=20from=20the=20=20=20?=
 =?UTF-8?q?channel's=20PID=20data.=20-=20Externally=20provided=20EPG=20dat?=
 =?UTF-8?q?a=20(with=20table=20ID=200x00)=20now=20gets=20its=20component?=
 =?UTF-8?q?=20=20=20descriptors=20set=20from=20the=20broadcast=20data,=20s?=
 =?UTF-8?q?o=20that=20language=20codes=20and=20descriptions=20=20=20are=20?=
 =?UTF-8?q?available=20(suggested=20by=20Andreas=20Brugger).=20-=20When=20?=
 =?UTF-8?q?setting=20the=20audio=20track=20descriptions,=20the=20language?=
 =?UTF-8?q?=20codes=20are=20now=20also=20set=20=20=20in=20case=20this=20is?=
 =?UTF-8?q?=20a=20replay=20session=20(based=20on=20a=20patch=20from=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).=20-=20If=20a=20recording=20starts=20and=20the=20?=
 =?UTF-8?q?channel's=20audio=20PID=20data=20has=20more=20language=20code?=
 =?UTF-8?q?=20=20=20information=20than=20the=20EPG's=20component=20data,?=
 =?UTF-8?q?=20the=20code=20from=20the=20channel=20is=20taken.=20-=20Fixed?=
 =?UTF-8?q?=20handling=20DPID=20when=20deciding=20whether=20to=20switch=20?=
 =?UTF-8?q?to=20'Transfer=20Mode'=20(thanks=20=20=20to=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20Fixed=20replaying=20recordings=20of=20r?=
 =?UTF-8?q?adio=20channels=20with=20many=20audio=20tracks=20(thanks=20to?=
 =?UTF-8?q?=20=20=20Reinhard=20Nissl).=20-=20Added=20a=20comment=20to=20tC?=
 =?UTF-8?q?hannelID::nid,=20explaining=20that=20is=20is=20actually=20the?=
 =?UTF-8?q?=20"original"=20=20=20network=20id.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS       | 21 ++++++++++++++--
 HISTORY            | 43 ++++++++++++++++++++++++++++++++
 channels.conf      | 28 ++++++++++-----------
 channels.h         |  4 +--
 config.h           |  6 ++---
 cutter.c           |  3 +--
 dvbdevice.c        |  4 +--
 dvbplayer.c        | 27 +++++++++++++++++---
 dvbspu.c           | 12 ++++-----
 eit.c              | 31 ++++++++++++++---------
 epg.c              | 20 ++++++++++++---
 epg.h              |  5 ++--
 libsi/descriptor.c | 44 ++++++++++++++++++---------------
 libsi/section.c    | 30 +++++++++++------------
 libsi/si.c         |  6 ++---
 libsi/si.h         | 10 ++++----
 libsi/util.c       | 18 ++++++++------
 libsi/util.h       | 34 +++++++++++++-------------
 menu.c             | 14 +++++++----
 menu.h             |  3 ++-
 menuitems.c        | 14 +++++++++--
 menuitems.h        |  3 ++-
 recording.c        | 61 +++++++++++++++++++++++++++++++++++++---------
 recording.h        |  6 ++---
 skinsttng.c        |  4 +--
 thread.c           |  4 +--
 vdr.5              |  6 ++---
 27 files changed, 313 insertions(+), 148 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7a65ceeae..b3dc8e8b1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -548,10 +548,12 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to increase the default value for 'Min. user inactivity' to 300 minutes
  for suggesting to add cChannel::LinkChannels() and cChannel::RefChannel()
  for suggesting to give a message when an instant recording is started
- fpr suggesting to retry a shutdown after a while
+ for suggesting to retry a shutdown after a while
  for separating the 'install' target into several individual targets
  for reporting a problem with scrolling with Up/Down in case there are non-selectable
  items at the beginning of the menu
+ for a patch that was used to implement stopping scanning the video directory if
+ there are too many levels of symbolic links
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -604,6 +606,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for making cEIT::cEIT() drop EPG events that have a zero start time or duration
  for reporting an unnecessary OSD draw operation caused by the audio track description
  display in the ST:TNG skin's channel display
+ for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust
+ against invalid data
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -953,6 +957,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  via the numeric keys
  for reporting a problem with expired timers when shutting down via the Power key
  for fixing handling the "Blue" key in the "Schedule" menu for the current channel
+ for making cMenuText use the given font
+ for making the channel number be reset if the number entered through the numeric keys
+ exceeds the maximum channel number
+ for suggesting to also set the language codes when setting the audio track descriptions
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1050,6 +1058,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing handling TS packets in cTS2PES
  for adding a mutex to synchronize cDevice::PlayPesPacket() and SetCurrentAudioTrack()
  for a suggestion that lead to implementing cDevice::Transferring()
+ for fixing replaying recordings of radio channels with many audio tracks
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1306,6 +1315,9 @@ Marco Schl
  for removing leftover 'needsBufferReserve' variable from cTransfer
  for adding an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier
  process the audio data
+ for improving OSD area handling in cDvbSpuDecoder
+ for suggesting to log the description (if present) in case a thread is canceled
+ for fixing handling DPID when deciding whether to switch to 'Transfer Mode'
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1412,6 +1424,8 @@ Andreas Brugger <brougs78@gmx.net>
  are being edited via the menu
  for suggesting to change the API of the functions cStatus::Recording() and
  cStatus::Replaying(), so that they can provide the full file name of the recording
+ for suggesting that externally provided EPG data (with table ID 0x00) shall get its
+ component descriptors set from the broadcast data
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
@@ -1568,6 +1582,7 @@ Frank Kr
  for adding missing storing of the MenuScrollPage parameter
  for reporting a problem with channel switching with the Down (Up) key in case the
  current channel is already the first (last) in the list
+ for fixing some typos in the CONTRIBUTORS file
 
 Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
  for reporting a problem in cEITScanner::Process() with forced EPG scans if EPG
@@ -1718,12 +1733,14 @@ Malte Schr
 
 Markus Hahn <mhahn@reel-multimedia.com>
  for suggesting to only start recordings if there is at least 300MB free disk space
+ for suggesting that the "Back" key should restore the original string when pressed
+ while editing a string item
 
 Jaroslaw Swierczynski <swiergot@gmail.com>
  for updating the Polish OSD texts and the fontosd-iso8859-2.c file
 
 Alexander Hans <cleditor@arcor.de>
- fpr reporting a crash when pressing '0' in the "Schedule" menu on a channel that
+ for reporting a crash when pressing '0' in the "Schedule" menu on a channel that
  doesn't have any EPG data 
 
 Daniel Karsubka <dkar@gmx.de>
diff --git a/HISTORY b/HISTORY
index 0302c8fd5..7132b8114 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4316,3 +4316,46 @@ Video Disk Recorder Revision History
   beginning or end of the menu (reported by Helmut Auer).
 - Added cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont(), so that a plugin
   that wants to do special text formatting can do so (thanks to Alexander Rieger).
+
+2006-02-19: Version 1.3.43
+
+- Removed an unnecessary toFile->SetReadAhead() from cutter.c (thanks to Artur
+  Skawina).
+- The "Back" key now restores the original string when pressed while editing a
+  string item (suggested by Markus Hahn).
+- Now stopping scanning the video directory if there are too many levels of
+  symbolic links, which might indicate a recursive link loop (based on a patch
+  from Helmut Auer).
+- Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schl��ler).
+- Now logging the description (if present) in case a thread is canceled (suggested
+  by Marco Schl��ler).
+- cMenuText now uses the given font (thanks to Rolf Ahrenberg).
+- The ST:TNG skin now uses the fixed font if requested when displaying texts.
+- Fixed some typos in the CONTRIBUTORS file (thanks to Frank Kr�mmelbein).
+- Changed offset and size handling in 'libsi' from 'unsigned' to 'signed', so that
+  overflows can be better detected (thanks to Marcel Wiesweg).
+- Checking data size in CaDescriptor::Parse() and LinkageDescriptor::Parse() of
+  'libsi' to avoid crashes with invalid data (thanks to Marcel Wiesweg).
+- Made CharArray::DataOwnData::assign() in 'libsi' more robust against invalid
+  data (suggested by Oliver Endriss). Also changed CharArray::DataOwnData::Delete()
+  so that it sets 'size' and 'data' to 0.
+- Now resetting the channel number if the number entered through the numeric keys
+  exceeds the maximum channel number (thanks to Rolf Ahrenberg).
+- The language code in the 'X' component records of EPG data can now consist of
+  two codes, separated by '+'.
+- If a recording starts and there is no EPG data available for the recorded channel,
+  the 'X' audio component records for the 'info.vdr' file are now generated from the
+  channel's PID data.
+- Externally provided EPG data (with table ID 0x00) now gets its component
+  descriptors set from the broadcast data, so that language codes and descriptions
+  are available (suggested by Andreas Brugger).
+- When setting the audio track descriptions, the language codes are now also set
+  in case this is a replay session (based on a patch from Rolf Ahrenberg).
+- If a recording starts and the channel's audio PID data has more language code
+  information than the EPG's component data, the code from the channel is taken.
+- Fixed handling DPID when deciding whether to switch to 'Transfer Mode' (thanks
+  to Marco Schl��ler).
+- Fixed replaying recordings of radio channels with many audio tracks (thanks to
+  Reinhard Nissl).
+- Added a comment to tChannelID::nid, explaining that is is actually the "original"
+  network id.
diff --git a/channels.conf b/channels.conf
index 54550c4c2..a5f896eee 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,5 +1,3 @@
-: first line
-: second line
 RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
 ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
@@ -15,10 +13,10 @@ S
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320:0:0:28008:1:1079:0
+KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:0:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu,502=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
@@ -30,8 +28,8 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
-Sky News:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
@@ -39,7 +37,7 @@ Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
 Eurosport;SES Astra:12226:hC34:S19.2E:27500:101+8190:103=deu:102:0:31200:1:1091:0
 EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
-EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:0:0:28202:1:1073:0
+EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:204:0:28202:1:1073:0
 EinsPlus;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
 ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:130:0:28016:1:1079:0
 ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
@@ -51,8 +49,8 @@ PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:3
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1801,1722,1702:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1722,1702:34:133:17:0
 :Premiere Direkt
@@ -67,7 +65,7 @@ PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-m�nchen.TV/RFO,m�TV/RFO;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
+m�nchen.TV/RFO,m�TV/RFO;BetaDigital:12148:hC34:S19.2E:27500:495:496:0:0:658:133:7:0
 ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
@@ -99,7 +97,7 @@ HDFORUM;TF1:11242:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
 Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
 Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
 SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
-SMD HD:12699:V:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0
+SMD HD:12699:vC56:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
 TV HD;CSAT:12581:vC56:S19.2E:22000:165:100=fra;101=fra:0:0:9306:1:1110:0
 C M HD;Telenor:11261:hC78:S1.0W:24500:517:660=eng;661=eng:0:B00:3306:70:33:0
@@ -118,9 +116,9 @@ Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;666=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,655=NAR;667=eng:583:960,961:4302:2:2007:0
 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;668=eng:584:960,961:4403:2:2007:0
-Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4402:2:2011:0
-Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4503:2:2011:0
-Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4502:2:2011:0
+Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,655=NAR:576:960,961:4402:2:2011:0
+Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:4503:2:2011:0
+Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,657=NAR:577:960,961:4502:2:2011:0
 Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4603:2:2030:0
 Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,666=NAR:582:960,961:4602:2:2030:0
diff --git a/channels.h b/channels.h
index 22dc6feb6..ef4e80b32 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.38 2006/01/14 15:51:26 kls Exp $
+ * $Id: channels.h 1.39 2006/02/19 14:39:43 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -69,7 +69,7 @@ extern const tChannelParameterMap HierarchyValues[];
 struct tChannelID {
 private:
   int source;
-  int nid;
+  int nid; ///< actually the "original" network id
   int tid;
   int sid;
   int rid;
diff --git a/config.h b/config.h
index 187767feb..5e992858f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.243 2006/01/29 17:24:53 kls Exp $
+ * $Id: config.h 1.244 2006/02/12 10:07:44 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.42"
-#define VDRVERSNUM   10342  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.43"
+#define VDRVERSNUM   10343  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/cutter.c b/cutter.c
index cb5afd398..5b82cc542 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.14 2006/02/05 11:06:47 kls Exp $
+ * $Id: cutter.c 1.15 2006/02/12 10:07:23 kls Exp $
  */
 
 #include "cutter.h"
@@ -67,7 +67,6 @@ void cCuttingThread::Action(void)
      if (!fromFile || !toFile)
         return;
      fromFile->SetReadAhead(MEGABYTE(20));
-     toFile->SetReadAhead(MEGABYTE(20));
      int Index = Mark->position;
      Mark = fromMarks.Next(Mark);
      int FileSize = 0;
diff --git a/dvbdevice.c b/dvbdevice.c
index f5f5f4e29..148a12a56 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.152 2006/02/04 10:21:51 kls Exp $
+ * $Id: dvbdevice.c 1.153 2006/02/19 13:52:04 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -811,7 +811,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                             );
 
   bool StartTransferMode = IsPrimaryDevice() && !DoTune
-                           && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || pidHandles[ptAudio].pid != Channel->Apid(0))// the PID is already set as DMX_PES_OTHER
+                           && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || (pidHandles[ptAudio].pid != Channel->Apid(0) && (Channel->Dpid(0) ? pidHandles[ptAudio].pid != Channel->Dpid(0) : true)))// the PID is already set as DMX_PES_OTHER
                               || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
 
diff --git a/dvbplayer.c b/dvbplayer.c
index efd767f11..f61e0c91b 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.42 2006/01/08 11:39:41 kls Exp $
+ * $Id: dvbplayer.c 1.43 2006/02/19 14:20:15 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -80,6 +80,8 @@ class cNonBlockingFileReader : public cThread {
   int length;
   bool hasData;
   cCondWait newSet;
+  cCondVar newDataCond;
+  cMutex newDataMutex;
 protected:
   void Action(void);
 public:
@@ -88,6 +90,7 @@ class cNonBlockingFileReader : public cThread {
   void Clear(void);
   int Read(cUnbufferedFile *File, uchar *Buffer, int Length);
   bool Reading(void) { return buffer; }
+  bool WaitForDataMs(int msToWait);
   };
 
 cNonBlockingFileReader::cNonBlockingFileReader(void)
@@ -150,8 +153,11 @@ void cNonBlockingFileReader::Action(void)
            int r = f->Read(buffer + length, wanted - length);
            if (r >= 0) {
               length += r;
-              if (!r || length == wanted) // r == 0 means EOF
+              if (!r || length == wanted) { // r == 0 means EOF
+                 cMutexLock NewDataLock(&newDataMutex);
                  hasData = true;
+                 newDataCond.Broadcast();
+                 }
               }
            else if (r < 0 && FATALERRNO) {
               LOG_ERROR;
@@ -164,6 +170,14 @@ void cNonBlockingFileReader::Action(void)
         }
 }
 
+bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
+{
+  cMutexLock NewDataLock(&newDataMutex);
+  if (hasData)
+     return true;
+  return newDataCond.TimedWait(newDataMutex, msToWait);
+}
+
 // --- cDvbPlayer ------------------------------------------------------------
 
 #define PLAYERBUFSIZE  MEGABYTE(1)
@@ -362,10 +376,14 @@ void cDvbPlayer::Action(void)
   nonBlockingFileReader = new cNonBlockingFileReader;
   int Length = 0;
   bool Sleep = false;
+  bool WaitingForData = false;
 
   while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
         if (Sleep) {
-           cCondWait::SleepMs(3); // this keeps the CPU load low
+           if (WaitingForData)
+              nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
+           else
+              cCondWait::SleepMs(3); // this keeps the CPU load low
            Sleep = false;
            }
         cPoller Poller;
@@ -423,11 +441,14 @@ void cDvbPlayer::Action(void)
                     }
                  int r = nonBlockingFileReader->Read(replayFile, b, Length);
                  if (r > 0) {
+                    WaitingForData = false;
                     readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
                     b = NULL;
                     }
                  else if (r == 0)
                     eof = true;
+                 else if (r < 0 && errno == EAGAIN)
+                    WaitingForData = true;
                  else if (r < 0 && FATALERRNO) {
                     LOG_ERROR;
                     break;
diff --git a/dvbspu.c b/dvbspu.c
index 745af8b23..9dbe07a8b 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.19 2006/01/08 11:39:46 kls Exp $
+ * $Id: dvbspu.c 1.20 2006/02/12 11:50:20 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -368,11 +368,11 @@ void cDvbSpuDecoder::Draw(void)
     if (bg || fg) {
         if (osd == NULL) {
            osd = cOsdProvider::NewOsd(0, 0);
-           int x2 = areaSize.x2;
-           while ((x2 - areaSize.x1 + 1) & 0x03)
-                 x2++;
-           tArea Area = { areaSize.x1, areaSize.y1, x2, areaSize.y2, (fg && bg) ? 4 : 2 };
-           osd->SetAreas(&Area, 1);
+           if ((areaSize.width() & 3) != 0)
+              areaSize.x2 += 4 - (areaSize.width() & 3);
+           tArea Area = { areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2 };
+           if (osd->SetAreas(&Area, 1) != oeOk)
+              dsyslog("dvbspu: AreaSize (%d, %d) (%d, %d) Bpp %d", areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2 );
            }
 
         if (bg)
diff --git a/eit.c b/eit.c
index 4a0f59ded..ccce49567 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.114 2006/01/14 15:41:21 kls Exp $
+ * $Id: eit.c 1.115 2006/02/19 09:51:02 kls Exp $
  */
 
 #include "eit.h"
@@ -39,11 +39,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
 
   bool Empty = true;
   bool Modified = false;
+  bool HasExternalData = false;
   time_t SegmentStart = 0;
   time_t SegmentEnd = 0;
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
+      bool ExternalData = false;
       // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
       if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getStartTime() > 0 && SiEitEvent.getDuration() == 0)
          continue;
@@ -66,11 +68,14 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          pEvent->SetSeen();
          // If the existing event has a zero table ID it was defined externally and shall
          // not be overwritten.
-         if (pEvent->TableID() == 0x00)
-            continue;
+         if (pEvent->TableID() == 0x00) {
+            if (pEvent->Version() == getVersionNumber())
+               continue;
+            HasExternalData = ExternalData = true;
+            }
          // If the new event has a higher table ID, let's skip it.
          // The lower the table ID, the more "current" the information.
-         if (Tid > pEvent->TableID())
+         else if (Tid > pEvent->TableID())
             continue;
          // If the new event comes from the same table and has the same version number
          // as the existing one, let's skip it to avoid unnecessary work.
@@ -78,15 +83,16 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          // the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on
          // each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned
          // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
-         if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
+         else if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
             continue;
          }
-      // XXX TODO log different (non-zero) event IDs for the same event???
-      pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
-      pEvent->SetTableID(Tid);
+      if (!ExternalData) {
+         pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
+         pEvent->SetTableID(Tid);
+         pEvent->SetStartTime(SiEitEvent.getStartTime());
+         pEvent->SetDuration(SiEitEvent.getDuration());
+         }
       pEvent->SetVersion(getVersionNumber());
-      pEvent->SetStartTime(SiEitEvent.getStartTime());
-      pEvent->SetDuration(SiEitEvent.getDuration());
 
       int LanguagePreferenceShort = -1;
       int LanguagePreferenceExt = -1;
@@ -97,6 +103,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       cLinkChannels *LinkChannels = NULL;
       cComponents *Components = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
+          if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag)
+             continue;
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
                  SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
@@ -243,7 +251,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
      pSchedule->SetPresentSeen();
   if (Modified) {
      pSchedule->Sort();
-     pSchedule->DropOutdated(SegmentStart, SegmentEnd, Tid, getVersionNumber());
+     if (!HasExternalData)
+        pSchedule->DropOutdated(SegmentStart, SegmentEnd, Tid, getVersionNumber());
      Schedules->SetModified(pSchedule);
      }
 }
diff --git a/epg.c b/epg.c
index efc5455fa..910333b11 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.58 2006/02/03 13:16:54 kls Exp $
+ * $Id: epg.c 1.61 2006/02/19 12:50:26 kls Exp $
  */
 
 #include "epg.h"
@@ -23,14 +23,14 @@
 cString tComponent::ToString(void)
 {
   char buffer[256];
-  snprintf(buffer, sizeof(buffer), "%X %02X %-3s %s", stream, type, language, description ? description : "");
+  snprintf(buffer, sizeof(buffer), "%X %02X %s %s", stream, type, language, description ? description : "");
   return buffer;
 }
 
 bool tComponent::FromString(const char *s)
 {
   unsigned int Stream, Type;
-  int n = sscanf(s, "%X %02X %3c %a[^\n]", &Stream, &Type, language, &description);
+  int n = sscanf(s, "%X %02X %7s %a[^\n]", &Stream, &Type, language, &description); // 7 = MAXLANGCODE2 - 1
   if (n != 4 || isempty(description)) {
      free(description);
      description = NULL;
@@ -78,9 +78,23 @@ void cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *
   p->stream = Stream;
   p->type = Type;
   strn0cpy(p->language, Language, sizeof(p->language));
+  char *q = strchr(p->language, ',');
+  if (q)
+     *q = 0; // strips rest of "normalized" language codes
   p->description = strcpyrealloc(p->description, !isempty(Description) ? Description : NULL);
 }
 
+tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
+{
+  for (int i = 0; i < numComponents; i++) {
+      if (components[i].stream == Stream && components[i].type == Type) {
+         if (!Index--)
+            return &components[i];
+         }
+      }
+  return NULL;
+}
+
 // --- cEvent ----------------------------------------------------------------
 
 cEvent::cEvent(u_int16_t EventID)
diff --git a/epg.h b/epg.h
index ad245243d..fa80474e3 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.30 2006/01/29 14:03:13 kls Exp $
+ * $Id: epg.h 1.32 2006/02/19 12:51:41 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -24,7 +24,7 @@ enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
 struct tComponent {
   uchar stream;
   uchar type;
-  char language[4];
+  char language[MAXLANGCODE2];
   char *description;
   cString ToString(void);
   bool FromString(const char *s);
@@ -42,6 +42,7 @@ class cComponents {
   void SetComponent(int Index, const char *s);
   void SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
   tComponent *Component(int Index) const { return (Index < numComponents) ? &components[Index] : NULL; }
+  tComponent *GetComponent(int Index, uchar Stream, uchar Type); // Gets the Index'th component of Stream and Type, skipping other components
   };
 
 class cSchedule;
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index cc3a01692..6a3af9fe8 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.15 2005/09/03 15:16:49 kls Exp $
+ *   $Id: descriptor.c 1.17 2006/02/18 11:02:25 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -16,7 +16,7 @@
 namespace SI {
 
 void ShortEventDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const descr_short_event *s;
    data.setPointerAndOffset<const descr_short_event>(s, offset);
    languageCode[0]=s->lang_code1;
@@ -38,7 +38,7 @@ int ExtendedEventDescriptor::getLastDescriptorNumber() {
 }
 
 void ExtendedEventDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_extended_event>(s, offset);
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
@@ -51,7 +51,7 @@ void ExtendedEventDescriptor::Parse() {
 }
 
 void ExtendedEventDescriptor::Item::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const item_extended_event *first;
    data.setPointerAndOffset<const item_extended_event>(first, offset);
    itemDescription.setDataAndOffset(data+offset, first->item_description_length, offset);
@@ -327,9 +327,12 @@ int CaDescriptor::getCaPid() const {
 }
 
 void CaDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_ca>(s, offset);
-   privateData.assign(data.getData(offset), getLength()-offset);
+   if (checkSize(getLength()-offset))
+      privateData.assign(data.getData(offset), getLength()-offset);
+   else
+      privateData.assign(NULL, 0);
 }
 
 int StreamIdentifierDescriptor::getComponentTag() const {
@@ -477,7 +480,7 @@ int ServiceDescriptor::getServiceType() const {
 }
 
 void ServiceDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_service>(s, offset);
    providerName.setDataAndOffset(data+offset, s->provider_name_length, offset);
    const descr_service_mid *mid;
@@ -526,7 +529,7 @@ int ComponentDescriptor::getComponentTag() const {
 }
 
 void ComponentDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_component>(s, offset);
    languageCode[0]=s->lang_code1;
    languageCode[1]=s->lang_code2;
@@ -580,7 +583,7 @@ int FrequencyListDescriptor::getCodingType() const {
 }
 
 void FrequencyListDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_frequency_list>(s, offset);
    frequencies.setData(data+offset, getLength()-offset);
 }
@@ -594,7 +597,7 @@ void MultilingualNameDescriptor::Parse() {
 }
 
 void MultilingualNameDescriptor::Name::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const entry_multilingual_name *s;
    data.setPointerAndOffset<const entry_multilingual_name>(s, offset);
    languageCode[0]=s->lang_code1;
@@ -609,7 +612,7 @@ int MultilingualComponentDescriptor::getComponentTag() const {
 }
 
 void MultilingualComponentDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_multilingual_component>(s, offset);
    nameLoop.setData(data+sizeof(descr_multilingual_component), getLength()-sizeof(descr_multilingual_component));
 }
@@ -619,7 +622,7 @@ void MultilingualServiceNameDescriptor::Parse() {
 }
 
 void MultilingualServiceNameDescriptor::Name::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const entry_multilingual_name *s;
    data.setPointerAndOffset<const entry_multilingual_name>(s, offset);
    languageCode[0]=s->lang_code1;
@@ -633,9 +636,12 @@ void MultilingualServiceNameDescriptor::Name::Parse() {
 }
 
 void LinkageDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_linkage>(s, offset);
-   privateData.assign(data.getData(offset), getLength()-offset);
+   if (checkSize(getLength()-offset))
+      privateData.assign(data.getData(offset), getLength()-offset);
+   else
+      privateData.assign(NULL, 0);
 }
 
 int LinkageDescriptor::getTransportStreamId() const {
@@ -682,7 +688,7 @@ AudioType ISO639LanguageDescriptor::Language::getAudioType() {
 }
 
 void PDCDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_pdc>(s, offset);
 }
 
@@ -731,7 +737,7 @@ int MHP_ApplicationDescriptor::getApplicationPriority() const {
 }
 
 void MHP_ApplicationDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const descr_application *dapp;
    data.setPointerAndOffset<const descr_application>(dapp, offset);
    profileLoop.setDataAndOffset(data+offset, dapp->application_profiles_length, offset);
@@ -790,7 +796,7 @@ int MHP_TransportProtocolDescriptor::getComponentTag() const {
 }
 
 void MHP_TransportProtocolDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const descr_transport_protocol>(s, offset);
    if (getProtocolId() == ObjectCarousel) {
       const transport_via_oc *oc;
@@ -821,7 +827,7 @@ void MHP_DVBJApplicationDescriptor::ApplicationEntry::Parse() {
 }
 
 void MHP_DVBJApplicationLocationDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const descr_dvbj_application_location *first;
    data.setPointerAndOffset<const descr_dvbj_application_location>(first, offset);
    baseDirectory.setDataAndOffset(data+offset, first->base_directory_length, offset);
@@ -836,7 +842,7 @@ int MHP_ApplicationIconsDescriptor::getIconFlags() const {
 }
 
 void MHP_ApplicationIconsDescriptor::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const descr_application_icons_descriptor *first;
    data.setPointerAndOffset<const descr_application_icons_descriptor>(first, offset);
    iconLocator.setDataAndOffset(data+offset, first->icon_locator_length, offset);
diff --git a/libsi/section.c b/libsi/section.c
index 2cac809df..68af99180 100644
--- a/libsi/section.c
+++ b/libsi/section.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.c 1.3 2004/02/20 13:44:59 kls Exp $
+ *   $Id: section.c 1.4 2006/02/18 10:38:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -18,7 +18,7 @@ namespace SI {
 /*********************** PAT ***********************/
 
 void PAT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const pat>(s, offset);
    associationLoop.setData(data+offset, getLength()-offset-4);
 }
@@ -48,7 +48,7 @@ void CAT::Parse() {
 /*********************** PMT ***********************/
 
 void PMT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const pmt>(s, offset);
    commonDescriptors.setDataAndOffset(data+offset, HILO(s->program_info_length), offset);
    streamLoop.setData(data+offset, getLength()-offset-4);
@@ -71,7 +71,7 @@ int PMT::Stream::getStreamType() const {
 }
 
 void PMT::Stream::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const pmt_info>(s, offset);
    streamDescriptors.setData(data+offset, HILO(s->ES_info_length));
 }
@@ -79,7 +79,7 @@ void PMT::Stream::Parse() {
 /*********************** TSDT ***********************/
 
 void TSDT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const tsdt>(s, offset);
    transportStreamDescriptors.setDataAndOffset(data+offset, getLength()-offset-4, offset);
 }
@@ -91,7 +91,7 @@ int NIT::getNetworkId() const {
 }
 
 void NIT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const nit>(s, offset);
    commonDescriptors.setDataAndOffset(data+offset, HILO(s->network_descriptor_length), offset);
    const nit_mid *mid;
@@ -108,7 +108,7 @@ int NIT::TransportStream::getOriginalNetworkId() const {
 }
 
 void NIT::TransportStream::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const ni_ts>(s, offset);
    transportStreamDescriptors.setData(data+offset, HILO(s->transport_descriptors_length));
 }
@@ -116,7 +116,7 @@ void NIT::TransportStream::Parse() {
 /*********************** SDT ***********************/
 
 void SDT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const sdt>(s, offset);
    serviceLoop.setData(data+offset, getLength()-offset-4); //4 is for CRC
 }
@@ -150,7 +150,7 @@ int SDT::Service::getFreeCaMode() const {
 }
 
 void SDT::Service::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const sdt_descr>(s, offset);
    serviceDescriptors.setData(data+offset, HILO(s->descriptors_loop_length));
 }
@@ -188,7 +188,7 @@ bool EIT::isActualTS() const {
 }
 
 void EIT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const eit>(s, offset);
    //printf("%d %d %d %d %d\n", getServiceId(), getTransportStreamId(), getOriginalNetworkId(), isPresentFollowing(), isActualTS());
    eventLoop.setData(data+offset, getLength()-offset-4); //4 is for CRC
@@ -243,7 +243,7 @@ int EIT::Event::getFreeCaMode() const {
 }
 
 void EIT::Event::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const eit_event>(s, offset);
    //printf("%d %d %d\n", getStartTime(), getDuration(), getRunningStatus());
    eventDescriptors.setData(data+offset, HILO(s->descriptors_loop_length));
@@ -266,7 +266,7 @@ time_t TOT::getTime() const {
 }
 
 void TOT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const tot>(s, offset);
    descriptorLoop.setData(data+offset, getLength()-offset-4);
 }
@@ -274,7 +274,7 @@ void TOT::Parse() {
 /*********************** RST ***********************/
 
 void RST::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    const rst *s;
    data.setPointerAndOffset<const rst>(s, offset);
    infoLoop.setData(data+offset, getLength()-offset);
@@ -315,7 +315,7 @@ int AIT::getAITVersion() const {
 }
 
 void AIT::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const ait>(first, offset);
    commonDescriptors.setDataAndOffset(data+offset, HILO(first->common_descriptors_length), offset);
    const ait_mid *mid;
@@ -336,7 +336,7 @@ int AIT::Application::getControlCode() const {
 }
 
 void AIT::Application::Parse() {
-   unsigned int offset=0;
+   int offset=0;
    data.setPointerAndOffset<const ait_app>(s, offset);
    applicationDescriptors.setData(data+offset, HILO(s->application_descriptors_length));
 }
diff --git a/libsi/si.c b/libsi/si.c
index 90d403032..bbd3f1afe 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.14 2005/05/28 14:11:16 kls Exp $
+ *   $Id: si.c 1.15 2006/02/18 10:38:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -22,7 +22,7 @@ Object::Object() {
 Object::Object(CharArray &d) : data(d) {
 }
 
-void Object::setData(const unsigned char*d, unsigned int size, bool doCopy) {
+void Object::setData(const unsigned char*d, int size, bool doCopy) {
    data.assign(d, size, doCopy);
 }
 
@@ -30,7 +30,7 @@ void Object::setData(CharArray &d) {
    data=d;
 }
 
-bool Object::checkSize(unsigned int offset) {
+bool Object::checkSize(int offset) {
    return data.checkSize(offset);
 }
 
diff --git a/libsi/si.h b/libsi/si.h
index 3836b2fb7..c8910ffb2 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.12 2005/09/03 15:19:00 kls Exp $
+ *   $Id: si.h 1.13 2006/02/18 10:38:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -184,7 +184,7 @@ class Object : public Parsable {
    Object();
    Object(CharArray &d);
    //can only be called once since data is immutable
-   void setData(const unsigned char*data, unsigned int size, bool doCopy=true);
+   void setData(const unsigned char*data, int size, bool doCopy=true);
    CharArray getData() { return data; }
    //returns the valid flag which indicates if data is all right or errors have been encountered
    bool isValid() { return data.isValid(); }
@@ -196,7 +196,7 @@ class Object : public Parsable {
    void setData(CharArray &d);
    //returns whether the given offset fits within the limits of the actual data
    //The valid flag will be set accordingly
-   bool checkSize(unsigned int offset);
+   bool checkSize(int offset);
 };
 
 class Section : public Object {
@@ -242,7 +242,7 @@ class VariableLengthPart : public Object {
    //never forget to call this
    void setData(CharArray d, int l) { Object::setData(d); checkSize(l); length=l; }
    //convenience method
-   void setDataAndOffset(CharArray d, int l, unsigned int &offset) { Object::setData(d); checkSize(l); length=l; offset+=l; }
+   void setDataAndOffset(CharArray d, int l, int &offset) { Object::setData(d); checkSize(l); length=l; offset+=l; }
    virtual int getLength() { return length; }
 private:
    int length;
@@ -384,7 +384,7 @@ typedef uint64_t  SixtyFourBit;
 template <typename T> class TypeLoop : public Loop {
 public:
    int getCount() { return getLength()/sizeof(T); }
-   T operator[](const unsigned int index) const
+   T operator[](const int index) const
       {
          switch (sizeof(T)) {
          case 1:
diff --git a/libsi/util.c b/libsi/util.c
index 346579489..b0db93e16 100644
--- a/libsi/util.c
+++ b/libsi/util.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.c 1.5 2005/05/28 14:15:29 kls Exp $
+ *   $Id: util.c 1.7 2006/02/18 11:17:50 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -47,7 +47,7 @@ CharArray& CharArray::operator=(const CharArray &f) {
     return *this;
 }
 
-void CharArray::assign(const unsigned char*data, unsigned int size, bool doCopy) {
+void CharArray::assign(const unsigned char*data, int size, bool doCopy) {
     //immutable
     if (!data_)
       data_= doCopy ? (Data*)new DataOwnData() : (Data*)new DataForeignData();
@@ -76,13 +76,13 @@ bool CharArray::operator==(const CharArray &other) const {
       return false;
 
    //do _not_ use strcmp! Data is not necessarily null-terminated.
-   for (unsigned int i=0;i<data_->size;i++)
+   for (int i=0;i<data_->size;i++)
       if (data_->data[i] != other.data_->data[i])
          return false;
    return true;
 }
 
-CharArray CharArray::operator+(const unsigned int offset) const {
+CharArray CharArray::operator+(const int offset) const {
    CharArray f(*this);
    f.off+=offset;
    return f;
@@ -117,8 +117,10 @@ CharArray::DataOwnData::~DataOwnData() {
    Delete();
 }
 
-void CharArray::DataOwnData::assign(const unsigned char*d, unsigned int s) {
+void CharArray::DataOwnData::assign(const unsigned char*d, int s) {
    Delete();
+   if (!d || s > 100000 || s <= 0) // ultimate plausibility check
+      return;
    size=s;
    unsigned char *newdata=new unsigned char[size];
    memcpy(newdata, d, size);
@@ -127,13 +129,15 @@ void CharArray::DataOwnData::assign(const unsigned char*d, unsigned int s) {
 
 void CharArray::DataOwnData::Delete() {
    delete[] data;
+   size=0;
+   data=0;
 }
 
 CharArray::DataForeignData::~DataForeignData() {
    Delete();
 }
 
-void CharArray::DataForeignData::assign(const unsigned char*d, unsigned int s) {
+void CharArray::DataForeignData::assign(const unsigned char*d, int s) {
    size=s;
    data=d;
 }
@@ -143,7 +147,7 @@ void CharArray::DataForeignData::Delete() {
 }
 
 /*
-void CharArray::Data::assign(unsigned int s) {
+void CharArray::Data::assign(int s) {
    if (data)
       delete[] data;
    size=s;
diff --git a/libsi/util.h b/libsi/util.h
index da188ad44..91a4c32a2 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 1.5 2004/10/23 14:22:40 kls Exp $
+ *   $Id: util.h 1.6 2006/02/18 10:38:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -37,14 +37,14 @@ class CharArray {
    ~CharArray();
 
    //can be called exactly once
-   void assign(const unsigned char*data, unsigned int size, bool doCopy=true);
+   void assign(const unsigned char*data, int size, bool doCopy=true);
    //compares to a null-terminated string
    bool operator==(const char *string) const;
    //compares to another CharArray (data not necessarily null-terminated)
    bool operator==(const CharArray &other) const;
 
    //returns another CharArray with its offset incremented by offset
-   CharArray operator+(const unsigned int offset) const;
+   CharArray operator+(const int offset) const;
 
    //access and convenience methods
    const unsigned char* getData() const { return data_->data+off; }
@@ -52,28 +52,28 @@ class CharArray {
    template <typename T> const T* getData() const { return (T*)(data_->data+off); }
    template <typename T> const T* getData(int offset) const { return (T*)(data_->data+offset+off); }
       //sets p to point to data+offset, increments offset
-   template <typename T> void setPointerAndOffset(const T* &p, unsigned int &offset) const { p=(T*)getData(offset); offset+=sizeof(T); }
-   unsigned char operator[](const unsigned int index) const { return data_->data ? data_->data[off+index] : 0; }
+   template <typename T> void setPointerAndOffset(const T* &p, int &offset) const { p=(T*)getData(offset); offset+=sizeof(T); }
+   unsigned char operator[](const int index) const { return data_->data ? data_->data[off+index] : 0; }
    int getLength() const { return data_->size; }
-   u_int16_t TwoBytes(const unsigned int index) const { return data_->data ? data_->TwoBytes(off+index) : 0; }
-   u_int32_t FourBytes(const unsigned int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
+   u_int16_t TwoBytes(const int index) const { return data_->data ? data_->TwoBytes(off+index) : 0; }
+   u_int32_t FourBytes(const int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
 
    bool isValid() const { return data_->valid; }
-   bool checkSize(unsigned int offset) { return (data_->valid && (data_->valid=(off+offset < data_->size))); }
+   bool checkSize(int offset) { return (data_->valid && offset>=0 && (data_->valid=(off+offset < data_->size))); }
 
-   void addOffset(unsigned int offset) { off+=offset; }
+   void addOffset(int offset) { off+=offset; }
 private:
    class Data {
    public:
       Data();
       virtual ~Data();
 
-      virtual void assign(const unsigned char*data, unsigned int size) = 0;
+      virtual void assign(const unsigned char*data, int size) = 0;
       virtual void Delete() = 0;
 
-      u_int16_t TwoBytes(const unsigned int index) const
+      u_int16_t TwoBytes(const int index) const
          { return (data[index] << 8) | data[index+1]; }
-      u_int32_t FourBytes(const unsigned int index) const
+      u_int32_t FourBytes(const int index) const
          { return (data[index] << 24) | (data[index+1] << 16) | (data[index+2] << 8) | data[index+3]; }
       /*#ifdef CHARARRAY_THREADSAFE
       void Lock();
@@ -83,11 +83,11 @@ class CharArray {
       void Unlock() {}
       #endif
       Data(const Data& d);
-      void assign(unsigned int size);
+      void assign(int size);
       */
 
       const unsigned char*data;
-      unsigned int size;
+      int size;
 
       // count_ is the number of CharArray objects that point at this
       // count_ must be initialized to 1 by all constructors
@@ -106,18 +106,18 @@ class CharArray {
    public:
       DataOwnData() {}
       virtual ~DataOwnData();
-      virtual void assign(const unsigned char*data, unsigned int size);
+      virtual void assign(const unsigned char*data, int size);
       virtual void Delete();
    };
    class DataForeignData : public Data {
    public:
       DataForeignData() {}
       virtual ~DataForeignData();
-      virtual void assign(const unsigned char*data, unsigned int size);
+      virtual void assign(const unsigned char*data, int size);
       virtual void Delete();
    };
    Data* data_;
-   unsigned int off;
+   int off;
 };
 
 
diff --git a/menu.c b/menu.c
index d9c6b04c8..e20889437 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.410 2006/02/05 13:31:08 kls Exp $
+ * $Id: menu.c 1.413 2006/02/19 10:18:28 kls Exp $
  */
 
 #include "menu.h"
@@ -572,6 +572,7 @@ cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
 :cOsdMenu(Title)
 {
   text = NULL;
+  font = Font;
   SetText(Text);
 }
 
@@ -589,7 +590,7 @@ void cMenuText::SetText(const char *Text)
 void cMenuText::Display(void)
 {
   cOsdMenu::Display();
-  DisplayMenu()->SetText(text, true);//XXX define control character in text to choose the font???
+  DisplayMenu()->SetText(text, font == fontFix); //XXX define control character in text to choose the font???
   cStatus::MsgOsdTextItem(text);
 }
 
@@ -2988,9 +2989,9 @@ static void SetTrackDescriptions(int LiveChannel)
          const tComponent *p = Components->Component(i);
          if (p->stream == 2) {
             if (p->type == 0x05)
-               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, NULL, p->description);
+               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, LiveChannel ? NULL : p->language, p->description);
             else
-               cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, NULL, p->description);
+               cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, LiveChannel ? NULL : p->language, p->description);
             }
          }
      }
@@ -3104,7 +3105,10 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             }
     case k1 ... k9:
          if (number >= 0) {
-            number = number * 10 + Key - k0;
+            if (number > Channels.MaxNumber())
+               number = Key - k0;
+            else
+               number = number * 10 + Key - k0;
             channel = Channels.GetByNumber(number);
             displayChannel->SetEvents(NULL, NULL);
             withInfo = false;
diff --git a/menu.h b/menu.h
index 55d179c73..0cfa4fb6d 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.82 2006/01/22 14:24:31 kls Exp $
+ * $Id: menu.h 1.83 2006/02/17 15:38:40 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -22,6 +22,7 @@
 class cMenuText : public cOsdMenu {
 private:
   char *text;
+  eDvbFont font;
 public:
   cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
   virtual ~cMenuText();
diff --git a/menuitems.c b/menuitems.c
index e23806631..fab13ca49 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.31 2006/02/04 12:47:08 kls Exp $
+ * $Id: menuitems.c 1.32 2006/02/12 10:31:08 kls Exp $
  */
 
 #include "menuitems.h"
@@ -239,6 +239,7 @@ eOSState cMenuEditChrItem::ProcessKey(eKeys Key)
 cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed)
 :cMenuEditItem(Name)
 {
+  orgValue = NULL;
   value = Value;
   length = Length;
   allowed = strdup(Allowed);
@@ -253,6 +254,7 @@ cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, co
 
 cMenuEditStrItem::~cMenuEditStrItem()
 {
+  free(orgValue);
   free(allowed);
 }
 
@@ -409,8 +411,10 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  break;
     case kRight|k_Repeat:
     case kRight: AdvancePos();
-                 if (pos == 0)
+                 if (pos == 0) {
+                    orgValue = strdup(value);
                     SetHelpKeys();
+                    }
                  break;
     case kUp|k_Repeat:
     case kUp:
@@ -469,7 +473,13 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     return cMenuEditItem::ProcessKey(Key);
                  }
                  break;
+    case kBack:
     case kOk:    if (InEditMode()) {
+                    if (Key == kBack && orgValue) {
+                       strcpy(value, orgValue);
+                       free(orgValue);
+                       orgValue = NULL;
+                       }
                     pos = -1;
                     newchar = true;
                     stripspace(value);
diff --git a/menuitems.h b/menuitems.h
index ec8e08f19..ac0d7d3c7 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.16 2006/01/21 10:45:55 kls Exp $
+ * $Id: menuitems.h 1.17 2006/02/12 10:22:03 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -77,6 +77,7 @@ class cMenuEditChrItem : public cMenuEditItem {
 
 class cMenuEditStrItem : public cMenuEditItem {
 private:
+  char *orgValue;
   char *value;
   int length;
   char *allowed;
diff --git a/recording.c b/recording.c
index e7efba0b9..1efa3f643 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.134 2006/02/05 12:34:08 kls Exp $
+ * $Id: recording.c 1.137 2006/02/19 13:09:29 kls Exp $
  */
 
 #include "recording.h"
@@ -58,6 +58,8 @@
 
 #define MAX_SUBTITLE_LENGTH  40
 
+#define MAX_LINK_LEVEL  6
+
 bool VfatFileSystem = false;
 
 cRecordings DeletedRecordings(true);
@@ -254,15 +256,44 @@ void cResumeFile::Delete(void)
 
 // --- cRecordingInfo --------------------------------------------------------
 
-cRecordingInfo::cRecordingInfo(tChannelID ChannelID, const cEvent *Event)
-{
-  channelID = ChannelID;
-  if (Event) {
-     event = Event;
-     ownEvent = NULL;
+cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
+{
+  channelID = Channel ? Channel->GetChannelID() : tChannelID::InvalidID;
+  ownEvent = Event ? NULL : new cEvent(0);
+  event = ownEvent ? ownEvent : Event;
+  if (Channel) {
+     // Since the EPG data's component records can carry only a single
+     // language code, let's see whether the channel's PID data has
+     // more information:
+     cComponents *Components = (cComponents *)event->Components();
+     if (!Components)
+        Components = new cComponents;
+     for (int i = 0; i < MAXAPIDS; i++) {
+         const char *s = Channel->Alang(i);
+         if (*s) {
+            tComponent *Component = Components->GetComponent(i, 2, 3);
+            if (!Component)
+               Components->SetComponent(Components->NumComponents(), 2, 3, s, NULL);
+            else if (strlen(s) > strlen(Component->language))
+               strn0cpy(Component->language, s, sizeof(Component->language));
+            }
+         }
+     // There's no "multiple languages" for Dolby Digital tracks, but
+     // we do the same procedure here, too, in case there is no component
+     // information at all:
+     for (int i = 0; i < MAXDPIDS; i++) {
+         const char *s = Channel->Dlang(i);
+         if (*s) {
+            tComponent *Component = Components->GetComponent(i, 2, 5);
+            if (!Component)
+               Components->SetComponent(Components->NumComponents(), 2, 5, s, NULL);
+            else if (strlen(s) > strlen(Component->language))
+               strn0cpy(Component->language, s, sizeof(Component->language));
+            }
+         }
+     if (Components != event->Components())
+        ((cEvent *)event)->SetComponents(Components);
      }
-  else
-     event = ownEvent = new cEvent(0);
 }
 
 cRecordingInfo::~cRecordingInfo()
@@ -465,7 +496,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   priority = Timer->Priority();
   lifetime = Timer->Lifetime();
   // handle info:
-  info = new cRecordingInfo(Timer->Channel()->GetChannelID(), Event);
+  info = new cRecordingInfo(Timer->Channel(), Event);
   // this is a somewhat ugly hack to get the 'summary' information from the
   // timer into the recording info, but it saves us from having to actually
   // copy the entire event data:
@@ -811,7 +842,7 @@ void cRecordings::Refresh(bool Foreground)
   ScanVideoDir(VideoDirectory, Foreground);
 }
 
-void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
+void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel)
 {
   cReadDir d(DirName);
   struct dirent *e;
@@ -821,7 +852,13 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
            asprintf(&buffer, "%s/%s", DirName, e->d_name);
            struct stat st;
            if (stat(buffer, &st) == 0) {
+              int Link = 0;
               if (S_ISLNK(st.st_mode)) {
+                 if (LinkLevel > MAX_LINK_LEVEL) {
+                    isyslog("max link level exceeded - not scanning %s", buffer);
+                    continue;
+                    }
+                 Link = 1;
                  char *old = buffer;
                  buffer = ReadLink(old);
                  free(old);
@@ -849,7 +886,7 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
                        delete r;
                     }
                  else
-                    ScanVideoDir(buffer, Foreground);
+                    ScanVideoDir(buffer, Foreground, LinkLevel + Link);
                  }
               }
            free(buffer);
diff --git a/recording.h b/recording.h
index 7eaddcc36..5a188281d 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.49 2006/01/20 17:18:28 kls Exp $
+ * $Id: recording.h 1.51 2006/02/18 14:08:09 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -44,7 +44,7 @@ class cRecordingInfo {
   tChannelID channelID;
   const cEvent *event;
   cEvent *ownEvent;
-  cRecordingInfo(tChannelID ChannelID = tChannelID::InvalidID, const cEvent *Event = NULL);
+  cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
   void SetData(const char *Title, const char *ShortText, const char *Description);
 public:
   ~cRecordingInfo();
@@ -104,7 +104,7 @@ class cRecordings : public cList<cRecording>, public cThread {
   int state;
   const char *UpdateFileName(void);
   void Refresh(bool Foreground = false);
-  void ScanVideoDir(const char *DirName, bool Foreground = false);
+  void ScanVideoDir(const char *DirName, bool Foreground = false, int LinkLevel = 0);
 protected:
   void Action(void);
 public:
diff --git a/skinsttng.c b/skinsttng.c
index 97e8fc8b9..47a154ed8 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.18 2006/02/05 14:51:39 kls Exp $
+ * $Id: skinsttng.c 1.19 2006/02/17 15:57:37 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -632,7 +632,7 @@ int cSkinSTTNGDisplayMenu::GetTextAreaWidth(void) const
 const cFont *cSkinSTTNGDisplayMenu::GetTextAreaFont(bool FixedFont) const
 {
   const cFont *font = cFont::GetFont(FixedFont ? fontFix : fontOsd);
-  font = cFont::GetFont(fontSml);//XXX -> make a way to let the text define which font to use
+  //XXX -> make a way to let the text define which font to use
   return font;
 }
 
diff --git a/thread.c b/thread.c
index 5d5e18bd1..3293b1d45 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.52 2006/01/28 11:34:35 kls Exp $
+ * $Id: thread.c 1.53 2006/02/12 12:24:39 kls Exp $
  */
 
 #include "thread.h"
@@ -300,7 +300,7 @@ void cThread::Cancel(int WaitSeconds)
                return;
             cCondWait::SleepMs(10);
             }
-        esyslog("ERROR: thread %d won't end (waited %d seconds) - canceling it...", childThreadId, WaitSeconds);
+        esyslog("ERROR: %s thread %d won't end (waited %d seconds) - canceling it...", description ? description : "", childThreadId, WaitSeconds);
         }
      pthread_cancel(childTid);
      childTid = 0;
diff --git a/vdr.5 b/vdr.5
index 214aac81c..0f6904543 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.48 2006/01/29 11:31:58 kls Exp $
+.\" $Id: vdr.5 1.49 2006/02/19 15:04:21 kls Exp $
 .\"
-.TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files"
+.TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -641,7 +641,7 @@ l l.
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
 <stream>       @is the stream content (1 = video, 2 = audio)
 <type>         @is the stream type according to ETSI EN 300 468
-<language>     @is the three letter language code
+<language>     @is the three letter language code (optionally two codes, separated by '+')
 <descr>        @is the description of this stream component
 <vps time>     @is the Video Programming Service time of this event
 .TE

From 9d12ac30f006ed63b4c9ab4c1a076b7d4f025022 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Feb 2006 18:00:00 +0100
Subject: [PATCH 136/307] Version 1.3.44 - Fixed setting the audio language
 codes in 'Transfer-Mode' (reported by Rolf   Ahrenberg). The actual problem
 was the call to the Transferring() function in   cDevice::AttachPlayer()
 before assigning the player. - Fixed removing the '-' when entering a channel
 number where there is no other   one that fits the input (thanks to Joachim
 Wilke). - Fixed the 'libsi' function CharArray::checkSize(), which made a
 previous workaround   in libsi/descriptor.c obsolete (thanks to Marcel
 Wiesweg). - The "Ok" key in the "Jump" mode of the replay progress display
 now confirms the   jump instead of closing the display (thanks to Christoph
 Haubrich). - The 'summary' field of a timer definition has been renamed to
 'aux', and is now   only used for external applications to store auxiliary
 information with a timer,   which has no meaning whatsoever to VDR itself.  
 The contents of the 'aux' field of a timer is copied into the recording's  
 'info.vdr' file, using the tag character '@'. - The description of a
 recording is now taken exclusively from its related EPG   data. If an
 application wants to use a different description it needs to set   it with
 SVDRP/PUTE and use table ID 0x00, so that it won't be overwritten (as   a
 side effect, however, this also disables VPS for such an event). - There is
 no more "Summary" menu when pressing "Ok" in the "Timers" menu.   The "Ok"
 key now always opens the "Edit timer" menu. - The upper 16 bit of a timer's
 "flags" are no longer treated specially when a timer   is modified in the
 "Edit timer" menu. If an external application needs to know if   a timer was
 modified, it has to keep a copy of the timer's data and compare that   to the
 actual data. - The new function cRecordingInfo::ChannelID() can be used to
 retrieve the ID of   the channel a recording was made from. - The 'info.vdr'
 file of a recording now also contains the 'E' and 'V' records of   the EPG
 event used when creating it. - The option "Setup/OSD/Sort timers" has been
 removed. Timers are always sorted   by their start time and priority. - The
 "Blue" key in the "Timers" menu now displays the EPG info of the event the  
 selected timer will record (if available). The "On/Off" function has been
 shifted   to the "Red" button. Editing a timer is done by pressing "Ok". -
 When determining which event a timer is going to record, all available events
   in the future are now taken into account (no more limit to 4 hours in the  
 future). This has been done so that the event info is available in the
 "Timers"   menu when pressing the "Blue" button. In order to avoid
 unnecessary work, each   timer now has its own timestamp to control whether
 its schedule has changed   since the last time its event has been set. -
 Fixed setting events to timers in case a non-VPS event has expired. - There
 is now a log message "timer ... set to event ..." when defining a timer  
 from the EPG menu. - Lines tagged with '#' in the 'info.vdr' file of a
 recording are now silently   ignored when reading that file (suggested by
 Peter Bieringer). Such lines can   be used by external tools to store
 arbitrary information. - The 'event id' in EPG data has been extended to 32
 bit, so that external tools   can generate ids that don't collide with those
 from the DVB data stream   (suggested by Matthias Schniedermeyer). - The
 DrawBitmap() function now has a new parameter 'Overlay' that allows a bitmap 
  to be drawn with a transparent background (thanks to Alexander Hans). -
 Fixed cSchedule::GetFollowingEvent() in case there is currently no present
 event   running (thanks to Pekka Mauno).

---
 CONTRIBUTORS       |  16 ++++++
 HISTORY            |  55 +++++++++++++++++++
 MANUAL             |  25 +++------
 channels.conf      |   8 +--
 config.c           |   5 +-
 config.h           |   7 +--
 device.c           |   6 +-
 epg.c              |  20 ++++---
 epg.h              |  14 +++--
 i18n.c             |  68 ++++++++---------------
 libsi/descriptor.c |   6 +-
 libsi/util.h       |   4 +-
 menu.c             |  90 ++++++++++++++++--------------
 menu.h             |   4 +-
 osd.c              |  20 ++++---
 osd.h              |  16 ++++--
 recording.c        |  38 +++++++++++--
 recording.h        |   6 +-
 timers.c           | 133 ++++++++++++++++++++++++---------------------
 timers.h           |   8 ++-
 vdr.5              |  38 +++++++------
 21 files changed, 346 insertions(+), 241 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b3dc8e8b1..4b9f40bf3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -73,6 +73,8 @@ Matthias Schniedermeyer <ms@citd.de>
  is currently recording
  for suggesting to make the SVDRP command LSTT optionally list the channels
  of the timers with their unique channel ids instead of their numbers
+ for suggesting to extend the 'event id' in EPG data to 32 bit, so that external tools
+ can generate ids that don't collide with those from the DVB data stream
 
 Miha Setina <mihasetina@softhome.net>
  for translating OSD texts to the Slovenian language
@@ -961,6 +963,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making the channel number be reset if the number entered through the numeric keys
  exceeds the maximum channel number
  for suggesting to also set the language codes when setting the audio track descriptions
+ for reporting a problem in setting the audio language codes in 'Transfer-Mode'
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -977,6 +980,7 @@ Peter Bieringer <pb@bieringer.de>
  for reporting a leftover 'summary.vdr' in vdr.5
  for adding more error messages and line numbers when reading EPG data and info.vdr
  for fixing handling "more than 3 byte" key sequences in cKbdRemote::ReadKeySequence()
+ for suggesting to ignore lines tagged with '#' in the 'info.vdr' file of a recording
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
@@ -1412,6 +1416,8 @@ Joachim Wilke <vdr@joachim-wilke.de>
  for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
  for fixing a NULL pointer access with the cUnbufferedFile when a replay session
  runs all the way until the end of the recording
+ for fixing removing the '-' when entering a channel number where there is no other
+ one that fits the input
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -1742,6 +1748,8 @@ Jaroslaw Swierczynski <swiergot@gmail.com>
 Alexander Hans <cleditor@arcor.de>
  for reporting a crash when pressing '0' in the "Schedule" menu on a channel that
  doesn't have any EPG data 
+ for giving the DrawBitmap() function a new parameter 'Overlay' that allows a bitmap
+ to be drawn with a transparent background
 
 Daniel Karsubka <dkar@gmx.de>
  for suggesting to write the epg.data file when VDR exits
@@ -1755,3 +1763,11 @@ Ronny Kornexl <ronny.kornexl@online.de>
 
 B�rta Vladim�r <vladimir.barta@k2atmitec.cz>
  for translating OSD texts to the Czech language
+
+Christoph Haubrich <christoph1.haubrich@arcor.de>
+ for making the "Ok" key in the "Jump" mode of the replay progress display confirm
+ the jump instead of closing the display
+
+Pekka Mauno <pekka.mauno@iki.fi>
+ for fixing cSchedule::GetFollowingEvent() in case there is currently no present
+ event running
diff --git a/HISTORY b/HISTORY
index 7132b8114..2b6cb5b7b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4359,3 +4359,58 @@ Video Disk Recorder Revision History
   Reinhard Nissl).
 - Added a comment to tChannelID::nid, explaining that is is actually the "original"
   network id.
+
+2006-02-26: Version 1.3.44
+
+- Fixed setting the audio language codes in 'Transfer-Mode' (reported by Rolf
+  Ahrenberg). The actual problem was the call to the Transferring() function in
+  cDevice::AttachPlayer() before assigning the player.
+- Fixed removing the '-' when entering a channel number where there is no other
+  one that fits the input (thanks to Joachim Wilke).
+- Fixed the 'libsi' function CharArray::checkSize(), which made a previous workaround
+  in libsi/descriptor.c obsolete (thanks to Marcel Wiesweg).
+- The "Ok" key in the "Jump" mode of the replay progress display now confirms the
+  jump instead of closing the display (thanks to Christoph Haubrich).
+- The 'summary' field of a timer definition has been renamed to 'aux', and is now
+  only used for external applications to store auxiliary information with a timer,
+  which has no meaning whatsoever to VDR itself.
+  The contents of the 'aux' field of a timer is copied into the recording's
+  'info.vdr' file, using the tag character '@'.
+- The description of a recording is now taken exclusively from its related EPG
+  data. If an application wants to use a different description it needs to set
+  it with SVDRP/PUTE and use table ID 0x00, so that it won't be overwritten (as
+  a side effect, however, this also disables VPS for such an event).
+- There is no more "Summary" menu when pressing "Ok" in the "Timers" menu.
+  The "Ok" key now always opens the "Edit timer" menu.
+- The upper 16 bit of a timer's "flags" are no longer treated specially when a timer
+  is modified in the "Edit timer" menu. If an external application needs to know if
+  a timer was modified, it has to keep a copy of the timer's data and compare that
+  to the actual data.
+- The new function cRecordingInfo::ChannelID() can be used to retrieve the ID of
+  the channel a recording was made from.
+- The 'info.vdr' file of a recording now also contains the 'E' and 'V' records of
+  the EPG event used when creating it.
+- The option "Setup/OSD/Sort timers" has been removed. Timers are always sorted
+  by their start time and priority.
+- The "Blue" key in the "Timers" menu now displays the EPG info of the event the
+  selected timer will record (if available). The "On/Off" function has been shifted
+  to the "Red" button. Editing a timer is done by pressing "Ok".
+- When determining which event a timer is going to record, all available events
+  in the future are now taken into account (no more limit to 4 hours in the
+  future). This has been done so that the event info is available in the "Timers"
+  menu when pressing the "Blue" button. In order to avoid unnecessary work, each
+  timer now has its own timestamp to control whether its schedule has changed
+  since the last time its event has been set.
+- Fixed setting events to timers in case a non-VPS event has expired.
+- There is now a log message "timer ... set to event ..." when defining a timer
+  from the EPG menu.
+- Lines tagged with '#' in the 'info.vdr' file of a recording are now silently
+  ignored when reading that file (suggested by Peter Bieringer). Such lines can
+  be used by external tools to store arbitrary information.
+- The 'event id' in EPG data has been extended to 32 bit, so that external tools
+  can generate ids that don't collide with those from the DVB data stream
+  (suggested by Matthias Schniedermeyer).
+- The DrawBitmap() function now has a new parameter 'Overlay' that allows a bitmap
+  to be drawn with a transparent background (thanks to Alexander Hans).
+- Fixed cSchedule::GetFollowingEvent() in case there is currently no present event
+  running (thanks to Pekka Mauno).
diff --git a/MANUAL b/MANUAL
index cd86d7313..9655bc365 100644
--- a/MANUAL
+++ b/MANUAL
@@ -20,11 +20,11 @@ Version 1.3
   Ok      Ch display  Select       Switch     Edit       Accept        Play              Progress disp.   Switch & Close
   Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu off         Menu off
   Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu  Close
-  Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump             -
+  Red     -           Record       Edit       On/Off     ABC/abc       Play/Commands(1)  Jump             -
   Green   -           Audio        New        New        Ins/Ovr       Rewind            Skip -60s        -
   Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s        -
-  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Info              Stop             -
-  0..9    Ch select   -            Sort(3)    Day(4)     Numeric inp.  Exec cmd(2)       Editing          -
+  Blue    -           Stop/Resume  Mark       Info       -             Info              Stop             -
+  0..9    Ch select   -            Sort(2)    Day(3)     Numeric inp.  Exec cmd(1)       Editing          -
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
   are used to enter the data, and the Left key can be used to delete the last
@@ -75,18 +75,15 @@ Version 1.3
   Yellow    Info
   Blue      Timers menu
 
-  (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
-      has been enabled in the "Setup" menu. Otherwise the Blue button is used
-      to "mark" a timer for moving.
-  (2) See "Processing Recordings" below.
-  (3) In the "Channels" menu the '0' key switches the sort mode through "by number",
+  (1) See "Processing Recordings" below.
+  (2) In the "Channels" menu the '0' key switches the sort mode through "by number",
       "by name" and "by provider". Other numeric input positions the cursor to
       the channel with the number entered so far. If there is no channel with that
       number, nothing happens. While entering a channel number, the '0' key will
       be treated as part of that number, not as a sort mode toggle. If no numeric
       key has been pressed for more than one second, the number is reset and '0'
       functions as sort mode toggle again.
-  (4) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
+  (3) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
       a single shot and a repeating timer. If "Day" indicates a repeating timer,
       the keys '1'...'7' can be used to toggle the individual days ('1' is Monday).
 
@@ -101,12 +98,10 @@ Version 1.3
   any changes that might have been made in the current menu.
 
   In the "Timers" menu, the current timer can be enabled or disabled with
-  the "Blue" key (this is only possible if the "Timers" list is sorted,
-  otherwise the "Blue" key is used to mark a timer in order to move it to
-  another position in the list). Enabled timers are marked with '>', timers
+  the "Red" key. Enabled timers are marked with '>', timers
   that are currently recording are marked with '#'. If a timer has the
   "First day" set so that it will start recording only on the given date,
-  it is marked with '!'. The "Blue" key toggles through the "enabled" and
+  it is marked with '!'. The "Red" key toggles through the "enabled" and
   "disabled" states, and for repeating timers that are currently recording
   also a state that ends this recording prematurely and sets the "First day"
   date so that it will record again the next time the timer hits.
@@ -539,10 +534,6 @@ Version 1.3
                          closing a temporary display, like, for instance, the channel
                          display.
 
-  Sort timers = yes      Turns sorting the timers in the "Timers" menu on/off.
-                         Timers are sorted by ascending start times, with the
-                         first one being the next timer that will start.
-
   Recording directories = yes
                          Turns displaying the Recordings menu as a hierarchical
                          directory structure on or off.
diff --git a/channels.conf b/channels.conf
index a5f896eee..50266e9c8 100644
--- a/channels.conf
+++ b/channels.conf
@@ -48,8 +48,8 @@ PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1801,1722,1702:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1801,1722,1702:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1722,1702:34:133:17:0
@@ -108,7 +108,7 @@ TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
 ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:0:10070:2:2044:0
-Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng:576:960,961:4905:2:2023:0
+Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
 ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
 Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
@@ -120,7 +120,7 @@ Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,655=NAR:576:960,961:
 Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:4503:2:2011:0
 Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,657=NAR:577:960,961:4502:2:2011:0
 Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4603:2:2030:0
-Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:5502:2:2007:0
+Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,666=NAR:582:960,961:4602:2:2030:0
 Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:4809:2:2030:0
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
diff --git a/config.c b/config.c
index 4e469ab91..b829d3a7a 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.141 2006/01/13 15:19:37 kls Exp $
+ * $Id: config.c 1.142 2006/02/25 14:12:16 kls Exp $
  */
 
 #include "config.h"
@@ -240,7 +240,6 @@ cSetup::cSetup(void)
   EPGLinger = 0;
   SVDRPTimeout = 300;
   ZapTimeout = 3;
-  SortTimers = 1;
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 99;
@@ -400,7 +399,6 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
-  else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
   else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
@@ -467,7 +465,6 @@ bool cSetup::Save(void)
   Store("EPGLinger",          EPGLinger);
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("ZapTimeout",         ZapTimeout);
-  Store("SortTimers",         SortTimers);
   Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
diff --git a/config.h b/config.h
index 5e992858f..ff532d27c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.244 2006/02/12 10:07:44 kls Exp $
+ * $Id: config.h 1.246 2006/02/25 14:12:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.43"
-#define VDRVERSNUM   10343  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.44"
+#define VDRVERSNUM   10344  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -212,7 +212,6 @@ class cSetup : public cConfig<cSetupLine> {
   int EPGLinger;
   int SVDRPTimeout;
   int ZapTimeout;
-  int SortTimers;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
diff --git a/device.c b/device.c
index 6a03ade07..5eaa8ac20 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.123 2006/02/04 14:58:24 kls Exp $
+ * $Id: device.c 1.124 2006/02/24 14:05:26 kls Exp $
  */
 
 #include "device.h"
@@ -934,10 +934,10 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (CanReplay()) {
      if (player)
         Detach(player);
-     if (!Transferring())
-        ClrAvailableTracks();
      pesAssembler->Reset();
      player = Player;
+     if (!Transferring())
+        ClrAvailableTracks();
      SetPlayMode(player->playMode);
      player->device = this;
      player->Activate(true);
diff --git a/epg.c b/epg.c
index 910333b11..2f88af9af 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.61 2006/02/19 12:50:26 kls Exp $
+ * $Id: epg.c 1.64 2006/02/26 15:07:17 kls Exp $
  */
 
 #include "epg.h"
@@ -97,7 +97,7 @@ tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
 
 // --- cEvent ----------------------------------------------------------------
 
-cEvent::cEvent(u_int16_t EventID)
+cEvent::cEvent(tEventID EventID)
 {
   schedule = NULL;
   eventID = EventID;
@@ -133,7 +133,7 @@ tChannelID cEvent::ChannelID(void) const
   return schedule ? schedule->ChannelID() : tChannelID();
 }
 
-void cEvent::SetEventID(u_int16_t EventID)
+void cEvent::SetEventID(tEventID EventID)
 {
   if (eventID != EventID) {
      if (schedule)
@@ -249,8 +249,7 @@ cString cEvent::GetVpsString(void) const
 void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
 {
   if (InfoOnly || startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
-     if (!InfoOnly)
-        fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version);
+     fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version);
      if (!isempty(title))
         fprintf(f, "%sT %s\n", Prefix, title);
      if (!isempty(shortText))
@@ -268,7 +267,7 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
             fprintf(f, "%sX %s\n", Prefix, *p->ToString());
             }
         }
-     if (!InfoOnly && vps)
+     if (vps)
         fprintf(f, "%sV %ld\n", Prefix, vps);
      if (!InfoOnly)
         fprintf(f, "%se\n", Prefix);
@@ -692,10 +691,17 @@ const cEvent *cSchedule::GetFollowingEvent(void) const
   const cEvent *p = GetPresentEvent();
   if (p)
      p = events.Next(p);
+  else { 
+     time_t now = time(NULL);
+     for (p = events.First(); p; p = events.Next(p)) {
+         if (p->StartTime() >= now)
+            break;
+         }
+     }
   return p;
 }
 
-const cEvent *cSchedule::GetEvent(u_int16_t EventID, time_t StartTime) const
+const cEvent *cSchedule::GetEvent(tEventID EventID, time_t StartTime) const
 {
   // Returns either the event info with the given EventID or, if that one can't
   // be found, the one with the given StartTime (or NULL if neither can be found)
diff --git a/epg.h b/epg.h
index fa80474e3..1def6176e 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.32 2006/02/19 12:51:41 kls Exp $
+ * $Id: epg.h 1.33 2006/02/26 13:58:57 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -47,11 +47,13 @@ class cComponents {
 
 class cSchedule;
 
+typedef u_int32_t tEventID;
+
 class cEvent : public cListObject {
   friend class cSchedule;
 private:
   cSchedule *schedule;     // The Schedule this event belongs to
-  u_int16_t eventID;       // Event ID of this event
+  tEventID eventID;        // Event ID of this event
   uchar tableID;           // Table ID this event came from
   uchar version;           // Version number of section this event came from
   int runningStatus;       // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running
@@ -64,12 +66,12 @@ class cEvent : public cListObject {
   time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
   time_t seen;             // When this event was last seen in the data stream
 public:
-  cEvent(u_int16_t EventID);
+  cEvent(tEventID EventID);
   ~cEvent();
   virtual int Compare(const cListObject &ListObject) const;
   tChannelID ChannelID(void) const;
   const cSchedule *Schedule(void) const { return schedule; }
-  u_int16_t EventID(void) const { return eventID; }
+  tEventID EventID(void) const { return eventID; }
   uchar TableID(void) const { return tableID; }
   uchar Version(void) const { return version; }
   int RunningStatus(void) const { return runningStatus; }
@@ -89,7 +91,7 @@ class cEvent : public cListObject {
   cString GetTimeString(void) const;
   cString GetEndTimeString(void) const;
   cString GetVpsString(void) const;
-  void SetEventID(u_int16_t EventID);
+  void SetEventID(tEventID EventID);
   void SetTableID(uchar TableID);
   void SetVersion(uchar Version);
   void SetRunningStatus(int RunningStatus, cChannel *Channel = NULL);
@@ -140,7 +142,7 @@ class cSchedule : public cListObject  {
   const cList<cEvent> *Events(void) const { return &events; }
   const cEvent *GetPresentEvent(void) const;
   const cEvent *GetFollowingEvent(void) const;
-  const cEvent *GetEvent(u_int16_t EventID, time_t StartTime = 0) const;
+  const cEvent *GetEvent(tEventID EventID, time_t StartTime = 0) const;
   const cEvent *GetEventAround(time_t Time) const;
   void Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0) const;
   static bool Read(FILE *f, cSchedules *Schedules);
diff --git a/i18n.c b/i18n.c
index ad9b797e4..63c4aeff8 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.247 2006/02/04 14:17:54 kls Exp $
+ * $Id: i18n.c 1.250 2006/02/25 14:21:28 kls Exp $
  *
  * Translations provided by:
  *
@@ -569,28 +569,6 @@ const tI18nPhrase Phrases[] = {
     "Hvad vises som det n�ste?",
     "N�sleduj�c� program",
   },
-  { "Summary",
-    "Inhalt",
-    "Vsebina",
-    "Sommario",
-    "Inhoud",
-    "Resumo",
-    "R�sum�",
-    "Sammendrag",
-    "Yhteenveto",
-    "Podsumowanie",
-    "Resumen",
-    "�����������",
-    "Sammanfattning",
-    "Cuprins",
-    "Tartalom",
-    "Resum",
-    "��������",
-    "Sadr�aj",
-    "�levaade",
-    "Omtale",
-    "Obsah",
-  },
   // Button texts (should not be more than 10 characters!):
   { "Button$Edit",
     "Editieren",
@@ -746,6 +724,28 @@ const tI18nPhrase Phrases[] = {
     "Optag",
     "Nahr�t",
   },
+  { "Button$Info",
+    "Info",
+    "Info",
+    "",//TODO
+    "Info",
+    "",//TODO
+    "Info",
+    "",//TODO
+    "Tiedot",
+    "Info",
+    "Info",
+    "�����������",
+    "Info",
+    "Info",
+    "",//TODO
+    "",//TODO
+    "����",
+    "Info",
+    "Info",
+    "Info",
+    "Info",
+  },
   { "Button$Play",
     "Wiedergabe",
     "Predvajaj",
@@ -3304,28 +3304,6 @@ const tI18nPhrase Phrases[] = {
     "Menu taste lukker",
     "Kl�vesa Menu zav�r�",
   },
-  { "Setup.OSD$Sort timers",
-    "Timer sortieren",
-    "Sortiraj termine",
-    "Ordinamento timer",
-    "Timers sorteren",
-    "Ordenar os timers",
-    "Trier les programmations",
-    "Sorter timere",
-    "J�rjest� ajastimet",
-    "Sortuj timery",
-    "Ordenar programas de grabaci�n",
-    "�������� ��������������������",
-    "Sortera timers",
-    "Sortare timer-e",
-    "A beprogramozott felv�telek elrendez�se",
-    "Ordenar gravacions programades",
-    "���������� ��������",
-    "Sortiraj termine",
-    "Taimeri sorteerimine",
-    "Sorter timere",
-    "T��d�n� �asova��",
-  },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
     "Direktoriji za posnetke",
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 6a3af9fe8..b84e2c44d 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.17 2006/02/18 11:02:25 kls Exp $
+ *   $Id: descriptor.c 1.18 2006/02/25 10:06:05 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -331,8 +331,6 @@ void CaDescriptor::Parse() {
    data.setPointerAndOffset<const descr_ca>(s, offset);
    if (checkSize(getLength()-offset))
       privateData.assign(data.getData(offset), getLength()-offset);
-   else
-      privateData.assign(NULL, 0);
 }
 
 int StreamIdentifierDescriptor::getComponentTag() const {
@@ -640,8 +638,6 @@ void LinkageDescriptor::Parse() {
    data.setPointerAndOffset<const descr_linkage>(s, offset);
    if (checkSize(getLength()-offset))
       privateData.assign(data.getData(offset), getLength()-offset);
-   else
-      privateData.assign(NULL, 0);
 }
 
 int LinkageDescriptor::getTransportStreamId() const {
diff --git a/libsi/util.h b/libsi/util.h
index 91a4c32a2..08b16141b 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 1.6 2006/02/18 10:38:20 kls Exp $
+ *   $Id: util.h 1.7 2006/02/25 10:13:28 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -59,7 +59,7 @@ class CharArray {
    u_int32_t FourBytes(const int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
 
    bool isValid() const { return data_->valid; }
-   bool checkSize(int offset) { return (data_->valid && offset>=0 && (data_->valid=(off+offset < data_->size))); }
+   bool checkSize(int offset) { return (data_->valid && (data_->valid=(offset>=0 && off+offset < data_->size))); }
 
    void addOffset(int offset) { off+=offset; }
 private:
diff --git a/menu.c b/menu.c
index e20889437..d15c017fe 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.413 2006/02/19 10:18:28 kls Exp $
+ * $Id: menu.c 1.422 2006/02/25 15:41:40 kls Exp $
  */
 
 #include "menu.h"
@@ -686,14 +686,12 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                        if (!*data.file)
                           strcpy(data.file, data.Channel()->ShortName(true));
                        if (timer) {
-                          if (memcmp(timer, &data, sizeof(data)) != 0) {
+                          if (memcmp(timer, &data, sizeof(data)) != 0)
                              *timer = data;
-                             if (timer->HasFlags(tfActive))
-                                timer->ClrFlags(~tfAll); // allows external programs to mark active timers with values > 0xFFFF and recognize if the user has modified them
-                             }
                           if (addIfConfirmed)
                              Timers.Add(timer);
                           timer->Matches();
+                          timer->SetEventFromSchedule();
                           Timers.SetModified();
                           isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
@@ -771,13 +769,14 @@ void cMenuTimerItem::Set(void)
 
 class cMenuTimers : public cOsdMenu {
 private:
+  int helpKeys;
   eOSState Edit(void);
   eOSState New(void);
   eOSState Delete(void);
   eOSState OnOff(void);
-  virtual void Move(int From, int To);
-  eOSState Summary(void);
+  eOSState Info(void);
   cTimer *CurrentTimer(void);
+  void SetHelpKeys(void);
 public:
   cMenuTimers(void);
   virtual ~cMenuTimers();
@@ -787,11 +786,12 @@ class cMenuTimers : public cOsdMenu {
 cMenuTimers::cMenuTimers(void)
 :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
 {
+  helpKeys = -1;
   for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer))
       Add(new cMenuTimerItem(timer));
-  if (Setup.SortTimers)
-     Sort();
-  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), Setup.SortTimers ? tr("Button$On/Off") : tr("Button$Mark"));
+  Sort();
+  SetCurrent(First());
+  SetHelpKeys();
   Timers.IncBeingEdited();
 }
 
@@ -806,11 +806,30 @@ cTimer *cMenuTimers::CurrentTimer(void)
   return item ? item->Timer() : NULL;
 }
 
+void cMenuTimers::SetHelpKeys(void)
+{
+  int NewHelpKeys = 0;
+  cTimer *timer = CurrentTimer();
+  if (timer) {
+     if (timer->Event())
+        NewHelpKeys = 2;
+     else
+        NewHelpKeys = 1;
+     }
+  if (NewHelpKeys != helpKeys) {
+     helpKeys = NewHelpKeys;
+     SetHelp(helpKeys > 0 ? tr("Button$On/Off") : NULL, tr("Button$New"), helpKeys > 0 ? tr("Button$Delete") : NULL, helpKeys == 2 ? tr("Button$Info") : NULL);
+     }
+}
+
 eOSState cMenuTimers::OnOff(void)
 {
+  if (HasSubMenu())
+     return osContinue;
   cTimer *timer = CurrentTimer();
   if (timer) {
      timer->OnOff();
+     timer->SetEventFromSchedule();
      RefreshCurrent();
      DisplayCurrent(true);
      if (timer->FirstDay())
@@ -861,23 +880,14 @@ eOSState cMenuTimers::Delete(void)
   return osContinue;
 }
 
-void cMenuTimers::Move(int From, int To)
-{
-  Timers.Move(From, To);
-  cOsdMenu::Move(From, To);
-  Timers.SetModified();
-  Display();
-  isyslog("timer %d moved to %d", From + 1, To + 1);
-}
-
-eOSState cMenuTimers::Summary(void)
+eOSState cMenuTimers::Info(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   cTimer *ti = CurrentTimer();
-  if (ti && !isempty(ti->Summary()))
-     return AddSubMenu(new cMenuText(tr("Summary"), ti->Summary()));
-  return Edit(); // convenience for people not using the Summary feature ;-)
+  if (ti && ti->Event())
+     return AddSubMenu(new cMenuEvent(ti->Event()));
+  return osContinue;
 }
 
 eOSState cMenuTimers::ProcessKey(eKeys Key)
@@ -887,14 +897,11 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:     return Summary();
-       case kRed:    return Edit();
+       case kOk:     return Edit();
+       case kRed:    state = OnOff(); break; // must go through SetHelpKeys()!
        case kGreen:  return New();
        case kYellow: return Delete();
-       case kBlue:   if (Setup.SortTimers)
-                        OnOff();
-                     else
-                        Mark();
+       case kBlue:   return Info();
                      break;
        default: break;
        }
@@ -904,12 +911,14 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
      Add(new cMenuTimerItem(Timers.Get(TimerNumber)), true);
      Display();
      }
+  if (Key != kNone)
+     SetHelpKeys();
   return state;
 }
 
 // --- cMenuEvent ------------------------------------------------------------
 
-cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
+cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch, bool Buttons)
 :cOsdMenu(tr("Event"))
 {
   event = Event;
@@ -919,7 +928,8 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
         SetTitle(channel->Name());
         int TimerMatch = tmNone;
         Timers.GetMatch(event, &TimerMatch);
-        SetHelp(TimerMatch == tmFull ? tr("Button$Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
+        if (Buttons)
+           SetHelp(TimerMatch == tmFull ? tr("Button$Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
         }
      }
 }
@@ -1173,7 +1183,7 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                      break;
        case kBlue:   return Switch();
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true, true));
                      break;
        default:      break;
        }
@@ -1442,7 +1452,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                         return Switch();
                      break;
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel, true));
                      break;
        default:      break;
        }
@@ -1850,7 +1860,7 @@ void cMenuRecordings::SetHelpKeys(void)
        case 0: SetHelp(NULL); break;
        case 1: SetHelp(tr("Button$Open")); break;
        case 2:
-       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), NewHelpKeys == 3 ? tr("Info") : NULL);
+       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), NewHelpKeys == 3 ? tr("Button$Info") : NULL);
        }
      helpKeys = NewHelpKeys;
      }
@@ -2142,7 +2152,6 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu button closes"),     &data.MenuButtonCloses));
-  Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   SetCurrent(Get(current));
   Display();
@@ -3110,9 +3119,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             else
                number = number * 10 + Key - k0;
             channel = Channels.GetByNumber(number);
-            displayChannel->SetEvents(NULL, NULL);
+            Refresh();
             withInfo = false;
-            DisplayChannel();
             // Lets see if there can be any useful further input:
             int n = channel ? number * 10 : 0;
             int m = 10;
@@ -3131,10 +3139,10 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                   }
             if (n > 0) {
                // This channel is the only one that fits the input, so let's take it right away:
-               displayChannel->Flush(); // makes sure the user sees his last input
                NewChannel = channel;
                withInfo = true;
                number = 0;
+               Refresh();
                }
             }
          break;
@@ -3159,8 +3167,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                group = SaveGroup;
             channel = Channels.Get(group);
             if (channel) {
-               displayChannel->SetEvents(NULL, NULL);
-               DisplayChannel();
+               Refresh();
                if (!channel->GroupSep())
                   group = -1;
                }
@@ -3940,8 +3947,9 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
     case kUp:
     case kPause:
     case kDown:
+    case kOk:
          Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
-         Goto(Seconds * FRAMESPERSEC, Key == kDown || Key == kPause);
+         Goto(Seconds * FRAMESPERSEC, Key == kDown || Key == kPause || Key == kOk);
          timeSearchActive = false;
          break;
     default:
diff --git a/menu.h b/menu.h
index 0cfa4fb6d..46c1eeffd 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.83 2006/02/17 15:38:40 kls Exp $
+ * $Id: menu.h 1.84 2006/02/25 13:41:21 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -49,7 +49,7 @@ class cMenuEvent : public cOsdMenu {
 private:
   const cEvent *event;
 public:
-  cMenuEvent(const cEvent *Event, bool CanSwitch = false);
+  cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
diff --git a/osd.c b/osd.c
index 40b60e1bb..bf9640c58 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.66 2006/02/05 13:46:37 kls Exp $
+ * $Id: osd.c 1.67 2006/02/26 14:31:31 kls Exp $
  */
 
 #include "osd.h"
@@ -344,7 +344,7 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
      SetIndex(x, y, Index(Color));
 }
 
-void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette)
+void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
 {
   if (bitmap && Bitmap.bitmap && Intersects(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1)) {
      if (Covers(x, y, x + Bitmap.Width() - 1, y + Bitmap.Height() - 1))
@@ -354,16 +354,20 @@ void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tC
      if (ReplacePalette && Covers(x + x0, y + y0, x + x0 + Bitmap.Width() - 1, y + y0 + Bitmap.Height() - 1)) {
         Replace(Bitmap);
         for (int ix = 0; ix < Bitmap.width; ix++) {
-            for (int iy = 0; iy < Bitmap.height; iy++)
-                SetIndex(x + ix, y + iy, Bitmap.bitmap[Bitmap.width * iy + ix]);
+            for (int iy = 0; iy < Bitmap.height; iy++) {
+                if (!Overlay || Bitmap.bitmap[Bitmap.width * iy + ix] != 0)
+                   SetIndex(x + ix, y + iy, Bitmap.bitmap[Bitmap.width * iy + ix]);
+                }
             }
         }
      else {
         tIndexes Indexes;
         Take(Bitmap, &Indexes, ColorFg, ColorBg);
         for (int ix = 0; ix < Bitmap.width; ix++) {
-            for (int iy = 0; iy < Bitmap.height; iy++)
-                SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
+            for (int iy = 0; iy < Bitmap.height; iy++) {
+                if (!Overlay || Bitmap.bitmap[Bitmap.width * iy + ix] != 0)
+                   SetIndex(x + ix, y + iy, Indexes[int(Bitmap.bitmap[Bitmap.width * iy + ix])]);
+                }
             }
         }
      }
@@ -683,10 +687,10 @@ void cOsd::DrawPixel(int x, int y, tColor Color)
       bitmaps[i]->DrawPixel(x, y, Color);
 }
 
-void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette)
+void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
 {
   for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette);
+      bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette, Overlay);
 }
 
 void cOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
diff --git a/osd.h b/osd.h
index d716df844..0e9eb3c94 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.51 2006/02/05 13:46:37 kls Exp $
+ * $Id: osd.h 1.53 2006/02/26 14:45:05 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -157,13 +157,16 @@ class cBitmap : public cPalette {
        ///< Sets the pixel at the given coordinates to the given Color, which is
        ///< a full 32 bit ARGB value.
        ///< If the coordinates are outside the bitmap area, no pixel will be set.
-  void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false);
+  void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false, bool Overlay = false);
        ///< Sets the pixels in this bitmap with the data from the given
        ///< Bitmap, putting the upper left corner of the Bitmap at (x, y).
        ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
        ///< will be mapped to ColorBg and the second palette entry will be mapped to
        ///< ColorFg (palette indexes are defined so that 0 is the background and
-       ///< 1 is the foreground color).
+       ///< 1 is the foreground color). ReplacePalette controls whether the target
+       ///< area shall have its palette replaced with the one from Bitmap.
+       ///< If Overlay is true, any pixel in Bitmap that has color index 0 will
+       ///< not overwrite the corresponding pixel in the target area.
   void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
        ///< Draws the given string at coordinates (x, y) with the given foreground
        ///< and background color and font. If Width and Height are given, the text
@@ -278,13 +281,16 @@ class cOsd {
        ///< If the OSD area has been divided into separate sub-areas, and the
        ///< given coordinates don't fall into any of these sub-areas, no pixel will
        ///< be set.
-  virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false);
+  virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false, bool Overlay = false);
        ///< Sets the pixels in the OSD with the data from the given
        ///< Bitmap, putting the upper left corner of the Bitmap at (x, y).
        ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
        ///< will be mapped to ColorBg and the second palette entry will be mapped to
        ///< ColorFg (palette indexes are defined so that 0 is the background and
-       ///< 1 is the foreground color).
+       ///< 1 is the foreground color). ReplacePalette controls whether the target
+       ///< area shall have its palette replaced with the one from Bitmap.
+       ///< If Overlay is true, any pixel in Bitmap that has color index 0 will
+       ///< not overwrite the corresponding pixel in the target area.
   virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
        ///< Draws the given string at coordinates (x, y) with the given foreground
        ///< and background color and font. If Width and Height are given, the text
diff --git a/recording.c b/recording.c
index 1efa3f643..b8db2647d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.137 2006/02/19 13:09:29 kls Exp $
+ * $Id: recording.c 1.140 2006/02/26 11:59:59 kls Exp $
  */
 
 #include "recording.h"
@@ -261,6 +261,7 @@ cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
   channelID = Channel ? Channel->GetChannelID() : tChannelID::InvalidID;
   ownEvent = Event ? NULL : new cEvent(0);
   event = ownEvent ? ownEvent : Event;
+  aux = NULL;
   if (Channel) {
      // Since the EPG data's component records can carry only a single
      // language code, let's see whether the channel's PID data has
@@ -299,6 +300,7 @@ cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
 cRecordingInfo::~cRecordingInfo()
 {
   delete ownEvent;
+  free(aux);
 }
 
 void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description)
@@ -311,6 +313,12 @@ void cRecordingInfo::SetData(const char *Title, const char *ShortText, const cha
      ((cEvent *)event)->SetDescription(Description);
 }
 
+void cRecordingInfo::SetAux(const char *Aux)
+{
+  free(aux);
+  aux = Aux ? strdup(Aux) : NULL;
+}
+
 bool cRecordingInfo::Read(FILE *f)
 {
   if (ownEvent) {
@@ -329,6 +337,26 @@ bool cRecordingInfo::Read(FILE *f)
                             channelID = tChannelID::FromString(t);
                        }
                        break;
+             case 'E': {
+                         unsigned int EventID;
+                         time_t StartTime;
+                         int Duration;
+                         unsigned int TableID = 0;
+                         unsigned int Version = 0xFF;
+                         int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
+                         if (n >= 3 && n <= 5) {
+                            ownEvent->SetEventID(EventID);
+                            ownEvent->SetStartTime(StartTime);
+                            ownEvent->SetDuration(Duration);
+                            ownEvent->SetTableID(TableID);
+                            ownEvent->SetVersion(Version);
+                            }
+                       }
+                       break;
+             case '@': free(aux);
+                       aux = strdup(t);
+                       break;
+             case '#': break; // comments are ignored
              default: if (!ownEvent->Parse(s)) {
                          esyslog("ERROR: EPG data problem in line %d", line);
                          return false;
@@ -346,6 +374,8 @@ bool cRecordingInfo::Write(FILE *f, const char *Prefix) const
   if (channelID.Valid())
      fprintf(f, "%sC %s\n", Prefix, *channelID.ToString());
   event->Dump(f, Prefix, true);
+  if (aux)
+     fprintf(f, "%s@ %s\n", Prefix, aux);
   return true;
 }
 
@@ -497,11 +527,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   lifetime = Timer->Lifetime();
   // handle info:
   info = new cRecordingInfo(Timer->Channel(), Event);
-  // this is a somewhat ugly hack to get the 'summary' information from the
-  // timer into the recording info, but it saves us from having to actually
-  // copy the entire event data:
-  if (!isempty(Timer->Summary()))
-     info->SetData(isempty(info->Title()) ? Timer->File() : NULL, NULL, Timer->Summary());
+  info->SetAux(Timer->Aux());
 }
 
 cRecording::cRecording(const char *FileName)
diff --git a/recording.h b/recording.h
index 5a188281d..f0c3c0e59 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.51 2006/02/18 14:08:09 kls Exp $
+ * $Id: recording.h 1.53 2006/02/25 12:24:46 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -44,14 +44,18 @@ class cRecordingInfo {
   tChannelID channelID;
   const cEvent *event;
   cEvent *ownEvent;
+  char *aux;
   cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
   void SetData(const char *Title, const char *ShortText, const char *Description);
+  void SetAux(const char *Aux);
 public:
   ~cRecordingInfo();
+  tChannelID ChannelID(void) { return channelID; }
   const char *Title(void) const { return event->Title(); }
   const char *ShortText(void) const { return event->ShortText(); }
   const char *Description(void) const { return event->Description(); }
   const cComponents *Components(void) const { return event->Components(); }
+  const char *Aux(void) const { return aux; }
   bool Read(FILE *f);
   bool Write(FILE *f, const char *Prefix = "") const;
   };
diff --git a/timers.c b/timers.c
index e5b9ea613..63eb34227 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.46 2006/02/03 15:20:14 kls Exp $
+ * $Id: timers.c 1.50 2006/02/26 10:50:47 kls Exp $
  */
 
 #include "timers.h"
@@ -23,6 +23,7 @@
 cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
 {
   startTime = stopTime = 0;
+  lastSetEvent = 0;
   recording = pending = inVpsMargin = false;
   flags = tfNone;
   if (Instant)
@@ -41,7 +42,7 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
   lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
   *file = 0;
-  summary = NULL;
+  aux = NULL;
   event = NULL;
   if (Instant && channel)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
@@ -50,6 +51,7 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
 cTimer::cTimer(const cEvent *Event)
 {
   startTime = stopTime = 0;
+  lastSetEvent = 0;
   recording = pending = inVpsMargin = false;
   flags = tfActive;
   if (Event->Vps() && Setup.UseVps)
@@ -76,21 +78,22 @@ cTimer::cTimer(const cEvent *Event)
   const char *Title = Event->Title();
   if (!isempty(Title))
      strn0cpy(file, Event->Title(), sizeof(file));
-  summary = NULL;
-  event = Event;
+  aux = NULL;
+  event = NULL; // let SetEvent() be called to get a log message
 }
 
 cTimer::~cTimer()
 {
-  free(summary);
+  free(aux);
 }
 
 cTimer& cTimer::operator= (const cTimer &Timer)
 {
   memcpy(this, &Timer, sizeof(*this));
-  if (summary)
-     summary = strdup(summary);
+  if (aux)
+     aux = strdup(aux);
   event = NULL;
+  lastSetEvent = 0;
   return *this;
 }
 
@@ -109,9 +112,7 @@ cString cTimer::ToText(bool UseChannelID)
 {
   char *buffer;
   strreplace(file, ':', '|');
-  strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays), start, stop, priority, lifetime, file, summary ? summary : "");
-  strreplace(summary, '|', '\n');
+  asprintf(&buffer, "%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays), start, stop, priority, lifetime, file, aux ? aux : "");
   strreplace(file, '|', ':');
   return cString(buffer, true);
 }
@@ -226,8 +227,8 @@ bool cTimer::Parse(const char *s)
   char *channelbuffer = NULL;
   char *daybuffer = NULL;
   char *filebuffer = NULL;
-  free(summary);
-  summary = NULL;
+  free(aux);
+  aux = NULL;
   //XXX Apparently sscanf() doesn't work correctly if the last %a argument
   //XXX results in an empty string (this first occured when the EIT gathering
   //XXX was put into a separate thread - don't know why this happens...
@@ -244,17 +245,16 @@ bool cTimer::Parse(const char *s)
      s = s2;
      }
   bool result = false;
-  if (8 <= sscanf(s, "%u :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &summary)) {
+  if (8 <= sscanf(s, "%u :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &aux)) {
      ClrFlags(tfRecording);
-     if (summary && !*skipspace(summary)) {
-        free(summary);
-        summary = NULL;
+     if (aux && !*skipspace(aux)) {
+        free(aux);
+        aux = NULL;
         }
      //TODO add more plausibility checks
      result = ParseDay(daybuffer, day, weekdays);
      strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
-     strreplace(summary, '|', '\n');
      if (isnumber(channelbuffer))
         channel = Channels.GetByNumber(atoi(channelbuffer));
      else
@@ -426,6 +426,55 @@ time_t cTimer::StopTime(void) const
   return stopTime;
 }
 
+#define EPGLIMITPAST   (2 * 3600) // time in seconds in the past within which EPG events will be taken into consideration
+
+void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
+{
+  cSchedulesLock SchedulesLock;
+  if (!Schedules) {
+     lastSetEvent = 0; // forces setting the event, even if the schedule hasn't been modified
+     if (!(Schedules = cSchedules::Schedules(SchedulesLock)))
+        return;
+     }
+  const cSchedule *Schedule = Schedules->GetSchedule(Channel());
+  if (Schedule) {
+     if (!lastSetEvent || Schedule->Modified() >= lastSetEvent) {
+        const cEvent *Event = NULL;
+        int Overlap = 0;
+        int Distance = INT_MIN;
+        time_t now = time(NULL);
+        for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
+            if (e->EndTime() < now - EPGLIMITPAST)
+               continue; // skip old events
+            int overlap = 0;
+            Matches(e, &overlap);
+            if (overlap && overlap >= Overlap) {
+               int distance = 0;
+               if (now < e->StartTime())
+                  distance = e->StartTime() - now;
+               else if (now > e->EndTime())
+                  distance = e->EndTime() - now;
+               if (Event && overlap == Overlap) {
+                  if (Overlap > FULLMATCH) { // this means VPS
+                     if (abs(Distance) < abs(distance))
+                        break; // we've already found the closest VPS event
+                     }
+                  else if (e->Duration() <= Event->Duration())
+                     continue; // if overlap is the same, we take the longer event
+                  }
+               Overlap = overlap;
+               Distance = distance;
+               Event = e;
+               }
+            }
+        if (Event && Event->EndTime() < now - EXPIRELATENCY && Overlap > FULLMATCH && !Event->IsRunning())
+           Event = NULL;
+        SetEvent(Event);
+        }
+     }
+  lastSetEvent = time(NULL);
+}
+
 void cTimer::SetEvent(const cEvent *Event)
 {
   if (event != Event) { //XXX TODO check event data, too???
@@ -491,7 +540,7 @@ bool cTimer::HasFlags(uint Flags) const
 void cTimer::Skip(void)
 {
   day = IncDay(SetTime(StartTime(), 0), 1);
-  event = NULL;
+  SetEvent(NULL);
 }
 
 void cTimer::OnOff(void)
@@ -506,7 +555,7 @@ void cTimer::OnOff(void)
      Skip();
   else
      SetFlags(tfActive);
-  event = NULL;
+  SetEvent(NULL);
   Matches(); // refresh start and end time
 }
 
@@ -594,9 +643,6 @@ bool cTimers::Modified(int &State)
   return Result;
 }
 
-#define EPGLIMITPAST   (2 * 3600) // time in seconds around now, within which EPG events will be taken into consideration
-#define EPGLIMITFUTURE (4 * 3600)
-
 void cTimers::SetEvents(void)
 {
   if (time(NULL) - lastSetEvents < 5)
@@ -606,46 +652,9 @@ void cTimers::SetEvents(void)
   if (Schedules) {
      if (!lastSetEvents || Schedules->Modified() >= lastSetEvents) {
         for (cTimer *ti = First(); ti; ti = Next(ti)) {
-            const cSchedule *Schedule = Schedules->GetSchedule(ti->Channel());
-            if (Schedule) {
-               if (!lastSetEvents || Schedule->Modified() >= lastSetEvents) {
-                  const cEvent *Event = NULL;
-                  int Overlap = 0;
-                  int Distance = INT_MIN;
-                  time_t now = time(NULL);
-                  for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
-                      if (cRemote::HasKeys())
-                         return; // react immediately on user input
-                      if (e->EndTime() < now - EPGLIMITPAST)
-                         continue; // skip old events
-                      if (e->StartTime() > now + EPGLIMITFUTURE)
-                         break; // no need to process events too far in the future
-                      int overlap = 0;
-                      ti->Matches(e, &overlap);
-                      if (overlap && overlap >= Overlap) {
-                         int distance = 0;
-                         if (now < e->StartTime())
-                            distance = e->StartTime() - now;
-                         else if (now > e->EndTime())
-                            distance = e->EndTime() - now;
-                         if (Event && overlap == Overlap) {
-                            if (Overlap > FULLMATCH) { // this means VPS
-                               if (abs(Distance) < abs(distance))
-                                  break; // we've already found the closest VPS event
-                               }
-                            else if (e->Duration() <= Event->Duration())
-                               continue; // if overlap is the same, we take the longer event
-                            }
-                         Overlap = overlap;
-                         Distance = distance;
-                         Event = e;
-                         }
-                      }
-                  if (Event && Event->EndTime() < now - EXPIRELATENCY && !Event->IsRunning())
-                     Event = NULL;
-                  ti->SetEvent(Event);
-                  }
-               }
+            if (cRemote::HasKeys())
+               return; // react immediately on user input
+            ti->SetEventFromSchedule(Schedules);
             }
         }
      }
diff --git a/timers.h b/timers.h
index 73b951d11..f49b48ddc 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.24 2006/01/15 13:29:44 kls Exp $
+ * $Id: timers.h 1.26 2006/02/25 15:05:09 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -28,6 +28,7 @@ class cTimer : public cListObject {
   friend class cMenuEditTimer;
 private:
   mutable time_t startTime, stopTime;
+  time_t lastSetEvent;
   bool recording, pending, inVpsMargin;
   uint flags;
   cChannel *channel;
@@ -38,7 +39,7 @@ class cTimer : public cListObject {
   int priority;
   int lifetime;
   char file[MaxFileName];
-  char *summary;
+  char *aux;
   const cEvent *event;
 public:
   cTimer(bool Instant = false, bool Pause = false, cChannel *Channel = NULL);
@@ -59,7 +60,7 @@ class cTimer : public cListObject {
   int Lifetime(void) const { return lifetime; }
   const char *File(void) const { return file; }
   time_t FirstDay(void) const { return weekdays ? day : 0; }
-  const char *Summary(void) const { return summary; }
+  const char *Aux(void) const { return aux; }
   cString ToText(bool UseChannelID = false);
   cString ToDescr(void) const;
   const cEvent *Event(void) const { return event; }
@@ -77,6 +78,7 @@ class cTimer : public cListObject {
   bool Expired(void) const;
   time_t StartTime(void) const;
   time_t StopTime(void) const;
+  void SetEventFromSchedule(const cSchedules *Schedules = NULL);
   void SetEvent(const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
diff --git a/vdr.5 b/vdr.5
index 0f6904543..e167965af 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.49 2006/02/19 15:04:21 kls Exp $
+.\" $Id: vdr.5 1.54 2006/02/26 14:10:00 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
 .SH NAME
@@ -217,13 +217,8 @@ l l.
 \fB4\fR@this timer uses VPS
 \fB8\fR@this timer is currently recording (may only be up-to-date with SVDRP)
 .TE
-Bits other than these can be used by external programs to mark active timers
-and recognize if the user has modified them. When a user modifies an active
-timer, the upper 16 bits of this unsigned 32 bit parameter will be explicitly set to 0.
 
-Note: in order to allow future extensibility, external programs using the
-\fBstatus\fR parameter should only use the upper 16 bit of this 32 bit parameter
-and leave the lower 16 bit untouched.
+All other bits are reserved for future use.
 .TP
 .B Channel
 The channel to record from. This is either the channel number as shown in the
@@ -321,11 +316,11 @@ recording (if that data is available). If at the time of recording either
 of these cannot be determined, \fBTITLE\fR will default to the channel name, and
 \fBEPISODE\fR will default to a blank.
 .TP
-.B Summary
-Arbitrary text that describes the recording made by this timer.
-Any newline characters in the summary have to be replaced by '|', and
-the summary may contain ':' characters. If this field is not empty, its
-contents will be written into the \fIinfo.vdr\fR file of the recording.
+.B Auxiliary data
+An arbitrary string that can be used by external applications to store any
+kind of data related to this timer. The string must not contain any newline
+characters. If this field is not empty, its contents will be written into the
+\fIinfo.vdr\fR file of the recording with the '@' tag.
 .SS SOURCES
 The file \fIsources.conf\fR defines the codes to be used in the \fBSource\fR field
 of channels in \fIchannels.conf\fR and assigns descriptive texts to them.
@@ -567,10 +562,13 @@ actual contents of this file.
 .SS INFO
 The file \fIinfo.vdr\fR (if present in a recording directory) contains
 a description of the recording, derived from the EPG data at recording time
-(if such data was available) or the \fBSummary\fR field of the corresponding
-timer. This is a plain ASCII file and contains tagged lines like the \fBEPG DATA\fR
-file (see the description of the \fIepg.data\fR file). Note that the tags
-c, E, e and V will not appear in an \fIinfo.vdr\fR file.
+(if such data was available). The \fBAux\fR field of the corresponding
+timer (if given) is copied into this file, using the '@' tag.
+This is a plain ASCII file and contains tagged lines like the \fBEPG DATA\fR
+file (see the description of the \fIepg.data\fR file). Note that the lowercase
+tags ('c' and 'e') will not appear in an \fIinfo.vdr\fR file.
+Lines tagged with '#' are ignored and can be used by external tools to
+store arbitrary information.
 .SS RESUME
 The file \fIresume.vdr\fR (if present in a recording directory) contains
 the position within the recording where the last replay session left off.
@@ -626,12 +624,15 @@ All other tags are optional (although every event
 should at least have a \fBT\fR entry).
 There may be several \fBX\fR tags, depending on the number of tracks (video, audio etc.)
 the event provides.
+The special tag character \fB@\fR is used to mark the \fBauxiliary data\fR from
+a timer definition in the \fIinfo.vdr\fR file.
 
 .TS
 tab (@);
 l l.
 <channel id>   @is the "channel ID", made up from the parameters defined in 'channels.conf'
 <channel name> @is the "name" as in 'channels.conf' (for information only, may be left out)
+<event id>     @is a 32 bit unsigned int, uniquely identifying this event
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
 <table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
@@ -648,6 +649,11 @@ l l.
 
 This file will be read at program startup in order to restore the results of
 previous EPG scans.
+
+Note that the \fBevent id\fR that comes from the DVB data stream is actually
+just 16 bit wide. The internal representation in VDR allows for 32 bit to
+be used, so that external tools can generate EPG data that is guaranteed
+not to collide with the ids of existing data.
 .SH SEE ALSO
 .BR vdr (1)
 .SH AUTHOR

From 49b561fcad16d3315fce8cb854de9f4ee6156640 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Mar 2006 19:00:00 +0200
Subject: [PATCH 137/307] Version 1.3.45 - Fixed updating the "Info" button in
 the "Timers" menu. - Reduced the number of events to actually check when
 setting events to timers. - cMenuEditIntItem now checks the given value and
 forces it to be between the   given min and max limits. - The status changes
 of EPG events are now logged for all channels that have timers. - Removed the
 log message "deleting plugin: ..." when shutting down VDR (thanks to  
 Christoph Haubrich for reporting that this is irritating when calling "vdr
 --help"). - Fixed cReadLine::Read() for lines that end with the infamous
 "\r\n" (thanks to   Rolf Ahrenberg). - Fixed cDvbDevice::SetAudioBypass() in
 case setTransferModeForDolbyDigital is false   (thanks to Werner Fink). -
 Updated 'sources.conf' (thanks to Oleg Roitburd). - Fixed the shutdown
 timeout (thanks to Alexander Wenzel). - Only calling
 RemoveEmptyVideoDirectories() once in case a recording has been   deleted
 (reported by Hardy Flor). - Fixed deleting recordings that have been removed
 externally when running out of   disk space (reported by Jan Lenz). - Fixed
 handling repeating VPS timers (they stopped recording too early). - Timer log
 messages now show "VPS" if this is a VPS timer. - Fixed getting the present
 EPG event in case none is currently 'running' (it   then returns the one that
 just ended). - Fixed calling a plugin's main menu function while a message is
 being displayed   (reported by Helmut Auer). - Updated the Russian OSD texts
 (thanks to Oleg Roitburd). - Made cMenuRecordings::GetRecording() 'protected'
 (suggested by Marius Heidenstecker). - Speeded up cRemux::ScanVideoPacket()
 (thanks to Reinhard Nissl). - Enhanced logging EPG event data. - Fixed format
 string handling (thanks to Darren Salt). - The new function
 cDevice::ForceTransferMode() can be used to force the primary   device into
 transfer mode (thanks to Reinhard Nissl). - The 'version' of EPG events is
 now ignored when reading EPG data from 'epg.data'   or via SVDRP/PUTE to
 avoid problems with double EPG events. - The 'running status' of EPG events
 is now only set to SI::RunningStatusNotRunning   for events before the
 present event. - Fixed some #include sequences. - Single shot VPS timers are
 now only considered 'expired' if their associated   EPG event has been
 explicitly set to SI::RunningStatusNotRunning. - The check for timers to be
 deleted is now done only every 30 seconds.

---
 CONTRIBUTORS            |  25 ++++++
 HISTORY                 |  43 +++++++++-
 PLUGINS/src/sky/HISTORY |   4 +
 PLUGINS/src/sky/sky.c   |   7 +-
 channels.c              |  12 ++-
 channels.conf           |  30 +++----
 channels.h              |   3 +-
 config.h                |   6 +-
 device.c                |  11 ++-
 device.h                |   4 +-
 dvbdevice.c             |   8 +-
 epg.c                   |  37 +++++----
 epg.h                   |   3 +-
 i18n.c                  |  78 +++++++++---------
 i18n.h                  |   4 +-
 interface.c             |   4 +-
 menu.c                  |  20 ++---
 menu.h                  |   5 +-
 menuitems.c             |   9 ++-
 pat.h                   |   4 +-
 plugin.c                |   8 +-
 receiver.c              |   4 +-
 recording.c             |  20 +++--
 remux.c                 |  44 ++++++++---
 remux.h                 |   6 +-
 sources.conf            | 171 ++++++++++++++++++++++++++++------------
 spu.c                   |   4 +-
 svdrp.c                 |  16 ++--
 thread.c                |   5 +-
 timers.c                |  49 ++++++++----
 timers.h                |   3 +-
 tools.c                 |  10 ++-
 vdr.5                   |   6 +-
 vdr.c                   |  19 +++--
 34 files changed, 460 insertions(+), 222 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4b9f40bf3..f44f43798 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -307,6 +307,8 @@ Werner Fink <werner@suse.de>
  for enabling a device to detach all receivers for a given PID
  for modifying switching to Dolby Digital audio in live mode, if the driver
  and firmware can handle live DD without the need of a Transfer Mode
+ for fixing cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is
+ false
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -556,6 +558,8 @@ Helmut Auer <vdr@helmutauer.de>
  items at the beginning of the menu
  for a patch that was used to implement stopping scanning the video directory if
  there are too many levels of symbolic links
+ for reporting that an attempt to call a plugin's main menu function while a
+ message is being displayed didn't work
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -964,6 +968,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  exceeds the maximum channel number
  for suggesting to also set the language codes when setting the audio track descriptions
  for reporting a problem in setting the audio language codes in 'Transfer-Mode'
+ for fixing cReadLine::Read() for lines that end with the infamous "\r\n"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1063,6 +1068,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for adding a mutex to synchronize cDevice::PlayPesPacket() and SetCurrentAudioTrack()
  for a suggestion that lead to implementing cDevice::Transferring()
  for fixing replaying recordings of radio channels with many audio tracks
+ for speeding up cRemux::ScanVideoPacket()
+ for implementing cDevice::ForceTransferMode()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1454,6 +1461,7 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
  for suggesting to open the file handle in the SVDRP GRAB command in a way that
  it won't follow symbolic links, and to canonicalize the file name
  for making all font and image data 'const'
+ for fixing format string handling
 
 Sean Carlos <seanc@libero.it>
  for translating OSD texts to the Italian language
@@ -1616,6 +1624,8 @@ Marcus Hilbrich <s4440288@mail.inf.tu-dresden.de>
 Hardy Flor <HFlor@web.de>
  for a patch that was used as a base to implement SVDRP commands for plugins
  for implementing the SVDRP command PLAY
+ for reporting that RemoveEmptyVideoDirectories() was called for every single
+ recording that has been deleted
 
 Harald Milz <hm@seneca.muc.de>
  for his CUTR patch, which was used as a base to implement the SVDRP command EDIT
@@ -1767,7 +1777,22 @@ B
 Christoph Haubrich <christoph1.haubrich@arcor.de>
  for making the "Ok" key in the "Jump" mode of the replay progress display confirm
  the jump instead of closing the display
+ for reporting that the log message "deleting plugin: ..." is irritating when
+ calling "vdr --help"
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
  event running
+
+Alexander Wenzel <hondansx@gmx.de>
+ for fixing the shutdown timeout
+
+Jan Lenz <email@JanLenz.de>
+ for reporting a bug in deleting recordings that have been removed externally when
+ running out of disk space
+
+Oleg Roitburd <oleg@roitburd.de>
+ for translating OSD texts to the Russian language
+
+Marius Heidenstecker <marius@heidenstecker.de>
+ for suggesting to make cMenuRecordings::GetRecording() 'protected'
diff --git a/HISTORY b/HISTORY
index 2b6cb5b7b..ad85a22c4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3838,7 +3838,7 @@ Video Disk Recorder Revision History
 - The 'new' indicator in the Recordings menu is now kept up-to-date (thanks to
   Thomas G�nther).
 - Updated the Romanian OSD texts (thanks to Lucian Muresan).
-- Updated the Russian OSD texts (thanks to Oleg ???).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
 - The '.update' file in the video directory is now touched when a recording is
   added or deleted, so that other VDR instances can update their lists (thanks to
   Alexander Rieger).
@@ -4414,3 +4414,44 @@ Video Disk Recorder Revision History
   to be drawn with a transparent background (thanks to Alexander Hans).
 - Fixed cSchedule::GetFollowingEvent() in case there is currently no present event
   running (thanks to Pekka Mauno).
+
+2006-03-26: Version 1.3.45
+
+- Fixed updating the "Info" button in the "Timers" menu.
+- Reduced the number of events to actually check when setting events to timers.
+- cMenuEditIntItem now checks the given value and forces it to be between the
+  given min and max limits.
+- The status changes of EPG events are now logged for all channels that have timers.
+- Removed the log message "deleting plugin: ..." when shutting down VDR (thanks to
+  Christoph Haubrich for reporting that this is irritating when calling "vdr --help").
+- Fixed cReadLine::Read() for lines that end with the infamous "\r\n" (thanks to
+  Rolf Ahrenberg).
+- Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false
+  (thanks to Werner Fink).
+- Updated 'sources.conf'.
+- Fixed the shutdown timeout (thanks to Alexander Wenzel).
+- Only calling RemoveEmptyVideoDirectories() once in case a recording has been
+  deleted (reported by Hardy Flor).
+- Fixed deleting recordings that have been removed externally when running out of
+  disk space (reported by Jan Lenz).
+- Fixed handling repeating VPS timers (they stopped recording too early).
+- Timer log messages now show "VPS" if this is a VPS timer.
+- Fixed getting the present EPG event in case none is currently 'running' (it
+  then returns the one that just ended).
+- Fixed calling a plugin's main menu function while a message is being displayed
+  (reported by Helmut Auer).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Made cMenuRecordings::GetRecording() 'protected' (suggested by Marius Heidenstecker).
+- Speeded up cRemux::ScanVideoPacket() (thanks to Reinhard Nissl).
+- Enhanced logging EPG event data.
+- Fixed format string handling (thanks to Darren Salt).
+- The new function cDevice::ForceTransferMode() can be used to force the primary
+  device into transfer mode (thanks to Reinhard Nissl).
+- The 'version' of EPG events is now ignored when reading EPG data from 'epg.data'
+  or via SVDRP/PUTE to avoid problems with double EPG events.
+- The 'running status' of EPG events is now only set to SI::RunningStatusNotRunning
+  for events before the present event.
+- Fixed some #include sequences.
+- Single shot VPS timers are now only considered 'expired' if their associated
+  EPG event has been explicitly set to SI::RunningStatusNotRunning.
+- The check for timers to be deleted is now done only every 30 seconds.
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 9d4057511..45774f15d 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -41,3 +41,7 @@ VDR Plugin 'sky' Revision History
 2005-09-17: Version 0.3.4
 
 - Added a missing include statement.
+
+2006-03-26: Version 0.3.5
+
+- Fixed format string handling.
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index cbb927bbe..4033bf7b1 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.12 2005/09/17 10:39:35 kls Exp $
+ * $Id: sky.c 1.13 2006/03/26 09:21:10 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -15,7 +15,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.4";
+static const char *VERSION        = "0.3.5";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
@@ -108,9 +108,8 @@ cDigiboxDevice::~cDigiboxDevice()
 
 void cDigiboxDevice::LircSend(const char *s)
 {
-  const char *c = "SEND_ONCE SKY %s\n";
   char buf[100];
-  sprintf(buf, c, s);
+  snprintf(buf, sizeof(buf), "SEND_ONCE SKY %s\n", s);
   dsyslog(buf);//XXX
   if (write(fd_lirc, buf, strlen(buf)) < 0)
      LOG_ERROR;//XXX _STR
diff --git a/channels.c b/channels.c
index bf1230bde..c40006168 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.48 2006/01/14 15:51:02 kls Exp $
+ * $Id: channels.c 1.49 2006/02/28 13:54:34 kls Exp $
  */
 
 #include "channels.h"
@@ -12,6 +12,7 @@
 #include <ctype.h>
 #include "device.h"
 #include "epg.h"
+#include "timers.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -248,6 +249,15 @@ int cChannel::Transponder(void) const
   return tf;
 }
 
+bool cChannel::HasTimer(void) const
+{
+  for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+      if (Timer->Channel() == this)
+         return true;
+      }
+  return false;
+}
+
 int cChannel::Modification(int Mask)
 {
   int Result = modification & Mask;
diff --git a/channels.conf b/channels.conf
index 50266e9c8..29dffe147 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,4 +1,4 @@
-RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0
+RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu;106=deu:105:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
 ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
@@ -8,15 +8,15 @@ hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Ferns.;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;706=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
@@ -44,20 +44,20 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1801,1722,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1801,1722,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1702,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1801,1722,1702:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1722,1702:34:133:17:0
+PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
+PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1722,1702,1801:21:133:17:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1801,1702,1722,1810:513:133:4:0
+EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
 :Sportsworld
 PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1722,1801,1702:17:133:3:0
 PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
@@ -108,7 +108,7 @@ TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:
 Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
 ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:0:10070:2:2044:0
-Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
+SCI FI;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
 ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
 Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
diff --git a/channels.h b/channels.h
index ef4e80b32..c7da4f357 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.39 2006/02/19 14:39:43 kls Exp $
+ * $Id: channels.h 1.40 2006/02/28 13:52:49 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -202,6 +202,7 @@ class cChannel : public cListObject {
   bool IsSat(void) const { return cSource::IsSat(source); }
   bool IsTerr(void) const { return cSource::IsTerr(source); }
   tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
+  bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
   void CopyTransponderData(const cChannel *Channel);
   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
diff --git a/config.h b/config.h
index ff532d27c..07f48cf52 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.246 2006/02/25 14:12:20 kls Exp $
+ * $Id: config.h 1.247 2006/02/28 12:23:28 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.44"
-#define VDRVERSNUM   10344  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.45"
+#define VDRVERSNUM   10345  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 5eaa8ac20..dfb95f4c4 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.124 2006/02/24 14:05:26 kls Exp $
+ * $Id: device.c 1.125 2006/03/26 09:42:48 kls Exp $
  */
 
 #include "device.h"
@@ -697,6 +697,15 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   return Result;
 }
 
+void cDevice::ForceTransferMode(void)
+{
+  if (!cTransferControl::ReceiverDevice()) {
+     cChannel *Channel = Channels.GetByNumber(CurrentChannel());
+     if (Channel)
+        SetChannelDevice(Channel, false); // this implicitly starts Transfer Mode
+     }
+}
+
 bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
   return false;
diff --git a/device.h b/device.h
index e6e436b25..16fa370b4 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.72 2006/02/04 14:22:08 kls Exp $
+ * $Id: device.h 1.73 2006/03/26 09:42:40 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -236,6 +236,8 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+  void ForceTransferMode(void);
+         ///< Forces the device into transfermode for the current channel.
   virtual bool HasLock(int TimeoutMs = 0);//XXX PLUGINS.html
          ///< Returns true if the device has a lock on the requested transponder.
          ///< Default is true, a specific device implementation may return false
diff --git a/dvbdevice.c b/dvbdevice.c
index 148a12a56..af9b4a84c 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.153 2006/02/19 13:52:04 kls Exp $
+ * $Id: dvbdevice.c 1.155 2006/03/26 09:42:54 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -653,6 +653,8 @@ eVideoSystem cDvbDevice::GetVideoSystem(void)
 
 bool cDvbDevice::SetAudioBypass(bool On)
 {
+  if (!setTransferModeForDolbyDigital)
+     return false;
   return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
 }
 
@@ -928,9 +930,7 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
         if (!setTransferModeForDolbyDigital)
            return;
         // Currently this works only in Transfer Mode
-        cChannel *Channel = Channels.GetByNumber(CurrentChannel());
-        if (Channel)
-           SetChannelDevice(Channel, false); // this implicitly starts Transfer Mode
+        ForceTransferMode();
         }
      }
 }
diff --git a/epg.c b/epg.c
index 2f88af9af..987efb9c6 100644
--- a/epg.c
+++ b/epg.c
@@ -7,14 +7,14 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.64 2006/02/26 15:07:17 kls Exp $
+ * $Id: epg.c 1.70 2006/03/26 14:06:11 kls Exp $
  */
 
 #include "epg.h"
-#include "libsi/si.h"
-#include "timers.h"
 #include <ctype.h>
 #include <time.h>
+#include "libsi/si.h"
+#include "timers.h"
 
 #define RUNNINGSTATUSTIMEOUT 30 // seconds before the running status is considered unknown
 
@@ -103,7 +103,7 @@ cEvent::cEvent(tEventID EventID)
   eventID = EventID;
   tableID = 0;
   version = 0xFF; // actual version numbers are 0..31
-  runningStatus = 0;
+  runningStatus = SI::RunningStatusUndefined;
   title = NULL;
   shortText = NULL;
   description = NULL;
@@ -156,9 +156,8 @@ void cEvent::SetVersion(uchar Version)
 
 void cEvent::SetRunningStatus(int RunningStatus, cChannel *Channel)
 {
-  if (Channel && runningStatus != RunningStatus && (RunningStatus > SI::RunningStatusNotRunning || runningStatus > SI::RunningStatusUndefined))
-     if (Channel->Number() <= 30)//XXX maybe log only those that have timers???
-     isyslog("channel %d (%s) event %s '%s' status %d", Channel->Number(), Channel->Name(), *GetTimeString(), Title(), RunningStatus);
+  if (Channel && runningStatus != RunningStatus && (RunningStatus > SI::RunningStatusNotRunning || runningStatus > SI::RunningStatusUndefined) && Channel->HasTimer())
+     isyslog("channel %d (%s) event %s status %d", Channel->Number(), Channel->Name(), *ToDescr(), RunningStatus);
   runningStatus = RunningStatus;
 }
 
@@ -209,6 +208,14 @@ void cEvent::SetSeen(void)
   seen = time(NULL);
 }
 
+cString cEvent::ToDescr(void) const
+{
+  char vpsbuf[64] = "";
+  if (Vps())
+     sprintf(vpsbuf, "(VPS: %s) ", *GetVpsString());
+  return cString::sprintf("%s %s-%s %s'%s'", *GetDateString(), *GetTimeString(), *GetEndTimeString(), vpsbuf, Title());
+}
+
 bool cEvent::HasTimer(void) const
 {
   for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
@@ -313,7 +320,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                           time_t StartTime;
                           int Duration;
                           unsigned int TableID = 0;
-                          unsigned int Version = 0xFF;
+                          unsigned int Version = 0xFF; // actual value is ignored
                           int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
                           if (n >= 3 && n <= 5) {
                              Event = (cEvent *)Schedule->GetEvent(EventID, StartTime);
@@ -324,8 +331,6 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                                 Event = newEvent = new cEvent(EventID);
                              if (Event) {
                                 Event->SetTableID(TableID);
-                                if (TableID >= 0x50) // makes sure the running status flag is set from the actual data stream
-                                   Event->SetVersion(Version);
                                 Event->SetStartTime(StartTime);
                                 Event->SetDuration(Duration);
                                 if (newEvent)
@@ -678,8 +683,10 @@ const cEvent *cSchedule::GetPresentEvent(void) const
   const cEvent *pe = NULL;
   time_t now = time(NULL);
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
-      if (p->StartTime() <= now && now < p->EndTime())
+      if (p->StartTime() <= now)
          pe = p;
+      else if (p->StartTime() > now + 3600)
+         break;
       if (p->SeenWithin(RUNNINGSTATUSTIMEOUT) && p->RunningStatus() >= SI::RunningStatusPausing)
          return p;
       }
@@ -728,9 +735,11 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
 void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel)
 {
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
-      if (p == Event)
-         p->SetRunningStatus(RunningStatus, Channel);
-      else if (RunningStatus >= SI::RunningStatusPausing && p->RunningStatus() > SI::RunningStatusNotRunning)
+      if (p == Event) {
+         if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning)
+            p->SetRunningStatus(RunningStatus, Channel);
+         }
+      else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime())
          p->SetRunningStatus(SI::RunningStatusNotRunning);
       }
   if (RunningStatus >= SI::RunningStatusPausing)
diff --git a/epg.h b/epg.h
index 1def6176e..a937ff7d1 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.33 2006/02/26 13:58:57 kls Exp $
+ * $Id: epg.h 1.34 2006/03/25 12:39:39 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -103,6 +103,7 @@ class cEvent : public cListObject {
   void SetDuration(int Duration);
   void SetVps(time_t Vps);
   void SetSeen(void);
+  cString ToDescr(void) const;
   void Dump(FILE *f, const char *Prefix = "", bool InfoOnly = false) const;
   bool Parse(char *s);
   static bool Read(FILE *f, cSchedule *Schedule);
diff --git a/i18n.c b/i18n.c
index 63c4aeff8..f4760f6ee 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.250 2006/02/25 14:21:28 kls Exp $
+ * $Id: i18n.c 1.252 2006/03/26 09:17:58 kls Exp $
  *
  * Translations provided by:
  *
@@ -22,7 +22,7 @@
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
  * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com>, Jordi Vil� <jvila@tinet.org>
- * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>
+ * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>, Oleg Roitburd <oleg@roitburd.de>
  * Croatian    Drazen Dupor <drazen.dupor@dupor.com>, Dino Ravnic <dino.ravnic@fer.hr>
  * Estonian    Arthur Konovalov <kasjas@hot.ee>
  * Danish      Mogens Elneff <mogens@elneff.dk>
@@ -475,7 +475,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "��� �������� - %s",
     "",//TODO
     "See s�ndmus - %s",
     "Denne udsendelse - %s",
@@ -497,7 +497,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "��� �������� - ��� ������",
     "",//TODO
     "See s�ndmus - k�ik kanalid",
     "Denne udsendelse - alle kanaler",
@@ -519,7 +519,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "��� �������� - ��� ������",
     "",//TODO
     "K�ik s�ndmused - k�ik kanalid",
     "Alle udsendelser - alle kanaler",
@@ -696,7 +696,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������",
     "",// TODO
     "Taimer",
     "Timer",
@@ -1319,27 +1319,27 @@ const tI18nPhrase Phrases[] = {
     "Optagelse igang - sluk alligevel?",
     "Syst�m je zanepr�zdn�n - p�esto vypnout?",
   },
-  { "Recording in %d minutes, shut down anyway?",
-    "Aufnahme in %d Minuten - trotzdem ausschalten?",
-    "Snemanje �ez %d minut, zares izklopi?",
-    "Registrazione fra %d minuti - spengo comunque?",
-    "Opname in %d minuten - toch uitschakelen?",
-    "Em grava��o dentro de %d minutos - quer mesmo desligar?",
-    "Enregistrement dans %d minutes - confirmez l'arr�t",
-    "Skal gj�re opptak om %d minutter - sl� av likevel?",
-    "Tallennus alkaa %d min kuluttua - sammutetaanko?",
-    "Nagrywanie za %d minut - wy��czy� mimo to?",
-    "Grabaci�n dentro de %d minutos, �apagar realmente?",
-    "���������� ������� �� %d ����� - ������ �� �����������?",
-    "Inspelning startar om %d minuter, vill du avsluta?",
-    "�nregistrez peste %d minute - �nchid, totu�i?",
-    "Felv�tel %d perc mulva kezd�dik - m�gis kikapcsolni?",
-    "Hi ha una gravaci� en %d minuts - Apagar de totes maneres?",
-    "����� %d ����� �������� ������ - ������������� ���������?",
-    "Snimanje za %d minuta - svejedno isklju�iti?",
-    "Salvestamine algab %d minuti p�rast - l�litan v�lja?",
-    "Optagelse om %d minutter - sluk alligevel?",
-    "Nahr�v�n� za�ne za %d minut - p�esto vypnout?",
+  { "Recording in %ld minutes, shut down anyway?",
+    "Aufnahme in %ld Minuten - trotzdem ausschalten?",
+    "Snemanje �ez %ld minut, zares izklopi?",
+    "Registrazione fra %ld minuti - spengo comunque?",
+    "Opname in %ld minuten - toch uitschakelen?",
+    "Em grava��o dentro de %ld minutos - quer mesmo desligar?",
+    "Enregistrement dans %ld minutes - confirmez l'arr�t",
+    "Skal gj�re opptak om %ld minutter - sl� av likevel?",
+    "Tallennus alkaa %ld min kuluttua - sammutetaanko?",
+    "Nagrywanie za %ld minut - wy��czy� mimo to?",
+    "Grabaci�n dentro de %ld minutos, �apagar realmente?",
+    "���������� ������� �� %ld ����� - ������ �� �����������?",
+    "Inspelning startar om %ld minuter, vill du avsluta?",
+    "�nregistrez peste %ld minute - �nchid, totu�i?",
+    "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?",
+    "Hi ha una gravaci� en %ld minuts - Apagar de totes maneres?",
+    "����� %ld ����� �������� ������ - ������������� ���������?",
+    "Snimanje za %ld minuta - svejedno isklju�iti?",
+    "Salvestamine algab %ld minuti p�rast - l�litan v�lja?",
+    "Optagelse om %ld minutter - sluk alligevel?",
+    "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken, um Shutdown abzubrechen",
@@ -1666,7 +1666,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "FTA (��������������)",
     "",//TODO
     "FTA",
     "Free To Air",
@@ -1688,7 +1688,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������������",
     "",//TODO
     "kr�ptitud",
     "kodet",
@@ -2460,7 +2460,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������������ ����� �� ����� ��� ������ ������",
     "",//TODO
     "Ebapiisavalt kettaruumi salvestamise alustamiseks!",
     "For lidt harddisk plads til optagelse!",
@@ -2504,7 +2504,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "�������� ���� ������ ��������� ������� (CAM)",
     "",//TODO
     "CAM-men�� avamine...",
     "�bner CAM menu...",
@@ -2548,7 +2548,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "���������� CAM...",
     "",//TODO
     "CAM mooduli taask�ivitus...",
     "Nulstiller CAM...",
@@ -2614,7 +2614,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������� %d �����",
     "",//TODO
     "Palun sisesta %d numbrit!",
     "Indtast venligst %d cifre!",
@@ -3232,7 +3232,7 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "", // TODO
     "", // TODO
-    "", // TODO
+    "���������� � ������ �������",
     "", // TODO
     "Kanaliinfo kuvamise ajapiirang",
     "Timeout ved anmodet kanal info",
@@ -3298,7 +3298,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ���� �������",
     "",// TODO
     "Sulgemine Men�� klahviga",
     "Menu taste lukker",
@@ -4399,7 +4399,7 @@ const tI18nPhrase Phrases[] = {
     "LMMJVSD",
     "HKSCPSV",
     "LMCJVSG",
-    "���ǿ��",
+    "���ǿ��",
     "PUS�PSN", // hrv
     "ETKNRLP",
     "MTOTFLS",
@@ -5151,7 +5151,7 @@ const tI18nPhrase Phrases[] = {
     "Derulare �nainte",
     "El�re p�rgetni",
     "Endavant r�pidament",
-    "������",
+    "��������� ������",
     "Naprijed",
     "Edasikerimine",
     "Spol fremad",
@@ -5173,7 +5173,7 @@ const tI18nPhrase Phrases[] = {
     "Derulare �napoi",
     "Vissza p�rgetni",
     "Enrera r�pidament",
-    "�����",
+    "��������� �����",
     "Nazad",
     "Tagasikerimine",
     "Spol tilbage",
@@ -5768,7 +5768,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������ ������",
     "",//TODO
     "Salvestamine algas",
     "Optagelse startet",
diff --git a/i18n.h b/i18n.h
index 0cbf72817..b6c217b73 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.17 2006/02/04 10:41:16 kls Exp $
+ * $Id: i18n.h 1.18 2006/03/26 09:08:00 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -18,7 +18,7 @@ typedef const char *tI18nPhrase[I18nNumLanguages];
 
 void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin);
 
-const char *I18nTranslate(const char *s, const char *Plugin = NULL);
+const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1);
 
 const char * const * I18nLanguages(void);
 const char * const * I18nCharSets(void);
diff --git a/interface.c b/interface.c
index 4b74db95b..59147f4bb 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.73 2006/01/29 12:35:50 kls Exp $
+ * $Id: interface.c 1.74 2006/03/25 11:50:55 kls Exp $
  */
 
 #include "interface.h"
@@ -52,7 +52,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
       if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted)
          break;
       }
-  if (KeepChar && ISRAWKEY(Key))
+  if (KeepChar && ISRAWKEY(Key) || Key == k_Plugin)
      cRemote::Put(Key);
   interrupted = false;
   return Key;
diff --git a/menu.c b/menu.c
index d15c017fe..f3c9fab9f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.422 2006/02/25 15:41:40 kls Exp $
+ * $Id: menu.c 1.424 2006/02/28 13:58:00 kls Exp $
  */
 
 #include "menu.h"
@@ -500,12 +500,10 @@ eOSState cMenuChannels::Delete(void)
      cChannel *channel = GetChannel(Current());
      int DeletedChannel = channel->Number();
      // Check if there is a timer using this channel:
-     for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) {
-         if (ti->Channel() == channel) {
-            Skins.Message(mtError, tr("Channel is being used by a timer!"));
-            return osContinue;
-            }
-         }
+     if (channel->HasTimer()) {
+        Skins.Message(mtError, tr("Channel is being used by a timer!"));
+        return osContinue;
+        }
      if (Interface->Confirm(tr("Delete channel?"))) {
         Channels.Del(channel);
         cOsdMenu::Del(Index);
@@ -690,8 +688,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                              *timer = data;
                           if (addIfConfirmed)
                              Timers.Add(timer);
-                          timer->Matches();
                           timer->SetEventFromSchedule();
+                          timer->Matches();
                           Timers.SetModified();
                           isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
@@ -787,8 +785,10 @@ cMenuTimers::cMenuTimers(void)
 :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
 {
   helpKeys = -1;
-  for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer))
+  for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
+      timer->SetEventFromSchedule(); // make sure the event is current
       Add(new cMenuTimerItem(timer));
+      }
   Sort();
   SetCurrent(First());
   SetHelpKeys();
@@ -900,7 +900,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        case kOk:     return Edit();
        case kRed:    state = OnOff(); break; // must go through SetHelpKeys()!
        case kGreen:  return New();
-       case kYellow: return Delete();
+       case kYellow: state = Delete(); break;
        case kBlue:   return Info();
                      break;
        default: break;
diff --git a/menu.h b/menu.h
index 46c1eeffd..de6014e29 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.84 2006/02/25 13:41:21 kls Exp $
+ * $Id: menu.h 1.85 2006/03/25 12:15:19 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -165,13 +165,14 @@ class cMenuRecordings : public cOsdMenu {
   int helpKeys;
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
-  cRecording *GetRecording(cMenuRecordingItem *Item);
   bool Open(bool OpenSubMenus = false);
   eOSState Play(void);
   eOSState Rewind(void);
   eOSState Delete(void);
   eOSState Info(void);
   eOSState Commands(eKeys Key = kNone);
+protected:
+  cRecording *GetRecording(cMenuRecordingItem *Item);
 public:
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
   ~cMenuRecordings();
diff --git a/menuitems.c b/menuitems.c
index fab13ca49..34e0dd75f 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.32 2006/02/12 10:31:08 kls Exp $
+ * $Id: menuitems.c 1.34 2006/03/26 09:10:17 kls Exp $
  */
 
 #include "menuitems.h"
@@ -51,6 +51,10 @@ cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Ma
   value = Value;
   min = Min;
   max = Max;
+  if (*value < min)
+     *value = min;
+  else if (*value > max)
+     *value = max;
   Set();
 }
 
@@ -286,12 +290,11 @@ void cMenuEditStrItem::AdvancePos(void)
 void cMenuEditStrItem::Set(void)
 {
   char buf[1000];
-  const char *fmt = insert && newchar ? "[]%c%s" : "[%c]%s";
 
   if (InEditMode()) {
      const cFont *font = cFont::GetFont(fontOsd);
      strncpy(buf, value, pos);
-     snprintf(buf + pos, sizeof(buf) - pos - 2, fmt, *(value + pos), value + pos + 1);
+     snprintf(buf + pos, sizeof(buf) - pos - 2, insert && newchar ? "[]%c%s" : "[%c]%s", *(value + pos), value + pos + 1);
      int width = cSkinDisplay::Current()->EditableWidth();
      if (font->Width(buf) <= width) {
         // the whole buffer fits on the screen
diff --git a/pat.h b/pat.h
index a7f463572..6246cc0c9 100644
--- a/pat.h
+++ b/pat.h
@@ -4,14 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 1.4 2004/03/07 16:22:01 kls Exp $
+ * $Id: pat.h 1.5 2006/03/26 14:09:43 kls Exp $
  */
 
 #ifndef __PAT_H
 #define __PAT_H
 
-#include "filter.h"
 #include <stdint.h>
+#include "filter.h"
 
 #define MAXPMTENTRIES 64
 
diff --git a/plugin.c b/plugin.c
index fdb38e823..6ceb561b7 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.16 2006/01/08 11:40:05 kls Exp $
+ * $Id: plugin.c 1.17 2006/02/28 14:16:54 kls Exp $
  */
 
 #include "plugin.h"
@@ -427,10 +427,6 @@ void cPluginManager::StopPlugins(void)
 void cPluginManager::Shutdown(void)
 {
   cDll *dll;
-  while ((dll = dlls.Last()) != NULL) {
-        cPlugin *p = dll->Plugin();
-        if (p)
-           isyslog("deleting plugin: %s", p->Name());
+  while ((dll = dlls.Last()) != NULL)
         dlls.Del(dll);
-        }
 }
diff --git a/receiver.c b/receiver.c
index 2fc36c9f9..ddaafefd2 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,12 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.4 2005/01/16 14:03:01 kls Exp $
+ * $Id: receiver.c 1.5 2006/03/26 14:07:21 kls Exp $
  */
 
+#include "receiver.h"
 #include <stdarg.h>
 #include <stdio.h>
-#include "receiver.h"
 #include "tools.h"
 
 cReceiver::cReceiver(int Ca, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
diff --git a/recording.c b/recording.c
index b8db2647d..379627c00 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.140 2006/02/26 11:59:59 kls Exp $
+ * $Id: recording.c 1.143 2006/03/26 09:11:00 kls Exp $
  */
 
 #include "recording.h"
@@ -83,6 +83,7 @@ void cRemoveDeletedRecordingsThread::Action(void)
   // Make sure only one instance of VDR does this:
   cLockFile LockFile(VideoDirectory);
   if (LockFile.Lock()) {
+     bool deleted = false;
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      for (cRecording *r = DeletedRecordings.First(); r; ) {
          if (r->deleted && time(NULL) - r->deleted > DELETEDLIFETIME) {
@@ -90,11 +91,13 @@ void cRemoveDeletedRecordingsThread::Action(void)
             r->Remove();
             DeletedRecordings.Del(r);
             r = next;
-            RemoveEmptyVideoDirectories();
+            deleted = true;
             continue;
             }
          r = DeletedRecordings.Next(r);
          }
+     if (deleted)
+        RemoveEmptyVideoDirectories();
      }
 }
 
@@ -801,11 +804,16 @@ bool cRecording::Delete(void)
      strncpy(ext, DELEXT, strlen(ext));
      if (access(NewName, F_OK) == 0) {
         // the new name already exists, so let's remove that one first:
-        isyslog("removing recording %s", NewName);
+        isyslog("removing recording '%s'", NewName);
         RemoveVideoFile(NewName);
         }
-     isyslog("deleting recording %s", FileName());
-     result = RenameVideoFile(FileName(), NewName);
+     isyslog("deleting recording '%s'", FileName());
+     if (access(FileName(), F_OK) == 0)
+        result = RenameVideoFile(FileName(), NewName);
+     else {
+        isyslog("recording '%s' vanished", FileName());
+        result = true; // well, we were going to delete it, anyway
+        }
      }
   free(NewName);
   return result;
@@ -1049,7 +1057,7 @@ bool cMark::Parse(const char *s)
 
 bool cMark::Save(FILE *f)
 {
-  return fprintf(f, ToText()) > 0;
+  return fprintf(f, "%s", *ToText()) > 0;
 }
 
 // --- cMarks ----------------------------------------------------------------
diff --git a/remux.c b/remux.c
index 31ad719d1..ae4a17a61 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.54 2006/02/03 16:19:02 kls Exp $
+ * $Id: remux.c 1.55 2006/03/25 12:27:30 kls Exp $
  */
 
 #include "remux.h"
@@ -1429,7 +1429,9 @@ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
 #define IPACKS 2048
 
 // Start codes:
-#define SC_PICTURE 0x00  // "picture header"
+#define SC_SEQUENCE 0xB3  // "sequence header code"
+#define SC_GROUP    0xB8  // "group start code"
+#define SC_PICTURE  0x00  // "picture start code"
 
 #define MAXNONUSEFULDATA (10*1024*1024)
 #define MAXNUMUPTERRORS  10
@@ -1925,14 +1927,38 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
   if (Length > 0) {
      int PesPayloadOffset = 0;
      if (AnalyzePesHeader(Data + Offset, Length, PesPayloadOffset) >= phMPEG1) {
-        for (int i = Offset + PesPayloadOffset; i < Offset + Length - 5; i++) {
-            if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
-               switch (Data[i + 3]) {
-                 case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
-                                  return Length;
+        const uchar *p = Data + Offset + PesPayloadOffset + 2;
+        const uchar *pLimit = Data + Offset + Length - 3;
+#ifdef TEST_cVideoRepacker
+        // cVideoRepacker ensures that a new PES packet is started for a new sequence,
+        // group or picture which allows us to easily skip scanning through a huge
+        // amount of video data.
+        if (p < pLimit) {
+           if (p[-2] || p[-1] || p[0] != 0x01)
+              pLimit = 0; // skip scanning: packet doesn't start with 0x000001
+           else {
+              switch (p[1]) {
+                case SC_SEQUENCE:
+                case SC_GROUP:
+                case SC_PICTURE:
+                     break;
+                default: // skip scanning: packet doesn't start a new sequence, group or picture
+                     pLimit = 0;
+                }
+              }
+           }
+#endif
+        while (p < pLimit && (p = (const uchar *)memchr(p, 0x01, pLimit - p))) {
+              if (!p[-2] && !p[-1]) { // found 0x000001
+                 switch (p[1]) {
+                   case SC_PICTURE: PictureType = (p[3] >> 3) & 0x07;
+                                    return Length;
+                   }
+                 p += 4; // continue scanning after 0x01ssxxyy
                  }
-               }
-            }
+              else
+                 p += 3; // continue scanning after 0x01xxyy
+              }
         }
      PictureType = NO_PICTURE;
      return Length;
diff --git a/remux.h b/remux.h
index ab296553a..2f1175638 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.15 2005/08/26 13:22:19 kls Exp $
+ * $Id: remux.h 1.16 2006/03/25 12:27:30 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -46,8 +46,6 @@ class cRemux {
   cRingBufferLinear *resultBuffer;
   int resultSkipped;
   int GetPid(const uchar *Data);
-  int GetPacketLength(const uchar *Data, int Count, int Offset);
-  int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
 public:
   cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure = false);
        ///< Creates a new remuxer for the given PIDs. VPid is the video PID, while
@@ -79,6 +77,8 @@ class cRemux {
        ///< Clears the remuxer of all data it might still contain, keeping the PID
        ///< settings as they are.
   static void SetBrokenLink(uchar *Data, int Length);
+  static int GetPacketLength(const uchar *Data, int Count, int Offset);
+  static int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
   };
 
 #endif // __REMUX_H
diff --git a/sources.conf b/sources.conf
index b318468e8..e770496a7 100644
--- a/sources.conf
+++ b/sources.conf
@@ -17,98 +17,169 @@
 
 # Satellites
 
+# Europe
+
 S5E     Sirius 2/3
-S7E     Eutelsat W3
-S10E    Eutelsat W1R
+S7E     Eutelsat W3A
+S10E    Eutelsat W1
 S13E    Hotbird 1-(5)-6
 S16E    Eutelsat W2
 S19.2E  Astra 1B/C/E/F/G/H/2C
-S21.5E  Eutelsat II F3
-S23.5E  Astra 3A
-S24.2E  Astra 1D
-S26E    Arabsat 2A/3A
+S21.0E  Afristar 1
+S21.6E  Eutelsat W6
+S23.5E  Astra 1D 3A
+S26E    Arabsat 2D/2C/3A
 S28.2E  Astra 2D/A/B 
-S28.5E  Eurobird
+S28.5E  Eurobird 1 & Astra 2A/B/D
 S30.5E  Arabsat 2B
-S31.3E  T�rksat 1B
+S33E    Eurobird 3 & Intelsat 802
 S36E    Eutelsat W4 & Sesat
-S39E    Hellas Sat
-S40E    Express A1R
-S42E    Turksat 1C & EurAsiaSat 1 & NewSat 1
-S45E    Europe*Star 1
-S47E    Telecom 2B
-S48E    Eutelsat II F1 
-S50E    Anatolia 1
-S53E    Gorizont 32
-S55.1E  Insat 2DT
-S56E    Most 1
+S38E    Paksat 1
+S39E    Hellas Sat 2
+S40E    Express AM1
+S42E    Turksat 1C/2A
+S45E    PAS 12
+S49E    Yamal 202
+S53E    Express AM 22
+S55E    Insat 3E & Intelsat 702
+S56E    Bonum 1
 S57E    NSS 703
 S60E    Intelsat 904
 S62E    Intelsat 902
 S64E    Intelsat 906 
 S66E    Intelsat 704
 S68.5E  PAS 7/10
+S70.5E  Eutelsat W5
 S72E    PAS 4 
-S74E    Insat 3C
+
+# Asia
+
+S74E    Insat 3C & Edusat
 S75E    LMI 1
-S76.5E  Apstar
+S76.5E  Telstar 10
 S78.5E  Thaicom 2/3
-S80E    Express 6A
-S83E    Insat 2E/3B
+S80E    Express AM2
+S83E    Insat 2E/3B/4A
+S85.2E  Intelsat 709
+S87.5E  Chinastar 1
+S88E    ST 1
+S90E    Yamal 201
+S91.5E  Measat 1
+S93.5E  Insat 3A
+S95E    NSS 6
+S96.5E  Express AM 11  
 S100.5E Asiasat 2
+S103E   Express A2
 S105.5E Asiasat 3S
-S113E   Palapa C2
+S107.7E Cakrawarta 1
+S108E   Telkom 1 & AAP 1
+S110E   N-Sat 110 & BSAT 1A/2A
+S110.5E Sinosat 1
+S113E   Palapa C2 & Koreasat 2
+S116E   Koreasat 3
+S118E   Telkom 2
+S120E   Thaicom 1A
+S122.2E Asiasat 4
+S124E   JCSAT 4a
+S128E   JCSAT 3
+S132E   N-Star A
+S134E   Apstar 6
+S136E   N-Star B
+S138E   Telstar 18
+S140E   Express AM 3
+S144E   Superbird C
+S146E   Agila 2
+S148E   Measat 2
+S150E   JCSAT R
 S152E   Optus B3
+S154E   JCSAT 2A
 S156E   Optus C1
+S158E   Superbird A
 S160E   Optus B1
+S162E   Superbird B2
+S164E   Optus A3
 S166E   PAS 8
 S169E   PAS 2
+S172E   AMC 23
 S180E   Intelsat 701
+S177W   NSS 5
 
-S1W     Thor 2/3 & Intelsat 707
-S4W     Amos 1
-S5W     Telecom 2C & Atlantic Bird 3
+# Atlantic
+
+S1W     Thor 2/3 & Intelsat 10-02
+S4W     Amos 1/2
+S5W     Atlantic Bird 3
 S7W     Nilesat 101 & 102
-S8W     Telecom 2A/2D & Atlantic Bird 2
-S11W    Express 3A
-S12.5W  Eutelsat II F2
-S14W    Gorizont 26
+S8W     Telecom 2D & Atlantic Bird 2
+S11W    Express A3
+S12.5W  Atlantic Bird 2
+S14W    Express A4
 S15W    Telstar 12
 S18W    Intelsat 901
-S21.5W  NSS 7
-S27.5W  Intelsat 605
-S30W    Hispasat 1
+S20W    Intelsat 603
+S22W    NSS 7
+S24.5W  Intelsat 905
+S27.5W  Intelsat 907
+S30W    Hispasat 1C/1D
 S31.5W  Intelsat 801
 S34.5W  Intelsat 903
-S37.5W  Telstar 11
+S37.5W  Telstar 11 & AMC 12
 S40.5W  NSS 806
-S43W    PAS 3R/6/6B
-S45W    PAS 1/5R
-S47W    TDRS 6
-S53W    Intelsat 706
+S43W    PAS 3R/6B
+S45W    PAS 1R
+S50W    Intelsat 705
+S53W    Intelsat 707
 S55.5W  Intelsat 805
 S58W    PAS 9
-S61.5W  Echostar 3
+S61W    Amazonas
+
+# America
+
+S61.5W  Echostar 3 & Rainbow 1
+S63W    Estrelo de Sul 1
+S65W    Brasilsat B2
+S70W    Brasilsat B1
+S72W    Nahuel 1 & AMC 6
+S72.5W  DirecTV 1
+S74W    SBS 6
+S77W    Echostar 4
 S79W    AMC5
+S79.5W  Nimiq 3
 S82W    Nimiq 2
-S85W    AMC2
+S83W    AMC 9
+S84W    Brasilsat B3
+S85W    AMC 2
+S85.1W  XM 3
 S87W    AMC3
-S89W    Intelsat 808
-S91W    Galaxy 11 & Nimiq 1/3
-S93W    Intelsat 806
+S89W    Intelsat Americas 8
+S91W    Galaxy 11 & Nimiq 1
+S91.5W  DirecTV 2
+S92W    Brasilsat B4
+S93W    Intelsat Americas 6
 S95W    Galaxy 3C
-S97W    Telestar 5
+S97W    Intelsat Americas 5
 S99W    Galaxy 4R
-S101W   AMC4
+S99.2W  Spaceway 2
+S101W   DirecTV 1R/4S/8 & AMC4
 S103W   AMC1
 S105W   AMC15
-S110W   Echostar 6/8
-S119W   Echostar 7
-S121W   Echostar 9 & Intelsat 813
+S107.3W Anik F1/F1R
+S110W   DirecTV 5 & Echostar 6/8
+A111.1W Anik F2
+S113W   Solidaridad 2
+S119W   Echostar 7 & DirecTV 7S
+S121W   Echostar 9 & Intelsat Americas 13
 S123W   Galaxy 10R
-S129W   Intelsat 807
+S125W   Galaxy 14
+S127W   Galaxy 13/Horizons 1
+S129W   Echostar 5 & Intelsat Americas 7
+S131W   AMC 11
+S133W   Galaxy15/1R
+S135W   AMC 10
+S137W   AMC 7
+S138.5W Echostar 10
+S139W   AMC 8
 S148W   Echostar 1/2
-S157W   Echostar 4
 
 # Cable
 
diff --git a/spu.c b/spu.c
index ccdcc3908..9ca25a154 100644
--- a/spu.c
+++ b/spu.c
@@ -6,11 +6,11 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.c 1.1 2002/09/08 14:17:41 kls Exp $
+ * $Id: spu.c 1.2 2006/03/26 14:07:59 kls Exp $
  */
 
-#include <inttypes.h>
 #include "spu.h"
+#include <inttypes.h>
 
 // -- cSpuDecoder ----------------
 /*
diff --git a/svdrp.c b/svdrp.c
index 9fa61ea98..0cf73e9f2 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.93 2006/01/14 16:08:20 kls Exp $
+ * $Id: svdrp.c 1.94 2006/03/26 09:14:13 kls Exp $
  */
 
 #include "svdrp.h"
@@ -461,7 +461,7 @@ void cSVDRP::PrintHelpTopics(const char **hp)
              q += sprintf(q, "%*s", -MAXHELPTOPIC, topic);
           }
       x = 0;
-      Reply(-214, buffer);
+      Reply(-214, "%s", buffer);
       }
 }
 
@@ -782,7 +782,7 @@ void cSVDRP::CmdGRAB(const char *Option)
            cBase64Encoder Base64(Image, ImageSize);
            const char *s;
            while ((s = Base64.NextLine()) != NULL)
-                 Reply(-216, s);
+                 Reply(-216, "%s", s);
            Reply(216, "Grabbed image %s", Option);
            }
         free(Image);
@@ -799,7 +799,7 @@ void cSVDRP::CmdHELP(const char *Option)
   if (*Option) {
      const char *hp = GetHelpPage(Option, HelpPages);
      if (hp)
-        Reply(214, hp);
+        Reply(214, "%s", hp);
      else {
         Reply(504, "HELP topic \"%s\" unknown", Option);
         return;
@@ -1332,7 +1332,7 @@ void cSVDRP::CmdPLUG(const char *Option)
            if (*cmd && *option) {
               const char *hp = GetHelpPage(option, plugin->SVDRPHelpPages());
               if (hp) {
-                 Reply(-214, hp);
+                 Reply(-214, "%s", hp);
                  Reply(214, "End of HELP info");
                  }
               else
@@ -1358,7 +1358,7 @@ void cSVDRP::CmdPLUG(const char *Option)
            int ReplyCode = 900;
            cString s = plugin->SVDRPCommand(cmd, option, ReplyCode);
            if (s)
-              Reply(abs(ReplyCode), *s);
+              Reply(abs(ReplyCode), "%s", *s);
            else
               Reply(500, "Command unrecognized: \"%s\"", cmd);
            }
@@ -1380,7 +1380,7 @@ void cSVDRP::CmdPUTE(const char *Option)
 {
   delete PUTEhandler;
   PUTEhandler = new cPUTEhandler;
-  Reply(PUTEhandler->Status(), PUTEhandler->Message());
+  Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
   if (PUTEhandler->Status() != 354)
      DELETENULL(PUTEhandler);
 }
@@ -1467,7 +1467,7 @@ void cSVDRP::Execute(char *Cmd)
   // handle PUTE data:
   if (PUTEhandler) {
      if (!PUTEhandler->Process(Cmd)) {
-        Reply(PUTEhandler->Status(), PUTEhandler->Message());
+        Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
         DELETENULL(PUTEhandler);
         }
      return;
diff --git a/thread.c b/thread.c
index 3293b1d45..89d56e9fd 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.53 2006/02/12 12:24:39 kls Exp $
+ * $Id: thread.c 1.54 2006/03/26 09:22:27 kls Exp $
  */
 
 #include "thread.h"
@@ -208,7 +208,8 @@ cThread::cThread(const char *Description)
   childTid = 0;
   childThreadId = 0;
   description = NULL;
-  SetDescription(Description);
+  if (Description)
+     SetDescription("%s", Description);
 }
 
 cThread::~cThread()
diff --git a/timers.c b/timers.c
index 63eb34227..0e764d345 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.50 2006/02/26 10:50:47 kls Exp $
+ * $Id: timers.c 1.55 2006/03/26 14:08:57 kls Exp $
  */
 
 #include "timers.h"
@@ -12,6 +12,7 @@
 #include "channels.h"
 #include "device.h"
 #include "i18n.h"
+#include "libsi/si.h"
 #include "remote.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
@@ -120,7 +121,7 @@ cString cTimer::ToText(bool UseChannelID)
 cString cTimer::ToDescr(void) const
 {
   char *buffer;
-  asprintf(&buffer, "%d (%d %04d-%04d '%s')", Index() + 1, Channel()->Number(), start, stop, file);
+  asprintf(&buffer, "%d (%d %04d-%04d %s'%s')", Index() + 1, Channel()->Number(), start, stop, HasFlags(tfVps) ? "VPS " : "", file);
   return cString(buffer, true);
 }
 
@@ -409,7 +410,13 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
 
 bool cTimer::Expired(void) const
 {
-  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL);
+  if (IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL)) {
+     if (HasFlags(tfVps) && event && event->Vps())
+        return event->RunningStatus() == SI::RunningStatusNotRunning;
+     else
+        return true;
+     }
+  return false;
 }
 
 time_t cTimer::StartTime(void) const
@@ -426,7 +433,10 @@ time_t cTimer::StopTime(void) const
   return stopTime;
 }
 
-#define EPGLIMITPAST   (2 * 3600) // time in seconds in the past within which EPG events will be taken into consideration
+#define EPGLIMITBEFORE   (1 * 3600) // Time in seconds before a timer's start time and
+#define EPGLIMITAFTER    (1 * 3600) // after its stop time within which EPG events will be taken into consideration.
+#define VPSLIMITBEFORE   (2 * 3600) // Same for VPS timers, which need to
+#define VPSLIMITAFTER   (24 * 3600) // look further into the future to catch shifted broadcasts.
 
 void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
 {
@@ -438,14 +448,25 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
      }
   const cSchedule *Schedule = Schedules->GetSchedule(Channel());
   if (Schedule) {
+     time_t now = time(NULL);
      if (!lastSetEvent || Schedule->Modified() >= lastSetEvent) {
         const cEvent *Event = NULL;
         int Overlap = 0;
         int Distance = INT_MIN;
-        time_t now = time(NULL);
+        bool UseVps = HasFlags(tfVps);
+        const cEvent *PresentEvent = UseVps ? Schedule->GetPresentEvent() : NULL;
+        const cEvent *FollowingEvent = UseVps ? Schedule->GetFollowingEvent() : NULL;
+        // Set up the time frame within which to check events:
+        Matches(0, true);
+        time_t TimeFrameBegin = StartTime() - (UseVps ? VPSLIMITBEFORE : EPGLIMITBEFORE);
+        time_t TimeFrameEnd   = StopTime()  + (UseVps ? VPSLIMITAFTER  : EPGLIMITAFTER);
         for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
-            if (e->EndTime() < now - EPGLIMITPAST)
-               continue; // skip old events
+            if (!UseVps || e != event && e != PresentEvent && e != FollowingEvent) { // always check these if this is a VPS timer
+               if (e->EndTime() < TimeFrameBegin)
+                  continue; // skip events way before the timer starts
+               if (e->StartTime() > TimeFrameEnd)
+                  break; // the rest is way after the timer ends
+               }
             int overlap = 0;
             Matches(e, &overlap);
             if (overlap && overlap >= Overlap) {
@@ -470,20 +491,16 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
         if (Event && Event->EndTime() < now - EXPIRELATENCY && Overlap > FULLMATCH && !Event->IsRunning())
            Event = NULL;
         SetEvent(Event);
+        lastSetEvent = now;
         }
      }
-  lastSetEvent = time(NULL);
 }
 
 void cTimer::SetEvent(const cEvent *Event)
 {
   if (event != Event) { //XXX TODO check event data, too???
-     if (Event) {
-        char vpsbuf[64] = "";
-        if (Event->Vps())
-           sprintf(vpsbuf, "(VPS: %s) ", *Event->GetVpsString());
-        isyslog("timer %s set to event %s %s-%s %s'%s'", *ToDescr(), *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString(), vpsbuf, Event->Title());
-        }
+     if (Event)
+        isyslog("timer %s set to event %s", *ToDescr(), *Event->ToDescr());
      else
         isyslog("timer %s set to no event", *ToDescr());
      event = Event;
@@ -568,6 +585,7 @@ cTimers::cTimers(void)
   state = 0;
   beingEdited = 0;;
   lastSetEvents = 0;
+  lastDeleteExpired = 0;
 }
 
 cTimer *cTimers::GetTimer(cTimer *Timer)
@@ -663,6 +681,8 @@ void cTimers::SetEvents(void)
 
 void cTimers::DeleteExpired(void)
 {
+  if (time(NULL) - lastDeleteExpired < 30)
+     return;
   cTimer *ti = First();
   while (ti) {
         cTimer *next = Next(ti);
@@ -673,4 +693,5 @@ void cTimers::DeleteExpired(void)
            }
         ti = next;
         }
+  lastDeleteExpired = time(NULL);
 }
diff --git a/timers.h b/timers.h
index f49b48ddc..da7a5f810 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.26 2006/02/25 15:05:09 kls Exp $
+ * $Id: timers.h 1.27 2006/03/26 10:44:01 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -101,6 +101,7 @@ class cTimers : public cConfig<cTimer> {
   int state;
   int beingEdited;
   time_t lastSetEvents;
+  time_t lastDeleteExpired;
 public:
   cTimers(void);
   cTimer *GetTimer(cTimer *Timer);
diff --git a/tools.c b/tools.c
index fb8878933..18f953764 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.114 2006/02/05 11:05:56 kls Exp $
+ * $Id: tools.c 1.115 2006/03/19 12:28:16 kls Exp $
  */
 
 #include "tools.h"
@@ -829,8 +829,14 @@ char *cReadLine::Read(FILE *f)
   int n = getline(&buffer, &size, f);
   if (n > 0) {
      n--;
-     if (buffer[n] == '\n')
+     if (buffer[n] == '\n') {
         buffer[n] = 0;
+        if (n > 0) {
+           n--;
+           if (buffer[n] == '\r')
+              buffer[n] = 0;
+           }
+        }
      return buffer;
      }
   return NULL;
diff --git a/vdr.5 b/vdr.5
index e167965af..f6fc2fd9b 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.54 2006/02/26 14:10:00 kls Exp $
+.\" $Id: vdr.5 1.55 2006/03/26 13:42:29 kls Exp $
 .\"
-.TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
+.TH vdr 5 "26 Mar 2006" "1.3.45" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -636,7 +636,7 @@ l l.
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
 <table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
-<version>      @is a hex number that indicates the event's version number inside its table (optional, only processed for table IDs smaller than 0x50)
+<version>      @is a hex number that indicates the event's version number inside its table (optional, ignored when reading EPG data)
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
diff --git a/vdr.c b/vdr.c
index 5e17a37df..7ff749bff 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.249 2006/02/05 12:57:10 kls Exp $
+ * $Id: vdr.c 1.251 2006/03/26 09:16:53 kls Exp $
  */
 
 #include <getopt.h>
@@ -1067,7 +1067,7 @@ int main(int argc, char *argv[])
                     }
                  if (UserShutdown && Next && Delta <= Setup.MinEventTimeout * 60 && !ForceShutdown) {
                     char *buf;
-                    asprintf(&buf, tr("Recording in %d minutes, shut down anyway?"), Delta / 60);
+                    asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
                     if (Interface->Confirm(buf))
                        ForceShutdown = true;
                     else
@@ -1090,13 +1090,16 @@ int main(int argc, char *argv[])
                        isyslog("executing '%s'", cmd);
                        SystemExec(cmd);
                        free(cmd);
+                       LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
                        }
-                    else if (WatchdogTimeout > 0) {
-                       alarm(WatchdogTimeout);
-                       if (signal(SIGALRM, Watchdog) == SIG_IGN)
-                          signal(SIGALRM, SIG_IGN);
-                       }
-                    LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
+                    else {
+                      LastActivity = Now;
+                      if (WatchdogTimeout > 0) {
+                         alarm(WatchdogTimeout);
+                         if (signal(SIGALRM, Watchdog) == SIG_IGN)
+                            signal(SIGALRM, SIG_IGN);
+                         }
+                      }
                     UserShutdown = false;
                     continue; // skip the rest of the housekeeping for now
                     }

From 396d0ad36712d8c07d91b36283a14838900ca5a2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 9 Apr 2006 18:00:00 +0200
Subject: [PATCH 138/307] =?UTF-8?q?Version=201.3.46=20-=20Fixed=20handling?=
 =?UTF-8?q?=20broken=20PMT=20records=20(thanks=20to=20Marcel=20Wiesweg=20f?=
 =?UTF-8?q?or=20pointing=20out=20how=20=20=20to=20detect=20these).=20-=20A?=
 =?UTF-8?q?dded=20a=20missing=20"Button$"=20for=20the=20Timer=20button=20a?=
 =?UTF-8?q?nd=20"Key$"=20in=20skinclassic.c=20=20=20(thanks=20to=20Rolf=20?=
 =?UTF-8?q?Ahrenberg).=20-=20Fixed=20broken=20entry=20'A111.1W'=20in=20sou?=
 =?UTF-8?q?rces.conf=20(reported=20by=20Luca=20Olivetti).=20-=20Replaced?=
 =?UTF-8?q?=20the=20obsolete=20entry=20'S21.5E'=20in=20the=20default=20'di?=
 =?UTF-8?q?seqc.conf'=20with=20'S13.0E'=20=20=20(reported=20by=20Ville=20S?=
 =?UTF-8?q?kytt=C3=A4).=20-=20Fixed=20learning=20keys=20when=20VDR=20is=20?=
 =?UTF-8?q?already=20running=20(thanks=20to=20Jurij=20Retzlaff).=20-=20Fix?=
 =?UTF-8?q?ed=20handling=20the=20system=20time=20transponder=20setting=20i?=
 =?UTF-8?q?n=20the=20Setup/EPG=20menu,=20which=20=20=20was=20broken=20by?=
 =?UTF-8?q?=20the=20min/max=20fix=20in=20cMenuEditIntItem.=20-=20VPS=20tim?=
 =?UTF-8?q?ers=20now=20record=20only=20events=20that=20have=20exactly=20th?=
 =?UTF-8?q?e=20given=20start=20time.=20=20=20This=20fix=20also=20implement?=
 =?UTF-8?q?s=20recording=20several=20subsequent=20events=20that=20have=20t?=
 =?UTF-8?q?he=20=20=20same=20VPS=20time=20(like=20a=20sports=20event=20wit?=
 =?UTF-8?q?h=20intermittent=20news=20breaks).=20-=20When=20checking=20for?=
 =?UTF-8?q?=20timers=20that=20have=20entered=20the=20"VPS=20margin",=20any?=
 =?UTF-8?q?=20free=20devices=20are=20=20=20now=20used=20to=20switch=20to?=
 =?UTF-8?q?=20the=20needed=20transponder.=20This=20improves=20cases=20wher?=
 =?UTF-8?q?e=20more=20than=20=20=20one=20VPS=20timer=20is=20about=20to=20s?=
 =?UTF-8?q?tart.=20-=20Fixed=20handling=20the=20VPS=20margin=20in=20case?=
 =?UTF-8?q?=20the=20event's=20duration=20is=20shorter=20than=20the=20=20?=
 =?UTF-8?q?=20margin.=20-=20Fixed=20handling=20VPS=20timers=20in=20case=20?=
 =?UTF-8?q?the=20primary=20device=20needs=20to=20switch=20to=20the=20=20?=
 =?UTF-8?q?=20timer's=20transponder.=20-=20Now=20avoiding=20the=20'actual'?=
 =?UTF-8?q?=20device=20when=20starting=20a=20recording,=20so=20that=20a=20?=
 =?UTF-8?q?Transfer=20=20=20Mode=20for=20live=20tv=20isn't=20interrupted.?=
 =?UTF-8?q?=20-=20Fixed=20a=20typo=20in=20skins.h=20(thanks=20to=20Alexand?=
 =?UTF-8?q?er=20Rieger).=20-=20cSkins::QueueMessage()=20called=20from=20a?=
 =?UTF-8?q?=20background=20thread=20with=20an=20empty=20message=20=20=20no?=
 =?UTF-8?q?w=20clears=20all=20messages=20that=20have=20been=20previously?=
 =?UTF-8?q?=20queued=20by=20that=20thread=20and=20have=20=20=20not=20yet?=
 =?UTF-8?q?=20beed=20displayed=20(thanks=20to=20Alexander=20Rieger).=20-?=
 =?UTF-8?q?=20Fixed=20handling=20the=20color=20button=20texts=20when=20swi?=
 =?UTF-8?q?tching=20from=20the=20'Schedule'=20menu=20of=20=20=20a=20channe?=
 =?UTF-8?q?l=20without=20EPG=20info=20to=20the=20'What's=20on=20now'=20men?=
 =?UTF-8?q?u=20(reported=20by=20Rolf=20=20=20Ahrenberg).=20-=20cMenuEditIn?=
 =?UTF-8?q?tItem=20and=20cMenuEditChanItem=20can=20now=20be=20given=20stri?=
 =?UTF-8?q?ngs=20to=20label=20the=20=20=20minimum=20and=20maximum=20values?=
 =?UTF-8?q?,=20and=20the=20case=20that=20no=20channel=20has=20been=20selec?=
 =?UTF-8?q?ted,=20=20=20respectively.=20-=20The=20initial=20channel=20and?=
 =?UTF-8?q?=20volume=20can=20now=20be=20defined=20in=20the=20"Setup/Miscel?=
 =?UTF-8?q?laneous"=20=20=20menu=20(based=20on=20a=20patch=20from=20Thomas?=
 =?UTF-8?q?=20Keil).=20-=20When=20hitting=20the=20end=20of=20a=20recording?=
 =?UTF-8?q?=20in=20fast=20forward=20mode,=20VDR=20no=20longer=20switches?=
 =?UTF-8?q?=20=20=20back=20to=20normal=20speed=20if=20the=20recording=20is?=
 =?UTF-8?q?=20already=20finished=20(thanks=20to=20Reinhard=20=20=20Nissl).?=
 =?UTF-8?q?=20-=20No=20longer=20calling=20cPlugin::ProcessArgs()=20if=20VD?=
 =?UTF-8?q?R=20is=20run=20with=20the=20--help=20or=20=20=20--version=20opt?=
 =?UTF-8?q?ion,=20to=20avoid=20error=20messages=20from=20plugins=20(report?=
 =?UTF-8?q?ed=20by=20Udo=20Richter).=20-=20Now=20checking=20whether=20ther?=
 =?UTF-8?q?e=20is=20any=20text=20before=20calling=20cStatus::MsgOsdTextIte?=
 =?UTF-8?q?m()=20=20=20(reported=20by=20Joachim=20Wilke).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  | 21 +++++++++++-
 HISTORY       | 46 +++++++++++++++++++++++++-
 MANUAL        |  9 +++++
 channels.conf | 14 ++++----
 config.c      |  8 ++++-
 config.h      |  8 +++--
 device.c      | 24 +++++++++-----
 device.h      |  5 ++-
 diseqc.conf   | 24 +++++++-------
 dvbdevice.c   |  7 +++-
 dvbdevice.h   |  3 +-
 dvbplayer.c   | 11 ++++--
 i18n.c        | 92 +++++++++++++++++++++++++++++++++++++++++++++++++--
 interface.c   |  7 ++--
 menu.c        | 18 ++++++----
 menuitems.c   | 55 +++++++++++++++++-------------
 menuitems.h   | 10 +++---
 pat.c         |  7 +++-
 pat.h         |  3 +-
 plugin.c      |  4 +--
 recording.c   |  7 +++-
 recording.h   |  3 +-
 remote.h      |  3 +-
 skinclassic.c |  4 +--
 skins.c       | 13 ++++++--
 skins.h       |  8 +++--
 sources.conf  |  2 +-
 timers.c      | 80 ++++++++++++++++++++++----------------------
 timers.h      |  4 +--
 vdr.c         | 76 +++++++++++++++++++++++++++++++++---------
 30 files changed, 429 insertions(+), 147 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f44f43798..735e81656 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -780,6 +780,7 @@ Marcel Wiesweg <marcel.wiesweg@gmx.de>
  for fixing a possible crash with inconsistent SI data
  for pointing out a problem with the cChannel copy constructor
  for fixing cDvbTuner to avoid lockups on NPTL systems
+ for pointing out how to detect broken PMT records
 
 Torsten Herz <torsten.herz@web.de>
  for fixing a possible deadlock when using the "Blue" button in the "Schedules" menu
@@ -969,6 +970,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for suggesting to also set the language codes when setting the audio track descriptions
  for reporting a problem in setting the audio language codes in 'Transfer-Mode'
  for fixing cReadLine::Read() for lines that end with the infamous "\r\n"
+ for adding a missing "Button$" for the Timer button and "Key$" in skinclassic.c
+ for reporting a bug in handling the color button texts when switching from the
+ 'Schedule' menu of a channel without EPG info to the 'What's on now' menu
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1011,12 +1015,14 @@ Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 Michael Walle <michael.walle@web.de>
  for reporting a bug in channel switching after Left/Right has been pressed
 
-Thomas Keil <tk@commedia-group.com>
+Thomas Keil <tkeil@datacrystal.de>
  for suggesting to change the behaviour of the '0' key in normal viewing mode so
  that a channel only qualifies as "previous" if it has been selected for at least
  3 seconds
  for reporting a bug in handling the color buttons in the "Edit channel" menu
  for adding a note about the config files of plugins to INSTALL
+ for a patch that was used as a base to implement setting the initial channel and
+ volume
 
 Kenneth Aafl�y <ke-aa@frisurf.no>
  for fixing checking CA capabilities with the dvb-kernel driver
@@ -1070,6 +1076,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing replaying recordings of radio channels with many audio tracks
  for speeding up cRemux::ScanVideoPacket()
  for implementing cDevice::ForceTransferMode()
+ for changing the behaviour when hitting the end of a recording in fast forward mode
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1393,6 +1400,8 @@ Udo Richter <udo_richter@gmx.de>
  Up/Down in insert mode
  for fixing handling the "Setup/OSD/Menu button closes" option when set to 'yes' in
  case a replay is active
+ for reporting a problem with plugins that report errors when VDR is run with the
+ --help or --version option
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1425,6 +1434,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
  runs all the way until the end of the recording
  for fixing removing the '-' when entering a channel number where there is no other
  one that fits the input
+ for reporting a problem with cStatus::MsgOsdTextItem() being called without a text
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -1517,6 +1527,7 @@ Luca Olivetti <luca@ventoso.org>
  for suggesting to make the "Menu" key behave consistently
  for suggesting to implement a timeout for remote controls that don't deliver
  "repeat" keypresses very fast
+ for reporting a broken entry 'A111.1W' in sources.conf
 
 Mikko Salo <mikko.salo@ppe.inet.fi>
  for suggesting to make the setup option "DVB/Video display format" available only
@@ -1543,6 +1554,7 @@ Ville Skytt
  for making the cLircRemote try to reestablish the connection to the LIRC daemon
  in case it breaks
  for enabling generating a core dump if VDR is run with a different user id
+ for reporting an obsolete entry 'S21.5E' in the default 'diseqc.conf'
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1643,6 +1655,9 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for making the '.update' file in the video directory be touched when a recording is
  added or deleted, so that other VDR instances can update their lists
  for adding cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont()
+ for fixing a typo in skins.h
+ for making cSkins::QueueMessage() called from a background thread with an empty
+ message clears all messages that have been previously queued by that thread
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
@@ -1793,6 +1808,10 @@ Jan Lenz <email@JanLenz.de>
 
 Oleg Roitburd <oleg@roitburd.de>
  for translating OSD texts to the Russian language
+ for updating 'sources.conf'
 
 Marius Heidenstecker <marius@heidenstecker.de>
  for suggesting to make cMenuRecordings::GetRecording() 'protected'
+
+Jurij Retzlaff <jurij@topofweb.de>
+ for fixing learning keys when VDR is already running
diff --git a/HISTORY b/HISTORY
index ad85a22c4..7dabc45de 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4428,7 +4428,7 @@ Video Disk Recorder Revision History
   Rolf Ahrenberg).
 - Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false
   (thanks to Werner Fink).
-- Updated 'sources.conf'.
+- Updated 'sources.conf' (thanks to Oleg Roitburd).
 - Fixed the shutdown timeout (thanks to Alexander Wenzel).
 - Only calling RemoveEmptyVideoDirectories() once in case a recording has been
   deleted (reported by Hardy Flor).
@@ -4455,3 +4455,47 @@ Video Disk Recorder Revision History
 - Single shot VPS timers are now only considered 'expired' if their associated
   EPG event has been explicitly set to SI::RunningStatusNotRunning.
 - The check for timers to be deleted is now done only every 30 seconds.
+
+2006-04-09: Version 1.3.46
+
+- Fixed handling broken PMT records (thanks to Marcel Wiesweg for pointing out how
+  to detect these).
+- Added a missing "Button$" for the Timer button and "Key$" in skinclassic.c
+  (thanks to Rolf Ahrenberg).
+- Fixed broken entry 'A111.1W' in sources.conf (reported by Luca Olivetti).
+- Replaced the obsolete entry 'S21.5E' in the default 'diseqc.conf' with 'S13.0E'
+  (reported by Ville Skytt�).
+- Fixed learning keys when VDR is already running (thanks to Jurij Retzlaff).
+- Fixed handling the system time transponder setting in the Setup/EPG menu, which
+  was broken by the min/max fix in cMenuEditIntItem.
+- VPS timers now record only events that have exactly the given start time.
+  This fix also implements recording several subsequent events that have the
+  same VPS time (like a sports event with intermittent news breaks).
+- When checking for timers that have entered the "VPS margin", any free devices are
+  now used to switch to the needed transponder. This improves cases where more than
+  one VPS timer is about to start.
+- Fixed handling the VPS margin in case the event's duration is shorter than the
+  margin.
+- Fixed handling VPS timers in case the primary device needs to switch to the
+  timer's transponder.
+- Now avoiding the 'actual' device when starting a recording, so that a Transfer
+  Mode for live tv isn't interrupted.
+- Fixed a typo in skins.h (thanks to Alexander Rieger).
+- cSkins::QueueMessage() called from a background thread with an empty message
+  now clears all messages that have been previously queued by that thread and have
+  not yet beed displayed (thanks to Alexander Rieger).
+- Fixed handling the color button texts when switching from the 'Schedule' menu of
+  a channel without EPG info to the 'What's on now' menu (reported by Rolf
+  Ahrenberg).
+- cMenuEditIntItem and cMenuEditChanItem can now be given strings to label the
+  minimum and maximum values, and the case that no channel has been selected,
+  respectively.
+- The initial channel and volume can now be defined in the "Setup/Miscellaneous"
+  menu (based on a patch from Thomas Keil).
+- When hitting the end of a recording in fast forward mode, VDR no longer switches
+  back to normal speed if the recording is already finished (thanks to Reinhard
+  Nissl).
+- No longer calling cPlugin::ProcessArgs() if VDR is run with the --help or
+  --version option, to avoid error messages from plugins (reported by Udo Richter).
+- Now checking whether there is any text before calling cStatus::MsgOsdTextItem()
+  (reported by Joachim Wilke).
diff --git a/MANUAL b/MANUAL
index 9655bc365..c29d648eb 100644
--- a/MANUAL
+++ b/MANUAL
@@ -779,6 +779,15 @@ Version 1.3
   Zap Timeout = 3        The time (in seconds) until a channel counts as "previous"
                          for switching with '0'
 
+  Inital channel = 0     The number of the channel that shall be tuned to when
+                         VDR starts. Default is 0, which means that it will
+                         tune to the channel that was on before VDR was stopped.
+
+  Initial volume = -1    The volume that shall be set when VDR starts. Default
+                         is -1, which means that the same volume as before
+                         VDR was stopped will be used. The valid range is from
+                         0 (silent) to 255 (loudest).
+
 * Executing system commands
 
   The "VDR" menu option "Commands" allows you to execute any system commands
diff --git a/channels.conf b/channels.conf
index 29dffe147..26fe158c3 100644
--- a/channels.conf
+++ b/channels.conf
@@ -8,7 +8,7 @@ hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR S�DWEST Ferns.;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu;706=deu:704:0:28112:1:1101:0
+BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
@@ -27,7 +27,7 @@ DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
@@ -45,11 +45,11 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1:11:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
 PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1:29:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
@@ -119,9 +119,9 @@ Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;668=eng:584:
 Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,655=NAR:576:960,961:4402:2:2011:0
 Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:4503:2:2011:0
 Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,657=NAR:577:960,961:4502:2:2011:0
-Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,663=NAR:579:960,961:4603:2:2030:0
+Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,653=NAR;663=eng:579:960,961:4603:2:2030:0
 Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:5502:2:2007:0
-Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,666=NAR:582:960,961:4602:2:2030:0
+Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,654=NAR;666=eng:2440:960,961:4602:2:2030:0
 Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:4809:2:2030:0
 Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
 :@900 Some 'seed' channels
diff --git a/config.c b/config.c
index b829d3a7a..9dadfdca2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.142 2006/02/25 14:12:16 kls Exp $
+ * $Id: config.c 1.143 2006/04/09 12:12:01 kls Exp $
  */
 
 #include "config.h"
@@ -271,6 +271,8 @@ cSetup::cSetup(void)
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
   CurrentDolby = 0;
+  InitialChannel = 0;
+  InitialVolume = -1;
 }
 
 cSetup& cSetup::operator= (const cSetup &s)
@@ -430,6 +432,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
   else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
+  else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = atoi(Value);
+  else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
   else
      return false;
   return true;
@@ -496,6 +500,8 @@ bool cSetup::Save(void)
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
   Store("CurrentDolby",       CurrentDolby);
+  Store("InitialChannel",     InitialChannel);
+  Store("InitialVolume",      InitialVolume);
 
   Sort();
 
diff --git a/config.h b/config.h
index 07f48cf52..50c5afa52 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.247 2006/02/28 12:23:28 kls Exp $
+ * $Id: config.h 1.249 2006/04/09 12:09:05 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.45"
-#define VDRVERSNUM   10345  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.46"
+#define VDRVERSNUM   10346  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
@@ -237,6 +237,8 @@ class cSetup : public cConfig<cSetupLine> {
   int CurrentChannel;
   int CurrentVolume;
   int CurrentDolby;
+  int InitialChannel;
+  int InitialVolume;
   int __EndData__;
   cSetup(void);
   cSetup& operator= (const cSetup &s);
diff --git a/device.c b/device.c
index dfb95f4c4..b931527cb 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.125 2006/03/26 09:42:48 kls Exp $
+ * $Id: device.c 1.127 2006/04/09 10:46:36 kls Exp $
  */
 
 #include "device.h"
@@ -281,27 +281,30 @@ cDevice *cDevice::GetDevice(int Index)
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
   cDevice *d = NULL;
-  int select = 8, pri;
+  int select = INT_MAX;
 
   for (int i = 0; i < numDevices; i++) {
       bool ndr;
       if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
+         int pri;
          if (device[i]->Receiving() && !ndr)
             pri = 0; // receiving and allows additional receivers
-         else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
+         else if (!device[i]->Receiving(true) && d && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
             pri = 1; // free and fewer Ca's
          else if (!device[i]->Receiving() && !device[i]->HasDecoder())
             pri = 2; // free and not a full featured card
+         else if (!device[i]->Receiving() && device[i] != ActualDevice())
+            pri = 3; // free and not the actual device
          else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice())
-            pri = 3; // free and not the primary device
+            pri = 4; // free and not the primary device
          else if (!device[i]->Receiving())
-            pri = 4; // free
+            pri = 5; // free
          else if (d && device[i]->Priority() < d->Priority())
-            pri = 5; // receiving but priority is lower
+            pri = 6; // receiving but priority is lower
          else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
-            pri = 6; // receiving with same priority but fewer Ca's
+            pri = 7; // receiving with same priority but fewer Ca's
          else
-            pri = 7; // all others
+            pri = 8; // all others
          if (pri <= select) {
             select = pri;
             d = device[i];
@@ -547,6 +550,11 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
   return false;
 }
 
+bool cDevice::IsTunedToTransponder(const cChannel *Channel)
+{
+  return false;
+}
+
 bool cDevice::MaySwitchTransponder(void)
 {
   return !Receiving(true) && !(pidHandles[ptAudio].pid || pidHandles[ptVideo].pid || pidHandles[ptDolby].pid);
diff --git a/device.h b/device.h
index 16fa370b4..23663e84b 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.73 2006/03/26 09:42:40 kls Exp $
+ * $Id: device.h 1.74 2006/04/02 13:08:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -217,6 +217,9 @@ class cDevice : public cThread {
          ///< function itself actually returns true.
          ///< The default implementation always returns false, so a derived cDevice
          ///< class that can provide channels must implement this function.
+  virtual bool IsTunedToTransponder(const cChannel *Channel);
+         ///< Returns true if this device is currently tuned to the given Channel's
+         ///< transponder.
   virtual bool MaySwitchTransponder(void);
          ///< Returns true if it is ok to switch the transponder on this device,
          ///< without disturbing any other activities.
diff --git a/diseqc.conf b/diseqc.conf
index 9708327c0..3dfc70368 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -32,10 +32,10 @@ S19.2E  99999 V 10600  t v W15 [E0 10 38 F1] W15 A W15 T
 S19.2E  11700 H  9750  t V W15 [E0 10 38 F2] W15 A W15 t
 S19.2E  99999 H 10600  t V W15 [E0 10 38 F3] W15 A W15 T
 
-S21.5E  11700 V  9750  t v W15 [E0 10 38 F4] W15 B W15 t
-S21.5E  99999 V 10600  t v W15 [E0 10 38 F5] W15 B W15 T
-S21.5E  11700 H  9750  t V W15 [E0 10 38 F6] W15 B W15 t
-S21.5E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
+S13.0E  11700 V  9750  t v W15 [E0 10 38 F4] W15 B W15 t
+S13.0E  99999 V 10600  t v W15 [E0 10 38 F5] W15 B W15 T
+S13.0E  11700 H  9750  t V W15 [E0 10 38 F6] W15 B W15 t
+S13.0E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 
 # Optimized for mini DiSEqC (aka toneburst):
 #
@@ -44,10 +44,10 @@ S21.5E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S19.2E  11700 H  9750  t V W15 A W15 t
 # S19.2E  99999 H 10600  t V W15 A W15 T
 #
-# S21.5E  11700 V  9750  t v W15 B W15 t
-# S21.5E  99999 V 10600  t v W15 B W15 T
-# S21.5E  11700 H  9750  t V W15 B W15 t
-# S21.5E  99999 H 10600  t V W15 B W15 T
+# S13.0E  11700 V  9750  t v W15 B W15 t
+# S13.0E  99999 V 10600  t v W15 B W15 T
+# S13.0E  11700 H  9750  t V W15 B W15 t
+# S13.0E  99999 H 10600  t V W15 B W15 T
 #
 # Optimized for full DiSEqC:
 #
@@ -56,10 +56,10 @@ S21.5E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S19.2E  11700 H  9750  [E0 10 38 F2]
 # S19.2E  99999 H 10600  [E0 10 38 F3]
 #
-# S21.5E  11700 V  9750  [E0 10 38 F4]
-# S21.5E  99999 V 10600  [E0 10 38 F5]
-# S21.5E  11700 H  9750  [E0 10 38 F6]
-# S21.5E  99999 H 10600  [E0 10 38 F7]
+# S13.0E  11700 V  9750  [E0 10 38 F4]
+# S13.0E  99999 V 10600  [E0 10 38 F5]
+# S13.0E  11700 H  9750  [E0 10 38 F6]
+# S13.0E  99999 H 10600  [E0 10 38 F7]
 #
 # DisiCon-4 Single Cable Network:
 #
diff --git a/dvbdevice.c b/dvbdevice.c
index af9b4a84c..db6a44762 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.155 2006/03/26 09:42:54 kls Exp $
+ * $Id: dvbdevice.c 1.156 2006/04/01 14:19:43 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -801,6 +801,11 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
+bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
+{
+  return dvbTuner->IsTunedTo(Channel);
+}
+
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
   bool DoTune = !dvbTuner->IsTunedTo(Channel);
diff --git a/dvbdevice.h b/dvbdevice.h
index ac84a946f..6f2078abd 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.38 2006/02/04 10:21:51 kls Exp $
+ * $Id: dvbdevice.h 1.39 2006/04/01 14:18:59 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -62,6 +62,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool IsTunedToTransponder(const cChannel *Channel);
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 public:
diff --git a/dvbplayer.c b/dvbplayer.c
index f61e0c91b..2f23e3108 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.43 2006/02/19 14:20:15 kls Exp $
+ * $Id: dvbplayer.c 1.44 2006/04/09 13:47:11 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -399,12 +399,19 @@ void cDvbPlayer::Action(void)
                     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
                        uchar FileNumber;
                        int FileOffset;
-                       int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
+                       bool TimeShiftMode = index->IsStillRecording();
+                       int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
                        if (Index >= 0) {
                           if (!NextFile(FileNumber, FileOffset))
                              continue;
                           }
                        else {
+                          if (!TimeShiftMode && playDir == pdForward) {
+                             // hit end of recording: signal end of file but don't change playMode
+                             readIndex = -1;
+                             eof = true;
+                             continue;
+                             }
                           // hit begin of recording: wait for device buffers to drain
                           // before changing play mode:
                           if (!DeviceFlush(100))
diff --git a/i18n.c b/i18n.c
index f4760f6ee..feabf70b7 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.252 2006/03/26 09:17:58 kls Exp $
+ * $Id: i18n.c 1.255 2006/04/09 13:04:50 kls Exp $
  *
  * Translations provided by:
  *
@@ -680,7 +680,7 @@ const tI18nPhrase Phrases[] = {
     "Til/Fra",
     "Zap./Vyp.",
   },
-  { "Timer",
+  { "Button$Timer",
     "Timer",
     "",// TODO
     "",// TODO
@@ -2246,6 +2246,28 @@ const tI18nPhrase Phrases[] = {
     "*** Ugyldig kanal! ***",
     "*** Neplatn� kan�l ***",
   },
+  { "Upcoming VPS recording!",
+    "VPS-Aufnahme beginnt in K�rze!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
     "Ni proste DVB naprave za snemanje!",
@@ -4382,6 +4404,72 @@ const tI18nPhrase Phrases[] = {
     "Zap timeout (s)",
     "�asov� limit Zap (s)",
   },
+  { "Setup.Miscellaneous$Initial channel",
+    "Kanal beim Einschalten",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.Miscellaneous$Initial volume",
+    "Lautst�rke beim Einschalten",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.Miscellaneous$as before",
+    "wie vorher",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   // The days of the week:
   { "MTWTFSS",
     "MDMDFSS",
diff --git a/interface.c b/interface.c
index 59147f4bb..9c4aefa9a 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.74 2006/03/25 11:50:55 kls Exp $
+ * $Id: interface.c 1.75 2006/03/31 14:20:04 kls Exp $
  */
 
 #include "interface.h"
@@ -37,7 +37,10 @@ eKeys cInterface::GetKey(bool Wait)
      if (SVDRP->Process())
         Wait = false;
      }
-  return cRemote::Get(Wait ? 1000 : 10);
+  if (!cRemote::IsLearning())
+     return cRemote::Get(Wait ? 1000 : 10);
+  else
+     return kNone;
 }
 
 eKeys cInterface::Wait(int Seconds, bool KeepChar)
diff --git a/menu.c b/menu.c
index f3c9fab9f..fba03a328 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.424 2006/02/28 13:58:00 kls Exp $
+ * $Id: menu.c 1.428 2006/04/09 14:29:24 kls Exp $
  */
 
 #include "menu.h"
@@ -589,7 +589,8 @@ void cMenuText::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetText(text, font == fontFix); //XXX define control character in text to choose the font???
-  cStatus::MsgOsdTextItem(text);
+  if (text)
+     cStatus::MsgOsdTextItem(text);
 }
 
 eOSState cMenuText::ProcessKey(eKeys Key)
@@ -938,7 +939,8 @@ void cMenuEvent::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetEvent(event);
-  cStatus::MsgOsdTextItem(event->Description());
+  if (event->Description())
+     cStatus::MsgOsdTextItem(event->Description());
 }
 
 eOSState cMenuEvent::ProcessKey(eKeys Key)
@@ -1079,6 +1081,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
          }
       }
   currentChannel = CurrentChannelNr;
+  Display();
   SetHelpKeys();
 }
 
@@ -1105,7 +1108,7 @@ void cMenuWhatsOn::SetHelpKeys(void)
         NewHelpKeys = 1;
      }
   if (NewHelpKeys != helpKeys) {
-     const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
+     const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
      SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
      helpKeys = NewHelpKeys;
      }
@@ -1347,7 +1350,7 @@ void cMenuSchedule::SetHelpKeys(void)
         NewHelpKeys = 1;
      }
   if (NewHelpKeys != helpKeys) {
-     const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
+     const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
      SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
      helpKeys = NewHelpKeys;
      }
@@ -1737,7 +1740,8 @@ void cMenuRecording::Display(void)
 {
   cOsdMenu::Display();
   DisplayMenu()->SetRecording(recording);
-  cStatus::MsgOsdTextItem(recording->Info()->Description());
+  if (recording->Info()->Description())
+     cStatus::MsgOsdTextItem(recording->Info()->Description());
 }
 
 eOSState cMenuRecording::ProcessKey(eKeys Key)
@@ -2583,6 +2587,8 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"),            &data.ZapTimeout));
+  Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
 }
 
 // --- cMenuSetupPluginItem --------------------------------------------------
diff --git a/menuitems.c b/menuitems.c
index 34e0dd75f..8d7e50e25 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.34 2006/03/26 09:10:17 kls Exp $
+ * $Id: menuitems.c 1.36 2006/04/09 13:10:02 kls Exp $
  */
 
 #include "menuitems.h"
@@ -45,12 +45,14 @@ void cMenuEditItem::SetValue(const char *Value)
 
 // --- cMenuEditIntItem ------------------------------------------------------
 
-cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max)
+cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max, const char *MinString, const char *MaxString)
 :cMenuEditItem(Name)
 {
   value = Value;
   min = Min;
   max = Max;
+  minString = MinString;
+  maxString = MaxString;
   if (*value < min)
      *value = min;
   else if (*value > max)
@@ -60,9 +62,15 @@ cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Ma
 
 void cMenuEditIntItem::Set(void)
 {
-  char buf[16];
-  snprintf(buf, sizeof(buf), "%d", *value);
-  SetValue(buf);
+  if (minString && *value == min)
+     SetValue(minString);
+  else if (maxString && *value == max)
+     SetValue(maxString);
+  else {
+     char buf[16];
+     snprintf(buf, sizeof(buf), "%d", *value);
+     SetValue(buf);
+     }
 }
 
 eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
@@ -549,18 +557,23 @@ void cMenuEditStraItem::Set(void)
 
 // --- cMenuEditChanItem -----------------------------------------------------
 
-cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value)
-:cMenuEditIntItem(Name, Value, 1, Channels.MaxNumber())
+cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value, const char *NoneString)
+:cMenuEditIntItem(Name, Value, NoneString ? 0 : 1, Channels.MaxNumber())
 {
+  noneString = NoneString;
   Set();
 }
 
 void cMenuEditChanItem::Set(void)
 {
-  char buf[255];
-  cChannel *channel = Channels.GetByNumber(*value);
-  snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
-  SetValue(buf);
+  if (*value > 0) {
+     char buf[255];
+     cChannel *channel = Channels.GetByNumber(*value);
+     snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
+     SetValue(buf);
+     }
+  else
+     SetValue(noneString);
 }
 
 eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
@@ -574,10 +587,11 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
     case kRight:
                  {
                    cChannel *channel = Channels.GetByNumber(*value + delta, delta);
-                   if (channel) {
+                   if (channel)
                       *value = channel->Number();
-                      Set();
-                      }
+                   else if (delta < 0 && noneString)
+                      *value = 0;
+                   Set();
                  }
                  break;
     default: return cMenuEditIntItem::ProcessKey(Key);
@@ -588,11 +602,11 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
 // --- cMenuEditTranItem -----------------------------------------------------
 
 cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value, int *Source)
-:cMenuEditChanItem(Name, Value)
+:cMenuEditChanItem(Name, &number)
 {
   number = 0;
   source = Source;
-  transponder = *Value;
+  transponder = Value;
   cChannel *channel = Channels.First();
   while (channel) {
         if (!channel->GroupSep() && *source == channel->Source() && ISTRANSPONDER(channel->Transponder(), *Value)) {
@@ -601,22 +615,17 @@ cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value, int *Source)
            }
         channel = (cChannel *)channel->Next();
         }
-  *Value = number;
   Set();
-  *Value = transponder;
 }
 
 eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
 {
-  *value = number;
   eOSState state = cMenuEditChanItem::ProcessKey(Key);
-  number = *value;
-  cChannel *channel = Channels.GetByNumber(*value);
+  cChannel *channel = Channels.GetByNumber(number);
   if (channel) {
      *source = channel->Source();
-     transponder = channel->Transponder();
+     *transponder = channel->Transponder();
      }
-  *value = transponder;
   return state;
 }
 
diff --git a/menuitems.h b/menuitems.h
index ac0d7d3c7..20d1ebb00 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.17 2006/02/12 10:22:03 kls Exp $
+ * $Id: menuitems.h 1.19 2006/04/09 12:56:48 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -28,9 +28,10 @@ class cMenuEditIntItem : public cMenuEditItem {
 protected:
   int *value;
   int min, max;
+  const char *minString, *maxString;
   virtual void Set(void);
 public:
-  cMenuEditIntItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX);
+  cMenuEditIntItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX, const char *MinString = NULL, const char *MaxString = NULL);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -110,9 +111,10 @@ class cMenuEditStraItem : public cMenuEditIntItem {
 
 class cMenuEditChanItem : public cMenuEditIntItem {
 protected:
+  const char *noneString;
   virtual void Set(void);
 public:
-  cMenuEditChanItem(const char *Name, int *Value);
+  cMenuEditChanItem(const char *Name, int *Value, const char *NoneString = NULL);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
@@ -120,7 +122,7 @@ class cMenuEditTranItem : public cMenuEditChanItem {
 private:
   int number;
   int *source;
-  int transponder;
+  int *transponder;
 public:
   cMenuEditTranItem(const char *Name, int *Value, int *Source);
   virtual eOSState ProcessKey(eKeys Key);
diff --git a/pat.c b/pat.c
index a7216b8cb..f898c70d7 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.15 2006/01/27 15:48:29 kls Exp $
+ * $Id: pat.c 1.16 2006/03/31 12:39:34 kls Exp $
  */
 
 #include "pat.h"
@@ -232,6 +232,7 @@ cPatFilter::cPatFilter(void)
 {
   pmtIndex = 0;
   pmtPid = 0;
+  pmtSid = 0;
   lastPmtScan = 0;
   numPmtEntries = 0;
   Set(0x00, 0x00);  // PAT
@@ -242,6 +243,7 @@ void cPatFilter::SetStatus(bool On)
   cFilter::SetStatus(On);
   pmtIndex = 0;
   pmtPid = 0;
+  pmtSid = 0;
   lastPmtScan = 0;
   numPmtEntries = 0;
 }
@@ -289,6 +291,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                if (!assoc.isNITPid()) {
                   if (Index++ >= pmtIndex && Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId())) {
                      pmtPid = assoc.getPid();
+                     pmtSid = assoc.getServiceId();
                      Add(pmtPid, 0x02);
                      break;
                      }
@@ -303,6 +306,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      SI::PMT pmt(Data, false);
      if (!pmt.CheckCRCAndParse())
         return;
+     if (pmt.getServiceId() != pmtSid)
+        return; // skip broken PMT records
      if (!PmtVersionChanged(pmtPid, pmt.getTableIdExtension(), pmt.getVersionNumber())) {
         lastPmtScan = 0; // this triggers the next scan
         return;
diff --git a/pat.h b/pat.h
index 6246cc0c9..88b2115b3 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 1.5 2006/03/26 14:09:43 kls Exp $
+ * $Id: pat.h 1.6 2006/03/29 15:18:38 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -20,6 +20,7 @@ class cPatFilter : public cFilter {
   time_t lastPmtScan;
   int pmtIndex;
   int pmtPid;
+  int pmtSid;
   uint64_t pmtVersion[MAXPMTENTRIES];
   int numPmtEntries;
   bool PmtVersionChanged(int PmtPid, int Sid, int Version);
diff --git a/plugin.c b/plugin.c
index 6ceb561b7..69d558cf0 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.17 2006/02/28 14:16:54 kls Exp $
+ * $Id: plugin.c 1.18 2006/04/09 14:16:17 kls Exp $
  */
 
 #include "plugin.h"
@@ -232,7 +232,7 @@ bool cDll::Load(bool Log)
         if (argc)
            plugin->SetName(argv[0]);
         optind = 0; // to reset the getopt() data
-        return !argc || plugin->ProcessArgs(argc, argv);
+        return !Log || !argc || plugin->ProcessArgs(argc, argv);
         }
      }
   else {
diff --git a/recording.c b/recording.c
index 379627c00..fa21df213 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.143 2006/03/26 09:11:00 kls Exp $
+ * $Id: recording.c 1.144 2006/04/09 13:49:51 kls Exp $
  */
 
 #include "recording.h"
@@ -1368,6 +1368,11 @@ int cIndexFile::Get(uchar FileNumber, int FileOffset)
   return -1;
 }
 
+bool cIndexFile::IsStillRecording()
+{
+  return f >= 0;
+}
+
 // --- cFileName -------------------------------------------------------------
 
 #include <errno.h>
diff --git a/recording.h b/recording.h
index f0c3c0e59..286568550 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.53 2006/02/25 12:24:46 kls Exp $
+ * $Id: recording.h 1.54 2006/04/09 13:47:11 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -210,6 +210,7 @@ class cIndexFile {
   int Last(void) { CatchUp(); return last; }
   int GetResume(void) { return resumeFile.Read(); }
   bool StoreResume(int Index) { return resumeFile.Save(Index); }
+  bool IsStillRecording(void);
   };
 
 class cFileName {
diff --git a/remote.h b/remote.h
index 0213b0cff..ce6055ffe 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.33 2006/01/29 12:27:08 kls Exp $
+ * $Id: remote.h 1.34 2006/03/31 14:18:44 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -42,6 +42,7 @@ class cRemote : public cListObject {
   virtual bool Initialize(void);
   const char *Name(void) { return name; }
   static void SetLearning(cRemote *Learning) { learning = Learning; }
+  static bool IsLearning() { return learning != NULL; }
   static void Clear(void);
   static bool Put(eKeys Key, bool AtFront = false);
   static bool PutMacro(eKeys Key);
diff --git a/skinclassic.c b/skinclassic.c
index f471b3031..0bc96b056 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.14 2006/02/05 14:51:39 kls Exp $
+ * $Id: skinclassic.c 1.15 2006/03/31 13:59:50 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -517,7 +517,7 @@ void cSkinClassicDisplayVolume::SetVolume(int Current, int Total, bool Mute)
   const cFont *font = cFont::GetFont(fontOsd);
   if (Mute) {
      osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, clrTransparent);
-     osd->DrawText(0, 0, tr("Mute"), Theme.Color(clrVolumePrompt), Theme.Color(clrBackground), font);
+     osd->DrawText(0, 0, tr("Key$Mute"), Theme.Color(clrVolumePrompt), Theme.Color(clrBackground), font);
      }
   else {
      const char *Prompt = tr("Volume ");
diff --git a/skins.c b/skins.c
index 0952b118f..736d7dad9 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.8 2006/02/05 14:53:04 kls Exp $
+ * $Id: skins.c 1.9 2006/04/09 11:25:30 kls Exp $
  */
 
 #include "skins.h"
@@ -255,7 +255,16 @@ int cSkins::QueueMessage(eMessageType Type, const char *s, int Seconds, int Time
      return kNone;
      }
   if (isempty(s)) {
-     dsyslog("cSkins::QueueMessage() called with empty message - ignored!");
+     if (!cThread::IsMainThread()) {
+        queueMessageMutex.Lock();
+        for (cSkinQueuedMessage *m = SkinQueuedMessages.Last(); m; m = SkinQueuedMessages.Prev(m)) {
+            if (m->threadId == cThread::ThreadId() && m->state == 0)
+               m->state = 2; // done
+            }
+        queueMessageMutex.Unlock();
+        }
+     else
+        dsyslog("cSkins::QueueMessage() called with empty message from main thread - ignored!");
      return kNone;
      }
   int k = kNone;
diff --git a/skins.h b/skins.h
index 96f28219d..225fbc22a 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.11 2006/02/05 14:59:57 kls Exp $
+ * $Id: skins.h 1.13 2006/04/09 11:23:35 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -329,7 +329,7 @@ class cSkins : public cList<cSkin> {
        ///< temporary cSkinDisplayMessage object.
        ///< The return value is the key pressed by the user. If no user input
        ///< has been received within Seconds (the default value of 0 results
-       ///< in the ///< value defined for "Message time" in the setup), kNone
+       ///< in the value defined for "Message time" in the setup), kNone
        ///< will be returned.
   int QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
        ///< Like Message(), but this function may be called from a background
@@ -353,7 +353,9 @@ class cSkins : public cList<cSkin> {
        ///< progress displays, where only the most recent message is actually
        ///< important.
        ///< Type may only be mtInfo, mtWarning or mtError. A call with mtStatus
-       ///< will be ignored, as will be one with an empty message.
+       ///< will be ignored. A call with an empty message from a background thread
+       ///< removes all queued messages from the calling thread. A call with
+       ///< an empty message from the main thread will be ignored.
   void ProcessQueuedMessages(void);
        ///< Processes the first queued message, if any.
   void Flush(void);
diff --git a/sources.conf b/sources.conf
index e770496a7..09ee0a413 100644
--- a/sources.conf
+++ b/sources.conf
@@ -165,7 +165,7 @@ S103W   AMC1
 S105W   AMC15
 S107.3W Anik F1/F1R
 S110W   DirecTV 5 & Echostar 6/8
-A111.1W Anik F2
+S111.1W Anik F2
 S113W   Solidaridad 2
 S119W   Echostar 7 & DirecTV 7S
 S121W   Echostar 9 & Intelsat Americas 13
diff --git a/timers.c b/timers.c
index 0e764d345..f620735fa 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.55 2006/03/26 14:08:57 kls Exp $
+ * $Id: timers.c 1.57 2006/04/09 09:10:08 kls Exp $
  */
 
 #include "timers.h"
@@ -330,7 +330,7 @@ char *cTimer::SetFile(const char *File)
   return file;
 }
 
-bool cTimer::Matches(time_t t, bool Directly) const
+bool cTimer::Matches(time_t t, bool Directly, int Margin) const
 {
   startTime = stopTime = 0;
   if (t == 0)
@@ -370,7 +370,7 @@ bool cTimer::Matches(time_t t, bool Directly) const
         stopTime = event->EndTime();
         return event->IsRunning(true);
         }
-     return startTime <= t && t < stopTime; // must stop *before* stopTime to allow adjacent timers
+     return startTime <= t + Margin && t < stopTime; // must stop *before* stopTime to allow adjacent timers
      }
   return false;
 }
@@ -401,7 +401,9 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
      startTime = stopTime = 0;
      if (Overlap)
         *Overlap = overlap;
-     return overlap >= 1000 ? tmFull : overlap > 0 ? tmPartial : tmNone;
+     if (UseVps)
+        return overlap > FULLMATCH ? tmFull : tmNone;
+     return overlap >= FULLMATCH ? tmFull : overlap > 0 ? tmPartial : tmNone;
      }
   return tmNone;
 }
@@ -435,8 +437,6 @@ time_t cTimer::StopTime(void) const
 
 #define EPGLIMITBEFORE   (1 * 3600) // Time in seconds before a timer's start time and
 #define EPGLIMITAFTER    (1 * 3600) // after its stop time within which EPG events will be taken into consideration.
-#define VPSLIMITBEFORE   (2 * 3600) // Same for VPS timers, which need to
-#define VPSLIMITAFTER   (24 * 3600) // look further into the future to catch shifted broadcasts.
 
 void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
 {
@@ -447,51 +447,51 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
         return;
      }
   const cSchedule *Schedule = Schedules->GetSchedule(Channel());
-  if (Schedule) {
+  if (Schedule && Schedule->Events()->First()) {
      time_t now = time(NULL);
      if (!lastSetEvent || Schedule->Modified() >= lastSetEvent) {
+        lastSetEvent = now;
         const cEvent *Event = NULL;
-        int Overlap = 0;
-        int Distance = INT_MIN;
-        bool UseVps = HasFlags(tfVps);
-        const cEvent *PresentEvent = UseVps ? Schedule->GetPresentEvent() : NULL;
-        const cEvent *FollowingEvent = UseVps ? Schedule->GetFollowingEvent() : NULL;
-        // Set up the time frame within which to check events:
-        Matches(0, true);
-        time_t TimeFrameBegin = StartTime() - (UseVps ? VPSLIMITBEFORE : EPGLIMITBEFORE);
-        time_t TimeFrameEnd   = StopTime()  + (UseVps ? VPSLIMITAFTER  : EPGLIMITAFTER);
-        for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
-            if (!UseVps || e != event && e != PresentEvent && e != FollowingEvent) { // always check these if this is a VPS timer
+        if (HasFlags(tfVps) && Schedule->Events()->First()->Vps()) {
+           if (event && Recording())
+              return; // let the recording end first
+           // VPS timers only match if their start time exactly matches the event's VPS time:
+           for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
+               if (e->StartTime() && e->RunningStatus() != SI::RunningStatusNotRunning) { // skip outdated events
+                  int overlap = 0;
+                  Matches(e, &overlap);
+                  if (overlap > FULLMATCH) {
+                     Event = e;
+                     break; // take the first matching event
+                     }
+                  }
+               }
+           if (!Event && event && (now <= event->EndTime() || Matches(0, true)))
+              return; // stay with the old event until the timer has completely expired
+           }
+        else {
+           // Normal timers match the event they have the most overlap with:
+           int Overlap = 0;
+           // Set up the time frame within which to check events:
+           Matches(0, true);
+           time_t TimeFrameBegin = StartTime() - EPGLIMITBEFORE;
+           time_t TimeFrameEnd   = StopTime()  + EPGLIMITAFTER;
+           for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
                if (e->EndTime() < TimeFrameBegin)
                   continue; // skip events way before the timer starts
                if (e->StartTime() > TimeFrameEnd)
                   break; // the rest is way after the timer ends
-               }
-            int overlap = 0;
-            Matches(e, &overlap);
-            if (overlap && overlap >= Overlap) {
-               int distance = 0;
-               if (now < e->StartTime())
-                  distance = e->StartTime() - now;
-               else if (now > e->EndTime())
-                  distance = e->EndTime() - now;
-               if (Event && overlap == Overlap) {
-                  if (Overlap > FULLMATCH) { // this means VPS
-                     if (abs(Distance) < abs(distance))
-                        break; // we've already found the closest VPS event
-                     }
-                  else if (e->Duration() <= Event->Duration())
+               int overlap = 0;
+               Matches(e, &overlap);
+               if (overlap && overlap >= Overlap) {
+                  if (Event && overlap == Overlap && e->Duration() <= Event->Duration())
                      continue; // if overlap is the same, we take the longer event
+                  Overlap = overlap;
+                  Event = e;
                   }
-               Overlap = overlap;
-               Distance = distance;
-               Event = e;
                }
-            }
-        if (Event && Event->EndTime() < now - EXPIRELATENCY && Overlap > FULLMATCH && !Event->IsRunning())
-           Event = NULL;
+           }
         SetEvent(Event);
-        lastSetEvent = now;
         }
      }
 }
diff --git a/timers.h b/timers.h
index da7a5f810..8abc5238e 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.27 2006/03/26 10:44:01 kls Exp $
+ * $Id: timers.h 1.28 2006/04/08 12:41:44 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -73,7 +73,7 @@ class cTimer : public cListObject {
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
   char *SetFile(const char *File);
-  bool Matches(time_t t = 0, bool Directly = false) const;
+  bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
   int Matches(const cEvent *Event, int *Overlap = NULL) const;
   bool Expired(void) const;
   time_t StartTime(void) const;
diff --git a/vdr.c b/vdr.c
index 7ff749bff..8d9ab54a6 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.251 2006/03/26 09:16:53 kls Exp $
+ * $Id: vdr.c 1.254 2006/04/09 12:22:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -72,6 +72,8 @@
 #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
 #define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
 #define SHUTDOWNRETRY     300 // seconds before trying again to shut down
+#define VPSCHECKDELTA      10 // seconds between checks for timers that have entered the VPS margin
+#define VPSDEVICETIMEOUT    8 // seconds before a device used for VPS may be reused
 
 #define EXIT(v) { ExitCode = (v); goto Exit; }
 
@@ -630,6 +632,10 @@ int main(int argc, char *argv[])
 
   if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
      dsyslog("not all devices ready after %d seconds", DEVICEREADYTIMEOUT);
+  if (Setup.InitialChannel > 0)
+     Setup.CurrentChannel = Setup.InitialChannel;
+  if (Setup.InitialVolume >= 0)
+     Setup.CurrentVolume = Setup.InitialVolume;
   Channels.SwitchTo(Setup.CurrentChannel);
   if (MuteAudio)
      cDevice::PrimaryDevice()->ToggleMute();
@@ -736,8 +742,6 @@ int main(int argc, char *argv[])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
-           // Delete expired timers:
-           Timers.DeleteExpired();
            // Assign events to timers:
            Timers.SetEvents();
            // Must do all following calls with the exact same time!
@@ -753,21 +757,63 @@ int main(int argc, char *argv[])
                  LastTimerChannel = Timer->Channel()->Number();
               }
            // Make sure VPS timers "see" their channel early enough:
-           TimerInVpsMargin = false;
-           for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
-               if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording() && !Timer->Pending() && Timer->Matches(Now + Setup.VpsMargin, true)) {
-                  if (!Timer->InVpsMargin()) {
+           static time_t LastVpsCheck = 0;
+           if (Now - LastVpsCheck > VPSCHECKDELTA) { // don't do this too often
+              TimerInVpsMargin = false;
+              static time_t DeviceUsed[MAXDEVICES] = { 0 };
+              for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+                  if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording() && Timer->Matches(Now, true, Setup.VpsMargin)) {
                      Timer->SetInVpsMargin(true);
-                     //XXX if not primary device has TP???
-                     LastTimerChannel = Timer->Channel()->Number();
-                     cRecordControls::Start(Timer); // will only switch the device
+                     // Find a device that provides the required transponder:
+                     cDevice *Device = NULL;
+                     for (int i = 0; i < cDevice::NumDevices(); i++) {
+                         cDevice *d = cDevice::GetDevice(i);
+                         if (d && d->ProvidesTransponder(Timer->Channel())) {
+                            if (d->IsTunedToTransponder(Timer->Channel())) {
+                               // if any device is tuned to the transponder, we're done
+                               Device = d;
+                               break;
+                               }
+                            else if (Now - DeviceUsed[d->DeviceNumber()] > VPSDEVICETIMEOUT) {
+                               // only check other devices if they have been left alone for a while
+                               if (d->MaySwitchTransponder())
+                                  // this one can be switched without disturbing anything else
+                                  Device = d;
+                               else if (!Device && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
+                                  // use this one only if no other with less impact can be found
+                                  Device = d;
+                               }
+                            }
+                         }
+                     if (!Device) {
+                        cDevice *d = cDevice::ActualDevice();
+                        if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && Now - DeviceUsed[d->DeviceNumber()] > VPSDEVICETIMEOUT)
+                           Device = d; // use the actual device as a last resort
+                        }
+                     // Switch the device to the transponder:
+                     if (Device) {
+                        if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
+                           cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
+                        if (!Device->IsTunedToTransponder(Timer->Channel())) {
+                           dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
+                           Device->SwitchChannel(Timer->Channel(), false);
+                           DeviceUsed[Device->DeviceNumber()] = Now;
+                           }
+                        if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
+                           // the previous SwitchChannel() has switched away the current live channel
+                           Channels.SwitchTo(Timer->Channel()->Number()); // avoids toggling between old channel and black screen
+                           Skins.Message(mtInfo, tr("Upcoming VPS recording!"));
+                           }
+                        }
+                     TimerInVpsMargin = true;
                      }
+                  else
+                     Timer->SetInVpsMargin(false);
                   }
-               else
-                  Timer->SetInVpsMargin(false);
-               if (Timer->InVpsMargin())
-                  TimerInVpsMargin = true;
-               }
+              LastVpsCheck = time(NULL);
+              }
+           // Delete expired timers:
+           Timers.DeleteExpired();
            }
         if (!Menu && Recordings.NeedsUpdate()) {
            Recordings.Update();

From 293ed4027ed3c3c8fd6ef1e8bdd79bfe69193957 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 17 Apr 2006 18:00:00 +0200
Subject: [PATCH 139/307] =?UTF-8?q?Version=201.3.47=20-=20Updated=20the=20?=
 =?UTF-8?q?Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-?=
 =?UTF-8?q?=20Fixed=20a=20crash=20when=20setting=20the=20time=20transponde?=
 =?UTF-8?q?r=20in=20the=20Setup=20menu,=20caused=20by=20the=20=20=20new=20?=
 =?UTF-8?q?'noneString'=20in=20cMenuEditChanItem=20(reported=20by=20Thomas?=
 =?UTF-8?q?=20G=C3=BCnther).=20-=20Added=20NULL=20checks=20to=20some=20str?=
 =?UTF-8?q?dup()=20calls=20in=20menuitems.c=20(suggested=20by=20Darren=20?=
 =?UTF-8?q?=20=20Salt).=20-=20Removed=20the=20unnecessary=20'value'=20memb?=
 =?UTF-8?q?er=20from=20cMenuEditItem.=20-=20Fixed=20the=20initial=20settin?=
 =?UTF-8?q?g=20of=20the=20time=20transponder=20setup=20parameter=20(report?=
 =?UTF-8?q?ed=20=20=20by=20Thomas=20G=C3=BCnther).=20-=20Fixed=20unnecessa?=
 =?UTF-8?q?ry=20Set()=20calls=20in=20cMenuEditIntItem::ProcessKey().=20-?=
 =?UTF-8?q?=20Allowing=20a=20tolerance=20for=20symbol=20rate=20values=20th?=
 =?UTF-8?q?at=20are=20off=20by=20one=20(thanks=20to=20=20=20Richard=20Lith?=
 =?UTF-8?q?vall).=20-=20Added=20VBITeletextDescriptorTag,=20TeletextDescri?=
 =?UTF-8?q?ptorTag,=20LocalTimeOffsetDescriptorTag=20=20=20and=20PremiereC?=
 =?UTF-8?q?ontentTransmissionDescriptor=20to=20'libsi'=20(thanks=20to=20Ma?=
 =?UTF-8?q?rco=20Schl=C3=BC=C3=9Fler).=20-=20Using=20geteuid()=20to=20chec?=
 =?UTF-8?q?k=20whether=20VDR=20is=20running=20as=20user=20'root'=20(sugges?=
 =?UTF-8?q?ted=20by=20=20=20Tobias=20Grimm).=20-=20Added=20a=20missing=20"?=
 =?UTF-8?q?Key$"=20in=20skincurses.c=20(reported=20by=20Darren=20Salt).=20?=
 =?UTF-8?q?-=20Reintroduced=20the=20log=20message=20"deleting=20plugin:=20?=
 =?UTF-8?q?..."=20when=20shutting=20down=20VDR=20(upon=20=20=20request=20b?=
 =?UTF-8?q?y=20Ville=20Skytt=C3=A4,=20as=20in=20the=20initial=20patch=20fr?=
 =?UTF-8?q?om=20Christoph=20Haubrich).=20-=20Fixed=20the=20vdr.1=20man=20p?=
 =?UTF-8?q?age=20(a=20single=20DVB=20card=20can=20record=20and=20do=20live?=
 =?UTF-8?q?=20tv).=20-=20The=20preferred=20audio=20language=20is=20now=20a?=
 =?UTF-8?q?utomatically=20selected=20when=20starting=20replay.=20-=20Updat?=
 =?UTF-8?q?ed=20the=20Danish=20OSD=20texts=20(thanks=20to=20Mogens=20Elnef?=
 =?UTF-8?q?f).=20-=20The=20new=20function=20cPlugin::Active()=20can=20be?=
 =?UTF-8?q?=20used=20by=20a=20plugin=20to=20indicate=20that=20it=20=20=20i?=
 =?UTF-8?q?s=20still=20busy=20and=20the=20system=20should=20not=20shut=20d?=
 =?UTF-8?q?own=20or=20restart=20(based=20on=20a=20patch=20=20=20from=20Sas?=
 =?UTF-8?q?cha=20Volkenandt).=20See=20PLUGINS.html=20for=20details.=20-=20?=
 =?UTF-8?q?Fixed=20setting=20the=20'Delta'=20parameter=20when=20calling=20?=
 =?UTF-8?q?the=20shutdown=20script=20with=20=20=20no=20active=20timer=20(r?=
 =?UTF-8?q?eported=20by=20Helge=20Lenz).=20-=20In=20order=20to=20make=20su?=
 =?UTF-8?q?re=20that=20plugins=20are=20compiled=20with=20the=20same=20DVB?=
 =?UTF-8?q?=20driver=20header=20=20=20files=20as=20VDR=20itself,=20the=20d?=
 =?UTF-8?q?efinition=20of=20DVBDIR=20has=20been=20removed=20from=20the=20V?=
 =?UTF-8?q?DR=20=20=20Makefile.=20If=20you=20are=20using=20a=20driver=20ve?=
 =?UTF-8?q?rsion=20that=20has=20its=20header=20files=20at=20a=20location?=
 =?UTF-8?q?=20=20=20other=20than=20/usr/include/linux/dvb,=20you=20can=20d?=
 =?UTF-8?q?efine=20DVBDIR=20in=20the=20Make.config=20=20=20file=20(see=20a?=
 =?UTF-8?q?lso=20INSTALL).=20Note=20that=20if=20you=20already=20have=20a?=
 =?UTF-8?q?=20Make.config=20file=20of=20your=20=20=20own,=20you=20should?=
 =?UTF-8?q?=20add=20the=20lines?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  ifdef DVBDIR
  INCLUDES += -I$(DVBDIR)/include
  endif

  to its end, as in the new Make.config.template.
  Any reference to DVBDIR should be removed from all plugins' Makefiles, like this:

  ------------------------------------------------------------
  --- PLUGINS/src/hello/Makefile  2005/11/11 13:20:14     1.10
  +++ PLUGINS/src/hello/Makefile  2006/04/15 11:58:46     1.11
  @@ -20,7 +20,6 @@

   ### The directory environment:

  -DVBDIR = ../../../../DVB
   VDRDIR = ../../..
   LIBDIR = ../../lib
   TMPDIR = /tmp
  @@ -40,7 +39,7 @@

   ### Includes and Defines (add further entries here):

  -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
  +INCLUDES += -I$(VDRDIR)/include

   DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  ------------------------------------------------------------

  Thanks to Marco Schlüßler for pointing out this problem.
- Implemented kNext and kPrev keys (based on a patch from Peter Juszack).
  See MANUAL for details.
- Implemented kChanPrev (from a patch from Darren Salt).
- The "Update channels" parameter in the "Setup/DVB" menu has been extended to
  allow updating only the PIDs (see MANUAL for details). When updating to this
  version of VDR, please verify that the setting is as you want it to be, because
  the values have been shifted.
- The new APIVERSION (see config.h) now allows existing compiled plugins to be
  used with newer versions of VDR, as long as there have been no changes to the
  VDR header files since the last APIVERSION. Existing plugins' Makefiles should
  have all references to VDRVERSION changed to APIVERSION, like this:

  ------------------------------------------------------------
  --- PLUGINS/src/hello/Makefile  2006/04/15 11:58:46     1.11
  +++ PLUGINS/src/hello/Makefile  2006/04/16 09:03:50     1.12
  @@ -28,9 +28,9 @@

   -include $(VDRDIR)/Make.config

  -### The version number of VDR (taken from VDR's "config.h"):
  +### The version number of VDR's plugin API (taken from VDR's "config.h"):

  -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
  +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)

   ### The name of the distribution archive:

  @@ -67,7 +67,7 @@

   libvdr-$(PLUGIN).so: $(OBJS)
          $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
  -       @cp $@ $(LIBDIR)/$@.$(VDRVERSION)
  +       @cp $@ $(LIBDIR)/$@.$(APIVERSION)

   dist: clean
          @-rm -rf $(TMPDIR)/$(ARCHIVE)
  ------------------------------------------------------------
- If a timer is newly created from within the "Schedule" menu, and its event is
  already running or has its start time within the next two minutes, it now goes
  directly into the "Edit timer" menu in order to allow the user to make further
  changes to timer parameters before the actual recording starts (inspired by
  Christian Wieninger's "epgsearch" plugin).
- Added format check to syslog_with_tid().
- Updated the INSTALL file's section about non-VDR files in the video directory
  (since version 1.3.38 disk access is done in a separate thread, so the watchdog
  timer won't hit).
- Changed the behaviour of the "Use small font" setup option to *always* use the small
  font if set to '2' - even if it would have been a fixed font (suggested by Ronny
  Kornexl).
- No longer using characters 0x01 and 0x02 for mapping single quote and slash in
  recording names (thanks to Patrick Fischer for reporting that this was a problem
  with XML). The single quote is not mapped at all, and the slash is interchanged
  with the tilde. Existing recordings will be handled like before, so there is
  no need to actually rename them.
- The cRemote::CallPlugin() function now has a boolean return value that tells
  the caller whether initiating the plugin call was successful (suggested by
  Reinhard Nissl). If it returns false, another plugin call is currently pending
  and the caller should try again later. This also means that the SVDRP command
  PLUG can now return an error code is the call fails.
- The new function cPlugin::MainThreadHook() can be used by plugins to perform
  actions in the context of the main program thread. Use this function with great
  care and only of you absolutely have to! See also PLUGINS.html.
---
 CONTRIBUTORS                        |  34 ++-
 HISTORY                             | 120 ++++++++++
 INSTALL                             |  19 +-
 MANUAL                              |  16 +-
 Make.config.template                |  10 +-
 Makefile                            |  21 +-
 PLUGINS.html                        | 101 +++++++--
 PLUGINS/src/hello/Makefile          |  11 +-
 PLUGINS/src/osddemo/Makefile        |  11 +-
 PLUGINS/src/servicedemo/Makefile    |  13 +-
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/Makefile     |  11 +-
 PLUGINS/src/skincurses/skincurses.c |   6 +-
 PLUGINS/src/sky/Makefile            |  11 +-
 PLUGINS/src/status/Makefile         |  11 +-
 PLUGINS/src/svdrpdemo/Makefile      |  11 +-
 UPDATE-1.4.0                        | 334 ++++++++++++++++++++++++++++
 channels.c                          |   5 +-
 channels.conf                       |  16 +-
 config.c                            |   6 +-
 config.h                            |  19 +-
 device.c                            |  13 +-
 device.h                            |   8 +-
 dvbplayer.c                         |   4 +-
 dvbspu.c                            |   8 +-
 dvbspu.h                            |  10 +-
 eit.c                               |   6 +-
 epg.c                               |   4 +-
 epg2html.pl                         |   3 +-
 font.c                              |   4 +-
 i18n.c                              | 128 ++++++++++-
 keys.c                              |   5 +-
 keys.h                              |   5 +-
 libsi/descriptor.c                  | 125 ++++++++++-
 libsi/descriptor.h                  |  90 +++++++-
 libsi/headers.h                     | 101 ++++++++-
 libsi/section.c                     |  18 +-
 libsi/section.h                     |  17 +-
 libsi/si.c                          |  41 +++-
 libsi/si.h                          |  15 +-
 menu.c                              |  41 +++-
 menuitems.c                         |  24 +-
 menuitems.h                         |   3 +-
 newplugin                           |  25 ++-
 nit.c                               |  14 +-
 plugin.c                            |  50 ++++-
 plugin.h                            |   8 +-
 recording.c                         |   7 +-
 remote.c                            |  21 +-
 remote.h                            |  15 +-
 remux.c                             |   4 +-
 sdt.c                               |   8 +-
 sources.conf                        |   8 +-
 spu.c                               |   4 +-
 spu.h                               |   4 +-
 summary2info.pl                     |   4 +-
 svdrp.c                             |   8 +-
 svdrphosts.conf                     |   2 +-
 tools.c                             |   4 +-
 tools.h                             |   4 +-
 vdr.1                               |  14 +-
 vdr.c                               |  23 +-
 62 files changed, 1432 insertions(+), 258 deletions(-)
 create mode 100644 UPDATE-1.4.0

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 735e81656..61baad09b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1077,6 +1077,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for speeding up cRemux::ScanVideoPacket()
  for implementing cDevice::ForceTransferMode()
  for changing the behaviour when hitting the end of a recording in fast forward mode
+ for suggesting to give the cRemote::CallPlugin() function a boolean return value
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1336,6 +1337,10 @@ Marco Schl
  for improving OSD area handling in cDvbSpuDecoder
  for suggesting to log the description (if present) in case a thread is canceled
  for fixing handling DPID when deciding whether to switch to 'Transfer Mode'
+ for adding VBITeletextDescriptorTag, TeletextDescriptorTag, LocalTimeOffsetDescriptorTag
+ and PremiereContentTransmissionDescriptor to 'libsi'
+ for pointing out that plugins might be compiled with different DVB driver header
+ files than VDR itself
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1472,6 +1477,9 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
  it won't follow symbolic links, and to canonicalize the file name
  for making all font and image data 'const'
  for fixing format string handling
+ for suggesting to add NULL checks to some strdup() calls in menuitems.c
+ for reporting a missing "Key$" in skincurses.c
+ for a patch that was used to implement kChanPrev
 
 Sean Carlos <seanc@libero.it>
  for translating OSD texts to the Italian language
@@ -1624,6 +1632,8 @@ Thomas G
  can use it
  for fixing converting arbitrarily formatted summary.vdr files
  for making the 'new' indicator in the Recordings menu kept up-to-date
+ for reporting a crash when setting the time transponder in the Setup menu
+ for reporting a bug in the initial setting of the time transponder setup parameter
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -1676,6 +1686,8 @@ Patrick Fischer <patrick_fischer@gmx.de>
  for suggesting that the cTimer constructor should take an optional cChannel
  for suggesting that any cReceivers still attached to a cDevice when that device
  switches to a different transponder shall be automatically detached
+ for reporting that characters 0x01 and 0x02 in recording names were a problem
+ with XML
 
 Ralf M�ller <ralf@bj-ig.de>
  for a patch that was used to implement cUnbufferedFile
@@ -1713,6 +1725,8 @@ J
 
 Christian Wieninger <cwieninger@gmx.de>
  for suggesting to add cMenuEditStrItem::InEditMode()
+ for his idea of going directly into the "Edit timer" menu for a timer created
+ from the "Schedule" menu in case it starts withing the next two minutes
 
 Thiemo Gehrke <tgehrke@reel-multimedia.com>
  for suggesting to add a setup option to turn off the automatic timeout of the
@@ -1772,7 +1786,7 @@ Jaroslaw Swierczynski <swiergot@gmail.com>
 
 Alexander Hans <cleditor@arcor.de>
  for reporting a crash when pressing '0' in the "Schedule" menu on a channel that
- doesn't have any EPG data 
+ doesn't have any EPG data
  for giving the DrawBitmap() function a new parameter 'Overlay' that allows a bitmap
  to be drawn with a transparent background
 
@@ -1785,6 +1799,8 @@ Suur Karu <suurkaru@fastmail.fm>
 
 Ronny Kornexl <ronny.kornexl@online.de>
  for reporting a problem with setting "No title" for broken event data
+ for suggesting to make the "Use small font" setup option *always* use the small
+ font if set to '3' - even if it would have been a fixed font
 
 B�rta Vladim�r <vladimir.barta@k2atmitec.cz>
  for translating OSD texts to the Czech language
@@ -1815,3 +1831,19 @@ Marius Heidenstecker <marius@heidenstecker.de>
 
 Jurij Retzlaff <jurij@topofweb.de>
  for fixing learning keys when VDR is already running
+
+Richard Lithvall <richard@lithvall.se>
+ for adding a tolerance for symbol rate values that are off by one
+
+Tobias Grimm <listaccount@e-tobi.net>
+ for suggesting to use geteuid() to check whether VDR is running as user 'root'
+
+Peter Dittmann <peter.dittmann@philips.com>
+ for a patch that was used as a base to implement cPlugin::Active()
+
+Helge Lenz <h.lenz@gmx.de>
+ for reporting a bug in setting the 'Delta' parameter when calling the shutdown
+ script with no active timer
+
+Peter Juszack <vdr@unterbrecher.de>
+ for a patch that was used as a base to implement kNext and kPrev
diff --git a/HISTORY b/HISTORY
index 7dabc45de..e1e01ae93 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4499,3 +4499,123 @@ Video Disk Recorder Revision History
   --version option, to avoid error messages from plugins (reported by Udo Richter).
 - Now checking whether there is any text before calling cStatus::MsgOsdTextItem()
   (reported by Joachim Wilke).
+
+2006-04-17: Version 1.3.47
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed a crash when setting the time transponder in the Setup menu, caused by the
+  new 'noneString' in cMenuEditChanItem (reported by Thomas G�nther).
+- Added NULL checks to some strdup() calls in menuitems.c (suggested by Darren
+  Salt).
+- Removed the unnecessary 'value' member from cMenuEditItem.
+- Fixed the initial setting of the time transponder setup parameter (reported
+  by Thomas G�nther).
+- Fixed unnecessary Set() calls in cMenuEditIntItem::ProcessKey().
+- Allowing a tolerance for symbol rate values that are off by one (thanks to
+  Richard Lithvall).
+- Added VBITeletextDescriptorTag, TeletextDescriptorTag, LocalTimeOffsetDescriptorTag
+  and PremiereContentTransmissionDescriptor to 'libsi' (thanks to Marco Schl��ler).
+- Using geteuid() to check whether VDR is running as user 'root' (suggested by
+  Tobias Grimm).
+- Added a missing "Key$" in skincurses.c (reported by Darren Salt).
+- Reintroduced the log message "deleting plugin: ..." when shutting down VDR (upon
+  request by Ville Skytt�, as in the initial patch from Christoph Haubrich).
+- Fixed the vdr.1 man page (a single DVB card can record and do live tv).
+- The preferred audio language is now automatically selected when starting replay.
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- The new function cPlugin::Active() can be used by a plugin to indicate that it
+  is still busy and the system should not shut down or restart (based on a patch
+  from Peter Dittmann). See PLUGINS.html for details.
+- Fixed setting the 'Delta' parameter when calling the shutdown script with
+  no active timer (reported by Helge Lenz).
+- In order to make sure that plugins are compiled with the same DVB driver header
+  files as VDR itself, the definition of DVBDIR has been removed from the VDR
+  Makefile. If you are using a driver version that has its header files at a location
+  other than /usr/include/linux/dvb, you can define DVBDIR in the Make.config
+  file (see also INSTALL). Any reference to DVBDIR should be removed from all
+  plugins' Makefiles, like this:
+
+  ------------------------------------------------------------
+  --- PLUGINS/src/hello/Makefile  2005/11/11 13:20:14     1.10
+  +++ PLUGINS/src/hello/Makefile  2006/04/15 11:58:46     1.11
+  @@ -20,7 +20,6 @@
+
+   ### The directory environment:
+
+  -DVBDIR = ../../../../DVB
+   VDRDIR = ../../..
+   LIBDIR = ../../lib
+   TMPDIR = /tmp
+  @@ -40,7 +39,7 @@
+
+   ### Includes and Defines (add further entries here):
+
+  -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+  +INCLUDES += -I$(VDRDIR)/include
+
+   DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+  ------------------------------------------------------------
+
+  Thanks to Marco Schl��ler for pointing out this problem.
+- Implemented kNext and kPrev keys (based on a patch from Peter Juszack).
+  See MANUAL for details.
+- Implemented kChanPrev (from a patch from Darren Salt).
+- The "Update channels" parameter in the "Setup/DVB" menu has been extended to
+  allow updating only the PIDs (see MANUAL for details). When updating to this
+  version of VDR, please verify that the setting is as you want it to be, because
+  the values have been shifted.
+- The new APIVERSION (see config.h) now allows existing compiled plugins to be
+  used with newer versions of VDR, as long as there have been no changes to the
+  VDR header files since the last APIVERSION. Existing plugins' Makefiles should
+  have all references to VDRVERSION changed to APIVERSION, like this:
+
+  ------------------------------------------------------------
+  --- PLUGINS/src/hello/Makefile  2006/04/15 11:58:46     1.11
+  +++ PLUGINS/src/hello/Makefile  2006/04/16 09:03:50     1.12
+  @@ -28,9 +28,9 @@
+
+   -include $(VDRDIR)/Make.config
+
+  -### The version number of VDR (taken from VDR's "config.h"):
+  +### The version number of VDR's plugin API (taken from VDR's "config.h"):
+
+  -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+  +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+   ### The name of the distribution archive:
+
+  @@ -67,7 +67,7 @@
+
+   libvdr-$(PLUGIN).so: $(OBJS)
+          $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+  -       @cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+  +       @cp $@ $(LIBDIR)/$@.$(APIVERSION)
+
+   dist: clean
+          @-rm -rf $(TMPDIR)/$(ARCHIVE)
+  ------------------------------------------------------------
+- If a timer is newly created from within the "Schedule" menu, and its event is
+  already running or has its start time within the next two minutes, it now goes
+  directly into the "Edit timer" menu in order to allow the user to make further
+  changes to timer parameters before the actual recording starts (inspired by
+  Christian Wieninger's "epgsearch" plugin).
+- Added format check to syslog_with_tid().
+- Updated the INSTALL file's section about non-VDR files in the video directory
+  (since version 1.3.38 disk access is done in a separate thread, so the watchdog
+  timer won't hit).
+- Changed the behaviour of the "Use small font" setup option to *always* use the small
+  font if set to '3' - even if it would have been a fixed font (suggested by Ronny
+  Kornexl).
+- No longer using characters 0x01 and 0x02 for mapping single quote and slash in
+  recording names (thanks to Patrick Fischer for reporting that this was a problem
+  with XML). The single quote is not mapped at all, and the slash is interchanged
+  with the tilde. Existing recordings will be handled like before, so there is
+  no need to actually rename them.
+- The cRemote::CallPlugin() function now has a boolean return value that tells
+  the caller whether initiating the plugin call was successful (suggested by
+  Reinhard Nissl). If it returns false, another plugin call is currently pending
+  and the caller should try again later. This also means that the SVDRP command
+  PLUG can now return an error code is the call fails.
+- The new function cPlugin::MainThreadHook() can be used by plugins to perform
+  actions in the context of the main program thread. Use this function with great
+  care and only of you absolutely have to! See also PLUGINS.html.
diff --git a/INSTALL b/INSTALL
index c4b2a59ea..d4ac230db 100644
--- a/INSTALL
+++ b/INSTALL
@@ -25,17 +25,12 @@ Compiling and running the program:
 
 VDR requires the Linux-DVB driver header files to compile.
 As of kernel 2.6 these are part of the official Linux kernel
-distribution, and VDR's Makefile will automatically locate
-them. If you are using kernel 2.4 or earlier, you should
-install the files from this package in a directory that is
-"parallel" to the DVB directory of the driver source (refer to
-http://linuxtv.org for more information about that driver).
-For example, if the DVB driver was extracted into the directory
-/home/kls/vdr/DVB, then this package should be extracted into
-/home/kls/vdr/VDR.
-If you have the DVB driver source in a different location
-you can rename the file Make.config.template to Make.config and
-adjust the definition of DVBDIR in that file.
+distribution, and so they should be automatically found in
+/usr/include/linux/dvb. If your DVB driver header files are
+in a different location, you can rename the file Make.config.template
+to Make.config and adjust the definition of DVBDIR in that file.
+
+Refer to http://linuxtv.org for more information about the Linux-DVB driver.
 
 VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
 to work properly.
@@ -325,7 +320,7 @@ with the name of the basic directory when running 'vdr':
    vdr -v /video0
 
 Note that you should not copy any non-VDR files into the /videoX directories,
-since this might cause the watchdog timer to expire when VDR cleans up those
+since this might cause a lot of unnecessary disk access when VDR cleans up those
 directories and there is a large number of files and/or subdirectories in
 there.
 
diff --git a/MANUAL b/MANUAL
index c29d648eb..1ff920374 100644
--- a/MANUAL
+++ b/MANUAL
@@ -45,8 +45,12 @@ Version 1.3
   FastFwd     fast forward
   FastRew     fast rewind
 
+  Next        Next/previous channel group (in live tv mode)
+  Prev        or next/previous editing mark (in replay mode)
+
   Channel+    channel up
   Channel-    channel down
+  PrevChannel previous channel
 
   Power       shutdown
 
@@ -158,6 +162,10 @@ Version 1.3
   default margin values will be sufficient, so in case this recording is
   really important you may want to add an extra margin ;-). VPS recordings
   will use the exact Start (or VPS) and Stop times as given in the event.
+  If a timer is newly created from within the "Schedule" menu, and its event is
+  already running or has its start time within the next two minutes, it goes
+  directly into the "Edit timer" menu in order to allow the user to make further
+  changes to timer parameters before the actual recording starts.
 
   The "Blue" button can be pressed to switch to the channel with the selected
   programme.
@@ -635,11 +643,11 @@ Version 1.3
                          If turned off, Dolby Digital tracks also don't appear in the
                          "Audio" menu.
 
-  Update channels = 4    Controls the automatic channel update function. '0' means
+  Update channels = 5    Controls the automatic channel update function. '0' means
                          no update, '1' will only update channel names, '2' will
-                         update channel names and PIDs, '3' will perform all
-                         updates and also add newly found channels, and '4' will
-                         also add newly found transponders.
+                         only update PIDs, '3' will update channel names and PIDs,
+                         '4' will perform all updates and also add newly found channels,
+                         and '5' will also add newly found transponders.
 
   Audio languages = 0    Some tv stations broadcast various audio tracks in different
                          languages. This option allows you to define which language(s)
diff --git a/Make.config.template b/Make.config.template
index fcf607c77..e307ba91c 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.7 2006/01/13 16:06:11 kls Exp $
+# $Id: Make.config.template 1.8 2006/04/15 12:28:03 kls Exp $
 
 ### The C compiler and options:
 
@@ -18,7 +18,7 @@ CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-#DVBDIR   = ../DVB
+#DVBDIR   = /usr/src/v4l-dvb/linux
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
 
@@ -33,3 +33,9 @@ RCU_DEVICE  = /dev/ttyS1
 
 ## Define if you want vdr to not run as root
 #VDR_USER = vdr
+
+### You don't need to touch the following:
+
+ifdef DVBDIR
+INCLUDES += -I$(DVBDIR)/include
+endif
diff --git a/Makefile b/Makefile
index 60373a38c..f5862139f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.85 2006/02/05 13:37:11 kls Exp $
+# $Id: Makefile 1.87 2006/04/16 09:00:30 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -14,16 +14,6 @@ CFLAGS   ?= -O2
 CXX      ?= g++
 CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
-LINUX_VERSION := $(shell uname -r | cut -c-3)
-LINUX         := $(shell uname -r)
-DVBDIR        := /lib/modules/$(LINUX)/build
-ifeq ($(LINUX_VERSION), 2.4)
-   DVBDIR = ../DVB
-endif
-ifeq ($(LINUX_VERSION), 2.2)
-   DVBDIR = ../DVB
-endif
-
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
@@ -40,8 +30,6 @@ DOXYFILE = Doxyfile
 
 -include Make.config
 
-INCLUDES += -I$(DVBDIR)/include
-
 SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
@@ -91,9 +79,10 @@ DEFINES += -D_GNU_SOURCE
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
-# The version number of VDR (taken from VDR's "config.h"):
+# The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell grep 'define VDRVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ifdef VFAT
 # for people who want their video directory on a VFAT partition
@@ -195,7 +184,7 @@ plugins: include-dir
 
 clean-plugins:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
-	@-rm -f $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION)
+	@-rm -f $(PLUGINDIR)/lib/libvdr-*.so.$(APIVERSION)
 
 # Install the files:
 
@@ -227,7 +216,7 @@ install-doc:
 
 install-plugins: plugins
 	@mkdir -p $(PLUGINLIBDIR)
-	@cp $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION) $(PLUGINLIBDIR)
+	@cp $(PLUGINDIR)/lib/libvdr-*.so.$(APIVERSION) $(PLUGINLIBDIR)
 
 # Source documentation:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 9515174f4..bd18a8661 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.30 are marked like this.
-<!--X1.3.30--></td></tr></table>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.31 are marked like this.
 <!--X1.3.31--></td></tr></table>
-<!--X1.3.37--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.37--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.37 are marked like this.
 <!--X1.3.37--></td></tr></table>
-<!--X1.3.38--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.3.38 are marked like this.
 <!--X1.3.38--></td></tr></table>
+<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.3.46 are marked like this.
+<!--X1.3.47--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -62,14 +62,16 @@ <h1>Table Of Contents</h1>
 <li><a href="#Main menu entry">Main menu entry</a>
 <li><a href="#User interaction">User interaction</a>
 <li><a href="#Housekeeping">Housekeeping</a>
+<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Main thread hook">Main thread hook</a>
+<li><a href="#Activity">Activity</a>
+<!--X1.3.47--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
 <li><a href="#Internationalization">Internationalization</a>
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Custom services">Custom services</a>
-<!--X1.3.30--></td></tr></table>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#SVDRP commands">SVDRP commands</a>
 <!--X1.3.31--></td></tr></table>
 <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
@@ -164,11 +166,20 @@ <h1>Table Of Contents</h1>
 The <tt>lib</tt> directory contains the dynamically loadable libraries of all
 available plugins. Note that the names of these files are created by concatenating
 <p>
+<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <table border=2>
 <tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>hello</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
-<tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>VDR version number<br>this plugin was<br>compiled for</font></td></tr>
+<tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>API version number<br>this plugin was<br>compiled for</font></td></tr>
 </table>
 <p>
+The <i>API version number</i> refers to the plugin API version number of the VDR
+version this plugin was compiled with. Compiled plugins can run with newer versions
+of VDR as long as their plugin API version number is still the same as that of
+the current VDR version. That way minor fixes to VDR, that don't require changes
+to the VDR header files, can be made without requiring all plugins to be
+recompiled.
+<!--X1.3.47--></td></tr></table>
+<p>
 The plugin library files can be stored in any directory. If the default organization
 is not used, the path to the plugin directory has be be given to VDR through the
 <b><tt>-L</tt></b> option.
@@ -609,6 +620,65 @@ <h1>Table Of Contents</h1>
 the plugin should launch a separate thread to do this.
 </b>
 
+<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Main thread hook"><hr><h2>Main thread hook</h2>
+
+<center><i><b>Pushing in...</b></i></center><p>
+
+Normally a plugin only reacts on user input if directly called through its
+<a href="#Main menu entry">main menu entry</a>, or performs some background
+activity in a separate thread. However, sometimes a plugin may need to do
+something in the context of the main program thread, without being explicitly
+called up by the user. In such a case it can implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual void MainThreadHook(void);
+</pre></td></tr></table><p>
+
+in which it can do this. This function is called for every plugin once during
+every cycle of VDR's main program loop, which typically happens once every
+second.
+<b>Be very careful when using this function, and make sure you return from it
+as soon as possible! If you spend too much time in this function, the user
+interface performance will become sluggish!</b>
+
+<a name="Activity"><hr><h2>Activity</h2>
+
+<center><i><b>Now is not a good time!</b></i></center><p>
+
+If a plugin is running a background task that should be finished before shutting
+down the system, it can implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual cString Active(void);
+</pre></td></tr></table><p>
+
+which shall return an empty string if it is ok to shut down, and a proper message
+if not:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+cString cDoSomethingPlugin::Active(void)
+{
+  if (busy)
+     return tr("Doing something");
+  return NULL;
+}
+</pre></td></tr></table><p>
+
+The message should be short and should indicate what is currently going on.
+It will be presented to the user as a confirmation message, followed by a
+hyphen and a "shut down anyway?" prompt, as in
+<p>
+<b>Doing something - shut down anyway?</b>
+<p>
+All plugins will be queried, and the first one that returns a non empty
+string will cause the confirmation message to be shown. If the user confirms
+the prompt by pressing the "Ok" button, the rest of the plugins will also
+be queried, and further prompts may show up. If all prompts have been confirmed,
+the shutdown will take place. As soon as one prompt is not confirmed, no
+further plugins will be queried and no shutdown will be done.
+<!--X1.3.47--></td></tr></table>
+
 <a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
 <center><i><b>Remember me...</b></i></center><p>
@@ -864,7 +934,6 @@ <h1>Table Of Contents</h1>
 and then in the global VDR texts. So a plugin can make use of texts defined by the
 core VDR code.
 
-<!--X1.3.30--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Custom services"><hr><h2>Custom services</h2>
 
 <center><i><b>What can I do for you?</b></i></center><p>
@@ -933,9 +1002,7 @@ <h1>Table Of Contents</h1>
 <tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if
 any plugin handled the request, or <tt>false</tt> if no plugin handled the request.
 
-<!--X1.3.30--></td></tr></table>
-
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
 
 <center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
@@ -1262,7 +1329,7 @@ <h1>Table Of Contents</h1>
   cMyControl(void);
   virtual ~cMyControl();
   virtual void Hide(void);
-<!--X1.3.38--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
   virtual cOsdObject *GetInfo(void);
 <!--X1.3.38--></td></tr></table>
   virtual eOSState ProcessKey(eKeys Key);
@@ -1294,7 +1361,7 @@ <h1>Table Of Contents</h1>
 it has to hide itself from the OSD, in case it uses it. <tt>Hide()</tt> may be called at
 any time, and it may be called even if the <tt>cControl</tt> is not visible at the moment.
 <p>
-<!--X1.3.38--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 The <tt>GetInfo()</tt> function is called when the user presses the <tt>Info</tt> button,
 and shall return a pointer to a <tt>cOsdObject</tt> that contains information
 about the currently played programme. The caller takes ownership of the returned
@@ -1522,7 +1589,7 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 
-<!--X1.3.37--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.3.37--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p>
 Directly accessing the OSD is only allowed from the foreground thread, which
 restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index cab396ed6..6f3dd4c74 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.10 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.12 2006/04/16 09:03:50 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index fb7d423d8..8a0aef4b7 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.4 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.6 2006/04/16 09:03:55 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 675a86dbc..c76b871f2 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.4 2006/04/16 09:03:59 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -21,7 +21,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -30,9 +29,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -41,7 +40,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -69,11 +68,11 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 80779eb9e..841d5505e 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -25,3 +25,7 @@ VDR Plugin 'skincurses' Revision History
 2005-11-26: Version 0.0.5
 
 - Fixed SetProgress() in case Total is 0.
+
+2006-04-14: Version 0.0.6
+
+- Added a missing "Key$" in skincurses.c.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 6117ee3db..360b0d2fc 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.4 2006/04/16 09:04:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 522d7cfcc..96b62e313 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.7 2005/11/26 13:52:39 kls Exp $
+ * $Id: skincurses.c 1.8 2006/04/14 11:35:59 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -564,7 +564,7 @@ void cSkinCursesDisplayVolume::SetVolume(int Current, int Total, bool Mute)
 {
   if (Mute) {
      osd->DrawRectangle(0, 0, OsdWidth - 1, 0, clrTransparent);
-     osd->DrawText(0, 0, tr("Mute"), clrGreen, clrBackground, &Font);
+     osd->DrawText(0, 0, tr("Key$Mute"), clrGreen, clrBackground, &Font);
      }
   else {
      const char *Prompt = tr("Volume ");
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index aeeed4df1..e94353805 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.4 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.6 2006/04/16 09:04:06 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index d53468861..e6525e9e5 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.10 2006/04/16 09:04:10 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 316a6d5cb..272587482 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $
+# $Id: Makefile 1.4 2006/04/16 09:04:13 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/UPDATE-1.4.0 b/UPDATE-1.4.0
new file mode 100644
index 000000000..910c444e8
--- /dev/null
+++ b/UPDATE-1.4.0
@@ -0,0 +1,334 @@
+This is a summary of the changes in VDR 1.4.0 since the last stable
+version 1.2.6. It only contains things that are of actual importance
+to the user and doesn't mention the many fixes and improvements that
+have been made "behind the scenes".
+
+See the file HISTORY for a detailed list of all changes.
+
+Plugins:
+
+- The new function cPlugin::Stop() shall be used to stop any background activities
+  of a plugin. Previously this was done in the plugin's desctructor, but it is
+  better to do this in a dedicated function that can be called early when shutting
+  down.
+- Added 'Service' functions to the plugin interface.
+  See PLUGINS.html, section "Custom services" for details.
+- Plugins can now implement their own SVDRP commands.
+  See PLUGINS.html, section "SVDRP commands" for details. The SVDRP commands
+  of a plugin are accessed through the new SVDRP command PLUG.
+- The main menu function of a plugin can now be activated through a key macro of
+  the form "@plugin" even if that plugin doesn't have a main menu entry.
+- The main menu function of a plugin can now be called programmatically through
+  the static function cRemote::CallPlugin().
+- The new function cPlugin::Active() can be used by a plugin to indicate that it
+  is still busy and the system should not shut down or restart.
+- The new APIVERSION (see config.h) now allows existing compiled plugins to be
+  used with newer versions of VDR, as long as there have been no changes to the
+  VDR header files since the last APIVERSION.
+- The new function cPlugin::MainThreadHook() can be used by plugins to perform
+  actions in the context of the main program thread.
+
+Skins:
+
+- The entire OSD display can now be implemented via "skins". See VDR/skins.[hc],
+  VDR/skinclassic.[hc], VDR/skinsttng.[hc] and PLUGINS.html for information on how
+  a plugin can implement its own skin. By default VDR comes with a "Classic" skin
+  that implements the OSD display known from previous versions, and the new skin
+  named "ST:TNG Panels", which is also the default skin now. The actual skin can
+  be selected through "Setup/OSD/Skin".
+- The colors used in a skin can now be configured using "themes". See PLUGINS.html
+  for information on how a skin can make use of themes, and man vdr(5) for the
+  structure of a theme file. The actual theme to use can be selected through
+  "Setup/OSD/Theme".
+
+Remote control:
+
+- Pressing the "Play" key in live viewing mode now resumes a previous replay
+  session (thanks to Mirko D�lle).
+- The new "Info" key brings up information on the currently viewed programme
+  or recording.
+- In string entry fields (like, e.g., the file name of a recording) the characters
+  can now be entered by pressing the numeric keys, the same way as on a
+  telephone keypad.
+- Key macros can now be defined for all non-modeless keys.
+- Switching channels with the Up/Down or Channel+/Channel- keys now works a lot
+  faster when the repeat function kicks in, by not actually switching the
+  channel every time, but rather only displaying the channel info and doing
+  the final switch when the key is released.
+- The "Back" key now restores the original string when pressed while editing a
+  string item.
+- The "Ok" key in the "Jump" mode of the replay progress display now confirms the
+  jump instead of closing the display.
+- Implemented kNext and kPrev keys.
+- Implemented kChanPrev.
+
+Devices:
+
+- Now waiting at startup until all DVB devices are ready. This includes having
+  all CAMs initialized and ready to decrypt, so that no more "channel not
+  available" happens if VDR is started with the current channel being an encrypted
+  one, or a timer on such a channel hits right after starting VDR.
+- The DVB devices now retune (and, if applicable, resend the DiSEqC data) if
+  the lock is lost.
+
+EPG:
+
+- Added support for selecting preferred EPG languages.
+- The "Red" button in the "Setup/EPG" menu can now be used to force an EPG
+  scan on a single DVB card system.
+- Implemented an "EPG linger time", which can be set to have older EPG information
+  still displayed in the "Schedule" menu.
+- The "Schedule" and "What's on now/next?" menus now have an additional column
+  which displays information on whether there is a timer defined for an event,
+  whether an event has a VPS time that's different than its start time, and
+  whether an event is currently running.
+- The format of the 'epg.data' files has been extended by the new tag 'X', which
+  contains the stream components of an event.
+- Modified the EPG scan so that it uses the primary device if it is
+  replaying and is the only device that provides the given transponder, and that
+  a forced EPG scan works even if EPG scan timeout is set to 0.
+- Removed EPG bugfix #0, because it removed actually important data.
+- No longer removing superfluous hyphens in EPG data - would become too
+  language dependent to handle all kinds of exceptions.
+- EPG events that are no longer in the currently broadcasted data stream are
+  now automatically deleted.
+- Schedules are now cleaned up once every hour (not only at 05:00).
+- The "Red" button in the "Schedule", "What's on now/next?" and "Event" menus
+  now immediately creates a timer for the selected event and marks it with 'T'.
+  If the event is already marked with 'T', the "Red" button opens the "Edit
+  timer" menu for that timer.
+- Pressing '0' in the "Schedule" menu now rotates through displaying "This event on
+  this channel", "This event on all channels" and "All events on all channels".
+  This can be used to find reruns of a given show, or the episodes of a series.
+  Note that if there are many channels in your channels.conf, displaying the
+  "All events on all channels" page may take a while.
+- The epg.data file is now written when VDR exits.
+- The 'event id' in EPG data has been extended to 32 bit, so that external tools
+  can generate ids that don't collide with those from the DVB data stream.
+- The status changes of EPG events are now logged for all channels that have timers.
+
+OSD:
+
+- Changed font handling to allow language specific character sets.
+- Adopted the small font character set from the "Elchi" patch
+- Increased the maximum number of possible OSD colors to 256.
+- Now using the 'running status' in the channel display, so that a programme
+  that has an end time that is before the current time, but is still running,
+  will still be shown in the display (provided the broadcasters handle the
+  'running status' flag correctly). This also applies to programmes that have
+  a start time that is in the future, but are already running.
+- The new setup option "OSD/Use small font" can be used to control the use of
+  the small font.
+- The new OSD setup parameters "Left" and "Top" can be used to define the top left
+  corner of the OSD.
+- The OSD size prameters are now in pixel (as opposed to formerly characters).
+  When reading a 'setup.conf' file from an older version of VDR, the OSDwidth
+  and OSDheight values will be converted to pixel automatically.
+- The OSD is now fully device independent. See the comments in VDR/osd.h and the
+  description in PLUGINS.html for information on how a plugin can implement an OSD
+  display on arbitrary hardware.
+- The OSD (actually its cBitmap class) can now handle XPM files. There are several
+  XPM files in the VDR/symbols directory which can be used by skins (some of these
+  have been taken from the "elchi" patch).
+- Due to the changes in the OSD handling the DEBUG_OSD option for a textual OSD
+  has been dropped. A textual OSD can now be displayed with the "skincurses"
+  plugin.
+- Single shot timers and events now show the day of week.
+- The new setup option "OSD/Channel info time" can be used to define the time after
+  which the channel display is removed if no key has been pressed.
+- The "Summary" button in the "Recordings" menu has been renamed to "Info", and
+  the page it brings up now shows the recording's information, much like the EPG
+  event page.
+- The new setup option "OSD/Scroll wraps" can be used to activate wrapping around
+  in menu lists.
+- The main menu now dynamically updates its contents in case an instant
+  recording or replay stops, etc.
+- The new option "Setup/OSD/Timeout requested channel info" can be used to turn
+  off the automatic timeout of the channel display in case it was invoked by
+  a press of the "Ok" key.
+
+Channels:
+
+- Channel data is now automatically derived from the DVB data stream
+- Channel names in 'channels.conf' can now have a short form, as provided
+  by some tv stations.
+- There can now be up to 32 audio and 16 Dolby PIDs.
+- The audio and Dolby PIDs in 'channels.conf' now can have an optional language
+  code.
+- Fixed transponder handling to make it work with satellites that provide two
+  transponders on the same frequency, with different polarization.
+- Now storing the name of the service provider (aka "bouquet") in the channel
+  name, separated by a semicolon.
+- The "Channels" menu can now be sorted "by number" (default), "by name" and
+  "by provider". While in the "Channels" menu, pressing the '0' key switches
+  through these modes.
+- Added support for circular polarization.
+- When reading the channels.conf file, duplicate channels (i.e. ones that have
+  the same channel ID) are now automatically deleted and only the first one is
+  actually stored.
+- In the "Channels" menu the numeric keys now position the cursor to the channel
+  with the given number.
+- The "Mark/Move" function in the "Channels" menu now also works in the non-numeric
+  sort modes.
+- The "Update channels" parameter in the "Setup/DVB" menu has been extended to
+  allow updating only the PIDs.
+
+Timers:
+
+- The '0' key now toggles the "Day" item in the "Timers" menu between "single
+  shot" and "repeating". The keys '1'...'7' can be used to toggle the individual
+  days ('1' is monday).
+- The day of a timer is now stored as a full date in ISO notation ("YYYY-MM-DD") in
+  'timers.conf' and for the result of the SVDRP command LSTT
+- The timer status now has a new bit that is set when that timer is currently
+  recording.
+- The 'summary' field of a timer definition has been renamed to 'aux', and is now
+  only used for external applications to store auxiliary information with a timer,
+  which has no meaning whatsoever to VDR itself.
+  The contents of the 'aux' field of a timer is copied into the recording's
+  'info.vdr' file, using the tag character '@'.
+- The description of a recording is now taken exclusively from its related EPG
+  data. If an application wants to use a different description it needs to set
+  it with SVDRP/PUTE and use table ID 0x00, so that it won't be overwritten (as
+  a side effect, however, this also disables VPS for such an event).
+- There is no more "Summary" menu when pressing "Ok" in the "Timers" menu.
+  The "Ok" key now always opens the "Edit timer" menu.
+- The upper 16 bit of a timer's "flags" are no longer treated specially when a timer
+  is modified in the "Edit timer" menu. If an external application needs to know if
+  a timer was modified, it has to keep a copy of the timer's data and compare that
+  to the actual data.
+- The option "Setup/OSD/Sort timers" has been removed. Timers are always sorted
+  by their start time and priority.
+- The "Blue" key in the "Timers" menu now displays the EPG info of the event the
+  selected timer will record (if available). The "On/Off" function has been shifted
+  to the "Red" button. Editing a timer is done by pressing "Ok".
+
+Recording:
+
+- Implemented handling the VPS timestamps (aka "Programme Identification Label")
+  for full VPS support for timers (provided the tv stations actually broadcast
+  this information). The VPS time is displayed in the event info page if it exists
+  and is different than the event's start time.
+- Timers can now be set to use the VPS information to control recording a programme.
+  The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
+  the "VPS" option in the individual timers, can be used to control this feature
+- Now preferring budget cards when selecting a DVB device for recording.
+- The file 'summary.vdr' has been replaced with 'info.vdr' and now contains the
+  information about a recording, in the same format as the events are stored in
+  'epg.data'.
+- Recordings are now only started if there is at least 300MB free disk space.
+- No longer using characters 0x01 and 0x02 for mapping single quote and slash in
+  recording names.
+  The single quote is not mapped at all, and the slash is interchanged
+  with the tilde. Existing recordings will be handled like before, so there is
+  no need to actually rename them.
+
+SVDRP:
+
+- The new SVDRP command 'SCAN' can be used to force  an EPG scan on a single
+  DVB card system.
+- Extended the SVDRP command LSTE to allow limiting the listed data to a given
+  channel, the present or following events, or events at a given time.
+- The SVDRP command LSTR now lists the recording information in the same tagged
+  format as the LSTE command lists the EPG data.
+- The new SVDRP command PLAY can be used to start replaying a recording.
+- The new SVDRP command EDIT can be used to start the editing process of a recording.
+- The new SVDRP command PLUG can be used to call a plugin's main menu function.
+- Implemented the SVDRP command MOVC.
+- The SVDRP command GRAB now determines the image type (JPEG or PNM) from the
+  extension (".jpg", ".jpeg" or ".pnm") of the given file name. The explicit
+  'jpeg' or 'pnm' parameter is still accepted for backward compatibility, but
+  has no meaning any more.
+- The SVDRP command GRAB now writes the image data to the SVDRP connection
+  (encoded in base64) if the given file name consists of only the file
+  extension (".jpg", ".jpeg" or ".pnm"), or if only "-" is given as file
+  name.
+- The new command line option '-g' must be given if the SVDRP command GRAB
+  shall be allowed to write image files to disk. The parameter to this option
+  must be the full path name of an existing directory, without any "..", double
+  '/' or symlinks. By default, or if "-g- is given, grabbing to files is
+  not allowed any more because of potential security risks.
+- The SVDRP command LSTT now accepts the new option 'id' to have the channels
+  of the timers listed with their unique channel ids instead of their numbers.
+
+Audio:
+
+- AC3 audio can now be output directly over the full featured DVB cards.
+- The new remote control button "Audio" can be used to switch between different
+  audio tracks. The "Green" button in the "Main" menu has been changed from "Language"
+  to "Audio", since it now also controls switching between normal and Dolby Digital
+  audio tracks.
+- The description of the audio tracks is now taken from the "component descriptors"
+  that are broadcast in the EPG data. However (as no big surprise), not all channels
+  actually provide useful data here, so there are now some additional EPG bugfixes,
+  which can be activated by setting the "EPG bugfix level" to 3.
+- The new setup option "DVB/Audio languages" can be used to control which audio
+  language shall be selected in case a channel broadcasts in different languages.
+- The "Left" and "Right" keys in the "Audio" menu can be used to switch between
+  the left and right stereo channels in case there are different audio tracks
+  in these channels.
+- The setup option "Recording/Record Dobly Digital" has been renamed and moved to
+  "DVB/Use Dolby Digital". It now controls whether Dolby Digital is recorded and
+  whether an available DD audio track will appear in the "Audio" menu.
+- Recording and Transfer Mode now handle more than 2 audio PIDs.
+
+Conditional Access:
+
+- Improved CAM handling.
+- The file 'ca.conf' has been removed. VDR now automatically detects which
+  device contains a CAM that can decode a channel.
+- Removed the now obsolete CaCaps stuff. The Setup/CICAM menu now displays the
+  actual CAM type as reported by the CAM.
+- The Setup/CICAM menu now only contains the devices that actually have a CI and
+  dynamically detects the number of slots a CI provides.
+- The CAM menu now automatically updates itself in case of a progress display (as
+  used, for instance, when updating the firmware via satellite).
+- Improved the CAM enquiry menu.
+
+Internationalization:
+
+- Added Russian language texts.
+- Added Croatian language texts.
+- Added Estonian language texts.
+- Added Danish language texts.
+- Added Czech language texts.
+
+Misc:
+
+- Changed thread handling to make it work with NPTL ("Native Posix Thread Library").
+- The list of recordings is now kept statically in memory to avoid long delays
+  when opening the "Recordings" menu. As a side effect, external modifications to
+  the video directory are no longer immediately reflected in the "Recordings" menu.
+  If a plugin manipulates the video directory in any way, it can call the function
+  Recordings.TriggerUpdate() to trigger an update of the list of recordings.
+  If some external tool manipulates the video directory, it can touch the file
+  '.update' in the video directory to trigger an update of the list of recordings.
+- The new setup option "DVB/Video display format" can be used to define which display
+  format to use for playing wide screen video on a 4:3 tv set.
+- Added the command line options '--lirc', '--rcu' and '--no-kbd' to allow setting
+  the remote control at runtime.
+- Pressing Ok while entering a channel number now immediately switches to that
+  channel, without waiting for further input.
+- The new command line option '--vfat' can be used to make VDR encode special
+  characters in recording file names, even if it wasn't compiled with VFAT=1
+  The compile time option VFAT still exists and creates a VDR that always behaves
+  as if it were called with '--vfat'.
+- Replaced the ':' delimiter between hour and minute in recording file names with
+  a '.' under Linux, too. Existing recordings with ':' as delimiter will still work.
+- The list of recordings is now read in a separate thread, resulting in a faster
+  startup if there are a great many of recordings, or the disk(s) have to spin up.
+- When displaying the amount of free disk space, the space consumed by
+  recordings that have been "deleted" but not yet actually "removed" is now
+  taken into account.
+- Removing deleted recordings is now done in a separate thread.
+- When started as user 'root' VDR can now switch to a lesser privileged user id,
+  keeping the capability to set the system time. The 'runvdr' script has been
+  changed to use the new '-u' option.
+- The Makefile now reports a summary of failed plugins.
+- Removed the "buffer reserve" in Transfer Mode - it's no longer necessary with
+  recent driver/firmware versions.
+- The initial channel and volume can now be defined in the "Setup/Miscellaneous"
+  menu.
+- In order to make sure that plugins are compiled with the same DVB driver header
+  files as VDR itself, the definition of DVBDIR has been removed from the VDR
+  Makefile. It can now be defined, if necessary, in Make.config.
diff --git a/channels.c b/channels.c
index c40006168..343802ee1 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.49 2006/02/28 13:54:34 kls Exp $
+ * $Id: channels.c 1.51 2006/04/17 12:18:57 kls Exp $
  */
 
 #include "channels.h"
@@ -293,6 +293,9 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
   // Sometimes the transponder frequency is set to 0, which is just wrong
   if (Frequency == 0)
      return false;
+  // Sometimes the symbol rate is off by one
+  if (abs(srate - Srate) <= 1)
+     Srate = srate;
 
   if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
      if (Number()) {
diff --git a/channels.conf b/channels.conf
index 26fe158c3..4beb0782a 100644
--- a/channels.conf
+++ b/channels.conf
@@ -28,7 +28,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
 Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -47,9 +47,9 @@ rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
 PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
 PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu:32:1:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1:29:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1:29:133:2:0
 PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
 DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
@@ -80,7 +80,7 @@ ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
 ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
-RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:74:0:3994:1:1108:0
+RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:0:0:3994:1:1108:0
 Nick/Talpa;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 NICK;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
@@ -116,9 +116,9 @@ Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;666=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,655=NAR;667=eng:583:960,961:4302:2:2007:0
 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;668=eng:584:960,961:4403:2:2007:0
-Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,655=NAR:576:960,961:4402:2:2011:0
-Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,656=NAR:579:960,961:4503:2:2011:0
-Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,657=NAR:577:960,961:4502:2:2011:0
+Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,655=NAR;660=eng:576:960,961:4402:2:2011:0
+Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:4503:2:2011:0
+Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,657=NAR;661=eng:577:960,961:4502:2:2011:0
 Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,653=NAR;663=eng:579:960,961:4603:2:2030:0
 Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,654=NAR;666=eng:2440:960,961:4602:2:2030:0
diff --git a/config.c b/config.c
index 9dadfdca2..8d49fc6f2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.143 2006/04/09 12:12:01 kls Exp $
+ * $Id: config.c 1.145 2006/04/17 12:43:57 kls Exp $
  */
 
 #include "config.h"
@@ -20,7 +20,7 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// --- cCommand -------------------------------------------------------------
+// --- cCommand --------------------------------------------------------------
 
 char *cCommand::result = NULL;
 
@@ -251,7 +251,7 @@ cSetup::cSetup(void)
   RecordingDirs = 1;
   VideoDisplayFormat = 1;
   VideoFormat = 0;
-  UpdateChannels = 4;
+  UpdateChannels = 5;
   UseDolbyDigital = 1;
   ChannelInfoPos = 0;
   ChannelInfoTime = 5;
diff --git a/config.h b/config.h
index 50c5afa52..7e518bde8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.249 2006/04/09 12:09:05 kls Exp $
+ * $Id: config.h 1.251 2006/04/16 09:36:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,21 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.46"
-#define VDRVERSNUM   10346  // Version * 10000 + Major * 100 + Minor
+// VDR's own version number:
+
+#define VDRVERSION  "1.3.47"
+#define VDRVERSNUM   10347  // Version * 10000 + Major * 100 + Minor
+
+// The plugin API's version number:
+
+#define APIVERSION  "1.3.47"
+#define APIVERSNUM   10347  // Version * 10000 + Major * 100 + Minor
+
+// When loading plugins, VDR searches them by their APIVERSION, which
+// may be smaller than VDRVERSION in case there have been no changes to
+// VDR header files since the last APIVERSION. This allows compiled
+// plugins to work with newer versions of the core VDR as long as no
+// VDR header files have changed.
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index b931527cb..14b88178f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.127 2006/04/09 10:46:36 kls Exp $
+ * $Id: device.c 1.128 2006/04/14 14:34:43 kls Exp $
  */
 
 #include "device.h"
@@ -790,14 +790,19 @@ void cDevice::SetVolume(int Volume, bool Absolute)
      }
 }
 
-void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
+void cDevice::ClrAvailableTracks(bool DescriptionsOnly, bool IdsOnly)
 {
   if (DescriptionsOnly) {
      for (int i = ttNone; i < ttMaxTrackTypes; i++)
          *availableTracks[i].description = 0;
      }
   else {
-     memset(availableTracks, 0, sizeof(availableTracks));
+     if (IdsOnly) {
+        for (int i = ttNone; i < ttMaxTrackTypes; i++)
+            availableTracks[i].id = 0;
+        }
+     else
+        memset(availableTracks, 0, sizeof(availableTracks));
      pre_1_3_19_PrivateStream = false;
      SetAudioChannel(0); // fall back to stereo
      currentAudioTrackMissingCount = 0;
@@ -954,7 +959,7 @@ bool cDevice::AttachPlayer(cPlayer *Player)
      pesAssembler->Reset();
      player = Player;
      if (!Transferring())
-        ClrAvailableTracks();
+        ClrAvailableTracks(false, true);
      SetPlayMode(player->playMode);
      player->device = this;
      player->Activate(true);
diff --git a/device.h b/device.h
index 23663e84b..2a682a3aa 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.74 2006/04/02 13:08:13 kls Exp $
+ * $Id: device.h 1.75 2006/04/14 14:35:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -356,7 +356,11 @@ class cDevice : public cThread {
   virtual void SetAudioTrackDevice(eTrackType Type);
        ///< Sets the current audio track to the given value.
 public:
-  void ClrAvailableTracks(bool DescriptionsOnly = false);
+  void ClrAvailableTracks(bool DescriptionsOnly = false, bool IdsOnly = false);
+       ///< Clears the list of currently availabe tracks. If DescriptionsOnly
+       ///< is true, only the track descriptions will be cleared. With IdsOnly
+       ///< set to true only the ids will be cleared. IdsOnly is only taken
+       ///< into account if DescriptionsOnly is false.
   bool SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL);
        ///< Sets the track of the given Type and Index to the given values.
        ///< Type must be one of the basic eTrackType values, like ttAudio or ttDolby.
diff --git a/dvbplayer.c b/dvbplayer.c
index 2f23e3108..7d50663de 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.44 2006/04/09 13:47:11 kls Exp $
+ * $Id: dvbplayer.c 1.45 2006/04/17 12:45:48 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -15,7 +15,7 @@
 #include "thread.h"
 #include "tools.h"
 
-// --- cBackTrace ----------------------------------------------------------
+// --- cBackTrace ------------------------------------------------------------
 
 #define AVG_FRAME_SIZE 15000         // an assumption about the average frame size
 #define DVB_BUF_SIZE   (256 * 1024)  // an assumption about the dvb firmware buffer size
diff --git a/dvbspu.c b/dvbspu.c
index 9dbe07a8b..48b20bf7d 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.20 2006/02/12 11:50:20 kls Exp $
+ * $Id: dvbspu.c 1.21 2006/04/17 12:45:05 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -42,7 +42,7 @@
 #define DEBUG(format, args...)
 #endif
 
-// --- cDvbSpuPalette----------------------------------
+// --- cDvbSpuPalette---------------------------------------------------------
 
 void cDvbSpuPalette::setPalette(const uint32_t * pal)
 {
@@ -50,7 +50,7 @@ void cDvbSpuPalette::setPalette(const uint32_t * pal)
         palette[i] = yuv2rgb(pal[i]);
 }
 
-// --- cDvbSpuBitmap --------------------------------------------
+// --- cDvbSpuBitmap ---------------------------------------------------------
 
 #define setMin(a, b) if (a > b) a = b
 #define setMax(a, b) if (a < b) a = b
@@ -208,7 +208,7 @@ void cDvbSpuBitmap::putFieldData(int field, uint8_t * data, uint8_t * endp)
     }
 }
 
-// --- cDvbSpuDecoder-----------------------------
+// --- cDvbSpuDecoder---------------------------------------------------------
 
 #define CMD_SPU_MENU            0x00
 #define CMD_SPU_SHOW            0x01
diff --git a/dvbspu.h b/dvbspu.h
index 487264a13..1812b14b1 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.11 2006/01/05 10:18:31 kls Exp $
+ * $Id: dvbspu.h 1.12 2006/04/17 12:47:29 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -46,7 +46,7 @@ typedef struct sDvbSpuRect {
 
 sDvbSpuRect;
 
-// --- cDvbSpuPalette----------------------------------
+// --- cDvbSpuPalette---------------------------------------------------------
 
 class cDvbSpuPalette {
   private:
@@ -60,7 +60,7 @@ class cDvbSpuPalette {
     uint32_t getColor(uint8_t idx, uint8_t trans) const;
 };
 
-// --- cDvbSpuBitmap----------------------------------
+// --- cDvbSpuBitmap----------------------------------------------------------
 
 class cDvbSpuBitmap {
 
@@ -87,7 +87,7 @@ class cDvbSpuBitmap {
                        sDvbSpuRect & size) const;
 };
 
-// --- cDvbSpuDecoder------------------------------------
+// --- cDvbSpuDecoder---------------------------------------------------------
 
 class cDvbSpuDecoder:public cSpuDecoder {
   private:
@@ -151,7 +151,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
     void processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow);
 };
 
-// --- cDvbSpuPalette -------------------------------------------
+// --- cDvbSpuPalette --------------------------------------------------------
 
 inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
 {
diff --git a/eit.c b/eit.c
index ccce49567..c33dbefca 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.115 2006/02/19 09:51:02 kls Exp $
+ * $Id: eit.c 1.116 2006/04/15 14:11:52 kls Exp $
  */
 
 #include "eit.h"
@@ -180,10 +180,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                        if (link != channel) { // only link to other channels, not the same one
                           //fprintf(stderr, "Linkage %s %4d %4d %5d %5d %5d %5d  %02X  '%s'\n", hit ? "*" : "", channel->Number(), link ? link->Number() : -1, SiEitEvent.getEventId(), ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId(), ld->getLinkageType(), linkName);//XXX
                           if (link) {
-                             if (Setup.UpdateChannels >= 1)
+                             if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3)
                                 link->SetName(linkName, "", "");
                              }
-                          else if (Setup.UpdateChannels >= 3) {
+                          else if (Setup.UpdateChannels >= 4) {
                              link = Channels.NewChannel(channel, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
                              //XXX patFilter->Trigger();
                              }
diff --git a/epg.c b/epg.c
index 987efb9c6..0525008e7 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.70 2006/03/26 14:06:11 kls Exp $
+ * $Id: epg.c 1.71 2006/04/17 12:18:59 kls Exp $
  */
 
 #include "epg.h"
@@ -698,7 +698,7 @@ const cEvent *cSchedule::GetFollowingEvent(void) const
   const cEvent *p = GetPresentEvent();
   if (p)
      p = events.Next(p);
-  else { 
+  else {
      time_t now = time(NULL);
      for (p = events.First(); p; p = events.Next(p)) {
          if (p->StartTime() >= now)
diff --git a/epg2html.pl b/epg2html.pl
index 6b2584660..a18ec08b1 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.6 2004/03/28 11:15:01 kls Exp $
+# $Id: epg2html.pl 1.7 2006/04/17 12:19:08 kls Exp $
 
 @Index = ();
 
@@ -95,4 +95,3 @@ sub Tags
 print INDEX sort { lc($a) cmp lc($b) } @Index;
 print INDEX "</body>\n</html>\n";
 close(INDEX);
-   
diff --git a/font.c b/font.c
index 87440d28f..fe2ec6e8b 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.12 2006/02/05 13:49:10 kls Exp $
+ * $Id: font.c 1.13 2006/04/16 10:59:15 kls Exp $
  */
 
 #include "config.h"
@@ -123,7 +123,7 @@ const cFont *cFont::GetFont(eDvbFont Font)
 {
   if (Setup.UseSmallFont == 0 && Font == fontSml)
      Font = fontOsd;
-  else if (Setup.UseSmallFont == 2 && Font == fontOsd)
+  else if (Setup.UseSmallFont == 2)
      Font = fontSml;
   if (!fonts[Font])
      SetFont(Font);
diff --git a/i18n.c b/i18n.c
index feabf70b7..5912a53e6 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.255 2006/04/09 13:04:50 kls Exp $
+ * $Id: i18n.c 1.261 2006/04/15 14:13:45 kls Exp $
  *
  * Translations provided by:
  *
@@ -1275,6 +1275,28 @@ const tI18nPhrase Phrases[] = {
     "Vil du virkelig genstarte?",
     "Opravdu restartovat?",
   },
+  { "shut down anyway?",
+    "trotzdem ausschalten?",
+    "zares izklopi?",
+    "spengo comunque?",
+    "toch uitschakelen?",
+    "quer mesmo desligar?",
+    "confirmez l'arr�t",
+    "sl� av likevel?",
+    "sammutetaanko?",
+    "wy��czy� mimo to?",
+    "�apagar igualmente?",
+    "������ �� ����� �����������?",
+    "vill du �nd� avbryta?",
+    "�nchid, totu�i?",
+    "m�gis kikapcsolni?",
+    "Apagar de totes maneres?",
+    "������������� ���������?",
+    "svejedno isklju�iti?",
+    "l�litan v�lja?",
+    "sluk alligevel?",
+    "p�esto vypnout?",
+  },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
     "Snemanje - zares ponoven zagon?",
@@ -2254,6 +2276,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
+    "VPS-tallennus on alkamassa!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2264,8 +2287,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "VPS optagelse starter snart!",
     "",//TODO
   },
   { "No free DVB device to record!",
@@ -3700,6 +3722,28 @@ const tI18nPhrase Phrases[] = {
     "kun navne",
     "jen n�zvy",
   },
+  { "PIDs only",
+    "nur PIDs",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "names and PIDs",
     "Namen und PIDs",
     "imena in PIDe",
@@ -4412,6 +4456,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "Kanava k�ynnistett�ess�",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4422,8 +4467,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Kanal ved opstart",
     "",// TODO
   },
   { "Setup.Miscellaneous$Initial volume",
@@ -4434,6 +4478,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "��nenvoimakkuus k�ynnistett�ess�",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4444,8 +4489,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Lydstyrke ved opstart",
     "",// TODO
   },
   { "Setup.Miscellaneous$as before",
@@ -4456,6 +4500,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
+    "edellinen",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4466,8 +4511,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "som før",
     "",// TODO
   },
   // The days of the week:
@@ -5267,6 +5311,50 @@ const tI18nPhrase Phrases[] = {
     "Spol tilbage",
     "Dozadu",
   },
+  { "Key$Next",
+    "Vorw�rts",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Key$Prev",
+    "Zur�ck",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Key$Power",
     "Ausschalten",
     "Izklop",
@@ -5333,6 +5421,28 @@ const tI18nPhrase Phrases[] = {
     "Kanal-",
     "Kan�l-",
   },
+  { "Key$PrevChannel",
+    "Vorheriger Kanal",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Key$Volume+",
     "Lautst�rke+",
     "Glasnost+",
diff --git a/keys.c b/keys.c
index 9fd5552f4..6ebdbfeaf 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.11 2006/01/16 17:01:25 kls Exp $
+ * $Id: keys.c 1.13 2006/04/15 13:50:43 kls Exp $
  */
 
 #include "keys.h"
@@ -39,9 +39,12 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kRecord,        "Record"     },
                     { kFastFwd,       "FastFwd"    },
                     { kFastRew,       "FastRew"    },
+                    { kNext,          "Next"       },
+                    { kPrev,          "Prev"       },
                     { kPower,         "Power"      },
                     { kChanUp,        "Channel+"   },
                     { kChanDn,        "Channel-"   },
+                    { kChanPrev,      "PrevChannel"},
                     { kVolUp,         "Volume+"    },
                     { kVolDn,         "Volume-"    },
                     { kMute,          "Mute"       },
diff --git a/keys.h b/keys.h
index 73e061e3d..4fa13372a 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.7 2006/01/05 15:39:06 kls Exp $
+ * $Id: keys.h 1.9 2006/04/15 13:56:03 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -33,9 +33,12 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kRecord,
              kFastFwd,
              kFastRew,
+             kNext,
+             kPrev,
              kPower,
              kChanUp,
              kChanDn,
+             kChanPrev,
              kVolUp,
              kVolDn,
              kMute,
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index b84e2c44d..57a92488a 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.18 2006/02/25 10:06:05 kls Exp $
+ *   $Id: descriptor.c 1.20 2006/04/17 12:19:15 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -318,6 +318,31 @@ void ParentalRatingDescriptor::Rating::Parse() {
    languageCode[3]=0;
 }
 
+void TeletextDescriptor::Parse() {
+   //this descriptor is only a header and a loop
+   teletextLoop.setData(data+sizeof(descr_teletext), getLength()-sizeof(descr_teletext));
+}
+
+void TeletextDescriptor::Teletext::Parse() {
+   s=data.getData<const item_teletext>();
+   languageCode[0]=s->lang_code1;
+   languageCode[1]=s->lang_code2;
+   languageCode[2]=s->lang_code3;
+   languageCode[3]=0;
+}
+
+int TeletextDescriptor::Teletext::getTeletextType() const {
+   return s->type;
+}
+
+int TeletextDescriptor::Teletext::getTeletextMagazineNumber() const {
+   return s->magazine_number;
+}
+
+int TeletextDescriptor::Teletext::getTeletextPageNumber() const {
+   return s->page_number;
+}
+
 int CaDescriptor::getCaType() const {
    return HILO(s->CA_type);
 }
@@ -536,6 +561,14 @@ void ComponentDescriptor::Parse() {
    description.setData(data+offset, getLength()-offset);
 }
 
+void PrivateDataSpecifierDescriptor::Parse() {
+   s=data.getData<const descr_private_data_specifier>();
+}
+
+int PrivateDataSpecifierDescriptor::getPrivateDataSpecifier() const {
+   return (HILO(s->private_data_specifier_hi) << 16) | HILO(s->private_data_specifier_lo);
+}
+
 void SubtitlingDescriptor::Parse() {
    subtitlingLoop.setData(data+sizeof(descr_subtitling), getLength()-sizeof(descr_subtitling));
 }
@@ -633,11 +666,47 @@ void MultilingualServiceNameDescriptor::Name::Parse() {
    name.setData(data+offset, mid->service_name_length);
 }
 
+void LocalTimeOffsetDescriptor::Parse() {
+   localTimeOffsetLoop.setData(data+sizeof(descr_local_time_offset), getLength()-sizeof(descr_local_time_offset));
+}
+
+int LocalTimeOffsetDescriptor::LocalTimeOffset::getCountryId() const {
+   return s->country_region_id;
+}
+
+int LocalTimeOffsetDescriptor::LocalTimeOffset::getLocalTimeOffsetPolarity() const {
+   return s->local_time_offset_polarity;
+}
+
+int LocalTimeOffsetDescriptor::LocalTimeOffset::getLocalTimeOffset() const {
+   return (s->local_time_offset_h << 8) | s->local_time_offset_m;
+}
+
+time_t LocalTimeOffsetDescriptor::LocalTimeOffset::getTimeOfChange() const {
+   return DVBTime::getTime(s->time_of_change_mjd_hi, s->time_of_change_mjd_lo, s->time_of_change_time_h, s->time_of_change_time_m, s->time_of_change_time_s);
+}
+
+int LocalTimeOffsetDescriptor::LocalTimeOffset::getNextTimeOffset() const {
+   return (s->next_time_offset_h << 8) | s->next_time_offset_m;
+}
+
+void LocalTimeOffsetDescriptor::LocalTimeOffset::Parse() {
+   s=data.getData<const local_time_offset_entry>();
+   countryCode[0]=s->country_code1;
+   countryCode[1]=s->country_code2;
+   countryCode[2]=s->country_code3;
+   countryCode[3]=0;
+}
+
 void LinkageDescriptor::Parse() {
    int offset=0;
+   s1 = NULL;
    data.setPointerAndOffset<const descr_linkage>(s, offset);
-   if (checkSize(getLength()-offset))
+   if (checkSize(getLength()-offset)) {
+      if (getLinkageType() == LinkageTypeMobileHandover)
+         data.setPointerAndOffset<const descr_linkage_8>(s1, offset);
       privateData.assign(data.getData(offset), getLength()-offset);
+      }
 }
 
 int LinkageDescriptor::getTransportStreamId() const {
@@ -656,9 +725,21 @@ LinkageType LinkageDescriptor::getLinkageType() const {
    return (LinkageType)s->linkage_type;
 }
 
+int LinkageDescriptor::getHandOverType() const {
+   return s1 == NULL ? 0 : s1->hand_over_type;
+}
+
+int LinkageDescriptor::getOriginType() const {
+   return s1 == NULL ? 0 : s1->origin_type;
+}
+
+int LinkageDescriptor::getId() const {
+   return s1 == NULL ? 0 : HILO(s1->id);
+}
+
 void ISO639LanguageDescriptor::Parse() {
    languageLoop.setData(data+sizeof(descr_iso_639_language), getLength()-sizeof(descr_iso_639_language));
-   
+
    //all this is for backwards compatibility only
    Loop::Iterator it;
    Language first;
@@ -704,6 +785,44 @@ int PDCDescriptor::getMinute() const {
    return s->pil2 & 0x3F;
 }
 
+void AncillaryDataDescriptor::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const descr_ancillary_data>(s, offset);
+}
+
+int AncillaryDataDescriptor::getAncillaryDataIdentifier() const {
+   return s->ancillary_data_identifier;
+}
+
+int PremiereContentTransmissionDescriptor::getOriginalNetworkId() const {
+   return HILO(s->original_network_id);
+}
+
+int PremiereContentTransmissionDescriptor::getTransportStreamId() const {
+   return HILO(s->transport_stream_id);
+}
+
+int PremiereContentTransmissionDescriptor::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int PremiereContentTransmissionDescriptor::getMJD() const {
+   return HILO(s->mjd);
+}
+
+void PremiereContentTransmissionDescriptor::Parse() {
+   s=data.getData<const descr_premiere_content_transmission>();
+   startTimeLoop.setData(data+sizeof(descr_premiere_content_transmission), getLength()-sizeof(descr_premiere_content_transmission));
+}
+
+time_t PremiereContentTransmissionDescriptor::StartTimeEntry::getStartTime(int mjd) const {
+   return DVBTime::getTime(mjd >> 8, mjd & 0xff, s->start_time_h, s->start_time_m, s->start_time_s);
+}
+
+void PremiereContentTransmissionDescriptor::StartTimeEntry::Parse() {
+   s=data.getData<const item_premiere_content_transmission_reference>();
+}
+
 void ApplicationSignallingDescriptor::Parse() {
    entryLoop.setData(data+sizeof(descr_application_signalling), getLength()-sizeof(descr_application_signalling));
 }
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 476da3fbf..338a1fd5f 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.13 2005/09/03 15:17:35 kls Exp $
+ *   $Id: descriptor.h 1.14 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -121,6 +121,25 @@ class ParentalRatingDescriptor : public Descriptor {
    virtual void Parse();
 };
 
+class TeletextDescriptor : public Descriptor {
+public:
+   class Teletext : public LoopElement {
+   public:
+      char languageCode[4];
+      int getTeletextType() const;
+      int getTeletextMagazineNumber() const;
+      int getTeletextPageNumber() const;
+      virtual int getLength() { return sizeof(item_teletext); }
+   protected:
+      virtual void Parse();
+   private:
+      const item_teletext *s;
+   };
+   StructureLoop<Teletext> teletextLoop;
+protected:
+   virtual void Parse();
+};
+
 class CaDescriptor : public Descriptor {
 public:
    int getCaType() const;
@@ -281,6 +300,15 @@ class ComponentDescriptor : public Descriptor {
    const descr_component *s;
 };
 
+class PrivateDataSpecifierDescriptor : public Descriptor {
+public:
+   int getPrivateDataSpecifier() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_private_data_specifier *s;
+};
+
 class SubtitlingDescriptor : public Descriptor {
 public:
    class Subtitling : public LoopElement {
@@ -377,17 +405,42 @@ class MultilingualServiceNameDescriptor : public Descriptor {
    virtual void Parse();
 };
 
+class LocalTimeOffsetDescriptor : public Descriptor {
+public:
+   class LocalTimeOffset : public LoopElement {
+   public:
+      char countryCode[4];
+      virtual int getLength() { return sizeof(local_time_offset_entry); }
+      int getCountryId() const;
+      int getLocalTimeOffsetPolarity() const;
+      int getLocalTimeOffset() const;
+      time_t getTimeOfChange() const;
+      int getNextTimeOffset() const;
+   protected:
+      virtual void Parse();
+   private:
+      const local_time_offset_entry *s;
+   };
+   StructureLoop<LocalTimeOffset> localTimeOffsetLoop;
+protected:
+   virtual void Parse();
+};
+
 class LinkageDescriptor : public Descriptor {
 public:
    int getTransportStreamId() const;
    int getOriginalNetworkId() const;
    int getServiceId() const;
    LinkageType getLinkageType() const;
+   int getHandOverType() const;
+   int getOriginType() const;
+   int getId() const;
    CharArray privateData;
 protected:
    virtual void Parse();
 private:
    const descr_linkage *s;
+   const descr_linkage_8 *s1;
 };
 
 class ISO639LanguageDescriptor : public Descriptor {
@@ -422,6 +475,41 @@ class PDCDescriptor : public Descriptor {
    const descr_pdc *s;
 };
 
+class AncillaryDataDescriptor : public Descriptor {
+public:
+   int getAncillaryDataIdentifier() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_ancillary_data *s;
+};
+
+// Private DVB Descriptor  Premiere.de
+// 0xF2  Content Transmission Descriptor
+// http://dvbsnoop.sourceforge.net/examples/example-private-section.html
+
+class PremiereContentTransmissionDescriptor : public Descriptor {
+public:
+   class StartTimeEntry : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(item_premiere_content_transmission_reference); }
+      time_t getStartTime(int mjd) const; //UTC
+   protected:
+      virtual void Parse();
+   private:
+      const item_premiere_content_transmission_reference *s;
+   };
+   StructureLoop<StartTimeEntry> startTimeLoop;
+   int getOriginalNetworkId() const;
+   int getTransportStreamId() const;
+   int getServiceId() const;
+   int getMJD() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_premiere_content_transmission *s;
+};
+
 //a descriptor currently unimplemented in this library
 class UnimplementedDescriptor : public Descriptor {
 protected:
diff --git a/libsi/headers.h b/libsi/headers.h
index 69350cdd7..a238ca67b 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.5 2005/09/03 15:18:16 kls Exp $
+ *   $Id: headers.h 1.6 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -769,6 +769,57 @@ struct ait_app {
    /* descriptors  */
 };
 
+/* Premiere Content Information Table */
+
+#define PCIT_LEN 17
+
+struct pcit {
+   u_char table_id                               :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char section_syntax_indicator               :1;
+   u_char dummy                                  :1; // has to be 0
+   u_char                                        :2;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :2;
+   u_char dummy                                  :1; // has to be 0
+   u_char section_syntax_indicator               :1;
+#endif
+   u_char section_length_lo                      :8;
+   u_char                                        :8;
+   u_char                                        :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
+#else
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
+#endif
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+
+   u_char contentId_hi_hi                        :8;
+   u_char contentId_hi_lo                        :8;
+   u_char contentId_lo_hi                        :8;
+   u_char contentId_lo_lo                        :8;
+
+   u_char duration_h                             :8;
+   u_char duration_m                             :8;
+   u_char duration_s                             :8;
+
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char descriptors_loop_length_hi             :4;
+#else
+   u_char descriptors_loop_length_hi             :4;
+   u_char                                        :4;
+#endif
+   u_char descriptors_loop_length_lo             :8;
+};
+
 /*
  *
  *    The following describes the different descriptors that can be used within
@@ -1010,6 +1061,21 @@ struct descr_linkage {
    u_char linkage_type                           :8;
 };
 
+#define DESCR_LINKAGE_8_LEN 3
+struct descr_linkage_8 {
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char hand_over_type                         :4;
+   u_char reserved                               :3;
+   u_char origin_type                            :1;
+#else
+   u_char origin_type                            :1;
+   u_char reserved                               :3;
+   u_char hand_over_type                         :4;
+#endif
+   u_char id_hi                                  :8;
+   u_char id_lo                                  :8;
+};
+
 /* 0x4B nvod_reference_descriptor */
 
 #define DESCR_NVOD_REFERENCE_LEN 2
@@ -1364,7 +1430,10 @@ struct descr_multilingual_component {
 struct descr_private_data_specifier {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* TBD */
+   u_char private_data_specifier_hi_hi           :8;
+   u_char private_data_specifier_hi_lo           :8;
+   u_char private_data_specifier_lo_hi           :8;
+   u_char private_data_specifier_lo_lo           :8;
 };
 
 /* 0x60 service_move_descriptor */
@@ -1717,6 +1786,34 @@ struct descr_application_icons_descriptor_end {
    u_char icon_flags_lo                          :8;
 };
 
+// Private DVB Descriptor  Premiere.de
+// 0xF2  Content Transmission Descriptor
+// http://dvbsnoop.sourceforge.net/examples/example-private-section.html
+
+#define DESCR_PREMIERE_CONTENT_TRANSMISSION_LEN 11
+
+struct descr_premiere_content_transmission {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+   u_char mjd_hi                                 :8;
+   u_char mjd_lo                                 :8;
+   u_char start_time_loop                        :8;
+};
+
+#define ITEM_PREMIERE_CONTENT_TRANSMISSION_LEN 3
+
+struct item_premiere_content_transmission_reference {
+   u_char start_time_h                           :8;
+   u_char start_time_m                           :8;
+   u_char start_time_s                           :8;
+};
+
 } //end of namespace
 
 #endif //LIBSI_HEADERS_H
diff --git a/libsi/section.c b/libsi/section.c
index 68af99180..6dd43df7b 100644
--- a/libsi/section.c
+++ b/libsi/section.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.c 1.4 2006/02/18 10:38:20 kls Exp $
+ *   $Id: section.c 1.5 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -341,4 +341,20 @@ void AIT::Application::Parse() {
    applicationDescriptors.setData(data+offset, HILO(s->application_descriptors_length));
 }
 
+/******************* PremiereCIT *******************/
+
+void PremiereCIT::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const pcit>(s, offset);
+   eventDescriptors.setData(data+offset, HILO(s->descriptors_loop_length));
+}
+
+int PremiereCIT::getContentId() const {
+   return (HILO(s->contentId_hi) << 16) | HILO(s->contentId_lo);
+}
+
+time_t PremiereCIT::getDuration() const {
+   return DVBTime::getDuration(s->duration_h, s->duration_m, s->duration_s);
+}
+
 } //end of namespace
diff --git a/libsi/section.h b/libsi/section.h
index 5b43f05f4..29af7f4bd 100644
--- a/libsi/section.h
+++ b/libsi/section.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.h 1.3 2004/02/20 13:45:45 kls Exp $
+ *   $Id: section.h 1.4 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -260,6 +260,21 @@ class AIT : public NumberedSection {
    virtual void Parse();
 };
 
+/* Premiere Content Information Table */
+
+class PremiereCIT : public NumberedSection {
+public:
+   PremiereCIT(const unsigned char *data, bool doCopy=true) : NumberedSection(data, doCopy) {}
+   PremiereCIT() {}
+   int getContentId() const;
+   time_t getDuration() const;
+   PCIT_DescriptorLoop eventDescriptors;
+protected:
+   virtual void Parse();
+private:
+   const pcit *s;
+};
+
 } //end of namespace
 
 #endif //LIBSI_TABLE_H
diff --git a/libsi/si.c b/libsi/si.c
index bbd3f1afe..c7f23e88b 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.15 2006/02/18 10:38:20 kls Exp $
+ *   $Id: si.c 1.16 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -373,6 +373,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case MultilingualComponentDescriptorTag:
             d=new MultilingualComponentDescriptor();
             break;
+         case PrivateDataSpecifierDescriptorTag:
+            d=new PrivateDataSpecifierDescriptor();
+            break;
          case ServiceMoveDescriptorTag:
             d=new ServiceMoveDescriptor();
             break;
@@ -400,9 +403,16 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case ParentalRatingDescriptorTag:
             d=new ParentalRatingDescriptor();
             break;
+         case TeletextDescriptorTag:
+         case VBITeletextDescriptorTag:
+            d=new TeletextDescriptor();
+            break;
          case ApplicationSignallingDescriptorTag:
             d=new ApplicationSignallingDescriptor();
             break;
+         case LocalTimeOffsetDescriptorTag:
+            d=new LocalTimeOffsetDescriptor();
+            break;
          case LinkageDescriptorTag:
             d=new LinkageDescriptor();
             break;
@@ -412,6 +422,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case PDCDescriptorTag:
             d=new PDCDescriptor();
             break;
+         case AncillaryDataDescriptorTag:
+            d=new AncillaryDataDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -436,13 +449,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          //defined in ETSI EN 300 468
          case StuffingDescriptorTag:
          case VBIDataDescriptorTag:
-         case VBITeletextDescriptorTag:
          case CountryAvailabilityDescriptorTag:
          case MocaicDescriptorTag:
-         case TeletextDescriptorTag:
          case TelephoneDescriptorTag:
-         case LocalTimeOffsetDescriptorTag:
-         case PrivateDataSpecifierDescriptorTag:
          case CellListDescriptorTag:
          case CellFrequencyLinkDescriptorTag:
          case ServiceAvailabilityDescriptorTag:
@@ -453,7 +462,6 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case CaSystemDescriptorTag:
          case AC3DescriptorTag:
          case DSNGDescriptorTag:
-         case AncillaryDataDescriptorTag:
          case AnnouncementSupportDescriptorTag:
          case AdaptationFieldDataDescriptorTag:
          case TransportStreamDescriptorTag:
@@ -500,6 +508,27 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
             break;
       }
       break;
+   case PCIT:
+      switch ((DescriptorTag)da.getData<DescriptorHeader>()->descriptor_tag) {
+         case ContentDescriptorTag:
+            d=new ContentDescriptor();
+            break;
+         case ShortEventDescriptorTag:
+            d=new ShortEventDescriptor();
+            break;
+         case ExtendedEventDescriptorTag:
+            d=new ExtendedEventDescriptor();
+            break;
+         case PremiereContentTransmissionDescriptorTag:
+            d=new PremiereContentTransmissionDescriptor();
+            break;
+         default:
+            if (!returnUnimplemetedDescriptor)
+               return 0;
+            d=new UnimplementedDescriptor();
+            break;
+      }
+      break;
    }
    d->setData(da);
    return d;
diff --git a/libsi/si.h b/libsi/si.h
index c8910ffb2..6922cdcda 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.13 2006/02/18 10:38:20 kls Exp $
+ *   $Id: si.h 1.14 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -43,7 +43,8 @@ enum TableId { TableIdPAT = 0x00, //program association section
                TableIdTOT = 0x73, //time offset section
                TableIdDIT = 0x7E, //discontinuity information section
                TableIdSIT = 0x7F, //service information section
-               TableIdAIT = 0x74  //application information section
+               TableIdAIT = 0x74, //application information section
+               TableIdPremiereCIT = 0xA0 //premiere content information section
              };
 
 
@@ -139,13 +140,15 @@ enum DescriptorTag {
                MHP_PrefetchDescriptorTag = 0x0C,
                MHP_DelegatedApplicationDescriptorTag = 0x0E,
                MHP_ApplicationStorageDescriptorTag = 0x10,
+  // Premiere private Descriptor Tags
+               PremiereContentTransmissionDescriptorTag = 0xF2,
 
                //a descriptor currently unimplemented in this library
                //the actual value 0xFF is "forbidden" according to the spec.
                UnimplementedDescriptorTag = 0xFF
 };
 
-enum DescriptorTagDomain { SI, MHP };
+enum DescriptorTagDomain { SI, MHP, PCIT };
 
 enum RunningStatus { RunningStatusUndefined = 0,
                      RunningStatusNotRunning = 1,
@@ -411,6 +414,12 @@ class MHP_DescriptorLoop : public DescriptorLoop {
    MHP_DescriptorLoop() { domain=MHP; }
 };
 
+//Premiere Content Information Table
+class PCIT_DescriptorLoop : public DescriptorLoop {
+public:
+   PCIT_DescriptorLoop() { domain=PCIT; }
+};
+
 //The content of the ExtendedEventDescriptor may be split over several
 //descriptors if the text is longer than 256 bytes.
 //The following classes provide base functionality to handle this case.
diff --git a/menu.c b/menu.c
index fba03a328..8c3fe2ec0 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.428 2006/04/09 14:29:24 kls Exp $
+ * $Id: menu.c 1.434 2006/04/16 12:20:46 kls Exp $
  */
 
 #include "menu.h"
@@ -32,6 +32,9 @@
 #define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
 #define DISKSPACECHEK     5 // seconds between disk space checks in the main menu
+#define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
+                            // within which it will go directly into the "Edit timer" menu to allow
+                            // further parameter settings
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
@@ -1152,9 +1155,10 @@ eOSState cMenuWhatsOn::Record(void)
         }
      else {
         Timers.Add(timer);
-        timer->Matches();
         Timers.SetModified();
         isyslog("timer %s added (active)", *timer->ToDescr());
+        if (timer->Matches(0, false, NEWTIMERLIMIT))
+           return AddSubMenu(new cMenuEditTimer(timer));
         if (HasSubMenu())
            CloseSubMenu();
         if (Update())
@@ -1400,9 +1404,10 @@ eOSState cMenuSchedule::Record(void)
         }
      else {
         Timers.Add(timer);
-        timer->Matches();
         Timers.SetModified();
         isyslog("timer %s added (active)", *timer->ToDescr());
+        if (timer->Matches(0, false, NEWTIMERLIMIT))
+           return AddSubMenu(new cMenuEditTimer(timer));
         if (HasSubMenu())
            CloseSubMenu();
         if (Update())
@@ -2031,7 +2036,7 @@ eOSState cMenuRecordings::Commands(eKeys Key)
      cRecording *recording = GetRecording(ri);
      if (recording) {
         char *parameter = NULL;
-        asprintf(&parameter, "'%s'", recording->FileName());
+        asprintf(&parameter, "\"%s\"", *strescape(recording->FileName(), "\"$"));
         cMenuCommands *menu;
         eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, parameter));
         free(parameter);
@@ -2299,7 +2304,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
   int numAudioLanguages;
   void Setup(void);
   const char *videoDisplayFormatTexts[3];
-  const char *updateChannelsTexts[5];
+  const char *updateChannelsTexts[6];
 public:
   cMenuSetupDVB(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -2315,9 +2320,10 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   videoDisplayFormatTexts[2] = tr("center cut out");
   updateChannelsTexts[0] = tr("no");
   updateChannelsTexts[1] = tr("names only");
-  updateChannelsTexts[2] = tr("names and PIDs");
-  updateChannelsTexts[3] = tr("add new channels");
-  updateChannelsTexts[4] = tr("add new transponders");
+  updateChannelsTexts[2] = tr("PIDs only");
+  updateChannelsTexts[3] = tr("names and PIDs");
+  updateChannelsTexts[4] = tr("add new channels");
+  updateChannelsTexts[5] = tr("add new transponders");
 
   SetSection(tr("DVB"));
   Setup();
@@ -2334,7 +2340,7 @@ void cMenuSetupDVB::Setup(void)
   if (data.VideoFormat == 0)
      Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"),     &data.UseDolbyDigital));
-  Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 5, updateChannelsTexts));
+  Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 6, updateChannelsTexts));
   Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nNumLanguages));
   for (int i = 0; i < numAudioLanguages; i++)
       Add(new cMenuEditStraItem(tr("Setup.DVB$Audio language"),    &data.AudioLanguages[i], I18nNumLanguages, I18nLanguages()));
@@ -2696,7 +2702,9 @@ void cMenuSetup::Set(void)
 
 eOSState cMenuSetup::Restart(void)
 {
-  if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?"))) {
+  if (Interface->Confirm(tr("Really restart?"))
+     && (!cRecordControls::Active() || Interface->Confirm(tr("Recording - restart anyway?")))
+     && !cPluginManager::Active(tr("Really restart?"))) {
      cThread::EmergencyExit(true);
      return osEnd;
      }
@@ -3156,6 +3164,10 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kLeft:
     case kRight|k_Repeat:
     case kRight:
+    case kNext|k_Repeat:
+    case kNext:
+    case kPrev|k_Repeat:
+    case kPrev:
          withInfo = false;
          number = 0;
          if (group < 0) {
@@ -3165,7 +3177,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             }
          if (group >= 0) {
             int SaveGroup = group;
-            if (NORMALKEY(Key) == kRight)
+            if (NORMALKEY(Key) == kRight || NORMALKEY(Key) == kNext)
                group = Channels.GetNextGroup(group) ;
             else
                group = Channels.GetPrevGroup(group < 1 ? 1 : group);
@@ -3199,6 +3211,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kDown|k_Release:
     case kChanUp|k_Release:
     case kChanDn|k_Release:
+    case kNext|k_Release:
+    case kPrev|k_Release:
          if (!(Key & k_Repeat) && channel && channel->Number() != cDevice::CurrentChannel())
             NewChannel = channel;
          withInfo = true;
@@ -3788,6 +3802,7 @@ cReplayControl::cReplayControl(void)
   marks.Load(fileName);
   cRecording Recording(fileName);
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
+  SetTrackDescriptions(false);
 }
 
 cReplayControl::~cReplayControl()
@@ -4143,8 +4158,12 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
       switch (Key) {
         // Editing:
         case kMarkToggle:      MarkToggle(); break;
+        case kPrev|k_Repeat:
+        case kPrev:
         case kMarkJumpBack|k_Repeat:
         case kMarkJumpBack:    MarkJump(false); break;
+        case kNext|k_Repeat:
+        case kNext:
         case kMarkJumpForward|k_Repeat:
         case kMarkJumpForward: MarkJump(true); break;
         case kMarkMoveBack|k_Repeat:
diff --git a/menuitems.c b/menuitems.c
index 8d7e50e25..e756e8df7 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.36 2006/04/09 13:10:02 kls Exp $
+ * $Id: menuitems.c 1.42 2006/04/14 10:41:28 kls Exp $
  */
 
 #include "menuitems.h"
@@ -23,22 +23,18 @@ const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@";
 
 cMenuEditItem::cMenuEditItem(const char *Name)
 {
-  name = strdup(Name);
-  value = NULL;
+  name = strdup(Name ? Name : "???");
 }
 
 cMenuEditItem::~cMenuEditItem()
 {
   free(name);
-  free(value);
 }
 
 void cMenuEditItem::SetValue(const char *Value)
 {
-  free(value);
-  value = strdup(Value);
   char *buffer = NULL;
-  asprintf(&buffer, "%s:\t%s", name, value);
+  asprintf(&buffer, "%s:\t%s", name, Value);
   SetText(buffer, false);
   cStatus::MsgOsdCurrentItem(buffer);
 }
@@ -102,7 +98,7 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
             if (*value > max) { *value = max; Set(); }
             return state;
        }
-     if ((!fresh || min <= newValue) && newValue <= max) {
+     if (newValue != *value && (!fresh || min <= newValue) && newValue <= max) {
         *value = newValue;
         Set();
         }
@@ -205,7 +201,7 @@ cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Al
 :cMenuEditItem(Name)
 {
   value = Value;
-  allowed = strdup(Allowed);
+  allowed = strdup(Allowed ? Allowed : "");
   current = strchr(allowed, *Value);
   if (!current)
      current = allowed;
@@ -254,7 +250,7 @@ cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, co
   orgValue = NULL;
   value = Value;
   length = Length;
-  allowed = strdup(Allowed);
+  allowed = strdup(Allowed ? Allowed : "");
   pos = -1;
   insert = uppercase = false;
   newchar = true;
@@ -572,7 +568,7 @@ void cMenuEditChanItem::Set(void)
      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
      SetValue(buf);
      }
-  else
+  else if (noneString)
      SetValue(noneString);
 }
 
@@ -602,7 +598,7 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
 // --- cMenuEditTranItem -----------------------------------------------------
 
 cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value, int *Source)
-:cMenuEditChanItem(Name, &number)
+:cMenuEditChanItem(Name, &number, "-")
 {
   number = 0;
   source = Source;
@@ -626,6 +622,10 @@ eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
      *source = channel->Source();
      *transponder = channel->Transponder();
      }
+  else {
+     *source = 0;
+     *transponder = 0;
+     }
   return state;
 }
 
diff --git a/menuitems.h b/menuitems.h
index 20d1ebb00..2454f95a9 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.19 2006/04/09 12:56:48 kls Exp $
+ * $Id: menuitems.h 1.20 2006/04/14 10:01:47 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -17,7 +17,6 @@ extern const char *FileNameChars;
 class cMenuEditItem : public cOsdItem {
 private:
   char *name;
-  char *value;
 public:
   cMenuEditItem(const char *Name);
   ~cMenuEditItem();
diff --git a/newplugin b/newplugin
index 1800b7f4c..2a7cac2ac 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.22 2005/11/11 13:20:14 kls Exp $
+# $Id: newplugin 1.26 2006/04/17 09:49:13 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -75,7 +75,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -84,9 +83,9 @@ TMPDIR = /tmp
 
 -include \$(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = \$(shell grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g')
+APIVERSION = \$(shell grep 'define APIVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -95,7 +94,7 @@ PACKAGE = vdr-\$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I\$(VDRDIR)/include -I\$(DVBDIR)/include
+INCLUDES += -I\$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
@@ -123,7 +122,7 @@ all: libvdr-\$(PLUGIN).so
 
 libvdr-\$(PLUGIN).so: \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
-	\@cp \$\@ \$(LIBDIR)/\$\@.\$(VDRVERSION)
+	\@cp \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
 
 dist: clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
@@ -166,6 +165,8 @@ public:
   virtual bool Start(void);
   virtual void Stop(void);
   virtual void Housekeeping(void);
+  virtual void MainThreadHook(void);
+  virtual cString Active(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
@@ -221,6 +222,18 @@ void cPlugin${PLUGIN_CLASS}::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
+void cPlugin${PLUGIN_CLASS}::MainThreadHook(void)
+{
+  // Perform actions in the context of the main program thread.
+  // WARNING: Use with great care - see PLUGINS.html!
+}
+
+cString cPlugin${PLUGIN_CLASS}::Active(void)
+{
+  // Return a message string if shutdown should be postponed
+  return NULL;
+}
+
 cOsdObject *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
diff --git a/nit.c b/nit.c
index 73b1df247..27b90fd18 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.10 2004/10/17 12:00:54 kls Exp $
+ * $Id: nit.c 1.11 2006/04/15 14:10:42 kls Exp $
  */
 
 #include "nit.h"
@@ -116,12 +116,12 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 4)
+                        if (Setup.UpdateChannels >= 5)
                            Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
                         found = true;
                         }
                      }
-                 if (!found && Setup.UpdateChannels >= 4) {
+                 if (!found && Setup.UpdateChannels >= 5) {
                     cChannel *Channel = new cChannel;
                     Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                     if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate))
@@ -151,12 +151,12 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 4)
+                        if (Setup.UpdateChannels >= 5)
                            Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
                         found = true;
                         }
                      }
-                 if (!found && Setup.UpdateChannels >= 4) {
+                 if (!found && Setup.UpdateChannels >= 5) {
                     cChannel *Channel = new cChannel;
                     Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                     if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate))
@@ -193,12 +193,12 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 4)
+                        if (Setup.UpdateChannels >= 5)
                            Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
                         found = true;
                         }
                      }
-                 if (!found && Setup.UpdateChannels >= 4) {
+                 if (!found && Setup.UpdateChannels >= 5) {
                     cChannel *Channel = new cChannel;
                     Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                     if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
diff --git a/plugin.c b/plugin.c
index 69d558cf0..82cbd6925 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.18 2006/04/09 14:16:17 kls Exp $
+ * $Id: plugin.c 1.22 2006/04/17 09:20:05 kls Exp $
  */
 
 #include "plugin.h"
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include "config.h"
+#include "interface.h"
 
 #define LIBVDR_PREFIX  "libvdr-"
 #define SO_INDICATOR   ".so."
@@ -69,6 +70,15 @@ void cPlugin::Housekeeping(void)
 {
 }
 
+void cPlugin::MainThreadHook(void)
+{
+}
+
+cString cPlugin::Active(void)
+{
+  return NULL;
+}
+
 const char *cPlugin::MainMenuEntry(void)
 {
   return NULL;
@@ -284,7 +294,7 @@ void cPluginManager::AddPlugin(const char *Args)
               if (p) {
                  *p = 0;
                  p += strlen(SO_INDICATOR);
-                 if (strcmp(p, VDRVERSION) == 0) {
+                 if (strcmp(p, APIVERSION) == 0) {
                     char *name = e->d_name + strlen(LIBVDR_PREFIX);
                     if (strcmp(name, "*") != 0) { // let's not get into a loop!
                        AddPlugin(e->d_name + strlen(LIBVDR_PREFIX));
@@ -300,7 +310,7 @@ void cPluginManager::AddPlugin(const char *Args)
   if (p)
      *p = 0;
   char *buffer = NULL;
-  asprintf(&buffer, "%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, VDRVERSION);
+  asprintf(&buffer, "%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION);
   dlls.Add(new cDll(buffer, Args));
   free(buffer);
   free(s);
@@ -364,6 +374,32 @@ void cPluginManager::Housekeeping(void)
      }
 }
 
+void cPluginManager::MainThreadHook(void)
+{
+  for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
+      cPlugin *p = dll->Plugin();
+      if (p)
+         p->MainThreadHook();
+      }
+}
+
+bool cPluginManager::Active(const char *Prompt)
+{
+  if (pluginManager) {
+     for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
+         cPlugin *p = dll->Plugin();
+         if (p) {
+            cString s = p->Active();
+            if (!isempty(*s)) {
+               if (!Prompt || !Interface->Confirm(cString::sprintf("%s - %s", *s, Prompt)))
+                  return true;
+               }
+            }
+         }
+     }
+  return false;
+}
+
 bool cPluginManager::HasPlugins(void)
 {
   return pluginManager && pluginManager->dlls.Count();
@@ -424,9 +460,13 @@ void cPluginManager::StopPlugins(void)
       }
 }
 
-void cPluginManager::Shutdown(void)
+void cPluginManager::Shutdown(bool Log)
 {
   cDll *dll;
-  while ((dll = dlls.Last()) != NULL)
+  while ((dll = dlls.Last()) != NULL) {
+        cPlugin *p = dll->Plugin();
+        if (p && Log)
+           isyslog("deleting plugin: %s", p->Name());
         dlls.Del(dll);
+        }
 }
diff --git a/plugin.h b/plugin.h
index 2d9f98330..19db61346 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.10 2005/08/27 16:13:17 kls Exp $
+ * $Id: plugin.h 1.13 2006/04/17 09:18:16 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -39,6 +39,8 @@ class cPlugin {
   virtual bool Start(void);
   virtual void Stop(void);
   virtual void Housekeeping(void);
+  virtual void MainThreadHook(void);
+  virtual cString Active(void);
 
   virtual const char *MainMenuEntry(void);
   virtual cOsdObject *MainMenuAction(void);
@@ -89,13 +91,15 @@ class cPluginManager {
   bool InitializePlugins(void);
   bool StartPlugins(void);
   void Housekeeping(void);
+  void MainThreadHook(void);
+  static bool Active(const char *Prompt = NULL);
   static bool HasPlugins(void);
   static cPlugin *GetPlugin(int Index);
   static cPlugin *GetPlugin(const char *Name);
   static cPlugin *CallFirstService(const char *Id, void *Data = NULL);
   static bool CallAllServices(const char *Id, void *Data = NULL);
   void StopPlugins(void);
-  void Shutdown(void);
+  void Shutdown(bool Log = false);
   };
 
 #endif //__PLUGIN_H
diff --git a/recording.c b/recording.c
index fa21df213..fabf5698d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.144 2006/04/09 13:49:51 kls Exp $
+ * $Id: recording.c 1.146 2006/04/17 12:47:59 kls Exp $
  */
 
 #include "recording.h"
@@ -192,7 +192,7 @@ void AssertFreeDiskSpace(int Priority, bool Force)
      }
 }
 
-// --- cResumeFile ------------------------------------------------------------
+// --- cResumeFile -----------------------------------------------------------
 
 cResumeFile::cResumeFile(const char *FileName)
 {
@@ -389,7 +389,10 @@ bool cRecordingInfo::Write(FILE *f, const char *Prefix) const
 struct tCharExchange { char a; char b; };
 tCharExchange CharExchange[] = {
   { '~',  '/'    },
+  { '/',  '~'    },
   { ' ',  '_'    },
+  // backwards compatibility:
+  { '\'', '\''   },
   { '\'', '\x01' },
   { '/',  '\x02' },
   { 0, 0 }
diff --git a/remote.c b/remote.c
index 4504533c3..c0b92867e 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.49 2006/01/29 14:43:07 kls Exp $
+ * $Id: remote.c 1.50 2006/04/17 08:58:28 kls Exp $
  */
 
 #include "remote.h"
@@ -145,10 +145,23 @@ bool cRemote::Put(const char *Code, bool Repeat, bool Release)
   return false;
 }
 
-void cRemote::CallPlugin(const char *Plugin)
+bool cRemote::CallPlugin(const char *Plugin)
 {
-  plugin = Plugin;
-  Put(k_Plugin);
+  cMutexLock MutexLock(&mutex);
+  if (!plugin) {
+     plugin = Plugin;
+     Put(k_Plugin);
+     return true;
+     }
+  return false;
+}
+
+const char *cRemote::GetPlugin(void)
+{
+  cMutexLock MutexLock(&mutex);
+  const char *p = plugin;
+  plugin = NULL;
+  return p;
 }
 
 bool cRemote::HasKeys(void)
diff --git a/remote.h b/remote.h
index ce6055ffe..3a2bb7498 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.34 2006/03/31 14:18:44 kls Exp $
+ * $Id: remote.h 1.35 2006/04/17 08:59:48 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -46,11 +46,18 @@ class cRemote : public cListObject {
   static void Clear(void);
   static bool Put(eKeys Key, bool AtFront = false);
   static bool PutMacro(eKeys Key);
-  static void CallPlugin(const char *Plugin);
+  static bool CallPlugin(const char *Plugin);
       ///< Initiates calling the given plugin's main menu function.
       ///< The Plugin parameter is the name of the plugin, and must be
-      ///< a static string.
-  static const char *GetPlugin(void) { return plugin; }
+      ///< a static string. Returns true if the plugin call was successfully
+      ///< initiated (the actual call to the plugin's main menu function
+      ///< will take place some time later, during the next execution
+      ///< of VDR's main loop). If there is already a plugin call pending
+      ///< false will be returned and the caller should try again later.
+  static const char *GetPlugin(void);
+      ///< Returns the name of the plugin that was set with a previous
+      ///< call to CallPlugin(). The internally stored pointer to the
+      ///< plugin name will be reset to NULL by this call.
   static bool HasKeys(void);
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   };
diff --git a/remux.c b/remux.c
index ae4a17a61..2d1b74143 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.55 2006/03/25 12:27:30 kls Exp $
+ * $Id: remux.c 1.56 2006/04/17 12:48:12 kls Exp $
  */
 
 #include "remux.h"
@@ -148,7 +148,7 @@ int cRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count
   return n;
 }
 
-// --- cCommonRepacker --------------------------------------------------------
+// --- cCommonRepacker -------------------------------------------------------
 
 class cCommonRepacker : public cRepacker {
 protected:
diff --git a/sdt.c b/sdt.c
index 74c55032f..f42b08551 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.15 2005/08/27 09:27:47 kls Exp $
+ * $Id: sdt.c 1.16 2006/04/15 14:12:21 kls Exp $
  */
 
 #include "sdt.h"
@@ -78,7 +78,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         char *pp = compactspace(ProviderNameBuf);
                         if (channel) {
                            channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
-                           if (Setup.UpdateChannels >= 1)
+                           if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3)
                               channel->SetName(pn, ps, pp);
                            // Using SiSdtService.getFreeCaMode() is no good, because some
                            // tv stations set this flag even for non-encrypted channels :-(
@@ -86,7 +86,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            // and would have been overwritten with real CA values later:
                            // channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
                            }
-                        else if (*pn && Setup.UpdateChannels >= 3) {
+                        else if (*pn && Setup.UpdateChannels >= 4) {
                            channel = Channels.NewChannel(Channel(), pn, ps, pp, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            patFilter->Trigger();
                            }
@@ -111,7 +111,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::NVODReferenceDescriptor::Service Service;
                  for (SI::Loop::Iterator it; nrd->serviceLoop.getNext(Service, it); ) {
                      cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
-                     if (!link && Setup.UpdateChannels >= 3) {
+                     if (!link && Setup.UpdateChannels >= 4) {
                         link = Channels.NewChannel(Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
                         patFilter->Trigger();
                         }
diff --git a/sources.conf b/sources.conf
index 09ee0a413..f3da9ab0f 100644
--- a/sources.conf
+++ b/sources.conf
@@ -29,7 +29,7 @@ S21.0E  Afristar 1
 S21.6E  Eutelsat W6
 S23.5E  Astra 1D 3A
 S26E    Arabsat 2D/2C/3A
-S28.2E  Astra 2D/A/B 
+S28.2E  Astra 2D/A/B
 S28.5E  Eurobird 1 & Astra 2A/B/D
 S30.5E  Arabsat 2B
 S33E    Eurobird 3 & Intelsat 802
@@ -46,11 +46,11 @@ S56E    Bonum 1
 S57E    NSS 703
 S60E    Intelsat 904
 S62E    Intelsat 902
-S64E    Intelsat 906 
+S64E    Intelsat 906
 S66E    Intelsat 704
 S68.5E  PAS 7/10
 S70.5E  Eutelsat W5
-S72E    PAS 4 
+S72E    PAS 4
 
 # Asia
 
@@ -67,7 +67,7 @@ S90E    Yamal 201
 S91.5E  Measat 1
 S93.5E  Insat 3A
 S95E    NSS 6
-S96.5E  Express AM 11  
+S96.5E  Express AM 11
 S100.5E Asiasat 2
 S103E   Express A2
 S105.5E Asiasat 3S
diff --git a/spu.c b/spu.c
index 9ca25a154..ebe4192de 100644
--- a/spu.c
+++ b/spu.c
@@ -6,13 +6,13 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.c 1.2 2006/03/26 14:07:59 kls Exp $
+ * $Id: spu.c 1.3 2006/04/17 12:48:33 kls Exp $
  */
 
 #include "spu.h"
 #include <inttypes.h>
 
-// -- cSpuDecoder ----------------
+// -- cSpuDecoder ------------------------------------------------------------
 /*
 cSpuDecoder::cSpuDecoder()
 {};
diff --git a/spu.h b/spu.h
index 0437a322c..39c721fbc 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 1.4 2005/02/20 11:21:31 kls Exp $
+ * $Id: spu.h 1.5 2006/04/17 12:48:55 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
@@ -14,7 +14,7 @@
 
 #include <inttypes.h>
 
-// --- cSpuDecoder -------------------------------------------
+// --- cSpuDecoder -----------------------------------------------------------
 
 class cSpuDecoder {
   public:
diff --git a/summary2info.pl b/summary2info.pl
index 5d68d7944..15300e5d9 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 1.5 2005/09/17 09:20:31 kls Exp $
+# $Id: summary2info.pl 1.6 2006/04/17 12:19:24 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
@@ -41,7 +41,7 @@
        # if line 1 is too long, it can't be the short text,
        # so assume the short text is missing and concatenate
        # line 1 and line 2 to be the long text:
-       if (length($data[1]) > 80) { 
+       if (length($data[1]) > 80) {
           $data[2] = $data[1] . "|" . $data[2];
           $data[1] = "";
           }
diff --git a/svdrp.c b/svdrp.c
index 0cf73e9f2..e0b56e432 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.94 2006/03/26 09:14:13 kls Exp $
+ * $Id: svdrp.c 1.95 2006/04/17 09:02:23 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1351,8 +1351,10 @@ void cSVDRP::CmdPLUG(const char *Option)
               }
            }
         else if (strcasecmp(cmd, "MAIN") == 0) {
-           cRemote::CallPlugin(plugin->Name());
-           Reply(250, "Initiated call to main menu function of plugin \"%s\"", plugin->Name());
+           if (cRemote::CallPlugin(plugin->Name()))
+              Reply(250, "Initiated call to main menu function of plugin \"%s\"", plugin->Name());
+           else
+              Reply(550, "A plugin call is already pending - please try again later");
            }
         else {
            int ReplyCode = 900;
diff --git a/svdrphosts.conf b/svdrphosts.conf
index dec9c42a0..57cdc1602 100644
--- a/svdrphosts.conf
+++ b/svdrphosts.conf
@@ -3,7 +3,7 @@
 #               are allowed to connect to the SVDRP port of the Video
 #               Disk Recorder (VDR) running on this system.
 # Syntax:
-#    
+#
 # IP-Address[/Netmask]
 #
 
diff --git a/tools.c b/tools.c
index 18f953764..b1decf2ef 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.115 2006/03/19 12:28:16 kls Exp $
+ * $Id: tools.c 1.116 2006/04/17 12:19:31 kls Exp $
  */
 
 #include "tools.h"
@@ -39,7 +39,7 @@ void syslog_with_tid(int priority, const char *format, ...)
   snprintf(fmt, sizeof(fmt), "[%d] %s", cThread::ThreadId(), format);
   va_start(ap, format);
   vsyslog(priority, fmt, ap);
-  va_end(ap); 
+  va_end(ap);
 }
 
 int BCD2INT(int x)
diff --git a/tools.h b/tools.h
index a52ced81f..0d7941401 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.92 2006/02/04 14:27:05 kls Exp $
+ * $Id: tools.h 1.93 2006/04/16 10:40:45 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -52,7 +52,7 @@ template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #endif
 
-void syslog_with_tid(int priority, const char *format, ...);
+void syslog_with_tid(int priority, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
 
 #define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
 int BCD2INT(int x);
diff --git a/vdr.1 b/vdr.1
index 9bc5b4fb1..829eb215f 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.22 2006/01/14 11:09:08 kls Exp $
+.\" $Id: vdr.1 1.23 2006/04/14 13:03:18 kls Exp $
 .\"
-.TH vdr 1 "08 Jan 2006" "1.3.38" "Video Disk Recorder"
+.TH vdr 1 "14 Apr 2006" "1.3.47" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -22,10 +22,12 @@ implements a complete digital Set-Top Box and Video Recorder.
 It can work with signals received from satellites (DVB-S) as
 well as cable (DVB-C) and terrestrial (DVB-T) signals.
 
-At least one DVB card is required to run \fBvdr\fR, but in order
-to watch one broadcast while recording another, or to start watching
-a recorded programme before the live broadcast has ended (\fBtime shifting\fR),
-two DVB cards are necessary. By default \fBvdr\fR can support up to four
+At least one DVB card is required to run \fBvdr\fR. With it you can watch
+live tv while recording one or more other broadcasts from the same transponder.
+It is also possible to start watching a recorded programme before the live
+broadcast has ended (\fBtime shifting\fR). In order to record from different
+transponders simultaneously two or more DVB cards are necessary.
+By default \fBvdr\fR can support up to four
 DVB cards. The primary DVB card (the one your tv set is connected to) has
 to be a "full featured" card, which means it must contain an MPEG decoder
 and provide audio and video signal outputs.
diff --git a/vdr.c b/vdr.c
index 8d9ab54a6..2ab3d5391 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.254 2006/04/09 12:22:46 kls Exp $
+ * $Id: vdr.c 1.262 2006/04/17 14:43:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
 
   // Set user id in case we were started as root:
 
-  if (VdrUser && getuid() == 0) {
+  if (VdrUser && geteuid() == 0) {
      StartedAsRoot = true;
      if (strcmp(VdrUser, "root")) {
         if (!SetKeepCaps(true))
@@ -980,6 +980,8 @@ int main(int argc, char *argv[])
                           if (Interface->Confirm(tr("Recording - shut down anyway?")))
                              ForceShutdown = true;
                           }
+                       if (cPluginManager::Active(tr("shut down anyway?")))
+                          ForceShutdown = true;
                        LastActivity = 1; // not 0, see below!
                        UserShutdown = true;
                        break;
@@ -1051,6 +1053,7 @@ int main(int argc, char *argv[])
               }
            switch (key) {
              // Toggle channels:
+             case kChanPrev:
              case k0: {
                   if (PreviousChannel[PreviousChannelIndex ^ 1] == LastChannel || LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
                      PreviousChannelIndex ^= 1;
@@ -1059,11 +1062,16 @@ int main(int argc, char *argv[])
                   }
              // Direct Channel Select:
              case k1 ... k9:
-             // Left/Right rotates trough channel groups:
+             // Left/Right rotates through channel groups:
              case kLeft|k_Repeat:
              case kLeft:
              case kRight|k_Repeat:
              case kRight:
+             // Previous/Next rotates through channel groups:
+             case kPrev|k_Repeat:
+             case kPrev:
+             case kNext|k_Repeat:
+             case kNext:
              // Up/Down Channel Select:
              case kUp|k_Repeat:
              case kUp:
@@ -1093,7 +1101,7 @@ int main(int argc, char *argv[])
                  Skins.Message(mtInfo, tr("Editing process finished"));
               }
            }
-        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
+        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && !cPluginManager::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
@@ -1130,7 +1138,8 @@ int main(int argc, char *argv[])
                        cControl::Shutdown();
                        int Channel = timer ? timer->Channel()->Number() : 0;
                        const char *File = timer ? timer->File() : "";
-                       Delta = Next - time(NULL); // compensates for Confirm() timeout
+                       if (timer)
+                          Delta = Next - time(NULL); // compensates for Confirm() timeout
                        char *cmd;
                        asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, *strescape(File, "\"$"), UserShutdown);
                        isyslog("executing '%s'", cmd);
@@ -1157,6 +1166,8 @@ int main(int argc, char *argv[])
               PluginManager.Housekeeping();
               }
            }
+        // Main thread hooks of plugins:
+        PluginManager.MainThreadHook();
         }
   if (Interrupted)
      isyslog("caught signal %d", Interrupted);
@@ -1179,7 +1190,7 @@ int main(int argc, char *argv[])
      Setup.Save();
      }
   cDevice::Shutdown();
-  PluginManager.Shutdown();
+  PluginManager.Shutdown(true);
   cSchedules::Cleanup(true);
   ReportEpgBugFixStats();
   if (WatchdogTimeout > 0)

From 880c3ddb94c09d6cca411363ed6f981d4e150fd2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Apr 2006 18:00:00 +0200
Subject: [PATCH 140/307] =?UTF-8?q?Version=201.3.48=20-=20Updated=20the=20?=
 =?UTF-8?q?GPL=20copies=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Fixed?=
 =?UTF-8?q?=20several=20spelling=20errors=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4).=20-=20Updated=20the=20Polish=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Jaroslaw=20Swierczynski).=20-=20Updated=20the=20Finnish?=
 =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Update?=
 =?UTF-8?q?d=20the=20French=20OSD=20texts=20(thanks=20to=20Pierre=20Briec)?=
 =?UTF-8?q?.=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Arthur=20Konovalov).=20-=20Updated=20the=20Romanian=20OSD=20?=
 =?UTF-8?q?texts=20(thanks=20to=20Lucian=20Muresan).=20-=20Updated=20the?=
 =?UTF-8?q?=20Danish=20OSD=20texts=20(thanks=20to=20Mogens=20Elneff).=20-?=
 =?UTF-8?q?=20Updated=20the=20Russian=20OSD=20texts=20(thanks=20to=20Oleg?=
 =?UTF-8?q?=20Roitburd).=20-=20Updated=20the=20Slovenian=20OSD=20texts=20(?=
 =?UTF-8?q?thanks=20to=20Matjaz=20Thaler).=20-=20Fixed=20wrong=20credits?=
 =?UTF-8?q?=20for=20the=20patch=20that=20was=20used=20to=20implement=20cPl?=
 =?UTF-8?q?ugin::Active().=20-=20Simplified=20the=20'grep|awk|sed'=20comma?=
 =?UTF-8?q?nd=20to=20retrieve=20the=20VDR/APIVERSION=20to=20a=20single=20?=
 =?UTF-8?q?=20=20'sed'=20call.=20-=20Updated=20the=20Swedish=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Tomas=20Prybil).=20-=20Modified=20the=20Germa?=
 =?UTF-8?q?n=20OSD=20texts=20to=20be=20"less=20technical"=20(thanks=20to?=
 =?UTF-8?q?=20Andreas=20Brachold).=20-=20Extended=20the=20version=20number?=
 =?UTF-8?q?=20reported=20with=20the=20'-V'=20option=20to=20also=20show=20t?=
 =?UTF-8?q?he=20=20=20current=20APIVERSION=20(suggested=20by=20Thomas=20G?=
 =?UTF-8?q?=C3=BCnther).=20-=20Fixed=20handling=20empty=20titles=20in=20cE?=
 =?UTF-8?q?vent::FixEpgBugs()=20(reported=20by=20Rolf=20Ahrenberg).=20-=20?=
 =?UTF-8?q?Fixed=20some=20missing=20'-'=20in=20the=20German=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Walter=20Koch).=20-=20Added=20an=20error=20me?=
 =?UTF-8?q?ssage=20about=20plugins=20that=20don't=20honor=20APIVERSION=20i?=
 =?UTF-8?q?n=20their=20Makefile=20=20=20(based=20on=20a=20suggestion=20by?=
 =?UTF-8?q?=20Udo=20Richter).=20-=20Fixed=20a=20format=20string=20in=20rec?=
 =?UTF-8?q?ording.c=20to=20avoid=20a=20compiler=20warning=20on=2064bit=20s?=
 =?UTF-8?q?ystems=20=20=20(thanks=20to=20Christian=20Wieninger=20for=20rep?=
 =?UTF-8?q?orting,=20and=20Werner=20Schweer=20for=20pointing=20out=20=20?=
 =?UTF-8?q?=20that=20the=20'z'=20modifier=20should=20be=20used=20here).=20?=
 =?UTF-8?q?-=20Ignoring=20k=5FRepeat=20when=20deciding=20whether=20the=20s?=
 =?UTF-8?q?ame=20key=20has=20been=20pressed=20in=20string=20=20=20input=20?=
 =?UTF-8?q?fields=20(based=20on=20a=20patch=20from=20Marko=20M=C3=A4kel?=
 =?UTF-8?q?=C3=A4).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     |  49 +++--
 COPYING                          |  18 +-
 HISTORY                          |  45 +++-
 INSTALL                          |   4 +-
 MANUAL                           |   2 +-
 Makefile                         |  13 +-
 PLUGINS.html                     |  24 +-
 PLUGINS/src/hello/COPYING        |  18 +-
 PLUGINS/src/hello/HISTORY        |   4 +
 PLUGINS/src/hello/Makefile       |   4 +-
 PLUGINS/src/hello/hello.c        |   4 +-
 PLUGINS/src/hello/i18n.c         |  14 +-
 PLUGINS/src/osddemo/COPYING      |  18 +-
 PLUGINS/src/osddemo/Makefile     |   4 +-
 PLUGINS/src/servicedemo/COPYING  |  18 +-
 PLUGINS/src/servicedemo/Makefile |   4 +-
 PLUGINS/src/skincurses/COPYING   |  18 +-
 PLUGINS/src/skincurses/Makefile  |   4 +-
 PLUGINS/src/sky/COPYING          |  18 +-
 PLUGINS/src/sky/Makefile         |   4 +-
 PLUGINS/src/status/COPYING       |  18 +-
 PLUGINS/src/status/Makefile      |   4 +-
 PLUGINS/src/svdrpdemo/COPYING    |  18 +-
 PLUGINS/src/svdrpdemo/Makefile   |   4 +-
 README                           |   2 +-
 README.developer                 |  82 -------
 README.vps                       | 137 ------------
 UPDATE-1.4.0                     |  25 ++-
 channels.conf                    |  22 +-
 config.h                         |   6 +-
 epg.c                            |   4 +-
 i18n.c                           | 366 +++++++++++++++----------------
 menuitems.c                      |  10 +-
 newplugin                        |   4 +-
 recording.c                      |   4 +-
 timers.c                         |   4 +-
 tools.c                          |   4 +-
 vdr.5                            |   8 +-
 vdr.c                            |   6 +-
 39 files changed, 428 insertions(+), 587 deletions(-)
 delete mode 100644 README.developer
 delete mode 100644 README.vps

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 61baad09b..b798ebc8c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,5 @@
 Tons of suggestions, bugreports, patches and other contributions have been
-provided by the people on the 'linux-dvb' and 'vdr' mailing lists.
+provided by the people on the 'linux-dvb' and 'vdr' mailing lists
 Special thanks go to the following individuals (if your name is missing here,
 please send an email to kls@cadsoft.de):
 
@@ -48,7 +48,7 @@ Niels de Carpentier <niels@casema.net>
 Martin Hammerschmid <martin@hammerschmid.com>
  for suggesting to display the direct channel select input on the OSD
  for suggesting to use the "Blue" button in the main menu to resume replay
- for implementing pege up/down with the "Left" and "Right" keys
+ for implementing page up/down with the "Left" and "Right" keys
  for detecting a deadlock when switching channels via Schedule/Now|Next/Switch
  for adding a missing #include to ringbuffer.c
  for adding a missing 'public' keyword in device.h
@@ -300,7 +300,7 @@ Werner Fink <werner@suse.de>
  recordings can be triggered in the default branch
  for pointing out that pesAssembler->Reset() needs to be called between subsequent
  Transfer Modes
- for suggestions that led to the addition of the 'Id' parameter to cAudio::Play().
+ for suggestions that led to the addition of the 'Id' parameter to cAudio::Play()
  for pointing out that MAXDPIDS needs to be to 16 (8xAC3 + 8xDTS)
  for reporting a problem with ensuring there is a current audio track in case there
  is only one track
@@ -377,7 +377,7 @@ Hannu Savolainen <hannu@opensound.com>
  for translating OSD texts to the Finnish language
 
 J�rgen Schmidt <ju@ct.heise.de>
- for fixing a problem with 'in_addr_t' on systems with glibc < 2.2.
+ for fixing a problem with 'in_addr_t' on systems with glibc < 2.2
  for suggesting to optionally allow logging to LOG_LOCALn (n=0..7)
 
 Uwe Freese <mail@uwe-freese.de>
@@ -444,7 +444,7 @@ Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
 
 Michael Moster <dvb@juelich-gmbh.de>
- for initally reporting the problem with wrong EPG data in the Schedules menu
+ for initially reporting the problem with wrong EPG data in the Schedules menu
  (somehow I had misplaced his message...)
 
 Tobias Kerner <tobschle@gmx.de>
@@ -833,6 +833,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
  for reporting '\n' in an esyslog() call in osd.c
  for reporting missing '&' in the SetAreas() example in PLUGINS.html
  for reporting a memory leak in cString::operator=()
+ for a patch that was used as a base to implement cPlugin::Active()
 
 Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
  for modifying LOF handling to allow for C-band reception
@@ -883,6 +884,7 @@ Andreas Brachold <vdr04@deltab.de>
  for fixing the "plugins-clean" and "plugins-install" targets in the Makefile
  for suggesting to make the log messages regarding lost lock of devices "info"
  instead of "error"
+ for modifying the German OSD texts to be "less technical"
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
@@ -944,7 +946,7 @@ Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and
  for translating OSD texts to the Catalanian language
 
 Lars Bl�ser <LBlaeser@hofheim.de>
- for reporting a bug in EPG bugfix statistics which made log entires for undefined
+ for reporting a bug in EPG bugfix statistics which made log entries for undefined
  channels
 
 Niko Tarnanen <niko.tarnanen@hut.fi>
@@ -973,6 +975,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding a missing "Button$" for the Timer button and "Key$" in skinclassic.c
  for reporting a bug in handling the color button texts when switching from the
  'Schedule' menu of a channel without EPG info to the 'What's on now' menu
+ for reporting a bug in handling empty titles in cEvent::FixEpgBugs()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1084,7 +1087,7 @@ Richard Robson <richard_robson@beeb.net>
  device used by the timer, and the timer needs a different transponder
 
 Manfred Schmidt-Voigt <manfred.schmidt-voigt@mannitec.de>
- for reporting a problem with runnign out of disk space while cutting in case
+ for reporting a problem with running out of disk space while cutting in case
  there are still deleted recordings to remove
 
 Javier Marcet <lists@marcet.info>
@@ -1098,7 +1101,7 @@ Robert Bartl <robert@bartl.priv.at>
  for reporting a hangup in SVDRP when the client disappears without sending QUIT
 
 Sebastian Frei <sebastian@schnapsleichen.de>
- for his support in keeping 'channels.conf' up-to-date.
+ for his support in keeping 'channels.conf' up-to-date
  for suggesting to rename the Makefile target 'plugins-clean' to 'clean-plugins'
 
 Rene Bartsch <ml@bartschnet.de>
@@ -1278,7 +1281,7 @@ Marco Schl
  for avoiding unnecessary section filter start/stops
  for pointing out that if one PID can't be added, the whole cDevice::AttachReceiver()
  should fail and all PIDs added so far should be deleted
- for fixing attaching a cPlayer to a cDevice, so that 'Operation not permited'
+ for fixing attaching a cPlayer to a cDevice, so that 'Operation not permitted'
  errors don't occur any more
  for reporting a problem with initialization of the main program loop variables
  with older compiler versions
@@ -1297,7 +1300,7 @@ Marco Schl
  when clearing the transfer buffer to avoid overflows
  for adding CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime()
  for suggesting to force a new resync after a call to cRemux::Clear()
- for suggestions that led to the addition of the 'Id' parameter to cAudio::Play().
+ for suggestions that led to the addition of the 'Id' parameter to cAudio::Play()
  for removing the "Cleared/PlayPes(NULL, 0)" handling from cTransfer::Action(), since
  this is now done when attaching the player to the device
  for adding DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer
@@ -1407,6 +1410,8 @@ Udo Richter <udo_richter@gmx.de>
  case a replay is active
  for reporting a problem with plugins that report errors when VDR is run with the
  --help or --version option
+ for suggesting to add a warning about plugins that don't honor APIVERSION in their
+ Makefile
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1489,7 +1494,7 @@ Laurence Abbott <laz@club-burniston.co.uk>
 
 Patrick Gleichmann <patrick@feedface.com>
  for fixing the default quality value when grabbing a JPEG image
- for suggestiong a modified page scrolling behaviour
+ for suggesting a modified page scrolling behaviour
  for suggesting wrapping around in menu lists
 
 Achim Tuffentsammer <a.tuffentsammer@web.de>
@@ -1505,6 +1510,7 @@ Marco Kremer <vdr.hgm.bg@gmx.net>
 
 Walter Koch <koch@u32.de>
  for adding channels for DVB-T D�sseldorf and K�ln (Germany) to channels.cont.terr
+ for fixing some missing '-' in the German OSD texts
 
 Rolf Groppe <rolf@groppe.de>
  for suggesting to fall back to 'stereo' when switching channels in case the user
@@ -1563,6 +1569,8 @@ Ville Skytt
  in case it breaks
  for enabling generating a core dump if VDR is run with a different user id
  for reporting an obsolete entry 'S21.5E' in the default 'diseqc.conf'
+ for updating the GPL copies
+ for fixing several spelling errors
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1623,7 +1631,7 @@ Bernhard Stegmaier <bernhard.stegmaier@in.tum.de>
  scan timeout is set to 0
 
 Klaus Heppenheimer <klaus@reel-multimedia.com>
- for reporting a race condition in cTransfer.
+ for reporting a race condition in cTransfer
 
 Thomas G�nther <tom1@toms-cafe.de>
  for fixing handling the frame number display if '7' is pressed before the first
@@ -1634,6 +1642,8 @@ Thomas G
  for making the 'new' indicator in the Recordings menu kept up-to-date
  for reporting a crash when setting the time transponder in the Setup menu
  for reporting a bug in the initial setting of the time transponder setup parameter
+ for suggesting to extend the version number reported with the '-V' option to also
+ show the current APIVERSION
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -1655,6 +1665,8 @@ Harald Milz <hm@seneca.muc.de>
 Marko M�kel� <marko.makela@hut.fi>
  for making repeat keys be ignored when waiting for a keypress to cancel an operation
  for reporting that a menu was automatically closed when a replay ends
+ for suggesting to ignore k_Repeat when deciding whether the same key has been
+ pressed in string input fields
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
@@ -1675,7 +1687,7 @@ Philip Prindeville <philipp_subx@redfish-solutions.com>
 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
  for making VDR use use daemon() instead of fork() to run in daemon mode
  for fixing a possible endless loop in a menu with no selectable items if
- Setup.MenuScrollWrap is true (thanks to Enrico Scholz).
+ Setup.MenuScrollWrap is true (thanks to Enrico Scholz)
 
 Nicolas Huillard <nhuillard@e-dition.fr>
  for translating OSD texts to the French language
@@ -1727,6 +1739,7 @@ Christian Wieninger <cwieninger@gmx.de>
  for suggesting to add cMenuEditStrItem::InEditMode()
  for his idea of going directly into the "Edit timer" menu for a timer created
  from the "Schedule" menu in case it starts withing the next two minutes
+ for reporting a problem with a format string in recording.c on 64bit systems
 
 Thiemo Gehrke <tgehrke@reel-multimedia.com>
  for suggesting to add a setup option to turn off the automatic timeout of the
@@ -1838,12 +1851,16 @@ Richard Lithvall <richard@lithvall.se>
 Tobias Grimm <listaccount@e-tobi.net>
  for suggesting to use geteuid() to check whether VDR is running as user 'root'
 
-Peter Dittmann <peter.dittmann@philips.com>
- for a patch that was used as a base to implement cPlugin::Active()
-
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
  script with no active timer
 
 Peter Juszack <vdr@unterbrecher.de>
  for a patch that was used as a base to implement kNext and kPrev
+
+Pierre Briec <pbriec@free.fr>
+ for translating OSD texts to the French language
+
+Werner Schweer <ws@seh.de>
+ for pointing out that the 'z' printf modifier should be used for 'size_t' type
+ arguments
diff --git a/COPYING b/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/HISTORY b/HISTORY
index e1e01ae93..026fe79a3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2768,7 +2768,7 @@ Video Disk Recorder Revision History
   driver, together with the endian problem).
 - The new OSD setup parameters "Left" and "Top" can be used to define the top left
   corner of the OSD.
-- The OSD size prameters are now in pixel (as opposed to formerly characters).
+- The OSD size parameters are now in pixel (as opposed to formerly characters).
   When reading a 'setup.conf' file from an older version of VDR, the OSDwidth
   and OSDheight values will be converted to pixel automatically.
 - The OSD is now fully device independent. See the comments in VDR/osd.h and the
@@ -3046,7 +3046,7 @@ Video Disk Recorder Revision History
 - Added some missing 'const' to cChannel.
 - Added a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf'
   (thanks to Oliver Endriss).
-- Fixed attaching a cPlayer to a cDevice, so that 'Operation not permited'
+- Fixed attaching a cPlayer to a cDevice, so that 'Operation not permitted'
   errors don't occur any more (thanks to Marco Schl��ler).
 - Fixed a case where the resultBuffer in cRemux ran full before getting a sync.
 - Removed the usleep() call from cDvbPlayer::Action() to make VDR run on NPTL
@@ -3089,7 +3089,7 @@ Video Disk Recorder Revision History
 - Immediately displaying the new channel info when switching channel groups.
 - Moved the main program loop variables further up to allow compilation with
   older compiler versions (thanks to Marco Schl��ler for reporting this one).
-- Now calling pthread_cond_broadcast() in the desctructor of cCondWait and
+- Now calling pthread_cond_broadcast() in the destructor of cCondWait and
   cCondVar to make sure any sleepers will wake up (suggested by Werner Fink).
   Also using pthread_cond_broadcast() instead of pthread_cond_signal() in
   cCondWait, in case there is more than one sleeper.
@@ -3136,7 +3136,7 @@ Video Disk Recorder Revision History
   funny characters. Invalid language codes will be stored as "???".
 - The '0' key now toggles the "Day" item in the "Timers" menu between "single
   shot" and "repeating". The keys '1'...'7' can be used to toggle the individual
-  days ('1' is monday). Thanks to Sascha Klek for reporting a problem with the
+  days ('1' is Monday). Thanks to Sascha Klek for reporting a problem with the
   '0' key in the "Day" item of the "Timers" menu.
 
 2004-11-21: Version 1.3.17
@@ -3281,7 +3281,7 @@ Video Disk Recorder Revision History
   Dino Ravnic).
 - Implemented displaying mandatory subtitles in the SPU decoder (thanks to Marco
   Schl��ler).
-- The setup option "Recording/Record Dobly Digital" has been renamed and moved to
+- The setup option "Recording/Record Dolby Digital" has been renamed and moved to
   "DVB/Use Dolby Digital". It now controls whether Dolby Digital is recorded and
   whether an available DD audio track will appear in the "Audio" menu.
 - Added support for circular polarization (thanks to Jonan Santiago).
@@ -3346,7 +3346,7 @@ Video Disk Recorder Revision History
 - Fixed masking SubStreamType in cDevice::PlayPesPacket() (thanks to Werner Fink
   for pointing out this one).
 - The new function cPlugin::Stop() shall be used to stop any background activities
-  of a plugin. Previously this was done in the plugin's desctructor, but it is
+  of a plugin. Previously this was done in the plugin's destructor, but it is
   better to do this in a dedicated function that can be called early when shutting
   down.
 - Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks() to have it
@@ -3505,7 +3505,7 @@ Video Disk Recorder Revision History
 - Removed scaling coordinates in letterbox mode from cDvbSpu - the DVD plugin, which
   was the only one needing this, doesn't need it any more (thanks to Marco Schl��ler).
 - No longer retuning or restarting a recording if only the language code of an
-  audio or dolby PID changes.
+  audio or Dolby PID changes.
 - Now preferring budget cards when selecting a DVB device for recording.
 - Recordings now avoid zero sized video data files (thanks to Wolfgang Fitz).
 - Some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems
@@ -4525,7 +4525,7 @@ Video Disk Recorder Revision History
 - Updated the Danish OSD texts (thanks to Mogens Elneff).
 - The new function cPlugin::Active() can be used by a plugin to indicate that it
   is still busy and the system should not shut down or restart (based on a patch
-  from Peter Dittmann). See PLUGINS.html for details.
+  from Sascha Volkenandt). See PLUGINS.html for details.
 - Fixed setting the 'Delta' parameter when calling the shutdown script with
   no active timer (reported by Helge Lenz).
 - In order to make sure that plugins are compiled with the same DVB driver header
@@ -4619,3 +4619,32 @@ Video Disk Recorder Revision History
 - The new function cPlugin::MainThreadHook() can be used by plugins to perform
   actions in the context of the main program thread. Use this function with great
   care and only of you absolutely have to! See also PLUGINS.html.
+
+2006-04-23: Version 1.3.48
+
+- Updated the GPL copies (thanks to Ville Skytt�).
+- Fixed several spelling errors (thanks to Ville Skytt�).
+- Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the French OSD texts (thanks to Pierre Briec).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
+- Fixed wrong credits for the patch that was used to implement cPlugin::Active().
+- Simplified the 'grep|awk|sed' command to retrieve the VDR/APIVERSION to a single
+  'sed' call.
+- Updated the Swedish OSD texts (thanks to Tomas Prybil).
+- Modified the German OSD texts to be "less technical" (thanks to Andreas Brachold).
+- Extended the version number reported with the '-V' option to also show the
+  current APIVERSION (suggested by Thomas G�nther).
+- Fixed handling empty titles in cEvent::FixEpgBugs() (reported by Rolf Ahrenberg).
+- Fixed some missing '-' in the German OSD texts (thanks to Walter Koch).
+- Added an error message about plugins that don't honor APIVERSION in their Makefile
+  (based on a suggestion by Udo Richter).
+- Fixed a format string in recording.c to avoid a compiler warning on 64bit systems
+  (thanks to Christian Wieninger for reporting, and Werner Schweer for pointing out
+  that the 'z' modifier should be used here).
+- Ignoring k_Repeat when deciding whether the same key has been pressed in string
+  input fields (based on a patch from Marko M�kel�).
diff --git a/INSTALL b/INSTALL
index d4ac230db..ece7a60f7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -64,7 +64,7 @@ the default:
 
 Alternatively you can use the '--rcu' or '--lirc' options at runtime.
 These options accept an optional path to the remote control device,
-which's defaults can be set via the RCU_DEVICE and LIRC_DEVICE macros,
+the defaults of which can be set via the RCU_DEVICE and LIRC_DEVICE macros,
 respectively.
 
 If your video directory will be on a VFAT partition, add the compile
@@ -130,7 +130,7 @@ If you run VDR using the 'runvdr' shell script it will use the built-in
 watchdog timer to restart the program in case something happens that
 causes a program hangup. If you change the command line options for the
 call to the VDR program, be sure to NOT use the '-d' option! Otherwise
-VDR will go into 'deamon' mode and the initial program call will return
+VDR will go into 'daemon' mode and the initial program call will return
 immediately! 'runvdr' needs to be started as user 'root'. Use the '-u'
 option to run the actual 'vdr' program under a different user id.
 
diff --git a/MANUAL b/MANUAL
index 1ff920374..4e2885718 100644
--- a/MANUAL
+++ b/MANUAL
@@ -787,7 +787,7 @@ Version 1.3
   Zap Timeout = 3        The time (in seconds) until a channel counts as "previous"
                          for switching with '0'
 
-  Inital channel = 0     The number of the channel that shall be tuned to when
+  Initial channel = 0    The number of the channel that shall be tuned to when
                          VDR starts. Default is 0, which means that it will
                          tune to the channel that was on before VDR was stopped.
 
diff --git a/Makefile b/Makefile
index f5862139f..f671fb477 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.87 2006/04/16 09:00:30 kls Exp $
+# $Id: Makefile 1.89 2006/04/23 09:01:17 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -81,8 +81,8 @@ DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
 # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-APIVERSION = $(shell grep 'define APIVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+VDRVERSION = $(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h)
 
 ifdef VFAT
 # for people who want their video directory on a VFAT partition
@@ -176,10 +176,17 @@ include-dir:
 
 plugins: include-dir
 	@failed="";\
+	@noapiv="";\
 	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
 	    echo "Plugin $$i:";\
+	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
+	       echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\
+	       noapiv="$$noapiv $$i";\
+	       continue;\
+	       fi;\
 	    $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\
 	    done;\
+	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; fi
 
 clean-plugins:
diff --git a/PLUGINS.html b/PLUGINS.html
index bd18a8661..491399c71 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -219,7 +219,7 @@ <h1>Table Of Contents</h1>
 Call the Perl script <tt>newplugin</tt> from the VDR source directory to create
 a new plugin directory with a <tt>Makefile</tt> and a main source file implementing
 the basic derived plugin class.
-You will also find a <tt>README</tt> file there with some inital text, where you
+You will also find a <tt>README</tt> file there with some initial text, where you
 should fill in actual information about your project.
 A <tt>HISTORY</tt> file is set up with an "Initial revision" entry. As your project
 evolves, you should add the changes here with date and version number.
@@ -284,7 +284,7 @@ <h1>Table Of Contents</h1>
 The GNU library header files do this pretty much the same way, except that they
 usually precede the name with only one underline (there are exceptions, though).
 <p>
-As long as you make shure that none of your plugin's header files will be named
+As long as you make sure that none of your plugin's header files will be named
 like one of VDR's header files, you can use the same method as VDR. However,
 if you want to name a header file like one that is already existing in VDR's
 source (<tt>i18n.h</tt> would be a possible candidate for this), you may want
@@ -794,7 +794,7 @@ <h1>Table Of Contents</h1>
 that the <i>Setup</i> menu can work with temporary copies (in order to discard any changes
 if the user doesn't confirm them by pressing the "Ok" button).
 After this the constructor adds the appropriate menu items, using internationalized texts
-and the addresses of the temporary variables. That's all there is to inizialize a <i>Setup</i>
+and the addresses of the temporary variables. That's all there is to initialize a <i>Setup</i>
 menu - the rest will be done by the core VDR code.
 <p>
 Once the user has pressed the "Ok" button to confirm the changes, the <tt>Store()</tt> function will
@@ -957,7 +957,7 @@ <h1>Table Of Contents</h1>
 of the id string.
 <p>
 The function shall return <i>true</i> for any service id string it handles, and <i>false</i>
-otherwise. The plugins have to agreee in which situations the service
+otherwise. The plugins have to agree in which situations the service
 may be called, for example whether the service may be called from every thread, or
 just from the main thread. A possible implementation could look like this:
 
@@ -1040,7 +1040,7 @@ <h1>Table Of Contents</h1>
 (to avoid messy output on 80 character wide terminals). The last entry in the
 list must be NULL.
 <p>
-The command names <tt>HELP</tt> and <tt>MAIN</tt> are reserverd and cannot
+The command names <tt>HELP</tt> and <tt>MAIN</tt> are reserved and cannot
 be used by a plugin.
 <p>
 The actual processing of SVDRP commands for a plugin is done in its
@@ -1283,8 +1283,8 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 where <tt>Data</tt> points to a block of <tt>Length</tt> bytes of a PES data
-stream containing any combination of video, audio or dolby tracks. Which audio
-or dolby track will actually be played is controlled by the device the player
+stream containing any combination of video, audio or Dolby tracks. Which audio
+or Dolby track will actually be played is controlled by the device the player
 is attached to. There are no prerequisites regarding the length or alignment of an
 individual block of data. The sum of all blocks must simply result in the
 desired data stream, and it must be delivered fast enough so that the
@@ -1473,7 +1473,7 @@ <h1>Table Of Contents</h1>
 cDevice::ActualDevice()-&gt;AttachReceiver(Receiver);
 </pre></td></tr></table><p>
 
-Noteh the use of <tt>cDevice::ActualDevice()</tt> here, which makes sure that
+Note the use of <tt>cDevice::ActualDevice()</tt> here, which makes sure that
 the receiver is attached to the device that actually receives the current live
 video stream (this may be different from the primary device in case of <i>Transfer
 Mode</i>).
@@ -1483,7 +1483,7 @@ <h1>Table Of Contents</h1>
 
 <a name="Filters"><hr><h2>Filters</h2>
 
-<center><i><b>A Fistful of Datas</b></i></center><p>
+<center><i><b>A Fistful of Data</b></i></center><p>
 
 If you want to receive section data you have to implement a derived <tt>cFilter</tt>
 class which at least implements the <tt>Process()</tt> function and a constructor
@@ -1556,7 +1556,7 @@ <h1>Table Of Contents</h1>
 full area or color depth, maybe because of lack of OSD memory or other restrictions.
 A plugin that uses the OSD should therefore test whether the OSD is able to
 provide the requested functionality, and should offer alternate color depths
-to allow a less powerfull OSD implementation to still work reasonably.
+to allow a less powerful OSD implementation to still work reasonably.
 Since it is often not really necessary to have hundreds or thousands of colors
 all over the OSD area, a plugin can divide the total drawing area into several
 sub-areas with different color depths and separate color palettes, as in
@@ -1753,7 +1753,7 @@ <h1>Table Of Contents</h1>
 
 These functions will be called with the desired source or channel and shall return whether
 this device can provide the requested source or channel and whether tuning to it was successful,
-repectively.
+respectively.
 <p>
 <b>Audio selection</b>
 <p>
@@ -1786,7 +1786,7 @@ <h1>Table Of Contents</h1>
 <p>
 <b>Replaying</b>
 <p>
-The functions to implement replaying capabilites are
+The functions to implement replaying capabilities are
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool HasDecoder(void) const;
diff --git a/PLUGINS/src/hello/COPYING b/PLUGINS/src/hello/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/hello/COPYING
+++ b/PLUGINS/src/hello/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index f5e90bae8..3de2d66b6 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -45,3 +45,7 @@ VDR Plugin 'hello' Revision History
 2002-12-13: Version 0.1.0
 
 - Changed setting of CXX and CXXFLAGS variables in Makefile.
+
+2006-04-22: Version 0.1.1
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 6f3dd4c74..2106cbf3f 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.12 2006/04/16 09:03:50 kls Exp $
+# $Id: Makefile 1.13 2006/04/22 09:59:44 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index e3c45f2ba..05ae9df97 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.11 2002/12/13 15:01:43 kls Exp $
+ * $Id: hello.c 1.12 2006/04/22 09:31:52 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
diff --git a/PLUGINS/src/hello/i18n.c b/PLUGINS/src/hello/i18n.c
index 62446a647..0ceeb2cd7 100644
--- a/PLUGINS/src/hello/i18n.c
+++ b/PLUGINS/src/hello/i18n.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: i18n.c 1.5 2006/02/04 10:51:41 kls Exp $
+ * $Id: i18n.c 1.6 2006/04/22 09:30:57 kls Exp $
  */
 
 #include "i18n.h"
@@ -17,7 +17,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Hei",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -39,7 +39,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Hei maailma!",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -61,7 +61,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Mit� kuuluu?",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -83,7 +83,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Yst�v�llisin terveisin",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -105,7 +105,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Tervehdysaika (s)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -127,7 +127,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "K�yt� vaihtoehtoista tervehdyst�",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/PLUGINS/src/osddemo/COPYING b/PLUGINS/src/osddemo/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/osddemo/COPYING
+++ b/PLUGINS/src/osddemo/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 8a0aef4b7..51317afc6 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/16 09:03:55 kls Exp $
+# $Id: Makefile 1.7 2006/04/22 09:59:49 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/servicedemo/COPYING b/PLUGINS/src/servicedemo/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/servicedemo/COPYING
+++ b/PLUGINS/src/servicedemo/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index c76b871f2..31e57a898 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.4 2006/04/16 09:03:59 kls Exp $
+# $Id: Makefile 1.5 2006/04/22 09:59:55 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -31,7 +31,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/skincurses/COPYING b/PLUGINS/src/skincurses/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/skincurses/COPYING
+++ b/PLUGINS/src/skincurses/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 360b0d2fc..ebb045f11 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.4 2006/04/16 09:04:04 kls Exp $
+# $Id: Makefile 1.5 2006/04/22 10:00:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/sky/COPYING b/PLUGINS/src/sky/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/sky/COPYING
+++ b/PLUGINS/src/sky/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index e94353805..2fad8b5f8 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/16 09:04:06 kls Exp $
+# $Id: Makefile 1.7 2006/04/22 10:00:17 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/status/COPYING b/PLUGINS/src/status/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/status/COPYING
+++ b/PLUGINS/src/status/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index e6525e9e5..21f88171e 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.10 2006/04/16 09:04:10 kls Exp $
+# $Id: Makefile 1.11 2006/04/22 10:00:24 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/svdrpdemo/COPYING b/PLUGINS/src/svdrpdemo/COPYING
index 5b6e7c66c..f90922eea 100644
--- a/PLUGINS/src/svdrpdemo/COPYING
+++ b/PLUGINS/src/svdrpdemo/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 272587482..d9fd83494 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.4 2006/04/16 09:04:13 kls Exp $
+# $Id: Makefile 1.5 2006/04/22 10:00:32 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/README b/README
index 5a0184892..c70b825b2 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ video disk recorder, based upon open standards and freely available
 driver software (of course, the hardware still has to be bought).
 
 The on screen menu system is simple, but shall provide all the
-possibilites necessary to perform timer controlled recording,
+possibilities necessary to perform timer controlled recording,
 file management and even "on disk editing". The menus
 of commercial set-top boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
diff --git a/README.developer b/README.developer
deleted file mode 100644
index 4fe75c812..000000000
--- a/README.developer
+++ /dev/null
@@ -1,82 +0,0 @@
-Version 1.3.0 marks the beginning of a new developer version
-of VDR, in which I am going to integrate functionality from
-patches that have been written by various people for previous
-versions of VDR.
-
-IMPORTANT NOTE: Beginning with version 1.3.0, VDR will automatically
-=============== modify the 'channels.conf' file. Please run this version
-                of VDR in a controlled environment only, and work with
-                copies of all your config files!
-
-This version of VDR focuses on some improvements regarding
-CAM support and, most important, the first step towards automatic
-PID handling. Some things are still in a raw state, but at least
-the program should now dynamically react on any changes in the
-channel settings.
-
-Here's a list of the highlights - and what _not_ to expect yet
-(but don't worry, these things will come soon ;-):
-
-- Automatic switching when PIDs are changed (e.g. for regional
-  programmes).
-- There is no explicit transponder list yet, so you just
-  have to define one channel for a new transponder and VDR
-  will automatically detect all other channels on that transponder.
-- New channels are added to the end of the channel list, so
-  it might be a good idea to add a line like
-
-  :@1000 New channels
-
-  to have them start at some high number.
-- Improved CAM support. Channels with conditional access now automatically
-  use the device that contains the proper CAM.
-- No NVOD support yet.
-
-Note that this is currently work in progress, so there may be some
-areas that don't work as smooth as expected, yet.
-
-Known issues:
-=============
-
-- The Setup/CICAM menu is currently without much meaning.
-  CA detection is done automatically.
-- The channel "EURO1080" on Astra 19.2E currently broadcasts HDTV
-  test signals. Unfortunately, the full featured DVB cards crash
-  pretty ugly when tuned to that channel, so it might be a good idea
-  to have the channel definition
-
-  EURO1080:12168:v:S19.2E:27500:308:256:0:FF:21100:1:1088:0
-
-  in your 'channels.conf' file. Note the Ca parameter 'FF' (255 in hex),
-  which gives this channel a non-existent Ca mode, so that it won't
-  be tuned to at all. If you really want to tune to this channel for
-  tests, do it on your own risk.
-- The 'sky' plugin now temporarily uses Ca value 30 (this will be changed
-  later).
-- Since the CA detection is now done automatically, a timer that starts
-  immediately after VDR has been launched and wants to record a CA channel
-  may not work. This will be changed later to make this work safely.
-
-What to test:
-=============
-
-Apart from the usual general functionality, special attention should
-be given to the following matters:
-
-- Does the automatic PID switching really work in all cases, especially
-  in conjunction with conditional access channels?
-- Does CAM support work for all kinds of CAMs?
-
-Known bugs:
-===========
-
-- Sometimes a new channel is created with the wrong 'source'
-  parameter. This presumably happens when the transponder and source
-  are switched, and there is still an SDT data packet being processed.
-  The call to device->HasLock() in sections.c should fix this (and it
-  apparently does for most cases), but there must still be soemthing
-  wrong in that area. This may be fixed in 1.3.1 - please report if
-  it does still happen there.
-- Sometimes the current channel gets re-tuned even though the channel
-  data of this channel didn't change (but that of an other channel did
-  change).
diff --git a/README.vps b/README.vps
deleted file mode 100644
index ee8909e6c..000000000
--- a/README.vps
+++ /dev/null
@@ -1,137 +0,0 @@
-VPS (Video Programming Service)
-===============================
-
-Beginning with version 1.3.5 VDR supports the VPS method
-of identifying programmes to record, and making sure they
-are recorded in full length, even if they run longer than
-initially specified or are shifted in time.
-
-Of course, the main prerequisite for this to work is that
-the broadcasters actually provide the necessary data. In
-particular these are
-
-- EPG data (well, obviously)
-- the data for each event must contain the "Programme Identification Label"
-  descriptor, which contains the VPS timestamp for this programme
-- the event data must provide and maintain the "Running Status" flag,
-  which indicates whether this programme is currently running or not.
-
-Currently only the German "�ffentlich Rechtliche" tv stations provide
-the necessary VPS data, so this will work only for stations like "Das Erste",
-"ZDF" and the like.
-
-Following is a step by step description of what happens for a VPS controlled
-timer recording. First let's take a look at what the VDR user needs to do.
-
-VPS as seen by the VDR user:
-----------------------------
-
-When the VDR user sets up a timer that shall be under VPS control, there
-are only two things that need to be done:
-
-1. Set the "Start" time to the actual VPS time as published in tv magazines.
-   Typically the VPS time is the same as the printed start time, unless
-   expliciltly specified otherwise. For instance, a tv magazine might print
-
-   20:15 Wetten, dass...?
-         (VPS = 20:14)
-
-   In this case the timer would need to be set to 20:14.
-
-2. Set the "VPS" flag in the timer definition to "yes" in order to tell VDR
-   that this timer is to be handled under VPS control. This is no different
-   to old analog video recorders, where each timer has also had a separate
-   VPS flag.
-
-If the user sets up a timer from the "Schedule" menu, things are even simpler.
-If the setup option "Recording/Use VPS" is set to "yes", any timer that is
-programmed from an event that has VPS information will automatically be set
-up as a VPS timer.
-
-IMPORTANT: In order for a recording to work under VPS control it is of
-========== paramount importance that the start time is set to the actual
-           VPS time of that event, NOT some time a few minutes before the
-           event starts! If a timer is set to use VPS, and the time doesn't
-           match any event's VPS time, nothing will be recorded!
-
-VPS as seen by VDR:
--------------------
-
-The following things happen when VDR processes timers:
-
-- VDR regularly scans the EPG data and assigns events to the timers (see
-  cTimers::SetEvents() in VDR/timers.c).
-  This can be seen in the log file as
-
-  timer 1 (15 1830-1900 'Neues') set to event 28.02.2004 18:30-18:59 (VPS: 28.02 18:30) 'neues'
-
-- When a VPS timer is asked whether it matches (i.e. whether a recording shall
-  be started), it checks whether it has an event assigned to it, and whether
-  that event has a running status of "starts in a few seconds" or "running"
-  (see cTimer::Matches(time_t t, bool Directly) in VDR/timers.c). This allows
-  the recording process to catch the entire programme, even if it runs longer
-  than initially advertised. It also works if it runs shorter or gets shifted.
-
-- When a VPS timer event is coming up (i.e. there are only a few minutes until
-  it starts, according to the related event data's start time - which may be
-  different than the VPS time!), VDR tunes a free DVB device to that transponder
-  (unless there is already a device tuned to that one) in order to make sure
-  that the event data (especially the "Running Status") will be up to date and
-  a change in the "Running status" flag will be seen immediately. This may
-  lead to the primary device being switched to a different channel if there
-  is no other free DVB device available. See the main program loop in VDR/vdr.c,
-  "Make sure VPS timers "see" their channel early enough:".
-
-Problems:
----------
-
-- In order for a VPS controlled timer to function properly, it needs to "see"
-  any changes in the running status of its event. This means that one of the
-  DVB devices needs to be tuned to the proper transponder some time before
-  the actual start time of the event. However, this may result in an other
-  timer (with lower priority) to be stopped, because it occupies the DVB device
-  and has it tuned to a different transponder.
-  See "// Make sure VPS timers "see" their channel early enough:" in VDR/vdr.c.
-TODO:
-  Something needs to be done to prevent two timers from repeatedly switching
-  the device between channels in such a situation.
-
-- If, for some reason, the driver doesn't deliver any more section data, a
-  VPS controlled timer will never see that the programme has started (or ended).
-TODO:
-  Therefore some mechanism needs to be implemented that makes absolutely sure
-  we continuously receive at least the event data for the present event.
-
-Caveats:
---------
-
-Apparently VPS in digital broadcasting is still in an early state. Only few
-tv stations actually support it, and other tv stations don't even handle the
-"Running Status" correctly (which, by itself, would already be helpful, even
-without VPS).
-
-Here's a list of things that are apparently done wrong by the individual
-stations:
-
-- The German "�ffentlich Rechtliche" tv stations, although supporting VPS,
-  don't switch the "Running Status" of an upcoming broadcast to "starts in
-  a few seconds", but rather go directly from "unknown" or "not running" to
-  "running". This may result in a recording that misses the first few seconds
-  of the programme.
-- The RTL group handles EPG events in a rather random way. They change event
-  IDs randomly, and switch the "Running Status" flag at times that are only
-  losely related to the actual events. For instance, if the "RTL aktuell"
-  programme starts at 18:45, they switch that event to "running" at about
-  18:43. Or, even worse, if "Wer wird Million�r?" runs until 21:15, they
-  switch the _next_ programme to running (which implicitly set "Wer wird
-  Million�r?" to "not running) at around 21:11 - so anybody using that
-  information to control recording would not see the end of that programme.
-
-... more following as it comes up...
-
-Contact:
---------
-
-ARD Digital: http://www.ard-digital.de/home/index.php?id=16&languageid=1
-ZDF vision:  http://www.zdf.de/ZDFde/inhalt/1/0,1872,1021601,00.html (select "zdfvision")
-             phone: 06131/706754
diff --git a/UPDATE-1.4.0 b/UPDATE-1.4.0
index 910c444e8..f046eb9d0 100644
--- a/UPDATE-1.4.0
+++ b/UPDATE-1.4.0
@@ -5,10 +5,20 @@ have been made "behind the scenes".
 
 See the file HISTORY for a detailed list of all changes.
 
+Video Programming System (VPS):
+
+- Implemented handling the VPS timestamps (aka "Programme Identification Label")
+  for full VPS support for timers (provided the tv stations actually broadcast
+  this information). The VPS time is displayed in the event info page if it exists
+  and is different than the event's start time.
+- Timers can now be set to use the VPS information to control recording a programme.
+  The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
+  the "VPS" option in the individual timers, can be used to control this feature
+
 Plugins:
 
 - The new function cPlugin::Stop() shall be used to stop any background activities
-  of a plugin. Previously this was done in the plugin's desctructor, but it is
+  of a plugin. Previously this was done in the plugin's destructor, but it is
   better to do this in a dedicated function that can be called early when shutting
   down.
 - Added 'Service' functions to the plugin interface.
@@ -121,7 +131,7 @@ OSD:
   the small font.
 - The new OSD setup parameters "Left" and "Top" can be used to define the top left
   corner of the OSD.
-- The OSD size prameters are now in pixel (as opposed to formerly characters).
+- The OSD size parameters are now in pixel (as opposed to formerly characters).
   When reading a 'setup.conf' file from an older version of VDR, the OSDwidth
   and OSDheight values will be converted to pixel automatically.
 - The OSD is now fully device independent. See the comments in VDR/osd.h and the
@@ -177,7 +187,7 @@ Timers:
 
 - The '0' key now toggles the "Day" item in the "Timers" menu between "single
   shot" and "repeating". The keys '1'...'7' can be used to toggle the individual
-  days ('1' is monday).
+  days ('1' is Monday).
 - The day of a timer is now stored as a full date in ISO notation ("YYYY-MM-DD") in
   'timers.conf' and for the result of the SVDRP command LSTT
 - The timer status now has a new bit that is set when that timer is currently
@@ -205,13 +215,6 @@ Timers:
 
 Recording:
 
-- Implemented handling the VPS timestamps (aka "Programme Identification Label")
-  for full VPS support for timers (provided the tv stations actually broadcast
-  this information). The VPS time is displayed in the event info page if it exists
-  and is different than the event's start time.
-- Timers can now be set to use the VPS information to control recording a programme.
-  The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
-  the "VPS" option in the individual timers, can be used to control this feature
 - Now preferring budget cards when selecting a DVB device for recording.
 - The file 'summary.vdr' has been replaced with 'info.vdr' and now contains the
   information about a recording, in the same format as the events are stored in
@@ -267,7 +270,7 @@ Audio:
 - The "Left" and "Right" keys in the "Audio" menu can be used to switch between
   the left and right stereo channels in case there are different audio tracks
   in these channels.
-- The setup option "Recording/Record Dobly Digital" has been renamed and moved to
+- The setup option "Recording/Record Dolby Digital" has been renamed and moved to
   "DVB/Use Dolby Digital". It now controls whether Dolby Digital is recorded and
   whether an available DD audio track will appear in the "Audio" menu.
 - Recording and Transfer Mode now handle more than 2 audio PIDs.
diff --git a/channels.conf b/channels.conf
index 4beb0782a..484040460 100644
--- a/channels.conf
+++ b/channels.conf
@@ -15,8 +15,8 @@ ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0
+ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
+ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
@@ -28,7 +28,7 @@ DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
+rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
@@ -45,14 +45,14 @@ MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
 PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu:32:1:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1:41:133:2:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1722,1801,1702:9:133:2:0
+PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1801,1702:29:133:2:0
+PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1722,1801,1702:41:133:2:0
 PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
@@ -133,6 +133,6 @@ CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
 eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
-Challenger Tv;Telespazio:11304:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
+Challenger Tv;Telespazio:11295:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
 TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:3:1:65535:1:0
 :@1000 New channels
diff --git a/config.h b/config.h
index 7e518bde8..cf27216a4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.251 2006/04/16 09:36:10 kls Exp $
+ * $Id: config.h 1.252 2006/04/21 14:53:26 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.3.47"
-#define VDRVERSNUM   10347  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.48"
+#define VDRVERSNUM   10348  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/epg.c b/epg.c
index 0525008e7..bc448cf83 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.71 2006/04/17 12:18:59 kls Exp $
+ * $Id: epg.c 1.72 2006/04/22 12:02:47 kls Exp $
  */
 
 #include "epg.h"
@@ -445,7 +445,7 @@ void cEvent::FixEpgBugs(void)
   strreplace(description, '\x86', ' ');
   strreplace(description, '\x87', ' ');
 
-  if (!title) {
+  if (isempty(title)) {
      // we don't want any "(null)" titles
      title = strcpyrealloc(title, tr("No title"));
      EpgBugFixStat(12, ChannelID());
diff --git a/i18n.c b/i18n.c
index 5912a53e6..1d8d30302 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.261 2006/04/15 14:13:45 kls Exp $
+ * $Id: i18n.c 1.273 2006/04/23 08:39:00 kls Exp $
  *
  * Translations provided by:
  *
@@ -12,7 +12,7 @@
  * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>
  * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>, Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
- * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>
+ * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>, Pierre Briec <pbriec@free.fr>
  * Norwegian   J�rgen Tvedt <pjtvedt@online.no>, Truls Slevigen <truls@slevigen.no>
  * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi>, Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  * Polish      Michael Rakowski <mrak@gmx.de>, Jaroslaw Swierczynski <swiergot@gmail.com>
@@ -124,7 +124,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-5",
     "iso8859-2",
     "iso8859-13",
-    "iso8859-1",
+    "iso8859-15",
     "iso8859-2",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
@@ -461,18 +461,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "This event - %s",
     "Diese Sendung - %s",
+    "Ta oddaja - %s",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Cet �v�nement",
     "",//TODO
     "T�m� tapahtuma - %s",
-    "",//TODO
+    "Den h�r s�ndningen - %s",
     "Este evento - %s",
     "",//TODO
-    "Ta audycja - %s",
     "",//TODO
+    "Aceast� emisiune - %s",
     "",//TODO
     "",//TODO
     "��� �������� - %s",
@@ -483,18 +483,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
+    "Ta oddaja - vsi kanali",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Cet �v�nement - toutes les cha�nes",
     "",//TODO
     "T�m� tapahtuma - kaikki kanavat",
     "",//TODO
     "Este evento - todos los canales",
     "",//TODO
-    "Ta audycja - wszystkie kana�y",
-    "",//TODO
+    "Den h�r s�ndningen - alla kanaler",
+    "Aceast� emisiune - toate canalele",
     "",//TODO
     "",//TODO
     "��� �������� - ��� ������",
@@ -505,18 +505,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "All events - all channels",
     "Alle Sendungen - alle Kan�le",
+    "Vse oddaje - vsi kanali",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Tous les �v�nements - toutes cha�nes",
     "",//TODO
     "Kaikki tapahtumat - kaikki kanavat",
     "",//TODO
     "Todos los eventos - todos los canales",
     "",//TODO
-    "Wszystkie audycje - wszystkie kana�y",
-    "",//TODO
+    "Alla tillf�llen - alla kanaler",
+    "Toate emisiunile - toate canalele",
     "",//TODO
     "",//TODO
     "��� �������� - ��� ������",
@@ -682,18 +682,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Button$Timer",
     "Timer",
+    "Termini",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Programmation",
     "",// TODO
     "Ajastin",
     "Timer",
     "Programa",
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Timer",
+    "Timer",
     "",// TODO
     "",// TODO
     "������",
@@ -847,7 +847,7 @@ const tI18nPhrase Phrases[] = {
     "Continuar",
     "���������",
     "Forts�tt",
-    "Revenire",
+    "Continuare",
     "Tov�bb",
     "Continuar",
     "����������",
@@ -1055,7 +1055,7 @@ const tI18nPhrase Phrases[] = {
     "Menu",
   },
   { "Button$Reset",
-    "Reset",
+    "R�cksetzen",
     "Reset",
     "Reset",
     "Herstart",
@@ -1364,8 +1364,8 @@ const tI18nPhrase Phrases[] = {
     "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?",
   },
   { "Press any key to cancel shutdown",
-    "Taste dr�cken, um Shutdown abzubrechen",
-    "Pritisni katerikoli gumb za preklic izklopa",
+    "Taste dr�cken, um Ausschalten abzubrechen",
+    "Pritisnite katerikoli gumb za preklic izklopa",
     "Un tasto per annullare lo spegnimento",
     "Druk een toets om shutdown af te breken",
     "Pressione qualquer tecla para cancelar",
@@ -1674,18 +1674,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Free To Air",
     "frei empfangbar",
+    "nekodiran",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Aucun cryptage",
     "",//TODO
     "vapaa",
     "",//TODO
     "en abierto",
     "",//TODO
-    "otwarty przekaz",
-    "",//TODO
+    "Okodad",
+    "FTA (necriptat)",
     "",//TODO
     "",//TODO
     "FTA (��������������)",
@@ -1696,18 +1696,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "encrypted",
     "verschl�sselt",
+    "kodiran",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Crypt�",
     "",//TODO
     "salattu",
     "",//TODO
     "cifrado",
     "",//TODO
-    "szyfrowany",
-    "",//TODO
+    "krypterad",
+    "criptat",
     "",//TODO
     "",//TODO
     "������������",
@@ -1761,7 +1761,7 @@ const tI18nPhrase Phrases[] = {
     "Inversion",
   },
   { "Bandwidth",
-    "Bandwidth",
+    "Bandbreite",
     "Pasovna �irina",
     "Bandwidth",
     "Bandwidth",
@@ -1861,7 +1861,7 @@ const tI18nPhrase Phrases[] = {
     "Transmisi�n",
     "��������",
     "Transmission",
-    "Transmisiune",
+    "Transmisie",
     "Transmission",
     "Transmissi�",
     "��������",
@@ -1893,7 +1893,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
   },
   { "Hierarchy",
-    "Hierarchy",
+    "Hierarchie",
     "Hierarhija",
     "Hierarchy",
     "Hierarchy",
@@ -2270,23 +2270,23 @@ const tI18nPhrase Phrases[] = {
   },
   { "Upcoming VPS recording!",
     "VPS-Aufnahme beginnt in K�rze!",
+    "Sledi VPS snemanje!",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Enregistrement VPS commence procha�nement",
     "",//TODO
     "VPS-tallennus on alkamassa!",
+    "Wkr�tce nagranie VPS!",
     "",//TODO
     "",//TODO
+    "strax VPS inspelning...",
+    "Urmeaz� o �nregistrare VPS!",
     "",//TODO
     "",//TODO
+    "VPS-������ ����� ��������",
     "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
+    "VPS salvestamine tulekul!",
     "VPS optagelse starter snart!",
     "",//TODO
   },
@@ -2380,7 +2380,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
-    "Ne morem za�eti s prenosnim na�inom",
+    "Ne morem za�eti s prenosnim na�inom!",
     "Impossibile iniziare la modalita' di trasferimento!",
     "Kan Transfer-Mode niet starten",
     "Imposs�vel iniciar modo de transfer�ncia!",
@@ -2412,9 +2412,9 @@ const tI18nPhrase Phrases[] = {
     "Nie zdefiniowano znacznik�w monta�u!",
     "�No se definieron marcas de edici�n!",
     "��� ����� ������� ������ ������������",
-    "Det finns inga redigeringsm�rken",//TODO
+    "Det finns inga redigeringsm�rken",
     "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare",
-    "A v�g�pont nincs kijel�lve",//TODO
+    "A v�g�pont nincs kijel�lve",
     "No hi ha marques d'edici� definides",
     "�� ������ ����� ��� �������!",
     "Nijedna prekidna to�ka nije postavljena!",
@@ -2467,7 +2467,7 @@ const tI18nPhrase Phrases[] = {
     "Edita�n� proces je ji� aktivn�!",
   },
   { "Can't shutdown - option '-s' not given!",
-    "Shutdown unm�glich - Option '-s' fehlt!",
+    "Ausschalten unm�glich - Option '-s' fehlt!",
     "Zaustavitev ni izvedljiva - opcija '-s' ni podana!",
     "Impossibile spegnere - parametro '-s' non passato!",
     "Shutdown onmogelijk - Optie '-s' ontbreekt!",
@@ -2490,18 +2490,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Not enough disk space to start recording!",
     "Nicht gen�gend Plattenplatz f�r Aufnahme!",
+    "Premalo prostora na disku za snemanje!",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Espace disque insuffisant pour d�marrer l'enregistrement!",
     "",//TODO
     "Tallennustilan puute est�� tallennuksen!",
     "Brak miejsca na dysku do nagrywania!",
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Otillr�cklingt diskutrymme f�r inspelning!",
+    "Insuficient spa�iul pe disc pentru �nregistrare!",
     "",//TODO
     "",//TODO
     "������������ ����� �� ����� ��� ������ ������",
@@ -2534,18 +2534,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Opening CAM menu...",
     "CAM-Men� wird ge�ffnet...",
-    "",//TODO
+    "Odpiram CAM meni...",
     "",//TODO
     "CAM-menu wordt geopend...",
     "",//TODO
-    "",//TODO
+    "Ouverture du menu CAM",
     "",//TODO
     "Avataan CA-moduulin valikkoa...",
     "Otwieram menu CAM...",
     "Abriendo el men� CAM...",
     "",//TODO
-    "������� CAM �����",
-    "",//TODO
+    "�ppnar CAM menyn...",
+    "Deschid meniul CAM...",
     "",//TODO
     "",//TODO
     "�������� ���� ������ ��������� ������� (CAM)",
@@ -2578,18 +2578,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Resetting CAM...",
     "CAM wird zur�ckgesetzt...",
-    "",//TODO
+    "Resetiram CAM...",
     "",//TODO
     "CAM wordt herstart...",
     "",//TODO
-    "",//TODO
+    "R�initialisation du CAM",
     "",//TODO
     "CA-moduuli palautetaan alkutilaan...",
     "Resetuj� CAM...",
     "Reiniciando CAM...",
     "",//TODO
-    "��������� CAM",
-    "",//TODO
+    "�terst�ller CAM ...",
+    "Se reseteaz� CAM...",
     "",//TODO
     "",//TODO
     "���������� CAM...",
@@ -2599,8 +2599,8 @@ const tI18nPhrase Phrases[] = {
     "Restartuje se CAM...",
   },
   { "Can't reset CAM!",
-    "CAM-Reset fehlgeschlagen!",
-    "Ne morem resetirati CAM-a",
+    "Zur�cksetzen des CAM fehlgeschlagen!",
+    "Ne morem resetirati CAM-a!",
     "Impossibile reimpostare il modulo CAM!",
     "Kan CAM niet herstarten!",
     "",//TODO
@@ -2644,18 +2644,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Please enter %d digits!",
     "Bitte geben Sie %d Ziffern ein!",
-    "",//TODO
+    "Prosim vnesite %d �tevilk!",
     "",//TODO
     "Vul %d cijfers in!",
     "",//TODO
-    "",//TODO
+    "Veuillez entrer %d chiffres!",
     "",//TODO
     "Sy�t� %d numeroa!",
     "Prosz� poda� %d cyfr!",
     "�Escriba %d d�gitos!",
     "",//TODO
-    "�������� ��������������� %d �������",
-    "",//TODO
+    "Mata in %d siffror!",
+    "V� rog introduce�i %d cifre!",
     "",//TODO
     "",//TODO
     "������� %d �����",
@@ -2666,7 +2666,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "No audio available!",
     "Kein Audio verf�gbar!",
-    "Zvok ni dosegljiv",
+    "Zvok ni dosegljiv!",
     "",//TODO
     "Geen audio beschikbaar!",
     "",//TODO
@@ -2865,7 +2865,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Plugins",
     "Plugins",
-    "Plugins",
+    "Vstavki",
     "Plugins",
     "Plugins",
     "Plugins",
@@ -2887,7 +2887,7 @@ const tI18nPhrase Phrases[] = {
   },
   { "Plugin",
     "Plugin",
-    "Plugin",
+    "Vstavek",
     "Plugin",
     "Plugin",
     "Plugin",
@@ -3195,7 +3195,7 @@ const tI18nPhrase Phrases[] = {
     "v�dy",
   },
   { "Setup.OSD$Channel info position",
-    "Kanal-Info Position",
+    "Kanalinfo-Position",
     "Pozicija informacije o kanalu",
     "Posizione informazioni canale",
     "Kanaal info positie",
@@ -3217,8 +3217,8 @@ const tI18nPhrase Phrases[] = {
     "Pozice informace o kan�lu",
   },
   { "Setup.OSD$Channel info time (s)",
-    "Anzeigedauer f�r Kanal-Info (s)",
-    "�as prikaza podatka o programu (s)",
+    "Anzeigedauer f�r Kanalinfo (s)",
+    "�as prikaza podatka o kanalu (s)",
     "",// TODO
     "Duur tonen kanaal-informatie (s)",
     "",// TODO
@@ -3262,18 +3262,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Timeout requested channel info",
     "Angeforderte Kanalinfo schlie�en",
+    "�as prikaza informacije o kanalu",
     "", // TODO
     "", // TODO
     "", // TODO
+    "Demande d'infos de cha�ne termin�e",
     "", // TODO
-    "", // TODO
-    "", // TODO
-    "Sulje kanavatieto pyydett�ess�",
+    "Sulje erikseen avattu kanavatieto",
     "Czas oczekiwania na informacje",
     "Auto-cerrar al solicitar info de canal",
     "", // TODO
-    "", // TODO
-    "", // TODO
+    "Timeout f�r kanalinformation",
+    "Durata afi��rii informa�ii canal",
     "", // TODO
     "", // TODO
     "���������� � ������ �������",
@@ -3328,18 +3328,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.OSD$Menu button closes",
     "Menu-Taste schlie�t",
+    "Meni gumb zapre meni",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Menu bouton ferm�",
     "",// TODO
     "Sulje valikkon�pp�imell�",
     "",// TODO
     "Cerrar al pulsar bot�n de men�",
     "",// TODO
-    "Klawisz Menu zamyka",
-    "",// TODO
+    "Menyknappen st�nger",
+    "Tasta 'Meniu' �nchide",
     "",// TODO
     "",// TODO
     "������ ���� �������",
@@ -3371,7 +3371,7 @@ const tI18nPhrase Phrases[] = {
     "Seznam nahr�vek",
   },
   { "Setup.EPG$EPG scan timeout (h)",
-    "Zeit bis EPG Scan (h)",
+    "Zeit bis zur EPG-Aktualisierung (h)",
     "�as do EPG pregleda (h)",
     "Timeout scansione aggiornamento EPG (ore)",
     "EPG-scan Timeout (h)",
@@ -3393,7 +3393,7 @@ const tI18nPhrase Phrases[] = {
     "�asov� limit pro sn�m�n� EPG (h)",
   },
   { "Setup.EPG$EPG bugfix level",
-    "EPG Fehlerbereinigung",
+    "EPG-Fehlerbereinigung",
     "Nivo za popravilo EPG napak",
     "Livello correzione EPG",
     "EPG foutcorrectieniveau",
@@ -3525,7 +3525,7 @@ const tI18nPhrase Phrases[] = {
     "Preferovan� jazyk",
   },
   { "Setup.DVB$Primary DVB interface",
-    "Prim�res DVB Interface",
+    "Prim�res DVB-Interface",
     "Primarna naprava",
     "Scheda DVB primaria",
     "Eerste DVB kaart",
@@ -3547,7 +3547,7 @@ const tI18nPhrase Phrases[] = {
     "Prim�rn� DVB interface",
   },
   { "Setup.DVB$Video display format",
-    "Video Anzeige-Format",
+    "Video-Anzeigeformat",
     "Format video prikaza",
     "",//TODO
     "Video display formaat",
@@ -3591,7 +3591,7 @@ const tI18nPhrase Phrases[] = {
     "pan&scan",
   },
   { "letterbox",
-    "letterbox",
+    "Letterbox",
     "letterbox",
     "letterbox",
     "letterbox",
@@ -3613,7 +3613,7 @@ const tI18nPhrase Phrases[] = {
     "letterbox",
   },
   { "center cut out",
-    "center cut out",
+    "Center-cut-out",
     "center cut out",
     "center cut out",
     "center cut out",
@@ -3635,7 +3635,7 @@ const tI18nPhrase Phrases[] = {
     "dost�edu o��znout",
   },
   { "Setup.DVB$Video format",
-    "Video Format",
+    "Videoformat",
     "Video format",
     "Formato video",
     "Videoformaat",
@@ -3657,7 +3657,7 @@ const tI18nPhrase Phrases[] = {
     "Form�t videa",
   },
   { "Setup.DVB$Use Dolby Digital",
-    "Dolby Digital Ton benutzen",
+    "Dolby-Digital-Ton benutzen",
     "Uporabljaj Dolby Digital",
     "",//TODO
     "Dolby Digital gebruiken",
@@ -3724,24 +3724,24 @@ const tI18nPhrase Phrases[] = {
   },
   { "PIDs only",
     "nur PIDs",
+    "samo PIDe",
     "",// TODO
     "",// TODO
     "",// TODO
+    "PIDs uniquement",
     "",// TODO
+    "vain PID:it",
+    "Tylko PID-y",
     "",// TODO
     "",// TODO
+    "bara PIDs",
+    "Numai PID-uri",
     "",// TODO
     "",// TODO
+    "������ PID�",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "ainult PID-id",
+    "kun PIDs",
     "",// TODO
   },
   { "names and PIDs",
@@ -3811,7 +3811,7 @@ const tI18nPhrase Phrases[] = {
     "p�idat nov� transpond�ry",
   },
   { "Setup.DVB$Audio languages",  // note the plural
-    "Audio Sprachen",
+    "Audio-Sprachen",
     "Jeziki za zvok",
     "",//TODO
     "Audio talen",
@@ -3833,7 +3833,7 @@ const tI18nPhrase Phrases[] = {
     "Jazyky zvuku",
   },
   { "Setup.DVB$Audio language",  // note the singular
-    "Audio Sprache",
+    "Audio-Sprache",
     "Jezik za zvok",
     "",//TODO
     "Audio taal",
@@ -3943,7 +3943,7 @@ const tI18nPhrase Phrases[] = {
     "Pou��vat DiSEqC",
   },
   { "Setup.CICAM$CICAM DVB",
-    "CICAM DVB",
+    "CICAM-DVB",
     "CICAM DVB",
     "CICAM DVB",
     "CICAM DVB",
@@ -3965,7 +3965,7 @@ const tI18nPhrase Phrases[] = {
     "CICAM DVB",
   },
   { "Setup.Recording$Margin at start (min)",
-    "Zeitpuffer bei Anfang (min)",
+    "Vorlauf zum Timer-Beginn (min)",
     "Premik za�etka snemanja (min)",
     "Margine iniziale (min)",
     "Tijd marge begin (min)",
@@ -3987,7 +3987,7 @@ const tI18nPhrase Phrases[] = {
     "Nahr�vat p�ed za��tkem (min)",
   },
   { "Setup.Recording$Margin at stop (min)",
-    "Zeitpuffer bei Ende (min)",
+    "Nachlauf am Timer-Ende (min)",
     "Zamik konca snemanja (min)",
     "Margine finale (min)",
     "Tijd marge eind (min)",
@@ -4031,7 +4031,7 @@ const tI18nPhrase Phrases[] = {
     "Prim�rn� limit",
   },
   { "Setup.Recording$Default priority",
-    "Default Priorit�t",
+    "Default-Priorit�t",
     "Privzeta prioriteta",
     "Priorita' predefinita",
     "Standaard prioriteit",
@@ -4053,7 +4053,7 @@ const tI18nPhrase Phrases[] = {
     "V�choz� priorita",
   },
   { "Setup.Recording$Default lifetime (d)",
-    "Default Lebensdauer (d)",
+    "Default-Lebensdauer (d)",
     "Privzeti �ivljenski �as (d)",
     "Durata predefinita (gg)",
     "Standaard levensduur (d)",
@@ -4075,7 +4075,7 @@ const tI18nPhrase Phrases[] = {
     "V�choz� �ivotnost",
   },
   { "Setup.Recording$Pause priority",
-    "Pause Priorit�t",
+    "Pause-Priorit�t",
     "Prioriteta pavze",
     "Priorita' di pausa",
     "Pauze prioriteit",
@@ -4097,7 +4097,7 @@ const tI18nPhrase Phrases[] = {
     "Priorita p�eru�en�",
   },
   { "Setup.Recording$Pause lifetime (d)",
-    "Pause Lebensdauer (d)",
+    "Pause-Lebensdauer (d)",
     "�as pavze (d)",
     "Durata pausa (gg)",
     "Pauze levensduur (d)",
@@ -4163,7 +4163,7 @@ const tI18nPhrase Phrases[] = {
     "Pou��vat VPS",
   },
   { "Setup.Recording$VPS margin (s)",
-    "Zeitpuffer bei VPS (s)",
+    "Zeitvorlauf bei VPS (s)",
     "�asovna rezerva pri VPS (s)",
     "Margine VPS",
     "Marge VPS (s)",
@@ -4251,7 +4251,7 @@ const tI18nPhrase Phrases[] = {
     "D�lka okam�it�ho nahr�v�n� (min)",
   },
   { "Setup.Recording$Max. video file size (MB)",
-    "Max. Video Dateigr��e (MB)",
+    "Max. Videodateigr��e (MB)",
     "Najve�ja velikost datoteke (MB)",
     "Dimensione massima file video (MB)",
     "Maximale omvang video file (MB)",
@@ -4295,7 +4295,7 @@ const tI18nPhrase Phrases[] = {
     "D�lit editovan� soubory",
   },
   { "Setup.Replay$Multi speed mode",
-    "MultiSpeed Modus",
+    "Mehrstufiger Vor-/R�cklauf",
     "Re�im z ve� hitrostmi",
     "Modalita' multispeed",
     "Multi-speed mode",
@@ -4339,7 +4339,7 @@ const tI18nPhrase Phrases[] = {
     "Zobrazit re�im p�ehr�v�n�",
   },
   { "Setup.Replay$Resume ID",
-    "Wiedergabe ID",
+    "Wiedergabe-ID",
     "ID za predvajanje",
     "ID Ripresa",
     "Hervattings ID",
@@ -4361,7 +4361,7 @@ const tI18nPhrase Phrases[] = {
     "ID obnoven�",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
-    "Mindest Event Pause (min)",
+    "Br�ckenzeit zwischen Timern (min)",
     "Najmanj�i �as dogodka (min)",
     "Spegnimento: controllo prossimo evento (m)",
     "Minimale event time-out (min)",
@@ -4383,7 +4383,7 @@ const tI18nPhrase Phrases[] = {
     "Min. pauza mezi ud�lostmi (min)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
-    "Mindest Benutzer-Inaktivit�t (min)",
+    "VDR ausschalten bei Inaktivit�t (min)",
     "Najmanj�i �as neaktivnosti (min)",
     "Spegnimento: tempo minimo di inattivit� (m)",
     "Minimum gebruikers inactiviteit (min)",
@@ -4405,7 +4405,7 @@ const tI18nPhrase Phrases[] = {
     "�asov� limit neaktivnosti (min)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
-    "SVDRP Timeout (s)",
+    "SVDRP trennen bei Inaktivit�t (s)",
     "SVDRP �as neaktivnosti (s)",
     "Timeout SVDRP (s)",
     "SVDRP Timeout (s)",
@@ -4427,7 +4427,7 @@ const tI18nPhrase Phrases[] = {
     "�asov� limit SVDRP (s)",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
-    "Zap Timeout (s)",
+    "Mindestzeit f�r Kanalhistorie (s)",
     "�as ugla�evanja (s)",
     "Timeout Zapping",
     "Zap timeout (s)",
@@ -4450,68 +4450,68 @@ const tI18nPhrase Phrases[] = {
   },
   { "Setup.Miscellaneous$Initial channel",
     "Kanal beim Einschalten",
+    "Privzeti kanal",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Cha�ne initiale",
     "",// TODO
     "Kanava k�ynnistett�ess�",
+    "Pocz�tkowy kana�",
     "",// TODO
     "",// TODO
+    "Kanal vid uppstart",
+    "Canalul de pornire",
     "",// TODO
     "",// TODO
+    "����� ��� ���������",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Kanal k�ivitamisel",
     "Kanal ved opstart",
     "",// TODO
   },
   { "Setup.Miscellaneous$Initial volume",
     "Lautst�rke beim Einschalten",
+    "Privzeta glasnost",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "Volume initial",
     "",// TODO
     "��nenvoimakkuus k�ynnistett�ess�",
+    "Pocz�tkowa g�o�no��",
     "",// TODO
     "",// TODO
+    "Ljudstyrka vid uppstart",
+    "Volumul la pornire",
     "",// TODO
     "",// TODO
+    "��������� ��� ���������",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Helitugevus k�ivitamisel",
     "Lydstyrke ved opstart",
     "",// TODO
   },
   { "Setup.Miscellaneous$as before",
     "wie vorher",
+    "kot prej",
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
-    "",// TODO
+    "comme avant",
     "",// TODO
     "edellinen",
+    "jak ostatnio",
     "",// TODO
     "",// TODO
+    "som f�rut",
+    "ca mai �nainte",
     "",// TODO
     "",// TODO
+    "��� ������",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "som før",
+    "nagu enne",
+    "som f�r",
     "",// TODO
   },
   // The days of the week:
@@ -4585,18 +4585,18 @@ const tI18nPhrase Phrases[] = {
   // The character maps for entering letters via the numeric keys:
   { " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
     " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
+    " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
     " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��",
     " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9",
     "",//TODO
-    "",//TODO
-    "",//TODO
+    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz",
+    " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -4607,7 +4607,7 @@ const tI18nPhrase Phrases[] = {
   },
   // Learning keys:
   { "Learning Remote Control Keys",
-    "Fernbedienungs-Codes lernen",
+    "Fernbedienung anlernen",
     "U�enje kod upravljalca",
     "Apprendimento tasti unita` remota",
     "Leren toetsen afstandsbediening",
@@ -4629,7 +4629,7 @@ const tI18nPhrase Phrases[] = {
     "U�en� k�d� d�lkov�ho ovl�d�n�",
   },
   { "Phase 1: Detecting RC code type",
-    "Phase 1: FB Code feststellen",
+    "Phase 1: System der Fernbedienung ermitteln",
     "Faza 1: Sprejemanje IR kode",
     "Fase 1: tipo ricevitore RC",
     "Fase 1: detecteren type afstandsbediening",
@@ -4651,7 +4651,7 @@ const tI18nPhrase Phrases[] = {
     "F�ze 1: Detekce typu k�du",
   },
   { "Press any key on the RC unit",
-    "Eine Taste auf der FB dr�cken",
+    "Eine Taste auf der Fernbedienung dr�cken",
     "Pritisnite tipko na upravljalcu",
     "Premere un tasto dell'unita` RC",
     "Druk op een willekeurige knop",
@@ -4673,7 +4673,7 @@ const tI18nPhrase Phrases[] = {
     "Stiskn�te libovolnou kl�vesu ovl�d�n�",
   },
   { "RC code detected!",
-    "FB Code erkannt!",
+    "System der Fernbedienung erkannt!",
     "IR koda sprejeta!",
     "Codice RC rilevato!",
     "Afstandsbediening code herkend!",
@@ -4717,7 +4717,7 @@ const tI18nPhrase Phrases[] = {
     "Nema�kejte ��dn� kl�vesy...",
   },
   { "Phase 2: Learning specific key codes",
-    "Phase 2: Einzelne Tastencodes lernen",
+    "Phase 2: Tastenbelegung anlernen",
     "Faza 2: U�enje posebnih kod",
     "Fase 2: Codici specifici dei tasti",
     "Fase 2: Leren specifieke toets-codes",
@@ -4805,7 +4805,7 @@ const tI18nPhrase Phrases[] = {
     "Stiskn�te 'Dol�' pro pokra�ov�n�",
   },
   { "(press 'Up' to go back)",
-    "('Auf' dr�cken um zur�ckzugehen)",
+    "('Auf' dr�cken, um zur�ckzugehen)",
     "(pritisnite 'Gor' za nazaj)",
     "(premere 'Su' per tornare indietro)",
     "(druk 'Omhoog' om terug te gaan)",
@@ -4871,7 +4871,7 @@ const tI18nPhrase Phrases[] = {
     "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)",
   },
   { "Phase 3: Saving key codes",
-    "Phase 3: Codes abspeichern",
+    "Phase 3: Tastenbelegung abspeichern",
     "Faza 3: Shranjevanje kod tipk",
     "Fase 3: Salvataggio codici tasti",
     "Fase 3: Opslaan toets codes",
@@ -5224,7 +5224,7 @@ const tI18nPhrase Phrases[] = {
     "P�eru�it",
   },
   { "Key$Stop",
-    "Stop",
+    "Stopp",
     "Ustavi",
     "Stop",
     "Stop",
@@ -5313,46 +5313,46 @@ const tI18nPhrase Phrases[] = {
   },
   { "Key$Next",
     "Vorw�rts",
+    "Naprej",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Suivant",
     "",// TODO
+    "Seuraava",
+    "Dalej",
     "",// TODO
     "",// TODO
+    "N�sta",
+    "Urm�tor",
     "",// TODO
     "",// TODO
+    "������",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "J�rgmine",
+    "Fremad",
     "",// TODO
   },
   { "Key$Prev",
     "Zur�ck",
+    "Nazaj",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Pr�c�dent",
     "",// TODO
+    "Edellinen",
+    "Wstecz",
     "",// TODO
     "",// TODO
+    "Bak�t",
+    "Anterior",
     "",// TODO
     "",// TODO
+    "�����",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Eelmine",
+    "Tilbage",
     "",// TODO
   },
   { "Key$Power",
@@ -5361,7 +5361,7 @@ const tI18nPhrase Phrases[] = {
     "Power",
     "Uitschakelen",
     "Ligar",
-    "Veille", // This one caused some bug reports ;)
+    "Arr�t",
     "Power",
     "Virtakytkin",
     "Wy��cz",
@@ -5423,24 +5423,24 @@ const tI18nPhrase Phrases[] = {
   },
   { "Key$PrevChannel",
     "Vorheriger Kanal",
+    "Prej�nji kanal",
     "",// TODO
     "",// TODO
     "",// TODO
+    "Cha�ne pr�c�dente",
     "",// TODO
+    "Edellinen kanava",
+    "Poprzedni kana�",
     "",// TODO
     "",// TODO
+    "F�rra kanalen",
+    "Canal anterior",
     "",// TODO
     "",// TODO
+    "���������� �����",
     "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
+    "Eelmine kanal",
+    "Foreg�ende kanal",
     "",// TODO
   },
   { "Key$Volume+",
@@ -5952,18 +5952,18 @@ const tI18nPhrase Phrases[] = {
   },
   { "Recording started",
     "Aufzeichnung gestartet",
+    "Snemanje se je pri�elo",
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Enregistrement a commenc�",
     "",//TODO
     "Tallennus aloitettu",
     "Rozpocz�to nagrywanie",
     "Iniciando grabaci�n",
     "",//TODO
-    "",//TODO
-    "",//TODO
+    "Inspelningen har startat",
+    "A �nceput �nregistrarea",
     "",//TODO
     "",//TODO
     "������ ������",
@@ -5995,7 +5995,7 @@ const tI18nPhrase Phrases[] = {
     "P�eru�uje se b��c� program ...",
   },
   { "Starting EPG scan",
-    "Beginne mit EPG-Scan",
+    "Aktualisiere EPG-Daten",
     "Pri�enjam EPG-scan",
     "",// TODO
     "Bezig met starten EPG scan",
@@ -6017,8 +6017,8 @@ const tI18nPhrase Phrases[] = {
     "Za��n� prohled�v�n� EPG",
   },
   { "This plugin has no setup parameters!",
-    "Dieses Plugin hat keine Setup-Parameter!",
-    "Ta plugin nima nastavitvenih parametrov!",
+    "Dieses Plugin hat keine Parameter!",
+    "Ta vstavek nima nastavitvenih parametrov!",
     "Questo plugin non ha parametri di setup!",
     "Deze plugin heeft geen instelparameters",
     "",// TODO
@@ -6061,7 +6061,7 @@ const tI18nPhrase Phrases[] = {
     "Klasick� VDR",
   },
   { "ST:TNG Panels",
-    "ST:TNG Konsolen",
+    "ST:TNG-Konsolen",
     "ST:TNG Konsola",
     "Consolles ST:TNG",
     "ST:TNG Consoles",
@@ -6072,7 +6072,7 @@ const tI18nPhrase Phrases[] = {
     "Panel ST:TNG",
     "Paneles ST:TNG",
     "������ ST:TNG",
-    "ST:TNG konsoll",
+    "ST:TNG konsol",
     "Cons. ST:TNG",
     "",// TODO
     "",// TODO
diff --git a/menuitems.c b/menuitems.c
index e756e8df7..ef7cccc3e 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.42 2006/04/14 10:41:28 kls Exp $
+ * $Id: menuitems.c 1.43 2006/04/23 11:39:48 kls Exp $
  */
 
 #include "menuitems.h"
@@ -351,10 +351,10 @@ char cMenuEditStrItem::Inc(char c, bool Up)
 
 eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
-  bool SameKey = Key == lastKey;
+  bool SameKey = NORMALKEY(Key) == lastKey;
   if (Key != kNone)
-     lastKey = Key;
-  else if (!newchar && k0 <= NORMALKEY(lastKey) && NORMALKEY(lastKey) <= k9 && autoAdvanceTimeout.TimedOut()) {
+     lastKey = NORMALKEY(Key);
+  else if (!newchar && k0 <= lastKey && lastKey <= k9 && autoAdvanceTimeout.TimedOut()) {
      AdvancePos();
      newchar = true;
      currentChar = NULL;
@@ -460,7 +460,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        }
                     if (!currentChar || !*currentChar || *currentChar == '\t') {
                        // find the beginning of the character map entry for Key
-                       int n = Key - k0;
+                       int n = NORMALKEY(Key) - k0;
                        currentChar = charMap;
                        while (n > 0 && *currentChar) {
                              if (*currentChar++ == '\t')
diff --git a/newplugin b/newplugin
index 2a7cac2ac..f54db76e2 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.26 2006/04/17 09:49:13 kls Exp $
+# $Id: newplugin 1.27 2006/04/22 10:04:10 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -85,7 +85,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = \$(shell grep 'define APIVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g')
+APIVERSION = \$(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*\$\$/\\1/; p }' \$(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/recording.c b/recording.c
index fabf5698d..351713e99 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.146 2006/04/17 12:47:59 kls Exp $
+ * $Id: recording.c 1.147 2006/04/23 10:43:06 kls Exp $
  */
 
 #include "recording.h"
@@ -1197,7 +1197,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
                        LOG_ERROR_STR(fileName);
                     }
                  else
-                    esyslog("ERROR: can't allocate %d bytes for index '%s'", size * sizeof(tIndex), fileName);
+                    esyslog("ERROR: can't allocate %zd bytes for index '%s'", size * sizeof(tIndex), fileName);
                  }
               }
            else
diff --git a/timers.c b/timers.c
index f620735fa..3a5b0ba64 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.57 2006/04/09 09:10:08 kls Exp $
+ * $Id: timers.c 1.58 2006/04/21 15:12:49 kls Exp $
  */
 
 #include "timers.h"
@@ -292,7 +292,7 @@ int cTimer::GetWDay(time_t t)
 {
   struct tm tm_r;
   int weekday = localtime_r(&t, &tm_r)->tm_wday;
-  return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
+  return weekday == 0 ? 6 : weekday - 1; // we start with Monday==0!
 }
 
 bool cTimer::DayMatches(time_t t) const
diff --git a/tools.c b/tools.c
index b1decf2ef..53523fa09 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.116 2006/04/17 12:19:31 kls Exp $
+ * $Id: tools.c 1.117 2006/04/21 15:12:47 kls Exp $
  */
 
 #include "tools.h"
@@ -615,7 +615,7 @@ cString cString::sprintf(const char *fmt, ...)
 cString WeekDayName(int WeekDay)
 {
   char buffer[4];
-  WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with monday==0!
+  WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with Monday==0!
   if (0 <= WeekDay && WeekDay <= 6) {
      const char *day = tr("MonTueWedThuFriSatSun");
      day += WeekDay * 3;
diff --git a/vdr.5 b/vdr.5
index f6fc2fd9b..0fc083bdc 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.55 2006/03/26 13:42:29 kls Exp $
+.\" $Id: vdr.5 1.56 2006/04/21 15:13:10 kls Exp $
 .\"
 .TH vdr 5 "26 Mar 2006" "1.3.45" "Video Disk Recorder Files"
 .SH NAME
@@ -259,11 +259,11 @@ so a complete definition could look like this:
 
 \fBMTWTF\-\-@2002\-02\-18\fR
 
-which would implement a timer that records Moday thru Friday, and will hit
+which would implement a timer that records Monday thru Friday, and will hit
 for the first time on or after February 18, 2002.
 This \fBfirst day\fR feature can be used to disable a repeating timer for a couple
-of days, or for instance to define a new Mon...Fri timer on wednesday, which
-actually starts "monday next week". The \fBfirst day\fR date given need not be
+of days, or for instance to define a new Mon...Fri timer on Wednesday, which
+actually starts "Monday next week". The \fBfirst day\fR date given need not be
 that of a day when the timer would actually hit.
 .TP
 .B Start
diff --git a/vdr.c b/vdr.c
index 2ab3d5391..ff87c030b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -15,14 +15,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  *
  * The author can be reached at kls@cadsoft.de
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.262 2006/04/17 14:43:46 kls Exp $
+ * $Id: vdr.c 1.264 2006/04/22 11:26:04 kls Exp $
  */
 
 #include <getopt.h>
@@ -422,7 +422,7 @@ int main(int argc, char *argv[])
                );
         }
      if (DisplayVersion)
-        printf("vdr (%s) - The Video Disk Recorder\n", VDRVERSION);
+        printf("vdr (%s/%s) - The Video Disk Recorder\n", VDRVERSION, APIVERSION);
      if (PluginManager.HasPlugins()) {
         if (DisplayHelp)
            printf("Plugins: vdr -P\"name [OPTIONS]\"\n\n");

From 56e5836b54ab1a7f5ad5b067e867a0c9392c5e5b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 28 Apr 2006 18:00:00 +0200
Subject: [PATCH 141/307] =?UTF-8?q?Version=201.3.49=20-=20Fixed=20initiali?=
 =?UTF-8?q?zing=20'noapiv'=20in=20the=20Makefile=20(reported=20by=20Ronny?=
 =?UTF-8?q?=20Kornexl).=20-=20Fixed=20extracting=20APIVERSION=20to=20work?=
 =?UTF-8?q?=20with=20older=20versions=20of=20'sed'=20(reported=20by=20=20?=
 =?UTF-8?q?=20Oliver=20Endriss;=20thanks=20also=20to=20Udo=20Richter=20for?=
 =?UTF-8?q?=20a=20shorter=20version=20of=20the=20'sed'=20=20=20expression)?=
 =?UTF-8?q?.=20-=20Fixed=20broken=20APIVERSION=20extraction=20line=20in=20?=
 =?UTF-8?q?'newplugin'=20(thanks=20to=20Oliver=20Endriss).=20-=20Fixed=20e?=
 =?UTF-8?q?ntering=20'0'=20in=20a=20cMenuEditIntItem=20(reported=20by=20Mi?=
 =?UTF-8?q?rko=20D=C3=B6lle).=20-=20Updated=20the=20Italian=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Nino=20Gerbino).=20-=20Added=20a=20note=20abo?=
 =?UTF-8?q?ut=20adding=20'INCLUDES=20+=3D=20-I$(DVBDIR)/include'=20to=20an?=
 =?UTF-8?q?=20existing=20=20=20Make.config=20(problem=20reported=20by=20Ma?=
 =?UTF-8?q?rkus=20Ehrnsperger).=20-=20Fixed=20handling=20the=20cPluginMana?=
 =?UTF-8?q?ger::Active()=20result=20when=20pressing=20the=20"Power"=20key?=
 =?UTF-8?q?=20=20=20(reported=20by=20Werner=20F=C3=A4rber).=20-=20Added=20?=
 =?UTF-8?q?a=20hint=20about=20commenting=20out=20the=20line=20'#define=20U?=
 =?UTF-8?q?SE=5FFADVISE'=20in=20tools.c=20in=20=20=20case=20of=20problems?=
 =?UTF-8?q?=20with=20replaying=20in=20fast=20forward=20mode=20if=20the=20v?=
 =?UTF-8?q?ideo=20directory=20is=20=20=20mounted=20via=20a=20Samba=20share?=
 =?UTF-8?q?=20(reported=20by=20Andy=20Grobb).=20-=20Changed=20the=20"Reall?=
 =?UTF-8?q?y=20restart=3F"=20prompt=20in=20the=20call=20to=20cPluginManage?=
 =?UTF-8?q?r::Active()=20in=20=20=20menu.c=20to=20"restart=20anyway=3F"=20?=
 =?UTF-8?q?(suggested=20by=20Rolf=20Ahrenberg).=20-=20Removed=20the=20obso?=
 =?UTF-8?q?lete=20"'1'=20for=20encrypted=20radio=20channels"=20part=20from?=
 =?UTF-8?q?=20the=20description=20=20=20of=20the=20VPID=20in=20vdr.5=20(re?=
 =?UTF-8?q?ported=20by=20Alexander=20Hans).=20-=20Fixed=20tuning=20to=20th?=
 =?UTF-8?q?e=20channel=20of=20a=20VPS=20timer=20if=20the=20device=20is=20t?=
 =?UTF-8?q?he=20actual=20device.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     |  22 +++++
 HISTORY                          |  35 ++++++-
 INSTALL                          |   9 +-
 MANUAL                           |   2 +-
 Makefile                         |   8 +-
 PLUGINS.html                     |  32 +-----
 PLUGINS/src/hello/Makefile       |   4 +-
 PLUGINS/src/osddemo/Makefile     |   4 +-
 PLUGINS/src/servicedemo/Makefile |   4 +-
 PLUGINS/src/skincurses/Makefile  |   4 +-
 PLUGINS/src/sky/Makefile         |   4 +-
 PLUGINS/src/status/Makefile      |   4 +-
 PLUGINS/src/svdrpdemo/Makefile   |   4 +-
 config.h                         |   6 +-
 i18n.c                           | 162 ++++++++++++++++++-------------
 menu.c                           |   4 +-
 menuitems.c                      |   6 +-
 newplugin                        |   4 +-
 vdr.1                            |   4 +-
 vdr.5                            |   6 +-
 vdr.c                            |   8 +-
 21 files changed, 193 insertions(+), 143 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b798ebc8c..ff5052d76 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -334,6 +334,8 @@ Andy Grobb <Charly98@01019freenet.de>
  for completing storing the current audio volume in the setup.conf file
  for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no"
  for reporting a bug in handling min/max borders when entering integer values
+ for reporting a problem with replaying in fast forward mode if the video directory
+ is mounted via a Samba share
 
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
@@ -439,6 +441,7 @@ Mirko D
  for reporting a problem with inconsistent channel and timer lists
  for making the "Play" key in live viewing mode resume a previous replay session
  for suggesting to allow defining key macros for all non-modeless keys
+ for reporting a bug in entering '0' in a cMenuEditIntItem
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -614,6 +617,8 @@ Oliver Endriss <o.endriss@gmx.de>
  display in the ST:TNG skin's channel display
  for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust
  against invalid data
+ for reporting a problem in extracting APIVERSION with older versions of 'sed'
+ for fixing broken APIVERSION extraction line in 'newplugin'
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -976,6 +981,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a bug in handling the color button texts when switching from the
  'Schedule' menu of a channel without EPG info to the 'What's on now' menu
  for reporting a bug in handling empty titles in cEvent::FixEpgBugs()
+ for suggesting to replace the "Really restart?" prompt in the call to
+ cPluginManager::Active() in menu.c to "restart anyway?"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1412,6 +1419,7 @@ Udo Richter <udo_richter@gmx.de>
  --help or --version option
  for suggesting to add a warning about plugins that don't honor APIVERSION in their
  Makefile
+ for providing a shorter version of the 'sed' expression for extracting APIVERSION
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1802,6 +1810,8 @@ Alexander Hans <cleditor@arcor.de>
  doesn't have any EPG data
  for giving the DrawBitmap() function a new parameter 'Overlay' that allows a bitmap
  to be drawn with a transparent background
+ for reporting that the "'1' for encrypted radio channels" part in the description
+ of the VPID in vdr.5 is obsolete
 
 Daniel Karsubka <dkar@gmx.de>
  for suggesting to write the epg.data file when VDR exits
@@ -1814,6 +1824,7 @@ Ronny Kornexl <ronny.kornexl@online.de>
  for reporting a problem with setting "No title" for broken event data
  for suggesting to make the "Use small font" setup option *always* use the small
  font if set to '3' - even if it would have been a fixed font
+ for reporting a bug in initializing 'noapiv' in the Makefile
 
 B�rta Vladim�r <vladimir.barta@k2atmitec.cz>
  for translating OSD texts to the Czech language
@@ -1864,3 +1875,14 @@ Pierre Briec <pbriec@free.fr>
 Werner Schweer <ws@seh.de>
  for pointing out that the 'z' printf modifier should be used for 'size_t' type
  arguments
+
+Nino Gerbino <ngerb@interfree.it>
+ for translating OSD texts to the Italian language
+
+Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
+ for reporting a problem with missing 'INCLUDES += -I$(DVBDIR)/include' in an existing
+ Make.config
+
+Werner F�rber <w.faerber@gmx.de>
+ for reporting a bug in handling the cPluginManager::Active() result when pressing
+ the "Power" key
diff --git a/HISTORY b/HISTORY
index 026fe79a3..33a7ad8be 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4532,8 +4532,15 @@ Video Disk Recorder Revision History
   files as VDR itself, the definition of DVBDIR has been removed from the VDR
   Makefile. If you are using a driver version that has its header files at a location
   other than /usr/include/linux/dvb, you can define DVBDIR in the Make.config
-  file (see also INSTALL). Any reference to DVBDIR should be removed from all
-  plugins' Makefiles, like this:
+  file (see also INSTALL). Note that if you already have a Make.config file of your
+  own, you should add the lines
+
+  ifdef DVBDIR
+  INCLUDES += -I$(DVBDIR)/include
+  endif
+
+  to its end, as in the new Make.config.template.
+  Any reference to DVBDIR should be removed from all plugins' Makefiles, like this:
 
   ------------------------------------------------------------
   --- PLUGINS/src/hello/Makefile  2005/11/11 13:20:14     1.10
@@ -4580,7 +4587,7 @@ Video Disk Recorder Revision History
   +### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
   -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-  +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+  +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
    ### The name of the distribution archive:
 
@@ -4648,3 +4655,25 @@ Video Disk Recorder Revision History
   that the 'z' modifier should be used here).
 - Ignoring k_Repeat when deciding whether the same key has been pressed in string
   input fields (based on a patch from Marko M�kel�).
+
+2006-04-28: Version 1.3.49
+
+- Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl).
+- Fixed extracting APIVERSION to work with older versions of 'sed' (reported by
+  Oliver Endriss; thanks also to Udo Richter for a shorter version of the 'sed'
+  expression).
+- Fixed broken APIVERSION extraction line in 'newplugin' (thanks to Oliver Endriss).
+- Fixed entering '0' in a cMenuEditIntItem (reported by Mirko D�lle).
+- Updated the Italian OSD texts (thanks to Nino Gerbino).
+- Added a note about adding 'INCLUDES += -I$(DVBDIR)/include' to an existing
+  Make.config (problem reported by Markus Ehrnsperger).
+- Fixed handling the cPluginManager::Active() result when pressing the "Power" key
+  (reported by Werner F�rber).
+- Added a hint about commenting out the line '#define USE_FADVISE' in tools.c in
+  case of problems with replaying in fast forward mode if the video directory is
+  mounted via a Samba share (reported by Andy Grobb).
+- Changed the "Really restart?" prompt in the call to cPluginManager::Active() in
+  menu.c to "restart anyway?" (suggested by Rolf Ahrenberg).
+- Removed the obsolete "'1' for encrypted radio channels" part from the description
+  of the VPID in vdr.5 (reported by Alexander Hans).
+- Fixed tuning to the channel of a VPS timer if the device is the actual device.
diff --git a/INSTALL b/INSTALL
index ece7a60f7..a7cd588e2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 1.3
+Version 1.4
 -----------
 
 IMPORTANT NOTES:
@@ -324,6 +324,13 @@ since this might cause a lot of unnecessary disk access when VDR cleans up those
 directories and there is a large number of files and/or subdirectories in
 there.
 
+If your video directory is mounted via a Samba share, and you are experiencing
+problems with replaying in fast forward mode, you can comment out the line
+
+#define USE_FADVISE
+
+in the file tools.c, which may lead to better results.
+
 Configuration files:
 --------------------
 
diff --git a/MANUAL b/MANUAL
index 4e2885718..52c2a94e9 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,7 +1,7 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
-Version 1.3
+Version 1.4
 -----------
 
 * Remote Control Keys
diff --git a/Makefile b/Makefile
index f671fb477..148a688d7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.89 2006/04/23 09:01:17 kls Exp $
+# $Id: Makefile 1.91 2006/04/24 17:18:06 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -81,8 +81,8 @@ DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 
 # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h)
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h)
+VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 
 ifdef VFAT
 # for people who want their video directory on a VFAT partition
@@ -176,7 +176,7 @@ include-dir:
 
 plugins: include-dir
 	@failed="";\
-	@noapiv="";\
+	noapiv="";\
 	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
 	    echo "Plugin $$i:";\
 	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
diff --git a/PLUGINS.html b/PLUGINS.html
index 491399c71..0869c38f8 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.3</b></center>
+<center><b>Version 1.4</b></center>
 <p>
 <center>
 Copyright &copy; 2006 Klaus Schmidinger<br>
@@ -14,19 +14,6 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.31 are marked like this.
-<!--X1.3.31--></td></tr></table>
-<!--X1.3.37--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.37 are marked like this.
-<!--X1.3.37--></td></tr></table>
-<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.38 are marked like this.
-<!--X1.3.38--></td></tr></table>
-<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.3.46 are marked like this.
-<!--X1.3.47--></td></tr></table>
-<p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
 This interface allows programmers to develop additional functionality for VDR completely
@@ -62,18 +49,14 @@ <h1>Table Of Contents</h1>
 <li><a href="#Main menu entry">Main menu entry</a>
 <li><a href="#User interaction">User interaction</a>
 <li><a href="#Housekeeping">Housekeeping</a>
-<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <li><a href="#Main thread hook">Main thread hook</a>
 <li><a href="#Activity">Activity</a>
-<!--X1.3.47--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
 <li><a href="#Internationalization">Internationalization</a>
 <li><a href="#Custom services">Custom services</a>
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#SVDRP commands">SVDRP commands</a>
-<!--X1.3.31--></td></tr></table>
 <li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
 <li><a href="#Building the distribution package">Building the distribution package</a>
 </ul>
@@ -166,7 +149,6 @@ <h1>Table Of Contents</h1>
 The <tt>lib</tt> directory contains the dynamically loadable libraries of all
 available plugins. Note that the names of these files are created by concatenating
 <p>
-<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <table border=2>
 <tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>hello</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
 <tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>API version number<br>this plugin was<br>compiled for</font></td></tr>
@@ -178,7 +160,6 @@ <h1>Table Of Contents</h1>
 the current VDR version. That way minor fixes to VDR, that don't require changes
 to the VDR header files, can be made without requiring all plugins to be
 recompiled.
-<!--X1.3.47--></td></tr></table>
 <p>
 The plugin library files can be stored in any directory. If the default organization
 is not used, the path to the plugin directory has be be given to VDR through the
@@ -620,7 +601,6 @@ <h1>Table Of Contents</h1>
 the plugin should launch a separate thread to do this.
 </b>
 
-<!--X1.3.47--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <a name="Main thread hook"><hr><h2>Main thread hook</h2>
 
 <center><i><b>Pushing in...</b></i></center><p>
@@ -677,7 +657,6 @@ <h1>Table Of Contents</h1>
 be queried, and further prompts may show up. If all prompts have been confirmed,
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
-<!--X1.3.47--></td></tr></table>
 
 <a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
@@ -1002,7 +981,6 @@ <h1>Table Of Contents</h1>
 <tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if
 any plugin handled the request, or <tt>false</tt> if no plugin handled the request.
 
-<!--X1.3.31--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
 
 <center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
@@ -1094,8 +1072,6 @@ <h1>Table Of Contents</h1>
 when presenting them to the caller, and the continuation character ('<tt>-</tt>')
 will be set for all but the last one.
 
-<!--X1.3.31--></td></tr></table>
-
 <a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2>
 
 <center><i><b>Saddling up!</b></i></center><p>
@@ -1329,9 +1305,7 @@ <h1>Table Of Contents</h1>
   cMyControl(void);
   virtual ~cMyControl();
   virtual void Hide(void);
-<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
   virtual cOsdObject *GetInfo(void);
-<!--X1.3.38--></td></tr></table>
   virtual eOSState ProcessKey(eKeys Key);
   };
 </pre></td></tr></table><p>
@@ -1361,13 +1335,11 @@ <h1>Table Of Contents</h1>
 it has to hide itself from the OSD, in case it uses it. <tt>Hide()</tt> may be called at
 any time, and it may be called even if the <tt>cControl</tt> is not visible at the moment.
 <p>
-<!--X1.3.38--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 The <tt>GetInfo()</tt> function is called when the user presses the <tt>Info</tt> button,
 and shall return a pointer to a <tt>cOsdObject</tt> that contains information
 about the currently played programme. The caller takes ownership of the returned
 pointer and will delete it when it is no longer used. If no information is available,
 <tt>NULL</tt> shall be returned.
-<!--X1.3.38--></td></tr></table>
 <p>
 Finally, to get things going, a plugin that implements a player (and the surrounding
 infrastructure like displaying a list of playable stuff etc) simply has to call the
@@ -1589,7 +1561,6 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 
-<!--X1.3.37--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <p>
 Directly accessing the OSD is only allowed from the foreground thread, which
 restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
@@ -1603,7 +1574,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 to queue that message for display. See <tt>VDR/skins.h</tt> for details.
-<!--X1.3.37--></td></tr></table>
 
 <a name="Skins"><hr><h2>Skins</h2>
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 2106cbf3f..cefc33310 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.13 2006/04/22 09:59:44 kls Exp $
+# $Id: Makefile 1.14 2006/04/24 17:20:58 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 51317afc6..f0b130630 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2006/04/22 09:59:49 kls Exp $
+# $Id: Makefile 1.8 2006/04/24 17:21:00 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 31e57a898..08e83c31a 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.5 2006/04/22 09:59:55 kls Exp $
+# $Id: Makefile 1.6 2006/04/24 17:21:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -31,7 +31,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index ebb045f11..05c5e0539 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.5 2006/04/22 10:00:03 kls Exp $
+# $Id: Makefile 1.6 2006/04/24 17:21:02 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 2fad8b5f8..6b43441c0 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2006/04/22 10:00:17 kls Exp $
+# $Id: Makefile 1.8 2006/04/24 17:21:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 21f88171e..8cca7596b 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2006/04/22 10:00:24 kls Exp $
+# $Id: Makefile 1.12 2006/04/24 17:21:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index d9fd83494..a191d513c 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.5 2006/04/22 10:00:32 kls Exp $
+# $Id: Makefile 1.6 2006/04/24 17:21:06 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/config.h b/config.h
index cf27216a4..ddac5021f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.252 2006/04/21 14:53:26 kls Exp $
+ * $Id: config.h 1.254 2006/04/28 12:33:13 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.3.48"
-#define VDRVERSNUM   10348  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.49"
+#define VDRVERSNUM   10349  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/i18n.c b/i18n.c
index 1d8d30302..06a597167 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,12 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.273 2006/04/23 08:39:00 kls Exp $
+ * $Id: i18n.c 1.275 2006/04/28 12:50:04 kls Exp $
  *
  * Translations provided by:
  *
  * Slovenian   Miha Setina <mihasetina@softhome.net>, Matjaz Thaler <matjaz.thaler@guest.arnes.si>
- * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>
+ * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>, Nino Gerbino <ngerb@interfree.it>
  * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>, Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
  * Portuguese  Paulo Lopes <pmml@netvita.pt>
  * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>, Pierre Briec <pbriec@free.fr>
@@ -264,7 +264,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording info",
     "Aufzeichnung",
     "Podatki o snemanju",
-    "",// TODO
+    "Info Registrazione",
     "Opname info",
     "",// TODO
     "Infos sur l'enregistrement",
@@ -418,7 +418,7 @@ const tI18nPhrase Phrases[] = {
   { "Info",
     "Info",
     "Info",
-    "",//TODO
+    "Info",
     "Info",
     "",//TODO
     "Info",
@@ -462,7 +462,7 @@ const tI18nPhrase Phrases[] = {
   { "This event - %s",
     "Diese Sendung - %s",
     "Ta oddaja - %s",
-    "",//TODO
+    "Quest'evento - %s",
     "",//TODO
     "",//TODO
     "Cet �v�nement",
@@ -484,7 +484,7 @@ const tI18nPhrase Phrases[] = {
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
     "Ta oddaja - vsi kanali",
-    "",//TODO
+    "Quest'evento - tutti i canali",
     "",//TODO
     "",//TODO
     "Cet �v�nement - toutes les cha�nes",
@@ -506,7 +506,7 @@ const tI18nPhrase Phrases[] = {
   { "All events - all channels",
     "Alle Sendungen - alle Kan�le",
     "Vse oddaje - vsi kanali",
-    "",//TODO
+    "Tutti gli eventi - tutti i canali",
     "",//TODO
     "",//TODO
     "Tous les �v�nements - toutes cha�nes",
@@ -683,7 +683,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Timer",
     "Timer",
     "Termini",
-    "",// TODO
+    "Timer",
     "",// TODO
     "",// TODO
     "Programmation",
@@ -727,7 +727,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Info",
     "Info",
     "Info",
-    "",//TODO
+    "Info",
     "Info",
     "",//TODO
     "Info",
@@ -793,7 +793,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Rewind",
     "Anfang",
     "Na za�etek",
-    "Da inizio",
+    "Dall'inizio",
     "Naar begin",
     "Rebobinar",
     "Retour",
@@ -1035,7 +1035,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Menu",
     "Men�",
     "Meni",
-    "Men�",
+    "Menu",
     "Menu",
     "Menu",
     "Menu",
@@ -1101,7 +1101,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Audio",
     "Audio",
     "Zvok",
-    "",// TODO
+    "Audio",
     "Audio",
     "",// TODO
     "Audio",
@@ -1256,7 +1256,7 @@ const tI18nPhrase Phrases[] = {
   { "Really restart?",
     "Wirklich neu starten?",
     "Zares ponoven zagon?",
-    "Eseguo un restart?",
+    "Eseguo un riavvio?",
     "Werkelijk opnieuw starten?",
     "Tem a certeza que quer reiniciar?",
     "Red�marrer?",
@@ -1275,6 +1275,28 @@ const tI18nPhrase Phrases[] = {
     "Vil du virkelig genstarte?",
     "Opravdu restartovat?",
   },
+  { "restart anyway?",
+    "trotzdem neu starten?",
+    "zares ponoven zagon?",
+    "riavvio comunque?",
+    "toch opnieuw starten?",
+    "quer mesmo reiniciar?",
+    "red�marrer?",
+    "starte p� nytt likevel?",
+    "k�ynnistet��nk� uudelleen?",
+    "zrestartowa� mimo to?",
+    "�reiniciar igualmente?",
+    "������ �� ����� ������������?",
+    "vill du �nd� starta om?",
+    "repornesc, totu�i?",
+    "m�gis �jraind�tani?",
+    "Reiniciar de totes maneres?",
+    "������������� �������������?",
+    "svejedno restart sistema?",
+    "restart?",
+    "genstart alligevel?",
+    "p�esto restartovat?",
+  },
   { "shut down anyway?",
     "trotzdem ausschalten?",
     "zares izklopi?",
@@ -1300,7 +1322,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
     "Snemanje - zares ponoven zagon?",
-    "In registrazione - restart comunque?",
+    "In registrazione - riavvio comunque?",
     "Opname loopt - toch opnieuw starten?",
     "Em grava��o - quer mesmo reiniciar?",
     "Enregistrement en cours - red�marrer?",
@@ -1366,7 +1388,7 @@ const tI18nPhrase Phrases[] = {
   { "Press any key to cancel shutdown",
     "Taste dr�cken, um Ausschalten abzubrechen",
     "Pritisnite katerikoli gumb za preklic izklopa",
-    "Un tasto per annullare lo spegnimento",
+    "Premere un tasto per annullare lo spegnimento",
     "Druk een toets om shutdown af te breken",
     "Pressione qualquer tecla para cancelar",
     "Appuyez sur une touche pour annuler l'arr�t",
@@ -1477,7 +1499,7 @@ const tI18nPhrase Phrases[] = {
   { "Srate",
     "Srate",
     "Srate",
-    "Srate",
+    "SymbolRate",
     "Srate",
     "Srate",
     "Fr�q. Symbole",
@@ -1499,7 +1521,7 @@ const tI18nPhrase Phrases[] = {
   { "Vpid",
     "Vpid",
     "Vpid",
-    "Vpid",
+    "PID Video",
     "Vpid",
     "PID de V�deo",
     "PID Vid�o",
@@ -1521,7 +1543,7 @@ const tI18nPhrase Phrases[] = {
   { "Ppid",
     "Ppid",
     "Ppid",
-    "Ppid",
+    "PID Pcr",
     "Ppid",
     "Ppid",
     "Ppid",
@@ -1543,7 +1565,7 @@ const tI18nPhrase Phrases[] = {
   { "Apid1",
     "Apid1",
     "Apid1",
-    "Apid1",
+    "PID Audio (1)",
     "Apid1",
     "PID �udio (1)",
     "PID Audio (1)",
@@ -1565,7 +1587,7 @@ const tI18nPhrase Phrases[] = {
   { "Apid2",
     "Apid2",
     "Apid2",
-    "Apid2",
+    "PID Audio (2)",
     "Apid2",
     "Apid2",
     "PID Audio (2)",
@@ -1587,7 +1609,7 @@ const tI18nPhrase Phrases[] = {
   { "Dpid1",
     "Dpid1",
     "Dpid1",
-    "Dpid1",
+    "PID AC3 (1)",
     "Dpid1",
     "PID AC3 (1)",
     "PID AC3 (1)",
@@ -1609,7 +1631,7 @@ const tI18nPhrase Phrases[] = {
   { "Dpid2",
     "Dpid2",
     "Dpid2",
-    "Dpid2",
+    "PID AC3 (2)",
     "Dpid2",
     "PID AC3 (2)",
     "PID AC3 (2)",
@@ -1631,7 +1653,7 @@ const tI18nPhrase Phrases[] = {
   { "Tpid",
     "Tpid",
     "Tpid",
-    "Tpid",
+    "PID Teletext",
     "Tpid",
     "PID Teletexto",
     "PID T�l�texte",
@@ -1675,7 +1697,7 @@ const tI18nPhrase Phrases[] = {
   { "Free To Air",
     "frei empfangbar",
     "nekodiran",
-    "",//TODO
+    "in chiaro",
     "",//TODO
     "",//TODO
     "Aucun cryptage",
@@ -1697,7 +1719,7 @@ const tI18nPhrase Phrases[] = {
   { "encrypted",
     "verschl�sselt",
     "kodiran",
-    "",//TODO
+    "criptato",
     "",//TODO
     "",//TODO
     "Crypt�",
@@ -1763,7 +1785,7 @@ const tI18nPhrase Phrases[] = {
   { "Bandwidth",
     "Bandbreite",
     "Pasovna �irina",
-    "Bandwidth",
+    "Banda passante",
     "Bandwidth",
     "Bandwidth",
     "Bande passante",
@@ -2183,7 +2205,7 @@ const tI18nPhrase Phrases[] = {
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
     "Snemanje po terminu!",
-    "Registrazione di un timer in corso!",
+    "Registrazione da un timer in corso!",
     "Timer is aan het opnemen!",
     "Timer a gravar!",
     "Enregistrement en cours!",
@@ -2249,7 +2271,7 @@ const tI18nPhrase Phrases[] = {
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
     "*** Neznan kanal ***",
-    "*** CANALE INVALIDO ***",
+    "*** CANALE NON VALIDO ***",
     "*** Ongeldig kanaal ***",
     "*** Canal Inv�lido! ***",
     "*** Cha�ne invalide! ***",
@@ -2271,7 +2293,7 @@ const tI18nPhrase Phrases[] = {
   { "Upcoming VPS recording!",
     "VPS-Aufnahme beginnt in K�rze!",
     "Sledi VPS snemanje!",
-    "",//TODO
+    "Registrazione VPS in esecuzione!",
     "",//TODO
     "",//TODO
     "Enregistrement VPS commence procha�nement",
@@ -2337,7 +2359,7 @@ const tI18nPhrase Phrases[] = {
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
     "Nastavitve kanala niso edinstvene!",
-    "Paramentri Canale non unici!",
+    "Parametri canale non univoci!",
     "Kanaalinstellingen zijn niet uniek!",
     "",//TODO
     "Caract�ristiques des cha�nes ne sont pas uniques",
@@ -2491,7 +2513,7 @@ const tI18nPhrase Phrases[] = {
   { "Not enough disk space to start recording!",
     "Nicht gen�gend Plattenplatz f�r Aufnahme!",
     "Premalo prostora na disku za snemanje!",
-    "",//TODO
+    "Spazio su disco insufficiente per registrare!",
     "",//TODO
     "",//TODO
     "Espace disque insuffisant pour d�marrer l'enregistrement!",
@@ -2535,7 +2557,7 @@ const tI18nPhrase Phrases[] = {
   { "Opening CAM menu...",
     "CAM-Men� wird ge�ffnet...",
     "Odpiram CAM meni...",
-    "",//TODO
+    "Apertura menu CAM...",
     "CAM-menu wordt geopend...",
     "",//TODO
     "Ouverture du menu CAM",
@@ -2579,7 +2601,7 @@ const tI18nPhrase Phrases[] = {
   { "Resetting CAM...",
     "CAM wird zur�ckgesetzt...",
     "Resetiram CAM...",
-    "",//TODO
+    "CAM reimpostato...",
     "CAM wordt herstart...",
     "",//TODO
     "R�initialisation du CAM",
@@ -2645,7 +2667,7 @@ const tI18nPhrase Phrases[] = {
   { "Please enter %d digits!",
     "Bitte geben Sie %d Ziffern ein!",
     "Prosim vnesite %d �tevilk!",
-    "",//TODO
+    "Inserisci %d digits!",
     "Vul %d cijfers in!",
     "",//TODO
     "Veuillez entrer %d chiffres!",
@@ -2667,7 +2689,7 @@ const tI18nPhrase Phrases[] = {
   { "No audio available!",
     "Kein Audio verf�gbar!",
     "Zvok ni dosegljiv!",
-    "",//TODO
+    "Nessun audio disponibile!",
     "Geen audio beschikbaar!",
     "",//TODO
     "",//TODO
@@ -2822,7 +2844,7 @@ const tI18nPhrase Phrases[] = {
   { "Replay",
     "Wiedergabe",
     "Predvajanje",
-    "Replay",
+    "Riproduzione",
     "Afspelen",
     "Replay",
     "Lecture",
@@ -2955,7 +2977,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Skin",
     "Oberfl�che",
     "Preobleka",
-    "Superficie Skin",
+    "Skin",
     "Skin",
     "",// TODO
     "Skin",
@@ -3021,7 +3043,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Top",
     "Oben",
     "Zgoraj",
-    "Cima",
+    "Alto",
     "Boven",
     "",// TODO
     "Haut",
@@ -3153,7 +3175,7 @@ const tI18nPhrase Phrases[] = {
   { "skin dependent",
     "je nach Oberfl�che",
     "odvisno od preobleke",
-    "in base alla superficie",
+    "in base allo skin",
     "skin afhankelijk",
     "",// TODO
     "d�pend du skin",
@@ -3219,7 +3241,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Channel info time (s)",
     "Anzeigedauer f�r Kanalinfo (s)",
     "�as prikaza podatka o kanalu (s)",
-    "",// TODO
+    "Info orario canale (s)",
     "Duur tonen kanaal-informatie (s)",
     "",// TODO
     "Dur�e affichage infos cha�nes (s)",
@@ -3263,7 +3285,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Timeout requested channel info",
     "Angeforderte Kanalinfo schlie�en",
     "�as prikaza informacije o kanalu",
-    "", // TODO
+    "Richiesta timeout info canale",
     "", // TODO
     "", // TODO
     "Demande d'infos de cha�ne termin�e",
@@ -3307,7 +3329,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Scroll wraps",
     "Rundum scrollen",
     "Iz konca sko�i na za�etek",
-    "",// TODO
+    "Scrolling testo menu OSD",
     "Rondom scrollen",
     "",// TODO
     "D�filement rotatif",
@@ -3329,7 +3351,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Menu button closes",
     "Menu-Taste schlie�t",
     "Meni gumb zapre meni",
-    "",// TODO
+    "Bottone menu bloccato",
     "",// TODO
     "",// TODO
     "Menu bouton ferm�",
@@ -3373,7 +3395,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis zur EPG-Aktualisierung (h)",
     "�as do EPG pregleda (h)",
-    "Timeout scansione aggiornamento EPG (ore)",
+    "Timeout scansione EPG (ore)",
     "EPG-scan Timeout (h)",
     "Expirou o EPG (h)",
     "Inactivit� avant rech. EPG (h)",
@@ -3549,7 +3571,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Video display format",
     "Video-Anzeigeformat",
     "Format video prikaza",
-    "",//TODO
+    "Formato display video",
     "Video display formaat",
     "",//TODO
     "Format d'affichage",
@@ -3659,7 +3681,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Use Dolby Digital",
     "Dolby-Digital-Ton benutzen",
     "Uporabljaj Dolby Digital",
-    "",//TODO
+    "Usa Dolby Digital",
     "Dolby Digital gebruiken",
     "",//TODO
     "Utiliser le Dolby Digital",
@@ -3725,7 +3747,7 @@ const tI18nPhrase Phrases[] = {
   { "PIDs only",
     "nur PIDs",
     "samo PIDe",
-    "",// TODO
+    "solo PIDs",
     "",// TODO
     "",// TODO
     "PIDs uniquement",
@@ -3813,7 +3835,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Audio languages",  // note the plural
     "Audio-Sprachen",
     "Jeziki za zvok",
-    "",//TODO
+    "Lingue Audio",
     "Audio talen",
     "",//TODO
     "Langues audio",
@@ -3835,7 +3857,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Audio language",  // note the singular
     "Audio-Sprache",
     "Jezik za zvok",
-    "",//TODO
+    "Lingua Audio",
     "Audio taal",
     "",//TODO
     "Langue audio",
@@ -4319,7 +4341,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
     "Prika�i re�im predvajanja",
-    "Modalita' di visualizz su replay",
+    "Modalita' di visualizz. su replay",
     "Weergave mode aangeven",
     "Mostrar modo de replay",
     "Affichage mode de lecture",
@@ -4363,7 +4385,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Br�ckenzeit zwischen Timern (min)",
     "Najmanj�i �as dogodka (min)",
-    "Spegnimento: controllo prossimo evento (m)",
+    "Periodo minimo di pausa (min)",
     "Minimale event time-out (min)",
     "Per�odo m�nimo de pausa (min)",
     "MinEventTimeout (min)",
@@ -4385,7 +4407,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "VDR ausschalten bei Inaktivit�t (min)",
     "Najmanj�i �as neaktivnosti (min)",
-    "Spegnimento: tempo minimo di inattivit� (m)",
+    "Periodo minimo d'inattivita' (min)",
     "Minimum gebruikers inactiviteit (min)",
     "Per�odo m�nimo de inactividade (min)",
     "Dur�e minimale d'inact. (min)",
@@ -4451,7 +4473,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Initial channel",
     "Kanal beim Einschalten",
     "Privzeti kanal",
-    "",// TODO
+    "Canale iniziale",
     "",// TODO
     "",// TODO
     "Cha�ne initiale",
@@ -4473,7 +4495,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Initial volume",
     "Lautst�rke beim Einschalten",
     "Privzeta glasnost",
-    "",// TODO
+    "Volume iniziale",
     "",// TODO
     "",// TODO
     "Volume initial",
@@ -4495,7 +4517,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$as before",
     "wie vorher",
     "kot prej",
-    "",// TODO
+    "come prima",
     "",// TODO
     "",// TODO
     "comme avant",
@@ -4563,7 +4585,7 @@ const tI18nPhrase Phrases[] = {
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@",
     " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@",
-    " a�bcde��fghi�jklmnopqrstu�vwxyz0123456789-.#~,/_@",
+    " a�bcde��fghi�jklmno�pqrstu�vwxyz0123456789-.#~,/_@",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������",
     "",// TODO
     " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@",
@@ -4940,7 +4962,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Down",
     "Ab",
     "Dol",
-    "Gi�",
+    "Giu",
     "Omlaag",
     "Baixo",
     "Bas",
@@ -4962,7 +4984,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Menu",
     "Men�",
     "Meni",
-    "Men�",
+    "Menu",
     "Menu",
     "Menu",
     "Menu",
@@ -5314,7 +5336,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Next",
     "Vorw�rts",
     "Naprej",
-    "",// TODO
+    "Prossimo",
     "",// TODO
     "",// TODO
     "Suivant",
@@ -5336,7 +5358,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Prev",
     "Zur�ck",
     "Nazaj",
-    "",// TODO
+    "Precedente",
     "",// TODO
     "",// TODO
     "Pr�c�dent",
@@ -5424,7 +5446,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$PrevChannel",
     "Vorheriger Kanal",
     "Prej�nji kanal",
-    "",// TODO
+    "Canale Prec.",
     "",// TODO
     "",// TODO
     "Cha�ne pr�c�dente",
@@ -5490,7 +5512,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Mute",
     "Stumm",
     "Izklop zvoka",
-    "Mute",
+    "Muto",
     "Geluid onderbreken",
     "Sem som",
     "Coupure du son",
@@ -5512,7 +5534,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Audio",
     "Audio",
     "Zvok",
-    "",// TODO
+    "Audio",
     "Audio",
     "",// TODO
     "Audio",
@@ -5645,7 +5667,7 @@ const tI18nPhrase Phrases[] = {
   { "top",
     "oben",
     "zgoraj",
-    "limite sup",
+    "limite sup.",
     "boven",
     "topo",
     "haut",
@@ -5667,7 +5689,7 @@ const tI18nPhrase Phrases[] = {
   { "bottom",
     "unten",
     "spodaj",
-    "limite inf",
+    "limite inf.",
     "onder",
     "fundo",
     "bas",
@@ -5865,7 +5887,7 @@ const tI18nPhrase Phrases[] = {
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
     "Gor/Dol za novo poz. - Ok za premik",
-    "Su/Gi� per nuova posizione - OK per muovere",
+    "Su/Giu per nuova posizione - OK per muovere",
     "Gebruik Omhoog/Omlaag - daarna Ok",
     "Cima/Baixo para nova localiza��o - Ok para mover",
     "Haut/Bas -> nouvelle place - OK -> d�placer",
@@ -5953,7 +5975,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording started",
     "Aufzeichnung gestartet",
     "Snemanje se je pri�elo",
-    "",//TODO
+    "Registrazione iniziata",
     "",//TODO
     "",//TODO
     "Enregistrement a commenc�",
@@ -5997,7 +6019,7 @@ const tI18nPhrase Phrases[] = {
   { "Starting EPG scan",
     "Aktualisiere EPG-Daten",
     "Pri�enjam EPG-scan",
-    "",// TODO
+    "Scan EPG iniziato",
     "Bezig met starten EPG scan",
     "",// TODO
     "Mise � jour du guide des programmes",
@@ -6063,7 +6085,7 @@ const tI18nPhrase Phrases[] = {
   { "ST:TNG Panels",
     "ST:TNG-Konsolen",
     "ST:TNG Konsola",
-    "Consolles ST:TNG",
+    "Pannelli ST:TNG",
     "ST:TNG Consoles",
     "",// TODO
     "Consoles ST:TNG",
@@ -6085,7 +6107,7 @@ const tI18nPhrase Phrases[] = {
   { "No title",
     "Kein Titel",
     "Brez naziva",
-    "",// TODO
+    "Nessun titolo",
     "Geen titel",
     "",// TODO
     "Sans titre",
diff --git a/menu.c b/menu.c
index 8c3fe2ec0..950a7d9e8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.434 2006/04/16 12:20:46 kls Exp $
+ * $Id: menu.c 1.435 2006/04/28 12:48:01 kls Exp $
  */
 
 #include "menu.h"
@@ -2704,7 +2704,7 @@ eOSState cMenuSetup::Restart(void)
 {
   if (Interface->Confirm(tr("Really restart?"))
      && (!cRecordControls::Active() || Interface->Confirm(tr("Recording - restart anyway?")))
-     && !cPluginManager::Active(tr("Really restart?"))) {
+     && !cPluginManager::Active(tr("restart anyway?"))) {
      cThread::EmergencyExit(true);
      return osEnd;
      }
diff --git a/menuitems.c b/menuitems.c
index ef7cccc3e..1bca4873c 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.43 2006/04/23 11:39:48 kls Exp $
+ * $Id: menuitems.c 1.44 2006/04/25 15:59:02 kls Exp $
  */
 
 #include "menuitems.h"
@@ -80,10 +80,10 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
        case kNone: break;
        case k0 ... k9:
             if (fresh) {
-               *value = 0;
+               newValue = 0;
                fresh = false;
                }
-            newValue = *value * 10 + (Key - k0);
+            newValue = newValue * 10 + (Key - k0);
             break;
        case kLeft: // TODO might want to increase the delta if repeated quickly?
             newValue = *value - 1;
diff --git a/newplugin b/newplugin
index f54db76e2..98b8645d4 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.27 2006/04/22 10:04:10 kls Exp $
+# $Id: newplugin 1.28 2006/04/24 17:18:41 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -85,7 +85,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = \$(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*\$\$/\\1/; p }' \$(VDRDIR)/config.h)
+APIVERSION = \$(shell sed -ne '/define APIVERSION/s/^.*"\\(.*\\)".*\$\$/\\1/p' \$(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
diff --git a/vdr.1 b/vdr.1
index 829eb215f..6f71d2e0c 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.23 2006/04/14 13:03:18 kls Exp $
+.\" $Id: vdr.1 1.24 2006/04/28 13:06:35 kls Exp $
 .\"
-.TH vdr 1 "14 Apr 2006" "1.3.47" "Video Disk Recorder"
+.TH vdr 1 "28 Apr 2006" "1.4.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
diff --git a/vdr.5 b/vdr.5
index 0fc083bdc..08106c1ca 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.56 2006/04/21 15:13:10 kls Exp $
+.\" $Id: vdr.5 1.58 2006/04/28 13:06:54 kls Exp $
 .\"
-.TH vdr 5 "26 Mar 2006" "1.3.45" "Video Disk Recorder Files"
+.TH vdr 5 "28 Apr 2006" "1.4.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -118,7 +118,7 @@ defined in \fIsources.conf\fR.
 The symbol rate of this channel (DVB-S and DVB-C only).
 .TP
 .B VPID
-The video PID (set to '0' for radio channels, '1' for encrypted radio channels).
+The video PID (set to '0' for radio channels).
 If this channel uses a separate PCR PID, it follows the VPID, separated by a
 plus sign, as in
 .B ...:164+17:...
diff --git a/vdr.c b/vdr.c
index ff87c030b..792238637 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.264 2006/04/22 11:26:04 kls Exp $
+ * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
  */
 
 #include <getopt.h>
@@ -792,9 +792,9 @@ int main(int argc, char *argv[])
                         }
                      // Switch the device to the transponder:
                      if (Device) {
-                        if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
-                           cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                         if (!Device->IsTunedToTransponder(Timer->Channel())) {
+                           if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
+                              cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                            dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
                            Device->SwitchChannel(Timer->Channel(), false);
                            DeviceUsed[Device->DeviceNumber()] = Now;
@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
                           if (Interface->Confirm(tr("Recording - shut down anyway?")))
                              ForceShutdown = true;
                           }
-                       if (cPluginManager::Active(tr("shut down anyway?")))
+                       if (!cPluginManager::Active(tr("shut down anyway?")))
                           ForceShutdown = true;
                        LastActivity = 1; // not 0, see below!
                        UserShutdown = true;

From 529fc7b48aa8e2d6f3b66b1f0a473ee7bbad16c2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 30 Apr 2006 18:00:00 +0200
Subject: [PATCH 142/307] Version 1.4.0 - Fixed handling the "Power" key in
 case a recording is going on and no plugin   is active (thanks to Udo
 Richter; bug reported by Dominique Simon). - Updated the Polish OSD texts
 (thanks to Jaroslaw Swierczynski). - Fixed a memory leak in handling external
 EPG data (thanks to Tobias Grimm). - Fixed a memory leak in closing the video
 file during replay (thanks to Tobias Grimm). - Updated the Italian OSD texts
 (thanks to Nino Gerbino and Antonio Ospite). - Updated the Estonian OSD texts
 (thanks to Arthur Konovalov).

---
 CONTRIBUTORS |   8 ++
 HISTORY      |  10 +++
 config.h     |  10 +--
 eit.c        |   6 +-
 i18n.c       | 212 +++++++++++++++++++++++++--------------------------
 recording.c  |   4 +-
 vdr.1        |   4 +-
 vdr.5        |   4 +-
 vdr.c        |  34 +++++----
 9 files changed, 157 insertions(+), 135 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ff5052d76..54e36dfa5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1420,6 +1420,8 @@ Udo Richter <udo_richter@gmx.de>
  for suggesting to add a warning about plugins that don't honor APIVERSION in their
  Makefile
  for providing a shorter version of the 'sed' expression for extracting APIVERSION
+ for fixing a bug in handling the "Power" key in case a recording is going on and
+ no plugin is active
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1861,6 +1863,8 @@ Richard Lithvall <richard@lithvall.se>
 
 Tobias Grimm <listaccount@e-tobi.net>
  for suggesting to use geteuid() to check whether VDR is running as user 'root'
+ for fixing a memory leak in handling external EPG data
+ for fixing a memory leak in closing the video file during replay
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -1886,3 +1890,7 @@ Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
 Werner F�rber <w.faerber@gmx.de>
  for reporting a bug in handling the cPluginManager::Active() result when pressing
  the "Power" key
+
+Dominique Simon <d.simon@gmx.net>
+ for reporting a bug in handling the "Power" key in case a recording is going on and
+ no plugin is active
diff --git a/HISTORY b/HISTORY
index 33a7ad8be..7bba27703 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4677,3 +4677,13 @@ Video Disk Recorder Revision History
 - Removed the obsolete "'1' for encrypted radio channels" part from the description
   of the VPID in vdr.5 (reported by Alexander Hans).
 - Fixed tuning to the channel of a VPS timer if the device is the actual device.
+
+2006-04-30: Version 1.4.0
+
+- Fixed handling the "Power" key in case a recording is going on and no plugin
+  is active (thanks to Udo Richter; bug reported by Dominique Simon).
+- Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski).
+- Fixed a memory leak in handling external EPG data (thanks to Tobias Grimm).
+- Fixed a memory leak in closing the video file during replay (thanks to Tobias Grimm).
+- Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
diff --git a/config.h b/config.h
index ddac5021f..0138d31bd 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.254 2006/04/28 12:33:13 kls Exp $
+ * $Id: config.h 1.255 2006/04/29 09:24:07 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.3.49"
-#define VDRVERSNUM   10349  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.4.0"
+#define VDRVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.3.47"
-#define APIVERSNUM   10347  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.4.0"
+#define APIVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/eit.c b/eit.c
index c33dbefca..39567f8c6 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.116 2006/04/15 14:11:52 kls Exp $
+ * $Id: eit.c 1.117 2006/04/29 11:38:37 kls Exp $
  */
 
 #include "eit.h"
@@ -103,8 +103,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       cLinkChannels *LinkChannels = NULL;
       cComponents *Components = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
-          if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag)
+          if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag) {
+             delete d;
              continue;
+             }
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
                  SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
diff --git a/i18n.c b/i18n.c
index 06a597167..61af8a3dd 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.275 2006/04/28 12:50:04 kls Exp $
+ * $Id: i18n.c 1.279 2006/04/30 08:51:10 kls Exp $
  *
  * Translations provided by:
  *
@@ -108,7 +108,7 @@ const tI18nPhrase Phrases[] = {
   { "iso8859-15",
     "iso8859-15",
     "iso8859-2",
-    "iso8859-1",
+    "iso8859-15",
     "iso8859-15",
     "iso8859-1",
     "iso8859-1",
@@ -264,7 +264,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording info",
     "Aufzeichnung",
     "Podatki o snemanju",
-    "Info Registrazione",
+    "Informazioni registrazione",
     "Opname info",
     "",// TODO
     "Infos sur l'enregistrement",
@@ -330,7 +330,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
     "Ukazi za snemanje",
-    "Comandi di Registrazione",
+    "Comandi di registrazione",
     "Opname commando's",
     "",// TODO
     "Commandes d'enregistrement",
@@ -418,7 +418,7 @@ const tI18nPhrase Phrases[] = {
   { "Info",
     "Info",
     "Info",
-    "Info",
+    "Informazioni",
     "Info",
     "",//TODO
     "Info",
@@ -462,16 +462,16 @@ const tI18nPhrase Phrases[] = {
   { "This event - %s",
     "Diese Sendung - %s",
     "Ta oddaja - %s",
-    "Quest'evento - %s",
+    "Questo evento - %s",
     "",//TODO
     "",//TODO
     "Cet �v�nement",
     "",//TODO
     "T�m� tapahtuma - %s",
-    "Den h�r s�ndningen - %s",
+    "Ta audycja - %s",
     "Este evento - %s",
     "",//TODO
-    "",//TODO
+    "Den h�r s�ndningen - %s",
     "Aceast� emisiune - %s",
     "",//TODO
     "",//TODO
@@ -484,13 +484,13 @@ const tI18nPhrase Phrases[] = {
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
     "Ta oddaja - vsi kanali",
-    "Quest'evento - tutti i canali",
+    "Questo evento - tutti i canali"
     "",//TODO
     "",//TODO
     "Cet �v�nement - toutes les cha�nes",
     "",//TODO
     "T�m� tapahtuma - kaikki kanavat",
-    "",//TODO
+    "Ta audycja - wszystkie kana�y",
     "Este evento - todos los canales",
     "",//TODO
     "Den h�r s�ndningen - alla kanaler",
@@ -512,7 +512,7 @@ const tI18nPhrase Phrases[] = {
     "Tous les �v�nements - toutes cha�nes",
     "",//TODO
     "Kaikki tapahtumat - kaikki kanavat",
-    "",//TODO
+    "Wszystkie audycje - wszystkie kana�y",
     "Todos los eventos - todos los canales",
     "",//TODO
     "Alla tillf�llen - alla kanaler",
@@ -528,7 +528,7 @@ const tI18nPhrase Phrases[] = {
   { "What's on now?",
     "Was l�uft jetzt?",
     "Kaj je na sporedu?",
-    "In programmazione",
+    "In programmazione adesso",
     "Wat is er nu?",
     "Programa actual?",
     "Programmes en cours",
@@ -727,7 +727,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Info",
     "Info",
     "Info",
-    "Info",
+    "Informazioni",
     "Info",
     "",//TODO
     "Info",
@@ -793,7 +793,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Rewind",
     "Anfang",
     "Na za�etek",
-    "Dall'inizio",
+    "Riavvolgi",
     "Naar begin",
     "Rebobinar",
     "Retour",
@@ -1057,7 +1057,7 @@ const tI18nPhrase Phrases[] = {
   { "Button$Reset",
     "R�cksetzen",
     "Reset",
-    "Reset",
+    "Resetta",
     "Herstart",
     "",//TODO
     "R�initialisation",
@@ -1124,7 +1124,7 @@ const tI18nPhrase Phrases[] = {
   { "Delete channel?",
     "Kanal l�schen?",
     "Izbri�i kanal?",
-    "Cancello il canale?",
+    "Cancellare il canale?",
     "Kanaal verwijderen?",
     "Apagar o canal?",
     "Supprimer la cha�ne?",
@@ -1139,14 +1139,14 @@ const tI18nPhrase Phrases[] = {
     "Esborrar el canal?",
     "������� �����?",
     "Obrisati program?",
-    "Kustutan kanali?",
+    "Kustutada kanal?",
     "Slet kanal?",
     "Smazat kan�l?",
   },
   { "Delete timer?",
     "Timer l�schen?",
     "Izbri�i termin?",
-    "Cancello il timer?",
+    "Cancellare il timer?",
     "Timer verwijderen?",
     "Apagar o timer?",
     "Supprimer la programmation?",
@@ -1161,14 +1161,14 @@ const tI18nPhrase Phrases[] = {
     "Esborrar el temporitzador?",
     "������� ������?",
     "Obrisati termin?",
-    "Kustutan taimeri?",
+    "Kustutada taimer?",
     "Slet timer?",
     "Smazat �asova�?",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
     "Izbri�i posnetek?",
-    "Cancello la registrazione?",
+    "Cancellare la registrazione?",
     "Opname verwijderen?",
     "Apagar a grava��o?",
     "Supprimer l'enregistrement?",
@@ -1183,14 +1183,14 @@ const tI18nPhrase Phrases[] = {
     "Esborrar gravaci�?",
     "������� ������?",
     "Obrisati snimku?",
-    "Kustutan salvestuse?",
+    "Kustutada salvestus?",
     "Slet optagelse?",
     "Smazat nahr�vku?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
     "Snemanje po terminu - zares izbri�i?",
-    "Timer in registrazione - cancello?",
+    "Timer in registrazione - cancellare?",
     "Timer neemt nog op - toch verwijderen?",
     "Timer activo - t�m a certeza que quer apagar?",
     "Enregistrement en cours - confirmez la suppression",
@@ -1205,14 +1205,14 @@ const tI18nPhrase Phrases[] = {
     "Temporitzador activat - Esborrar de totes maneres?",
     "���� ������ �� ������� - ������������� �������?",
     "Jo� snimam - zaista obrisati?",
-    "Salvestus aktiivne - kustutan?",
+    "Salvestus aktiivne - kustutada?",
     "Timerstyret optagelse i gang - slet alligevel?",
     "Prob�h� nahr�v�n� - opravdu smazat?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
     "Prekini snemanje?",
-    "Fermo la registrazione?",
+    "Fermare la registrazione?",
     "Opname stoppen?",
     "Parar Grava��o?",
     "Arr�ter l'enregistrement?",
@@ -1227,14 +1227,14 @@ const tI18nPhrase Phrases[] = {
     "Aturar la gravaci�?",
     "���������� ������?",
     "Zaustaviti snimanje?",
-    "L�petan salvestamise?",
+    "L�petada salvestamine?",
     "Stop optagelse?",
     "Ukon�it nahr�v�n�?",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
     "�elite prekiniti urejanje?",
-    "Annullo la modifica?",
+    "Annullare la modifica?",
     "Bewerken afbreken?",
     "Cancelar Modifica��es?",
     "Annuler les modifications?",
@@ -1249,14 +1249,14 @@ const tI18nPhrase Phrases[] = {
     "Cancel�lar l'edici�?",
     "�������� ��������������?",
     "Otkazati ure�ivanje?",
-    "T�histan muudatuse?",
+    "T�histada muudatus?",
     "Afbryd redigering?",
     "Zru�it editaci?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
     "Zares ponoven zagon?",
-    "Eseguo un riavvio?",
+    "Eseguire un riavvio?",
     "Werkelijk opnieuw starten?",
     "Tem a certeza que quer reiniciar?",
     "Red�marrer?",
@@ -1278,7 +1278,7 @@ const tI18nPhrase Phrases[] = {
   { "restart anyway?",
     "trotzdem neu starten?",
     "zares ponoven zagon?",
-    "riavvio comunque?",
+    "riavviare comunque?",
     "toch opnieuw starten?",
     "quer mesmo reiniciar?",
     "red�marrer?",
@@ -1300,7 +1300,7 @@ const tI18nPhrase Phrases[] = {
   { "shut down anyway?",
     "trotzdem ausschalten?",
     "zares izklopi?",
-    "spengo comunque?",
+    "spegnere comunque?",
     "toch uitschakelen?",
     "quer mesmo desligar?",
     "confirmez l'arr�t",
@@ -1315,14 +1315,14 @@ const tI18nPhrase Phrases[] = {
     "Apagar de totes maneres?",
     "������������� ���������?",
     "svejedno isklju�iti?",
-    "l�litan v�lja?",
+    "l�litada v�lja?",
     "sluk alligevel?",
     "p�esto vypnout?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
     "Snemanje - zares ponoven zagon?",
-    "In registrazione - riavvio comunque?",
+    "In registrazione - riavviare comunque?",
     "Opname loopt - toch opnieuw starten?",
     "Em grava��o - quer mesmo reiniciar?",
     "Enregistrement en cours - red�marrer?",
@@ -1344,7 +1344,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
     "Snemanje - zares izklopi?",
-    "In registrazione - spengo comunque?",
+    "In registrazione - spegnere comunque?",
     "Opname loopt - toch uitschakelen?",
     "Em grava��o - quer mesmo desligar?",
     "Enregistrement en cours - confirmez l'arr�t",
@@ -1359,14 +1359,14 @@ const tI18nPhrase Phrases[] = {
     "Gravant - Apagar de totes maneres?",
     "���� ������ - ������������� ���������?",
     "Snimanje traje - svejedno isklju�iti?",
-    "Salvestamine aktiivne - l�litan v�lja?",
+    "Salvestamine aktiivne - l�litada v�lja?",
     "Optagelse igang - sluk alligevel?",
     "Syst�m je zanepr�zdn�n - p�esto vypnout?",
   },
   { "Recording in %ld minutes, shut down anyway?",
     "Aufnahme in %ld Minuten - trotzdem ausschalten?",
     "Snemanje �ez %ld minut, zares izklopi?",
-    "Registrazione fra %ld minuti - spengo comunque?",
+    "Registrazione fra %ld minuti - spegnere comunque?",
     "Opname in %ld minuten - toch uitschakelen?",
     "Em grava��o dentro de %ld minutos - quer mesmo desligar?",
     "Enregistrement dans %ld minutes - confirmez l'arr�t",
@@ -1381,7 +1381,7 @@ const tI18nPhrase Phrases[] = {
     "Hi ha una gravaci� en %ld minuts - Apagar de totes maneres?",
     "����� %ld ����� �������� ������ - ������������� ���������?",
     "Snimanje za %ld minuta - svejedno isklju�iti?",
-    "Salvestamine algab %ld minuti p�rast - l�litan v�lja?",
+    "Salvestamine algab %ld minuti p�rast - l�litada v�lja?",
     "Optagelse om %ld minutter - sluk alligevel?",
     "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?",
   },
@@ -1703,7 +1703,7 @@ const tI18nPhrase Phrases[] = {
     "Aucun cryptage",
     "",//TODO
     "vapaa",
-    "",//TODO
+    "nieszyfrowany"
     "en abierto",
     "",//TODO
     "Okodad",
@@ -1725,7 +1725,7 @@ const tI18nPhrase Phrases[] = {
     "Crypt�",
     "",//TODO
     "salattu",
-    "",//TODO
+    "szyfrowany",
     "cifrado",
     "",//TODO
     "krypterad",
@@ -2205,7 +2205,7 @@ const tI18nPhrase Phrases[] = {
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
     "Snemanje po terminu!",
-    "Registrazione da un timer in corso!",
+    "Registrazione di un timer in corso!",
     "Timer is aan het opnemen!",
     "Timer a gravar!",
     "Enregistrement en cours!",
@@ -2227,7 +2227,7 @@ const tI18nPhrase Phrases[] = {
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
     "Napaka pri dostopu do posnetka!",
-    "Errore nell'accesso alla registrazione",
+    "Errore nell'accedere alla registrazione!",
     "Fout bij lezen opname!",
     "Erro ao aceder � grava��o",
     "Impossible d'acc�der � l'enregistrement",
@@ -2271,7 +2271,7 @@ const tI18nPhrase Phrases[] = {
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
     "*** Neznan kanal ***",
-    "*** CANALE NON VALIDO ***",
+    "*** Canale NON valido ***",
     "*** Ongeldig kanaal ***",
     "*** Canal Inv�lido! ***",
     "*** Cha�ne invalide! ***",
@@ -2293,7 +2293,7 @@ const tI18nPhrase Phrases[] = {
   { "Upcoming VPS recording!",
     "VPS-Aufnahme beginnt in K�rze!",
     "Sledi VPS snemanje!",
-    "Registrazione VPS in esecuzione!",
+    "Registrazione VPS imminente!",
     "",//TODO
     "",//TODO
     "Enregistrement VPS commence procha�nement",
@@ -2469,7 +2469,7 @@ const tI18nPhrase Phrases[] = {
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
     "Urejanje je �e aktivno!",
-    "Processo di modifica gia` attivo!",
+    "Processo di modifica gia' attivo!",
     "Bewerken is al actief!",
     "Processo de modifica��o j� activo!",
     "Montage d�j� en cours!",
@@ -2601,7 +2601,7 @@ const tI18nPhrase Phrases[] = {
   { "Resetting CAM...",
     "CAM wird zur�ckgesetzt...",
     "Resetiram CAM...",
-    "CAM reimpostato...",
+    "Reimpostazione modulo CAM...",
     "CAM wordt herstart...",
     "",//TODO
     "R�initialisation du CAM",
@@ -2667,7 +2667,7 @@ const tI18nPhrase Phrases[] = {
   { "Please enter %d digits!",
     "Bitte geben Sie %d Ziffern ein!",
     "Prosim vnesite %d �tevilk!",
-    "Inserisci %d digits!",
+    "Inserire %d cifre!",
     "Vul %d cijfers in!",
     "",//TODO
     "Veuillez entrer %d chiffres!",
@@ -2955,7 +2955,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Language",
     "Sprache",
     "Jezik",
-    "Linguaggio",
+    "Lingua",
     "Taal",
     "Linguagem",
     "Langue",
@@ -2977,7 +2977,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Skin",
     "Oberfl�che",
     "Preobleka",
-    "Skin",
+    "Stile interfaccia",
     "Skin",
     "",// TODO
     "Skin",
@@ -2999,7 +2999,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Theme",
     "Thema",
     "Tema",
-    "Tema",
+    "Tema colori",
     "Thema",
     "",// TODO
     "Th�me",
@@ -3043,7 +3043,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Top",
     "Oben",
     "Zgoraj",
-    "Alto",
+    "In alto",
     "Boven",
     "",// TODO
     "Haut",
@@ -3175,7 +3175,7 @@ const tI18nPhrase Phrases[] = {
   { "skin dependent",
     "je nach Oberfl�che",
     "odvisno od preobleke",
-    "in base allo skin",
+    "in base allo stile",
     "skin afhankelijk",
     "",// TODO
     "d�pend du skin",
@@ -3241,7 +3241,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Channel info time (s)",
     "Anzeigedauer f�r Kanalinfo (s)",
     "�as prikaza podatka o kanalu (s)",
-    "Info orario canale (s)",
+    "Durata informazioni canale (s)",
     "Duur tonen kanaal-informatie (s)",
     "",// TODO
     "Dur�e affichage infos cha�nes (s)",
@@ -3263,7 +3263,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
     "Poka�i naziv kanala",
-    "Mostra info al cambio canale",
+    "Mostrare informazioni al cambio canale",
     "Kanaal info tonen",
     "Mostrar info ao mudar de Canal",
     "Affichage progr. en cours",
@@ -3285,7 +3285,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Timeout requested channel info",
     "Angeforderte Kanalinfo schlie�en",
     "�as prikaza informacije o kanalu",
-    "Richiesta timeout info canale",
+    "Scadenza informazioni canale richieste",
     "", // TODO
     "", // TODO
     "Demande d'infos de cha�ne termin�e",
@@ -3307,7 +3307,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
     "Drsni meni",
-    "Scorri pagina nel menu",
+    "Scorrere per pagine",
     "Scrollen per pagina",
     "Scroll da p�gina no menu",
     "D�filement par pages",
@@ -3329,7 +3329,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Scroll wraps",
     "Rundum scrollen",
     "Iz konca sko�i na za�etek",
-    "Scrolling testo menu OSD",
+    "Scorrere riavvolgendo",
     "Rondom scrollen",
     "",// TODO
     "D�filement rotatif",
@@ -3351,13 +3351,13 @@ const tI18nPhrase Phrases[] = {
   { "Setup.OSD$Menu button closes",
     "Menu-Taste schlie�t",
     "Meni gumb zapre meni",
-    "Bottone menu bloccato",
+    "Usare il bottone Menu per chiudere",
     "",// TODO
     "",// TODO
     "Menu bouton ferm�",
     "",// TODO
     "Sulje valikkon�pp�imell�",
-    "",// TODO
+    "Przycisk Menu zamyka",
     "Cerrar al pulsar bot�n de men�",
     "",// TODO
     "Menyknappen st�nger",
@@ -3395,7 +3395,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis zur EPG-Aktualisierung (h)",
     "�as do EPG pregleda (h)",
-    "Timeout scansione EPG (ore)",
+    "Timeout scansione aggiorn. EPG (ore)",
     "EPG-scan Timeout (h)",
     "Expirou o EPG (h)",
     "Inactivit� avant rech. EPG (h)",
@@ -3461,7 +3461,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
     "Nastavi sistemski �as",
-    "Settaggio orario automatico",
+    "Settare orario automatico",
     "Systeem klok instellen",
     "Ajustar rel�gio do sistema",
     "Ajuster l'heure du syst�me",
@@ -3483,7 +3483,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
     "Transponder za nastavitev �asa",
-    "Utilizza orario da transponder",
+    "Utilizzare orario da transponder",
     "Gebruik transponder tijd voor systeem",
     "Usar rel�gio do transponder",
     "Utiliser l'heure de la cha�ne",
@@ -3571,7 +3571,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Video display format",
     "Video-Anzeigeformat",
     "Format video prikaza",
-    "Formato display video",
+    "Formato di visualizz. video",
     "Video display formaat",
     "",//TODO
     "Format d'affichage",
@@ -3681,7 +3681,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Use Dolby Digital",
     "Dolby-Digital-Ton benutzen",
     "Uporabljaj Dolby Digital",
-    "Usa Dolby Digital",
+    "Dolby Digital",
     "Dolby Digital gebruiken",
     "",//TODO
     "Utiliser le Dolby Digital",
@@ -3747,13 +3747,13 @@ const tI18nPhrase Phrases[] = {
   { "PIDs only",
     "nur PIDs",
     "samo PIDe",
-    "solo PIDs",
+    "solo PID",
     "",// TODO
     "",// TODO
     "PIDs uniquement",
     "",// TODO
     "vain PID:it",
-    "Tylko PID-y",
+    "tylko PID-y",
     "",// TODO
     "",// TODO
     "bara PIDs",
@@ -3769,7 +3769,7 @@ const tI18nPhrase Phrases[] = {
   { "names and PIDs",
     "Namen und PIDs",
     "imena in PIDe",
-    "nomi e PIDs",
+    "nomi e PID",
     "namen en PIDs",
     "",// TODO
     "noms et PIDs",
@@ -3791,7 +3791,7 @@ const tI18nPhrase Phrases[] = {
   { "add new channels",
     "neue Kan�le hinzuf�gen",
     "dodaj nove programe",
-    "aggiungere canali nuovi",
+    "nuovi canali",
     "nieuwe kanalen toevoegen",
     "",// TODO
     "ajouter cha�nes",
@@ -3806,14 +3806,14 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "����� ������",
     "dodaj nove programe",
-    "lisa uued kanalid",
+    "uute kanalite lisamine",
     "tilf. ny kanaler",
     "p�idat nov� kan�ly",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
     "dodaj nove oddajnike",
-    "aggiungere transponder nuovi",
+    "nuovi transponder",
     "nieuwe transponders toevoegen",
     "",// TODO
     "ajouter transpondeurs",
@@ -3828,14 +3828,14 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "���. ������������",
     "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
-    "lisa uued transponderid",
+    "uute transponderite lisamine",
     "tilf. ny transp.",
     "p�idat nov� transpond�ry",
   },
   { "Setup.DVB$Audio languages",  // note the plural
     "Audio-Sprachen",
     "Jeziki za zvok",
-    "Lingue Audio",
+    "Lingue per l'Audio",
     "Audio talen",
     "",//TODO
     "Langues audio",
@@ -3857,7 +3857,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.DVB$Audio language",  // note the singular
     "Audio-Sprache",
     "Jezik za zvok",
-    "Lingua Audio",
+    "Lingua per l'Audio",
     "Audio taal",
     "",//TODO
     "Langue audio",
@@ -4143,7 +4143,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
     "Uporabi ime epizode",
-    "Utilizza il nome dell'episodio",
+    "Usare nome episodio",
     "Gebruik episode naam",
     "Utilizar o nome do epis�dio",
     "Utiliser le nom de l'�pisode",
@@ -4165,7 +4165,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
     "Uporabi VPS",
-    "Utilizzare VPS",
+    "Usare VPS",
     "VPS gebruiken",
     "",// TODO
     "Utiliser le VPS",
@@ -4209,7 +4209,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
     "Ozna�i direktno snemanje",
-    "Marca la registrazione",
+    "Marcare registrazione immediata",
     "Direkte opnamen markeren",
     "Marca de grava��o r�pida",
     "Marquage enregistr. imm�diats",
@@ -4231,7 +4231,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
     "Ime za direktno snemanje",
-    "Nome registrazione istantanea",
+    "Nome registrazione immediata",
     "Naam direkt-opname",
     "Nome de grava��o r�pida",
     "Noms enregistr. imm�diats",
@@ -4253,7 +4253,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
     "�as direktnega snemanja (min)",
-    "Tempo registrazione istantanea (min)",
+    "Tempo registrazione immediata (min)",
     "Duur van de directe opname (min)",
     "",//TODO
     "Dur�e enregistr. imm�diat (min)",
@@ -4341,7 +4341,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
     "Prika�i re�im predvajanja",
-    "Modalita' di visualizz. su replay",
+    "Mostrare modalita' riproduzione",
     "Weergave mode aangeven",
     "Mostrar modo de replay",
     "Affichage mode de lecture",
@@ -4363,7 +4363,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Replay$Resume ID",
     "Wiedergabe-ID",
     "ID za predvajanje",
-    "ID Ripresa",
+    "ID di rispristino",
     "Hervattings ID",
     "Resume ID",// TODO
     "ID de reprise",
@@ -4385,7 +4385,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Br�ckenzeit zwischen Timern (min)",
     "Najmanj�i �as dogodka (min)",
-    "Periodo minimo di pausa (min)",
+    "Scadenza minima evento (min)",
     "Minimale event time-out (min)",
     "Per�odo m�nimo de pausa (min)",
     "MinEventTimeout (min)",
@@ -4407,7 +4407,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "VDR ausschalten bei Inaktivit�t (min)",
     "Najmanj�i �as neaktivnosti (min)",
-    "Periodo minimo d'inattivita' (min)",
+    "Periodo minimo di inattivita' (min)",
     "Minimum gebruikers inactiviteit (min)",
     "Per�odo m�nimo de inactividade (min)",
     "Dur�e minimale d'inact. (min)",
@@ -4429,7 +4429,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP trennen bei Inaktivit�t (s)",
     "SVDRP �as neaktivnosti (s)",
-    "Timeout SVDRP (s)",
+    "Scadenza SVDRP (s)",
     "SVDRP Timeout (s)",
     "Timeout SVDRP (s)",
     "Temps maxi SVDRP (s)",
@@ -4451,7 +4451,7 @@ const tI18nPhrase Phrases[] = {
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Mindestzeit f�r Kanalhistorie (s)",
     "�as ugla�evanja (s)",
-    "Timeout Zapping",
+    "Scadenza Zapping (s)",
     "Zap timeout (s)",
     "",// TODO
     "Prise en compte cha�ne (s)",
@@ -4585,7 +4585,7 @@ const tI18nPhrase Phrases[] = {
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@",
     " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@",
-    " a�bcde��fghi�jklmno�pqrstu�vwxyz0123456789-.#~,/_@",
+    " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.#~,/_@",
     " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������",
     "",// TODO
     " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@",
@@ -4608,7 +4608,7 @@ const tI18nPhrase Phrases[] = {
   { " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
     " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
     " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9",
-    "",//TODO
+    " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9",
     "",//TODO
     "",//TODO
     " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
@@ -4631,7 +4631,7 @@ const tI18nPhrase Phrases[] = {
   { "Learning Remote Control Keys",
     "Fernbedienung anlernen",
     "U�enje kod upravljalca",
-    "Apprendimento tasti unita` remota",
+    "Apprendimento tasti unita' remota",
     "Leren toetsen afstandsbediening",
     "Aprender as teclas do telecomando",
     "Apprentissage des codes de t�l�commande",
@@ -4668,14 +4668,14 @@ const tI18nPhrase Phrases[] = {
     "Fase 1: Detectant el tipus de receptor",
     "��� 1: ����������� ���� ���� ������",
     "Faza 1: detektiranje k�da daljinskog upravlja�a.",
-    "Aste 1: Kodeerimiss�steemi tuvastamine",
+    "Samm 1: Kodeerimiss�steemi tuvastamine",
     "Fase 1: Detekterer fjernbetjenings-kodetype",
     "F�ze 1: Detekce typu k�du",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der Fernbedienung dr�cken",
     "Pritisnite tipko na upravljalcu",
-    "Premere un tasto dell'unita` RC",
+    "Premere un tasto dell'unita' RC",
     "Druk op een willekeurige knop",
     "Pressione qualquer tecla do telecomando",
     "Appuyer sur une touche de la t�l�commande",
@@ -4756,7 +4756,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 2: Aprenentantge de les funcions",
     "��� 2: ������� ����� ��������� ������",
     "Faza 2: U�enje posebnih k�dova",
-    "Aste 2: Klahvide �petamine",
+    "Samm 2: Klahvide �petamine",
     "Fase 2: L�r individuelle tast koder",
     "F�ze 2: U�en� konkr�tn�ho k�du kl�ves",
   },
@@ -4910,7 +4910,7 @@ const tI18nPhrase Phrases[] = {
     "Fase 3: Guardant els codis de les tecles",
     "��� 3: ����������� ����� ������",
     "Faza 3: Spremanje k�dova tipki",
-    "Aste 3: Klavhikoodide salvestamine",
+    "Samm 3: Klavhikoodide salvestamine",
     "Fase 3: Gemmer tast koder",
     "F�ze 3: Ulo�en� k�d�",
   },
@@ -5182,7 +5182,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Info",
     "Info",
     "Info",
-    "",//TODO
+    "Informazioni",
     "Info",
     "",//TODO
     "Info",
@@ -5204,7 +5204,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Play",
     "Wiedergabe",
     "Predvajaj",
-    "Riproduci",
+    "Riproduzione",
     "Weergeven",
     "",// TODO
     "Lecture",
@@ -5270,7 +5270,7 @@ const tI18nPhrase Phrases[] = {
   { "Key$Record",
     "Aufnehmen",
     "Snemaj",
-    "Registra",
+    "Registrazione",
     "Opnemen",
     "",// TODO
     "Enregistrement",
@@ -5645,7 +5645,7 @@ const tI18nPhrase Phrases[] = {
   { "auto",
     "auto",
     "avtomatsko",
-    "auto",
+    "automatico",
     "auto",
     "",// TODO
     "auto",
@@ -5667,7 +5667,7 @@ const tI18nPhrase Phrases[] = {
   { "top",
     "oben",
     "zgoraj",
-    "limite sup.",
+    "in alto",
     "boven",
     "topo",
     "haut",
@@ -5689,7 +5689,7 @@ const tI18nPhrase Phrases[] = {
   { "bottom",
     "unten",
     "spodaj",
-    "limite inf.",
+    "in basso",
     "onder",
     "fundo",
     "bas",
@@ -5799,7 +5799,7 @@ const tI18nPhrase Phrases[] = {
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
     " Prekini predvajanje",
-    " Interrompi riproduzione",
+    " Stop riproduzione",
     " Stop afspelen",
     " Parar reprodu��o",
     " Arr�ter la lecture",
@@ -5814,14 +5814,14 @@ const tI18nPhrase Phrases[] = {
     " Aturar la reproducci�",
     " ���������� ���������������",
     " Prekini reprodukciju",
-    " L�peta taasesitamine",
+    " L�petada taasesitamine",
     " Stop afspilning",
     " Zastavit p�ehr�v�n�",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
     " Prekini snemanje ",
-    " Interrompi registrazione ",
+    " Stop registrazione ",
     " Stop opnemen ",
     " Parar grava��o ",
     " Arr�ter l'enregistrement ",
@@ -5836,14 +5836,14 @@ const tI18nPhrase Phrases[] = {
     " Aturar la gravaci� ",
     " ���������� ������ ",
     " Prekini snimanje ",
-    " L�peta salvestamine ",
+    " L�petada salvestamine ",
     " Stop optagelse ",
     " Zastavit nahr�v�n� ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
     " Prekini urejanje",
-    " Annulla modifiche",
+    " Annullare modifiche",
     " Bewerken afbreken",
     " Anular modifica��o",
     " Annuler le montage",
@@ -5858,7 +5858,7 @@ const tI18nPhrase Phrases[] = {
     " Cancel�lar l'edici� ",
     " �������� ������ ������",
     " Prekini ure�ivanje",
-    " Katkesta monteerimine",
+    " Katkestada monteerimine",
     " Afbryd redigering",
     " Zru�it editaci",
   },
@@ -5975,7 +5975,7 @@ const tI18nPhrase Phrases[] = {
   { "Recording started",
     "Aufzeichnung gestartet",
     "Snemanje se je pri�elo",
-    "Registrazione iniziata",
+    "Registrazione avviata",
     "",//TODO
     "",//TODO
     "Enregistrement a commenc�",
@@ -6019,7 +6019,7 @@ const tI18nPhrase Phrases[] = {
   { "Starting EPG scan",
     "Aktualisiere EPG-Daten",
     "Pri�enjam EPG-scan",
-    "Scan EPG iniziato",
+    "Inizio scansione EPG",
     "Bezig met starten EPG scan",
     "",// TODO
     "Mise � jour du guide des programmes",
@@ -6041,7 +6041,7 @@ const tI18nPhrase Phrases[] = {
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Parameter!",
     "Ta vstavek nima nastavitvenih parametrov!",
-    "Questo plugin non ha parametri di setup!",
+    "Questo plugin non ha parametri di configurazione!",
     "Deze plugin heeft geen instelparameters",
     "",// TODO
     "Ce plugin n'a pas de param�tres!",
@@ -6085,7 +6085,7 @@ const tI18nPhrase Phrases[] = {
   { "ST:TNG Panels",
     "ST:TNG-Konsolen",
     "ST:TNG Konsola",
-    "Pannelli ST:TNG",
+    "Consolle ST:TNG",
     "ST:TNG Consoles",
     "",// TODO
     "Consoles ST:TNG",
@@ -6107,7 +6107,7 @@ const tI18nPhrase Phrases[] = {
   { "No title",
     "Kein Titel",
     "Brez naziva",
-    "Nessun titolo",
+    "Senza titolo",
     "Geen titel",
     "",// TODO
     "Sans titre",
diff --git a/recording.c b/recording.c
index 351713e99..229cfee59 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.147 2006/04/23 10:43:06 kls Exp $
+ * $Id: recording.c 1.148 2006/04/29 13:22:20 kls Exp $
  */
 
 #include "recording.h"
@@ -1436,7 +1436,7 @@ cUnbufferedFile *cFileName::Open(void)
 void cFileName::Close(void)
 {
   if (file) {
-     if ((record && CloseVideoFile(file) < 0) || (!record && file->Close() < 0))
+     if (CloseVideoFile(file) < 0)
         LOG_ERROR_STR(fileName);
      file = NULL;
      }
diff --git a/vdr.1 b/vdr.1
index 6f71d2e0c..232508624 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.24 2006/04/28 13:06:35 kls Exp $
+.\" $Id: vdr.1 1.25 2006/04/30 08:55:12 kls Exp $
 .\"
-.TH vdr 1 "28 Apr 2006" "1.4.0" "Video Disk Recorder"
+.TH vdr 1 "30 Apr 2006" "1.4.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
diff --git a/vdr.5 b/vdr.5
index 08106c1ca..3ecbe91f1 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.58 2006/04/28 13:06:54 kls Exp $
+.\" $Id: vdr.5 1.59 2006/04/30 08:55:16 kls Exp $
 .\"
-.TH vdr 5 "28 Apr 2006" "1.4.0" "Video Disk Recorder Files"
+.TH vdr 5 "30 Apr 2006" "1.4.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
diff --git a/vdr.c b/vdr.c
index 792238637..449eadf76 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
+ * $Id: vdr.c 1.267 2006/04/29 09:14:06 kls Exp $
  */
 
 #include <getopt.h>
@@ -970,21 +970,23 @@ int main(int argc, char *argv[])
                   }
                break;
           // Power off:
-          case kPower: isyslog("Power button pressed");
-                       DELETE_MENU;
-                       if (!Shutdown) {
-                          Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
-                          break;
-                          }
-                       if (cRecordControls::Active()) {
-                          if (Interface->Confirm(tr("Recording - shut down anyway?")))
-                             ForceShutdown = true;
-                          }
-                       if (!cPluginManager::Active(tr("shut down anyway?")))
-                          ForceShutdown = true;
-                       LastActivity = 1; // not 0, see below!
-                       UserShutdown = true;
-                       break;
+          case kPower:
+               isyslog("Power button pressed");
+               DELETE_MENU;
+               if (!Shutdown) {
+                  Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
+                  break;
+                  }
+               LastActivity = 1; // not 0, see below!
+               UserShutdown = true;
+               if (cRecordControls::Active()) {
+                  if (!Interface->Confirm(tr("Recording - shut down anyway?")))
+                     break;
+                  }
+               if (cPluginManager::Active(tr("shut down anyway?")))
+                  break;
+               ForceShutdown = true;
+               break;
           default: break;
           }
         Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time

From 5d8e3b18dc610e2696606092ba66e1477eccce88 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 May 2006 18:00:00 +0200
Subject: [PATCH 143/307] =?UTF-8?q?Version=201.4.0-1=20-=20Updated=20'S110?=
 =?UTF-8?q?W'=20in=20'sources.conf'.=20-=20Adjusted=20the=20'runvdr'=20scr?=
 =?UTF-8?q?ipt=20so=20that=20the=20user=20can=20fill=20in=20the=20function?=
 =?UTF-8?q?s=20to=20=20=20detect,=20load=20and=20unload=20the=20necessary?=
 =?UTF-8?q?=20driver=20modules=20(thanks=20to=20M.=20Kiesel=20for=20=20=20?=
 =?UTF-8?q?reporting=20that=20it=20still=20used=20DVBDIR).=20-=20Added=20'?=
 =?UTF-8?q?eval'=20to=20the=20$VDRCMD=20call=20in=20'runvdr'=20to=20avoid?=
 =?UTF-8?q?=20problems=20with=20quoting=20=20=20(suggested=20by=20Udo=20Ri?=
 =?UTF-8?q?chter).=20-=20Fixed=20missing=20','=20in=20the=20Italian=20and?=
 =?UTF-8?q?=20Polish=20OSD=20texts=20(thanks=20to=20Marko=20M=C3=A4kel?=
 =?UTF-8?q?=C3=A4).=20-=20Updated=20the=20Czech=20OSD=20texts=20(thanks=20?=
 =?UTF-8?q?to=20Vladim=C3=ADr=20B=C3=A1rta).=20-=20Fixed=20handling=20the?=
 =?UTF-8?q?=20"Power"=20key=20in=20case=20a=20timer=20is=20about=20to=20st?=
 =?UTF-8?q?art=20recording=20=20=20(thanks=20to=20Udo=20Richter).=20-=20Fi?=
 =?UTF-8?q?xed=20the=20character=20'r'=20in=20fontosd=20and=20fontsml=20fo?=
 =?UTF-8?q?r=20iso8859-2=20(thanks=20to=20Vladim=C3=ADr=20=20=20B=C3=A1rta?=
 =?UTF-8?q?).=20-=20When=20checking=20whether=20a=20VPS=20timer=20has=20en?=
 =?UTF-8?q?tered=20the=20"VPS=20margin",=20the=20event's=20start=20=20=20t?=
 =?UTF-8?q?ime=20is=20now=20used=20instead=20of=20the=20timer's=20start=20?=
 =?UTF-8?q?time,=20because=20otherwise=20events=20that=20=20=20start=20way?=
 =?UTF-8?q?=20off=20of=20their=20VPS=20time=20wouldn't=20be=20recorded=20c?=
 =?UTF-8?q?orrectly.=20-=20If=20VPS=20timers=20are=20active,=20their=20eve?=
 =?UTF-8?q?nts=20are=20now=20being=20kept=20up=20to=20date=20if=20there=20?=
 =?UTF-8?q?=20=20are=20any=20free=20devices=20available.=20-=20Fixed=20the?=
 =?UTF-8?q?=20character=20#207=20in=20fontosd=20for=20iso8859-2=20(thanks?=
 =?UTF-8?q?=20to=20Vladim=C3=ADr=20B=C3=A1rta).=20-=20Fixed=20handling=20u?=
 =?UTF-8?q?nknown=20codes=20when=20learning=20LIRC=20remote=20control=20co?=
 =?UTF-8?q?des=20(reported=20=20=20by=20Helmut=20Auer).=20-=20Since=20some?=
 =?UTF-8?q?=20channels=20(especially=20the=20Austrian=20ORF)=20randomly=20?=
 =?UTF-8?q?change=20the=20ids=20of=20their=20=20=20EPG=20events,=20VDR=20n?=
 =?UTF-8?q?ow=20gives=20the=20start=20time=20precedence=20when=20searching?=
 =?UTF-8?q?=20for=20existing=20=20=20events.=20-=20Fixed=20automatically?=
 =?UTF-8?q?=20updating=20the=20CAM=20menu=20in=20case=20the=20whole=20oper?=
 =?UTF-8?q?ation=20(for=20=20=20instance=20a=20firmware=20update)=20takes?=
 =?UTF-8?q?=20longer=20than=20the=20menu=20timeout.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS        |  13 ++++-
 HISTORY             |  30 +++++++++++-
 INSTALL             |   3 ++
 config.h            |   4 +-
 epg.c               |  18 +++----
 fontosd-iso8859-2.c | 112 ++++++++++++++++++++++----------------------
 fontsml-iso8859-2.c |  48 +++++++++----------
 i18n.c              |  22 ++++-----
 remote.c            |  12 ++---
 runvdr              |  39 +++++++++++----
 sources.conf        |   2 +-
 timers.c            |  13 +++--
 vdr.c               |  58 ++++++++++++++++-------
 13 files changed, 232 insertions(+), 142 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 54e36dfa5..4624d605c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -563,6 +563,8 @@ Helmut Auer <vdr@helmutauer.de>
  there are too many levels of symbolic links
  for reporting that an attempt to call a plugin's main menu function while a
  message is being displayed didn't work
+ for reporting a problem with the "Press any key on the RC unit" step when learning
+ LIRC remote control codes
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1422,6 +1424,9 @@ Udo Richter <udo_richter@gmx.de>
  for providing a shorter version of the 'sed' expression for extracting APIVERSION
  for fixing a bug in handling the "Power" key in case a recording is going on and
  no plugin is active
+ for suggesting to add 'eval' to the $VDRCMD call in 'runvdr' to avoid problems with
+ quoting
+ for fixing handling the "Power" key in case a timer is about to start recording
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1677,6 +1682,7 @@ Marko M
  for reporting that a menu was automatically closed when a replay ends
  for suggesting to ignore k_Repeat when deciding whether the same key has been
  pressed in string input fields
+ for fixing missing ',' in the Italian and Polish OSD texts
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
@@ -1828,8 +1834,10 @@ Ronny Kornexl <ronny.kornexl@online.de>
  font if set to '3' - even if it would have been a fixed font
  for reporting a bug in initializing 'noapiv' in the Makefile
 
-B�rta Vladim�r <vladimir.barta@k2atmitec.cz>
+Vladim�r B�rta <vladimir.barta@k2atmitec.cz>
  for translating OSD texts to the Czech language
+ for fixing the character 'r' in fontosd and fontsml for iso8859-2
+ for fixing the character #207 in fontosd for iso8859-2
 
 Christoph Haubrich <christoph1.haubrich@arcor.de>
  for making the "Ok" key in the "Jump" mode of the replay progress display confirm
@@ -1894,3 +1902,6 @@ Werner F
 Dominique Simon <d.simon@gmx.net>
  for reporting a bug in handling the "Power" key in case a recording is going on and
  no plugin is active
+
+M. Kiesel <vdr@continuity.cjb.net>
+ for reporting that the 'runvdr' script still used DVBDIR
diff --git a/HISTORY b/HISTORY
index 7bba27703..3934eb8f6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4283,7 +4283,7 @@ Video Disk Recorder Revision History
 - Speeded up cVideoRepacker (thanks to Reinhard Nissl).
 - Added an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier
   process the audio data (thanks to Marco Schl��ler).
-- Added Czech language texts (thanks to B�rta Vladim�r).
+- Added Czech language texts (thanks to Vladim�r B�rta).
   Plugin authors may want to add the new entries to their I18N texts and contact
   the translators to have their texts translated. Note that there are now 21
   different OSD languages, so please make sure you have 21 versions for each of
@@ -4687,3 +4687,31 @@ Video Disk Recorder Revision History
 - Fixed a memory leak in closing the video file during replay (thanks to Tobias Grimm).
 - Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+
+2006-05-14: Version 1.4.0-1
+
+- Updated 'S110W' in 'sources.conf'.
+- Adjusted the 'runvdr' script so that the user can fill in the functions to
+  detect, load and unload the necessary driver modules (thanks to M. Kiesel for
+  reporting that it still used DVBDIR).
+- Added 'eval' to the $VDRCMD call in 'runvdr' to avoid problems with quoting
+  (suggested by Udo Richter).
+- Fixed missing ',' in the Italian and Polish OSD texts (thanks to Marko M�kel�).
+- Updated the Czech OSD texts (thanks to Vladim�r B�rta).
+- Fixed handling the "Power" key in case a timer is about to start recording
+  (thanks to Udo Richter).
+- Fixed the character 'r' in fontosd and fontsml for iso8859-2 (thanks to Vladim�r
+  B�rta).
+- When checking whether a VPS timer has entered the "VPS margin", the event's start
+  time is now used instead of the timer's start time, because otherwise events that
+  start way off of their VPS time wouldn't be recorded correctly.
+- If VPS timers are active, their events are now being kept up to date if there
+  are any free devices available.
+- Fixed the character #207 in fontosd for iso8859-2 (thanks to Vladim�r B�rta).
+- Fixed handling unknown codes when learning LIRC remote control codes (reported
+  by Helmut Auer).
+- Since some channels (especially the Austrian ORF) randomly change the ids of their
+  EPG events, VDR now gives the start time precedence when searching for existing
+  events.
+- Fixed automatically updating the CAM menu in case the whole operation (for
+  instance a firmware update) takes longer than the menu timeout.
diff --git a/INSTALL b/INSTALL
index a7cd588e2..6cbc8b5fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -133,6 +133,9 @@ call to the VDR program, be sure to NOT use the '-d' option! Otherwise
 VDR will go into 'daemon' mode and the initial program call will return
 immediately! 'runvdr' needs to be started as user 'root'. Use the '-u'
 option to run the actual 'vdr' program under a different user id.
+Note that the 'runvdr' script needs to be adjusted to your particular
+requirements before you can actually use it. See the comments inside
+the script for more information.
 
 Setting the system time:
 ------------------------
diff --git a/config.h b/config.h
index 0138d31bd..0f042cf39 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.255 2006/04/29 09:24:07 kls Exp $
+ * $Id: config.h 1.256 2006/05/07 09:01:49 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.0"
+#define VDRVERSION  "1.4.0-1"
 #define VDRVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/epg.c b/epg.c
index bc448cf83..96c43e546 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.72 2006/04/22 12:02:47 kls Exp $
+ * $Id: epg.c 1.74 2006/05/12 13:25:44 kls Exp $
  */
 
 #include "epg.h"
@@ -327,8 +327,10 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
                              cEvent *newEvent = NULL;
                              if (Event)
                                 DELETENULL(Event->components);
-                             if (!Event)
+                             if (!Event) {
                                 Event = newEvent = new cEvent(EventID);
+                                Event->seen = 0;
+                                }
                              if (Event) {
                                 Event->SetTableID(TableID);
                                 Event->SetStartTime(StartTime);
@@ -710,12 +712,12 @@ const cEvent *cSchedule::GetFollowingEvent(void) const
 
 const cEvent *cSchedule::GetEvent(tEventID EventID, time_t StartTime) const
 {
-  // Returns either the event info with the given EventID or, if that one can't
-  // be found, the one with the given StartTime (or NULL if neither can be found)
-  cEvent *pt = eventsHashID.Get(EventID);
-  if (!pt && StartTime > 0) // 'StartTime < 0' is apparently used with NVOD channels
-     pt = eventsHashStartTime.Get(StartTime);
-  return pt;
+  // Returns the event info with the given StartTime or, if no actual StartTime
+  // is given, the one with the given EventID.
+  if (StartTime > 0) // 'StartTime < 0' is apparently used with NVOD channels
+     return eventsHashStartTime.Get(StartTime);
+  else
+     return eventsHashID.Get(EventID);
 }
 
 const cEvent *cSchedule::GetEventAround(time_t Time) const
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
index c5f664080..66224adc4 100644
--- a/fontosd-iso8859-2.c
+++ b/fontosd-iso8859-2.c
@@ -2471,34 +2471,34 @@ static const cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x0000000C,  // .........**..
   },
   {             // 114
-     10, 27,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CE,  // ..**..***.
-     0x000000FE,  // ..*******.
-     0x000000E0,  // ..***.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000E,  // ....***.
+     0x0000003E,  // ..*****.
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
   },
   {             // 115
      12, 27,
@@ -5261,34 +5261,34 @@ static const cFont::tPixelData FontOsd_iso8859_2[][29] = {
      0x00000000,  // ........
   },
   {             // 207
-     6, 27,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
+     17, 27,
+     0x00001860,  // ....**....**.....
+     0x00000CC0,  // .....**..**......
+     0x00000780,  // ......****.......
+     0x00000300,  // .......**........
+     0x00000000,  // .................
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006078,  // ..**......****...
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
   },
   {             // 208 iso8859-2
      17, 27,
diff --git a/fontsml-iso8859-2.c b/fontsml-iso8859-2.c
index af1d8a8b6..8b02a17ef 100644
--- a/fontsml-iso8859-2.c
+++ b/fontsml-iso8859-2.c
@@ -2132,30 +2132,30 @@ static const cFont::tPixelData FontSml_iso8859_2[][25] = {
      0x00000006,  // ........**.
   },
   {             // 114
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x000000F8,  // .*****...
-     0x000000E0,  // .***.....
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
+     6, 23,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
   },
   {             // 115
      9, 23,
diff --git a/i18n.c b/i18n.c
index 61af8a3dd..d1882c8f2 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.279 2006/04/30 08:51:10 kls Exp $
+ * $Id: i18n.c 1.281 2006/05/05 13:26:09 kls Exp $
  *
  * Translations provided by:
  *
@@ -484,7 +484,7 @@ const tI18nPhrase Phrases[] = {
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
     "Ta oddaja - vsi kanali",
-    "Questo evento - tutti i canali"
+    "Questo evento - tutti i canali",
     "",//TODO
     "",//TODO
     "Cet �v�nement - toutes les cha�nes",
@@ -1703,7 +1703,7 @@ const tI18nPhrase Phrases[] = {
     "Aucun cryptage",
     "",//TODO
     "vapaa",
-    "nieszyfrowany"
+    "nieszyfrowany",
     "en abierto",
     "",//TODO
     "Okodad",
@@ -2310,7 +2310,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "VPS salvestamine tulekul!",
     "VPS optagelse starter snart!",
-    "",//TODO
+    "Brzo za�ne nahr�v�n� VPS!",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -3764,7 +3764,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "ainult PID-id",
     "kun PIDs",
-    "",// TODO
+    "jen PIDs",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -4490,7 +4490,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Kanal k�ivitamisel",
     "Kanal ved opstart",
-    "",// TODO
+    "Kan�l po spu�t�n�",
   },
   { "Setup.Miscellaneous$Initial volume",
     "Lautst�rke beim Einschalten",
@@ -4512,7 +4512,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Helitugevus k�ivitamisel",
     "Lydstyrke ved opstart",
-    "",// TODO
+    "Hlasitost po spu�t�n�",
   },
   { "Setup.Miscellaneous$as before",
     "wie vorher",
@@ -4534,7 +4534,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "nagu enne",
     "som f�r",
-    "",// TODO
+    "jako naposledy",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -5353,7 +5353,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "J�rgmine",
     "Fremad",
-    "",// TODO
+    "D�le",
   },
   { "Key$Prev",
     "Zur�ck",
@@ -5375,7 +5375,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Eelmine",
     "Tilbage",
-    "",// TODO
+    "Zp�t",
   },
   { "Key$Power",
     "Ausschalten",
@@ -5463,7 +5463,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Eelmine kanal",
     "Foreg�ende kanal",
-    "",// TODO
+    "P�edch�zej�c� kan�l",
   },
   { "Key$Volume+",
     "Lautst�rke+",
diff --git a/remote.c b/remote.c
index c0b92867e..a4277401c 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.50 2006/04/17 08:58:28 kls Exp $
+ * $Id: remote.c 1.51 2006/05/12 12:40:15 kls Exp $
  */
 
 #include "remote.h"
@@ -182,11 +182,11 @@ eKeys cRemote::Get(int WaitMs, char **UnknownCode)
             repeatTimeout.Set(REPEATTIMEOUT);
          return k;
          }
-      else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut()) {
-         if (learning && UnknownCode) {
-            *UnknownCode = unknownCode;
-            unknownCode = NULL;
-            }
+      else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut())
+         return kNone;
+      else if (learning && UnknownCode && unknownCode) {
+         *UnknownCode = unknownCode;
+         unknownCode = NULL;
          return kNone;
          }
       }
diff --git a/runvdr b/runvdr
index 355549cb3..701c94ca9 100755
--- a/runvdr
+++ b/runvdr
@@ -5,6 +5,11 @@
 # If VDR exits abnormally, the driver will be reloaded
 # and VDR restarted.
 #
+# In order to actually use this script you need to implement
+# the functions DriverLoaded(), LoadDriver() and UnloadDriver()
+# and maybe adjust the VDRPRG and VDRCMD to your particular
+# requirements.
+#
 # Since this script loads the DVB driver, it must be started
 # as user 'root'. Add the option "-u username" to run VDR
 # under the given user name.
@@ -15,27 +20,43 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.16 2006/02/04 15:20:48 kls Exp $
+# $Id: runvdr 1.18 2006/05/01 14:51:00 kls Exp $
 
-DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
 VDRCMD="$VDRPRG -w 60 $*"
 
 LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
 KILL="/usr/bin/killall -q -TERM"
 
+# Detect whether the DVB driver is already loaded
+# and return 0 if it *is* loaded, 1 if not:
+function DriverLoaded()
+{
+  return 1
+}
+
+# Load all DVB driver modules needed for your hardware:
+function LoadDriver()
+{
+}
+
+# Unload all DVB driver modules loaded in LoadDriver():
+function UnloadDriver()
+{
+}
+
 # Load driver if it hasn't been loaded already:
-if [ $LSMOD -eq 0 ] ; then
-   (cd $DVBDIR; make insmod)
+if ! DriverLoaded; then
+   LoadDriver
    fi
 
 while (true) do
-      $VDRCMD
+      eval "$VDRCMD"
       if test $? -eq 0 -o $? -eq 2; then exit; fi
-      date
-      echo "restarting VDR"
+      echo "`date` reloading DVB driver"
       $KILL $VDRPRG
       sleep 10
-      (cd $DVBDIR; make rmmod; make insmod)
-      date
+      UnloadDriver
+      LoadDriver
+      echo "`date` restarting VDR"
       done
diff --git a/sources.conf b/sources.conf
index f3da9ab0f..fb6cd300f 100644
--- a/sources.conf
+++ b/sources.conf
@@ -164,7 +164,7 @@ S101W   DirecTV 1R/4S/8 & AMC4
 S103W   AMC1
 S105W   AMC15
 S107.3W Anik F1/F1R
-S110W   DirecTV 5 & Echostar 6/8
+S110W   DirecTV 5 & Echostar 6/8/10
 S111.1W Anik F2
 S113W   Solidaridad 2
 S119W   Echostar 7 & DirecTV 7S
diff --git a/timers.c b/timers.c
index 3a5b0ba64..9b70b57c0 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.58 2006/04/21 15:12:49 kls Exp $
+ * $Id: timers.c 1.59 2006/05/13 09:03:59 kls Exp $
  */
 
 #include "timers.h"
@@ -365,10 +365,13 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
      }
 
   if (HasFlags(tfActive)) {
-     if (HasFlags(tfVps) && !Directly && event && event->Vps() && event->Schedule() && event->Schedule()->PresentSeenWithin(30)) {
-        startTime = event->StartTime();
-        stopTime = event->EndTime();
-        return event->IsRunning(true);
+     if (HasFlags(tfVps) && event && event->Vps()) {
+        if (Margin || !Directly) {
+           startTime = event->StartTime();
+           stopTime = event->EndTime();
+           if (!Margin)
+              return event->IsRunning(true);
+           }
         }
      return startTime <= t + Margin && t < stopTime; // must stop *before* stopTime to allow adjacent timers
      }
diff --git a/vdr.c b/vdr.c
index 449eadf76..6343933fa 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.267 2006/04/29 09:14:06 kls Exp $
+ * $Id: vdr.c 1.272 2006/05/14 09:23:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -74,6 +74,8 @@
 #define SHUTDOWNRETRY     300 // seconds before trying again to shut down
 #define VPSCHECKDELTA      10 // seconds between checks for timers that have entered the VPS margin
 #define VPSDEVICETIMEOUT    8 // seconds before a device used for VPS may be reused
+#define VPSLOOKAHEADTIME   24 // hours within which VPS timers will make sure their events are up to date
+#define VPSUPTODATETIME  3600 // seconds before the event or schedule of a VPS timer needs to be refreshed
 
 #define EXIT(v) { ExitCode = (v); goto Exit; }
 
@@ -762,8 +764,25 @@ int main(int argc, char *argv[])
               TimerInVpsMargin = false;
               static time_t DeviceUsed[MAXDEVICES] = { 0 };
               for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
-                  if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording() && Timer->Matches(Now, true, Setup.VpsMargin)) {
-                     Timer->SetInVpsMargin(true);
+                  bool InVpsMargin = false;
+                  bool NeedsTransponder = false;
+                  if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording()) {
+                     if (Timer->Matches(Now, true, Setup.VpsMargin))
+                        InVpsMargin = true;
+                     else if (Timer->Event())
+                        NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
+                     else {
+                        cSchedulesLock SchedulesLock;
+                        const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+                        if (Schedules) {
+                           const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
+                           NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
+                           }
+                        }
+                     TimerInVpsMargin |= InVpsMargin | NeedsTransponder;
+                     }
+                  Timer->SetInVpsMargin(InVpsMargin);
+                  if (NeedsTransponder || InVpsMargin) {
                      // Find a device that provides the required transponder:
                      cDevice *Device = NULL;
                      for (int i = 0; i < cDevice::NumDevices(); i++) {
@@ -779,13 +798,13 @@ int main(int argc, char *argv[])
                                if (d->MaySwitchTransponder())
                                   // this one can be switched without disturbing anything else
                                   Device = d;
-                               else if (!Device && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
+                               else if (!Device && InVpsMargin && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
                                   // use this one only if no other with less impact can be found
                                   Device = d;
                                }
                             }
                          }
-                     if (!Device) {
+                     if (!Device && InVpsMargin) {
                         cDevice *d = cDevice::ActualDevice();
                         if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && Now - DeviceUsed[d->DeviceNumber()] > VPSDEVICETIMEOUT)
                            Device = d; // use the actual device as a last resort
@@ -805,10 +824,7 @@ int main(int argc, char *argv[])
                            Skins.Message(mtInfo, tr("Upcoming VPS recording!"));
                            }
                         }
-                     TimerInVpsMargin = true;
                      }
-                  else
-                     Timer->SetInVpsMargin(false);
                   }
               LastVpsCheck = time(NULL);
               }
@@ -970,7 +986,7 @@ int main(int argc, char *argv[])
                   }
                break;
           // Power off:
-          case kPower:
+          case kPower: {
                isyslog("Power button pressed");
                DELETE_MENU;
                if (!Shutdown) {
@@ -985,8 +1001,20 @@ int main(int argc, char *argv[])
                   }
                if (cPluginManager::Active(tr("shut down anyway?")))
                   break;
+               cTimer *timer = Timers.GetNextActiveTimer();
+               time_t Next  = timer ? timer->StartTime() : 0;
+               time_t Delta = timer ? Next - time(NULL) : 0;
+               if (Next && Delta <= Setup.MinEventTimeout * 60) {
+                  char *buf;
+                  asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
+                  bool confirm = Interface->Confirm(buf);
+                  free(buf);
+                  if (!confirm)
+                     break;
+                  }
                ForceShutdown = true;
                break;
+               }
           default: break;
           }
         Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
@@ -1004,6 +1032,9 @@ int main(int argc, char *argv[])
               else if (time(NULL) - LastActivity > MENUTIMEOUT)
                  state = osEnd;
               }
+           // TODO make the CAM menu stay open in case of automatic updates and have it return osContinue; then the following two lines can be removed again
+           else if (state == osEnd && LastActivity > 1)
+              LastActivity = time(NULL);
            switch (state) {
              case osPause:  DELETE_MENU;
                             cControl::Shutdown(); // just in case
@@ -1121,15 +1152,6 @@ int main(int argc, char *argv[])
                     else
                        LastActivity = 1;
                     }
-                 if (UserShutdown && Next && Delta <= Setup.MinEventTimeout * 60 && !ForceShutdown) {
-                    char *buf;
-                    asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
-                    if (Interface->Confirm(buf))
-                       ForceShutdown = true;
-                    else
-                       UserShutdown = false;
-                    free(buf);
-                    }
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
                     if (timer)

From 177b875945e5898ebc07d79527e0ddc5e4e0f93d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 28 May 2006 18:00:00 +0200
Subject: [PATCH 144/307] =?UTF-8?q?Version=201.4.0-2=20-=20Removed=20lefto?=
 =?UTF-8?q?ver=20LSMOD=3D...=20line=20from=20'runvdr'.=20-=20Modified=20th?=
 =?UTF-8?q?e=20Makefile=20to=20copy=20additional=20libraries=20a=20plugin?=
 =?UTF-8?q?=20might=20provide=20(suggested=20=20=20by=20Wayne=20Keer).=20S?=
 =?UTF-8?q?ee=20PLUGINS.html=20for=20details.=20-=20Fixed=20handling=20Tra?=
 =?UTF-8?q?nsfer=20Mode=20when=20replaying=20Dolby=20Digital=20audio=20and?=
 =?UTF-8?q?=20the=20option=20=20=20'-a'=20was=20given=20(based=20on=20a=20?=
 =?UTF-8?q?patch=20from=20Werner=20Fink).=20To=20avoid=20having=20to=20inc?=
 =?UTF-8?q?rement=20=20=20the=20API=20version,=20several=20#if=20checks=20?=
 =?UTF-8?q?have=20been=20introduced=20around=20this.=20These=20will=20=20?=
 =?UTF-8?q?=20be=20removed=20once=20the=20API=20version=20actually=20needs?=
 =?UTF-8?q?=20to=20be=20incremented.=20-=20Fixed=20deleting=20the=20'skinD?=
 =?UTF-8?q?escriptions'=20in=20cMenuSetupOSD::~cMenuSetupOSD()=20(thanks?=
 =?UTF-8?q?=20=20=20to=20Tobias=20Grimm).=20-=20Fixed=20calculating=20the?=
 =?UTF-8?q?=20start=20time=20of=20repeated=20timers=20with=20"first=20day"?=
 =?UTF-8?q?=20(thanks=20to=20=20=20Udo=20Richter).=20-=20Now=20setting=20a?=
 =?UTF-8?q?=20timer's=20cached=20start=20time=20to=200=20after=20a=20call?=
 =?UTF-8?q?=20to=20Skip()=20(thanks=20to=20=20=20Udo=20Richter).=20-=20Fix?=
 =?UTF-8?q?ed=20handling=20the=20running=20status=20of=20EPG=20events=20in?=
 =?UTF-8?q?=20case=20the=20"Schedule"=20menu=20is=20=20=20currently=20open?=
 =?UTF-8?q?=20(i.e.=20a=20write=20lock=20on=20the=20schedules=20data=20can?=
 =?UTF-8?q?'t=20be=20achieved).=20-=20Fixed=20handling=20VPS=20timers=20in?=
 =?UTF-8?q?=20case=20the=20EPG=20event=20hasn't=20been=20'seen'=20in=20a?=
 =?UTF-8?q?=20while.=20-=20Fixed=20calculating=20the=20cache=20size=20in?=
 =?UTF-8?q?=20cUnbufferedFile::Read()=20(thanks=20to=20Artur=20Skawina).?=
 =?UTF-8?q?=20-=20Removed=20-fPIC=20from=20VDR's=20and=20libsi's=20Makefil?=
 =?UTF-8?q?e=20(suggested=20by=20Prakash=20Punnoor).=20-=20Modifed=20the?=
 =?UTF-8?q?=20device=20selection=20to=20better=20handle=20timer=20conflict?=
 =?UTF-8?q?s=20(reported=20by=20=20=20Christian=20Wieninger).=20-=20Avoidi?=
 =?UTF-8?q?ng=20a=20compiler=20warning=20in=20libsi's=20TypeLoop::operator?=
 =?UTF-8?q?[].=20-=20Now=20processing=20the=20"frequency=20list=20descript?=
 =?UTF-8?q?or"=20(based=20on=20a=20patch=20from=20Anssi=20Hannula).=20-=20?=
 =?UTF-8?q?Improved=20the=20repeat=20function=20for=20LIRC=20remote=20cont?=
 =?UTF-8?q?rols=20(thanks=20to=20Joerg=20Riechardt).=20-=20Fixed=20moving?=
 =?UTF-8?q?=20channels,=20which=20sometimes=20stopped=20the=20current=20re?=
 =?UTF-8?q?play=20session=20=20=20(reported=20by=20Mirko=20D=C3=B6lle).=20?=
 =?UTF-8?q?-=20Fixed=20deleting=20channels=20in=20case=20the=20current=20c?=
 =?UTF-8?q?hannel's=20number=20changes=20(reported=20=20=20by=20Mirko=20D?=
 =?UTF-8?q?=C3=B6lle).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         |  19 ++++++
 HISTORY              |  30 +++++++++
 Make.config.template |   6 +-
 Makefile             |   8 +--
 PLUGINS.html         |  12 +++-
 audio.c              |  19 +++++-
 channels.c           |  13 +++-
 channels.h           |   6 +-
 config.h             |   4 +-
 device.c             |  38 ++++--------
 device.h             |  11 +++-
 dvbdevice.c          |  28 +++++++--
 dvbdevice.h          |  14 ++++-
 eit.c                |  30 ++++++---
 epg.c                |   4 +-
 libsi/Makefile       |   4 +-
 libsi/si.h           |   3 +-
 lirc.c               |  14 +++--
 menu.c               |  45 ++++++++++++--
 nit.c                | 142 +++++++++++++++++++++++++++++++------------
 receiver.h           |   4 +-
 runvdr               |   3 +-
 timers.c             |   7 ++-
 tools.c              |   4 +-
 24 files changed, 351 insertions(+), 117 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4624d605c..c593cc465 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -274,6 +274,7 @@ Artur Skawina <skawina@geocities.com>
  for pointing out a problem with the ERR macro defined by ncurses.h
  for a patch that contained a fix for checking toFile in cCuttingThread::Action()
  for improving cUnbufferedFile
+ for fixing calculating the cache size in cUnbufferedFile::Read()
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
@@ -309,6 +310,8 @@ Werner Fink <werner@suse.de>
  and firmware can handle live DD without the need of a Transfer Mode
  for fixing cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is
  false
+ for a patch that was used as a base to fix handling Transfer Mode when replaying
+ Dolby Digital audio and the option '-a' was given
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
@@ -442,6 +445,9 @@ Mirko D
  for making the "Play" key in live viewing mode resume a previous replay session
  for suggesting to allow defining key macros for all non-modeless keys
  for reporting a bug in entering '0' in a cMenuEditIntItem
+ for reporting that moving channels sometimes stopped the current replay session
+ for reporting a problem with deleting channels in case the current channel's
+ number changes
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
@@ -538,6 +544,7 @@ Christian Rienecker <C.Rienecker@gmx.net>
 
 Joerg Riechardt <J.Riechardt@gmx.de>
  for filling in some missing teletext PIDs
+ for improving the repeat function for LIRC remote controls
 
 Holger W�chtler <holger@qanu.de>
  for some valuable advice during adapting to the NEWSTRUCT driver
@@ -1273,6 +1280,8 @@ Wayne Keer <syphir@syphir.sytes.net>
  for reporting a spelling error in 'canceling'
  for adding some 'mkdir -p' to the Makefile's 'install' target
  for reporting some missing braces in remux.c
+ for suggesting to modifiy the Makefile to copy additional libraries a plugin might
+ provide
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
@@ -1427,6 +1436,8 @@ Udo Richter <udo_richter@gmx.de>
  for suggesting to add 'eval' to the $VDRCMD call in 'runvdr' to avoid problems with
  quoting
  for fixing handling the "Power" key in case a timer is about to start recording
+ for fixing calculating the start time of repeated timers with "first day"
+ for setting a timer's cached start time to 0 after a call to Skip()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1756,6 +1767,7 @@ Christian Wieninger <cwieninger@gmx.de>
  for his idea of going directly into the "Edit timer" menu for a timer created
  from the "Schedule" menu in case it starts withing the next two minutes
  for reporting a problem with a format string in recording.c on 64bit systems
+ for reporting a problem with the device selection in case of timer conflicts
 
 Thiemo Gehrke <tgehrke@reel-multimedia.com>
  for suggesting to add a setup option to turn off the automatic timeout of the
@@ -1873,6 +1885,7 @@ Tobias Grimm <listaccount@e-tobi.net>
  for suggesting to use geteuid() to check whether VDR is running as user 'root'
  for fixing a memory leak in handling external EPG data
  for fixing a memory leak in closing the video file during replay
+ for fixing deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD()
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -1905,3 +1918,9 @@ Dominique Simon <d.simon@gmx.net>
 
 M. Kiesel <vdr@continuity.cjb.net>
  for reporting that the 'runvdr' script still used DVBDIR
+
+Prakash Punnoor <prakash@punnoor.de>
+ for suggesting to remove -fPIC from VDR's and libsi's Makefile
+
+Anssi Hannula <anssi.hannula@gmail.com>
+ for a patch that was used to implement processing the "frequency list descriptor"
diff --git a/HISTORY b/HISTORY
index 3934eb8f6..da5dd4f97 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4715,3 +4715,33 @@ Video Disk Recorder Revision History
   events.
 - Fixed automatically updating the CAM menu in case the whole operation (for
   instance a firmware update) takes longer than the menu timeout.
+
+2006-05-28: Version 1.4.0-2
+
+- Removed leftover LSMOD=... line from 'runvdr'.
+- Modified the Makefile to copy additional libraries a plugin might provide (suggested
+  by Wayne Keer). See PLUGINS.html for details.
+- Fixed handling Transfer Mode when replaying Dolby Digital audio and the option
+  '-a' was given (based on a patch from Werner Fink). To avoid having to increment
+  the API version, several #if checks have been introduced around this. These will
+  be removed once the API version actually needs to be incremented.
+- Fixed deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() (thanks
+  to Tobias Grimm).
+- Fixed calculating the start time of repeated timers with "first day" (thanks to
+  Udo Richter).
+- Now setting a timer's cached start time to 0 after a call to Skip() (thanks to
+  Udo Richter).
+- Fixed handling the running status of EPG events in case the "Schedule" menu is
+  currently open (i.e. a write lock on the schedules data can't be achieved).
+- Fixed handling VPS timers in case the EPG event hasn't been 'seen' in a while.
+- Fixed calculating the cache size in cUnbufferedFile::Read() (thanks to Artur Skawina).
+- Removed -fPIC from VDR's and libsi's Makefile (suggested by Prakash Punnoor).
+- Modifed the device selection to better handle timer conflicts (reported by
+  Christian Wieninger).
+- Avoiding a compiler warning in libsi's TypeLoop::operator[].
+- Now processing the "frequency list descriptor" (based on a patch from Anssi Hannula).
+- Improved the repeat function for LIRC remote controls (thanks to Joerg Riechardt).
+- Fixed moving channels, which sometimes stopped the current replay session
+  (reported by Mirko D�lle).
+- Fixed deleting channels in case the current channel's number changes (reported
+  by Mirko D�lle).
diff --git a/Make.config.template b/Make.config.template
index e307ba91c..4a22f655b 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,15 +6,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.8 2006/04/15 12:28:03 kls Exp $
+# $Id: Make.config.template 1.9 2006/05/26 10:41:46 kls Exp $
 
 ### The C compiler and options:
 
 CC       = gcc
-CFLAGS   = -O2
+CFLAGS   = -g -O2 -Wall
 
 CXX      = g++
-CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/Makefile b/Makefile
index 148a688d7..7b542eb56 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.91 2006/04/24 17:18:06 kls Exp $
+# $Id: Makefile 1.93 2006/05/26 10:42:17 kls Exp $
 
 .DELETE_ON_ERROR:
 
 CC       ?= gcc
-CFLAGS   ?= -O2
+CFLAGS   ?= -g -O2 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
@@ -223,7 +223,7 @@ install-doc:
 
 install-plugins: plugins
 	@mkdir -p $(PLUGINLIBDIR)
-	@cp $(PLUGINDIR)/lib/libvdr-*.so.$(APIVERSION) $(PLUGINLIBDIR)
+	@cp $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
 
 # Source documentation:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 0869c38f8..51424ce30 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.4</b></center>
+<center><b>Version 1.4.1</b></center>
 <p>
 <center>
 Copyright &copy; 2006 Klaus Schmidinger<br>
@@ -192,6 +192,16 @@ <h1>Table Of Contents</h1>
 should lead to the current version of the plugin you want to use. This way you can
 have several different versions of a plugin source (like <tt>hello-0.0.1</tt> and
 <tt>hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
+<p>
+If a plugin needs library files of its own, it can copy them to the <tt>lib</tt>
+directory following the naming convention <tt>lib<i>name</i>-<i>library</i>.so.0.0.1</tt>,
+where <i>name</i> is the name of the plugin, and <i>library</i> identifies the
+plugin's additional library. If the plugin <tt>hello</tt> would require the two
+additional libraries <tt>foo</tt> and <tt>bar</tt>, the  names would be
+<p>
+<tt>libhello-foo.so.0.0.1</tt><br>
+<tt>libhello-bar.so.0.0.1</tt>
+<p>
 
 <a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
 
diff --git a/audio.c b/audio.c
index 742c50b4c..ad5725c6a 100644
--- a/audio.c
+++ b/audio.c
@@ -4,11 +4,18 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 1.3 2005/02/12 12:40:51 kls Exp $
+ * $Id: audio.c 1.4 2006/05/20 10:02:08 kls Exp $
  */
 
 #include "audio.h"
-#include "stdlib.h"
+#include <stdlib.h>
+// TODO remove the following if APIVERSNUM > 10400
+#include "config.h"
+#if APIVERSNUM != 10400
+#warning ******* API version changed - remove old stuff
+#endif
+// TODO
+#include "dvbdevice.h"
 
 // --- cAudio ----------------------------------------------------------------
 
@@ -61,6 +68,14 @@ void cExternalAudio::Play(const uchar *Data, int Length, uchar Id)
   if (command && !mute) {
      if (pipe || pipe.Open(command, "w")) {
         if (0x80 <= Id && Id <= 0x87 || Id == 0xBD) { // AC3
+#if APIVERSNUM == 10400
+           extern int cDvbDevice__setTransferModeForDolbyDigital;
+           cDvbDevice__setTransferModeForDolbyDigital = 2;
+           cDvbDevice::SetTransferModeForDolbyDigital(false);
+#else
+#warning ******* API version changed - remove old stuff
+           cDvbDevice::SetTransferModeForDolbyDigital(2);
+#endif
            int written = Data[8] + 9; // skips the PES header
            if (Id != 0xBD)
               written += 4; // skips AC3 bytes
diff --git a/channels.c b/channels.c
index 343802ee1..4f1d39519 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.51 2006/04/17 12:18:57 kls Exp $
+ * $Id: channels.c 1.52 2006/05/28 10:14:18 kls Exp $
  */
 
 #include "channels.h"
@@ -925,6 +925,17 @@ int cChannels::GetNextNormal(int Idx)
   return channel ? Idx : -1;
 }
 
+#if APIVERSNUM != 10400
+#warning ******* API version changed - activate new code
+int cChannels::GetPrevNormal(int Idx)
+{
+  cChannel *channel = Get(--Idx);
+  while (channel && channel->GroupSep())
+        channel = Get(--Idx);
+  return channel ? Idx : -1;
+}
+#endif
+
 void cChannels::ReNumber( void )
 {
   channelsHashSid.Clear();
diff --git a/channels.h b/channels.h
index c7da4f357..abccceaea 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.40 2006/02/28 13:52:49 kls Exp $
+ * $Id: channels.h 1.41 2006/05/28 10:13:21 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -233,6 +233,10 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
+#if APIVERSNUM != 10400
+#warning ******* API version changed - activate new code
+  int GetPrevNormal(int Idx);  // Get previous normal channel (not group)
+#endif
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID);
diff --git a/config.h b/config.h
index 0f042cf39..0611e16ce 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.256 2006/05/07 09:01:49 kls Exp $
+ * $Id: config.h 1.257 2006/05/19 12:12:39 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.0-1"
+#define VDRVERSION  "1.4.0-2"
 #define VDRVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/device.c b/device.c
index 14b88178f..7d0fe12ef 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.128 2006/04/14 14:34:43 kls Exp $
+ * $Id: device.c 1.130 2006/05/27 11:14:42 kls Exp $
  */
 
 #include "device.h"
@@ -281,32 +281,20 @@ cDevice *cDevice::GetDevice(int Index)
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
   cDevice *d = NULL;
-  int select = INT_MAX;
-
+  uint Impact = 0xFFFFFFFF;
   for (int i = 0; i < numDevices; i++) {
       bool ndr;
       if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
-         int pri;
-         if (device[i]->Receiving() && !ndr)
-            pri = 0; // receiving and allows additional receivers
-         else if (!device[i]->Receiving(true) && d && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
-            pri = 1; // free and fewer Ca's
-         else if (!device[i]->Receiving() && !device[i]->HasDecoder())
-            pri = 2; // free and not a full featured card
-         else if (!device[i]->Receiving() && device[i] != ActualDevice())
-            pri = 3; // free and not the actual device
-         else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice())
-            pri = 4; // free and not the primary device
-         else if (!device[i]->Receiving())
-            pri = 5; // free
-         else if (d && device[i]->Priority() < d->Priority())
-            pri = 6; // receiving but priority is lower
-         else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
-            pri = 7; // receiving with same priority but fewer Ca's
-         else
-            pri = 8; // all others
-         if (pri <= select) {
-            select = pri;
+         uint imp = 0;
+         imp <<= 1; imp |= !device[i]->Receiving() || ndr;
+         imp <<= 1; imp |= device[i]->Receiving();
+         imp <<= 1; imp |= device[i] == ActualDevice();
+         imp <<= 1; imp |= device[i]->IsPrimaryDevice();
+         imp <<= 1; imp |= device[i]->HasDecoder();
+         imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);
+         imp <<= 8; imp |= min(max(device[i]->ProvidesCa(Channel), 0), 0xFF);
+         if (imp < Impact) {
+            Impact = imp;
             d = device[i];
             if (NeedsDetachReceivers)
                *NeedsDetachReceivers = ndr;
@@ -613,7 +601,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      StopReplay();
 
   // If this card is switched to an other transponder, any receivers still
-  // attached to it ineed to be automatically detached:
+  // attached to it need to be automatically detached:
   bool NeedsDetachReceivers = false;
 
   // If this card can't receive this channel, we must not actually switch
diff --git a/device.h b/device.h
index 2a682a3aa..7ff5d52e2 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.75 2006/04/14 14:35:13 kls Exp $
+ * $Id: device.h 1.77 2006/05/28 09:19:30 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -169,7 +169,7 @@ class cDevice : public cThread {
   int CardIndex(void) const { return cardIndex; }
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
-         ///< Returns the number of this device (0 ... MAXDEVICES - 1).
+         ///< Returns the number of this device (0 ... numDevices).
   virtual int ProvidesCa(const cChannel *Channel) const;
          ///< Checks whether this device provides the conditional access
          ///< facilities to decrypt the given Channel.
@@ -239,6 +239,13 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+#if APIVERSNUM != 10400
+#warning ******* API version changed - activate new code
+  static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
+         ///< Sets the number of the current channel on the primary device, without
+         ///< actually switching to it. This can be used to correct the current
+         ///< channel number while replaying.
+#endif
   void ForceTransferMode(void);
          ///< Forces the device into transfermode for the current channel.
   virtual bool HasLock(int TimeoutMs = 0);//XXX PLUGINS.html
diff --git a/dvbdevice.c b/dvbdevice.c
index db6a44762..6570695e8 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.156 2006/04/01 14:19:43 kls Exp $
+ * $Id: dvbdevice.c 1.157 2006/05/20 09:52:23 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -356,7 +356,12 @@ void cDvbTuner::Action(void)
 // --- cDvbDevice ------------------------------------------------------------
 
 int cDvbDevice::devVideoOffset = -1;
-bool cDvbDevice::setTransferModeForDolbyDigital = true;
+int cDvbDevice::setTransferModeForDolbyDigital = 1;
+#if APIVERSNUM == 10400
+int cDvbDevice__setTransferModeForDolbyDigital = -1;
+#else
+#warning ******* API version changed - remove old stuff
+#endif
 
 cDvbDevice::cDvbDevice(int n)
 {
@@ -653,7 +658,7 @@ eVideoSystem cDvbDevice::GetVideoSystem(void)
 
 bool cDvbDevice::SetAudioBypass(bool On)
 {
-  if (!setTransferModeForDolbyDigital)
+  if (setTransferModeForDolbyDigital != 1)
      return false;
   return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
 }
@@ -914,10 +919,23 @@ void cDvbDevice::SetDigitalAudioDevice(bool On)
      }
 }
 
+#if APIVERSNUM == 10400
 void cDvbDevice::SetTransferModeForDolbyDigital(bool On)
 {
-  setTransferModeForDolbyDigital = On;
+  if (cDvbDevice__setTransferModeForDolbyDigital >= 0) {
+     setTransferModeForDolbyDigital = cDvbDevice__setTransferModeForDolbyDigital;
+     cDvbDevice__setTransferModeForDolbyDigital = -1;
+     }
+  else
+     setTransferModeForDolbyDigital = On;
+}
+#else
+#warning ******* API version changed - remove old stuff
+void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
+{
+  setTransferModeForDolbyDigital = Mode;
 }
+#endif
 
 void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
 {
@@ -932,7 +950,7 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
            }
         }
      else if (IS_DOLBY_TRACK(Type)) {
-        if (!setTransferModeForDolbyDigital)
+        if (setTransferModeForDolbyDigital == 0)
            return;
         // Currently this works only in Transfer Mode
         ForceTransferMode();
diff --git a/dvbdevice.h b/dvbdevice.h
index 6f2078abd..1031c83d0 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.39 2006/04/01 14:18:59 kls Exp $
+ * $Id: dvbdevice.h 1.40 2006/05/20 09:32:06 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -104,14 +104,24 @@ class cDvbDevice : public cDevice {
 
 private:
   bool digitalAudio;
-  static bool setTransferModeForDolbyDigital;
+  static int setTransferModeForDolbyDigital;
 protected:
   virtual int GetAudioChannelDevice(void);
   virtual void SetAudioChannelDevice(int AudioChannel);
   virtual void SetVolumeDevice(int Volume);
   virtual void SetDigitalAudioDevice(bool On);
 public:
+#if APIVERSNUM == 10400
   static void SetTransferModeForDolbyDigital(bool On);
+#else
+#warning ******* API version changed - remove old stuff
+  static void SetTransferModeForDolbyDigital(int Mode);
+         ///< Controls how the DVB device handles Transfer Mode when replaying
+         ///< Dolby Digital audio.
+         ///< 0 = don't set "audio bypass" in driver/firmware, don't force Transfer Mode
+         ///< 1 = set "audio bypass" in driver/firmware, force Transfer Mode (default)
+         ///< 2 = don't set "audio bypass" in driver/firmware, force Transfer Mode
+#endif
 
 // Player facilities
 
diff --git a/eit.c b/eit.c
index 39567f8c6..d27849c15 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.117 2006/04/29 11:38:37 kls Exp $
+ * $Id: eit.c 1.118 2006/05/25 14:35:19 kls Exp $
  */
 
 #include "eit.h"
@@ -21,10 +21,10 @@
 
 class cEIT : public SI::EIT {
 public:
-  cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data);
+  cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus = false);
   };
 
-cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
+cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus)
 :SI::EIT(Data, false)
 {
   if (!CheckCRCAndParse())
@@ -57,6 +57,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       cEvent *rEvent = NULL;
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
       if (!pEvent) {
+         if (OnlyRunningStatus)
+            continue;
          // If we don't have that event yet, we create a new one.
          // Otherwise we copy the information into the existing event anyway, because the data might have changed.
          pEvent = newEvent = new cEvent(SiEitEvent.getEventId());
@@ -92,6 +94,12 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          pEvent->SetStartTime(SiEitEvent.getStartTime());
          pEvent->SetDuration(SiEitEvent.getDuration());
          }
+      if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
+         if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
+            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
+         }
+      if (OnlyRunningStatus)
+         continue; // do this before setting the version, so that the full update can be done later
       pEvent->SetVersion(getVersionNumber());
 
       int LanguagePreferenceShort = -1;
@@ -240,15 +248,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       pEvent->FixEpgBugs();
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
-      if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
-         if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
-            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
-         }
       Modified = true;
       }
   if (Empty && Tid == 0x4E && getSectionNumber() == 0)
      // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
      pSchedule->ClrRunningStatus(channel);
+  if (OnlyRunningStatus)
+     return;
   if (Tid == 0x4E)
      pSchedule->SetPresentSeen();
   if (Modified) {
@@ -312,6 +318,16 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
          cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
          if (Schedules)
             cEIT EIT(Schedules, Source(), Tid, Data);
+         else {
+            // If we don't get a write lock, let's at least get a read lock, so
+            // that we can set the running status and 'seen' timestamp (well, actually
+            // with a read lock we shouldn't be doing that, but it's only integers that
+            // get changed, so it should be ok)
+            cSchedulesLock SchedulesLock;
+            cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
+            if (Schedules)
+               cEIT EIT(Schedules, Source(), Tid, Data, true);
+            }
          }
          break;
     case 0x14: {
diff --git a/epg.c b/epg.c
index 96c43e546..566f20ee9 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.74 2006/05/12 13:25:44 kls Exp $
+ * $Id: epg.c 1.75 2006/05/25 14:55:36 kls Exp $
  */
 
 #include "epg.h"
@@ -227,7 +227,7 @@ bool cEvent::HasTimer(void) const
 
 bool cEvent::IsRunning(bool OrAboutToStart) const
 {
-  return SeenWithin(RUNNINGSTATUSTIMEOUT) && runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
+  return runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
 }
 
 cString cEvent::GetDateString(void) const
diff --git a/libsi/Makefile b/libsi/Makefile
index 155421797..cfc889b87 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,12 +1,12 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 1.5 2005/05/29 11:47:12 kls Exp $
+# $Id: Makefile 1.6 2006/05/26 10:40:19 kls Exp $
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
+CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
 AR = ar
 ARFLAGS = ru
 RANLIB = ranlib
diff --git a/libsi/si.h b/libsi/si.h
index 6922cdcda..a4877169d 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.14 2006/04/14 10:53:44 kls Exp $
+ *   $Id: si.h 1.15 2006/05/27 13:07:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -399,6 +399,7 @@ template <typename T> class TypeLoop : public Loop {
          case 8:
             return (SixtyFourBit(data.FourBytes(index)) << 32) | data.FourBytes(index+4);
          }
+         return 0; // just to avoid a compiler warning
       }
    T getNext(Iterator &it) const
       {
diff --git a/lirc.c b/lirc.c
index 9bb83287f..c4838b16b 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,16 +6,16 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.14 2006/01/27 15:59:47 kls Exp $
+ * $Id: lirc.c 1.15 2006/05/28 08:48:13 kls Exp $
  */
 
 #include "lirc.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#define REPEATLIMIT  20 // ms
 #define REPEATDELAY 350 // ms
-#define KEYPRESSDELAY 150 // ms
+#define REPEATFREQ 100 // ms
+#define REPEATTIMEOUT 500 // ms
 #define RECONNECTDELAY 3000 // ms
 
 cLircRemote::cLircRemote(const char *DeviceName)
@@ -94,7 +94,7 @@ void cLircRemote::Action(void)
               continue;
               }
            if (count == 0) {
-              if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < KEYPRESSDELAY)
+              if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < REPEATDELAY)
                  continue; // skip keys coming in too fast
               if (repeat)
                  Put(LastKeyName, false, true);
@@ -104,8 +104,10 @@ void cLircRemote::Action(void)
               timeout = -1;
               }
            else {
+              if (LastTime.Elapsed() < REPEATFREQ)
+                 continue; // repeat function kicks in after a short delay (after last key instead of first key)
               if (FirstTime.Elapsed() < REPEATDELAY)
-                 continue; // repeat function kicks in after a short delay
+                 continue; // skip keys coming in too fast (for count != 0 as well)
               repeat = true;
               timeout = REPEATDELAY;
               }
@@ -113,7 +115,7 @@ void cLircRemote::Action(void)
            Put(KeyName, repeat);
            }
         else if (repeat) { // the last one was a repeat, so let's generate a release
-           if (LastTime.Elapsed() >= REPEATDELAY) {
+           if (LastTime.Elapsed() >= REPEATTIMEOUT) {
               Put(LastKeyName, false, true);
               repeat = false;
               *LastKeyName = 0;
diff --git a/menu.c b/menu.c
index 950a7d9e8..759cfe0d9 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.435 2006/04/28 12:48:01 kls Exp $
+ * $Id: menu.c 1.438 2006/05/28 10:47:40 kls Exp $
  */
 
 #include "menu.h"
@@ -499,6 +499,8 @@ eOSState cMenuChannels::New(void)
 eOSState cMenuChannels::Delete(void)
 {
   if (!HasSubMenu() && Count() > 0) {
+     int CurrentChannelNr = cDevice::CurrentChannel();
+     cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
      int Index = Current();
      cChannel *channel = GetChannel(Current());
      int DeletedChannel = channel->Number();
@@ -508,10 +510,38 @@ eOSState cMenuChannels::Delete(void)
         return osContinue;
         }
      if (Interface->Confirm(tr("Delete channel?"))) {
+        if (CurrentChannel && channel == CurrentChannel) {
+           int n = Channels.GetNextNormal(CurrentChannel->Index());
+#if APIVERSNUM == 10400
+           if (n < 0) {
+              int Idx = CurrentChannel->Index();
+              cChannel *channel = Channels.Get(--Idx);
+              while (channel && channel->GroupSep())
+                    channel = Channels.Get(--Idx);
+              if (channel)
+                 n = Idx;
+              }
+#else
+#warning ******* API version changed - remove old stuff
+           if (n < 0)
+              n = Channels.GetPrevNormal(CurrentChannel->Index());
+#endif
+           CurrentChannel = Channels.Get(n);
+           CurrentChannelNr = 0; // triggers channel switch below
+           }
         Channels.Del(channel);
         cOsdMenu::Del(Index);
         Propagate();
         isyslog("channel %d deleted", DeletedChannel);
+        if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+           if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+              Channels.SwitchTo(CurrentChannel->Number());
+#if APIVERSNUM != 10400
+#warning ******* API version changed - activate new code
+           else
+              cDevice::SetCurrentChannel(CurrentChannel);
+#endif
+           }
         }
      }
   return osContinue;
@@ -530,8 +560,15 @@ void cMenuChannels::Move(int From, int To)
      cOsdMenu::Move(From, To);
      Propagate();
      isyslog("channel %d moved to %d", FromNumber, ToNumber);
-     if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr)
-        Channels.SwitchTo(CurrentChannel->Number());
+     if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+        if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+           Channels.SwitchTo(CurrentChannel->Number());
+#if APIVERSNUM != 10400
+#warning ******* API version changed - activate new code
+        else
+           cDevice::SetCurrentChannel(CurrentChannel);
+#endif
+        }
      }
 }
 
@@ -2131,7 +2168,7 @@ cMenuSetupOSD::cMenuSetupOSD(void)
 cMenuSetupOSD::~cMenuSetupOSD()
 {
   cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
-  delete skinDescriptions;
+  delete[] skinDescriptions;
 }
 
 void cMenuSetupOSD::Set(void)
diff --git a/nit.c b/nit.c
index 27b90fd18..007093dbf 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.11 2006/04/15 14:10:42 kls Exp $
+ * $Id: nit.c 1.12 2006/05/27 15:35:16 kls Exp $
  */
 
 #include "nit.h"
@@ -48,7 +48,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    if (nits[j].hasTransponder) {
                       networkId = nits[j].networkId;
                       //printf("taking NIT with network ID %d\n", networkId);
-                      //XXX what if more than one NIT contaisn this transponder???
+                      //XXX what if more than one NIT contains this transponder???
                       break;
                       }
                    }
@@ -95,46 +95,84 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
   SI::NIT::TransportStream ts;
   for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
       SI::Descriptor *d;
+
+      SI::Loop::Iterator it2;
+      SI::FrequencyListDescriptor *fld = (SI::FrequencyListDescriptor *)ts.transportStreamDescriptors.getNext(it2, SI::FrequencyListDescriptorTag);
+      int NumFrequencies = fld ? fld->frequencies.getCount() + 1 : 1;
+      int Frequencies[NumFrequencies];
+      if (fld) {
+         int ct = fld->getCodingType();
+         if (ct > 0) {
+            int n = 1;
+            for (SI::Loop::Iterator it3; fld->frequencies.hasNext(it3); ) {
+                int f = fld->frequencies.getNext(it3);
+                switch (ct) {
+                  case 1: f = BCD2INT(f) / 100; break;
+                  case 2: f = BCD2INT(f) / 10; break;
+                  case 3: f = f * 10;  break;
+                  }
+                Frequencies[n++] = f;
+                }
+            }
+         else
+            NumFrequencies = 1;
+         }
+      delete fld;
+
       for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
             case SI::SatelliteDeliverySystemDescriptorTag: {
                  SI::SatelliteDeliverySystemDescriptor *sd = (SI::SatelliteDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stSat, BCD2INT(sd->getOrbitalPosition()), sd->getWestEastFlag());
-                 int Frequency = BCD2INT(sd->getFrequency()) / 100;
+                 int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100;
                  static char Polarizations[] = { 'h', 'v', 'l', 'r' };
                  char Polarization = Polarizations[sd->getPolarization()];
                  static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
-                    if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) {
-                       nits[ThisNIT].hasTransponder = true;
-                       //printf("has transponder %d\n", Transponder());
-                       }
+                    for (int n = 0; n < NumFrequencies; n++) {
+                        if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Transponder())) {
+                           nits[ThisNIT].hasTransponder = true;
+                           //printf("has transponder %d\n", Transponder());
+                           break;
+                           }
+                        }
                     break;
                     }
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 5)
+                        if (Setup.UpdateChannels >= 5) {
+                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
+                              for (int n = 0; n < NumFrequencies; n++) {
+                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
+                                     Frequency = Frequencies[n];
+                                     break;
+                                     }
+                                  }
+                              }
                            Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
+                           }
                         found = true;
                         }
                      }
                  if (!found && Setup.UpdateChannels >= 5) {
-                    cChannel *Channel = new cChannel;
-                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                    if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate))
-                       EITScanner.AddTransponder(Channel);
-                    else
-                       delete Channel;
+                    for (int n = 0; n < NumFrequencies; n++) {
+                        cChannel *Channel = new cChannel;
+                        Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                        if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
+                           EITScanner.AddTransponder(Channel);
+                        else
+                           delete Channel;
+                        }
                     }
                  }
                  break;
             case SI::CableDeliverySystemDescriptorTag: {
                  SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stCable);
-                 int Frequency = BCD2INT(sd->getFrequency()) / 10;
+                 int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
                  static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
@@ -142,34 +180,48 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Modulation = Modulations[min(sd->getModulation(), 6)];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
-                    if (ISTRANSPONDER(Frequency / 1000, Transponder())) {
-                       nits[ThisNIT].hasTransponder = true;
-                       //printf("has transponder %d\n", Transponder());
-                       }
+                    for (int n = 0; n < NumFrequencies; n++) {
+                        if (ISTRANSPONDER(Frequencies[n] / 1000, Transponder())) {
+                           nits[ThisNIT].hasTransponder = true;
+                           //printf("has transponder %d\n", Transponder());
+                           break;
+                           }
+                        }
                     break;
                     }
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 5)
+                        if (Setup.UpdateChannels >= 5) {
+                           if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
+                              for (int n = 0; n < NumFrequencies; n++) {
+                                  if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
+                                     Frequency = Frequencies[n];
+                                     break;
+                                     }
+                                  }
+                              }
                            Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
+                           }
                         found = true;
                         }
                      }
                  if (!found && Setup.UpdateChannels >= 5) {
-                    cChannel *Channel = new cChannel;
-                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                    if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate))
-                       EITScanner.AddTransponder(Channel);
-                    else
-                       delete Channel;
+                    for (int n = 0; n < NumFrequencies; n++) {
+                        cChannel *Channel = new cChannel;
+                        Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                        if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
+                           EITScanner.AddTransponder(Channel);
+                        else
+                           delete Channel;
+                        }
                     }
                  }
                  break;
             case SI::TerrestrialDeliverySystemDescriptorTag: {
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stTerr);
-                 int Frequency = sd->getFrequency() * 10;
+                 int Frequency = Frequencies[0] = sd->getFrequency() * 10;
                  static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
                  int Bandwidth = Bandwidths[sd->getBandwidth()];
                  static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
@@ -184,27 +236,41 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
                  int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
                  if (ThisNIT >= 0) {
-                    if (ISTRANSPONDER(Frequency / 1000000, Transponder())) {
-                       nits[ThisNIT].hasTransponder = true;
-                       //printf("has transponder %d\n", Transponder());
-                       }
+                    for (int n = 0; n < NumFrequencies; n++) {
+                        if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
+                           nits[ThisNIT].hasTransponder = true;
+                           //printf("has transponder %d\n", Transponder());
+                           break;
+                           }
+                        }
                     break;
                     }
                  bool found = false;
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 5)
+                        if (Setup.UpdateChannels >= 5) {
+                           if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
+                              for (int n = 0; n < NumFrequencies; n++) {
+                                  if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
+                                     Frequency = Frequencies[n];
+                                     break;
+                                     }
+                                  }
+                              }
                            Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
+                           }
                         found = true;
                         }
                      }
                  if (!found && Setup.UpdateChannels >= 5) {
-                    cChannel *Channel = new cChannel;
-                    Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                    if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
-                       EITScanner.AddTransponder(Channel);
-                    else
-                       delete Channel;
+                    for (int n = 0; n < NumFrequencies; n++) {
+                        cChannel *Channel = new cChannel;
+                        Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                        if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
+                           EITScanner.AddTransponder(Channel);
+                        else
+                           delete Channel;
+                        }
                     }
                  }
                  break;
diff --git a/receiver.h b/receiver.h
index 959f6d61e..e12349973 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 1.3 2005/01/16 14:05:10 kls Exp $
+ * $Id: receiver.h 1.4 2006/05/27 09:04:22 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -44,7 +44,7 @@ class cReceiver {
                ///< Pids1...Pids3 are pointers to zero terminated lists of PIDs.
                ///< If any of these PIDs are 0, they will be silently ignored.
                ///< The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
-               ///< Priority may be any value in the range 0..99. Negative values indicate
+               ///< Priority may be any value in the range -99..99. Negative values indicate
                ///< that this cReceiver may be detached at any time (without blocking the
                ///< cDevice it is attached to).
   virtual ~cReceiver();
diff --git a/runvdr b/runvdr
index 701c94ca9..96c95bf2c 100755
--- a/runvdr
+++ b/runvdr
@@ -20,12 +20,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.18 2006/05/01 14:51:00 kls Exp $
+# $Id: runvdr 1.19 2006/05/14 16:02:05 kls Exp $
 
 VDRPRG="./vdr"
 VDRCMD="$VDRPRG -w 60 $*"
 
-LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
 KILL="/usr/bin/killall -q -TERM"
 
 # Detect whether the DVB driver is already loaded
diff --git a/timers.c b/timers.c
index 9b70b57c0..15fbdd8e5 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.59 2006/05/13 09:03:59 kls Exp $
+ * $Id: timers.c 1.61 2006/05/25 14:36:37 kls Exp $
  */
 
 #include "timers.h"
@@ -347,7 +347,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
      }
   else {
      for (int i = -1; i <= 7; i++) {
-         time_t t0 = IncDay(t, i);
+         time_t t0 = IncDay(day ? max(day, t) : t, i);
          if (DayMatches(t0)) {
             time_t a = SetTime(t0, begin);
             time_t b = a + length;
@@ -359,7 +359,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
             }
          }
      if (!startTime)
-        startTime = day; // just to have something that's more than a week in the future
+        startTime = IncDay(t, 7); // just to have something that's more than a week in the future
      else if (!Directly && (t > startTime || t > day + SECSINDAY + 3600)) // +3600 in case of DST change
         day = 0;
      }
@@ -560,6 +560,7 @@ bool cTimer::HasFlags(uint Flags) const
 void cTimer::Skip(void)
 {
   day = IncDay(SetTime(StartTime(), 0), 1);
+  startTime = 0;
   SetEvent(NULL);
 }
 
diff --git a/tools.c b/tools.c
index 53523fa09..475afdb86 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.117 2006/04/21 15:12:47 kls Exp $
+ * $Id: tools.c 1.118 2006/05/26 10:10:31 kls Exp $
  */
 
 #include "tools.h"
@@ -1179,7 +1179,7 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
            }
         else if (cachedend > ahead && cachedend - curpos > READCHUNK * 2) {
            // current position has moved back enough, shrink head window.
-           FadviseDrop(curpos + READCHUNK, cachedend - curpos + READCHUNK);
+           FadviseDrop(curpos + READCHUNK, cachedend - (curpos + READCHUNK));
            cachedend = curpos + READCHUNK;
            }
         }

From 21f3eaf6c98751cc5931ccfd7bc123f7b7ac38f8 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 Jun 2006 18:00:00 +0200
Subject: [PATCH 145/307] =?UTF-8?q?Version=201.4.0-3=20-=20Fixed=20the=20P?=
 =?UTF-8?q?remiereContentTransmissionDescriptor=20in=20'libsi'=20(thanks?=
 =?UTF-8?q?=20to=20Stefan=20=20=20Huelswitt).=20-=20Removed=20all=20the=20?=
 =?UTF-8?q?compatibility=20'#if=20APIVERSNUM...'=20stuff=20and=20instead?=
 =?UTF-8?q?=20increased=20=20=20the=20API=20version=20number=20-=20plugins?=
 =?UTF-8?q?=20will=20have=20to=20be=20recompiled.=20-=20Removed=20the=20ca?=
 =?UTF-8?q?ll=20to=20pthread=5Fsetschedparam(childTid,=20SCHED=5FRR,=200)?=
 =?UTF-8?q?=20in=20thread.c,=20=20=20because=20it=20caused=20a=20compiler?=
 =?UTF-8?q?=20warning=20with=20post-2.4=20glibc=20(reported=20by=20Ville?=
 =?UTF-8?q?=20Skytt=C3=A4).=20=20=20Since=20the=20third=20parameter=20has?=
 =?UTF-8?q?=20to=20be=20non-null=20to=20have=20any=20effect,=20the=20call?=
 =?UTF-8?q?=20was=20=20=20presumably=20a=20NOP,=20anyway.=20-=20Fixed=20th?=
 =?UTF-8?q?e=20'clean-plugins'=20target=20in=20the=20Makefile=20to=20also?=
 =?UTF-8?q?=20remove=20additional=20=20=20plugin=20libraries=20(thanks=20t?=
 =?UTF-8?q?o=20Wayne=20Keer).=20-=20Applied=20the=20fixes=20to=20moving=20?=
 =?UTF-8?q?and=20deleting=20channels=20from=20version=201.4.0-2=20to=20the?=
 =?UTF-8?q?=20=20=20SVDRP=20commands=20MOVC=20and=20DELC=20as=20well.=20-?=
 =?UTF-8?q?=20Fixed=20handling=20the=20display=20of=20the=20'*'=20indicato?=
 =?UTF-8?q?r=20in=20the=20"What's=20on=20now/next=3F"=20=20=20menu,=20so?=
 =?UTF-8?q?=20that=20events=20that=20haven't=20been=20"seen"=20in=20the=20?=
 =?UTF-8?q?data=20stream=20within=2030=20=20=20seconds=20won't=20be=20show?=
 =?UTF-8?q?n=20as=20"running".=20-=20Fixed=20handling=20tabbed=20item=20di?=
 =?UTF-8?q?splay=20in=20'skincurses'.=20-=20Increased=20the=20column=20spa?=
 =?UTF-8?q?cing=20in=20the=20"Recordings"=20menu=20(was=20too=20small=20fo?=
 =?UTF-8?q?r=20the=20=20=20'skincurses'=20plugin).=20-=20When=20the=20'ski?=
 =?UTF-8?q?ncurses'=20plugin=20is=20loaded,=20it=20automatically=20sets=20?=
 =?UTF-8?q?the=20'curses'=20=20=20skin=20as=20the=20current=20one.=20This?=
 =?UTF-8?q?=20doesn't=20modify=20the=20Setup.OSDSkin=20parameter,=20so=20?=
 =?UTF-8?q?=20=20that=20after=20using=20'skincurses'=20(for=20instance=20f?=
 =?UTF-8?q?or=20debugging)=20the=20previously=20=20=20selected=20skin=20wi?=
 =?UTF-8?q?ll=20be=20used=20again.=20-=20Added=20some=20log=20messages=20w?=
 =?UTF-8?q?hen=20setting=20the=20current=20skin.=20-=20Only=20making=20a?=
 =?UTF-8?q?=20second=20attempt=20to=20set=20the=20current=20skin=20at=20st?=
 =?UTF-8?q?artup=20if=20the=20first=20=20=20attempt=20has=20failed.=20-=20?=
 =?UTF-8?q?Now=20switching=20to=20non-VPS=20timers'=20channels=2060=20seco?=
 =?UTF-8?q?nds=20before=20the=20timer=20starts=20=20=20(if=20a=20free=20de?=
 =?UTF-8?q?vice=20is=20available),=20to=20allow=20for=20the=20updating=20o?=
 =?UTF-8?q?f=20EPG=20data=20and=20CA=20=20=20descriptors=20before=20the=20?=
 =?UTF-8?q?actual=20recording=20starts.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  7 +++-
 HISTORY                             | 31 +++++++++++++++
 Makefile                            |  4 +-
 PLUGINS/src/skincurses/HISTORY      |  6 +++
 PLUGINS/src/skincurses/skincurses.c | 13 +++---
 audio.c                             | 15 +------
 channels.c                          |  5 +--
 channels.h                          |  5 +--
 config.h                            |  8 ++--
 device.h                            |  5 +--
 dvbdevice.c                         | 20 +---------
 dvbdevice.h                         |  7 +---
 libsi/descriptor.c                  | 29 ++++++++++----
 libsi/descriptor.h                  | 24 ++++++++----
 libsi/headers.h                     | 13 ++++--
 menu.c                              | 24 ++----------
 menuitems.c                         |  7 +++-
 skins.c                             | 10 +++--
 skins.h                             |  6 +--
 svdrp.c                             | 25 ++++++++++--
 thread.c                            |  3 +-
 vdr.c                               | 61 +++++++++++++++++------------
 22 files changed, 185 insertions(+), 143 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c593cc465..f5ea22f56 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -218,6 +218,7 @@ Stefan Huelswitt <huels@iname.com>
  for suggesting that the SVDRP command GRAB should allow file names without extension
  again
  for reporting a problem with channel up/down switching on single card systems
+ for fixing the PremiereContentTransmissionDescriptor in 'libsi'
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -1280,8 +1281,8 @@ Wayne Keer <syphir@syphir.sytes.net>
  for reporting a spelling error in 'canceling'
  for adding some 'mkdir -p' to the Makefile's 'install' target
  for reporting some missing braces in remux.c
- for suggesting to modifiy the Makefile to copy additional libraries a plugin might
- provide
+ for suggesting to modifiy the Makefile to copy and clean up additional libraries
+ a plugin might provide
 
 Marco Schl��ler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
@@ -1597,6 +1598,8 @@ Ville Skytt
  for reporting an obsolete entry 'S21.5E' in the default 'diseqc.conf'
  for updating the GPL copies
  for fixing several spelling errors
+ for reporting that the call to pthread_setschedparam(childTid, SCHED_RR, 0) in
+ thread.c caused a compiler warning with g++ 4.1.1
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index da5dd4f97..2fa2f944f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4745,3 +4745,34 @@ Video Disk Recorder Revision History
   (reported by Mirko D�lle).
 - Fixed deleting channels in case the current channel's number changes (reported
   by Mirko D�lle).
+
+2006-06-04: Version 1.4.0-3
+
+- Fixed the PremiereContentTransmissionDescriptor in 'libsi' (thanks to Stefan
+  Huelswitt).
+- Removed all the compatibility '#if APIVERSNUM...' stuff and instead increased
+  the API version number - plugins will have to be recompiled.
+- Removed the call to pthread_setschedparam(childTid, SCHED_RR, 0) in thread.c,
+  because it caused a compiler warning with g++ 4.1.1 (reported by Ville Skytt�).
+  Since the third parameter has to be non-null to have any effect, the call was
+  presumably a NOP, anyway.
+- Fixed the 'clean-plugins' target in the Makefile to also remove additional
+  plugin libraries (thanks to Wayne Keer).
+- Applied the fixes to moving and deleting channels from version 1.4.0-2 to the
+  SVDRP commands MOVC and DELC as well.
+- Fixed handling the display of the '*' indicator in the "What's on now/next?"
+  menu, so that events that haven't been "seen" in the data stream within 30
+  seconds won't be shown as "running".
+- Fixed handling tabbed item display in 'skincurses'.
+- Increased the column spacing in the "Recordings" menu (was too small for the
+  'skincurses' plugin).
+- When the 'skincurses' plugin is loaded, it automatically sets the 'curses'
+  skin as the current one. This doesn't modify the Setup.OSDSkin parameter, so
+  that after using 'skincurses' (for instance for debugging) the previously
+  selected skin will be used again.
+- Added some log messages when setting the current skin.
+- Only making a second attempt to set the current skin at startup if the first
+  attempt has failed.
+- Now switching to non-VPS timers' channels 60 seconds before the timer starts
+  (if a free device is available), to allow for the updating of EPG data and CA
+  descriptors before the actual recording starts.
diff --git a/Makefile b/Makefile
index 7b542eb56..0a3dffac7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.93 2006/05/26 10:42:17 kls Exp $
+# $Id: Makefile 1.94 2006/06/02 14:45:33 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -191,7 +191,7 @@ plugins: include-dir
 
 clean-plugins:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
-	@-rm -f $(PLUGINDIR)/lib/libvdr-*.so.$(APIVERSION)
+	@-rm -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION)
 
 # Install the files:
 
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 841d5505e..c58423df6 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -29,3 +29,9 @@ VDR Plugin 'skincurses' Revision History
 2006-04-14: Version 0.0.6
 
 - Added a missing "Key$" in skincurses.c.
+
+2006-06-03: Version 0.0.7
+
+- Fixed handling tabbed item display.
+- When the 'skincurses' plugin is loaded, it automatically sets the 'curses'
+  skin as the current one.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 96b62e313..a75375b57 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.8 2006/04/14 11:35:59 kls Exp $
+ * $Id: skincurses.c 1.10 2006/06/03 14:20:39 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.6";
+static const char *VERSION        = "0.0.7";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -277,6 +277,7 @@ class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
   virtual void SetEvent(const cEvent *Event);
   virtual void SetRecording(const cRecording *Recording);
   virtual void SetText(const char *Text, bool FixedFont);
+  virtual const cFont *GetTextAreaFont(bool FixedFont) const { return &Font; }
   virtual void Flush(void);
   };
 
@@ -366,13 +367,13 @@ void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current,
   for (int i = 0; i < MaxTabs; i++) {
       const char *s = GetTabbedText(Text, i);
       if (s) {
-         int xt = Tab(i);
+         int xt = Tab(i) / 12;// Tab() is in "pixel" - see also skins.c!!!
          osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, OsdWidth - xt);
          }
       if (!Tab(i + 1))
          break;
       }
-  SetEditableWidth(OsdWidth - Tab(1));
+  SetEditableWidth(OsdWidth - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
 }
 
 void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
@@ -786,7 +787,9 @@ bool cPluginSkinCurses::Initialize(void)
 bool cPluginSkinCurses::Start(void)
 {
   // Start any background activities the plugin shall perform.
-  new cSkinCurses;
+  cSkin *Skin = new cSkinCurses;
+  // This skin is normally used for debugging, so let's make it the current one:
+  Skins.SetCurrent(Skin->Name());
   return true;
 }
 
diff --git a/audio.c b/audio.c
index ad5725c6a..7109a7d4b 100644
--- a/audio.c
+++ b/audio.c
@@ -4,17 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 1.4 2006/05/20 10:02:08 kls Exp $
+ * $Id: audio.c 1.5 2006/05/28 15:03:24 kls Exp $
  */
 
 #include "audio.h"
 #include <stdlib.h>
-// TODO remove the following if APIVERSNUM > 10400
-#include "config.h"
-#if APIVERSNUM != 10400
-#warning ******* API version changed - remove old stuff
-#endif
-// TODO
 #include "dvbdevice.h"
 
 // --- cAudio ----------------------------------------------------------------
@@ -68,14 +62,7 @@ void cExternalAudio::Play(const uchar *Data, int Length, uchar Id)
   if (command && !mute) {
      if (pipe || pipe.Open(command, "w")) {
         if (0x80 <= Id && Id <= 0x87 || Id == 0xBD) { // AC3
-#if APIVERSNUM == 10400
-           extern int cDvbDevice__setTransferModeForDolbyDigital;
-           cDvbDevice__setTransferModeForDolbyDigital = 2;
-           cDvbDevice::SetTransferModeForDolbyDigital(false);
-#else
-#warning ******* API version changed - remove old stuff
            cDvbDevice::SetTransferModeForDolbyDigital(2);
-#endif
            int written = Data[8] + 9; // skips the PES header
            if (Id != 0xBD)
               written += 4; // skips AC3 bytes
diff --git a/channels.c b/channels.c
index 4f1d39519..67cf3c9de 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.52 2006/05/28 10:14:18 kls Exp $
+ * $Id: channels.c 1.53 2006/05/28 15:03:40 kls Exp $
  */
 
 #include "channels.h"
@@ -925,8 +925,6 @@ int cChannels::GetNextNormal(int Idx)
   return channel ? Idx : -1;
 }
 
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
 int cChannels::GetPrevNormal(int Idx)
 {
   cChannel *channel = Get(--Idx);
@@ -934,7 +932,6 @@ int cChannels::GetPrevNormal(int Idx)
         channel = Get(--Idx);
   return channel ? Idx : -1;
 }
-#endif
 
 void cChannels::ReNumber( void )
 {
diff --git a/channels.h b/channels.h
index abccceaea..c0dd37e0f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.41 2006/05/28 10:13:21 kls Exp $
+ * $Id: channels.h 1.42 2006/05/28 15:03:56 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -233,10 +233,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   int GetNextGroup(int Idx);   // Get next channel group
   int GetPrevGroup(int Idx);   // Get previous channel group
   int GetNextNormal(int Idx);  // Get next normal channel (not group)
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
   int GetPrevNormal(int Idx);  // Get previous normal channel (not group)
-#endif
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID);
diff --git a/config.h b/config.h
index 0611e16ce..a68843ad4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.257 2006/05/19 12:12:39 kls Exp $
+ * $Id: config.h 1.259 2006/05/28 15:04:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.0-2"
+#define VDRVERSION  "1.4.0-3"
 #define VDRVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.4.0"
-#define APIVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.4.1"
+#define APIVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.h b/device.h
index 7ff5d52e2..ac721f59f 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.77 2006/05/28 09:19:30 kls Exp $
+ * $Id: device.h 1.78 2006/05/28 15:04:24 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -239,13 +239,10 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
   static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
          ///< Sets the number of the current channel on the primary device, without
          ///< actually switching to it. This can be used to correct the current
          ///< channel number while replaying.
-#endif
   void ForceTransferMode(void);
          ///< Forces the device into transfermode for the current channel.
   virtual bool HasLock(int TimeoutMs = 0);//XXX PLUGINS.html
diff --git a/dvbdevice.c b/dvbdevice.c
index 6570695e8..fc57c5b0f 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.157 2006/05/20 09:52:23 kls Exp $
+ * $Id: dvbdevice.c 1.158 2006/05/28 15:05:03 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -357,11 +357,6 @@ void cDvbTuner::Action(void)
 
 int cDvbDevice::devVideoOffset = -1;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
-#if APIVERSNUM == 10400
-int cDvbDevice__setTransferModeForDolbyDigital = -1;
-#else
-#warning ******* API version changed - remove old stuff
-#endif
 
 cDvbDevice::cDvbDevice(int n)
 {
@@ -919,23 +914,10 @@ void cDvbDevice::SetDigitalAudioDevice(bool On)
      }
 }
 
-#if APIVERSNUM == 10400
-void cDvbDevice::SetTransferModeForDolbyDigital(bool On)
-{
-  if (cDvbDevice__setTransferModeForDolbyDigital >= 0) {
-     setTransferModeForDolbyDigital = cDvbDevice__setTransferModeForDolbyDigital;
-     cDvbDevice__setTransferModeForDolbyDigital = -1;
-     }
-  else
-     setTransferModeForDolbyDigital = On;
-}
-#else
-#warning ******* API version changed - remove old stuff
 void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
 {
   setTransferModeForDolbyDigital = Mode;
 }
-#endif
 
 void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
 {
diff --git a/dvbdevice.h b/dvbdevice.h
index 1031c83d0..effa5fb90 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.40 2006/05/20 09:32:06 kls Exp $
+ * $Id: dvbdevice.h 1.41 2006/05/28 15:05:19 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -111,17 +111,12 @@ class cDvbDevice : public cDevice {
   virtual void SetVolumeDevice(int Volume);
   virtual void SetDigitalAudioDevice(bool On);
 public:
-#if APIVERSNUM == 10400
-  static void SetTransferModeForDolbyDigital(bool On);
-#else
-#warning ******* API version changed - remove old stuff
   static void SetTransferModeForDolbyDigital(int Mode);
          ///< Controls how the DVB device handles Transfer Mode when replaying
          ///< Dolby Digital audio.
          ///< 0 = don't set "audio bypass" in driver/firmware, don't force Transfer Mode
          ///< 1 = set "audio bypass" in driver/firmware, force Transfer Mode (default)
          ///< 2 = don't set "audio bypass" in driver/firmware, force Transfer Mode
-#endif
 
 // Player facilities
 
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 57a92488a..1654a33b6 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.20 2006/04/17 12:19:15 kls Exp $
+ *   $Id: descriptor.c 1.21 2006/05/28 14:25:30 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -806,21 +806,34 @@ int PremiereContentTransmissionDescriptor::getServiceId() const {
    return HILO(s->service_id);
 }
 
-int PremiereContentTransmissionDescriptor::getMJD() const {
+void PremiereContentTransmissionDescriptor::Parse() {
+   s=data.getData<const descr_premiere_content_transmission>();
+   startDayLoop.setData(data+sizeof(descr_premiere_content_transmission), getLength()-sizeof(descr_premiere_content_transmission));
+}
+
+int PremiereContentTransmissionDescriptor::StartDayEntry::getMJD() const {
    return HILO(s->mjd);
 }
 
-void PremiereContentTransmissionDescriptor::Parse() {
-   s=data.getData<const descr_premiere_content_transmission>();
-   startTimeLoop.setData(data+sizeof(descr_premiere_content_transmission), getLength()-sizeof(descr_premiere_content_transmission));
+int PremiereContentTransmissionDescriptor::StartDayEntry::getLoopLength() const {
+   return s->start_time_loop;
+}
+
+int PremiereContentTransmissionDescriptor::StartDayEntry::getLength() {
+   return sizeof(item_premiere_content_transmission_day)+getLoopLength();
+}
+
+void PremiereContentTransmissionDescriptor::StartDayEntry::Parse() {
+   s=data.getData<const item_premiere_content_transmission_day>();
+   startTimeLoop.setData(data+sizeof(item_premiere_content_transmission_day), getLoopLength());
 }
 
-time_t PremiereContentTransmissionDescriptor::StartTimeEntry::getStartTime(int mjd) const {
+time_t PremiereContentTransmissionDescriptor::StartDayEntry::StartTimeEntry::getStartTime(int mjd) const {
    return DVBTime::getTime(mjd >> 8, mjd & 0xff, s->start_time_h, s->start_time_m, s->start_time_s);
 }
 
-void PremiereContentTransmissionDescriptor::StartTimeEntry::Parse() {
-   s=data.getData<const item_premiere_content_transmission_reference>();
+void PremiereContentTransmissionDescriptor::StartDayEntry::StartTimeEntry::Parse() {
+   s=data.getData<const item_premiere_content_transmission_time>();
 }
 
 void ApplicationSignallingDescriptor::Parse() {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 338a1fd5f..c0c884fde 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.14 2006/04/14 10:53:44 kls Exp $
+ *   $Id: descriptor.h 1.15 2006/05/28 14:25:30 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -490,20 +490,30 @@ class AncillaryDataDescriptor : public Descriptor {
 
 class PremiereContentTransmissionDescriptor : public Descriptor {
 public:
-   class StartTimeEntry : public LoopElement {
+   class StartDayEntry : public LoopElement {
    public:
-      virtual int getLength() { return sizeof(item_premiere_content_transmission_reference); }
-      time_t getStartTime(int mjd) const; //UTC
+      class StartTimeEntry : public LoopElement {
+      public:
+         virtual int getLength() { return sizeof(item_premiere_content_transmission_time); }
+         time_t getStartTime(int mjd) const; //UTC
+      protected:
+         virtual void Parse();
+      private:
+         const item_premiere_content_transmission_time *s;
+      };
+      StructureLoop<StartTimeEntry> startTimeLoop;
+      virtual int getLength();
+      int getMJD() const;
+      int getLoopLength() const;
    protected:
       virtual void Parse();
    private:
-      const item_premiere_content_transmission_reference *s;
+      const item_premiere_content_transmission_day *s;
    };
-   StructureLoop<StartTimeEntry> startTimeLoop;
+   StructureLoop<StartDayEntry> startDayLoop;
    int getOriginalNetworkId() const;
    int getTransportStreamId() const;
    int getServiceId() const;
-   int getMJD() const;
 protected:
    virtual void Parse();
 private:
diff --git a/libsi/headers.h b/libsi/headers.h
index a238ca67b..afa3106d1 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.6 2006/04/14 10:53:44 kls Exp $
+ *   $Id: headers.h 1.7 2006/05/28 14:25:30 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -1790,7 +1790,7 @@ struct descr_application_icons_descriptor_end {
 // 0xF2  Content Transmission Descriptor
 // http://dvbsnoop.sourceforge.net/examples/example-private-section.html
 
-#define DESCR_PREMIERE_CONTENT_TRANSMISSION_LEN 11
+#define DESCR_PREMIERE_CONTENT_TRANSMISSION_LEN 8
 
 struct descr_premiere_content_transmission {
    u_char descriptor_tag                         :8;
@@ -1801,14 +1801,19 @@ struct descr_premiere_content_transmission {
    u_char original_network_id_lo                 :8;
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
+};
+
+#define ITEM_PREMIERE_CONTENT_TRANSMISSION_DAY_LEN 3
+
+struct item_premiere_content_transmission_day {
    u_char mjd_hi                                 :8;
    u_char mjd_lo                                 :8;
    u_char start_time_loop                        :8;
 };
 
-#define ITEM_PREMIERE_CONTENT_TRANSMISSION_LEN 3
+#define ITEM_PREMIERE_CONTENT_TRANSMISSION_TIME_LEN 3
 
-struct item_premiere_content_transmission_reference {
+struct item_premiere_content_transmission_time {
    u_char start_time_h                           :8;
    u_char start_time_m                           :8;
    u_char start_time_s                           :8;
diff --git a/menu.c b/menu.c
index 759cfe0d9..788ce0f32 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.438 2006/05/28 10:47:40 kls Exp $
+ * $Id: menu.c 1.441 2006/06/03 13:32:42 kls Exp $
  */
 
 #include "menu.h"
@@ -512,20 +512,8 @@ eOSState cMenuChannels::Delete(void)
      if (Interface->Confirm(tr("Delete channel?"))) {
         if (CurrentChannel && channel == CurrentChannel) {
            int n = Channels.GetNextNormal(CurrentChannel->Index());
-#if APIVERSNUM == 10400
-           if (n < 0) {
-              int Idx = CurrentChannel->Index();
-              cChannel *channel = Channels.Get(--Idx);
-              while (channel && channel->GroupSep())
-                    channel = Channels.Get(--Idx);
-              if (channel)
-                 n = Idx;
-              }
-#else
-#warning ******* API version changed - remove old stuff
            if (n < 0)
               n = Channels.GetPrevNormal(CurrentChannel->Index());
-#endif
            CurrentChannel = Channels.Get(n);
            CurrentChannelNr = 0; // triggers channel switch below
            }
@@ -536,11 +524,8 @@ eOSState cMenuChannels::Delete(void)
         if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
            if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
               Channels.SwitchTo(CurrentChannel->Number());
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
            else
               cDevice::SetCurrentChannel(CurrentChannel);
-#endif
            }
         }
      }
@@ -563,11 +548,8 @@ void cMenuChannels::Move(int From, int To)
      if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
         if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
            Channels.SwitchTo(CurrentChannel->Number());
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
         else
            cDevice::SetCurrentChannel(CurrentChannel);
-#endif
         }
      }
 }
@@ -1066,7 +1048,7 @@ bool cMenuScheduleItem::Update(bool Force)
      char *buffer = NULL;
      char t = TimerMatchChars[timerMatch];
      char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
-     char r = event->IsRunning() ? '*' : ' ';
+     char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' ';
      if (channel && withDate)
         asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
      else if (channel)
@@ -1865,7 +1847,7 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 // --- cMenuRecordings -------------------------------------------------------
 
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
-:cOsdMenu(Base ? Base : tr("Recordings"), 8, 6)
+:cOsdMenu(Base ? Base : tr("Recordings"), 9, 7)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
diff --git a/menuitems.c b/menuitems.c
index 1bca4873c..517664c7f 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.44 2006/04/25 15:59:02 kls Exp $
+ * $Id: menuitems.c 1.45 2006/06/03 13:20:01 kls Exp $
  */
 
 #include "menuitems.h"
@@ -296,7 +296,10 @@ void cMenuEditStrItem::Set(void)
   char buf[1000];
 
   if (InEditMode()) {
-     const cFont *font = cFont::GetFont(fontOsd);
+     // This is an ugly hack to make editing strings work with the 'skincurses' plugin.
+     const cFont *font = dynamic_cast<cSkinDisplayMenu *>(cSkinDisplay::Current())->GetTextAreaFont(false);
+     if (!font || font->Width("W") != 1) // all characters have with == 1 in the font used by 'skincurses'
+        font = cFont::GetFont(fontOsd);
      strncpy(buf, value, pos);
      snprintf(buf + pos, sizeof(buf) - pos - 2, insert && newchar ? "[]%c%s" : "[%c]%s", *(value + pos), value + pos + 1);
      int width = cSkinDisplay::Current()->EditableWidth();
diff --git a/skins.c b/skins.c
index 736d7dad9..7a9682ed1 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.9 2006/04/09 11:25:30 kls Exp $
+ * $Id: skins.c 1.11 2006/06/03 14:39:14 kls Exp $
  */
 
 #include "skins.h"
@@ -79,7 +79,7 @@ void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
   tabs[4] = Tab4 ? tabs[3] + Tab4 : 0;
   tabs[5] = Tab5 ? tabs[4] + Tab5 : 0;
   for (int i = 1; i < MaxTabs; i++)
-      tabs[i] *= 12;//XXX average character width of font used for items!!!
+      tabs[i] *= 12;//XXX average character width of font used for items - see also skincurses.c!!!
 }
 
 void cSkinDisplayMenu::Scroll(bool Up, bool Page)
@@ -176,7 +176,6 @@ cSkin::cSkin(const char *Name, cTheme *Theme)
   if (theme)
      cThemes::Save(name, theme);
   Skins.Add(this);
-  Skins.SetCurrent(Name);
 }
 
 cSkin::~cSkin()
@@ -203,12 +202,17 @@ bool cSkins::SetCurrent(const char *Name)
   if (Name) {
      for (cSkin *Skin = First(); Skin; Skin = Next(Skin)) {
          if (strcmp(Skin->Name(), Name) == 0) {
+            isyslog("setting current skin to \"%s\"", Name);
             current = Skin;
             return true;
             }
          }
      }
   current = First();
+  if (current)
+     isyslog("skin \"%s\" not available - using \"%s\" instead", Name, current->Name());
+  else
+     esyslog("ERROR: no skin available");
   return current != NULL;
 }
 
diff --git a/skins.h b/skins.h
index 225fbc22a..9a9ba5704 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.13 2006/04/09 11:23:35 kls Exp $
+ * $Id: skins.h 1.14 2006/06/03 10:21:45 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -95,7 +95,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
   cTextScroller textScroller;
   int Tab(int n) { return (n >= 0 && n < MaxTabs) ? tabs[n] : 0; }
        ///< Returns the offset of the given tab from the left border of the
-       ///< item display area. The value returned is in pixel.//XXX ncurses???
+       ///< item display area. The value returned is in pixel.
   const char *GetTabbedText(const char *s, int Tab);
        ///< Returns the part of the given string that follows the given
        ///< Tab (where 0 indicates the beginning of the string). If no such
@@ -104,7 +104,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
   cSkinDisplayMenu(void);
   virtual void SetTabs(int Tab1, int Tab2 = 0, int Tab3 = 0, int Tab4 = 0, int Tab5 = 0);
        ///< Sets the tab columns to the given values, which are the number of
-       ///< characters in each column.//XXX ncurses???
+       ///< characters in each column.
   virtual void Scroll(bool Up, bool Page);
        ///< If this menu contains a text area that can be scrolled, this function
        ///< will be called to actually scroll the text. Up indicates whether the
diff --git a/svdrp.c b/svdrp.c
index e0b56e432..0f6060c13 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.95 2006/04/17 09:02:23 kls Exp $
+ * $Id: svdrp.c 1.96 2006/06/03 09:17:17 kls Exp $
  */
 
 #include "svdrp.h"
@@ -550,10 +550,25 @@ void cSVDRP::CmdDELC(const char *Option)
                      return;
                      }
                   }
+              int CurrentChannelNr = cDevice::CurrentChannel();
+              cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
+              if (CurrentChannel && channel == CurrentChannel) {
+                 int n = Channels.GetNextNormal(CurrentChannel->Index());
+                 if (n < 0)
+                    n = Channels.GetPrevNormal(CurrentChannel->Index());
+                 CurrentChannel = Channels.Get(n);
+                 CurrentChannelNr = 0; // triggers channel switch below
+                 }
               Channels.Del(channel);
               Channels.ReNumber();
               Channels.SetModified(true);
               isyslog("channel %s deleted", Option);
+              if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+                 if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+                    Channels.SwitchTo(CurrentChannel->Number());
+                 else
+                    cDevice::SetCurrentChannel(CurrentChannel);
+                 }
               Reply(250, "Channel \"%s\" deleted", Option);
               }
            else
@@ -1158,8 +1173,12 @@ void cSVDRP::CmdMOVC(const char *Option)
                        Channels.Move(FromChannel, ToChannel);
                        Channels.ReNumber();
                        Channels.SetModified(true);
-                       if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr)
-                          Channels.SwitchTo(CurrentChannel->Number());
+                       if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+                          if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+                             Channels.SwitchTo(CurrentChannel->Number());
+                          else
+                             cDevice::SetCurrentChannel(CurrentChannel);
+                          }
                        isyslog("channel %d moved to %d", FromNumber, ToNumber);
                        Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
                        }
diff --git a/thread.c b/thread.c
index 89d56e9fd..c65f9e29f 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.54 2006/03/26 09:22:27 kls Exp $
+ * $Id: thread.c 1.55 2006/06/02 13:51:39 kls Exp $
  */
 
 #include "thread.h"
@@ -255,7 +255,6 @@ bool cThread::Start(void)
      active = running = true;
      if (pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this) == 0) {
         pthread_detach(childTid); // auto-reap
-        pthread_setschedparam(childTid, SCHED_RR, 0);
         }
      else {
         LOG_ERROR;
diff --git a/vdr.c b/vdr.c
index 6343933fa..2f6ad646d 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.272 2006/05/14 09:23:46 kls Exp $
+ * $Id: vdr.c 1.274 2006/06/04 09:04:47 kls Exp $
  */
 
 #include <getopt.h>
@@ -72,8 +72,9 @@
 #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
 #define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
 #define SHUTDOWNRETRY     300 // seconds before trying again to shut down
-#define VPSCHECKDELTA      10 // seconds between checks for timers that have entered the VPS margin
-#define VPSDEVICETIMEOUT    8 // seconds before a device used for VPS may be reused
+#define TIMERCHECKDELTA    10 // seconds between checks for timers that need to see their channel
+#define TIMERDEVICETIMEOUT  8 // seconds before a device used for timer check may be reused
+#define TIMERLOOKAHEADTIME 60 // seconds before a non-VPS timer starts and the channel is switched if possible
 #define VPSLOOKAHEADTIME   24 // hours within which VPS timers will make sure their events are up to date
 #define VPSUPTODATETIME  3600 // seconds before the event or schedule of a VPS timer needs to be refreshed
 
@@ -502,8 +503,9 @@ int main(int argc, char *argv[])
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
   bool UserShutdown = false;
-  bool TimerInVpsMargin = false;
+  bool InhibitEpgScan = false;
   bool IsInfoMenu = false;
+  cSkin *CurrentSkin = NULL;
 
   // Load plugins:
 
@@ -605,6 +607,7 @@ int main(int argc, char *argv[])
   new cSkinSTTNG;
   Skins.SetCurrent(Setup.OSDSkin);
   cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+  CurrentSkin = Skins.Current();
 
   // Start plugins:
 
@@ -613,8 +616,10 @@ int main(int argc, char *argv[])
 
   // Set skin and theme in case they're implemented by a plugin:
 
-  Skins.SetCurrent(Setup.OSDSkin);
-  cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+  if (!CurrentSkin || CurrentSkin == Skins.Current() && strcmp(Skins.Current()->Name(), Setup.OSDSkin) != 0) {
+     Skins.SetCurrent(Setup.OSDSkin);
+     cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+     }
 
   // Remote Controls:
   if (RcuDevice)
@@ -758,28 +763,32 @@ int main(int argc, char *argv[])
               else
                  LastTimerChannel = Timer->Channel()->Number();
               }
-           // Make sure VPS timers "see" their channel early enough:
-           static time_t LastVpsCheck = 0;
-           if (Now - LastVpsCheck > VPSCHECKDELTA) { // don't do this too often
-              TimerInVpsMargin = false;
+           // Make sure timers "see" their channel early enough:
+           static time_t LastTimerCheck = 0;
+           if (Now - LastTimerCheck > TIMERCHECKDELTA) { // don't do this too often
+              InhibitEpgScan = false;
               static time_t DeviceUsed[MAXDEVICES] = { 0 };
               for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
                   bool InVpsMargin = false;
                   bool NeedsTransponder = false;
-                  if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording()) {
-                     if (Timer->Matches(Now, true, Setup.VpsMargin))
-                        InVpsMargin = true;
-                     else if (Timer->Event())
-                        NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
-                     else {
-                        cSchedulesLock SchedulesLock;
-                        const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-                        if (Schedules) {
-                           const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
-                           NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
+                  if (Timer->HasFlags(tfActive) && !Timer->Recording()) {
+                     if (Timer->HasFlags(tfVps)) {
+                        if (Timer->Matches(Now, true, Setup.VpsMargin))
+                           InVpsMargin = true;
+                        else if (Timer->Event())
+                           NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
+                        else {
+                           cSchedulesLock SchedulesLock;
+                           const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
+                           if (Schedules) {
+                              const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
+                              NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
+                              }
                            }
+                        InhibitEpgScan |= InVpsMargin | NeedsTransponder;
                         }
-                     TimerInVpsMargin |= InVpsMargin | NeedsTransponder;
+                     else
+                        NeedsTransponder = Timer->Matches(Now, true, TIMERLOOKAHEADTIME);
                      }
                   Timer->SetInVpsMargin(InVpsMargin);
                   if (NeedsTransponder || InVpsMargin) {
@@ -793,7 +802,7 @@ int main(int argc, char *argv[])
                                Device = d;
                                break;
                                }
-                            else if (Now - DeviceUsed[d->DeviceNumber()] > VPSDEVICETIMEOUT) {
+                            else if (Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT) {
                                // only check other devices if they have been left alone for a while
                                if (d->MaySwitchTransponder())
                                   // this one can be switched without disturbing anything else
@@ -806,7 +815,7 @@ int main(int argc, char *argv[])
                          }
                      if (!Device && InVpsMargin) {
                         cDevice *d = cDevice::ActualDevice();
-                        if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && Now - DeviceUsed[d->DeviceNumber()] > VPSDEVICETIMEOUT)
+                        if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT)
                            Device = d; // use the actual device as a last resort
                         }
                      // Switch the device to the transponder:
@@ -826,7 +835,7 @@ int main(int argc, char *argv[])
                         }
                      }
                   }
-              LastVpsCheck = time(NULL);
+              LastTimerCheck = time(NULL);
               }
            // Delete expired timers:
            Timers.DeleteExpired();
@@ -1125,7 +1134,7 @@ int main(int argc, char *argv[])
              }
            }
         if (!Menu) {
-           if (!TimerInVpsMargin)
+           if (!InhibitEpgScan)
               EITScanner.Process();
            if (!cCutter::Active() && cCutter::Ended()) {
               if (cCutter::Error())

From 2bb325135433521694b0a387a60225d7727a980e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 11 Jun 2006 18:00:00 +0200
Subject: [PATCH 146/307] Version 1.4.1 - Changed the log messages when
 grabbing an image from 'isyslog()' to 'dsyslog()'   so that they can be
 suppressed in normal operation mode to avoid clogging the   log file in case
 this function is used frequently (suggested by Helmut Auer).

---
 CONTRIBUTORS | 1 +
 HISTORY      | 8 +++++++-
 config.h     | 6 +++---
 dvbdevice.c  | 4 ++--
 svdrp.c      | 4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f5ea22f56..8bbb5f224 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -573,6 +573,7 @@ Helmut Auer <vdr@helmutauer.de>
  message is being displayed didn't work
  for reporting a problem with the "Press any key on the RC unit" step when learning
  LIRC remote control codes
+ for suggesting to reduce the logging for the SVDRP GRAB command
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
diff --git a/HISTORY b/HISTORY
index 2fa2f944f..856803b3e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4753,7 +4753,7 @@ Video Disk Recorder Revision History
 - Removed all the compatibility '#if APIVERSNUM...' stuff and instead increased
   the API version number - plugins will have to be recompiled.
 - Removed the call to pthread_setschedparam(childTid, SCHED_RR, 0) in thread.c,
-  because it caused a compiler warning with g++ 4.1.1 (reported by Ville Skytt�).
+  because it caused a compiler warning with post-2.4 glibc (reported by Ville Skytt�).
   Since the third parameter has to be non-null to have any effect, the call was
   presumably a NOP, anyway.
 - Fixed the 'clean-plugins' target in the Makefile to also remove additional
@@ -4776,3 +4776,9 @@ Video Disk Recorder Revision History
 - Now switching to non-VPS timers' channels 60 seconds before the timer starts
   (if a free device is available), to allow for the updating of EPG data and CA
   descriptors before the actual recording starts.
+
+2006-06-11: Version 1.4.1
+
+- Changed the log messages when grabbing an image from 'isyslog()' to 'dsyslog()'
+  so that they can be suppressed in normal operation mode to avoid clogging the
+  log file in case this function is used frequently (suggested by Helmut Auer).
diff --git a/config.h b/config.h
index a68843ad4..9ee947137 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.259 2006/05/28 15:04:08 kls Exp $
+ * $Id: config.h 1.260 2006/06/11 08:57:35 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.0-3"
-#define VDRVERSNUM   10400  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.4.1"
+#define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/dvbdevice.c b/dvbdevice.c
index fc57c5b0f..9ae8dfafb 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.158 2006/05/28 15:05:03 kls Exp $
+ * $Id: dvbdevice.c 1.159 2006/06/11 09:03:55 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -570,7 +570,7 @@ uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int S
                  if (Quality < 0)
                     Quality = 100;
 
-                 isyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+                 dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
                  if (Jpeg) {
                     // convert to JPEG:
                     result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality);
diff --git a/svdrp.c b/svdrp.c
index 0f6060c13..34f283f63 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.96 2006/06/03 09:17:17 kls Exp $
+ * $Id: svdrp.c 1.97 2006/06/11 09:04:36 kls Exp $
  */
 
 #include "svdrp.h"
@@ -779,7 +779,7 @@ void cSVDRP::CmdGRAB(const char *Option)
            int fd = open(FileName, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, DEFFILEMODE);
            if (fd >= 0) {
               if (safe_write(fd, Image, ImageSize) == ImageSize) {
-                 isyslog("grabbed image to %s", FileName);
+                 dsyslog("grabbed image to %s", FileName);
                  Reply(250, "Grabbed image %s", Option);
                  }
               else {

From 90bc2f18e3fb72bba792226dfd2a6e245464d2f5 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 18 Jun 2006 18:00:00 +0200
Subject: [PATCH 147/307] Version 1.4.1-1 - Added "-fPIC" to the compiler
 options in Make.config.template when compiling   plugins (thanks to Udo
 Richter). If you use your own Make.config file, you may   want to add these
 lines there, too. - Added some comment to cDevice::GetDevice() to explain how
 the individual   conditions are put together to make a decision on which
 device to use. - Updated 'S13E' in 'sources.conf' (thanks to Antti
 Hartikainen). - Now making sure VPS timers don't get stuck with outdated
 events, and that the   actual device isn't used for updating a VPS timer's
 event as long as other   free devices are available. - Modified rcu.c to
 better handle RC5 codes. - Added a missing variable initialization in
 cRingBufferLinear::cRingBufferLinear()   (thanks to Prakash Punnoor). - Fixed
 handling relative link targets in the ReadLink() function (reported by  
 Patrick Cernko). - Now making sure a VPS timer has a schedule in case the
 epg.data file didn't   contain one when VDR was started.

---
 CONTRIBUTORS         |  7 +++++++
 HISTORY              | 19 +++++++++++++++++++
 Make.config.template |  7 ++++++-
 config.h             |  4 ++--
 device.c             | 25 ++++++++++++++++---------
 device.h             |  5 +++--
 rcu.c                | 17 +++++++++--------
 ringbuffer.c         |  3 ++-
 sources.conf         |  2 +-
 tools.c              | 22 ++++++++--------------
 vdr.c                | 31 ++++++++++++++++++-------------
 11 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8bbb5f224..5e522b9a0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1440,6 +1440,8 @@ Udo Richter <udo_richter@gmx.de>
  for fixing handling the "Power" key in case a timer is about to start recording
  for fixing calculating the start time of repeated timers with "first day"
  for setting a timer's cached start time to 0 after a call to Skip()
+ for adding "-fPIC" to the compiler options in Make.config.template when compiling
+ plugins
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1792,6 +1794,7 @@ Ingo Schneider <mail@ingo-schneider.de>
 
 Patrick Cernko <errror@errror.org>
  for suggesting to add a note about "modprobe capability" to INSTALL
+ for reporting a problem with relative link targets in the ReadLink() function
 
 Philippe Gramoull� <philippe@gramoulle.com>
  for reporting a a missing '-' in the example for viewing a grabbed image on a remote
@@ -1925,6 +1928,10 @@ M. Kiesel <vdr@continuity.cjb.net>
 
 Prakash Punnoor <prakash@punnoor.de>
  for suggesting to remove -fPIC from VDR's and libsi's Makefile
+ for adding a missing variable initialization in cRingBufferLinear::cRingBufferLinear()
 
 Anssi Hannula <anssi.hannula@gmail.com>
  for a patch that was used to implement processing the "frequency list descriptor"
+
+Antti Hartikainen <ami+vdr@ah.fi>
+ for updating 'S13E' in 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 856803b3e..796f4437e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4782,3 +4782,22 @@ Video Disk Recorder Revision History
 - Changed the log messages when grabbing an image from 'isyslog()' to 'dsyslog()'
   so that they can be suppressed in normal operation mode to avoid clogging the
   log file in case this function is used frequently (suggested by Helmut Auer).
+
+2006-06-18: Version 1.4.1-1
+
+- Added "-fPIC" to the compiler options in Make.config.template when compiling
+  plugins (thanks to Udo Richter). If you use your own Make.config file, you may
+  want to add these lines there, too.
+- Added some comment to cDevice::GetDevice() to explain how the individual
+  conditions are put together to make a decision on which device to use.
+- Updated 'S13E' in 'sources.conf' (thanks to Antti Hartikainen).
+- Now making sure VPS timers don't get stuck with outdated events, and that the
+  actual device isn't used for updating a VPS timer's event as long as other
+  free devices are available.
+- Modified rcu.c to better handle RC5 codes.
+- Added a missing variable initialization in cRingBufferLinear::cRingBufferLinear()
+  (thanks to Prakash Punnoor).
+- Fixed handling relative link targets in the ReadLink() function (reported by
+  Patrick Cernko).
+- Now making sure a VPS timer has a schedule in case the epg.data file didn't
+  contain one when VDR was started.
diff --git a/Make.config.template b/Make.config.template
index 4a22f655b..378e12c33 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.9 2006/05/26 10:41:46 kls Exp $
+# $Id: Make.config.template 1.10 2006/06/15 09:15:25 kls Exp $
 
 ### The C compiler and options:
 
@@ -16,6 +16,11 @@ CFLAGS   = -g -O2 -Wall
 CXX      = g++
 CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
 
+ifdef PLUGIN
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+endif 
+
 ### The directory environment:
 
 #DVBDIR   = /usr/src/v4l-dvb/linux
diff --git a/config.h b/config.h
index 9ee947137..212c88d2b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.260 2006/06/11 08:57:35 kls Exp $
+ * $Id: config.h 1.261 2006/06/15 09:23:21 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1"
+#define VDRVERSION  "1.4.1-1"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/device.c b/device.c
index 7d0fe12ef..25c09f6a3 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.130 2006/05/27 11:14:42 kls Exp $
+ * $Id: device.c 1.131 2006/06/15 09:59:40 kls Exp $
  */
 
 #include "device.h"
@@ -281,19 +281,26 @@ cDevice *cDevice::GetDevice(int Index)
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
 {
   cDevice *d = NULL;
-  uint Impact = 0xFFFFFFFF;
+  uint Impact = 0xFFFFFFFF; // we're looking for a device with the least impact
   for (int i = 0; i < numDevices; i++) {
       bool ndr;
       if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
+         // Put together an integer number that reflects the "impact" using
+         // this device would have on the overall system. Each condition is represented
+         // by one bit in the number (or several bits, if the condition is actually
+         // a numeric value). The sequence in which the conditions are listed corresponds
+         // to their individual severity, where the one listed first will make the most
+         // difference, because it results in the most significant bit of the result.
          uint imp = 0;
-         imp <<= 1; imp |= !device[i]->Receiving() || ndr;
-         imp <<= 1; imp |= device[i]->Receiving();
-         imp <<= 1; imp |= device[i] == ActualDevice();
-         imp <<= 1; imp |= device[i]->IsPrimaryDevice();
-         imp <<= 1; imp |= device[i]->HasDecoder();
-         imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);
-         imp <<= 8; imp |= min(max(device[i]->ProvidesCa(Channel), 0), 0xFF);
+         imp <<= 1; imp |= !device[i]->Receiving() || ndr;                         // use receiving devices if we don't need to detach existing receivers
+         imp <<= 1; imp |= device[i]->Receiving();                                 // avoid devices that are receiving
+         imp <<= 1; imp |= device[i] == ActualDevice();                            // avoid the actual device (in case of Transfer Mode)
+         imp <<= 1; imp |= device[i]->IsPrimaryDevice();                           // avoid the primary device
+         imp <<= 1; imp |= device[i]->HasDecoder();                                // avoid full featured cards
+         imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+         imp <<= 8; imp |= min(max(device[i]->ProvidesCa(Channel), 0), 0xFF);      // use the device that provides the lowest number of conditional access methods
          if (imp < Impact) {
+            // This device has less impact than any previous one, so we take it.
             Impact = imp;
             d = device[i];
             if (NeedsDetachReceivers)
diff --git a/device.h b/device.h
index ac721f59f..dced092e9 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.78 2006/05/28 15:04:24 kls Exp $
+ * $Id: device.h 1.79 2006/06/15 09:32:48 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -130,7 +130,8 @@ class cDevice : public cThread {
          ///< \return A pointer to the device, or NULL if the Index was invalid.
   static cDevice *GetDevice(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
          ///< Returns a device that is able to receive the given Channel at the
-         ///< given Priority.
+         ///< given Priority, with the least impact on active recordings and
+         ///< live viewing.
          ///< See ProvidesChannel() for more information on how
          ///< priorities are handled, and the meaning of NeedsDetachReceivers.
   static void Shutdown(void);
diff --git a/rcu.c b/rcu.c
index bc95e5c09..39211bb26 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.13 2006/01/08 11:40:09 kls Exp $
+ * $Id: rcu.c 1.14 2006/06/16 09:29:24 kls Exp $
  */
 
 #include "rcu.h"
@@ -13,8 +13,9 @@
 #include <unistd.h>
 #include "tools.h"
 
-#define REPEATLIMIT  20 // ms
-#define REPEATDELAY 350 // ms
+#define REPEATLIMIT      150 // ms
+#define REPEATDELAY      350 // ms
+#define HANDSHAKETIMEOUT  20 // ms
 
 cRcuRemote::cRcuRemote(const char *DeviceName)
 :cRemote("RCU")
@@ -96,7 +97,7 @@ void cRcuRemote::Action(void)
   time_t LastCodeRefresh = 0;
   cTimeMs FirstTime;
   unsigned char LastCode = 0, LastMode = 0;
-  uint64 LastCommand = 0;
+  uint64 LastCommand = ~0; // 0x00 might be a valid command
   unsigned int LastData = 0;
   bool repeat = false;
 
@@ -136,7 +137,7 @@ void cRcuRemote::Action(void)
         else if (repeat) { // the last one was a repeat, so let's generate a release
            Put(LastCommand, false, true);
            repeat = false;
-           LastCommand = 0;
+           LastCommand = ~0;
            }
         else {
            unsigned int d = data;
@@ -154,9 +155,9 @@ void cRcuRemote::Action(void)
               SendCommand(m);
               LastMode = m;
               }
-           LastCommand = 0;
+           LastCommand = ~0;
            }
-        if (code && time(NULL) - LastCodeRefresh > 60) {
+        if (!repeat && code && time(NULL) - LastCodeRefresh > 60) {
            SendCommand(code); // in case the PIC listens to the wrong code
            LastCodeRefresh = time(NULL);
            }
@@ -181,7 +182,7 @@ bool cRcuRemote::SendByteHandshake(unsigned char c)
   if (f >= 0) {
      int w = write(f, &c, 1);
      if (w == 1) {
-        for (int reply = ReceiveByte(REPEATLIMIT); reply >= 0;) {
+        for (int reply = ReceiveByte(HANDSHAKETIMEOUT); reply >= 0;) {
             if (reply == c)
                return true;
             else if (reply == 'X') {
diff --git a/ringbuffer.c b/ringbuffer.c
index e00a524f1..0633bd37c 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.23 2005/12/30 15:42:08 kls Exp $
+ * $Id: ringbuffer.c 1.24 2006/06/16 09:32:13 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -156,6 +156,7 @@ cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics, cons
 {
   description = Description ? strdup(Description) : NULL;
   tail = head = margin = Margin;
+  gotten = 0;
   buffer = NULL;
   if (Size > 1) { // 'Size - 1' must not be 0!
      if (Margin <= Size / 2) {
diff --git a/sources.conf b/sources.conf
index fb6cd300f..81e5171cf 100644
--- a/sources.conf
+++ b/sources.conf
@@ -22,7 +22,7 @@
 S5E     Sirius 2/3
 S7E     Eutelsat W3A
 S10E    Eutelsat W1
-S13E    Hotbird 1-(5)-6
+S13E    Hotbird 1-3/6/7A
 S16E    Eutelsat W2
 S19.2E  Astra 1B/C/E/F/G/H/2C
 S21.0E  Afristar 1
diff --git a/tools.c b/tools.c
index 475afdb86..5869bf08d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.118 2006/05/26 10:10:31 kls Exp $
+ * $Id: tools.c 1.119 2006/06/17 09:45:32 kls Exp $
  */
 
 #include "tools.h"
@@ -480,22 +480,16 @@ int DirSizeMB(const char *DirName)
 
 char *ReadLink(const char *FileName)
 {
-  char RealName[PATH_MAX];
-  const char *TargetName = NULL;
-  int n = readlink(FileName, RealName, sizeof(RealName) - 1);
-  if (n < 0) {
-     if (errno == ENOENT || errno == EINVAL) // file doesn't exist or is not a symlink
-        TargetName = FileName;
+  if (!FileName)
+     return NULL;
+  char *TargetName = canonicalize_file_name(FileName);
+  if (!TargetName) {
+     if (errno == ENOENT) // file doesn't exist
+        TargetName = strdup(FileName);
      else // some other error occurred
         LOG_ERROR_STR(FileName);
      }
-  else if (n < int(sizeof(RealName))) { // got it!
-     RealName[n] = 0;
-     TargetName = RealName;
-     }
-  else
-     esyslog("ERROR: symlink's target name too long: %s", FileName);
-  return TargetName ? strdup(TargetName) : NULL;
+  return TargetName;
 }
 
 bool SpinUpDisk(const char *FileName)
diff --git a/vdr.c b/vdr.c
index 2f6ad646d..09ea29efa 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.274 2006/06/04 09:04:47 kls Exp $
+ * $Id: vdr.c 1.276 2006/06/18 08:49:20 kls Exp $
  */
 
 #include <getopt.h>
@@ -47,6 +47,7 @@
 #include "i18n.h"
 #include "interface.h"
 #include "keys.h"
+#include "libsi/si.h"
 #include "lirc.h"
 #include "menu.h"
 #include "osdbase.h"
@@ -773,15 +774,20 @@ int main(int argc, char *argv[])
                   bool NeedsTransponder = false;
                   if (Timer->HasFlags(tfActive) && !Timer->Recording()) {
                      if (Timer->HasFlags(tfVps)) {
-                        if (Timer->Matches(Now, true, Setup.VpsMargin))
+                        if (Timer->Matches(Now, true, Setup.VpsMargin)) {
                            InVpsMargin = true;
-                        else if (Timer->Event())
+                           Timer->SetInVpsMargin(InVpsMargin);
+                           }
+                        else if (Timer->Event()) {
+                           InVpsMargin = Timer->Event()->StartTime() <= Now && Timer->Event()->RunningStatus() == SI::RunningStatusUndefined;
                            NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
+                           }
                         else {
                            cSchedulesLock SchedulesLock;
                            const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
                            if (Schedules) {
                               const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
+                              InVpsMargin = !Schedule; // we must make sure we have the schedule
                               NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
                               }
                            }
@@ -790,10 +796,10 @@ int main(int argc, char *argv[])
                      else
                         NeedsTransponder = Timer->Matches(Now, true, TIMERLOOKAHEADTIME);
                      }
-                  Timer->SetInVpsMargin(InVpsMargin);
                   if (NeedsTransponder || InVpsMargin) {
                      // Find a device that provides the required transponder:
                      cDevice *Device = NULL;
+                     bool DeviceAvailable = false;
                      for (int i = 0; i < cDevice::NumDevices(); i++) {
                          cDevice *d = cDevice::GetDevice(i);
                          if (d && d->ProvidesTransponder(Timer->Channel())) {
@@ -802,18 +808,17 @@ int main(int argc, char *argv[])
                                Device = d;
                                break;
                                }
-                            else if (Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT) {
-                               // only check other devices if they have been left alone for a while
-                               if (d->MaySwitchTransponder())
-                                  // this one can be switched without disturbing anything else
-                                  Device = d;
-                               else if (!Device && InVpsMargin && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
-                                  // use this one only if no other with less impact can be found
-                                  Device = d;
+                            bool timeout = Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT; // only check other devices if they have been left alone for a while
+                            if (d->MaySwitchTransponder()) {
+                               DeviceAvailable = true; // avoids using the actual device below
+                               if (timeout)
+                                  Device = d; // only check other devices if they have been left alone for a while
                                }
+                            else if (timeout && !Device && InVpsMargin && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
+                               Device = d; // use this one only if no other with less impact can be found
                             }
                          }
-                     if (!Device && InVpsMargin) {
+                     if (!Device && InVpsMargin && !DeviceAvailable) {
                         cDevice *d = cDevice::ActualDevice();
                         if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT)
                            Device = d; // use the actual device as a last resort

From 80c04529681b844de88cfa47ec743f847b37d7a2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Jul 2006 18:00:00 +0200
Subject: [PATCH 148/307] =?UTF-8?q?Version=201.4.1-2=20-=20Fixed=20the=20M?=
 =?UTF-8?q?akefile=20of=20the=20'servicedemo'=20plugin,=20so=20that=20it?=
 =?UTF-8?q?=20defines=20the=20=20=20PLUGIN=20macro,=20which=20allows=20the?=
 =?UTF-8?q?=20Make.config=20file=20to=20react=20properly=20when=20=20=20co?=
 =?UTF-8?q?mpiling=20the=20plugin=20(reported=20by=20Bernd=20Melcher).=20?=
 =?UTF-8?q?=20=20Note=20to=20all=20plugin=20developers:=20a=20plugin's=20M?=
 =?UTF-8?q?akefile=20*must*=20define=20the=20PLUGIN=20=20=20macro,=20even?=
 =?UTF-8?q?=20if=20it=20doesn't=20use=20it=20itself!=20-=20Added=20a=20com?=
 =?UTF-8?q?ment=20regarding=20the=20PLUGIN=20macro=20to=20the=20'newplugin?=
 =?UTF-8?q?'=20script.=20-=20Added=20'--vfat'=20to=20the=20vdr.1=20man=20p?=
 =?UTF-8?q?age=20(reported=20by=20Udo=20Richter).=20-=20Removed=20a=20doub?=
 =?UTF-8?q?le=20fdopen()=20in=20cPipe::Open()=20(reported=20by=20Stefan=20?=
 =?UTF-8?q?Huelswitt).=20-=20Fixed=20handling=20the=20running=20status=20o?=
 =?UTF-8?q?f=20EPG=20events=20before=20the=20currently=20running=20one,=20?=
 =?UTF-8?q?=20=20in=20case=20they=20are=20added=20after=20the=20current=20?=
 =?UTF-8?q?event.=20-=20cEIT::cEIT()=20now=20calls=20pSchedule->SetPresent?=
 =?UTF-8?q?Seen()=20even=20if=20OnlyRunningStatus=20is=20=20=20true.=20-?=
 =?UTF-8?q?=20Newlines=20in=20title=20and=20short=20text=20of=20an=20EPG?=
 =?UTF-8?q?=20event=20are=20now=20changed=20into=20blanks=20only=20=20=20a?=
 =?UTF-8?q?fter=20all=20other=20fixes,=20because=20a=20short=20text=20migh?=
 =?UTF-8?q?t=20become=20a=20description.=20-=20Fixed=20handling=20network?=
 =?UTF-8?q?=20masks=20in=20the=20svdrphosts.conf=20file=20(thanks=20to=20P?=
 =?UTF-8?q?atrick=20=20=20Maier).=20-=20Fixed=20handling=20relative=20volu?=
 =?UTF-8?q?me=20settings=20in=20the=20call=20to=20cStatus::MsgSetVolume()?=
 =?UTF-8?q?=20=20=20(reported=20by=20Norbert=20Wentz).=20-=20Added=20a=20m?=
 =?UTF-8?q?issing=20initialization=20of=20'mutex'=20in=20cCiMenu::cCiMenu(?=
 =?UTF-8?q?)=20and=20removed=20=20=20some=20superfluous=20semicolons=20in?=
 =?UTF-8?q?=20ci.c=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fi?=
 =?UTF-8?q?xed=20handling=20client=20side=20termination=20of=20SVDRP=20con?=
 =?UTF-8?q?nections=20(thanks=20to=20Frank=20=20=20Schmirler).=20-=20cDevi?=
 =?UTF-8?q?ce::GetDevice()=20now=20prefers=20any=20device=20that's=20alrea?=
 =?UTF-8?q?dy=20receiving=20and=20doesn't=20=20=20require=20detatching=20r?=
 =?UTF-8?q?eceivers=20(suggested=20by=20Anssi=20Hannula).=20-=20Fixed=20ha?=
 =?UTF-8?q?ndling=20numeric=20keys=20in=20the=20channel=20display=20after?=
 =?UTF-8?q?=20switching=20channel=20groups=20=20=20(thanks=20to=20Andreas?=
 =?UTF-8?q?=20Regel).=20-=20Menu=20items=20derived=20from=20cMenuEditIntIt?=
 =?UTF-8?q?em=20now=20loop=20though=20their=20values=20if=20they=20=20=20h?=
 =?UTF-8?q?ave=20a=20dedicated=20minimum=20or=20maximum=20limit=20(suggest?=
 =?UTF-8?q?ed=20by=20Andy=20Grobb).=20Looping=20is=20=20=20only=20done=20f?=
 =?UTF-8?q?or=20normal=20keypresses,=20not=20for=20repeated=20ones.=20This?=
 =?UTF-8?q?=20allows=20the=20user=20to=20=20=20scroll=20the=20value=20all?=
 =?UTF-8?q?=20the=20way=20to=20the=20limit=20by=20keeping=20the=20key=20pr?=
 =?UTF-8?q?essed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     | 23 +++++++++++++++++
 HISTORY                          | 33 +++++++++++++++++++++++++
 PLUGINS/src/servicedemo/Makefile |  3 ++-
 ci.c                             |  7 +++---
 config.c                         |  8 +++---
 config.h                         |  4 +--
 device.c                         |  7 +++---
 eit.c                            |  6 ++---
 epg.c                            | 42 ++++++++++++++++++++------------
 menu.c                           |  5 ++--
 menuitems.c                      |  7 +++++-
 newplugin                        |  4 ++-
 svdrp.c                          | 10 +++++---
 thread.c                         |  3 +--
 vdr.1                            |  6 ++++-
 15 files changed, 127 insertions(+), 41 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5e522b9a0..460930092 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -219,6 +219,7 @@ Stefan Huelswitt <huels@iname.com>
  again
  for reporting a problem with channel up/down switching on single card systems
  for fixing the PremiereContentTransmissionDescriptor in 'libsi'
+ for reporting a double fdopen() in cPipe::Open()
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -340,6 +341,8 @@ Andy Grobb <Charly98@01019freenet.de>
  for reporting a bug in handling min/max borders when entering integer values
  for reporting a problem with replaying in fast forward mode if the video directory
  is mounted via a Samba share
+ for suggesting to make menu items that are derived from cMenuEditIntItem loop
+ though their values if they have a dedicated minimum or maximum limit
 
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
@@ -1221,6 +1224,8 @@ Andreas Regel <andreas.regel@gmx.de>
  for reporting a problem in handling Transfer Mode for radio channels
  for reporting a problem with messages when a cOsdObject uses the raw OSD
  for implementing palette replace mode in the OSD bitmaps
+ for fixing handling numeric keys in the channel display after switching channel
+ groups
 
 Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1364,6 +1369,8 @@ Marco Schl
  and PremiereContentTransmissionDescriptor to 'libsi'
  for pointing out that plugins might be compiled with different DVB driver header
  files than VDR itself
+ for adding a missing initialization of 'mutex' in cCiMenu::cCiMenu() and removing
+ some superfluous semicolons in ci.c
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1442,6 +1449,7 @@ Udo Richter <udo_richter@gmx.de>
  for setting a timer's cached start time to 0 after a call to Skip()
  for adding "-fPIC" to the compiler options in Make.config.template when compiling
  plugins
+ for reporting a missing '--vfat' in the vdr.1 man page
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1932,6 +1940,21 @@ Prakash Punnoor <prakash@punnoor.de>
 
 Anssi Hannula <anssi.hannula@gmail.com>
  for a patch that was used to implement processing the "frequency list descriptor"
+ for suggesting that cDevice::GetDevice() should prefer any device that's already
+ receiving and doesn't require detatching receivers
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
+
+Bernd Melcher <bernd@bernd-melcher.de>
+ for reporting a problem with the 'servicedemo' plugin having no PLUGIN macro
+
+Patrick Maier <maierp@informatik.tu-muenchen.de>
+ for fixing handling network masks in the svdrphosts.conf file
+
+Norbert Wentz <norbert.wentz@online.de>
+ for reporting a bug in handling relative volume settings in the call to
+ cStatus::MsgSetVolume()
+
+Frank Schmirler <vdr@schmirler.de>
+ for fixing handling client side termination of SVDRP connections
diff --git a/HISTORY b/HISTORY
index 796f4437e..d3a249079 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4801,3 +4801,36 @@ Video Disk Recorder Revision History
   Patrick Cernko).
 - Now making sure a VPS timer has a schedule in case the epg.data file didn't
   contain one when VDR was started.
+
+2006-07-23: Version 1.4.1-2
+
+- Fixed the Makefile of the 'servicedemo' plugin, so that it defines the
+  PLUGIN macro, which allows the Make.config file to react properly when
+  compiling the plugin (reported by Bernd Melcher).
+  Note to all plugin developers: a plugin's Makefile *must* define the PLUGIN
+  macro, even if it doesn't use it itself!
+- Added a comment regarding the PLUGIN macro to the 'newplugin' script.
+- Added '--vfat' to the vdr.1 man page (reported by Udo Richter).
+- Removed a double fdopen() in cPipe::Open() (reported by Stefan Huelswitt).
+- Fixed handling the running status of EPG events before the currently running one,
+  in case they are added after the current event.
+- cEIT::cEIT() now calls pSchedule->SetPresentSeen() even if OnlyRunningStatus is
+  true.
+- Newlines in title and short text of an EPG event are now changed into blanks only
+  after all other fixes, because a short text might become a description.
+- Fixed handling network masks in the svdrphosts.conf file (thanks to Patrick
+  Maier).
+- Fixed handling relative volume settings in the call to cStatus::MsgSetVolume()
+  (reported by Norbert Wentz).
+- Added a missing initialization of 'mutex' in cCiMenu::cCiMenu() and removed
+  some superfluous semicolons in ci.c (thanks to Marco Schl��ler).
+- Fixed handling client side termination of SVDRP connections (thanks to Frank
+  Schmirler).
+- cDevice::GetDevice() now prefers any device that's already receiving and doesn't
+  require detatching receivers (suggested by Anssi Hannula).
+- Fixed handling numeric keys in the channel display after switching channel groups
+  (thanks to Andreas Regel).
+- Menu items derived from cMenuEditIntItem now loop though their values if they
+  have a dedicated minimum or maximum limit (suggested by Andy Grobb). Looping is
+  only done for normal keypresses, not for repeated ones. This allows the user to
+  scroll the value all the way to the limit by keeping the key pressed.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 08e83c31a..e44af0b19 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,12 +1,13 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/24 17:21:01 kls Exp $
+# $Id: Makefile 1.7 2006/06/24 09:09:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
 #
+PLUGIN  = servicedemo # dummy name for Make.config
 PLUGIN1 = svccli
 PLUGIN2 = svcsvr
 
diff --git a/ci.c b/ci.c
index 863be5331..e6bfa72bf 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.42 2006/01/07 15:07:16 kls Exp $
+ * $Id: ci.c 1.43 2006/07/22 13:40:30 kls Exp $
  */
 
 #include "ci.h"
@@ -1387,6 +1387,7 @@ bool cCiMMI::SendCloseMMI(void)
 cCiMenu::cCiMenu(cCiMMI *MMI, bool Selectable)
 {
   mmi = MMI;
+  mutex = NULL;
   selectable = Selectable;
   titleText = subTitleText = bottomText = NULL;
   numEntries = 0;
@@ -1445,8 +1446,8 @@ cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
 {
   mmi = MMI;
   text = NULL;
-  blind = false;;
-  expectedLength = 0;;
+  blind = false;
+  expectedLength = 0;
 }
 
 cCiEnquiry::~cCiEnquiry()
diff --git a/config.c b/config.c
index 8d49fc6f2..f39426688 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.145 2006/04/17 12:43:57 kls Exp $
+ * $Id: config.c 1.146 2006/07/22 11:57:51 kls Exp $
  */
 
 #include "config.h"
@@ -106,8 +106,10 @@ bool cSVDRPhost::Parse(const char *s)
      *(char *)p = 0; // yes, we know it's 'const' - will be restored!
      if (m == 0)
         mask = 0;
-     else
-        mask >>= (32 - m);
+     else {
+        mask <<= (32 - m);
+        mask = htonl(mask);
+        }
      }
   int result = inet_aton(s, &addr);
   if (p)
diff --git a/config.h b/config.h
index 212c88d2b..92a143335 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.261 2006/06/15 09:23:21 kls Exp $
+ * $Id: config.h 1.262 2006/06/24 09:08:46 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1-1"
+#define VDRVERSION  "1.4.1-2"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/device.c b/device.c
index 25c09f6a3..8f451d716 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.131 2006/06/15 09:59:40 kls Exp $
+ * $Id: device.c 1.133 2006/07/22 14:06:11 kls Exp $
  */
 
 #include "device.h"
@@ -292,7 +292,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
          // to their individual severity, where the one listed first will make the most
          // difference, because it results in the most significant bit of the result.
          uint imp = 0;
-         imp <<= 1; imp |= !device[i]->Receiving() || ndr;                         // use receiving devices if we don't need to detach existing receivers
+         imp <<= 1; imp |= !device[i]->Receiving(true) || ndr;                     // use receiving devices if we don't need to detach existing receivers
          imp <<= 1; imp |= device[i]->Receiving();                                 // avoid devices that are receiving
          imp <<= 1; imp |= device[i] == ActualDevice();                            // avoid the actual device (in case of Transfer Mode)
          imp <<= 1; imp |= device[i]->IsPrimaryDevice();                           // avoid the primary device
@@ -776,9 +776,10 @@ void cDevice::SetAudioChannel(int AudioChannel)
 
 void cDevice::SetVolume(int Volume, bool Absolute)
 {
+  int OldVolume = volume;
   volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
   SetVolumeDevice(volume);
-  cStatus::MsgSetVolume(volume, Absolute);
+  cStatus::MsgSetVolume(Absolute ? volume : volume - OldVolume, Absolute);
   if (volume > 0) {
      mute = false;
      Audios.MuteAudio(mute);
diff --git a/eit.c b/eit.c
index d27849c15..d9714ef84 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.118 2006/05/25 14:35:19 kls Exp $
+ * $Id: eit.c 1.119 2006/07/22 09:21:59 kls Exp $
  */
 
 #include "eit.h"
@@ -253,10 +253,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   if (Empty && Tid == 0x4E && getSectionNumber() == 0)
      // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
      pSchedule->ClrRunningStatus(channel);
-  if (OnlyRunningStatus)
-     return;
   if (Tid == 0x4E)
      pSchedule->SetPresentSeen();
+  if (OnlyRunningStatus)
+     return;
   if (Modified) {
      pSchedule->Sort();
      if (!HasExternalData)
diff --git a/epg.c b/epg.c
index 566f20ee9..dbd5350b4 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.75 2006/05/25 14:55:36 kls Exp $
+ * $Id: epg.c 1.77 2006/07/22 10:13:34 kls Exp $
  */
 
 #include "epg.h"
@@ -435,18 +435,6 @@ void ReportEpgBugFixStats(bool Reset)
 
 void cEvent::FixEpgBugs(void)
 {
-  // VDR can't usefully handle newline characters in the title and shortText of EPG
-  // data, so let's always convert them to blanks (independent of the setting of EPGBugfixLevel):
-  strreplace(title, '\n', ' ');
-  strreplace(shortText, '\n', ' ');
-  // Same for control characters:
-  strreplace(title, '\x86', ' ');
-  strreplace(title, '\x87', ' ');
-  strreplace(shortText, '\x86', ' ');
-  strreplace(shortText, '\x87', ' ');
-  strreplace(description, '\x86', ' ');
-  strreplace(description, '\x87', ' ');
-
   if (isempty(title)) {
      // we don't want any "(null)" titles
      title = strcpyrealloc(title, tr("No title"));
@@ -454,7 +442,7 @@ void cEvent::FixEpgBugs(void)
      }
 
   if (Setup.EPGBugfixLevel == 0)
-     return;
+     goto Final;
 
   // Some TV stations apparently have their own idea about how to fill in the
   // EPG data. Let's fix their bugs as good as we can:
@@ -528,7 +516,7 @@ void cEvent::FixEpgBugs(void)
      }
 
   if (Setup.EPGBugfixLevel <= 1)
-     return;
+     goto Final;
 
   // Some channels apparently try to do some formatting in the texts,
   // which is a bad idea because they have no way of knowing the width
@@ -574,7 +562,7 @@ void cEvent::FixEpgBugs(void)
   strreplace(description, '`', '\'');
 
   if (Setup.EPGBugfixLevel <= 2)
-     return;
+     goto Final;
 
   // The stream components have a "description" field which some channels
   // apparently have no idea of how to set correctly:
@@ -638,6 +626,20 @@ void cEvent::FixEpgBugs(void)
            }
          }
      }
+
+Final:
+
+  // VDR can't usefully handle newline characters in the title and shortText of EPG
+  // data, so let's always convert them to blanks (independent of the setting of EPGBugfixLevel):
+  strreplace(title, '\n', ' ');
+  strreplace(shortText, '\n', ' ');
+  // Same for control characters:
+  strreplace(title, '\x86', ' ');
+  strreplace(title, '\x87', ' ');
+  strreplace(shortText, '\x86', ' ');
+  strreplace(shortText, '\x87', ' ');
+  strreplace(description, '\x86', ' ');
+  strreplace(description, '\x87', ' ');
 }
 
 // --- cSchedule -------------------------------------------------------------
@@ -770,6 +772,14 @@ void cSchedule::ResetVersions(void)
 void cSchedule::Sort(void)
 {
   events.Sort();
+  // Make sure there are no RunningStatusUndefined before the currently running event:
+  if (hasRunning) {
+     for (cEvent *p = events.First(); p; p = events.Next(p)) {
+         if (p->RunningStatus() > SI::RunningStatusNotRunning)
+            break;
+         p->SetRunningStatus(SI::RunningStatusNotRunning);
+         }
+     }
 }
 
 void cSchedule::DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version)
diff --git a/menu.c b/menu.c
index 788ce0f32..7e4f36253 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.441 2006/06/03 13:32:42 kls Exp $
+ * $Id: menu.c 1.443 2006/07/23 09:23:11 kls Exp $
  */
 
 #include "menu.h"
@@ -39,7 +39,7 @@
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
 #define MAXWAITFORCAMMENU 4 // seconds to wait for the CAM menu to open
-#define MINFREEDISK       300 // minimum free disk space required to start recording
+#define MINFREEDISK       300 // minimum free disk space (in MB) required to start recording
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
@@ -3146,6 +3146,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             return osEnd;
             }
     case k1 ... k9:
+         group = -1;
          if (number >= 0) {
             if (number > Channels.MaxNumber())
                number = Key - k0;
diff --git a/menuitems.c b/menuitems.c
index 517664c7f..cbfcf053a 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.45 2006/06/03 13:20:01 kls Exp $
+ * $Id: menuitems.c 1.46 2006/07/23 09:42:17 kls Exp $
  */
 
 #include "menuitems.h"
@@ -75,6 +75,7 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      int newValue = *value;
+     bool IsRepeat = Key & k_Repeat;
      Key = NORMALKEY(Key);
      switch (Key) {
        case kNone: break;
@@ -88,10 +89,14 @@ eOSState cMenuEditIntItem::ProcessKey(eKeys Key)
        case kLeft: // TODO might want to increase the delta if repeated quickly?
             newValue = *value - 1;
             fresh = true;
+            if (!IsRepeat && newValue < min && max != INT_MAX)
+               newValue = max;
             break;
        case kRight:
             newValue = *value + 1;
             fresh = true;
+            if (!IsRepeat && newValue > max && min != INT_MIN)
+               newValue = min;
             break;
        default:
             if (*value < min) { *value = min; Set(); }
diff --git a/newplugin b/newplugin
index 98b8645d4..dd4914056 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.28 2006/04/24 17:18:41 kls Exp $
+# $Id: newplugin 1.29 2006/06/24 09:15:17 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -61,6 +61,8 @@ $MAKEFILE = qq
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
+# IPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
 #
 PLUGIN = $PLUGIN_NAME
 
diff --git a/svdrp.c b/svdrp.c
index 34f283f63..6972681e4 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.97 2006/06/11 09:04:36 kls Exp $
+ * $Id: svdrp.c 1.98 2006/07/22 13:59:43 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1594,8 +1594,12 @@ bool cSVDRP::Process(void)
               isyslog("lost connection to SVDRP client");
               Close();
               }
-           else
-              break;
+           else {
+              isyslog("SVDRP client closed connection");
+              //TODO give cSVDRP::Close() an extra parameter to avoid this code duplication
+              file.Close();
+              DELETENULL(PUTEhandler);
+              }
            }
      if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
         isyslog("timeout on SVDRP connection");
diff --git a/thread.c b/thread.c
index c65f9e29f..1749fc1e0 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.55 2006/06/02 13:51:39 kls Exp $
+ * $Id: thread.c 1.56 2006/06/24 10:10:58 kls Exp $
  */
 
 #include "thread.h"
@@ -423,7 +423,6 @@ bool cPipe::Open(const char *Command, const char *Mode)
         iopipe = 1;
         }
      close(fd[iopipe]);
-     f = fdopen(fd[1 - iopipe], mode);
      if ((f = fdopen(fd[1 - iopipe], mode)) == NULL) {
         LOG_ERROR;
         close(fd[1 - iopipe]);
diff --git a/vdr.1 b/vdr.1
index 232508624..86f5bdf73 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.25 2006/04/30 08:55:12 kls Exp $
+.\" $Id: vdr.1 1.26 2006/06/24 10:07:16 kls Exp $
 .\"
 .TH vdr 1 "30 Apr 2006" "1.4.0" "Video Disk Recorder"
 .SH NAME
@@ -137,6 +137,10 @@ be set from the transponder data, but for security reasons
 vdr can switch to a lesser privileged user id during normal
 operation.
 .TP
+.BI \-\-vfat
+Encode special characters in recording names to avoid problems
+with VFAT file systems.
+.TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
 The default is \fI/video\fR.

From 33f1491b18c201ecda4ff2c34f606d9f5f041489 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Aug 2006 18:00:00 +0200
Subject: [PATCH 149/307] Version 1.4.1-3 - Fixed assigning schedules to
 channels in case there is no initial EPG information   (thanks to Frank
 Schmirler). - Increased the APIVERSION to allow plugins that relied on the
 cStatus::MsgSetVolume()   bug to react properly (suggested by Stefan
 Huelswitt). - Fixed cDevice::ToggleMute() (thanks to Christoph Haubrich). -
 Fixed deleting the last character of a string menu item in insert mode
 (thanks   to Udo Richter). - The /video/.update file is now touched _after_
 an editing process is finished   in order to avoid excessive disk access
 (thanks to Artur Skawina). - Fixed handling the running status of EPG events
 before the currently running one,   in case they are added after the current
 event (cont'd from version 1.4.1-2). - Modified the shutdown mechanism, so
 that the shutdown script is never given a   time in the past (reported by
 Helmut Auer). If a timer is currently recording,   or a recording would start
 within the next 30 minutes (default for the "Min.   event timeout" setup
 parameter), and the user insists in shutting down now, the   reboot time
 given to the shutdown script will correspond to a time that is   "Min. event
 timeout" minutes (default is 30) in the future. - Avoiding shutdown message
 "Recording in ... minutes, shut down anyway?" with   a negative number of
 minutes (reported by Udo Richter). - Fixed getting the next active timer when
 shutting down (thanks to Udo Richter). - Modified the cSVDRP::Close()
 function to avoid code duplication.

---
 CONTRIBUTORS | 12 ++++++++++++
 HISTORY      | 24 ++++++++++++++++++++++++
 INSTALL      | 11 +++++------
 config.h     |  8 ++++----
 cutter.c     |  5 +++--
 device.c     |  6 +++---
 eit.c        |  7 +++----
 epg.c        | 14 +++++++++-----
 menuitems.c  |  6 ++++--
 recording.c  |  7 ++++---
 recording.h  |  4 ++--
 svdrp.c      | 36 +++++++++++++++---------------------
 svdrp.h      |  4 ++--
 timers.c     |  5 +++--
 vdr.c        | 30 +++++++++++++++++++-----------
 15 files changed, 112 insertions(+), 67 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 460930092..dced3ca05 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -220,6 +220,8 @@ Stefan Huelswitt <huels@iname.com>
  for reporting a problem with channel up/down switching on single card systems
  for fixing the PremiereContentTransmissionDescriptor in 'libsi'
  for reporting a double fdopen() in cPipe::Open()
+ for suggesting to increase the APIVERSION to allow plugins that relied on the
+ cStatus::MsgSetVolume() bug to react properly
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -277,6 +279,8 @@ Artur Skawina <skawina@geocities.com>
  for a patch that contained a fix for checking toFile in cCuttingThread::Action()
  for improving cUnbufferedFile
  for fixing calculating the cache size in cUnbufferedFile::Read()
+ for making the /video/.update file be touched _after_ an editing process is finished
+ in order to avoid excessive disk access
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
@@ -577,6 +581,8 @@ Helmut Auer <vdr@helmutauer.de>
  for reporting a problem with the "Press any key on the RC unit" step when learning
  LIRC remote control codes
  for suggesting to reduce the logging for the SVDRP GRAB command
+ for reporting that the shutdown script is given a reboot time in the past if there
+ is a recording going on or about to start, and the user insists in shutting down now
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1450,6 +1456,10 @@ Udo Richter <udo_richter@gmx.de>
  for adding "-fPIC" to the compiler options in Make.config.template when compiling
  plugins
  for reporting a missing '--vfat' in the vdr.1 man page
+ for fixing deleting the last character of a string menu item in insert mode
+ for reporting that the shutdown message "Recording in ... minutes, shut down anyway?"
+ may have been given with a negative number of minutes
+ for fixing getting the next active timer when shutting down
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1871,6 +1881,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  the jump instead of closing the display
  for reporting that the log message "deleting plugin: ..." is irritating when
  calling "vdr --help"
+ for fixing cDevice::ToggleMute()
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -1958,3 +1969,4 @@ Norbert Wentz <norbert.wentz@online.de>
 
 Frank Schmirler <vdr@schmirler.de>
  for fixing handling client side termination of SVDRP connections
+ for fixing assigning schedules to channels in case there is no initial EPG information
diff --git a/HISTORY b/HISTORY
index d3a249079..1a35c12a2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4834,3 +4834,27 @@ Video Disk Recorder Revision History
   have a dedicated minimum or maximum limit (suggested by Andy Grobb). Looping is
   only done for normal keypresses, not for repeated ones. This allows the user to
   scroll the value all the way to the limit by keeping the key pressed.
+
+2006-08-06: Version 1.4.1-3
+
+- Fixed assigning schedules to channels in case there is no initial EPG information
+  (thanks to Frank Schmirler).
+- Increased the APIVERSION to allow plugins that relied on the cStatus::MsgSetVolume()
+  bug to react properly (suggested by Stefan Huelswitt).
+- Fixed cDevice::ToggleMute() (thanks to Christoph Haubrich).
+- Fixed deleting the last character of a string menu item in insert mode (thanks
+  to Udo Richter).
+- The /video/.update file is now touched _after_ an editing process is finished
+  in order to avoid excessive disk access (thanks to Artur Skawina).
+- Fixed handling the running status of EPG events before the currently running one,
+  in case they are added after the current event (cont'd from version 1.4.1-2).
+- Modified the shutdown mechanism, so that the shutdown script is never given a
+  time in the past (reported by Helmut Auer). If a timer is currently recording,
+  or a recording would start within the next 30 minutes (default for the "Min.
+  event timeout" setup parameter), and the user insists in shutting down now, the
+  reboot time given to the shutdown script will correspond to a time that is
+  "Min. event timeout" minutes (default is 30) in the future.
+- Avoiding shutdown message "Recording in ... minutes, shut down anyway?" with
+  a negative number of minutes (reported by Udo Richter).
+- Fixed getting the next active timer when shutting down (thanks to Udo Richter).
+- Modified the cSVDRP::Close() function to avoid code duplication.
diff --git a/INSTALL b/INSTALL
index 6cbc8b5fe..fef86017c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -171,7 +171,7 @@ calling the shutdown program, but will rather continue normally until it
 receives a SIGTERM when the computer is actually shut down. So in case
 the shutdown fails, or the shutdown program for some reason decides not to
 perform a shutdown, VDR will stay up and running and will call the shutdown
-program again after another MinUserInactivity minutes.
+program again after another five minutes.
 
 If there are currently no timers active, both parameters will be '0'.
 In that case the program shall not set the hardware for automatic restart
@@ -191,11 +191,10 @@ that this is a user requested shutdown (resulting from pressing the "Power"
 key). The shutdown program may use this information to decide whether or
 not to actually perform the system shutdown.
 
-If a timer is currently recording, the parameters will reflect the start
-time of that timer. This means that the first parameter will be a time in
-the past, and the second parameter will be a negative number. This only
-happens if the user presses the "Power" key while a timer is currently
-recording.
+If a timer is currently recording, or a recording would start within the
+next 30 minutes (default for the "Min. event timeout" setup parameter), and
+the user insists in shutting down now, the first and second parameter will
+correspond to a time that is "Min. event timeout" minutes in the future.
 
 Before the shutdown program is called, the user will be prompted to inform
 him that the system is about to shut down. If any remote control key is
diff --git a/config.h b/config.h
index 92a143335..fd244cdf5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.262 2006/06/24 09:08:46 kls Exp $
+ * $Id: config.h 1.264 2006/07/29 09:56:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1-2"
+#define VDRVERSION  "1.4.1-3"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.4.1"
-#define APIVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.4.2"
+#define APIVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 5b82cc542..5170ae4af 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.15 2006/02/12 10:07:23 kls Exp $
+ * $Id: cutter.c 1.16 2006/07/30 10:22:08 kls Exp $
  */
 
 #include "cutter.h"
@@ -171,6 +171,7 @@ void cCuttingThread::Action(void)
                  LastMark = true;
               }
            }
+     Recordings.TouchUpdate();
      }
   else
      esyslog("no editing marks found!");
@@ -205,7 +206,7 @@ bool cCutter::Start(const char *FileName)
         // XXX
         editedVersionName = strdup(evn);
         Recording.WriteInfo();
-        Recordings.AddByName(editedVersionName);
+        Recordings.AddByName(editedVersionName, false);
         cuttingThread = new cCuttingThread(FileName, editedVersionName);
         return true;
         }
diff --git a/device.c b/device.c
index 8f451d716..882279cb0 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.133 2006/07/22 14:06:11 kls Exp $
+ * $Id: device.c 1.134 2006/07/29 10:03:56 kls Exp $
  */
 
 #include "device.h"
@@ -751,12 +751,12 @@ bool cDevice::ToggleMute(void)
   mute = !mute;
   //XXX why is it necessary to use different sequences???
   if (mute) {
-     SetVolume(0, mute);
+     SetVolume(0, true);
      Audios.MuteAudio(mute); // Mute external audio after analog audio
      }
   else {
      Audios.MuteAudio(mute); // Enable external audio before analog audio
-     SetVolume(0, mute);
+     SetVolume(OldVolume, true);
      }
   volume = OldVolume;
   return mute;
diff --git a/eit.c b/eit.c
index d9714ef84..fc65bc9c4 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.119 2006/07/22 09:21:59 kls Exp $
+ * $Id: eit.c 1.120 2006/08/05 10:01:21 kls Exp $
  */
 
 #include "eit.h"
@@ -94,6 +94,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          pEvent->SetStartTime(SiEitEvent.getStartTime());
          pEvent->SetDuration(SiEitEvent.getDuration());
          }
+      if (newEvent)
+         pSchedule->AddEvent(newEvent);
       if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
          if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
             pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
@@ -240,9 +242,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
 
-      if (newEvent)
-         pSchedule->AddEvent(newEvent);
-
       pEvent->SetComponents(Components);
 
       pEvent->FixEpgBugs();
diff --git a/epg.c b/epg.c
index dbd5350b4..b8b6b64d6 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.77 2006/07/22 10:13:34 kls Exp $
+ * $Id: epg.c 1.79 2006/08/05 10:04:17 kls Exp $
  */
 
 #include "epg.h"
@@ -647,7 +647,7 @@ void cEvent::FixEpgBugs(void)
 cSchedule::cSchedule(tChannelID ChannelID)
 {
   channelID = ChannelID;
-  hasRunning = false;;
+  hasRunning = false;
   modified = 0;
   presentSeen = 0;
 }
@@ -738,6 +738,7 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
 
 void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel)
 {
+  hasRunning = false;
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
       if (p == Event) {
          if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning)
@@ -745,9 +746,9 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Cha
          }
       else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime())
          p->SetRunningStatus(SI::RunningStatusNotRunning);
+      if (p->RunningStatus() >= SI::RunningStatusPausing)
+         hasRunning = true;
       }
-  if (RunningStatus >= SI::RunningStatusPausing)
-     hasRunning = true;
 }
 
 void cSchedule::ClrRunningStatus(cChannel *Channel)
@@ -775,7 +776,7 @@ void cSchedule::Sort(void)
   // Make sure there are no RunningStatusUndefined before the currently running event:
   if (hasRunning) {
      for (cEvent *p = events.First(); p; p = events.Next(p)) {
-         if (p->RunningStatus() > SI::RunningStatusNotRunning)
+         if (p->RunningStatus() >= SI::RunningStatusPausing)
             break;
          p->SetRunningStatus(SI::RunningStatusNotRunning);
          }
@@ -1035,6 +1036,9 @@ cSchedule *cSchedules::AddSchedule(tChannelID ChannelID)
   if (!p) {
      p = new cSchedule(ChannelID);
      Add(p);
+     cChannel *channel = Channels.GetByChannelID(ChannelID);
+     if (channel)
+        channel->schedule = p;
      }
   return p;
 }
diff --git a/menuitems.c b/menuitems.c
index cbfcf053a..086668eea 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.46 2006/07/23 09:42:17 kls Exp $
+ * $Id: menuitems.c 1.47 2006/07/30 09:09:30 kls Exp $
  */
 
 #include "menuitems.h"
@@ -313,7 +313,7 @@ void cMenuEditStrItem::Set(void)
         SetValue(buf);
         return;
         }
-     width -= font->Width('>'); // assuming '<' and '>' have the same with
+     width -= font->Width('>'); // assuming '<' and '>' have the same width
      int w = 0;
      int i = 0;
      int l = strlen(buf);
@@ -395,6 +395,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     if (strlen(value) > 1) {
                        if (!insert || pos < int(strlen(value)) - 1)
                           memmove(value + pos, value + pos + 1, strlen(value) - pos);
+                       else if (insert && pos == int(strlen(value)) - 1)
+                          value[pos] = ' '; // in insert mode, deleting the last character replaces it with a blank to keep the cursor position
                        // reduce position, if we removed the last character
                        if (pos == int(strlen(value)))
                           pos--;
diff --git a/recording.c b/recording.c
index 229cfee59..fd7800b4d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.148 2006/04/29 13:22:20 kls Exp $
+ * $Id: recording.c 1.149 2006/07/30 10:23:46 kls Exp $
  */
 
 #include "recording.h"
@@ -970,7 +970,7 @@ cRecording *cRecordings::GetByName(const char *FileName)
   return NULL;
 }
 
-void cRecordings::AddByName(const char *FileName)
+void cRecordings::AddByName(const char *FileName, bool TriggerUpdate)
 {
   LOCK_THREAD;
   cRecording *recording = GetByName(FileName);
@@ -978,7 +978,8 @@ void cRecordings::AddByName(const char *FileName)
      recording = new cRecording(FileName);
      Add(recording);
      ChangeState();
-     TouchUpdate();
+     if (TriggerUpdate)
+        TouchUpdate();
      }
 }
 
diff --git a/recording.h b/recording.h
index 286568550..def351f87 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.54 2006/04/09 13:47:11 kls Exp $
+ * $Id: recording.h 1.55 2006/07/30 10:24:07 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -133,7 +133,7 @@ class cRecordings : public cList<cRecording>, public cThread {
   bool StateChanged(int &State);
   void ResetResume(const char *ResumeFileName = NULL);
   cRecording *GetByName(const char *FileName);
-  void AddByName(const char *FileName);
+  void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
   int TotalFileSizeMB(void); ///< Only for deleted recordings!
   };
diff --git a/svdrp.c b/svdrp.c
index 6972681e4..b2317527c 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.98 2006/07/22 13:59:43 kls Exp $
+ * $Id: svdrp.c 1.99 2006/08/06 09:17:58 kls Exp $
  */
 
 #include "svdrp.h"
@@ -378,17 +378,19 @@ cSVDRP::cSVDRP(int Port)
 
 cSVDRP::~cSVDRP()
 {
-  Close();
+  Close(true);
   free(cmdLine);
 }
 
-void cSVDRP::Close(bool Timeout)
+void cSVDRP::Close(bool SendReply, bool Timeout)
 {
   if (file.IsOpen()) {
-     //TODO how can we get the *full* hostname?
-     char buffer[BUFSIZ];
-     gethostname(buffer, sizeof(buffer));
-     Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
+     if (SendReply) {
+        //TODO how can we get the *full* hostname?
+        char buffer[BUFSIZ];
+        gethostname(buffer, sizeof(buffer));
+        Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
+        }
      isyslog("closing SVDRP connection"); //TODO store IP#???
      file.Close();
      DELETENULL(PUTEhandler);
@@ -401,7 +403,7 @@ bool cSVDRP::Send(const char *s, int length)
      length = strlen(s);
   if (safe_write(file, s, length) < 0) {
      LOG_ERROR;
-     file.Close();
+     Close();
      return false;
      }
   return true;
@@ -423,10 +425,8 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
                  cont = '-';
               char number[16];
               sprintf(number, "%03d%c", abs(Code), cont);
-              if (!(Send(number) && Send(s, n ? n - s : -1) && Send("\r\n"))) {
-                 Close();
+              if (!(Send(number) && Send(s, n ? n - s : -1) && Send("\r\n")))
                  break;
-                 }
               s = n ? n + 1 : NULL;
               }
         free(buffer);
@@ -1530,7 +1530,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("STAT"))  CmdSTAT(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("VOLU"))  CmdVOLU(s);
-  else if (CMD("QUIT"))  Close();
+  else if (CMD("QUIT"))  Close(true);
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
 }
 
@@ -1570,7 +1570,7 @@ bool cSVDRP::Process(void)
                  }
               else if (c == 0x04 && numChars == 0) {
                  // end of file (only at beginning of line)
-                 Close();
+                 Close(true);
                  }
               else if (c == 0x08 || c == 0x7F) {
                  // backspace or delete (last character)
@@ -1590,20 +1590,14 @@ bool cSVDRP::Process(void)
                  }
               lastActivity = time(NULL);
               }
-           else if (r < 0) {
+           else if (r <= 0) {
               isyslog("lost connection to SVDRP client");
               Close();
               }
-           else {
-              isyslog("SVDRP client closed connection");
-              //TODO give cSVDRP::Close() an extra parameter to avoid this code duplication
-              file.Close();
-              DELETENULL(PUTEhandler);
-              }
            }
      if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
         isyslog("timeout on SVDRP connection");
-        Close(true);
+        Close(true, true);
         }
      return true;
      }
diff --git a/svdrp.h b/svdrp.h
index 1229f8ef2..65d2f69c5 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.27 2005/12/30 14:46:38 kls Exp $
+ * $Id: svdrp.h 1.28 2006/08/06 08:51:09 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -50,7 +50,7 @@ class cSVDRP {
   char *cmdLine;
   time_t lastActivity;
   static char *grabImageDir;
-  void Close(bool Timeout = false);
+  void Close(bool SendReply = false, bool Timeout = false);
   bool Send(const char *s, int length = -1);
   void Reply(int Code, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
   void PrintHelpTopics(const char **hp);
diff --git a/timers.c b/timers.c
index 15fbdd8e5..8bc0b324a 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.61 2006/05/25 14:36:37 kls Exp $
+ * $Id: timers.c 1.62 2006/08/05 12:03:36 kls Exp $
  */
 
 #include "timers.h"
@@ -351,7 +351,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
          if (DayMatches(t0)) {
             time_t a = SetTime(t0, begin);
             time_t b = a + length;
-            if ((!day || a >= day) && t <= b) {
+            if ((!day || a >= day) && t < b) {
                startTime = a;
                stopTime = b;
                break;
@@ -647,6 +647,7 @@ cTimer *cTimers::GetNextActiveTimer(void)
 {
   cTimer *t0 = NULL;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      ti->Matches();
       if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
          t0 = ti;
       }
diff --git a/vdr.c b/vdr.c
index 09ea29efa..436bfada8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.276 2006/06/18 08:49:20 kls Exp $
+ * $Id: vdr.c 1.278 2006/08/05 10:46:38 kls Exp $
  */
 
 #include <getopt.h>
@@ -1015,16 +1015,18 @@ int main(int argc, char *argv[])
                   }
                if (cPluginManager::Active(tr("shut down anyway?")))
                   break;
-               cTimer *timer = Timers.GetNextActiveTimer();
-               time_t Next  = timer ? timer->StartTime() : 0;
-               time_t Delta = timer ? Next - time(NULL) : 0;
-               if (Next && Delta <= Setup.MinEventTimeout * 60) {
-                  char *buf;
-                  asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
-                  bool confirm = Interface->Confirm(buf);
-                  free(buf);
-                  if (!confirm)
-                     break;
+               if (!cRecordControls::Active()) {
+                  cTimer *timer = Timers.GetNextActiveTimer();
+                  time_t Next  = timer ? timer->StartTime() : 0;
+                  time_t Delta = timer ? Next - time(NULL) : 0;
+                  if (Next && Delta <= Setup.MinEventTimeout * 60) {
+                     char *buf;
+                     asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
+                     bool confirm = Interface->Confirm(buf);
+                     free(buf);
+                     if (!confirm)
+                        break;
+                     }
                   }
                ForceShutdown = true;
                break;
@@ -1166,6 +1168,12 @@ int main(int argc, char *argv[])
                     else
                        LastActivity = 1;
                     }
+                 if (timer && Delta < Setup.MinEventTimeout * 60 && ForceShutdown) {
+                    Delta = Setup.MinEventTimeout * 60;
+                    Next = Now + Delta;
+                    timer = NULL;
+                    dsyslog("reboot at %s", *TimeToString(Next));
+                    }
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
                     if (timer)

From f5ad8fc5d7679433faf6a7465b5cfd54a7c10f8b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Aug 2006 18:00:00 +0200
Subject: [PATCH 150/307] =?UTF-8?q?Version=201.4.1-4=20-=20Fixed=20convert?=
 =?UTF-8?q?ing=20the=20port=20number=20in=20the=20"connect=20from..."=20lo?=
 =?UTF-8?q?g=20message=20of=20SVDRP=20=20=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4).=20-=20Made=20the=20cCiSession=20members=20sessionId=20?=
 =?UTF-8?q?and=20resourceId=20uint16=5Ft=20and=20uint32=5Ft,=20=20=20respe?=
 =?UTF-8?q?ctively,=20to=20match=20their=20types=20in=20the=20CI=20session?=
 =?UTF-8?q?=20data=20(thanks=20to=20Ville=20Skytt=C3=A4=20=20=20for=20repo?=
 =?UTF-8?q?rting=20that=20there=20are=20places=20where=20ntohs()=20is=20as?=
 =?UTF-8?q?signed=20to=20different=20types).=20-=20Changed=20the=20way=20a?=
 =?UTF-8?q?=20device=20is=20selected=20for=20receiving=20in=20order=20to?=
 =?UTF-8?q?=20keep=20devices=20with=20=20=20CAMs=20better=20available,=20e?=
 =?UTF-8?q?ven=20if=20this=20means=20recording=20on=20the=20primary=20devi?=
 =?UTF-8?q?ce=20(reported=20=20=20by=20J=C3=B6rn=20Reder;=20thanks=20to=20?=
 =?UTF-8?q?Anssi=20Hannula=20for=20improving=20handling=20Transfer=20Mode?=
 =?UTF-8?q?=20devices=20=20=20in=20this).=20-=20No=20longer=20stopping=20r?=
 =?UTF-8?q?emoving=20empty=20directories=20if=20an=20error=20occurs=20(tha?=
 =?UTF-8?q?nks=20to=20=20=20Oliver=20Endriss).=20-=20Added=20a=20log=20err?=
 =?UTF-8?q?or=20message=20to=20cPlugin::ConfigDirectory()=20in=20case=20a?=
 =?UTF-8?q?=20plugin=20calls=20it=20=20=20from=20a=20separate=20thread=20(?=
 =?UTF-8?q?reported=20by=20Udo=20Richter).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS | 10 ++++++++
 HISTORY      | 16 +++++++++++++
 ci.c         | 68 ++++++++++++++++++++++++++--------------------------
 ci.h         | 14 +++++------
 config.h     |  4 ++--
 device.c     |  8 +++----
 plugin.c     |  5 +++-
 svdrp.c      |  4 ++--
 tools.c      |  5 ++--
 9 files changed, 81 insertions(+), 53 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dced3ca05..f19b4610d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -639,6 +639,7 @@ Oliver Endriss <o.endriss@gmx.de>
  against invalid data
  for reporting a problem in extracting APIVERSION with older versions of 'sed'
  for fixing broken APIVERSION extraction line in 'newplugin'
+ for making VDR no longer stop removing empty directories if an error occurs
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1460,6 +1461,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting that the shutdown message "Recording in ... minutes, shut down anyway?"
  may have been given with a negative number of minutes
  for fixing getting the next active timer when shutting down
+ for reporting a problem with cPlugin::ConfigDirectory() in case a plugin calls it
+ from a separate thread
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1621,6 +1624,8 @@ Ville Skytt
  for fixing several spelling errors
  for reporting that the call to pthread_setschedparam(childTid, SCHED_RR, 0) in
  thread.c caused a compiler warning with g++ 4.1.1
+ for fixing converting the port number in the "connect from..." log message of SVDRP
+ for reporting that there are places where ntohs() is assigned to different types
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1953,6 +1958,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for a patch that was used to implement processing the "frequency list descriptor"
  for suggesting that cDevice::GetDevice() should prefer any device that's already
  receiving and doesn't require detatching receivers
+ for improving handling Transfer Mode devices when selecting a device to receive
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -1970,3 +1976,7 @@ Norbert Wentz <norbert.wentz@online.de>
 Frank Schmirler <vdr@schmirler.de>
  for fixing handling client side termination of SVDRP connections
  for fixing assigning schedules to channels in case there is no initial EPG information
+
+J�rn Reder <joern@zyn.de>
+ for reporting that a recording may unnecessarily block a device with a CAM, while
+ it could record on the primary device as well
diff --git a/HISTORY b/HISTORY
index 1a35c12a2..6ba80d34a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4858,3 +4858,19 @@ Video Disk Recorder Revision History
   a negative number of minutes (reported by Udo Richter).
 - Fixed getting the next active timer when shutting down (thanks to Udo Richter).
 - Modified the cSVDRP::Close() function to avoid code duplication.
+
+2006-08-13: Version 1.4.1-4
+
+- Fixed converting the port number in the "connect from..." log message of SVDRP
+  (thanks to Ville Skytt�).
+- Made the cCiSession members sessionId and resourceId uint16_t and uint32_t,
+  respectively, to match their types in the CI session data (thanks to Ville Skytt�
+  for reporting that there are places where ntohs() is assigned to different types).
+- Changed the way a device is selected for receiving in order to keep devices with
+  CAMs better available, even if this means recording on the primary device (reported
+  by J�rn Reder; thanks to Anssi Hannula for improving handling Transfer Mode devices
+  in this).
+- No longer stopping removing empty directories if an error occurs (thanks to
+  Oliver Endriss).
+- Added a log error message to cPlugin::ConfigDirectory() in case a plugin calls it
+  from a separate thread (reported by Udo Richter).
diff --git a/ci.c b/ci.c
index e6bfa72bf..d1332dd4e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.43 2006/07/22 13:40:30 kls Exp $
+ * $Id: ci.c 1.44 2006/08/12 10:14:27 kls Exp $
  */
 
 #include "ci.h"
@@ -630,24 +630,24 @@ cCiTransportConnection *cCiTransportLayer::Process(int Slot)
 
 class cCiSession {
 private:
-  int sessionId;
-  int resourceId;
+  uint16_t sessionId;
+  uint32_t resourceId;
   cCiTransportConnection *tc;
 protected:
   int GetTag(int &Length, const uint8_t **Data);
   const uint8_t *GetData(const uint8_t *Data, int &Length);
   int SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
 public:
-  cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc);
+  cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc);
   virtual ~cCiSession();
   const cCiTransportConnection *Tc(void) { return tc; }
-  int SessionId(void) { return sessionId; }
-  int ResourceId(void) { return resourceId; }
+  uint16_t SessionId(void) { return sessionId; }
+  uint32_t ResourceId(void) { return resourceId; }
   virtual bool HasUserIO(void) { return false; }
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
-cCiSession::cCiSession(int SessionId, int ResourceId, cCiTransportConnection *Tc)
+cCiSession::cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc)
 {
   sessionId = SessionId;
   resourceId = ResourceId;
@@ -711,11 +711,11 @@ class cCiResourceManager : public cCiSession {
 private:
   int state;
 public:
-  cCiResourceManager(int SessionId, cCiTransportConnection *Tc);
+  cCiResourceManager(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
-cCiResourceManager::cCiResourceManager(int SessionId, cCiTransportConnection *Tc)
+cCiResourceManager::cCiResourceManager(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_RESOURCE_MANAGER, Tc)
 {
   dbgprotocol("New Resource Manager (session id %d)\n", SessionId);
@@ -729,12 +729,12 @@ bool cCiResourceManager::Process(int Length, const uint8_t *Data)
      switch (Tag) {
        case AOT_PROFILE_ENQ: {
             dbgprotocol("%d: <== Profile Enquiry\n", SessionId());
-            int resources[] = { htonl(RI_RESOURCE_MANAGER),
-                                htonl(RI_APPLICATION_INFORMATION),
-                                htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
-                                htonl(RI_DATE_TIME),
-                                htonl(RI_MMI)
-                              };
+            uint32_t resources[] = { htonl(RI_RESOURCE_MANAGER),
+                                     htonl(RI_APPLICATION_INFORMATION),
+                                     htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
+                                     htonl(RI_DATE_TIME),
+                                     htonl(RI_MMI)
+                                   };
             dbgprotocol("%d: ==> Profile\n", SessionId());
             SendData(AOT_PROFILE, sizeof(resources), (uint8_t*)resources);
             state = 3;
@@ -779,14 +779,14 @@ class cCiApplicationInformation : public cCiSession {
   uint16_t manufacturerCode;
   char *menuString;
 public:
-  cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc);
+  cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual ~cCiApplicationInformation();
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   bool EnterMenu(void);
   const char *GetMenuString(void) { return menuString; }
   };
 
-cCiApplicationInformation::cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc)
+cCiApplicationInformation::cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
 {
   dbgprotocol("New Application Information (session id %d)\n", SessionId);
@@ -963,14 +963,14 @@ class cCiConditionalAccessSupport : public cCiSession {
   int numCaSystemIds;
   unsigned short caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
 public:
-  cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc);
+  cCiConditionalAccessSupport(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   const unsigned short *GetCaSystemIds(void) { return caSystemIds; }
   bool SendPMT(cCiCaPmt *CaPmt);
   bool ReceivedReply(bool CanDescramble = false);
   };
 
-cCiConditionalAccessSupport::cCiConditionalAccessSupport(int SessionId, cCiTransportConnection *Tc)
+cCiConditionalAccessSupport::cCiConditionalAccessSupport(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_CONDITIONAL_ACCESS_SUPPORT, Tc)
 {
   dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
@@ -1090,11 +1090,11 @@ class cCiDateTime : public cCiSession {
   time_t lastTime;
   bool SendDateTime(void);
 public:
-  cCiDateTime(int SessionId, cCiTransportConnection *Tc);
+  cCiDateTime(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
-cCiDateTime::cCiDateTime(int SessionId, cCiTransportConnection *Tc)
+cCiDateTime::cCiDateTime(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_DATE_TIME, Tc)
 {
   interval = 0;
@@ -1193,7 +1193,7 @@ class cCiMMI : public cCiSession {
   cCiMenu *menu, *fetchedMenu;
   cCiEnquiry *enquiry, *fetchedEnquiry;
 public:
-  cCiMMI(int SessionId, cCiTransportConnection *Tc);
+  cCiMMI(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual ~cCiMMI();
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
   virtual bool HasUserIO(void) { return menu || enquiry; }
@@ -1204,7 +1204,7 @@ class cCiMMI : public cCiSession {
   bool SendCloseMMI(void);
   };
 
-cCiMMI::cCiMMI(int SessionId, cCiTransportConnection *Tc)
+cCiMMI::cCiMMI(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_MMI, Tc)
 {
   dbgprotocol("New MMI (session id %d)\n", SessionId);
@@ -1524,12 +1524,12 @@ cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
   return NULL;
 }
 
-int cCiHandler::ResourceIdToInt(const uint8_t *Data)
+uint32_t cCiHandler::ResourceIdToInt(const uint8_t *Data)
 {
-  return (ntohl(get_unaligned((int32_t *)Data)));
+  return (ntohl(get_unaligned((uint32_t *)Data)));
 }
 
-bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
+bool cCiHandler::Send(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId, int Status)
 {
   uint8_t buffer[16];
   uint8_t *p = buffer;
@@ -1538,7 +1538,7 @@ bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
   if (Status >= 0)
      *p++ = Status;
   if (ResourceId) {
-     put_unaligned(htonl(ResourceId), (int32_t *)p);
+     put_unaligned(htonl(ResourceId), (uint32_t *)p);
      p += 4;
      }
   put_unaligned(htons(SessionId), (uint16_t *)p);
@@ -1547,7 +1547,7 @@ bool cCiHandler::Send(uint8_t Tag, int SessionId, int ResourceId, int Status)
   return tc && tc->SendData(p - buffer, buffer) == OK;
 }
 
-cCiSession *cCiHandler::GetSessionBySessionId(int SessionId)
+cCiSession *cCiHandler::GetSessionBySessionId(uint16_t SessionId)
 {
   for (int i = 0; i < MAX_CI_SESSION; i++) {
       if (sessions[i] && sessions[i]->SessionId() == SessionId)
@@ -1556,7 +1556,7 @@ cCiSession *cCiHandler::GetSessionBySessionId(int SessionId)
   return NULL;
 }
 
-cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId, int Slot)
+cCiSession *cCiHandler::GetSessionByResourceId(uint32_t ResourceId, int Slot)
 {
   for (int i = 0; i < MAX_CI_SESSION; i++) {
       if (sessions[i] && sessions[i]->Tc()->Slot() == Slot && sessions[i]->ResourceId() == ResourceId)
@@ -1565,7 +1565,7 @@ cCiSession *cCiHandler::GetSessionByResourceId(int ResourceId, int Slot)
   return NULL;
 }
 
-cCiSession *cCiHandler::CreateSession(int ResourceId)
+cCiSession *cCiHandler::CreateSession(uint32_t ResourceId)
 {
   if (!GetSessionByResourceId(ResourceId, tc->Slot())) {
      for (int i = 0; i < MAX_CI_SESSION; i++) {
@@ -1588,7 +1588,7 @@ cCiSession *cCiHandler::CreateSession(int ResourceId)
 bool cCiHandler::OpenSession(int Length, const uint8_t *Data)
 {
   if (Length == 6 && *(Data + 1) == 0x04) {
-     int ResourceId = ResourceIdToInt(Data + 2);
+     uint32_t ResourceId = ResourceIdToInt(Data + 2);
      dbgprotocol("OpenSession %08X\n", ResourceId);
      switch (ResourceId) {
        case RI_RESOURCE_MANAGER:
@@ -1611,9 +1611,9 @@ bool cCiHandler::OpenSession(int Length, const uint8_t *Data)
   return false;
 }
 
-bool cCiHandler::CloseSession(int SessionId)
+bool cCiHandler::CloseSession(uint16_t SessionId)
 {
-  dbgprotocol("CloseSession %08X\n", SessionId);
+  dbgprotocol("CloseSession %d\n", SessionId);
   cCiSession *Session = GetSessionBySessionId(SessionId);
   if (Session && sessions[SessionId - 1] == Session) {
      delete Session;
@@ -1675,7 +1675,7 @@ bool cCiHandler::Process(int Slot)
             if (Data && Length > 1) {
                switch (*Data) {
                  case ST_SESSION_NUMBER:          if (Length > 4) {
-                                                     int SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
+                                                     uint16_t SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
                                                      cCiSession *Session = GetSessionBySessionId(SessionId);
                                                      if (Session)
                                                         Session->Process(Length - 4, Data + 4);
diff --git a/ci.h b/ci.h
index 3817a89b2..457401060 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.21 2006/01/07 15:03:05 kls Exp $
+ * $Id: ci.h 1.22 2006/08/12 09:43:31 kls Exp $
  */
 
 #ifndef __CI_H
@@ -110,14 +110,14 @@ class cCiHandler {
   int source;
   int transponder;
   cList<cCiCaProgramData> caProgramList;
-  int ResourceIdToInt(const uint8_t *Data);
-  bool Send(uint8_t Tag, int SessionId, int ResourceId = 0, int Status = -1);
+  uint32_t ResourceIdToInt(const uint8_t *Data);
+  bool Send(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId = 0, int Status = -1);
   const unsigned short *GetCaSystemIds(int Slot);
-  cCiSession *GetSessionBySessionId(int SessionId);
-  cCiSession *GetSessionByResourceId(int ResourceId, int Slot);
-  cCiSession *CreateSession(int ResourceId);
+  cCiSession *GetSessionBySessionId(uint16_t SessionId);
+  cCiSession *GetSessionByResourceId(uint32_t ResourceId, int Slot);
+  cCiSession *CreateSession(uint32_t ResourceId);
   bool OpenSession(int Length, const uint8_t *Data);
-  bool CloseSession(int SessionId);
+  bool CloseSession(uint16_t SessionId);
   int CloseAllSessions(int Slot);
   cCiHandler(int Fd, int NumSlots);
   void SendCaPmt(void);
diff --git a/config.h b/config.h
index fd244cdf5..82c06c60e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.264 2006/07/29 09:56:04 kls Exp $
+ * $Id: config.h 1.265 2006/08/12 09:10:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1-3"
+#define VDRVERSION  "1.4.1-4"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/device.c b/device.c
index 882279cb0..a1a1d6984 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.134 2006/07/29 10:03:56 kls Exp $
+ * $Id: device.c 1.135 2006/08/12 11:33:34 kls Exp $
  */
 
 #include "device.h"
@@ -294,11 +294,11 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
          uint imp = 0;
          imp <<= 1; imp |= !device[i]->Receiving(true) || ndr;                     // use receiving devices if we don't need to detach existing receivers
          imp <<= 1; imp |= device[i]->Receiving();                                 // avoid devices that are receiving
-         imp <<= 1; imp |= device[i] == ActualDevice();                            // avoid the actual device (in case of Transfer Mode)
-         imp <<= 1; imp |= device[i]->IsPrimaryDevice();                           // avoid the primary device
-         imp <<= 1; imp |= device[i]->HasDecoder();                                // avoid full featured cards
+         imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();        // avoid the Transfer Mode receiver device
          imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
          imp <<= 8; imp |= min(max(device[i]->ProvidesCa(Channel), 0), 0xFF);      // use the device that provides the lowest number of conditional access methods
+         imp <<= 1; imp |= device[i]->IsPrimaryDevice();                           // avoid the primary device
+         imp <<= 1; imp |= device[i]->HasDecoder();                                // avoid full featured cards
          if (imp < Impact) {
             // This device has less impact than any previous one, so we take it.
             Impact = imp;
diff --git a/plugin.c b/plugin.c
index 82cbd6925..40b449487 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.22 2006/04/17 09:20:05 kls Exp $
+ * $Id: plugin.c 1.23 2006/08/13 08:51:44 kls Exp $
  */
 
 #include "plugin.h"
@@ -15,6 +15,7 @@
 #include <time.h>
 #include "config.h"
 #include "interface.h"
+#include "thread.h"
 
 #define LIBVDR_PREFIX  "libvdr-"
 #define SO_INDICATOR   ".so."
@@ -137,6 +138,8 @@ void cPlugin::SetConfigDirectory(const char *Dir)
 const char *cPlugin::ConfigDirectory(const char *PluginName)
 {
   static char *buffer = NULL;
+  if (!cThread::IsMainThread())
+     esyslog("ERROR: plugin '%s' called cPlugin::ConfigDirectory(), which is not thread safe!", PluginName ? PluginName : "<no name given>");
   free(buffer);
   asprintf(&buffer, "%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
   return MakeDirs(buffer, true) ? buffer : NULL;
diff --git a/svdrp.c b/svdrp.c
index b2317527c..8ca8afd16 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.99 2006/08/06 09:17:58 kls Exp $
+ * $Id: svdrp.c 1.100 2006/08/12 09:09:55 kls Exp $
  */
 
 #include "svdrp.h"
@@ -120,7 +120,7 @@ int cSocket::Accept(void)
            close(newsock);
            newsock = -1;
            }
-        isyslog("connect from %s, port %hd - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
+        isyslog("connect from %s, port %hu - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
         }
      else if (errno != EINTR && errno != EAGAIN)
         LOG_ERROR;
diff --git a/tools.c b/tools.c
index 5869bf08d..8ec1e696b 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.119 2006/06/17 09:45:32 kls Exp $
+ * $Id: tools.c 1.120 2006/08/12 13:30:07 kls Exp $
  */
 
 #include "tools.h"
@@ -422,8 +422,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
                  }
               else {
                  LOG_ERROR_STR(buffer);
-                 free(buffer);
-                 return false;
+                 empty = false;
                  }
               free(buffer);
               }

From 0e310c57a4af9e3b3bc87816a60b01790e2c6b89 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 20 Aug 2006 18:00:00 +0200
Subject: [PATCH 151/307] =?UTF-8?q?Version=201.4.1-5=20-=20Replaced=20the?=
 =?UTF-8?q?=20"quick=20workaround=20for=20additional=20live=20audio=20PIDs?=
 =?UTF-8?q?"=20in=20=20=20cDvbDevice::SetChannelDevice()=20with=20an=20act?=
 =?UTF-8?q?ual=20solution=20in=20=20=20cDvbDevice::SetAudioTrackDevice()?=
 =?UTF-8?q?=20in=20order=20to=20prevent=20sticky=20PIDs=20in=20CAMs,=20=20?=
 =?UTF-8?q?=20which=20caused=20long=20switching=20times=20or=20completely?=
 =?UTF-8?q?=20blank=20screens=20when=20switching=20=20=20between=20encrypt?=
 =?UTF-8?q?ed=20channels=20on=20the=20same=20transponder=20(reported=20by?=
 =?UTF-8?q?=20Tomas=20Berglund).=20-=20Adapted=20cThread::ThreadId()=20to?=
 =?UTF-8?q?=20recent=20kernels=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-?=
 =?UTF-8?q?=20Added=20--remove-destination=20to=20the=20'cp'=20command=20f?=
 =?UTF-8?q?or=20binaries=20in=20the=20Makefile=20to=20=20=20avoid=20a=20cr?=
 =?UTF-8?q?ash=20in=20case=20a=20new=20version=20is=20installed=20on=20a?=
 =?UTF-8?q?=20running=20system=20(suggested=20=20=20by=20Petri=20Hintukain?=
 =?UTF-8?q?en).=20-=20Fixed=20handling=20"Ca=20Info"=20in=20case=20the=20C?=
 =?UTF-8?q?AM=20sends=20this=20again=20if=20the=20smart=20card=20is=20=20?=
 =?UTF-8?q?=20replaced=20with=20a=20different=20one.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |  7 +++++++
 HISTORY      | 14 ++++++++++++++
 Makefile     |  6 +++---
 ci.c         | 12 +++++++-----
 config.h     |  4 ++--
 dvbdevice.c  | 13 +++++++------
 thread.c     |  6 ++----
 7 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f19b4610d..ea619ca93 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1626,6 +1626,7 @@ Ville Skytt
  thread.c caused a compiler warning with g++ 4.1.1
  for fixing converting the port number in the "connect from..." log message of SVDRP
  for reporting that there are places where ntohs() is assigned to different types
+ for adapting cThread::ThreadId() to recent kernels
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1808,6 +1809,8 @@ Gavin Hamill <gdh@acentral.co.uk>
 Petri Hintukainen <Petri.Hintukainen@hut.fi>
  for suggesting to disable the use of "fadvise" in cUnbufferedFile because there
  have been several reports that it causes more problems than it solves
+ for suggesting to add --remove-destination to the 'cp' command for binaries in
+ the Makefile to avoid a crash in case a new version is installed on a running system
 
 Marcel Schaeben <mts280@gmx.de>
  for his "Easy Input" patch
@@ -1980,3 +1983,7 @@ Frank Schmirler <vdr@schmirler.de>
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
  it could record on the primary device as well
+
+Tomas Berglund <tomber@telia.com>
+ for reporting a problem with sticky PIDs in CAMs when switching between encrypted
+ channels on the same transponder
diff --git a/HISTORY b/HISTORY
index 6ba80d34a..29ba1e2ee 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4874,3 +4874,17 @@ Video Disk Recorder Revision History
   Oliver Endriss).
 - Added a log error message to cPlugin::ConfigDirectory() in case a plugin calls it
   from a separate thread (reported by Udo Richter).
+
+2006-08-20: Version 1.4.1-5
+
+- Replaced the "quick workaround for additional live audio PIDs" in
+  cDvbDevice::SetChannelDevice() with an actual solution in
+  cDvbDevice::SetAudioTrackDevice() in order to prevent sticky PIDs in CAMs,
+  which caused long switching times or completely blank screens when switching
+  between encrypted channels on the same transponder (reported by Tomas Berglund).
+- Adapted cThread::ThreadId() to recent kernels (thanks to Ville Skytt�).
+- Added --remove-destination to the 'cp' command for binaries in the Makefile to
+  avoid a crash in case a new version is installed on a running system (suggested
+  by Petri Hintukainen).
+- Fixed handling "Ca Info" in case the CAM sends this again if the smart card is
+  replaced with a different one.
diff --git a/Makefile b/Makefile
index 0a3dffac7..1d73b79d9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.94 2006/06/02 14:45:33 kls Exp $
+# $Id: Makefile 1.95 2006/08/20 10:44:22 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -201,7 +201,7 @@ install: install-bin install-conf install-doc install-plugins
 
 install-bin: vdr
 	@mkdir -p $(BINDIR)
-	@cp vdr runvdr $(BINDIR)
+	@cp --remove-destination vdr runvdr $(BINDIR)
 
 # Configuration files:
 
@@ -223,7 +223,7 @@ install-doc:
 
 install-plugins: plugins
 	@mkdir -p $(PLUGINLIBDIR)
-	@cp $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
+	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
 
 # Source documentation:
 
diff --git a/ci.c b/ci.c
index d1332dd4e..066acc27b 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.44 2006/08/12 10:14:27 kls Exp $
+ * $Id: ci.c 1.45 2006/08/20 11:38:33 kls Exp $
  */
 
 #include "ci.h"
@@ -985,6 +985,7 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
      switch (Tag) {
        case AOT_CA_INFO: {
             dbgprotocol("%d: <== Ca Info", SessionId());
+            numCaSystemIds = 0;
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             while (l > 1) {
@@ -992,13 +993,14 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                   dbgprotocol(" %04X", id);
                   d += 2;
                   l -= 2;
-                  if (numCaSystemIds < MAXCASYSTEMIDS) {
+                  if (numCaSystemIds < MAXCASYSTEMIDS)
                      caSystemIds[numCaSystemIds++] = id;
-                     caSystemIds[numCaSystemIds] = 0;
-                     }
-                  else
+                  else {
                      esyslog("ERROR: too many CA system IDs!");
+                     break;
+                     }
                   }
+            caSystemIds[numCaSystemIds] = 0;
             dbgprotocol("\n");
             }
             state = 2; // got ca info
diff --git a/config.h b/config.h
index 82c06c60e..8472210dd 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.265 2006/08/12 09:10:11 kls Exp $
+ * $Id: config.h 1.266 2006/08/14 09:49:22 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1-4"
+#define VDRVERSION  "1.4.1-5"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/dvbdevice.c b/dvbdevice.c
index 9ae8dfafb..fb8ec9381 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.159 2006/06/11 09:03:55 kls Exp $
+ * $Id: dvbdevice.c 1.160 2006/08/14 09:38:32 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -853,11 +853,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
-     //XXX quick workaround for additional live audio PIDs:
-     if (ciHandler) {
-        ciHandler->SetPid(Channel->Apid(1), true);
-        ciHandler->SetPid(Channel->Dpid(0), true);
-        }
      if (IsPrimaryDevice())
         AddPid(Channel->Tpid(), ptTeletext);
      CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schl��ler <marco@lordzodiac.de> this works
@@ -927,8 +922,14 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
      if (IS_AUDIO_TRACK(Type) || (IS_DOLBY_TRACK(Type) && SetAudioBypass(true))) {
         if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
            DetachAll(pidHandles[ptAudio].pid);
+           if (ciHandler)
+              ciHandler->SetPid(pidHandles[ptAudio].pid, false);
            pidHandles[ptAudio].pid = TrackId->id;
            SetPid(&pidHandles[ptAudio], ptAudio, true);
+           if (ciHandler) {
+              ciHandler->SetPid(pidHandles[ptAudio].pid, true);
+              ciHandler->StartDecrypting();
+              }
            }
         }
      else if (IS_DOLBY_TRACK(Type)) {
diff --git a/thread.c b/thread.c
index 1749fc1e0..8b6e58f41 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.56 2006/06/24 10:10:58 kls Exp $
+ * $Id: thread.c 1.57 2006/08/20 10:20:44 kls Exp $
  */
 
 #include "thread.h"
@@ -316,11 +316,9 @@ bool cThread::EmergencyExit(bool Request)
   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
 }
 
-_syscall0(pid_t, gettid)
-
 tThreadId cThread::ThreadId(void)
 {
-  return gettid();
+  return syscall(__NR_gettid);
 }
 
 void cThread::SetMainThreadId(void)

From 6d6df2fddd6da0ccc9fe9a9aa5526306e9db73d7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Aug 2006 18:00:00 +0200
Subject: [PATCH 152/307] Version 1.4.2 - Revoked the change to
 cDevice::GetDevice() that was introduced in version 1.4.1-2,   which made it
 prefer any device that's already receiving and doesn't require   detatching
 receivers. This change has caused some unwanted behavior, so further  
 testing is necessary.

---
 HISTORY       |  7 ++++++
 channels.conf | 66 +++++++++++++++++++++++++++------------------------
 config.h      |  6 ++---
 device.c      |  4 ++--
 4 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/HISTORY b/HISTORY
index 29ba1e2ee..b9ece60b9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4888,3 +4888,10 @@ Video Disk Recorder Revision History
   by Petri Hintukainen).
 - Fixed handling "Ca Info" in case the CAM sends this again if the smart card is
   replaced with a different one.
+
+2006-08-27: Version 1.4.2
+
+- Revoked the change to cDevice::GetDevice() that was introduced in version 1.4.1-2,
+  which made it prefer any device that's already receiving and doesn't require
+  detatching receivers. This change has caused some unwanted behavior, so further
+  testing is necessary.
diff --git a/channels.conf b/channels.conf
index 484040460..fb5c8ecd3 100644
--- a/channels.conf
+++ b/channels.conf
@@ -17,7 +17,7 @@ KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
 ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
 ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
-ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0
+ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:630:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
@@ -27,9 +27,9 @@ DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,91=rus,93=eng,94=ita,95=esl,98=por,99=deu:0:0:8004:1:1070:0
+EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
-Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:0:0:28707:1:1026:0
+Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:579:0:28707:1:1026:0
 Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
 BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
@@ -39,33 +39,35 @@ Eurosport;SES Astra:12226:hC34:S19.2E:27500:101+8190:103=deu:102:0:31200:1:1091:
 EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
 EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:204:0:28202:1:1073:0
 EinsPlus;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
-ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:130:0:28016:1:1079:0
-ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0
+ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:630:0:28016:1:1079:0
+ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:630:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1722,1801,1702:8:133:2:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1801,1702:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1722,1801,1702:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1722,1801,1702:9:133:2:0
-PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1801,1702:29:133:2:0
-PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1722,1801,1702:41:133:2:0
-PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1702,1801,1722:20:133:2:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1722,1801,1702:34:133:17:0
+PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1801,1702,1722:8:133:1:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1801,1722,1702:9:133:2:0
+PREMIERE SERIE,SERIE;PREMIERE:11797:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1801,1702,1722:16:133:2:0
+PREMIERE KRIMI,KRIMI;PREMIERE:11797:hC34:S19.2E:27500:2815:2816=deu:32:1702,1801,1722:23:133:2:0
+PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11719:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:516:133:3:0
+PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:41:133:3:0
+PREMIERE FILMFEST,FILMFEST;PREMIERE:11719:hC34:S19.2E:27500:1279:1280=deu:32:1801,1702,1722:20:133:3:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
-BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1722,1702,1801:21:133:17:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
+BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1702,1722,1801:21:133:17:0
+EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1801,1702,1722,1810:513:133:4:0
 :Sportsworld
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1722,1801,1702:17:133:3:0
-PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
+PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1722,1801,1702:17:133:3:0
+Live Wetten:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-m�nchen.TV/RFO,m�TV/RFO;BetaDigital:12148:hC34:S19.2E:27500:495:496:0:0:658:133:7:0
+m�nchen.TV/RFO,m�TV/RFO;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
 ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
@@ -73,17 +75,17 @@ ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:
 FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
 LCP;ABSAT:12285:vC34:S19.2E:27500:167:108:0:0:17027:1:1094:0
 ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
-Best of Shopping;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
+BEST OF SHOPPING;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
 ASTRA-Mosaic;SES ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
 ASTRA-Mosaic 2;SES ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
 ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
 ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
-RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=eng,146=fra,151=ltz:0:0:3994:1:1108:0
+RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=ltz,146=fra:74:0:3994:1:1108:0
 Nick/Talpa;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 NICK;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
-MTV Central;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
+Service 3;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 VIVA;MTV Networks:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
 VIVA PLUS;MTV Networks:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
@@ -92,8 +94,8 @@ TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 Venevision;T-Systems/MTI:11200:vC56:S13.0E:27500:922:923=und:0:0:4750:0:13400:0
 EBC.1;T-Systems/MTI:11200:vC56:S13.0E:27500:373:374=eng:0:0:4747:0:13400:0
 :HDTV
-HDFORUM;TF1:11242:vC34:S13.0E:27500:33:36=fra:0:0:13809:100:200:0
-HDFORUM;TF1:11242:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
+HDFORUM;TF1:11242:vC34:S13.0E:27500:0:36=fra:0:0:13809:100:200:0
+HD FORUM;EUTELSAT:11240:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
 Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
 Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
 SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
@@ -105,12 +107,12 @@ C MORE HD;Telenor:11389:hC78:S1.0W:24500:512:640;641=eng:0:B00:3306:70:34:0
 HELLAS-HDTV;Scopus Network Technologies:11642:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
 TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:0
 :@201 Sky
-Sky One;BSkyB:12226:hC23:S28.2E:27500:515+8190:643=eng:579:960,961:4705:2:2027:0
+Sky One;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4703:2:2030:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10758:vC56:S28.2E:22000:2314:2315=eng,2363=NAR:2317:0:10070:2:2044:0
+ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2350=eng,2352=NAR:2354:0:10070:2:2044:0
 SCI FI;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
 ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
-Paramount;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
+ParaComedy 1;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;666=eng:582:960,961:4303:2:2007:0
@@ -127,12 +129,14 @@ Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
 WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
-Animal Plnt+;BSkyB:12070:hC23:S28.2E:27500:2315+2307:2316=eng:0:960,961:50002:2:2019:0
+Animal Plnt+1;BSkyB:12070:hC23:S28.2E:27500:514+8190:662=eng:0:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
 CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
-IGLESIA MME;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
-eng-WRN-multi;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
+MTI;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
+WRN Eng AAP;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
+Dr Dish TV;Overon:12359:hC34:S13.0E:27500:4231:4232=eng:0:0:14023:318:8300:0
+! LifeStyle-TV !;T-Systems:12633:hC56:S19.2E:22000:204:304=deu:0:0:12603:1:1113:0
 Challenger Tv;Telespazio:11295:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
-TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:3:1:65535:1:0
+TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:0:1:65535:1:0
 :@1000 New channels
diff --git a/config.h b/config.h
index 8472210dd..4a4cbb20d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.266 2006/08/14 09:49:22 kls Exp $
+ * $Id: config.h 1.267 2006/08/26 14:16:34 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1-5"
-#define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.4.2"
+#define VDRVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/device.c b/device.c
index a1a1d6984..c17cb0b58 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.135 2006/08/12 11:33:34 kls Exp $
+ * $Id: device.c 1.136 2006/08/26 14:11:03 kls Exp $
  */
 
 #include "device.h"
@@ -292,7 +292,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
          // to their individual severity, where the one listed first will make the most
          // difference, because it results in the most significant bit of the result.
          uint imp = 0;
-         imp <<= 1; imp |= !device[i]->Receiving(true) || ndr;                     // use receiving devices if we don't need to detach existing receivers
+         imp <<= 1; imp |= !device[i]->Receiving() || ndr;                         // use receiving devices if we don't need to detach existing receivers
          imp <<= 1; imp |= device[i]->Receiving();                                 // avoid devices that are receiving
          imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();        // avoid the Transfer Mode receiver device
          imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)

From c49ca5abb73cbc11447da5d961e106025dc927d0 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Sep 2006 18:00:00 +0200
Subject: [PATCH 153/307] Version 1.4.2-1 - Added LC_ALL to the checks for
 UTF-8 at startup (suggested by Matthias Schwarzott). - Fixed the
 cTimer::operator=() so that it won't mess up the cListObject's pointers  
 (reported by Alexander Rieger). - Fixed a memory leak in the
 cTimer::operator=() when using the 'aux' string   (reported by Alexander
 Rieger). - Fixed processing the PDCDescriptor in 'libsi' on big endian
 systems (thanks to   Martin Ostermann). - Fixed handling relative volume
 settings that unmute the audio in the call to   cStatus::MsgSetVolume()
 (reported by Oliver Endriss).

---
 CONTRIBUTORS    | 10 ++++++++++
 HISTORY         | 12 ++++++++++++
 config.h        |  4 ++--
 device.c        |  3 ++-
 libsi/headers.h |  8 +-------
 timers.c        | 23 ++++++++++++++++++-----
 vdr.c           |  3 ++-
 7 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea619ca93..2315e54db 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -640,6 +640,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting a problem in extracting APIVERSION with older versions of 'sed'
  for fixing broken APIVERSION extraction line in 'newplugin'
  for making VDR no longer stop removing empty directories if an error occurs
+ for reporting a bug in handling relative volume settings that unmute the audio in
+ the call to cStatus::MsgSetVolume()
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1737,6 +1739,8 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for fixing a typo in skins.h
  for making cSkins::QueueMessage() called from a background thread with an empty
  message clears all messages that have been previously queued by that thread
+ for reporting that the cTimer::operator=() messes up the cListObject's pointers
+ for reporting a memory leak in the cTimer::operator=() when using the 'aux' string
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
@@ -1987,3 +1991,9 @@ J
 Tomas Berglund <tomber@telia.com>
  for reporting a problem with sticky PIDs in CAMs when switching between encrypted
  channels on the same transponder
+
+Matthias Schwarzott <zzam@gentoo.org>
+ for suggesting to add LC_ALL to the checks for UTF-8 at startup
+
+Martin Ostermann <martin@familie-ostermann.de>
+ for fixing processing the PDCDescriptor in 'libsi' on big endian systems
diff --git a/HISTORY b/HISTORY
index b9ece60b9..9fcbe4507 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4895,3 +4895,15 @@ Video Disk Recorder Revision History
   which made it prefer any device that's already receiving and doesn't require
   detatching receivers. This change has caused some unwanted behavior, so further
   testing is necessary.
+
+2006-09-03: Version 1.4.2-1
+
+- Added LC_ALL to the checks for UTF-8 at startup (suggested by Matthias Schwarzott).
+- Fixed the cTimer::operator=() so that it won't mess up the cListObject's pointers
+  (reported by Alexander Rieger).
+- Fixed a memory leak in the cTimer::operator=() when using the 'aux' string
+  (reported by Alexander Rieger).
+- Fixed processing the PDCDescriptor in 'libsi' on big endian systems (thanks to
+  Martin Ostermann).
+- Fixed handling relative volume settings that unmute the audio in the call to
+  cStatus::MsgSetVolume() (reported by Oliver Endriss).
diff --git a/config.h b/config.h
index 4a4cbb20d..d1d4e2e17 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.267 2006/08/26 14:16:34 kls Exp $
+ * $Id: config.h 1.268 2006/09/01 12:59:35 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.2"
+#define VDRVERSION  "1.4.2-1"
 #define VDRVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/device.c b/device.c
index c17cb0b58..0fb4fc755 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.136 2006/08/26 14:11:03 kls Exp $
+ * $Id: device.c 1.137 2006/09/03 10:13:25 kls Exp $
  */
 
 #include "device.h"
@@ -779,6 +779,7 @@ void cDevice::SetVolume(int Volume, bool Absolute)
   int OldVolume = volume;
   volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
   SetVolumeDevice(volume);
+  Absolute |= mute;
   cStatus::MsgSetVolume(Absolute ? volume : volume - OldVolume, Absolute);
   if (volume > 0) {
      mute = false;
diff --git a/libsi/headers.h b/libsi/headers.h
index afa3106d1..ea7824bc8 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.7 2006/05/28 14:25:30 kls Exp $
+ *   $Id: headers.h 1.8 2006/09/02 20:25:16 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -1534,15 +1534,9 @@ struct descr_dsng {
 struct descr_pdc {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-#if BYTE_ORDER == BIG_ENDIAN
-   u_char pil2                                   :8;
-   u_char pil1                                   :8;
-   u_char pil0                                   :8;
-#else
    u_char pil0                                   :8;
    u_char pil1                                   :8;
    u_char pil2                                   :8;
-#endif
 };
 
 /* 0x6A ac3_descriptor */
diff --git a/timers.c b/timers.c
index 8bc0b324a..d8d00168d 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.62 2006/08/05 12:03:36 kls Exp $
+ * $Id: timers.c 1.63 2006/09/02 10:20:36 kls Exp $
  */
 
 #include "timers.h"
@@ -90,11 +90,24 @@ cTimer::~cTimer()
 
 cTimer& cTimer::operator= (const cTimer &Timer)
 {
-  memcpy(this, &Timer, sizeof(*this));
-  if (aux)
-     aux = strdup(aux);
-  event = NULL;
+  startTime    = Timer.startTime;
+  stopTime     = Timer.stopTime;
   lastSetEvent = 0;
+  recording    = Timer.recording;
+  pending      = Timer.pending;
+  inVpsMargin  = Timer.inVpsMargin;
+  flags        = Timer.flags;
+  channel      = Timer.channel;
+  day          = Timer.day;
+  weekdays     = Timer.weekdays;
+  start        = Timer.start;
+  stop         = Timer.stop;
+  priority     = Timer.priority;
+  lifetime     = Timer.lifetime;
+  strncpy(file, Timer.file, sizeof(file));
+  free(aux);
+  aux = Timer.aux ? strdup(Timer.aux) : NULL;
+  event = NULL;
   return *this;
 }
 
diff --git a/vdr.c b/vdr.c
index 436bfada8..46d65c843 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.278 2006/08/05 10:46:38 kls Exp $
+ * $Id: vdr.c 1.279 2006/09/01 12:57:44 kls Exp $
  */
 
 #include <getopt.h>
@@ -450,6 +450,7 @@ int main(int argc, char *argv[])
   // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
   char *LangEnv;
   if ((LangEnv = getenv("LANG"))     != NULL && strcasestr(LangEnv, "utf") ||
+      (LangEnv = getenv("LC_ALL"))   != NULL && strcasestr(LangEnv, "utf") ||
       (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
      fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
      return 2;

From 0b99b3aac10e38d624488978641d66fae3f41a28 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 9 Sep 2006 18:00:00 +0200
Subject: [PATCH 154/307] Version 1.4.2-2 - Fixed cTimer::operator=() in case a
 cTimer variable is assigned to itself (thanks   to Alexander Rieger). -
 Implemented a copy constructor for cTimer (thanks to Udo Richter for
 reporting that   an assignment in svdrp.c didn't use the
 cTimer::operator=()).

---
 CONTRIBUTORS |  2 ++
 HISTORY      |  7 +++++++
 config.h     |  8 ++++----
 timers.c     | 48 +++++++++++++++++++++++++++++-------------------
 timers.h     |  3 ++-
 5 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2315e54db..78413683e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1465,6 +1465,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing getting the next active timer when shutting down
  for reporting a problem with cPlugin::ConfigDirectory() in case a plugin calls it
  from a separate thread
+ for reporting that an assignment in svdrp.c didn't use the cTimer::operator=())
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1741,6 +1742,7 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  message clears all messages that have been previously queued by that thread
  for reporting that the cTimer::operator=() messes up the cListObject's pointers
  for reporting a memory leak in the cTimer::operator=() when using the 'aux' string
+ for fixing cTimer::operator=() in case a cTimer variable is assigned to itself
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 9fcbe4507..1e4a553d1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4907,3 +4907,10 @@ Video Disk Recorder Revision History
   Martin Ostermann).
 - Fixed handling relative volume settings that unmute the audio in the call to
   cStatus::MsgSetVolume() (reported by Oliver Endriss).
+
+2006-09-09: Version 1.4.2-2
+
+- Fixed cTimer::operator=() in case a cTimer variable is assigned to itself (thanks
+  to Alexander Rieger).
+- Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that
+  an assignment in svdrp.c didn't use the cTimer::operator=()).
diff --git a/config.h b/config.h
index d1d4e2e17..8e3ec8d0d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.268 2006/09/01 12:59:35 kls Exp $
+ * $Id: config.h 1.269 2006/09/04 17:44:12 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.2-1"
+#define VDRVERSION  "1.4.2-2"
 #define VDRVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.4.2"
-#define APIVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.4.3"
+#define APIVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/timers.c b/timers.c
index d8d00168d..18dab0ff3 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.63 2006/09/02 10:20:36 kls Exp $
+ * $Id: timers.c 1.64 2006/09/08 15:06:09 kls Exp $
  */
 
 #include "timers.h"
@@ -83,6 +83,14 @@ cTimer::cTimer(const cEvent *Event)
   event = NULL; // let SetEvent() be called to get a log message
 }
 
+cTimer::cTimer(const cTimer &Timer)
+{
+  channel = NULL;
+  aux = NULL;
+  event = NULL;
+  *this = Timer;
+}
+
 cTimer::~cTimer()
 {
   free(aux);
@@ -90,24 +98,26 @@ cTimer::~cTimer()
 
 cTimer& cTimer::operator= (const cTimer &Timer)
 {
-  startTime    = Timer.startTime;
-  stopTime     = Timer.stopTime;
-  lastSetEvent = 0;
-  recording    = Timer.recording;
-  pending      = Timer.pending;
-  inVpsMargin  = Timer.inVpsMargin;
-  flags        = Timer.flags;
-  channel      = Timer.channel;
-  day          = Timer.day;
-  weekdays     = Timer.weekdays;
-  start        = Timer.start;
-  stop         = Timer.stop;
-  priority     = Timer.priority;
-  lifetime     = Timer.lifetime;
-  strncpy(file, Timer.file, sizeof(file));
-  free(aux);
-  aux = Timer.aux ? strdup(Timer.aux) : NULL;
-  event = NULL;
+  if (&Timer != this) {
+     startTime    = Timer.startTime;
+     stopTime     = Timer.stopTime;
+     lastSetEvent = 0;
+     recording    = Timer.recording;
+     pending      = Timer.pending;
+     inVpsMargin  = Timer.inVpsMargin;
+     flags        = Timer.flags;
+     channel      = Timer.channel;
+     day          = Timer.day;
+     weekdays     = Timer.weekdays;
+     start        = Timer.start;
+     stop         = Timer.stop;
+     priority     = Timer.priority;
+     lifetime     = Timer.lifetime;
+     strncpy(file, Timer.file, sizeof(file));
+     free(aux);
+     aux = Timer.aux ? strdup(Timer.aux) : NULL;
+     event = NULL;
+     }
   return *this;
 }
 
diff --git a/timers.h b/timers.h
index 8abc5238e..e3d5450a5 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.28 2006/04/08 12:41:44 kls Exp $
+ * $Id: timers.h 1.29 2006/09/04 17:07:39 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -44,6 +44,7 @@ class cTimer : public cListObject {
 public:
   cTimer(bool Instant = false, bool Pause = false, cChannel *Channel = NULL);
   cTimer(const cEvent *Event);
+  cTimer(const cTimer &Timer);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
   virtual int Compare(const cListObject &ListObject) const;

From d495ed1a3e51fbb0fa0704cdb048a385be2b6a9b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Sep 2006 18:00:00 +0200
Subject: [PATCH 155/307] Version 1.4.2-3 - Added --remove-destination to the
 'cp' command for binaries in the Makefiles of   the plugins (thanks to Rolf
 Ahrenberg). - The 'skincurses' plugin now adjusts the size of the OSD to the
 size of the console   window. - Fixed deleting expired VPS timers (under
 certain conditions a timer could have been   deleted before it even started
 recording). - Updated the Hungarian language texts (thanks to Istvan
 Koenigsberger and Guido Josten). - Fixed handling video directory updates in
 case the timestamp of the .update file   is in the future (thanks to Petri
 Hintukainen).

---
 CONTRIBUTORS                        |   4 +
 HISTORY                             |  12 +++
 PLUGINS/src/hello/Makefile          |   4 +-
 PLUGINS/src/osddemo/Makefile        |   4 +-
 PLUGINS/src/servicedemo/Makefile    |   6 +-
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/Makefile     |   4 +-
 PLUGINS/src/skincurses/skincurses.c |  17 +--
 PLUGINS/src/sky/Makefile            |   4 +-
 PLUGINS/src/status/Makefile         |   4 +-
 PLUGINS/src/svdrpdemo/Makefile      |   4 +-
 config.h                            |   4 +-
 i18n.c                              | 160 ++++++++++++++--------------
 newplugin                           |   4 +-
 recording.c                         |   7 +-
 timers.c                            |  10 +-
 16 files changed, 137 insertions(+), 115 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 78413683e..6d8533629 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1006,6 +1006,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a bug in handling empty titles in cEvent::FixEpgBugs()
  for suggesting to replace the "Really restart?" prompt in the call to
  cPluginManager::Active() in menu.c to "restart anyway?"
+ for adding --remove-destination to the 'cp' command for binaries in the Makefiles of
+ the plugins
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1817,6 +1819,8 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
  have been several reports that it causes more problems than it solves
  for suggesting to add --remove-destination to the 'cp' command for binaries in
  the Makefile to avoid a crash in case a new version is installed on a running system
+ for fixing handling video directory updates in case the timestamp of the .update
+ file is in the future
 
 Marcel Schaeben <mts280@gmx.de>
  for his "Easy Input" patch
diff --git a/HISTORY b/HISTORY
index 1e4a553d1..784a05623 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4914,3 +4914,15 @@ Video Disk Recorder Revision History
   to Alexander Rieger).
 - Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that
   an assignment in svdrp.c didn't use the cTimer::operator=()).
+
+2006-09-17: Version 1.4.2-3
+
+- Added --remove-destination to the 'cp' command for binaries in the Makefiles of
+  the plugins (thanks to Rolf Ahrenberg).
+- The 'skincurses' plugin now adjusts the size of the OSD to the size of the console
+  window.
+- Fixed deleting expired VPS timers (under certain conditions a timer could have been
+  deleted before it even started recording).
+- Updated the Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten).
+- Fixed handling video directory updates in case the timestamp of the .update file
+  is in the future (thanks to Petri Hintukainen).
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index cefc33310..8deaeaa87 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.14 2006/04/24 17:20:58 kls Exp $
+# $Id: Makefile 1.15 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index f0b130630..716388875 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2006/04/24 17:21:00 kls Exp $
+# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index e44af0b19..a18f99504 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2006/06/24 09:09:54 kls Exp $
+# $Id: Makefile 1.8 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -69,11 +69,11 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index c58423df6..96ff93c82 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -35,3 +35,7 @@ VDR Plugin 'skincurses' Revision History
 - Fixed handling tabbed item display.
 - When the 'skincurses' plugin is loaded, it automatically sets the 'curses'
   skin as the current one.
+
+2006-09-10: Version 0.0.8
+
+- The size of the OSD is now adjusted to the size of the console window.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 05c5e0539..4f83614f8 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/24 17:21:02 kls Exp $
+# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index a75375b57..243ddcecd 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.10 2006/06/03 14:20:39 kls Exp $
+ * $Id: skincurses.c 1.11 2006/09/10 14:23:55 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.0.8";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -53,8 +53,8 @@ static int clrMessage[] = {
   clrRed
   };
 
-#define OsdWidth  50//XXX
-#define OsdHeight 20//XXX
+static int OsdWidth = 50;
+static int OsdHeight = 20;
 
 class cCursesOsd : public cOsd {
 private:
@@ -780,8 +780,13 @@ bool cPluginSkinCurses::ProcessArgs(int argc, char *argv[])
 bool cPluginSkinCurses::Initialize(void)
 {
   // Initialize any background activities the plugin shall perform.
-  initscr();
-  return true;
+  WINDOW *w = initscr();
+  if (w) {
+     OsdWidth  = w->_maxx - w->_begx + 1;
+     OsdHeight = w->_maxy - w->_begy + 1;
+     return true;
+     }
+  return false;
 }
 
 bool cPluginSkinCurses::Start(void)
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 6b43441c0..63a647c47 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2006/04/24 17:21:03 kls Exp $
+# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 8cca7596b..1985ab03a 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.12 2006/04/24 17:21:04 kls Exp $
+# $Id: Makefile 1.13 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index a191d513c..8c0f42e35 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2006/04/24 17:21:06 kls Exp $
+# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/config.h b/config.h
index 8e3ec8d0d..ad0e4a789 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.269 2006/09/04 17:44:12 kls Exp $
+ * $Id: config.h 1.270 2006/09/10 14:09:31 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.2-2"
+#define VDRVERSION  "1.4.2-3"
 #define VDRVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/i18n.c b/i18n.c
index d1882c8f2..34c81f625 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.281 2006/05/05 13:26:09 kls Exp $
+ * $Id: i18n.c 1.282 2006/09/16 09:08:30 kls Exp $
  *
  * Translations provided by:
  *
@@ -20,7 +20,7 @@
  * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
  * Swedish     Tomas Prybil <tomas@prybil.se>, Jan Ekholm <chakie@infa.abo.fi>
  * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
- * Hungarian   Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
+ * Hungarian   Istvan & Silvia Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
  * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com>, Jordi Vil� <jvila@tinet.org>
  * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>, Oleg Roitburd <oleg@roitburd.de>
  * Croatian    Drazen Dupor <drazen.dupor@dupor.com>, Dino Ravnic <dino.ravnic@fer.hr>
@@ -231,7 +231,7 @@ const tI18nPhrase Phrases[] = {
     "��������������������",
     "Timers",
     "Timer-e",
-    "Felv�tel beprogramoz�sa",
+    "Id�z�t�",
     "Temporitzadors",
     "�������",
     "Termini",
@@ -275,7 +275,7 @@ const tI18nPhrase Phrases[] = {
     "����������� E�������",
     "Inspelning",
     "Detaliile �nregistr�rii",
-    "",// TODO
+    "Felv�tel",
     "",// TODO
     "���� � ������",
     "",// TODO
@@ -385,7 +385,7 @@ const tI18nPhrase Phrases[] = {
     "����������� ��������������������",
     "�ndra timer",
     "Modificare timer",
-    "Felv�tel beprogramoz�s�nak megv�ltoztat�sa",
+    "Id�z�t� megv�ltoztat�sa",
     "Editar temporitzador",
     "��������� �������",
     "Ure�ivanje termina",
@@ -429,7 +429,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Info",
     "Info",
-    "",//TODO
+    "Inform�ci�",
     "",//TODO
     "����",
     "Info",
@@ -473,7 +473,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Den h�r s�ndningen - %s",
     "Aceast� emisiune - %s",
-    "",//TODO
+    "Ez az ad�s - %s",
     "",//TODO
     "��� �������� - %s",
     "",//TODO
@@ -495,7 +495,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Den h�r s�ndningen - alla kanaler",
     "Aceast� emisiune - toate canalele",
-    "",//TODO
+    "Ez az ad�s - �sszes ad�",
     "",//TODO
     "��� �������� - ��� ������",
     "",//TODO
@@ -517,7 +517,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Alla tillf�llen - alla kanaler",
     "Toate emisiunile - toate canalele",
-    "",//TODO
+    "Az �sszes ad�s - az �sszes ad�",
     "",//TODO
     "��� �������� - ��� ������",
     "",//TODO
@@ -694,7 +694,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Timer",
     "Timer",
-    "",// TODO
+    "Id�z�t�",
     "",// TODO
     "������",
     "",// TODO
@@ -738,7 +738,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Info",
     "Info",
-    "",//TODO
+    "Inform�ci�",
     "",//TODO
     "����",
     "Info",
@@ -1090,7 +1090,7 @@ const tI18nPhrase Phrases[] = {
     "������",
     "Skanna",
     "C�utare canale",
-    "",//TODO
+    "Ad�skeres�s",
     "",//TODO
     "�����������",
     "Pretra�i",
@@ -1112,7 +1112,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Ljud",
     "Sunet",
-    "",// TODO
+    "Hang",
     "",// TODO
     "����",
     "",// TODO
@@ -1157,7 +1157,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��������������������;?",
     "Ta bort timern?",
     "�terg timer-ul?",
-    "Felv�tel beprogramoz�s�nak t�rl�se?",
+    "Id�z�t� t�rl�se?",
     "Esborrar el temporitzador?",
     "������� ������?",
     "Obrisati termin?",
@@ -1708,7 +1708,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Okodad",
     "FTA (necriptat)",
-    "",//TODO
+    "K�dolatlan",
     "",//TODO
     "FTA (��������������)",
     "",//TODO
@@ -1730,7 +1730,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "krypterad",
     "criptat",
-    "",//TODO
+    "K�dolt",
     "",//TODO
     "������������",
     "",//TODO
@@ -2061,7 +2061,7 @@ const tI18nPhrase Phrases[] = {
     "VPS",
     "VPS",
     "VPS",
-    "",// TODO
+    "VPS",
     "",// TODO
     "VPS ��������",
     "VPS", // hrv
@@ -2172,7 +2172,7 @@ const tI18nPhrase Phrases[] = {
     "�� ������ ��������������� ��� �������������������!",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
-    "Csatorn�t m�s haszn�lja!",
+    "Az ad�t az id�z�t� haszn�lja!",
     "Canal en �s per un temporitzador!",
     "����� ����� ��������!",
     "Program je trenutno zauzet terminom za snimanje",
@@ -2194,7 +2194,7 @@ const tI18nPhrase Phrases[] = {
     "������ �������� �������!",
     "Om�jligt att byta kanal!",
     "Nu pot comuta canalul!",
-    "Csatorn�t nem lehet �tkapcsolni!",
+    "Az ad�t nem lehet elkapcsolni",
     "No puc canviar de canal!",
     "���������� ����������� �����!",
     "Ne mogu prebaciti program!",
@@ -2304,7 +2304,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "strax VPS inspelning...",
     "Urmeaz� o �nregistrare VPS!",
-    "",//TODO
+    "VPS-felv�tel r�gt�n kezd�dik!",
     "",//TODO
     "VPS-������ ����� ��������",
     "",//TODO
@@ -2348,7 +2348,7 @@ const tI18nPhrase Phrases[] = {
     "�� ������ ��� ����� ���������!",
     "Kanalen �r inte tillg�nglig!",
     "Canal indisponibil",
-    "A csatorna nem el�rhet�",
+    "Az ad� nem el�rhet�",
     "Canal no disponible!",
     "����� ����������!",
     "Program nije dostupan!",
@@ -2370,7 +2370,7 @@ const tI18nPhrase Phrases[] = {
     "�� ��������� ��� �������� ����������������!",
     "Kanalinst�llningarna �r ej unika!",
     "Parametrii canalului nu sunt univoci!",
-    "A csatornabe�ll�t�sok nem egy�rtelm�ek",
+    "Az ad�be�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
     "��������� ������ �� ���������!",
     "Parametri programa nisu jednozna�ni!",
@@ -2392,7 +2392,7 @@ const tI18nPhrase Phrases[] = {
     "�� ������ ����� ������������ (������ �������)!",
     "Kanalen �r l�st (inspelning p�g�r)!",
     "Canal blocat (�nregistrare)!",
-    "Csatorna hozz�f�rhetetlen (felv�tel)!",
+    "Az ad� blokkolva (felv�tel)!",
     "Canal bloquejat (gravant)!",
     "����� ������������ (���� ������)!",
     "Program blokiran (snimanje)!",
@@ -2524,7 +2524,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Otillr�cklingt diskutrymme f�r inspelning!",
     "Insuficient spa�iul pe disc pentru �nregistrare!",
-    "",//TODO
+    "Nincs elegend� hely a felv�telre",
     "",//TODO
     "������������ ����� �� ����� ��� ������ ������",
     "",//TODO
@@ -2568,7 +2568,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "�ppnar CAM menyn...",
     "Deschid meniul CAM...",
-    "",//TODO
+    "A CAM-men� nyit�s alatt...",
     "",//TODO
     "�������� ���� ������ ��������� ������� (CAM)",
     "",//TODO
@@ -2612,7 +2612,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "�terst�ller CAM ...",
     "Se reseteaz� CAM...",
-    "",//TODO
+    "A CAM �jra indul...",
     "",//TODO
     "���������� CAM...",
     "",//TODO
@@ -2678,7 +2678,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Mata in %d siffror!",
     "V� rog introduce�i %d cifre!",
-    "",//TODO
+    "�ss�n be %d sz�mot!",
     "",//TODO
     "������� %d �����",
     "",//TODO
@@ -2700,7 +2700,7 @@ const tI18nPhrase Phrases[] = {
     "�� ���������� ����",
     "Ljud saknas!",
     "Lipse�te sunetul!",
-    "",//TODO
+    "Hang nem lehets�ges!",
     "",//TODO
     "����������� ����!",
     "Audio nedostupan",
@@ -2988,7 +2988,7 @@ const tI18nPhrase Phrases[] = {
     "���������",
     "Skin",
     "Skin",
-    "",// TODO
+    "Men� n�zet",
     "",// TODO
     "�����",
     "Povr�ina",
@@ -3010,7 +3010,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Tema",
     "Tem�",
-    "",// TODO
+    "T�ma",
     "",// TODO
     "�������",
     "Tema",
@@ -3032,7 +3032,7 @@ const tI18nPhrase Phrases[] = {
     "��������",
     "V�nster",
     "St�nga",
-    "",// TODO
+    "Balra",
     "",// TODO
     "������ �����",
     "Lijevo",
@@ -3054,7 +3054,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "�vre",
     "Sus",
-    "",// TODO
+    "Fent",
     "",// TODO
     "������ ������",
     "Gore",
@@ -3142,7 +3142,7 @@ const tI18nPhrase Phrases[] = {
     "������������� ������ ��������������",
     "Anv�nd liten font",
     "Utilizare fonturi mici",
-    "",// TODO
+    "Kisbet�t haszn�lni",
     "",// TODO
     "������������ ������ �����",
     "Koristi mala slova",
@@ -3164,7 +3164,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "aldrig",
     "niciodat�",
-    "",// TODO
+    "soha",
     "",// TODO
     "�������",
     "nikada",
@@ -3186,7 +3186,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��� ��� ���������",
     "skin beroende",
     "dep. de skin",
-    "",// TODO
+    "Men� n�zet�t�l f�gg�en",
     "",// TODO
     "�������� ����",
     "ovisno o povr�ini",
@@ -3208,7 +3208,7 @@ const tI18nPhrase Phrases[] = {
     "�����",
     "alltid",
     "�ntotdeauna",
-    "",// TODO
+    "mindig",
     "",// TODO
     "������",
     "uvijek",
@@ -3230,7 +3230,7 @@ const tI18nPhrase Phrases[] = {
     "���� ����������� ��������",
     "Placering av kanalinformation",
     "Pozi�ia informa�iilor despre canal",
-    "Csatorna-Inf� pozici�ja",
+    "Ad�sinform�ci� pozici�ja",
     "Posici� de la informaci� del canal",
     "��������� ���� ���������� � ������",
     "Pozicija informacije o programu",
@@ -3252,7 +3252,7 @@ const tI18nPhrase Phrases[] = {
     "������ ��������� ����������� �������� �� (�)",
     "Kanal information (s)",
     "Durata afi��rii info-canal (s)",
-    "",// TODO
+    "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)",
     "",// TODO
     "����� ���������� � ������ (���)",
     "Vrijeme prikaza informacije o programu (s)",
@@ -3274,7 +3274,7 @@ const tI18nPhrase Phrases[] = {
     "����������� ���� ������ ��������",
     "Information vid kanalbyte",
     "Informa�ii la comutarea canalului",
-    "Inf� a csatorna v�lt�s�n�l",
+    "Inform�ci� az ad� v�lt�s�n�l",
     "Informaci� del canvi de canal",
     "���������� ���������� � ������",
     "Informacije kod promjene kanala",
@@ -3296,7 +3296,7 @@ const tI18nPhrase Phrases[] = {
     "", // TODO
     "Timeout f�r kanalinformation",
     "Durata afi��rii informa�ii canal",
-    "", // TODO
+    "A lek�rdezett ad�sinform�ci� bez�r�sa",
     "", // TODO
     "���������� � ������ �������",
     "", // TODO
@@ -3340,7 +3340,7 @@ const tI18nPhrase Phrases[] = {
     "������ ����-����",
     "Rulla texten",
     "Derulare circular�",
-    "",// TODO
+    "Korl�tlan l�ptet�s",
     "",// TODO
     "����������� ���������",
     "S kraja sko�i na po�etak",
@@ -3362,7 +3362,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Menyknappen st�nger",
     "Tasta 'Meniu' �nchide",
-    "",// TODO
+    "A men� gomb z�r",
     "",// TODO
     "������ ���� �������",
     "",// TODO
@@ -3406,7 +3406,7 @@ const tI18nPhrase Phrases[] = {
     "������ ��������� �������� EPG �� ����",
     "EPG s�kning timeout",
     "Interval achizi�ie EPG (h)",
-    "Fennmaradt id� az EPG-g (h)",
+    "Fennmaradt id� az EPG-�j�t�sig (h)",
     "M�xim d'Hores a cercar per la Guia",
     "�������� ������������ �������� (�)",
     "Vrijeme do EPG pregleda (h)",
@@ -3450,7 +3450,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������������ ����������� (�����)",
     "Visa gammal information (min)",
     "Date EPG expirate cel mult (min)",
-    "",// TODO
+    "R�gi EPG adatok megmutat�sa (perc)",
     "",// TODO
     "�������� ���������� ������ (���)",
     "Prika�i stare EPG podatke (min)",
@@ -3516,7 +3516,7 @@ const tI18nPhrase Phrases[] = {
     "������������� �������",
     "�nskade spr�k",
     "Limbi preferate",
-    "",// TODO
+    "Kedvenc nyelvek",
     "",// TODO
     "�������������� ����� (�������)",
     "Preferirani jezici",
@@ -3538,7 +3538,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ������",
     "�nskat spr�k",
     "Limba preferat�",
-    "",// TODO
+    "Kedvenc nyelv",
     "",// TODO
     "������",
     "Preferirani jezik",
@@ -3692,7 +3692,7 @@ const tI18nPhrase Phrases[] = {
     "����� ���� Dolby Digital",
     "Anv�nd Dolby Digital",
     "Sunet Dolby Digital",
-    "",//TODO
+    "Dolby-Digital hangot haszn�lni",
     "",//TODO
     "�������� Dolby Digital",
     "Koristi Dolby Digital",
@@ -3714,7 +3714,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ��������",
     "Uppdatera kanaler",
     "Actualizare canale",
-    "",// TODO
+    "Ad�k aktualiz�l�sa",
     "",// TODO
     "��������� ��������� �������",
     "Aktualiziraj programe",
@@ -3736,7 +3736,7 @@ const tI18nPhrase Phrases[] = {
     "���� �������",
     "bara namn",
     "doar numele",
-    "",// TODO
+    "kiz�r�lag nevek",
     "",// TODO
     "������ ��������",
     "samo imena",
@@ -3758,7 +3758,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "bara PIDs",
     "Numai PID-uri",
-    "",// TODO
+    "kiz�r�lag PID-k",
     "",// TODO
     "������ PID�",
     "",// TODO
@@ -3780,7 +3780,7 @@ const tI18nPhrase Phrases[] = {
     "������� ��� PIDs",
     "namn och PID",
     "nume si PID-uri",
-    "",// TODO
+    "nevek �s PID-k",
     "",// TODO
     "�������� � PID�",
     "imena i identifikatore (PIDs)",
@@ -3802,7 +3802,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ���� ��������",
     "l�gg till nya kanaler",
     "ad�ugare canale noi",
-    "",// TODO
+    "�j ad�k hozz�ad�sa",
     "",// TODO
     "����� ������",
     "dodaj nove programe",
@@ -3824,7 +3824,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ���� �����������",
     "l�gg till nya transponders",
     "ad�ugare transpondere noi",
-    "",// TODO
+    "�j transponder hozz�ad�sa",
     "",// TODO
     "���. ������������",
     "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
@@ -3846,7 +3846,7 @@ const tI18nPhrase Phrases[] = {
     "������� ����",
     "Antal ljudspr�k",
     "Limbi sunet",
-    "",//TODO
+    "Audio-nyelvek",
     "",//TODO
     "�������������� ����� (����)",
     "Audio jezici",
@@ -3868,7 +3868,7 @@ const tI18nPhrase Phrases[] = {
     "������ ����",
     "Ljudspr�k",
     "Limba sunetului",
-    "",//TODO
+    "Audio-nyelv",
     "",//TODO
     "������",
     "Audio jezik",
@@ -4000,7 +4000,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ ���� ���� (�����)",
     "Marginal f�r start (min)",
     "Marj� la pornire (min)",
-    "Id�eltol�d�s a kezd�sn�l (min)",
+    "Id�eltol�d�s a kezd�sn�l (perc)",
     "Marge d'inici de gravaci� (min)",
     "���������� ������ ������ (���)",
     "Rezerva na po�etku snimanja (min)",
@@ -4022,7 +4022,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ ��� ����� (�����)",
     "Marginal f�r stopp (min)",
     "Marj� la oprire (min)",
-    "Id�eltol�d�s a befejez�sn�l",
+    "Id�eltol�d�s a befejez�sn�l (perc)",
     "Marge de fi de gravaci� (min)",
     "������������ ��������� ������ (���)",
     "Rezerva na kraju (min)",
@@ -4176,7 +4176,7 @@ const tI18nPhrase Phrases[] = {
     "����� VPS",
     "Anv�nd VPS",
     "Utilizeaz� VPS",
-    "",// TODO
+    "VPS-t haszn�lni",
     "",// TODO
     "������������ ������� VPS",
     "Koristi VPS",
@@ -4198,7 +4198,7 @@ const tI18nPhrase Phrases[] = {
     "��������� VPS (�)",
     "VPS marginal (s)",
     "Marj� de timp la utilizare VPS (s)",
-    "",// TODO
+    "Id�eltol�d�s VPS-n�l (s)",
     "",// TODO
     "�������� ����� VPS (���)",
     "Vremenska rezerva kod VPS (s)",
@@ -4264,7 +4264,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��������� �������� (�����)",
     "Direktinspelning l�ngd (min)",
     "Timpul de �nregistare imediat� (min)",
-    "Felv�tel id�tartama",
+    "Felv�tel id�tartama (perc)",
     "Temps de gravaci� instant�nia (min)",
     "������������ ������ ������ (���)",
     "Trajanje direktnog snimanja (min)",
@@ -4396,7 +4396,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ ���������� (�����)",
     "Minsta h�ndelse-pause (min)",
     "Durat� minim� emisiuni (min)",
-    "Min. esem�ny sz�net (min)",
+    "Id�zit�sek k�z�tti id�tartam (perc)",
     "Temps m�nim en pausa (min)",
     "���. ����� �������� ������� (���)",
     "Minimalno vrijeme pauze",
@@ -4418,7 +4418,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ �������� (�����)",
     "Minsta anv�ndar-inaktivitet (min)",
     "Durata minim� de inactivitate (min)",
-    "Min. kezel�si aktivit�s (min)",
+    "VDR le�ll haszn�lat n�lk�l (perc)",
     "Temps m�nim d'inactivitat (min)",
     "���. ����� �������� ����� (���)",
     "Minimalno vrijeme neaktivnosti (min)",
@@ -4440,7 +4440,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP ������� (�)",
     "SVDRP Timeout (s)",
     "Timeout SVDRP (sec)",
-    "SVDRP Timeout (s)",
+    "SVDRP sz�tkapcsol haszn�lat n�lk�l(s)",
     "SVDRP Timeout (s)",
     "�������� ������ ����. SVDRP (���)",
     "SVDRP vrijeme neaktivnosti",
@@ -4462,7 +4462,7 @@ const tI18nPhrase Phrases[] = {
     "������� ������� (�)",
     "Zap timeout(s)",
     "Interval zapping (s)",
-    "",// TODO
+    "Ad�sv�lt�s ideje (s)",
     "",// TODO
     "�������� ������������ ������ (���)",
     "",// hrv TODO
@@ -4484,7 +4484,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Kanal vid uppstart",
     "Canalul de pornire",
-    "",// TODO
+    "Ad�s a bekapcsol�sn�l",
     "",// TODO
     "����� ��� ���������",
     "",// TODO
@@ -4506,7 +4506,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Ljudstyrka vid uppstart",
     "Volumul la pornire",
-    "",// TODO
+    "Hanger� a bekapcsol�sn�l",
     "",// TODO
     "��������� ��� ���������",
     "",// TODO
@@ -4528,7 +4528,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "som f�rut",
     "ca mai �nainte",
-    "",// TODO
+    "ahogy az el�bb",
     "",// TODO
     "��� ������",
     "",// TODO
@@ -5193,7 +5193,7 @@ const tI18nPhrase Phrases[] = {
     "�����������",
     "Info",
     "Info",
-    "",//TODO
+    "Inform�ci�",
     "",//TODO
     "����",
     "Info",
@@ -5347,7 +5347,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "N�sta",
     "Urm�tor",
-    "",// TODO
+    "El�re",
     "",// TODO
     "������",
     "",// TODO
@@ -5369,7 +5369,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Bak�t",
     "Anterior",
-    "",// TODO
+    "Vissza",
     "",// TODO
     "�����",
     "",// TODO
@@ -5457,7 +5457,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "F�rra kanalen",
     "Canal anterior",
-    "",// TODO
+    "Az el�z� ad�s",
     "",// TODO
     "���������� �����",
     "",// TODO
@@ -5545,7 +5545,7 @@ const tI18nPhrase Phrases[] = {
     "����",
     "Ljud",
     "Sunet",
-    "",// TODO
+    "Hang",
     "",// TODO
     "����",
     "",// TODO
@@ -5766,7 +5766,7 @@ const tI18nPhrase Phrases[] = {
     "����������: ",
     "Hopp: ",
     "Salt la: ",
-    "Ugr�s: ",
+    "Ugr�s:",
     "Salta a:",
     "�������: ",
     "Sko�i: ",
@@ -5788,7 +5788,7 @@ const tI18nPhrase Phrases[] = {
     "������ ",
     "Volym ",
     "Volum ",
-    "Hanger� ",
+    "Hanger�",
     "Volum ",
     "��������� ",
     "Glasno�a ",
@@ -5832,7 +5832,7 @@ const tI18nPhrase Phrases[] = {
     " ����� ������� ",
     " Avsluta inspelning ",
     " Opre�te �nregistrarea ",
-    " Felv�telt befejezni ",
+    " Felv�telt befejezni",
     " Aturar la gravaci� ",
     " ���������� ������ ",
     " Prekini snimanje ",
@@ -5986,7 +5986,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Inspelningen har startat",
     "A �nceput �nregistrarea",
-    "",//TODO
+    "A felv�tel elinditva Nd",
     "",//TODO
     "������ ������",
     "",//TODO
@@ -6030,7 +6030,7 @@ const tI18nPhrase Phrases[] = {
     "���� ������ EPG",
     "P�b�rjar EPG skanning",
     "Pornesc achizi�ia EPG",
-    "",// TODO
+    "EPG adatok aktualiz�l�sa",
     "",// TODO
     "������� EPG-������������",
     "Po�injem EPG-scan",
@@ -6074,7 +6074,7 @@ const tI18nPhrase Phrases[] = {
     "������� VDR",
     "Klassisk VDR",
     "VDR clasic",
-    "",// TODO
+    "Klasszikus VDR",
     "",// TODO
     "������������",
     "Klasi�ni VDR",
@@ -6096,7 +6096,7 @@ const tI18nPhrase Phrases[] = {
     "������ ST:TNG",
     "ST:TNG konsol",
     "Cons. ST:TNG",
-    "",// TODO
+    "ST:TNG Konzol",
     "",// TODO
     "ST:TNG ������",
     "ST:TNG Konzole",
@@ -6118,7 +6118,7 @@ const tI18nPhrase Phrases[] = {
     "����� �����",
     "ingen titel",
     "F�r� titlu",
-    "",// TODO
+    "n�v n�lk�l",
     "",// TODO
     "��� ��������",
     "Bez titla",
diff --git a/newplugin b/newplugin
index dd4914056..363baae46 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.29 2006/06/24 09:15:17 kls Exp $
+# $Id: newplugin 1.30 2006/09/09 12:38:35 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -124,7 +124,7 @@ all: libvdr-\$(PLUGIN).so
 
 libvdr-\$(PLUGIN).so: \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
-	\@cp \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
+	\@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
 
 dist: clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
diff --git a/recording.c b/recording.c
index fd7800b4d..e60c47821 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.149 2006/07/30 10:23:46 kls Exp $
+ * $Id: recording.c 1.150 2006/09/16 12:12:34 kls Exp $
  */
 
 #include "recording.h"
@@ -947,7 +947,10 @@ void cRecordings::TouchUpdate(void)
 
 bool cRecordings::NeedsUpdate(void)
 {
-  return lastUpdate < LastModifiedTime(UpdateFileName());
+  time_t lastModified = LastModifiedTime(UpdateFileName());
+  if (lastModified > time(NULL))
+     return false; // somebody's clock isn't running correctly
+  return lastUpdate < lastModified;
 }
 
 bool cRecordings::Update(bool Wait)
diff --git a/timers.c b/timers.c
index 18dab0ff3..069b8578d 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.64 2006/09/08 15:06:09 kls Exp $
+ * $Id: timers.c 1.65 2006/09/15 14:15:53 kls Exp $
  */
 
 #include "timers.h"
@@ -438,13 +438,7 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
 
 bool cTimer::Expired(void) const
 {
-  if (IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL)) {
-     if (HasFlags(tfVps) && event && event->Vps())
-        return event->RunningStatus() == SI::RunningStatusNotRunning;
-     else
-        return true;
-     }
-  return false;
+  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event);
 }
 
 time_t cTimer::StartTime(void) const

From 312c21b832f89b600e44850a870ee160631c5ecd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 23 Sep 2006 18:00:00 +0200
Subject: [PATCH 156/307] Version 1.4.3 - Official release.

---
 HISTORY  | 4 ++++
 config.h | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 784a05623..455a6a1c9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4926,3 +4926,7 @@ Video Disk Recorder Revision History
 - Updated the Hungarian language texts (thanks to Istvan Koenigsberger and Guido Josten).
 - Fixed handling video directory updates in case the timestamp of the .update file
   is in the future (thanks to Petri Hintukainen).
+
+2006-09-23: Version 1.4.3
+
+- Official release.
diff --git a/config.h b/config.h
index ad0e4a789..bb9070e95 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.270 2006/09/10 14:09:31 kls Exp $
+ * $Id: config.h 1.271 2006/09/23 13:56:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.2-3"
-#define VDRVERSNUM   10402  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.4.3"
+#define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 

From 948c370a29a21ac1fc9531f7e92d99e24734dcf4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Oct 2006 18:00:00 +0200
Subject: [PATCH 157/307] Version 1.4.3-1 - The function cThread::Cancel() now
 only sets 'running' to false and does not   actually kill the thread if the
 special value -1 is given (suggested by Udo Richter). - Changed the
 I18nNormalizeLanguageCode() check to also allow blanks (and all other  
 printable characters) in the language codes (thanks to Boguslaw Juza for
 reporting   that there are stations that use blanks in these codes). Blanks
 are replaced with   underlines, so that all parts of VDR that rely on
 language codes to be one word   (without blanks) work as expected. - Now
 clearing an event's Title, ShortText and Description if there is no  
 ShortEventDescriptor or ExtendedEventDescriptor, respectively (thanks to
 Boguslaw   Juza for reporting that events without an ExtendedEventDescriptor
 may get   duplicate information in their ShortText through the EPG bugfixes
 in case they   are received again). - Fixed handling video directory updates
 in case an other process has touched the   .update file after the last
 NeedsUpdate() check (thanks to Petri Hintukainen). - Fixed handling language
 codes and descriptions of recorded audio tracks on channels   with multiple
 tracks where not all of them appear in the event data (reported by   Boguslaw
 Juza).

---
 CONTRIBUTORS | 12 ++++++++++++
 HISTORY      | 20 ++++++++++++++++++++
 config.h     |  4 ++--
 eit.c        |  8 +++++++-
 epg.c        |  5 +++--
 epg.h        |  3 ++-
 i18n.c       | 33 ++++++++++++++++++++++++++-------
 recording.c  |  6 ++++--
 thread.c     |  4 ++--
 thread.h     |  4 +++-
 10 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6d8533629..6e79bc39a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1468,6 +1468,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a problem with cPlugin::ConfigDirectory() in case a plugin calls it
  from a separate thread
  for reporting that an assignment in svdrp.c didn't use the cTimer::operator=())
+ for suggesting that the function cThread::Cancel() should only set 'running' to
+ false and not actually kill the thread if the special value -1 is given
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1821,6 +1823,8 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
  the Makefile to avoid a crash in case a new version is installed on a running system
  for fixing handling video directory updates in case the timestamp of the .update
  file is in the future
+ for fixing handling video directory updates in case an other process has touched the
+ .update file after the last NeedsUpdate() check
 
 Marcel Schaeben <mts280@gmx.de>
  for his "Easy Input" patch
@@ -2003,3 +2007,11 @@ Matthias Schwarzott <zzam@gentoo.org>
 
 Martin Ostermann <martin@familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
+
+Boguslaw Juza <bogdan@uci.agh.edu.pl>
+ for reporting that there are stations that use blanks in the language codes
+ for reporting that events without an ExtendedEventDescriptor may get duplicate
+ information in their ShortText through the EPG bugfixes in case they are received
+ again
+ for reporting a problem with language codes of recorded audio tracks on channels with
+ multiple tracks
diff --git a/HISTORY b/HISTORY
index 455a6a1c9..c082442dd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4930,3 +4930,23 @@ Video Disk Recorder Revision History
 2006-09-23: Version 1.4.3
 
 - Official release.
+
+2006-10-08: Version 1.4.3-1
+
+- The function cThread::Cancel() now only sets 'running' to false and does not
+  actually kill the thread if the special value -1 is given (suggested by Udo Richter).
+- Changed the I18nNormalizeLanguageCode() check to also allow blanks (and all other
+  printable characters) in the language codes (thanks to Boguslaw Juza for reporting
+  that there are stations that use blanks in these codes). Blanks are replaced with
+  underlines, so that all parts of VDR that rely on language codes to be one word
+  (without blanks) work as expected.
+- Now clearing an event's Title, ShortText and Description if there is no
+  ShortEventDescriptor or ExtendedEventDescriptor, respectively (thanks to Boguslaw
+  Juza for reporting that events without an ExtendedEventDescriptor may get
+  duplicate information in their ShortText through the EPG bugfixes in case they
+  are received again).
+- Fixed handling video directory updates in case an other process has touched the
+  .update file after the last NeedsUpdate() check (thanks to Petri Hintukainen).
+- Fixed handling language codes and descriptions of recorded audio tracks on channels
+  with multiple tracks where not all of them appear in the event data (reported by
+  Boguslaw Juza).
diff --git a/config.h b/config.h
index bb9070e95..bc3ebd64a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.271 2006/09/23 13:56:08 kls Exp $
+ * $Id: config.h 1.272 2006/09/24 10:09:25 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3"
+#define VDRVERSION  "1.4.3-1"
 #define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/eit.c b/eit.c
index fc65bc9c4..23ae987dd 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.120 2006/08/05 10:01:21 kls Exp $
+ * $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $
  */
 
 #include "eit.h"
@@ -234,10 +234,16 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
+         else {
+            pEvent->SetTitle(NULL);
+            pEvent->SetShortText(NULL);
+            }
          if (ExtendedEventDescriptors) {
             char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
+         else
+            pEvent->SetDescription(NULL);
          }
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
diff --git a/epg.c b/epg.c
index b8b6b64d6..960934ff5 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.79 2006/08/05 10:04:17 kls Exp $
+ * $Id: epg.c 1.80 2006/10/07 13:47:28 kls Exp $
  */
 
 #include "epg.h"
@@ -87,7 +87,8 @@ void cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *
 tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
 {
   for (int i = 0; i < numComponents; i++) {
-      if (components[i].stream == Stream && components[i].type == Type) {
+      // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital":
+      if (components[i].stream == Stream && (Stream != 2 || (components[i].type < 5) == (Type < 5))) {
          if (!Index--)
             return &components[i];
          }
diff --git a/epg.h b/epg.h
index a937ff7d1..792bb1362 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.34 2006/03/25 12:39:39 kls Exp $
+ * $Id: epg.h 1.35 2006/10/07 13:47:19 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -43,6 +43,7 @@ class cComponents {
   void SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description);
   tComponent *Component(int Index) const { return (Index < numComponents) ? &components[Index] : NULL; }
   tComponent *GetComponent(int Index, uchar Stream, uchar Type); // Gets the Index'th component of Stream and Type, skipping other components
+                                                                 // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital"
   };
 
 class cSchedule;
diff --git a/i18n.c b/i18n.c
index 34c81f625..ee529d4ad 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.282 2006/09/16 09:08:30 kls Exp $
+ * $Id: i18n.c 1.284 2006/10/08 08:50:30 kls Exp $
  *
  * Translations provided by:
  *
@@ -6243,12 +6243,31 @@ int I18nLanguageIndex(const char *Code)
 
 const char *I18nNormalizeLanguageCode(const char *Code)
 {
-  if (Code[0] && !isalnum(Code[0]) || Code[1] && !isalnum(Code[1]) || Code[2] && !isalnum(Code[2])) {
-     // ISO 639 language codes are defined as alphabetical characters, but digits are apparently
-     // also used, for instance for "2ch"
-     //dsyslog("invalid language code: '%s'", Code);
-     return "???";
-     }
+  for (int i = 0; i < 3; i++) {
+      if (Code[i]) {
+         // ETSI EN 300 468 defines language codes as consisting of three letters
+         // according to ISO 639-2. This means that they are supposed to always consist
+         // of exactly three letters in the range a-z - no digits, UTF-8 or other
+         // funny characters. However, some broadcasters apparently don't have a
+         // copy of the DVB standard (or they do, but are perhaps unable to read it),
+         // so they put all sorts of non-standard stuff into the language codes,
+         // like nonsense as "2ch" or "A 1" (yes, they even go as far as using
+         // blanks!). Such things should go into the description of the EPG event's
+         // ComponentDescriptor.
+         // So, as a workaround for this broadcaster stupidity, let's ignore
+         // language codes with unprintable characters...
+         if (!isprint(Code[i])) {
+            //dsyslog("invalid language code: '%s'", Code);
+            return "???";
+            }
+         // ...and replace blanks with underlines (ok, this breaks the 'const'
+         // of the Code parameter - but hey, it's them who started this):
+         if (Code[i] == ' ')
+            *((char *)&Code[i]) = '_';
+         }
+      else
+         break;
+      }
   int n = I18nLanguageIndex(Code);
   return n >= 0 ? I18nLanguageCode(n) : Code;
 }
diff --git a/recording.c b/recording.c
index e60c47821..5298de3f1 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.150 2006/09/16 12:12:34 kls Exp $
+ * $Id: recording.c 1.151 2006/10/07 12:46:22 kls Exp $
  */
 
 #include "recording.h"
@@ -941,8 +941,10 @@ bool cRecordings::StateChanged(int &State)
 
 void cRecordings::TouchUpdate(void)
 {
+  bool needsUpdate = NeedsUpdate();
   TouchFile(UpdateFileName());
-  lastUpdate = time(NULL); // make sure we don't tigger ourselves
+  if (!needsUpdate)
+     lastUpdate = time(NULL); // make sure we don't tigger ourselves
 }
 
 bool cRecordings::NeedsUpdate(void)
diff --git a/thread.c b/thread.c
index 8b6e58f41..2e145e50e 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.57 2006/08/20 10:20:44 kls Exp $
+ * $Id: thread.c 1.58 2006/09/24 12:54:47 kls Exp $
  */
 
 #include "thread.h"
@@ -293,7 +293,7 @@ bool cThread::Active(void)
 void cThread::Cancel(int WaitSeconds)
 {
   running = false;
-  if (active) {
+  if (active && WaitSeconds > -1) {
      if (WaitSeconds > 0) {
         for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
             if (!Active())
diff --git a/thread.h b/thread.h
index 341e87d04..6211e2c1d 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.36 2006/01/08 11:40:23 kls Exp $
+ * $Id: thread.h 1.37 2006/09/24 10:10:37 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -103,6 +103,8 @@ class cThread {
        ///< the Action() loop can finish in an orderly fashion and then waiting
        ///< up to WaitSeconds seconds for the thread to actually end. If the
        ///< thread doesn't end by itself, it is killed.
+       ///< If WaitSeconds is -1, only 'running' is set to false and Cancel()
+       ///< returns immediately, without killing the thread.
 public:
   cThread(const char *Description = NULL);
        ///< Creates a new thread.

From 9ef312f888aae6167bf210d0d1bb8fcb9b787584 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 15 Oct 2006 18:00:00 +0200
Subject: [PATCH 158/307] Version 1.4.3-2 - Fixed clearing an event's Title,
 ShortText and Description in case the data comes   from an external source. -
 Updated the Hungarian language texts (thanks to Guido Josten). - Fixed a
 possible crash if cPluginManager::GetPlugin() is called with a NULL   pointer
 (thanks to Petri Hintukainen). - Fixed displaying the error log message in
 case an unknown plugin was requested   in a key macro (thanks to Petri
 Hintukainen). - Keys from expanded key macros are now put into the front of
 the key queue to   avoid problems if the queue is not empty at that time
 (based on a patch from   Petri Hintukainen). - cKeyMacro now has an explicit
 counter for the number of keys it contains. - cRemote::PutMacro() now sets a
 lock while it expands the macro (thanks to   Petri Hintukainen). - Fixed
 handling plugins from cRemote::PutMacro() and cRemote::CallPlugin()   (based
 on a patch from Petri Hintukainen). - Increased the size of the key queue to
 avoid problems with long key macros.

---
 CONTRIBUTORS |  9 +++++++++
 HISTORY      | 19 +++++++++++++++++++
 config.h     |  8 ++++----
 eit.c        |  9 +++++----
 i18n.c       |  8 ++++----
 keys.c       | 11 ++++++-----
 keys.h       |  7 ++++++-
 plugin.c     |  4 ++--
 remote.c     | 31 +++++++++++++++++--------------
 remote.h     |  9 +++++----
 vdr.c        | 25 ++++++++++++++-----------
 11 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6e79bc39a..87bbe365a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1825,6 +1825,15 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
  file is in the future
  for fixing handling video directory updates in case an other process has touched the
  .update file after the last NeedsUpdate() check
+ for fixing a possible crash if cPluginManager::GetPlugin() is called with a NULL
+ pointer
+ for fixing displaying the error log message in case an unknown plugin was requested
+ in a key macro
+ for pointing out that keys from expanded key macros should be put into the front of
+ the key queue to avoid problems if the queue is not empty at that time
+ for making cRemote::PutMacro() set a lock while it expands the macro
+ for pointing out that plugins from cRemote::PutMacro() and cRemote::CallPlugin()
+ need to be handled separately
 
 Marcel Schaeben <mts280@gmx.de>
  for his "Easy Input" patch
diff --git a/HISTORY b/HISTORY
index c082442dd..56557dad5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4950,3 +4950,22 @@ Video Disk Recorder Revision History
 - Fixed handling language codes and descriptions of recorded audio tracks on channels
   with multiple tracks where not all of them appear in the event data (reported by
   Boguslaw Juza).
+
+2006-10-15: Version 1.4.3-2
+
+- Fixed clearing an event's Title, ShortText and Description in case the data comes
+  from an external source.
+- Updated the Hungarian language texts (thanks to Guido Josten).
+- Fixed a possible crash if cPluginManager::GetPlugin() is called with a NULL
+  pointer (thanks to Petri Hintukainen).
+- Fixed displaying the error log message in case an unknown plugin was requested
+  in a key macro (thanks to Petri Hintukainen).
+- Keys from expanded key macros are now put into the front of the key queue to
+  avoid problems if the queue is not empty at that time (based on a patch from
+  Petri Hintukainen).
+- cKeyMacro now has an explicit counter for the number of keys it contains.
+- cRemote::PutMacro() now sets a lock while it expands the macro (thanks to
+  Petri Hintukainen).
+- Fixed handling plugins from cRemote::PutMacro() and cRemote::CallPlugin()
+  (based on a patch from Petri Hintukainen).
+- Increased the size of the key queue to avoid problems with long key macros.
diff --git a/config.h b/config.h
index bc3ebd64a..360be5d83 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.272 2006/09/24 10:09:25 kls Exp $
+ * $Id: config.h 1.274 2006/10/14 10:28:38 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3-1"
+#define VDRVERSION  "1.4.3-2"
 #define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.4.3"
-#define APIVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.4.4"
+#define APIVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/eit.c b/eit.c
index 23ae987dd..2b07b87c7 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $
+ * $Id: eit.c 1.122 2006/10/09 16:14:36 kls Exp $
  */
 
 #include "eit.h"
@@ -234,7 +234,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
-         else {
+         else if (!HasExternalData) {
             pEvent->SetTitle(NULL);
             pEvent->SetShortText(NULL);
             }
@@ -242,7 +242,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
             char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
-         else
+         else if (!HasExternalData)
             pEvent->SetDescription(NULL);
          }
       delete ExtendedEventDescriptors;
@@ -250,7 +250,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
 
       pEvent->SetComponents(Components);
 
-      pEvent->FixEpgBugs();
+      if (!HasExternalData)
+         pEvent->FixEpgBugs();
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
       Modified = true;
diff --git a/i18n.c b/i18n.c
index ee529d4ad..475264b2e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.284 2006/10/08 08:50:30 kls Exp $
+ * $Id: i18n.c 1.285 2006/10/14 09:26:41 kls Exp $
  *
  * Translations provided by:
  *
@@ -3582,7 +3582,7 @@ const tI18nPhrase Phrases[] = {
     "����� ����������� ������",
     "Format f�r video display",
     "Formatul red�rii video",
-    "",//TODO
+    "K�perny�form�tum",
     "",//TODO
     "�������������� �����������",
     "Format video prikaza",
@@ -4596,7 +4596,7 @@ const tI18nPhrase Phrases[] = {
     " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
     " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@",
-    " a�bcde�fghi�jklmno��pqrstu��vwxyz0123456789-.,#~,/_@",
+    " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~,/_@",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~,/_@�",
     " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@",
     " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@", // hrv
@@ -4619,7 +4619,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz",
     " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9",
-    "",//TODO
+    " 0\t-.#~,/_@1\ta�bc2\tde�3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9",
     "",//TODO
     "",//TODO
     "",//TODO
diff --git a/keys.c b/keys.c
index 6ebdbfeaf..577dae222 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.13 2006/04/15 13:50:43 kls Exp $
+ * $Id: keys.c 1.14 2006/10/14 10:18:05 kls Exp $
  */
 
 #include "keys.h"
@@ -186,8 +186,9 @@ void cKeys::PutSetup(const char *Remote, const char *Setup)
 
 cKeyMacro::cKeyMacro(void)
 {
+  numKeys = 0;
   for (int i = 0; i < MAXKEYSINMACRO; i++)
-      macro[i] = kNone;
+      macro[i] = kNone; // for compatibility with old code that doesn't know about NumKeys()
   plugin = NULL;
 }
 
@@ -241,9 +242,9 @@ bool cKeyMacro::Parse(char *s)
            return false;
            }
         }
-  if (n < 2) {
-     esyslog("ERROR: empty key macro");
-     }
+  if (n < 2)
+     esyslog("ERROR: empty key macro"); // non fatal
+  numKeys = n;
   return true;
 }
 
diff --git a/keys.h b/keys.h
index 4fa13372a..be87c7983 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.9 2006/04/15 13:56:03 kls Exp $
+ * $Id: keys.h 1.10 2006/10/14 10:41:20 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -117,11 +117,16 @@ extern cKeys Keys;
 class cKeyMacro : public cListObject {
 private:
   eKeys macro[MAXKEYSINMACRO];
+  int numKeys;
   char *plugin;
 public:
   cKeyMacro(void);
   ~cKeyMacro();
   bool Parse(char *s);
+  int NumKeys(void) const { return numKeys; }
+      ///< Returns the number of keys in this macro. The first key (with
+      ///< index 0) is the macro code. The actual macro expansion codes
+      ///< start at index 1 and go to NumKeys() - 1.
   const eKeys *Macro(void) const { return macro; }
   const char *Plugin(void) const { return plugin; }
   };
diff --git a/plugin.c b/plugin.c
index 40b449487..569e941a3 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.23 2006/08/13 08:51:44 kls Exp $
+ * $Id: plugin.c 1.24 2006/10/14 09:49:16 kls Exp $
  */
 
 #include "plugin.h"
@@ -416,7 +416,7 @@ cPlugin *cPluginManager::GetPlugin(int Index)
 
 cPlugin *cPluginManager::GetPlugin(const char *Name)
 {
-  if (pluginManager) {
+  if (pluginManager && Name) {
      for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
          cPlugin *p = dll->Plugin();
          if (p && strcmp(p->Name(), Name) == 0)
diff --git a/remote.c b/remote.c
index a4277401c..112f6c1b8 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.51 2006/05/12 12:40:15 kls Exp $
+ * $Id: remote.c 1.54 2006/10/14 11:05:57 kls Exp $
  */
 
 #include "remote.h"
@@ -29,7 +29,8 @@ cRemote *cRemote::learning = NULL;
 char *cRemote::unknownCode = NULL;
 cMutex cRemote::mutex;
 cCondVar cRemote::keyPressed;
-const char *cRemote::plugin = NULL;
+const char *cRemote::keyMacroPlugin = NULL;
+const char *cRemote::callPlugin = NULL;
 
 cRemote::cRemote(const char *Name)
 {
@@ -105,14 +106,11 @@ bool cRemote::PutMacro(eKeys Key)
 {
   const cKeyMacro *km = KeyMacros.Get(Key);
   if (km) {
-     plugin = km->Plugin();
-     for (int i = 1; i < MAXKEYSINMACRO; i++) {
-         if (km->Macro()[i] != kNone) {
-            if (!Put(km->Macro()[i]))
-               return false;
-            }
-         else
-            break;
+     keyMacroPlugin = km->Plugin();
+     cMutexLock MutexLock(&mutex);
+     for (int i = km->NumKeys(); --i > 0; ) {
+         if (!Put(km->Macro()[i], true))
+            return false;
          }
      }
   return true;
@@ -148,8 +146,8 @@ bool cRemote::Put(const char *Code, bool Repeat, bool Release)
 bool cRemote::CallPlugin(const char *Plugin)
 {
   cMutexLock MutexLock(&mutex);
-  if (!plugin) {
-     plugin = Plugin;
+  if (!callPlugin) {
+     callPlugin = Plugin;
      Put(k_Plugin);
      return true;
      }
@@ -159,8 +157,13 @@ bool cRemote::CallPlugin(const char *Plugin)
 const char *cRemote::GetPlugin(void)
 {
   cMutexLock MutexLock(&mutex);
-  const char *p = plugin;
-  plugin = NULL;
+  const char *p = keyMacroPlugin;
+  if (p)
+     keyMacroPlugin = NULL;
+  else {
+     p = callPlugin;
+     callPlugin = NULL;
+     }
   return p;
 }
 
diff --git a/remote.h b/remote.h
index 3a2bb7498..4477666bd 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.35 2006/04/17 08:59:48 kls Exp $
+ * $Id: remote.h 1.37 2006/10/14 11:46:58 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -19,7 +19,7 @@
 
 class cRemote : public cListObject {
 private:
-  enum { MaxKeys = MAXKEYSINMACRO };
+  enum { MaxKeys = 2 * MAXKEYSINMACRO };
   static eKeys keys[MaxKeys];
   static int in;
   static int out;
@@ -28,7 +28,8 @@ class cRemote : public cListObject {
   static char *unknownCode;
   static cMutex mutex;
   static cCondVar keyPressed;
-  static const char *plugin;
+  static const char *keyMacroPlugin;
+  static const char *callPlugin;
   char *name;
 protected:
   cRemote(const char *Name);
@@ -56,7 +57,7 @@ class cRemote : public cListObject {
       ///< false will be returned and the caller should try again later.
   static const char *GetPlugin(void);
       ///< Returns the name of the plugin that was set with a previous
-      ///< call to CallPlugin(). The internally stored pointer to the
+      ///< call to PutMacro() or CallPlugin(). The internally stored pointer to the
       ///< plugin name will be reset to NULL by this call.
   static bool HasKeys(void);
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
diff --git a/vdr.c b/vdr.c
index 46d65c843..73c5c9184 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.279 2006/09/01 12:57:44 kls Exp $
+ * $Id: vdr.c 1.280 2006/10/14 10:01:32 kls Exp $
  */
 
 #include <getopt.h>
@@ -923,17 +923,20 @@ int main(int argc, char *argv[])
           case kCommands:   DirectMainFunction(osCommands); break;
           case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
           case k_Plugin: {
-               DELETE_MENU;
-               if (cControl::Control())
-                  cControl::Control()->Hide();
-               cPlugin *plugin = cPluginManager::GetPlugin(cRemote::GetPlugin());
-               if (plugin) {
-                  Menu = plugin->MainMenuAction();
-                  if (Menu)
-                     Menu->Show();
+               const char *PluginName = cRemote::GetPlugin();
+               if (PluginName) {
+                  DELETE_MENU;
+                  if (cControl::Control())
+                     cControl::Control()->Hide();
+                  cPlugin *plugin = cPluginManager::GetPlugin(PluginName);
+                  if (plugin) {
+                     Menu = plugin->MainMenuAction();
+                     if (Menu)
+                        Menu->Show();
+                     }
+                  else
+                     esyslog("ERROR: unknown plugin '%s'", PluginName);
                   }
-               else
-                  esyslog("ERROR: unknown plugin '%s'", cRemote::GetPlugin());
                key = kNone; // nobody else needs to see these keys
                }
                break;

From f99e13afb489f75749f4f8d978759d104a2983f2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 22 Oct 2006 18:00:00 +0200
Subject: [PATCH 159/307] =?UTF-8?q?Version=201.4.3-3=20-=20Fixed=20setting?=
 =?UTF-8?q?=20audio=20track=20descriptions=20after=20a=20replay=20has=20be?=
 =?UTF-8?q?en=20stopped=20(reported=20=20=20by=20Ulf=20Kiener,=20thanks=20?=
 =?UTF-8?q?to=20Marco=20Schl=C3=BC=C3=9Fler=20for=20pointing=20out=20what?=
 =?UTF-8?q?=20caused=20the=20problem).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |  6 ++++++
 HISTORY      |  5 +++++
 config.h     |  4 ++--
 menu.c       | 15 ++++++++++++---
 menu.h       |  4 +++-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 87bbe365a..33534dddd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1382,6 +1382,8 @@ Marco Schl
  files than VDR itself
  for adding a missing initialization of 'mutex' in cCiMenu::cCiMenu() and removing
  some superfluous semicolons in ci.c
+ for pointing out what caused the problem with audio track descriptions after a
+ replay has been stopped
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -2024,3 +2026,7 @@ Boguslaw Juza <bogdan@uci.agh.edu.pl>
  again
  for reporting a problem with language codes of recorded audio tracks on channels with
  multiple tracks
+
+Ulf Kiener <webmaster@ulf-kiener.de>
+ for reporting a problem with audio track descriptions in the DVD plugin after a
+ replay has been stopped
diff --git a/HISTORY b/HISTORY
index 56557dad5..eb3a3913a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4969,3 +4969,8 @@ Video Disk Recorder Revision History
 - Fixed handling plugins from cRemote::PutMacro() and cRemote::CallPlugin()
   (based on a patch from Petri Hintukainen).
 - Increased the size of the key queue to avoid problems with long key macros.
+
+2006-10-22: Version 1.4.3-3
+
+- Fixed setting audio track descriptions after a replay has been stopped (reported
+  by Ulf Kiener, thanks to Marco Schl��ler for pointing out what caused the problem).
diff --git a/config.h b/config.h
index 360be5d83..2a1fee386 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.274 2006/10/14 10:28:38 kls Exp $
+ * $Id: config.h 1.275 2006/10/20 13:37:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3-2"
+#define VDRVERSION  "1.4.3-3"
 #define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/menu.c b/menu.c
index 7e4f36253..239ef72b3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.443 2006/07/23 09:23:11 kls Exp $
+ * $Id: menu.c 1.444 2006/10/20 13:18:38 kls Exp $
  */
 
 #include "menu.h"
@@ -3018,9 +3018,9 @@ static void SetTrackDescriptions(int LiveChannel)
            }
         }
      }
-  else if (cReplayControl::LastReplayed()) {
+  else if (cReplayControl::NowReplaying()) {
      cThreadLock RecordingsLock(&Recordings);
-     cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
+     cRecording *Recording = Recordings.GetByName(cReplayControl::NowReplaying());
      if (Recording)
         Components = Recording->Info()->Components();
      }
@@ -3806,12 +3806,14 @@ bool cRecordControls::StateChanged(int &State)
 
 // --- cReplayControl --------------------------------------------------------
 
+cReplayControl *cReplayControl::currentReplayControl = NULL;
 char *cReplayControl::fileName = NULL;
 char *cReplayControl::title = NULL;
 
 cReplayControl::cReplayControl(void)
 :cDvbPlayerControl(fileName)
 {
+  currentReplayControl = this;
   displayReplay = NULL;
   visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
@@ -3830,6 +3832,8 @@ cReplayControl::~cReplayControl()
   Hide();
   cStatus::MsgReplaying(this, NULL, fileName, false);
   Stop();
+  if (currentReplayControl == this)
+     currentReplayControl = NULL;
 }
 
 void cReplayControl::SetRecording(const char *FileName, const char *Title)
@@ -3840,6 +3844,11 @@ void cReplayControl::SetRecording(const char *FileName, const char *Title)
   title = Title ? strdup(Title) : NULL;
 }
 
+const char *cReplayControl::NowReplaying(void)
+{
+  return currentReplayControl ? fileName : NULL;
+}
+
 const char *cReplayControl::LastReplayed(void)
 {
   return fileName;
diff --git a/menu.h b/menu.h
index de6014e29..7376b719c 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.85 2006/03/25 12:15:19 kls Exp $
+ * $Id: menu.h 1.86 2006/10/20 13:09:57 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -233,6 +233,7 @@ class cReplayControl : public cDvbPlayerControl {
   void TimeSearchProcess(eKeys Key);
   void TimeSearch(void);
   void ShowTimed(int Seconds = 0);
+  static cReplayControl *currentReplayControl;
   static char *fileName;
   static char *title;
   void ShowMode(void);
@@ -251,6 +252,7 @@ class cReplayControl : public cDvbPlayerControl {
   virtual void Hide(void);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
+  static const char *NowReplaying(void);
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
   };

From d45b4aba734515e7f6b007eae4360874059a5a2c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 29 Oct 2006 17:00:00 +0100
Subject: [PATCH 160/307] Version 1.4.3-4 - Fixed deleting EPG events that have
 a running status of "pausing" or higher. - Fixed handling NITs with more than
 one delivery system descriptor tag for the   same transponder.

---
 HISTORY  |  6 ++++++
 config.h |  4 ++--
 epg.c    | 10 ++++++++--
 nit.c    | 50 ++++++++++++++++++++++++++++----------------------
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/HISTORY b/HISTORY
index eb3a3913a..baa951cf9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4974,3 +4974,9 @@ Video Disk Recorder Revision History
 
 - Fixed setting audio track descriptions after a replay has been stopped (reported
   by Ulf Kiener, thanks to Marco Schl��ler for pointing out what caused the problem).
+
+2006-10-29: Version 1.4.3-4
+
+- Fixed deleting EPG events that have a running status of "pausing" or higher.
+- Fixed handling NITs with more than one delivery system descriptor tag for the
+  same transponder.
diff --git a/config.h b/config.h
index 2a1fee386..bd2becb01 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.275 2006/10/20 13:37:37 kls Exp $
+ * $Id: config.h 1.276 2006/10/28 09:15:00 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3-3"
+#define VDRVERSION  "1.4.3-4"
 #define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/epg.c b/epg.c
index 960934ff5..695ca9939 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.80 2006/10/07 13:47:28 kls Exp $
+ * $Id: epg.c 1.81 2006/10/28 09:12:42 kls Exp $
  */
 
 #include "epg.h"
@@ -664,6 +664,8 @@ cEvent *cSchedule::AddEvent(cEvent *Event)
 void cSchedule::DelEvent(cEvent *Event)
 {
   if (Event->schedule == this) {
+     if (hasRunning && Event->IsRunning())
+        ClrRunningStatus();
      UnhashEvent(Event);
      events.Del(Event);
      }
@@ -742,8 +744,10 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Cha
   hasRunning = false;
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
       if (p == Event) {
-         if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning)
+         if (p->RunningStatus() > SI::RunningStatusNotRunning || RunningStatus > SI::RunningStatusNotRunning) {
             p->SetRunningStatus(RunningStatus, Channel);
+            break;
+            }
          }
       else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime())
          p->SetRunningStatus(SI::RunningStatusNotRunning);
@@ -797,6 +801,8 @@ void cSchedule::DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar Table
                   // We can't delete the event right here because a timer might have
                   // a pointer to it, so let's set its id and start time to 0 to have it
                   // "phased out":
+                  if (hasRunning && p->IsRunning())
+                     ClrRunningStatus();
                   UnhashEvent(p);
                   p->eventID = 0;
                   p->startTime = 0;
diff --git a/nit.c b/nit.c
index 007093dbf..4f5356212 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.12 2006/05/27 15:35:16 kls Exp $
+ * $Id: nit.c 1.13 2006/10/28 12:31:04 kls Exp $
  */
 
 #include "nit.h"
@@ -144,15 +144,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                         if (Setup.UpdateChannels >= 5) {
-                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
-                              for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
-                                     Frequency = Frequencies[n];
-                                     break;
+                           if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { // only modify channels if we're actually receiving this transponder
+                              if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
+                                 for (int n = 0; n < NumFrequencies; n++) {
+                                     if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
+                                        Frequency = Frequencies[n];
+                                        break;
+                                        }
                                      }
-                                  }
+                                 }
+                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
                               }
-                           Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
                            }
                         found = true;
                         }
@@ -193,15 +195,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                         if (Setup.UpdateChannels >= 5) {
-                           if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
-                              for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
-                                     Frequency = Frequencies[n];
-                                     break;
+                           if (ISTRANSPONDER(Frequency / 1000, Transponder())) { // only modify channels if we're actually receiving this transponder
+                              if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
+                                 for (int n = 0; n < NumFrequencies; n++) {
+                                     if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
+                                        Frequency = Frequencies[n];
+                                        break;
+                                        }
                                      }
-                                  }
+                                 }
+                              Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
                               }
-                           Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
                            }
                         found = true;
                         }
@@ -249,15 +253,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                         if (Setup.UpdateChannels >= 5) {
-                           if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
-                              for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
-                                     Frequency = Frequencies[n];
-                                     break;
+                           if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { // only modify channels if we're actually receiving this transponder
+                              if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
+                                 for (int n = 0; n < NumFrequencies; n++) {
+                                     if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
+                                        Frequency = Frequencies[n];
+                                        break;
+                                        }
                                      }
-                                  }
+                                 }
+                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
                               }
-                           Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
                            }
                         found = true;
                         }

From bc67a03157def5c4d8d0f3c7b38351f2aeb397ee Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 4 Nov 2006 18:00:00 +0100
Subject: [PATCH 161/307] =?UTF-8?q?Version=201.4.4=20-=20Fixed=20displayin?=
 =?UTF-8?q?g=20the=20replay=20mode=20symbol=20in=20case=20of=20"Multi=20sp?=
 =?UTF-8?q?eed=20mode"=20(reported=20=20=20by=20Marco=20Schl=C3=BC=C3=9Fle?=
 =?UTF-8?q?r).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 5 +++++
 config.h     | 6 +++---
 menu.c       | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 33534dddd..c834f0af5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1384,6 +1384,8 @@ Marco Schl
  some superfluous semicolons in ci.c
  for pointing out what caused the problem with audio track descriptions after a
  replay has been stopped
+ for reporting a problem with displaying the replay mode symbol in case of "Multi
+ speed mode"
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index baa951cf9..f46e5f963 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4980,3 +4980,8 @@ Video Disk Recorder Revision History
 - Fixed deleting EPG events that have a running status of "pausing" or higher.
 - Fixed handling NITs with more than one delivery system descriptor tag for the
   same transponder.
+
+2006-11-04: Version 1.4.4
+
+- Fixed displaying the replay mode symbol in case of "Multi speed mode" (reported
+  by Marco Schl��ler).
diff --git a/config.h b/config.h
index bd2becb01..3d0e2a0da 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.276 2006/10/28 09:15:00 kls Exp $
+ * $Id: config.h 1.277 2006/11/04 13:19:31 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.3-4"
-#define VDRVERSNUM   10403  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.4.4"
+#define VDRVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/menu.c b/menu.c
index 239ef72b3..870216b7a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.444 2006/10/20 13:18:38 kls Exp $
+ * $Id: menu.c 1.445 2006/11/04 13:13:18 kls Exp $
  */
 
 #include "menu.h"
@@ -3818,7 +3818,7 @@ cReplayControl::cReplayControl(void)
   visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
   lastPlay = lastForward = false;
-  lastSpeed = -1;
+  lastSpeed = -2; // an invalid value
   timeoutShow = 0;
   timeSearchActive = false;
   marks.Load(fileName);
@@ -3885,7 +3885,7 @@ void cReplayControl::Hide(void)
      needsFastResponse = visible = false;
      modeOnly = false;
      lastPlay = lastForward = false;
-     lastSpeed = -1;
+     lastSpeed = -2; // an invalid value
      timeSearchActive = false;
      }
 }

From 287cd613a1d5d08fb56e107460473132d23e3ca0 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Dec 2006 18:00:00 +0100
Subject: [PATCH 162/307] =?UTF-8?q?Version=201.4.4-1=20-=20Some=20improvem?=
 =?UTF-8?q?ents=20to=20the=20man=20pages=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4).=20-=20Fixed=20a=20possible=20segfault=20in=20cSkins::M?=
 =?UTF-8?q?essage()=20(thanks=20to=20Udo=20Richter).=20-=20Made=20the=20ge?=
 =?UTF-8?q?tskyepg.pl=20script=20of=20the=20'sky'=20plugin=20send=20a=20us?=
 =?UTF-8?q?er=20agent=20message=20to=20=20=20the=20server,=20according=20t?=
 =?UTF-8?q?o=20the=20rules=20at=20http://bleb.org/tv/data/listings.=20=20?=
 =?UTF-8?q?=20If=20your=20version=20of=20'wget'=20doesn't=20support=20the?=
 =?UTF-8?q?=20-U=20option=20to=20set=20the=20user=20agent,=20=20=20use=20t?=
 =?UTF-8?q?he=20new=20option=20-U=20of=20getskyepg.pl=20to=20have=20the=20?=
 =?UTF-8?q?information=20added=20to=20the=20URL=20=20=20as=20a=20query=20s?=
 =?UTF-8?q?tring.=20-=20The=20getskyepg.pl=20script=20now=20replaces=20"&a?=
 =?UTF-8?q?mp;"=20with=20"&".=20-=20Fixed=20a=20possible=20crash=20in=20re?=
 =?UTF-8?q?mux.c=20on=2064-bit=20machines=20(thanks=20to=20Reinhard=20Niss?=
 =?UTF-8?q?l).=20-=20Fixed=20a=20typo=20in=20the=20change=20to=20the=20"Us?=
 =?UTF-8?q?e=20small=20font"=20setup=20option=20in=20version=201.3.47=20?=
 =?UTF-8?q?=20=20in=20the=20HISTORY=20and=20CONTRIBUTORS=20file=20(reporte?=
 =?UTF-8?q?d=20by=20Andreas=20Brugger).=20-=20Added=20a=20missing=20'const?=
 =?UTF-8?q?'=20to=20cRecordingInfo::ChannelID()=20(reported=20by=20Andreas?=
 =?UTF-8?q?=20=20=20Brugger).=20This=20required=20the=20APIVERSION=20to=20?=
 =?UTF-8?q?be=20increased,=20so=20plugins=20will=20have=20to=20=20=20be=20?=
 =?UTF-8?q?recompiled.=20-=20Now=20calling=20cPluginManager::Active()=20on?=
 =?UTF-8?q?ly=20if=20VDR=20is=20really=20trying=20to=20shut=20down,=20=20?=
 =?UTF-8?q?=20and=20waiting=20for=205=20minutes=20before=20calling=20it=20?=
 =?UTF-8?q?again=20(thanks=20to=20J=C3=B6rg=20Wendel=20for=20=20=20reporti?=
 =?UTF-8?q?ng=20that=20cPlugin::Active()=20was=20called=20too=20often,=20a?=
 =?UTF-8?q?nd=20to=20Udo=20Richter=20for=20=20=20some=20hints=20on=20how?=
 =?UTF-8?q?=20to=20improve=20this).=20-=20Replaced=20'unsigned=20long'=20w?=
 =?UTF-8?q?ith=20'uint32=5Ft'=20and=20'uint64'=20with=20'uint64=5Ft'=20to?=
 =?UTF-8?q?=20=20=20avoid=20problems=20on=2064-bit=20machines.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                 | 12 +++++++++++-
 HISTORY                      | 25 ++++++++++++++++++++++++-
 PLUGINS/src/sky/HISTORY      |  9 +++++++++
 PLUGINS/src/sky/getskyepg.pl | 28 ++++++++++++++++++++++++----
 config.h                     |  8 ++++----
 font.h                       |  4 ++--
 menu.c                       |  4 ++--
 rcu.c                        |  8 ++++----
 recording.h                  |  4 ++--
 remote.c                     | 16 ++++++++--------
 remote.h                     | 10 +++++-----
 remux.c                      |  6 +++---
 skins.c                      |  7 +++++--
 tools.c                      |  8 ++++----
 tools.h                      | 10 +++++-----
 vdr.1                        | 14 ++++++++------
 vdr.5                        |  8 ++++----
 vdr.c                        |  8 ++++++--
 18 files changed, 130 insertions(+), 59 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c834f0af5..2a9ee3d18 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1113,6 +1113,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for implementing cDevice::ForceTransferMode()
  for changing the behaviour when hitting the end of a recording in fast forward mode
  for suggesting to give the cRemote::CallPlugin() function a boolean return value
+ for fixing a possible crash in remux.c on 64-bit machines
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1474,6 +1475,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting that an assignment in svdrp.c didn't use the cTimer::operator=())
  for suggesting that the function cThread::Cancel() should only set 'running' to
  false and not actually kill the thread if the special value -1 is given
+ or fixing a possible segfault in cSkins::Message()
+ for some hints on how to improve handling cPluginManager::Active()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1521,6 +1524,9 @@ Andreas Brugger <brougs78@gmx.net>
  cStatus::Replaying(), so that they can provide the full file name of the recording
  for suggesting that externally provided EPG data (with table ID 0x00) shall get its
  component descriptors set from the broadcast data
+ for reporting a typo in the change to the "Use small font" setup option in version
+ 1.3.47 in the HISTORY and CONTRIBUTORS file
+ for reporting a missing 'const' in cRecordingInfo::ChannelID()
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
@@ -1638,6 +1644,7 @@ Ville Skytt
  for fixing converting the port number in the "connect from..." log message of SVDRP
  for reporting that there are places where ntohs() is assigned to different types
  for adapting cThread::ThreadId() to recent kernels
+ for some improvements to the man pages
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1903,7 +1910,7 @@ Suur Karu <suurkaru@fastmail.fm>
 Ronny Kornexl <ronny.kornexl@online.de>
  for reporting a problem with setting "No title" for broken event data
  for suggesting to make the "Use small font" setup option *always* use the small
- font if set to '3' - even if it would have been a fixed font
+ font if set to '2' - even if it would have been a fixed font
  for reporting a bug in initializing 'noapiv' in the Makefile
 
 Vladim�r B�rta <vladimir.barta@k2atmitec.cz>
@@ -2032,3 +2039,6 @@ Boguslaw Juza <bogdan@uci.agh.edu.pl>
 Ulf Kiener <webmaster@ulf-kiener.de>
  for reporting a problem with audio track descriptions in the DVD plugin after a
  replay has been stopped
+
+J�rg Wendel <vdr-ml@jwendel.de>
+ for reporting that cPlugin::Active() was called too often
diff --git a/HISTORY b/HISTORY
index f46e5f963..baa53de9c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4611,7 +4611,7 @@ Video Disk Recorder Revision History
   (since version 1.3.38 disk access is done in a separate thread, so the watchdog
   timer won't hit).
 - Changed the behaviour of the "Use small font" setup option to *always* use the small
-  font if set to '3' - even if it would have been a fixed font (suggested by Ronny
+  font if set to '2' - even if it would have been a fixed font (suggested by Ronny
   Kornexl).
 - No longer using characters 0x01 and 0x02 for mapping single quote and slash in
   recording names (thanks to Patrick Fischer for reporting that this was a problem
@@ -4985,3 +4985,26 @@ Video Disk Recorder Revision History
 
 - Fixed displaying the replay mode symbol in case of "Multi speed mode" (reported
   by Marco Schl��ler).
+
+2006-12-03: Version 1.4.4-1
+
+- Some improvements to the man pages (thanks to Ville Skytt�).
+- Fixed a possible segfault in cSkins::Message() (thanks to Udo Richter).
+- Made the getskyepg.pl script of the 'sky' plugin send a user agent message to
+  the server, according to the rules at http://bleb.org/tv/data/listings.
+  If your version of 'wget' doesn't support the -U option to set the user agent,
+  use the new option -U of getskyepg.pl to have the information added to the URL
+  as a query string.
+- The getskyepg.pl script now replaces "&amp;" with "&".
+- Fixed a possible crash in remux.c on 64-bit machines (thanks to Reinhard Nissl).
+- Fixed a typo in the change to the "Use small font" setup option in version 1.3.47
+  in the HISTORY and CONTRIBUTORS file (reported by Andreas Brugger).
+- Added a missing 'const' to cRecordingInfo::ChannelID() (reported by Andreas
+  Brugger). This required the APIVERSION to be increased, so plugins will have to
+  be recompiled.
+- Now calling cPluginManager::Active() only if VDR is really trying to shut down,
+  and waiting for 5 minutes before calling it again (thanks to J�rg Wendel for
+  reporting that cPlugin::Active() was called too often, and to Udo Richter for
+  some hints on how to improve this).
+- Replaced 'unsigned long long' with 'uint32_t' and 'uint64' with 'uint64_t' to
+  avoid problems on 64-bit machines.
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 45774f15d..3233bf626 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -45,3 +45,12 @@ VDR Plugin 'sky' Revision History
 2006-03-26: Version 0.3.5
 
 - Fixed format string handling.
+
+2006-12-02: Version 0.3.5 (version number not increased)
+
+- Made the getskyepg.pl script send a user agent message to
+  the server, according to the rules at http://bleb.org/tv/data/listings.
+  If your version of 'wget' doesn't support the -U option to set the user agent,
+  use the new option -U of getskyepg.pl to have the information added to the URL
+  as a query string.
+- The getskyepg.pl script now replaces "&amp;" with "&".
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index 26dbc0a02..6388caaed 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 1.4 2006/01/08 10:21:32 kls Exp $
+# $Id: getskyepg.pl 1.6 2006/12/02 09:52:49 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
@@ -21,18 +21,29 @@
          -p port            SVDRP port number (default: 2001)
          -S source          channel source (default: S28.2E)
          -D days            days to get EPG for (1..7, default: 2)
+         -U                 use this if your version of 'wget' doesn't support -U
 };
 
-die $Usage if (!getopts("c:d:D:hp:S:") || $opt_h);
+die $Usage if (!getopts("c:d:D:hp:S:U") || $opt_h);
 
 $Conf   = $opt_c || "channels.conf.sky";
 $Dest   = $opt_d || "localhost";
 $Port   = $opt_p || 2001;
 $Source = $opt_S || "S28.2E";
 $Days   = $opt_D || 2;
+$User   = $opt_U;
+
+# See "Rules for using this data" on http://bleb.org/tv/data/listings.
+# In case you modify this script in a way that changes its behavior
+# towards the www.bleb.org website, please replace 'vdrbugs@cadsoft.de'
+# with your own email address! That way Andrew Flegg <andrew@bleb.org>,
+# who runs that web site, can contact you in case of problems.
+$IDENT = "VDR::getskyepg.pl, http://www.cadsoft.de/vdr - vdrbugs\@cadsoft.de";
+$GAP = 2;
 
 $SkyWebPage = "www.bleb.org/tv/data/listings";
 $WGET = "/usr/bin/wget -q -O-";
+$WGET .= " -U '$IDENT'" unless $User;
 $LOGGER = "/usr/bin/logger -t SKYEPG";
 
 $DST = -3600; # Daylight Saving Time offset
@@ -76,13 +87,21 @@ sub GetPage
   my $channel = shift;
   my $day = shift;
   $day--;
-  my $url = "$SkyWebPage/$day/$channel.xml";
+  my $url = "http://$SkyWebPage/$day/$channel.xml";
+  $url .= "?$IDENT" if $User;
   Log("reading $url");
   my @page = split("\n", `$WGET '$url'`);
   Log("received " . ($#page + 1) . " lines");
   return @page;
 }
 
+sub ReplaceTags
+{
+  my $s = shift;
+  $s =~ s/&amp;/&/g;
+  return $s;
+}
+
 sub StripWhitespace
 {
   my $s = shift;
@@ -96,7 +115,7 @@ sub Extract
   my $s = shift;
   my $t = shift;
   $s =~ /<$t>([^<]*)<\/$t>/;
-  return StripWhitespace($1);
+  return ReplaceTags(StripWhitespace($1));
 }
 
 # In order to get the duration we need to buffer the last event:
@@ -174,6 +193,7 @@ sub GetEpgData
              $data .= $line;
              }
           }
+      sleep($GAP);
       }
   SVDRPsend("c");
   Log("generated $numEvents EPG events");
diff --git a/config.h b/config.h
index 3d0e2a0da..5da7b68b7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.277 2006/11/04 13:19:31 kls Exp $
+ * $Id: config.h 1.279 2006/12/01 15:08:43 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.4"
+#define VDRVERSION  "1.4.4-1"
 #define VDRVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.4.4"
-#define APIVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.4.5"
+#define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/font.h b/font.h
index 2a1042942..3a3ece425 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.12 2006/02/05 13:46:36 kls Exp $
+ * $Id: font.h 1.13 2006/12/02 11:11:48 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -32,7 +32,7 @@ enum eDvbCode {
 class cFont {
 public:
   enum { NUMCHARS = 256 };
-  typedef unsigned long tPixelData;
+  typedef uint32_t tPixelData;
   struct tCharData {
     tPixelData width, height;
     tPixelData lines[1];
diff --git a/menu.c b/menu.c
index 870216b7a..10a3b266e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.445 2006/11/04 13:13:18 kls Exp $
+ * $Id: menu.c 1.446 2006/12/02 11:12:02 kls Exp $
  */
 
 #include "menu.h"
@@ -3280,7 +3280,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             return osEnd;
             }
     };
-  if (!timeout || lastTime.Elapsed() < (uint64)(Setup.ChannelInfoTime * 1000)) {
+  if (!timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
      if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
         // makes sure a channel switch through the SVDRP CHAN command is displayed
         channel = Channels.GetByNumber(cDevice::CurrentChannel());
diff --git a/rcu.c b/rcu.c
index 39211bb26..d81c0b6a0 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.14 2006/06/16 09:29:24 kls Exp $
+ * $Id: rcu.c 1.15 2006/12/02 11:12:28 kls Exp $
  */
 
 #include "rcu.h"
@@ -97,7 +97,7 @@ void cRcuRemote::Action(void)
   time_t LastCodeRefresh = 0;
   cTimeMs FirstTime;
   unsigned char LastCode = 0, LastMode = 0;
-  uint64 LastCommand = ~0; // 0x00 might be a valid command
+  uint64_t LastCommand = ~0; // 0x00 might be a valid command
   unsigned int LastData = 0;
   bool repeat = false;
 
@@ -109,13 +109,13 @@ void cRcuRemote::Action(void)
                   buffer.raw[i] = b;
                   if (i == 5) {
                      unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
-                     uint64         Command = ntohl(buffer.data.command);
+                     uint64_t       Command = ntohl(buffer.data.command);
                      if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
                         // Well, well, if it isn't the "d-box"...
                         // This remote control sends the above command before and after
                         // each keypress - let's just drop this:
                         break;
-                     Command |= uint64(Address) << 32;
+                     Command |= uint64_t(Address) << 32;
                      if (Command != LastCommand) {
                         LastCommand = Command;
                         repeat = false;
diff --git a/recording.h b/recording.h
index def351f87..f9db505d5 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.55 2006/07/30 10:24:07 kls Exp $
+ * $Id: recording.h 1.56 2006/12/01 15:06:07 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -50,7 +50,7 @@ class cRecordingInfo {
   void SetAux(const char *Aux);
 public:
   ~cRecordingInfo();
-  tChannelID ChannelID(void) { return channelID; }
+  tChannelID ChannelID(void) const { return channelID; }
   const char *Title(void) const { return event->Title(); }
   const char *ShortText(void) const { return event->ShortText(); }
   const char *Description(void) const { return event->Description(); }
diff --git a/remote.c b/remote.c
index 112f6c1b8..fa341846b 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.54 2006/10/14 11:05:57 kls Exp $
+ * $Id: remote.c 1.55 2006/12/02 11:12:42 kls Exp $
  */
 
 #include "remote.h"
@@ -116,7 +116,7 @@ bool cRemote::PutMacro(eKeys Key)
   return true;
 }
 
-bool cRemote::Put(uint64 Code, bool Repeat, bool Release)
+bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
 {
   char buffer[32];
   snprintf(buffer, sizeof(buffer), "%016LX", Code);
@@ -203,7 +203,7 @@ cRemotes Remotes;
 
 struct tKbdMap {
   eKbdFunc func;
-  uint64 code;
+  uint64_t code;
   };
 
 static tKbdMap KbdMap[] = {
@@ -264,7 +264,7 @@ void cKbdRemote::SetRawMode(bool RawMode)
   rawMode = RawMode;
 }
 
-uint64 cKbdRemote::MapFuncToCode(int Func)
+uint64_t cKbdRemote::MapFuncToCode(int Func)
 {
   for (tKbdMap *p = KbdMap; p->func != kfNone; p++) {
       if (p->func == Func)
@@ -273,7 +273,7 @@ uint64 cKbdRemote::MapFuncToCode(int Func)
   return (Func <= 0xFF) ? Func : 0;
 }
 
-int cKbdRemote::MapCodeToFunc(uint64 Code)
+int cKbdRemote::MapCodeToFunc(uint64_t Code)
 {
   for (tKbdMap *p = KbdMap; p->func != kfNone; p++) {
       if (p->code == Code)
@@ -296,9 +296,9 @@ int cKbdRemote::ReadKey(void)
   return -1;
 }
 
-uint64 cKbdRemote::ReadKeySequence(void)
+uint64_t cKbdRemote::ReadKeySequence(void)
 {
-  uint64 k = 0;
+  uint64_t k = 0;
   int key1;
 
   if ((key1 = ReadKey()) >= 0) {
@@ -342,7 +342,7 @@ uint64 cKbdRemote::ReadKeySequence(void)
 void cKbdRemote::Action(void)
 {
   while (Running()) {
-        uint64 Command = ReadKeySequence();
+        uint64_t Command = ReadKeySequence();
         if (Command) {
            if (rawMode || !Put(Command)) {
               int func = MapCodeToFunc(Command);
diff --git a/remote.h b/remote.h
index 4477666bd..03be5288e 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.37 2006/10/14 11:46:58 kls Exp $
+ * $Id: remote.h 1.38 2006/12/02 11:12:49 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -35,7 +35,7 @@ class cRemote : public cListObject {
   cRemote(const char *Name);
   const char *GetSetup(void);
   void PutSetup(const char *Setup);
-  bool Put(uint64 Code, bool Repeat = false, bool Release = false);
+  bool Put(uint64_t Code, bool Repeat = false, bool Release = false);
   bool Put(const char *Code, bool Repeat = false, bool Release = false);
 public:
   virtual ~cRemote();
@@ -100,13 +100,13 @@ class cKbdRemote : public cRemote, private cThread {
   struct termios savedTm;
   virtual void Action(void);
   int ReadKey(void);
-  uint64 ReadKeySequence(void);
-  int MapCodeToFunc(uint64 Code);
+  uint64_t ReadKeySequence(void);
+  int MapCodeToFunc(uint64_t Code);
 public:
   cKbdRemote(void);
   virtual ~cKbdRemote();
   static bool KbdAvailable(void) { return kbdAvailable; }
-  static uint64 MapFuncToCode(int Func);
+  static uint64_t MapFuncToCode(int Func);
   static void SetRawMode(bool RawMode);
   };
 
diff --git a/remux.c b/remux.c
index 2d1b74143..da805b76a 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.56 2006/04/17 12:48:12 kls Exp $
+ * $Id: remux.c 1.57 2006/12/01 14:46:25 kls Exp $
  */
 
 #include "remux.h"
@@ -389,7 +389,7 @@ bool cVideoRepacker::ScanDataForStartCodeFast(const uchar *&Data, const uchar *L
         }
 
   Data = Limit;
-  unsigned long *Scanner = (unsigned long *)(Data - 3);
+  uint32_t *Scanner = (uint32_t *)(Data - 3);
   scanner = ntohl(*Scanner);
   return false;
 }
@@ -615,7 +615,7 @@ bool cVideoRepacker::ScanForEndOfPictureFast(const uchar *&Data, const uchar *Li
         }
 
   Data = Limit + 1;
-  unsigned long *LocalScanner = (unsigned long *)(Data - 4);
+  uint32_t *LocalScanner = (uint32_t *)(Data - 4);
   localScanner = ntohl(*LocalScanner);
   return false;
 }
diff --git a/skins.c b/skins.c
index 7a9682ed1..34b26382a 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.11 2006/06/03 14:39:14 kls Exp $
+ * $Id: skins.c 1.12 2006/12/01 13:32:37 kls Exp $
  */
 
 #include "skins.h"
@@ -226,8 +226,11 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
     }
   if (!Current())
      return kNone;
-  if (!cSkinDisplay::Current() && !displayMessage)
+  if (!cSkinDisplay::Current()) {
+     if (displayMessage)
+        delete displayMessage;
      displayMessage = Current()->DisplayMessage();
+     }
   cSkinDisplay::Current()->SetMessage(Type, s);
   cSkinDisplay::Current()->Flush();
   cStatus::MsgOsdStatusMessage(s);
diff --git a/tools.c b/tools.c
index 8ec1e696b..255c80617 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.120 2006/08/12 13:30:07 kls Exp $
+ * $Id: tools.c 1.121 2006/12/02 11:12:59 kls Exp $
  */
 
 #include "tools.h"
@@ -547,11 +547,11 @@ cTimeMs::cTimeMs(void)
   Set();
 }
 
-uint64 cTimeMs::Now(void)
+uint64_t cTimeMs::Now(void)
 {
   struct timeval t;
   if (gettimeofday(&t, NULL) == 0)
-     return (uint64(t.tv_sec)) * 1000 + t.tv_usec / 1000;
+     return (uint64_t(t.tv_sec)) * 1000 + t.tv_usec / 1000;
   return 0;
 }
 
@@ -565,7 +565,7 @@ bool cTimeMs::TimedOut(void)
   return Now() >= begin;
 }
 
-uint64 cTimeMs::Elapsed(void)
+uint64_t cTimeMs::Elapsed(void)
 {
   return Now() - begin;
 }
diff --git a/tools.h b/tools.h
index 0d7941401..b1313eded 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.93 2006/04/16 10:40:45 kls Exp $
+ * $Id: tools.h 1.94 2006/12/02 11:14:14 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
@@ -22,7 +23,6 @@
 #include <sys/types.h>
 
 typedef unsigned char uchar;
-typedef unsigned long long int uint64;
 
 extern int SysLogLevel;
 
@@ -159,13 +159,13 @@ class cBase64Encoder {
 
 class cTimeMs {
 private:
-  uint64 begin;
+  uint64_t begin;
 public:
   cTimeMs(void);
-  static uint64 Now(void);
+  static uint64_t Now(void);
   void Set(int Ms = 0);
   bool TimedOut(void);
-  uint64 Elapsed(void);
+  uint64_t Elapsed(void);
   };
 
 class cReadLine {
diff --git a/vdr.1 b/vdr.1
index 86f5bdf73..b18f3b4f2 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.26 2006/06/24 10:07:16 kls Exp $
+.\" $Id: vdr.1 1.27 2006/11/19 10:02:31 kls Exp $
 .\"
 .TH vdr 1 "30 Apr 2006" "1.4.0" "Video Disk Recorder"
 .SH NAME
@@ -23,12 +23,12 @@ It can work with signals received from satellites (DVB-S) as
 well as cable (DVB-C) and terrestrial (DVB-T) signals.
 
 At least one DVB card is required to run \fBvdr\fR. With it you can watch
-live tv while recording one or more other broadcasts from the same transponder.
+live TV while recording one or more other broadcasts from the same transponder.
 It is also possible to start watching a recorded programme before the live
 broadcast has ended (\fBtime shifting\fR). In order to record from different
 transponders simultaneously two or more DVB cards are necessary.
 By default \fBvdr\fR can support up to four
-DVB cards. The primary DVB card (the one your tv set is connected to) has
+DVB cards. The primary DVB card (the one your TV set is connected to) has
 to be a "full featured" card, which means it must contain an MPEG decoder
 and provide audio and video signal outputs.
 
@@ -76,7 +76,7 @@ Set logging to \fIlevel\fR.
 \fB0\fR\ =\ no logging, \fB1\fR\ =\ errors only,
 \fB2\fR\ =\ errors and info, \fB3\fR\ =\ errors, info and debug.
 The default logging level is \fB3\fR.
-If logging should be done to LOG_LOCALn instead of
+If logging should be done to LOG_LOCAL\fIn\fR instead of
 LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
 .TP
 .BI \-L\  dir ,\ \-\-lib= dir
@@ -122,10 +122,12 @@ Use a serial port remote control device.
 If \fIpath\fR is omitted, vdr uses \fI/dev/ttyS1\fR.
 .TP
 .BI \-r\  cmd ,\ \-\-record= cmd
-Call \fIcmd\fR before and after a recording.
+Call \fIcmd\fR before and after a recording. See the file \fIINSTALL\fR for
+more information.
 .TP
 .BI \-s\  cmd ,\ \-\-shutdown= cmd
-Call \fIcmd\fR to shutdown the computer.
+Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
+information.
 .TP
 .BI \-t\  tty ,\ \-\-terminal= tty
 Set the controlling terminal.
diff --git a/vdr.5 b/vdr.5
index 3ecbe91f1..2e77f1eae 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.59 2006/04/30 08:55:16 kls Exp $
+.\" $Id: vdr.5 1.60 2006/11/19 10:02:33 kls Exp $
 .\"
 .TH vdr 5 "30 Apr 2006" "1.4.0" "Video Disk Recorder Files"
 .SH NAME
@@ -57,7 +57,7 @@ to right):
 .B Name
 The channel's name (if the name originally contains a ':' character
 it has to be replaced by '|').
-Some tv stations provide a way of deriving a "short name" from the
+Some TV stations provide a way of deriving a "short name" from the
 channel name, which can be used in situations where there is not
 much space for displaying a long name. If a short name is available
 for this channel, it follows the full name and is delimited by a comma,
@@ -248,7 +248,7 @@ cause the timer to record on that day. Example:
 
 .B MTWTF\-\-
 
-will define a timer that records on Monday thru Friday and does not record
+will define a timer that records on Monday through Friday and does not record
 on weekends. The same result could be achieved with \fBABCDE\-\-\fR (this is
 used to allow setting the days with language specific characters).
 Note that only letters may be used here, no digits.
@@ -259,7 +259,7 @@ so a complete definition could look like this:
 
 \fBMTWTF\-\-@2002\-02\-18\fR
 
-which would implement a timer that records Monday thru Friday, and will hit
+which would implement a timer that records Monday through Friday, and will hit
 for the first time on or after February 18, 2002.
 This \fBfirst day\fR feature can be used to disable a repeating timer for a couple
 of days, or for instance to define a new Mon...Fri timer on Wednesday, which
diff --git a/vdr.c b/vdr.c
index 73c5c9184..a628cd015 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.280 2006/10/14 10:01:32 kls Exp $
+ * $Id: vdr.c 1.282 2006/12/02 16:22:12 kls Exp $
  */
 
 #include <getopt.h>
@@ -1154,7 +1154,7 @@ int main(int argc, char *argv[])
                  Skins.Message(mtInfo, tr("Editing process finished"));
               }
            }
-        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && !cPluginManager::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
+        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
            time_t Now = time(NULL);
            if (Now - LastActivity > ACTIVITYTIMEOUT) {
               // Shutdown:
@@ -1178,6 +1178,10 @@ int main(int argc, char *argv[])
                     timer = NULL;
                     dsyslog("reboot at %s", *TimeToString(Next));
                     }
+                 if (!ForceShutdown && cPluginManager::Active()) {
+                    LastActivity = Now - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
+                    continue;
+                    }
                  if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
                     ForceShutdown = false;
                     if (timer)

From 20e2335d3e1f6fa6ec6ffcc73117b438858ed52c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Dec 2006 18:00:00 +0100
Subject: [PATCH 163/307] Version 1.4.4-2 - Added '#include <stdint.h>' to
 font.h (reported by Peter Pinnau). - Added a compatibility define for
 'uint64' to tools.h, so that existing   plugins don't need to be modified
 immediately (reported by Suur Karu).   This will be removed in version 1.5.

---
 CONTRIBUTORS | 4 ++++
 HISTORY      | 7 +++++++
 config.h     | 4 ++--
 font.h       | 3 ++-
 tools.h      | 3 ++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2a9ee3d18..6a6582209 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1906,6 +1906,7 @@ Daniel Karsubka <dkar@gmx.de>
 Suur Karu <suurkaru@fastmail.fm>
  for reporting a problem with the tuning timeout for channels that have low symbol
  rates
+ for reporting that dropping the 'uint64' typedef caused many plugins to be modified
 
 Ronny Kornexl <ronny.kornexl@online.de>
  for reporting a problem with setting "No title" for broken event data
@@ -2042,3 +2043,6 @@ Ulf Kiener <webmaster@ulf-kiener.de>
 
 J�rg Wendel <vdr-ml@jwendel.de>
  for reporting that cPlugin::Active() was called too often
+
+Peter Pinnau <vdr@unterbrecher.de>
+ for reporting that 'uint32_t' requires uncluding stdint.h in font.h on some systems
diff --git a/HISTORY b/HISTORY
index baa53de9c..a93771d3a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5008,3 +5008,10 @@ Video Disk Recorder Revision History
   some hints on how to improve this).
 - Replaced 'unsigned long long' with 'uint32_t' and 'uint64' with 'uint64_t' to
   avoid problems on 64-bit machines.
+
+2006-12-03: Version 1.4.4-2
+
+- Added '#include <stdint.h>' to font.h (reported by Peter Pinnau).
+- Added a compatibility define for 'uint64' to tools.h, so that existing
+  plugins don't need to be modified immediately (reported by Suur Karu).
+  This will be removed in version 1.5.
diff --git a/config.h b/config.h
index 5da7b68b7..07ebbce54 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.279 2006/12/01 15:08:43 kls Exp $
+ * $Id: config.h 1.280 2006/12/03 16:44:29 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.4-1"
+#define VDRVERSION  "1.4.4-2"
 #define VDRVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/font.h b/font.h
index 3a3ece425..3c66a33d2 100644
--- a/font.h
+++ b/font.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.13 2006/12/02 11:11:48 kls Exp $
+ * $Id: font.h 1.14 2006/12/03 16:42:10 kls Exp $
  */
 
 #ifndef __FONT_H
 #define __FONT_H
 
+#include <stdint.h>
 #include <stdlib.h>
 
 enum eDvbFont {
diff --git a/tools.h b/tools.h
index b1313eded..149e2b7bf 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.94 2006/12/02 11:14:14 kls Exp $
+ * $Id: tools.h 1.95 2006/12/03 16:41:59 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 
 typedef unsigned char uchar;
+#define uint64 uint64_t // for compatibility - TODO remove in version 1.5
 
 extern int SysLogLevel;
 

From 6d4eb0df37c2669176677abeeb664da58f945d5f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 5 Jan 2007 18:00:00 +0100
Subject: [PATCH 164/307] Version 1.4.4-3 - Fixed a possible segfault if VDR
 gets terminated while a message is displayed   (thanks to Udo Richter). -
 Fixed the INSTALL section on retrying shutdown later (reported by Udo
 Richter). - When entering text via the numeric keys, the characters are now
 checked against   the allowed characters (thanks to Frank Schmirler). - Added
 a missing break statement in cCiHandler::OpenSession().

---
 CONTRIBUTORS |  4 ++++
 HISTORY      | 11 ++++++++++-
 INSTALL      |  5 ++---
 ci.c         |  3 ++-
 config.h     |  4 ++--
 menuitems.c  | 28 +++++++++++++++++-----------
 skins.c      | 11 ++++++++++-
 skins.h      |  4 +++-
 8 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6a6582209..79c6e18bb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1477,6 +1477,8 @@ Udo Richter <udo_richter@gmx.de>
  false and not actually kill the thread if the special value -1 is given
  or fixing a possible segfault in cSkins::Message()
  for some hints on how to improve handling cPluginManager::Active()
+ for fixing a possible segfault if VDR gets terminated while a message is displayed
+ for reporting an error in the INSTALL section on retrying shutdown later
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2014,6 +2016,8 @@ Norbert Wentz <norbert.wentz@online.de>
 Frank Schmirler <vdr@schmirler.de>
  for fixing handling client side termination of SVDRP connections
  for fixing assigning schedules to channels in case there is no initial EPG information
+ for making entering text via the numeric keys check the characters against the
+ allowed characters
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
diff --git a/HISTORY b/HISTORY
index a93771d3a..df5711dea 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5006,7 +5006,7 @@ Video Disk Recorder Revision History
   and waiting for 5 minutes before calling it again (thanks to J�rg Wendel for
   reporting that cPlugin::Active() was called too often, and to Udo Richter for
   some hints on how to improve this).
-- Replaced 'unsigned long long' with 'uint32_t' and 'uint64' with 'uint64_t' to
+- Replaced 'unsigned long' with 'uint32_t' and 'uint64' with 'uint64_t' to
   avoid problems on 64-bit machines.
 
 2006-12-03: Version 1.4.4-2
@@ -5015,3 +5015,12 @@ Video Disk Recorder Revision History
 - Added a compatibility define for 'uint64' to tools.h, so that existing
   plugins don't need to be modified immediately (reported by Suur Karu).
   This will be removed in version 1.5.
+
+2007-01-05: Version 1.4.4-3
+
+- Fixed a possible segfault if VDR gets terminated while a message is displayed
+  (thanks to Udo Richter).
+- Fixed the INSTALL section on retrying shutdown later (reported by Udo Richter).
+- When entering text via the numeric keys, the characters are now checked against
+  the allowed characters (thanks to Frank Schmirler).
+- Added a missing break statement in cCiHandler::OpenSession().
diff --git a/INSTALL b/INSTALL
index fef86017c..21dfcfadf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -199,9 +199,8 @@ correspond to a time that is "Min. event timeout" minutes in the future.
 Before the shutdown program is called, the user will be prompted to inform
 him that the system is about to shut down. If any remote control key is
 pressed while this prompt is visible, the shutdown will be cancelled (and
-tried again after another MinUserInactivity minutes). The shutdown prompt
-will be displayed for 5 minutes, which should be enough time for the user
-to react.
+tried again later). The shutdown prompt will be displayed for 5 minutes, which
+should be enough time for the user to react.
 
 A sample shell script to be used with the '-s' option might look like this:
 
diff --git a/ci.c b/ci.c
index 066acc27b..cce7b5d09 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.45 2006/08/20 11:38:33 kls Exp $
+ * $Id: ci.c 1.46 2007/01/05 10:08:46 kls Exp $
  */
 
 #include "ci.h"
@@ -1607,6 +1607,7 @@ bool cCiHandler::OpenSession(int Length, const uint8_t *Data)
                  }
               esyslog("ERROR: can't create session for resource identifier: %08X", ResourceId);
             }
+            break;
        default: esyslog("ERROR: unknown resource identifier: %08X", ResourceId);
        }
      }
diff --git a/config.h b/config.h
index 07ebbce54..6a3bf2b37 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.280 2006/12/03 16:44:29 kls Exp $
+ * $Id: config.h 1.281 2007/01/04 12:52:22 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.4-2"
+#define VDRVERSION  "1.4.4-3"
 #define VDRVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/menuitems.c b/menuitems.c
index 086668eea..366989dc4 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.47 2006/07/30 09:09:30 kls Exp $
+ * $Id: menuitems.c 1.48 2007/01/04 13:30:37 kls Exp $
  */
 
 #include "menuitems.h"
@@ -461,13 +461,6 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                           AdvancePos();
                        currentChar = NULL;
                        }
-                    if (insert && newchar) {
-                       // create a new character in insert mode
-                       if (int(strlen(value)) < length - 1) {
-                          memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
-                          value[pos] = ' ';
-                          }
-                       }
                     if (!currentChar || !*currentChar || *currentChar == '\t') {
                        // find the beginning of the character map entry for Key
                        int n = NORMALKEY(Key) - k0;
@@ -476,15 +469,28 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                              if (*currentChar++ == '\t')
                                 n--;
                              }
+                       // find first allowed character
+                       while (*currentChar && *currentChar != '\t' && !strchr(allowed, *currentChar))
+                             currentChar++;
                        }
                     if (*currentChar && *currentChar != '\t') {
+                       if (insert && newchar) {
+                          // create a new character in insert mode
+                          if (int(strlen(value)) < length - 1) {
+                             memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
+                             value[pos] = ' ';
+                             }
+                          }
                        value[pos] = *currentChar;
                        if (uppercase)
                           value[pos] = toupper(value[pos]);
-                       currentChar++;
+                       // find next allowed character
+                       do {
+                          currentChar++;
+                          } while (*currentChar && *currentChar != '\t' && !strchr(allowed, *currentChar));
+                       newchar = false;
+                       autoAdvanceTimeout.Set(AUTO_ADVANCE_TIMEOUT);
                        }
-                    newchar = false;
-                    autoAdvanceTimeout.Set(AUTO_ADVANCE_TIMEOUT);
                     }
                  else
                     return cMenuEditItem::ProcessKey(Key);
diff --git a/skins.c b/skins.c
index 34b26382a..f442e5adc 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.12 2006/12/01 13:32:37 kls Exp $
+ * $Id: skins.c 1.13 2007/01/04 13:08:55 kls Exp $
  */
 
 #include "skins.h"
@@ -358,3 +358,12 @@ void cSkins::Flush(void)
   if (cSkinDisplay::Current())
      cSkinDisplay::Current()->Flush();
 }
+
+void cSkins::Clear(void)
+{
+  if (displayMessage) {
+     delete displayMessage;
+     displayMessage = NULL;
+     }
+  cList<cSkin>::Clear();
+}
diff --git a/skins.h b/skins.h
index 9a9ba5704..a0f03880d 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.14 2006/06/03 10:21:45 kls Exp $
+ * $Id: skins.h 1.15 2007/01/04 13:08:55 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -360,6 +360,8 @@ class cSkins : public cList<cSkin> {
        ///< Processes the first queued message, if any.
   void Flush(void);
        ///< Flushes the currently active cSkinDisplay, if any.
+  virtual void Clear(void);
+       ///< Free up all registered skins
   };
 
 extern cSkins Skins;

From a2096f3beb9f7bf3ba600cf66555628fc899720e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 7 Jan 2007 18:00:00 +0100
Subject: [PATCH 165/307] Version 1.4.5 - Official release.

---
 HISTORY       |  4 ++++
 channels.conf | 63 ++++++++++++++++++++++++++-------------------------
 config.h      |  6 ++---
 tools.h       |  2 +-
 vdr.1         |  4 ++--
 vdr.5         |  4 ++--
 6 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/HISTORY b/HISTORY
index df5711dea..e290b6485 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5024,3 +5024,7 @@ Video Disk Recorder Revision History
 - When entering text via the numeric keys, the characters are now checked against
   the allowed characters (thanks to Frank Schmirler).
 - Added a missing break statement in cCiHandler::OpenSession().
+
+2007-01-07: Version 1.4.5
+
+- Official release.
diff --git a/channels.conf b/channels.conf
index fb5c8ecd3..b6ffe4ff8 100644
--- a/channels.conf
+++ b/channels.conf
@@ -6,10 +6,10 @@ Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu;106=deu:104:0:28106:1:1101:0
 Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
-SR S�DWEST Ferns.;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
+SR Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
 WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
 BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
-S�DWEST Ferns. BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
+SWR Fernsehen BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
 ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
@@ -44,30 +44,30 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:630:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1801,1702,1722:8:133:1:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1:43:133:2:0
+PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1702,1722,1801:8:133:1:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1702,1722,1801:43:133:2:0
 PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1801,1722,1702:9:133:2:0
 PREMIERE SERIE,SERIE;PREMIERE:11797:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1801,1702,1722:16:133:2:0
 PREMIERE KRIMI,KRIMI;PREMIERE:11797:hC34:S19.2E:27500:2815:2816=deu:32:1702,1801,1722:23:133:2:0
 PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11719:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:516:133:3:0
-PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:41:133:3:0
+PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:41:133:3:0
 PREMIERE FILMFEST,FILMFEST;PREMIERE:11719:hC34:S19.2E:27500:1279:1280=deu:32:1801,1702,1722:20:133:3:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1:34:133:17:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1702,1722:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1702,1722,1801:21:133:17:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1801,1702,1722,1810:513:133:4:0
+EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
 :Sportsworld
 PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1722,1801,1702:17:133:3:0
-Live Wetten:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
+PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
 :Beta Digital
 N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
-m�nchen.TV/RFO,m�TV/RFO;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
+APS.TV3;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
 ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
 Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
 Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
@@ -82,20 +82,20 @@ ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
 ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
 Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
-RTL TELE Letzebuerg:12551:vC56:S19.2E:22000:168:144=ltz,146=fra:74:0:3994:1:1108:0
-Nick/Talpa;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
-NICK;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
-Service 3;MTV Networks:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-VIVA;MTV Networks:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
-VIVA PLUS;MTV Networks:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
+RTL Tele Letzebuerg:12551:vC56:S19.2E:22000:168:144=ltz,146=fra:301:0:3994:1:1108:0
+tien;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
+NICK AUSTRIA;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
+Service 3;MTV Networks Europe:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
+VIVA;MTV Networks Europe:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
+VIVA PLUS;MTV Networks Europe:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :NTSC
 Venevision;T-Systems/MTI:11200:vC56:S13.0E:27500:922:923=und:0:0:4750:0:13400:0
 EBC.1;T-Systems/MTI:11200:vC56:S13.0E:27500:373:374=eng:0:0:4747:0:13400:0
 :HDTV
-HDFORUM;TF1:11242:vC34:S13.0E:27500:0:36=fra:0:0:13809:100:200:0
-HD FORUM;EUTELSAT:11240:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
+HDFORUM;TF1:11242:vC34:S13.0E:27500:0:36=fra,37=fra:0:0:13809:100:200:0
+LUXE TV HD;Eutelsat:11240:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
 Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
 Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
 SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
@@ -103,13 +103,13 @@ SMD HD:12699:vC56:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
 TV HD;CSAT:12581:vC56:S19.2E:22000:165:100=fra;101=fra:0:0:9306:1:1110:0
 C M HD;Telenor:11261:hC78:S1.0W:24500:517:660=eng;661=eng:0:B00:3306:70:33:0
-C MORE HD;Telenor:11389:hC78:S1.0W:24500:512:640;641=eng:0:B00:3306:70:34:0
-HELLAS-HDTV;Scopus Network Technologies:11642:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
+CANAL+ HD;Telenor:11389:hC78:S1.0W:24500:512:640;641=eng:580:0:3306:70:34:0
+HELLAS-HDTV;Scopus Network Technologies:11645:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
 TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:0
 :@201 Sky
 Sky One;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4703:2:2030:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2350=eng,2352=NAR:2354:0:10070:2:2044:0
+ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2349=eng,2352=NAR:2354:0:10070:2:2044:0
 SCI FI;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
 ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
 ParaComedy 1;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
@@ -118,25 +118,26 @@ Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201
 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;666=eng:582:960,961:4303:2:2007:0
 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,655=NAR;667=eng:583:960,961:4302:2:2007:0
 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;668=eng:584:960,961:4403:2:2007:0
-Sky Movies 4;BSkyB:11914:hC23:S28.2E:27500:512+8190:640=eng,655=NAR;660=eng:576:960,961:4402:2:2011:0
-Sky Movies 5;BSkyB:11914:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:4503:2:2011:0
-Sky Movies 6;BSkyB:11914:hC23:S28.2E:27500:513+8190:641=eng,657=NAR;661=eng:577:960,961:4502:2:2011:0
+Sky Movies 4;BSkyB:11836:hC23:S28.2E:27500:512+8190:640=eng,657=NAR;660=eng:576:960,961:4304:2:2007:0
+Sky Movies 5;BSkyB:11836:hC23:S28.2E:27500:513+8190:641=eng,658=NAR;661=eng:577:960,961:4305:2:2007:0
+Sky Movies 6;BSkyB:11836:hC23:S28.2E:27500:514+8190:642=eng,659=NAR;662=eng:578:960,961:4306:2:2007:0
 Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,653=NAR;663=eng:579:960,961:4603:2:2030:0
 Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:5502:2:2007:0
 Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,654=NAR;666=eng:2440:960,961:4602:2:2030:0
-Sky Cinema 1;BSkyB:12285:vC23:S28.2E:27500:519+8190:647=eng,667=NAR:583:960,961:4809:2:2030:0
-Sky Cinema 2;BSkyB:12285:vC23:S28.2E:27500:517+8190:645=eng,665=NAR:581:960,961:4802:2:2030:0
+Sky Movies 10;BSkyB:12285:vC23:S28.2E:27500:514+8190:642=eng,655=NAR;662=eng:2441:960,961:4604:2:2030:0
+Sky Cinema 1;BSkyB:11603:vC23:S28.2E:27500:513+129:641=eng,661=NAR:577:960,961:4651:2:2408:0
+Sky Cinema 2;BSkyB:11603:vC23:S28.2E:27500:514+130:642=eng,662=NAR:578:960,961:4652:2:2408:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
 WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
-Animal Plnt+1;BSkyB:12070:hC23:S28.2E:27500:514+8190:662=eng:0:960,961:50002:2:2019:0
+Animal Plnt+1;BSkyB:12070:hC23:S28.2E:27500:514+8190:662=eng,682=NAR:578:960,961:50002:2:2019:0
 S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
-CNN;BSkyB:12051:vC23:S28.2E:27500:2313:2315=eng:2314:0:7140:2:2018:0
+CNN;BSkyB:12051:vC23:S28.2E:27500:2317:2319=eng:2318:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 MTI;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
 WRN Eng AAP;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
-Dr Dish TV;Overon:12359:hC34:S13.0E:27500:4231:4232=eng:0:0:14023:318:8300:0
+Dr Dish TV;Overon:12359:hC34:S13.0E:27500:4231:4232:0:0:14023:318:8300:0
 ! LifeStyle-TV !;T-Systems:12633:hC56:S19.2E:22000:204:304=deu:0:0:12603:1:1113:0
 Challenger Tv;Telespazio:11295:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
-TVS Teleport Bonn;DMV:11535:vC34:S1.0W:5632:308+8190:256=eng,257=eng:0:0:1:65535:1:0
+NDS Enc 3;NDS:11535:vC34:S1.0W:5632:308+8190:256=eng,257=fra:273:0:1:65535:1:0
 :@1000 New channels
diff --git a/config.h b/config.h
index 6a3bf2b37..3597ff782 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.281 2007/01/04 12:52:22 kls Exp $
+ * $Id: config.h 1.282 2007/01/07 13:45:19 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.4-3"
-#define VDRVERSNUM   10404  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.4.5"
+#define VDRVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/tools.h b/tools.h
index 149e2b7bf..1f71ec4b4 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.95 2006/12/03 16:41:59 kls Exp $
+ * $Id: tools.h 1.96 2006/12/03 17:38:38 kls Exp $
  */
 
 #ifndef __TOOLS_H
diff --git a/vdr.1 b/vdr.1
index b18f3b4f2..5d2aa90ce 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.27 2006/11/19 10:02:31 kls Exp $
+.\" $Id: vdr.1 1.28 2007/01/07 14:03:56 kls Exp $
 .\"
-.TH vdr 1 "30 Apr 2006" "1.4.0" "Video Disk Recorder"
+.TH vdr 1 "07 Jan 2007" "1.4.5" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
diff --git a/vdr.5 b/vdr.5
index 2e77f1eae..18f942f66 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.60 2006/11/19 10:02:33 kls Exp $
+.\" $Id: vdr.5 1.61 2007/01/07 14:04:12 kls Exp $
 .\"
-.TH vdr 5 "30 Apr 2006" "1.4.0" "Video Disk Recorder Files"
+.TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION

From 66ab78a40f5b57e20142a33484e32c785a0c4017 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 7 Jan 2007 18:00:00 +0100
Subject: [PATCH 166/307] Version 1.5.0 - The CAM handling has been refactored.
 Instead of a cCiHandler per device there   is now an abstract cCiAdapter and
 a cCamSlot. This allows each slot to be   accessed individually. - The
 general 15 seconds workaround time before opening the CAM menu has been  
 removed. If the CAM menu doesn't open within a timeout, the enter menu
 command   is now sent again. - If a CAM is reset or pulled and reinserted, it
 now automatically starts   decrypting the current channel again. - The
 Setup/CAM menu now dynamically refreshes its items and displays whether   a
 CAM is present or ready. The 'Reset' function no longer leaves the menu. -
 The CAM menu will now be openend when pressing the Ok key on a slot entry. -
 The CAM menu now stays within the current menu context and doesn't close and 
  reopen the menu every time an option is selected. - When an encrypted
 channel is switched to for the first time, VDR now checks   explicitly
 whether a CAM can actually decrypt that channel. If there is more   than one
 CAM in the system that claims to be able to decrypt the channel,   they are
 all tried in turn.   To make this possible, an encrypted channel needs to be
 received in Transfer   Mode when it is switched to for the first time, so
 that VDR can determine   whether the TS packets are actually decrypted. Once
 a channel is known to   be decrypted by a particular CAM, the next time it is
 switched to it will   be shown in normal live viewing mode. - A cDevice now
 automatically detaches all cReceiver objects that receive PIDs   that can't
 be decrypted with the current CAM. A plugin that attaches a cReceiver   to a
 device should therefore watch the receiver's IsAttached() function to   see
 if it is still attached to the device. - The cReceiver constructor no longer
 takes an 'int Ca' as its first parameter,   but rather a 'tChannelID
 ChannelID'. This is necessary for the device to be   able to determine which
 CAM a particular channel can be decrypted with. If the   channel is known to
 be unencrypted, or a plugin doesn't want to provide the   channel id for
 other reasons, an invalid tChannelID() can be given. - The cThread::Start()
 function now waits until a previous incarnation of this   thread has actually
 stopped. Before this it could happen that a thread's   Cancel(-1) function
 was called and immediately after that it was started again,   but the Start()
 function still found it to be 'active'. - The parameter NeedsDetachReceivers
 in cDevice::GetDevice(const cChannel *Channel, ...)   has been removed. A
 call to this function will automatically detach all receivers   from the
 device if it returns a non-NULL pointer. - The cTimeMs class now accepts an
 initial timeout value in its constructor. - A CAM is now explicitly
 instructed to stop decrypting when switching away from   an encrypted
 channel. - If the CAM in use can decrypt several channels at the same time,
 VDR can   now make use if this capability. Whether or not a CAM can decrypt
 more   than one channel is determined by sending it an initial empty QUERY
 command   and testing whether it replies to it. - Ca values in the range
 0...F in channels.conf can still be used to assign a channel   to a
 particular device, but this will no longer work with encrypted channels
 because   without valid CA ids VDR can't decide which CAM slot to use.
 However, since VDR now   automatically determines which CAM can decrypt which
 channel, setting fixed   channel/device relations should no longer be
 necessary.   IF AN ENCRYPTED CHANNEL CAN'T BE DECRYPTED AND YOU HAVE A CA
 VALUE IN THE RANGE   0...F FOR THAT CHANNEL, SET IT TO 0 (FTA) AND TUNE TO
 THE CHANNEL AGAIN.

---
 HISTORY      |   53 ++
 MANUAL       |   16 +-
 Makefile     |    4 +-
 PLUGINS.html |   47 +-
 channels.h   |    3 +-
 ci.c         | 1742 ++++++++++++++++++++++++++++----------------------
 ci.h         |  247 ++++---
 config.h     |   10 +-
 device.c     |  276 ++++----
 device.h     |   51 +-
 dvbci.c      |  108 ++++
 dvbci.h      |   31 +
 dvbdevice.c  |   77 +--
 dvbdevice.h  |   10 +-
 i18n.c       |  200 +++---
 menu.c       |  416 ++++++------
 menu.h       |   28 +-
 osdbase.c    |   23 +-
 osdbase.h    |   11 +-
 pat.c        |   14 +-
 pat.h        |    4 +-
 receiver.c   |    6 +-
 receiver.h   |   19 +-
 recorder.c   |   10 +-
 recorder.h   |    8 +-
 thread.c     |   30 +-
 thread.h     |    3 +-
 tools.c      |    6 +-
 tools.h      |    6 +-
 transfer.c   |   17 +-
 transfer.h   |    6 +-
 vdr.c        |   17 +-
 32 files changed, 2079 insertions(+), 1420 deletions(-)
 create mode 100644 dvbci.c
 create mode 100644 dvbci.h

diff --git a/HISTORY b/HISTORY
index e290b6485..4649a2236 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5028,3 +5028,56 @@ Video Disk Recorder Revision History
 2007-01-07: Version 1.4.5
 
 - Official release.
+
+2007-01-07: Version 1.5.0
+
+- The CAM handling has been refactored. Instead of a cCiHandler per device there
+  is now an abstract cCiAdapter and a cCamSlot. This allows each slot to be
+  accessed individually.
+- The general 15 seconds workaround time before opening the CAM menu has been
+  removed. If the CAM menu doesn't open within a timeout, the enter menu command
+  is now sent again.
+- If a CAM is reset or pulled and reinserted, it now automatically starts
+  decrypting the current channel again.
+- The Setup/CAM menu now dynamically refreshes its items and displays whether
+  a CAM is present or ready. The 'Reset' function no longer leaves the menu.
+- The CAM menu will now be openend when pressing the Ok key on a slot entry.
+- The CAM menu now stays within the current menu context and doesn't close and
+  reopen the menu every time an option is selected.
+- When an encrypted channel is switched to for the first time, VDR now checks
+  explicitly whether a CAM can actually decrypt that channel. If there is more
+  than one CAM in the system that claims to be able to decrypt the channel,
+  they are all tried in turn.
+  To make this possible, an encrypted channel needs to be received in Transfer
+  Mode when it is switched to for the first time, so that VDR can determine
+  whether the TS packets are actually decrypted. Once a channel is known to
+  be decrypted by a particular CAM, the next time it is switched to it will
+  be shown in normal live viewing mode.
+- A cDevice now automatically detaches all cReceiver objects that receive PIDs
+  that can't be decrypted with the current CAM. A plugin that attaches a cReceiver
+  to a device should therefore watch the receiver's IsAttached() function to
+  see if it is still attached to the device.
+- The cReceiver constructor no longer takes an 'int Ca' as its first parameter,
+  but rather a 'tChannelID ChannelID'. This is necessary for the device to be
+  able to determine which CAM a particular channel can be decrypted with. If the
+  channel is known to be unencrypted, or a plugin doesn't want to provide the
+  channel id for other reasons, an invalid tChannelID() can be given.
+- The cThread::Start() function now waits until a previous incarnation of this
+  thread has actually stopped. Before this it could happen that a thread's
+  Cancel(-1) function was called and immediately after that it was started again,
+  but the Start() function still found it to be 'active'.
+- The parameter NeedsDetachReceivers in cDevice::GetDevice(const cChannel *Channel, ...)
+  has been removed. A call to this function will automatically detach all receivers
+  from the device if it returns a non-NULL pointer.
+- The cTimeMs class now accepts an initial timeout value in its constructor.
+- A CAM is now explicitly instructed to stop decrypting when switching away from
+  an encrypted channel.
+- If the CAM in use can decrypt several channels at the same time, VDR can
+  now make use if this capability. Whether or not a CAM can decrypt more
+  than one channel is determined by sending it an initial empty QUERY command
+  and testing whether it replies to it.
+- Ca values in the range 0...F in channels.conf can still be used to assign a channel
+  to a particular device, but this will no longer work with encrypted channels because
+  without valid CA ids VDR can't decide which CAM slot to use. However, since VDR now
+  automatically determines which CAM can decrypt which channel, setting fixed
+  channel/device relations should no longer be necessary.
diff --git a/MANUAL b/MANUAL
index 52c2a94e9..3377fb0dd 100644
--- a/MANUAL
+++ b/MANUAL
@@ -667,13 +667,15 @@ Version 1.4
 
   Use DiSEqC = no        Generally turns DiSEqC support on or off.
 
-  CICAM:
-
-  CICAM DVBn m           Shows the CAMs that each device contains, where 'n' is
-                         the number of the device, and 'm' is the number of the
-                         Common Interface slot of that device. The "Red" key
-                         can be pressed to enter the CAM menu, and the "Green" key
-                         triggers a reset of the selected CAM.
+  CAM:
+
+  n CAM Name             Shows the CAM slots that are present in this system, where
+                         'n' is the number of the slot, followed by the name of the
+                         CAM. If a CAM slot is empty, '-' is displayed as name, and
+                         if it is in the process of being reset, its current status
+                         is displayed.  The "Red" key can be pressed to enter the CAM
+                         menu, and the "Green" key triggers a reset of the selected
+                         slot. The "Ok" key also opens the CAM menu.
 
   Recording:
 
diff --git a/Makefile b/Makefile
index 1d73b79d9..cfa735451 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.95 2006/08/20 10:44:22 kls Exp $
+# $Id: Makefile 1.96 2006/11/11 13:55:32 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -32,7 +32,7 @@ DOXYFILE = Doxyfile
 
 SILIB    = $(LSIDIR)/libsi.a
 
-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
+OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o dvbosd.o\
        dvbplayer.o dvbspu.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o\
diff --git a/PLUGINS.html b/PLUGINS.html
index 51424ce30..71c1b77e5 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.4.1</b></center>
+<center><b>Version 1.5.0</b></center>
 <p>
 <center>
 Copyright &copy; 2006 Klaus Schmidinger<br>
@@ -14,6 +14,10 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.0 are marked like this.
+<!--X1.5.0--></td></tr></table>
+<p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
 This interface allows programmers to develop additional functionality for VDR completely
@@ -72,6 +76,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Conditional Access">Conditional Access</a>
+<!--X1.5.0--></td></tr></table>
 </ul>
 </ul>
 
@@ -1727,6 +1734,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool ProvidesSource(int Source) const;
+virtual bool ProvidesTransponder(const cChannel *Channel) const;
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 </pre></td></tr></table><p>
@@ -2038,5 +2046,42 @@ <h1>Table Of Contents</h1>
 
 The other parameters have the same meaning as in the first version of this function.
 
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Conditional Access"><hr><h2>Conditional Access</h2>
+
+<center><i><b>Members only!</b></i></center><p>
+
+Pay TV providers usually encrypt their broadcasts, so that only viewers who
+have the proper smart card can watch them. Such a smart card needs to be inserted
+into a CAM (Conditional Access Module), which in turn goes into a CI (Common
+Interface) slot.
+<p>
+VDR's mechanisms for supporting Conditional Access are mainly the two classes
+<tt>cCiAdapter</tt> and <tt>cCamSlot</tt>. A <tt>cCiAdapter</tt> handles exactly
+one CI, and can provide several CAM slots, represented by the appropriate
+number of <tt>cCamSlot</tt> objects.
+<p>
+In order to decrypt a particular channel, a <tt>cCiAdapter</tt> with a <tt>cCamSlot</tt>
+that contains the necessary CAM will be assigned to a <tt>cDevice</tt>, and exactly
+one of its CAM slots will be activated. Whether or not a <tt>cCiAdapter</tt> can
+be assigned to a particular device depends on the hardware implementation.
+Some devices (like the Siemens/Technotrend DVB cards) are hardwired with their
+CI adapters, so the <tt>cCiAdapter</tt> for these can only be used with one device.
+Other hardware implementations may allow CI adapters and devices to be connected
+through some sort of matrix switch. When trying to decrypt an encrypted channel,
+VDR will automatically select a useful combination of device and CAM slot.
+<p>
+If a plugin implements a derived <tt>cCiAdapter</tt>, it has to implement
+several low level functions that handle the actual data transfer (see <tt>dvbci.c</tt>
+for example). The decision whether the adapter can actually be assigned to different
+devices is made in the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual bool Assign(cDevice *Device, bool Query = false);
+</pre></td></tr></table><p>
+
+See the description of this function in <tt>ci.h</tt> for details.
+<!--X1.5.0--></td></tr></table>
+
 </body>
 </html>
diff --git a/channels.h b/channels.h
index c0dd37e0f..143bb47ca 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.42 2006/05/28 15:03:56 kls Exp $
+ * $Id: channels.h 1.43 2007/01/05 10:37:35 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -179,6 +179,7 @@ class cChannel : public cListObject {
   const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
   const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
   int Tpid(void) const { return tpid; }
+  const int *Caids(void) const { return caids; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
   int Nid(void) const { return nid; }
   int Tid(void) const { return tid; }
diff --git a/ci.c b/ci.c
index cce7b5d09..26447cbac 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.46 2007/01/05 10:08:46 kls Exp $
+ * $Id: ci.c 1.47 2007/01/05 10:38:03 kls Exp $
  */
 
 #include "ci.h"
@@ -17,38 +17,18 @@
 #include <sys/ioctl.h>
 #include <time.h>
 #include <unistd.h>
+#include "device.h"
 #include "pat.h"
 #include "tools.h"
 
-/* these might come in handy in case you want to use this code without VDR's other files:
-#ifndef MALLOC
-#define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
-#endif
-
-#ifndef esyslog
-static int SysLogLevel = 3;
-#define esyslog(a...) void( (SysLogLevel > 0) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
-#define isyslog(a...) void( (SysLogLevel > 1) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
-#define dsyslog(a...) void( (SysLogLevel > 2) ? void(fprintf(stderr, a)), void(fprintf(stderr, "\n")) : void() )
-#endif
-*/
-
 // Set these to 'true' for debug output:
 static bool DumpTPDUDataTransfer = false;
 static bool DebugProtocol = false;
+static bool DumpPolls = false;
+static bool DumpDateTime = false;
 
 #define dbgprotocol(a...) if (DebugProtocol) fprintf(stderr, a)
 
-#define OK       0
-#define TIMEOUT -1
-#define ERROR   -2
-
-// --- Workarounds -----------------------------------------------------------
-
-// The Irdeto AllCAM 4.7 (and maybe others, too) does not react on AOT_ENTER_MENU
-// during the first few seconds of a newly established connection
-#define WRKRND_TIME_BEFORE_ENTER_MENU  15 // seconds
-
 // --- Helper functions ------------------------------------------------------
 
 #define SIZE_INDICATOR 0x80
@@ -144,27 +124,29 @@ static char *GetString(int &Length, const uint8_t **Data)
 class cTPDU {
 private:
   int size;
-  uint8_t data[MAX_TPDU_SIZE];
+  uint8_t buffer[MAX_TPDU_SIZE];
   const uint8_t *GetData(const uint8_t *Data, int &Length);
 public:
   cTPDU(void) { size = 0; }
   cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
-  uint8_t Slot(void) { return data[0]; }
-  uint8_t Tcid(void) { return data[1]; }
-  uint8_t Tag(void)  { return data[2]; }
-  const uint8_t *Data(int &Length) { return GetData(data + 3, Length); }
+  uint8_t Slot(void) { return buffer[0]; }
+  uint8_t Tcid(void) { return buffer[1]; }
+  uint8_t Tag(void)  { return buffer[2]; }
+  const uint8_t *Data(int &Length) { return GetData(buffer + 3, Length); }
   uint8_t Status(void);
-  int Write(int fd);
-  int Read(int fd);
-  void Dump(int fd, bool Outgoing);
+  uint8_t *Buffer(void) { return buffer; }
+  int Size(void) { return size; }
+  void SetSize(int Size) { size = Size; }
+  int MaxSize(void) { return sizeof(buffer); }
+  void Dump(int SlotNumber, bool Outgoing);
   };
 
 cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t *Data)
 {
   size = 0;
-  data[0] = Slot;
-  data[1] = Tcid;
-  data[2] = Tag;
+  buffer[0] = Slot;
+  buffer[1] = Tcid;
+  buffer[2] = Tag;
   switch (Tag) {
     case T_RCV:
     case T_CREATE_TC:
@@ -172,72 +154,51 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t
     case T_DELETE_TC:
     case T_DTC_REPLY:
     case T_REQUEST_TC:
-         data[3] = 1; // length
-         data[4] = Tcid;
+         buffer[3] = 1; // length
+         buffer[4] = Tcid;
          size = 5;
          break;
     case T_NEW_TC:
     case T_TC_ERROR:
          if (Length == 1) {
-            data[3] = 2; // length
-            data[4] = Tcid;
-            data[5] = Data[0];
+            buffer[3] = 2; // length
+            buffer[4] = Tcid;
+            buffer[5] = Data[0];
             size = 6;
             }
          else
-            esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d", Tag, Length);
+            esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d (%d/%d)", Tag, Length, Slot, Tcid);
          break;
     case T_DATA_LAST:
     case T_DATA_MORE:
          if (Length <= MAX_TPDU_DATA) {
-            uint8_t *p = data + 3;
+            uint8_t *p = buffer + 3;
             p = SetLength(p, Length + 1);
             *p++ = Tcid;
             if (Length)
                memcpy(p, Data, Length);
-            size = Length + (p - data);
+            size = Length + (p - buffer);
             }
          else
-            esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d", Tag, Length);
+            esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d (%d/%d)", Tag, Length, Slot, Tcid);
          break;
     default:
-         esyslog("ERROR: unknown TPDU tag: 0x%02X", Tag);
+         esyslog("ERROR: unknown TPDU tag: 0x%02X (%d/%d)", Tag, Slot, Tcid);
     }
  }
 
-int cTPDU::Write(int fd)
-{
-  Dump(fd, true);
-  if (size)
-     return safe_write(fd, data, size) == size ? OK : ERROR;
-  esyslog("ERROR: attemp to write TPDU with zero size");
-  return ERROR;
-}
-
-int cTPDU::Read(int fd)
+void cTPDU::Dump(int SlotNumber, bool Outgoing)
 {
-  size = safe_read(fd, data, sizeof(data));
-  if (size < 0) {
-     esyslog("ERROR: %m");
-     size = 0;
-     return ERROR;
-     }
-  Dump(fd, false);
-  return OK;
-}
-
-void cTPDU::Dump(int fd, bool Outgoing)
-{
-  if (DumpTPDUDataTransfer) {
+  if (DumpTPDUDataTransfer && (DumpPolls || Tag() != T_SB)) {
 #define MAX_DUMP 256
-     fprintf(stderr, "%2d %s ", fd, Outgoing ? "-->" : "<--");
+     fprintf(stderr, "     %d: %s ", SlotNumber, Outgoing ? "-->" : "<--");
      for (int i = 0; i < size && i < MAX_DUMP; i++)
-         fprintf(stderr, "%02X ", data[i]);
+         fprintf(stderr, "%02X ", buffer[i]);
      fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : "");
      if (!Outgoing) {
-        fprintf(stderr, "      ");
+        fprintf(stderr, "           ");
         for (int i = 0; i < size && i < MAX_DUMP; i++)
-            fprintf(stderr, "%2c ", isprint(data[i]) ? data[i] : '.');
+            fprintf(stderr, "%2c ", isprint(buffer[i]) ? buffer[i] : '.');
         fprintf(stderr, "%s\n", size >= MAX_DUMP ? "..." : "");
         }
      }
@@ -257,301 +218,51 @@ const uint8_t *cTPDU::GetData(const uint8_t *Data, int &Length)
 
 uint8_t cTPDU::Status(void)
 {
-  if (size >= 4 && data[size - 4] == T_SB && data[size - 3] == 2) {
-     //XXX test tcid???
-     return data[size - 1];
-     }
+  if (size >= 4 && buffer[size - 4] == T_SB && buffer[size - 3] == 2)
+     return buffer[size - 1];
   return 0;
 }
 
 // --- cCiTransportConnection ------------------------------------------------
 
-enum eState { stIDLE, stCREATION, stACTIVE, stDELETION };
+#define MAX_SESSIONS_PER_TC  16
 
 class cCiTransportConnection {
-  friend class cCiTransportLayer;
 private:
-  int fd;
-  uint8_t slot;
+  enum eState { stIDLE, stCREATION, stACTIVE, stDELETION };
+  cCamSlot *camSlot;
   uint8_t tcid;
   eState state;
-  cTPDU *tpdu;
-  int lastResponse;
-  bool dataAvailable;
-  void Init(int Fd, uint8_t Slot, uint8_t Tcid);
-  int SendTPDU(uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
-  int RecvTPDU(void);
-  int CreateConnection(void);
-  int Poll(void);
-  eState State(void) { return state; }
-  int LastResponse(void) { return lastResponse; }
-  bool DataAvailable(void) { return dataAvailable; }
-public:
-  cCiTransportConnection(void);
-  ~cCiTransportConnection();
-  int Slot(void) const { return slot; }
-  int SendData(int Length, const uint8_t *Data);
-  int RecvData(void);
-  const uint8_t *Data(int &Length);
-  //XXX Close()
-  void Reset(void);
-  };
-
-cCiTransportConnection::cCiTransportConnection(void)
-{
-  tpdu = NULL;
-  Init(-1, 0, 0);
-}
-
-cCiTransportConnection::~cCiTransportConnection()
-{
-  delete tpdu;
-}
-
-void cCiTransportConnection::Init(int Fd, uint8_t Slot, uint8_t Tcid)
-{
-  fd = Fd;
-  slot = Slot;
-  tcid = Tcid;
-  state = stIDLE;
-  if (fd >= 0 && !tpdu)
-     tpdu = new cTPDU;
-  lastResponse = ERROR;
-  dataAvailable = false;
-//XXX Clear()???
-}
-
-int cCiTransportConnection::SendTPDU(uint8_t Tag, int Length, const uint8_t *Data)
-{
-  cTPDU TPDU(slot, tcid, Tag, Length, Data);
-  return TPDU.Write(fd);
-}
-
-#define CAM_READ_TIMEOUT  3500 // ms
-
-int cCiTransportConnection::RecvTPDU(void)
-{
-  struct pollfd pfd[1];
-  pfd[0].fd = fd;
-  pfd[0].events = POLLIN;
-  lastResponse = ERROR;
-  if (poll(pfd, 1, CAM_READ_TIMEOUT) > 0 && (pfd[0].revents & POLLIN) && tpdu->Read(fd) == OK && tpdu->Tcid() == tcid) {
-     switch (state) {
-       case stIDLE:     break;
-       case stCREATION: if (tpdu->Tag() == T_CTC_REPLY) {
-                           dataAvailable = tpdu->Status() & DATA_INDICATOR;
-                           state = stACTIVE;
-                           lastResponse = tpdu->Tag();
-                           }
-                        break;
-       case stACTIVE:   switch (tpdu->Tag()) {
-                          case T_SB:
-                          case T_DATA_LAST:
-                          case T_DATA_MORE:
-                          case T_REQUEST_TC: break;
-                          case T_DELETE_TC:  if (SendTPDU(T_DTC_REPLY) != OK)
-                                                return ERROR;
-                                             Init(fd, slot, tcid);
-                                             break;
-                          default: return ERROR;
-                          }
-                        dataAvailable = tpdu->Status() & DATA_INDICATOR;
-                        lastResponse = tpdu->Tag();
-                        break;
-       case stDELETION: if (tpdu->Tag() == T_DTC_REPLY) {
-                           Init(fd, slot, tcid);
-                           //XXX Status()???
-                           lastResponse = tpdu->Tag();
-                           }
-                        break;
-       }
-     }
-  else if (FATALERRNO) {
-     esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m", slot, tcid);
-     Init(-1, slot, tcid);
-     }
-  return lastResponse;
-}
-
-int cCiTransportConnection::SendData(int Length, const uint8_t *Data)
-{
-  while (state == stACTIVE && Length > 0) {
-        uint8_t Tag = T_DATA_LAST;
-        int l = Length;
-        if (l > MAX_TPDU_DATA) {
-           Tag = T_DATA_MORE;
-           l = MAX_TPDU_DATA;
-           }
-        if (SendTPDU(Tag, l, Data) != OK || RecvTPDU() != T_SB)
-           break;
-        Length -= l;
-        Data += l;
-        }
-  return Length ? ERROR : OK;
-}
-
-int cCiTransportConnection::RecvData(void)
-{
-  if (SendTPDU(T_RCV) == OK)
-     return RecvTPDU();
-  return ERROR;
-}
-
-const uint8_t *cCiTransportConnection::Data(int &Length)
-{
-  return tpdu->Data(Length);
-}
-
-#define MAX_CONNECT_RETRIES  2
-
-int cCiTransportConnection::CreateConnection(void)
-{
-  if (state == stIDLE) {
-     if (SendTPDU(T_CREATE_TC) == OK) {
-        state = stCREATION;
-        if (RecvTPDU() == T_CTC_REPLY)
-           return OK;
-        // the following is a workaround for CAMs that don't quite follow the specs...
-        else {
-           for (int i = 0; i < MAX_CONNECT_RETRIES; i++) {
-               dsyslog("CAM: retrying to establish connection");
-               if (RecvTPDU() == T_CTC_REPLY) {
-                  dsyslog("CAM: connection established");
-                  return OK;
-                  }
-               }
-           return ERROR;
-           }
-        }
-     }
-  return ERROR;
-}
-
-int cCiTransportConnection::Poll(void)
-{
-  if (state == stACTIVE) {
-     if (SendTPDU(T_DATA_LAST) == OK)
-        return RecvTPDU();
-     }
-  return ERROR;
-}
-
-void cCiTransportConnection::Reset(void)
-{
-  Init(-1, 0, 0);
-}
-
-// --- cCiTransportLayer -----------------------------------------------------
-
-#define MAX_CI_CONNECT  16 // maximum possible value is 254
-
-class cCiTransportLayer {
-private:
-  int fd;
-  int numSlots;
-  cCiTransportConnection tc[MAX_CI_CONNECT];
+  bool createConnectionRequested;
+  bool deleteConnectionRequested;
+  bool hasUserIO;
+  cTimeMs alive;
+  cTimeMs timer;
+  cCiSession *sessions[MAX_SESSIONS_PER_TC + 1]; // session numbering starts with 1
+  void SendTPDU(uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
+  void SendTag(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId = 0, int Status = -1);
+  void Poll(void);
+  uint32_t ResourceIdToInt(const uint8_t *Data);
+  cCiSession *GetSessionBySessionId(uint16_t SessionId);
+  void OpenSession(int Length, const uint8_t *Data);
+  void CloseSession(uint16_t SessionId);
+  void HandleSessions(cTPDU *TPDU);
 public:
-  cCiTransportLayer(int Fd, int NumSlots);
-  cCiTransportConnection *NewConnection(int Slot);
-  bool ResetSlot(int Slot, bool Wait = false);
-  bool ModuleReady(int Slot);
-  cCiTransportConnection *Process(int Slot);
+  cCiTransportConnection(cCamSlot *CamSlot, uint8_t Tcid);
+  virtual ~cCiTransportConnection();
+  cCamSlot *CamSlot(void) { return camSlot; }
+  uint8_t Tcid(void) const { return tcid; }
+  void CreateConnection(void) { createConnectionRequested = true; }
+  void DeleteConnection(void) { deleteConnectionRequested = true; }
+  const char *GetCamName(void);
+  bool Ready(void);
+  bool HasUserIO(void) { return hasUserIO; }
+  void SendData(int Length, const uint8_t *Data);
+  bool Process(cTPDU *TPDU = NULL);
+  cCiSession *GetSessionByResourceId(uint32_t ResourceId);
   };
 
-cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
-{
-  fd = Fd;
-  numSlots = NumSlots;
-  for (int s = 0; s < numSlots; s++)
-      ResetSlot(s);
-  cCondWait::SleepMs(2000);
-}
-
-cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot)
-{
-  for (int i = 0; i < MAX_CI_CONNECT; i++) {
-      if (tc[i].State() == stIDLE) {
-         dbgprotocol("Creating connection: slot %d, tcid %d\n", Slot, i + 1);
-         tc[i].Init(fd, Slot, i + 1);
-         if (tc[i].CreateConnection() == OK)
-            return &tc[i];
-         break;
-         }
-      }
-  return NULL;
-}
-
-bool cCiTransportLayer::ResetSlot(int Slot, bool Wait)
-{
-  for (int i = 0; i < MAX_CI_CONNECT; i++) {
-      if (tc[i].State() != stIDLE && tc[i].Slot() == Slot)
-         tc[i].Reset();
-      }
-  dbgprotocol("Resetting slot %d...", Slot);
-  if (ioctl(fd, CA_RESET, 1 << Slot) != -1) {
-     if (Wait)
-        cCondWait::SleepMs(2000);
-     dbgprotocol("ok.\n");
-     return true;
-     }
-  else
-     esyslog("ERROR: can't reset CAM slot %d: %m", Slot);
-  dbgprotocol("failed!\n");
-  return false;
-}
-
-bool cCiTransportLayer::ModuleReady(int Slot)
-{
-  ca_slot_info_t sinfo;
-  sinfo.num = Slot;
-  if (ioctl(fd, CA_GET_SLOT_INFO, &sinfo) != -1)
-     return sinfo.flags & CA_CI_MODULE_READY;
-  else
-     esyslog("ERROR: can't get info on CAM slot %d: %m", Slot);
-  return false;
-}
-
-cCiTransportConnection *cCiTransportLayer::Process(int Slot)
-{
-  for (int i = 0; i < MAX_CI_CONNECT; i++) {
-      cCiTransportConnection *Tc = &tc[i];
-      if (Tc->Slot() == Slot) {
-         switch (Tc->State()) {
-           case stCREATION:
-           case stACTIVE:
-                if (!Tc->DataAvailable()) {
-                   if (Tc->Poll() != OK)
-                      ;//XXX continue;
-                   }
-                switch (Tc->LastResponse()) {
-                  case T_REQUEST_TC:
-                       //XXX
-                       break;
-                  case T_DATA_MORE:
-                  case T_DATA_LAST:
-                  case T_CTC_REPLY:
-                  case T_SB:
-                       if (Tc->DataAvailable())
-                          Tc->RecvData();
-                       break;
-                  case TIMEOUT:
-                  case ERROR:
-                  default:
-                       //XXX Tc->state = stIDLE;//XXX Init()???
-                       return NULL;
-                       break;
-                  }
-                //XXX this will only work with _one_ transport connection per slot!
-                return Tc;
-                break;
-           default: ;
-           }
-         }
-      }
-  return NULL;
-}
-
-// -- cCiSession -------------------------------------------------------------
+// --- cCiSession ------------------------------------------------------------
 
 // Session Tags:
 
@@ -636,15 +347,15 @@ class cCiSession {
 protected:
   int GetTag(int &Length, const uint8_t **Data);
   const uint8_t *GetData(const uint8_t *Data, int &Length);
-  int SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
+  void SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
+  cCiTransportConnection *Tc(void) { return tc; }
 public:
   cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc);
   virtual ~cCiSession();
-  const cCiTransportConnection *Tc(void) { return tc; }
   uint16_t SessionId(void) { return sessionId; }
   uint32_t ResourceId(void) { return resourceId; }
   virtual bool HasUserIO(void) { return false; }
-  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
 cCiSession::cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc)
@@ -679,7 +390,7 @@ const uint8_t *cCiSession::GetData(const uint8_t *Data, int &Length)
   return Length ? Data : NULL;
 }
 
-int cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
+void cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
 {
   uint8_t buffer[2048];
   uint8_t *p = buffer;
@@ -694,78 +405,75 @@ int cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
   if (p - buffer + Length < int(sizeof(buffer))) {
      memcpy(p, Data, Length);
      p += Length;
-     return tc->SendData(p - buffer, buffer);
+     tc->SendData(p - buffer, buffer);
      }
-  esyslog("ERROR: CAM: data length (%d) exceeds buffer size", Length);
-  return ERROR;
+  else
+     esyslog("ERROR: CAM %d: data length (%d) exceeds buffer size", Tc()->CamSlot()->SlotNumber(), Length);
 }
 
-bool cCiSession::Process(int Length, const uint8_t *Data)
+void cCiSession::Process(int Length, const uint8_t *Data)
 {
-  return true;
 }
 
-// -- cCiResourceManager -----------------------------------------------------
+// --- cCiResourceManager ----------------------------------------------------
 
 class cCiResourceManager : public cCiSession {
 private:
   int state;
 public:
   cCiResourceManager(uint16_t SessionId, cCiTransportConnection *Tc);
-  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
 cCiResourceManager::cCiResourceManager(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_RESOURCE_MANAGER, Tc)
 {
-  dbgprotocol("New Resource Manager (session id %d)\n", SessionId);
+  dbgprotocol("Slot %d: new Resource Manager (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
   state = 0;
 }
 
-bool cCiResourceManager::Process(int Length, const uint8_t *Data)
+void cCiResourceManager::Process(int Length, const uint8_t *Data)
 {
   if (Data) {
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_PROFILE_ENQ: {
-            dbgprotocol("%d: <== Profile Enquiry\n", SessionId());
+            dbgprotocol("Slot %d: <== Profile Enquiry (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             uint32_t resources[] = { htonl(RI_RESOURCE_MANAGER),
                                      htonl(RI_APPLICATION_INFORMATION),
                                      htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
                                      htonl(RI_DATE_TIME),
                                      htonl(RI_MMI)
                                    };
-            dbgprotocol("%d: ==> Profile\n", SessionId());
+            dbgprotocol("Slot %d: ==> Profile (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             SendData(AOT_PROFILE, sizeof(resources), (uint8_t*)resources);
             state = 3;
             }
             break;
        case AOT_PROFILE: {
-            dbgprotocol("%d: <== Profile\n", SessionId());
+            dbgprotocol("Slot %d: <== Profile (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             if (state == 1) {
                int l = 0;
                const uint8_t *d = GetData(Data, l);
                if (l > 0 && d)
-                  esyslog("CI resource manager: unexpected data");
-               dbgprotocol("%d: ==> Profile Change\n", SessionId());
+                  esyslog("ERROR: CAM %d: resource manager: unexpected data", Tc()->CamSlot()->SlotNumber());
+               dbgprotocol("Slot %d: ==> Profile Change (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
                SendData(AOT_PROFILE_CHANGE);
                state = 2;
                }
             else {
-               esyslog("ERROR: CI resource manager: unexpected tag %06X in state %d", Tag, state);
+               esyslog("ERROR: CAM %d: resource manager: unexpected tag %06X in state %d", Tc()->CamSlot()->SlotNumber(), Tag, state);
                }
             }
             break;
-       default: esyslog("ERROR: CI resource manager: unknown tag %06X", Tag);
-                return false;
+       default: esyslog("ERROR: CAM %d: resource manager: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (state == 0) {
-     dbgprotocol("%d: ==> Profile Enq\n", SessionId());
+     dbgprotocol("Slot %d: ==> Profile Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_PROFILE_ENQ);
      state = 1;
      }
-  return true;
 }
 
 // --- cCiApplicationInformation ---------------------------------------------
@@ -773,7 +481,6 @@ bool cCiResourceManager::Process(int Length, const uint8_t *Data)
 class cCiApplicationInformation : public cCiSession {
 private:
   int state;
-  time_t creationTime;
   uint8_t applicationType;
   uint16_t applicationManufacturer;
   uint16_t manufacturerCode;
@@ -781,7 +488,7 @@ class cCiApplicationInformation : public cCiSession {
 public:
   cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual ~cCiApplicationInformation();
-  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
   bool EnterMenu(void);
   const char *GetMenuString(void) { return menuString; }
   };
@@ -789,9 +496,8 @@ class cCiApplicationInformation : public cCiSession {
 cCiApplicationInformation::cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
 {
-  dbgprotocol("New Application Information (session id %d)\n", SessionId);
+  dbgprotocol("Slot %d: new Application Information (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
   state = 0;
-  creationTime = time(NULL);
   menuString = NULL;
 }
 
@@ -800,13 +506,13 @@ cCiApplicationInformation::~cCiApplicationInformation()
   free(menuString);
 }
 
-bool cCiApplicationInformation::Process(int Length, const uint8_t *Data)
+void cCiApplicationInformation::Process(int Length, const uint8_t *Data)
 {
   if (Data) {
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_APPLICATION_INFO: {
-            dbgprotocol("%d: <== Application Info\n", SessionId());
+            dbgprotocol("Slot %d: <== Application Info (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             if ((l -= 1) < 0) break;
@@ -819,28 +525,26 @@ bool cCiApplicationInformation::Process(int Length, const uint8_t *Data)
             d += 2;
             free(menuString);
             menuString = GetString(l, &d);
-            isyslog("CAM: %s, %02X, %04X, %04X", menuString, applicationType, applicationManufacturer, manufacturerCode);//XXX make externally accessible!
-            }
+            isyslog("CAM %d: %s, %02X, %04X, %04X", Tc()->CamSlot()->SlotNumber(), menuString, applicationType, applicationManufacturer, manufacturerCode);
             state = 2;
+            }
             break;
-       default: esyslog("ERROR: CI application information: unknown tag %06X", Tag);
-                return false;
+       default: esyslog("ERROR: CAM %d: application information: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (state == 0) {
-     dbgprotocol("%d: ==> Application Info Enq\n", SessionId());
+     dbgprotocol("Slot %d: ==> Application Info Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_APPLICATION_INFO_ENQ);
      state = 1;
      }
-  return true;
 }
 
 bool cCiApplicationInformation::EnterMenu(void)
 {
-  if (state == 2 && time(NULL) - creationTime > WRKRND_TIME_BEFORE_ENTER_MENU) {
-     dbgprotocol("%d: ==> Enter Menu\n", SessionId());
+  if (state == 2) {
+     dbgprotocol("Slot %d: ==> Enter Menu (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_ENTER_MENU);
-     return true;//XXX
+     return true;
      }
   return false;
 }
@@ -875,13 +579,14 @@ class cCiCaPmt : public cListObject {
   bool streamFlag;
   void AddCaDescriptors(int Length, const uint8_t *Data);
 public:
-  cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds);
+  cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds);
+  uint8_t CmdId(void) { return cmdId; }
   void SetListManagement(uint8_t ListManagement);
-  bool Valid(void);
+  uint8_t ListManagement(void) { return capmt[0]; }
   void AddPid(int Pid, uint8_t StreamType);
   };
 
-cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const unsigned short *CaSystemIds)
+cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds)
 {
   cmdId = CmdId;
   caDescriptorsLength = GetCaDescriptors(Source, Transponder, ProgramNumber, CaSystemIds, sizeof(caDescriptors), caDescriptors, streamFlag);
@@ -902,11 +607,6 @@ void cCiCaPmt::SetListManagement(uint8_t ListManagement)
   capmt[0] = ListManagement;
 }
 
-bool cCiCaPmt::Valid(void)
-{
-  return caDescriptorsLength > 0;
-}
-
 void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
 {
   if (Pid) {
@@ -957,61 +657,77 @@ void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 
 #define CA_ENABLE(x) (((x) & CA_ENABLE_FLAG) ? (x) & ~CA_ENABLE_FLAG : 0)
 
+#define QUERY_WAIT_TIME      1000 // ms to wait before sending a query
+#define QUERY_REPLY_TIMEOUT  2000 // ms to wait for a reply to a query
+
 class cCiConditionalAccessSupport : public cCiSession {
 private:
   int state;
   int numCaSystemIds;
-  unsigned short caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
+  int caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
+  bool repliesToQuery;
+  cTimeMs timer;
 public:
   cCiConditionalAccessSupport(uint16_t SessionId, cCiTransportConnection *Tc);
-  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
-  const unsigned short *GetCaSystemIds(void) { return caSystemIds; }
-  bool SendPMT(cCiCaPmt *CaPmt);
-  bool ReceivedReply(bool CanDescramble = false);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
+  const int *GetCaSystemIds(void) { return caSystemIds; }
+  void SendPMT(cCiCaPmt *CaPmt);
+  bool RepliesToQuery(void) { return repliesToQuery; }
+  bool Ready(void) { return state >= 4; }
+  bool ReceivedReply(void) { return state >= 5; }
+  bool CanDecrypt(void) { return state == 6; }
   };
 
 cCiConditionalAccessSupport::cCiConditionalAccessSupport(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_CONDITIONAL_ACCESS_SUPPORT, Tc)
 {
-  dbgprotocol("New Conditional Access Support (session id %d)\n", SessionId);
+  dbgprotocol("Slot %d: new Conditional Access Support (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
   state = 0; // inactive
   caSystemIds[numCaSystemIds = 0] = 0;
+  repliesToQuery = false;
 }
 
-bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
+void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
 {
   if (Data) {
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_CA_INFO: {
-            dbgprotocol("%d: <== Ca Info", SessionId());
+            dbgprotocol("Slot %d: <== Ca Info (%d)", Tc()->CamSlot()->SlotNumber(), SessionId());
             numCaSystemIds = 0;
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             while (l > 1) {
-                  unsigned short id = ((unsigned short)(*d) << 8) | *(d + 1);
+                  uint16_t id = ((uint16_t)(*d) << 8) | *(d + 1);
                   dbgprotocol(" %04X", id);
                   d += 2;
                   l -= 2;
                   if (numCaSystemIds < MAXCASYSTEMIDS)
                      caSystemIds[numCaSystemIds++] = id;
                   else {
-                     esyslog("ERROR: too many CA system IDs!");
+                     esyslog("ERROR: CAM %d: too many CA system IDs!", Tc()->CamSlot()->SlotNumber());
                      break;
                      }
                   }
             caSystemIds[numCaSystemIds] = 0;
             dbgprotocol("\n");
+            if (state == 1) {
+               timer.Set(QUERY_WAIT_TIME); // WORKAROUND: Alphacrypt 3.09 doesn't reply to QUERY immediately after reset
+               state = 2; // got ca info
+               }
             }
-            state = 2; // got ca info
             break;
        case AOT_CA_PMT_REPLY: {
-            dbgprotocol("%d: <== Ca Pmt Reply", SessionId());
-            state = 4; // got ca pmt reply
+            dbgprotocol("Slot %d: <== Ca Pmt Reply (%d)", Tc()->CamSlot()->SlotNumber(), SessionId());
+            if (!repliesToQuery) {
+               dsyslog("CAM %d: replies to QUERY - multi channel decryption possible", Tc()->CamSlot()->SlotNumber());
+               repliesToQuery = true;
+               }
+            state = 5; // got ca pmt reply
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             if (l > 1) {
-               unsigned short pnr = ((unsigned short)(*d) << 8) | *(d + 1);
+               uint16_t pnr = ((uint16_t)(*d) << 8) | *(d + 1);
                dbgprotocol(" %d", pnr);
                d += 2;
                l -= 2;
@@ -1026,7 +742,7 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                         // CAMs (for instance the AlphaCrypt with firmware <= 3.05) that
                         // insert a two byte length field here.
                         // This is a workaround to skip this length field:
-                        unsigned short len = ((unsigned short)(*d) << 8) | *(d + 1);
+                        uint16_t len = ((uint16_t)(*d) << 8) | *(d + 1);
                         if (len == l - 2) {
                            d += 2;
                            l -= 2;
@@ -1040,7 +756,7 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                      if (l <= 2)
                         ok = CA_ENABLE(caepl) == CAEI_POSSIBLE;
                      while (l > 2) {
-                           unsigned short pid = ((unsigned short)(*d) << 8) | *(d + 1);
+                           uint16_t pid = ((uint16_t)(*d) << 8) | *(d + 1);
                            unsigned char caees = *(d + 2);
                            dbgprotocol(" %d=%02X", pid, caees);
                            d += 3;
@@ -1049,39 +765,40 @@ bool cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                               ok = false;
                            }
                      if (ok)
-                        state = 5; // descrambling possible
+                        state = 6; // descrambling possible
                      }
                   }
                }
             dbgprotocol("\n");
             }
             break;
-       default: esyslog("ERROR: CI conditional access support: unknown tag %06X", Tag);
-                return false;
+       default: esyslog("ERROR: CAM %d: conditional access support: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (state == 0) {
-     dbgprotocol("%d: ==> Ca Info Enq\n", SessionId());
+     dbgprotocol("Slot %d: ==> Ca Info Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_CA_INFO_ENQ);
      state = 1; // enquired ca info
      }
-  return true;
+  else if (state == 2 && timer.TimedOut()) {
+     cCiCaPmt CaPmt(CPCI_QUERY, 0, 0, 0, NULL);
+     SendPMT(&CaPmt);
+     timer.Set(QUERY_REPLY_TIMEOUT);
+     state = 3; // waiting for reply
+     }
+  else if (state == 3 && timer.TimedOut()) {
+     dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", Tc()->CamSlot()->SlotNumber());
+     state = 4; // normal operation
+     }
 }
 
-bool cCiConditionalAccessSupport::SendPMT(cCiCaPmt *CaPmt)
+void cCiConditionalAccessSupport::SendPMT(cCiCaPmt *CaPmt)
 {
   if (CaPmt && state >= 2) {
-     dbgprotocol("%d: ==> Ca Pmt\n", SessionId());
+     dbgprotocol("Slot %d: ==> Ca Pmt (%d) %d %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), CaPmt->ListManagement(), CaPmt->CmdId());
      SendData(AOT_CA_PMT, CaPmt->length, CaPmt->capmt);
-     state = 3; // sent ca pmt
-     return true;
+     state = 4; // sent ca pmt
      }
-  return false;
-}
-
-bool cCiConditionalAccessSupport::ReceivedReply(bool CanDescramble)
-{
-  return state >= (CanDescramble ? 5 : 4);
 }
 
 // --- cCiDateTime -----------------------------------------------------------
@@ -1090,10 +807,10 @@ class cCiDateTime : public cCiSession {
 private:
   int interval;
   time_t lastTime;
-  bool SendDateTime(void);
+  void SendDateTime(void);
 public:
   cCiDateTime(uint16_t SessionId, cCiTransportConnection *Tc);
-  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
   };
 
 cCiDateTime::cCiDateTime(uint16_t SessionId, cCiTransportConnection *Tc)
@@ -1101,10 +818,10 @@ cCiDateTime::cCiDateTime(uint16_t SessionId, cCiTransportConnection *Tc)
 {
   interval = 0;
   lastTime = 0;
-  dbgprotocol("New Date Time (session id %d)\n", SessionId);
+  dbgprotocol("Slot %d: new Date Time (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
 }
 
-bool cCiDateTime::SendDateTime(void)
+void cCiDateTime::SendDateTime(void)
 {
   time_t t = time(NULL);
   struct tm tm_gmt;
@@ -1116,17 +833,18 @@ bool cCiDateTime::SendDateTime(void)
      int L = (M == 1 || M == 2) ? 1 : 0;
      int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
 #define DEC2BCD(d) (((d / 10) << 4) + (d % 10))
-     struct tTime { unsigned short mjd; uint8_t h, m, s; short offset; };
+     struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; };
      tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : htons(tm_loc.tm_gmtoff / 60) };
-     dbgprotocol("%d: ==> Date Time\n", SessionId());
+     bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
+     DumpTPDUDataTransfer &= DumpDateTime;
+     if (DumpDateTime)
+        dbgprotocol("Slot %d: ==> Date Time (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_DATE_TIME, 7, (uint8_t*)&T);
-     //XXX return value of all SendData() calls???
-     return true;
+     DumpTPDUDataTransfer = OldDumpTPDUDataTransfer;
      }
-  return false;
 }
 
-bool cCiDateTime::Process(int Length, const uint8_t *Data)
+void cCiDateTime::Process(int Length, const uint8_t *Data)
 {
   if (Data) {
      int Tag = GetTag(Length, &Data);
@@ -1137,20 +855,18 @@ bool cCiDateTime::Process(int Length, const uint8_t *Data)
             const uint8_t *d = GetData(Data, l);
             if (l > 0)
                interval = *d;
-            dbgprotocol("%d: <== Date Time Enq, interval = %d\n", SessionId(), interval);
+            dbgprotocol("Slot %d: <== Date Time Enq (%d), interval = %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), interval);
             lastTime = time(NULL);
-            return SendDateTime();
+            SendDateTime();
             }
             break;
-       default: esyslog("ERROR: CI date time: unknown tag %06X", Tag);
-                return false;
+       default: esyslog("ERROR: CAM %d: date time: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (interval && time(NULL) - lastTime > interval) {
      lastTime = time(NULL);
-     return SendDateTime();
+     SendDateTime();
      }
-  return true;
 }
 
 // --- cCiMMI ----------------------------------------------------------------
@@ -1197,11 +913,11 @@ class cCiMMI : public cCiSession {
 public:
   cCiMMI(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual ~cCiMMI();
-  virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
   virtual bool HasUserIO(void) { return menu || enquiry; }
   cCiMenu *Menu(bool Clear = false);
   cCiEnquiry *Enquiry(bool Clear = false);
-  bool SendMenuAnswer(uint8_t Selection);
+  void SendMenuAnswer(uint8_t Selection);
   bool SendAnswer(const char *Text);
   bool SendCloseMMI(void);
   };
@@ -1209,7 +925,7 @@ class cCiMMI : public cCiSession {
 cCiMMI::cCiMMI(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_MMI, Tc)
 {
-  dbgprotocol("New MMI (session id %d)\n", SessionId);
+  dbgprotocol("Slot %d: new MMI (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
   menu = fetchedMenu = NULL;
   enquiry = fetchedEnquiry = NULL;
 }
@@ -1236,21 +952,21 @@ char *cCiMMI::GetText(int &Length, const uint8_t **Data)
   int Tag = GetTag(Length, Data);
   if (Tag == AOT_TEXT_LAST) {
      char *s = GetString(Length, Data);
-     dbgprotocol("%d: <== Text Last '%s'\n", SessionId(), s);
+     dbgprotocol("Slot %d: <== Text Last (%d) '%s'\n", Tc()->CamSlot()->SlotNumber(), SessionId(), s);
      return s;
      }
   else
-     esyslog("CI MMI: unexpected text tag: %06X", Tag);
+     esyslog("ERROR: CAM %d: MMI: unexpected text tag: %06X", Tc()->CamSlot()->SlotNumber(), Tag);
   return NULL;
 }
 
-bool cCiMMI::Process(int Length, const uint8_t *Data)
+void cCiMMI::Process(int Length, const uint8_t *Data)
 {
   if (Data) {
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_DISPLAY_CONTROL: {
-            dbgprotocol("%d: <== Display Control\n", SessionId());
+            dbgprotocol("Slot %d: <== Display Control (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             if (l > 0) {
@@ -1259,19 +975,18 @@ bool cCiMMI::Process(int Length, const uint8_t *Data)
                       if (l == 2 && *++d == MM_HIGH_LEVEL) {
                          struct tDisplayReply { uint8_t id; uint8_t mode; };
                          tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
-                         dbgprotocol("%d: ==> Display Reply\n", SessionId());
+                         dbgprotocol("Slot %d: ==> Display Reply (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
                          SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);
                          }
                       break;
-                 default: esyslog("CI MMI: unsupported display control command %02X", *d);
-                          return false;
+                 default: esyslog("ERROR: CAM %d: MMI: unsupported display control command %02X", Tc()->CamSlot()->SlotNumber(), *d);
                  }
                }
             }
             break;
        case AOT_LIST_LAST:
        case AOT_MENU_LAST: {
-            dbgprotocol("%d: <== Menu Last\n", SessionId());
+            dbgprotocol("Slot %d: <== Menu Last (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             delete menu;
             menu = new cCiMenu(this, Tag == AOT_MENU_LAST);
             int l = 0;
@@ -1296,7 +1011,7 @@ bool cCiMMI::Process(int Length, const uint8_t *Data)
             }
             break;
        case AOT_ENQ: {
-            dbgprotocol("%d: <== Enq\n", SessionId());
+            dbgprotocol("Slot %d: <== Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
             delete enquiry;
             enquiry = new cCiEnquiry(this);
             int l = 0;
@@ -1323,14 +1038,12 @@ bool cCiMMI::Process(int Length, const uint8_t *Data)
                if (l > 1)
                   delay = *d;
                }
-            dbgprotocol("%d: <== Close MMI  id = %02X  delay = %d\n", SessionId(), id, delay);
+            dbgprotocol("Slot %d: <== Close MMI (%d)  id = %02X  delay = %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), id, delay);
             }
             break;
-       default: esyslog("ERROR: CI MMI: unknown tag %06X", Tag);
-                return false;
+       default: esyslog("ERROR: CAM %d: MMI: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
        }
      }
-  return true;
 }
 
 cCiMenu *cCiMMI::Menu(bool Clear)
@@ -1355,32 +1068,28 @@ cCiEnquiry *cCiMMI::Enquiry(bool Clear)
   return fetchedEnquiry;
 }
 
-bool cCiMMI::SendMenuAnswer(uint8_t Selection)
+void cCiMMI::SendMenuAnswer(uint8_t Selection)
 {
-  dbgprotocol("%d: ==> Menu Answ\n", SessionId());
+  dbgprotocol("Slot %d: ==> Menu Answ (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
   SendData(AOT_MENU_ANSW, 1, &Selection);
-  //XXX return value of all SendData() calls???
-  return true;
 }
 
 bool cCiMMI::SendAnswer(const char *Text)
 {
-  dbgprotocol("%d: ==> Answ\n", SessionId());
+  dbgprotocol("Slot %d: ==> Answ (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
   struct tAnswer { uint8_t id; char text[256]; };//XXX
   tAnswer answer;
   answer.id = Text ? AI_ANSWER : AI_CANCEL;
   if (Text)
      strncpy(answer.text, Text, sizeof(answer.text));
   SendData(AOT_ANSW, Text ? strlen(Text) + 1 : 1, (uint8_t *)&answer);
-  //XXX return value of all SendData() calls???
   return true;
 }
 
 bool cCiMMI::SendCloseMMI(void)
 {
-  dbgprotocol("%d: ==> Close MMI\n", SessionId());
+  dbgprotocol("Slot %d: ==> Close MMI (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
   SendData(AOT_CLOSE_MMI, 0);
-  //XXX return value of all SendData() calls???
   return true;
 }
 
@@ -1422,24 +1131,23 @@ bool cCiMenu::HasUpdate(void)
   return !mmi || mmi->HasUserIO();
 }
 
-bool cCiMenu::Select(int Index)
+void cCiMenu::Select(int Index)
 {
   cMutexLock MutexLock(mutex);
-  dbgprotocol("%d: ==> Select %d\n", mmi ? mmi->SessionId() : -1, Index);
   if (mmi && -1 <= Index && Index < numEntries)
-     return mmi->SendMenuAnswer(Index + 1);
-  return false;
+     mmi->SendMenuAnswer(Index + 1);
 }
 
-bool cCiMenu::Cancel(void)
+void cCiMenu::Cancel(void)
 {
-  return Select(-1);
+  Select(-1);
 }
 
-bool cCiMenu::Abort(void)
+void cCiMenu::Abort(void)
 {
   cMutexLock MutexLock(mutex);
-  return mmi && mmi->SendCloseMMI();
+  if (mmi)
+     mmi->SendCloseMMI();
 }
 
 // --- cCiEnquiry ------------------------------------------------------------
@@ -1460,78 +1168,77 @@ cCiEnquiry::~cCiEnquiry()
   free(text);
 }
 
-bool cCiEnquiry::Reply(const char *s)
+void cCiEnquiry::Reply(const char *s)
 {
   cMutexLock MutexLock(mutex);
-  return mmi ? mmi->SendAnswer(s) : false;
+  if (mmi)
+     mmi->SendAnswer(s);
 }
 
-bool cCiEnquiry::Cancel(void)
+void cCiEnquiry::Cancel(void)
 {
-  return Reply(NULL);
+  Reply(NULL);
 }
 
-bool cCiEnquiry::Abort(void)
+void cCiEnquiry::Abort(void)
 {
   cMutexLock MutexLock(mutex);
-  return mmi && mmi->SendCloseMMI();
+  if (mmi)
+     mmi->SendCloseMMI();
 }
 
-// -- cCiHandler -------------------------------------------------------------
+// --- cCiTransportConnection (cont'd) ---------------------------------------
 
-cCiHandler::cCiHandler(int Fd, int NumSlots)
+#define TC_POLL_TIMEOUT   300 // ms WORKAROUND: TC_POLL_TIMEOUT < 300ms doesn't work with DragonCAM
+#define TC_ALIVE_TIMEOUT 2000 // ms after which a transport connection is assumed dead
+
+cCiTransportConnection::cCiTransportConnection(cCamSlot *CamSlot, uint8_t Tcid)
 {
-  fd = Fd;
-  numSlots = NumSlots;
-  newCaSupport = false;
+  dbgprotocol("Slot %d: creating connection %d/%d\n", CamSlot->SlotNumber(), CamSlot->SlotIndex(), Tcid);
+  camSlot = CamSlot;
+  tcid = Tcid;
+  state = stIDLE;
+  createConnectionRequested = false;
+  deleteConnectionRequested = false;
   hasUserIO = false;
-  for (int i = 0; i < MAX_CI_SESSION; i++)
+  alive.Set(TC_ALIVE_TIMEOUT);
+  for (int i = 0; i <= MAX_SESSIONS_PER_TC; i++) // sessions[0] is not used, but initialized anyway
       sessions[i] = NULL;
-  for (int i = 0; i < MAX_CI_SLOT; i++)
-      moduleReady[i] = false;
-  tpl = new cCiTransportLayer(Fd, numSlots);
-  tc = NULL;
-  source = transponder = 0;
 }
 
-cCiHandler::~cCiHandler()
+cCiTransportConnection::~cCiTransportConnection()
 {
-  for (int i = 0; i < MAX_CI_SESSION; i++)
+  for (int i = 1; i <= MAX_SESSIONS_PER_TC; i++)
       delete sessions[i];
-  delete tpl;
-  close(fd);
 }
 
-cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
+bool cCiTransportConnection::Ready(void)
 {
-  int fd_ca = open(FileName, O_RDWR);
-  if (fd_ca >= 0) {
-     ca_caps_t Caps;
-     if (ioctl(fd_ca, CA_GET_CAP, &Caps) == 0) {
-        int NumSlots = Caps.slot_num;
-        if (NumSlots > 0) {
-           //XXX dsyslog("CAM: found %d CAM slots", NumSlots); // TODO let's do this only once we can be sure that there _really_ is a CAM adapter!
-           if ((Caps.slot_type & CA_CI_LINK) != 0)
-              return new cCiHandler(fd_ca, NumSlots);
-           else
-              isyslog("CAM doesn't support link layer interface");
-           }
-        else
-           esyslog("ERROR: no CAM slots found");
-        }
-     else
-        LOG_ERROR_STR(FileName);
-     close(fd_ca);
-     }
-  return NULL;
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  return cas && cas->Ready();
 }
 
-uint32_t cCiHandler::ResourceIdToInt(const uint8_t *Data)
+const char *cCiTransportConnection::GetCamName(void)
 {
-  return (ntohl(get_unaligned((uint32_t *)Data)));
+  cCiApplicationInformation *ai = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION);
+  return ai ? ai->GetMenuString() : NULL;
 }
 
-bool cCiHandler::Send(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId, int Status)
+void cCiTransportConnection::SendTPDU(uint8_t Tag, int Length, const uint8_t *Data)
+{
+  cTPDU TPDU(camSlot->SlotIndex(), tcid, Tag, Length, Data);
+  camSlot->Write(&TPDU);
+  timer.Set(TC_POLL_TIMEOUT);
+}
+
+void cCiTransportConnection::SendData(int Length, const uint8_t *Data)
+{
+  // if Length ever exceeds MAX_TPDU_DATA this needs to be handled differently
+  if (state == stACTIVE && Length > 0)
+     SendTPDU(T_DATA_LAST, Length, Data);
+}
+
+void cCiTransportConnection::SendTag(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId, int Status)
 {
   uint8_t buffer[16];
   uint8_t *p = buffer;
@@ -1546,297 +1253,587 @@ bool cCiHandler::Send(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId, int
   put_unaligned(htons(SessionId), (uint16_t *)p);
   p += 2;
   buffer[1] = p - buffer - 2; // length
-  return tc && tc->SendData(p - buffer, buffer) == OK;
+  SendData(p - buffer, buffer);
 }
 
-cCiSession *cCiHandler::GetSessionBySessionId(uint16_t SessionId)
+void cCiTransportConnection::Poll(void)
 {
-  for (int i = 0; i < MAX_CI_SESSION; i++) {
-      if (sessions[i] && sessions[i]->SessionId() == SessionId)
-         return sessions[i];
-      }
-  return NULL;
+  bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
+  DumpTPDUDataTransfer &= DumpPolls;
+  if (DumpPolls)
+     dbgprotocol("Slot %d: ==> Poll\n", camSlot->SlotNumber());
+  SendTPDU(T_DATA_LAST);
+  DumpTPDUDataTransfer = OldDumpTPDUDataTransfer;
 }
 
-cCiSession *cCiHandler::GetSessionByResourceId(uint32_t ResourceId, int Slot)
+uint32_t cCiTransportConnection::ResourceIdToInt(const uint8_t *Data)
 {
-  for (int i = 0; i < MAX_CI_SESSION; i++) {
-      if (sessions[i] && sessions[i]->Tc()->Slot() == Slot && sessions[i]->ResourceId() == ResourceId)
-         return sessions[i];
-      }
-  return NULL;
+  return (ntohl(get_unaligned((uint32_t *)Data)));
 }
 
-cCiSession *cCiHandler::CreateSession(uint32_t ResourceId)
+cCiSession *cCiTransportConnection::GetSessionBySessionId(uint16_t SessionId)
 {
-  if (!GetSessionByResourceId(ResourceId, tc->Slot())) {
-     for (int i = 0; i < MAX_CI_SESSION; i++) {
-         if (!sessions[i]) {
-            switch (ResourceId) {
-              case RI_RESOURCE_MANAGER:           return sessions[i] = new cCiResourceManager(i + 1, tc);
-              case RI_APPLICATION_INFORMATION:    return sessions[i] = new cCiApplicationInformation(i + 1, tc);
-              case RI_CONDITIONAL_ACCESS_SUPPORT: newCaSupport = true;
-                                                  return sessions[i] = new cCiConditionalAccessSupport(i + 1, tc);
-              case RI_HOST_CONTROL:               break; //XXX
-              case RI_DATE_TIME:                  return sessions[i] = new cCiDateTime(i + 1, tc);
-              case RI_MMI:                        return sessions[i] = new cCiMMI(i + 1, tc);
-              }
-            }
-         }
-     }
+  return (SessionId <= MAX_SESSIONS_PER_TC) ? sessions[SessionId] : NULL;
+}
+
+cCiSession *cCiTransportConnection::GetSessionByResourceId(uint32_t ResourceId)
+{
+  for (int i = 1; i <= MAX_SESSIONS_PER_TC; i++) {
+      if (sessions[i] && sessions[i]->ResourceId() == ResourceId)
+         return sessions[i];
+      }
   return NULL;
 }
 
-bool cCiHandler::OpenSession(int Length, const uint8_t *Data)
+void cCiTransportConnection::OpenSession(int Length, const uint8_t *Data)
 {
   if (Length == 6 && *(Data + 1) == 0x04) {
      uint32_t ResourceId = ResourceIdToInt(Data + 2);
-     dbgprotocol("OpenSession %08X\n", ResourceId);
-     switch (ResourceId) {
-       case RI_RESOURCE_MANAGER:
-       case RI_APPLICATION_INFORMATION:
-       case RI_CONDITIONAL_ACCESS_SUPPORT:
-       case RI_HOST_CONTROL:
-       case RI_DATE_TIME:
-       case RI_MMI:
-            {
-              cCiSession *Session = CreateSession(ResourceId);
-              if (Session) {
-                 Send(ST_OPEN_SESSION_RESPONSE, Session->SessionId(), Session->ResourceId(), SS_OK);
-                 return true;
+     dbgprotocol("Slot %d: open session %08X\n", camSlot->SlotNumber(), ResourceId);
+     if (!GetSessionByResourceId(ResourceId)) {
+        for (int i = 1; i <= MAX_SESSIONS_PER_TC; i++) {
+            if (!sessions[i]) {
+               switch (ResourceId) {
+                 case RI_RESOURCE_MANAGER:           sessions[i] = new cCiResourceManager(i, this); break;
+                 case RI_APPLICATION_INFORMATION:    sessions[i] = new cCiApplicationInformation(i, this); break;
+                 case RI_CONDITIONAL_ACCESS_SUPPORT: sessions[i] = new cCiConditionalAccessSupport(i, this); break;
+                 case RI_DATE_TIME:                  sessions[i] = new cCiDateTime(i, this); break;
+                 case RI_MMI:                        sessions[i] = new cCiMMI(i, this); break;
+                 case RI_HOST_CONTROL:               // not implemented
+                 default: esyslog("ERROR: CAM %d: unknown resource identifier: %08X (%d/%d)", camSlot->SlotNumber(), ResourceId, camSlot->SlotIndex(), tcid);
                  }
-              esyslog("ERROR: can't create session for resource identifier: %08X", ResourceId);
+               if (sessions[i])
+                  SendTag(ST_OPEN_SESSION_RESPONSE, sessions[i]->SessionId(), sessions[i]->ResourceId(), SS_OK);
+               return;
+               }
             }
-            break;
-       default: esyslog("ERROR: unknown resource identifier: %08X", ResourceId);
-       }
+        esyslog("ERROR: CAM %d: no free session slot for resource identifier %08X (%d/%d)", camSlot->SlotNumber(), ResourceId, camSlot->SlotIndex(), tcid);
+        }
+     else
+        esyslog("ERROR: CAM %d: session for resource identifier %08X already exists (%d/%d)", camSlot->SlotNumber(), ResourceId, camSlot->SlotIndex(), tcid);
      }
-  return false;
 }
 
-bool cCiHandler::CloseSession(uint16_t SessionId)
+void cCiTransportConnection::CloseSession(uint16_t SessionId)
 {
-  dbgprotocol("CloseSession %d\n", SessionId);
+  dbgprotocol("Slot %d: close session %d\n", camSlot->SlotNumber(), SessionId);
   cCiSession *Session = GetSessionBySessionId(SessionId);
-  if (Session && sessions[SessionId - 1] == Session) {
+  if (Session && sessions[SessionId] == Session) {
      delete Session;
-     sessions[SessionId - 1] = NULL;
-     Send(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_OK);
-     return true;
+     sessions[SessionId] = NULL;
+     SendTag(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_OK);
      }
   else {
-     esyslog("ERROR: unknown session id: %d", SessionId);
-     Send(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_NOT_ALLOCATED);
+     esyslog("ERROR: CAM %d: unknown session id: %d (%d/%d)", camSlot->SlotNumber(), SessionId, camSlot->SlotIndex(), tcid);
+     SendTag(ST_CLOSE_SESSION_RESPONSE, SessionId, 0, SS_NOT_ALLOCATED);
+     }
+}
+
+void cCiTransportConnection::HandleSessions(cTPDU *TPDU)
+{
+  int Length;
+  const uint8_t *Data = TPDU->Data(Length);
+  if (Data && Length > 1) {
+     switch (*Data) {
+       case ST_SESSION_NUMBER:          if (Length > 4) {
+                                           uint16_t SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
+                                           cCiSession *Session = GetSessionBySessionId(SessionId);
+                                           if (Session)
+                                              Session->Process(Length - 4, Data + 4);
+                                           else
+                                              esyslog("ERROR: CAM %d: unknown session id: %d (%d/%d)", camSlot->SlotNumber(), SessionId, camSlot->SlotIndex(), tcid);
+                                           }
+                                        break;
+       case ST_OPEN_SESSION_REQUEST:    OpenSession(Length, Data);
+                                        break;
+       case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
+                                           CloseSession(ntohs(get_unaligned((uint16_t *)&Data[2])));
+                                        break;
+       case ST_CREATE_SESSION_RESPONSE: // not implemented
+       case ST_CLOSE_SESSION_RESPONSE:  // not implemented
+       default: esyslog("ERROR: CAM %d: unknown session tag: %02X (%d/%d)", camSlot->SlotNumber(), *Data, camSlot->SlotIndex(), tcid);
+       }
      }
-  return false;
 }
 
-int cCiHandler::CloseAllSessions(int Slot)
+bool cCiTransportConnection::Process(cTPDU *TPDU)
 {
-  int result = 0;
-  for (int i = 0; i < MAX_CI_SESSION; i++) {
-      if (sessions[i] && sessions[i]->Tc()->Slot() == Slot) {
-         CloseSession(sessions[i]->SessionId());
-         result++;
-         }
-      }
-  return result;
+  if (TPDU)
+     alive.Set(TC_ALIVE_TIMEOUT);
+  else if (alive.TimedOut())
+     return false;
+  switch (state) {
+    case stIDLE:
+         if (createConnectionRequested) {
+            dbgprotocol("Slot %d: create connection %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+            createConnectionRequested = false;
+            SendTPDU(T_CREATE_TC);
+            state = stCREATION;
+            }
+         return true;
+    case stCREATION:
+         if (TPDU && TPDU->Tag() == T_CTC_REPLY) {
+            dbgprotocol("Slot %d: connection created %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+            Poll();
+            state = stACTIVE;
+            }
+         else if (timer.TimedOut()) {
+            dbgprotocol("Slot %d: timeout while creating connection %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+            state = stIDLE;
+            }
+         return true;
+    case stACTIVE:
+         if (deleteConnectionRequested) {
+            dbgprotocol("Slot %d: delete connection requested %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+            deleteConnectionRequested = false;
+            SendTPDU(T_DELETE_TC);
+            state = stDELETION;
+            return true;
+            }
+         if (TPDU) {
+            switch (TPDU->Tag()) {
+              case T_REQUEST_TC:
+                   esyslog("ERROR: CAM %d: T_REQUEST_TC not implemented (%d/%d)", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+                   break;
+              case T_DATA_MORE:
+              case T_DATA_LAST:
+                   HandleSessions(TPDU);
+                   // continue with T_SB
+              case T_SB:
+                   if ((TPDU->Status() & DATA_INDICATOR) != 0) {
+                      dbgprotocol("Slot %d: receive data %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+                      SendTPDU(T_RCV);
+                      }
+                   break;
+              case T_DELETE_TC:
+                   dbgprotocol("Slot %d: delete connection %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+                   SendTPDU(T_DTC_REPLY);
+                   state = stIDLE;
+                   return true;
+              }
+            }
+         else if (timer.TimedOut())
+            Poll();
+         hasUserIO = false;
+         for (int i = 1; i <= MAX_SESSIONS_PER_TC; i++) {
+             if (sessions[i]) {
+                sessions[i]->Process();
+                if (sessions[i]->HasUserIO())
+                   hasUserIO = true;
+                }
+             }
+         break;
+    case stDELETION:
+         if (TPDU && TPDU->Tag() == T_DTC_REPLY || timer.TimedOut()) {
+            dbgprotocol("Slot %d: connection deleted %d/%d\n", camSlot->SlotNumber(), camSlot->SlotIndex(), tcid);
+            state = stIDLE;
+            }
+         return true;
+    }
+  return true;
 }
 
-int cCiHandler::NumCams(void)
+// --- cCiCaPidData ----------------------------------------------------------
+
+class cCiCaPidData : public cListObject {
+public:
+  bool active;
+  int pid;
+  int streamType;
+  cCiCaPidData(int Pid, int StreamType)
+  {
+    active = false;
+    pid = Pid;
+    streamType = StreamType;
+  }
+  };
+
+// --- cCiCaProgramData ------------------------------------------------------
+
+class cCiCaProgramData : public cListObject {
+public:
+  int programNumber;
+  bool modified;
+  cList<cCiCaPidData> pidList;
+  cCiCaProgramData(int ProgramNumber)
+  {
+    programNumber = ProgramNumber;
+    modified = false;
+  }
+  };
+
+// --- cCiAdapter ------------------------------------------------------------
+
+cCiAdapter::cCiAdapter(void)
+:cThread("CI adapter")
 {
-  int result = 0;
-  for (int i = 0; i < MAX_CI_SLOT; i++)
-      if (moduleReady[i])
-         result++;
-  return result;
+  assignedDevice = NULL;
+  for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++)
+      camSlots[i] = NULL;
 }
 
-bool cCiHandler::Ready(void)
+cCiAdapter::~cCiAdapter()
 {
-  cMutexLock MutexLock(&mutex);
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      if (moduleReady[Slot]) {
-         cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-         if (!cas || !*cas->GetCaSystemIds())
-            return false;
-         }
+  Cancel(3);
+  for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++)
+      delete camSlots[i];
+}
+
+void cCiAdapter::AddCamSlot(cCamSlot *CamSlot)
+{
+  if (CamSlot) {
+     for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++) {
+         if (!camSlots[i]) {
+            CamSlot->slotIndex = i;
+            camSlots[i] = CamSlot;
+            return;
+            }
+        }
+     esyslog("ERROR: no free CAM slot in CI adapter");
+     }
+}
+
+bool cCiAdapter::Ready(void)
+{
+  for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++) {
+      if (camSlots[i] && !camSlots[i]->Ready())
+         return false;
       }
   return true;
 }
 
-bool cCiHandler::Process(int Slot)
+void cCiAdapter::Action(void)
+{
+  cTPDU TPDU;
+  while (Running()) {
+        int n = Read(TPDU.Buffer(), TPDU.MaxSize());
+        if (n > 0 && TPDU.Slot() < MAX_CAM_SLOTS_PER_ADAPTER) {
+           TPDU.SetSize(n);
+           cCamSlot *cs = camSlots[TPDU.Slot()];
+           TPDU.Dump(cs ? cs->SlotNumber() : 0, false);
+           if (cs)
+              cs->Process(&TPDU);
+           }
+        for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++) {
+            if (camSlots[i])
+               camSlots[i]->Process();
+            }
+        }
+}
+
+// --- cCamSlot --------------------------------------------------------------
+
+cCamSlots CamSlots;
+
+#define MODULE_CHECK_INTERVAL 100 // ms
+#define MODULE_RESET_TIMEOUT    2 // s
+
+cCamSlot::cCamSlot(cCiAdapter *CiAdapter)
+{
+  ciAdapter = CiAdapter;
+  slotIndex = -1;
+  lastModuleStatus = msReset; // avoids initial reset log message
+  resetTime = 0;
+  resendPmt = false;
+  source = transponder = 0;
+  for (int i = 0; i <= MAX_CONNECTIONS_PER_CAM_SLOT; i++) // tc[0] is not used, but initialized anyway
+      tc[i] = NULL;
+  CamSlots.Add(this);
+  slotNumber = Index() + 1;
+  if (ciAdapter)
+     ciAdapter->AddCamSlot(this);
+  Reset();
+}
+
+cCamSlot::~cCamSlot()
+{
+  CamSlots.Del(this, false);
+  DeleteAllConnections();
+}
+
+bool cCamSlot::Assign(cDevice *Device, bool Query)
 {
-  bool result = true;
   cMutexLock MutexLock(&mutex);
-  for (int slot = 0; slot < numSlots; slot++) {
-      if (Slot < 0 || slot == Slot) {
-         tc = tpl->Process(slot);
-         if (tc) {
-            int Length;
-            const uint8_t *Data = tc->Data(Length);
-            if (Data && Length > 1) {
-               switch (*Data) {
-                 case ST_SESSION_NUMBER:          if (Length > 4) {
-                                                     uint16_t SessionId = ntohs(get_unaligned((uint16_t *)&Data[2]));
-                                                     cCiSession *Session = GetSessionBySessionId(SessionId);
-                                                     if (Session)
-                                                        Session->Process(Length - 4, Data + 4);
-                                                     else
-                                                        esyslog("ERROR: unknown session id: %d", SessionId);
-                                                     }
-                                                  break;
-                 case ST_OPEN_SESSION_REQUEST:    OpenSession(Length, Data);
-                                                  break;
-                 case ST_CLOSE_SESSION_REQUEST:   if (Length == 4)
-                                                     CloseSession(ntohs(get_unaligned((uint16_t *)&Data[2])));
-                                                  break;
-                 case ST_CREATE_SESSION_RESPONSE: //XXX fall through to default
-                 case ST_CLOSE_SESSION_RESPONSE:  //XXX fall through to default
-                 default: esyslog("ERROR: unknown session tag: %02X", *Data);
+  if (ciAdapter) {
+     if (ciAdapter->Assign(Device, true)) {
+        if (!Device && ciAdapter->assignedDevice)
+           ciAdapter->assignedDevice->SetCamSlot(NULL);
+        if (!Query) {
+           StopDecrypting();
+           source = transponder = 0;
+           if (ciAdapter->Assign(Device)) {
+              ciAdapter->assignedDevice = Device;
+              if (Device) {
+                 Device->SetCamSlot(this);
+                 dsyslog("CAM %d: assigned to device %d", slotNumber, Device->DeviceNumber() + 1);
                  }
-               }
-            }
-         else if (CloseAllSessions(slot)) {
-            tpl->ResetSlot(slot);
-            result = false;
-            }
-         else if (tpl->ModuleReady(slot)) {
-            dbgprotocol("Module ready in slot %d\n", slot);
-            moduleReady[slot] = true;
-            tpl->NewConnection(slot);
-            }
+              else
+                 dsyslog("CAM %d: unassigned", slotNumber);
+              }
+           else
+              return false;
+           }
+        return true;
+        }
+     }
+  return false;
+}
+
+cDevice *cCamSlot::Device(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (ciAdapter) {
+     cDevice *d = ciAdapter->assignedDevice;
+     if (d && d->CamSlot() == this)
+        return d;
+     }
+  return NULL;
+}
+
+void cCamSlot::NewConnection(void)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int i = 1; i <= MAX_CONNECTIONS_PER_CAM_SLOT; i++) {
+      if (!tc[i]) {
+         tc[i] = new cCiTransportConnection(this, i);
+         tc[i]->CreateConnection();
+         return;
          }
       }
-  SendCaPmt();
-  bool UserIO = false;
-  for (int i = 0; i < MAX_CI_SESSION; i++) {
-      if (sessions[i] && sessions[i]->Process())
-         UserIO |= sessions[i]->HasUserIO();
+  esyslog("ERROR: CAM %d: can't create new transport connection!", slotNumber);
+}
+
+void cCamSlot::DeleteAllConnections(void)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int i = 1; i <= MAX_CONNECTIONS_PER_CAM_SLOT; i++) {
+      delete tc[i];
+      tc[i] = NULL;
       }
-  hasUserIO = UserIO;
-  return result;
 }
 
-void cCiHandler::SendCaPmt(void)
+void cCamSlot::Process(cTPDU *TPDU)
 {
   cMutexLock MutexLock(&mutex);
-  if (newCaSupport) {
-     newCaSupport = false;
-     for (int Slot = 0; Slot < numSlots; Slot++) {
-         cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-         if (cas) {
-            // build the list of CA_PMT data:
-            cList<cCiCaPmt> CaPmtList;
-            for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
-                bool Active = false;
-                cCiCaPmt *CaPmt = new cCiCaPmt(CPCI_OK_DESCRAMBLING, source, transponder, p->programNumber, GetCaSystemIds(Slot));
-                if (CaPmt->Valid()) {
-                   for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
-                       if (q->active) {
-                          CaPmt->AddPid(q->pid, q->streamType);
-                          Active = true;
-                          }
-                       }
-                   }
-                if (Active)
-                   CaPmtList.Add(CaPmt);
-                else
-                   delete CaPmt;
-                }
-            // send the CA_PMT data:
-            uint8_t ListManagement = CaPmtList.Count() > 1 ? CPLM_FIRST : CPLM_ONLY;
-            for (cCiCaPmt *CaPmt = CaPmtList.First(); CaPmt; CaPmt = CaPmtList.Next(CaPmt)) {
-                CaPmt->SetListManagement(ListManagement);
-                if (!cas->SendPMT(CaPmt))
-                   newCaSupport = true;
-                ListManagement = CaPmt->Next() && CaPmt->Next()->Next() ? CPLM_MORE : CPLM_LAST;
-                }
-            }
+  if (TPDU) {
+     int n = TPDU->Tcid();
+     if (1 <= n && n <= MAX_CONNECTIONS_PER_CAM_SLOT) {
+        if (tc[n])
+           tc[n]->Process(TPDU);
+        }
+     }
+  for (int i = 1; i <= MAX_CONNECTIONS_PER_CAM_SLOT; i++) {
+      if (tc[i]) {
+         if (!tc[i]->Process()) {
+           Reset();
+           return;
+           }
          }
+      }
+  if (moduleCheckTimer.TimedOut()) {
+     eModuleStatus ms = ModuleStatus();
+     if (ms != lastModuleStatus) {
+        switch (ms) {
+          case msNone:
+               dbgprotocol("Slot %d: no module present\n", slotNumber);
+               isyslog("CAM %d: no module present", slotNumber);
+               DeleteAllConnections();
+               break;
+          case msReset:
+               dbgprotocol("Slot %d: module reset\n", slotNumber);
+               isyslog("CAM %d: module reset", slotNumber);
+               DeleteAllConnections();
+               break;
+          case msPresent:
+               dbgprotocol("Slot %d: module present\n", slotNumber);
+               isyslog("CAM %d: module present", slotNumber);
+               break;
+          case msReady:
+               dbgprotocol("Slot %d: module ready\n", slotNumber);
+               isyslog("CAM %d: module ready", slotNumber);
+               NewConnection();
+               resendPmt = caProgramList.Count() > 0;
+               break;
+          }
+        lastModuleStatus = ms;
+        }
+     moduleCheckTimer.Set(MODULE_CHECK_INTERVAL);
+     }
+  if (resendPmt)
+     SendCaPmt(CPCI_OK_DESCRAMBLING);
+  processed.Broadcast();
+}
+
+cCiSession *cCamSlot::GetSessionByResourceId(uint32_t ResourceId)
+{
+  cMutexLock MutexLock(&mutex);
+  return tc[1] ? tc[1]->GetSessionByResourceId(ResourceId) : NULL;
+}
+
+void cCamSlot::Write(cTPDU *TPDU)
+{
+  cMutexLock MutexLock(&mutex);
+  if (ciAdapter && TPDU->Size()) {
+     TPDU->Dump(SlotNumber(), true);
+     ciAdapter->Write(TPDU->Buffer(), TPDU->Size());
+     }
+}
+
+bool cCamSlot::Reset(void)
+{
+  cMutexLock MutexLock(&mutex);
+  ChannelCamRelations.Reset(slotNumber);
+  DeleteAllConnections();
+  if (ciAdapter) {
+     dbgprotocol("Slot %d: reset...", slotNumber);
+     if (ciAdapter->Reset(slotIndex)) {
+        resetTime = time(NULL);
+        dbgprotocol("ok.\n");
+        return true;
+        }
+     dbgprotocol("failed!\n");
+     }
+  return false;
+}
+
+eModuleStatus cCamSlot::ModuleStatus(void)
+{
+  cMutexLock MutexLock(&mutex);
+  eModuleStatus ms = ciAdapter ? ciAdapter->ModuleStatus(slotIndex) : msNone;
+  if (resetTime) {
+     if (ms <= msReset) {
+        if (time(NULL) - resetTime < MODULE_RESET_TIMEOUT)
+           return msReset;
+        }
+     resetTime = 0;
      }
+  return ms;
+}
+
+const char *cCamSlot::GetCamName(void)
+{
+  cMutexLock MutexLock(&mutex);
+  return tc[1] ? tc[1]->GetCamName() : NULL;
 }
 
-bool cCiHandler::EnterMenu(int Slot)
+bool cCamSlot::Ready(void)
 {
   cMutexLock MutexLock(&mutex);
-  cCiApplicationInformation *api = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION, Slot);
+  return ModuleStatus() == msNone || tc[1] && tc[1]->Ready();
+}
+
+bool cCamSlot::HasMMI(void)
+{
+  return GetSessionByResourceId(RI_MMI);
+}
+
+bool cCamSlot::HasUserIO(void)
+{
+  cMutexLock MutexLock(&mutex);
+  return tc[1] && tc[1]->HasUserIO();
+}
+
+bool cCamSlot::EnterMenu(void)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiApplicationInformation *api = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION);
   return api ? api->EnterMenu() : false;
 }
 
-cCiMenu *cCiHandler::GetMenu(void)
+cCiMenu *cCamSlot::GetMenu(void)
 {
   cMutexLock MutexLock(&mutex);
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot);
-      if (mmi) {
-         cCiMenu *Menu = mmi->Menu();
-         if (Menu)
-            Menu->mutex = &mutex;
-         return Menu;
-         }
-      }
+  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
+  if (mmi) {
+     cCiMenu *Menu = mmi->Menu();
+     if (Menu)
+        Menu->mutex = &mutex;
+     return Menu;
+     }
   return NULL;
 }
 
-cCiEnquiry *cCiHandler::GetEnquiry(void)
+cCiEnquiry *cCamSlot::GetEnquiry(void)
 {
   cMutexLock MutexLock(&mutex);
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI, Slot);
-      if (mmi) {
-         cCiEnquiry *Enquiry = mmi->Enquiry();
-         if (Enquiry)
-            Enquiry->mutex = &mutex;
-         return Enquiry;
-         }
-      }
+  cCiMMI *mmi = (cCiMMI *)GetSessionByResourceId(RI_MMI);
+  if (mmi) {
+     cCiEnquiry *Enquiry = mmi->Enquiry();
+     if (Enquiry)
+        Enquiry->mutex = &mutex;
+     return Enquiry;
+     }
   return NULL;
 }
 
-const char *cCiHandler::GetCamName(int Slot)
+void cCamSlot::SendCaPmt(uint8_t CmdId)
 {
   cMutexLock MutexLock(&mutex);
-  cCiApplicationInformation *ai = (cCiApplicationInformation *)GetSessionByResourceId(RI_APPLICATION_INFORMATION, Slot);
-  return ai ? ai->GetMenuString() : NULL;
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  if (cas) {
+     const int *CaSystemIds = cas->GetCaSystemIds();
+     if (CaSystemIds && *CaSystemIds) {
+        if (caProgramList.Count()) {
+           for (int Loop = 1; Loop <= 2; Loop++) {
+               for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+                   if (p->modified || resendPmt) {
+                      bool Active = false;
+                      cCiCaPmt CaPmt(CmdId, source, transponder, p->programNumber, CaSystemIds);
+                      for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+                          if (q->active) {
+                             CaPmt.AddPid(q->pid, q->streamType);
+                             Active = true;
+                             }
+                          }
+                      if ((Loop == 1) != Active) { // first remove, then add
+                         if (cas->RepliesToQuery())
+                            CaPmt.SetListManagement(Active ? CPLM_ADD : CPLM_UPDATE);
+                         if (Active || cas->RepliesToQuery())
+                            cas->SendPMT(&CaPmt);
+                         p->modified = false;
+                         }
+                      }
+                   }
+               }
+           resendPmt = false;
+           }
+        else {
+           cCiCaPmt CaPmt(CmdId, 0, 0, 0, NULL);
+           cas->SendPMT(&CaPmt);
+           }
+        }
+     }
 }
 
-const unsigned short *cCiHandler::GetCaSystemIds(int Slot)
+const int *cCamSlot::GetCaSystemIds(void)
 {
   cMutexLock MutexLock(&mutex);
-  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
   return cas ? cas->GetCaSystemIds() : NULL;
 }
 
-bool cCiHandler::ProvidesCa(const unsigned short *CaSystemIds)
+int cCamSlot::Priority(void)
 {
-  cMutexLock MutexLock(&mutex);
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-      if (cas) {
-         for (const unsigned short *ids = cas->GetCaSystemIds(); ids && *ids; ids++) {
-             for (const unsigned short *id = CaSystemIds; *id; id++) {
-                 if (*id == *ids)
-                    return true;
-                 }
-             }
-         }
-      }
-  return false;
+  cDevice *d = Device();
+  return d ? d->Priority() : -1;
 }
 
-void cCiHandler::SetSource(int Source, int Transponder)
+bool cCamSlot::ProvidesCa(const int *CaSystemIds)
 {
   cMutexLock MutexLock(&mutex);
-  if (source != Source || transponder != Transponder) {
-     //XXX if there are active entries, send an empty CA_PMT
-     caProgramList.Clear();
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  if (cas) {
+     for (const int *ids = cas->GetCaSystemIds(); ids && *ids; ids++) {
+         for (const int *id = CaSystemIds; *id; id++) {
+             if (*id == *ids)
+                return true;
+             }
+         }
      }
-  source = Source;
-  transponder = Transponder;
+  return false;
 }
 
-void cCiHandler::AddPid(int ProgramNumber, int Pid, int StreamType)
+void cCamSlot::AddPid(int ProgramNumber, int Pid, int StreamType)
 {
   cMutexLock MutexLock(&mutex);
   cCiCaProgramData *ProgramData = NULL;
@@ -1854,65 +1851,276 @@ void cCiHandler::AddPid(int ProgramNumber, int Pid, int StreamType)
   ProgramData->pidList.Add(new cCiCaPidData(Pid, StreamType));
 }
 
-void cCiHandler::SetPid(int Pid, bool Active)
+void cCamSlot::SetPid(int Pid, bool Active)
 {
   cMutexLock MutexLock(&mutex);
   for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
       for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
           if (q->pid == Pid) {
-             q->active = Active;
+             if (q->active != Active) {
+                q->active = Active;
+                p->modified = true;
+                }
              return;
              }
          }
       }
 }
 
-bool cCiHandler::CanDecrypt(int ProgramNumber)
+// see ISO/IEC 13818-1
+#define STREAM_TYPE_VIDEO  0x02
+#define STREAM_TYPE_AUDIO  0x04
+#define STREAM_TYPE_DOLBY  0x06
+
+void cCamSlot::AddChannel(const cChannel *Channel)
 {
   cMutexLock MutexLock(&mutex);
-  for (int Slot = 0; Slot < numSlots; Slot++) {
-      cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-      if (cas) {
-         for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
-             if (p->programNumber == ProgramNumber) {
-                cCiCaPmt CaPmt(CPCI_QUERY, source, transponder, p->programNumber, GetCaSystemIds(Slot));//XXX???
-                if (CaPmt.Valid()) {
-                   for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
-//XXX                       if (q->active)
-                          CaPmt.AddPid(q->pid, q->streamType);
-                       }
-                   }
-                if (!cas->SendPMT(&CaPmt))
-                   return false;//XXX
-                //XXX
-                time_t timeout = time(NULL) + 3;//XXX
-                while (time(NULL) <= timeout) {
-                      Process(Slot);
-                      cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT, Slot);
-                      if (!cas)
-                         return false;//XXX
-                      if (cas->ReceivedReply(true))
-                         return true;
-                      //XXX remember if a slot doesn't receive a reply
-                      }
-                break;
-                }
+  if (source != Channel->Source() || transponder != Channel->Transponder())
+     StopDecrypting();
+  source = Channel->Source();
+  transponder = Channel->Transponder();
+  if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
+     AddPid(Channel->Sid(), Channel->Vpid(), STREAM_TYPE_VIDEO);
+     for (const int *Apid = Channel->Apids(); *Apid; Apid++)
+         AddPid(Channel->Sid(), *Apid, STREAM_TYPE_AUDIO);
+     for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
+         AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_DOLBY);
+     }
+}
+
+#define QUERY_REPLY_WAIT  100 // ms to wait between checks for a reply
+
+bool cCamSlot::CanDecrypt(const cChannel *Channel)
+{
+  if (Channel->Ca() < CA_ENCRYPTED_MIN)
+     return true; // channel not encrypted
+  if (!IsDecrypting())
+     return true; // any CAM can decrypt at least one channel
+  cMutexLock MutexLock(&mutex);
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  if (cas && cas->RepliesToQuery()) {
+     cCiCaPmt CaPmt(CPCI_QUERY, Channel->Source(), Channel->Transponder(), Channel->Sid(), GetCaSystemIds());
+     CaPmt.SetListManagement(CPLM_ADD); // WORKAROUND: CPLM_ONLY doesn't work with Alphacrypt 3.09 (deletes existing CA_PMTs)
+     CaPmt.AddPid(Channel->Vpid(), STREAM_TYPE_VIDEO);
+     for (const int *Apid = Channel->Apids(); *Apid; Apid++)
+         CaPmt.AddPid(*Apid, STREAM_TYPE_AUDIO);
+     for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
+         CaPmt.AddPid(*Dpid, STREAM_TYPE_DOLBY);
+     cas->SendPMT(&CaPmt);
+     cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
+     do {
+        processed.TimedWait(mutex, QUERY_REPLY_WAIT);
+        if ((cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT)) != NULL) { // must re-fetch it, there might have been a reset
+           if (cas->ReceivedReply())
+              return cas->CanDecrypt();
+           }
+        else
+           return false;
+        } while (!Timeout.TimedOut());
+     dsyslog("CAM %d: didn't reply to QUERY", SlotNumber());
+     }
+  return false;
+}
+
+void cCamSlot::StartDecrypting(void)
+{
+  SendCaPmt(CPCI_OK_DESCRAMBLING);
+}
+
+void cCamSlot::StopDecrypting(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (caProgramList.Count()) {
+     caProgramList.Clear();
+     SendCaPmt(CPCI_NOT_SELECTED);
+     }
+}
+
+bool cCamSlot::IsDecrypting(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (caProgramList.Count()) {
+     for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+         if (p->modified)
+            return true; // any modifications need to be processed before we can assume it's no longer decrypting
+         for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+             if (q->active)
+                return true;
              }
          }
-      }
+     }
   return false;
 }
 
-void cCiHandler::StartDecrypting(void)
+// --- cChannelCamRelation ---------------------------------------------------
+
+#define CAM_CHECKED_TIMEOUT  15 // seconds before a CAM that has been checked for a particular channel will be checked again
+
+class cChannelCamRelation : public cListObject {
+private:
+  tChannelID channelID;
+  uint32_t camSlotsChecked;
+  uint32_t camSlotsDecrypt;
+  time_t lastChecked;
+public:
+  cChannelCamRelation(tChannelID ChannelID);
+  bool TimedOut(void);
+  tChannelID ChannelID(void) { return channelID; }
+  bool CamChecked(int CamSlotNumber);
+  bool CamDecrypt(int CamSlotNumber);
+  void SetChecked(int CamSlotNumber);
+  void SetDecrypt(int CamSlotNumber);
+  void ClrChecked(int CamSlotNumber);
+  void ClrDecrypt(int CamSlotNumber);
+  };
+
+cChannelCamRelation::cChannelCamRelation(tChannelID ChannelID)
+{
+  channelID = ChannelID;
+  camSlotsChecked = 0;
+  camSlotsDecrypt = 0;
+  lastChecked = 0;
+}
+
+bool cChannelCamRelation::TimedOut(void)
+{
+  return !camSlotsDecrypt && time(NULL) - lastChecked > CAM_CHECKED_TIMEOUT;
+}
+
+bool cChannelCamRelation::CamChecked(int CamSlotNumber)
+{
+  if (lastChecked && time(NULL) - lastChecked > CAM_CHECKED_TIMEOUT) {
+     lastChecked = 0;
+     camSlotsChecked = 0;
+     }
+  return camSlotsChecked & (1 << (CamSlotNumber - 1));
+}
+
+bool cChannelCamRelation::CamDecrypt(int CamSlotNumber)
+{
+  return camSlotsDecrypt & (1 << (CamSlotNumber - 1));
+}
+
+void cChannelCamRelation::SetChecked(int CamSlotNumber)
+{
+  camSlotsChecked |= (1 << (CamSlotNumber - 1));
+  lastChecked = time(NULL);
+  ClrDecrypt(CamSlotNumber);
+}
+
+void cChannelCamRelation::SetDecrypt(int CamSlotNumber)
+{
+  camSlotsDecrypt |= (1 << (CamSlotNumber - 1));
+  ClrChecked(CamSlotNumber);
+}
+
+void cChannelCamRelation::ClrChecked(int CamSlotNumber)
+{
+  camSlotsChecked &= ~(1 << (CamSlotNumber - 1));
+  lastChecked = 0;
+}
+
+void cChannelCamRelation::ClrDecrypt(int CamSlotNumber)
+{
+  camSlotsDecrypt &= ~(1 << (CamSlotNumber - 1));
+}
+
+// --- cChannelCamRelations --------------------------------------------------
+
+#define CHANNEL_CAM_RELATIONS_CLEANUP_INTERVAL 3600 // seconds between cleanups
+
+cChannelCamRelations ChannelCamRelations;
+
+cChannelCamRelations::cChannelCamRelations(void)
+{
+  lastCleanup = time(NULL);
+}
+
+void cChannelCamRelations::Cleanup(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (time(NULL) - lastCleanup > CHANNEL_CAM_RELATIONS_CLEANUP_INTERVAL) {
+     for (cChannelCamRelation *ccr = First(); ccr; ) {
+         cChannelCamRelation *c = ccr;
+         ccr = Next(ccr);
+         if (c->TimedOut())
+            Del(c);
+         }
+     lastCleanup = time(NULL);
+     }
+}
+
+cChannelCamRelation *cChannelCamRelations::GetEntry(tChannelID ChannelID)
+{
+  cMutexLock MutexLock(&mutex);
+  Cleanup();
+  for (cChannelCamRelation *ccr = First(); ccr; ccr = Next(ccr)) {
+      if (ccr->ChannelID() == ChannelID)
+         return ccr;
+      }
+  return NULL;
+}
+
+cChannelCamRelation *cChannelCamRelations::AddEntry(tChannelID ChannelID)
+{
+  cMutexLock MutexLock(&mutex);
+  cChannelCamRelation *ccr = GetEntry(ChannelID);
+  if (!ccr)
+     Add(ccr = new cChannelCamRelation(ChannelID));
+  return ccr;
+}
+
+void cChannelCamRelations::Reset(int CamSlotNumber)
+{
+  cMutexLock MutexLock(&mutex);
+  for (cChannelCamRelation *ccr = First(); ccr; ccr = Next(ccr)) {
+      ccr->ClrChecked(CamSlotNumber);
+      ccr->ClrDecrypt(CamSlotNumber);
+      }
+}
+
+bool cChannelCamRelations::CamChecked(tChannelID ChannelID, int CamSlotNumber)
+{
+  cMutexLock MutexLock(&mutex);
+  cChannelCamRelation *ccr = GetEntry(ChannelID);
+  return ccr ? ccr->CamChecked(CamSlotNumber) : false;
+}
+
+bool cChannelCamRelations::CamDecrypt(tChannelID ChannelID, int CamSlotNumber)
+{
+  cMutexLock MutexLock(&mutex);
+  cChannelCamRelation *ccr = GetEntry(ChannelID);
+  return ccr ? ccr->CamDecrypt(CamSlotNumber) : false;
+}
+
+void cChannelCamRelations::SetChecked(tChannelID ChannelID, int CamSlotNumber)
+{
+  cMutexLock MutexLock(&mutex);
+  cChannelCamRelation *ccr = AddEntry(ChannelID);
+  if (ccr)
+     ccr->SetChecked(CamSlotNumber);
+}
+
+void cChannelCamRelations::SetDecrypt(tChannelID ChannelID, int CamSlotNumber)
+{
+  cMutexLock MutexLock(&mutex);
+  cChannelCamRelation *ccr = AddEntry(ChannelID);
+  if (ccr)
+     ccr->SetDecrypt(CamSlotNumber);
+}
+
+void cChannelCamRelations::ClrChecked(tChannelID ChannelID, int CamSlotNumber)
 {
   cMutexLock MutexLock(&mutex);
-  newCaSupport = true;
-  SendCaPmt();
+  cChannelCamRelation *ccr = GetEntry(ChannelID);
+  if (ccr)
+     ccr->ClrChecked(CamSlotNumber);
 }
 
-bool cCiHandler::Reset(int Slot)
+void cChannelCamRelations::ClrDecrypt(tChannelID ChannelID, int CamSlotNumber)
 {
   cMutexLock MutexLock(&mutex);
-  CloseAllSessions(Slot);
-  return tpl->ResetSlot(Slot, true);
+  cChannelCamRelation *ccr = GetEntry(ChannelID);
+  if (ccr)
+     ccr->ClrDecrypt(CamSlotNumber);
 }
diff --git a/ci.h b/ci.h
index 457401060..37514a52a 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.22 2006/08/12 09:43:31 kls Exp $
+ * $Id: ci.h 1.23 2007/01/03 12:49:10 kls Exp $
  */
 
 #ifndef __CI_H
@@ -12,13 +12,18 @@
 
 #include <stdint.h>
 #include <stdio.h>
+#include "channels.h"
 #include "thread.h"
 #include "tools.h"
 
+#define MAX_CAM_SLOTS_PER_ADAPTER     8 // maximum possible value is 255
+#define MAX_CONNECTIONS_PER_CAM_SLOT  8 // maximum possible value is 254
+#define CAM_READ_TIMEOUT  50 // ms
+
 class cCiMMI;
 
 class cCiMenu {
-  friend class cCiHandler;
+  friend class cCamSlot;
   friend class cCiMMI;
 private:
   enum { MAX_CIMENU_ENTRIES = 64 }; ///< XXX is there a specified maximum?
@@ -40,14 +45,14 @@ class cCiMenu {
   const char *Entry(int n) { return n < numEntries ? entries[n] : NULL; }
   int NumEntries(void) { return numEntries; }
   bool Selectable(void) { return selectable; }
-  bool Select(int Index);
-  bool Cancel(void);
-  bool Abort(void);
+  void Select(int Index);
+  void Cancel(void);
+  void Abort(void);
   bool HasUpdate(void);
   };
 
 class cCiEnquiry {
-  friend class cCiHandler;
+  friend class cCamSlot;
   friend class cCiMMI;
 private:
   cCiMMI *mmi;
@@ -61,103 +66,140 @@ class cCiEnquiry {
   const char *Text(void) { return text; }
   bool Blind(void) { return blind; }
   int ExpectedLength(void) { return expectedLength; }
-  bool Reply(const char *s);
-  bool Cancel(void);
-  bool Abort(void);
+  void Reply(const char *s);
+  void Cancel(void);
+  void Abort(void);
   };
 
-#define MAX_CI_SESSION  16 //XXX
-#define MAX_CI_SLOT     16
+class cDevice;
+class cCamSlot;
 
-class cCiCaPidData : public cListObject {
-public:
-  bool active;
-  int pid;
-  int streamType;
-  cCiCaPidData(int Pid, int StreamType)
-  {
-    active = false;
-    pid = Pid;
-    streamType = StreamType;
-  }
-  };
+enum eModuleStatus { msNone, msReset, msPresent, msReady };
 
-class cCiCaProgramData : public cListObject {
+class cCiAdapter : public cThread {
+  friend class cCamSlot;
+private:
+  cDevice *assignedDevice;
+  cCamSlot *camSlots[MAX_CAM_SLOTS_PER_ADAPTER];
+  void AddCamSlot(cCamSlot *CamSlot);
+       ///< Adds the given CamSlot to this CI adapter.
+protected:
+  virtual void Action(void);
+       ///< Handles the attached CAM slots in a separate thread.
+       ///< The derived class must call the Start() function to
+       ///< actually start CAM handling.
+  virtual int Read(uint8_t *Buffer, int MaxLength) = 0;
+       ///< Reads one chunk of data into the given Buffer, up to MaxLength bytes.
+       ///< If no data is available immediately, wait for up to CAM_READ_TIMEOUT.
+       ///< Returns the number of bytes read (in case of an error it will also
+       ///< return 0).
+  virtual void Write(const uint8_t *Buffer, int Length) = 0;
+       ///< Writes Length bytes of the given Buffer.
+  virtual bool Reset(int Slot) = 0;
+       ///< Resets the CAM in the given Slot.
+       ///< Returns true if the operation was successful.
+  virtual eModuleStatus ModuleStatus(int Slot) = 0;
+       ///< Returns the status of the CAM in the given Slot.
+  virtual bool Assign(cDevice *Device, bool Query = false) = 0;
+       ///< Assigns this adapter to the given Device, if this is possible.
+       ///< If Query is 'true', the adapter only checks whether it can be
+       ///< assigned to the Device, but doesn't actually assign itself to it.
+       ///< Returns true if the adapter can be assigned to the Device.
+       ///< If Device is NULL, the adapter will be unassigned from any
+       ///< device it was previously assigned to. The value of Query
+       ///< is ignored in that case, and this function always returns
+       ///< 'true'.
 public:
-  int programNumber;
-  cList<cCiCaPidData> pidList;
-  cCiCaProgramData(int ProgramNumber)
-  {
-    programNumber = ProgramNumber;
-  }
+  cCiAdapter(void);
+  virtual ~cCiAdapter();
+       ///< The derived class must call Cancel(3) in its destructor.
+  virtual bool Ready(void);
+       ///< Returns 'true' if all present CAMs in this adapter are ready.
   };
 
-class cCiSession;
-class cCiTransportLayer;
+class cTPDU;
 class cCiTransportConnection;
+class cCiSession;
+class cCiCaProgramData;
 
-class cCiHandler {
+class cCamSlot : public cListObject {
+  friend class cCiAdapter;
+  friend class cCiTransportConnection;
 private:
   cMutex mutex;
-  int fd;
-  int numSlots;
-  bool newCaSupport;
-  bool hasUserIO;
-  bool moduleReady[MAX_CI_SLOT];
-  cCiSession *sessions[MAX_CI_SESSION];
-  cCiTransportLayer *tpl;
-  cCiTransportConnection *tc;
+  cCondVar processed;
+  cCiAdapter *ciAdapter;
+  int slotIndex;
+  int slotNumber;
+  cCiTransportConnection *tc[MAX_CONNECTIONS_PER_CAM_SLOT + 1];  // connection numbering starts with 1
+  eModuleStatus lastModuleStatus;
+  time_t resetTime;
+  cTimeMs moduleCheckTimer;
+  bool resendPmt;
   int source;
   int transponder;
   cList<cCiCaProgramData> caProgramList;
-  uint32_t ResourceIdToInt(const uint8_t *Data);
-  bool Send(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId = 0, int Status = -1);
-  const unsigned short *GetCaSystemIds(int Slot);
-  cCiSession *GetSessionBySessionId(uint16_t SessionId);
-  cCiSession *GetSessionByResourceId(uint32_t ResourceId, int Slot);
-  cCiSession *CreateSession(uint32_t ResourceId);
-  bool OpenSession(int Length, const uint8_t *Data);
-  bool CloseSession(uint16_t SessionId);
-  int CloseAllSessions(int Slot);
-  cCiHandler(int Fd, int NumSlots);
-  void SendCaPmt(void);
+  const int *GetCaSystemIds(void);
+  void SendCaPmt(uint8_t CmdId);
+  void NewConnection(void);
+  void DeleteAllConnections(void);
+  void Process(cTPDU *TPDU = NULL);
+  void Write(cTPDU *TPDU);
+  cCiSession *GetSessionByResourceId(uint32_t ResourceId);
 public:
-  ~cCiHandler();
-  static cCiHandler *CreateCiHandler(const char *FileName);
-       ///< Creates a new cCiHandler for the given CA device.
-  int NumSlots(void) { return numSlots; }
-       ///< Returns the number of CAM slots provided by this CA device.
-  int NumCams(void);
-       ///< Returns the number of actual CAMs inserted into this CA device.
+  cCamSlot(cCiAdapter *CiAdapter);
+       ///< Creates a new CAM slot for the given CiAdapter.
+       ///< The CiAdapter will take care of deleting the CAM slot,
+       ///< so the caller must not delete it!
+  virtual ~cCamSlot();
+  bool Assign(cDevice *Device, bool Query = false);
+       ///< Assigns this CAM slot to the given Device, if this is possible.
+       ///< If Query is 'true', the CI adapter of this slot only checks whether
+       ///< it can be assigned to the Device, but doesn't actually assign itself to it.
+       ///< Returns true if this slot can be assigned to the Device.
+       ///< If Device is NULL, the slot will be unassigned from any
+       ///< device it was previously assigned to. The value of Query
+       ///< is ignored in that case, and this function always returns
+       ///< 'true'.
+  cDevice *Device(void);
+       ///< Returns the device this CAM slot is currently assigned to.
+  int SlotIndex(void) { return slotIndex; }
+       ///< Returns the index of this CAM slot within its CI adapter.
+       ///< The first slot has an index of 0.
+  int SlotNumber(void) { return slotNumber; }
+       ///< Returns the number of this CAM slot within the whole system.
+       ///< The first slot has the number 1.
+  bool Reset(void);
+       ///< Resets the CAM in this slot.
+       ///< Returns true if the operation was successful.
+  eModuleStatus ModuleStatus(void);
+       ///< Returns the status of the CAM in this slot.
+  const char *GetCamName(void);
+       ///< Returns the name of the CAM in this slot, or NULL if there is
+       ///< no ready CAM in this slot.
   bool Ready(void);
-       ///< Returns true if all CAMs in this CA device are ready.
-  bool Process(int Slot = -1);
-       ///< Processes the given Slot. If Slot is -1, all slots are processed.
-       ///< Returns false in case of an error.
-  bool HasUserIO(void) { return hasUserIO; }
+       ///< Returns 'true' if the CAM in this slot is ready to decrypt.
+  bool HasMMI(void);
+       ///< Returns 'true' if the CAM in this slot has an active MMI.
+  bool HasUserIO(void);
        ///< Returns true if there is a pending user interaction, which shall
        ///< be retrieved via GetMenu() or GetEnquiry().
-  bool EnterMenu(int Slot);
-       ///< Requests the CAM in the given Slot to start its menu.
+  bool EnterMenu(void);
+       ///< Requests the CAM in this slot to start its menu.
   cCiMenu *GetMenu(void);
        ///< Gets a pending menu, or NULL if there is no menu.
   cCiEnquiry *GetEnquiry(void);
        ///< Gets a pending enquiry, or NULL if there is no enquiry.
-  const char *GetCamName(int Slot);
-       ///< Returns the name of the CAM in the given Slot, or NULL if there
-       ///< is no CAM in that slot.
-  bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot???
-       ///< Returns true if any of the CAMs can provide one of the given
+  int Priority(void);
+       ///< Returns the priority if the device this slot is currently assigned
+       ///< to, or -1 if it is not assigned to any device.
+  bool ProvidesCa(const int *CaSystemIds);
+       ///< Returns true if the CAM in this slot provides one of the given
        ///< CaSystemIds. This doesn't necessarily mean that it will be
        ///< possible to actually decrypt such a programme, since CAMs
        ///< usually advertise several CA system ids, while the actual
        ///< decryption is controlled by the smart card inserted into
        ///< the CAM.
-  void SetSource(int Source, int Transponder);
-       ///< Sets the Source and Transponder of the device this cCiHandler is
-       ///< currently tuned to. If Source or Transponder are different than
-       ///< what was given in a previous call to SetSource(), any previously
-       ///< added PIDs will be cleared.
   void AddPid(int ProgramNumber, int Pid, int StreamType);
        ///< Adds the given PID information to the list of PIDs. A later call
        ///< to SetPid() will (de)activate one of these entries.
@@ -165,16 +207,55 @@ class cCiHandler {
        ///< Sets the given Pid (which has previously been added through a
        ///< call to AddPid()) to Active. A later call to StartDecrypting() will
        ///< send the full list of currently active CA_PMT entries to the CAM.
-  bool CanDecrypt(int ProgramNumber);
-       ///< XXX
-       ///< Returns true if there is a CAM in this CA device that is able
-       ///< to decrypt the programme with the given ProgramNumber. The PIDs
-       ///< for this ProgramNumber must have been set through previous calls
-       ///< to SetPid().
+  void AddChannel(const cChannel *Channel);
+       ///< Adds all PIDs if the given Channel to the current list of PIDs.
+       ///< If the source or transponder of the channel are different than
+       ///< what was given in a previous call to AddChannel(), any previously
+       ///< added PIDs will be cleared.
+  bool CanDecrypt(const cChannel *Channel);
+       ///< Returns true if there is a CAM in this slot that is able to decrypt
+       ///< the given Channel (or at least claims to be able to do so).
+       ///< Since the QUERY/REPLY mechanism for CAMs is pretty unreliable (some
+       ///< CAMs don't reply to queries at all), we always return true if the
+       ///< CAM is currently not decrypting anything. If there is already a
+       ///< channel being decrypted, a call to CanDecrypt() checks whether the
+       ///< CAM can also decrypt the given channel. Only CAMs that have replied
+       ///< to the inital QUERY will perform this check at all. CAMs that never
+       ///< replied to the initial QUERY are assumed not to be able to handle
+       ///< more than one channel at a time.
   void StartDecrypting(void);
        ///< Triggers sending all currently active CA_PMT entries to the CAM,
        ///< so that it will start decrypting.
-  bool Reset(int Slot);
+  void StopDecrypting(void);
+       ///< Clears the list of CA_PMT entries and tells the CAM to stop decrypting.
+  bool IsDecrypting(void);
+       ///< Returns true if the CAM in this slot is currently used for decrypting.
   };
 
+class cCamSlots : public cList<cCamSlot> {};
+
+extern cCamSlots CamSlots;
+
+class cChannelCamRelation;
+
+class cChannelCamRelations : public cList<cChannelCamRelation> {
+private:
+  cMutex mutex;
+  cChannelCamRelation *GetEntry(tChannelID ChannelID);
+  cChannelCamRelation *AddEntry(tChannelID ChannelID);
+  time_t lastCleanup;
+  void Cleanup(void);
+public:
+  cChannelCamRelations(void);
+  void Reset(int CamSlotNumber);
+  bool CamChecked(tChannelID ChannelID, int CamSlotNumber);
+  bool CamDecrypt(tChannelID ChannelID, int CamSlotNumber);
+  void SetChecked(tChannelID ChannelID, int CamSlotNumber);
+  void SetDecrypt(tChannelID ChannelID, int CamSlotNumber);
+  void ClrChecked(tChannelID ChannelID, int CamSlotNumber);
+  void ClrDecrypt(tChannelID ChannelID, int CamSlotNumber);
+  };
+
+extern cChannelCamRelations ChannelCamRelations;
+
 #endif //__CI_H
diff --git a/config.h b/config.h
index 3597ff782..e795ad774 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.282 2007/01/07 13:45:19 kls Exp $
+ * $Id: config.h 1.283 2007/01/07 14:09:31 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.5"
-#define VDRVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.0"
+#define VDRVERSNUM   10500  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.4.5"
-#define APIVERSNUM   10405  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.0"
+#define APIVERSNUM   10500  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 0fb4fc755..e26af004e 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.137 2006/09/03 10:13:25 kls Exp $
+ * $Id: device.c 1.138 2007/01/07 13:41:07 kls Exp $
  */
 
 #include "device.h"
@@ -164,7 +164,9 @@ cDevice::cDevice(void)
   sdtFilter = NULL;
   nitFilter = NULL;
 
-  ciHandler = NULL;
+  camSlot = NULL;
+  startScrambleDetection = 0;
+
   player = NULL;
   pesAssembler = new cPesAssembler;
   ClrAvailableTracks();
@@ -183,9 +185,7 @@ cDevice::cDevice(void)
 cDevice::~cDevice()
 {
   Detach(player);
-  for (int i = 0; i < MAXRECEIVERS; i++)
-      Detach(receiver[i]);
-  delete ciHandler;
+  DetachAllReceivers();
   delete nitFilter;
   delete sdtFilter;
   delete patFilter;
@@ -199,8 +199,10 @@ bool cDevice::WaitForAllDevicesReady(int Timeout)
   for (time_t t0 = time(NULL); time(NULL) - t0 < Timeout; ) {
       bool ready = true;
       for (int i = 0; i < numDevices; i++) {
-          if (device[i] && !device[i]->Ready())
+          if (device[i] && !device[i]->Ready()) {
              ready = false;
+             cCondWait::SleepMs(100);
+             }
           }
       if (ready)
          return true;
@@ -278,39 +280,98 @@ cDevice *cDevice::GetDevice(int Index)
   return (0 <= Index && Index < numDevices) ? device[Index] : NULL;
 }
 
-cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
-{
-  cDevice *d = NULL;
-  uint Impact = 0xFFFFFFFF; // we're looking for a device with the least impact
-  for (int i = 0; i < numDevices; i++) {
-      bool ndr;
-      if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
-         // Put together an integer number that reflects the "impact" using
-         // this device would have on the overall system. Each condition is represented
-         // by one bit in the number (or several bits, if the condition is actually
-         // a numeric value). The sequence in which the conditions are listed corresponds
-         // to their individual severity, where the one listed first will make the most
-         // difference, because it results in the most significant bit of the result.
-         uint imp = 0;
-         imp <<= 1; imp |= !device[i]->Receiving() || ndr;                         // use receiving devices if we don't need to detach existing receivers
-         imp <<= 1; imp |= device[i]->Receiving();                                 // avoid devices that are receiving
-         imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();        // avoid the Transfer Mode receiver device
-         imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
-         imp <<= 8; imp |= min(max(device[i]->ProvidesCa(Channel), 0), 0xFF);      // use the device that provides the lowest number of conditional access methods
-         imp <<= 1; imp |= device[i]->IsPrimaryDevice();                           // avoid the primary device
-         imp <<= 1; imp |= device[i]->HasDecoder();                                // avoid full featured cards
-         if (imp < Impact) {
-            // This device has less impact than any previous one, so we take it.
-            Impact = imp;
-            d = device[i];
-            if (NeedsDetachReceivers)
-               *NeedsDetachReceivers = ndr;
+cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView)
+{
+  // Collect the current priorities of all CAM slots that can decrypt the channel:
+  int NumCamSlots = CamSlots.Count();
+  int SlotPriority[NumCamSlots];
+  int NumUsableSlots = 0;
+  if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
+     for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+         SlotPriority[CamSlot->Index()] = MAXPRIORITY + 1; // assumes it can't be used
+         if (CamSlot->ModuleStatus() == msReady) {
+            if (CamSlot->ProvidesCa(Channel->Caids())) {
+               if (!ChannelCamRelations.CamChecked(Channel->GetChannelID(), CamSlot->SlotNumber())) {
+                  SlotPriority[CamSlot->Index()] = CamSlot->Priority();
+                  NumUsableSlots++;
+                  }
+               }
             }
          }
+     if (!NumUsableSlots)
+        return NULL; // no CAM is able to decrypt this channel
+     }
+
+  bool NeedsDetachReceivers = false;
+  cDevice *d = NULL;
+  cCamSlot *s = NULL;
+
+  uint32_t Impact = 0xFFFFFFFF; // we're looking for a device with the least impact
+  for (int j = 0; j < NumCamSlots || !NumUsableSlots; j++) {
+      if (NumUsableSlots && SlotPriority[j] > MAXPRIORITY)
+         continue; // there is no CAM available in this slot
+      for (int i = 0; i < numDevices; i++) {
+          if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
+             continue; // a specific card was requested, but not this one
+          if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
+             continue; // CAM slot can't be used with this device
+          bool ndr;
+          if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
+             if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
+                ndr = true; // using a different CAM slot requires detaching receivers
+             // Put together an integer number that reflects the "impact" using
+             // this device would have on the overall system. Each condition is represented
+             // by one bit in the number (or several bits, if the condition is actually
+             // a numeric value). The sequence in which the conditions are listed corresponds
+             // to their individual severity, where the one listed first will make the most
+             // difference, because it results in the most significant bit of the result.
+             uint32_t imp = 0;
+             imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
+             imp <<= 1; imp |= !device[i]->Receiving() || ndr;                                                       // use receiving devices if we don't need to detach existing receivers
+             imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
+             imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
+             imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+             imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+             imp <<= 1; imp |= ndr;                                                                                  // avoid devices if we need to detach existing receivers
+             imp <<= 1; imp |= device[i]->IsPrimaryDevice();                                                         // avoid the primary device
+             imp <<= 1; imp |= device[i]->HasDecoder();                                                              // avoid full featured cards
+             imp <<= 1; imp |= NumUsableSlots ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
+             if (imp < Impact) {
+                // This device has less impact than any previous one, so we take it.
+                Impact = imp;
+                d = device[i];
+                NeedsDetachReceivers = ndr;
+                if (NumUsableSlots)
+                   s = CamSlots.Get(j);
+                }
+             }
+          }
+      if (!NumUsableSlots)
+         break; // no CAM necessary, so just one loop over the devices
       }
+  if (d) {
+     if (NeedsDetachReceivers)
+        d->DetachAllReceivers();
+     if (s) {
+        if (s->Device() != d) {
+           if (s->Device())
+              s->Device()->DetachAllReceivers();
+           if (d->CamSlot())
+              d->CamSlot()->Assign(NULL);
+           s->Assign(d);
+           }
+        }
+     else if (d->CamSlot() && !d->CamSlot()->IsDecrypting())
+        d->CamSlot()->Assign(NULL);
+     }
   return d;
 }
 
+void cDevice::SetCamSlot(cCamSlot *CamSlot)
+{
+  camSlot = CamSlot;
+}
+
 void cDevice::Shutdown(void)
 {
   primaryDevice = NULL;
@@ -422,8 +483,8 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
               DelPid(Pid, PidType);
               return false;
               }
-           if (ciHandler)
-              ciHandler->SetPid(Pid, true);
+           if (camSlot)
+              camSlot->SetPid(Pid, true);
            }
         PRINTPIDS("a");
         return true;
@@ -451,8 +512,8 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
            DelPid(Pid, PidType);
            return false;
            }
-        if (ciHandler)
-           ciHandler->SetPid(Pid, true);
+        if (camSlot)
+           camSlot->SetPid(Pid, true);
         }
      }
   return true;
@@ -479,8 +540,8 @@ void cDevice::DelPid(int Pid, ePidType PidType)
            if (pidHandles[n].used == 0) {
               pidHandles[n].handle = -1;
               pidHandles[n].pid = 0;
-              if (ciHandler)
-                 ciHandler->SetPid(Pid, false);
+              if (camSlot)
+                 camSlot->SetPid(Pid, false);
               }
            }
         PRINTPIDS("E");
@@ -557,8 +618,10 @@ bool cDevice::MaySwitchTransponder(void)
 
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
 {
-  if (LiveView)
+  if (LiveView) {
      isyslog("switching to channel %d", Channel->Number());
+     cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
+     }
   for (int i = 3; i--;) {
       switch (SetChannel(Channel, LiveView)) {
         case scrOk:           return true;
@@ -578,12 +641,13 @@ bool cDevice::SwitchChannel(int Direction)
   bool result = false;
   Direction = sgn(Direction);
   if (Direction) {
+     cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
      int n = CurrentChannel() + Direction;
      int first = n;
      cChannel *channel;
      while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
            // try only channels which are currently available
-           if (PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit) || PrimaryDevice()->CanReplay() && GetDevice(channel, 0))
+           if (GetDevice(channel, 0, true))
               break;
            n = channel->Number() + Direction;
            }
@@ -607,14 +671,9 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   if (LiveView)
      StopReplay();
 
-  // If this card is switched to an other transponder, any receivers still
-  // attached to it need to be automatically detached:
-  bool NeedsDetachReceivers = false;
+  cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, 0, LiveView) : this;
 
-  // If this card can't receive this channel, we must not actually switch
-  // the channel here, because that would irritate the driver when we
-  // start replaying in Transfer Mode immediately after switching the channel:
-  bool NeedsTransferMode = (LiveView && IsPrimaryDevice() && !ProvidesChannel(Channel, Setup.PrimaryLimit, &NeedsDetachReceivers));
+  bool NeedsTransferMode = Device != this;
 
   eSetChannelResult Result = scrOk;
 
@@ -622,14 +681,10 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   // use the card that actually can receive it and transfer data from there:
 
   if (NeedsTransferMode) {
-     cDevice *CaDevice = GetDevice(Channel, 0, &NeedsDetachReceivers);
-     if (CaDevice && CanReplay()) {
+     if (Device && CanReplay()) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
-        if (CaDevice->SetChannel(Channel, false) == scrOk) { // calling SetChannel() directly, not SwitchChannel()!
-           if (NeedsDetachReceivers)
-              CaDevice->DetachAllReceivers();
-           cControl::Launch(new cTransferControl(CaDevice, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
-           }
+        if (Device->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
+           cControl::Launch(new cTransferControl(Device, Channel->GetChannelID(), Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
         else
            Result = scrNoTransfer;
         }
@@ -644,27 +699,10 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         sectionHandler->SetStatus(false);
         sectionHandler->SetChannel(NULL);
         }
-     // Tell the ciHandler about the channel switch and add all PIDs of this
+     // Tell the camSlot about the channel switch and add all PIDs of this
      // channel to it, for possible later decryption:
-     if (ciHandler) {
-        ciHandler->SetSource(Channel->Source(), Channel->Transponder());
-// Men at work - please stand clear! ;-)
-#ifdef XXX_DO_MULTIPLE_CA_CHANNELS
-        if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
-#endif
-           ciHandler->AddPid(Channel->Sid(), Channel->Vpid(), 2);
-           for (const int *Apid = Channel->Apids(); *Apid; Apid++)
-               ciHandler->AddPid(Channel->Sid(), *Apid, 4);
-           for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
-               ciHandler->AddPid(Channel->Sid(), *Dpid, 0);
-#ifdef XXX_DO_MULTIPLE_CA_CHANNELS
-           bool CanDecrypt = ciHandler->CanDecrypt(Channel->Sid());//XXX
-           dsyslog("CanDecrypt %d %d %d %s", CardIndex() + 1, CanDecrypt, Channel->Number(), Channel->Name());//XXX
-           }
-#endif
-        }
-     if (NeedsDetachReceivers)
-        DetachAllReceivers();
+     if (camSlot)
+        camSlot->AddChannel(Channel);
      if (SetChannelDevice(Channel, LiveView)) {
         // Start section handling:
         if (sectionHandler) {
@@ -672,8 +710,8 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
            sectionHandler->SetStatus(true);
            }
         // Start decrypting any PIDs that might have been set in SetChannelDevice():
-        if (ciHandler)
-           ciHandler->StartDecrypting();
+        if (camSlot)
+           camSlot->StartDecrypting();
         }
      else
         Result = scrFailed;
@@ -968,9 +1006,10 @@ bool cDevice::AttachPlayer(cPlayer *Player)
 void cDevice::Detach(cPlayer *Player)
 {
   if (Player && player == Player) {
-     player->Activate(false);
-     player->device = NULL;
-     player = NULL;
+     cPlayer *p = player;
+     player = NULL; // avoids recursive calls to Detach()
+     p->Activate(false);
+     p->device = NULL;
      SetPlayMode(pmNone);
      SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
      Audios.ClearAudio();
@@ -1143,16 +1182,6 @@ int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
   return Length;
 }
 
-int cDevice::Ca(void) const
-{
-  int ca = 0;
-  for (int i = 0; i < MAXRECEIVERS; i++) {
-      if (receiver[i] && (ca = receiver[i]->ca) != 0)
-         break; // all receivers have the same ca
-      }
-  return ca;
-}
-
 int cDevice::Priority(void) const
 {
   int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
@@ -1168,16 +1197,6 @@ bool cDevice::Ready(void)
   return true;
 }
 
-int cDevice::ProvidesCa(const cChannel *Channel) const
-{
-  int Ca = Channel->Ca();
-  if (Ca == CardIndex() + 1)
-     return 1; // exactly _this_ card was requested
-  if (Ca && Ca <= CA_DVB_MAX)
-     return 0; // a specific card was requested, but not _this_ one
-  return !Ca; // by default every card can provide FTA
-}
-
 bool cDevice::Receiving(bool CheckAny) const
 {
   for (int i = 0; i < MAXRECEIVERS; i++) {
@@ -1187,6 +1206,10 @@ bool cDevice::Receiving(bool CheckAny) const
   return false;
 }
 
+#define TS_SCRAMBLING_CONTROL  0xC0
+#define TS_SCRAMBLING_TIMEOUT     3 // seconds to wait until a TS becomes unscrambled
+#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked a known to decrypt
+
 void cDevice::Action(void)
 {
   if (Running() && OpenDvr()) {
@@ -1196,11 +1219,39 @@ void cDevice::Action(void)
            if (GetTSPacket(b)) {
               if (b) {
                  int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
+                 // Check whether the TS packets are scrambled:
+                 bool DetachReceivers = false;
+                 bool DescramblingOk = false;
+                 int CamSlotNumber = 0;
+                 if (startScrambleDetection) {
+                    cCamSlot *cs = CamSlot();
+                    CamSlotNumber = cs ? cs->SlotNumber() : 0;
+                    if (CamSlotNumber) {
+                       bool Scrambled = b[3] & TS_SCRAMBLING_CONTROL;
+                       int t = time(NULL) - startScrambleDetection;
+                       if (Scrambled) {
+                          if (t > TS_SCRAMBLING_TIMEOUT)
+                             DetachReceivers = true;
+                          }
+                       else if (t > TS_SCRAMBLING_TIME_OK) {
+                          DescramblingOk = true;
+                          startScrambleDetection = 0;
+                          }
+                       }
+                    }
                  // Distribute the packet to all attached receivers:
                  Lock();
                  for (int i = 0; i < MAXRECEIVERS; i++) {
-                     if (receiver[i] && receiver[i]->WantsPid(Pid))
-                        receiver[i]->Receive(b, TS_SIZE);
+                     if (receiver[i] && receiver[i]->WantsPid(Pid)) {
+                        if (DetachReceivers) {
+                           ChannelCamRelations.SetChecked(receiver[i]->ChannelID(), CamSlotNumber);
+                           Detach(receiver[i]);
+                           }
+                        else
+                           receiver[i]->Receive(b, TS_SIZE);
+                        if (DescramblingOk)
+                           ChannelCamRelations.SetDecrypt(receiver[i]->ChannelID(), CamSlotNumber);
+                        }
                      }
                  Unlock();
                  }
@@ -1256,10 +1307,11 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Receiver->device = this;
          receiver[i] = Receiver;
          Unlock();
-         if (!Running())
-            Start();
-         if (ciHandler)
-            ciHandler->StartDecrypting();
+         if (camSlot) {
+            camSlot->StartDecrypting();
+            startScrambleDetection = time(NULL);
+            }
+         Start();
          return true;
          }
       }
@@ -1286,10 +1338,10 @@ void cDevice::Detach(cReceiver *Receiver)
       else if (receiver[i])
          receiversLeft = true;
       }
-  if (ciHandler)
-     ciHandler->StartDecrypting();
+  if (camSlot)
+     camSlot->StartDecrypting();
   if (!receiversLeft)
-     Cancel(3);
+     Cancel(-1);
 }
 
 void cDevice::DetachAll(int Pid)
@@ -1307,10 +1359,8 @@ void cDevice::DetachAll(int Pid)
 void cDevice::DetachAllReceivers(void)
 {
   cMutexLock MutexLock(&mutexReceiver);
-  for (int i = 0; i < MAXRECEIVERS; i++) {
-      if (receiver[i])
-         Detach(receiver[i]);
-      }
+  for (int i = 0; i < MAXRECEIVERS; i++)
+      Detach(receiver[i]);
 }
 
 // --- cTSBuffer -------------------------------------------------------------
diff --git a/device.h b/device.h
index dced092e9..e41d5ae2a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.79 2006/06/15 09:32:48 kls Exp $
+ * $Id: device.h 1.80 2007/01/03 14:14:29 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -128,12 +128,21 @@ class cDevice : public cThread {
          ///< Gets the device with the given Index.
          ///< \param Index must be in the range 0..numDevices-1.
          ///< \return A pointer to the device, or NULL if the Index was invalid.
-  static cDevice *GetDevice(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+  static cDevice *GetDevice(const cChannel *Channel, int Priority, bool LiveView);
          ///< Returns a device that is able to receive the given Channel at the
          ///< given Priority, with the least impact on active recordings and
-         ///< live viewing.
-         ///< See ProvidesChannel() for more information on how
-         ///< priorities are handled, and the meaning of NeedsDetachReceivers.
+         ///< live viewing. The LiveView parameter tells whether the device will
+         ///< be used for live viewing or a recording.
+         ///< If the Channel is encrypted, a CAM slot that claims to be able to
+         ///< decrypt the channel is automatically selected and assigned to the
+         ///< returned device. Whether or not this combination of device and CAM
+         ///< slot is actually able to decrypt the channel can only be determined
+         ///< by checking the "scrambling control" bits of the received TS packets.
+         ///< The Action() function automatically does this and takes care that
+         ///< after detaching any receivers because the channel can't be decrypted,
+         ///< this device/CAM combination will be skipped in the next call to
+         ///< GetDevice().
+         ///< See also ProvidesChannel().
   static void Shutdown(void);
          ///< Closes down all devices.
          ///< Must be called at the end of the program.
@@ -171,16 +180,6 @@ class cDevice : public cThread {
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
          ///< Returns the number of this device (0 ... numDevices).
-  virtual int ProvidesCa(const cChannel *Channel) const;
-         ///< Checks whether this device provides the conditional access
-         ///< facilities to decrypt the given Channel.
-         ///< Returns 0 if the Channel can't be decrypted, 1 if this is a
-         ///< Free To Air channel or only exactly this device can decrypt it,
-         ///< and > 1 if this device can decrypt the Channel.
-         ///< If the result is greater than 1 and the device has more than one
-         ///< CAM, the value will be increased by the number of CAMs, which
-         ///< allows to select the device with the smallest number of CAMs
-         ///< in order to preserve resources for other recordings.
   virtual bool HasDecoder(void) const;
          ///< Tells whether this device has an MPEG decoder.
 
@@ -199,7 +198,9 @@ class cDevice : public cThread {
   virtual bool ProvidesSource(int Source) const;
          ///< Returns true if this device can provide the given source.
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
-         ///< XXX -> PLUGINS.html!
+         ///< Returns true if this device can provide the transponder of the
+         ///< given Channel (which implies that it can provide the Channel's
+         ///< source).
   virtual bool ProvidesTransponderExclusively(const cChannel *Channel) const;
          ///< Returns true if this is the only device that is able to provide
          ///< the given channel's transponder.
@@ -246,7 +247,7 @@ class cDevice : public cThread {
          ///< channel number while replaying.
   void ForceTransferMode(void);
          ///< Forces the device into transfermode for the current channel.
-  virtual bool HasLock(int TimeoutMs = 0);//XXX PLUGINS.html
+  virtual bool HasLock(int TimeoutMs = 0);
          ///< Returns true if the device has a lock on the requested transponder.
          ///< Default is true, a specific device implementation may return false
          ///< to indicate that it is not ready yet.
@@ -309,10 +310,15 @@ class cDevice : public cThread {
 
 // Common Interface facilities:
 
-protected:
-  cCiHandler *ciHandler;
+private:
+  time_t startScrambleDetection;
+  cCamSlot *camSlot;
 public:
-  cCiHandler *CiHandler(void) { return ciHandler; }
+  void SetCamSlot(cCamSlot *CamSlot);
+         ///< Sets the given CamSlot to be used with this device.
+  cCamSlot *CamSlot(void) const { return camSlot; }
+         ///< Returns the CAM slot that is currently used with this device,
+         ///< or NULL if no CAM slot is in use.
 
 // Image Grab facilities
 
@@ -512,11 +518,12 @@ class cDevice : public cThread {
 private:
   cMutex mutexReceiver;
   cReceiver *receiver[MAXRECEIVERS];
-protected:
+public:
   int Priority(void) const;
       ///< Returns the priority of the current receiving session (0..MAXPRIORITY),
       ///< or -1 if no receiver is currently active. The primary device will
       ///< always return at least Setup.PrimaryLimit-1.
+protected:
   virtual bool OpenDvr(void);
       ///< Opens the DVR of this device and prepares it to deliver a Transport
       ///< Stream for use in a cReceiver.
@@ -530,8 +537,6 @@ class cDevice : public cThread {
       ///< false in case of a non recoverable error, otherwise it returns true,
       ///< even if Data is NULL.
 public:
-  int  Ca(void) const;
-       ///< Returns the ca of the current receiving session(s).
   bool Receiving(bool CheckAny = false) const;
        ///< Returns true if we are currently receiving.
   bool AttachReceiver(cReceiver *Receiver);
diff --git a/dvbci.c b/dvbci.c
new file mode 100644
index 000000000..9d44008cb
--- /dev/null
+++ b/dvbci.c
@@ -0,0 +1,108 @@
+/*
+ * dvbci.h: Common Interface for DVB devices
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbci.c 1.1 2007/01/04 12:49:10 kls Exp $
+ */
+
+#include "dvbci.h"
+#include <linux/dvb/ca.h>
+#include <sys/ioctl.h>
+#include "device.h"
+
+// --- cDvbCiAdapter ---------------------------------------------------------
+
+cDvbCiAdapter::cDvbCiAdapter(cDevice *Device, int Fd)
+{
+  device = Device;
+  SetDescription("CI adapter on device %d", device->DeviceNumber());
+  fd = Fd;
+  ca_caps_t Caps;
+  if (ioctl(fd, CA_GET_CAP, &Caps) == 0) {
+     if ((Caps.slot_type & CA_CI_LINK) != 0) {
+        int NumSlots = Caps.slot_num;
+        if (NumSlots > 0) {
+           for (int i = 0; i < NumSlots; i++)
+               new cCamSlot(this);
+           Start();
+           }
+        else
+           esyslog("ERROR: no CAM slots found on device %d", device->DeviceNumber());
+        }
+     else
+        isyslog("device %d doesn't support CI link layer interface", device->DeviceNumber());
+     }
+  else
+     esyslog("ERROR: can't get CA capabilities on device %d", device->DeviceNumber());
+}
+
+cDvbCiAdapter::~cDvbCiAdapter()
+{
+  Cancel(3);
+}
+
+int cDvbCiAdapter::Read(uint8_t *Buffer, int MaxLength)
+{
+  if (Buffer && MaxLength > 0) {
+     struct pollfd pfd[1];
+     pfd[0].fd = fd;
+     pfd[0].events = POLLIN;
+     if (poll(pfd, 1, CAM_READ_TIMEOUT) > 0 && (pfd[0].revents & POLLIN)) {
+        int n = safe_read(fd, Buffer, MaxLength);
+        if (n >= 0)
+           return n;
+        esyslog("ERROR: can't read from CI adapter on device %d: %m", device->DeviceNumber());
+        }
+     }
+  return 0;
+}
+
+void cDvbCiAdapter::Write(const uint8_t *Buffer, int Length)
+{
+  if (Buffer && Length > 0) {
+     if (safe_write(fd, Buffer, Length) != Length)
+        esyslog("ERROR: can't write to CI adapter on device %d: %m", device->DeviceNumber());
+     }
+}
+
+bool cDvbCiAdapter::Reset(int Slot)
+{
+  if (ioctl(fd, CA_RESET, 1 << Slot) != -1)
+     return true;
+  else
+     esyslog("ERROR: can't reset CAM slot %d on device %d: %m", Slot, device->DeviceNumber());
+  return false;
+}
+
+eModuleStatus cDvbCiAdapter::ModuleStatus(int Slot)
+{
+  ca_slot_info_t sinfo;
+  sinfo.num = Slot;
+  if (ioctl(fd, CA_GET_SLOT_INFO, &sinfo) != -1) {
+     if ((sinfo.flags & CA_CI_MODULE_READY) != 0)
+        return msReady;
+     else if ((sinfo.flags & CA_CI_MODULE_PRESENT) != 0)
+        return msPresent;
+     }
+  else
+     esyslog("ERROR: can't get info of CAM slot %d on device %d: %m", Slot, device->DeviceNumber());
+  return msNone;
+}
+
+bool cDvbCiAdapter::Assign(cDevice *Device, bool Query)
+{
+  // The CI is hardwired to its device, so there's not really much to do here
+  if (Device)
+     return Device == device;
+  return true;
+}
+
+cDvbCiAdapter *cDvbCiAdapter::CreateCiAdapter(cDevice *Device, int Fd)
+{
+  // TODO check whether a CI is actually present?
+  if (Device)
+     return new cDvbCiAdapter(Device, Fd);
+  return NULL;
+}
diff --git a/dvbci.h b/dvbci.h
new file mode 100644
index 000000000..1669c8cc0
--- /dev/null
+++ b/dvbci.h
@@ -0,0 +1,31 @@
+/*
+ * dvbci.h: Common Interface for DVB devices
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: dvbci.h 1.1 2006/11/26 11:19:42 kls Exp $
+ */
+
+#ifndef __DVBCI_H
+#define __DVBCI_H
+
+#include "ci.h"
+
+class cDvbCiAdapter : public cCiAdapter {
+private:
+  cDevice *device;
+  int fd;
+protected:
+  virtual int Read(uint8_t *Buffer, int MaxLength);
+  virtual void Write(const uint8_t *Buffer, int Length);
+  virtual bool Reset(int Slot);
+  virtual eModuleStatus ModuleStatus(int Slot);
+  virtual bool Assign(cDevice *Device, bool Query = false);
+  cDvbCiAdapter(cDevice *Device, int Fd);
+public:
+  virtual ~cDvbCiAdapter();
+  static cDvbCiAdapter *CreateCiAdapter(cDevice *Device, int Fd);
+  };
+
+#endif //__DVBCI_H
diff --git a/dvbdevice.c b/dvbdevice.c
index fb8ec9381..487aec5bd 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.160 2006/08/14 09:38:32 kls Exp $
+ * $Id: dvbdevice.c 1.161 2007/01/05 11:09:51 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -19,6 +19,7 @@
 #include <sys/mman.h>
 #include "channels.h"
 #include "diseqc.h"
+#include "dvbci.h"
 #include "dvbosd.h"
 #include "eitscan.h"
 #include "player.h"
@@ -28,7 +29,6 @@
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
-//#define DO_MULTIPLE_CA_CHANNELS
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -77,7 +77,6 @@ class cDvbTuner : public cThread {
   int lockTimeout;
   time_t lastTimeoutReport;
   fe_type_t frontendType;
-  cCiHandler *ciHandler;
   cChannel channel;
   const char *diseqcCommands;
   eTunerStatus tunerStatus;
@@ -88,19 +87,18 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler);
+  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType, cCiHandler *CiHandler)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
   frontendType = FrontendType;
-  ciHandler = CiHandler;
   tuneTimeout = 0;
   lockTimeout = 0;
   lastTimeoutReport = 0;
@@ -346,8 +344,6 @@ void cDvbTuner::Action(void)
                   }
           }
 
-        if (ciHandler)
-           ciHandler->Process();
         if (tunerStatus != tsTuned)
            newSet.TimedWait(mutex, 1000);
         }
@@ -360,6 +356,7 @@ int cDvbDevice::setTransferModeForDolbyDigital = 1;
 
 cDvbDevice::cDvbDevice(int n)
 {
+  ciAdapter = NULL;
   dvbTuner = NULL;
   frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   spuDecoder = NULL;
@@ -377,6 +374,12 @@ cDvbDevice::cDvbDevice(int n)
   fd_audio    = DvbOpen(DEV_DVB_AUDIO,  n, O_RDWR | O_NONBLOCK);
   fd_stc      = DvbOpen(DEV_DVB_DEMUX,  n, O_RDWR);
 
+  // Common Interface:
+
+  fd_ca       = DvbOpen(DEV_DVB_CA,     n, O_RDWR);
+  if (fd_ca >= 0)
+     ciAdapter = cDvbCiAdapter::CreateCiAdapter(this, fd_ca);
+
   // The DVR device (will be opened and closed as needed):
 
   fd_dvr = -1;
@@ -420,8 +423,7 @@ cDvbDevice::cDvbDevice(int n)
      dvb_frontend_info feinfo;
      if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
         frontendType = feinfo.type;
-        ciHandler = cCiHandler::CreateCiHandler(*cDvbName(DEV_DVB_CA, n));
-        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType, ciHandler);
+        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
         }
      else
         LOG_ERROR;
@@ -436,6 +438,7 @@ cDvbDevice::~cDvbDevice()
 {
   delete spuDecoder;
   delete dvbTuner;
+  delete ciAdapter;
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
 }
@@ -494,32 +497,11 @@ bool cDvbDevice::HasDecoder(void) const
 
 bool cDvbDevice::Ready(void)
 {
-  if (ciHandler) {
-     ciHandler->Process();
-     return ciHandler->Ready();
-     }
+  if (ciAdapter)
+     return ciAdapter->Ready();
   return true;
 }
 
-int cDvbDevice::ProvidesCa(const cChannel *Channel) const
-{
-  int NumCams = 0;
-  if (ciHandler) {
-     NumCams = ciHandler->NumCams();
-     if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
-        unsigned short ids[MAXCAIDS + 1];
-        for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0!
-            ids[i] = Channel->Ca(i);
-        if (ciHandler->ProvidesCa(ids))
-           return NumCams + 1;
-        }
-     }
-  int result = cDevice::ProvidesCa(Channel);
-  if (result > 0)
-     result += NumCams;
-  return result;
-}
-
 cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
 {
   if (!spuDecoder && IsPrimaryDevice())
@@ -770,18 +752,19 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel)) {
+  if (ProvidesSource(Channel->Source())) {
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
            if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
 #ifdef DO_MULTIPLE_RECORDINGS
-#ifndef DO_MULTIPLE_CA_CHANNELS
-              if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN)
-                 needsDetachReceivers = Ca() != Channel->Ca();
-              else
-#endif
-              if (!IsPrimaryDevice())
+              if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                 if (CamSlot()->CanDecrypt(Channel))
+                    result = true;
+                 else
+                    needsDetachReceivers = true;
+                 }
+              else if (!IsPrimaryDevice())
                  result = true;
 #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
               else
@@ -821,6 +804,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                            && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || (pidHandles[ptAudio].pid != Channel->Apid(0) && (Channel->Dpid(0) ? pidHandles[ptAudio].pid != Channel->Dpid(0) : true)))// the PID is already set as DMX_PES_OTHER
                               || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
+  if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
+     StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
 
   bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode && LiveView;
 
@@ -861,7 +846,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+     cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
 
   return true;
 }
@@ -922,13 +907,13 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
      if (IS_AUDIO_TRACK(Type) || (IS_DOLBY_TRACK(Type) && SetAudioBypass(true))) {
         if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
            DetachAll(pidHandles[ptAudio].pid);
-           if (ciHandler)
-              ciHandler->SetPid(pidHandles[ptAudio].pid, false);
+           if (CamSlot())
+              CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
            pidHandles[ptAudio].pid = TrackId->id;
            SetPid(&pidHandles[ptAudio], ptAudio, true);
-           if (ciHandler) {
-              ciHandler->SetPid(pidHandles[ptAudio].pid, true);
-              ciHandler->StartDecrypting();
+           if (CamSlot()) {
+              CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
+              CamSlot()->StartDecrypting();
               }
            }
         }
diff --git a/dvbdevice.h b/dvbdevice.h
index effa5fb90..670421f42 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.41 2006/05/28 15:05:19 kls Exp $
+ * $Id: dvbdevice.h 1.42 2007/01/05 10:39:52 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -36,16 +36,20 @@ class cDvbDevice : public cDevice {
          ///< \return True if any devices are available.
 private:
   fe_type_t frontendType;
-  int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc;
+  int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca;
 protected:
   virtual void MakePrimaryDevice(bool On);
 public:
   cDvbDevice(int n);
   virtual ~cDvbDevice();
   virtual bool Ready(void);
-  virtual int ProvidesCa(const cChannel *Channel) const;
   virtual bool HasDecoder(void) const;
 
+// Common Interface facilities:
+
+private:
+  cCiAdapter *ciAdapter;
+
 // SPU facilities
 
 private:
diff --git a/i18n.c b/i18n.c
index 475264b2e..54d39c496 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.285 2006/10/14 09:26:41 kls Exp $
+ * $Id: i18n.c 1.286 2007/01/07 12:19:15 kls Exp $
  *
  * Translations provided by:
  *
@@ -2598,27 +2598,27 @@ const tI18nPhrase Phrases[] = {
     "Kan ikke �bne CAM menuen!",
     "Menu CAM nen� dostupn�",
   },
-  { "Resetting CAM...",
-    "CAM wird zur�ckgesetzt...",
-    "Resetiram CAM...",
-    "Reimpostazione modulo CAM...",
-    "CAM wordt herstart...",
+  { "CAM is in use - really reset?"
+    "CAM wird benutzt - wirklich zur�cksetzen?",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
     "",//TODO
-    "R�initialisation du CAM",
     "",//TODO
-    "CA-moduuli palautetaan alkutilaan...",
-    "Resetuj� CAM...",
-    "Reiniciando CAM...",
     "",//TODO
-    "�terst�ller CAM ...",
-    "Se reseteaz� CAM...",
-    "A CAM �jra indul...",
     "",//TODO
-    "���������� CAM...",
     "",//TODO
-    "CAM mooduli taask�ivitus...",
-    "Nulstiller CAM...",
-    "Restartuje se CAM...",
   },
   { "Can't reset CAM!",
     "Zur�cksetzen des CAM fehlgeschlagen!",
@@ -2642,27 +2642,93 @@ const tI18nPhrase Phrases[] = {
     "Kan ikke nulstille CAM!",
     "CAM modul nelze restartovat!",
   },
-  { "CAM has been reset",
-    "CAM wurde zur�ckgesetzt",
-    "CAM je resetiran",
-    "Modulo CAM reimpostato",
-    "CAM is herstart",
-    "",//TODO
-    "La CAM a �t� r�initialis�e",
-    "",//TODO
-    "CA-moduuli palautettu alkutilaan",
-    "CAM zosta� zresetowany",
-    "CAM reiniciado",
-    "����� ��������� ��� CAM",
-    "CA modulen har �terst�llts",
-    "CAM-ul a fost resetat",
-    "A CAM vissza lett �ll�tva",
-    "CAM reiniciada",
-    "CAM-������ �����������",
-    "CAM je resetiran",
-    "CAM mooduli taask�ivitus tehtud",
-    "CAM er blevet nulstillet",
-    "CAM byl restartov�n",
+  { "CAM reset",
+    "CAM zur�ckgesetzt",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "CAM present",
+    "CAM vorhanden",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "CAM ready",
+    "CAM bereit",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "CAM not responding!",
+    "CAM antwortet nicht!",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
   },
   { "Please enter %d digits!",
     "Bitte geben Sie %d Ziffern ein!",
@@ -2797,27 +2863,27 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
   },
-  { "CICAM",
-    "CICAM",
-    "CICAM",
-    "Accesso condizionato CICAM",
-    "CICAM",
-    "CICAM",
+  { "CAM",
+    "CAM",
+    "CAM",
+    "Accesso condizionato CAM",
+    "CAM",
+    "CAM",
     "Acc�s conditionnel",
-    "CICAM",
-    "CICAM",
-    "CICAM",
-    "CICAM",
-    "CICAM",
-    "CICAM",
-    "CICAM",
-    "CICAM",
+    "CAM",
+    "CAM",
+    "CAM",
+    "CAM",
+    "CAM",
+    "CAM",
+    "CAM",
+    "CAM",
     "CI Acc�s condicional",
     "�������� ������",
-    "CICAM",
-    "CICAM",
-    "CICAM",
-    "CICAM",
+    "CAM",
+    "CAM",
+    "CAM",
+    "CAM",
   },
   { "Recording",
     "Aufnahme",
@@ -3964,28 +4030,6 @@ const tI18nPhrase Phrases[] = {
     "Anvend DiSEqC",
     "Pou��vat DiSEqC",
   },
-  { "Setup.CICAM$CICAM DVB",
-    "CICAM-DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "Acc�s conditionnel",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "Acc�s condicional CICAM",
-    "CAM-������ DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-    "CICAM DVB",
-  },
   { "Setup.Recording$Margin at start (min)",
     "Vorlauf zum Timer-Beginn (min)",
     "Premik za�etka snemanja (min)",
diff --git a/menu.c b/menu.c
index 10a3b266e..203eee0f2 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.446 2006/12/02 11:12:02 kls Exp $
+ * $Id: menu.c 1.447 2007/01/07 12:19:48 kls Exp $
  */
 
 #include "menu.h"
@@ -38,7 +38,9 @@
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
-#define MAXWAITFORCAMMENU 4 // seconds to wait for the CAM menu to open
+#define MAXWAITFORCAMMENU  10 // seconds to wait for the CAM menu to open
+#define CAMMENURETYTIMEOUT  3 // seconds after which opening the CAM menu is retried
+#define CAMRESPONSETIMEOUT  5 // seconds to wait for a response from a CAM
 #define MINFREEDISK       300 // minimum free disk space (in MB) required to start recording
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
 
@@ -1579,38 +1581,104 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
 // --- cMenuCam --------------------------------------------------------------
 
-cMenuCam::cMenuCam(cCiMenu *CiMenu)
-:cOsdMenu("")
+class cMenuCam : public cOsdMenu {
+private:
+  cCamSlot *camSlot;
+  cCiMenu *ciMenu;
+  cCiEnquiry *ciEnquiry;
+  char *input;
+  int offset;
+  time_t lastCamExchange;
+  void GenerateTitle(const char *s = NULL);
+  void QueryCam(void);
+  void AddMultiLineItem(const char *s);
+  void Set(void);
+  eOSState Select(void);
+public:
+  cMenuCam(cCamSlot *CamSlot);
+  virtual ~cMenuCam();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuCam::cMenuCam(cCamSlot *CamSlot)
+:cOsdMenu("", 1) // tab necessary for enquiry!
 {
-  dsyslog("CAM: Menu ------------------");
-  ciMenu = CiMenu;
-  selected = false;
+  camSlot = CamSlot;
+  ciMenu = NULL;
+  ciEnquiry = NULL;
+  input = NULL;
   offset = 0;
-  if (ciMenu->Selectable())
-     SetHasHotkeys();
-  SetTitle(*ciMenu->TitleText() ? ciMenu->TitleText() : "CAM");
-  dsyslog("CAM: '%s'", ciMenu->TitleText());
-  if (*ciMenu->SubTitleText()) {
-     dsyslog("CAM: '%s'", ciMenu->SubTitleText());
-     AddMultiLineItem(ciMenu->SubTitleText());
-     offset = Count();
-     }
-  for (int i = 0; i < ciMenu->NumEntries(); i++) {
-      Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable()));
-      dsyslog("CAM: '%s'", ciMenu->Entry(i));
-      }
-  if (*ciMenu->BottomText()) {
-     AddMultiLineItem(ciMenu->BottomText());
-     dsyslog("CAM: '%s'", ciMenu->BottomText());
-     }
-  Display();
+  lastCamExchange = time(NULL);
+  SetNeedsFastResponse(true);
+  QueryCam();
 }
 
 cMenuCam::~cMenuCam()
 {
-  if (!selected)
+  if (ciMenu)
      ciMenu->Abort();
   delete ciMenu;
+  if (ciEnquiry)
+     ciEnquiry->Abort();
+  delete ciEnquiry;
+  free(input);
+}
+
+void cMenuCam::GenerateTitle(const char *s)
+{
+  SetTitle(cString::sprintf("CAM %d - %s", camSlot->SlotNumber(), (s && *s) ? s : camSlot->GetCamName()));
+}
+
+void cMenuCam::QueryCam(void)
+{
+  delete ciMenu;
+  ciMenu = NULL;
+  delete ciEnquiry;
+  ciEnquiry = NULL;
+  if (camSlot->HasUserIO()) {
+     ciMenu = camSlot->GetMenu();
+     ciEnquiry = camSlot->GetEnquiry();
+     }
+  Set();
+}
+
+void cMenuCam::Set(void)
+{
+  if (ciMenu) {
+     Clear();
+     free(input);
+     input = NULL;
+     dsyslog("CAM %d: Menu ------------------", camSlot->SlotNumber());
+     offset = 0;
+     SetHasHotkeys(ciMenu->Selectable());
+     GenerateTitle(ciMenu->TitleText());
+     dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->TitleText());
+     if (*ciMenu->SubTitleText()) {
+        dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->SubTitleText());
+        AddMultiLineItem(ciMenu->SubTitleText());
+        offset = Count();
+        }
+     for (int i = 0; i < ciMenu->NumEntries(); i++) {
+         Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable()));
+         dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->Entry(i));
+         }
+     if (*ciMenu->BottomText()) {
+        AddMultiLineItem(ciMenu->BottomText());
+        dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->BottomText());
+        }
+     }
+  else if (ciEnquiry) {
+     Clear();
+     int Length = ciEnquiry->ExpectedLength();
+     free(input);
+     input = MALLOC(char, Length + 1);
+     *input = 0;
+     GenerateTitle();
+     Add(new cOsdItem(ciEnquiry->Text(), osUnknown, false));
+     Add(new cOsdItem("", osUnknown, false));
+     Add(new cMenuEditNumItem("", input, Length, ciEnquiry->Blind()));
+     }
+  Display();
 }
 
 void cMenuCam::AddMultiLineItem(const char *s)
@@ -1628,90 +1696,61 @@ void cMenuCam::AddMultiLineItem(const char *s)
 
 eOSState cMenuCam::Select(void)
 {
-  if (ciMenu->Selectable()) {
-     ciMenu->Select(Current() - offset);
-     dsyslog("CAM: select %d", Current() - offset);
-     }
-  else
-     ciMenu->Cancel();
-  selected = true;
-  return osEnd;
-}
-
-eOSState cMenuCam::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk:     return Select();
-       default: break;
-       }
-     }
-  else if (state == osBack) {
-     ciMenu->Cancel();
-     selected = true;
-     return osEnd;
+  if (ciMenu) {
+     if (ciMenu->Selectable()) {
+        ciMenu->Select(Current() - offset);
+        dsyslog("CAM %d: select %d", camSlot->SlotNumber(), Current() - offset);
+        }
+     else
+        ciMenu->Cancel();
      }
-  if (ciMenu->HasUpdate()) {
-     selected = true;
-     return osEnd;
+  else if (ciEnquiry) {
+     if (ciEnquiry->ExpectedLength() < 0xFF && int(strlen(input)) != ciEnquiry->ExpectedLength()) {
+        char buffer[64];
+        snprintf(buffer, sizeof(buffer), tr("Please enter %d digits!"), ciEnquiry->ExpectedLength());
+        Skins.Message(mtError, buffer);
+        return osContinue;
+        }
+     ciEnquiry->Reply(input);
+     dsyslog("CAM %d: entered '%s'", camSlot->SlotNumber(), ciEnquiry->Blind() ? "****" : input);
      }
-  return state;
-}
-
-// --- cMenuCamEnquiry -------------------------------------------------------
-
-cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
-:cOsdMenu("", 1)
-{
-  ciEnquiry = CiEnquiry;
-  int Length = ciEnquiry->ExpectedLength();
-  input = MALLOC(char, Length + 1);
-  *input = 0;
-  replied = false;
-  SetTitle("CAM");
-  Add(new cOsdItem(ciEnquiry->Text(), osUnknown, false));
-  Add(new cOsdItem("", osUnknown, false));
-  Add(new cMenuEditNumItem("", input, Length, ciEnquiry->Blind()));
-  Display();
-}
-
-cMenuCamEnquiry::~cMenuCamEnquiry()
-{
-  if (!replied)
-     ciEnquiry->Abort();
-  free(input);
-  delete ciEnquiry;
+  QueryCam();
+  return osContinue;
 }
 
-eOSState cMenuCamEnquiry::Reply(void)
+eOSState cMenuCam::ProcessKey(eKeys Key)
 {
-  if (ciEnquiry->ExpectedLength() < 0xFF && int(strlen(input)) != ciEnquiry->ExpectedLength()) {
-     char buffer[64];
-     snprintf(buffer, sizeof(buffer), tr("Please enter %d digits!"), ciEnquiry->ExpectedLength());
-     Skins.Message(mtError, buffer);
-     return osContinue;
-     }
-  ciEnquiry->Reply(input);
-  replied = true;
-  return osEnd;
-}
+  if (!camSlot->HasMMI())
+     return osBack;
 
-eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
-{
   eOSState state = cOsdMenu::ProcessKey(Key);
 
-  if (state == osUnknown) {
-     switch (Key) {
-       case kOk:     return Reply();
-       default: break;
-       }
+  if (ciMenu || ciEnquiry) {
+     lastCamExchange = time(NULL);
+     if (state == osUnknown) {
+        switch (Key) {
+          case kOk: return Select();
+          default: break;
+          }
+        }
+     else if (state == osBack) {
+        if (ciMenu)
+           ciMenu->Cancel();
+        if (ciEnquiry)
+           ciEnquiry->Cancel();
+        QueryCam();
+        return osContinue;
+        }
+     if (ciMenu && ciMenu->HasUpdate()) {
+        QueryCam();
+        return osContinue;
+        }
      }
-  else if (state == osBack) {
-     ciEnquiry->Cancel();
-     replied = true;
-     return osEnd;
+  else if (time(NULL) - lastCamExchange < CAMRESPONSETIMEOUT)
+     QueryCam();
+  else {
+     Skins.Message(mtError, tr("CAM not responding!"));
+     return osBack;
      }
   return state;
 }
@@ -1720,21 +1759,9 @@ eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
 
 cOsdObject *CamControl(void)
 {
-  for (int d = 0; d < cDevice::NumDevices(); d++) {
-      cDevice *Device = cDevice::GetDevice(d);
-      if (Device) {
-         cCiHandler *CiHandler = Device->CiHandler();
-         if (CiHandler && CiHandler->HasUserIO()) {
-            cCiMenu *CiMenu = CiHandler->GetMenu();
-            if (CiMenu)
-               return new cMenuCam(CiMenu);
-            else {
-               cCiEnquiry *CiEnquiry = CiHandler->GetEnquiry();
-               if (CiEnquiry)
-                  return new cMenuCamEnquiry(CiEnquiry);
-               }
-            }
-         }
+  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+      if (CamSlot->HasUserIO())
+         return new cMenuCam(CamSlot);
       }
   return NULL;
 }
@@ -2454,95 +2481,117 @@ eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuSetupCICAM -------------------------------------------------------
+// --- cMenuSetupCAM ---------------------------------------------------------
 
-class cMenuSetupCICAMItem : public cOsdItem {
+class cMenuSetupCAMItem : public cOsdItem {
 private:
-  cCiHandler *ciHandler;
-  int slot;
+  cCamSlot *camSlot;
 public:
-  cMenuSetupCICAMItem(int Device, cCiHandler *CiHandler, int Slot);
-  cCiHandler *CiHandler(void) { return ciHandler; }
-  int Slot(void) { return slot; }
+  cMenuSetupCAMItem(cCamSlot *CamSlot);
+  cCamSlot *CamSlot(void) { return camSlot; }
+  bool Changed(void);
   };
 
-cMenuSetupCICAMItem::cMenuSetupCICAMItem(int Device, cCiHandler *CiHandler, int Slot)
+cMenuSetupCAMItem::cMenuSetupCAMItem(cCamSlot *CamSlot)
+{
+  camSlot = CamSlot;
+  SetText("");
+  Changed();
+}
+
+bool cMenuSetupCAMItem::Changed(void)
 {
-  ciHandler = CiHandler;
-  slot = Slot;
   char buffer[32];
-  const char *CamName = CiHandler->GetCamName(slot);
-  snprintf(buffer, sizeof(buffer), "%s%d %d\t%s", tr("Setup.CICAM$CICAM DVB"), Device + 1, slot + 1, CamName ? CamName : "-");
-  SetText(buffer);
+  const char *CamName = camSlot->GetCamName();
+  if (!CamName) {
+     switch (camSlot->ModuleStatus()) {
+       case msReset:   CamName = tr("CAM reset"); break;
+       case msPresent: CamName = tr("CAM present"); break;
+       case msReady:   CamName = tr("CAM ready"); break;
+       default:        CamName = "-"; break;
+       }
+     }
+  snprintf(buffer, sizeof(buffer), " %d %s", camSlot->SlotNumber(), CamName);
+  if (strcmp(buffer, Text()) != 0) {
+     SetText(buffer);
+     return true;
+     }
+  return false;
 }
 
-class cMenuSetupCICAM : public cMenuSetupBase {
+class cMenuSetupCAM : public cMenuSetupBase {
 private:
   eOSState Menu(void);
   eOSState Reset(void);
 public:
-  cMenuSetupCICAM(void);
+  cMenuSetupCAM(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuSetupCICAM::cMenuSetupCICAM(void)
+cMenuSetupCAM::cMenuSetupCAM(void)
 {
-  SetSection(tr("CICAM"));
-  for (int d = 0; d < cDevice::NumDevices(); d++) {
-      cDevice *Device = cDevice::GetDevice(d);
-      if (Device) {
-         cCiHandler *CiHandler = Device->CiHandler();
-         if (CiHandler) {
-            for (int Slot = 0; Slot < CiHandler->NumSlots(); Slot++)
-                Add(new cMenuSetupCICAMItem(Device->CardIndex(), CiHandler, Slot));
-            }
-         }
-      }
+  SetSection(tr("CAM"));
+  SetCols(15);
+  SetHasHotkeys();
+  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot))
+      Add(new cMenuSetupCAMItem(CamSlot));
   SetHelp(tr("Button$Menu"), tr("Button$Reset"));
 }
 
-eOSState cMenuSetupCICAM::Menu(void)
+eOSState cMenuSetupCAM::Menu(void)
 {
-  cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
+  cMenuSetupCAMItem *item = (cMenuSetupCAMItem *)Get(Current());
   if (item) {
-     if (item->CiHandler()->EnterMenu(item->Slot())) {
-        Skins.Message(mtWarning, tr("Opening CAM menu..."));
-        time_t t = time(NULL);
-        while (time(NULL) - t < MAXWAITFORCAMMENU && !item->CiHandler()->HasUserIO())
-              item->CiHandler()->Process();
-        return osEnd; // the CAM menu will be executed explicitly from the main loop
+     if (item->CamSlot()->EnterMenu()) {
+        Skins.Message(mtStatus, tr("Opening CAM menu..."));
+        time_t t0 = time(NULL);
+        time_t t1 = t0;
+        while (time(NULL) - t0 <= MAXWAITFORCAMMENU) {
+              if (item->CamSlot()->HasUserIO())
+                 break;
+              if (time(NULL) - t1 >= CAMMENURETYTIMEOUT) {
+                 dsyslog("CAM %d: retrying to enter CAM menu...", item->CamSlot()->SlotNumber());
+                 item->CamSlot()->EnterMenu();
+                 t1 = time(NULL);
+                 }
+              cCondWait::SleepMs(100);
+              }
+        Skins.Message(mtStatus, NULL);
+        if (item->CamSlot()->HasUserIO())
+           return AddSubMenu(new cMenuCam(item->CamSlot()));
         }
-     else
-        Skins.Message(mtError, tr("Can't open CAM menu!"));
+     Skins.Message(mtError, tr("Can't open CAM menu!"));
      }
   return osContinue;
 }
 
-eOSState cMenuSetupCICAM::Reset(void)
+eOSState cMenuSetupCAM::Reset(void)
 {
-  cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
+  cMenuSetupCAMItem *item = (cMenuSetupCAMItem *)Get(Current());
   if (item) {
-     Skins.Message(mtWarning, tr("Resetting CAM..."));
-     if (item->CiHandler()->Reset(item->Slot())) {
-        Skins.Message(mtInfo, tr("CAM has been reset"));
-        return osEnd;
+     if (!item->CamSlot()->Device() || Interface->Confirm(tr("CAM is in use - really reset?"))) {
+        if (!item->CamSlot()->Reset())
+           Skins.Message(mtError, tr("Can't reset CAM!"));
         }
-     else
-        Skins.Message(mtError, tr("Can't reset CAM!"));
      }
   return osContinue;
 }
 
-eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
+eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
 {
-  eOSState state = cMenuSetupBase::ProcessKey(Key);
+  eOSState state = HasSubMenu() ? cMenuSetupBase::ProcessKey(Key) : cOsdMenu::ProcessKey(Key);
 
-  if (state == osUnknown) {
+  if (!HasSubMenu()) {
      switch (Key) {
+       case kOk:
        case kRed:    return Menu();
-       case kGreen:  return Reset();
+       case kGreen:  state = Reset(); break;
        default: break;
        }
+     for (cMenuSetupCAMItem *ci = (cMenuSetupCAMItem *)First(); ci; ci = (cMenuSetupCAMItem *)ci->Next()) {
+         if (ci->Changed())
+            DisplayItem(ci);
+         }
      }
   return state;
 }
@@ -2710,7 +2759,7 @@ void cMenuSetup::Set(void)
   Add(new cOsdItem(hk(tr("EPG")),           osUser2));
   Add(new cOsdItem(hk(tr("DVB")),           osUser3));
   Add(new cOsdItem(hk(tr("LNB")),           osUser4));
-  Add(new cOsdItem(hk(tr("CICAM")),         osUser5));
+  Add(new cOsdItem(hk(tr("CAM")),           osUser5));
   Add(new cOsdItem(hk(tr("Recording")),     osUser6));
   Add(new cOsdItem(hk(tr("Replay")),        osUser7));
   Add(new cOsdItem(hk(tr("Miscellaneous")), osUser8));
@@ -2740,7 +2789,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
     case osUser2: return AddSubMenu(new cMenuSetupEPG);
     case osUser3: return AddSubMenu(new cMenuSetupDVB);
     case osUser4: return AddSubMenu(new cMenuSetupLNB);
-    case osUser5: return AddSubMenu(new cMenuSetupCICAM);
+    case osUser5: return AddSubMenu(new cMenuSetupCAM);
     case osUser6: return AddSubMenu(new cMenuSetupRecord);
     case osUser7: return AddSubMenu(new cMenuSetupReplay);
     case osUser8: return AddSubMenu(new cMenuSetupMisc);
@@ -3126,7 +3175,7 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction
   if (Direction) {
      while (Channel) {
            Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
-           if (Channel && !Channel->GroupSep() && (cDevice::PrimaryDevice()->ProvidesChannel(Channel, Setup.PrimaryLimit) || cDevice::GetDevice(Channel, 0)))
+           if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true))
               return Channel;
            }
      }
@@ -3541,7 +3590,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   isyslog("record %s", fileName);
   if (MakeDirs(fileName, true)) {
      const cChannel *ch = timer->Channel();
-     recorder = new cRecorder(fileName, ch->Ca(), timer->Priority(), ch->Vpid(), ch->Apids(), ch->Dpids(), ch->Spids());
+     recorder = new cRecorder(fileName, ch->GetChannelID(), timer->Priority(), ch->Vpid(), ch->Apids(), ch->Dpids(), ch->Spids());
      if (device->AttachReceiver(recorder)) {
         Recording.WriteInfo();
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
@@ -3610,7 +3659,7 @@ void cRecordControl::Stop(void)
 
 bool cRecordControl::Process(time_t t)
 {
-  if (!recorder || !timer || !timer->Matches(t))
+  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t))
      return false;
   AssertFreeDiskSpace(timer->Priority());
   return true;
@@ -3645,15 +3694,9 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
   cChannel *channel = Channels.GetByNumber(ch);
 
   if (channel) {
-     bool NeedsDetachReceivers = false;
      int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority;
-     cDevice *device = cDevice::GetDevice(channel, Priority, &NeedsDetachReceivers);
+     cDevice *device = cDevice::GetDevice(channel, Priority, false);
      if (device) {
-        if (NeedsDetachReceivers) {
-           Stop(device);
-           if (device == cTransferControl::ReceiverDevice())
-              cControl::Shutdown(); // in case this device was used for Transfer Mode
-           }
         dsyslog("switching device %d to channel %d", device->DeviceNumber() + 1, channel->Number());
         if (!device->SwitchChannel(channel, false)) {
            cThread::EmergencyExit(true);
@@ -3698,19 +3741,6 @@ void cRecordControls::Stop(const char *InstantId)
       }
 }
 
-void cRecordControls::Stop(cDevice *Device)
-{
-  ChangeState();
-  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
-      if (RecordControls[i]) {
-         if (RecordControls[i]->Device() == Device) {
-            isyslog("stopping recording on DVB device %d due to higher priority", Device->CardIndex() + 1);
-            RecordControls[i]->Stop();
-            }
-         }
-      }
-}
-
 bool cRecordControls::PauseLiveVideo(void)
 {
   Skins.Message(mtStatus, tr("Pausing live video..."));
@@ -3882,7 +3912,8 @@ void cReplayControl::Hide(void)
   if (visible) {
      delete displayReplay;
      displayReplay = NULL;
-     needsFastResponse = visible = false;
+     SetNeedsFastResponse(false);
+     visible = false;
      modeOnly = false;
      lastPlay = lastForward = false;
      lastSpeed = -2; // an invalid value
@@ -3923,7 +3954,8 @@ bool cReplayControl::ShowProgress(bool Initial)
      if (!visible) {
         displayReplay = Skins.Current()->DisplayReplay(modeOnly);
         displayReplay->SetMarks(&marks);
-        needsFastResponse = visible = true;
+        SetNeedsFastResponse(true);
+        visible = true;
         }
      if (Initial) {
         if (title)
diff --git a/menu.h b/menu.h
index 7376b719c..9851ae12c 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.86 2006/10/20 13:09:57 kls Exp $
+ * $Id: menu.h 1.87 2007/01/05 10:40:54 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -128,31 +128,6 @@ class cDisplayTracks : public cOsdObject {
   eOSState ProcessKey(eKeys Key);
   };
 
-class cMenuCam : public cOsdMenu {
-private:
-  cCiMenu *ciMenu;
-  bool selected;
-  int offset;
-  void AddMultiLineItem(const char *s);
-  eOSState Select(void);
-public:
-  cMenuCam(cCiMenu *CiMenu);
-  virtual ~cMenuCam();
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-class cMenuCamEnquiry : public cOsdMenu {
-private:
-  cCiEnquiry *ciEnquiry;
-  char *input;
-  bool replied;
-  eOSState Reply(void);
-public:
-  cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
-  virtual ~cMenuCamEnquiry();
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
 cOsdObject *CamControl(void);
 
 class cMenuRecordingItem;
@@ -206,7 +181,6 @@ class cRecordControls {
 public:
   static bool Start(cTimer *Timer = NULL, bool Pause = false);
   static void Stop(const char *InstantId);
-  static void Stop(cDevice *Device);
   static bool PauseLiveVideo(void);
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
diff --git a/osdbase.c b/osdbase.c
index 65b66cb81..5a43321d6 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.29 2006/02/05 14:37:03 kls Exp $
+ * $Id: osdbase.c 1.30 2007/01/05 10:41:16 kls Exp $
  */
 
 #include "osdbase.h"
@@ -127,9 +127,9 @@ void cOsdMenu::SetCols(int c0, int c1, int c2, int c3, int c4)
   cols[4] = c4;
 }
 
-void cOsdMenu::SetHasHotkeys(void)
+void cOsdMenu::SetHasHotkeys(bool HasHotkeys)
 {
-  hasHotkeys = true;
+  hasHotkeys = HasHotkeys;
   digit = 0;
 }
 
@@ -256,6 +256,20 @@ void cOsdMenu::DisplayCurrent(bool Current)
      }
 }
 
+void cOsdMenu::DisplayItem(cOsdItem *Item)
+{
+  if (Item) {
+     int Index = Item->Index();
+     int Offset = Index - first;
+     if (Offset >= 0 && Offset < first + displayMenuItems) {
+        bool Current = Index == current;
+        displayMenu->SetItem(Item->Text(), Offset, Current && Item->Selectable(), Item->Selectable());
+        if (Current && Item->Selectable())
+           cStatus::MsgOsdCurrentItem(Item->Text());
+        }
+     }
+}
+
 void cOsdMenu::Clear(void)
 {
   if (marked >= 0)
@@ -432,6 +446,8 @@ eOSState cOsdMenu::HotKey(eKeys Key)
       if (s && (s = skipspace(s)) != NULL) {
          if (*s == Key - k1 + '1') {
             current = item->Index();
+            RefreshCurrent();
+            Display();
             cRemote::Put(kOk, true);
             break;
             }
@@ -499,4 +515,3 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
     }
   return osContinue;
 }
-
diff --git a/osdbase.h b/osdbase.h
index 0ca284bad..fac1a57a0 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.14 2006/01/06 11:55:30 kls Exp $
+ * $Id: osdbase.h 1.15 2007/01/05 10:41:32 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -70,12 +70,13 @@ class cOsdObject {
   friend class cOsdMenu;
 private:
   bool isMenu;
-protected:
   bool needsFastResponse;
+protected:
+  void SetNeedsFastResponse(bool NeedsFastResponse) { needsFastResponse = NeedsFastResponse; }
 public:
   cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
   virtual ~cOsdObject() {}
-  bool NeedsFastResponse(void) { return needsFastResponse; }
+  virtual bool NeedsFastResponse(void) { return needsFastResponse; }
   bool IsMenu(void) { return isMenu; }
   virtual void Show(void);
   virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
@@ -98,12 +99,13 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
   const char *hk(const char *s);
   void SetCols(int c0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
-  void SetHasHotkeys(void);
+  void SetHasHotkeys(bool HasHotkeys = true);
   virtual void Clear(void);
   bool SelectableItem(int idx);
   void SetCurrent(cOsdItem *Item);
   void RefreshCurrent(void);
   void DisplayCurrent(bool Current);
+  void DisplayItem(cOsdItem *Item);
   void CursorUp(void);
   void CursorDown(void);
   void PageUp(void);
@@ -120,6 +122,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 public:
   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
+  virtual bool NeedsFastResponse(void) { return subMenu ? subMenu->NeedsFastResponse() : cOsdObject::NeedsFastResponse(); }
   int Current(void) { return current; }
   void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
diff --git a/pat.c b/pat.c
index f898c70d7..559111de2 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.16 2006/03/31 12:39:34 kls Exp $
+ * $Id: pat.c 1.17 2007/01/05 10:41:55 kls Exp $
  */
 
 #include "pat.h"
@@ -78,7 +78,7 @@ class cCaDescriptors : public cListObject {
   bool Is(cCaDescriptors * CaDescriptors);
   bool Empty(void) { return caDescriptors.Count() == 0; }
   void AddCaDescriptor(SI::CaDescriptor *d, bool Stream);
-  int GetCaDescriptors(const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+  int GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
   const int *CaIds(void) { return caIds; }
   };
 
@@ -148,7 +148,7 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
 #endif
 }
 
-int cCaDescriptors::GetCaDescriptors(const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
 {
   if (!CaSystemIds || !*CaSystemIds)
      return 0;
@@ -156,7 +156,7 @@ int cCaDescriptors::GetCaDescriptors(const unsigned short *CaSystemIds, int BufS
      int length = 0;
      int IsStream = -1;
      for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
-         const unsigned short *caids = CaSystemIds;
+         const int *caids = CaSystemIds;
          do {
             if (d->CaSystem() == *caids) {
                if (length + d->Length() <= BufSize) {
@@ -187,7 +187,7 @@ class cCaDescriptorHandler : public cList<cCaDescriptors> {
       // Returns 0 if this is an already known descriptor,
       // 1 if it is an all new descriptor with actual contents,
       // and 2 if an existing descriptor was changed.
-  int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+  int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
   };
 
 int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
@@ -208,7 +208,7 @@ int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
   return CaDescriptors->Empty() ? 0 : 1;
 }
 
-int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
 {
   cMutexLock MutexLock(&mutex);
   StreamFlag = false;
@@ -221,7 +221,7 @@ int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int Serv
 
 cCaDescriptorHandler CaDescriptorHandler;
 
-int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
 {
   return CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, BufSize, Data, StreamFlag);
 }
diff --git a/pat.h b/pat.h
index 88b2115b3..a8053ae9c 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 1.6 2006/03/29 15:18:38 kls Exp $
+ * $Id: pat.h 1.7 2007/01/05 10:42:11 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -32,7 +32,7 @@ class cPatFilter : public cFilter {
   void Trigger(void);
   };
 
-int GetCaDescriptors(int Source, int Transponder, int ServiceId, const unsigned short *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
          ///< Gets all CA descriptors for a given channel.
          ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
          ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
diff --git a/receiver.c b/receiver.c
index ddaafefd2..20be19ab5 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.5 2006/03/26 14:07:21 kls Exp $
+ * $Id: receiver.c 1.6 2007/01/05 10:42:29 kls Exp $
  */
 
 #include "receiver.h"
@@ -12,10 +12,10 @@
 #include <stdio.h>
 #include "tools.h"
 
-cReceiver::cReceiver(int Ca, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
+cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
 {
   device = NULL;
-  ca = Ca;
+  channelID = ChannelID;
   priority = Priority;
   numPids = 0;
   if (Pid)
diff --git a/receiver.h b/receiver.h
index e12349973..e223274ad 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 1.4 2006/05/27 09:04:22 kls Exp $
+ * $Id: receiver.h 1.5 2007/01/05 11:00:36 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -18,7 +18,7 @@ class cReceiver {
   friend class cDevice;
 private:
   cDevice *device;
-  int ca;
+  tChannelID channelID;
   int priority;
   int pids[MAXRECEIVEPIDS];
   int numPids;
@@ -38,8 +38,8 @@ class cReceiver {
                ///< will be delivered only ONCE, so the cReceiver must make sure that
                ///< it will be able to buffer the data if necessary.
 public:
-  cReceiver(int Ca, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
-               ///< Creates a new receiver that requires conditional access Ca and has
+  cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
+               ///< Creates a new receiver for the channel with the given ChannelID with
                ///< the given Priority. Pid is a single PID (typically the video PID), while
                ///< Pids1...Pids3 are pointers to zero terminated lists of PIDs.
                ///< If any of these PIDs are 0, they will be silently ignored.
@@ -47,7 +47,18 @@ class cReceiver {
                ///< Priority may be any value in the range -99..99. Negative values indicate
                ///< that this cReceiver may be detached at any time (without blocking the
                ///< cDevice it is attached to).
+               ///< The ChannelID is necessary to allow the device that will be used for this
+               ///< receiver to detect and store whether the channel can be decrypted in case
+               ///< this is an encrypted channel. If the channel is not encrypted or this
+               ///< detection is not wanted, an invalid tChannelID may be given.
   virtual ~cReceiver();
+  tChannelID ChannelID(void) { return channelID; }
+  bool IsAttached(void) { return device != NULL; }
+               ///< Returns true if this receiver is (still) attached to a device.
+               ///< A receiver may be automatically detached from its device in
+               ///< case the device is needed otherwise, so code that uses a cReceiver
+               ///< should repeatedly check whether it is still attached, and if
+               ///< it isn't, delete it (or take any other appropriate measures).
   };
 
 #endif //__RECEIVER_H
diff --git a/recorder.c b/recorder.c
index 8bb16212c..2542bca9c 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.17 2006/01/08 11:01:25 kls Exp $
+ * $Id: recorder.c 1.18 2007/01/05 10:43:09 kls Exp $
  */
 
 #include "recorder.h"
@@ -21,6 +21,8 @@
 #define MINFREEDISKSPACE    (512) // MB
 #define DISKCHECKINTERVAL   100 // seconds
 
+// --- cFileWriter -----------------------------------------------------------
+
 class cFileWriter : public cThread {
 private:
   cRemux *remux;
@@ -121,8 +123,10 @@ void cFileWriter::Action(void)
         }
 }
 
-cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
-:cReceiver(Ca, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
+// --- cRecorder -------------------------------------------------------------
+
+cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
+:cReceiver(ChannelID, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
 ,cThread("recording")
 {
   // Make sure the disk is up and running:
diff --git a/recorder.h b/recorder.h
index c4aebbf35..920d90954 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 1.4 2005/08/13 11:31:18 kls Exp $
+ * $Id: recorder.h 1.5 2007/01/05 10:44:05 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -28,9 +28,9 @@ class cRecorder : public cReceiver, cThread {
   virtual void Receive(uchar *Data, int Length);
   virtual void Action(void);
 public:
-  cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids);
-               // Creates a new recorder that requires conditional access Ca, has
-               // the given Priority and will record the given PIDs into the file FileName.
+  cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids);
+               // Creates a new recorder for the channel with the given ChannelID and
+               // the given Priority that will record the given PIDs into the file FileName.
   virtual ~cRecorder();
   };
 
diff --git a/thread.c b/thread.c
index 2e145e50e..d2debefd3 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.58 2006/09/24 12:54:47 kls Exp $
+ * $Id: thread.c 1.59 2007/01/05 10:44:22 kls Exp $
  */
 
 #include "thread.h"
@@ -249,17 +249,29 @@ void *cThread::StartThread(cThread *Thread)
   return NULL;
 }
 
+#define THREAD_STOP_TIMEOUT  3000 // ms to wait for a thread to stop before newly starting it
+#define THREAD_STOP_SLEEP      30 // ms to sleep while waiting for a thread to stop
+
 bool cThread::Start(void)
 {
-  if (!active) {
-     active = running = true;
-     if (pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this) == 0) {
-        pthread_detach(childTid); // auto-reap
+  if (!running) {
+     if (active) {
+        // Wait until the previous incarnation of this thread has completely ended
+        // before starting it newly:
+        cTimeMs RestartTimeout;
+        while (!running && active && RestartTimeout.Elapsed() < THREAD_STOP_TIMEOUT)
+              cCondWait::SleepMs(THREAD_STOP_SLEEP);
         }
-     else {
-        LOG_ERROR;
-        active = running = false;
-        return false;
+     if (!active) {
+        active = running = true;
+        if (pthread_create(&childTid, NULL, (void *(*) (void *))&StartThread, (void *)this) == 0) {
+           pthread_detach(childTid); // auto-reap
+           }
+        else {
+           LOG_ERROR;
+           active = running = false;
+           return false;
+           }
         }
      }
   return true;
diff --git a/thread.h b/thread.h
index 6211e2c1d..be21c19fb 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.37 2006/09/24 10:10:37 kls Exp $
+ * $Id: thread.h 1.38 2007/01/05 10:44:38 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -115,6 +115,7 @@ class cThread {
   void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
   bool Start(void);
        ///< Actually starts the thread.
+       ///< If the thread is already running, nothing happens.
   bool Active(void);
        ///< Checks whether the thread is still alive.
   static bool EmergencyExit(bool Request = false);
diff --git a/tools.c b/tools.c
index 255c80617..db79f9580 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.121 2006/12/02 11:12:59 kls Exp $
+ * $Id: tools.c 1.122 2007/01/05 10:44:57 kls Exp $
  */
 
 #include "tools.h"
@@ -542,9 +542,9 @@ time_t LastModifiedTime(const char *FileName)
 
 // --- cTimeMs ---------------------------------------------------------------
 
-cTimeMs::cTimeMs(void)
+cTimeMs::cTimeMs(int Ms)
 {
-  Set();
+  Set(Ms);
 }
 
 uint64_t cTimeMs::Now(void)
diff --git a/tools.h b/tools.h
index 1f71ec4b4..6f0737547 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.96 2006/12/03 17:38:38 kls Exp $
+ * $Id: tools.h 1.97 2007/01/05 10:45:11 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 
 typedef unsigned char uchar;
-#define uint64 uint64_t // for compatibility - TODO remove in version 1.5
 
 extern int SysLogLevel;
 
@@ -162,7 +161,8 @@ class cTimeMs {
 private:
   uint64_t begin;
 public:
-  cTimeMs(void);
+  cTimeMs(int Ms = 0);
+      ///< Creates a timer with ms resolution and an initial timeout of Ms.
   static uint64_t Now(void);
   void Set(int Ms = 0);
   bool TimedOut(void);
diff --git a/transfer.c b/transfer.c
index afaccd15e..79efab5eb 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.33 2006/01/29 17:24:39 kls Exp $
+ * $Id: transfer.c 1.34 2007/01/05 10:45:28 kls Exp $
  */
 
 #include "transfer.h"
@@ -14,8 +14,8 @@
 
 // --- cTransfer -------------------------------------------------------------
 
-cTransfer::cTransfer(int VPid, const int *APids, const int *DPids, const int *SPids)
-:cReceiver(0, -1, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
+cTransfer::cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids)
+:cReceiver(ChannelID, -1, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
 ,cThread("transfer")
 {
   ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
@@ -34,17 +34,18 @@ void cTransfer::Activate(bool On)
 {
   if (On)
      Start();
-  else
+  else {
      Cancel(3);
+     cPlayer::Detach();
+     }
 }
 
 void cTransfer::Receive(uchar *Data, int Length)
 {
-  if (IsAttached() && Running()) {
+  if (cPlayer::IsAttached() && Running()) {
      int p = ringBuffer->Put(Data, Length);
      if (p != Length && Running())
         ringBuffer->ReportOverflow(Length - p);
-     return;
      }
 }
 
@@ -110,8 +111,8 @@ void cTransfer::Action(void)
 
 cDevice *cTransferControl::receiverDevice = NULL;
 
-cTransferControl::cTransferControl(cDevice *ReceiverDevice, int VPid, const int *APids, const int *DPids, const int *SPids)
-:cControl(transfer = new cTransfer(VPid, APids, DPids, SPids), true)
+cTransferControl::cTransferControl(cDevice *ReceiverDevice, tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids)
+:cControl(transfer = new cTransfer(ChannelID, VPid, APids, DPids, SPids), true)
 {
   ReceiverDevice->AttachReceiver(transfer);
   receiverDevice = ReceiverDevice;
diff --git a/transfer.h b/transfer.h
index 7210ac077..c891808bb 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.11 2006/01/29 17:24:43 kls Exp $
+ * $Id: transfer.h 1.12 2007/01/05 10:45:45 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -25,7 +25,7 @@ class cTransfer : public cReceiver, public cPlayer, public cThread {
   virtual void Receive(uchar *Data, int Length);
   virtual void Action(void);
 public:
-  cTransfer(int VPid, const int *APids, const int *DPids, const int *SPids);
+  cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids);
   virtual ~cTransfer();
   };
 
@@ -34,7 +34,7 @@ class cTransferControl : public cControl {
   cTransfer *transfer;
   static cDevice *receiverDevice;
 public:
-  cTransferControl(cDevice *ReceiverDevice, int VPid, const int *APids, const int *DPids, const int *SPids);
+  cTransferControl(cDevice *ReceiverDevice, tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids);
   ~cTransferControl();
   virtual void Hide(void) {}
   static cDevice *ReceiverDevice(void) { return receiverDevice; }
diff --git a/vdr.c b/vdr.c
index a628cd015..ae845f54b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.282 2006/12/02 16:22:12 kls Exp $
+ * $Id: vdr.c 1.283 2007/01/05 10:46:14 kls Exp $
  */
 
 #include <getopt.h>
@@ -68,8 +68,6 @@
 #define SHUTDOWNWAIT      300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART       600 // seconds the next timer must be in the future to assume manual start
 #define CHANNELSAVEDELTA  600 // seconds before saving channels.conf after automatic modifications
-#define LASTCAMMENUTIMEOUT  3 // seconds to run the main loop 'fast' after a CAM menu has been closed
-                              // in order to react on a possible new CAM menu as soon as possible
 #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
 #define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
 #define SHUTDOWNRETRY     300 // seconds before trying again to shut down
@@ -501,7 +499,6 @@ int main(int argc, char *argv[])
   int PreviousChannelIndex = 0;
   time_t LastChannelChanged = time(NULL);
   time_t LastActivity = 0;
-  time_t LastCamMenu = 0;
   int MaxLatencyTime = 0;
   bool ForceShutdown = false;
   bool UserShutdown = false;
@@ -851,19 +848,14 @@ int main(int argc, char *argv[])
            DeletedRecordings.Update();
            }
         // CAM control:
-        if (!Menu && !cOsd::IsOpen()) {
+        if (!Menu && !cOsd::IsOpen())
            Menu = CamControl();
-           if (Menu)
-              LastCamMenu = 0;
-           else if (!LastCamMenu)
-              LastCamMenu = time(NULL);
-           }
         // Queued messages:
         if (!Skins.IsOpen())
            Skins.ProcessQueuedMessages();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
-        eKeys key = Interface->GetKey((!Interact || !Interact->NeedsFastResponse()) && time(NULL) - LastCamMenu > LASTCAMMENUTIMEOUT);
+        eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
         if (NORMALKEY(key) != kNone) {
            EITScanner.Activity();
            LastActivity = time(NULL);
@@ -1052,9 +1044,6 @@ int main(int argc, char *argv[])
               else if (time(NULL) - LastActivity > MENUTIMEOUT)
                  state = osEnd;
               }
-           // TODO make the CAM menu stay open in case of automatic updates and have it return osContinue; then the following two lines can be removed again
-           else if (state == osEnd && LastActivity > 1)
-              LastActivity = time(NULL);
            switch (state) {
              case osPause:  DELETE_MENU;
                             cControl::Shutdown(); // just in case

From 9f42c33ef6793482a5c2515f9a87c13c0d189c60 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 Feb 2007 18:00:00 +0100
Subject: [PATCH 167/307] =?UTF-8?q?Version=201.5.1=20-=20Added=20cDevice::?=
 =?UTF-8?q?HasCi()=20so=20that=20devices=20with=20Common=20Interface=20can?=
 =?UTF-8?q?=20be=20avoided=20=20=20when=20tuning=20to=20an=20FTA=20channel?=
 =?UTF-8?q?,=20thus=20preserving=20the=20CAM=20resources=20even=20on=20bud?=
 =?UTF-8?q?get=20=20=20DVB=20cards=20(suggested=20by=20Petri=20Helin).=20-?=
 =?UTF-8?q?=20Fixed=20i18n=20characters=20for=20the=20Hungarian=20texts=20?=
 =?UTF-8?q?(thanks=20to=20Thomas=20G=C3=BCnther).=20-=20Now=20using=20cPip?=
 =?UTF-8?q?e=20instead=20of=20popen()=20in=20cCommand::Execute()=20to=20av?=
 =?UTF-8?q?oid=20problems=20=20=20with=20open=20file=20handles=20when=20st?=
 =?UTF-8?q?arting=20background=20commands=20(thanks=20to=20Reinhard=20=20?=
 =?UTF-8?q?=20Nissl).=20-=20Removed=20'assert(0)'=20from=20cDvbSpuDecoder:?=
 =?UTF-8?q?:setTime()=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-?=
 =?UTF-8?q?=20Fixed=20a=20possible=20crash=20when=20loading=20an=20invalid?=
 =?UTF-8?q?=20XPM=20file=20(thanks=20to=20Martin=20Wache).=20-=20Updated?=
 =?UTF-8?q?=20satellite=20names=20in=20'sources.conf'=20(thanks=20to=20Thi?=
 =?UTF-8?q?lo=20Wunderlich).=20-=20Adapted=20'libsi'=20to=20DVB-S2=20(than?=
 =?UTF-8?q?ks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fixed=20handling?=
 =?UTF-8?q?=20error=20status=20in=20cDvbTuner::GetFrontendStatus()=20(than?=
 =?UTF-8?q?ks=20to=20=20=20Reinhard=20Nissl).=20-=20Shutdown=20handling=20?=
 =?UTF-8?q?has=20been=20rewritten=20(thanks=20to=20Udo=20Richter).=20-=20P?=
 =?UTF-8?q?lugins=20can=20now=20implement=20the=20new=20function=20WakeupT?=
 =?UTF-8?q?ime()=20to=20request=20VDR=20to=20wake=20=20=20up=20at=20a=20pa?=
 =?UTF-8?q?rticular=20time=20(thanks=20to=20Udo=20Richter).=20-=20The=20HU?=
 =?UTF-8?q?P=20signal=20now=20forces=20a=20restart=20of=20VDR=20(thanks=20?=
 =?UTF-8?q?to=20Udo=20Richter).=20-=20cThread::EmergencyExit()=20has=20bee?=
 =?UTF-8?q?n=20replaced=20by=20ShutdownHandler.RequestEmergencyExit().=20-?=
 =?UTF-8?q?=20Several=20references=20to=20"button"=20in=20a=20remote=20con?=
 =?UTF-8?q?trol=20context=20have=20been=20changed=20=20=20to=20"key"=20(ba?=
 =?UTF-8?q?sed=20on=20a=20report=20from=20Marko=20M=C3=A4kel=C3=A4=20regar?=
 =?UTF-8?q?ding=20the=20"Menu=20button=20closes"=20=20=20text).=20The=20"M?=
 =?UTF-8?q?enuButtonCloses"=20parameter=20in=20'setup.conf'=20has=20theref?=
 =?UTF-8?q?ore=20been=20=20=20renamed=20to=20"MenuKeyCloses",=20accordingl?=
 =?UTF-8?q?y.=20This=20will=20result=20in=20an=20"unknown=20config=20=20?=
 =?UTF-8?q?=20parameter:=20MenuButtonCloses"=20error=20message=20in=20the?=
 =?UTF-8?q?=20log=20file,=20so=20you=20may=20want=20to=20=20=20remove=20th?=
 =?UTF-8?q?at=20entry=20from=20your=20'setup.conf'=20file.=20-=20Simplifie?=
 =?UTF-8?q?d=20the=20error=20handling=20in=20cDvbTuner::GetFrontendStatus(?=
 =?UTF-8?q?)=20(based=20on=20a=20=20=20discussion=20with=20Reinhard=20Niss?=
 =?UTF-8?q?l).=20-=20Updated=20the=20Finnish=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Rolf=20Ahrenberg).=20-=20Increased=20the=20maximum=20number?=
 =?UTF-8?q?=20of=20DVB=20devices=20to=208=20(thanks=20to=20Rolf=20Ahrenber?=
 =?UTF-8?q?g).=20-=20The=20new=20Setup=20parameter=20"Channel=20entry=20ti?=
 =?UTF-8?q?meout"=20can=20be=20used=20to=20customize=20the=20time=20=20=20?=
 =?UTF-8?q?since=20the=20last=20keypress=20until=20a=20numerically=20enter?=
 =?UTF-8?q?ed=20channel=20number=20is=20considered=20=20=20complete,=20and?=
 =?UTF-8?q?=20the=20channel=20is=20switched=20(suggested=20by=20Helmut=20A?=
 =?UTF-8?q?uer).=20Setting=20this=20=20=20parameter=20to=200=20turns=20off?=
 =?UTF-8?q?=20the=20automatic=20channel=20switching,=20and=20the=20user=20?=
 =?UTF-8?q?will=20=20=20have=20to=20confirm=20the=20entry=20by=20pressing?=
 =?UTF-8?q?=20the=20"Ok"=20key.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS       |  21 +++-
 HISTORY            |  53 ++++++++++
 INSTALL            |  51 ++++-----
 MANUAL             |  87 +++++++++-------
 Makefile           |   4 +-
 PLUGINS.html       |  49 ++++++++-
 config.c           |  20 ++--
 config.h           |  14 +--
 device.c           |   8 +-
 device.h           |   4 +-
 dvbdevice.c        |  20 ++--
 dvbdevice.h        |   9 +-
 dvbspu.c           |   7 +-
 i18n.c             | 240 +++++++++++++++++++++++++++++++++++--------
 keys.h             |   3 +-
 libsi/descriptor.c |  61 ++++++++++-
 libsi/descriptor.h |  33 +++++-
 libsi/headers.h    | 209 +++++++++++++++++++++++++++++++++++--
 libsi/si.c         |  21 +++-
 libsi/si.h         |  17 ++-
 menu.c             |  18 ++--
 newplugin          |   9 +-
 osd.c              |  22 ++--
 plugin.c           |  27 ++++-
 plugin.h           |   4 +-
 recorder.c         |   5 +-
 remote.c           |   4 +-
 remote.h           |   5 +-
 remux.c            |   8 +-
 shutdown.c         | 250 +++++++++++++++++++++++++++++++++++++++++++++
 shutdown.h         | 112 ++++++++++++++++++++
 sources.conf       |  26 ++---
 thread.c           |  27 ++---
 thread.h           |   8 +-
 vdr.1              |  10 +-
 vdr.c              | 223 ++++++++++++++++++----------------------
 36 files changed, 1348 insertions(+), 341 deletions(-)
 create mode 100644 shutdown.c
 create mode 100644 shutdown.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 79c6e18bb..d1c492f2e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -360,6 +360,7 @@ Norbert Schmidt <nschmidt-nrw@t-online.de>
 Thilo Wunderlich <wunderlich@speedway.org>
  for his help in keeping 'channels.conf' up to date
  for reporting a problem with accessing the epg.data file before it is fully written
+ for updating satellite names in 'sources.conf'
 
 Stephan Schreiber <stephan@sschreiber.de>
  for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
@@ -583,6 +584,7 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to reduce the logging for the SVDRP GRAB command
  for reporting that the shutdown script is given a reboot time in the past if there
  is a recording going on or about to start, and the user insists in shutting down now
+ for suggesting to make the channel entry timeout configurable
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1008,13 +1010,14 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  cPluginManager::Active() in menu.c to "restart anyway?"
  for adding --remove-destination to the 'cp' command for binaries in the Makefiles of
  the plugins
+ for increasing the maximum number of DVB devices to 8
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
  for reporting a bug in handling a channels.conf that contains a ":@nnn" line as
  its last entry
 
-Hermann Gausterer <mrq1@gmx.net>
+Hermann Gausterer <vdr@mrq1.org>
  for suggesting to switch to the recording channel in case the current channel
  becomes unavailable
 
@@ -1114,6 +1117,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for changing the behaviour when hitting the end of a recording in fast forward mode
  for suggesting to give the cRemote::CallPlugin() function a boolean return value
  for fixing a possible crash in remux.c on 64-bit machines
+ for making cCommand::Execute() use cPipe instead of popen() to avoid problems
+ with open file handles when starting background commands
+ for fixing handling error status in cDvbTuner::GetFrontendStatus()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1387,6 +1393,8 @@ Marco Schl
  replay has been stopped
  for reporting a problem with displaying the replay mode symbol in case of "Multi
  speed mode"
+ for removing 'assert(0)' from cDvbSpuDecoder::setTime()
+ for adapting 'libsi' to DVB-S2
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1479,6 +1487,10 @@ Udo Richter <udo_richter@gmx.de>
  for some hints on how to improve handling cPluginManager::Active()
  for fixing a possible segfault if VDR gets terminated while a message is displayed
  for reporting an error in the INSTALL section on retrying shutdown later
+ for rewriting shutdown handling
+ for implementing cPlugin::WakeupTime() to allow plugins to request VDR to wake
+ up at a particular time
+ for making the HUP signal force a restart of VDR
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1692,6 +1704,7 @@ Henrik Niehaus <henrik.niehaus@gmx.de>
 Martin Wache <M.Wache@gmx.net>
  for adding a sleep in cDvbPlayer::Action() in case there is no data to send to the
  device, which avoids a busy loop on very fast machines
+ for fixing a possible crash when loading an invalid XPM file
 
 Matthias Lenk <matthias.lenk@amd.com>
  for reporting an out-of-bounds memory access with audio language ids
@@ -1720,6 +1733,7 @@ Thomas G
  for reporting a bug in the initial setting of the time transponder setup parameter
  for suggesting to extend the version number reported with the '-V' option to also
  show the current APIVERSION
+ for fixing i18n characters for the Hungarian texts
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -1744,6 +1758,7 @@ Marko M
  for suggesting to ignore k_Repeat when deciding whether the same key has been
  pressed in string input fields
  for fixing missing ',' in the Italian and Polish OSD texts
+ for pointing out that "Menu button closes" should actually be "Menu key closes"
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
@@ -2050,3 +2065,7 @@ J
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires uncluding stdint.h in font.h on some systems
+
+Petri Helin <phelin@googlemail.com>
+ for suggesting to avoid budget DVB cards with Common Interface when tuning to an
+ FTA channel
diff --git a/HISTORY b/HISTORY
index 4649a2236..bcc61aadc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5081,3 +5081,56 @@ Video Disk Recorder Revision History
   without valid CA ids VDR can't decide which CAM slot to use. However, since VDR now
   automatically determines which CAM can decrypt which channel, setting fixed
   channel/device relations should no longer be necessary.
+  IF AN ENCRYPTED CHANNEL CAN'T BE DECRYPTED AND YOU HAVE A CA VALUE IN THE RANGE
+  0...F FOR THAT CHANNEL, SET IT TO 0 (FTA) AND TUNE TO THE CHANNEL AGAIN.
+
+2007-01-28: Version 1.4.5-1
+
+- Fixed i18n characters for the Hungarian texts (thanks to Thomas G�nther).
+- Now using cPipe instead of popen() in cCommand::Execute() to avoid problems
+  with open file handles when starting background commands (thanks to Reinhard
+  Nissl).
+
+2007-02-24: Version 1.4.5-2
+
+- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schl��ler).
+- Fixed a possible crash when loading an invalid XPM file (thanks to Martin Wache).
+- Updated satellite names in 'sources.conf' (thanks to Thilo Wunderlich).
+- Fixed handling error status in cDvbTuner::GetFrontendStatus() (thanks to
+  Reinhard Nissl).
+
+2007-02-25: Version 1.5.1
+
+- Added cDevice::HasCi() so that devices with Common Interface can be avoided
+  when tuning to an FTA channel, thus preserving the CAM resources even on budget
+  DVB cards (suggested by Petri Helin).
+- Fixed i18n characters for the Hungarian texts (thanks to Thomas G�nther).
+- Now using cPipe instead of popen() in cCommand::Execute() to avoid problems
+  with open file handles when starting background commands (thanks to Reinhard
+  Nissl).
+- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schl��ler).
+- Fixed a possible crash when loading an invalid XPM file (thanks to Martin Wache).
+- Updated satellite names in 'sources.conf' (thanks to Thilo Wunderlich).
+- Adapted 'libsi' to DVB-S2 (thanks to Marco Schl��ler).
+- Fixed handling error status in cDvbTuner::GetFrontendStatus() (thanks to
+  Reinhard Nissl).
+- Shutdown handling has been rewritten (thanks to Udo Richter).
+- Plugins can now implement the new function WakeupTime() to request VDR to wake
+  up at a particular time (thanks to Udo Richter).
+- The HUP signal now forces a restart of VDR (thanks to Udo Richter).
+- cThread::EmergencyExit() has been replaced by ShutdownHandler.RequestEmergencyExit().
+- Several references to "button" in a remote control context have been changed
+  to "key" (based on a report from Marko M�kel� regarding the "Menu button closes"
+  text). The "MenuButtonCloses" parameter in 'setup.conf' has therefore been
+  renamed to "MenuKeyCloses", accordingly. This will result in an "unknown config
+  parameter: MenuButtonCloses" error message in the log file, so you may want to
+  remove that entry from your 'setup.conf' file.
+- Simplified the error handling in cDvbTuner::GetFrontendStatus() (based on a
+  discussion with Reinhard Nissl).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Increased the maximum number of DVB devices to 8 (thanks to Rolf Ahrenberg).
+- The new Setup parameter "Channel entry timeout" can be used to customize the time
+  since the last keypress until a numerically entered channel number is considered
+  complete, and the channel is switched (suggested by Helmut Auer). Setting this
+  parameter to 0 turns off the automatic channel switching, and the user will
+  have to confirm the entry by pressing the "Ok" key.
diff --git a/INSTALL b/INSTALL
index 21dfcfadf..7f50c44d5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -160,30 +160,33 @@ and the next timer event is at least MinEventTimeout minutes in the future
 (see the Setup parameters in MANUAL).
 
 The command given in the '-s' option will be called with five parameters.
-The first one is the time (in UTC) of the next timer event (as a time_t
-type number), and the second one is the number of seconds from the current
-time until the next timer event. Your program can choose which one to use
-for programming some sort of hardware device that makes sure the computer
-will be restarted in time before the next timer event. Your program must
-also initiate the actual shutdown procedure of the computer. After this
-your program should return to VDR. VDR will not automatically exit after
-calling the shutdown program, but will rather continue normally until it
-receives a SIGTERM when the computer is actually shut down. So in case
-the shutdown fails, or the shutdown program for some reason decides not to
-perform a shutdown, VDR will stay up and running and will call the shutdown
-program again after another five minutes.
-
-If there are currently no timers active, both parameters will be '0'.
-In that case the program shall not set the hardware for automatic restart
-and only perform the system shutdown. A program that uses the second parameter
-to set the hardware for restart must therefore also check whether the first
-parameter is '0'.
-
-The third parameter contains the number of the channel that will be recorded
-by the next timer (or 0 if no timer is present), and the fourth parameter
-contains the file name of the recording as defined in the timer (or an empty
-string if no timer is present). These can be used by the shutdown program to
-show that information on some display interface etc.
+
+The first one is the time (in UTC) of the next timer event or plugin wakeup
+time (as a time_t type number), and the second one is the number of
+seconds from the current time until the next timer event. Your program can
+choose which one to use for programming some sort of hardware device that
+makes sure the computer will be restarted in time before the next timer
+event. Your program must also initiate the actual shutdown procedure of the
+computer. VDR will not automatically exit after calling the shutdown
+program, but will rather continue normally until it receives a SIGTERM when
+the computer is actually shut down. So in case the shutdown fails, or the
+shutdown program for some reason decides not to perform a shutdown, VDR
+will stay up and running and will call the shutdown program again after a
+while. The command will be started in a separate background session, so it
+can continue to run even after VDR has terminated.
+
+If there are currently no timers active and there is no plugin wakeup
+time, both parameters will be '0'. In that case the program shall not set
+the hardware for automatic restart and only perform the system shutdown.
+A program that uses the second parameter to set the hardware for restart
+must therefore also check whether the first parameter is '0'.
+
+If the wakeup time is given by a timer, the third parameter will be the
+number of the channel that will be recorded, otherwise it will be 0. The
+fourth parameter contains the file name of the recording as defined in the
+timer, the name of the plugin that requested the wakeup time, or an empty
+string if no wakeup time is present. These can be used by the shutdown
+program to show that information on some display interface etc.
 
 The fifth parameter indicates the reason why the shutdown was requested.
 '0' means this is an automatic shutdown due to some timeout, while '1' means
diff --git a/MANUAL b/MANUAL
index 3377fb0dd..4f4db682f 100644
--- a/MANUAL
+++ b/MANUAL
@@ -112,7 +112,7 @@ Version 1.4
   "Ok" here opens the "Edit timer" menu.
 
   Textual options, like channel names or recording file names, can be edited
-  by pressing the "Right" button (which puts brackets around the current
+  by pressing the "Right" key (which puts brackets around the current
   character as in "[R]TL"), selecting the desired character position with
   "Left" and "Right", and changing the character with the "Up" and "Down"
   keys. "Ok" then confirms the changes. The "Red" key toggles between
@@ -120,7 +120,7 @@ Version 1.4
   insert and overwrite mode. The "Yellow" key deletes the current character
   (or the one to the right of the cursor in insert mode).
 
-  The "Red", "Green", "Yellow" and "Blue" buttons have special meanings
+  The "Red", "Green", "Yellow" and "Blue" keys have special meanings
   in various menus and are listed at the bottom of the on-screen-display.
 
   At any point in the menu system, pressing the "Menu" key again will
@@ -137,22 +137,22 @@ Version 1.4
   displays detailed information about the selected programme. Pressing "Ok"
   again (or pressing "Back") gets you back into the "Schedule" menu.
 
-  From the "Schedule" menu, the "Green" button opens the "What's on now?"
+  From the "Schedule" menu, the "Green" key opens the "What's on now?"
   menu, which displays all programmes that are currently running on all
   channels that broadcast their programme information on the current
   transponder, or from channels that have been current lately (VDR stores
   all information it gathers in an internal list). The more channels you
   have been switching through lately, the longer this list will be.
-  The "Yellow" button opens the "What's on next?" menu, which lists all
+  The "Yellow" key opens the "What's on next?" menu, which lists all
   programmes that will start next on all channels.
 
-  Inside the "What's on now/next?" menus the "Green" button toggles between
-  the "Now" and "Next" display, and the "Yellow" button takes you to the
+  Inside the "What's on now/next?" menus the "Green" key toggles between
+  the "Now" and "Next" display, and the "Yellow" key takes you to the
   "Schedule" menu of the current channel in the list.
 
-  The "Red" button allows you to instantly program a timer to record the
-  selected programme. After pressing this button, the current event will
-  be marked with 'T', and the function of the "Red" button will change from
+  The "Red" key allows you to instantly program a timer to record the
+  selected programme. After pressing this key, the current event will
+  be marked with 'T', and the function of the "Red" key will change from
   "Record" to "Timer". Pressing "Red" on an event marked with 'T' will open
   the "Edit timer" menu for this timer, where you can make any modifications
   you may want to apply. Note that the Start and Stop time are offset by the
@@ -167,7 +167,7 @@ Version 1.4
   directly into the "Edit timer" menu in order to allow the user to make further
   changes to timer parameters before the actual recording starts.
 
-  The "Blue" button can be pressed to switch to the channel with the selected
+  The "Blue" key can be pressed to switch to the channel with the selected
   programme.
 
   The following markers in these menus give additional information about the
@@ -192,14 +192,14 @@ Version 1.4
 
   1. With no On Screen Menu displayed press the "Up" or "Down" key to switch
      to the next higher or lower channel.
-  2. Press the "Menu" button to bring up the On Screen Menu, select "Channels"
+  2. Press the "Menu" key to bring up the On Screen Menu, select "Channels"
      and browse through the list with the "Up" and "Down" key; to switch to the
      selected channel press "Ok".
   3. Directly type in the channel number with the numeric keys ('0'..'9');
      if no key is pressed for about one second, the digits collected so
      far will define the channel number.
   4. From the "Now", "Next" and "Event" menus (accessible through the "Schedule"
-     menu) by pressing the "Blue" button.
+     menu) by pressing the "Blue" key.
 
   Pressing the '0' key in normal viewing mode toggles between the current and
   the previous channel. A channel is considered "previous" if it has been
@@ -210,15 +210,15 @@ Version 1.4
   'current/next' information will be displayed below this line. This display
   automatically goes away after about five seconds, or if any key is pressed.
   To bring up the channel display without switching channels you can press
-  the "Ok" button.
+  the "Ok" key.
 
 * Selecting audio tracks
 
   If the current channel or recording provides different audio tracks (for
-  different languages or Dolby Digital), the "Green" button in the "VDR" menu can
+  different languages or Dolby Digital), the "Green" key in the "VDR" menu can
   be pressed to bring up the "Audio" menu. Within this menu, the "Up" and "Down"
   keys can be used to switch between the audio tracks. If your remote control has
-  a dedicated "Audio" button, the first press of that button brings up the "Audio"
+  a dedicated "Audio" key, the first press of that key brings up the "Audio"
   menu, and every further press switches to the next available audio track.
 
   The "Left" and "Right" keys can be used to switch between "mono left", "stereo"
@@ -242,7 +242,7 @@ Version 1.4
   If the 'channels.conf' file contains "group separators" you can switch
   through these groups by pressing the "Left" and "Right" key while no
   menu is being displayed. The channel display will show the name of the
-  group, and if you press the "Ok" button while the group name is being
+  group, and if you press the "Ok" key while the group name is being
   displayed, you will switch to the first channel of that group.
 
   Channel groups can be whatever you decide them to be. You can either
@@ -251,11 +251,11 @@ Version 1.4
 
 * Instant Recording
 
-  You can start recording the current channel by pressing the "Red" button
+  You can start recording the current channel by pressing the "Red" key
   in the "VDR" menu. This will create a timer event named "@channelname" that
   starts at the current time and by default records for 3 hours.
   If you want to modify the recording time you need to edit the timer.
-  Stop instant recording by pressing the "Menu" button and selecting
+  Stop instant recording by pressing the "Menu" key and selecting
   "Stop Recording", or by disabling the timer. The default priority, lifetime
   and recording time can be defined in the "Setup/Recording" menu.
 
@@ -267,7 +267,7 @@ Version 1.4
   "Record") and immediately begin replaying that recording. Replay will be
   put into "pause" mode, so you can attend to whatever it was that disturbed
   your live viewing session. Once you're back, simply press the "Up" or "Play"
-  button and you'll be watching the current channel in time shift mode, right
+  key and you'll be watching the current channel in time shift mode, right
   from the point where you left off. The instant recording VDR has started
   will use the parameters for "Pause priority" and "Pause lifetime" as defined
   in the "Setup/Recording" menu. Recording time will be the same as for
@@ -277,12 +277,12 @@ Version 1.4
 * Replaying a Recording
 
   All recordings are listed in the "Recordings" menu. Browse through the
-  list with the "Up" and "Down" button and press "Ok" (or the "Red" button)
+  list with the "Up" and "Down" key and press "Ok" (or the "Red" key)
   to start playback. New recordings are marked with an '*'.
   If the Setup parameter RecordingDirs has been set and there are recordings
   from repeating timers organized in a subdirectory structure, only the
   directory is displayed and it can be opened by pressing "Ok" (or the "Red"
-  button). A directory entry displays the total number of recordings within
+  key). A directory entry displays the total number of recordings within
   that directory (and any possible subdirectory thereof) as well as the total
   number of new recordings (as opposed to a recording's entry, which displays
   the date and time of the recording).
@@ -295,15 +295,15 @@ Version 1.4
   the order in which they were broadcast.
 
   Playback can be stopped via the "VDR" menu by selecting "Stop replaying",
-  or by pressing the "Blue" button outside the menu.
+  or by pressing the "Blue" key outside the menu.
   A previously stopped playback session can be resumed by pressing the "Blue"
-  button in the "VDR" menu.
+  key in the "VDR" menu.
 
 * Processing Recordings
 
   The configuration file 'reccmds.conf' can be used to define system commands
   that can be applied to the recording that is currently highlighted in the
-  "Recordings" menu. The "Red" button in the "Recordings" menu opens the "Recording
+  "Recordings" menu. The "Red" key in the "Recordings" menu opens the "Recording
   commands" menu if there are commands defined in the file 'reccmds.conf'. Pressing
   one of the keys '1'..'9' in the "Recordings" menu executes the corresponding
   command from 'reccmds.conf' (see also "Executing system commands" below).
@@ -322,20 +322,20 @@ Version 1.4
     Right   Runs playback forward or backward at a higher speed; press
             again to resume normal speed. If in Pause mode, runs forward or
             backward at a slower speed; press again to return to pause mode.
-            Pressing and holding down the button performs the function until
-            the button is released again.
+            Pressing and holding down the key performs the function until
+            the key is released again.
             If "Multi Speed Mode" has been enabled in the "Setup" menu, the
-            function of these buttons changes in a way that gives you three
+            function of these keys changes in a way that gives you three
             fast and slow speeds, through which you can switch by pressing
-            the respective button several times.
+            the respective key several times.
   - Red     Jump to a specific location. Enter the time you want to jump to
             and then press "Left" or "Right" to jump relative to the current
             position, "Up" to jump to an absolute position, and "Down" to
             jump and pause at an absolute position.
   - Green
     Yellow  Skips about 60 seconds back or forward.
-            Pressing and holding down the button performs the function until
-            the button is released again.
+            Pressing and holding down the key performs the function until
+            the key is released again.
   - Ok      Brings up the replay progress display, which shows the date,
             time and title of the recording, a progress bar and the
             current and total time of the recording.
@@ -469,7 +469,7 @@ Version 1.4
   First day: The date of the first day when this timer shall start recording
              (only available for repeating timers).
 
-  A timer can also be programmed by pressing the "Red" button on the "Schedule",
+  A timer can also be programmed by pressing the "Red" key on the "Schedule",
   "Now", "Next" or "Event" menus.
 
 * Parameters in the "Setup" menu
@@ -513,7 +513,7 @@ Version 1.4
   Info on channel switch = yes
                          Turns the display of the current/next information on
                          or off when switching the channel. The information is
-                         always displayed when pressing the "Ok" button in
+                         always displayed when pressing the "Ok" key in
                          normal viewing mode.
 
   Timeout requested channel info = yes
@@ -535,10 +535,10 @@ Version 1.4
                                (first) line of the list directly to the first (last)
                                one.
 
-  Menu button closes = no
-                         If set to "yes", pressing the "Menu" button while there is
+  Menu key closes = no
+                         If set to "yes", pressing the "Menu" key while there is
                          anything displayed on the OSD will close the OSD. If set
-                         to "no", the "Menu" button will open the main menu after
+                         to "no", the "Menu" key will open the main menu after
                          closing a temporary display, like, for instance, the channel
                          display.
 
@@ -607,7 +607,7 @@ Version 1.4
                          different languages, the preferred languages are checked
                          in the given order to decide which one to take.
 
-  Scan                   The "Red" button in the "Setup/EPG" menu can be used to
+  Scan                   The "Red" key in the "Setup/EPG" menu can be used to
                          force an EPG scan on a single DVB card system. If pressed,
                          and the primary DVB device is currently not recording or
                          replaying, it will loop through the transponders once and
@@ -711,7 +711,7 @@ Version 1.4
                          yes = use it (and create subdirectories)
 
   Use VPS = 0            Defines whether a timer that is created from an EPG entry
-                         (by pressing the "Record" (red) button in the "Schedules"
+                         (by pressing the "Record" (red) key in the "Schedules"
                          or "What's on now/next?" menu) will automatically use VPS
                          if the event it is created for has a VPS time.
 
@@ -723,7 +723,7 @@ Version 1.4
 
   Mark instant recording = yes
                          Defines whether an "instant recording" (started by
-                         pressing the "Red" button in the "VDR" menu) will be
+                         pressing the "Red" key in the "VDR" menu) will be
                          marked with a '@' character to make it distinguishable
                          from timer recordings in the "Recordings" menu.
 
@@ -786,9 +786,18 @@ Version 1.4
                          connection after which the connection is automatically
                          closed. Default is 300, a value of 0 means no timeout.
 
-  Zap Timeout = 3        The time (in seconds) until a channel counts as "previous"
+  Zap timeout = 3        The time (in seconds) until a channel counts as "previous"
                          for switching with '0'
 
+  Channel entry timeout = 1000
+                         The time (in milliseconds) after the last keypress until
+                         a numerically entered channel number is considered
+                         complete, and the channel is switched. Default is 1000,
+                         a value of 0 turns this off, so a numerically entered
+                         channel number then needs to be confirmed with the "Ok"
+                         key. Note that the total maximum is also limited by
+                         the "OSD/Channel info time" parameter.
+
   Initial channel = 0    The number of the channel that shall be tuned to when
                          VDR starts. Default is 0, which means that it will
                          tune to the channel that was on before VDR was stopped.
diff --git a/Makefile b/Makefile
index cfa735451..c20c7f2c9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.96 2006/11/11 13:55:32 kls Exp $
+# $Id: Makefile 1.97 2007/02/24 13:23:12 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -35,7 +35,7 @@ SILIB    = $(LSIDIR)/libsi.a
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o dvbosd.o\
        dvbplayer.o dvbspu.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
-       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o\
+       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
        skinclassic.o skins.o skinsttng.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 71c1b77e5..640345380 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.5.0</b></center>
+<center><b>Version 1.5.1</b></center>
 <p>
 <center>
 Copyright &copy; 2006 Klaus Schmidinger<br>
@@ -14,9 +14,12 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.0 are marked like this.
 <!--X1.5.0--></td></tr></table>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.1 are marked like this.
+<!--X1.5.1--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -55,6 +58,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Housekeeping">Housekeeping</a>
 <li><a href="#Main thread hook">Main thread hook</a>
 <li><a href="#Activity">Activity</a>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Wakeup">Wakeup</a>
+<!--X1.5.1--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
@@ -76,7 +82,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Conditional Access">Conditional Access</a>
 <!--X1.5.0--></td></tr></table>
 </ul>
@@ -675,6 +681,41 @@ <h1>Table Of Contents</h1>
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
 
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Wakeup"><hr><h2>Wakeup</h2>
+
+<center><i><b>Wake me up before you go-go</b></i></center><p>
+
+If a plugin wants to schedule activity for a later time, or wants to perform
+periodic activity at a certain time at night, and if VDR shall wake up from
+shutdown at that time, the plugin can implement the function
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+virtual time_t WakeupTime(void);
+</pre></td></tr></table><p>
+
+which shall return the time of the next custom wakeup time, or 0 if no wakeup
+is planned. VDR will pass the most recent wakeup time of all plugins, or the next
+timer time, whichever comes first, to the shutdown script. The following sample
+will wake up VDR every night at 1:00:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+time_t MyPlugin::WakeupTime(void)
+{
+  time_t Now = time(NULL);
+  time_t Time = cTimer::SetTime(Now, cTimer::TimeToInt(100));
+  if (Time &lt;= Now)
+     Time = cTimer::IncDay(Time, 1);
+  return Time;
+}
+</pre></td></tr></table><p>
+
+After wakeup, the plugin shall continue to return the wakeup time and shall
+return a string when <tt>Active()</tt> is called at that time, otherwise VDR may shut down
+again instantly. If <tt>WakeupTime()</tt> returns a time that is not in
+the future, the time will be ignored.
+<!--X1.5.1--></td></tr></table>
+
 <a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
 <center><i><b>Remember me...</b></i></center><p>
@@ -2046,7 +2087,7 @@ <h1>Table Of Contents</h1>
 
 The other parameters have the same meaning as in the first version of this function.
 
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="Conditional Access"><hr><h2>Conditional Access</h2>
 
 <center><i><b>Members only!</b></i></center><p>
diff --git a/config.c b/config.c
index f39426688..801fa06a1 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.146 2006/07/22 11:57:51 kls Exp $
+ * $Id: config.c 1.150 2007/02/25 13:58:45 kls Exp $
  */
 
 #include "config.h"
@@ -67,8 +67,8 @@ const char *cCommand::Execute(const char *Parameters)
      asprintf(&cmdbuf, "%s %s", command, Parameters);
   const char *cmd = cmdbuf ? cmdbuf : command;
   dsyslog("executing command '%s'", cmd);
-  FILE *p = popen(cmd, "r");
-  if (p) {
+  cPipe p;
+  if (p.Open(cmd, "r")) {
      int l = 0;
      int c;
      while ((c = fgetc(p)) != EOF) {
@@ -78,7 +78,7 @@ const char *cCommand::Execute(const char *Parameters)
            }
      if (result)
         result[l] = 0;
-     pclose(p);
+     p.Close();
      }
   else
      esyslog("ERROR: can't open pipe for command '%s'", cmd);
@@ -222,7 +222,7 @@ cSetup::cSetup(void)
   TimeoutRequChInfo = 1;
   MenuScrollPage = 1;
   MenuScrollWrap = 0;
-  MenuButtonCloses = 0;
+  MenuKeyCloses = 0;
   MarkInstantRecord = 1;
   strcpy(NameInstantRecord, "TITLE EPISODE");
   InstantRecordTime = 180;
@@ -242,6 +242,7 @@ cSetup::cSetup(void)
   EPGLinger = 0;
   SVDRPTimeout = 300;
   ZapTimeout = 3;
+  ChannelEntryTimeout = 1000;
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 99;
@@ -267,6 +268,7 @@ cSetup::cSetup(void)
   SplitEditedFiles = 0;
   MinEventTimeout = 30;
   MinUserInactivity = 300;
+  NextWakeupTime = 0;
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
   ResumeID = 0;
@@ -383,7 +385,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "TimeoutRequChInfo"))   TimeoutRequChInfo  = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
   else if (!strcasecmp(Name, "MenuScrollWrap"))      MenuScrollWrap     = atoi(Value);
-  else if (!strcasecmp(Name, "MenuButtonCloses"))    MenuButtonCloses   = atoi(Value);
+  else if (!strcasecmp(Name, "MenuKeyCloses"))       MenuKeyCloses      = atoi(Value);
   else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
   else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
   else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
@@ -403,6 +405,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
+  else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
   else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
@@ -428,6 +431,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
   else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
   else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
+  else if (!strcasecmp(Name, "NextWakeupTime"))      NextWakeupTime     = atoi(Value);
   else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
   else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
@@ -451,7 +455,7 @@ bool cSetup::Save(void)
   Store("TimeoutRequChInfo",  TimeoutRequChInfo);
   Store("MenuScrollPage",     MenuScrollPage);
   Store("MenuScrollWrap",     MenuScrollWrap);
-  Store("MenuButtonCloses",   MenuButtonCloses);
+  Store("MenuKeyCloses",      MenuKeyCloses);
   Store("MarkInstantRecord",  MarkInstantRecord);
   Store("NameInstantRecord",  NameInstantRecord);
   Store("InstantRecordTime",  InstantRecordTime);
@@ -471,6 +475,7 @@ bool cSetup::Save(void)
   Store("EPGLinger",          EPGLinger);
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("ZapTimeout",         ZapTimeout);
+  Store("ChannelEntryTimeout",ChannelEntryTimeout);
   Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
@@ -496,6 +501,7 @@ bool cSetup::Save(void)
   Store("SplitEditedFiles",   SplitEditedFiles);
   Store("MinEventTimeout",    MinEventTimeout);
   Store("MinUserInactivity",  MinUserInactivity);
+  Store("NextWakeupTime",     NextWakeupTime);
   Store("MultiSpeedMode",     MultiSpeedMode);
   Store("ShowReplayMode",     ShowReplayMode);
   Store("ResumeID",           ResumeID);
diff --git a/config.h b/config.h
index e795ad774..67ae7a8de 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.283 2007/01/07 14:09:31 kls Exp $
+ * $Id: config.h 1.287 2007/02/25 13:58:59 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,13 +21,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.0"
-#define VDRVERSNUM   10500  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.1"
+#define VDRVERSNUM   10501  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.0"
-#define APIVERSNUM   10500  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.1"
+#define APIVERSNUM   10501  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -206,7 +206,7 @@ class cSetup : public cConfig<cSetupLine> {
   int TimeoutRequChInfo;
   int MenuScrollPage;
   int MenuScrollWrap;
-  int MenuButtonCloses;
+  int MenuKeyCloses;
   int MarkInstantRecord;
   char NameInstantRecord[MaxFileName];
   int InstantRecordTime;
@@ -225,6 +225,7 @@ class cSetup : public cConfig<cSetupLine> {
   int EPGLinger;
   int SVDRPTimeout;
   int ZapTimeout;
+  int ChannelEntryTimeout;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
@@ -244,6 +245,7 @@ class cSetup : public cConfig<cSetupLine> {
   int MaxVideoFileSize;
   int SplitEditedFiles;
   int MinEventTimeout, MinUserInactivity;
+  time_t NextWakeupTime;
   int MultiSpeedMode;
   int ShowReplayMode;
   int ResumeID;
diff --git a/device.c b/device.c
index e26af004e..dc9af5938 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.138 2007/01/07 13:41:07 kls Exp $
+ * $Id: device.c 1.139 2007/01/13 12:05:00 kls Exp $
  */
 
 #include "device.h"
@@ -334,6 +334,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 1; imp |= ndr;                                                                                  // avoid devices if we need to detach existing receivers
              imp <<= 1; imp |= device[i]->IsPrimaryDevice();                                                         // avoid the primary device
+             imp <<= 1; imp |= NumUsableSlots ? 0 : device[i]->HasCi();                                              // avoid cards with Common Interface for FTA channels
              imp <<= 1; imp |= device[i]->HasDecoder();                                                              // avoid full featured cards
              imp <<= 1; imp |= NumUsableSlots ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
              if (imp < Impact) {
@@ -367,6 +368,11 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
   return d;
 }
 
+bool cDevice::HasCi(void)
+{
+  return false;
+}
+
 void cDevice::SetCamSlot(cCamSlot *CamSlot)
 {
   camSlot = CamSlot;
diff --git a/device.h b/device.h
index e41d5ae2a..60dc73e13 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.80 2007/01/03 14:14:29 kls Exp $
+ * $Id: device.h 1.81 2007/01/13 11:33:57 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -314,6 +314,8 @@ class cDevice : public cThread {
   time_t startScrambleDetection;
   cCamSlot *camSlot;
 public:
+  virtual bool HasCi(void);
+         ///< Returns true if this device has a Common Interface.
   void SetCamSlot(cCamSlot *CamSlot);
          ///< Sets the given CamSlot to be used with this device.
   cCamSlot *CamSlot(void) const { return camSlot; }
diff --git a/dvbdevice.c b/dvbdevice.c
index 487aec5bd..8757710a9 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.161 2007/01/05 11:09:51 kls Exp $
+ * $Id: dvbdevice.c 1.164 2007/02/25 11:46:52 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -155,15 +155,12 @@ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status, int TimeoutMs)
               ; // just to clear the event queue - we'll read the actual status below
         }
      }
-  do {
-     int stat = ioctl(fd_frontend, FE_READ_STATUS, &Status);
-     if (stat == 0)
-        return true;
-     if (stat < 0) {
-        if (errno == EINTR)
-           continue;
+  while (1) {
+        if (ioctl(fd_frontend, FE_READ_STATUS, &Status) != -1)
+           return true;
+        if (errno != EINTR)
+           break;
         }
-     } while (0);
   return false;
 }
 
@@ -509,6 +506,11 @@ cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
   return spuDecoder;
 }
 
+bool cDvbDevice::HasCi(void)
+{
+  return ciAdapter;
+}
+
 uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
   if (devVideoIndex < 0)
diff --git a/dvbdevice.h b/dvbdevice.h
index 670421f42..63c38d15b 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.42 2007/01/05 10:39:52 kls Exp $
+ * $Id: dvbdevice.h 1.44 2007/02/25 12:23:57 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -19,7 +19,7 @@
 #error VDR requires Linux DVB driver API version 3!
 #endif
 
-#define MAXDVBDEVICES  4
+#define MAXDVBDEVICES  8
 
 class cDvbTuner;
 
@@ -84,6 +84,11 @@ class cDvbDevice : public cDevice {
 protected:
   virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
 
+// Common Interface facilities:
+
+public:
+  virtual bool HasCi(void);
+
 // Image Grab facilities
 
 private:
diff --git a/dvbspu.c b/dvbspu.c
index 48b20bf7d..1ca5435fc 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.21 2006/04/17 12:45:05 kls Exp $
+ * $Id: dvbspu.c 1.22 2007/02/03 10:13:18 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -504,9 +504,8 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
                 default:
                     esyslog("invalid sequence in control header (%.2x)",
                             spu[i]);
-                    assert(0);
-                    i++;
-                    break;
+                    Empty();
+                    return 0;
                 }
             }
             if (fodd != 0 && feven != 0) {
diff --git a/i18n.c b/i18n.c
index 54d39c496..c7f8d7210 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.286 2007/01/07 12:19:15 kls Exp $
+ * $Id: i18n.c 1.291 2007/02/25 13:59:28 kls Exp $
  *
  * Translations provided by:
  *
@@ -119,7 +119,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-7",
     "iso8859-1",
     "iso8859-2",
-    "iso8859-1",
+    "iso8859-2",
     "iso8859-1",
     "iso8859-5",
     "iso8859-2",
@@ -231,7 +231,7 @@ const tI18nPhrase Phrases[] = {
     "��������������������",
     "Timers",
     "Timer-e",
-    "Id�z�t�",
+    "Id�z�t�",
     "Temporitzadors",
     "�������",
     "Termini",
@@ -385,7 +385,7 @@ const tI18nPhrase Phrases[] = {
     "����������� ��������������������",
     "�ndra timer",
     "Modificare timer",
-    "Id�z�t� megv�ltoztat�sa",
+    "Id�z�t� megv�ltoztat�sa",
     "Editar temporitzador",
     "��������� �������",
     "Ure�ivanje termina",
@@ -694,7 +694,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Timer",
     "Timer",
-    "Id�z�t�",
+    "Id�z�t�",
     "",// TODO
     "������",
     "",// TODO
@@ -936,7 +936,7 @@ const tI18nPhrase Phrases[] = {
     "�������",
     "N�sta",
     "Urm�tor",
-    "K�vetkez�",
+    "K�vetkez�",
     "Seg�ent",
     "�����",
     "Slijedi",
@@ -1157,7 +1157,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��������������������;?",
     "Ta bort timern?",
     "�terg timer-ul?",
-    "Id�z�t� t�rl�se?",
+    "Id�z�t� t�rl�se?",
     "Esborrar el temporitzador?",
     "������� ������?",
     "Obrisati termin?",
@@ -1341,6 +1341,28 @@ const tI18nPhrase Phrases[] = {
     "Optagelse igang - genstart alligevel?",
     "Syst�m je zanepr�zdn�n - p�esto restartovat?",
   },
+  { "Editing - restart anyway?",
+    "Schnitt l�uft - trotzdem neu starten?",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Recording - shut down anyway?",
     "Aufnahme l�uft - trotzdem ausschalten?",
     "Snemanje - zares izklopi?",
@@ -1377,7 +1399,7 @@ const tI18nPhrase Phrases[] = {
     "���������� ������� �� %ld ����� - ������ �� �����������?",
     "Inspelning startar om %ld minuter, vill du avsluta?",
     "�nregistrez peste %ld minute - �nchid, totu�i?",
-    "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?",
+    "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?",
     "Hi ha una gravaci� en %ld minuts - Apagar de totes maneres?",
     "����� %ld ����� �������� ������ - ������������� ���������?",
     "Snimanje za %ld minuta - svejedno isklju�iti?",
@@ -1407,6 +1429,116 @@ const tI18nPhrase Phrases[] = {
     "Tryk vilk�rlig tast for at annullere sluk",
     "Jak�koliv kl�vesa zru�� vypnut�",
   },
+  { "Press any key to cancel restart",
+    "Taste dr�cken, um Neustart abzubrechen",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "VDR will shut down later - press Power to force",
+    "VDR schaltet sp�ter aus - Power zum erzwingen",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "VDR sammuu my�hemmin - pakota virtakytkimell�",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "VDR will shut down in %s minutes",
+    "VDR wird in %s Minuten ausschalten",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "VDR sammuu %s minuutin kuluttua",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "Editing - shut down anyway?",
+    "Schnitt l�uft - trotzdem ausschalten?",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "Leikkaus kesken - sammutetaanko?",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
+  { "Plugin %s wakes up in %ld min, continue?",
+    "Plugin %s wacht in %ld Min auf, weiter?",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "Laajennos %s her�� %ld minuutin kuluttua - sammutetaanko?",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   // Channel parameters:
   { "Name",
     "Name",
@@ -2149,7 +2281,7 @@ const tI18nPhrase Phrases[] = {
     "����� ����",
     "F�rsta dag",
     "Prima zi",
-    "Els� nap",
+    "Els� nap",
     "Primer dia",
     "������ ����",
     "Prvi dan",
@@ -2172,7 +2304,7 @@ const tI18nPhrase Phrases[] = {
     "�� ������ ��������������� ��� �������������������!",
     "Kanalen anv�nds av en timer!",
     "Canalul este utilizat de un timer!",
-    "Az ad�t az id�z�t� haszn�lja!",
+    "Az ad�t az id�z�t� haszn�lja!",
     "Canal en �s per un temporitzador!",
     "����� ����� ��������!",
     "Program je trenutno zauzet terminom za snimanje",
@@ -2304,7 +2436,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "strax VPS inspelning...",
     "Urmeaz� o �nregistrare VPS!",
-    "VPS-felv�tel r�gt�n kezd�dik!",
+    "VPS-felv�tel r�gt�n kezd�dik!",
     "",//TODO
     "VPS-������ ����� ��������",
     "",//TODO
@@ -2348,7 +2480,7 @@ const tI18nPhrase Phrases[] = {
     "�� ������ ��� ����� ���������!",
     "Kanalen �r inte tillg�nglig!",
     "Canal indisponibil",
-    "Az ad� nem el�rhet�",
+    "Az ad� nem el�rhet�",
     "Canal no disponible!",
     "����� ����������!",
     "Program nije dostupan!",
@@ -2370,7 +2502,7 @@ const tI18nPhrase Phrases[] = {
     "�� ��������� ��� �������� ����������������!",
     "Kanalinst�llningarna �r ej unika!",
     "Parametrii canalului nu sunt univoci!",
-    "Az ad�be�ll�t�sok nem egy�rtelm�ek",
+    "Az ad�be�ll�t�sok nem egy�rtelm�ek",
     "Propietats del canal duplicades!",
     "��������� ������ �� ���������!",
     "Parametri programa nisu jednozna�ni!",
@@ -2524,7 +2656,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "Otillr�cklingt diskutrymme f�r inspelning!",
     "Insuficient spa�iul pe disc pentru �nregistrare!",
-    "Nincs elegend� hely a felv�telre",
+    "Nincs elegend� hely a felv�telre",
     "",//TODO
     "������������ ����� �� ����� ��� ������ ������",
     "",//TODO
@@ -3186,7 +3318,7 @@ const tI18nPhrase Phrases[] = {
     "������ �������� ��������� (�)",
     "Tid f�r meddelanden (sek)",
     "Timp afi�are mesaje (sec)",
-    "Inform�ci� felt�ntet�s�nek id�tartama",
+    "Inform�ci� felt�ntet�s�nek id�tartama",
     "Durada dels missatges (s)",
     "������������ ������ ��������� (���)",
     "Vrijeme prikaza poruka (s)",
@@ -3208,7 +3340,7 @@ const tI18nPhrase Phrases[] = {
     "������������� ������ ��������������",
     "Anv�nd liten font",
     "Utilizare fonturi mici",
-    "Kisbet�t haszn�lni",
+    "Kisbet�t haszn�lni",
     "",// TODO
     "������������ ������ �����",
     "Koristi mala slova",
@@ -3252,7 +3384,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��� ��� ���������",
     "skin beroende",
     "dep. de skin",
-    "Men� n�zet�t�l f�gg�en",
+    "Men� n�zet�t�l f�gg�en",
     "",// TODO
     "�������� ����",
     "ovisno o povr�ini",
@@ -3318,7 +3450,7 @@ const tI18nPhrase Phrases[] = {
     "������ ��������� ����������� �������� �� (�)",
     "Kanal information (s)",
     "Durata afi��rii info-canal (s)",
-    "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)",
+    "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)",
     "",// TODO
     "����� ���������� � ������ (���)",
     "Vrijeme prikaza informacije o programu (s)",
@@ -3414,7 +3546,7 @@ const tI18nPhrase Phrases[] = {
     "Scroll rundt",
     "Z konce na za��tek",
   },
-  { "Setup.OSD$Menu button closes",
+  { "Setup.OSD$Menu key closes",
     "Menu-Taste schlie�t",
     "Meni gumb zapre meni",
     "Usare il bottone Menu per chiudere",
@@ -3472,7 +3604,7 @@ const tI18nPhrase Phrases[] = {
     "������ ��������� �������� EPG �� ����",
     "EPG s�kning timeout",
     "Interval achizi�ie EPG (h)",
-    "Fennmaradt id� az EPG-�j�t�sig (h)",
+    "Fennmaradt id� az EPG-�j�t�sig (h)",
     "M�xim d'Hores a cercar per la Guia",
     "�������� ������������ �������� (�)",
     "Vrijeme do EPG pregleda (h)",
@@ -3538,7 +3670,7 @@ const tI18nPhrase Phrases[] = {
     "����������� ���� ����������",
     "St�ll in systemtid",
     "Potrive�te ceasul sistem",
-    "Az id� be�ll�t�sa",
+    "Az id� be�ll�t�sa",
     "Ajustar l'hora del sistema",
     "���������� ��������� �����",
     "Podesi vrijeme sistema",
@@ -3560,7 +3692,7 @@ const tI18nPhrase Phrases[] = {
     "������������ ����������� ����",
     "Anv�nd klockan fr�n transponder",
     "Preia ora din transponder",
-    "Id�h�z tartoz� Transponder",
+    "Id�h�z tartoz� Transponder",
     "Usar el temps del m�ltiplex",
     "������������ ����� ������������",
     "Transponder za pode�avanje sata",
@@ -3626,7 +3758,7 @@ const tI18nPhrase Phrases[] = {
     "����� DVB �����",
     "Prim�r DVB enhet",
     "Dispozitiv DVB primar",
-    "Els� DVB interface",
+    "Els� DVB interface",
     "Tarja DVB prim�ria",
     "�������� DVB-����������",
     "Primarni DVB ure�aj",
@@ -4000,7 +4132,7 @@ const tI18nPhrase Phrases[] = {
     "��� LNB-��������� (MHz)",
     "�vre LNB frekvens (MHz)",
     "Frecvn�� LNB superioar� (MHz)",
-    "Fels� LNB-frekvencia (MHZ)",
+    "Fels� LNB-frekvencia (MHZ)",
     "Freq��ncia LNB alta (MHz)",
     "������� ������� ���������� (���)",
     "Gornja LNB frekv. (MHz)",
@@ -4044,7 +4176,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ ���� ���� (�����)",
     "Marginal f�r start (min)",
     "Marj� la pornire (min)",
-    "Id�eltol�d�s a kezd�sn�l (perc)",
+    "Id�eltol�d�s a kezd�sn�l (perc)",
     "Marge d'inici de gravaci� (min)",
     "���������� ������ ������ (���)",
     "Rezerva na po�etku snimanja (min)",
@@ -4066,7 +4198,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ ��� ����� (�����)",
     "Marginal f�r stopp (min)",
     "Marj� la oprire (min)",
-    "Id�eltol�d�s a befejez�sn�l (perc)",
+    "Id�eltol�d�s a befejez�sn�l (perc)",
     "Marge de fi de gravaci� (min)",
     "������������ ��������� ������ (���)",
     "Rezerva na kraju (min)",
@@ -4242,7 +4374,7 @@ const tI18nPhrase Phrases[] = {
     "��������� VPS (�)",
     "VPS marginal (s)",
     "Marj� de timp la utilizare VPS (s)",
-    "Id�eltol�d�s VPS-n�l (s)",
+    "Id�eltol�d�s VPS-n�l (s)",
     "",// TODO
     "�������� ����� VPS (���)",
     "Vremenska rezerva kod VPS (s)",
@@ -4308,7 +4440,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ��������� �������� (�����)",
     "Direktinspelning l�ngd (min)",
     "Timpul de �nregistare imediat� (min)",
-    "Felv�tel id�tartama (perc)",
+    "Felv�tel id�tartama (perc)",
     "Temps de gravaci� instant�nia (min)",
     "������������ ������ ������ (���)",
     "Trajanje direktnog snimanja (min)",
@@ -4440,7 +4572,7 @@ const tI18nPhrase Phrases[] = {
     "��������� ������ ���������� (�����)",
     "Minsta h�ndelse-pause (min)",
     "Durat� minim� emisiuni (min)",
-    "Id�zit�sek k�z�tti id�tartam (perc)",
+    "Id�zit�sek k�z�tti id�tartam (perc)",
     "Temps m�nim en pausa (min)",
     "���. ����� �������� ������� (���)",
     "Minimalno vrijeme pauze",
@@ -4514,6 +4646,28 @@ const tI18nPhrase Phrases[] = {
     "Zap timeout (s)",
     "�asov� limit Zap (s)",
   },
+  { "Setup.Miscellaneous$Channel entry timeout (ms)",
+    "Zeitlimit f�r Kanaleingabe (ms)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.Miscellaneous$Initial channel",
     "Kanal beim Einschalten",
     "Privzeti kanal",
@@ -4550,7 +4704,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "Ljudstyrka vid uppstart",
     "Volumul la pornire",
-    "Hanger� a bekapcsol�sn�l",
+    "Hanger� a bekapcsol�sn�l",
     "",// TODO
     "��������� ��� ���������",
     "",// TODO
@@ -4572,7 +4726,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "som f�rut",
     "ca mai �nainte",
-    "ahogy az el�bb",
+    "ahogy az el�bb",
     "",// TODO
     "��� ������",
     "",// TODO
@@ -4640,7 +4794,7 @@ const tI18nPhrase Phrases[] = {
     " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
     " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@",
-    " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~,/_@",
+    " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~,/_@",
     " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~,/_@�",
     " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@",
     " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@", // hrv
@@ -4663,7 +4817,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz",
     " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9",
-    " 0\t-.#~,/_@1\ta�bc2\tde�3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9",
+    " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -4708,7 +4862,7 @@ const tI18nPhrase Phrases[] = {
     "���� 1: ��������� ������ RC",
     "Steg1: identifiering av kod",
     "Faza 1: Detec�ia tipului telecomenzii",
-    "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
+    "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
     "Fase 1: Detectant el tipus de receptor",
     "��� 1: ����������� ���� ���� ������",
     "Faza 1: detektiranje k�da daljinskog upravlja�a.",
@@ -5347,7 +5501,7 @@ const tI18nPhrase Phrases[] = {
     "�������� ������",
     "Snabbspolning fram�t",
     "Derulare �nainte",
-    "El�re p�rgetni",
+    "El�re p�rgetni",
     "Endavant r�pidament",
     "��������� ������",
     "Naprijed",
@@ -5391,7 +5545,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "N�sta",
     "Urm�tor",
-    "El�re",
+    "El�re",
     "",// TODO
     "������",
     "",// TODO
@@ -5429,7 +5583,7 @@ const tI18nPhrase Phrases[] = {
     "Ligar",
     "Arr�t",
     "Power",
-    "Virtakytkin",
+    "Virta",
     "Wy��cz",
     "Apagar",
     "K�������",
@@ -5501,7 +5655,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "F�rra kanalen",
     "Canal anterior",
-    "Az el�z� ad�s",
+    "Az el�z� ad�s",
     "",// TODO
     "���������� �����",
     "",// TODO
@@ -5523,7 +5677,7 @@ const tI18nPhrase Phrases[] = {
     "������+",
     "Volym+",
     "Volum+",
-    "Hanger�+",
+    "Hanger�+",
     "Volum +",
     "��������� +",
     "Glasnije", // hrv "Glasnocca +"
@@ -5545,7 +5699,7 @@ const tI18nPhrase Phrases[] = {
     "������-",
     "Volym-",
     "Volum-",
-    "Hanger�-",
+    "Hanger�-",
     "Volum -",
     "��������� -",
     "Ti�e", // hrv Glasnocca -"
@@ -5561,7 +5715,7 @@ const tI18nPhrase Phrases[] = {
     "Sem som",
     "Coupure du son",
     "Lyd av",
-    "��net�n",
+    "Mykistys",
     "Wycisz",
     "Mudo",
     "�������",
@@ -5832,7 +5986,7 @@ const tI18nPhrase Phrases[] = {
     "������ ",
     "Volym ",
     "Volum ",
-    "Hanger�",
+    "Hanger�",
     "Volum ",
     "��������� ",
     "Glasno�a ",
@@ -6052,7 +6206,7 @@ const tI18nPhrase Phrases[] = {
     "������ �������� �������",
     "Pausar direktinspelningen",
     "Trec �n pauz� emisiunea transmis�...",
-    "Az �l� ad�s meg�ll�tva...",
+    "Az �l� ad�s meg�ll�tva...",
     "Pausa d'emissi� en directe...",
     "����� ����������� ���������...",
     "Zaustavljanje �ivog signala...",
diff --git a/keys.h b/keys.h
index be87c7983..0799a3b4f 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.10 2006/10/14 10:41:20 kls Exp $
+ * $Id: keys.h 1.11 2007/02/25 10:49:35 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -74,6 +74,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 #define ISRAWKEY(k)      ((k) != kNone && ((k) & k_Flags) == 0)
 #define NORMALKEY(k)     (eKeys((k) & ~k_Repeat))
 #define ISMODELESSKEY(k) (RAWKEY(k) > k9)
+#define ISREALKEY(k)     (k != kNone && k != k_Plugin)
 
 #define BASICKEY(k)      (eKeys((k) & 0xFFFF))
 #define KBDKEY(k)        (eKeys(((k) << 16) | kKbd))
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 1654a33b6..f3bb34428 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.21 2006/05/28 14:25:30 kls Exp $
+ *   $Id: descriptor.c 1.22 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -418,8 +418,16 @@ int SatelliteDeliverySystemDescriptor::getPolarization() const {
    return s->polarization;
 }
 
-int SatelliteDeliverySystemDescriptor::getModulation() const {
-   return s->modulation;
+int SatelliteDeliverySystemDescriptor::getModulationSystem() const {
+   return s->modulation_system;
+}
+
+int SatelliteDeliverySystemDescriptor::getModulationType() const {
+   return s->modulation_type;
+}
+
+int SatelliteDeliverySystemDescriptor::getRollOff() const {
+   return s->roll_off;
 }
 
 int SatelliteDeliverySystemDescriptor::getSymbolRate() const {
@@ -462,6 +470,18 @@ int TerrestrialDeliverySystemDescriptor::getFrequency() const {
    return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo);
 }
 
+int TerrestrialDeliverySystemDescriptor::getPriority() const {
+   return s->priority;
+}
+
+int TerrestrialDeliverySystemDescriptor::getTimeSlicingIndicator() const {
+   return s->time_slicing_indicator;
+}
+
+int TerrestrialDeliverySystemDescriptor::getMpeFecIndicator() const {
+   return s->mpe_fec_indicator;
+}
+
 int TerrestrialDeliverySystemDescriptor::getBandwidth() const {
    return s->bandwidth;
 }
@@ -794,6 +814,41 @@ int AncillaryDataDescriptor::getAncillaryDataIdentifier() const {
    return s->ancillary_data_identifier;
 }
 
+void S2SatelliteDeliverySystemDescriptor::Parse() {
+   int offset=0;
+   input_stream_identifier=0;
+   data.setPointerAndOffset<const descr_s2_satellite_delivery_system>(s, offset);
+   if (s->scrambling_sequence_selector)
+      data.setPointerAndOffset<const descr_scrambling_sequence_selector>(sss, offset);
+   if (s->multiple_input_stream_flag)
+      input_stream_identifier = *data.getData(offset++);
+}
+
+int S2SatelliteDeliverySystemDescriptor::getScramblingSequenceSelector() const {
+   return s->scrambling_sequence_selector;
+}
+
+int S2SatelliteDeliverySystemDescriptor::getMultipleInputStreamFlag() const {
+   return s->multiple_input_stream_flag;
+}
+
+int S2SatelliteDeliverySystemDescriptor::getBackwardsCompatibilityIndicator() const {
+   return s->backwards_compatibility_indicator;
+}
+
+int S2SatelliteDeliverySystemDescriptor::getScramblingSequenceIndex() const {
+   return sss == NULL ? 0 : (sss->scrambling_sequence_index_hi_lo << 16) | HILO(sss->scrambling_sequence_index_lo);
+}
+
+void ExtensionDescriptor::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const descr_extension>(s, offset);
+}
+
+int ExtensionDescriptor::getExtensionDescriptorTag() const {
+   return s->descriptor_tag_extension;
+}
+
 int PremiereContentTransmissionDescriptor::getOriginalNetworkId() const {
    return HILO(s->original_network_id);
 }
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index c0c884fde..161793e5e 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.15 2006/05/28 14:25:30 kls Exp $
+ *   $Id: descriptor.h 1.16 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -210,7 +210,9 @@ class SatelliteDeliverySystemDescriptor : public Descriptor {
    int getOrbitalPosition() const;
    int getWestEastFlag() const;
    int getPolarization() const;
-   int getModulation() const;
+   int getModulationSystem() const;
+   int getModulationType() const;
+   int getRollOff() const;
    int getSymbolRate() const;
    int getFecInner() const;
 protected:
@@ -236,6 +238,9 @@ class TerrestrialDeliverySystemDescriptor : public Descriptor {
 public:
    int getFrequency() const;
    int getBandwidth() const;
+   int getPriority() const;
+   int getTimeSlicingIndicator() const;
+   int getMpeFecIndicator() const;
    int getConstellation() const;
    int getHierarchy() const;
    int getCodeRateHP() const;
@@ -484,6 +489,30 @@ class AncillaryDataDescriptor : public Descriptor {
    const descr_ancillary_data *s;
 };
 
+class S2SatelliteDeliverySystemDescriptor : public Descriptor {
+public:
+   int getScramblingSequenceSelector() const;
+   int getMultipleInputStreamFlag() const;
+   int getBackwardsCompatibilityIndicator() const;
+   int getScramblingSequenceIndex() const;
+   int getInputStreamIdentifier() const { return input_stream_identifier; }
+protected:
+   virtual void Parse();
+private:
+   const descr_s2_satellite_delivery_system *s;
+   const descr_scrambling_sequence_selector *sss;
+   int input_stream_identifier;
+};
+
+class ExtensionDescriptor : public Descriptor {
+public:
+   int getExtensionDescriptorTag() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_extension *s;
+};
+
 // Private DVB Descriptor  Premiere.de
 // 0xF2  Content Transmission Descriptor
 // http://dvbsnoop.sourceforge.net/examples/example-private-section.html
diff --git a/libsi/headers.h b/libsi/headers.h
index ea7824bc8..db1e261e3 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.8 2006/09/02 20:25:16 kls Exp $
+ *   $Id: headers.h 1.9 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -942,9 +942,13 @@ struct descr_satellite_delivery_system {
 #if BYTE_ORDER == BIG_ENDIAN
    u_char west_east_flag                         :1;
    u_char polarization                           :2;
-   u_char modulation                             :5;
+   u_char roll_off                               :2;
+   u_char modulation_system                      :1;
+   u_char modulation_type                        :2;
 #else
-   u_char modulation                             :5;
+   u_char modulation_type                        :2;
+   u_char modulation_system                      :1;
+   u_char roll_off                               :2;
    u_char polarization                           :2;
    u_char west_east_flag                         :1;
 #endif
@@ -1349,9 +1353,15 @@ struct descr_terrestrial_delivery {
    u_char frequency_lo_lo                        :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char bandwidth                              :3;
-   u_char reserved1                              :5;
+   u_char priority                               :1;
+   u_char time_slicing_indicator                 :1;
+   u_char mpe_fec_indicator                      :1;
+   u_char reserved1                              :2;
 #else
-   u_char reserved1                              :5;
+   u_char reserved1                              :2;
+   u_char mpe_fec_indicator                      :1;
+   u_char time_slicing_indicator                 :1;
+   u_char priority                               :1;
    u_char bandwidth                              :3;
 #endif
 #if BYTE_ORDER == BIG_ENDIAN
@@ -1492,10 +1502,10 @@ struct descr_data_broadcast {
    /* TBD */
 };
 
-/* 0x65 ca_system_descriptor */
+/* 0x65 scrambling_descriptor */
 
-#define DESCR_CA_SYSTEM_LEN XX
-struct descr_ca_system {
+#define DESCR_SCRAMBLING_LEN XX
+struct descr_scrambling {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
    /* TBD */
@@ -1628,6 +1638,189 @@ struct descr_service_identifier {
    u_char descriptor_length                      :8;
 };
 
+/* 0x72 service_availbility_descriptor */
+
+struct descr_service_availbility {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char availability_flag                      :1;
+   u_char reserved                               :7;
+#else
+   u_char reserved                               :7;
+   u_char availability_flag                      :1;
+#endif
+};
+
+/* 0x73 default_authority_descriptor (ETSI TS 102 323) */
+
+struct descr_default_authority {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+/* 0x74 related_content_descriptor (ETSI TS 102 323) */
+
+struct descr_related_content {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+/* 0x75 tva_id_descriptor (ETSI TS 102 323) */
+
+struct descr_tva_id {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+/* 0x76 content_identifier_descriptor (ETSI TS 102 323) */
+
+struct descr_content_identifier {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+/* 0x77 time_slice_fec_identifier_descriptor (ETSI EN 301 192) */
+
+struct descr_time_slice_fec_identifier {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char time_slicing                           :1;
+   u_char mpe_fec                                :2;
+   u_char reserved                               :2;
+   u_char frame_size                             :3;
+#else
+   u_char frame_size                             :3;
+   u_char reserved                               :2;
+   u_char mpe_fec                                :2;
+   u_char time_slicing                           :1;
+#endif
+   u_char max_burst_duration                     :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char max_average_rate                       :4;
+   u_char time_slice_fec_id                      :4;
+#else
+   u_char time_slice_fec_id                      :4;
+   u_char max_average_rate                       :4;
+#endif
+};
+
+/* 0x78 ecm_repetition_rate_descriptor (ETSI EN 301 192) */
+
+struct descr_ecm_repetition_rate {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char ca_system_id_hi                        :8;
+   u_char ca_system_id_lo                        :8;
+   u_char ecm_repetition_rate_hi                 :8;
+   u_char ecm_repetition_rate_lo                 :8;
+};
+
+/* 0x79 s2_satellite_delivery_system_descriptor */
+
+struct descr_s2_satellite_delivery_system {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char scrambling_sequence_selector           :1;
+   u_char multiple_input_stream_flag             :1;
+   u_char backwards_compatibility_indicator      :1;
+   u_char reserved                               :5;
+#else
+   u_char reserved                               :5;
+   u_char backwards_compatibility_indicator      :1;
+   u_char multiple_input_stream_flag             :1;
+   u_char scrambling_sequence_selector           :1;
+#endif
+};
+
+struct descr_scrambling_sequence_selector {
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char reserved                               :6;
+   u_char scrambling_sequence_index_hi_lo        :2;
+#else
+   u_char scrambling_sequence_index_hi_lo        :2;
+   u_char reserved                               :6;
+#endif
+   u_char scrambling_sequence_index_lo_hi        :8;
+   u_char scrambling_sequence_index_lo_lo        :8;
+};
+
+/* 0x7A enhanced_ac3_descriptor */
+
+struct descr_enhanced_ac3 {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char component_type_flag                    :1;
+   u_char bsid_flag                              :1;
+   u_char mainid_flag                            :1;
+   u_char asvc_flag                              :1;
+   u_char mixinfoexists                          :1;
+   u_char substream1_flag                        :1;
+   u_char substream2_flag                        :1;
+   u_char substream3_flag                        :1;
+#else
+   u_char substream3_flag                        :1;
+   u_char substream2_flag                        :1;
+   u_char substream1_flag                        :1;
+   u_char mixinfoexists                          :1;
+   u_char asvc_flag                              :1;
+   u_char mainid_flag                            :1;
+   u_char bsid_flag                              :1;
+   u_char component_type_flag                    :1;
+#endif
+};
+
+/* 0x7B dts_descriptor */
+
+struct descr_dts {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char sample_rate_code                       :4;
+   u_char bit_rate_code                          :6;
+   u_char nblks                                  :7;
+   u_char fsize_hi                               :6;
+   u_char fsize_lo                               :8;
+   u_char surround_mode                          :6;
+   u_char lfe_flag                               :1;
+   u_char extended_surround_flag                 :2;
+#else
+   u_char extended_surround_flag                 :2;
+   u_char lfe_flag                               :1;
+   u_char surround_mode                          :6;
+   u_char fsize_lo                               :8;
+   u_char fsize_hi                               :6;
+   u_char nblks                                  :7;
+   u_char bit_rate_code                          :6;
+   u_char sample_rate_code                       :4;
+#endif
+};
+
+/* 0x7C aac_descriptor */
+
+struct descr_aac {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char profile_and_level                      :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char aac_type_flag                          :1;
+   u_char reserved                               :7;
+#else
+   u_char reserved                               :7;
+   u_char aac_type_flag                          :1;
+#endif
+};
+/* 0x7F extension_descriptor */
+
+struct descr_extension {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char descriptor_tag_extension               :8;
+};
+
 /* MHP 0x00 application_descriptor */
 
 #define DESCR_APPLICATION_LEN 3
diff --git a/libsi/si.c b/libsi/si.c
index c7f23e88b..a16000dea 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.16 2006/04/14 10:53:44 kls Exp $
+ *   $Id: si.c 1.17 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -425,6 +425,12 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case AncillaryDataDescriptorTag:
             d=new AncillaryDataDescriptor();
             break;
+         case S2SatelliteDeliverySystemDescriptorTag:
+            d=new S2SatelliteDeliverySystemDescriptor();
+            break;
+         case ExtensionDescriptorTag:
+            d=new ExtensionDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -459,12 +465,23 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case PartialTransportStreamDescriptorTag:
          case DataBroadcastDescriptorTag:
          case DataBroadcastIdDescriptorTag:
-         case CaSystemDescriptorTag:
+         case ScramblingDescriptorTag:
          case AC3DescriptorTag:
          case DSNGDescriptorTag:
          case AnnouncementSupportDescriptorTag:
          case AdaptationFieldDataDescriptorTag:
          case TransportStreamDescriptorTag:
+
+         //defined in ETSI EN 300 468 v 1.7.1
+         case DefaultAuthorityDescriptorTag:
+         case RelatedContentDescriptorTag:
+         case TVAIdDescriptorTag:
+         case ContentIdentifierDescriptorTag:
+         case TimeSliceFecIdentifierDescriptorTag:
+         case ECMRepetitionRateDescriptorTag:
+         case EnhancedAC3DescriptorTag:
+         case DTSDescriptorTag:
+         case AACDescriptorTag:
          default:
             if (!returnUnimplemetedDescriptor)
                return 0;
diff --git a/libsi/si.h b/libsi/si.h
index a4877169d..eb016094d 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.15 2006/05/27 13:07:20 kls Exp $
+ *   $Id: si.h 1.16 2007/02/03 11:47:25 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -108,7 +108,7 @@ enum DescriptorTag {
                FrequencyListDescriptorTag = 0x62,
                PartialTransportStreamDescriptorTag = 0x63,
                DataBroadcastDescriptorTag = 0x64,
-               CaSystemDescriptorTag = 0x65,
+               ScramblingDescriptorTag = 0x65,
                DataBroadcastIdDescriptorTag = 0x66,
                TransportStreamDescriptorTag = 0x67,
                DSNGDescriptorTag = 0x68,
@@ -122,6 +122,19 @@ enum DescriptorTag {
                AdaptationFieldDataDescriptorTag = 0x70,
                ServiceIdentifierDescriptorTag = 0x71,
                ServiceAvailabilityDescriptorTag = 0x72,
+  // defined by ETSI (EN 300 468) v 1.7.1
+               DefaultAuthorityDescriptorTag = 0x73,
+               RelatedContentDescriptorTag = 0x74,
+               TVAIdDescriptorTag = 0x75,
+               ContentIdentifierDescriptorTag = 0x76,
+               TimeSliceFecIdentifierDescriptorTag = 0x77,
+               ECMRepetitionRateDescriptorTag = 0x78,
+               S2SatelliteDeliverySystemDescriptorTag = 0x79,
+               EnhancedAC3DescriptorTag = 0x7A,
+               DTSDescriptorTag = 0x7B,
+               AACDescriptorTag = 0x7C,
+               ExtensionDescriptorTag = 0x7F,
+
  // Defined by ETSI TS 102 812 (MHP)
                // They once again start with 0x00 (see page 234, MHP specification)
                MHP_ApplicationDescriptorTag = 0x00,
diff --git a/menu.c b/menu.c
index 203eee0f2..9e76ebed9 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.447 2007/01/07 12:19:48 kls Exp $
+ * $Id: menu.c 1.450 2007/02/25 14:04:33 kls Exp $
  */
 
 #include "menu.h"
@@ -22,6 +22,7 @@
 #include "plugin.h"
 #include "recording.h"
 #include "remote.h"
+#include "shutdown.h"
 #include "sources.h"
 #include "status.h"
 #include "themes.h"
@@ -2206,7 +2207,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Timeout requested channel info"), &data.TimeoutRequChInfo));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
-  Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu button closes"),     &data.MenuButtonCloses));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"),        &data.MenuKeyCloses));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   SetCurrent(Get(current));
   Display();
@@ -2661,6 +2662,7 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"),            &data.ZapTimeout));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0));
   Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
 }
@@ -2770,10 +2772,8 @@ void cMenuSetup::Set(void)
 
 eOSState cMenuSetup::Restart(void)
 {
-  if (Interface->Confirm(tr("Really restart?"))
-     && (!cRecordControls::Active() || Interface->Confirm(tr("Recording - restart anyway?")))
-     && !cPluginManager::Active(tr("restart anyway?"))) {
-     cThread::EmergencyExit(true);
+  if (Interface->Confirm(tr("Really restart?")) && ShutdownHandler.ConfirmRestart(true)) {
+     ShutdownHandler.Exit(1);
      return osEnd;
      }
   return osContinue;
@@ -3090,8 +3090,6 @@ static void SetTrackDescriptions(int LiveChannel)
 
 // --- cDisplayChannel -------------------------------------------------------
 
-#define DIRECTCHANNELTIMEOUT 1000 //ms
-
 cDisplayChannel *cDisplayChannel::currentDisplayChannel = NULL;
 
 cDisplayChannel::cDisplayChannel(int Number, bool Switched)
@@ -3290,7 +3288,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
          Refresh();
          break;
     case kNone:
-         if (number && lastTime.Elapsed() > DIRECTCHANNELTIMEOUT) {
+         if (number && Setup.ChannelEntryTimeout && int(lastTime.Elapsed()) > Setup.ChannelEntryTimeout) {
             channel = Channels.GetByNumber(number);
             if (channel)
                NewChannel = channel;
@@ -3699,7 +3697,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
      if (device) {
         dsyslog("switching device %d to channel %d", device->DeviceNumber() + 1, channel->Number());
         if (!device->SwitchChannel(channel, false)) {
-           cThread::EmergencyExit(true);
+           ShutdownHandler.RequestEmergencyExit();
            return false;
            }
         if (!Timer || Timer->Matches()) {
diff --git a/newplugin b/newplugin
index 363baae46..dbb56e6d7 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.30 2006/09/09 12:38:35 kls Exp $
+# $Id: newplugin 1.31 2007/02/24 13:23:08 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -169,6 +169,7 @@ public:
   virtual void Housekeeping(void);
   virtual void MainThreadHook(void);
   virtual cString Active(void);
+  virtual time_t WakeupTime(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
@@ -236,6 +237,12 @@ cString cPlugin${PLUGIN_CLASS}::Active(void)
   return NULL;
 }
 
+time_t cPlugin${PLUGIN_CLASS}::WakeupTime(void)
+{
+  // Return custom wakeup time for shutdown script
+  return 0;
+}
+
 cOsdObject *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
diff --git a/osd.c b/osd.c
index bf9640c58..64f475dda 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.67 2006/02/26 14:31:31 kls Exp $
+ * $Id: osd.c 1.68 2007/02/17 16:05:52 kls Exp $
  */
 
 #include "osd.h"
@@ -218,14 +218,17 @@ bool cBitmap::LoadXpm(const char *FileName)
                  int w, h, n, c;
                  if (4 != sscanf(s, "%d %d %d %d", &w, &h, &n, &c)) {
                     esyslog("ERROR: faulty 'values' line in XPM file '%s'", FileName);
+                    isXpm = false;
                     break;
                     }
                  lines = h + n + 1;
                  Xpm = MALLOC(char *, lines);
+                 memset(Xpm, 0, lines * sizeof(char*));
                  }
               char *q = strchr(s, '"');
               if (!q) {
                  esyslog("ERROR: missing quotes in XPM file '%s'", FileName);
+                 isXpm = false;
                  break;
                  }
               *q = 0;
@@ -233,16 +236,21 @@ bool cBitmap::LoadXpm(const char *FileName)
                  Xpm[index++] = strdup(s);
               else {
                  esyslog("ERROR: too many lines in XPM file '%s'", FileName);
+                 isXpm = false;
                  break;
                  }
               }
            }
-     if (index == lines)
-        Result = SetXpm(Xpm);
-     else
-        esyslog("ERROR: too few lines in XPM file '%s'", FileName);
-     for (int i = 0; i < index; i++)
-         free(Xpm[i]);
+     if (isXpm) {
+        if (index == lines)
+           Result = SetXpm(Xpm);
+        else
+           esyslog("ERROR: too few lines in XPM file '%s'", FileName);
+        }
+     if (Xpm) {
+        for (int i = 0; i < index; i++)
+            free(Xpm[i]);
+        }
      free(Xpm);
      fclose(f);
      }
diff --git a/plugin.c b/plugin.c
index 569e941a3..16087cf6d 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.24 2006/10/14 09:49:16 kls Exp $
+ * $Id: plugin.c 1.25 2007/02/24 13:44:23 kls Exp $
  */
 
 #include "plugin.h"
@@ -80,6 +80,11 @@ cString cPlugin::Active(void)
   return NULL;
 }
 
+time_t cPlugin::WakeupTime(void)
+{
+  return 0;
+}
+
 const char *cPlugin::MainMenuEntry(void)
 {
   return NULL;
@@ -403,6 +408,26 @@ bool cPluginManager::Active(const char *Prompt)
   return false;
 }
 
+cPlugin *cPluginManager::GetNextWakeupPlugin(void)
+{
+  cPlugin *NextPlugin = NULL;
+  if (pluginManager) {
+     time_t Now = time(NULL);
+     time_t Next = 0;
+     for (cDll *dll = pluginManager->dlls.First(); dll; dll = pluginManager->dlls.Next(dll)) {
+         cPlugin *p = dll->Plugin();
+         if (p) {
+            time_t t = p->WakeupTime();
+            if (t > Now && (!Next || t < Next)) {
+               Next = t;
+               NextPlugin = p;
+               }
+            }
+         }
+     }
+  return NextPlugin;
+}
+
 bool cPluginManager::HasPlugins(void)
 {
   return pluginManager && pluginManager->dlls.Count();
diff --git a/plugin.h b/plugin.h
index 19db61346..ddb498c18 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.13 2006/04/17 09:18:16 kls Exp $
+ * $Id: plugin.h 1.14 2007/02/24 13:45:28 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -41,6 +41,7 @@ class cPlugin {
   virtual void Housekeeping(void);
   virtual void MainThreadHook(void);
   virtual cString Active(void);
+  virtual time_t WakeupTime(void);
 
   virtual const char *MainMenuEntry(void);
   virtual cOsdObject *MainMenuAction(void);
@@ -93,6 +94,7 @@ class cPluginManager {
   void Housekeeping(void);
   void MainThreadHook(void);
   static bool Active(const char *Prompt = NULL);
+  static cPlugin *GetNextWakeupPlugin(void);
   static bool HasPlugins(void);
   static cPlugin *GetPlugin(int Index);
   static cPlugin *GetPlugin(const char *Name);
diff --git a/recorder.c b/recorder.c
index 2542bca9c..7bcd0cc72 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.18 2007/01/05 10:43:09 kls Exp $
+ * $Id: recorder.c 1.19 2007/02/24 16:36:24 kls Exp $
  */
 
 #include "recorder.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
+#include "shutdown.h"
 
 #define RECORDERBUFSIZE  MEGABYTE(5)
 
@@ -117,7 +118,7 @@ void cFileWriter::Action(void)
            }
         else if (time(NULL) - t > MAXBROKENTIMEOUT) {
            esyslog("ERROR: video data stream broken");
-           cThread::EmergencyExit(true);
+           ShutdownHandler.RequestEmergencyExit();
            t = time(NULL);
            }
         }
diff --git a/remote.c b/remote.c
index fa341846b..bbc73787c 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.55 2006/12/02 11:12:42 kls Exp $
+ * $Id: remote.c 1.56 2007/02/24 13:23:12 kls Exp $
  */
 
 #include "remote.h"
@@ -31,6 +31,7 @@ cMutex cRemote::mutex;
 cCondVar cRemote::keyPressed;
 const char *cRemote::keyMacroPlugin = NULL;
 const char *cRemote::callPlugin = NULL;
+time_t cRemote::lastActivity = 0;
 
 cRemote::cRemote(const char *Name)
 {
@@ -183,6 +184,7 @@ eKeys cRemote::Get(int WaitMs, char **UnknownCode)
             out = 0;
          if ((k & k_Repeat) != 0)
             repeatTimeout.Set(REPEATTIMEOUT);
+         lastActivity = time(NULL);
          return k;
          }
       else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut())
diff --git a/remote.h b/remote.h
index 03be5288e..fb3268978 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.38 2006/12/02 11:12:49 kls Exp $
+ * $Id: remote.h 1.39 2007/02/24 15:53:00 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -28,6 +28,7 @@ class cRemote : public cListObject {
   static char *unknownCode;
   static cMutex mutex;
   static cCondVar keyPressed;
+  static time_t lastActivity;
   static const char *keyMacroPlugin;
   static const char *callPlugin;
   char *name;
@@ -61,6 +62,8 @@ class cRemote : public cListObject {
       ///< plugin name will be reset to NULL by this call.
   static bool HasKeys(void);
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
+  static time_t LastActivity(void) { return lastActivity; }
+      ///< Absolute time when last key was delivered by Get().
   };
 
 class cRemotes : public cList<cRemote> {};
diff --git a/remux.c b/remux.c
index da805b76a..ccc5b00d5 100644
--- a/remux.c
+++ b/remux.c
@@ -11,13 +11,13 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.57 2006/12/01 14:46:25 kls Exp $
+ * $Id: remux.c 1.58 2007/02/24 16:36:10 kls Exp $
  */
 
 #include "remux.h"
 #include <stdlib.h>
 #include "channels.h"
-#include "thread.h"
+#include "shutdown.h"
 #include "tools.h"
 
 ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
@@ -2011,7 +2011,7 @@ int cRemux::Put(const uchar *Data, int Count)
         esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
         skipped = -1;
         if (exitOnFailure)
-           cThread::EmergencyExit(true);
+           ShutdownHandler.RequestEmergencyExit();
         }
      else
         skipped += used;
@@ -2059,7 +2059,7 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
                   if (pt < I_FRAME || B_FRAME < pt) {
                      esyslog("ERROR: unknown picture type '%d'", pt);
                      if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure)
-                        cThread::EmergencyExit(true);
+                        ShutdownHandler.RequestEmergencyExit();
                      }
                   else if (!synced) {
                      if (pt == I_FRAME) {
diff --git a/shutdown.c b/shutdown.c
new file mode 100644
index 000000000..4029a78c1
--- /dev/null
+++ b/shutdown.c
@@ -0,0 +1,250 @@
+/*
+ * shutdown.c: Handling of shutdown and inactivity
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version written by Udo Richter <udo_richter@gmx.de>.
+ *
+ * $Id: shutdown.c 1.1 2007/02/24 17:24:11 kls Exp $
+ */
+
+#include "shutdown.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include "channels.h"
+#include "config.h"
+#include "cutter.h"
+#include "i18n.h"
+#include "interface.h"
+#include "menu.h"
+#include "plugin.h"
+#include "timers.h"
+#include "tools.h"
+
+cShutdownHandler ShutdownHandler;
+
+cCountdown::cCountdown(void)
+{
+  timeout = 0;
+  counter = 0;
+  timedOut = false;
+  message = NULL;
+}
+
+void cCountdown::Start(const char *Message, int Seconds)
+{
+  timeout = time(NULL) + Seconds;
+  counter = -1;
+  timedOut = false;
+  message = Message;
+  Update();
+}
+
+void cCountdown::Cancel(void)
+{
+  if (timeout) {
+     timeout = 0;
+     timedOut = false;
+     Skins.Message(mtStatus, NULL);
+     }
+}
+
+bool cCountdown::Done(void)
+{
+  if (timedOut) {
+     Cancel();
+     return true;
+     }
+  return false;
+}
+
+bool cCountdown::Update(void)
+{
+  if (timeout) {
+     int NewCounter = (timeout - time(NULL) + 9) / 10;
+     if (NewCounter <= 0)
+        timedOut = true;
+     if (counter != NewCounter) {
+        counter = NewCounter;
+        char time[10];
+        snprintf(time, sizeof(time), "%d:%d0", counter > 0 ? counter / 6 : 0, counter > 0 ? counter % 6 : 0);
+        cString Message = cString::sprintf(message, time);
+        Skins.Message(mtStatus, Message);
+        return true;
+        }
+     }
+  return false;
+}
+
+cShutdownHandler::cShutdownHandler(void)
+{
+  activeTimeout = 0;
+  retry = 0;
+  shutdownCommand = NULL;
+  exitCode = -1;
+  emergencyExitRequested = false;
+}
+
+cShutdownHandler::~cShutdownHandler()
+{
+  free(shutdownCommand);
+}
+
+void cShutdownHandler::RequestEmergencyExit(void)
+{
+  esyslog("initiating emergency exit");
+  emergencyExitRequested = true;
+  Exit(1);
+}
+
+void cShutdownHandler::CheckManualStart(int ManualStart)
+{
+  time_t Delta = Setup.NextWakeupTime ? Setup.NextWakeupTime - time(NULL) : 0;
+
+  if (!Setup.NextWakeupTime || abs(Delta) > ManualStart) {
+     // Apparently the user started VDR manually
+     dsyslog("assuming manual start of VDR");
+     // Set inactive after MinUserInactivity
+     SetUserInactiveTimeout();
+     }
+  else
+     // Set inactive from now on
+     SetUserInactive();
+}
+
+void cShutdownHandler::SetShutdownCommand(const char *ShutdownCommand)
+{
+  free(shutdownCommand);
+  shutdownCommand = ShutdownCommand ? strdup(ShutdownCommand) : NULL;
+}
+
+void cShutdownHandler::CallShutdownCommand(time_t WakeupTime, int Channel, const char *File, bool UserShutdown)
+{
+  time_t Delta = WakeupTime ? WakeupTime - time(NULL) : 0;
+  cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\"$"), UserShutdown);
+  isyslog("executing '%s'", *cmd);
+  if (SystemExec(cmd, true) == 0)
+     Setup.NextWakeupTime = WakeupTime; // Remember this wakeup time for comparison on reboot
+}
+
+void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force)
+{
+  if (!Setup.MinUserInactivity && !Force) {
+     activeTimeout = 0;
+     return;
+     }
+  if (Seconds < 0)
+     Seconds = Setup.MinUserInactivity * 60;
+  activeTimeout = time(NULL) + Seconds;
+}
+
+bool cShutdownHandler::ConfirmShutdown(bool Interactive)
+{
+  if (!shutdownCommand) {
+     if (Interactive)
+        Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
+     return false;
+     }
+  if (cCutter::Active()) {
+     if (!Interactive || !Interface->Confirm(tr("Editing - shut down anyway?")))
+        return false;
+     }
+
+  cTimer *timer = Timers.GetNextActiveTimer();
+  time_t Next = timer ? timer->StartTime() : 0;
+  time_t Delta = timer ? Next - time(NULL) : 0;
+
+  if (cRecordControls::Active() || (Next && Delta <= 0)) {
+     // VPS recordings in timer end margin may cause Delta <= 0
+     if (!Interactive || !Interface->Confirm(tr("Recording - shut down anyway?")))
+        return false;
+     }
+  else if (Next && Delta <= Setup.MinEventTimeout * 60) {
+     // Timer within Min Event Timeout
+     if (!Interactive)
+        return false;
+     cString buf = cString::sprintf(tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
+     if (!Interface->Confirm(buf))
+        return false;
+     }
+
+  if (cPluginManager::Active(Interactive ? tr("shut down anyway?") : NULL))
+     return false;
+
+  cPlugin *Plugin = cPluginManager::GetNextWakeupPlugin();
+  Next = Plugin ? Plugin->WakeupTime() : 0;
+  Delta = Next ? Next - time(NULL) : 0;
+  if (Next && Delta <= Setup.MinEventTimeout * 60) {
+     // Plugin wakeup within Min Event Timeout
+     if (!Interactive)
+        return false;
+     cString buf = cString::sprintf(tr("Plugin %s wakes up in %ld min, continue?"), Plugin->Name(), Delta / 60);
+     if (!Interface->Confirm(buf))
+        return false;
+     }
+
+  return true;
+}
+
+bool cShutdownHandler::ConfirmRestart(bool Interactive)
+{
+  if (cCutter::Active()) {
+     if (!Interactive || !Interface->Confirm(tr("Editing - restart anyway?")))
+        return false;
+     }
+
+  cTimer *timer = Timers.GetNextActiveTimer();
+  time_t Next  = timer ? timer->StartTime() : 0;
+  time_t Delta = timer ? Next - time(NULL) : 0;
+
+  if (cRecordControls::Active() || (Next && Delta <= 0)) {
+     // VPS recordings in timer end margin may cause Delta <= 0
+     if (!Interactive || !Interface->Confirm(tr("Recording - restart anyway?")))
+        return false;
+     }
+
+  if (cPluginManager::Active(Interactive ? tr("restart anyway?") : NULL))
+     return false;
+
+  return true;
+}
+
+bool cShutdownHandler::DoShutdown(bool Force)
+{
+  time_t Now = time(NULL);
+  cTimer *timer = Timers.GetNextActiveTimer();
+  cPlugin *Plugin = cPluginManager::GetNextWakeupPlugin();
+
+  time_t Next = timer ? timer->StartTime() : 0;
+  time_t NextPlugin = Plugin ? Plugin->WakeupTime() : 0;
+  if (NextPlugin && (!Next || Next > NextPlugin)) {
+     Next = NextPlugin;
+     timer = NULL;
+     }
+  time_t Delta = Next ? Next - Now : 0;
+
+  if (Next && Delta < Setup.MinEventTimeout * 60) {
+     if (!Force)
+        return false;
+     Delta = Setup.MinEventTimeout * 60;
+     Next = Now + Delta;
+     timer = NULL;
+     dsyslog("reboot at %s", *TimeToString(Next));
+     }
+
+  if (Next && timer) {
+     dsyslog("next timer event at %s", *TimeToString(Next));
+     CallShutdownCommand(Next, timer->Channel()->Number(), timer->File(), Force);
+     }
+  else if (Next && Plugin) {
+     CallShutdownCommand(Next, 0, Plugin->Name(), Force);
+     dsyslog("next plugin wakeup at %s", *TimeToString(Next));
+     }
+  else
+     CallShutdownCommand(Next, 0, "", Force); // Next should always be 0 here. Just for safety, pass it.
+
+  return true;
+}
diff --git a/shutdown.h b/shutdown.h
new file mode 100644
index 000000000..4dff8eabf
--- /dev/null
+++ b/shutdown.h
@@ -0,0 +1,112 @@
+/*
+ * shutdown.h: Handling of shutdown and inactivity
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version written by Udo Richter <udo_richter@gmx.de>.
+ *
+ * $Id: shutdown.h 1.1 2007/02/24 17:23:59 kls Exp $
+ */
+
+#ifndef __SHUTDOWN_H
+#define __SHUTDOWN_H
+
+#include <time.h>
+
+class cCountdown {
+private:
+  time_t timeout;      ///< 5-minute countdown timer
+  int counter;         ///< last shown time in 10s units
+  bool timedOut;       ///< countdown did run down to 0 and was not canceled
+  const char *message; ///< message to display, %s is placeholder for time
+public:
+  cCountdown(void);
+  void Start(const char *Message, int Seconds);
+       ///< Start the 5 minute shutdown warning countdown.
+  void Cancel(void);
+       ///< Cancel the 5 minute shutdown warning countdown.
+  bool Done(void);
+       ///< Check if countdown timer has run out without canceling.
+  operator bool(void) const { return timeout != 0; }
+       ///< Check if countdown is running.
+  bool Update(void);
+       ///< Update status display of the countdown.
+       ///< Returns true on actual update.
+  };
+
+class cShutdownHandler {
+private:
+  time_t activeTimeout;
+       ///< Time when VDR will become non-interactive. 0 means never.
+  time_t retry;
+       ///< Time for retrying the shutdown.
+  char *shutdownCommand;
+       ///< Command for shutting down VDR.
+  int exitCode;
+       ///< Exit code, if VDR exit was requested, or -1 if not requested.
+  bool emergencyExitRequested;
+       ///< The requested exit is an emergency exit.
+public:
+  cCountdown countdown;
+  cShutdownHandler(void);
+  ~cShutdownHandler();
+  void Exit(int ExitCode) { exitCode = ExitCode; }
+       ///< Set VDR exit code and initiate end of VDR main loop.
+       ///< This will exit VDR without any confirmation.
+  bool DoExit(void) { return exitCode >= 0; }
+       ///< Check if an exit code was set, and VDR should exit.
+  int GetExitCode(void) { return exitCode >= 0 ? exitCode : 0; }
+       ///< Get the currently set exit code of VDR.
+  bool EmergencyExitRequested(void) { return emergencyExitRequested; }
+       ///< Returns true if an emergency exit was requested.
+  void RequestEmergencyExit(void);
+       ///< Requests an emergency exit of the VDR main loop.
+  void CheckManualStart(int ManualStart);
+       ///< Check whether the next timer is in ManualStart time window.
+       ///< If yes, assume non-interactive use.
+  void SetShutdownCommand(const char *ShutdownCommand);
+       ///< Set the command string for shutdown command.
+  void CallShutdownCommand(time_t WakeupTime, int Channel, const char *File, bool UserShutdown);
+       ///< Call the shutdown command with the given parameters.
+  bool IsUserInactive(time_t AtTime = 0) { return activeTimeout && activeTimeout <= (AtTime ? AtTime : time(NULL)); }
+       ///< Check whether VDR is in interactive mode or non-interactive mode (waiting for shutdown).
+       ///< AtTime checks whether VDR will probably be inactive at that time.
+  time_t GetUserInactiveTime(void) { return activeTimeout; }
+       ///< Time when user will become non-inactive, or 0 if never.
+  void SetUserInactiveTimeout(int Seconds = -1, bool Force = false);
+       ///< Set the time when VDR will switch into non-interactive mode or power down.
+       ///< -1 means Setup.MinUserInactivity in the future.
+       ///< Otherwise, seconds in the future.
+       ///< If MinUserInactivity = 0 and Force = false, Seconds is ignored and VDR will
+       ///< stay interactive forever.
+  void SetUserInactive(void) { SetUserInactiveTimeout(0, true); }
+       ///< Set VDR manually into non-interactive mode.
+  bool Retry(time_t AtTime = 0) { return retry <= (AtTime ? AtTime : time(NULL)); }
+       ///< Check whether its time to re-try the shutdown.
+       ///< AtTime checks whether VDR will probably be inactive at that time.
+  time_t GetRetry(void) { return retry; }
+       ///< Time when shutdown retry block ends.
+  void SetRetry(int Seconds) { retry = time(NULL) + Seconds; }
+       ///< Set shutdown retry so that VDR will not try to automatically shut down
+       ///< within Seconds.
+  bool ConfirmShutdown(bool Ask);
+       ///< Check for background activity that blocks shutdown.
+       ///< Returns immediately and without user interaction if Ask = false.
+       ///< Asks for confirmation if Ask = true.
+       ///< Returns true if ready for shutdown.
+  bool ConfirmRestart(bool Ask);
+       ///< Check for background activity that blocks restart.
+       ///< Returns immediately and without user interaction if Ask = false.
+       ///< Asks for confirmation if Ask = true.
+       ///< Returns true if ready for restart.
+  bool DoShutdown(bool Force);
+       ///< Call the shutdown script with data of the next pending timer.
+       ///< Fails if Force = false and a timer is running or within MinEventTimeout.
+       ///< Always calls shutdown on Force = true.
+       ///< Returns true on success.
+  };
+
+extern cShutdownHandler ShutdownHandler;
+
+#endif
diff --git a/sources.conf b/sources.conf
index 81e5171cf..7cc105e40 100644
--- a/sources.conf
+++ b/sources.conf
@@ -38,7 +38,7 @@ S38E    Paksat 1
 S39E    Hellas Sat 2
 S40E    Express AM1
 S42E    Turksat 1C/2A
-S45E    PAS 12
+S45E    Intelsat 12
 S49E    Yamal 202
 S53E    Express AM 22
 S55E    Insat 3E & Intelsat 702
@@ -48,9 +48,9 @@ S60E    Intelsat 904
 S62E    Intelsat 902
 S64E    Intelsat 906
 S66E    Intelsat 704
-S68.5E  PAS 7/10
+S68.5E  Intelsat 7/10
 S70.5E  Eutelsat W5
-S72E    PAS 4
+S72E    Intelsat 4
 
 # Asia
 
@@ -98,8 +98,8 @@ S158E   Superbird A
 S160E   Optus B1
 S162E   Superbird B2
 S164E   Optus A3
-S166E   PAS 8
-S169E   PAS 2
+S166E   Intelsat 8
+S169E   Intelsat 2
 S172E   AMC 23
 S180E   Intelsat 701
 S177W   NSS 5
@@ -125,12 +125,12 @@ S31.5W  Intelsat 801
 S34.5W  Intelsat 903
 S37.5W  Telstar 11 & AMC 12
 S40.5W  NSS 806
-S43W    PAS 3R/6B
-S45W    PAS 1R
+S43W    Intelsat 3R/6B
+S45W    Intelsat 1R
 S50W    Intelsat 705
 S53W    Intelsat 707
 S55.5W  Intelsat 805
-S58W    PAS 9
+S58W    Intelsat 9
 S61W    Amazonas
 
 # America
@@ -151,13 +151,13 @@ S84W    Brasilsat B3
 S85W    AMC 2
 S85.1W  XM 3
 S87W    AMC3
-S89W    Intelsat Americas 8
+S89W    Galaxy 28
 S91W    Galaxy 11 & Nimiq 1
 S91.5W  DirecTV 2
 S92W    Brasilsat B4
-S93W    Intelsat Americas 6
+S93W    Galaxy 26
 S95W    Galaxy 3C
-S97W    Intelsat Americas 5
+S97W    Galaxy 25
 S99W    Galaxy 4R
 S99.2W  Spaceway 2
 S101W   DirecTV 1R/4S/8 & AMC4
@@ -168,11 +168,11 @@ S110W   DirecTV 5 & Echostar 6/8/10
 S111.1W Anik F2
 S113W   Solidaridad 2
 S119W   Echostar 7 & DirecTV 7S
-S121W   Echostar 9 & Intelsat Americas 13
+S121W   Echostar 9 & Galaxy 23
 S123W   Galaxy 10R
 S125W   Galaxy 14
 S127W   Galaxy 13/Horizons 1
-S129W   Echostar 5 & Intelsat Americas 7
+S129W   Echostar 5 & Galaxy 27
 S131W   AMC 11
 S133W   Galaxy15/1R
 S135W   AMC 10
diff --git a/thread.c b/thread.c
index d2debefd3..8882252a1 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.59 2007/01/05 10:44:22 kls Exp $
+ * $Id: thread.c 1.60 2007/02/24 16:13:33 kls Exp $
  */
 
 #include "thread.h"
@@ -200,7 +200,6 @@ void cMutex::Unlock(void)
 // --- cThread ---------------------------------------------------------------
 
 tThreadId cThread::mainThreadId = 0;
-bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(const char *Description)
 {
@@ -320,14 +319,6 @@ void cThread::Cancel(int WaitSeconds)
      }
 }
 
-bool cThread::EmergencyExit(bool Request)
-{
-  if (!Request)
-     return emergencyExitRequested;
-  esyslog("initiating emergency exit");
-  return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
-}
-
 tThreadId cThread::ThreadId(void)
 {
   return syscall(__NR_gettid);
@@ -505,7 +496,7 @@ int cPipe::Close(void)
 
 // --- SystemExec ------------------------------------------------------------
 
-int SystemExec(const char *Command)
+int SystemExec(const char *Command, bool Detached)
 {
   pid_t pid;
 
@@ -515,14 +506,24 @@ int SystemExec(const char *Command)
      }
 
   if (pid > 0) { // parent process
-     int status;
-     if (waitpid(pid, &status, 0) < 0) {
+     int status = 0;
+     if (!Detached && waitpid(pid, &status, 0) < 0) {
         LOG_ERROR;
         return -1;
         }
      return status;
      }
   else { // child process
+     if (Detached) {
+        // Start a new session
+        pid_t sid = setsid();
+        if (sid < 0)
+           LOG_ERROR;
+        // close STDIN and re-open as /dev/null
+        int devnull = open("/dev/null", O_RDONLY);
+        if (devnull < 0 || dup2(devnull, 0) < 0)
+           LOG_ERROR;
+        }
      int MaxPossibleFileDescriptors = getdtablesize();
      for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
          close(i); //close all dup'ed filedescriptors
diff --git a/thread.h b/thread.h
index be21c19fb..6eaa79a7b 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.38 2007/01/05 10:44:38 kls Exp $
+ * $Id: thread.h 1.39 2007/02/24 16:13:28 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -84,7 +84,6 @@ class cThread {
   cMutex mutex;
   char *description;
   static tThreadId mainThreadId;
-  static bool emergencyExitRequested;
   static void *StartThread(cThread *Thread);
 protected:
   void SetPriority(int Priority);
@@ -118,7 +117,6 @@ class cThread {
        ///< If the thread is already running, nothing happens.
   bool Active(void);
        ///< Checks whether the thread is still alive.
-  static bool EmergencyExit(bool Request = false);
   static tThreadId ThreadId(void);
   static tThreadId IsMainThread(void) { return ThreadId() == mainThreadId; }
   static void SetMainThreadId(void);
@@ -175,7 +173,9 @@ class cPipe {
 
 // SystemExec() implements a 'system()' call that closes all unnecessary file
 // descriptors in the child process.
+// With Detached=true, calls command in background and in a separate session,
+// with stdin connected to /dev/null.
 
-int SystemExec(const char *Command);
+int SystemExec(const char *Command, bool Detached = false);
 
 #endif //__THREAD_H
diff --git a/vdr.1 b/vdr.1
index 5d2aa90ce..1fa653928 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.28 2007/01/07 14:03:56 kls Exp $
+.\" $Id: vdr.1 1.29 2007/02/24 17:40:20 kls Exp $
 .\"
 .TH vdr 1 "07 Jan 2007" "1.4.5" "Video Disk Recorder"
 .SH NAME
@@ -153,6 +153,14 @@ Print version information and exit.
 .BI \-w\  sec ,\ \-\-watchdog= sec
 Activate the watchdog timer with a timeout of \fIsec\fR seconds.
 A value of \fB0\fR (default) disables the watchdog.
+.SH SIGNALS
+.TP
+.B SIGINT, SIGTERM
+Program exits with status 0.
+.TP
+.B SIGHUP
+Program exits with status 1. This can be used to force a reload, for example
+if an update has been installed.
 .SH EXIT STATUS
 .TP
 .B 0
diff --git a/vdr.c b/vdr.c
index ae845f54b..001a7cb1c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.283 2007/01/05 10:46:14 kls Exp $
+ * $Id: vdr.c 1.285 2007/02/25 11:27:36 kls Exp $
  */
 
 #include <getopt.h>
@@ -54,6 +54,7 @@
 #include "plugin.h"
 #include "rcu.h"
 #include "recording.h"
+#include "shutdown.h"
 #include "skinclassic.h"
 #include "skinsttng.h"
 #include "sources.h"
@@ -66,20 +67,23 @@
 #define MINCHANNELWAIT     10 // seconds to wait between failed channel switchings
 #define ACTIVITYTIMEOUT    60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT      300 // seconds to wait in user prompt before automatic shutdown
+#define SHUTDOWNRETRY     360 // seconds before trying again to shut down
+#define SHUTDOWNFORCEPROMPT 5 // seconds to wait in user prompt to allow forcing shutdown
+#define SHUTDOWNCANCELROMPT 5 // seconds to wait in user prompt to allow canceling shutdown
+#define RESTARTCANCELPROMPT 5 // seconds to wait in user prompt before restarting on SIGHUP
 #define MANUALSTART       600 // seconds the next timer must be in the future to assume manual start
 #define CHANNELSAVEDELTA  600 // seconds before saving channels.conf after automatic modifications
 #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
 #define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
-#define SHUTDOWNRETRY     300 // seconds before trying again to shut down
 #define TIMERCHECKDELTA    10 // seconds between checks for timers that need to see their channel
 #define TIMERDEVICETIMEOUT  8 // seconds before a device used for timer check may be reused
 #define TIMERLOOKAHEADTIME 60 // seconds before a non-VPS timer starts and the channel is switched if possible
 #define VPSLOOKAHEADTIME   24 // hours within which VPS timers will make sure their events are up to date
 #define VPSUPTODATETIME  3600 // seconds before the event or schedule of a VPS timer needs to be refreshed
 
-#define EXIT(v) { ExitCode = (v); goto Exit; }
+#define EXIT(v) { ShutdownHandler.Exit(v); goto Exit; }
 
-static int Interrupted = 0;
+static int LastSignal = 0;
 
 static bool SetUser(const char *UserName)
 {
@@ -138,10 +142,18 @@ static bool SetKeepCaps(bool On)
 
 static void SignalHandler(int signum)
 {
-  if (signum != SIGPIPE) {
-     Interrupted = signum;
-     Interface->Interrupt();
-     }
+  isyslog("caught signal %d", signum);
+  switch (signum) {
+    case SIGPIPE:
+         break;
+    case SIGHUP:
+         LastSignal = signum;
+         break;
+    default:
+         LastSignal = signum;
+         Interface->Interrupt();
+         ShutdownHandler.Exit(0);
+    }
   signal(signum, SignalHandler);
 }
 
@@ -184,7 +196,6 @@ int main(int argc, char *argv[])
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
-  const char *Shutdown = NULL;
 
   bool UseKbd = true;
   const char *LircDevice = NULL;
@@ -205,7 +216,6 @@ int main(int argc, char *argv[])
 #endif
 
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
-  int ExitCode = 0;
 
   static struct option long_options[] = {
       { "audio",    required_argument, NULL, 'a' },
@@ -313,7 +323,7 @@ int main(int argc, char *argv[])
                     break;
           case 'r': cRecordingUserCommand::SetCommand(optarg);
                     break;
-          case 's': Shutdown = optarg;
+          case 's': ShutdownHandler.SetShutdownCommand(optarg);
                     break;
           case 't': Terminal = optarg;
                     if (access(Terminal, R_OK | W_OK) < 0) {
@@ -498,10 +508,7 @@ int main(int argc, char *argv[])
   int PreviousChannel[2] = { 1, 1 };
   int PreviousChannelIndex = 0;
   time_t LastChannelChanged = time(NULL);
-  time_t LastActivity = 0;
   int MaxLatencyTime = 0;
-  bool ForceShutdown = false;
-  bool UserShutdown = false;
   bool InhibitEpgScan = false;
   bool IsInfoMenu = false;
   cSkin *CurrentSkin = NULL;
@@ -596,6 +603,10 @@ int main(int argc, char *argv[])
         }
      }
 
+  // Check for timers in automatic start time window:
+
+  ShutdownHandler.CheckManualStart(MANUALSTART);
+
   // User interface:
 
   Interface = new cInterface(SVDRPport);
@@ -668,12 +679,7 @@ int main(int argc, char *argv[])
 
 #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
 
-  while (!Interrupted) {
-        // Handle emergency exits:
-        if (cThread::EmergencyExit()) {
-           esyslog("emergency exit requested - shutting down");
-           break;
-           }
+  while (!ShutdownHandler.DoExit()) {
 #ifdef DEBUGRINGBUFFERS
         cRingBufferLinear::PrintDebugRBL();
 #endif
@@ -856,9 +862,13 @@ int main(int argc, char *argv[])
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
         eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
-        if (NORMALKEY(key) != kNone) {
+        if (ISREALKEY(key)) {
            EITScanner.Activity();
-           LastActivity = time(NULL);
+           // Cancel shutdown countdown:
+           if (ShutdownHandler.countdown)
+              ShutdownHandler.countdown.Cancel();
+           // Set user active for MinUserInactivity time in the future:
+           ShutdownHandler.SetUserInactiveTimeout();
            }
         // Keys that must work independent of any interactive mode:
         switch (key) {
@@ -875,7 +885,7 @@ int main(int argc, char *argv[])
                   else
                      WasOpen = false;
                   }
-               if (!WasOpen || !WasMenu && !Setup.MenuButtonCloses)
+               if (!WasOpen || !WasMenu && !Setup.MenuKeyCloses)
                   Menu = new cMenuMain;
                }
                break;
@@ -996,37 +1006,32 @@ int main(int argc, char *argv[])
                   }
                break;
           // Power off:
-          case kPower: {
+          case kPower:
                isyslog("Power button pressed");
                DELETE_MENU;
-               if (!Shutdown) {
-                  Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
+               // Check for activity, request power button again if active:
+               if (!ShutdownHandler.ConfirmShutdown(false) && Skins.Message(mtWarning, tr("VDR will shut down later - press Power to force"), SHUTDOWNFORCEPROMPT) != kPower) {
+                  // Not pressed power - set VDR to be non-interactive and power down later:
+                  ShutdownHandler.SetUserInactive();
                   break;
                   }
-               LastActivity = 1; // not 0, see below!
-               UserShutdown = true;
-               if (cRecordControls::Active()) {
-                  if (!Interface->Confirm(tr("Recording - shut down anyway?")))
-                     break;
-                  }
-               if (cPluginManager::Active(tr("shut down anyway?")))
+               // No activity or power button pressed twice - ask for confirmation:
+               if (!ShutdownHandler.ConfirmShutdown(true)) {
+                  // Non-confirmed background activity - set VDR to be non-interactive and power down later:
+                  ShutdownHandler.SetUserInactive();
                   break;
-               if (!cRecordControls::Active()) {
-                  cTimer *timer = Timers.GetNextActiveTimer();
-                  time_t Next  = timer ? timer->StartTime() : 0;
-                  time_t Delta = timer ? Next - time(NULL) : 0;
-                  if (Next && Delta <= Setup.MinEventTimeout * 60) {
-                     char *buf;
-                     asprintf(&buf, tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
-                     bool confirm = Interface->Confirm(buf);
-                     free(buf);
-                     if (!confirm)
-                        break;
-                     }
                   }
-               ForceShutdown = true;
+               // Ask the final question:
+               if (!Interface->Confirm(tr("Press any key to cancel shutdown"), SHUTDOWNCANCELROMPT, true))
+                  // If final question was canceled, continue to be active:
+                  break;
+               // Ok, now call the shutdown script:
+               ShutdownHandler.DoShutdown(true);
+               // Set VDR to be non-interactive and power down again later:
+               ShutdownHandler.SetUserInactive();
+               // Do not attempt to automatically shut down for a while:
+               ShutdownHandler.SetRetry(SHUTDOWNRETRY);
                break;
-               }
           default: break;
           }
         Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
@@ -1041,7 +1046,7 @@ int main(int argc, char *argv[])
                     continue;
                     }
                  }
-              else if (time(NULL) - LastActivity > MENUTIMEOUT)
+              else if (time(NULL) - cRemote::LastActivity() > MENUTIMEOUT)
                  state = osEnd;
               }
            switch (state) {
@@ -1143,77 +1148,55 @@ int main(int argc, char *argv[])
                  Skins.Message(mtInfo, tr("Editing process finished"));
               }
            }
-        if (!Interact && ((!cRecordControls::Active() && !cCutter::Active() && (!Interface->HasSVDRPConnection() || UserShutdown)) || ForceShutdown)) {
-           time_t Now = time(NULL);
-           if (Now - LastActivity > ACTIVITYTIMEOUT) {
-              // Shutdown:
-              if (Shutdown && (Setup.MinUserInactivity || LastActivity == 1) && Now - LastActivity > Setup.MinUserInactivity * 60) {
-                 cTimer *timer = Timers.GetNextActiveTimer();
-                 time_t Next  = timer ? timer->StartTime() : 0;
-                 time_t Delta = timer ? Next - Now : 0;
-                 if (!LastActivity) {
-                    if (!timer || Delta > MANUALSTART) {
-                       // Apparently the user started VDR manually
-                       dsyslog("assuming manual start of VDR");
-                       LastActivity = Now;
-                       continue; // don't run into the actual shutdown procedure below
-                       }
-                    else
-                       LastActivity = 1;
-                    }
-                 if (timer && Delta < Setup.MinEventTimeout * 60 && ForceShutdown) {
-                    Delta = Setup.MinEventTimeout * 60;
-                    Next = Now + Delta;
-                    timer = NULL;
-                    dsyslog("reboot at %s", *TimeToString(Next));
-                    }
-                 if (!ForceShutdown && cPluginManager::Active()) {
-                    LastActivity = Now - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
-                    continue;
-                    }
-                 if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
-                    ForceShutdown = false;
-                    if (timer)
-                       dsyslog("next timer event at %s", *TimeToString(Next));
-                    if (WatchdogTimeout > 0)
-                       signal(SIGALRM, SIG_IGN);
-                    if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
-                       cControl::Shutdown();
-                       int Channel = timer ? timer->Channel()->Number() : 0;
-                       const char *File = timer ? timer->File() : "";
-                       if (timer)
-                          Delta = Next - time(NULL); // compensates for Confirm() timeout
-                       char *cmd;
-                       asprintf(&cmd, "%s %ld %ld %d \"%s\" %d", Shutdown, Next, Delta, Channel, *strescape(File, "\"$"), UserShutdown);
-                       isyslog("executing '%s'", cmd);
-                       SystemExec(cmd);
-                       free(cmd);
-                       LastActivity = time(NULL) - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
-                       }
-                    else {
-                      LastActivity = Now;
-                      if (WatchdogTimeout > 0) {
-                         alarm(WatchdogTimeout);
-                         if (signal(SIGALRM, Watchdog) == SIG_IGN)
-                            signal(SIGALRM, SIG_IGN);
-                         }
-                      }
-                    UserShutdown = false;
-                    continue; // skip the rest of the housekeeping for now
-                    }
-                 }
-              // Disk housekeeping:
-              RemoveDeletedRecordings();
-              cSchedules::Cleanup();
-              // Plugins housekeeping:
-              PluginManager.Housekeeping();
+
+        // SIGHUP shall cause a restart:
+        if (LastSignal == SIGHUP) {
+           if (ShutdownHandler.ConfirmRestart(true) && Interface->Confirm(tr("Press any key to cancel restart"), RESTARTCANCELPROMPT, true))
+              EXIT(1);
+           LastSignal = 0;
+           }
+
+        // Update the shutdown countdown:
+        if (ShutdownHandler.countdown && ShutdownHandler.countdown.Update()) {
+           if (!ShutdownHandler.ConfirmShutdown(false))
+              ShutdownHandler.countdown.Cancel();
+           }
+
+        if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && cRemote::LastActivity() > ACTIVITYTIMEOUT) {
+           // Handle housekeeping tasks
+
+           // Shutdown:
+           // Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
+           time_t Soon = time(NULL) + SHUTDOWNWAIT;
+           if (ShutdownHandler.IsUserInactive(Soon) && ShutdownHandler.Retry(Soon) && !ShutdownHandler.countdown) {
+              if (ShutdownHandler.ConfirmShutdown(false))
+                 // Time to shut down - start final countdown:
+                 ShutdownHandler.countdown.Start(tr("VDR will shut down in %s minutes"), SHUTDOWNWAIT); // the placeholder is really %s!
+              // Dont try to shut down again for a while:
+              ShutdownHandler.SetRetry(SHUTDOWNRETRY);
               }
+           // Countdown run down to 0?
+           if (ShutdownHandler.countdown.Done()) {
+              // Timed out, now do a final check:
+              if (ShutdownHandler.IsUserInactive() && ShutdownHandler.ConfirmShutdown(false))
+                 ShutdownHandler.DoShutdown(false);
+              // Do this again a bit later:
+              ShutdownHandler.SetRetry(SHUTDOWNRETRY);
+              }
+
+           // Disk housekeeping:
+           RemoveDeletedRecordings();
+           cSchedules::Cleanup();
+           // Plugins housekeeping:
+           PluginManager.Housekeeping();
            }
+
         // Main thread hooks of plugins:
         PluginManager.MainThreadHook();
         }
-  if (Interrupted)
-     isyslog("caught signal %d", Interrupted);
+
+  if (ShutdownHandler.EmergencyExitRequested())
+     esyslog("emergency exit requested - shutting down");
 
 Exit:
 
@@ -1227,7 +1210,7 @@ int main(int argc, char *argv[])
   Remotes.Clear();
   Audios.Clear();
   Skins.Clear();
-  if (ExitCode != 2) {
+  if (ShutdownHandler.GetExitCode() != 2) {
      Setup.CurrentChannel = cDevice::CurrentChannel();
      Setup.CurrentVolume  = cDevice::CurrentVolume();
      Setup.Save();
@@ -1238,14 +1221,12 @@ int main(int argc, char *argv[])
   ReportEpgBugFixStats();
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
-  isyslog("exiting");
+  isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode());
+  if (ShutdownHandler.EmergencyExitRequested())
+     esyslog("emergency exit!");
   if (SysLogLevel > 0)
      closelog();
   if (HasStdin)
      tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
-  if (cThread::EmergencyExit()) {
-     esyslog("emergency exit!");
-     return 1;
-     }
-  return ExitCode;
+  return ShutdownHandler.GetExitCode();
 }

From a5921252942f73601b159f20b560477ec45b4ece Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 22 Apr 2007 18:00:00 +0200
Subject: [PATCH 168/307] =?UTF-8?q?Version=201.5.2=20-=20Updated=20the=20F?=
 =?UTF-8?q?innish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20?=
 =?UTF-8?q?Fixed=20handling=20user=20activity=20for=20shutdown,=20which=20?=
 =?UTF-8?q?I=20had=20messed=20when=20adopting=20Udo's=20=20=20original=20p?=
 =?UTF-8?q?atch=20(thanks=20to=20Udo=20Richter).=20-=20Added=20Turkish=20l?=
 =?UTF-8?q?anguage=20texts=20(thanks=20to=20Oktay=20Yolge=C3=A7en).=20-=20?=
 =?UTF-8?q?Added=20missing=20rules=20for=20generating=20iso8859-13=20font?=
 =?UTF-8?q?=20to=20Makefile.=20-=20'libsi'=20now=20converts=20the=20incomi?=
 =?UTF-8?q?ng=20strings=20into=20the=20system's=20character=20set=20=20=20?=
 =?UTF-8?q?according=20to=20the=20DVB=20standard.=20The=20system's=20chara?=
 =?UTF-8?q?cter=20set=20is=20determined=20from=20=20=20the=20LANG=20enviro?=
 =?UTF-8?q?nment=20variable.=20If=20no=20recognizable=20setting=20can=20be?=
 =?UTF-8?q?=20found,=20no=20=20=20conversion=20will=20take=20place.=20Note?=
 =?UTF-8?q?=20that=20currently=20only=20the=20strings=20received=20from=20?=
 =?UTF-8?q?the=20=20=20SI=20data=20stream=20are=20converted,=20there=20hav?=
 =?UTF-8?q?e=20not=20been=20any=20changes=20regarding=20displaying=20=20?=
 =?UTF-8?q?=20UTF-8=20characters=20on=20the=20OSD,=20yet=20-=20this=20will?=
 =?UTF-8?q?=20follow=20in=20one=20of=20the=20next=20steps.=20=20=20With=20?=
 =?UTF-8?q?this=20conversion,=20it=20should=20now=20be=20safe=20to=20run?=
 =?UTF-8?q?=20VDR=20on=20a=20UTF-8=20file=20system,=20=20=20because=20all?=
 =?UTF-8?q?=20incoming=20characters=20are=20converted=20to=20UTF-8.=20This?=
 =?UTF-8?q?=20will=20most=20likely=20=20=20result=20in=20wrong=20character?=
 =?UTF-8?q?s=20being=20displayed=20on=20the=20OSD=20(because=20there=20UTF?=
 =?UTF-8?q?-8=20is=20=20=20not=20known,=20yet),=20but=20the=20file=20names?=
 =?UTF-8?q?=20should=20be=20ok=20(haven't=20tested=20this=20myself,=20=20?=
 =?UTF-8?q?=20though,=20because=20I=20don't=20do=20UTF-8=20-=20so=20please?=
 =?UTF-8?q?=20be=20very=20careful=20when=20testing!).=20=20=20There's=20on?=
 =?UTF-8?q?e=20piece=20of=20bad=20news=20here:=20the=20German=20pay-tv=20b?=
 =?UTF-8?q?roadcaster=20Premiere=20=20=20apparently=20encodes=20all=20EPG?=
 =?UTF-8?q?=20strings=20as=20ISO8859-1,=20but=20fails=20to=20correctly=20m?=
 =?UTF-8?q?ark=20=20=20these=20strings=20as=20such.=20Therefore=20'libsi'?=
 =?UTF-8?q?=20(following=20the=20DVB=20standard)=20considers=20=20=20the?=
 =?UTF-8?q?=20strings=20to=20be=20encoded=20in=20the=20default=20ISO6937?=
 =?UTF-8?q?=20and=20converts=20them=20to=20whatever=20=20=20the=20system's?=
 =?UTF-8?q?=20character=20set=20is.=20This,=20of=20course,=20results=20in?=
 =?UTF-8?q?=20wrong=20umlauts.=20=20=20On=20its=20old=20transponder,=20the?=
 =?UTF-8?q?=20ProSieben/SAT.1=20channels=20also=20had=20their=20EPG=20data?=
 =?UTF-8?q?=20=20=20wrongly=20encoded,=20but=20apparently=20on=20the=20new?=
 =?UTF-8?q?=20transponder=20they=20started=20broadcasting=20=20=20on=20thi?=
 =?UTF-8?q?s=20month,=20they=20got=20it=20right.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS        |    3 +
 HISTORY             |   31 +
 Makefile            |   26 +-
 config.h            |    6 +-
 font.c              |    8 +-
 font.h              |    3 +-
 fontfix-iso8859-9.c | 6498 +++++++++++++++++++++++++++++++++++++++++
 fontosd-iso8859-9.c | 6722 +++++++++++++++++++++++++++++++++++++++++++
 fontsml-iso8859-9.c | 5602 ++++++++++++++++++++++++++++++++++++
 i18n.c              |  283 +-
 i18n.h              |    4 +-
 libsi/si.c          |  196 +-
 libsi/si.h          |    7 +-
 vdr.c               |   25 +-
 14 files changed, 19370 insertions(+), 44 deletions(-)
 create mode 100644 fontfix-iso8859-9.c
 create mode 100644 fontosd-iso8859-9.c
 create mode 100644 fontsml-iso8859-9.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d1c492f2e..d9afc84af 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2069,3 +2069,6 @@ Peter Pinnau <vdr@unterbrecher.de>
 Petri Helin <phelin@googlemail.com>
  for suggesting to avoid budget DVB cards with Common Interface when tuning to an
  FTA channel
+
+Oktay Yolge�en <oktay_73@yahoo.de>
+ for translating OSD texts to the Turkish language
diff --git a/HISTORY b/HISTORY
index bcc61aadc..3aa97f5f6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5099,6 +5099,10 @@ Video Disk Recorder Revision History
 - Fixed handling error status in cDvbTuner::GetFrontendStatus() (thanks to
   Reinhard Nissl).
 
+2007-03-03: Version 1.4.6
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+
 2007-02-25: Version 1.5.1
 
 - Added cDevice::HasCi() so that devices with Common Interface can be avoided
@@ -5134,3 +5138,30 @@ Video Disk Recorder Revision History
   complete, and the channel is switched (suggested by Helmut Auer). Setting this
   parameter to 0 turns off the automatic channel switching, and the user will
   have to confirm the entry by pressing the "Ok" key.
+
+2007-04-22: Version 1.5.2
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling user activity for shutdown, which I had messed when adopting Udo's
+  original patch (thanks to Udo Richter).
+- Added Turkish language texts (thanks to Oktay Yolge�en).
+- Added missing rules for generating iso8859-13 font to Makefile.
+- 'libsi' now converts the incoming strings into the system's character set
+  according to the DVB standard. The system's character set is determined from
+  the LANG environment variable. If no recognizable setting can be found, no
+  conversion will take place. Note that currently only the strings received from the
+  SI data stream are converted, there have not been any changes regarding displaying
+  UTF-8 characters on the OSD, yet - this will follow in one of the next steps.
+  With this conversion, it should now be safe to run VDR on a UTF-8 file system,
+  because all incoming characters are converted to UTF-8. This will most likely
+  result in wrong characters being displayed on the OSD (because there UTF-8 is
+  not known, yet), but the file names should be ok (haven't tested this myself,
+  though, because I don't do UTF-8 - so please be very careful when testing!).
+  There's one piece of bad news here: the German pay-tv broadcaster Premiere
+  apparently encodes all EPG strings as ISO8859-1, but fails to correctly mark
+  these strings as such. Therefore 'libsi' (following the DVB standard) considers
+  the strings to be encoded in the default ISO6937 and converts them to whatever
+  the system's character set is. This, of course, results in wrong umlauts.
+  On its old transponder, the ProSieben/SAT.1 channels also had their EPG data
+  wrongly encoded, but apparently on the new transponder they started broadcasting
+  on this month, they got it right.
diff --git a/Makefile b/Makefile
index c20c7f2c9..ea712d7e7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.97 2007/02/24 13:23:12 kls Exp $
+# $Id: Makefile 1.99 2007/03/11 10:22:18 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -55,6 +55,14 @@ FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
 OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
 SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
 
+FIXFONT_ISO8859_9 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-9
+OSDFONT_ISO8859_9 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-9
+SMLFONT_ISO8859_9 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-9
+
+FIXFONT_ISO8859_13 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-13
+OSDFONT_ISO8859_13 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-13
+SMLFONT_ISO8859_13 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-13
+
 FIXFONT_ISO8859_15 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-15
 OSDFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-15
 SMLFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-15
@@ -95,6 +103,8 @@ font: genfontfile\
       fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
       fontfix-iso8859-5.c fontosd-iso8859-5.c fontsml-iso8859-5.c\
       fontfix-iso8859-7.c fontosd-iso8859-7.c fontsml-iso8859-7.c\
+      fontfix-iso8859-9.c fontosd-iso8859-9.c fontsml-iso8859-9.c\
+      fontfix-iso8859-13.c fontosd-iso8859-13.c fontsml-iso8859-13.c\
       fontfix-iso8859-15.c fontosd-iso8859-15.c fontsml-iso8859-15.c
 	@echo "font files created."
 
@@ -147,6 +157,20 @@ fontosd-iso8859-7.c:
 fontsml-iso8859-7.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
 
+fontfix-iso8859-9.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_9" "$(FIXFONT_ISO8859_9)" > $@
+fontosd-iso8859-9.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_9" "$(OSDFONT_ISO8859_9)" > $@
+fontsml-iso8859-9.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_9" "$(SMLFONT_ISO8859_9)" > $@
+
+fontfix-iso8859-13.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_13" "$(FIXFONT_ISO8859_13)" > $@
+fontosd-iso8859-13.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_13" "$(OSDFONT_ISO8859_13)" > $@
+fontsml-iso8859-13.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_13" "$(SMLFONT_ISO8859_13)" > $@
+
 fontfix-iso8859-15.c:
 	./genfontfile "cFont::tPixelData FontFix_iso8859_15" "$(FIXFONT_ISO8859_15)" > $@
 fontosd-iso8859-15.c:
diff --git a/config.h b/config.h
index 67ae7a8de..eddb4e505 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.287 2007/02/25 13:58:59 kls Exp $
+ * $Id: config.h 1.288 2007/03/03 15:39:05 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,8 +21,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.1"
-#define VDRVERSNUM   10501  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.2"
+#define VDRVERSNUM   10502  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/font.c b/font.c
index fe2ec6e8b..5e22fcd2f 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.13 2006/04/16 10:59:15 kls Exp $
+ * $Id: font.c 1.14 2007/03/11 09:51:44 kls Exp $
  */
 
 #include "config.h"
@@ -28,6 +28,10 @@
 #include "fontosd-iso8859-7.c"
 #include "fontsml-iso8859-7.c"
 
+#include "fontfix-iso8859-9.c"
+#include "fontosd-iso8859-9.c"
+#include "fontsml-iso8859-9.c"
+
 #include "fontfix-iso8859-13.c"
 #include "fontosd-iso8859-13.c"
 #include "fontsml-iso8859-13.c"
@@ -43,6 +47,7 @@ static const void *const FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_2,  FontFix_iso8859_2,  FontSml_iso8859_2 },
   { FontOsd_iso8859_5,  FontFix_iso8859_5,  FontSml_iso8859_5 },
   { FontOsd_iso8859_7,  FontFix_iso8859_7,  FontSml_iso8859_7 },
+  { FontOsd_iso8859_9,  FontFix_iso8859_9,  FontSml_iso8859_9 },
   { FontOsd_iso8859_13, FontFix_iso8859_13, FontSml_iso8859_13 },
   { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15 },
   };
@@ -52,6 +57,7 @@ static const char *FontCode[eDvbCodeSize] = {
   "iso8859-2",
   "iso8859-5",
   "iso8859-7",
+  "iso8859-9",
   "iso8859-13",
   "iso8859-15",
   };
diff --git a/font.h b/font.h
index 3c66a33d2..010d0a14f 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.14 2006/12/03 16:42:10 kls Exp $
+ * $Id: font.h 1.15 2007/03/11 09:50:42 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -25,6 +25,7 @@ enum eDvbCode {
   code_iso8859_2,
   code_iso8859_5,
   code_iso8859_7,
+  code_iso8859_9,
   code_iso8859_13,
   code_iso8859_15,
 #define eDvbCodeSize (code_iso8859_15 + 1)
diff --git a/fontfix-iso8859-9.c b/fontfix-iso8859-9.c
new file mode 100644
index 000000000..fc27a5a42
--- /dev/null
+++ b/fontfix-iso8859-9.c
@@ -0,0 +1,6498 @@
+static const cFont::tPixelData FontFix_iso8859_9[][28] = {
+  {             // 32
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 33
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 34
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000EE0,  // ...***.***.....
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000440,  // ....*...*......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 35
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000CC0,  // ...**..**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 36
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000FC0,  // ...******......
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FF0,  // ..*********....
+     0x00001BE0,  // ..**.*****.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 37
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000780,  // ....****.......
+     0x00000CC0,  // ...**..**......
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00000CC0,  // ...**..**......
+     0x00000780,  // ....****.......
+     0x00000038,  // .........***...
+     0x000001E0,  // ......****.....
+     0x00000700,  // ....***........
+     0x00001CF0,  // ..***..****....
+     0x00000198,  // ......**..**...
+     0x0000030C,  // .....**....**..
+     0x0000030C,  // .....**....**..
+     0x00000198,  // ......**..**...
+     0x000000F0,  // .......****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 38
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000700,  // ....***........
+     0x00000F98,  // ...*****..**...
+     0x00000DF8,  // ...**.******...
+     0x000018F0,  // ..**...****....
+     0x00001860,  // ..**....**.....
+     0x000018F0,  // ..**...****....
+     0x00001FFC,  // ..***********..
+     0x00000F9C,  // ...*****..***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 40
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000030,  // .........**....
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000070,  // ........***....
+     0x00000030,  // .........**....
+     0x00000000,  // ...............
+  },
+  {             // 41
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C00,  // ...**..........
+     0x00000E00,  // ...***.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00000000,  // ...............
+  },
+  {             // 42
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001998,  // ..**..**..**...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x000007E0,  // ....******.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 43
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 44
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000400,  // ....*..........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 45
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 46
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 47
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 48
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000C30,  // ...**....**....
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 49
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 50
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E00,  // ...***.........
+     0x00001C00,  // ..***..........
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 51
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000003E0,  // .....*****.....
+     0x000003F0,  // .....******....
+     0x00000038,  // .........***...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001FF0,  // ..*********....
+     0x00000FE0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 52
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // .......***.....
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00003FF8,  // .***********...
+     0x00003FF8,  // .***********...
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000003F8,  // .....*******...
+     0x000003F8,  // .....*******...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 53
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FF8,  // ...*********...
+     0x00000FF8,  // ...*********...
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DE0,  // ...**.****.....
+     0x00000FF8,  // ...*********...
+     0x00000E38,  // ...***...***...
+     0x0000001C,  // ..........***..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000181C,  // ..**......***..
+     0x00001C38,  // ..***....***...
+     0x00000FF8,  // ...*********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 54
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000F8,  // .......*****...
+     0x000003F8,  // .....*******...
+     0x00000780,  // ....****.......
+     0x00000E00,  // ...***.........
+     0x00000C00,  // ...**..........
+     0x00001C00,  // ..***..........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C18,  // ..***.....**...
+     0x00000E38,  // ...***...***...
+     0x00000FF0,  // ...********....
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 55
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000018,  // ..........**...
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 56
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 57
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001E0,  // ......****.....
+     0x000007F8,  // ....********...
+     0x00000618,  // ....**....**...
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E3C,  // ...***...****..
+     0x000007EC,  // ....******.**..
+     0x000003CC,  // .....****..**..
+     0x0000000C,  // ...........**..
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FC0,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 58
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 59
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000C00,  // ...**..........
+     0x00000800,  // ...*...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 60
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000000E,  // ...........***.
+     0x0000003C,  // .........****..
+     0x000000F0,  // .......****....
+     0x000003C0,  // .....****......
+     0x00000F00,  // ...****........
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000F00,  // ...****........
+     0x000003C0,  // .....****......
+     0x000000F0,  // .......****....
+     0x0000003C,  // .........****..
+     0x0000000E,  // ...........***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 61
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 62
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003800,  // .***...........
+     0x00001E00,  // ..****.........
+     0x00000780,  // ....****.......
+     0x000001E0,  // ......****.....
+     0x00000078,  // ........****...
+     0x0000001E,  // ..........****.
+     0x0000001E,  // ..........****.
+     0x00000078,  // ........****...
+     0x000001E0,  // ......****.....
+     0x00000780,  // ....****.......
+     0x00001E00,  // ..****.........
+     0x00003800,  // .***...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 63
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00000FF0,  // ...********....
+     0x00000C38,  // ...**....***...
+     0x00000C18,  // ...**.....**...
+     0x00000C18,  // ...**.....**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x000000F0,  // .......****....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 64
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x000018F0,  // ..**...****....
+     0x000019F0,  // ..**..*****....
+     0x00001BB0,  // ..**.***.**....
+     0x00001B30,  // ..**.**..**....
+     0x00001B30,  // ..**.**..**....
+     0x00001BB0,  // ..**.***.**....
+     0x000019F8,  // ..**..******...
+     0x000018F8,  // ..**...*****...
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C30,  // ...**....**....
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 65
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // .**********....
+     0x00003FF8,  // .***********...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000FF8,  // ...*********...
+     0x00000FFC,  // ...**********..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001800,  // ..**...........
+     0x00001C0C,  // ..***......**..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 68
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FE0,  // **********.....
+     0x00007FF8,  // ************...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x0000180E,  // ..**.......***.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x0000181C,  // ..**......***..
+     0x00007FF8,  // ************...
+     0x00007FF0,  // ***********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 69
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C66,  // ...**...**..**.
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 71
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 73
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 74
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FE,  // ....**********.
+     0x000007FE,  // ....**********.
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003030,  // .**......**....
+     0x00003870,  // .***....***....
+     0x00001FE0,  // ..********.....
+     0x00000FC0,  // ...******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 75
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7C,  // ******..*****..
+     0x00007E7C,  // ******..*****..
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001B80,  // ..**.***.......
+     0x00001F00,  // ..*****........
+     0x00001F80,  // ..******.......
+     0x00001DC0,  // ..***.***......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x0000060C,  // ....**.....**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 77
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000781E,  // ****......****.
+     0x0000781E,  // ****......****.
+     0x00003C3C,  // .****....****..
+     0x00003C3C,  // .****....****..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x000033CC,  // .**..****..**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 78
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 79
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FF0,  // .**********....
+     0x00003FFC,  // .************..
+     0x00000C0E,  // ...**......***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C0E,  // ...**......***.
+     0x00000FFC,  // ...**********..
+     0x00000FF0,  // ...********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000386,  // .....***....**.
+     0x00000FFE,  // ...***********.
+     0x00000E78,  // ...***..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FC0,  // *********......
+     0x00007FF0,  // ***********....
+     0x00001838,  // ..**.....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001838,  // ..**.....***...
+     0x00001FF0,  // ..*********....
+     0x00001FC0,  // ..*******......
+     0x000018E0,  // ..**...***.....
+     0x00001870,  // ..**....***....
+     0x00001830,  // ..**.....**....
+     0x00001838,  // ..**.....***...
+     0x00007E1E,  // ******....****.
+     0x00007E1E,  // ******....****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 83
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 85
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 86
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000300C,  // .**........**..
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x000033CC,  // .**..****..**..
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001E78,  // ..****..****...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00001C38,  // ..***....***...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 88
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x0000070C,  // ....***....**..
+     0x00000E0C,  // ...***.....**..
+     0x00001C0C,  // ..***......**..
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 91
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001F0,  // ......*****....
+     0x000001F0,  // ......*****....
+     0x00000000,  // ...............
+  },
+  {             // 92
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000030,  // .........**....
+     0x00000030,  // .........**....
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 93
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000000,  // ...............
+  },
+  {             // 94
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 95
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFF,  // ***************
+     0x00007FFF,  // ***************
+     0x00000000,  // ...............
+  },
+  {             // 96
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x00000060,  // ........**.....
+     0x00000020,  // .........*.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 97
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 98
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000DF0,  // ...**.*****....
+     0x00000FFC,  // ...**********..
+     0x00000F1C,  // ...****...***..
+     0x00000E0E,  // ...***.....***.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000E0E,  // ...***.....***.
+     0x00000F1C,  // ...****...***..
+     0x00003FFC,  // .************..
+     0x00003DF0,  // .****.*****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 99
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // ....******.**..
+     0x00001FFC,  // ..***********..
+     0x00001C3C,  // ..***....****..
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 100
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000078,  // ........****...
+     0x00000078,  // ........****...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FFE,  // ..************.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 101
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 102
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000FC,  // .......******..
+     0x000001FC,  // ......*******..
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 103
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
+  },
+  {             // 104
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007800,  // ****...........
+     0x00007800,  // ****...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001BE0,  // ..**.*****.....
+     0x00001FF0,  // ..*********....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 105
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 106
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FE0,  // ..********.....
+     0x00001FE0,  // ..********.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x00000060,  // ........**.....
+     0x000000E0,  // .......***.....
+     0x00001FC0,  // ..*******......
+     0x00001F80,  // ..******.......
+  },
+  {             // 107
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003C00,  // .****..........
+     0x00003C00,  // .****..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C78,  // ...**...****...
+     0x00000C78,  // ...**...****...
+     0x00000CE0,  // ...**..***.....
+     0x00000DC0,  // ...**.***......
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000DC0,  // ...**.***......
+     0x00000CE0,  // ...**..***.....
+     0x00000C70,  // ...**...***....
+     0x00003C7E,  // .****...******.
+     0x00003C7E,  // .****...******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 108
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 109
+     16, 26,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x0000EF78,  // ***.****.****...
+     0x0000FFFC,  // **************..
+     0x000039CC,  // ..***..***..**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000318C,  // ..**...**...**..
+     0x0000F9EF,  // *****..****.****
+     0x0000F9EF,  // *****..****.****
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 111
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 112
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007BE0,  // ****.*****.....
+     0x00007FF8,  // ************...
+     0x00001E38,  // ..****...***...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00001E38,  // ..****...***...
+     0x00001FF8,  // ..**********...
+     0x00001BE0,  // ..**.*****.....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00007F00,  // *******........
+     0x00007F00,  // *******........
+  },
+  {             // 113
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x000000FE,  // .......*******.
+     0x000000FE,  // .......*******.
+  },
+  {             // 114
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E78,  // ..****..****...
+     0x00001FFC,  // ..***********..
+     0x0000078C,  // ....****...**..
+     0x00000700,  // ....***........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 115
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 116
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FF0,  // .**********....
+     0x00003FF0,  // .**********....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000E38,  // ...***...***...
+     0x000007F8,  // ....********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 117
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 118
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 119
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007C3E,  // *****....*****.
+     0x00007C3E,  // *****....*****.
+     0x0000318C,  // .**...**...**..
+     0x0000318C,  // .**...**...**..
+     0x00001998,  // ..**..**..**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001BD8,  // ..**.****.**...
+     0x00001E78,  // ..****..****...
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 120
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 121
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
+  },
+  {             // 122
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000E18,  // ...***....**...
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 123
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000070,  // ........***....
+     0x00000000,  // ...............
+  },
+  {             // 124
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 125
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000E00,  // ...***.........
+     0x00000000,  // ...............
+  },
+  {             // 126
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F0C,  // ...****....**..
+     0x00001F9C,  // ..******..***..
+     0x000039F8,  // .***..******...
+     0x000030F0,  // .**....****....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 127
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 26,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 161
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000000,  // ...............
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000780,  // ....****.......
+     0x00000300,  // .....**........
+  },
+  {             // 162
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000007B0,  // ....****.**....
+     0x00000FF0,  // ...********....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 163
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x000007F0,  // ....*******....
+     0x00000E30,  // ...***...**....
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00000C00,  // ...**..........
+     0x00003FC0,  // .********......
+     0x00003FC0,  // .********......
+     0x00000600,  // ....**.........
+     0x00000600,  // ....**.........
+     0x00000E00,  // ...***.........
+     0x00001C0C,  // ..***......**..
+     0x00003FFC,  // .************..
+     0x00003FF8,  // .***********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 164
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001818,  // ..**......**...
+     0x00001FF8,  // ..**********...
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x00001FF8,  // ..**********...
+     0x00001818,  // ..**......**...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 165
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 166
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 167
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003F8,  // .....*******...
+     0x000007F8,  // ....********...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000E00,  // ...***.........
+     0x00001F80,  // ..******.......
+     0x000033E0,  // .**..*****.....
+     0x000030F8,  // .**....*****...
+     0x00003C3C,  // .****....****..
+     0x00001F0C,  // ..*****....**..
+     0x000007CC,  // ....*****..**..
+     0x000001FC,  // ......*******..
+     0x00000078,  // ........****...
+     0x00000030,  // .........**....
+     0x00001830,  // ..**.....**....
+     0x00001870,  // ..**....***....
+     0x00001FE0,  // ..********.....
+     0x00001FC0,  // ..*******......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 168
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 169
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000033CC,  // .**..****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006E66,  // **.***..**..**.
+     0x00006C06,  // **.**.......**.
+     0x00006C06,  // **.**.......**.
+     0x00006E66,  // **.***..**..**.
+     0x000037EC,  // .**.******.**..
+     0x000033CC,  // .**..****..**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000060,  // ........**.....
+     0x000007E0,  // ....******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000CF0,  // ...**..****....
+     0x000007B0,  // ....****.**....
+     0x00000000,  // ...............
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 171
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 172
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x0000000C,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 173
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 174
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000FF0,  // ...********....
+     0x00001C38,  // ..***....***...
+     0x000037CC,  // .**.*****..**..
+     0x000037EC,  // .**.******.**..
+     0x00006666,  // **..**..**..**.
+     0x00006666,  // **..**..**..**.
+     0x000067C6,  // **..*****...**.
+     0x000066C6,  // **..**.**...**.
+     0x0000366C,  // .**.**..**.**..
+     0x0000366C,  // .**.**..**.**..
+     0x00001C38,  // ..***....***...
+     0x00000FF0,  // ...********....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 175
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 176
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000660,  // ....**..**.....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 177
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 178
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000300,  // .....**........
+     0x00000630,  // ....**...**....
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 179
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000060,  // ........**.....
+     0x000001E0,  // ......****.....
+     0x00000030,  // .........**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 180
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 181
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00001FFE,  // ..************.
+     0x00001FDE,  // ..*******.****.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+  },
+  {             // 182
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FC,  // ....*********..
+     0x00001FFC,  // ..***********..
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x000039B0,  // .***..**.**....
+     0x00001FB0,  // ..******.**....
+     0x000007B0,  // ....****.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x000001B0,  // ......**.**....
+     0x00000FBC,  // ...*****.****..
+     0x00000FBC,  // ...*****.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 183
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 184
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 185
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 186
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x00000000,  // ...............
+     0x00000FF0,  // ...********....
+     0x00000FF0,  // ...********....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 187
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000038E0,  // .***...***.....
+     0x00001C70,  // ..***...***....
+     0x00000E38,  // ...***...***...
+     0x0000071C,  // ....***...***..
+     0x0000038E,  // .....***...***.
+     0x0000071C,  // ....***...***..
+     0x00000E38,  // ...***...***...
+     0x00001C70,  // ..***...***....
+     0x000038E0,  // .***...***.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 188
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ..**...........
+     0x00007801,  // ****..........*
+     0x00001803,  // ..**.........**
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001818,  // ..**......**...
+     0x00001830,  // ..**.....**....
+     0x00001864,  // ..**....**..*..
+     0x00007FCC,  // *********..**..
+     0x0000019C,  // ......**..***..
+     0x0000032C,  // .....**..*.**..
+     0x0000064C,  // ....**..*..**..
+     0x00000C8C,  // ...**..*...**..
+     0x000018FE,  // ..**...*******.
+     0x0000300C,  // .**........**..
+     0x0000201E,  // .*........****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001800,  // ..**...........
+     0x00007801,  // ****..........*
+     0x00001803,  // ..**.........**
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001818,  // ..**......**...
+     0x00001830,  // ..**.....**....
+     0x0000187E,  // ..**....******.
+     0x00007FF3,  // ***********..**
+     0x000001A3,  // ......**.*...**
+     0x00000306,  // .....**.....**.
+     0x0000060C,  // ....**.....**..
+     0x00000C18,  // ...**.....**...
+     0x00001830,  // ..**.....**....
+     0x00003063,  // .**.....**...**
+     0x0000207F,  // .*......*******
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003E00,  // .*****.........
+     0x00006301,  // **...**.......*
+     0x00006303,  // **...**......**
+     0x00000606,  // ....**......**.
+     0x00001E0C,  // ..****.....**..
+     0x00000318,  // .....**...**...
+     0x00006330,  // **...**..**....
+     0x00006364,  // **...**.**..*..
+     0x00003ECC,  // .*****.**..**..
+     0x0000019C,  // ......**..***..
+     0x0000032C,  // .....**..*.**..
+     0x0000064C,  // ....**..*..**..
+     0x00000C8C,  // ...**..*...**..
+     0x000018FE,  // ..**...*******.
+     0x0000300C,  // .**........**..
+     0x0000201E,  // .*........****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000F00,  // ...****........
+     0x00001C00,  // ..***..........
+     0x00001800,  // ..**...........
+     0x00001830,  // ..**.....**....
+     0x00001830,  // ..**.....**....
+     0x00001C30,  // ..***....**....
+     0x00000FF0,  // ...********....
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+  },
+  {             // 192
+     15, 26,
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 26,
+     0x00000300,  // .....**........
+     0x00000780,  // ....****.......
+     0x00000FC0,  // ...******......
+     0x00001CE0,  // ..***..***.....
+     0x00003870,  // .***....***....
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 26,
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00001F80,  // ..******.......
+     0x00001F80,  // ..******.......
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007FF,  // ....***********
+     0x000007FF,  // ....***********
+     0x000001C3,  // ......***....**
+     0x000003C3,  // .....****....**
+     0x000003C0,  // .....****......
+     0x000006CC,  // ....**.**..**..
+     0x000004FC,  // ....*..******..
+     0x00000CFC,  // ...**..******..
+     0x00000FCC,  // ...******..**..
+     0x00001FC0,  // ..*******......
+     0x000018C0,  // ..**...**......
+     0x000030C3,  // .**....**....**
+     0x000030C3,  // .**....**....**
+     0x00007BFF,  // ****.**********
+     0x00007BFF,  // ****.**********
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 199
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003EC,  // .....*****.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380C,  // .***.......**..
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001804,  // ..**........*..
+     0x00001C0C,  // ..***......**..
+     0x00000FF8,  // ...*********...
+     0x000003F0,  // .....******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 200
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 26,
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 26,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000000,  // ...............
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C6C,  // ...**...**.**..
+     0x00000C60,  // ...**...**.....
+     0x00000FE0,  // ...*******.....
+     0x00000FE0,  // ...*******.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00000C06,  // ...**.......**.
+     0x00003FFE,  // .*************.
+     0x00003FFE,  // .*************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 205
+     15, 26,
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 206
+     15, 26,
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 207
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000660,  // ....**..**.....
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 208
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E1C,  // ...***....***..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x000003F6,  // .....******.**.
+     0x00000FFE,  // ...***********.
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000307E,  // .**.....******.
+     0x0000307E,  // .**.....******.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x00003C3E,  // .****....*****.
+     0x00003C3E,  // .****....*****.
+     0x00001E0C,  // ..****.....**..
+     0x00001E0C,  // ..****.....**..
+     0x00001B0C,  // ..**.**....**..
+     0x00001B0C,  // ..**.**....**..
+     0x0000198C,  // ..**..**...**..
+     0x0000198C,  // ..**..**...**..
+     0x000018CC,  // ..**...**..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000186C,  // ..**....**.**..
+     0x0000186C,  // ..**....**.**..
+     0x0000183C,  // ..**.....****..
+     0x00003E3C,  // .*****...****..
+     0x00003E1C,  // .*****....***..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 210
+     15, 26,
+     0x00000000,  // ...............
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x000000E0,  // .......***.....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 26,
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 26,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000398,  // .....***..**...
+     0x000007F0,  // ....*******....
+     0x00000CE0,  // ...**..***.....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001008,  // ..*........*...
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00000E70,  // ...***..***....
+     0x000007E0,  // ....******.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x00001008,  // ..*........*...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 216
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x0000000C,  // ...........**..
+     0x000003F8,  // .....*******...
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x00003046,  // .**.....*...**.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x00003A0E,  // .***.*.....***.
+     0x00001E0C,  // ..****.....**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x00001BE0,  // ..**.*****.....
+     0x00003000,  // .**............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     15, 26,
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 218
+     15, 26,
+     0x00000000,  // ...............
+     0x00000038,  // .........***...
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 219
+     15, 26,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x000003F0,  // .....******....
+     0x00000738,  // ....***..***...
+     0x00000E1C,  // ...***....***..
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 220
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000630,  // ....**...**....
+     0x00000000,  // ...............
+     0x00003E3E,  // .*****...*****.
+     0x00003E3E,  // .*****...*****.
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00000C18,  // ...**.....**...
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 221
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000080,  // ......**.......
+     0x00000080,  // ......**.......
+     0x00000080,  // ......**.......
+     0x00000000,  // ...............
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 222
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007EC,  // ....******.**..
+     0x00000FFC,  // ...**********..
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000180C,  // ..**.......**..
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F0,  // ....*******....
+     0x000000F8,  // .......*****...
+     0x0000001C,  // ..........***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00003FF8,  // .***********...
+     0x000037F0,  // .**.*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 223
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000E70,  // ...***..***....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C70,  // ...**...***....
+     0x00000DE0,  // ...**.****.....
+     0x00000DF0,  // ...**.*****....
+     0x00000C38,  // ...**....***...
+     0x00000C1C,  // ...**.....***..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000CDC,  // ...**..**.***..
+     0x00003EF8,  // .*****.*****...
+     0x00003E70,  // .*****..***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 224
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 225
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 226
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 227
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 228
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 229
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000006C0,  // ....**.**......
+     0x00000440,  // ....*...*......
+     0x000006C0,  // ....**.**......
+     0x00000380,  // .....***.......
+     0x00000FC0,  // ...******......
+     0x00001FE0,  // ..********.....
+     0x00001870,  // ..**....***....
+     0x00000030,  // .........**....
+     0x000007F0,  // ....*******....
+     0x00001FF0,  // ..*********....
+     0x00003830,  // .***.....**....
+     0x00003030,  // .**......**....
+     0x00003070,  // .**.....***....
+     0x00003FFC,  // .************..
+     0x00001FBC,  // ..******.****..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 230
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001E78,  // ..****..****...
+     0x00003FFC,  // .************..
+     0x000033CE,  // .**..****..***.
+     0x00000186,  // ......**....**.
+     0x00000F86,  // ...*****....**.
+     0x00003FFE,  // .*************.
+     0x000071FE,  // ***...********.
+     0x00006180,  // **....**.......
+     0x000063C6,  // **...****...**.
+     0x00007FFE,  // **************.
+     0x00003E78,  // .*****..****...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 231
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // ....*****.**...
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x00003818,  // .***......**...
+     0x00003018,  // .**.......**...
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x00003800,  // .***...........
+     0x00001C18,  // ..***.....**...
+     0x00001FF8,  // ..**********...
+     0x000007F0,  // ....*******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 232
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 233
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 234
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000003E0,  // .....*****.....
+     0x00000770,  // ....***.***....
+     0x00000E38,  // ...***...***...
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 235
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x00003FFC,  // .************..
+     0x00003FFC,  // .************..
+     0x00003800,  // .***...........
+     0x00001C1C,  // ..***.....***..
+     0x00001FFC,  // ..***********..
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 236
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 237
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 238
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 239
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 240
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E38,  // ...***...***...
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x000007DE,  // ....*****.****.
+     0x00001FFE,  // ..************.
+     0x00001C78,  // ..***...****...
+     0x00003838,  // .***.....***...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003018,  // .**.......**...
+     0x00003838,  // .***.....***...
+     0x00001C78,  // ..***...****...
+     0x00001FF8,  // ..**********...
+     0x000007D8,  // ....*****.**...
+     0x00000018,  // ..........**...
+     0x00000018,  // ..........**...
+     0x00000038,  // .........***...
+     0x00000FF0,  // ...********....
+     0x00000FE0,  // ...*******.....
+  },
+  {             // 241
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x000079E0,  // ****..****.....
+     0x00007BF0,  // ****.******....
+     0x00001E38,  // ..****...***...
+     0x00001C18,  // ..***.....**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00007E7E,  // ******..******.
+     0x00007E7E,  // ******..******.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 242
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x000001C0,  // ......***......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 243
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000070,  // ........***....
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 244
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 245
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000730,  // ....***..**....
+     0x00000FE0,  // ...*******.....
+     0x000019C0,  // ..**..***......
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 246
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x000007E0,  // ....******.....
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000381C,  // .***......***..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000300C,  // .**........**..
+     0x0000381C,  // .***......***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x000007E0,  // ....******.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 247
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00007FFC,  // *************..
+     0x00007FFC,  // *************..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 248
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000006,  // ............**.
+     0x000007EC,  // ....******.**..
+     0x00001FF8,  // ..**********...
+     0x00001C38,  // ..***....***...
+     0x0000386C,  // .***....**.**..
+     0x000030CC,  // .**....**..**..
+     0x0000318C,  // .**...**...**..
+     0x0000330C,  // .**..**....**..
+     0x0000361C,  // .**.**....***..
+     0x00001C38,  // ..***....***...
+     0x00001FF8,  // ..**********...
+     0x00001FE0,  // ..********.....
+     0x00003000,  // .**............
+     0x00006000,  // **.............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 249
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001C00,  // ..***..........
+     0x00000E00,  // ...***.........
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 250
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000000E0,  // .......***.....
+     0x000001C0,  // ......***......
+     0x00000380,  // .....***.......
+     0x00000700,  // ....***........
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 251
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000380,  // .....***.......
+     0x000007C0,  // ....*****......
+     0x00000EE0,  // ...***.***.....
+     0x00001C70,  // ..***...***....
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 252
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00007878,  // ****....****...
+     0x00007878,  // ****....****...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000FFE,  // ...***********.
+     0x000007DE,  // ....*****.****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 253
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000F80,  // ...*****.......
+     0x00000F80,  // ...*****.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00000180,  // ......**.......
+     0x00001FF8,  // ..**********...
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 254
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000007D8,  // ....*****.**...
+     0x00000FF8,  // ...*********...
+     0x00001C38,  // ..***....***...
+     0x00001C18,  // ..***.....**...
+     0x00000F80,  // ...*****.......
+     0x000003E0,  // .....*****.....
+     0x000000F8,  // .......*****...
+     0x0000181C,  // ..**......***..
+     0x00001C1C,  // ..***.....***..
+     0x00001FF8,  // ..**********...
+     0x00001BF0,  // ..**.******....
+     0x00000180,  // ......**.......
+     0x000003C0,  // .....****......
+     0x000000C0,  // .......**......
+     0x000007C0,  // ....*****......
+     0x00000380,  // .....***.......
+  },
+  {             // 255
+     15, 26,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000C60,  // ...**...**.....
+     0x00000000,  // ...............
+     0x00003E7C,  // .*****..*****..
+     0x00003E7C,  // .*****..*****..
+     0x00001818,  // ..**......**...
+     0x00001C38,  // ..***....***...
+     0x00000C30,  // ...**....**....
+     0x00000E70,  // ...***..***....
+     0x00000660,  // ....**..**.....
+     0x000006E0,  // ....**.***.....
+     0x000003C0,  // .....****......
+     0x000003C0,  // .....****......
+     0x00000180,  // ......**.......
+     0x00000380,  // .....***.......
+     0x00000300,  // .....**........
+     0x00000700,  // ....***........
+     0x00003F80,  // .*******.......
+     0x00003F80,  // .*******.......
+  },
+  };
diff --git a/fontosd-iso8859-9.c b/fontosd-iso8859-9.c
new file mode 100644
index 000000000..335bd1cb3
--- /dev/null
+++ b/fontosd-iso8859-9.c
@@ -0,0 +1,6722 @@
+static const cFont::tPixelData FontOsd_iso8859_9[][29] = {
+  {             // 32
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 33
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000022,  // ..*...*.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 35
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000008C,  // .....*...**..
+     0x0000018C,  // ....**...**..
+     0x0000018C,  // ....**...**..
+     0x00000188,  // ....**...*...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000118,  // ....*...**...
+     0x00000318,  // ...**...**...
+     0x00000318,  // ...**...**...
+     0x00000310,  // ...**...*....
+     0x00001FFE,  // ************.
+     0x00001FFE,  // ************.
+     0x00000230,  // ...*...**....
+     0x00000630,  // ..**...**....
+     0x00000620,  // ..**...*.....
+     0x00000620,  // ..**...*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 36
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000007F8,  // ..********...
+     0x0000065C,  // ..**..*.***..
+     0x00000CCC,  // .**..**..**..
+     0x00000CCC,  // .**..**..**..
+     0x00000CC0,  // .**..**......
+     0x00000CC0,  // .**..**......
+     0x000007C0,  // ..*****......
+     0x000003F0,  // ...******....
+     0x000001FC,  // ....*******..
+     0x000000CE,  // .....**..***.
+     0x000000C6,  // .....**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CC6,  // .**..**...**.
+     0x00000CCE,  // .**..**..***.
+     0x00000E9C,  // .***.*..***..
+     0x000007F8,  // ..********...
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 37
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0001C020,  // ...***........*.....
+     0x0007F060,  // .*******.....**.....
+     0x000E38C0,  // ***...***...**......
+     0x000C1880,  // **.....**...*.......
+     0x000C1980,  // **.....**..**.......
+     0x000E3900,  // ***...***..*........
+     0x0007F300,  // .*******..**........
+     0x0003E200,  // ..*****...*.........
+     0x0000063C,  // .........**...****..
+     0x00000C7E,  // ........**...******.
+     0x00000CE6,  // ........**..***..**.
+     0x000018C3,  // .......**...**....**
+     0x000010C3,  // .......*....**....**
+     0x000030C3,  // ......**....**....**
+     0x0000607E,  // .....**......******.
+     0x0000603C,  // .....**.......****..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 38
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003C0,  // .....****......
+     0x000007E0,  // ....******.....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x00000C30,  // ...**....**....
+     0x000006E0,  // ....**.***.....
+     0x000007C0,  // ....*****......
+     0x00000780,  // ....****.......
+     0x00000FCC,  // ...******..**..
+     0x000018CC,  // ..**...**..**..
+     0x0000306C,  // .**.....**.**..
+     0x00003038,  // .**......***...
+     0x00003038,  // .**......***...
+     0x0000383C,  // .***.....****..
+     0x00001FEE,  // ..********.***.
+     0x00000F80,  // ...*****.......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 39
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000002,  // ...*.
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 40
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000006,  // .....**.
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000008,  // ....*...
+     0x0000000C,  // ....**..
+     0x00000004,  // .....*..
+     0x00000004,  // .....*..
+  },
+  {             // 41
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000040,  // .*......
+     0x00000020,  // ..*.....
+     0x00000030,  // ..**....
+     0x00000010,  // ...*....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000010,  // ...*....
+     0x00000030,  // ..**....
+     0x00000020,  // ..*.....
+     0x00000040,  // .*......
+  },
+  {             // 42
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000010,  // ....*....
+     0x00000010,  // ....*....
+     0x000000D6,  // .**.*.**.
+     0x0000007C,  // ..*****..
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x00000044,  // ..*...*..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 43
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 44
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 45
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 46
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 47
+     7, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000006,  // ....**.
+     0x00000006,  // ....**.
+     0x00000004,  // ....*..
+     0x0000000C,  // ...**..
+     0x0000000C,  // ...**..
+     0x00000008,  // ...*...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000010,  // ..*....
+     0x00000030,  // .**....
+     0x00000030,  // .**....
+     0x00000020,  // .*.....
+     0x00000060,  // **.....
+     0x00000060,  // **.....
+     0x00000040,  // *......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 48
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 49
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001E0,  // ....****.....
+     0x000007E0,  // ..******.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 50
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x0000001C,  // ........***..
+     0x00000078,  // ......****...
+     0x000001E0,  // ....****.....
+     0x00000380,  // ...***.......
+     0x00000700,  // ..***........
+     0x00000600,  // ..**.........
+     0x00000C00,  // .**..........
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 51
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003F0,  // ...******....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x000000F0,  // .....****....
+     0x000000FC,  // .....******..
+     0x0000000C,  // .........**..
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 52
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000018,  // ........**...
+     0x00000038,  // .......***...
+     0x00000078,  // ......****...
+     0x00000078,  // ......****...
+     0x000000D8,  // .....**.**...
+     0x00000198,  // ....**..**...
+     0x00000318,  // ...**...**...
+     0x00000218,  // ...*....**...
+     0x00000618,  // ..**....**...
+     0x00000C18,  // .**.....**...
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000018,  // ........**...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 53
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007F0,  // ..*******....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0E,  // .**......***.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000006,  // ..........**.
+     0x00000C06,  // .**.......**.
+     0x00000E0C,  // .***.....**..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 54
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000070C,  // ..***....**..
+     0x0000060E,  // ..**.....***.
+     0x00000E00,  // .***.........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 55
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000004,  // ..........*..
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000380,  // ...***.......
+     0x00000300,  // ...**........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 56
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003F0,  // ...******....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 57
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E1E,  // .***....****.
+     0x000007FE,  // ..**********.
+     0x000001F6,  // ....*****.**.
+     0x00000006,  // ..........**.
+     0x0000000E,  // .........***.
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 58
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 59
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000002,  // ....*.
+     0x00000002,  // ....*.
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 60
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000002,  // ...........*.
+     0x0000000E,  // .........***.
+     0x0000003C,  // .......****..
+     0x000001E0,  // ....****.....
+     0x00000780,  // ..****.......
+     0x00000E00,  // .***.........
+     0x00000F00,  // .****........
+     0x000001E0,  // ....****.....
+     0x00000078,  // ......****...
+     0x0000000E,  // .........***.
+     0x00000002,  // ...........*.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 61
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 62
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000800,  // .*...........
+     0x00000E00,  // .***.........
+     0x000003C0,  // ...****......
+     0x000000F0,  // .....****....
+     0x0000003E,  // .......*****.
+     0x00000006,  // ..........**.
+     0x0000001E,  // ........****.
+     0x00000078,  // ......****...
+     0x000003C0,  // ...****......
+     0x00000F00,  // .****........
+     0x00000800,  // .*...........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 63
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000F8,  // .....*****...
+     0x000003FC,  // ...********..
+     0x0000070E,  // ..***....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x00000006,  // ..........**.
+     0x0000000C,  // .........**..
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 64
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00003F00,  // .........******........
+     0x0001FFE0,  // ......************.....
+     0x0003C0F0,  // .....****......****....
+     0x00070038,  // ....***..........***...
+     0x000E001C,  // ...***............***..
+     0x001C1E8C,  // ..***.....****.*...**..
+     0x00187FCE,  // ..**....*********..***.
+     0x0018E1C6,  // ..**...***....***...**.
+     0x0030C186,  // .**....**.....**....**.
+     0x00318186,  // .**...**......**....**.
+     0x00318186,  // .**...**......**....**.
+     0x0031830C,  // .**...**.....**....**..
+     0x0031830C,  // .**...**.....**....**..
+     0x0039C718,  // .***..***...***...**...
+     0x0018FFF0,  // ..**...************....
+     0x001C71E0,  // ..***...***...****.....
+     0x000E0000,  // ...***.................
+     0x00078000,  // ....****...............
+     0x0003FF80,  // .....***********.......
+     0x00007F00,  // ........*******........
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 65
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 66
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000181C,  // ..**......***..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FF8,  // ..**********...
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00001FFC,  // ..***********..
+     0x00001FF8,  // ..**********...
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 67
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x00003818,  // ...***......**...
+     0x00003FF8,  // ...***********...
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 68
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007FC0,  // ..*********......
+     0x00007FF0,  // ..***********....
+     0x00006070,  // ..**......***....
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00006018,  // ..**........**...
+     0x00006070,  // ..**......***....
+     0x00007FF0,  // ..***********....
+     0x00007FC0,  // ..*********......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 69
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 70
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000FFE,  // ..***********.
+     0x00000FFE,  // ..***********.
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000FFC,  // ..**********..
+     0x00000FFC,  // ..**********..
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000C00,  // ..**..........
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 71
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E018,  // ..***........**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x000181FC,  // .**......*******..
+     0x000181FC,  // .**......*******..
+     0x0001800C,  // .**...........**..
+     0x0001C00C,  // .***..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x0000703C,  // ...***......****..
+     0x00003FEC,  // ....*********.**..
+     0x00000FC4,  // ......******...*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 72
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00007FFC,  // ..*************..
+     0x00007FFC,  // ..*************..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 73
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x0000000C,  // ........**..
+     0x00000C0C,  // **......**..
+     0x00000C0C,  // **......**..
+     0x00000E1C,  // ***....***..
+     0x000007F8,  // .********...
+     0x000003F0,  // ..******....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 75
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001807,  // ..**........***
+     0x0000180E,  // ..**.......***.
+     0x0000181C,  // ..**......***..
+     0x00001838,  // ..**.....***...
+     0x00001870,  // ..**....***....
+     0x000018E0,  // ..**...***.....
+     0x000019C0,  // ..**..***......
+     0x00001BC0,  // ..**.****......
+     0x00001FC0,  // ..*******......
+     0x00001EE0,  // ..****.***.....
+     0x00001C70,  // ..***...***....
+     0x00001830,  // ..**.....**....
+     0x00001818,  // ..**......**...
+     0x0000181C,  // ..**......***..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001807,  // ..**........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 76
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 77
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x0001C01C,  // ..***.........***..
+     0x0001C01C,  // ..***.........***..
+     0x0001E01C,  // ..****........***..
+     0x0001E03C,  // ..****.......****..
+     0x0001E03C,  // ..****.......****..
+     0x0001B02C,  // ..**.**......*.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001B06C,  // ..**.**.....**.**..
+     0x0001984C,  // ..**..**....*..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x000198CC,  // ..**..**...**..**..
+     0x00018C8C,  // ..**...**..*...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x00018D8C,  // ..**...**.**...**..
+     0x0001878C,  // ..**....****...**..
+     0x0001870C,  // ..**....***....**..
+     0x0001870C,  // ..**....***....**..
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 78
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 79
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 80
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FF0,  // ..*********....
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001FFC,  // ..***********..
+     0x00001FF0,  // ..*********....
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 81
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C04C,  // ..**.......*..**..
+     0x0000E0FC,  // ..***.....******..
+     0x00007078,  // ...***.....****...
+     0x00003FF8,  // ....***********...
+     0x00000FCE,  // ......******..***.
+     0x00000004,  // ...............*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 82
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00007FE0,  // ..**********.....
+     0x00007FF8,  // ..************...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00006018,  // ..**........**...
+     0x00007FF0,  // ..***********....
+     0x00007FF8,  // ..************...
+     0x00006018,  // ..**........**...
+     0x0000601C,  // ..**........***..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600E,  // ..**.........***.
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 83
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 84
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 85
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 86
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003007,  // .**.........***
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x0000180E,  // ..**.......***.
+     0x00001C0C,  // ..***......**..
+     0x00000C0C,  // ...**......**..
+     0x00000C1C,  // ...**.....***..
+     0x00000E18,  // ...***....**...
+     0x00000618,  // ....**....**...
+     0x00000638,  // ....**...***...
+     0x00000730,  // ....***..**....
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 87
+     22, 27,
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00180C06,  // .**.......**.......**.
+     0x00181C06,  // .**......***.......**.
+     0x00181E0E,  // .**......****.....***.
+     0x001C1E0E,  // .***.....****.....***.
+     0x000C1E0C,  // ..**.....****.....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000C330C,  // ..**....**..**....**..
+     0x000E331C,  // ..***...**..**...***..
+     0x00066318,  // ...**..**...**...**...
+     0x00066198,  // ...**..**....**..**...
+     0x00066198,  // ...**..**....**..**...
+     0x000761B8,  // ...***.**....**.***...
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0F0,  // ....****......****....
+     0x0003C0E0,  // ....****......***.....
+     0x00018060,  // .....**........**.....
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+     0x00000000,  // ......................
+  },
+  {             // 88
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003806,  // .***........**.
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000638,  // ....**...***...
+     0x00000330,  // .....**..**....
+     0x000003E0,  // .....*****.....
+     0x000001E0,  // ......****.....
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000730,  // ....***..**....
+     0x00000E38,  // ...***...***...
+     0x00000C1C,  // ...**.....***..
+     0x00001C0C,  // ..***......**..
+     0x0000380E,  // .***.......***.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 89
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003007,  // .**.........***
+     0x00003807,  // .***........***
+     0x0000180E,  // ..**.......***.
+     0x00000C0C,  // ...**......**..
+     0x00000E1C,  // ...***....***..
+     0x00000618,  // ....**....**...
+     0x00000730,  // ....***..**....
+     0x000003B0,  // .....***.**....
+     0x000001E0,  // ......****.....
+     0x000001E0,  // ......****.....
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x000000C0,  // .......**......
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 90
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x0000000E,  // ..........***.
+     0x0000000C,  // ..........**..
+     0x0000001C,  // .........***..
+     0x00000038,  // ........***...
+     0x00000070,  // .......***....
+     0x000000E0,  // ......***.....
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000E00,  // ..***.........
+     0x00001C00,  // .***..........
+     0x00001FFE,  // .************.
+     0x00001FFE,  // .************.
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 91
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000001F,  // .*****
+     0x0000001F,  // .*****
+  },
+  {             // 92
+     7, 27,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000040,  // *......
+     0x00000060,  // **.....
+     0x00000020,  // .*.....
+     0x00000020,  // .*.....
+     0x00000030,  // .**....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000010,  // ..*....
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000008,  // ...*...
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000004,  // ....*..
+     0x00000006,  // ....**.
+     0x00000002,  // .....*.
+     0x00000002,  // .....*.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 93
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000001E,  // .****.
+     0x0000001E,  // .****.
+  },
+  {             // 94
+     11, 27,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000070,  // ....***....
+     0x00000070,  // ....***....
+     0x000000D0,  // ...**.*....
+     0x000000D8,  // ...**.**...
+     0x00000088,  // ...*...*...
+     0x0000018C,  // ..**...**..
+     0x0000010C,  // ..*....**..
+     0x00000304,  // .**.....*..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 95
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00003FFF,  // **************
+     0x00003FFF,  // **************
+     0x00000000,  // ..............
+  },
+  {             // 96
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000002,  // ...*.
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 97
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 98
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 99
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x000003FC,  // ..********..
+     0x000000F8,  // ....*****...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 100
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 101
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 102
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x000003E0,  // ...*****.....
+  },
+  {             // 104
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000006F8,  // ..**.*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 105
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 106
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
+  },
+  {             // 107
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x0000060C,  // .**.....**..
+     0x00000618,  // .**....**...
+     0x00000630,  // .**...**....
+     0x00000660,  // .**..**.....
+     0x000007E0,  // .******.....
+     0x000007E0,  // .******.....
+     0x00000730,  // .***..**....
+     0x00000638,  // .**...***...
+     0x00000618,  // .**....**...
+     0x0000060C,  // .**.....**..
+     0x0000060E,  // .**.....***.
+     0x00000606,  // .**......**.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 108
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 109
+     19, 27,
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x0001BE7C,  // ..**.*****..*****..
+     0x0001FFFE,  // ..****************.
+     0x0001C386,  // ..***....***....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00018306,  // ..**.....**.....**.
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+     0x00000000,  // ...................
+  },
+  {             // 110
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 111
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 112
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000DF0,  // .**.*****....
+     0x00000FFC,  // .**********..
+     0x00000F1C,  // .****...***..
+     0x00000E0E,  // .***.....***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E0E,  // .***.....***.
+     0x00000F1C,  // .****...***..
+     0x00000FFC,  // .**********..
+     0x00000CF0,  // .**..****....
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+  },
+  {             // 113
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000007FC,  // ..*********..
+     0x000003EC,  // ...*****.**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+     0x0000000C,  // .........**..
+  },
+  {             // 114
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000E,  // ....***.
+     0x0000003E,  // ..*****.
+     0x00000038,  // ..***...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 115
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 116
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x0000000F,  // ..****
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 118
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000E06,  // ***......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000070C,  // .***....**..
+     0x0000031C,  // ..**...***..
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 119
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00018306,  // **.....**.....**.
+     0x0000C386,  // .**....***....**.
+     0x0000C78E,  // .**...****...***.
+     0x0000C78C,  // .**...****...**..
+     0x0000C6CC,  // .**...**.**..**..
+     0x000064CC,  // ..**..*..**..**..
+     0x00006CD8,  // ..**.**..**.**...
+     0x00006CD8,  // ..**.**..**.**...
+     0x00002C78,  // ...*.**...****...
+     0x00003878,  // ...***....****...
+     0x00003870,  // ...***....***....
+     0x00003870,  // ...***....***....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 120
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x0000060E,  // .**.....***.
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000001F0,  // ...*****....
+     0x000001B8,  // ...**.***...
+     0x00000318,  // ..**...**...
+     0x0000070C,  // .***....**..
+     0x0000060E,  // .**.....***.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 121
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
+  },
+  {             // 122
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FC,  // .*********..
+     0x000007FC,  // .*********..
+     0x00000018,  // .......**...
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 123
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000C,  // ....**..
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000038,  // ..***...
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+  },
+  {             // 124
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+  },
+  {             // 125
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000060,  // .**.....
+     0x00000070,  // .***....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000018,  // ...**...
+     0x0000001C,  // ...***..
+     0x0000000C,  // ....**..
+     0x00000018,  // ...**...
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000030,  // ..**....
+     0x00000070,  // .***....
+     0x00000060,  // .**.....
+  },
+  {             // 126
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000380,  // ...***.......
+     0x000007C6,  // ..*****...**.
+     0x0000047E,  // ..*...******.
+     0x0000001C,  // ........***..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 127
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     0, 27,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 161
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+  },
+  {             // 162
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x000001F8,  // ....******...
+     0x000007FC,  // ..*********..
+     0x0000072C,  // ..***..*.**..
+     0x00000E26,  // .***...*..**.
+     0x00000C20,  // .**....*.....
+     0x00000C20,  // .**....*.....
+     0x00000C40,  // .**...*......
+     0x00000C40,  // .**...*......
+     0x00000C46,  // .**...*...**.
+     0x0000064E,  // ..**..*..***.
+     0x0000075C,  // ..***.*.***..
+     0x000003F8,  // ...*******...
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 163
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x00000C0C,  // .**......**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000E00,  // .***.........
+     0x00000700,  // ..***........
+     0x00000FE0,  // .*******.....
+     0x00000FA0,  // .*****.*.....
+     0x00000380,  // ...***.......
+     0x00000180,  // ....**.......
+     0x00000180,  // ....**.......
+     0x00000300,  // ...**........
+     0x00000600,  // ..**.........
+     0x00000FFE,  // .***********.
+     0x00000FFC,  // .**********..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 164
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000204,  // ...*......*..
+     0x000007EC,  // ..******.**..
+     0x000007FC,  // ..*********..
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x000003F8,  // ...*******...
+     0x000007EC,  // ..******.**..
+     0x00000204,  // ...*......*..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 165
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C06,  // .**.......**.
+     0x00000C0C,  // .**......**..
+     0x0000060C,  // ..**.....**..
+     0x00000618,  // ..**....**...
+     0x00000310,  // ...**...*....
+     0x00000130,  // ....*..**....
+     0x000001E0,  // ....****.....
+     0x00000EFC,  // .***.******..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x00000FFC,  // .**********..
+     0x00000FFC,  // .**********..
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 166
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+  },
+  {             // 167
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000F0,  // .....****....
+     0x000003F8,  // ...*******...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000700,  // ..***........
+     0x000003C0,  // ...****......
+     0x000006F0,  // ..**.****....
+     0x00000C78,  // .**...****...
+     0x00000C1C,  // .**.....***..
+     0x00000C0E,  // .**......***.
+     0x00000E06,  // .***......**.
+     0x00000706,  // ..***.....**.
+     0x000003CC,  // ...****..**..
+     0x000000F8,  // .....*****...
+     0x00000070,  // ......***....
+     0x00000038,  // .......***...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000718,  // ..***...**...
+     0x000003F0,  // ...******....
+     0x000001E0,  // ....****.....
+  },
+  {             // 168
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000066,  // .**..**.
+     0x00000066,  // .**..**.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 169
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000E38C,  // ..***...***...**..
+     0x0001C7C6,  // .***...*****...**.
+     0x00018C66,  // .**...**...**..**.
+     0x00031823,  // **...**.....*...**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031803,  // **...**.........**
+     0x00031833,  // **...**.....**..**
+     0x00018C63,  // .**...**...**...**
+     0x00018FE6,  // .**...*******..**.
+     0x0000C3CE,  // ..**....****..***.
+     0x0000703C,  // ...***......****..
+     0x00003FF8,  // ....***********...
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 170
+     9, 27,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000078,  // ..****...
+     0x000000FC,  // .******..
+     0x0000000C,  // .....**..
+     0x0000003C,  // ...****..
+     0x000000CC,  // .**..**..
+     0x000000CC,  // .**..**..
+     0x000000FE,  // .*******.
+     0x00000076,  // ..***.**.
+     0x000000FC,  // .******..
+     0x000000FC,  // .******..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 171
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000088,  // .....*...*...
+     0x00000188,  // ....**...*...
+     0x00000338,  // ...**..***...
+     0x00000620,  // ..**...*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000088,  // .....*...*...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 172
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFF,  // .************
+     0x00000FFF,  // .************
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000003,  // ...........**
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 173
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000007C,  // .*****..
+     0x0000007C,  // .*****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 174
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x0000783C,  // ...****.....****..
+     0x0000FFCC,  // ..**********..**..
+     0x0001DFE6,  // .***.********..**.
+     0x00019836,  // .**..**.....**.**.
+     0x00031833,  // **...**.....**..**
+     0x00031833,  // **...**.....**..**
+     0x00031FE3,  // **...********...**
+     0x00031FF3,  // **...*********..**
+     0x00031833,  // **...**.....**..**
+     0x00019837,  // .**..**.....**.***
+     0x00019836,  // .**..**.....**.**.
+     0x0000F83E,  // ..*****.....*****.
+     0x0000703C,  // ...***......****..
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 175
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 176
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001E0,  // .....****.....
+     0x000003F0,  // ....******....
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000618,  // ...**....**...
+     0x00000330,  // ....**..**....
+     0x000003F0,  // ....******....
+     0x000001E0,  // .....****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 177
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 178
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ..****..
+     0x0000007F,  // .*******
+     0x00000043,  // .*....**
+     0x00000003,  // ......**
+     0x00000006,  // .....**.
+     0x00000018,  // ...**...
+     0x00000070,  // .***....
+     0x00000040,  // .*......
+     0x0000007F,  // .*******
+     0x0000003F,  // ..******
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 179
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ..****..
+     0x0000007E,  // .******.
+     0x00000046,  // .*...**.
+     0x00000006,  // .....**.
+     0x0000001C,  // ...***..
+     0x00000006,  // .....**.
+     0x00000003,  // ......**
+     0x000000C3,  // **....**
+     0x0000007E,  // .******.
+     0x0000003C,  // ..****..
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 180
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000000E,  // ....***.
+     0x0000001C,  // ...***..
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 181
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x00000FEF,  // .*******.****
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+     0x00000C00,  // .**..........
+  },
+  {             // 182
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000FF,  // ....********
+     0x000001FF,  // ...*********
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000007F6,  // .*******.**.
+     0x000003F6,  // ..******.**.
+     0x000003F6,  // ..******.**.
+     0x000000F6,  // ....****.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000036,  // ......**.**.
+     0x00000000,  // ............
+  },
+  {             // 183
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 184
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000008,  // ....*...
+     0x0000001C,  // ...***..
+     0x0000001E,  // ...****.
+     0x0000007E,  // .******.
+     0x0000001C,  // ...***..
+  },
+  {             // 185
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000008,  // ....*...
+     0x00000038,  // ..***...
+     0x00000078,  // .****...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000018,  // ...**...
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 186
+     8, 27,
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x0000003C,  // ..****..
+     0x0000003E,  // ..*****.
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x00000063,  // .**...**
+     0x0000003E,  // ..*****.
+     0x0000001C,  // ...***..
+     0x0000007E,  // .******.
+     0x0000007E,  // .******.
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+     0x00000000,  // ........
+  },
+  {             // 187
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000420,  // ..*....*.....
+     0x00000630,  // ..**...**....
+     0x00000398,  // ...***..**...
+     0x00000188,  // ....**...*...
+     0x00000198,  // ....**..**...
+     0x00000730,  // ..***..**....
+     0x00000620,  // ..**...*.....
+     0x00000420,  // ..*....*.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 188
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00018030,  // ...**.........**....
+     0x00038020,  // ..***.........*.....
+     0x00078040,  // .****........*......
+     0x000180C0,  // ...**.......**......
+     0x00018180,  // ...**......**.......
+     0x00018100,  // ...**......*........
+     0x0001830C,  // ...**.....**....**..
+     0x0001860C,  // ...**....**.....**..
+     0x0001861C,  // ...**....**....***..
+     0x00000C3C,  // ........**....****..
+     0x0000186C,  // .......**....**.**..
+     0x0000384C,  // ......***....*..**..
+     0x000030FF,  // ......**....********
+     0x000060FF,  // .....**.....********
+     0x0000E00C,  // ....***.........**..
+     0x0000C004,  // ....**...........*..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 189
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00018020,  // ...**.........*.....
+     0x00038040,  // ..***........*......
+     0x000780C0,  // .****.......**......
+     0x00018080,  // ...**.......*.......
+     0x00018180,  // ...**......**.......
+     0x00018300,  // ...**.....**........
+     0x0001863C,  // ...**....**...****..
+     0x0001867E,  // ...**....**..******.
+     0x00018C43,  // ...**...**...*....**
+     0x00001843,  // .......**....*....**
+     0x00001806,  // .......**........**.
+     0x0000300C,  // ......**........**..
+     0x00006030,  // .....**.......**....
+     0x00006040,  // .....**......*......
+     0x0000C0FF,  // ....**......********
+     0x0001803F,  // ...**.........******
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 190
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0003C010,  // ..****.........*....
+     0x0007E030,  // .******.......**....
+     0x00046060,  // .*...**......**.....
+     0x00006040,  // .....**......*......
+     0x0001C0C0,  // ...***......**......
+     0x00006180,  // .....**....**.......
+     0x0000310C,  // ......**...*....**..
+     0x000C320C,  // **....**..*.....**..
+     0x0007E61C,  // .******..**....***..
+     0x0003C43C,  // ..****...*....****..
+     0x0000086C,  // ........*....**.**..
+     0x0000184C,  // .......**....*..**..
+     0x000010FF,  // .......*....********
+     0x000020FF,  // ......*.....********
+     0x0000400C,  // .....*..........**..
+     0x00004004,  // .....*...........*..
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 191
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000000C0,  // ......**......
+     0x000000C0,  // ......**......
+     0x000001C0,  // .....***......
+     0x00000380,  // ....***.......
+     0x00000700,  // ...***........
+     0x00000600,  // ...**.........
+     0x00000C00,  // ..**..........
+     0x00000C0C,  // ..**......**..
+     0x00000C0C,  // ..**......**..
+     0x00000E1C,  // ..***....***..
+     0x000007F8,  // ...********...
+     0x000003E0,  // ....*****.....
+  },
+  {             // 192
+     15, 27,
+     0x00000700,  // ....***........
+     0x00000380,  // .....***.......
+     0x00000080,  // .......*.......
+     0x00000040,  // ........*......
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 193
+     15, 27,
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 194
+     15, 27,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000360,  // .....**.**.....
+     0x00000230,  // .....*...**....
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 195
+     15, 27,
+     0x00000000,  // ...............
+     0x00000390,  // .....***..*....
+     0x000007F0,  // ....*******....
+     0x00000020,  // .........*.....
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 196
+     15, 27,
+     0x00000000,  // ...............
+     0x00000370,  // .....**.***....
+     0x00000370,  // .....**.***....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 197
+     15, 27,
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x00000120,  // ......*..*.....
+     0x000001C0,  // ......***......
+     0x000000C0,  // .......**......
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000003E0,  // .....*****.....
+     0x00000360,  // .....**.**.....
+     0x00000370,  // .....**.***....
+     0x00000730,  // ....***..**....
+     0x00000630,  // ....**...**....
+     0x00000638,  // ....**...***...
+     0x00000E18,  // ...***....**...
+     0x00000C18,  // ...**.....**...
+     0x00000FFC,  // ...**********..
+     0x00001FFC,  // ..***********..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003806,  // .***........**.
+     0x00003006,  // .**.........**.
+     0x00003007,  // .**.........***
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 198
+     23, 27,
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x0000FFFC,  // .......**************..
+     0x0000FFFC,  // .......**************..
+     0x00018C00,  // ......**...**..........
+     0x00018C00,  // ......**...**..........
+     0x00030C00,  // .....**....**..........
+     0x00030C00,  // .....**....**..........
+     0x00070C00,  // ....***....**..........
+     0x00060FFC,  // ....**.....**********..
+     0x00060FFC,  // ....**.....**********..
+     0x000C0C00,  // ...**......**..........
+     0x000FFC00,  // ...**********..........
+     0x001FFC00,  // ..***********..........
+     0x00180C00,  // ..**.......**..........
+     0x00180C00,  // ..**.......**..........
+     0x00380C00,  // .***.......**..........
+     0x00300FFE,  // .**........***********.
+     0x00700FFE,  // ***........***********.
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+     0x00000000,  // .......................
+  },
+  {             // 199
+     17, 27,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x000007E0,  // ......******.....
+     0x00001FF0,  // ....*********....
+     0x00003838,  // ...***.....***...
+     0x0000701C,  // ..***.......***..
+     0x0000600C,  // ..**.........**..
+     0x00006000,  // ..**.............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C000,  // .**..............
+     0x0000C00C,  // .**..........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003018,  // ...**.......**...
+     0x00003C78,  // ...****...****...
+     0x00000FF0,  // .....********....
+     0x00000100,  // ........*........
+     0x00000380,  // .......***.......
+     0x000001C0,  // ........***......
+     0x000007C0,  // ......*****......
+     0x00000380,  // .......***.......
+  },
+  {             // 200
+     15, 27,
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x000000C0,  // .......**......
+     0x00000040,  // ........*......
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 201
+     15, 27,
+     0x00000070,  // ........***....
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 202
+     15, 27,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000320,  // .....**..*.....
+     0x00000230,  // .....*...**....
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 203
+     15, 27,
+     0x00000000,  // ...............
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFC,  // ..***********..
+     0x00001FFC,  // ..***********..
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001800,  // ..**...........
+     0x00001FFE,  // ..************.
+     0x00001FFE,  // ..************.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 204
+     6, 27,
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 27,
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     7, 27,
+     0x00000018,  // ..**...
+     0x0000003C,  // .****..
+     0x00000026,  // .*..**.
+     0x00000062,  // **...*.
+     0x00000000,  // .......
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 207
+     6, 27,
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     18, 27,
+     0x00000000,  // ..................
+     0x00003870,  // ....***....***....
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007038,  // ...***......***...
+     0x0000E018,  // ..***........**...
+     0x0000C00C,  // ..**..........**..
+     0x0001C000,  // .***..............
+     0x00018000,  // .**...............
+     0x00018000,  // .**...............
+     0x000181FC,  // .**......*******..
+     0x000181FC,  // .**......*******..
+     0x0001800C,  // .**...........**..
+     0x0001C00C,  // .***..........**..
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x0000703C,  // ...***......****..
+     0x00003FEC,  // ....*********.**..
+     0x00000FC4,  // ......******...*..
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 209
+     17, 27,
+     0x00000000,  // .................
+     0x00000760,  // ......***.**.....
+     0x00000FE0,  // .....*******.....
+     0x000000C0,  // .........**......
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000700C,  // ..***........**..
+     0x0000780C,  // ..****.......**..
+     0x0000780C,  // ..****.......**..
+     0x00006C0C,  // ..**.**......**..
+     0x00006E0C,  // ..**.***.....**..
+     0x0000660C,  // ..**..**.....**..
+     0x0000630C,  // ..**...**....**..
+     0x0000638C,  // ..**...***...**..
+     0x0000618C,  // ..**....**...**..
+     0x000061CC,  // ..**....***..**..
+     0x000060CC,  // ..**.....**..**..
+     0x0000606C,  // ..**......**.**..
+     0x0000607C,  // ..**......*****..
+     0x0000603C,  // ..**.......****..
+     0x0000601C,  // ..**........***..
+     0x0000601C,  // ..**........***..
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 210
+     18, 27,
+     0x00000C00,  // ......**..........
+     0x00000600,  // .......**.........
+     0x00000300,  // ........**........
+     0x00000100,  // .........*........
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 211
+     18, 27,
+     0x000000C0,  // ..........**......
+     0x00000180,  // .........**.......
+     0x00000300,  // ........**........
+     0x00000200,  // ........*.........
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 212
+     18, 27,
+     0x00000300,  // ........**........
+     0x00000780,  // .......****.......
+     0x00000480,  // .......*..*.......
+     0x00000840,  // ......*....*......
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 213
+     18, 27,
+     0x00000000,  // ..................
+     0x00000E60,  // ......***..**.....
+     0x00000FC0,  // ......******......
+     0x000000C0,  // ..........**......
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 214
+     18, 27,
+     0x00000000,  // ..................
+     0x00000CC0,  // ......**..**......
+     0x00000CC0,  // ......**..**......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC0,  // ......******......
+     0x00003FF0,  // ....**********....
+     0x00007078,  // ...***.....****...
+     0x0000E01C,  // ..***........***..
+     0x0000C00C,  // ..**..........**..
+     0x0001C00E,  // .***..........***.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x00018006,  // .**............**.
+     0x0000C00C,  // ..**..........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x00003FF0,  // ....**********....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 215
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000204,  // ...*......*..
+     0x0000070C,  // ..***....**..
+     0x00000398,  // ...***..**...
+     0x000001F0,  // ....*****....
+     0x000000E0,  // .....***.....
+     0x000000F0,  // .....****....
+     0x000001B8,  // ....**.***...
+     0x0000031C,  // ...**...***..
+     0x0000020C,  // ...*.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 216
+     18, 27,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FC6,  // ......******...**.
+     0x00003FF4,  // ....**********.*..
+     0x00007038,  // ...***......***...
+     0x0000E01C,  // ..***........***..
+     0x0000C02C,  // ..**........*.**..
+     0x0001C04E,  // .***.......*..***.
+     0x000180C6,  // .**.......**...**.
+     0x00018186,  // .**......**....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018606,  // .**....**......**.
+     0x00018C06,  // .**...**.......**.
+     0x00019806,  // .**..**........**.
+     0x0000F00C,  // ..****........**..
+     0x0000E01C,  // ..***........***..
+     0x00007038,  // ...***......***...
+     0x0001FFF0,  // .*************....
+     0x00011FC0,  // .*...*******......
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 217
+     17, 27,
+     0x00000E00,  // .....***.........
+     0x00000600,  // ......**.........
+     0x00000300,  // .......**........
+     0x00000180,  // ........**.......
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 218
+     17, 27,
+     0x000000C0,  // .........**......
+     0x00000180,  // ........**.......
+     0x00000100,  // ........*........
+     0x00000200,  // .......*.........
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 219
+     17, 27,
+     0x00000380,  // .......***.......
+     0x00000380,  // .......***.......
+     0x000006C0,  // ......**.**......
+     0x00000C40,  // .....**...*......
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 220
+     17, 27,
+     0x00000000,  // .................
+     0x00000EC0,  // .....***.**......
+     0x00000EC0,  // .....***.**......
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x0000600C,  // ..**.........**..
+     0x00003038,  // ...**......***...
+     0x00003FF0,  // ...**********....
+     0x00000FE0,  // .....*******.....
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 221
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 222
+     15, 27,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00000C1C,  // ...**.....***..
+     0x0000180C,  // ..**.......**..
+     0x00001804,  // ..**........*..
+     0x00001800,  // ..**...........
+     0x00001C00,  // ..***..........
+     0x00000F80,  // ...*****.......
+     0x000007F8,  // ....********...
+     0x0000007C,  // ........*****..
+     0x0000000E,  // ...........***.
+     0x00000006,  // ............**.
+     0x00003006,  // .**.........**.
+     0x00001806,  // ..**........**.
+     0x0000180C,  // ..**.......**..
+     0x00000FF8,  // ...*********...
+     0x000007F0,  // ....*******....
+     0x00000080,  // .......*.......
+     0x000001C0,  // ......***......
+     0x000001E0,  // ......****.....
+     0x000007E0,  // ....******.....
+     0x000001C0,  // ......***......
+  },
+  {             // 223
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000003F8,  // ....*******...
+     0x0000071C,  // ...***...***..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000060C,  // ...**.....**..
+     0x0000061C,  // ...**....***..
+     0x00000670,  // ...**..***....
+     0x00000678,  // ...**..****...
+     0x0000060C,  // ...**.....**..
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x00000606,  // ...**......**.
+     0x0000060C,  // ...**.....**..
+     0x0000067C,  // ...**..*****..
+     0x00000670,  // ...**..***....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 224
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 225
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 226
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 227
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 228
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 229
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x00000120,  // ....*..*.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007FC,  // ..*********..
+     0x0000060C,  // ..**.....**..
+     0x0000040C,  // ..*......**..
+     0x0000000C,  // .........**..
+     0x000001FC,  // ....*******..
+     0x000007CC,  // ..*****..**..
+     0x00000E0C,  // .***.....**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFE,  // .***********.
+     0x000003EE,  // ...*****.***.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 230
+     20, 27,
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x0000F9F8,  // ....*****..******...
+     0x0003FFFC,  // ..****************..
+     0x0003070E,  // ..**.....***....***.
+     0x00020606,  // ..*......**......**.
+     0x00000E06,  // ........***......**.
+     0x0001FFFE,  // ...****************.
+     0x0003F7FE,  // ..******.**********.
+     0x00070600,  // .***.....**.........
+     0x00060606,  // .**......**......**.
+     0x00060F0E,  // .**.....****....***.
+     0x0007FBFC,  // .********.********..
+     0x0003E1F8,  // ..*****....******...
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+     0x00000000,  // ....................
+  },
+  {             // 231
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000000F8,  // ....*****...
+     0x000003FC,  // ..********..
+     0x0000030E,  // ..**....***.
+     0x00000606,  // .**......**.
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000600,  // .**.........
+     0x00000606,  // .**......**.
+     0x0000030E,  // ..**....***.
+     0x0000039C,  // ..***..***..
+     0x000001F8,  // ...******...
+     0x00000040,  // .....*......
+     0x00000070,  // .....***....
+     0x00000070,  // .....***....
+     0x000001F0,  // ...*****....
+     0x00000060,  // .....**.....
+  },
+  {             // 232
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 233
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000038,  // .......***...
+     0x00000070,  // ......***....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 234
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000000B0,  // .....*.**....
+     0x00000190,  // ....**..*....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 235
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001B8,  // ....**.***...
+     0x000001B8,  // ....**.***...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000003F8,  // ...*******...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000C00,  // .**..........
+     0x00000C04,  // .**.......*..
+     0x0000060C,  // ..**.....**..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 236
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000038,  // ***...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 237
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 238
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000E,  // ..***.
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 239
+     6, 27,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 240
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x0000071C,  // ..***...***..
+     0x000007FC,  // ..*********..
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x000001EC,  // ....****.**..
+     0x000007FC,  // ..*********..
+     0x0000061C,  // ..**....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x0000061C,  // ..**....***..
+     0x000003FC,  // ...********..
+     0x000001EC,  // ....****.**..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x000003E0,  // ...*****.....
+  },
+  {             // 241
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000004F8,  // ..*..*****...
+     0x000007FC,  // ..*********..
+     0x0000070C,  // ..***....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x0000060C,  // ..**.....**..
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 242
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 243
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 244
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 245
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000180,  // ....**.......
+     0x000003F8,  // ...*******...
+     0x00000270,  // ...*..***....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 246
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003B0,  // ...***.**....
+     0x000003B0,  // ...***.**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001F0,  // ....*****....
+     0x000007F8,  // ..********...
+     0x0000061C,  // ..**....***..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x0000061C,  // ..**....***..
+     0x000007F8,  // ..********...
+     0x000001F0,  // ....*****....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 247
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FFE,  // .***********.
+     0x00000FFE,  // .***********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000060,  // ......**.....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 248
+     14, 27,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E4,  // ....*****..*..
+     0x00000FF8,  // ..*********...
+     0x00000C18,  // ..**.....**...
+     0x0000183C,  // .**.....****..
+     0x0000184C,  // .**....*..**..
+     0x000018CC,  // .**...**..**..
+     0x0000198C,  // .**..**...**..
+     0x00001B0C,  // .**.**....**..
+     0x00001A1C,  // .**.*....***..
+     0x00000C38,  // ..**....***...
+     0x00000FF0,  // ..********....
+     0x000013E0,  // .*..*****.....
+     0x00001000,  // .*............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 249
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000380,  // ...***.......
+     0x000000C0,  // .....**......
+     0x00000040,  // ......*......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 250
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000070,  // ......***....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 251
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000E0,  // .....***.....
+     0x000001A0,  // ....**.*.....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 252
+     13, 27,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000370,  // ...**.***....
+     0x00000130,  // ....*..**....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C1C,  // .**.....***..
+     0x00000FFC,  // .**********..
+     0x000003E0,  // ...*****.....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 253
+     5, 27,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 254
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001F8,  // ...******...
+     0x000003FC,  // ..********..
+     0x0000060C,  // .**.....**..
+     0x00000600,  // .**.........
+     0x00000700,  // .***........
+     0x000003F0,  // ..******....
+     0x000000FC,  // ....******..
+     0x0000000E,  // ........***.
+     0x00000606,  // .**......**.
+     0x00000606,  // .**......**.
+     0x000007FC,  // .*********..
+     0x000001F8,  // ...******...
+     0x00000020,  // ......*.....
+     0x00000070,  // .....***....
+     0x00000078,  // .....****...
+     0x000001F8,  // ...******...
+     0x00000070,  // .....***....
+  },
+  {             // 255
+     12, 27,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000001B8,  // ...**.***...
+     0x000001B8,  // ...**.***...
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000606,  // .**......**.
+     0x0000060E,  // .**.....***.
+     0x0000060C,  // .**.....**..
+     0x0000030C,  // ..**....**..
+     0x00000318,  // ..**...**...
+     0x00000318,  // ..**...**...
+     0x00000198,  // ...**..**...
+     0x000001B0,  // ...**.**....
+     0x000001B0,  // ...**.**....
+     0x000000F0,  // ....****....
+     0x000000E0,  // ....***.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x000000C0,  // ....**......
+     0x000001C0,  // ...***......
+     0x00000780,  // .****.......
+     0x00000700,  // .***........
+  },
+  };
diff --git a/fontsml-iso8859-9.c b/fontsml-iso8859-9.c
new file mode 100644
index 000000000..3456be2c3
--- /dev/null
+++ b/fontsml-iso8859-9.c
@@ -0,0 +1,5602 @@
+static const cFont::tPixelData FontSml_iso8859_9[][24] = {
+  {             // 32
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 33
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000008,  // ..*...
+     0x00000008,  // ..*...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 34
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 35
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x000001FF,  // .*********
+     0x000001FF,  // .*********
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x00000048,  // ...*..*...
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000090,  // ..*..*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 36
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000010,  // .....*....
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000196,  // .**..*.**.
+     0x00000190,  // .**..*....
+     0x000001D0,  // .***.*....
+     0x000000F0,  // ..****....
+     0x0000007C,  // ...*****..
+     0x0000001E,  // .....****.
+     0x00000013,  // .....*..**
+     0x00000193,  // .**..*..**
+     0x000001D7,  // .***.*.***
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000010,  // .....*....
+     0x00000010,  // .....*....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 37
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00003C30,  // ..****....**....
+     0x00006660,  // .**..**..**.....
+     0x00006660,  // .**..**..**.....
+     0x000066C0,  // .**..**.**......
+     0x000066C0,  // .**..**.**......
+     0x00003D80,  // ..****.**.......
+     0x00000180,  // .......**.......
+     0x0000033C,  // ......**..****..
+     0x00000366,  // ......**.**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000666,  // .....**..**..**.
+     0x00000C66,  // ....**...**..**.
+     0x00000C3C,  // ....**....****..
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 38
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000003C0,  // ...****......
+     0x000007E0,  // ..******.....
+     0x00000660,  // ..**..**.....
+     0x00000660,  // ..**..**.....
+     0x000003C0,  // ...****......
+     0x000007C0,  // ..*****......
+     0x00000EEC,  // .***.***.**..
+     0x00000C6C,  // .**...**.**..
+     0x00000C3C,  // .**....****..
+     0x00000C38,  // .**....***...
+     0x00000E7C,  // .***..*****..
+     0x000007EE,  // ..******.***.
+     0x000003C7,  // ...****...***
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 39
+     3, 22,
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000002,  // .*.
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+     0x00000000,  // ...
+  },
+  {             // 40
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000004,  // ...*..
+  },
+  {             // 41
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000010,  // .*....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000010,  // .*....
+  },
+  {             // 42
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000008,  // ...*...
+     0x0000002A,  // .*.*.*.
+     0x0000003E,  // .*****.
+     0x00000008,  // ...*...
+     0x0000003E,  // .*****.
+     0x0000002A,  // .*.*.*.
+     0x00000008,  // ...*...
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 43
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 44
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 45
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // *****. added by hand to avoid flickering!!!
+     0x0000003E,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 46
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 47
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 48
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 49
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // .....**...
+     0x000000F8,  // ..*****...
+     0x000000F8,  // ..*****...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 50
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000006,  // .......**.
+     0x0000000E,  // ......***.
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x00000180,  // .**.......
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 51
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000000C,  // ......**..
+     0x00000038,  // ....***...
+     0x0000003C,  // ....****..
+     0x0000000E,  // ......***.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 52
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x0000001C,  // .....***..
+     0x0000003C,  // ....****..
+     0x0000006C,  // ...**.**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x0000018C,  // .**...**..
+     0x0000030C,  // **....**..
+     0x000003FE,  // *********.
+     0x000003FE,  // *********.
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 53
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FC,  // .*******..
+     0x000001FC,  // .*******..
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001F8,  // .******...
+     0x000001FC,  // .*******..
+     0x0000018E,  // .**...***.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 54
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001B8,  // .**.***...
+     0x000001FC,  // .*******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 55
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000006,  // .......**.
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x000000C0,  // ..**......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 56
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000FC,  // ..******..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 57
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FE,  // ..*******.
+     0x00000076,  // ...***.**.
+     0x00000006,  // .......**.
+     0x00000006,  // .......**.
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 58
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 59
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000004,  // ..*..
+     0x00000004,  // ..*..
+     0x00000008,  // .*...
+     0x00000000,  // .....
+  },
+  {             // 60
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000006,  // .......**.
+     0x0000001E,  // .....****.
+     0x00000078,  // ...****...
+     0x000000E0,  // ..***.....
+     0x00000180,  // .**.......
+     0x000000E0,  // ..***.....
+     0x00000078,  // ...****...
+     0x0000001E,  // .....****.
+     0x00000006,  // .......**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 61
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x00000000,  // ...........
+     0x000001FC,  // ..*******..
+     0x000001FC,  // ..*******..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 62
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000180,  // .**.......
+     0x000001E0,  // .****.....
+     0x00000078,  // ...****...
+     0x0000001C,  // .....***..
+     0x00000006,  // .......**.
+     0x0000001C,  // .....***..
+     0x00000078,  // ...****...
+     0x000001E0,  // .****.....
+     0x00000180,  // .**.......
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 63
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000F8,  // ..*****...
+     0x000001FC,  // .*******..
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x0000001C,  // .....***..
+     0x00000038,  // ....***...
+     0x00000070,  // ...***....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 64
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x000007E0,  // .......******.....
+     0x00001FF8,  // .....**********...
+     0x0000381C,  // ....***......***..
+     0x0000600C,  // ...**.........**..
+     0x0000C7A6,  // ..**...****.*..**.
+     0x0000CEE6,  // ..**..***.***..**.
+     0x00018C66,  // .**...**...**..**.
+     0x000198C6,  // .**..**...**...**.
+     0x000198CC,  // .**..**...**..**..
+     0x000198CC,  // .**..**...**..**..
+     0x00019998,  // .**..**..**..**...
+     0x00019FF0,  // .**..*********....
+     0x0000CEE0,  // ..**..***.***.....
+     0x0000E000,  // ..***.............
+     0x00007000,  // ...***............
+     0x00003FE0,  // ....*********.....
+     0x00000FC0,  // ......******......
+     0x00000000,  // ..................
+  },
+  {             // 65
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 66
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000FF0,  // .********....
+     0x00000FF8,  // .*********...
+     0x00000C1C,  // .**.....***..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C18,  // .**.....**...
+     0x00000FF8,  // .*********...
+     0x00000FFC,  // .**********..
+     0x00000C0E,  // .**......***.
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000C0E,  // .**......***.
+     0x00000FFC,  // .**********..
+     0x00000FF8,  // .*********...
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 67
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 68
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x00001806,  // .**........**.
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 69
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 70
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000003FE,  // ..*********.
+     0x000003FE,  // ..*********.
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x000003FC,  // ..********..
+     0x000003FC,  // ..********..
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000300,  // ..**........
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 71
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003F0,  // .....******....
+     0x00000FFC,  // ...**********..
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000303E,  // .**......*****.
+     0x0000303E,  // .**......*****.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFE,  // ...***********.
+     0x000003F6,  // .....******.**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 72
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00001FFC,  // .***********..
+     0x00001FFC,  // .***********..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 73
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 74
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000000C,  // ......**..
+     0x0000030C,  // **....**..
+     0x0000030C,  // **....**..
+     0x0000039C,  // ***..***..
+     0x000001F8,  // .******...
+     0x000000F0,  // ..****....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 75
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000C0E,  // ..**......***.
+     0x00000C1C,  // ..**.....***..
+     0x00000C38,  // ..**....***...
+     0x00000C70,  // ..**...***....
+     0x00000CE0,  // ..**..***.....
+     0x00000DC0,  // ..**.***......
+     0x00000F80,  // ..*****.......
+     0x00000FC0,  // ..******......
+     0x00000CE0,  // ..**..***.....
+     0x00000C70,  // ..**...***....
+     0x00000C38,  // ..**....***...
+     0x00000C1C,  // ..**.....***..
+     0x00000C0E,  // ..**......***.
+     0x00000C07,  // ..**.......***
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 76
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 77
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006006,  // .**..........**.
+     0x00006006,  // .**..........**.
+     0x0000700E,  // .***........***.
+     0x0000700E,  // .***........***.
+     0x0000781E,  // .****......****.
+     0x0000781E,  // .****......****.
+     0x00006C36,  // .**.**....**.**.
+     0x00006C36,  // .**.**....**.**.
+     0x00006666,  // .**..**..**..**.
+     0x00006666,  // .**..**..**..**.
+     0x00006246,  // .**...*..*...**.
+     0x000063C6,  // .**...****...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 78
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 79
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 80
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000007F8,  // ..********...
+     0x000007FC,  // ..*********..
+     0x0000060E,  // ..**.....***.
+     0x00000606,  // ..**......**.
+     0x00000606,  // ..**......**.
+     0x0000060E,  // ..**.....***.
+     0x000007FC,  // ..*********..
+     0x000007F8,  // ..********...
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 81
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000386E,  // .***....**.***.
+     0x0000186C,  // ..**....**.**..
+     0x00001C3C,  // ..***....****..
+     0x00000FF8,  // ...*********...
+     0x000003EC,  // .....*****.**..
+     0x0000000C,  // ...........**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 82
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00001FF0,  // .*********....
+     0x00001FF8,  // .**********...
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000181C,  // .**......***..
+     0x00001FF8,  // .**********...
+     0x00001FF0,  // .*********....
+     0x00001818,  // .**......**...
+     0x00001818,  // .**......**...
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 83
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // ....****.....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x00000038,  // .......***...
+     0x0000001C,  // ........***..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 84
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000060,  // .....**.....
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 85
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 86
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 87
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018306,  // .**.....**.....**.
+     0x00018786,  // .**....****....**.
+     0x0000C78C,  // ..**...****...**..
+     0x0000C48C,  // ..**...*..*...**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x0000CCCC,  // ..**..**..**..**..
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006CD8,  // ...**.**..**.**...
+     0x00006858,  // ...**.*....*.**...
+     0x00003870,  // ....***....***....
+     0x00003030,  // ....**......**....
+     0x00003030,  // ....**......**....
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 88
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x0000060C,  // ..**.....**..
+     0x0000071C,  // ..***...***..
+     0x00000318,  // ...**...**...
+     0x000001B0,  // ....**.**....
+     0x000000E0,  // .....***.....
+     0x000000E0,  // .....***.....
+     0x000001B0,  // ....**.**....
+     0x00000318,  // ...**...**...
+     0x0000071C,  // ..***...***..
+     0x0000060C,  // ..**.....**..
+     0x00000C06,  // .**.......**.
+     0x00000C06,  // .**.......**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 89
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00000618,  // ..**....**...
+     0x00000738,  // ..***..***...
+     0x00000330,  // ...**..**....
+     0x000001E0,  // ....****.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 90
+     12, 22,
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000006,  // .........**.
+     0x0000000C,  // ........**..
+     0x00000018,  // .......**...
+     0x00000030,  // ......**....
+     0x00000060,  // .....**.....
+     0x000000E0,  // ....***.....
+     0x000000C0,  // ....**......
+     0x00000180,  // ...**.......
+     0x00000300,  // ..**........
+     0x00000600,  // .**.........
+     0x000007FE,  // .**********.
+     0x000007FE,  // .**********.
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+     0x00000000,  // ............
+  },
+  {             // 91
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+  },
+  {             // 92
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x00000018,  // **...
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000003,  // ...**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 93
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001E,  // ****.
+  },
+  {             // 94
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000010,  // ....*....
+     0x00000038,  // ...***...
+     0x0000006C,  // ..**.**..
+     0x0000006C,  // ..**.**..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 95
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000007FF,  // ***********
+     0x000007FF,  // ***********
+  },
+  {             // 96
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 97
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 98
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 99
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 100
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 101
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 102
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000007,  // ...***
+     0x0000000F,  // ..****
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 103
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x00000070,  // ....***....
+  },
+  {             // 104
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 105
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 106
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x00000006,  // ..**.
+     0x0000001E,  // ****.
+     0x0000001C,  // ***..
+  },
+  {             // 107
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C0,  // .**......
+     0x000000C6,  // .**...**.
+     0x000000CC,  // .**..**..
+     0x000000D8,  // .**.**...
+     0x000000F0,  // .****....
+     0x000000F8,  // .*****...
+     0x000000D8,  // .**.**...
+     0x000000CC,  // .**..**..
+     0x000000CE,  // .**..***.
+     0x000000C6,  // .**...**.
+     0x000000C7,  // .**...***
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 108
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 109
+     16, 22,
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00006F3C,  // .**.****..****..
+     0x00007FFE,  // .**************.
+     0x000071C6,  // .***...***...**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00006186,  // .**....**....**.
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+     0x00000000,  // ................
+  },
+  {             // 110
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 111
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 112
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000378,  // .**.****...
+     0x000003FC,  // .********..
+     0x0000038C,  // .***...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000038C,  // .***...**..
+     0x000003FC,  // .********..
+     0x00000378,  // .**.****...
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+     0x00000300,  // .**........
+  },
+  {             // 113
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x0000018E,  // ..**...***.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+  },
+  {             // 114
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001B,  // .**.**
+     0x0000001B,  // .**.**
+     0x0000001C,  // .***..
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000018,  // .**...
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 115
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 116
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000003F,  // ******
+     0x0000003F,  // ******
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000F,  // ..****
+     0x00000007,  // ...***
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 117
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 118
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 119
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x000018C6,  // .**...**...**.
+     0x00000CCC,  // ..**..**..**..
+     0x00000CCC,  // ..**..**..**..
+     0x00000D2C,  // ..**.*..*.**..
+     0x00000528,  // ...*.*..*.*...
+     0x00000738,  // ...***..***...
+     0x00000330,  // ....**..**....
+     0x00000330,  // ....**..**....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 120
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x000001CE,  // .***..***.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 121
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
+  },
+  {             // 122
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000006,  // ......**.
+     0x0000000C,  // .....**..
+     0x00000018,  // ....**...
+     0x00000030,  // ...**....
+     0x00000060,  // ..**.....
+     0x000000C0,  // .**......
+     0x000000FE,  // .*******.
+     0x000000FE,  // .*******.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 123
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000006,  // ....**.
+     0x0000000C,  // ...**..
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000030,  // .**....
+     0x00000060,  // **.....
+     0x00000030,  // .**....
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x00000018,  // ..**...
+     0x0000000C,  // ...**..
+     0x00000006,  // ....**.
+  },
+  {             // 124
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+  },
+  {             // 125
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000006,  // ...**.
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x00000030,  // **....
+  },
+  {             // 126
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000E6,  // ..***..**.
+     0x000001FE,  // .********.
+     0x0000019C,  // .**..***..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 127
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 128
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 129
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 130
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 131
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 132
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 133
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 134
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 135
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 136
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 137
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 138
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 139
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 140
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 141
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 142
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 143
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 144
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 145
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 146
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 147
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 148
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 149
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 150
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 151
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 152
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 153
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 154
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 155
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 156
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 157
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 158
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 159
+     0, 22,
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+     0x00000000,  // 
+  },
+  {             // 160
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 161
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000004,  // ...*..
+     0x00000004,  // ...*..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+  },
+  {             // 162
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000008,  // ......*...
+     0x00000008,  // ......*...
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000D6,  // ..**.*.**.
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x00000190,  // .**..*....
+     0x000000D6,  // ..**.*.**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000020,  // ....*.....
+     0x00000020,  // ....*.....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 163
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000180,  // .**.......
+     0x000000C0,  // ..**......
+     0x000001F8,  // .******...
+     0x00000060,  // ...**.....
+     0x00000060,  // ...**.....
+     0x000000C0,  // ..**......
+     0x00000182,  // .**.....*.
+     0x000003FE,  // *********.
+     0x0000037C,  // **.*****..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 164
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000001FE,  // .********.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 165
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 166
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+  },
+  {             // 167
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001E0,  // .****.....
+     0x000000F8,  // ..*****...
+     0x000000DC,  // ..**.***..
+     0x0000018E,  // .**...***.
+     0x00000186,  // .**....**.
+     0x000001C6,  // .***...**.
+     0x000000E6,  // ..***..**.
+     0x0000007C,  // ...*****..
+     0x0000001C,  // .....***..
+     0x0000000E,  // ......***.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000FC,  // ..******..
+     0x00000078,  // ...****...
+  },
+  {             // 168
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000036,  // **.**.
+     0x00000036,  // **.**.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 169
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000C18,  // ...**.....**...
+     0x00001004,  // ..*.........*..
+     0x000011C4,  // ..*...***...*..
+     0x00002222,  // .*...*...*...*.
+     0x00002422,  // .*..*....*...*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002402,  // .*..*........*.
+     0x00002222,  // .*...*...*...*.
+     0x000011C4,  // ..*...***...*..
+     0x00001004,  // ..*.........*..
+     0x00000C18,  // ...**.....**...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 170
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ..***..
+     0x00000026,  // .*..**.
+     0x0000000E,  // ...***.
+     0x00000012,  // ..*..*.
+     0x00000036,  // .**.**.
+     0x0000001A,  // ..**.*.
+     0x00000000,  // .......
+     0x0000003E,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 171
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 172
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000003FE,  // .*********.
+     0x000003FE,  // .*********.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000006,  // ........**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 173
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000003E,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 174
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000003E0,  // ....*****.....
+     0x00000C18,  // ..**.....**...
+     0x00001004,  // .*.........*..
+     0x000013E4,  // .*..*****..*..
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x00002212,  // *...*....*..*.
+     0x000023E2,  // *...*****...*.
+     0x00002242,  // *...*..*....*.
+     0x00002222,  // *...*...*...*.
+     0x00001214,  // .*..*....*.*..
+     0x00001004,  // .*.........*..
+     0x00000C18,  // ..**.....**...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 175
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001F,  // *****
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 176
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 177
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 178
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000018,  // .**...
+     0x0000003E,  // *****.
+     0x0000003E,  // *****.
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 179
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000001C,  // .***..
+     0x0000003E,  // *****.
+     0x00000026,  // *..**.
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000026,  // *..**.
+     0x0000003E,  // *****.
+     0x0000001C,  // .***..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 180
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 181
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001CE,  // .***..***.
+     0x000001FE,  // .********.
+     0x000001B6,  // .**.**.**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+  },
+  {             // 182
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007E,  // ...******.
+     0x000000E4,  // ..***..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000001E4,  // .****..*..
+     0x000000E4,  // ..***..*..
+     0x00000064,  // ...**..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+     0x00000024,  // ....*..*..
+  },
+  {             // 183
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 184
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000E,  // .***.
+     0x00000003,  // ...**
+     0x0000001B,  // **.**
+     0x0000001E,  // ****.
+  },
+  {             // 185
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000003C,  // ****..
+     0x0000003C,  // ****..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 186
+     7, 22,
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x0000001C,  // ..***..
+     0x00000036,  // .**.**.
+     0x00000022,  // .*...*.
+     0x00000022,  // .*...*.
+     0x00000036,  // .**.**.
+     0x0000001C,  // ..***..
+     0x00000000,  // .......
+     0x0000003E,  // .*****.
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+     0x00000000,  // .......
+  },
+  {             // 187
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x000000D8,  // .**.**...
+     0x0000006C,  // ..**.**..
+     0x00000036,  // ...**.**.
+     0x00000036,  // ...**.**.
+     0x0000006C,  // ..**.**..
+     0x000000D8,  // .**.**...
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 188
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001818,  // ..**......**...
+     0x00007818,  // ****......**...
+     0x00007830,  // ****.....**....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x000018C4,  // ..**...**...*..
+     0x0000188C,  // ..**...*...**..
+     0x0000199C,  // ..**..**..***..
+     0x0000033C,  // .....**..****..
+     0x0000036C,  // .....**.**.**..
+     0x0000067E,  // ....**..******.
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 189
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00001818,  // ..**......**...
+     0x00007818,  // ****......**...
+     0x00007830,  // ****.....**....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x000018DC,  // ..**...**.***..
+     0x000018BE,  // ..**...*.*****.
+     0x000019A6,  // ..**..**.*..**.
+     0x00000306,  // .....**.....**.
+     0x0000030C,  // .....**....**..
+     0x00000618,  // ....**....**...
+     0x00000C3E,  // ...**....*****.
+     0x00000C3E,  // ...**....*****.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 190
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00003818,  // .***......**...
+     0x00007C18,  // *****.....**...
+     0x00004C30,  // *..**....**....
+     0x00001860,  // ..**....**.....
+     0x00001860,  // ..**....**.....
+     0x00004CC4,  // *..**..**...*..
+     0x00007C8C,  // *****..*...**..
+     0x0000399C,  // .***..**..***..
+     0x0000033C,  // .....**..****..
+     0x0000036C,  // .....**.**.**..
+     0x0000067E,  // ....**..******.
+     0x00000C0C,  // ...**......**..
+     0x00000C0C,  // ...**......**..
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 191
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000070,  // ...***....
+     0x000000E0,  // ..***.....
+     0x000001C0,  // .***......
+     0x0000018C,  // .**...**..
+     0x0000018C,  // .**...**..
+     0x000001FC,  // .*******..
+     0x000000F8,  // ..*****...
+  },
+  {             // 192
+     13, 22,
+     0x00000300,  // ...**........
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 193
+     13, 22,
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x000000C0,  // .....**......
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 194
+     13, 22,
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 195
+     13, 22,
+     0x00000190,  // ....**..*....
+     0x000002D0,  // ...*.**.*....
+     0x00000260,  // ...*..**.....
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 196
+     13, 22,
+     0x00000000,  // .............
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 197
+     13, 22,
+     0x00000000,  // .............
+     0x000000C0,  // .....**......
+     0x00000120,  // ....*..*.....
+     0x00000120,  // ....*..*.....
+     0x000000C0,  // .....**......
+     0x000000C0,  // .....**......
+     0x000001E0,  // ....****.....
+     0x000001E0,  // ....****.....
+     0x00000330,  // ...**..**....
+     0x00000330,  // ...**..**....
+     0x00000618,  // ..**....**...
+     0x00000618,  // ..**....**...
+     0x000007F8,  // ..********...
+     0x00000FFC,  // .**********..
+     0x00000C0C,  // .**......**..
+     0x00000C0C,  // .**......**..
+     0x00001806,  // **........**.
+     0x00001806,  // **........**.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 198
+     18, 22,
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000FFE,  // ......***********.
+     0x00000FFE,  // ......***********.
+     0x00001B00,  // .....**.**........
+     0x00001B00,  // .....**.**........
+     0x00003300,  // ....**..**........
+     0x00003300,  // ....**..**........
+     0x000063FC,  // ...**...********..
+     0x000063FC,  // ...**...********..
+     0x00007F00,  // ...*******........
+     0x0000FF00,  // ..********........
+     0x0000C300,  // ..**....**........
+     0x0000C300,  // ..**....**........
+     0x000183FE,  // .**.....*********.
+     0x000183FE,  // .**.....*********.
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+     0x00000000,  // ..................
+  },
+  {             // 199
+     14, 22,
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x000001F0,  // .....*****....
+     0x000007FC,  // ...*********..
+     0x00000E0E,  // ..***.....***.
+     0x00000C06,  // ..**.......**.
+     0x00001C00,  // .***..........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001800,  // .**...........
+     0x00001C00,  // .***..........
+     0x00000C06,  // ..**.......**.
+     0x00000E0E,  // ..***.....***.
+     0x000007FC,  // ...*********..
+     0x000001F0,  // .....*****....
+     0x000000C0,  // ......**......
+     0x00000060,  // .......**.....
+     0x00000360,  // ....**.**.....
+     0x000003C0,  // ....****......
+  },
+  {             // 200
+     13, 22,
+     0x00000180,  // ....**.......
+     0x000000C0,  // .....**......
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 201
+     13, 22,
+     0x00000018,  // ........**...
+     0x00000030,  // .......**....
+     0x00000060,  // ......**.....
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 202
+     13, 22,
+     0x00000060,  // ......**.....
+     0x000000F0,  // .....****....
+     0x00000198,  // ....**..**...
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 203
+     13, 22,
+     0x00000000,  // .............
+     0x00000198,  // ....**..**...
+     0x00000198,  // ....**..**...
+     0x00000000,  // .............
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FC,  // ..*********..
+     0x000007FC,  // ..*********..
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x00000600,  // ..**.........
+     0x000007FE,  // ..**********.
+     0x000007FE,  // ..**********.
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+  },
+  {             // 204
+     6, 22,
+     0x00000030,  // **....
+     0x00000018,  // .**...
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 205
+     6, 22,
+     0x00000003,  // ....**
+     0x00000006,  // ...**.
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 206
+     6, 22,
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000021,  // *....*
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 207
+     6, 22,
+     0x00000000,  // ......
+     0x00000033,  // **..**
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 208
+     15, 22,
+     0x00000E1C,  // ...***....***..
+     0x00000FFC,  // ...**********..
+     0x000003F0,  // .....******....
+     0x00000000,  // ...............
+     0x000003F0,  // .....******....
+     0x00000FFC,  // ...**********..
+     0x00001C0E,  // ..***......***.
+     0x00001806,  // ..**........**.
+     0x00003806,  // .***........**.
+     0x00003000,  // .**............
+     0x00003000,  // .**............
+     0x0000303E,  // .**......*****.
+     0x0000303E,  // .**......*****.
+     0x00003806,  // .***........**.
+     0x00001806,  // ..**........**.
+     0x00001C0E,  // ..***......***.
+     0x00000FFE,  // ...***********.
+     0x000003F6,  // .....******.**.
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 209
+     14, 22,
+     0x00000190,  // .....**..*....
+     0x000002D0,  // ....*.**.*....
+     0x00000260,  // ....*..**.....
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x00001C0C,  // .***......**..
+     0x00001E0C,  // .****.....**..
+     0x00001E0C,  // .****.....**..
+     0x00001B0C,  // .**.**....**..
+     0x0000198C,  // .**..**...**..
+     0x0000198C,  // .**..**...**..
+     0x000018CC,  // .**...**..**..
+     0x000018CC,  // .**...**..**..
+     0x0000186C,  // .**....**.**..
+     0x0000183C,  // .**.....****..
+     0x0000183C,  // .**.....****..
+     0x0000181C,  // .**......***..
+     0x0000180C,  // .**.......**..
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 210
+     15, 22,
+     0x00000600,  // ....**.........
+     0x00000300,  // .....**........
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 211
+     15, 22,
+     0x00000060,  // ........**.....
+     0x000000C0,  // .......**......
+     0x00000180,  // ......**.......
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 212
+     15, 22,
+     0x000000C0,  // .......**......
+     0x000001E0,  // ......****.....
+     0x00000330,  // .....**..**....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 213
+     15, 22,
+     0x00000190,  // ......**..*....
+     0x000002D0,  // .....*.**.*....
+     0x00000260,  // .....*..**.....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 214
+     15, 22,
+     0x00000000,  // ...............
+     0x00000330,  // .....**..**....
+     0x00000330,  // .....**..**....
+     0x00000000,  // ...............
+     0x000003E0,  // .....*****.....
+     0x00000FF8,  // ...*********...
+     0x00001C1C,  // ..***.....***..
+     0x0000180C,  // ..**.......**..
+     0x0000380E,  // .***.......***.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x00003006,  // .**.........**.
+     0x0000380E,  // .***.......***.
+     0x0000180C,  // ..**.......**..
+     0x00001C1C,  // ..***.....***..
+     0x00000FF8,  // ...*********...
+     0x000003E0,  // .....*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 215
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000303,  // **......**
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000186,  // .**....**.
+     0x00000303,  // **......**
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 216
+     15, 22,
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x000003E6,  // .....*****..**.
+     0x00000FFC,  // ...**********..
+     0x00001C18,  // ..***.....**...
+     0x0000183C,  // ..**.....****..
+     0x0000386E,  // .***....**.***.
+     0x000030C6,  // .**....**...**.
+     0x00003186,  // .**...**....**.
+     0x00003106,  // .**...*.....**.
+     0x00003306,  // .**..**.....**.
+     0x0000360E,  // .**.**.....***.
+     0x00001C0C,  // ..***......**..
+     0x00001C1C,  // ..***.....***..
+     0x000037F8,  // .**.********...
+     0x000063E0,  // **...*****.....
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+     0x00000000,  // ...............
+  },
+  {             // 217
+     14, 22,
+     0x00000300,  // ....**........
+     0x00000180,  // .....**.......
+     0x000000C0,  // ......**......
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 218
+     14, 22,
+     0x00000060,  // .......**.....
+     0x000000C0,  // ......**......
+     0x00000180,  // .....**.......
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 219
+     14, 22,
+     0x000000C0,  // ......**......
+     0x000001E0,  // .....****.....
+     0x00000330,  // ....**..**....
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 220
+     14, 22,
+     0x00000000,  // ..............
+     0x00000630,  // ...**...**....
+     0x00000630,  // ...**...**....
+     0x00000000,  // ..............
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x0000180C,  // .**.......**..
+     0x00000C18,  // ..**.....**...
+     0x00000FF8,  // ..*********...
+     0x000003E0,  // ....*****.....
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+     0x00000000,  // ..............
+  },
+  {             // 221
+     6, 22,
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 222
+     13, 22,
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x00000000,  // .............
+     0x000001E0,  // ....****.....
+     0x000007F8,  // ..********...
+     0x00000E1C,  // .***....***..
+     0x00000C0C,  // .**......**..
+     0x00000E00,  // .***.........
+     0x000007C0,  // ..*****......
+     0x000001F0,  // ....*****....
+     0x00000038,  // .......***...
+     0x0000001C,  // ........***..
+     0x0000000C,  // .........**..
+     0x00000C0C,  // .**......**..
+     0x00000E1C,  // .***....***..
+     0x000007F8,  // ..********...
+     0x000003F0,  // ...******....
+     0x000000C0,  // .....**......
+     0x000000E0,  // .....***.....
+     0x00000030,  // .......**....
+     0x000001B0,  // ....**.**....
+     0x000001E0,  // ....****.....
+  },
+  {             // 223
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000038,  // ...***...
+     0x0000007C,  // ..*****..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DC,  // .**.***..
+     0x000000DC,  // .**.***..
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000C6,  // .**...**.
+     0x000000DE,  // .**.****.
+     0x000000DC,  // .**.***..
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+  },
+  {             // 224
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 225
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x000000C0,  // ...**......
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 226
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 227
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 228
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000198,  // ..**..**...
+     0x00000198,  // ..**..**...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 229
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x00000090,  // ...*..*....
+     0x00000090,  // ...*..*....
+     0x00000060,  // ....**.....
+     0x000001F8,  // ..******...
+     0x0000039C,  // .***..***..
+     0x0000030C,  // .**....**..
+     0x0000001C,  // ......***..
+     0x000001FC,  // ..*******..
+     0x0000038C,  // .***...**..
+     0x0000030C,  // .**....**..
+     0x0000030C,  // .**....**..
+     0x0000039E,  // .***..****.
+     0x000001E6,  // ..****..**.
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 230
+     17, 22,
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00003F78,  // ...******.****...
+     0x000073FC,  // ..***..********..
+     0x00006186,  // ..**....**....**.
+     0x00000386,  // .......***....**.
+     0x00003FFE,  // ...*************.
+     0x00007180,  // ..***...**.......
+     0x00006180,  // ..**....**.......
+     0x000061C6,  // ..**....***...**.
+     0x000073FE,  // ..***..*********.
+     0x00003D78,  // ...****.*.****...
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+     0x00000000,  // .................
+  },
+  {             // 231
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000007C,  // ...*****..
+     0x000000FE,  // ..*******.
+     0x000000C6,  // ..**...**.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000000C6,  // ..**...**.
+     0x000000FE,  // ..*******.
+     0x0000007C,  // ...*****..
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x000000D8,  // ..**.**...
+     0x000000F0,  // ..****....
+  },
+  {             // 232
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 233
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000060,  // ...**.....
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 234
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 235
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000078,  // ...****...
+     0x000000FC,  // ..******..
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000001FE,  // .********.
+     0x00000180,  // .**.......
+     0x00000180,  // .**.......
+     0x000001C6,  // .***...**.
+     0x000000FE,  // ..*******.
+     0x00000078,  // ...****...
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 236
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x0000000C,  // **..
+     0x00000006,  // .**.
+     0x00000003,  // ..**
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 237
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000003,  // ..**
+     0x00000006,  // .**.
+     0x0000000C,  // **..
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 238
+     6, 22,
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000001E,  // .****.
+     0x00000033,  // **..**
+     0x00000000,  // ......
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x0000000C,  // ..**..
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+     0x00000000,  // ......
+  },
+  {             // 239
+     5, 22,
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000001B,  // **.**
+     0x0000001B,  // **.**
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x0000000C,  // .**..
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+     0x00000000,  // .....
+  },
+  {             // 240
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x0000038E,  // .***...***.
+     0x000003FE,  // .*********.
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x000000F6,  // ...****.**.
+     0x000001FE,  // ..********.
+     0x00000186,  // ..**....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018E,  // ..**...***.
+     0x000001FE,  // ..********.
+     0x000000F6,  // ...****.**.
+     0x00000006,  // ........**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x00000070,  // ....***....
+  },
+  {             // 241
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000064,  // ...**..*..
+     0x000000B4,  // ..*.**.*..
+     0x00000098,  // ..*..**...
+     0x00000000,  // ..........
+     0x000001BC,  // .**.****..
+     0x000001FE,  // .********.
+     0x000001C6,  // .***...**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 242
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C0,  // ...**......
+     0x00000060,  // ....**.....
+     0x00000030,  // .....**....
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 243
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000018,  // ......**...
+     0x00000030,  // .....**....
+     0x00000060,  // ....**.....
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 244
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000060,  // ....**.....
+     0x000000F0,  // ...****....
+     0x00000198,  // ..**..**...
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 245
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000C8,  // ...**..*...
+     0x00000168,  // ..*.**.*...
+     0x00000130,  // ..*..**....
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 246
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000CC,  // ...**..**..
+     0x000000CC,  // ...**..**..
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x000000F8,  // ...*****...
+     0x000001FC,  // ..*******..
+     0x0000018C,  // ..**...**..
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x00000306,  // .**.....**.
+     0x0000018C,  // ..**...**..
+     0x000001FC,  // ..*******..
+     0x000000F8,  // ...*****...
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 247
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x000001FE,  // .********.
+     0x000001FE,  // .********.
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 248
+     11, 22,
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000073,  // ....***..**
+     0x000001FE,  // ..********.
+     0x0000018C,  // ..**...**..
+     0x0000031E,  // .**...****.
+     0x00000336,  // .**..**.**.
+     0x00000366,  // .**.**..**.
+     0x000003C6,  // .****...**.
+     0x0000018C,  // ..**...**..
+     0x000003FC,  // .********..
+     0x00000670,  // **..***....
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+     0x00000000,  // ...........
+  },
+  {             // 249
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000060,  // ...**.....
+     0x00000030,  // ....**....
+     0x00000018,  // .....**...
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 250
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x0000000C,  // ......**..
+     0x00000018,  // .....**...
+     0x00000030,  // ....**....
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 251
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000030,  // ....**....
+     0x00000078,  // ...****...
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 252
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x0000018E,  // .**...***.
+     0x000001FE,  // .********.
+     0x000000F6,  // ..****.**.
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+  },
+  {             // 253
+     4, 22,
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000006,  // .**.
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+     0x00000000,  // ....
+  },
+  {             // 254
+     9, 22,
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x00000000,  // .........
+     0x0000003C,  // ...****..
+     0x0000007E,  // ..******.
+     0x000000C6,  // .**...**.
+     0x000000C0,  // .**......
+     0x000000FC,  // .******..
+     0x0000003E,  // ...*****.
+     0x00000006,  // ......**.
+     0x000000C6,  // .**...**.
+     0x000000FC,  // .******..
+     0x00000078,  // ..****...
+     0x00000030,  // ...**....
+     0x00000038,  // ...***...
+     0x0000000C,  // .....**..
+     0x0000006C,  // ..**.**..
+     0x00000078,  // ..****...
+  },
+  {             // 255
+     10, 22,
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000000,  // ..........
+     0x00000000,  // ..........
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x00000186,  // .**....**.
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x000000CC,  // ..**..**..
+     0x00000048,  // ...*..*...
+     0x00000078,  // ...****...
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x00000030,  // ....**....
+     0x000000E0,  // ..***.....
+     0x000000E0,  // ..***.....
+  },
+  };
diff --git a/i18n.c b/i18n.c
index c7f8d7210..533810bb3 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.291 2007/02/25 13:59:28 kls Exp $
+ * $Id: i18n.c 1.293 2007/03/11 10:05:36 kls Exp $
  *
  * Translations provided by:
  *
@@ -27,6 +27,7 @@
  * Estonian    Arthur Konovalov <kasjas@hot.ee>
  * Danish      Mogens Elneff <mogens@elneff.dk>
  * Czech       Vladim�r B�rta <vladimir.barta@k2atmitec.cz>
+ * Turkish     Oktay Yolge�en <oktay_73@yahoo.de>
  *
  */
 
@@ -103,6 +104,7 @@ const tI18nPhrase Phrases[] = {
     "Eesti",
     "Dansk",
     "�esky", //Czech
+    "T�rk�e",
   },
   // The character set needed for this language (this MUST be the second phrase!):
   { "iso8859-15",
@@ -126,6 +128,7 @@ const tI18nPhrase Phrases[] = {
     "iso8859-13",
     "iso8859-15",
     "iso8859-2",
+    "iso8859-9",
   },
   // The 3-letter names of the language (this MUST be the third phrase!):
   { "eng,dos",
@@ -149,6 +152,7 @@ const tI18nPhrase Phrases[] = {
     "est",
     "dan",
     "cze,ces",
+    "tur",
   },
   // Menu titles:
   { "VDR",
@@ -172,6 +176,7 @@ const tI18nPhrase Phrases[] = {
     "VDR",
     "VDR",
     "VDR",
+    "VDR",
   },
   { "Schedule",
     "Programm",
@@ -194,6 +199,7 @@ const tI18nPhrase Phrases[] = {
     "Kava",
     "Programoversigt",
     "Program (EPG)",
+    "Program",
   },
   { "Channels",
     "Kan�le",
@@ -216,6 +222,7 @@ const tI18nPhrase Phrases[] = {
     "Kanalid",
     "Kanaler",
     "Kan�ly",
+    "Kanallar",
   },
   { "Timers",
     "Timer",
@@ -238,6 +245,7 @@ const tI18nPhrase Phrases[] = {
     "Taimer",
     "Timere",
     "�asova�e",
+    "Zamanlay�c�",
   },
   { "Recordings",
     "Aufzeichnungen",
@@ -260,6 +268,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestused",
     "Optagelser",
     "Nahr�vky",
+    "Kay�tlar",
   },
   { "Recording info",
     "Aufzeichnung",
@@ -282,6 +291,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestuse info",
     "Optagelses info",
     "Detail nahr�vky",
+    "Kay�t bilgisi",
   },
   { "Setup",
     "Einstellungen",
@@ -304,6 +314,7 @@ const tI18nPhrase Phrases[] = {
     "S�tted",
     "Indstillinger",
     "Nastaven�",
+    "Ayarlar",
   },
   { "Commands",
     "Befehle",
@@ -326,6 +337,7 @@ const tI18nPhrase Phrases[] = {
     "K�sud",
     "Kommandoer",
     "P��kazy",
+    "Komutlar",
   },
   { "Recording commands",
     "Befehle f�r Aufzeichnungen",
@@ -348,6 +360,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestuse k�sud",
     "Optage kommandoer",
     "P��kazy nahr�v�n�",
+    "Kay�t komutlar�",
   },
   { "Edit channel",
     "Kanal editieren",
@@ -370,6 +383,7 @@ const tI18nPhrase Phrases[] = {
     "Kanali muutmine",
     "Rediger kanal",
     "Editace kan�lu",
+    "Kanal ayarlar�n� de�i�tir",
   },
   { "Edit timer",
     "Timer editieren",
@@ -392,6 +406,7 @@ const tI18nPhrase Phrases[] = {
     "Taimeri muutmine",
     "Rediger timer",
     "Editace �asova�e",
+    "Zamanlay�c�y� ayarla",
   },
   { "Event",
     "Sendung",
@@ -414,6 +429,7 @@ const tI18nPhrase Phrases[] = {
     "S�ndmus",
     "Udsendelse",
     "Ud�lost",
+    "Yay�n",
   },
   { "Info",
     "Info",
@@ -436,6 +452,7 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "Info",
     "Info",
+    "Bilgi",
   },
   { "Schedule - %s",
     "Programm - %s",
@@ -458,6 +475,7 @@ const tI18nPhrase Phrases[] = {
     "Ajakava - %s",
     "Program - %s",
     "Program - %s",
+    "Program - %s",
   },
   { "This event - %s",
     "Diese Sendung - %s",
@@ -480,6 +498,7 @@ const tI18nPhrase Phrases[] = {
     "See s�ndmus - %s",
     "Denne udsendelse - %s",
     "Tato ud�lost - %s",
+    "Bu yay�n - %s",
   },
   { "This event - all channels",
     "Diese Sendung - alle Kan�le",
@@ -502,6 +521,7 @@ const tI18nPhrase Phrases[] = {
     "See s�ndmus - k�ik kanalid",
     "Denne udsendelse - alle kanaler",
     "Tato ud�lost - v�echny kan�ly",
+    "Bu yay�n - t�m kanallar",
   },
   { "All events - all channels",
     "Alle Sendungen - alle Kan�le",
@@ -524,6 +544,7 @@ const tI18nPhrase Phrases[] = {
     "K�ik s�ndmused - k�ik kanalid",
     "Alle udsendelser - alle kanaler",
     "V�echny ud�lost - v�echny kan�ly",
+    "T�m yay�nlar - t�m kanallar",
   },
   { "What's on now?",
     "Was l�uft jetzt?",
@@ -546,6 +567,7 @@ const tI18nPhrase Phrases[] = {
     "Hetkel eetris",
     "Hvad vises nu?",
     "Aktu�ln� program",
+    "�imdiki yay�nlar",
   },
   { "What's on next?",
     "Was l�uft als n�chstes?",
@@ -568,6 +590,7 @@ const tI18nPhrase Phrases[] = {
     "J�rgmisena eetris",
     "Hvad vises som det n�ste?",
     "N�sleduj�c� program",
+    "Gelecek yay�nlar",
   },
   // Button texts (should not be more than 10 characters!):
   { "Button$Edit",
@@ -591,6 +614,7 @@ const tI18nPhrase Phrases[] = {
     "Muuda",
     "Rediger",
     "Editace",
+    "De�i�tir",
   },
   { "Button$New",
     "Neu",
@@ -613,6 +637,7 @@ const tI18nPhrase Phrases[] = {
     "Uus",
     "Ny",
     "Nov�",
+    "Yeni",
   },
   { "Button$Delete",
     "L�schen",
@@ -635,6 +660,7 @@ const tI18nPhrase Phrases[] = {
     "Kustuta",
     "Slet",
     "Smazat",
+    "Sil",
   },
   { "Button$Mark",
     "Markieren",
@@ -657,6 +683,7 @@ const tI18nPhrase Phrases[] = {
     "Siirda",
     "Mark�r",
     "Ozna�it",
+    "��aretle",
   },
   { "Button$On/Off",
     "Ein/Aus",
@@ -679,6 +706,7 @@ const tI18nPhrase Phrases[] = {
     "On/Off",
     "Til/Fra",
     "Zap./Vyp.",
+    "A�/Kapat",
   },
   { "Button$Timer",
     "Timer",
@@ -701,6 +729,7 @@ const tI18nPhrase Phrases[] = {
     "Taimer",
     "Timer",
     "�asova�",
+    "Zamanlay�c�",
   },
   { "Button$Record",
     "Aufnehmen",
@@ -723,6 +752,7 @@ const tI18nPhrase Phrases[] = {
     "Salvesta",
     "Optag",
     "Nahr�t",
+    "Kay�t et",
   },
   { "Button$Info",
     "Info",
@@ -745,6 +775,7 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "Info",
     "Info",
+    "Bilgi",
   },
   { "Button$Play",
     "Wiedergabe",
@@ -767,6 +798,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Afspil",
     "P�ehr�t",
+    "G�ster",
   },
   { "Button$Pause",
     "Pause",
@@ -789,6 +821,7 @@ const tI18nPhrase Phrases[] = {
     "Paus",
     "Pause",
     "Zastavit",
+    "Durakla",
   },
   { "Button$Rewind",
     "Anfang",
@@ -811,6 +844,7 @@ const tI18nPhrase Phrases[] = {
     "Algusesse",
     "Forfra",
     "Na za��tek",
+    "Baslang��",
   },
   { "Button$Stop",
     "Beenden",
@@ -833,6 +867,7 @@ const tI18nPhrase Phrases[] = {
     "Stopp",
     "Stop",
     "Ukon�it",
+    "Durdur",
   },
   { "Button$Resume",
     "Weiter",
@@ -855,6 +890,7 @@ const tI18nPhrase Phrases[] = {
     "J�tka",
     "Forts�t",
     "Pokra�ovat",
+    "S�rd�r",
   },
   { "Button$Open",
     "�ffnen",
@@ -877,6 +913,7 @@ const tI18nPhrase Phrases[] = {
     "Ava",
     "�bn",
     "Otev��t",
+    "A�",
   },
   { "Button$Switch",
     "Umschalten",
@@ -899,6 +936,7 @@ const tI18nPhrase Phrases[] = {
     "Vali",
     "Skift",
     "P�epnout",
+    "De�i�tir",
   },
   { "Button$Now",
     "Jetzt",
@@ -921,6 +959,7 @@ const tI18nPhrase Phrases[] = {
     "N��d",
     "Nu",
     "Nyn�",
+    "�imdi",
   },
   { "Button$Next",
     "N�chste",
@@ -943,6 +982,7 @@ const tI18nPhrase Phrases[] = {
     "Tulekul",
     "N�ste",
     "Dal��",
+    "Sonra",
   },
   { "Button$Schedule",
     "Programm",
@@ -965,6 +1005,7 @@ const tI18nPhrase Phrases[] = {
     "Ajakava",
     "Program",
     "Program",
+    "Program",
   },
   { "Button$ABC/abc",
     "ABC/abc",
@@ -987,6 +1028,7 @@ const tI18nPhrase Phrases[] = {
     "ABC/abc",
     "ABC/abc",
     "ABC/abc",
+    "ABC/abc",
   },
   { "Button$Insert",
     "Einf�gen",
@@ -1009,6 +1051,7 @@ const tI18nPhrase Phrases[] = {
     "Lisa (INS)",
     "Inds�t",
     "Vlo�it",
+    "Ekle",
   },
   { "Button$Overwrite",
     "�berschreiben",
@@ -1031,6 +1074,7 @@ const tI18nPhrase Phrases[] = {
     "Asenda (OVR)",
     "Overskriv",
     "P�epsat",
+    "�st�ne yaz",
   },
   { "Button$Menu",
     "Men�",
@@ -1053,6 +1097,7 @@ const tI18nPhrase Phrases[] = {
     "Men��",
     "Menu",
     "Menu",
+    "Men�",
   },
   { "Button$Reset",
     "R�cksetzen",
@@ -1075,6 +1120,7 @@ const tI18nPhrase Phrases[] = {
     "Nullimine",
     "Nulstille",
     "Reset",
+    "S�f�rla",
   },
   { "Button$Scan",
     "Scan",
@@ -1097,6 +1143,7 @@ const tI18nPhrase Phrases[] = {
     "Uuenda",
     "Skan",
     "Sn�mat",
+    "Tara",
   },
   { "Button$Audio",
     "Audio",
@@ -1119,6 +1166,7 @@ const tI18nPhrase Phrases[] = {
     "Audio",
     "Audio",
     "Zvuk",
+    "Audio",
   },
   // Confirmations:
   { "Delete channel?",
@@ -1142,6 +1190,7 @@ const tI18nPhrase Phrases[] = {
     "Kustutada kanal?",
     "Slet kanal?",
     "Smazat kan�l?",
+    "Kanal� sil?",
   },
   { "Delete timer?",
     "Timer l�schen?",
@@ -1164,6 +1213,7 @@ const tI18nPhrase Phrases[] = {
     "Kustutada taimer?",
     "Slet timer?",
     "Smazat �asova�?",
+    "Zamanlay�c�y� sil",
   },
   { "Delete recording?",
     "Aufzeichnung l�schen?",
@@ -1186,6 +1236,7 @@ const tI18nPhrase Phrases[] = {
     "Kustutada salvestus?",
     "Slet optagelse?",
     "Smazat nahr�vku?",
+    "Kay�t� sil?",
   },
   { "Timer still recording - really delete?",
     "Timer zeichnet auf - trotzdem l�schen?",
@@ -1208,6 +1259,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestus aktiivne - kustutada?",
     "Timerstyret optagelse i gang - slet alligevel?",
     "Prob�h� nahr�v�n� - opravdu smazat?",
+    "Zamanlay�c� kay�t ediyor - buna ra�men sil?",
   },
   { "Stop recording?",
     "Aufzeichnung beenden?",
@@ -1230,6 +1282,7 @@ const tI18nPhrase Phrases[] = {
     "L�petada salvestamine?",
     "Stop optagelse?",
     "Ukon�it nahr�v�n�?",
+    "Kay�t� durdur?",
   },
   { "Cancel editing?",
     "Schneiden abbrechen?",
@@ -1252,6 +1305,7 @@ const tI18nPhrase Phrases[] = {
     "T�histada muudatus?",
     "Afbryd redigering?",
     "Zru�it editaci?",
+    "Kesimi iptal et?",
   },
   { "Really restart?",
     "Wirklich neu starten?",
@@ -1274,6 +1328,7 @@ const tI18nPhrase Phrases[] = {
     "Restart?",
     "Vil du virkelig genstarte?",
     "Opravdu restartovat?",
+    "Ger�ekten yeniden ba�lat?",
   },
   { "restart anyway?",
     "trotzdem neu starten?",
@@ -1296,6 +1351,7 @@ const tI18nPhrase Phrases[] = {
     "restart?",
     "genstart alligevel?",
     "p�esto restartovat?",
+    "buna ra�men yeniden ba�lat?",
   },
   { "shut down anyway?",
     "trotzdem ausschalten?",
@@ -1318,6 +1374,7 @@ const tI18nPhrase Phrases[] = {
     "l�litada v�lja?",
     "sluk alligevel?",
     "p�esto vypnout?",
+    "buna ra�men kapat?",
   },
   { "Recording - restart anyway?",
     "Aufnahme l�uft - trotzdem neu starten?",
@@ -1340,6 +1397,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine aktiivne - restart?",
     "Optagelse igang - genstart alligevel?",
     "Syst�m je zanepr�zdn�n - p�esto restartovat?",
+    "Kay�t ediliyor - buna ra�men yeniden ba�lat?",
   },
   { "Editing - restart anyway?",
     "Schnitt l�uft - trotzdem neu starten?",
@@ -1349,7 +1407,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Muokkaus kesken - k�ynnistet��nk� uudelleen?",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1384,6 +1442,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine aktiivne - l�litada v�lja?",
     "Optagelse igang - sluk alligevel?",
     "Syst�m je zanepr�zdn�n - p�esto vypnout?",
+    "Kay�t ediliyor - buna ra�men kapat?",
   },
   { "Recording in %ld minutes, shut down anyway?",
     "Aufnahme in %ld Minuten - trotzdem ausschalten?",
@@ -1406,6 +1465,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine algab %ld minuti p�rast - l�litada v�lja?",
     "Optagelse om %ld minutter - sluk alligevel?",
     "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?",
+    "Kay�t %ld dakikada ba�l�yor - buna ra�men kapat?",
   },
   { "Press any key to cancel shutdown",
     "Taste dr�cken, um Ausschalten abzubrechen",
@@ -1428,6 +1488,7 @@ const tI18nPhrase Phrases[] = {
     "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks",
     "Tryk vilk�rlig tast for at annullere sluk",
     "Jak�koliv kl�vesa zru�� vypnut�",
+    "Kapatmay� iptal etmek i�in herhangi bir tu�a bas",
   },
   { "Press any key to cancel restart",
     "Taste dr�cken, um Neustart abzubrechen",
@@ -1437,7 +1498,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Peru uudelleenk�ynnistys painamalla mit� tahansa n�pp�int�",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1459,7 +1520,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "VDR sammuu my�hemmin - pakota virtakytkimell�",
+    "VDR sammuu my�hemmin - pakota virtan�pp�imell�",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1503,7 +1564,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "Leikkaus kesken - sammutetaanko?",
+    "Muokkaus kesken - sammutetaanko?",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1561,6 +1622,7 @@ const tI18nPhrase Phrases[] = {
     "Nimi",
     "Navn",
     "N�zev",
+    "�sim",
   },
   { "Frequency",
     "Frequenz",
@@ -1583,6 +1645,7 @@ const tI18nPhrase Phrases[] = {
     "Sagedus",
     "Frekvens",
     "Frekvence",
+    "Frekans",
   },
   { "Polarization",
     "Polarisation",
@@ -1605,6 +1668,7 @@ const tI18nPhrase Phrases[] = {
     "Polarisatsioon",
     "Polarisation",
     "Polarizace",
+    "Kutupla�ma",
   },
   { "Source",
     "Quelle",
@@ -1627,6 +1691,7 @@ const tI18nPhrase Phrases[] = {
     "Allikas",
     "Kilde",
     "Zdroj",
+    "Kaynak",
   },
   { "Srate",
     "Srate",
@@ -1649,6 +1714,7 @@ const tI18nPhrase Phrases[] = {
     "Srate",
     "Srate",
     "Srate",
+    "Srate",
   },
   { "Vpid",
     "Vpid",
@@ -1671,6 +1737,7 @@ const tI18nPhrase Phrases[] = {
     "Vpid",
     "Vpid",
     "Vpid",
+    "Vpid",
   },
   { "Ppid",
     "Ppid",
@@ -1693,6 +1760,7 @@ const tI18nPhrase Phrases[] = {
     "Ppid",
     "Ppid",
     "Ppid",
+    "Ppid",
   },
   { "Apid1",
     "Apid1",
@@ -1715,6 +1783,7 @@ const tI18nPhrase Phrases[] = {
     "Apid1",
     "Apid1",
     "Apid1",
+    "Apid1",
   },
   { "Apid2",
     "Apid2",
@@ -1737,6 +1806,7 @@ const tI18nPhrase Phrases[] = {
     "Apid2",
     "Apid2",
     "Apid2",
+    "Apid2",
   },
   { "Dpid1",
     "Dpid1",
@@ -1759,6 +1829,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid1",
     "Dpid1",
     "Dpid1",
+    "Dpid1",
   },
   { "Dpid2",
     "Dpid2",
@@ -1781,6 +1852,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid2",
     "Dpid2",
     "Dpid2",
+    "Dpid2",
   },
   { "Tpid",
     "Tpid",
@@ -1803,6 +1875,7 @@ const tI18nPhrase Phrases[] = {
     "Tpid",
     "Tpid",
     "Tpid",
+    "Tpid",
   },
   { "CA",
     "CA",
@@ -1825,6 +1898,7 @@ const tI18nPhrase Phrases[] = {
     "CA",
     "CA",
     "CA",
+    "CA",
   },
   { "Free To Air",
     "frei empfangbar",
@@ -1847,6 +1921,7 @@ const tI18nPhrase Phrases[] = {
     "FTA",
     "Free To Air",
     "voln�",
+    "�ifresiz",
   },
   { "encrypted",
     "verschl�sselt",
@@ -1869,6 +1944,7 @@ const tI18nPhrase Phrases[] = {
     "kr�ptitud",
     "kodet",
     "k�dovan�",
+    "�ifreli",
   },
   { "Sid",
     "Sid",
@@ -1891,6 +1967,7 @@ const tI18nPhrase Phrases[] = {
     "Sid",
     "Sid",
     "Sid",
+    "Sid",
   },
   { "Inversion",
     "Inversion",
@@ -1913,6 +1990,7 @@ const tI18nPhrase Phrases[] = {
     "Inversioon",
     "Inversion",
     "Inversion",
+    "�nversiyon",
   },
   { "Bandwidth",
     "Bandbreite",
@@ -1935,6 +2013,7 @@ const tI18nPhrase Phrases[] = {
     "Ribalaius",
     "B�ndbredde",
     "���ka p�sma",
+    "Bant geni�li�i",
   },
   { "CoderateH",
     "CoderateH",
@@ -1957,6 +2036,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateH",
     "CoderateH",
     "CoderateH",
+    "CoderateH",
   },
   { "CoderateL",
     "CoderateL",
@@ -1979,6 +2059,7 @@ const tI18nPhrase Phrases[] = {
     "CoderateL",
     "CoderateL",
     "CoderateL",
+    "CoderateL",
   },
   { "Modulation",
     "Modulation",
@@ -2001,6 +2082,7 @@ const tI18nPhrase Phrases[] = {
     "Modulatsioon",
     "Modulation",
     "Modulace",
+    "Mod�lasyon",
   },
   { "Transmission",
     "Transmission",
@@ -2023,6 +2105,7 @@ const tI18nPhrase Phrases[] = {
     "Transmissioon",
     "Transmission",
     "P�enos",
+    "�letim",
   },
   { "Guard",
     "Guard",
@@ -2045,6 +2128,7 @@ const tI18nPhrase Phrases[] = {
     "Guard",
     "Guard",
     "Guard",
+    "Koruma",
   },
   { "Hierarchy",
     "Hierarchie",
@@ -2067,6 +2151,7 @@ const tI18nPhrase Phrases[] = {
     "Hierarhia",
     "Hierarki",
     "Hierarchy",
+    "Hiyerar�i",
   },
   // Timer parameters:
   { "Active",
@@ -2090,6 +2175,7 @@ const tI18nPhrase Phrases[] = {
     "Aktiivne",
     "Aktiv",
     "Aktivn�",
+    "Aktif",
   },
   { "Channel",
     "Kanal",
@@ -2112,6 +2198,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal",
     "Kanal",
     "Kan�l",
+    "Kanal",
   },
   { "Day",
     "Tag",
@@ -2134,6 +2221,7 @@ const tI18nPhrase Phrases[] = {
     "P�ev",
     "Dag",
     "Den",
+    "G�n",
   },
   { "Start",
     "Anfang",
@@ -2156,6 +2244,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Start",
     "Za��tek",
+    "Ba�lang��",
   },
   { "Stop",
     "Ende",
@@ -2178,6 +2267,7 @@ const tI18nPhrase Phrases[] = {
     "Stopp",
     "Stop",
     "Konec",
+    "Biti�",
   },
   { "VPS",
     "VPS",
@@ -2200,6 +2290,7 @@ const tI18nPhrase Phrases[] = {
     "VPS",
     "VPS",
     "VPS",
+    "VPS",
   },
   { "Priority",
     "Priorit�t",
@@ -2222,6 +2313,7 @@ const tI18nPhrase Phrases[] = {
     "Prioriteet",
     "Prioritet",
     "Priorita",
+    "�ncelik",
   },
   { "Lifetime",
     "Lebensdauer",
@@ -2244,6 +2336,7 @@ const tI18nPhrase Phrases[] = {
     "Eluiga",
     "Levetid",
     "�ivotnost",
+    "�mr�",
   },
   { "File",
     "Datei",
@@ -2266,6 +2359,7 @@ const tI18nPhrase Phrases[] = {
     "Fail",
     "Fil",
     "Soubor",
+    "K�t�k",
   },
   { "First day",
     "Erster Tag",
@@ -2288,6 +2382,7 @@ const tI18nPhrase Phrases[] = {
     "Esimene p�ev",
     "F�rste dag",
     "Prvn� den",
+    "�lk g�n",
   },
   // Error messages:
   { "Channel is being used by a timer!",
@@ -2311,6 +2406,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal on taimeri kasutuses!",
     "Kanal anvendes af en timer!",
     "Kan�l je dr�en� �asova�em nahr�vek!",
+    "Kanal zamanlay�c�dan kullan�l�yor!",
   },
   { "Can't switch channel!",
     "Kanal kann nicht umgeschaltet werden!",
@@ -2333,6 +2429,7 @@ const tI18nPhrase Phrases[] = {
     "Kanali vahetus ei ole v�imalik!",
     "Kan ikke skifte kanal!",
     "Kan�l nelze p�epnout!",
+    "Kanala de�i�tirelemiyor!",
   },
   { "Timer is recording!",
     "Timer zeichnet gerade auf!",
@@ -2355,6 +2452,7 @@ const tI18nPhrase Phrases[] = {
     "Taimeriga salvestamine aktiivne!",
     "Timer optager nu!",
     "�asova� pr�v� nahr�v�!",
+    "Zamanlay�c� �ekim yap�yor!",
   },
   { "Error while accessing recording!",
     "Fehler beim Ansprechen der Aufzeichnung!",
@@ -2377,6 +2475,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestuse taasesitus eba�nnestus!",
     "Fejl ved l�sning af optagelse!",
     "Chyba p�i p��stupu k nahr�vk�m!",
+    "Kay�t okuma hatas�!",
   },
   { "Error while deleting recording!",
     "Fehler beim L�schen der Aufzeichnung!",
@@ -2399,6 +2498,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestuse kustutamine eba�nnestus!",
     "Fejl ved sletning af optagelse!",
     "Chyba p�i maz�n� nahr�vky!",
+    "Kay�t silme hatas�!",
   },
   { "*** Invalid Channel ***",
     "*** Ung�ltiger Kanal ***",
@@ -2421,6 +2521,7 @@ const tI18nPhrase Phrases[] = {
     "*** Vigane kanal ***",
     "*** Ugyldig kanal! ***",
     "*** Neplatn� kan�l ***",
+    "*** Ge�ersiz kanal ***",
   },
   { "Upcoming VPS recording!",
     "VPS-Aufnahme beginnt in K�rze!",
@@ -2443,6 +2544,7 @@ const tI18nPhrase Phrases[] = {
     "VPS salvestamine tulekul!",
     "VPS optagelse starter snart!",
     "Brzo za�ne nahr�v�n� VPS!",
+    "VPS �ekim yak�nda ba�l�yor!",
   },
   { "No free DVB device to record!",
     "Keine freie DVB-Karte zum Aufnehmen!",
@@ -2465,6 +2567,7 @@ const tI18nPhrase Phrases[] = {
     "Puudub vaba DVB seade salvestamiseks!",
     "Ingen fri DVB enhed til optagelse!",
     "��dn� DVB karta nen� voln� pro nahr�v�n�",
+    "Kullan�lmayan DVB kart� bulunmad�!",
   },
   { "Channel not available!",
     "Kanal nicht verf�gbar!",
@@ -2487,6 +2590,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal ei ole k�ttesaadav!",
     "Kanal er ikke tilg�ngelig!",
     "Kan�l nen� dostupn�!",
+    "Kanal kullan�lam�yor!",
   },
   { "Channel settings are not unique!",
     "Kanaleinstellungen sind nicht eindeutig!",
@@ -2509,6 +2613,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaliseaded ei ole unikaalsed!",
     "Kanalindstillinger er ikke entydige!",
     "Nastaven� kan�l� nejsou unik�tn�!",
+    "Kanal ayarlar� belli de��l!",
   },
   { "Channel locked (recording)!",
     "Kanal blockiert (zeichnet auf)!",
@@ -2531,6 +2636,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal lukus (salvestamine aktiivne)!",
     "Kanal blokeret (optagelse i gang)",
     "Kan�l je blokovan� (nahr�v� se)!",
+    "Kanal ge�ersiz (kay�t ediliyor)!",
   },
   { "Can't start Transfer Mode!",
     "Transfer-Mode kann nicht gestartet werden!",
@@ -2553,6 +2659,7 @@ const tI18nPhrase Phrases[] = {
     "Siirdemooduse start eba�nnestus!",
     "Kan ikke starte Transfer Mode!",
     "Nelze za��t s p�enosem",
+    "Transfer mode ba�lat�lam�yor!",
   },
   { "No editing marks defined!",
     "Keine Schnittmarken gesetzt!",
@@ -2575,6 +2682,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimise markerid puuduvad!",
     "Der er ikke sat nogen redigeringsm�rker!",
     "Nejsou definov�ny edita�n� zna�ky!",
+    "Kesim i�aretleri belirtilmemi�!",
   },
   { "Can't start editing process!",
     "Schnitt kann nicht gestartet werden!",
@@ -2597,6 +2705,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimise start eba�nnestus!",
     "Kan ikke starte redigeringsprocessen!",
     "Nelze za��t edita�n� proces!",
+    "Kesim ba�lat�lam�yor!",
   },
   { "Editing process already active!",
     "Schnitt bereits aktiv!",
@@ -2619,6 +2728,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimine juba aktiivne!",
     "Redigeringsproces er allerede aktiv!",
     "Edita�n� proces je ji� aktivn�!",
+    "Kesim hen�z aktif!",
   },
   { "Can't shutdown - option '-s' not given!",
     "Ausschalten unm�glich - Option '-s' fehlt!",
@@ -2641,6 +2751,7 @@ const tI18nPhrase Phrases[] = {
     "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!",
     "Kan ikke slukke - parameter '-s' ikke angivet!",
     "Vypnut� nen� mo�n� - chb� volba '-s'!",
+    "Kapat�lam�yor - '-s' se�ene�i verilmemi�!",
   },
   { "Not enough disk space to start recording!",
     "Nicht gen�gend Plattenplatz f�r Aufnahme!",
@@ -2663,6 +2774,7 @@ const tI18nPhrase Phrases[] = {
     "Ebapiisavalt kettaruumi salvestamise alustamiseks!",
     "For lidt harddisk plads til optagelse!",
     "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!",
+    "Kay�t i�in yeterince kapasite yok!",
   },
   { "Low disk space!",
     "Platte beinahe voll!",
@@ -2685,6 +2797,7 @@ const tI18nPhrase Phrases[] = {
     "K�vaketas t�is!",
     "Kun lidt diskplads tilbage!",
     "Disk bude brzy zapln�n!",
+    "Kay�t kapasitesi az!",
   },
   { "Opening CAM menu...",
     "CAM-Men� wird ge�ffnet...",
@@ -2707,6 +2820,7 @@ const tI18nPhrase Phrases[] = {
     "CAM-men�� avamine...",
     "�bner CAM menu...",
     "Otev�r� se menu CAM...",
+    "CAM men�s� a��l�yor...",
   },
   { "Can't open CAM menu!",
     "CAM-Men� kann nicht ge�ffnet werden!",
@@ -2729,6 +2843,7 @@ const tI18nPhrase Phrases[] = {
     "Ei saa avada CAM men��d!",
     "Kan ikke �bne CAM menuen!",
     "Menu CAM nen� dostupn�",
+    "CAM men�s� a��lam�yor!",
   },
   { "CAM is in use - really reset?"
     "CAM wird benutzt - wirklich zur�cksetzen?",
@@ -2773,6 +2888,7 @@ const tI18nPhrase Phrases[] = {
     "CAM mooduli taask�ivitus eba�nnestus!",
     "Kan ikke nulstille CAM!",
     "CAM modul nelze restartovat!",
+    "CAM s�f�rlanamad�!",
   },
   { "CAM reset",
     "CAM zur�ckgesetzt",
@@ -2883,6 +2999,7 @@ const tI18nPhrase Phrases[] = {
     "Palun sisesta %d numbrit!",
     "Indtast venligst %d cifre!",
     "Pros�m vlo�te %d znak�!",
+    "L�tfen %d rakam veriniz!",
   },
   { "No audio available!",
     "Kein Audio verf�gbar!",
@@ -2905,6 +3022,7 @@ const tI18nPhrase Phrases[] = {
     "Audio k�ttesaamatu!",
     "Ingen lyd tilg�ngelig!",
     "Zvuk nen� dostupn�!",
+    "Audio yok!",
   },
   // Setup pages:
   { "OSD",
@@ -2928,6 +3046,7 @@ const tI18nPhrase Phrases[] = {
     "Ekraanimen��",
     "OSD",
     "OSD",
+    "OSD",
   },
   { "EPG",
     "EPG",
@@ -2950,6 +3069,7 @@ const tI18nPhrase Phrases[] = {
     "EPG",
     "EPG",
     "EPG",
+    "EPG",
   },
   { "DVB",
     "DVB",
@@ -2972,6 +3092,7 @@ const tI18nPhrase Phrases[] = {
     "DVB",
     "DVB",
     "DVB",
+    "DVB",
   },
   { "LNB",
     "LNB",
@@ -2994,6 +3115,7 @@ const tI18nPhrase Phrases[] = {
     "LNB",
     "LNB",
     "LNB",
+    "LNB",
   },
   { "CAM",
     "CAM",
@@ -3038,6 +3160,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine",
     "Optagelse",
     "Nahr�v�n�",
+    "Kay�t",
   },
   { "Replay",
     "Wiedergabe",
@@ -3060,6 +3183,7 @@ const tI18nPhrase Phrases[] = {
     "Taasesitus",
     "Afspilning",
     "P�ehr�v�n�",
+    "Tekrar",
   },
   { "Miscellaneous",
     "Sonstiges",
@@ -3082,6 +3206,7 @@ const tI18nPhrase Phrases[] = {
     "Muud s�tted",
     "Diverse",
     "R�zn�",
+    "Di�erler",
   },
   { "Plugins",
     "Plugins",
@@ -3104,6 +3229,7 @@ const tI18nPhrase Phrases[] = {
     "Laiendusmoodulid",
     "Plugins",
     "Moduly",
+    "Eklentiler",
   },
   { "Plugin",
     "Plugin",
@@ -3126,6 +3252,7 @@ const tI18nPhrase Phrases[] = {
     "Laiendusmoodul",
     "Plugin",
     "Modul",
+    "Eklenti",
   },
   { "Restart",
     "Neustart",
@@ -3148,6 +3275,7 @@ const tI18nPhrase Phrases[] = {
     "Restart",
     "Genstart",
     "Restart",
+    "Yeniden ba�lat",
   },
   // Setup parameters:
   { "Setup.OSD$Language",
@@ -3171,6 +3299,7 @@ const tI18nPhrase Phrases[] = {
     "Keel",
     "Sprog",
     "Jazyk",
+    "Dil",
   },
   { "Setup.OSD$Skin",
     "Oberfl�che",
@@ -3193,6 +3322,7 @@ const tI18nPhrase Phrases[] = {
     "Kest",
     "Skin",
     "Vzhled",
+    "Y�zey",
   },
   { "Setup.OSD$Theme",
     "Thema",
@@ -3215,6 +3345,7 @@ const tI18nPhrase Phrases[] = {
     "Teema",
     "Tema",
     "T�ma",
+    "Tema",
   },
   { "Setup.OSD$Left",
     "Links",
@@ -3237,6 +3368,7 @@ const tI18nPhrase Phrases[] = {
     "Vasakule",
     "Venstre",
     "Vlevo",
+    "Sol",
   },
   { "Setup.OSD$Top",
     "Oben",
@@ -3259,6 +3391,7 @@ const tI18nPhrase Phrases[] = {
     "�lesse",
     "Top",
     "Naho�e",
+    "�st",
   },
   { "Setup.OSD$Width",
     "Breite",
@@ -3281,6 +3414,7 @@ const tI18nPhrase Phrases[] = {
     "Laius",
     "Bredde",
     "���ka",
+    "Geni�lik",
   },
   { "Setup.OSD$Height",
     "H�he",
@@ -3303,6 +3437,7 @@ const tI18nPhrase Phrases[] = {
     "K�rgus",
     "H�jde",
     "V��ka",
+    "Y�kseklik",
   },
   { "Setup.OSD$Message time (s)",
     "Anzeigedauer f�r Nachrichten (s)",
@@ -3325,6 +3460,7 @@ const tI18nPhrase Phrases[] = {
     "Teate esitusaeg (s)",
     "Tid beskeder skal vises (s)",
     "�as zobrazen� zp�vy (s)",
+    "Mesaj g�sterme zaman� (sn)",
   },
   { "Setup.OSD$Use small font",
     "Kleine Schrift benutzen",
@@ -3347,6 +3483,7 @@ const tI18nPhrase Phrases[] = {
     "V�ikese fondi kasutamine",
     "Anvend lille skrift",
     "Pou��vat mal� p�smo",
+    "K���k harf kullan",
   },
   { "never",
     "nie",
@@ -3369,6 +3506,7 @@ const tI18nPhrase Phrases[] = {
     "mitte kunagi",
     "aldrig",
     "nikdy",
+    "hi�",
   },
   { "skin dependent",
     "je nach Oberfl�che",
@@ -3391,6 +3529,7 @@ const tI18nPhrase Phrases[] = {
     "kestast s�ltuv",
     "skin afh�ngig",
     "podle vzhledu",
+    "y�zeye ba�imli",
   },
   { "always",
     "immer",
@@ -3413,6 +3552,7 @@ const tI18nPhrase Phrases[] = {
     "alati",
     "altid",
     "v�dy",
+    "hep",
   },
   { "Setup.OSD$Channel info position",
     "Kanalinfo-Position",
@@ -3435,6 +3575,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaliinfo asukoht",
     "Placering af kanalinfo",
     "Pozice informace o kan�lu",
+    "Kanal bilgi pozisyonu",
   },
   { "Setup.OSD$Channel info time (s)",
     "Anzeigedauer f�r Kanalinfo (s)",
@@ -3457,6 +3598,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaliinfo esitusaeg (s)",
     "Tid kanalinfo skal vises (s)",
     "�as zobr. informace o kan�lu (s)",
+    "Kanal bilgi g�sterme zaman� (sn)",
   },
   { "Setup.OSD$Info on channel switch",
     "Info beim Kanalwechsel",
@@ -3479,6 +3621,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaliinfo n�itamine",
     "Info ved kanalskift",
     "Informace p�i zm�n� kan�lu",
+    "Kanal de�i�tirme bilgisi",
   },
   { "Setup.OSD$Timeout requested channel info",
     "Angeforderte Kanalinfo schlie�en",
@@ -3501,6 +3644,7 @@ const tI18nPhrase Phrases[] = {
     "Kanaliinfo kuvamise ajapiirang",
     "Timeout ved anmodet kanal info",
     "�asov� limit informace o kan�lu",
+    "Kanal bilginin zaman a��m�",
   },
   { "Setup.OSD$Scroll pages",
     "Seitenweise scrollen",
@@ -3523,6 +3667,7 @@ const tI18nPhrase Phrases[] = {
     "Lehek�lje kerimine",
     "Scroll sidevis",
     "Rolovat strany",
+    "Sayfa kayd�rma",
   },
   { "Setup.OSD$Scroll wraps",
     "Rundum scrollen",
@@ -3545,6 +3690,7 @@ const tI18nPhrase Phrases[] = {
     "Ridade kerimine",
     "Scroll rundt",
     "Z konce na za��tek",
+    "Sar�m kayd�rma",
   },
   { "Setup.OSD$Menu key closes",
     "Menu-Taste schlie�t",
@@ -3567,6 +3713,7 @@ const tI18nPhrase Phrases[] = {
     "Sulgemine Men�� klahviga",
     "Menu taste lukker",
     "Kl�vesa Menu zav�r�",
+    "Men� d��mesi kapat�yor",
   },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
@@ -3589,6 +3736,7 @@ const tI18nPhrase Phrases[] = {
     "Kausta nime salvestamine",
     "Optagelser i foldere",
     "Seznam nahr�vek",
+    "Kay�t dizinleri",
   },
   { "Setup.EPG$EPG scan timeout (h)",
     "Zeit bis zur EPG-Aktualisierung (h)",
@@ -3611,6 +3759,7 @@ const tI18nPhrase Phrases[] = {
     "EPG skaneerimise viide (h)",
     "Tid f�r EPG skanning (t)",
     "�asov� limit pro sn�m�n� EPG (h)",
+    "EPG tarama zaman a��m� (sa)",
   },
   { "Setup.EPG$EPG bugfix level",
     "EPG-Fehlerbereinigung",
@@ -3633,6 +3782,7 @@ const tI18nPhrase Phrases[] = {
     "EPG veaparanduse tase",
     "Niveau for EPG fejlrettelse",
     "EPG �rove� chyb",
+    "EPG hata ��z�mleme �l��s�",
   },
   { "Setup.EPG$EPG linger time (min)",
     "Alte EPG-Daten anzeigen (min)",// TODO
@@ -3655,6 +3805,7 @@ const tI18nPhrase Phrases[] = {
     "Vana EPG viide (min)",
     "Vise gammel EPG info (min)",
     "Ukazovat star�� EPG data (min)",
+    "Eski EPG g�ster (dak)",
   },
   { "Setup.EPG$Set system time",
     "Systemzeit stellen",
@@ -3677,6 +3828,7 @@ const tI18nPhrase Phrases[] = {
     "Kella s�nkroniseerimine",
     "Indstil system tid",
     "Nastavit syst�mov� �as",
+    "Bilgisayar saatini ayarla",
   },
   { "Setup.EPG$Use time from transponder",
     "Transponder f�r Systemzeit",
@@ -3699,6 +3851,7 @@ const tI18nPhrase Phrases[] = {
     "Kella s�nkroniseerimise transponder",
     "Anvend tid fra transponder",
     "Pou��t �as z kan�lu",
+    "Bilgisayar saati i�in uydu al�c�-verici",
   },
   { "Setup.EPG$Preferred languages", // note the plural
     "Bevorzugte Sprachen",
@@ -3721,6 +3874,7 @@ const tI18nPhrase Phrases[] = {
     "Eelistatuid keeli",
     "Foretrukne sprog",
     "Preferovan� jazyky",
+    "Dil tercihleri",
   },
   { "Setup.EPG$Preferred language", // note the singular
     "Bevorzugte Sprache",
@@ -3743,6 +3897,7 @@ const tI18nPhrase Phrases[] = {
     "Eelistatud keel",
     "Foretrukket sprog",
     "Preferovan� jazyk",
+    "Dil tercihi",
   },
   { "Setup.DVB$Primary DVB interface",
     "Prim�res DVB-Interface",
@@ -3765,6 +3920,7 @@ const tI18nPhrase Phrases[] = {
     "Esmane DVB seade",
     "Prim�r DVB enhed",
     "Prim�rn� DVB interface",
+    "Primer DVB aray�z�",
   },
   { "Setup.DVB$Video display format",
     "Video-Anzeigeformat",
@@ -3787,6 +3943,7 @@ const tI18nPhrase Phrases[] = {
     "Video kuvamise formaat",
     "Video display format",
     "Form�t zobrazen� videa",
+    "Video g�r�nt� bi�imi",
   },
   { "pan&scan",
     "pan&scan",
@@ -3809,6 +3966,7 @@ const tI18nPhrase Phrases[] = {
     "pan&scan",
     "pan&scan",
     "pan&scan",
+    "pan&scan",
   },
   { "letterbox",
     "Letterbox",
@@ -3831,6 +3989,7 @@ const tI18nPhrase Phrases[] = {
     "letterbox",
     "letterbox",
     "letterbox",
+    "letterbox",
   },
   { "center cut out",
     "Center-cut-out",
@@ -3853,6 +4012,7 @@ const tI18nPhrase Phrases[] = {
     "center cut out",
     "center cut out",
     "dost�edu o��znout",
+    "center cut out",
   },
   { "Setup.DVB$Video format",
     "Videoformat",
@@ -3875,6 +4035,7 @@ const tI18nPhrase Phrases[] = {
     "TV k�lgsuhe",
     "Video format",
     "Form�t videa",
+    "Video format�",
   },
   { "Setup.DVB$Use Dolby Digital",
     "Dolby-Digital-Ton benutzen",
@@ -3897,6 +4058,7 @@ const tI18nPhrase Phrases[] = {
     "Dolby Digital kasutamine",
     "Anvend Dolby Digital",
     "Pou��vat zvuk v Dolby Digital",
+    "Dolby Dijital ses kullan",
   },
   { "Setup.DVB$Update channels",
     "Kan�le aktualisieren",
@@ -3919,6 +4081,7 @@ const tI18nPhrase Phrases[] = {
     "Kanalite uuendamine",
     "Opdat�r kanaler",
     "Aktualizace kan�l�",
+    "Kanallar� yenile",
   },
   { "names only",
     "nur Namen",
@@ -3941,6 +4104,7 @@ const tI18nPhrase Phrases[] = {
     "ainult nimed",
     "kun navne",
     "jen n�zvy",
+    "s�rf isimler",
   },
   { "PIDs only",
     "nur PIDs",
@@ -3963,6 +4127,7 @@ const tI18nPhrase Phrases[] = {
     "ainult PID-id",
     "kun PIDs",
     "jen PIDs",
+    "s�rf PID'ler",
   },
   { "names and PIDs",
     "Namen und PIDs",
@@ -3985,6 +4150,7 @@ const tI18nPhrase Phrases[] = {
     "nimi ja PID-id",
     "navne og PIDs",
     "n�zvy a PIDs",
+    "�simler ve PID'ler",
   },
   { "add new channels",
     "neue Kan�le hinzuf�gen",
@@ -4007,6 +4173,7 @@ const tI18nPhrase Phrases[] = {
     "uute kanalite lisamine",
     "tilf. ny kanaler",
     "p�idat nov� kan�ly",
+    "yeni kanallar ekle",
   },
   { "add new transponders",
     "neue Transponder hinzuf�gen",
@@ -4029,6 +4196,7 @@ const tI18nPhrase Phrases[] = {
     "uute transponderite lisamine",
     "tilf. ny transp.",
     "p�idat nov� transpond�ry",
+    "yeni uydu al�c�-verici ekle",
   },
   { "Setup.DVB$Audio languages",  // note the plural
     "Audio-Sprachen",
@@ -4051,6 +4219,7 @@ const tI18nPhrase Phrases[] = {
     "Audio keeli",
     "Audio sprog (ant.)",
     "Jazyky zvuku",
+    "Audio dilleri",
   },
   { "Setup.DVB$Audio language",  // note the singular
     "Audio-Sprache",
@@ -4073,6 +4242,7 @@ const tI18nPhrase Phrases[] = {
     "Audio keel",
     "Audio sprog",
     "Jazyk zvuku",
+    "Audio dili",
   },
   { "Setup.LNB$SLOF (MHz)",
     "SLOF (MHz)",
@@ -4095,6 +4265,7 @@ const tI18nPhrase Phrases[] = {
     "SLOF (MHz)",
     "SLOF (MHz)",
     "SLOF (MHz)",
+    "SLOF (MHz)",
   },
   { "Setup.LNB$Low LNB frequency (MHz)",
     "Untere LNB-Frequenz (MHz)",
@@ -4117,6 +4288,7 @@ const tI18nPhrase Phrases[] = {
     "Alumine (LO) LNB sagedus (MHz)",
     "Nedre LNB frekvens (MHz)",
     "Doln� frekvence LNB (MHz)",
+    "Alt LNB frekans� (MHz)",
   },
   { "Setup.LNB$High LNB frequency (MHz)",
     "Obere LNB-Frequenz (MHz)",
@@ -4139,6 +4311,7 @@ const tI18nPhrase Phrases[] = {
     "�lemine (HI) LNB sagedus (MHz)",
     "�vre LNB frekvens (MHz)",
     "Horn� frekvence LNB (MHz)",
+    "�st LNB frekans� (MHz)",
   },
   { "Setup.LNB$Use DiSEqC",
     "DiSEqC benutzen",
@@ -4161,6 +4334,7 @@ const tI18nPhrase Phrases[] = {
     "DiSEqC kasutamine",
     "Anvend DiSEqC",
     "Pou��vat DiSEqC",
+    "DiSEqC kullan",
   },
   { "Setup.Recording$Margin at start (min)",
     "Vorlauf zum Timer-Beginn (min)",
@@ -4183,6 +4357,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamise algusvaru (min)",
     "Margin ved start (min)",
     "Nahr�vat p�ed za��tkem (min)",
+    "Ba��nda tolerans (dak)",
   },
   { "Setup.Recording$Margin at stop (min)",
     "Nachlauf am Timer-Ende (min)",
@@ -4205,6 +4380,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamise l�puvaru (min)",
     "Margin ved stop (min)",
     "Nahr�vat po konci (min)",
+    "Sonunda tolerans (dak)",
   },
   { "Setup.Recording$Primary limit",
     "Prim�r-Limit",
@@ -4227,6 +4403,7 @@ const tI18nPhrase Phrases[] = {
     "Esmane prioriteet",
     "Prim�r gr�nse",
     "Prim�rn� limit",
+    "Primer limit",
   },
   { "Setup.Recording$Default priority",
     "Default-Priorit�t",
@@ -4249,6 +4426,7 @@ const tI18nPhrase Phrases[] = {
     "Vaikimisi prioriteet",
     "Standard prioritet",
     "V�choz� priorita",
+    "Ola�an priorite",
   },
   { "Setup.Recording$Default lifetime (d)",
     "Default-Lebensdauer (d)",
@@ -4271,6 +4449,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestuse eluiga (p�evi)",
     "Standard levetid (d)",
     "V�choz� �ivotnost",
+    "Ola�an �ekim �mr� (g�n)",
   },
   { "Setup.Recording$Pause priority",
     "Pause-Priorit�t",
@@ -4293,6 +4472,7 @@ const tI18nPhrase Phrases[] = {
     "Pausi prioriteet",
     "Pause prioritet",
     "Priorita p�eru�en�",
+    "Ola�an duraklama prioritesi",
   },
   { "Setup.Recording$Pause lifetime (d)",
     "Pause-Lebensdauer (d)",
@@ -4315,6 +4495,7 @@ const tI18nPhrase Phrases[] = {
     "Pausi eluiga (p�evi)",
     "Pause levetid (d)",
     "�ivotnost p�eru�en� (d)",
+    "Duraklama �mr� (g�n)",
   },
   { "Setup.Recording$Use episode name",
     "Episodenname verwenden",
@@ -4337,6 +4518,7 @@ const tI18nPhrase Phrases[] = {
     "Episoodi nime kasutamine",
     "Anvend udsendelsesnavn",
     "Pou��vat n�zev epizody",
+    "Episod ismini kullan",
   },
   { "Setup.Recording$Use VPS",
     "VPS benutzen",
@@ -4359,6 +4541,7 @@ const tI18nPhrase Phrases[] = {
     "VPS-i kasutamine",
     "Anvend VPS",
     "Pou��vat VPS",
+    "VPS kullan",
   },
   { "Setup.Recording$VPS margin (s)",
     "Zeitvorlauf bei VPS (s)",
@@ -4381,6 +4564,7 @@ const tI18nPhrase Phrases[] = {
     "VPS-i algusvaru (s)",
     "VPS margin (s)",
     "�asov� rezerva pro VPS (s)",
+    "VPS tolerans (s)",
   },
   { "Setup.Recording$Mark instant recording",
     "Direktaufzeichnung markieren",
@@ -4403,6 +4587,7 @@ const tI18nPhrase Phrases[] = {
     "Otsesalvestuse m�rgistamine",
     "Mark�r direkte optagelse",
     "Ozna�it okam�it� nahr�vky",
+    "Derhal �ekimi i�aretle",
   },
   { "Setup.Recording$Name instant recording",
     "Direktaufzeichnung benennen",
@@ -4425,6 +4610,7 @@ const tI18nPhrase Phrases[] = {
     "Otsesalvestuse nimi",
     "Navngiv direkte optagelse",
     "Pojmenovat okam�it� nahr�vky",
+    "Derhal �ekimi isimlendir",
   },
   { "Setup.Recording$Instant rec. time (min)",
     "Dauer der Direktaufzeichnung (min)",
@@ -4447,6 +4633,7 @@ const tI18nPhrase Phrases[] = {
     "Otsesalvestuse kestus (min)",
     "L�ngde af direkte optagelse (min)",
     "D�lka okam�it�ho nahr�v�n� (min)",
+    "Derhal �ekim s�resi (dak)",
   },
   { "Setup.Recording$Max. video file size (MB)",
     "Max. Videodateigr��e (MB)",
@@ -4469,6 +4656,7 @@ const tI18nPhrase Phrases[] = {
     "Maksimaalne failisuurus (MB)",
     "Max. video filst�rrelse (MB)",
     "Maxim�ln� velikost nahr�vky (MB)",
+    "Maksimum Video k�t�k b�y�kl�g� (MB)",
   },
   { "Setup.Recording$Split edited files",
     "Editierte Dateien aufteilen",
@@ -4491,6 +4679,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeeritud failide t�keldamine",
     "Opdel redigerede filer",
     "D�lit editovan� soubory",
+    "D�zenlenmi� k�t�kleri ay�r",
   },
   { "Setup.Replay$Multi speed mode",
     "Mehrstufiger Vor-/R�cklauf",
@@ -4513,6 +4702,7 @@ const tI18nPhrase Phrases[] = {
     "Multi-kiiruse moodus",
     "Multi hastighedsmodus",
     "V�cerychlostn� m�d",
+    "Katl� h�z sarma",
   },
   { "Setup.Replay$Show replay mode",
     "Wiedergabestatus anzeigen",
@@ -4535,6 +4725,7 @@ const tI18nPhrase Phrases[] = {
     "Korduse moodus",
     "Vis afspilningsmodus",
     "Zobrazit re�im p�ehr�v�n�",
+    "G�steri� bilgisi",
   },
   { "Setup.Replay$Resume ID",
     "Wiedergabe-ID",
@@ -4557,6 +4748,7 @@ const tI18nPhrase Phrases[] = {
     "J�tkamise ID",
     "Genoptagelses ID",
     "ID obnoven�",
+    "G�steri� ID'si",
   },
   { "Setup.Miscellaneous$Min. event timeout (min)",
     "Br�ckenzeit zwischen Timern (min)",
@@ -4579,6 +4771,7 @@ const tI18nPhrase Phrases[] = {
     "Min. s�ndmuse kestus (min)",
     "Mindste h�ndelsespause (min)",
     "Min. pauza mezi ud�lostmi (min)",
+    "Minimum olay zaman a��m� (dak)",
   },
   { "Setup.Miscellaneous$Min. user inactivity (min)",
     "VDR ausschalten bei Inaktivit�t (min)",
@@ -4601,6 +4794,7 @@ const tI18nPhrase Phrases[] = {
     "Min. kasutaja tegevusetus (min)",
     "Min. bruger inaktivitet (min)",
     "�asov� limit neaktivnosti (min)",
+    "Minimum kullan�c� hareketsizli�i (dak)",
   },
   { "Setup.Miscellaneous$SVDRP timeout (s)",
     "SVDRP trennen bei Inaktivit�t (s)",
@@ -4623,6 +4817,7 @@ const tI18nPhrase Phrases[] = {
     "SVDRP ooteaeg (s)",
     "SVDRP timeout (s)",
     "�asov� limit SVDRP (s)",
+    "SVDRP zaman a��m� (sn) ",
   },
   { "Setup.Miscellaneous$Zap timeout (s)",
     "Mindestzeit f�r Kanalhistorie (s)",
@@ -4645,6 +4840,7 @@ const tI18nPhrase Phrases[] = {
     "Kanalivahetuse ooteaeg (s)",
     "Zap timeout (s)",
     "�asov� limit Zap (s)",
+    "Kanal de�i�tirme zaman a��m� (sn)",
   },
   { "Setup.Miscellaneous$Channel entry timeout (ms)",
     "Zeitlimit f�r Kanaleingabe (ms)",
@@ -4654,7 +4850,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Kanavasy�tteen odotusaika (ms)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4689,6 +4885,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal k�ivitamisel",
     "Kanal ved opstart",
     "Kan�l po spu�t�n�",
+    "A��l��daki kanal",
   },
   { "Setup.Miscellaneous$Initial volume",
     "Lautst�rke beim Einschalten",
@@ -4711,6 +4908,7 @@ const tI18nPhrase Phrases[] = {
     "Helitugevus k�ivitamisel",
     "Lydstyrke ved opstart",
     "Hlasitost po spu�t�n�",
+    "A��l��daki ses",
   },
   { "Setup.Miscellaneous$as before",
     "wie vorher",
@@ -4733,6 +4931,7 @@ const tI18nPhrase Phrases[] = {
     "nagu enne",
     "som f�r",
     "jako naposledy",
+    "�nceki gibi",
   },
   // The days of the week:
   { "MTWTFSS",
@@ -4756,6 +4955,7 @@ const tI18nPhrase Phrases[] = {
     "ETKNRLP",
     "MTOTFLS",
     "PUS�PSN",
+    "PS�PCCP",
   },
   { "MonTueWedThuFriSatSun", // must all be 3 letters!
     "MonDieMitDonFreSamSon",
@@ -4778,6 +4978,7 @@ const tI18nPhrase Phrases[] = {
     " E  T  K  N  R  L  P ",
     "ManTirOnsTorFreL�rS�n",
     "Po �t St �t P� So Ne ",
+    "PztSal�arPerCumCmtPaz",
   },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
@@ -4801,6 +5002,7 @@ const tI18nPhrase Phrases[] = {
     " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~,/_@",
     " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
     " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.#~,/_@",
+    " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.#~,/_@",
   },
   // The character maps for entering letters via the numeric keys:
   { " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
@@ -4824,6 +5026,7 @@ const tI18nPhrase Phrases[] = {
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9",
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
     " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9",
+    " 0\t-.#~,/_@1\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9",
   },
   // Learning keys:
   { "Learning Remote Control Keys",
@@ -4847,6 +5050,7 @@ const tI18nPhrase Phrases[] = {
     "Kaugjuhtimispuldi �petamine",
     "L�rer fjernbetjeningstaster",
     "U�en� k�d� d�lkov�ho ovl�d�n�",
+    "Uzaktan kumandan�n tu�lar� e�itiliyor",
   },
   { "Phase 1: Detecting RC code type",
     "Phase 1: System der Fernbedienung ermitteln",
@@ -4869,6 +5073,7 @@ const tI18nPhrase Phrases[] = {
     "Samm 1: Kodeerimiss�steemi tuvastamine",
     "Fase 1: Detekterer fjernbetjenings-kodetype",
     "F�ze 1: Detekce typu k�du",
+    "Faz 1: Kumandan�n kodu aran�yor",
   },
   { "Press any key on the RC unit",
     "Eine Taste auf der Fernbedienung dr�cken",
@@ -4891,6 +5096,7 @@ const tI18nPhrase Phrases[] = {
     "Vajuta puldil suvalist klahvi",
     "Tryk vilk�rlig tast p� fjernbetjeningen",
     "Stiskn�te libovolnou kl�vesu ovl�d�n�",
+    "Kumandada herhangi bir tu�a bas",
   },
   { "RC code detected!",
     "System der Fernbedienung erkannt!",
@@ -4913,6 +5119,7 @@ const tI18nPhrase Phrases[] = {
     "Kodeerimiss�steem tuvastatud!",
     "Fjernbetjenings-kodetype fundet!",
     "K�d byl detekov�n!",
+    "Kumandan�n kodu bulundu!",
   },
   { "Do not press any key...",
     "Keine Taste dr�cken...",
@@ -4935,6 +5142,7 @@ const tI18nPhrase Phrases[] = {
     "�ra vajuta puldil �htki klahvi...",
     "Tryk ikke p� nogen tast...",
     "Nema�kejte ��dn� kl�vesy...",
+    "Tu�lara basmay�n�z...",
   },
   { "Phase 2: Learning specific key codes",
     "Phase 2: Tastenbelegung anlernen",
@@ -4957,6 +5165,7 @@ const tI18nPhrase Phrases[] = {
     "Samm 2: Klahvide �petamine",
     "Fase 2: L�r individuelle tast koder",
     "F�ze 2: U�en� konkr�tn�ho k�du kl�ves",
+    "Faz 2: Belirli tu� kodu e�itiliyor",
   },
   { "Press key for '%s'",
     "Taste f�r '%s' dr�cken",
@@ -4979,6 +5188,7 @@ const tI18nPhrase Phrases[] = {
     "Vajuta klahvile '%s'",
     "Tryk tasten for '%s'",
     "Stiskn�te kl�vesu pro '%s'",
+    "'%s' i�in tu� se�iniz",
   },
   { "Press 'Up' to confirm",
     "'Auf' dr�cken zum Best�tigen",
@@ -5001,6 +5211,7 @@ const tI18nPhrase Phrases[] = {
     "Kinnitamiseks vajuta '�les'",
     "Tryk 'Op' for at bekr�fte",
     "Stiskn�te 'Nahoru' pro potvrzen�",
+    "Onaylamak i�in 'Yukar�' bas",
   },
   { "Press 'Down' to continue",
     "'Ab' dr�cken zum Weitermachen",
@@ -5023,6 +5234,7 @@ const tI18nPhrase Phrases[] = {
     "J�tkamiseks vajuta 'Alla'",
     "Tryk 'Ned' for at forts�tte",
     "Stiskn�te 'Dol�' pro pokra�ov�n�",
+    "Devam etmek i�in 'A�a��' bas",
   },
   { "(press 'Up' to go back)",
     "('Auf' dr�cken, um zur�ckzugehen)",
@@ -5045,6 +5257,7 @@ const tI18nPhrase Phrases[] = {
     "(tagasiminekuks vajuta '�les')",
     "(tryk 'Op' for at g� tilbage)",
     "(stiskn�te 'Nahoru' pro zp�t)",
+    "(Geri d�nmek i�in 'Yukar�' bas)",
   },
   { "(press 'Down' to end key definition)",
     "('Ab' dr�cken zum Beenden)",
@@ -5067,6 +5280,7 @@ const tI18nPhrase Phrases[] = {
     "(l�petamiseks vajuta 'Alla')",
     "(tryk 'Ned' for at afslutte indl�ringen)",
     "(stiskn�te 'Dol�' pro ukon�en�)",
+    "(Sona erdirmek i�in 'A�a��' bas)",
   },
   { "(press 'Menu' to skip this key)",
     "('Men�' dr�cken zum �berspringen)",
@@ -5089,6 +5303,7 @@ const tI18nPhrase Phrases[] = {
     "(selle klahvi vahelej�tmiseks vajuta 'Men��')",
     "(tryk 'Menu' for at springe denne tast over)",
     "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)",
+    "(Tu�u atlamak i�in 'Men�' bas)",
   },
   { "Phase 3: Saving key codes",
     "Phase 3: Tastenbelegung abspeichern",
@@ -5111,6 +5326,7 @@ const tI18nPhrase Phrases[] = {
     "Samm 3: Klavhikoodide salvestamine",
     "Fase 3: Gemmer tast koder",
     "F�ze 3: Ulo�en� k�d�",
+    "Faz 3: Tu� ayarlar�n� kesinle�tir",
   },
   { "Press 'Up' to save, 'Down' to cancel",
     "'Auf' speichert, 'Ab' bricht ab",
@@ -5133,6 +5349,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'",
     "Tryk 'Op' for at gemme, 'Ned' for at annullere",
     "Stiskn�te 'Nahoru' pro ulo�en�, 'Dol�' pro zru�en�",
+    "Kesinle�tirmek i�in 'Yukar�', Iptal etmek i�in 'A�a��' bas",
   },
   // Key names:
   { "Key$Up",
@@ -5156,6 +5373,7 @@ const tI18nPhrase Phrases[] = {
     "�les",
     "Op",
     "Nahoru",
+    "Yukar�",
   },
   { "Key$Down",
     "Ab",
@@ -5178,6 +5396,7 @@ const tI18nPhrase Phrases[] = {
     "Alla",
     "Ned",
     "Dol�",
+    "A�a��",
   },
   { "Key$Menu",
     "Men�",
@@ -5200,6 +5419,7 @@ const tI18nPhrase Phrases[] = {
     "Men��",
     "Menu",
     "Menu",
+    "Men�",
   },
   { "Key$Ok",
     "Ok",
@@ -5222,6 +5442,7 @@ const tI18nPhrase Phrases[] = {
     "Ok",
     "Ok",
     "Ok",
+    "Tamam",
   },
   { "Key$Back",
     "Zur�ck",
@@ -5244,6 +5465,7 @@ const tI18nPhrase Phrases[] = {
     "Tagasi",
     "Tilbage",
     "Zp�t",
+    "Geri",
   },
   { "Key$Left",
     "Links",
@@ -5266,6 +5488,7 @@ const tI18nPhrase Phrases[] = {
     "Vasakule",
     "Venstre",
     "Vlevo",
+    "Sol",
   },
   { "Key$Right",
     "Rechts",
@@ -5288,6 +5511,7 @@ const tI18nPhrase Phrases[] = {
     "Paremale",
     "H�jre",
     "Vpravo",
+    "Sa�",
   },
   { "Key$Red",
     "Rot",
@@ -5310,6 +5534,7 @@ const tI18nPhrase Phrases[] = {
     "Punane",
     "R�d",
     "�erven�",
+    "K�rm�z�",
   },
   { "Key$Green",
     "Gr�n",
@@ -5332,6 +5557,7 @@ const tI18nPhrase Phrases[] = {
     "Roheline",
     "Gr�n",
     "Zelen�",
+    "Ye�il",
   },
   { "Key$Yellow",
     "Gelb",
@@ -5354,6 +5580,7 @@ const tI18nPhrase Phrases[] = {
     "Kollane",
     "Gul",
     "�lut�",
+    "Sar�",
   },
   { "Key$Blue",
     "Blau",
@@ -5376,6 +5603,7 @@ const tI18nPhrase Phrases[] = {
     "Sinine",
     "Bl�",
     "Modr�",
+    "Mavi",
   },
   { "Key$Info",
     "Info",
@@ -5398,6 +5626,7 @@ const tI18nPhrase Phrases[] = {
     "Info",
     "Info",
     "Info",
+    "Bilgi",
   },
   { "Key$Play",
     "Wiedergabe",
@@ -5420,6 +5649,7 @@ const tI18nPhrase Phrases[] = {
     "Start",
     "Afspil",
     "P�ehr�t",
+    "G�ster",
   },
   { "Key$Pause",
     "Pause",
@@ -5442,6 +5672,7 @@ const tI18nPhrase Phrases[] = {
     "Paus",
     "Pause",
     "P�eru�it",
+    "Durakla",
   },
   { "Key$Stop",
     "Stopp",
@@ -5464,6 +5695,7 @@ const tI18nPhrase Phrases[] = {
     "Stopp",
     "Stop",
     "Zastavit",
+    "Durdur",
   },
   { "Key$Record",
     "Aufnehmen",
@@ -5486,6 +5718,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine",
     "Optag",
     "Nahr�t",
+    "Kay�t et",
   },
   { "Key$FastFwd",
     "Vorlauf",
@@ -5508,6 +5741,7 @@ const tI18nPhrase Phrases[] = {
     "Edasikerimine",
     "Spol fremad",
     "Dop�edu",
+    "�leri sar",
   },
   { "Key$FastRew",
     "R�cklauf",
@@ -5530,6 +5764,7 @@ const tI18nPhrase Phrases[] = {
     "Tagasikerimine",
     "Spol tilbage",
     "Dozadu",
+    "Geri sar",
   },
   { "Key$Next",
     "Vorw�rts",
@@ -5552,6 +5787,7 @@ const tI18nPhrase Phrases[] = {
     "J�rgmine",
     "Fremad",
     "D�le",
+    "Sonraki",
   },
   { "Key$Prev",
     "Zur�ck",
@@ -5574,6 +5810,7 @@ const tI18nPhrase Phrases[] = {
     "Eelmine",
     "Tilbage",
     "Zp�t",
+    "�nceki",
   },
   { "Key$Power",
     "Ausschalten",
@@ -5596,6 +5833,7 @@ const tI18nPhrase Phrases[] = {
     "Toide",
     "Sluk",
     "Vyp�na�",
+    "Kapat",
   },
   { "Key$Channel+",
     "Kanal+",
@@ -5618,6 +5856,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal+",
     "Kanal+",
     "Kan�l+",
+    "Kanal+",
   },
   { "Key$Channel-",
     "Kanal-",
@@ -5640,6 +5879,7 @@ const tI18nPhrase Phrases[] = {
     "Kanal-",
     "Kanal-",
     "Kan�l-",
+    "Kanal-",
   },
   { "Key$PrevChannel",
     "Vorheriger Kanal",
@@ -5662,6 +5902,7 @@ const tI18nPhrase Phrases[] = {
     "Eelmine kanal",
     "Foreg�ende kanal",
     "P�edch�zej�c� kan�l",
+    "�nceki kanal",
   },
   { "Key$Volume+",
     "Lautst�rke+",
@@ -5684,6 +5925,7 @@ const tI18nPhrase Phrases[] = {
     "Helitugevus+",
     "Lydstyrke+",
     "Hlasitost+",
+    "Ses+",
   },
   { "Key$Volume-",
     "Lautst�rke-",
@@ -5706,6 +5948,7 @@ const tI18nPhrase Phrases[] = {
     "Helitugevus-",
     "Lydstyrke-",
     "Hlasitost-",
+    "Ses-",
   },
   { "Key$Mute",
     "Stumm",
@@ -5728,6 +5971,7 @@ const tI18nPhrase Phrases[] = {
     "H��letu",
     "Sluk lyd",
     "Ticho",
+    "Sessiz",
   },
   { "Key$Audio",
     "Audio",
@@ -5750,6 +5994,7 @@ const tI18nPhrase Phrases[] = {
     "Audio",
     "Audio",
     "Zvuk",
+    "Audio",
   },
   // Miscellaneous:
   { "yes",
@@ -5773,6 +6018,7 @@ const tI18nPhrase Phrases[] = {
     "jah",
     "ja",
     "ano",
+    "evet",
   },
   { "no",
     "nein",
@@ -5795,6 +6041,7 @@ const tI18nPhrase Phrases[] = {
     "ei",
     "nej",
     "ne",
+    "hay�r",
   },
   { "off",
     "aus",
@@ -5817,6 +6064,7 @@ const tI18nPhrase Phrases[] = {
     "v�lja",
     "fra",
     "vyp.",
+    "kapal�",
   },
   { "none",
     "keine",
@@ -5839,6 +6087,7 @@ const tI18nPhrase Phrases[] = {
     "t�hi",
     "ingen",
     "��dn�",
+    "hi�",
   },
   { "auto",
     "auto",
@@ -5861,6 +6110,7 @@ const tI18nPhrase Phrases[] = {
     "automaatne",
     "automatisk",
     "auto",
+    "otomatik",
   },
   { "top",
     "oben",
@@ -5883,6 +6133,7 @@ const tI18nPhrase Phrases[] = {
     "�leval",
     "top",
     "haho�e",
+    "�st",
   },
   { "bottom",
     "unten",
@@ -5905,6 +6156,7 @@ const tI18nPhrase Phrases[] = {
     "all",
     "bund",
     "dole",
+    "alt",
   },
   { "Disk",
     "Disk",
@@ -5927,6 +6179,7 @@ const tI18nPhrase Phrases[] = {
     "Ketas",
     "Disk",
     "Disk",
+    "Disk",
   },
   { "free",
     "frei",
@@ -5949,6 +6202,7 @@ const tI18nPhrase Phrases[] = {
     "vaba",
     "fri",
     "volno",
+    "bo�",
   },
   { "Jump: ", // note the trailing blank
     "Springen: ",
@@ -5971,6 +6225,7 @@ const tI18nPhrase Phrases[] = {
     "H�pe: ",
     "Hop: ",
     "Skok: ",
+    "Atla: ",
   },
   { "Volume ", // note the trailing blank
     "Lautst�rke ",
@@ -5993,6 +6248,7 @@ const tI18nPhrase Phrases[] = {
     "Helitugevus ",
     "Lydstyrke ",
     "Hlasitost ",
+    "Ses ",
   },
   { " Stop replaying", // note the leading blank!
     " Wiedergabe beenden",
@@ -6015,6 +6271,7 @@ const tI18nPhrase Phrases[] = {
     " L�petada taasesitamine",
     " Stop afspilning",
     " Zastavit p�ehr�v�n�",
+    " G�steri�i bitir",
   },
   { " Stop recording ", // note the leading and trailing blanks!
     " Aufzeichnung beenden ",
@@ -6037,6 +6294,7 @@ const tI18nPhrase Phrases[] = {
     " L�petada salvestamine ",
     " Stop optagelse ",
     " Zastavit nahr�v�n� ",
+    " �ekimi bitir ",
   },
   { " Cancel editing", // note the leading blank!
     " Schneiden abbrechen",
@@ -6059,6 +6317,7 @@ const tI18nPhrase Phrases[] = {
     " Katkestada monteerimine",
     " Afbryd redigering",
     " Zru�it editaci",
+    " Kesimi iptal et",
   },
   { "Switching primary DVB...",
     "Prim�res Interface wird umgeschaltet...",
@@ -6081,6 +6340,7 @@ const tI18nPhrase Phrases[] = {
     "Esmase DVB seadme �mberl�litus...",
     "Skifter prim�r DVB enhed...",
     "P�epnout prim�rn� DVB...",
+    "Primer DVB aray�z� de�i�tiriliyor...",
   },
   { "Up/Dn for new location - OK to move",
     "Auf/Ab f�r neue Position - dann OK",
@@ -6103,6 +6363,7 @@ const tI18nPhrase Phrases[] = {
     "'�les/Alla' uus asukoht - 'OK' kinnitus",
     "Op/Ned for ny placering - OK for at flytte",
     "Nahoru/Dolu pro novou pozici - Ok p�esune",
+    "'Yukar�/A�a��' yeni posizyon se� - 'Tamam' ta��",
   },
   { "Editing process started",
     "Schnitt gestartet",
@@ -6125,6 +6386,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimine algas",
     "Redigeringsproces startet",
     "Edita�n� proces za�al",
+    "Kesim ba�land�",
   },
   { "Editing process finished",
     "Schnitt beendet",
@@ -6147,6 +6409,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimine l�petatud",
     "Redigeringsproces afsluttet",
     "Edita�n� proces skon�il",
+    "Kesim bitti",
   },
   { "Editing process failed!",
     "Schnitt gescheitert!",
@@ -6169,6 +6432,7 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimine eba�nnestus",
     "Redigeringsproces fejlede!",
     "Edita�n� proces selhal!",
+    "Kesim ba�ar�s�z!",
   },
   { "Recording started",
     "Aufzeichnung gestartet",
@@ -6191,6 +6455,7 @@ const tI18nPhrase Phrases[] = {
     "Salvestamine algas",
     "Optagelse startet",
     "Za�alo nahr�v�n�",
+    "Kay�t ba�land�",
   },
   { "Pausing live video...",
     "Live-Signal wird angehalten...",
@@ -6213,6 +6478,7 @@ const tI18nPhrase Phrases[] = {
     "Saate edastamise peatamine...",
     "Pausere live udsendelse...",
     "P�eru�uje se b��c� program ...",
+    "Naklen yay�n duraklat�l�yor...",
   },
   { "Starting EPG scan",
     "Aktualisiere EPG-Daten",
@@ -6235,6 +6501,7 @@ const tI18nPhrase Phrases[] = {
     "EPG skaneerimine k�ivitatud",
     "Starter EPG skanning",
     "Za��n� prohled�v�n� EPG",
+    "EPG tarama ba�l�yor",
   },
   { "This plugin has no setup parameters!",
     "Dieses Plugin hat keine Parameter!",
@@ -6257,6 +6524,7 @@ const tI18nPhrase Phrases[] = {
     "Sellel laienudusmoodulil ei ole seadeid!",
     "Denne plugin har ingen parametre",
     "Modul nem� konfigura�n� parametry!",
+    "Bu eklentinin d�zenek parametresi yok!",
   },
   { "Classic VDR",
     "Klassischer VDR",
@@ -6279,6 +6547,7 @@ const tI18nPhrase Phrases[] = {
     "Klassikaline VDR",
     "Klassisk VDR",
     "Klasick� VDR",
+    "Klasik VDR",
   },
   { "ST:TNG Panels",
     "ST:TNG-Konsolen",
@@ -6301,6 +6570,7 @@ const tI18nPhrase Phrases[] = {
     "ST:TNG konsool",
     "ST:TNG konsol",
     "ST:TNG konzola",
+    "ST:TNG paneli",
   },
   { "No title",
     "Kein Titel",
@@ -6323,6 +6593,7 @@ const tI18nPhrase Phrases[] = {
     "Pealkiri puudub",
     "Ingen titel",
     "Bez n�zvu",
+    "�sim yok",
   },
   { NULL }
   };
diff --git a/i18n.h b/i18n.h
index b6c217b73..085dd924f 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.18 2006/03/26 09:08:00 kls Exp $
+ * $Id: i18n.h 1.19 2007/03/11 09:52:16 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-const int I18nNumLanguages = 21;
+const int I18nNumLanguages = 22;
 
 typedef const char *tI18nPhrase[I18nNumLanguages];
 
diff --git a/libsi/si.c b/libsi/si.c
index a16000dea..a1d2f3459 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,12 +6,15 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.17 2007/02/03 11:45:58 kls Exp $
+ *   $Id: si.c 1.18 2007/04/22 13:56:39 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
-#include <string.h>
 #include "si.h"
+#include <errno.h>
+#include <iconv.h>
+#include <malloc.h>
+#include <string.h>
 #include "descriptor.h"
 
 namespace SI {
@@ -232,7 +235,6 @@ char *String::getText(char *buffer, int size) {
    return buffer;
 }
 
-//taken from VDR, Copyright Klaus Schmidinger <kls@cadsoft.de>
 char *String::getText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion) {
    int len=getLength();
    if (len < 0 || len >= sizeBuffer) {
@@ -245,21 +247,163 @@ char *String::getText(char *buffer, char *shortVersion, int sizeBuffer, int size
    return buffer;
 }
 
-//taken from libdtv, Copyright Rolf Hakenes <hakenes@hippomi.de>
+static const char *CharacterTables1[] = {
+  NULL,         // 0x00
+  "ISO8859-5",  // 0x01
+  "ISO8859-6",  // 0x02
+  "ISO8859-7",  // 0x03
+  "ISO8859-8",  // 0x04
+  "ISO8859-9",  // 0x05
+  "ISO8859-10", // 0x06
+  "ISO8859-11", // 0x07
+  "ISO8859-12", // 0x08
+  "ISO8859-13", // 0x09
+  "ISO8859-14", // 0x0A
+  "ISO8859-15", // 0x0B
+  NULL,         // 0x0C
+  NULL,         // 0x0D
+  NULL,         // 0x0E
+  NULL,         // 0x0F
+  NULL,         // 0x10
+  "UTF16",      // 0x11
+  "EUC-KR",     // 0x12
+  "GB2312",     // 0x13
+  "GBK",        // 0x14
+  "UTF8",       // 0x15
+  NULL,         // 0x16
+  NULL,         // 0x17
+  NULL,         // 0x18
+  NULL,         // 0x19
+  NULL,         // 0x1A
+  NULL,         // 0x1B
+  NULL,         // 0x1C
+  NULL,         // 0x1D
+  NULL,         // 0x1E
+  NULL,         // 0x1F
+};
+
+#define SingleByteLimit 0x0B
+
+static const char *CharacterTables2[] = {
+  NULL,         // 0x00
+  "ISO8859-1",  // 0x01
+  "ISO8859-2",  // 0x02
+  "ISO8859-3",  // 0x03
+  "ISO8859-4",  // 0x04
+  "ISO8859-5",  // 0x05
+  "ISO8859-6",  // 0x06
+  "ISO8859-7",  // 0x07
+  "ISO8859-8",  // 0x08
+  "ISO8859-9",  // 0x09
+  "ISO8859-10", // 0x0A
+  "ISO8859-11", // 0x0B
+  NULL,         // 0x0C
+  "ISO8859-13", // 0x0D
+  "ISO8859-14", // 0x0E
+  "ISO8859-15", // 0x0F
+};
+
+#define NumEntries(Table) (sizeof(Table) / sizeof(char *))
+
+static const char *SystemCharacterTable = NULL;
+bool SystemCharacterTableIsSingleByte = true;
+
+bool SetSystemCharacterTable(const char *CharacterTable) {
+   if (CharacterTable) {
+      for (unsigned int i = 0; i < NumEntries(CharacterTables1); i++) {
+         if (CharacterTables1[i] && strcasecmp(CharacterTable, CharacterTables1[i]) == 0) {
+            SystemCharacterTable = CharacterTables1[i];
+            SystemCharacterTableIsSingleByte = i <= SingleByteLimit;
+            return true;
+         }
+      }
+      for (unsigned int i = 0; i < NumEntries(CharacterTables2); i++) {
+         if (CharacterTables2[i] && strcasecmp(CharacterTable, CharacterTables2[i]) == 0) {
+            SystemCharacterTable = CharacterTables2[i];
+            SystemCharacterTableIsSingleByte = true;
+            return true;
+         }
+      }
+   } else {
+      SystemCharacterTable = NULL;
+      SystemCharacterTableIsSingleByte = true;
+      return true;
+   }
+   return false;
+}
+
+// Determines the character table used in the given buffer and returns
+// a string indicating that table. If no table can be determined, the
+// default ISO6937 is returned. If a table can be determined, the buffer
+// and length are adjusted accordingly.
+static const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL) {
+   const char *cs = "ISO6937";
+   if (isSingleByte)
+      *isSingleByte = false;
+   if (length <= 0)
+      return cs;
+   unsigned int tag = buffer[0];
+   if (tag >= 0x20)
+      return cs;
+   if (tag == 0x10) {
+      if (length >= 3) {
+         tag = (buffer[1] << 8) | buffer[2];
+         if (tag < NumEntries(CharacterTables2) && CharacterTables2[tag]) {
+            buffer += 3;
+            length -= 3;
+            if (isSingleByte)
+               *isSingleByte = true;
+            return CharacterTables2[tag];
+         }
+      }
+   } else if (tag < NumEntries(CharacterTables1) && CharacterTables1[tag]) {
+      buffer += 1;
+      length -= 1;
+      if (isSingleByte)
+         *isSingleByte = tag <= SingleByteLimit;
+      return CharacterTables1[tag];
+   }
+   return cs;
+}
+
+static bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode)
+{
+  if (SystemCharacterTable) {
+     iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
+     if (cd >= 0) {
+        char *fromPtr = (char *)from;
+        while (fromLength > 0 && toLength > 1) {
+           if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
+              if (errno == EILSEQ) {
+                 // A character can't be converted, so mark it with '?' and proceed:
+                 fromPtr++;
+                 fromLength--;
+                 *to++ = '?';
+                 toLength--;
+              }
+              else
+                 break;
+           }
+        }
+        *to = 0;
+        iconv_close(cd);
+        return true;
+     }
+  }
+  return false;
+}
+
+// originally from libdtv, Copyright Rolf Hakenes <hakenes@hippomi.de>
 void String::decodeText(char *buffer, int size) {
    const unsigned char *from=data.getData(0);
    char *to=buffer;
-
-   /* Disable detection of coding tables - libdtv doesn't do it either
-   if ( (0x01 <= *from) && (*from <= 0x1f) ) {
-      codeTable=*from
-   }
-   */
-
-   if (*from == 0x10)
-      from += 3; // skips code table info
-
    int len=getLength();
+   if (len <= 0) {
+      *to = '\0';
+      return;
+      }
+   bool singleByte;
+   const char *cs = getCharacterTable(from, len, &singleByte);
    for (int i = 0; i < len; i++) {
       if (*from == 0)
          break;
@@ -276,6 +420,11 @@ void String::decodeText(char *buffer, int size) {
          break;
    }
    *to = '\0';
+   if (!singleByte || !SystemCharacterTableIsSingleByte) {
+      char convBuffer[size];
+      if (convertCharacterTable(buffer, strlen(buffer), convBuffer, sizeof(convBuffer), cs))
+         strncpy(buffer, convBuffer, strlen(convBuffer) + 1);
+   }
 }
 
 void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion) {
@@ -283,11 +432,14 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
    char *to=buffer;
    char *toShort=shortVersion;
    int IsShortName=0;
-
-   if (*from == 0x10)
-      from += 3; // skips code table info
-
    int len=getLength();
+   if (len <= 0) {
+      *to = '\0';
+      *toShort = '\0';
+      return;
+      }
+   bool singleByte;
+   const char *cs = getCharacterTable(from, len, &singleByte);
    for (int i = 0; i < len; i++) {
       if (    ((' ' <= *from) && (*from <= '~'))
            || (*from == '\n')
@@ -312,6 +464,14 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
    }
    *to = '\0';
    *toShort = '\0';
+   if (!singleByte || !SystemCharacterTableIsSingleByte) {
+      char convBuffer[sizeBuffer];
+      if (convertCharacterTable(buffer, strlen(buffer), convBuffer, sizeof(convBuffer), cs))
+         strncpy(buffer, convBuffer, strlen(convBuffer) + 1);
+      char convShortVersion[sizeShortVersion];
+      if (convertCharacterTable(shortVersion, strlen(shortVersion), convShortVersion, sizeof(convShortVersion), cs))
+         strncpy(shortVersion, convShortVersion, strlen(convShortVersion) + 1);
+   }
 }
 
 Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain, bool returnUnimplemetedDescriptor) {
diff --git a/libsi/si.h b/libsi/si.h
index eb016094d..a156d767d 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.16 2007/02/03 11:47:25 kls Exp $
+ *   $Id: si.h 1.17 2007/04/22 13:32:09 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -486,6 +486,11 @@ class String : public VariableLengthPart {
    void decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
 };
 
+// Call this function to set the system character table. CharacterTable is a string
+// like "iso8859-15" or "utf-8" (case insensitive).
+// Returns true if the character table was recognized.
+bool SetSystemCharacterTable(const char *CharacterTable);
+
 } //end of namespace
 
 #endif //LIBSI_SI_H
diff --git a/vdr.c b/vdr.c
index 001a7cb1c..fa5d72bbe 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.285 2007/02/25 11:27:36 kls Exp $
+ * $Id: vdr.c 1.287 2007/04/22 13:28:32 kls Exp $
  */
 
 #include <getopt.h>
@@ -455,15 +455,6 @@ int main(int argc, char *argv[])
      return 0;
      }
 
-  // Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
-  char *LangEnv;
-  if ((LangEnv = getenv("LANG"))     != NULL && strcasestr(LangEnv, "utf") ||
-      (LangEnv = getenv("LC_ALL"))   != NULL && strcasestr(LangEnv, "utf") ||
-      (LangEnv = getenv("LC_CTYPE")) != NULL && strcasestr(LangEnv, "utf")) {
-     fprintf(stderr, "vdr: please turn off UTF-8 before starting VDR\n");
-     return 2;
-     }
-
   // Log file:
 
   if (SysLogLevel > 0)
@@ -500,6 +491,18 @@ int main(int argc, char *argv[])
      dsyslog("running as daemon (tid=%d)", cThread::ThreadId());
   cThread::SetMainThreadId();
 
+  // Set the system character table:
+
+  char *LangEnv = getenv("LANG");
+  if (LangEnv) {
+     char *CodeSet = strchr(LangEnv, '.');
+     if (CodeSet) {
+        CodeSet++; // skip the dot
+        bool known = SI::SetSystemCharacterTable(CodeSet);
+        isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
+        }
+     }
+
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
   cOsdObject *Menu = NULL;
@@ -1162,7 +1165,7 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && cRemote::LastActivity() > ACTIVITYTIMEOUT) {
+        if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (time(NULL) - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Handle housekeeping tasks
 
            // Shutdown:

From b9b9ace9a8d2d1c0beda1dc0a2ebc6be9b47c305 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 10 Jun 2007 18:00:00 +0200
Subject: [PATCH 169/307] =?UTF-8?q?Version=201.5.3=20-=20Fixed=20some=20sp?=
 =?UTF-8?q?elling=20errors=20in=20'newplugin'=20(thanks=20to=20Ville=20Sky?=
 =?UTF-8?q?tt=C3=A4).=20-=20Fixed=20a=20busy=20loop=20in=20fast=20forward?=
 =?UTF-8?q?=20if=20the=20next=20video=20data=20file=20is=20missing=20=20?=
 =?UTF-8?q?=20(thanks=20to=20Reinhard=20Nissl).=20-=20Fixed=20handling=20f?=
 =?UTF-8?q?requencies=20in=20NitFilter::Process()=20(thanks=20to=20Anssi?=
 =?UTF-8?q?=20Hannula).=20-=20Fixed=20a=20race=20condition=20with=20signal?=
 =?UTF-8?q?=20handlers=20at=20program=20exit=20(thanks=20to=20Udo=20=20=20?=
 =?UTF-8?q?Richter).=20-=20Non-primary=20devices=20in=20Transfer=20mode=20?=
 =?UTF-8?q?are=20now=20also=20used=20for=20recording=20(thanks=20=20=20to?=
 =?UTF-8?q?=20Anssi=20Hannula).=20-=20Fixed=20handling=20ChannelUp/Down=20?=
 =?UTF-8?q?keys=20if=20there=20is=20currently=20a=20replay=20running=20=20?=
 =?UTF-8?q?=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20The=20new?=
 =?UTF-8?q?=20SVDRP=20command=20REMO=20can=20be=20used=20to=20turn=20VDR's?=
 =?UTF-8?q?=20remote=20control=20off=20and=20=20=20on=20in=20case=20other?=
 =?UTF-8?q?=20programs=20need=20to=20be=20controlled=20(based=20on=20patch?=
 =?UTF-8?q?es=20from=20Krzysztof=20=20=20Parma=20and=20Helmut=20Auer).=20-?=
 =?UTF-8?q?=20Increased=20the=20maximum=20number=20of=20CA=20system=20ids?=
 =?UTF-8?q?=20to=20cope=20with=20the=20AlphaCrypt=20=20=20CAM's=20version?=
 =?UTF-8?q?=203.11=20firmware.=20-=20Fixed=20getting=20the=20code=20settin?=
 =?UTF-8?q?g=20from=20the=20locale=20(thanks=20to=20Matthias=20Schwarzott)?=
 =?UTF-8?q?.=20-=20Implemented=20support=20for=20Freetype=20fonts=20(based?=
 =?UTF-8?q?=20on=20a=20patch=20from=20Alexander=20Riedel).=20=20=20The=20f?=
 =?UTF-8?q?ont=20names=20and=20sizes=20can=20be=20adjusted=20in=20the=20"S?=
 =?UTF-8?q?etup/OSD"=20menu.=20=20=20Note=20that=20VDR=20now=20requires=20?=
 =?UTF-8?q?freetype=20fonts=20to=20be=20installed=20in=20=20=20/usr/share/?=
 =?UTF-8?q?fonts/truetype.=20-=20If=20the=20OSD=20device=20in=20use=20has?=
 =?UTF-8?q?=20at=20least=208bpp=20bitmap=20depth=20and=20this=20is=20also?=
 =?UTF-8?q?=20=20=20used=20by=20the=20current=20skin,=20Freetype=20fonts?=
 =?UTF-8?q?=20are=20displayed=20"anti-aliased".=20=20=20The=20new=20setup?=
 =?UTF-8?q?=20parameter=20"OSD/Anti-alias"=20can=20be=20used=20to=20turn?=
 =?UTF-8?q?=20this=20off.=20-=20The=20new=20function=20cOsd::SetAntiAliasG?=
 =?UTF-8?q?ranularity()=20can=20be=20used=20to=20help=20the=20OSD=20=20=20?=
 =?UTF-8?q?in=20managing=20the=20available=20color=20palette=20entries=20w?=
 =?UTF-8?q?hen=20doing=20anti-aliasing.=20=20=20Skins=20that=20use=208bpp?=
 =?UTF-8?q?=20bitmaps=20can=20call=20this=20function=20with=20the=20maximu?=
 =?UTF-8?q?m=20number=20=20=20of=20colors=20used,=20and=20the=20maximum=20?=
 =?UTF-8?q?number=20of=20color=20combinations.=20The=20OSD=20will=20=20=20?=
 =?UTF-8?q?then=20evenly=20split=20the=20available=20palette=20entries=20b?=
 =?UTF-8?q?etween=20the=20various=20colors=20=20=20combinations,=20so=20th?=
 =?UTF-8?q?at=20fonts=20can=20be=20"anti-aliased".=20By=20default=20a=20to?=
 =?UTF-8?q?tal=20of=20=20=2010=20colors=20and=2010=20combinations=20is=20a?=
 =?UTF-8?q?ssumed.=20-=20The=20pixel=20fonts=20have=20been=20completely=20?=
 =?UTF-8?q?removed=20from=20the=20VDR=20source.=20-=20VDR=20is=20now=20"UT?=
 =?UTF-8?q?F-8=20aware".=20It=20handles=20strings=20according=20to=20the?=
 =?UTF-8?q?=20character=20=20=20encoding=20used=20on=20the=20user's=20syst?=
 =?UTF-8?q?em.=20All=20internationalization=20strings=20and=20=20=20incomi?=
 =?UTF-8?q?ng=20SI=20data=20are=20converted=20to=20the=20system=20encoding?=
 =?UTF-8?q?.=20-=20Plugins=20that=20handle=20strings=20need=20to=20be=20aw?=
 =?UTF-8?q?are=20that=20on=20systems=20with=20UTF-8=20=20=20encoding=20a?=
 =?UTF-8?q?=20"character=20symbol"=20may=20consist=20of=20more=20than=20a?=
 =?UTF-8?q?=20single=20byte=20in=20=20=20memory.=20The=20functions=20and?=
 =?UTF-8?q?=20macros=20named=20Utf8...()=20can=20be=20used=20to=20handle?=
 =?UTF-8?q?=20=20=20strings=20without=20needing=20to=20care=20about=20the?=
 =?UTF-8?q?=20underlying=20character=20encoding=20=20=20(see=20tools.h=20f?=
 =?UTF-8?q?or=20details).=20-=20Even=20though=20the=20weekdays=20of=20repe?=
 =?UTF-8?q?ating=20timers=20are=20presented=20to=20the=20user=20as=20UTF-8?=
 =?UTF-8?q?=20=20=20characters=20in=20the=20OSD,=20the=20timers.conf=20fil?=
 =?UTF-8?q?e=20and=20the=20SVDRP=20timer=20commands=20still=20=20=20use=20?=
 =?UTF-8?q?single=20byte=20characters=20("MTWTFSS")=20to=20make=20sure=20t?=
 =?UTF-8?q?his=20information=20is=20handled=20=20=20correctly=20between=20?=
 =?UTF-8?q?systems=20with=20different=20character=20encodings.=20-=20Added?=
 =?UTF-8?q?=20a=20missing=20i18n=20string=20for=20"CAM"=20in=20the=20Turki?=
 =?UTF-8?q?sh=20OSD=20texts.=20-=20Improved=20editing=20strings=20that=20a?=
 =?UTF-8?q?re=20too=20long=20to=20fit=20into=20the=20editable=20area.=20-?=
 =?UTF-8?q?=20Changes=20to=20the=20OSD=20settings=20in=20the=20"Setup/OSD"?=
 =?UTF-8?q?=20menu=20now=20immediately=20take=20effect=20=20=20when=20the?=
 =?UTF-8?q?=20"Ok"=20key=20is=20pressed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         |   15 +
 HISTORY              |   64 +
 INSTALL              |   35 +-
 MANUAL               |   17 +
 Makefile             |  105 +-
 PLUGINS.html         |   45 +-
 channels.conf        |   89 +-
 ci.c                 |    4 +-
 config.c             |   23 +-
 config.h             |   14 +-
 device.c             |    4 +-
 dvbplayer.c          |    6 +-
 eit.c                |    9 +-
 epg.c                |    4 +-
 font.c               |  352 ++-
 font.h               |   64 +-
 fontfix-iso8859-1.c  | 6498 ----------------------------------------
 fontfix-iso8859-13.c | 6498 ----------------------------------------
 fontfix-iso8859-15.c | 6498 ----------------------------------------
 fontfix-iso8859-2.c  | 6498 ----------------------------------------
 fontfix-iso8859-5.c  | 6050 -------------------------------------
 fontfix-iso8859-7.c  | 6050 -------------------------------------
 fontfix-iso8859-9.c  | 6498 ----------------------------------------
 fontosd-iso8859-1.c  | 6722 -----------------------------------------
 fontosd-iso8859-13.c | 6722 -----------------------------------------
 fontosd-iso8859-15.c | 6722 -----------------------------------------
 fontosd-iso8859-2.c  | 6733 ------------------------------------------
 fontosd-iso8859-5.c  | 5602 -----------------------------------
 fontosd-iso8859-7.c  | 6274 ---------------------------------------
 fontosd-iso8859-9.c  | 6722 -----------------------------------------
 fontsml-iso8859-1.c  | 5602 -----------------------------------
 fontsml-iso8859-13.c | 5602 -----------------------------------
 fontsml-iso8859-15.c | 5602 -----------------------------------
 fontsml-iso8859-2.c  | 5826 ------------------------------------
 fontsml-iso8859-5.c  | 6274 ---------------------------------------
 fontsml-iso8859-7.c  | 5154 --------------------------------
 fontsml-iso8859-9.c  | 5602 -----------------------------------
 genfontfile.c        |  381 ---
 i18n.c               |  215 +-
 i18n.h               |    3 +-
 libsi/si.c           |   14 +-
 menu.c               |   66 +-
 menuitems.c          |  302 +-
 menuitems.h          |   23 +-
 newplugin            |    6 +-
 nit.c                |   53 +-
 nit.h                |    4 +-
 osd.c                |   95 +-
 osd.h                |   44 +-
 osdbase.c            |   22 +-
 osdbase.h            |    3 +-
 remote.c             |    5 +-
 remote.h             |    5 +-
 sdt.c                |    8 +-
 skinclassic.c        |   89 +-
 skinsttng.c          |  116 +-
 svdrp.c              |   24 +-
 svdrp.h              |    3 +-
 timers.c             |   25 +-
 timers.h             |    4 +-
 tools.c              |  264 +-
 tools.h              |  126 +-
 vdr.5                |   11 +-
 vdr.c                |   18 +-
 64 files changed, 1768 insertions(+), 130760 deletions(-)
 delete mode 100644 fontfix-iso8859-1.c
 delete mode 100644 fontfix-iso8859-13.c
 delete mode 100644 fontfix-iso8859-15.c
 delete mode 100644 fontfix-iso8859-2.c
 delete mode 100644 fontfix-iso8859-5.c
 delete mode 100644 fontfix-iso8859-7.c
 delete mode 100644 fontfix-iso8859-9.c
 delete mode 100644 fontosd-iso8859-1.c
 delete mode 100644 fontosd-iso8859-13.c
 delete mode 100644 fontosd-iso8859-15.c
 delete mode 100644 fontosd-iso8859-2.c
 delete mode 100644 fontosd-iso8859-5.c
 delete mode 100644 fontosd-iso8859-7.c
 delete mode 100644 fontosd-iso8859-9.c
 delete mode 100644 fontsml-iso8859-1.c
 delete mode 100644 fontsml-iso8859-13.c
 delete mode 100644 fontsml-iso8859-15.c
 delete mode 100644 fontsml-iso8859-2.c
 delete mode 100644 fontsml-iso8859-5.c
 delete mode 100644 fontsml-iso8859-7.c
 delete mode 100644 fontsml-iso8859-9.c
 delete mode 100644 genfontfile.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d9afc84af..471a6bc5f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -585,6 +585,7 @@ Helmut Auer <vdr@helmutauer.de>
  for reporting that the shutdown script is given a reboot time in the past if there
  is a recording going on or about to start, and the user insists in shutting down now
  for suggesting to make the channel entry timeout configurable
+ for a patch that was used to implement the SVDRP command REMO
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1120,6 +1121,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for making cCommand::Execute() use cPipe instead of popen() to avoid problems
  with open file handles when starting background commands
  for fixing handling error status in cDvbTuner::GetFrontendStatus()
+ for fixing a busy loop in fast forward if the next video data file is missing
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1395,6 +1397,7 @@ Marco Schl
  speed mode"
  for removing 'assert(0)' from cDvbSpuDecoder::setTime()
  for adapting 'libsi' to DVB-S2
+ for fixing handling ChannelUp/Down keys if there is currently a replay running
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1491,6 +1494,7 @@ Udo Richter <udo_richter@gmx.de>
  for implementing cPlugin::WakeupTime() to allow plugins to request VDR to wake
  up at a particular time
  for making the HUP signal force a restart of VDR
+ for fixing a race condition with signal handlers at program exit
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1659,6 +1663,7 @@ Ville Skytt
  for reporting that there are places where ntohs() is assigned to different types
  for adapting cThread::ThreadId() to recent kernels
  for some improvements to the man pages
+ for fixing some spelling errors in 'newplugin'
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2014,6 +2019,8 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for suggesting that cDevice::GetDevice() should prefer any device that's already
  receiving and doesn't require detatching receivers
  for improving handling Transfer Mode devices when selecting a device to receive
+ for fixing handling frequencies in NitFilter::Process()
+ for making non-primary devices in Transfer mode be also used for recording
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2044,6 +2051,7 @@ Tomas Berglund <tomber@telia.com>
 
 Matthias Schwarzott <zzam@gentoo.org>
  for suggesting to add LC_ALL to the checks for UTF-8 at startup
+ for fixing getting the code setting from the locale
 
 Martin Ostermann <martin@familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
@@ -2072,3 +2080,10 @@ Petri Helin <phelin@googlemail.com>
 
 Oktay Yolge�en <oktay_73@yahoo.de>
  for translating OSD texts to the Turkish language
+
+Krzysztof Parma <krzycho@zoz.wodzislaw.pl>
+ for suggesting to implement the SVDRP command REMO
+
+Alexander Riedel <alexander-riedel@t-online.de>
+ for a patch that was used as a base to implement support for Freetype fonts and
+ UTF-8 handling
diff --git a/HISTORY b/HISTORY
index 3aa97f5f6..90bccf247 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5165,3 +5165,67 @@ Video Disk Recorder Revision History
   On its old transponder, the ProSieben/SAT.1 channels also had their EPG data
   wrongly encoded, but apparently on the new transponder they started broadcasting
   on this month, they got it right.
+
+2007-04-30: Version 1.4.6-1
+
+- Fixed a busy loop in fast forward if the next video data file is missing
+  (thanks to Reinhard Nissl).
+- Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
+- Fixed handling ChannelUp/Down keys if there is currently a replay running
+  (thanks to Marco Schl��ler).
+- Increased the maximum number of CA system ids to cope with the AlphaCrypt
+  CAM's version 3.11 firmware.
+
+2007-05-12: Version 1.4.7
+
+- Official release.
+
+2007-06-10: Version 1.5.3
+
+- Fixed some spelling errors in 'newplugin' (thanks to Ville Skytt�).
+- Fixed a busy loop in fast forward if the next video data file is missing
+  (thanks to Reinhard Nissl).
+- Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
+- Fixed a race condition with signal handlers at program exit (thanks to Udo
+  Richter).
+- Non-primary devices in Transfer mode are now also used for recording (thanks
+  to Anssi Hannula).
+- Fixed handling ChannelUp/Down keys if there is currently a replay running
+  (thanks to Marco Schl��ler).
+- The new SVDRP command REMO can be used to turn VDR's remote control off and
+  on in case other programs need to be controlled (based on patches from Krzysztof
+  Parma and Helmut Auer).
+- Increased the maximum number of CA system ids to cope with the AlphaCrypt
+  CAM's version 3.11 firmware.
+- Fixed getting the code setting from the locale (thanks to Matthias Schwarzott).
+- Implemented support for Freetype fonts (based on a patch from Alexander Riedel).
+  The font names and sizes can be adjusted in the "Setup/OSD" menu.
+  Note that VDR now requires freetype fonts to be installed in
+  /usr/share/fonts/truetype.
+- If the OSD device in use has at least 8bpp bitmap depth and this is also
+  used by the current skin, Freetype fonts are displayed "anti-aliased".
+  The new setup parameter "OSD/Anti-alias" can be used to turn this off.
+- The new function cOsd::SetAntiAliasGranularity() can be used to help the OSD
+  in managing the available color palette entries when doing anti-aliasing.
+  Skins that use 8bpp bitmaps can call this function with the maximum number
+  of colors used, and the maximum number of color combinations. The OSD will
+  then evenly split the available palette entries between the various colors
+  combinations, so that fonts can be "anti-aliased". By default a total of
+  10 colors and 10 combinations is assumed.
+- The pixel fonts have been completely removed from the VDR source.
+- VDR is now "UTF-8 aware". It handles strings according to the character
+  encoding used on the user's system. All internationalization strings and
+  incoming SI data are converted to the system encoding.
+- Plugins that handle strings need to be aware that on systems with UTF-8
+  encoding a "character symbol" may consist of more than a single byte in
+  memory. The functions and macros named Utf8...() can be used to handle
+  strings without needing to care about the underlying character encoding
+  (see tools.h for details).
+- Even though the weekdays of repeating timers are presented to the user as UTF-8
+  characters in the OSD, the timers.conf file and the SVDRP timer commands still
+  use single byte characters ("MTWTFSS") to make sure this information is handled
+  correctly between systems with different character encodings.
+- Added a missing i18n string for "CAM" in the Turkish OSD texts.
+- Improved editing strings that are too long to fit into the editable area.
+- Changes to the OSD settings in the "Setup/OSD" menu now immediately take effect
+  when the "Ok" key is pressed.
diff --git a/INSTALL b/INSTALL
index 7f50c44d5..26af9d907 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,25 +1,9 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 1.4
+Version 1.5
 -----------
 
-IMPORTANT NOTES:
-----------------
-
-Please make sure your environment is NOT set to use UTF-8 or
-any other multibyte character representation. Check the value of your
-$LANG or $LC_CTYPE environment variable, and if it contains something
-like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"
-or whatever single byte character mode you want. If you run VDR with
-UTF-8 enabled, it may crash in case it encounters EPG or channel data
-that contains non-7-bit ASCII characters. Another problem may occur if
-you have mounted your video partition with "iocharset=utf8". In that case
-recordings that contain umlauts or other non-seven-bit ASCII characters
-may be displayed wrong, or not at all. Please make sure you mount your
-video partition with "iocharset=iso8859-1" or whatever single byte character
-mode you want.
-
 Compiling and running the program:
 ----------------------------------
 
@@ -35,11 +19,18 @@ Refer to http://linuxtv.org for more information about the Linux-DVB driver.
 VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
 to work properly.
 
-You will also need to install the "libjpeg" and "libcap" libraries,
-as well as their "devel" packages to get the necessary header files
-for compiling VDR. If the "capability" module is not compiled into
-your kernel, you may need to do "modprobe capability" before running
-VDR.
+You will also need to install the following libraries, as well as their
+"devel" packages to get the necessary header files for compiling VDR:
+
+  freetype2
+  libcap
+  libjpeg
+
+If the "capability" module is not compiled into your kernel, you may
+need to do "modprobe capability" before running VDR.
+
+When running VDR, the Freetype fonts must be installed in the directory
+/usr/share/fonts/truetype.
 
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
diff --git a/MANUAL b/MANUAL
index 4f4db682f..e244e46f3 100644
--- a/MANUAL
+++ b/MANUAL
@@ -503,6 +503,23 @@ Version 1.4
                          current skin wants to, and 2 means always use the small
                          font.
 
+  Anti-alias = 1         Controls whether the OSD uses "anti-aliasing" to improve
+                         font rendering. To make this work, the OSD must support
+                         at least 256 colors, and the skin in use has to
+                         utilize these. If either of these conditions is not met,
+                         rendering will be done without anti-aliasing.
+
+  OSD font name = arialbd.ttf
+  Small font name = arial.ttf
+  Fixed font name = courbd.ttf
+                         The file names of the various fonts to use.
+
+  OSD font size = 22
+  Small font size = 18
+  Fixed font size = 20
+                         The sizes (in pixel) of the various fonts. Valid range is
+                         10...64.
+
   Channel info position = bottom
                          The position of the channel info window in the OSD
                          (either 'bottom' or 'top').
diff --git a/Makefile b/Makefile
index ea712d7e7..7f711db4f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.99 2007/03/11 10:22:18 kls Exp $
+# $Id: Makefile 1.100 2007/05/28 11:22:42 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -17,8 +17,8 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
-LIBS     = -ljpeg -lpthread -ldl -lcap
-INCLUDES =
+LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype
+INCLUDES = -I/usr/include/freetype2
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
@@ -39,34 +39,6 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
        skinclassic.o skins.o skinsttng.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
 
-FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
-OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
-SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1
-
-FIXFONT_ISO8859_2 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-2
-OSDFONT_ISO8859_2 = -adobe-helvetica-medium-r-normal--24-*-75-75-p-*-iso8859-2
-SMLFONT_ISO8859_2 = -adobe-helvetica-medium-r-normal--18-*-75-75-p-*-iso8859-2
-
-FIXFONT_ISO8859_5 = -rfx-courier-bold-r-normal--24-*-75-75-m-*-iso8859-5
-OSDFONT_ISO8859_5 = -rfx-helvetica-medium-r-normal--24-*-75-75-p-*-iso8859-5
-SMLFONT_ISO8859_5 = -rfx-helvetica-medium-r-normal--18-*-75-75-p-*-iso8859-5
-
-FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
-OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
-SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
-
-FIXFONT_ISO8859_9 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-9
-OSDFONT_ISO8859_9 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-9
-SMLFONT_ISO8859_9 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-9
-
-FIXFONT_ISO8859_13 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-13
-OSDFONT_ISO8859_13 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-13
-SMLFONT_ISO8859_13 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-13
-
-FIXFONT_ISO8859_15 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-15
-OSDFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-15
-SMLFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-15
-
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
 endif
@@ -98,15 +70,6 @@ DEFINES += -DVFAT
 endif
 
 all: vdr
-font: genfontfile\
-      fontfix-iso8859-1.c fontosd-iso8859-1.c fontsml-iso8859-1.c\
-      fontfix-iso8859-2.c fontosd-iso8859-2.c fontsml-iso8859-2.c\
-      fontfix-iso8859-5.c fontosd-iso8859-5.c fontsml-iso8859-5.c\
-      fontfix-iso8859-7.c fontosd-iso8859-7.c fontsml-iso8859-7.c\
-      fontfix-iso8859-9.c fontosd-iso8859-9.c fontsml-iso8859-9.c\
-      fontfix-iso8859-13.c fontosd-iso8859-13.c fontsml-iso8859-13.c\
-      fontfix-iso8859-15.c fontosd-iso8859-15.c fontsml-iso8859-15.c
-	@echo "font files created."
 
 # Implicit rules:
 
@@ -127,62 +90,6 @@ $(DEPFILE): Makefile
 vdr: $(OBJS) $(SILIB)
 	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
 
-# The font files:
-
-fontfix-iso8859-1.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_1" "$(FIXFONT_ISO8859_1)" > $@
-fontosd-iso8859-1.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@
-fontsml-iso8859-1.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@
-
-fontfix-iso8859-2.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_2" "$(FIXFONT_ISO8859_2)" > $@
-fontosd-iso8859-2.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_2" "$(OSDFONT_ISO8859_2)" > $@
-fontsml-iso8859-2.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_2" "$(SMLFONT_ISO8859_2)" > $@
-
-fontfix-iso8859-5.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_5" "$(FIXFONT_ISO8859_5)" > $@
-fontosd-iso8859-5.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_5" "$(OSDFONT_ISO8859_5)" > $@
-fontsml-iso8859-5.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_5" "$(SMLFONT_ISO8859_5)" > $@
-
-fontfix-iso8859-7.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_7" "$(FIXFONT_ISO8859_7)" > $@
-fontosd-iso8859-7.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_7" "$(OSDFONT_ISO8859_7)" > $@
-fontsml-iso8859-7.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
-
-fontfix-iso8859-9.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_9" "$(FIXFONT_ISO8859_9)" > $@
-fontosd-iso8859-9.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_9" "$(OSDFONT_ISO8859_9)" > $@
-fontsml-iso8859-9.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_9" "$(SMLFONT_ISO8859_9)" > $@
-
-fontfix-iso8859-13.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_13" "$(FIXFONT_ISO8859_13)" > $@
-fontosd-iso8859-13.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_13" "$(OSDFONT_ISO8859_13)" > $@
-fontsml-iso8859-13.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_13" "$(SMLFONT_ISO8859_13)" > $@
-
-fontfix-iso8859-15.c:
-	./genfontfile "cFont::tPixelData FontFix_iso8859_15" "$(FIXFONT_ISO8859_15)" > $@
-fontosd-iso8859-15.c:
-	./genfontfile "cFont::tPixelData FontOsd_iso8859_15" "$(OSDFONT_ISO8859_15)" > $@
-fontsml-iso8859-15.c:
-	./genfontfile "cFont::tPixelData FontSml_iso8859_15" "$(SMLFONT_ISO8859_15)" > $@
-
-# The font file generator:
-
-genfontfile: genfontfile.c
-	$(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
-
 # The libsi library:
 
 $(SILIB):
@@ -261,10 +168,8 @@ srcdoc:
 
 clean:
 	$(MAKE) -C $(LSIDIR) clean
-	-rm -f $(OBJS) $(DEPFILE) vdr genfontfile genfontfile.o core* *~
+	-rm -f $(OBJS) $(DEPFILE) vdr core* *~
 	-rm -rf include
 	-rm -rf srcdoc
-fontclean:
-	-rm -f fontfix*.c fontosd*.c fontsml*.c
-CLEAN: clean fontclean
+CLEAN: clean
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 640345380..dc725a510 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.5.1</b></center>
+<center><b>Version 1.5.3</b></center>
 <p>
 <center>
 Copyright &copy; 2006 Klaus Schmidinger<br>
@@ -14,12 +14,15 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.0 are marked like this.
 <!--X1.5.0--></td></tr></table>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.1 are marked like this.
 <!--X1.5.1--></td></tr></table>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.3 are marked like this.
+<!--X1.5.3--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -58,7 +61,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Housekeeping">Housekeeping</a>
 <li><a href="#Main thread hook">Main thread hook</a>
 <li><a href="#Activity">Activity</a>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <li><a href="#Wakeup">Wakeup</a>
 <!--X1.5.1--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
@@ -82,7 +85,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Conditional Access">Conditional Access</a>
 <!--X1.5.0--></td></tr></table>
 </ul>
@@ -681,7 +684,7 @@ <h1>Table Of Contents</h1>
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
 
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <a name="Wakeup"><hr><h2>Wakeup</h2>
 
 <center><i><b>Wake me up before you go-go</b></i></center><p>
@@ -970,6 +973,19 @@ <h1>Table Of Contents</h1>
 Texts are first searched for in the <i>Phrases</i> registered for this plugin (if any)
 and then in the global VDR texts. So a plugin can make use of texts defined by the
 core VDR code.
+<p>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+The system VDR is running on may use a character encoding where a single character
+(or <i>symbol</i>) consists of more than one byte (UTF-8, as opposed to, for instance,
+ISO8859-1, where every character is represented by a single byte in memory).
+In order to make sure a plugin works regardless of the character encoding the current
+system uses, the VDR core code provides several functions and macros that allow accessing
+text strings transparently without knowing whether this is a single or multi byte
+character set. The names of these functions and macros are all of the form <tt>Utf8...()</tt>,
+and are defined in <tt>VDR/tools.h</tt>.
+Most of the time a plugin doesn't need to care about this, but when it comes to
+handling individual characters these functions may come in handy.
+<!--X1.5.3--></td></tr></table>
 
 <a name="Custom services"><hr><h2>Custom services</h2>
 
@@ -1618,7 +1634,22 @@ <h1>Table Of Contents</h1>
 with the full required resolution. Only if this fails shall it use alternate
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
+<p>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Special consideration may have to be given to color usage if the OSD provides
+8bpp (256 colors). In that case, fonts may be drawn using <i>anti-aliasing</i>,
+which requires several blended color values between the foreground and background
+color. In order to not use up the whole color palette for a single color
+combination (and thus be unable to draw any other colors at all), it may be
+useful to call
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+osd-&gt;SetAntiAliasGranularity();
+</pre></td></tr></table><p>
 
+which allows the system to evenly distribute the palette entries to the various
+color combinations (see <tt>VDR/osd.h</tt> for details).
+<!--X1.5.3--></td></tr></table>
 <p>
 Directly accessing the OSD is only allowed from the foreground thread, which
 restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
@@ -2087,7 +2118,7 @@ <h1>Table Of Contents</h1>
 
 The other parameters have the same meaning as in the first version of this function.
 
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Conditional Access"><hr><h2>Conditional Access</h2>
 
 <center><i><b>Members only!</b></i></center><p>
diff --git a/channels.conf b/channels.conf
index b6ffe4ff8..e47dd09bd 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,13 +1,13 @@
 RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu;106=deu:105:0:12003:1:1089:0
-SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0
-ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0
+SAT.1;ProSiebenSat.1:12544:hC56:S19.2E:22000:255:256=deu;259=deu:32:0:17500:1:1107:0
+ProSieben;ProSiebenSat.1:12544:hC56:S19.2E:22000:511:512=deu;515=deu:33:0:17501:1:1107:0
 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
-Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu;106=deu:104:0:28106:1:1101:0
-Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu:204:0:28107:1:1101:0
+Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu,103=2ch;106=dd:104:0:28106:1:1101:0
+Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu,203=2ch:204:0:28107:1:1101:0
 hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
 NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
 SR Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
-WDR K�ln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
+WDR Köln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
 BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
 SWR Fernsehen BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
 Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
@@ -15,23 +15,26 @@ ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1
 3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
 KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
 arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
+ORF1;ORF:562:C34D34M16B8T8G4Y0:T:27500:3210:3211=deu;3213=deu:3215:0:10101:13130:320:0
+ORF2S;ORF:562:C34D34M16B8T8G4Y0:T:27500:3220:3221=deu;3223=deu:3225:0:10107:13130:320:0
+ATV;ORF:562:C34D34M16B8T8G4Y0:T:27500:3240:3241=deu:3245:0:10120:13130:320:0
 ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
 ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:630:0:28011:1:1079:0
 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
 Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
-KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0
+kabel eins;ProSiebenSat.1:12544:hC56:S19.2E:22000:767:768=deu:34:0:17502:1:1107:0
 DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:133:5:0
-9Live;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0
+9Live;ProSiebenSat.1:12544:hC56:S19.2E:22000:1279:1280=deu:36:0:17504:1:1107:0
 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
 HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
 EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
 rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
 Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:579:0:28707:1:1026:0
-Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
-BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
+Veronica/JETIX;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
+BVN;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
 n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
 Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
 TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
@@ -44,27 +47,27 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:630:0:28014:1:1079:0
 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
 :Premiere World
-PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1702,1722,1801:8:133:1:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1722,1702,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1801,1722,1702:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1702,1722,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1801,1722,1702:9:133:2:0
-PREMIERE SERIE,SERIE;PREMIERE:11797:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1801,1702,1722:16:133:2:0
-PREMIERE KRIMI,KRIMI;PREMIERE:11797:hC34:S19.2E:27500:2815:2816=deu:32:1702,1801,1722:23:133:2:0
-PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11719:hC34:S19.2E:27500:1535:1536=deu:32:1702,1801,1722:516:133:3:0
-PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:41:133:3:0
-PREMIERE FILMFEST,FILMFEST;PREMIERE:11719:hC34:S19.2E:27500:1279:1280=deu:32:1801,1702,1722:20:133:3:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1801,1702,1722:34:133:17:0
+PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1722,1702,1801:8:133:1:0
+PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1722,1831,1801:10:133:2:0
+PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1831,1722,1801:11:133:2:0
+PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1722,1831,1702,1801:43:133:2:0
+PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1831,1722,1702,1801:9:133:2:0
+PREMIERE SERIE,SERIE;PREMIERE:11797:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1831,1801,1722,1702:16:133:2:0
+PREMIERE KRIMI,KRIMI;PREMIERE:11797:hC34:S19.2E:27500:2815:2816=deu:32:1831,1702,1722,1801:23:133:2:0
+PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11719:hC34:S19.2E:27500:1535:1536=deu:32:1722,1831,1702,1801:516:133:3:0
+PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu,1025=deu:32:1831,1801,1722,1702:41:133:3:0
+PREMIERE FILMFEST,FILMFEST;PREMIERE:11719:hC34:S19.2E:27500:1279:1280=deu:32:1831,1801,1702,1722:20:133:3:0
+DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1831,1702,1722,1801:34:133:17:0
 :Premiere Direkt
 PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
 :PW Erotic
 BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1702,1722,1801:21:133:17:0
 EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
 :Sportsworld
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1722,1801,1702:17:133:3:0
-PREMIERE WIN,WIN;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:33:0:27:133:4:0
+PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1831,1722,1801,1702:17:133:3:0
+BIG BROTHER,BROTHER;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:0:1831,1702,1722,1801:27:133:4:0
 :Beta Digital
-N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0
+N24;ProSiebenSat.1:12544:hC56:S19.2E:22000:1023:1024=deu:35:0:17503:1:1107:0
 LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
 :-
 APS.TV3;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
@@ -75,19 +78,19 @@ ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:
 FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
 LCP;ABSAT:12285:vC34:S19.2E:27500:167:108:0:0:17027:1:1094:0
 ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
-BEST OF SHOPPING;CSAT:12324:vC34:S19.2E:27500:160:80=fra:0:0:8612:1:1096:0
+BEST OF SHOPPING;CSAT:12324:vC34:S19.2E:27500:2047+160:0:0:0:8612:1:1096:0
 ASTRA-Mosaic;SES ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
 ASTRA-Mosaic 2;SES ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
 ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
 ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
 ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
-Chamber TV;Chambre des D�put�es:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
+Chamber TV;Chambre des DØputØes:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
 RTL Tele Letzebuerg:12551:vC56:S19.2E:22000:168:144=ltz,146=fra:301:0:3994:1:1108:0
-tien;CANALDIGITAAL:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
+tien;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
 NICK AUSTRIA;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
 Service 3;MTV Networks Europe:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
 VIVA;MTV Networks Europe:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
-VIVA PLUS;MTV Networks Europe:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
+COMEDY CENTRAL;MTV Networks Europe:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
 QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
 TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
 :NTSC
@@ -103,30 +106,30 @@ SMD HD:12699:vC56:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0
 Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
 TV HD;CSAT:12581:vC56:S19.2E:22000:165:100=fra;101=fra:0:0:9306:1:1110:0
 C M HD;Telenor:11261:hC78:S1.0W:24500:517:660=eng;661=eng:0:B00:3306:70:33:0
-CANAL+ HD;Telenor:11389:hC78:S1.0W:24500:512:640;641=eng:580:0:3306:70:34:0
-HELLAS-HDTV;Scopus Network Technologies:11645:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
+CANAL+ HD;Telenor:11389:hC78:S1.0W:24500:512:640=eng;641=eng:580:0:3306:70:34:0
+Era 2;Service Provider:11645:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
 TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:0
 :@201 Sky
 Sky One;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4703:2:2030:0
 Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2349=eng,2352=NAR:2354:0:10070:2:2044:0
+ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2349=eng,2351=NAR:2353:0:10070:2:2044:0
 SCI FI;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
 ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
 ParaComedy 1;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
 ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
 Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0
-Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,653=NAR;666=eng:582:960,961:4303:2:2007:0
-Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,655=NAR;667=eng:583:960,961:4302:2:2007:0
-Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,654=NAR;668=eng:584:960,961:4403:2:2007:0
-Sky Movies 4;BSkyB:11836:hC23:S28.2E:27500:512+8190:640=eng,657=NAR;660=eng:576:960,961:4304:2:2007:0
-Sky Movies 5;BSkyB:11836:hC23:S28.2E:27500:513+8190:641=eng,658=NAR;661=eng:577:960,961:4305:2:2007:0
-Sky Movies 6;BSkyB:11836:hC23:S28.2E:27500:514+8190:642=eng,659=NAR;662=eng:578:960,961:4306:2:2007:0
+Sky Comedy;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,686=NAR;666=eng:582:960,961:4303:2:2007:0
+Sky Action;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,687=NAR;667=eng:583:960,961:4302:2:2007:0
+Sky Family;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,688=NAR;668=eng:584:960,961:4403:2:2007:0
+Sky ScFi/Horror;BSkyB:11836:hC23:S28.2E:27500:512+8190:640=eng,680=NAR;660=eng:576:960,961:4304:2:2007:0
+Sky Classics;BSkyB:11836:hC23:S28.2E:27500:513+8190:641=eng,681=NAR;661=eng:577:960,961:4305:2:2007:0
+Sky Indie;BSkyB:11836:hC23:S28.2E:27500:514+8190:642=eng,682=NAR;662=eng:578:960,961:4306:2:2007:0
 Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,653=NAR;663=eng:579:960,961:4603:2:2030:0
-Sky Movies 8;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,656=NAR;663=eng:579:960,961:5502:2:2007:0
-Sky Movies 9;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,654=NAR;666=eng:2440:960,961:4602:2:2030:0
-Sky Movies 10;BSkyB:12285:vC23:S28.2E:27500:514+8190:642=eng,655=NAR;662=eng:2441:960,961:4604:2:2030:0
-Sky Cinema 1;BSkyB:11603:vC23:S28.2E:27500:513+129:641=eng,661=NAR:577:960,961:4651:2:2408:0
-Sky Cinema 2;BSkyB:11603:vC23:S28.2E:27500:514+130:642=eng,662=NAR:578:960,961:4652:2:2408:0
+Sky Drama;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,683=NAR;663=eng:579:960,961:5502:2:2007:0
+SkyMovies SD1;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,686=NAR;666=eng:2328:960,961:4602:2:2030:0
+SkyMovies SD2;BSkyB:12285:vC23:S28.2E:27500:514+8190:642=eng,682=NAR;662=eng:2331:960,961:4604:2:2030:0
+Sky Premiere;BSkyB:11603:vC23:S28.2E:27500:513+129:641=eng,661=NAR;681=eng:577:960,961:4651:2:2408:0
+Sky Prem+1;BSkyB:11603:vC23:S28.2E:27500:514+130:642=eng,662=NAR;682=eng:578:960,961:4652:2:2408:0
 :@900 Some 'seed' channels
 Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
 WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
@@ -135,8 +138,8 @@ S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:20
 CNN;BSkyB:12051:vC23:S28.2E:27500:2317:2319=eng:2318:0:7140:2:2018:0
 BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
 MTI;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
-WRN Eng AAP;WRN:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
-Dr Dish TV;Overon:12359:hC34:S13.0E:27500:4231:4232:0:0:14023:318:8300:0
+WRN Eng AAP;Globecast:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
+DrDish Television;BetaDigital:12246:vC34:S19.2E:27500:2047:2048=deu:0:0:10107:1:1092:0
 ! LifeStyle-TV !;T-Systems:12633:hC56:S19.2E:22000:204:304=deu:0:0:12603:1:1113:0
 Challenger Tv;Telespazio:11295:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
 NDS Enc 3;NDS:11535:vC34:S1.0W:5632:308+8190:256=eng,257=fra:273:0:1:65535:1:0
diff --git a/ci.c b/ci.c
index 26447cbac..05a1bd4e9 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.47 2007/01/05 10:38:03 kls Exp $
+ * $Id: ci.c 1.48 2007/04/30 13:02:49 kls Exp $
  */
 
 #include "ci.h"
@@ -643,7 +643,7 @@ void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 
 // --- cCiConditionalAccessSupport -------------------------------------------
 
-#define MAXCASYSTEMIDS 16
+#define MAXCASYSTEMIDS 64
 
 // CA Enable Ids:
 
diff --git a/config.c b/config.c
index 801fa06a1..1c8ad1f10 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.150 2007/02/25 13:58:45 kls Exp $
+ * $Id: config.c 1.151 2007/06/02 11:21:40 kls Exp $
  */
 
 #include "config.h"
@@ -264,6 +264,13 @@ cSetup::cSetup(void)
   OSDHeight = 486;
   OSDMessageTime = 1;
   UseSmallFont = 1;
+  AntiAlias = 1;
+  strcpy(FontOsd, "arialbd.ttf");
+  strcpy(FontSml, "arial.ttf");
+  strcpy(FontFix, "courbd.ttf");
+  FontOsdSize = 22;
+  FontSmlSize = 18;
+  FontFixSize = 20;
   MaxVideoFileSize = MAXVIDEOFILESIZE;
   SplitEditedFiles = 0;
   MinEventTimeout = 30;
@@ -427,6 +434,13 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "OSDHeight"))         { OSDHeight          = atoi(Value); if (OSDHeight < 100) OSDHeight *= 27; }
   else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
   else if (!strcasecmp(Name, "UseSmallFont"))        UseSmallFont       = atoi(Value);
+  else if (!strcasecmp(Name, "AntiAlias"))           AntiAlias          = atoi(Value);
+  else if (!strcasecmp(Name, "FontOsd"))             strn0cpy(FontOsd, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontSml"))             strn0cpy(FontSml, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontFix"))             strn0cpy(FontFix, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontOsdSize"))         FontOsdSize        = atoi(Value);
+  else if (!strcasecmp(Name, "FontSmlSize"))         FontSmlSize        = atoi(Value);
+  else if (!strcasecmp(Name, "FontFixSize"))         FontFixSize        = atoi(Value);
   else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
   else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
   else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
@@ -497,6 +511,13 @@ bool cSetup::Save(void)
   Store("OSDHeight",          OSDHeight);
   Store("OSDMessageTime",     OSDMessageTime);
   Store("UseSmallFont",       UseSmallFont);
+  Store("AntiAlias",          AntiAlias);
+  Store("FontOsd",            FontOsd);
+  Store("FontSml",            FontSml);
+  Store("FontFix",            FontFix);
+  Store("FontOsdSize",        FontOsdSize);
+  Store("FontSmlSize",        FontSmlSize);
+  Store("FontFixSize",        FontFixSize);
   Store("MaxVideoFileSize",   MaxVideoFileSize);
   Store("SplitEditedFiles",   SplitEditedFiles);
   Store("MinEventTimeout",    MinEventTimeout);
diff --git a/config.h b/config.h
index eddb4e505..2c1d992c6 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.288 2007/03/03 15:39:05 kls Exp $
+ * $Id: config.h 1.290 2007/06/02 11:22:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,12 +17,13 @@
 #include <time.h>
 #include <unistd.h>
 #include "i18n.h"
+#include "font.h"
 #include "tools.h"
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.2"
-#define VDRVERSNUM   10502  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.3"
+#define VDRVERSNUM   10503  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
@@ -242,6 +243,13 @@ class cSetup : public cConfig<cSetupLine> {
   int OSDLeft, OSDTop, OSDWidth, OSDHeight;
   int OSDMessageTime;
   int UseSmallFont;
+  int AntiAlias;
+  char FontOsd[MAXFONTNAME];
+  char FontSml[MAXFONTNAME];
+  char FontFix[MAXFONTNAME];
+  int FontOsdSize;
+  int FontSmlSize;
+  int FontFixSize;
   int MaxVideoFileSize;
   int SplitEditedFiles;
   int MinEventTimeout, MinUserInactivity;
diff --git a/device.c b/device.c
index dc9af5938..b859124e3 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.139 2007/01/13 12:05:00 kls Exp $
+ * $Id: device.c 1.140 2007/04/30 09:34:00 kls Exp $
  */
 
 #include "device.h"
@@ -327,7 +327,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              // difference, because it results in the most significant bit of the result.
              uint32_t imp = 0;
              imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
-             imp <<= 1; imp |= !device[i]->Receiving() || ndr;                                                       // use receiving devices if we don't need to detach existing receivers
+             imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
              imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
diff --git a/dvbplayer.c b/dvbplayer.c
index 7d50663de..99b3f5cef 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.45 2006/04/17 12:45:48 kls Exp $
+ * $Id: dvbplayer.c 1.46 2007/04/28 14:55:22 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -402,8 +402,10 @@ void cDvbPlayer::Action(void)
                        bool TimeShiftMode = index->IsStillRecording();
                        int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
                        if (Index >= 0) {
-                          if (!NextFile(FileNumber, FileOffset))
+                          if (!NextFile(FileNumber, FileOffset)) {
+                             readIndex = Index;
                              continue;
+                             }
                           }
                        else {
                           if (!TimeShiftMode && playDir == pdForward) {
diff --git a/eit.c b/eit.c
index 2b07b87c7..e1e47f48f 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.122 2006/10/09 16:14:36 kls Exp $
+ * $Id: eit.c 1.123 2007/06/10 12:51:05 kls Exp $
  */
 
 #include "eit.h"
@@ -188,6 +188,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                     if (hit) {
                        char linkName[ld->privateData.getLength() + 1];
                        strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
+                       // TODO is there a standard way to determine the character set of this string?
                        cChannel *link = Channels.GetByChannelID(linkID);
                        if (link != channel) { // only link to other channels, not the same one
                           //fprintf(stderr, "Linkage %s %4d %4d %5d %5d %5d %5d  %02X  '%s'\n", hit ? "*" : "", channel->Number(), link ? link->Number() : -1, SiEitEvent.getEventId(), ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId(), ld->getLinkageType(), linkName);//XXX
@@ -218,7 +219,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  if (1 <= Stream && Stream <= 2 && Type != 0) {
                     if (!Components)
                        Components = new cComponents;
-                    char buffer[256];
+                    char buffer[Utf8BufSize(256)];
                     Components->SetComponent(Components->NumComponents(), cd->getStreamContent(), cd->getComponentType(), I18nNormalizeLanguageCode(cd->languageCode), cd->description.getText(buffer, sizeof(buffer)));
                     }
                  }
@@ -230,7 +231,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
 
       if (!rEvent) {
          if (ShortEventDescriptor) {
-            char buffer[256];
+            char buffer[Utf8BufSize(256)];
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
@@ -239,7 +240,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
             pEvent->SetShortText(NULL);
             }
          if (ExtendedEventDescriptors) {
-            char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
+            char buffer[Utf8BufSize(ExtendedEventDescriptors->getMaximumTextLength(": ")) + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
          else if (!HasExternalData)
diff --git a/epg.c b/epg.c
index 695ca9939..37a0553c7 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.81 2006/10/28 09:12:42 kls Exp $
+ * $Id: epg.c 1.82 2007/06/10 12:52:19 kls Exp $
  */
 
 #include "epg.h"
@@ -634,6 +634,7 @@ void cEvent::FixEpgBugs(void)
   // data, so let's always convert them to blanks (independent of the setting of EPGBugfixLevel):
   strreplace(title, '\n', ' ');
   strreplace(shortText, '\n', ' ');
+  /* TODO adapt to UTF-8
   // Same for control characters:
   strreplace(title, '\x86', ' ');
   strreplace(title, '\x87', ' ');
@@ -641,6 +642,7 @@ void cEvent::FixEpgBugs(void)
   strreplace(shortText, '\x87', ' ');
   strreplace(description, '\x86', ' ');
   strreplace(description, '\x87', ' ');
+  XXX*/
 }
 
 // --- cSchedule -------------------------------------------------------------
diff --git a/font.c b/font.c
index 5e22fcd2f..af8b7cbfb 100644
--- a/font.c
+++ b/font.c
@@ -4,125 +4,296 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.14 2007/03/11 09:51:44 kls Exp $
+ * $Id: font.c 1.15 2007/06/09 14:41:27 kls Exp $
  */
 
-#include "config.h"
-#include <ctype.h>
 #include "font.h"
+#include <ctype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include "config.h"
+#include "osd.h"
 #include "tools.h"
 
-#include "fontfix-iso8859-1.c"
-#include "fontosd-iso8859-1.c"
-#include "fontsml-iso8859-1.c"
-
-#include "fontfix-iso8859-2.c"
-#include "fontosd-iso8859-2.c"
-#include "fontsml-iso8859-2.c"
+// --- cFreetypeFont ---------------------------------------------------------
 
-#include "fontfix-iso8859-5.c"
-#include "fontosd-iso8859-5.c"
-#include "fontsml-iso8859-5.c"
+#define KERNING_UNKNOWN  (-10000)
 
-#include "fontfix-iso8859-7.c"
-#include "fontosd-iso8859-7.c"
-#include "fontsml-iso8859-7.c"
+struct tKerning {
+  uint prevSym;
+  int kerning;
+  tKerning(uint PrevSym, int Kerning) { prevSym = PrevSym; kerning = Kerning; }
+  };
 
-#include "fontfix-iso8859-9.c"
-#include "fontosd-iso8859-9.c"
-#include "fontsml-iso8859-9.c"
+class cGlyph : public cListObject {
+private:
+  uint charCode;
+  uchar *bitmap;
+  int advanceX;
+  int advanceY;
+  int left;  ///< The bitmap's left bearing expressed in integer pixels.
+  int top;   ///< The bitmap's top bearing expressed in integer pixels.
+  int width; ///< The number of pixels per bitmap row.
+  int rows;  ///< The number of bitmap rows.
+  int pitch; ///< The pitch's absolute value is the number of bytes taken by one bitmap row, including padding.
+  cVector<tKerning> kerningCache;
+public:
+  cGlyph(uint CharCode, FT_GlyphSlotRec_ *GlyphData);
+  virtual ~cGlyph();
+  uint CharCode(void) const { return charCode; }
+  uchar *Bitmap(void) const { return bitmap; }
+  int AdvanceX(void) const { return advanceX; }
+  int AdvanceY(void) const { return advanceY; }
+  int Left(void) const { return left; }
+  int Top(void) const { return top; }
+  int Width(void) const { return width; }
+  int Rows(void) const { return rows; }
+  int Pitch(void) const { return pitch; }
+  int GetKerningCache(uint PrevSym) const;
+  void SetKerningCache(uint PrevSym, int Kerning);
+  };
 
-#include "fontfix-iso8859-13.c"
-#include "fontosd-iso8859-13.c"
-#include "fontsml-iso8859-13.c"
+cGlyph::cGlyph(uint CharCode, FT_GlyphSlotRec_ *GlyphData)
+{
+  charCode = CharCode;
+  advanceX = GlyphData->advance.x >> 6;
+  advanceY = GlyphData->advance.y >> 6;
+  left = GlyphData->bitmap_left;
+  top = GlyphData->bitmap_top;
+  width = GlyphData->bitmap.width;
+  rows = GlyphData->bitmap.rows;
+  pitch = GlyphData->bitmap.pitch;
+  bitmap = MALLOC(uchar, rows * pitch);
+  memcpy(bitmap, GlyphData->bitmap.buffer, rows * pitch);
+}
 
-#include "fontfix-iso8859-15.c"
-#include "fontosd-iso8859-15.c"
-#include "fontsml-iso8859-15.c"
+cGlyph::~cGlyph()
+{
+  free(bitmap);
+}
 
-// --- cFont -----------------------------------------------------------------
+int cGlyph::GetKerningCache(uint PrevSym) const
+{
+  for (int i = kerningCache.Size(); --i > 0; ) {
+      if (kerningCache[i].prevSym == PrevSym)
+         return kerningCache[i].kerning;
+      }
+  return KERNING_UNKNOWN;
+}
 
-static const void *const FontData[eDvbCodeSize][eDvbFontSize] = {
-  { FontOsd_iso8859_1,  FontFix_iso8859_1,  FontSml_iso8859_1 },
-  { FontOsd_iso8859_2,  FontFix_iso8859_2,  FontSml_iso8859_2 },
-  { FontOsd_iso8859_5,  FontFix_iso8859_5,  FontSml_iso8859_5 },
-  { FontOsd_iso8859_7,  FontFix_iso8859_7,  FontSml_iso8859_7 },
-  { FontOsd_iso8859_9,  FontFix_iso8859_9,  FontSml_iso8859_9 },
-  { FontOsd_iso8859_13, FontFix_iso8859_13, FontSml_iso8859_13 },
-  { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15 },
-  };
+void cGlyph::SetKerningCache(uint PrevSym, int Kerning)
+{
+  kerningCache.Append(tKerning(PrevSym, Kerning));
+}
 
-static const char *FontCode[eDvbCodeSize] = {
-  "iso8859-1",
-  "iso8859-2",
-  "iso8859-5",
-  "iso8859-7",
-  "iso8859-9",
-  "iso8859-13",
-  "iso8859-15",
+class cFreetypeFont : public cFont {
+private:
+  int height;
+  int bottom;
+  FT_Library library; ///< Handle to library
+  FT_Face face; ///< Handle to face object
+  mutable cList<cGlyph> glyphCacheMonochrome;
+  mutable cList<cGlyph> glyphCacheAntiAliased;
+  int Bottom(void) const { return bottom; }
+  int Kerning(cGlyph *Glyph, uint PrevSym) const;
+  cGlyph* Glyph(uint CharCode, bool AntiAliased = false) const;
+public:
+  cFreetypeFont(const char *Name, int CharHeight);
+  virtual ~cFreetypeFont();
+  virtual int Width(uint c) const;
+  virtual int Width(const char *s) const;
+  virtual int Height(void) const { return height; }
+  virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const;
   };
 
-eDvbCode cFont::code = code_iso8859_1;
-cFont *cFont::fonts[eDvbFontSize] = { NULL };
+cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight)
+{
+  height = 0;
+  bottom = 0;
+  int error = FT_Init_FreeType(&library);
+  if (!error) {
+     error = FT_New_Face(library, Name, 0, &face);
+     if (!error) {
+        if (face->num_fixed_sizes && face->available_sizes) { // fixed font
+           // TODO what exactly does all this mean?
+           height = face->available_sizes->height;
+           for (uint sym ='A'; sym < 'z'; sym++) { // search for descender for fixed font FIXME
+               FT_UInt glyph_index = FT_Get_Char_Index(face, sym);
+               error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+               if (!error) {
+                  error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
+                  if (!error) {
+                     if (face->glyph->bitmap.rows-face->glyph->bitmap_top > bottom)
+                        bottom = face->glyph->bitmap.rows-face->glyph->bitmap_top;
+                     }
+                  else
+                     esyslog("ERROR: FreeType: error %d in FT_Render_Glyph", error);
+                  }
+               else
+                  esyslog("ERROR: FreeType: error %d in FT_Load_Glyph", error);
+               }
+           }
+        else {
+           error = FT_Set_Char_Size(face, // handle to face object
+                                    0,    // char_width in 1/64th of points
+                                    CharHeight * 64, // CharHeight in 1/64th of points
+                                    0,    // horizontal device resolution
+                                    0);   // vertical device resolution
+           if (!error) {
+              height = ((face->size->metrics.ascender-face->size->metrics.descender) + 63) / 64;
+              bottom = abs((face->size->metrics.descender - 63) / 64);
+              }
+           else
+              esyslog("ERROR: FreeType: error %d during FT_Set_Char_Size (font = %s)\n", error, Name);
+           }
+        }
+     else
+        esyslog("ERROR: FreeType: load error %d (font = %s)", error, Name);
+     }
+  else
+     esyslog("ERROR: FreeType: initialization error %d (font = %s)", error, Name);
+}
 
-cFont::cFont(const void *Data)
+cFreetypeFont::~cFreetypeFont()
 {
-  SetData(Data);
+  FT_Done_Face(face);
+  FT_Done_FreeType(library);
 }
 
-void cFont::SetData(const void *Data)
+int cFreetypeFont::Kerning(cGlyph *Glyph, uint PrevSym) const
 {
-  if (Data) {
-     height = ((tCharData *)Data)->height;
-     for (int i = 0; i < NUMCHARS; i++)
-         data[i] = (tCharData *)&((tPixelData *)Data)[(i < 32 ? 0 : i - 32) * (height + 2)];
+  int kerning = 0;
+  if (Glyph && PrevSym) {
+     kerning = Glyph->GetKerningCache(PrevSym);
+     if (kerning == KERNING_UNKNOWN) {
+        FT_Vector delta;
+        FT_UInt glyph_index = FT_Get_Char_Index(face, Glyph->CharCode());
+        FT_UInt glyph_index_prev = FT_Get_Char_Index(face, PrevSym);
+        FT_Get_Kerning(face, glyph_index_prev, glyph_index, FT_KERNING_DEFAULT, &delta);
+        kerning = delta.x / 64;
+        Glyph->SetKerningCache(PrevSym, kerning);
+        }
      }
-  else
-     height = 0;
+  return kerning;
 }
 
-int cFont::Width(const char *s) const
+cGlyph* cFreetypeFont::Glyph(uint CharCode, bool AntiAliased) const
 {
-  int w = 0;
-  while (s && *s)
-        w += Width(*s++);
-  return w;
+  // Lookup in cache:
+  cList<cGlyph> *glyphCache = AntiAliased ? &glyphCacheAntiAliased : &glyphCacheMonochrome;
+  for (cGlyph *g = glyphCache->First(); g; g = glyphCache->Next(g)) {
+      if (g->CharCode() == CharCode)
+         return g;
+      }
+
+  FT_UInt glyph_index = FT_Get_Char_Index(face, CharCode);
+
+  // Load glyph image into the slot (erase previous one):
+  int error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+  if (error)
+     esyslog("ERROR: FreeType: error during FT_Load_Glyph");
+  else {
+#if ((FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 7) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 2 && FREETYPE_PATCH <= 1))// TODO workaround for bug? which one?
+     if (AntiAliased || CharCode == 32)
+#else
+     if (AntiAliased)
+#endif
+        error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
+     else
+        error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_MONO);
+     if (error)
+        esyslog("ERROR: FreeType: error during FT_Render_Glyph %d, %d\n", CharCode, glyph_index);
+     else { //new bitmap
+        cGlyph *Glyph = new cGlyph(CharCode, face->glyph);
+        glyphCache->Add(Glyph);
+        return Glyph;
+        }
+     }
+  return NULL;
 }
 
-int cFont::Height(const char *s) const
+int cFreetypeFont::Width(uint c) const
 {
-  int h = 0;
-  if (s && *s)
-     h = height; // all characters have the same height!
-  return h;
+  cGlyph *g = Glyph(c, Setup.AntiAlias);
+  return g ? g->AdvanceX() : 0;
 }
 
-bool cFont::SetCode(const char *Code)
+int cFreetypeFont::Width(const char *s) const
 {
-  for (int i = 0; i < eDvbCodeSize; i++) {
-      if (strcmp(Code, FontCode[i]) == 0) {
-         SetCode(eDvbCode(i));
-         return true;
-         }
-      }
-  return false;
+  int w = 0;
+  if (s) {
+     uint prevSym = 0;
+     while (*s) {
+           int sl = Utf8CharLen(s);
+           uint sym = Utf8CharGet(s, sl);
+           s += sl;
+           cGlyph *g = Glyph(sym, Setup.AntiAlias);
+           if (g)
+              w += g->AdvanceX() + Kerning(g, prevSym);
+           prevSym = sym;
+           }
+     }
+  return w;
 }
 
-void cFont::SetCode(eDvbCode Code)
+void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const
 {
-  if (code != Code) {
-     code = Code;
-     for (int i = 0; i < eDvbFontSize; i++) {
-         if (fonts[i])
-            fonts[i]->SetData(FontData[code][i]);
-         }
+  if (s && height) { // checking height to make sure we actually have a valid font
+     bool AntiAliased = Setup.AntiAlias && Bitmap->Bpp() >= 8;
+     tIndex fg = Bitmap->Index(ColorFg);
+     uint prevSym = 0;
+     while (*s) {
+           int sl = Utf8CharLen(s);
+           uint sym = Utf8CharGet(s, sl);
+           s += sl;
+           cGlyph *g = Glyph(sym, AntiAliased);
+           int kerning = Kerning(g, prevSym);
+           prevSym = sym;
+           uchar *buffer = g->Bitmap();
+           int symWidth = g->Width();
+           if (Width && x + symWidth + g->Left() + kerning - 1 > Width)
+              break; // we don't draw partial characters
+           if (x + symWidth + g->Left() + kerning > 0) {
+              for (int row = 0; row < g->Rows(); row++) {
+                  for (int pitch = 0; pitch < g->Pitch(); pitch++) {
+                      uchar bt = *(buffer + (row * g->Pitch() + pitch));
+                      if (AntiAliased) {
+                         if (bt > 0x00) {
+                            int px = x + pitch + g->Left() + kerning;
+                            int py = y + row + (height - Bottom() - g->Top());
+                            if (bt == 0xFF)
+                               Bitmap->SetIndex(px, py, fg);
+                            else {
+                               tColor bg = (ColorBg != clrTransparent) ? ColorBg : Bitmap->GetColor(px, py);
+                               Bitmap->SetIndex(px, py, Bitmap->Index(Bitmap->Blend(ColorFg, bg, bt)));
+                               }
+                            }
+                         }
+                      else { //monochrome rendering
+                         for (int col = 0; col < 8 && col + pitch * 8 <= symWidth; col++) {
+                             if (bt & 0x80)
+                                Bitmap->SetIndex(x + col + pitch * 8 + g->Left() + kerning, y + row + (height - Bottom() - g->Top()), fg);
+                             bt <<= 1;
+                             }
+                         }
+                      }
+                  }
+              }
+           x += g->AdvanceX() + kerning;
+           if (x > Bitmap->Width() - 1)
+              break;
+           }
      }
 }
 
-void cFont::SetFont(eDvbFont Font, const void *Data)
+// --- cFont -----------------------------------------------------------------
+
+cFont *cFont::fonts[eDvbFontSize] = { NULL };
+
+void cFont::SetFont(eDvbFont Font, const char *Name, int CharHeight)
 {
   delete fonts[Font];
-  fonts[Font] = new cFont(Data ? Data : FontData[code][Font]);
+  fonts[Font] = new cFreetypeFont(*Name == '/' ? Name : *AddDirectory(FONTDIR, Name), CharHeight);
 }
 
 const cFont *cFont::GetFont(eDvbFont Font)
@@ -131,8 +302,13 @@ const cFont *cFont::GetFont(eDvbFont Font)
      Font = fontOsd;
   else if (Setup.UseSmallFont == 2)
      Font = fontSml;
-  if (!fonts[Font])
-     SetFont(Font);
+  if (!fonts[Font]) {
+     switch (Font) {
+       case fontOsd: SetFont(Font, AddDirectory(FONTDIR, Setup.FontOsd), Setup.FontOsdSize); break;
+       case fontSml: SetFont(Font, AddDirectory(FONTDIR, Setup.FontSml), Setup.FontSmlSize); break;
+       case fontFix: SetFont(Font, AddDirectory(FONTDIR, Setup.FontFix), Setup.FontFixSize); break;
+       }
+     }
   return fonts[Font];
 }
 
@@ -176,16 +352,18 @@ void cTextWrapper::Set(const char *Text, const cFont *Font, int Width)
   stripspace(text); // strips trailing newlines
 
   for (char *p = text; *p; ) {
-      if (*p == '\n') {
+      int sl = Utf8CharLen(p);
+      uint sym = Utf8CharGet(p, sl);
+      if (sym == '\n') {
          lines++;
          w = 0;
          Blank = Delim = NULL;
          p++;
          continue;
          }
-      else if (isspace(*p))
+      else if (sl == 1 && isspace(sym))
          Blank = p;
-      int cw = Font->Width(*p);
+      int cw = Font->Width(sym);
       if (w + cw > Width) {
          if (Blank) {
             *Blank = '\n';
@@ -214,7 +392,7 @@ void cTextWrapper::Set(const char *Text, const cFont *Font, int Width)
          Delim = p;
          Blank = NULL;
          }
-      p++;
+      p += sl;
       }
 }
 
diff --git a/font.h b/font.h
index 010d0a14f..b2ab293c5 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.15 2007/03/11 09:50:42 kls Exp $
+ * $Id: font.h 1.16 2007/06/10 12:58:54 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -13,6 +13,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#define MAXFONTNAME 64
+#define MAXFONTSIZE 64
+#define FONTDIR     "/usr/share/fonts/truetype"
+
 enum eDvbFont {
   fontOsd,
   fontFix,
@@ -20,49 +24,35 @@ enum eDvbFont {
 #define eDvbFontSize (fontSml + 1)
   };
 
-enum eDvbCode {
-  code_iso8859_1,
-  code_iso8859_2,
-  code_iso8859_5,
-  code_iso8859_7,
-  code_iso8859_9,
-  code_iso8859_13,
-  code_iso8859_15,
-#define eDvbCodeSize (code_iso8859_15 + 1)
-  };
+class cBitmap;
+typedef uint32_t tColor; // see also osd.h
+typedef uint8_t tIndex;
 
 class cFont {
-public:
-  enum { NUMCHARS = 256 };
-  typedef uint32_t tPixelData;
-  struct tCharData {
-    tPixelData width, height;
-    tPixelData lines[1];
-    };
 private:
-  static eDvbCode code;
   static cFont *fonts[];
-  const tCharData *data[NUMCHARS];
-  int height;
 public:
-  cFont(const void *Data);
   virtual ~cFont() {}
-  void SetData(const void *Data);
-  virtual int Width(unsigned char c) const { return data[c]->width; }
-      ///< Returns the width of the given character.
-  virtual int Width(const char *s) const;
-      ///< Returns the width of the given string.
-  virtual int Height(unsigned char c) const { return data[c]->height; }
-      ///< Returns the height of the given character.
-  virtual int Height(const char *s) const;
-      ///< Returns the height of the given string.
-  virtual int Height(void) const { return height; }
-      ///< Returns the height of this font (all characters have the same height).
-  const tCharData *CharData(unsigned char c) const { return data[c]; }
-  static bool SetCode(const char *Code);
-  static void SetCode(eDvbCode Code);
-  static void SetFont(eDvbFont Font, const void *Data = NULL);
+  virtual int Width(uint c) const = 0;
+          ///< Returns the width of the given character in pixel.
+  virtual int Width(const char *s) const = 0;
+          ///< Returns the width of the given string in pixel.
+  virtual int Height(void) const = 0;
+          ///< Returns the height of this font in pixel (all characters have the same height).
+  int Height(const char *s) const { return Height(); }
+          ///< Returns the height of this font in pixel (obsolete, just for backwards compatibilty).
+  virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
+          ///< Draws the given text into the Bitmap at position (x, y) with the given colors.
+          ///< The text will not exceed the given Width (if > 0), and will end with a complete character.
+  static void SetFont(eDvbFont Font, const char *Name, int CharHeight);
+          ///< Sets the given Font to use the font data from the file Name and make its characters
+          ///< CharHeight pixels high.
   static const cFont *GetFont(eDvbFont Font);
+          ///< Gets the given Font, which was previously set by a call to SetFont().
+          ///< If no SetFont() call has been made, the font as defined in the setup is returned.
+          ///< The caller must not use the returned font outside the scope in which
+          ///< it was retrieved by the call to GetFont(), because a call to SetFont()
+          ///< may delete an existing font.
   };
 
 class cTextWrapper {
diff --git a/fontfix-iso8859-1.c b/fontfix-iso8859-1.c
deleted file mode 100644
index 42a4c992b..000000000
--- a/fontfix-iso8859-1.c
+++ /dev/null
@@ -1,6498 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_1[][28] = {
-  {             // 32
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 33
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 34
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 35
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 36
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000FC0,  // ...******......
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FF0,  // ..*********....
-     0x00001BE0,  // ..**.*****.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 37
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000780,  // ....****.......
-     0x00000CC0,  // ...**..**......
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000038,  // .........***...
-     0x000001E0,  // ......****.....
-     0x00000700,  // ....***........
-     0x00001CF0,  // ..***..****....
-     0x00000198,  // ......**..**...
-     0x0000030C,  // .....**....**..
-     0x0000030C,  // .....**....**..
-     0x00000198,  // ......**..**...
-     0x000000F0,  // .......****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 38
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000700,  // ....***........
-     0x00000F98,  // ...*****..**...
-     0x00000DF8,  // ...**.******...
-     0x000018F0,  // ..**...****....
-     0x00001860,  // ..**....**.....
-     0x000018F0,  // ..**...****....
-     0x00001FFC,  // ..***********..
-     0x00000F9C,  // ...*****..***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 40
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000070,  // ........***....
-     0x00000030,  // .........**....
-     0x00000000,  // ...............
-  },
-  {             // 41
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00000000,  // ...............
-  },
-  {             // 42
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001998,  // ..**..**..**...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x000007E0,  // ....******.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 43
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 44
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 45
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 46
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 47
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 48
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000C30,  // ...**....**....
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 49
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 50
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00001C00,  // ..***..........
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 51
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000003E0,  // .....*****.....
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001FF0,  // ..*********....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 52
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000003F8,  // .....*******...
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 53
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DE0,  // ...**.****.....
-     0x00000FF8,  // ...*********...
-     0x00000E38,  // ...***...***...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000181C,  // ..**......***..
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 54
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000F8,  // .......*****...
-     0x000003F8,  // .....*******...
-     0x00000780,  // ....****.......
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C18,  // ..***.....**...
-     0x00000E38,  // ...***...***...
-     0x00000FF0,  // ...********....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 55
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 56
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 57
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000007F8,  // ....********...
-     0x00000618,  // ....**....**...
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E3C,  // ...***...****..
-     0x000007EC,  // ....******.**..
-     0x000003CC,  // .....****..**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 58
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 59
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000800,  // ...*...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 60
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000E,  // ...........***.
-     0x0000003C,  // .........****..
-     0x000000F0,  // .......****....
-     0x000003C0,  // .....****......
-     0x00000F00,  // ...****........
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000F00,  // ...****........
-     0x000003C0,  // .....****......
-     0x000000F0,  // .......****....
-     0x0000003C,  // .........****..
-     0x0000000E,  // ...........***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 61
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 62
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003800,  // .***...........
-     0x00001E00,  // ..****.........
-     0x00000780,  // ....****.......
-     0x000001E0,  // ......****.....
-     0x00000078,  // ........****...
-     0x0000001E,  // ..........****.
-     0x0000001E,  // ..........****.
-     0x00000078,  // ........****...
-     0x000001E0,  // ......****.....
-     0x00000780,  // ....****.......
-     0x00001E00,  // ..****.........
-     0x00003800,  // .***...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 63
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x000000F0,  // .......****....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 64
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x000018F0,  // ..**...****....
-     0x000019F0,  // ..**..*****....
-     0x00001BB0,  // ..**.***.**....
-     0x00001B30,  // ..**.**..**....
-     0x00001B30,  // ..**.**..**....
-     0x00001BB0,  // ..**.***.**....
-     0x000019F8,  // ..**..******...
-     0x000018F8,  // ..**...*****...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 65
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 68
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 69
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C66,  // ...**...**..**.
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 71
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 73
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 74
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 75
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 77
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 78
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 79
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000386,  // .....***....**.
-     0x00000FFE,  // ...***********.
-     0x00000E78,  // ...***..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 83
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 85
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 86
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001E78,  // ..****..****...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 88
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 91
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-  },
-  {             // 92
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 93
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-  },
-  {             // 94
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 95
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFF,  // ***************
-     0x00007FFF,  // ***************
-     0x00000000,  // ...............
-  },
-  {             // 96
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 97
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 98
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00003FFC,  // .************..
-     0x00003DF0,  // .****.*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 99
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 100
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 101
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 102
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000FC,  // .......******..
-     0x000001FC,  // ......*******..
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 103
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 104
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 105
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 106
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 107
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C78,  // ...**...****...
-     0x00000C78,  // ...**...****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003C7E,  // .****...******.
-     0x00003C7E,  // .****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 108
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 109
-     16, 26,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000EF78,  // ***.****.****...
-     0x0000FFFC,  // **************..
-     0x000039CC,  // ..***..***..**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000F9EF,  // *****..****.****
-     0x0000F9EF,  // *****..****.****
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 111
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 112
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 113
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000000FE,  // .......*******.
-     0x000000FE,  // .......*******.
-  },
-  {             // 114
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 115
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 116
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 117
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 118
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 119
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00001998,  // ..**..**..**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001E78,  // ..****..****...
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 121
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 122
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 123
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-  },
-  {             // 124
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 125
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-  },
-  {             // 126
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F0C,  // ...****....**..
-     0x00001F9C,  // ..******..***..
-     0x000039F8,  // .***..******...
-     0x000030F0,  // .**....****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 127
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 161
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000300,  // .....**........
-  },
-  {             // 162
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 163
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x000007F0,  // ....*******....
-     0x00000E30,  // ...***...**....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00001C0C,  // ..***......**..
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 164
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 165
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 166
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F8,  // .....*******...
-     0x000007F8,  // ....********...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000E00,  // ...***.........
-     0x00001F80,  // ..******.......
-     0x000033E0,  // .**..*****.....
-     0x000030F8,  // .**....*****...
-     0x00003C3C,  // .****....****..
-     0x00001F0C,  // ..*****....**..
-     0x000007CC,  // ....*****..**..
-     0x000001FC,  // ......*******..
-     0x00000078,  // ........****...
-     0x00000030,  // .........**....
-     0x00001830,  // ..**.....**....
-     0x00001870,  // ..**....***....
-     0x00001FE0,  // ..********.....
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 168
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006E66,  // **.***..**..**.
-     0x00006C06,  // **.**.......**.
-     0x00006C06,  // **.**.......**.
-     0x00006E66,  // **.***..**..**.
-     0x000037EC,  // .**.******.**..
-     0x000033CC,  // .**..****..**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000060,  // ........**.....
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000CF0,  // ...**..****....
-     0x000007B0,  // ....****.**....
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 171
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 172
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 173
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 174
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000037CC,  // .**.*****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006666,  // **..**..**..**.
-     0x00006666,  // **..**..**..**.
-     0x000067C6,  // **..*****...**.
-     0x000066C6,  // **..**.**...**.
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 176
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 177
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 178
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000630,  // ....**...**....
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 179
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000001E0,  // ......****.....
-     0x00000030,  // .........**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 180
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FFE,  // ..************.
-     0x00001FDE,  // ..*******.****.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-  },
-  {             // 182
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FC,  // ....*********..
-     0x00001FFC,  // ..***********..
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x00001FB0,  // ..******.**....
-     0x000007B0,  // ....****.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x00000FBC,  // ...*****.****..
-     0x00000FBC,  // ...*****.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 183
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 184
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 185
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 186
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 187
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 188
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00007801,  // ****..........*
-     0x00001803,  // ..**.........**
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001818,  // ..**......**...
-     0x00001830,  // ..**.....**....
-     0x00001864,  // ..**....**..*..
-     0x00007FCC,  // *********..**..
-     0x0000019C,  // ......**..***..
-     0x0000032C,  // .....**..*.**..
-     0x0000064C,  // ....**..*..**..
-     0x00000C8C,  // ...**..*...**..
-     0x000018FE,  // ..**...*******.
-     0x0000300C,  // .**........**..
-     0x0000201E,  // .*........****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00007801,  // ****..........*
-     0x00001803,  // ..**.........**
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001818,  // ..**......**...
-     0x00001830,  // ..**.....**....
-     0x0000187E,  // ..**....******.
-     0x00007FF3,  // ***********..**
-     0x000001A3,  // ......**.*...**
-     0x00000306,  // .....**.....**.
-     0x0000060C,  // ....**.....**..
-     0x00000C18,  // ...**.....**...
-     0x00001830,  // ..**.....**....
-     0x00003063,  // .**.....**...**
-     0x0000207F,  // .*......*******
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E00,  // .*****.........
-     0x00006301,  // **...**.......*
-     0x00006303,  // **...**......**
-     0x00000606,  // ....**......**.
-     0x00001E0C,  // ..****.....**..
-     0x00000318,  // .....**...**...
-     0x00006330,  // **...**..**....
-     0x00006364,  // **...**.**..*..
-     0x00003ECC,  // .*****.**..**..
-     0x0000019C,  // ......**..***..
-     0x0000032C,  // .....**..*.**..
-     0x0000064C,  // ....**..*..**..
-     0x00000C8C,  // ...**..*...**..
-     0x000018FE,  // ..**...*******.
-     0x0000300C,  // .**........**..
-     0x0000201E,  // .*........****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000F00,  // ...****........
-     0x00001C00,  // ..***..........
-     0x00001800,  // ..**...........
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-  },
-  {             // 192
-     15, 26,
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 26,
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000FC0,  // ...******......
-     0x00001CE0,  // ..***..***.....
-     0x00003870,  // .***....***....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 26,
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FF,  // ....***********
-     0x000007FF,  // ....***********
-     0x000001C3,  // ......***....**
-     0x000003C3,  // .....****....**
-     0x000003C0,  // .....****......
-     0x000006CC,  // ....**.**..**..
-     0x000004FC,  // ....*..******..
-     0x00000CFC,  // ...**..******..
-     0x00000FCC,  // ...******..**..
-     0x00001FC0,  // ..*******......
-     0x000018C0,  // ..**...**......
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x00007BFF,  // ****.**********
-     0x00007BFF,  // ****.**********
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 199
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001804,  // ..**........*..
-     0x00001C0C,  // ..***......**..
-     0x00000FF8,  // ...*********...
-     0x000003F0,  // .....******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 200
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 206
-     15, 26,
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00007F06,  // *******.....**.
-     0x00007F06,  // *******.....**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     15, 26,
-     0x00000000,  // ...............
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001008,  // ..*........*...
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00001008,  // ..*........*...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x0000000C,  // ...........**..
-     0x000003F8,  // .....*******...
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x00003046,  // .**.....*...**.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x00003A0E,  // .***.*.....***.
-     0x00001E0C,  // ..****.....**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x00001BE0,  // ..**.*****.....
-     0x00003000,  // .**............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 218
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 219
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 220
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 221
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003F00,  // .******........
-     0x00003F00,  // .******........
-     0x00000C00,  // ...**..........
-     0x00000FF0,  // ...********....
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00003F00,  // .******........
-     0x00003F00,  // .******........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C70,  // ...**...***....
-     0x00000DE0,  // ...**.****.....
-     0x00000DF0,  // ...**.*****....
-     0x00000C38,  // ...**....***...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000CDC,  // ...**..**.***..
-     0x00003EF8,  // .*****.*****...
-     0x00003E70,  // .*****..***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 224
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 225
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 226
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 227
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 228
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 229
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 230
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00003FFC,  // .************..
-     0x000033CE,  // .**..****..***.
-     0x00000186,  // ......**....**.
-     0x00000F86,  // ...*****....**.
-     0x00003FFE,  // .*************.
-     0x000071FE,  // ***...********.
-     0x00006180,  // **....**.......
-     0x000063C6,  // **...****...**.
-     0x00007FFE,  // **************.
-     0x00003E78,  // .*****..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 231
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x00003818,  // .***......**...
-     0x00003018,  // .**.......**...
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x000007F0,  // ....*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 232
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 233
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 234
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000003E0,  // .....*****.....
-     0x00000770,  // ....***.***....
-     0x00000E38,  // ...***...***...
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 235
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 236
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 237
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 238
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 240
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007E38,  // ******...***...
-     0x000007F8,  // ....********...
-     0x00000FC0,  // ...******......
-     0x00003EE0,  // .*****.***.....
-     0x00003870,  // .***....***....
-     0x000007F8,  // ....********...
-     0x00001FF8,  // ..**********...
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 241
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 242
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 243
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 244
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 245
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 246
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 247
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFC,  // *************..
-     0x00007FFC,  // *************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 248
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x000007EC,  // ....******.**..
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000386C,  // .***....**.**..
-     0x000030CC,  // .**....**..**..
-     0x0000318C,  // .**...**...**..
-     0x0000330C,  // .**..**....**..
-     0x0000361C,  // .**.**....***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x00001FE0,  // ..********.....
-     0x00003000,  // .**............
-     0x00006000,  // **.............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 249
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 250
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 251
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 252
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 253
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 254
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00000FFC,  // ...**********..
-     0x00000DF0,  // ...**.*****....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 255
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  };
diff --git a/fontfix-iso8859-13.c b/fontfix-iso8859-13.c
deleted file mode 100644
index f42be8dd2..000000000
--- a/fontfix-iso8859-13.c
+++ /dev/null
@@ -1,6498 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_13[][28] = {
-  {             // 32
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 33
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 34
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 35
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 36
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000FC0,  // ...******......
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FF0,  // ..*********....
-     0x00001BE0,  // ..**.*****.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 37
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000780,  // ....****.......
-     0x00000CC0,  // ...**..**......
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000038,  // .........***...
-     0x000001E0,  // ......****.....
-     0x00000700,  // ....***........
-     0x00001CF0,  // ..***..****....
-     0x00000198,  // ......**..**...
-     0x0000030C,  // .....**....**..
-     0x0000030C,  // .....**....**..
-     0x00000198,  // ......**..**...
-     0x000000F0,  // .......****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 38
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000700,  // ....***........
-     0x00000F98,  // ...*****..**...
-     0x00000DF8,  // ...**.******...
-     0x000018F0,  // ..**...****....
-     0x00001860,  // ..**....**.....
-     0x000018F0,  // ..**...****....
-     0x00001FFC,  // ..***********..
-     0x00000F9C,  // ...*****..***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 40
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000070,  // ........***....
-     0x00000030,  // .........**....
-     0x00000000,  // ...............
-  },
-  {             // 41
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00000000,  // ...............
-  },
-  {             // 42
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001998,  // ..**..**..**...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x000007E0,  // ....******.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 43
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 44
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 45
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 46
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 47
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 48
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000C30,  // ...**....**....
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 49
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 50
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00001C00,  // ..***..........
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 51
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000003E0,  // .....*****.....
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001FF0,  // ..*********....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 52
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000003F8,  // .....*******...
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 53
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DE0,  // ...**.****.....
-     0x00000FF8,  // ...*********...
-     0x00000E38,  // ...***...***...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000181C,  // ..**......***..
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 54
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000F8,  // .......*****...
-     0x000003F8,  // .....*******...
-     0x00000780,  // ....****.......
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C18,  // ..***.....**...
-     0x00000E38,  // ...***...***...
-     0x00000FF0,  // ...********....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 55
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 56
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 57
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000007F8,  // ....********...
-     0x00000618,  // ....**....**...
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E3C,  // ...***...****..
-     0x000007EC,  // ....******.**..
-     0x000003CC,  // .....****..**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 58
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 59
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000800,  // ...*...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 60
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000E,  // ...........***.
-     0x0000003C,  // .........****..
-     0x000000F0,  // .......****....
-     0x000003C0,  // .....****......
-     0x00000F00,  // ...****........
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000F00,  // ...****........
-     0x000003C0,  // .....****......
-     0x000000F0,  // .......****....
-     0x0000003C,  // .........****..
-     0x0000000E,  // ...........***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 61
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 62
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003800,  // .***...........
-     0x00001E00,  // ..****.........
-     0x00000780,  // ....****.......
-     0x000001E0,  // ......****.....
-     0x00000078,  // ........****...
-     0x0000001E,  // ..........****.
-     0x0000001E,  // ..........****.
-     0x00000078,  // ........****...
-     0x000001E0,  // ......****.....
-     0x00000780,  // ....****.......
-     0x00001E00,  // ..****.........
-     0x00003800,  // .***...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 63
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x000000F0,  // .......****....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 64
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x000018F0,  // ..**...****....
-     0x000019F0,  // ..**..*****....
-     0x00001BB0,  // ..**.***.**....
-     0x00001B30,  // ..**.**..**....
-     0x00001B30,  // ..**.**..**....
-     0x00001BB0,  // ..**.***.**....
-     0x000019F8,  // ..**..******...
-     0x000018F8,  // ..**...*****...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 65
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 68
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 69
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C66,  // ...**...**..**.
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 71
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 73
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 74
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 75
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 77
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 78
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 79
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000386,  // .....***....**.
-     0x00000FFE,  // ...***********.
-     0x00000E78,  // ...***..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 83
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 85
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 86
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001E78,  // ..****..****...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 88
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 91
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-  },
-  {             // 92
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 93
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-  },
-  {             // 94
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 95
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFF,  // ***************
-     0x00007FFF,  // ***************
-     0x00000000,  // ...............
-  },
-  {             // 96
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 97
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 98
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00003FFC,  // .************..
-     0x00003DF0,  // .****.*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 99
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 100
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 101
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 102
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000FC,  // .......******..
-     0x000001FC,  // ......*******..
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 103
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 104
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 105
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 106
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 107
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C78,  // ...**...****...
-     0x00000C78,  // ...**...****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003C7E,  // .****...******.
-     0x00003C7E,  // .****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 108
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 109
-     16, 26,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000EF78,  // ***.****.****...
-     0x0000FFFC,  // **************..
-     0x000039CC,  // ..***..***..**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000F9EF,  // *****..****.****
-     0x0000F9EF,  // *****..****.****
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 111
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 112
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 113
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000000FE,  // .......*******.
-     0x000000FE,  // .......*******.
-  },
-  {             // 114
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 115
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 116
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 117
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 118
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 119
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00001998,  // ..**..**..**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001E78,  // ..****..****...
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 121
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 122
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 123
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-  },
-  {             // 124
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 125
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-  },
-  {             // 126
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F0C,  // ...****....**..
-     0x00001F9C,  // ..******..***..
-     0x000039F8,  // .***..******...
-     0x000030F0,  // .**....****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 127
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 161
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000300,  // .....**........
-  },
-  {             // 162
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 163
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x000007F0,  // ....*******....
-     0x00000E30,  // ...***...**....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00001C0C,  // ..***......**..
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 164
-     17, 26,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000003F6,  // .......******.**.
-     0x00000FFE,  // .....***********.
-     0x00001C0E,  // ....***......***.
-     0x00001806,  // ....**........**.
-     0x0001FFE6,  // ************..**.
-     0x0001FFE0,  // ************.....
-     0x00003000,  // ...**............
-     0x00003000,  // ...**............
-     0x0001FFE0,  // ************.....
-     0x0001FFE0,  // ************.....
-     0x00003800,  // ...***...........
-     0x00001806,  // ....**........**.
-     0x00001C0E,  // ....***......***.
-     0x00000FFC,  // .....**********..
-     0x000003F0,  // .......******....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 165
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 166
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F8,  // .....*******...
-     0x000007F8,  // ....********...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000E00,  // ...***.........
-     0x00001F80,  // ..******.......
-     0x000033E0,  // .**..*****.....
-     0x000030F8,  // .**....*****...
-     0x00003C3C,  // .****....****..
-     0x00001F0C,  // ..*****....**..
-     0x000007CC,  // ....*****..**..
-     0x000001FC,  // ......*******..
-     0x00000078,  // ........****...
-     0x00000030,  // .........**....
-     0x00001830,  // ..**.....**....
-     0x00001870,  // ..**....***....
-     0x00001FE0,  // ..********.....
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 168
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x0000000C,  // ...........**..
-     0x000003F8,  // .....*******...
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x00003046,  // .**.....*...**.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x00003A0E,  // .***.*.....***.
-     0x00001E0C,  // ..****.....**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x00001BE0,  // ..**.*****.....
-     0x00003000,  // .**............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006E66,  // **.***..**..**.
-     0x00006C06,  // **.**.......**.
-     0x00006C06,  // **.**.......**.
-     0x00006E66,  // **.***..**..**.
-     0x000037EC,  // .**.******.**..
-     0x000033CC,  // .**..****..**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000060,  // ........**.....
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000CF0,  // ...**..****....
-     0x000007B0,  // ....****.**....
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 171
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 172
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 173
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 174
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000037CC,  // .**.*****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006666,  // **..**..**..**.
-     0x00006666,  // **..**..**..**.
-     0x000067C6,  // **..*****...**.
-     0x000066C6,  // **..**.**...**.
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 176
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 177
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 178
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000630,  // ....**...**....
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 179
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000001E0,  // ......****.....
-     0x00000030,  // .........**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 180
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FFE,  // ..************.
-     0x00001FDE,  // ..*******.****.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-  },
-  {             // 182
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FC,  // ....*********..
-     0x00001FFC,  // ..***********..
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x00001FB0,  // ..******.**....
-     0x000007B0,  // ....****.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x00000FBC,  // ...*****.****..
-     0x00000FBC,  // ...*****.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 183
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 184
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x000007EC,  // ....******.**..
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000386C,  // .***....**.**..
-     0x000030CC,  // .**....**..**..
-     0x0000318C,  // .**...**...**..
-     0x0000330C,  // .**..**....**..
-     0x0000361C,  // .**.**....***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x00001FE0,  // ..********.....
-     0x00003000,  // .**............
-     0x00006000,  // **.............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 185
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 186
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 187
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 188
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FFF,  // ...************
-     0x00003FFF,  // .**************
-     0x000031C3,  // .**...***....**
-     0x000060C3,  // **.....**....**
-     0x000060C0,  // **.....**......
-     0x000060CC,  // **.....**..**..
-     0x000060FC,  // **.....******..
-     0x000060FC,  // **.....******..
-     0x000060CC,  // **.....**..**..
-     0x000060C0,  // **.....**......
-     0x000060C0,  // **.....**......
-     0x000060C3,  // **.....**....**
-     0x000031C3,  // .**...***....**
-     0x00003FFF,  // .**************
-     0x00000FFF,  // ...************
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E7C,  // ..****..*****..
-     0x00003FFE,  // .*************.
-     0x000073C7,  // ***..****...***
-     0x00006183,  // **....**.....**
-     0x00006183,  // **....**.....**
-     0x000061FF,  // **....*********
-     0x000061FF,  // **....*********
-     0x00006180,  // **....**.......
-     0x000073C3,  // ***..****....**
-     0x00003FFF,  // .**************
-     0x00001E7C,  // ..****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000F00,  // ...****........
-     0x00001C00,  // ..***..........
-     0x00001800,  // ..**...........
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-  },
-  {             // 192
-     15, 26,
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 26,
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000FC0,  // ...******......
-     0x00001CE0,  // ..***..***.....
-     0x00003870,  // .***....***....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 26,
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FF,  // ....***********
-     0x000007FF,  // ....***********
-     0x000001C3,  // ......***....**
-     0x000003C3,  // .....****....**
-     0x000003C0,  // .....****......
-     0x000006CC,  // ....**.**..**..
-     0x000004FC,  // ....*..******..
-     0x00000CFC,  // ...**..******..
-     0x00000FCC,  // ...******..**..
-     0x00001FC0,  // ..*******......
-     0x000018C0,  // ..**...**......
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x00007BFF,  // ****.**********
-     0x00007BFF,  // ****.**********
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 199
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001804,  // ..**........*..
-     0x00001C0C,  // ..***......**..
-     0x00000FF8,  // ...*********...
-     0x000003F0,  // .....******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 200
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 206
-     15, 26,
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001E00,  // ..****.........
-     0x00000FC0,  // ...******......
-     0x000001F8,  // ......******...
-     0x0000003C,  // .........****..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     15, 26,
-     0x00000000,  // ...............
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001008,  // ..*........*...
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00001008,  // ..*........*...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x0000000C,  // ...........**..
-     0x000003F8,  // .....*******...
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x00003046,  // .**.....*...**.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x00003A0E,  // .***.*.....***.
-     0x00001E0C,  // ..****.....**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x00001BE0,  // ..**.*****.....
-     0x00003000,  // .**............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 218
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 219
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 220
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 221
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C70,  // ...**...***....
-     0x00000DE0,  // ...**.****.....
-     0x00000DF0,  // ...**.*****....
-     0x00000C38,  // ...**....***...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000CDC,  // ...**..**.***..
-     0x00003EF8,  // .*****.*****...
-     0x00003E70,  // .*****..***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 224
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 225
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 226
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 227
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 228
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 229
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 230
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00003FFC,  // .************..
-     0x000033CE,  // .**..****..***.
-     0x00000186,  // ......**....**.
-     0x00000F86,  // ...*****....**.
-     0x00003FFE,  // .*************.
-     0x000071FE,  // ***...********.
-     0x00006180,  // **....**.......
-     0x000063C6,  // **...****...**.
-     0x00007FFE,  // **************.
-     0x00003E78,  // .*****..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 231
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x00003818,  // .***......**...
-     0x00003018,  // .**.......**...
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x000007F0,  // ....*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 232
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 233
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 234
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000003E0,  // .....*****.....
-     0x00000770,  // ....***.***....
-     0x00000E38,  // ...***...***...
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 235
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 236
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 237
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 238
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 240
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 241
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 242
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 243
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 244
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 245
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 246
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 247
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFC,  // *************..
-     0x00007FFC,  // *************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 248
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x000007EC,  // ....******.**..
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000386C,  // .***....**.**..
-     0x000030CC,  // .**....**..**..
-     0x0000318C,  // .**...**...**..
-     0x0000330C,  // .**..**....**..
-     0x0000361C,  // .**.**....***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x00001FE0,  // ..********.....
-     0x00003000,  // .**............
-     0x00006000,  // **.............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 249
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 250
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 251
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 252
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 253
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 254
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 255
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  };
diff --git a/fontfix-iso8859-15.c b/fontfix-iso8859-15.c
deleted file mode 100644
index c4c5aa078..000000000
--- a/fontfix-iso8859-15.c
+++ /dev/null
@@ -1,6498 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_15[][28] = {
-  {             // 32
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 33
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 34
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 35
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 36
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000FC0,  // ...******......
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FF0,  // ..*********....
-     0x00001BE0,  // ..**.*****.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 37
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000780,  // ....****.......
-     0x00000CC0,  // ...**..**......
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000038,  // .........***...
-     0x000001E0,  // ......****.....
-     0x00000700,  // ....***........
-     0x00001CF0,  // ..***..****....
-     0x00000198,  // ......**..**...
-     0x0000030C,  // .....**....**..
-     0x0000030C,  // .....**....**..
-     0x00000198,  // ......**..**...
-     0x000000F0,  // .......****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 38
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000700,  // ....***........
-     0x00000F98,  // ...*****..**...
-     0x00000DF8,  // ...**.******...
-     0x000018F0,  // ..**...****....
-     0x00001860,  // ..**....**.....
-     0x000018F0,  // ..**...****....
-     0x00001FFC,  // ..***********..
-     0x00000F9C,  // ...*****..***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 40
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000070,  // ........***....
-     0x00000030,  // .........**....
-     0x00000000,  // ...............
-  },
-  {             // 41
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00000000,  // ...............
-  },
-  {             // 42
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001998,  // ..**..**..**...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x000007E0,  // ....******.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 43
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 44
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 45
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 46
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 47
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 48
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000C30,  // ...**....**....
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 49
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 50
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00001C00,  // ..***..........
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 51
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000003E0,  // .....*****.....
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001FF0,  // ..*********....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 52
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000003F8,  // .....*******...
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 53
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DE0,  // ...**.****.....
-     0x00000FF8,  // ...*********...
-     0x00000E38,  // ...***...***...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000181C,  // ..**......***..
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 54
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000F8,  // .......*****...
-     0x000003F8,  // .....*******...
-     0x00000780,  // ....****.......
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C18,  // ..***.....**...
-     0x00000E38,  // ...***...***...
-     0x00000FF0,  // ...********....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 55
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 56
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 57
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000007F8,  // ....********...
-     0x00000618,  // ....**....**...
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E3C,  // ...***...****..
-     0x000007EC,  // ....******.**..
-     0x000003CC,  // .....****..**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 58
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 59
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000800,  // ...*...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 60
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000E,  // ...........***.
-     0x0000003C,  // .........****..
-     0x000000F0,  // .......****....
-     0x000003C0,  // .....****......
-     0x00000F00,  // ...****........
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000F00,  // ...****........
-     0x000003C0,  // .....****......
-     0x000000F0,  // .......****....
-     0x0000003C,  // .........****..
-     0x0000000E,  // ...........***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 61
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 62
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003800,  // .***...........
-     0x00001E00,  // ..****.........
-     0x00000780,  // ....****.......
-     0x000001E0,  // ......****.....
-     0x00000078,  // ........****...
-     0x0000001E,  // ..........****.
-     0x0000001E,  // ..........****.
-     0x00000078,  // ........****...
-     0x000001E0,  // ......****.....
-     0x00000780,  // ....****.......
-     0x00001E00,  // ..****.........
-     0x00003800,  // .***...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 63
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x000000F0,  // .......****....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 64
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x000018F0,  // ..**...****....
-     0x000019F0,  // ..**..*****....
-     0x00001BB0,  // ..**.***.**....
-     0x00001B30,  // ..**.**..**....
-     0x00001B30,  // ..**.**..**....
-     0x00001BB0,  // ..**.***.**....
-     0x000019F8,  // ..**..******...
-     0x000018F8,  // ..**...*****...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 65
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 68
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 69
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C66,  // ...**...**..**.
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 71
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 73
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 74
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 75
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 77
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 78
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 79
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000386,  // .....***....**.
-     0x00000FFE,  // ...***********.
-     0x00000E78,  // ...***..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 83
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 85
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 86
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001E78,  // ..****..****...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 88
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 91
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-  },
-  {             // 92
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 93
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-  },
-  {             // 94
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 95
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFF,  // ***************
-     0x00007FFF,  // ***************
-     0x00000000,  // ...............
-  },
-  {             // 96
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 97
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 98
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00003FFC,  // .************..
-     0x00003DF0,  // .****.*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 99
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 100
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 101
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 102
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000FC,  // .......******..
-     0x000001FC,  // ......*******..
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 103
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 104
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 105
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 106
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 107
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C78,  // ...**...****...
-     0x00000C78,  // ...**...****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003C7E,  // .****...******.
-     0x00003C7E,  // .****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 108
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 109
-     16, 26,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000EF78,  // ***.****.****...
-     0x0000FFFC,  // **************..
-     0x000039CC,  // ..***..***..**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000F9EF,  // *****..****.****
-     0x0000F9EF,  // *****..****.****
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 111
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 112
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 113
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000000FE,  // .......*******.
-     0x000000FE,  // .......*******.
-  },
-  {             // 114
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 115
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 116
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 117
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 118
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 119
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00001998,  // ..**..**..**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001E78,  // ..****..****...
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 121
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 122
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 123
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-  },
-  {             // 124
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 125
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-  },
-  {             // 126
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F0C,  // ...****....**..
-     0x00001F9C,  // ..******..***..
-     0x000039F8,  // .***..******...
-     0x000030F0,  // .**....****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 127
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 26,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 161
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000300,  // .....**........
-  },
-  {             // 162
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 163
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x000007F0,  // ....*******....
-     0x00000E30,  // ...***...**....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00001C0C,  // ..***......**..
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 164
-     17, 26,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000003F6,  // .......******.**.
-     0x00000FFE,  // .....***********.
-     0x00001C0E,  // ....***......***.
-     0x00001806,  // ....**........**.
-     0x0001FFE6,  // ************..**.
-     0x0001FFE0,  // ************.....
-     0x00003000,  // ...**............
-     0x00003000,  // ...**............
-     0x0001FFE0,  // ************.....
-     0x0001FFE0,  // ************.....
-     0x00003800,  // ...***...........
-     0x00001806,  // ....**........**.
-     0x00001C0E,  // ....***......***.
-     0x00000FFC,  // .....**********..
-     0x000003F0,  // .......******....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 165
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 166
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001E00,  // ..****.........
-     0x00000FC0,  // ...******......
-     0x000001F8,  // ......******...
-     0x0000003C,  // .........****..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F8,  // .....*******...
-     0x000007F8,  // ....********...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000E00,  // ...***.........
-     0x00001F80,  // ..******.......
-     0x000033E0,  // .**..*****.....
-     0x000030F8,  // .**....*****...
-     0x00003C3C,  // .****....****..
-     0x00001F0C,  // ..*****....**..
-     0x000007CC,  // ....*****..**..
-     0x000001FC,  // ......*******..
-     0x00000078,  // ........****...
-     0x00000030,  // .........**....
-     0x00001830,  // ..**.....**....
-     0x00001870,  // ..**....***....
-     0x00001FE0,  // ..********.....
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 168
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006E66,  // **.***..**..**.
-     0x00006C06,  // **.**.......**.
-     0x00006C06,  // **.**.......**.
-     0x00006E66,  // **.***..**..**.
-     0x000037EC,  // .**.******.**..
-     0x000033CC,  // .**..****..**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000060,  // ........**.....
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000CF0,  // ...**..****....
-     0x000007B0,  // ....****.**....
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 171
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 172
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 173
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 174
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000037CC,  // .**.*****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006666,  // **..**..**..**.
-     0x00006666,  // **..**..**..**.
-     0x000067C6,  // **..*****...**.
-     0x000066C6,  // **..**.**...**.
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 176
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 177
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 178
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000630,  // ....**...**....
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 179
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000001E0,  // ......****.....
-     0x00000030,  // .........**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 180
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FFE,  // ..************.
-     0x00001FDE,  // ..*******.****.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-  },
-  {             // 182
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FC,  // ....*********..
-     0x00001FFC,  // ..***********..
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x00001FB0,  // ..******.**....
-     0x000007B0,  // ....****.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x00000FBC,  // ...*****.****..
-     0x00000FBC,  // ...*****.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 183
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 184
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 185
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 186
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 187
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 188
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FFF,  // ...************
-     0x00003FFF,  // .**************
-     0x000031C3,  // .**...***....**
-     0x000060C3,  // **.....**....**
-     0x000060C0,  // **.....**......
-     0x000060CC,  // **.....**..**..
-     0x000060FC,  // **.....******..
-     0x000060FC,  // **.....******..
-     0x000060CC,  // **.....**..**..
-     0x000060C0,  // **.....**......
-     0x000060C0,  // **.....**......
-     0x000060C3,  // **.....**....**
-     0x000031C3,  // .**...***....**
-     0x00003FFF,  // .**************
-     0x00000FFF,  // ...************
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E7C,  // ..****..*****..
-     0x00003FFE,  // .*************.
-     0x000073C7,  // ***..****...***
-     0x00006183,  // **....**.....**
-     0x00006183,  // **....**.....**
-     0x000061FF,  // **....*********
-     0x000061FF,  // **....*********
-     0x00006180,  // **....**.......
-     0x000073C3,  // ***..****....**
-     0x00003FFF,  // .**************
-     0x00001E7C,  // ..****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000F00,  // ...****........
-     0x00001C00,  // ..***..........
-     0x00001800,  // ..**...........
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-  },
-  {             // 192
-     15, 26,
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 26,
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000FC0,  // ...******......
-     0x00001CE0,  // ..***..***.....
-     0x00003870,  // .***....***....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 26,
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FF,  // ....***********
-     0x000007FF,  // ....***********
-     0x000001C3,  // ......***....**
-     0x000003C3,  // .....****....**
-     0x000003C0,  // .....****......
-     0x000006CC,  // ....**.**..**..
-     0x000004FC,  // ....*..******..
-     0x00000CFC,  // ...**..******..
-     0x00000FCC,  // ...******..**..
-     0x00001FC0,  // ..*******......
-     0x000018C0,  // ..**...**......
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x00007BFF,  // ****.**********
-     0x00007BFF,  // ****.**********
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 199
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001804,  // ..**........*..
-     0x00001C0C,  // ..***......**..
-     0x00000FF8,  // ...*********...
-     0x000003F0,  // .....******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 200
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 206
-     15, 26,
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00007F06,  // *******.....**.
-     0x00007F06,  // *******.....**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     15, 26,
-     0x00000000,  // ...............
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001008,  // ..*........*...
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00001008,  // ..*........*...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x0000000C,  // ...........**..
-     0x000003F8,  // .....*******...
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x00003046,  // .**.....*...**.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x00003A0E,  // .***.*.....***.
-     0x00001E0C,  // ..****.....**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x00001BE0,  // ..**.*****.....
-     0x00003000,  // .**............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 218
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 219
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 220
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 221
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003F00,  // .******........
-     0x00003F00,  // .******........
-     0x00000C00,  // ...**..........
-     0x00000FF0,  // ...********....
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00003F00,  // .******........
-     0x00003F00,  // .******........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C70,  // ...**...***....
-     0x00000DE0,  // ...**.****.....
-     0x00000DF0,  // ...**.*****....
-     0x00000C38,  // ...**....***...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000CDC,  // ...**..**.***..
-     0x00003EF8,  // .*****.*****...
-     0x00003E70,  // .*****..***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 224
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 225
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 226
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 227
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 228
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 229
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 230
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00003FFC,  // .************..
-     0x000033CE,  // .**..****..***.
-     0x00000186,  // ......**....**.
-     0x00000F86,  // ...*****....**.
-     0x00003FFE,  // .*************.
-     0x000071FE,  // ***...********.
-     0x00006180,  // **....**.......
-     0x000063C6,  // **...****...**.
-     0x00007FFE,  // **************.
-     0x00003E78,  // .*****..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 231
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x00003818,  // .***......**...
-     0x00003018,  // .**.......**...
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x000007F0,  // ....*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 232
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 233
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 234
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000003E0,  // .....*****.....
-     0x00000770,  // ....***.***....
-     0x00000E38,  // ...***...***...
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 235
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 236
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 237
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 238
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 240
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007E38,  // ******...***...
-     0x000007F8,  // ....********...
-     0x00000FC0,  // ...******......
-     0x00003EE0,  // .*****.***.....
-     0x00003870,  // .***....***....
-     0x000007F8,  // ....********...
-     0x00001FF8,  // ..**********...
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 241
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 242
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 243
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 244
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 245
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 246
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 247
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFC,  // *************..
-     0x00007FFC,  // *************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 248
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x000007EC,  // ....******.**..
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000386C,  // .***....**.**..
-     0x000030CC,  // .**....**..**..
-     0x0000318C,  // .**...**...**..
-     0x0000330C,  // .**..**....**..
-     0x0000361C,  // .**.**....***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x00001FE0,  // ..********.....
-     0x00003000,  // .**............
-     0x00006000,  // **.............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 249
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 250
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 251
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 252
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 253
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 254
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00000FFC,  // ...**********..
-     0x00000DF0,  // ...**.*****....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 255
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  };
diff --git a/fontfix-iso8859-2.c b/fontfix-iso8859-2.c
deleted file mode 100644
index c5862d715..000000000
--- a/fontfix-iso8859-2.c
+++ /dev/null
@@ -1,6498 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_2[][28] = {
-  {             // 32
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 33
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 34
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 35
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 36
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000FC0,  // ...******......
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FF0,  // ..*********....
-     0x00001BE0,  // ..**.*****.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 37
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000780,  // ....****.......
-     0x00000CC0,  // ...**..**......
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000038,  // .........***...
-     0x000001E0,  // ......****.....
-     0x00000700,  // ....***........
-     0x00001CF0,  // ..***..****....
-     0x00000198,  // ......**..**...
-     0x0000030C,  // .....**....**..
-     0x0000030C,  // .....**....**..
-     0x00000198,  // ......**..**...
-     0x000000F0,  // .......****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 38
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000700,  // ....***........
-     0x00000F98,  // ...*****..**...
-     0x00000DF8,  // ...**.******...
-     0x000018F0,  // ..**...****....
-     0x00001860,  // ..**....**.....
-     0x000018F0,  // ..**...****....
-     0x00001FFC,  // ..***********..
-     0x00000F9C,  // ...*****..***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000100,  // ......*........
-     0x00000100,  // ......*........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 40
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000070,  // ........***....
-     0x00000030,  // .........**....
-     0x00000000,  // ...............
-  },
-  {             // 41
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00000000,  // ...............
-  },
-  {             // 42
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001998,  // ..**..**..**...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x000007E0,  // ....******.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 43
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 44
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 45
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 46
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 47
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 48
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000C30,  // ...**....**....
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 49
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 50
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00001C00,  // ..***..........
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 51
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000003E0,  // .....*****.....
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001FF0,  // ..*********....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 52
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000003F8,  // .....*******...
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 53
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DE0,  // ...**.****.....
-     0x00000FF8,  // ...*********...
-     0x00000E38,  // ...***...***...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000181C,  // ..**......***..
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 54
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000F8,  // .......*****...
-     0x000003F8,  // .....*******...
-     0x00000780,  // ....****.......
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C18,  // ..***.....**...
-     0x00000E38,  // ...***...***...
-     0x00000FF0,  // ...********....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 55
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 56
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 57
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000007F8,  // ....********...
-     0x00000618,  // ....**....**...
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E3C,  // ...***...****..
-     0x000007EC,  // ....******.**..
-     0x000003CC,  // .....****..**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 58
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 59
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000800,  // ...*...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 60
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000E,  // ...........***.
-     0x0000003C,  // .........****..
-     0x000000F0,  // .......****....
-     0x000003C0,  // .....****......
-     0x00000F00,  // ...****........
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000F00,  // ...****........
-     0x000003C0,  // .....****......
-     0x000000F0,  // .......****....
-     0x0000003C,  // .........****..
-     0x0000000E,  // ...........***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 61
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 62
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003800,  // .***...........
-     0x00001E00,  // ..****.........
-     0x00000780,  // ....****.......
-     0x000001E0,  // ......****.....
-     0x00000078,  // ........****...
-     0x0000001E,  // ..........****.
-     0x0000001E,  // ..........****.
-     0x00000078,  // ........****...
-     0x000001E0,  // ......****.....
-     0x00000780,  // ....****.......
-     0x00001E00,  // ..****.........
-     0x00003800,  // .***...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 63
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x000000F0,  // .......****....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 64
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x000018F0,  // ..**...****....
-     0x000019F0,  // ..**..*****....
-     0x00001BB0,  // ..**.***.**....
-     0x00001B30,  // ..**.**..**....
-     0x00001B30,  // ..**.**..**....
-     0x00001BB0,  // ..**.***.**....
-     0x000019F8,  // ..**..******...
-     0x000018F8,  // ..**...*****...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 65
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 68
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 69
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C66,  // ...**...**..**.
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 71
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 73
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 74
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 75
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 77
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 78
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 79
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000386,  // .....***....**.
-     0x00000FFE,  // ...***********.
-     0x00000E78,  // ...***..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 83
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 85
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 86
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001E78,  // ..****..****...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 88
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 91
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-  },
-  {             // 92
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 93
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-  },
-  {             // 94
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 95
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFF,  // ***************
-     0x00007FFF,  // ***************
-     0x00000000,  // ...............
-  },
-  {             // 96
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 97
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 98
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00003FFC,  // .************..
-     0x00003DF0,  // .****.*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 99
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 100
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 101
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 102
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000FC,  // .......******..
-     0x000001FC,  // ......*******..
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 103
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 104
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 105
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 106
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 107
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C78,  // ...**...****...
-     0x00000C78,  // ...**...****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003C7E,  // .****...******.
-     0x00003C7E,  // .****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 108
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 109
-     16, 26,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000EF78,  // ***.****.****...
-     0x0000FFFC,  // **************..
-     0x000039CC,  // ..***..***..**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000F9EF,  // *****..****.****
-     0x0000F9EF,  // *****..****.****
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 111
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 112
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 113
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000000FE,  // .......*******.
-     0x000000FE,  // .......*******.
-  },
-  {             // 114
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 115
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 116
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 117
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 118
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 119
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00001998,  // ..**..**..**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001E78,  // ..****..****...
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 121
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 122
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 123
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-  },
-  {             // 124
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 125
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-  },
-  {             // 126
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F0C,  // ...****....**..
-     0x00001F9C,  // ..******..***..
-     0x000039F8,  // .***..******...
-     0x000030F0,  // .**....****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 127
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 161
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-  },
-  {             // 162
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 163
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x000006C0,  // ....**.**......
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000F00,  // ...****........
-     0x00001E00,  // ..****.........
-     0x00003E00,  // .*****.........
-     0x0000360C,  // .**.**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 164
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 165
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000018C0,  // ..**...**......
-     0x00000D80,  // ...**.**.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 166
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F8,  // .....*******...
-     0x000007F8,  // ....********...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000E00,  // ...***.........
-     0x00001F80,  // ..******.......
-     0x000033E0,  // .**..*****.....
-     0x000030F8,  // .**....*****...
-     0x00003C3C,  // .****....****..
-     0x00001F0C,  // ..*****....**..
-     0x000007CC,  // ....*****..**..
-     0x000001FC,  // ......*******..
-     0x00000078,  // ........****...
-     0x00000030,  // .........**....
-     0x00001830,  // ..**.....**....
-     0x00001870,  // ..**....***....
-     0x00001FE0,  // ..********.....
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 168
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001E00,  // ..****.........
-     0x00000FC0,  // ...******......
-     0x000001F8,  // ......******...
-     0x0000003C,  // .........****..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 171
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 172
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 173
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 174
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 176
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 177
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-  },
-  {             // 178
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x000001B0,  // ......**.**....
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-  },
-  {             // 179
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001B0,  // ......**.**....
-     0x000001F0,  // ......*****....
-     0x000001E0,  // ......****.....
-     0x000003C0,  // .....****......
-     0x00000780,  // ....****.......
-     0x00000F80,  // ...*****.......
-     0x00000D80,  // ...**.**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 180
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     15, 26,
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 182
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 183
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 184
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 185
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 186
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 187
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003180,  // .**...**.......
-     0x00001B00,  // ..**.**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 188
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000660,  // ....**..**.....
-     0x00000CC0,  // ...**..**......
-     0x00001980,  // ..**..**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 192
-     15, 26,
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 26,
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000FC0,  // ...******......
-     0x00001CE0,  // ..***..***.....
-     0x00003870,  // .***....***....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 26,
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 199
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001804,  // ..**........*..
-     0x00001C0C,  // ..***......**..
-     0x00000FF8,  // ...*********...
-     0x000003F0,  // .....******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 200
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x000001B0,  // ......**.**....
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 206
-     15, 26,
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00007F06,  // *******.....**.
-     0x00007F06,  // *******.....**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 26,
-     0x00000000,  // ...............
-     0x000000CC,  // .......**..**..
-     0x00000198,  // ......**..**...
-     0x00000330,  // .....**..**....
-     0x00000660,  // ....**..**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001008,  // ..*........*...
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00001008,  // ..*........*...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     15, 26,
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x00000360,  // .....**.**.....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 218
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 219
-     15, 26,
-     0x00000000,  // ...............
-     0x000000CC,  // .......**..**..
-     0x00000198,  // ......**..**...
-     0x00000330,  // .....**..**....
-     0x00000660,  // ....**..**.....
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 220
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 221
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 223
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C70,  // ...**...***....
-     0x00000DE0,  // ...**.****.....
-     0x00000DF0,  // ...**.*****....
-     0x00000C38,  // ...**....***...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000CDC,  // ...**..**.***..
-     0x00003EF8,  // .*****.*****...
-     0x00003E70,  // .*****..***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 224
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 225
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 226
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 227
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 228
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 229
-     15, 26,
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 230
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 231
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x00003818,  // .***......**...
-     0x00003018,  // .**.......**...
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x000007F0,  // ....*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 232
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 233
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 234
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x000001B0,  // ......**.**....
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-  },
-  {             // 235
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 236
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 237
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 238
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     15, 26,
-     0x00000000,  // ...............
-     0x0000018C,  // ......**...**..
-     0x000000D8,  // .......**.**...
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 240
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x000003FF,  // .....**********
-     0x000003FF,  // .....**********
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 241
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 242
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 243
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 244
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 245
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000198,  // ......**..**...
-     0x00000330,  // .....**..**....
-     0x00000660,  // ....**..**.....
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 246
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 247
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFC,  // *************..
-     0x00007FFC,  // *************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 248
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 249
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 250
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 251
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000198,  // ......**..**...
-     0x00000330,  // .....**..**....
-     0x00000660,  // ....**..**.....
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 252
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 253
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 254
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 255
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  };
diff --git a/fontfix-iso8859-5.c b/fontfix-iso8859-5.c
deleted file mode 100644
index b9939c951..000000000
--- a/fontfix-iso8859-5.c
+++ /dev/null
@@ -1,6050 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_5[][26] = {
-  {             // 32
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 33
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 34
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E70,  // ...***..***....
-     0x00000E70,  // ...***..***....
-     0x00000E70,  // ...***..***....
-     0x00000E70,  // ...***..***....
-     0x00000C60,  // ...**...**.....
-     0x00000840,  // ...*....*......
-     0x00000840,  // ...*....*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 35
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 36
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000FC0,  // ...******......
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FF0,  // ..*********....
-     0x00001BE0,  // ..**.*****.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 37
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000780,  // ....****.......
-     0x00000CC0,  // ...**..**......
-     0x00000840,  // ...*....*......
-     0x00000840,  // ...*....*......
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000038,  // .........***...
-     0x000001E0,  // ......****.....
-     0x00000700,  // ....***........
-     0x00001CF0,  // ..***..****....
-     0x00000198,  // ......**..**...
-     0x00000108,  // ......*....*...
-     0x00000108,  // ......*....*...
-     0x00000198,  // ......**..**...
-     0x000000F0,  // .......****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 38
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000700,  // ....***........
-     0x00000F98,  // ...*****..**...
-     0x00000DF8,  // ...**.******...
-     0x000018F0,  // ..**...****....
-     0x00001860,  // ..**....**.....
-     0x000018F0,  // ..**...****....
-     0x00001FFC,  // ..***********..
-     0x00000F9C,  // ...*****..***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000100,  // ......*........
-     0x00000100,  // ......*........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 40
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000070,  // ........***....
-     0x00000030,  // .........**....
-     0x00000000,  // ...............
-  },
-  {             // 41
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00000000,  // ...............
-  },
-  {             // 42
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001998,  // ..**..**..**...
-     0x00001DB8,  // ..***.**.***...
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 43
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 44
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 45
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 46
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 47
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 48
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000C30,  // ...**....**....
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 49
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 50
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00001C00,  // ..***..........
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 51
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000003E0,  // .....*****.....
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001FF0,  // ..*********....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 52
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000003F8,  // .....*******...
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 53
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DE0,  // ...**.****.....
-     0x00000FF8,  // ...*********...
-     0x00000E38,  // ...***...***...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000181C,  // ..**......***..
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 54
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000007C,  // ........*****..
-     0x000001FC,  // ......*******..
-     0x000003C0,  // .....****......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000CF0,  // ...**..****....
-     0x00000DF8,  // ...**.******...
-     0x00000F1C,  // ...****...***..
-     0x00000E0C,  // ...***.....**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000E0C,  // ...***.....**..
-     0x0000071C,  // ....***...***..
-     0x000007F8,  // ....********...
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 55
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 56
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 57
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000007F8,  // ....********...
-     0x00000618,  // ....**....**...
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E3C,  // ...***...****..
-     0x000007EC,  // ....******.**..
-     0x000003CC,  // .....****..**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 58
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 59
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000800,  // ...*...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 60
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000E,  // ...........***.
-     0x0000003C,  // .........****..
-     0x000000F0,  // .......****....
-     0x000003C0,  // .....****......
-     0x00000F00,  // ...****........
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000F00,  // ...****........
-     0x000003C0,  // .....****......
-     0x000000F0,  // .......****....
-     0x0000003C,  // .........****..
-     0x0000000E,  // ...........***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 61
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 62
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003800,  // .***...........
-     0x00001E00,  // ..****.........
-     0x00000780,  // ....****.......
-     0x000001E0,  // ......****.....
-     0x00000078,  // ........****...
-     0x0000001E,  // ..........****.
-     0x0000001E,  // ..........****.
-     0x00000078,  // ........****...
-     0x000001E0,  // ......****.....
-     0x00000780,  // ....****.......
-     0x00001E00,  // ..****.........
-     0x00003800,  // .***...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 63
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x000000F0,  // .......****....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 64
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x000018F0,  // ..**...****....
-     0x000019F0,  // ..**..*****....
-     0x00001BB0,  // ..**.***.**....
-     0x00001B30,  // ..**.**..**....
-     0x00001B30,  // ..**.**..**....
-     0x00001BB0,  // ..**.***.**....
-     0x000019F8,  // ..**..******...
-     0x000018F8,  // ..**...*****...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 65
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001FC0,  // ..*******......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 68
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 69
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C66,  // ...**...**..**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 71
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 73
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 74
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 75
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 77
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 78
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 79
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000786,  // ....****....**.
-     0x00000FFE,  // ...***********.
-     0x00000E78,  // ...***..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 83
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 85
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 86
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001E78,  // ..****..****...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 88
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 91
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-  },
-  {             // 92
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 93
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-  },
-  {             // 94
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 95
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFF,  // ***************
-     0x00007FFF,  // ***************
-     0x00000000,  // ...............
-  },
-  {             // 96
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 97
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 98
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF8,  // ..**********...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00007FF8,  // ************...
-     0x00007BE0,  // ****.*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 99
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C0E,  // ..***......***.
-     0x00001FFE,  // ..************.
-     0x000007F8,  // ....********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 100
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 101
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 102
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000FC,  // .......******..
-     0x000001FC,  // ......*******..
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 103
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 104
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 105
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 106
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 107
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C78,  // ...**...****...
-     0x00000C78,  // ...**...****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003C7E,  // .****...******.
-     0x00003C7E,  // .****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 108
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 109
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000EF78,  // ***.****.****...
-     0x0000FFFC,  // **************..
-     0x000039CC,  // ..***..***..**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000F9EF,  // *****..****.****
-     0x0000F9EF,  // *****..****.****
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 111
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 112
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 113
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000000FE,  // .......*******.
-     0x000000FE,  // .......*******.
-  },
-  {             // 114
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 115
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 116
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 117
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 118
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 119
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00001998,  // ..**..**..**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001E78,  // ..****..****...
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 121
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 122
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 123
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-  },
-  {             // 124
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 125
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-  },
-  {             // 126
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F0C,  // ...****....**..
-     0x00001F9C,  // ..******..***..
-     0x000039F8,  // .***..******...
-     0x000030F0,  // .**....****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 127
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 161
-     15, 24,
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C66,  // ...**...**..**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 162
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 163
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 164
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 165
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 166
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     15, 24,
-     0x00000000,  // ...............
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 168
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 170
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 171
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 172
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 173
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 174
-     15, 24,
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 176
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001FC0,  // ..*******......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 177
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C00,  // ...**..........
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 178
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 179
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 180
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00006006,  // **..........**.
-     0x00006006,  // **..........**.
-     0x00006006,  // **..........**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C66,  // ...**...**..**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 182
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000F3CF,  // ****..****..****
-     0x0000F3CF,  // ****..****..****
-     0x0000318C,  // ..**...**...**..
-     0x0000399C,  // ..***..**..***..
-     0x00001998,  // ...**..**..**...
-     0x00000DB0,  // ....**.**.**....
-     0x00000FF0,  // ....********....
-     0x00000FF0,  // ....********....
-     0x00001BD8,  // ...**.****.**...
-     0x00001998,  // ...**..**..**...
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000E3C7,  // ***...****...***
-     0x0000E3C7,  // ***...****...***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 183
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001BF0,  // ..**.******....
-     0x00001FF8,  // ..**********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000001C,  // ..........***..
-     0x000001F8,  // ......******...
-     0x000001FC,  // ......*******..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 184
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E1E,  // .*****....****.
-     0x00003E1E,  // .*****....****.
-     0x0000183C,  // ..**.....****..
-     0x0000183C,  // ..**.....****..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001E0C,  // ..****.....**..
-     0x00003E3E,  // .*****...*****.
-     0x00003C3E,  // .****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 185
-     15, 24,
-     0x00000630,  // ....**...**....
-     0x000003E0,  // .....*****.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E1E,  // .*****....****.
-     0x00003E1E,  // .*****....****.
-     0x0000183C,  // ..**.....****..
-     0x0000183C,  // ..**.....****..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001E0C,  // ..****.....**..
-     0x00003E3E,  // .*****...*****.
-     0x00003C3E,  // .****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 186
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 187
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFF,  // ..*************
-     0x00001FFF,  // ..*************
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00006C0C,  // **.**......**..
-     0x00007C3F,  // *****....******
-     0x0000383F,  // .***.....******
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 188
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 192
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000007F8,  // ....********...
-     0x00001FFE,  // ..************.
-     0x00001CCE,  // ..***..**..***.
-     0x000038C7,  // .***...**...***
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000038C7,  // .***...**...***
-     0x00001CCE,  // ..***..**..***.
-     0x00001FFE,  // ..************.
-     0x000007F8,  // ....********...
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 199
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FFC,  // ...**********..
-     0x000007EC,  // ....******.**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000003E,  // .........*****.
-     0x0000003E,  // .........*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 200
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BDE,  // ****.****.****.
-     0x00007BDE,  // ****.****.****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BDE,  // ****.****.****.
-     0x00007BDE,  // ****.****.****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007F80,  // ********.......
-     0x00007F80,  // ********.......
-     0x00006600,  // **..**.........
-     0x00006600,  // **..**.........
-     0x00006600,  // **..**.........
-     0x00000600,  // ....**.........
-     0x000007FC,  // ....*********..
-     0x000007FE,  // ....**********.
-     0x00000607,  // ....**......***
-     0x00000603,  // ....**.......**
-     0x00000603,  // ....**.......**
-     0x00000603,  // ....**.......**
-     0x00000607,  // ....**......***
-     0x00001FFE,  // ..************.
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C1F,  // *****.....*****
-     0x00007C1F,  // *****.....*****
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003F86,  // .*******....**.
-     0x00003FC6,  // .********...**.
-     0x000030E6,  // .**....***..**.
-     0x00003066,  // .**.....**..**.
-     0x00003066,  // .**.....**..**.
-     0x00003066,  // .**.....**..**.
-     0x000030E6,  // .**....***..**.
-     0x00007FDF,  // *********.*****
-     0x00007F9F,  // ********..*****
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003F00,  // .******........
-     0x00003F00,  // .******........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000037E0,  // .**.******.....
-     0x00003FF8,  // .***********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300E,  // .**........***.
-     0x00000006,  // ............**.
-     0x000001FE,  // ......********.
-     0x000001FE,  // ......********.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x0000000E,  // ...........***.
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 206
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C78,  // *****...****...
-     0x00007CFC,  // *****..******..
-     0x000031CE,  // .**...***..***.
-     0x00003186,  // .**...**....**.
-     0x00003387,  // .**..***....***
-     0x00003303,  // .**..**......**
-     0x00003F03,  // .******......**
-     0x00003F03,  // .******......**
-     0x00003303,  // .**..**......**
-     0x00003303,  // .**..**......**
-     0x00003387,  // .**..***....***
-     0x00003186,  // .**...**....**.
-     0x000031CE,  // .**...***..***.
-     0x00007CFC,  // *****..******..
-     0x00007C78,  // *****...****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003FE,  // .....*********.
-     0x00000FFE,  // ...***********.
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C18,  // ..***.....**...
-     0x00000FF8,  // ...*********...
-     0x000003F8,  // .....*******...
-     0x00000718,  // ....***...**...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00001C18,  // ..***.....**...
-     0x0000787E,  // ****....******.
-     0x0000787E,  // ****....******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x000003FC,  // .....********..
-     0x00000FF0,  // ...********....
-     0x00001C00,  // ..***..........
-     0x00001800,  // ..**...........
-     0x000037E0,  // .**.******.....
-     0x00003FF8,  // .***********...
-     0x00003C38,  // .****....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FF0,  // ...********....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00003FF8,  // .***********...
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00001FC0,  // ..*******......
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000F3CF,  // ****..****..****
-     0x0000F3CF,  // ****..****..****
-     0x0000399C,  // ..***..**..***..
-     0x00001DB8,  // ...***.**.***...
-     0x00000FF0,  // ....********....
-     0x00000FF0,  // ....********....
-     0x00001BD8,  // ...**.****.**...
-     0x00001998,  // ...**..**..**...
-     0x0000318C,  // ..**...**...**..
-     0x0000F3CF,  // ****..****..****
-     0x0000E3C7,  // ***...****...***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 215
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000037F0,  // .**.*******....
-     0x00003FF8,  // .***********...
-     0x00003818,  // .***......**...
-     0x00003018,  // .**.......**...
-     0x000003F0,  // .....******....
-     0x000003F8,  // .....*******...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E3E,  // ******...*****.
-     0x00007E7E,  // ******..******.
-     0x00001878,  // ..**....****...
-     0x000018D8,  // ..**...**.**...
-     0x000018D8,  // ..**...**.**...
-     0x00001998,  // ..**..**..**...
-     0x00001B98,  // ..**.***..**...
-     0x00001B18,  // ..**.**...**...
-     0x00001E18,  // ..****....**...
-     0x00007E7E,  // ******..******.
-     0x00007C7E,  // *****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00007E3E,  // ******...*****.
-     0x00007E7E,  // ******..******.
-     0x00001878,  // ..**....****...
-     0x000018D8,  // ..**...**.**...
-     0x000018D8,  // ..**...**.**...
-     0x00001998,  // ..**..**..**...
-     0x00001B98,  // ..**.***..**...
-     0x00001B18,  // ..**.**...**...
-     0x00001E18,  // ..****....**...
-     0x00007E7E,  // ******..******.
-     0x00007C7E,  // *****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 218
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E78,  // .*****..****...
-     0x00003E78,  // .*****..****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003E7E,  // .*****..******.
-     0x00003E7E,  // .*****..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 219
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00000618,  // ....**....**...
-     0x00006C18,  // **.**.....**...
-     0x00007C7E,  // *****...******.
-     0x0000387E,  // .***....******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 220
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 221
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 224
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 225
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C0E,  // ..***......***.
-     0x00001FFE,  // ..************.
-     0x000007F8,  // ....********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 226
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007E0,  // ....******.....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 227
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 228
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000EDC,  // ...***.**.***..
-     0x00001FFE,  // ..************.
-     0x000039E7,  // .***..****..***
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000039E7,  // .***..****..***
-     0x00001FFE,  // ..************.
-     0x00000EDC,  // ...***.**.***..
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000003F0,  // .....******....
-     0x000003F0,  // .....******....
-  },
-  {             // 229
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 230
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007FFE,  // **************.
-     0x00007FFE,  // **************.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 231
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000007E,  // ........******.
-     0x0000007E,  // ........******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 232
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000FBDF,  // *****.****.*****
-     0x0000FBDF,  // *****.****.*****
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000FFFF,  // ****************
-     0x0000FFFF,  // ****************
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 233
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000FBDF,  // *****.****.*****
-     0x0000FBDF,  // *****.****.*****
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000FFFF,  // ****************
-     0x0000FFFF,  // ****************
-     0x00000003,  // ..............**
-     0x00000003,  // ..............**
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 234
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007F80,  // ********.......
-     0x00007F80,  // ********.......
-     0x00006600,  // **..**.........
-     0x00006600,  // **..**.........
-     0x000007F8,  // ....********...
-     0x000007FC,  // ....*********..
-     0x0000060E,  // ....**.....***.
-     0x00000606,  // ....**......**.
-     0x0000060E,  // ....**.....***.
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 235
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C1F,  // *****.....*****
-     0x00007C1F,  // *****.....*****
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003F86,  // .*******....**.
-     0x00003FC6,  // .********...**.
-     0x000030E6,  // .**....***..**.
-     0x00003066,  // .**.....**..**.
-     0x000030E6,  // .**....***..**.
-     0x00007FDF,  // *********.*****
-     0x00007F9F,  // ********..*****
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 236
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003F00,  // .******........
-     0x00003F00,  // .******........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000FF0,  // ...********....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00003FF8,  // .***********...
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 237
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001BF0,  // ..**.******....
-     0x00001FFC,  // ..***********..
-     0x00001E1C,  // ..****....***..
-     0x00001C0E,  // ..***......***.
-     0x000018FE,  // ..**...*******.
-     0x000000FE,  // .......*******.
-     0x00000006,  // ............**.
-     0x0000000E,  // ...........***.
-     0x0000381C,  // .***......***..
-     0x00003FFC,  // .************..
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 238
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000078F8,  // ****...*****...
-     0x000079FC,  // ****..*******..
-     0x0000338E,  // .**..***...***.
-     0x00003306,  // .**..**.....**.
-     0x00003F06,  // .******.....**.
-     0x00003F06,  // .******.....**.
-     0x00003306,  // .**..**.....**.
-     0x00003306,  // .**..**.....**.
-     0x0000338E,  // .**..***...***.
-     0x000079FC,  // ****..*******..
-     0x000078F8,  // ****...*****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003830,  // .***.....**....
-     0x00001FF0,  // ..*********....
-     0x00000FF0,  // ...********....
-     0x00000E30,  // ...***...**....
-     0x00001C30,  // ..***....**....
-     0x000078FC,  // ****...******..
-     0x000078FC,  // ****...******..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 240
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000F0F0,  // ****....****....
-     0x0000F0F0,  // ****....****....
-     0x0000786E,  // .****....**.***.
-     0x0000787F,  // .****....*******
-     0x00006C7B,  // .**.**...****.**
-     0x00006C7F,  // .**.**...*******
-     0x0000666E,  // .**..**..**.***.
-     0x00006660,  // .**..**..**.....
-     0x0000637F,  // .**...**.*******
-     0x0000637F,  // .**...**.*******
-     0x000061E0,  // .**....****.....
-     0x000061E0,  // .**....****.....
-     0x000060E0,  // .**.....***.....
-     0x0000F0E0,  // ****....***.....
-     0x0000F060,  // ****.....**.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 241
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 242
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 243
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 244
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x00003F8C,  // .*******...**..
-     0x00003F80,  // .*******.......
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C0E,  // ..***......***.
-     0x00001FFE,  // ..************.
-     0x000007F8,  // ....********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 245
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 246
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 247
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 248
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 249
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 250
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 251
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 252
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 253
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F8,  // .....*******...
-     0x000007F8,  // ....********...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000E00,  // ...***.........
-     0x00001F80,  // ..******.......
-     0x000033E0,  // .**..*****.....
-     0x000030F8,  // .**....*****...
-     0x00003C3C,  // .****....****..
-     0x00001F0C,  // ..*****....**..
-     0x000007CC,  // ....*****..**..
-     0x000001FC,  // ......*******..
-     0x00000078,  // ........****...
-     0x00000030,  // .........**....
-     0x00001830,  // ..**.....**....
-     0x00001870,  // ..**....***....
-     0x00001FE0,  // ..********.....
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 254
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 255
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  };
diff --git a/fontfix-iso8859-7.c b/fontfix-iso8859-7.c
deleted file mode 100644
index 3ef21c222..000000000
--- a/fontfix-iso8859-7.c
+++ /dev/null
@@ -1,6050 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_7[][26] = {
-  {             // 32
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 33
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000064,  // .**..*..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000184,  // ....**....*..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00000108,  // ....*....*...
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000210,  // ...*....*....
-     0x00000210,  // ...*....*....
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000630,  // ..**...**....
-     0x00000420,  // ..*....*.....
-     0x00000420,  // ..*....*.....
-     0x00000C60,  // .**...**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 24,
-     0x00000000,  // .............
-     0x00000040,  // ......*......
-     0x000000E0,  // .....***.....
-     0x000003F8,  // ...*******...
-     0x0000065C,  // ..**..*.***..
-     0x00000C4E,  // .**...*..***.
-     0x00000C40,  // .**...*......
-     0x00000C40,  // .**...*......
-     0x00000E40,  // .***..*......
-     0x000007C0,  // ..*****......
-     0x000003F0,  // ...******....
-     0x0000007C,  // ......*****..
-     0x0000004E,  // ......*..***.
-     0x00000046,  // ......*...**.
-     0x00000C46,  // .**...*...**.
-     0x00000C46,  // .**...*...**.
-     0x00000E4E,  // .***..*..***.
-     0x0000075C,  // ..***.*.***..
-     0x000003F8,  // ...*******...
-     0x00000040,  // ......*......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     20, 24,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0001C020,  // ...***........*.....
-     0x00036060,  // ..**.**......**.....
-     0x00063040,  // .**...**.....*......
-     0x000630C0,  // .**...**....**......
-     0x00063080,  // .**...**....*.......
-     0x00063180,  // .**...**...**.......
-     0x00073100,  // .***..**...*........
-     0x0003E300,  // ..*****...**........
-     0x00000238,  // ..........*...***...
-     0x0000067C,  // .........**..*****..
-     0x00000CC6,  // ........**..**...**.
-     0x000008C6,  // ........*...**...**.
-     0x000018C6,  // .......**...**...**.
-     0x000010C6,  // .......*....**...**.
-     0x000030C6,  // ......**....**...**.
-     0x00002064,  // ......*......**..*..
-     0x0000607C,  // .....**......*****..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 38
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000FC0,  // ...******......
-     0x000018C0,  // ..**...**......
-     0x000038EC,  // .***...***.**..
-     0x0000307C,  // .**.....*****..
-     0x00003038,  // .**......***...
-     0x0000303C,  // .**......****..
-     0x0000187C,  // ..**....*****..
-     0x00001FE6,  // ..********..**.
-     0x000007C0,  // ....*****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     4, 24,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 40
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x00000008,  // ....*...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000020,  // ..*.....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000004,  // .....*..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000008,  // ....*...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-  },
-  {             // 42
-     9, 24,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x0000007E,  // ..******.
-     0x0000007E,  // ..******.
-     0x0000003C,  // ...****..
-     0x00000026,  // ...*..**.
-     0x00000024,  // ...*..*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 44
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 45
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 46
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000060C,  // ..**.....**..
-     0x0000061C,  // ..**....***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000070,  // ......***....
-     0x000001F0,  // ....*****....
-     0x000003B0,  // ...***.**....
-     0x00000230,  // ...*...**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000380,  // ...***.......
-     0x00000600,  // ..**.........
-     0x00000400,  // ..*..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000063C,  // ..**...****..
-     0x0000061C,  // ..**....***..
-     0x0000001C,  // ........***..
-     0x0000001C,  // ........***..
-     0x00000038,  // .......***...
-     0x000000F0,  // .....****....
-     0x0000007C,  // ......*****..
-     0x0000000C,  // .........**..
-     0x0000000E,  // .........***.
-     0x0000000E,  // .........***.
-     0x0000040E,  // ..*......***.
-     0x0000060E,  // ..**.....***.
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x000001D8,  // ....***.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003FC,  // ...********..
-     0x000003FC,  // ...********..
-     0x00000300,  // ...**........
-     0x00000200,  // ...*.........
-     0x00000600,  // ..**.........
-     0x000006F0,  // ..**.****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000E0E,  // .***.....***.
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070C,  // ..***....**..
-     0x00000606,  // ..**......**.
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000CF0,  // .**..****....
-     0x00000DFC,  // .**.*******..
-     0x00000E0C,  // .***.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060E,  // ..**.....***.
-     0x0000070C,  // ..***....**..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000030C,  // ...**....**..
-     0x000001F8,  // ....******...
-     0x000003FC,  // ...********..
-     0x0000070C,  // ..***....**..
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000030C,  // ...**....**..
-     0x000003FC,  // ...********..
-     0x000000F0,  // .....****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000E0C,  // .***.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x00000E0E,  // .***.....***.
-     0x0000071E,  // ..***...****.
-     0x000003F6,  // ...******.**.
-     0x000001E6,  // ....****..**.
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001E0,  // ....****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000006,  // ..........**.
-     0x0000003E,  // .......*****.
-     0x000000F8,  // .....*****...
-     0x000003C0,  // ...****......
-     0x00000F00,  // .****........
-     0x00000F00,  // .****........
-     0x000003C0,  // ...****......
-     0x000000F0,  // .....****....
-     0x0000003E,  // .......*****.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 61
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 62
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000F80,  // .*****.......
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000001E,  // ........****.
-     0x0000000E,  // .........***.
-     0x0000007C,  // ......*****..
-     0x000001E0,  // ....****.....
-     0x00000F80,  // .*****.......
-     0x00000E00,  // .***.........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003FC,  // ...********..
-     0x0000030E,  // ...**....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x0000000E,  // .........***.
-     0x0000001C,  // ........***..
-     0x00000038,  // .......***...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     23, 24,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00003F80,  // .........*******.......
-     0x0001FFE0,  // ......************.....
-     0x0003C070,  // .....****.......***....
-     0x00070018,  // ....***...........**...
-     0x000E000C,  // ...***.............**..
-     0x000C3CCC,  // ...**....****..**..**..
-     0x0018E6C6,  // ..**...***..**.**...**.
-     0x0018C386,  // ..**...**....***....**.
-     0x00318186,  // .**...**......**....**.
-     0x00330186,  // .**..**.......**....**.
-     0x00330186,  // .**..**.......**....**.
-     0x00330384,  // .**..**......***....*..
-     0x0033030C,  // .**..**......**....**..
-     0x00330718,  // .**..**.....***...**...
-     0x00318F38,  // .**...**...****..***...
-     0x0019FFF0,  // ..**..*************....
-     0x001873C7,  // ..**....***..****...***
-     0x000C0006,  // ...**...............**.
-     0x000F001C,  // ...****...........***..
-     0x0003C078,  // .....****.......****...
-     0x0001FFE0,  // ......************.....
-     0x00003F80,  // .........*******.......
-  },
-  {             // 65
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000680,  // ......**.*.......
-     0x000006C0,  // ......**.**......
-     0x00000CC0,  // .....**..**......
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00001870,  // ....**....***....
-     0x00001830,  // ....**.....**....
-     0x00003FF0,  // ...**********....
-     0x00003FF8,  // ...***********...
-     0x00003018,  // ...**.......**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000C00E,  // .**..........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 66
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180E,  // ..**.......***.
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x000003E0,  // ......*****.....
-     0x00000FF8,  // ....*********...
-     0x00001C1C,  // ...***.....***..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x00006000,  // .**.............
-     0x00006000,  // .**.............
-     0x00006000,  // .**.............
-     0x00006000,  // .**.............
-     0x00006000,  // .**.............
-     0x00006000,  // .**.............
-     0x0000700C,  // .***........**..
-     0x0000300C,  // ..**........**..
-     0x0000380C,  // ..***.......**..
-     0x00001C18,  // ...***.....**...
-     0x00000FF0,  // ....********....
-     0x000007E0,  // .....******.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 68
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FF0,  // ..**********....
-     0x00003FF8,  // ..***********...
-     0x0000301C,  // ..**.......***..
-     0x0000300E,  // ..**........***.
-     0x00003006,  // ..**.........**.
-     0x00003007,  // ..**.........***
-     0x00003003,  // ..**..........**
-     0x00003003,  // ..**..........**
-     0x00003003,  // ..**..........**
-     0x00003003,  // ..**..........**
-     0x00003007,  // ..**.........***
-     0x00003006,  // ..**.........**.
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003FF8,  // ..***********...
-     0x00003FE0,  // ..*********.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 69
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FF0,  // ..*********....
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FF8,  // ..*********...
-     0x00000FF8,  // ..*********...
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FE0,  // ......*******.....
-     0x00003FF8,  // ....***********...
-     0x00007838,  // ...****.....***...
-     0x0000E00C,  // ..***.........**..
-     0x0000C00E,  // ..**..........***.
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x0001807E,  // .**........******.
-     0x0001C07E,  // .***.......******.
-     0x0000C006,  // ..**...........**.
-     0x0000E006,  // ..***..........**.
-     0x0000701E,  // ...***.......****.
-     0x00003FF8,  // ....***********...
-     0x000007E0,  // .......******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003FFE,  // ..*************.
-     0x00003FFE,  // ..*************.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 73
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 75
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C60,  // ..***...**.....
-     0x00001870,  // ..**....***....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180E,  // ..**.......***.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000700E,  // ..***........***.
-     0x0000780E,  // ..****.......***.
-     0x0000781E,  // ..****......****.
-     0x00007C1E,  // ..*****.....****.
-     0x00006C36,  // ..**.**....**.**.
-     0x00006E36,  // ..**.***...**.**.
-     0x00006666,  // ..**..**..**..**.
-     0x00006666,  // ..**..**..**..**.
-     0x000063C6,  // ..**...****...**.
-     0x000063C6,  // ..**...****...**.
-     0x00006186,  // ..**....**....**.
-     0x00006186,  // ..**....**....**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 78
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003006,  // ..**.........**.
-     0x00003806,  // ..***........**.
-     0x00003C06,  // ..****.......**.
-     0x00003E06,  // ..*****......**.
-     0x00003606,  // ..**.**......**.
-     0x00003706,  // ..**.***.....**.
-     0x00003386,  // ..**..***....**.
-     0x00003186,  // ..**...**....**.
-     0x000030C6,  // ..**....**...**.
-     0x000030E6,  // ..**....***..**.
-     0x00003066,  // ..**.....**..**.
-     0x00003036,  // ..**......**.**.
-     0x0000303E,  // ..**......*****.
-     0x0000301E,  // ..**.......****.
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 79
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x0001800E,  // .**...........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0001800E,  // .**...........***.
-     0x0001800E,  // .**...........***.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FFE,  // ..************.
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x00001803,  // ..**.........**
-     0x00001807,  // ..**........***
-     0x0000180F,  // ..**.......****
-     0x00001FFE,  // ..************.
-     0x00001FF8,  // ..**********...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001800E,  // .**...........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0001800E,  // .**...........***.
-     0x0000C18C,  // ..**.....**...**..
-     0x0000E1DC,  // ..***....***.***..
-     0x00007078,  // ...***.....****...
-     0x00003FF8,  // ....***********...
-     0x00000FCE,  // ......******..***.
-     0x00000004,  // ...............*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FF8,  // ..***********...
-     0x00003FFC,  // ..************..
-     0x0000300E,  // ..**........***.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x0000300E,  // ..**........***.
-     0x00003FFC,  // ..************..
-     0x00003FF0,  // ..**********....
-     0x00003060,  // ..**.....**.....
-     0x00003070,  // ..**.....***....
-     0x00003030,  // ..**......**....
-     0x00003038,  // ..**......***...
-     0x00003018,  // ..**.......**...
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x00003006,  // ..**.........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 83
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FFC,  // ...**********..
-     0x00000C1C,  // ...**.....***..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001800,  // ..**...........
-     0x00001E00,  // ..****.........
-     0x00000FE0,  // ...*******.....
-     0x000003F8,  // .....*******...
-     0x0000003C,  // .........****..
-     0x00000006,  // ............**.
-     0x00001806,  // ..**........**.
-     0x00001802,  // ..**.........*.
-     0x00001C06,  // ..***.......**.
-     0x00000E0C,  // ...***.....**..
-     0x000007FC,  // ....*********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x0000380E,  // ..***.......***.
-     0x00001C1C,  // ...***.....***..
-     0x00000FF8,  // ....*********...
-     0x000007F0,  // .....*******....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 86
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007003,  // ***..........**
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380C,  // .***.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000C10,  // ...**.....*....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x00000360,  // .....**.**.....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     22, 24,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00381C06,  // ***......***.......**.
-     0x00181C0E,  // .**......***......***.
-     0x00181E0C,  // .**......****.....**..
-     0x0018360C,  // .**.....**.**.....**..
-     0x001C360C,  // .***....**.**.....**..
-     0x000C331C,  // ..**....**..**...***..
-     0x000C2318,  // ..**....*...**...**...
-     0x000C6318,  // ..**...**...**...**...
-     0x00046318,  // ...*...**...**...**...
-     0x000661B0,  // ...**..**....**.**....
-     0x0006C1B0,  // ...**.**.....**.**....
-     0x0006C1B0,  // ...**.**.....**.**....
-     0x0002C0B0,  // ....*.**......*.**....
-     0x000380A0,  // ....***.......*.*.....
-     0x000380E0,  // ....***.......***.....
-     0x000380E0,  // ....***.......***.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x00001C0C,  // ..***......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E38,  // ...***...***...
-     0x00000730,  // ....***..**....
-     0x00000360,  // .....**.**.....
-     0x000003E0,  // .....*****.....
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000360,  // .....**.**.....
-     0x00000770,  // ....***.***....
-     0x00000E38,  // ...***...***...
-     0x00000C18,  // ...**.....**...
-     0x00001C1C,  // ..***.....***..
-     0x0000380E,  // .***.......***.
-     0x00007007,  // ***.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007006,  // .***.........**.
-     0x0000300C,  // ..**........**..
-     0x0000381C,  // ..***......***..
-     0x00001C18,  // ...***.....**...
-     0x00000C30,  // ....**....**....
-     0x00000670,  // .....**..***....
-     0x00000760,  // .....***.**.....
-     0x000003C0,  // ......****......
-     0x000001C0,  // .......***......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 90
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00001800,  // .**...........
-     0x00003FFE,  // *************.
-     0x00003FFE,  // *************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001E,  // ..****.
-     0x0000001E,  // ..****.
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000001E,  // ..****.
-     0x0000001E,  // ..****.
-     0x00000000,  // .......
-  },
-  {             // 92
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000008,  // ...*...
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000000,  // ......
-  },
-  {             // 94
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x00000070,  // ....***....
-     0x000000F0,  // ...****....
-     0x000000D8,  // ...**.**...
-     0x00000198,  // ..**..**...
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x0000030C,  // .**....**..
-     0x00000306,  // .**.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFF,  // .*************
-     0x00000000,  // ..............
-  },
-  {             // 96
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 97
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x00000E0C,  // .***.....**..
-     0x0000040C,  // ..*......**..
-     0x0000001C,  // ........***..
-     0x000003FC,  // ...********..
-     0x0000078C,  // ..****...**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x000007FC,  // ..*********..
-     0x000003CC,  // ...****..**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 98
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FF8,  // .*********...
-     0x00000E0C,  // .***.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000E1C,  // .***....***..
-     0x00000FF8,  // .*********...
-     0x00000CF0,  // .**..****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000001FC,  // ...*******..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000604,  // .**......*..
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000001FC,  // ...*******..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000E0C,  // .***.....**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000060C,  // ..**.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x0000000E,  // ...***.
-     0x0000001C,  // ..***..
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000007E,  // ******.
-     0x0000007E,  // ******.
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 103
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F6,  // ....*****.**.
-     0x000003BE,  // ...***.*****.
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060E,  // ..**.....***.
-     0x000003FE,  // ...*********.
-     0x000001E6,  // ....****..**.
-     0x00000006,  // ..........**.
-     0x00000C0E,  // .**......***.
-     0x00000E0C,  // .***.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-  },
-  {             // 104
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000CF8,  // .**..*****...
-     0x00000FFC,  // .**********..
-     0x00000E0E,  // .***.....***.
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 24,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001C,  // .***..
-  },
-  {             // 107
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000306,  // .**.....**.
-     0x0000030C,  // .**....**..
-     0x00000318,  // .**...**...
-     0x00000330,  // .**..**....
-     0x00000360,  // .**.**.....
-     0x000003E0,  // .*****.....
-     0x000003B0,  // .***.**....
-     0x00000338,  // .**..***...
-     0x00000318,  // .**...**...
-     0x0000030C,  // .**....**..
-     0x0000030E,  // .**....***.
-     0x00000306,  // .**.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 108
-     5, 24,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     19, 24,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00033C78,  // .**..****...****...
-     0x0003EEFC,  // .*****.***.******..
-     0x00038786,  // .***....****....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00030306,  // .**......**.....**.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 110
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000CF0,  // .**..****....
-     0x00000FF8,  // .*********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000060C,  // ..**.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000061C,  // ..**....***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000DF0,  // .**.*****....
-     0x00000F18,  // .****...**...
-     0x00000E0C,  // .***.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000E1C,  // .***....***..
-     0x00000FF8,  // .*********...
-     0x00000DF0,  // .**.*****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000000,  // .............
-  },
-  {             // 113
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x0000073C,  // ..***..****..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000E0C,  // .***.....**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x00000000,  // .............
-  },
-  {             // 114
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000006E,  // .**.***.
-     0x0000007E,  // .******.
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FC,  // ...******..
-     0x000001FE,  // ..********.
-     0x00000307,  // .**.....***
-     0x00000300,  // .**........
-     0x000003C0,  // .****......
-     0x000001FC,  // ..*******..
-     0x0000003E,  // .....*****.
-     0x00000003,  // .........**
-     0x00000303,  // .**......**
-     0x00000383,  // .***.....**
-     0x000001FE,  // ..********.
-     0x000000FC,  // ...******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 116
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000003E,  // .*****.
-     0x0000003E,  // .*****.
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000001E,  // ..****.
-     0x0000000E,  // ...***.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 117
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007FC,  // ..*********..
-     0x000003CC,  // ...****..**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018306,  // **.....**.....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C78C,  // .**...****...**..
-     0x0000C78C,  // .**...****...**..
-     0x0000C78C,  // .**...****...**..
-     0x000064C8,  // ..**..*..**..*...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00002CD8,  // ...*.**..**.**...
-     0x00003870,  // ...***....***....
-     0x00003870,  // ...***....***....
-     0x00001870,  // ....**....***....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060C,  // .**.....**..
-     0x0000031C,  // ..**...***..
-     0x00000398,  // ..***..**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001B0,  // ...**.**....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x0000070C,  // .***....**..
-     0x00000E0E,  // ***.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FE,  // **********.
-     0x000007FE,  // **********.
-     0x0000000C,  // .......**..
-     0x0000001C,  // ......***..
-     0x00000038,  // .....***...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000180,  // ..**.......
-     0x00000380,  // .***.......
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 123
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000001E,  // ...****.
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000E,  // ....***.
-     0x00000006,  // .....**.
-  },
-  {             // 124
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-  },
-  {             // 125
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000070,  // .***....
-     0x00000078,  // .****...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-  },
-  {             // 126
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FE2,  // .*******...*.
-     0x00000FFE,  // .***********.
-     0x0000083C,  // .*.....****..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 127
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 161
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x00000008,  // ....*...
-     0x00000008,  // ....*...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-  },
-  {             // 162
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003380,  // ...**..***.......
-     0x00006380,  // ..**...***.......
-     0x00006680,  // ..**..**.*.......
-     0x000006C0,  // ......**.**......
-     0x00000CC0,  // .....**..**......
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00001870,  // ....**....***....
-     0x00001830,  // ....**.....**....
-     0x00003FF0,  // ...**********....
-     0x00003FF8,  // ...***********...
-     0x00003018,  // ...**.......**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000C00E,  // .**..........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 163
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000001F8,  // ....******...
-     0x0000030C,  // ...**....**..
-     0x0000020C,  // ...*.....**..
-     0x00000604,  // ..**......*..
-     0x00000600,  // ..**.........
-     0x00000200,  // ...*.........
-     0x00000200,  // ...*.........
-     0x00000FE0,  // .*******.....
-     0x00000FE0,  // .*******.....
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000200,  // ...*.........
-     0x00000600,  // ..**.........
-     0x000007C0,  // ..*****......
-     0x00000FFE,  // .***********.
-     0x0000043C,  // ..*....****..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000404,  // ..*.......*..
-     0x00000EFE,  // .***.*******.
-     0x000007FC,  // ..*********..
-     0x00000318,  // ...**...**...
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000318,  // ...**...**...
-     0x000007FC,  // ..*********..
-     0x00000EE6,  // .***.***..**.
-     0x00000404,  // ..*.......*..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 165
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00000C0C,  // ..**......**..
-     0x00000C1C,  // ..**.....***..
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 166
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-  },
-  {             // 167
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x0000060C,  // ..**.....**..
-     0x00000600,  // ..**.........
-     0x00000300,  // ...**........
-     0x000003C0,  // ...****......
-     0x000006F0,  // ..**.****....
-     0x00000C38,  // .**....***...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000606,  // ..**......**.
-     0x00000386,  // ...***....**.
-     0x000001CC,  // ....***..**..
-     0x000000F8,  // .....*****...
-     0x00000038,  // .......***...
-     0x0000001C,  // ........***..
-     0x0000020C,  // ...*.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000031C,  // ...**...***..
-     0x000003F8,  // ...*******...
-     0x000000F0,  // .....****....
-  },
-  {             // 168
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 169
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007C0,  // ......*****......
-     0x00001FF0,  // ....*********....
-     0x00003018,  // ...**.......**...
-     0x0000600C,  // ..**.........**..
-     0x0000C7C6,  // .**...*****...**.
-     0x0000CE62,  // .**..***..**...*.
-     0x00019C23,  // **..***....*...**
-     0x00019803,  // **..**.........**
-     0x00019801,  // **..**..........*
-     0x00019801,  // **..**..........*
-     0x00019803,  // **..**.........**
-     0x0000C832,  // .**..*.....**..*.
-     0x0000CC62,  // .**..**...**...*.
-     0x000067C4,  // ..**..*****...*..
-     0x0000700C,  // ..***........**..
-     0x00003838,  // ...***.....***...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 170
-     9, 24,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x00000006,  // ......**.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x0000007A,  // ..****.*.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 171
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000330,  // ...**..**....
-     0x00000660,  // ..**..**.....
-     0x00000660,  // ..**..**.....
-     0x00000630,  // ..**...**....
-     0x00000330,  // ...**..**....
-     0x00000198,  // ....**..**...
-     0x00000188,  // ....**...*...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 172
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 173
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 174
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007C0,  // ......*****......
-     0x00001E70,  // ....****..***....
-     0x00003018,  // ...**.......**...
-     0x0000600C,  // ..**.........**..
-     0x0000CFC6,  // .**..******...**.
-     0x0000CCE2,  // .**..**..***...*.
-     0x00018C23,  // **...**....*...**
-     0x00018C23,  // **...**....*...**
-     0x00018C61,  // **...**...**....*
-     0x00018FC1,  // **...******.....*
-     0x00018CC1,  // **...**..**.....*
-     0x0000CC42,  // .**..**...*....*.
-     0x0000CC62,  // .**..**...**...*.
-     0x00006C24,  // ..**.**....*..*..
-     0x0000700C,  // ..***........**..
-     0x00003838,  // ...***.....***...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 175
-     14, 24,
-     0x00000000,  // ..............
-     0x00001FFF,  // .*************
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 176
-     9, 24,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x00000086,  // .*....**.
-     0x00000082,  // .*.....*.
-     0x00000086,  // .*....**.
-     0x00000044,  // ..*...*..
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 177
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 178
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001E,  // ...****.
-     0x0000003F,  // ..******
-     0x00000063,  // .**...**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x0000007F,  // .*******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x00000066,  // .**..**.
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x0000001E,  // ...****.
-     0x00000002,  // ......*.
-     0x00000042,  // .*....*.
-     0x00000066,  // .**..**.
-     0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     8, 24,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 181
-     13, 24,
-     0x00000000,  // .............
-     0x00000078,  // ......****...
-     0x00000070,  // ......***....
-     0x00000CE6,  // .**..***..**.
-     0x00000CC6,  // .**..**...**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 182
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003380,  // ...**..***.......
-     0x00006380,  // ..**...***.......
-     0x00006680,  // ..**..**.*.......
-     0x000006C0,  // ......**.**......
-     0x00000CC0,  // .....**..**......
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00001870,  // ....**....***....
-     0x00001830,  // ....**.....**....
-     0x00003FF0,  // ...**********....
-     0x00003FF8,  // ...***********...
-     0x00003018,  // ...**.......**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000C00E,  // .**..........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 183
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0001DFFE,  // .***.************.
-     0x00019FFE,  // .**..************.
-     0x00031800,  // **...**...........
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001FF0,  // .....*********....
-     0x00001FF0,  // .....*********....
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001800,  // .....**...........
-     0x00001FFC,  // .....***********..
-     0x00001FFC,  // .....***********..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 185
-     20, 24,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0007600C,  // .***.**.........**..
-     0x0006600C,  // .**..**.........**..
-     0x000C600C,  // **...**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x00007FFC,  // .....*************..
-     0x00007FFC,  // .....*************..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x0000600C,  // .....**.........**..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 186
-     10, 24,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000EC,  // ..***.**..
-     0x000000CC,  // ..**..**..
-     0x0000018C,  // .**...**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 187
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000460,  // ..*...**.....
-     0x00000620,  // ..**...*.....
-     0x00000330,  // ...**..**....
-     0x00000318,  // ...**...**...
-     0x00000198,  // ....**..**...
-     0x0000018C,  // ....**...**..
-     0x00000198,  // ....**..**...
-     0x00000330,  // ...**..**....
-     0x00000230,  // ...*...**....
-     0x00000660,  // ..**..**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 188
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0001C7E0,  // .***...******.....
-     0x00019FF8,  // .**..**********...
-     0x0003381C,  // **..***......***..
-     0x0000600E,  // ...**.........***.
-     0x00006006,  // ...**..........**.
-     0x0000C007,  // ..**...........***
-     0x0000C007,  // ..**...........***
-     0x0000C003,  // ..**............**
-     0x0000C003,  // ..**............**
-     0x0000C003,  // ..**............**
-     0x0000C007,  // ..**...........***
-     0x0000C007,  // ..**...........***
-     0x00006006,  // ...**..........**.
-     0x0000700E,  // ...***........***.
-     0x0000381C,  // ....***......***..
-     0x00001FF8,  // .....**********...
-     0x000007E0,  // .......******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 189
-     19, 24,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0000600C,  // ....**.........**..
-     0x0000E018,  // ...***........**...
-     0x0001E030,  // ..****.......**....
-     0x00006030,  // ....**.......**....
-     0x00006060,  // ....**......**.....
-     0x000060C0,  // ....**.....**......
-     0x00006080,  // ....**.....*.......
-     0x00006180,  // ....**....**.......
-     0x00006300,  // ....**...**........
-     0x0000061E,  // ........**....****.
-     0x00000433,  // ........*....**..**
-     0x00000C03,  // .......**........**
-     0x00001803,  // ......**.........**
-     0x0000300E,  // .....**........***.
-     0x0000301C,  // .....**.......***..
-     0x00006030,  // ....**.......**....
-     0x0000C07F,  // ...**.......*******
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 190
-     21, 24,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00067006,  // ..**..***.........**.
-     0x000C300C,  // .**....**........**..
-     0x000C381C,  // .**....***......***..
-     0x00001C18,  // ........***.....**...
-     0x00000C30,  // .........**....**....
-     0x00000E70,  // .........***..***....
-     0x00000660,  // ..........**..**.....
-     0x000003C0,  // ...........****......
-     0x000003C0,  // ...........****......
-     0x00000180,  // ............**.......
-     0x00000180,  // ............**.......
-     0x00000180,  // ............**.......
-     0x00000180,  // ............**.......
-     0x00000180,  // ............**.......
-     0x00000180,  // ............**.......
-     0x00000180,  // ............**.......
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-  },
-  {             // 191
-     19, 24,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x000187C0,  // ..**....*****......
-     0x00019FF0,  // ..**..*********....
-     0x00033838,  // .**..***.....***...
-     0x0000700C,  // ....***........**..
-     0x0000600C,  // ....**.........**..
-     0x0000C006,  // ...**...........**.
-     0x0000C006,  // ...**...........**.
-     0x0000C006,  // ...**...........**.
-     0x0000C006,  // ...**...........**.
-     0x0000C006,  // ...**...........**.
-     0x0000C006,  // ...**...........**.
-     0x0000600C,  // ....**.........**..
-     0x0000600C,  // ....**.........**..
-     0x00003018,  // .....**.......**...
-     0x00001830,  // ......**.....**....
-     0x0000FC7E,  // ...******...******.
-     0x0000FC7E,  // ...******...******.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 192
-     10, 24,
-     0x00000000,  // ..........
-     0x0000001C,  // .....***..
-     0x00000018,  // .....**...
-     0x00000333,  // **..**..**
-     0x00000303,  // **......**
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 193
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000680,  // ......**.*.......
-     0x000006C0,  // ......**.**......
-     0x00000CC0,  // .....**..**......
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00001870,  // ....**....***....
-     0x00001830,  // ....**.....**....
-     0x00003FF0,  // ...**********....
-     0x00003FF8,  // ...***********...
-     0x00003018,  // ...**.......**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000C00E,  // .**..........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 194
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180E,  // ..**.......***.
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FF,  // ..**********
-     0x000003FF,  // ..**********
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 196
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x000006C0,  // ......**.**......
-     0x00000CC0,  // .....**..**......
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00001870,  // ....**....***....
-     0x00001830,  // ....**.....**....
-     0x00001830,  // ....**.....**....
-     0x00003018,  // ...**.......**...
-     0x00003018,  // ...**.......**...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00007FFC,  // ..*************..
-     0x0000FFFE,  // .***************.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 197
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FF0,  // ..*********....
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00001800,  // .**...........
-     0x00003FFE,  // *************.
-     0x00003FFE,  // *************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 199
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003FFE,  // ..*************.
-     0x00003FFE,  // ..*************.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 200
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C01C,  // ..**.........***..
-     0x0001C00E,  // .***..........***.
-     0x0001800E,  // .**...........***.
-     0x0001800E,  // .**...........***.
-     0x00018FC6,  // .**...******...**.
-     0x00018FC6,  // .**...******...**.
-     0x0001800E,  // .**...........***.
-     0x0001800E,  // .**...........***.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 201
-     6, 24,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 202
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C60,  // ..***...**.....
-     0x00001870,  // ..**....***....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180E,  // ..**.......***.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000360,  // .....**.**.....
-     0x00000360,  // .....**.**.....
-     0x00000360,  // .....**.**.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00006007,  // **..........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000700E,  // ..***........***.
-     0x0000780E,  // ..****.......***.
-     0x0000781E,  // ..****......****.
-     0x00007C1E,  // ..*****.....****.
-     0x00006C36,  // ..**.**....**.**.
-     0x00006E36,  // ..**.***...**.**.
-     0x00006666,  // ..**..**..**..**.
-     0x00006666,  // ..**..**..**..**.
-     0x000063C6,  // ..**...****...**.
-     0x000063C6,  // ..**...****...**.
-     0x00006186,  // ..**....**....**.
-     0x00006186,  // ..**....**....**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 205
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003006,  // ..**.........**.
-     0x00003806,  // ..***........**.
-     0x00003C06,  // ..****.......**.
-     0x00003E06,  // ..*****......**.
-     0x00003606,  // ..**.**......**.
-     0x00003706,  // ..**.***.....**.
-     0x00003386,  // ..**..***....**.
-     0x00003186,  // ..**...**....**.
-     0x000030C6,  // ..**....**...**.
-     0x000030E6,  // ..**....***..**.
-     0x00003066,  // ..**.....**..**.
-     0x00003036,  // ..**......**.**.
-     0x0000303E,  // ..**......*****.
-     0x0000301E,  // ..**.......****.
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 206
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x0001800E,  // .**...........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0001800E,  // .**...........***.
-     0x0001800E,  // .**...........***.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 208
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FFE,  // ..*************.
-     0x00003FFE,  // ..*************.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 209
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FFE,  // ..************.
-     0x00001807,  // ..**........***
-     0x00001807,  // ..**........***
-     0x00001803,  // ..**.........**
-     0x00001807,  // ..**........***
-     0x0000180F,  // ..**.......****
-     0x00001FFE,  // ..************.
-     0x00001FF8,  // ..**********...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000E00,  // ..***.........
-     0x00000600,  // ...**.........
-     0x00000300,  // ....**........
-     0x00000180,  // .....**.......
-     0x000000C0,  // ......**......
-     0x00000060,  // .......**.....
-     0x000000E0,  // ......***.....
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000300,  // ....**........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 211
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000E00,  // ..***.........
-     0x00000600,  // ...**.........
-     0x00000300,  // ....**........
-     0x00000180,  // .....**.......
-     0x000000C0,  // ......**......
-     0x00000060,  // .......**.....
-     0x000000E0,  // ......***.....
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000300,  // ....**........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 212
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 213
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007006,  // .***.........**.
-     0x0000300C,  // ..**........**..
-     0x0000381C,  // ..***......***..
-     0x00001C18,  // ...***.....**...
-     0x00000C30,  // ....**....**....
-     0x00000670,  // .....**..***....
-     0x00000760,  // .....***.**.....
-     0x000003C0,  // ......****......
-     0x000001C0,  // .......***......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 214
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000300,  // ........**........
-     0x00000300,  // ........**........
-     0x00001FE0,  // .....********.....
-     0x00007FF8,  // ...************...
-     0x0000E31E,  // ..***...**...****.
-     0x0000C306,  // ..**....**.....**.
-     0x00018307,  // .**.....**.....***
-     0x00018307,  // .**.....**.....***
-     0x00018303,  // .**.....**......**
-     0x00018307,  // .**.....**.....***
-     0x00018307,  // .**.....**.....***
-     0x0000C30E,  // ..**....**....***.
-     0x0000E31E,  // ..***...**...****.
-     0x00007FF8,  // ...************...
-     0x00001FE0,  // .....********.....
-     0x00000300,  // ........**........
-     0x00000300,  // ........**........
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 215
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x00001C0C,  // ..***......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E38,  // ...***...***...
-     0x00000730,  // ....***..**....
-     0x00000360,  // .....**.**.....
-     0x000003E0,  // .....*****.....
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000360,  // .....**.**.....
-     0x00000770,  // ....***.***....
-     0x00000E38,  // ...***...***...
-     0x00000C18,  // ...**.....**...
-     0x00001C1C,  // ..***.....***..
-     0x0000380E,  // .***.......***.
-     0x00007007,  // ***.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     19, 24,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0003060C,  // .**.....**.....**..
-     0x0003060C,  // .**.....**.....**..
-     0x0003060C,  // .**.....**.....**..
-     0x0003060C,  // .**.....**.....**..
-     0x0003060C,  // .**.....**.....**..
-     0x0003060C,  // .**.....**.....**..
-     0x0003060C,  // .**.....**.....**..
-     0x0003861C,  // .***....**....***..
-     0x0001C638,  // ..***...**...***...
-     0x0000FFF0,  // ...************....
-     0x00003FC0,  // .....********......
-     0x00000600,  // ........**.........
-     0x00000600,  // ........**.........
-     0x00000600,  // ........**.........
-     0x00000600,  // ........**.........
-     0x00000600,  // ........**.........
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 217
-     17, 24,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000FC0,  // .....******......
-     0x00001FE0,  // ....********.....
-     0x00003870,  // ...***....***....
-     0x00007038,  // ..***......***...
-     0x00006018,  // ..**........**...
-     0x0000C00C,  // .**..........**..
-     0x0000C00C,  // .**..........**..
-     0x0000C00C,  // .**..........**..
-     0x0000C00C,  // .**..........**..
-     0x0000C00C,  // .**..........**..
-     0x0000C00C,  // .**..........**..
-     0x00006008,  // ..**.........*...
-     0x00006018,  // ..**........**...
-     0x00003030,  // ...**......**....
-     0x00001860,  // ....**....**.....
-     0x0000FCFC,  // .******..******..
-     0x0000FCFC,  // .******..******..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 218
-     9, 24,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000001BB,  // **.***.**
-     0x000001BB,  // **.***.**
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 219
-     16, 24,
-     0x00006007,  // .**..........***
-     0x00006007,  // .**..........***
-     0x00000000,  // ................
-     0x00006007,  // .**..........***
-     0x00003006,  // ..**.........**.
-     0x0000380C,  // ..***.......**..
-     0x0000181C,  // ...**......***..
-     0x00000C38,  // ....**....***...
-     0x00000E30,  // ....***...**....
-     0x00000660,  // .....**..**.....
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 220
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000003FC,  // ...********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x0000061C,  // ..**....***..
-     0x000007F7,  // ..*******.***
-     0x000001E6,  // ....****..**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 221
-     10, 24,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000038,  // ....***...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x00000184,  // .**....*..
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000F0,  // ..****....
-     0x000000F0,  // ..****....
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000186,  // .**....**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 222
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000020,  // .......*.....
-     0x00000000,  // .............
-     0x000006F8,  // ..**.*****...
-     0x000007DC,  // ..*****.***..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-  },
-  {             // 223
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000E,  // ...***.
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 224
-     12, 24,
-     0x00000000,  // ............
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000336,  // ..**..**.**.
-     0x00000306,  // ..**.....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x0000038E,  // ..***...***.
-     0x000001FC,  // ...*******..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 225
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000003FC,  // ...********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x0000061C,  // ..**....***..
-     0x000007F7,  // ..*******.***
-     0x000001E6,  // ....****..**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 226
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003F8,  // ...*******...
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000618,  // ..**....**...
-     0x00000670,  // ..**..***....
-     0x00000678,  // ..**..****...
-     0x0000060C,  // ..**.....**..
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000706,  // ..***.....**.
-     0x0000070C,  // ..***....**..
-     0x000006F8,  // ..**.*****...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-  },
-  {             // 227
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-  },
-  {             // 228
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FC,  // ..*********..
-     0x00000700,  // ..***........
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x000001F0,  // ....*****....
-     0x000007B8,  // ..****.***...
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000070C,  // ..***....**..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     10, 24,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x00000184,  // .**....*..
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000F0,  // ..****....
-     0x000000F0,  // ..****....
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000186,  // .**....**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 230
-     10, 24,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007F,  // ...*******
-     0x0000007F,  // ...*******
-     0x00000004,  // .......*..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000020,  // ....*.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000FC,  // ..******..
-     0x0000007E,  // ...******.
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x0000000E,  // ......***.
-     0x00000008,  // ......*...
-  },
-  {             // 231
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000006F8,  // ..**.*****...
-     0x000007DC,  // ..*****.***..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-  },
-  {             // 232
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x0000060C,  // ..**.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 233
-     5, 24,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 234
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000030E,  // .**....***.
-     0x0000031C,  // .**...***..
-     0x00000338,  // .**..***...
-     0x00000370,  // .**.***....
-     0x000003E0,  // .*****.....
-     0x000003E0,  // .*****.....
-     0x000003E0,  // .*****.....
-     0x00000330,  // .**..**....
-     0x00000338,  // .**..***...
-     0x0000031C,  // .**...***..
-     0x0000030E,  // .**....***.
-     0x00000306,  // .**.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 235
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x000000E0,  // ...***.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000078,  // ....****...
-     0x000000D8,  // ...**.**...
-     0x000000DC,  // ...**.***..
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000703,  // ***......**
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 236
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000060E,  // ..**.....***.
-     0x0000070E,  // ..***....***.
-     0x000007FE,  // ..**********.
-     0x000006F6,  // ..**.****.**.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-  },
-  {             // 237
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 238
-     10, 24,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000F8,  // ..*****...
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x000000C0,  // ..**......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C0,  // ..**......
-     0x0000007C,  // ...*****..
-     0x0000001F,  // .....*****
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x0000001F,  // .....*****
-     0x0000001C,  // .....***..
-     0x00000000,  // ..........
-  },
-  {             // 239
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000060C,  // ..**.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060C,  // ..**.....**..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 240
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FF,  // .***********
-     0x000007FF,  // .***********
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 241
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003FC,  // ...********..
-     0x0000060E,  // ..**.....***.
-     0x00000C07,  // .**.......***
-     0x00000C07,  // .**.......***
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C07,  // .**.......***
-     0x00000E07,  // .***......***
-     0x00000E0E,  // .***.....***.
-     0x00000FFC,  // .**********..
-     0x00000DF8,  // .**.******...
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000000,  // .............
-  },
-  {             // 242
-     11, 24,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000003F,  // .....******
-     0x0000007F,  // ....*******
-     0x000001C0,  // ..***......
-     0x00000180,  // ..**.......
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000380,  // .***.......
-     0x000001C0,  // ..***......
-     0x000000F8,  // ...*****...
-     0x0000003E,  // .....*****.
-     0x00000007,  // ........***
-     0x00000003,  // .........**
-     0x00000007,  // ........***
-     0x0000003E,  // .....*****.
-     0x00000078,  // ....****...
-  },
-  {             // 243
-     14, 24,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003FF,  // ....**********
-     0x0000067F,  // ...**..*******
-     0x00000C18,  // ..**.....**...
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001C1C,  // .***.....***..
-     0x00000C18,  // ..**.....**...
-     0x000007F0,  // ...*******....
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 244
-     9, 24,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FF,  // .********
-     0x000000FF,  // .********
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 245
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 246
-     15, 24,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000670,  // ....**..***....
-     0x00000EFC,  // ...***.******..
-     0x000018CC,  // ..**...**..**..
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000018CC,  // ..**...**..**..
-     0x00001CCC,  // ..***..**..**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-  },
-  {             // 247
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000F0,  // ....****....
-     0x000001B8,  // ...**.***...
-     0x00000198,  // ...**..**...
-     0x0000031C,  // ..**...***..
-     0x0000030C,  // ..**....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-  },
-  {             // 248
-     16, 24,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x0000618E,  // .**....**...***.
-     0x0000318C,  // ..**...**...**..
-     0x00003FFC,  // ..************..
-     0x00000FF0,  // ....********....
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-  },
-  {             // 249
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C008,  // ..**..........*...
-     0x0000C00C,  // ..**..........**..
-     0x0000C00C,  // ..**..........**..
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x0001830E,  // .**.....**....***.
-     0x0000C78C,  // ..**...****...**..
-     0x0000FCFC,  // ..******..******..
-     0x00007878,  // ...****....****...
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 250
-     7, 24,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000067,  // **..***
-     0x00000067,  // **..***
-     0x00000000,  // .......
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 251
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000001F0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 252
-     13, 24,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000060C,  // ..**.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060C,  // ..**.....**..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253
-     12, 24,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 254
-     18, 24,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000001C0,  // .........***......
-     0x00000180,  // .........**.......
-     0x00000300,  // ........**........
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C00C,  // ..**..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000C00C,  // ..**..........**..
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x0001830E,  // .**.....**....***.
-     0x0000C78C,  // ..**...****...**..
-     0x0000FCFC,  // ..******..******..
-     0x00007878,  // ...****....****...
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 255
-     0, 24,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  };
diff --git a/fontfix-iso8859-9.c b/fontfix-iso8859-9.c
deleted file mode 100644
index fc27a5a42..000000000
--- a/fontfix-iso8859-9.c
+++ /dev/null
@@ -1,6498 +0,0 @@
-static const cFont::tPixelData FontFix_iso8859_9[][28] = {
-  {             // 32
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 33
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 34
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000EE0,  // ...***.***.....
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000440,  // ....*...*......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 35
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000CC0,  // ...**..**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 36
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000FC0,  // ...******......
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FF0,  // ..*********....
-     0x00001BE0,  // ..**.*****.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 37
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000780,  // ....****.......
-     0x00000CC0,  // ...**..**......
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00000CC0,  // ...**..**......
-     0x00000780,  // ....****.......
-     0x00000038,  // .........***...
-     0x000001E0,  // ......****.....
-     0x00000700,  // ....***........
-     0x00001CF0,  // ..***..****....
-     0x00000198,  // ......**..**...
-     0x0000030C,  // .....**....**..
-     0x0000030C,  // .....**....**..
-     0x00000198,  // ......**..**...
-     0x000000F0,  // .......****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 38
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000700,  // ....***........
-     0x00000F98,  // ...*****..**...
-     0x00000DF8,  // ...**.******...
-     0x000018F0,  // ..**...****....
-     0x00001860,  // ..**....**.....
-     0x000018F0,  // ..**...****....
-     0x00001FFC,  // ..***********..
-     0x00000F9C,  // ...*****..***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 40
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000070,  // ........***....
-     0x00000030,  // .........**....
-     0x00000000,  // ...............
-  },
-  {             // 41
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00000000,  // ...............
-  },
-  {             // 42
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001998,  // ..**..**..**...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x000007E0,  // ....******.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 43
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 44
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000400,  // ....*..........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 45
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 46
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 47
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 48
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000C30,  // ...**....**....
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 49
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 50
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E00,  // ...***.........
-     0x00001C00,  // ..***..........
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 51
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000003E0,  // .....*****.....
-     0x000003F0,  // .....******....
-     0x00000038,  // .........***...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001FF0,  // ..*********....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 52
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00003FF8,  // .***********...
-     0x00003FF8,  // .***********...
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000003F8,  // .....*******...
-     0x000003F8,  // .....*******...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 53
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FF8,  // ...*********...
-     0x00000FF8,  // ...*********...
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DE0,  // ...**.****.....
-     0x00000FF8,  // ...*********...
-     0x00000E38,  // ...***...***...
-     0x0000001C,  // ..........***..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000181C,  // ..**......***..
-     0x00001C38,  // ..***....***...
-     0x00000FF8,  // ...*********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 54
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000F8,  // .......*****...
-     0x000003F8,  // .....*******...
-     0x00000780,  // ....****.......
-     0x00000E00,  // ...***.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C18,  // ..***.....**...
-     0x00000E38,  // ...***...***...
-     0x00000FF0,  // ...********....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 55
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 56
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 57
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001E0,  // ......****.....
-     0x000007F8,  // ....********...
-     0x00000618,  // ....**....**...
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E3C,  // ...***...****..
-     0x000007EC,  // ....******.**..
-     0x000003CC,  // .....****..**..
-     0x0000000C,  // ...........**..
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 58
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 59
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00000800,  // ...*...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 60
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000000E,  // ...........***.
-     0x0000003C,  // .........****..
-     0x000000F0,  // .......****....
-     0x000003C0,  // .....****......
-     0x00000F00,  // ...****........
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000F00,  // ...****........
-     0x000003C0,  // .....****......
-     0x000000F0,  // .......****....
-     0x0000003C,  // .........****..
-     0x0000000E,  // ...........***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 61
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 62
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003800,  // .***...........
-     0x00001E00,  // ..****.........
-     0x00000780,  // ....****.......
-     0x000001E0,  // ......****.....
-     0x00000078,  // ........****...
-     0x0000001E,  // ..........****.
-     0x0000001E,  // ..........****.
-     0x00000078,  // ........****...
-     0x000001E0,  // ......****.....
-     0x00000780,  // ....****.......
-     0x00001E00,  // ..****.........
-     0x00003800,  // .***...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 63
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00000FF0,  // ...********....
-     0x00000C38,  // ...**....***...
-     0x00000C18,  // ...**.....**...
-     0x00000C18,  // ...**.....**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x000000F0,  // .......****....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 64
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x000018F0,  // ..**...****....
-     0x000019F0,  // ..**..*****....
-     0x00001BB0,  // ..**.***.**....
-     0x00001B30,  // ..**.**..**....
-     0x00001B30,  // ..**.**..**....
-     0x00001BB0,  // ..**.***.**....
-     0x000019F8,  // ..**..******...
-     0x000018F8,  // ..**...*****...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C30,  // ...**....**....
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 65
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FF8,  // .***********...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000FF8,  // ...*********...
-     0x00000FFC,  // ...**********..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001800,  // ..**...........
-     0x00001C0C,  // ..***......**..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 68
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FF8,  // ************...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00007FF8,  // ************...
-     0x00007FF0,  // ***********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 69
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C66,  // ...**...**..**.
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 71
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 73
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 74
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FE,  // ....**********.
-     0x000007FE,  // ....**********.
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003030,  // .**......**....
-     0x00003870,  // .***....***....
-     0x00001FE0,  // ..********.....
-     0x00000FC0,  // ...******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 75
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7C,  // ******..*****..
-     0x00007E7C,  // ******..*****..
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001B80,  // ..**.***.......
-     0x00001F00,  // ..*****........
-     0x00001F80,  // ..******.......
-     0x00001DC0,  // ..***.***......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x0000060C,  // ....**.....**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 77
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000781E,  // ****......****.
-     0x0000781E,  // ****......****.
-     0x00003C3C,  // .****....****..
-     0x00003C3C,  // .****....****..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x000033CC,  // .**..****..**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 78
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 79
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FF0,  // .**********....
-     0x00003FFC,  // .************..
-     0x00000C0E,  // ...**......***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C0E,  // ...**......***.
-     0x00000FFC,  // ...**********..
-     0x00000FF0,  // ...********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000386,  // .....***....**.
-     0x00000FFE,  // ...***********.
-     0x00000E78,  // ...***..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FC0,  // *********......
-     0x00007FF0,  // ***********....
-     0x00001838,  // ..**.....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001838,  // ..**.....***...
-     0x00001FF0,  // ..*********....
-     0x00001FC0,  // ..*******......
-     0x000018E0,  // ..**...***.....
-     0x00001870,  // ..**....***....
-     0x00001830,  // ..**.....**....
-     0x00001838,  // ..**.....***...
-     0x00007E1E,  // ******....****.
-     0x00007E1E,  // ******....****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 83
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 85
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 86
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000300C,  // .**........**..
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001E78,  // ..****..****...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 88
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x0000070C,  // ....***....**..
-     0x00000E0C,  // ...***.....**..
-     0x00001C0C,  // ..***......**..
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 91
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001F0,  // ......*****....
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-  },
-  {             // 92
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000030,  // .........**....
-     0x00000030,  // .........**....
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 93
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-  },
-  {             // 94
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 95
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFF,  // ***************
-     0x00007FFF,  // ***************
-     0x00000000,  // ...............
-  },
-  {             // 96
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x00000060,  // ........**.....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 97
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 98
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000DF0,  // ...**.*****....
-     0x00000FFC,  // ...**********..
-     0x00000F1C,  // ...****...***..
-     0x00000E0E,  // ...***.....***.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x00000F1C,  // ...****...***..
-     0x00003FFC,  // .************..
-     0x00003DF0,  // .****.*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 99
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00001FFC,  // ..***********..
-     0x00001C3C,  // ..***....****..
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 100
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000078,  // ........****...
-     0x00000078,  // ........****...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FFE,  // ..************.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 101
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 102
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000FC,  // .......******..
-     0x000001FC,  // ......*******..
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 103
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 104
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007800,  // ****...........
-     0x00007800,  // ****...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001BE0,  // ..**.*****.....
-     0x00001FF0,  // ..*********....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 105
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 106
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FE0,  // ..********.....
-     0x00001FE0,  // ..********.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x00000060,  // ........**.....
-     0x000000E0,  // .......***.....
-     0x00001FC0,  // ..*******......
-     0x00001F80,  // ..******.......
-  },
-  {             // 107
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003C00,  // .****..........
-     0x00003C00,  // .****..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C78,  // ...**...****...
-     0x00000C78,  // ...**...****...
-     0x00000CE0,  // ...**..***.....
-     0x00000DC0,  // ...**.***......
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000DC0,  // ...**.***......
-     0x00000CE0,  // ...**..***.....
-     0x00000C70,  // ...**...***....
-     0x00003C7E,  // .****...******.
-     0x00003C7E,  // .****...******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 108
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 109
-     16, 26,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000EF78,  // ***.****.****...
-     0x0000FFFC,  // **************..
-     0x000039CC,  // ..***..***..**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000318C,  // ..**...**...**..
-     0x0000F9EF,  // *****..****.****
-     0x0000F9EF,  // *****..****.****
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 111
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 112
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007BE0,  // ****.*****.....
-     0x00007FF8,  // ************...
-     0x00001E38,  // ..****...***...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00001E38,  // ..****...***...
-     0x00001FF8,  // ..**********...
-     0x00001BE0,  // ..**.*****.....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00007F00,  // *******........
-     0x00007F00,  // *******........
-  },
-  {             // 113
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x000000FE,  // .......*******.
-     0x000000FE,  // .......*******.
-  },
-  {             // 114
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00001FFC,  // ..***********..
-     0x0000078C,  // ....****...**..
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 115
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 116
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FF0,  // .**********....
-     0x00003FF0,  // .**********....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000E38,  // ...***...***...
-     0x000007F8,  // ....********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 117
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 118
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 119
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007C3E,  // *****....*****.
-     0x00007C3E,  // *****....*****.
-     0x0000318C,  // .**...**...**..
-     0x0000318C,  // .**...**...**..
-     0x00001998,  // ..**..**..**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001BD8,  // ..**.****.**...
-     0x00001E78,  // ..****..****...
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 121
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  {             // 122
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000E18,  // ...***....**...
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 123
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000070,  // ........***....
-     0x00000000,  // ...............
-  },
-  {             // 124
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 125
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000E00,  // ...***.........
-     0x00000000,  // ...............
-  },
-  {             // 126
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F0C,  // ...****....**..
-     0x00001F9C,  // ..******..***..
-     0x000039F8,  // .***..******...
-     0x000030F0,  // .**....****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 127
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 26,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 161
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000000,  // ...............
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000780,  // ....****.......
-     0x00000300,  // .....**........
-  },
-  {             // 162
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007B0,  // ....****.**....
-     0x00000FF0,  // ...********....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 163
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x000007F0,  // ....*******....
-     0x00000E30,  // ...***...**....
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00000C00,  // ...**..........
-     0x00003FC0,  // .********......
-     0x00003FC0,  // .********......
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000E00,  // ...***.........
-     0x00001C0C,  // ..***......**..
-     0x00003FFC,  // .************..
-     0x00003FF8,  // .***********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 164
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00001FF8,  // ..**********...
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x00001FF8,  // ..**********...
-     0x00001818,  // ..**......**...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 165
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 166
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F8,  // .....*******...
-     0x000007F8,  // ....********...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000E00,  // ...***.........
-     0x00001F80,  // ..******.......
-     0x000033E0,  // .**..*****.....
-     0x000030F8,  // .**....*****...
-     0x00003C3C,  // .****....****..
-     0x00001F0C,  // ..*****....**..
-     0x000007CC,  // ....*****..**..
-     0x000001FC,  // ......*******..
-     0x00000078,  // ........****...
-     0x00000030,  // .........**....
-     0x00001830,  // ..**.....**....
-     0x00001870,  // ..**....***....
-     0x00001FE0,  // ..********.....
-     0x00001FC0,  // ..*******......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 168
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000033CC,  // .**..****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006E66,  // **.***..**..**.
-     0x00006C06,  // **.**.......**.
-     0x00006C06,  // **.**.......**.
-     0x00006E66,  // **.***..**..**.
-     0x000037EC,  // .**.******.**..
-     0x000033CC,  // .**..****..**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000060,  // ........**.....
-     0x000007E0,  // ....******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000CF0,  // ...**..****....
-     0x000007B0,  // ....****.**....
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 171
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 172
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 173
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 174
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000FF0,  // ...********....
-     0x00001C38,  // ..***....***...
-     0x000037CC,  // .**.*****..**..
-     0x000037EC,  // .**.******.**..
-     0x00006666,  // **..**..**..**.
-     0x00006666,  // **..**..**..**.
-     0x000067C6,  // **..*****...**.
-     0x000066C6,  // **..**.**...**.
-     0x0000366C,  // .**.**..**.**..
-     0x0000366C,  // .**.**..**.**..
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 175
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 176
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000660,  // ....**..**.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 177
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 178
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000300,  // .....**........
-     0x00000630,  // ....**...**....
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 179
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000060,  // ........**.....
-     0x000001E0,  // ......****.....
-     0x00000030,  // .........**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 180
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00001FFE,  // ..************.
-     0x00001FDE,  // ..*******.****.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-  },
-  {             // 182
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FC,  // ....*********..
-     0x00001FFC,  // ..***********..
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x000039B0,  // .***..**.**....
-     0x00001FB0,  // ..******.**....
-     0x000007B0,  // ....****.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x000001B0,  // ......**.**....
-     0x00000FBC,  // ...*****.****..
-     0x00000FBC,  // ...*****.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 183
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 184
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 185
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 186
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x00000000,  // ...............
-     0x00000FF0,  // ...********....
-     0x00000FF0,  // ...********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 187
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000038E0,  // .***...***.....
-     0x00001C70,  // ..***...***....
-     0x00000E38,  // ...***...***...
-     0x0000071C,  // ....***...***..
-     0x0000038E,  // .....***...***.
-     0x0000071C,  // ....***...***..
-     0x00000E38,  // ...***...***...
-     0x00001C70,  // ..***...***....
-     0x000038E0,  // .***...***.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 188
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00007801,  // ****..........*
-     0x00001803,  // ..**.........**
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001818,  // ..**......**...
-     0x00001830,  // ..**.....**....
-     0x00001864,  // ..**....**..*..
-     0x00007FCC,  // *********..**..
-     0x0000019C,  // ......**..***..
-     0x0000032C,  // .....**..*.**..
-     0x0000064C,  // ....**..*..**..
-     0x00000C8C,  // ...**..*...**..
-     0x000018FE,  // ..**...*******.
-     0x0000300C,  // .**........**..
-     0x0000201E,  // .*........****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00007801,  // ****..........*
-     0x00001803,  // ..**.........**
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001818,  // ..**......**...
-     0x00001830,  // ..**.....**....
-     0x0000187E,  // ..**....******.
-     0x00007FF3,  // ***********..**
-     0x000001A3,  // ......**.*...**
-     0x00000306,  // .....**.....**.
-     0x0000060C,  // ....**.....**..
-     0x00000C18,  // ...**.....**...
-     0x00001830,  // ..**.....**....
-     0x00003063,  // .**.....**...**
-     0x0000207F,  // .*......*******
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003E00,  // .*****.........
-     0x00006301,  // **...**.......*
-     0x00006303,  // **...**......**
-     0x00000606,  // ....**......**.
-     0x00001E0C,  // ..****.....**..
-     0x00000318,  // .....**...**...
-     0x00006330,  // **...**..**....
-     0x00006364,  // **...**.**..*..
-     0x00003ECC,  // .*****.**..**..
-     0x0000019C,  // ......**..***..
-     0x0000032C,  // .....**..*.**..
-     0x0000064C,  // ....**..*..**..
-     0x00000C8C,  // ...**..*...**..
-     0x000018FE,  // ..**...*******.
-     0x0000300C,  // .**........**..
-     0x0000201E,  // .*........****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000F00,  // ...****........
-     0x00001C00,  // ..***..........
-     0x00001800,  // ..**...........
-     0x00001830,  // ..**.....**....
-     0x00001830,  // ..**.....**....
-     0x00001C30,  // ..***....**....
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-  },
-  {             // 192
-     15, 26,
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 26,
-     0x00000300,  // .....**........
-     0x00000780,  // ....****.......
-     0x00000FC0,  // ...******......
-     0x00001CE0,  // ..***..***.....
-     0x00003870,  // .***....***....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 26,
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00001F80,  // ..******.......
-     0x00001F80,  // ..******.......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FF,  // ....***********
-     0x000007FF,  // ....***********
-     0x000001C3,  // ......***....**
-     0x000003C3,  // .....****....**
-     0x000003C0,  // .....****......
-     0x000006CC,  // ....**.**..**..
-     0x000004FC,  // ....*..******..
-     0x00000CFC,  // ...**..******..
-     0x00000FCC,  // ...******..**..
-     0x00001FC0,  // ..*******......
-     0x000018C0,  // ..**...**......
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x00007BFF,  // ****.**********
-     0x00007BFF,  // ****.**********
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 199
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003EC,  // .....*****.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380C,  // .***.......**..
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001804,  // ..**........*..
-     0x00001C0C,  // ..***......**..
-     0x00000FF8,  // ...*********...
-     0x000003F0,  // .....******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 200
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C6C,  // ...**...**.**..
-     0x00000C60,  // ...**...**.....
-     0x00000FE0,  // ...*******.....
-     0x00000FE0,  // ...*******.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205
-     15, 26,
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 206
-     15, 26,
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000660,  // ....**..**.....
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E1C,  // ...***....***..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x000003F6,  // .....******.**.
-     0x00000FFE,  // ...***********.
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000307E,  // .**.....******.
-     0x0000307E,  // .**.....******.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x00003C3E,  // .****....*****.
-     0x00003C3E,  // .****....*****.
-     0x00001E0C,  // ..****.....**..
-     0x00001E0C,  // ..****.....**..
-     0x00001B0C,  // ..**.**....**..
-     0x00001B0C,  // ..**.**....**..
-     0x0000198C,  // ..**..**...**..
-     0x0000198C,  // ..**..**...**..
-     0x000018CC,  // ..**...**..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000186C,  // ..**....**.**..
-     0x0000186C,  // ..**....**.**..
-     0x0000183C,  // ..**.....****..
-     0x00003E3C,  // .*****...****..
-     0x00003E1C,  // .*****....***..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 210
-     15, 26,
-     0x00000000,  // ...............
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x000000E0,  // .......***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000398,  // .....***..**...
-     0x000007F0,  // ....*******....
-     0x00000CE0,  // ...**..***.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001008,  // ..*........*...
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00000E70,  // ...***..***....
-     0x000007E0,  // ....******.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x00001008,  // ..*........*...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 216
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x0000000C,  // ...........**..
-     0x000003F8,  // .....*******...
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x00003046,  // .**.....*...**.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x00003A0E,  // .***.*.....***.
-     0x00001E0C,  // ..****.....**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x00001BE0,  // ..**.*****.....
-     0x00003000,  // .**............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     15, 26,
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 218
-     15, 26,
-     0x00000000,  // ...............
-     0x00000038,  // .........***...
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 219
-     15, 26,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x000003F0,  // .....******....
-     0x00000738,  // ....***..***...
-     0x00000E1C,  // ...***....***..
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 220
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000630,  // ....**...**....
-     0x00000000,  // ...............
-     0x00003E3E,  // .*****...*****.
-     0x00003E3E,  // .*****...*****.
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00000C18,  // ...**.....**...
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 221
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000080,  // ......**.......
-     0x00000080,  // ......**.......
-     0x00000080,  // ......**.......
-     0x00000000,  // ...............
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007EC,  // ....******.**..
-     0x00000FFC,  // ...**********..
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000180C,  // ..**.......**..
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F0,  // ....*******....
-     0x000000F8,  // .......*****...
-     0x0000001C,  // ..........***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00003FF8,  // .***********...
-     0x000037F0,  // .**.*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 223
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000E70,  // ...***..***....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C70,  // ...**...***....
-     0x00000DE0,  // ...**.****.....
-     0x00000DF0,  // ...**.*****....
-     0x00000C38,  // ...**....***...
-     0x00000C1C,  // ...**.....***..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000CDC,  // ...**..**.***..
-     0x00003EF8,  // .*****.*****...
-     0x00003E70,  // .*****..***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 224
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 225
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 226
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 227
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 228
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 229
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000006C0,  // ....**.**......
-     0x00000440,  // ....*...*......
-     0x000006C0,  // ....**.**......
-     0x00000380,  // .....***.......
-     0x00000FC0,  // ...******......
-     0x00001FE0,  // ..********.....
-     0x00001870,  // ..**....***....
-     0x00000030,  // .........**....
-     0x000007F0,  // ....*******....
-     0x00001FF0,  // ..*********....
-     0x00003830,  // .***.....**....
-     0x00003030,  // .**......**....
-     0x00003070,  // .**.....***....
-     0x00003FFC,  // .************..
-     0x00001FBC,  // ..******.****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 230
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001E78,  // ..****..****...
-     0x00003FFC,  // .************..
-     0x000033CE,  // .**..****..***.
-     0x00000186,  // ......**....**.
-     0x00000F86,  // ...*****....**.
-     0x00003FFE,  // .*************.
-     0x000071FE,  // ***...********.
-     0x00006180,  // **....**.......
-     0x000063C6,  // **...****...**.
-     0x00007FFE,  // **************.
-     0x00003E78,  // .*****..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 231
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x00003818,  // .***......**...
-     0x00003018,  // .**.......**...
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003800,  // .***...........
-     0x00001C18,  // ..***.....**...
-     0x00001FF8,  // ..**********...
-     0x000007F0,  // ....*******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 232
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 233
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 234
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000003E0,  // .....*****.....
-     0x00000770,  // ....***.***....
-     0x00000E38,  // ...***...***...
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 235
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x00003FFC,  // .************..
-     0x00003FFC,  // .************..
-     0x00003800,  // .***...........
-     0x00001C1C,  // ..***.....***..
-     0x00001FFC,  // ..***********..
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 236
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 237
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 238
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 240
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E38,  // ...***...***...
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x000007DE,  // ....*****.****.
-     0x00001FFE,  // ..************.
-     0x00001C78,  // ..***...****...
-     0x00003838,  // .***.....***...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003018,  // .**.......**...
-     0x00003838,  // .***.....***...
-     0x00001C78,  // ..***...****...
-     0x00001FF8,  // ..**********...
-     0x000007D8,  // ....*****.**...
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000038,  // .........***...
-     0x00000FF0,  // ...********....
-     0x00000FE0,  // ...*******.....
-  },
-  {             // 241
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000079E0,  // ****..****.....
-     0x00007BF0,  // ****.******....
-     0x00001E38,  // ..****...***...
-     0x00001C18,  // ..***.....**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00007E7E,  // ******..******.
-     0x00007E7E,  // ******..******.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 242
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 243
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 244
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 245
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000730,  // ....***..**....
-     0x00000FE0,  // ...*******.....
-     0x000019C0,  // ..**..***......
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 246
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x000007E0,  // ....******.....
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000381C,  // .***......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000381C,  // .***......***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 247
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FFC,  // *************..
-     0x00007FFC,  // *************..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 248
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000006,  // ............**.
-     0x000007EC,  // ....******.**..
-     0x00001FF8,  // ..**********...
-     0x00001C38,  // ..***....***...
-     0x0000386C,  // .***....**.**..
-     0x000030CC,  // .**....**..**..
-     0x0000318C,  // .**...**...**..
-     0x0000330C,  // .**..**....**..
-     0x0000361C,  // .**.**....***..
-     0x00001C38,  // ..***....***...
-     0x00001FF8,  // ..**********...
-     0x00001FE0,  // ..********.....
-     0x00003000,  // .**............
-     0x00006000,  // **.............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 249
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 250
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 251
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000380,  // .....***.......
-     0x000007C0,  // ....*****......
-     0x00000EE0,  // ...***.***.....
-     0x00001C70,  // ..***...***....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 252
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00007878,  // ****....****...
-     0x00007878,  // ****....****...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000FFE,  // ...***********.
-     0x000007DE,  // ....*****.****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 253
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000F80,  // ...*****.......
-     0x00000F80,  // ...*****.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00001FF8,  // ..**********...
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 254
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007D8,  // ....*****.**...
-     0x00000FF8,  // ...*********...
-     0x00001C38,  // ..***....***...
-     0x00001C18,  // ..***.....**...
-     0x00000F80,  // ...*****.......
-     0x000003E0,  // .....*****.....
-     0x000000F8,  // .......*****...
-     0x0000181C,  // ..**......***..
-     0x00001C1C,  // ..***.....***..
-     0x00001FF8,  // ..**********...
-     0x00001BF0,  // ..**.******....
-     0x00000180,  // ......**.......
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 255
-     15, 26,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000C60,  // ...**...**.....
-     0x00000000,  // ...............
-     0x00003E7C,  // .*****..*****..
-     0x00003E7C,  // .*****..*****..
-     0x00001818,  // ..**......**...
-     0x00001C38,  // ..***....***...
-     0x00000C30,  // ...**....**....
-     0x00000E70,  // ...***..***....
-     0x00000660,  // ....**..**.....
-     0x000006E0,  // ....**.***.....
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000180,  // ......**.......
-     0x00000380,  // .....***.......
-     0x00000300,  // .....**........
-     0x00000700,  // ....***........
-     0x00003F80,  // .*******.......
-     0x00003F80,  // .*******.......
-  },
-  };
diff --git a/fontosd-iso8859-1.c b/fontosd-iso8859-1.c
deleted file mode 100644
index 67e286d2d..000000000
--- a/fontosd-iso8859-1.c
+++ /dev/null
@@ -1,6722 +0,0 @@
-static const cFont::tPixelData FontOsd_iso8859_1[][29] = {
-  {             // 32
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 33
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000022,  // ..*...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00000188,  // ....**...*...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000118,  // ....*...**...
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000310,  // ...**...*....
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000230,  // ...*...**....
-     0x00000630,  // ..**...**....
-     0x00000620,  // ..**...*.....
-     0x00000620,  // ..**...*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000007F8,  // ..********...
-     0x0000065C,  // ..**..*.***..
-     0x00000CCC,  // .**..**..**..
-     0x00000CCC,  // .**..**..**..
-     0x00000CC0,  // .**..**......
-     0x00000CC0,  // .**..**......
-     0x000007C0,  // ..*****......
-     0x000003F0,  // ...******....
-     0x000001FC,  // ....*******..
-     0x000000CE,  // .....**..***.
-     0x000000C6,  // .....**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CCE,  // .**..**..***.
-     0x00000E9C,  // .***.*..***..
-     0x000007F8,  // ..********...
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0001C020,  // ...***........*.....
-     0x0007F060,  // .*******.....**.....
-     0x000E38C0,  // ***...***...**......
-     0x000C1880,  // **.....**...*.......
-     0x000C1980,  // **.....**..**.......
-     0x000E3900,  // ***...***..*........
-     0x0007F300,  // .*******..**........
-     0x0003E200,  // ..*****...*.........
-     0x0000063C,  // .........**...****..
-     0x00000C7E,  // ........**...******.
-     0x00000CE6,  // ........**..***..**.
-     0x000018C3,  // .......**...**....**
-     0x000010C3,  // .......*....**....**
-     0x000030C3,  // ......**....**....**
-     0x0000607E,  // .....**......******.
-     0x0000603C,  // .....**.......****..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 38
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000006E0,  // ....**.***.....
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000FCC,  // ...******..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000306C,  // .**.....**.**..
-     0x00003038,  // .**......***...
-     0x00003038,  // .**......***...
-     0x0000383C,  // .***.....****..
-     0x00001FEE,  // ..********.***.
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 40
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000008,  // ....*...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000040,  // .*......
-     0x00000020,  // ..*.....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000040,  // .*......
-  },
-  {             // 42
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x000000D6,  // .**.*.**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x00000044,  // ..*...*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 44
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 45
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 46
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000040,  // *......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001E0,  // ....****.....
-     0x000007E0,  // ..******.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000001C,  // ........***..
-     0x00000078,  // ......****...
-     0x000001E0,  // ....****.....
-     0x00000380,  // ...***.......
-     0x00000700,  // ..***........
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x000000F0,  // .....****....
-     0x000000FC,  // .....******..
-     0x0000000C,  // .........**..
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000218,  // ...*....**...
-     0x00000618,  // ..**....**...
-     0x00000C18,  // .**.....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007F0,  // ..*******....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0E,  // .**......***.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0C,  // .***.....**..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000070C,  // ..***....**..
-     0x0000060E,  // ..**.....***.
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000004,  // ..........*..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000380,  // ...***.......
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003F0,  // ...******....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E1E,  // .***....****.
-     0x000007FE,  // ..**********.
-     0x000001F6,  // ....*****.**.
-     0x00000006,  // ..........**.
-     0x0000000E,  // .........***.
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000002,  // ...........*.
-     0x0000000E,  // .........***.
-     0x0000003C,  // .......****..
-     0x000001E0,  // ....****.....
-     0x00000780,  // ..****.......
-     0x00000E00,  // .***.........
-     0x00000F00,  // .****........
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000000E,  // .........***.
-     0x00000002,  // ...........*.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 61
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 62
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000800,  // .*...........
-     0x00000E00,  // .***.........
-     0x000003C0,  // ...****......
-     0x000000F0,  // .....****....
-     0x0000003E,  // .......*****.
-     0x00000006,  // ..........**.
-     0x0000001E,  // ........****.
-     0x00000078,  // ......****...
-     0x000003C0,  // ...****......
-     0x00000F00,  // .****........
-     0x00000800,  // .*...........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00003F00,  // .........******........
-     0x0001FFE0,  // ......************.....
-     0x0003C0F0,  // .....****......****....
-     0x00070038,  // ....***..........***...
-     0x000E001C,  // ...***............***..
-     0x001C1E8C,  // ..***.....****.*...**..
-     0x00187FCE,  // ..**....*********..***.
-     0x0018E1C6,  // ..**...***....***...**.
-     0x0030C186,  // .**....**.....**....**.
-     0x00318186,  // .**...**......**....**.
-     0x00318186,  // .**...**......**....**.
-     0x0031830C,  // .**...**.....**....**..
-     0x0031830C,  // .**...**.....**....**..
-     0x0039C718,  // .***..***...***...**...
-     0x0018FFF0,  // ..**...************....
-     0x001C71E0,  // ..***...***...****.....
-     0x000E0000,  // ...***.................
-     0x00078000,  // ....****...............
-     0x0003FF80,  // .....***********.......
-     0x00007F00,  // ........*******........
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 65
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 68
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006070,  // ..**......***....
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 69
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E018,  // ..***........**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x000181FC,  // .**......*******..
-     0x000181FC,  // .**......*******..
-     0x0001800C,  // .**...........**..
-     0x0001C00C,  // .***..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x0000703C,  // ...***......****..
-     0x00003FEC,  // ....*********.**..
-     0x00000FC4,  // ......******...*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00007FFC,  // ..*************..
-     0x00007FFC,  // ..*************..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 73
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000C0C,  // **......**..
-     0x00000C0C,  // **......**..
-     0x00000E1C,  // ***....***..
-     0x000007F8,  // .********...
-     0x000003F0,  // ..******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001BC0,  // ..**.****......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001C01C,  // ..***.........***..
-     0x0001C01C,  // ..***.........***..
-     0x0001E01C,  // ..****........***..
-     0x0001E03C,  // ..****.......****..
-     0x0001E03C,  // ..****.......****..
-     0x0001B02C,  // ..**.**......*.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001984C,  // ..**..**....*..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x00018C8C,  // ..**...**..*...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x0001878C,  // ..**....****...**..
-     0x0001870C,  // ..**....***....**..
-     0x0001870C,  // ..**....***....**..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 78
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 79
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C04C,  // ..**.......*..**..
-     0x0000E0FC,  // ..***.....******..
-     0x00007078,  // ...***.....****...
-     0x00003FF8,  // ....***********...
-     0x00000FCE,  // ......******..***.
-     0x00000004,  // ...............*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF8,  // ..************...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00007FF0,  // ..***********....
-     0x00007FF8,  // ..************...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 83
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 86
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001C0C,  // ..***......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E18,  // ...***....**...
-     0x00000618,  // ....**....**...
-     0x00000638,  // ....**...***...
-     0x00000730,  // ....***..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     22, 27,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00180C06,  // .**.......**.......**.
-     0x00181C06,  // .**......***.......**.
-     0x00181E0E,  // .**......****.....***.
-     0x001C1E0E,  // .***.....****.....***.
-     0x000C1E0C,  // ..**.....****.....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000E331C,  // ..***...**..**...***..
-     0x00066318,  // ...**..**...**...**...
-     0x00066198,  // ...**..**....**..**...
-     0x00066198,  // ...**..**....**..**...
-     0x000761B8,  // ...***.**....**.***...
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0E0,  // ....****......***.....
-     0x00018060,  // .....**........**.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000638,  // ....**...***...
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000730,  // ....***..**....
-     0x00000E38,  // ...***...***...
-     0x00000C1C,  // ...**.....***..
-     0x00001C0C,  // ..***......**..
-     0x0000380E,  // .***.......***.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-  },
-  {             // 92
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000040,  // *......
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-  },
-  {             // 94
-     11, 27,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D0,  // ...**.*....
-     0x000000D8,  // ...**.**...
-     0x00000088,  // ...*...*...
-     0x0000018C,  // ..**...**..
-     0x0000010C,  // ..*....**..
-     0x00000304,  // .**.....*..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x00000000,  // ..............
-  },
-  {             // 96
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 97
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 98
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x000003E0,  // ...*****.....
-  },
-  {             // 104
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000007E0,  // .******.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000638,  // .**...***...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 108
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001BE7C,  // ..**.*****..*****..
-     0x0001FFFE,  // ..****************.
-     0x0001C386,  // ..***....***....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 110
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 113
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003EC,  // ...*****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-  },
-  {             // 114
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000003E,  // ..*****.
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000070C,  // .***....**..
-     0x0000031C,  // ..**...***..
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018306,  // **.....**.....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C78E,  // .**...****...***.
-     0x0000C78C,  // .**...****...**..
-     0x0000C6CC,  // .**...**.**..**..
-     0x000064CC,  // ..**..*..**..**..
-     0x00006CD8,  // ..**.**..**.**...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00002C78,  // ...*.**...****...
-     0x00003878,  // ...***....****...
-     0x00003870,  // ...***....***....
-     0x00003870,  // ...***....***....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x0000070C,  // .***....**..
-     0x0000060E,  // .**.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000038,  // ..***...
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-  },
-  {             // 124
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 125
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000060,  // .**.....
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-  },
-  {             // 126
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000007C6,  // ..*****...**.
-     0x0000047E,  // ..*...******.
-     0x0000001C,  // ........***..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 127
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 161
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-  },
-  {             // 162
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000072C,  // ..***..*.**..
-     0x00000E26,  // .***...*..**.
-     0x00000C20,  // .**....*.....
-     0x00000C20,  // .**....*.....
-     0x00000C40,  // .**...*......
-     0x00000C40,  // .**...*......
-     0x00000C46,  // .**...*...**.
-     0x0000064E,  // ..**..*..***.
-     0x0000075C,  // ..***.*.***..
-     0x000003F8,  // ...*******...
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 163
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x00000700,  // ..***........
-     0x00000FE0,  // .*******.....
-     0x00000FA0,  // .*****.*.....
-     0x00000380,  // ...***.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
-     0x00000600,  // ..**.........
-     0x00000FFE,  // .***********.
-     0x00000FFC,  // .**********..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x000007EC,  // ..******.**..
-     0x000007FC,  // ..*********..
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000007EC,  // ..******.**..
-     0x00000204,  // ...*......*..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 165
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000618,  // ..**....**...
-     0x00000310,  // ...**...*....
-     0x00000130,  // ....*..**....
-     0x000001E0,  // ....****.....
-     0x00000EFC,  // .***.******..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 166
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 167
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000700,  // ..***........
-     0x000003C0,  // ...****......
-     0x000006F0,  // ..**.****....
-     0x00000C78,  // .**...****...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000E06,  // .***......**.
-     0x00000706,  // ..***.....**.
-     0x000003CC,  // ...****..**..
-     0x000000F8,  // .....*****...
-     0x00000070,  // ......***....
-     0x00000038,  // .......***...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000718,  // ..***...**...
-     0x000003F0,  // ...******....
-     0x000001E0,  // ....****.....
-  },
-  {             // 168
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 169
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000E38C,  // ..***...***...**..
-     0x0001C7C6,  // .***...*****...**.
-     0x00018C66,  // .**...**...**..**.
-     0x00031823,  // **...**.....*...**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031833,  // **...**.....**..**
-     0x00018C63,  // .**...**...**...**
-     0x00018FE6,  // .**...*******..**.
-     0x0000C3CE,  // ..**....****..***.
-     0x0000703C,  // ...***......****..
-     0x00003FF8,  // ....***********...
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 170
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x0000000C,  // .....**..
-     0x0000003C,  // ...****..
-     0x000000CC,  // .**..**..
-     0x000000CC,  // .**..**..
-     0x000000FE,  // .*******.
-     0x00000076,  // ..***.**.
-     0x000000FC,  // .******..
-     0x000000FC,  // .******..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 171
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000088,  // .....*...*...
-     0x00000188,  // ....**...*...
-     0x00000338,  // ...**..***...
-     0x00000620,  // ..**...*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000088,  // .....*...*...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 172
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 173
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007C,  // .*****..
-     0x0000007C,  // .*****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 174
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000FFCC,  // ..**********..**..
-     0x0001DFE6,  // .***.********..**.
-     0x00019836,  // .**..**.....**.**.
-     0x00031833,  // **...**.....**..**
-     0x00031833,  // **...**.....**..**
-     0x00031FE3,  // **...********...**
-     0x00031FF3,  // **...*********..**
-     0x00031833,  // **...**.....**..**
-     0x00019837,  // .**..**.....**.***
-     0x00019836,  // .**..**.....**.**.
-     0x0000F83E,  // ..*****.....*****.
-     0x0000703C,  // ...***......****..
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 175
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 176
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000003F0,  // ....******....
-     0x000001E0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 177
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 178
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007F,  // .*******
-     0x00000043,  // .*....**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000040,  // .*......
-     0x0000007F,  // .*******
-     0x0000003F,  // ..******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007E,  // .******.
-     0x00000046,  // .*...**.
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x00000006,  // .....**.
-     0x00000003,  // ......**
-     0x000000C3,  // **....**
-     0x0000007E,  // .******.
-     0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 181
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x00000FEF,  // .*******.****
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 182
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FF,  // ....********
-     0x000001FF,  // ...*********
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000000F6,  // ....****.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000000,  // ............
-  },
-  {             // 183
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x0000001C,  // ...***..
-     0x0000001E,  // ...****.
-     0x0000007E,  // .******.
-     0x0000001C,  // ...***..
-  },
-  {             // 185
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x00000038,  // ..***...
-     0x00000078,  // .****...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 186
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000003E,  // ..*****.
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x0000003E,  // ..*****.
-     0x0000001C,  // ...***..
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 187
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000420,  // ..*....*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000198,  // ....**..**...
-     0x00000730,  // ..***..**....
-     0x00000620,  // ..**...*.....
-     0x00000420,  // ..*....*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 188
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00018030,  // ...**.........**....
-     0x00038020,  // ..***.........*.....
-     0x00078040,  // .****........*......
-     0x000180C0,  // ...**.......**......
-     0x00018180,  // ...**......**.......
-     0x00018100,  // ...**......*........
-     0x0001830C,  // ...**.....**....**..
-     0x0001860C,  // ...**....**.....**..
-     0x0001861C,  // ...**....**....***..
-     0x00000C3C,  // ........**....****..
-     0x0000186C,  // .......**....**.**..
-     0x0000384C,  // ......***....*..**..
-     0x000030FF,  // ......**....********
-     0x000060FF,  // .....**.....********
-     0x0000E00C,  // ....***.........**..
-     0x0000C004,  // ....**...........*..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 189
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00018020,  // ...**.........*.....
-     0x00038040,  // ..***........*......
-     0x000780C0,  // .****.......**......
-     0x00018080,  // ...**.......*.......
-     0x00018180,  // ...**......**.......
-     0x00018300,  // ...**.....**........
-     0x0001863C,  // ...**....**...****..
-     0x0001867E,  // ...**....**..******.
-     0x00018C43,  // ...**...**...*....**
-     0x00001843,  // .......**....*....**
-     0x00001806,  // .......**........**.
-     0x0000300C,  // ......**........**..
-     0x00006030,  // .....**.......**....
-     0x00006040,  // .....**......*......
-     0x0000C0FF,  // ....**......********
-     0x0001803F,  // ...**.........******
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 190
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0003C010,  // ..****.........*....
-     0x0007E030,  // .******.......**....
-     0x00046060,  // .*...**......**.....
-     0x00006040,  // .....**......*......
-     0x0001C0C0,  // ...***......**......
-     0x00006180,  // .....**....**.......
-     0x0000310C,  // ......**...*....**..
-     0x000C320C,  // **....**..*.....**..
-     0x0007E61C,  // .******..**....***..
-     0x0003C43C,  // ..****...*....****..
-     0x0000086C,  // ........*....**.**..
-     0x0000184C,  // .......**....*..**..
-     0x000010FF,  // .......*....********
-     0x000020FF,  // ......*.....********
-     0x0000400C,  // .....*..........**..
-     0x00004004,  // .....*...........*..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 191
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E1C,  // ..***....***..
-     0x000007F8,  // ...********...
-     0x000003E0,  // ....*****.....
-  },
-  {             // 192
-     15, 27,
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000080,  // .......*.......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 27,
-     0x00000000,  // ...............
-     0x00000390,  // .....***..*....
-     0x000007F0,  // ....*******....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 27,
-     0x00000000,  // ...............
-     0x00000370,  // .....**.***....
-     0x00000370,  // .....**.***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 27,
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000120,  // ......*..*.....
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x0000FFFC,  // .......**************..
-     0x0000FFFC,  // .......**************..
-     0x00018C00,  // ......**...**..........
-     0x00018C00,  // ......**...**..........
-     0x00030C00,  // .....**....**..........
-     0x00030C00,  // .....**....**..........
-     0x00070C00,  // ....***....**..........
-     0x00060FFC,  // ....**.....**********..
-     0x00060FFC,  // ....**.....**********..
-     0x000C0C00,  // ...**......**..........
-     0x000FFC00,  // ...**********..........
-     0x001FFC00,  // ..***********..........
-     0x00180C00,  // ..**.......**..........
-     0x00180C00,  // ..**.......**..........
-     0x00380C00,  // .***.......**..........
-     0x00300FFE,  // .**........***********.
-     0x00700FFE,  // ***........***********.
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 199
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003018,  // ...**.......**...
-     0x00003C78,  // ...****...****...
-     0x00000FF0,  // .....********....
-     0x00000100,  // ........*........
-     0x00000380,  // .......***.......
-     0x000001C0,  // ........***......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-  },
-  {             // 200
-     15, 27,
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000320,  // .....**..*.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 27,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     6, 27,
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 27,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     7, 27,
-     0x00000018,  // ..**...
-     0x0000003C,  // .****..
-     0x00000026,  // .*..**.
-     0x00000062,  // **...*.
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 207
-     6, 27,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006078,  // ..**......****...
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0001FE0C,  // ********.....**..
-     0x0001FE0C,  // ********.....**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 209
-     17, 27,
-     0x00000000,  // .................
-     0x00000760,  // ......***.**.....
-     0x00000FE0,  // .....*******.....
-     0x000000C0,  // .........**......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 210
-     18, 27,
-     0x00000C00,  // ......**..........
-     0x00000600,  // .......**.........
-     0x00000300,  // ........**........
-     0x00000100,  // .........*........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 211
-     18, 27,
-     0x000000C0,  // ..........**......
-     0x00000180,  // .........**.......
-     0x00000300,  // ........**........
-     0x00000200,  // ........*.........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 212
-     18, 27,
-     0x00000300,  // ........**........
-     0x00000780,  // .......****.......
-     0x00000480,  // .......*..*.......
-     0x00000840,  // ......*....*......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 213
-     18, 27,
-     0x00000000,  // ..................
-     0x00000E60,  // ......***..**.....
-     0x00000FC0,  // ......******......
-     0x000000C0,  // ..........**......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 214
-     18, 27,
-     0x00000000,  // ..................
-     0x00000CC0,  // ......**..**......
-     0x00000CC0,  // ......**..**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 215
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x0000070C,  // ..***....**..
-     0x00000398,  // ...***..**...
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x000000F0,  // .....****....
-     0x000001B8,  // ....**.***...
-     0x0000031C,  // ...**...***..
-     0x0000020C,  // ...*.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 216
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC6,  // ......******...**.
-     0x00003FF4,  // ....**********.*..
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C02C,  // ..**........*.**..
-     0x0001C04E,  // .***.......*..***.
-     0x000180C6,  // .**.......**...**.
-     0x00018186,  // .**......**....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018606,  // .**....**......**.
-     0x00018C06,  // .**...**.......**.
-     0x00019806,  // .**..**........**.
-     0x0000F00C,  // ..****........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x0001FFF0,  // .*************....
-     0x00011FC0,  // .*...*******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 217
-     17, 27,
-     0x00000E00,  // .....***.........
-     0x00000600,  // ......**.........
-     0x00000300,  // .......**........
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 218
-     17, 27,
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000100,  // ........*........
-     0x00000200,  // .......*.........
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 219
-     17, 27,
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x00000C40,  // .....**...*......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 220
-     17, 27,
-     0x00000000,  // .................
-     0x00000EC0,  // .....***.**......
-     0x00000EC0,  // .....***.**......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 221
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000181C,  // ..**......***..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000003F8,  // ....*******...
-     0x0000071C,  // ...***...***..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000061C,  // ...**....***..
-     0x00000670,  // ...**..***....
-     0x00000678,  // ...**..****...
-     0x0000060C,  // ...**.....**..
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x0000060C,  // ...**.....**..
-     0x0000067C,  // ...**..*****..
-     0x00000670,  // ...**..***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 224
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 225
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 226
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 227
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 228
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x00000120,  // ....*..*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 230
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0000F9F8,  // ....*****..******...
-     0x0003FFFC,  // ..****************..
-     0x0003070E,  // ..**.....***....***.
-     0x00020606,  // ..*......**......**.
-     0x00000E06,  // ........***......**.
-     0x0001FFFE,  // ...****************.
-     0x0003F7FE,  // ..******.**********.
-     0x00070600,  // .***.....**.........
-     0x00060606,  // .**......**......**.
-     0x00060F0E,  // .**.....****....***.
-     0x0007FBFC,  // .********.********..
-     0x0003E1F8,  // ..*****....******...
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 231
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x0000039C,  // ..***..***..
-     0x000001F8,  // ...******...
-     0x00000040,  // .....*......
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-  },
-  {             // 232
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 233
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 234
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000B0,  // .....*.**....
-     0x00000190,  // ....**..*....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 235
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001B8,  // ....**.***...
-     0x000001B8,  // ....**.***...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 236
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 237
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 238
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 240
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000210,  // ...*....*....
-     0x000003E0,  // ...*****.....
-     0x000003C0,  // ...****......
-     0x00000260,  // ...*..**.....
-     0x00000070,  // ......***....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 241
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 242
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 243
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 244
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 245
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 246
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 247
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 248
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E4,  // ....*****..*..
-     0x00000FF8,  // ..*********...
-     0x00000C18,  // ..**.....**...
-     0x0000183C,  // .**.....****..
-     0x0000184C,  // .**....*..**..
-     0x000018CC,  // .**...**..**..
-     0x0000198C,  // .**..**...**..
-     0x00001B0C,  // .**.**....**..
-     0x00001A1C,  // .**.*....***..
-     0x00000C38,  // ..**....***...
-     0x00000FF0,  // ..********....
-     0x000013E0,  // .*..*****.....
-     0x00001000,  // .*............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 249
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 250
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000070,  // ......***....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 251
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 252
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000370,  // ...**.***....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // ......***...
-     0x00000070,  // .....***....
-     0x00000040,  // .....*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 254
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 255
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001B8,  // ...**.***...
-     0x000001B8,  // ...**.***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  };
diff --git a/fontosd-iso8859-13.c b/fontosd-iso8859-13.c
deleted file mode 100644
index 29a5d7894..000000000
--- a/fontosd-iso8859-13.c
+++ /dev/null
@@ -1,6722 +0,0 @@
-static const cFont::tPixelData FontOsd_iso8859_13[][29] = {
-  {             // 32
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 33
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000022,  // ..*...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00000188,  // ....**...*...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000118,  // ....*...**...
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000310,  // ...**...*....
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000230,  // ...*...**....
-     0x00000630,  // ..**...**....
-     0x00000620,  // ..**...*.....
-     0x00000620,  // ..**...*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000007F8,  // ..********...
-     0x0000065C,  // ..**..*.***..
-     0x00000CCC,  // .**..**..**..
-     0x00000CCC,  // .**..**..**..
-     0x00000CC0,  // .**..**......
-     0x00000CC0,  // .**..**......
-     0x000007C0,  // ..*****......
-     0x000003F0,  // ...******....
-     0x000001FC,  // ....*******..
-     0x000000CE,  // .....**..***.
-     0x000000C6,  // .....**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CCE,  // .**..**..***.
-     0x00000E9C,  // .***.*..***..
-     0x000007F8,  // ..********...
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0001C020,  // ...***........*.....
-     0x0007F060,  // .*******.....**.....
-     0x000E38C0,  // ***...***...**......
-     0x000C1880,  // **.....**...*.......
-     0x000C1980,  // **.....**..**.......
-     0x000E3900,  // ***...***..*........
-     0x0007F300,  // .*******..**........
-     0x0003E200,  // ..*****...*.........
-     0x0000063C,  // .........**...****..
-     0x00000C7E,  // ........**...******.
-     0x00000CE6,  // ........**..***..**.
-     0x000018C3,  // .......**...**....**
-     0x000010C3,  // .......*....**....**
-     0x000030C3,  // ......**....**....**
-     0x0000607E,  // .....**......******.
-     0x0000603C,  // .....**.......****..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 38
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000006E0,  // ....**.***.....
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000FCC,  // ...******..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000306C,  // .**.....**.**..
-     0x00003038,  // .**......***...
-     0x00003038,  // .**......***...
-     0x0000383C,  // .***.....****..
-     0x00001FEE,  // ..********.***.
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 40
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000008,  // ....*...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000040,  // .*......
-     0x00000020,  // ..*.....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000040,  // .*......
-  },
-  {             // 42
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x000000D6,  // .**.*.**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x00000044,  // ..*...*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 44
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 45
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 46
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000040,  // *......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001E0,  // ....****.....
-     0x000007E0,  // ..******.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000001C,  // ........***..
-     0x00000078,  // ......****...
-     0x000001E0,  // ....****.....
-     0x00000380,  // ...***.......
-     0x00000700,  // ..***........
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x000000F0,  // .....****....
-     0x000000FC,  // .....******..
-     0x0000000C,  // .........**..
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000218,  // ...*....**...
-     0x00000618,  // ..**....**...
-     0x00000C18,  // .**.....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007F0,  // ..*******....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0E,  // .**......***.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0C,  // .***.....**..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000070C,  // ..***....**..
-     0x0000060E,  // ..**.....***.
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000004,  // ..........*..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000380,  // ...***.......
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003F0,  // ...******....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E1E,  // .***....****.
-     0x000007FE,  // ..**********.
-     0x000001F6,  // ....*****.**.
-     0x00000006,  // ..........**.
-     0x0000000E,  // .........***.
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000002,  // ...........*.
-     0x0000000E,  // .........***.
-     0x0000003C,  // .......****..
-     0x000001E0,  // ....****.....
-     0x00000780,  // ..****.......
-     0x00000E00,  // .***.........
-     0x00000F00,  // .****........
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000000E,  // .........***.
-     0x00000002,  // ...........*.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 61
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 62
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000800,  // .*...........
-     0x00000E00,  // .***.........
-     0x000003C0,  // ...****......
-     0x000000F0,  // .....****....
-     0x0000003E,  // .......*****.
-     0x00000006,  // ..........**.
-     0x0000001E,  // ........****.
-     0x00000078,  // ......****...
-     0x000003C0,  // ...****......
-     0x00000F00,  // .****........
-     0x00000800,  // .*...........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00003F00,  // .........******........
-     0x0001FFE0,  // ......************.....
-     0x0003C0F0,  // .....****......****....
-     0x00070038,  // ....***..........***...
-     0x000E001C,  // ...***............***..
-     0x001C1E8C,  // ..***.....****.*...**..
-     0x00187FCE,  // ..**....*********..***.
-     0x0018E1C6,  // ..**...***....***...**.
-     0x0030C186,  // .**....**.....**....**.
-     0x00318186,  // .**...**......**....**.
-     0x00318186,  // .**...**......**....**.
-     0x0031830C,  // .**...**.....**....**..
-     0x0031830C,  // .**...**.....**....**..
-     0x0039C718,  // .***..***...***...**...
-     0x0018FFF0,  // ..**...************....
-     0x001C71E0,  // ..***...***...****.....
-     0x000E0000,  // ...***.................
-     0x00078000,  // ....****...............
-     0x0003FF80,  // .....***********.......
-     0x00007F00,  // ........*******........
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 65
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 68
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006070,  // ..**......***....
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 69
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E018,  // ..***........**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x000181FC,  // .**......*******..
-     0x000181FC,  // .**......*******..
-     0x0001800C,  // .**...........**..
-     0x0001C00C,  // .***..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x0000703C,  // ...***......****..
-     0x00003FEC,  // ....*********.**..
-     0x00000FC4,  // ......******...*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00007FFC,  // ..*************..
-     0x00007FFC,  // ..*************..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 73
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000C0C,  // **......**..
-     0x00000C0C,  // **......**..
-     0x00000E1C,  // ***....***..
-     0x000007F8,  // .********...
-     0x000003F0,  // ..******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001BC0,  // ..**.****......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001C01C,  // ..***.........***..
-     0x0001C01C,  // ..***.........***..
-     0x0001E01C,  // ..****........***..
-     0x0001E03C,  // ..****.......****..
-     0x0001E03C,  // ..****.......****..
-     0x0001B02C,  // ..**.**......*.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001984C,  // ..**..**....*..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x00018C8C,  // ..**...**..*...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x0001878C,  // ..**....****...**..
-     0x0001870C,  // ..**....***....**..
-     0x0001870C,  // ..**....***....**..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 78
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 79
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C04C,  // ..**.......*..**..
-     0x0000E0FC,  // ..***.....******..
-     0x00007078,  // ...***.....****...
-     0x00003FF8,  // ....***********...
-     0x00000FCE,  // ......******..***.
-     0x00000004,  // ...............*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF8,  // ..************...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00007FF0,  // ..***********....
-     0x00007FF8,  // ..************...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 83
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 86
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001C0C,  // ..***......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E18,  // ...***....**...
-     0x00000618,  // ....**....**...
-     0x00000638,  // ....**...***...
-     0x00000730,  // ....***..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     22, 27,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00180C06,  // .**.......**.......**.
-     0x00181C06,  // .**......***.......**.
-     0x00181E0E,  // .**......****.....***.
-     0x001C1E0E,  // .***.....****.....***.
-     0x000C1E0C,  // ..**.....****.....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000E331C,  // ..***...**..**...***..
-     0x00066318,  // ...**..**...**...**...
-     0x00066198,  // ...**..**....**..**...
-     0x00066198,  // ...**..**....**..**...
-     0x000761B8,  // ...***.**....**.***...
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0E0,  // ....****......***.....
-     0x00018060,  // .....**........**.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000638,  // ....**...***...
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000730,  // ....***..**....
-     0x00000E38,  // ...***...***...
-     0x00000C1C,  // ...**.....***..
-     0x00001C0C,  // ..***......**..
-     0x0000380E,  // .***.......***.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-  },
-  {             // 92
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000040,  // *......
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-  },
-  {             // 94
-     11, 27,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D0,  // ...**.*....
-     0x000000D8,  // ...**.**...
-     0x00000088,  // ...*...*...
-     0x0000018C,  // ..**...**..
-     0x0000010C,  // ..*....**..
-     0x00000304,  // .**.....*..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x00000000,  // ..............
-  },
-  {             // 96
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 97
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 98
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x000003E0,  // ...*****.....
-  },
-  {             // 104
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000007E0,  // .******.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000638,  // .**...***...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 108
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001BE7C,  // ..**.*****..*****..
-     0x0001FFFE,  // ..****************.
-     0x0001C386,  // ..***....***....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 110
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 113
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003EC,  // ...*****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-  },
-  {             // 114
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000003E,  // ..*****.
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000070C,  // .***....**..
-     0x0000031C,  // ..**...***..
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018306,  // **.....**.....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C78E,  // .**...****...***.
-     0x0000C78C,  // .**...****...**..
-     0x0000C6CC,  // .**...**.**..**..
-     0x000064CC,  // ..**..*..**..**..
-     0x00006CD8,  // ..**.**..**.**...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00002C78,  // ...*.**...****...
-     0x00003878,  // ...***....****...
-     0x00003870,  // ...***....***....
-     0x00003870,  // ...***....***....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x0000070C,  // .***....**..
-     0x0000060E,  // .**.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000038,  // ..***...
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-  },
-  {             // 124
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 125
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000060,  // .**.....
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-  },
-  {             // 126
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000007C6,  // ..*****...**.
-     0x0000047E,  // ..*...******.
-     0x0000001C,  // ........***..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 127
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 161
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-  },
-  {             // 162
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000072C,  // ..***..*.**..
-     0x00000E26,  // .***...*..**.
-     0x00000C20,  // .**....*.....
-     0x00000C20,  // .**....*.....
-     0x00000C40,  // .**...*......
-     0x00000C40,  // .**...*......
-     0x00000C46,  // .**...*...**.
-     0x0000064E,  // ..**..*..***.
-     0x0000075C,  // ..***.*.***..
-     0x000003F8,  // ...*******...
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 163
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x00000700,  // ..***........
-     0x00000FE0,  // .*******.....
-     0x00000FA0,  // .*****.*.....
-     0x00000380,  // ...***.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
-     0x00000600,  // ..**.........
-     0x00000FFE,  // .***********.
-     0x00000FFC,  // .**********..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FFC,  // ....***********..
-     0x0000781E,  // ..****......****.
-     0x00007006,  // ..***.........**.
-     0x00007006,  // ..***.........**.
-     0x0001FF00,  // *********........
-     0x0001FF00,  // *********........
-     0x0000E000,  // .***.............
-     0x0000E000,  // .***.............
-     0x0000E000,  // .***.............
-     0x0001FF00,  // *********........
-     0x0001FF00,  // *********........
-     0x00007006,  // ..***.........**.
-     0x0000781E,  // ..****......****.
-     0x0000781E,  // ..****......****.
-     0x00001FFC,  // ....***********..
-     0x000007E0,  // ......******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 165
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000618,  // ..**....**...
-     0x00000310,  // ...**...*....
-     0x00000130,  // ....*..**....
-     0x000001E0,  // ....****.....
-     0x00000EFC,  // .***.******..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 166
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 167
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000700,  // ..***........
-     0x000003C0,  // ...****......
-     0x000006F0,  // ..**.****....
-     0x00000C78,  // .**...****...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000E06,  // .***......**.
-     0x00000706,  // ..***.....**.
-     0x000003CC,  // ...****..**..
-     0x000000F8,  // .....*****...
-     0x00000070,  // ......***....
-     0x00000038,  // .......***...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000718,  // ..***...**...
-     0x000003F0,  // ...******....
-     0x000001E0,  // ....****.....
-  },
-  {             // 168
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC6,  // ......******...**.
-     0x00003FF4,  // ....**********.*..
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C02C,  // ..**........*.**..
-     0x0001C04E,  // .***.......*..***.
-     0x000180C6,  // .**.......**...**.
-     0x00018186,  // .**......**....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018606,  // .**....**......**.
-     0x00018C06,  // .**...**.......**.
-     0x00019806,  // .**..**........**.
-     0x0000F00C,  // ..****........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x0001FFF0,  // .*************....
-     0x00011FC0,  // .*...*******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 169
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000E38C,  // ..***...***...**..
-     0x0001C7C6,  // .***...*****...**.
-     0x00018C66,  // .**...**...**..**.
-     0x00031823,  // **...**.....*...**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031833,  // **...**.....**..**
-     0x00018C63,  // .**...**...**...**
-     0x00018FE6,  // .**...*******..**.
-     0x0000C3CE,  // ..**....****..***.
-     0x0000703C,  // ...***......****..
-     0x00003FF8,  // ....***********...
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 170
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x0000000C,  // .....**..
-     0x0000003C,  // ...****..
-     0x000000CC,  // .**..**..
-     0x000000CC,  // .**..**..
-     0x000000FE,  // .*******.
-     0x00000076,  // ..***.**.
-     0x000000FC,  // .******..
-     0x000000FC,  // .******..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 171
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000088,  // .....*...*...
-     0x00000188,  // ....**...*...
-     0x00000338,  // ...**..***...
-     0x00000620,  // ..**...*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000088,  // .....*...*...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 172
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 173
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007C,  // .*****..
-     0x0000007C,  // .*****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 174
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000FFCC,  // ..**********..**..
-     0x0001DFE6,  // .***.********..**.
-     0x00019836,  // .**..**.....**.**.
-     0x00031833,  // **...**.....**..**
-     0x00031833,  // **...**.....**..**
-     0x00031FE3,  // **...********...**
-     0x00031FF3,  // **...*********..**
-     0x00031833,  // **...**.....**..**
-     0x00019837,  // .**..**.....**.***
-     0x00019836,  // .**..**.....**.**.
-     0x0000F83E,  // ..*****.....*****.
-     0x0000703C,  // ...***......****..
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 175
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 176
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000003F0,  // ....******....
-     0x000001E0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 177
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 178
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007F,  // .*******
-     0x00000043,  // .*....**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000040,  // .*......
-     0x0000007F,  // .*******
-     0x0000003F,  // ..******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007E,  // .******.
-     0x00000046,  // .*...**.
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x00000006,  // .....**.
-     0x00000003,  // ......**
-     0x000000C3,  // **....**
-     0x0000007E,  // .******.
-     0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000022,  // ..*...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 181
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x00000FEF,  // .*******.****
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 182
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FF,  // ....********
-     0x000001FF,  // ...*********
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000000F6,  // ....****.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000000,  // ............
-  },
-  {             // 183
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E4,  // ....*****..*..
-     0x00000FF8,  // ..*********...
-     0x00000C18,  // ..**.....**...
-     0x0000183C,  // .**.....****..
-     0x0000184C,  // .**....*..**..
-     0x000018CC,  // .**...**..**..
-     0x0000198C,  // .**..**...**..
-     0x00001B0C,  // .**.**....**..
-     0x00001A1C,  // .**.*....***..
-     0x00000C38,  // ..**....***...
-     0x00000FF0,  // ..********....
-     0x000013E0,  // .*..*****.....
-     0x00001000,  // .*............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 185
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x00000038,  // ..***...
-     0x00000078,  // .****...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 186
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000003E,  // ..*****.
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x0000003E,  // ..*****.
-     0x0000001C,  // ...***..
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 187
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000420,  // ..*....*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000198,  // ....**..**...
-     0x00000730,  // ..***..**....
-     0x00000620,  // ..**...*.....
-     0x00000420,  // ..*....*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 188
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x0001EFFE,  // ......****.***********.
-     0x0007FFFE,  // ....******************.
-     0x001E1E00,  // ..****....****.........
-     0x001C0E00,  // ..***......***.........
-     0x001C0E00,  // ..***......***.........
-     0x003C0E00,  // .****......***.........
-     0x00380E00,  // .***.......***.........
-     0x00380FFC,  // .***.......**********..
-     0x00380FFC,  // .***.......**********..
-     0x00380FFC,  // .***.......**********..
-     0x00380E00,  // .***.......***.........
-     0x003C0E00,  // .****......***.........
-     0x001C0E00,  // ..***......***.........
-     0x001E1E00,  // ..****....****.........
-     0x001E1E00,  // ..****....****.........
-     0x0007FFFE,  // ....******************.
-     0x0001EFFE,  // ......****.***********.
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 189
-     21, 27,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x0001F9F0,  // ....******..*****....
-     0x0007FFF8,  // ..****************...
-     0x00070E0E,  // ..***....***.....***.
-     0x000E060E,  // .***......**.....***.
-     0x000E060E,  // .***......**.....***.
-     0x000E07FE,  // .***......**********.
-     0x000E0600,  // .***......**.........
-     0x000E0600,  // .***......**.........
-     0x00070F8E,  // ..***....*****...***.
-     0x00070F8E,  // ..***....*****...***.
-     0x0007FFFE,  // ..******************.
-     0x0001F9F0,  // ....******..*****....
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-  },
-  {             // 190
-     17, 27,
-     0x00000000,  // .................
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000000,  // .................
-     0x0000E006,  // .***..........**.
-     0x0000E006,  // .***..........**.
-     0x0000701C,  // ..***.......***..
-     0x0000701C,  // ..***.......***..
-     0x0000701C,  // ..***.......***..
-     0x00001838,  // ....**.....***...
-     0x00001838,  // ....**.....***...
-     0x00000C60,  // .....**...**.....
-     0x000007C0,  // ......*****......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 191
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E1C,  // ..***....***..
-     0x000007F8,  // ...********...
-     0x000003E0,  // ....*****.....
-  },
-  {             // 192
-     15, 27,
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000080,  // .......*.......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 27,
-     0x00000000,  // ...............
-     0x00000390,  // .....***..*....
-     0x000007F0,  // ....*******....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 27,
-     0x00000000,  // ...............
-     0x00000370,  // .....**.***....
-     0x00000370,  // .....**.***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 27,
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000120,  // ......*..*.....
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x0000FFFC,  // .......**************..
-     0x0000FFFC,  // .......**************..
-     0x00018C00,  // ......**...**..........
-     0x00018C00,  // ......**...**..........
-     0x00030C00,  // .....**....**..........
-     0x00030C00,  // .....**....**..........
-     0x00070C00,  // ....***....**..........
-     0x00060FFC,  // ....**.....**********..
-     0x00060FFC,  // ....**.....**********..
-     0x000C0C00,  // ...**......**..........
-     0x000FFC00,  // ...**********..........
-     0x001FFC00,  // ..***********..........
-     0x00180C00,  // ..**.......**..........
-     0x00180C00,  // ..**.......**..........
-     0x00380C00,  // .***.......**..........
-     0x00300FFE,  // .**........***********.
-     0x00700FFE,  // ***........***********.
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 199
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003018,  // ...**.......**...
-     0x00003C78,  // ...****...****...
-     0x00000FF0,  // .....********....
-     0x00000100,  // ........*........
-     0x00000380,  // .......***.......
-     0x000001C0,  // ........***......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-  },
-  {             // 200
-     15, 27,
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000320,  // .....**..*.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 27,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     6, 27,
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 27,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     7, 27,
-     0x00000018,  // ..**...
-     0x0000003C,  // .****..
-     0x00000026,  // .*..**.
-     0x00000062,  // **...*.
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 207
-     6, 27,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     16, 27,
-     0x00000C30,  // ....**....**....
-     0x00000660,  // .....**..**.....
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x00000000,  // ................
-     0x000007E0,  // .....******.....
-     0x00003FFC,  // ..************..
-     0x0000781E,  // .****......****.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x00007800,  // .****...........
-     0x00003F80,  // ..*******.......
-     0x000007E0,  // .....******.....
-     0x0000007C,  // .........*****..
-     0x0000007C,  // .........*****..
-     0x0000001E,  // ...........****.
-     0x0000000E,  // ............***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00003FFC,  // ..************..
-     0x00000FE0,  // ....*******.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 209
-     17, 27,
-     0x00000000,  // .................
-     0x00000760,  // ......***.**.....
-     0x00000FE0,  // .....*******.....
-     0x000000C0,  // .........**......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 210
-     18, 27,
-     0x00000C00,  // ......**..........
-     0x00000600,  // .......**.........
-     0x00000300,  // ........**........
-     0x00000100,  // .........*........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 211
-     18, 27,
-     0x000000C0,  // ..........**......
-     0x00000180,  // .........**.......
-     0x00000300,  // ........**........
-     0x00000200,  // ........*.........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 212
-     18, 27,
-     0x00000300,  // ........**........
-     0x00000780,  // .......****.......
-     0x00000480,  // .......*..*.......
-     0x00000840,  // ......*....*......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 213
-     18, 27,
-     0x00000000,  // ..................
-     0x00000E60,  // ......***..**.....
-     0x00000FC0,  // ......******......
-     0x000000C0,  // ..........**......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 214
-     18, 27,
-     0x00000000,  // ..................
-     0x00000CC0,  // ......**..**......
-     0x00000CC0,  // ......**..**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 215
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x0000070C,  // ..***....**..
-     0x00000398,  // ...***..**...
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x000000F0,  // .....****....
-     0x000001B8,  // ....**.***...
-     0x0000031C,  // ...**...***..
-     0x0000020C,  // ...*.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 216
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC6,  // ......******...**.
-     0x00003FF4,  // ....**********.*..
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C02C,  // ..**........*.**..
-     0x0001C04E,  // .***.......*..***.
-     0x000180C6,  // .**.......**...**.
-     0x00018186,  // .**......**....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018606,  // .**....**......**.
-     0x00018C06,  // .**...**.......**.
-     0x00019806,  // .**..**........**.
-     0x0000F00C,  // ..****........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x0001FFF0,  // .*************....
-     0x00011FC0,  // .*...*******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 217
-     17, 27,
-     0x00000E00,  // .....***.........
-     0x00000600,  // ......**.........
-     0x00000300,  // .......**........
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 218
-     17, 27,
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000100,  // ........*........
-     0x00000200,  // .......*.........
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 219
-     17, 27,
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x00000C40,  // .....**...*......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 220
-     17, 27,
-     0x00000000,  // .................
-     0x00000EC0,  // .....***.**......
-     0x00000EC0,  // .....***.**......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 221
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 27,
-     0x00000618,  // ....**....**...
-     0x00000330,  // .....**..**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x0000000E,  // ...........***.
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00001C00,  // ..***..........
-     0x00003800,  // .***...........
-     0x00003800,  // .***...........
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000003F8,  // ....*******...
-     0x0000071C,  // ...***...***..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000061C,  // ...**....***..
-     0x00000670,  // ...**..***....
-     0x00000678,  // ...**..****...
-     0x0000060C,  // ...**.....**..
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x0000060C,  // ...**.....**..
-     0x0000067C,  // ...**..*****..
-     0x00000670,  // ...**..***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 224
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 225
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 226
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 227
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 228
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x00000120,  // ....*..*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 230
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0000F9F8,  // ....*****..******...
-     0x0003FFFC,  // ..****************..
-     0x0003070E,  // ..**.....***....***.
-     0x00020606,  // ..*......**......**.
-     0x00000E06,  // ........***......**.
-     0x0001FFFE,  // ...****************.
-     0x0003F7FE,  // ..******.**********.
-     0x00070600,  // .***.....**.........
-     0x00060606,  // .**......**......**.
-     0x00060F0E,  // .**.....****....***.
-     0x0007FBFC,  // .********.********..
-     0x0003E1F8,  // ..*****....******...
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 231
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x0000039C,  // ..***..***..
-     0x000001F8,  // ...******...
-     0x00000040,  // .....*......
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-  },
-  {             // 232
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 233
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 234
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000B0,  // .....*.**....
-     0x00000190,  // ....**..*....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 235
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001B8,  // ....**.***...
-     0x000001B8,  // ....**.***...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 236
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 237
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 238
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 240
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000039C,  // ..***..***..
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 241
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 242
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 243
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 244
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 245
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 246
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 247
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 248
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E4,  // ....*****..*..
-     0x00000FF8,  // ..*********...
-     0x00000C18,  // ..**.....**...
-     0x0000183C,  // .**.....****..
-     0x0000184C,  // .**....*..**..
-     0x000018CC,  // .**...**..**..
-     0x0000198C,  // .**..**...**..
-     0x00001B0C,  // .**.**....**..
-     0x00001A1C,  // .**.*....***..
-     0x00000C38,  // ..**....***...
-     0x00000FF0,  // ..********....
-     0x000013E0,  // .*..*****.....
-     0x00001000,  // .*............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 249
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 250
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000070,  // ......***....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 251
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 252
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000370,  // ...**.***....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // ......***...
-     0x00000070,  // .....***....
-     0x00000040,  // .....*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 254
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000039C,  // ..***..***..
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 255
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001B8,  // ...**.***...
-     0x000001B8,  // ...**.***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  };
diff --git a/fontosd-iso8859-15.c b/fontosd-iso8859-15.c
deleted file mode 100644
index f3008b7e4..000000000
--- a/fontosd-iso8859-15.c
+++ /dev/null
@@ -1,6722 +0,0 @@
-static const cFont::tPixelData FontOsd_iso8859_15[][29] = {
-  {             // 32
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 33
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000022,  // ..*...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00000188,  // ....**...*...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000118,  // ....*...**...
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000310,  // ...**...*....
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000230,  // ...*...**....
-     0x00000630,  // ..**...**....
-     0x00000620,  // ..**...*.....
-     0x00000620,  // ..**...*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000007F8,  // ..********...
-     0x0000065C,  // ..**..*.***..
-     0x00000CCC,  // .**..**..**..
-     0x00000CCC,  // .**..**..**..
-     0x00000CC0,  // .**..**......
-     0x00000CC0,  // .**..**......
-     0x000007C0,  // ..*****......
-     0x000003F0,  // ...******....
-     0x000001FC,  // ....*******..
-     0x000000CE,  // .....**..***.
-     0x000000C6,  // .....**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CCE,  // .**..**..***.
-     0x00000E9C,  // .***.*..***..
-     0x000007F8,  // ..********...
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0001C020,  // ...***........*.....
-     0x0007F060,  // .*******.....**.....
-     0x000E38C0,  // ***...***...**......
-     0x000C1880,  // **.....**...*.......
-     0x000C1980,  // **.....**..**.......
-     0x000E3900,  // ***...***..*........
-     0x0007F300,  // .*******..**........
-     0x0003E200,  // ..*****...*.........
-     0x0000063C,  // .........**...****..
-     0x00000C7E,  // ........**...******.
-     0x00000CE6,  // ........**..***..**.
-     0x000018C3,  // .......**...**....**
-     0x000010C3,  // .......*....**....**
-     0x000030C3,  // ......**....**....**
-     0x0000607E,  // .....**......******.
-     0x0000603C,  // .....**.......****..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 38
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000006E0,  // ....**.***.....
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000FCC,  // ...******..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000306C,  // .**.....**.**..
-     0x00003038,  // .**......***...
-     0x00003038,  // .**......***...
-     0x0000383C,  // .***.....****..
-     0x00001FEE,  // ..********.***.
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 40
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000008,  // ....*...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000040,  // .*......
-     0x00000020,  // ..*.....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000040,  // .*......
-  },
-  {             // 42
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x000000D6,  // .**.*.**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x00000044,  // ..*...*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 44
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 45
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 46
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000040,  // *......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001E0,  // ....****.....
-     0x000007E0,  // ..******.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000001C,  // ........***..
-     0x00000078,  // ......****...
-     0x000001E0,  // ....****.....
-     0x00000380,  // ...***.......
-     0x00000700,  // ..***........
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x000000F0,  // .....****....
-     0x000000FC,  // .....******..
-     0x0000000C,  // .........**..
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000218,  // ...*....**...
-     0x00000618,  // ..**....**...
-     0x00000C18,  // .**.....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007F0,  // ..*******....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0E,  // .**......***.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0C,  // .***.....**..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000070C,  // ..***....**..
-     0x0000060E,  // ..**.....***.
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000004,  // ..........*..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000380,  // ...***.......
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003F0,  // ...******....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E1E,  // .***....****.
-     0x000007FE,  // ..**********.
-     0x000001F6,  // ....*****.**.
-     0x00000006,  // ..........**.
-     0x0000000E,  // .........***.
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000002,  // ...........*.
-     0x0000000E,  // .........***.
-     0x0000003C,  // .......****..
-     0x000001E0,  // ....****.....
-     0x00000780,  // ..****.......
-     0x00000E00,  // .***.........
-     0x00000F00,  // .****........
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000000E,  // .........***.
-     0x00000002,  // ...........*.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 61
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 62
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000800,  // .*...........
-     0x00000E00,  // .***.........
-     0x000003C0,  // ...****......
-     0x000000F0,  // .....****....
-     0x0000003E,  // .......*****.
-     0x00000006,  // ..........**.
-     0x0000001E,  // ........****.
-     0x00000078,  // ......****...
-     0x000003C0,  // ...****......
-     0x00000F00,  // .****........
-     0x00000800,  // .*...........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00003F00,  // .........******........
-     0x0001FFE0,  // ......************.....
-     0x0003C0F0,  // .....****......****....
-     0x00070038,  // ....***..........***...
-     0x000E001C,  // ...***............***..
-     0x001C1E8C,  // ..***.....****.*...**..
-     0x00187FCE,  // ..**....*********..***.
-     0x0018E1C6,  // ..**...***....***...**.
-     0x0030C186,  // .**....**.....**....**.
-     0x00318186,  // .**...**......**....**.
-     0x00318186,  // .**...**......**....**.
-     0x0031830C,  // .**...**.....**....**..
-     0x0031830C,  // .**...**.....**....**..
-     0x0039C718,  // .***..***...***...**...
-     0x0018FFF0,  // ..**...************....
-     0x001C71E0,  // ..***...***...****.....
-     0x000E0000,  // ...***.................
-     0x00078000,  // ....****...............
-     0x0003FF80,  // .....***********.......
-     0x00007F00,  // ........*******........
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 65
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 68
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006070,  // ..**......***....
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 69
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E018,  // ..***........**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x000181FC,  // .**......*******..
-     0x000181FC,  // .**......*******..
-     0x0001800C,  // .**...........**..
-     0x0001C00C,  // .***..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x0000703C,  // ...***......****..
-     0x00003FEC,  // ....*********.**..
-     0x00000FC4,  // ......******...*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00007FFC,  // ..*************..
-     0x00007FFC,  // ..*************..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 73
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000C0C,  // **......**..
-     0x00000C0C,  // **......**..
-     0x00000E1C,  // ***....***..
-     0x000007F8,  // .********...
-     0x000003F0,  // ..******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001BC0,  // ..**.****......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001C01C,  // ..***.........***..
-     0x0001C01C,  // ..***.........***..
-     0x0001E01C,  // ..****........***..
-     0x0001E03C,  // ..****.......****..
-     0x0001E03C,  // ..****.......****..
-     0x0001B02C,  // ..**.**......*.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001984C,  // ..**..**....*..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x00018C8C,  // ..**...**..*...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x0001878C,  // ..**....****...**..
-     0x0001870C,  // ..**....***....**..
-     0x0001870C,  // ..**....***....**..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 78
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 79
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C04C,  // ..**.......*..**..
-     0x0000E0FC,  // ..***.....******..
-     0x00007078,  // ...***.....****...
-     0x00003FF8,  // ....***********...
-     0x00000FCE,  // ......******..***.
-     0x00000004,  // ...............*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF8,  // ..************...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00007FF0,  // ..***********....
-     0x00007FF8,  // ..************...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 83
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 86
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001C0C,  // ..***......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E18,  // ...***....**...
-     0x00000618,  // ....**....**...
-     0x00000638,  // ....**...***...
-     0x00000730,  // ....***..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     22, 27,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00180C06,  // .**.......**.......**.
-     0x00181C06,  // .**......***.......**.
-     0x00181E0E,  // .**......****.....***.
-     0x001C1E0E,  // .***.....****.....***.
-     0x000C1E0C,  // ..**.....****.....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000E331C,  // ..***...**..**...***..
-     0x00066318,  // ...**..**...**...**...
-     0x00066198,  // ...**..**....**..**...
-     0x00066198,  // ...**..**....**..**...
-     0x000761B8,  // ...***.**....**.***...
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0E0,  // ....****......***.....
-     0x00018060,  // .....**........**.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000638,  // ....**...***...
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000730,  // ....***..**....
-     0x00000E38,  // ...***...***...
-     0x00000C1C,  // ...**.....***..
-     0x00001C0C,  // ..***......**..
-     0x0000380E,  // .***.......***.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-  },
-  {             // 92
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000040,  // *......
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-  },
-  {             // 94
-     11, 27,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D0,  // ...**.*....
-     0x000000D8,  // ...**.**...
-     0x00000088,  // ...*...*...
-     0x0000018C,  // ..**...**..
-     0x0000010C,  // ..*....**..
-     0x00000304,  // .**.....*..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x00000000,  // ..............
-  },
-  {             // 96
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 97
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 98
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x000003E0,  // ...*****.....
-  },
-  {             // 104
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000007E0,  // .******.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000638,  // .**...***...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 108
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001BE7C,  // ..**.*****..*****..
-     0x0001FFFE,  // ..****************.
-     0x0001C386,  // ..***....***....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 110
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 113
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003EC,  // ...*****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-  },
-  {             // 114
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000003E,  // ..*****.
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000070C,  // .***....**..
-     0x0000031C,  // ..**...***..
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018306,  // **.....**.....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C78E,  // .**...****...***.
-     0x0000C78C,  // .**...****...**..
-     0x0000C6CC,  // .**...**.**..**..
-     0x000064CC,  // ..**..*..**..**..
-     0x00006CD8,  // ..**.**..**.**...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00002C78,  // ...*.**...****...
-     0x00003878,  // ...***....****...
-     0x00003870,  // ...***....***....
-     0x00003870,  // ...***....***....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x0000070C,  // .***....**..
-     0x0000060E,  // .**.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000038,  // ..***...
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-  },
-  {             // 124
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 125
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000060,  // .**.....
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-  },
-  {             // 126
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000007C6,  // ..*****...**.
-     0x0000047E,  // ..*...******.
-     0x0000001C,  // ........***..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 127
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 161
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-  },
-  {             // 162
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000072C,  // ..***..*.**..
-     0x00000E26,  // .***...*..**.
-     0x00000C20,  // .**....*.....
-     0x00000C20,  // .**....*.....
-     0x00000C40,  // .**...*......
-     0x00000C40,  // .**...*......
-     0x00000C46,  // .**...*...**.
-     0x0000064E,  // ..**..*..***.
-     0x0000075C,  // ..***.*.***..
-     0x000003F8,  // ...*******...
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 163
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x00000700,  // ..***........
-     0x00000FE0,  // .*******.....
-     0x00000FA0,  // .*****.*.....
-     0x00000380,  // ...***.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
-     0x00000600,  // ..**.........
-     0x00000FFE,  // .***********.
-     0x00000FFC,  // .**********..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FFC,  // ....***********..
-     0x0000781E,  // ..****......****.
-     0x00007006,  // ..***.........**.
-     0x00007006,  // ..***.........**.
-     0x0001FF00,  // *********........
-     0x0001FF00,  // *********........
-     0x0000E000,  // .***.............
-     0x0000E000,  // .***.............
-     0x0000E000,  // .***.............
-     0x0001FF00,  // *********........
-     0x0001FF00,  // *********........
-     0x00007006,  // ..***.........**.
-     0x0000781E,  // ..****......****.
-     0x0000781E,  // ..****......****.
-     0x00001FFC,  // ....***********..
-     0x000007E0,  // ......******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 165
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000618,  // ..**....**...
-     0x00000310,  // ...**...*....
-     0x00000130,  // ....*..**....
-     0x000001E0,  // ....****.....
-     0x00000EFC,  // .***.******..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 166
-     16, 27,
-     0x00000C30,  // ....**....**....
-     0x00000660,  // .....**..**.....
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x00000000,  // ................
-     0x000007E0,  // .....******.....
-     0x00003FFC,  // ..************..
-     0x0000781E,  // .****......****.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x00007800,  // .****...........
-     0x00003F80,  // ..*******.......
-     0x000007E0,  // .....******.....
-     0x0000007C,  // .........*****..
-     0x0000007C,  // .........*****..
-     0x0000001E,  // ...........****.
-     0x0000000E,  // ............***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00003FFC,  // ..************..
-     0x00000FE0,  // ....*******.....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 167
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000700,  // ..***........
-     0x000003C0,  // ...****......
-     0x000006F0,  // ..**.****....
-     0x00000C78,  // .**...****...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000E06,  // .***......**.
-     0x00000706,  // ..***.....**.
-     0x000003CC,  // ...****..**..
-     0x000000F8,  // .....*****...
-     0x00000070,  // ......***....
-     0x00000038,  // .......***...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000718,  // ..***...**...
-     0x000003F0,  // ...******....
-     0x000001E0,  // ....****.....
-  },
-  {             // 168
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000039C,  // ..***..***..
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 169
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000E38C,  // ..***...***...**..
-     0x0001C7C6,  // .***...*****...**.
-     0x00018C66,  // .**...**...**..**.
-     0x00031823,  // **...**.....*...**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031833,  // **...**.....**..**
-     0x00018C63,  // .**...**...**...**
-     0x00018FE6,  // .**...*******..**.
-     0x0000C3CE,  // ..**....****..***.
-     0x0000703C,  // ...***......****..
-     0x00003FF8,  // ....***********...
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 170
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x0000000C,  // .....**..
-     0x0000003C,  // ...****..
-     0x000000CC,  // .**..**..
-     0x000000CC,  // .**..**..
-     0x000000FE,  // .*******.
-     0x00000076,  // ..***.**.
-     0x000000FC,  // .******..
-     0x000000FC,  // .******..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 171
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000088,  // .....*...*...
-     0x00000188,  // ....**...*...
-     0x00000338,  // ...**..***...
-     0x00000620,  // ..**...*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000088,  // .....*...*...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 172
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 173
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007C,  // .*****..
-     0x0000007C,  // .*****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 174
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000FFCC,  // ..**********..**..
-     0x0001DFE6,  // .***.********..**.
-     0x00019836,  // .**..**.....**.**.
-     0x00031833,  // **...**.....**..**
-     0x00031833,  // **...**.....**..**
-     0x00031FE3,  // **...********...**
-     0x00031FF3,  // **...*********..**
-     0x00031833,  // **...**.....**..**
-     0x00019837,  // .**..**.....**.***
-     0x00019836,  // .**..**.....**.**.
-     0x0000F83E,  // ..*****.....*****.
-     0x0000703C,  // ...***......****..
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 175
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 176
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000003F0,  // ....******....
-     0x000001E0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 177
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 178
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007F,  // .*******
-     0x00000043,  // .*....**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000040,  // .*......
-     0x0000007F,  // .*******
-     0x0000003F,  // ..******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007E,  // .******.
-     0x00000046,  // .*...**.
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x00000006,  // .....**.
-     0x00000003,  // ......**
-     0x000000C3,  // **....**
-     0x0000007E,  // .******.
-     0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     15, 27,
-     0x00000618,  // ....**....**...
-     0x00000330,  // .....**..**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x0000000E,  // ...........***.
-     0x00000018,  // ..........**...
-     0x00000018,  // ..........**...
-     0x00000030,  // .........**....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x000003C0,  // .....****......
-     0x000003C0,  // .....****......
-     0x00000300,  // .....**........
-     0x00000600,  // ....**.........
-     0x00001C00,  // ..***..........
-     0x00003800,  // .***...........
-     0x00003800,  // .***...........
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 181
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x00000FEF,  // .*******.****
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 182
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FF,  // ....********
-     0x000001FF,  // ...*********
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000000F6,  // ....****.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000000,  // ............
-  },
-  {             // 183
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000039C,  // ..***..***..
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 185
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x00000038,  // ..***...
-     0x00000078,  // .****...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 186
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000003E,  // ..*****.
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x0000003E,  // ..*****.
-     0x0000001C,  // ...***..
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 187
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000420,  // ..*....*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000198,  // ....**..**...
-     0x00000730,  // ..***..**....
-     0x00000620,  // ..**...*.....
-     0x00000420,  // ..*....*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 188
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x0001EFFE,  // ......****.***********.
-     0x0007FFFE,  // ....******************.
-     0x001E1E00,  // ..****....****.........
-     0x001C0E00,  // ..***......***.........
-     0x001C0E00,  // ..***......***.........
-     0x003C0E00,  // .****......***.........
-     0x00380E00,  // .***.......***.........
-     0x00380FFC,  // .***.......**********..
-     0x00380FFC,  // .***.......**********..
-     0x00380FFC,  // .***.......**********..
-     0x00380E00,  // .***.......***.........
-     0x003C0E00,  // .****......***.........
-     0x001C0E00,  // ..***......***.........
-     0x001E1E00,  // ..****....****.........
-     0x001E1E00,  // ..****....****.........
-     0x0007FFFE,  // ....******************.
-     0x0001EFFE,  // ......****.***********.
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 189
-     21, 27,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x0001F9F0,  // ....******..*****....
-     0x0007FFF8,  // ..****************...
-     0x00070E0E,  // ..***....***.....***.
-     0x000E060E,  // .***......**.....***.
-     0x000E060E,  // .***......**.....***.
-     0x000E07FE,  // .***......**********.
-     0x000E0600,  // .***......**.........
-     0x000E0600,  // .***......**.........
-     0x00070F8E,  // ..***....*****...***.
-     0x00070F8E,  // ..***....*****...***.
-     0x0007FFFE,  // ..******************.
-     0x0001F9F0,  // ....******..*****....
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-  },
-  {             // 190
-     17, 27,
-     0x00000000,  // .................
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000000,  // .................
-     0x0000E006,  // .***..........**.
-     0x0000E006,  // .***..........**.
-     0x0000701C,  // ..***.......***..
-     0x0000701C,  // ..***.......***..
-     0x0000701C,  // ..***.......***..
-     0x00001838,  // ....**.....***...
-     0x00001838,  // ....**.....***...
-     0x00000C60,  // .....**...**.....
-     0x000007C0,  // ......*****......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 191
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E1C,  // ..***....***..
-     0x000007F8,  // ...********...
-     0x000003E0,  // ....*****.....
-  },
-  {             // 192
-     15, 27,
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000080,  // .......*.......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 27,
-     0x00000000,  // ...............
-     0x00000390,  // .....***..*....
-     0x000007F0,  // ....*******....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 27,
-     0x00000000,  // ...............
-     0x00000370,  // .....**.***....
-     0x00000370,  // .....**.***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 27,
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000120,  // ......*..*.....
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x0000FFFC,  // .......**************..
-     0x0000FFFC,  // .......**************..
-     0x00018C00,  // ......**...**..........
-     0x00018C00,  // ......**...**..........
-     0x00030C00,  // .....**....**..........
-     0x00030C00,  // .....**....**..........
-     0x00070C00,  // ....***....**..........
-     0x00060FFC,  // ....**.....**********..
-     0x00060FFC,  // ....**.....**********..
-     0x000C0C00,  // ...**......**..........
-     0x000FFC00,  // ...**********..........
-     0x001FFC00,  // ..***********..........
-     0x00180C00,  // ..**.......**..........
-     0x00180C00,  // ..**.......**..........
-     0x00380C00,  // .***.......**..........
-     0x00300FFE,  // .**........***********.
-     0x00700FFE,  // ***........***********.
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 199
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003018,  // ...**.......**...
-     0x00003C78,  // ...****...****...
-     0x00000FF0,  // .....********....
-     0x00000100,  // ........*........
-     0x00000380,  // .......***.......
-     0x000001C0,  // ........***......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-  },
-  {             // 200
-     15, 27,
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000320,  // .....**..*.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 27,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     6, 27,
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 27,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     7, 27,
-     0x00000018,  // ..**...
-     0x0000003C,  // .****..
-     0x00000026,  // .*..**.
-     0x00000062,  // **...*.
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 207
-     6, 27,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006078,  // ..**......****...
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0001FE0C,  // ********.....**..
-     0x0001FE0C,  // ********.....**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 209
-     17, 27,
-     0x00000000,  // .................
-     0x00000760,  // ......***.**.....
-     0x00000FE0,  // .....*******.....
-     0x000000C0,  // .........**......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 210
-     18, 27,
-     0x00000C00,  // ......**..........
-     0x00000600,  // .......**.........
-     0x00000300,  // ........**........
-     0x00000100,  // .........*........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 211
-     18, 27,
-     0x000000C0,  // ..........**......
-     0x00000180,  // .........**.......
-     0x00000300,  // ........**........
-     0x00000200,  // ........*.........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 212
-     18, 27,
-     0x00000300,  // ........**........
-     0x00000780,  // .......****.......
-     0x00000480,  // .......*..*.......
-     0x00000840,  // ......*....*......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 213
-     18, 27,
-     0x00000000,  // ..................
-     0x00000E60,  // ......***..**.....
-     0x00000FC0,  // ......******......
-     0x000000C0,  // ..........**......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 214
-     18, 27,
-     0x00000000,  // ..................
-     0x00000CC0,  // ......**..**......
-     0x00000CC0,  // ......**..**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 215
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x0000070C,  // ..***....**..
-     0x00000398,  // ...***..**...
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x000000F0,  // .....****....
-     0x000001B8,  // ....**.***...
-     0x0000031C,  // ...**...***..
-     0x0000020C,  // ...*.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 216
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC6,  // ......******...**.
-     0x00003FF4,  // ....**********.*..
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C02C,  // ..**........*.**..
-     0x0001C04E,  // .***.......*..***.
-     0x000180C6,  // .**.......**...**.
-     0x00018186,  // .**......**....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018606,  // .**....**......**.
-     0x00018C06,  // .**...**.......**.
-     0x00019806,  // .**..**........**.
-     0x0000F00C,  // ..****........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x0001FFF0,  // .*************....
-     0x00011FC0,  // .*...*******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 217
-     17, 27,
-     0x00000E00,  // .....***.........
-     0x00000600,  // ......**.........
-     0x00000300,  // .......**........
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 218
-     17, 27,
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000100,  // ........*........
-     0x00000200,  // .......*.........
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 219
-     17, 27,
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x00000C40,  // .....**...*......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 220
-     17, 27,
-     0x00000000,  // .................
-     0x00000EC0,  // .....***.**......
-     0x00000EC0,  // .....***.**......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 221
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180E,  // ..**.......***.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000181C,  // ..**......***..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 223
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000003F8,  // ....*******...
-     0x0000071C,  // ...***...***..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000061C,  // ...**....***..
-     0x00000670,  // ...**..***....
-     0x00000678,  // ...**..****...
-     0x0000060C,  // ...**.....**..
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x0000060C,  // ...**.....**..
-     0x0000067C,  // ...**..*****..
-     0x00000670,  // ...**..***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 224
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 225
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 226
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 227
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 228
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x00000120,  // ....*..*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 230
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0000F9F8,  // ....*****..******...
-     0x0003FFFC,  // ..****************..
-     0x0003070E,  // ..**.....***....***.
-     0x00020606,  // ..*......**......**.
-     0x00000E06,  // ........***......**.
-     0x0001FFFE,  // ...****************.
-     0x0003F7FE,  // ..******.**********.
-     0x00070600,  // .***.....**.........
-     0x00060606,  // .**......**......**.
-     0x00060F0E,  // .**.....****....***.
-     0x0007FBFC,  // .********.********..
-     0x0003E1F8,  // ..*****....******...
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 231
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x0000039C,  // ..***..***..
-     0x000001F8,  // ...******...
-     0x00000040,  // .....*......
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-  },
-  {             // 232
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 233
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 234
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000B0,  // .....*.**....
-     0x00000190,  // ....**..*....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 235
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001B8,  // ....**.***...
-     0x000001B8,  // ....**.***...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 236
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 237
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 238
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 240
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000210,  // ...*....*....
-     0x000003E0,  // ...*****.....
-     0x000003C0,  // ...****......
-     0x00000260,  // ...*..**.....
-     0x00000070,  // ......***....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 241
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 242
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 243
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 244
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 245
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 246
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 247
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 248
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E4,  // ....*****..*..
-     0x00000FF8,  // ..*********...
-     0x00000C18,  // ..**.....**...
-     0x0000183C,  // .**.....****..
-     0x0000184C,  // .**....*..**..
-     0x000018CC,  // .**...**..**..
-     0x0000198C,  // .**..**...**..
-     0x00001B0C,  // .**.**....**..
-     0x00001A1C,  // .**.*....***..
-     0x00000C38,  // ..**....***...
-     0x00000FF0,  // ..********....
-     0x000013E0,  // .*..*****.....
-     0x00001000,  // .*............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 249
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 250
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000070,  // ......***....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 251
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 252
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000370,  // ...**.***....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // ......***...
-     0x00000070,  // .....***....
-     0x00000040,  // .....*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 254
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 255
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001B8,  // ...**.***...
-     0x000001B8,  // ...**.***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  };
diff --git a/fontosd-iso8859-2.c b/fontosd-iso8859-2.c
deleted file mode 100644
index 66224adc4..000000000
--- a/fontosd-iso8859-2.c
+++ /dev/null
@@ -1,6733 +0,0 @@
-/*
- * iso8859-2 modified iso8859-1 (Drazen Dupor 23.05.2004).
- *
- * Because (still) uncleared problem with old iso8859-2 font
- * (there were also bigger).
- *
- * I modifyed iso8859-1 font partially.
- * For a start there is chars needed for Croatian and Slovak.
- *
- */
-
-static const cFont::tPixelData FontOsd_iso8859_2[][29] = {
-  {             // 32
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 33
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000022,  // ..*...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00000188,  // ....**...*...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000118,  // ....*...**...
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000310,  // ...**...*....
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000230,  // ...*...**....
-     0x00000630,  // ..**...**....
-     0x00000620,  // ..**...*.....
-     0x00000620,  // ..**...*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000007F8,  // ..********...
-     0x0000065C,  // ..**..*.***..
-     0x00000CCC,  // .**..**..**..
-     0x00000CCC,  // .**..**..**..
-     0x00000CC0,  // .**..**......
-     0x00000CC0,  // .**..**......
-     0x000007C0,  // ..*****......
-     0x000003F0,  // ...******....
-     0x000001FC,  // ....*******..
-     0x000000CE,  // .....**..***.
-     0x000000C6,  // .....**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CCE,  // .**..**..***.
-     0x00000E9C,  // .***.*..***..
-     0x000007F8,  // ..********...
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0001C020,  // ...***........*.....
-     0x0007F060,  // .*******.....**.....
-     0x000E38C0,  // ***...***...**......
-     0x000C1880,  // **.....**...*.......
-     0x000C1980,  // **.....**..**.......
-     0x000E3900,  // ***...***..*........
-     0x0007F300,  // .*******..**........
-     0x0003E200,  // ..*****...*.........
-     0x0000063C,  // .........**...****..
-     0x00000C7E,  // ........**...******.
-     0x00000CE6,  // ........**..***..**.
-     0x000018C3,  // .......**...**....**
-     0x000010C3,  // .......*....**....**
-     0x000030C3,  // ......**....**....**
-     0x0000607E,  // .....**......******.
-     0x0000603C,  // .....**.......****..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 38
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000006E0,  // ....**.***.....
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000FCC,  // ...******..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000306C,  // .**.....**.**..
-     0x00003038,  // .**......***...
-     0x00003038,  // .**......***...
-     0x0000383C,  // .***.....****..
-     0x00001FEE,  // ..********.***.
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 40
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000008,  // ....*...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000040,  // .*......
-     0x00000020,  // ..*.....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000040,  // .*......
-  },
-  {             // 42
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x000000D6,  // .**.*.**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x00000044,  // ..*...*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 44
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 45
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003FC,  // ...********..
-     0x000003FC,  // ...********..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 46
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000040,  // *......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001E0,  // ....****.....
-     0x000007E0,  // ..******.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000001C,  // ........***..
-     0x00000078,  // ......****...
-     0x000001E0,  // ....****.....
-     0x00000380,  // ...***.......
-     0x00000700,  // ..***........
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x000000F0,  // .....****....
-     0x000000FC,  // .....******..
-     0x0000000C,  // .........**..
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000218,  // ...*....**...
-     0x00000618,  // ..**....**...
-     0x00000C18,  // .**.....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007F0,  // ..*******....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0E,  // .**......***.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0C,  // .***.....**..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000070C,  // ..***....**..
-     0x0000060E,  // ..**.....***.
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000004,  // ..........*..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000380,  // ...***.......
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003F0,  // ...******....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E1E,  // .***....****.
-     0x000007FE,  // ..**********.
-     0x000001F6,  // ....*****.**.
-     0x00000006,  // ..........**.
-     0x0000000E,  // .........***.
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000002,  // ...........*.
-     0x0000000E,  // .........***.
-     0x0000003C,  // .......****..
-     0x000001E0,  // ....****.....
-     0x00000780,  // ..****.......
-     0x00000E00,  // .***.........
-     0x00000F00,  // .****........
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000000E,  // .........***.
-     0x00000002,  // ...........*.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 61
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 62
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000800,  // .*...........
-     0x00000E00,  // .***.........
-     0x000003C0,  // ...****......
-     0x000000F0,  // .....****....
-     0x0000003E,  // .......*****.
-     0x00000006,  // ..........**.
-     0x0000001E,  // ........****.
-     0x00000078,  // ......****...
-     0x000003C0,  // ...****......
-     0x00000F00,  // .****........
-     0x00000800,  // .*...........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00003F00,  // .........******........
-     0x0001FFE0,  // ......************.....
-     0x0003C0F0,  // .....****......****....
-     0x00070038,  // ....***..........***...
-     0x000E001C,  // ...***............***..
-     0x001C1E8C,  // ..***.....****.*...**..
-     0x00187FCE,  // ..**....*********..***.
-     0x0018E1C6,  // ..**...***....***...**.
-     0x0030C186,  // .**....**.....**....**.
-     0x00318186,  // .**...**......**....**.
-     0x00318186,  // .**...**......**....**.
-     0x0031830C,  // .**...**.....**....**..
-     0x0031830C,  // .**...**.....**....**..
-     0x0039C718,  // .***..***...***...**...
-     0x0018FFF0,  // ..**...************....
-     0x001C71E0,  // ..***...***...****.....
-     0x000E0000,  // ...***.................
-     0x00078000,  // ....****...............
-     0x0003FF80,  // .....***********.......
-     0x00007F00,  // ........*******........
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 65
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 68
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006070,  // ..**......***....
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 69
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E018,  // ..***........**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x000181FC,  // .**......*******..
-     0x000181FC,  // .**......*******..
-     0x0001800C,  // .**...........**..
-     0x0001C00C,  // .***..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x0000703C,  // ...***......****..
-     0x00003FEC,  // ....*********.**..
-     0x00000FC4,  // ......******...*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00007FFC,  // ..*************..
-     0x00007FFC,  // ..*************..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 73
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000C0C,  // **......**..
-     0x00000C0C,  // **......**..
-     0x00000E1C,  // ***....***..
-     0x000007F8,  // .********...
-     0x000003F0,  // ..******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001BC0,  // ..**.****......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001C01C,  // ..***.........***..
-     0x0001C01C,  // ..***.........***..
-     0x0001E01C,  // ..****........***..
-     0x0001E03C,  // ..****.......****..
-     0x0001E03C,  // ..****.......****..
-     0x0001B02C,  // ..**.**......*.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001984C,  // ..**..**....*..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x00018C8C,  // ..**...**..*...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x0001878C,  // ..**....****...**..
-     0x0001870C,  // ..**....***....**..
-     0x0001870C,  // ..**....***....**..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 78
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 79
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C04C,  // ..**.......*..**..
-     0x0000E0FC,  // ..***.....******..
-     0x00007078,  // ...***.....****...
-     0x00003FF8,  // ....***********...
-     0x00000FCE,  // ......******..***.
-     0x00000004,  // ...............*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF8,  // ..************...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00007FF0,  // ..***********....
-     0x00007FF8,  // ..************...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 83
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 86
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001C0C,  // ..***......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E18,  // ...***....**...
-     0x00000618,  // ....**....**...
-     0x00000638,  // ....**...***...
-     0x00000730,  // ....***..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     22, 27,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00180C06,  // .**.......**.......**.
-     0x00181C06,  // .**......***.......**.
-     0x00181E0E,  // .**......****.....***.
-     0x001C1E0E,  // .***.....****.....***.
-     0x000C1E0C,  // ..**.....****.....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000E331C,  // ..***...**..**...***..
-     0x00066318,  // ...**..**...**...**...
-     0x00066198,  // ...**..**....**..**...
-     0x00066198,  // ...**..**....**..**...
-     0x000761B8,  // ...***.**....**.***...
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0E0,  // ....****......***.....
-     0x00018060,  // .....**........**.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000638,  // ....**...***...
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000730,  // ....***..**....
-     0x00000E38,  // ...***...***...
-     0x00000C1C,  // ...**.....***..
-     0x00001C0C,  // ..***......**..
-     0x0000380E,  // .***.......***.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-  },
-  {             // 92
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000040,  // *......
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-  },
-  {             // 94
-     11, 27,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D0,  // ...**.*....
-     0x000000D8,  // ...**.**...
-     0x00000088,  // ...*...*...
-     0x0000018C,  // ..**...**..
-     0x0000010C,  // ..*....**..
-     0x00000304,  // .**.....*..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x00000000,  // ..............
-  },
-  {             // 96
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 97
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 98
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x000003E0,  // ...*****.....
-  },
-  {             // 104
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000007E0,  // .******.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000638,  // .**...***...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 108
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001BE7C,  // ..**.*****..*****..
-     0x0001FFFE,  // ..****************.
-     0x0001C386,  // ..***....***....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 110
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 113
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003EC,  // ...*****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-  },
-  {             // 114
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000003E,  // ..*****.
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000070C,  // .***....**..
-     0x0000031C,  // ..**...***..
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018306,  // **.....**.....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C78E,  // .**...****...***.
-     0x0000C78C,  // .**...****...**..
-     0x0000C6CC,  // .**...**.**..**..
-     0x000064CC,  // ..**..*..**..**..
-     0x00006CD8,  // ..**.**..**.**...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00002C78,  // ...*.**...****...
-     0x00003878,  // ...***....****...
-     0x00003870,  // ...***....***....
-     0x00003870,  // ...***....***....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x0000070C,  // .***....**..
-     0x0000060E,  // .**.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000038,  // ..***...
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-  },
-  {             // 124
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 125
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000060,  // .**.....
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-  },
-  {             // 126
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000007C6,  // ..*****...**.
-     0x0000047E,  // ..*...******.
-     0x0000001C,  // ........***..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 127
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     0, 27,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 161
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-  },
-  {             // 162
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000072C,  // ..***..*.**..
-     0x00000E26,  // .***...*..**.
-     0x00000C20,  // .**....*.....
-     0x00000C20,  // .**....*.....
-     0x00000C40,  // .**...*......
-     0x00000C40,  // .**...*......
-     0x00000C46,  // .**...*...**.
-     0x0000064E,  // ..**..*..***.
-     0x0000075C,  // ..***.*.***..
-     0x000003F8,  // ...*******...
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 163
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000FE0,  // .*******.....
-     0x00000FE0,  // .*******.....
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x000007EC,  // ..******.**..
-     0x000007FC,  // ..*********..
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000007EC,  // ..******.**..
-     0x00000204,  // ...*......*..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 165
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000618,  // ..**....**...
-     0x00000310,  // ...**...*....
-     0x00000130,  // ....*..**....
-     0x000001E0,  // ....****.....
-     0x00000EFC,  // .***.******..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 166
-     15, 27,
-     0x00000070,  // ........***....
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 167
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000700,  // ..***........
-     0x000003C0,  // ...****......
-     0x000006F0,  // ..**.****....
-     0x00000C78,  // .**...****...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000E06,  // .***......**.
-     0x00000706,  // ..***.....**.
-     0x000003CC,  // ...****..**..
-     0x000000F8,  // .....*****...
-     0x00000070,  // ......***....
-     0x00000038,  // .......***...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000718,  // ..***...**...
-     0x000003F0,  // ...******....
-     0x000001E0,  // ....****.....
-  },
-  {             // 168
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 169 iso8859-2
-     15, 27,
-     0x00000618,  // ....**....**...
-     0x00000330,  // .....**..**....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170 iso8859-2
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000000C0,  // .......**......
-     0x000007C0,  // ....*****......
-     0x00000380,  // .....***.......
-  },
-  {             // 171
-     14, 27,
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 172
-     14, 27,
-     0x00000000,  // ..............
-     0x00000030,  // ........**....
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 173
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007C,  // .*****..
-     0x0000007C,  // .*****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 174 iso8859-2
-     14, 27,
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 175
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 176
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000003F0,  // ....******....
-     0x000001E0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 177
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x0000000E,  // .........***.
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 178
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007F,  // .*******
-     0x00000043,  // .*....**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000040,  // .*......
-     0x0000007F,  // .*******
-     0x0000003F,  // ..******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x0000001E,  // ...****.
-     0x0000003C,  // ..****..
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 181
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x00000FEF,  // .*******.****
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 182
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 183
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x0000001C,  // ...***..
-     0x0000001E,  // ...****.
-     0x0000007E,  // .******.
-     0x0000001C,  // ...***..
-  },
-  {             // 185 iso8859-2
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 186 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x00000C18,  // .**.....**...
-     0x00000C00,  // .**..........
-     0x00000E00,  // .***.........
-     0x000007E0,  // ..******.....
-     0x000001F8,  // ....******...
-     0x0000001C,  // ........***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000FF8,  // .*********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x00000060,  // ......**.....
-     0x000003E0,  // ...*****.....
-     0x000001C0,  // ....***......
-  },
-  {             // 187
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000007,  // ....***
-     0x00000007,  // ....***
-     0x00000003,  // .....**
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000003F,  // .******
-     0x0000003F,  // .******
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000F,  // ...****
-     0x0000000F,  // ...****
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 188
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 189
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00018020,  // ...**.........*.....
-     0x00038040,  // ..***........*......
-     0x000780C0,  // .****.......**......
-     0x00018080,  // ...**.......*.......
-     0x00018180,  // ...**......**.......
-     0x00018300,  // ...**.....**........
-     0x0001863C,  // ...**....**...****..
-     0x0001867E,  // ...**....**..******.
-     0x00018C43,  // ...**...**...*....**
-     0x00001843,  // .......**....*....**
-     0x00001806,  // .......**........**.
-     0x0000300C,  // ......**........**..
-     0x00006030,  // .....**.......**....
-     0x00006040,  // .....**......*......
-     0x0000C0FF,  // ....**......********
-     0x0001803F,  // ...**.........******
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 190 iso8859-2
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 191
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 192
-     15, 27,
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000080,  // .......*.......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193 iso8859-2
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195 iso8859-2
-     15, 27,
-     0x00000000,  // ...............
-     0x00000630,  // ....**...**....
-     0x00000360,  // .....**.**.....
-     0x000001C0,  // ......***......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 27,
-     0x00000000,  // ...............
-     0x00000370,  // .....**.***....
-     0x00000370,  // .....**.***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 27,
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000120,  // ......*..*.....
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198 iso8859-2
-     17, 27,
-     0x00000070,  // ..........***....
-     0x00000060,  // ..........**.....
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 199
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003018,  // ...**.......**...
-     0x00003C78,  // ...****...****...
-     0x00000FF0,  // .....********....
-     0x00000100,  // ........*........
-     0x00000380,  // .......***.......
-     0x000001C0,  // ........***......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-  },
-  {             // 200 iso8859-2
-     17, 27,
-     0x00000C30,  // .....**....**....
-     0x00000660,  // ......**..**.....
-     0x000003C0,  // .......****......
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 201 iso8859-2
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000006,  // ............**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 27,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     15, 27,
-     0x00000618,  // ....**....**...
-     0x00000330,  // .....**..**....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 205 iso8859-2
-     7, 27,
-     0x00000006,  // ....**.
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 206
-     8, 27,
-     0x00000030,  // ..**....
-     0x00000078,  // .****...
-     0x00000048,  // .*..*...
-     0x000000CC,  // **..**..
-     0x00000000,  // ........
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 207
-     17, 27,
-     0x00001860,  // ....**....**.....
-     0x00000CC0,  // .....**..**......
-     0x00000780,  // ......****.......
-     0x00000300,  // .......**........
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006078,  // ..**......****...
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 208 iso8859-2
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006078,  // ..**......****...
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0001FE0C,  // ********.....**..
-     0x0001FE0C,  // ********.....**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 209
-     17, 27,
-     0x00000070,  // ..........***....
-     0x00000060,  // ..........**.....
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 210 iso8859-2
-     17, 27,
-     0x00000C30,  // .....**....**....
-     0x00000660,  // ......**..**.....
-     0x000003C0,  // .......****......
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 211 iso8859-2
-     18, 27,
-     0x000000C0,  // ..........**......
-     0x00000180,  // .........**.......
-     0x00000300,  // ........**........
-     0x00000200,  // ........*.........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 212 iso8859-2
-     18, 27,
-     0x00000300,  // ........**........
-     0x00000780,  // .......****.......
-     0x00000480,  // .......*..*.......
-     0x00000840,  // ......*....*......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 213
-     18, 27,
-     0x00000000,  // ..................
-     0x00000E60,  // ......***..**.....
-     0x00000FC0,  // ......******......
-     0x000000C0,  // ..........**......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 214
-     18, 27,
-     0x00000000,  // ..................
-     0x00000CC0,  // ......**..**......
-     0x00000CC0,  // ......**..**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 215
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x0000070C,  // ..***....**..
-     0x00000398,  // ...***..**...
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x000000F0,  // .....****....
-     0x000001B8,  // ....**.***...
-     0x0000031C,  // ...**...***..
-     0x0000020C,  // ...*.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 216
-     17, 27,
-     0x00000C30,  // .....**....**....
-     0x00000660,  // ......**..**.....
-     0x000003C0,  // .......****......
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF8,  // ..************...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00007FF0,  // ..***********....
-     0x00007FF8,  // ..************...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 217
-     17, 27,
-     0x00000780,  // ......****.......
-     0x00001860,  // ....**....**.....
-     0x00001860,  // ....**....**.....
-     0x00000780,  // ......****.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 218 iso8859-2
-     17, 27,
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000100,  // ........*........
-     0x00000200,  // .......*.........
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 219
-     17, 27,
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x00000C40,  // .....**...*......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 220
-     17, 27,
-     0x00000000,  // .................
-     0x00000EC0,  // .....***.**......
-     0x00000EC0,  // .....***.**......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 221 iso8859-2
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 222 iso8859-2
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x00000060,  // .......**.....
-     0x00000360,  // ....**.**.....
-     0x000001C0,  // .....***......
-  },
-  {             // 223
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000003F8,  // ....*******...
-     0x0000071C,  // ...***...***..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000061C,  // ...**....***..
-     0x00000670,  // ...**..***....
-     0x00000678,  // ...**..****...
-     0x0000060C,  // ...**.....**..
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x0000060C,  // ...**.....**..
-     0x0000067C,  // ...**..*****..
-     0x00000670,  // ...**..***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 224
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 225 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 226
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 227 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 228
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x00000120,  // ....*..*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 230 iso8859-2
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 231
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x0000039C,  // ..***..***..
-     0x000001F8,  // ...******...
-     0x00000040,  // .....*......
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-  },
-  {             // 232 iso8859-2
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 233 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 234
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x00000038,  // .......***...
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 235
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001B8,  // ....**.***...
-     0x000001B8,  // ....**.***...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 236
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 237
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 238
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     13, 27,
-     0x00000000,  // .............
-     0x0000000E,  // .........***.
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 240 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000007E,  // ......******.
-     0x0000007E,  // ......******.
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 241
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 242 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 243 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 244 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 245
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 246
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 247
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 248
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x0000003C,  // ..****..
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000003E,  // ..*****.
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 249
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x00000210,  // ...*....*....
-     0x00000210,  // ...*....*....
-     0x000001E0,  // ....****.....
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 250 iso8859-2
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000070,  // ......***....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 251
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 252
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000370,  // ...**.***....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253 iso8859-2
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // ......***...
-     0x00000070,  // .....***....
-     0x00000040,  // .....*......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 254 iso8859-2
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x00000000,  // ......
-     0x0000000F,  // ..****
-     0x00000003,  // ....**
-     0x0000001B,  // .**.**
-     0x0000000E,  // ..***.
-  },
-  {             // 255
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001B8,  // ...**.***...
-     0x000001B8,  // ...**.***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  };
diff --git a/fontosd-iso8859-5.c b/fontosd-iso8859-5.c
deleted file mode 100644
index d155a3289..000000000
--- a/fontosd-iso8859-5.c
+++ /dev/null
@@ -1,5602 +0,0 @@
-static const cFont::tPixelData FontOsd_iso8859_5[][24] = {
-  {             // 32
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 33
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 35
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000006E,  // .....**.***.
-     0x000000EC,  // ....***.**..
-     0x000000CC,  // ....**..**..
-     0x000000CC,  // ....**..**..
-     0x000007FF,  // .***********
-     0x000007FF,  // .***********
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x00000FFE,  // ***********.
-     0x00000FFE,  // ***********.
-     0x00000330,  // ..**..**....
-     0x00000330,  // ..**..**....
-     0x00000760,  // .***.**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 36
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x000001FC,  // ...*******..
-     0x000003F4,  // ..******.*..
-     0x00000360,  // ..**.**.....
-     0x00000360,  // ..**.**.....
-     0x00000360,  // ..**.**.....
-     0x000001E0,  // ...****.....
-     0x000000E0,  // ....***.....
-     0x00000070,  // .....***....
-     0x00000078,  // .....****...
-     0x0000006C,  // .....**.**..
-     0x0000006C,  // .....**.**..
-     0x0000006C,  // .....**.**..
-     0x000003FC,  // ..********..
-     0x000001F8,  // ...******...
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 37
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000F07,  // .****.....***
-     0x00001F86,  // ******....**.
-     0x0000198C,  // **..**...**..
-     0x0000199C,  // **..**..***..
-     0x00001FB8,  // ******.***...
-     0x00000F70,  // .****.***....
-     0x0000007E,  // ......******.
-     0x000000DE,  // .....**.****.
-     0x000001F3,  // ....*****..**
-     0x000003B3,  // ...***.**..**
-     0x00000733,  // ..***..**..**
-     0x00000633,  // ..**...**..**
-     0x00000C1E,  // .**.....****.
-     0x00001C1E,  // ***.....****.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 38
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x000003F0,  // ...******....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000370,  // ...**.***....
-     0x000003E0,  // ...*****.....
-     0x00000780,  // ..****.......
-     0x00000EC6,  // .***.**...**.
-     0x00000CE6,  // .**..***..**.
-     0x00000C76,  // .**...***.**.
-     0x00000C3C,  // .**....****..
-     0x00000E38,  // .***...***...
-     0x000007F8,  // ..********...
-     0x000003CE,  // ...****..***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 39
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 40
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000001,  // .....*
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000008,  // ..*...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000001,  // .....*
-  },
-  {             // 41
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000020,  // *.....
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x00000008,  // ..*...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-     0x00000020,  // *.....
-  },
-  {             // 42
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x000000D6,  // .**.*.**.
-     0x0000006C,  // ..**.**..
-     0x00000028,  // ...*.*...
-     0x00000028,  // ...*.*...
-     0x00000044,  // ..*...*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000FFF,  // ************
-     0x00000FFF,  // ************
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 44
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000000E,  // ..***.
-     0x0000000E,  // ..***.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-  },
-  {             // 45
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FF,  // .***********
-     0x000007FF,  // .***********
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 46
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000003,  // .......**
-     0x00000003,  // .......**
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x0000000C,  // .....**..
-     0x0000001C,  // ....***..
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000070,  // ..***....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x00000180,  // **.......
-     0x00000180,  // **.......
-  },
-  {             // 48
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F0,  // ....****....
-     0x000001F8,  // ...******...
-     0x0000039C,  // ..***..***..
-     0x0000030C,  // ..**....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x0000039C,  // ..***..***..
-     0x000001F8,  // ...******...
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 49
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001E0,  // ...****.....
-     0x000001E0,  // ...****.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 50
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ...*****....
-     0x000003F8,  // ..*******...
-     0x0000021C,  // ..*....***..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000038,  // ......***...
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 51
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ...*****....
-     0x000003F8,  // ..*******...
-     0x0000021C,  // ..*....***..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x000001E0,  // ...****.....
-     0x000001F8,  // ...******...
-     0x0000001C,  // .......***..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000021C,  // ..*....***..
-     0x000003F8,  // ..*******...
-     0x000003F0,  // ..******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 52
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000038,  // ......***...
-     0x00000038,  // ......***...
-     0x00000078,  // .....****...
-     0x000000F8,  // ....*****...
-     0x000001D8,  // ...***.**...
-     0x00000198,  // ...**..**...
-     0x00000318,  // ..**...**...
-     0x00000718,  // .***...**...
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 53
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ...*******..
-     0x000001FC,  // ...*******..
-     0x00000180,  // ...**.......
-     0x00000180,  // ...**.......
-     0x00000180,  // ...**.......
-     0x000001F0,  // ...*****....
-     0x000001F8,  // ...******...
-     0x0000001C,  // .......***..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000011C,  // ...*...***..
-     0x000001F8,  // ...******...
-     0x000001F0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 54
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000001F8,  // ...******...
-     0x00000388,  // ..***...*...
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000006F0,  // .**.****....
-     0x000007F8,  // .********...
-     0x0000071C,  // .***...***..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000020C,  // ..*.....**..
-     0x00000318,  // ..**...**...
-     0x000001F8,  // ...******...
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 55
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x0000000E,  // ........***.
-     0x0000000C,  // ........**..
-     0x0000001C,  // .......***..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000180,  // ...**.......
-     0x00000180,  // ...**.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 56
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000078,  // .....****...
-     0x000000FE,  // ....*******.
-     0x000001CE,  // ...***..***.
-     0x00000186,  // ...**....**.
-     0x00000186,  // ...**....**.
-     0x000000C8,  // ....**..*...
-     0x000000F0,  // ....****....
-     0x000001FC,  // ...*******..
-     0x0000038E,  // ..***...***.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x0000038E,  // ..***...***.
-     0x000001FC,  // ...*******..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 57
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F0,  // ....****....
-     0x000001FC,  // ...*******..
-     0x0000038C,  // ..***...**..
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x0000038E,  // ..***...***.
-     0x000001F6,  // ...*****.**.
-     0x000000F6,  // ....****.**.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x0000011C,  // ...*...***..
-     0x000001F8,  // ...******...
-     0x000001F0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 58
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-  },
-  {             // 60
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000001,  // .............*
-     0x00000007,  // ...........***
-     0x0000001E,  // .........****.
-     0x00000078,  // .......****...
-     0x000001E0,  // .....****.....
-     0x00000FC0,  // ..******......
-     0x000007C0,  // ...*****......
-     0x000001E0,  // .....****.....
-     0x00000078,  // .......****...
-     0x0000001E,  // .........****.
-     0x00000007,  // ...........***
-     0x00000001,  // .............*
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 61
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FF,  // .***********
-     0x000007FF,  // .***********
-     0x00000000,  // ............
-     0x000007FF,  // .***********
-     0x000007FF,  // .***********
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 62
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000800,  // .*...........
-     0x00000E00,  // .***.........
-     0x00000780,  // ..****.......
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000003E,  // .......*****.
-     0x0000003F,  // .......******
-     0x00000078,  // ......****...
-     0x000001E0,  // ....****.....
-     0x00000780,  // ..****.......
-     0x00000E00,  // .***.........
-     0x00000800,  // .*...........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     8, 22,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000078,  // .****...
-     0x000000FC,  // ******..
-     0x0000008E,  // *...***.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 64
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000001F0,  // ........*****....
-     0x000007FC,  // ......*********..
-     0x00000E0E,  // .....***.....***.
-     0x000018F7,  // ....**...****.***
-     0x000031E3,  // ...**...****...**
-     0x00003323,  // ...**..**..*...**
-     0x00006643,  // ..**..**..*....**
-     0x000066C3,  // ..**..**.**....**
-     0x000066F6,  // ..**..**.****.**.
-     0x0000673E,  // ..**..***..*****.
-     0x0000763C,  // ..***.**...****..
-     0x00003820,  // ...***.....*.....
-     0x00001FE0,  // ....********.....
-     0x000007C0,  // ......*****......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 65
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001F0,  // ....*****....
-     0x000001B0,  // ....**.**....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00001C06,  // ***.......**.
-     0x00001803,  // **.........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 66
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x0000018C,  // ..**...**..
-     0x000001F0,  // ..*****....
-     0x000001F8,  // ..******...
-     0x0000018E,  // ..**...***.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x000001FC,  // ..*******..
-     0x000001F8,  // ..******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 67
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000FC,  // .....******..
-     0x000003FE,  // ...*********.
-     0x00000702,  // ..***......*.
-     0x00000600,  // ..**.........
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000600,  // ..**.........
-     0x00000702,  // ..***......*.
-     0x000003FE,  // ...*********.
-     0x000000FC,  // .....******..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 68
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FE0,  // ..*******.....
-     0x00000FF8,  // ..*********...
-     0x00000C1C,  // ..**.....***..
-     0x00000C0C,  // ..**......**..
-     0x00000C06,  // ..**.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000C0C,  // ..**......**..
-     0x00000C1C,  // ..**.....***..
-     0x00000FF8,  // ..*********...
-     0x00000FE0,  // ..*******.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 69
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FE,  // ..*******.
-     0x000000FE,  // ..*******.
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 70
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FE,  // ..*******.
-     0x000000FE,  // ..*******.
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 71
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F8,  // .....******...
-     0x000007FC,  // ...*********..
-     0x00000E04,  // ..***......*..
-     0x00000C00,  // ..**..........
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E0C,  // ..***.....**..
-     0x000007FC,  // ...*********..
-     0x000001F8,  // .....******...
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 72
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 73
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 74
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x0000007C,  // *****..
-     0x00000078,  // ****...
-  },
-  {             // 75
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000306,  // ..**.....**.
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x00000338,  // ..**..***...
-     0x00000330,  // ..**..**....
-     0x00000360,  // ..**.**.....
-     0x000003E0,  // ..*****.....
-     0x000003E0,  // ..*****.....
-     0x00000370,  // ..**.***....
-     0x00000330,  // ..**..**....
-     0x00000318,  // ..**...**...
-     0x0000030C,  // ..**....**..
-     0x0000030E,  // ..**....***.
-     0x00000307,  // ..**.....***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 76
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 77
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000380E,  // ..***.......***.
-     0x0000380E,  // ..***.......***.
-     0x00003C1E,  // ..****.....****.
-     0x00003C1E,  // ..****.....****.
-     0x00003E1E,  // ..*****....****.
-     0x00003636,  // ..**.**...**.**.
-     0x00003636,  // ..**.**...**.**.
-     0x00003736,  // ..**.***..**.**.
-     0x00003366,  // ..**..**.**..**.
-     0x00003366,  // ..**..**.**..**.
-     0x000033E6,  // ..**..*****..**.
-     0x000031C6,  // ..**...***...**.
-     0x000031C6,  // ..**...***...**.
-     0x00003006,  // ..**.........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 78
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000E0C,  // ..***.....**..
-     0x00000F0C,  // ..****....**..
-     0x00000F0C,  // ..****....**..
-     0x00000F8C,  // ..*****...**..
-     0x00000D8C,  // ..**.**...**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000C6C,  // ..**...**.**..
-     0x00000C7C,  // ..**...*****..
-     0x00000C3C,  // ..**....****..
-     0x00000C3C,  // ..**....****..
-     0x00000C1C,  // ..**.....***..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 79
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FE,  // ..*******.
-     0x000000FF,  // ..********
-     0x000000C7,  // ..**...***
-     0x000000C3,  // ..**....**
-     0x000000C3,  // ..**....**
-     0x000000C3,  // ..**....**
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x000000F8,  // ..*****...
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 81
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003F0,  // .....******....
-     0x0000003C,  // .........****..
-     0x0000001F,  // ..........*****
-     0x0000000E,  // ...........***.
-     0x00000002,  // .............*.
-  },
-  {             // 82
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003F0,  // ..******....
-     0x000003F8,  // ..*******...
-     0x0000031C,  // ..**...***..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000308,  // ..**....*...
-     0x00000318,  // ..**...**...
-     0x000003E0,  // ..*****.....
-     0x000003F0,  // ..******....
-     0x00000338,  // ..**..***...
-     0x00000318,  // ..**...**...
-     0x0000030C,  // ..**....**..
-     0x0000030E,  // ..**....***.
-     0x00000307,  // ..**.....***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 83
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FC,  // ..******..
-     0x000001C4,  // .***...*..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000010E,  // .*....***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 84
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFF,  // ************
-     0x00000FFF,  // ************
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 86
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000C03,  // **........**
-     0x00000E03,  // ***.......**
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000019C,  // ...**..***..
-     0x00000198,  // ...**..**...
-     0x000001D8,  // ...***.**...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 87
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000C183,  // **.....**.....**
-     0x0000C183,  // **.....**.....**
-     0x000063C7,  // .**...****...***
-     0x000063C6,  // .**...****...**.
-     0x000063C6,  // .**...****...**.
-     0x000063C6,  // .**...****...**.
-     0x000036EC,  // ..**.**.***.**..
-     0x0000366C,  // ..**.**..**.**..
-     0x0000366C,  // ..**.**..**.**..
-     0x0000366C,  // ..**.**..**.**..
-     0x00001E78,  // ...****..****...
-     0x00001C38,  // ...***....***...
-     0x00001C38,  // ...***....***...
-     0x00001C38,  // ...***....***...
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 88
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E0E,  // ***.....***.
-     0x0000060C,  // .**.....**..
-     0x0000031C,  // ..**...***..
-     0x00000398,  // ..***..**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B0,  // ...**.**....
-     0x00000318,  // ..**...**...
-     0x0000071C,  // .***...***..
-     0x0000060C,  // .**.....**..
-     0x00000C0E,  // **......***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 89
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E03,  // ***.......**
-     0x00000606,  // .**......**.
-     0x0000070E,  // .***....***.
-     0x0000030C,  // ..**....**..
-     0x00000198,  // ...**..**...
-     0x000001F8,  // ...******...
-     0x000000F0,  // ....****....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 90
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FF,  // .**********
-     0x000003FF,  // .**********
-     0x00000006,  // ........**.
-     0x0000000E,  // .......***.
-     0x0000000C,  // .......**..
-     0x00000018,  // ......**...
-     0x00000038,  // .....***...
-     0x00000070,  // ....***....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x000001C0,  // ..***......
-     0x00000380,  // .***.......
-     0x000003FF,  // .**********
-     0x000003FF,  // .**********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 91
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-  },
-  {             // 92
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000180,  // **.......
-     0x00000180,  // **.......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000070,  // ..***....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x0000001C,  // ....***..
-     0x0000000C,  // .....**..
-     0x0000000C,  // .....**..
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000003,  // .......**
-     0x00000003,  // .......**
-  },
-  {             // 93
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-  },
-  {             // 94
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000020,  // ......*.....
-     0x00000020,  // ......*.....
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x000000D8,  // ....**.**...
-     0x000000D8,  // ....**.**...
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000707,  // .***.....***
-     0x00000603,  // .**.......**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 95
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 96
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000180,  // ...**.......
-     0x000000C0,  // ....**......
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 97
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000086,  // ..*....**.
-     0x00000006,  // .......**.
-     0x0000007E,  // ...******.
-     0x000000FE,  // ..*******.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FF,  // .*********
-     0x000000E7,  // ..***..***
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 98
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000378,  // ..**.****...
-     0x000003FC,  // ..********..
-     0x0000038E,  // ..***...***.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x0000038C,  // ..***...**..
-     0x000003FC,  // ..********..
-     0x00000378,  // ..**.****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 99
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000003E,  // ....*****.
-     0x000000FE,  // ..*******.
-     0x000000C0,  // ..**......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C2,  // ..**....*.
-     0x000000FE,  // ..*******.
-     0x0000003C,  // ....****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x000001EC,  // ...****.**..
-     0x000003FC,  // ..********..
-     0x0000031C,  // ..**...***..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000071C,  // .***...***..
-     0x000003FC,  // ..********..
-     0x000001EC,  // ...****.**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 101
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ...****....
-     0x000001F8,  // ..******...
-     0x0000018C,  // ..**...**..
-     0x0000030C,  // .**....**..
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000384,  // .***....*..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 102
-     8, 22,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000F,  // ....****
-     0x0000001F,  // ...*****
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 103
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001EC,  // ...****.**..
-     0x000003FC,  // ..********..
-     0x0000031C,  // ..**...***..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000071C,  // .***...***..
-     0x000003EC,  // ..*****.**..
-     0x000001CC,  // ...***..**..
-     0x0000000C,  // ........**..
-     0x00000218,  // ..*....**...
-     0x000003F8,  // ..*******...
-     0x000003F0,  // ..******....
-  },
-  {             // 104
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000338,  // ..**..***...
-     0x0000037C,  // ..**.*****..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 105
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000046,  // *...**.
-     0x0000007C,  // *****..
-     0x00000078,  // ****...
-  },
-  {             // 107
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x0000018E,  // ..**...***.
-     0x0000018C,  // ..**...**..
-     0x00000198,  // ..**..**...
-     0x000001B0,  // ..**.**....
-     0x000001F0,  // ..*****....
-     0x000001F0,  // ..*****....
-     0x000001B8,  // ..**.***...
-     0x0000019C,  // ..**..***..
-     0x0000018E,  // ..**...***.
-     0x00000187,  // ..**....***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 108
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000CE38,  // ..**..***...***...
-     0x0000DF7C,  // ..**.*****.*****..
-     0x0000E38C,  // ..***...***...**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 110
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000338,  // ..**..***...
-     0x0000037C,  // ..**.*****..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 111
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F0,  // ....****....
-     0x000003FC,  // ..********..
-     0x0000030C,  // ..**....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 112
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000378,  // ..**.****...
-     0x000003FC,  // ..********..
-     0x0000038E,  // ..***...***.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x0000038C,  // ..***...**..
-     0x000003FC,  // ..********..
-     0x00000378,  // ..**.****...
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-  },
-  {             // 113
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001EC,  // ...****.**..
-     0x000003FC,  // ..********..
-     0x0000031C,  // ..**...***..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000071C,  // .***...***..
-     0x000003FC,  // ..********..
-     0x000001EC,  // ...****.**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-  },
-  {             // 114
-     8, 22,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000033,  // ..**..**
-     0x00000037,  // ..**.***
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001F8,  // .******...
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000000C,  // ......**..
-     0x0000010C,  // .*....**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 116
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000003F,  // .******
-     0x0000003F,  // .******
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000001F,  // ..*****
-     0x0000000F,  // ...****
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 117
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x000003EC,  // ..*****.**..
-     0x000001CC,  // ...***..**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 118
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000387,  // ***....***
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000F8,  // ..*****...
-     0x00000078,  // ...****...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00006186,  // **....**....**.
-     0x000063C6,  // **...****...**.
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x000033CC,  // .**..****..**..
-     0x00003678,  // .**.**..****...
-     0x00001E78,  // ..****..****...
-     0x00001E78,  // ..****..****...
-     0x00001C78,  // ..***...****...
-     0x00001C30,  // ..***....**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 120
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000070E,  // .***....***.
-     0x0000038C,  // ..***...**..
-     0x00000198,  // ...**..**...
-     0x000000F8,  // ....*****...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000001F0,  // ...*****....
-     0x00000198,  // ...**..**...
-     0x0000031C,  // ..**...***..
-     0x0000070E,  // .***....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000187,  // .**....***
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000007C,  // ...*****..
-     0x00000078,  // ...****...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 122
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x0000000C,  // .......**..
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000180,  // ..**.......
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 123
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x0000000E,  // ..***.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000038,  // ***...
-     0x0000003C,  // ****..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000E,  // ..***.
-     0x00000006,  // ...**.
-  },
-  {             // 124
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-  },
-  {             // 125
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // .**...
-     0x0000001C,  // .***..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x00000007,  // ...***
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-  },
-  {             // 126
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003C3,  // ..****....**
-     0x000003E3,  // ..*****...**
-     0x00000673,  // .**..***..**
-     0x0000063E,  // .**...*****.
-     0x0000060E,  // .**.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 127
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 161
-     10, 22,
-     0x00000000,  // ..........
-     0x00000066,  // ...**..**.
-     0x00000066,  // ...**..**.
-     0x00000000,  // ..........
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FE,  // ..*******.
-     0x000000FE,  // ..*******.
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 162
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000FFF0,  // ************....
-     0x0000FFF0,  // ************....
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x000006F8,  // .....**.*****...
-     0x000007FC,  // .....*********..
-     0x0000070E,  // .....***....***.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x0000060E,  // .....**.....***.
-     0x0000063C,  // .....**...****..
-     0x00000638,  // .....**...***...
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 163
-     10, 22,
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000FC,  // .....******..
-     0x000003FE,  // ...*********.
-     0x00000702,  // ..***......*.
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000FF0,  // .********....
-     0x00000FF0,  // .********....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000600,  // ..**.........
-     0x00000702,  // ..***......*.
-     0x000003FE,  // ...*********.
-     0x000000FC,  // .....******..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 165
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FC,  // ..******..
-     0x000001C4,  // .***...*..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000010E,  // .*....***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 166
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 167
-     5, 22,
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 168
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x0000007C,  // *****..
-     0x00000078,  // ****...
-  },
-  {             // 169
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00007F80,  // ...********.......
-     0x00007F80,  // ...********.......
-     0x00006180,  // ...**....**.......
-     0x00006180,  // ...**....**.......
-     0x00006180,  // ...**....**.......
-     0x00006180,  // ...**....**.......
-     0x000061F8,  // ...**....******...
-     0x000061FC,  // ...**....*******..
-     0x0000618E,  // ...**....**...***.
-     0x00006186,  // ...**....**....**.
-     0x00006186,  // ...**....**....**.
-     0x0000C18E,  // ..**.....**...***.
-     0x0001C1FE,  // .***.....********.
-     0x000181FC,  // .**......*******..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 170
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C180,  // ..**.....**.......
-     0x0000C180,  // ..**.....**.......
-     0x0000C180,  // ..**.....**.......
-     0x0000C180,  // ..**.....**.......
-     0x0000C180,  // ..**.....**.......
-     0x0000C180,  // ..**.....**.......
-     0x0000FFF8,  // ..*************...
-     0x0000FFFC,  // ..**************..
-     0x0000C18E,  // ..**.....**...***.
-     0x0000C186,  // ..**.....**....**.
-     0x0000C186,  // ..**.....**....**.
-     0x0000C18E,  // ..**.....**...***.
-     0x0000C1FE,  // ..**.....********.
-     0x0000C1FC,  // ..**.....*******..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 171
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000FFF0,  // ************....
-     0x0000FFF0,  // ************....
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x000006F8,  // .....**.*****...
-     0x000007FC,  // .....*********..
-     0x0000070E,  // .....***....***.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x00000606,  // .....**......**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 172
-     12, 22,
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000306,  // ..**.....**.
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x00000338,  // ..**..***...
-     0x00000330,  // ..**..**....
-     0x00000360,  // ..**.**.....
-     0x000003E0,  // ..*****.....
-     0x000003E0,  // ..*****.....
-     0x00000370,  // ..**.***....
-     0x00000330,  // ..**..**....
-     0x00000318,  // ..**...**...
-     0x0000030C,  // ..**....**..
-     0x0000030E,  // ..**....***.
-     0x00000307,  // ..**.....***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 173
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 174
-     12, 22,
-     0x00000108,  // ...*....*...
-     0x000001F8,  // ...******...
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000E07,  // ***......***
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x0000030C,  // ..**....**..
-     0x0000018C,  // ...**...**..
-     0x00000198,  // ...**..**...
-     0x000000D8,  // ....**.**...
-     0x000000F0,  // ....****....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x000003C0,  // ..****......
-     0x00000380,  // ..***.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 175
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-  },
-  {             // 176
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001F0,  // ....*****....
-     0x000001B0,  // ....**.**....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00001C06,  // ***.......**.
-     0x00001803,  // **.........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 177
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FE,  // ..********.
-     0x000001FE,  // ..********.
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x0000018E,  // ..**...***.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 178
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x0000018C,  // ..**...**..
-     0x000001F0,  // ..*****....
-     0x000001F8,  // ..******...
-     0x0000018E,  // ..**...***.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x000001FC,  // ..*******..
-     0x000001F8,  // ..******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 179
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 180
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007FC,  // ...*********..
-     0x000007FC,  // ...*********..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000000,  // ..............
-  },
-  {             // 181
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FE,  // ..*******.
-     0x000000FE,  // ..*******.
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000FF,  // ..********
-     0x000000FF,  // ..********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 182
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018306,  // .**.....**.....**.
-     0x0000C30C,  // ..**....**....**..
-     0x0000E31C,  // ..***...**...***..
-     0x00007338,  // ...***..**..***...
-     0x00003330,  // ....**..**..**....
-     0x00001B60,  // .....**.**.**.....
-     0x00001FE0,  // .....********.....
-     0x00001FE0,  // .....********.....
-     0x00003B70,  // ....***.**.***....
-     0x00003330,  // ....**..**..**....
-     0x00006318,  // ...**...**...**...
-     0x0000C30C,  // ..**....**....**..
-     0x0001C30E,  // .***....**....***.
-     0x00038307,  // ***.....**.....***
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 183
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x00000106,  // .*.....**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000070,  // ...***....
-     0x00000078,  // ...****...
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000106,  // .*.....**.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 184
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C1C,  // ..**.....***..
-     0x00000C3C,  // ..**....****..
-     0x00000C3C,  // ..**....****..
-     0x00000C7C,  // ..**...*****..
-     0x00000C6C,  // ..**...**.**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D8C,  // ..**.**...**..
-     0x00000F8C,  // ..*****...**..
-     0x00000F0C,  // ..****....**..
-     0x00000F0C,  // ..****....**..
-     0x00000E0C,  // ..***.....**..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 185
-     14, 22,
-     0x00000210,  // ....*....*....
-     0x000003F0,  // ....******....
-     0x000001E0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C1C,  // ..**.....***..
-     0x00000C3C,  // ..**....****..
-     0x00000C3C,  // ..**....****..
-     0x00000C7C,  // ..**...*****..
-     0x00000C6C,  // ..**...**.**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D8C,  // ..**.**...**..
-     0x00000F8C,  // ..*****...**..
-     0x00000F0C,  // ..****....**..
-     0x00000F0C,  // ..****....**..
-     0x00000E0C,  // ..***.....**..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 186
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000306,  // ..**.....**.
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x00000338,  // ..**..***...
-     0x00000330,  // ..**..**....
-     0x00000360,  // ..**.**.....
-     0x000003E0,  // ..*****.....
-     0x000003E0,  // ..*****.....
-     0x00000370,  // ..**.***....
-     0x00000330,  // ..**..**....
-     0x00000318,  // ..**...**...
-     0x0000030C,  // ..**....**..
-     0x0000030E,  // ..**....***.
-     0x00000307,  // ..**.....***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 187
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007FC,  // ...*********..
-     0x000007FC,  // ...*********..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x00000C0C,  // ..**......**..
-     0x00001C0C,  // .***......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 188
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000380E,  // ..***.......***.
-     0x0000380E,  // ..***.......***.
-     0x00003C1E,  // ..****.....****.
-     0x00003C1E,  // ..****.....****.
-     0x00003E1E,  // ..*****....****.
-     0x00003636,  // ..**.**...**.**.
-     0x00003636,  // ..**.**...**.**.
-     0x00003736,  // ..**.***..**.**.
-     0x00003366,  // ..**..**.**..**.
-     0x00003366,  // ..**..**.**..**.
-     0x000033E6,  // ..**..*****..**.
-     0x000031C6,  // ..**...***...**.
-     0x000031C6,  // ..**...***...**.
-     0x00003006,  // ..**.........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 189
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 190
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 192
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FE,  // ..*******.
-     0x000000FF,  // ..********
-     0x000000C7,  // ..**...***
-     0x000000C3,  // ..**....**
-     0x000000C3,  // ..**....**
-     0x000000C3,  // ..**....**
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x000000F8,  // ..*****...
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 193
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000FC,  // .....******..
-     0x000003FE,  // ...*********.
-     0x00000702,  // ..***......*.
-     0x00000600,  // ..**.........
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000600,  // ..**.........
-     0x00000702,  // ..***......*.
-     0x000003FE,  // ...*********.
-     0x000000FC,  // .....******..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 194
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFF,  // ************
-     0x00000FFF,  // ************
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 195
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E07,  // ***......***
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x0000030C,  // ..**....**..
-     0x0000018C,  // ...**...**..
-     0x00000198,  // ...**..**...
-     0x000000D8,  // ....**.**...
-     0x000000F0,  // ....****....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x000003C0,  // ..****......
-     0x00000380,  // ..***.......
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 196
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000FF0,  // ....********....
-     0x00003FFC,  // ..************..
-     0x0000318C,  // ..**...**...**..
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x0000318C,  // ..**...**...**..
-     0x00003FFC,  // ..************..
-     0x00000FF0,  // ....********....
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 197
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E0E,  // ***.....***.
-     0x0000060C,  // .**.....**..
-     0x0000031C,  // ..**...***..
-     0x00000398,  // ..***..**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B0,  // ...**.**....
-     0x00000318,  // ..**...**...
-     0x0000071C,  // .***...***..
-     0x0000060C,  // .**.....**..
-     0x00000C0E,  // **......***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 198
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000006,  // ...........**.
-     0x00000006,  // ...........**.
-     0x00000006,  // ...........**.
-     0x00000000,  // ..............
-  },
-  {             // 199
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007FC,  // ..*********..
-     0x000003EC,  // ...*****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 200
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000FFFC,  // ..**************..
-     0x0000FFFC,  // ..**************..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 201
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000FFFE,  // ..***************.
-     0x0000FFFE,  // ..***************.
-     0x00000006,  // ...............**.
-     0x00000006,  // ...............**.
-     0x00000006,  // ...............**.
-     0x00000000,  // ..................
-  },
-  {             // 202
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000780,  // ****.......
-     0x00000780,  // ****.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x0000018E,  // ..**...***.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 203
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x00003F0C,  // ..******....**..
-     0x00003F8C,  // ..*******...**..
-     0x000031CC,  // ..**...***..**..
-     0x000030CC,  // ..**....**..**..
-     0x000030CC,  // ..**....**..**..
-     0x000031CC,  // ..**...***..**..
-     0x00003FCC,  // ..********..**..
-     0x00003F8C,  // ..*******...**..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 204
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x0000018E,  // ..**...***.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 205
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007E0,  // ..******.....
-     0x00000FF8,  // .*********...
-     0x0000081C,  // .*......***..
-     0x0000000C,  // .........**..
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x000001FE,  // ....********.
-     0x000001FE,  // ....********.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000081C,  // .*......***..
-     0x00000FF8,  // .*********...
-     0x000007E0,  // ..******.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 206
-     19, 22,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x000181E0,  // ..**......****.....
-     0x000187F8,  // ..**....********...
-     0x00018E1C,  // ..**...***....***..
-     0x00018C0C,  // ..**...**......**..
-     0x00019C0E,  // ..**..***......***.
-     0x00019806,  // ..**..**........**.
-     0x0001F806,  // ..******........**.
-     0x0001F806,  // ..******........**.
-     0x00019806,  // ..**..**........**.
-     0x00019C0E,  // ..**..***......***.
-     0x00018C0C,  // ..**...**......**..
-     0x00018E1C,  // ..**...***....***..
-     0x000187F8,  // ..**....********...
-     0x000181E0,  // ..**......****.....
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 207
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FC,  // ....******..
-     0x000001FC,  // ...*******..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000010C,  // ...*....**..
-     0x0000018C,  // ...**...**..
-     0x0000007C,  // .....*****..
-     0x000000FC,  // ....******..
-     0x000001CC,  // ...***..**..
-     0x0000018C,  // ...**...**..
-     0x0000030C,  // ..**....**..
-     0x0000070C,  // .***....**..
-     0x00000E0C,  // ***.....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 208
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000086,  // ..*....**.
-     0x00000006,  // .......**.
-     0x0000007E,  // ...******.
-     0x000000FE,  // ..*******.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FF,  // .*********
-     0x000000E7,  // ..***..***
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 209
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FC,  // ....******..
-     0x000003FC,  // ..********..
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000006F0,  // .**.****....
-     0x000007FC,  // .*********..
-     0x0000070C,  // .***....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 210
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x00000186,  // ..**....**.
-     0x0000018E,  // ..**...***.
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x000001FE,  // ..********.
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 211
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007F,  // ..*******
-     0x0000007F,  // ..*******
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 212
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ...*******..
-     0x000001FC,  // ...*******..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 213
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ...****....
-     0x000001F8,  // ..******...
-     0x0000018C,  // ..**...**..
-     0x0000030C,  // .**....**..
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000384,  // .***....*..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 214
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000718E,  // .***...**...***.
-     0x0000318C,  // ..**...**...**..
-     0x00001998,  // ...**..**..**...
-     0x00000DB0,  // ....**.**.**....
-     0x00000FF0,  // ....********....
-     0x00000FF0,  // ....********....
-     0x00001DB8,  // ...***.**.***...
-     0x0000399C,  // ..***..**..***..
-     0x0000718E,  // .***...**...***.
-     0x0000E187,  // ***....**....***
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 215
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x00000106,  // .*.....**.
-     0x0000000E,  // ......***.
-     0x00000078,  // ...****...
-     0x0000007C,  // ...*****..
-     0x00000006,  // .......**.
-     0x00000106,  // .*.....**.
-     0x000001FE,  // .********.
-     0x000000FC,  // ..******..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 216
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x0000033C,  // ..**..****..
-     0x0000033C,  // ..**..****..
-     0x0000036C,  // ..**.**.**..
-     0x0000036C,  // ..**.**.**..
-     0x000003CC,  // ..****..**..
-     0x000003CC,  // ..****..**..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 217
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000108,  // ...*....*...
-     0x000001F8,  // ...******...
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x0000033C,  // ..**..****..
-     0x0000033C,  // ..**..****..
-     0x0000036C,  // ..**.**.**..
-     0x0000036C,  // ..**.**.**..
-     0x000003CC,  // ..****..**..
-     0x000003CC,  // ..****..**..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 218
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000018E,  // ..**...***.
-     0x0000018C,  // ..**...**..
-     0x00000198,  // ..**..**...
-     0x000001B0,  // ..**.**....
-     0x000001F0,  // ..*****....
-     0x000001F0,  // ..*****....
-     0x000001B8,  // ..**.***...
-     0x0000019C,  // ..**..***..
-     0x0000018E,  // ..**...***.
-     0x00000187,  // ..**....***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 219
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ...*******..
-     0x000001FC,  // ...*******..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000018C,  // ...**...**..
-     0x0000078C,  // .****...**..
-     0x0000070C,  // .***....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 220
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000E0C,  // ..***.....**..
-     0x00000E1C,  // ..***....***..
-     0x00000F1C,  // ..****...***..
-     0x00000F3C,  // ..****..****..
-     0x00000F3C,  // ..****..****..
-     0x00000DEC,  // ..**.****.**..
-     0x00000DEC,  // ..**.****.**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000C0C,  // ..**......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 221
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 222
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F0,  // ....****....
-     0x000003FC,  // ..********..
-     0x0000030C,  // ..**....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 223
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 224
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000378,  // ..**.****...
-     0x000003FC,  // ..********..
-     0x0000038E,  // ..***...***.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x0000038C,  // ..***...**..
-     0x000003FC,  // ..********..
-     0x00000378,  // ..**.****...
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-  },
-  {             // 225
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000003C,  // ....****..
-     0x000000FE,  // ..*******.
-     0x000000C2,  // ..**....*.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C2,  // ..**....*.
-     0x000000FE,  // ..*******.
-     0x0000003C,  // ....****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 226
-     8, 22,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x000000FF,  // ********
-     0x000000FF,  // ********
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 227
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000187,  // .**....***
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000007C,  // ...*****..
-     0x00000078,  // ...****...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 228
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00001DB8,  // ...***.**.***...
-     0x00003FFC,  // ..************..
-     0x000033CC,  // ..**..****..**..
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x000033CC,  // ..**..****..**..
-     0x00003FFC,  // ..************..
-     0x00001DB8,  // ...***.**.***...
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-  },
-  {             // 229
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000070E,  // .***....***.
-     0x0000038C,  // ..***...**..
-     0x00000198,  // ...**..**...
-     0x000000F8,  // ....*****...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000001F0,  // ...*****....
-     0x00000198,  // ...**..**...
-     0x0000031C,  // ..**...***..
-     0x0000070E,  // .***....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 230
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000006,  // .........**.
-     0x00000006,  // .........**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 231
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000031C,  // ..**...***..
-     0x000003FC,  // ..********..
-     0x000001CC,  // ...***..**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 232
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000FFFC,  // ..**************..
-     0x0000FFFC,  // ..**************..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 233
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000C30C,  // ..**....**....**..
-     0x0000FFFE,  // ..***************.
-     0x0000FFFE,  // ..***************.
-     0x00000006,  // ...............**.
-     0x00000006,  // ...............**.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 234
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000780,  // ****.......
-     0x00000780,  // ****.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x000001FE,  // ..********.
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 235
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x00003F0C,  // ..******....**..
-     0x00003F8C,  // ..*******...**..
-     0x000030CC,  // ..**....**..**..
-     0x000030CC,  // ..**....**..**..
-     0x00003FCC,  // ..********..**..
-     0x00003F8C,  // ..*******...**..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 236
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x000001F8,  // ..******...
-     0x000001FC,  // ..*******..
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x000001FE,  // ..********.
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 237
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F0,  // ..****....
-     0x000001FC,  // .*******..
-     0x0000010C,  // .*....**..
-     0x00000006,  // .......**.
-     0x0000003E,  // ....*****.
-     0x0000003E,  // ....*****.
-     0x00000006,  // .......**.
-     0x0000010C,  // .*....**..
-     0x000001FC,  // .*******..
-     0x000000F0,  // ..****....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 238
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003070,  // ..**.....***....
-     0x000031FC,  // ..**...*******..
-     0x0000318C,  // ..**...**...**..
-     0x00003306,  // ..**..**.....**.
-     0x00003F06,  // ..******.....**.
-     0x00003F06,  // ..******.....**.
-     0x00003306,  // ..**..**.....**.
-     0x0000318C,  // ..**...**...**..
-     0x000031FC,  // ..**...*******..
-     0x00003070,  // ..**.....***....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 239
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ...*******..
-     0x000003FC,  // ..********..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000001FC,  // ...*******..
-     0x0000007C,  // .....*****..
-     0x000000CC,  // ....**..**..
-     0x0000018C,  // ...**...**..
-     0x0000030C,  // ..**....**..
-     0x0000070C,  // .***....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 240
-     19, 22,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00018180,  // ..**......**.......
-     0x0001C180,  // ..***.....**.......
-     0x0001E180,  // ..****....**.......
-     0x0001E19C,  // ..****....**..***..
-     0x0001F1BE,  // ..*****...**.*****.
-     0x0001B1B6,  // ..**.**...**.**.**.
-     0x000199B6,  // ..**..**..**.**.**.
-     0x000199BE,  // ..**..**..**.*****.
-     0x00018D9C,  // ..**...**.**..***..
-     0x00018F80,  // ..**...*****.......
-     0x000187BE,  // ..**....****.*****.
-     0x000187BE,  // ..**....****.*****.
-     0x00018380,  // ..**.....***.......
-     0x00018180,  // ..**......**.......
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 241
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ..**..**...
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000000F0,  // ...****....
-     0x000001F8,  // ..******...
-     0x0000018C,  // ..**...**..
-     0x0000030C,  // .**....**..
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000384,  // .***....*..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 242
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ..**........
-     0x000007F0,  // .*******....
-     0x000007F0,  // .*******....
-     0x00000300,  // ..**........
-     0x00000338,  // ..**..***...
-     0x0000037C,  // ..**.*****..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000078,  // .....****...
-     0x00000070,  // .....***....
-  },
-  {             // 243
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000000,  // .........
-     0x0000007F,  // ..*******
-     0x0000007F,  // ..*******
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 244
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000003C,  // ....****..
-     0x000000FE,  // ..*******.
-     0x000000C2,  // ..**....*.
-     0x00000180,  // .**.......
-     0x000001F0,  // .*****....
-     0x000001F0,  // .*****....
-     0x00000180,  // .**.......
-     0x000000C2,  // ..**....*.
-     0x000000FE,  // ..*******.
-     0x0000003C,  // ....****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 245
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001F8,  // .******...
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000000C,  // ......**..
-     0x0000010C,  // .*....**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 246
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 247
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 248
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000046,  // *...**.
-     0x0000007C,  // *****..
-     0x00000078,  // ****...
-  },
-  {             // 249
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003F80,  // ...*******.......
-     0x00003F80,  // ...*******.......
-     0x00003180,  // ...**...**.......
-     0x00003180,  // ...**...**.......
-     0x000031F8,  // ...**...******...
-     0x000031FC,  // ...**...*******..
-     0x00003186,  // ...**...**....**.
-     0x00003186,  // ...**...**....**.
-     0x0000F1FE,  // .****...********.
-     0x0000E1FC,  // .***....*******..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 250
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00006180,  // ..**....**.......
-     0x00006180,  // ..**....**.......
-     0x00006180,  // ..**....**.......
-     0x00006180,  // ..**....**.......
-     0x00007FF8,  // ..************...
-     0x00007FFC,  // ..*************..
-     0x00006186,  // ..**....**....**.
-     0x00006186,  // ..**....**....**.
-     0x000061FE,  // ..**....********.
-     0x000061FC,  // ..**....*******..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 251
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000300,  // ..**........
-     0x000007F0,  // .*******....
-     0x000007F0,  // .*******....
-     0x00000300,  // ..**........
-     0x00000338,  // ..**..***...
-     0x0000037C,  // ..**.*****..
-     0x0000038C,  // ..***...**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 252
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x0000018E,  // ..**...***.
-     0x0000018C,  // ..**...**..
-     0x00000198,  // ..**..**...
-     0x000001B0,  // ..**.**....
-     0x000001F0,  // ..*****....
-     0x000001F0,  // ..*****....
-     0x000001B8,  // ..**.***...
-     0x0000019C,  // ..**..***..
-     0x0000018E,  // ..**...***.
-     0x00000187,  // ..**....***
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 253
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000001FC,  // ...*******..
-     0x00000384,  // ..***....*..
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x000001C0,  // ...***......
-     0x000001F0,  // ...*****....
-     0x00000338,  // ..**..***...
-     0x0000030C,  // ..**....**..
-     0x0000038C,  // ..***...**..
-     0x000001CC,  // ...***..**..
-     0x000000F8,  // ....*****...
-     0x00000038,  // ......***...
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000021C,  // ..*....***..
-     0x000003FC,  // ..********..
-     0x000001F0,  // ...*****....
-  },
-  {             // 254
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000084,  // ..*....*..
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000187,  // .**....***
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000007C,  // ...*****..
-     0x00000078,  // ...****...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 255
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  };
diff --git a/fontosd-iso8859-7.c b/fontosd-iso8859-7.c
deleted file mode 100644
index 4fd47fbdb..000000000
--- a/fontosd-iso8859-7.c
+++ /dev/null
@@ -1,6274 +0,0 @@
-static const cFont::tPixelData FontOsd_iso8859_7[][27] = {
-  {             // 32
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 33
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 34
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000067,  // .**..***
-     0x00000067,  // .**..***
-     0x00000067,  // .**..***
-     0x00000067,  // .**..***
-     0x00000067,  // .**..***
-     0x00000062,  // .**...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000086,  // .....*....**.
-     0x00000186,  // ....**....**.
-     0x00000184,  // ....**....*..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00001FFF,  // *************
-     0x00001FFF,  // *************
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000218,  // ...*....**...
-     0x00001FFF,  // *************
-     0x00001FFF,  // *************
-     0x00000630,  // ..**...**....
-     0x00000630,  // ..**...**....
-     0x00000430,  // ..*....**....
-     0x00000C20,  // .**....*.....
-     0x00000C20,  // .**....*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x000003F8,  // ...*******...
-     0x000007FC,  // ..*********..
-     0x00000E66,  // .***..**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C60,  // .**...**.....
-     0x00000E60,  // .***..**.....
-     0x00000760,  // ..***.**.....
-     0x000003F0,  // ...******....
-     0x000001FC,  // ....*******..
-     0x0000007C,  // ......*****..
-     0x00000066,  // ......**..**.
-     0x00000066,  // ......**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000666,  // ..**..**..**.
-     0x000007FC,  // ..*********..
-     0x000003F8,  // ...*******...
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     21, 25,
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x0003C020,  // ...****........*.....
-     0x0007E060,  // ..******......**.....
-     0x000C3040,  // .**....**.....*......
-     0x000C30C0,  // .**....**....**......
-     0x000C3080,  // .**....**....*.......
-     0x000C3180,  // .**....**...**.......
-     0x000C3100,  // .**....**...*........
-     0x00066300,  // ..**..**...**........
-     0x0007E200,  // ..******...*.........
-     0x00000638,  // ..........**...***...
-     0x0000047C,  // ..........*...*****..
-     0x00000CC6,  // .........**..**...**.
-     0x000008C6,  // .........*...**...**.
-     0x000018C6,  // ........**...**...**.
-     0x000030C6,  // .......**....**...**.
-     0x000030C6,  // .......**....**...**.
-     0x00006064,  // ......**......**..*..
-     0x0000607C,  // ......**......*****..
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-     0x00000000,  // .....................
-  },
-  {             // 38
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x000007C0,  // .....*****......
-     0x00000FE0,  // ....*******.....
-     0x00001C70,  // ...***...***....
-     0x00001830,  // ...**.....**....
-     0x00001870,  // ...**....***....
-     0x00001C60,  // ...***...**.....
-     0x00000FE0,  // ....*******.....
-     0x00000780,  // .....****.......
-     0x00000F80,  // ....*****.......
-     0x00003BC0,  // ..***.****......
-     0x000031EC,  // ..**...****.**..
-     0x000060EC,  // .**.....***.**..
-     0x0000607C,  // .**......*****..
-     0x00006038,  // .**.......***...
-     0x0000703C,  // .***......****..
-     0x0000387E,  // ..***....******.
-     0x00001FE7,  // ...********..***
-     0x00000F82,  // ....*****.....*.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 39
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 40
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000004,  // .....*..
-     0x0000000C,  // ....**..
-     0x00000008,  // ....*...
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000020,  // ..*.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000000,  // ........
-  },
-  {             // 42
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x000000FF,  // .********
-     0x0000007E,  // ..******.
-     0x0000001C,  // ....***..
-     0x0000002C,  // ...*.**..
-     0x00000066,  // ..**..**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 44
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000008,  // ...*...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 45
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 46
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 47
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x0000060C,  // ..**.....**..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000070,  // ......***....
-     0x000001F0,  // ....*****....
-     0x000003B0,  // ...***.**....
-     0x00000230,  // ...*...**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003FC,  // ...********..
-     0x0000060C,  // ..**.....**..
-     0x00000E06,  // .***......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x000000E0,  // .....***.....
-     0x000001C0,  // ....***......
-     0x00000300,  // ...**........
-     0x00000600,  // ..**.........
-     0x00000400,  // ..*..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003FC,  // ...********..
-     0x0000073E,  // ..***..*****.
-     0x0000061E,  // ..**....****.
-     0x0000041E,  // ..*.....****.
-     0x0000001E,  // ........****.
-     0x0000001E,  // ........****.
-     0x0000003C,  // .......****..
-     0x000000F0,  // .....****....
-     0x0000007C,  // ......*****..
-     0x0000000E,  // .........***.
-     0x0000000F,  // .........****
-     0x00000007,  // ..........***
-     0x0000000F,  // .........****
-     0x0000060F,  // ..**.....****
-     0x0000061E,  // ..**....****.
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x000001D8,  // ....***.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000718,  // ..***...**...
-     0x00000618,  // ..**....**...
-     0x00000C18,  // .**.....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001FE,  // ....********.
-     0x000001FE,  // ....********.
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000378,  // ...**.****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000007,  // ..........***
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000603,  // ..**.......**
-     0x00000606,  // ..**......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000000F8,  // .....*****...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000001FE,  // ....********.
-     0x0000030E,  // ...**....***.
-     0x00000607,  // ..**......***
-     0x00000607,  // ..**......***
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000CF8,  // .**..*****...
-     0x00000DFC,  // .**.*******..
-     0x00000E0E,  // .***.....***.
-     0x00000E07,  // .***......***
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000607,  // ..**......***
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000000F8,  // .....*****...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FE,  // ...*********.
-     0x00000707,  // ..***.....***
-     0x00000607,  // ..**......***
-     0x00000607,  // ..**......***
-     0x00000607,  // ..**......***
-     0x0000030E,  // ...**....***.
-     0x000001FC,  // ....*******..
-     0x000003FC,  // ...********..
-     0x00000306,  // ...**.....**.
-     0x00000703,  // ..***......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000703,  // ..***......**
-     0x00000386,  // ...***....**.
-     0x000001FC,  // ....*******..
-     0x000000F8,  // .....*****...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000C07,  // .**.......***
-     0x00000C07,  // .**.......***
-     0x00000C07,  // .**.......***
-     0x00000C07,  // .**.......***
-     0x00000E07,  // .***......***
-     0x0000070F,  // ..***....****
-     0x000003FB,  // ...*******.**
-     0x000001F3,  // ....*****..**
-     0x00000007,  // ..........***
-     0x00000006,  // ..........**.
-     0x00000606,  // ..**......**.
-     0x0000060C,  // ..**.....**..
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 59
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000008,  // ...*...
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 60
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000004,  // ...........*..
-     0x0000001C,  // .........***..
-     0x00000078,  // .......****...
-     0x000003E0,  // ....*****.....
-     0x00000F00,  // ..****........
-     0x00001C00,  // .***..........
-     0x00001F00,  // .*****........
-     0x000007C0,  // ...*****......
-     0x000000F0,  // ......****....
-     0x0000003C,  // ........****..
-     0x0000000C,  // ..........**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 61
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFC,  // .***********..
-     0x00001FFC,  // .***********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFC,  // .***********..
-     0x00001FFC,  // .***********..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 62
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001000,  // .*............
-     0x00001E00,  // .****.........
-     0x00000F80,  // ..*****.......
-     0x000001F0,  // .....*****....
-     0x0000007C,  // .......*****..
-     0x0000000C,  // ..........**..
-     0x0000003C,  // ........****..
-     0x000000F0,  // ......****....
-     0x000007C0,  // ...*****......
-     0x00001F00,  // .*****........
-     0x00001800,  // .**...........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 63
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003FC,  // ...********..
-     0x0000070C,  // ..***....**..
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000001C,  // ........***..
-     0x00000038,  // .......***...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     24, 25,
-     0x00000000,  // ........................
-     0x00000000,  // ........................
-     0x00007F00,  // .........*******........
-     0x0001FFE0,  // .......************.....
-     0x000780F0,  // .....****.......****....
-     0x000E0038,  // ....***...........***...
-     0x001C001C,  // ...***.............***..
-     0x00183CCC,  // ...**.....****..**..**..
-     0x00387EC6,  // ..***....******.**...**.
-     0x0030C386,  // ..**....**....***....**.
-     0x00318186,  // ..**...**......**....**.
-     0x00618186,  // .**....**......**....**.
-     0x00630186,  // .**...**.......**....**.
-     0x00630186,  // .**...**.......**....**.
-     0x00630304,  // .**...**......**.....*..
-     0x0063030C,  // .**...**......**....**..
-     0x00630718,  // .**...**.....***...**...
-     0x00718F38,  // .***...**...****..***...
-     0x0031FFE0,  // ..**...************.....
-     0x003873C0,  // ..***....***..****......
-     0x001C0006,  // ...***...............**.
-     0x000E001C,  // ....***............***..
-     0x00078078,  // .....****........****...
-     0x0003FFF0,  // ......**************....
-     0x00007F80,  // .........********.......
-  },
-  {             // 65
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x000006C0,  // ......**.**......
-     0x000006E0,  // ......**.***.....
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C30,  // .....**....**....
-     0x00001830,  // ....**.....**....
-     0x00001838,  // ....**.....***...
-     0x00003FF8,  // ...***********...
-     0x00003FFC,  // ...************..
-     0x0000301C,  // ...**.......***..
-     0x0000700C,  // ..***........**..
-     0x0000600E,  // ..**.........***.
-     0x00006006,  // ..**..........**.
-     0x0000E007,  // .***..........***
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 66
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FE0,  // ..*********.....
-     0x00003FF8,  // ..***********...
-     0x0000301C,  // ..**.......***..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x00003018,  // ..**.......**...
-     0x00003FF0,  // ..**********....
-     0x00003FF8,  // ..***********...
-     0x0000301C,  // ..**.......***..
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003FF8,  // ..***********...
-     0x00003FF0,  // ..**********....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 67
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007C0,  // ......*****......
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x0000E000,  // .***.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000E00C,  // .***.........**..
-     0x0000600C,  // ..**.........**..
-     0x00007018,  // ..***.......**...
-     0x00003838,  // ...***.....***...
-     0x00001FF0,  // ....*********....
-     0x000007C0,  // ......*****......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 68
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF0,  // ..***********....
-     0x00006038,  // ..**.......***...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x0000600E,  // ..**.........***.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x0000600E,  // ..**.........***.
-     0x0000600C,  // ..**.........**..
-     0x0000601C,  // ..**........***..
-     0x00006038,  // ..**.......***...
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 69
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FFC,  // ..************..
-     0x00003FFC,  // ..************..
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003FE0,  // ..*********.....
-     0x00003FE0,  // ..*********.....
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003FFC,  // ..************..
-     0x00003FFC,  // ..************..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 70
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FF8,  // ..*********...
-     0x00000FF8,  // ..*********...
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000783C,  // ...****.....****..
-     0x0000601C,  // ...**........***..
-     0x0000C00E,  // ..**..........***.
-     0x0000C000,  // ..**..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x0001807E,  // .**........******.
-     0x0001807E,  // .**........******.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000600E,  // ...**.........***.
-     0x0000783C,  // ...****.....****..
-     0x00001FF8,  // .....**********...
-     0x000007E0,  // .......******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00007FFE,  // ..**************.
-     0x00007FFE,  // ..**************.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 73
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 74
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000071C,  // .***...***..
-     0x000003F8,  // ..*******...
-     0x000001F0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003038,  // ..**......***...
-     0x00003070,  // ..**.....***....
-     0x000030E0,  // ..**....***.....
-     0x000031C0,  // ..**...***......
-     0x00003380,  // ..**..***.......
-     0x00003780,  // ..**.****.......
-     0x00003F80,  // ..*******.......
-     0x00003DC0,  // ..****.***......
-     0x000038E0,  // ..***...***.....
-     0x00003070,  // ..**.....***....
-     0x00003070,  // ..**.....***....
-     0x00003038,  // ..**......***...
-     0x0000301C,  // ..**.......***..
-     0x0000301C,  // ..**.......***..
-     0x0000300E,  // ..**........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 76
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000E00E,  // ..***.........***.
-     0x0000F01E,  // ..****.......****.
-     0x0000F01E,  // ..****.......****.
-     0x0000F83E,  // ..*****.....*****.
-     0x0000D836,  // ..**.**.....**.**.
-     0x0000DC76,  // ..**.***...***.**.
-     0x0000CC66,  // ..**..**...**..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x0000C6C6,  // ..**...**.**...**.
-     0x0000C7C6,  // ..**...*****...**.
-     0x0000C386,  // ..**....***....**.
-     0x0000C386,  // ..**....***....**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 78
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007006,  // ..***.........**.
-     0x00007006,  // ..***.........**.
-     0x00007806,  // ..****........**.
-     0x00007C06,  // ..*****.......**.
-     0x00006C06,  // ..**.**.......**.
-     0x00006E06,  // ..**.***......**.
-     0x00006706,  // ..**..***.....**.
-     0x00006386,  // ..**...***....**.
-     0x00006386,  // ..**...***....**.
-     0x000061C6,  // ..**....***...**.
-     0x000060E6,  // ..**.....***..**.
-     0x00006066,  // ..**......**..**.
-     0x00006076,  // ..**......***.**.
-     0x0000603E,  // ..**.......*****.
-     0x0000601E,  // ..**........****.
-     0x0000601E,  // ..**........****.
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 79
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000783C,  // ...****.....****..
-     0x0000601C,  // ...**........***..
-     0x0000C00E,  // ..**..........***.
-     0x0000C006,  // ..**...........**.
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x00018003,  // .**.............**
-     0x00018003,  // .**.............**
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x0000C006,  // ..**...........**.
-     0x0000C00E,  // ..**..........***.
-     0x0000600C,  // ...**.........**..
-     0x0000783C,  // ...****.....****..
-     0x00001FF0,  // .....*********....
-     0x00000FE0,  // ......*******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FF0,  // ..**********....
-     0x00003FFC,  // ..************..
-     0x0000301E,  // ..**.......****.
-     0x0000300E,  // ..**........***.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003FFC,  // ..************..
-     0x00003FF0,  // ..**********....
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 81
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000783C,  // ...****.....****..
-     0x0000601C,  // ...**........***..
-     0x0000C00E,  // ..**..........***.
-     0x0000C006,  // ..**...........**.
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x00018003,  // .**.............**
-     0x00018003,  // .**.............**
-     0x00018003,  // .**.............**
-     0x00018007,  // .**............***
-     0x0000C006,  // ..**...........**.
-     0x0000C0CE,  // ..**......**..***.
-     0x000060EE,  // ...**.....***.***.
-     0x0000783C,  // ...****.....****..
-     0x00003FFC,  // ....************..
-     0x00000FC7,  // ......******...***
-     0x00000002,  // ................*.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FF0,  // ..***********....
-     0x00007FFC,  // ..*************..
-     0x0000600E,  // ..**.........***.
-     0x0000600E,  // ..**.........***.
-     0x00006006,  // ..**..........**.
-     0x0000600E,  // ..**.........***.
-     0x0000601E,  // ..**........****.
-     0x00007FFC,  // ..*************..
-     0x00007FF0,  // ..***********....
-     0x000060E0,  // ..**.....***.....
-     0x00006060,  // ..**......**.....
-     0x00006070,  // ..**......***....
-     0x00006038,  // ..**.......***...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 83
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x000007F0,  // .....*******....
-     0x00000FF8,  // ....*********...
-     0x00001C1C,  // ...***.....***..
-     0x0000300E,  // ..**........***.
-     0x00003006,  // ..**.........**.
-     0x00003000,  // ..**............
-     0x00003800,  // ..***...........
-     0x00001F00,  // ...*****........
-     0x00000FF0,  // ....********....
-     0x000001FC,  // .......*******..
-     0x0000001C,  // ...........***..
-     0x00000006,  // .............**.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x00003806,  // ..***........**.
-     0x00001C0C,  // ...***......**..
-     0x00000FF8,  // ....*********...
-     0x000003F0,  // ......******....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 84
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x0000600E,  // ..**.........***.
-     0x0000600E,  // ..**.........***.
-     0x0000700C,  // ..***........**..
-     0x0000381C,  // ...***......***..
-     0x00001FF8,  // ....**********...
-     0x000007E0,  // ......******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 86
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000E006,  // ***..........**.
-     0x00006006,  // .**..........**.
-     0x0000600E,  // .**.........***.
-     0x0000700C,  // .***........**..
-     0x0000300C,  // ..**........**..
-     0x00003018,  // ..**.......**...
-     0x00001818,  // ...**......**...
-     0x00001838,  // ...**.....***...
-     0x00001C30,  // ...***....**....
-     0x00000C30,  // ....**....**....
-     0x00000C60,  // ....**...**.....
-     0x00000E60,  // ....***..**.....
-     0x00000660,  // .....**..**.....
-     0x000006C0,  // .....**.**......
-     0x000003C0,  // ......****......
-     0x00000380,  // ......***.......
-     0x00000380,  // ......***.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 87
-     22, 25,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00380E03,  // ***.......***.......**
-     0x00181E07,  // .**......****......***
-     0x00181E06,  // .**......****......**.
-     0x00181F06,  // .**......*****.....**.
-     0x001C1B06,  // .***.....**.**.....**.
-     0x000C330C,  // ..**....**..**....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000C318C,  // ..**....**...**...**..
-     0x000E618C,  // ..***..**....**...**..
-     0x00066198,  // ...**..**....**..**...
-     0x000661D8,  // ...**..**....***.**...
-     0x000660D8,  // ...**..**.....**.**...
-     0x0002C0D8,  // ....*.**......**.**...
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x00038070,  // ....***........***....
-     0x00018060,  // .....**........**.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000700E,  // .***........***.
-     0x0000380C,  // ..***.......**..
-     0x00001818,  // ...**......**...
-     0x00001C38,  // ...***....***...
-     0x00000E70,  // ....***..***....
-     0x00000660,  // .....**..**.....
-     0x000007C0,  // .....*****......
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x000006E0,  // .....**.***.....
-     0x00000E70,  // ....***..***....
-     0x00001C30,  // ...***....**....
-     0x00001838,  // ...**.....***...
-     0x0000381C,  // ..***......***..
-     0x0000700C,  // .***........**..
-     0x0000E00E,  // ***.........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 89
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007006,  // .***.........**.
-     0x0000700E,  // .***........***.
-     0x0000380C,  // ..***.......**..
-     0x00001818,  // ...**......**...
-     0x00001C38,  // ...***....***...
-     0x00000E30,  // ....***...**....
-     0x00000660,  // .....**..**.....
-     0x000007E0,  // .....******.....
-     0x000003C0,  // ......****......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 90
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFF,  // .*************
-     0x00001FFE,  // .************.
-     0x00000006,  // ...........**.
-     0x0000000C,  // ..........**..
-     0x00000018,  // .........**...
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000E00,  // ..***.........
-     0x00000C00,  // ..**..........
-     0x00001800,  // .**...........
-     0x00003FFE,  // *************.
-     0x00003FFE,  // *************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001F,  // ..*****
-     0x0000001F,  // ..*****
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000001F,  // ..*****
-     0x0000001F,  // ..*****
-  },
-  {             // 92
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000008,  // ...*...
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x0000003E,  // .*****.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x0000003E,  // .*****.
-     0x0000003E,  // .*****.
-  },
-  {             // 94
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000050,  // ....*.*....
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-  },
-  {             // 96
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000070,  // .***....
-     0x00000038,  // ..***...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 97
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003F0,  // ....******....
-     0x00000FF8,  // ..*********...
-     0x00001C1C,  // .***.....***..
-     0x0000180C,  // .**.......**..
-     0x0000000C,  // ..........**..
-     0x000000FC,  // ......******..
-     0x000007EC,  // ...******.**..
-     0x00001E0C,  // .****.....**..
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001C3C,  // .***....****..
-     0x00000FEC,  // ..*******.**..
-     0x000007CE,  // ...*****..***.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 98
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070E,  // ..***....***.
-     0x00000707,  // ..***.....***
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000706,  // ..***.....**.
-     0x0000070E,  // ..***....***.
-     0x000007FC,  // ..*********..
-     0x00000678,  // ..**..****...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000001FC,  // ...*******..
-     0x0000030E,  // ..**....***.
-     0x00000706,  // .***.....**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x0000030E,  // ..**....***.
-     0x000001FC,  // ...*******..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x000001E6,  // ....****..**.
-     0x000003FE,  // ...*********.
-     0x0000060E,  // ..**.....***.
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060E,  // ..**.....***.
-     0x0000070E,  // ..***....***.
-     0x000003FE,  // ...*********.
-     0x000001E6,  // ....****..**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003FC,  // ...********..
-     0x0000060C,  // ..**.....**..
-     0x00000406,  // ..*.......**.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000E06,  // .***......**.
-     0x0000070C,  // ..***....**..
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x0000000E,  // ...***.
-     0x0000001C,  // ..***..
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000007E,  // ******.
-     0x0000007E,  // ******.
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 103
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F6,  // ....*****.**.
-     0x000003FE,  // ...*********.
-     0x0000060E,  // ..**.....***.
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060E,  // ..**.....***.
-     0x000003FE,  // ...*********.
-     0x000001E6,  // ....****..**.
-     0x00000006,  // ..........**.
-     0x00000C0E,  // .**......***.
-     0x00000E0C,  // .***.....**..
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-  },
-  {             // 104
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000678,  // ..**..****...
-     0x000007FC,  // ..*********..
-     0x0000070E,  // ..***....***.
-     0x00000706,  // ..***.....**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000003C,  // ****..
-  },
-  {             // 107
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x0000061C,  // ..**....***..
-     0x00000638,  // ..**...***...
-     0x00000670,  // ..**..***....
-     0x000006E0,  // ..**.***.....
-     0x000007C0,  // ..*****......
-     0x000007E0,  // ..******.....
-     0x00000760,  // ..***.**.....
-     0x00000630,  // ..**...**....
-     0x00000638,  // ..**...***...
-     0x00000618,  // ..**....**...
-     0x0000060C,  // ..**.....**..
-     0x0000060E,  // ..**.....***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 108
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     20, 25,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00037C78,  // ..**.*****...****...
-     0x0003FFFC,  // ..****************..
-     0x0003870E,  // ..***....***....***.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00030606,  // ..**.....**......**.
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 110
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000678,  // ..**..****...
-     0x000007FC,  // ..*********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F8,  // ....******...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000E07,  // .***......***
-     0x00000C07,  // .**.......***
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C07,  // .**.......***
-     0x00000E06,  // .***......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000006F8,  // ..**.*****...
-     0x000007DC,  // ..*****.***..
-     0x00000706,  // ..***.....**.
-     0x00000707,  // ..***.....***
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000607,  // ..**......***
-     0x00000706,  // ..***.....**.
-     0x0000078E,  // ..****...***.
-     0x000007FC,  // ..*********..
-     0x000006F8,  // ..**.*****...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-  },
-  {             // 113
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F6,  // ....*****.**.
-     0x000003BE,  // ...***.*****.
-     0x0000060E,  // ..**.....***.
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060E,  // ..**.....***.
-     0x0000070E,  // ..***....***.
-     0x000003FE,  // ...*********.
-     0x000001E6,  // ....****..**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-  },
-  {             // 114
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000037,  // ..**.***
-     0x0000003F,  // ..******
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000700,  // .***........
-     0x000003E0,  // ..*****.....
-     0x000001FC,  // ...*******..
-     0x0000001E,  // .......****.
-     0x00000006,  // .........**.
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x000003FC,  // ..********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000007E,  // ******.
-     0x0000007E,  // ******.
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000001E,  // ..****.
-     0x0000000E,  // ...***.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 117
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000070E,  // ..***....***.
-     0x000003FE,  // ...*********.
-     0x000001E6,  // ....****..**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000398,  // ..***..**...
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018383,  // **.....***.....**
-     0x0000C386,  // .**....***....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C6C6,  // .**...**.**...**.
-     0x0000C6CC,  // .**...**.**..**..
-     0x000066CC,  // ..**..**.**..**..
-     0x000064CC,  // ..**..*..**..**..
-     0x00006C68,  // ..**.**...**.*...
-     0x00003C78,  // ...****...****...
-     0x00003C78,  // ...****...****...
-     0x00003870,  // ...***....***....
-     0x00001830,  // ....**.....**....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x00000398,  // ..***..**...
-     0x000001B8,  // ...**.***...
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000F0,  // ....****....
-     0x000001F0,  // ...*****....
-     0x00000198,  // ...**..**...
-     0x0000031C,  // ..**...***..
-     0x0000070E,  // .***....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000398,  // ..***..**...
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000040,  // .....*......
-     0x000000C0,  // ....**......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000FFE,  // ***********.
-     0x00000FFE,  // ***********.
-     0x0000001C,  // .......***..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000700,  // .***........
-     0x00000FFE,  // ***********.
-     0x00000FFE,  // ***********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000000E,  // .....***.
-     0x0000000E,  // .....***.
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000030,  // ...**....
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x0000000E,  // .....***.
-     0x0000000E,  // .....***.
-  },
-  {             // 124
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-  },
-  {             // 125
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000070,  // .***....
-     0x00000078,  // .****...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x00000006,  // .....**.
-     0x0000000E,  // ....***.
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000070,  // .***....
-  },
-  {             // 126
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FC6,  // .*******...**.
-     0x00001FFE,  // .************.
-     0x0000107C,  // .*.....*****..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 127
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 161
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x00000008,  // ....*...
-     0x00000008,  // ....*...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-  },
-  {             // 162
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003380,  // ...**..***.......
-     0x00007380,  // ..***..***.......
-     0x000066C0,  // ..**..**.**......
-     0x000006C0,  // ......**.**......
-     0x000006E0,  // ......**.***.....
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C30,  // .....**....**....
-     0x00001830,  // ....**.....**....
-     0x00001838,  // ....**.....***...
-     0x00003FF8,  // ...***********...
-     0x00003FFC,  // ...************..
-     0x0000301C,  // ...**.......***..
-     0x0000700C,  // ..***........**..
-     0x0000600E,  // ..**.........***.
-     0x00006006,  // ..**..........**.
-     0x0000E007,  // .***..........***
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 163
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000001FC,  // ....*******..
-     0x0000030C,  // ...**....**..
-     0x0000020E,  // ...*.....***.
-     0x00000606,  // ..**......**.
-     0x00000600,  // ..**.........
-     0x00000200,  // ...*.........
-     0x00000300,  // ...**........
-     0x00000FE0,  // .*******.....
-     0x00000FE0,  // .*******.....
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000300,  // ...**........
-     0x00000200,  // ...*.........
-     0x00000600,  // ..**.........
-     0x000007C2,  // ..*****....*.
-     0x00000FFE,  // .***********.
-     0x0000043E,  // ..*....*****.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000402,  // ..*........*.
-     0x00000EF7,  // .***.****.***
-     0x000007FE,  // ..**********.
-     0x0000039C,  // ...***..***..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000706,  // ..***.....**.
-     0x0000038C,  // ...***...**..
-     0x000007FE,  // ..**********.
-     0x00000EF7,  // .***.****.***
-     0x00000402,  // ..*........*.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 165
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001C0E,  // .***......***.
-     0x00000C0C,  // ..**......**..
-     0x00000E18,  // ..***....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 166
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-  },
-  {             // 167
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x0000060E,  // ..**.....***.
-     0x00000600,  // ..**.........
-     0x00000300,  // ...**........
-     0x000003C0,  // ...****......
-     0x000007F0,  // ..*******....
-     0x00000478,  // ..*...****...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000607,  // ..**......***
-     0x00000703,  // ..***......**
-     0x000003C3,  // ...****....**
-     0x000001E6,  // ....****..**.
-     0x0000007C,  // ......*****..
-     0x0000001C,  // ........***..
-     0x0000000E,  // .........***.
-     0x00000206,  // ...*......**.
-     0x00000606,  // ..**......**.
-     0x0000030E,  // ...**....***.
-     0x000003FC,  // ...********..
-     0x000000F8,  // .....*****...
-  },
-  {             // 168
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000067,  // .**..***
-     0x00000067,  // .**..***
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 169
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007018,  // ...***.......**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C786,  // .***...****....**.
-     0x00019CE2,  // .**..***..***...*.
-     0x00039863,  // ***..**....**...**
-     0x00033003,  // **..**..........**
-     0x00033003,  // **..**..........**
-     0x00033001,  // **..**...........*
-     0x00033003,  // **..**..........**
-     0x00033823,  // **..***.....*...**
-     0x00019862,  // .**..**....**...*.
-     0x00018F86,  // .**...*****....**.
-     0x0000C004,  // ..**...........*..
-     0x00006008,  // ...**.........*...
-     0x00003830,  // ....***.....**....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 170
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x00000006,  // ......**.
-     0x0000007E,  // ..******.
-     0x000000E2,  // .***...*.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x0000007A,  // ..****.*.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 171
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000330,  // ...**..**....
-     0x00000670,  // ..**..***....
-     0x00000670,  // ..**..***....
-     0x00000330,  // ...**..**....
-     0x00000318,  // ...**...**...
-     0x00000198,  // ....**..**...
-     0x0000008C,  // .....*...**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 172
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000006,  // ...........**.
-     0x00000006,  // ...........**.
-     0x00000006,  // ...........**.
-     0x00000006,  // ...........**.
-     0x00000006,  // ...........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 173
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 174
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E00C,  // ..***.........**..
-     0x0001C006,  // .***...........**.
-     0x00019FC2,  // .**..*******....*.
-     0x00039863,  // ***..**....**...**
-     0x00031863,  // **...**....**...**
-     0x00031861,  // **...**....**....*
-     0x00031FC1,  // **...*******.....*
-     0x00031981,  // **...**..**......*
-     0x000318C3,  // **...**...**....**
-     0x00019862,  // .**..**....**...*.
-     0x00019862,  // .**..**....**...*.
-     0x0000C004,  // ..**...........*..
-     0x00006008,  // ...**.........*...
-     0x00003830,  // ....***.....**....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 175
-     15, 25,
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 176
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007C,  // ..*****..
-     0x00000046,  // ..*...**.
-     0x00000042,  // ..*....*.
-     0x00000042,  // ..*....*.
-     0x00000066,  // ..**..**.
-     0x0000003C,  // ...****..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 177
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 178
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001E,  // ...****.
-     0x0000003F,  // ..******
-     0x00000063,  // .**...**
-     0x00000003,  // ......**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x00000038,  // ..***...
-     0x00000070,  // .***....
-     0x0000007F,  // .*******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001E,  // ...****.
-     0x0000003F,  // ..******
-     0x00000023,  // ..*...**
-     0x00000003,  // ......**
-     0x0000000E,  // ....***.
-     0x0000000F,  // ....****
-     0x00000001,  // .......*
-     0x00000061,  // .**....*
-     0x00000033,  // ..**..**
-     0x0000001E,  // ...****.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 181
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000070,  // ......***....
-     0x00000070,  // ......***....
-     0x00000CE6,  // .**..***..**.
-     0x00000CC6,  // .**..**...**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 182
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003380,  // ...**..***.......
-     0x00007380,  // ..***..***.......
-     0x000066C0,  // ..**..**.**......
-     0x000006C0,  // ......**.**......
-     0x000006E0,  // ......**.***.....
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C30,  // .....**....**....
-     0x00001830,  // ....**.....**....
-     0x00001838,  // ....**.....***...
-     0x00003FF8,  // ...***********...
-     0x00003FFC,  // ...************..
-     0x0000301C,  // ...**.......***..
-     0x0000700C,  // ..***........**..
-     0x0000600E,  // ..**.........***.
-     0x00006006,  // ..**..........**.
-     0x0000E007,  // .***..........***
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 183
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 184
-     20, 25,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0003BFFC,  // ..***.************..
-     0x00033FFC,  // ..**..************..
-     0x00063000,  // .**...**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003FE0,  // ......*********.....
-     0x00003FE0,  // ......*********.....
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003000,  // ......**............
-     0x00003FFC,  // ......************..
-     0x00003FFC,  // ......************..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 185
-     22, 25,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x000EC00C,  // ..***.**..........**..
-     0x000CC00C,  // ..**..**..........**..
-     0x0018C00C,  // .**...**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000FFFC,  // ......**************..
-     0x0000FFFC,  // ......**************..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x0000C00C,  // ......**..........**..
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 186
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000066,  // ..**..**.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 187
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000620,  // ..**...*.....
-     0x00000330,  // ...**..**....
-     0x00000318,  // ...**...**...
-     0x00000198,  // ....**..**...
-     0x000001CC,  // ....***..**..
-     0x000001CC,  // ....***..**..
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000230,  // ...*...**....
-     0x00000660,  // ..**..**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 188
-     20, 25,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00038FE0,  // ..***...*******.....
-     0x00031FF8,  // ..**...**********...
-     0x0006703C,  // .**..***......****..
-     0x0000600E,  // .....**.........***.
-     0x0000C00E,  // ....**..........***.
-     0x0000C006,  // ....**...........**.
-     0x00018007,  // ...**............***
-     0x00018007,  // ...**............***
-     0x00018007,  // ...**............***
-     0x00018007,  // ...**............***
-     0x00018007,  // ...**............***
-     0x00018007,  // ...**............***
-     0x0000C006,  // ....**...........**.
-     0x0000C00E,  // ....**..........***.
-     0x0000600C,  // .....**.........**..
-     0x0000783C,  // .....****.....****..
-     0x00001FF8,  // .......**********...
-     0x00000FE0,  // ........*******.....
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 189
-     20, 25,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0000C00C,  // ....**..........**..
-     0x0001C018,  // ...***.........**...
-     0x0007C030,  // .*****........**....
-     0x0006C060,  // .**.**.......**.....
-     0x0000C060,  // ....**.......**.....
-     0x0000C0C0,  // ....**......**......
-     0x0000C180,  // ....**.....**.......
-     0x0000C100,  // ....**.....*........
-     0x0000C300,  // ....**....**........
-     0x0000C600,  // ....**...**.........
-     0x00000C3E,  // ........**....*****.
-     0x00000C63,  // ........**...**...**
-     0x00001803,  // .......**.........**
-     0x00003003,  // ......**..........**
-     0x0000600E,  // .....**.........***.
-     0x00006018,  // .....**........**...
-     0x0000C030,  // ....**........**....
-     0x0001807F,  // ...**........*******
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 190
-     22, 25,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x000E6006,  // ..***..**..........**.
-     0x000C700E,  // ..**...***........***.
-     0x0018380C,  // .**.....***.......**..
-     0x00001818,  // .........**......**...
-     0x00001C38,  // .........***....***...
-     0x00000E30,  // ..........***...**....
-     0x00000660,  // ...........**..**.....
-     0x000007E0,  // ...........******.....
-     0x000003C0,  // ............****......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000180,  // .............**.......
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 191
-     20, 25,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00030F80,  // ..**....*****.......
-     0x00033FE0,  // ..**..*********.....
-     0x00067070,  // .**..***.....***....
-     0x0000E038,  // ....***.......***...
-     0x0000C018,  // ....**.........**...
-     0x0001C01C,  // ...***.........***..
-     0x0001800C,  // ...**...........**..
-     0x0001800C,  // ...**...........**..
-     0x0001800C,  // ...**...........**..
-     0x0001800C,  // ...**...........**..
-     0x0001800C,  // ...**...........**..
-     0x0001800C,  // ...**...........**..
-     0x0000C018,  // ....**.........**...
-     0x0000C018,  // ....**.........**...
-     0x00006030,  // .....**.......**....
-     0x00003060,  // ......**.....**.....
-     0x0001F8FC,  // ...******...******..
-     0x0001F8FC,  // ...******...******..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 192
-     11, 25,
-     0x00000000,  // ...........
-     0x00000038,  // .....***...
-     0x00000030,  // .....**....
-     0x00000667,  // **..**..***
-     0x00000607,  // **......***
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 193
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x000006C0,  // ......**.**......
-     0x000006E0,  // ......**.***.....
-     0x00000C60,  // .....**...**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C30,  // .....**....**....
-     0x00001830,  // ....**.....**....
-     0x00001838,  // ....**.....***...
-     0x00003FF8,  // ...***********...
-     0x00003FFC,  // ...************..
-     0x0000301C,  // ...**.......***..
-     0x0000700C,  // ..***........**..
-     0x0000600E,  // ..**.........***.
-     0x00006006,  // ..**..........**.
-     0x0000E007,  // .***..........***
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 194
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FE0,  // ..*********.....
-     0x00003FF8,  // ..***********...
-     0x0000301C,  // ..**.......***..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x0000300C,  // ..**........**..
-     0x00003018,  // ..**.......**...
-     0x00003FF0,  // ..**********....
-     0x00003FF8,  // ..***********...
-     0x0000301C,  // ..**.......***..
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003FF8,  // ..***********...
-     0x00003FF0,  // ..**********....
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 195
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 196
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000002C0,  // .......*.**......
-     0x000006C0,  // ......**.**......
-     0x000006E0,  // ......**.***.....
-     0x00000E60,  // .....***..**.....
-     0x00000C60,  // .....**...**.....
-     0x00000C30,  // .....**....**....
-     0x00001830,  // ....**.....**....
-     0x00001838,  // ....**.....***...
-     0x00003818,  // ...***......**...
-     0x0000301C,  // ...**.......***..
-     0x0000301C,  // ...**.......***..
-     0x0000700C,  // ..***........**..
-     0x0000600E,  // ..**.........***.
-     0x00007FFE,  // ..**************.
-     0x0000FFFF,  // .****************
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 197
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FFC,  // ..************..
-     0x00003FFC,  // ..************..
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003FE0,  // ..*********.....
-     0x00003FE0,  // ..*********.....
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003FFC,  // ..************..
-     0x00003FFC,  // ..************..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 198
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFF,  // .*************
-     0x00001FFE,  // .************.
-     0x00000006,  // ...........**.
-     0x0000000C,  // ..........**..
-     0x00000018,  // .........**...
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000E00,  // ..***.........
-     0x00000C00,  // ..**..........
-     0x00001800,  // .**...........
-     0x00003FFE,  // *************.
-     0x00003FFE,  // *************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 199
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00007FFE,  // ..**************.
-     0x00007FFE,  // ..**************.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 200
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000787C,  // ...****....*****..
-     0x0000601C,  // ...**........***..
-     0x0000C00E,  // ..**..........***.
-     0x0000C006,  // ..**...........**.
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x00018FE3,  // .**...*******...**
-     0x00018FE3,  // .**...*******...**
-     0x00018007,  // .**............***
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000600C,  // ...**.........**..
-     0x0000703C,  // ...***......****..
-     0x00001FF8,  // .....**********...
-     0x00000FE0,  // ......*******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 201
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 202
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003038,  // ..**......***...
-     0x00003070,  // ..**.....***....
-     0x000030E0,  // ..**....***.....
-     0x000031C0,  // ..**...***......
-     0x00003380,  // ..**..***.......
-     0x00003780,  // ..**.****.......
-     0x00003F80,  // ..*******.......
-     0x00003DC0,  // ..****.***......
-     0x000038E0,  // ..***...***.....
-     0x00003070,  // ..**.....***....
-     0x00003070,  // ..**.....***....
-     0x00003038,  // ..**......***...
-     0x0000301C,  // ..**.......***..
-     0x0000301C,  // ..**.......***..
-     0x0000300E,  // ..**........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 203
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000180,  // .......**.......
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x000006C0,  // .....**.**......
-     0x00000660,  // .....**..**.....
-     0x00000660,  // .....**..**.....
-     0x00000C70,  // ....**...***....
-     0x00000C30,  // ....**....**....
-     0x00001C30,  // ...***....**....
-     0x00001838,  // ...**.....***...
-     0x00001818,  // ...**......**...
-     0x00003018,  // ..**.......**...
-     0x0000301C,  // ..**.......***..
-     0x0000700C,  // .***........**..
-     0x0000600E,  // .**.........***.
-     0x00006006,  // .**..........**.
-     0x0000E006,  // ***..........**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 204
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000E00E,  // ..***.........***.
-     0x0000F01E,  // ..****.......****.
-     0x0000F01E,  // ..****.......****.
-     0x0000F83E,  // ..*****.....*****.
-     0x0000D836,  // ..**.**.....**.**.
-     0x0000DC76,  // ..**.***...***.**.
-     0x0000CC66,  // ..**..**...**..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x0000C6C6,  // ..**...**.**...**.
-     0x0000C7C6,  // ..**...*****...**.
-     0x0000C386,  // ..**....***....**.
-     0x0000C386,  // ..**....***....**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 205
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007006,  // ..***.........**.
-     0x00007006,  // ..***.........**.
-     0x00007806,  // ..****........**.
-     0x00007C06,  // ..*****.......**.
-     0x00006C06,  // ..**.**.......**.
-     0x00006E06,  // ..**.***......**.
-     0x00006706,  // ..**..***.....**.
-     0x00006386,  // ..**...***....**.
-     0x00006386,  // ..**...***....**.
-     0x000061C6,  // ..**....***...**.
-     0x000060E6,  // ..**.....***..**.
-     0x00006066,  // ..**......**..**.
-     0x00006076,  // ..**......***.**.
-     0x0000603E,  // ..**.......*****.
-     0x0000601E,  // ..**........****.
-     0x0000601E,  // ..**........****.
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 206
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000FFC,  // ...**********..
-     0x00000FFC,  // ...**********..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003FFE,  // .*************.
-     0x00003FFE,  // .*************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 207
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000783C,  // ...****.....****..
-     0x0000601C,  // ...**........***..
-     0x0000C00E,  // ..**..........***.
-     0x0000C006,  // ..**...........**.
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x00018003,  // .**.............**
-     0x00018003,  // .**.............**
-     0x00018007,  // .**............***
-     0x00018007,  // .**............***
-     0x0000C006,  // ..**...........**.
-     0x0000C00E,  // ..**..........***.
-     0x0000600C,  // ...**.........**..
-     0x0000783C,  // ...****.....****..
-     0x00001FF0,  // .....*********....
-     0x00000FE0,  // ......*******.....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 208
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FFE,  // ..**************.
-     0x00007FFE,  // ..**************.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00006006,  // ..**..........**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 209
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003FF0,  // ..**********....
-     0x00003FFC,  // ..************..
-     0x0000301E,  // ..**.......****.
-     0x0000300E,  // ..**........***.
-     0x00003006,  // ..**.........**.
-     0x00003006,  // ..**.........**.
-     0x0000300E,  // ..**........***.
-     0x0000301C,  // ..**.......***..
-     0x00003FFC,  // ..************..
-     0x00003FF0,  // ..**********....
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00003000,  // ..**............
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 210
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001C00,  // ..***..........
-     0x00000E00,  // ...***.........
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x000000E0,  // .......***.....
-     0x000001C0,  // ......***......
-     0x00000380,  // .....***.......
-     0x00000700,  // ....***........
-     0x00000600,  // ....**.........
-     0x00000C00,  // ...**..........
-     0x00001C00,  // ..***..........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 213
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007006,  // .***.........**.
-     0x0000700E,  // .***........***.
-     0x0000380C,  // ..***.......**..
-     0x00001818,  // ...**......**...
-     0x00001C38,  // ...***....***...
-     0x00000E30,  // ....***...**....
-     0x00000660,  // .....**..**.....
-     0x000007E0,  // .....******.....
-     0x000003C0,  // ......****......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 214
-     19, 25,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000600,  // ........**.........
-     0x00000600,  // ........**.........
-     0x00003FC0,  // .....********......
-     0x0000FFF0,  // ...************....
-     0x0001C63C,  // ..***...**...****..
-     0x0001861C,  // ..**....**....***..
-     0x0003860E,  // .***....**.....***.
-     0x0003060E,  // .**.....**.....***.
-     0x00030606,  // .**.....**......**.
-     0x00030606,  // .**.....**......**.
-     0x0003060E,  // .**.....**.....***.
-     0x0003860E,  // .***....**.....***.
-     0x0001861C,  // ..**....**....***..
-     0x0001E638,  // ..****..**...***...
-     0x0000FFF0,  // ...************....
-     0x00003FC0,  // .....********......
-     0x00000600,  // ........**.........
-     0x00000600,  // ........**.........
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 215
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000700E,  // .***........***.
-     0x0000380C,  // ..***.......**..
-     0x00001818,  // ...**......**...
-     0x00001C38,  // ...***....***...
-     0x00000E70,  // ....***..***....
-     0x00000660,  // .....**..**.....
-     0x000007C0,  // .....*****......
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x000003C0,  // ......****......
-     0x000006E0,  // .....**.***.....
-     0x00000E70,  // ....***..***....
-     0x00001C30,  // ...***....**....
-     0x00001838,  // ...**.....***...
-     0x0000381C,  // ..***......***..
-     0x0000700C,  // .***........**..
-     0x0000E00E,  // ***.........***.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 216
-     20, 25,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0006060C,  // .**......**.....**..
-     0x0006060C,  // .**......**.....**..
-     0x0006060C,  // .**......**.....**..
-     0x0006060C,  // .**......**.....**..
-     0x0006060C,  // .**......**.....**..
-     0x0006060C,  // .**......**.....**..
-     0x0006060C,  // .**......**.....**..
-     0x0007061C,  // .***.....**....***..
-     0x00030618,  // ..**.....**....**...
-     0x0003C638,  // ..****...**...***...
-     0x0001FFF0,  // ...*************....
-     0x00003FC0,  // ......********......
-     0x00000600,  // .........**.........
-     0x00000600,  // .........**.........
-     0x00000600,  // .........**.........
-     0x00000600,  // .........**.........
-     0x00000600,  // .........**.........
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 217
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000F80,  // ......*****.......
-     0x00003FE0,  // ....*********.....
-     0x00007070,  // ...***.....***....
-     0x0000E038,  // ..***.......***...
-     0x0000C018,  // ..**.........**...
-     0x0001C01C,  // .***.........***..
-     0x0001800C,  // .**...........**..
-     0x0001800C,  // .**...........**..
-     0x0001800C,  // .**...........**..
-     0x0001800C,  // .**...........**..
-     0x0001800C,  // .**...........**..
-     0x0001800C,  // .**...........**..
-     0x0000C018,  // ..**.........**...
-     0x0000C018,  // ..**.........**...
-     0x00006030,  // ...**.......**....
-     0x00003060,  // ....**.....**.....
-     0x0001F8FC,  // .******...******..
-     0x0001F8FC,  // .******...******..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 218
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000001BB,  // **.***.**
-     0x000001BB,  // **.***.**
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 219
-     17, 25,
-     0x00000000,  // .................
-     0x0000C007,  // .**...........***
-     0x0000C007,  // .**...........***
-     0x00000000,  // .................
-     0x0000C007,  // .**...........***
-     0x00006006,  // ..**..........**.
-     0x0000700C,  // ..***........**..
-     0x0000381C,  // ...***......***..
-     0x00001C38,  // ....***....***...
-     0x00000E30,  // .....***...**....
-     0x00000660,  // ......**..**.....
-     0x000007C0,  // ......*****......
-     0x000003C0,  // .......****......
-     0x00000180,  // ........**.......
-     0x00000180,  // ........**.......
-     0x00000180,  // ........**.......
-     0x00000180,  // ........**.......
-     0x00000180,  // ........**.......
-     0x00000180,  // ........**.......
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 220
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000000,  // ..............
-     0x000007EC,  // ...******.**..
-     0x00000F7C,  // ..****.*****..
-     0x00000C1C,  // ..**.....***..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001C1C,  // .***.....***..
-     0x00000C3C,  // ..**....****..
-     0x000007F7,  // ...*******.***
-     0x000003E6,  // ....*****..**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 221
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000001C,  // .....***..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x000001C4,  // .***...*..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000F0,  // ..****....
-     0x000000F0,  // ..****....
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 222
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000678,  // ..**..****...
-     0x000007FC,  // ..*********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-  },
-  {             // 223
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000E,  // ...***.
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 224
-     13, 25,
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x00000666,  // ..**..**..**.
-     0x00000606,  // ..**......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000030C,  // ...**....**..
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 225
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000007EC,  // ...******.**..
-     0x00000F7C,  // ..****.*****..
-     0x00000C1C,  // ..**.....***..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001C1C,  // .***.....***..
-     0x00000C3C,  // ..**....****..
-     0x000007F7,  // ...*******.***
-     0x000003E6,  // ....*****..**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 226
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000007F8,  // ...********...
-     0x0000061C,  // ...**....***..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C38,  // ..**....***...
-     0x00000CF0,  // ..**..****....
-     0x00000C78,  // ..**...****...
-     0x00000C0C,  // ..**......**..
-     0x00000C0E,  // ..**......***.
-     0x00000C06,  // ..**.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x00000F0C,  // ..****....**..
-     0x00000FFC,  // ..**********..
-     0x00000CF0,  // ..**..****....
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-  },
-  {             // 227
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000039C,  // ..***..***..
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-  },
-  {             // 228
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x00000700,  // ..***........
-     0x00000180,  // ....**.......
-     0x000000E0,  // .....***.....
-     0x000001F0,  // ....*****....
-     0x000003FC,  // ...********..
-     0x0000060E,  // ..**.....***.
-     0x00000E06,  // .***......**.
-     0x00000C07,  // .**.......***
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C07,  // .**.......***
-     0x00000606,  // ..**......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000184,  // .**....*..
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000F0,  // ..****....
-     0x000000F0,  // ..****....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 230
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007F,  // ...*******
-     0x0000007F,  // ...*******
-     0x00000006,  // .......**.
-     0x00000008,  // ......*...
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C0,  // .***......
-     0x000000FC,  // ..******..
-     0x0000007E,  // ...******.
-     0x00000007,  // .......***
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x0000000E,  // ......***.
-     0x0000000C,  // ......**..
-  },
-  {             // 231
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-  },
-  {             // 232
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000607,  // ..**......***
-     0x00000C07,  // .**.......***
-     0x00000C07,  // .**.......***
-     0x00000C03,  // .**........**
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C07,  // .**.......***
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 233
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 234
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000061C,  // ..**....***..
-     0x00000638,  // ..**...***...
-     0x00000670,  // ..**..***....
-     0x000006E0,  // ..**.***.....
-     0x000007C0,  // ..*****......
-     0x000007C0,  // ..*****......
-     0x000007E0,  // ..******.....
-     0x00000660,  // ..**..**.....
-     0x00000630,  // ..**...**....
-     0x00000638,  // ..**...***...
-     0x0000061C,  // ..**....***..
-     0x0000060E,  // ..**.....***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 235
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000180,  // ...**.......
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000001F0,  // ...*****....
-     0x000001B8,  // ...**.***...
-     0x00000198,  // ...**..**...
-     0x00000318,  // ..**...**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000E06,  // ***......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 236
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E1C,  // ..***....***..
-     0x00000FFC,  // ..**********..
-     0x00000DEC,  // ..**.****.**..
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-  },
-  {             // 237
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x00000398,  // ..***..**...
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 238
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000180,  // ..**.......
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000180,  // ..**.......
-     0x000000F8,  // ...*****...
-     0x00000078,  // ....****...
-     0x000000C0,  // ...**......
-     0x00000180,  // ..**.......
-     0x00000380,  // .***.......
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000380,  // .***.......
-     0x000001F0,  // ..*****....
-     0x0000007E,  // ....******.
-     0x0000000F,  // .......****
-     0x00000003,  // .........**
-     0x00000007,  // ........***
-     0x0000003E,  // .....*****.
-     0x00000038,  // .....***...
-  },
-  {             // 239
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F8,  // ....******...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000E07,  // .***......***
-     0x00000C07,  // .**.......***
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C07,  // .**.......***
-     0x00000E06,  // .***......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 240
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 241
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000001FC,  // ....*******..
-     0x0000030E,  // ...**....***.
-     0x00000706,  // ..***.....**.
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000603,  // ..**.......**
-     0x00000706,  // ..***.....**.
-     0x0000070E,  // ..***....***.
-     0x000007FC,  // ..*********..
-     0x000006F8,  // ..**.*****...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-  },
-  {             // 242
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000001F,  // ......*****
-     0x0000007F,  // ....*******
-     0x000000E0,  // ...***.....
-     0x00000180,  // ..**.......
-     0x00000180,  // ..**.......
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000380,  // .***.......
-     0x000001E0,  // ..****.....
-     0x000000FC,  // ...******..
-     0x0000003F,  // .....******
-     0x00000007,  // ........***
-     0x00000003,  // .........**
-     0x00000007,  // ........***
-     0x0000003E,  // .....*****.
-     0x00000038,  // .....***...
-  },
-  {             // 243
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000007FF,  // ....***********
-     0x00000FFF,  // ...************
-     0x00001838,  // ..**.....***...
-     0x0000181C,  // ..**......***..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000300C,  // .**........**..
-     0x0000301C,  // .**.......***..
-     0x00003818,  // .***......**...
-     0x00001C38,  // ..***....***...
-     0x00000FF0,  // ...********....
-     0x000007E0,  // ....******.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 244
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FF,  // .********
-     0x000000FF,  // .********
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 245
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 246
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000678,  // ....**..****...
-     0x00000EFC,  // ...***.******..
-     0x000018C6,  // ..**...**...**.
-     0x000030C7,  // .**....**...***
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000030C3,  // .**....**....**
-     0x000030C7,  // .**....**...***
-     0x000038C6,  // .***...**...**.
-     0x000018CE,  // ..**...**..***.
-     0x00001EDC,  // ..****.**.***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-  },
-  {             // 247
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0E,  // .**......***.
-     0x00000E0C,  // .***.....**..
-     0x0000061C,  // ..**....***..
-     0x00000718,  // ..***...**...
-     0x00000330,  // ...**..**....
-     0x000003B0,  // ...***.**....
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x000000E0,  // .....***.....
-     0x000001E0,  // ....****.....
-     0x000001F0,  // ....*****....
-     0x00000330,  // ...**..**....
-     0x00000318,  // ...**...**...
-     0x00000618,  // ..**....**...
-     0x0000060C,  // ..**.....**..
-     0x00000C0C,  // .**......**..
-     0x00001C06,  // ***.......**.
-  },
-  {             // 248
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000C306,  // .**....**.....**.
-     0x0000C306,  // .**....**.....**.
-     0x0000C306,  // .**....**.....**.
-     0x0000C30E,  // .**....**....***.
-     0x0000E30E,  // .***...**....***.
-     0x0000631C,  // ..**...**...***..
-     0x00007FFC,  // ..*************..
-     0x00001FF0,  // ....*********....
-     0x00000300,  // .......**........
-     0x00000300,  // .......**........
-     0x00000300,  // .......**........
-     0x00000300,  // .......**........
-     0x00000000,  // .................
-  },
-  {             // 249
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00006006,  // ...**..........**.
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x0001C383,  // .***....***.....**
-     0x0000C3C6,  // ..**....****...**.
-     0x0000FE7E,  // ..*******..******.
-     0x00003C3C,  // ....****....****..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 250
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CF,  // .**..****
-     0x000000CF,  // .**..****
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 251
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000070C,  // ..***....**..
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 252
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000001F8,  // ....******...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000E07,  // .***......***
-     0x00000C07,  // .**.......***
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C07,  // .**.......***
-     0x00000E06,  // .***......**.
-     0x0000070E,  // ..***....***.
-     0x000003FC,  // ...********..
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000070C,  // ..***....**..
-     0x000003FC,  // ...********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 254
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000000E0,  // ..........***.....
-     0x000001C0,  // .........***......
-     0x00000180,  // .........**.......
-     0x00000000,  // ..................
-     0x0000600C,  // ...**.........**..
-     0x0000C006,  // ..**...........**.
-     0x0000C006,  // ..**...........**.
-     0x0001C187,  // .***.....**....***
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x00018183,  // .**......**.....**
-     0x0001C387,  // .***....***....***
-     0x0000C3C6,  // ..**....****...**.
-     0x0000FE7E,  // ..*******..******.
-     0x00003C38,  // ....****....***...
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 255
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  };
diff --git a/fontosd-iso8859-9.c b/fontosd-iso8859-9.c
deleted file mode 100644
index 335bd1cb3..000000000
--- a/fontosd-iso8859-9.c
+++ /dev/null
@@ -1,6722 +0,0 @@
-static const cFont::tPixelData FontOsd_iso8859_9[][29] = {
-  {             // 32
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 33
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000022,  // ..*...*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000008C,  // .....*...**..
-     0x0000018C,  // ....**...**..
-     0x0000018C,  // ....**...**..
-     0x00000188,  // ....**...*...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000118,  // ....*...**...
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x00000310,  // ...**...*....
-     0x00001FFE,  // ************.
-     0x00001FFE,  // ************.
-     0x00000230,  // ...*...**....
-     0x00000630,  // ..**...**....
-     0x00000620,  // ..**...*.....
-     0x00000620,  // ..**...*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 36
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000007F8,  // ..********...
-     0x0000065C,  // ..**..*.***..
-     0x00000CCC,  // .**..**..**..
-     0x00000CCC,  // .**..**..**..
-     0x00000CC0,  // .**..**......
-     0x00000CC0,  // .**..**......
-     0x000007C0,  // ..*****......
-     0x000003F0,  // ...******....
-     0x000001FC,  // ....*******..
-     0x000000CE,  // .....**..***.
-     0x000000C6,  // .....**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CCE,  // .**..**..***.
-     0x00000E9C,  // .***.*..***..
-     0x000007F8,  // ..********...
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 37
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0001C020,  // ...***........*.....
-     0x0007F060,  // .*******.....**.....
-     0x000E38C0,  // ***...***...**......
-     0x000C1880,  // **.....**...*.......
-     0x000C1980,  // **.....**..**.......
-     0x000E3900,  // ***...***..*........
-     0x0007F300,  // .*******..**........
-     0x0003E200,  // ..*****...*.........
-     0x0000063C,  // .........**...****..
-     0x00000C7E,  // ........**...******.
-     0x00000CE6,  // ........**..***..**.
-     0x000018C3,  // .......**...**....**
-     0x000010C3,  // .......*....**....**
-     0x000030C3,  // ......**....**....**
-     0x0000607E,  // .....**......******.
-     0x0000603C,  // .....**.......****..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 38
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003C0,  // .....****......
-     0x000007E0,  // ....******.....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x00000C30,  // ...**....**....
-     0x000006E0,  // ....**.***.....
-     0x000007C0,  // ....*****......
-     0x00000780,  // ....****.......
-     0x00000FCC,  // ...******..**..
-     0x000018CC,  // ..**...**..**..
-     0x0000306C,  // .**.....**.**..
-     0x00003038,  // .**......***...
-     0x00003038,  // .**......***...
-     0x0000383C,  // .***.....****..
-     0x00001FEE,  // ..********.***.
-     0x00000F80,  // ...*****.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 39
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 40
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000006,  // .....**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000008,  // ....*...
-     0x0000000C,  // ....**..
-     0x00000004,  // .....*..
-     0x00000004,  // .....*..
-  },
-  {             // 41
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000040,  // .*......
-     0x00000020,  // ..*.....
-     0x00000030,  // ..**....
-     0x00000010,  // ...*....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000010,  // ...*....
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000040,  // .*......
-  },
-  {             // 42
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x000000D6,  // .**.*.**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x00000044,  // ..*...*..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 43
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 44
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 45
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 46
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 47
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000004,  // ....*..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000010,  // ..*....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000020,  // .*.....
-     0x00000060,  // **.....
-     0x00000060,  // **.....
-     0x00000040,  // *......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 48
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 49
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001E0,  // ....****.....
-     0x000007E0,  // ..******.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 50
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x0000001C,  // ........***..
-     0x00000078,  // ......****...
-     0x000001E0,  // ....****.....
-     0x00000380,  // ...***.......
-     0x00000700,  // ..***........
-     0x00000600,  // ..**.........
-     0x00000C00,  // .**..........
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 51
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003F0,  // ...******....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x000000F0,  // .....****....
-     0x000000FC,  // .....******..
-     0x0000000C,  // .........**..
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 52
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000018,  // ........**...
-     0x00000038,  // .......***...
-     0x00000078,  // ......****...
-     0x00000078,  // ......****...
-     0x000000D8,  // .....**.**...
-     0x00000198,  // ....**..**...
-     0x00000318,  // ...**...**...
-     0x00000218,  // ...*....**...
-     0x00000618,  // ..**....**...
-     0x00000C18,  // .**.....**...
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000018,  // ........**...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 53
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007F0,  // ..*******....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0E,  // .**......***.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0C,  // .***.....**..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 54
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000070C,  // ..***....**..
-     0x0000060E,  // ..**.....***.
-     0x00000E00,  // .***.........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 55
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000004,  // ..........*..
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000380,  // ...***.......
-     0x00000300,  // ...**........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 56
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003F0,  // ...******....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 57
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E1E,  // .***....****.
-     0x000007FE,  // ..**********.
-     0x000001F6,  // ....*****.**.
-     0x00000006,  // ..........**.
-     0x0000000E,  // .........***.
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 58
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000002,  // ...........*.
-     0x0000000E,  // .........***.
-     0x0000003C,  // .......****..
-     0x000001E0,  // ....****.....
-     0x00000780,  // ..****.......
-     0x00000E00,  // .***.........
-     0x00000F00,  // .****........
-     0x000001E0,  // ....****.....
-     0x00000078,  // ......****...
-     0x0000000E,  // .........***.
-     0x00000002,  // ...........*.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 61
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 62
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000800,  // .*...........
-     0x00000E00,  // .***.........
-     0x000003C0,  // ...****......
-     0x000000F0,  // .....****....
-     0x0000003E,  // .......*****.
-     0x00000006,  // ..........**.
-     0x0000001E,  // ........****.
-     0x00000078,  // ......****...
-     0x000003C0,  // ...****......
-     0x00000F00,  // .****........
-     0x00000800,  // .*...........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 63
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x0000070E,  // ..***....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x00000006,  // ..........**.
-     0x0000000C,  // .........**..
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 64
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00003F00,  // .........******........
-     0x0001FFE0,  // ......************.....
-     0x0003C0F0,  // .....****......****....
-     0x00070038,  // ....***..........***...
-     0x000E001C,  // ...***............***..
-     0x001C1E8C,  // ..***.....****.*...**..
-     0x00187FCE,  // ..**....*********..***.
-     0x0018E1C6,  // ..**...***....***...**.
-     0x0030C186,  // .**....**.....**....**.
-     0x00318186,  // .**...**......**....**.
-     0x00318186,  // .**...**......**....**.
-     0x0031830C,  // .**...**.....**....**..
-     0x0031830C,  // .**...**.....**....**..
-     0x0039C718,  // .***..***...***...**...
-     0x0018FFF0,  // ..**...************....
-     0x001C71E0,  // ..***...***...****.....
-     0x000E0000,  // ...***.................
-     0x00078000,  // ....****...............
-     0x0003FF80,  // .....***********.......
-     0x00007F00,  // ........*******........
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 65
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 66
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000181C,  // ..**......***..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FF8,  // ..**********...
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00001FFC,  // ..***********..
-     0x00001FF8,  // ..**********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 67
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x00003818,  // ...***......**...
-     0x00003FF8,  // ...***********...
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 68
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FC0,  // ..*********......
-     0x00007FF0,  // ..***********....
-     0x00006070,  // ..**......***....
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00006018,  // ..**........**...
-     0x00006070,  // ..**......***....
-     0x00007FF0,  // ..***********....
-     0x00007FC0,  // ..*********......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 69
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 70
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000FFE,  // ..***********.
-     0x00000FFE,  // ..***********.
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000FFC,  // ..**********..
-     0x00000FFC,  // ..**********..
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000C00,  // ..**..........
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 71
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E018,  // ..***........**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x000181FC,  // .**......*******..
-     0x000181FC,  // .**......*******..
-     0x0001800C,  // .**...........**..
-     0x0001C00C,  // .***..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x0000703C,  // ...***......****..
-     0x00003FEC,  // ....*********.**..
-     0x00000FC4,  // ......******...*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 72
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00007FFC,  // ..*************..
-     0x00007FFC,  // ..*************..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 73
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x0000000C,  // ........**..
-     0x00000C0C,  // **......**..
-     0x00000C0C,  // **......**..
-     0x00000E1C,  // ***....***..
-     0x000007F8,  // .********...
-     0x000003F0,  // ..******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 75
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001807,  // ..**........***
-     0x0000180E,  // ..**.......***.
-     0x0000181C,  // ..**......***..
-     0x00001838,  // ..**.....***...
-     0x00001870,  // ..**....***....
-     0x000018E0,  // ..**...***.....
-     0x000019C0,  // ..**..***......
-     0x00001BC0,  // ..**.****......
-     0x00001FC0,  // ..*******......
-     0x00001EE0,  // ..****.***.....
-     0x00001C70,  // ..***...***....
-     0x00001830,  // ..**.....**....
-     0x00001818,  // ..**......**...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001807,  // ..**........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 76
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 77
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001C01C,  // ..***.........***..
-     0x0001C01C,  // ..***.........***..
-     0x0001E01C,  // ..****........***..
-     0x0001E03C,  // ..****.......****..
-     0x0001E03C,  // ..****.......****..
-     0x0001B02C,  // ..**.**......*.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001B06C,  // ..**.**.....**.**..
-     0x0001984C,  // ..**..**....*..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x000198CC,  // ..**..**...**..**..
-     0x00018C8C,  // ..**...**..*...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x00018D8C,  // ..**...**.**...**..
-     0x0001878C,  // ..**....****...**..
-     0x0001870C,  // ..**....***....**..
-     0x0001870C,  // ..**....***....**..
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 78
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 79
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 80
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001FFC,  // ..***********..
-     0x00001FF0,  // ..*********....
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 81
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C04C,  // ..**.......*..**..
-     0x0000E0FC,  // ..***.....******..
-     0x00007078,  // ...***.....****...
-     0x00003FF8,  // ....***********...
-     0x00000FCE,  // ......******..***.
-     0x00000004,  // ...............*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 82
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007FE0,  // ..**********.....
-     0x00007FF8,  // ..************...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00006018,  // ..**........**...
-     0x00007FF0,  // ..***********....
-     0x00007FF8,  // ..************...
-     0x00006018,  // ..**........**...
-     0x0000601C,  // ..**........***..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600E,  // ..**.........***.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 83
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 84
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 85
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 86
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x0000180E,  // ..**.......***.
-     0x00001C0C,  // ..***......**..
-     0x00000C0C,  // ...**......**..
-     0x00000C1C,  // ...**.....***..
-     0x00000E18,  // ...***....**...
-     0x00000618,  // ....**....**...
-     0x00000638,  // ....**...***...
-     0x00000730,  // ....***..**....
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 87
-     22, 27,
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00180C06,  // .**.......**.......**.
-     0x00181C06,  // .**......***.......**.
-     0x00181E0E,  // .**......****.....***.
-     0x001C1E0E,  // .***.....****.....***.
-     0x000C1E0C,  // ..**.....****.....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000C330C,  // ..**....**..**....**..
-     0x000E331C,  // ..***...**..**...***..
-     0x00066318,  // ...**..**...**...**...
-     0x00066198,  // ...**..**....**..**...
-     0x00066198,  // ...**..**....**..**...
-     0x000761B8,  // ...***.**....**.***...
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0F0,  // ....****......****....
-     0x0003C0E0,  // ....****......***.....
-     0x00018060,  // .....**........**.....
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-     0x00000000,  // ......................
-  },
-  {             // 88
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003806,  // .***........**.
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000638,  // ....**...***...
-     0x00000330,  // .....**..**....
-     0x000003E0,  // .....*****.....
-     0x000001E0,  // ......****.....
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000730,  // ....***..**....
-     0x00000E38,  // ...***...***...
-     0x00000C1C,  // ...**.....***..
-     0x00001C0C,  // ..***......**..
-     0x0000380E,  // .***.......***.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 89
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003007,  // .**.........***
-     0x00003807,  // .***........***
-     0x0000180E,  // ..**.......***.
-     0x00000C0C,  // ...**......**..
-     0x00000E1C,  // ...***....***..
-     0x00000618,  // ....**....**...
-     0x00000730,  // ....***..**....
-     0x000003B0,  // .....***.**....
-     0x000001E0,  // ......****.....
-     0x000001E0,  // ......****.....
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 90
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x0000000E,  // ..........***.
-     0x0000000C,  // ..........**..
-     0x0000001C,  // .........***..
-     0x00000038,  // ........***...
-     0x00000070,  // .......***....
-     0x000000E0,  // ......***.....
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000E00,  // ..***.........
-     0x00001C00,  // .***..........
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 91
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-  },
-  {             // 92
-     7, 27,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000040,  // *......
-     0x00000060,  // **.....
-     0x00000020,  // .*.....
-     0x00000020,  // .*.....
-     0x00000030,  // .**....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000010,  // ..*....
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000004,  // ....*..
-     0x00000006,  // ....**.
-     0x00000002,  // .....*.
-     0x00000002,  // .....*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 93
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-  },
-  {             // 94
-     11, 27,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D0,  // ...**.*....
-     0x000000D8,  // ...**.**...
-     0x00000088,  // ...*...*...
-     0x0000018C,  // ..**...**..
-     0x0000010C,  // ..*....**..
-     0x00000304,  // .**.....*..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 95
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00003FFF,  // **************
-     0x00003FFF,  // **************
-     0x00000000,  // ..............
-  },
-  {             // 96
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 97
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 98
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 99
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 100
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 101
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 102
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x000003E0,  // ...*****.....
-  },
-  {             // 104
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000006F8,  // ..**.*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 105
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 106
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000007E0,  // .******.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000638,  // .**...***...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 108
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 109
-     19, 27,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001BE7C,  // ..**.*****..*****..
-     0x0001FFFE,  // ..****************.
-     0x0001C386,  // ..***....***....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00018306,  // ..**.....**.....**.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 110
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 111
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 112
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000DF0,  // .**.*****....
-     0x00000FFC,  // .**********..
-     0x00000F1C,  // .****...***..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x00000F1C,  // .****...***..
-     0x00000FFC,  // .**********..
-     0x00000CF0,  // .**..****....
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 113
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000007FC,  // ..*********..
-     0x000003EC,  // ...*****.**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-     0x0000000C,  // .........**..
-  },
-  {             // 114
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000003E,  // ..*****.
-     0x00000038,  // ..***...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 115
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 116
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x0000000F,  // ..****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 118
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E06,  // ***......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000070C,  // .***....**..
-     0x0000031C,  // ..**...***..
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 119
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018306,  // **.....**.....**.
-     0x0000C386,  // .**....***....**.
-     0x0000C78E,  // .**...****...***.
-     0x0000C78C,  // .**...****...**..
-     0x0000C6CC,  // .**...**.**..**..
-     0x000064CC,  // ..**..*..**..**..
-     0x00006CD8,  // ..**.**..**.**...
-     0x00006CD8,  // ..**.**..**.**...
-     0x00002C78,  // ...*.**...****...
-     0x00003878,  // ...***....****...
-     0x00003870,  // ...***....***....
-     0x00003870,  // ...***....***....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 120
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000001F0,  // ...*****....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x0000070C,  // .***....**..
-     0x0000060E,  // .**.....***.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 121
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  {             // 122
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000018,  // .......**...
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 123
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000038,  // ..***...
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-  },
-  {             // 124
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 125
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000060,  // .**.....
-     0x00000070,  // .***....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000018,  // ...**...
-     0x0000001C,  // ...***..
-     0x0000000C,  // ....**..
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000030,  // ..**....
-     0x00000070,  // .***....
-     0x00000060,  // .**.....
-  },
-  {             // 126
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000007C6,  // ..*****...**.
-     0x0000047E,  // ..*...******.
-     0x0000001C,  // ........***..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 127
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     0, 27,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 161
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-  },
-  {             // 162
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000072C,  // ..***..*.**..
-     0x00000E26,  // .***...*..**.
-     0x00000C20,  // .**....*.....
-     0x00000C20,  // .**....*.....
-     0x00000C40,  // .**...*......
-     0x00000C40,  // .**...*......
-     0x00000C46,  // .**...*...**.
-     0x0000064E,  // ..**..*..***.
-     0x0000075C,  // ..***.*.***..
-     0x000003F8,  // ...*******...
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 163
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x00000700,  // ..***........
-     0x00000FE0,  // .*******.....
-     0x00000FA0,  // .*****.*.....
-     0x00000380,  // ...***.......
-     0x00000180,  // ....**.......
-     0x00000180,  // ....**.......
-     0x00000300,  // ...**........
-     0x00000600,  // ..**.........
-     0x00000FFE,  // .***********.
-     0x00000FFC,  // .**********..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 164
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x000007EC,  // ..******.**..
-     0x000007FC,  // ..*********..
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x000003F8,  // ...*******...
-     0x000007EC,  // ..******.**..
-     0x00000204,  // ...*......*..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 165
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000618,  // ..**....**...
-     0x00000310,  // ...**...*....
-     0x00000130,  // ....*..**....
-     0x000001E0,  // ....****.....
-     0x00000EFC,  // .***.******..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x00000FFC,  // .**********..
-     0x00000FFC,  // .**********..
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 166
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 167
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F0,  // .....****....
-     0x000003F8,  // ...*******...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000700,  // ..***........
-     0x000003C0,  // ...****......
-     0x000006F0,  // ..**.****....
-     0x00000C78,  // .**...****...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000E06,  // .***......**.
-     0x00000706,  // ..***.....**.
-     0x000003CC,  // ...****..**..
-     0x000000F8,  // .....*****...
-     0x00000070,  // ......***....
-     0x00000038,  // .......***...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000718,  // ..***...**...
-     0x000003F0,  // ...******....
-     0x000001E0,  // ....****.....
-  },
-  {             // 168
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 169
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000E38C,  // ..***...***...**..
-     0x0001C7C6,  // .***...*****...**.
-     0x00018C66,  // .**...**...**..**.
-     0x00031823,  // **...**.....*...**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031803,  // **...**.........**
-     0x00031833,  // **...**.....**..**
-     0x00018C63,  // .**...**...**...**
-     0x00018FE6,  // .**...*******..**.
-     0x0000C3CE,  // ..**....****..***.
-     0x0000703C,  // ...***......****..
-     0x00003FF8,  // ....***********...
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 170
-     9, 27,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x0000000C,  // .....**..
-     0x0000003C,  // ...****..
-     0x000000CC,  // .**..**..
-     0x000000CC,  // .**..**..
-     0x000000FE,  // .*******.
-     0x00000076,  // ..***.**.
-     0x000000FC,  // .******..
-     0x000000FC,  // .******..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 171
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000088,  // .....*...*...
-     0x00000188,  // ....**...*...
-     0x00000338,  // ...**..***...
-     0x00000620,  // ..**...*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000088,  // .....*...*...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 172
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFF,  // .************
-     0x00000FFF,  // .************
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000003,  // ...........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 173
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007C,  // .*****..
-     0x0000007C,  // .*****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 174
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x0000783C,  // ...****.....****..
-     0x0000FFCC,  // ..**********..**..
-     0x0001DFE6,  // .***.********..**.
-     0x00019836,  // .**..**.....**.**.
-     0x00031833,  // **...**.....**..**
-     0x00031833,  // **...**.....**..**
-     0x00031FE3,  // **...********...**
-     0x00031FF3,  // **...*********..**
-     0x00031833,  // **...**.....**..**
-     0x00019837,  // .**..**.....**.***
-     0x00019836,  // .**..**.....**.**.
-     0x0000F83E,  // ..*****.....*****.
-     0x0000703C,  // ...***......****..
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 175
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 176
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000003F0,  // ....******....
-     0x000001E0,  // .....****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 177
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 178
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007F,  // .*******
-     0x00000043,  // .*....**
-     0x00000003,  // ......**
-     0x00000006,  // .....**.
-     0x00000018,  // ...**...
-     0x00000070,  // .***....
-     0x00000040,  // .*......
-     0x0000007F,  // .*******
-     0x0000003F,  // ..******
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 179
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007E,  // .******.
-     0x00000046,  // .*...**.
-     0x00000006,  // .....**.
-     0x0000001C,  // ...***..
-     0x00000006,  // .....**.
-     0x00000003,  // ......**
-     0x000000C3,  // **....**
-     0x0000007E,  // .******.
-     0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 180
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000E,  // ....***.
-     0x0000001C,  // ...***..
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 181
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x00000FEF,  // .*******.****
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-  },
-  {             // 182
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000FF,  // ....********
-     0x000001FF,  // ...*********
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000007F6,  // .*******.**.
-     0x000003F6,  // ..******.**.
-     0x000003F6,  // ..******.**.
-     0x000000F6,  // ....****.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000036,  // ......**.**.
-     0x00000000,  // ............
-  },
-  {             // 183
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x0000001C,  // ...***..
-     0x0000001E,  // ...****.
-     0x0000007E,  // .******.
-     0x0000001C,  // ...***..
-  },
-  {             // 185
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000008,  // ....*...
-     0x00000038,  // ..***...
-     0x00000078,  // .****...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 186
-     8, 27,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000003E,  // ..*****.
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x00000063,  // .**...**
-     0x0000003E,  // ..*****.
-     0x0000001C,  // ...***..
-     0x0000007E,  // .******.
-     0x0000007E,  // .******.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 187
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000420,  // ..*....*.....
-     0x00000630,  // ..**...**....
-     0x00000398,  // ...***..**...
-     0x00000188,  // ....**...*...
-     0x00000198,  // ....**..**...
-     0x00000730,  // ..***..**....
-     0x00000620,  // ..**...*.....
-     0x00000420,  // ..*....*.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 188
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00018030,  // ...**.........**....
-     0x00038020,  // ..***.........*.....
-     0x00078040,  // .****........*......
-     0x000180C0,  // ...**.......**......
-     0x00018180,  // ...**......**.......
-     0x00018100,  // ...**......*........
-     0x0001830C,  // ...**.....**....**..
-     0x0001860C,  // ...**....**.....**..
-     0x0001861C,  // ...**....**....***..
-     0x00000C3C,  // ........**....****..
-     0x0000186C,  // .......**....**.**..
-     0x0000384C,  // ......***....*..**..
-     0x000030FF,  // ......**....********
-     0x000060FF,  // .....**.....********
-     0x0000E00C,  // ....***.........**..
-     0x0000C004,  // ....**...........*..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 189
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00018020,  // ...**.........*.....
-     0x00038040,  // ..***........*......
-     0x000780C0,  // .****.......**......
-     0x00018080,  // ...**.......*.......
-     0x00018180,  // ...**......**.......
-     0x00018300,  // ...**.....**........
-     0x0001863C,  // ...**....**...****..
-     0x0001867E,  // ...**....**..******.
-     0x00018C43,  // ...**...**...*....**
-     0x00001843,  // .......**....*....**
-     0x00001806,  // .......**........**.
-     0x0000300C,  // ......**........**..
-     0x00006030,  // .....**.......**....
-     0x00006040,  // .....**......*......
-     0x0000C0FF,  // ....**......********
-     0x0001803F,  // ...**.........******
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 190
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0003C010,  // ..****.........*....
-     0x0007E030,  // .******.......**....
-     0x00046060,  // .*...**......**.....
-     0x00006040,  // .....**......*......
-     0x0001C0C0,  // ...***......**......
-     0x00006180,  // .....**....**.......
-     0x0000310C,  // ......**...*....**..
-     0x000C320C,  // **....**..*.....**..
-     0x0007E61C,  // .******..**....***..
-     0x0003C43C,  // ..****...*....****..
-     0x0000086C,  // ........*....**.**..
-     0x0000184C,  // .......**....*..**..
-     0x000010FF,  // .......*....********
-     0x000020FF,  // ......*.....********
-     0x0000400C,  // .....*..........**..
-     0x00004004,  // .....*...........*..
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 191
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000001C0,  // .....***......
-     0x00000380,  // ....***.......
-     0x00000700,  // ...***........
-     0x00000600,  // ...**.........
-     0x00000C00,  // ..**..........
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000E1C,  // ..***....***..
-     0x000007F8,  // ...********...
-     0x000003E0,  // ....*****.....
-  },
-  {             // 192
-     15, 27,
-     0x00000700,  // ....***........
-     0x00000380,  // .....***.......
-     0x00000080,  // .......*.......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 193
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 194
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000360,  // .....**.**.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 195
-     15, 27,
-     0x00000000,  // ...............
-     0x00000390,  // .....***..*....
-     0x000007F0,  // ....*******....
-     0x00000020,  // .........*.....
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 196
-     15, 27,
-     0x00000000,  // ...............
-     0x00000370,  // .....**.***....
-     0x00000370,  // .....**.***....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 197
-     15, 27,
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x00000120,  // ......*..*.....
-     0x000001C0,  // ......***......
-     0x000000C0,  // .......**......
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000003E0,  // .....*****.....
-     0x00000360,  // .....**.**.....
-     0x00000370,  // .....**.***....
-     0x00000730,  // ....***..**....
-     0x00000630,  // ....**...**....
-     0x00000638,  // ....**...***...
-     0x00000E18,  // ...***....**...
-     0x00000C18,  // ...**.....**...
-     0x00000FFC,  // ...**********..
-     0x00001FFC,  // ..***********..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003806,  // .***........**.
-     0x00003006,  // .**.........**.
-     0x00003007,  // .**.........***
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 198
-     23, 27,
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x0000FFFC,  // .......**************..
-     0x0000FFFC,  // .......**************..
-     0x00018C00,  // ......**...**..........
-     0x00018C00,  // ......**...**..........
-     0x00030C00,  // .....**....**..........
-     0x00030C00,  // .....**....**..........
-     0x00070C00,  // ....***....**..........
-     0x00060FFC,  // ....**.....**********..
-     0x00060FFC,  // ....**.....**********..
-     0x000C0C00,  // ...**......**..........
-     0x000FFC00,  // ...**********..........
-     0x001FFC00,  // ..***********..........
-     0x00180C00,  // ..**.......**..........
-     0x00180C00,  // ..**.......**..........
-     0x00380C00,  // .***.......**..........
-     0x00300FFE,  // .**........***********.
-     0x00700FFE,  // ***........***********.
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-     0x00000000,  // .......................
-  },
-  {             // 199
-     17, 27,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF0,  // ....*********....
-     0x00003838,  // ...***.....***...
-     0x0000701C,  // ..***.......***..
-     0x0000600C,  // ..**.........**..
-     0x00006000,  // ..**.............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C000,  // .**..............
-     0x0000C00C,  // .**..........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003018,  // ...**.......**...
-     0x00003C78,  // ...****...****...
-     0x00000FF0,  // .....********....
-     0x00000100,  // ........*........
-     0x00000380,  // .......***.......
-     0x000001C0,  // ........***......
-     0x000007C0,  // ......*****......
-     0x00000380,  // .......***.......
-  },
-  {             // 200
-     15, 27,
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x000000C0,  // .......**......
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     15, 27,
-     0x00000070,  // ........***....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 202
-     15, 27,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000320,  // .....**..*.....
-     0x00000230,  // .....*...**....
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     15, 27,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFC,  // ..***********..
-     0x00001FFC,  // ..***********..
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001800,  // ..**...........
-     0x00001FFE,  // ..************.
-     0x00001FFE,  // ..************.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 204
-     6, 27,
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 27,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     7, 27,
-     0x00000018,  // ..**...
-     0x0000003C,  // .****..
-     0x00000026,  // .*..**.
-     0x00000062,  // **...*.
-     0x00000000,  // .......
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 207
-     6, 27,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     18, 27,
-     0x00000000,  // ..................
-     0x00003870,  // ....***....***....
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007038,  // ...***......***...
-     0x0000E018,  // ..***........**...
-     0x0000C00C,  // ..**..........**..
-     0x0001C000,  // .***..............
-     0x00018000,  // .**...............
-     0x00018000,  // .**...............
-     0x000181FC,  // .**......*******..
-     0x000181FC,  // .**......*******..
-     0x0001800C,  // .**...........**..
-     0x0001C00C,  // .***..........**..
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x0000703C,  // ...***......****..
-     0x00003FEC,  // ....*********.**..
-     0x00000FC4,  // ......******...*..
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 209
-     17, 27,
-     0x00000000,  // .................
-     0x00000760,  // ......***.**.....
-     0x00000FE0,  // .....*******.....
-     0x000000C0,  // .........**......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000700C,  // ..***........**..
-     0x0000780C,  // ..****.......**..
-     0x0000780C,  // ..****.......**..
-     0x00006C0C,  // ..**.**......**..
-     0x00006E0C,  // ..**.***.....**..
-     0x0000660C,  // ..**..**.....**..
-     0x0000630C,  // ..**...**....**..
-     0x0000638C,  // ..**...***...**..
-     0x0000618C,  // ..**....**...**..
-     0x000061CC,  // ..**....***..**..
-     0x000060CC,  // ..**.....**..**..
-     0x0000606C,  // ..**......**.**..
-     0x0000607C,  // ..**......*****..
-     0x0000603C,  // ..**.......****..
-     0x0000601C,  // ..**........***..
-     0x0000601C,  // ..**........***..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 210
-     18, 27,
-     0x00000C00,  // ......**..........
-     0x00000600,  // .......**.........
-     0x00000300,  // ........**........
-     0x00000100,  // .........*........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 211
-     18, 27,
-     0x000000C0,  // ..........**......
-     0x00000180,  // .........**.......
-     0x00000300,  // ........**........
-     0x00000200,  // ........*.........
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 212
-     18, 27,
-     0x00000300,  // ........**........
-     0x00000780,  // .......****.......
-     0x00000480,  // .......*..*.......
-     0x00000840,  // ......*....*......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 213
-     18, 27,
-     0x00000000,  // ..................
-     0x00000E60,  // ......***..**.....
-     0x00000FC0,  // ......******......
-     0x000000C0,  // ..........**......
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 214
-     18, 27,
-     0x00000000,  // ..................
-     0x00000CC0,  // ......**..**......
-     0x00000CC0,  // ......**..**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC0,  // ......******......
-     0x00003FF0,  // ....**********....
-     0x00007078,  // ...***.....****...
-     0x0000E01C,  // ..***........***..
-     0x0000C00C,  // ..**..........**..
-     0x0001C00E,  // .***..........***.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x00018006,  // .**............**.
-     0x0000C00C,  // ..**..........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x00003FF0,  // ....**********....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 215
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000204,  // ...*......*..
-     0x0000070C,  // ..***....**..
-     0x00000398,  // ...***..**...
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x000000F0,  // .....****....
-     0x000001B8,  // ....**.***...
-     0x0000031C,  // ...**...***..
-     0x0000020C,  // ...*.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 216
-     18, 27,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FC6,  // ......******...**.
-     0x00003FF4,  // ....**********.*..
-     0x00007038,  // ...***......***...
-     0x0000E01C,  // ..***........***..
-     0x0000C02C,  // ..**........*.**..
-     0x0001C04E,  // .***.......*..***.
-     0x000180C6,  // .**.......**...**.
-     0x00018186,  // .**......**....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018606,  // .**....**......**.
-     0x00018C06,  // .**...**.......**.
-     0x00019806,  // .**..**........**.
-     0x0000F00C,  // ..****........**..
-     0x0000E01C,  // ..***........***..
-     0x00007038,  // ...***......***...
-     0x0001FFF0,  // .*************....
-     0x00011FC0,  // .*...*******......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 217
-     17, 27,
-     0x00000E00,  // .....***.........
-     0x00000600,  // ......**.........
-     0x00000300,  // .......**........
-     0x00000180,  // ........**.......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 218
-     17, 27,
-     0x000000C0,  // .........**......
-     0x00000180,  // ........**.......
-     0x00000100,  // ........*........
-     0x00000200,  // .......*.........
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 219
-     17, 27,
-     0x00000380,  // .......***.......
-     0x00000380,  // .......***.......
-     0x000006C0,  // ......**.**......
-     0x00000C40,  // .....**...*......
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 220
-     17, 27,
-     0x00000000,  // .................
-     0x00000EC0,  // .....***.**......
-     0x00000EC0,  // .....***.**......
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x0000600C,  // ..**.........**..
-     0x00003038,  // ...**......***...
-     0x00003FF0,  // ...**********....
-     0x00000FE0,  // .....*******.....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 221
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 222
-     15, 27,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00000C1C,  // ...**.....***..
-     0x0000180C,  // ..**.......**..
-     0x00001804,  // ..**........*..
-     0x00001800,  // ..**...........
-     0x00001C00,  // ..***..........
-     0x00000F80,  // ...*****.......
-     0x000007F8,  // ....********...
-     0x0000007C,  // ........*****..
-     0x0000000E,  // ...........***.
-     0x00000006,  // ............**.
-     0x00003006,  // .**.........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x00000FF8,  // ...*********...
-     0x000007F0,  // ....*******....
-     0x00000080,  // .......*.......
-     0x000001C0,  // ......***......
-     0x000001E0,  // ......****.....
-     0x000007E0,  // ....******.....
-     0x000001C0,  // ......***......
-  },
-  {             // 223
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000003F8,  // ....*******...
-     0x0000071C,  // ...***...***..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000060C,  // ...**.....**..
-     0x0000061C,  // ...**....***..
-     0x00000670,  // ...**..***....
-     0x00000678,  // ...**..****...
-     0x0000060C,  // ...**.....**..
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x00000606,  // ...**......**.
-     0x0000060C,  // ...**.....**..
-     0x0000067C,  // ...**..*****..
-     0x00000670,  // ...**..***....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 224
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 225
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 226
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 227
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 228
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 229
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x00000120,  // ....*..*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x0000040C,  // ..*......**..
-     0x0000000C,  // .........**..
-     0x000001FC,  // ....*******..
-     0x000007CC,  // ..*****..**..
-     0x00000E0C,  // .***.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFE,  // .***********.
-     0x000003EE,  // ...*****.***.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 230
-     20, 27,
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x0000F9F8,  // ....*****..******...
-     0x0003FFFC,  // ..****************..
-     0x0003070E,  // ..**.....***....***.
-     0x00020606,  // ..*......**......**.
-     0x00000E06,  // ........***......**.
-     0x0001FFFE,  // ...****************.
-     0x0003F7FE,  // ..******.**********.
-     0x00070600,  // .***.....**.........
-     0x00060606,  // .**......**......**.
-     0x00060F0E,  // .**.....****....***.
-     0x0007FBFC,  // .********.********..
-     0x0003E1F8,  // ..*****....******...
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-     0x00000000,  // ....................
-  },
-  {             // 231
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000606,  // .**......**.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000606,  // .**......**.
-     0x0000030E,  // ..**....***.
-     0x0000039C,  // ..***..***..
-     0x000001F8,  // ...******...
-     0x00000040,  // .....*......
-     0x00000070,  // .....***....
-     0x00000070,  // .....***....
-     0x000001F0,  // ...*****....
-     0x00000060,  // .....**.....
-  },
-  {             // 232
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 233
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000038,  // .......***...
-     0x00000070,  // ......***....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 234
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000000B0,  // .....*.**....
-     0x00000190,  // ....**..*....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 235
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001B8,  // ....**.***...
-     0x000001B8,  // ....**.***...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000003F8,  // ...*******...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C00,  // .**..........
-     0x00000C04,  // .**.......*..
-     0x0000060C,  // ..**.....**..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 236
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000038,  // ***...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 237
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 238
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     6, 27,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 240
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x0000071C,  // ..***...***..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x000001EC,  // ....****.**..
-     0x000007FC,  // ..*********..
-     0x0000061C,  // ..**....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x000003FC,  // ...********..
-     0x000001EC,  // ....****.**..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x000003E0,  // ...*****.....
-  },
-  {             // 241
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000004F8,  // ..*..*****...
-     0x000007FC,  // ..*********..
-     0x0000070C,  // ..***....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x0000060C,  // ..**.....**..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 242
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 243
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 244
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 245
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000180,  // ....**.......
-     0x000003F8,  // ...*******...
-     0x00000270,  // ...*..***....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 246
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003B0,  // ...***.**....
-     0x000003B0,  // ...***.**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007F8,  // ..********...
-     0x0000061C,  // ..**....***..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x0000061C,  // ..**....***..
-     0x000007F8,  // ..********...
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 247
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 248
-     14, 27,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E4,  // ....*****..*..
-     0x00000FF8,  // ..*********...
-     0x00000C18,  // ..**.....**...
-     0x0000183C,  // .**.....****..
-     0x0000184C,  // .**....*..**..
-     0x000018CC,  // .**...**..**..
-     0x0000198C,  // .**..**...**..
-     0x00001B0C,  // .**.**....**..
-     0x00001A1C,  // .**.*....***..
-     0x00000C38,  // ..**....***...
-     0x00000FF0,  // ..********....
-     0x000013E0,  // .*..*****.....
-     0x00001000,  // .*............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 249
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000380,  // ...***.......
-     0x000000C0,  // .....**......
-     0x00000040,  // ......*......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 250
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000070,  // ......***....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 251
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 252
-     13, 27,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000370,  // ...**.***....
-     0x00000130,  // ....*..**....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FFC,  // .**********..
-     0x000003E0,  // ...*****.....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 253
-     5, 27,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 254
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F8,  // ...******...
-     0x000003FC,  // ..********..
-     0x0000060C,  // .**.....**..
-     0x00000600,  // .**.........
-     0x00000700,  // .***........
-     0x000003F0,  // ..******....
-     0x000000FC,  // ....******..
-     0x0000000E,  // ........***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000001F8,  // ...******...
-     0x00000020,  // ......*.....
-     0x00000070,  // .....***....
-     0x00000078,  // .....****...
-     0x000001F8,  // ...******...
-     0x00000070,  // .....***....
-  },
-  {             // 255
-     12, 27,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001B8,  // ...**.***...
-     0x000001B8,  // ...**.***...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x0000030C,  // ..**....**..
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001B0,  // ...**.**....
-     0x000001B0,  // ...**.**....
-     0x000000F0,  // ....****....
-     0x000000E0,  // ....***.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000001C0,  // ...***......
-     0x00000780,  // .****.......
-     0x00000700,  // .***........
-  },
-  };
diff --git a/fontsml-iso8859-1.c b/fontsml-iso8859-1.c
deleted file mode 100644
index 028d1521a..000000000
--- a/fontsml-iso8859-1.c
+++ /dev/null
@@ -1,5602 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_1[][24] = {
-  {             // 32
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 33
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 35
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 36
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000010,  // .....*....
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000196,  // .**..*.**.
-     0x00000190,  // .**..*....
-     0x000001D0,  // .***.*....
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000001E,  // .....****.
-     0x00000013,  // .....*..**
-     0x00000193,  // .**..*..**
-     0x000001D7,  // .***.*.***
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000010,  // .....*....
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 37
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003C30,  // ..****....**....
-     0x00006660,  // .**..**..**.....
-     0x00006660,  // .**..**..**.....
-     0x000066C0,  // .**..**.**......
-     0x000066C0,  // .**..**.**......
-     0x00003D80,  // ..****.**.......
-     0x00000180,  // .......**.......
-     0x0000033C,  // ......**..****..
-     0x00000366,  // ......**.**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000C66,  // ....**...**..**.
-     0x00000C3C,  // ....**....****..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 38
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003C0,  // ...****......
-     0x000007E0,  // ..******.....
-     0x00000660,  // ..**..**.....
-     0x00000660,  // ..**..**.....
-     0x000003C0,  // ...****......
-     0x000007C0,  // ..*****......
-     0x00000EEC,  // .***.***.**..
-     0x00000C6C,  // .**...**.**..
-     0x00000C3C,  // .**....****..
-     0x00000C38,  // .**....***...
-     0x00000E7C,  // .***..*****..
-     0x000007EE,  // ..******.***.
-     0x000003C7,  // ...****...***
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 39
-     3, 22,
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-  },
-  {             // 40
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-  },
-  {             // 41
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000010,  // .*....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000010,  // .*....
-  },
-  {             // 42
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000008,  // ...*...
-     0x0000002A,  // .*.*.*.
-     0x0000003E,  // .*****.
-     0x00000008,  // ...*...
-     0x0000003E,  // .*****.
-     0x0000002A,  // .*.*.*.
-     0x00000008,  // ...*...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 43
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 44
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 45
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****. added by hand to avoid flickering!!!
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 46
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 48
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 49
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x000000F8,  // ..*****...
-     0x000000F8,  // ..*****...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 50
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000006,  // .......**.
-     0x0000000E,  // ......***.
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 51
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000000C,  // ......**..
-     0x00000038,  // ....***...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 52
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000001C,  // .....***..
-     0x0000003C,  // ....****..
-     0x0000006C,  // ...**.**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000018C,  // .**...**..
-     0x0000030C,  // **....**..
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 53
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001F8,  // .******...
-     0x000001FC,  // .*******..
-     0x0000018E,  // .**...***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 54
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 55
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 56
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 57
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 58
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 59
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 60
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x0000001E,  // .....****.
-     0x00000078,  // ...****...
-     0x000000E0,  // ..***.....
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000001E,  // .....****.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 61
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 62
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 63
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000381C,  // ....***......***..
-     0x0000600C,  // ...**.........**..
-     0x0000C7A6,  // ..**...****.*..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x00018C66,  // .**...**...**..**.
-     0x000198C6,  // .**..**...**...**.
-     0x000198CC,  // .**..**...**..**..
-     0x000198CC,  // .**..**...**..**..
-     0x00019998,  // .**..**..**..**...
-     0x00019FF0,  // .**..*********....
-     0x0000CEE0,  // ..**..***.***.....
-     0x0000E000,  // ..***.............
-     0x00007000,  // ...***............
-     0x00003FE0,  // ....*********.....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-  },
-  {             // 65
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 66
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C18,  // .**.....**...
-     0x00000FF8,  // .*********...
-     0x00000FFC,  // .**********..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x00000FFC,  // .**********..
-     0x00000FF8,  // .*********...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 67
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 68
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 69
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 70
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 71
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FFC,  // ...**********..
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000303E,  // .**......*****.
-     0x0000303E,  // .**......*****.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFE,  // ...***********.
-     0x000003F6,  // .....******.**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001FFC,  // .***********..
-     0x00001FFC,  // .***********..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 73
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000030C,  // **....**..
-     0x0000030C,  // **....**..
-     0x0000039C,  // ***..***..
-     0x000001F8,  // .******...
-     0x000000F0,  // ..****....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 75
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0E,  // ..**......***.
-     0x00000C1C,  // ..**.....***..
-     0x00000C38,  // ..**....***...
-     0x00000C70,  // ..**...***....
-     0x00000CE0,  // ..**..***.....
-     0x00000DC0,  // ..**.***......
-     0x00000F80,  // ..*****.......
-     0x00000FC0,  // ..******......
-     0x00000CE0,  // ..**..***.....
-     0x00000C70,  // ..**...***....
-     0x00000C38,  // ..**....***...
-     0x00000C1C,  // ..**.....***..
-     0x00000C0E,  // ..**......***.
-     0x00000C07,  // ..**.......***
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 76
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 77
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00006C36,  // .**.**....**.**.
-     0x00006C36,  // .**.**....**.**.
-     0x00006666,  // .**..**..**..**.
-     0x00006666,  // .**..**..**..**.
-     0x00006246,  // .**...*..*...**.
-     0x000063C6,  // .**...****...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 78
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 79
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007F8,  // ..********...
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000060E,  // ..**.....***.
-     0x000007FC,  // ..*********..
-     0x000007F8,  // ..********...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 81
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000386E,  // .***....**.***.
-     0x0000186C,  // ..**....**.**..
-     0x00001C3C,  // ..***....****..
-     0x00000FF8,  // ...*********...
-     0x000003EC,  // .....*****.**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00001818,  // .**......**...
-     0x00001818,  // .**......**...
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 83
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x00000038,  // .......***...
-     0x0000001C,  // ........***..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 84
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 86
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 87
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018786,  // .**....****....**.
-     0x0000C78C,  // ..**...****...**..
-     0x0000C48C,  // ..**...*..*...**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006858,  // ...**.*....*.**...
-     0x00003870,  // ....***....***....
-     0x00003030,  // ....**......**....
-     0x00003030,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 88
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 89
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 90
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 91
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 92
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 93
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 94
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 95
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-  },
-  {             // 96
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 97
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 98
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 99
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 101
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 102
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x00000070,  // ....***....
-  },
-  {             // 104
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C6,  // .**...**.
-     0x000000CC,  // .**..**..
-     0x000000D8,  // .**.**...
-     0x000000F0,  // .****....
-     0x000000F8,  // .*****...
-     0x000000D8,  // .**.**...
-     0x000000CC,  // .**..**..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 108
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006F3C,  // .**.****..****..
-     0x00007FFE,  // .**************.
-     0x000071C6,  // .***...***...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 112
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 113
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-  },
-  {             // 114
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 115
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x00000007,  // ...***
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D2C,  // ..**.*..*.**..
-     0x00000528,  // ...*.*..*.*...
-     0x00000738,  // ...***..***...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 121
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 122
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000030,  // .**....
-     0x00000060,  // **.....
-     0x00000030,  // .**....
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000000C,  // ...**..
-     0x00000006,  // ....**.
-  },
-  {             // 124
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 125
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-  },
-  {             // 126
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000E6,  // ..***..**.
-     0x000001FE,  // .********.
-     0x0000019C,  // .**..***..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 127
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 161
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 162
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000008,  // ......*...
-     0x00000008,  // ......*...
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000D6,  // ..**.*.**.
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x000000D6,  // ..**.*.**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000020,  // ....*.....
-     0x00000020,  // ....*.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 163
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000180,  // .**.......
-     0x000000C0,  // ..**......
-     0x000001F8,  // .******...
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x00000182,  // .**.....*.
-     0x000003FE,  // *********.
-     0x0000037C,  // **.*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 165
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 166
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 167
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001E0,  // .****.....
-     0x000000F8,  // ..*****...
-     0x000000DC,  // ..**.***..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000E6,  // ..***..**.
-     0x0000007C,  // ...*****..
-     0x0000001C,  // .....***..
-     0x0000000E,  // ......***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-  },
-  {             // 168
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000036,  // **.**.
-     0x00000036,  // **.**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 169
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000C18,  // ...**.....**...
-     0x00001004,  // ..*.........*..
-     0x000011C4,  // ..*...***...*..
-     0x00002222,  // .*...*...*...*.
-     0x00002422,  // .*..*....*...*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002222,  // .*...*...*...*.
-     0x000011C4,  // ..*...***...*..
-     0x00001004,  // ..*.........*..
-     0x00000C18,  // ...**.....**...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000026,  // .*..**.
-     0x0000000E,  // ...***.
-     0x00000012,  // ..*..*.
-     0x00000036,  // .**.**.
-     0x0000001A,  // ..**.*.
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 171
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 172
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 173
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 174
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // ....*****.....
-     0x00000C18,  // ..**.....**...
-     0x00001004,  // .*.........*..
-     0x000013E4,  // .*..*****..*..
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x000023E2,  // *...*****...*.
-     0x00002242,  // *...*..*....*.
-     0x00002222,  // *...*...*...*.
-     0x00001214,  // .*..*....*.*..
-     0x00001004,  // .*.........*..
-     0x00000C18,  // ..**.....**...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 175
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001F,  // *****
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 176
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 177
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 178
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x0000003E,  // *****.
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 179
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000026,  // *..**.
-     0x0000003E,  // *****.
-     0x0000001C,  // .***..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 180
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 181
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FE,  // .********.
-     0x000001B6,  // .**.**.**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-  },
-  {             // 182
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007E,  // ...******.
-     0x000000E4,  // ..***..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000000E4,  // ..***..*..
-     0x00000064,  // ...**..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-  },
-  {             // 183
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 184
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000E,  // .***.
-     0x00000003,  // ...**
-     0x0000001B,  // **.**
-     0x0000001E,  // ****.
-  },
-  {             // 185
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000003C,  // ****..
-     0x0000003C,  // ****..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 186
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 187
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 188
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00007818,  // ****......**...
-     0x00007830,  // ****.....**....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x000018C4,  // ..**...**...*..
-     0x0000188C,  // ..**...*...**..
-     0x0000199C,  // ..**..**..***..
-     0x0000033C,  // .....**..****..
-     0x0000036C,  // .....**.**.**..
-     0x0000067E,  // ....**..******.
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00007818,  // ****......**...
-     0x00007830,  // ****.....**....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x000018DC,  // ..**...**.***..
-     0x000018BE,  // ..**...*.*****.
-     0x000019A6,  // ..**..**.*..**.
-     0x00000306,  // .....**.....**.
-     0x0000030C,  // .....**....**..
-     0x00000618,  // ....**....**...
-     0x00000C3E,  // ...**....*****.
-     0x00000C3E,  // ...**....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003818,  // .***......**...
-     0x00007C18,  // *****.....**...
-     0x00004C30,  // *..**....**....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00004CC4,  // *..**..**...*..
-     0x00007C8C,  // *****..*...**..
-     0x0000399C,  // .***..**..***..
-     0x0000033C,  // .....**..****..
-     0x0000036C,  // .....**.**.**..
-     0x0000067E,  // ....**..******.
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-  },
-  {             // 192
-     13, 22,
-     0x00000300,  // ...**........
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 193
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 194
-     13, 22,
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 195
-     13, 22,
-     0x00000190,  // ....**..*....
-     0x000002D0,  // ...*.**.*....
-     0x00000260,  // ...*..**.....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 196
-     13, 22,
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 197
-     13, 22,
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x00000120,  // ....*..*.....
-     0x00000120,  // ....*..*.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 198
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FFE,  // ......***********.
-     0x00000FFE,  // ......***********.
-     0x00001B00,  // .....**.**........
-     0x00001B00,  // .....**.**........
-     0x00003300,  // ....**..**........
-     0x00003300,  // ....**..**........
-     0x000063FC,  // ...**...********..
-     0x000063FC,  // ...**...********..
-     0x00007F00,  // ...*******........
-     0x0000FF00,  // ..********........
-     0x0000C300,  // ..**....**........
-     0x0000C300,  // ..**....**........
-     0x000183FE,  // .**.....*********.
-     0x000183FE,  // .**.....*********.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 199
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x000000C0,  // ......**......
-     0x00000060,  // .......**.....
-     0x00000360,  // ....**.**.....
-     0x000003C0,  // ....****......
-  },
-  {             // 200
-     13, 22,
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 201
-     13, 22,
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 202
-     13, 22,
-     0x00000060,  // ......**.....
-     0x000000F0,  // .....****....
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 203
-     13, 22,
-     0x00000000,  // .............
-     0x00000198,  // ....**..**...
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 204
-     6, 22,
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 22,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     6, 22,
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000021,  // *....*
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 207
-     6, 22,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FF8,  // ..**********...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00007F06,  // *******.....**.
-     0x00007F06,  // *******.....**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00001FF8,  // ..**********...
-     0x00001FF0,  // ..*********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     14, 22,
-     0x00000190,  // .....**..*....
-     0x000002D0,  // ....*.**.*....
-     0x00000260,  // ....*..**.....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 210
-     15, 22,
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 22,
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 22,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 22,
-     0x00000190,  // ......**..*....
-     0x000002D0,  // .....*.**.*....
-     0x00000260,  // .....*..**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 22,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000303,  // **......**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 216
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E6,  // .....*****..**.
-     0x00000FFC,  // ...**********..
-     0x00001C18,  // ..***.....**...
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x0000360E,  // .**.**.....***.
-     0x00001C0C,  // ..***......**..
-     0x00001C1C,  // ..***.....***..
-     0x000037F8,  // .**.********...
-     0x000063E0,  // **...*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     14, 22,
-     0x00000300,  // ....**........
-     0x00000180,  // .....**.......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 218
-     14, 22,
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 219
-     14, 22,
-     0x000000C0,  // ......**......
-     0x000001E0,  // .....****.....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 220
-     14, 22,
-     0x00000000,  // ..............
-     0x00000630,  // ...**...**....
-     0x00000630,  // ...**...**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 221
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 222
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 223
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DC,  // .**.***..
-     0x000000DC,  // .**.***..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DE,  // .**.****.
-     0x000000DC,  // .**.***..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 224
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 225
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 226
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 227
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 228
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ..**..**...
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 229
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x00000090,  // ...*..*....
-     0x00000090,  // ...*..*....
-     0x00000060,  // ....**.....
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 230
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003F78,  // ...******.****...
-     0x000073FC,  // ..***..********..
-     0x00006186,  // ..**....**....**.
-     0x00000386,  // .......***....**.
-     0x00003FFE,  // ...*************.
-     0x00007180,  // ..***...**.......
-     0x00006180,  // ..**....**.......
-     0x000061C6,  // ..**....***...**.
-     0x000073FE,  // ..***..*********.
-     0x00003D78,  // ...****.*.****...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 231
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x000000D8,  // ..**.**...
-     0x000000F0,  // ..****....
-  },
-  {             // 232
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 233
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 234
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 235
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 236
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 237
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 238
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 240
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ..**.......
-     0x000000D8,  // ...**.**...
-     0x000000E0,  // ...***.....
-     0x00000130,  // ..*..**....
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 241
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000064,  // ...**..*..
-     0x000000B4,  // ..*.**.*..
-     0x00000098,  // ..*..**...
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 242
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 243
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 244
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 245
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 246
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000CC,  // ...**..**..
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 247
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 248
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000073,  // ....***..**
-     0x000001FE,  // ..********.
-     0x0000018C,  // ..**...**..
-     0x0000031E,  // .**...****.
-     0x00000336,  // .**..**.**.
-     0x00000366,  // .**.**..**.
-     0x000003C6,  // .****...**.
-     0x0000018C,  // ..**...**..
-     0x000003FC,  // .********..
-     0x00000670,  // **..***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 249
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 250
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 251
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 253
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 254
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 255
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  };
diff --git a/fontsml-iso8859-13.c b/fontsml-iso8859-13.c
deleted file mode 100644
index 738816a72..000000000
--- a/fontsml-iso8859-13.c
+++ /dev/null
@@ -1,5602 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_13[][24] = {
-  {             // 32
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 33
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 35
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 36
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000010,  // .....*....
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000196,  // .**..*.**.
-     0x00000190,  // .**..*....
-     0x000001D0,  // .***.*....
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000001E,  // .....****.
-     0x00000013,  // .....*..**
-     0x00000193,  // .**..*..**
-     0x000001D7,  // .***.*.***
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000010,  // .....*....
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 37
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003C30,  // ..****....**....
-     0x00006660,  // .**..**..**.....
-     0x00006660,  // .**..**..**.....
-     0x000066C0,  // .**..**.**......
-     0x000066C0,  // .**..**.**......
-     0x00003D80,  // ..****.**.......
-     0x00000180,  // .......**.......
-     0x0000033C,  // ......**..****..
-     0x00000366,  // ......**.**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000C66,  // ....**...**..**.
-     0x00000C3C,  // ....**....****..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 38
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003C0,  // ...****......
-     0x000007E0,  // ..******.....
-     0x00000660,  // ..**..**.....
-     0x00000660,  // ..**..**.....
-     0x000003C0,  // ...****......
-     0x000007C0,  // ..*****......
-     0x00000EEC,  // .***.***.**..
-     0x00000C6C,  // .**...**.**..
-     0x00000C3C,  // .**....****..
-     0x00000C38,  // .**....***...
-     0x00000E7C,  // .***..*****..
-     0x000007EE,  // ..******.***.
-     0x000003C7,  // ...****...***
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 39
-     3, 22,
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-  },
-  {             // 40
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-  },
-  {             // 41
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000010,  // .*....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000010,  // .*....
-  },
-  {             // 42
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000008,  // ...*...
-     0x0000002A,  // .*.*.*.
-     0x0000003E,  // .*****.
-     0x00000008,  // ...*...
-     0x0000003E,  // .*****.
-     0x0000002A,  // .*.*.*.
-     0x00000008,  // ...*...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 43
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 44
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 45
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****. added by hand to avoid flickering!!!
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 46
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 48
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 49
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x000000F8,  // ..*****...
-     0x000000F8,  // ..*****...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 50
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000006,  // .......**.
-     0x0000000E,  // ......***.
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 51
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000000C,  // ......**..
-     0x00000038,  // ....***...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 52
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000001C,  // .....***..
-     0x0000003C,  // ....****..
-     0x0000006C,  // ...**.**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000018C,  // .**...**..
-     0x0000030C,  // **....**..
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 53
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001F8,  // .******...
-     0x000001FC,  // .*******..
-     0x0000018E,  // .**...***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 54
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 55
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 56
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 57
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 58
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 59
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 60
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x0000001E,  // .....****.
-     0x00000078,  // ...****...
-     0x000000E0,  // ..***.....
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000001E,  // .....****.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 61
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 62
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 63
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000381C,  // ....***......***..
-     0x0000600C,  // ...**.........**..
-     0x0000C7A6,  // ..**...****.*..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x00018C66,  // .**...**...**..**.
-     0x000198C6,  // .**..**...**...**.
-     0x000198CC,  // .**..**...**..**..
-     0x000198CC,  // .**..**...**..**..
-     0x00019998,  // .**..**..**..**...
-     0x00019FF0,  // .**..*********....
-     0x0000CEE0,  // ..**..***.***.....
-     0x0000E000,  // ..***.............
-     0x00007000,  // ...***............
-     0x00003FE0,  // ....*********.....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-  },
-  {             // 65
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 66
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C18,  // .**.....**...
-     0x00000FF8,  // .*********...
-     0x00000FFC,  // .**********..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x00000FFC,  // .**********..
-     0x00000FF8,  // .*********...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 67
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 68
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 69
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 70
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 71
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FFC,  // ...**********..
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000303E,  // .**......*****.
-     0x0000303E,  // .**......*****.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFE,  // ...***********.
-     0x000003F6,  // .....******.**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001FFC,  // .***********..
-     0x00001FFC,  // .***********..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 73
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000030C,  // **....**..
-     0x0000030C,  // **....**..
-     0x0000039C,  // ***..***..
-     0x000001F8,  // .******...
-     0x000000F0,  // ..****....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 75
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0E,  // ..**......***.
-     0x00000C1C,  // ..**.....***..
-     0x00000C38,  // ..**....***...
-     0x00000C70,  // ..**...***....
-     0x00000CE0,  // ..**..***.....
-     0x00000DC0,  // ..**.***......
-     0x00000F80,  // ..*****.......
-     0x00000FC0,  // ..******......
-     0x00000CE0,  // ..**..***.....
-     0x00000C70,  // ..**...***....
-     0x00000C38,  // ..**....***...
-     0x00000C1C,  // ..**.....***..
-     0x00000C0E,  // ..**......***.
-     0x00000C07,  // ..**.......***
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 76
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 77
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00006C36,  // .**.**....**.**.
-     0x00006C36,  // .**.**....**.**.
-     0x00006666,  // .**..**..**..**.
-     0x00006666,  // .**..**..**..**.
-     0x00006246,  // .**...*..*...**.
-     0x000063C6,  // .**...****...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 78
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 79
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007F8,  // ..********...
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000060E,  // ..**.....***.
-     0x000007FC,  // ..*********..
-     0x000007F8,  // ..********...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 81
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000386E,  // .***....**.***.
-     0x0000186C,  // ..**....**.**..
-     0x00001C3C,  // ..***....****..
-     0x00000FF8,  // ...*********...
-     0x000003EC,  // .....*****.**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00001818,  // .**......**...
-     0x00001818,  // .**......**...
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 83
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x00000038,  // .......***...
-     0x0000001C,  // ........***..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 84
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 86
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 87
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018786,  // .**....****....**.
-     0x0000C78C,  // ..**...****...**..
-     0x0000C48C,  // ..**...*..*...**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006858,  // ...**.*....*.**...
-     0x00003870,  // ....***....***....
-     0x00003030,  // ....**......**....
-     0x00003030,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 88
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 89
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 90
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 91
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 92
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 93
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 94
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 95
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-  },
-  {             // 96
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 97
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 98
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 99
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 101
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 102
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x00000070,  // ....***....
-  },
-  {             // 104
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C6,  // .**...**.
-     0x000000CC,  // .**..**..
-     0x000000D8,  // .**.**...
-     0x000000F0,  // .****....
-     0x000000F8,  // .*****...
-     0x000000D8,  // .**.**...
-     0x000000CC,  // .**..**..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 108
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006F3C,  // .**.****..****..
-     0x00007FFE,  // .**************.
-     0x000071C6,  // .***...***...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 112
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 113
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-  },
-  {             // 114
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 115
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x00000007,  // ...***
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D2C,  // ..**.*..*.**..
-     0x00000528,  // ...*.*..*.*...
-     0x00000738,  // ...***..***...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 121
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 122
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000030,  // .**....
-     0x00000060,  // **.....
-     0x00000030,  // .**....
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000000C,  // ...**..
-     0x00000006,  // ....**.
-  },
-  {             // 124
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 125
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-  },
-  {             // 126
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000E6,  // ..***..**.
-     0x000001FE,  // .********.
-     0x0000019C,  // .**..***..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 127
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 161
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 162
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000008,  // ......*...
-     0x00000008,  // ......*...
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000D6,  // ..**.*.**.
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x000000D6,  // ..**.*.**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000020,  // ....*.....
-     0x00000020,  // ....*.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 163
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000180,  // .**.......
-     0x000000C0,  // ..**......
-     0x000001F8,  // .******...
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x00000182,  // .**.....*.
-     0x000003FE,  // *********.
-     0x0000037C,  // **.*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00003F80,  // *******.......
-     0x00003F80,  // *******.......
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00003F80,  // *******.......
-     0x00003F80,  // *******.......
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 165
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 166
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 167
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001E0,  // .****.....
-     0x000000F8,  // ..*****...
-     0x000000DC,  // ..**.***..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000E6,  // ..***..**.
-     0x0000007C,  // ...*****..
-     0x0000001C,  // .....***..
-     0x0000000E,  // ......***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-  },
-  {             // 168
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E6,  // .....*****..**.
-     0x00000FFC,  // ...**********..
-     0x00001C18,  // ..***.....**...
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x0000360E,  // .**.**.....***.
-     0x00001C0C,  // ..***......**..
-     0x00001C1C,  // ..***.....***..
-     0x000037F8,  // .**.********...
-     0x000063E0,  // **...*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 169
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000C18,  // ...**.....**...
-     0x00001004,  // ..*.........*..
-     0x000011C4,  // ..*...***...*..
-     0x00002222,  // .*...*...*...*.
-     0x00002422,  // .*..*....*...*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002222,  // .*...*...*...*.
-     0x000011C4,  // ..*...***...*..
-     0x00001004,  // ..*.........*..
-     0x00000C18,  // ...**.....**...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000026,  // .*..**.
-     0x0000000E,  // ...***.
-     0x00000012,  // ..*..*.
-     0x00000036,  // .**.**.
-     0x0000001A,  // ..**.*.
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 171
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 172
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 173
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 174
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // ....*****.....
-     0x00000C18,  // ..**.....**...
-     0x00001004,  // .*.........*..
-     0x000013E4,  // .*..*****..*..
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x000023E2,  // *...*****...*.
-     0x00002242,  // *...*..*....*.
-     0x00002222,  // *...*...*...*.
-     0x00001214,  // .*..*....*.*..
-     0x00001004,  // .*.........*..
-     0x00000C18,  // ..**.....**...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 175
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001F,  // *****
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 176
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 177
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 178
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x0000003E,  // *****.
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 179
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000026,  // *..**.
-     0x0000003E,  // *****.
-     0x0000001C,  // .***..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 180
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 181
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FE,  // .********.
-     0x000001B6,  // .**.**.**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-  },
-  {             // 182
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007E,  // ...******.
-     0x000000E4,  // ..***..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000000E4,  // ..***..*..
-     0x00000064,  // ...**..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-  },
-  {             // 183
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 184
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000073,  // ....***..**
-     0x000001FE,  // ..********.
-     0x0000018C,  // ..**...**..
-     0x0000031E,  // .**...****.
-     0x00000336,  // .**..**.**.
-     0x00000366,  // .**.**..**.
-     0x000003C6,  // .****...**.
-     0x0000018C,  // ..**...**..
-     0x000003FC,  // .********..
-     0x00000670,  // **..***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 185
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000003C,  // ****..
-     0x0000003C,  // ****..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 186
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 187
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 188
-     19, 22,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00003BFE,  // .....***.*********.
-     0x0000FFFE,  // ...***************.
-     0x0001C700,  // ..***...***........
-     0x00018300,  // ..**.....**........
-     0x00038300,  // .***.....**........
-     0x00030300,  // .**......**........
-     0x000303FC,  // .**......********..
-     0x000303FC,  // .**......********..
-     0x00030300,  // .**......**........
-     0x00038300,  // .***.....**........
-     0x00018300,  // ..**.....**........
-     0x0001C700,  // ..***...***........
-     0x0000FFFE,  // ...***************.
-     0x00003BFE,  // .....***.*********.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 189
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003E78,  // ...*****..****...
-     0x00007FFC,  // ..*************..
-     0x00006386,  // ..**...***....**.
-     0x0000C186,  // .**.....**....**.
-     0x0000C1FE,  // .**.....********.
-     0x0000C180,  // .**.....**.......
-     0x0000C180,  // .**.....**.......
-     0x000063C6,  // ..**...****...**.
-     0x00007FFE,  // ..**************.
-     0x00003E78,  // ...*****..****...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 190
-     14, 22,
-     0x00000000,  // ..............
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 191
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-  },
-  {             // 192
-     13, 22,
-     0x00000300,  // ...**........
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 193
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 194
-     13, 22,
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 195
-     13, 22,
-     0x00000190,  // ....**..*....
-     0x000002D0,  // ...*.**.*....
-     0x00000260,  // ...*..**.....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 196
-     13, 22,
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 197
-     13, 22,
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x00000120,  // ....*..*.....
-     0x00000120,  // ....*..*.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 198
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FFE,  // ......***********.
-     0x00000FFE,  // ......***********.
-     0x00001B00,  // .....**.**........
-     0x00001B00,  // .....**.**........
-     0x00003300,  // ....**..**........
-     0x00003300,  // ....**..**........
-     0x000063FC,  // ...**...********..
-     0x000063FC,  // ...**...********..
-     0x00007F00,  // ...*******........
-     0x0000FF00,  // ..********........
-     0x0000C300,  // ..**....**........
-     0x0000C300,  // ..**....**........
-     0x000183FE,  // .**.....*********.
-     0x000183FE,  // .**.....*********.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 199
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x000000C0,  // ......**......
-     0x00000060,  // .......**.....
-     0x00000360,  // ....**.**.....
-     0x000003C0,  // ....****......
-  },
-  {             // 200
-     13, 22,
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 201
-     13, 22,
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 202
-     13, 22,
-     0x00000060,  // ......**.....
-     0x000000F0,  // .....****....
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 203
-     13, 22,
-     0x00000000,  // .............
-     0x00000198,  // ....**..**...
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 204
-     6, 22,
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 22,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     6, 22,
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000021,  // *....*
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 207
-     6, 22,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     13, 22,
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x0000003C,  // .......****..
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 209
-     14, 22,
-     0x00000190,  // .....**..*....
-     0x000002D0,  // ....*.**.*....
-     0x00000260,  // ....*..**.....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 210
-     15, 22,
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 22,
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 22,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 22,
-     0x00000190,  // ......**..*....
-     0x000002D0,  // .....*.**.*....
-     0x00000260,  // .....*..**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 22,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000303,  // **......**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 216
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E6,  // .....*****..**.
-     0x00000FFC,  // ...**********..
-     0x00001C18,  // ..***.....**...
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x0000360E,  // .**.**.....***.
-     0x00001C0C,  // ..***......**..
-     0x00001C1C,  // ..***.....***..
-     0x000037F8,  // .**.********...
-     0x000063E0,  // **...*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     14, 22,
-     0x00000300,  // ....**........
-     0x00000180,  // .....**.......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 218
-     14, 22,
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 219
-     14, 22,
-     0x000000C0,  // ......**......
-     0x000001E0,  // .....****.....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 220
-     14, 22,
-     0x00000000,  // ..............
-     0x00000630,  // ...**...**....
-     0x00000630,  // ...**...**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 221
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 222
-     12, 22,
-     0x0000018C,  // ...**...**..
-     0x000000D8,  // ....**.**...
-     0x00000070,  // .....***....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 223
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DC,  // .**.***..
-     0x000000DC,  // .**.***..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DE,  // .**.****.
-     0x000000DC,  // .**.***..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 224
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 225
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 226
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 227
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 228
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ..**..**...
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 229
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x00000090,  // ...*..*....
-     0x00000090,  // ...*..*....
-     0x00000060,  // ....**.....
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 230
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003F78,  // ...******.****...
-     0x000073FC,  // ..***..********..
-     0x00006186,  // ..**....**....**.
-     0x00000386,  // .......***....**.
-     0x00003FFE,  // ...*************.
-     0x00007180,  // ..***...**.......
-     0x00006180,  // ..**....**.......
-     0x000061C6,  // ..**....***...**.
-     0x000073FE,  // ..***..*********.
-     0x00003D78,  // ...****.*.****...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 231
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x000000D8,  // ..**.**...
-     0x000000F0,  // ..****....
-  },
-  {             // 232
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 233
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 234
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 235
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 236
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 237
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 238
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 240
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 241
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000064,  // ...**..*..
-     0x000000B4,  // ..*.**.*..
-     0x00000098,  // ..*..**...
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 242
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 243
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 244
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 245
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 246
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000CC,  // ...**..**..
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 247
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 248
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000073,  // ....***..**
-     0x000001FE,  // ..********.
-     0x0000018C,  // ..**...**..
-     0x0000031E,  // .**...****.
-     0x00000336,  // .**..**.**.
-     0x00000366,  // .**.**..**.
-     0x000003C6,  // .****...**.
-     0x0000018C,  // ..**...**..
-     0x000003FC,  // .********..
-     0x00000670,  // **..***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 249
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 250
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 251
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 253
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 254
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 255
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  };
diff --git a/fontsml-iso8859-15.c b/fontsml-iso8859-15.c
deleted file mode 100644
index 27333bd4f..000000000
--- a/fontsml-iso8859-15.c
+++ /dev/null
@@ -1,5602 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_15[][24] = {
-  {             // 32
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 33
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 35
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 36
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000010,  // .....*....
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000196,  // .**..*.**.
-     0x00000190,  // .**..*....
-     0x000001D0,  // .***.*....
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000001E,  // .....****.
-     0x00000013,  // .....*..**
-     0x00000193,  // .**..*..**
-     0x000001D7,  // .***.*.***
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000010,  // .....*....
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 37
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003C30,  // ..****....**....
-     0x00006660,  // .**..**..**.....
-     0x00006660,  // .**..**..**.....
-     0x000066C0,  // .**..**.**......
-     0x000066C0,  // .**..**.**......
-     0x00003D80,  // ..****.**.......
-     0x00000180,  // .......**.......
-     0x0000033C,  // ......**..****..
-     0x00000366,  // ......**.**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000C66,  // ....**...**..**.
-     0x00000C3C,  // ....**....****..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 38
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003C0,  // ...****......
-     0x000007E0,  // ..******.....
-     0x00000660,  // ..**..**.....
-     0x00000660,  // ..**..**.....
-     0x000003C0,  // ...****......
-     0x000007C0,  // ..*****......
-     0x00000EEC,  // .***.***.**..
-     0x00000C6C,  // .**...**.**..
-     0x00000C3C,  // .**....****..
-     0x00000C38,  // .**....***...
-     0x00000E7C,  // .***..*****..
-     0x000007EE,  // ..******.***.
-     0x000003C7,  // ...****...***
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 39
-     3, 22,
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-  },
-  {             // 40
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-  },
-  {             // 41
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000010,  // .*....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000010,  // .*....
-  },
-  {             // 42
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000008,  // ...*...
-     0x0000002A,  // .*.*.*.
-     0x0000003E,  // .*****.
-     0x00000008,  // ...*...
-     0x0000003E,  // .*****.
-     0x0000002A,  // .*.*.*.
-     0x00000008,  // ...*...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 43
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 44
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 45
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****. added by hand to avoid flickering!!!
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 46
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 48
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 49
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x000000F8,  // ..*****...
-     0x000000F8,  // ..*****...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 50
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000006,  // .......**.
-     0x0000000E,  // ......***.
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 51
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000000C,  // ......**..
-     0x00000038,  // ....***...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 52
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000001C,  // .....***..
-     0x0000003C,  // ....****..
-     0x0000006C,  // ...**.**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000018C,  // .**...**..
-     0x0000030C,  // **....**..
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 53
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001F8,  // .******...
-     0x000001FC,  // .*******..
-     0x0000018E,  // .**...***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 54
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 55
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 56
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 57
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 58
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 59
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 60
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x0000001E,  // .....****.
-     0x00000078,  // ...****...
-     0x000000E0,  // ..***.....
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000001E,  // .....****.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 61
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 62
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 63
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000381C,  // ....***......***..
-     0x0000600C,  // ...**.........**..
-     0x0000C7A6,  // ..**...****.*..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x00018C66,  // .**...**...**..**.
-     0x000198C6,  // .**..**...**...**.
-     0x000198CC,  // .**..**...**..**..
-     0x000198CC,  // .**..**...**..**..
-     0x00019998,  // .**..**..**..**...
-     0x00019FF0,  // .**..*********....
-     0x0000CEE0,  // ..**..***.***.....
-     0x0000E000,  // ..***.............
-     0x00007000,  // ...***............
-     0x00003FE0,  // ....*********.....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-  },
-  {             // 65
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 66
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C18,  // .**.....**...
-     0x00000FF8,  // .*********...
-     0x00000FFC,  // .**********..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x00000FFC,  // .**********..
-     0x00000FF8,  // .*********...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 67
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 68
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 69
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 70
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 71
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FFC,  // ...**********..
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000303E,  // .**......*****.
-     0x0000303E,  // .**......*****.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFE,  // ...***********.
-     0x000003F6,  // .....******.**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001FFC,  // .***********..
-     0x00001FFC,  // .***********..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 73
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000030C,  // **....**..
-     0x0000030C,  // **....**..
-     0x0000039C,  // ***..***..
-     0x000001F8,  // .******...
-     0x000000F0,  // ..****....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 75
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0E,  // ..**......***.
-     0x00000C1C,  // ..**.....***..
-     0x00000C38,  // ..**....***...
-     0x00000C70,  // ..**...***....
-     0x00000CE0,  // ..**..***.....
-     0x00000DC0,  // ..**.***......
-     0x00000F80,  // ..*****.......
-     0x00000FC0,  // ..******......
-     0x00000CE0,  // ..**..***.....
-     0x00000C70,  // ..**...***....
-     0x00000C38,  // ..**....***...
-     0x00000C1C,  // ..**.....***..
-     0x00000C0E,  // ..**......***.
-     0x00000C07,  // ..**.......***
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 76
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 77
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00006C36,  // .**.**....**.**.
-     0x00006C36,  // .**.**....**.**.
-     0x00006666,  // .**..**..**..**.
-     0x00006666,  // .**..**..**..**.
-     0x00006246,  // .**...*..*...**.
-     0x000063C6,  // .**...****...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 78
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 79
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007F8,  // ..********...
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000060E,  // ..**.....***.
-     0x000007FC,  // ..*********..
-     0x000007F8,  // ..********...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 81
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000386E,  // .***....**.***.
-     0x0000186C,  // ..**....**.**..
-     0x00001C3C,  // ..***....****..
-     0x00000FF8,  // ...*********...
-     0x000003EC,  // .....*****.**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00001818,  // .**......**...
-     0x00001818,  // .**......**...
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 83
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x00000038,  // .......***...
-     0x0000001C,  // ........***..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 84
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 86
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 87
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018786,  // .**....****....**.
-     0x0000C78C,  // ..**...****...**..
-     0x0000C48C,  // ..**...*..*...**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006858,  // ...**.*....*.**...
-     0x00003870,  // ....***....***....
-     0x00003030,  // ....**......**....
-     0x00003030,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 88
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 89
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 90
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 91
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 92
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 93
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 94
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 95
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-  },
-  {             // 96
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 97
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 98
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 99
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 101
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 102
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x00000070,  // ....***....
-  },
-  {             // 104
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C6,  // .**...**.
-     0x000000CC,  // .**..**..
-     0x000000D8,  // .**.**...
-     0x000000F0,  // .****....
-     0x000000F8,  // .*****...
-     0x000000D8,  // .**.**...
-     0x000000CC,  // .**..**..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 108
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006F3C,  // .**.****..****..
-     0x00007FFE,  // .**************.
-     0x000071C6,  // .***...***...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 112
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 113
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-  },
-  {             // 114
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 115
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x00000007,  // ...***
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D2C,  // ..**.*..*.**..
-     0x00000528,  // ...*.*..*.*...
-     0x00000738,  // ...***..***...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 121
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 122
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000030,  // .**....
-     0x00000060,  // **.....
-     0x00000030,  // .**....
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000000C,  // ...**..
-     0x00000006,  // ....**.
-  },
-  {             // 124
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 125
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-  },
-  {             // 126
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000E6,  // ..***..**.
-     0x000001FE,  // .********.
-     0x0000019C,  // .**..***..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 127
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 128
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 129
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 130
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 131
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 132
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 133
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 134
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 135
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 136
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 137
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 138
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 139
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 140
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 141
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 142
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 143
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 144
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 145
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 146
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 147
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 148
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 149
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 150
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 151
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 152
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 153
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 154
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 155
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 156
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 157
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 158
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 159
-     0, 22,
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-     0x00000000,  //
-  },
-  {             // 160
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 161
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 162
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000008,  // ......*...
-     0x00000008,  // ......*...
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000D6,  // ..**.*.**.
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x000000D6,  // ..**.*.**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000020,  // ....*.....
-     0x00000020,  // ....*.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 163
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000180,  // .**.......
-     0x000000C0,  // ..**......
-     0x000001F8,  // .******...
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x00000182,  // .**.....*.
-     0x000003FE,  // *********.
-     0x0000037C,  // **.*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00003F80,  // *******.......
-     0x00003F80,  // *******.......
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00003F80,  // *******.......
-     0x00003F80,  // *******.......
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 165
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 166
-     13, 22,
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x0000003C,  // .......****..
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 167
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001E0,  // .****.....
-     0x000000F8,  // ..*****...
-     0x000000DC,  // ..**.***..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000E6,  // ..***..**.
-     0x0000007C,  // ...*****..
-     0x0000001C,  // .....***..
-     0x0000000E,  // ......***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-  },
-  {             // 168
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 169
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000C18,  // ...**.....**...
-     0x00001004,  // ..*.........*..
-     0x000011C4,  // ..*...***...*..
-     0x00002222,  // .*...*...*...*.
-     0x00002422,  // .*..*....*...*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002222,  // .*...*...*...*.
-     0x000011C4,  // ..*...***...*..
-     0x00001004,  // ..*.........*..
-     0x00000C18,  // ...**.....**...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000026,  // .*..**.
-     0x0000000E,  // ...***.
-     0x00000012,  // ..*..*.
-     0x00000036,  // .**.**.
-     0x0000001A,  // ..**.*.
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 171
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 172
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 173
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 174
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // ....*****.....
-     0x00000C18,  // ..**.....**...
-     0x00001004,  // .*.........*..
-     0x000013E4,  // .*..*****..*..
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x000023E2,  // *...*****...*.
-     0x00002242,  // *...*..*....*.
-     0x00002222,  // *...*...*...*.
-     0x00001214,  // .*..*....*.*..
-     0x00001004,  // .*.........*..
-     0x00000C18,  // ..**.....**...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 175
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001F,  // *****
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 176
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 177
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 178
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x0000003E,  // *****.
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 179
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000026,  // *..**.
-     0x0000003E,  // *****.
-     0x0000001C,  // .***..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 180
-     12, 22,
-     0x0000018C,  // ...**...**..
-     0x000000D8,  // ....**.**...
-     0x00000070,  // .....***....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 181
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FE,  // .********.
-     0x000001B6,  // .**.**.**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-  },
-  {             // 182
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007E,  // ...******.
-     0x000000E4,  // ..***..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000000E4,  // ..***..*..
-     0x00000064,  // ...**..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-  },
-  {             // 183
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 184
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 185
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000003C,  // ****..
-     0x0000003C,  // ****..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 186
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 187
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 188
-     19, 22,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00003BFE,  // .....***.*********.
-     0x0000FFFE,  // ...***************.
-     0x0001C700,  // ..***...***........
-     0x00018300,  // ..**.....**........
-     0x00038300,  // .***.....**........
-     0x00030300,  // .**......**........
-     0x000303FC,  // .**......********..
-     0x000303FC,  // .**......********..
-     0x00030300,  // .**......**........
-     0x00038300,  // .***.....**........
-     0x00018300,  // ..**.....**........
-     0x0001C700,  // ..***...***........
-     0x0000FFFE,  // ...***************.
-     0x00003BFE,  // .....***.*********.
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 189
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003E78,  // ...*****..****...
-     0x00007FFC,  // ..*************..
-     0x00006386,  // ..**...***....**.
-     0x0000C186,  // .**.....**....**.
-     0x0000C1FE,  // .**.....********.
-     0x0000C180,  // .**.....**.......
-     0x0000C180,  // .**.....**.......
-     0x000063C6,  // ..**...****...**.
-     0x00007FFE,  // ..**************.
-     0x00003E78,  // ...*****..****...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 190
-     14, 22,
-     0x00000000,  // ..............
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 191
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-  },
-  {             // 192
-     13, 22,
-     0x00000300,  // ...**........
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 193
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 194
-     13, 22,
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 195
-     13, 22,
-     0x00000190,  // ....**..*....
-     0x000002D0,  // ...*.**.*....
-     0x00000260,  // ...*..**.....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 196
-     13, 22,
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 197
-     13, 22,
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x00000120,  // ....*..*.....
-     0x00000120,  // ....*..*.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 198
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FFE,  // ......***********.
-     0x00000FFE,  // ......***********.
-     0x00001B00,  // .....**.**........
-     0x00001B00,  // .....**.**........
-     0x00003300,  // ....**..**........
-     0x00003300,  // ....**..**........
-     0x000063FC,  // ...**...********..
-     0x000063FC,  // ...**...********..
-     0x00007F00,  // ...*******........
-     0x0000FF00,  // ..********........
-     0x0000C300,  // ..**....**........
-     0x0000C300,  // ..**....**........
-     0x000183FE,  // .**.....*********.
-     0x000183FE,  // .**.....*********.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 199
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x000000C0,  // ......**......
-     0x00000060,  // .......**.....
-     0x00000360,  // ....**.**.....
-     0x000003C0,  // ....****......
-  },
-  {             // 200
-     13, 22,
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 201
-     13, 22,
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 202
-     13, 22,
-     0x00000060,  // ......**.....
-     0x000000F0,  // .....****....
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 203
-     13, 22,
-     0x00000000,  // .............
-     0x00000198,  // ....**..**...
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 204
-     6, 22,
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 22,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     6, 22,
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000021,  // *....*
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 207
-     6, 22,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001FF0,  // ..*********....
-     0x00001FF8,  // ..**********...
-     0x0000181C,  // ..**......***..
-     0x0000180C,  // ..**.......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00007F06,  // *******.....**.
-     0x00007F06,  // *******.....**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x0000180C,  // ..**.......**..
-     0x0000181C,  // ..**......***..
-     0x00001FF8,  // ..**********...
-     0x00001FF0,  // ..*********....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     14, 22,
-     0x00000190,  // .....**..*....
-     0x000002D0,  // ....*.**.*....
-     0x00000260,  // ....*..**.....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 210
-     15, 22,
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 22,
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 22,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 22,
-     0x00000190,  // ......**..*....
-     0x000002D0,  // .....*.**.*....
-     0x00000260,  // .....*..**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 22,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000303,  // **......**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 216
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E6,  // .....*****..**.
-     0x00000FFC,  // ...**********..
-     0x00001C18,  // ..***.....**...
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x0000360E,  // .**.**.....***.
-     0x00001C0C,  // ..***......**..
-     0x00001C1C,  // ..***.....***..
-     0x000037F8,  // .**.********...
-     0x000063E0,  // **...*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     14, 22,
-     0x00000300,  // ....**........
-     0x00000180,  // .....**.......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 218
-     14, 22,
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 219
-     14, 22,
-     0x000000C0,  // ......**......
-     0x000001E0,  // .....****.....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 220
-     14, 22,
-     0x00000000,  // ..............
-     0x00000630,  // ...**...**....
-     0x00000630,  // ...**...**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 221
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 222
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 223
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DC,  // .**.***..
-     0x000000DC,  // .**.***..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DE,  // .**.****.
-     0x000000DC,  // .**.***..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 224
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 225
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 226
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 227
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 228
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ..**..**...
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 229
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x00000090,  // ...*..*....
-     0x00000090,  // ...*..*....
-     0x00000060,  // ....**.....
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 230
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003F78,  // ...******.****...
-     0x000073FC,  // ..***..********..
-     0x00006186,  // ..**....**....**.
-     0x00000386,  // .......***....**.
-     0x00003FFE,  // ...*************.
-     0x00007180,  // ..***...**.......
-     0x00006180,  // ..**....**.......
-     0x000061C6,  // ..**....***...**.
-     0x000073FE,  // ..***..*********.
-     0x00003D78,  // ...****.*.****...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 231
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x000000D8,  // ..**.**...
-     0x000000F0,  // ..****....
-  },
-  {             // 232
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 233
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 234
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 235
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 236
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 237
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 238
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 240
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000180,  // ..**.......
-     0x000000D8,  // ...**.**...
-     0x000000E0,  // ...***.....
-     0x00000130,  // ..*..**....
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 241
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000064,  // ...**..*..
-     0x000000B4,  // ..*.**.*..
-     0x00000098,  // ..*..**...
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 242
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 243
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 244
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 245
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 246
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000CC,  // ...**..**..
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 247
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 248
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000073,  // ....***..**
-     0x000001FE,  // ..********.
-     0x0000018C,  // ..**...**..
-     0x0000031E,  // .**...****.
-     0x00000336,  // .**..**.**.
-     0x00000366,  // .**.**..**.
-     0x000003C6,  // .****...**.
-     0x0000018C,  // ..**...**..
-     0x000003FC,  // .********..
-     0x00000670,  // **..***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 249
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 250
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 251
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 253
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 254
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 255
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  };
diff --git a/fontsml-iso8859-2.c b/fontsml-iso8859-2.c
deleted file mode 100644
index 8b02a17ef..000000000
--- a/fontsml-iso8859-2.c
+++ /dev/null
@@ -1,5826 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_2[][25] = {
-  {             // 32
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 33
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000012,  // *..*.
-     0x00000012,  // *..*.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 35
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 36
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000010,  // .....*....
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000196,  // .**..*.**.
-     0x00000190,  // .**..*....
-     0x000001D0,  // .***.*....
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000001E,  // .....****.
-     0x00000013,  // .....*..**
-     0x00000193,  // .**..*..**
-     0x000001D7,  // .***.*.***
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000010,  // .....*....
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 37
-     16, 23,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003C30,  // ..****....**....
-     0x00007E60,  // .******..**.....
-     0x00006660,  // .**..**..**.....
-     0x000066C0,  // .**..**.**......
-     0x00007EC0,  // .******.**......
-     0x00003D80,  // ..****.**.......
-     0x00000180,  // .......**.......
-     0x0000033C,  // ......**..****..
-     0x0000037E,  // ......**.******.
-     0x00000666,  // .....**..**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000C7E,  // ....**...******.
-     0x00000C3C,  // ....**....****..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 38
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003C0,  // ...****......
-     0x000007E0,  // ..******.....
-     0x00000660,  // ..**..**.....
-     0x00000660,  // ..**..**.....
-     0x000003C0,  // ...****......
-     0x000007C0,  // ..*****......
-     0x00000EEC,  // .***.***.**..
-     0x00000C6C,  // .**...**.**..
-     0x00000C3C,  // .**....****..
-     0x00000C38,  // .**....***...
-     0x00000E7C,  // .***..*****..
-     0x000007EE,  // ..******.***.
-     0x000003C7,  // ...****...***
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 39
-     3, 23,
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-  },
-  {             // 40
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-  },
-  {             // 41
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000010,  // .*....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000010,  // .*....
-  },
-  {             // 42
-     7, 23,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000008,  // ...*...
-     0x00000008,  // ...*...
-     0x0000003E,  // .*****.
-     0x0000001C,  // ..***..
-     0x0000001C,  // ..***..
-     0x00000022,  // .*...*.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 43
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 44
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 45
-     7, 23,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 46
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000008,  // .*...
-     0x00000008,  // .*...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 48
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 49
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x000000F8,  // ..*****...
-     0x000000F8,  // ..*****...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 50
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000006,  // .......**.
-     0x0000000E,  // ......***.
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 51
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000000C,  // ......**..
-     0x00000038,  // ....***...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 52
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x0000000E,  // ......***.
-     0x0000001E,  // .....****.
-     0x00000036,  // ....**.**.
-     0x00000066,  // ...**..**.
-     0x00000066,  // ...**..**.
-     0x000000C6,  // ..**...**.
-     0x00000186,  // .**....**.
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 53
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001F8,  // .******...
-     0x000001FC,  // .*******..
-     0x0000018E,  // .**...***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 54
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 55
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 56
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 57
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 58
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 59
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 60
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x0000001E,  // .....****.
-     0x00000078,  // ...****...
-     0x000000E0,  // ..***.....
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000001E,  // .....****.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 61
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 62
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 63
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     18, 23,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000381C,  // ....***......***..
-     0x0000600C,  // ...**.........**..
-     0x0000C766,  // ..**...***.**..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x00018C66,  // .**...**...**..**.
-     0x000198C6,  // .**..**...**...**.
-     0x000198CC,  // .**..**...**..**..
-     0x000198CC,  // .**..**...**..**..
-     0x00019998,  // .**..**..**..**...
-     0x00019FF0,  // .**..*********....
-     0x0000CEE0,  // ..**..***.***.....
-     0x0000E000,  // ..***.............
-     0x00007000,  // ...***............
-     0x00003FE0,  // ....*********.....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-  },
-  {             // 65
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 66
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C18,  // .**.....**...
-     0x00000FF8,  // .*********...
-     0x00000FFC,  // .**********..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x00000FFC,  // .**********..
-     0x00000FF8,  // .*********...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 67
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 68
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FF8,  // .*********...
-     0x00000FF0,  // .********....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 69
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 70
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 71
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C06,  // .***.......**.
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x0000183E,  // .**.....*****.
-     0x0000183E,  // .**.....*****.
-     0x00001C06,  // .***.......**.
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FE,  // ...**********.
-     0x000001F6,  // .....*****.**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 72
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 73
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 75
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C0E,  // .**......***.
-     0x00000C1C,  // .**.....***..
-     0x00000C38,  // .**....***...
-     0x00000C70,  // .**...***....
-     0x00000CE0,  // .**..***.....
-     0x00000DC0,  // .**.***......
-     0x00000F80,  // .*****.......
-     0x00000FC0,  // .******......
-     0x00000CE0,  // .**..***.....
-     0x00000C70,  // .**...***....
-     0x00000C38,  // .**....***...
-     0x00000C1C,  // .**.....***..
-     0x00000C0E,  // .**......***.
-     0x00000C07,  // .**.......***
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 76
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 77
-     16, 23,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00006C36,  // .**.**....**.**.
-     0x00006C36,  // .**.**....**.**.
-     0x00006666,  // .**..**..**..**.
-     0x00006666,  // .**..**..**..**.
-     0x00006246,  // .**...*..*...**.
-     0x000063C6,  // .**...****...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 78
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x00000F06,  // .****.....**.
-     0x00000F06,  // .****.....**.
-     0x00000D86,  // .**.**....**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000C66,  // .**...**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C36,  // .**....**.**.
-     0x00000C1E,  // .**.....****.
-     0x00000C1E,  // .**.....****.
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 79
-     15, 23,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 81
-     15, 23,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000386E,  // .***....**.***.
-     0x0000186C,  // ..**....**.**..
-     0x00001C3C,  // ..***....****..
-     0x00000FF8,  // ...*********...
-     0x000003EC,  // .....*****.**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 83
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x0000003C,  // .......****..
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 84
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 86
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 87
-     18, 23,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018786,  // .**....****....**.
-     0x0000C78C,  // ..**...****...**..
-     0x0000C48C,  // ..**...*..*...**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006858,  // ...**.*....*.**...
-     0x00003870,  // ....***....***....
-     0x00003030,  // ....**......**....
-     0x00003030,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 88
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 89
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 90
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 91
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000F,  // .****
-     0x0000000F,  // .****
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000F,  // .****
-     0x0000000F,  // .****
-  },
-  {             // 92
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000008,  // .*...
-     0x00000008,  // .*...
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 93
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 94
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x000000C6,  // .**...**.
-     0x00000082,  // .*.....*.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 95
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000003FF,  // **********
-     0x000003FF,  // **********
-  },
-  {             // 96
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 97
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x0000000E,  // .....***.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x00000076,  // ..***.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 98
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 99
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 101
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 102
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x00000070,  // ....***....
-  },
-  {             // 104
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x0000019C,  // .**..***..
-     0x000001BE,  // .**.*****.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C6,  // .**...**.
-     0x000000CC,  // .**..**..
-     0x000000D8,  // .**.**...
-     0x000000F0,  // .****....
-     0x000000F8,  // .*****...
-     0x000000D8,  // .**.**...
-     0x000000CC,  // .**..**..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 108
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000198C,  // .**..**...**..
-     0x00001BDE,  // .**.****.****.
-     0x00001CE6,  // .***..***..**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 110
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000019C,  // .**..***..
-     0x000001BE,  // .**.*****.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 112
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 113
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-  },
-  {             // 114
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 115
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000E,  // ..***.
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001F6,  // .*****.**.
-     0x000000E6,  // ..***..**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D2C,  // ..**.*..*.**..
-     0x00000528,  // ...*.*..*.*...
-     0x00000738,  // ...***..***...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 121
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 122
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-  },
-  {             // 124
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-  },
-  {             // 125
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-  },
-  {             // 126
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000066,  // ...**..**.
-     0x000000FC,  // ..******..
-     0x00000198,  // .**..**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 127
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 23,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 161
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000C03,  // **........**
-     0x00000C33,  // **....**..**
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x00000070,  // .....***....
-  },
-  {             // 162
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000021,  // *....*
-     0x00000033,  // **..**
-     0x0000001E,  // .****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 163
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B0,  // .**.**....
-     0x000001F0,  // .*****....
-     0x000003C0,  // ****......
-     0x00000380,  // ***.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 165
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001802,  // .**.........*.
-     0x00001802,  // .**.........*.
-     0x00001804,  // .**........*..
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001FE0,  // .********.....
-     0x00001FE0,  // .********.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 166
-     13, 23,
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x0000003C,  // .......****..
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 167
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001E0,  // .****.....
-     0x000000F8,  // ..*****...
-     0x000000DC,  // ..**.***..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000E6,  // ..***..**.
-     0x0000007C,  // ...*****..
-     0x0000001C,  // .....***..
-     0x0000000E,  // ......***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-  },
-  {             // 168
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000036,  // **.**.
-     0x00000036,  // **.**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 169
-     13, 23,
-     0x00000000,  // .............
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x0000003C,  // .......****..
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 170
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x00000E0E,  // .***.....***.
-     0x00000C06,  // .**.......**.
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x0000003C,  // .......****..
-     0x0000000E,  // .........***.
-     0x00000006,  // ..........**.
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x000007FC,  // ..*********..
-     0x000003F0,  // ...******....
-     0x000000E0,  // .....***.....
-     0x00000030,  // .......**....
-     0x000001B0,  // ....**.**....
-     0x000001E0,  // ....****.....
-  },
-  {             // 171
-     12, 23,
-     0x00000000,  // ............
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 172
-     12, 23,
-     0x00000000,  // ............
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 173
-     7, 23,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 174
-     12, 23,
-     0x00000000,  // ............
-     0x0000018C,  // ...**...**..
-     0x000000D8,  // ....**.**...
-     0x00000070,  // .....***....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 175
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 176
-     7, 23,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 177
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x0000000E,  // .....***.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x0000007E,  // ..******.
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000038,  // ...***...
-  },
-  {             // 178
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000007,  // ...***
-  },
-  {             // 179
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000007,  // .***
-     0x0000000F,  // ****
-     0x0000000E,  // ***.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 180
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 181
-     8, 23,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000062,  // .**...*.
-     0x00000062,  // .**...*.
-     0x00000064,  // .**..*..
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 182
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 183
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x0000001E,  // .****.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 184
-     5, 23,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000E,  // .***.
-     0x00000003,  // ...**
-     0x0000001B,  // **.**
-     0x0000001E,  // ****.
-  },
-  {             // 185
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 186
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000038,  // ...***...
-     0x0000000C,  // .....**..
-     0x0000006C,  // ..**.**..
-     0x00000078,  // ..****...
-  },
-  {             // 187
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x000000C6,  // ..**...**.
-     0x000000C2,  // ..**....*.
-     0x000000C2,  // ..**....*.
-     0x000003F4,  // ******.*..
-     0x000003F0,  // ******....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000E0,  // ..***.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 188
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 189
-     7, 23,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001B,  // ..**.**
-     0x00000036,  // .**.**.
-     0x0000006C,  // **.**..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 190
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000CC,  // .**..**..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 191
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 192
-     12, 23,
-     0x00000000,  // ............
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 193
-     12, 23,
-     0x00000000,  // ............
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 194
-     12, 23,
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 195
-     12, 23,
-     0x00000000,  // ............
-     0x00000108,  // ...*....*...
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 196
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x00000000,  // ............
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x000000F0,  // ....****....
-     0x000000F0,  // ....****....
-     0x00000198,  // ...**..**...
-     0x00000198,  // ...**..**...
-     0x0000030C,  // ..**....**..
-     0x0000030C,  // ..**....**..
-     0x000003FC,  // ..********..
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 197
-     10, 23,
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 198
-     14, 23,
-     0x00000000,  // ..............
-     0x00000030,  // ........**....
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 199
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x000001C0,  // .....***......
-     0x00000060,  // .......**.....
-     0x00000360,  // ....**.**.....
-     0x000003C0,  // ....****......
-  },
-  {             // 200
-     14, 23,
-     0x00000000,  // ..............
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 201
-     11, 23,
-     0x00000000,  // ...........
-     0x0000000C,  // .......**..
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 202
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x000000C0,  // ...**......
-     0x00000070,  // ....***....
-  },
-  {             // 203
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000CC,  // ...**..**..
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 204
-     11, 23,
-     0x00000000,  // ...........
-     0x00000198,  // ..**..**...
-     0x000000F0,  // ...****....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FC,  // .********..
-     0x000003FC,  // .********..
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 205
-     6, 23,
-     0x00000000,  // ......
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     6, 23,
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 207
-     13, 23,
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FF8,  // .*********...
-     0x00000FF0,  // .********....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 208
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00001F86,  // ******....**.
-     0x00001F86,  // ******....**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x00000C1C,  // .**.....***..
-     0x00000FF8,  // .*********...
-     0x00000FF0,  // .********....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 209
-     13, 23,
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x00000F06,  // .****.....**.
-     0x00000F06,  // .****.....**.
-     0x00000D86,  // .**.**....**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000C66,  // .**...**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C36,  // .**....**.**.
-     0x00000C1E,  // .**.....****.
-     0x00000C1E,  // .**.....****.
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 210
-     13, 23,
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x00000F06,  // .****.....**.
-     0x00000F06,  // .****.....**.
-     0x00000D86,  // .**.**....**.
-     0x00000CC6,  // .**..**...**.
-     0x00000CC6,  // .**..**...**.
-     0x00000C66,  // .**...**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C36,  // .**....**.**.
-     0x00000C1E,  // .**.....****.
-     0x00000C1E,  // .**.....****.
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 211
-     15, 23,
-     0x00000000,  // ...............
-     0x00000030,  // .........**....
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 23,
-     0x00000000,  // ...............
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 23,
-     0x00000000,  // ...............
-     0x000000D8,  // .......**.**...
-     0x000001B0,  // ......**.**....
-     0x00000360,  // .....**.**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 23,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000360,  // .....**.**.....
-     0x00000360,  // .....**.**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000303,  // **......**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 216
-     12, 23,
-     0x00000000,  // ............
-     0x00000198,  // ...**..**...
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 217
-     13, 23,
-     0x000000E0,  // .....***.....
-     0x000001B0,  // ....**.**....
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 218
-     13, 23,
-     0x00000000,  // .............
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 219
-     13, 23,
-     0x00000000,  // .............
-     0x0000006C,  // ......**.**..
-     0x000000D8,  // .....**.**...
-     0x000001B0,  // ....**.**....
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 220
-     13, 23,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000198,  // ....**..**...
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 221
-     14, 23,
-     0x00000000,  // ..............
-     0x00000030,  // ........**....
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000618,  // ...**....**...
-     0x00000618,  // ...**....**...
-     0x00000330,  // ....**..**....
-     0x000001E0,  // .....****.....
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 222
-     12, 23,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000070,  // .....***....
-     0x00000018,  // .......**...
-     0x000000D8,  // ....**.**...
-     0x000000F0,  // ....****....
-  },
-  {             // 223
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DC,  // .**.***..
-     0x000000DC,  // .**.***..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DE,  // .**.****.
-     0x000000DC,  // .**.***..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 224
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 225
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x0000000E,  // .....***.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x00000076,  // ..***.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 226
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x0000003C,  // ...****..
-     0x00000066,  // ..**..**.
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x0000000E,  // .....***.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x00000076,  // ..***.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 227
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000042,  // ..*....*.
-     0x00000066,  // ..**..**.
-     0x0000003C,  // ...****..
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x0000000E,  // .....***.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x00000076,  // ..***.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 228
-     9, 23,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x0000000E,  // .....***.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x00000076,  // ..***.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 229
-     5, 23,
-     0x00000000,  // .....
-     0x00000003,  // ...**
-     0x00000006,  // ..**.
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 230
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 231
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000070,  // ...***....
-     0x00000018,  // .....**...
-     0x000000D8,  // ..**.**...
-     0x000000F0,  // ..****....
-  },
-  {             // 232
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 233
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 234
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000038,  // ....***...
-  },
-  {             // 235
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000006C,  // ...**.**..
-     0x0000006C,  // ...**.**..
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 236
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 237
-     4, 23,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 238
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     14, 23,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000036,  // ........**.**.
-     0x00000036,  // ........**.**.
-     0x00000032,  // ........**..*.
-     0x00000032,  // ........**..*.
-     0x000007B4,  // ...****.**.*..
-     0x00000FF0,  // ..********....
-     0x00000C70,  // ..**...***....
-     0x00001830,  // .**.....**....
-     0x00001830,  // .**.....**....
-     0x00001830,  // .**.....**....
-     0x00001830,  // .**.....**....
-     0x00000C70,  // ..**...***....
-     0x00000FF0,  // ..********....
-     0x000007B0,  // ...****.**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 240
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x0000007E,  // ....******.
-     0x0000007E,  // ....******.
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 241
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x0000019C,  // .**..***..
-     0x000001BE,  // .**.*****.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 242
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x0000019C,  // .**..***..
-     0x000001BE,  // .**.*****.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 243
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 244
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // .....**....
-     0x00000078,  // ....****...
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 245
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000036,  // .....**.**.
-     0x0000006C,  // ....**.**..
-     0x000000D8,  // ...**.**...
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 246
-     11, 23,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 247
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 248
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x0000001E,  // .****.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 249
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000038,  // ....***...
-     0x0000006C,  // ...**.**..
-     0x0000006C,  // ...**.**..
-     0x00000038,  // ....***...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001F6,  // .*****.**.
-     0x000000E6,  // ..***..**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 250
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001F6,  // .*****.**.
-     0x000000E6,  // ..***..**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 251
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000036,  // ....**.**.
-     0x0000006C,  // ...**.**..
-     0x000000D8,  // ..**.**...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001F6,  // .*****.**.
-     0x000000E6,  // ..***..**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001F6,  // .*****.**.
-     0x000000E6,  // ..***..**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 253
-     10, 23,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 254
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000E,  // ..***.
-     0x0000000E,  // ..***.
-     0x0000000E,  // ..***.
-     0x00000003,  // ....**
-     0x0000001B,  // .**.**
-     0x0000001E,  // .****.
-  },
-  {             // 255
-     6, 23,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  };
diff --git a/fontsml-iso8859-5.c b/fontsml-iso8859-5.c
deleted file mode 100644
index 786b07036..000000000
--- a/fontsml-iso8859-5.c
+++ /dev/null
@@ -1,6274 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_5[][27] = {
-  {             // 32
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 33
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000066,  // .**..**.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 35
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000036,  // ....**.**.
-     0x00000036,  // ....**.**.
-     0x0000006C,  // ...**.**..
-     0x000003FF,  // **********
-     0x000003FF,  // **********
-     0x0000006C,  // ...**.**..
-     0x000000D8,  // ..**.**...
-     0x000003FF,  // **********
-     0x000003FF,  // **********
-     0x000000D8,  // ..**.**...
-     0x000001B0,  // .**.**....
-     0x000001B0,  // .**.**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 36
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000D6,  // .**.*.**.
-     0x000000D0,  // .**.*....
-     0x000000F0,  // .****....
-     0x00000078,  // ..****...
-     0x0000003C,  // ...****..
-     0x0000001E,  // ....****.
-     0x000000D6,  // .**.*.**.
-     0x000000D6,  // .**.*.**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x00000010,  // ....*....
-     0x00000010,  // ....*....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 37
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00007830,  // .****.....**....
-     0x0000CC60,  // **..**...**.....
-     0x0000CC60,  // **..**...**.....
-     0x0000CCC0,  // **..**..**......
-     0x0000CD80,  // **..**.**.......
-     0x00007980,  // .****..**.......
-     0x0000033C,  // ......**..****..
-     0x00000366,  // ......**.**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000C66,  // ....**...**..**.
-     0x0000183C,  // ...**.....****..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 38
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ...*****....
-     0x000003F8,  // ..*******...
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x000001F0,  // ...*****....
-     0x000001E0,  // ...****.....
-     0x00000374,  // ..**.***.*..
-     0x00000676,  // .**..***.**.
-     0x0000063C,  // .**...****..
-     0x0000061E,  // .**....****.
-     0x000003FF,  // ..**********
-     0x000001E2,  // ...****...*.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 39
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 40
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 41
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 42
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000008,  // ...*...
-     0x0000003E,  // .*****.
-     0x00000008,  // ...*...
-     0x00000014,  // ..*.*..
-     0x00000036,  // .**.**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 43
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 44
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 45
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 46
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 48
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x000001CE,  // ***..***.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x000001CE,  // ***..***.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 49
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x00000038,  // ...***...
-     0x00000078,  // ..****...
-     0x000000D8,  // .**.**...
-     0x00000098,  // .*..**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 50
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x000001C6,  // ***...**.
-     0x00000186,  // **....**.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x0000001C,  // ....***..
-     0x00000038,  // ...***...
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000001FE,  // ********.
-     0x000001FE,  // ********.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 51
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000001C6,  // ***...**.
-     0x00000006,  // ......**.
-     0x0000003C,  // ...****..
-     0x0000003C,  // ...****..
-     0x0000000E,  // .....***.
-     0x00000006,  // ......**.
-     0x00000186,  // **....**.
-     0x000001CE,  // ***..***.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 52
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000000C,  // .....**..
-     0x0000001C,  // ....***..
-     0x0000001C,  // ....***..
-     0x0000003C,  // ...****..
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x000000CC,  // .**..**..
-     0x0000018C,  // **...**..
-     0x000001FE,  // ********.
-     0x000001FE,  // ********.
-     0x0000000C,  // .....**..
-     0x0000000C,  // .....**..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 53
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FC,  // .******..
-     0x000000FC,  // .******..
-     0x000000C0,  // .**......
-     0x00000180,  // **.......
-     0x000001F8,  // ******...
-     0x000001FC,  // *******..
-     0x0000018E,  // **...***.
-     0x00000006,  // ......**.
-     0x00000186,  // **....**.
-     0x000001CE,  // ***..***.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 54
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x00000180,  // **.......
-     0x000001B8,  // **.***...
-     0x000001FC,  // *******..
-     0x000001CE,  // ***..***.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 55
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000001FE,  // ********.
-     0x000001FE,  // ********.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000060,  // ..**.....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 56
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x000000FC,  // .******..
-     0x000000FC,  // .******..
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 57
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x0000018C,  // **...**..
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x000001CE,  // ***..***.
-     0x000000FE,  // .*******.
-     0x00000076,  // ..***.**.
-     0x00000006,  // ......**.
-     0x0000018C,  // **...**..
-     0x000001FC,  // *******..
-     0x000000F8,  // .*****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 58
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 59
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 60
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000004,  // .......*..
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000380,  // ***.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000004,  // .......*..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 61
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 62
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000200,  // *.........
-     0x00000380,  // ***.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000380,  // ***.......
-     0x00000200,  // *.........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 63
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x0000000E,  // ......***.
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x000007E0,  // ......******.....
-     0x00001FF8,  // ....**********...
-     0x0000381C,  // ...***......***..
-     0x0000776C,  // ..***.***.**.**..
-     0x00006FE6,  // ..**.*******..**.
-     0x0000ECE6,  // .***.**..***..**.
-     0x0000D8E6,  // .**.**...***..**.
-     0x0000D8C6,  // .**.**...**...**.
-     0x0000D8CE,  // .**.**...**..***.
-     0x0000D9DC,  // .**.**..***.***..
-     0x0000DFF8,  // .**.**********...
-     0x00006EF0,  // ..**.***.****....
-     0x00007007,  // ..***.........***
-     0x0000381E,  // ...***......****.
-     0x00001FFC,  // ....***********..
-     0x000007F0,  // ......*******....
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 65
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000003FE,  // .*********.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000603,  // **.......**
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 66
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 67
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000704,  // .***.....*..
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000704,  // .***.....*..
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 68
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F0,  // .*******....
-     0x000007FC,  // .*********..
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000060C,  // .**.....**..
-     0x000007FC,  // .*********..
-     0x000007F0,  // .*******....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 69
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 70
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 71
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F8,  // ....******...
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000E04,  // .***......*..
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C3E,  // .**....*****.
-     0x00000C3E,  // .**....*****.
-     0x00000E06,  // .***......**.
-     0x0000060E,  // ..**.....***.
-     0x000007FE,  // ..**********.
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 72
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 73
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 74
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000186,  // **....**.
-     0x0000018E,  // **...***.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 75
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x0000060E,  // .**.....***.
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000006F0,  // .**.****....
-     0x000007B8,  // .****.***...
-     0x00000718,  // .***...**...
-     0x0000061C,  // .**....***..
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 76
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 77
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000E0E,  // .***.....***.
-     0x00000E0E,  // .***.....***.
-     0x00000F1E,  // .****...****.
-     0x00000F1E,  // .****...****.
-     0x00000D16,  // .**.*...*.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000CE6,  // .**..***..**.
-     0x00000CE6,  // .**..***..**.
-     0x00000CE6,  // .**..***..**.
-     0x00000C46,  // .**...*...**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 78
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x00000786,  // .****....**.
-     0x00000786,  // .****....**.
-     0x000006C6,  // .**.**...**.
-     0x00000666,  // .**..**..**.
-     0x00000666,  // .**..**..**.
-     0x00000636,  // .**...**.**.
-     0x0000061E,  // .**....****.
-     0x0000061E,  // .**....****.
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 79
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x00000E06,  // .***......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 80
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003F8,  // .*******...
-     0x000003FC,  // .********..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000030E,  // .**....***.
-     0x000003FC,  // .********..
-     0x000003F8,  // .*******...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 81
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x00000E06,  // .***......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C6E,  // .**...**.***.
-     0x0000063C,  // ..**...****..
-     0x000007FC,  // ..*********..
-     0x000001EC,  // ....****.**..
-     0x00000006,  // ..........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 82
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F0,  // .*******....
-     0x00000638,  // .**...***...
-     0x0000061C,  // .**....***..
-     0x0000060C,  // .**.....**..
-     0x0000060E,  // .**.....***.
-     0x00000607,  // .**......***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 83
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000038E,  // .***...***.
-     0x00000306,  // .**.....**.
-     0x000003C0,  // .****......
-     0x000001F8,  // ..******...
-     0x0000007C,  // ....*****..
-     0x0000000E,  // .......***.
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 84
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000003FF,  // **********
-     0x000003FF,  // **********
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 85
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x0000070E,  // .***....***.
-     0x000003FC,  // ..********..
-     0x000001F8,  // ...******...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 86
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000603,  // **.......**
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x000001DC,  // ..***.***..
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 87
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00018383,  // **.....***.....**
-     0x0001C387,  // ***....***....***
-     0x0000C7C6,  // .**...*****...**.
-     0x0000C6C6,  // .**...**.**...**.
-     0x0000C6C6,  // .**...**.**...**.
-     0x00006EEC,  // ..**.***.***.**..
-     0x00006C6C,  // ..**.**...**.**..
-     0x00006C6C,  // ..**.**...**.**..
-     0x00003C7C,  // ...****...*****..
-     0x00003838,  // ...***.....***...
-     0x00003838,  // ...***.....***...
-     0x00003838,  // ...***.....***...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 88
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x0000018C,  // ..**...**..
-     0x000000D8,  // ...**.**...
-     0x000000F8,  // ...*****...
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000F8,  // ...*****...
-     0x000000D8,  // ...**.**...
-     0x0000018C,  // ..**...**..
-     0x0000038E,  // .***...***.
-     0x00000306,  // .**.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 89
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000070E,  // .***....***.
-     0x0000030C,  // ..**....**..
-     0x00000198,  // ...**..**...
-     0x000001B8,  // ...**.***...
-     0x000000F0,  // ....****....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 90
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FF,  // .********
-     0x000000FF,  // .********
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x0000001C,  // ....***..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000070,  // ..***....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000001FF,  // *********
-     0x000001FF,  // *********
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 91
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 92
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 93
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000001E,  // .****.
-     0x0000001E,  // .****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 94
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 95
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000001FF,  // *********
-     0x000001FF,  // *********
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 96
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 97
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x0000001E,  // ....****.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x0000007B,  // ..****.**
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 98
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FC,  // .*******..
-     0x000001B8,  // .**.***...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 99
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000E6,  // .***..**.
-     0x0000007E,  // ..******.
-     0x0000003C,  // ...****..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 100
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000076,  // ...***.**.
-     0x000000FE,  // ..*******.
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 101
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x000000C0,  // .**......
-     0x000000E6,  // .***..**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 102
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000F,  // ..****
-     0x0000001F,  // .*****
-     0x00000018,  // .**...
-     0x0000003E,  // *****.
-     0x0000003E,  // *****.
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000076,  // ...***.**.
-     0x000000FE,  // ..*******.
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000000FC,  // ..******..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 104
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 107
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C6,  // .**...**.
-     0x000000CC,  // .**..**..
-     0x000000D8,  // .**.**...
-     0x000000F8,  // .*****...
-     0x000000FC,  // .******..
-     0x000000EC,  // .***.**..
-     0x000000CC,  // .**..**..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 108
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001B9C,  // .**.***..***..
-     0x00001FFE,  // .************.
-     0x00001CE6,  // .***..***..**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 110
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 112
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FC,  // .*******..
-     0x000001B8,  // .**.***...
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 113
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000076,  // ...***.**.
-     0x000000FE,  // ..*******.
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 114
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000037,  // .**.***
-     0x0000003F,  // .******
-     0x00000038,  // .***...
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 115
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x000000F0,  // .****....
-     0x0000007C,  // ..*****..
-     0x0000000E,  // .....***.
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x0000007C,  // ..*****..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000008,  // ..*...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000003E,  // *****.
-     0x0000003E,  // *****.
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000001E,  // .****.
-     0x0000000E,  // ..***.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 119
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000018E3,  // **...***...**
-     0x000018E3,  // **...***...**
-     0x00000CE6,  // .**..***..**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x0000071C,  // ..***...***..
-     0x0000071C,  // ..***...***..
-     0x0000071C,  // ..***...***..
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 120
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x0000006C,  // ..**.**..
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 121
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x000000F8,  // ...*****...
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000060,  // ....**.....
-     0x000001E0,  // ..****.....
-     0x000001C0,  // ..***......
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 122
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x0000000C,  // .....**..
-     0x0000001C,  // ....***..
-     0x00000038,  // ...***...
-     0x00000070,  // ..***....
-     0x00000060,  // ..**.....
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000007,  // ....***
-     0x0000000F,  // ...****
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000038,  // .***...
-     0x00000038,  // .***...
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000F,  // ...****
-     0x00000007,  // ....***
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 124
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 125
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000070,  // ***....
-     0x00000078,  // ****...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000000E,  // ...***.
-     0x0000000E,  // ...***.
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000078,  // ****...
-     0x00000070,  // ***....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 126
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001E2,  // .****...*.
-     0x000003FE,  // *********.
-     0x0000023C,  // *...****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 127
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 25,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 161
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000CC,  // ...**..**..
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 162
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FE0,  // **********.....
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x000006F8,  // ....**.*****...
-     0x000007FC,  // ....*********..
-     0x0000070E,  // ....***....***.
-     0x00000606,  // ....**......**.
-     0x00000606,  // ....**......**.
-     0x0000060E,  // ....**.....***.
-     0x0000067C,  // ....**..*****..
-     0x00000678,  // ....**..****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 163
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000604,  // .**......*..
-     0x00000600,  // .**.........
-     0x000007E0,  // .******.....
-     0x000007E0,  // .******.....
-     0x00000600,  // .**.........
-     0x00000604,  // .**......*..
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 165
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000038E,  // .***...***.
-     0x00000306,  // .**.....**.
-     0x000003C0,  // .****......
-     0x000001F8,  // ..******...
-     0x0000007C,  // ....*****..
-     0x0000000E,  // .......***.
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 166
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 167
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 168
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000186,  // **....**.
-     0x0000018E,  // **...***.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 169
-     19, 25,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x0001FE00,  // ..********.........
-     0x0001FE00,  // ..********.........
-     0x00018600,  // ..**....**.........
-     0x00018600,  // ..**....**.........
-     0x00018600,  // ..**....**.........
-     0x000187F8,  // ..**....********...
-     0x000187FC,  // ..**....*********..
-     0x0001860E,  // ..**....**.....***.
-     0x00018606,  // ..**....**......**.
-     0x0001860E,  // ..**....**.....***.
-     0x000787FC,  // ****....*********..
-     0x000707F8,  // ***.....********...
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 170
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018600,  // .**....**.........
-     0x00018600,  // .**....**.........
-     0x00018600,  // .**....**.........
-     0x00018600,  // .**....**.........
-     0x00018600,  // .**....**.........
-     0x0001FFF8,  // .**************...
-     0x0001FFFC,  // .***************..
-     0x0001860E,  // .**....**.....***.
-     0x00018606,  // .**....**......**.
-     0x0001860E,  // .**....**.....***.
-     0x000187FC,  // .**....*********..
-     0x000187F8,  // .**....********...
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 171
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007FE0,  // **********.....
-     0x00007FE0,  // **********.....
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x000007F8,  // ....********...
-     0x000007FC,  // ....*********..
-     0x0000060E,  // ....**.....***.
-     0x00000606,  // ....**......**.
-     0x00000606,  // ....**......**.
-     0x00000606,  // ....**......**.
-     0x00000606,  // ....**......**.
-     0x00000606,  // ....**......**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 172
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000187,  // .**....***
-     0x0000018F,  // .**...****
-     0x0000019C,  // .**..***..
-     0x00000198,  // .**..**...
-     0x000001B8,  // .**.***...
-     0x000001F0,  // .*****....
-     0x000001F8,  // .******...
-     0x0000019C,  // .**..***..
-     0x0000018C,  // .**...**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000183,  // .**.....**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 173
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 174
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000110,  // ....*...*....
-     0x000000E0,  // .....***.....
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060C,  // ..**.....**..
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x00000040,  // ......*......
-     0x000000C0,  // .....**......
-     0x000003C0,  // ...****......
-     0x00000380,  // ...***.......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 175
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 176
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000003FE,  // .*********.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000603,  // **.......**
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 177
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 178
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 179
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 180
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000FFF,  // ************
-     0x00000FFF,  // ************
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000C03,  // **........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 181
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 182
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000038C7,  // ***...**...***
-     0x00003CCF,  // ****..**..****
-     0x00000CCC,  // ..**..**..**..
-     0x000006DC,  // ...**.**.***..
-     0x000006D8,  // ...**.**.**...
-     0x000003F0,  // ....******....
-     0x000007F8,  // ...********...
-     0x00000EDC,  // ..***.**.***..
-     0x00000CCC,  // ..**..**..**..
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000030C3,  // **....**....**
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 183
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x000003FC,  // .********..
-     0x0000070E,  // ***....***.
-     0x00000206,  // .*......**.
-     0x0000000C,  // .......**..
-     0x00000038,  // .....***...
-     0x0000003C,  // .....****..
-     0x00000006,  // ........**.
-     0x00000206,  // .*......**.
-     0x0000070E,  // ***....***.
-     0x000003FC,  // .********..
-     0x000001F8,  // ..******...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 184
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000061E,  // .**....****.
-     0x0000061E,  // .**....****.
-     0x00000636,  // .**...**.**.
-     0x00000666,  // .**..**..**.
-     0x00000666,  // .**..**..**.
-     0x000006C6,  // .**.**...**.
-     0x00000786,  // .****....**.
-     0x00000786,  // .****....**.
-     0x00000706,  // .***.....**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 185
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000088,  // ....*...*...
-     0x00000070,  // .....***....
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x0000061E,  // .**....****.
-     0x0000061E,  // .**....****.
-     0x00000636,  // .**...**.**.
-     0x00000666,  // .**..**..**.
-     0x00000666,  // .**..**..**.
-     0x000006C6,  // .**.**...**.
-     0x00000786,  // .****....**.
-     0x00000786,  // .****....**.
-     0x00000706,  // .***.....**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 186
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000187,  // .**....***
-     0x0000018F,  // .**...****
-     0x0000019C,  // .**..***..
-     0x00000198,  // .**..**...
-     0x000001B8,  // .**.***...
-     0x000001F0,  // .*****....
-     0x000001F8,  // .******...
-     0x0000019C,  // .**..***..
-     0x0000018C,  // .**...**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000183,  // .**.....**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 187
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000306,  // ..**.....**.
-     0x00000F06,  // ****.....**.
-     0x00000E06,  // ***......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 188
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000E0E,  // .***.....***.
-     0x00000E0E,  // .***.....***.
-     0x00000F1E,  // .****...****.
-     0x00000F1E,  // .****...****.
-     0x00000D16,  // .**.*...*.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000CE6,  // .**..***..**.
-     0x00000CE6,  // .**..***..**.
-     0x00000CE6,  // .**..***..**.
-     0x00000C46,  // .**...*...**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 189
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 190
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001F0,  // ....*****....
-     0x000007FC,  // ..*********..
-     0x0000060C,  // ..**.....**..
-     0x00000E06,  // .***......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 191
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 192
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003F8,  // .*******...
-     0x000003FC,  // .********..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000030E,  // .**....***.
-     0x000003FC,  // .********..
-     0x000003F8,  // .*******...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 193
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FC,  // ..********..
-     0x0000030E,  // ..**....***.
-     0x00000704,  // .***.....*..
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000704,  // .***.....*..
-     0x0000030E,  // ..**....***.
-     0x000003FC,  // ..********..
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 194
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000003FF,  // **********
-     0x000003FF,  // **********
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 195
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E0E,  // .***.....***.
-     0x0000060C,  // ..**.....**..
-     0x00000318,  // ...**...**...
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000001F0,  // ....*****....
-     0x000000E0,  // .....***.....
-     0x00000040,  // ......*......
-     0x000000C0,  // .....**......
-     0x000003C0,  // ...****......
-     0x00000380,  // ...***.......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 196
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000003F0,  // ....******....
-     0x00000FFC,  // ..**********..
-     0x00000CCC,  // ..**..**..**..
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000CCC,  // ..**..**..**..
-     0x00000FFC,  // ..**********..
-     0x000003F0,  // ....******....
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 197
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x0000018C,  // ..**...**..
-     0x000000D8,  // ...**.**...
-     0x000000F8,  // ...*****...
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x000000F8,  // ...*****...
-     0x000000D8,  // ...**.**...
-     0x0000018C,  // ..**...**..
-     0x0000038E,  // .***...***.
-     0x00000306,  // .**.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 198
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007FF,  // .***********
-     0x000007FF,  // .***********
-     0x00000003,  // ..........**
-     0x00000003,  // ..........**
-     0x00000003,  // ..........**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 199
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x000003FE,  // ..*********.
-     0x000001FE,  // ...********.
-     0x00000006,  // .........**.
-     0x00000006,  // .........**.
-     0x00000006,  // .........**.
-     0x00000006,  // .........**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 200
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00007FFE,  // .**************.
-     0x00007FFE,  // .**************.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 201
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00007FFF,  // .***************
-     0x00007FFF,  // .***************
-     0x00000003,  // ..............**
-     0x00000003,  // ..............**
-     0x00000003,  // ..............**
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 202
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00007E00,  // ******.........
-     0x00007E00,  // ******.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x00000600,  // ....**.........
-     0x000007F8,  // ....********...
-     0x000007FC,  // ....*********..
-     0x0000060E,  // ....**.....***.
-     0x00000606,  // ....**......**.
-     0x0000060E,  // ....**.....***.
-     0x000007FC,  // ....*********..
-     0x000007F8,  // ....********...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 203
-     17, 25,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000C006,  // .**...........**.
-     0x0000FF06,  // .********.....**.
-     0x0000FF86,  // .*********....**.
-     0x0000C1C6,  // .**.....***...**.
-     0x0000C0C6,  // .**......**...**.
-     0x0000C1C6,  // .**.....***...**.
-     0x0000FF86,  // .*********....**.
-     0x0000FF06,  // .********.....**.
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 204
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007F8,  // .********...
-     0x000007FC,  // .*********..
-     0x0000060E,  // .**.....***.
-     0x00000606,  // .**......**.
-     0x0000060E,  // .**.....***.
-     0x000007FC,  // .*********..
-     0x000007F8,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 205
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001F0,  // ...*****....
-     0x000003F8,  // ..*******...
-     0x0000070C,  // .***....**..
-     0x00000206,  // ..*......**.
-     0x00000006,  // .........**.
-     0x0000007E,  // .....******.
-     0x0000007E,  // .....******.
-     0x00000006,  // .........**.
-     0x00000206,  // ..*......**.
-     0x0000070C,  // .***....**..
-     0x000003FC,  // ..********..
-     0x000001F0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 206
-     18, 25,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000181F0,  // .**......*****....
-     0x000187FC,  // .**....*********..
-     0x0001860C,  // .**....**.....**..
-     0x00018C06,  // .**...**.......**.
-     0x00018C06,  // .**...**.......**.
-     0x0001FC06,  // .*******.......**.
-     0x0001FC06,  // .*******.......**.
-     0x00018C06,  // .**...**.......**.
-     0x00018C06,  // .**...**.......**.
-     0x0001860C,  // .**....**.....**..
-     0x000187FC,  // .**....*********..
-     0x000181F0,  // .**......*****....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 207
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FE,  // ...********.
-     0x000003FE,  // ..*********.
-     0x00000706,  // .***.....**.
-     0x00000606,  // .**......**.
-     0x00000706,  // .***.....**.
-     0x000003FE,  // ..*********.
-     0x000000FE,  // ....*******.
-     0x000001C6,  // ...***...**.
-     0x00000386,  // ..***....**.
-     0x00000306,  // ..**.....**.
-     0x00000706,  // .***.....**.
-     0x00000E06,  // ***......**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 208
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x0000001E,  // ....****.
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x0000007B,  // ..****.**
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 209
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FE,  // ...*******.
-     0x000001FC,  // ..*******..
-     0x00000380,  // .***.......
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038E,  // .***...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 210
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FC,  // .*******..
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000001FC,  // .*******..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 211
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000003F,  // .******
-     0x0000003F,  // .******
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 212
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x0000030C,  // .**....**..
-     0x000007FE,  // **********.
-     0x000007FE,  // **********.
-     0x00000606,  // **......**.
-     0x00000606,  // **......**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 213
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x000000C0,  // .**......
-     0x000000E6,  // .***..**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 214
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000E67,  // ***..**..***
-     0x00000F6F,  // ****.**.****
-     0x0000036C,  // ..**.**.**..
-     0x000001F8,  // ...******...
-     0x000001F8,  // ...******...
-     0x0000036C,  // ..**.**.**..
-     0x00000666,  // .**..**..**.
-     0x00000666,  // .**..**..**.
-     0x00000C63,  // **...**...**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 215
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007E,  // .******.
-     0x00000066,  // .**..**.
-     0x0000000C,  // ....**..
-     0x0000000C,  // ....**..
-     0x00000006,  // .....**.
-     0x00000066,  // .**..**.
-     0x0000007E,  // .******.
-     0x0000003C,  // ..****..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 216
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x0000019E,  // .**..****.
-     0x0000019E,  // .**..****.
-     0x000001B6,  // .**.**.**.
-     0x000001E6,  // .****..**.
-     0x000001E6,  // .****..**.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 217
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000044,  // ...*...*..
-     0x00000038,  // ....***...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x0000019E,  // .**..****.
-     0x0000019E,  // .**..****.
-     0x000001B6,  // .**.**.**.
-     0x000001E6,  // .****..**.
-     0x000001E6,  // .****..**.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 218
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C7,  // .**...***
-     0x000000CF,  // .**..****
-     0x000000CC,  // .**..**..
-     0x000000DC,  // .**.***..
-     0x000000F8,  // .*****...
-     0x000000FC,  // .******..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 219
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FE,  // ..********.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000186,  // ..**....**.
-     0x00000786,  // ****....**.
-     0x00000706,  // ***.....**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 220
-     13, 25,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000E0E,  // .***.....***.
-     0x00000E0E,  // .***.....***.
-     0x00000F1E,  // .****...****.
-     0x00000F1E,  // .****...****.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000DB6,  // .**.**.**.**.
-     0x00000CE6,  // .**..***..**.
-     0x00000CE6,  // .**..***..**.
-     0x00000C46,  // .**...*...**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 221
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 222
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 223
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 224
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FC,  // .*******..
-     0x000001B8,  // .**.***...
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 225
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000E6,  // .***..**.
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000E6,  // .***..**.
-     0x0000007E,  // ..******.
-     0x0000003C,  // ...****..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 226
-     8, 25,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x000000FF,  // ********
-     0x000000FF,  // ********
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 227
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x000000F8,  // ...*****...
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000060,  // ....**.....
-     0x000001E0,  // ..****.....
-     0x000001C0,  // ..***......
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 228
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00001DB8,  // ...***.**.***...
-     0x00003FFC,  // ..************..
-     0x000073CE,  // .***..****..***.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x000073CE,  // .***..****..***.
-     0x00003FFC,  // ..************..
-     0x00001DB8,  // ...***.**.***...
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 229
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C6,  // .**...**.
-     0x000000EE,  // .***.***.
-     0x0000006C,  // ..**.**..
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x000000EE,  // .***.***.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 230
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 231
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000000FE,  // ..*******.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 232
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00001FFE,  // .************.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 233
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00001FFF,  // .*************
-     0x00001FFF,  // .*************
-     0x00000003,  // ............**
-     0x00000003,  // ............**
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 234
-     12, 25,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007C0,  // .*****......
-     0x000007C0,  // .*****......
-     0x000000C0,  // ....**......
-     0x000000C0,  // ....**......
-     0x000000FC,  // ....******..
-     0x000000FE,  // ....*******.
-     0x000000C6,  // ....**...**.
-     0x000000FE,  // ....*******.
-     0x000000FC,  // ....******..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 235
-     14, 25,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001FC6,  // .*******...**.
-     0x00001FE6,  // .********..**.
-     0x00001866,  // .**....**..**.
-     0x00001866,  // .**....**..**.
-     0x00001FE6,  // .********..**.
-     0x00001FC6,  // .*******...**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 236
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FC,  // .*******..
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000001FC,  // .*******..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 237
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x0000001E,  // ....****.
-     0x0000001E,  // ....****.
-     0x00000006,  // ......**.
-     0x000000CE,  // .**..***.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 238
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000030F8,  // .**....*****...
-     0x000031FC,  // .**...*******..
-     0x0000338E,  // .**..***...***.
-     0x00003306,  // .**..**.....**.
-     0x00003F06,  // .******.....**.
-     0x00003F06,  // .******.....**.
-     0x0000338E,  // .**..***...***.
-     0x000031FC,  // .**...*******..
-     0x000030F8,  // .**....*****...
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 239
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FE,  // ..*******.
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000000FE,  // ..*******.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000386,  // ***....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 240
-     19, 25,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00030600,  // .**.....**.........
-     0x00038638,  // .***....**...***...
-     0x0003867C,  // .***....**..*****..
-     0x0003C6C6,  // .****...**.**...**.
-     0x000366C6,  // .**.**..**.**...**.
-     0x000366C6,  // .**.**..**.**...**.
-     0x0003367C,  // .**..**.**..*****..
-     0x00033638,  // .**..**.**...***...
-     0x00031E00,  // .**...****.........
-     0x00030EFE,  // .**....***.*******.
-     0x00030EFE,  // .**....***.*******.
-     0x00030600,  // .**.....**.........
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-  },
-  {             // 241
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000066,  // ..**..**.
-     0x00000066,  // ..**..**.
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x000000C0,  // .**......
-     0x000000E6,  // .***..**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 242
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000003F0,  // ******....
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000006,  // .......**.
-     0x0000001E,  // .....****.
-     0x0000001C,  // .....***..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 243
-     7, 25,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000000,  // .......
-     0x0000003F,  // .******
-     0x0000003F,  // .******
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 244
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000F0,  // .****....
-     0x000000F0,  // .****....
-     0x000000C0,  // .**......
-     0x000000E6,  // .***..**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 245
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000007C,  // ..*****..
-     0x000000FE,  // .*******.
-     0x000000C6,  // .**...**.
-     0x000000F0,  // .****....
-     0x0000007C,  // ..*****..
-     0x0000000E,  // .....***.
-     0x000000C6,  // .**...**.
-     0x000000FE,  // .*******.
-     0x0000007C,  // ..*****..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 246
-     4, 25,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 247
-     6, 25,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 248
-     5, 25,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 249
-     16, 25,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003F80,  // ..*******.......
-     0x00003F80,  // ..*******.......
-     0x00003180,  // ..**...**.......
-     0x000031FC,  // ..**...*******..
-     0x000031FE,  // ..**...********.
-     0x00003186,  // ..**...**....**.
-     0x00003186,  // ..**...**....**.
-     0x0000F1FE,  // ****...********.
-     0x0000E1FC,  // ***....*******..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 250
-     15, 25,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003180,  // .**...**.......
-     0x00003180,  // .**...**.......
-     0x00003180,  // .**...**.......
-     0x00003FFC,  // .************..
-     0x00003FFE,  // .*************.
-     0x00003186,  // .**...**....**.
-     0x00003186,  // .**...**....**.
-     0x000031FE,  // .**...********.
-     0x000031FC,  // .**...*******..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 251
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000003F0,  // ******....
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x000000C7,  // .**...***
-     0x000000CF,  // .**..****
-     0x000000CC,  // .**..**..
-     0x000000DC,  // .**.***..
-     0x000000F8,  // .*****...
-     0x000000FC,  // .******..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 253
-     9, 25,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000078,  // ..****...
-     0x000000FC,  // .******..
-     0x000000CC,  // .**..**..
-     0x000000E0,  // .***.....
-     0x00000070,  // ..***....
-     0x000000F8,  // .*****...
-     0x0000019C,  // **..***..
-     0x0000018E,  // **...***.
-     0x000001C6,  // ***...**.
-     0x000000E6,  // .***..**.
-     0x0000007C,  // ..*****..
-     0x00000038,  // ...***...
-     0x0000001C,  // ....***..
-     0x000000CC,  // .**..**..
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 254
-     11, 25,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000088,  // ...*...*...
-     0x00000070,  // ....***....
-     0x00000000,  // ...........
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x0000018C,  // ..**...**..
-     0x000000D8,  // ...**.**...
-     0x000000D8,  // ...**.**...
-     0x000000F8,  // ...*****...
-     0x00000070,  // ....***....
-     0x00000070,  // ....***....
-     0x00000060,  // ....**.....
-     0x000001E0,  // ..****.....
-     0x000001C0,  // ..***......
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 255
-     10, 25,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  };
diff --git a/fontsml-iso8859-7.c b/fontsml-iso8859-7.c
deleted file mode 100644
index a95f8f10d..000000000
--- a/fontsml-iso8859-7.c
+++ /dev/null
@@ -1,5154 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_7[][22] = {
-  {             // 32
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 33
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 34
-     7, 20,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000036,  // .**.**.
-     0x00000026,  // .*..**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 35
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000044,  // ....*...*..
-     0x000000C4,  // ...**...*..
-     0x000000CC,  // ...**..**..
-     0x0000008C,  // ...*...**..
-     0x000007FE,  // **********.
-     0x00000088,  // ...*...*...
-     0x00000188,  // ..**...*...
-     0x00000188,  // ..**...*...
-     0x00000118,  // ..*...**...
-     0x000007FE,  // **********.
-     0x00000110,  // ..*...*....
-     0x00000310,  // .**...*....
-     0x00000330,  // .**..**....
-     0x00000230,  // .*...**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 36
-     10, 20,
-     0x00000000,  // ..........
-     0x00000010,  // .....*....
-     0x00000038,  // ....***...
-     0x000000FE,  // ..*******.
-     0x00000193,  // .**..*..**
-     0x00000193,  // .**..*..**
-     0x00000190,  // .**..*....
-     0x000001D0,  // .***.*....
-     0x000000F8,  // ..*****...
-     0x0000003E,  // ....*****.
-     0x00000017,  // .....*.***
-     0x00000013,  // .....*..**
-     0x00000193,  // .**..*..**
-     0x00000193,  // .**..*..**
-     0x000000D6,  // ..**.*.**.
-     0x0000007C,  // ...*****..
-     0x00000010,  // .....*....
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 37
-     17, 20,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00007810,  // ..****......*....
-     0x0000CC20,  // .**..**....*.....
-     0x0000CC20,  // .**..**....*.....
-     0x0000CC40,  // .**..**...*......
-     0x0000CC40,  // .**..**...*......
-     0x0000CC80,  // .**..**..*.......
-     0x00007880,  // ..****...*.......
-     0x0000013C,  // ........*..****..
-     0x00000326,  // .......**..*..**.
-     0x00000262,  // .......*..**...*.
-     0x00000662,  // ......**..**...*.
-     0x00000462,  // ......*...**...*.
-     0x00000826,  // .....*.....*..**.
-     0x0000083C,  // .....*.....****..
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 38
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F0,  // ....****....
-     0x000001B8,  // ...**.***...
-     0x00000318,  // ..**...**...
-     0x00000318,  // ..**...**...
-     0x00000198,  // ...**..**...
-     0x000001F0,  // ...*****....
-     0x000001C0,  // ...***......
-     0x00000360,  // ..**.**.....
-     0x00000634,  // .**...**.*..
-     0x0000043E,  // .*....*****.
-     0x00000C1C,  // **.....***..
-     0x0000060C,  // .**.....**..
-     0x0000061E,  // .**....****.
-     0x000003F3,  // ..******..**
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 39
-     4, 20,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000004,  // .*..
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 40
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000008,  // ..*...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000002,  // ....*.
-     0x00000003,  // ....**
-  },
-  {             // 41
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000008,  // ..*...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000003,  // ....**
-     0x00000002,  // ....*.
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-  },
-  {             // 42
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000018,  // ...**...
-     0x0000001A,  // ...**.*.
-     0x0000007E,  // .******.
-     0x00000018,  // ...**...
-     0x0000002C,  // ..*.**..
-     0x00000024,  // ..*..*..
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 43
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // .....**....
-     0x00000030,  // .....**....
-     0x00000030,  // .....**....
-     0x00000030,  // .....**....
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000030,  // .....**....
-     0x00000030,  // .....**....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 44
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 45
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001F,  // .*****
-     0x0000001F,  // .*****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 46
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000002,  // ....*.
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x00000018,  // .**...
-     0x00000010,  // .*....
-     0x00000010,  // .*....
-     0x00000010,  // .*....
-     0x00000030,  // **....
-     0x00000020,  // *.....
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 48
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x000000C2,  // ..**....*.
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000082,  // ..*.....*.
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 49
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000008,  // ......*...
-     0x00000018,  // .....**...
-     0x00000078,  // ...****...
-     0x000000F8,  // ..*****...
-     0x00000098,  // ..*..**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 50
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000E6,  // ..***..**.
-     0x00000183,  // .**.....**
-     0x00000181,  // .**......*
-     0x00000001,  // .........*
-     0x00000003,  // ........**
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 51
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000038,  // ....***...
-     0x0000006C,  // ...**.**..
-     0x000000C6,  // ..**...**.
-     0x000000C6,  // ..**...**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x000000C3,  // ..**....**
-     0x00000046,  // ...*...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 52
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000001C,  // .....***..
-     0x0000003C,  // ....****..
-     0x0000006C,  // ...**.**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000018C,  // .**...**..
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 53
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007E,  // ...******.
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000BC,  // ..*.****..
-     0x000000FE,  // ..*******.
-     0x00000183,  // .**.....**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000183,  // .**.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 54
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000003C,  // ....****..
-     0x0000006E,  // ...**.***.
-     0x000000C3,  // ..**....**
-     0x00000083,  // ..*.....**
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000083,  // ..*.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 55
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FF,  // .*********
-     0x000001FE,  // .********.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000008,  // ......*...
-     0x00000018,  // .....**...
-     0x00000010,  // .....*....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 56
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x000000E6,  // ..***..**.
-     0x000001C3,  // .***....**
-     0x00000181,  // .**......*
-     0x00000181,  // .**......*
-     0x00000183,  // .**.....**
-     0x000000C2,  // ..**....*.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 57
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000EE,  // ..***.***.
-     0x000001C2,  // .***....*.
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C7,  // ..**...***
-     0x0000007B,  // ...****.**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000082,  // ..*.....*.
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 58
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 59
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000002,  // ...*.
-     0x00000002,  // ...*.
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-  },
-  {             // 60
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x0000001E,  // ......****.
-     0x00000070,  // ....***....
-     0x000003C0,  // .****......
-     0x00000300,  // .**........
-     0x000001C0,  // ..***......
-     0x00000078,  // ....****...
-     0x0000001E,  // ......****.
-     0x00000002,  // .........*.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 61
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 62
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000200,  // .*.........
-     0x000003C0,  // .****......
-     0x000000F0,  // ...****....
-     0x0000001E,  // ......****.
-     0x00000006,  // ........**.
-     0x0000003C,  // .....****..
-     0x000000F0,  // ...****....
-     0x00000380,  // .***.......
-     0x00000200,  // .*.........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 63
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000003,  // ........**
-     0x00000007,  // .......***
-     0x0000000E,  // ......***.
-     0x00000018,  // .....**...
-     0x00000010,  // .....*....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     19, 20,
-     0x00000000,  // ...................
-     0x00000000,  // ...................
-     0x00000FC0,  // .......******......
-     0x00003CF0,  // .....****..****....
-     0x00006018,  // ....**........**...
-     0x0000C00C,  // ...**..........**..
-     0x00018F66,  // ..**...****.**..**.
-     0x000198E6,  // ..**..**...***..**.
-     0x000330C2,  // .**..**....**....*.
-     0x000320C2,  // .**..*.....**....*.
-     0x000360C6,  // .**.**.....**...**.
-     0x000360C6,  // .**.**.....**...**.
-     0x0003608C,  // .**.**.....*...**..
-     0x00033198,  // .**..**...**..**...
-     0x00033FF0,  // .**..**********....
-     0x00018CE2,  // ..**...**..***...*.
-     0x00018006,  // ..**............**.
-     0x0000E00C,  // ...***.........**..
-     0x00007838,  // ....****.....***...
-     0x00000FE0,  // .......*******.....
-  },
-  {             // 65
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000E0,  // ......***.....
-     0x000001E0,  // .....****.....
-     0x00000120,  // .....*..*.....
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000218,  // ....*....**...
-     0x00000618,  // ...**....**...
-     0x000007FC,  // ...*********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000806,  // ..*........**.
-     0x00001806,  // .**........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 66
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x0000061C,  // .**....***..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007F8,  // .********...
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000606,  // .**......**.
-     0x000007FE,  // .**********.
-     0x000007F8,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 67
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000F8,  // .....*****...
-     0x000003FC,  // ...********..
-     0x00000706,  // ..***.....**.
-     0x00000606,  // ..**......**.
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000C00,  // .**..........
-     0x00000602,  // ..**.......*.
-     0x00000606,  // ..**......**.
-     0x0000030C,  // ...**....**..
-     0x000001F8,  // ....******...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 68
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF8,  // .*********...
-     0x00000FFC,  // .**********..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000FFC,  // .**********..
-     0x00000FF0,  // .********....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 69
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007F8,  // .********...
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 70
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003F8,  // .*******...
-     0x000003F8,  // .*******...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 71
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FF8,  // ...*********...
-     0x00001C0C,  // ..***......**..
-     0x00001806,  // ..**........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000303E,  // .**......*****.
-     0x0000303E,  // .**......*****.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 73
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 74
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000006,  // ......**.
-     0x00000186,  // **....**.
-     0x00000186,  // **....**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 75
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000006E0,  // .**.***.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000618,  // .**....**...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000607,  // .**......***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 76
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 77
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001C07,  // .***.......***
-     0x00001E07,  // .****......***
-     0x00001E0F,  // .****.....****
-     0x00001B0F,  // .**.**....****
-     0x00001B1B,  // .**.**...**.**
-     0x0000199B,  // .**..**..**.**
-     0x000019B3,  // .**..**.**..**
-     0x000018E3,  // .**...***...**
-     0x000018E3,  // .**...***...**
-     0x00001843,  // .**....*....**
-     0x00001803,  // .**.........**
-     0x00001803,  // .**.........**
-     0x00001803,  // .**.........**
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 78
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x00000F06,  // .****.....**.
-     0x00000D86,  // .**.**....**.
-     0x00000D86,  // .**.**....**.
-     0x00000CC6,  // .**..**...**.
-     0x00000C66,  // .**...**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C36,  // .**....**.**.
-     0x00000C1E,  // .**.....****.
-     0x00000C1E,  // .**.....****.
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 79
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x0000061E,  // .**....****.
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000607,  // .**......***
-     0x000007FE,  // .**********.
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 81
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000186C,  // ..**....**.**..
-     0x00001C3C,  // ..***....****..
-     0x00000FFC,  // ...**********..
-     0x000003E6,  // .....*****..**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF8,  // .**********...
-     0x0000180C,  // .**.......**..
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x0000180E,  // .**.......***.
-     0x00001FFC,  // .***********..
-     0x00001FE0,  // .********.....
-     0x00001830,  // .**.....**....
-     0x00001830,  // .**.....**....
-     0x00001818,  // .**......**...
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001806,  // .**........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 83
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000000F8,  // ....*****...
-     0x000003FE,  // ..*********.
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000600,  // .**.........
-     0x00000380,  // ..***.......
-     0x000001F8,  // ...******...
-     0x0000001E,  // .......****.
-     0x00000003,  // ..........**
-     0x00000601,  // .**........*
-     0x00000601,  // .**........*
-     0x00000303,  // ..**......**
-     0x000003FE,  // ..*********.
-     0x000000F8,  // ....*****...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 84
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x000007FC,  // ..*********..
-     0x000001F0,  // ....*****....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 86
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00000C06,  // .**.......**.
-     0x00000C04,  // .**.......*..
-     0x00000C0C,  // .**......**..
-     0x00000608,  // ..**.....*...
-     0x00000618,  // ..**....**...
-     0x00000218,  // ...*....**...
-     0x00000310,  // ...**...*....
-     0x00000330,  // ...**..**....
-     0x00000120,  // ....*..*.....
-     0x000001E0,  // ....****.....
-     0x000000E0,  // .....***.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 87
-     18, 20,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00030306,  // **......**.....**.
-     0x00010706,  // .*.....***.....**.
-     0x00018786,  // .**....****....**.
-     0x00018584,  // .**....*.**....*..
-     0x00018C8C,  // .**...**..*...**..
-     0x00008CCC,  // ..*...**..**..**..
-     0x0000C8CC,  // ..**..*...**..**..
-     0x0000C8C8,  // ..**..*...**..*...
-     0x00005858,  // ...*.**....*.**...
-     0x00005878,  // ...*.**....****...
-     0x00007070,  // ...***.....***....
-     0x00007030,  // ...***......**....
-     0x00003030,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 88
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x00000318,  // ...**...**...
-     0x00000330,  // ...**..**....
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001E0,  // ....****.....
-     0x000003B0,  // ...***.**....
-     0x00000318,  // ...**...**...
-     0x00000618,  // ..**....**...
-     0x00000C0C,  // .**......**..
-     0x00001C06,  // ***.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 89
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001C06,  // ***.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000718,  // ..***...**...
-     0x00000330,  // ...**..**....
-     0x000001A0,  // ....**.*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 90
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FF,  // .**********
-     0x000003FF,  // .**********
-     0x00000006,  // ........**.
-     0x0000000C,  // .......**..
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000070,  // ....***....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000180,  // ..**.......
-     0x00000300,  // .**........
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 91
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000F,  // .****
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000F,  // .****
-  },
-  {             // 92
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000020,  // *.....
-     0x00000030,  // **....
-     0x00000010,  // .*....
-     0x00000010,  // .*....
-     0x00000010,  // .*....
-     0x00000018,  // .**...
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000002,  // ....*.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 93
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-  },
-  {             // 94
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000030,  // ...**....
-     0x00000038,  // ...***...
-     0x00000028,  // ...*.*...
-     0x0000006C,  // ..**.**..
-     0x0000004C,  // ..*..**..
-     0x000000C4,  // .**...*..
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 95
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FF,  // .***********
-  },
-  {             // 96
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 97
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000FC,  // ...******..
-     0x000001CE,  // ..***..***.
-     0x00000306,  // .**.....**.
-     0x00000006,  // ........**.
-     0x0000007E,  // ....******.
-     0x000001F6,  // ..*****.**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000030E,  // .**....***.
-     0x000001F2,  // ..*****..*.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 98
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001EE,  // .****.***.
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000001C6,  // .***...**.
-     0x000001BC,  // .**.****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 99
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x000001C2,  // .***....*.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000182,  // .**.....*.
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x0000007B,  // ...****.**
-     0x000000EF,  // ..***.****
-     0x00000083,  // ..*.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C7,  // ..**...***
-     0x0000007F,  // ...*******
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 101
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001CC,  // ..***..**..
-     0x00000106,  // ..*.....**.
-     0x00000306,  // .**.....**.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 102
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000E,  // ..***.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000001F,  // .*****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007B,  // ...****.**
-     0x000000C7,  // ..**...***
-     0x00000083,  // ..*.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000EF,  // ..***.****
-     0x0000007B,  // ...****.**
-     0x00000003,  // ........**
-     0x00000183,  // .**.....**
-     0x000001C6,  // .***...**.
-     0x0000007C,  // ...*****..
-  },
-  {             // 104
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BE,  // .**.*****.
-     0x000001E7,  // .****..***
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 20,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x0000018C,  // .**...**..
-     0x00000198,  // .**..**...
-     0x000001B0,  // .**.**....
-     0x000001F0,  // .*****....
-     0x000001F0,  // .*****....
-     0x00000198,  // .**..**...
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 108
-     4, 20,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     16, 20,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006F3C,  // .**.****..****..
-     0x000071C6,  // .***...***...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BE,  // .**.*****.
-     0x000001E7,  // .****..***
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 112
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001C6,  // .***...**.
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000001C6,  // .***...**.
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-  },
-  {             // 113
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007B,  // ...****.**
-     0x000000C7,  // ..**...***
-     0x00000083,  // ..*.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000083,  // ..*.....**
-     0x000000C7,  // ..**...***
-     0x0000007F,  // ...*******
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-  },
-  {             // 114
-     7, 20,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000036,  // .**.**.
-     0x0000003E,  // .*****.
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000030,  // .**....
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 115
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x000000E7,  // .***..***
-     0x000000C3,  // .**....**
-     0x000000C0,  // .**......
-     0x0000007C,  // ..*****..
-     0x0000003E,  // ...*****.
-     0x00000003,  // .......**
-     0x000000C1,  // .**.....*
-     0x000000C3,  // .**....**
-     0x0000007E,  // ..******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000001F,  // .*****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x00000007,  // ...***
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C7,  // ..**...***
-     0x000000FB,  // ..*****.**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000306,  // **.....**.
-     0x00000106,  // .*.....**.
-     0x00000184,  // .**....*..
-     0x0000008C,  // ..*...**..
-     0x000000C8,  // ..**..*...
-     0x000000D8,  // ..**.**...
-     0x00000058,  // ...*.**...
-     0x00000070,  // ...***....
-     0x00000070,  // ...***....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000030C2,  // **....**....*.
-     0x000011C6,  // .*...***...**.
-     0x000011C6,  // .*...***...**.
-     0x00001944,  // .**..*.*...*..
-     0x0000196C,  // .**..*.**.**..
-     0x00000B6C,  // ..*.**.**.**..
-     0x00000B28,  // ..*.**..*.*...
-     0x00000E28,  // ..***...*.*...
-     0x00000638,  // ...**...***...
-     0x00000630,  // ...**...**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x0000018C,  // .**...**..
-     0x000000D8,  // ..**.**...
-     0x00000070,  // ...***....
-     0x00000070,  // ...***....
-     0x00000070,  // ...***....
-     0x00000058,  // ...*.**...
-     0x000000C8,  // ..**..*...
-     0x0000018C,  // .**...**..
-     0x00000306,  // **.....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 121
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000306,  // **.....**.
-     0x00000186,  // .**....**.
-     0x00000184,  // .**....*..
-     0x0000008C,  // ..*...**..
-     0x000000C8,  // ..**..*...
-     0x000000D8,  // ..**.**...
-     0x00000058,  // ...*.**...
-     0x00000070,  // ...***....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000020,  // ....*.....
-     0x00000060,  // ...**.....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-  },
-  {             // 122
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000001FF,  // *********
-     0x00000006,  // ......**.
-     0x00000004,  // ......*..
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x00000080,  // .*.......
-     0x000001FF,  // *********
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     7, 20,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000007,  // ....***
-     0x00000007,  // ....***
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000008,  // ...*...
-     0x00000010,  // ..*....
-     0x00000008,  // ...*...
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x0000000C,  // ...**..
-     0x00000004,  // ....*..
-     0x00000007,  // ....***
-  },
-  {             // 124
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-  },
-  {             // 125
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000018,  // .**...
-     0x0000001C,  // .***..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-  },
-  {             // 126
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003E2,  // .*****...*.
-     0x000003FE,  // .*********.
-     0x0000001C,  // ......***..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 127
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 161
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-  },
-  {             // 162
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000CC0,  // ..**..**......
-     0x00000CE0,  // ..**..***.....
-     0x000001E0,  // .....****.....
-     0x00000120,  // .....*..*.....
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000218,  // ....*....**...
-     0x00000618,  // ...**....**...
-     0x000007FC,  // ...*********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000806,  // ..*........**.
-     0x00001806,  // .**........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 163
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000003C,  // ....****..
-     0x000000CE,  // ..**..***.
-     0x00000086,  // ..*....**.
-     0x00000080,  // ..*.......
-     0x00000080,  // ..*.......
-     0x00000080,  // ..*.......
-     0x000001F0,  // .*****....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000080,  // ..*.......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x0000011F,  // .*...*****
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000002,  // ........*.
-     0x000001FB,  // .******.**
-     0x000000EE,  // ..***.***.
-     0x00000186,  // .**....**.
-     0x00000182,  // .**.....*.
-     0x00000186,  // .**....**.
-     0x000000C6,  // ..**...**.
-     0x000001FE,  // .********.
-     0x000001BB,  // .**.***.**
-     0x00000002,  // ........*.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 165
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000606,  // **......**.
-     0x00000304,  // .**.....*..
-     0x0000010C,  // ..*....**..
-     0x00000198,  // ..**..**...
-     0x00000098,  // ...*..**...
-     0x000000F0,  // ...****....
-     0x000003FE,  // .*********.
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x000003FE,  // .*********.
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 166
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-  },
-  {             // 167
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000EC,  // ..***.**..
-     0x000000C6,  // ..**...**.
-     0x000000C0,  // ..**......
-     0x00000060,  // ...**.....
-     0x00000070,  // ...***....
-     0x0000009C,  // ..*..***..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x000000C3,  // ..**....**
-     0x000000E3,  // ..***...**
-     0x00000032,  // ....**..*.
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x000000C2,  // ..**....*.
-     0x00000066,  // ...**..**.
-     0x0000003C,  // ....****..
-  },
-  {             // 168
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 169
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000C04,  // ..**.......*..
-     0x000019E2,  // .**..****...*.
-     0x00003313,  // **..**...*..**
-     0x00003601,  // **.**........*
-     0x00003601,  // **.**........*
-     0x00003601,  // **.**........*
-     0x00003611,  // **.**....*...*
-     0x00003313,  // **..**...*..**
-     0x000019E2,  // .**..****...*.
-     0x00000C04,  // ..**.......*..
-     0x00000608,  // ...**.....*...
-     0x000003F0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 170
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007C,  // .*****..
-     0x000000E6,  // ***..**.
-     0x00000002,  // ......*.
-     0x0000007E,  // .******.
-     0x000000C6,  // **...**.
-     0x000000C6,  // **...**.
-     0x0000007A,  // .****.*.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 171
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000026,  // ....*..**.
-     0x00000064,  // ...**..*..
-     0x000000CC,  // ..**..**..
-     0x00000098,  // ..*..**...
-     0x00000198,  // .**..**...
-     0x000000C8,  // ..**..*...
-     0x0000004C,  // ...*..**..
-     0x00000026,  // ....*..**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 172
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 173
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 174
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003F0,  // ....******....
-     0x00000618,  // ...**....**...
-     0x00000C04,  // ..**.......*..
-     0x00001BE2,  // .**.*****...*.
-     0x00003333,  // **..**..**..**
-     0x00003311,  // **..**...*...*
-     0x00003311,  // **..**...*...*
-     0x000033E1,  // **..*****....*
-     0x00003321,  // **..**..*....*
-     0x00003333,  // **..**..**..**
-     0x00001B12,  // .**.**...*..*.
-     0x00000C04,  // ..**.......*..
-     0x00000608,  // ...**.....*...
-     0x000003F0,  // ....******....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 175
-     12, 20,
-     0x00000000,  // ............
-     0x000007FF,  // .***********
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 176
-     7, 20,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001E,  // ..****.
-     0x00000023,  // .*...**
-     0x00000021,  // .*....*
-     0x00000023,  // .*...**
-     0x0000001E,  // ..****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 177
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 178
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001E,  // .****.
-     0x00000013,  // .*..**
-     0x00000001,  // .....*
-     0x00000002,  // ....*.
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x0000001F,  // .*****
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 179
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000E,  // ..***.
-     0x0000001B,  // .**.**
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x00000001,  // .....*
-     0x00000011,  // .*...*
-     0x0000001E,  // .****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 180
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000006,  // ...**.
-     0x00000004,  // ...*..
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 181
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000001C,  // .....***..
-     0x0000019B,  // .**..**.**
-     0x000001B3,  // .**.**..**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 182
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000CC0,  // ..**..**......
-     0x00000CE0,  // ..**..***.....
-     0x000001E0,  // .....****.....
-     0x00000120,  // .....*..*.....
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000218,  // ....*....**...
-     0x00000618,  // ...**....**...
-     0x000007FC,  // ...*********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000806,  // ..*........**.
-     0x00001806,  // .**........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 183
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 184
-     16, 20,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x000037FE,  // ..**.**********.
-     0x00006600,  // .**..**.........
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x000007F8,  // .....********...
-     0x000007F8,  // .....********...
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x00000600,  // .....**.........
-     0x000007FE,  // .....**********.
-     0x000007FE,  // .....**********.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 185
-     16, 20,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006C06,  // .**.**.......**.
-     0x00004C06,  // .*..**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000FFE,  // ....***********.
-     0x00000FFE,  // ....***********.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000C06,  // ....**.......**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 186
-     7, 20,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000036,  // .**.**.
-     0x00000026,  // .*..**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000006,  // ....**.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 187
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000090,  // ..*..*....
-     0x000000C8,  // ..**..*...
-     0x0000004C,  // ...*..**..
-     0x00000066,  // ...**..**.
-     0x00000066,  // ...**..**.
-     0x0000006C,  // ...**.**..
-     0x000000C8,  // ..**..*...
-     0x00000098,  // ..*..**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 188
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000031F0,  // .**...*****....
-     0x0000371C,  // .**.***...***..
-     0x00006C06,  // **.**.......**.
-     0x00000C06,  // ...**.......**.
-     0x00001803,  // ..**.........**
-     0x00001803,  // ..**.........**
-     0x00001803,  // ..**.........**
-     0x00001803,  // ..**.........**
-     0x00001803,  // ..**.........**
-     0x00001803,  // ..**.........**
-     0x00000C06,  // ...**.......**.
-     0x00000E0E,  // ...***.....***.
-     0x000007FC,  // ....*********..
-     0x000001F0,  // ......*****....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     16, 20,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x0000180C,  // ...**.......**..
-     0x00003808,  // ..***.......*...
-     0x00005810,  // .*.**......*....
-     0x00001830,  // ...**.....**....
-     0x00001860,  // ...**....**.....
-     0x00001840,  // ...**....*......
-     0x00001880,  // ...**...*.......
-     0x0000019E,  // .......**..****.
-     0x00000313,  // ......**...*..**
-     0x00000203,  // ......*.......**
-     0x00000402,  // .....*........*.
-     0x00000C0C,  // ....**......**..
-     0x00001818,  // ...**......**...
-     0x0000103F,  // ...*......******
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 190
-     18, 20,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x0000DC06,  // ..**.***.......**.
-     0x00018C0C,  // .**...**......**..
-     0x0000060C,  // .......**.....**..
-     0x00000318,  // ........**...**...
-     0x00000330,  // ........**..**....
-     0x000001A0,  // .........**.*.....
-     0x000000E0,  // ..........***.....
-     0x000000C0,  // ..........**......
-     0x000000C0,  // ..........**......
-     0x000000C0,  // ..........**......
-     0x000000C0,  // ..........**......
-     0x000000C0,  // ..........**......
-     0x000000C0,  // ..........**......
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 191
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000031F0,  // .**...*****....
-     0x00003738,  // .**.***..***...
-     0x00006C0C,  // **.**......**..
-     0x00000C0C,  // ...**......**..
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00001806,  // ..**........**.
-     0x00000804,  // ...*........*..
-     0x00000C0C,  // ...**......**..
-     0x00000618,  // ....**....**...
-     0x00001F3E,  // ..*****..*****.
-     0x00001F3E,  // ..*****..*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 192
-     9, 20,
-     0x00000000,  // .........
-     0x00000018,  // ....**...
-     0x000001B3,  // **.**..**
-     0x00000183,  // **.....**
-     0x00000000,  // .........
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000030,  // ...**....
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 193
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000E0,  // ......***.....
-     0x000001E0,  // .....****.....
-     0x00000120,  // .....*..*.....
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000218,  // ....*....**...
-     0x00000618,  // ...**....**...
-     0x000007FC,  // ...*********..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000806,  // ..*........**.
-     0x00001806,  // .**........**.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 194
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007F8,  // .********...
-     0x0000061C,  // .**....***..
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x00000606,  // .**......**.
-     0x000007F8,  // .********...
-     0x000007FE,  // .**********.
-     0x00000606,  // .**......**.
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000606,  // .**......**.
-     0x000007FE,  // .**********.
-     0x000007F8,  // .********...
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 195
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 196
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000000C0,  // ......**......
-     0x000000E0,  // ......***.....
-     0x000001E0,  // .....****.....
-     0x00000120,  // .....*..*.....
-     0x00000330,  // ....**..**....
-     0x00000310,  // ....**...*....
-     0x00000218,  // ....*....**...
-     0x00000618,  // ...**....**...
-     0x0000060C,  // ...**.....**..
-     0x00000C0C,  // ..**......**..
-     0x00000C0C,  // ..**......**..
-     0x00000FFE,  // ..***********.
-     0x00001FFE,  // .************.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 197
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007F8,  // .********...
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 198
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FF,  // .**********
-     0x000003FF,  // .**********
-     0x00000006,  // ........**.
-     0x0000000C,  // .......**..
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000070,  // ....***....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000180,  // ..**.......
-     0x00000300,  // .**........
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 199
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 200
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x000033E6,  // .**..*****..**.
-     0x000033E6,  // .**..*****..**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 201
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 202
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000606,  // .**......**.
-     0x0000060C,  // .**.....**..
-     0x00000618,  // .**....**...
-     0x00000630,  // .**...**....
-     0x00000660,  // .**..**.....
-     0x000006E0,  // .**.***.....
-     0x000007E0,  // .******.....
-     0x00000730,  // .***..**....
-     0x00000618,  // .**....**...
-     0x00000618,  // .**....**...
-     0x0000060C,  // .**.....**..
-     0x00000606,  // .**......**.
-     0x00000607,  // .**......***
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 203
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x000001A0,  // ....**.*.....
-     0x000001B0,  // ....**.**....
-     0x00000330,  // ...**..**....
-     0x00000310,  // ...**...*....
-     0x00000218,  // ...*....**...
-     0x00000618,  // ..**....**...
-     0x0000060C,  // ..**.....**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000806,  // .*........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 204
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001C07,  // .***.......***
-     0x00001E07,  // .****......***
-     0x00001E0F,  // .****.....****
-     0x00001B0F,  // .**.**....****
-     0x00001B1B,  // .**.**...**.**
-     0x0000199B,  // .**..**..**.**
-     0x000019B3,  // .**..**.**..**
-     0x000018E3,  // .**...***...**
-     0x000018E3,  // .**...***...**
-     0x00001843,  // .**....*....**
-     0x00001803,  // .**.........**
-     0x00001803,  // .**.........**
-     0x00001803,  // .**.........**
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 205
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000E06,  // .***......**.
-     0x00000F06,  // .****.....**.
-     0x00000D86,  // .**.**....**.
-     0x00000D86,  // .**.**....**.
-     0x00000CC6,  // .**..**...**.
-     0x00000C66,  // .**...**..**.
-     0x00000C66,  // .**...**..**.
-     0x00000C36,  // .**....**.**.
-     0x00000C1E,  // .**.....****.
-     0x00000C1E,  // .**.....****.
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 206
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 207
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 208
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FFE,  // .***********.
-     0x00000FFE,  // .***********.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 209
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x0000061E,  // .**....****.
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000603,  // .**.......**
-     0x00000607,  // .**......***
-     0x000007FE,  // .**********.
-     0x000007F8,  // .********...
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000600,  // .**.........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 210
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000300,  // ..**........
-     0x00000180,  // ...**.......
-     0x000000C0,  // ....**......
-     0x00000060,  // .....**.....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 211
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FC,  // .*********..
-     0x000007FC,  // .*********..
-     0x00000300,  // ..**........
-     0x00000180,  // ...**.......
-     0x000000C0,  // ....**......
-     0x00000060,  // .....**.....
-     0x00000070,  // .....***....
-     0x00000060,  // .....**.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 212
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 213
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001C06,  // ***.......**.
-     0x00000C0C,  // .**......**..
-     0x0000060C,  // ..**.....**..
-     0x00000718,  // ..***...**...
-     0x00000330,  // ...**..**....
-     0x000001A0,  // ....**.*.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 214
-     15, 20,
-     0x00000000,  // ...............
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x000007F0,  // ....*******....
-     0x00001FFC,  // ..***********..
-     0x0000198E,  // ..**..**...***.
-     0x00003187,  // .**...**....***
-     0x00003183,  // .**...**.....**
-     0x00003183,  // .**...**.....**
-     0x00003183,  // .**...**.....**
-     0x00003183,  // .**...**.....**
-     0x00001186,  // ..*...**....**.
-     0x0000198C,  // ..**..**...**..
-     0x000007F8,  // ....********...
-     0x00000180,  // ......**.......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x00000318,  // ...**...**...
-     0x00000330,  // ...**..**....
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001E0,  // ....****.....
-     0x000003B0,  // ...***.**....
-     0x00000318,  // ...**...**...
-     0x00000618,  // ..**....**...
-     0x00000C0C,  // .**......**..
-     0x00001C06,  // ***.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 216
-     16, 20,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x0000618E,  // .**....**...***.
-     0x0000319C,  // ..**...**..***..
-     0x00001FF8,  // ...**********...
-     0x00000FF0,  // ....********....
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000180,  // .......**.......
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 217
-     14, 20,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001E0,  // .....****.....
-     0x000007F8,  // ...********...
-     0x00000E1C,  // ..***....***..
-     0x00000C0C,  // ..**......**..
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00000804,  // ..*........*..
-     0x00000C0C,  // ..**......**..
-     0x00000618,  // ...**....**...
-     0x00001F3E,  // .*****..*****.
-     0x00001F3E,  // .*****..*****.
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 218
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x000000DB,  // **.**.**
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 219
-     13, 20,
-     0x00000000,  // .............
-     0x00001803,  // **.........**
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C0C,  // .**......**..
-     0x0000061C,  // ..**....***..
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 220
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x00000040,  // .....*......
-     0x00000000,  // ............
-     0x000001FC,  // ...*******..
-     0x0000031C,  // ..**...***..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000031C,  // ..**...***..
-     0x000001F6,  // ...*****.**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 221
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000000C,  // ....**..
-     0x00000008,  // ....*...
-     0x00000000,  // ........
-     0x0000003C,  // ..****..
-     0x0000007F,  // .*******
-     0x00000062,  // .**...*.
-     0x00000060,  // .**.....
-     0x00000020,  // ..*.....
-     0x00000018,  // ...**...
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000063,  // .**...**
-     0x0000003E,  // ..*****.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 222
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x000001BE,  // .**.*****.
-     0x000001C7,  // .***...***
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000000,  // ..........
-  },
-  {             // 223
-     5, 20,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000004,  // ..*..
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 224
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x000001B2,  // .**.**..*.
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000086,  // ..*....**.
-     0x000000C4,  // ..**...*..
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 225
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FC,  // ...*******..
-     0x0000031C,  // ..**...***..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000031C,  // ..**...***..
-     0x000001F6,  // ...*****.**.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 226
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F0,  // ...****....
-     0x000001DC,  // ..***.***..
-     0x0000030C,  // .**....**..
-     0x00000304,  // .**.....*..
-     0x00000304,  // .**.....*..
-     0x0000030C,  // .**....**..
-     0x00000370,  // .**.***....
-     0x0000031C,  // .**...***..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000000,  // ...........
-  },
-  {             // 227
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000102,  // .*......*.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000008C,  // ..*...**..
-     0x000000CC,  // ..**..**..
-     0x000000C8,  // ..**..*...
-     0x00000078,  // ...****...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-  },
-  {             // 228
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000FE,  // ..*******.
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000C6,  // ..**...**.
-     0x00000182,  // .**.....*.
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 229
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000003E,  // ..*****.
-     0x00000076,  // .***.**.
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000038,  // ..***...
-     0x00000038,  // ..***...
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000063,  // .**...**
-     0x0000003E,  // ..*****.
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 230
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000001F,  // ...*****
-     0x00000002,  // ......*.
-     0x00000004,  // .....*..
-     0x00000008,  // ....*...
-     0x00000018,  // ...**...
-     0x00000030,  // ..**....
-     0x00000020,  // ..*.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000060,  // .**.....
-     0x00000078,  // .****...
-     0x0000003F,  // ..******
-     0x00000003,  // ......**
-     0x00000003,  // ......**
-     0x00000007,  // .....***
-     0x00000004,  // .....*..
-  },
-  {             // 231
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BE,  // .**.*****.
-     0x000001C7,  // .***...***
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000003,  // ........**
-     0x00000000,  // ..........
-  },
-  {             // 232
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000C6,  // ..**...**.
-     0x000000C2,  // ..**....*.
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000082,  // ..*.....*.
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 233
-     4, 20,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 234
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000018E,  // .**...***.
-     0x0000019C,  // .**..***..
-     0x000001B0,  // .**.**....
-     0x000001E0,  // .****.....
-     0x000001E0,  // .****.....
-     0x000001B0,  // .**.**....
-     0x00000198,  // .**..**...
-     0x00000198,  // .**..**...
-     0x0000018C,  // .**...**..
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 235
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000040,  // ...*......
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000020,  // ....*.....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x00000058,  // ...*.**...
-     0x000000D8,  // ..**.**...
-     0x000000C8,  // ..**..*...
-     0x0000008C,  // ..*...**..
-     0x0000018C,  // .**...**..
-     0x00000184,  // .**....*..
-     0x00000306,  // **.....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 236
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038E,  // .***...***.
-     0x000003FE,  // .*********.
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 237
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000306,  // **.....**.
-     0x00000106,  // .*.....**.
-     0x00000184,  // .**....*..
-     0x0000008C,  // ..*...**..
-     0x000000C8,  // ..**..*...
-     0x000000D8,  // ..**.**...
-     0x00000058,  // ...*.**...
-     0x00000070,  // ...***....
-     0x00000070,  // ...***....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 238
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x0000007C,  // ..*****..
-     0x0000001C,  // ....***..
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x00000078,  // ..****...
-     0x0000001F,  // ....*****
-     0x00000003,  // .......**
-     0x00000003,  // .......**
-     0x0000000E,  // .....***.
-     0x00000000,  // .........
-  },
-  {             // 239
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 240
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000003FF,  // **********
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 241
-     11, 20,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001DC,  // ..***.***..
-     0x00000184,  // ..**....*..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003F8,  // .*******...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 242
-     9, 20,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000001F,  // ....*****
-     0x00000039,  // ...***..*
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x00000060,  // ..**.....
-     0x00000038,  // ...***...
-     0x0000000E,  // .....***.
-     0x00000003,  // .......**
-     0x00000003,  // .......**
-     0x0000001F,  // ....*****
-     0x0000001C,  // ....***..
-  },
-  {             // 243
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001FE,  // ...********.
-     0x00000318,  // ..**...**...
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x0000060C,  // .**.....**..
-     0x00000318,  // ..**...**...
-     0x000001F0,  // ...*****....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 244
-     8, 20,
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x0000007E,  // .******.
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000018,  // ...**...
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-     0x00000000,  // ........
-  },
-  {             // 245
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000C4,  // ..**...*..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 246
-     12, 20,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000001BC,  // ...**.****..
-     0x00000326,  // ..**..*..**.
-     0x00000623,  // .**...*...**
-     0x00000623,  // .**...*...**
-     0x00000623,  // .**...*...**
-     0x00000623,  // .**...*...**
-     0x00000623,  // .**...*...**
-     0x00000326,  // ..**..*..**.
-     0x000003BC,  // ..***.****..
-     0x000000F8,  // ....*****...
-     0x00000020,  // ......*.....
-     0x00000020,  // ......*.....
-     0x00000020,  // ......*.....
-     0x00000020,  // ......*.....
-  },
-  {             // 247
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000106,  // .*.....**.
-     0x00000186,  // .**....**.
-     0x0000008C,  // ..*...**..
-     0x000000CC,  // ..**..**..
-     0x00000058,  // ...*.**...
-     0x00000070,  // ...***....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x00000078,  // ...****...
-     0x000000C8,  // ..**..*...
-     0x0000008C,  // ..*...**..
-     0x00000186,  // .**....**.
-     0x00000106,  // .*.....**.
-     0x00000000,  // ..........
-  },
-  {             // 248
-     13, 20,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C03,  // .**........**
-     0x00000C63,  // .**...**...**
-     0x00000C63,  // .**...**...**
-     0x00000C63,  // .**...**...**
-     0x00000C63,  // .**...**...**
-     0x00000666,  // ..**..**..**.
-     0x000003FC,  // ...********..
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-     0x00000060,  // ......**.....
-  },
-  {             // 249
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001804,  // ..**........*..
-     0x00001804,  // ..**........*..
-     0x00003006,  // .**.........**.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000030C2,  // .**....**....*.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000019E4,  // ..**..****..*..
-     0x00000F3C,  // ...****..****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 250
-     6, 20,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000037,  // **.***
-     0x00000030,  // **....
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 251
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000C4,  // ..**...*..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000008,  // ......*...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000EE,  // ..***.***.
-     0x000001C3,  // .***....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x00000183,  // .**.....**
-     0x000000C6,  // ..**...**.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 253
-     10, 20,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000C4,  // ..**...*..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 254
-     15, 20,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000060,  // ........**.....
-     0x00000040,  // ........*......
-     0x00000000,  // ...............
-     0x0000080C,  // ...*.......**..
-     0x00001804,  // ..**........*..
-     0x00001006,  // ..*.........**.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000030C2,  // .**....**....*.
-     0x000030C6,  // .**....**...**.
-     0x000030C6,  // .**....**...**.
-     0x000019E4,  // ..**..****..*..
-     0x00000F3C,  // ...****..****..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 255
-     0, 20,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  };
diff --git a/fontsml-iso8859-9.c b/fontsml-iso8859-9.c
deleted file mode 100644
index 3456be2c3..000000000
--- a/fontsml-iso8859-9.c
+++ /dev/null
@@ -1,5602 +0,0 @@
-static const cFont::tPixelData FontSml_iso8859_9[][24] = {
-  {             // 32
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 33
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000008,  // ..*...
-     0x00000008,  // ..*...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 34
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 35
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x000001FF,  // .*********
-     0x000001FF,  // .*********
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x00000048,  // ...*..*...
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000090,  // ..*..*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 36
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000010,  // .....*....
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000196,  // .**..*.**.
-     0x00000190,  // .**..*....
-     0x000001D0,  // .***.*....
-     0x000000F0,  // ..****....
-     0x0000007C,  // ...*****..
-     0x0000001E,  // .....****.
-     0x00000013,  // .....*..**
-     0x00000193,  // .**..*..**
-     0x000001D7,  // .***.*.***
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000010,  // .....*....
-     0x00000010,  // .....*....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 37
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00003C30,  // ..****....**....
-     0x00006660,  // .**..**..**.....
-     0x00006660,  // .**..**..**.....
-     0x000066C0,  // .**..**.**......
-     0x000066C0,  // .**..**.**......
-     0x00003D80,  // ..****.**.......
-     0x00000180,  // .......**.......
-     0x0000033C,  // ......**..****..
-     0x00000366,  // ......**.**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000666,  // .....**..**..**.
-     0x00000C66,  // ....**...**..**.
-     0x00000C3C,  // ....**....****..
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 38
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000003C0,  // ...****......
-     0x000007E0,  // ..******.....
-     0x00000660,  // ..**..**.....
-     0x00000660,  // ..**..**.....
-     0x000003C0,  // ...****......
-     0x000007C0,  // ..*****......
-     0x00000EEC,  // .***.***.**..
-     0x00000C6C,  // .**...**.**..
-     0x00000C3C,  // .**....****..
-     0x00000C38,  // .**....***...
-     0x00000E7C,  // .***..*****..
-     0x000007EE,  // ..******.***.
-     0x000003C7,  // ...****...***
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 39
-     3, 22,
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000002,  // .*.
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-     0x00000000,  // ...
-  },
-  {             // 40
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000004,  // ...*..
-  },
-  {             // 41
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000010,  // .*....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000010,  // .*....
-  },
-  {             // 42
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000008,  // ...*...
-     0x0000002A,  // .*.*.*.
-     0x0000003E,  // .*****.
-     0x00000008,  // ...*...
-     0x0000003E,  // .*****.
-     0x0000002A,  // .*.*.*.
-     0x00000008,  // ...*...
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 43
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 44
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 45
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****. added by hand to avoid flickering!!!
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 46
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 47
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 48
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 49
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x000000F8,  // ..*****...
-     0x000000F8,  // ..*****...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 50
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000006,  // .......**.
-     0x0000000E,  // ......***.
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x00000180,  // .**.......
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 51
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000000C,  // ......**..
-     0x00000038,  // ....***...
-     0x0000003C,  // ....****..
-     0x0000000E,  // ......***.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 52
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000001C,  // .....***..
-     0x0000003C,  // ....****..
-     0x0000006C,  // ...**.**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x0000018C,  // .**...**..
-     0x0000030C,  // **....**..
-     0x000003FE,  // *********.
-     0x000003FE,  // *********.
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 53
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FC,  // .*******..
-     0x000001FC,  // .*******..
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001F8,  // .******...
-     0x000001FC,  // .*******..
-     0x0000018E,  // .**...***.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 54
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001B8,  // .**.***...
-     0x000001FC,  // .*******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 55
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000006,  // .......**.
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x000000C0,  // ..**......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 56
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000FC,  // ..******..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 57
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FE,  // ..*******.
-     0x00000076,  // ...***.**.
-     0x00000006,  // .......**.
-     0x00000006,  // .......**.
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 58
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 59
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000004,  // ..*..
-     0x00000004,  // ..*..
-     0x00000008,  // .*...
-     0x00000000,  // .....
-  },
-  {             // 60
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000006,  // .......**.
-     0x0000001E,  // .....****.
-     0x00000078,  // ...****...
-     0x000000E0,  // ..***.....
-     0x00000180,  // .**.......
-     0x000000E0,  // ..***.....
-     0x00000078,  // ...****...
-     0x0000001E,  // .....****.
-     0x00000006,  // .......**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 61
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x000001FC,  // ..*******..
-     0x000001FC,  // ..*******..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 62
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x000001E0,  // .****.....
-     0x00000078,  // ...****...
-     0x0000001C,  // .....***..
-     0x00000006,  // .......**.
-     0x0000001C,  // .....***..
-     0x00000078,  // ...****...
-     0x000001E0,  // .****.....
-     0x00000180,  // .**.......
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 63
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000F8,  // ..*****...
-     0x000001FC,  // .*******..
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x0000001C,  // .....***..
-     0x00000038,  // ....***...
-     0x00000070,  // ...***....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 64
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x000007E0,  // .......******.....
-     0x00001FF8,  // .....**********...
-     0x0000381C,  // ....***......***..
-     0x0000600C,  // ...**.........**..
-     0x0000C7A6,  // ..**...****.*..**.
-     0x0000CEE6,  // ..**..***.***..**.
-     0x00018C66,  // .**...**...**..**.
-     0x000198C6,  // .**..**...**...**.
-     0x000198CC,  // .**..**...**..**..
-     0x000198CC,  // .**..**...**..**..
-     0x00019998,  // .**..**..**..**...
-     0x00019FF0,  // .**..*********....
-     0x0000CEE0,  // ..**..***.***.....
-     0x0000E000,  // ..***.............
-     0x00007000,  // ...***............
-     0x00003FE0,  // ....*********.....
-     0x00000FC0,  // ......******......
-     0x00000000,  // ..................
-  },
-  {             // 65
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 66
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000FF0,  // .********....
-     0x00000FF8,  // .*********...
-     0x00000C1C,  // .**.....***..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C18,  // .**.....**...
-     0x00000FF8,  // .*********...
-     0x00000FFC,  // .**********..
-     0x00000C0E,  // .**......***.
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000C0E,  // .**......***.
-     0x00000FFC,  // .**********..
-     0x00000FF8,  // .*********...
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 67
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 68
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x00001806,  // .**........**.
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 69
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 70
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000003FE,  // ..*********.
-     0x000003FE,  // ..*********.
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x000003FC,  // ..********..
-     0x000003FC,  // ..********..
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000300,  // ..**........
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 71
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FFC,  // ...**********..
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000303E,  // .**......*****.
-     0x0000303E,  // .**......*****.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFE,  // ...***********.
-     0x000003F6,  // .....******.**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 72
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00001FFC,  // .***********..
-     0x00001FFC,  // .***********..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 73
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 74
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000000C,  // ......**..
-     0x0000030C,  // **....**..
-     0x0000030C,  // **....**..
-     0x0000039C,  // ***..***..
-     0x000001F8,  // .******...
-     0x000000F0,  // ..****....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 75
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000C0E,  // ..**......***.
-     0x00000C1C,  // ..**.....***..
-     0x00000C38,  // ..**....***...
-     0x00000C70,  // ..**...***....
-     0x00000CE0,  // ..**..***.....
-     0x00000DC0,  // ..**.***......
-     0x00000F80,  // ..*****.......
-     0x00000FC0,  // ..******......
-     0x00000CE0,  // ..**..***.....
-     0x00000C70,  // ..**...***....
-     0x00000C38,  // ..**....***...
-     0x00000C1C,  // ..**.....***..
-     0x00000C0E,  // ..**......***.
-     0x00000C07,  // ..**.......***
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 76
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 77
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006006,  // .**..........**.
-     0x00006006,  // .**..........**.
-     0x0000700E,  // .***........***.
-     0x0000700E,  // .***........***.
-     0x0000781E,  // .****......****.
-     0x0000781E,  // .****......****.
-     0x00006C36,  // .**.**....**.**.
-     0x00006C36,  // .**.**....**.**.
-     0x00006666,  // .**..**..**..**.
-     0x00006666,  // .**..**..**..**.
-     0x00006246,  // .**...*..*...**.
-     0x000063C6,  // .**...****...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 78
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 79
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 80
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000007F8,  // ..********...
-     0x000007FC,  // ..*********..
-     0x0000060E,  // ..**.....***.
-     0x00000606,  // ..**......**.
-     0x00000606,  // ..**......**.
-     0x0000060E,  // ..**.....***.
-     0x000007FC,  // ..*********..
-     0x000007F8,  // ..********...
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 81
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000386E,  // .***....**.***.
-     0x0000186C,  // ..**....**.**..
-     0x00001C3C,  // ..***....****..
-     0x00000FF8,  // ...*********...
-     0x000003EC,  // .....*****.**..
-     0x0000000C,  // ...........**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 82
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00001FF0,  // .*********....
-     0x00001FF8,  // .**********...
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000181C,  // .**......***..
-     0x00001FF8,  // .**********...
-     0x00001FF0,  // .*********....
-     0x00001818,  // .**......**...
-     0x00001818,  // .**......**...
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 83
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x00000038,  // .......***...
-     0x0000001C,  // ........***..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 84
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000060,  // .....**.....
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 85
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 86
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 87
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018306,  // .**.....**.....**.
-     0x00018786,  // .**....****....**.
-     0x0000C78C,  // ..**...****...**..
-     0x0000C48C,  // ..**...*..*...**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x0000CCCC,  // ..**..**..**..**..
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006CD8,  // ...**.**..**.**...
-     0x00006858,  // ...**.*....*.**...
-     0x00003870,  // ....***....***....
-     0x00003030,  // ....**......**....
-     0x00003030,  // ....**......**....
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 88
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x0000060C,  // ..**.....**..
-     0x0000071C,  // ..***...***..
-     0x00000318,  // ...**...**...
-     0x000001B0,  // ....**.**....
-     0x000000E0,  // .....***.....
-     0x000000E0,  // .....***.....
-     0x000001B0,  // ....**.**....
-     0x00000318,  // ...**...**...
-     0x0000071C,  // ..***...***..
-     0x0000060C,  // ..**.....**..
-     0x00000C06,  // .**.......**.
-     0x00000C06,  // .**.......**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 89
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00000618,  // ..**....**...
-     0x00000738,  // ..***..***...
-     0x00000330,  // ...**..**....
-     0x000001E0,  // ....****.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 90
-     12, 22,
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000006,  // .........**.
-     0x0000000C,  // ........**..
-     0x00000018,  // .......**...
-     0x00000030,  // ......**....
-     0x00000060,  // .....**.....
-     0x000000E0,  // ....***.....
-     0x000000C0,  // ....**......
-     0x00000180,  // ...**.......
-     0x00000300,  // ..**........
-     0x00000600,  // .**.........
-     0x000007FE,  // .**********.
-     0x000007FE,  // .**********.
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-     0x00000000,  // ............
-  },
-  {             // 91
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 92
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x00000018,  // **...
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000003,  // ...**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 93
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001E,  // ****.
-  },
-  {             // 94
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000010,  // ....*....
-     0x00000038,  // ...***...
-     0x0000006C,  // ..**.**..
-     0x0000006C,  // ..**.**..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 95
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000007FF,  // ***********
-     0x000007FF,  // ***********
-  },
-  {             // 96
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 97
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 98
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 99
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 100
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 101
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 102
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000007,  // ...***
-     0x0000000F,  // ..****
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 103
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x00000070,  // ....***....
-  },
-  {             // 104
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 105
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 106
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x00000006,  // ..**.
-     0x0000001E,  // ****.
-     0x0000001C,  // ***..
-  },
-  {             // 107
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C0,  // .**......
-     0x000000C6,  // .**...**.
-     0x000000CC,  // .**..**..
-     0x000000D8,  // .**.**...
-     0x000000F0,  // .****....
-     0x000000F8,  // .*****...
-     0x000000D8,  // .**.**...
-     0x000000CC,  // .**..**..
-     0x000000CE,  // .**..***.
-     0x000000C6,  // .**...**.
-     0x000000C7,  // .**...***
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 108
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 109
-     16, 22,
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00006F3C,  // .**.****..****..
-     0x00007FFE,  // .**************.
-     0x000071C6,  // .***...***...**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00006186,  // .**....**....**.
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-     0x00000000,  // ................
-  },
-  {             // 110
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 111
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 112
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000378,  // .**.****...
-     0x000003FC,  // .********..
-     0x0000038C,  // .***...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000038C,  // .***...**..
-     0x000003FC,  // .********..
-     0x00000378,  // .**.****...
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-     0x00000300,  // .**........
-  },
-  {             // 113
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x0000018E,  // ..**...***.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-  },
-  {             // 114
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001B,  // .**.**
-     0x0000001B,  // .**.**
-     0x0000001C,  // .***..
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000018,  // .**...
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 115
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 116
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000003F,  // ******
-     0x0000003F,  // ******
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000F,  // ..****
-     0x00000007,  // ...***
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 117
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 118
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 119
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x000018C6,  // .**...**...**.
-     0x00000CCC,  // ..**..**..**..
-     0x00000CCC,  // ..**..**..**..
-     0x00000D2C,  // ..**.*..*.**..
-     0x00000528,  // ...*.*..*.*...
-     0x00000738,  // ...***..***...
-     0x00000330,  // ....**..**....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 120
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x000001CE,  // .***..***.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 121
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  {             // 122
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000006,  // ......**.
-     0x0000000C,  // .....**..
-     0x00000018,  // ....**...
-     0x00000030,  // ...**....
-     0x00000060,  // ..**.....
-     0x000000C0,  // .**......
-     0x000000FE,  // .*******.
-     0x000000FE,  // .*******.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 123
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000006,  // ....**.
-     0x0000000C,  // ...**..
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000030,  // .**....
-     0x00000060,  // **.....
-     0x00000030,  // .**....
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x00000018,  // ..**...
-     0x0000000C,  // ...**..
-     0x00000006,  // ....**.
-  },
-  {             // 124
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 125
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000006,  // ...**.
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x00000030,  // **....
-  },
-  {             // 126
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000E6,  // ..***..**.
-     0x000001FE,  // .********.
-     0x0000019C,  // .**..***..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 127
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 128
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 129
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 130
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 131
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 132
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 133
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 134
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 135
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 136
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 137
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 138
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 139
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 140
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 141
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 142
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 143
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 144
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 145
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 146
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 147
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 148
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 149
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 150
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 151
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 152
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 153
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 154
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 155
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 156
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 157
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 158
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 159
-     0, 22,
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-     0x00000000,  // 
-  },
-  {             // 160
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 161
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000004,  // ...*..
-     0x00000004,  // ...*..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-  },
-  {             // 162
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000008,  // ......*...
-     0x00000008,  // ......*...
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000D6,  // ..**.*.**.
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x00000190,  // .**..*....
-     0x000000D6,  // ..**.*.**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000020,  // ....*.....
-     0x00000020,  // ....*.....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 163
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000180,  // .**.......
-     0x000000C0,  // ..**......
-     0x000001F8,  // .******...
-     0x00000060,  // ...**.....
-     0x00000060,  // ...**.....
-     0x000000C0,  // ..**......
-     0x00000182,  // .**.....*.
-     0x000003FE,  // *********.
-     0x0000037C,  // **.*****..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 164
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000001FE,  // .********.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 165
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 166
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-  },
-  {             // 167
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001E0,  // .****.....
-     0x000000F8,  // ..*****...
-     0x000000DC,  // ..**.***..
-     0x0000018E,  // .**...***.
-     0x00000186,  // .**....**.
-     0x000001C6,  // .***...**.
-     0x000000E6,  // ..***..**.
-     0x0000007C,  // ...*****..
-     0x0000001C,  // .....***..
-     0x0000000E,  // ......***.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000FC,  // ..******..
-     0x00000078,  // ...****...
-  },
-  {             // 168
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000036,  // **.**.
-     0x00000036,  // **.**.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 169
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000C18,  // ...**.....**...
-     0x00001004,  // ..*.........*..
-     0x000011C4,  // ..*...***...*..
-     0x00002222,  // .*...*...*...*.
-     0x00002422,  // .*..*....*...*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002402,  // .*..*........*.
-     0x00002222,  // .*...*...*...*.
-     0x000011C4,  // ..*...***...*..
-     0x00001004,  // ..*.........*..
-     0x00000C18,  // ...**.....**...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 170
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000026,  // .*..**.
-     0x0000000E,  // ...***.
-     0x00000012,  // ..*..*.
-     0x00000036,  // .**.**.
-     0x0000001A,  // ..**.*.
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 171
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 172
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000003FE,  // .*********.
-     0x000003FE,  // .*********.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000006,  // ........**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 173
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 174
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000003E0,  // ....*****.....
-     0x00000C18,  // ..**.....**...
-     0x00001004,  // .*.........*..
-     0x000013E4,  // .*..*****..*..
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x00002212,  // *...*....*..*.
-     0x000023E2,  // *...*****...*.
-     0x00002242,  // *...*..*....*.
-     0x00002222,  // *...*...*...*.
-     0x00001214,  // .*..*....*.*..
-     0x00001004,  // .*.........*..
-     0x00000C18,  // ..**.....**...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 175
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001F,  // *****
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 176
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 177
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 178
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000018,  // .**...
-     0x0000003E,  // *****.
-     0x0000003E,  // *****.
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 179
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000001C,  // .***..
-     0x0000003E,  // *****.
-     0x00000026,  // *..**.
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000026,  // *..**.
-     0x0000003E,  // *****.
-     0x0000001C,  // .***..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 180
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 181
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001CE,  // .***..***.
-     0x000001FE,  // .********.
-     0x000001B6,  // .**.**.**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-  },
-  {             // 182
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007E,  // ...******.
-     0x000000E4,  // ..***..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000001E4,  // .****..*..
-     0x000000E4,  // ..***..*..
-     0x00000064,  // ...**..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-     0x00000024,  // ....*..*..
-  },
-  {             // 183
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 184
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000E,  // .***.
-     0x00000003,  // ...**
-     0x0000001B,  // **.**
-     0x0000001E,  // ****.
-  },
-  {             // 185
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000003C,  // ****..
-     0x0000003C,  // ****..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 186
-     7, 22,
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x0000001C,  // ..***..
-     0x00000036,  // .**.**.
-     0x00000022,  // .*...*.
-     0x00000022,  // .*...*.
-     0x00000036,  // .**.**.
-     0x0000001C,  // ..***..
-     0x00000000,  // .......
-     0x0000003E,  // .*****.
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-     0x00000000,  // .......
-  },
-  {             // 187
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x000000D8,  // .**.**...
-     0x0000006C,  // ..**.**..
-     0x00000036,  // ...**.**.
-     0x00000036,  // ...**.**.
-     0x0000006C,  // ..**.**..
-     0x000000D8,  // .**.**...
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 188
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00007818,  // ****......**...
-     0x00007830,  // ****.....**....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x000018C4,  // ..**...**...*..
-     0x0000188C,  // ..**...*...**..
-     0x0000199C,  // ..**..**..***..
-     0x0000033C,  // .....**..****..
-     0x0000036C,  // .....**.**.**..
-     0x0000067E,  // ....**..******.
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 189
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00001818,  // ..**......**...
-     0x00007818,  // ****......**...
-     0x00007830,  // ****.....**....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x000018DC,  // ..**...**.***..
-     0x000018BE,  // ..**...*.*****.
-     0x000019A6,  // ..**..**.*..**.
-     0x00000306,  // .....**.....**.
-     0x0000030C,  // .....**....**..
-     0x00000618,  // ....**....**...
-     0x00000C3E,  // ...**....*****.
-     0x00000C3E,  // ...**....*****.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 190
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00003818,  // .***......**...
-     0x00007C18,  // *****.....**...
-     0x00004C30,  // *..**....**....
-     0x00001860,  // ..**....**.....
-     0x00001860,  // ..**....**.....
-     0x00004CC4,  // *..**..**...*..
-     0x00007C8C,  // *****..*...**..
-     0x0000399C,  // .***..**..***..
-     0x0000033C,  // .....**..****..
-     0x0000036C,  // .....**.**.**..
-     0x0000067E,  // ....**..******.
-     0x00000C0C,  // ...**......**..
-     0x00000C0C,  // ...**......**..
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 191
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000070,  // ...***....
-     0x000000E0,  // ..***.....
-     0x000001C0,  // .***......
-     0x0000018C,  // .**...**..
-     0x0000018C,  // .**...**..
-     0x000001FC,  // .*******..
-     0x000000F8,  // ..*****...
-  },
-  {             // 192
-     13, 22,
-     0x00000300,  // ...**........
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 193
-     13, 22,
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x000000C0,  // .....**......
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 194
-     13, 22,
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 195
-     13, 22,
-     0x00000190,  // ....**..*....
-     0x000002D0,  // ...*.**.*....
-     0x00000260,  // ...*..**.....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 196
-     13, 22,
-     0x00000000,  // .............
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 197
-     13, 22,
-     0x00000000,  // .............
-     0x000000C0,  // .....**......
-     0x00000120,  // ....*..*.....
-     0x00000120,  // ....*..*.....
-     0x000000C0,  // .....**......
-     0x000000C0,  // .....**......
-     0x000001E0,  // ....****.....
-     0x000001E0,  // ....****.....
-     0x00000330,  // ...**..**....
-     0x00000330,  // ...**..**....
-     0x00000618,  // ..**....**...
-     0x00000618,  // ..**....**...
-     0x000007F8,  // ..********...
-     0x00000FFC,  // .**********..
-     0x00000C0C,  // .**......**..
-     0x00000C0C,  // .**......**..
-     0x00001806,  // **........**.
-     0x00001806,  // **........**.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 198
-     18, 22,
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000FFE,  // ......***********.
-     0x00000FFE,  // ......***********.
-     0x00001B00,  // .....**.**........
-     0x00001B00,  // .....**.**........
-     0x00003300,  // ....**..**........
-     0x00003300,  // ....**..**........
-     0x000063FC,  // ...**...********..
-     0x000063FC,  // ...**...********..
-     0x00007F00,  // ...*******........
-     0x0000FF00,  // ..********........
-     0x0000C300,  // ..**....**........
-     0x0000C300,  // ..**....**........
-     0x000183FE,  // .**.....*********.
-     0x000183FE,  // .**.....*********.
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-     0x00000000,  // ..................
-  },
-  {             // 199
-     14, 22,
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x000001F0,  // .....*****....
-     0x000007FC,  // ...*********..
-     0x00000E0E,  // ..***.....***.
-     0x00000C06,  // ..**.......**.
-     0x00001C00,  // .***..........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001800,  // .**...........
-     0x00001C00,  // .***..........
-     0x00000C06,  // ..**.......**.
-     0x00000E0E,  // ..***.....***.
-     0x000007FC,  // ...*********..
-     0x000001F0,  // .....*****....
-     0x000000C0,  // ......**......
-     0x00000060,  // .......**.....
-     0x00000360,  // ....**.**.....
-     0x000003C0,  // ....****......
-  },
-  {             // 200
-     13, 22,
-     0x00000180,  // ....**.......
-     0x000000C0,  // .....**......
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 201
-     13, 22,
-     0x00000018,  // ........**...
-     0x00000030,  // .......**....
-     0x00000060,  // ......**.....
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 202
-     13, 22,
-     0x00000060,  // ......**.....
-     0x000000F0,  // .....****....
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 203
-     13, 22,
-     0x00000000,  // .............
-     0x00000198,  // ....**..**...
-     0x00000198,  // ....**..**...
-     0x00000000,  // .............
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FC,  // ..*********..
-     0x000007FC,  // ..*********..
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x00000600,  // ..**.........
-     0x000007FE,  // ..**********.
-     0x000007FE,  // ..**********.
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-  },
-  {             // 204
-     6, 22,
-     0x00000030,  // **....
-     0x00000018,  // .**...
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 205
-     6, 22,
-     0x00000003,  // ....**
-     0x00000006,  // ...**.
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 206
-     6, 22,
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000021,  // *....*
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 207
-     6, 22,
-     0x00000000,  // ......
-     0x00000033,  // **..**
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 208
-     15, 22,
-     0x00000E1C,  // ...***....***..
-     0x00000FFC,  // ...**********..
-     0x000003F0,  // .....******....
-     0x00000000,  // ...............
-     0x000003F0,  // .....******....
-     0x00000FFC,  // ...**********..
-     0x00001C0E,  // ..***......***.
-     0x00001806,  // ..**........**.
-     0x00003806,  // .***........**.
-     0x00003000,  // .**............
-     0x00003000,  // .**............
-     0x0000303E,  // .**......*****.
-     0x0000303E,  // .**......*****.
-     0x00003806,  // .***........**.
-     0x00001806,  // ..**........**.
-     0x00001C0E,  // ..***......***.
-     0x00000FFE,  // ...***********.
-     0x000003F6,  // .....******.**.
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 209
-     14, 22,
-     0x00000190,  // .....**..*....
-     0x000002D0,  // ....*.**.*....
-     0x00000260,  // ....*..**.....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x00001C0C,  // .***......**..
-     0x00001E0C,  // .****.....**..
-     0x00001E0C,  // .****.....**..
-     0x00001B0C,  // .**.**....**..
-     0x0000198C,  // .**..**...**..
-     0x0000198C,  // .**..**...**..
-     0x000018CC,  // .**...**..**..
-     0x000018CC,  // .**...**..**..
-     0x0000186C,  // .**....**.**..
-     0x0000183C,  // .**.....****..
-     0x0000183C,  // .**.....****..
-     0x0000181C,  // .**......***..
-     0x0000180C,  // .**.......**..
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 210
-     15, 22,
-     0x00000600,  // ....**.........
-     0x00000300,  // .....**........
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 211
-     15, 22,
-     0x00000060,  // ........**.....
-     0x000000C0,  // .......**......
-     0x00000180,  // ......**.......
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 212
-     15, 22,
-     0x000000C0,  // .......**......
-     0x000001E0,  // ......****.....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 213
-     15, 22,
-     0x00000190,  // ......**..*....
-     0x000002D0,  // .....*.**.*....
-     0x00000260,  // .....*..**.....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 214
-     15, 22,
-     0x00000000,  // ...............
-     0x00000330,  // .....**..**....
-     0x00000330,  // .....**..**....
-     0x00000000,  // ...............
-     0x000003E0,  // .....*****.....
-     0x00000FF8,  // ...*********...
-     0x00001C1C,  // ..***.....***..
-     0x0000180C,  // ..**.......**..
-     0x0000380E,  // .***.......***.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x00003006,  // .**.........**.
-     0x0000380E,  // .***.......***.
-     0x0000180C,  // ..**.......**..
-     0x00001C1C,  // ..***.....***..
-     0x00000FF8,  // ...*********...
-     0x000003E0,  // .....*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 215
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000303,  // **......**
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000186,  // .**....**.
-     0x00000303,  // **......**
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 216
-     15, 22,
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x000003E6,  // .....*****..**.
-     0x00000FFC,  // ...**********..
-     0x00001C18,  // ..***.....**...
-     0x0000183C,  // ..**.....****..
-     0x0000386E,  // .***....**.***.
-     0x000030C6,  // .**....**...**.
-     0x00003186,  // .**...**....**.
-     0x00003106,  // .**...*.....**.
-     0x00003306,  // .**..**.....**.
-     0x0000360E,  // .**.**.....***.
-     0x00001C0C,  // ..***......**..
-     0x00001C1C,  // ..***.....***..
-     0x000037F8,  // .**.********...
-     0x000063E0,  // **...*****.....
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-     0x00000000,  // ...............
-  },
-  {             // 217
-     14, 22,
-     0x00000300,  // ....**........
-     0x00000180,  // .....**.......
-     0x000000C0,  // ......**......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 218
-     14, 22,
-     0x00000060,  // .......**.....
-     0x000000C0,  // ......**......
-     0x00000180,  // .....**.......
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 219
-     14, 22,
-     0x000000C0,  // ......**......
-     0x000001E0,  // .....****.....
-     0x00000330,  // ....**..**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 220
-     14, 22,
-     0x00000000,  // ..............
-     0x00000630,  // ...**...**....
-     0x00000630,  // ...**...**....
-     0x00000000,  // ..............
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x0000180C,  // .**.......**..
-     0x00000C18,  // ..**.....**...
-     0x00000FF8,  // ..*********...
-     0x000003E0,  // ....*****.....
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-     0x00000000,  // ..............
-  },
-  {             // 221
-     6, 22,
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 222
-     13, 22,
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x00000000,  // .............
-     0x000001E0,  // ....****.....
-     0x000007F8,  // ..********...
-     0x00000E1C,  // .***....***..
-     0x00000C0C,  // .**......**..
-     0x00000E00,  // .***.........
-     0x000007C0,  // ..*****......
-     0x000001F0,  // ....*****....
-     0x00000038,  // .......***...
-     0x0000001C,  // ........***..
-     0x0000000C,  // .........**..
-     0x00000C0C,  // .**......**..
-     0x00000E1C,  // .***....***..
-     0x000007F8,  // ..********...
-     0x000003F0,  // ...******....
-     0x000000C0,  // .....**......
-     0x000000E0,  // .....***.....
-     0x00000030,  // .......**....
-     0x000001B0,  // ....**.**....
-     0x000001E0,  // ....****.....
-  },
-  {             // 223
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000038,  // ...***...
-     0x0000007C,  // ..*****..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DC,  // .**.***..
-     0x000000DC,  // .**.***..
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000C6,  // .**...**.
-     0x000000DE,  // .**.****.
-     0x000000DC,  // .**.***..
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-  },
-  {             // 224
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 225
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x000000C0,  // ...**......
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 226
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 227
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 228
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000198,  // ..**..**...
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 229
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x00000090,  // ...*..*....
-     0x00000090,  // ...*..*....
-     0x00000060,  // ....**.....
-     0x000001F8,  // ..******...
-     0x0000039C,  // .***..***..
-     0x0000030C,  // .**....**..
-     0x0000001C,  // ......***..
-     0x000001FC,  // ..*******..
-     0x0000038C,  // .***...**..
-     0x0000030C,  // .**....**..
-     0x0000030C,  // .**....**..
-     0x0000039E,  // .***..****.
-     0x000001E6,  // ..****..**.
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 230
-     17, 22,
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00003F78,  // ...******.****...
-     0x000073FC,  // ..***..********..
-     0x00006186,  // ..**....**....**.
-     0x00000386,  // .......***....**.
-     0x00003FFE,  // ...*************.
-     0x00007180,  // ..***...**.......
-     0x00006180,  // ..**....**.......
-     0x000061C6,  // ..**....***...**.
-     0x000073FE,  // ..***..*********.
-     0x00003D78,  // ...****.*.****...
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-     0x00000000,  // .................
-  },
-  {             // 231
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000007C,  // ...*****..
-     0x000000FE,  // ..*******.
-     0x000000C6,  // ..**...**.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000000C6,  // ..**...**.
-     0x000000FE,  // ..*******.
-     0x0000007C,  // ...*****..
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x000000D8,  // ..**.**...
-     0x000000F0,  // ..****....
-  },
-  {             // 232
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 233
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000060,  // ...**.....
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 234
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 235
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000078,  // ...****...
-     0x000000FC,  // ..******..
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000001FE,  // .********.
-     0x00000180,  // .**.......
-     0x00000180,  // .**.......
-     0x000001C6,  // .***...**.
-     0x000000FE,  // ..*******.
-     0x00000078,  // ...****...
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 236
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x0000000C,  // **..
-     0x00000006,  // .**.
-     0x00000003,  // ..**
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 237
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000003,  // ..**
-     0x00000006,  // .**.
-     0x0000000C,  // **..
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 238
-     6, 22,
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000001E,  // .****.
-     0x00000033,  // **..**
-     0x00000000,  // ......
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x0000000C,  // ..**..
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-     0x00000000,  // ......
-  },
-  {             // 239
-     5, 22,
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000001B,  // **.**
-     0x0000001B,  // **.**
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x0000000C,  // .**..
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-     0x00000000,  // .....
-  },
-  {             // 240
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x0000038E,  // .***...***.
-     0x000003FE,  // .*********.
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x000000F6,  // ...****.**.
-     0x000001FE,  // ..********.
-     0x00000186,  // ..**....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018E,  // ..**...***.
-     0x000001FE,  // ..********.
-     0x000000F6,  // ...****.**.
-     0x00000006,  // ........**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x00000070,  // ....***....
-  },
-  {             // 241
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000064,  // ...**..*..
-     0x000000B4,  // ..*.**.*..
-     0x00000098,  // ..*..**...
-     0x00000000,  // ..........
-     0x000001BC,  // .**.****..
-     0x000001FE,  // .********.
-     0x000001C6,  // .***...**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 242
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C0,  // ...**......
-     0x00000060,  // ....**.....
-     0x00000030,  // .....**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 243
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000018,  // ......**...
-     0x00000030,  // .....**....
-     0x00000060,  // ....**.....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 244
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000060,  // ....**.....
-     0x000000F0,  // ...****....
-     0x00000198,  // ..**..**...
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 245
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000C8,  // ...**..*...
-     0x00000168,  // ..*.**.*...
-     0x00000130,  // ..*..**....
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 246
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000CC,  // ...**..**..
-     0x000000CC,  // ...**..**..
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x000000F8,  // ...*****...
-     0x000001FC,  // ..*******..
-     0x0000018C,  // ..**...**..
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x00000306,  // .**.....**.
-     0x0000018C,  // ..**...**..
-     0x000001FC,  // ..*******..
-     0x000000F8,  // ...*****...
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 247
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x000001FE,  // .********.
-     0x000001FE,  // .********.
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 248
-     11, 22,
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000073,  // ....***..**
-     0x000001FE,  // ..********.
-     0x0000018C,  // ..**...**..
-     0x0000031E,  // .**...****.
-     0x00000336,  // .**..**.**.
-     0x00000366,  // .**.**..**.
-     0x000003C6,  // .****...**.
-     0x0000018C,  // ..**...**..
-     0x000003FC,  // .********..
-     0x00000670,  // **..***....
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-     0x00000000,  // ...........
-  },
-  {             // 249
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000060,  // ...**.....
-     0x00000030,  // ....**....
-     0x00000018,  // .....**...
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 250
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x0000000C,  // ......**..
-     0x00000018,  // .....**...
-     0x00000030,  // ....**....
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 251
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000030,  // ....**....
-     0x00000078,  // ...****...
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 252
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x0000018E,  // .**...***.
-     0x000001FE,  // .********.
-     0x000000F6,  // ..****.**.
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-  },
-  {             // 253
-     4, 22,
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000006,  // .**.
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-     0x00000000,  // ....
-  },
-  {             // 254
-     9, 22,
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x00000000,  // .........
-     0x0000003C,  // ...****..
-     0x0000007E,  // ..******.
-     0x000000C6,  // .**...**.
-     0x000000C0,  // .**......
-     0x000000FC,  // .******..
-     0x0000003E,  // ...*****.
-     0x00000006,  // ......**.
-     0x000000C6,  // .**...**.
-     0x000000FC,  // .******..
-     0x00000078,  // ..****...
-     0x00000030,  // ...**....
-     0x00000038,  // ...***...
-     0x0000000C,  // .....**..
-     0x0000006C,  // ..**.**..
-     0x00000078,  // ..****...
-  },
-  {             // 255
-     10, 22,
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000000,  // ..........
-     0x00000000,  // ..........
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x00000186,  // .**....**.
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x000000CC,  // ..**..**..
-     0x00000048,  // ...*..*...
-     0x00000078,  // ...****...
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x00000030,  // ....**....
-     0x000000E0,  // ..***.....
-     0x000000E0,  // ..***.....
-  },
-  };
diff --git a/genfontfile.c b/genfontfile.c
deleted file mode 100644
index 9dc6bce4e..000000000
--- a/genfontfile.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* Copyright (c) Mark J. Kilgard, 1997. */
-
-/* This program is freely distributable without licensing fees  and is
-   provided without guarantee or warrantee expressed or  implied. This
-   program is -not- in the public domain. */
-
-/* X compile line: cc -o gentexfont gentexfont.c -lX11 */
-
-/* 2000-10-01: Stripped down the original code to get a simple bitmap C-code generator  */
-/*             for use with the VDR project (see http://www.cadsoft.de/vdr)             */
-/*             Renamed the file 'genfontfile.c' since it no longer generates 'tex' data */
-/*             Klaus Schmidinger (kls@cadsoft.de)                                       */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <math.h>
-
-typedef struct {
-  unsigned short c;       /* Potentially support 16-bit glyphs. */
-  unsigned char width;
-  unsigned char height;
-  signed char xoffset;
-  signed char yoffset;
-  signed char advance;
-  char dummy;           /* Space holder for alignment reasons. */
-  short x;
-  short y;
-} TexGlyphInfo;
-
-typedef struct {
-  short width;
-  short height;
-  short xoffset;
-  short yoffset;
-  short advance;
-  unsigned char *bitmap;
-} PerGlyphInfo, *PerGlyphInfoPtr;
-
-typedef struct {
-  int min_char;
-  int max_char;
-  int max_ascent;
-  int max_descent;
-  PerGlyphInfo glyph[1];
-} FontInfo, *FontInfoPtr;
-
-Display *dpy;
-FontInfoPtr fontinfo;
-
-/* #define REPORT_GLYPHS */
-#ifdef REPORT_GLYPHS
-#define DEBUG_GLYPH4(msg,a,b,c,d) printf(msg,a,b,c,d)
-#define DEBUG_GLYPH(msg) printf(msg)
-#else
-#define DEBUG_GLYPH4(msg,a,b,c,d) { /* nothing */ }
-#define DEBUG_GLYPH(msg) { /* nothing */ }
-#endif
-
-#define MAX_GLYPHS_PER_GRAB 512  /* this is big enough for 2^9 glyph
-                                    character sets */
-
-FontInfoPtr
-SuckGlyphsFromServer(Display * dpy, Font font)
-{
-  Pixmap offscreen;
-  XFontStruct *fontinfo;
-  XImage *image;
-  GC xgc;
-  XGCValues values;
-  int numchars;
-  int width, height, pixwidth;
-  int i, j;
-  XCharStruct *charinfo;
-  XChar2b character;
-  unsigned char *bitmapData;
-  int x, y;
-  int spanLength;
-  int charWidth, charHeight, maxSpanLength;
-  int grabList[MAX_GLYPHS_PER_GRAB];
-  int glyphsPerGrab = MAX_GLYPHS_PER_GRAB;
-  int numToGrab, thisglyph;
-  FontInfoPtr myfontinfo;
-
-  fontinfo = XQueryFont(dpy, font);
-  if (!fontinfo)
-    return NULL;
-
-  numchars = fontinfo->max_char_or_byte2 - fontinfo->min_char_or_byte2 + 1;
-  if (numchars < 1)
-    return NULL;
-
-  myfontinfo = (FontInfoPtr) malloc(sizeof(FontInfo) + (numchars - 1) * sizeof(PerGlyphInfo));
-  if (!myfontinfo)
-    return NULL;
-
-  myfontinfo->min_char = fontinfo->min_char_or_byte2;
-  myfontinfo->max_char = fontinfo->max_char_or_byte2;
-  myfontinfo->max_ascent = fontinfo->max_bounds.ascent;
-  myfontinfo->max_descent = fontinfo->max_bounds.descent;
-
-  width = fontinfo->max_bounds.rbearing - fontinfo->min_bounds.lbearing;
-  height = fontinfo->max_bounds.ascent + fontinfo->max_bounds.descent;
-
-  maxSpanLength = (width + 7) / 8;
-  /* Be careful determining the width of the pixmap; the X protocol allows
-     pixmaps of width 2^16-1 (unsigned short size) but drawing coordinates
-     max out at 2^15-1 (signed short size).  If the width is too large, we
-     need to limit the glyphs per grab.  */
-  if ((glyphsPerGrab * 8 * maxSpanLength) >= (1 << 15)) {
-    glyphsPerGrab = (1 << 15) / (8 * maxSpanLength);
-  }
-  pixwidth = glyphsPerGrab * 8 * maxSpanLength;
-  offscreen = XCreatePixmap(dpy, RootWindow(dpy, DefaultScreen(dpy)),
-    pixwidth, height, 1);
-
-  values.font = font;
-  values.background = 0;
-  values.foreground = 0;
-  xgc = XCreateGC(dpy, offscreen, GCFont | GCBackground | GCForeground, &values);
-
-  XFillRectangle(dpy, offscreen, xgc, 0, 0, 8 * maxSpanLength * glyphsPerGrab, height);
-  XSetForeground(dpy, xgc, 1);
-
-  numToGrab = 0;
-  if (fontinfo->per_char == NULL) {
-    charinfo = &(fontinfo->min_bounds);
-    charWidth = charinfo->rbearing - charinfo->lbearing;
-    charHeight = charinfo->ascent + charinfo->descent;
-    spanLength = (charWidth + 7) / 8;
-  }
-  for (i = 0; i < numchars; i++) {
-    if (fontinfo->per_char != NULL) {
-      charinfo = &(fontinfo->per_char[i]);
-      charWidth = charinfo->rbearing - charinfo->lbearing;
-      charHeight = charinfo->ascent + charinfo->descent;
-      if (charWidth == 0 || charHeight == 0) {
-        /* Still must move raster pos even if empty character */
-        myfontinfo->glyph[i].width = 0;
-        myfontinfo->glyph[i].height = 0;
-        myfontinfo->glyph[i].xoffset = 0;
-        myfontinfo->glyph[i].yoffset = 0;
-        myfontinfo->glyph[i].advance = charinfo->width;
-        myfontinfo->glyph[i].bitmap = NULL;
-        goto PossiblyDoGrab;
-      }
-    }
-    grabList[numToGrab] = i;
-
-    /* XXX is this right for large fonts? */
-    character.byte2 = (i + fontinfo->min_char_or_byte2) & 255;
-    character.byte1 = (i + fontinfo->min_char_or_byte2) >> 8;
-
-    /* XXX we could use XDrawImageString16 which would also paint the backing
-
-       rectangle but X server bugs in some scalable font rasterizers makes it
-
-       more effective to do XFillRectangles to clear the pixmap and
-       XDrawImage16 for the text.  */
-    XDrawString16(dpy, offscreen, xgc,
-      -charinfo->lbearing + 8 * maxSpanLength * numToGrab,
-      charinfo->ascent, &character, 1);
-
-    numToGrab++;
-
-  PossiblyDoGrab:
-
-    if (numToGrab >= glyphsPerGrab || i == numchars - 1) {
-      image = XGetImage(dpy, offscreen,
-        0, 0, pixwidth, height, 1, XYPixmap);
-      for (j = 0; j < numToGrab; j++) {
-        thisglyph = grabList[j];
-        if (fontinfo->per_char != NULL) {
-          charinfo = &(fontinfo->per_char[thisglyph]);
-          charWidth = charinfo->rbearing - charinfo->lbearing;
-          charHeight = charinfo->ascent + charinfo->descent;
-          spanLength = (charWidth + 7) / 8;
-        }
-        bitmapData = (unsigned char *)calloc(height * spanLength, sizeof(char));
-        if (!bitmapData)
-          goto FreeFontAndReturn;
-        DEBUG_GLYPH4("index %d, glyph %d (%d by %d)\n",
-          j, thisglyph + fontinfo->min_char_or_byte2, charWidth, charHeight);
-        for (y = 0; y < charHeight; y++) {
-          for (x = 0; x < charWidth; x++) {
-            /* XXX The algorithm used to suck across the font ensures that
-               each glyph begins on a byte boundary.  In theory this would
-               make it convienent to copy the glyph into a byte oriented
-               bitmap.  We actually use the XGetPixel function to extract
-               each pixel from the image which is not that efficient.  We
-               could either do tighter packing in the pixmap or more
-               efficient extraction from the image.  Oh well.  */
-            if (XGetPixel(image, j * maxSpanLength * 8 + x, charHeight - 1 - y)) {
-              DEBUG_GLYPH("x");
-              bitmapData[y * spanLength + x / 8] |= (1 << (x & 7));
-            } else {
-              DEBUG_GLYPH(" ");
-            }
-          }
-          DEBUG_GLYPH("\n");
-        }
-        myfontinfo->glyph[thisglyph].width = charWidth;
-        myfontinfo->glyph[thisglyph].height = charHeight;
-        myfontinfo->glyph[thisglyph].xoffset = charinfo->lbearing;
-        myfontinfo->glyph[thisglyph].yoffset = -charinfo->descent;
-        myfontinfo->glyph[thisglyph].advance = charinfo->width;
-        myfontinfo->glyph[thisglyph].bitmap = bitmapData;
-      }
-      XDestroyImage(image);
-      numToGrab = 0;
-      /* do we need to clear the offscreen pixmap to get more? */
-      if (i < numchars - 1) {
-        XSetForeground(dpy, xgc, 0);
-        XFillRectangle(dpy, offscreen, xgc, 0, 0, 8 * maxSpanLength * glyphsPerGrab, height);
-        XSetForeground(dpy, xgc, 1);
-      }
-    }
-  }
-  XFreeGC(dpy, xgc);
-  XFreePixmap(dpy, offscreen);
-  return myfontinfo;
-
-FreeFontAndReturn:
-  XDestroyImage(image);
-  XFreeGC(dpy, xgc);
-  XFreePixmap(dpy, offscreen);
-  for (j = i - 1; j >= 0; j--) {
-    if (myfontinfo->glyph[j].bitmap)
-      free(myfontinfo->glyph[j].bitmap);
-  }
-  free(myfontinfo);
-  return NULL;
-}
-
-void
-printGlyph(FontInfoPtr font, int c)
-{
-  PerGlyphInfoPtr glyph;
-  unsigned char *bitmapData;
-  int width, height, spanLength, charWidth;
-  int x, y, l;
-  char buf[1000], *b;
-
-  if (c < font->min_char || c > font->max_char) {
-    fprintf(stderr, "out of range glyph\n");
-    exit(1);
-  }
-  glyph = &font->glyph[c - font->min_char];
-  bitmapData = glyph->bitmap;
-    width = glyph->width;
-    spanLength = (width + 7) / 8;
-    height = glyph->height;
-    charWidth = glyph->xoffset + width;
-    if (charWidth < glyph->advance)
-       charWidth = glyph->advance;
-
-    printf("  {             // %d\n", c);
-    printf("     %d, %d,\n", charWidth, font->max_ascent + font->max_descent);
-    for (y = 0; y < font->max_ascent - glyph->yoffset - height; y++) {
-        printf("     0x%08X,  // ", 0);
-        for (x = 0; x < charWidth; x++)
-            putchar('.');
-        putchar('\n');
-        }
-    for (y = height; y-- > 0;) {
-        l = 0;
-        b = buf;
-        for (x = 0; x < glyph->xoffset; x++)
-            *b++ = '.';
-        if (bitmapData) {
-           for (x = 0; x < width; x++) {
-               l <<= 1;
-               if (bitmapData[y * spanLength + x / 8] & (1 << (x & 7))) {
-                  *b++ = '*';
-                  l |= 1;
-                  }
-               else
-                  *b++ = '.';
-               }
-           for (x = 0; x < glyph->advance - width - glyph->xoffset; x++) {
-               *b++ = '.';
-               l <<= 1;
-               }
-           }
-        *b = 0;
-        printf("     0x%08X,  // %s\n", l, buf);
-        }
-    for (y = 0; y < font->max_descent + glyph->yoffset; y++) {
-        printf("     0x%08X,  // ", 0);
-        for (x = 0; x < glyph->xoffset + width || x < glyph->advance; x++)
-            putchar('.');
-        putchar('\n');
-        }
-    printf("  },\n");
-}
-
-void
-getMetric(FontInfoPtr font, int c, TexGlyphInfo * tgi)
-{
-  PerGlyphInfoPtr glyph;
-  unsigned char *bitmapData;
-
-  tgi->c = c;
-  if (c < font->min_char || c > font->max_char) {
-    tgi->width = 0;
-    tgi->height = 0;
-    tgi->xoffset = 0;
-    tgi->yoffset = 0;
-    tgi->dummy = 0;
-    tgi->advance = 0;
-    return;
-  }
-  glyph = &font->glyph[c - font->min_char];
-  bitmapData = glyph->bitmap;
-  if (bitmapData) {
-    tgi->width = glyph->width;
-    tgi->height = glyph->height;
-    tgi->xoffset = glyph->xoffset;
-    tgi->yoffset = glyph->yoffset;
-  } else {
-    tgi->width = 0;
-    tgi->height = 0;
-    tgi->xoffset = 0;
-    tgi->yoffset = 0;
-  }
-  tgi->dummy = 0;
-  tgi->advance = glyph->advance;
-}
-
-int
-main(int argc, char *argv[])
-{
-  int c;
-  TexGlyphInfo tgi;
-  int usageError = 0;
-  char *varname, *fontname;
-  XFontStruct *xfont;
-  int i;
-
-  if (argc == 3) {
-     varname  = argv[1];
-     fontname = argv[2];
-     }
-  else
-     usageError = 1;
-
-  if (usageError) {
-    fprintf(stderr, "\n");
-    fprintf(stderr, "usage: genfontfile variable_name X_font_name\n");
-    fprintf(stderr, "\n");
-    exit(1);
-  }
-
-  dpy = XOpenDisplay(NULL);
-  if (!dpy) {
-    fprintf(stderr, "could not open display\n");
-    exit(1);
-  }
-  /* find an OpenGL-capable RGB visual with depth buffer */
-  xfont = XLoadQueryFont(dpy, fontname);
-  if (!xfont) {
-    fprintf(stderr, "could not get load X font: %s\n", fontname);
-    exit(1);
-  }
-  fontinfo = SuckGlyphsFromServer(dpy, xfont->fid);
-  if (!fontinfo) {
-    fprintf(stderr, "could not get font glyphs\n");
-    exit(1);
-  }
-
-  printf("static const %s[][%d] = {\n", varname, fontinfo->max_ascent + fontinfo->max_descent + 2);
-  for (c = 32; c < 256; c++) {
-      getMetric(fontinfo, c, &tgi);
-      printGlyph(fontinfo, c);
-      }
-  printf("  };\n");
-  return 0;
-}
diff --git a/i18n.c b/i18n.c
index 533810bb3..88832d77e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.293 2007/03/11 10:05:36 kls Exp $
+ * $Id: i18n.c 1.294 2007/06/09 08:44:54 kls Exp $
  *
  * Translations provided by:
  *
@@ -3138,6 +3138,7 @@ const tI18nPhrase Phrases[] = {
     "CAM",
     "CAM",
     "CAM",
+    "CAM",
   },
   { "Recording",
     "Aufnahme",
@@ -3554,6 +3555,167 @@ const tI18nPhrase Phrases[] = {
     "v�dy",
     "hep",
   },
+  { "Setup.OSD$Anti-alias",
+    "Kantengl�ttung",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$OSD font name",
+    "OSD Schriftart",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Small font name",
+    "Kleine Schriftart",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Fixed font name",
+    "Festbreiten-Schriftart",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$OSD font size (pixel)",
+    "OSD Schriftgr��e (pixel)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Small font size (pixel)",
+    "Kleine Schriftgr��e (pixel)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
+  { "Setup.OSD$Fixed font size (pixel)",
+    "Festbreiten-Schriftgr��e (pixel)",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { "Setup.OSD$Channel info position",
     "Kanalinfo-Position",
     "Pozicija informacije o kanalu",
@@ -5021,7 +5183,7 @@ const tI18nPhrase Phrases[] = {
     " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9",
     " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9",
     "",//TODO
-    "",//TODO
+    " 0\t-.#~,/_@1\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9",
     "",//TODO
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9",
     " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
@@ -6603,25 +6765,33 @@ const tI18nPhrase Phrases[] = {
 class cI18nEntry : public cListObject {
 private:
   const tI18nPhrase *phrases;
+  tI18nPhrase *converted;
   const char *plugin;
 public:
   cI18nEntry(const tI18nPhrase * const Phrases, const char *Plugin);
+  virtual ~cI18nEntry();
   const tI18nPhrase *Phrases(void) { return phrases; }
+  tI18nPhrase **Converted(void) { return &converted; }
   const char *Plugin(void) { return plugin; }
   };
 
 cI18nEntry::cI18nEntry(const tI18nPhrase * const Phrases, const char *Plugin)
 {
   phrases = Phrases;
+  converted = NULL;
   plugin = Plugin;
 }
 
+cI18nEntry::~cI18nEntry()
+{
+  delete converted;
+}
+
 // --- cI18nList -------------------------------------------------------------
 
 class cI18nList : public cList<cI18nEntry> {
 public:
   cI18nEntry *Get(const char *Plugin);
-  const tI18nPhrase *GetPhrases(const char *Plugin);
   };
 
 cI18nEntry *cI18nList::Get(const char *Plugin)
@@ -6635,16 +6805,28 @@ cI18nEntry *cI18nList::Get(const char *Plugin)
   return NULL;
 }
 
-const tI18nPhrase *cI18nList::GetPhrases(const char *Plugin)
-{
-  cI18nEntry *p = Get(Plugin);
-  return p ? p->Phrases() : NULL;
-}
-
 cI18nList I18nList;
 
 // ---
 
+static tI18nPhrase *Converted = NULL;
+
+static const char *ConvertPhrase(const tI18nPhrase *Original, tI18nPhrase **Converted, int NrPhrase, int NrLanguage)
+{
+  if (!*Converted) {
+     int NumPhrases = 0;
+     for (const tI18nPhrase *p = Original; **p; p++)
+         NumPhrases++;
+     *Converted = new tI18nPhrase[NumPhrases + 1];
+     memset(*Converted, 0, sizeof(tI18nPhrase) * (NumPhrases + 1));
+     }
+  if (!(*Converted)[NrPhrase][NrLanguage]) {
+     cCharSetConv csc(Phrases[1][NrLanguage], cCharSetConv::SystemCharacterTable());
+     (*Converted)[NrPhrase][NrLanguage] = strdup(csc.Convert(Original[NrPhrase][NrLanguage]));
+     }
+  return (*Converted)[NrPhrase][NrLanguage];
+}
+
 void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin)
 {
   cI18nEntry *p = I18nList.Get(Plugin);
@@ -6657,13 +6839,14 @@ void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin)
 const char *I18nTranslate(const char *s, const char *Plugin)
 {
   if (Setup.OSDLanguage) {
-     const tI18nPhrase *p = Plugin ? I18nList.GetPhrases(Plugin) : Phrases;
-     if (!p)
-        p = Phrases;
+     cI18nEntry *e = Plugin ? I18nList.Get(Plugin) : NULL;
+     const tI18nPhrase *OriginalPhrases = e ? e->Phrases() : Phrases;
+     tI18nPhrase **ConvertedPhrases = e ? e->Converted() : &Converted;
+     const tI18nPhrase *p = OriginalPhrases;
      for (int i = ((p == Phrases) ? 1 : 2); i--; ) {
          for (; **p; p++) {
              if (strcmp(s, **p) == 0) {
-                const char *t = (*p)[Setup.OSDLanguage];
+                const char *t = ConvertPhrase(OriginalPhrases, ConvertedPhrases, p - OriginalPhrases, Setup.OSDLanguage);
                 if (t && *t)
                    return t;
                 }
@@ -6678,7 +6861,11 @@ const char *I18nTranslate(const char *s, const char *Plugin)
 
 const char * const * I18nLanguages(void)
 {
-  return &Phrases[0][0];
+  if (!Converted || !(Converted)[0][0]) {
+     for (int i = 0; i < I18nNumLanguages; i++)
+         ConvertPhrase(Phrases, &Converted, 0, i);
+     }
+  return &Converted[0][0];
 }
 
 const char * const * I18nCharSets(void)
diff --git a/i18n.h b/i18n.h
index 085dd924f..7f9f0659c 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.19 2007/03/11 09:52:16 kls Exp $
+ * $Id: i18n.h 1.20 2007/05/28 11:43:14 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -21,7 +21,6 @@ void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin);
 const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1);
 
 const char * const * I18nLanguages(void);
-const char * const * I18nCharSets(void);
 const char *I18nLanguageCode(int Index);
 int I18nLanguageIndex(const char *Code);
 const char *I18nNormalizeLanguageCode(const char *Code);
diff --git a/libsi/si.c b/libsi/si.c
index a1d2f3459..2eb3dfd63 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.18 2007/04/22 13:56:39 kls Exp $
+ *   $Id: si.c 1.20 2007/06/10 09:31:34 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -219,7 +219,9 @@ char *String::getText() {
    int len=getLength();
    if (len < 0 || len > 4095)
       return strdup("text error"); // caller will delete it!
-   char *data=new char(len+1);
+   char *data=new char(len+1); // FIXME If this function is ever actually used, this buffer might
+                               // need to be bigger in order to hold the string as UTF-8.
+                               // Maybe decodeText should dynamically handle this? kls 2007-06-10
    decodeText(data, len+1);
    return data;
 }
@@ -370,7 +372,7 @@ static bool convertCharacterTable(const char *from, size_t fromLength, char *to,
 {
   if (SystemCharacterTable) {
      iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
-     if (cd >= 0) {
+     if (cd != (iconv_t)-1) {
         char *fromPtr = (char *)from;
         while (fromLength > 0 && toLength > 1) {
            if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {
@@ -404,6 +406,9 @@ void String::decodeText(char *buffer, int size) {
       }
    bool singleByte;
    const char *cs = getCharacterTable(from, len, &singleByte);
+   // FIXME Need to make this UTF-8 aware (different control codes).
+   // However, there's yet to be found a broadcaster that actually
+   // uses UTF-8 for the SI data... (kls 2007-06-10)
    for (int i = 0; i < len; i++) {
       if (*from == 0)
          break;
@@ -440,6 +445,9 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
       }
    bool singleByte;
    const char *cs = getCharacterTable(from, len, &singleByte);
+   // FIXME Need to make this UTF-8 aware (different control codes).
+   // However, there's yet to be found a broadcaster that actually
+   // uses UTF-8 for the SI data... (kls 2007-06-10)
    for (int i = 0; i < len; i++) {
       if (    ((' ' <= *from) && (*from <= '~'))
            || (*from == '\n')
diff --git a/menu.c b/menu.c
index 9e76ebed9..47e9c3d9b 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.450 2007/02/25 14:04:33 kls Exp $
+ * $Id: menu.c 1.451 2007/06/09 14:36:46 kls Exp $
  */
 
 #include "menu.h"
@@ -761,7 +761,7 @@ void cMenuTimerItem::Set(void)
 {
   cString day, name("");
   if (timer->WeekDays())
-     day = timer->PrintDay(0, timer->WeekDays());
+     day = timer->PrintDay(0, timer->WeekDays(), false);
   else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {
      day = itoa(timer->GetMDay(timer->Day()));
      name = WeekDayName(timer->Day());
@@ -1052,10 +1052,11 @@ bool cMenuScheduleItem::Update(bool Force)
      char t = TimerMatchChars[timerMatch];
      char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
      char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' ';
+     const char *csn = channel ? channel->ShortName(true) : NULL;
      if (channel && withDate)
-        asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
+        asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
      else if (channel)
-        asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), 6, channel->ShortName(true), *event->GetTimeString(), t, v, r, event->Title());
+        asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title());
      else
         asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
      SetText(buffer, false);
@@ -2157,7 +2158,10 @@ class cMenuSetupOSD : public cMenuSetupBase {
   int skinIndex;
   const char **skinDescriptions;
   cThemes themes;
+  int originalThemeIndex;
   int themeIndex;
+  cFileNameList fontNames;
+  int fontOsdIndex, fontSmlIndex, fontFixIndex;
   virtual void Set(void);
 public:
   cMenuSetupOSD(void);
@@ -2171,13 +2175,18 @@ cMenuSetupOSD::cMenuSetupOSD(void)
   skinIndex = originalSkinIndex = Skins.Current()->Index();
   skinDescriptions = new const char*[numSkins];
   themes.Load(Skins.Current()->Name());
-  themeIndex = Skins.Current()->Theme() ? themes.GetThemeIndex(Skins.Current()->Theme()->Description()) : 0;
+  themeIndex = originalThemeIndex = Skins.Current()->Theme() ? themes.GetThemeIndex(Skins.Current()->Theme()->Description()) : 0;
+  fontNames.Load(FONTDIR);
+  if (fontNames.Size()) {
+     fontOsdIndex = max(0, fontNames.Find(Setup.FontOsd));
+     fontSmlIndex = max(0, fontNames.Find(Setup.FontSml));
+     fontFixIndex = max(0, fontNames.Find(Setup.FontFix));
+     }
   Set();
 }
 
 cMenuSetupOSD::~cMenuSetupOSD()
 {
-  cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
   delete[] skinDescriptions;
 }
 
@@ -2201,6 +2210,15 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDHeight, MINOSDHEIGHT, MAXOSDHEIGHT));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Use small font"),         &data.UseSmallFont, 3, useSmallFontTexts));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Anti-alias"),             &data.AntiAlias));
+  if (fontNames.Size()) {
+  Add(new cMenuEditStraItem(tr("Setup.OSD$OSD font name"),          &fontOsdIndex, fontNames.Size(), &fontNames[0]));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Small font name"),        &fontSmlIndex, fontNames.Size(), &fontNames[0]));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font name"),        &fontFixIndex, fontNames.Size(), &fontNames[0]));
+  }
+  Add(new cMenuEditIntItem( tr("Setup.OSD$OSD font size (pixel)"),  &data.FontOsdSize, 10, MAXFONTSIZE));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Small font size (pixel)"),&data.FontSmlSize, 10, MAXFONTSIZE));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Fixed font size (pixel)"),&data.FontFixSize, 10, MAXFONTSIZE));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Channel info time (s)"),  &data.ChannelInfoTime, 1, 60));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
@@ -2215,29 +2233,57 @@ void cMenuSetupOSD::Set(void)
 
 eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
 {
+  bool ModifiedApperance = false;
+
   if (Key == kOk) {
      if (skinIndex != originalSkinIndex) {
         cSkin *Skin = Skins.Get(skinIndex);
         if (Skin) {
            strn0cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin));
            Skins.SetCurrent(Skin->Name());
+           ModifiedApperance = true;
            }
         }
      if (themes.NumThemes() && Skins.Current()->Theme()) {
         Skins.Current()->Theme()->Load(themes.FileName(themeIndex));
         strn0cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme));
+        ModifiedApperance |= themeIndex != originalThemeIndex;
+        }
+     if (data.OSDLeft != Setup.OSDLeft || data.OSDTop != Setup.OSDTop || data.OSDWidth != Setup.OSDWidth || data.OSDHeight != Setup.OSDHeight) {
+        data.OSDWidth &= ~0x07; // OSD width must be a multiple of 8
+        ModifiedApperance = true;
+        }
+     if (data.UseSmallFont != Setup.UseSmallFont || data.AntiAlias != Setup.AntiAlias)
+        ModifiedApperance = true;
+     if (fontNames.Size()) {
+        strn0cpy(data.FontOsd, fontNames[fontOsdIndex], sizeof(data.FontOsd));
+        strn0cpy(data.FontSml, fontNames[fontSmlIndex], sizeof(data.FontSml));
+        strn0cpy(data.FontFix, fontNames[fontFixIndex], sizeof(data.FontFix));
+        }
+     if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSize != Setup.FontOsdSize) {
+        cFont::SetFont(fontOsd, data.FontOsd, data.FontOsdSize);
+        ModifiedApperance = true;
+        }
+     if (strcmp(data.FontSml, Setup.FontSml) || data.FontSmlSize != Setup.FontSmlSize) {
+        cFont::SetFont(fontSml, data.FontSml, data.FontSmlSize);
+        ModifiedApperance = true;
+        }
+     if (strcmp(data.FontFix, Setup.FontFix) || data.FontFixSize != Setup.FontFixSize) {
+        cFont::SetFont(fontFix, data.FontFix, data.FontFixSize);
+        ModifiedApperance = true;
         }
-     data.OSDWidth &= ~0x07; // OSD width must be a multiple of 8
      }
 
   int osdLanguage = data.OSDLanguage;
   int oldSkinIndex = skinIndex;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
+  if (ModifiedApperance)
+     SetDisplayMenu();
+
   if (data.OSDLanguage != osdLanguage || skinIndex != oldSkinIndex) {
      int OriginalOSDLanguage = Setup.OSDLanguage;
      Setup.OSDLanguage = data.OSDLanguage;
-     cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
 
      cSkin *Skin = Skins.Get(skinIndex);
      if (Skin) {
@@ -2910,10 +2956,8 @@ bool cMenuMain::Update(bool Force)
         int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
         int Hours = Minutes / 60;
         Minutes %= 60;
-        char buffer[40];
-        snprintf(buffer, sizeof(buffer), "%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free"));
         //XXX -> skin function!!!
-        SetTitle(buffer);
+        SetTitle(cString::sprintf("%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free")));
         result = true;
         }
      lastDiskSpaceCheck = time(NULL);
diff --git a/menuitems.c b/menuitems.c
index 366989dc4..1b8a5742d 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.48 2007/01/04 13:30:37 kls Exp $
+ * $Id: menuitems.c 1.49 2007/06/08 15:16:38 kls Exp $
  */
 
 #include "menuitems.h"
 #include <ctype.h>
+#include <wctype.h>
 #include "i18n.h"
 #include "plugin.h"
 #include "remote.h"
@@ -252,23 +253,64 @@ eOSState cMenuEditChrItem::ProcessKey(eKeys Key)
 cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed)
 :cMenuEditItem(Name)
 {
-  orgValue = NULL;
   value = Value;
   length = Length;
-  allowed = strdup(Allowed ? Allowed : "");
+  allowed = Allowed;
   pos = -1;
+  offset = 0;
   insert = uppercase = false;
   newchar = true;
-  charMap = tr(" 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9");
-  currentChar = NULL;
+  lengthUtf8 = 0;
+  valueUtf8 = NULL;
+  allowedUtf8 = NULL;
+  charMapUtf8 = NULL;
+  currentCharUtf8 = NULL;
   lastKey = kNone;
   Set();
 }
 
 cMenuEditStrItem::~cMenuEditStrItem()
 {
-  free(orgValue);
-  free(allowed);
+  delete valueUtf8;
+  delete allowedUtf8;
+  delete charMapUtf8;
+}
+
+void cMenuEditStrItem::EnterEditMode(void)
+{
+  if (!valueUtf8) {
+     valueUtf8 = new uint[length];
+     lengthUtf8 = Utf8ToArray(value, valueUtf8, length);
+     int l = strlen(allowed) + 1;
+     allowedUtf8 = new uint[l];
+     Utf8ToArray(allowed, allowedUtf8, l);
+     const char *charMap = tr(" 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9");
+     l = strlen(charMap) + 1;
+     charMapUtf8 = new uint[l];
+     Utf8ToArray(charMap, charMapUtf8, l);
+     currentCharUtf8 = charMapUtf8;
+     AdvancePos();
+     }
+}
+
+void cMenuEditStrItem::LeaveEditMode(bool SaveValue)
+{
+  if (valueUtf8) {
+     if (SaveValue) {
+        Utf8FromArray(valueUtf8, value, length);
+        stripspace(value);
+        }
+     lengthUtf8 = 0;
+     delete valueUtf8;
+     valueUtf8 = NULL;
+     delete allowedUtf8;
+     allowedUtf8 = NULL;
+     delete charMapUtf8;
+     charMapUtf8 = NULL;
+     pos = -1;
+     offset = 0;
+     newchar = true;
+     }
 }
 
 void cMenuEditStrItem::SetHelpKeys(void)
@@ -279,84 +321,120 @@ void cMenuEditStrItem::SetHelpKeys(void)
      cSkinDisplay::Current()->SetButtons(NULL);
 }
 
+uint *cMenuEditStrItem::IsAllowed(uint c)
+{
+  if (allowedUtf8) {
+     for (uint *a = allowedUtf8; *a; a++) {
+         if (c == *a)
+            return a;
+         }
+     }
+  return NULL;
+}
+
 void cMenuEditStrItem::AdvancePos(void)
 {
-  if (pos < length - 2 && pos < int(strlen(value)) ) {
-     if (++pos >= int(strlen(value))) {
-        if (pos >= 2 && value[pos - 1] == ' ' && value[pos - 2] == ' ')
+  if (pos < length - 2 && pos < lengthUtf8) {
+     if (++pos >= lengthUtf8) {
+        if (pos >= 2 && valueUtf8[pos - 1] == ' ' && valueUtf8[pos - 2] == ' ')
            pos--; // allow only two blanks at the end
         else {
-           value[pos] = ' ';
-           value[pos + 1] = 0;
+           valueUtf8[pos] = ' ';
+           valueUtf8[pos + 1] = 0;
+           lengthUtf8++;
            }
         }
      }
   newchar = true;
-  if (!insert && isalpha(value[pos]))
-     uppercase = isupper(value[pos]);
+  if (!insert && Utf8is(alpha, valueUtf8[pos]))
+     uppercase = Utf8is(upper, valueUtf8[pos]);
 }
 
 void cMenuEditStrItem::Set(void)
 {
-  char buf[1000];
-
   if (InEditMode()) {
      // This is an ugly hack to make editing strings work with the 'skincurses' plugin.
      const cFont *font = dynamic_cast<cSkinDisplayMenu *>(cSkinDisplay::Current())->GetTextAreaFont(false);
      if (!font || font->Width("W") != 1) // all characters have with == 1 in the font used by 'skincurses'
         font = cFont::GetFont(fontOsd);
-     strncpy(buf, value, pos);
-     snprintf(buf + pos, sizeof(buf) - pos - 2, insert && newchar ? "[]%c%s" : "[%c]%s", *(value + pos), value + pos + 1);
+
      int width = cSkinDisplay::Current()->EditableWidth();
-     if (font->Width(buf) <= width) {
-        // the whole buffer fits on the screen
-        SetValue(buf);
-        return;
-        }
-     width -= font->Width('>'); // assuming '<' and '>' have the same width
-     int w = 0;
-     int i = 0;
-     int l = strlen(buf);
-     while (i < l && w <= width)
-           w += font->Width(buf[i++]);
-     if (i >= pos + 4) {
-        // the cursor fits on the screen
-        buf[i - 1] = '>';
-        buf[i] = 0;
-        SetValue(buf);
-        return;
-        }
-     // the cursor doesn't fit on the screen
-     w = 0;
-     if (buf[i = pos + 3]) {
-        buf[i] = '>';
-        buf[i + 1] = 0;
-        }
-     else
-        i--;
-     while (i >= 0 && w <= width)
-           w += font->Width(buf[i--]);
-     buf[++i] = '<';
-     SetValue(buf + i);
+     width -= font->Width("[]");
+     width -= font->Width("<>"); // reserving this anyway make the whole thing simpler
+
+     if (pos < offset)
+        offset = pos;
+     int WidthFromOffset = 0;
+     int EndPos = lengthUtf8;
+     for (int i = offset; i < lengthUtf8; i++) {
+         WidthFromOffset += font->Width(valueUtf8[i]);
+         if (WidthFromOffset > width) {
+            if (pos >= i) {
+               do {
+                  WidthFromOffset -= font->Width(valueUtf8[offset]);
+                  offset++;
+                  } while (WidthFromOffset > width && offset < pos);
+               EndPos = pos + 1;
+               }
+            else {
+               EndPos = i;
+               break;
+               }
+            }
+         }
+
+     char buf[1000];
+     char *p = buf;
+     if (offset)
+        *p++ = '<';
+     p += Utf8FromArray(valueUtf8 + offset, p, sizeof(buf) - (p - buf), pos - offset);
+     *p++ = '[';
+     if (insert && newchar)
+        *p++ = ']';
+     p += Utf8FromArray(&valueUtf8[pos], p, sizeof(buf) - (p - buf), 1);
+     if (!(insert && newchar))
+        *p++ = ']';
+     p += Utf8FromArray(&valueUtf8[pos + 1], p, sizeof(buf) - (p - buf), EndPos - pos - 1);
+     if (EndPos != lengthUtf8)
+        *p++ = '>';
+     *p = 0;
+
+     SetValue(buf);
      }
   else
      SetValue(value);
 }
 
-char cMenuEditStrItem::Inc(char c, bool Up)
+uint cMenuEditStrItem::Inc(uint c, bool Up)
 {
-  const char *p = strchr(allowed, c);
+  uint *p = IsAllowed(c);
   if (!p)
-     p = allowed;
+     p = allowedUtf8;
   if (Up) {
      if (!*++p)
-        p = allowed;
+        p = allowedUtf8;
+     }
+  else if (--p < allowedUtf8) {
+     p = allowedUtf8;
+     while (*p && *(p + 1))
+           p++;
      }
-  else if (--p < allowed)
-     p = allowed + strlen(allowed) - 1;
   return *p;
 }
 
+void cMenuEditStrItem::Insert(void)
+{
+  memmove(valueUtf8 + pos + 1, valueUtf8 + pos, (lengthUtf8 - pos + 1) * sizeof(*valueUtf8));
+  lengthUtf8++;
+  valueUtf8[pos] = ' ';
+}
+
+void cMenuEditStrItem::Delete(void)
+{
+  memmove(valueUtf8 + pos, valueUtf8 + pos + 1, (lengthUtf8 - pos) * sizeof(*valueUtf8));
+  lengthUtf8--;
+}
+
 eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
 {
   bool SameKey = NORMALKEY(Key) == lastKey;
@@ -365,7 +443,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
   else if (!newchar && k0 <= lastKey && lastKey <= k9 && autoAdvanceTimeout.TimedOut()) {
      AdvancePos();
      newchar = true;
-     currentChar = NULL;
+     currentCharUtf8 = NULL;
      Set();
      return osContinue;
      }
@@ -374,7 +452,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  if (InEditMode()) {
                     if (!insert || !newchar) {
                        uppercase = !uppercase;
-                       value[pos] = uppercase ? toupper(value[pos]) : tolower(value[pos]);
+                       valueUtf8[pos] = uppercase ? Utf8to(upper, valueUtf8[pos]) : Utf8to(lower, valueUtf8[pos]);
                        }
                     }
                  else
@@ -390,21 +468,21 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     return osUnknown;
                  break;
     case kYellow|k_Repeat:
-    case kYellow: // Remove the character at current position; in insert mode it is the character to the right of cursor
+    case kYellow: // Remove the character at the current position; in insert mode it is the character to the right of the cursor
                  if (InEditMode()) {
-                    if (strlen(value) > 1) {
-                       if (!insert || pos < int(strlen(value)) - 1)
-                          memmove(value + pos, value + pos + 1, strlen(value) - pos);
-                       else if (insert && pos == int(strlen(value)) - 1)
-                          value[pos] = ' '; // in insert mode, deleting the last character replaces it with a blank to keep the cursor position
+                    if (lengthUtf8 > 1) {
+                       if (!insert || pos < lengthUtf8 - 1)
+                          Delete();
+                       else if (insert && pos == lengthUtf8 - 1)
+                          valueUtf8[pos] = ' '; // in insert mode, deleting the last character replaces it with a blank to keep the cursor position
                        // reduce position, if we removed the last character
-                       if (pos == int(strlen(value)))
+                       if (pos == lengthUtf8)
                           pos--;
                        }
-                    else if (strlen(value) == 1)
-                       value[0] = ' '; // This is the last character in the string, replace it with a blank
-                    if (isalpha(value[pos]))
-                       uppercase = isupper(value[pos]);
+                    else if (lengthUtf8 == 1)
+                       valueUtf8[0] = ' '; // This is the last character in the string, replace it with a blank
+                    if (Utf8is(alpha, valueUtf8[pos]))
+                       uppercase = Utf8is(upper, valueUtf8[pos]);
                     newchar = true;
                     }
                  else
@@ -423,13 +501,14 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                        pos--;
                     newchar = true;
                     }
-                 if (!insert && isalpha(value[pos]))
-                    uppercase = isupper(value[pos]);
+                 if (!insert && Utf8is(alpha, valueUtf8[pos]))
+                    uppercase = Utf8is(upper, valueUtf8[pos]);
                  break;
     case kRight|k_Repeat:
-    case kRight: AdvancePos();
-                 if (pos == 0) {
-                    orgValue = strdup(value);
+    case kRight: if (InEditMode())
+                    AdvancePos();
+                 else {
+                    EnterEditMode();
                     SetHelpKeys();
                     }
                  break;
@@ -439,15 +518,13 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
     case kDown:  if (InEditMode()) {
                     if (insert && newchar) {
                        // create a new character in insert mode
-                       if (int(strlen(value)) < length - 1) {
-                          memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
-                          value[pos] = ' ';
-                          }
+                       if (lengthUtf8 < length - 1)
+                          Insert();
                        }
                     if (uppercase)
-                       value[pos] = toupper(Inc(tolower(value[pos]), NORMALKEY(Key) == kUp));
+                       valueUtf8[pos] = Utf8to(upper, Inc(Utf8to(lower, valueUtf8[pos]), NORMALKEY(Key) == kUp));
                     else
-                       value[pos] =         Inc(        value[pos],  NORMALKEY(Key) == kUp);
+                       valueUtf8[pos] =               Inc(              valueUtf8[pos],  NORMALKEY(Key) == kUp);
                     newchar = false;
                     }
                  else
@@ -459,35 +536,33 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     if (!SameKey) {
                        if (!newchar)
                           AdvancePos();
-                       currentChar = NULL;
+                       currentCharUtf8 = NULL;
                        }
-                    if (!currentChar || !*currentChar || *currentChar == '\t') {
+                    if (!currentCharUtf8 || !*currentCharUtf8 || *currentCharUtf8 == '\t') {
                        // find the beginning of the character map entry for Key
                        int n = NORMALKEY(Key) - k0;
-                       currentChar = charMap;
-                       while (n > 0 && *currentChar) {
-                             if (*currentChar++ == '\t')
+                       currentCharUtf8 = charMapUtf8;
+                       while (n > 0 && *currentCharUtf8) {
+                             if (*currentCharUtf8++ == '\t')
                                 n--;
                              }
                        // find first allowed character
-                       while (*currentChar && *currentChar != '\t' && !strchr(allowed, *currentChar))
-                             currentChar++;
+                       while (*currentCharUtf8 && *currentCharUtf8 != '\t' && !IsAllowed(*currentCharUtf8))
+                             currentCharUtf8++;
                        }
-                    if (*currentChar && *currentChar != '\t') {
+                    if (*currentCharUtf8 && *currentCharUtf8 != '\t') {
                        if (insert && newchar) {
                           // create a new character in insert mode
-                          if (int(strlen(value)) < length - 1) {
-                             memmove(value + pos + 1, value + pos, strlen(value) - pos + 1);
-                             value[pos] = ' ';
-                             }
+                          if (lengthUtf8 < length - 1)
+                             Insert();
                           }
-                       value[pos] = *currentChar;
+                       valueUtf8[pos] = *currentCharUtf8;
                        if (uppercase)
-                          value[pos] = toupper(value[pos]);
+                          valueUtf8[pos] = Utf8to(upper, valueUtf8[pos]);
                        // find next allowed character
                        do {
-                          currentChar++;
-                          } while (*currentChar && *currentChar != '\t' && !strchr(allowed, *currentChar));
+                          currentCharUtf8++;
+                          } while (*currentCharUtf8 && *currentCharUtf8 != '\t' && !IsAllowed(*currentCharUtf8));
                        newchar = false;
                        autoAdvanceTimeout.Set(AUTO_ADVANCE_TIMEOUT);
                        }
@@ -498,32 +573,25 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  break;
     case kBack:
     case kOk:    if (InEditMode()) {
-                    if (Key == kBack && orgValue) {
-                       strcpy(value, orgValue);
-                       free(orgValue);
-                       orgValue = NULL;
-                       }
-                    pos = -1;
-                    newchar = true;
-                    stripspace(value);
+                    LeaveEditMode(Key == kOk);
                     SetHelpKeys();
                     break;
                     }
                  // run into default
     default:     if (InEditMode() && BASICKEY(Key) == kKbd) {
                     int c = KEYKBD(Key);
-                    if (c <= 0xFF) {
-                       const char *p = strchr(allowed, tolower(c));
+                    if (c <= 0xFF) { // FIXME what about other UTF-8 characters?
+                       uint *p = IsAllowed(Utf8to(lower, c));
                        if (p) {
-                          int l = strlen(value);
-                          if (insert && l < length - 1)
-                             memmove(value + pos + 1, value + pos, l - pos + 1);
-                          value[pos] = c;
+                          if (insert && lengthUtf8 < length - 1)
+                             Insert();
+                          valueUtf8[pos] = c;
                           if (pos < length - 2)
                              pos++;
-                          if (pos >= l) {
-                             value[pos] = ' ';
-                             value[pos + 1] = 0;
+                          if (pos >= lengthUtf8) {
+                             valueUtf8[pos] = ' ';
+                             valueUtf8[pos + 1] = 0;
+                             lengthUtf8 = pos + 1;
                              }
                           }
                        else {
@@ -540,7 +608,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     else {
                        switch (c) {
                          case kfHome: pos = 0; break;
-                         case kfEnd:  pos = strlen(value) - 1; break;
+                         case kfEnd:  pos = lengthUtf8 - 1; break;
                          case kfIns:  return ProcessKey(kGreen);
                          case kfDel:  return ProcessKey(kYellow);
                          }
@@ -690,7 +758,7 @@ void cMenuEditDateItem::Set(void)
 #define DATEBUFFERSIZE 32
   char buf[DATEBUFFERSIZE];
   if (weekdays && *weekdays) {
-     SetValue(cTimer::PrintDay(0, *weekdays));
+     SetValue(cTimer::PrintDay(0, *weekdays, false));
      return;
      }
   else if (*value) {
@@ -880,9 +948,7 @@ cMenuSetupPage::cMenuSetupPage(void)
 
 void cMenuSetupPage::SetSection(const char *Section)
 {
-  char buf[40];
-  snprintf(buf, sizeof(buf), "%s - %s", tr("Setup"), Section);
-  SetTitle(buf);
+  SetTitle(cString::sprintf("%s - %s", tr("Setup"), Section));
 }
 
 eOSState cMenuSetupPage::ProcessKey(eKeys Key)
@@ -903,9 +969,7 @@ eOSState cMenuSetupPage::ProcessKey(eKeys Key)
 void cMenuSetupPage::SetPlugin(cPlugin *Plugin)
 {
   plugin = Plugin;
-  char buf[40];
-  snprintf(buf, sizeof(buf), "%s '%s'", tr("Plugin"), plugin->Name());
-  SetSection(buf);
+  SetSection(cString::sprintf("%s '%s'", tr("Plugin"), plugin->Name()));
 }
 
 void cMenuSetupPage::SetupStore(const char *Name, const char *Value)
diff --git a/menuitems.h b/menuitems.h
index 2454f95a9..50778b161 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.20 2006/04/14 10:01:47 kls Exp $
+ * $Id: menuitems.h 1.21 2007/06/08 11:53:37 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -77,22 +77,29 @@ class cMenuEditChrItem : public cMenuEditItem {
 
 class cMenuEditStrItem : public cMenuEditItem {
 private:
-  char *orgValue;
   char *value;
   int length;
-  char *allowed;
-  int pos;
+  const char *allowed;
+  int pos, offset;
   bool insert, newchar, uppercase;
-  const char *charMap;
-  const char *currentChar;
+  int lengthUtf8;
+  uint *valueUtf8;
+  uint *allowedUtf8;
+  uint *charMapUtf8;
+  uint *currentCharUtf8;
   eKeys lastKey;
   cTimeMs autoAdvanceTimeout;
   void SetHelpKeys(void);
+  uint *IsAllowed(uint c);
   void AdvancePos(void);
   virtual void Set(void);
-  char Inc(char c, bool Up);
+  uint Inc(uint c, bool Up);
+  void Insert(void);
+  void Delete(void);
 protected:
-  bool InEditMode(void) { return pos >= 0; }
+  void EnterEditMode(void);
+  void LeaveEditMode(bool SaveValue = false);
+  bool InEditMode(void) { return valueUtf8 != NULL; }
 public:
   cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
   ~cMenuEditStrItem();
diff --git a/newplugin b/newplugin
index dbb56e6d7..30622868d 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.31 2007/02/24 13:23:08 kls Exp $
+# $Id: newplugin 1.32 2007/04/28 14:46:39 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -61,7 +61,7 @@ $MAKEFILE = qq
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IPORTANT: the presence of this macro is important for the Make.config
+# IMPORTANT: the presence of this macro is important for the Make.config
 # file. So it must be defined, even if it is not used here!
 #
 PLUGIN = $PLUGIN_NAME
@@ -217,7 +217,7 @@ bool cPlugin${PLUGIN_CLASS}::Start(void)
 
 void cPlugin${PLUGIN_CLASS}::Stop(void)
 {
-  // Stop any background activities the plugin shall perform.
+  // Stop any background activities the plugin is performing.
 }
 
 void cPlugin${PLUGIN_CLASS}::Housekeeping(void)
diff --git a/nit.c b/nit.c
index 4f5356212..9291c9604 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.13 2006/10/28 12:31:04 kls Exp $
+ * $Id: nit.c 1.14 2007/04/29 11:35:33 kls Exp $
  */
 
 #include "nit.h"
@@ -144,17 +144,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                         if (Setup.UpdateChannels >= 5) {
-                           if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { // only modify channels if we're actually receiving this transponder
-                              if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
-                                 for (int n = 0; n < NumFrequencies; n++) {
-                                     if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
-                                        Frequency = Frequencies[n];
-                                        break;
-                                        }
+                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
+                              for (int n = 0; n < NumFrequencies; n++) {
+                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
+                                     Frequency = Frequencies[n];
+                                     break;
                                      }
-                                 }
-                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
+                                  }
                               }
+                           if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder
+                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
                            }
                         found = true;
                         }
@@ -195,17 +194,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                         if (Setup.UpdateChannels >= 5) {
-                           if (ISTRANSPONDER(Frequency / 1000, Transponder())) { // only modify channels if we're actually receiving this transponder
-                              if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
-                                 for (int n = 0; n < NumFrequencies; n++) {
-                                     if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
-                                        Frequency = Frequencies[n];
-                                        break;
-                                        }
+                           if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
+                              for (int n = 0; n < NumFrequencies; n++) {
+                                  if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
+                                     Frequency = Frequencies[n];
+                                     break;
                                      }
-                                 }
-                              Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
+                                  }
                               }
+                           if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder
+                              Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
                            }
                         found = true;
                         }
@@ -253,17 +251,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                      if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                         if (Setup.UpdateChannels >= 5) {
-                           if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { // only modify channels if we're actually receiving this transponder
-                              if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
-                                 for (int n = 0; n < NumFrequencies; n++) {
-                                     if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
-                                        Frequency = Frequencies[n];
-                                        break;
-                                        }
+                           if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
+                              for (int n = 0; n < NumFrequencies; n++) {
+                                  if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
+                                     Frequency = Frequencies[n];
+                                     break;
                                      }
-                                 }
-                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
+                                  }
                               }
+                           if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
+                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
                            }
                         found = true;
                         }
diff --git a/nit.h b/nit.h
index f0655cded..c4ac82b58 100644
--- a/nit.h
+++ b/nit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.h 1.2 2004/01/18 11:13:48 kls Exp $
+ * $Id: nit.h 1.3 2007/06/10 08:50:21 kls Exp $
  */
 
 #ifndef __NIT_H
@@ -13,7 +13,7 @@
 #include "filter.h"
 
 #define MAXNITS 16
-#define MAXNETWORKNAME 256
+#define MAXNETWORKNAME Utf8BufSize(256)
 
 class cNitFilter : public cFilter {
 private:
diff --git a/osd.c b/osd.c
index 64f475dda..0031eaede 100644
--- a/osd.c
+++ b/osd.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.68 2007/02/17 16:05:52 kls Exp $
+ * $Id: osd.c 1.69 2007/06/10 12:16:36 kls Exp $
  */
 
 #include "osd.h"
 #include <math.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -20,6 +21,18 @@
 cPalette::cPalette(int Bpp)
 {
   SetBpp(Bpp);
+  SetAntiAliasGranularity(10, 10);
+}
+
+void cPalette::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
+{
+  if (FixedColors >= MAXNUMCOLORS || BlendColors == 0)
+     antiAliasGranularity = MAXNUMCOLORS - 1;
+  else {
+     int ColorsForBlending = MAXNUMCOLORS - FixedColors;
+     int ColorsPerBlend = ColorsForBlending / BlendColors + 2; // +2 = the full foreground and background colors, which are amoung the fixed colors
+     antiAliasGranularity = double(MAXNUMCOLORS - 1) / (ColorsPerBlend - 1);
+     }
 }
 
 void cPalette::Reset(void)
@@ -30,18 +43,23 @@ void cPalette::Reset(void)
 
 int cPalette::Index(tColor Color)
 {
+  // Check if color is already defined:
   for (int i = 0; i < numColors; i++) {
       if (color[i] == Color)
          return i;
       }
+  // No exact color, try a close one:
+  int i = ClosestColor(Color, 4);
+  if (i >= 0)
+     return i;
+  // No close one, try to define a new one:
   if (numColors < maxColors) {
      color[numColors++] = Color;
      modified = true;
      return numColors - 1;
      }
-  dsyslog("too many different colors used in palette");
-  //TODO: return the index of the "closest" color?
-  return 0;
+  // Out of colors, so any close color must do:
+  return ClosestColor(Color);
 }
 
 void cPalette::SetBpp(int Bpp)
@@ -91,6 +109,48 @@ void cPalette::Replace(const cPalette &Palette)
   for (int i = 0; i < Palette.numColors; i++)
       SetColor(i, Palette.color[i]);
   numColors = Palette.numColors;
+  antiAliasGranularity = Palette.antiAliasGranularity;
+}
+
+tColor cPalette::Blend(tColor ColorFg, tColor ColorBg, uint8_t Level)
+{
+  if (antiAliasGranularity > 0)
+     Level = uint8_t(int(Level / antiAliasGranularity + 0.5) * antiAliasGranularity);
+  int Af = (ColorFg & 0xFF000000) >> 24;
+  int Rf = (ColorFg & 0x00FF0000) >> 16;
+  int Gf = (ColorFg & 0x0000FF00) >>  8;
+  int Bf = (ColorFg & 0x000000FF);
+  int Ab = (ColorBg & 0xFF000000) >> 24;
+  int Rb = (ColorBg & 0x00FF0000) >> 16;
+  int Gb = (ColorBg & 0x0000FF00) >>  8;
+  int Bb = (ColorBg & 0x000000FF);
+  int A = (Ab + (Af - Ab) * Level / 0xFF) & 0xFF;
+  int R = (Rb + (Rf - Rb) * Level / 0xFF) & 0xFF;
+  int G = (Gb + (Gf - Gb) * Level / 0xFF) & 0xFF;
+  int B = (Bb + (Bf - Bb) * Level / 0xFF) & 0xFF;
+  return (A << 24) | (R << 16) | (G << 8) | B;
+}
+
+int cPalette::ClosestColor(tColor Color, int MaxDiff)
+{
+  int n = 0;
+  int d = INT_MAX;
+  int A1 = (Color & 0xFF000000) >> 24;
+  int R1 = (Color & 0x00FF0000) >> 16;
+  int G1 = (Color & 0x0000FF00) >>  8;
+  int B1 = (Color & 0x000000FF);
+  for (int i = 0; i < numColors; i++) {
+      int A2 = (color[i] & 0xFF000000) >> 24;
+      int R2 = (color[i] & 0x00FF0000) >> 16;
+      int G2 = (color[i] & 0x0000FF00) >>  8;
+      int B2 = (color[i] & 0x000000FF);
+      int diff = (abs(A1 - A2) << 1) + (abs(R1 - R2) << 1) + (abs(G1 - G2) << 1) + (abs(B1 - B2) << 1);
+      if (diff < d) {
+         d = diff;
+         n = i;
+         }
+      }
+  return d <= MaxDiff ? n : -1;
 }
 
 // --- cBitmap ---------------------------------------------------------------
@@ -424,26 +484,7 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
         return;
      x -= x0;
      y -= y0;
-     tIndex fg = Index(ColorFg);
-     tIndex bg = (ColorBg != clrTransparent) ? Index(ColorBg) : 0;
-     while (s && *s) {
-           const cFont::tCharData *CharData = Font->CharData(*s++);
-           if (limit && int(x + CharData->width) > limit)
-              break; // we don't draw partial characters
-           if (int(x + CharData->width) > 0) {
-              for (int row = 0; row < h; row++) {
-                  cFont::tPixelData PixelData = CharData->lines[row];
-                  for (int col = CharData->width; col-- > 0; ) {
-                      if (ColorBg != clrTransparent || (PixelData & 1))
-                         SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
-                      PixelData >>= 1;
-                      }
-                  }
-              }
-           x += CharData->width;
-           if (x > width - 1)
-              break;
-           }
+     Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
      }
 }
 
@@ -623,6 +664,12 @@ cOsd::~cOsd()
   isOpen--;
 }
 
+void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
+{
+  for (int i = 0; i < numBitmaps; i++)
+      bitmaps[i]->SetAntiAliasGranularity(FixedColors, BlendColors);
+}
+
 cBitmap *cOsd::GetBitmap(int Area)
 {
   return Area < numBitmaps ? bitmaps[Area] : NULL;
diff --git a/osd.h b/osd.h
index 0e9eb3c94..3adfd7f76 100644
--- a/osd.h
+++ b/osd.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.53 2006/02/26 14:45:05 kls Exp $
+ * $Id: osd.h 1.54 2007/06/10 12:15:52 kls Exp $
  */
 
 #ifndef __OSD_H
 #define __OSD_H
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include "font.h"
@@ -41,7 +42,7 @@ enum eOsdError { oeOk,
                  oeUnknown,
                };
 
-typedef uint32_t tColor;
+typedef uint32_t tColor; // see also font.h
 typedef uint8_t tIndex;
 
 class cPalette {
@@ -50,11 +51,22 @@ class cPalette {
   int bpp;
   int maxColors, numColors;
   bool modified;
+  double antiAliasGranularity;
 protected:
   typedef tIndex tIndexes[MAXNUMCOLORS];
 public:
   cPalette(int Bpp = 8);
         ///< Initializes the palette with the given color depth.
+  void SetAntiAliasGranularity(uint FixedColors, uint BlendColors);
+        ///< Allows the system to optimize utilization of the limited color
+        ///< palette entries when generating blended colors for anti-aliasing.
+        ///< FixedColors is the maximum number of colors used, and BlendColors
+        ///< is the maximum number of foreground/background color combinations
+        ///< used with anti-aliasing. If this function is not called with
+        ///< useful values, the palette may be filled up with many shades of
+        ///< a single color combination, and may not be able to serve all
+        ///< requested colors. By default the palette assumes there will be
+        ///< 10 fixed colors and 10 color combinations.
   int Bpp(void) { return bpp; }
   void Reset(void);
         ///< Resets the palette, making it contain no colors.
@@ -62,7 +74,7 @@ class cPalette {
         ///< Returns the index of the given Color (the first color has index 0).
         ///< If Color is not yet contained in this palette, it will be added if
         ///< there is a free slot. If the color can't be added to this palette,
-        ///< 0 will be returned.
+        ///< the closest existing color will be returned.
   tColor Color(int Index) { return Index < maxColors ? color[Index] : 0; }
         ///< Returns the color at the given Index. If Index is outside the valid
         ///< range, 0 will be returned.
@@ -88,6 +100,18 @@ class cPalette {
   void Replace(const cPalette &Palette);
         ///< Replaces the colors of this palette with the colors from the given
         ///< palette.
+  tColor Blend(tColor ColorFg, tColor ColorBg, uint8_t Level);
+        ///< Determines a color that consists of a linear blend between ColorFg
+        ///< and ColorBg. If Level is 0, the result is ColorBg, if it is 255,
+        ///< the result is ColorFg. If SetAntiAliasGranularity() has been called previously,
+        ///< Level will be mapped to a limited range of levels that allow to make best
+        ///< use of the palette entries.
+  int ClosestColor(tColor Color, int MaxDiff = INT_MAX);
+        ///< Returns the index of a color in this paltte that is closest to the given
+        ///< Color. MaxDiff can be used to control the maximum allowed color difference.
+        ///< If no color with a maximum difference of MaxDiff can be found, -1 will
+        ///< be returned. With the default value of INT_MAX, there will always be
+        ///< a valid color index returned, but the color may be completely different.
   };
 
 enum eTextAlignment { taCenter  = 0x00,
@@ -98,6 +122,8 @@ enum eTextAlignment { taCenter  = 0x00,
                       taDefault = taTop | taLeft
                     };
 
+class cFont;
+
 class cBitmap : public cPalette {
 private:
   tIndex *bitmap;
@@ -202,6 +228,8 @@ class cBitmap : public cPalette {
        ///< 7: vertical,   falling, upper
   const tIndex *Data(int x, int y);
        ///< Returns the address of the index byte at the given coordinates.
+  tColor GetColor(int x, int y) { return Color(*Data(x, y)); }
+       ///< Returns the color at the given coordinates.
   };
 
 struct tArea {
@@ -247,6 +275,16 @@ class cOsd {
   int Top(void) { return top; }
   int Width(void) { return width; }
   int Height(void) { return height; }
+  void SetAntiAliasGranularity(uint FixedColors, uint BlendColors);
+       ///< Allows the system to optimize utilization of the limited color
+       ///< palette entries when generating blended colors for anti-aliasing.
+       ///< FixedColors is the maximum number of colors used, and BlendColors
+       ///< is the maximum number of foreground/background color combinations
+       ///< used with anti-aliasing. If this function is not called with
+       ///< useful values, the palette may be filled up with many shades of
+       ///< a single color combination, and may not be able to serve all
+       ///< requested colors. By default the palette assumes there will be
+       ///< 10 fixed colors and 10 color combinations.
   cBitmap *GetBitmap(int Area);
        ///< Returns a pointer to the bitmap for the given Area, or NULL if no
        ///< such bitmap exists.
diff --git a/osdbase.c b/osdbase.c
index 5a43321d6..173734961 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.30 2007/01/05 10:41:16 kls Exp $
+ * $Id: osdbase.c 1.31 2007/06/09 10:07:46 kls Exp $
  */
 
 #include "osdbase.h"
@@ -86,10 +86,8 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   subMenu = NULL;
   helpRed = helpGreen = helpYellow = helpBlue = NULL;
   status = NULL;
-  if (!displayMenuCount++) {
-     displayMenu = Skins.Current()->DisplayMenu();
-     displayMenuItems = displayMenu->MaxItems();
-     }
+  if (!displayMenuCount++)
+     SetDisplayMenu();
 }
 
 cOsdMenu::~cOsdMenu()
@@ -103,15 +101,25 @@ cOsdMenu::~cOsdMenu()
      DELETENULL(displayMenu);
 }
 
+void cOsdMenu::SetDisplayMenu(void)
+{
+  if (displayMenu) {
+     displayMenu->Clear();
+     delete displayMenu;
+     }
+  displayMenu = Skins.Current()->DisplayMenu();
+  displayMenuItems = displayMenu->MaxItems();
+}
+
 const char *cOsdMenu::hk(const char *s)
 {
-  static char buffer[64];
+  static cString buffer;
   if (s && hasHotkeys) {
      if (digit == 0 && '1' <= *s && *s <= '9' && *(s + 1) == ' ')
         digit = -1; // prevents automatic hotkeys - input already has them
      if (digit >= 0) {
         digit++;
-        snprintf(buffer, sizeof(buffer), " %c %s", (digit < 10) ? '0' + digit : ' ' , s);
+        buffer = cString::sprintf(" %c %s", (digit < 10) ? '0' + digit : ' ' , s);
         s = buffer;
         }
      }
diff --git a/osdbase.h b/osdbase.h
index fac1a57a0..032a64ed9 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.15 2007/01/05 10:41:32 kls Exp $
+ * $Id: osdbase.h 1.16 2007/06/09 11:49:00 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -96,6 +96,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   int digit;
   bool hasHotkeys;
 protected:
+  void SetDisplayMenu(void);
   cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
   const char *hk(const char *s);
   void SetCols(int c0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
diff --git a/remote.c b/remote.c
index bbc73787c..c7eb7fb97 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.56 2007/02/24 13:23:12 kls Exp $
+ * $Id: remote.c 1.57 2007/04/30 12:27:56 kls Exp $
  */
 
 #include "remote.h"
@@ -31,6 +31,7 @@ cMutex cRemote::mutex;
 cCondVar cRemote::keyPressed;
 const char *cRemote::keyMacroPlugin = NULL;
 const char *cRemote::callPlugin = NULL;
+bool cRemote::enabled = true;
 time_t cRemote::lastActivity = 0;
 
 cRemote::cRemote(const char *Name)
@@ -185,7 +186,7 @@ eKeys cRemote::Get(int WaitMs, char **UnknownCode)
          if ((k & k_Repeat) != 0)
             repeatTimeout.Set(REPEATTIMEOUT);
          lastActivity = time(NULL);
-         return k;
+         return enabled ? k : kNone;
          }
       else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut())
          return kNone;
diff --git a/remote.h b/remote.h
index fb3268978..a38d66160 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.39 2007/02/24 15:53:00 kls Exp $
+ * $Id: remote.h 1.40 2007/04/30 12:37:37 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -31,6 +31,7 @@ class cRemote : public cListObject {
   static time_t lastActivity;
   static const char *keyMacroPlugin;
   static const char *callPlugin;
+  static bool enabled;
   char *name;
 protected:
   cRemote(const char *Name);
@@ -45,6 +46,8 @@ class cRemote : public cListObject {
   const char *Name(void) { return name; }
   static void SetLearning(cRemote *Learning) { learning = Learning; }
   static bool IsLearning() { return learning != NULL; }
+  static bool Enabled(void) { return enabled; }
+  static void SetEnabled(bool Enabled) { enabled = Enabled; }
   static void Clear(void);
   static bool Put(eKeys Key, bool AtFront = false);
   static bool PutMacro(eKeys Key);
diff --git a/sdt.c b/sdt.c
index f42b08551..29422d8aa 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.16 2006/04/15 14:12:21 kls Exp $
+ * $Id: sdt.c 1.17 2007/06/10 08:50:49 kls Exp $
  */
 
 #include "sdt.h"
@@ -56,9 +56,9 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    case 0x04: // NVOD reference service
                    case 0x05: // NVOD time-shifted service
                         {
-                        char NameBuf[1024];
-                        char ShortNameBuf[1024];
-                        char ProviderNameBuf[1024];
+                        char NameBuf[Utf8BufSize(1024)];
+                        char ShortNameBuf[Utf8BufSize(1024)];
+                        char ProviderNameBuf[Utf8BufSize(1024)];
                         sd->serviceName.getText(NameBuf, ShortNameBuf, sizeof(NameBuf), sizeof(ShortNameBuf));
                         char *pn = compactspace(NameBuf);
                         char *ps = compactspace(ShortNameBuf);
diff --git a/skinclassic.c b/skinclassic.c
index 0bc96b056..b3395a6fc 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.15 2006/03/31 13:59:50 kls Exp $
+ * $Id: skinclassic.c 1.16 2007/06/10 12:42:02 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -94,8 +94,13 @@ cSkinClassicDisplayChannel::cSkinClassicDisplayChannel(bool WithInfo)
   message = false;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - Lines * lineHeight));
   timeWidth = font->Width("00:00") + 4;
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight - 1, 4 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
   osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, Theme.Color(clrBackground));
 }
 
@@ -142,7 +147,9 @@ void cSkinClassicDisplayChannel::Flush(void)
 {
   if (!message) {
      cString date = DayDateTime();
-     osd->DrawText(osd->Width() - cFont::GetFont(fontSml)->Width(date) - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml));
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(date);
+     osd->DrawText(osd->Width() - w - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml), w);
      }
   osd->Flush();
 }
@@ -155,6 +162,7 @@ class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
   int x0, x1;
   int y0, y1, y2, y3, y4, y5;
   int lineHeight;
+  cString lastDate;
   void SetScrollbar(void);
 public:
   cSkinClassicDisplayMenu(void);
@@ -187,15 +195,20 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
   y4 = y5 - lineHeight;
   y3 = y4 - lineHeight;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop);
-  tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 4 } };
-  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x1 - 1, y1 - 1, 2 },
-                       { x0, y1, x1 - 1, y3 - 1, 2 },
-                       { x0, y3, x1 - 1, y5 - 1, 4 }
-                     };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 4 } };
+     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { x0, y0, x1 - 1, y1 - 1, 2 },
+                          { x0, y1, x1 - 1, y3 - 1, 2 },
+                          { x0, y3, x1 - 1, y5 - 1, 4 }
+                        };
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      }
   osd->DrawRectangle(x0, y0, x1 - 1, y5 - 1, Theme.Color(clrBackground));
 }
@@ -305,9 +318,10 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
   ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
-     asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
+     asprintf(&buffer, " VPS: %s ", *Event->GetVpsString());
      const cFont *font = cFont::GetFont(fontSml);
-     osd->DrawText(x1 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font);
+     int w = font->Width(buffer);
+     osd->DrawText(x1 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
      free(buffer);
      }
   y += ts.Height();
@@ -376,8 +390,12 @@ const cFont *cSkinClassicDisplayMenu::GetTextAreaFont(bool FixedFont) const
 void cSkinClassicDisplayMenu::Flush(void)
 {
   cString date = DayDateTime();
-  const cFont *font = cFont::GetFont(fontOsd);
-  osd->DrawText(x1 - font->Width(date) - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font);
+  if (!lastDate || strcmp(date, lastDate)) {
+     const cFont *font = cFont::GetFont(fontOsd);
+     int w = font->Width(date);
+     osd->DrawText(x1 - w - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font, w);
+     lastDate = date;
+     }
   osd->Flush();
 }
 
@@ -414,8 +432,13 @@ cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly)
   y2 = 2 * lineHeight;
   y3 = 3 * lineHeight;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y3);
-  tArea Areas[] = { { x0, y0, x1 - 1, y3 - 1, 4 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { x0, y0, x1 - 1, y3 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x1 - 1, y3 - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
   osd->DrawRectangle(x0, y0, x1 - 1, y3 - 1, ModeOnly ? clrTransparent : Theme.Color(clrBackground));
 }
 
@@ -455,14 +478,15 @@ void cSkinClassicDisplayReplay::SetCurrent(const char *Current)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   int w = font->Width(Current);
-  osd->DrawText(x0, y2, Current, Theme.Color(clrReplayCurrent), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : 0);
+  osd->DrawText(x0, y2, Current, Theme.Color(clrReplayCurrent), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : w);
   lastCurrentWidth = w;
 }
 
 void cSkinClassicDisplayReplay::SetTotal(const char *Total)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  osd->DrawText(x1 - font->Width(Total), y2, Total, Theme.Color(clrReplayTotal), Theme.Color(clrBackground), font);
+  int w = font->Width(Total);
+  osd->DrawText(x1 - font->Width(Total), y2, Total, Theme.Color(clrReplayTotal), Theme.Color(clrBackground), font, w);
 }
 
 void cSkinClassicDisplayReplay::SetJump(const char *Jump)
@@ -503,8 +527,13 @@ cSkinClassicDisplayVolume::cSkinClassicDisplayVolume(void)
   const cFont *font = cFont::GetFont(fontOsd);
   int lineHeight = font->Height();
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - lineHeight);
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 4 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
 }
 
 cSkinClassicDisplayVolume::~cSkinClassicDisplayVolume()
@@ -572,8 +601,13 @@ cSkinClassicDisplayTracks::cSkinClassicDisplayTracks(const char *Title, int NumT
   y1 = lineHeight;
   y2 = y1 + NumTracks * lineHeight;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y2);
-  tArea Areas[] = { { x0, y0, x1 - 1, y2 - 1, 4 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { x0, y0, x1 - 1, y2 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x1 - 1, y2 - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
   osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x1 - x0);
   for (int i = 0; i < NumTracks; i++)
       SetItem(Tracks[i], i, false);
@@ -630,8 +664,13 @@ cSkinClassicDisplayMessage::cSkinClassicDisplayMessage(void)
   const cFont *font = cFont::GetFont(fontOsd);
   int lineHeight = font->Height();
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - lineHeight);
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 2 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 2 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
 }
 
 cSkinClassicDisplayMessage::~cSkinClassicDisplayMessage()
diff --git a/skinsttng.c b/skinsttng.c
index 47a154ed8..e359c132e 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.19 2006/02/17 15:57:37 kls Exp $
+ * $Id: skinsttng.c 1.20 2007/06/10 12:40:43 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -178,8 +178,13 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      int yt = (y0 + y1) / 2;
      int yb = (y6 + y7) / 2;
      osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - y7));
-     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } };
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
      osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
      osd->DrawRectangle(x0, y6, x1 - 1, y7 - 1, clrTransparent);
@@ -211,8 +216,13 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      y0 = 0;
      y1 = lineHeight;
      osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - y1));
-     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
      osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
      osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
@@ -297,7 +307,7 @@ void cSkinSTTNGDisplayChannel::Flush(void)
         const cFont *font = cFont::GetFont(fontSml);
         cString date = DayDateTime();
         int w = font->Width(date);
-        osd->DrawText(x4 - w - 2, y7 - font->Height(date), date, Theme.Color(clrChannelDate), frameColor, font);
+        osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrChannelDate), frameColor, font, w);
         cDevice *Device = cDevice::PrimaryDevice();
         const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
         if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
@@ -333,6 +343,7 @@ class cSkinSTTNGDisplayMenu : public cSkinDisplayMenu {
   tColor frameColor;
   int currentIndex;
   bool message;
+  cString lastDate;
   void SetScrollbar(void);
 public:
   cSkinSTTNGDisplayMenu(void);
@@ -378,17 +389,22 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop);
-  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
-  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
-                       { x0, y3, x3 - 1, y4 - 1, 1 },
-                       { x3, y3, x4 - 1, y4 - 1, 2 },
-                       { x4, y3, x7 - 1, y4 - 1, 2 },
-                       { x0, y4, x7 - 1, y7 - 1, 4 }
-                     };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
+     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
+                          { x0, y3, x3 - 1, y4 - 1, 1 },
+                          { x3, y3, x4 - 1, y4 - 1, 2 },
+                          { x4, y3, x7 - 1, y4 - 1, 2 },
+                          { x0, y4, x7 - 1, y7 - 1, 4 }
+                        };
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
   osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
@@ -465,7 +481,7 @@ void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
   const char *VDR = " VDR";
   int w = font->Width(VDR);
   osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - w - x3 - 5);
-  osd->DrawText(x4 - w, y0, VDR, frameColor, clrBlack, font);
+  osd->DrawText(x4 - w, y0, VDR, frameColor, clrBlack, font, w, lineHeight);
 }
 
 void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
@@ -551,9 +567,10 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
-     asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
+     asprintf(&buffer, " VPS: %s ", *Event->GetVpsString());
      const cFont *font = cFont::GetFont(fontSml);
-     osd->DrawText(x4 - font->Width(buffer), y, buffer, Theme.Color(clrMenuEventVps), frameColor, font);
+     int w = font->Width(buffer);
+     osd->DrawText(x4 - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w);
      int yb = y + font->Height();
      osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor);
      osd->DrawEllipse  (x6, y, x7 - 1, yb - 1, frameColor, 5);
@@ -640,8 +657,12 @@ void cSkinSTTNGDisplayMenu::Flush(void)
 {
   if (!message) {
      cString date = DayDateTime();
-     const cFont *font = cFont::GetFont(fontSml);
-     osd->DrawText(x4 - font->Width(date) - 2, y7 - font->Height(date), date, Theme.Color(clrMenuDate), frameColor, font);
+     if (!lastDate || strcmp(date, lastDate)) {
+        const cFont *font = cFont::GetFont(fontSml);
+        int w = font->Width(date);
+        osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrMenuDate), frameColor, font, w);
+        lastDate = date;
+        }
      }
   osd->Flush();
 }
@@ -697,8 +718,13 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y7);
-  tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, ModeOnly ? clrTransparent : Theme.Color(clrBackground));
   if (!ModeOnly) {
      osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
@@ -760,14 +786,15 @@ void cSkinSTTNGDisplayReplay::SetCurrent(const char *Current)
 {
   const cFont *font = cFont::GetFont(fontSml);
   int w = font->Width(Current);
-  osd->DrawText(x3, y6, Current, Theme.Color(clrReplayCurrent), frameColor, font, lastCurrentWidth > w ? lastCurrentWidth : 0);
+  osd->DrawText(x3, y6, Current, Theme.Color(clrReplayCurrent), frameColor, font, lastCurrentWidth > w ? lastCurrentWidth : w);
   lastCurrentWidth = w;
 }
 
 void cSkinSTTNGDisplayReplay::SetTotal(const char *Total)
 {
   const cFont *font = cFont::GetFont(fontSml);
-  osd->DrawText(x4 - font->Width(Total) - 5, y6, Total, Theme.Color(clrReplayTotal), frameColor, font);
+  int w = font->Width(Total);
+  osd->DrawText(x4 - w - 5, y6, Total, Theme.Color(clrReplayTotal), frameColor, font, w);
 }
 
 void cSkinSTTNGDisplayReplay::SetJump(const char *Jump)
@@ -825,8 +852,13 @@ cSkinSTTNGDisplayVolume::cSkinSTTNGDisplayVolume(void)
   y0 = 0;
   y1 = lineHeight;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y1);
-  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
   osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
   osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
   osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
@@ -935,17 +967,22 @@ cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTrack
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y7);
-  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
-  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
-                       { x0, y3, x3 - 1, y4 - 1, 1 },
-                       { x3, y3, x4 - 1, y4 - 1, 2 },
-                       { x4, y3, x7 - 1, y4 - 1, 2 },
-                       { x0, y4, x7 - 1, y7 - 1, 4 }
-                     };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
+     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
+                          { x0, y3, x3 - 1, y4 - 1, 1 },
+                          { x3, y3, x4 - 1, y4 - 1, 2 },
+                          { x4, y3, x7 - 1, y4 - 1, 2 },
+                          { x0, y4, x7 - 1, y7 - 1, 4 }
+                        };
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
   osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
@@ -1057,8 +1094,13 @@ cSkinSTTNGDisplayMessage::cSkinSTTNGDisplayMessage(void)
   y0 = 0;
   y1 = lineHeight;
   osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y1);
-  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 } };
-  osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
+  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+  else {
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 } };
+     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     }
   osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
   osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
   osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
diff --git a/svdrp.c b/svdrp.c
index 8ca8afd16..96bc38368 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.100 2006/08/12 09:09:55 kls Exp $
+ * $Id: svdrp.c 1.101 2007/04/30 12:41:07 kls Exp $
  */
 
 #include "svdrp.h"
@@ -290,6 +290,9 @@ const char *HelpPages[] = {
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
   "    by itself terminates the input and starts processing of the data (all\n"
   "    entered data is buffered until the terminating '.' is seen).",
+  "REMO [ on | off ]\n"
+  "    Turns the remote control on or off. Without a parameter, the current\n"
+  "    status of the remote control is reported.",
   "SCAN\n"
   "    Forces an EPG scan. If this is a single DVB device system, the scan\n"
   "    will be done on the primary device unless it is currently recording.",
@@ -1406,6 +1409,24 @@ void cSVDRP::CmdPUTE(const char *Option)
      DELETENULL(PUTEhandler);
 }
 
+void cSVDRP::CmdREMO(const char *Option)
+{
+  if (*Option) {
+     if (!strcasecmp(Option, "ON")) {
+        cRemote::SetEnabled(true);
+        Reply(250, "Remote control enabled");
+        }
+     else if (!strcasecmp(Option, "OFF")) {
+        cRemote::SetEnabled(false);
+        Reply(250, "Remote control disabled");
+        }
+     else
+        Reply(501, "Invalid Option \"%s\"", Option);
+     }
+  else
+     Reply(250, "Remote control is %s", cRemote::Enabled() ? "enabled" : "disabled");
+}
+
 void cSVDRP::CmdSCAN(const char *Option)
 {
   EITScanner.ForceScan();
@@ -1526,6 +1547,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("PLAY"))  CmdPLAY(s);
   else if (CMD("PLUG"))  CmdPLUG(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
+  else if (CMD("REMO"))  CmdREMO(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
   else if (CMD("STAT"))  CmdSTAT(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
diff --git a/svdrp.h b/svdrp.h
index 65d2f69c5..deee42ca0 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.28 2006/08/06 08:51:09 kls Exp $
+ * $Id: svdrp.h 1.29 2007/04/30 12:28:28 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -78,6 +78,7 @@ class cSVDRP {
   void CmdPLAY(const char *Option);
   void CmdPLUG(const char *Option);
   void CmdPUTE(const char *Option);
+  void CmdREMO(const char *Option);
   void CmdSCAN(const char *Option);
   void CmdSTAT(const char *Option);
   void CmdUPDT(const char *Option);
diff --git a/timers.c b/timers.c
index 069b8578d..40791d06c 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.65 2006/09/15 14:15:53 kls Exp $
+ * $Id: timers.c 1.66 2007/06/03 13:48:57 kls Exp $
  */
 
 #include "timers.h"
@@ -136,7 +136,7 @@ cString cTimer::ToText(bool UseChannelID)
 {
   char *buffer;
   strreplace(file, ':', '|');
-  asprintf(&buffer, "%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays), start, stop, priority, lifetime, file, aux ? aux : "");
+  asprintf(&buffer, "%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays, true), start, stop, priority, lifetime, file, aux ? aux : "");
   strreplace(file, '|', ':');
   return cString(buffer, true);
 }
@@ -212,17 +212,26 @@ bool cTimer::ParseDay(const char *s, time_t &Day, int &WeekDays)
   return true;
 }
 
-cString cTimer::PrintDay(time_t Day, int WeekDays)
+cString cTimer::PrintDay(time_t Day, int WeekDays, bool SingleByteChars)
 {
-#define DAYBUFFERSIZE 32
+#define DAYBUFFERSIZE 64
   char buffer[DAYBUFFERSIZE];
   char *b = buffer;
   if (WeekDays) {
-     const char *w = tr("MTWTFSS");
+     const char *w = "MTWTFSS";
+     if (!SingleByteChars)
+        w = tr(w);
      while (*w) {
-           *b++ = (WeekDays & 1) ? *w : '-';
+           int sl = Utf8CharLen(w);
+           if (WeekDays & 1) {
+              for (int i = 0; i < sl; i++)
+                  b[i] = w[i];
+              b += sl;
+              }
+           else
+              *b++ = '-';
            WeekDays >>= 1;
-           w++;
+           w += sl;
            }
      if (Day)
         *b++ = '@';
@@ -239,7 +248,7 @@ cString cTimer::PrintDay(time_t Day, int WeekDays)
 cString cTimer::PrintFirstDay(void) const
 {
   if (weekdays) {
-     cString s = PrintDay(day, weekdays);
+     cString s = PrintDay(day, weekdays, true);
      if (strlen(s) == 18)
         return *s + 8;
      }
diff --git a/timers.h b/timers.h
index e3d5450a5..64d562b06 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.29 2006/09/04 17:07:39 kls Exp $
+ * $Id: timers.h 1.30 2007/06/03 13:24:58 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -94,7 +94,7 @@ class cTimer : public cListObject {
   cString PrintFirstDay(void) const;
   static int TimeToInt(int t);
   static bool ParseDay(const char *s, time_t &Day, int &WeekDays);
-  static cString PrintDay(time_t Day, int WeekDays);
+  static cString PrintDay(time_t Day, int WeekDays, bool SingleByteChars);
   };
 
 class cTimers : public cConfig<cTimer> {
diff --git a/tools.c b/tools.c
index db79f9580..a6af97a6d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.122 2007/01/05 10:44:57 kls Exp $
+ * $Id: tools.c 1.123 2007/06/09 14:21:21 kls Exp $
  */
 
 #include "tools.h"
@@ -570,6 +570,221 @@ uint64_t cTimeMs::Elapsed(void)
   return Now() - begin;
 }
 
+// --- UTF-8 support ---------------------------------------------------------
+
+static uint SystemToUtf8[128] = { 0 };
+
+int Utf8CharLen(const char *s)
+{
+  if (cCharSetConv::SystemCharacterTable())
+     return 1;
+#define MT(s, m, v) ((*(s) & (m)) == (v)) // Mask Test
+  if (MT(s, 0xE0, 0xC0) && MT(s + 1, 0xC0, 0x80))
+     return 2;
+  if (MT(s, 0xF0, 0xE0) && MT(s + 1, 0xC0, 0x80) && MT(s + 2, 0xC0, 0x80))
+     return 3;
+  if (MT(s, 0xF8, 0xF0) && MT(s + 1, 0xC0, 0x80) && MT(s + 2, 0xC0, 0x80) && MT(s + 3, 0xC0, 0x80))
+     return 4;
+  return 1;
+}
+
+uint Utf8CharGet(const char *s, int Length)
+{
+  if (cCharSetConv::SystemCharacterTable())
+     return (uchar)*s < 128 ? *s : SystemToUtf8[(uchar)*s - 128];
+  if (!Length)
+     Length = Utf8CharLen(s);
+  switch (Length) {
+    case 2: return ((*s & 0x1F) << 6) |  (*(s + 1) & 0x3F);
+    case 3: return ((*s & 0x0F) << 4) | ((*(s + 1) & 0x3F) << 6) |  (*(s + 2) & 0x3F);
+    case 4: return ((*s & 0x07) << 2) | ((*(s + 1) & 0x3F) << 4) | ((*(s + 2) & 0x3F) << 6) | (*(s + 3) & 0x3F);
+    }
+  return *s;
+}
+
+int Utf8CharSet(uint c, char *s)
+{
+  if (c < 0x80 || cCharSetConv::SystemCharacterTable()) {
+     if (s)
+        *s = c;
+     return 1;
+     }
+  if (c < 0x800) {
+     if (s) {
+        *s++ = ((c >> 6) & 0x1F) | 0xC0;
+        *s   = (c & 0x3F) | 0x80;
+        }
+     return 2;
+     }
+  if (c < 0x10000) {
+     if (s) {
+        *s++ = ((c >> 12) & 0x0F) | 0xE0;
+        *s++ = ((c >>  6) & 0x3F) | 0x80;
+        *s   = (c & 0x3F) | 0x80;
+        }
+     return 3;
+     }
+  if (c < 0x110000) {
+     if (s) {
+        *s++ = ((c >> 18) & 0x07) | 0xF0;
+        *s++ = ((c >> 12) & 0x3F) | 0x80;
+        *s++ = ((c >>  6) & 0x3F) | 0x80;
+        *s   = (c & 0x3F) | 0x80;
+        }
+     return 4;
+     }
+  return 0; // can't convert to UTF-8
+}
+
+int Utf8SymChars(const char *s, int Symbols)
+{
+  if (cCharSetConv::SystemCharacterTable())
+     return Symbols;
+  int n = 0;
+  while (*s && Symbols--) {
+        int sl = Utf8CharLen(s);
+        s += sl;
+        n += sl;
+        }
+  return n;
+}
+
+int Utf8ToArray(const char *s, uint *a, int Size)
+{
+  int n = 0;
+  while (*s && --Size > 0) {
+        if (cCharSetConv::SystemCharacterTable())
+           *a++ = *s++;
+        else {
+           int sl = Utf8CharLen(s);
+           *a++ = Utf8CharGet(s, sl);
+           s += sl;
+           }
+        n++;
+        }
+  if (Size > 0)
+     *a = 0;
+  return n;
+}
+
+int Utf8FromArray(const uint *a, char *s, int Size, int Max)
+{
+  int NumChars = 0;
+  int NumSyms = 0;
+  while (*a && NumChars < Size) {
+        if (Max >= 0 && NumSyms++ >= Max)
+           break;
+        if (cCharSetConv::SystemCharacterTable()) {
+           *s++ = *a++;
+           NumChars++;
+           }
+        else {
+           int sl = Utf8CharSet(*a);
+           if (NumChars + sl <= Size) {
+              Utf8CharSet(*a, s);
+              a++;
+              s += sl;
+              NumChars += sl;
+              }
+           else
+              break;
+           }
+        }
+  if (NumChars < Size)
+     *s = 0;
+  return NumChars;
+}
+
+// --- cCharSetConv ----------------------------------------------------------
+
+char *cCharSetConv::systemCharacterTable = NULL;
+
+cCharSetConv::cCharSetConv(const char *FromCode, const char *ToCode)
+{
+  if (!FromCode)
+     FromCode = systemCharacterTable;
+  if (!ToCode)
+     ToCode = "UTF-8";
+  cd = (FromCode && ToCode) ? iconv_open(ToCode, FromCode) : (iconv_t)-1;
+  result = NULL;
+  length = 0;
+}
+
+cCharSetConv::~cCharSetConv()
+{
+  free(result);
+  iconv_close(cd);
+}
+
+void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)
+{
+  free(systemCharacterTable);
+  systemCharacterTable = NULL;
+  if (!strcasestr(CharacterTable, "UTF")) {
+     // Set up a map for the character values 128...255:
+     char buf[129];
+     for (int i = 0; i < 128; i++)
+         buf[i] = i + 128;
+     buf[129] = 0;
+     cCharSetConv csc(CharacterTable);
+     const char *s = csc.Convert(buf);
+     int i = 0;
+     while (*s) {
+           int sl = Utf8CharLen(s);
+           SystemToUtf8[i] = Utf8CharGet(s, sl);
+           s += sl;
+           i++;
+           }
+     systemCharacterTable = strdup(CharacterTable);
+     }
+}
+
+const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
+{
+  if (cd != (iconv_t)-1) {
+     char *FromPtr = (char *)From;
+     size_t FromLength = strlen(From);
+     char *ToPtr = To;
+     if (!ToPtr) {
+        length = max(length, FromLength * 2); // some reserve to avoid later reallocations
+        result = (char *)realloc(result, length);
+        ToPtr = result;
+        ToLength = length;
+        }
+     else if (!ToLength)
+        return From; // can't convert into a zero sized buffer
+     ToLength--; // save space for terminating 0
+     char *Converted = ToPtr;
+     while (FromLength > 0) {
+           if (iconv(cd, &FromPtr, &FromLength, &ToPtr, &ToLength) == size_t(-1)) {
+              if (errno == E2BIG || errno == EILSEQ && ToLength < 1) {
+                 if (To)
+                    break; // caller provided a fixed size buffer, but it was too small
+                 // The result buffer is too small, so increase it:
+                 size_t d = ToPtr - result;
+                 size_t r = length / 2;
+                 length += r;
+                 result = (char *)realloc(result, length);
+                 ToLength += r;
+                 ToPtr = result + d;
+                 }
+              if (errno == EILSEQ) {
+                 // A character can't be converted, so mark it with '?' and proceed:
+                 FromPtr++;
+                 FromLength--;
+                 *ToPtr++ = '?';
+                 ToLength--;
+                 }
+              else if (errno != E2BIG)
+                 return From; // unknown error, return original string
+              }
+           }
+     *ToPtr = 0;
+     return Converted;
+     }
+  return From;
+}
+
 // --- cString ---------------------------------------------------------------
 
 cString::cString(const char *S, bool TakePointer)
@@ -607,12 +822,12 @@ cString cString::sprintf(const char *fmt, ...)
 
 cString WeekDayName(int WeekDay)
 {
-  char buffer[4];
+  char buffer[16];
   WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with Monday==0!
   if (0 <= WeekDay && WeekDay <= 6) {
      const char *day = tr("MonTueWedThuFriSatSun");
-     day += WeekDay * 3;
-     strn0cpy(buffer, day, sizeof(buffer));
+     day += Utf8SymChars(day, WeekDay * 3);
+     strn0cpy(buffer, day, min(Utf8SymChars(day, 3) + 1, int(sizeof(buffer))));
      return buffer;
      }
   else
@@ -890,6 +1105,47 @@ struct dirent *cReadDir::Next(void)
   return directory && readdir_r(directory, &u.d, &result) == 0 ? result : NULL;
 }
 
+// --- cFileNameList ---------------------------------------------------------
+
+cFileNameList::cFileNameList(const char *Directory)
+{
+  Load(Directory);
+}
+
+cFileNameList::~cFileNameList()
+{
+  for (int i = 0; i < Size(); i++)
+      free(At(i));
+}
+
+bool cFileNameList::Load(const char *Directory)
+{
+  if (Directory) {
+     cReadDir d(Directory);
+     struct dirent *e;
+     if (d.Ok()) {
+        while ((e = d.Next()) != NULL) {
+              if (strcmp(e->d_name, ".") && strcmp(e->d_name, ".."))
+                 Append(strdup(e->d_name));
+              }
+        Sort(CompareStrings);
+        return true;
+        }
+     else
+        LOG_ERROR_STR(Directory);
+     }
+  return false;
+}
+
+int cFileNameList::Find(const char *FileName)
+{
+  for (int i = 0; i < Size(); i++) {
+      if (!strcmp(FileName, At(i)))
+         return i;
+      }
+  return -1;
+}
+
 // --- cFile -----------------------------------------------------------------
 
 bool cFile::files[FD_SETSIZE] = { false };
diff --git a/tools.h b/tools.h
index 6f0737547..5d048076b 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.97 2007/01/05 10:45:11 kls Exp $
+ * $Id: tools.h 1.98 2007/06/10 08:46:23 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -13,10 +13,12 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <iconv.h>
 #include <poll.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <sys/stat.h>
@@ -72,6 +74,73 @@ template<class T> inline void put_unaligned(unsigned int v, T* p)
   ((s *)p)->v = v;
 }
 
+// When handling strings that might contain UTF-8 characters, it may be necessary
+// to process a "symbol" that consists of several actual character bytes. The
+// following functions allow transparently accessing a "char *" string without
+// having to worry about what character set is actually used.
+
+int Utf8CharLen(const char *s);
+    ///< Returns the number of character bytes at the beginning of the given
+    ///< string that form a UTF-8 symbol.
+uint Utf8CharGet(const char *s, int Length = 0);
+    ///< Returns the UTF-8 symbol at the beginning of the given string.
+    ///< Length can be given from a previous call to Utf8CharLen() to avoid calculating
+    ///< it again. If no Length is given, Utf8CharLen() will be called.
+int Utf8CharSet(uint c, char *s = NULL);
+    ///< Converts the given UTF-8 symbol to a sequence of character bytes and copies
+    ///< them to the given string. Returns the number of bytes written. If no string
+    ///< is given, only the number of bytes is returned and nothing is copied.
+int Utf8SymChars(const char *s, int Symbols);
+    ///< Returns the number of character bytes at the beginning of the given
+    ///< string that form at most the given number of UTF-8 Symbols.
+int Utf8ToArray(const char *s, uint *a, int Size);
+    ///< Converts the given character bytes (including the terminating 0) into an
+    ///< array of UTF-8 symbols of the given Size. Returns the number of symbols
+    ///< in the array (without the terminating 0).
+int Utf8FromArray(const uint *a, char *s, int Size, int Max = -1);
+    ///< Converts the given array of UTF-8 symbols (including the terminating 0)
+    ///< into a sequence of character bytes of at most Size length. Returns the
+    ///< number of character bytes written (without the terminating 0).
+    ///< If Max is given, only that many symbols will be converted.
+    ///< The resulting string is always zero-terminated if Size is big enough.
+
+// When allocating buffer space, make sure we reserve enough space to hold
+// a string in UTF-8 representation:
+
+#define Utf8BufSize(s) ((s) * 4)
+
+// The following macros automatically use the correct versions of the character
+// class functions:
+
+#define Utf8to(conv, c) (cCharSetConv::SystemCharacterTable() ? to##conv(c) : tow##conv(c))
+#define Utf8is(ccls, c) (cCharSetConv::SystemCharacterTable() ? is##ccls(c) : isw##ccls(c))
+
+class cCharSetConv {
+private:
+  iconv_t cd;
+  char *result;
+  size_t length;
+  static char *systemCharacterTable;
+public:
+  cCharSetConv(const char *FromCode = NULL, const char *ToCode = NULL);
+     ///< Sets up a character set converter to convert from FromCode to ToCode.
+     ///< If FromCode is NULL, the previously set systemCharacterTable is used.
+     ///< If ToCode is NULL, "UTF-8" is used.
+  ~cCharSetConv();
+  const char *Convert(const char *From, char *To = NULL, size_t ToLength = 0);
+     ///< Converts the given Text from FromCode to ToCode (as set in the cosntructor).
+     ///< If To is given, it is used to copy at most ToLength bytes of the result
+     ///< (including the terminating 0) into that buffer. If To is not given,
+     ///< the result is copied into a dynamically allocated buffer and is valid as
+     ///< long as this object lives, or until the next call to Convert(). The
+     ///< return value always points to the result if the conversion was successful
+     ///< (even if a fixed size To buffer was given and the result didn't fit into
+     ///< it). If the string could not be converted, the result points to the
+     ///< original From string.
+  static const char *SystemCharacterTable(void) { return systemCharacterTable; }
+  static void SetSystemCharacterTable(const char *CharacterTable);
+  };
+
 class cString {
 private:
   char *s;
@@ -320,6 +389,61 @@ template<class T> class cList : public cListBase {
   T *Next(const T *object) const { return (T *)object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
   };
 
+template<class T> class cVector {
+private:
+  mutable int allocated;
+  mutable int size;
+  mutable T *data;
+  void Realloc(int NewAllocated) const { data = (T *)realloc(data, (allocated = NewAllocated) * sizeof(T)); }
+public:
+  cVector(int Allocated = 10)
+  {
+    allocated = 0;
+    size = 0;
+    data = NULL;
+    Realloc(Allocated);
+  }
+  virtual ~cVector() { free(data); }
+  T& At(int Index) const
+  {
+    if (Index >= size)
+       Realloc(size = Index + 1);
+    return data[Index];
+  }
+  const T& operator[](int Index) const
+  {
+    return At(Index);
+  }
+  T& operator[](int Index)
+  {
+    return At(Index);
+  }
+  int Size(void) const { return size; }
+  virtual void Append(T Data)
+  {
+    if (size >= allocated)
+       Realloc(allocated * 4 / 2); // increase size by 50%
+    data[size++] = Data;
+  }
+  void Sort(__compar_fn_t Compare)
+  {
+    qsort(data, size, sizeof(T), Compare);
+  }
+  };
+
+inline int CompareStrings(const void *a, const void *b)
+{
+  return strcmp(*(const char **)a, *(const char **)b);
+}
+
+class cFileNameList : public cVector<char *> {
+public:
+  cFileNameList(const char *Directory = NULL);
+  virtual ~cFileNameList();
+  bool Load(const char *Directory);
+  int Find(const char *FileName);
+  };
+
 class cHashObject : public cListObject {
   friend class cHashBase;
 private:
diff --git a/vdr.5 b/vdr.5
index 18f942f66..99c3b09ab 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.61 2007/01/07 14:04:12 kls Exp $
+.\" $Id: vdr.5 1.62 2007/06/03 13:21:34 kls Exp $
 .\"
 .TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files"
 .SH NAME
@@ -249,9 +249,14 @@ cause the timer to record on that day. Example:
 .B MTWTF\-\-
 
 will define a timer that records on Monday through Friday and does not record
-on weekends. The same result could be achieved with \fBABCDE\-\-\fR (this is
-used to allow setting the days with language specific characters).
+on weekends.
 Note that only letters may be used here, no digits.
+For compatibility with timers created with earlier versions of VDR,
+the same result could be achieved with \fBABCDE\-\-\fR (which was
+used to allow setting the days with language specific characters).
+Since version 1.5.3 VDR can use UTF-8 characters to present data to
+the user, but the weekday encoding in the \fItimers.conf\fR file
+always uses single byte characters.
 
 The day definition of a `repeating' timer may be followed by the date when that
 timer shall hit for the first time. The format for this is \fB@YYYY\-MM\-DD\fR,
diff --git a/vdr.c b/vdr.c
index fa5d72bbe..f7ff1b58a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.287 2007/04/22 13:28:32 kls Exp $
+ * $Id: vdr.c 1.291 2007/06/09 12:33:53 kls Exp $
  */
 
 #include <getopt.h>
@@ -493,13 +493,16 @@ int main(int argc, char *argv[])
 
   // Set the system character table:
 
-  char *LangEnv = getenv("LANG");
+  char *LangEnv = setlocale(LC_CTYPE, "");
+  if (!LangEnv)
+     LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed
   if (LangEnv) {
      char *CodeSet = strchr(LangEnv, '.');
      if (CodeSet) {
         CodeSet++; // skip the dot
         bool known = SI::SetSystemCharacterTable(CodeSet);
         isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
+        cCharSetConv::SetSystemCharacterTable(CodeSet);
         }
      }
 
@@ -542,8 +545,6 @@ int main(int argc, char *argv[])
         ))
      EXIT(2);
 
-  cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]);
-
   // Recordings:
 
   Recordings.Update();
@@ -952,7 +953,7 @@ int main(int argc, char *argv[])
           case kChanDn:
                if (!Interact)
                   Menu = new cDisplayChannel(NORMALKEY(key));
-               else if (cDisplayChannel::IsOpen()) {
+               else if (cDisplayChannel::IsOpen() || cControl::Control()) {
                   Interact->ProcessKey(key);
                   continue;
                   }
@@ -1203,6 +1204,13 @@ int main(int argc, char *argv[])
 
 Exit:
 
+  // Reset all signal handlers to default before Interface gets deleted:
+  signal(SIGHUP,  SIG_DFL);
+  signal(SIGINT,  SIG_DFL);
+  signal(SIGTERM, SIG_DFL);
+  signal(SIGPIPE, SIG_DFL);
+  signal(SIGALRM, SIG_DFL);
+
   PluginManager.StopPlugins();
   cRecordControls::Shutdown();
   cCutter::Stop();

From b1e4da3be6552f58f3890bf2ad48879823d2e130 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Jun 2007 18:00:00 +0200
Subject: [PATCH 170/307] =?UTF-8?q?Version=201.5.4=20-=20Increased=20APIVE?=
 =?UTF-8?q?RSION=20(forgot=20to=20do=20that=20in=201.5.2=20and=201.5.3).?=
 =?UTF-8?q?=20-=20Fixed=20a=20crash=20in=20i18n=20character=20set=20conver?=
 =?UTF-8?q?sion=20(thanks=20to=20Alexander=20Riedel,=20=20=20Jose=20Albert?=
 =?UTF-8?q?o=20Reguero=20and=20Christian=20Wieninger=20for=20patches=20tha?=
 =?UTF-8?q?t=20cured=20part=20of=20=20=20the=20problem).=20-=20Adjusted=20?=
 =?UTF-8?q?the=20'skincurses'=20plugin=20to=20UTF-8=20handling.=20-=20Usin?=
 =?UTF-8?q?g=20nl=5Flanginfo(CODESET)=20to=20determine=20the=20local=20cod?=
 =?UTF-8?q?eset=20to=20use=20(thanks=20to=20=20=20Thomas=20G=C3=BCnther).?=
 =?UTF-8?q?=20The=20codeset=20names=20in=20'libsi/si.c'=20have=20been=20ch?=
 =?UTF-8?q?anged=20to=20the=20=20=20canonical=20spelling=20with=20'-'=20(t?=
 =?UTF-8?q?hanks=20to=20Ludwig=20Nussel=20for=20pointing=20this=20out).=20?=
 =?UTF-8?q?-=20Modified=20handling=20invalid=20characters=20in=20VFAT=20mo?=
 =?UTF-8?q?de.=20-=20Replaced=20strn0cpy()=20with=20Utf8Strn0Cpy()=20where?=
 =?UTF-8?q?=20necessary.=20-=20Now=20using=20'fontconfig'=20to=20determine?=
 =?UTF-8?q?=20which=20fonts=20to=20use=20(thanks=20to=20Anssi=20Hannula=20?=
 =?UTF-8?q?=20=20for=20code=20and=20hints=20on=20how=20to=20do=20this).=20?=
 =?UTF-8?q?-=20If=20no=20fonts=20are=20installed,=20VDR=20now=20uses=20a?=
 =?UTF-8?q?=20dummy=20font=20that=20doesn't=20actually=20draw=20=20=20any?=
 =?UTF-8?q?=20text,=20and=20logs=20an=20error=20message.=20-=20The=20new?=
 =?UTF-8?q?=20function=20cFont::CreateFont()=20can=20be=20used=20by=20plug?=
 =?UTF-8?q?ins=20to=20create=20and=20use=20=20=20fonts=20of=20their=20own,?=
 =?UTF-8?q?=20independent=20of=20VDR's=20standard=20fonts.=20-=20Updated?=
 =?UTF-8?q?=20the=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenber?=
 =?UTF-8?q?g).=20-=20Changed=20the=20parameter=20"OSD=20font"=20to=20"Defa?=
 =?UTF-8?q?ult=20font"=20in=20"Setup/OSD"=20(suggested=20=20=20by=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).=20-=20Fixed=20handling=20detached=20processes=20?=
 =?UTF-8?q?in=20SystemExec()=20(thanks=20to=20Udo=20Richter).=20-=20The=20?=
 =?UTF-8?q?info.vdr=20file=20now=20also=20stores=20the=20name=20of=20the?=
 =?UTF-8?q?=20channel,=20and=20the=20new=20function=20=20=20cRecordingInfo?=
 =?UTF-8?q?::ChannelName()=20returns=20this=20information=20if=20available?=
 =?UTF-8?q?=20(based=20on=20=20=20a=20patch=20from=20Alexander=20Hans).=20?=
 =?UTF-8?q?-=20The=20new=20function=20cOsd::SetOsdPosition()=20can=20be=20?=
 =?UTF-8?q?used=20to=20dynamically=20change=20the=20=20=20position=20and?=
 =?UTF-8?q?=20size=20of=20the=20OSD=20(based=20on=20a=20request=20from=20C?=
 =?UTF-8?q?hristoph=20Haubrich).=20=20=20Plugins=20that=20implement=20skin?=
 =?UTF-8?q?s=20should=20no=20longer=20use=20Setup.OSDWidth=20etc.=20direct?=
 =?UTF-8?q?ly,=20=20=20but=20should=20rather=20use=20cOsd::OsdWidth()=20et?=
 =?UTF-8?q?c.=20instead.=20=20=20Currently=20a=20change=20to=20the=20OSD?=
 =?UTF-8?q?=20position=20will=20only=20apply=20to=20newly=20opened=20OSDs.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  12 ++++
 HISTORY                             |  31 +++++++++
 INSTALL                             |   4 +-
 MANUAL                              |   8 +--
 Makefile                            |   4 +-
 PLUGINS/src/skincurses/HISTORY      |   4 ++
 PLUGINS/src/skincurses/Makefile     |   4 +-
 PLUGINS/src/skincurses/skincurses.c |  26 +++----
 config.c                            |  20 +++---
 config.h                            |  10 +--
 device.c                            |   4 +-
 font.c                              | 103 ++++++++++++++++++++++++++--
 font.h                              |  28 ++++++--
 i18n.c                              |  29 ++++----
 libsi/si.c                          |  94 ++++++++++++-------------
 menu.c                              |  39 +++++------
 osd.c                               |  14 +++-
 osd.h                               |  13 +++-
 recording.c                         |  39 ++++-------
 recording.h                         |   4 +-
 skinclassic.c                       |  36 +++++-----
 skinsttng.c                         |  34 ++++-----
 thread.c                            |   8 ++-
 timers.c                            |   8 +--
 tools.c                             |  74 +++++++++++++++-----
 tools.h                             |  52 ++++++++++++--
 vdr.c                               |  33 ++++++---
 27 files changed, 497 insertions(+), 238 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 471a6bc5f..e676a4f78 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -886,6 +886,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for removing the LOCK_THREAD from the LIRC thread
  for making the Makefile patch friendlier
  for a patch that was used for implementing setting the user id
+ for pointing out that the canonical spelling of codesets is with '-'
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -1012,6 +1013,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding --remove-destination to the 'cp' command for binaries in the Makefiles of
  the plugins
  for increasing the maximum number of DVB devices to 8
+ for suggesting to change the parameter "OSD font" to "Default font" in "Setup/OSD"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1495,6 +1497,7 @@ Udo Richter <udo_richter@gmx.de>
  up at a particular time
  for making the HUP signal force a restart of VDR
  for fixing a race condition with signal handlers at program exit
+ for fixing handling detached processes in SystemExec()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1739,6 +1742,7 @@ Thomas G
  for suggesting to extend the version number reported with the '-V' option to also
  show the current APIVERSION
  for fixing i18n characters for the Hungarian texts
+ for implementing using nl_langinfo(CODESET) to determine the local codeset to use
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -1841,6 +1845,7 @@ Christian Wieninger <cwieninger@gmx.de>
  from the "Schedule" menu in case it starts withing the next two minutes
  for reporting a problem with a format string in recording.c on 64bit systems
  for reporting a problem with the device selection in case of timer conflicts
+ for a patch that fixed part of a crash in i18n character set conversion
 
 Thiemo Gehrke <tgehrke@reel-multimedia.com>
  for suggesting to add a setup option to turn off the automatic timeout of the
@@ -1921,6 +1926,7 @@ Alexander Hans <cleditor@arcor.de>
  to be drawn with a transparent background
  for reporting that the "'1' for encrypted radio channels" part in the description
  of the VPID in vdr.5 is obsolete
+ for a patch that was used to implement storing the channel name in info.vdr
 
 Daniel Karsubka <dkar@gmx.de>
  for suggesting to write the epg.data file when VDR exits
@@ -1947,6 +1953,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for reporting that the log message "deleting plugin: ..." is irritating when
  calling "vdr --help"
  for fixing cDevice::ToggleMute()
+ for suggestions that led to implementing cOsd::SetOsdPosition() etc.
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2021,6 +2028,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for improving handling Transfer Mode devices when selecting a device to receive
  for fixing handling frequencies in NitFilter::Process()
  for making non-primary devices in Transfer mode be also used for recording
+ for code and hints on how to use 'fontconfig' to determine which fonts to use
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2087,3 +2095,7 @@ Krzysztof Parma <krzycho@zoz.wodzislaw.pl>
 Alexander Riedel <alexander-riedel@t-online.de>
  for a patch that was used as a base to implement support for Freetype fonts and
  UTF-8 handling
+ for a patch that fixed part of a crash in i18n character set conversion
+
+Jose Alberto Reguero <jareguero@telefonica.net>
+ for a patch that fixed part of a crash in i18n character set conversion
diff --git a/HISTORY b/HISTORY
index 90bccf247..71441c528 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5229,3 +5229,34 @@ Video Disk Recorder Revision History
 - Improved editing strings that are too long to fit into the editable area.
 - Changes to the OSD settings in the "Setup/OSD" menu now immediately take effect
   when the "Ok" key is pressed.
+
+2007-06-17: Version 1.5.4
+
+- Increased APIVERSION (forgot to do that in 1.5.2 and 1.5.3).
+- Fixed a crash in i18n character set conversion (thanks to Alexander Riedel,
+  Jose Alberto Reguero and Christian Wieninger for patches that cured part of
+  the problem).
+- Adjusted the 'skincurses' plugin to UTF-8 handling.
+- Using nl_langinfo(CODESET) to determine the local codeset to use (thanks to
+  Thomas G�nther). The codeset names in 'libsi/si.c' have been changed to the
+  canonical spelling with '-' (thanks to Ludwig Nussel for pointing this out).
+- Modified handling invalid characters in VFAT mode.
+- Replaced strn0cpy() with Utf8Strn0Cpy() where necessary.
+- Now using 'fontconfig' to determine which fonts to use (thanks to Anssi Hannula
+  for code and hints on how to do this).
+- If no fonts are installed, VDR now uses a dummy font that doesn't actually draw
+  any text, and logs an error message.
+- The new function cFont::CreateFont() can be used by plugins to create and use
+  fonts of their own, independent of VDR's standard fonts.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Changed the parameter "OSD font" to "Default font" in "Setup/OSD" (suggested
+  by Rolf Ahrenberg).
+- Fixed handling detached processes in SystemExec() (thanks to Udo Richter).
+- The info.vdr file now also stores the name of the channel, and the new function
+  cRecordingInfo::ChannelName() returns this information if available (based on
+  a patch from Alexander Hans).
+- The new function cOsd::SetOsdPosition() can be used to dynamically change the
+  position and size of the OSD (based on a request from Christoph Haubrich).
+  Plugins that implement skins should no longer use Setup.OSDWidth etc. directly,
+  but should rather use cOsd::OsdWidth() etc. instead.
+  Currently a change to the OSD position will only apply to newly opened OSDs.
diff --git a/INSTALL b/INSTALL
index 26af9d907..77ad9322b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -22,6 +22,7 @@ to work properly.
 You will also need to install the following libraries, as well as their
 "devel" packages to get the necessary header files for compiling VDR:
 
+  fontconfig
   freetype2
   libcap
   libjpeg
@@ -29,9 +30,6 @@ You will also need to install the following libraries, as well as their
 If the "capability" module is not compiled into your kernel, you may
 need to do "modprobe capability" before running VDR.
 
-When running VDR, the Freetype fonts must be installed in the directory
-/usr/share/fonts/truetype.
-
 After extracting the package, change into the VDR directory
 and type 'make'. This should produce an executable file
 named 'vdr', which can be run after the DVB driver has been
diff --git a/MANUAL b/MANUAL
index e244e46f3..86379acf2 100644
--- a/MANUAL
+++ b/MANUAL
@@ -509,10 +509,10 @@ Version 1.4
                          utilize these. If either of these conditions is not met,
                          rendering will be done without anti-aliasing.
 
-  OSD font name = arialbd.ttf
-  Small font name = arial.ttf
-  Fixed font name = courbd.ttf
-                         The file names of the various fonts to use.
+  Default font = Sans Serif:Bold
+  Small font = Sans Serif
+  Fixed font = Courier:Bold
+                         The names of the various fonts to use.
 
   OSD font size = 22
   Small font size = 18
diff --git a/Makefile b/Makefile
index 7f711db4f..7aa75f314 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.100 2007/05/28 11:22:42 kls Exp $
+# $Id: Makefile 1.101 2007/06/16 10:48:59 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -17,7 +17,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
-LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype
+LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig
 INCLUDES = -I/usr/include/freetype2
 
 PLUGINDIR= ./PLUGINS
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 96ff93c82..3204f204d 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -39,3 +39,7 @@ VDR Plugin 'skincurses' Revision History
 2006-09-10: Version 0.0.8
 
 - The size of the OSD is now adjusted to the size of the console window.
+
+2007-06-15: Version 0.1.0
+
+- Implemented UTF-8 handling.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 4f83614f8..a52f40951 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.8 2007/06/10 16:19:08 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -66,7 +66,7 @@ $(DEPFILE): Makefile
 all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 243ddcecd..33fe194d3 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.11 2006/09/10 14:23:55 kls Exp $
+ * $Id: skincurses.c 1.13 2007/06/16 09:05:04 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.0.8";
+static const char *VERSION        = "0.1.0";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -19,12 +19,10 @@ static const char *MAINMENUENTRY  = NULL;
 
 class cCursesFont : public cFont {
 public:
-  cCursesFont(void): cFont(NULL) {}
-  virtual int Width(unsigned char c) const { return 1; }
-  virtual int Width(const char *s) const { return s ? strlen(s) : 0; }
-  virtual int Height(unsigned char c) const { return 1; }
-  virtual int Height(const char *s) const { return 1; }
+  virtual int Width(uint c) const { return 1; }
+  virtual int Width(const char *s) const { return s ? Utf8StrLen(s) : 0; }
   virtual int Height(void) const { return 1; }
+  virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
   };
 
 static const cCursesFont Font;
@@ -135,6 +133,8 @@ void cCursesOsd::RestoreRegion(void)
 
 void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
 {
+  if (!s)
+     return;
   int w = Font->Width(s);
   int h = Font->Height();
   if (Width || Height) {
@@ -253,7 +253,7 @@ void cSkinCursesDisplayChannel::Flush(void)
 {
   if (!message) {
      cString date = DayDateTime();
-     osd->DrawText(OsdWidth - strlen(date), 0, date, clrWhite, clrBackground, &Font);
+     osd->DrawText(OsdWidth - Utf8StrLen(date), 0, date, clrWhite, clrBackground, &Font);
      }
   osd->Flush();
 }
@@ -388,7 +388,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
      asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
-     osd->DrawText(OsdWidth - strlen(buffer), y, buffer, clrBlack, clrYellow, &Font);
+     osd->DrawText(OsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
      free(buffer);
      }
   y += ts.Height();
@@ -443,7 +443,7 @@ void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
 void cSkinCursesDisplayMenu::Flush(void)
 {
   cString date = DayDateTime();
-  osd->DrawText(OsdWidth - strlen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
+  osd->DrawText(OsdWidth - Utf8StrLen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
   osd->Flush();
 }
 
@@ -508,12 +508,12 @@ void cSkinCursesDisplayReplay::SetProgress(int Current, int Total)
 
 void cSkinCursesDisplayReplay::SetCurrent(const char *Current)
 {
-  osd->DrawText(0, 2, Current, clrWhite, clrBackground, &Font, strlen(Current) + 3);
+  osd->DrawText(0, 2, Current, clrWhite, clrBackground, &Font, Utf8StrLen(Current) + 3);
 }
 
 void cSkinCursesDisplayReplay::SetTotal(const char *Total)
 {
-  osd->DrawText(OsdWidth - strlen(Total), 2, Total, clrWhite, clrBackground, &Font);
+  osd->DrawText(OsdWidth - Utf8StrLen(Total), 2, Total, clrWhite, clrBackground, &Font);
 }
 
 void cSkinCursesDisplayReplay::SetJump(const char *Jump)
@@ -569,7 +569,7 @@ void cSkinCursesDisplayVolume::SetVolume(int Current, int Total, bool Mute)
      }
   else {
      const char *Prompt = tr("Volume ");
-     int l = strlen(Prompt);
+     int l = Utf8StrLen(Prompt);
      int p = (OsdWidth - l) * Current / Total;
      osd->DrawText(0, 0, Prompt, clrGreen, clrBackground, &Font);
      osd->DrawRectangle(l, 0, l + p - 1, 0, clrGreen);
diff --git a/config.c b/config.c
index 1c8ad1f10..529a86968 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.151 2007/06/02 11:21:40 kls Exp $
+ * $Id: config.c 1.153 2007/06/17 11:54:54 kls Exp $
  */
 
 #include "config.h"
@@ -265,9 +265,9 @@ cSetup::cSetup(void)
   OSDMessageTime = 1;
   UseSmallFont = 1;
   AntiAlias = 1;
-  strcpy(FontOsd, "arialbd.ttf");
-  strcpy(FontSml, "arial.ttf");
-  strcpy(FontFix, "courbd.ttf");
+  strcpy(FontOsd, DefaultFontOsd);
+  strcpy(FontSml, DefaultFontSml);
+  strcpy(FontFix, DefaultFontFix);
   FontOsdSize = 22;
   FontSmlSize = 18;
   FontFixSize = 20;
@@ -385,8 +385,8 @@ bool cSetup::ParseLanguages(const char *Value, int *Values)
 bool cSetup::Parse(const char *Name, const char *Value)
 {
   if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
-  else if (!strcasecmp(Name, "OSDSkin"))             strn0cpy(OSDSkin, Value, MaxSkinName);
-  else if (!strcasecmp(Name, "OSDTheme"))            strn0cpy(OSDTheme, Value, MaxThemeName);
+  else if (!strcasecmp(Name, "OSDSkin"))             Utf8Strn0Cpy(OSDSkin, Value, MaxSkinName);
+  else if (!strcasecmp(Name, "OSDTheme"))            Utf8Strn0Cpy(OSDTheme, Value, MaxThemeName);
   else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
   else if (!strcasecmp(Name, "ShowInfoOnChSwitch"))  ShowInfoOnChSwitch = atoi(Value);
   else if (!strcasecmp(Name, "TimeoutRequChInfo"))   TimeoutRequChInfo  = atoi(Value);
@@ -394,7 +394,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "MenuScrollWrap"))      MenuScrollWrap     = atoi(Value);
   else if (!strcasecmp(Name, "MenuKeyCloses"))       MenuKeyCloses      = atoi(Value);
   else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
-  else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
+  else if (!strcasecmp(Name, "NameInstantRecord"))   Utf8Strn0Cpy(NameInstantRecord, Value, MaxFileName);
   else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
   else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
   else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
@@ -435,9 +435,9 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
   else if (!strcasecmp(Name, "UseSmallFont"))        UseSmallFont       = atoi(Value);
   else if (!strcasecmp(Name, "AntiAlias"))           AntiAlias          = atoi(Value);
-  else if (!strcasecmp(Name, "FontOsd"))             strn0cpy(FontOsd, Value, MAXFONTNAME);
-  else if (!strcasecmp(Name, "FontSml"))             strn0cpy(FontSml, Value, MAXFONTNAME);
-  else if (!strcasecmp(Name, "FontFix"))             strn0cpy(FontFix, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontOsd"))             Utf8Strn0Cpy(FontOsd, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontSml"))             Utf8Strn0Cpy(FontSml, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontFix"))             Utf8Strn0Cpy(FontFix, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontOsdSize"))         FontOsdSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontSmlSize"))         FontSmlSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontFixSize"))         FontFixSize        = atoi(Value);
diff --git a/config.h b/config.h
index 2c1d992c6..b058ff1ad 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.290 2007/06/02 11:22:17 kls Exp $
+ * $Id: config.h 1.291 2007/06/13 06:38:33 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.3"
-#define VDRVERSNUM   10503  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.4"
+#define VDRVERSNUM   10504  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.1"
-#define APIVERSNUM   10501  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.4"
+#define APIVERSNUM   10504  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index b859124e3..ae9e15e84 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.140 2007/04/30 09:34:00 kls Exp $
+ * $Id: device.c 1.141 2007/06/16 09:31:32 kls Exp $
  */
 
 #include "device.h"
@@ -859,7 +859,7 @@ bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const c
      if (Language)
         strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language));
      if (Description)
-        strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
+        Utf8Strn0Cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
      if (Id) {
         availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
         int numAudioTracks = NumAudioTracks();
diff --git a/font.c b/font.c
index af8b7cbfb..7e47e7ac4 100644
--- a/font.c
+++ b/font.c
@@ -4,17 +4,22 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.15 2007/06/09 14:41:27 kls Exp $
+ * $Id: font.c 1.19 2007/06/17 12:13:49 kls Exp $
  */
 
 #include "font.h"
 #include <ctype.h>
+#include <fontconfig/fontconfig.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "config.h"
 #include "osd.h"
 #include "tools.h"
 
+const char *DefaultFontOsd = "Sans Serif:Bold";
+const char *DefaultFontSml = "Sans Serif";
+const char *DefaultFontFix = "Courier:Bold";
+
 // --- cFreetypeFont ---------------------------------------------------------
 
 #define KERNING_UNKNOWN  (-10000)
@@ -22,7 +27,7 @@
 struct tKerning {
   uint prevSym;
   int kerning;
-  tKerning(uint PrevSym, int Kerning) { prevSym = PrevSym; kerning = Kerning; }
+  tKerning(uint PrevSym, int Kerning = 0) { prevSym = PrevSym; kerning = Kerning; }
   };
 
 class cGlyph : public cListObject {
@@ -286,14 +291,29 @@ void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColo
      }
 }
 
+// --- cDummyFont ------------------------------------------------------------
+
+// A dummy font, in case there are no fonts installed:
+
+class cDummyFont : public cFont {
+public:
+  virtual int Width(uint c) const { return 10; }
+  virtual int Width(const char *s) const { return 50; }
+  virtual int Height(void) const { return 20; }
+  virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
+  };
+
 // --- cFont -----------------------------------------------------------------
 
 cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
 void cFont::SetFont(eDvbFont Font, const char *Name, int CharHeight)
 {
+  cFont *f = CreateFont(Name, CharHeight);
+  if (!f || !f->Height())
+     f = new cDummyFont;
   delete fonts[Font];
-  fonts[Font] = new cFreetypeFont(*Name == '/' ? Name : *AddDirectory(FONTDIR, Name), CharHeight);
+  fonts[Font] = f;
 }
 
 const cFont *cFont::GetFont(eDvbFont Font)
@@ -304,14 +324,85 @@ const cFont *cFont::GetFont(eDvbFont Font)
      Font = fontSml;
   if (!fonts[Font]) {
      switch (Font) {
-       case fontOsd: SetFont(Font, AddDirectory(FONTDIR, Setup.FontOsd), Setup.FontOsdSize); break;
-       case fontSml: SetFont(Font, AddDirectory(FONTDIR, Setup.FontSml), Setup.FontSmlSize); break;
-       case fontFix: SetFont(Font, AddDirectory(FONTDIR, Setup.FontFix), Setup.FontFixSize); break;
+       case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break;
+       case fontSml: SetFont(Font, Setup.FontSml, Setup.FontSmlSize); break;
+       case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break;
        }
      }
   return fonts[Font];
 }
 
+cFont *cFont::CreateFont(const char *Name, int CharHeight)
+{
+  cString fn = GetFontFileName(Name);
+  if (*fn)
+     return new cFreetypeFont(fn, CharHeight);
+  return NULL;
+}
+
+bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
+{
+  if (!FontNames->Size()) {
+     FcInit();
+     FcObjectSet *os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, NULL);
+     FcPattern *pat = FcPatternCreate();
+     FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
+     if (Monospaced)
+        FcPatternAddInteger(pat, FC_SPACING, FC_MONO);
+     FcFontSet* fontset = FcFontList(NULL, pat, os);
+     for (int i = 0; i < fontset->nfont; i++) {
+         char *s = (char *)FcNameUnparse(fontset->fonts[i]);
+         if (s) {
+            // Strip i18n stuff:
+            char *p = strchr(s, ',');
+            if (p)
+               *p = 0;
+            // Make it user presentable:
+            s = strreplace(s, "\\", ""); // '-' is escaped
+            s = strreplace(s, "style=", "");
+            FontNames->Append(s); // takes ownership of s
+            }
+         }
+     FcFontSetDestroy(fontset);
+     FcPatternDestroy(pat);
+     FcObjectSetDestroy(os);
+     FcFini();
+     FontNames->Sort();
+     }
+  return FontNames->Size() > 0;
+}
+
+cString cFont::GetFontFileName(const char *FontName)
+{
+  cString FontFileName;
+  if (FontName) {
+     char *fn = strdup(FontName);
+     fn = strreplace(fn, ":", ":style=");
+     fn = strreplace(fn, "-", "\\-");
+     FcInit();
+     FcPattern *pat = FcNameParse((FcChar8 *)fn);
+     FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
+     FcConfigSubstitute(NULL, pat, FcMatchPattern);
+     FcDefaultSubstitute(pat);
+     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
+     for (int i = 0; i < fontset->nfont; i++) {
+         FcBool scalable;
+         FcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable);
+         if (scalable) {
+            FcChar8 *s = NULL;
+            FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &s);
+            FontFileName = (char *)s;
+            break;
+            }
+         }
+     FcFontSetDestroy(fontset);
+     FcPatternDestroy(pat);
+     free(fn);
+     FcFini();
+     }
+  return FontFileName;
+}
+
 // --- cTextWrapper ----------------------------------------------------------
 
 cTextWrapper::cTextWrapper(void)
diff --git a/font.h b/font.h
index b2ab293c5..4a83c8733 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.16 2007/06/10 12:58:54 kls Exp $
+ * $Id: font.h 1.19 2007/06/17 12:11:31 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -12,10 +12,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include "tools.h"
 
 #define MAXFONTNAME 64
 #define MAXFONTSIZE 64
-#define FONTDIR     "/usr/share/fonts/truetype"
 
 enum eDvbFont {
   fontOsd,
@@ -28,6 +28,10 @@ class cBitmap;
 typedef uint32_t tColor; // see also osd.h
 typedef uint8_t tIndex;
 
+extern const char *DefaultFontOsd;
+extern const char *DefaultFontSml;
+extern const char *DefaultFontFix;
+
 class cFont {
 private:
   static cFont *fonts[];
@@ -45,14 +49,30 @@ class cFont {
           ///< Draws the given text into the Bitmap at position (x, y) with the given colors.
           ///< The text will not exceed the given Width (if > 0), and will end with a complete character.
   static void SetFont(eDvbFont Font, const char *Name, int CharHeight);
-          ///< Sets the given Font to use the font data from the file Name and make its characters
-          ///< CharHeight pixels high.
+          ///< Sets the given Font to use the font data according to Name (see CreateFont())
+          ///< and make its characters CharHeight pixels high.
   static const cFont *GetFont(eDvbFont Font);
           ///< Gets the given Font, which was previously set by a call to SetFont().
           ///< If no SetFont() call has been made, the font as defined in the setup is returned.
           ///< The caller must not use the returned font outside the scope in which
           ///< it was retrieved by the call to GetFont(), because a call to SetFont()
           ///< may delete an existing font.
+  static cFont *CreateFont(const char *Name, int CharHeight);
+          ///< Creates a new font object with the given Name and makes its characters
+          ///< CharHeight pixels high. Name is of the form "Family:Style", for instance
+          ///< "Verdana:Bold Italic" or "Times New Roman". See GetAvailableFontNames()
+          ///< for how to get a list of all available font names.
+          ///< If the requested font can't be created, NULL is returned.
+          ///< The caller must delete the font when it is no longer needed.
+  static bool GetAvailableFontNames(cStringList *FontNames, bool Monospaced = false);
+          ///< Queries the font configuration for a list of available font names,
+          ///< which is returned in FontNames. If Monospaced is true, only
+          ///< monospaced fonts will be returned. The resulting font names are
+          ///< in a format that can be used with GetFontFileName() to get the name
+          ///< of the actual font file.
+          ///< Returns true if any font names were found.
+  static cString GetFontFileName(const char *FontName);
+          ///< Retruns the actual font file name for the given FontName.
   };
 
 class cTextWrapper {
diff --git a/i18n.c b/i18n.c
index 88832d77e..fdeafc5b3 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.294 2007/06/09 08:44:54 kls Exp $
+ * $Id: i18n.c 1.297 2007/06/17 12:31:02 kls Exp $
  *
  * Translations provided by:
  *
@@ -3563,7 +3563,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "K�yt� antialiasointia",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3578,15 +3578,15 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
-  { "Setup.OSD$OSD font name",
-    "OSD Schriftart",
-    "",// TODO
+  { "Setup.OSD$Default font",
+    "Standard-Schriftart",
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
     "",// TODO
+    "Oletuskirjasintyyppi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3601,7 +3601,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
-  { "Setup.OSD$Small font name",
+  { "Setup.OSD$Small font",
     "Kleine Schriftart",
     "",// TODO
     "",// TODO
@@ -3609,7 +3609,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pienikirjasintyyppi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3624,7 +3624,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
-  { "Setup.OSD$Fixed font name",
+  { "Setup.OSD$Fixed font",
     "Festbreiten-Schriftart",
     "",// TODO
     "",// TODO
@@ -3632,7 +3632,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Tasav�linen kirjasintyyppi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3655,7 +3655,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Oletuskirjasintyypin koko (px)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3678,7 +3678,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Pienen kirjasintyypin koko (px)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3701,7 +3701,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Tasav�lisen kirjasintyypin koko (px)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -6820,7 +6820,7 @@ static const char *ConvertPhrase(const tI18nPhrase *Original, tI18nPhrase **Conv
      *Converted = new tI18nPhrase[NumPhrases + 1];
      memset(*Converted, 0, sizeof(tI18nPhrase) * (NumPhrases + 1));
      }
-  if (!(*Converted)[NrPhrase][NrLanguage]) {
+  if (!(*Converted)[NrPhrase][NrLanguage] && Original[NrPhrase][NrLanguage]) {
      cCharSetConv csc(Phrases[1][NrLanguage], cCharSetConv::SystemCharacterTable());
      (*Converted)[NrPhrase][NrLanguage] = strdup(csc.Convert(Original[NrPhrase][NrLanguage]));
      }
@@ -6851,7 +6851,8 @@ const char *I18nTranslate(const char *s, const char *Plugin)
                    return t;
                 }
              }
-         p = Phrases;
+         p = OriginalPhrases = Phrases;
+         ConvertedPhrases = &Converted;
          }
      esyslog("%s%sno translation found for '%s' in language %d (%s)", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
      }
diff --git a/libsi/si.c b/libsi/si.c
index 2eb3dfd63..889509088 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.20 2007/06/10 09:31:34 kls Exp $
+ *   $Id: si.c 1.21 2007/06/15 13:08:31 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -250,59 +250,59 @@ char *String::getText(char *buffer, char *shortVersion, int sizeBuffer, int size
 }
 
 static const char *CharacterTables1[] = {
-  NULL,         // 0x00
-  "ISO8859-5",  // 0x01
-  "ISO8859-6",  // 0x02
-  "ISO8859-7",  // 0x03
-  "ISO8859-8",  // 0x04
-  "ISO8859-9",  // 0x05
-  "ISO8859-10", // 0x06
-  "ISO8859-11", // 0x07
-  "ISO8859-12", // 0x08
-  "ISO8859-13", // 0x09
-  "ISO8859-14", // 0x0A
-  "ISO8859-15", // 0x0B
-  NULL,         // 0x0C
-  NULL,         // 0x0D
-  NULL,         // 0x0E
-  NULL,         // 0x0F
-  NULL,         // 0x10
-  "UTF16",      // 0x11
-  "EUC-KR",     // 0x12
-  "GB2312",     // 0x13
-  "GBK",        // 0x14
-  "UTF8",       // 0x15
-  NULL,         // 0x16
-  NULL,         // 0x17
-  NULL,         // 0x18
-  NULL,         // 0x19
-  NULL,         // 0x1A
-  NULL,         // 0x1B
-  NULL,         // 0x1C
-  NULL,         // 0x1D
-  NULL,         // 0x1E
-  NULL,         // 0x1F
+  NULL,          // 0x00
+  "ISO-8859-5",  // 0x01
+  "ISO-8859-6",  // 0x02
+  "ISO-8859-7",  // 0x03
+  "ISO-8859-8",  // 0x04
+  "ISO-8859-9",  // 0x05
+  "ISO-8859-10", // 0x06
+  "ISO-8859-11", // 0x07
+  "ISO-8859-12", // 0x08
+  "ISO-8859-13", // 0x09
+  "ISO-8859-14", // 0x0A
+  "ISO-8859-15", // 0x0B
+  NULL,          // 0x0C
+  NULL,          // 0x0D
+  NULL,          // 0x0E
+  NULL,          // 0x0F
+  NULL,          // 0x10
+  "UTF-16",      // 0x11
+  "EUC-KR",      // 0x12
+  "GB2312",      // 0x13
+  "GBK",         // 0x14
+  "UTF-8",       // 0x15
+  NULL,          // 0x16
+  NULL,          // 0x17
+  NULL,          // 0x18
+  NULL,          // 0x19
+  NULL,          // 0x1A
+  NULL,          // 0x1B
+  NULL,          // 0x1C
+  NULL,          // 0x1D
+  NULL,          // 0x1E
+  NULL,          // 0x1F
 };
 
 #define SingleByteLimit 0x0B
 
 static const char *CharacterTables2[] = {
   NULL,         // 0x00
-  "ISO8859-1",  // 0x01
-  "ISO8859-2",  // 0x02
-  "ISO8859-3",  // 0x03
-  "ISO8859-4",  // 0x04
-  "ISO8859-5",  // 0x05
-  "ISO8859-6",  // 0x06
-  "ISO8859-7",  // 0x07
-  "ISO8859-8",  // 0x08
-  "ISO8859-9",  // 0x09
-  "ISO8859-10", // 0x0A
-  "ISO8859-11", // 0x0B
+  "ISO-8859-1",  // 0x01
+  "ISO-8859-2",  // 0x02
+  "ISO-8859-3",  // 0x03
+  "ISO-8859-4",  // 0x04
+  "ISO-8859-5",  // 0x05
+  "ISO-8859-6",  // 0x06
+  "ISO-8859-7",  // 0x07
+  "ISO-8859-8",  // 0x08
+  "ISO-8859-9",  // 0x09
+  "ISO-8859-10", // 0x0A
+  "ISO-8859-11", // 0x0B
   NULL,         // 0x0C
-  "ISO8859-13", // 0x0D
-  "ISO8859-14", // 0x0E
-  "ISO8859-15", // 0x0F
+  "ISO-8859-13", // 0x0D
+  "ISO-8859-14", // 0x0E
+  "ISO-8859-15", // 0x0F
 };
 
 #define NumEntries(Table) (sizeof(Table) / sizeof(char *))
diff --git a/menu.c b/menu.c
index 47e9c3d9b..13e224d9f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.451 2007/06/09 14:36:46 kls Exp $
+ * $Id: menu.c 1.455 2007/06/17 12:33:01 kls Exp $
  */
 
 #include "menu.h"
@@ -2160,7 +2160,7 @@ class cMenuSetupOSD : public cMenuSetupBase {
   cThemes themes;
   int originalThemeIndex;
   int themeIndex;
-  cFileNameList fontNames;
+  cStringList fontOsdNames, fontSmlNames, fontFixNames;
   int fontOsdIndex, fontSmlIndex, fontFixIndex;
   virtual void Set(void);
 public:
@@ -2176,12 +2176,15 @@ cMenuSetupOSD::cMenuSetupOSD(void)
   skinDescriptions = new const char*[numSkins];
   themes.Load(Skins.Current()->Name());
   themeIndex = originalThemeIndex = Skins.Current()->Theme() ? themes.GetThemeIndex(Skins.Current()->Theme()->Description()) : 0;
-  fontNames.Load(FONTDIR);
-  if (fontNames.Size()) {
-     fontOsdIndex = max(0, fontNames.Find(Setup.FontOsd));
-     fontSmlIndex = max(0, fontNames.Find(Setup.FontSml));
-     fontFixIndex = max(0, fontNames.Find(Setup.FontFix));
-     }
+  cFont::GetAvailableFontNames(&fontOsdNames);
+  cFont::GetAvailableFontNames(&fontSmlNames);
+  cFont::GetAvailableFontNames(&fontFixNames, true);
+  fontOsdNames.Insert(strdup(DefaultFontOsd));
+  fontSmlNames.Insert(strdup(DefaultFontSml));
+  fontFixNames.Insert(strdup(DefaultFontFix));
+  fontOsdIndex = max(0, fontOsdNames.Find(Setup.FontOsd));
+  fontSmlIndex = max(0, fontSmlNames.Find(Setup.FontSml));
+  fontFixIndex = max(0, fontFixNames.Find(Setup.FontFix));
   Set();
 }
 
@@ -2211,11 +2214,9 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Use small font"),         &data.UseSmallFont, 3, useSmallFontTexts));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Anti-alias"),             &data.AntiAlias));
-  if (fontNames.Size()) {
-  Add(new cMenuEditStraItem(tr("Setup.OSD$OSD font name"),          &fontOsdIndex, fontNames.Size(), &fontNames[0]));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Small font name"),        &fontSmlIndex, fontNames.Size(), &fontNames[0]));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font name"),        &fontFixIndex, fontNames.Size(), &fontNames[0]));
-  }
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Default font"),           &fontOsdIndex, fontOsdNames.Size(), &fontOsdNames[0]));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Small font"),             &fontSmlIndex, fontSmlNames.Size(), &fontSmlNames[0]));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font"),             &fontFixIndex, fontFixNames.Size(), &fontFixNames[0]));
   Add(new cMenuEditIntItem( tr("Setup.OSD$OSD font size (pixel)"),  &data.FontOsdSize, 10, MAXFONTSIZE));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Small font size (pixel)"),&data.FontSmlSize, 10, MAXFONTSIZE));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Fixed font size (pixel)"),&data.FontFixSize, 10, MAXFONTSIZE));
@@ -2239,14 +2240,14 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
      if (skinIndex != originalSkinIndex) {
         cSkin *Skin = Skins.Get(skinIndex);
         if (Skin) {
-           strn0cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin));
+           Utf8Strn0Cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin));
            Skins.SetCurrent(Skin->Name());
            ModifiedApperance = true;
            }
         }
      if (themes.NumThemes() && Skins.Current()->Theme()) {
         Skins.Current()->Theme()->Load(themes.FileName(themeIndex));
-        strn0cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme));
+        Utf8Strn0Cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme));
         ModifiedApperance |= themeIndex != originalThemeIndex;
         }
      if (data.OSDLeft != Setup.OSDLeft || data.OSDTop != Setup.OSDTop || data.OSDWidth != Setup.OSDWidth || data.OSDHeight != Setup.OSDHeight) {
@@ -2255,11 +2256,9 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         }
      if (data.UseSmallFont != Setup.UseSmallFont || data.AntiAlias != Setup.AntiAlias)
         ModifiedApperance = true;
-     if (fontNames.Size()) {
-        strn0cpy(data.FontOsd, fontNames[fontOsdIndex], sizeof(data.FontOsd));
-        strn0cpy(data.FontSml, fontNames[fontSmlIndex], sizeof(data.FontSml));
-        strn0cpy(data.FontFix, fontNames[fontFixIndex], sizeof(data.FontFix));
-        }
+     Utf8Strn0Cpy(data.FontOsd, fontOsdNames[fontOsdIndex], sizeof(data.FontOsd));
+     Utf8Strn0Cpy(data.FontSml, fontSmlNames[fontSmlIndex], sizeof(data.FontSml));
+     Utf8Strn0Cpy(data.FontFix, fontFixNames[fontFixIndex], sizeof(data.FontFix));
      if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSize != Setup.FontOsdSize) {
         cFont::SetFont(fontOsd, data.FontOsd, data.FontOsdSize);
         ModifiedApperance = true;
diff --git a/osd.c b/osd.c
index 0031eaede..188ee9d4c 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.69 2007/06/10 12:16:36 kls Exp $
+ * $Id: osd.c 1.70 2007/06/17 13:54:34 kls Exp $
  */
 
 #include "osd.h"
@@ -642,6 +642,10 @@ const tIndex *cBitmap::Data(int x, int y)
 
 // --- cOsd ------------------------------------------------------------------
 
+int cOsd::osdLeft = 0;
+int cOsd::osdTop = 0;
+int cOsd::osdWidth = 0;
+int cOsd::osdHeight = 0;
 int cOsd::isOpen = 0;
 
 cOsd::cOsd(int Left, int Top)
@@ -664,6 +668,14 @@ cOsd::~cOsd()
   isOpen--;
 }
 
+void cOsd::SetOsdPostion(int Left, int Top, int Width, int Height)
+{
+  osdLeft = Left;
+  osdTop = Top;
+  osdWidth = Width;
+  osdHeight = Height;
+}
+
 void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
 {
   for (int i = 0; i < numBitmaps; i++)
diff --git a/osd.h b/osd.h
index 3adfd7f76..075305821 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.54 2007/06/10 12:15:52 kls Exp $
+ * $Id: osd.h 1.55 2007/06/17 13:59:22 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -13,6 +13,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
+#include "config.h"
 #include "font.h"
 
 #define MAXNUMCOLORS 256
@@ -245,6 +246,7 @@ struct tArea {
 class cOsd {
   friend class cOsdProvider;
 private:
+  static int osdLeft, osdTop, osdWidth, osdHeight;
   static int isOpen;
   cBitmap *savedRegion;
   cBitmap *bitmaps[MAXOSDAREAS];
@@ -270,6 +272,15 @@ class cOsd {
 public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
+  static int OsdLeft(void) { return osdLeft ? osdLeft : Setup.OSDLeft; }
+  static int OsdTop(void) { return osdTop ? osdTop : Setup.OSDTop; }
+  static int OsdWidth(void) { return osdWidth ? osdWidth : Setup.OSDWidth; }
+  static int OsdHeight(void) { return osdHeight ? osdHeight : Setup.OSDHeight; }
+  static void SetOsdPostion(int Left, int Top, int Width, int Height);
+       ///< Sets the position and size of the OSD to the given values.
+       ///< This may be useful for plugins that determine the scaling of the
+       ///< video image and need to scale the OSD accordingly to fit on the
+       ///< screen.
   static int IsOpen(void) { return isOpen; }
   int Left(void) { return left; }
   int Top(void) { return top; }
diff --git a/recording.c b/recording.c
index 5298de3f1..22bb9556b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.151 2006/10/07 12:46:22 kls Exp $
+ * $Id: recording.c 1.154 2007/06/17 13:10:12 kls Exp $
  */
 
 #include "recording.h"
@@ -262,6 +262,7 @@ void cResumeFile::Delete(void)
 cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
 {
   channelID = Channel ? Channel->GetChannelID() : tChannelID::InvalidID;
+  channelName = Channel ? strdup(Channel->Name()) : NULL;
   ownEvent = Event ? NULL : new cEvent(0);
   event = ownEvent ? ownEvent : Event;
   aux = NULL;
@@ -304,6 +305,7 @@ cRecordingInfo::~cRecordingInfo()
 {
   delete ownEvent;
   free(aux);
+  free(channelName);
 }
 
 void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description)
@@ -334,8 +336,11 @@ bool cRecordingInfo::Read(FILE *f)
            switch (*s) {
              case 'C': {
                          char *p = strchr(t, ' ');
-                         if (p)
+                         if (p) {
+                            free(channelName);
+                            asprintf(&channelName, "%s", compactspace(p));
                             *p = 0; // strips optional channel name
+                            }
                          if (*t)
                             channelID = tChannelID::FromString(t);
                        }
@@ -375,7 +380,7 @@ bool cRecordingInfo::Read(FILE *f)
 bool cRecordingInfo::Write(FILE *f, const char *Prefix) const
 {
   if (channelID.Valid())
-     fprintf(f, "%sC %s\n", Prefix, *channelID.ToString());
+     fprintf(f, "%sC %s%s%s\n", Prefix, *channelID.ToString(), channelName ? " " : "", channelName ? channelName : "");
   event->Dump(f, Prefix, true);
   if (aux)
      fprintf(f, "%s@ %s\n", Prefix, aux);
@@ -406,34 +411,14 @@ char *ExchangeChars(char *s, bool ToFileSystem)
            // The VFAT file system can't handle all characters, so we
            // have to take extra efforts to encode/decode them:
            if (ToFileSystem) {
+              const char *InvalidChars = "\"\\/:*?|<>#";
               switch (*p) {
-                     // characters that can be used "as is":
-                     case '!':
-                     case '@':
-                     case '$':
-                     case '%':
-                     case '&':
-                     case '(':
-                     case ')':
-                     case '+':
-                     case ',':
-                     case '-':
-                     case ';':
-                     case '=':
-                     case '0' ... '9':
-                     case 'a' ... 'z':
-                     case 'A' ... 'Z':
-                     case '�': case '�':
-                     case '�': case '�':
-                     case '�': case '�':
-                     case '�':
-                          break;
                      // characters that can be mapped to other characters:
                      case ' ': *p = '_'; break;
                      case '~': *p = '/'; break;
                      // characters that have to be encoded:
                      default:
-                       if (*p != '.' || !*(p + 1) || *(p + 1) == '~') { // Windows can't handle '.' at the end of directory names
+                       if (strchr(InvalidChars, *p) || *p == '.' && (!*(p + 1) || *(p + 1) == '~')) { // Windows can't handle '.' at the end of file/directory names
                           int l = p - s;
                           s = (char *)realloc(s, strlen(s) + 10);
                           p = s + l;
@@ -450,7 +435,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                 // mapped characters:
                 case '_': *p = ' '; break;
                 case '/': *p = '~'; break;
-                // encodes characters:
+                // encoded characters:
                 case '#': {
                      if (strlen(p) > 2) {
                         char buf[3];
@@ -500,7 +485,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
      Subtitle = " ";
   else if (strlen(Subtitle) > MAX_SUBTITLE_LENGTH) {
      // let's make sure the Subtitle doesn't produce too long a file name:
-     strn0cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
+     Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
      Subtitle = SubtitleBuffer;
      }
   char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
diff --git a/recording.h b/recording.h
index f9db505d5..045bb24f0 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.56 2006/12/01 15:06:07 kls Exp $
+ * $Id: recording.h 1.57 2007/06/17 12:53:05 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -42,6 +42,7 @@ class cRecordingInfo {
   friend class cRecording;
 private:
   tChannelID channelID;
+  char *channelName;
   const cEvent *event;
   cEvent *ownEvent;
   char *aux;
@@ -51,6 +52,7 @@ class cRecordingInfo {
 public:
   ~cRecordingInfo();
   tChannelID ChannelID(void) const { return channelID; }
+  const char *ChannelName(void) const { return channelName; }
   const char *Title(void) const { return event->Title(); }
   const char *ShortText(void) const { return event->ShortText(); }
   const char *Description(void) const { return event->Description(); }
diff --git a/skinclassic.c b/skinclassic.c
index b3395a6fc..14be9d6f9 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.16 2007/06/10 12:42:02 kls Exp $
+ * $Id: skinclassic.c 1.17 2007/06/17 13:53:09 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -92,13 +92,13 @@ cSkinClassicDisplayChannel::cSkinClassicDisplayChannel(bool WithInfo)
   const cFont *font = cFont::GetFont(fontOsd);
   lineHeight = font->Height();
   message = false;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - Lines * lineHeight));
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - Lines * lineHeight));
   timeWidth = font->Width("00:00") + 4;
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight - 1, 8 } };
+  tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, Lines * lineHeight - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, Lines * lineHeight - 1, 4 } };
+     tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, Lines * lineHeight - 1, 4 } };
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      }
   osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, Theme.Color(clrBackground));
@@ -187,14 +187,14 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
   const cFont *font = cFont::GetFont(fontOsd);
   lineHeight = font->Height();
   x0 = 0;
-  x1 = Setup.OSDWidth;
+  x1 = cOsd::OsdWidth();
   y0 = 0;
   y1 = lineHeight;
   y2 = y1 + lineHeight;
-  y5 = Setup.OSDHeight;
+  y5 = cOsd::OsdHeight();
   y4 = y5 - lineHeight;
   y3 = y4 - lineHeight;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
   tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -426,12 +426,12 @@ cSkinClassicDisplayReplay::cSkinClassicDisplayReplay(bool ModeOnly)
   int lineHeight = font->Height();
   lastCurrentWidth = 0;
   x0 = 0;
-  x1 = Setup.OSDWidth;
+  x1 = cOsd::OsdWidth();
   y0 = 0;
   y1 = lineHeight;
   y2 = 2 * lineHeight;
   y3 = 3 * lineHeight;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y3);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y3);
   tArea Areas[] = { { x0, y0, x1 - 1, y3 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -526,12 +526,12 @@ cSkinClassicDisplayVolume::cSkinClassicDisplayVolume(void)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   int lineHeight = font->Height();
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - lineHeight);
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 8 } };
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - lineHeight);
+  tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, lineHeight - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 4 } };
+     tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, lineHeight - 1, 4 } };
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      }
 }
@@ -591,7 +591,7 @@ cSkinClassicDisplayTracks::cSkinClassicDisplayTracks(const char *Title, int NumT
       ItemsWidth = max(ItemsWidth, font->Width(Tracks[i]));
   ItemsWidth += 10;
   x0 = 0;
-  x1 = Setup.OSDWidth;
+  x1 = cOsd::OsdWidth();
   int d = x1 - x0;
   if (d > ItemsWidth) {
      d = (d - ItemsWidth) & ~0x07; // must be multiple of 8
@@ -600,7 +600,7 @@ cSkinClassicDisplayTracks::cSkinClassicDisplayTracks(const char *Title, int NumT
   y0 = 0;
   y1 = lineHeight;
   y2 = y1 + NumTracks * lineHeight;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y2);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y2);
   tArea Areas[] = { { x0, y0, x1 - 1, y2 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -663,12 +663,12 @@ cSkinClassicDisplayMessage::cSkinClassicDisplayMessage(void)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   int lineHeight = font->Height();
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - lineHeight);
-  tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 8 } };
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - lineHeight);
+  tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, lineHeight - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { 0, 0, Setup.OSDWidth - 1, lineHeight - 1, 2 } };
+     tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, lineHeight - 1, 2 } };
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      }
 }
@@ -681,7 +681,7 @@ cSkinClassicDisplayMessage::~cSkinClassicDisplayMessage()
 void cSkinClassicDisplayMessage::SetMessage(eMessageType Type, const char *Text)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  osd->DrawText(0, 0, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, Setup.OSDWidth, 0, taCenter);
+  osd->DrawText(0, 0, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, cOsd::OsdWidth(), 0, taCenter);
 }
 
 void cSkinClassicDisplayMessage::Flush(void)
diff --git a/skinsttng.c b/skinsttng.c
index e359c132e..4f576a7c7 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.20 2007/06/10 12:40:43 kls Exp $
+ * $Id: skinsttng.c 1.21 2007/06/17 13:51:56 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -163,7 +163,7 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      x1 = x0 + font->Width("00:00") + 4;
      x2 = x1 + Roundness;
      x3 = x2 + Gap;
-     x7 = Setup.OSDWidth;
+     x7 = cOsd::OsdWidth();
      x6 = x7 - lineHeight / 2;
      x5 = x6 - lineHeight / 2;
      x4 = x5 - Gap;
@@ -177,7 +177,7 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      y7 = y6 + cFont::GetFont(fontSml)->Height();
      int yt = (y0 + y1) / 2;
      int yb = (y6 + y7) / 2;
-     osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - y7));
+     osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y7));
      tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } };
      if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -209,13 +209,13 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      x1 = lineHeight / 2;
      x2 = lineHeight;
      x3 = x2 + Gap;
-     x7 = Setup.OSDWidth;
+     x7 = cOsd::OsdWidth();
      x6 = x7 - lineHeight / 2;
      x5 = x6 - lineHeight / 2;
      x4 = x5 - Gap;
      y0 = 0;
      y1 = lineHeight;
-     osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + (Setup.ChannelInfoPos ? 0 : Setup.OSDHeight - y1));
+     osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y1));
      tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
      if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -374,7 +374,7 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   x1 = lineHeight / 2;
   x3 = (x1 + Roundness + Gap + 7) & ~0x07; // must be multiple of 8
   x2 = x3 - Gap;
-  x7 = Setup.OSDWidth;
+  x7 = cOsd::OsdWidth();
   x6 = x7 - lineHeight / 2;
   x4 = (x6 - lineHeight / 2 - Gap) & ~0x07; // must be multiple of 8
   x5 = x4 + Gap;
@@ -382,13 +382,13 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   y1 = lineHeight;
   y2 = y1 + Roundness;
   y3 = y2 + Gap;
-  y7 = Setup.OSDHeight;
+  y7 = cOsd::OsdHeight();
   y6 = y7 - cFont::GetFont(fontSml)->Height();
   y5 = y6 - Roundness;
   y4 = y5 - Gap;
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
   tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -703,7 +703,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   x1 = max(SymbolWidth, bm.Width());
   x2 = x1 + Roundness;
   x3 = x2 + Gap;
-  x7 = Setup.OSDWidth;
+  x7 = cOsd::OsdWidth();
   x6 = x7 - lineHeight / 2;
   x5 = x6 - lineHeight / 2;
   x4 = x5 - Gap;
@@ -717,7 +717,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   y7 = y6 + font->Height();
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y7);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y7);
   tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -845,13 +845,13 @@ cSkinSTTNGDisplayVolume::cSkinSTTNGDisplayVolume(void)
   x1 = lineHeight / 2;
   x2 = lineHeight;
   x3 = x2 + Gap;
-  x7 = Setup.OSDWidth;
+  x7 = cOsd::OsdWidth();
   x6 = x7 - lineHeight / 2;
   x5 = x6 - lineHeight / 2;
   x4 = x5 - Gap;
   y0 = 0;
   y1 = lineHeight;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y1);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1);
   tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -943,7 +943,7 @@ cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTrack
   x1 = lineHeight / 2;
   x3 = (x1 + Roundness + Gap + 7) & ~0x07; // must be multiple of 8
   x2 = x3 - Gap;
-  x7 = Setup.OSDWidth;
+  x7 = cOsd::OsdWidth();
   x6 = x7 - lineHeight / 2;
   x4 = (x6 - lineHeight / 2 - Gap) & ~0x07; // must be multiple of 8
   x5 = x4 + Gap;
@@ -959,14 +959,14 @@ cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTrack
   y1 = lineHeight;
   y2 = y1 + Roundness;
   y3 = y2 + Gap;
-  // limit to Setup.OSDHeight? - what if height is too big???
+  // limit to cOsd::OsdHeight()? - what if height is too big???
   y4 = y3 + NumTracks * lineHeight + 2 * Roundness;
   y5 = y4 + Gap;
   y6 = y5 + Roundness;
   y7 = y6 + cFont::GetFont(fontSml)->Height();
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y7);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y7);
   tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -1087,13 +1087,13 @@ cSkinSTTNGDisplayMessage::cSkinSTTNGDisplayMessage(void)
   x1 = lineHeight / 2;
   x2 = lineHeight;
   x3 = x2 + Gap;
-  x7 = Setup.OSDWidth;
+  x7 = cOsd::OsdWidth();
   x6 = x7 - lineHeight / 2;
   x5 = x6 - lineHeight / 2;
   x4 = x5 - Gap;
   y0 = 0;
   y1 = lineHeight;
-  osd = cOsdProvider::NewOsd(Setup.OSDLeft, Setup.OSDTop + Setup.OSDHeight - y1);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1);
   tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
diff --git a/thread.c b/thread.c
index 8882252a1..4eb64f1ea 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.60 2007/02/24 16:13:33 kls Exp $
+ * $Id: thread.c 1.61 2007/06/17 12:43:40 kls Exp $
  */
 
 #include "thread.h"
@@ -12,6 +12,7 @@
 #include <linux/unistd.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/syscall.h>
 #include <sys/time.h>
@@ -507,7 +508,7 @@ int SystemExec(const char *Command, bool Detached)
 
   if (pid > 0) { // parent process
      int status = 0;
-     if (!Detached && waitpid(pid, &status, 0) < 0) {
+     if (waitpid(pid, &status, 0) < 0) {
         LOG_ERROR;
         return -1;
         }
@@ -515,6 +516,9 @@ int SystemExec(const char *Command, bool Detached)
      }
   else { // child process
      if (Detached) {
+        // Fork again and let first child die - grandchild stays alive without parent
+        if (fork() > 0)
+           exit(0);
         // Start a new session
         pid_t sid = setsid();
         if (sid < 0)
diff --git a/timers.c b/timers.c
index 40791d06c..febf12eb8 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.66 2007/06/03 13:48:57 kls Exp $
+ * $Id: timers.c 1.67 2007/06/16 10:41:21 kls Exp $
  */
 
 #include "timers.h"
@@ -78,7 +78,7 @@ cTimer::cTimer(const cEvent *Event)
   *file = 0;
   const char *Title = Event->Title();
   if (!isempty(Title))
-     strn0cpy(file, Event->Title(), sizeof(file));
+     Utf8Strn0Cpy(file, Event->Title(), sizeof(file));
   aux = NULL;
   event = NULL; // let SetEvent() be called to get a log message
 }
@@ -286,7 +286,7 @@ bool cTimer::Parse(const char *s)
         }
      //TODO add more plausibility checks
      result = ParseDay(daybuffer, day, weekdays);
-     strn0cpy(file, filebuffer, MaxFileName);
+     Utf8Strn0Cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      if (isnumber(channelbuffer))
         channel = Channels.GetByNumber(atoi(channelbuffer));
@@ -358,7 +358,7 @@ time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
 char *cTimer::SetFile(const char *File)
 {
   if (!isempty(File))
-     strn0cpy(file, File, sizeof(file));
+     Utf8Strn0Cpy(file, File, sizeof(file));
   return file;
 }
 
diff --git a/tools.c b/tools.c
index a6af97a6d..dd2395ad4 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.123 2007/06/09 14:21:21 kls Exp $
+ * $Id: tools.c 1.129 2007/06/17 11:02:34 kls Exp $
  */
 
 #include "tools.h"
@@ -649,6 +649,37 @@ int Utf8SymChars(const char *s, int Symbols)
   return n;
 }
 
+int Utf8StrLen(const char *s)
+{
+  if (cCharSetConv::SystemCharacterTable())
+     return strlen(s);
+  int n = 0;
+  while (*s) {
+        s += Utf8CharLen(s);
+        n++;
+        }
+  return n;
+}
+
+char *Utf8Strn0Cpy(char *Dest, const char *Src, int n)
+{
+  if (cCharSetConv::SystemCharacterTable())
+     return strn0cpy(Dest, Src, n);
+  char *d = Dest;
+  while (*Src) {
+        int sl = Utf8CharLen(Src);
+        n -= sl;
+        if (n > 0) {
+           while (sl--)
+                 *d++ = *Src++;
+           }
+        else
+           break;
+        }
+  *d = 0;
+  return Dest;
+}
+
 int Utf8ToArray(const char *s, uint *a, int Size)
 {
   int n = 0;
@@ -720,7 +751,7 @@ void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)
 {
   free(systemCharacterTable);
   systemCharacterTable = NULL;
-  if (!strcasestr(CharacterTable, "UTF")) {
+  if (!strcasestr(CharacterTable, "UTF-8")) {
      // Set up a map for the character values 128...255:
      char buf[129];
      for (int i = 0; i < 128; i++)
@@ -741,7 +772,7 @@ void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)
 
 const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
 {
-  if (cd != (iconv_t)-1) {
+  if (cd != (iconv_t)-1 && From && *From) {
      char *FromPtr = (char *)From;
      size_t FromLength = strlen(From);
      char *ToPtr = To;
@@ -1105,21 +1136,39 @@ struct dirent *cReadDir::Next(void)
   return directory && readdir_r(directory, &u.d, &result) == 0 ? result : NULL;
 }
 
-// --- cFileNameList ---------------------------------------------------------
+// --- cStringList -----------------------------------------------------------
 
-cFileNameList::cFileNameList(const char *Directory)
+cStringList::~cStringList()
 {
-  Load(Directory);
+  Clear();
 }
 
-cFileNameList::~cFileNameList()
+int cStringList::Find(const char *s) const
+{
+  for (int i = 0; i < Size(); i++) {
+      if (!strcmp(s, At(i)))
+         return i;
+      }
+  return -1;
+}
+
+void cStringList::Clear(void)
 {
   for (int i = 0; i < Size(); i++)
       free(At(i));
 }
 
+// --- cFileNameList ---------------------------------------------------------
+
+// TODO better GetFileNames(const char *Directory, cStringList *List)?
+cFileNameList::cFileNameList(const char *Directory)
+{
+  Load(Directory);
+}
+
 bool cFileNameList::Load(const char *Directory)
 {
+  Clear();
   if (Directory) {
      cReadDir d(Directory);
      struct dirent *e;
@@ -1128,7 +1177,7 @@ bool cFileNameList::Load(const char *Directory)
               if (strcmp(e->d_name, ".") && strcmp(e->d_name, ".."))
                  Append(strdup(e->d_name));
               }
-        Sort(CompareStrings);
+        Sort();
         return true;
         }
      else
@@ -1137,15 +1186,6 @@ bool cFileNameList::Load(const char *Directory)
   return false;
 }
 
-int cFileNameList::Find(const char *FileName)
-{
-  for (int i = 0; i < Size(); i++) {
-      if (!strcmp(FileName, At(i)))
-         return i;
-      }
-  return -1;
-}
-
 // --- cFile -----------------------------------------------------------------
 
 bool cFile::files[FD_SETSIZE] = { false };
diff --git a/tools.h b/tools.h
index 5d048076b..891196757 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.98 2007/06/10 08:46:23 kls Exp $
+ * $Id: tools.h 1.102 2007/06/17 11:00:20 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -92,7 +92,15 @@ int Utf8CharSet(uint c, char *s = NULL);
     ///< is given, only the number of bytes is returned and nothing is copied.
 int Utf8SymChars(const char *s, int Symbols);
     ///< Returns the number of character bytes at the beginning of the given
-    ///< string that form at most the given number of UTF-8 Symbols.
+    ///< string that form at most the given number of UTF-8 symbols.
+int Utf8StrLen(const char *s);
+    ///< Returns the number of UTF-8 symbols formed by the given string of
+    ///< character bytes.
+char *Utf8Strn0Cpy(char *Dest, const char *Src, int n);
+    ///< Copies at most n character bytes from Src to Dst, making sure that the
+    ///< resulting copy ends with a complete UTF-8 symbol. The copy is guaranteed
+    ///< to be zero terminated.
+    ///< Returns a pointer to Dest.
 int Utf8ToArray(const char *s, uint *a, int Size);
     ///< Converts the given character bytes (including the terminating 0) into an
     ///< array of UTF-8 symbols of the given Size. Returns the number of symbols
@@ -394,7 +402,17 @@ template<class T> class cVector {
   mutable int allocated;
   mutable int size;
   mutable T *data;
-  void Realloc(int NewAllocated) const { data = (T *)realloc(data, (allocated = NewAllocated) * sizeof(T)); }
+  cVector(const cVector &Vector) {} // don't copy...
+  cVector &operator=(const cVector &Vector) { return *this; } // ...or assign this!
+  void Realloc(int Index) const
+  {
+    if (++Index > allocated) {
+       data = (T *)realloc(data, Index * sizeof(T));
+       for (int i = allocated; i < Index; i++)
+           data[i] = T(0);
+       allocated = Index;
+       }
+  }
 public:
   cVector(int Allocated = 10)
   {
@@ -406,8 +424,9 @@ template<class T> class cVector {
   virtual ~cVector() { free(data); }
   T& At(int Index) const
   {
+    Realloc(Index);
     if (Index >= size)
-       Realloc(size = Index + 1);
+       size = Index + 1;
     return data[Index];
   }
   const T& operator[](int Index) const
@@ -419,12 +438,24 @@ template<class T> class cVector {
     return At(Index);
   }
   int Size(void) const { return size; }
+  virtual void Insert(T Data, int Before = 0)
+  {
+    if (Before < size) {
+       Realloc(size);
+       memmove(&data[Before + 1], &data[Before], (size - Before) * sizeof(T));
+       size++;
+       data[Before] = Data;
+       }
+    else
+       Append(Data);
+  }
   virtual void Append(T Data)
   {
     if (size >= allocated)
        Realloc(allocated * 4 / 2); // increase size by 50%
     data[size++] = Data;
   }
+  virtual void Clear(void) {}
   void Sort(__compar_fn_t Compare)
   {
     qsort(data, size, sizeof(T), Compare);
@@ -436,12 +467,19 @@ inline int CompareStrings(const void *a, const void *b)
   return strcmp(*(const char **)a, *(const char **)b);
 }
 
-class cFileNameList : public cVector<char *> {
+class cStringList : public cVector<char *> {
+public:
+  cStringList(int Allocated = 10): cVector<char *>(Allocated) {}
+  virtual ~cStringList();
+  int Find(const char *s) const;
+  void Sort(void) { cVector<char *>::Sort(CompareStrings); }
+  virtual void Clear(void);
+  };
+
+class cFileNameList : public cStringList {
 public:
   cFileNameList(const char *Directory = NULL);
-  virtual ~cFileNameList();
   bool Load(const char *Directory);
-  int Find(const char *FileName);
   };
 
 class cHashObject : public cListObject {
diff --git a/vdr.c b/vdr.c
index f7ff1b58a..e28c7281c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,11 +22,12 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.291 2007/06/09 12:33:53 kls Exp $
+ * $Id: vdr.c 1.293 2007/06/17 11:23:08 kls Exp $
  */
 
 #include <getopt.h>
 #include <grp.h>
+#include <langinfo.h>
 #include <locale.h>
 #include <pwd.h>
 #include <signal.h>
@@ -493,18 +494,22 @@ int main(int argc, char *argv[])
 
   // Set the system character table:
 
-  char *LangEnv = setlocale(LC_CTYPE, "");
-  if (!LangEnv)
-     LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed
-  if (LangEnv) {
-     char *CodeSet = strchr(LangEnv, '.');
-     if (CodeSet) {
-        CodeSet++; // skip the dot
-        bool known = SI::SetSystemCharacterTable(CodeSet);
-        isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
-        cCharSetConv::SetSystemCharacterTable(CodeSet);
+  char *CodeSet = NULL;
+  if (setlocale(LC_CTYPE, ""))
+     CodeSet = nl_langinfo(CODESET);
+  else {
+     char *LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed
+     if (LangEnv) {
+        CodeSet = strchr(LangEnv, '.');
+        if (CodeSet)
+           CodeSet++; // skip the dot
         }
      }
+  if (CodeSet) {
+     bool known = SI::SetSystemCharacterTable(CodeSet);
+     isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
+     cCharSetConv::SetSystemCharacterTable(CodeSet);
+     }
 
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
@@ -545,6 +550,12 @@ int main(int argc, char *argv[])
         ))
      EXIT(2);
 
+  if (!*cFont::GetFontFileName(Setup.FontOsd)) {
+     const char *msg = "no fonts available - OSD will not show any text!";
+     fprintf(stderr, "vdr: %s\n", msg);
+     esyslog("ERROR: %s", msg);
+     }
+
   // Recordings:
 
   Recordings.Update();

From a9c7f0de90a44ea7c031154d47b092faed74f90b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 23 Jun 2007 18:00:00 +0200
Subject: [PATCH 171/307] Version 1.5.5 - Fixed a name clash between
 skincurses.c and the new cOsd position functions. - Updated the Finnish OSD
 texts (thanks to Rolf Ahrenberg). - Changed the parameter "OSD font size" to
 "Default font size" in "Setup/OSD". - Fixed handling address masks in SVDRP
 host settings (thanks to Frank Schmirler). - Fonts can now be created with a
 width that overwrites the default width (thanks   to Andreas Mair). - Added
 full weekday names to i18n.c for plugins to use (thanks to Patrice Staudt).  
 The new function WeekDayNameFull() can be used to get these names from
 integer   values (just like the abbreviated weekday names). - Fixed stripping
 i18n stuff from font names (reported by Anssi Hannula). - Improved
 performance of the SVDRP commands LSTC and CHAN when used with a   channel
 name.

---
 CONTRIBUTORS                        |   5 +
 HISTORY                             |  15 +++
 MANUAL                              |   2 +-
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/skincurses.c | 108 +++++++++---------
 config.c                            |   4 +-
 config.h                            |  10 +-
 font.c                              |  26 +++--
 font.h                              |   7 +-
 i18n.c                              | 171 +++++++++++++++++++++++++++-
 menu.c                              |   4 +-
 svdrp.c                             |  56 ++++-----
 tools.c                             |  23 +++-
 tools.h                             |   4 +-
 14 files changed, 323 insertions(+), 116 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e676a4f78..30abdf99b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -939,6 +939,7 @@ Andreas Mair <Andreas.Mair@linogate.com>
  is started through a user defined key macro
  for reporting a problem with extremely long summary fields in timers
  for reporting a bug in handling the tfRecording flag when reading timers
+ for enabling fonts to be created with a width that overwrites the default width
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -2048,6 +2049,7 @@ Frank Schmirler <vdr@schmirler.de>
  for fixing assigning schedules to channels in case there is no initial EPG information
  for making entering text via the numeric keys check the characters against the
  allowed characters
+ for fixing handling address masks in SVDRP host settings
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
@@ -2099,3 +2101,6 @@ Alexander Riedel <alexander-riedel@t-online.de>
 
 Jose Alberto Reguero <jareguero@telefonica.net>
  for a patch that fixed part of a crash in i18n character set conversion
+
+Patrice Staudt <staudt@engsystem.net>
+ for adding full weekday names to i18n.c for plugins to use
diff --git a/HISTORY b/HISTORY
index 71441c528..6168579d2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5260,3 +5260,18 @@ Video Disk Recorder Revision History
   Plugins that implement skins should no longer use Setup.OSDWidth etc. directly,
   but should rather use cOsd::OsdWidth() etc. instead.
   Currently a change to the OSD position will only apply to newly opened OSDs.
+
+2007-06-23: Version 1.5.5
+
+- Fixed a name clash between skincurses.c and the new cOsd position functions.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Changed the parameter "OSD font size" to "Default font size" in "Setup/OSD".
+- Fixed handling address masks in SVDRP host settings (thanks to Frank Schmirler).
+- Fonts can now be created with a width that overwrites the default width (thanks
+  to Andreas Mair).
+- Added full weekday names to i18n.c for plugins to use (thanks to Patrice Staudt).
+  The new function WeekDayNameFull() can be used to get these names from integer
+  values (just like the abbreviated weekday names).
+- Fixed stripping i18n stuff from font names (reported by Anssi Hannula).
+- Improved performance of the SVDRP commands LSTC and CHAN when used with a
+  channel name.
diff --git a/MANUAL b/MANUAL
index 86379acf2..60c6a71fb 100644
--- a/MANUAL
+++ b/MANUAL
@@ -514,7 +514,7 @@ Version 1.4
   Fixed font = Courier:Bold
                          The names of the various fonts to use.
 
-  OSD font size = 22
+  Default font size = 22
   Small font size = 18
   Fixed font size = 20
                          The sizes (in pixel) of the various fonts. Valid range is
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 3204f204d..8e34bc864 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -43,3 +43,7 @@ VDR Plugin 'skincurses' Revision History
 2007-06-15: Version 0.1.0
 
 - Implemented UTF-8 handling.
+
+2007-06-23: Version 0.1.1
+
+- Fixed a name clash with the new cOsd position functions.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 33fe194d3..fd20b4d49 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.13 2007/06/16 09:05:04 kls Exp $
+ * $Id: skincurses.c 1.14 2007/06/23 09:08:01 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -51,8 +51,8 @@ static int clrMessage[] = {
   clrRed
   };
 
-static int OsdWidth = 50;
-static int OsdHeight = 20;
+static int ScOsdWidth = 50;
+static int ScOsdHeight = 20;
 
 class cCursesOsd : public cOsd {
 private:
@@ -80,7 +80,7 @@ cCursesOsd::cCursesOsd(int Left, int Top)
   start_color();
   leaveok(stdscr, true);
 
-  window = subwin(stdscr, OsdHeight, OsdWidth, 0, 0);
+  window = subwin(stdscr, ScOsdHeight, ScOsdWidth, 0, 0);
   syncok(window, true);
 }
 
@@ -168,7 +168,7 @@ void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Co
      }
   SetColor(ColorFg, ColorBg);
   wmove(window, y, x); // ncurses wants 'y' before 'x'!
-  waddnstr(window, s, OsdWidth - x);
+  waddnstr(window, s, ScOsdWidth - x);
 }
 
 void cCursesOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
@@ -206,9 +206,9 @@ cSkinCursesDisplayChannel::cSkinCursesDisplayChannel(bool WithInfo)
 {
   int Lines = WithInfo ? 5 : 1;
   message = false;
-  osd = new cCursesOsd(0, Setup.ChannelInfoPos ? 0 : OsdHeight - Lines);
+  osd = new cCursesOsd(0, Setup.ChannelInfoPos ? 0 : ScOsdHeight - Lines);
   timeWidth = strlen("00:00");
-  osd->DrawRectangle(0, 0, OsdWidth - 1, Lines - 1, clrBackground);
+  osd->DrawRectangle(0, 0, ScOsdWidth - 1, Lines - 1, clrBackground);
 }
 
 cSkinCursesDisplayChannel::~cSkinCursesDisplayChannel()
@@ -218,14 +218,14 @@ cSkinCursesDisplayChannel::~cSkinCursesDisplayChannel()
 
 void cSkinCursesDisplayChannel::SetChannel(const cChannel *Channel, int Number)
 {
-  osd->DrawRectangle(0, 0, OsdWidth - 1, 0, clrBackground);
+  osd->DrawRectangle(0, 0, ScOsdWidth - 1, 0, clrBackground);
   osd->DrawText(0, 0, ChannelString(Channel, Number), clrWhite, clrBackground, &Font);
 }
 
 void cSkinCursesDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
 {
   osd->DrawRectangle(0, 1, timeWidth - 1, 4, clrRed);
-  osd->DrawRectangle(timeWidth, 1, OsdWidth - 1, 4, clrBackground);
+  osd->DrawRectangle(timeWidth, 1, ScOsdWidth - 1, 4, clrBackground);
   for (int i = 0; i < 2; i++) {
       const cEvent *e = !i ? Present : Following;
       if (e) {
@@ -239,8 +239,8 @@ void cSkinCursesDisplayChannel::SetEvents(const cEvent *Present, const cEvent *F
 void cSkinCursesDisplayChannel::SetMessage(eMessageType Type, const char *Text)
 {
   if (Text) {
-     osd->SaveRegion(0, 0, OsdWidth - 1, 0);
-     osd->DrawText(0, 0, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+     osd->SaveRegion(0, 0, ScOsdWidth - 1, 0);
+     osd->DrawText(0, 0, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, ScOsdWidth, 0, taCenter);
      message = true;
      }
   else {
@@ -253,7 +253,7 @@ void cSkinCursesDisplayChannel::Flush(void)
 {
   if (!message) {
      cString date = DayDateTime();
-     osd->DrawText(OsdWidth - Utf8StrLen(date), 0, date, clrWhite, clrBackground, &Font);
+     osd->DrawText(ScOsdWidth - Utf8StrLen(date), 0, date, clrWhite, clrBackground, &Font);
      }
   osd->Flush();
 }
@@ -284,7 +284,7 @@ class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
 cSkinCursesDisplayMenu::cSkinCursesDisplayMenu(void)
 {
   osd = new cCursesOsd(0, 0);
-  osd->DrawRectangle(0, 0, OsdWidth - 1, OsdHeight - 1, clrBackground);
+  osd->DrawRectangle(0, 0, ScOsdWidth - 1, ScOsdHeight - 1, clrBackground);
 }
 
 cSkinCursesDisplayMenu::~cSkinCursesDisplayMenu()
@@ -301,7 +301,7 @@ void cSkinCursesDisplayMenu::SetScrollbar(void)
      int sb = yb;
      int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
      int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
-     int xl = OsdWidth - 1;
+     int xl = ScOsdWidth - 1;
      osd->DrawRectangle(xl, st, xl, sb, clrCyan);
      osd->DrawRectangle(xl, tt, xl, tb, clrWhite);
      }
@@ -315,29 +315,29 @@ void cSkinCursesDisplayMenu::Scroll(bool Up, bool Page)
 
 int cSkinCursesDisplayMenu::MaxItems(void)
 {
-  return OsdHeight - 4;
+  return ScOsdHeight - 4;
 }
 
 void cSkinCursesDisplayMenu::Clear(void)
 {
-  osd->DrawRectangle(0, 1, OsdWidth - 1, OsdHeight - 2, clrBackground);
+  osd->DrawRectangle(0, 1, ScOsdWidth - 1, ScOsdHeight - 2, clrBackground);
   textScroller.Reset();
 }
 
 void cSkinCursesDisplayMenu::SetTitle(const char *Title)
 {
-  osd->DrawText(0, 0, Title, clrBlack, clrCyan, &Font, OsdWidth);
+  osd->DrawText(0, 0, Title, clrBlack, clrCyan, &Font, ScOsdWidth);
 }
 
 void cSkinCursesDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
-  int w = OsdWidth;
+  int w = ScOsdWidth;
   int t0 = 0;
   int t1 = 0 + w / 4;
   int t2 = 0 + w / 2;
   int t3 = w - w / 4;
   int t4 = w;
-  int y = OsdHeight - 1;
+  int y = ScOsdHeight - 1;
   osd->DrawText(t0, y, Red,    clrWhite, Red    ? clrRed    : clrBackground, &Font, t1 - t0, 0, taCenter);
   osd->DrawText(t1, y, Green,  clrBlack, Green  ? clrGreen  : clrBackground, &Font, t2 - t1, 0, taCenter);
   osd->DrawText(t2, y, Yellow, clrBlack, Yellow ? clrYellow : clrBackground, &Font, t3 - t2, 0, taCenter);
@@ -347,9 +347,9 @@ void cSkinCursesDisplayMenu::SetButtons(const char *Red, const char *Green, cons
 void cSkinCursesDisplayMenu::SetMessage(eMessageType Type, const char *Text)
 {
   if (Text)
-     osd->DrawText(0, OsdHeight - 2, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+     osd->DrawText(0, ScOsdHeight - 2, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, ScOsdWidth, 0, taCenter);
   else
-     osd->DrawRectangle(0, OsdHeight - 2, OsdWidth - 1, OsdHeight - 2, clrBackground);
+     osd->DrawRectangle(0, ScOsdHeight - 2, ScOsdWidth - 1, ScOsdHeight - 2, clrBackground);
 }
 
 void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable)
@@ -368,12 +368,12 @@ void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current,
       const char *s = GetTabbedText(Text, i);
       if (s) {
          int xt = Tab(i) / 12;// Tab() is in "pixel" - see also skins.c!!!
-         osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, OsdWidth - xt);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, ScOsdWidth - xt);
          }
       if (!Tab(i + 1))
          break;
       }
-  SetEditableWidth(OsdWidth - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
+  SetEditableWidth(ScOsdWidth - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
 }
 
 void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
@@ -384,24 +384,24 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
   cTextScroller ts;
   char t[32];
   snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
-  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
+  ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      char *buffer;
      asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
-     osd->DrawText(OsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
+     osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
      free(buffer);
      }
   y += ts.Height();
   y += 1;
-  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Event->Title(), &Font, clrCyan, clrBackground);
+  ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Event->Title(), &Font, clrCyan, clrBackground);
   y += ts.Height();
   if (!isempty(Event->ShortText())) {
-     ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Event->ShortText(), &Font, clrYellow, clrBackground);
+     ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Event->ShortText(), &Font, clrYellow, clrBackground);
      y += ts.Height();
      }
   y += 1;
   if (!isempty(Event->Description())) {
-     textScroller.Set(osd, 0, y, OsdWidth - 2, OsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground);
+     textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground);
      SetScrollbar();
      }
 }
@@ -415,35 +415,35 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
   cTextScroller ts;
   char t[32];
   snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
-  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
+  ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   y += ts.Height();
   y += 1;
   const char *Title = Info->Title();
   if (isempty(Title))
      Title = Recording->Name();
-  ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Title, &Font, clrCyan, clrBackground);
+  ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Title, &Font, clrCyan, clrBackground);
   y += ts.Height();
   if (!isempty(Info->ShortText())) {
-     ts.Set(osd, 0, y, OsdWidth, OsdHeight - y - 2, Info->ShortText(), &Font, clrYellow, clrBackground);
+     ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Info->ShortText(), &Font, clrYellow, clrBackground);
      y += ts.Height();
      }
   y += 1;
   if (!isempty(Info->Description())) {
-     textScroller.Set(osd, 0, y, OsdWidth - 2, OsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground);
+     textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground);
      SetScrollbar();
      }
 }
 
 void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
 {
-  textScroller.Set(osd, 0, 2, OsdWidth - 2, OsdHeight - 4, Text, &Font, clrWhite, clrBackground);
+  textScroller.Set(osd, 0, 2, ScOsdWidth - 2, ScOsdHeight - 4, Text, &Font, clrWhite, clrBackground);
   SetScrollbar();
 }
 
 void cSkinCursesDisplayMenu::Flush(void)
 {
   cString date = DayDateTime();
-  osd->DrawText(OsdWidth - Utf8StrLen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
+  osd->DrawText(ScOsdWidth - Utf8StrLen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
   osd->Flush();
 }
 
@@ -469,8 +469,8 @@ class cSkinCursesDisplayReplay : public cSkinDisplayReplay {
 cSkinCursesDisplayReplay::cSkinCursesDisplayReplay(bool ModeOnly)
 {
   message = false;
-  osd = new cCursesOsd(0, OsdHeight - 3);
-  osd->DrawRectangle(0, 0, OsdWidth - 1, 2, ModeOnly ? clrTransparent : clrBackground);
+  osd = new cCursesOsd(0, ScOsdHeight - 3);
+  osd->DrawRectangle(0, 0, ScOsdWidth - 1, 2, ModeOnly ? clrTransparent : clrBackground);
 }
 
 cSkinCursesDisplayReplay::~cSkinCursesDisplayReplay()
@@ -480,7 +480,7 @@ cSkinCursesDisplayReplay::~cSkinCursesDisplayReplay()
 
 void cSkinCursesDisplayReplay::SetTitle(const char *Title)
 {
-  osd->DrawText(0, 0, Title, clrWhite, clrBackground, &Font, OsdWidth);
+  osd->DrawText(0, 0, Title, clrWhite, clrBackground, &Font, ScOsdWidth);
 }
 
 void cSkinCursesDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
@@ -501,9 +501,9 @@ void cSkinCursesDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
 
 void cSkinCursesDisplayReplay::SetProgress(int Current, int Total)
 {
-  int p = Total > 0 ? OsdWidth * Current / Total : 0;
+  int p = Total > 0 ? ScOsdWidth * Current / Total : 0;
   osd->DrawRectangle(0, 1, p, 1, clrGreen);
-  osd->DrawRectangle(p, 1, OsdWidth, 1, clrWhite);
+  osd->DrawRectangle(p, 1, ScOsdWidth, 1, clrWhite);
 }
 
 void cSkinCursesDisplayReplay::SetCurrent(const char *Current)
@@ -513,19 +513,19 @@ void cSkinCursesDisplayReplay::SetCurrent(const char *Current)
 
 void cSkinCursesDisplayReplay::SetTotal(const char *Total)
 {
-  osd->DrawText(OsdWidth - Utf8StrLen(Total), 2, Total, clrWhite, clrBackground, &Font);
+  osd->DrawText(ScOsdWidth - Utf8StrLen(Total), 2, Total, clrWhite, clrBackground, &Font);
 }
 
 void cSkinCursesDisplayReplay::SetJump(const char *Jump)
 {
-  osd->DrawText(OsdWidth / 4, 2, Jump, clrWhite, clrBackground, &Font, OsdWidth / 2, 0, taCenter);
+  osd->DrawText(ScOsdWidth / 4, 2, Jump, clrWhite, clrBackground, &Font, ScOsdWidth / 2, 0, taCenter);
 }
 
 void cSkinCursesDisplayReplay::SetMessage(eMessageType Type, const char *Text)
 {
   if (Text) {
-     osd->SaveRegion(0, 2, OsdWidth - 1, 2);
-     osd->DrawText(0, 2, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+     osd->SaveRegion(0, 2, ScOsdWidth - 1, 2);
+     osd->DrawText(0, 2, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, ScOsdWidth, 0, taCenter);
      message = true;
      }
   else {
@@ -553,7 +553,7 @@ class cSkinCursesDisplayVolume : public cSkinDisplayVolume {
 
 cSkinCursesDisplayVolume::cSkinCursesDisplayVolume(void)
 {
-  osd = new cCursesOsd(0, OsdHeight - 1);
+  osd = new cCursesOsd(0, ScOsdHeight - 1);
 }
 
 cSkinCursesDisplayVolume::~cSkinCursesDisplayVolume()
@@ -564,16 +564,16 @@ cSkinCursesDisplayVolume::~cSkinCursesDisplayVolume()
 void cSkinCursesDisplayVolume::SetVolume(int Current, int Total, bool Mute)
 {
   if (Mute) {
-     osd->DrawRectangle(0, 0, OsdWidth - 1, 0, clrTransparent);
+     osd->DrawRectangle(0, 0, ScOsdWidth - 1, 0, clrTransparent);
      osd->DrawText(0, 0, tr("Key$Mute"), clrGreen, clrBackground, &Font);
      }
   else {
      const char *Prompt = tr("Volume ");
      int l = Utf8StrLen(Prompt);
-     int p = (OsdWidth - l) * Current / Total;
+     int p = (ScOsdWidth - l) * Current / Total;
      osd->DrawText(0, 0, Prompt, clrGreen, clrBackground, &Font);
      osd->DrawRectangle(l, 0, l + p - 1, 0, clrGreen);
-     osd->DrawRectangle(l + p, 0, OsdWidth - 1, 0, clrWhite);
+     osd->DrawRectangle(l + p, 0, ScOsdWidth - 1, 0, clrWhite);
      }
 }
 
@@ -604,9 +604,9 @@ cSkinCursesDisplayTracks::cSkinCursesDisplayTracks(const char *Title, int NumTra
   itemsWidth = Font.Width(Title);
   for (int i = 0; i < NumTracks; i++)
       itemsWidth = max(itemsWidth, Font.Width(Tracks[i]));
-  itemsWidth = min(itemsWidth, OsdWidth);
+  itemsWidth = min(itemsWidth, ScOsdWidth);
   osd = new cCursesOsd(0, 0);
-  osd->DrawRectangle(0, 0, OsdWidth - 1, OsdHeight - 1, clrBackground);
+  osd->DrawRectangle(0, 0, ScOsdWidth - 1, ScOsdHeight - 1, clrBackground);
   osd->DrawText(0, 0, Title, clrBlack, clrCyan, &Font, itemsWidth);
   for (int i = 0; i < NumTracks; i++)
       SetItem(Tracks[i], i, false);
@@ -659,7 +659,7 @@ class cSkinCursesDisplayMessage : public cSkinDisplayMessage {
 
 cSkinCursesDisplayMessage::cSkinCursesDisplayMessage(void)
 {
-  osd = new cCursesOsd(0, OsdHeight - 1);
+  osd = new cCursesOsd(0, ScOsdHeight - 1);
 }
 
 cSkinCursesDisplayMessage::~cSkinCursesDisplayMessage()
@@ -669,7 +669,7 @@ cSkinCursesDisplayMessage::~cSkinCursesDisplayMessage()
 
 void cSkinCursesDisplayMessage::SetMessage(eMessageType Type, const char *Text)
 {
-  osd->DrawText(0, 0, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, OsdWidth, 0, taCenter);
+  osd->DrawText(0, 0, Text, clrMessage[2 * Type], clrMessage[2 * Type + 1], &Font, ScOsdWidth, 0, taCenter);
 }
 
 void cSkinCursesDisplayMessage::Flush(void)
@@ -782,8 +782,8 @@ bool cPluginSkinCurses::Initialize(void)
   // Initialize any background activities the plugin shall perform.
   WINDOW *w = initscr();
   if (w) {
-     OsdWidth  = w->_maxx - w->_begx + 1;
-     OsdHeight = w->_maxy - w->_begy + 1;
+     ScOsdWidth  = w->_maxx - w->_begx + 1;
+     ScOsdHeight = w->_maxy - w->_begy + 1;
      return true;
      }
   return false;
diff --git a/config.c b/config.c
index 529a86968..05f7f1ff8 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.153 2007/06/17 11:54:54 kls Exp $
+ * $Id: config.c 1.154 2007/06/23 09:42:49 kls Exp $
  */
 
 #include "config.h"
@@ -119,7 +119,7 @@ bool cSVDRPhost::Parse(const char *s)
 
 bool cSVDRPhost::Accepts(in_addr_t Address)
 {
-  return (Address & mask) == addr.s_addr;
+  return (Address & mask) == (addr.s_addr & mask);
 }
 
 // -- cCommands --------------------------------------------------------------
diff --git a/config.h b/config.h
index b058ff1ad..aa4cfe87a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.291 2007/06/13 06:38:33 kls Exp $
+ * $Id: config.h 1.292 2007/06/23 09:06:24 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.4"
-#define VDRVERSNUM   10504  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.5"
+#define VDRVERSNUM   10505  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.4"
-#define APIVERSNUM   10504  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.5"
+#define APIVERSNUM   10505  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/font.c b/font.c
index 7e47e7ac4..19753bfcb 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.19 2007/06/17 12:13:49 kls Exp $
+ * $Id: font.c 1.21 2007/06/23 11:25:42 kls Exp $
  */
 
 #include "font.h"
@@ -103,7 +103,7 @@ class cFreetypeFont : public cFont {
   int Kerning(cGlyph *Glyph, uint PrevSym) const;
   cGlyph* Glyph(uint CharCode, bool AntiAliased = false) const;
 public:
-  cFreetypeFont(const char *Name, int CharHeight);
+  cFreetypeFont(const char *Name, int CharHeight, int CharWidth = 0);
   virtual ~cFreetypeFont();
   virtual int Width(uint c) const;
   virtual int Width(const char *s) const;
@@ -111,7 +111,7 @@ class cFreetypeFont : public cFont {
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const;
   };
 
-cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight)
+cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
 {
   height = 0;
   bottom = 0;
@@ -140,7 +140,7 @@ cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight)
            }
         else {
            error = FT_Set_Char_Size(face, // handle to face object
-                                    0,    // char_width in 1/64th of points
+                                    CharWidth * 64,  // CharWidth in 1/64th of points
                                     CharHeight * 64, // CharHeight in 1/64th of points
                                     0,    // horizontal device resolution
                                     0);   // vertical device resolution
@@ -332,11 +332,11 @@ const cFont *cFont::GetFont(eDvbFont Font)
   return fonts[Font];
 }
 
-cFont *cFont::CreateFont(const char *Name, int CharHeight)
+cFont *cFont::CreateFont(const char *Name, int CharHeight, int CharWidth)
 {
   cString fn = GetFontFileName(Name);
   if (*fn)
-     return new cFreetypeFont(fn, CharHeight);
+     return new cFreetypeFont(fn, CharHeight, CharWidth);
   return NULL;
 }
 
@@ -354,9 +354,19 @@ bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
          char *s = (char *)FcNameUnparse(fontset->fonts[i]);
          if (s) {
             // Strip i18n stuff:
+            char *c = strchr(s, ':');
+            if (c) {
+               char *p = strchr(c + 1, ',');
+               if (p)
+                  *p = 0;
+               }
             char *p = strchr(s, ',');
-            if (p)
-               *p = 0;
+            if (p) {
+               if (c)
+                  memmove(p, c, strlen(c) + 1);
+               else
+                  *p = 0;
+               }
             // Make it user presentable:
             s = strreplace(s, "\\", ""); // '-' is escaped
             s = strreplace(s, "style=", "");
diff --git a/font.h b/font.h
index 4a83c8733..4794304a1 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.19 2007/06/17 12:11:31 kls Exp $
+ * $Id: font.h 1.20 2007/06/23 10:09:14 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -57,9 +57,10 @@ class cFont {
           ///< The caller must not use the returned font outside the scope in which
           ///< it was retrieved by the call to GetFont(), because a call to SetFont()
           ///< may delete an existing font.
-  static cFont *CreateFont(const char *Name, int CharHeight);
+  static cFont *CreateFont(const char *Name, int CharHeight, int CharWidth = 0);
           ///< Creates a new font object with the given Name and makes its characters
-          ///< CharHeight pixels high. Name is of the form "Family:Style", for instance
+          ///< CharHeight pixels high. If CharWidth is given, it overwrites the font's
+          ///< default width. Name is of the form "Family:Style", for instance
           ///< "Verdana:Bold Italic" or "Times New Roman". See GetAvailableFontNames()
           ///< for how to get a list of all available font names.
           ///< If the requested font can't be created, NULL is returned.
diff --git a/i18n.c b/i18n.c
index fdeafc5b3..22aae61e8 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.297 2007/06/17 12:31:02 kls Exp $
+ * $Id: i18n.c 1.300 2007/06/23 13:28:32 kls Exp $
  *
  * Translations provided by:
  *
@@ -3563,7 +3563,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "K�yt� antialiasointia",
+    "K�yt� reunan pehmennyst�",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3609,7 +3609,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "Pienikirjasintyyppi",
+    "Pieni kirjasintyyppi",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3647,8 +3647,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
-  { "Setup.OSD$OSD font size (pixel)",
-    "OSD Schriftgr��e (pixel)",
+  { "Setup.OSD$Default font size (pixel)",
+    "Standard-Schriftgr��e (pixel)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5142,6 +5142,167 @@ const tI18nPhrase Phrases[] = {
     "Po �t St �t P� So Ne ",
     "PztSal�arPerCumCmtPaz",
   },
+  { "Monday",
+    "Montag",
+    "ponedeljek",
+    "Luned�",
+    "maandag",
+    "Segunda",
+    "Lundi",
+    "Manday",
+    "maanantai",
+    "poniedzia�ek",
+    "Lunes",
+    "�������",
+    "M�ndag",
+    "Luni",
+    "H�tf�",
+    "Dilluns",
+    "�����������",
+    "Ponedjeljak",
+    "Esmasp�ev",
+    "Mandag",
+    "Pond�l�",
+    "Pazartesi",
+  },
+  { "Tuesday",
+    "Dienstag",
+    "Torek",
+    "Marted�",
+    "Dinsdag",
+    "Ter�a",
+    "Mardi",
+    "Tirsday",
+    "Tiistai",
+    "Wtorek",
+    "Martes",
+    "�����",
+    "Tisdag",
+    "Mar�i",
+    "Kedd",
+    "Dimarts",
+    "�������",
+    "Utorak",
+    "Teisip�ev",
+    "Tirsdag",
+    "�ter�",
+    "Sal�",
+  },
+  { "Wednesday",
+    "Mittwoch",
+    "sreda",
+    "mercoled�",
+    "woensdag",
+    "Quarta",
+    "Mercredi",
+    "Onsday",
+    "Keskiviikko",
+    "�roda",
+    "Mi�rcoles",
+    "�������",
+    "Onsdag",
+    "Miercuri",
+    "Szerda",
+    "Dimecres",
+    "�����",
+    "Srijeda",
+    "Kolmap�ev",
+    "Onsdag",
+    "St�eda",
+    "�ar�amba",
+  },
+  { "Thursday",
+    "Donnerstag",
+    "�etrtek",
+    "Gioved�",
+    "Donderdag",
+    "Quinta",
+    "Jeudi",
+    "Torsdag",
+    "Torstai",
+    "Czwartek",
+    "Jueves",
+    "������",
+    "Torsdag",
+    "Joi",
+    "Cs�t�rt�k",
+    "Dijous",
+    "�������",
+    "�etvrtak",
+    "Neljap�ev",
+    "Torsdag",
+    "�tvrtek",
+    "Per�embe",
+  },
+  { "Friday",
+    "Freitag",
+    "Petek",
+    "Venerd�",
+    "Vrijdag",
+    "Sexta",
+    "Vendredi",
+    "Fredag",
+    "Perjantai",
+    "Pi�tek",
+    "Viernes",
+    "���������",
+    "Fredag",
+    "Vineri",
+    "P�ntek",
+    "Divendres",
+    "�������",
+    "Petak",
+    "Reede",
+    "Fredag",
+    "P�tek",
+    "Cuma",
+  },
+  { "Saturday",
+    "Samstag",
+    "Sobota",
+    "Sabato",
+    "Zaterdag",
+    "S�bado",
+    "Samedi",
+    "L�rdag",
+    "Lauantai",
+    "Sobota",
+    "S�bado",
+    "�������",
+    "L�rdag",
+    "S�mb�t�",
+    "Szombat",
+    "Dissabte",
+    "�������",
+    "Subota",
+    "Laup�ev",
+    "L�rdag",
+    "Sobota",
+    "Cumartesi",
+  },
+  { "Sunday",
+    "Sonntag",
+    "Nedelja",
+    "Domenica",
+    "Zondag",
+    "Domingo",
+    "Dimanche",
+    "S�ndag",
+    "Sunnuntai",
+    "Niedziela",
+    "Domingo",
+    "�������",
+    "S�ndag",
+    "Duminic�",
+    "Vas�rnap",
+    "Diumenge",
+    "�����������",
+    "Nedjelja",
+    "P�hap�ev",
+    "S�ndag",
+    "Ned�le",
+    "Pazar",
+  },
   // The allowed characters in strings:
   { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
     " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@",
diff --git a/menu.c b/menu.c
index 13e224d9f..4d53b85c5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.455 2007/06/17 12:33:01 kls Exp $
+ * $Id: menu.c 1.456 2007/06/23 09:27:13 kls Exp $
  */
 
 #include "menu.h"
@@ -2217,7 +2217,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditStraItem(tr("Setup.OSD$Default font"),           &fontOsdIndex, fontOsdNames.Size(), &fontOsdNames[0]));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Small font"),             &fontSmlIndex, fontSmlNames.Size(), &fontSmlNames[0]));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font"),             &fontFixIndex, fontFixNames.Size(), &fontFixNames[0]));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$OSD font size (pixel)"),  &data.FontOsdSize, 10, MAXFONTSIZE));
+  Add(new cMenuEditIntItem( tr("Setup.OSD$Default font size (pixel)"), &data.FontOsdSize, 10, MAXFONTSIZE));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Small font size (pixel)"),&data.FontSmlSize, 10, MAXFONTSIZE));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Fixed font size (pixel)"),&data.FontFixSize, 10, MAXFONTSIZE));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
diff --git a/svdrp.c b/svdrp.c
index 96bc38368..3694ebb80 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.101 2007/04/30 12:41:07 kls Exp $
+ * $Id: svdrp.c 1.102 2007/06/23 13:14:59 kls Exp $
  */
 
 #include "svdrp.h"
@@ -497,14 +497,14 @@ void cSVDRP::CmdCHAN(const char *Option)
         if (channel)
            n = channel->Number();
         else {
-           int i = 1;
-           while ((channel = Channels.GetByNumber(i, 1)) != NULL) {
-                 if (strcasecmp(channel->Name(), Option) == 0) {
-                    n = channel->Number();
-                    break;
-                    }
-                 i = channel->Number() + 1;
-                 }
+           for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+               if (!channel->GroupSep()) {
+                  if (strcasecmp(channel->Name(), Option) == 0) {
+                     n = channel->Number();
+                     break;
+                     }
+                  }
+               }
            }
         }
      if (n < 0) {
@@ -871,23 +871,16 @@ void cSVDRP::CmdLSTC(const char *Option)
            Reply(501, "Channel \"%s\" not defined", Option);
         }
      else {
-        int i = 1;
         cChannel *next = NULL;
-        while (i <= Channels.MaxNumber()) {
-              cChannel *channel = Channels.GetByNumber(i, 1);
-              if (channel) {
-                 if (strcasestr(channel->Name(), Option)) {
-                    if (next)
-                       Reply(-250, "%d %s", next->Number(), *next->ToText());
-                    next = channel;
-                    }
-                 }
-              else {
-                 Reply(501, "Channel \"%d\" not found", i);
-                 return;
-                 }
-              i = channel->Number() + 1;
-              }
+        for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+            if (!channel->GroupSep()) {
+               if (strcasestr(channel->Name(), Option)) {
+                  if (next)
+                     Reply(-250, "%d %s", next->Number(), *next->ToText());
+                  next = channel;
+                  }
+               }
+            }
         if (next)
            Reply(250, "%d %s", next->Number(), *next->ToText());
         else
@@ -895,15 +888,10 @@ void cSVDRP::CmdLSTC(const char *Option)
         }
      }
   else if (Channels.MaxNumber() >= 1) {
-     int i = 1;
-     while (i <= Channels.MaxNumber()) {
-           cChannel *channel = Channels.GetByNumber(i, 1);
-           if (channel)
-              Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), *channel->ToText());
-           else
-              Reply(501, "Channel \"%d\" not found", i);
-           i = channel->Number() + 1;
-           }
+     for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+         if (!channel->GroupSep())
+            Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), *channel->ToText());
+         }
      }
   else
      Reply(550, "No channels defined");
diff --git a/tools.c b/tools.c
index dd2395ad4..edff762a3 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.129 2007/06/17 11:02:34 kls Exp $
+ * $Id: tools.c 1.130 2007/06/23 13:38:30 kls Exp $
  */
 
 #include "tools.h"
@@ -871,6 +871,27 @@ cString WeekDayName(time_t t)
   return WeekDayName(localtime_r(&t, &tm_r)->tm_wday);
 }
 
+cString WeekDayNameFull(int WeekDay)
+{
+  WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with Monday==0!
+  switch (WeekDay) {
+    case 0: return tr("Monday");
+    case 1: return tr("Tuesday");
+    case 2: return tr("Wednesday");
+    case 3: return tr("Thursday");
+    case 4: return tr("Friday");
+    case 5: return tr("Saturday");
+    case 6: return tr("Sunday");
+    }
+  return "???";
+}
+
+cString WeekDayNameFull(time_t t)
+{
+  struct tm tm_r;
+  return WeekDayNameFull(localtime_r(&t, &tm_r)->tm_wday);
+}
+
 cString DayDateTime(time_t t)
 {
   char buffer[32];
diff --git a/tools.h b/tools.h
index 891196757..fc9c87bff 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.102 2007/06/17 11:00:20 kls Exp $
+ * $Id: tools.h 1.103 2007/06/23 13:34:28 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -196,6 +196,8 @@ void TouchFile(const char *FileName);
 time_t LastModifiedTime(const char *FileName);
 cString WeekDayName(int WeekDay);
 cString WeekDayName(time_t t);
+cString WeekDayNameFull(int WeekDay);
+cString WeekDayNameFull(time_t t);
 cString DayDateTime(time_t t = 0);
 cString TimeToString(time_t t);
 cString DateString(time_t t);

From 8849308cf9ad1e85ed1790aa832806ce7f74e565 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 22 Jul 2007 18:00:00 +0200
Subject: [PATCH 172/307] =?UTF-8?q?Version=201.5.6=20-=20Fixed=20a=20buffe?=
 =?UTF-8?q?r=20overflow=20in=20initializing=20the=20system=20character=20t?=
 =?UTF-8?q?able=20(thanks=20=20=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-?=
 =?UTF-8?q?=20Updated=20the=20Russian=20OSD=20texts=20(thanks=20to=20Oleg?=
 =?UTF-8?q?=20Roitburd).=20-=20Fixed=20handling=20single=20byte=20characte?=
 =?UTF-8?q?rs=20>0x7F=20in=20Utf8ToArray()=20(thanks=20to=20Udo=20=20=20Ri?=
 =?UTF-8?q?chter).=20-=20Improved=20numdigits(),=20isnumber()=20and=20strr?=
 =?UTF-8?q?eplace()=20(thanks=20to=20Tobias=20Bratfisch).=20-=20Fixed=20cl?=
 =?UTF-8?q?earing=20color=20buttons=20in=20the=20'curses'=20skin=20(thanks?=
 =?UTF-8?q?=20to=20Udo=20Richter).=20-=20Fixed=20a=20typo=20in=20the=20fun?=
 =?UTF-8?q?ction=20name=20of=20cOsd::SetOsdPosition()=20and=20added=20a=20?=
 =?UTF-8?q?range=20=20=20check=20to=20it=20(thanks=20to=20Christoph=20Haub?=
 =?UTF-8?q?rich).=20-=20Updated=20the=20Finnish=20OSD=20texts=20(thanks=20?=
 =?UTF-8?q?to=20Rolf=20Ahrenberg).=20-=20Improved=20cControl::Launch()=20t?=
 =?UTF-8?q?o=20keep=20'control'=20from=20pointing=20to=20uninitialized=20?=
 =?UTF-8?q?=20=20memory=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Made=20s?=
 =?UTF-8?q?kipspace()=20an=20inline=20function=20(suggested=20by=20Tobias?=
 =?UTF-8?q?=20Bratfisch)=20and=20changed=20=20=20it=20to=20handle=20the=20?=
 =?UTF-8?q?most=20common=20case=20of=20'no=20leading=20space'=20very=20fas?=
 =?UTF-8?q?t,=20and=20avoid=20=20=20calling=20isspace(),=20which=20made=20?=
 =?UTF-8?q?the=20whole=20function=20a=20lot=20faster.=20-=20Fixed=20detect?=
 =?UTF-8?q?ion=20of=20Premiere=20NVOD=20channel=20links=20(thanks=20to=20M?=
 =?UTF-8?q?arkus=20Hahn).=20-=20Added=20a=20table=20of=20the=20used=20tric?=
 =?UTF-8?q?k=20speed=20values=20to=20the=20description=20of=20=20=20cDevic?=
 =?UTF-8?q?e::TrickSpeed()=20(suggested=20by=20Martin=20Dauskardt).=20-=20?=
 =?UTF-8?q?Added=20a=20missing=20'P'=20to=20vdr.c's=20SHUTDOWNCANCELROMPT?=
 =?UTF-8?q?=20macro=20(reported=20by=20Marco=20=20=20Schl=C3=BC=C3=9Fler).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        | 14 +++++++++
 HISTORY                             | 23 +++++++++++++++
 PLUGINS/src/skincurses/HISTORY      |  4 +++
 PLUGINS/src/skincurses/skincurses.c |  6 ++--
 channels.c                          | 13 +++++++-
 channels.h                          |  3 +-
 config.h                            | 10 +++----
 device.h                            |  8 ++++-
 eit.c                               |  7 +++--
 i18n.c                              | 46 ++++++++++++++---------------
 libsi/si.c                          |  6 ++--
 osd.c                               |  8 ++---
 osd.h                               |  4 +--
 player.c                            |  5 ++--
 tools.c                             | 38 +++++++++++-------------
 tools.h                             | 11 +++++--
 vdr.c                               | 36 +++++++++++-----------
 17 files changed, 153 insertions(+), 89 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 30abdf99b..7a4daaa8c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1015,6 +1015,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  the plugins
  for increasing the maximum number of DVB devices to 8
  for suggesting to change the parameter "OSD font" to "Default font" in "Setup/OSD"
+ for improving cControl::Launch() to keep 'control' from pointing to uninitialized
+ memory
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1401,6 +1403,8 @@ Marco Schl
  for removing 'assert(0)' from cDvbSpuDecoder::setTime()
  for adapting 'libsi' to DVB-S2
  for fixing handling ChannelUp/Down keys if there is currently a replay running
+ for fixing a buffer overflow in initializing the system character table
+ for reporting a missing 'P' in vdr.c's SHUTDOWNCANCELROMPT macro
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1419,6 +1423,8 @@ Olaf Henkel <olafhenkel@t-online.de>
 Martin Dauskardt <md001@gmx.de>
  for reporting a problem with switching channels while an encrypted channel is being
  recorded
+ for suggesting to add a table of the used trick speed values to the description of
+ cDevice::TrickSpeed()
 
 Maynard Cedric <maynard.cedric@wanadoo.fr>
  for reporting a problem in handling the color button texts in cMenuEditStrItem
@@ -1499,6 +1505,8 @@ Udo Richter <udo_richter@gmx.de>
  for making the HUP signal force a restart of VDR
  for fixing a race condition with signal handlers at program exit
  for fixing handling detached processes in SystemExec()
+ for fixing handling single byte characters >0x7F in Utf8ToArray()
+ for fixing clearing color buttons in the 'curses' skin
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1955,6 +1963,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  calling "vdr --help"
  for fixing cDevice::ToggleMute()
  for suggestions that led to implementing cOsd::SetOsdPosition() etc.
+ for fixing a typo in the function name of cOsd::SetOsdPosition() and adding a range
+ check to it
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2104,3 +2114,7 @@ Jose Alberto Reguero <jareguero@telefonica.net>
 
 Patrice Staudt <staudt@engsystem.net>
  for adding full weekday names to i18n.c for plugins to use
+
+Tobias Bratfisch <tobias@reel-multimedia.com>
+ for improving numdigits(), isnumber() and strreplace()
+ for suggesting to make skipspace() an inline function
diff --git a/HISTORY b/HISTORY
index 6168579d2..a4d0c2d86 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5275,3 +5275,26 @@ Video Disk Recorder Revision History
 - Fixed stripping i18n stuff from font names (reported by Anssi Hannula).
 - Improved performance of the SVDRP commands LSTC and CHAN when used with a
   channel name.
+
+2007-07-22: Version 1.5.6
+
+- Fixed a buffer overflow in initializing the system character table (thanks
+  to Marco Schl��ler).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Fixed handling single byte characters >0x7F in Utf8ToArray() (thanks to Udo
+  Richter).
+- Improved numdigits(), isnumber() and strreplace() (thanks to Tobias Bratfisch).
+- Fixed clearing color buttons in the 'curses' skin (thanks to Udo Richter).
+- Fixed a typo in the function name of cOsd::SetOsdPosition() and added a range
+  check to it (thanks to Christoph Haubrich).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Improved cControl::Launch() to keep 'control' from pointing to uninitialized
+  memory (thanks to Rolf Ahrenberg).
+- Made skipspace() an inline function (suggested by Tobias Bratfisch) and changed
+  it to handle the most common case of 'no leading space' very fast, and avoid
+  calling isspace(), which made the whole function a lot faster.
+- Fixed detection of Premiere NVOD channel links (thanks to anonymous).
+- Added a table of the used trick speed values to the description of
+  cDevice::TrickSpeed() (suggested by Martin Dauskardt).
+- Added a missing 'P' to vdr.c's SHUTDOWNCANCELROMPT macro (reported by Marco
+  Schl��ler).
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 8e34bc864..60f4839e2 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -47,3 +47,7 @@ VDR Plugin 'skincurses' Revision History
 2007-06-23: Version 0.1.1
 
 - Fixed a name clash with the new cOsd position functions.
+
+2007-07-20: Version 0.1.2
+
+- Fixed clearing color buttons.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index fd20b4d49..9324210c4 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.14 2007/06/23 09:08:01 kls Exp $
+ * $Id: skincurses.c 1.15 2007/07/20 14:45:07 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.1";
+static const char *VERSION        = "0.1.2";
 static const char *DESCRIPTION    = "A text only skin";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -133,8 +133,6 @@ void cCursesOsd::RestoreRegion(void)
 
 void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
 {
-  if (!s)
-     return;
   int w = Font->Width(s);
   int h = Font->Height();
   if (Width || Height) {
diff --git a/channels.c b/channels.c
index 67cf3c9de..d725ac763 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.53 2006/05/28 15:03:40 kls Exp $
+ * $Id: channels.c 1.54 2007/07/21 14:55:01 kls Exp $
  */
 
 #include "channels.h"
@@ -1007,6 +1007,17 @@ cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid, bo
      }
   return NULL;
 }
+cChannel *cChannels::GetByTransponderID(tChannelID ChannelID)
+{
+  int source = ChannelID.Source();
+  int nid = ChannelID.Nid();
+  int tid = ChannelID.Tid();
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (channel->Tid() == tid && channel->Nid() == nid && channel->Source() == source)
+         return channel;
+      }
+  return NULL;
+}
 
 bool cChannels::HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel)
 {
diff --git a/channels.h b/channels.h
index 143bb47ca..6381a2016 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.43 2007/01/05 10:37:35 kls Exp $
+ * $Id: channels.h 1.44 2007/07/21 14:58:36 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -239,6 +239,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID);
   cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false, bool TryWithoutPolarization = false);
+  cChannel *GetByTransponderID(tChannelID ChannelID);
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
   void DecBeingEdited(void) { beingEdited--; }
diff --git a/config.h b/config.h
index aa4cfe87a..edc512350 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.292 2007/06/23 09:06:24 kls Exp $
+ * $Id: config.h 1.294 2007/07/20 14:52:05 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.5"
-#define VDRVERSNUM   10505  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.6"
+#define VDRVERSNUM   10506  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.5"
-#define APIVERSNUM   10505  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.6"
+#define APIVERSNUM   10506  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.h b/device.h
index 60dc73e13..e74c88416 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.81 2007/01/13 11:33:57 kls Exp $
+ * $Id: device.h 1.82 2007/07/22 11:20:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -468,6 +468,12 @@ class cDevice : public cThread {
        ///< Sets the device into a mode where replay is done slower.
        ///< Every single frame shall then be displayed the given number of
        ///< times.
+       ///< The cDvbPlayer uses the following values for the various speeds:
+       ///<                   1x   2x   3x
+       ///< Fast Forward       6    3    1
+       ///< Fast Reverse       6    3    1
+       ///< Slow Forward       8    4    2
+       ///< Slow Reverse      63   48   24
   virtual void Clear(void);
        ///< Clears all video and audio data from the device.
        ///< A derived class must call the base class function to make sure
diff --git a/eit.c b/eit.c
index e1e47f48f..cc2d08638 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.123 2007/06/10 12:51:05 kls Exp $
+ * $Id: eit.c 1.124 2007/07/21 14:58:04 kls Exp $
  */
 
 #include "eit.h"
@@ -197,7 +197,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                                 link->SetName(linkName, "", "");
                              }
                           else if (Setup.UpdateChannels >= 4) {
-                             link = Channels.NewChannel(channel, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                             cChannel *transponder = channel;
+                             if (channel->Tid() != ld->getTransportStreamId())
+                                channel = Channels.GetByTransponderID(linkID);
+                             link = Channels.NewChannel(transponder, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
                              //XXX patFilter->Trigger();
                              }
                           if (link) {
diff --git a/i18n.c b/i18n.c
index 22aae61e8..db784ca31 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.300 2007/06/23 13:28:32 kls Exp $
+ * $Id: i18n.c 1.302 2007/07/20 15:04:37 kls Exp $
  *
  * Translations provided by:
  *
@@ -1415,7 +1415,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������� ������� - ������������� �������������?",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1506,7 +1506,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "������� ����� ������ ��� ������ ������������",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1528,7 +1528,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "VDR ���������� ����� - ������� Power ��� ���������",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1550,7 +1550,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "VDR ���������� ����� %s �����",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1572,7 +1572,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "���� ������ - ������������� ���������?",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -1594,7 +1594,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Plugin %s ��������� ����� %ld ����� - ����������?",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2861,7 +2861,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM ������������ - ������������� �����������?",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2906,7 +2906,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM ����������",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2928,7 +2928,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM ������������",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2950,7 +2950,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM �����",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2972,7 +2972,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "CAM �� ��������",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3341,7 +3341,7 @@ const tI18nPhrase Phrases[] = {
     "Tem�",
     "T�ma",
     "",// TODO
-    "�������",
+    "����",
     "Tema",
     "Teema",
     "Tema",
@@ -3525,7 +3525,7 @@ const tI18nPhrase Phrases[] = {
     "dep. de skin",
     "Men� n�zet�t�l f�gg�en",
     "",// TODO
-    "�������� ����",
+    "�������� �����",
     "ovisno o povr�ini",
     "kestast s�ltuv",
     "skin afh�ngig",
@@ -3571,7 +3571,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����������� �������",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3594,7 +3594,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "����������� ����",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3617,7 +3617,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ����",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3640,7 +3640,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������������� ����",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3663,7 +3663,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ����� ��� ���� (pixel)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3686,7 +3686,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ������� ����� (pixel)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -3709,7 +3709,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ �������������� ����� (pixel)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5020,7 +5020,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "������ ������� ��� ����� ������ (ms)",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5150,7 +5150,7 @@ const tI18nPhrase Phrases[] = {
     "Segunda",
     "Lundi",
     "Manday",
-    "maanantai",
+    "Maanantai",
     "poniedzia�ek",
     "Lunes",
     "�������",
diff --git a/libsi/si.c b/libsi/si.c
index 889509088..c75f19a9f 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.21 2007/06/15 13:08:31 kls Exp $
+ *   $Id: si.c 1.22 2007/07/21 13:49:48 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -287,7 +287,7 @@ static const char *CharacterTables1[] = {
 #define SingleByteLimit 0x0B
 
 static const char *CharacterTables2[] = {
-  NULL,         // 0x00
+  NULL,          // 0x00
   "ISO-8859-1",  // 0x01
   "ISO-8859-2",  // 0x02
   "ISO-8859-3",  // 0x03
@@ -299,7 +299,7 @@ static const char *CharacterTables2[] = {
   "ISO-8859-9",  // 0x09
   "ISO-8859-10", // 0x0A
   "ISO-8859-11", // 0x0B
-  NULL,         // 0x0C
+  NULL,          // 0x0C
   "ISO-8859-13", // 0x0D
   "ISO-8859-14", // 0x0E
   "ISO-8859-15", // 0x0F
diff --git a/osd.c b/osd.c
index 188ee9d4c..c60518c43 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.70 2007/06/17 13:54:34 kls Exp $
+ * $Id: osd.c 1.71 2007/07/20 14:51:36 kls Exp $
  */
 
 #include "osd.h"
@@ -668,12 +668,12 @@ cOsd::~cOsd()
   isOpen--;
 }
 
-void cOsd::SetOsdPostion(int Left, int Top, int Width, int Height)
+void cOsd::SetOsdPosition(int Left, int Top, int Width, int Height)
 {
   osdLeft = Left;
   osdTop = Top;
-  osdWidth = Width;
-  osdHeight = Height;
+  osdWidth = min(max(Width, MINOSDWIDTH), MAXOSDWIDTH);
+  osdHeight = min(max(Height, MINOSDHEIGHT), MAXOSDHEIGHT);
 }
 
 void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
diff --git a/osd.h b/osd.h
index 075305821..08bc41842 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.55 2007/06/17 13:59:22 kls Exp $
+ * $Id: osd.h 1.56 2007/07/20 14:50:17 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -276,7 +276,7 @@ class cOsd {
   static int OsdTop(void) { return osdTop ? osdTop : Setup.OSDTop; }
   static int OsdWidth(void) { return osdWidth ? osdWidth : Setup.OSDWidth; }
   static int OsdHeight(void) { return osdHeight ? osdHeight : Setup.OSDHeight; }
-  static void SetOsdPostion(int Left, int Top, int Width, int Height);
+  static void SetOsdPosition(int Left, int Top, int Width, int Height);
        ///< Sets the position and size of the OSD to the given values.
        ///< This may be useful for plugins that determine the scaling of the
        ///< video image and need to scale the OSD accordingly to fit on the
diff --git a/player.c b/player.c
index f29302073..c96fc1ab1 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.11 2006/01/06 11:30:07 kls Exp $
+ * $Id: player.c 1.12 2007/07/20 15:25:24 kls Exp $
  */
 
 #include "player.h"
@@ -69,8 +69,9 @@ cControl *cControl::Control(void)
 void cControl::Launch(cControl *Control)
 {
   cMutexLock MutexLock(&mutex);
-  delete control;
+  cControl *c = control; // keeps control from pointing to uninitialized memory
   control = Control;
+  delete c;
 }
 
 void cControl::Attach(void)
diff --git a/tools.c b/tools.c
index edff762a3..0d471bb7a 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.130 2007/06/23 13:38:30 kls Exp $
+ * $Id: tools.c 1.134 2007/07/21 13:02:45 kls Exp $
  */
 
 #include "tools.h"
@@ -158,21 +158,15 @@ char *strreplace(char *s, const char *s1, const char *s2)
      int l1 = strlen(s1);
      int l2 = strlen(s2);
      if (l2 > l1)
-        s = (char *)realloc(s, strlen(s) + l2 - l1 + 1);
+        s = (char *)realloc(s, l + l2 - l1 + 1);
+     char *sof = s + of;
      if (l2 != l1)
-        memmove(s + of + l2, s + of + l1, l - of - l1 + 1);
-     strncpy(s + of, s2, l2);
+        memmove(sof + l2, sof + l1, l - of - l1 + 1);
+     strncpy(sof, s2, l2);
      }
   return s;
 }
 
-char *skipspace(const char *s)
-{
-  while (*s && isspace(*s))
-        s++;
-  return (char *)s;
-}
-
 char *stripspace(char *s)
 {
   if (s && *s) {
@@ -252,20 +246,22 @@ bool isempty(const char *s)
 
 int numdigits(int n)
 {
-  char buf[16];
-  snprintf(buf, sizeof(buf), "%d", n);
-  return strlen(buf);
+  int res = 1;
+  while (n >= 10) {
+        n /= 10;
+        res++;
+        }
+  return res;
 }
 
 bool isnumber(const char *s)
 {
   if (!*s)
      return false;
-  while (*s) {
-        if (!isdigit(*s))
-           return false;
-        s++;
-        }
+  do {
+     if (!isdigit(*s))
+        return false;
+     } while (*++s);
   return true;
 }
 
@@ -685,7 +681,7 @@ int Utf8ToArray(const char *s, uint *a, int Size)
   int n = 0;
   while (*s && --Size > 0) {
         if (cCharSetConv::SystemCharacterTable())
-           *a++ = *s++;
+           *a++ = (uchar)(*s++);
         else {
            int sl = Utf8CharLen(s);
            *a++ = Utf8CharGet(s, sl);
@@ -756,7 +752,7 @@ void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)
      char buf[129];
      for (int i = 0; i < 128; i++)
          buf[i] = i + 128;
-     buf[129] = 0;
+     buf[128] = 0;
      cCharSetConv csc(CharacterTable);
      const char *s = csc.Convert(buf);
      int i = 0;
diff --git a/tools.h b/tools.h
index fc9c87bff..a0c5a528d 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.103 2007/06/23 13:34:28 kls Exp $
+ * $Id: tools.h 1.104 2007/07/21 13:35:45 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -173,7 +173,14 @@ char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
 char *strreplace(char *s, const char *s1, const char *s2); ///< re-allocates 's' and deletes the original string if necessary!
-char *skipspace(const char *s);
+inline char *skipspace(const char *s)
+{
+  if (*s > ' ') // most strings don't have any leading space, so handle this case as fast as possible
+     return (char *)s;
+  while (*s && *s <= ' ') // avoiding isspace() here, because it is much slower
+        s++;
+  return (char *)s;
+}
 char *stripspace(char *s);
 char *compactspace(char *s);
 cString strescape(const char *s, const char *chars);
diff --git a/vdr.c b/vdr.c
index e28c7281c..54814a78f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.293 2007/06/17 11:23:08 kls Exp $
+ * $Id: vdr.c 1.294 2007/07/22 11:40:01 kls Exp $
  */
 
 #include <getopt.h>
@@ -65,22 +65,22 @@
 #include "transfer.h"
 #include "videodir.h"
 
-#define MINCHANNELWAIT     10 // seconds to wait between failed channel switchings
-#define ACTIVITYTIMEOUT    60 // seconds before starting housekeeping
-#define SHUTDOWNWAIT      300 // seconds to wait in user prompt before automatic shutdown
-#define SHUTDOWNRETRY     360 // seconds before trying again to shut down
-#define SHUTDOWNFORCEPROMPT 5 // seconds to wait in user prompt to allow forcing shutdown
-#define SHUTDOWNCANCELROMPT 5 // seconds to wait in user prompt to allow canceling shutdown
-#define RESTARTCANCELPROMPT 5 // seconds to wait in user prompt before restarting on SIGHUP
-#define MANUALSTART       600 // seconds the next timer must be in the future to assume manual start
-#define CHANNELSAVEDELTA  600 // seconds before saving channels.conf after automatic modifications
-#define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
-#define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
-#define TIMERCHECKDELTA    10 // seconds between checks for timers that need to see their channel
-#define TIMERDEVICETIMEOUT  8 // seconds before a device used for timer check may be reused
-#define TIMERLOOKAHEADTIME 60 // seconds before a non-VPS timer starts and the channel is switched if possible
-#define VPSLOOKAHEADTIME   24 // hours within which VPS timers will make sure their events are up to date
-#define VPSUPTODATETIME  3600 // seconds before the event or schedule of a VPS timer needs to be refreshed
+#define MINCHANNELWAIT        10 // seconds to wait between failed channel switchings
+#define ACTIVITYTIMEOUT       60 // seconds before starting housekeeping
+#define SHUTDOWNWAIT         300 // seconds to wait in user prompt before automatic shutdown
+#define SHUTDOWNRETRY        360 // seconds before trying again to shut down
+#define SHUTDOWNFORCEPROMPT    5 // seconds to wait in user prompt to allow forcing shutdown
+#define SHUTDOWNCANCELPROMPT   5 // seconds to wait in user prompt to allow canceling shutdown
+#define RESTARTCANCELPROMPT    5 // seconds to wait in user prompt before restarting on SIGHUP
+#define MANUALSTART          600 // seconds the next timer must be in the future to assume manual start
+#define CHANNELSAVEDELTA     600 // seconds before saving channels.conf after automatic modifications
+#define DEVICEREADYTIMEOUT    30 // seconds to wait until all devices are ready
+#define MENUTIMEOUT          120 // seconds of user inactivity after which an OSD display is closed
+#define TIMERCHECKDELTA       10 // seconds between checks for timers that need to see their channel
+#define TIMERDEVICETIMEOUT     8 // seconds before a device used for timer check may be reused
+#define TIMERLOOKAHEADTIME    60 // seconds before a non-VPS timer starts and the channel is switched if possible
+#define VPSLOOKAHEADTIME      24 // hours within which VPS timers will make sure their events are up to date
+#define VPSUPTODATETIME     3600 // seconds before the event or schedule of a VPS timer needs to be refreshed
 
 #define EXIT(v) { ShutdownHandler.Exit(v); goto Exit; }
 
@@ -1037,7 +1037,7 @@ int main(int argc, char *argv[])
                   break;
                   }
                // Ask the final question:
-               if (!Interface->Confirm(tr("Press any key to cancel shutdown"), SHUTDOWNCANCELROMPT, true))
+               if (!Interface->Confirm(tr("Press any key to cancel shutdown"), SHUTDOWNCANCELPROMPT, true))
                   // If final question was canceled, continue to be active:
                   break;
                // Ok, now call the shutdown script:

From 4c65b525dc1e3c62336b223d200a46fb30dc7e52 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 12 Aug 2007 18:00:00 +0200
Subject: [PATCH 173/307] =?UTF-8?q?Version=201.5.7=20-=20All=20logging=20n?=
 =?UTF-8?q?ow=20goes=20to=20LOG=5FERR,=20because=20some=20systems=20split?=
 =?UTF-8?q?=20error,=20info=20and=20=20=20debug=20messages=20into=20separa?=
 =?UTF-8?q?te=20files,=20which=20repeatedly=20caused=20extra=20efforts=20t?=
 =?UTF-8?q?o=20=20=20find=20out=20when=20incomplete=20log=20excerpts=20wer?=
 =?UTF-8?q?e=20attached=20to=20problem=20reports=20in=20=20=20the=20past.?=
 =?UTF-8?q?=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to=20?=
 =?UTF-8?q?Arthur=20Konovalov).=20-=20Fixed=20a=20problem=20with=20charact?=
 =?UTF-8?q?ers=20>0x7F=20in=20the=20modified=20version=20of=20skipspace()?=
 =?UTF-8?q?=20=20=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fix?=
 =?UTF-8?q?ed=20a=20bug=20I=20introduced=20when=20simplifying=20the=20orig?=
 =?UTF-8?q?inal=20patch=20for=20detecting=20=20=20Premiere=20NVOD=20channe?=
 =?UTF-8?q?l=20links=20(crash=20reported=20by=20Malte=20Schr=C3=B6der).=20?=
 =?UTF-8?q?-=20Internationalization=20is=20now=20done=20with=20'gettext'?=
 =?UTF-8?q?=20(following=20a=20suggestion=20by=20=20=20Lucian=20Muresan).?=
 =?UTF-8?q?=20Plugin=20authors=20may=20want=20to=20use=20the=20Perl=20scri?=
 =?UTF-8?q?pt=20=20=20'i18n-to-gettext.pl'=20to=20convert=20their=20intern?=
 =?UTF-8?q?ationalized=20texts=20to=20the=20gettext=20=20=20format=20(see?=
 =?UTF-8?q?=20the=20instructions=20inside=20that=20script=20file).=20The?=
 =?UTF-8?q?=20function=20=20=20cPlugin::RegisterI18n()=20is=20still=20pres?=
 =?UTF-8?q?ent=20for=20compatibility,=20but=20doesn't=20=20=20have=20any?=
 =?UTF-8?q?=20more=20functionality.=20So=20plugins=20that=20don't=20conver?=
 =?UTF-8?q?t=20their=20texts=20to=20=20=20the=20gettext=20format=20will=20?=
 =?UTF-8?q?only=20present=20English=20texts.=20=20=20See=20PLUGINS.html,?=
 =?UTF-8?q?=20section=20"Internationalization",=20for=20instructions=20on?=
 =?UTF-8?q?=20how=20=20=20to=20make=20strings=20in=20arrays=20translatable?=
 =?UTF-8?q?.=20=20=20See=20README.i18n=20for=20information=20on=20how=20to?=
 =?UTF-8?q?=20create=20new=20or=20maintain=20existing=20=20=20translations?=
 =?UTF-8?q?.=20-=20The=20three=20letter=20language=20codes=20and=20their?=
 =?UTF-8?q?=20aliases=20are=20stored=20in=20i18n.c,=20and=20=20=20each=20t?=
 =?UTF-8?q?ranslation=20file=20only=20contains=20one=20of=20them=20to=20li?=
 =?UTF-8?q?nk=20that=20language=20name=20=20=20to=20the=20code.=20-=20The?=
 =?UTF-8?q?=20'newplugin'=20script=20has=20been=20extended=20to=20generate?=
 =?UTF-8?q?=20the=20Makefile=20section=20=20=20for=20i18n=20support.=20-?=
 =?UTF-8?q?=20The=20parameter=20OSDLanguage=20in=20'setup.conf'=20is=20now?=
 =?UTF-8?q?=20a=20string=20and=20holds=20the=20locale=20=20=20code=20of=20?=
 =?UTF-8?q?the=20selected=20OSD=20language=20(e.g.=20en=5FUS).=20If=20Setu?=
 =?UTF-8?q?p.OSDLanguage=20is=20not=20=20=20set=20to=20a=20particular=20lo?=
 =?UTF-8?q?cale=20that=20is=20found=20in=20VDR's=20locale=20directory,=20t?=
 =?UTF-8?q?he=20=20=20locale=20as=20defined=20in=20the=20system=20environm?=
 =?UTF-8?q?ent=20is=20used=20by=20default.=20-=20The=20list=20of=20tracks?=
 =?UTF-8?q?=20given=20in=20cStatus::SetAudioTrack()=20is=20now=20NULL=20te?=
 =?UTF-8?q?rminated,=20=20=20so=20that=20plugins=20can=20actually=20use=20?=
 =?UTF-8?q?all=20the=20strings=20in=20the=20list,=20not=20just=20the=20=20?=
 =?UTF-8?q?=20one=20pointed=20to=20by=20Index=20(thanks=20to=20Alexander?=
 =?UTF-8?q?=20Rieger).=20-=20Fixed=20handling=20kLeft=20in=20the=20calls?=
 =?UTF-8?q?=20to=20cStatus::MsgOsdTextItem()=20(thanks=20to=20=20=20Alexan?=
 =?UTF-8?q?der=20Rieger).=20-=20Added=20the=20"...or=20(at=20your=20option?=
 =?UTF-8?q?)=20any=20later=20version"=20phrase=20to=20the=20license=20=20?=
 =?UTF-8?q?=20information=20of=20all=20plugins,=20and=20also=20the=20'newp?=
 =?UTF-8?q?lugin'=20script=20(suggested=20by=20=20=20Ville=20Skytt=C3=A4).?=
 =?UTF-8?q?=20Plugin=20authors=20may=20want=20to=20consider=20doing=20the?=
 =?UTF-8?q?=20same.=20-=20Fixed=20the=20link=20to=20the=20GPL2=20at=20http?=
 =?UTF-8?q?://www.gnu.org=20in=20vdr.c=20(thanks=20to=20Ville=20=20=20Skyt?=
 =?UTF-8?q?t=C3=A4).=20-=20cBitmap::SetXpm()=20now=20checks=20whether=20th?=
 =?UTF-8?q?e=20given=20Xpm=20pointer=20is=20not=20NULL,=20to=20=20=20avoid?=
 =?UTF-8?q?=20a=20crash=20with=20files=20that=20only=20contain=20"/*=20XPM?=
 =?UTF-8?q?=20*/"=20(suggested=20by=20Andreas=20=20=20Mair).=20-=20Added?=
 =?UTF-8?q?=20a=20debug=20error=20message=20to=20cReceiver::~cReceiver()?=
 =?UTF-8?q?=20in=20case=20it=20is=20still=20=20=20attached=20to=20a=20devi?=
 =?UTF-8?q?ce=20(thanks=20to=20Reinhard=20Nissl).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                   |   15 +
 HISTORY                        |   49 +-
 INSTALL                        |    1 +
 Make.config.template           |    3 +-
 Makefile                       |   36 +-
 PLUGINS.html                   |   94 +-
 PLUGINS/src/hello/HISTORY      |    4 +
 PLUGINS/src/hello/Makefile     |   38 +-
 PLUGINS/src/hello/README       |    6 +-
 PLUGINS/src/hello/hello.c      |   11 +-
 PLUGINS/src/hello/i18n.c       |  145 -
 PLUGINS/src/hello/i18n.h       |   16 -
 PLUGINS/src/hello/po/ca_ES.po  |   42 +
 PLUGINS/src/hello/po/cs_CZ.po  |   40 +
 PLUGINS/src/hello/po/da_DK.po  |   40 +
 PLUGINS/src/hello/po/de_DE.po  |   40 +
 PLUGINS/src/hello/po/el_GR.po  |   40 +
 PLUGINS/src/hello/po/es_ES.po  |   40 +
 PLUGINS/src/hello/po/et_EE.po  |   40 +
 PLUGINS/src/hello/po/fi_FI.po  |   43 +
 PLUGINS/src/hello/po/fr_FR.po  |   43 +
 PLUGINS/src/hello/po/hr_HR.po  |   41 +
 PLUGINS/src/hello/po/hu_HU.po  |   41 +
 PLUGINS/src/hello/po/it_IT.po  |   42 +
 PLUGINS/src/hello/po/nl_NL.po  |   42 +
 PLUGINS/src/hello/po/nn_NO.po  |   41 +
 PLUGINS/src/hello/po/pl_PL.po  |   40 +
 PLUGINS/src/hello/po/pt_PT.po  |   40 +
 PLUGINS/src/hello/po/ro_RO.po  |   41 +
 PLUGINS/src/hello/po/ru_RU.po  |   40 +
 PLUGINS/src/hello/po/sl_SI.po  |   41 +
 PLUGINS/src/hello/po/sv_SE.po  |   41 +
 PLUGINS/src/hello/po/tr_TR.po  |   40 +
 PLUGINS/src/osddemo/README     |    6 +-
 PLUGINS/src/servicedemo/README |    6 +-
 PLUGINS/src/skincurses/README  |    6 +-
 PLUGINS/src/sky/README         |    6 +-
 PLUGINS/src/status/README      |    6 +-
 PLUGINS/src/svdrpdemo/README   |    6 +-
 README.i18n                    |   42 +
 config.c                       |   12 +-
 config.h                       |   16 +-
 eit.c                          |    4 +-
 i18n-to-gettext.pl             |  332 ++
 i18n.c                         | 7141 +-------------------------------
 i18n.h                         |   51 +-
 interface.c                    |    6 +-
 keys.c                         |  133 +-
 keys.h                         |    4 +-
 menu.c                         |   61 +-
 menu.h                         |    4 +-
 menuitems.c                    |    6 +-
 newplugin                      |   39 +-
 osd.c                          |    4 +-
 plugin.c                       |   14 +-
 plugin.h                       |    4 +-
 po/ca_ES.po                    | 1272 ++++++
 po/cs_CZ.po                    | 1270 ++++++
 po/da_DK.po                    | 1270 ++++++
 po/de_DE.po                    | 1270 ++++++
 po/el_GR.po                    | 1270 ++++++
 po/es_ES.po                    | 1270 ++++++
 po/et_EE.po                    | 1270 ++++++
 po/fi_FI.po                    | 1273 ++++++
 po/fr_FR.po                    | 1273 ++++++
 po/hr_HR.po                    | 1271 ++++++
 po/hu_HU.po                    | 1271 ++++++
 po/it_IT.po                    | 1272 ++++++
 po/nl_NL.po                    | 1272 ++++++
 po/nn_NO.po                    | 1271 ++++++
 po/pl_PL.po                    | 1270 ++++++
 po/pt_PT.po                    | 1270 ++++++
 po/ro_RO.po                    | 1271 ++++++
 po/ru_RU.po                    | 1270 ++++++
 po/sl_SI.po                    | 1271 ++++++
 po/sv_SE.po                    | 1271 ++++++
 po/tr_TR.po                    | 1270 ++++++
 receiver.c                     |    9 +-
 skinclassic.c                  |    3 +-
 status.h                       |    4 +-
 themes.c                       |    9 +-
 themes.h                       |    5 +-
 timers.c                       |    5 +-
 tools.c                        |   19 +-
 tools.h                        |   16 +-
 vdr.5                          |    7 +-
 vdr.c                          |    8 +-
 87 files changed, 28547 insertions(+), 7411 deletions(-)
 delete mode 100644 PLUGINS/src/hello/i18n.c
 delete mode 100644 PLUGINS/src/hello/i18n.h
 create mode 100644 PLUGINS/src/hello/po/ca_ES.po
 create mode 100644 PLUGINS/src/hello/po/cs_CZ.po
 create mode 100644 PLUGINS/src/hello/po/da_DK.po
 create mode 100644 PLUGINS/src/hello/po/de_DE.po
 create mode 100644 PLUGINS/src/hello/po/el_GR.po
 create mode 100644 PLUGINS/src/hello/po/es_ES.po
 create mode 100644 PLUGINS/src/hello/po/et_EE.po
 create mode 100644 PLUGINS/src/hello/po/fi_FI.po
 create mode 100644 PLUGINS/src/hello/po/fr_FR.po
 create mode 100644 PLUGINS/src/hello/po/hr_HR.po
 create mode 100644 PLUGINS/src/hello/po/hu_HU.po
 create mode 100644 PLUGINS/src/hello/po/it_IT.po
 create mode 100644 PLUGINS/src/hello/po/nl_NL.po
 create mode 100644 PLUGINS/src/hello/po/nn_NO.po
 create mode 100644 PLUGINS/src/hello/po/pl_PL.po
 create mode 100644 PLUGINS/src/hello/po/pt_PT.po
 create mode 100644 PLUGINS/src/hello/po/ro_RO.po
 create mode 100644 PLUGINS/src/hello/po/ru_RU.po
 create mode 100644 PLUGINS/src/hello/po/sl_SI.po
 create mode 100644 PLUGINS/src/hello/po/sv_SE.po
 create mode 100644 PLUGINS/src/hello/po/tr_TR.po
 create mode 100644 README.i18n
 create mode 100755 i18n-to-gettext.pl
 create mode 100644 po/ca_ES.po
 create mode 100644 po/cs_CZ.po
 create mode 100644 po/da_DK.po
 create mode 100644 po/de_DE.po
 create mode 100644 po/el_GR.po
 create mode 100644 po/es_ES.po
 create mode 100644 po/et_EE.po
 create mode 100644 po/fi_FI.po
 create mode 100644 po/fr_FR.po
 create mode 100644 po/hr_HR.po
 create mode 100644 po/hu_HU.po
 create mode 100644 po/it_IT.po
 create mode 100644 po/nl_NL.po
 create mode 100644 po/nn_NO.po
 create mode 100644 po/pl_PL.po
 create mode 100644 po/pt_PT.po
 create mode 100644 po/ro_RO.po
 create mode 100644 po/ru_RU.po
 create mode 100644 po/sl_SI.po
 create mode 100644 po/sv_SE.po
 create mode 100644 po/tr_TR.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7a4daaa8c..ea354f203 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1127,6 +1127,8 @@ Reinhard Nissl <rnissl@gmx.de>
  with open file handles when starting background commands
  for fixing handling error status in cDvbTuner::GetFrontendStatus()
  for fixing a busy loop in fast forward if the next video data file is missing
+ for adding a debug error message to cReceiver::~cReceiver() in case it is still
+ attached to a device
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1405,6 +1407,7 @@ Marco Schl
  for fixing handling ChannelUp/Down keys if there is currently a replay running
  for fixing a buffer overflow in initializing the system character table
  for reporting a missing 'P' in vdr.c's SHUTDOWNCANCELROMPT macro
+ for fixing a problem with characters >0x7F in the modified version of skipspace()
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1519,6 +1522,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
  for making VDR actually use the iso8859-15 fonts
  for suggesting to make the function ExchangeChars()
  for reporting duplicate texts in i18n.c
+ for suggesting to use 'gettext' for internationalization
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -1676,6 +1680,9 @@ Ville Skytt
  for adapting cThread::ThreadId() to recent kernels
  for some improvements to the man pages
  for fixing some spelling errors in 'newplugin'
+ for suggesting to add the "...or (at your option) any later version" phrase to the
+ license information of all plugins, and also the 'newplugin' script
+ for fixing the link to the GPL2 at http://www.gnu.org in vdr.c
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1793,6 +1800,8 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for reporting that the cTimer::operator=() messes up the cListObject's pointers
  for reporting a memory leak in the cTimer::operator=() when using the 'aux' string
  for fixing cTimer::operator=() in case a cTimer variable is assigned to itself
+ for making the list of tracks given in cStatus::SetAudioTrack() NULL terminated
+ for fixing handling kLeft in the calls to cStatus::MsgOsdTextItem()
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
@@ -1919,11 +1928,13 @@ Franz Gangkofer <Franz.Gangkofer@cadsoft.de>
 
 Malte Schr�der <MalteSch@gmx.de>
  for reporting a crash after executing the SVDRP command CLRE
+ for reporting a crash with the code for detecting Premiere NVOD channel links
 
 Markus Hahn <mhahn@reel-multimedia.com>
  for suggesting to only start recordings if there is at least 300MB free disk space
  for suggesting that the "Back" key should restore the original string when pressed
  while editing a string item
+ for fixing detection of Premiere NVOD channel links
 
 Jaroslaw Swierczynski <swiergot@gmail.com>
  for updating the Polish OSD texts and the fontosd-iso8859-2.c file
@@ -2118,3 +2129,7 @@ Patrice Staudt <staudt@engsystem.net>
 Tobias Bratfisch <tobias@reel-multimedia.com>
  for improving numdigits(), isnumber() and strreplace()
  for suggesting to make skipspace() an inline function
+
+Andreas Mair <andreas@vdr-developer.org>
+ for suggesting to make cBitmap::SetXpm() checks whether the given Xpm pointer is
+ not NULL
diff --git a/HISTORY b/HISTORY
index a4d0c2d86..c2d9aa7e1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5293,8 +5293,55 @@ Video Disk Recorder Revision History
 - Made skipspace() an inline function (suggested by Tobias Bratfisch) and changed
   it to handle the most common case of 'no leading space' very fast, and avoid
   calling isspace(), which made the whole function a lot faster.
-- Fixed detection of Premiere NVOD channel links (thanks to anonymous).
+- Fixed detection of Premiere NVOD channel links (thanks to Markus Hahn).
 - Added a table of the used trick speed values to the description of
   cDevice::TrickSpeed() (suggested by Martin Dauskardt).
 - Added a missing 'P' to vdr.c's SHUTDOWNCANCELROMPT macro (reported by Marco
   Schl��ler).
+
+2007-08-12: Version 1.5.7
+
+- All logging now goes to LOG_ERR, because some systems split error, info and
+  debug messages into separate files, which repeatedly caused extra efforts to
+  find out when incomplete log excerpts were attached to problem reports in
+  the past.
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed a problem with characters >0x7F in the modified version of skipspace()
+  (thanks to Marco Schl��ler).
+- Fixed a bug I introduced when simplifying the original patch for detecting
+  Premiere NVOD channel links (crash reported by Malte Schr�der).
+- Internationalization is now done with 'gettext' (following a suggestion by
+  Lucian Muresan). Plugin authors may want to use the Perl script
+  'i18n-to-gettext.pl' to convert their internationalized texts to the gettext
+  format (see the instructions inside that script file). The function
+  cPlugin::RegisterI18n() is still present for compatibility, but doesn't
+  have any more functionality. So plugins that don't convert their texts to
+  the gettext format will only present English texts.
+  See PLUGINS.html, section "Internationalization", for instructions on how
+  to make strings in arrays translatable.
+  See README.i18n for information on how to create new or maintain existing
+  translations.
+- The three letter language codes and their aliases are stored in i18n.c, and
+  each translation file only contains one of them to link that language name
+  to the code.
+- The 'newplugin' script has been extended to generate the Makefile section
+  for i18n support.
+- The parameter OSDLanguage in 'setup.conf' is now a string and holds the locale
+  code of the selected OSD language (e.g. en_US). If Setup.OSDLanguage is not
+  set to a particular locale that is found in VDR's locale directory, the
+  locale as defined in the system environment is used by default.
+- The list of tracks given in cStatus::SetAudioTrack() is now NULL terminated,
+  so that plugins can actually use all the strings in the list, not just the
+  one pointed to by Index (thanks to Alexander Rieger).
+- Fixed handling kLeft in the calls to cStatus::MsgOsdTextItem() (thanks to
+  Alexander Rieger).
+- Added the "...or (at your option) any later version" phrase to the license
+  information of all plugins, and also the 'newplugin' script (suggested by
+  Ville Skytt�). Plugin authors may want to consider doing the same.
+- Fixed the link to the GPL2 at http://www.gnu.org in vdr.c (thanks to Ville
+  Skytt�).
+- cBitmap::SetXpm() now checks whether the given Xpm pointer is not NULL, to
+  avoid a crash with files that only contain "/* XPM */" (suggested by Andreas
+  Mair).
+- Added a debug error message to cReceiver::~cReceiver() in case it is still
+  attached to a device (thanks to Reinhard Nissl).
diff --git a/INSTALL b/INSTALL
index 77ad9322b..cbef729bd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,6 +24,7 @@ You will also need to install the following libraries, as well as their
 
   fontconfig
   freetype2
+  gettext
   libcap
   libjpeg
 
diff --git a/Make.config.template b/Make.config.template
index 378e12c33..5412eafb8 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.10 2006/06/15 09:15:25 kls Exp $
+# $Id: Make.config.template 1.12 2007/08/12 12:04:17 kls Exp $
 
 ### The C compiler and options:
 
@@ -26,6 +26,7 @@ endif
 #DVBDIR   = /usr/src/v4l-dvb/linux
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
+LOCDIR   = /usr/share/vdr/locale  # set to ./locale to run VDR from within its source directory
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
diff --git a/Makefile b/Makefile
index 7aa75f314..a5f9201f4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.101 2007/06/16 10:48:59 kls Exp $
+# $Id: Makefile 1.102 2007/08/11 12:26:12 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -17,6 +17,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
+LOCDIR   = /usr/share/vdr/locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig
 INCLUDES = -I/usr/include/freetype2
 
@@ -58,6 +59,7 @@ DEFINES += -D_GNU_SOURCE
 
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
+DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 
 # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
 
@@ -69,7 +71,7 @@ ifdef VFAT
 DEFINES += -DVFAT
 endif
 
-all: vdr
+all: vdr i18n
 
 # Implicit rules:
 
@@ -95,6 +97,35 @@ vdr: $(OBJS) $(SILIB)
 $(SILIB):
 	$(MAKE) -C $(LSIDIR) all
 
+# Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Npot   = $(PODIR)/vdr.pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+
+$(I18Npo): $(I18Npot)
+	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+
+i18n: $(I18Nmo)
+	@mkdir -p $(LOCALEDIR)
+	for i in $(I18Ndirs); do\
+	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr.mo;\
+	    done
+
+install-i18n:
+	@mkdir -p $(LOCDIR)
+	@(cd $(LOCALEDIR); cp -r --parents * $(LOCDIR))
+
 # The 'include' directory (for plugins):
 
 include-dir:
@@ -169,6 +200,7 @@ srcdoc:
 clean:
 	$(MAKE) -C $(LSIDIR) clean
 	-rm -f $(OBJS) $(DEPFILE) vdr core* *~
+	-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
 	-rm -rf include
 	-rm -rf srcdoc
 CLEAN: clean
diff --git a/PLUGINS.html b/PLUGINS.html
index dc725a510..d18bc424c 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,15 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.0 are marked like this.
 <!--X1.5.0--></td></tr></table>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.1 are marked like this.
 <!--X1.5.1--></td></tr></table>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.3 are marked like this.
 <!--X1.5.3--></td></tr></table>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.7 are marked like this.
+<!--X1.5.7--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -61,7 +64,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Housekeeping">Housekeeping</a>
 <li><a href="#Main thread hook">Main thread hook</a>
 <li><a href="#Activity">Activity</a>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <li><a href="#Wakeup">Wakeup</a>
 <!--X1.5.1--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
@@ -85,7 +88,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Conditional Access">Conditional Access</a>
 <!--X1.5.0--></td></tr></table>
 </ul>
@@ -684,7 +687,7 @@ <h1>Table Of Contents</h1>
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
 
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <a name="Wakeup"><hr><h2>Wakeup</h2>
 
 <center><i><b>Wake me up before you go-go</b></i></center><p>
@@ -909,72 +912,38 @@ <h1>Table Of Contents</h1>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
 
-If a plugin displays texts to the user, it should implement internationalized
-versions of these texts and call the function
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+If a plugin displays texts to the user, it should prepare for internationalization
+of these texts. All that is necessary for this is to mark every text that is
+presented to the user as translatable, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-void RegisterI18n(const tI18nPhrase * const Phrases);
+const char *s = tr("Hello world!");
 </pre></td></tr></table><p>
 
-to register them with VDR's internationalization mechanism.
+The text given here must be the English version, and the returned pointer is either
+a translated version (if available) or the original string.
+Texts are first searched for in the domain registered for this plugin (if any)
+and then in the global VDR texts. So a plugin can make use of texts defined by the
+core VDR code.
 <p>
-The call to this function must be done in the <a href="#Getting started"><tt>Initialize()</tt></a>
-or <a href="#Getting started"><tt>Start()</tt></a> function of the plugin:
+Sometimes texts are stored in an array, in which case they need to be marked
+differently, using the trNOOP() macro. The actual translation is then done
+when such a text is used, as in
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-const tI18nPhrase Phrases[] = {
-  { "Hello world!",
-    "Hallo Welt!",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { NULL }
+const char *Texts = {
+  trNOOP("First text"),
+  trNOOP("Second text"),
+  trNOOP("Third one")
   };
 
-void cPluginHello::Start(void)
-{
-  RegisterI18n(Phrases);
-}
-</pre></td></tr></table><p>
-
-Each entry of type <tt>tI18nPhrase</tt> must have exactly as many members as defined
-by the constant <tt>I18nNumLanguages</tt> in the file <tt>VDR/i18n.h</tt>, and the
-sequence of the various languages must be the same as defined in <tt>VDR/i18n.c</tt>.<br>
-<b>It is very important that the array is terminated with a <tt>{&nbsp;NULL&nbsp;}</tt>
-entry!</b>.
-<p>
-Usually you won't be able to fill in all the different translations by yourself, so
-you may want to contact the maintainers of these languages (listed in the file
-<tt>VDR/i18n.c</tt>) and ask them to provide the additional translations.
-<p>
-The actual runtime selection of the texts corresponding to the selected language
-is done by wrapping each internationalized text with the <tt>tr()</tt> macro:
-
-<p><table><tr><td bgcolor=#F0F0F0><pre>
-const char *s = tr("Hello world!");
+for (int i = 0; i &lt; 3; i++)
+    MyFunc(tr(Texts[i]));
 </pre></td></tr></table><p>
 
-The text given here must be the first one defined in the related <i>Phrases</i>
-entry (which is the English version), and the returned pointer is either a translated
-version (if available) or the original string. In the latter case a message will be
-written to the log file, indicating that a translation is missing.
-Texts are first searched for in the <i>Phrases</i> registered for this plugin (if any)
-and then in the global VDR texts. So a plugin can make use of texts defined by the
-core VDR code.
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 The system VDR is running on may use a character encoding where a single character
 (or <i>symbol</i>) consists of more than one byte (UTF-8, as opposed to, for instance,
 ISO8859-1, where every character is represented by a single byte in memory).
@@ -986,6 +955,7 @@ <h1>Table Of Contents</h1>
 Most of the time a plugin doesn't need to care about this, but when it comes to
 handling individual characters these functions may come in handy.
 <!--X1.5.3--></td></tr></table>
+<!--X1.5.7--></td></tr></table>
 
 <a name="Custom services"><hr><h2>Custom services</h2>
 
@@ -1635,7 +1605,7 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Special consideration may have to be given to color usage if the OSD provides
 8bpp (256 colors). In that case, fonts may be drawn using <i>anti-aliasing</i>,
 which requires several blended color values between the foreground and background
@@ -2118,7 +2088,7 @@ <h1>Table Of Contents</h1>
 
 The other parameters have the same meaning as in the first version of this function.
 
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Conditional Access"><hr><h2>Conditional Access</h2>
 
 <center><i><b>Members only!</b></i></center><p>
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 3de2d66b6..2d770b88f 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -49,3 +49,7 @@ VDR Plugin 'hello' Revision History
 2006-04-22: Version 0.1.1
 
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+
+2007-08-11: Version 0.2.0
+
+- Switched to 'gettext' internationalization.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 8deaeaa87..e78b6e1a6 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,11 +1,13 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.15 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.16 2007/08/11 10:18:16 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
 #
 PLUGIN = hello
 
@@ -45,25 +47,50 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o i18n.o
+OBJS = $(PLUGIN).o
 
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+
+$(I18Npo): $(I18Npot)
+	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+
+i18n: $(I18Nmo)
+	@mkdir -p $(LOCALEDIR)
+	for i in $(I18Ndirs); do\
+	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    done
+
 ### Targets:
 
-all: libvdr-$(PLUGIN).so
+all: libvdr-$(PLUGIN).so i18n
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@@ -78,4 +105,5 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/hello/README b/PLUGINS/src/hello/README
index fd844ca61..5c5d3b0dd 100644
--- a/PLUGINS/src/hello/README
+++ b/PLUGINS/src/hello/README
@@ -6,6 +6,10 @@ Project's homepage:          www.cadsoft.de/people/kls/vdr
 
 Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description: This is a small demo of the VDR plugin interface.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 05ae9df97..96403389f 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,18 +3,18 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.12 2006/04/22 09:31:52 kls Exp $
+ * $Id: hello.c 1.13 2007/08/11 09:31:17 kls Exp $
  */
 
 #include <getopt.h>
 #include <stdlib.h>
+#include <vdr/i18n.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
-#include "i18n.h"
 
-static const char *VERSION        = "0.1.1";
-static const char *DESCRIPTION    = "A friendly greeting";
-static const char *MAINMENUENTRY  = "Hello";
+static const char *VERSION        = "0.2.0";
+static const char *DESCRIPTION    = trNOOP("A friendly greeting");
+static const char *MAINMENUENTRY  = trNOOP("Hello");
 
 class cPluginHello : public cPlugin {
 private:
@@ -115,7 +115,6 @@ bool cPluginHello::ProcessArgs(int argc, char *argv[])
 bool cPluginHello::Start(void)
 {
   // Start any background activities the plugin shall perform.
-  RegisterI18n(Phrases);
   return true;
 }
 
diff --git a/PLUGINS/src/hello/i18n.c b/PLUGINS/src/hello/i18n.c
deleted file mode 100644
index 0ceeb2cd7..000000000
--- a/PLUGINS/src/hello/i18n.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * i18n.c: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.c 1.6 2006/04/22 09:30:57 kls Exp $
- */
-
-#include "i18n.h"
-
-const tI18nPhrase Phrases[] = {
-  { "Hello",
-    "Hallo",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Hei",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������!",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Ahoj",
-  },
-  { "Hello world!",
-    "Hallo Welt!",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Hei maailma!",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "���������� ���!",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Ahoj sv�te!",
-  },
-  { "Howdy folks!",
-    "Tach zusammen!",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Mit� kuuluu?",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "��� ���������?",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Nazdar vespolek!",
-  },
-  { "A friendly greeting",
-    "Ein freundlicher Gru�",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Yst�v�llisin terveisin",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "��������� �����������",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "P��telsk� pozdrav",
-  },
-  { "Greeting time (s)",
-    "Dauer des Gru�es (s)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Tervehdysaika (s)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "����������������� �����������",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "�as pozdravu (s)",
-  },
-  { "Use alternate greeting",
-    "Alternativen Gru� verwenden",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "K�yt� vaihtoehtoista tervehdyst�",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "�������������� �����������",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Pou��t alternativn� pozdrav",
-  },
-  { NULL }
-  };
diff --git a/PLUGINS/src/hello/i18n.h b/PLUGINS/src/hello/i18n.h
deleted file mode 100644
index 577628a9f..000000000
--- a/PLUGINS/src/hello/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * i18n.h: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.h 1.2 2002/05/11 14:48:16 kls Exp $
- */
-
-#ifndef _I18N__H
-#define _I18N__H
-
-#include <vdr/i18n.h>
-
-extern const tI18nPhrase Phrases[];
-
-#endif //_I18N__H
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
new file mode 100644
index 000000000..fb239525a
--- /dev/null
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -0,0 +1,42 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Marc Rovira Vall <tm05462@salleURL.edu>, 2003
+# Ramon Roca <ramon.roca@xcombo.com>, 2003
+# Jordi Vil� <jvila@tinet.org>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
new file mode 100644
index 000000000..cc5c80a3d
--- /dev/null
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr "P��telsk� pozdrav"
+
+#: hello.c:17
+msgid "Hello"
+msgstr "Ahoj"
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr "�as pozdravu (s)"
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr "Pou��t alternativn� pozdrav"
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr "Ahoj sv�te!"
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr "Nazdar vespolek!"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
new file mode 100644
index 000000000..266a7a479
--- /dev/null
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Mogens Elneff <mogens@elneff.dk>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
new file mode 100644
index 000000000..cb2b9dd0a
--- /dev/null
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@cadsoft.de>, 2000
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr "Ein freundlicher Gru�"
+
+#: hello.c:17
+msgid "Hello"
+msgstr "Hallo"
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr "Dauer des Gru�es (s)"
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr "Alternativen Gru� verwenden"
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr "Hallo Welt!"
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr "Tach zusammen!"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
new file mode 100644
index 000000000..468251415
--- /dev/null
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-7\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
new file mode 100644
index 000000000..c59a4b83a
--- /dev/null
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
new file mode 100644
index 000000000..ca4eb5f10
--- /dev/null
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Arthur Konovalov <kasjas@hot.ee>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-13\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
new file mode 100644
index 000000000..516634d4c
--- /dev/null
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -0,0 +1,43 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Hannu Savolainen <hannu@opensound.com>, 2002
+# Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002
+# Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr "Yst�v�llisin terveisin"
+
+#: hello.c:17
+msgid "Hello"
+msgstr "Hei"
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr "Tervehdysaika (s)"
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr "K�yt� vaihtoehtoista tervehdyst�"
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr "Hei maailma!"
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr "Mit� kuuluu?"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
new file mode 100644
index 000000000..e23815b17
--- /dev/null
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -0,0 +1,43 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Jean-Claude Repetto <jc@repetto.org>, 2001
+# Olivier Jacques <jacquesolivier@hotmail.com>, 2003
+# Gregoire Favre <greg@magma.unil.ch>, 2003
+# Nicolas Huillard <nhuillard@e-dition.fr>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
new file mode 100644
index 000000000..ca84dc759
--- /dev/null
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -0,0 +1,41 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Drazen Dupor <drazen.dupor@dupor.com>, 2004
+# Dino Ravnic <dino.ravnic@fer.hr>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
new file mode 100644
index 000000000..a6c470c04
--- /dev/null
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -0,0 +1,41 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Istvan Koenigsberger <istvnko@hotmail.com>, 2002
+# Guido Josten <guido.josten@t-online.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
new file mode 100644
index 000000000..4e7386b8f
--- /dev/null
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -0,0 +1,42 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Alberto Carraro <bertocar@tin.it>, 2001
+# Antonio Ospite <ospite@studenti.unina.it>, 2003
+# Sean Carlos <seanc@libero.it>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Sean Carlos <seanc@libero.it>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
new file mode 100644
index 000000000..ae81781e5
--- /dev/null
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -0,0 +1,42 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
+# Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
+# Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
new file mode 100644
index 000000000..45d2cc91c
--- /dev/null
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -0,0 +1,41 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# J�rgen Tvedt <pjtvedt@online.no>, 2001
+# Truls Slevigen <truls@slevigen.no>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
new file mode 100644
index 000000000..5c3db8738
--- /dev/null
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Michael Rakowski <mrak@gmx.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
new file mode 100644
index 000000000..f2cd23c9a
--- /dev/null
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Paulo Lopes <pmml@netvita.pt>, 2001
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
new file mode 100644
index 000000000..43d97f13a
--- /dev/null
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -0,0 +1,41 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Paul Lacatus <paul@campina.iiruc.ro>, 2002
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
new file mode 100644
index 000000000..eeacdca89
--- /dev/null
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr "��������� �����������"
+
+#: hello.c:17
+msgid "Hello"
+msgstr "������!"
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr "����������������� �����������"
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr "�������������� �����������"
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr "���������� ���!"
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr "��� ���������?"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
new file mode 100644
index 000000000..783528a2f
--- /dev/null
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -0,0 +1,41 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Miha Setina <mihasetina@softhome.net>, 2000
+# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
new file mode 100644
index 000000000..b897ce2a3
--- /dev/null
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -0,0 +1,41 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Tomas Prybil <tomas@prybil.se>, 2002
+# Jan Ekholm <chakie@infa.abo.fi>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
new file mode 100644
index 000000000..bcf7ceb4a
--- /dev/null
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -0,0 +1,40 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Oktay Yolge�en <oktay_73@yahoo.de>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: hello.c:16
+msgid "A friendly greeting"
+msgstr ""
+
+#: hello.c:17
+msgid "Hello"
+msgstr ""
+
+#: hello.c:60
+msgid "Greeting time (s)"
+msgstr ""
+
+#: hello.c:61
+msgid "Use alternate greeting"
+msgstr ""
+
+#: hello.c:129
+msgid "Hello world!"
+msgstr ""
+
+#: hello.c:129
+msgid "Howdy folks!"
+msgstr ""
diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README
index cc150aba9..96f8912ba 100644
--- a/PLUGINS/src/osddemo/README
+++ b/PLUGINS/src/osddemo/README
@@ -6,7 +6,11 @@ Project's homepage:          http://www.cadsoft.de/vdr
 
 Latest version available at: http://www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/servicedemo/README b/PLUGINS/src/servicedemo/README
index 16dfbfb6b..db7ad5b9f 100644
--- a/PLUGINS/src/servicedemo/README
+++ b/PLUGINS/src/servicedemo/README
@@ -6,7 +6,11 @@ Project's homepage:          www.cadsoft.de/vdr
 
 Latest version available at: www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README
index ff82b0e77..b6ad9ec33 100644
--- a/PLUGINS/src/skincurses/README
+++ b/PLUGINS/src/skincurses/README
@@ -6,7 +6,11 @@ Project's homepage:          www.cadsoft.de/vdr
 
 Latest version available at: www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
index 185a98b0f..51b2d51d8 100644
--- a/PLUGINS/src/sky/README
+++ b/PLUGINS/src/sky/README
@@ -6,7 +6,11 @@ Project's homepage:          www.cadsoft.de/vdr
 
 Latest version available at: www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/status/README b/PLUGINS/src/status/README
index 356f1f8d1..f7bcd2f49 100644
--- a/PLUGINS/src/status/README
+++ b/PLUGINS/src/status/README
@@ -6,6 +6,10 @@ Project's homepage:          www.cadsoft.de/people/kls/vdr
 
 Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description: This is an example that shows the use of cStatus.
diff --git a/PLUGINS/src/svdrpdemo/README b/PLUGINS/src/svdrpdemo/README
index 27b767a57..4ca6821d4 100644
--- a/PLUGINS/src/svdrpdemo/README
+++ b/PLUGINS/src/svdrpdemo/README
@@ -6,7 +6,11 @@ Project's homepage:          http://www.cadsoft.de/vdr
 
 Latest version available at: http://www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/README.i18n b/README.i18n
new file mode 100644
index 000000000..2df584891
--- /dev/null
+++ b/README.i18n
@@ -0,0 +1,42 @@
+Video Disk Recorder ('VDR') - Internationalization
+--------------------------------------------------
+
+The internationalized texts of VDR and its plugins use the 'gettext'
+functionality. This file provides information on how to maintain
+these texts. The instructions apply equally to VDR itself or any
+plugin.
+
+
+How to translate to a new language
+----------------------------------
+
+- Change into the source directory.
+- Do a 'make i18n' to have the current *.pot file created.
+- Make sure your locale is set to the language you want to
+  translate to.
+- Change into the 'po' subdirectory and run 'msginit'. This
+  will create a new *.po file for your language.
+- Edit the new *.po file and translate the texts.
+  You can do this either with your favorite text editor, or
+  with a specialited tool like POEdit, GTranslator, KBabel
+  or whatever you have.
+
+How to maintain an existing language file
+-----------------------------------------
+
+- Do a 'make i18n' to have the *.po files brought up-to-date
+  with the texts in the source code.
+- Edit the new *.po file and translate the texts.
+  If you are using a plain text editor, you should search for
+  empty strings ("") to find new, untranslated texts. Also,
+  look for the "fuzzy" keyword to find translations that have
+  been "guessed" from other, similar texts, and make sure they
+  are correct. After that you may want to remove the "fuzzy"
+  keyword. Specialized tools for maintaining translation
+  files may provide particular functions to guide you through
+  updating translations.
+
+Once you have created or updated a translation file, please
+send it to the maintainer of the respective plugin (in case
+it belongs to a plugin) or to kls@cadsoft.de (for core VDR
+language files).
diff --git a/config.c b/config.c
index 05f7f1ff8..aed0936a1 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.154 2007/06/23 09:42:49 kls Exp $
+ * $Id: config.c 1.156 2007/08/12 12:09:37 kls Exp $
  */
 
 #include "config.h"
@@ -214,7 +214,7 @@ cSetup Setup;
 
 cSetup::cSetup(void)
 {
-  OSDLanguage = 0;
+  strcpy(OSDLanguage, ""); // default is taken from environment
   strcpy(OSDSkin, "sttng");
   strcpy(OSDTheme, "default");
   PrimaryDVB = 1;
@@ -349,9 +349,9 @@ bool cSetup::Load(const char *FileName)
 
 void cSetup::StoreLanguages(const char *Name, int *Values)
 {
-  char buffer[I18nNumLanguages * 4];
+  char buffer[I18nLanguages()->Size() * 4];
   char *q = buffer;
-  for (int i = 0; i < I18nNumLanguages; i++) {
+  for (int i = 0; i < I18nLanguages()->Size(); i++) {
       if (Values[i] < 0)
          break;
       const char *s = I18nLanguageCode(Values[i]);
@@ -369,7 +369,7 @@ void cSetup::StoreLanguages(const char *Name, int *Values)
 bool cSetup::ParseLanguages(const char *Value, int *Values)
 {
   int n = 0;
-  while (Value && *Value && n < I18nNumLanguages) {
+  while (Value && *Value && n < I18nLanguages()->Size()) {
         char buffer[4];
         strn0cpy(buffer, Value, sizeof(buffer));
         int i = I18nLanguageIndex(buffer);
@@ -384,7 +384,7 @@ bool cSetup::ParseLanguages(const char *Value, int *Values)
 
 bool cSetup::Parse(const char *Name, const char *Value)
 {
-  if      (!strcasecmp(Name, "OSDLanguage"))         OSDLanguage        = atoi(Value);
+  if      (!strcasecmp(Name, "OSDLanguage"))       { strn0cpy(OSDLanguage, Value, sizeof(OSDLanguage)); I18nSetLocale(OSDLanguage); }
   else if (!strcasecmp(Name, "OSDSkin"))             Utf8Strn0Cpy(OSDSkin, Value, MaxSkinName);
   else if (!strcasecmp(Name, "OSDTheme"))            Utf8Strn0Cpy(OSDTheme, Value, MaxThemeName);
   else if (!strcasecmp(Name, "PrimaryDVB"))          PrimaryDVB         = atoi(Value);
diff --git a/config.h b/config.h
index edc512350..5ff5849c9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.294 2007/07/20 14:52:05 kls Exp $
+ * $Id: config.h 1.296 2007/08/10 13:01:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.6"
-#define VDRVERSNUM   10506  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.7"
+#define VDRVERSNUM   10507  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.6"
-#define APIVERSNUM   10506  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.7"
+#define APIVERSNUM   10507  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -199,7 +199,7 @@ class cSetup : public cConfig<cSetupLine> {
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
   int __BeginData__;
-  int OSDLanguage;
+  char OSDLanguage[I18N_MAX_LOCALE_LEN];
   char OSDSkin[MaxSkinName];
   char OSDTheme[MaxThemeName];
   int PrimaryDVB;
@@ -219,8 +219,8 @@ class cSetup : public cConfig<cSetupLine> {
   int TimeSource;
   int TimeTransponder;
   int MarginStart, MarginStop;
-  int AudioLanguages[I18nNumLanguages + 1];
-  int EPGLanguages[I18nNumLanguages + 1];
+  int AudioLanguages[I18N_MAX_LANGUAGES + 1];
+  int EPGLanguages[I18N_MAX_LANGUAGES + 1];
   int EPGScanTimeout;
   int EPGBugfixLevel;
   int EPGLinger;
diff --git a/eit.c b/eit.c
index cc2d08638..dcac1164d 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.124 2007/07/21 14:58:04 kls Exp $
+ * $Id: eit.c 1.125 2007/07/28 13:16:43 kls Exp $
  */
 
 #include "eit.h"
@@ -199,7 +199,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                           else if (Setup.UpdateChannels >= 4) {
                              cChannel *transponder = channel;
                              if (channel->Tid() != ld->getTransportStreamId())
-                                channel = Channels.GetByTransponderID(linkID);
+                                transponder = Channels.GetByTransponderID(linkID);
                              link = Channels.NewChannel(transponder, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
                              //XXX patFilter->Trigger();
                              }
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
new file mode 100755
index 000000000..79b2aab70
--- /dev/null
+++ b/i18n-to-gettext.pl
@@ -0,0 +1,332 @@
+#!/usr/bin/perl -w
+
+# Convert i18n texts to gettext
+#
+# Extracts all texts from the file i18n.c and creates language
+# specific *.po files.
+#
+# Usage: i18n-to-gettext.pl
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: i18n-to-gettext.pl 1.2 2007/08/12 10:02:01 kls Exp $
+
+# How to convert an actual plugin:
+#
+# - If your code contains something like
+#
+#   const char *Text = "Some text";
+#   ...
+#   Function(tr(Text));
+#
+#   you need to enclose the text constant in trNOOP(...), as in
+#
+#   const char *Text = trNOOP("Some text");
+#
+#   The actual usage of the tr() macro remains unchanged.
+#
+# - If you have comments following the texts in your i18n.c file
+#   that should be seen by the translators, move them from the
+#   i18n.c file into the file where the text is actually used,
+#   and mark them with the TRANSLATORS keyword, as in
+#
+#   // TRANSLATORS: note the plural!
+#   Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"), ...
+#
+# - Fill in your email address in the line
+#   $MSGIDBUGS = "" ...
+#   below, so that users can reach you in case there is a problem
+#   with a message id.
+#
+# - Run this Perl script from within your plugin's source directory.
+#   This script will run 'xgettext' to extract all of your texts
+#   into a file named <pluginname>.pot. After that it will extract
+#   your existing i18n texts from the file i18n.c (or wherever you
+#   have defined them) and generate *.po files for all languages
+#   currently known by VDR.
+#
+# - Your Makefile will be automatically adjusted to allow for
+#   building the *.mo files necessary for supporting gettext().
+#   Please check carefully whether the automatic adjustments have
+#   succeeded, though. The modified Makefile will be written to
+#   Makefile.new, so you can call this script any numer of times
+#   in case you need to do some fine tuning of your texts (especially
+#   adding some trNOOP() in case the script reports "missing phrases".
+#   Once you're done converting your plugin source to using gettext,
+#   rename Makefile.new to Makefile.
+#
+# - You may want to remove the old internationalized texts from your
+#   source. Usually this means removing the files i18n.[hc], stripping
+#   i18n.o from the OBJS variable in the Makefile and removing all
+#   '#include "i18n.h"' lines from the rest of your source files.
+#   These steps are not done automatically.
+
+# Check for the existence of a Makefile:
+
+die "Makefile not found!" unless (-f "Makefile");
+
+# Determine the plugin name:
+
+$PLUGIN = `grep '^PLUGIN *=' Makefile | head -1` || die "can't find plugin name!";
+$PLUGIN =~ s/.*= *(.*)\n/$1/;
+die "can't find plugin name!" unless ($PLUGIN);
+
+# Locate the file containing the texts:
+
+$I18NFILE = "";
+for ("i18n.c", `ls *.c`) { # try i18n.c explicitly first
+    chomp($f = $_);
+    if (-f $f && `grep tI18nPhrase $f`) {
+       $I18NFILE = $f;
+       last;
+       }
+    }
+die "can't find internationalized texts!" unless ($I18NFILE);
+
+# Plugin specific information:
+
+$TITLE = "VDR plugin language source file";
+$COPYRIGHT = "2007 Klaus Schmidinger <kls\@cadsoft.de>";
+$PACKAGE = "VDR";
+$VERSION = "1.5.7";
+$MSGIDBUGS = "" || die "enter your email address here"; # escape the '@', as in "user\@domain.tld"
+$LANGUAGETEAM = "<vdr\@linuxtv.org>";
+
+# Gettext environment:
+
+$XGETTEXT = "xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='$MSGIDBUGS'";
+$PODIR = "po";
+$POTFILE = "$PODIR/$PLUGIN.pot";
+
+# Languages as known by VDR 1.5.6:
+
+@LANGS = (
+  "en_US",
+  "de_DE",
+  "sl_SI",
+  "it_IT",
+  "nl_NL",
+  "pt_PT",
+  "fr_FR",
+  "nn_NO",
+  "fi_FI",
+  "pl_PL",
+  "es_ES",
+  "el_GR",
+  "sv_SE",
+  "ro_RO",
+  "hu_HU",
+  "ca_ES",
+  "ru_RU",
+  "hr_HR",
+  "et_EE",
+  "da_DK",
+  "cs_CZ",
+  "tr_TR"
+  );
+
+@CHARSETS = (
+  "ISO-8859-15",
+  "ISO-8859-15",
+  "ISO-8859-2",
+  "ISO-8859-15",
+  "ISO-8859-15",
+  "ISO-8859-1",
+  "ISO-8859-1",
+  "ISO-8859-1",
+  "ISO-8859-15",
+  "ISO-8859-2",
+  "ISO-8859-15",
+  "ISO-8859-7",
+  "ISO-8859-1",
+  "ISO-8859-2",
+  "ISO-8859-2",
+  "ISO-8859-1",
+  "ISO-8859-5",
+  "ISO-8859-2",
+  "ISO-8859-13",
+  "ISO-8859-15",
+  "ISO-8859-2",
+  "ISO-8859-9",
+  );
+
+@TRANSLATORS = (
+  "Klaus Schmidinger <kls\@cadsoft.de>, 2000",
+  "Klaus Schmidinger <kls\@cadsoft.de>, 2000",
+  "Miha Setina <mihasetina\@softhome.net>, 2000; Matjaz Thaler <matjaz.thaler\@guest.arnes.si>, 2003",
+  "Alberto Carraro <bertocar\@tin.it>, 2001; Antonio Ospite <ospite\@studenti.unina.it>, 2003; Sean Carlos <seanc\@libero.it>, 2005",
+  "Arnold Niessen <niessen\@iae.nl> <arnold.niessen\@philips.com>, 2001; Hans Dingemans <hans.dingemans\@tacticalops.nl>, 2003; Maarten Wisse <Maarten.Wisse\@urz.uni-hd.de>, 2005",
+  "Paulo Lopes <pmml\@netvita.pt>, 2001",
+  "Jean-Claude Repetto <jc\@repetto.org>, 2001; Olivier Jacques <jacquesolivier\@hotmail.com>, 2003; Gregoire Favre <greg\@magma.unil.ch>, 2003; Nicolas Huillard <nhuillard\@e-dition.fr>, 2005",
+  "J�rgen Tvedt <pjtvedt\@online.no>, 2001; Truls Slevigen <truls\@slevigen.no>, 2002",
+  "Hannu Savolainen <hannu\@opensound.com>, 2002; Jaakko Hyv�tti <jaakko\@hyvatti.iki.fi>, 2002; Niko Tarnanen <niko.tarnanen\@hut.fi>, 2003; Rolf Ahrenberg <rahrenbe\@cc.hut.fi>, 2003",
+  "Michael Rakowski <mrak\@gmx.de>, 2002",
+  "Ruben Nunez Francisco <ruben.nunez\@tang-it.com>, 2002",
+  "Dimitrios Dimitrakos <mail\@dimitrios.de>, 2002",
+  "Tomas Prybil <tomas\@prybil.se>, 2002; Jan Ekholm <chakie\@infa.abo.fi>, 2003",
+  "Paul Lacatus <paul\@campina.iiruc.ro>, 2002; Lucian Muresan <lucianm\@users.sourceforge.net>, 2004",
+  "Istvan Koenigsberger <istvnko\@hotmail.com>, 2002; Guido Josten <guido.josten\@t-online.de>, 2002",
+  "Marc Rovira Vall <tm05462\@salleURL.edu>, 2003; Ramon Roca <ramon.roca\@xcombo.com>, 2003; Jordi Vil� <jvila\@tinet.org>, 2003",
+  "Vyacheslav Dikonov <sdiconov\@mail.ru>, 2004",
+  "Drazen Dupor <drazen.dupor\@dupor.com>, 2004; Dino Ravnic <dino.ravnic\@fer.hr>, 2004",
+  "Arthur Konovalov <kasjas\@hot.ee>, 2004",
+  "Mogens Elneff <mogens\@elneff.dk>, 2004",
+  "Vladim�r B�rta <vladimir.barta\@k2atmitec.cz>, 2006",
+  "Oktay Yolge�en <oktay_73\@yahoo.de>, 2007"
+  );
+
+@LASTTRANSLATOR = (
+  "Klaus Schmidinger <kls\@cadsoft.de>",
+  "Klaus Schmidinger <kls\@cadsoft.de>",
+  "Matjaz Thaler <matjaz.thaler\@guest.arnes.si>",
+  "Sean Carlos <seanc\@libero.it>",
+  "Maarten Wisse <Maarten.Wisse\@urz.uni-hd.de>",
+  "Paulo Lopes <pmml\@netvita.pt>",
+  "Nicolas Huillard <nhuillard\@e-dition.fr>",
+  "Truls Slevigen <truls\@slevigen.no>",
+  "Rolf Ahrenberg <rahrenbe\@cc.hut.fi>",
+  "Michael Rakowski <mrak\@gmx.de>",
+  "Ruben Nunez Francisco <ruben.nunez\@tang-it.com>",
+  "Dimitrios Dimitrakos <mail\@dimitrios.de>",
+  "Tomas Prybil <tomas\@prybil.se>",
+  "Lucian Muresan <lucianm\@users.sourceforge.net>",
+  "Istvan Koenigsberger <istvnko\@hotmail.com>, Guido Josten <guido.josten\@t-online.de>",
+  "Jordi Vil� <jvila\@tinet.org>",
+  "Vyacheslav Dikonov <sdiconov\@mail.ru>",
+  "Drazen Dupor <drazen.dupor\@dupor.com>",
+  "Arthur Konovalov <kasjas\@hot.ee>",
+  "Mogens Elneff <mogens\@elneff.dk>",
+  "Vladim�r B�rta <vladimir.barta\@k2atmitec.cz>",
+  "Oktay Yolge�en <oktay_73\@yahoo.de>"
+  );
+
+# Collect all translated texts:
+
+open(F, $I18NFILE) || die "$I18NFILE: $!\n";
+while (<F>) {
+      chomp;
+      s/\t/ /g; # get rid of tabs
+      s/  *$//; # get rid of trailing blanks
+      s/^ *\/\/.*//; # remove comment lines
+      s/, *\/\/.*/,/; # strip trailing comments
+      next if (/^ *$/); # skip empty lines
+      next unless ($found or $found = /const *tI18nPhrase .*{/); # sync on phrases
+      next if (/const *tI18nPhrase .*{/); # skip sync line
+      last if (/{ *NULL *}/); # stop after last phrase
+      if (/{ *(.*),/) {
+         $Original = $1;
+         $Index = 0;
+         }
+      elsif (/}/) {
+         }
+      else {
+         $Translated = $_;
+         $Translated =~ s/ *(.*),/$1/;
+         $Index++;
+         $Map{$Original}[$Index] = $Translated;
+         }
+      }
+close(F);
+
+# Generate the .pot file:
+
+(mkdir($PODIR) || die "$PODIR: $!\n") unless -d $PODIR;
+
+system("$XGETTEXT -o $POTFILE *.c");
+
+# Generate .po files for all languages:
+
+open(POT, $POTFILE) || die "$POTFILE: $!\n";
+@POT = <POT>;
+close(POT);
+
+for ($Index = 1; $LANGS[$Index]; $Index++) {
+
+    $Authors = "# " . join("\n# ", split(/; */, $TRANSLATORS[$Index])) . "\n";
+
+    $POFILE = "$PODIR/$LANGS[$Index].po";
+    open(PO, ">$POFILE") || die "$POFILE: $!\n";
+    $msgid = "";
+    for (@POT) {
+        next if (/^#, fuzzy$/); # skip the 'fuzzy' keyword
+        $msgid = $1 if (/^msgid (".+")/);
+        $date = $1 if (/POT-Creation-Date: (.*)\\n/);
+        $s = $_;
+        if (!$msgid) {
+           $s =~ s/SOME DESCRIPTIVE TITLE/$TITLE/;
+           $s =~ s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/$COPYRIGHT/;
+           $s =~ s/PACKAGE/$PACKAGE/;
+           $s =~ s/VERSION/$VERSION/;
+           $s = $Authors if (/FIRST AUTHOR/);
+           $s =~ s/YEAR-MO-DA HO:MI\+ZONE/$date/;
+           $s =~ s/FULL NAME <EMAIL\@ADDRESS>/$LASTTRANSLATOR[$Index]/;
+           $s =~ s/LANGUAGE <LL\@li\.org>/$LANGUAGETEAM/;
+           $s =~ s/CHARSET/$CHARSETS[$Index]/;
+           }
+        else {
+           $s =~ s/""/$Map{$msgid}[$Index]/ if ($msgid && /^msgstr ""/ && defined $Map{$msgid}[$Index]);
+           $Used{$msgid} = 1;
+           }
+        print PO $s;
+        }
+    close(PO);
+    }
+
+# Report missing phrases:
+
+for (keys %Map) {
+    push(@Missing, "$_\n") unless $Used{$_};
+    }
+
+if (@Missing) {
+   print "Missing phrases (may need to use trNOOP):\n\n";
+   print sort(@Missing);
+   }
+
+# Adjust the Makefile:
+
+$MAKEI18N = q{### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<} . $MSGIDBUGS . q{>' -o $@ $(wildcard *.c)
+
+$(I18Npo): $(I18Npot)
+	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+
+i18n: $(I18Nmo)
+	@mkdir -p $(LOCALEDIR)
+	for i in $(I18Ndirs); do\
+	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    done
+
+};
+
+open(OLD, "Makefile") || die "Makefile: $!";
+open(NEW, ">Makefile.new") || die "Makefile.new: $!";
+while (<OLD>) {
+      chomp;
+      if (/Targets:/) {
+         print NEW $MAKEI18N;
+         }
+      elsif (/^all:/) {
+         $_ .= " i18n";
+         }
+      elsif (/^clean:/) {
+	 $_ .= "\n\t\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot";
+         }
+      print NEW "$_\n";
+      }
+close(NEW);
+close(OLD);
diff --git a/i18n.c b/i18n.c
index db784ca31..1673e5397 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,69 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.302 2007/07/20 15:04:37 kls Exp $
+ * $Id: i18n.c 1.308 2007/08/12 12:15:29 kls Exp $
  *
- * Translations provided by:
- *
- * Slovenian   Miha Setina <mihasetina@softhome.net>, Matjaz Thaler <matjaz.thaler@guest.arnes.si>
- * Italian     Alberto Carraro <bertocar@tin.it>, Antonio Ospite <ospite@studenti.unina.it>, Sean Carlos <seanc@libero.it>, Nino Gerbino <ngerb@interfree.it>
- * Dutch       Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, Hans Dingemans <hans.dingemans@tacticalops.nl>, Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>
- * Portuguese  Paulo Lopes <pmml@netvita.pt>
- * French      Jean-Claude Repetto <jc@repetto.org>, Olivier Jacques <jacquesolivier@hotmail.com>, Gregoire Favre <greg@magma.unil.ch>, Nicolas Huillard <nhuillard@e-dition.fr>, Pierre Briec <pbriec@free.fr>
- * Norwegian   J�rgen Tvedt <pjtvedt@online.no>, Truls Slevigen <truls@slevigen.no>
- * Finnish     Hannu Savolainen <hannu@opensound.com>, Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, Niko Tarnanen <niko.tarnanen@hut.fi>, Rolf Ahrenberg <rahrenbe@cc.hut.fi>
- * Polish      Michael Rakowski <mrak@gmx.de>, Jaroslaw Swierczynski <swiergot@gmail.com>
- * Spanish     Ruben Nunez Francisco <ruben.nunez@tang-it.com>, Jesus Bravo Alvarez <jba@pobox.com>
- * Greek       Dimitrios Dimitrakos <mail@dimitrios.de>
- * Swedish     Tomas Prybil <tomas@prybil.se>, Jan Ekholm <chakie@infa.abo.fi>
- * Romanian    Paul Lacatus <paul@campina.iiruc.ro>, Lucian Muresan <lucianm@users.sourceforge.net>
- * Hungarian   Istvan & Silvia Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>
- * Catalanian  Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com>, Jordi Vil� <jvila@tinet.org>
- * Russian     Vyacheslav Dikonov <sdiconov@mail.ru>, Oleg Roitburd <oleg@roitburd.de>
- * Croatian    Drazen Dupor <drazen.dupor@dupor.com>, Dino Ravnic <dino.ravnic@fer.hr>
- * Estonian    Arthur Konovalov <kasjas@hot.ee>
- * Danish      Mogens Elneff <mogens@elneff.dk>
- * Czech       Vladim�r B�rta <vladimir.barta@k2atmitec.cz>
- * Turkish     Oktay Yolge�en <oktay_73@yahoo.de>
  *
  */
 
 /*
- * How to add a new language:
- *
- * 1. Announce your translation action on the VDR mailing
- *    list to avoid duplicate work.
- * 2. Increase the value of 'I18nNumLanguages' in 'i18n.h'.
- * 3. Insert a new line in every member of the 'Phrases[]' array,
- *    containing the translated text for the new language.
- *    For example, assuming you want to add the Italian language,
- *
- *       { "English",
- *         "Deutsch",
- *       },
- *
- *    would become
- *
- *       { "English",
- *         "Deutsch",
- *         "Italiano",
- *       },
- *
- *    and so on. Append your language after the last existing language
- *    and write the name of your language in your language (not in English,
- *    which means that it should be 'Italiano', not 'Italian').
- *    Note that only the characters defined in 'fontosd.c' will
- *    be available!
- * 4. If your language requires a character set other than the default iso8859-1
- *    you need to make the appropriate entry in the second phrase below, and
- *    also create the necessary font files in case they are not yet part of
- *    the VDR source (see how this is done for iso8859-7, for instance). Don't
- *    forget to adjust the files font.h and font.c accordingly.
- * 5. Compile VDR and test the new language by switching to it
- *    in the "Setup/OSD" menu.
- * 6. Send the modified files to <kls@cadsoft.de> to have
- *    it included in the next version of VDR.
- *
  * In case an English phrase is used in more than one context (and might need
  * different translations in other languages) it can be preceded with an
  * arbitrary string to describe its context, separated from the actual phrase
@@ -78,6982 +21,192 @@
 
 #include "i18n.h"
 #include <ctype.h>
-#include "config.h"
+#include <libintl.h>
+#include <locale.h>
 #include "tools.h"
 
-const tI18nPhrase Phrases[] = {
-  // The name of the language (this MUST be the first phrase!):
-  { "English",
-    "Deutsch",
-    "Slovenski",
-    "Italiano",
-    "Nederlands",
-    "Portugu�s",
-    "Fran�ais",
-    "Norsk",
-    "suomi", // Finnish (this is not a typo - it's really lowercase!)
-    "Polski",
-    "Espa�ol",
-    "��������", // Greek
-    "Svenska",
-    "Rom�n�",
-    "Magyar",
-    "Catal�",
-    "�������", // Russian
-    "Hrvatski",
-    "Eesti",
-    "Dansk",
-    "�esky", //Czech
-    "T�rk�e",
-  },
-  // The character set needed for this language (this MUST be the second phrase!):
-  { "iso8859-15",
-    "iso8859-15",
-    "iso8859-2",
-    "iso8859-15",
-    "iso8859-15",
-    "iso8859-1",
-    "iso8859-1",
-    "iso8859-1",
-    "iso8859-15",
-    "iso8859-2",
-    "iso8859-15",
-    "iso8859-7",
-    "iso8859-1",
-    "iso8859-2",
-    "iso8859-2",
-    "iso8859-1",
-    "iso8859-5",
-    "iso8859-2",
-    "iso8859-13",
-    "iso8859-15",
-    "iso8859-2",
-    "iso8859-9",
-  },
-  // The 3-letter names of the language (this MUST be the third phrase!):
-  { "eng,dos",
-    "deu,ger",
-    "slv,slo",
-    "ita",
-    "dut,nla,nld",
-    "por",
-    "fra,fre",
-    "nor",
-    "fin,smi",
-    "pol",
-    "esl,spa",
-    "ell,gre",
-    "sve,swe",
-    "rom,rum",
-    "hun",
-    "cat,cln",
-    "rus",
-    "hrv",
-    "est",
-    "dan",
-    "cze,ces",
-    "tur",
-  },
-  // Menu titles:
-  { "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-    "VDR",
-  },
-  { "Schedule",
-    "Programm",
-    "Program",
-    "Programmi",
-    "Gids",
-    "Programa��o",
-    "Programmes",
-    "Programmer",
-    "Ohjelmisto",
-    "Program",
-    "Gu�a de Programaci�n",
-    "���������",
-    "Program",
-    "Program (EPG)",
-    "Program",
-    "Guia de Programaci�",
-    "�������",
-    "Raspored",
-    "Kava",
-    "Programoversigt",
-    "Program (EPG)",
-    "Program",
-  },
-  { "Channels",
-    "Kan�le",
-    "Kanali",
-    "Canali",
-    "Kanalen",
-    "Canais",
-    "Cha�nes",
-    "Kanaler",
-    "Kanavat",
-    "Kana�y",
-    "Canales",
-    "�������",
-    "Kanaler",
-    "Canale",
-    "Csatorn�k",
-    "Canals",
-    "������",
-    "Programi",
-    "Kanalid",
-    "Kanaler",
-    "Kan�ly",
-    "Kanallar",
-  },
-  { "Timers",
-    "Timer",
-    "Termini",
-    "Timer",
-    "Timers",
-    "Timers",
-    "Programmation",
-    "Timere",
-    "Ajastimet",
-    "Timery",
-    "Programar grabaciones",
-    "��������������������",
-    "Timers",
-    "Timer-e",
-    "Id�z�t�",
-    "Temporitzadors",
-    "�������",
-    "Termini",
-    "Taimer",
-    "Timere",
-    "�asova�e",
-    "Zamanlay�c�",
-  },
-  { "Recordings",
-    "Aufzeichnungen",
-    "Posnetki",
-    "Registrazioni",
-    "Opnames",
-    "Grava��es",
-    "Enregistrements",
-    "Opptak",
-    "Tallenteet",
-    "Nagrania",
-    "Grabaciones",
-    "��������",
-    "Inspelningar",
-    "�nregistr�ri",
-    "Felvett ad�sok",
-    "Veure programes gravats",
-    "������",
-    "Snimke",
-    "Salvestused",
-    "Optagelser",
-    "Nahr�vky",
-    "Kay�tlar",
-  },
-  { "Recording info",
-    "Aufzeichnung",
-    "Podatki o snemanju",
-    "Informazioni registrazione",
-    "Opname info",
-    "",// TODO
-    "Infos sur l'enregistrement",
-    "",// TODO
-    "Tallenteen tiedot",
-    "Informacje o nagraniu",
-    "Informaci�n de grabaci�n",
-    "����������� E�������",
-    "Inspelning",
-    "Detaliile �nregistr�rii",
-    "Felv�tel",
-    "",// TODO
-    "���� � ������",
-    "",// TODO
-    "Salvestuse info",
-    "Optagelses info",
-    "Detail nahr�vky",
-    "Kay�t bilgisi",
-  },
-  { "Setup",
-    "Einstellungen",
-    "Nastavitve",
-    "Opzioni",
-    "Instellingen",
-    "Configurar",
-    "Configuration",
-    "Konfigurasjon",
-    "Asetukset",
-    "Ustawienia",
-    "Configuraci�n",
-    "���������",
-    "Inst�llningar",
-    "Configura�ie",
-    "Be�ll�t�sok",
-    "Configuraci�",
-    "���������",
-    "Konfiguracija",
-    "S�tted",
-    "Indstillinger",
-    "Nastaven�",
-    "Ayarlar",
-  },
-  { "Commands",
-    "Befehle",
-    "Ukazi",
-    "Comandi",
-    "Commando's",
-    "Comandos",
-    "Commandes",
-    "Kommandoer",
-    "Komennot",
-    "Polecenia",
-    "�rdenes",
-    "�������",
-    "Kommandon",
-    "Comenzi",
-    "Parancsok",
-    "Ordres",
-    "�������",
-    "Naredbe",
-    "K�sud",
-    "Kommandoer",
-    "P��kazy",
-    "Komutlar",
-  },
-  { "Recording commands",
-    "Befehle f�r Aufzeichnungen",
-    "Ukazi za snemanje",
-    "Comandi di registrazione",
-    "Opname commando's",
-    "",// TODO
-    "Commandes d'enregistrement",
-    "",// TODO
-    "Tallennekomennot",
-    "Polecenia nagra�",
-    "�rdenes de grabaci�n",
-    "������� ��� ��������",
-    "Inspelningskommandon",
-    "Comenzi pentru �nregistr�ri",
-    "Parancsok a felvett filmekhez",
-    "Ordres de gravaci�",
-    "������� ������",
-    "Naredbe za snimanje",
-    "Salvestuse k�sud",
-    "Optage kommandoer",
-    "P��kazy nahr�v�n�",
-    "Kay�t komutlar�",
-  },
-  { "Edit channel",
-    "Kanal editieren",
-    "Uredi kanal",
-    "Modifica canale",
-    "Kanaal aanpassen",
-    "Modificar canal",
-    "Modifier une cha�ne",
-    "Editer kanal",
-    "Muokkaa kanavaa",
-    "Edycja kana�u",
-    "Modificar canal",
-    "����������� ��������",
-    "�ndra kanal",
-    "Modificare canal",
-    "Csatorn�k be�ll�t�sa",
-    "Editar canal",
-    "�������������� ������",
-    "Ure�ivanje programa",
-    "Kanali muutmine",
-    "Rediger kanal",
-    "Editace kan�lu",
-    "Kanal ayarlar�n� de�i�tir",
-  },
-  { "Edit timer",
-    "Timer editieren",
-    "Uredi termin",
-    "Modifica timer",
-    "Timer veranderen",
-    "Modificar timer",
-    "Changer la programmation",
-    "Editer timer",
-    "Muokkaa ajastinta",
-    "Edycja timera",
-    "Modificar programaci�n",
-    "����������� ��������������������",
-    "�ndra timer",
-    "Modificare timer",
-    "Id�z�t� megv�ltoztat�sa",
-    "Editar temporitzador",
-    "��������� �������",
-    "Ure�ivanje termina",
-    "Taimeri muutmine",
-    "Rediger timer",
-    "Editace �asova�e",
-    "Zamanlay�c�y� ayarla",
-  },
-  { "Event",
-    "Sendung",
-    "Oddaja",
-    "Eventi",
-    "Uitzending",
-    "Evento",
-    "Ev�nement",
-    "Hendelse",
-    "Tapahtuma",
-    "Audycja",
-    "Evento",
-    "�������",
-    "S�ndning",
-    "Emisiune",
-    "Ad�s",
-    "Esdeveniment",
-    "��������",
-    "Emisija",
-    "S�ndmus",
-    "Udsendelse",
-    "Ud�lost",
-    "Yay�n",
-  },
-  { "Info",
-    "Info",
-    "Info",
-    "Informazioni",
-    "Info",
-    "",//TODO
-    "Info",
-    "",//TODO
-    "Tiedot",
-    "Info",
-    "Info",
-    "�����������",
-    "Info",
-    "Info",
-    "Inform�ci�",
-    "",//TODO
-    "����",
-    "Info",
-    "Info",
-    "Info",
-    "Info",
-    "Bilgi",
-  },
-  { "Schedule - %s",
-    "Programm - %s",
-    "Program - %s",
-    "Programma - %s",
-    "Programma - %s",
-    "Programa - %s",
-    "Programmes - %s",
-    "Program Guide - %s",
-    "Ohjelmisto - %s",
-    "Program - %s",
-    "Gu�a de programaci�n - %s",
-    "��������� - %s",
-    "Program - %s",
-    "Programul canalului %s",
-    "Program - %s",
-    "Guia de Programaci� - %s",
-    "��������� - %s",
-    "Raspored - %s",
-    "Ajakava - %s",
-    "Program - %s",
-    "Program - %s",
-    "Program - %s",
-  },
-  { "This event - %s",
-    "Diese Sendung - %s",
-    "Ta oddaja - %s",
-    "Questo evento - %s",
-    "",//TODO
-    "",//TODO
-    "Cet �v�nement",
-    "",//TODO
-    "T�m� tapahtuma - %s",
-    "Ta audycja - %s",
-    "Este evento - %s",
-    "",//TODO
-    "Den h�r s�ndningen - %s",
-    "Aceast� emisiune - %s",
-    "Ez az ad�s - %s",
-    "",//TODO
-    "��� �������� - %s",
-    "",//TODO
-    "See s�ndmus - %s",
-    "Denne udsendelse - %s",
-    "Tato ud�lost - %s",
-    "Bu yay�n - %s",
-  },
-  { "This event - all channels",
-    "Diese Sendung - alle Kan�le",
-    "Ta oddaja - vsi kanali",
-    "Questo evento - tutti i canali",
-    "",//TODO
-    "",//TODO
-    "Cet �v�nement - toutes les cha�nes",
-    "",//TODO
-    "T�m� tapahtuma - kaikki kanavat",
-    "Ta audycja - wszystkie kana�y",
-    "Este evento - todos los canales",
-    "",//TODO
-    "Den h�r s�ndningen - alla kanaler",
-    "Aceast� emisiune - toate canalele",
-    "Ez az ad�s - �sszes ad�",
-    "",//TODO
-    "��� �������� - ��� ������",
-    "",//TODO
-    "See s�ndmus - k�ik kanalid",
-    "Denne udsendelse - alle kanaler",
-    "Tato ud�lost - v�echny kan�ly",
-    "Bu yay�n - t�m kanallar",
-  },
-  { "All events - all channels",
-    "Alle Sendungen - alle Kan�le",
-    "Vse oddaje - vsi kanali",
-    "Tutti gli eventi - tutti i canali",
-    "",//TODO
-    "",//TODO
-    "Tous les �v�nements - toutes cha�nes",
-    "",//TODO
-    "Kaikki tapahtumat - kaikki kanavat",
-    "Wszystkie audycje - wszystkie kana�y",
-    "Todos los eventos - todos los canales",
-    "",//TODO
-    "Alla tillf�llen - alla kanaler",
-    "Toate emisiunile - toate canalele",
-    "Az �sszes ad�s - az �sszes ad�",
-    "",//TODO
-    "��� �������� - ��� ������",
-    "",//TODO
-    "K�ik s�ndmused - k�ik kanalid",
-    "Alle udsendelser - alle kanaler",
-    "V�echny ud�lost - v�echny kan�ly",
-    "T�m yay�nlar - t�m kanallar",
-  },
-  { "What's on now?",
-    "Was l�uft jetzt?",
-    "Kaj je na sporedu?",
-    "In programmazione adesso",
-    "Wat is er nu?",
-    "Programa actual?",
-    "Programmes en cours",
-    "Hvilket program sendes n�?",
-    "Menossa nyt",
-    "Program bie��cy",
-    "�Qu� hay ahora?",
-    "������ ���������",
-    "Vad s�nds nu?",
-    "Ce emisiuni sunt acum?",
-    "Mi megy most?",
-    "Qu� fan ara?",
-    "������ � �����:",
-    "�to je trenutno na programu?",
-    "Hetkel eetris",
-    "Hvad vises nu?",
-    "Aktu�ln� program",
-    "�imdiki yay�nlar",
-  },
-  { "What's on next?",
-    "Was l�uft als n�chstes?",
-    "Kaj sledi?",
-    "Prossimi programmi",
-    "Wat komt er hierna?",
-    "Pr�ximo Programa?",
-    "Prochains programmes",
-    "Hvilket program er neste?",
-    "Tulossa seuraavaksi",
-    "Nast�pne audycje",
-    "�Qu� hay despu�s?",
-    "������� ���������",
-    "Vilket �r n�sta program?",
-    "Ce emisiuni urmeaz�?",
-    "Mi k�vetkezik?",
-    "Qu� fan despr�s?",
-    "����� � ���������:",
-    "�to slijedi?",
-    "J�rgmisena eetris",
-    "Hvad vises som det n�ste?",
-    "N�sleduj�c� program",
-    "Gelecek yay�nlar",
-  },
-  // Button texts (should not be more than 10 characters!):
-  { "Button$Edit",
-    "Editieren",
-    "Uredi",
-    "Modifica",
-    "Verander",
-    "Modificar",
-    "Modifier",
-    "Editer",
-    "Muokkaa",
-    "Edytuj",
-    "Modificar",
-    "����������",
-    "�ndra",
-    "Modific�",
-    "Be�ll�tani",
-    "Editar",
-    "�������������",
-    "Promijeni",
-    "Muuda",
-    "Rediger",
-    "Editace",
-    "De�i�tir",
-  },
-  { "Button$New",
-    "Neu",
-    "Novo",
-    "Nuovo",
-    "Nieuw",
-    "Novo",
-    "Nouveau",
-    "Ny",
-    "Uusi",
-    "Nowy",
-    "Nuevo",
-    "N��",
-    "Ny",
-    "Nou",
-    "�j",
-    "Nou",
-    "��������",
-    "Novi",
-    "Uus",
-    "Ny",
-    "Nov�",
-    "Yeni",
-  },
-  { "Button$Delete",
-    "L�schen",
-    "Izbri�i",
-    "Cancella",
-    "Verwijder",
-    "Apagar",
-    "Supprimer",
-    "Slett",
-    "Poista",
-    "Usu�",
-    "Borrar",
-    "��������",
-    "Ta bort",
-    "�terge",
-    "T�r�lni",
-    "Esborrar",
-    "�������",
-    "Obri�i",
-    "Kustuta",
-    "Slet",
-    "Smazat",
-    "Sil",
-  },
-  { "Button$Mark",
-    "Markieren",
-    "Ozna�i",
-    "Marca",
-    "Verplaats",
-    "Marcar",
-    "Marquer",
-    "Marker",
-    "Siirr�",
-    "Zaznacz",
-    "Marcar",
-    "�������",
-    "M�rk",
-    "Marcheaz�",
-    "Megjel�lni",
-    "Marcar",
-    "�����������",
-    "Ozna�i",
-    "Siirda",
-    "Mark�r",
-    "Ozna�it",
-    "��aretle",
-  },
-  { "Button$On/Off",
-    "Ein/Aus",
-    "Vklop/Izklop",
-    "On/Off",
-    "Aan/Uit",
-    "On/Off",
-    "Marche/Arr",
-    "Av/P�",
-    "P��ll�/Pois",
-    "W�/Wy�",
-    "On/Off",
-    "A����/K������",
-    "P�/Av",
-    "Act./Inact.",
-    "Be/Ki",
-    "On/Off",
-    "���/����",
-    "De-/Aktiviraj",
-    "On/Off",
-    "Til/Fra",
-    "Zap./Vyp.",
-    "A�/Kapat",
-  },
-  { "Button$Timer",
-    "Timer",
-    "Termini",
-    "Timer",
-    "",// TODO
-    "",// TODO
-    "Programmation",
-    "",// TODO
-    "Ajastin",
-    "Timer",
-    "Programa",
-    "",// TODO
-    "Timer",
-    "Timer",
-    "Id�z�t�",
-    "",// TODO
-    "������",
-    "",// TODO
-    "Taimer",
-    "Timer",
-    "�asova�",
-    "Zamanlay�c�",
-  },
-  { "Button$Record",
-    "Aufnehmen",
-    "Posnemi",
-    "Registra",
-    "Opnemen",
-    "Gravar",
-    "Enregistre",
-    "Ta opp",
-    "Tallenna",
-    "Nagraj",
-    "Grabar",
-    "�������",
-    "Inspelning",
-    "�nregistr.",
-    "Felvenni",
-    "Gravar",
-    "������",
-    "Snimi",
-    "Salvesta",
-    "Optag",
-    "Nahr�t",
-    "Kay�t et",
-  },
-  { "Button$Info",
-    "Info",
-    "Info",
-    "Informazioni",
-    "Info",
-    "",//TODO
-    "Info",
-    "",//TODO
-    "Tiedot",
-    "Info",
-    "Info",
-    "�����������",
-    "Info",
-    "Info",
-    "Inform�ci�",
-    "",//TODO
-    "����",
-    "Info",
-    "Info",
-    "Info",
-    "Info",
-    "Bilgi",
-  },
-  { "Button$Play",
-    "Wiedergabe",
-    "Predvajaj",
-    "Riproduci",
-    "Afspelen",
-    "Play",
-    "Lire",
-    "Spill av",
-    "Toista",
-    "Odtw�rz",
-    "Play",
-    "�����������",
-    "Spela upp",
-    "Redare",
-    "Lej�tszani",
-    "Reproduir",
-    "�������������",
-    "Start",
-    "Start",
-    "Afspil",
-    "P�ehr�t",
-    "G�ster",
-  },
-  { "Button$Pause",
-    "Pause",
-    "Pavza",
-    "Pausa",
-    "Pauze",
-    "",// TODO
-    "Pause",
-    "",// TODO
-    "Tauko",
-    "Pauza",
-    "Pausa",
-    "�����",
-    "Pausa",
-    "Pauz�",
-    "Sz�net",
-    "Pausa",
-    "�����",
-    "Pauza",
-    "Paus",
-    "Pause",
-    "Zastavit",
-    "Durakla",
-  },
-  { "Button$Rewind",
-    "Anfang",
-    "Na za�etek",
-    "Riavvolgi",
-    "Naar begin",
-    "Rebobinar",
-    "Retour",
-    "Spol tilbake",
-    "Alkuun",
-    "Pocz�tek",
-    "Rebobinar",
-    "�������� ���� ����",
-    "�terspolning",
-    "�napoi",
-    "Vissza az elej�re",
-    "Enrera",
-    "�����",
-    "Na po�etak",
-    "Algusesse",
-    "Forfra",
-    "Na za��tek",
-    "Baslang��",
-  },
-  { "Button$Stop",
-    "Beenden",
-    "Ustavi",
-    "Stop",
-    "Eindigen",
-    "Parar",
-    "Arr�t",
-    "Stopp",
-    "Lopeta",
-    "Zatrzymaj",
-    "Parar",
-    "�����",
-    "Stopp",
-    "Stop",
-    "Stop",
-    "Aturar",
-    "����",
-    "Stop",
-    "Stopp",
-    "Stop",
-    "Ukon�it",
-    "Durdur",
-  },
-  { "Button$Resume",
-    "Weiter",
-    "Nadaljuj",
-    "Riprendi",
-    "Verder",
-    "Continuar",
-    "Reprendre",
-    "Fortsett",
-    "Jatka",
-    "Wzn�w",
-    "Continuar",
-    "���������",
-    "Forts�tt",
-    "Continuare",
-    "Tov�bb",
-    "Continuar",
-    "����������",
-    "Nastavi",
-    "J�tka",
-    "Forts�t",
-    "Pokra�ovat",
-    "S�rd�r",
-  },
-  { "Button$Open",
-    "�ffnen",
-    "Odpri",
-    "Apri",
-    "Openen",
-    "Abrir",
-    "Ouvrir",
-    "�pne",
-    "Avaa",
-    "Otw�rz",
-    "Abrir",
-    "�������",
-    "�ppna",
-    "Deschide",
-    "Kinyitni",
-    "Obrir",
-    "�������",
-    "Otvori",
-    "Ava",
-    "�bn",
-    "Otev��t",
-    "A�",
-  },
-  { "Button$Switch",
-    "Umschalten",
-    "Preklopi",
-    "Cambia",
-    "Selecteer",
-    "Seleccionar",
-    "Regarder",
-    "Skift til",
-    "Valitse",
-    "Prze��cz",
-    "Cambiar",
-    "A�����",
-    "Byt",
-    "Comut�",
-    "�tkapcsolni",
-    "Canviar",
-    "�����������",
-    "Prebaci",
-    "Vali",
-    "Skift",
-    "P�epnout",
-    "De�i�tir",
-  },
-  { "Button$Now",
-    "Jetzt",
-    "Sedaj",
-    "Adesso",
-    "Nu",
-    "Agora",
-    "Maintenant",
-    "N�",
-    "Nyt",
-    "Teraz",
-    "Ahora",
-    "����",
-    "Nu",
-    "Acum",
-    "Most",
-    "Ara",
-    "������",
-    "Trenutno",
-    "N��d",
-    "Nu",
-    "Nyn�",
-    "�imdi",
-  },
-  { "Button$Next",
-    "N�chste",
-    "Sledi",
-    "Prossimo",
-    "Hierna",
-    "Proximo",
-    "Apr�s",
-    "Neste",
-    "Seuraavaksi",
-    "Nast�pnie",
-    "Despu�s",
-    "�������",
-    "N�sta",
-    "Urm�tor",
-    "K�vetkez�",
-    "Seg�ent",
-    "�����",
-    "Slijedi",
-    "Tulekul",
-    "N�ste",
-    "Dal��",
-    "Sonra",
-  },
-  { "Button$Schedule",
-    "Programm",
-    "Program",
-    "Programma",
-    "Programma",
-    "Programa��o",
-    "Programme",
-    "Programmer",
-    "Ohjelmisto",
-    "Program",
-    "Gu�a",
-    "���������",
-    "Program",
-    "Program",
-    "Program",
-    "Programar",
-    "���������",
-    "Raspored",
-    "Ajakava",
-    "Program",
-    "Program",
-    "Program",
-  },
-  { "Button$ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "AB�/���",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "���/���",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-    "ABC/abc",
-  },
-  { "Button$Insert",
-    "Einf�gen",
-    "Vstavi",
-    "Inserisci",
-    "Invoegen",
-    "",// TODO
-    "Ins�rer",
-    "",// TODO
-    "Lis��",
-    "Wstaw",
-    "Insertar",
-    "��������",
-    "Infoga",
-    "Insereaz�",
-    "Beilleszteni",
-    "Inserir",
-    "�������",
-    "Umetni",
-    "Lisa (INS)",
-    "Inds�t",
-    "Vlo�it",
-    "Ekle",
-  },
-  { "Button$Overwrite",
-    "�berschreiben",
-    "Prepi�i",
-    "Sovrascrivi",
-    "Overschrijven",
-    "",// TODO
-    "�craser",
-    "",// TODO
-    "Korvaa",
-    "Nadpisz",
-    "Sobreescribir",
-    "�������������",
-    "Skriv �ver",
-    "Suprascrie",
-    "�t�rni",
-    "Sobrescriure",
-    "������",
-    "Prepi�i",
-    "Asenda (OVR)",
-    "Overskriv",
-    "P�epsat",
-    "�st�ne yaz",
-  },
-  { "Button$Menu",
-    "Men�",
-    "Meni",
-    "Menu",
-    "Menu",
-    "Menu",
-    "Menu",
-    "Meny",
-    "Valikko",
-    "Menu",
-    "Men�",
-    "M����",
-    "Meny",
-    "Meniu",
-    "Men�",
-    "Men�",
-    "����",
-    "Izbor",
-    "Men��",
-    "Menu",
-    "Menu",
-    "Men�",
-  },
-  { "Button$Reset",
-    "R�cksetzen",
-    "Reset",
-    "Resetta",
-    "Herstart",
-    "",//TODO
-    "R�initialisation",
-    "",//TODO
-    "Nollaa",
-    "Reset",
-    "Reiniciar",
-    "���������",
-    "�terst�ll",
-    "Resetare",
-    "Reset",
-    "Reiniciar",
-    "�����",
-    "Reset",
-    "Nullimine",
-    "Nulstille",
-    "Reset",
-    "S�f�rla",
-  },
-  { "Button$Scan",
-    "Scan",
-    "I��i",
-    "Scansione",
-    "Scan",
-    "",//TODO
-    "Scan",
-    "",//TODO
-    "P�ivit�",
-    "Skanuj",
-    "Escanear",
-    "������",
-    "Skanna",
-    "C�utare canale",
-    "Ad�skeres�s",
-    "",//TODO
-    "�����������",
-    "Pretra�i",
-    "Uuenda",
-    "Skan",
-    "Sn�mat",
-    "Tara",
-  },
-  { "Button$Audio",
-    "Audio",
-    "Zvok",
-    "Audio",
-    "Audio",
-    "",// TODO
-    "Audio",
-    "",// TODO
-    "��ni",
-    "D�wi�k",
-    "Audio",
-    "����",
-    "Ljud",
-    "Sunet",
-    "Hang",
-    "",// TODO
-    "����",
-    "",// TODO
-    "Audio",
-    "Audio",
-    "Zvuk",
-    "Audio",
-  },
-  // Confirmations:
-  { "Delete channel?",
-    "Kanal l�schen?",
-    "Izbri�i kanal?",
-    "Cancellare il canale?",
-    "Kanaal verwijderen?",
-    "Apagar o canal?",
-    "Supprimer la cha�ne?",
-    "Slette kanal?",
-    "Poistetaanko kanava?",
-    "Usun�� kana�?",
-    "�Eliminar canal?",
-    "�������� ��������?",
-    "Ta bort kanalen?",
-    "�terg canalul?",
-    "Csatorna t�rl�se?",
-    "Esborrar el canal?",
-    "������� �����?",
-    "Obrisati program?",
-    "Kustutada kanal?",
-    "Slet kanal?",
-    "Smazat kan�l?",
-    "Kanal� sil?",
-  },
-  { "Delete timer?",
-    "Timer l�schen?",
-    "Izbri�i termin?",
-    "Cancellare il timer?",
-    "Timer verwijderen?",
-    "Apagar o timer?",
-    "Supprimer la programmation?",
-    "Slette timer?",
-    "Poistetaanko ajastin?",
-    "Usun�� timer?",
-    "�Eliminar programaci�n?",
-    "�������� ��������������������;?",
-    "Ta bort timern?",
-    "�terg timer-ul?",
-    "Id�z�t� t�rl�se?",
-    "Esborrar el temporitzador?",
-    "������� ������?",
-    "Obrisati termin?",
-    "Kustutada taimer?",
-    "Slet timer?",
-    "Smazat �asova�?",
-    "Zamanlay�c�y� sil",
-  },
-  { "Delete recording?",
-    "Aufzeichnung l�schen?",
-    "Izbri�i posnetek?",
-    "Cancellare la registrazione?",
-    "Opname verwijderen?",
-    "Apagar a grava��o?",
-    "Supprimer l'enregistrement?",
-    "Slette opptak?",
-    "Poistetaanko tallenne?",
-    "Usun�� nagranie?",
-    "�Eliminar grabacion?",
-    "�������� ��������?",
-    "Ta bort inspelningen?",
-    "�terg �nregistrarea?",
-    "Felv�tel t�rl�se?",
-    "Esborrar gravaci�?",
-    "������� ������?",
-    "Obrisati snimku?",
-    "Kustutada salvestus?",
-    "Slet optagelse?",
-    "Smazat nahr�vku?",
-    "Kay�t� sil?",
-  },
-  { "Timer still recording - really delete?",
-    "Timer zeichnet auf - trotzdem l�schen?",
-    "Snemanje po terminu - zares izbri�i?",
-    "Timer in registrazione - cancellare?",
-    "Timer neemt nog op - toch verwijderen?",
-    "Timer activo - t�m a certeza que quer apagar?",
-    "Enregistrement en cours - confirmez la suppression",
-    "Timer gj�r opptak - vil du slette likevel?",
-    "Ajastettu tallennus k�ynniss� - poistetaanko silti?",
-    "Trwa nagrywanie - na pewno usun��?",
-    "Todav�a est� grabando - �eliminar realmente?",
-    "�������������������� �� ������� - �������� �������?",
-    "Timerstyrd inspelning p�g�r - Avbryta �nd�?",
-    "Timer-ul tocmai �nregistreaz� - �terg, totu�i?",
-    "Felv�tel folyamatban van - m�gis t�r�lni?",
-    "Temporitzador activat - Esborrar de totes maneres?",
-    "���� ������ �� ������� - ������������� �������?",
-    "Jo� snimam - zaista obrisati?",
-    "Salvestus aktiivne - kustutada?",
-    "Timerstyret optagelse i gang - slet alligevel?",
-    "Prob�h� nahr�v�n� - opravdu smazat?",
-    "Zamanlay�c� kay�t ediyor - buna ra�men sil?",
-  },
-  { "Stop recording?",
-    "Aufzeichnung beenden?",
-    "Prekini snemanje?",
-    "Fermare la registrazione?",
-    "Opname stoppen?",
-    "Parar Grava��o?",
-    "Arr�ter l'enregistrement?",
-    "Stoppe opptak?",
-    "Lopetetaanko tallennus?",
-    "Zatrzyma� nagrywanie?",
-    "�Parar grabaci�n?",
-    "������� ��������?",
-    "Stanna inspelning?",
-    "Opresc �nregistrarea?",
-    "Felv�tel befejezni?",
-    "Aturar la gravaci�?",
-    "���������� ������?",
-    "Zaustaviti snimanje?",
-    "L�petada salvestamine?",
-    "Stop optagelse?",
-    "Ukon�it nahr�v�n�?",
-    "Kay�t� durdur?",
-  },
-  { "Cancel editing?",
-    "Schneiden abbrechen?",
-    "�elite prekiniti urejanje?",
-    "Annullare la modifica?",
-    "Bewerken afbreken?",
-    "Cancelar Modifica��es?",
-    "Annuler les modifications?",
-    "Avbryte redigering?",
-    "Perutaanko muokkaus?",
-    "Anulowa� monta�?",
-    "�Cancelar edici�n?",
-    "A������ ������������?",
-    "Avbryta redigeringen?",
-    "Opresc montajul �nregistr�rii?",
-    "V�g�st befejezni?",
-    "Cancel�lar l'edici�?",
-    "�������� ��������������?",
-    "Otkazati ure�ivanje?",
-    "T�histada muudatus?",
-    "Afbryd redigering?",
-    "Zru�it editaci?",
-    "Kesimi iptal et?",
-  },
-  { "Really restart?",
-    "Wirklich neu starten?",
-    "Zares ponoven zagon?",
-    "Eseguire un riavvio?",
-    "Werkelijk opnieuw starten?",
-    "Tem a certeza que quer reiniciar?",
-    "Red�marrer?",
-    "Vil du virkelig starte p� nytt?",
-    "K�ynnistet��nk� uudelleen?",
-    "Na pewno zrestartowa�?",
-    "�Reiniciar realmente?",
-    "N� ����� ������� ������������?",
-    "Vill du verkligen starta om?",
-    "Sigur repornesc?",
-    "T�nyleg �jraind�tani?",
-    "Segur que voleu reiniciar?",
-    "������������� �������������?",
-    "Zaista ponovo pokrenuti?",
-    "Restart?",
-    "Vil du virkelig genstarte?",
-    "Opravdu restartovat?",
-    "Ger�ekten yeniden ba�lat?",
-  },
-  { "restart anyway?",
-    "trotzdem neu starten?",
-    "zares ponoven zagon?",
-    "riavviare comunque?",
-    "toch opnieuw starten?",
-    "quer mesmo reiniciar?",
-    "red�marrer?",
-    "starte p� nytt likevel?",
-    "k�ynnistet��nk� uudelleen?",
-    "zrestartowa� mimo to?",
-    "�reiniciar igualmente?",
-    "������ �� ����� ������������?",
-    "vill du �nd� starta om?",
-    "repornesc, totu�i?",
-    "m�gis �jraind�tani?",
-    "Reiniciar de totes maneres?",
-    "������������� �������������?",
-    "svejedno restart sistema?",
-    "restart?",
-    "genstart alligevel?",
-    "p�esto restartovat?",
-    "buna ra�men yeniden ba�lat?",
-  },
-  { "shut down anyway?",
-    "trotzdem ausschalten?",
-    "zares izklopi?",
-    "spegnere comunque?",
-    "toch uitschakelen?",
-    "quer mesmo desligar?",
-    "confirmez l'arr�t",
-    "sl� av likevel?",
-    "sammutetaanko?",
-    "wy��czy� mimo to?",
-    "�apagar igualmente?",
-    "������ �� ����� �����������?",
-    "vill du �nd� avbryta?",
-    "�nchid, totu�i?",
-    "m�gis kikapcsolni?",
-    "Apagar de totes maneres?",
-    "������������� ���������?",
-    "svejedno isklju�iti?",
-    "l�litada v�lja?",
-    "sluk alligevel?",
-    "p�esto vypnout?",
-    "buna ra�men kapat?",
-  },
-  { "Recording - restart anyway?",
-    "Aufnahme l�uft - trotzdem neu starten?",
-    "Snemanje - zares ponoven zagon?",
-    "In registrazione - riavviare comunque?",
-    "Opname loopt - toch opnieuw starten?",
-    "Em grava��o - quer mesmo reiniciar?",
-    "Enregistrement en cours - red�marrer?",
-    "Gj�r opptak - starte p� nytt likevel?",
-    "Tallennus kesken - k�ynnistet��nk� uudelleen?",
-    "Trwa nagrywanie - zrestartowa� mimo to?",
-    "Grabaci�n en curso - �reiniciar igualmente?",
-    "������� ������� - ������ �� ����� ������������?",
-    "Inspelning p�g�r, vill du �nd� starta om?",
-    "Tocmai se �nregistreaz� - repornesc, totu�i?",
-    "Felv�tel folyamatban van - m�gis �jraind�tani?",
-    "Gravant - Reiniciar de totes maneres?",
-    "���� ������ - ������������� �������������?",
-    "Snimanje traje - svejedno restart sistema?",
-    "Salvestamine aktiivne - restart?",
-    "Optagelse igang - genstart alligevel?",
-    "Syst�m je zanepr�zdn�n - p�esto restartovat?",
-    "Kay�t ediliyor - buna ra�men yeniden ba�lat?",
-  },
-  { "Editing - restart anyway?",
-    "Schnitt l�uft - trotzdem neu starten?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "Muokkaus kesken - k�ynnistet��nk� uudelleen?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "������� ������� - ������������� �������������?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "Recording - shut down anyway?",
-    "Aufnahme l�uft - trotzdem ausschalten?",
-    "Snemanje - zares izklopi?",
-    "In registrazione - spegnere comunque?",
-    "Opname loopt - toch uitschakelen?",
-    "Em grava��o - quer mesmo desligar?",
-    "Enregistrement en cours - confirmez l'arr�t",
-    "Gj�r opptak - sl� av likevel?",
-    "Tallennus kesken - sammutetaanko?",
-    "Trwa nagrywanie - wy��czy� mimo to?",
-    "Grabaci�n en curso - �apagar igualmente?",
-    "������� ������� - ������ �� ����� �����������?",
-    "Inspelning p�g�r, vill du �nd� avbryta?",
-    "Tocmai se �nregistreaz� - �nchid, totu�i?",
-    "Felv�tel folyamatban van - m�gis kikapcsolni?",
-    "Gravant - Apagar de totes maneres?",
-    "���� ������ - ������������� ���������?",
-    "Snimanje traje - svejedno isklju�iti?",
-    "Salvestamine aktiivne - l�litada v�lja?",
-    "Optagelse igang - sluk alligevel?",
-    "Syst�m je zanepr�zdn�n - p�esto vypnout?",
-    "Kay�t ediliyor - buna ra�men kapat?",
-  },
-  { "Recording in %ld minutes, shut down anyway?",
-    "Aufnahme in %ld Minuten - trotzdem ausschalten?",
-    "Snemanje �ez %ld minut, zares izklopi?",
-    "Registrazione fra %ld minuti - spegnere comunque?",
-    "Opname in %ld minuten - toch uitschakelen?",
-    "Em grava��o dentro de %ld minutos - quer mesmo desligar?",
-    "Enregistrement dans %ld minutes - confirmez l'arr�t",
-    "Skal gj�re opptak om %ld minutter - sl� av likevel?",
-    "Tallennus alkaa %ld min kuluttua - sammutetaanko?",
-    "Nagrywanie za %ld minut - wy��czy� mimo to?",
-    "Grabaci�n dentro de %ld minutos, �apagar realmente?",
-    "���������� ������� �� %ld ����� - ������ �� �����������?",
-    "Inspelning startar om %ld minuter, vill du avsluta?",
-    "�nregistrez peste %ld minute - �nchid, totu�i?",
-    "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?",
-    "Hi ha una gravaci� en %ld minuts - Apagar de totes maneres?",
-    "����� %ld ����� �������� ������ - ������������� ���������?",
-    "Snimanje za %ld minuta - svejedno isklju�iti?",
-    "Salvestamine algab %ld minuti p�rast - l�litada v�lja?",
-    "Optagelse om %ld minutter - sluk alligevel?",
-    "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?",
-    "Kay�t %ld dakikada ba�l�yor - buna ra�men kapat?",
-  },
-  { "Press any key to cancel shutdown",
-    "Taste dr�cken, um Ausschalten abzubrechen",
-    "Pritisnite katerikoli gumb za preklic izklopa",
-    "Premere un tasto per annullare lo spegnimento",
-    "Druk een toets om shutdown af te breken",
-    "Pressione qualquer tecla para cancelar",
-    "Appuyez sur une touche pour annuler l'arr�t",
-    "Trykk en tast for ikke � sl� av",
-    "Peru sammutus painamalla mit� tahansa n�pp�int�",
-    "Naci�nij dowolny klawisz aby nie wy��cza�",
-    "Pulse una tecla para interrumpir apagar",
-    "����� ��� ������� ��� ������� �����������",
-    "Tryck valfri knapp f�r att �terkalla avst�ngningen",
-    "Apas� orice tast� pentru a anula �nchiderea",
-    "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz",
-    "Prem qualsevol tecla per cancel�lar l'aturada",
-    "������� ����� ������ ����� �������� ����������.",
-    "Pritisnite tipku ako ne �elite ugasiti sistem",
-    "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks",
-    "Tryk vilk�rlig tast for at annullere sluk",
-    "Jak�koliv kl�vesa zru�� vypnut�",
-    "Kapatmay� iptal etmek i�in herhangi bir tu�a bas",
-  },
-  { "Press any key to cancel restart",
-    "Taste dr�cken, um Neustart abzubrechen",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "Peru uudelleenk�ynnistys painamalla mit� tahansa n�pp�int�",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "������� ����� ������ ��� ������ ������������",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "VDR will shut down later - press Power to force",
-    "VDR schaltet sp�ter aus - Power zum erzwingen",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "VDR sammuu my�hemmin - pakota virtan�pp�imell�",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "VDR ���������� ����� - ������� Power ��� ���������",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "VDR will shut down in %s minutes",
-    "VDR wird in %s Minuten ausschalten",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "VDR sammuu %s minuutin kuluttua",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "VDR ���������� ����� %s �����",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "Editing - shut down anyway?",
-    "Schnitt l�uft - trotzdem ausschalten?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "Muokkaus kesken - sammutetaanko?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "���� ������ - ������������� ���������?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "Plugin %s wakes up in %ld min, continue?",
-    "Plugin %s wacht in %ld Min auf, weiter?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "Laajennos %s her�� %ld minuutin kuluttua - sammutetaanko?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "Plugin %s ��������� ����� %ld ����� - ����������?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  // Channel parameters:
-  { "Name",
-    "Name",
-    "Ime",
-    "Nome",
-    "Naam",
-    "Nome",
-    "Nom",
-    "Navn",
-    "Nimi",
-    "Nazwa",
-    "Nombre",
-    "�����",
-    "Namn",
-    "Nume",
-    "N�v",
-    "Nom",
-    "��������",
-    "Naziv",
-    "Nimi",
-    "Navn",
-    "N�zev",
-    "�sim",
-  },
-  { "Frequency",
-    "Frequenz",
-    "Frekvenca",
-    "Frequenza",
-    "Frequentie",
-    "Frequ�ncia",
-    "Fr�quence",
-    "Frekvens",
-    "Taajuus",
-    "Cz�stotliwo��",
-    "Frecuencia",
-    "���������",
-    "Frekvens",
-    "Frecven��",
-    "Frekvencia",
-    "Freq��ncia",
-    "�������",
-    "Frekvencija",
-    "Sagedus",
-    "Frekvens",
-    "Frekvence",
-    "Frekans",
-  },
-  { "Polarization",
-    "Polarisation",
-    "Polarizacija",
-    "Polarizzazione",
-    "Polarisatie",
-    "Polariza��o",
-    "Polarisation",
-    "Polarisasjon",
-    "Polarisaatio",
-    "Polaryzacja",
-    "Polarizaci�n",
-    "������",
-    "Polarisation",
-    "Polarizare",
-    "Polariz�ci�",
-    "Polaritzaci�",
-    "�����������",
-    "Polarizacija",
-    "Polarisatsioon",
-    "Polarisation",
-    "Polarizace",
-    "Kutupla�ma",
-  },
-  { "Source",
-    "Quelle",
-    "Pozicija",
-    "Sorgente",
-    "Bron",
-    "",//TODO
-    "Source",
-    "",//TODO
-    "L�hde",
-    "�r�d�o",
-    "Fuente",
-    "����",
-    "K�lla",
-    "Surs�",
-    "Forr�s",
-    "Origen",
-    "��������",
-    "Izvor",
-    "Allikas",
-    "Kilde",
-    "Zdroj",
-    "Kaynak",
-  },
-  { "Srate",
-    "Srate",
-    "Srate",
-    "SymbolRate",
-    "Srate",
-    "Srate",
-    "Fr�q. Symbole",
-    "Srate",
-    "Symbolinopeus",
-    "Srate",
-    "T.s�mbolos",
-    "Srate",
-    "Srate",
-    "Rat� simboluri",
-    "Srate",
-    "Srate",
-    "����. ��������",
-    "Srate", // hrv
-    "Srate",
-    "Srate",
-    "Srate",
-    "Srate",
-  },
-  { "Vpid",
-    "Vpid",
-    "Vpid",
-    "PID Video",
-    "Vpid",
-    "PID de V�deo",
-    "PID Vid�o",
-    "Vpid",
-    "Kuva-PID",
-    "Vpid",
-    "Vpid",
-    "B����� PID",
-    "VPID",
-    "PID Video",
-    "Vpid",
-    "PID V�deo",
-    "Vpid (�����)",
-    "Vpid",
-    "Vpid",
-    "Vpid",
-    "Vpid",
-    "Vpid",
-  },
-  { "Ppid",
-    "Ppid",
-    "Ppid",
-    "PID Pcr",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "PCR-PID",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-    "Ppid",
-  },
-  { "Apid1",
-    "Apid1",
-    "Apid1",
-    "PID Audio (1)",
-    "Apid1",
-    "PID �udio (1)",
-    "PID Audio (1)",
-    "Apid1",
-    "��ni-PID (1)",
-    "Apid1",
-    "Apid1",
-    "Apid1",
-    "APID1",
-    "PID Audio (1)",
-    "Apid1",
-    "PID �udio (1)",
-    "Apid1 (����� 1)",
-    "Apid1", // hrv
-    "Apid1",
-    "Apid1",
-    "Apid1",
-    "Apid1",
-  },
-  { "Apid2",
-    "Apid2",
-    "Apid2",
-    "PID Audio (2)",
-    "Apid2",
-    "Apid2",
-    "PID Audio (2)",
-    "Apid2",
-    "��ni-PID (2)",
-    "Apid2",
-    "Apid2",
-    "Apid2",
-    "APID2",
-    "PID Audio (2)",
-    "Apid2",
-    "PID �udio (2)",
-    "Apid2 (����� 2)",
-    "Apid2", // hrv
-    "Apid2",
-    "Apid2",
-    "Apid2",
-    "Apid2",
-  },
-  { "Dpid1",
-    "Dpid1",
-    "Dpid1",
-    "PID AC3 (1)",
-    "Dpid1",
-    "PID AC3 (1)",
-    "PID AC3 (1)",
-    "AC3pid1",
-    "Dolby-PID (1)",
-    "Dpid1",
-    "Dpid1",
-    "Dpid1",
-    "DPID1",
-    "PID AC3 (1)",
-    "Dpid1",
-    "PID AC3 (1)",
-    "Dpid1 (AC3 1)",
-    "Dpid1", // hrv
-    "Dpid1",
-    "Dpid1",
-    "Dpid1",
-    "Dpid1",
-  },
-  { "Dpid2",
-    "Dpid2",
-    "Dpid2",
-    "PID AC3 (2)",
-    "Dpid2",
-    "PID AC3 (2)",
-    "PID AC3 (2)",
-    "AC3pid2",
-    "Dolby-PID (2)",
-    "Dpid2",
-    "Dpid2",
-    "Dpid2",
-    "DPID2",
-    "PID AC3 (2)",
-    "Dpid2",
-    "PID AC3 (2)",
-    "Dpid2 (AC3 2)",
-    "Dpid2", // hrv
-    "Dpid2",
-    "Dpid2",
-    "Dpid2",
-    "Dpid2",
-  },
-  { "Tpid",
-    "Tpid",
-    "Tpid",
-    "PID Teletext",
-    "Tpid",
-    "PID Teletexto",
-    "PID T�l�texte",
-    "Tekst-TV pid",
-    "Teksti-TV-PID",
-    "Tpid",
-    "Tpid",
-    "Tpid",
-    "TPID",
-    "PID Teletext",
-    "Tpid",
-    "PID Teletext",
-    "Tpid (���������)",
-    "Tpid", // hrv
-    "Tpid",
-    "Tpid",
-    "Tpid",
-    "Tpid",
-  },
-  { "CA",
-    "CA",
-    "CA",
-    "CA",
-    "CA",
-    "Encripta��o",
-    "Cryptage",
-    "Kortleser",
-    "Salaus (CA)",
-    "CA",
-    "Acceso condicional (CA)",
-    "CA",
-    "Kortl�sare",
-    "CA (Acces Condi�ional)",
-    "CA",
-    "Acc�s Condicional",
-    "CA (�������)",
-    "Kodiranje (CA)",
-    "CA",
-    "CA",
-    "CA",
-    "CA",
-  },
-  { "Free To Air",
-    "frei empfangbar",
-    "nekodiran",
-    "in chiaro",
-    "",//TODO
-    "",//TODO
-    "Aucun cryptage",
-    "",//TODO
-    "vapaa",
-    "nieszyfrowany",
-    "en abierto",
-    "",//TODO
-    "Okodad",
-    "FTA (necriptat)",
-    "K�dolatlan",
-    "",//TODO
-    "FTA (��������������)",
-    "",//TODO
-    "FTA",
-    "Free To Air",
-    "voln�",
-    "�ifresiz",
-  },
-  { "encrypted",
-    "verschl�sselt",
-    "kodiran",
-    "criptato",
-    "",//TODO
-    "",//TODO
-    "Crypt�",
-    "",//TODO
-    "salattu",
-    "szyfrowany",
-    "cifrado",
-    "",//TODO
-    "krypterad",
-    "criptat",
-    "K�dolt",
-    "",//TODO
-    "������������",
-    "",//TODO
-    "kr�ptitud",
-    "kodet",
-    "k�dovan�",
-    "�ifreli",
-  },
-  { "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Palvelu-ID",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid", // hrv
-    "Sid",
-    "Sid",
-    "Sid",
-    "Sid",
-  },
-  { "Inversion",
-    "Inversion",
-    "Inverzija",
-    "Inversion",
-    "Inversion",
-    "Inversion",
-    "Inversion",
-    "Inversion",
-    "Inversio",
-    "Inwersja",
-    "Inversion",
-    "����������",
-    "Inversion",
-    "Inversiune",
-    "Inversion",
-    "Inversi�",
-    "��������",
-    "Inverzija",
-    "Inversioon",
-    "Inversion",
-    "Inversion",
-    "�nversiyon",
-  },
-  { "Bandwidth",
-    "Bandbreite",
-    "Pasovna �irina",
-    "Banda passante",
-    "Bandwidth",
-    "Bandwidth",
-    "Bande passante",
-    "Bandwidth",
-    "Kaistanleveys",
-    "Pasmo",
-    "Ancho de banda",
-    "����� ����������",
-    "Bandbredd",
-    "L�rgime de band�",
-    "Bandwidth",
-    "Amplada de banda",
-    "��������",
-    "Bandwidth", // hrv "Pojasna �irina",
-    "Ribalaius",
-    "B�ndbredde",
-    "���ka p�sma",
-    "Bant geni�li�i",
-  },
-  { "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "Suojaustaso (HP)",
-    "CoderateH",
-    "CoderateH",
-    "������ ������ H",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH", // hrv
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-    "CoderateH",
-  },
-  { "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "Suojaustaso (LP)",
-    "CoderateL",
-    "CoderateL",
-    "������ ������ L",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL", // hrv
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-    "CoderateL",
-  },
-  { "Modulation",
-    "Modulation",
-    "Modulacija",
-    "Modulation",
-    "Modulation",
-    "Modulation",
-    "Modulation",
-    "Modulation",
-    "Modulaatio",
-    "Modulacja",
-    "Modulaci�n",
-    "����������",
-    "Modulation",
-    "Modula�ie",
-    "Modulation",
-    "Modulaci�",
-    "���������",
-    "Modulacija",
-    "Modulatsioon",
-    "Modulation",
-    "Modulace",
-    "Mod�lasyon",
-  },
-  { "Transmission",
-    "Transmission",
-    "Prenos",
-    "Transmission",
-    "Transmission",
-    "Transmission",
-    "Transmission",
-    "Transmission",
-    "Transmissio",
-    "Transmisja",
-    "Transmisi�n",
-    "��������",
-    "Transmission",
-    "Transmisie",
-    "Transmission",
-    "Transmissi�",
-    "��������",
-    "Prijenos",
-    "Transmissioon",
-    "Transmission",
-    "P�enos",
-    "�letim",
-  },
-  { "Guard",
-    "Guard",
-    "Za��ita",
-    "Guard",
-    "Guard",
-    "Guard",
-    "Guard",
-    "Guard",
-    "Suojav�li",
-    "Guard",
-    "Int.Guarda",
-    "���������",
-    "Guard",
-    "Guard",
-    "Guard",
-    "Protegir",
-    "������",
-    "Za�tita",
-    "Guard",
-    "Guard",
-    "Guard",
-    "Koruma",
-  },
-  { "Hierarchy",
-    "Hierarchie",
-    "Hierarhija",
-    "Hierarchy",
-    "Hierarchy",
-    "Hierarchy",
-    "Hi�rarchie",
-    "Hierarchy",
-    "Hierarkia",
-    "Hierarchia",
-    "Jerarqu�a",
-    "���������",
-    "Hierarchy",
-    "Ierarhie",
-    "Hierarchy",
-    "Jerarquia",
-    "��������",
-    "Hijerarhija",
-    "Hierarhia",
-    "Hierarki",
-    "Hierarchy",
-    "Hiyerar�i",
-  },
-  // Timer parameters:
-  { "Active",
-    "Aktiv",
-    "Aktivno",
-    "Attivo",
-    "Actief",
-    "Activo",
-    "Actif",
-    "Aktiv",
-    "Aktiivinen",
-    "Aktywny",
-    "Activo",
-    "������",
-    "Aktiv",
-    "Activ",
-    "Aktiv",
-    "Actiu",
-    "�����������",
-    "Aktivan",
-    "Aktiivne",
-    "Aktiv",
-    "Aktivn�",
-    "Aktif",
-  },
-  { "Channel",
-    "Kanal",
-    "Program",
-    "Canale",
-    "Kanaal",
-    "Canal",
-    "Cha�ne",
-    "Kanal",
-    "Kanava",
-    "Kana�",
-    "Canal",
-    "������",
-    "Kanal",
-    "Canal",
-    "Csatorna",
-    "Canal",
-    "�����",
-    "Program",
-    "Kanal",
-    "Kanal",
-    "Kan�l",
-    "Kanal",
-  },
-  { "Day",
-    "Tag",
-    "Dan",
-    "Giorno",
-    "Dag",
-    "Dia",
-    "Jour",
-    "Dag",
-    "P�iv�",
-    "Dzie�",
-    "D�a",
-    "�����",
-    "Dag",
-    "Ziua",
-    "Nap",
-    "Dia",
-    "����",
-    "Dan",
-    "P�ev",
-    "Dag",
-    "Den",
-    "G�n",
-  },
-  { "Start",
-    "Anfang",
-    "Za�etek",
-    "Inizio",
-    "Begin",
-    "Inicio",
-    "D�but",
-    "Start",
-    "Aloitus",
-    "Pocz�tek",
-    "Comienzo",
-    "����",
-    "B�rjar",
-    "�nceput",
-    "Kezdet",
-    "Inici",
-    "������",
-    "Po�etak",
-    "Start",
-    "Start",
-    "Za��tek",
-    "Ba�lang��",
-  },
-  { "Stop",
-    "Ende",
-    "Konec",
-    "Fine",
-    "Einde",
-    "Fim",
-    "Fin",
-    "Slutt",
-    "Lopetus",
-    "Koniec",
-    "Fin",
-    "�����",
-    "Slutar",
-    "Sf�r�it",
-    "V�ge",
-    "Fi",
-    "�����",
-    "Kraj",
-    "Stopp",
-    "Stop",
-    "Konec",
-    "Biti�",
-  },
-  { "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-    "",// TODO
-    "VPS",
-    "",// TODO
-    "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-    "",// TODO
-    "VPS ��������",
-    "VPS", // hrv
-    "VPS",
-    "VPS",
-    "VPS",
-    "VPS",
-  },
-  { "Priority",
-    "Priorit�t",
-    "Prioriteta",
-    "Priorita'",
-    "Prioriteit",
-    "Prioridade",
-    "Priorit�",
-    "Prioritet",
-    "Prioriteetti",
-    "Priorytet",
-    "Prioridad",
-    "�������������",
-    "Prioritet",
-    "Prioritate",
-    "Priorit�s",
-    "Prioritat",
-    "���������",
-    "Prioritet",
-    "Prioriteet",
-    "Prioritet",
-    "Priorita",
-    "�ncelik",
-  },
-  { "Lifetime",
-    "Lebensdauer",
-    "Veljavnost",
-    "Durata",
-    "Bewaarduur",
-    "Dura��o",
-    "Dur�e de vie",
-    "Levetid",
-    "Elinik�",
-    "Czas �ycia",
-    "Duraci�n",
-    "�������� ���������",
-    "Livstid",
-    "Timp de p�strare",
-    "�lettartam",
-    "Durada",
-    "���� ��������",
-    "Trajanje",
-    "Eluiga",
-    "Levetid",
-    "�ivotnost",
-    "�mr�",
-  },
-  { "File",
-    "Datei",
-    "Datoteka",
-    "Nome",
-    "Filenaam",
-    "Ficheiro",
-    "Fichier",
-    "Filnavn",
-    "Tiedosto",
-    "Plik",
-    "Fichero",
-    "������",
-    "Filnamn",
-    "Fi�ier",
-    "File",
-    "Arxiu",
-    "����",
-    "Datoteka",
-    "Fail",
-    "Fil",
-    "Soubor",
-    "K�t�k",
-  },
-  { "First day",
-    "Erster Tag",
-    "Prvi dan",
-    "Primo giorno",
-    "Eerste dag",
-    "Primeiro dia",
-    "Premier jour",
-    "F�rste dag",
-    "1. p�iv�",
-    "Pierwszy dzie�",
-    "Primer d�a",
-    "����� ����",
-    "F�rsta dag",
-    "Prima zi",
-    "Els� nap",
-    "Primer dia",
-    "������ ����",
-    "Prvi dan",
-    "Esimene p�ev",
-    "F�rste dag",
-    "Prvn� den",
-    "�lk g�n",
-  },
-  // Error messages:
-  { "Channel is being used by a timer!",
-    "Kanal wird von einem Timer benutzt!",
-    "Kanal je zavzet s terminom za snemanje!",
-    "Canale occupato da un timer!",
-    "Kanaal wordt gebruikt door een timer!",
-    "Canal a ser utilizador por um timer!",
-    "Cette cha�ne est en cours d'utilisation!",
-    "Kanalen er i bruk av en timer!",
-    "Kanava on ajastimen k�yt�ss�!",
-    "Kana� jest u�ywany przez timer!",
-    "�Hay una grabaci�n programada para este canal!",
-    "�� ������ ��������������� ��� �������������������!",
-    "Kanalen anv�nds av en timer!",
-    "Canalul este utilizat de un timer!",
-    "Az ad�t az id�z�t� haszn�lja!",
-    "Canal en �s per un temporitzador!",
-    "����� ����� ��������!",
-    "Program je trenutno zauzet terminom za snimanje",
-    "Kanal on taimeri kasutuses!",
-    "Kanal anvendes af en timer!",
-    "Kan�l je dr�en� �asova�em nahr�vek!",
-    "Kanal zamanlay�c�dan kullan�l�yor!",
-  },
-  { "Can't switch channel!",
-    "Kanal kann nicht umgeschaltet werden!",
-    "Ne morem preklopiti kanala!",
-    "Impossibile cambiare canale!",
-    "Kan geen kanaal wisselen!",
-    "N�o pode mudar de canal!",
-    "Impossible de changer de cha�ne!",
-    "Ikke mulig � skifte kanal!",
-    "Kanavan vaihtaminen ei mahdollista!",
-    "Nie mo�na prze��czy� kana�u!",
-    "�No se puede cambiar de canal!",
-    "������ �������� �������!",
-    "Om�jligt att byta kanal!",
-    "Nu pot comuta canalul!",
-    "Az ad�t nem lehet elkapcsolni",
-    "No puc canviar de canal!",
-    "���������� ����������� �����!",
-    "Ne mogu prebaciti program!",
-    "Kanali vahetus ei ole v�imalik!",
-    "Kan ikke skifte kanal!",
-    "Kan�l nelze p�epnout!",
-    "Kanala de�i�tirelemiyor!",
-  },
-  { "Timer is recording!",
-    "Timer zeichnet gerade auf!",
-    "Snemanje po terminu!",
-    "Registrazione di un timer in corso!",
-    "Timer is aan het opnemen!",
-    "Timer a gravar!",
-    "Enregistrement en cours!",
-    "Timer gj�r opptak!",
-    "Ajastintallennus k�ynniss�!",
-    "Timer nagrywa!",
-    "�Grabaci�n en curso!",
-    "������� ��������������� �������!",
-    "Timerstyrd inspelning p�g�r!",
-    "Timer-ul tocmai �nregistreaz�!",
-    "Felv�tel folyamatban van!",
-    "El temporitzador est� gravant!",
-    "���� ������ �� �������!",
-    "Snimanje po definiranom terminu!",
-    "Taimeriga salvestamine aktiivne!",
-    "Timer optager nu!",
-    "�asova� pr�v� nahr�v�!",
-    "Zamanlay�c� �ekim yap�yor!",
-  },
-  { "Error while accessing recording!",
-    "Fehler beim Ansprechen der Aufzeichnung!",
-    "Napaka pri dostopu do posnetka!",
-    "Errore nell'accedere alla registrazione!",
-    "Fout bij lezen opname!",
-    "Erro ao aceder � grava��o",
-    "Impossible d'acc�der � l'enregistrement",
-    "Feil under lesing av opptak!",
-    "Tallenteen toistaminen ep�onnistui!",
-    "Bl�d podczas dost�pu do nagrania!",
-    "�Error al acceder a la grabaci�n!",
-    "�������� ���� ���������� ��������!",
-    "Inspelningen g�r inte att l�sa!",
-    "Eroare la accesarea �nregistr�rii",
-    "Hiba a felv�tel hozz�f�r�s�n�l",
-    "Error a l'accedir a la gravaci�!",
-    "������ ������� � ������!",
-    "Gre�ka pri pristupanju snimke!",
-    "Salvestuse taasesitus eba�nnestus!",
-    "Fejl ved l�sning af optagelse!",
-    "Chyba p�i p��stupu k nahr�vk�m!",
-    "Kay�t okuma hatas�!",
-  },
-  { "Error while deleting recording!",
-    "Fehler beim L�schen der Aufzeichnung!",
-    "Napaka pri brisanju posnetka!",
-    "Errore nel cancellare la registrazione!",
-    "Fout bij verwijderen opname!",
-    "Erro enquanto apagava uma grava��o!",
-    "Erreur de suppression de l'enregistrement!",
-    "Feil under sletting av opptak!",
-    "Tallenteen poistaminen ep�onnistui!",
-    "Bl�d podczas usuwania nagrania!",
-    "�Error al borrar la grabaci�n!",
-    "����� ���� ��� �������� ��� �������!",
-    "Inspelningen g�r inte att ta bort!",
-    "Eroare la �tergerea �nregistr�rii!",
-    "Hiba a felv�tel t�rl�s�n�l!",
-    "Error a l'esborrar la gravaci�!",
-    "������ �������� ������!",
-    "Gre�ka pri brisanju snimke!",
-    "Salvestuse kustutamine eba�nnestus!",
-    "Fejl ved sletning af optagelse!",
-    "Chyba p�i maz�n� nahr�vky!",
-    "Kay�t silme hatas�!",
-  },
-  { "*** Invalid Channel ***",
-    "*** Ung�ltiger Kanal ***",
-    "*** Neznan kanal ***",
-    "*** Canale NON valido ***",
-    "*** Ongeldig kanaal ***",
-    "*** Canal Inv�lido! ***",
-    "*** Cha�ne invalide! ***",
-    "*** Ugyldig Kanal! ***",
-    "*** Virheellinen kanavavalinta! ***",
-    "*** Niepoprawny kana� ***",
-    "*** Canal no v�lido ***",
-    "*** ����� ������ ***",
-    "*** Felaktig kanal ***",
-    "*** Canal invalid ***",
-    "*** �rv�nytelen csatorna ***",
-    "*** Canal incorrecte ***",
-    "*** ������������ ����� ***",
-    "*** Neispravan program ***",
-    "*** Vigane kanal ***",
-    "*** Ugyldig kanal! ***",
-    "*** Neplatn� kan�l ***",
-    "*** Ge�ersiz kanal ***",
-  },
-  { "Upcoming VPS recording!",
-    "VPS-Aufnahme beginnt in K�rze!",
-    "Sledi VPS snemanje!",
-    "Registrazione VPS imminente!",
-    "",//TODO
-    "",//TODO
-    "Enregistrement VPS commence procha�nement",
-    "",//TODO
-    "VPS-tallennus on alkamassa!",
-    "Wkr�tce nagranie VPS!",
-    "",//TODO
-    "",//TODO
-    "strax VPS inspelning...",
-    "Urmeaz� o �nregistrare VPS!",
-    "VPS-felv�tel r�gt�n kezd�dik!",
-    "",//TODO
-    "VPS-������ ����� ��������",
-    "",//TODO
-    "VPS salvestamine tulekul!",
-    "VPS optagelse starter snart!",
-    "Brzo za�ne nahr�v�n� VPS!",
-    "VPS �ekim yak�nda ba�l�yor!",
-  },
-  { "No free DVB device to record!",
-    "Keine freie DVB-Karte zum Aufnehmen!",
-    "Ni proste DVB naprave za snemanje!",
-    "Nessuna periferica DVB disponibile per registrare!",
-    "Geen vrije DVB kaart om op te nemen!",
-    "Nenhuma placa DVB disponivel para gravar!",
-    "Pas de carte DVB disponible pour l'enregistrement!",
-    "Ingen ledige DVB enheter for opptak!",
-    "Ei vapaata DVB-viritint� tallennukselle!",
-    "Brak wolnej karty DVB do nagrywania!",
-    "�Ning�n dispositivo DVB disponible para grabar!",
-    "���������� DVB ������ ��� �������!",
-    "Det finns ingen ledig DVB enhet f�r inspelning!",
-    "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!",
-    "Nincs szabad DVB k�rtya a felv�telhez!",
-    "No hi ha cap dispositiu DVB lliure per gravar!",
-    "��� ���������� DVB-���������� ��� ������!",
-    "Nema slobodnog DVB ure�aja za snimanje!",
-    "Puudub vaba DVB seade salvestamiseks!",
-    "Ingen fri DVB enhed til optagelse!",
-    "��dn� DVB karta nen� voln� pro nahr�v�n�",
-    "Kullan�lmayan DVB kart� bulunmad�!",
-  },
-  { "Channel not available!",
-    "Kanal nicht verf�gbar!",
-    "Kanal ni razpolo�ljiv!",
-    "Canale non disponibile!",
-    "Kanaal niet beschikbaar",
-    "",//TODO
-    "Cha�ne non disponible!",
-    "",//TODO
-    "Kanava ei ole k�ytett�viss�!",
-    "Kana� nie jest dost�pny!",
-    "!Canal no disponible!",
-    "�� ������ ��� ����� ���������!",
-    "Kanalen �r inte tillg�nglig!",
-    "Canal indisponibil",
-    "Az ad� nem el�rhet�",
-    "Canal no disponible!",
-    "����� ����������!",
-    "Program nije dostupan!",
-    "Kanal ei ole k�ttesaadav!",
-    "Kanal er ikke tilg�ngelig!",
-    "Kan�l nen� dostupn�!",
-    "Kanal kullan�lam�yor!",
-  },
-  { "Channel settings are not unique!",
-    "Kanaleinstellungen sind nicht eindeutig!",
-    "Nastavitve kanala niso edinstvene!",
-    "Parametri canale non univoci!",
-    "Kanaalinstellingen zijn niet uniek!",
-    "",//TODO
-    "Caract�ristiques des cha�nes ne sont pas uniques",
-    "",//TODO
-    "Kanava-asetukset eiv�t ole yksil�lliset!",
-    "Ustawienia kana�u nie s� unikalne!",
-    "!Propiedades de canal duplicadas!",
-    "�� ��������� ��� �������� ����������������!",
-    "Kanalinst�llningarna �r ej unika!",
-    "Parametrii canalului nu sunt univoci!",
-    "Az ad�be�ll�t�sok nem egy�rtelm�ek",
-    "Propietats del canal duplicades!",
-    "��������� ������ �� ���������!",
-    "Parametri programa nisu jednozna�ni!",
-    "Kanaliseaded ei ole unikaalsed!",
-    "Kanalindstillinger er ikke entydige!",
-    "Nastaven� kan�l� nejsou unik�tn�!",
-    "Kanal ayarlar� belli de��l!",
-  },
-  { "Channel locked (recording)!",
-    "Kanal blockiert (zeichnet auf)!",
-    "Zaklenjen kanal (snemanje)!",
-    "Canale bloccato (in registrazione)!",
-    "Kanaal geblokkeerd (neemt op)!",
-    "Canal bloqueado (a gravar)!",
-    "Cha�ne verrouill�e (enregistrement en cours)!",
-    "Kanalen er l�st (opptak)!",
-    "Kanava lukittu (tallennus k�ynniss�)!",
-    "Kana� zablokowany (trwa nagrywanie)!",
-    "�Canal bloqueado (grabando)!",
-    "�� ������ ����� ������������ (������ �������)!",
-    "Kanalen �r l�st (inspelning p�g�r)!",
-    "Canal blocat (�nregistrare)!",
-    "Az ad� blokkolva (felv�tel)!",
-    "Canal bloquejat (gravant)!",
-    "����� ������������ (���� ������)!",
-    "Program blokiran (snimanje)!",
-    "Kanal lukus (salvestamine aktiivne)!",
-    "Kanal blokeret (optagelse i gang)",
-    "Kan�l je blokovan� (nahr�v� se)!",
-    "Kanal ge�ersiz (kay�t ediliyor)!",
-  },
-  { "Can't start Transfer Mode!",
-    "Transfer-Mode kann nicht gestartet werden!",
-    "Ne morem za�eti s prenosnim na�inom!",
-    "Impossibile iniziare la modalita' di trasferimento!",
-    "Kan Transfer-Mode niet starten",
-    "Imposs�vel iniciar modo de transfer�ncia!",
-    "Impossible d'utiliser le mode transfert!",
-    "Kan ikke starte transfer modus!",
-    "Siirtotilan aloitus ep�onnistui!",
-    "Nie mo�na uruchomi� trybu transferu!",
-    "�No se puede iniciar el modo de transferencia!",
-    "�������� ��������� ���������� ���������!",
-    "Kan inte starta Transfer Mode!",
-    "Nu pot porni modul de transfer!",
-    "Transfer-Mode nem ind�that�!",
-    "No puc iniciar el mode de transfer�ncia!",
-    "���������� �������� ����� ��������!", // ???
-    "Ne mogu zapo�eti 'prijenosni' na�in!",
-    "Siirdemooduse start eba�nnestus!",
-    "Kan ikke starte Transfer Mode!",
-    "Nelze za��t s p�enosem",
-    "Transfer mode ba�lat�lam�yor!",
-  },
-  { "No editing marks defined!",
-    "Keine Schnittmarken gesetzt!",
-    "Nobena prekinitvena to�ka ni definirana!",
-    "Nessun marcatore di modifica definito!",
-    "Geen bewerkingsmarkeringen gedefinieerd!",
-    "",//TODO
-    "Pas de marques d'�dition d�finies!",
-    "",//TODO
-    "Muokkausmerkinn�t puuttuvat!",
-    "Nie zdefiniowano znacznik�w monta�u!",
-    "�No se definieron marcas de edici�n!",
-    "��� ����� ������� ������ ������������",
-    "Det finns inga redigeringsm�rken",
-    "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare",
-    "A v�g�pont nincs kijel�lve",
-    "No hi ha marques d'edici� definides",
-    "�� ������ ����� ��� �������!",
-    "Nijedna prekidna to�ka nije postavljena!",
-    "Redigeerimise markerid puuduvad!",
-    "Der er ikke sat nogen redigeringsm�rker!",
-    "Nejsou definov�ny edita�n� zna�ky!",
-    "Kesim i�aretleri belirtilmemi�!",
-  },
-  { "Can't start editing process!",
-    "Schnitt kann nicht gestartet werden!",
-    "Ne morem za�eti urejanja!",
-    "Impossibile iniziare processo di modifica!",
-    "Kan niet beginnen met bewerken!",
-    "N�o pode iniciar a modifica��o!",
-    "Impossible de commencer le montage!",
-    "Kan ikke starte redigeringsprosessen!",
-    "Muokkauksen aloitus ep�onnistui!",
-    "Nie mo�na uruchomi� procesu edycji!",
-    "�No se puede iniciar el proceso de edici�n!",
-    "�������� ��������� ��� ������������!",
-    "Kan inte starta redigering!",
-    "Nu pot porni montajul �nregistr�rii!",
-    "A v�g�s nem ind�that�!",
-    "No puc iniciar el proc�s d'edici�!",
-    "���������� ������ ������ ������!",
-    "Ne mogu zapo�eti ure�ivanje!",
-    "Redigeerimise start eba�nnestus!",
-    "Kan ikke starte redigeringsprocessen!",
-    "Nelze za��t edita�n� proces!",
-    "Kesim ba�lat�lam�yor!",
-  },
-  { "Editing process already active!",
-    "Schnitt bereits aktiv!",
-    "Urejanje je �e aktivno!",
-    "Processo di modifica gia' attivo!",
-    "Bewerken is al actief!",
-    "Processo de modifica��o j� activo!",
-    "Montage d�j� en cours!",
-    "Redigeringsprosessen er allerede aktiv!",
-    "Muokkaus on jo k�ynniss�!",
-    "Proces edycji jest ju� aktywny!",
-    "�El proceso de edici�n ya est� activo!",
-    "����������� ��������� �� �������!",
-    "Redigeringen �r redan aktiv!",
-    "Montajul �nregistr�rii este deja activ!",
-    "A v�g�s m�r aktiv�lt!",
-    "Proc�s d'edici� iniciat anteriorment!",
-    "������� ������������ ��� �������!",
-    "Ure�ivanje je ve� aktivirano!",
-    "Redigeerimine juba aktiivne!",
-    "Redigeringsproces er allerede aktiv!",
-    "Edita�n� proces je ji� aktivn�!",
-    "Kesim hen�z aktif!",
-  },
-  { "Can't shutdown - option '-s' not given!",
-    "Ausschalten unm�glich - Option '-s' fehlt!",
-    "Zaustavitev ni izvedljiva - opcija '-s' ni podana!",
-    "Impossibile spegnere - parametro '-s' non passato!",
-    "Shutdown onmogelijk - Optie '-s' ontbreekt!",
-    "Imposs�vel desligar - falta a op��o '-s'!",
-    "Arr�t impossible - option '-s' absente!",
-    "Kan ikke sl� av - startet uten parameteret '-s'!",
-    "Sammutus ei onnistu - '-s' parametri puuttuu!",
-    "Nie mo�na wy��czy� - nie podano opcji '-s'!",
-    "�No se puede apagar - falta el par�metro '-s'!",
-    "�������� �� ����� �����������. ��������� � ���������� '-s'!",
-    "Kan inte avsluta, m�ste anv�nda parameter '-s'",
-    "Nu pot �nchide - vezi op�iunea '-s'",
-    "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!",
-    "No puc apagar, falta la opci� -s !",
-    "���������� ���������� - �� ����� �������� '-s'!",
-    "Ga�enje nemogu�e - nedostaje opcija '-s'!",
-    "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!",
-    "Kan ikke slukke - parameter '-s' ikke angivet!",
-    "Vypnut� nen� mo�n� - chb� volba '-s'!",
-    "Kapat�lam�yor - '-s' se�ene�i verilmemi�!",
-  },
-  { "Not enough disk space to start recording!",
-    "Nicht gen�gend Plattenplatz f�r Aufnahme!",
-    "Premalo prostora na disku za snemanje!",
-    "Spazio su disco insufficiente per registrare!",
-    "",//TODO
-    "",//TODO
-    "Espace disque insuffisant pour d�marrer l'enregistrement!",
-    "",//TODO
-    "Tallennustilan puute est�� tallennuksen!",
-    "Brak miejsca na dysku do nagrywania!",
-    "",//TODO
-    "",//TODO
-    "Otillr�cklingt diskutrymme f�r inspelning!",
-    "Insuficient spa�iul pe disc pentru �nregistrare!",
-    "Nincs elegend� hely a felv�telre",
-    "",//TODO
-    "������������ ����� �� ����� ��� ������ ������",
-    "",//TODO
-    "Ebapiisavalt kettaruumi salvestamise alustamiseks!",
-    "For lidt harddisk plads til optagelse!",
-    "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!",
-    "Kay�t i�in yeterince kapasite yok!",
-  },
-  { "Low disk space!",
-    "Platte beinahe voll!",
-    "Premalo prostora na disku!",
-    "Poco spazio su disco!",
-    "Disk bijna vol!",
-    "Espa�o em disco reduzido!",
-    "Disque presque plein!",
-    "Lite ledig diskplass!",
-    "Tallennustila loppumassa!",
-    "Ma�o miejsca na dysku!",
-    "�Poco espacio en disco!",
-    "� ������� �������� �� �������!",
-    "L�gt diskutrymme!",
-    "Spa�iul pe disc e foarte sc�zut!",
-    "A merev lemez majdnem tele!",
-    "Disc gaireb� ple!",
-    "������������ ����� �� �����!",
-    "Nedovoljno prostora na disku",
-    "K�vaketas t�is!",
-    "Kun lidt diskplads tilbage!",
-    "Disk bude brzy zapln�n!",
-    "Kay�t kapasitesi az!",
-  },
-  { "Opening CAM menu...",
-    "CAM-Men� wird ge�ffnet...",
-    "Odpiram CAM meni...",
-    "Apertura menu CAM...",
-    "CAM-menu wordt geopend...",
-    "",//TODO
-    "Ouverture du menu CAM",
-    "",//TODO
-    "Avataan CA-moduulin valikkoa...",
-    "Otwieram menu CAM...",
-    "Abriendo el men� CAM...",
-    "",//TODO
-    "�ppnar CAM menyn...",
-    "Deschid meniul CAM...",
-    "A CAM-men� nyit�s alatt...",
-    "",//TODO
-    "�������� ���� ������ ��������� ������� (CAM)",
-    "",//TODO
-    "CAM-men�� avamine...",
-    "�bner CAM menu...",
-    "Otev�r� se menu CAM...",
-    "CAM men�s� a��l�yor...",
-  },
-  { "Can't open CAM menu!",
-    "CAM-Men� kann nicht ge�ffnet werden!",
-    "Ne morem odpreti CAM menija!",
-    "Impossibile aprire il menu CAM!",
-    "Kan CAM-menu niet openen!",
-    "",//TODO
-    "Impossible d'ouvrir le menu CAM!",
-    "",//TODO
-    "CA-moduulin valikko ei saatavilla",
-    "Nie mo�na otworzy� menu CAM!",
-    "�No se puede abrir el men� CAM!",
-    "������� � �������� ��� CAM �����!",
-    "Det g�r inte att �ppna CAM menyn!",
-    "Nu pot deschide meniul CAM",
-    "A CAM-Men� nem nyithat�",
-    "No puc obrir el men� de la CAM!",
-    "���� CAM-������ ����������!",
-    "Ne mogu otvoriti CAM izbor!",
-    "Ei saa avada CAM men��d!",
-    "Kan ikke �bne CAM menuen!",
-    "Menu CAM nen� dostupn�",
-    "CAM men�s� a��lam�yor!",
-  },
-  { "CAM is in use - really reset?"
-    "CAM wird benutzt - wirklich zur�cksetzen?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "CAM ������������ - ������������� �����������?",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "Can't reset CAM!",
-    "Zur�cksetzen des CAM fehlgeschlagen!",
-    "Ne morem resetirati CAM-a!",
-    "Impossibile reimpostare il modulo CAM!",
-    "Kan CAM niet herstarten!",
-    "",//TODO
-    "Impossible de r�initialiser la CAM!",
-    "",//TODO
-    "CA-moduulin palautus alkutilaan ep�onnistui!",
-    "Nie mo�na zresetowa� CAM!",
-    "�No se puede reiniciar CAM!",
-    "������� � ��������� ��� CAM",
-    "Kan inte �terst�lla CAM!",
-    "Nu pot reseta CAM",
-    "A CAM-Reset nem siker�lt",
-    "No puc reiniciar la CAM!",
-    "������ ����������� CAM-������!",
-    "Ne mogu resetirati CAM",
-    "CAM mooduli taask�ivitus eba�nnestus!",
-    "Kan ikke nulstille CAM!",
-    "CAM modul nelze restartovat!",
-    "CAM s�f�rlanamad�!",
-  },
-  { "CAM reset",
-    "CAM zur�ckgesetzt",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "CAM ����������",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "CAM present",
-    "CAM vorhanden",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "CAM ������������",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "CAM ready",
-    "CAM bereit",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "CAM �����",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "CAM not responding!",
-    "CAM antwortet nicht!",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "CAM �� ��������",
-    "",//TODO
-    "",//TODO
-    "",//TODO
-    "",//TODO
-  },
-  { "Please enter %d digits!",
-    "Bitte geben Sie %d Ziffern ein!",
-    "Prosim vnesite %d �tevilk!",
-    "Inserire %d cifre!",
-    "Vul %d cijfers in!",
-    "",//TODO
-    "Veuillez entrer %d chiffres!",
-    "",//TODO
-    "Sy�t� %d numeroa!",
-    "Prosz� poda� %d cyfr!",
-    "�Escriba %d d�gitos!",
-    "",//TODO
-    "Mata in %d siffror!",
-    "V� rog introduce�i %d cifre!",
-    "�ss�n be %d sz�mot!",
-    "",//TODO
-    "������� %d �����",
-    "",//TODO
-    "Palun sisesta %d numbrit!",
-    "Indtast venligst %d cifre!",
-    "Pros�m vlo�te %d znak�!",
-    "L�tfen %d rakam veriniz!",
-  },
-  { "No audio available!",
-    "Kein Audio verf�gbar!",
-    "Zvok ni dosegljiv!",
-    "Nessun audio disponibile!",
-    "Geen audio beschikbaar!",
-    "",//TODO
-    "",//TODO
-    "Pas d'audio disponible!",
-    "��nen kieli ei ole valittavissa!",
-    "D�wi�k nie jest dost�pny!",
-    "�No hay audio disponible!",
-    "�� ���������� ����",
-    "Ljud saknas!",
-    "Lipse�te sunetul!",
-    "Hang nem lehets�ges!",
-    "",//TODO
-    "����������� ����!",
-    "Audio nedostupan",
-    "Audio k�ttesaamatu!",
-    "Ingen lyd tilg�ngelig!",
-    "Zvuk nen� dostupn�!",
-    "Audio yok!",
-  },
-  // Setup pages:
-  { "OSD",
-    "OSD",
-    "OSD",
-    "OSD",
-    "OSD",
-    "OSD",
-    "Affichage des menus",
-    "OSD",
-    "Kuvaruutun�ytt�",
-    "OSD",
-    "Men�s en pantalla",
-    "OSD",
-    "OSD",
-    "OSD",
-    "OSD",
-    "Informaci� en pantalla",
-    "����",
-    "OSD",
-    "Ekraanimen��",
-    "OSD",
-    "OSD",
-    "OSD",
-  },
-  { "EPG",
-    "EPG",
-    "Programski vodnik",
-    "Guida programmi EPG",
-    "EPG",
-    "EPG",
-    "Guide des programmes",
-    "Programoversikt",
-    "Ohjelmaopas",
-    "EPG",
-    "Gu�a de Programaci�n",
-    "������������ ������ ������������",
-    "EPG",
-    "EPG",
-    "EPG",
-    "Guia de Programes",
-    "�������",
-    "Pregled emisija (EPG)",
-    "EPG",
-    "EPG",
-    "EPG",
-    "EPG",
-  },
-  { "DVB",
-    "DVB",
-    "DVB",
-    "Scheda DVB",
-    "DVB",
-    "DVB",
-    "Cartes DVB",
-    "DVB-enheter",
-    "DVB",
-    "DVB",
-    "DVB",
-    "DVB",
-    "DVB",
-    "Dispozitiv DVB",
-    "DVB",
-    "Tarja DVB",
-    "DVB",
-    "DVB",
-    "DVB",
-    "DVB",
-    "DVB",
-    "DVB",
-  },
-  { "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "Configuraci� de l'LNB",
-    "���������",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-    "LNB",
-  },
-  { "CAM",
-    "CAM",
-    "CAM",
-    "Accesso condizionato CAM",
-    "CAM",
-    "CAM",
-    "Acc�s conditionnel",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CI Acc�s condicional",
-    "�������� ������",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-    "CAM",
-  },
-  { "Recording",
-    "Aufnahme",
-    "Snemanje",
-    "Registrazione",
-    "Opname",
-    "A gravar",
-    "Enregistrement",
-    "Opptak",
-    "Tallennus",
-    "Nagranie",
-    "Opciones de grabaci�n",
-    "�������",
-    "Inspelning",
-    "�nregistrare",
-    "Felv�tel",
-    "Opcions de Gravaci�",
-    "������",
-    "Snimanje",
-    "Salvestamine",
-    "Optagelse",
-    "Nahr�v�n�",
-    "Kay�t",
-  },
-  { "Replay",
-    "Wiedergabe",
-    "Predvajanje",
-    "Riproduzione",
-    "Afspelen",
-    "Replay",
-    "Lecture",
-    "Spill av",
-    "Toisto",
-    "Odtwarzanie",
-    "Opciones de reproducci�n",
-    "�����������",
-    "Uppspelning",
-    "Redare",
-    "Lej�tsz�s",
-    "Opcions de Reproducci�",
-    "���������������",
-    "Reprodukcija",
-    "Taasesitus",
-    "Afspilning",
-    "P�ehr�v�n�",
-    "Tekrar",
-  },
-  { "Miscellaneous",
-    "Sonstiges",
-    "Ostalo",
-    "Generici",
-    "Overig",
-    "Outros",
-    "Divers",
-    "Forskjellig",
-    "Sekalaiset",
-    "R�ne",
-    "Varios",
-    "�������",
-    "Diverse",
-    "Diverse",
-    "Egy�b",
-    "Miscel�l�nia",
-    "������",
-    "Ostalo",
-    "Muud s�tted",
-    "Diverse",
-    "R�zn�",
-    "Di�erler",
-  },
-  { "Plugins",
-    "Plugins",
-    "Vstavki",
-    "Plugins",
-    "Plugins",
-    "Plugins",
-    "Plugins",
-    "Plugins",
-    "Laajennokset",
-    "Wtyczki",
-    "Plugins",
-    "����������",
-    "Moduler",
-    "Plugin-uri",
-    "Plugins",
-    "Plugins",
-    "������ ����������",
-    "Dodaci (Plugins)",
-    "Laiendusmoodulid",
-    "Plugins",
-    "Moduly",
-    "Eklentiler",
-  },
-  { "Plugin",
-    "Plugin",
-    "Vstavek",
-    "Plugin",
-    "Plugin",
-    "Plugin",
-    "Plugin",
-    "Plugin",
-    "Laajennos",
-    "Wtyczka",
-    "Plugin",
-    "��������",
-    "Modul",
-    "Plugin (modul adi�ional)",
-    "Plugin",
-    "Plugin",
-    "������",
-    "Plugin",
-    "Laiendusmoodul",
-    "Plugin",
-    "Modul",
-    "Eklenti",
-  },
-  { "Restart",
-    "Neustart",
-    "Ponoven zagon",
-    "Riavvio",
-    "Herstart",
-    "Reiniciar",
-    "Red�marrer",
-    "Start p� nytt",
-    "K�ynnist� uudelleen",
-    "Restart",
-    "Reiniciar",
-    "������������",
-    "Omstart",
-    "Repornire",
-    "�jraind�t�s",
-    "Reiniciar",
-    "�������������",
-    "Restart sistema",
-    "Restart",
-    "Genstart",
-    "Restart",
-    "Yeniden ba�lat",
-  },
-  // Setup parameters:
-  { "Setup.OSD$Language",
-    "Sprache",
-    "Jezik",
-    "Lingua",
-    "Taal",
-    "Linguagem",
-    "Langue",
-    "Spr�k",
-    "Kieli",
-    "J�zyk",
-    "Idioma",
-    "������",
-    "Spr�k",
-    "Limba OSD",
-    "Nyelv",
-    "Idioma",
-    "����",
-    "Jezik",
-    "Keel",
-    "Sprog",
-    "Jazyk",
-    "Dil",
-  },
-  { "Setup.OSD$Skin",
-    "Oberfl�che",
-    "Preobleka",
-    "Stile interfaccia",
-    "Skin",
-    "",// TODO
-    "Skin",
-    "",// TODO
-    "Ulkoasu",
-    "Sk�rka",
-    "Skin",
-    "���������",
-    "Skin",
-    "Skin",
-    "Men� n�zet",
-    "",// TODO
-    "�����",
-    "Povr�ina",
-    "Kest",
-    "Skin",
-    "Vzhled",
-    "Y�zey",
-  },
-  { "Setup.OSD$Theme",
-    "Thema",
-    "Tema",
-    "Tema colori",
-    "Thema",
-    "",// TODO
-    "Th�me",
-    "",// TODO
-    "Teema",
-    "Motyw",
-    "Tema",
-    "����",
-    "Tema",
-    "Tem�",
-    "T�ma",
-    "",// TODO
-    "����",
-    "Tema",
-    "Teema",
-    "Tema",
-    "T�ma",
-    "Tema",
-  },
-  { "Setup.OSD$Left",
-    "Links",
-    "Levo",
-    "Sinistra",
-    "Links",
-    "",// TODO
-    "Gauche",
-    "",// TODO
-    "Vaakakeskitys",
-    "Od lewej",
-    "Izquierda",
-    "��������",
-    "V�nster",
-    "St�nga",
-    "Balra",
-    "",// TODO
-    "������ �����",
-    "Lijevo",
-    "Vasakule",
-    "Venstre",
-    "Vlevo",
-    "Sol",
-  },
-  { "Setup.OSD$Top",
-    "Oben",
-    "Zgoraj",
-    "In alto",
-    "Boven",
-    "",// TODO
-    "Haut",
-    "",// TODO
-    "Pystykeskitys",
-    "Od g�ry",
-    "Arriba",
-    "�����",
-    "�vre",
-    "Sus",
-    "Fent",
-    "",// TODO
-    "������ ������",
-    "Gore",
-    "�lesse",
-    "Top",
-    "Naho�e",
-    "�st",
-  },
-  { "Setup.OSD$Width",
-    "Breite",
-    "�irina",
-    "Larghezza OSD",
-    "Breedte",
-    "Largura",
-    "Largeur",
-    "Bredde",
-    "Leveys",
-    "Szeroko��",
-    "Anchura",
-    "������",
-    "Bredd",
-    "L��ime OSD",
-    "Sz�less�g",
-    "Amplada",
-    "������",
-    "�irina",
-    "Laius",
-    "Bredde",
-    "���ka",
-    "Geni�lik",
-  },
-  { "Setup.OSD$Height",
-    "H�he",
-    "Vi�ina",
-    "Altezza OSD",
-    "Hoogte",
-    "Altura",
-    "Hauteur",
-    "H�yde",
-    "Korkeus",
-    "Wysoko��",
-    "Altura",
-    "����",
-    "H�jd",
-    "�n�l�ime OSD",
-    "Magass�g",
-    "Al�ada",
-    "������",
-    "Visina",
-    "K�rgus",
-    "H�jde",
-    "V��ka",
-    "Y�kseklik",
-  },
-  { "Setup.OSD$Message time (s)",
-    "Anzeigedauer f�r Nachrichten (s)",
-    "�as prikaza sporo�ila (s)",
-    "Tempo del messaggio (s)",
-    "Weergave duur van berichten (s)",
-    "Mostrar contador (s)",
-    "Dur�e affichage message (s)",
-    "Tid meldinger skal vises (s)",
-    "Viestien esitysaika (s)",
-    "Czas trwania wiadomo�ci (s)",
-    "Duraci�n de los mensajes (sg)",
-    "������ �������� ��������� (�)",
-    "Tid f�r meddelanden (sek)",
-    "Timp afi�are mesaje (sec)",
-    "Inform�ci� felt�ntet�s�nek id�tartama",
-    "Durada dels missatges (s)",
-    "������������ ������ ��������� (���)",
-    "Vrijeme prikaza poruka (s)",
-    "Teate esitusaeg (s)",
-    "Tid beskeder skal vises (s)",
-    "�as zobrazen� zp�vy (s)",
-    "Mesaj g�sterme zaman� (sn)",
-  },
-  { "Setup.OSD$Use small font",
-    "Kleine Schrift benutzen",
-    "Uporabi male �rke",
-    "Utilizzare caratteri piccoli",
-    "Klein lettertype gebruiken",
-    "",// TODO
-    "Utiliser les petits caract�res",
-    "",// TODO
-    "K�yt� pieni� kirjasimia",
-    "U�ywaj ma�ej czcionki",
-    "Usar letra peque�a",
-    "������������� ������ ��������������",
-    "Anv�nd liten font",
-    "Utilizare fonturi mici",
-    "Kisbet�t haszn�lni",
-    "",// TODO
-    "������������ ������ �����",
-    "Koristi mala slova",
-    "V�ikese fondi kasutamine",
-    "Anvend lille skrift",
-    "Pou��vat mal� p�smo",
-    "K���k harf kullan",
-  },
-  { "never",
-    "nie",
-    "nikoli",
-    "mai",
-    "nooit",
-    "",// TODO
-    "jamais",
-    "",// TODO
-    "ei koskaan",
-    "nigdy",
-    "nunca",
-    "����",
-    "aldrig",
-    "niciodat�",
-    "soha",
-    "",// TODO
-    "�������",
-    "nikada",
-    "mitte kunagi",
-    "aldrig",
-    "nikdy",
-    "hi�",
-  },
-  { "skin dependent",
-    "je nach Oberfl�che",
-    "odvisno od preobleke",
-    "in base allo stile",
-    "skin afhankelijk",
-    "",// TODO
-    "d�pend du skin",
-    "",// TODO
-    "ulkoasun mukaan",
-    "zal. od sk�rki",
-    "seg�n skin",
-    "�������� ��� ��� ���������",
-    "skin beroende",
-    "dep. de skin",
-    "Men� n�zet�t�l f�gg�en",
-    "",// TODO
-    "�������� �����",
-    "ovisno o povr�ini",
-    "kestast s�ltuv",
-    "skin afh�ngig",
-    "podle vzhledu",
-    "y�zeye ba�imli",
-  },
-  { "always",
-    "immer",
-    "vedno",
-    "sempre",
-    "altijd",
-    "",// TODO
-    "toujours",
-    "",// TODO
-    "aina",
-    "zawsze",
-    "siempre",
-    "�����",
-    "alltid",
-    "�ntotdeauna",
-    "mindig",
-    "",// TODO
-    "������",
-    "uvijek",
-    "alati",
-    "altid",
-    "v�dy",
-    "hep",
-  },
-  { "Setup.OSD$Anti-alias",
-    "Kantengl�ttung",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "K�yt� reunan pehmennyst�",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "����������� �������",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Default font",
-    "Standard-Schriftart",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Oletuskirjasintyyppi",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "����������� ����",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Small font",
-    "Kleine Schriftart",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Pieni kirjasintyyppi",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������ ����",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Fixed font",
-    "Festbreiten-Schriftart",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Tasav�linen kirjasintyyppi",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������������� ����",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Default font size (pixel)",
-    "Standard-Schriftgr��e (pixel)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Oletuskirjasintyypin koko (px)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������ ����� ��� ���� (pixel)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Small font size (pixel)",
-    "Kleine Schriftgr��e (pixel)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Pienen kirjasintyypin koko (px)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������ ������� ����� (pixel)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Fixed font size (pixel)",
-    "Festbreiten-Schriftgr��e (pixel)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Tasav�lisen kirjasintyypin koko (px)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������ �������������� ����� (pixel)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.OSD$Channel info position",
-    "Kanalinfo-Position",
-    "Pozicija informacije o kanalu",
-    "Posizione informazioni canale",
-    "Kanaal info positie",
-    "Posi��o de info dos canais",
-    "Position infos cha�nes",
-    "Posisjon p� kanalinformasjon",
-    "Kanavatiedon sijainti",
-    "Pozycja informacji o kanale",
-    "Posici�n para informaci�n de canal",
-    "���� ����������� ��������",
-    "Placering av kanalinformation",
-    "Pozi�ia informa�iilor despre canal",
-    "Ad�sinform�ci� pozici�ja",
-    "Posici� de la informaci� del canal",
-    "��������� ���� ���������� � ������",
-    "Pozicija informacije o programu",
-    "Kanaliinfo asukoht",
-    "Placering af kanalinfo",
-    "Pozice informace o kan�lu",
-    "Kanal bilgi pozisyonu",
-  },
-  { "Setup.OSD$Channel info time (s)",
-    "Anzeigedauer f�r Kanalinfo (s)",
-    "�as prikaza podatka o kanalu (s)",
-    "Durata informazioni canale (s)",
-    "Duur tonen kanaal-informatie (s)",
-    "",// TODO
-    "Dur�e affichage infos cha�nes (s)",
-    "",// TODO
-    "Kanavatiedon esitysaika (s)",
-    "Czas trwania informacji o kanale (s)",
-    "Tiempo de informaci�n de canal (sg)",
-    "������ ��������� ����������� �������� �� (�)",
-    "Kanal information (s)",
-    "Durata afi��rii info-canal (s)",
-    "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)",
-    "",// TODO
-    "����� ���������� � ������ (���)",
-    "Vrijeme prikaza informacije o programu (s)",
-    "Kanaliinfo esitusaeg (s)",
-    "Tid kanalinfo skal vises (s)",
-    "�as zobr. informace o kan�lu (s)",
-    "Kanal bilgi g�sterme zaman� (sn)",
-  },
-  { "Setup.OSD$Info on channel switch",
-    "Info beim Kanalwechsel",
-    "Poka�i naziv kanala",
-    "Mostrare informazioni al cambio canale",
-    "Kanaal info tonen",
-    "Mostrar info ao mudar de Canal",
-    "Affichage progr. en cours",
-    "Info ved kanalskifte",
-    "N�yt� kanavatieto vaihdettaessa",
-    "Informacja przy zmianie kana�u",
-    "Mostrar info al cambiar de canal",
-    "����������� ���� ������ ��������",
-    "Information vid kanalbyte",
-    "Informa�ii la comutarea canalului",
-    "Inform�ci� az ad� v�lt�s�n�l",
-    "Informaci� del canvi de canal",
-    "���������� ���������� � ������",
-    "Informacije kod promjene kanala",
-    "Kanaliinfo n�itamine",
-    "Info ved kanalskift",
-    "Informace p�i zm�n� kan�lu",
-    "Kanal de�i�tirme bilgisi",
-  },
-  { "Setup.OSD$Timeout requested channel info",
-    "Angeforderte Kanalinfo schlie�en",
-    "�as prikaza informacije o kanalu",
-    "Scadenza informazioni canale richieste",
-    "", // TODO
-    "", // TODO
-    "Demande d'infos de cha�ne termin�e",
-    "", // TODO
-    "Sulje erikseen avattu kanavatieto",
-    "Czas oczekiwania na informacje",
-    "Auto-cerrar al solicitar info de canal",
-    "", // TODO
-    "Timeout f�r kanalinformation",
-    "Durata afi��rii informa�ii canal",
-    "A lek�rdezett ad�sinform�ci� bez�r�sa",
-    "", // TODO
-    "���������� � ������ �������",
-    "", // TODO
-    "Kanaliinfo kuvamise ajapiirang",
-    "Timeout ved anmodet kanal info",
-    "�asov� limit informace o kan�lu",
-    "Kanal bilginin zaman a��m�",
-  },
-  { "Setup.OSD$Scroll pages",
-    "Seitenweise scrollen",
-    "Drsni meni",
-    "Scorrere per pagine",
-    "Scrollen per pagina",
-    "Scroll da p�gina no menu",
-    "D�filement par pages",
-    "Rask rulling i menyer",
-    "Valikoiden vieritys sivuttain",
-    "Przesuwaj stronami",
-    "Deslizar p�ginas enteras",
-    "������ �������",
-    "Bl�ddra sidor",
-    "Deruleaz� pagini",
-    "Oldalank�nt l�ptetmi",
-    "Despla�ar p�gina sencera",
-    "��������� ������� ����",
-    "Listaj po stranicama",
-    "Lehek�lje kerimine",
-    "Scroll sidevis",
-    "Rolovat strany",
-    "Sayfa kayd�rma",
-  },
-  { "Setup.OSD$Scroll wraps",
-    "Rundum scrollen",
-    "Iz konca sko�i na za�etek",
-    "Scorrere riavvolgendo",
-    "Rondom scrollen",
-    "",// TODO
-    "D�filement rotatif",
-    "",// TODO
-    "Valikoiden vieritys ymp�ri",
-    "Skrajne pozycje s�siaduj�",
-    "Rotar arriba/abajo al deslizar",
-    "������ ����-����",
-    "Rulla texten",
-    "Derulare circular�",
-    "Korl�tlan l�ptet�s",
-    "",// TODO
-    "����������� ���������",
-    "S kraja sko�i na po�etak",
-    "Ridade kerimine",
-    "Scroll rundt",
-    "Z konce na za��tek",
-    "Sar�m kayd�rma",
-  },
-  { "Setup.OSD$Menu key closes",
-    "Menu-Taste schlie�t",
-    "Meni gumb zapre meni",
-    "Usare il bottone Menu per chiudere",
-    "",// TODO
-    "",// TODO
-    "Menu bouton ferm�",
-    "",// TODO
-    "Sulje valikkon�pp�imell�",
-    "Przycisk Menu zamyka",
-    "Cerrar al pulsar bot�n de men�",
-    "",// TODO
-    "Menyknappen st�nger",
-    "Tasta 'Meniu' �nchide",
-    "A men� gomb z�r",
-    "",// TODO
-    "������ ���� �������",
-    "",// TODO
-    "Sulgemine Men�� klahviga",
-    "Menu taste lukker",
-    "Kl�vesa Menu zav�r�",
-    "Men� d��mesi kapat�yor",
-  },
-  { "Setup.OSD$Recording directories",
-    "Aufnahmeverzeichnisse",
-    "Direktoriji za posnetke",
-    "Directory di registrazione",
-    "Opname directories",
-    "Directorias de grava��o",
-    "Dossiers d'enregistrements",
-    "Kataloger til opptak",
-    "N�yt� tallennehakemistot",
-    "Katalogi nagra�",
-    "Mostrar directorios de grabaciones",
-    "������� ��������",
-    "Kataloger f�r inspelningar",
-    "Directoare �nregistr�ri",
-    "Felv�telek list�ja",
-    "Gravacions en subcarpetes",
-    "�������� �������� �������",
-    "Imenik za snimke",
-    "Kausta nime salvestamine",
-    "Optagelser i foldere",
-    "Seznam nahr�vek",
-    "Kay�t dizinleri",
-  },
-  { "Setup.EPG$EPG scan timeout (h)",
-    "Zeit bis zur EPG-Aktualisierung (h)",
-    "�as do EPG pregleda (h)",
-    "Timeout scansione aggiorn. EPG (ore)",
-    "EPG-scan Timeout (h)",
-    "Expirou o EPG (h)",
-    "Inactivit� avant rech. EPG (h)",
-    "Ledig tid f�r EPG-s�k (h)",
-    "Ohjelmaoppaan taustap�ivitys (h)",
-    "Czas skanowania EPG (h)",
-    "Tiempo de exploraci�n de EPG (h)",
-    "������ ��������� �������� EPG �� ����",
-    "EPG s�kning timeout",
-    "Interval achizi�ie EPG (h)",
-    "Fennmaradt id� az EPG-�j�t�sig (h)",
-    "M�xim d'Hores a cercar per la Guia",
-    "�������� ������������ �������� (�)",
-    "Vrijeme do EPG pregleda (h)",
-    "EPG skaneerimise viide (h)",
-    "Tid f�r EPG skanning (t)",
-    "�asov� limit pro sn�m�n� EPG (h)",
-    "EPG tarama zaman a��m� (sa)",
-  },
-  { "Setup.EPG$EPG bugfix level",
-    "EPG-Fehlerbereinigung",
-    "Nivo za popravilo EPG napak",
-    "Livello correzione EPG",
-    "EPG foutcorrectieniveau",
-    "N�vel de correct��o EPG",
-    "Niveau de correction EPG",
-    "Niv� for EPG-feilretting",
-    "Ohjelmaoppaan korjaustaso",
-    "Stopie� poprawek b��d�w EPG",
-    "Nivel de correcci�n de EPG",
-    "������ ��������� ������ EPG",
-    "Niv� f�r EPG bugfix",
-    "Nivel corec�ie EPG",
-    "EPG hibaelh�r�t�s",
-    "Nivell de correcci� de la Guia",
-    "������� ��������� ������",
-    "Nivo popravka EPG gre�aka",
-    "EPG veaparanduse tase",
-    "Niveau for EPG fejlrettelse",
-    "EPG �rove� chyb",
-    "EPG hata ��z�mleme �l��s�",
-  },
-  { "Setup.EPG$EPG linger time (min)",
-    "Alte EPG-Daten anzeigen (min)",// TODO
-    "Prika�i stare EPG podatke (min)",
-    "Visualizzazione dati vecchi (min)",
-    "Oude EPG data tonen (min)",
-    "",// TODO
-    "Montrer l'EPG p�rim� (min)",
-    "",// TODO
-    "Vanha tieto n�kyy (min)",
-    "Czas przechowywania EPG (min)",
-    "Mostrar datos antiguos de EPG (m)",
-    "������� ������������ ����������� (�����)",
-    "Visa gammal information (min)",
-    "Date EPG expirate cel mult (min)",
-    "R�gi EPG adatok megmutat�sa (perc)",
-    "",// TODO
-    "�������� ���������� ������ (���)",
-    "Prika�i stare EPG podatke (min)",
-    "Vana EPG viide (min)",
-    "Vise gammel EPG info (min)",
-    "Ukazovat star�� EPG data (min)",
-    "Eski EPG g�ster (dak)",
-  },
-  { "Setup.EPG$Set system time",
-    "Systemzeit stellen",
-    "Nastavi sistemski �as",
-    "Settare orario automatico",
-    "Systeem klok instellen",
-    "Ajustar rel�gio do sistema",
-    "Ajuster l'heure du syst�me",
-    "Juster system-klokken",
-    "Tahdista kellonaika",
-    "Ustawiaj czas systemowy",
-    "Ajustar reloj de sistema",
-    "����������� ���� ����������",
-    "St�ll in systemtid",
-    "Potrive�te ceasul sistem",
-    "Az id� be�ll�t�sa",
-    "Ajustar l'hora del sistema",
-    "���������� ��������� �����",
-    "Podesi vrijeme sistema",
-    "Kella s�nkroniseerimine",
-    "Indstil system tid",
-    "Nastavit syst�mov� �as",
-    "Bilgisayar saatini ayarla",
-  },
-  { "Setup.EPG$Use time from transponder",
-    "Transponder f�r Systemzeit",
-    "Transponder za nastavitev �asa",
-    "Utilizzare orario da transponder",
-    "Gebruik transponder tijd voor systeem",
-    "Usar rel�gio do transponder",
-    "Utiliser l'heure de la cha�ne",
-    "Bruk klokke fra transponder",
-    "Vastaanota kellonaika transponderilta",
-    "U�yj czasu z transpondera",
-    "Transponder del que tomar la hora",
-    "������������ ����������� ����",
-    "Anv�nd klockan fr�n transponder",
-    "Preia ora din transponder",
-    "Id�h�z tartoz� Transponder",
-    "Usar el temps del m�ltiplex",
-    "������������ ����� ������������",
-    "Transponder za pode�avanje sata",
-    "Kella s�nkroniseerimise transponder",
-    "Anvend tid fra transponder",
-    "Pou��t �as z kan�lu",
-    "Bilgisayar saati i�in uydu al�c�-verici",
-  },
-  { "Setup.EPG$Preferred languages", // note the plural
-    "Bevorzugte Sprachen",
-    "Prednostni jeziki",
-    "Lingue preferite",
-    "Voorkeurstalen",
-    "",// TODO
-    "Langues pr�f�r�es",
-    "",// TODO
-    "Suosikkikielet",
-    "Preferowanych j�zyk�w",
-    "Idiomas preferidos",
-    "������������� �������",
-    "�nskade spr�k",
-    "Limbi preferate",
-    "Kedvenc nyelvek",
-    "",// TODO
-    "�������������� ����� (�������)",
-    "Preferirani jezici",
-    "Eelistatuid keeli",
-    "Foretrukne sprog",
-    "Preferovan� jazyky",
-    "Dil tercihleri",
-  },
-  { "Setup.EPG$Preferred language", // note the singular
-    "Bevorzugte Sprache",
-    "Prednostni jezik",
-    "Lingua preferita",
-    "Voorkeurstaal",
-    "",// TODO
-    "Langue pr�f�r�e",
-    "",// TODO
-    "Suosikkikieli",
-    "Preferowany j�zyk",
-    "Idioma preferido",
-    "������������ ������",
-    "�nskat spr�k",
-    "Limba preferat�",
-    "Kedvenc nyelv",
-    "",// TODO
-    "������",
-    "Preferirani jezik",
-    "Eelistatud keel",
-    "Foretrukket sprog",
-    "Preferovan� jazyk",
-    "Dil tercihi",
-  },
-  { "Setup.DVB$Primary DVB interface",
-    "Prim�res DVB-Interface",
-    "Primarna naprava",
-    "Scheda DVB primaria",
-    "Eerste DVB kaart",
-    "Interface DVB prim�rio",
-    "Carte DVB primaire",
-    "Hoved DVB-enhet",
-    "Ensisijainen DVB-sovitin",
-    "Pierwszy interfejs DVB",
-    "Interfaz DVB primario",
-    "����� DVB �����",
-    "Prim�r DVB enhet",
-    "Dispozitiv DVB primar",
-    "Els� DVB interface",
-    "Tarja DVB prim�ria",
-    "�������� DVB-����������",
-    "Primarni DVB ure�aj",
-    "Esmane DVB seade",
-    "Prim�r DVB enhed",
-    "Prim�rn� DVB interface",
-    "Primer DVB aray�z�",
-  },
-  { "Setup.DVB$Video display format",
-    "Video-Anzeigeformat",
-    "Format video prikaza",
-    "Formato di visualizz. video",
-    "Video display formaat",
-    "",//TODO
-    "Format d'affichage",
-    "",//TODO
-    "N�ytt�muoto",
-    "Format wy�wietlania obrazu",
-    "Formato de visualizaci�n",
-    "����� ����������� ������",
-    "Format f�r video display",
-    "Formatul red�rii video",
-    "K�perny�form�tum",
-    "",//TODO
-    "�������������� �����������",
-    "Format video prikaza",
-    "Video kuvamise formaat",
-    "Video display format",
-    "Form�t zobrazen� videa",
-    "Video g�r�nt� bi�imi",
-  },
-  { "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "��������������",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-    "pan&scan",
-  },
-  { "letterbox",
-    "Letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "���������",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-    "letterbox",
-  },
-  { "center cut out",
-    "Center-cut-out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "�������� �����",
-    "center cut out",
-    "center cut out",
-    "center cut out",
-    "dost�edu o��znout",
-    "center cut out",
-  },
-  { "Setup.DVB$Video format",
-    "Videoformat",
-    "Video format",
-    "Formato video",
-    "Videoformaat",
-    "Formato v�deo",
-    "Format vid�o",
-    "TV-Format",
-    "Kuvasuhde",
-    "Format obrazu",
-    "Formato de v�deo",
-    "����� ������",
-    "Video format",
-    "Format video",
-    "Video form�tum",
-    "Format del v�deo",
-    "������ �����",
-    "Video format",
-    "TV k�lgsuhe",
-    "Video format",
-    "Form�t videa",
-    "Video format�",
-  },
-  { "Setup.DVB$Use Dolby Digital",
-    "Dolby-Digital-Ton benutzen",
-    "Uporabljaj Dolby Digital",
-    "Dolby Digital",
-    "Dolby Digital gebruiken",
-    "",//TODO
-    "Utiliser le Dolby Digital",
-    "",//TODO
-    "K�yt� Dolby Digital -��nt�",
-    "U�ywaj Dolby Digital",
-    "Usar Dolby Digital",
-    "����� ���� Dolby Digital",
-    "Anv�nd Dolby Digital",
-    "Sunet Dolby Digital",
-    "Dolby-Digital hangot haszn�lni",
-    "",//TODO
-    "�������� Dolby Digital",
-    "Koristi Dolby Digital",
-    "Dolby Digital kasutamine",
-    "Anvend Dolby Digital",
-    "Pou��vat zvuk v Dolby Digital",
-    "Dolby Dijital ses kullan",
-  },
-  { "Setup.DVB$Update channels",
-    "Kan�le aktualisieren",
-    "Posodobi kanale",
-    "Aggiornare i canali",
-    "Kanalen actualiseren",
-    "",// TODO
-    "Mettre � jour les cha�nes",
-    "",// TODO
-    "P�ivit� kanavat",
-    "Aktualizuj kana�y",
-    "Actualizar canales",
-    "��������� ��������",
-    "Uppdatera kanaler",
-    "Actualizare canale",
-    "Ad�k aktualiz�l�sa",
-    "",// TODO
-    "��������� ��������� �������",
-    "Aktualiziraj programe",
-    "Kanalite uuendamine",
-    "Opdat�r kanaler",
-    "Aktualizace kan�l�",
-    "Kanallar� yenile",
-  },
-  { "names only",
-    "nur Namen",
-    "samo imena",
-    "solo nomi",
-    "alleen namen",
-    "",// TODO
-    "noms uniquement",
-    "",// TODO
-    "vain nimet",
-    "tylko nazwy",
-    "s�lo nombres",
-    "���� �������",
-    "bara namn",
-    "doar numele",
-    "kiz�r�lag nevek",
-    "",// TODO
-    "������ ��������",
-    "samo imena",
-    "ainult nimed",
-    "kun navne",
-    "jen n�zvy",
-    "s�rf isimler",
-  },
-  { "PIDs only",
-    "nur PIDs",
-    "samo PIDe",
-    "solo PID",
-    "",// TODO
-    "",// TODO
-    "PIDs uniquement",
-    "",// TODO
-    "vain PID:it",
-    "tylko PID-y",
-    "",// TODO
-    "",// TODO
-    "bara PIDs",
-    "Numai PID-uri",
-    "kiz�r�lag PID-k",
-    "",// TODO
-    "������ PID�",
-    "",// TODO
-    "ainult PID-id",
-    "kun PIDs",
-    "jen PIDs",
-    "s�rf PID'ler",
-  },
-  { "names and PIDs",
-    "Namen und PIDs",
-    "imena in PIDe",
-    "nomi e PID",
-    "namen en PIDs",
-    "",// TODO
-    "noms et PIDs",
-    "",// TODO
-    "nimet ja PID:it",
-    "nazwy i PID-y",
-    "nombres y PIDs",
-    "������� ��� PIDs",
-    "namn och PID",
-    "nume si PID-uri",
-    "nevek �s PID-k",
-    "",// TODO
-    "�������� � PID�",
-    "imena i identifikatore (PIDs)",
-    "nimi ja PID-id",
-    "navne og PIDs",
-    "n�zvy a PIDs",
-    "�simler ve PID'ler",
-  },
-  { "add new channels",
-    "neue Kan�le hinzuf�gen",
-    "dodaj nove programe",
-    "nuovi canali",
-    "nieuwe kanalen toevoegen",
-    "",// TODO
-    "ajouter cha�nes",
-    "",// TODO
-    "uudet kanavat",
-    "dodawaj nowe kana�y",
-    "a�adir canales",
-    "�������� ���� ��������",
-    "l�gg till nya kanaler",
-    "ad�ugare canale noi",
-    "�j ad�k hozz�ad�sa",
-    "",// TODO
-    "����� ������",
-    "dodaj nove programe",
-    "uute kanalite lisamine",
-    "tilf. ny kanaler",
-    "p�idat nov� kan�ly",
-    "yeni kanallar ekle",
-  },
-  { "add new transponders",
-    "neue Transponder hinzuf�gen",
-    "dodaj nove oddajnike",
-    "nuovi transponder",
-    "nieuwe transponders toevoegen",
-    "",// TODO
-    "ajouter transpondeurs",
-    "",// TODO
-    "uudet transponderit",
-    "dodawaj nowe transpondery",
-    "a�adir transponders",
-    "�������� ���� �����������",
-    "l�gg till nya transponders",
-    "ad�ugare transpondere noi",
-    "�j transponder hozz�ad�sa",
-    "",// TODO
-    "���. ������������",
-    "dodaj nove transpondere", // hrv TODO transponderi == odasilja�i?
-    "uute transponderite lisamine",
-    "tilf. ny transp.",
-    "p�idat nov� transpond�ry",
-    "yeni uydu al�c�-verici ekle",
-  },
-  { "Setup.DVB$Audio languages",  // note the plural
-    "Audio-Sprachen",
-    "Jeziki za zvok",
-    "Lingue per l'Audio",
-    "Audio talen",
-    "",//TODO
-    "Langues audio",
-    "",//TODO
-    "��nen kielet",
-    "J�zyk�w d�wi�ku",
-    "Idiomas de audio",
-    "������� ����",
-    "Antal ljudspr�k",
-    "Limbi sunet",
-    "Audio-nyelvek",
-    "",//TODO
-    "�������������� ����� (����)",
-    "Audio jezici",
-    "Audio keeli",
-    "Audio sprog (ant.)",
-    "Jazyky zvuku",
-    "Audio dilleri",
-  },
-  { "Setup.DVB$Audio language",  // note the singular
-    "Audio-Sprache",
-    "Jezik za zvok",
-    "Lingua per l'Audio",
-    "Audio taal",
-    "",//TODO
-    "Langue audio",
-    "",//TODO
-    "��nen kieli",
-    "J�zyk d�wi�ku",
-    "Idioma de audio",
-    "������ ����",
-    "Ljudspr�k",
-    "Limba sunetului",
-    "Audio-nyelv",
-    "",//TODO
-    "������",
-    "Audio jezik",
-    "Audio keel",
-    "Audio sprog",
-    "Jazyk zvuku",
-    "Audio dili",
-  },
-  { "Setup.LNB$SLOF (MHz)",
-    "SLOF (MHz)",
-    "Frekvenca preklopa (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "Limite de bandas LNB (MHz)",
-    "Limite de bandes LNB (MHz)",
-    "LO-grensefrekvens (MHz)",
-    "LNB-rajataajuus (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "Frecven�� comutare band�, SLOF (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "������� ������������ (SLOF) (���)",
-    "Frekv. preklopa SLOF (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-    "SLOF (MHz)",
-  },
-  { "Setup.LNB$Low LNB frequency (MHz)",
-    "Untere LNB-Frequenz (MHz)",
-    "Spodnja LNB-frek. (MHz)",
-    "Freq LO LNB (MHz)",
-    "Laagste LNB frequentie (MHz)",
-    "Frequ�ncia base LNB (MHz)",
-    "Fr�quence basse LNB (MHz)",
-    "LO-frekvens i lavb�ndet (MHz)",
-    "LNB-alataajuus (MHz)",
-    "Dolna cz�stotliwo�� LNB (MHz)",
-    "Frecuencia inferior del LNB (MHz)",
-    "���� LNB-��������� (MHz)",
-    "Undre LNB frekvens (MHz)",
-    "Frecvn�� LNB inferioar� (Mhz)",
-    "Als� LNB-frekvencia (MHZ)",
-    "Freq��ncia LNB baixa (MHz)",
-    "������ ������� ���������� (���)",
-    "Donja LNB frekv. (MHz)",
-    "Alumine (LO) LNB sagedus (MHz)",
-    "Nedre LNB frekvens (MHz)",
-    "Doln� frekvence LNB (MHz)",
-    "Alt LNB frekans� (MHz)",
-  },
-  { "Setup.LNB$High LNB frequency (MHz)",
-    "Obere LNB-Frequenz (MHz)",
-    "Zgornja LNB-frek. (MHz)",
-    "Freq HI LNB (MHz)",
-    "Hoogste LNB frequentie (MHz)",
-    "Frequ�ncia alta LNB (MHz)",
-    "Fr�quence haute LNB (MHz)",
-    "LO-frekvens i h�yb�ndet (MHz)",
-    "LNB-yl�taajuus (MHz)",
-    "G�rna cz�stotliwo�� LNB (MHz)",
-    "Frecuencia superior del LNB (MHz)",
-    "��� LNB-��������� (MHz)",
-    "�vre LNB frekvens (MHz)",
-    "Frecvn�� LNB superioar� (MHz)",
-    "Fels� LNB-frekvencia (MHZ)",
-    "Freq��ncia LNB alta (MHz)",
-    "������� ������� ���������� (���)",
-    "Gornja LNB frekv. (MHz)",
-    "�lemine (HI) LNB sagedus (MHz)",
-    "�vre LNB frekvens (MHz)",
-    "Horn� frekvence LNB (MHz)",
-    "�st LNB frekans� (MHz)",
-  },
-  { "Setup.LNB$Use DiSEqC",
-    "DiSEqC benutzen",
-    "Uporabi DiSEqC",
-    "Utilizza DiSEqC",
-    "DiSEqC gebruiken",
-    "Utilizar DiSEqC",
-    "Utiliser le DiSEqC",
-    "Bruk DiSEqC",
-    "K�yt� DiSEqC-kytkint�",
-    "U�ywaj DiSEqC",
-    "Utilizar DiSEqC",
-    "������������ DiSEqC",
-    "Anv�nd DiSEqC",
-    "Utilizare DiSEqC",
-    "DiSEqC haszn�lata",
-    "Utilitzar DiSEqC",
-    "������������ DiSEqC",
-    "Koristi DiSEqC",
-    "DiSEqC kasutamine",
-    "Anvend DiSEqC",
-    "Pou��vat DiSEqC",
-    "DiSEqC kullan",
-  },
-  { "Setup.Recording$Margin at start (min)",
-    "Vorlauf zum Timer-Beginn (min)",
-    "Premik za�etka snemanja (min)",
-    "Margine iniziale (min)",
-    "Tijd marge begin (min)",
-    "Margem inicial (min)",
-    "Marge ant�rieure (min)",
-    "Opptaksmargin start (min)",
-    "Aloitusmarginaali (min)",
-    "Margines na pocz�tku (min)",
-    "Comenzar grabaci�n antes (min)",
-    "��������� ������ ���� ���� (�����)",
-    "Marginal f�r start (min)",
-    "Marj� la pornire (min)",
-    "Id�eltol�d�s a kezd�sn�l (perc)",
-    "Marge d'inici de gravaci� (min)",
-    "���������� ������ ������ (���)",
-    "Rezerva na po�etku snimanja (min)",
-    "Salvestamise algusvaru (min)",
-    "Margin ved start (min)",
-    "Nahr�vat p�ed za��tkem (min)",
-    "Ba��nda tolerans (dak)",
-  },
-  { "Setup.Recording$Margin at stop (min)",
-    "Nachlauf am Timer-Ende (min)",
-    "Zamik konca snemanja (min)",
-    "Margine finale (min)",
-    "Tijd marge eind (min)",
-    "Margem final (min)",
-    "Marge post�rieure (min)",
-    "Opptaksmargin slutt (min)",
-    "Lopetusmarginaali (min)",
-    "Margines na ko�cu (min)",
-    "Acabar grabaci�n despu�s (min)",
-    "��������� ������ ��� ����� (�����)",
-    "Marginal f�r stopp (min)",
-    "Marj� la oprire (min)",
-    "Id�eltol�d�s a befejez�sn�l (perc)",
-    "Marge de fi de gravaci� (min)",
-    "������������ ��������� ������ (���)",
-    "Rezerva na kraju (min)",
-    "Salvestamise l�puvaru (min)",
-    "Margin ved stop (min)",
-    "Nahr�vat po konci (min)",
-    "Sonunda tolerans (dak)",
-  },
-  { "Setup.Recording$Primary limit",
-    "Prim�r-Limit",
-    "Primarna meja",
-    "Limite primario",
-    "Eerste grens",
-    "Limite Prim�rio",
-    "Limite primaire",
-    "Prioritetsgrense HovedDVB",
-    "Ensisijaisen sovittimen prioriteettiraja",
-    "Podstawowy limit",
-    "L�mite primario",
-    "�������� ����",
-    "Prim�r gr�ns",
-    "Limit� primar�",
-    "Prim�r-hat�r",
-    "L�mit primari",
-    "���. ��������� ������� ���. ����������",
-    "Standardno ograni�enje",
-    "Esmane prioriteet",
-    "Prim�r gr�nse",
-    "Prim�rn� limit",
-    "Primer limit",
-  },
-  { "Setup.Recording$Default priority",
-    "Default-Priorit�t",
-    "Privzeta prioriteta",
-    "Priorita' predefinita",
-    "Standaard prioriteit",
-    "Prioridade por defeito",
-    "Priorit� par d�faut",
-    "Normal prioritet (Timer)",
-    "Tallenteen oletusprioriteetti",
-    "Domy�lny priorytet",
-    "Prioridad por defecto",
-    "�������������� �������������",
-    "Normal prioritet",
-    "Prioritate implicit�",
-    "Default priority",
-    "Prioritat per defecte",
-    "��������� ������� �� ���������",
-    "Standardni prioritet",
-    "Vaikimisi prioriteet",
-    "Standard prioritet",
-    "V�choz� priorita",
-    "Ola�an priorite",
-  },
-  { "Setup.Recording$Default lifetime (d)",
-    "Default-Lebensdauer (d)",
-    "Privzeti �ivljenski �as (d)",
-    "Durata predefinita (gg)",
-    "Standaard levensduur (d)",
-    "Validade por defeito (d)",
-    "Dur�e de vie par d�faut (j)",
-    "Normal levetid timer (d)",
-    "Tallenteen oletuselinik� (d)",
-    "Domy�lny czas �ycia (d)",
-    "Duraci�n por defecto (d�as)",
-    "�������������� �������� ��������� (������)",
-    "Normal livstid (dagar)",
-    "Timp de p�strare predefinit (zile)",
-    "Default �lettartam",
-    "Durada predefinida",
-    "���� �������� ������ �� ��������� (�)",
-    "Standardno trajanje (d)",
-    "Salvestuse eluiga (p�evi)",
-    "Standard levetid (d)",
-    "V�choz� �ivotnost",
-    "Ola�an �ekim �mr� (g�n)",
-  },
-  { "Setup.Recording$Pause priority",
-    "Pause-Priorit�t",
-    "Prioriteta pavze",
-    "Priorita' di pausa",
-    "Pauze prioriteit",
-    "",// TODO
-    "Priorit� des pauses",
-    "",// TODO
-    "Taukotallenteen prioriteetti",
-    "Priorytet pauzy",
-    "Prioridad en modo pausa",
-    "������������� ������������",
-    "Prioritet f�r direktinspelning",
-    "Prioritate pauz�",
-    "Sz�net priorit�s",
-    "Prioritat de la pausa",
-    "��������� ����������� ���������",
-    "Prioritet pauze",
-    "Pausi prioriteet",
-    "Pause prioritet",
-    "Priorita p�eru�en�",
-    "Ola�an duraklama prioritesi",
-  },
-  { "Setup.Recording$Pause lifetime (d)",
-    "Pause-Lebensdauer (d)",
-    "�as pavze (d)",
-    "Durata pausa (gg)",
-    "Pauze levensduur (d)",
-    "",// TODO
-    "Dur�e de vie des pauses (j)",
-    "",// TODO
-    "Taukotallenteen elinik� (d)",
-    "Czas �ycia pauzy (d)",
-    "Duraci�n en modo pausa (d�as)",
-    "�������� �����������",
-    "Livstid f�r direktinspelning (dagar)",
-    "P�strarea emisiunilor 'pauzate' (zile)",
-    "Sz�net �lettartama",
-    "Durada de la pausa (d)",
-    "�������� ����������� ��������� (�)",
-    "Trajanje pauze (d)",
-    "Pausi eluiga (p�evi)",
-    "Pause levetid (d)",
-    "�ivotnost p�eru�en� (d)",
-    "Duraklama �mr� (g�n)",
-  },
-  { "Setup.Recording$Use episode name",
-    "Episodenname verwenden",
-    "Uporabi ime epizode",
-    "Usare nome episodio",
-    "Gebruik episode naam",
-    "Utilizar o nome do epis�dio",
-    "Utiliser le nom de l'�pisode",
-    "Bruk episodenavn",
-    "K�yt� jakson nime�",
-    "U�ywaj nazwy epizodu",
-    "Utilizar nombre de episodo",
-    "����� �������� ����������",
-    "Anv�nd episodnamn",
-    "Utilizeaz� numele episodului",
-    "Epiz�dn�v felhaszn�l�sa",
-    "Utilitzar el nom de l'episodi",
-    "������������ ����� �� ��������",
-    "Koristi ime epizode",
-    "Episoodi nime kasutamine",
-    "Anvend udsendelsesnavn",
-    "Pou��vat n�zev epizody",
-    "Episod ismini kullan",
-  },
-  { "Setup.Recording$Use VPS",
-    "VPS benutzen",
-    "Uporabi VPS",
-    "Usare VPS",
-    "VPS gebruiken",
-    "",// TODO
-    "Utiliser le VPS",
-    "",// TODO
-    "K�yt� VPS-toimintoa",
-    "U�ywaj VPS",
-    "Usar servicio VPS",
-    "����� VPS",
-    "Anv�nd VPS",
-    "Utilizeaz� VPS",
-    "VPS-t haszn�lni",
-    "",// TODO
-    "������������ ������� VPS",
-    "Koristi VPS",
-    "VPS-i kasutamine",
-    "Anvend VPS",
-    "Pou��vat VPS",
-    "VPS kullan",
-  },
-  { "Setup.Recording$VPS margin (s)",
-    "Zeitvorlauf bei VPS (s)",
-    "�asovna rezerva pri VPS (s)",
-    "Margine VPS",
-    "Marge VPS (s)",
-    "",// TODO
-    "Marge VPS",
-    "",// TODO
-    "VPS-toiminnon aloitusmarginaali (s)",
-    "Margines VPS (s)",
-    "Margen VPS (sg)",
-    "��������� VPS (�)",
-    "VPS marginal (s)",
-    "Marj� de timp la utilizare VPS (s)",
-    "Id�eltol�d�s VPS-n�l (s)",
-    "",// TODO
-    "�������� ����� VPS (���)",
-    "Vremenska rezerva kod VPS (s)",
-    "VPS-i algusvaru (s)",
-    "VPS margin (s)",
-    "�asov� rezerva pro VPS (s)",
-    "VPS tolerans (s)",
-  },
-  { "Setup.Recording$Mark instant recording",
-    "Direktaufzeichnung markieren",
-    "Ozna�i direktno snemanje",
-    "Marcare registrazione immediata",
-    "Direkte opnamen markeren",
-    "Marca de grava��o r�pida",
-    "Marquage enregistr. imm�diats",
-    "Markere direkteopptak",
-    "Merkitse pikatallenne",
-    "Zaznaczaj natychm. nagrywanie",
-    "Marcar grabaciones inmediatas",
-    "������� ��������� ��������",
-    "M�rk direktinspelning",
-    "Marcheaz� �nregistrare imediat�",
-    "Direktfelv�tel megjel�l�se",
-    "Marcar gravaci� instant�nia",
-    "�������� ��������� ������� ������",
-    "Ozna�i direktno snimanje",
-    "Otsesalvestuse m�rgistamine",
-    "Mark�r direkte optagelse",
-    "Ozna�it okam�it� nahr�vky",
-    "Derhal �ekimi i�aretle",
-  },
-  { "Setup.Recording$Name instant recording",
-    "Direktaufzeichnung benennen",
-    "Ime za direktno snemanje",
-    "Nome registrazione immediata",
-    "Naam direkt-opname",
-    "Nome de grava��o r�pida",
-    "Noms enregistr. imm�diats",
-    "Navngi direkteopptak",
-    "Nime� pikatallenne",
-    "Nazywaj natychm. nagrywanie",
-    "Nombrar grabaciones inmediatas",
-    "�������� ��������� ��������",
-    "Namnge direktinspelning",
-    "Nume �nregistrare imediat�",
-    "Direktfelv�tel megnevez�se",
-    "Anomenar gravacions instant�nies",
-    "����� ���������� ������ �������",
-    "Imenuj direktno snimanje",
-    "Otsesalvestuse nimi",
-    "Navngiv direkte optagelse",
-    "Pojmenovat okam�it� nahr�vky",
-    "Derhal �ekimi isimlendir",
-  },
-  { "Setup.Recording$Instant rec. time (min)",
-    "Dauer der Direktaufzeichnung (min)",
-    "�as direktnega snemanja (min)",
-    "Tempo registrazione immediata (min)",
-    "Duur van de directe opname (min)",
-    "",//TODO
-    "Dur�e enregistr. imm�diat (min)",
-    "",//TODO
-    "Pikatallennuksen kesto (min)",
-    "Czas natychm. nagrywania (min)",
-    "Tiempo de grabaci�n inmediata (min)",
-    "�������� ��������� �������� (�����)",
-    "Direktinspelning l�ngd (min)",
-    "Timpul de �nregistare imediat� (min)",
-    "Felv�tel id�tartama (perc)",
-    "Temps de gravaci� instant�nia (min)",
-    "������������ ������ ������ (���)",
-    "Trajanje direktnog snimanja (min)",
-    "Otsesalvestuse kestus (min)",
-    "L�ngde af direkte optagelse (min)",
-    "D�lka okam�it�ho nahr�v�n� (min)",
-    "Derhal �ekim s�resi (dak)",
-  },
-  { "Setup.Recording$Max. video file size (MB)",
-    "Max. Videodateigr��e (MB)",
-    "Najve�ja velikost datoteke (MB)",
-    "Dimensione massima file video (MB)",
-    "Maximale omvang video file (MB)",
-    "Tamanho m�ximo dos ficheiros (MB)",
-    "Taille maxi des fichiers (MB)",
-    "Maksimal st�rrelse p� videofiler (MB)",
-    "Suurin tiedostokoko (Mt)",
-    "Maksymalny rozmiar pliku (MB)",
-    "Tama�o m�ximo de fichero (MB)",
-    "������� ������� ������� (MB)",
-    "Maximal filstorlek f�r inspelning (MB)",
-    "Dimensiune maxim� a fi�ierului video (MB)",
-    "Max. video File-terjedelem (MB)",
-    "Mida m�xima de l'arxiu (MB)",
-    "����. ������ ���������� (��)",
-    "Maksimalna veli�ina datoteke (MB)",
-    "Maksimaalne failisuurus (MB)",
-    "Max. video filst�rrelse (MB)",
-    "Maxim�ln� velikost nahr�vky (MB)",
-    "Maksimum Video k�t�k b�y�kl�g� (MB)",
-  },
-  { "Setup.Recording$Split edited files",
-    "Editierte Dateien aufteilen",
-    "Razdeli urejene datoteke",
-    "Dividi i file modificati",
-    "Bewerkte files opdelen",
-    "Quebrar ficheiros",
-    "S�parer les s�quences �dit�es",
-    "Splitt redigerte filer",
-    "Jaottele muokatut tallenteet",
-    "Dziel edytowane pliki",
-    "Partir ficheros editados",
-    "����������� �������������� �������",
-    "Dela upp redigerade filer",
-    "Separare fi�iere montate",
-    "Feldolgozott File-k feloszt�sa",
-    "Separar arxius",
-    "������ ����������������� �����",
-    "Podijeli ure�ene datoteke",
-    "Redigeeritud failide t�keldamine",
-    "Opdel redigerede filer",
-    "D�lit editovan� soubory",
-    "D�zenlenmi� k�t�kleri ay�r",
-  },
-  { "Setup.Replay$Multi speed mode",
-    "Mehrstufiger Vor-/R�cklauf",
-    "Re�im z ve� hitrostmi",
-    "Modalita' multispeed",
-    "Multi-speed mode",
-    "Modo de multi-speed",
-    "Mode multi-vitesses",
-    "Multispeed modus",
-    "K�yt� toiston moninopeustilaa",
-    "Tryb wielopr�dko�ciowy",
-    "Modo multi-velocidad",
-    "������� ��������� ���������",
-    "Multispeed mode",
-    "Mod multi-vitez�",
-    "MultiSpeed funkci�",
-    "Mode de multivelocitat",
-    "��������������� �����",
-    "MultiSpeed na�in",
-    "Multi-kiiruse moodus",
-    "Multi hastighedsmodus",
-    "V�cerychlostn� m�d",
-    "Katl� h�z sarma",
-  },
-  { "Setup.Replay$Show replay mode",
-    "Wiedergabestatus anzeigen",
-    "Prika�i re�im predvajanja",
-    "Mostrare modalita' riproduzione",
-    "Weergave mode aangeven",
-    "Mostrar modo de replay",
-    "Affichage mode de lecture",
-    "Vis avspillingsmodus",
-    "N�yt� toiston tila",
-    "Pokazuj tryb odtwarzania",
-    "Mostrar modo de reproducci�n",
-    "������� ���������� ������������",
-    "Visa uppspelningsl�ge",
-    "Afi�eaz� redarea",
-    "Lej�tsz�s felt�ntet�se",
-    "Mostrar mode de reproducci�",
-    "���������� ����� ���������������", // ???
-    "Prika�i na�in prikazivanja",
-    "Korduse moodus",
-    "Vis afspilningsmodus",
-    "Zobrazit re�im p�ehr�v�n�",
-    "G�steri� bilgisi",
-  },
-  { "Setup.Replay$Resume ID",
-    "Wiedergabe-ID",
-    "ID za predvajanje",
-    "ID di rispristino",
-    "Hervattings ID",
-    "Resume ID",// TODO
-    "ID de reprise",
-    "Resume ID",// TODO
-    "Tallenteen paluutunniste",
-    "ID wznowienia",
-    "ID de continuaci�n",
-    "ID ������������",
-    "�teruppta ID",
-    "Identificator continuare",
-    "Lej�tsz�s ID",
-    "ID de Continuar",
-    "ID ���������������", // ???
-    "ID nastavka",
-    "J�tkamise ID",
-    "Genoptagelses ID",
-    "ID obnoven�",
-    "G�steri� ID'si",
-  },
-  { "Setup.Miscellaneous$Min. event timeout (min)",
-    "Br�ckenzeit zwischen Timern (min)",
-    "Najmanj�i �as dogodka (min)",
-    "Scadenza minima evento (min)",
-    "Minimale event time-out (min)",
-    "Per�odo m�nimo de pausa (min)",
-    "MinEventTimeout (min)",
-    "Minste hendelsespause (min)",
-    "Tapahtuman odotusaika (min)",
-    "Minimalny czas audycji (min)",
-    "Tiempo m�n. antes de un evento (m)",
-    "��������� ������ ���������� (�����)",
-    "Minsta h�ndelse-pause (min)",
-    "Durat� minim� emisiuni (min)",
-    "Id�zit�sek k�z�tti id�tartam (perc)",
-    "Temps m�nim en pausa (min)",
-    "���. ����� �������� ������� (���)",
-    "Minimalno vrijeme pauze",
-    "Min. s�ndmuse kestus (min)",
-    "Mindste h�ndelsespause (min)",
-    "Min. pauza mezi ud�lostmi (min)",
-    "Minimum olay zaman a��m� (dak)",
-  },
-  { "Setup.Miscellaneous$Min. user inactivity (min)",
-    "VDR ausschalten bei Inaktivit�t (min)",
-    "Najmanj�i �as neaktivnosti (min)",
-    "Periodo minimo di inattivita' (min)",
-    "Minimum gebruikers inactiviteit (min)",
-    "Per�odo m�nimo de inactividade (min)",
-    "Dur�e minimale d'inact. (min)",
-    "Minimumstid med inaktivitet (min)",
-    "K�ytt�j�toiminnon odotusaika (min)",
-    "Minimalny czas nieaktywno�ci (min)",
-    "Tiempo m�n. de inactividad (m)",
-    "��������� ������ �������� (�����)",
-    "Minsta anv�ndar-inaktivitet (min)",
-    "Durata minim� de inactivitate (min)",
-    "VDR le�ll haszn�lat n�lk�l (perc)",
-    "Temps m�nim d'inactivitat (min)",
-    "���. ����� �������� ����� (���)",
-    "Minimalno vrijeme neaktivnosti (min)",
-    "Min. kasutaja tegevusetus (min)",
-    "Min. bruger inaktivitet (min)",
-    "�asov� limit neaktivnosti (min)",
-    "Minimum kullan�c� hareketsizli�i (dak)",
-  },
-  { "Setup.Miscellaneous$SVDRP timeout (s)",
-    "SVDRP trennen bei Inaktivit�t (s)",
-    "SVDRP �as neaktivnosti (s)",
-    "Scadenza SVDRP (s)",
-    "SVDRP Timeout (s)",
-    "Timeout SVDRP (s)",
-    "Temps maxi SVDRP (s)",
-    "Ubrukt SVDRP-levetid (s)",
-    "SVDRP-komennon odotusaika (s)",
-    "Czas oczekiwania na SVDRP (s)",
-    "Tiempo de espera de SVDRP (sg)",
-    "SVDRP ������� (�)",
-    "SVDRP Timeout (s)",
-    "Timeout SVDRP (sec)",
-    "SVDRP sz�tkapcsol haszn�lat n�lk�l(s)",
-    "SVDRP Timeout (s)",
-    "�������� ������ ����. SVDRP (���)",
-    "SVDRP vrijeme neaktivnosti",
-    "SVDRP ooteaeg (s)",
-    "SVDRP timeout (s)",
-    "�asov� limit SVDRP (s)",
-    "SVDRP zaman a��m� (sn) ",
-  },
-  { "Setup.Miscellaneous$Zap timeout (s)",
-    "Mindestzeit f�r Kanalhistorie (s)",
-    "�as ugla�evanja (s)",
-    "Scadenza Zapping (s)",
-    "Zap timeout (s)",
-    "",// TODO
-    "Prise en compte cha�ne (s)",
-    "",// TODO
-    "Kanavavalinnan odotusaika (s)",
-    "Czas oczekiwania na zap (s)",
-    "Considerar canal como visto (sg)",
-    "������� ������� (�)",
-    "Zap timeout(s)",
-    "Interval zapping (s)",
-    "Ad�sv�lt�s ideje (s)",
-    "",// TODO
-    "�������� ������������ ������ (���)",
-    "",// hrv TODO
-    "Kanalivahetuse ooteaeg (s)",
-    "Zap timeout (s)",
-    "�asov� limit Zap (s)",
-    "Kanal de�i�tirme zaman a��m� (sn)",
-  },
-  { "Setup.Miscellaneous$Channel entry timeout (ms)",
-    "Zeitlimit f�r Kanaleingabe (ms)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "Kanavasy�tteen odotusaika (ms)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "������ ������� ��� ����� ������ (ms)",
-    "",// TODO
-    "",// TODO
-    "",// TODO
-    "",// TODO
-  },
-  { "Setup.Miscellaneous$Initial channel",
-    "Kanal beim Einschalten",
-    "Privzeti kanal",
-    "Canale iniziale",
-    "",// TODO
-    "",// TODO
-    "Cha�ne initiale",
-    "",// TODO
-    "Kanava k�ynnistett�ess�",
-    "Pocz�tkowy kana�",
-    "",// TODO
-    "",// TODO
-    "Kanal vid uppstart",
-    "Canalul de pornire",
-    "Ad�s a bekapcsol�sn�l",
-    "",// TODO
-    "����� ��� ���������",
-    "",// TODO
-    "Kanal k�ivitamisel",
-    "Kanal ved opstart",
-    "Kan�l po spu�t�n�",
-    "A��l��daki kanal",
-  },
-  { "Setup.Miscellaneous$Initial volume",
-    "Lautst�rke beim Einschalten",
-    "Privzeta glasnost",
-    "Volume iniziale",
-    "",// TODO
-    "",// TODO
-    "Volume initial",
-    "",// TODO
-    "��nenvoimakkuus k�ynnistett�ess�",
-    "Pocz�tkowa g�o�no��",
-    "",// TODO
-    "",// TODO
-    "Ljudstyrka vid uppstart",
-    "Volumul la pornire",
-    "Hanger� a bekapcsol�sn�l",
-    "",// TODO
-    "��������� ��� ���������",
-    "",// TODO
-    "Helitugevus k�ivitamisel",
-    "Lydstyrke ved opstart",
-    "Hlasitost po spu�t�n�",
-    "A��l��daki ses",
-  },
-  { "Setup.Miscellaneous$as before",
-    "wie vorher",
-    "kot prej",
-    "come prima",
-    "",// TODO
-    "",// TODO
-    "comme avant",
-    "",// TODO
-    "edellinen",
-    "jak ostatnio",
-    "",// TODO
-    "",// TODO
-    "som f�rut",
-    "ca mai �nainte",
-    "ahogy az el�bb",
-    "",// TODO
-    "��� ������",
-    "",// TODO
-    "nagu enne",
-    "som f�r",
-    "jako naposledy",
-    "�nceki gibi",
-  },
-  // The days of the week:
-  { "MTWTFSS",
-    "MDMDFSS",
-    "PTSCPSN",
-    "LMMGVSD",
-    "MDWDVZZ",
-    "STQQSSD",
-    "LMMJVSD",
-    "MTOTFLS",
-    "MTKTPLS",
-    "PW�CPSN",
-    "LMXJVSD",
-    "�������",
-    "MTOTFLS",
-    "LMMJVSD",
-    "HKSCPSV",
-    "LMCJVSG",
-    "���ǿ��",
-    "PUS�PSN", // hrv
-    "ETKNRLP",
-    "MTOTFLS",
-    "PUS�PSN",
-    "PS�PCCP",
-  },
-  { "MonTueWedThuFriSatSun", // must all be 3 letters!
-    "MonDieMitDonFreSamSon",
-    "PonTorSreCetPetSobNed",
-    "LunMarMerGioVenSabDom",
-    "MaaDinWoeDonVryZatZon",
-    "SegTerQuaQuiSexSabDom",
-    "LunMarMerJeuVenSamDim",
-    "ManTirOnsTorFreL�rS�n",
-    "Ma Ti Ke To Pe La Su ",
-    "PonWto�roCzwPi�SobNie",
-    "LunMarMieJueVieSabDom",
-    "������������������K��",
-    "M�nTisOnsTorFreL�rS�n",
-    "LunMarMieJoiVinS�mDum",
-    "H�tKedSzeCs�P�nSzoVas",
-    "Dl Dm Dc Dj Dv Ds Dg ",
-    "��ݲ�������ҿ����Ѳ��",
-    "PonUtoSri�etPetSubNed", // hrv
-    " E  T  K  N  R  L  P ",
-    "ManTirOnsTorFreL�rS�n",
-    "Po �t St �t P� So Ne ",
-    "PztSal�arPerCumCmtPaz",
-  },
-  { "Monday",
-    "Montag",
-    "ponedeljek",
-    "Luned�",
-    "maandag",
-    "Segunda",
-    "Lundi",
-    "Manday",
-    "Maanantai",
-    "poniedzia�ek",
-    "Lunes",
-    "�������",
-    "M�ndag",
-    "Luni",
-    "H�tf�",
-    "Dilluns",
-    "�����������",
-    "Ponedjeljak",
-    "Esmasp�ev",
-    "Mandag",
-    "Pond�l�",
-    "Pazartesi",
-  },
-  { "Tuesday",
-    "Dienstag",
-    "Torek",
-    "Marted�",
-    "Dinsdag",
-    "Ter�a",
-    "Mardi",
-    "Tirsday",
-    "Tiistai",
-    "Wtorek",
-    "Martes",
-    "�����",
-    "Tisdag",
-    "Mar�i",
-    "Kedd",
-    "Dimarts",
-    "�������",
-    "Utorak",
-    "Teisip�ev",
-    "Tirsdag",
-    "�ter�",
-    "Sal�",
-  },
-  { "Wednesday",
-    "Mittwoch",
-    "sreda",
-    "mercoled�",
-    "woensdag",
-    "Quarta",
-    "Mercredi",
-    "Onsday",
-    "Keskiviikko",
-    "�roda",
-    "Mi�rcoles",
-    "�������",
-    "Onsdag",
-    "Miercuri",
-    "Szerda",
-    "Dimecres",
-    "�����",
-    "Srijeda",
-    "Kolmap�ev",
-    "Onsdag",
-    "St�eda",
-    "�ar�amba",
-  },
-  { "Thursday",
-    "Donnerstag",
-    "�etrtek",
-    "Gioved�",
-    "Donderdag",
-    "Quinta",
-    "Jeudi",
-    "Torsdag",
-    "Torstai",
-    "Czwartek",
-    "Jueves",
-    "������",
-    "Torsdag",
-    "Joi",
-    "Cs�t�rt�k",
-    "Dijous",
-    "�������",
-    "�etvrtak",
-    "Neljap�ev",
-    "Torsdag",
-    "�tvrtek",
-    "Per�embe",
-  },
-  { "Friday",
-    "Freitag",
-    "Petek",
-    "Venerd�",
-    "Vrijdag",
-    "Sexta",
-    "Vendredi",
-    "Fredag",
-    "Perjantai",
-    "Pi�tek",
-    "Viernes",
-    "���������",
-    "Fredag",
-    "Vineri",
-    "P�ntek",
-    "Divendres",
-    "�������",
-    "Petak",
-    "Reede",
-    "Fredag",
-    "P�tek",
-    "Cuma",
-  },
-  { "Saturday",
-    "Samstag",
-    "Sobota",
-    "Sabato",
-    "Zaterdag",
-    "S�bado",
-    "Samedi",
-    "L�rdag",
-    "Lauantai",
-    "Sobota",
-    "S�bado",
-    "�������",
-    "L�rdag",
-    "S�mb�t�",
-    "Szombat",
-    "Dissabte",
-    "�������",
-    "Subota",
-    "Laup�ev",
-    "L�rdag",
-    "Sobota",
-    "Cumartesi",
-  },
-  { "Sunday",
-    "Sonntag",
-    "Nedelja",
-    "Domenica",
-    "Zondag",
-    "Domingo",
-    "Dimanche",
-    "S�ndag",
-    "Sunnuntai",
-    "Niedziela",
-    "Domingo",
-    "�������",
-    "S�ndag",
-    "Duminic�",
-    "Vas�rnap",
-    "Diumenge",
-    "�����������",
-    "Nedjelja",
-    "P�hap�ev",
-    "S�ndag",
-    "Ned�le",
-    "Pazar",
-  },
-  // The allowed characters in strings:
-  { " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
-    " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@",
-    " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@",
-    " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.#~,/_@",
-    " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������",
-    "",// TODO
-    " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@",
-    "",// TODO
-    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
-    " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.#~,/_@",
-    " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@",
-    " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz",
-    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
-    " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@",
-    " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~,/_@",
-    " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~,/_@�",
-    " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@",
-    " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@", // hrv
-    " abcdefghijklmnopqrs�z�tuvw����xy�0123456789-.#~,/_@",
-    " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@",
-    " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.#~,/_@",
-    " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.#~,/_@",
-  },
-  // The character maps for entering letters via the numeric keys:
-  { " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
-    " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
-    " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9",
-    " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9",
-    "",//TODO
-    "",//TODO
-    " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9",
-    "",//TODO
-    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
-    " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��",
-    " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9",
-    "",//TODO
-    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz",
-    " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9",
-    " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9",
-    "",//TODO
-    " 0\t-.#~,/_@1\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9",
-    "",//TODO
-    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9",
-    " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9",
-    " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9",
-    " 0\t-.#~,/_@1\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9",
-  },
-  // Learning keys:
-  { "Learning Remote Control Keys",
-    "Fernbedienung anlernen",
-    "U�enje kod upravljalca",
-    "Apprendimento tasti unita' remota",
-    "Leren toetsen afstandsbediening",
-    "Aprender as teclas do telecomando",
-    "Apprentissage des codes de t�l�commande",
-    "L�re fjernkontrolltaster",
-    "Kaukos��timen opettaminen",
-    "Nauka klawiszy pilota",
-    "Aprendiendo teclas del mando",
-    "�������� �������� �������������",
-    "Inl�rning av fj�rrkontrollsknappar",
-    "�nv��are taste telecomand�",
-    "T�vir�ny�t� betan�t�sa",
-    "Aprenent les tecles del comandament a dist�ncia",
-    "�������� ������",
-    "U�enje k�da daljinskog upravlja�a",
-    "Kaugjuhtimispuldi �petamine",
-    "L�rer fjernbetjeningstaster",
-    "U�en� k�d� d�lkov�ho ovl�d�n�",
-    "Uzaktan kumandan�n tu�lar� e�itiliyor",
-  },
-  { "Phase 1: Detecting RC code type",
-    "Phase 1: System der Fernbedienung ermitteln",
-    "Faza 1: Sprejemanje IR kode",
-    "Fase 1: tipo ricevitore RC",
-    "Fase 1: detecteren type afstandsbediening",
-    "Fase 1: detectar tipo de receptor",
-    "Phase 1: D�tection du type de code",
-    "Fase 1: Finne fjernkontroll-kodetype",
-    "Vaihe 1: Koodauksen tunnistaminen",
-    "Etap 1: Wykrywanie rodzaju kodu pilota",
-    "Fase 1: Detectando tipo de mando",
-    "���� 1: ��������� ������ RC",
-    "Steg1: identifiering av kod",
-    "Faza 1: Detec�ia tipului telecomenzii",
-    "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa",
-    "Fase 1: Detectant el tipus de receptor",
-    "��� 1: ����������� ���� ���� ������",
-    "Faza 1: detektiranje k�da daljinskog upravlja�a.",
-    "Samm 1: Kodeerimiss�steemi tuvastamine",
-    "Fase 1: Detekterer fjernbetjenings-kodetype",
-    "F�ze 1: Detekce typu k�du",
-    "Faz 1: Kumandan�n kodu aran�yor",
-  },
-  { "Press any key on the RC unit",
-    "Eine Taste auf der Fernbedienung dr�cken",
-    "Pritisnite tipko na upravljalcu",
-    "Premere un tasto dell'unita' RC",
-    "Druk op een willekeurige knop",
-    "Pressione qualquer tecla do telecomando",
-    "Appuyer sur une touche de la t�l�commande",
-    "Trykk en av tastene p� fjernkontrollen",
-    "Paina mit� tahansa kaukos��timen n�pp�int�",
-    "Naci�nij dowolny klawisz na pilocie",
-    "Pulse cualquier tecla en el mando",
-    "����� ��� ������� ��� ���������������",
-    "Tryck valfri tangent p� fj�rrkontrollen",
-    "Ap�sa�i o tast� pe telecomand�",
-    "Nyomjon meg egy gombot a t�vir�ny�t�n",
-    "Premeu qualsevol tecla del comandament",
-    "������� ����� ������ �� ������",
-    "Pritisnite tipku na daljinskom upravlja�u",
-    "Vajuta puldil suvalist klahvi",
-    "Tryk vilk�rlig tast p� fjernbetjeningen",
-    "Stiskn�te libovolnou kl�vesu ovl�d�n�",
-    "Kumandada herhangi bir tu�a bas",
-  },
-  { "RC code detected!",
-    "System der Fernbedienung erkannt!",
-    "IR koda sprejeta!",
-    "Codice RC rilevato!",
-    "Afstandsbediening code herkend!",
-    "C�digo do telecomando detectado!",
-    "Code de la t�l�commande d�tect�!",
-    "Fjernkontroll-kodetype funnet!",
-    "N�pp�inpainallus vastaanotettu!",
-    "Wykryto kod pilota!",
-    "�C�digo RC detectado!",
-    "������� ������� RC!",
-    "Koden detekterad!",
-    "S-a detectat tipul telecomenzii!",
-    "T�vir�ny�t� k�dja felismerve!",
-    "Codi detectat!",
-    "��������� ��� ������!",
-    "K�d daljinskog upravlja�a je prepoznat!",
-    "Kodeerimiss�steem tuvastatud!",
-    "Fjernbetjenings-kodetype fundet!",
-    "K�d byl detekov�n!",
-    "Kumandan�n kodu bulundu!",
-  },
-  { "Do not press any key...",
-    "Keine Taste dr�cken...",
-    "Ne pritiskajte tipk...",
-    "Non premere alcun tasto...",
-    "Druk niet op een knop...",
-    "N�o pressione nada...",
-    "N'appuyer sur aucune touche ...",
-    "Ikke trykk p� noen av tastene...",
-    "�l� paina kaukos��timen n�pp�imi�...",
-    "Nie naciskaj teraz �adnego klawisza...",
-    "No pulse ninguna tecla...",
-    "��� ����� �������...",
-    "Tryck inte p� n�gon knapp...",
-    "Nu ap�sa�i nici o tast�...",
-    "Ne nyomjon meg gombot...",
-    "No premeu cap tecla...",
-    "�� ��������� ������...",
-    "Ne pritiskajte tipku...",
-    "�ra vajuta puldil �htki klahvi...",
-    "Tryk ikke p� nogen tast...",
-    "Nema�kejte ��dn� kl�vesy...",
-    "Tu�lara basmay�n�z...",
-  },
-  { "Phase 2: Learning specific key codes",
-    "Phase 2: Tastenbelegung anlernen",
-    "Faza 2: U�enje posebnih kod",
-    "Fase 2: Codici specifici dei tasti",
-    "Fase 2: Leren specifieke toets-codes",
-    "Fase 2: A aprender c�digos especificos",
-    "Phase 2: Apprentissage des codes des touches",
-    "Fase 2: L�re spesifikke tastekoder",
-    "Vaihe 2: N�pp�inkoodien opettelu",
-    "Etap 2: Nauka konkretnych kod�w klawiszy",
-    "Fase 2: Aprendiendo c�digos espec�ficos",
-    "���� 2: �������� ����������� ��������",
-    "Fas 2: Inl�rning av specifika knapp-koder",
-    "Faza 2: �nv��area codurilor anumitor taste",
-    "M�sodik l�p�s: az egyes gombok betan�t�sa",
-    "Fase 2: Aprenentantge de les funcions",
-    "��� 2: ������� ����� ��������� ������",
-    "Faza 2: U�enje posebnih k�dova",
-    "Samm 2: Klahvide �petamine",
-    "Fase 2: L�r individuelle tast koder",
-    "F�ze 2: U�en� konkr�tn�ho k�du kl�ves",
-    "Faz 2: Belirli tu� kodu e�itiliyor",
-  },
-  { "Press key for '%s'",
-    "Taste f�r '%s' dr�cken",
-    "Pritisnite tipko za '%s'",
-    "Premere il tasto per '%s'",
-    "Druk knop voor '%s'",
-    "Pressione tecla para '%s'",
-    "Appuyer sur la touche '%s'",
-    "Trykk tasten for '%s'",
-    "Paina n�pp�int� toiminnolle '%s'",
-    "Naci�nij klawisz dla '%s'",
-    "Pulse la tecla para '%s'",
-    "����� �� ������� ��� '%s'",
-    "Tryck p� knappen f�r '%s'",
-    "Ap�sa�i tasta pentru '%s'",
-    "'%s' gomb megnyom�sa",
-    "Premeu una tecla per '%s'",
-    "������� ������ '%s'",
-    "Pritisnite tipku za '%s'",
-    "Vajuta klahvile '%s'",
-    "Tryk tasten for '%s'",
-    "Stiskn�te kl�vesu pro '%s'",
-    "'%s' i�in tu� se�iniz",
-  },
-  { "Press 'Up' to confirm",
-    "'Auf' dr�cken zum Best�tigen",
-    "Pritisnite tipko 'Gor' za potrditev",
-    "Premere 'Su' per confermare",
-    "Druk 'Omhoog' om te bevestigen",
-    "Pressione 'Cima' para confirmar",
-    "Appuyer sur 'Haut' pour confirmer",
-    "Trykk 'Opp' for � bekrefte",
-    "Hyv�ksy painamalla 'Yl�s'",
-    "Naci�nij 'Do g�ry' aby potwierdzi�",
-    "Pulse 'Arriba' para confirmar",
-    "����� '����' ��� �������",
-    "Tryck 'Upp' f�r att bekr�fta",
-    "Ap�sa�i 'Sus' pentru confirmare",
-    "'Fel' megnyom�sa az elfogad�shoz",
-    "Premeu 'Amunt' per confirmar",
-    "������� '�����' ����� �����������",
-    "Pritisnite 'Gore' za potvrdu",
-    "Kinnitamiseks vajuta '�les'",
-    "Tryk 'Op' for at bekr�fte",
-    "Stiskn�te 'Nahoru' pro potvrzen�",
-    "Onaylamak i�in 'Yukar�' bas",
-  },
-  { "Press 'Down' to continue",
-    "'Ab' dr�cken zum Weitermachen",
-    "Pritisnite tipko 'Dol' za nadaljevanje",
-    "Premere 'Giu' per continuare",
-    "Druk 'Omlaag' om verder te gaan",
-    "Pressione 'Baixo' para continuar",
-    "Appuyer sur 'Bas' pour continuer",
-    "Trykk Ned' for � fortsette",
-    "Jatka painamalla 'Alas'",
-    "Naci�nij 'Na d�' aby kontynuowa�",
-    "Pulse 'Abajo' para continuar",
-    "����� '����' ��� ��������",
-    "Tryck 'Ner' f�r att bekr�fta",
-    "Ap�sa�i 'Jos' pentru continuare",
-    "'Le' megnyom�sa a folytat�shoz",
-    "Premeu 'Avall' per continuar",
-    "������� '����' ����� ����������",
-    "Pritisnite 'Dolje' za nastavak",
-    "J�tkamiseks vajuta 'Alla'",
-    "Tryk 'Ned' for at forts�tte",
-    "Stiskn�te 'Dol�' pro pokra�ov�n�",
-    "Devam etmek i�in 'A�a��' bas",
-  },
-  { "(press 'Up' to go back)",
-    "('Auf' dr�cken, um zur�ckzugehen)",
-    "(pritisnite 'Gor' za nazaj)",
-    "(premere 'Su' per tornare indietro)",
-    "(druk 'Omhoog' om terug te gaan)",
-    "(Pressione 'Cima' para voltar)",
-    "(Appuyer sur 'Haut' pour revenir en arri�re)",
-    "(trykk 'Opp' for � g� tilbake)",
-    "(palaa takaisin painamalla 'Yl�s')",
-    "(naci�nij 'Do g�ry' aby si� cofn��)",
-    "(Pulse 'Arriba' para retornar)",
-    "(����� '����' ��� ���������",
-    "(Tryck 'Upp' f�r att backa)",
-    "(Ap�sa�i 'Sus' pentru revenire)",
-    "(�Fel' megnyom�sa a visszat�r�shez)",
-    "(Premeu 'Amunt' per retornar)",
-    "(������� '�����' ����� ���������)",
-    "(pritisnite 'Gore' za nazad)",
-    "(tagasiminekuks vajuta '�les')",
-    "(tryk 'Op' for at g� tilbage)",
-    "(stiskn�te 'Nahoru' pro zp�t)",
-    "(Geri d�nmek i�in 'Yukar�' bas)",
-  },
-  { "(press 'Down' to end key definition)",
-    "('Ab' dr�cken zum Beenden)",
-    "(pritisnite 'Dol' za konec)",
-    "('Giu' per finire la definizione tasti)",
-    "(Druk 'Omlaag' om te beeindigen)",
-    "(Pressione 'Baixo' para terminar a defini��o)",
-    "(Appuyer sur 'Bas' pour terminer)",
-    "(trykk 'Ned' for � avslutte innl�ring)",
-    "(lopeta opettaminen painamalla 'Alas')",
-    "(naci�nij 'Na d�' aby zako�czy� definiowanie)",
-    "(Pulse 'Abajo' para terminar el aprendizaje)",
-    "(����� '����' ��� ���������� �������� ��������)",
-    "(Tryck 'Ner' f�r att avsluta inl�rningen)",
-    "(Ap�sa�i 'Jos' pentru terminare)",
-    "('Le' megnyom�sa a befejez�shez)",
-    "(Premeu 'Avall' per finalitzar l'aprenentatge)",
-    "(������� '����' ����� ��������� ��������� ������)",
-    "(pritisnite 'Dolje' za kraj)",
-    "(l�petamiseks vajuta 'Alla')",
-    "(tryk 'Ned' for at afslutte indl�ringen)",
-    "(stiskn�te 'Dol�' pro ukon�en�)",
-    "(Sona erdirmek i�in 'A�a��' bas)",
-  },
-  { "(press 'Menu' to skip this key)",
-    "('Men�' dr�cken zum �berspringen)",
-    "pritisnite 'Meni' za preskok te tipke",
-    "(premere 'Menu' per saltare questo tasto)",
-    "Druk 'Menu' om deze toets over te slaan",
-    "",// TODO
-    "('Menu' pour passer cette touche)",
-    "",// TODO
-    "n�pp�imen puuttuessa paina 'Valikko'",
-    "(naci�nij 'Menu' aby pomin�� ten klawisz)",
-    "Pulse 'Men�' para omitir esta tecla",
-    "����� '�����' ��� ���������� ����� ��� ��������",
-    "(Tryck 'Meny' f�r att hoppa �ver knappen.)",
-    "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�",
-    "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz",
-    "Premeu 'Men�' per obviar aquesta tecla",
-    "(������� '����' ����� ���������� ������)",
-    "pritisnite 'Izbor' da presko�ite ovu tipku",
-    "(selle klahvi vahelej�tmiseks vajuta 'Men��')",
-    "(tryk 'Menu' for at springe denne tast over)",
-    "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)",
-    "(Tu�u atlamak i�in 'Men�' bas)",
-  },
-  { "Phase 3: Saving key codes",
-    "Phase 3: Tastenbelegung abspeichern",
-    "Faza 3: Shranjevanje kod tipk",
-    "Fase 3: Salvataggio codici tasti",
-    "Fase 3: Opslaan toets codes",
-    "Fase 3: A salvar os c�digos das teclas",
-    "Phase 3: Sauvegarde des codes des touches",
-    "Fase 3: Lagre tastekoder",
-    "Vaihe 3: N�pp�inkoodien tallentaminen",
-    "Etap 3: Zapisywanie kod�w klawiszy",
-    "Fase 3: Guardando los c�digos de teclas",
-    "���� 3: ���������� �������",
-    "Fas 3: Spara knappkoder",
-    "Faza 3: Salvarea codurilor de taste",
-    "Harmadik l�p�s: k�d ment�se",
-    "Fase 3: Guardant els codis de les tecles",
-    "��� 3: ����������� ����� ������",
-    "Faza 3: Spremanje k�dova tipki",
-    "Samm 3: Klavhikoodide salvestamine",
-    "Fase 3: Gemmer tast koder",
-    "F�ze 3: Ulo�en� k�d�",
-    "Faz 3: Tu� ayarlar�n� kesinle�tir",
-  },
-  { "Press 'Up' to save, 'Down' to cancel",
-    "'Auf' speichert, 'Ab' bricht ab",
-    "'Gor' za potrditev, 'Dol' za prekinitev",
-    "'Su' per salvare, 'Giu' per annullare",
-    "'Omhoog' te bewaren, 'Omlaag' voor annuleren",
-    "'Cima' para Salvar, 'Baixo' para Cancelar",
-    "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler",
-    "Trykk 'Opp' for � lagre, 'Ned' for � avbryte",
-    "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi",
-    "Naci�nij 'Do g�ry' aby zapisa�, 'Na d�' - aby anulowa�",
-    "Pulse 'Arriba' para guardar, 'Abajo' para anular",
-    "����� '����' ��� ����������, '����' ��� �������",
-    "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta.",
-    "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare",
-    "'Fel' ment�s, 'Le� m�gse",
-    "Premeu 'Amunt' per guardar, 'Avall' per anul�lar",
-    "������� '�����' ����� ���������, '����' ����� ����������",
-    "'Gore' za potvrdu, 'Dolje' za prekid",
-    "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'",
-    "Tryk 'Op' for at gemme, 'Ned' for at annullere",
-    "Stiskn�te 'Nahoru' pro ulo�en�, 'Dol�' pro zru�en�",
-    "Kesinle�tirmek i�in 'Yukar�', Iptal etmek i�in 'A�a��' bas",
-  },
-  // Key names:
-  { "Key$Up",
-    "Auf",
-    "Gor",
-    "Su",
-    "Omhoog",
-    "Cima",
-    "Haut",
-    "Opp",
-    "Yl�s",
-    "Do g�ry",
-    "Arriba",
-    "����",
-    "Upp",
-    "Sus",
-    "Fel",
-    "Amunt",
-    "�����",
-    "Gore",
-    "�les",
-    "Op",
-    "Nahoru",
-    "Yukar�",
-  },
-  { "Key$Down",
-    "Ab",
-    "Dol",
-    "Giu",
-    "Omlaag",
-    "Baixo",
-    "Bas",
-    "Ned",
-    "Alas",
-    "Na d�",
-    "Abajo",
-    "����",
-    "Ner",
-    "Jos",
-    "Le",
-    "Avall",
-    "����",
-    "Dolje",
-    "Alla",
-    "Ned",
-    "Dol�",
-    "A�a��",
-  },
-  { "Key$Menu",
-    "Men�",
-    "Meni",
-    "Menu",
-    "Menu",
-    "Menu",
-    "Menu",
-    "Meny",
-    "Valikko",
-    "Menu",
-    "Men�",
-    "�����",
-    "Meny",
-    "Meniu",
-    "Men�",
-    "Men�",
-    "����",
-    "Izbor",
-    "Men��",
-    "Menu",
-    "Menu",
-    "Men�",
-  },
-  { "Key$Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "��",
-    "Ok",
-    "OK",
-    "Ok",
-    "D'acord",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Ok",
-    "Tamam",
-  },
-  { "Key$Back",
-    "Zur�ck",
-    "Nazaj",
-    "Indietro",
-    "Terug",
-    "Voltar",
-    "Retour",
-    "Tilbake",
-    "Takaisin",
-    "Wstecz",
-    "Retornar",
-    "����",
-    "Tillbaka",
-    "�napoi",
-    "Vissza",
-    "Retornar",
-    "�����",
-    "Nazad",
-    "Tagasi",
-    "Tilbage",
-    "Zp�t",
-    "Geri",
-  },
-  { "Key$Left",
-    "Links",
-    "Levo",
-    "Sinistra",
-    "Links",
-    "Esquerda",
-    "Gauche",
-    "Venstre",
-    "Vasemmalle",
-    "W lewo",
-    "Izquierda",
-    "��������",
-    "V�nster",
-    "St�nga",
-    "Balra",
-    "Esquerra",
-    "������",
-    "Lijevo",
-    "Vasakule",
-    "Venstre",
-    "Vlevo",
-    "Sol",
-  },
-  { "Key$Right",
-    "Rechts",
-    "Desno",
-    "Destra",
-    "Rechts",
-    "Direita",
-    "Droite",
-    "H�yre",
-    "Oikealle",
-    "W prawo",
-    "Derecha",
-    "�����",
-    "H�ger",
-    "Dreapta",
-    "Jobbra",
-    "Dreta",
-    "�������",
-    "Desno",
-    "Paremale",
-    "H�jre",
-    "Vpravo",
-    "Sa�",
-  },
-  { "Key$Red",
-    "Rot",
-    "Rde�a",
-    "Rosso",
-    "Rood",
-    "Vermelho",
-    "Rouge",
-    "R�d",
-    "Punainen",
-    "Czerwony",
-    "Rojo",
-    "�������",
-    "R�d",
-    "Ro�u",
-    "Piros",
-    "Vermell",
-    "�������",
-    "Crveno",
-    "Punane",
-    "R�d",
-    "�erven�",
-    "K�rm�z�",
-  },
-  { "Key$Green",
-    "Gr�n",
-    "Zelena",
-    "Verde",
-    "Groen",
-    "Verde",
-    "Vert",
-    "Gr�nn",
-    "Vihre�",
-    "Zielony",
-    "Verde",
-    "�������",
-    "Gr�n",
-    "Verde",
-    "Z�ld",
-    "Verd",
-    "�������",
-    "Zeleno",
-    "Roheline",
-    "Gr�n",
-    "Zelen�",
-    "Ye�il",
-  },
-  { "Key$Yellow",
-    "Gelb",
-    "Rumena",
-    "Giallo",
-    "Geel",
-    "Amarelo",
-    "Jaune",
-    "Gul",
-    "Keltainen",
-    "��ty",
-    "Amarillo",
-    "�������",
-    "Gul",
-    "Galben",
-    "S�rga",
-    "Groc",
-    "������",
-    "�uto",
-    "Kollane",
-    "Gul",
-    "�lut�",
-    "Sar�",
-  },
-  { "Key$Blue",
-    "Blau",
-    "Modra",
-    "Blu",
-    "Blauw",
-    "Azul",
-    "Bleu",
-    "Bl�",
-    "Sininen",
-    "Niebieski",
-    "Azul",
-    "����",
-    "Bl�",
-    "Albastru",
-    "K�k",
-    "Blau",
-    "�����",
-    "Plavo",
-    "Sinine",
-    "Bl�",
-    "Modr�",
-    "Mavi",
-  },
-  { "Key$Info",
-    "Info",
-    "Info",
-    "Informazioni",
-    "Info",
-    "",//TODO
-    "Info",
-    "",//TODO
-    "Tiedot",
-    "Info",
-    "Info",
-    "�����������",
-    "Info",
-    "Info",
-    "Inform�ci�",
-    "",//TODO
-    "����",
-    "Info",
-    "Info",
-    "Info",
-    "Info",
-    "Bilgi",
-  },
-  { "Key$Play",
-    "Wiedergabe",
-    "Predvajaj",
-    "Riproduzione",
-    "Weergeven",
-    "",// TODO
-    "Lecture",
-    "",// TODO
-    "Toista",
-    "Odtw�rz",
-    "Reproducir",
-    "�����������",
-    "Spela upp",
-    "Redare",
-    "Lej�tsz�s",
-    "Reproduir",
-    "���������������",
-    "Start",
-    "Start",
-    "Afspil",
-    "P�ehr�t",
-    "G�ster",
-  },
-  { "Key$Pause",
-    "Pause",
-    "Pavza",
-    "Pausa",
-    "Pauze",
-    "",// TODO
-    "Pause",
-    "",// TODO
-    "Tauko",
-    "Pauza",
-    "Pausa",
-    "�����",
-    "Pausa",
-    "Pauz�",
-    "Sz�net",
-    "Pausa",
-    "�����",
-    "Pauza",
-    "Paus",
-    "Pause",
-    "P�eru�it",
-    "Durakla",
-  },
-  { "Key$Stop",
-    "Stopp",
-    "Ustavi",
-    "Stop",
-    "Stop",
-    "Stop",
-    "Stop",
-    "",// TODO
-    "Lopeta",
-    "Stop",
-    "Parar",
-    "T����",
-    "Stoppa",
-    "Stop",
-    "Stop",
-    "Aturar",
-    "����",
-    "Stop",
-    "Stopp",
-    "Stop",
-    "Zastavit",
-    "Durdur",
-  },
-  { "Key$Record",
-    "Aufnehmen",
-    "Snemaj",
-    "Registrazione",
-    "Opnemen",
-    "",// TODO
-    "Enregistrement",
-    "",// TODO
-    "Tallenna",
-    "Nagrywaj",
-    "Grabar",
-    "E������",
-    "Spela in",
-    "�nregistrare",
-    "Felvenni",
-    "Gravar",
-    "������",
-    "Snimaj",
-    "Salvestamine",
-    "Optag",
-    "Nahr�t",
-    "Kay�t et",
-  },
-  { "Key$FastFwd",
-    "Vorlauf",
-    "Hitro naprej",
-    "Avanti Veloce",
-    "Vooruitspoelen",
-    "",// TODO
-    "Avance rapide",
-    "",// TODO
-    "Pikakelaus >>",
-    "Do przodu",
-    "Avance r�pido",
-    "�������� ������",
-    "Snabbspolning fram�t",
-    "Derulare �nainte",
-    "El�re p�rgetni",
-    "Endavant r�pidament",
-    "��������� ������",
-    "Naprijed",
-    "Edasikerimine",
-    "Spol fremad",
-    "Dop�edu",
-    "�leri sar",
-  },
-  { "Key$FastRew",
-    "R�cklauf",
-    "Hitro nazaj",
-    "Indietro Veloce",
-    "Terugspoelen",
-    "",// TODO
-    "Retour rapide",
-    "",// TODO
-    "Pikakelaus <<",
-    "Do ty�u",
-    "Retroceso r�pido",
-    "�������� ����",
-    "Snabbspolning bak�t",
-    "Derulare �napoi",
-    "Vissza p�rgetni",
-    "Enrera r�pidament",
-    "��������� �����",
-    "Nazad",
-    "Tagasikerimine",
-    "Spol tilbage",
-    "Dozadu",
-    "Geri sar",
-  },
-  { "Key$Next",
-    "Vorw�rts",
-    "Naprej",
-    "Prossimo",
-    "",// TODO
-    "",// TODO
-    "Suivant",
-    "",// TODO
-    "Seuraava",
-    "Dalej",
-    "",// TODO
-    "",// TODO
-    "N�sta",
-    "Urm�tor",
-    "El�re",
-    "",// TODO
-    "������",
-    "",// TODO
-    "J�rgmine",
-    "Fremad",
-    "D�le",
-    "Sonraki",
-  },
-  { "Key$Prev",
-    "Zur�ck",
-    "Nazaj",
-    "Precedente",
-    "",// TODO
-    "",// TODO
-    "Pr�c�dent",
-    "",// TODO
-    "Edellinen",
-    "Wstecz",
-    "",// TODO
-    "",// TODO
-    "Bak�t",
-    "Anterior",
-    "Vissza",
-    "",// TODO
-    "�����",
-    "",// TODO
-    "Eelmine",
-    "Tilbage",
-    "Zp�t",
-    "�nceki",
-  },
-  { "Key$Power",
-    "Ausschalten",
-    "Izklop",
-    "Power",
-    "Uitschakelen",
-    "Ligar",
-    "Arr�t",
-    "Power",
-    "Virta",
-    "Wy��cz",
-    "Apagar",
-    "K�������",
-    "P�/Av",
-    "�nchidere",
-    "Kikapcsolni",
-    "Aturar",
-    "���������",
-    "Isklju�i",
-    "Toide",
-    "Sluk",
-    "Vyp�na�",
-    "Kapat",
-  },
-  { "Key$Channel+",
-    "Kanal+",
-    "Program+",
-    "Canale +",
-    "Kanaal+",
-    "",// TODO
-    "Cha�ne+",
-    "",// TODO
-    "Kanava +",
-    "Kana�+",
-    "Canal+",
-    "������+",
-    "Kanal+",
-    "Canal+",
-    "Csatorna+",
-    "Canal +",
-    "����� +",
-    "Program +",
-    "Kanal+",
-    "Kanal+",
-    "Kan�l+",
-    "Kanal+",
-  },
-  { "Key$Channel-",
-    "Kanal-",
-    "Program-",
-    "Canale -",
-    "Kanaal-",
-    "",// TODO
-    "Cha�ne-",
-    "",// TODO
-    "Kanava -",
-    "Kana�-",
-    "Canal-",
-    "������-",
-    "Kanal-",
-    "Canal-",
-    "Csatorna-",
-    "Canal -",
-    "����� -",
-    "Program -",
-    "Kanal-",
-    "Kanal-",
-    "Kan�l-",
-    "Kanal-",
-  },
-  { "Key$PrevChannel",
-    "Vorheriger Kanal",
-    "Prej�nji kanal",
-    "Canale Prec.",
-    "",// TODO
-    "",// TODO
-    "Cha�ne pr�c�dente",
-    "",// TODO
-    "Edellinen kanava",
-    "Poprzedni kana�",
-    "",// TODO
-    "",// TODO
-    "F�rra kanalen",
-    "Canal anterior",
-    "Az el�z� ad�s",
-    "",// TODO
-    "���������� �����",
-    "",// TODO
-    "Eelmine kanal",
-    "Foreg�ende kanal",
-    "P�edch�zej�c� kan�l",
-    "�nceki kanal",
-  },
-  { "Key$Volume+",
-    "Lautst�rke+",
-    "Glasnost+",
-    "Volume +",
-    "Volume+",
-    "Volume+",
-    "Volume+",
-    "Volum+",
-    "��nenvoimakkuus +",
-    "G�o�niej",
-    "Volumen+",
-    "������+",
-    "Volym+",
-    "Volum+",
-    "Hanger�+",
-    "Volum +",
-    "��������� +",
-    "Glasnije", // hrv "Glasnocca +"
-    "Helitugevus+",
-    "Lydstyrke+",
-    "Hlasitost+",
-    "Ses+",
-  },
-  { "Key$Volume-",
-    "Lautst�rke-",
-    "Glasnost-",
-    "Volume -",
-    "Volume-",
-    "Volume-",
-    "Volume-",
-    "Volum-",
-    "��nenvoimakkuus -",
-    "Ciszej",
-    "Volumen-",
-    "������-",
-    "Volym-",
-    "Volum-",
-    "Hanger�-",
-    "Volum -",
-    "��������� -",
-    "Ti�e", // hrv Glasnocca -"
-    "Helitugevus-",
-    "Lydstyrke-",
-    "Hlasitost-",
-    "Ses-",
-  },
-  { "Key$Mute",
-    "Stumm",
-    "Izklop zvoka",
-    "Muto",
-    "Geluid onderbreken",
-    "Sem som",
-    "Coupure du son",
-    "Lyd av",
-    "Mykistys",
-    "Wycisz",
-    "Mudo",
-    "�������",
-    "Ljud Av",
-    "F�r� sunet",
-    "Csend",
-    "En silenci",
-    "��������� ����",
-    "Bez zvuka",
-    "H��letu",
-    "Sluk lyd",
-    "Ticho",
-    "Sessiz",
-  },
-  { "Key$Audio",
-    "Audio",
-    "Zvok",
-    "Audio",
-    "Audio",
-    "",// TODO
-    "Audio",
-    "",// TODO
-    "��ni",
-    "D�wi�k",
-    "Audio",
-    "����",
-    "Ljud",
-    "Sunet",
-    "Hang",
-    "",// TODO
-    "����",
-    "",// TODO
-    "Audio",
-    "Audio",
-    "Zvuk",
-    "Audio",
-  },
-  // Miscellaneous:
-  { "yes",
-    "ja",
-    "da",
-    "si",
-    "ja",
-    "sim",
-    "oui",
-    "ja",
-    "kyll�",
-    "tak",
-    "s�",
-    "���",
-    "ja",
-    "da",
-    "igen",
-    "s�",
-    "��",
-    "da",
-    "jah",
-    "ja",
-    "ano",
-    "evet",
-  },
-  { "no",
-    "nein",
-    "ne",
-    "no",
-    "nee",
-    "n�o",
-    "non",
-    "nei",
-    "ei",
-    "nie",
-    "no",
-    "���",
-    "nej",
-    "nu",
-    "nem",
-    "no",
-    "���",
-    "ne",
-    "ei",
-    "nej",
-    "ne",
-    "hay�r",
-  },
-  { "off",
-    "aus",
-    "izklop",
-    "off",
-    "uit",
-    "off",
-    "off",
-    "",// TODO
-    "pois",
-    "wy��cz",
-    "off",
-    "�������",
-    "av",
-    "inactiv",
-    "ki",
-    "off",
-    "����",
-    "ugasi",
-    "v�lja",
-    "fra",
-    "vyp.",
-    "kapal�",
-  },
-  { "none",
-    "keine",
-    "nobeden",
-    "nessuno",
-    "geen",
-    "",// TODO
-    "aucun",
-    "",// TODO
-    "tyhj�",
-    "brak",
-    "ninguno",
-    "������",
-    "ingen",
-    "niciuna(ul)",
-    "semmi",
-    "cap",
-    "������",
-    "nijedan",
-    "t�hi",
-    "ingen",
-    "��dn�",
-    "hi�",
-  },
-  { "auto",
-    "auto",
-    "avtomatsko",
-    "automatico",
-    "auto",
-    "",// TODO
-    "auto",
-    "",// TODO
-    "auto",
-    "auto",
-    "auto",
-    "��������",
-    "automatisk",
-    "automat",
-    "auto",
-    "auto",
-    "����",
-    "automatski",
-    "automaatne",
-    "automatisk",
-    "auto",
-    "otomatik",
-  },
-  { "top",
-    "oben",
-    "zgoraj",
-    "in alto",
-    "boven",
-    "topo",
-    "haut",
-    "�vre",
-    "yl�reuna",
-    "g�ra",
-    "arriba",
-    "����",
-    "�vre",
-    "sus",
-    "Fent",
-    "a dalt",
-    "������",
-    "gore",
-    "�leval",
-    "top",
-    "haho�e",
-    "�st",
-  },
-  { "bottom",
-    "unten",
-    "spodaj",
-    "in basso",
-    "onder",
-    "fundo",
-    "bas",
-    "nedre",
-    "alareuna",
-    "d�",
-    "abajo",
-    "����",
-    "undre",
-    "jos",
-    "lent",
-    "a baix",
-    "�����",
-    "dolje",
-    "all",
-    "bund",
-    "dole",
-    "alt",
-  },
-  { "Disk",
-    "Disk",
-    "Disk",
-    "Disco",
-    "Disk",
-    "Disk",
-    "Disque",
-    "Disk",
-    "Levy",
-    "Dysk",
-    "Disco",
-    "������",
-    "Disk",
-    "Disc",
-    "Lemez",
-    "Disc",
-    "����",
-    "Disk",
-    "Ketas",
-    "Disk",
-    "Disk",
-    "Disk",
-  },
-  { "free",
-    "frei",
-    "prosto",
-    "liberi",
-    "vrij",
-    "livre",
-    "restant",
-    "ledig",
-    "vapaana",
-    "wolnego",
-    "libre",
-    "���������",
-    "ledigt",
-    "liber",
-    "szabad",
-    "lliure",
-    "��������",
-    "slobodno",
-    "vaba",
-    "fri",
-    "volno",
-    "bo�",
-  },
-  { "Jump: ", // note the trailing blank
-    "Springen: ",
-    "Sko�i: ",
-    "Vai a: ",
-    "Springen: ",
-    "Saltar: ",
-    "Acc�s direct: ",
-    "Hopp: ",
-    "Siirry: ",
-    "Skok: ",
-    "Saltar: ",
-    "����������: ",
-    "Hopp: ",
-    "Salt la: ",
-    "Ugr�s:",
-    "Salta a:",
-    "�������: ",
-    "Sko�i: ",
-    "H�pe: ",
-    "Hop: ",
-    "Skok: ",
-    "Atla: ",
-  },
-  { "Volume ", // note the trailing blank
-    "Lautst�rke ",
-    "Glasnost ",
-    "Volume ",
-    "Volume ",
-    "Volume ",
-    "Volume ",
-    "Volum ",
-    "��nenvoimakkuus ",
-    "G�o�no�� ",
-    "Volumen ",
-    "������ ",
-    "Volym ",
-    "Volum ",
-    "Hanger�",
-    "Volum ",
-    "��������� ",
-    "Glasno�a ",
-    "Helitugevus ",
-    "Lydstyrke ",
-    "Hlasitost ",
-    "Ses ",
-  },
-  { " Stop replaying", // note the leading blank!
-    " Wiedergabe beenden",
-    " Prekini predvajanje",
-    " Stop riproduzione",
-    " Stop afspelen",
-    " Parar reprodu��o",
-    " Arr�ter la lecture",
-    " Stopp avspilling",
-    " Lopeta toisto",
-    " Zatrzymaj odtwarzanie",
-    " Parar reproduci�n",
-    " ����� ������������",
-    " Avsluta uppspelning",
-    " Opre�te redarea",
-    " Lej�tsz�st befejzni",
-    " Aturar la reproducci�",
-    " ���������� ���������������",
-    " Prekini reprodukciju",
-    " L�petada taasesitamine",
-    " Stop afspilning",
-    " Zastavit p�ehr�v�n�",
-    " G�steri�i bitir",
-  },
-  { " Stop recording ", // note the leading and trailing blanks!
-    " Aufzeichnung beenden ",
-    " Prekini snemanje ",
-    " Stop registrazione ",
-    " Stop opnemen ",
-    " Parar grava��o ",
-    " Arr�ter l'enregistrement ",
-    " Stopp opptak fra ",
-    " Lopeta tallennus ",
-    " Zatrzymaj nagrywanie ",
-    " Parar grabaci�n ",
-    " ����� ������� ",
-    " Avsluta inspelning ",
-    " Opre�te �nregistrarea ",
-    " Felv�telt befejezni",
-    " Aturar la gravaci� ",
-    " ���������� ������ ",
-    " Prekini snimanje ",
-    " L�petada salvestamine ",
-    " Stop optagelse ",
-    " Zastavit nahr�v�n� ",
-    " �ekimi bitir ",
-  },
-  { " Cancel editing", // note the leading blank!
-    " Schneiden abbrechen",
-    " Prekini urejanje",
-    " Annullare modifiche",
-    " Bewerken afbreken",
-    " Anular modifica��o",
-    " Annuler le montage",
-    " Avbryt redigering",
-    " Peru muokkaus",
-    " Anuluj edycj�",
-    " Anular edici�n",
-    " ������� ������������",
-    " Avbryt redigering",
-    " Opre�te montajul �nregistr�rii",
-    " V�g�st megszak�tani",
-    " Cancel�lar l'edici� ",
-    " �������� ������ ������",
-    " Prekini ure�ivanje",
-    " Katkestada monteerimine",
-    " Afbryd redigering",
-    " Zru�it editaci",
-    " Kesimi iptal et",
-  },
-  { "Switching primary DVB...",
-    "Prim�res Interface wird umgeschaltet...",
-    "Preklapljanje primarne DVB naprave...",
-    "Cambio su card DVB primaria...",
-    "Eerste DVB-kaart wordt omgeschakeld...",
-    "A mudar interface DVB prim�rio...",
-    "Changement de carte DVB primaire...",
-    "Bytter f�rste DVB-enhet...",
-    "Vaihdetaan ensisijaista DVB-sovitinta...",
-    "Prz곱czam na pierwszy interfejs DVB...",
-    "Cambiando el interfaz DVB primario...",
-    "� ����� DVB ����� �������...",
-    "Byter prim�r DVB enhet...",
-    "Comut dispozitiv DVB primar...",
-    "Prim�r Interface �tkapcsolva...",
-    "Canviant a la interf�cie DVB prim�ria...",
-    "����� ��������� DVB-����������...",
-    "Preklapanje primarnog DVB ure�aja...",
-    "Esmase DVB seadme �mberl�litus...",
-    "Skifter prim�r DVB enhed...",
-    "P�epnout prim�rn� DVB...",
-    "Primer DVB aray�z� de�i�tiriliyor...",
-  },
-  { "Up/Dn for new location - OK to move",
-    "Auf/Ab f�r neue Position - dann OK",
-    "Gor/Dol za novo poz. - Ok za premik",
-    "Su/Giu per nuova posizione - OK per muovere",
-    "Gebruik Omhoog/Omlaag - daarna Ok",
-    "Cima/Baixo para nova localiza��o - Ok para mover",
-    "Haut/Bas -> nouvelle place - OK -> d�placer",
-    "Opp/Ned for ny plass - OK for � flytte",
-    "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy",
-    "Do g�ry/Na d� na now� pozycj� - Ok zatwierdza",
-    "Arriba/Abajo para mover - OK para confirmar",
-    "����/���� ��� ��� ����. ���� ��",
-    "Upp/Ner f�r nya platsen - d�refter OK f�r att flytta",
-    "Sus/Jos pentru noua loca�ie - OK pentru a muta",
-    "Fel/Le egy uj opci��rt - azt�n OK",
-    "Amunt/Avall per una nova localitzaci� - OK per moure",
-    "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\"",
-    "Gore/Dolje na novu poziciju - zatim OK",
-    "'�les/Alla' uus asukoht - 'OK' kinnitus",
-    "Op/Ned for ny placering - OK for at flytte",
-    "Nahoru/Dolu pro novou pozici - Ok p�esune",
-    "'Yukar�/A�a��' yeni posizyon se� - 'Tamam' ta��",
-  },
-  { "Editing process started",
-    "Schnitt gestartet",
-    "Urejanje se je za�elo",
-    "Processo di modifica iniziato",
-    "Bewerken is gestart",
-    "Processo de modifica��o iniciado",
-    "Op�ration de montage lanc�e",
-    "Redigeringsprosess startet",
-    "Muokkaus aloitettu",
-    "Proces edycji rozpocz�ty",
-    "Proceso de edici�n iniciado",
-    "������ � �����������",
-    "Redigeringen startar",
-    "Montajul �nregistr�rii a �nceput",
-    "V�g�s elind�tva",
-    "Proc�s d'edici� iniciat",
-    "����� ������ ������",
-    "Rezanje je zapo�eto",
-    "Redigeerimine algas",
-    "Redigeringsproces startet",
-    "Edita�n� proces za�al",
-    "Kesim ba�land�",
-  },
-  { "Editing process finished",
-    "Schnitt beendet",
-    "Proces urejanja je kon�an",
-    "Processo di modifica terminato",
-    "Bewerken is klaar",
-    "Processo de modifica��o terminado",
-    "Montage termin�",
-    "Redigeringsprosess avsluttet",
-    "Muokkaus valmis",
-    "Proces edycji zako�czony",
-    "Proceso de edici�n terminado",
-    "� ����������� ��������",
-    "Redigering avslutad",
-    "Montajul �nregistr�rii s-a terminat",
-    "V�g�s befejezve",
-    "Proc�s d'edici� finalitzat",
-    "������ �������",
-    "Rezanje zavr�eno",
-    "Redigeerimine l�petatud",
-    "Redigeringsproces afsluttet",
-    "Edita�n� proces skon�il",
-    "Kesim bitti",
-  },
-  { "Editing process failed!",
-    "Schnitt gescheitert!",
-    "Napaka pri procesu urejanja!",
-    "Processo di modifica fallito!",
-    "Bewerken is mislukt!",
-    "Falha no processo de modifica��o",
-    "Echec du montage!",
-    "Feil under redigering!",
-    "Muokkaus ep�onnistui!",
-    "Proces edycji nie powi�d� si�!",
-    "�Proceso de edici�n fallido!",
-    "� ����������� �������!",
-    "Redigeringsprocessen misslyckades",
-    "Montajul �nregistr�rii a e�uat",
-    "V�g�s sikertelen!",
-    "Proc�s d'edici� fallit!",
-    "������ �� ����� ������� ������!",
-    "Rezanje neuspje�no!",
-    "Redigeerimine eba�nnestus",
-    "Redigeringsproces fejlede!",
-    "Edita�n� proces selhal!",
-    "Kesim ba�ar�s�z!",
-  },
-  { "Recording started",
-    "Aufzeichnung gestartet",
-    "Snemanje se je pri�elo",
-    "Registrazione avviata",
-    "",//TODO
-    "",//TODO
-    "Enregistrement a commenc�",
-    "",//TODO
-    "Tallennus aloitettu",
-    "Rozpocz�to nagrywanie",
-    "Iniciando grabaci�n",
-    "",//TODO
-    "Inspelningen har startat",
-    "A �nceput �nregistrarea",
-    "A felv�tel elinditva Nd",
-    "",//TODO
-    "������ ������",
-    "",//TODO
-    "Salvestamine algas",
-    "Optagelse startet",
-    "Za�alo nahr�v�n�",
-    "Kay�t ba�land�",
-  },
-  { "Pausing live video...",
-    "Live-Signal wird angehalten...",
-    "Ustavljanje predvajanja v �ivo...",
-    "Pausa del canale in visione...",
-    "Pauzeren live uitzending...",
-    "",// TODO
-    "Pause de l'�mission en direct...",
-    "",// TODO
-    "Pys�ytet��n l�hetys...",
-    "Pauzuj� program na �ywo...",
-    "Pausa de la emisi�n en directo...",
-    "������ �������� �������",
-    "Pausar direktinspelningen",
-    "Trec �n pauz� emisiunea transmis�...",
-    "Az �l� ad�s meg�ll�tva...",
-    "Pausa d'emissi� en directe...",
-    "����� ����������� ���������...",
-    "Zaustavljanje �ivog signala...",
-    "Saate edastamise peatamine...",
-    "Pausere live udsendelse...",
-    "P�eru�uje se b��c� program ...",
-    "Naklen yay�n duraklat�l�yor...",
-  },
-  { "Starting EPG scan",
-    "Aktualisiere EPG-Daten",
-    "Pri�enjam EPG-scan",
-    "Inizio scansione EPG",
-    "Bezig met starten EPG scan",
-    "",// TODO
-    "Mise � jour du guide des programmes",
-    "",// TODO
-    "Ohjelmaoppaan p�ivitys aloitettu",
-    "Rozpoczynam skanowanie EPG",
-    "Iniciando la exploraci�n de EPG",
-    "���� ������ EPG",
-    "P�b�rjar EPG skanning",
-    "Pornesc achizi�ia EPG",
-    "EPG adatok aktualiz�l�sa",
-    "",// TODO
-    "������� EPG-������������",
-    "Po�injem EPG-scan",
-    "EPG skaneerimine k�ivitatud",
-    "Starter EPG skanning",
-    "Za��n� prohled�v�n� EPG",
-    "EPG tarama ba�l�yor",
-  },
-  { "This plugin has no setup parameters!",
-    "Dieses Plugin hat keine Parameter!",
-    "Ta vstavek nima nastavitvenih parametrov!",
-    "Questo plugin non ha parametri di configurazione!",
-    "Deze plugin heeft geen instelparameters",
-    "",// TODO
-    "Ce plugin n'a pas de param�tres!",
-    "",// TODO
-    "T�ll� laajennoksella ei ole asetuksia!",
-    "Ta wtyczka nie ma �adnych ustawie�!",
-    "Este plugin no admite configuraci�n",
-    "���� � �������� ��� ���� �����������!",
-    "Den h�r modulen har inga parametrar",
-    "Acest plugin nu se configureaz�!",
-    "Ennek a plugin-nak nincs setup-parametere!",
-    "Aquest plugin no admet configuraci�!",
-    "������ �� ����� ���������� ���������!",
-    "Ovaj dodatak (Plugin) nema parametara!",
-    "Sellel laienudusmoodulil ei ole seadeid!",
-    "Denne plugin har ingen parametre",
-    "Modul nem� konfigura�n� parametry!",
-    "Bu eklentinin d�zenek parametresi yok!",
-  },
-  { "Classic VDR",
-    "Klassischer VDR",
-    "Klasi�ni VDR",
-    "VDR Classico",
-    "VDR Klassiek",
-    "",// TODO
-    "VDR Classique",// TODO
-    "",// TODO
-    "Klassinen VDR",
-    "Klasyczny VDR",
-    "VDR cl�sico",
-    "������� VDR",
-    "Klassisk VDR",
-    "VDR clasic",
-    "Klasszikus VDR",
-    "",// TODO
-    "������������",
-    "Klasi�ni VDR",
-    "Klassikaline VDR",
-    "Klassisk VDR",
-    "Klasick� VDR",
-    "Klasik VDR",
-  },
-  { "ST:TNG Panels",
-    "ST:TNG-Konsolen",
-    "ST:TNG Konsola",
-    "Consolle ST:TNG",
-    "ST:TNG Consoles",
-    "",// TODO
-    "Consoles ST:TNG",
-    "",// TODO
-    "ST:TNG konsoli",
-    "Panel ST:TNG",
-    "Paneles ST:TNG",
-    "������ ST:TNG",
-    "ST:TNG konsol",
-    "Cons. ST:TNG",
-    "ST:TNG Konzol",
-    "",// TODO
-    "ST:TNG ������",
-    "ST:TNG Konzole",
-    "ST:TNG konsool",
-    "ST:TNG konsol",
-    "ST:TNG konzola",
-    "ST:TNG paneli",
-  },
-  { "No title",
-    "Kein Titel",
-    "Brez naziva",
-    "Senza titolo",
-    "Geen titel",
-    "",// TODO
-    "Sans titre",
-    "",// TODO
-    "Ei esityst�",
-    "Bez tytu�u",
-    "Sin t�tulo",
-    "����� �����",
-    "ingen titel",
-    "F�r� titlu",
-    "n�v n�lk�l",
-    "",// TODO
-    "��� ��������",
-    "Bez titla",
-    "Pealkiri puudub",
-    "Ingen titel",
-    "Bez n�zvu",
-    "�sim yok",
-  },
-  { NULL }
-  };
+// TRANSLATORS: The name of the language, as written natively
+const char *LanguageName = trNOOP("LanguageName$English");
+// TRANSLATORS: The 3-letter code of the language
+const char *LanguageCode = trNOOP("LanguageCode$eng");
 
-// --- cI18nEntry ------------------------------------------------------------
+// List of known language codes with aliases.
+// Actually we could list all codes from http://www.loc.gov/standards/iso639-2
+// here, but that would be several hundreds - and for most of them it's unlikely
+// they're ever going to be used...
 
-class cI18nEntry : public cListObject {
-private:
-  const tI18nPhrase *phrases;
-  tI18nPhrase *converted;
-  const char *plugin;
-public:
-  cI18nEntry(const tI18nPhrase * const Phrases, const char *Plugin);
-  virtual ~cI18nEntry();
-  const tI18nPhrase *Phrases(void) { return phrases; }
-  tI18nPhrase **Converted(void) { return &converted; }
-  const char *Plugin(void) { return plugin; }
+const char *LanguageCodeList[] = {
+  "eng,dos",
+  "deu,ger",
+  "slv,slo",
+  "ita",
+  "dut,nla,nld",
+  "por",
+  "fra,fre",
+  "nor",
+  "fin,smi",
+  "pol",
+  "esl,spa",
+  "ell,gre",
+  "sve,swe",
+  "rom,rum",
+  "hun",
+  "cat,cln",
+  "rus",
+  "hrv",
+  "est",
+  "dan",
+  "cze,ces",
+  "tur",
+  NULL
   };
 
-cI18nEntry::cI18nEntry(const tI18nPhrase * const Phrases, const char *Plugin)
+static char *I18nLocaleDir = LOCDIR;
+
+static cStringList LanguageLocales;
+static cStringList LanguageNames;
+static cStringList LanguageCodes;
+
+static int CurrentLanguage = 0;
+
+static bool ContainsCode(const char *Codes, const char *Code)
 {
-  phrases = Phrases;
-  converted = NULL;
-  plugin = Plugin;
+  while (*Codes) {
+        int l = 0;
+        for ( ; l < 3 && Code[l]; l++) {
+            if (Codes[l] != tolower(Code[l]))
+               break;
+            }
+        if (l == 3)
+           return true;
+        Codes++;
+        }
+  return false;
 }
 
-cI18nEntry::~cI18nEntry()
+static const char *SkipContext(const char *s)
 {
-  delete converted;
+  const char *p = strchr(s, '$');
+  return p ? p + 1 : s;
 }
 
-// --- cI18nList -------------------------------------------------------------
-
-class cI18nList : public cList<cI18nEntry> {
-public:
-  cI18nEntry *Get(const char *Plugin);
-  };
-
-cI18nEntry *cI18nList::Get(const char *Plugin)
+void I18nInitialize(void)
 {
-  if (Plugin) {
-     for (cI18nEntry *p = First(); p; p = Next(p)) {
-         if (strcmp(p->Plugin(), Plugin) == 0)
-            return p;
+  LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
+  LanguageNames.Append(strdup(SkipContext(LanguageName)));
+  LanguageCodes.Append(strdup(LanguageCodeList[0]));
+  textdomain("vdr");
+  bindtextdomain("vdr", I18nLocaleDir);
+  cFileNameList Locales(I18nLocaleDir, true);
+  if (Locales.Size() > 0) {
+     dsyslog("found %d locales in %s", Locales.Size(), I18nLocaleDir);
+     char *OldLocale = strdup(setlocale(LC_MESSAGES, NULL));
+     for (int i = 0; i < Locales.Size(); i++) {
+         if (i < I18N_MAX_LANGUAGES - 1) {
+            if (setlocale(LC_MESSAGES, Locales[i])) {
+               if (strstr(OldLocale, Locales[i]) == OldLocale)
+                  CurrentLanguage = LanguageLocales.Size();
+               LanguageLocales.Append(strdup(Locales[i]));
+               LanguageNames.Append(strdup(gettext(LanguageName)));
+               const char *Code = gettext(LanguageCode);
+               for (const char **lc = LanguageCodeList; *lc; lc++) {
+                   if (ContainsCode(*lc, Code)) {
+                      Code = *lc;
+                      break;
+                      }
+                   }
+               LanguageCodes.Append(strdup(Code));
+               }
+            }
+         else
+            esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
          }
+     setlocale(LC_MESSAGES, OldLocale);
+     free(OldLocale);
      }
-  return NULL;
+  // Prepare any known language codes for which there was no locale:
+  for (const char **lc = LanguageCodeList; *lc; lc++) {
+      bool Found = false;
+      for (int i = 0; i < LanguageCodes.Size(); i++) {
+          if (strcmp(*lc, LanguageCodes[i]) == 0) {
+             Found = true;
+             break;
+             }
+          }
+      if (!Found) {
+         dsyslog("no locale for language code '%s'", *lc);
+         LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
+         LanguageNames.Append(strdup(*lc));
+         LanguageCodes.Append(strdup(*lc));
+         }
+      }
 }
 
-cI18nList I18nList;
+void I18nRegister(const char *Plugin)
+{
+  bindtextdomain(Plugin, I18nLocaleDir);
+}
 
-// ---
+void I18nSetLocale(const char *Locale)
+{
+  if (Locale && *Locale) {
+     int i = LanguageLocales.Find(Locale);
+     if (i >= 0) {
+        CurrentLanguage = i;
+        setlocale(LC_MESSAGES, Locale);
+        }
+     else
+        dsyslog("unknown locale: '%s'", Locale);
+     }
+}
 
-static tI18nPhrase *Converted = NULL;
+int I18nCurrentLanguage(void)
+{
+  return CurrentLanguage;
+}
 
-static const char *ConvertPhrase(const tI18nPhrase *Original, tI18nPhrase **Converted, int NrPhrase, int NrLanguage)
+void I18nSetLanguage(int Language)
 {
-  if (!*Converted) {
-     int NumPhrases = 0;
-     for (const tI18nPhrase *p = Original; **p; p++)
-         NumPhrases++;
-     *Converted = new tI18nPhrase[NumPhrases + 1];
-     memset(*Converted, 0, sizeof(tI18nPhrase) * (NumPhrases + 1));
-     }
-  if (!(*Converted)[NrPhrase][NrLanguage] && Original[NrPhrase][NrLanguage]) {
-     cCharSetConv csc(Phrases[1][NrLanguage], cCharSetConv::SystemCharacterTable());
-     (*Converted)[NrPhrase][NrLanguage] = strdup(csc.Convert(Original[NrPhrase][NrLanguage]));
+  if (Language < LanguageNames.Size()) {
+     CurrentLanguage = Language;
+     I18nSetLocale(I18nLocale(CurrentLanguage));
      }
-  return (*Converted)[NrPhrase][NrLanguage];
 }
 
-void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin)
+const cStringList *I18nLanguages(void)
 {
-  cI18nEntry *p = I18nList.Get(Plugin);
-  if (p)
-     I18nList.Del(p);
-  if (Phrases)
-     I18nList.Add(new cI18nEntry(Phrases, Plugin));
+  return &LanguageNames;
 }
 
 const char *I18nTranslate(const char *s, const char *Plugin)
 {
-  if (Setup.OSDLanguage) {
-     cI18nEntry *e = Plugin ? I18nList.Get(Plugin) : NULL;
-     const tI18nPhrase *OriginalPhrases = e ? e->Phrases() : Phrases;
-     tI18nPhrase **ConvertedPhrases = e ? e->Converted() : &Converted;
-     const tI18nPhrase *p = OriginalPhrases;
-     for (int i = ((p == Phrases) ? 1 : 2); i--; ) {
-         for (; **p; p++) {
-             if (strcmp(s, **p) == 0) {
-                const char *t = ConvertPhrase(OriginalPhrases, ConvertedPhrases, p - OriginalPhrases, Setup.OSDLanguage);
-                if (t && *t)
-                   return t;
-                }
-             }
-         p = OriginalPhrases = Phrases;
-         ConvertedPhrases = &Converted;
-         }
-     esyslog("%s%sno translation found for '%s' in language %d (%s)", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]);
+  if (CurrentLanguage) {
+     const char *t = s;
+     if (Plugin)
+        t = dgettext(Plugin, s);
+     if (t == s)
+        t = gettext(s);
+     s = t;
      }
   const char *p = strchr(s, '$');
   return p ? p + 1 : s;
 }
 
-const char * const * I18nLanguages(void)
+const char *I18nLocale(int Language)
 {
-  if (!Converted || !(Converted)[0][0]) {
-     for (int i = 0; i < I18nNumLanguages; i++)
-         ConvertPhrase(Phrases, &Converted, 0, i);
-     }
-  return &Converted[0][0];
+  return 0 <= Language && Language < LanguageLocales.Size() ? LanguageLocales[Language] : NULL;
 }
 
-const char * const * I18nCharSets(void)
+const char *I18nLanguageCode(int Language)
 {
-  return &Phrases[1][0];
-}
-
-const char *I18nLanguageCode(int Index)
-{
-  return 0 <= Index && Index < I18nNumLanguages ? Phrases[2][Index] : NULL;
+  return 0 <= Language && Language < LanguageCodes.Size() ? LanguageCodes[Language] : NULL;
 }
 
 int I18nLanguageIndex(const char *Code)
 {
-  for (int i = 0; i < I18nNumLanguages; i++) {
-      const char *s = Phrases[2][i];
-      while (*s) {
-            int l = 0;
-            for ( ; l < 3 && Code[l]; l++) {
-                if (s[l] != tolower(Code[l]))
-                   break;
-                }
-            if (l == 3)
-               return i;
-            s++;
-            }
+  for (int i = 0; i < LanguageCodes.Size(); i++) {
+      if (ContainsCode(LanguageCodes[i], Code))
+         return i;
       }
   //dsyslog("unknown language code: '%s'", Code);
   return -1;
@@ -7096,7 +249,7 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
   bool found = false;
   while (LanguageCode) {
         int LanguageIndex = I18nLanguageIndex(LanguageCode);
-        for (int i = 0; i < I18nNumLanguages; i++) {
+        for (int i = 0; i < LanguageCodes.Size(); i++) {
             if (PreferredLanguages[i] < 0)
                break; // the language is not a preferred one
             if (PreferredLanguages[i] == LanguageIndex) {
@@ -7117,7 +270,7 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
            *Position = 0;
         }
   if (OldPreference < 0) {
-     OldPreference = I18nNumLanguages; // higher than the maximum possible value
+     OldPreference = LanguageCodes.Size(); // higher than the maximum possible value
      return true; // if we don't find a preferred one, we take the first one
      }
   return found;
diff --git a/i18n.h b/i18n.h
index 7f9f0659c..46c6a5e12 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,25 +4,58 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.20 2007/05/28 11:43:14 kls Exp $
+ * $Id: i18n.h 1.21 2007/08/10 13:53:57 kls Exp $
  */
 
 #ifndef __I18N_H
 #define __I18N_H
 
 #include <stdio.h>
+#include "tools.h"
 
-const int I18nNumLanguages = 22;
+typedef const char *tI18nPhrase[22]; ///< obsolete - switch to 'gettext'!
 
-typedef const char *tI18nPhrase[I18nNumLanguages];
-
-void I18nRegister(const tI18nPhrase * const Phrases, const char *Plugin);
+#define I18N_DEFAULT_LOCALE "en_US"
+#define I18N_MAX_LOCALE_LEN 16       // for buffers that hold en_US etc.
+#define I18N_MAX_LANGUAGES  256      // for buffers that hold all available languages
 
+void I18nInitialize(void);
+   ///< Detects all available locales and loads the language names and codes.
+void I18nRegister(const char *Plugin);
+   ///< Registers the named plugin, so that it can use internationalized texts.
+void I18nSetLocale(const char *Locale);
+   ///< Sets the current locale to Locale. The default locale is "en_US".
+   ///< If no such locale has been found in the call to I18nInitialize(),
+   ///< nothing happens.
+int I18nCurrentLanguage(void);
+   ///< Returns the index of the current language. This number stays the
+   ///< same for any given language while the program is running, but may
+   ///< be different when the program is run again (for instance because
+   ///< a locale has been added or removed). The default locale ("en_US")
+   ///< always has a zero index.
+void I18nSetLanguage(int Language);
+   ///< Sets the current language index to Language. If Language is outside
+   ///< the range of available languages, nothing happens.
+const cStringList *I18nLanguages(void);
+   ///< Returns the list of available languages. Values returned by
+   ///< I18nCurrentLanguage() are indexes into this list.
 const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1);
-
-const char * const * I18nLanguages(void);
-const char *I18nLanguageCode(int Index);
+   ///< Translates the given string (with optional Plugin context) into
+   ///< the current language. If no translation is available, the original
+   ///< string will be returned.
+const char *I18nLocale(int Language);
+   ///< Returns the locale code of the given Language (which is an index as
+   ///< returned by I18nCurrentLanguage()). If Language is outside the range
+   ///< of available languages, NULL is returned.
+const char *I18nLanguageCode(int Language);
+   ///< Returns the three letter language code of the given Language (which
+   ///< is an index as returned by I18nCurrentLanguage()). If Language is
+   ///< outside the range of available languages, NULL is returned.
+   ///< The returned string may consist of several alternative three letter
+   ///< language codes, separated by commas (as in "deu,ger").
 int I18nLanguageIndex(const char *Code);
+   ///< Returns the index of the language with the given three letter
+   ///< language Code. If no suitable language is found, -1 is returned.
 const char *I18nNormalizeLanguageCode(const char *Code);
    ///< Returns a 3 letter language code that may not be zero terminated.
    ///< If no normalized language code can be found, the given Code is returned.
@@ -44,4 +77,6 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
 #define tr(s)  I18nTranslate(s)
 #endif
 
+#define trNOOP(s) (s)
+
 #endif //__I18N_H
diff --git a/interface.c b/interface.c
index 9c4aefa9a..efdf7371d 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.75 2006/03/31 14:20:04 kls Exp $
+ * $Id: interface.c 1.76 2007/08/04 14:39:25 kls Exp $
  */
 
 #include "interface.h"
@@ -87,9 +87,7 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
      eKeys NewKey = kUp;
      while (NewKey != kNone) {
            char *Prompt;
-           char buf[32];
-           snprintf(buf, sizeof(buf), "Key$%s", cKey::ToString(NewKey));
-           asprintf(&Prompt, tr("Press key for '%s'"), tr(buf));
+           asprintf(&Prompt, tr("Press key for '%s'"), cKey::ToString(NewKey, true));
            DisplayMenu->SetItem(Prompt, 4, false, false);
            free(Prompt);
            cRemote::Clear();
diff --git a/keys.c b/keys.c
index 577dae222..58ae1fa6e 100644
--- a/keys.c
+++ b/keys.c
@@ -4,69 +4,69 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.14 2006/10/14 10:18:05 kls Exp $
+ * $Id: keys.c 1.15 2007/08/11 11:30:18 kls Exp $
  */
 
 #include "keys.h"
 #include "plugin.h"
 
 static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
-                    { kUp,            "Up"         },
-                    { kDown,          "Down"       },
-                    { kMenu,          "Menu"       },
-                    { kOk,            "Ok"         },
-                    { kBack,          "Back"       },
-                    { kLeft,          "Left"       },
-                    { kRight,         "Right"      },
-                    { kRed,           "Red"        },
-                    { kGreen,         "Green"      },
-                    { kYellow,        "Yellow"     },
-                    { kBlue,          "Blue"       },
-                    { k0,             "0"          },
-                    { k1,             "1"          },
-                    { k2,             "2"          },
-                    { k3,             "3"          },
-                    { k4,             "4"          },
-                    { k5,             "5"          },
-                    { k6,             "6"          },
-                    { k7,             "7"          },
-                    { k8,             "8"          },
-                    { k9,             "9"          },
-                    { kInfo,          "Info"       },
-                    { kPlay,          "Play"       },
-                    { kPause,         "Pause"      },
-                    { kStop,          "Stop"       },
-                    { kRecord,        "Record"     },
-                    { kFastFwd,       "FastFwd"    },
-                    { kFastRew,       "FastRew"    },
-                    { kNext,          "Next"       },
-                    { kPrev,          "Prev"       },
-                    { kPower,         "Power"      },
-                    { kChanUp,        "Channel+"   },
-                    { kChanDn,        "Channel-"   },
-                    { kChanPrev,      "PrevChannel"},
-                    { kVolUp,         "Volume+"    },
-                    { kVolDn,         "Volume-"    },
-                    { kMute,          "Mute"       },
-                    { kAudio,         "Audio"      },
-                    { kSchedule,      "Schedule"   },
-                    { kChannels,      "Channels"   },
-                    { kTimers,        "Timers"     },
-                    { kRecordings,    "Recordings" },
-                    { kSetup,         "Setup"      },
-                    { kCommands,      "Commands"   },
-                    { kUser1,         "User1"      },
-                    { kUser2,         "User2"      },
-                    { kUser3,         "User3"      },
-                    { kUser4,         "User4"      },
-                    { kUser5,         "User5"      },
-                    { kUser6,         "User6"      },
-                    { kUser7,         "User7"      },
-                    { kUser8,         "User8"      },
-                    { kUser9,         "User9"      },
-                    { kNone,          ""           },
-                    { k_Setup,        "_Setup"     },
-                    { kNone,          NULL         },
+                    { kUp,            trNOOP("Key$Up")          },
+                    { kDown,          trNOOP("Key$Down")        },
+                    { kMenu,          trNOOP("Key$Menu")        },
+                    { kOk,            trNOOP("Key$Ok")          },
+                    { kBack,          trNOOP("Key$Back")        },
+                    { kLeft,          trNOOP("Key$Left")        },
+                    { kRight,         trNOOP("Key$Right")       },
+                    { kRed,           trNOOP("Key$Red")         },
+                    { kGreen,         trNOOP("Key$Green")       },
+                    { kYellow,        trNOOP("Key$Yellow")      },
+                    { kBlue,          trNOOP("Key$Blue")        },
+                    { k0,                    "0"                },
+                    { k1,                    "1"                },
+                    { k2,                    "2"                },
+                    { k3,                    "3"                },
+                    { k4,                    "4"                },
+                    { k5,                    "5"                },
+                    { k6,                    "6"                },
+                    { k7,                    "7"                },
+                    { k8,                    "8"                },
+                    { k9,                    "9"                },
+                    { kInfo,          trNOOP("Key$Info")        },
+                    { kPlay,          trNOOP("Key$Play")        },
+                    { kPause,         trNOOP("Key$Pause")       },
+                    { kStop,          trNOOP("Key$Stop")        },
+                    { kRecord,        trNOOP("Key$Record")      },
+                    { kFastFwd,       trNOOP("Key$FastFwd")     },
+                    { kFastRew,       trNOOP("Key$FastRew")     },
+                    { kNext,          trNOOP("Key$Next")        },
+                    { kPrev,          trNOOP("Key$Prev")        },
+                    { kPower,         trNOOP("Key$Power")       },
+                    { kChanUp,        trNOOP("Key$Channel+")    },
+                    { kChanDn,        trNOOP("Key$Channel-")    },
+                    { kChanPrev,      trNOOP("Key$PrevChannel") },
+                    { kVolUp,         trNOOP("Key$Volume+")     },
+                    { kVolDn,         trNOOP("Key$Volume-")     },
+                    { kMute,          trNOOP("Key$Mute")        },
+                    { kAudio,         trNOOP("Key$Audio")       },
+                    { kSchedule,      trNOOP("Key$Schedule")    },
+                    { kChannels,      trNOOP("Key$Channels")    },
+                    { kTimers,        trNOOP("Key$Timers")      },
+                    { kRecordings,    trNOOP("Key$Recordings")  },
+                    { kSetup,         trNOOP("Key$Setup")       },
+                    { kCommands,      trNOOP("Key$Commands")    },
+                    { kUser1,         trNOOP("Key$User1")       },
+                    { kUser2,         trNOOP("Key$User2")       },
+                    { kUser3,         trNOOP("Key$User3")       },
+                    { kUser4,         trNOOP("Key$User4")       },
+                    { kUser5,         trNOOP("Key$User5")       },
+                    { kUser6,         trNOOP("Key$User6")       },
+                    { kUser7,         trNOOP("Key$User7")       },
+                    { kUser8,         trNOOP("Key$User8")       },
+                    { kUser9,         trNOOP("Key$User9")       },
+                    { kNone,                 ""                 },
+                    { k_Setup,               "_Setup"           },
+                    { kNone,                 NULL               },
                   };
 
 // -- cKey -------------------------------------------------------------------
@@ -121,18 +121,29 @@ eKeys cKey::FromString(const char *Name)
 {
   if (Name) {
      for (tKey *k = keyTable; k->name; k++) {
-         if (strcasecmp(k->name, Name) == 0)
+         const char *n = k->name;
+         const char *p = strchr(n, '$');
+         if (p)
+            n = p + 1;
+         if (strcasecmp(n, Name) == 0)
             return k->type;
          }
      }
   return kNone;
 }
 
-const char *cKey::ToString(eKeys Key)
+const char *cKey::ToString(eKeys Key, bool Translate)
 {
   for (tKey *k = keyTable; k->name; k++) {
-      if (k->type == Key)
-         return k->name;
+      if (k->type == Key) {
+         const char *n = k->name;
+         if (Translate)
+            n = tr(n);
+         const char *p = strchr(n, '$');
+         if (p)
+            n = p + 1;
+         return n;
+         }
       }
   return NULL;
 }
diff --git a/keys.h b/keys.h
index 0799a3b4f..da4b7a459 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.11 2007/02/25 10:49:35 kls Exp $
+ * $Id: keys.h 1.12 2007/08/04 14:40:23 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -100,7 +100,7 @@ class cKey : public cListObject {
   bool Parse(char *s);
   bool Save(FILE *f);
   static eKeys FromString(const char *Name);
-  static const char *ToString(eKeys Key);
+  static const char *ToString(eKeys Key, bool Translate = false);
   };
 
 class cKeys : public cConfig<cKey> {
diff --git a/menu.c b/menu.c
index 4d53b85c5..69621efbb 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.456 2007/06/23 09:27:13 kls Exp $
+ * $Id: menu.c 1.459 2007/08/12 10:44:35 kls Exp $
  */
 
 #include "menu.h"
@@ -630,7 +630,7 @@ eOSState cMenuText::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
-                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
                   return osContinue;
     default: break;
     }
@@ -980,7 +980,7 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
-                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
                   return osContinue;
     default: break;
     }
@@ -1809,7 +1809,7 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
-                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
+                  cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
                   return osContinue;
     default: break;
     }
@@ -2153,6 +2153,7 @@ void cMenuSetupBase::Store(void)
 class cMenuSetupOSD : public cMenuSetupBase {
 private:
   const char *useSmallFontTexts[3];
+  int osdLanguageIndex;
   int numSkins;
   int originalSkinIndex;
   int skinIndex;
@@ -2171,6 +2172,7 @@ class cMenuSetupOSD : public cMenuSetupBase {
 
 cMenuSetupOSD::cMenuSetupOSD(void)
 {
+  osdLanguageIndex = I18nCurrentLanguage();
   numSkins = Skins.Count();
   skinIndex = originalSkinIndex = Skins.Current()->Index();
   skinDescriptions = new const char*[numSkins];
@@ -2203,7 +2205,7 @@ void cMenuSetupOSD::Set(void)
   useSmallFontTexts[2] = tr("always");
   Clear();
   SetSection(tr("OSD"));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &data.OSDLanguage, I18nNumLanguages, I18nLanguages()));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &osdLanguageIndex, I18nLanguages()->Size(), &I18nLanguages()->At(0)));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"),                   &skinIndex, numSkins, skinDescriptions));
   if (themes.NumThemes())
   Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"),                  &themeIndex, themes.NumThemes(), themes.Descriptions()));
@@ -2237,6 +2239,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
   bool ModifiedApperance = false;
 
   if (Key == kOk) {
+     I18nSetLocale(data.OSDLanguage);
      if (skinIndex != originalSkinIndex) {
         cSkin *Skin = Skins.Get(skinIndex);
         if (Skin) {
@@ -2273,16 +2276,17 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         }
      }
 
-  int osdLanguage = data.OSDLanguage;
   int oldSkinIndex = skinIndex;
+  int oldOsdLanguageIndex = osdLanguageIndex;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (ModifiedApperance)
      SetDisplayMenu();
 
-  if (data.OSDLanguage != osdLanguage || skinIndex != oldSkinIndex) {
-     int OriginalOSDLanguage = Setup.OSDLanguage;
-     Setup.OSDLanguage = data.OSDLanguage;
+  if (osdLanguageIndex != oldOsdLanguageIndex || skinIndex != oldSkinIndex) {
+     strn0cpy(data.OSDLanguage, I18nLocale(osdLanguageIndex), sizeof(data.OSDLanguage));
+     int OriginalOSDLanguage = I18nCurrentLanguage();
+     I18nSetLanguage(osdLanguageIndex);
 
      cSkin *Skin = Skins.Get(skinIndex);
      if (Skin) {
@@ -2294,7 +2298,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         }
 
      Set();
-     Setup.OSDLanguage = OriginalOSDLanguage;
+     I18nSetLanguage(OriginalOSDLanguage);
      }
   return state;
 }
@@ -2313,7 +2317,7 @@ class cMenuSetupEPG : public cMenuSetupBase {
 
 cMenuSetupEPG::cMenuSetupEPG(void)
 {
-  for (numLanguages = 0; numLanguages < I18nNumLanguages && data.EPGLanguages[numLanguages] >= 0; numLanguages++)
+  for (numLanguages = 0; numLanguages < I18nLanguages()->Size() && data.EPGLanguages[numLanguages] >= 0; numLanguages++)
       ;
   originalNumLanguages = numLanguages;
   SetSection(tr("EPG"));
@@ -2333,9 +2337,11 @@ void cMenuSetupEPG::Setup(void)
   Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"),           &data.SetSystemTime));
   if (data.SetSystemTime)
      Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder, &data.TimeSource));
-  Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"),       &numLanguages, 0, I18nNumLanguages));
+  // TRANSLATORS: note the plural!
+  Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"),       &numLanguages, 0, I18nLanguages()->Size()));
   for (int i = 0; i < numLanguages; i++)
-     Add(new cMenuEditStraItem(tr("Setup.EPG$Preferred language"),     &data.EPGLanguages[i], I18nNumLanguages, I18nLanguages()));
+      // TRANSLATORS: note the singular!
+      Add(new cMenuEditStraItem(tr("Setup.EPG$Preferred language"),    &data.EPGLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
 
   SetCurrent(Get(current));
   Display();
@@ -2365,7 +2371,7 @@ eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
      if (numLanguages != oldnumLanguages || data.SetSystemTime != oldSetSystemTime) {
         for (int i = oldnumLanguages; i < numLanguages; i++) {
             data.EPGLanguages[i] = 0;
-            for (int l = 0; l < I18nNumLanguages; l++) {
+            for (int l = 0; l < I18nLanguages()->Size(); l++) {
                 int k;
                 for (k = 0; k < oldnumLanguages; k++) {
                     if (data.EPGLanguages[k] == l)
@@ -2404,7 +2410,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
 
 cMenuSetupDVB::cMenuSetupDVB(void)
 {
-  for (numAudioLanguages = 0; numAudioLanguages < I18nNumLanguages && data.AudioLanguages[numAudioLanguages] >= 0; numAudioLanguages++)
+  for (numAudioLanguages = 0; numAudioLanguages < I18nLanguages()->Size() && data.AudioLanguages[numAudioLanguages] >= 0; numAudioLanguages++)
       ;
   originalNumAudioLanguages = numAudioLanguages;
   videoDisplayFormatTexts[0] = tr("pan&scan");
@@ -2433,9 +2439,9 @@ void cMenuSetupDVB::Setup(void)
      Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"),     &data.UseDolbyDigital));
   Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"),       &data.UpdateChannels, 6, updateChannelsTexts));
-  Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nNumLanguages));
+  Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nLanguages()->Size()));
   for (int i = 0; i < numAudioLanguages; i++)
-      Add(new cMenuEditStraItem(tr("Setup.DVB$Audio language"),    &data.AudioLanguages[i], I18nNumLanguages, I18nLanguages()));
+      Add(new cMenuEditStraItem(tr("Setup.DVB$Audio language"),    &data.AudioLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
 
   SetCurrent(Get(current));
   Display();
@@ -2455,7 +2461,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
      if (numAudioLanguages != oldnumAudioLanguages) {
         for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
             data.AudioLanguages[i] = 0;
-            for (int l = 0; l < I18nNumLanguages; l++) {
+            for (int l = 0; l < I18nLanguages()->Size(); l++) {
                 int k;
                 for (k = 0; k < oldnumAudioLanguages; k++) {
                     if (data.AudioLanguages[k] == l)
@@ -2826,7 +2832,7 @@ eOSState cMenuSetup::Restart(void)
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
 {
-  int osdLanguage = Setup.OSDLanguage;
+  int osdLanguage = I18nCurrentLanguage();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   switch (state) {
@@ -2842,7 +2848,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
     case osUser10: return Restart();
     default: ;
     }
-  if (Setup.OSDLanguage != osdLanguage) {
+  if (I18nCurrentLanguage() != osdLanguage) {
      Set();
      if (!HasSubMenu())
         Display();
@@ -2868,7 +2874,8 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 
 // --- cMenuMain -------------------------------------------------------------
 
-#define STOP_RECORDING tr(" Stop recording ")
+// TRANSLATORS: note the leading and trailing blanks!
+#define STOP_RECORDING trNOOP(" Stop recording ")
 
 cOsdObject *cMenuMain::pluginOsdObject = NULL;
 
@@ -2967,6 +2974,7 @@ bool cMenuMain::Update(bool Force)
      replaying = NewReplaying;
      // Replay control:
      if (replaying && !stopReplayItem)
+        // TRANSLATORS: note the leading blank!
         Add(stopReplayItem = new cOsdItem(tr(" Stop replaying"), osStopReplay));
      else if (stopReplayItem && !replaying) {
         Del(stopReplayItem->Index());
@@ -2980,6 +2988,7 @@ bool cMenuMain::Update(bool Force)
   // Editing control:
   bool CutterActive = cCutter::Active();
   if (CutterActive && !cancelEditingItem) {
+     // TRANSLATORS: note the leading blank!
      Add(cancelEditingItem = new cOsdItem(tr(" Cancel editing"), osCancelEdit));
      result = true;
      }
@@ -2999,7 +3008,7 @@ bool cMenuMain::Update(bool Force)
      const char *s = NULL;
      while ((s = cRecordControls::GetInstantId(s)) != NULL) {
            char *buffer = NULL;
-           asprintf(&buffer, "%s%s", STOP_RECORDING, s);
+           asprintf(&buffer, "%s%s", tr(STOP_RECORDING), s);
            cOsdItem *item = new cOsdItem(osStopRecord);
            item->SetText(buffer, false);
            Add(item);
@@ -3015,7 +3024,7 @@ bool cMenuMain::Update(bool Force)
 eOSState cMenuMain::ProcessKey(eKeys Key)
 {
   bool HadSubMenu = HasSubMenu();
-  int osdLanguage = Setup.OSDLanguage;
+  int osdLanguage = I18nCurrentLanguage();
   eOSState state = cOsdMenu::ProcessKey(Key);
   HadSubMenu |= HasSubMenu();
 
@@ -3029,7 +3038,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
                           cOsdItem *item = Get(Current());
                           if (item) {
-                             cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING));
+                             cRecordControls::Stop(item->Text() + strlen(tr(STOP_RECORDING)));
                              return osEnd;
                              }
                           }
@@ -3080,7 +3089,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
   if (!HasSubMenu() && Update(HadSubMenu))
      Display();
   if (Key != kNone) {
-     if (Setup.OSDLanguage != osdLanguage) {
+     if (I18nCurrentLanguage() != osdLanguage) {
         Set();
         if (!HasSubMenu())
            Display();
@@ -3482,6 +3491,7 @@ cDisplayTracks::cDisplayTracks(void)
          numTracks++;
          }
       }
+  descriptions[numTracks] = 0;
   timeout.Set(TRACKTIMEOUT);
   displayTracks = Skins.Current()->DisplayTracks(tr("Button$Audio"), numTracks, descriptions);
   Show();
@@ -4026,6 +4036,7 @@ bool cReplayControl::ShowProgress(bool Initial)
 void cReplayControl::TimeSearchDisplay(void)
 {
   char buf[64];
+  // TRANSLATORS: note the trailing blank!
   strcpy(buf, tr("Jump: "));
   int len = strlen(buf);
   char h10 = '0' + (timeSearchTime >> 24);
diff --git a/menu.h b/menu.h
index 9851ae12c..1613aa4e7 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.87 2007/01/05 10:40:54 kls Exp $
+ * $Id: menu.h 1.88 2007/08/12 10:35:42 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -115,7 +115,7 @@ class cDisplayTracks : public cOsdObject {
   cSkinDisplayTracks *displayTracks;
   cTimeMs timeout;
   eTrackType types[ttMaxTrackTypes];
-  char *descriptions[ttMaxTrackTypes];
+  char *descriptions[ttMaxTrackTypes + 1]; // list is NULL terminated
   int numTracks, track, audioChannel;
   static cDisplayTracks *currentDisplayTracks;
   virtual void Show(void);
diff --git a/menuitems.c b/menuitems.c
index 1b8a5742d..44661ec15 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.49 2007/06/08 15:16:38 kls Exp $
+ * $Id: menuitems.c 1.50 2007/08/04 09:12:18 kls Exp $
  */
 
 #include "menuitems.h"
@@ -18,7 +18,7 @@
 
 #define AUTO_ADVANCE_TIMEOUT  1500 // ms before auto advance when entering characters via numeric keys
 
-const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@";
+const char *FileNameChars = trNOOP(" abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@");
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -316,7 +316,7 @@ void cMenuEditStrItem::LeaveEditMode(bool SaveValue)
 void cMenuEditStrItem::SetHelpKeys(void)
 {
   if (InEditMode())
-     cSkinDisplay::Current()->SetButtons(tr("Button$ABC/abc"), tr(insert ? "Button$Overwrite" : "Button$Insert"), tr("Button$Delete"));
+     cSkinDisplay::Current()->SetButtons(tr("Button$ABC/abc"), insert ? tr("Button$Overwrite") : tr("Button$Insert"), tr("Button$Delete"));
   else
      cSkinDisplay::Current()->SetButtons(NULL);
 }
diff --git a/newplugin b/newplugin
index 30622868d..c35ae7e6b 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.32 2007/04/28 14:46:39 kls Exp $
+# $Id: newplugin 1.34 2007/08/12 11:04:39 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -35,7 +35,11 @@ Project's homepage:          URL
 
 Latest version available at: URL
 
-See the file COPYING for license information.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 };
@@ -109,7 +113,7 @@ OBJS = \$(PLUGIN).o
 %.o: %.c
 	\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) \$<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = \$(CXX) -MM -MG
 DEPFILE = .dependencies
@@ -118,9 +122,34 @@ DEPFILE = .dependencies
 
 -include \$(DEPFILE)
 
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = \$(VDRDIR)/locale
+I18Npo    = \$(wildcard \$(PODIR)/*.po)
+I18Nmo    = \$(addsuffix .mo, \$(foreach file, \$(I18Npo), \$(basename \$(file))))
+I18Ndirs  = \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))
+I18Npot   = \$(PODIR)/\$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o \$\@ \$<
+
+\$(I18Npot): \$(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$(wildcard *.c)
+
+\$(I18Npo): \$(I18Npot)
+	msgmerge -U --no-wrap -F --backup=none -q \$\@ \$<
+
+i18n: \$(I18Nmo)
+	\@mkdir -p \$(LOCALEDIR)
+	for i in \$(I18Ndirs); do\\
+	    mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\
+	    cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/\$(PLUGIN).mo;\\
+	    done
+
 ### Targets:
 
-all: libvdr-\$(PLUGIN).so
+all: libvdr-\$(PLUGIN).so i18n
 
 libvdr-\$(PLUGIN).so: \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
@@ -135,7 +164,7 @@ dist: clean
 	\@echo Distribution package created as \$(PACKAGE).tgz
 
 clean:
-	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~
+	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~ \$(PODIR)/*.mo \$(PODIR)/*.pot
 };
 
 $MAIN = qq
diff --git a/osd.c b/osd.c
index c60518c43..3be8fc7f6 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.71 2007/07/20 14:51:36 kls Exp $
+ * $Id: osd.c 1.72 2007/08/12 11:33:17 kls Exp $
  */
 
 #include "osd.h"
@@ -321,6 +321,8 @@ bool cBitmap::LoadXpm(const char *FileName)
 
 bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
 {
+  if (!Xpm)
+     return false;
   const char *const *p = Xpm;
   int w, h, n, c;
   if (4 != sscanf(*p, "%d %d %d %d", &w, &h, &n, &c)) {
diff --git a/plugin.c b/plugin.c
index 16087cf6d..a39453cd1 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.25 2007/02/24 13:44:23 kls Exp $
+ * $Id: plugin.c 1.26 2007/08/05 12:48:50 kls Exp $
  */
 
 #include "plugin.h"
@@ -35,12 +35,12 @@ cPlugin::cPlugin(void)
 
 cPlugin::~cPlugin()
 {
-  I18nRegister(NULL, Name());
 }
 
 void cPlugin::SetName(const char *s)
 {
   name = s;
+  I18nRegister(name);
 }
 
 const char *cPlugin::CommandLineHelp(void)
@@ -130,9 +130,9 @@ cString cPlugin::SVDRPCommand(const char *Command, const char *Option, int &Repl
   return NULL;
 }
 
-void cPlugin::RegisterI18n(const tI18nPhrase * const Phrases)
+void cPlugin::RegisterI18n(const void *)
 {
-  I18nRegister(Phrases, Name());
+  dsyslog("plugin '%s' called obsolete function RegisterI18n()", Name());
 }
 
 void cPlugin::SetConfigDirectory(const char *Dir)
@@ -338,10 +338,7 @@ bool cPluginManager::InitializePlugins(void)
   for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
       cPlugin *p = dll->Plugin();
       if (p) {
-         int Language = Setup.OSDLanguage;
-         Setup.OSDLanguage = 0; // the i18n texts are only available _after_ Start()
          isyslog("initializing plugin: %s (%s): %s", p->Name(), p->Version(), p->Description());
-         Setup.OSDLanguage = Language;
          if (!p->Initialize())
             return false;
          }
@@ -354,10 +351,7 @@ bool cPluginManager::StartPlugins(void)
   for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
       cPlugin *p = dll->Plugin();
       if (p) {
-         int Language = Setup.OSDLanguage;
-         Setup.OSDLanguage = 0; // the i18n texts are only available _after_ Start()
          isyslog("starting plugin: %s", p->Name());
-         Setup.OSDLanguage = Language;
          if (!p->Start())
             return false;
          p->started = true;
diff --git a/plugin.h b/plugin.h
index ddb498c18..f457bd04b 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.14 2007/02/24 13:45:28 kls Exp $
+ * $Id: plugin.h 1.15 2007/08/04 09:56:26 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -51,7 +51,7 @@ class cPlugin {
   void SetupStore(const char *Name, const char *Value = NULL);
   void SetupStore(const char *Name, int Value);
 
-  void RegisterI18n(const tI18nPhrase * const Phrases);
+  void RegisterI18n(const void *); ///< This function is obsolete and may be removed in future versions of VDR!
 
   virtual bool Service(const char *Id, void *Data = NULL);
   virtual const char **SVDRPHelpPages(void);
diff --git a/po/ca_ES.po b/po/ca_ES.po
new file mode 100644
index 000000000..a23a19e7f
--- /dev/null
+++ b/po/ca_ES.po
@@ -0,0 +1,1272 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Marc Rovira Vall <tm05462@salleURL.edu>, 2003
+# Ramon Roca <ramon.roca@xcombo.com>, 2003
+# Jordi Vil� <jvila@tinet.org>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal incorrecte ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Canal no disponible!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "No puc iniciar el mode de transfer�ncia!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr ""
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr ""
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Catal�"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "cat"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: Detectant el tipus de receptor"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Premeu qualsevol tecla del comandament"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Codi detectat!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "No premeu cap tecla..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: Aprenentantge de les funcions"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Premeu una tecla per '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Premeu 'Amunt' per confirmar"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Premeu 'Avall' per continuar"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Premeu 'Amunt' per retornar)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Premeu 'Avall' per finalitzar l'aprenentatge)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "Premeu 'Men�' per obviar aquesta tecla"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Aprenent les tecles del comandament a dist�ncia"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: Guardant els codis de les tecles"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Premeu 'Amunt' per guardar, 'Avall' per anul�lar"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Amunt"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Avall"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Men�"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "D'acord"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Retornar"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Esquerra"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Dreta"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Vermell"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Verd"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Groc"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Blau"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr ""
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Reproduir"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pausa"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Aturar"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Gravar"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Endavant r�pidament"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Enrera r�pidament"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Aturar"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Canal +"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Canal -"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volum +"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volum -"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "En silenci"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr ""
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Guia de Programaci�"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Canals"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Temporitzadors"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Veure programes gravats"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Configuraci�"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Ordres"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr ""
+
+#: menu.c:71
+msgid "encrypted"
+msgstr ""
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Editar canal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nom"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Origen"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Freq��ncia"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "PID V�deo"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "PID �udio (1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "PID �udio (2)"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "PID AC3 (1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "PID AC3 (2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "PID Teletext"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Acc�s Condicional"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polaritzaci�"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversi�"
+
+#: menu.c:274
+msgid "off"
+msgstr "off"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "cap"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulaci�"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Amplada de banda"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmissi�"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Protegir"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Jerarquia"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Propietats del canal duplicades!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Canals"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Esborrar"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Editar"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marcar"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nou"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Canal en �s per un temporitzador!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Esborrar el canal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Editar temporitzador"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Actiu"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Canal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dia"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Inici"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Fi"
+
+#: menu.c:667
+msgid "VPS"
+msgstr ""
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioritat"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Durada"
+
+#: menu.c:670
+msgid "File"
+msgstr "Arxiu"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Primer dia"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Temporitzadors"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr ""
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "On/Off"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Esborrar el temporitzador?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Temporitzador activat - Esborrar de totes maneres?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Esdeveniment"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Gravar"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Canviar"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr ""
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Qu� fan despr�s?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Qu� fan ara?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Seg�ent"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Ara"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programar"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "No puc canviar de canal!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Guia de Programaci� - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr ""
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr ""
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr ""
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr ""
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr ""
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Reproduir"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Enrera"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Veure programes gravats"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Obrir"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Ordres"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Error a l'accedir a la gravaci�!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Esborrar gravaci�?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Error a l'esborrar la gravaci�!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Ordres de gravaci�"
+
+#: menu.c:2203
+msgid "never"
+msgstr ""
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr ""
+
+#: menu.c:2205
+msgid "always"
+msgstr ""
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "Informaci� en pantalla"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Idioma"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr ""
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr ""
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr ""
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr ""
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Amplada"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Al�ada"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Durada dels missatges (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr ""
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Posici� de la informaci� del canal"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "a baix"
+
+#: menu.c:2225
+msgid "top"
+msgstr "a dalt"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr ""
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Informaci� del canvi de canal"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr ""
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Despla�ar p�gina sencera"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr ""
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr ""
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Gravacions en subcarpetes"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Guia de Programes"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr ""
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "M�xim d'Hores a cercar per la Guia"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Nivell de correcci� de la Guia"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr ""
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Ajustar l'hora del sistema"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Usar el temps del m�ltiplex"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr ""
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr ""
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "no"
+
+#: menu.c:2420
+msgid "names only"
+msgstr ""
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr ""
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr ""
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr ""
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "Tarja DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Tarja DVB prim�ria"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Format del v�deo"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr ""
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr ""
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr ""
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr ""
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr ""
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "Configuraci� de l'LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Utilitzar DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Freq��ncia LNB baixa (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Freq��ncia LNB alta (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CI Acc�s condicional"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Men�"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reiniciar"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr ""
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "No puc obrir el men� de la CAM!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "No puc reiniciar la CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Opcions de Gravaci�"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Marge d'inici de gravaci� (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Marge de fi de gravaci� (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "L�mit primari"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Prioritat per defecte"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Durada predefinida"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioritat de la pausa"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Durada de la pausa (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Utilitzar el nom de l'episodi"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr ""
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr ""
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Marcar gravaci� instant�nia"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Anomenar gravacions instant�nies"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Temps de gravaci� instant�nia (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Mida m�xima de l'arxiu (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Separar arxius"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Opcions de Reproducci�"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Mode de multivelocitat"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Mostrar mode de reproducci�"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID de Continuar"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Miscel�l�nia"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Temps m�nim en pausa (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Temps m�nim d'inactivitat (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP Timeout (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr ""
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Aquest plugin no admet configuraci�!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Configuraci�"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Segur que voleu reiniciar?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Aturar la gravaci� "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Guia de Programaci�"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disc"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "lliure"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Aturar la reproducci�"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr ""
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pausa"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Continuar"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Aturar"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Cancel�lar l'edici� "
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Aturar la gravaci�?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Cancel�lar l'edici�?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr ""
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pausa d'emissi� en directe..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Salta a:"
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "No hi ha marques d'edici� definides"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "No puc iniciar el proc�s d'edici�!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Proc�s d'edici� iniciat"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Proc�s d'edici� iniciat anteriorment!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~,/_@�"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "s�"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Inserir"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Sobrescriure"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Amunt/Avall per una nova localitzaci� - OK per moure"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Canal bloquejat (gravant)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Disc gaireb� ple!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "No puc apagar, falta la opci� -s !"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Gravant - Apagar de totes maneres?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Hi ha una gravaci� en %ld minuts - Apagar de totes maneres?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "Apagar de totes maneres?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Gravant - Reiniciar de totes maneres?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "Reiniciar de totes maneres?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volum "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr ""
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr ""
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "LMCJVSG"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "Dl Dm Dc Dj Dv Ds Dg "
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Dilluns"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Dijous"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Divendres"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr ""
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Prem qualsevol tecla per cancel�lar l'aturada"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Canviant a la interf�cie DVB prim�ria..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Proc�s d'edici� fallit!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Proc�s d'edici� finalitzat"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
new file mode 100644
index 000000000..08f454c35
--- /dev/null
+++ b/po/cs_CZ.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Neplatn� kan�l ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kan�l nen� dostupn�!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Nelze za��t s p�enosem"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Za��n� prohled�v�n� EPG"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Bez n�zvu"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "�esky"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "cze"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "F�ze 1: Detekce typu k�du"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Stiskn�te libovolnou kl�vesu ovl�d�n�"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "K�d byl detekov�n!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Nema�kejte ��dn� kl�vesy..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "F�ze 2: U�en� konkr�tn�ho k�du kl�ves"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Stiskn�te kl�vesu pro '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Stiskn�te 'Nahoru' pro potvrzen�"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Stiskn�te 'Dol�' pro pokra�ov�n�"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(stiskn�te 'Nahoru' pro zp�t)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(stiskn�te 'Dol�' pro ukon�en�)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "U�en� k�d� d�lkov�ho ovl�d�n�"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "F�ze 3: Ulo�en� k�d�"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Stiskn�te 'Nahoru' pro ulo�en�, 'Dol�' pro zru�en�"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Nahoru"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Dol�"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Zp�t"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Vlevo"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Vpravo"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "�erven�"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Zelen�"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "�lut�"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Modr�"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "P�ehr�t"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "P�eru�it"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Zastavit"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Nahr�t"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Dop�edu"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Dozadu"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "D�le"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Zp�t"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Vyp�na�"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kan�l+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kan�l-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "P�edch�zej�c� kan�l"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Hlasitost+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Hlasitost-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Ticho"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Zvuk"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program (EPG)"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kan�ly"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "�asova�e"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Nahr�vky"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Nastaven�"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "P��kazy"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "voln�"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "k�dovan�"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Editace kan�lu"
+
+#: menu.c:254
+msgid "Name"
+msgstr "N�zev"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Zdroj"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvence"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarizace"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "vyp."
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "��dn�"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulace"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "���ka p�sma"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "P�enos"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Nastaven� kan�l� nejsou unik�tn�!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kan�ly"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Smazat"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Editace"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Ozna�it"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nov�"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kan�l je dr�en� �asova�em nahr�vek!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Smazat kan�l?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Editace �asova�e"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktivn�"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kan�l"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Den"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Za��tek"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Konec"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Priorita"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "�ivotnost"
+
+#: menu.c:670
+msgid "File"
+msgstr "Soubor"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Prvn� den"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "�asova�e"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Zap./Vyp."
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Smazat �asova�?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Prob�h� nahr�v�n� - opravdu smazat?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Ud�lost"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Nahr�t"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "P�epnout"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "�asova�"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "N�sleduj�c� program"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Aktu�ln� program"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Dal��"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Nyn�"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kan�l nelze p�epnout!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Tato ud�lost - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Tato ud�lost - v�echny kan�ly"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "V�echny ud�lost - v�echny kan�ly"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Pros�m vlo�te %d znak�!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Detail nahr�vky"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "P�ehr�t"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Na za��tek"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Nahr�vky"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Otev��t"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "P��kazy"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Chyba p�i p��stupu k nahr�vk�m!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Smazat nahr�vku?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Chyba p�i maz�n� nahr�vky!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "P��kazy nahr�v�n�"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nikdy"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "podle vzhledu"
+
+#: menu.c:2205
+msgid "always"
+msgstr "v�dy"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Jazyk"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Vzhled"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "T�ma"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Vlevo"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Naho�e"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "���ka"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "V��ka"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "�as zobrazen� zp�vy (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Pou��vat mal� p�smo"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Pozice informace o kan�lu"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "dole"
+
+#: menu.c:2225
+msgid "top"
+msgstr "haho�e"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "�as zobr. informace o kan�lu (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Informace p�i zm�n� kan�lu"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "�asov� limit informace o kan�lu"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Rolovat strany"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Z konce na za��tek"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Kl�vesa Menu zav�r�"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Seznam nahr�vek"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Sn�mat"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "�asov� limit pro sn�m�n� EPG (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG �rove� chyb"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Ukazovat star�� EPG data (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Nastavit syst�mov� �as"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Pou��t �as z kan�lu"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Preferovan� jazyky"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Preferovan� jazyk"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "dost�edu o��znout"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "ne"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "jen n�zvy"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "jen PIDs"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "n�zvy a PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "p�idat nov� kan�ly"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "p�idat nov� transpond�ry"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Prim�rn� DVB interface"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Form�t videa"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Form�t zobrazen� videa"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Pou��vat zvuk v Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Aktualizace kan�l�"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Jazyky zvuku"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Jazyk zvuku"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Pou��vat DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Doln� frekvence LNB (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Horn� frekvence LNB (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reset"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Otev�r� se menu CAM..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Menu CAM nen� dostupn�"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "CAM modul nelze restartovat!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Nahr�v�n�"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Nahr�vat p�ed za��tkem (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Nahr�vat po konci (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Prim�rn� limit"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "V�choz� priorita"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "V�choz� �ivotnost"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Priorita p�eru�en�"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "�ivotnost p�eru�en� (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Pou��vat n�zev epizody"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Pou��vat VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "�asov� rezerva pro VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Ozna�it okam�it� nahr�vky"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Pojmenovat okam�it� nahr�vky"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "D�lka okam�it�ho nahr�v�n� (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maxim�ln� velikost nahr�vky (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "D�lit editovan� soubory"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "P�ehr�v�n�"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "V�cerychlostn� m�d"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Zobrazit re�im p�ehr�v�n�"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID obnoven�"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "R�zn�"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Min. pauza mezi ud�lostmi (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "�asov� limit neaktivnosti (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "�asov� limit SVDRP (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "�asov� limit Zap (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kan�l po spu�t�n�"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "jako naposledy"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Hlasitost po spu�t�n�"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Moduly"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Modul nem� konfigura�n� parametry!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Nastaven�"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Restart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Opravdu restartovat?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Zastavit nahr�v�n� "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program (EPG)"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "volno"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Zastavit p�ehr�v�n�"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Zvuk"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Zastavit"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Pokra�ovat"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Ukon�it"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Zru�it editaci"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Ukon�it nahr�v�n�?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Zru�it editaci?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Zvuk nen� dostupn�!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "��dn� DVB karta nen� voln� pro nahr�v�n�"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "P�eru�uje se b��c� program ..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Skok: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Nejsou definov�ny edita�n� zna�ky!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Nelze za��t edita�n� proces!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Edita�n� proces za�al"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Edita�n� proces je ji� aktivn�!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "ano"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Vlo�it"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "P�epsat"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Modul"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Nahoru/Dolu pro novou pozici - Ok p�esune"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kan�l je blokovan� (nahr�v� se)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Disk bude brzy zapln�n!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Vypnut� nen� mo�n� - chb� volba '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Syst�m je zanepr�zdn�n - p�esto vypnout?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "p�esto vypnout?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Syst�m je zanepr�zdn�n - p�esto restartovat?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "p�esto restartovat?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Hlasitost "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klasick� VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG konzola"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "PUS�PSN"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "Po �t St �t P� So Ne "
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Pond�l�"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "�ter�"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "St�eda"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "�tvrtek"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "P�tek"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Sobota"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Ned�le"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "Brzo za�ne nahr�v�n� VPS!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Za�alo nahr�v�n�"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Jak�koliv kl�vesa zru�� vypnut�"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "P�epnout prim�rn� DVB..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Edita�n� proces selhal!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Edita�n� proces skon�il"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
new file mode 100644
index 000000000..b3bca8aae
--- /dev/null
+++ b/po/da_DK.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Mogens Elneff <mogens@elneff.dk>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Ugyldig kanal! ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanal er ikke tilg�ngelig!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Kan ikke starte Transfer Mode!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Starter EPG skanning"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Ingen titel"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Dansk"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "dan"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: Detekterer fjernbetjenings-kodetype"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Tryk vilk�rlig tast p� fjernbetjeningen"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Fjernbetjenings-kodetype fundet!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Tryk ikke p� nogen tast..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: L�r individuelle tast koder"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Tryk tasten for '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Tryk 'Op' for at bekr�fte"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Tryk 'Ned' for at forts�tte"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(tryk 'Op' for at g� tilbage)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(tryk 'Ned' for at afslutte indl�ringen)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(tryk 'Menu' for at springe denne tast over)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "L�rer fjernbetjeningstaster"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: Gemmer tast koder"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Tryk 'Op' for at gemme, 'Ned' for at annullere"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Op"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Ned"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Tilbage"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Venstre"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "H�jre"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "R�d"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Gr�n"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Gul"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Bl�"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Afspil"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pause"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Optag"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Spol fremad"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Spol tilbage"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Fremad"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Tilbage"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Sluk"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Foreg�ende kanal"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Lydstyrke+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Lydstyrke-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Sluk lyd"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Programoversigt"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanaler"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timere"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Optagelser"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Indstillinger"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Kommandoer"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "Free To Air"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "kodet"
+
+#: menu.c:177
+msgid "auto"
+msgstr "automatisk"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Rediger kanal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Navn"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Kilde"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvens"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisation"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "fra"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "ingen"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "B�ndbredde"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarki"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanalindstillinger er ikke entydige!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanaler"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Slet"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Rediger"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Mark�r"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Ny"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanal anvendes af en timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Slet kanal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Rediger timer"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiv"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dag"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Start"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Stop"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioritet"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Levetid"
+
+#: menu.c:670
+msgid "File"
+msgstr "Fil"
+
+#: menu.c:686
+msgid "First day"
+msgstr "F�rste dag"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timere"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Til/Fra"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Slet timer?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timerstyret optagelse i gang - slet alligevel?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Udsendelse"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Optag"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Skift"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Timer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Hvad vises som det n�ste?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Hvad vises nu?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "N�ste"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Nu"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kan ikke skifte kanal!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Denne udsendelse - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Denne udsendelse - alle kanaler"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Alle udsendelser - alle kanaler"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Indtast venligst %d cifre!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Optagelses info"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Afspil"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Forfra"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Optagelser"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "�bn"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Kommandoer"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Fejl ved l�sning af optagelse!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Slet optagelse?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Fejl ved sletning af optagelse!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Optage kommandoer"
+
+#: menu.c:2203
+msgid "never"
+msgstr "aldrig"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "skin afh�ngig"
+
+#: menu.c:2205
+msgid "always"
+msgstr "altid"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Sprog"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Skin"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Venstre"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Top"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Bredde"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "H�jde"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Tid beskeder skal vises (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Anvend lille skrift"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Placering af kanalinfo"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "bund"
+
+#: menu.c:2225
+msgid "top"
+msgstr "top"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Tid kanalinfo skal vises (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Info ved kanalskift"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Timeout ved anmodet kanal info"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Scroll sidevis"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Scroll rundt"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Menu taste lukker"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Optagelser i foldere"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Skan"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Tid f�r EPG skanning (t)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Niveau for EPG fejlrettelse"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Vise gammel EPG info (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Indstil system tid"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Anvend tid fra transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Foretrukne sprog"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Foretrukket sprog"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nej"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "kun navne"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "kun PIDs"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "navne og PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "tilf. ny kanaler"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "tilf. ny transp."
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Prim�r DVB enhed"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Video format"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Video display format"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Anvend Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Opdat�r kanaler"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio sprog (ant.)"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio sprog"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Anvend DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Nedre LNB frekvens (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "�vre LNB frekvens (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Nulstille"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "�bner CAM menu..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Kan ikke �bne CAM menuen!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Kan ikke nulstille CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Optagelse"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Margin ved start (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Margin ved stop (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Prim�r gr�nse"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Standard prioritet"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Standard levetid (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Pause prioritet"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Pause levetid (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Anvend udsendelsesnavn"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Anvend VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS margin (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Mark�r direkte optagelse"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Navngiv direkte optagelse"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "L�ngde af direkte optagelse (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Max. video filst�rrelse (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Opdel redigerede filer"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Afspilning"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Multi hastighedsmodus"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Vis afspilningsmodus"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Genoptagelses ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Mindste h�ndelsespause (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Min. bruger inaktivitet (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP timeout (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Zap timeout (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kanal ved opstart"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "som f�r"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Lydstyrke ved opstart"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Denne plugin har ingen parametre"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Indstillinger"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Genstart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Vil du virkelig genstarte?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Stop optagelse "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Programoversigt"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "fri"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Stop afspilning"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pause"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Forts�t"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stop"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Afbryd redigering"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Stop optagelse?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Afbryd redigering?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Ingen lyd tilg�ngelig!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "For lidt harddisk plads til optagelse!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Ingen fri DVB enhed til optagelse!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pausere live udsendelse..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Hop: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Der er ikke sat nogen redigeringsm�rker!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Kan ikke starte redigeringsprocessen!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Redigeringsproces startet"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Redigeringsproces er allerede aktiv!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "ja"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Inds�t"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Overskriv"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Op/Ned for ny placering - OK for at flytte"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanal blokeret (optagelse i gang)"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Kun lidt diskplads tilbage!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Kan ikke slukke - parameter '-s' ikke angivet!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Optagelse igang - sluk alligevel?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Optagelse om %ld minutter - sluk alligevel?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "sluk alligevel?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Optagelse igang - genstart alligevel?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "genstart alligevel?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Lydstyrke "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klassisk VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG konsol"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "MTOTFLS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "ManTirOnsTorFreL�rS�n"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Mandag"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Tirsdag"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Fredag"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "L�rdag"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "S�ndag"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS optagelse starter snart!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Optagelse startet"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Tryk vilk�rlig tast for at annullere sluk"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Skifter prim�r DVB enhed..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Redigeringsproces fejlede!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Redigeringsproces afsluttet"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
new file mode 100644
index 000000000..1e70b1c3f
--- /dev/null
+++ b/po/de_DE.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@cadsoft.de>, 2000
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Ung�ltiger Kanal ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanal nicht verf�gbar!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Transfer-Mode kann nicht gestartet werden!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Aktualisiere EPG-Daten"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Kein Titel"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Deutsch"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "deu"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Phase 1: System der Fernbedienung ermitteln"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Eine Taste auf der Fernbedienung dr�cken"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "System der Fernbedienung erkannt!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Keine Taste dr�cken..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Phase 2: Tastenbelegung anlernen"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Taste f�r '%s' dr�cken"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "'Auf' dr�cken zum Best�tigen"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "'Ab' dr�cken zum Weitermachen"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "('Auf' dr�cken, um zur�ckzugehen)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "('Ab' dr�cken zum Beenden)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "('Men�' dr�cken zum �berspringen)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Fernbedienung anlernen"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Phase 3: Tastenbelegung abspeichern"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Auf' speichert, 'Ab' bricht ab"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Auf"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Ab"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Men�"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Zur�ck"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Links"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Rechts"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Rot"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Gr�n"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Gelb"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Blau"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Wiedergabe"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pause"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stopp"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Aufnehmen"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Vorlauf"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "R�cklauf"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Vorw�rts"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Zur�ck"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Ausschalten"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Vorheriger Kanal"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Lautst�rke+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Lautst�rke-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Stumm"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Programm"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kan�le"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timer"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Aufzeichnungen"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Einstellungen"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Befehle"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr "Benutzer1"
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr "Benutzer2"
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr "Benutzer3"
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr "Benutzer4"
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr "Benutzer5"
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr "Benutzer6"
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr "Benutzer7"
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr "Benutzer8"
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr "Benutzer9"
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "frei empfangbar"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "verschl�sselt"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Kanal editieren"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Name"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Quelle"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frequenz"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisation"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "aus"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "keine"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandbreite"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchie"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanaleinstellungen sind nicht eindeutig!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kan�le"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "L�schen"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Editieren"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Markieren"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Neu"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanal wird von einem Timer benutzt!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Kanal l�schen?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Timer editieren"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiv"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Tag"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Anfang"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Ende"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Priorit�t"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Lebensdauer"
+
+#: menu.c:670
+msgid "File"
+msgstr "Datei"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Erster Tag"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timer"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Ein/Aus"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Timer l�schen?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timer zeichnet auf - trotzdem l�schen?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Sendung"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Aufnehmen"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Umschalten"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Timer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Was l�uft als n�chstes?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Was l�uft jetzt?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "N�chste"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Jetzt"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programm"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kanal kann nicht umgeschaltet werden!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programm - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Diese Sendung - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Diese Sendung - alle Kan�le"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Alle Sendungen - alle Kan�le"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Bitte geben Sie %d Ziffern ein!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr "CAM antwortet nicht!"
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Aufzeichnung"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Wiedergabe"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Anfang"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Aufzeichnungen"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "�ffnen"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Befehle"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Fehler beim Ansprechen der Aufzeichnung!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Aufzeichnung l�schen?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Fehler beim L�schen der Aufzeichnung!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Befehle f�r Aufzeichnungen"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nie"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "je nach Oberfl�che"
+
+#: menu.c:2205
+msgid "always"
+msgstr "immer"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Sprache"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Oberfl�che"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Thema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Links"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Oben"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Breite"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "H�he"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Anzeigedauer f�r Nachrichten (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Kleine Schrift benutzen"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr "Kantengl�ttung"
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr "Standard-Schriftart"
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr "Kleine Schriftart"
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr "Festbreiten-Schriftart"
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr "Standard-Schriftgr��e (pixel)"
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr "Kleine Schriftgr��e (pixel)"
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr "Festbreiten-Schriftgr��e (pixel)"
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Kanalinfo-Position"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "unten"
+
+#: menu.c:2225
+msgid "top"
+msgstr "oben"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Anzeigedauer f�r Kanalinfo (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Info beim Kanalwechsel"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Angeforderte Kanalinfo schlie�en"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Seitenweise scrollen"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Rundum scrollen"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Menu-Taste schlie�t"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Aufnahmeverzeichnisse"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Scan"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Zeit bis zur EPG-Aktualisierung (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG-Fehlerbereinigung"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Alte EPG-Daten anzeigen (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Systemzeit stellen"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Transponder f�r Systemzeit"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Bevorzugte Sprachen"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Bevorzugte Sprache"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "Letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "Center-cut-out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nein"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "nur Namen"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "nur PIDs"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "Namen und PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "neue Kan�le hinzuf�gen"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "neue Transponder hinzuf�gen"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Prim�res DVB-Interface"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Videoformat"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Video-Anzeigeformat"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Dolby-Digital-Ton benutzen"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Kan�le aktualisieren"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio-Sprachen"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio-Sprache"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "DiSEqC benutzen"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Untere LNB-Frequenz (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Obere LNB-Frequenz (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr "CAM zur�ckgesetzt"
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr "CAM vorhanden"
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr "CAM bereit"
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Men�"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "R�cksetzen"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "CAM-Men� wird ge�ffnet..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "CAM-Men� kann nicht ge�ffnet werden!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr "CAM wird benutzt - wirklich zur�cksetzen?"
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Zur�cksetzen des CAM fehlgeschlagen!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Aufnahme"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Vorlauf zum Timer-Beginn (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Nachlauf am Timer-Ende (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Prim�r-Limit"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Default-Priorit�t"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Default-Lebensdauer (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Pause-Priorit�t"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Pause-Lebensdauer (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Episodenname verwenden"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "VPS benutzen"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Zeitvorlauf bei VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Direktaufzeichnung markieren"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Direktaufzeichnung benennen"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Dauer der Direktaufzeichnung (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Max. Videodateigr��e (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Editierte Dateien aufteilen"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Wiedergabe"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Mehrstufiger Vor-/R�cklauf"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Wiedergabestatus anzeigen"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Wiedergabe-ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Sonstiges"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Br�ckenzeit zwischen Timern (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "VDR ausschalten bei Inaktivit�t (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP trennen bei Inaktivit�t (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Mindestzeit f�r Kanalhistorie (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "Zeitlimit f�r Kanaleingabe (ms)"
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kanal beim Einschalten"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "wie vorher"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Lautst�rke beim Einschalten"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Dieses Plugin hat keine Parameter!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Einstellungen"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Neustart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Wirklich neu starten?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Aufzeichnung beenden "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Programm"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "frei"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Wiedergabe beenden"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pause"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Weiter"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Beenden"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Schneiden abbrechen"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Aufzeichnung beenden?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Schneiden abbrechen?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Kein Audio verf�gbar!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Nicht gen�gend Plattenplatz f�r Aufnahme!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Keine freie DVB-Karte zum Aufnehmen!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Live-Signal wird angehalten..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Springen: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Keine Schnittmarken gesetzt!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Schnitt kann nicht gestartet werden!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Schnitt gestartet"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Schnitt bereits aktiv!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "ja"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Einf�gen"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "�berschreiben"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Auf/Ab f�r neue Position - dann OK"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanal blockiert (zeichnet auf)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Platte beinahe voll!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Ausschalten unm�glich - Option '-s' fehlt!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr "Schnitt l�uft - trotzdem ausschalten?"
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Aufnahme l�uft - trotzdem ausschalten?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Aufnahme in %ld Minuten - trotzdem ausschalten?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "trotzdem ausschalten?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Plugin %s wacht in %ld Min auf, weiter?"
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr "Schnitt l�uft - trotzdem neu starten?"
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Aufnahme l�uft - trotzdem neu starten?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "trotzdem neu starten?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Lautst�rke "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klassischer VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG-Konsolen"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "MDMDFSS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "MonDieMitDonFreSamSon"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Montag"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Freitag"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Samstag"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS-Aufnahme beginnt in K�rze!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Aufzeichnung gestartet"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR schaltet sp�ter aus - Power zum erzwingen"
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Taste dr�cken, um Ausschalten abzubrechen"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Prim�res Interface wird umgeschaltet..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Schnitt gescheitert!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Schnitt beendet"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr "Taste dr�cken, um Neustart abzubrechen"
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR wird in %s Minuten ausschalten"
diff --git a/po/el_GR.po b/po/el_GR.po
new file mode 100644
index 000000000..d08fd2e03
--- /dev/null
+++ b/po/el_GR.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-7\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** ����� ������ ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "�� ������ ��� ����� ���������!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "�������� ��������� ���������� ���������!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "���� ������ EPG"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "����� �����"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "��������"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "ell"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "���� 1: ��������� ������ RC"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "����� ��� ������� ��� ���������������"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "������� ������� RC!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "��� ����� �������..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "���� 2: �������� ����������� ��������"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "����� �� ������� ��� '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "����� '����' ��� �������"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "����� '����' ��� ��������"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(����� '����' ��� ���������"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(����� '����' ��� ���������� �������� ��������)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "����� '�����' ��� ���������� ����� ��� ��������"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "�������� �������� �������������"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "���� 3: ���������� �������"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "����� '����' ��� ����������, '����' ��� �������"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "����"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "����"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "�����"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "��"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "����"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "��������"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "�����"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "�������"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "�������"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "�������"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "����"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "�����������"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "�����������"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "�����"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "T����"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "E������"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "�������� ������"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "�������� ����"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "K�������"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "������+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "������-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "������+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "������-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "�������"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "����"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "���������"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "�������"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "��������������������"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "��������"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "���������"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "�������"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr ""
+
+#: menu.c:71
+msgid "encrypted"
+msgstr ""
+
+#: menu.c:177
+msgid "auto"
+msgstr "��������"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "����������� ��������"
+
+#: menu.c:254
+msgid "Name"
+msgstr "�����"
+
+#: menu.c:255
+msgid "Source"
+msgstr "����"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "���������"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "B����� PID"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "������"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "����������"
+
+#: menu.c:274
+msgid "off"
+msgstr "�������"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "������ ������ H"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "������"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "������ ������ L"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "����������"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "����� ����������"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "��������"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "���������"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "���������"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "�� ��������� ��� �������� ����������������!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "�������"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "��������"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "����������"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "�������"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "N��"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "�� ������ ��������������� ��� �������������������!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "�������� ��������?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "����������� ��������������������"
+
+#: menu.c:662
+msgid "Active"
+msgstr "������"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "������"
+
+#: menu.c:664
+msgid "Day"
+msgstr "�����"
+
+#: menu.c:665
+msgid "Start"
+msgstr "����"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "�����"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "�������������"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "�������� ���������"
+
+#: menu.c:670
+msgid "File"
+msgstr "������"
+
+#: menu.c:686
+msgid "First day"
+msgstr "����� ����"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "��������������������"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "�����������"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "A����/K������"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "�������� ��������������������;?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "�������������������� �� ������� - �������� �������?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "�������"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "�������"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "A�����"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr ""
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "������� ���������"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "������ ���������"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "�������"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "����"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "���������"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "������ �������� �������!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "��������� - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr ""
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr ""
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr ""
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr ""
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "����������� E�������"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "�����������"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "�������� ���� ����"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "��������"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "�������"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "�������"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "�������� ���� ���������� ��������!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "�������� ��������?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "����� ���� ��� �������� ��� �������!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "������� ��� ��������"
+
+#: menu.c:2203
+msgid "never"
+msgstr "����"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "�������� ��� ��� ���������"
+
+#: menu.c:2205
+msgid "always"
+msgstr "�����"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "������"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "���������"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "����"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "��������"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "�����"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "������"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "����"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "������ �������� ��������� (�)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "������������� ������ ��������������"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "���� ����������� ��������"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "����"
+
+#: menu.c:2225
+msgid "top"
+msgstr "����"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "������ ��������� ����������� �������� �� (�)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "����������� ���� ������ ��������"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr ""
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "������ �������"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "������ ����-����"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr ""
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "������� ��������"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "������������ ������ ������������"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "������"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "������ ��������� �������� EPG �� ����"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "������ ��������� ������ EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "������� ������������ ����������� (�����)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "����������� ���� ����������"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "������������ ����������� ����"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "������������� �������"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "������������ ������"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "���"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "���� �������"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "������� ��� PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "�������� ���� ��������"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "�������� ���� �����������"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "����� DVB �����"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "����� ������"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "����� ����������� ������"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "����� ���� Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "��������� ��������"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "������� ����"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "������ ����"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "������������ DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "���� LNB-��������� (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "��� LNB-��������� (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "M����"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "���������"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr ""
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "������� � �������� ��� CAM �����!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "������� � ��������� ��� CAM"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "�������"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "��������� ������ ���� ���� (�����)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "��������� ������ ��� ����� (�����)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "�������� ����"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "�������������� �������������"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "�������������� �������� ��������� (������)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "������������� ������������"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "�������� �����������"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "����� �������� ����������"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "����� VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "��������� VPS (�)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "������� ��������� ��������"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "�������� ��������� ��������"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "�������� ��������� �������� (�����)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "������� ������� ������� (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "����������� �������������� �������"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "�����������"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "������� ��������� ���������"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "������� ���������� ������������"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID ������������"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "�������"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "��������� ������ ���������� (�����)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "��������� ������ �������� (�����)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP ������� (�)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "������� ������� (�)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "����������"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "���� � �������� ��� ���� �����������!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "���������"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "������������"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "N� ����� ������� ������������?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " ����� ������� "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "���������"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "������"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "���������"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " ����� ������������"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "����"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "�����"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "���������"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "�����"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " ������� ������������"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "������� ��������?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "A������ ������������?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "�� ���������� ����"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "���������� DVB ������ ��� �������!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "������ �������� �������"
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "����������: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "��� ����� ������� ������ ������������"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "�������� ��������� ��� ������������!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "������ � �����������"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "����������� ��������� �� �������!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "���"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "AB�/���"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "��������"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "�������������"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "��������"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "����/���� ��� ��� ����. ���� ��"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "�� ������ ����� ������������ (������ �������)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "� ������� �������� �� �������!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "�������� �� ����� �����������. ��������� � ���������� '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "������� ������� - ������ �� ����� �����������?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "���������� ������� �� %ld ����� - ������ �� �����������?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "������ �� ����� �����������?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "������� ������� - ������ �� ����� ������������?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "������ �� ����� ������������?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "������ "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "������� VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "������ ST:TNG"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "�������"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "������������������K��"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "�������"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "�����"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "�������"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "������"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "���������"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "�������"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "�������"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr ""
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "����� ��� ������� ��� ������� �����������"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "� ����� DVB ����� �������..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "� ����������� �������!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "� ����������� ��������"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
new file mode 100644
index 000000000..1314aa7aa
--- /dev/null
+++ b/po/es_ES.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal no v�lido ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "!Canal no disponible!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "�No se puede iniciar el modo de transferencia!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Iniciando la exploraci�n de EPG"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Sin t�tulo"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Espa�ol"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "esl"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: Detectando tipo de mando"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Pulse cualquier tecla en el mando"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "�C�digo RC detectado!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "No pulse ninguna tecla..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: Aprendiendo c�digos espec�ficos"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Pulse la tecla para '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Pulse 'Arriba' para confirmar"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Pulse 'Abajo' para continuar"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Pulse 'Arriba' para retornar)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Pulse 'Abajo' para terminar el aprendizaje)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "Pulse 'Men�' para omitir esta tecla"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Aprendiendo teclas del mando"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: Guardando los c�digos de teclas"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Pulse 'Arriba' para guardar, 'Abajo' para anular"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Arriba"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Abajo"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Men�"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Retornar"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Izquierda"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Derecha"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Rojo"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Verde"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Amarillo"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Azul"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Reproducir"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pausa"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Parar"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Grabar"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Avance r�pido"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Retroceso r�pido"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Apagar"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Canal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Canal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volumen+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volumen-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Mudo"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Gu�a de Programaci�n"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Canales"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Programar grabaciones"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Grabaciones"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Configuraci�n"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "�rdenes"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "en abierto"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "cifrado"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Modificar canal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nombre"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Fuente"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Acceso condicional (CA)"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarizaci�n"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "T.s�mbolos"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "off"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "ninguno"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulaci�n"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Ancho de banda"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmisi�n"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Int.Guarda"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Jerarqu�a"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "!Propiedades de canal duplicadas!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Canales"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Borrar"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Modificar"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marcar"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nuevo"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "�Hay una grabaci�n programada para este canal!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "�Eliminar canal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Modificar programaci�n"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Activo"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Canal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "D�a"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Comienzo"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Fin"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioridad"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Duraci�n"
+
+#: menu.c:670
+msgid "File"
+msgstr "Fichero"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Primer d�a"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Programar grabaciones"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "On/Off"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "�Eliminar programaci�n?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Todav�a est� grabando - �eliminar realmente?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Evento"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Grabar"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Cambiar"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Programa"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "�Qu� hay despu�s?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "�Qu� hay ahora?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Despu�s"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Ahora"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Gu�a"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "�No se puede cambiar de canal!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Gu�a de programaci�n - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Este evento - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Este evento - todos los canales"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Todos los eventos - todos los canales"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "�Escriba %d d�gitos!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Informaci�n de grabaci�n"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Play"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Rebobinar"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Grabaciones"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Abrir"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "�rdenes"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "�Error al acceder a la grabaci�n!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "�Eliminar grabacion?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "�Error al borrar la grabaci�n!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "�rdenes de grabaci�n"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nunca"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "seg�n skin"
+
+#: menu.c:2205
+msgid "always"
+msgstr "siempre"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "Men�s en pantalla"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Idioma"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Skin"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Izquierda"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Arriba"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Anchura"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Altura"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Duraci�n de los mensajes (sg)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Usar letra peque�a"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Posici�n para informaci�n de canal"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "abajo"
+
+#: menu.c:2225
+msgid "top"
+msgstr "arriba"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Tiempo de informaci�n de canal (sg)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Mostrar info al cambiar de canal"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Auto-cerrar al solicitar info de canal"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Deslizar p�ginas enteras"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Rotar arriba/abajo al deslizar"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Cerrar al pulsar bot�n de men�"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Mostrar directorios de grabaciones"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Gu�a de Programaci�n"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Escanear"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Tiempo de exploraci�n de EPG (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Nivel de correcci�n de EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Mostrar datos antiguos de EPG (m)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Ajustar reloj de sistema"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Transponder del que tomar la hora"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Idiomas preferidos"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Idioma preferido"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "no"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "s�lo nombres"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nombres y PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "a�adir canales"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "a�adir transponders"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Interfaz DVB primario"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Formato de v�deo"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Formato de visualizaci�n"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Usar Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Actualizar canales"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Idiomas de audio"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Idioma de audio"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Utilizar DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Frecuencia inferior del LNB (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Frecuencia superior del LNB (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Men�"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reiniciar"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Abriendo el men� CAM..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "�No se puede abrir el men� CAM!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "�No se puede reiniciar CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Opciones de grabaci�n"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Comenzar grabaci�n antes (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Acabar grabaci�n despu�s (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "L�mite primario"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Prioridad por defecto"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Duraci�n por defecto (d�as)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioridad en modo pausa"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Duraci�n en modo pausa (d�as)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Utilizar nombre de episodo"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Usar servicio VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Margen VPS (sg)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Marcar grabaciones inmediatas"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Nombrar grabaciones inmediatas"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Tiempo de grabaci�n inmediata (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Tama�o m�ximo de fichero (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Partir ficheros editados"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Opciones de reproducci�n"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Modo multi-velocidad"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Mostrar modo de reproducci�n"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID de continuaci�n"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Tiempo m�n. antes de un evento (m)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Tiempo m�n. de inactividad (m)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Tiempo de espera de SVDRP (sg)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Considerar canal como visto (sg)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Este plugin no admite configuraci�n"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Configuraci�n"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "�Reiniciar realmente?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Parar grabaci�n "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Gu�a de Programaci�n"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disco"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "libre"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Parar reproduci�n"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pausa"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Continuar"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Parar"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Anular edici�n"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "�Parar grabaci�n?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "�Cancelar edici�n?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "�No hay audio disponible!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "�Ning�n dispositivo DVB disponible para grabar!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pausa de la emisi�n en directo..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Saltar: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "�No se definieron marcas de edici�n!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "�No se puede iniciar el proceso de edici�n!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Proceso de edici�n iniciado"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "�El proceso de edici�n ya est� activo!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "s�"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Insertar"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Sobreescribir"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Arriba/Abajo para mover - OK para confirmar"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "�Canal bloqueado (grabando)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "�Poco espacio en disco!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "�No se puede apagar - falta el par�metro '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Grabaci�n en curso - �apagar igualmente?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Grabaci�n dentro de %ld minutos, �apagar realmente?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "�apagar igualmente?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Grabaci�n en curso - �reiniciar igualmente?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "�reiniciar igualmente?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volumen "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "VDR cl�sico"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "Paneles ST:TNG"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "LMXJVSD"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "LunMarMieJueVieSabDom"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Lunes"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Martes"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Mi�rcoles"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Jueves"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Viernes"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "S�bado"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Domingo"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Iniciando grabaci�n"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Pulse una tecla para interrumpir apagar"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Cambiando el interfaz DVB primario..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "�Proceso de edici�n fallido!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Proceso de edici�n terminado"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
new file mode 100644
index 000000000..989a14f4e
--- /dev/null
+++ b/po/et_EE.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Arthur Konovalov <kasjas@hot.ee>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-13\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Vigane kanal ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanal ei ole k�ttesaadav!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Siirdemooduse start eba�nnestus!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "EPG skaneerimine k�ivitatud"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Pealkiri puudub"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "eesti"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "est"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Samm 1: Kodeerimiss�steemi tuvastamine"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Vajuta puldil suvalist klahvi"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Kodeerimiss�steem tuvastatud!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "�ra vajuta puldil �htki klahvi..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Samm 2: Klahvide �petamine"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Vajuta klahvile '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Kinnitamiseks vajuta '�les'"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "J�tkamiseks vajuta 'Alla'"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(tagasiminekuks vajuta '�les')"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(l�petamiseks vajuta 'Alla')"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(selle klahvi vahelej�tmiseks vajuta 'Men��')"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Kaugjuhtimispuldi �petamine"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Samm 3: Klavhikoodide salvestamine"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "�les"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Alla"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Men��"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Tagasi"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Vasakule"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Paremale"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Punane"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Roheline"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Kollane"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Sinine"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Start"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Paus"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stopp"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Salvestamine"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Edasikerimine"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Tagasikerimine"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "J�rgmine"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Eelmine"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Toide"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Eelmine kanal"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Helitugevus+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Helitugevus-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "H��letu"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Kava"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanalid"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Taimer"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Salvestused"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "S�tted"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "K�sud"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "FTA"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "kr�ptitud"
+
+#: menu.c:177
+msgid "auto"
+msgstr "automaatne"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Kanali muutmine"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nimi"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Allikas"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Sagedus"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisatsioon"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversioon"
+
+#: menu.c:274
+msgid "off"
+msgstr "v�ljas"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "t�hi"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulatsioon"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Ribalaius"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmissioon"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarhia"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanaliseaded ei ole unikaalsed!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanalid"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Kustuta"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Muuda"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Siirda"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Uus"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanal on taimeri kasutuses!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Kustutada kanal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Taimeri muutmine"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiivne"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "P�ev"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Start"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Stopp"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioriteet"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Eluiga"
+
+#: menu.c:670
+msgid "File"
+msgstr "Fail"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Esimene p�ev"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Taimer"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "On/Off"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Kustutada taimer?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Salvestus aktiivne - kustutada?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Saade"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Salvesta"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Vali"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Taimer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "J�rgmisena eetris"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Hetkel eetris"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Tulekul"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "N��d"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Ajakava"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kanali vahetus ei ole v�imalik!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Ajakava - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Sama saade - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Sama saade - k�ik kanalid"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "K�ik saated - k�ik kanalid"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Palun sisesta %d numbrit!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr "CAM ei vasta"
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Salvestuse info"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Start"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Algusesse"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Salvestused"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Ava"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "K�sud"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Salvestuse taasesitus eba�nnestus!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Kustutada salvestus?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Salvestuse kustutamine eba�nnestus!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Salvestuse k�sud"
+
+#: menu.c:2203
+msgid "never"
+msgstr "mitte kunagi"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "kestast s�ltuv"
+
+#: menu.c:2205
+msgid "always"
+msgstr "alati"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "Ekraanimen��"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Keel"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Kest"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Teema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Vasakule"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "�lesse"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Laius"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "K�rgus"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Teate esitusaeg (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "V�ikese fondi kasutamine"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr "Fondi silumine"
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr "Vaikefont"
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr "V�ike font"
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr "Fikseeritud font"
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr "Vaikefondi suurus (px)"
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr "V�ikese fondi suurus (px)"
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr "Fiks. fondi suurus (px)"
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Kanaliinfo asukoht"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "all"
+
+#: menu.c:2225
+msgid "top"
+msgstr "�leval"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Kanaliinfo esitusaeg (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Kanaliinfo n�itamine"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Kanaliinfo kuvamise ajapiirang"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Lehek�lje kerimine"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Ridade kerimine"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Sulgemine Men�� klahviga"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Kausta nime salvestamine"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Uuenda"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "EPG skaneerimise viide (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG veaparanduse tase"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Vana EPG viide (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Kella s�nkroniseerimine"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Kella s�nkroniseerimise transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Eelistatuid keeli"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Eelistatud keel"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "ei"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "ainult nimed"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "ainult PID-id"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nimi ja PID-id"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "uute kanalite lisamine"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "uute transponderite lisamine"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Esmane DVB seade"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "TV k�lgsuhe"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Video kuvamise formaat"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Dolby Digital kasutamine"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Kanalite uuendamine"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio keeli"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio keel"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "DiSEqC kasutamine"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "LO LNB sagedus (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "HI LNB sagedus (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr "CAM taask�ivitamine"
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr "CAM esitletud"
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr "CAM t��valmis"
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Men��"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Nullimine"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "CAM-men�� avamine..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Ei saa avada CAM men��d!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr "CAM on kasutuses - taask�ivitada?"
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "CAM mooduli taask�ivitus eba�nnestus!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Salvestamine"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Salvestamise algusvaru (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Salvestamise l�puvaru (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Esmane prioriteet"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Vaikimisi prioriteet"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Salvestuse eluiga (p�evi)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Pausi prioriteet"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Pausi eluiga (p�evi)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Episoodi nime kasutamine"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "VPS-i kasutamine"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS-i algusvaru (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Otsesalvestuse m�rgistamine"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Otsesalvestuse nimi"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Otsesalvestuse kestus (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maksimaalne failisuurus (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Failide t�keldamine"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Taasesitus"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Multi-kiiruse moodus"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Korduse moodus"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "J�tkamise ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Muud s�tted"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Min. s�ndmuse kestus (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Min. kasutaja tegevusetus (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP ooteaeg (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Kanalivahetuse ooteaeg (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "Kanali sisestamise ajalimiit (ms)"
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kanal k�ivitamisel"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "nagu enne"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Helitugevus k�ivitamisel"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Laiendusmoodulid"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Sellel laienudusmoodulil ei ole seadeid!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "S�tted"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Restart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Restart?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " L�petada salvestamine "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Kava"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Ketas"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "vaba"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " L�petada taasesitamine"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Paus"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "J�tka"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stopp"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Katkestada redigeerimine"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "L�petada salvestamine?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "T�histada muudatus?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Audio k�ttesaamatu!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Ebapiisavalt kettaruumi salvestamise alustamiseks!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Puudub vaba DVB seade salvestamiseks!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Saate edastamise peatamine..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "H�pe: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Redigeerimise markerid puuduvad!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Redigeerimise start eba�nnestus!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Redigeerimine algas"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Redigeerimine juba aktiivne!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrs�z�tuvw����xy0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "jah"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Lisa (INS)"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Asenda (OVR)"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Laiendusmoodul"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "'�les/Alla' uus asukoht - 'OK' kinnitus"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanal lukus (salvestamine aktiivne)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "K�vaketas t�is!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr "Redigeerimine aktiive - l�litan v�lja?"
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Salvestamine aktiivne - l�litada v�lja?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Salvestamine algab %ld minuti p�rast - l�litada v�lja?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "l�litada v�lja?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Laiendusmoodul %s �rkab %ld minuti p�rast, j�tkata?"
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr "Redigeerimine aktiivne - taask�ivitada?"
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Salvestamine aktiivne - restart?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "restart?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Helitugevus "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klassikaline VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG konsool"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "ETKNRLP"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr " E  T  K  N  R  L  P "
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Esmasp�ev"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Teisip�ev"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Kolmap�ev"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Neljap�ev"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Reede"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Laup�ev"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "P�hap�ev"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS salvestamine tulekul!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Salvestamine algas"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR l�litub v�lja hiljem - vajuta Power kiirendamiseks"
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Esmase DVB seadme �mberl�litus..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Redigeerimine eba�nnestus"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Redigeerimine l�petatud"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR l�litub v�lja %s minuti p�rast"
diff --git a/po/fi_FI.po b/po/fi_FI.po
new file mode 100644
index 000000000..f44f3c198
--- /dev/null
+++ b/po/fi_FI.po
@@ -0,0 +1,1273 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Hannu Savolainen <hannu@opensound.com>, 2002
+# Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002
+# Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Virheellinen kanavavalinta! ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanava ei ole k�ytett�viss�!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Siirtotilan aloitus ep�onnistui!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Ohjelmaoppaan p�ivitys aloitettu"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Ei esityst�"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "suomi"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "fin"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Vaihe 1: Koodauksen tunnistaminen"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Paina mit� tahansa kaukos��timen n�pp�int�"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "N�pp�inpainallus vastaanotettu!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "�l� paina kaukos��timen n�pp�imi�..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Vaihe 2: N�pp�inkoodien opettelu"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Paina n�pp�int� toiminnolle '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Hyv�ksy painamalla 'Yl�s'"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Jatka painamalla 'Alas'"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(palaa takaisin painamalla 'Yl�s')"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(lopeta opettaminen painamalla 'Alas')"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "n�pp�imen puuttuessa paina 'Valikko'"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Kaukos��timen opettaminen"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Vaihe 3: N�pp�inkoodien tallentaminen"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Yl�s"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Alas"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Valikko"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Takaisin"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Vasemmalle"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Oikealle"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Punainen"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Vihre�"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Keltainen"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Sininen"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Tiedot"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Toista"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Tauko"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Lopeta"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Tallenna"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Pikakelaus >>"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Pikakelaus <<"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Seuraava"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Edellinen"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Virta"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanava +"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanava -"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Edellinen kanava"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "��nenvoimakkuus +"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "��nenvoimakkuus -"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Mykistys"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "��ni"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Ohjelmisto"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanavat"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Ajastimet"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Tallenteet"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Asetukset"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Komennot"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "vapaa"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "salattu"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Muokkaa kanavaa"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nimi"
+
+#: menu.c:255
+msgid "Source"
+msgstr "L�hde"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Taajuus"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Kuva-PID"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "PCR-PID"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "��ni-PID (1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "��ni-PID (2)"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dolby-PID (1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dolby-PID (2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Teksti-TV-PID"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Salaus (CA)"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Palvelu-ID"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisaatio"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Symbolinopeus"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversio"
+
+#: menu.c:274
+msgid "off"
+msgstr "pois"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "Suojaustaso (HP)"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "tyhj�"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "Suojaustaso (LP)"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulaatio"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Kaistanleveys"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmissio"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Suojav�li"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarkia"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanavat"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Poista"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Muokkaa"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Siirr�"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Uusi"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanava on ajastimen k�yt�ss�!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Poistetaanko kanava?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Muokkaa ajastinta"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiivinen"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanava"
+
+#: menu.c:664
+msgid "Day"
+msgstr "P�iv�"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Aloitus"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Lopetus"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Elinik�"
+
+#: menu.c:670
+msgid "File"
+msgstr "Tiedosto"
+
+#: menu.c:686
+msgid "First day"
+msgstr "1. p�iv�"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Ajastimet"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Tiedot"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "P��ll�/Pois"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Poistetaanko ajastin?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Ajastettu tallennus k�ynniss� - poistetaanko silti?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Tapahtuma"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Tallenna"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Valitse"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Ajastin"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Tulossa seuraavaksi"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Menossa nyt"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Seuraavaksi"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Nyt"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Ohjelmisto"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kanavan vaihtaminen ei mahdollista!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Ohjelmisto - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "T�m� tapahtuma - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "T�m� tapahtuma - kaikki kanavat"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Kaikki tapahtumat - kaikki kanavat"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Sy�t� %d numeroa!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Tallenteen tiedot"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Toista"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Alkuun"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Tallenteet"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Avaa"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Komennot"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Tallenteen toistaminen ep�onnistui!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Poistetaanko tallenne?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Tallenteen poistaminen ep�onnistui!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Tallennekomennot"
+
+#: menu.c:2203
+msgid "never"
+msgstr "ei koskaan"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "ulkoasun mukaan"
+
+#: menu.c:2205
+msgid "always"
+msgstr "aina"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "Kuvaruutun�ytt�"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Kieli"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Ulkoasu"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Teema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Vaakakeskitys"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Pystykeskitys"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Leveys"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Korkeus"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Viestien esitysaika (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "K�yt� pieni� kirjasimia"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr "K�yt� reunan pehmennyst�"
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr "Oletuskirjasintyyppi"
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr "Pieni kirjasintyyppi"
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr "Tasav�linen kirjasintyyppi"
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr "Oletuskirjasintyypin koko (px)"
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr "Pienen kirjasintyypin koko (px)"
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr "Tasav�lisen kirjasintyypin koko (px)"
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Kanavatiedon sijainti"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "alareuna"
+
+#: menu.c:2225
+msgid "top"
+msgstr "yl�reuna"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Kanavatiedon esitysaika (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "N�yt� kanavatieto vaihdettaessa"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Sulje erikseen avattu kanavatieto"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Valikoiden vieritys sivuttain"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Valikoiden vieritys ymp�ri"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Sulje valikkon�pp�imell�"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "N�yt� tallennehakemistot"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Ohjelmaopas"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "P�ivit�"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Ohjelmaoppaan taustap�ivitys (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Ohjelmaoppaan korjaustaso"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Vanha tieto n�kyy (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Tahdista kellonaika"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Vastaanota kellonaika transponderilta"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Suosikkikielet"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Suosikkikieli"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "ei"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "vain nimet"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "vain PID:it"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nimet ja PID:it"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "uudet kanavat"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "uudet transponderit"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Ensisijainen DVB-sovitin"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Kuvasuhde"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "N�ytt�muoto"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "K�yt� Dolby Digital -��nt�"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "P�ivit� kanavat"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "��nen kielet"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "��nen kieli"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "K�yt� DiSEqC-kytkint�"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "LNB-rajataajuus (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "LNB-alataajuus (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "LNB-yl�taajuus (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Valikko"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Nollaa"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Avataan CA-moduulin valikkoa..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "CA-moduulin valikko ei saatavilla"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "CA-moduulin palautus alkutilaan ep�onnistui!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Tallennus"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Aloitusmarginaali (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Lopetusmarginaali (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Ensisijaisen sovittimen prioriteettiraja"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Tallenteen oletusprioriteetti"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Tallenteen oletuselinik� (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Taukotallenteen prioriteetti"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Taukotallenteen elinik� (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "K�yt� jakson nime�"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "K�yt� VPS-toimintoa"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS-toiminnon aloitusmarginaali (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Merkitse pikatallenne"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Nime� pikatallenne"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Pikatallennuksen kesto (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Suurin tiedostokoko (Mt)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Jaottele muokatut tallenteet"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Toisto"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "K�yt� toiston moninopeustilaa"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "N�yt� toiston tila"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Tallenteen paluutunniste"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Sekalaiset"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Tapahtuman odotusaika (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "K�ytt�j�toiminnon odotusaika (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP-komennon odotusaika (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Kanavavalinnan odotusaika (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "Kanavasy�tteen odotusaika (ms)"
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kanava k�ynnistett�ess�"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "edellinen"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "��nenvoimakkuus k�ynnistett�ess�"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Laajennokset"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "T�ll� laajennoksella ei ole asetuksia!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Asetukset"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "K�ynnist� uudelleen"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "K�ynnistet��nk� uudelleen?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Lopeta tallennus "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Ohjelmisto"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Levy"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "vapaana"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Lopeta toisto"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "��ni"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Tauko"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Jatka"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Lopeta"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Peru muokkaus"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Lopetetaanko tallennus?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Perutaanko muokkaus?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "��nen kieli ei ole valittavissa!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Tallennustilan puute est�� tallennuksen!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Ei vapaata DVB-viritint� tallennukselle!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pys�ytet��n l�hetys..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Siirry: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Muokkausmerkinn�t puuttuvat!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Muokkauksen aloitus ep�onnistui!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Muokkaus aloitettu"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Muokkaus on jo k�ynniss�!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "kyll�"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Lis��"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Korvaa"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Laajennos"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanava lukittu (tallennus k�ynniss�)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Tallennustila loppumassa!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr "Muokkaus kesken - sammutetaanko?"
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Tallennus kesken - sammutetaanko?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Tallennus alkaa %ld min kuluttua - sammutetaanko?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "sammutetaanko?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Laajennos %s her�� %ld minuutin kuluttua - sammutetaanko?"
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr "Muokkaus kesken - k�ynnistet��nk� uudelleen?"
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Tallennus kesken - k�ynnistet��nk� uudelleen?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "k�ynnistet��nk� uudelleen?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "��nenvoimakkuus "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klassinen VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG konsoli"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "MTKTPLS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "Ma Ti Ke To Pe La Su "
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Maanantai"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Torstai"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Perjantai"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS-tallennus on alkamassa!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Tallennus aloitettu"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR sammuu my�hemmin - pakota virtan�pp�imell�"
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Peru sammutus painamalla mit� tahansa n�pp�int�"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Muokkaus ep�onnistui!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Muokkaus valmis"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr "Peru uudelleenk�ynnistys painamalla mit� tahansa n�pp�int�"
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR sammuu %s minuutin kuluttua"
diff --git a/po/fr_FR.po b/po/fr_FR.po
new file mode 100644
index 000000000..b9622af9e
--- /dev/null
+++ b/po/fr_FR.po
@@ -0,0 +1,1273 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Jean-Claude Repetto <jc@repetto.org>, 2001
+# Olivier Jacques <jacquesolivier@hotmail.com>, 2003
+# Gregoire Favre <greg@magma.unil.ch>, 2003
+# Nicolas Huillard <nhuillard@e-dition.fr>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Cha�ne invalide! ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Cha�ne non disponible!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Impossible d'utiliser le mode transfert!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Mise � jour du guide des programmes"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Sans titre"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Fran�ais"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "fra"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Phase 1: D�tection du type de code"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Appuyer sur une touche de la t�l�commande"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Code de la t�l�commande d�tect�!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "N'appuyer sur aucune touche ..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Phase 2: Apprentissage des codes des touches"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Appuyer sur la touche '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Appuyer sur 'Haut' pour confirmer"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Appuyer sur 'Bas' pour continuer"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Appuyer sur 'Haut' pour revenir en arri�re)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Appuyer sur 'Bas' pour terminer)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "('Menu' pour passer cette touche)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Apprentissage des codes de t�l�commande"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Phase 3: Sauvegarde des codes des touches"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Haut"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Bas"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Retour"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Gauche"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Droite"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Rouge"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Vert"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Jaune"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Bleu"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Lecture"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pause"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Enregistrement"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Avance rapide"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Retour rapide"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Suivant"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Pr�c�dent"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Arr�t"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Cha�ne+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Cha�ne-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Cha�ne pr�c�dente"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volume+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volume-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Coupure du son"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Programmes"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Cha�nes"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Programmation"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Enregistrements"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Configuration"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Commandes"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "Aucun cryptage"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "Crypt�"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Modifier une cha�ne"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nom"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Source"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Fr�quence"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "PID Vid�o"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "PID Audio (1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "PID Audio (2)"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "PID AC3 (1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "PID AC3 (2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "PID T�l�texte"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Cryptage"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisation"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Fr�q. Symbole"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "off"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "aucun"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bande passante"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hi�rarchie"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Caract�ristiques des cha�nes ne sont pas uniques"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Cha�nes"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Supprimer"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Modifier"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marquer"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nouveau"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Cette cha�ne est en cours d'utilisation!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Supprimer la cha�ne?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Changer la programmation"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Actif"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Cha�ne"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Jour"
+
+#: menu.c:665
+msgid "Start"
+msgstr "D�but"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Fin"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Priorit�"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Dur�e de vie"
+
+#: menu.c:670
+msgid "File"
+msgstr "Fichier"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Premier jour"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Programmation"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Marche/Arr"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Supprimer la programmation?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Enregistrement en cours - confirmez la suppression"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Ev�nement"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Enregistre"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Regarder"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Programmation"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Prochains programmes"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Programmes en cours"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Apr�s"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Maintenant"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programme"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Impossible de changer de cha�ne!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programmes - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Cet �v�nement -%s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Cet �v�nement - toutes les cha�nes"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Tous les �v�nements - toutes cha�nes"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Veuillez entrer %d chiffres!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Infos sur l'enregistrement"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Lire"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Retour"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Enregistrements"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Ouvrir"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Commandes"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Impossible d'acc�der � l'enregistrement"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Supprimer l'enregistrement?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Erreur de suppression de l'enregistrement!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Commandes d'enregistrement"
+
+#: menu.c:2203
+msgid "never"
+msgstr "jamais"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "d�pend du skin"
+
+#: menu.c:2205
+msgid "always"
+msgstr "toujours"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "Affichage des menus"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Langue"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Skin"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Th�me"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Gauche"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Haut"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Largeur"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Hauteur"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Dur�e affichage message (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Utiliser les petits caract�res"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Position infos cha�nes"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "bas"
+
+#: menu.c:2225
+msgid "top"
+msgstr "haut"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Dur�e affichage infos cha�nes (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Affichage progr. en cours"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Demande d'infos de cha�ne termin�e"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "D�filement par pages"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "D�filement rotatif"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Menu bouton ferm�"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Dossiers d'enregistrements"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Guide des programmes"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Scan"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Inactivit� avant rech. EPG (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Niveau de correction EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Montrer l'EPG p�rim� (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Ajuster l'heure du syst�me"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Utiliser l'heure de la cha�ne"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Langues pr�f�r�es"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Langue pr�f�r�e"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "non"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "noms uniquement"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "PIDs uniquement"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "noms et PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "ajouter cha�nes"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "ajouter transpondeurs"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "Cartes DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Carte DVB primaire"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Format vid�o"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Format d'affichage"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Utiliser le Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Mettre � jour les cha�nes"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Langues audio"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Langue audio"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Utiliser le DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "Limite de bandes LNB (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Fr�quence basse LNB (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Fr�quence haute LNB (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "Acc�s conditionnel"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "R�initialisation"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Ouverture du menu CAM"
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Impossible d'ouvrir le menu CAM!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Impossible de r�initialiser la CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Enregistrement"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Marge ant�rieure (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Marge post�rieure (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Limite primaire"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Priorit� par d�faut"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Dur�e de vie par d�faut (j)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Priorit� des pauses"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Dur�e de vie des pauses (j)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Utiliser le nom de l'�pisode"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Utiliser le VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Marge VPS"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Marquage enregistr. imm�diats"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Noms enregistr. imm�diats"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Dur�e enregistr. imm�diat (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Taille maxi des fichiers (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "S�parer les s�quences �dit�es"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Lecture"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Mode multi-vitesses"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Affichage mode de lecture"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID de reprise"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "MinEventTimeout (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Dur�e minimale d'inact. (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Temps maxi SVDRP (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Prise en compte cha�ne (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Cha�ne initiale"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "comme avant"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Volume initial"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Ce plugin n'a pas de param�tres!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Configuration"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Red�marrer"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Red�marrer?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Arr�ter l'enregistrement "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Programmes"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disque"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "restant"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Arr�ter la lecture"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pause"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Reprendre"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Arr�t"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Annuler le montage"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Arr�ter l'enregistrement?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Annuler les modifications?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr ""
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Espace disque insuffisant pour d�marrer l'enregistrement!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Pas de carte DVB disponible pour l'enregistrement!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pause de l'�mission en direct..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Acc�s direct: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Pas de marques d'�dition d�finies!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Impossible de commencer le montage!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Op�ration de montage lanc�e"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Montage d�j� en cours!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "oui"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Ins�rer"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "�craser"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Haut/Bas -> nouvelle place - OK -> d�placer"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Cha�ne verrouill�e (enregistrement en cours)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Disque presque plein!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Arr�t impossible - option '-s' absente!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Enregistrement en cours - confirmez l'arr�t"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Enregistrement dans %ld minutes - confirmez l'arr�t"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "confirmez l'arr�t"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Enregistrement en cours - red�marrer?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "red�marrer?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volume "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "VDR Classique"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "Consoles ST:TNG"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "LMMJVSD"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "LunMarMerJeuVenSamDim"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Lundi"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Vendredi"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Samedi"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "Enregistrement VPS commence procha�nement"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Enregistrement a commenc�"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Appuyez sur une touche pour annuler l'arr�t"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Changement de carte DVB primaire..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Echec du montage!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Montage termin�"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/hr_HR.po b/po/hr_HR.po
new file mode 100644
index 000000000..698810c5d
--- /dev/null
+++ b/po/hr_HR.po
@@ -0,0 +1,1271 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Drazen Dupor <drazen.dupor@dupor.com>, 2004
+# Dino Ravnic <dino.ravnic@fer.hr>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Neispravan program ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Program nije dostupan!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Ne mogu zapo�eti 'prijenosni' na�in!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Po�injem EPG-scan"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Bez titla"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Hrvatski"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "hrv"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Faza 1: detektiranje k�da daljinskog upravlja�a."
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Pritisnite tipku na daljinskom upravlja�u"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "K�d daljinskog upravlja�a je prepoznat!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Ne pritiskajte tipku..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Faza 2: U�enje posebnih k�dova"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Pritisnite tipku za '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Pritisnite 'Gore' za potvrdu"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Pritisnite 'Dolje' za nastavak"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(pritisnite 'Gore' za nazad)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(pritisnite 'Dolje' za kraj)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "pritisnite 'Izbor' da presko�ite ovu tipku"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "U�enje k�da daljinskog upravlja�a"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Faza 3: Spremanje k�dova tipki"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Gore' za potvrdu, 'Dolje' za prekid"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Gore"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Dolje"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Izbor"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Nazad"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Lijevo"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Desno"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Crveno"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Zeleno"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "�uto"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Plavo"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Start"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pauza"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Snimaj"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Naprijed"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Nazad"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Isklju�i"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Program +"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Program -"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Glasnije"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Ti�e"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Bez zvuka"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr ""
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Raspored"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Programi"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Termini"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Snimke"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Konfiguracija"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Naredbe"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr ""
+
+#: menu.c:71
+msgid "encrypted"
+msgstr ""
+
+#: menu.c:177
+msgid "auto"
+msgstr "automatski"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Ure�ivanje programa"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Naziv"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Izvor"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvencija"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Kodiranje (CA)"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarizacija"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inverzija"
+
+#: menu.c:274
+msgid "off"
+msgstr "ugasi"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "nijedan"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulacija"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Prijenos"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Za�tita"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hijerarhija"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Parametri programa nisu jednozna�ni!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Programi"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Obri�i"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Promijeni"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Ozna�i"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Novi"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Program je trenutno zauzet terminom za snimanje"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Obrisati program?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Ure�ivanje termina"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktivan"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Program"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dan"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Po�etak"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Kraj"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioritet"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Trajanje"
+
+#: menu.c:670
+msgid "File"
+msgstr "Datoteka"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Prvi dan"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Termini"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "De-/Aktiviraj"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Obrisati termin?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Jo� snimam - zaista obrisati?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Emisija"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Snimi"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Prebaci"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr ""
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "�to slijedi?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "�to je trenutno na programu?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Slijedi"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Trenutno"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Raspored"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Ne mogu prebaciti program!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Raspored - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr ""
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr ""
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr ""
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr ""
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr ""
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Start"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Na po�etak"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Snimke"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Otvori"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Naredbe"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Gre�ka pri pristupanju snimke!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Obrisati snimku?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Gre�ka pri brisanju snimke!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Naredbe za snimanje"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nikada"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "ovisno o povr�ini"
+
+#: menu.c:2205
+msgid "always"
+msgstr "uvijek"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Jezik"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Povr�ina"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Lijevo"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Gore"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "�irina"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Visina"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Vrijeme prikaza poruka (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Koristi mala slova"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Pozicija informacije o programu"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "dolje"
+
+#: menu.c:2225
+msgid "top"
+msgstr "gore"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Vrijeme prikaza informacije o programu (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Informacije kod promjene kanala"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr ""
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Listaj po stranicama"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "S kraja sko�i na po�etak"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr ""
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Imenik za snimke"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Pregled emisija (EPG)"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Pretra�i"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Vrijeme do EPG pregleda (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Nivo popravka EPG gre�aka"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Prika�i stare EPG podatke (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Podesi vrijeme sistema"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Transponder za pode�avanje sata"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Preferirani jezici"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Preferirani jezik"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "ne"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "samo imena"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "imena i identifikatore (PIDs)"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "dodaj nove programe"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "dodaj nove transpondere"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Primarni DVB ure�aj"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Video format"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Format video prikaza"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Koristi Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Aktualiziraj programe"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio jezici"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio jezik"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Koristi DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "Frekv. preklopa SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Donja LNB frekv. (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Gornja LNB frekv. (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Izbor"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reset"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr ""
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Ne mogu otvoriti CAM izbor!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Ne mogu resetirati CAM"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Snimanje"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Rezerva na po�etku snimanja (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Rezerva na kraju (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Standardno ograni�enje"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Standardni prioritet"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Standardno trajanje (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioritet pauze"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Trajanje pauze (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Koristi ime epizode"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Koristi VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Vremenska rezerva kod VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Ozna�i direktno snimanje"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Imenuj direktno snimanje"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Trajanje direktnog snimanja (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maksimalna veli�ina datoteke (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Podijeli ure�ene datoteke"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Reprodukcija"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "MultiSpeed na�in"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Prika�i na�in prikazivanja"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID nastavka"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Ostalo"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Minimalno vrijeme pauze"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Minimalno vrijeme neaktivnosti (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP vrijeme neaktivnosti"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr ""
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Dodaci (Plugins)"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Ovaj dodatak (Plugin) nema parametara!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Konfiguracija"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Restart sistema"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Zaista ponovo pokrenuti?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Prekini snimanje "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Raspored"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "slobodno"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Prekini reprodukciju"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr ""
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pauza"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Nastavi"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stop"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Prekini ure�ivanje"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Zaustaviti snimanje?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Otkazati ure�ivanje?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Audio nedostupan"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Nema slobodnog DVB ure�aja za snimanje!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Zaustavljanje �ivog signala..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Sko�i: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Nijedna prekidna to�ka nije postavljena!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Ne mogu zapo�eti ure�ivanje!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Rezanje je zapo�eto"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Ure�ivanje je ve� aktivirano!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "da"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Umetni"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Prepi�i"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Gore/Dolje na novu poziciju - zatim OK"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Program blokiran (snimanje)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Nedovoljno prostora na disku"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Snimanje traje - svejedno isklju�iti?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Snimanje za %ld minuta - svejedno isklju�iti?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "svejedno isklju�iti?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Snimanje traje - svejedno restart sistema?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "svejedno restart sistema?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Glasno�a "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klasi�ni VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Konzole"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "PUS�PSN"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "PonUtoSri�etPetSubNed"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Ponedjeljak"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Utorak"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Srijeda"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "�etvrtak"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Petak"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Subota"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Nedjelja"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr ""
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Pritisnite tipku ako ne �elite ugasiti sistem"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Preklapanje primarnog DVB ure�aja..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Rezanje neuspje�no!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Rezanje zavr�eno"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
new file mode 100644
index 000000000..b210525cc
--- /dev/null
+++ b/po/hu_HU.po
@@ -0,0 +1,1271 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Istvan Koenigsberger <istvnko@hotmail.com>, 2002
+# Guido Josten <guido.josten@t-online.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** �rv�nytelen csatorna ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Az ad� nem el�rhet�"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Transfer-Mode nem ind�that�!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "EPG adatok aktualiz�l�sa"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "n�v n�lk�l"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Magyar"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "hun"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Nyomjon meg egy gombot a t�vir�ny�t�n"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "T�vir�ny�t� k�dja felismerve!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Ne nyomjon meg gombot..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "M�sodik l�p�s: az egyes gombok betan�t�sa"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "'%s' gomb megnyom�sa"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "'Fel' megnyom�sa az elfogad�shoz"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "'Le' megnyom�sa a folytat�shoz"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(�Fel' megnyom�sa a visszat�r�shez)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "('Le' megnyom�sa a befejez�shez)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "T�vir�ny�t� betan�t�sa"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Harmadik l�p�s: k�d ment�se"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Fel' ment�s, 'Le� m�gse"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Fel"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Le"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Men�"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Vissza"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Balra"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Jobbra"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Piros"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Z�ld"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "S�rga"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "K�k"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Inform�ci�"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Lej�tsz�s"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Sz�net"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Felvenni"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "El�re p�rgetni"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Vissza p�rgetni"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "El�re"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Vissza"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Kikapcsolni"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Csatorna+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Csatorna-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Az el�z� ad�s"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Hanger�+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Hanger�-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Csend"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Hang"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Csatorn�k"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Id�z�t�"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Felvett ad�sok"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Be�ll�t�sok"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Parancsok"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "K�dolatlan"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "K�dolt"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Csatorn�k be�ll�t�sa"
+
+#: menu.c:254
+msgid "Name"
+msgstr "N�v"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Forr�s"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvencia"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polariz�ci�"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "ki"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "semmi"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Csatorn�k"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "T�r�lni"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Be�ll�tani"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Megjel�lni"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "�j"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Az ad�t az id�z�t� haszn�lja!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Csatorna t�rl�se?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Id�z�t� megv�ltoztat�sa"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiv"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Csatorna"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Nap"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Kezdet"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "V�ge"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Priorit�s"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "�lettartam"
+
+#: menu.c:670
+msgid "File"
+msgstr "File"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Els� nap"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Id�z�t�"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Inform�ci�"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Be/Ki"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Id�z�t� t�rl�se?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Felv�tel folyamatban van - m�gis t�r�lni?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Ad�s"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Felvenni"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "�tkapcsolni"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Id�z�t�"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Mi k�vetkezik?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Mi megy most?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "K�vetkez�"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Most"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Az ad�t nem lehet elkapcsolni"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Ez az ad�s - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Ez az ad�s - �sszes ad�"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Az �sszes ad�s - az �sszes ad�"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "�ss�n be %d sz�mot!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Felv�tel"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Lej�tszani"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Vissza az elej�re"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Felvett ad�sok"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Kinyitni"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Parancsok"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Hiba a felv�tel hozz�f�r�s�n�l"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Felv�tel t�rl�se?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Hiba a felv�tel t�rl�s�n�l!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Parancsok a felvett filmekhez"
+
+#: menu.c:2203
+msgid "never"
+msgstr "soha"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "Men� n�zet�t�l f�gg�en"
+
+#: menu.c:2205
+msgid "always"
+msgstr "mindig"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Nyelv"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Men� n�zet"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "T�ma"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Balra"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Fent"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Sz�less�g"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Magass�g"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Inform�ci� felt�ntet�s�nek id�tartama"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Kisbet�t haszn�lni"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Ad�sinform�ci� pozici�ja"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "lent"
+
+#: menu.c:2225
+msgid "top"
+msgstr "Fent"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Inform�ci� az ad� v�lt�s�n�l"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "A lek�rdezett ad�sinform�ci� bez�r�sa"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Oldalank�nt l�ptetmi"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Korl�tlan l�ptet�s"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "A men� gomb z�r"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Felv�telek list�ja"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Ad�skeres�s"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Fennmaradt id� az EPG-�j�t�sig (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG hibaelh�r�t�s"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "R�gi EPG adatok megmutat�sa (perc)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Az id� be�ll�t�sa"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Id�h�z tartoz� Transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Kedvenc nyelvek"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Kedvenc nyelv"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nem"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "kiz�r�lag nevek"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "kiz�r�lag PID-k"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nevek �s PID-k"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "�j ad�k hozz�ad�sa"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "�j transponder hozz�ad�sa"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Els� DVB interface"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Video form�tum"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "K�perny�form�tum"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Dolby-Digital hangot haszn�lni"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Ad�k aktualiz�l�sa"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio-nyelvek"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio-nyelv"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "DiSEqC haszn�lata"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Als� LNB-frekvencia (MHZ)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Fels� LNB-frekvencia (MHZ)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Men�"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reset"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "A CAM-men� nyit�s alatt..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "A CAM-Men� nem nyithat�"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "A CAM-Reset nem siker�lt"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Felv�tel"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Id�eltol�d�s a kezd�sn�l (perc)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Id�eltol�d�s a befejez�sn�l (perc)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Prim�r-hat�r"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Default priority"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Default �lettartam"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Sz�net priorit�s"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Sz�net �lettartama"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Epiz�dn�v felhaszn�l�sa"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "VPS-t haszn�lni"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Id�eltol�d�s VPS-n�l (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Direktfelv�tel megjel�l�se"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Direktfelv�tel megnevez�se"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Felv�tel id�tartama (perc)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Max. video File-terjedelem (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Feldolgozott File-k feloszt�sa"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Lej�tsz�s"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "MultiSpeed funkci�"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Lej�tsz�s felt�ntet�se"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Lej�tsz�s ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Egy�b"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Id�zit�sek k�z�tti id�tartam (perc)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "VDR le�ll haszn�lat n�lk�l (perc)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP sz�tkapcsol haszn�lat n�lk�l(s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Ad�sv�lt�s ideje (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Ad�s a bekapcsol�sn�l"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "ahogy az el�bb"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Hanger� a bekapcsol�sn�l"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Ennek a plugin-nak nincs setup-parametere!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Be�ll�t�sok"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "�jraind�t�s"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "T�nyleg �jraind�tani?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Felv�telt befejezni"
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Lemez"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "szabad"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Lej�tsz�st befejzni"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Hang"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Sz�net"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Tov�bb"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stop"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " V�g�st megszak�tani"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Felv�tel befejezni?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "V�g�st befejezni?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Hang nem lehets�ges!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Nincs elegend� hely a felv�telre"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Nincs szabad DVB k�rtya a felv�telhez!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Az �l� ad�s meg�ll�tva..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Ugr�s:"
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "A v�g�pont nincs kijel�lve"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "A v�g�s nem ind�that�!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "V�g�s elind�tva"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "A v�g�s m�r aktiv�lt!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "igen"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Beilleszteni"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "�t�rni"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Fel/Le egy uj opci��rt - azt�n OK"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Az ad� blokkolva (felv�tel)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "A merev lemez majdnem tele!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Felv�tel folyamatban van - m�gis kikapcsolni?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "m�gis kikapcsolni?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Felv�tel folyamatban van - m�gis �jraind�tani?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "m�gis �jraind�tani?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Hanger�"
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klasszikus VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Konzol"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "HKSCPSV"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "H�tKedSzeCs�P�nSzoVas"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "H�tf�"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Kedd"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Szerda"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Cs�t�rt�k"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "P�ntek"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Szombat"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Vas�rnap"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS-felv�tel r�gt�n kezd�dik!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "A felv�tel elinditva Nd"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Prim�r Interface �tkapcsolva..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "V�g�s sikertelen!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "V�g�s befejezve"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
new file mode 100644
index 000000000..ccf17415d
--- /dev/null
+++ b/po/it_IT.po
@@ -0,0 +1,1272 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Alberto Carraro <bertocar@tin.it>, 2001
+# Antonio Ospite <ospite@studenti.unina.it>, 2003
+# Sean Carlos <seanc@libero.it>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Sean Carlos <seanc@libero.it>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Canale NON valido ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Canale non disponibile!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Impossibile iniziare la modalita' di trasferimento!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Inizio scansione EPG"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Senza titolo"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Italiano"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "ita"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: tipo ricevitore RC"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Premere un tasto dell'unita' RC"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Codice RC rilevato!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Non premere alcun tasto..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: Codici specifici dei tasti"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Premere il tasto per '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Premere 'Su' per confermare"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Premere 'Giu' per continuare"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(premere 'Su' per tornare indietro)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "('Giu' per finire la definizione tasti)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(premere 'Menu' per saltare questo tasto)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Apprendimento tasti unita' remota"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: Salvataggio codici tasti"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Su' per salvare, 'Giu' per annullare"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Su"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Giu"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Indietro"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Sinistra"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Destra"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Rosso"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Verde"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Giallo"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Blu"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Informazioni"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Riproduzione"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pausa"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Registrazione"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Avanti Veloce"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Indietro Veloce"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Prossimo"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Precedente"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Power"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Canale +"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Canale -"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Canale Prec."
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volume +"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volume -"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Muto"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Programmi"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Canali"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timer"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Registrazioni"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Opzioni"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Comandi"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "in chiaro"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "criptato"
+
+#: menu.c:177
+msgid "auto"
+msgstr "automatico"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Modifica canale"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nome"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Sorgente"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frequenza"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "PID Video"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "PID Pcr"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "PID Audio (1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "PID Audio (2)"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "PID AC3 (1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "PID AC3 (2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "PID Teletext"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarizzazione"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "SymbolRate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "off"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "nessuno"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Banda passante"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Parametri canale non univoci!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Canali"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Cancella"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Modifica"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marca"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nuovo"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Canale occupato da un timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Cancellare il canale?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Modifica timer"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Attivo"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Canale"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Giorno"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Inizio"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Fine"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Priorita'"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Durata"
+
+#: menu.c:670
+msgid "File"
+msgstr "Nome"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Primo giorno"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timer"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Informazioni"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "On/Off"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Cancellare il timer?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timer in registrazione - cancellare?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Eventi"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Registra"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Cambia"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Timer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Prossimi programmi"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "In programmazione adesso"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Prossimo"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Adesso"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programma"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Impossibile cambiare canale!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programma - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Questo evento - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Questo evento - tutti i canali"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Tutti gli eventi - tutti i canali"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Inserire %d cifre!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Informazioni registrazione"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Riproduci"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Riavvolgi"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Registrazioni"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Apri"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Comandi"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Errore nell'accedere alla registrazione!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Cancellare la registrazione?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Errore nel cancellare la registrazione!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Comandi di registrazione"
+
+#: menu.c:2203
+msgid "never"
+msgstr "mai"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "in base allo stile"
+
+#: menu.c:2205
+msgid "always"
+msgstr "sempre"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Lingua"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Stile interfaccia"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema colori"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Sinistra"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "In alto"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Larghezza OSD"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Altezza OSD"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Tempo del messaggio (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Utilizzare caratteri piccoli"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Posizione informazioni canale"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "in basso"
+
+#: menu.c:2225
+msgid "top"
+msgstr "in alto"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Durata informazioni canale (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Mostrare informazioni al cambio canale"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Scadenza informazioni canale richieste"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Scorrere per pagine"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Scorrere riavvolgendo"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Usare il bottone Menu per chiudere"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Directory di registrazione"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Guida programmi EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Scansione"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Timeout scansione aggiorn. EPG (ore)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Livello correzione EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Visualizzazione dati vecchi (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Settare orario automatico"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Utilizzare orario da transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Lingue preferite"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Lingua preferita"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "no"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "solo nomi"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "solo PID"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nomi e PID"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "nuovi canali"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "nuovi transponder"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "Scheda DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Scheda DVB primaria"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Formato video"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Formato di visualizz. video"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Aggiornare i canali"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Lingue per l'Audio"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Lingua per l'Audio"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Utilizza DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Freq LO LNB (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Freq HI LNB (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "Accesso condizionato CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Resetta"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Apertura menu CAM..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Impossibile aprire il menu CAM!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Impossibile reimpostare il modulo CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Registrazione"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Margine iniziale (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Margine finale (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Limite primario"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Priorita' predefinita"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Durata predefinita (gg)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Priorita' di pausa"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Durata pausa (gg)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Usare nome episodio"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Usare VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Margine VPS"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Marcare registrazione immediata"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Nome registrazione immediata"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Tempo registrazione immediata (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Dimensione massima file video (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Dividi i file modificati"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Riproduzione"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Modalita' multispeed"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Mostrare modalita' riproduzione"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID di rispristino"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Generici"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Scadenza minima evento (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Periodo minimo di inattivita' (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Scadenza SVDRP (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Scadenza Zapping (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Canale iniziale"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "come prima"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Volume iniziale"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Questo plugin non ha parametri di configurazione!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Opzioni"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Riavvio"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Eseguire un riavvio?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Stop registrazione "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Programmi"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disco"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "liberi"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Stop riproduzione"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pausa"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Riprendi"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stop"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Annullare modifiche"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Fermare la registrazione?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Annullare la modifica?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Nessun audio disponibile!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Spazio su disco insufficiente per registrare!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Nessuna periferica DVB disponibile per registrare!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pausa del canale in visione..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Vai a: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Nessun marcatore di modifica definito!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Impossibile iniziare processo di modifica!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Processo di modifica iniziato"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Processo di modifica gia' attivo!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "si"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Inserisci"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Sovrascrivi"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Su/Giu per nuova posizione - OK per muovere"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Canale bloccato (in registrazione)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Poco spazio su disco!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Impossibile spegnere - parametro '-s' non passato!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "In registrazione - spegnere comunque?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Registrazione fra %ld minuti - spegnere comunque?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "spegnere comunque?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "In registrazione - riavviare comunque?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "riavviare comunque?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volume "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "VDR Classico"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "Consolle ST:TNG"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "LMMGVSD"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "LunMarMerGioVenSabDom"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Luned�"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Marted�"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "mercoled�"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Gioved�"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Venerd�"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Sabato"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Domenica"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "Registrazione VPS imminente!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Registrazione avviata"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Premere un tasto per annullare lo spegnimento"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Cambio su card DVB primaria..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Processo di modifica fallito!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Processo di modifica terminato"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
new file mode 100644
index 000000000..19c351428
--- /dev/null
+++ b/po/nl_NL.po
@@ -0,0 +1,1272 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
+# Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
+# Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Ongeldig kanaal ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanaal niet beschikbaar"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Kan Transfer-Mode niet starten"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Bezig met starten EPG scan"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Geen titel"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Nederlands"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "dut"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: detecteren type afstandsbediening"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Druk op een willekeurige knop"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Afstandsbediening code herkend!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Druk niet op een knop..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: Leren specifieke toets-codes"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Druk knop voor '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Druk 'Omhoog' om te bevestigen"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Druk 'Omlaag' om verder te gaan"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(druk 'Omhoog' om terug te gaan)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Druk 'Omlaag' om te beeindigen)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "Druk 'Menu' om deze toets over te slaan"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Leren toetsen afstandsbediening"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: Opslaan toets codes"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Omhoog' te bewaren, 'Omlaag' voor annuleren"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Omhoog"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Omlaag"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Terug"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Links"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Rechts"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Rood"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Groen"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Geel"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Blauw"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Weergeven"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pauze"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Opnemen"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Vooruitspoelen"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Terugspoelen"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Uitschakelen"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanaal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanaal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volume+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volume-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Geluid onderbreken"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Gids"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanalen"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timers"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Opnames"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Instellingen"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Commando's"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr ""
+
+#: menu.c:71
+msgid "encrypted"
+msgstr ""
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Kanaal aanpassen"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Naam"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Bron"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frequentie"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisatie"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "uit"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "geen"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanaalinstellingen zijn niet uniek!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanalen"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Verwijder"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Verander"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Verplaats"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nieuw"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanaal wordt gebruikt door een timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Kanaal verwijderen?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Timer veranderen"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Actief"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanaal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dag"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Begin"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Einde"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Bewaarduur"
+
+#: menu.c:670
+msgid "File"
+msgstr "Filenaam"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Eerste dag"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timers"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Aan/Uit"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Timer verwijderen?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timer neemt nog op - toch verwijderen?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Uitzending"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Opnemen"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Selecteer"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr ""
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Wat komt er hierna?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Wat is er nu?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Hierna"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Nu"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programma"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kan geen kanaal wisselen!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programma - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr ""
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr ""
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr ""
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Vul %d cijfers in!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Opname info"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Afspelen"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Naar begin"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Opnames"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Openen"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Commando's"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Fout bij lezen opname!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Opname verwijderen?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Fout bij verwijderen opname!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Opname commando's"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nooit"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "skin afhankelijk"
+
+#: menu.c:2205
+msgid "always"
+msgstr "altijd"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Taal"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Skin"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Thema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Links"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Boven"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Breedte"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Hoogte"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Weergave duur van berichten (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Klein lettertype gebruiken"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Kanaal info positie"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "onder"
+
+#: menu.c:2225
+msgid "top"
+msgstr "boven"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Duur tonen kanaal-informatie (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Kanaal info tonen"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr ""
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Scrollen per pagina"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Rondom scrollen"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr ""
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Opname directories"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Scan"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "EPG-scan Timeout (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG foutcorrectieniveau"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Oude EPG data tonen (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Systeem klok instellen"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Gebruik transponder tijd voor systeem"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Voorkeurstalen"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Voorkeurstaal"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nee"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "alleen namen"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "namen en PIDs"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "nieuwe kanalen toevoegen"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "nieuwe transponders toevoegen"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Eerste DVB kaart"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Videoformaat"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Video display formaat"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Dolby Digital gebruiken"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Kanalen actualiseren"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio talen"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio taal"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "DiSEqC gebruiken"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Laagste LNB frequentie (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Hoogste LNB frequentie (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Herstart"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "CAM-menu wordt geopend..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Kan CAM-menu niet openen!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Kan CAM niet herstarten!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Opname"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Tijd marge begin (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Tijd marge eind (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Eerste grens"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Standaard prioriteit"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Standaard levensduur (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Pauze prioriteit"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Pauze levensduur (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Gebruik episode naam"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "VPS gebruiken"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Marge VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Direkte opnamen markeren"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Naam direkt-opname"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Duur van de directe opname (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maximale omvang video file (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Bewerkte files opdelen"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Afspelen"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Multi-speed mode"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Weergave mode aangeven"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Hervattings ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Overig"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Minimale event time-out (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Minimum gebruikers inactiviteit (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP Timeout (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Zap timeout (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Deze plugin heeft geen instelparameters"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Instellingen"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Herstart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Werkelijk opnieuw starten?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Stop opnemen "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Gids"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "vrij"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Stop afspelen"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pauze"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Verder"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Eindigen"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Bewerken afbreken"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Opname stoppen?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Bewerken afbreken?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Geen audio beschikbaar!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Geen vrije DVB kaart om op te nemen!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pauzeren live uitzending..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Springen: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Geen bewerkingsmarkeringen gedefinieerd!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Kan niet beginnen met bewerken!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Bewerken is gestart"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Bewerken is al actief!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "ja"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Invoegen"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Overschrijven"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Gebruik Omhoog/Omlaag - daarna Ok"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanaal geblokkeerd (neemt op)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Disk bijna vol!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Opname loopt - toch uitschakelen?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Opname in %ld minuten - toch uitschakelen?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "toch uitschakelen?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Opname loopt - toch opnieuw starten?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "toch opnieuw starten?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volume "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "VDR Klassiek"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Consoles"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "MDWDVZZ"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "MaaDinWoeDonVryZatZon"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "maandag"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Donderdag"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Vrijdag"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Zaterdag"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Zondag"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr ""
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Druk een toets om shutdown af te breken"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Eerste DVB-kaart wordt omgeschakeld..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Bewerken is mislukt!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Bewerken is klaar"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
new file mode 100644
index 000000000..25d074b60
--- /dev/null
+++ b/po/nn_NO.po
@@ -0,0 +1,1271 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# J�rgen Tvedt <pjtvedt@online.no>, 2001
+# Truls Slevigen <truls@slevigen.no>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Ugyldig Kanal! ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr ""
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Kan ikke starte transfer modus!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr ""
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr ""
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Norsk"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "nor"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: Finne fjernkontroll-kodetype"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Trykk en av tastene p� fjernkontrollen"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Fjernkontroll-kodetype funnet!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Ikke trykk p� noen av tastene..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: L�re spesifikke tastekoder"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Trykk tasten for '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Trykk 'Opp' for � bekrefte"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Trykk Ned' for � fortsette"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(trykk 'Opp' for � g� tilbake)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(trykk 'Ned' for � avslutte innl�ring)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr ""
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "L�re fjernkontrolltaster"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: Lagre tastekoder"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Trykk 'Opp' for � lagre, 'Ned' for � avbryte"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Opp"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Ned"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Meny"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Tilbake"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Venstre"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "H�yre"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "R�d"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Gr�nn"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Gul"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Bl�"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr ""
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr ""
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr ""
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr ""
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr ""
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr ""
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr ""
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Power"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr ""
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr ""
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volum+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volum-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Lyd av"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr ""
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Programmer"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanaler"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timere"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Opptak"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Konfigurasjon"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Kommandoer"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr ""
+
+#: menu.c:71
+msgid "encrypted"
+msgstr ""
+
+#: menu.c:177
+msgid "auto"
+msgstr ""
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Editer kanal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Navn"
+
+#: menu.c:255
+msgid "Source"
+msgstr ""
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvens"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "AC3pid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "AC3pid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tekst-TV pid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Kortleser"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisasjon"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr ""
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr ""
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr ""
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanaler"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Slett"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Editer"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marker"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Ny"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanalen er i bruk av en timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Slette kanal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Editer timer"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiv"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dag"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Start"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Slutt"
+
+#: menu.c:667
+msgid "VPS"
+msgstr ""
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioritet"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Levetid"
+
+#: menu.c:670
+msgid "File"
+msgstr "Filnavn"
+
+#: menu.c:686
+msgid "First day"
+msgstr "F�rste dag"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timere"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr ""
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Av/P�"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Slette timer?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timer gj�r opptak - vil du slette likevel?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Hendelse"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Ta opp"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Skift til"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr ""
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Hvilket program er neste?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Hvilket program sendes n�?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Neste"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "N�"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programmer"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Ikke mulig � skifte kanal!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program Guide - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr ""
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr ""
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr ""
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr ""
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr ""
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Spill av"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Spol tilbake"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Opptak"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "�pne"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Kommandoer"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Feil under lesing av opptak!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Slette opptak?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Feil under sletting av opptak!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr ""
+
+#: menu.c:2203
+msgid "never"
+msgstr ""
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr ""
+
+#: menu.c:2205
+msgid "always"
+msgstr ""
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Spr�k"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr ""
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr ""
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr ""
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr ""
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Bredde"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "H�yde"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Tid meldinger skal vises (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr ""
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Posisjon p� kanalinformasjon"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "nedre"
+
+#: menu.c:2225
+msgid "top"
+msgstr "�vre"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr ""
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Info ved kanalskifte"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr ""
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Rask rulling i menyer"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr ""
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr ""
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Kataloger til opptak"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Programoversikt"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr ""
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Ledig tid f�r EPG-s�k (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Niv� for EPG-feilretting"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr ""
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Juster system-klokken"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Bruk klokke fra transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr ""
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr ""
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nei"
+
+#: menu.c:2420
+msgid "names only"
+msgstr ""
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr ""
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr ""
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr ""
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB-enheter"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Hoved DVB-enhet"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "TV-Format"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr ""
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr ""
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr ""
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr ""
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr ""
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Bruk DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "LO-grensefrekvens (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "LO-frekvens i lavb�ndet (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "LO-frekvens i h�yb�ndet (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Meny"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr ""
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr ""
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr ""
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr ""
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Opptak"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Opptaksmargin start (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Opptaksmargin slutt (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Prioritetsgrense HovedDVB"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Normal prioritet (Timer)"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Normal levetid timer (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr ""
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr ""
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Bruk episodenavn"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr ""
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr ""
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Markere direkteopptak"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Navngi direkteopptak"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr ""
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maksimal st�rrelse p� videofiler (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Splitt redigerte filer"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Spill av"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Multispeed modus"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Vis avspillingsmodus"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Resume ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Forskjellig"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Minste hendelsespause (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Minimumstid med inaktivitet (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Ubrukt SVDRP-levetid (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr ""
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr ""
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Konfigurasjon"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Start p� nytt"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Vil du virkelig starte p� nytt?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Stopp opptak fra "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Programmer"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "ledig"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Stopp avspilling"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr ""
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr ""
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Fortsett"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stopp"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Avbryt redigering"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Stoppe opptak?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Avbryte redigering?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Pas d'audio disponible!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Ingen ledige DVB enheter for opptak!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr ""
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Hopp: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr ""
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Kan ikke starte redigeringsprosessen!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Redigeringsprosess startet"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Redigeringsprosessen er allerede aktiv!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr ""
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "ja"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr ""
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Opp/Ned for ny plass - OK for � flytte"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanalen er l�st (opptak)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Lite ledig diskplass!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Kan ikke sl� av - startet uten parameteret '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Gj�r opptak - sl� av likevel?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Skal gj�re opptak om %ld minutter - sl� av likevel?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "sl� av likevel?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Gj�r opptak - starte p� nytt likevel?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "starte p� nytt likevel?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volum "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr ""
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr ""
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "MTOTFLS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "ManTirOnsTorFreL�rS�n"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Manday"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Tirsday"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Onsday"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Fredag"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "L�rdag"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "S�ndag"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr ""
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Trykk en tast for ikke � sl� av"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Bytter f�rste DVB-enhet..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Feil under redigering!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Redigeringsprosess avsluttet"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
new file mode 100644
index 000000000..d782eff75
--- /dev/null
+++ b/po/pl_PL.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Michael Rakowski <mrak@gmx.de>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Niepoprawny kana� ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kana� nie jest dost�pny!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Nie mo�na uruchomi� trybu transferu!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Rozpoczynam skanowanie EPG"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Bez tytu�u"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Polski"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "pol"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Etap 1: Wykrywanie rodzaju kodu pilota"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Naci�nij dowolny klawisz na pilocie"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Wykryto kod pilota!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Nie naciskaj teraz �adnego klawisza..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Etap 2: Nauka konkretnych kod�w klawiszy"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Naci�nij klawisz dla '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Naci�nij 'Do g�ry' aby potwierdzi�"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Naci�nij 'Na d�' aby kontynuowa�"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(naci�nij 'Do g�ry' aby si� cofn��)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(naci�nij 'Na d�' aby zako�czy� definiowanie)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(naci�nij 'Menu' aby pomin�� ten klawisz)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Nauka klawiszy pilota"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Etap 3: Zapisywanie kod�w klawiszy"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Naci�nij 'Do g�ry' aby zapisa�, 'Na d�' - aby anulowa�"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Do g�ry"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Na d�"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Wstecz"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "W lewo"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "W prawo"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Czerwony"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Zielony"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "��ty"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Niebieski"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Odtw�rz"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pauza"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Nagrywaj"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Do przodu"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Do ty�u"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Dalej"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Wstecz"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Wy��cz"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kana�+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kana�-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Poprzedni kana�"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "G�o�niej"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Ciszej"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Wycisz"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "D�wi�k"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kana�y"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timery"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Nagrania"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Ustawienia"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Polecenia"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "nieszyfrowany"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "szyfrowany"
+
+#: menu.c:177
+msgid "auto"
+msgstr "auto"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Edycja kana�u"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nazwa"
+
+#: menu.c:255
+msgid "Source"
+msgstr "�r�d�o"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Cz�stotliwo��"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polaryzacja"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inwersja"
+
+#: menu.c:274
+msgid "off"
+msgstr "wy��cz"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "brak"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulacja"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Pasmo"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmisja"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Ustawienia kana�u nie s� unikalne!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kana�y"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Usu�"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Edytuj"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Zaznacz"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nowy"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kana� jest u�ywany przez timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Usun�� kana�?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Edycja timera"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktywny"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kana�"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dzie�"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Pocz�tek"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Koniec"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Priorytet"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Czas �ycia"
+
+#: menu.c:670
+msgid "File"
+msgstr "Plik"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Pierwszy dzie�"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timery"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "W�/Wy�"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Usun�� timer?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Trwa nagrywanie - na pewno usun��?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Audycja"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Nagraj"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Prze��cz"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Timer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Nast�pne audycje"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Program bie��cy"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Nast�pnie"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Teraz"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Nie mo�na prze��czy� kana�u!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Ta audycja - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Ta audycja - wszystkie kana�y"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Wszystkie audycje - wszystkie kana�y"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Prosz� poda� %d cyfr!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Informacje o nagraniu"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Odtw�rz"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Pocz�tek"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Nagrania"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Otw�rz"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Polecenia"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Bl�d podczas dost�pu do nagrania!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Usun�� nagranie?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Bl�d podczas usuwania nagrania!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Polecenia nagra�"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nigdy"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "zal. od sk�rki"
+
+#: menu.c:2205
+msgid "always"
+msgstr "zawsze"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "J�zyk"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Sk�rka"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Motyw"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Od lewej"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Od g�ry"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Szeroko��"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Wysoko��"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Czas trwania wiadomo�ci (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "U�ywaj ma�ej czcionki"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Pozycja informacji o kanale"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "d�"
+
+#: menu.c:2225
+msgid "top"
+msgstr "g�ra"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Czas trwania informacji o kanale (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Informacja przy zmianie kana�u"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Czas oczekiwania na informacje"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Przesuwaj stronami"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Skrajne pozycje s�siaduj�"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Przycisk Menu zamyka"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Katalogi nagra�"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Skanuj"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Czas skanowania EPG (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Stopie� poprawek b��d�w EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Czas przechowywania EPG (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Ustawiaj czas systemowy"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "U�yj czasu z transpondera"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Preferowanych j�zyk�w"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Preferowany j�zyk"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nie"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "tylko nazwy"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "tylko PID-y"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nazwy i PID-y"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "dodawaj nowe kana�y"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "dodawaj nowe transpondery"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Pierwszy interfejs DVB"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Format obrazu"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Format wy�wietlania obrazu"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "U�ywaj Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Aktualizuj kana�y"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "J�zyk�w d�wi�ku"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "J�zyk d�wi�ku"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "U�ywaj DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Dolna cz�stotliwo�� LNB (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "G�rna cz�stotliwo�� LNB (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reset"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Otwieram menu CAM..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Nie mo�na otworzy� menu CAM!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Nie mo�na zresetowa� CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Nagranie"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Margines na pocz�tku (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Margines na ko�cu (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Podstawowy limit"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Domy�lny priorytet"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Domy�lny czas �ycia (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Priorytet pauzy"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Czas �ycia pauzy (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "U�ywaj nazwy epizodu"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "U�ywaj VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Margines VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Zaznaczaj natychm. nagrywanie"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Nazywaj natychm. nagrywanie"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Czas natychm. nagrywania (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maksymalny rozmiar pliku (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Dziel edytowane pliki"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Odtwarzanie"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Tryb wielopr�dko�ciowy"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Pokazuj tryb odtwarzania"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID wznowienia"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "R�ne"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Minimalny czas audycji (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Minimalny czas nieaktywno�ci (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Czas oczekiwania na SVDRP (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Czas oczekiwania na zap (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Pocz�tkowy kana�"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "jak ostatnio"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Pocz�tkowa g�o�no��"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Ta wtyczka nie ma �adnych ustawie�!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Ustawienia"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Restart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Na pewno zrestartowa�?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Zatrzymaj nagrywanie "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Dysk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "wolnego"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Zatrzymaj odtwarzanie"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "D�wi�k"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pauza"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Wzn�w"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Zatrzymaj"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Anuluj edycj�"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Zatrzyma� nagrywanie?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Anulowa� monta�?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "D�wi�k nie jest dost�pny!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Brak miejsca na dysku do nagrywania!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Brak wolnej karty DVB do nagrywania!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pauzuj� program na �ywo..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Skok: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Nie zdefiniowano znacznik�w monta�u!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Nie mo�na uruchomi� procesu edycji!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Proces edycji rozpocz�ty"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Proces edycji jest ju� aktywny!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "tak"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Wstaw"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Nadpisz"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Wtyczka"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Do g�ry/Na d� na now� pozycj� - Ok zatwierdza"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kana� zablokowany (trwa nagrywanie)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Ma�o miejsca na dysku!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Trwa nagrywanie - wy��czy� mimo to?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Nagrywanie za %ld minut - wy��czy� mimo to?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "wy��czy� mimo to?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Trwa nagrywanie - zrestartowa� mimo to?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "zrestartowa� mimo to?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "G�o�no�� "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klasyczny VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "Panel ST:TNG"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "PW�CPSN"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "PonWto�roCzwPi�SobNie"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "poniedzia�ek"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "�roda"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Czwartek"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Pi�tek"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Sobota"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Niedziela"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "Wkr�tce nagranie VPS!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Rozpocz�to nagrywanie"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Naci�nij dowolny klawisz aby nie wy��cza�"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Prz곱czam na pierwszy interfejs DVB..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Proces edycji nie powi�d� si�!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Proces edycji zako�czony"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
new file mode 100644
index 000000000..8bab256ad
--- /dev/null
+++ b/po/pt_PT.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Paulo Lopes <pmml@netvita.pt>, 2001
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal Inv�lido! ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr ""
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Imposs�vel iniciar modo de transfer�ncia!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr ""
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr ""
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Portugu�s"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "por"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Fase 1: detectar tipo de receptor"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Pressione qualquer tecla do telecomando"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "C�digo do telecomando detectado!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "N�o pressione nada..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fase 2: A aprender c�digos especificos"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Pressione tecla para '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Pressione 'Cima' para confirmar"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Pressione 'Baixo' para continuar"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Pressione 'Cima' para voltar)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Pressione 'Baixo' para terminar a defini��o)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr ""
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Aprender as teclas do telecomando"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fase 3: A salvar os c�digos das teclas"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Cima' para Salvar, 'Baixo' para Cancelar"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Cima"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Baixo"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Menu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Voltar"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Esquerda"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Direita"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Vermelho"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Verde"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Amarelo"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Azul"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr ""
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr ""
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr ""
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr ""
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr ""
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr ""
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr ""
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr ""
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Ligar"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr ""
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr ""
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr ""
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volume+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volume-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Sem som"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr ""
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Programa��o"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Canais"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timers"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Grava��es"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Configurar"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Comandos"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr ""
+
+#: menu.c:71
+msgid "encrypted"
+msgstr ""
+
+#: menu.c:177
+msgid "auto"
+msgstr ""
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Modificar canal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nome"
+
+#: menu.c:255
+msgid "Source"
+msgstr ""
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frequ�ncia"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "PID de V�deo"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "PID �udio (1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "PID AC3 (1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "PID AC3 (2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "PID Teletexto"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Encripta��o"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polariza��o"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "off"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr ""
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr ""
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Canais"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Apagar"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Modificar"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marcar"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Novo"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Canal a ser utilizador por um timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Apagar o canal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Modificar timer"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Activo"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Canal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dia"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Inicio"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Fim"
+
+#: menu.c:667
+msgid "VPS"
+msgstr ""
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioridade"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Dura��o"
+
+#: menu.c:670
+msgid "File"
+msgstr "Ficheiro"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Primeiro dia"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timers"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr ""
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "On/Off"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Apagar o timer?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timer activo - t�m a certeza que quer apagar?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Evento"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Gravar"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Seleccionar"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr ""
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Pr�ximo Programa?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Programa actual?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Proximo"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Agora"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Programa��o"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "N�o pode mudar de canal!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programa - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr ""
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr ""
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr ""
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr ""
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr ""
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Play"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Rebobinar"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Grava��es"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Abrir"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Comandos"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Erro ao aceder � grava��o"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Apagar a grava��o?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Erro enquanto apagava uma grava��o!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr ""
+
+#: menu.c:2203
+msgid "never"
+msgstr ""
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr ""
+
+#: menu.c:2205
+msgid "always"
+msgstr ""
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Linguagem"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr ""
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr ""
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr ""
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr ""
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Largura"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Altura"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Mostrar contador (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr ""
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Posi��o de info dos canais"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "fundo"
+
+#: menu.c:2225
+msgid "top"
+msgstr "topo"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr ""
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Mostrar info ao mudar de Canal"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr ""
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Scroll da p�gina no menu"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr ""
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr ""
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Directorias de grava��o"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr ""
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Expirou o EPG (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "N�vel de correct��o EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr ""
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Ajustar rel�gio do sistema"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Usar rel�gio do transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr ""
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr ""
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "n�o"
+
+#: menu.c:2420
+msgid "names only"
+msgstr ""
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr ""
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr ""
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr ""
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr ""
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Interface DVB prim�rio"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Formato v�deo"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr ""
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr ""
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr ""
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr ""
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr ""
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Utilizar DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "Limite de bandas LNB (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Frequ�ncia base LNB (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Frequ�ncia alta LNB (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Menu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr ""
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr ""
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr ""
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr ""
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "A gravar"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Margem inicial (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Margem final (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Limite Prim�rio"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Prioridade por defeito"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Validade por defeito (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr ""
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr ""
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Utilizar o nome do epis�dio"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr ""
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr ""
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Marca de grava��o r�pida"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Nome de grava��o r�pida"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr ""
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Tamanho m�ximo dos ficheiros (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Quebrar ficheiros"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Replay"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Modo de multi-speed"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Mostrar modo de replay"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Resume ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Outros"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Per�odo m�nimo de pausa (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Per�odo m�nimo de inactividade (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Timeout SVDRP (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr ""
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr ""
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr ""
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr ""
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugins"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr ""
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Configurar"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Tem a certeza que quer reiniciar?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Parar grava��o "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Programa��o"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "livre"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Parar reprodu��o"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr ""
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr ""
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Continuar"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Parar"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Anular modifica��o"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Parar Grava��o?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Cancelar Modifica��es?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr ""
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr ""
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Nenhuma placa DVB disponivel para gravar!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr ""
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Saltar: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr ""
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "N�o pode iniciar a modifica��o!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Processo de modifica��o iniciado"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Processo de modifica��o j� activo!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr ""
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "sim"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr ""
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr ""
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Cima/Baixo para nova localiza��o - Ok para mover"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Canal bloqueado (a gravar)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Espa�o em disco reduzido!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Imposs�vel desligar - falta a op��o '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Em grava��o - quer mesmo desligar?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Em grava��o dentro de %ld minutos - quer mesmo desligar?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "quer mesmo desligar?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Em grava��o - quer mesmo reiniciar?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "quer mesmo reiniciar?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volume "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr ""
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr ""
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "STQQSSD"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "SegTerQuaQuiSexSabDom"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Segunda"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Ter�a"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Quarta"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Quinta"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Sexta"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "S�bado"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Domingo"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr ""
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr ""
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Pressione qualquer tecla para cancelar"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "A mudar interface DVB prim�rio..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Falha no processo de modifica��o"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Processo de modifica��o terminado"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
new file mode 100644
index 000000000..f2edbec75
--- /dev/null
+++ b/po/ro_RO.po
@@ -0,0 +1,1271 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Paul Lacatus <paul@campina.iiruc.ro>, 2002
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal invalid ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Canal indisponibil"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Nu pot porni modul de transfer!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Pornesc achizi�ia EPG"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "F�r� titlu"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Rom�n�"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "rom"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Faza 1: Detec�ia tipului telecomenzii"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Ap�sa�i o tast� pe telecomand�"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "S-a detectat tipul telecomenzii!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Nu ap�sa�i nici o tast�..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Faza 2: �nv��area codurilor anumitor taste"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Ap�sa�i tasta pentru '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Ap�sa�i 'Sus' pentru confirmare"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Ap�sa�i 'Jos' pentru continuare"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Ap�sa�i 'Sus' pentru revenire)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Ap�sa�i 'Jos' pentru terminare)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "�nv��are taste telecomand�"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Faza 3: Salvarea codurilor de taste"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Sus"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Jos"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Meniu"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "OK"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "�napoi"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "St�nga"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Dreapta"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Ro�u"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Verde"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Galben"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Albastru"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Redare"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pauz�"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stop"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "�nregistrare"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Derulare �nainte"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Derulare �napoi"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Urm�tor"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Anterior"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "�nchidere"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Canal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Canal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Canal anterior"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volum+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volum-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "F�r� sunet"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Sunet"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program (EPG)"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Canale"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timer-e"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "�nregistr�ri"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Configura�ie"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Comenzi"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "FTA (necriptat)"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "criptat"
+
+#: menu.c:177
+msgid "auto"
+msgstr "automat"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Modificare canal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Nume"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Surs�"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frecven��"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "PID Video"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "PID Audio (1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "PID Audio (2)"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "PID AC3 (1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "PID AC3 (2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "PID Teletext"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA (Acces Condi�ional)"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarizare"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Rat� simboluri"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversiune"
+
+#: menu.c:274
+msgid "off"
+msgstr "inactiv"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "niciuna(ul)"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modula�ie"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "L�rgime de band�"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmisie"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Ierarhie"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Parametrii canalului nu sunt univoci!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Canale"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "�terge"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Modific�"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Marcheaz�"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Nou"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Canalul este utilizat de un timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "�terg canalul?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Modificare timer"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Activ"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Canal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Ziua"
+
+#: menu.c:665
+msgid "Start"
+msgstr "�nceput"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Sf�r�it"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioritate"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Timp de p�strare"
+
+#: menu.c:670
+msgid "File"
+msgstr "Fi�ier"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Prima zi"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timer-e"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Act./Inact."
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "�terg timer-ul?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timer-ul tocmai �nregistreaz� - �terg, totu�i?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Emisiune"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "�nregistr."
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Comut�"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Timer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Ce emisiuni urmeaz�?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Ce emisiuni sunt acum?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Urm�tor"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Acum"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Nu pot comuta canalul!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programul canalului %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Aceast� emisiune - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Aceast� emisiune - toate canalele"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Toate emisiunile - toate canalele"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "V� rog introduce�i %d cifre!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Detaliile �nregistr�rii"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Redare"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "�napoi"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "�nregistr�ri"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Deschide"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Comenzi"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Eroare la accesarea �nregistr�rii"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "�terg �nregistrarea?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Eroare la �tergerea �nregistr�rii!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Comenzi pentru �nregistr�ri"
+
+#: menu.c:2203
+msgid "never"
+msgstr "niciodat�"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "dep. de skin"
+
+#: menu.c:2205
+msgid "always"
+msgstr "�ntotdeauna"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Limba OSD"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Skin"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tem�"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "St�nga"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Sus"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "L��ime OSD"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "�n�l�ime OSD"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Timp afi�are mesaje (sec)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Utilizare fonturi mici"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Pozi�ia informa�iilor despre canal"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "jos"
+
+#: menu.c:2225
+msgid "top"
+msgstr "sus"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Durata afi��rii info-canal (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Informa�ii la comutarea canalului"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Durata afi��rii informa�ii canal"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Deruleaz� pagini"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Derulare circular�"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Tasta 'Meniu' �nchide"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Directoare �nregistr�ri"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "C�utare canale"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Interval achizi�ie EPG (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Nivel corec�ie EPG"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Date EPG expirate cel mult (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Potrive�te ceasul sistem"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Preia ora din transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Limbi preferate"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Limba preferat�"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nu"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "doar numele"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "Numai PID-uri"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "nume si PID-uri"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "ad�ugare canale noi"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "ad�ugare transpondere noi"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "Dispozitiv DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Dispozitiv DVB primar"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Format video"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Formatul red�rii video"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Sunet Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Actualizare canale"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Limbi sunet"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Limba sunetului"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Utilizare DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "Frecven�� comutare band�, SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Frecvn�� LNB inferioar� (Mhz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Frecvn�� LNB superioar� (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Meniu"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Resetare"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Deschid meniul CAM..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Nu pot deschide meniul CAM"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Nu pot reseta CAM"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "�nregistrare"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Marj� la pornire (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Marj� la oprire (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Limit� primar�"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Prioritate implicit�"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Timp de p�strare predefinit (zile)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioritate pauz�"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "P�strarea emisiunilor 'pauzate' (zile)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Utilizeaz� numele episodului"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Utilizeaz� VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Marj� de timp la utilizare VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Marcheaz� �nregistrare imediat�"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Nume �nregistrare imediat�"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Timpul de �nregistare imediat� (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Dimensiune maxim� a fi�ierului video (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Separare fi�iere montate"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Redare"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Mod multi-vitez�"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Afi�eaz� redarea"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "Identificator continuare"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Durat� minim� emisiuni (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Durata minim� de inactivitate (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "Timeout SVDRP (sec)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Interval zapping (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Canalul de pornire"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "ca mai �nainte"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Volumul la pornire"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Plugin-uri"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Acest plugin nu se configureaz�!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Configura�ie"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Repornire"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Sigur repornesc?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Opre�te �nregistrarea "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program (EPG)"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disc"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "liber"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Opre�te redarea"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Sunet"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pauz�"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Continuare"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stop"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Opre�te montajul �nregistr�rii"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Opresc �nregistrarea?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Opresc montajul �nregistr�rii?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Lipse�te sunetul!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Insuficient spa�iul pe disc pentru �nregistrare!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Trec �n pauz� emisiunea transmis�..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Salt la: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Nu pot porni montajul �nregistr�rii!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Montajul �nregistr�rii a �nceput"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Montajul �nregistr�rii este deja activ!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "da"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Insereaz�"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Suprascrie"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Plugin (modul adi�ional)"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Sus/Jos pentru noua loca�ie - OK pentru a muta"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Canal blocat (�nregistrare)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Spa�iul pe disc e foarte sc�zut!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Nu pot �nchide - vezi op�iunea '-s'"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Tocmai se �nregistreaz� - �nchid, totu�i?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "�nregistrez peste %ld minute - �nchid, totu�i?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "�nchid, totu�i?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Tocmai se �nregistreaz� - repornesc, totu�i?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "repornesc, totu�i?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volum "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "VDR clasic"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "Cons. ST:TNG"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "LMMJVSD"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "LunMarMieJoiVinS�mDum"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Luni"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Mar�i"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Miercuri"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Joi"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Vineri"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "S�mb�t�"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Duminic�"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "Urmeaz� o �nregistrare VPS!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "A �nceput �nregistrarea"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Apas� orice tast� pentru a anula �nchiderea"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Comut dispozitiv DVB primar..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Montajul �nregistr�rii a e�uat"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Montajul �nregistr�rii s-a terminat"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
new file mode 100644
index 000000000..47cbbace3
--- /dev/null
+++ b/po/ru_RU.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** ������������ ����� ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "����� ����������!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "���������� �������� ����� ��������!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "������� EPG-������������"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "��� ��������"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "�������"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "rus"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "��� 1: ����������� ���� ���� ������"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "������� ����� ������ �� ������"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "��������� ��� ������!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "�� ��������� ������..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "��� 2: ������� ����� ��������� ������"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "������� ������ '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "������� '�����' ����� �����������"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "������� '����' ����� ����������"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(������� '�����' ����� ���������)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(������� '����' ����� ��������� ��������� ������)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(������� '����' ����� ���������� ������)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "�������� ������"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "��� 3: ����������� ����� ������"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "������� '�����' ����� ���������, '����' ����� ����������"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "�����"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "����"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "����"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "�����"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "������"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "�������"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "�������"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "�������"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "������"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "�����"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "����"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "���������������"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "�����"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "����"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "������"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "��������� ������"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "��������� �����"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "������"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "�����"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "���������"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "����� +"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "����� -"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "���������� �����"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "��������� +"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "��������� -"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "��������� ����"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "����"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "�������"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "������"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "�������"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "������"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "���������"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "�������"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "FTA (��������������)"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "������������"
+
+#: menu.c:177
+msgid "auto"
+msgstr "����"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "�������������� ������"
+
+#: menu.c:254
+msgid "Name"
+msgstr "��������"
+
+#: menu.c:255
+msgid "Source"
+msgstr "��������"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "�������"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid (�����)"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1 (����� 1)"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2 (����� 2)"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1 (AC3 1)"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2 (AC3 2)"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid (���������)"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA (�������)"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "�����������"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "����. ��������"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "��������"
+
+#: menu.c:274
+msgid "off"
+msgstr "����"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "������"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "���������"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "��������"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "��������"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "������"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "��������"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "��������� ������ �� ���������!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "������"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "�������"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "�������������"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "�����������"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "��������"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "����� ����� ��������!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "������� �����?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "��������� �������"
+
+#: menu.c:662
+msgid "Active"
+msgstr "�����������"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "�����"
+
+#: menu.c:664
+msgid "Day"
+msgstr "����"
+
+#: menu.c:665
+msgid "Start"
+msgstr "������"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "�����"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS ��������"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "���������"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "���� ��������"
+
+#: menu.c:670
+msgid "File"
+msgstr "����"
+
+#: menu.c:686
+msgid "First day"
+msgstr "������ ����"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "�������"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "����"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "���/����"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "������� ������?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "���� ������ �� ������� - ������������� �������?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "��������"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "������"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "�����������"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "������"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "����� � ���������:"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "������ � �����:"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "�����"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "������"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "���������"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "���������� ����������� �����!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "��������� - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "��� �������� - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "��� �������� - ��� ������"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "��� �������� - ��� ������"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "������� %d �����"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr "CAM �� ��������"
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "���� � ������"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "�������������"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "�����"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "������"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "�������"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "�������"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "������ ������� � ������!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "������� ������?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "������ �������� ������!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "������� ������"
+
+#: menu.c:2203
+msgid "never"
+msgstr "�������"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "�������� �����"
+
+#: menu.c:2205
+msgid "always"
+msgstr "������"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "����"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "����"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "�����"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "����"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "������ �����"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "������ ������"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "������"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "������"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "������������ ������ ��������� (���)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "������������ ������ �����"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr "����������� �������"
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr "����������� ����"
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr "������ ����"
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr "������������� ����"
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr "������ ����� ��� ���� (pixel)"
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr "������ ������� ����� (pixel)"
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr "������ �������������� ����� (pixel)"
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "��������� ���� ���������� � ������"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "�����"
+
+#: menu.c:2225
+msgid "top"
+msgstr "������"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "����� ���������� � ������ (���)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "���������� ���������� � ������"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "���������� � ������ �������"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "��������� ������� ����"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "����������� ���������"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "������ ���� �������"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "�������� �������� �������"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "�������"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "�����������"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "�������� ������������ �������� (�)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "������� ��������� ������"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "�������� ���������� ������ (���)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "���������� ��������� �����"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "������������ ����� ������������"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "�������������� ����� (�������)"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "������"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "��������������"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "���������"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "�������� �����"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "���"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "������ ��������"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "������ PID�"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "�������� � PID�"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "����� ������"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "���. ������������"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "�������� DVB-����������"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "������ �����"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "�������������� �����������"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "�������� Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "��������� ��������� �������"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "�������������� ����� (����)"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "������"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "���������"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "������������ DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "������� ������������ (SLOF) (���)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "������ ������� ���������� (���)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "������� ������� ���������� (���)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr "CAM ����������"
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr "CAM ������������"
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr "CAM �����"
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "�������� ������"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "����"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "�����"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "�������� ���� ������ ��������� ������� (CAM)"
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "���� CAM-������ ����������!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr "CAM ������������ - ������������� �����������?"
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "������ ����������� CAM-������!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "������"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "���������� ������ ������ (���)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "������������ ��������� ������ (���)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "���. ��������� ������� ���. ����������"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "��������� ������� �� ���������"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "���� �������� ������ �� ��������� (�)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "��������� ����������� ���������"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "�������� ����������� ��������� (�)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "������������ ����� �� ��������"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "������������ ������� VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "�������� ����� VPS (���)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "�������� ��������� ������� ������"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "����� ���������� ������ �������"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "������������ ������ ������ (���)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "����. ������ ���������� (��)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "������ ����������������� �����"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "���������������"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "��������������� �����"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "���������� ����� ���������������"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID ���������������"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "������"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "���. ����� �������� ������� (���)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "���. ����� �������� ����� (���)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "�������� ������ ����. SVDRP (���)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "�������� ������������ ������ (���)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "������ ������� ��� ����� ������ (ms)"
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "����� ��� ���������"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "��� ������"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "��������� ��� ���������"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "������ ����������"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "������ �� ����� ���������� ���������!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "���������"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "�������������"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "������������� �������������?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " ���������� ������ "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "�������"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "����"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "��������"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " ���������� ���������������"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "����"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "�����"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "����������"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "����"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " �������� ������ ������"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "���������� ������?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "�������� ��������������?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "����������� ����!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "������������ ����� �� ����� ��� ������ ������"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "��� ���������� DVB-���������� ��� ������!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "����� ����������� ���������..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "�������: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "�� ������ ����� ��� �������!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "���������� ������ ������ ������!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "����� ������ ������"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "������� ������������ ��� �������!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "��"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "���/���"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "�������"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "������"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "������"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\""
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "����� ������������ (���� ������)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "������������ ����� �� �����!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "���������� ���������� - �� ����� �������� '-s'!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr "���� ������ - ������������� ���������?"
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "���� ������ - ������������� ���������?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "����� %ld ����� �������� ������ - ������������� ���������?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "������������� ���������?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Plugin %s ��������� ����� %ld ����� - ����������?"
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr "������� ������� - ������������� �������������?"
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "���� ������ - ������������� �������������?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "������������� �������������?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "��������� "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "������������"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG ������"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "���ǿ��"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "��ݲ�������ҿ����Ѳ��"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "�����������"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "�������"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "�����"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "�������"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "�������"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "�������"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "�����������"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS-������ ����� ��������"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "������ ������"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR ���������� ����� - ������� Power ��� ���������"
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "������� ����� ������ ����� �������� ����������."
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "����� ��������� DVB-����������..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "������ �� ����� ������� ������!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "������ �������"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr "������� ����� ������ ��� ������ ������������"
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR ���������� ����� %s �����"
diff --git a/po/sl_SI.po b/po/sl_SI.po
new file mode 100644
index 000000000..642f403da
--- /dev/null
+++ b/po/sl_SI.po
@@ -0,0 +1,1271 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Miha Setina <mihasetina@softhome.net>, 2000
+# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Neznan kanal ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanal ni razpolo�ljiv!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Ne morem za�eti s prenosnim na�inom!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "Pri�enjam EPG-scan"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "Brez naziva"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Slovenski"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "slv"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Faza 1: Sprejemanje IR kode"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Pritisnite tipko na upravljalcu"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "IR koda sprejeta!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Ne pritiskajte tipk..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Faza 2: U�enje posebnih kod"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Pritisnite tipko za '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Pritisnite tipko 'Gor' za potrditev"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Pritisnite tipko 'Dol' za nadaljevanje"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(pritisnite 'Gor' za nazaj)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(pritisnite 'Dol' za konec)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "pritisnite 'Meni' za preskok te tipke"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "U�enje kod upravljalca"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Faza 3: Shranjevanje kod tipk"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Gor' za potrditev, 'Dol' za prekinitev"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Gor"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Dol"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Meni"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Nazaj"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Levo"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Desno"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "Rde�a"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Zelena"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Rumena"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Modra"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Predvajaj"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pavza"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Ustavi"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Snemaj"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Hitro naprej"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Hitro nazaj"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Naprej"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Nazaj"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Izklop"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Program+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Program-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "Prej�nji kanal"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Glasnost+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Glasnost-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Izklop zvoka"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Zvok"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanali"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Termini"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Posnetki"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Nastavitve"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Ukazi"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "nekodiran"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "kodiran"
+
+#: menu.c:177
+msgid "auto"
+msgstr "avtomatsko"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Uredi kanal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Ime"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Pozicija"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvenca"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarizacija"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inverzija"
+
+#: menu.c:274
+msgid "off"
+msgstr "izklop"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "nobeden"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulacija"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Pasovna �irina"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Prenos"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Za��ita"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarhija"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Nastavitve kanala niso edinstvene!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanali"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Izbri�i"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "Uredi"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "Ozna�i"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Novo"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanal je zavzet s terminom za snemanje!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Izbri�i kanal?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Uredi termin"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktivno"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Program"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dan"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Za�etek"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Konec"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Veljavnost"
+
+#: menu.c:670
+msgid "File"
+msgstr "Datoteka"
+
+#: menu.c:686
+msgid "First day"
+msgstr "Prvi dan"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Termini"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "Vklop/Izklop"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Izbri�i termin?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Snemanje po terminu - zares izbri�i?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Oddaja"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Posnemi"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Preklopi"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Termini"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Kaj sledi?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Kaj je na sporedu?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Sledi"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Sedaj"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Ne morem preklopiti kanala!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Ta oddaja - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Ta oddaja - vsi kanali"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Vse oddaje - vsi kanali"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Prosim vnesite %d �tevilk!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Podatki o snemanju"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Predvajaj"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Na za�etek"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Posnetki"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "Odpri"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Ukazi"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Napaka pri dostopu do posnetka!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Izbri�i posnetek?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Napaka pri brisanju posnetka!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Ukazi za snemanje"
+
+#: menu.c:2203
+msgid "never"
+msgstr "nikoli"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "odvisno od preobleke"
+
+#: menu.c:2205
+msgid "always"
+msgstr "vedno"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Jezik"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Preobleka"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Levo"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "Zgoraj"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "�irina"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Vi�ina"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "�as prikaza sporo�ila (s)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Uporabi male �rke"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Pozicija informacije o kanalu"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "spodaj"
+
+#: menu.c:2225
+msgid "top"
+msgstr "zgoraj"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "�as prikaza podatka o kanalu (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Poka�i naziv kanala"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "�as prikaza informacije o kanalu"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Drsni meni"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Iz konca sko�i na za�etek"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Meni gumb zapre meni"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Direktoriji za posnetke"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "Programski vodnik"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "I��i"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "�as do EPG pregleda (h)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Nivo za popravilo EPG napak"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Prika�i stare EPG podatke (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Nastavi sistemski �as"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Transponder za nastavitev �asa"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Prednostni jeziki"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Prednostni jezik"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "ne"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "samo imena"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "samo PIDe"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "imena in PIDe"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "dodaj nove programe"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "dodaj nove oddajnike"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Primarna naprava"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Video format"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Format video prikaza"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Uporabljaj Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Posodobi kanale"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Jeziki za zvok"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Jezik za zvok"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Uporabi DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "Frekvenca preklopa (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Spodnja LNB-frek. (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Zgornja LNB-frek. (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Meni"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "Reset"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "Odpiram CAM meni..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Ne morem odpreti CAM menija!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Ne morem resetirati CAM-a!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Snemanje"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Premik za�etka snemanja (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Zamik konca snemanja (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Primarna meja"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Privzeta prioriteta"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Privzeti �ivljenski �as (d)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioriteta pavze"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "�as pavze (d)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Uporabi ime epizode"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Uporabi VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "�asovna rezerva pri VPS (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Ozna�i direktno snemanje"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Ime za direktno snemanje"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "�as direktnega snemanja (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Najve�ja velikost datoteke (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Razdeli urejene datoteke"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Predvajanje"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Re�im z ve� hitrostmi"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Prika�i re�im predvajanja"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "ID za predvajanje"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Ostalo"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Najmanj�i �as dogodka (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Najmanj�i �as neaktivnosti (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP �as neaktivnosti (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "�as ugla�evanja (s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Privzeti kanal"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "kot prej"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Privzeta glasnost"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Vstavki"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Ta vstavek nima nastavitvenih parametrov!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Nastavitve"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Ponoven zagon"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Zares ponoven zagon?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Prekini snemanje "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "prosto"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Prekini predvajanje"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Zvok"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pavza"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Nadaljuj"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Ustavi"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Prekini urejanje"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Prekini snemanje?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "�elite prekiniti urejanje?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Zvok ni dosegljiv!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Premalo prostora na disku za snemanje!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Ni proste DVB naprave za snemanje!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Ustavljanje predvajanja v �ivo..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Sko�i: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Nobena prekinitvena to�ka ni definirana!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Ne morem za�eti urejanja!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Urejanje se je za�elo"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Urejanje je �e aktivno!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "da"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Vstavi"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Prepi�i"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Vstavek"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Gor/Dol za novo poz. - Ok za premik"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Zaklenjen kanal (snemanje)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Premalo prostora na disku!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Snemanje - zares izklopi?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Snemanje �ez %ld minut, zares izklopi?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "zares izklopi?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Snemanje - zares ponoven zagon?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "zares ponoven zagon?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Glasnost "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klasi�ni VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Konsola"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "PTSCPSN"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "PonTorSreCetPetSobNed"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "ponedeljek"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Torek"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "sreda"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "�etrtek"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Petek"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Sobota"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Nedelja"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "Sledi VPS snemanje!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Snemanje se je pri�elo"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Pritisnite katerikoli gumb za preklic izklopa"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Preklapljanje primarne DVB naprave..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Napaka pri procesu urejanja!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Proces urejanja je kon�an"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
new file mode 100644
index 000000000..82b13735e
--- /dev/null
+++ b/po/sv_SE.po
@@ -0,0 +1,1271 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Tomas Prybil <tomas@prybil.se>, 2002
+# Jan Ekholm <chakie@infa.abo.fi>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Felaktig kanal ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanalen �r inte tillg�nglig!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Kan inte starta Transfer Mode!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "P�b�rjar EPG skanning"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "ingen titel"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "Svenska"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "sve"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Steg1: identifiering av kod"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Tryck valfri tangent p� fj�rrkontrollen"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Koden detekterad!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Tryck inte p� n�gon knapp..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Fas 2: Inl�rning av specifika knapp-koder"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Tryck p� knappen f�r '%s'"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Tryck 'Upp' f�r att bekr�fta"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Tryck 'Ner' f�r att bekr�fta"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Tryck 'Upp' f�r att backa)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Tryck 'Ner' f�r att avsluta inl�rningen)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(Tryck 'Meny' f�r att hoppa �ver knappen.)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Inl�rning av fj�rrkontrollsknappar"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Fas 3: Spara knappkoder"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta."
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Upp"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "Ner"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Meny"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Ok"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Tillbaka"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "V�nster"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "H�ger"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "R�d"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Gr�n"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Gul"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Bl�"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Info"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "Spela upp"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Pausa"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Stoppa"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Spela in"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "Snabbspolning fram�t"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Snabbspolning bak�t"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "N�sta"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "Bak�t"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "P�/Av"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "F�rra kanalen"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Volym+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Volym-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Ljud Av"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Ljud"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanaler"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Timers"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Inspelningar"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Inst�llningar"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Kommandon"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "Okodad"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "krypterad"
+
+#: menu.c:177
+msgid "auto"
+msgstr "automatisk"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "�ndra kanal"
+
+#: menu.c:254
+msgid "Name"
+msgstr "Namn"
+
+#: menu.c:255
+msgid "Source"
+msgstr "K�lla"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekvens"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "VPID"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "APID1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "APID2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "DPID1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "DPID2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "TPID"
+
+#: menu.c:264
+msgid "CA"
+msgstr "Kortl�sare"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Polarisation"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "Inversion"
+
+#: menu.c:274
+msgid "off"
+msgstr "av"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "ingen"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Modulation"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bandbredd"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "Transmission"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Guard"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanalinst�llningarna �r ej unika!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanaler"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Ta bort"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "�ndra"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "M�rk"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Ny"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanalen anv�nds av en timer!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Ta bort kanalen?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "�ndra timer"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktiv"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "Dag"
+
+#: menu.c:665
+msgid "Start"
+msgstr "B�rjar"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Slutar"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "Prioritet"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "Livstid"
+
+#: menu.c:670
+msgid "File"
+msgstr "Filnamn"
+
+#: menu.c:686
+msgid "First day"
+msgstr "F�rsta dag"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Timers"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Info"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "P�/Av"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Ta bort timern?"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Timerstyrd inspelning p�g�r - Avbryta �nd�?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "S�ndning"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Inspelning"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "Byt"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Timer"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Vilket �r n�sta program?"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "Vad s�nds nu?"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "N�sta"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "Nu"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Om�jligt att byta kanal!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Den h�r s�ndningen - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Den h�r s�ndningen - alla kanaler"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "Alla tillf�llen - alla kanaler"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Mata in %d siffror!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Inspelning"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "Spela upp"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "�terspolning"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Inspelningar"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "�ppna"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Kommandon"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Inspelningen g�r inte att l�sa!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Ta bort inspelningen?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Inspelningen g�r inte att ta bort!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Inspelningskommandon"
+
+#: menu.c:2203
+msgid "never"
+msgstr "aldrig"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "skin beroende"
+
+#: menu.c:2205
+msgid "always"
+msgstr "alltid"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Spr�k"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Skin"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "V�nster"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "�vre"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Bredd"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "H�jd"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Tid f�r meddelanden (sek)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "Anv�nd liten font"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Placering av kanalinformation"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "undre"
+
+#: menu.c:2225
+msgid "top"
+msgstr "�vre"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Kanal information (s)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Information vid kanalbyte"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Timeout f�r kanalinformation"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Bl�ddra sidor"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Rulla texten"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Menyknappen st�nger"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Kataloger f�r inspelningar"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Skanna"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "EPG s�kning timeout"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Niv� f�r EPG bugfix"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Visa gammal information (min)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "St�ll in systemtid"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Anv�nd klockan fr�n transponder"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "�nskade spr�k"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "�nskat spr�k"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "nej"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "bara namn"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "bara PIDs"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "namn och PID"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "l�gg till nya kanaler"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "l�gg till nya transponders"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Prim�r DVB enhet"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Video format"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Format f�r video display"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Anv�nd Dolby Digital"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Uppdatera kanaler"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Antal ljudspr�k"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Ljudspr�k"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Anv�nd DiSEqC"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Undre LNB frekvens (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "�vre LNB frekvens (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Meny"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "�terst�ll"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "�ppnar CAM menyn..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "Det g�r inte att �ppna CAM menyn!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "Kan inte �terst�lla CAM!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Inspelning"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Marginal f�r start (min)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Marginal f�r stopp (min)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Prim�r gr�ns"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Normal prioritet"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Normal livstid (dagar)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioritet f�r direktinspelning"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Livstid f�r direktinspelning (dagar)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Anv�nd episodnamn"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "Anv�nd VPS"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS marginal (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "M�rk direktinspelning"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Namnge direktinspelning"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Direktinspelning l�ngd (min)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maximal filstorlek f�r inspelning (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "Dela upp redigerade filer"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Uppspelning"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Multispeed mode"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "Visa uppspelningsl�ge"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "�teruppta ID"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Minsta h�ndelse-pause (min)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Minsta anv�ndar-inaktivitet (min)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP Timeout (s)"
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Zap timeout(s)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kanal vid uppstart"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "som f�rut"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Ljudstyrka vid uppstart"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Moduler"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Den h�r modulen har inga parametrar"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Inst�llningar"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Omstart"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Vill du verkligen starta om?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " Avsluta inspelning "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "ledigt"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " Avsluta uppspelning"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Ljud"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Pausa"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "Forts�tt"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Stopp"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Avbryt redigering"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Stanna inspelning?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Avbryta redigeringen?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Ljud saknas!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Otillr�cklingt diskutrymme f�r inspelning!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Det finns ingen ledig DVB enhet f�r inspelning!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Pausar direktinspelningen"
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Hopp: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Det finns inga redigeringsm�rken"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Kan inte starta redigering!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Redigeringen startar"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Redigeringen �r redan aktiv!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "ja"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Infoga"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "Skriv �ver"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Modul"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "Upp/Ner f�r nya platsen - d�refter OK f�r att flytta"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanalen �r l�st (inspelning p�g�r)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "L�gt diskutrymme!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Kan inte avsluta, m�ste anv�nda parameter '-s'"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Inspelning p�g�r, vill du �nd� avbryta?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Inspelning startar om %ld minuter, vill du avsluta?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "vill du �nd� avbryta?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Inspelning p�g�r, vill du �nd� starta om?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "vill du �nd� starta om?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Volym "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klassisk VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG konsol"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "MTOTFLS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "M�nTisOnsTorFreL�rS�n"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "M�ndag"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Tisdag"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Fredag"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "L�rdag"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "S�ndag"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "strax VPS inspelning..."
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Inspelningen har startat"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Tryck valfri knapp f�r att �terkalla avst�ngningen"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Byter prim�r DVB enhet..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Redigeringsprocessen misslyckades"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Redigering avslutad"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
new file mode 100644
index 000000000..4a220baa9
--- /dev/null
+++ b/po/tr_TR.po
@@ -0,0 +1,1270 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Oktay Yolge�en <oktay_73@yahoo.de>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: channels.c:1077 menu.c:707
+msgid "*** Invalid Channel ***"
+msgstr "*** Ge�ersiz kanal ***"
+
+#: device.c:634 device.c:670
+msgid "Channel not available!"
+msgstr "Kanal kullan�lam�yor!"
+
+#: device.c:636
+msgid "Can't start Transfer Mode!"
+msgstr "Transfer mode ba�lat�lam�yor!"
+
+#: eitscan.c:159
+msgid "Starting EPG scan"
+msgstr "EPG tarama ba�l�yor"
+
+#: epg.c:346 epg.c:441
+msgid "No title"
+msgstr "�sim yok"
+
+#. TRANSLATORS: The name of the language, as written natively
+#: i18n.c:29
+msgid "LanguageName$English"
+msgstr "T�rk�e"
+
+#. TRANSLATORS: The 3-letter code of the language
+#: i18n.c:31
+msgid "LanguageCode$eng"
+msgstr "tur"
+
+#: interface.c:75
+msgid "Phase 1: Detecting RC code type"
+msgstr "Faz 1: Kumandan�n kodu aran�yor"
+
+#: interface.c:76
+msgid "Press any key on the RC unit"
+msgstr "Kumandada herhangi bir tu�a bas"
+
+#: interface.c:79
+msgid "RC code detected!"
+msgstr "Kumandan�n kodu bulundu!"
+
+#: interface.c:80
+msgid "Do not press any key..."
+msgstr "Tu�lara basmay�n�z..."
+
+#: interface.c:86
+msgid "Phase 2: Learning specific key codes"
+msgstr "Faz 2: Belirli tu� kodu e�itiliyor"
+
+#: interface.c:90
+#, c-format
+msgid "Press key for '%s'"
+msgstr "'%s' i�in tu� se�iniz"
+
+#: interface.c:106
+msgid "Press 'Up' to confirm"
+msgstr "Onaylamak i�in 'Yukar�' bas"
+
+#: interface.c:107
+msgid "Press 'Down' to continue"
+msgstr "Devam etmek i�in 'A�a��' bas"
+
+#: interface.c:138
+msgid "(press 'Up' to go back)"
+msgstr "(Geri d�nmek i�in 'Yukar�' bas)"
+
+#: interface.c:142
+msgid "(press 'Down' to end key definition)"
+msgstr "(Sona erdirmek i�in 'A�a��' bas)"
+
+#: interface.c:146
+msgid "(press 'Menu' to skip this key)"
+msgstr "(Tu�u atlamak i�in 'Men�' bas)"
+
+#: interface.c:167
+msgid "Learning Remote Control Keys"
+msgstr "Uzaktan kumandan�n tu�lar� e�itiliyor"
+
+#: interface.c:180
+msgid "Phase 3: Saving key codes"
+msgstr "Faz 3: Tu� ayarlar�n� kesinle�tir"
+
+#: interface.c:181
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Kesinle�tirmek i�in 'Yukar�', Iptal etmek i�in 'A�a��' bas"
+
+#: keys.c:14
+msgid "Key$Up"
+msgstr "Yukar�"
+
+#: keys.c:15
+msgid "Key$Down"
+msgstr "A�a��"
+
+#: keys.c:16
+msgid "Key$Menu"
+msgstr "Men�"
+
+#: keys.c:17
+msgid "Key$Ok"
+msgstr "Tamam"
+
+#: keys.c:18
+msgid "Key$Back"
+msgstr "Geri"
+
+#: keys.c:19
+msgid "Key$Left"
+msgstr "Sol"
+
+#: keys.c:20
+msgid "Key$Right"
+msgstr "Sa�"
+
+#: keys.c:21
+msgid "Key$Red"
+msgstr "K�rm�z�"
+
+#: keys.c:22
+msgid "Key$Green"
+msgstr "Ye�il"
+
+#: keys.c:23
+msgid "Key$Yellow"
+msgstr "Sar�"
+
+#: keys.c:24
+msgid "Key$Blue"
+msgstr "Mavi"
+
+#: keys.c:35
+msgid "Key$Info"
+msgstr "Bilgi"
+
+#: keys.c:36
+msgid "Key$Play"
+msgstr "G�ster"
+
+#: keys.c:37
+msgid "Key$Pause"
+msgstr "Durakla"
+
+#: keys.c:38
+msgid "Key$Stop"
+msgstr "Durdur"
+
+#: keys.c:39
+msgid "Key$Record"
+msgstr "Kay�t et"
+
+#: keys.c:40
+msgid "Key$FastFwd"
+msgstr "�leri sar"
+
+#: keys.c:41
+msgid "Key$FastRew"
+msgstr "Geri sar"
+
+#: keys.c:42
+msgid "Key$Next"
+msgstr "Sonraki"
+
+#: keys.c:43
+msgid "Key$Prev"
+msgstr "�nceki"
+
+#: keys.c:44
+msgid "Key$Power"
+msgstr "Kapat"
+
+#: keys.c:45
+msgid "Key$Channel+"
+msgstr "Kanal+"
+
+#: keys.c:46
+msgid "Key$Channel-"
+msgstr "Kanal-"
+
+#: keys.c:47
+msgid "Key$PrevChannel"
+msgstr "�nceki kanal"
+
+#: keys.c:48
+msgid "Key$Volume+"
+msgstr "Ses+"
+
+#: keys.c:49
+msgid "Key$Volume-"
+msgstr "Ses-"
+
+#: keys.c:50 skinclassic.c:549
+msgid "Key$Mute"
+msgstr "Sessiz"
+
+#: keys.c:51
+msgid "Key$Audio"
+msgstr "Audio"
+
+#: keys.c:52
+msgid "Key$Schedule"
+msgstr "Program"
+
+#: keys.c:53
+msgid "Key$Channels"
+msgstr "Kanallar"
+
+#: keys.c:54
+msgid "Key$Timers"
+msgstr "Zamanlay�c�"
+
+#: keys.c:55
+msgid "Key$Recordings"
+msgstr "Kay�tlar"
+
+#: keys.c:56
+msgid "Key$Setup"
+msgstr "Ayarlar"
+
+#: keys.c:57
+msgid "Key$Commands"
+msgstr "Komutlar"
+
+#: keys.c:58
+msgid "Key$User1"
+msgstr ""
+
+#: keys.c:59
+msgid "Key$User2"
+msgstr ""
+
+#: keys.c:60
+msgid "Key$User3"
+msgstr ""
+
+#: keys.c:61
+msgid "Key$User4"
+msgstr ""
+
+#: keys.c:62
+msgid "Key$User5"
+msgstr ""
+
+#: keys.c:63
+msgid "Key$User6"
+msgstr ""
+
+#: keys.c:64
+msgid "Key$User7"
+msgstr ""
+
+#: keys.c:65
+msgid "Key$User8"
+msgstr ""
+
+#: keys.c:66
+msgid "Key$User9"
+msgstr ""
+
+#: menu.c:69
+msgid "Free To Air"
+msgstr "�ifresiz"
+
+#: menu.c:71
+msgid "encrypted"
+msgstr "�ifreli"
+
+#: menu.c:177
+msgid "auto"
+msgstr "otomatik"
+
+#: menu.c:229
+msgid "Edit channel"
+msgstr "Kanal ayarlar�n� de�i�tir"
+
+#: menu.c:254
+msgid "Name"
+msgstr "�sim"
+
+#: menu.c:255
+msgid "Source"
+msgstr "Kaynak"
+
+#: menu.c:256
+msgid "Frequency"
+msgstr "Frekans"
+
+#: menu.c:257
+msgid "Vpid"
+msgstr "Vpid"
+
+#: menu.c:258
+msgid "Ppid"
+msgstr "Ppid"
+
+#: menu.c:259
+msgid "Apid1"
+msgstr "Apid1"
+
+#: menu.c:260
+msgid "Apid2"
+msgstr "Apid2"
+
+#: menu.c:261
+msgid "Dpid1"
+msgstr "Dpid1"
+
+#: menu.c:262
+msgid "Dpid2"
+msgstr "Dpid2"
+
+#: menu.c:263
+msgid "Tpid"
+msgstr "Tpid"
+
+#: menu.c:264
+msgid "CA"
+msgstr "CA"
+
+#: menu.c:265
+msgid "Sid"
+msgstr "Sid"
+
+#: menu.c:272
+msgid "Polarization"
+msgstr "Kutupla�ma"
+
+#: menu.c:273
+msgid "Srate"
+msgstr "Srate"
+
+#: menu.c:274
+msgid "Inversion"
+msgstr "�nversiyon"
+
+#: menu.c:274
+msgid "off"
+msgstr "kapal�"
+
+#: menu.c:275
+msgid "CoderateH"
+msgstr "CoderateH"
+
+#: menu.c:275 menu.c:276 menu.c:281
+msgid "none"
+msgstr "hi�"
+
+#: menu.c:276
+msgid "CoderateL"
+msgstr "CoderateL"
+
+#: menu.c:277
+msgid "Modulation"
+msgstr "Mod�lasyon"
+
+#: menu.c:278
+msgid "Bandwidth"
+msgstr "Bant geni�li�i"
+
+#: menu.c:279
+msgid "Transmission"
+msgstr "�letim"
+
+#: menu.c:280
+msgid "Guard"
+msgstr "Koruma"
+
+#: menu.c:281
+msgid "Hierarchy"
+msgstr "Hiyerar�i"
+
+#: menu.c:312
+msgid "Channel settings are not unique!"
+msgstr "Kanal ayarlar� belli de��l!"
+
+#: menu.c:402 menu.c:2923
+msgid "Channels"
+msgstr "Kanallar"
+
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+msgid "Button$Delete"
+msgstr "Sil"
+
+#: menu.c:432
+msgid "Button$Edit"
+msgstr "De�i�tir"
+
+#: menu.c:432
+msgid "Button$Mark"
+msgstr "��aretle"
+
+#: menu.c:432 menu.c:847
+msgid "Button$New"
+msgstr "Yeni"
+
+#: menu.c:512
+msgid "Channel is being used by a timer!"
+msgstr "Kanal zamanlay�c�dan kullan�l�yor!"
+
+#: menu.c:515
+msgid "Delete channel?"
+msgstr "Kanal� sil?"
+
+#: menu.c:652
+msgid "Edit timer"
+msgstr "Zamanlay�c�y� ayarla"
+
+#: menu.c:662
+msgid "Active"
+msgstr "Aktif"
+
+#: menu.c:663
+msgid "Channel"
+msgstr "Kanal"
+
+#: menu.c:664
+msgid "Day"
+msgstr "G�n"
+
+#: menu.c:665
+msgid "Start"
+msgstr "Ba�lang��"
+
+#: menu.c:666
+msgid "Stop"
+msgstr "Biti�"
+
+#: menu.c:667
+msgid "VPS"
+msgstr "VPS"
+
+#: menu.c:668
+msgid "Priority"
+msgstr "�ncelik"
+
+#: menu.c:669
+msgid "Lifetime"
+msgstr "�mr�"
+
+#: menu.c:670
+msgid "File"
+msgstr "K�t�k"
+
+#: menu.c:686
+msgid "First day"
+msgstr "�lk g�n"
+
+#: menu.c:811 menu.c:2924
+msgid "Timers"
+msgstr "Zamanlay�c�"
+
+#: menu.c:847 menu.c:1920
+msgid "Button$Info"
+msgstr "Bilgi"
+
+#: menu.c:847
+msgid "Button$On/Off"
+msgstr "A�/Kapat"
+
+#: menu.c:890
+msgid "Delete timer?"
+msgstr "Zamanlay�c�y� sil"
+
+#: menu.c:892 menu.c:2031
+msgid "Timer still recording - really delete?"
+msgstr "Zamanlay�c� kay�t ediyor - buna ra�men sil?"
+
+#: menu.c:948
+msgid "Event"
+msgstr "Yay�n"
+
+#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Record"
+msgstr "Kay�t et"
+
+#: menu.c:958 menu.c:1138 menu.c:1501
+msgid "Button$Switch"
+msgstr "De�i�tir"
+
+#: menu.c:958 menu.c:1137 menu.c:1380
+msgid "Button$Timer"
+msgstr "Zamanlay�c�"
+
+#: menu.c:1093
+msgid "What's on next?"
+msgstr "Gelecek yay�nlar"
+
+#: menu.c:1093
+msgid "What's on now?"
+msgstr "�imdiki yay�nlar"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Next"
+msgstr "Sonra"
+
+#: menu.c:1138 menu.c:1381 menu.c:1501
+msgid "Button$Now"
+msgstr "�imdi"
+
+#: menu.c:1138
+msgid "Button$Schedule"
+msgstr "Program"
+
+#: menu.c:1158 menu.c:1450
+msgid "Can't switch channel!"
+msgstr "Kanala de�i�tirelemiyor!"
+
+#: menu.c:1283
+#, c-format
+msgid "Schedule - %s"
+msgstr "Program - %s"
+
+#: menu.c:1304
+#, c-format
+msgid "This event - %s"
+msgstr "Bu yay�n - %s"
+
+#: menu.c:1323
+msgid "This event - all channels"
+msgstr "Bu yay�n - t�m kanallar"
+
+#: menu.c:1342
+msgid "All events - all channels"
+msgstr "T�m yay�nlar - t�m kanallar"
+
+#: menu.c:1712
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "L�tfen %d rakam veriniz!"
+
+#: menu.c:1754
+msgid "CAM not responding!"
+msgstr ""
+
+#: menu.c:1784
+msgid "Recording info"
+msgstr "Kay�t bilgisi"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Play"
+msgstr "G�ster"
+
+#: menu.c:1789 menu.c:1920
+msgid "Button$Rewind"
+msgstr "Baslang��"
+
+#: menu.c:1879 menu.c:2925
+msgid "Recordings"
+msgstr "Kay�tlar"
+
+#: menu.c:1918
+msgid "Button$Open"
+msgstr "A�"
+
+#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
+msgid "Commands"
+msgstr "Komutlar"
+
+#: menu.c:1970
+msgid "Error while accessing recording!"
+msgstr "Kay�t okuma hatas�!"
+
+#: menu.c:2028
+msgid "Delete recording?"
+msgstr "Kay�t� sil?"
+
+#: menu.c:2058
+msgid "Error while deleting recording!"
+msgstr "Kay�t silme hatas�!"
+
+#: menu.c:2089
+msgid "Recording commands"
+msgstr "Kay�t komutlar�"
+
+#: menu.c:2203
+msgid "never"
+msgstr "hi�"
+
+#: menu.c:2204
+msgid "skin dependent"
+msgstr "y�zeye ba�imli"
+
+#: menu.c:2205
+msgid "always"
+msgstr "hep"
+
+#: menu.c:2207 menu.c:2811
+msgid "OSD"
+msgstr "OSD"
+
+#: menu.c:2208
+msgid "Setup.OSD$Language"
+msgstr "Dil"
+
+#: menu.c:2209
+msgid "Setup.OSD$Skin"
+msgstr "Y�zey"
+
+#: menu.c:2211
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#: menu.c:2212
+msgid "Setup.OSD$Left"
+msgstr "Sol"
+
+#: menu.c:2213
+msgid "Setup.OSD$Top"
+msgstr "�st"
+
+#: menu.c:2214
+msgid "Setup.OSD$Width"
+msgstr "Geni�lik"
+
+#: menu.c:2215
+msgid "Setup.OSD$Height"
+msgstr "Y�kseklik"
+
+#: menu.c:2216
+msgid "Setup.OSD$Message time (s)"
+msgstr "Mesaj g�sterme zaman� (sn)"
+
+#: menu.c:2217
+msgid "Setup.OSD$Use small font"
+msgstr "K���k harf kullan"
+
+#: menu.c:2218
+msgid "Setup.OSD$Anti-alias"
+msgstr ""
+
+#: menu.c:2219
+msgid "Setup.OSD$Default font"
+msgstr ""
+
+#: menu.c:2220
+msgid "Setup.OSD$Small font"
+msgstr ""
+
+#: menu.c:2221
+msgid "Setup.OSD$Fixed font"
+msgstr ""
+
+#: menu.c:2222
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr ""
+
+#: menu.c:2223
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr ""
+
+#: menu.c:2224
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr ""
+
+#: menu.c:2225
+msgid "Setup.OSD$Channel info position"
+msgstr "Kanal bilgi pozisyonu"
+
+#: menu.c:2225
+msgid "bottom"
+msgstr "alt"
+
+#: menu.c:2225
+msgid "top"
+msgstr "�st"
+
+#: menu.c:2226
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Kanal bilgi g�sterme zaman� (sn)"
+
+#: menu.c:2227
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Kanal de�i�tirme bilgisi"
+
+#: menu.c:2228
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Kanal bilginin zaman a��m�"
+
+#: menu.c:2229
+msgid "Setup.OSD$Scroll pages"
+msgstr "Sayfa kayd�rma"
+
+#: menu.c:2230
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Sar�m kayd�rma"
+
+#: menu.c:2231
+msgid "Setup.OSD$Menu key closes"
+msgstr "Men� d��mesi kapat�yor"
+
+#: menu.c:2232
+msgid "Setup.OSD$Recording directories"
+msgstr "Kay�t dizinleri"
+
+#: menu.c:2323 menu.c:2812
+msgid "EPG"
+msgstr "EPG"
+
+#: menu.c:2324
+msgid "Button$Scan"
+msgstr "Tara"
+
+#: menu.c:2334
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "EPG tarama zaman a��m� (sa)"
+
+#: menu.c:2335
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG hata ��z�mleme �l��s�"
+
+#: menu.c:2336
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Eski EPG g�ster (dak)"
+
+#: menu.c:2337
+msgid "Setup.EPG$Set system time"
+msgstr "Bilgisayar saatini ayarla"
+
+#: menu.c:2339
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Bilgisayar saati i�in uydu al�c�-verici"
+
+#. TRANSLATORS: note the plural!
+#: menu.c:2341
+msgid "Setup.EPG$Preferred languages"
+msgstr "Dil tercihleri"
+
+#. TRANSLATORS: note the singular!
+#: menu.c:2344
+msgid "Setup.EPG$Preferred language"
+msgstr "Dil tercihi"
+
+#: menu.c:2416
+msgid "pan&scan"
+msgstr "pan&scan"
+
+#: menu.c:2417
+msgid "letterbox"
+msgstr "letterbox"
+
+#: menu.c:2418
+msgid "center cut out"
+msgstr "center cut out"
+
+#: menu.c:2419 menuitems.c:121
+msgid "no"
+msgstr "hay�r"
+
+#: menu.c:2420
+msgid "names only"
+msgstr "s�rf isimler"
+
+#: menu.c:2421
+msgid "PIDs only"
+msgstr "s�rf PID'ler"
+
+#: menu.c:2422
+msgid "names and PIDs"
+msgstr "�simler ve PID'ler"
+
+#: menu.c:2423
+msgid "add new channels"
+msgstr "yeni kanallar ekle"
+
+#: menu.c:2424
+msgid "add new transponders"
+msgstr "yeni uydu al�c�-verici ekle"
+
+#: menu.c:2426 menu.c:2813
+msgid "DVB"
+msgstr "DVB"
+
+#: menu.c:2436
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Primer DVB aray�z�"
+
+#: menu.c:2437
+msgid "Setup.DVB$Video format"
+msgstr "Video format�"
+
+#: menu.c:2439
+msgid "Setup.DVB$Video display format"
+msgstr "Video g�r�nt� bi�imi"
+
+#: menu.c:2440
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Dolby Dijital ses kullan"
+
+#: menu.c:2441
+msgid "Setup.DVB$Update channels"
+msgstr "Kanallar� yenile"
+
+#: menu.c:2442
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio dilleri"
+
+#: menu.c:2444
+msgid "Setup.DVB$Audio language"
+msgstr "Audio dili"
+
+#: menu.c:2505 menu.c:2814
+msgid "LNB"
+msgstr "LNB"
+
+#: menu.c:2515
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "DiSEqC kullan"
+
+#: menu.c:2517
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+#: menu.c:2518
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Alt LNB frekans� (MHz)"
+
+#: menu.c:2519
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "�st LNB frekans� (MHz)"
+
+#: menu.c:2560
+msgid "CAM reset"
+msgstr ""
+
+#: menu.c:2561
+msgid "CAM present"
+msgstr ""
+
+#: menu.c:2562
+msgid "CAM ready"
+msgstr ""
+
+#: menu.c:2585 menu.c:2815
+msgid "CAM"
+msgstr "CAM"
+
+#: menu.c:2590
+msgid "Button$Menu"
+msgstr "Men�"
+
+#: menu.c:2590
+msgid "Button$Reset"
+msgstr "S�f�rla"
+
+#: menu.c:2598
+msgid "Opening CAM menu..."
+msgstr "CAM men�s� a��l�yor..."
+
+#: menu.c:2615
+msgid "Can't open CAM menu!"
+msgstr "CAM men�s� a��lam�yor!"
+
+#: menu.c:2624
+msgid "CAM is in use - really reset?"
+msgstr ""
+
+#: menu.c:2626
+msgid "Can't reset CAM!"
+msgstr "CAM s�f�rlanamad�!"
+
+#: menu.c:2660 menu.c:2816
+msgid "Recording"
+msgstr "Kay�t"
+
+#: menu.c:2661
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Ba��nda tolerans (dak)"
+
+#: menu.c:2662
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Sonunda tolerans (dak)"
+
+#: menu.c:2663
+msgid "Setup.Recording$Primary limit"
+msgstr "Primer limit"
+
+#: menu.c:2664
+msgid "Setup.Recording$Default priority"
+msgstr "Ola�an priorite"
+
+#: menu.c:2665
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Ola�an �ekim �mr� (g�n)"
+
+#: menu.c:2666
+msgid "Setup.Recording$Pause priority"
+msgstr "Ola�an duraklama prioritesi"
+
+#: menu.c:2667
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Duraklama �mr� (g�n)"
+
+#: menu.c:2668
+msgid "Setup.Recording$Use episode name"
+msgstr "Episod ismini kullan"
+
+#: menu.c:2669
+msgid "Setup.Recording$Use VPS"
+msgstr "VPS kullan"
+
+#: menu.c:2670
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS tolerans (s)"
+
+#: menu.c:2671
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Derhal �ekimi i�aretle"
+
+#: menu.c:2672
+msgid "Setup.Recording$Name instant recording"
+msgstr "Derhal �ekimi isimlendir"
+
+#: menu.c:2673
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Derhal �ekim s�resi (dak)"
+
+#: menu.c:2674
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maksimum Video k�t�k b�y�kl�g� (MB)"
+
+#: menu.c:2675
+msgid "Setup.Recording$Split edited files"
+msgstr "D�zenlenmi� k�t�kleri ay�r"
+
+#: menu.c:2689 menu.c:2817
+msgid "Replay"
+msgstr "Tekrar"
+
+#: menu.c:2690
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Katl� h�z sarma"
+
+#: menu.c:2691
+msgid "Setup.Replay$Show replay mode"
+msgstr "G�steri� bilgisi"
+
+#: menu.c:2692
+msgid "Setup.Replay$Resume ID"
+msgstr "G�steri� ID'si"
+
+#: menu.c:2711 menu.c:2818
+msgid "Miscellaneous"
+msgstr "Di�erler"
+
+#: menu.c:2712
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Minimum olay zaman a��m� (dak)"
+
+#: menu.c:2713
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Minimum kullan�c� hareketsizli�i (dak)"
+
+#: menu.c:2714
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP zaman a��m� (sn) "
+
+#: menu.c:2715
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Kanal de�i�tirme zaman a��m� (sn)"
+
+#: menu.c:2716
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr ""
+
+#: menu.c:2717
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "A��l��daki kanal"
+
+#: menu.c:2717 menu.c:2718
+msgid "Setup.Miscellaneous$as before"
+msgstr "�nceki gibi"
+
+#: menu.c:2718
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "A��l��daki ses"
+
+#: menu.c:2747 menu.c:2820
+msgid "Plugins"
+msgstr "Eklentiler"
+
+#: menu.c:2777
+msgid "This plugin has no setup parameters!"
+msgstr "Bu eklentinin d�zenek parametresi yok!"
+
+#: menu.c:2808 menu.c:2942 menuitems.c:951
+msgid "Setup"
+msgstr "Ayarlar"
+
+#: menu.c:2821
+msgid "Restart"
+msgstr "Yeniden ba�lat"
+
+#: menu.c:2826
+msgid "Really restart?"
+msgstr "Ger�ekten yeniden ba�lat?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+#: menu.c:2878
+msgid " Stop recording "
+msgstr " �ekimi bitir "
+
+#: menu.c:2922
+msgid "Schedule"
+msgstr "Program"
+
+#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
+#: menu.c:2966
+msgid "VDR"
+msgstr "VDR"
+
+#: menu.c:2966
+msgid "free"
+msgstr "bo�"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2978
+msgid " Stop replaying"
+msgstr " G�steri�i bitir"
+
+#: menu.c:2984 menu.c:3496
+msgid "Button$Audio"
+msgstr "Audio"
+
+#: menu.c:2984
+msgid "Button$Pause"
+msgstr "Durakla"
+
+#: menu.c:2984
+msgid "Button$Resume"
+msgstr "S�rd�r"
+
+#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Durdur"
+
+#. TRANSLATORS: note the leading blank!
+#: menu.c:2992
+msgid " Cancel editing"
+msgstr " Kesimi iptal et"
+
+#: menu.c:3038
+msgid "Stop recording?"
+msgstr "Kay�t� durdur?"
+
+#: menu.c:3046
+msgid "Cancel editing?"
+msgstr "Kesimi iptal et?"
+
+#: menu.c:3526
+msgid "No audio available!"
+msgstr "Audio yok!"
+
+#: menu.c:3736
+msgid "Not enough disk space to start recording!"
+msgstr "Kay�t i�in yeterince kapasite yok!"
+
+#: menu.c:3767 vdr.c:1015 vdr.c:1075
+msgid "No free DVB device to record!"
+msgstr "Kullan�lmayan DVB kart� bulunmad�!"
+
+#: menu.c:3797
+msgid "Pausing live video..."
+msgstr "Naklen yay�n duraklat�l�yor..."
+
+#. TRANSLATORS: note the trailing blank!
+#: menu.c:4040
+msgid "Jump: "
+msgstr "Atla: "
+
+#: menu.c:4184
+msgid "No editing marks defined!"
+msgstr "Kesim i�aretleri belirtilmemi�!"
+
+#: menu.c:4186
+msgid "Can't start editing process!"
+msgstr "Kesim ba�lat�lam�yor!"
+
+#: menu.c:4188
+msgid "Editing process started"
+msgstr "Kesim ba�land�"
+
+#: menu.c:4191
+msgid "Editing process already active!"
+msgstr "Kesim hen�z aktif!"
+
+#: menuitems.c:21
+msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgstr " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.#~,/_@"
+
+#: menuitems.c:122
+msgid "yes"
+msgstr "evet"
+
+#: menuitems.c:287
+msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9"
+
+#: menuitems.c:319
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+#: menuitems.c:319
+msgid "Button$Insert"
+msgstr "Ekle"
+
+#: menuitems.c:319
+msgid "Button$Overwrite"
+msgstr "�st�ne yaz"
+
+#: menuitems.c:972
+msgid "Plugin"
+msgstr "Eklenti"
+
+#: osdbase.c:446
+msgid "Up/Dn for new location - OK to move"
+msgstr "'Yukar�/A�a��' yeni posizyon se� - 'Tamam' ta��"
+
+#: player.c:84
+msgid "Channel locked (recording)!"
+msgstr "Kanal ge�ersiz (kay�t ediliyor)!"
+
+#: recording.c:189
+msgid "Low disk space!"
+msgstr "Kay�t kapasitesi az!"
+
+#: shutdown.c:148
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Kapat�lam�yor - '-s' se�ene�i verilmemi�!"
+
+#: shutdown.c:152
+msgid "Editing - shut down anyway?"
+msgstr ""
+
+#: shutdown.c:162
+msgid "Recording - shut down anyway?"
+msgstr "Kay�t ediliyor - buna ra�men kapat?"
+
+#: shutdown.c:169
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Kay�t %ld dakikada ba�l�yor - buna ra�men kapat?"
+
+#: shutdown.c:174
+msgid "shut down anyway?"
+msgstr "buna ra�men kapat?"
+
+#: shutdown.c:184
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+#: shutdown.c:195
+msgid "Editing - restart anyway?"
+msgstr ""
+
+#: shutdown.c:205
+msgid "Recording - restart anyway?"
+msgstr "Kay�t ediliyor - buna ra�men yeniden ba�lat?"
+
+#: shutdown.c:209
+msgid "restart anyway?"
+msgstr "buna ra�men yeniden ba�lat?"
+
+#. TRANSLATORS: note the trailing blank!
+#: skinclassic.c:553
+msgid "Volume "
+msgstr "Ses "
+
+#: skinclassic.c:702
+msgid "Classic VDR"
+msgstr "Klasik VDR"
+
+#: skinsttng.c:1136
+msgid "ST:TNG Panels"
+msgstr "ST:TNG paneli"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+#: timers.c:222
+msgid "MTWTFSS"
+msgstr "PS�PCCP"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+#: tools.c:856
+msgid "MonTueWedThuFriSatSun"
+msgstr "PztSal�arPerCumCmtPaz"
+
+#: tools.c:875
+msgid "Monday"
+msgstr "Pazartesi"
+
+#: tools.c:876
+msgid "Tuesday"
+msgstr "Sal�"
+
+#: tools.c:877
+msgid "Wednesday"
+msgstr "�ar�amba"
+
+#: tools.c:878
+msgid "Thursday"
+msgstr "Per�embe"
+
+#: tools.c:879
+msgid "Friday"
+msgstr "Cuma"
+
+#: tools.c:880
+msgid "Saturday"
+msgstr "Cumartesi"
+
+#: tools.c:881
+msgid "Sunday"
+msgstr "Pazar"
+
+#: vdr.c:861
+msgid "Upcoming VPS recording!"
+msgstr "VPS �ekim yak�nda ba�l�yor!"
+
+#: vdr.c:1023 vdr.c:1079
+msgid "Recording started"
+msgstr "Kay�t ba�land�"
+
+#: vdr.c:1032
+msgid "VDR will shut down later - press Power to force"
+msgstr ""
+
+#: vdr.c:1044
+msgid "Press any key to cancel shutdown"
+msgstr "Kapatmay� iptal etmek i�in herhangi bir tu�a bas"
+
+#: vdr.c:1097
+msgid "Switching primary DVB..."
+msgstr "Primer DVB aray�z� de�i�tiriliyor..."
+
+#: vdr.c:1165
+msgid "Editing process failed!"
+msgstr "Kesim ba�ar�s�z!"
+
+#: vdr.c:1167
+msgid "Editing process finished"
+msgstr "Kesim bitti"
+
+#: vdr.c:1173
+msgid "Press any key to cancel restart"
+msgstr ""
+
+#: vdr.c:1193
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr ""
diff --git a/receiver.c b/receiver.c
index 20be19ab5..82c414dcb 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.6 2007/01/05 10:42:29 kls Exp $
+ * $Id: receiver.c 1.7 2007/08/12 11:52:59 kls Exp $
  */
 
 #include "receiver.h"
@@ -38,7 +38,12 @@ cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pid
 
 cReceiver::~cReceiver()
 {
-  Detach();
+  if (device) {
+     const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
+     esyslog(msg);
+     fprintf(stderr, "%s\n", msg);
+     *(char *)0 = 0; // cause a segfault
+     }
 }
 
 bool cReceiver::WantsPid(int Pid)
diff --git a/skinclassic.c b/skinclassic.c
index 14be9d6f9..144d0722b 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.17 2007/06/17 13:53:09 kls Exp $
+ * $Id: skinclassic.c 1.18 2007/07/29 12:35:03 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -549,6 +549,7 @@ void cSkinClassicDisplayVolume::SetVolume(int Current, int Total, bool Mute)
      osd->DrawText(0, 0, tr("Key$Mute"), Theme.Color(clrVolumePrompt), Theme.Color(clrBackground), font);
      }
   else {
+     // TRANSLATORS: note the trailing blank!
      const char *Prompt = tr("Volume ");
      int l = font->Width(Prompt);
      int p = (osd->Width() - l) * Current / Total;
diff --git a/status.h b/status.h
index 57e4b9195..651974418 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.9 2005/12/31 15:15:25 kls Exp $
+ * $Id: status.h 1.10 2007/08/12 10:34:40 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -40,7 +40,7 @@ class cStatus : public cListObject {
                // absolutely or relative to the current volume.
   virtual void SetAudioTrack(int Index, const char * const *Tracks) {}
                // The audio track has been set to the one given by Index, which
-               // points into the Tracks array of strings.
+               // points into the Tracks array of strings. Tracks is NULL terminated.
   virtual void SetAudioChannel(int AudioChannel) {}
                // The audio channel has been set to the given value.
                // 0=stereo, 1=left, 2=right, -1=no information available.
diff --git a/themes.c b/themes.c
index 45fc17256..21294c388 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.6 2005/11/04 14:19:54 kls Exp $
+ * $Id: themes.c 1.7 2007/08/05 14:11:35 kls Exp $
  */
 
 #include "themes.h"
@@ -18,7 +18,6 @@
 cTheme::cTheme(void)
 {
   name = strdup("default");
-  memset(descriptions, 0, sizeof(descriptions));
   memset(colorNames, 0, sizeof(colorNames));
   memset(colorValues, 0, sizeof(colorValues));
   descriptions[0] = strdup("Default");
@@ -27,8 +26,6 @@ cTheme::cTheme(void)
 cTheme::~cTheme()
 {
   free(name);
-  for (int i = 0; i < I18nNumLanguages; i++)
-      free(descriptions[i]);
   for (int i = 0; i < MaxThemeColors; i++)
       free(colorNames[i]);
 }
@@ -77,7 +74,7 @@ bool cTheme::FileNameOk(const char *FileName, bool SetName)
 
 const char *cTheme::Description(void)
 {
-  char *s = descriptions[Setup.OSDLanguage];
+  char *s = descriptions[I18nCurrentLanguage()];
   if (!s)
      s = descriptions[0];
   return s ? s : name;
@@ -167,7 +164,7 @@ bool cTheme::Save(const char *FileName)
   bool result = true;
   cSafeFile f(FileName);
   if (f.Open()) {
-     for (int i = 0; i < I18nNumLanguages; i++) {
+     for (int i = 0; i < I18nLanguages()->Size(); i++) {
          if (descriptions[i])
             fprintf(f, "Description%s%.*s = %s\n", i ? "." : "", 3, i ? I18nLanguageCode(i) : "", descriptions[i]);
          }
diff --git a/themes.h b/themes.h
index 617f1d2e6..562429367 100644
--- a/themes.h
+++ b/themes.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.h 1.1 2004/05/15 14:22:16 kls Exp $
+ * $Id: themes.h 1.2 2007/08/05 14:10:22 kls Exp $
  */
 
 #ifndef __THEMES_H
 #define __THEMES_H
 
 #include "i18n.h"
+#include "tools.h"
 #include "osd.h"
 
 class cTheme {
@@ -18,7 +19,7 @@ class cTheme {
   enum { MaxThemeColors = 128 };
 private:
   char *name;
-  char *descriptions[I18nNumLanguages];
+  cStringList descriptions;
   char *colorNames[MaxThemeColors];
   tColor colorValues[MaxThemeColors];
   bool FileNameOk(const char *FileName, bool SetName = false);
diff --git a/timers.c b/timers.c
index febf12eb8..f70ab9d18 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.67 2007/06/16 10:41:21 kls Exp $
+ * $Id: timers.c 1.68 2007/08/04 09:23:33 kls Exp $
  */
 
 #include "timers.h"
@@ -218,7 +218,8 @@ cString cTimer::PrintDay(time_t Day, int WeekDays, bool SingleByteChars)
   char buffer[DAYBUFFERSIZE];
   char *b = buffer;
   if (WeekDays) {
-     const char *w = "MTWTFSS";
+     // TRANSLATORS: the first character of each weekday, beginning with monday
+     const char *w = trNOOP("MTWTFSS");
      if (!SingleByteChars)
         w = tr(w);
      while (*w) {
diff --git a/tools.c b/tools.c
index 0d471bb7a..642704ca6 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.134 2007/07/21 13:02:45 kls Exp $
+ * $Id: tools.c 1.135 2007/08/05 12:18:15 kls Exp $
  */
 
 #include "tools.h"
@@ -852,6 +852,7 @@ cString WeekDayName(int WeekDay)
   char buffer[16];
   WeekDay = WeekDay == 0 ? 6 : WeekDay - 1; // we start with Monday==0!
   if (0 <= WeekDay && WeekDay <= 6) {
+     // TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
      const char *day = tr("MonTueWedThuFriSatSun");
      day += Utf8SymChars(day, WeekDay * 3);
      strn0cpy(buffer, day, min(Utf8SymChars(day, 3) + 1, int(sizeof(buffer))));
@@ -1178,12 +1179,12 @@ void cStringList::Clear(void)
 // --- cFileNameList ---------------------------------------------------------
 
 // TODO better GetFileNames(const char *Directory, cStringList *List)?
-cFileNameList::cFileNameList(const char *Directory)
+cFileNameList::cFileNameList(const char *Directory, bool DirsOnly)
 {
-  Load(Directory);
+  Load(Directory, DirsOnly);
 }
 
-bool cFileNameList::Load(const char *Directory)
+bool cFileNameList::Load(const char *Directory, bool DirsOnly)
 {
   Clear();
   if (Directory) {
@@ -1191,8 +1192,16 @@ bool cFileNameList::Load(const char *Directory)
      struct dirent *e;
      if (d.Ok()) {
         while ((e = d.Next()) != NULL) {
-              if (strcmp(e->d_name, ".") && strcmp(e->d_name, ".."))
+              if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+                 if (DirsOnly) {
+                    struct stat ds;
+                    if (stat(e->d_name, &ds) == 0) {
+                       if (S_ISDIR(ds.st_mode))
+                          continue;
+                       }
+                    }
                  Append(strdup(e->d_name));
+                 }
               }
         Sort();
         return true;
diff --git a/tools.h b/tools.h
index a0c5a528d..bd77f8576 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.104 2007/07/21 13:35:45 kls Exp $
+ * $Id: tools.h 1.107 2007/08/05 12:11:52 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -28,9 +28,9 @@ typedef unsigned char uchar;
 
 extern int SysLogLevel;
 
-#define esyslog(a...) void( (SysLogLevel > 0) ? syslog_with_tid(LOG_ERR,   a) : void() )
-#define isyslog(a...) void( (SysLogLevel > 1) ? syslog_with_tid(LOG_INFO,  a) : void() )
-#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_DEBUG, a) : void() )
+#define esyslog(a...) void( (SysLogLevel > 0) ? syslog_with_tid(LOG_ERR, a) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? syslog_with_tid(LOG_ERR, a) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_ERR, a) : void() )
 
 #define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
 #define LOG_ERROR_STR(s)  esyslog("ERROR: %s: %m", s)
@@ -175,9 +175,9 @@ char *strreplace(char *s, char c1, char c2);
 char *strreplace(char *s, const char *s1, const char *s2); ///< re-allocates 's' and deletes the original string if necessary!
 inline char *skipspace(const char *s)
 {
-  if (*s > ' ') // most strings don't have any leading space, so handle this case as fast as possible
+  if ((uchar)*s > ' ') // most strings don't have any leading space, so handle this case as fast as possible
      return (char *)s;
-  while (*s && *s <= ' ') // avoiding isspace() here, because it is much slower
+  while (*s && (uchar)*s <= ' ') // avoiding isspace() here, because it is much slower
         s++;
   return (char *)s;
 }
@@ -487,8 +487,8 @@ class cStringList : public cVector<char *> {
 
 class cFileNameList : public cStringList {
 public:
-  cFileNameList(const char *Directory = NULL);
-  bool Load(const char *Directory);
+  cFileNameList(const char *Directory = NULL, bool DirsOnly = false);
+  bool Load(const char *Directory, bool DirsOnly = false);
   };
 
 class cHashObject : public cListObject {
diff --git a/vdr.5 b/vdr.5
index 99c3b09ab..6ea1e49d3 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.62 2007/06/03 13:21:34 kls Exp $
+.\" $Id: vdr.5 1.63 2007/08/05 12:58:35 kls Exp $
 .\"
 .TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files"
 .SH NAME
@@ -542,9 +542,10 @@ you can provide language specific descriptions as
 .br
 \fBDescription.ger = Blaut\(:one\fR
 
-where the language code (as defined in VDR/i18n.c) is added to the keyword
+where the language code is added to the keyword
 "Description", separated by a dot. You can enter as many language specific
-descriptions as there are languages defined in VDR/i18n.h.
+descriptions as you like, but only those that have a corresponding locale
+messages file will be actually used.
 If a theme file doesn't contain a Description, the name of the theme (as
 given in the theme's file name) will be used.
 .SS AUDIO/VIDEO DATA
diff --git a/vdr.c b/vdr.c
index 54814a78f..b15938a74 100644
--- a/vdr.c
+++ b/vdr.c
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
  * The author can be reached at kls@cadsoft.de
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.294 2007/07/22 11:40:01 kls Exp $
+ * $Id: vdr.c 1.296 2007/08/12 11:22:04 kls Exp $
  */
 
 #include <getopt.h>
@@ -511,6 +511,10 @@ int main(int argc, char *argv[])
      cCharSetConv::SetSystemCharacterTable(CodeSet);
      }
 
+  // Initialize internationalization:
+
+  I18nInitialize();
+
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
   cOsdObject *Menu = NULL;

From e5a2aa41c9762bda4ce7b987aba1bcfa1cee6f70 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 19 Aug 2007 18:00:00 +0200
Subject: [PATCH 174/307] =?UTF-8?q?Version=201.5.8=20-=20Added=20missing?=
 =?UTF-8?q?=20install-i18n=20to=20the=20install=20target=20in=20the=20Make?=
 =?UTF-8?q?file=20(reported=20=20=20by=20Joachim=20Wilke).=20-=20Fixed=20a?=
 =?UTF-8?q?=20faulty=20comment=20in=20Make.config.template=20(reported=20b?=
 =?UTF-8?q?y=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Improved=20i18n-to-gett?=
 =?UTF-8?q?ext.pl=20(thanks=20to=20Matthias=20Schwarzott).=20-=20Moved=20t?=
 =?UTF-8?q?he=20"all"=20target=20in=20plugin=20Makefiles=20before=20the=20?=
 =?UTF-8?q?"Implicit=20rules",=20=20=20so=20that=20a=20plain=20"make"=20wi?=
 =?UTF-8?q?ll=20compile=20everything=20(suggested=20by=20Matthias=20=20=20?=
 =?UTF-8?q?Schwarzott).=20The=20"newplugin"=20script=20has=20been=20change?=
 =?UTF-8?q?d=20accordingly.=20=20=20Plugin=20authors=20may=20want=20to=20c?=
 =?UTF-8?q?hange=20their=20Makefiles,=20too.=20-=20Added=20DESTDIR=20and?=
 =?UTF-8?q?=20PREFIX=20handling=20to=20the=20Makefile=20(thanks=20to=20Mat?=
 =?UTF-8?q?thias=20=20=20Schwarzott).=20-=20Updated=20the=20Finnish=20OSD?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Added=20inte?=
 =?UTF-8?q?rnationalization=20to=20the=20"skincurses"=20plugin=20(thanks?=
 =?UTF-8?q?=20to=20Rolf=20=20=20Ahrenberg).=20-=20Checking=20the=20string?=
 =?UTF-8?q?=20for=20NULL=20in=20I18nTranslate().=20-=20Updated=20the=20Fre?=
 =?UTF-8?q?nch=20OSD=20texts=20(thanks=20to=20Bruno=20Roussel).=20-=20Some?=
 =?UTF-8?q?=20optimizations=20in=20cDvbDevice::SetChannelDevice()=20(thank?=
 =?UTF-8?q?s=20to=20Tobias=20Bratfisch).=20-=20Optimized=20cMenuEditChrIte?=
 =?UTF-8?q?m::Set()=20(thanks=20to=20Tobias=20Bratfisch).=20-=20Optimized?=
 =?UTF-8?q?=20cNitFilter::Process()=20(thanks=20to=20Tobias=20Bratfisch).?=
 =?UTF-8?q?=20-=20Reduced=20the=20number=20of=20time(NULL)=20calls=20in=20?=
 =?UTF-8?q?vdr.c's=20main=20loop=20to=20a=20single=20call=20=20=20(thanks?=
 =?UTF-8?q?=20to=20Tobias=20Bratfisch).=20-=20Changed=20cBitmap::DrawText(?=
 =?UTF-8?q?)=20to=20always=20draw=20the=20background=20unless=20ColorBg=20?=
 =?UTF-8?q?=20=20is=20clrTransparent=20(thanks=20to=20Christoph=20Haubrich?=
 =?UTF-8?q?).=20-=20The=20"Setup/OSD/Language"=20menu=20now=20only=20shows?=
 =?UTF-8?q?=20those=20languages=20that=20actually=20=20=20have=20a=20local?=
 =?UTF-8?q?e=20(suggested=20by=20Anssi=20Hannula).=20-=20Now=20using=20set?=
 =?UTF-8?q?env()=20instead=20of=20setlocale()=20to=20set=20the=20language?=
 =?UTF-8?q?=20for=20gettext()=20=20=20(suggested=20by=20Anssi=20Hannula;?=
 =?UTF-8?q?=20thanks=20also=20to=20Ludwig=20Nussel=20for=20a=20hint=20on?=
 =?UTF-8?q?=20using=20=20=20=5Fnl=5Fmsg=5Fcat=5Fcntr).=20-=20When=20scanni?=
 =?UTF-8?q?ng=20the=20locale=20directory,=20VDR=20now=20explicitly=20looks?=
 =?UTF-8?q?=20for=20a=20file=20named=20=20=20vdr.mo.=20Text=20files=20for?=
 =?UTF-8?q?=20plugins=20are=20now=20named=20"vdr-name.mo",=20when=20"name"?=
 =?UTF-8?q?=20is=20the=20=20=20name=20of=20the=20plugin.=20The=20"newplugi?=
 =?UTF-8?q?n"=20script=20has=20been=20changed=20accordingly,=20and=20=20?=
 =?UTF-8?q?=20plugin=20authors=20should=20change=20their=20Makefiles,=20to?=
 =?UTF-8?q?o.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  26 +++-
 HISTORY                             |  34 ++++++
 Make.config.template                |   5 +-
 Makefile                            |  40 ++++---
 PLUGINS/src/hello/HISTORY           |   5 +
 PLUGINS/src/hello/Makefile          |  10 +-
 PLUGINS/src/hello/hello.c           |   4 +-
 PLUGINS/src/osddemo/HISTORY         |   5 +
 PLUGINS/src/osddemo/Makefile        |   8 +-
 PLUGINS/src/osddemo/osddemo.c       |   4 +-
 PLUGINS/src/servicedemo/HISTORY     |   5 +
 PLUGINS/src/servicedemo/Makefile    |   8 +-
 PLUGINS/src/servicedemo/svccli.c    |   4 +-
 PLUGINS/src/servicedemo/svcsvr.c    |   4 +-
 PLUGINS/src/skincurses/HISTORY      |   6 +
 PLUGINS/src/skincurses/Makefile     |  34 +++++-
 PLUGINS/src/skincurses/po/de_DE.po  |  32 +++++
 PLUGINS/src/skincurses/po/fi_FI.po  |  32 +++++
 PLUGINS/src/skincurses/skincurses.c |  10 +-
 PLUGINS/src/sky/HISTORY             |   5 +
 PLUGINS/src/sky/Makefile            |   8 +-
 PLUGINS/src/sky/sky.c               |   4 +-
 PLUGINS/src/status/HISTORY          |   5 +
 PLUGINS/src/status/Makefile         |   8 +-
 PLUGINS/src/status/status.c         |   4 +-
 PLUGINS/src/svdrpdemo/HISTORY       |   5 +
 PLUGINS/src/svdrpdemo/Makefile      |   8 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c   |   4 +-
 config.h                            |  10 +-
 dvbdevice.c                         |  19 ++-
 i18n-to-gettext.pl                  |  23 +++-
 i18n.c                              |  40 +++++--
 i18n.h                              |  11 +-
 menu.c                              |   4 +-
 menuitems.c                         |   9 +-
 newplugin                           |  10 +-
 nit.c                               |  99 ++++++++--------
 osd.c                               |  16 ++-
 po/ca_ES.po                         |  40 +++----
 po/cs_CZ.po                         |  40 +++----
 po/da_DK.po                         |  40 +++----
 po/de_DE.po                         |  40 +++----
 po/el_GR.po                         |  40 +++----
 po/es_ES.po                         |  40 +++----
 po/et_EE.po                         |  40 +++----
 po/fi_FI.po                         |  74 ++++++------
 po/fr_FR.po                         | 178 ++++++++++++++--------------
 po/hr_HR.po                         |  40 +++----
 po/hu_HU.po                         |  40 +++----
 po/it_IT.po                         |  40 +++----
 po/nl_NL.po                         |  40 +++----
 po/nn_NO.po                         |  40 +++----
 po/pl_PL.po                         |  40 +++----
 po/pt_PT.po                         |  40 +++----
 po/ro_RO.po                         |  40 +++----
 po/ru_RU.po                         |  40 +++----
 po/sl_SI.po                         |  40 +++----
 po/sv_SE.po                         |  40 +++----
 po/tr_TR.po                         |  40 +++----
 vdr.c                               |  26 ++--
 60 files changed, 930 insertions(+), 676 deletions(-)
 create mode 100644 PLUGINS/src/skincurses/po/de_DE.po
 create mode 100644 PLUGINS/src/skincurses/po/fi_FI.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea354f203..68abd99a7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -887,6 +887,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for making the Makefile patch friendlier
  for a patch that was used for implementing setting the user id
  for pointing out that the canonical spelling of codesets is with '-'
+ for a hint on using _nl_msg_cat_cntr
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -934,12 +935,14 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for reporting a problem with multiple entries of the same subdirectory in the
  "Recordings" menu
 
-Andreas Mair <Andreas.Mair@linogate.com>
+Andreas Mair <andreas@vdr-developer.org>
  for reporting a short display of the main menu if a plugin displays its own OSD and
  is started through a user defined key macro
  for reporting a problem with extremely long summary fields in timers
  for reporting a bug in handling the tfRecording flag when reading timers
  for enabling fonts to be created with a width that overwrites the default width
+ for suggesting to make cBitmap::SetXpm() checks whether the given Xpm pointer is
+ not NULL
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1017,6 +1020,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for suggesting to change the parameter "OSD font" to "Default font" in "Setup/OSD"
  for improving cControl::Launch() to keep 'control' from pointing to uninitialized
  memory
+ for adding internationalization to the "skincurses" plugin
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1408,6 +1412,7 @@ Marco Schl
  for fixing a buffer overflow in initializing the system character table
  for reporting a missing 'P' in vdr.c's SHUTDOWNCANCELROMPT macro
  for fixing a problem with characters >0x7F in the modified version of skipspace()
+ for reporting a faulty comment in Make.config.template
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1544,6 +1549,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
  for fixing removing the '-' when entering a channel number where there is no other
  one that fits the input
  for reporting a problem with cStatus::MsgOsdTextItem() being called without a text
+ for reporting a missing install-i18n in the install target in the Makefile
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -1976,6 +1982,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for suggestions that led to implementing cOsd::SetOsdPosition() etc.
  for fixing a typo in the function name of cOsd::SetOsdPosition() and adding a range
  check to it
+ for changing cBitmap::DrawText() to always draw the background unless ColorBg
+ is clrTransparent
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2051,6 +2059,9 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for fixing handling frequencies in NitFilter::Process()
  for making non-primary devices in Transfer mode be also used for recording
  for code and hints on how to use 'fontconfig' to determine which fonts to use
+ for suggesting to make the "Setup/OSD/Language" menu only show those languages
+ that actually have a locale
+ for suggesting to use setenv() instead of setlocale() to set the language for gettext()
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2083,6 +2094,10 @@ Tomas Berglund <tomber@telia.com>
 Matthias Schwarzott <zzam@gentoo.org>
  for suggesting to add LC_ALL to the checks for UTF-8 at startup
  for fixing getting the code setting from the locale
+ for improving i18n-to-gettext.pl
+ for suggesting to move the "all" target in plugin Makefiles before the
+ "Implicit rules", so that a plain "make" will compile everything
+ for adding DESTDIR and PREFIX handling to the Makefile
 
 Martin Ostermann <martin@familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
@@ -2129,7 +2144,10 @@ Patrice Staudt <staudt@engsystem.net>
 Tobias Bratfisch <tobias@reel-multimedia.com>
  for improving numdigits(), isnumber() and strreplace()
  for suggesting to make skipspace() an inline function
+ for making some optimizations in cDvbDevice::SetChannelDevice()
+ for optimizing cMenuEditChrItem::Set()
+ for optimizing cNitFilter::Process()
+ for reducing the number of time(NULL) calls in vdr.c's main loop to a single call
 
-Andreas Mair <andreas@vdr-developer.org>
- for suggesting to make cBitmap::SetXpm() checks whether the given Xpm pointer is
- not NULL
+Bruno Roussel <bruno.roussel@free.fr>
+ for translating OSD texts to the French language
diff --git a/HISTORY b/HISTORY
index c2d9aa7e1..0677dbcc6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5345,3 +5345,37 @@ Video Disk Recorder Revision History
   Mair).
 - Added a debug error message to cReceiver::~cReceiver() in case it is still
   attached to a device (thanks to Reinhard Nissl).
+
+2007-08-19: Version 1.5.8
+
+- Added missing install-i18n to the install target in the Makefile (reported
+  by Joachim Wilke).
+- Fixed a faulty comment in Make.config.template (reported by Marco Schl��ler).
+- Improved i18n-to-gettext.pl (thanks to Matthias Schwarzott).
+- Moved the "all" target in plugin Makefiles before the "Implicit rules",
+  so that a plain "make" will compile everything (suggested by Matthias
+  Schwarzott). The "newplugin" script has been changed accordingly.
+  Plugin authors may want to change their Makefiles, too.
+- Added DESTDIR and PREFIX handling to the Makefile (thanks to Matthias
+  Schwarzott).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added internationalization to the "skincurses" plugin (thanks to Rolf
+  Ahrenberg).
+- Checking the string for NULL in I18nTranslate().
+- Updated the French OSD texts (thanks to Bruno Roussel).
+- Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch).
+- Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch).
+- Optimized cNitFilter::Process() (thanks to Tobias Bratfisch).
+- Reduced the number of time(NULL) calls in vdr.c's main loop to a single call
+  (thanks to Tobias Bratfisch).
+- Changed cBitmap::DrawText() to always draw the background unless ColorBg
+  is clrTransparent (thanks to Christoph Haubrich).
+- The "Setup/OSD/Language" menu now only shows those languages that actually
+  have a locale (suggested by Anssi Hannula).
+- Now using setenv() instead of setlocale() to set the language for gettext()
+  (suggested by Anssi Hannula; thanks also to Ludwig Nussel for a hint on using
+  _nl_msg_cat_cntr).
+- When scanning the locale directory, VDR now explicitly looks for a file named
+  vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the
+  name of the plugin. The "newplugin" script has been changed accordingly, and
+  plugin authors should change their Makefiles, too.
diff --git a/Make.config.template b/Make.config.template
index 5412eafb8..86564a284 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.12 2007/08/12 12:04:17 kls Exp $
+# $Id: Make.config.template 1.13 2007/08/12 20:43:46 kls Exp $
 
 ### The C compiler and options:
 
@@ -26,7 +26,8 @@ endif
 #DVBDIR   = /usr/src/v4l-dvb/linux
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
-LOCDIR   = /usr/share/vdr/locale  # set to ./locale to run VDR from within its source directory
+# set to ./locale to run VDR from within its source directory:
+LOCDIR   = /usr/share/vdr/locale
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
diff --git a/Makefile b/Makefile
index a5f9201f4..a46aaef58 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.102 2007/08/11 12:26:12 kls Exp $
+# $Id: Makefile 1.104 2007/08/15 13:47:16 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -15,9 +15,11 @@ CXX      ?= g++
 CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 
 LSIDIR   = ./libsi
-MANDIR   = /usr/local/man
-BINDIR   = /usr/local/bin
-LOCDIR   = /usr/share/vdr/locale
+DESTDIR ?=
+PREFIX  ?= /usr/local
+MANDIR   = $(PREFIX)/share/man
+BINDIR   = $(PREFIX)/bin
+LOCDIR   = $(PREFIX)/share/vdr/locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig
 INCLUDES = -I/usr/include/freetype2
 
@@ -25,6 +27,7 @@ PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
 
 VIDEODIR = /video
+CONFDIR ?= $(VIDEODIR)
 
 DOXYGEN  = /usr/bin/doxygen
 DOXYFILE = Doxyfile
@@ -123,8 +126,8 @@ i18n: $(I18Nmo)
 	    done
 
 install-i18n:
-	@mkdir -p $(LOCDIR)
-	@(cd $(LOCALEDIR); cp -r --parents * $(LOCDIR))
+	@mkdir -p $(DESTDIR)$(LOCDIR)
+	@(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
 
 # The 'include' directory (for plugins):
 
@@ -157,35 +160,36 @@ clean-plugins:
 
 # Install the files:
 
-install: install-bin install-conf install-doc install-plugins
+install: install-bin install-conf install-doc install-plugins install-i18n
 
 # VDR binary:
 
 install-bin: vdr
-	@mkdir -p $(BINDIR)
-	@cp --remove-destination vdr runvdr $(BINDIR)
+	@mkdir -p $(DESTDIR)$(BINDIR)
+	@cp --remove-destination vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)
 
 # Configuration files:
 
 install-conf:
-	@if [ ! -d $(VIDEODIR) ]; then\
-	    mkdir -p $(VIDEODIR);\
-	    cp *.conf $(VIDEODIR);\
+	@mkdir -p $(DESTDIR)$(VIDEODIR)
+	@if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
+	    mkdir -p $(DESTDIR)$(CONFDIR);\
+	    cp *.conf $(DESTDIR)$(CONFDIR);\
 	    fi
 
 # Documentation:
 
 install-doc:
-	@mkdir -p $(MANDIR)/man1
-	@mkdir -p $(MANDIR)/man5
-	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
-	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
+	@mkdir -p $(DESTDIR)$(MANDIR)/man1
+	@mkdir -p $(DESTDIR)$(MANDIR)/man5
+	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
 
 # Plugins:
 
 install-plugins: plugins
-	@mkdir -p $(PLUGINLIBDIR)
-	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
+	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
+	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
 
 # Source documentation:
 
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 2d770b88f..d4c9d3787 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -53,3 +53,8 @@ VDR Plugin 'hello' Revision History
 2007-08-11: Version 0.2.0
 
 - Switched to 'gettext' internationalization.
+
+2007-08-15: Version 0.2.1
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index e78b6e1a6..80b6c8cb1 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.16 2007/08/11 10:18:16 kls Exp $
+# $Id: Makefile 1.18 2007/08/19 14:18:59 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
 ### Implicit rules:
 
 %.o: %.c
@@ -85,13 +89,11 @@ i18n: $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
 	    done
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so i18n
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 96403389f..273217e08 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.13 2007/08/11 09:31:17 kls Exp $
+ * $Id: hello.c 1.14 2007/08/15 13:17:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.0";
+static const char *VERSION        = "0.2.1";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index fd10cc3c3..b0f300a46 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -12,3 +12,8 @@ VDR Plugin 'osddemo' Revision History
 2004-04-30: Version 0.1.1
 
 - New OSD handling.
+
+2007-08-15: Version 0.1.2
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 716388875..568faa679 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.10 2007/08/15 13:05:24 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
 ### Implicit rules:
 
 %.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 08b2d9675..a4c0b8f86 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 1.3 2004/05/16 09:28:51 kls Exp $
+ * $Id: osddemo.c 1.4 2007/08/15 13:17:55 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.1";
+static const char *VERSION        = "0.1.2";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 16a0c4302..76d95a5cd 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -4,3 +4,8 @@ VDR Plugin 'servicedemo' Revision History
 2005-08-21: Version 0.1.1
 
 - Initial revision.
+
+2007-08-15: Version 0.1.2
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index a18f99504..9625953fb 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.9 2007/08/15 13:05:42 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN1).o $(PLUGIN2).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
+
 ### Implicit rules:
 
 %.o: %.c
@@ -65,8 +69,6 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
-
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 9a4ed4440..6e812b417 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 1.1 2005/08/21 10:44:29 kls Exp $
+ * $Id: svccli.c 1.2 2007/08/15 13:18:08 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.1";
+static const char *VERSION        = "0.1.2";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 7aff2b98d..9ccb73cec 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 1.1 2005/08/21 10:44:24 kls Exp $
+ * $Id: svcsvr.c 1.2 2007/08/15 13:18:59 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.1";
+static const char *VERSION        = "0.1.2";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 60f4839e2..02065a4de 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -51,3 +51,9 @@ VDR Plugin 'skincurses' Revision History
 2007-07-20: Version 0.1.2
 
 - Fixed clearing color buttons.
+
+2007-08-15: Version 0.1.3
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
+- Added internationalization.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index a52f40951..5199dd8b5 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2007/06/10 16:19:08 kls Exp $
+# $Id: Makefile 1.11 2007/08/19 14:19:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
 ### Implicit rules:
 
 %.o: %.c
@@ -61,9 +65,32 @@ $(DEPFILE): Makefile
 
 -include $(DEPFILE)
 
-### Targets:
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
 
-all: libvdr-$(PLUGIN).so
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+
+$(I18Npo): $(I18Npot)
+	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+
+i18n: $(I18Nmo)
+	@mkdir -p $(LOCALEDIR)
+	for i in $(I18Ndirs); do\
+	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
+	    done
+
+### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
@@ -78,4 +105,5 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
new file mode 100644
index 000000000..e80cdc63c
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@cadsoft.de>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"PO-Revision-Date: 2007-08-15 16:07+0200\n"
+"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: skincurses.c:15
+msgid "A text only skin"
+msgstr "Eine reine Text-Oberfl�che"
+
+#: skincurses.c:566
+msgid "Key$Mute"
+msgstr "Stumm"
+
+#: skincurses.c:569
+msgid "Volume "
+msgstr "Lautst�rke"
+
+#: skincurses.c:699
+msgid "Text mode"
+msgstr "Text-Modus"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
new file mode 100644
index 000000000..d4a474295
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-14 20:54+0300\n"
+"PO-Revision-Date: 2007-08-14 20:48+0300\n"
+"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: skincurses.c:15
+msgid "A text only skin"
+msgstr "Tekstipohjainen ulkoasu"
+
+#: skincurses.c:566
+msgid "Key$Mute"
+msgstr "Mykistys"
+
+#: skincurses.c:569
+msgid "Volume "
+msgstr "��nenvoimakkuus "
+
+#: skincurses.c:699
+msgid "Text mode"
+msgstr "Teksti"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 9324210c4..0553de9c1 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.15 2007/07/20 14:45:07 kls Exp $
+ * $Id: skincurses.c 1.17 2007/08/15 14:01:54 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,8 +11,8 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.2";
-static const char *DESCRIPTION    = "A text only skin";
+static const char *VERSION        = "0.1.3";
+static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
 // --- cCursesFont -----------------------------------------------------------
@@ -738,13 +738,13 @@ class cPluginSkinCurses : public cPlugin {
   cPluginSkinCurses(void);
   virtual ~cPluginSkinCurses();
   virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *Description(void) { return tr(DESCRIPTION); }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Initialize(void);
   virtual bool Start(void);
   virtual void Housekeeping(void);
-  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 3233bf626..b089c4a1a 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -54,3 +54,8 @@ VDR Plugin 'sky' Revision History
   use the new option -U of getskyepg.pl to have the information added to the URL
   as a query string.
 - The getskyepg.pl script now replaces "&amp;" with "&".
+
+2007-08-15:Version 0.3.6
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 63a647c47..52a520bc6 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.10 2007/08/15 13:06:08 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
 ### Implicit rules:
 
 %.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 4033bf7b1..f2aa0cf89 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.13 2006/03/26 09:21:10 kls Exp $
+ * $Id: sky.c 1.14 2007/08/15 13:19:24 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -15,7 +15,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.5";
+static const char *VERSION        = "0.3.6";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 998e23dfc..97bc7e2ee 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -35,3 +35,8 @@ VDR Plugin 'status' Revision History
 2005-12-31: Version 0.2.0
 
 - API change in cStatus.
+
+2007-08-15: Version 0.2.1
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 1985ab03a..2c66d200d 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.13 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.14 2007/08/15 13:06:17 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
 ### Implicit rules:
 
 %.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 71639279c..fa5f0d41e 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.8 2005/12/31 15:19:45 kls Exp $
+ * $Id: status.c 1.9 2007/08/15 13:19:44 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.2.0";
+static const char *VERSION        = "0.2.1";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index efdc82651..643346847 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -8,3 +8,8 @@ VDR Plugin 'svdrpdemo' Revision History
 2005-08-28: Version 0.0.2
 
 - Removed unused MAINMENUENTRY.
+
+2007-08-15: Version 0.0.3
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+  so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 8c0f42e35..a69444691 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.8 2007/08/15 13:06:28 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 OBJS = $(PLUGIN).o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
 ### Implicit rules:
 
 %.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 66dc25b9a..008d25b0f 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 1.2 2005/08/28 21:11:14 kls Exp $
+ * $Id: svdrpdemo.c 1.3 2007/08/15 13:19:57 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.h b/config.h
index 5ff5849c9..526885300 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.296 2007/08/10 13:01:52 kls Exp $
+ * $Id: config.h 1.297 2007/08/12 20:38:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.7"
-#define VDRVERSNUM   10507  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.8"
+#define VDRVERSNUM   10508  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.7"
-#define APIVERSNUM   10507  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.8"
+#define APIVERSNUM   10508  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbdevice.c b/dvbdevice.c
index 8757710a9..7d1a5c8c6 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.164 2007/02/25 11:46:52 kls Exp $
+ * $Id: dvbdevice.c 1.165 2007/08/17 13:37:56 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -793,18 +793,25 @@ bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
+  int apid = Channel->Apid(0);
+  int vpid = Channel->Vpid();
+  int dpid = Channel->Dpid(0);
+
   bool DoTune = !dvbTuner->IsTunedTo(Channel);
 
+  bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
+  bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
+
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
                             || !IsPrimaryDevice()
                             || LiveView // for a new live view the old PIDs need to be turned off
-                            || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                            || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                             );
 
   bool StartTransferMode = IsPrimaryDevice() && !DoTune
-                           && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || (pidHandles[ptAudio].pid != Channel->Apid(0) && (Channel->Dpid(0) ? pidHandles[ptAudio].pid != Channel->Dpid(0) : true)))// the PID is already set as DMX_PES_OTHER
-                              || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                           && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
+                              || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                               );
   if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
      StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
@@ -836,7 +843,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   if (TurnOnLivePIDs) {
      SetAudioBypass(false);
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo) && AddPid(apid, ptAudio))) {
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
@@ -848,7 +855,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+     cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), vpid, Channel->Apids(), Channel->Dpids(), Channel->Spids()));
 
   return true;
 }
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index 79b2aab70..130122d45 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 1.2 2007/08/12 10:02:01 kls Exp $
+# $Id: i18n-to-gettext.pl 1.3 2007/08/15 12:52:00 kls Exp $
 
 # How to convert an actual plugin:
 #
@@ -75,7 +75,7 @@
 # Locate the file containing the texts:
 
 $I18NFILE = "";
-for ("i18n.c", `ls *.c`) { # try i18n.c explicitly first
+for ("i18n.c", "i18n.h", `ls *.c`) { # try i18n.[ch] explicitly first
     chomp($f = $_);
     if (-f $f && `grep tI18nPhrase $f`) {
        $I18NFILE = $f;
@@ -204,13 +204,28 @@
 # Collect all translated texts:
 
 open(F, $I18NFILE) || die "$I18NFILE: $!\n";
+$InComment = 0;
 while (<F>) {
       chomp;
       s/\t/ /g; # get rid of tabs
       s/  *$//; # get rid of trailing blanks
       s/^ *\/\/.*//; # remove comment lines
-      s/, *\/\/.*/,/; # strip trailing comments
+      s/ *\/\/.*//; # strip trailing comments
+      s/\/\*.*\*\///g; # strip c comments
+      if (/\/\*/) {
+         $InComment = 1;
+         s/\/\*.*$//; # remove start of comment
+         }
+      elsif (/\*\//) {
+         $InComment = 0;
+         s/^.*\*\///; # remove end of comment
+         }
+      elsif ($InComment) {
+         next;
+         }
       next if (/^ *$/); # skip empty lines
+      next if (/#if/);
+      next if (/#endif/);
       next unless ($found or $found = /const *tI18nPhrase .*{/); # sync on phrases
       next if (/const *tI18nPhrase .*{/); # skip sync line
       last if (/{ *NULL *}/); # stop after last phrase
@@ -324,7 +339,7 @@
          $_ .= " i18n";
          }
       elsif (/^clean:/) {
-	 $_ .= "\n\t\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot";
+         $_ .= "\n\t\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot";
          }
       print NEW "$_\n";
       }
diff --git a/i18n.c b/i18n.c
index 1673e5397..15853a0f5 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.308 2007/08/12 12:15:29 kls Exp $
+ * $Id: i18n.c 1.312 2007/08/19 14:10:46 kls Exp $
  *
  *
  */
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <libintl.h>
 #include <locale.h>
+#include <unistd.h>
 #include "tools.h"
 
 // TRANSLATORS: The name of the language, as written natively
@@ -67,6 +68,7 @@ static cStringList LanguageLocales;
 static cStringList LanguageNames;
 static cStringList LanguageCodes;
 
+static int NumLocales = 1;
 static int CurrentLanguage = 0;
 
 static bool ContainsCode(const char *Codes, const char *Code)
@@ -90,6 +92,13 @@ static const char *SkipContext(const char *s)
   return p ? p + 1 : s;
 }
 
+static void SetEnvLanguage(const char *Locale)
+{
+  setenv("LANGUAGE", Locale, 1);
+  extern int _nl_msg_cat_cntr;
+  ++_nl_msg_cat_cntr;
+}
+
 void I18nInitialize(void)
 {
   LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
@@ -99,11 +108,13 @@ void I18nInitialize(void)
   bindtextdomain("vdr", I18nLocaleDir);
   cFileNameList Locales(I18nLocaleDir, true);
   if (Locales.Size() > 0) {
-     dsyslog("found %d locales in %s", Locales.Size(), I18nLocaleDir);
      char *OldLocale = strdup(setlocale(LC_MESSAGES, NULL));
      for (int i = 0; i < Locales.Size(); i++) {
-         if (i < I18N_MAX_LANGUAGES - 1) {
-            if (setlocale(LC_MESSAGES, Locales[i])) {
+         cString FileName = cString::sprintf("%s/%s/LC_MESSAGES/vdr.mo", I18nLocaleDir, Locales[i]);
+         if (access(FileName, F_OK) == 0) { // found a locale with VDR texts
+            if (i < I18N_MAX_LANGUAGES - 1) {
+               SetEnvLanguage(Locales[i]);
+               NumLocales++;
                if (strstr(OldLocale, Locales[i]) == OldLocale)
                   CurrentLanguage = LanguageLocales.Size();
                LanguageLocales.Append(strdup(Locales[i]));
@@ -117,12 +128,15 @@ void I18nInitialize(void)
                    }
                LanguageCodes.Append(strdup(Code));
                }
+            else {
+               esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
+               break;
+               }
             }
-         else
-            esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
          }
-     setlocale(LC_MESSAGES, OldLocale);
+     SetEnvLanguage(LanguageLocales[CurrentLanguage]);
      free(OldLocale);
+     dsyslog("found %d locales in %s", NumLocales - 1, I18nLocaleDir);
      }
   // Prepare any known language codes for which there was no locale:
   for (const char **lc = LanguageCodeList; *lc; lc++) {
@@ -144,7 +158,8 @@ void I18nInitialize(void)
 
 void I18nRegister(const char *Plugin)
 {
-  bindtextdomain(Plugin, I18nLocaleDir);
+  cString Domain = cString::sprintf("vdr-%s", Plugin);
+  bindtextdomain(Domain, I18nLocaleDir);
 }
 
 void I18nSetLocale(const char *Locale)
@@ -153,7 +168,7 @@ void I18nSetLocale(const char *Locale)
      int i = LanguageLocales.Find(Locale);
      if (i >= 0) {
         CurrentLanguage = i;
-        setlocale(LC_MESSAGES, Locale);
+        SetEnvLanguage(Locale);
         }
      else
         dsyslog("unknown locale: '%s'", Locale);
@@ -173,6 +188,11 @@ void I18nSetLanguage(int Language)
      }
 }
 
+int I18nNumLanguagesWithLocale(void)
+{
+  return NumLocales;
+}
+
 const cStringList *I18nLanguages(void)
 {
   return &LanguageNames;
@@ -180,6 +200,8 @@ const cStringList *I18nLanguages(void)
 
 const char *I18nTranslate(const char *s, const char *Plugin)
 {
+  if (!s)
+     return s;
   if (CurrentLanguage) {
      const char *t = s;
      if (Plugin)
diff --git a/i18n.h b/i18n.h
index 46c6a5e12..2d1c79bda 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.21 2007/08/10 13:53:57 kls Exp $
+ * $Id: i18n.h 1.23 2007/08/19 14:07:17 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -36,9 +36,16 @@ int I18nCurrentLanguage(void);
 void I18nSetLanguage(int Language);
    ///< Sets the current language index to Language. If Language is outside
    ///< the range of available languages, nothing happens.
+int I18nNumLanguagesWithLocale(void);
+   ///< Returns the number of entries in the list returned by I18nLanguages()
+   ///< that actually have a locale.
 const cStringList *I18nLanguages(void);
    ///< Returns the list of available languages. Values returned by
    ///< I18nCurrentLanguage() are indexes into this list.
+   ///< Only the first I18nNumLanguagesWithLocale() entries in this list
+   ///< have an actual locale installed. The rest are just dummy entries
+   ///< to allow having three letter language codes for other languages
+   ///< that have no actual locale on this system.
 const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1);
    ///< Translates the given string (with optional Plugin context) into
    ///< the current language. If no translation is available, the original
@@ -72,7 +79,7 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
    ///< the second one (like "deu" out of ""eng+deu").
 
 #ifdef PLUGIN_NAME_I18N
-#define tr(s)  I18nTranslate(s, PLUGIN_NAME_I18N)
+#define tr(s)  I18nTranslate(s, "vdr-" PLUGIN_NAME_I18N)
 #else
 #define tr(s)  I18nTranslate(s)
 #endif
diff --git a/menu.c b/menu.c
index 69621efbb..4d94b6108 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.459 2007/08/12 10:44:35 kls Exp $
+ * $Id: menu.c 1.460 2007/08/18 09:03:05 kls Exp $
  */
 
 #include "menu.h"
@@ -2205,7 +2205,7 @@ void cMenuSetupOSD::Set(void)
   useSmallFontTexts[2] = tr("always");
   Clear();
   SetSection(tr("OSD"));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &osdLanguageIndex, I18nLanguages()->Size(), &I18nLanguages()->At(0)));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &osdLanguageIndex, I18nNumLanguagesWithLocale(), &I18nLanguages()->At(0)));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"),                   &skinIndex, numSkins, skinDescriptions));
   if (themes.NumThemes())
   Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"),                  &themeIndex, themes.NumThemes(), themes.Descriptions()));
diff --git a/menuitems.c b/menuitems.c
index 44661ec15..a900e4a8b 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.50 2007/08/04 09:12:18 kls Exp $
+ * $Id: menuitems.c 1.51 2007/08/17 13:48:07 kls Exp $
  */
 
 #include "menuitems.h"
@@ -222,7 +222,8 @@ cMenuEditChrItem::~cMenuEditChrItem()
 void cMenuEditChrItem::Set(void)
 {
   char buf[2];
-  snprintf(buf, sizeof(buf), "%c", *value);
+  buf[0] = *value;
+  buf[1] = '\0';
   SetValue(buf);
 }
 
@@ -490,9 +491,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                  break;
     case kBlue|k_Repeat:
     case kBlue:  // consume the key only if in edit-mode
-                 if (InEditMode())
-                    ;
-                 else
+                 if (!InEditMode())
                     return osUnknown;
                  break;
     case kLeft|k_Repeat:
diff --git a/newplugin b/newplugin
index c35ae7e6b..368007b13 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.34 2007/08/12 11:04:39 kls Exp $
+# $Id: newplugin 1.36 2007/08/19 14:19:49 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -108,6 +108,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
 OBJS = \$(PLUGIN).o
 
+### The main target:
+
+all: libvdr-\$(PLUGIN).so i18n
+
 ### Implicit rules:
 
 %.o: %.c
@@ -144,13 +148,11 @@ i18n: \$(I18Nmo)
 	\@mkdir -p \$(LOCALEDIR)
 	for i in \$(I18Ndirs); do\\
 	    mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\
-	    cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/\$(PLUGIN).mo;\\
+	    cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/vdr-\$(PLUGIN).mo;\\
 	    done
 
 ### Targets:
 
-all: libvdr-\$(PLUGIN).so i18n
-
 libvdr-\$(PLUGIN).so: \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
 	\@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
diff --git a/nit.c b/nit.c
index 9291c9604..ba80a68ff 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.14 2007/04/29 11:35:33 kls Exp $
+ * $Id: nit.c 1.15 2007/08/17 14:02:45 kls Exp $
  */
 
 #include "nit.h"
@@ -140,13 +140,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         }
                     break;
                     }
-                 bool found = false;
-                 for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                     if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 5) {
-                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
+                 if (Setup.UpdateChannels >= 5) {
+                    bool found = false;
+                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                        if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           int transponder = Channel->Transponder();
+                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
+                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), transponder)) {
                                      Frequency = Frequencies[n];
                                      break;
                                      }
@@ -157,16 +158,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                         found = true;
                         }
-                     }
-                 if (!found && Setup.UpdateChannels >= 5) {
-                    for (int n = 0; n < NumFrequencies; n++) {
-                        cChannel *Channel = new cChannel;
-                        Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                        if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
-                           EITScanner.AddTransponder(Channel);
-                        else
-                           delete Channel;
-                        }
+                    if (!found) {
+                       for (int n = 0; n < NumFrequencies; n++) {
+                           cChannel *Channel = new cChannel;
+                           Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
+                              EITScanner.AddTransponder(Channel);
+                           else
+                              delete Channel;
+                           }
+                       }
                     }
                  }
                  break;
@@ -190,13 +191,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         }
                     break;
                     }
-                 bool found = false;
-                 for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                     if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 5) {
-                           if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
+                 if (Setup.UpdateChannels >= 5) {
+                    bool found = false;
+                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                        if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           int transponder = Channel->Transponder();
+                           if (!ISTRANSPONDER(Frequency / 1000, transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
+                                  if (ISTRANSPONDER(Frequencies[n] / 1000, transponder)) {
                                      Frequency = Frequencies[n];
                                      break;
                                      }
@@ -207,16 +209,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                         found = true;
                         }
-                     }
-                 if (!found && Setup.UpdateChannels >= 5) {
-                    for (int n = 0; n < NumFrequencies; n++) {
-                        cChannel *Channel = new cChannel;
-                        Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                        if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
-                           EITScanner.AddTransponder(Channel);
-                        else
-                           delete Channel;
-                        }
+                    if (!found) {
+                        for (int n = 0; n < NumFrequencies; n++) {
+                           cChannel *Channel = new cChannel;
+                           Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                           if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
+                              EITScanner.AddTransponder(Channel);
+                           else
+                              delete Channel;
+                           }
+                       }
                     }
                  }
                  break;
@@ -247,13 +249,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         }
                     break;
                     }
-                 bool found = false;
-                 for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                     if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                        if (Setup.UpdateChannels >= 5) {
-                           if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
+                 if (Setup.UpdateChannels >= 5) {
+                    bool found = false;
+                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                        if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           int transponder = Channel->Transponder();
+                           if (!ISTRANSPONDER(Frequency / 1000000, transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
+                                  if (ISTRANSPONDER(Frequencies[n] / 1000000, transponder)) {
                                      Frequency = Frequencies[n];
                                      break;
                                      }
@@ -264,15 +267,15 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                         found = true;
                         }
-                     }
-                 if (!found && Setup.UpdateChannels >= 5) {
-                    for (int n = 0; n < NumFrequencies; n++) {
-                        cChannel *Channel = new cChannel;
-                        Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                        if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
-                           EITScanner.AddTransponder(Channel);
-                        else
-                           delete Channel;
+                    if (!found) {
+                       for (int n = 0; n < NumFrequencies; n++) {
+                           cChannel *Channel = new cChannel;
+                           Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
+                              EITScanner.AddTransponder(Channel);
+                           else
+                              delete Channel;
+                           }
                         }
                     }
                  }
diff --git a/osd.c b/osd.c
index 3be8fc7f6..5624c2632 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.72 2007/08/12 11:33:17 kls Exp $
+ * $Id: osd.c 1.73 2007/08/17 15:23:50 kls Exp $
  */
 
 #include "osd.h"
@@ -449,13 +449,13 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
      int w = Font->Width(s);
      int h = Font->Height();
      int limit = 0;
+     int cw = Width ? Width : w;
+     int ch = Height ? Height : h;
+     if (!Intersects(x, y, x + cw - 1, y + ch - 1))
+        return;
+     if (ColorBg != clrTransparent)
+        DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
      if (Width || Height) {
-        int cw = Width ? Width : w;
-        int ch = Height ? Height : h;
-        if (!Intersects(x, y, x + cw - 1, y + ch - 1))
-           return;
-        if (ColorBg != clrTransparent)
-           DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
         limit = x + cw - x0;
         if (Width) {
            if ((Alignment & taLeft) != 0)
@@ -482,8 +482,6 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
               }
            }
         }
-     else if (!Intersects(x, y, x + w - 1, y + h - 1))
-        return;
      x -= x0;
      y -= y0;
      Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index a23a19e7f..72093c1c0 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -38,12 +38,12 @@ msgid "No title"
 msgstr ""
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Catal�"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "cat"
 
@@ -396,7 +396,7 @@ msgstr "Propietats del canal duplicades!"
 msgid "Channels"
 msgstr "Canals"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Esborrar"
 
@@ -1001,7 +1001,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Aquest plugin no admet configuraci�!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configuraci�"
 
@@ -1076,7 +1076,7 @@ msgstr ""
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
 
@@ -1113,23 +1113,23 @@ msgstr " a
 msgid "yes"
 msgstr "s�"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Inserir"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Sobrescriure"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1234,39 +1234,39 @@ msgstr "Dissabte"
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Prem qualsevol tecla per cancel�lar l'aturada"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Canviant a la interf�cie DVB prim�ria..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Proc�s d'edici� fallit!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proc�s d'edici� finalitzat"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 08f454c35..07439ab02 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "Bez n�zvu"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "�esky"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "cze"
 
@@ -394,7 +394,7 @@ msgstr "Nastaven
 msgid "Channels"
 msgstr "Kan�ly"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Smazat"
 
@@ -999,7 +999,7 @@ msgstr "Moduly"
 msgid "This plugin has no setup parameters!"
 msgstr "Modul nem� konfigura�n� parametry!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Nastaven�"
 
@@ -1074,7 +1074,7 @@ msgstr "Zvuk nen
 msgid "Not enough disk space to start recording!"
 msgstr "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "��dn� DVB karta nen� voln� pro nahr�v�n�"
 
@@ -1111,23 +1111,23 @@ msgstr " a
 msgid "yes"
 msgstr "ano"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Vlo�it"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "P�epsat"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Modul"
 
@@ -1232,39 +1232,39 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Ned�le"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Brzo za�ne nahr�v�n� VPS!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Za�alo nahr�v�n�"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Jak�koliv kl�vesa zru�� vypnut�"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "P�epnout prim�rn� DVB..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Edita�n� proces selhal!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Edita�n� proces skon�il"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index b3bca8aae..61ff64244 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "Ingen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Dansk"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "dan"
 
@@ -394,7 +394,7 @@ msgstr "Kanalindstillinger er ikke entydige!"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Slet"
 
@@ -999,7 +999,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Denne plugin har ingen parametre"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Indstillinger"
 
@@ -1074,7 +1074,7 @@ msgstr "Ingen lyd tilg
 msgid "Not enough disk space to start recording!"
 msgstr "For lidt harddisk plads til optagelse!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ingen fri DVB enhed til optagelse!"
 
@@ -1111,23 +1111,23 @@ msgstr " abcdefghijklmnopqrstuvwxyz
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Inds�t"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Overskriv"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1232,39 +1232,39 @@ msgstr "L
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS optagelse starter snart!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Optagelse startet"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Tryk vilk�rlig tast for at annullere sluk"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Skifter prim�r DVB enhed..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Redigeringsproces fejlede!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigeringsproces afsluttet"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 1e70b1c3f..0da285cbd 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "Kein Titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Deutsch"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "deu"
 
@@ -394,7 +394,7 @@ msgstr "Kanaleinstellungen sind nicht eindeutig!"
 msgid "Channels"
 msgstr "Kan�le"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "L�schen"
 
@@ -999,7 +999,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Dieses Plugin hat keine Parameter!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -1074,7 +1074,7 @@ msgstr "Kein Audio verf
 msgid "Not enough disk space to start recording!"
 msgstr "Nicht gen�gend Plattenplatz f�r Aufnahme!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Keine freie DVB-Karte zum Aufnehmen!"
 
@@ -1111,23 +1111,23 @@ msgstr " a
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Einf�gen"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�berschreiben"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1232,39 +1232,39 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-Aufnahme beginnt in K�rze!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR schaltet sp�ter aus - Power zum erzwingen"
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Taste dr�cken, um Ausschalten abzubrechen"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Prim�res Interface wird umgeschaltet..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Schnitt gescheitert!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Schnitt beendet"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Taste dr�cken, um Neustart abzubrechen"
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR wird in %s Minuten ausschalten"
diff --git a/po/el_GR.po b/po/el_GR.po
index d08fd2e03..363246db9 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "����� �����"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "��������"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "ell"
 
@@ -394,7 +394,7 @@ msgstr "
 msgid "Channels"
 msgstr "�������"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "��������"
 
@@ -999,7 +999,7 @@ msgstr "
 msgid "This plugin has no setup parameters!"
 msgstr "���� � �������� ��� ���� �����������!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "���������"
 
@@ -1074,7 +1074,7 @@ msgstr "
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "���������� DVB ������ ��� �������!"
 
@@ -1111,23 +1111,23 @@ msgstr " 
 msgid "yes"
 msgstr "���"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "AB�/���"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "��������"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�������������"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "��������"
 
@@ -1232,39 +1232,39 @@ msgstr "
 msgid "Sunday"
 msgstr "�������"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "����� ��� ������� ��� ������� �����������"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "� ����� DVB ����� �������..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "� ����������� �������!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "� ����������� ��������"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 1314aa7aa..bab0dfaca 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "Sin t�tulo"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Espa�ol"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "esl"
 
@@ -394,7 +394,7 @@ msgstr "!Propiedades de canal duplicadas!"
 msgid "Channels"
 msgstr "Canales"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Borrar"
 
@@ -999,7 +999,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Este plugin no admite configuraci�n"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configuraci�n"
 
@@ -1074,7 +1074,7 @@ msgstr "
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "�Ning�n dispositivo DVB disponible para grabar!"
 
@@ -1111,23 +1111,23 @@ msgstr " a
 msgid "yes"
 msgstr "s�"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Insertar"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Sobreescribir"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1232,39 +1232,39 @@ msgstr "S
 msgid "Sunday"
 msgstr "Domingo"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Iniciando grabaci�n"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pulse una tecla para interrumpir apagar"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Cambiando el interfaz DVB primario..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "�Proceso de edici�n fallido!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proceso de edici�n terminado"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 989a14f4e..56b8382be 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "Pealkiri puudub"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "eesti"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "est"
 
@@ -394,7 +394,7 @@ msgstr "Kanaliseaded ei ole unikaalsed!"
 msgid "Channels"
 msgstr "Kanalid"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Kustuta"
 
@@ -999,7 +999,7 @@ msgstr "Laiendusmoodulid"
 msgid "This plugin has no setup parameters!"
 msgstr "Sellel laienudusmoodulil ei ole seadeid!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "S�tted"
 
@@ -1074,7 +1074,7 @@ msgstr "Audio k
 msgid "Not enough disk space to start recording!"
 msgstr "Ebapiisavalt kettaruumi salvestamise alustamiseks!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Puudub vaba DVB seade salvestamiseks!"
 
@@ -1111,23 +1111,23 @@ msgstr " abcdefghijklmnopqrs
 msgid "yes"
 msgstr "jah"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Lisa (INS)"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Asenda (OVR)"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Laiendusmoodul"
 
@@ -1232,39 +1232,39 @@ msgstr "Laup
 msgid "Sunday"
 msgstr "P�hap�ev"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS salvestamine tulekul!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Salvestamine algas"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR l�litub v�lja hiljem - vajuta Power kiirendamiseks"
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Esmase DVB seadme �mberl�litus..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Redigeerimine eba�nnestus"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigeerimine l�petatud"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR l�litub v�lja %s minuti p�rast"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f44f3c198..09b83b4fe 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
-msgstr "*** Virheellinen kanavavalinta! ***"
+msgstr "*** Virheellinen kanavavalinta ***"
 
 #: device.c:634 device.c:670
 msgid "Channel not available!"
@@ -39,12 +39,12 @@ msgid "No title"
 msgstr "Ei esityst�"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "suomi"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "fin"
 
@@ -243,39 +243,39 @@ msgstr "Komennot"
 
 #: keys.c:58
 msgid "Key$User1"
-msgstr ""
+msgstr "Lis�n�pp�in 1"
 
 #: keys.c:59
 msgid "Key$User2"
-msgstr ""
+msgstr "Lis�n�pp�in 2"
 
 #: keys.c:60
 msgid "Key$User3"
-msgstr ""
+msgstr "Lis�n�pp�in 3"
 
 #: keys.c:61
 msgid "Key$User4"
-msgstr ""
+msgstr "Lis�n�pp�in 4"
 
 #: keys.c:62
 msgid "Key$User5"
-msgstr ""
+msgstr "Lis�n�pp�in 5"
 
 #: keys.c:63
 msgid "Key$User6"
-msgstr ""
+msgstr "Lis�n�pp�in 6"
 
 #: keys.c:64
 msgid "Key$User7"
-msgstr ""
+msgstr "Lis�n�pp�in 7"
 
 #: keys.c:65
 msgid "Key$User8"
-msgstr ""
+msgstr "Lis�n�pp�in 8"
 
 #: keys.c:66
 msgid "Key$User9"
-msgstr ""
+msgstr "Lis�n�pp�in 9"
 
 #: menu.c:69
 msgid "Free To Air"
@@ -397,7 +397,7 @@ msgstr "Kanava-asetukset eiv
 msgid "Channels"
 msgstr "Kanavat"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Poista"
 
@@ -550,7 +550,7 @@ msgstr "Sy
 
 #: menu.c:1754
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CA-moduuli ei vastaa!"
 
 #: menu.c:1784
 msgid "Recording info"
@@ -840,15 +840,15 @@ msgstr "LNB-yl
 
 #: menu.c:2560
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM nollaus"
 
 #: menu.c:2561
 msgid "CAM present"
-msgstr ""
+msgstr "CAM havaittu"
 
 #: menu.c:2562
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM valmis"
 
 #: menu.c:2585 menu.c:2815
 msgid "CAM"
@@ -872,11 +872,11 @@ msgstr "CA-moduulin valikko ei saatavilla"
 
 #: menu.c:2624
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CA-moduuli k�yt�ss� - nollataanko?"
 
 #: menu.c:2626
 msgid "Can't reset CAM!"
-msgstr "CA-moduulin palautus alkutilaan ep�onnistui!"
+msgstr "CA-moduulin nollaus ep�onnistui!"
 
 #: menu.c:2660 menu.c:2816
 msgid "Recording"
@@ -1002,7 +1002,7 @@ msgstr "Laajennokset"
 msgid "This plugin has no setup parameters!"
 msgstr "T�ll� laajennoksella ei ole asetuksia!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -1077,7 +1077,7 @@ msgstr "
 msgid "Not enough disk space to start recording!"
 msgstr "Tallennustilan puute est�� tallennuksen!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ei vapaata DVB-viritint� tallennukselle!"
 
@@ -1114,23 +1114,23 @@ msgstr " abcdefghijklmnopqrstuvwxyz
 msgid "yes"
 msgstr "kyll�"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Lis��"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Korvaa"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Laajennos"
 
@@ -1235,39 +1235,39 @@ msgstr "Lauantai"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-tallennus on alkamassa!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR sammuu my�hemmin - pakota virtan�pp�imell�"
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Peru sammutus painamalla mit� tahansa n�pp�int�"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Muokkaus ep�onnistui!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Muokkaus valmis"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Peru uudelleenk�ynnistys painamalla mit� tahansa n�pp�int�"
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR sammuu %s minuutin kuluttua"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index b9622af9e..4e5551cbf 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -5,14 +5,16 @@
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003
 # Gregoire Favre <greg@magma.unil.ch>, 2003
 # Nicolas Huillard <nhuillard@e-dition.fr>, 2005
+# Pierre Briec <pbriec@free.fr>, 2006
+# Bruno Roussel <bruno.roussel@free.fr>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"PO-Revision-Date: 2007-08-17 13:45+0200\n"
+"Last-Translator: Bruno Roussel <bruno.roussel@free.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -20,15 +22,15 @@ msgstr ""
 
 #: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
-msgstr "*** Cha�ne invalide! ***"
+msgstr "*** Cha�ne invalide ! ***"
 
 #: device.c:634 device.c:670
 msgid "Channel not available!"
-msgstr "Cha�ne non disponible!"
+msgstr "Cha�ne non disponible !"
 
 #: device.c:636
 msgid "Can't start Transfer Mode!"
-msgstr "Impossible d'utiliser le mode transfert!"
+msgstr "Impossible d'utiliser le mode transfert !"
 
 #: eitscan.c:159
 msgid "Starting EPG scan"
@@ -39,12 +41,12 @@ msgid "No title"
 msgstr "Sans titre"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Fran�ais"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "fra"
 
@@ -58,7 +60,7 @@ msgstr "Appuyer sur une touche de la t
 
 #: interface.c:79
 msgid "RC code detected!"
-msgstr "Code de la t�l�commande d�tect�!"
+msgstr "Code de la t�l�commande d�tect� !"
 
 #: interface.c:80
 msgid "Do not press any key..."
@@ -243,39 +245,39 @@ msgstr "Commandes"
 
 #: keys.c:58
 msgid "Key$User1"
-msgstr ""
+msgstr "Utilisateur1"
 
 #: keys.c:59
 msgid "Key$User2"
-msgstr ""
+msgstr "Utilisateur2"
 
 #: keys.c:60
 msgid "Key$User3"
-msgstr ""
+msgstr "Utilisateur3"
 
 #: keys.c:61
 msgid "Key$User4"
-msgstr ""
+msgstr "Utilisateur4"
 
 #: keys.c:62
 msgid "Key$User5"
-msgstr ""
+msgstr "Utilisateur5"
 
 #: keys.c:63
 msgid "Key$User6"
-msgstr ""
+msgstr "Utilisateur6"
 
 #: keys.c:64
 msgid "Key$User7"
-msgstr ""
+msgstr "Utilisateur7"
 
 #: keys.c:65
 msgid "Key$User8"
-msgstr ""
+msgstr "Utilisateur8"
 
 #: keys.c:66
 msgid "Key$User9"
-msgstr ""
+msgstr "Utilisateur9"
 
 #: menu.c:69
 msgid "Free To Air"
@@ -391,13 +393,13 @@ msgstr "Hi
 
 #: menu.c:312
 msgid "Channel settings are not unique!"
-msgstr "Caract�ristiques des cha�nes ne sont pas uniques"
+msgstr "Caract�ristiques des cha�nes non uniques"
 
 #: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Cha�nes"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Supprimer"
 
@@ -415,11 +417,11 @@ msgstr "Nouveau"
 
 #: menu.c:512
 msgid "Channel is being used by a timer!"
-msgstr "Cette cha�ne est en cours d'utilisation!"
+msgstr "Cette cha�ne est en cours d'utilisation !"
 
 #: menu.c:515
 msgid "Delete channel?"
-msgstr "Supprimer la cha�ne?"
+msgstr "Supprimer la cha�ne ?"
 
 #: menu.c:652
 msgid "Edit timer"
@@ -479,11 +481,11 @@ msgstr "Marche/Arr"
 
 #: menu.c:890
 msgid "Delete timer?"
-msgstr "Supprimer la programmation?"
+msgstr "Supprimer la programmation ?"
 
 #: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
-msgstr "Enregistrement en cours - confirmez la suppression"
+msgstr "Enregistrement en cours - suppression confirm�e ?"
 
 #: menu.c:948
 msgid "Event"
@@ -511,7 +513,7 @@ msgstr "Programmes en cours"
 
 #: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
-msgstr "Apr�s"
+msgstr "Apr�s"
 
 #: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
@@ -523,7 +525,7 @@ msgstr "Programme"
 
 #: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
-msgstr "Impossible de changer de cha�ne!"
+msgstr "Impossible de changer de cha�ne !"
 
 #: menu.c:1283
 #, c-format
@@ -541,16 +543,16 @@ msgstr "Cet 
 
 #: menu.c:1342
 msgid "All events - all channels"
-msgstr "Tous les �v�nements - toutes cha�nes"
+msgstr "Tous les �v�nements - toutes les cha�nes"
 
 #: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Veuillez entrer %d chiffres!"
+msgstr "Veuillez entrer %d chiffres !"
 
 #: menu.c:1754
 msgid "CAM not responding!"
-msgstr ""
+msgstr "Pas de r�ponse de la CAM"
 
 #: menu.c:1784
 msgid "Recording info"
@@ -578,15 +580,15 @@ msgstr "Commandes"
 
 #: menu.c:1970
 msgid "Error while accessing recording!"
-msgstr "Impossible d'acc�der � l'enregistrement"
+msgstr "Impossible d'acc�der � l'enregistrement"
 
 #: menu.c:2028
 msgid "Delete recording?"
-msgstr "Supprimer l'enregistrement?"
+msgstr "Supprimer l'enregistrement ?"
 
 #: menu.c:2058
 msgid "Error while deleting recording!"
-msgstr "Erreur de suppression de l'enregistrement!"
+msgstr "Erreur de suppression de l'enregistrement !"
 
 #: menu.c:2089
 msgid "Recording commands"
@@ -642,35 +644,35 @@ msgstr "Dur
 
 #: menu.c:2217
 msgid "Setup.OSD$Use small font"
-msgstr "Utiliser les petits caract�res"
+msgstr "Utiliser les petites polices"
 
 #: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-aliasing"
 
 #: menu.c:2219
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Police par d�faut"
 
 #: menu.c:2220
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Petite police"
 
 #: menu.c:2221
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Police taille fixe"
 
 #: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Taille police par d�faut (pixel)"
 
 #: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Taille petite police par d�faut (pixel)"
 
 #: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Taille police fixe par d�faut (pixel)"
 
 #: menu.c:2225
 msgid "Setup.OSD$Channel info position"
@@ -840,19 +842,19 @@ msgstr "Fr
 
 #: menu.c:2560
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM remise � z�ro"
 
 #: menu.c:2561
 msgid "CAM present"
-msgstr ""
+msgstr "CAM pr�sente"
 
 #: menu.c:2562
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM pr�te"
 
 #: menu.c:2585 menu.c:2815
 msgid "CAM"
-msgstr "Acc�s conditionnel"
+msgstr "Acc�s conditionnel"
 
 #: menu.c:2590
 msgid "Button$Menu"
@@ -868,15 +870,15 @@ msgstr "Ouverture du menu CAM"
 
 #: menu.c:2615
 msgid "Can't open CAM menu!"
-msgstr "Impossible d'ouvrir le menu CAM!"
+msgstr "Impossible d'ouvrir le menu CAM !"
 
 #: menu.c:2624
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM en cours d'utilisation - Remettre � z�ro ?"
 
 #: menu.c:2626
 msgid "Can't reset CAM!"
-msgstr "Impossible de r�initialiser la CAM!"
+msgstr "Impossible de r�initialiser la CAM !"
 
 #: menu.c:2660 menu.c:2816
 msgid "Recording"
@@ -980,7 +982,7 @@ msgstr "Prise en compte cha
 
 #: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Entr�e cha�ne timeout (ms)"
 
 #: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
@@ -1002,7 +1004,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Ce plugin n'a pas de param�tres!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configuration"
 
@@ -1012,7 +1014,7 @@ msgstr "Red
 
 #: menu.c:2826
 msgid "Really restart?"
-msgstr "Red�marrer?"
+msgstr "Vraiment red�marrer ?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 #: menu.c:2878
@@ -1063,23 +1065,23 @@ msgstr " Annuler le montage"
 
 #: menu.c:3038
 msgid "Stop recording?"
-msgstr "Arr�ter l'enregistrement?"
+msgstr "Arr�ter l'enregistrement ?"
 
 #: menu.c:3046
 msgid "Cancel editing?"
-msgstr "Annuler les modifications?"
+msgstr "Annuler les modifications ?"
 
 #: menu.c:3526
 msgid "No audio available!"
-msgstr ""
+msgstr "Pas d'audio disponible !"
 
 #: menu.c:3736
 msgid "Not enough disk space to start recording!"
-msgstr "Espace disque insuffisant pour d�marrer l'enregistrement!"
+msgstr "Espace disque insuffisant pour d�marrer l'enregistrement !"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
-msgstr "Pas de carte DVB disponible pour l'enregistrement!"
+msgstr "Pas de carte DVB disponible pour l'enregistrement !"
 
 #: menu.c:3797
 msgid "Pausing live video..."
@@ -1088,15 +1090,15 @@ msgstr "Pause de l'
 #. TRANSLATORS: note the trailing blank!
 #: menu.c:4040
 msgid "Jump: "
-msgstr "Acc�s direct: "
+msgstr "Acc�s direct : "
 
 #: menu.c:4184
 msgid "No editing marks defined!"
-msgstr "Pas de marques d'�dition d�finies!"
+msgstr "Pas de marques d'�dition d�finies !"
 
 #: menu.c:4186
 msgid "Can't start editing process!"
-msgstr "Impossible de commencer le montage!"
+msgstr "Impossible de commencer le montage !"
 
 #: menu.c:4188
 msgid "Editing process started"
@@ -1104,7 +1106,7 @@ msgstr "Op
 
 #: menu.c:4191
 msgid "Editing process already active!"
-msgstr "Montage d�j� en cours!"
+msgstr "Montage d�j� en cours !"
 
 #: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
@@ -1114,23 +1116,23 @@ msgstr " a
 msgid "yes"
 msgstr "oui"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Ins�rer"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
-msgstr "�craser"
+msgstr "Ecraser"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1140,23 +1142,23 @@ msgstr "Haut/Bas -> nouvelle place - OK -> d
 
 #: player.c:84
 msgid "Channel locked (recording)!"
-msgstr "Cha�ne verrouill�e (enregistrement en cours)!"
+msgstr "Cha�ne verrouill�e (enregistrement en cours) !"
 
 #: recording.c:189
 msgid "Low disk space!"
-msgstr "Disque presque plein!"
+msgstr "Disque presque plein !"
 
 #: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Arr�t impossible - option '-s' absente!"
+msgstr "Arr�t impossible - option '-s' absente !"
 
 #: shutdown.c:152
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Edition en cours - confirmez l'arr�t ?"
 
 #: shutdown.c:162
 msgid "Recording - shut down anyway?"
-msgstr "Enregistrement en cours - confirmez l'arr�t"
+msgstr "Enregistrement en cours - confirmez l'arr�t ?"
 
 #: shutdown.c:169
 #, c-format
@@ -1170,19 +1172,19 @@ msgstr "confirmez l'arr
 #: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Le plugin %s d�marre dans %ld min, continuer ?"
 
 #: shutdown.c:195
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Edition en cours - red�marrer ?"
 
 #: shutdown.c:205
 msgid "Recording - restart anyway?"
-msgstr "Enregistrement en cours - red�marrer?"
+msgstr "Enregistrement en cours - red�marrer ?"
 
 #: shutdown.c:209
 msgid "restart anyway?"
-msgstr "red�marrer?"
+msgstr "red�marrer ?"
 
 #. TRANSLATORS: note the trailing blank!
 #: skinclassic.c:553
@@ -1235,39 +1237,39 @@ msgstr "Samedi"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Enregistrement VPS commence procha�nement"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Enregistrement a commenc�"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR doit s'arr�ter plus tard - Appuyer sur Power pour forcer"
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Appuyez sur une touche pour annuler l'arr�t"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Changement de carte DVB primaire..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
-msgstr "Echec du montage!"
+msgstr "Echec du montage !"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Montage termin�"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Appuyer sur une touche pour annuler le red�marrage"
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR s'arr�tera dans %s minutes"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 698810c5d..1798657c1 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
 msgstr "Bez titla"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Hrvatski"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "hrv"
 
@@ -395,7 +395,7 @@ msgstr "Parametri programa nisu jednozna
 msgid "Channels"
 msgstr "Programi"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Obri�i"
 
@@ -1000,7 +1000,7 @@ msgstr "Dodaci (Plugins)"
 msgid "This plugin has no setup parameters!"
 msgstr "Ovaj dodatak (Plugin) nema parametara!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Konfiguracija"
 
@@ -1075,7 +1075,7 @@ msgstr "Audio nedostupan"
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nema slobodnog DVB ure�aja za snimanje!"
 
@@ -1112,23 +1112,23 @@ msgstr " abc
 msgid "yes"
 msgstr "da"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Umetni"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Prepi�i"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1233,39 +1233,39 @@ msgstr "Subota"
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite tipku ako ne �elite ugasiti sistem"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Preklapanje primarnog DVB ure�aja..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Rezanje neuspje�no!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Rezanje zavr�eno"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b210525cc..495aa40e5 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
 msgstr "n�v n�lk�l"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Magyar"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "hun"
 
@@ -395,7 +395,7 @@ msgstr "Az ad
 msgid "Channels"
 msgstr "Csatorn�k"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "T�r�lni"
 
@@ -1000,7 +1000,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Ennek a plugin-nak nincs setup-parametere!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Be�ll�t�sok"
 
@@ -1075,7 +1075,7 @@ msgstr "Hang nem lehets
 msgid "Not enough disk space to start recording!"
 msgstr "Nincs elegend� hely a felv�telre"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nincs szabad DVB k�rtya a felv�telhez!"
 
@@ -1112,23 +1112,23 @@ msgstr " a
 msgid "yes"
 msgstr "igen"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Beilleszteni"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�t�rni"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1233,39 +1233,39 @@ msgstr "Szombat"
 msgid "Sunday"
 msgstr "Vas�rnap"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-felv�tel r�gt�n kezd�dik!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "A felv�tel elinditva Nd"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Prim�r Interface �tkapcsolva..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "V�g�s sikertelen!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "V�g�s befejezve"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index ccf17415d..e87b05fbf 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -38,12 +38,12 @@ msgid "No title"
 msgstr "Senza titolo"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Italiano"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "ita"
 
@@ -396,7 +396,7 @@ msgstr "Parametri canale non univoci!"
 msgid "Channels"
 msgstr "Canali"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Cancella"
 
@@ -1001,7 +1001,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Questo plugin non ha parametri di configurazione!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Opzioni"
 
@@ -1076,7 +1076,7 @@ msgstr "Nessun audio disponibile!"
 msgid "Not enough disk space to start recording!"
 msgstr "Spazio su disco insufficiente per registrare!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nessuna periferica DVB disponibile per registrare!"
 
@@ -1113,23 +1113,23 @@ msgstr " a
 msgid "yes"
 msgstr "si"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Inserisci"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Sovrascrivi"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1234,39 +1234,39 @@ msgstr "Sabato"
 msgid "Sunday"
 msgstr "Domenica"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Registrazione VPS imminente!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Registrazione avviata"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Premere un tasto per annullare lo spegnimento"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Cambio su card DVB primaria..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Processo di modifica fallito!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Processo di modifica terminato"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 19c351428..f06f56ffb 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -38,12 +38,12 @@ msgid "No title"
 msgstr "Geen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Nederlands"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "dut"
 
@@ -396,7 +396,7 @@ msgstr "Kanaalinstellingen zijn niet uniek!"
 msgid "Channels"
 msgstr "Kanalen"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Verwijder"
 
@@ -1001,7 +1001,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr "Deze plugin heeft geen instelparameters"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Instellingen"
 
@@ -1076,7 +1076,7 @@ msgstr "Geen audio beschikbaar!"
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Geen vrije DVB kaart om op te nemen!"
 
@@ -1113,23 +1113,23 @@ msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Invoegen"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Overschrijven"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1234,39 +1234,39 @@ msgstr "Zaterdag"
 msgid "Sunday"
 msgstr "Zondag"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Druk een toets om shutdown af te breken"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Eerste DVB-kaart wordt omgeschakeld..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Bewerken is mislukt!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Bewerken is klaar"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 25d074b60..62e3a5994 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
 msgstr ""
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Norsk"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "nor"
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "Channels"
 msgstr "Kanaler"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Slett"
 
@@ -1000,7 +1000,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr ""
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Konfigurasjon"
 
@@ -1075,7 +1075,7 @@ msgstr "Pas d'audio disponible!"
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ingen ledige DVB enheter for opptak!"
 
@@ -1112,23 +1112,23 @@ msgstr ""
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr ""
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1233,39 +1233,39 @@ msgstr "L
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Trykk en tast for ikke � sl� av"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Bytter f�rste DVB-enhet..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Feil under redigering!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigeringsprosess avsluttet"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d782eff75..60b93ac7d 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "Bez tytu�u"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Polski"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "pol"
 
@@ -394,7 +394,7 @@ msgstr "Ustawienia kana
 msgid "Channels"
 msgstr "Kana�y"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Usu�"
 
@@ -999,7 +999,7 @@ msgstr "Wtyczki"
 msgid "This plugin has no setup parameters!"
 msgstr "Ta wtyczka nie ma �adnych ustawie�!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Ustawienia"
 
@@ -1074,7 +1074,7 @@ msgstr "D
 msgid "Not enough disk space to start recording!"
 msgstr "Brak miejsca na dysku do nagrywania!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Brak wolnej karty DVB do nagrywania!"
 
@@ -1111,23 +1111,23 @@ msgstr " a
 msgid "yes"
 msgstr "tak"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Wstaw"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Nadpisz"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Wtyczka"
 
@@ -1232,39 +1232,39 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Wkr�tce nagranie VPS!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Naci�nij dowolny klawisz aby nie wy��cza�"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Prz곱czam na pierwszy interfejs DVB..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Proces edycji nie powi�d� si�!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proces edycji zako�czony"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8bab256ad..ff15f57c5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr ""
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Portugu�s"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "por"
 
@@ -394,7 +394,7 @@ msgstr ""
 msgid "Channels"
 msgstr "Canais"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Apagar"
 
@@ -999,7 +999,7 @@ msgstr "Plugins"
 msgid "This plugin has no setup parameters!"
 msgstr ""
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configurar"
 
@@ -1074,7 +1074,7 @@ msgstr ""
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nenhuma placa DVB disponivel para gravar!"
 
@@ -1111,23 +1111,23 @@ msgstr ""
 msgid "yes"
 msgstr "sim"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr ""
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr ""
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -1232,39 +1232,39 @@ msgstr "S
 msgid "Sunday"
 msgstr "Domingo"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pressione qualquer tecla para cancelar"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "A mudar interface DVB prim�rio..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Falha no processo de modifica��o"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Processo de modifica��o terminado"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f2edbec75..933389e9e 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
 msgstr "F�r� titlu"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Rom�n�"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "rom"
 
@@ -395,7 +395,7 @@ msgstr "Parametrii canalului nu sunt univoci!"
 msgid "Channels"
 msgstr "Canale"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "�terge"
 
@@ -1000,7 +1000,7 @@ msgstr "Plugin-uri"
 msgid "This plugin has no setup parameters!"
 msgstr "Acest plugin nu se configureaz�!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configura�ie"
 
@@ -1075,7 +1075,7 @@ msgstr "Lipse
 msgid "Not enough disk space to start recording!"
 msgstr "Insuficient spa�iul pe disc pentru �nregistrare!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!"
 
@@ -1112,23 +1112,23 @@ msgstr " a
 msgid "yes"
 msgstr "da"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Insereaz�"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Suprascrie"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin (modul adi�ional)"
 
@@ -1233,39 +1233,39 @@ msgstr "S
 msgid "Sunday"
 msgstr "Duminic�"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Urmeaz� o �nregistrare VPS!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "A �nceput �nregistrarea"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Apas� orice tast� pentru a anula �nchiderea"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Comut dispozitiv DVB primar..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Montajul �nregistr�rii a e�uat"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Montajul �nregistr�rii s-a terminat"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 47cbbace3..ec18474df 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "��� ��������"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "�������"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "rus"
 
@@ -394,7 +394,7 @@ msgstr "
 msgid "Channels"
 msgstr "������"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "�������"
 
@@ -999,7 +999,7 @@ msgstr "
 msgid "This plugin has no setup parameters!"
 msgstr "������ �� ����� ���������� ���������!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "���������"
 
@@ -1074,7 +1074,7 @@ msgstr "
 msgid "Not enough disk space to start recording!"
 msgstr "������������ ����� �� ����� ��� ������ ������"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "��� ���������� DVB-���������� ��� ������!"
 
@@ -1111,23 +1111,23 @@ msgstr " abcdefghijklmnopqrstuvwxyz
 msgid "yes"
 msgstr "��"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "���/���"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "�������"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "������"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "������"
 
@@ -1232,39 +1232,39 @@ msgstr "
 msgid "Sunday"
 msgstr "�����������"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-������ ����� ��������"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "������ ������"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR ���������� ����� - ������� Power ��� ���������"
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "������� ����� ������ ����� �������� ����������."
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "����� ��������� DVB-����������..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "������ �� ����� ������� ������!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "������ �������"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "������� ����� ������ ��� ������ ������������"
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR ���������� ����� %s �����"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 642f403da..c62b2724a 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
 msgstr "Brez naziva"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Slovenski"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "slv"
 
@@ -395,7 +395,7 @@ msgstr "Nastavitve kanala niso edinstvene!"
 msgid "Channels"
 msgstr "Kanali"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Izbri�i"
 
@@ -1000,7 +1000,7 @@ msgstr "Vstavki"
 msgid "This plugin has no setup parameters!"
 msgstr "Ta vstavek nima nastavitvenih parametrov!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Nastavitve"
 
@@ -1075,7 +1075,7 @@ msgstr "Zvok ni dosegljiv!"
 msgid "Not enough disk space to start recording!"
 msgstr "Premalo prostora na disku za snemanje!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ni proste DVB naprave za snemanje!"
 
@@ -1112,23 +1112,23 @@ msgstr " abc
 msgid "yes"
 msgstr "da"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Vstavi"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Prepi�i"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Vstavek"
 
@@ -1233,39 +1233,39 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Sledi VPS snemanje!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite katerikoli gumb za preklic izklopa"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Preklapljanje primarne DVB naprave..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Napaka pri procesu urejanja!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proces urejanja je kon�an"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 82b13735e..bf84d1699 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
 msgstr "ingen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Svenska"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "sve"
 
@@ -395,7 +395,7 @@ msgstr "Kanalinst
 msgid "Channels"
 msgstr "Kanaler"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Ta bort"
 
@@ -1000,7 +1000,7 @@ msgstr "Moduler"
 msgid "This plugin has no setup parameters!"
 msgstr "Den h�r modulen har inga parametrar"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Inst�llningar"
 
@@ -1075,7 +1075,7 @@ msgstr "Ljud saknas!"
 msgid "Not enough disk space to start recording!"
 msgstr "Otillr�cklingt diskutrymme f�r inspelning!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Det finns ingen ledig DVB enhet f�r inspelning!"
 
@@ -1112,23 +1112,23 @@ msgstr " abcdefghijklmnopqrstuvwxyz
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Infoga"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Skriv �ver"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Modul"
 
@@ -1233,39 +1233,39 @@ msgstr "L
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "strax VPS inspelning..."
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Inspelningen har startat"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Tryck valfri knapp f�r att �terkalla avst�ngningen"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Byter prim�r DVB enhet..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Redigeringsprocessen misslyckades"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigering avslutad"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 4a220baa9..1eecb501c 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
 msgstr "�sim yok"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "T�rk�e"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "tur"
 
@@ -394,7 +394,7 @@ msgstr "Kanal ayarlar
 msgid "Channels"
 msgstr "Kanallar"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
 msgid "Button$Delete"
 msgstr "Sil"
 
@@ -999,7 +999,7 @@ msgstr "Eklentiler"
 msgid "This plugin has no setup parameters!"
 msgstr "Bu eklentinin d�zenek parametresi yok!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Ayarlar"
 
@@ -1074,7 +1074,7 @@ msgstr "Audio yok!"
 msgid "Not enough disk space to start recording!"
 msgstr "Kay�t i�in yeterince kapasite yok!"
 
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Kullan�lmayan DVB kart� bulunmad�!"
 
@@ -1111,23 +1111,23 @@ msgstr " abc
 msgid "yes"
 msgstr "evet"
 
-#: menuitems.c:287
+#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Insert"
 msgstr "Ekle"
 
-#: menuitems.c:319
+#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�st�ne yaz"
 
-#: menuitems.c:972
+#: menuitems.c:971
 msgid "Plugin"
 msgstr "Eklenti"
 
@@ -1232,39 +1232,39 @@ msgstr "Cumartesi"
 msgid "Sunday"
 msgstr "Pazar"
 
-#: vdr.c:861
+#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS �ekim yak�nda ba�l�yor!"
 
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Kay�t ba�land�"
 
-#: vdr.c:1032
+#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1044
+#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Kapatmay� iptal etmek i�in herhangi bir tu�a bas"
 
-#: vdr.c:1097
+#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Primer DVB aray�z� de�i�tiriliyor..."
 
-#: vdr.c:1165
+#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Kesim ba�ar�s�z!"
 
-#: vdr.c:1167
+#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Kesim bitti"
 
-#: vdr.c:1173
+#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1193
+#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/vdr.c b/vdr.c
index b15938a74..0f9cf5f91 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.296 2007/08/12 11:22:04 kls Exp $
+ * $Id: vdr.c 1.298 2007/08/18 13:03:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -704,10 +704,13 @@ int main(int argc, char *argv[])
 #endif
         // Attach launched player control:
         cControl::Attach();
+
+        time_t Now = time(NULL);
+
         // Make sure we have a visible programme in case device usage has changed:
         if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
-           if (time(NULL) - lastTime > MINCHANNELWAIT) {
+           if (Now - lastTime > MINCHANNELWAIT) {
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
               if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
                  if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
@@ -716,7 +719,7 @@ int main(int argc, char *argv[])
                      && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
                     ;
                  }
-              lastTime = time(NULL); // don't do this too often
+              lastTime = Now; // don't do this too often
               LastTimerChannel = -1;
               }
            }
@@ -738,8 +741,8 @@ int main(int argc, char *argv[])
            if (modified == CHANNELSMOD_USER || Timers.Modified(TimerState))
               ChannelSaveTimeout = 1; // triggers an immediate save
            else if (modified && !ChannelSaveTimeout)
-              ChannelSaveTimeout = time(NULL) + CHANNELSAVEDELTA;
-           bool timeout = ChannelSaveTimeout == 1 || ChannelSaveTimeout && time(NULL) > ChannelSaveTimeout && !cRecordControls::Active();
+              ChannelSaveTimeout = Now + CHANNELSAVEDELTA;
+           bool timeout = ChannelSaveTimeout == 1 || ChannelSaveTimeout && Now > ChannelSaveTimeout && !cRecordControls::Active();
            if ((modified || timeout) && Channels.Lock(false, 100)) {
               if (timeout) {
                  Channels.Save();
@@ -767,16 +770,15 @@ int main(int argc, char *argv[])
            if (!Menu)
               Menu = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel >= 0);
            LastChannel = cDevice::CurrentChannel();
-           LastChannelChanged = time(NULL);
+           LastChannelChanged = Now;
            }
-        if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
+        if (Now - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {
            // Assign events to timers:
            Timers.SetEvents();
            // Must do all following calls with the exact same time!
-           time_t Now = time(NULL);
            // Process ongoing recordings:
            cRecordControls::Process(Now);
            // Start new recordings:
@@ -863,7 +865,7 @@ int main(int argc, char *argv[])
                         }
                      }
                   }
-              LastTimerCheck = time(NULL);
+              LastTimerCheck = Now;
               }
            // Delete expired timers:
            Timers.DeleteExpired();
@@ -1065,7 +1067,7 @@ int main(int argc, char *argv[])
                     continue;
                     }
                  }
-              else if (time(NULL) - cRemote::LastActivity() > MENUTIMEOUT)
+              else if (Now - cRemote::LastActivity() > MENUTIMEOUT)
                  state = osEnd;
               }
            switch (state) {
@@ -1181,12 +1183,12 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (time(NULL) - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+        if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Handle housekeeping tasks
 
            // Shutdown:
            // Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
-           time_t Soon = time(NULL) + SHUTDOWNWAIT;
+           time_t Soon = Now + SHUTDOWNWAIT;
            if (ShutdownHandler.IsUserInactive(Soon) && ShutdownHandler.Retry(Soon) && !ShutdownHandler.countdown) {
               if (ShutdownHandler.ConfirmShutdown(false))
                  // Time to shut down - start final countdown:

From 46c882c04d5200cc97262b15db2e4841b305664d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Aug 2007 18:00:00 +0200
Subject: [PATCH 175/307] =?UTF-8?q?Version=201.5.9=20-=20Fixed=20handling?=
 =?UTF-8?q?=20locale=20directories=20with=20a=20large=20number=20of=20entr?=
 =?UTF-8?q?ies=20(thanks=20to=20=20=20Anssi=20Hannula).=20-=20Updated=20Tu?=
 =?UTF-8?q?rkish=20language=20texts=20(thanks=20to=20Oktay=20Yolge=C3=A7en?=
 =?UTF-8?q?).=20-=20Fixed=20stripping=20the=20context=20in=20I18nTranslate?=
 =?UTF-8?q?()=20(reported=20by=20Christian=20=20=20Wieninger).=20-=20Fixed?=
 =?UTF-8?q?=20detecting=20whether=20a=20particular=20locale=20is=20actuall?=
 =?UTF-8?q?y=20supported.=20-=20Added=20a=20note=20about=20LANG=20having?=
 =?UTF-8?q?=20to=20be=20set=20to=20a=20valid=20locale=20in=20INSTALL=20=20?=
 =?UTF-8?q?=20(suggested=20by=20Matthias=20Fechner).=20-=20Fixed=20some=20?=
 =?UTF-8?q?compiler=20warnings=20with=20gcc-4.2.0=20(thanks=20to=20Matthia?=
 =?UTF-8?q?s=20Schwarzott).=20-=20Fixed=20setting=20the=20locale=20file=20?=
 =?UTF-8?q?name=20in=20i18n-to-gettext.pl=20(thanks=20to=20Matthias=20=20?=
 =?UTF-8?q?=20Schwarzott).=20-=20Changed=20the=20default=20for=20LOCDIR=20?=
 =?UTF-8?q?in=20Makefile=20and=20Make.config.template=20to=20=20=20"./loca?=
 =?UTF-8?q?le",=20so=20that=20internationalization=20works=20by=20default?=
 =?UTF-8?q?=20when=20running=20VDR=20=20=20from=20within=20its=20source=20?=
 =?UTF-8?q?directory=20(suggested=20by=20Anssi=20Hannula).=20-=20Added=20t?=
 =?UTF-8?q?he=20new=20i18n=20macro=20trVDR(),=20which=20can=20be=20used=20?=
 =?UTF-8?q?by=20plugins=20to=20mark=20=20=20texts=20they=20want=20to=20reu?=
 =?UTF-8?q?se=20from=20VDR's=20core=20translations=20(suggested=20by=20Mat?=
 =?UTF-8?q?thias=20=20=20Becker).=20-=20VDR=20now=20uses=20the=20default?=
 =?UTF-8?q?=20configuration=20directory=20as=20defined=20in=20the=20CONFDI?=
 =?UTF-8?q?R=20=20=20varable=20in=20the=20Makefile=20(thanks=20to=20Thomas?=
 =?UTF-8?q?=20Schmidt).=20-=20The=20SVDRP=20command=20LSTC=20can=20now=20l?=
 =?UTF-8?q?ist=20the=20channels=20with=20group=20separators=20if=20the=20?=
 =?UTF-8?q?=20=20option=20':groups'=20is=20given=20(thanks=20to=20Andreas?=
 =?UTF-8?q?=20Mair).=20-=20Added=20a=20missing=20error=20report=20to=20cCu?=
 =?UTF-8?q?ttingThread::Action()=20(thanks=20to=20Udo=20=20=20Richter).=20?=
 =?UTF-8?q?-=20There=20can=20now=20be=20more=20than=20one=20OSD=20at=20the?=
 =?UTF-8?q?=20same=20time.=20At=20any=20given=20time,=20=20=20however,=20o?=
 =?UTF-8?q?nly=20one=20of=20them=20can=20be=20active=20(and=20thus=20visib?=
 =?UTF-8?q?le).=20This=20is=20to=20=20=20allow=20displaying=20things=20lik?=
 =?UTF-8?q?e=20subtitles=20in=20an=20easy=20way.=20A=20cOsd=20therefore=20?=
 =?UTF-8?q?=20=20now=20has=20a=20"Level",=20and=20only=20the=20OSD=20with?=
 =?UTF-8?q?=20the=20smallest=20level=20will=20be=20=20=20displayed.=20The?=
 =?UTF-8?q?=20level=200=20OSD=20is=20special,=20and=20there=20can=20only?=
 =?UTF-8?q?=20be=20one=20with=20=20=20this=20level.=20If=20there=20is=20mo?=
 =?UTF-8?q?re=20than=20one=20OSD=20with=20a=20particular=20level,=20only?=
 =?UTF-8?q?=20=20=20the=20one=20that=20was=20created=20first=20will=20be?=
 =?UTF-8?q?=20displayed.=20=20=20Plugins=20that=20provide=20an=20OSD=20nee?=
 =?UTF-8?q?d=20to=20adjust=20their=20cOsdProvider::CreateOsd()=20=20=20fun?=
 =?UTF-8?q?ction=20to=20hand=20through=20the=20Level.=20-=20Fixed=20checki?=
 =?UTF-8?q?ng=20for=20ttDolbyLast=20in=20cDevice::SetCurrentAudioTrack()?=
 =?UTF-8?q?=20(thanks=20=20=20to=20Marco=20Schl=C3=BC=C3=9Fler).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         | 20 +++++++++++-
 HISTORY              | 37 +++++++++++++++++++++
 INSTALL              |  3 ++
 Make.config.template |  6 ++--
 Makefile             |  5 +--
 PLUGINS.html         | 37 ++++++++++-----------
 config.h             | 10 +++---
 cutter.c             |  6 ++--
 device.c             |  4 +--
 dvbosd.c             | 60 +++++++++++++++++++++++-----------
 dvbosd.h             |  4 +--
 i18n-to-gettext.pl   |  4 +--
 i18n.c               | 45 +++++++++++++------------
 i18n.h               |  3 +-
 keys.h               |  4 +--
 menu.c               |  4 +--
 osd.c                | 45 ++++++++++++++++++-------
 osd.h                | 24 ++++++++++----
 po/tr_TR.po          | 78 ++++++++++++++++++++++----------------------
 rcu.c                |  4 +--
 rcu.h                |  4 +--
 svdrp.c              | 15 ++++++---
 thread.c             |  4 +--
 tools.h              |  8 ++++-
 vdr.c                |  4 +--
 25 files changed, 282 insertions(+), 156 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 68abd99a7..bddbeed12 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -541,6 +541,7 @@ Tomas Prybil <tomas.prybil@copper.se>
 
 Matthias Fechner <matthiasfechner@web.de>
  for pointing out a bug in parsing 'E' records in epg2html.pl
+ for suggesting to add a note about LANG having to be set to a valid locale in INSTALL
 
 Paul Lacatus <paul@campina.iiruc.ro>
  for translating OSD texts to the Romanian language
@@ -943,6 +944,8 @@ Andreas Mair <andreas@vdr-developer.org>
  for enabling fonts to be created with a width that overwrites the default width
  for suggesting to make cBitmap::SetXpm() checks whether the given Xpm pointer is
  not NULL
+ for making the SVDRP command LSTC list the channels with group separators if the
+ option ':groups' is given
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1056,9 +1059,11 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
  for reporting a bug in handling the '.update' file in case the video directory is
  not at the default location
 
-Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Thomas Schmidt <tschmidt@debian.org>
  for reporting a crash when canceling a newly created timer
  for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated
+ for making VDR use the default configuration directory as defined in the CONFDIR
+ varable in the Makefile
 
 Michael Walle <michael.walle@web.de>
  for reporting a bug in channel switching after Left/Right has been pressed
@@ -1413,6 +1418,7 @@ Marco Schl
  for reporting a missing 'P' in vdr.c's SHUTDOWNCANCELROMPT macro
  for fixing a problem with characters >0x7F in the modified version of skipspace()
  for reporting a faulty comment in Make.config.template
+ for fixing checking for ttDolbyLast in cDevice::SetCurrentAudioTrack()
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1515,6 +1521,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing handling detached processes in SystemExec()
  for fixing handling single byte characters >0x7F in Utf8ToArray()
  for fixing clearing color buttons in the 'curses' skin
+ for adding a missing error report to cCuttingThread::Action()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1870,6 +1877,7 @@ Christian Wieninger <cwieninger@gmx.de>
  for reporting a problem with a format string in recording.c on 64bit systems
  for reporting a problem with the device selection in case of timer conflicts
  for a patch that fixed part of a crash in i18n character set conversion
+ for reporting a bug in stripping the context in I18nTranslate()
 
 Thiemo Gehrke <tgehrke@reel-multimedia.com>
  for suggesting to add a setup option to turn off the automatic timeout of the
@@ -2062,6 +2070,10 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for suggesting to make the "Setup/OSD/Language" menu only show those languages
  that actually have a locale
  for suggesting to use setenv() instead of setlocale() to set the language for gettext()
+ for fixing handling locale directories with a large number of entries
+ for suggesting to change the default for LOCDIR in Makefile and Make.config.template
+ to "./locale", so that internationalization works by default when running VDR
+ from within its source directory
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2098,6 +2110,8 @@ Matthias Schwarzott <zzam@gentoo.org>
  for suggesting to move the "all" target in plugin Makefiles before the
  "Implicit rules", so that a plain "make" will compile everything
  for adding DESTDIR and PREFIX handling to the Makefile
+ for fixing some compiler warnings with gcc-4.2.0
+ for fixing setting the locale file name in i18n-to-gettext.pl
 
 Martin Ostermann <martin@familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
@@ -2151,3 +2165,7 @@ Tobias Bratfisch <tobias@reel-multimedia.com>
 
 Bruno Roussel <bruno.roussel@free.fr>
  for translating OSD texts to the French language
+
+Matthias Becker <becker.matthias@gmail.com>
+ for suggesting to add a new i18n macro that can be used by plugins to mark
+ texts they want to reuse from VDR's core translations
diff --git a/HISTORY b/HISTORY
index 0677dbcc6..c89b2183c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5379,3 +5379,40 @@ Video Disk Recorder Revision History
   vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the
   name of the plugin. The "newplugin" script has been changed accordingly, and
   plugin authors should change their Makefiles, too.
+
+2007-08-26: Version 1.5.9
+
+- Fixed handling locale directories with a large number of entries (thanks to
+  Anssi Hannula).
+- Updated Turkish language texts (thanks to Oktay Yolge�en).
+- Fixed stripping the context in I18nTranslate() (reported by Christian
+  Wieninger).
+- Fixed detecting whether a particular locale is actually supported.
+- Added a note about LANG having to be set to a valid locale in INSTALL
+  (suggested by Matthias Fechner).
+- Fixed some compiler warnings with gcc-4.2.0 (thanks to Matthias Schwarzott).
+- Fixed setting the locale file name in i18n-to-gettext.pl (thanks to Matthias
+  Schwarzott).
+- Changed the default for LOCDIR in Makefile and Make.config.template to
+  "./locale", so that internationalization works by default when running VDR
+  from within its source directory (suggested by Anssi Hannula).
+- Added the new i18n macro trVDR(), which can be used by plugins to mark
+  texts they want to reuse from VDR's core translations (suggested by Matthias
+  Becker).
+- VDR now uses the default configuration directory as defined in the CONFDIR
+  varable in the Makefile (thanks to Thomas Schmidt).
+- The SVDRP command LSTC can now list the channels with group separators if the
+  option ':groups' is given (thanks to Andreas Mair).
+- Added a missing error report to cCuttingThread::Action() (thanks to Udo
+  Richter).
+- There can now be more than one OSD at the same time. At any given time,
+  however, only one of them can be active (and thus visible). This is to
+  allow displaying things like subtitles in an easy way. A cOsd therefore
+  now has a "Level", and only the OSD with the smallest level will be
+  displayed. The level 0 OSD is special, and there can only be one with
+  this level. If there is more than one OSD with a particular level, only
+  the one that was created first will be displayed.
+  Plugins that provide an OSD need to adjust their cOsdProvider::CreateOsd()
+  function to hand through the Level.
+- Fixed checking for ttDolbyLast in cDevice::SetCurrentAudioTrack() (thanks
+  to Marco Schl��ler).
diff --git a/INSTALL b/INSTALL
index cbef729bd..a26e43bb0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -113,6 +113,9 @@ in the log file, it is sufficient to just set
 which only influences the way strings are sorted and leaves error messages
 in English.
 
+Note that for VDR's internationalized texts to work, the LANG environment
+variable must be set to a valid locale!
+
 Automatic restart in case of hangups:
 -------------------------------------
 
diff --git a/Make.config.template b/Make.config.template
index 86564a284..a4b4812b2 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.13 2007/08/12 20:43:46 kls Exp $
+# $Id: Make.config.template 1.15 2007/08/25 08:53:45 kls Exp $
 
 ### The C compiler and options:
 
@@ -26,12 +26,12 @@ endif
 #DVBDIR   = /usr/src/v4l-dvb/linux
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
-# set to ./locale to run VDR from within its source directory:
-LOCDIR   = /usr/share/vdr/locale
 
+LOCDIR   = ./locale
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
 VIDEODIR = /video
+CONFDIR  = $(VIDEODIR)
 
 ### The remote control:
 
diff --git a/Makefile b/Makefile
index a46aaef58..294ca7884 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.104 2007/08/15 13:47:16 kls Exp $
+# $Id: Makefile 1.106 2007/08/25 08:52:17 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -19,7 +19,7 @@ DESTDIR ?=
 PREFIX  ?= /usr/local
 MANDIR   = $(PREFIX)/share/man
 BINDIR   = $(PREFIX)/bin
-LOCDIR   = $(PREFIX)/share/vdr/locale
+LOCDIR   = ./locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig
 INCLUDES = -I/usr/include/freetype2
 
@@ -61,6 +61,7 @@ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
 DEFINES += -D_GNU_SOURCE
 
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+DEFINES += -DCONFDIR=\"$(CONFDIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 
diff --git a/PLUGINS.html b/PLUGINS.html
index d18bc424c..0b0b49563 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,7 +6,7 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.5.3</b></center>
+<center><b>Version 1.5.8</b></center>
 <p>
 <center>
 Copyright &copy; 2006 Klaus Schmidinger<br>
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.0 are marked like this.
-<!--X1.5.0--></td></tr></table>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.1 are marked like this.
 <!--X1.5.1--></td></tr></table>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.3 are marked like this.
 <!--X1.5.3--></td></tr></table>
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.7 are marked like this.
 <!--X1.5.7--></td></tr></table>
+<!--X1.5.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.8 are marked like this.
+<!--X1.5.8--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -64,7 +64,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Housekeeping">Housekeeping</a>
 <li><a href="#Main thread hook">Main thread hook</a>
 <li><a href="#Activity">Activity</a>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Wakeup">Wakeup</a>
 <!--X1.5.1--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
@@ -88,9 +88,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Devices">Devices</a>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Conditional Access">Conditional Access</a>
-<!--X1.5.0--></td></tr></table>
 </ul>
 </ul>
 
@@ -687,7 +685,7 @@ <h1>Table Of Contents</h1>
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
 
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Wakeup"><hr><h2>Wakeup</h2>
 
 <center><i><b>Wake me up before you go-go</b></i></center><p>
@@ -912,7 +910,7 @@ <h1>Table Of Contents</h1>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
 
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 If a plugin displays texts to the user, it should prepare for internationalization
 of these texts. All that is necessary for this is to mark every text that is
 presented to the user as translatable, as in
@@ -923,9 +921,12 @@ <h1>Table Of Contents</h1>
 
 The text given here must be the English version, and the returned pointer is either
 a translated version (if available) or the original string.
-Texts are first searched for in the domain registered for this plugin (if any)
-and then in the global VDR texts. So a plugin can make use of texts defined by the
-core VDR code.
+<!--X1.5.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Texts are searched for in the domain registered for this plugin.
+If a plugin wants to make use of texts defined by the core VDR code, it can use
+the special <tt>trVDR()</tt> macro to mark these texts without having them
+appear in its own translation file.
+<!--X1.5.8--></td></tr></table>
 <p>
 Sometimes texts are stored in an array, in which case they need to be marked
 differently, using the trNOOP() macro. The actual translation is then done
@@ -943,7 +944,7 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 The system VDR is running on may use a character encoding where a single character
 (or <i>symbol</i>) consists of more than one byte (UTF-8, as opposed to, for instance,
 ISO8859-1, where every character is represented by a single byte in memory).
@@ -1605,7 +1606,7 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Special consideration may have to be given to color usage if the OSD provides
 8bpp (256 colors). In that case, fonts may be drawn using <i>anti-aliasing</i>,
 which requires several blended color values between the foreground and background
@@ -2088,7 +2089,6 @@ <h1>Table Of Contents</h1>
 
 The other parameters have the same meaning as in the first version of this function.
 
-<!--X1.5.0--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Conditional Access"><hr><h2>Conditional Access</h2>
 
 <center><i><b>Members only!</b></i></center><p>
@@ -2123,7 +2123,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 See the description of this function in <tt>ci.h</tt> for details.
-<!--X1.5.0--></td></tr></table>
 
 </body>
 </html>
diff --git a/config.h b/config.h
index 526885300..a5efb9b72 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.297 2007/08/12 20:38:10 kls Exp $
+ * $Id: config.h 1.298 2007/08/19 16:02:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.8"
-#define VDRVERSNUM   10508  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.9"
+#define VDRVERSNUM   10509  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.8"
-#define APIVERSNUM   10508  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.9"
+#define APIVERSNUM   10509  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 5170ae4af..b596f3f4d 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.16 2006/07/30 10:22:08 kls Exp $
+ * $Id: cutter.c 1.17 2007/08/25 10:33:18 kls Exp $
  */
 
 #include "cutter.h"
@@ -110,8 +110,10 @@ void cCuttingThread::Action(void)
                  break;
                  }
               }
-           else
+           else {
+              error = "index";
               break;
+              }
 
            // Write one frame:
 
diff --git a/device.c b/device.c
index ae9e15e84..e23b74b84 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.141 2007/06/16 09:31:32 kls Exp $
+ * $Id: device.c 1.142 2007/08/26 11:11:42 kls Exp $
  */
 
 #include "device.h"
@@ -892,7 +892,7 @@ int cDevice::NumAudioTracks(void) const
 
 bool cDevice::SetCurrentAudioTrack(eTrackType Type)
 {
-  if (ttNone < Type && Type < ttDolbyLast) {
+  if (ttNone < Type && Type <= ttDolbyLast) {
      cMutexLock MutexLock(&mutexCurrentAudioTrack);
      if (IS_DOLBY_TRACK(Type))
         SetDigitalAudioDevice(true);
diff --git a/dvbosd.c b/dvbosd.c
index 469ef1fbe..87c8dec21 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.30 2006/01/28 14:24:04 kls Exp $
+ * $Id: dvbosd.c 1.31 2007/08/26 09:39:20 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -26,15 +26,17 @@ class cDvbOsd : public cOsd {
   int osdMem;
   bool shown;
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
+protected:
+  virtual void SetActive(bool On);
 public:
-  cDvbOsd(int Left, int Top, int OsdDev);
+  cDvbOsd(int Left, int Top, int OsdDev, uint Level);
   virtual ~cDvbOsd();
   virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
   virtual void Flush(void);
   };
 
-cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
-:cOsd(Left, Top)
+cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev, uint Level)
+:cOsd(Left, Top, Level)
 {
   osdDev = OsdDev;
   shown = false;
@@ -49,23 +51,36 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
      if (ioctl(osdDev, OSD_GET_CAPABILITY, &cap) == 0)
         osdMem = cap.val;
 #endif
-     // must clear all windows here to avoid flashing effects - doesn't work if done
-     // in Flush() only for the windows that are actually used...
-     for (int i = 0; i < MAXNUMWINDOWS; i++) {
-         Cmd(OSD_SetWindow, 0, i + 1);
-         Cmd(OSD_Clear);
-         }
      }
 }
 
 cDvbOsd::~cDvbOsd()
 {
-  if (shown) {
-     cBitmap *Bitmap;
-     for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
-         Cmd(OSD_SetWindow, 0, i + 1);
-         Cmd(OSD_Close);
-         }
+  SetActive(false);
+}
+
+void cDvbOsd::SetActive(bool On)
+{
+  if (On != Active()) {
+     cOsd::SetActive(On);
+     if (On) {
+        // must clear all windows here to avoid flashing effects - doesn't work if done
+        // in Flush() only for the windows that are actually used...
+        for (int i = 0; i < MAXNUMWINDOWS; i++) {
+            Cmd(OSD_SetWindow, 0, i + 1);
+            Cmd(OSD_Clear);
+            }
+        if (GetBitmap(0)) // only flush here if there are already bitmaps
+           Flush();
+        }
+     else if (shown) {
+        cBitmap *Bitmap;
+        for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+            Cmd(OSD_SetWindow, 0, i + 1);
+            Cmd(OSD_Close);
+            }
+        shown = false;
+        }
      }
 }
 
@@ -108,13 +123,20 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
 
 void cDvbOsd::Flush(void)
 {
+  if (!Active())
+     return;
   cBitmap *Bitmap;
   for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
       Cmd(OSD_SetWindow, 0, i + 1);
       if (!shown)
          Cmd(OSD_Open, Bitmap->Bpp(), Left() + Bitmap->X0(), Top() + Bitmap->Y0(), Left() + Bitmap->X0() + Bitmap->Width() - 1, Top() + Bitmap->Y0() + Bitmap->Height() - 1, (void *)1); // initially hidden!
       int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-      if (Bitmap->Dirty(x1, y1, x2, y2)) {
+      if (!shown || Bitmap->Dirty(x1, y1, x2, y2)) {
+         if (!shown) {
+            x1 = y1 = 0;
+            x2 = Bitmap->Width() - 1;
+            y2 = Bitmap->Height() - 1;
+            }
          //TODO Workaround: apparently the bitmap sent to the driver always has to be a multiple
          //TODO of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
          //TODO Fix driver (should be able to handle any size bitmaps!)
@@ -173,7 +195,7 @@ cDvbOsdProvider::cDvbOsdProvider(int OsdDev)
   osdDev = OsdDev;
 }
 
-cOsd *cDvbOsdProvider::CreateOsd(int Left, int Top)
+cOsd *cDvbOsdProvider::CreateOsd(int Left, int Top, uint Level)
 {
-  return new cDvbOsd(Left, Top, osdDev);
+  return new cDvbOsd(Left, Top, osdDev, Level);
 }
diff --git a/dvbosd.h b/dvbosd.h
index 752b9fa1a..ae8afb6d0 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.18 2004/06/12 13:09:52 kls Exp $
+ * $Id: dvbosd.h 1.19 2007/08/25 13:49:34 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -17,7 +17,7 @@ class cDvbOsdProvider : public cOsdProvider {
   int osdDev;
 public:
   cDvbOsdProvider(int OsdDev);
-  virtual cOsd *CreateOsd(int Left, int Top);
+  virtual cOsd *CreateOsd(int Left, int Top, uint Level);
   };
 
 #endif //__DVBOSD_H
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index 130122d45..e46c64401 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 1.3 2007/08/15 12:52:00 kls Exp $
+# $Id: i18n-to-gettext.pl 1.4 2007/08/24 13:19:34 kls Exp $
 
 # How to convert an actual plugin:
 #
@@ -323,7 +323,7 @@
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
 	    done
 
 };
diff --git a/i18n.c b/i18n.c
index 15853a0f5..da699d97d 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.312 2007/08/19 14:10:46 kls Exp $
+ * $Id: i18n.c 1.317 2007/08/24 14:03:47 kls Exp $
  *
  *
  */
@@ -62,7 +62,7 @@ const char *LanguageCodeList[] = {
   NULL
   };
 
-static char *I18nLocaleDir = LOCDIR;
+static const char *I18nLocaleDir = LOCDIR;
 
 static cStringList LanguageLocales;
 static cStringList LanguageNames;
@@ -112,21 +112,24 @@ void I18nInitialize(void)
      for (int i = 0; i < Locales.Size(); i++) {
          cString FileName = cString::sprintf("%s/%s/LC_MESSAGES/vdr.mo", I18nLocaleDir, Locales[i]);
          if (access(FileName, F_OK) == 0) { // found a locale with VDR texts
-            if (i < I18N_MAX_LANGUAGES - 1) {
+            if (NumLocales < I18N_MAX_LANGUAGES - 1) {
                SetEnvLanguage(Locales[i]);
-               NumLocales++;
-               if (strstr(OldLocale, Locales[i]) == OldLocale)
-                  CurrentLanguage = LanguageLocales.Size();
-               LanguageLocales.Append(strdup(Locales[i]));
-               LanguageNames.Append(strdup(gettext(LanguageName)));
-               const char *Code = gettext(LanguageCode);
-               for (const char **lc = LanguageCodeList; *lc; lc++) {
-                   if (ContainsCode(*lc, Code)) {
-                      Code = *lc;
-                      break;
+               const char *TranslatedLanguageName = gettext(LanguageName);
+               if (TranslatedLanguageName != LanguageName) {
+                  NumLocales++;
+                  if (strstr(OldLocale, Locales[i]) == OldLocale)
+                     CurrentLanguage = LanguageLocales.Size();
+                  LanguageLocales.Append(strdup(Locales[i]));
+                  LanguageNames.Append(strdup(TranslatedLanguageName));
+                  const char *Code = gettext(LanguageCode);
+                  for (const char **lc = LanguageCodeList; *lc; lc++) {
+                      if (ContainsCode(*lc, Code)) {
+                         Code = *lc;
+                         break;
+                         }
                       }
-                   }
-               LanguageCodes.Append(strdup(Code));
+                  LanguageCodes.Append(strdup(Code));
+                  }
                }
             else {
                esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
@@ -203,15 +206,11 @@ const char *I18nTranslate(const char *s, const char *Plugin)
   if (!s)
      return s;
   if (CurrentLanguage) {
-     const char *t = s;
-     if (Plugin)
-        t = dgettext(Plugin, s);
-     if (t == s)
-        t = gettext(s);
-     s = t;
+     const char *t = Plugin ? dgettext(Plugin, s) : gettext(s);
+     if (t != s)
+        return t;
      }
-  const char *p = strchr(s, '$');
-  return p ? p + 1 : s;
+  return SkipContext(s);
 }
 
 const char *I18nLocale(int Language)
diff --git a/i18n.h b/i18n.h
index 2d1c79bda..cbe42b99a 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.23 2007/08/19 14:07:17 kls Exp $
+ * $Id: i18n.h 1.24 2007/08/24 13:35:18 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -80,6 +80,7 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
 
 #ifdef PLUGIN_NAME_I18N
 #define tr(s)  I18nTranslate(s, "vdr-" PLUGIN_NAME_I18N)
+#define trVDR(s) I18nTranslate(s)  // to use a text that's in the VDR core's translation file
 #else
 #define tr(s)  I18nTranslate(s)
 #endif
diff --git a/keys.h b/keys.h
index da4b7a459..2adcad8a0 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.12 2007/08/04 14:40:23 kls Exp $
+ * $Id: keys.h 1.13 2007/08/24 13:15:48 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -82,7 +82,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 
 struct tKey {
   eKeys type;
-  char *name;
+  const char *name;
   };
 
 class cKey : public cListObject {
diff --git a/menu.c b/menu.c
index 4d94b6108..444fd7507 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.460 2007/08/18 09:03:05 kls Exp $
+ * $Id: menu.c 1.461 2007/08/24 13:15:48 kls Exp $
  */
 
 #include "menu.h"
@@ -1040,7 +1040,7 @@ int cMenuScheduleItem::Compare(const cListObject &ListObject) const
   return r;
 }
 
-static char *TimerMatchChars = " tT";
+static const char *TimerMatchChars = " tT";
 
 bool cMenuScheduleItem::Update(bool Force)
 {
diff --git a/osd.c b/osd.c
index 5624c2632..1c91184d6 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.73 2007/08/17 15:23:50 kls Exp $
+ * $Id: osd.c 1.74 2007/08/26 09:44:50 kls Exp $
  */
 
 #include "osd.h"
@@ -646,18 +646,24 @@ int cOsd::osdLeft = 0;
 int cOsd::osdTop = 0;
 int cOsd::osdWidth = 0;
 int cOsd::osdHeight = 0;
-int cOsd::isOpen = 0;
+cVector<cOsd *> cOsd::Osds;
 
-cOsd::cOsd(int Left, int Top)
+cOsd::cOsd(int Left, int Top, uint Level)
 {
-  if (isOpen)
-     esyslog("ERROR: OSD opened without closing previous OSD!");
   savedRegion = NULL;
   numBitmaps = 0;
   left = Left;
   top = Top;
   width = height = 0;
-  isOpen++;
+  level = Level;
+  active = false;
+  for (int i = 0; i < Osds.Size(); i++) {
+      if (Osds[i]->level > level) {
+         Osds.Insert(this, i);
+         return;
+         }
+      }
+  Osds.Append(this);
 }
 
 cOsd::~cOsd()
@@ -665,7 +671,14 @@ cOsd::~cOsd()
   for (int i = 0; i < numBitmaps; i++)
       delete bitmaps[i];
   delete savedRegion;
-  isOpen--;
+  for (int i = 0; i < Osds.Size(); i++) {
+      if (Osds[i] == this) {
+         Osds.Remove(i);
+         if (Osds.Size())
+            Osds[0]->SetActive(true);
+         break;
+         }
+      }
 }
 
 void cOsd::SetOsdPosition(int Left, int Top, int Width, int Height)
@@ -803,15 +816,23 @@ cOsdProvider::~cOsdProvider()
   osdProvider = NULL;
 }
 
-cOsd *cOsdProvider::NewOsd(int Left, int Top)
+cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
 {
-  if (cOsd::IsOpen())
+  if (Level == 0 && cOsd::IsOpen())
      esyslog("ERROR: attempt to open OSD while it is already open - using dummy OSD!");
-  else if (osdProvider)
-     return osdProvider->CreateOsd(Left, Top);
+  else if (osdProvider) {
+     cOsd *ActiveOsd = cOsd::Osds.Size() ? cOsd::Osds[0] : NULL;
+     cOsd *Osd = osdProvider->CreateOsd(Left, Top, Level);
+     if (Osd == cOsd::Osds[0]) {
+        if (ActiveOsd)
+           ActiveOsd->SetActive(false);
+        Osd->SetActive(true);
+        }
+     return Osd;
+     }
   else
      esyslog("ERROR: no OSD provider available - using dummy OSD!");
-  return new cOsd(Left, Top); // create a dummy cOsd, so that access won't result in a segfault
+  return new cOsd(Left, Top, 999); // create a dummy cOsd, so that access won't result in a segfault
 }
 
 void cOsdProvider::Shutdown(void)
diff --git a/osd.h b/osd.h
index 08bc41842..604b2d227 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.56 2007/07/20 14:50:17 kls Exp $
+ * $Id: osd.h 1.57 2007/08/26 09:45:38 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -15,6 +15,7 @@
 #include <stdint.h>
 #include "config.h"
 #include "font.h"
+#include "tools.h"
 
 #define MAXNUMCOLORS 256
 
@@ -247,13 +248,15 @@ class cOsd {
   friend class cOsdProvider;
 private:
   static int osdLeft, osdTop, osdWidth, osdHeight;
-  static int isOpen;
+  static cVector<cOsd *> Osds;
   cBitmap *savedRegion;
   cBitmap *bitmaps[MAXOSDAREAS];
   int numBitmaps;
   int left, top, width, height;
+  uint level;
+  bool active;
 protected:
-  cOsd(int Left, int Top);
+  cOsd(int Left, int Top, uint Level);
        ///< Initializes the OSD with the given coordinates.
        ///< By default it is assumed that the full area will be able to display
        ///< full 32 bit graphics (ARGB with eight bit for each color and the alpha
@@ -269,6 +272,14 @@ class cOsd {
        ///< and should require only the minimum necessary color depth. This is
        ///< because a derived cOsd class may or may not be able to handle more
        ///< than one area.
+       ///< There can be any number of cOsd objects at the same time, but only
+       ///< one of them will be active at any given time. The active OSD is the
+       ///< one with the lowest value of Level. If there are several cOsd objects
+       ///< with the same Level, the one that was created first will be active.
+  bool Active(void) { return active; }
+  virtual void SetActive(bool On) { active = On; }
+       ///< Sets this OSD to be the active one.
+       ///< A derived class must call cOsd::SetActive(On).
 public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
@@ -281,7 +292,8 @@ class cOsd {
        ///< This may be useful for plugins that determine the scaling of the
        ///< video image and need to scale the OSD accordingly to fit on the
        ///< screen.
-  static int IsOpen(void) { return isOpen; }
+  static int IsOpen(void) { return Osds.Size() && Osds[0]->level == 0; }
+       ///< Returns true if there is currently a level 0 OSD open.
   int Left(void) { return left; }
   int Top(void) { return top; }
   int Width(void) { return width; }
@@ -379,14 +391,14 @@ class cOsdProvider {
 private:
   static cOsdProvider *osdProvider;
 protected:
-  virtual cOsd *CreateOsd(int Left, int Top) = 0;
+  virtual cOsd *CreateOsd(int Left, int Top, uint Level) = 0;
       ///< Returns a pointer to a newly created cOsd object, which will be located
       ///< at the given coordinates.
 public:
   cOsdProvider(void);
       //XXX maybe parameter to make this one "sticky"??? (frame-buffer etc.)
   virtual ~cOsdProvider();
-  static cOsd *NewOsd(int Left, int Top);
+  static cOsd *NewOsd(int Left, int Top, uint Level = 0);
       ///< Returns a pointer to a newly created cOsd object, which will be located
       ///< at the given coordinates. When the cOsd object is no longer needed, the
       ///< caller must delete it. If the OSD is already in use, or there is no OSD
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 1eecb501c..487c426f6 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-08-19 13:53+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"PO-Revision-Date: 2007-08-24 14:37+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "Kanal kullan
 
 #: device.c:636
 msgid "Can't start Transfer Mode!"
-msgstr "Transfer mode ba�lat�lam�yor!"
+msgstr "Transfer modu ba�lat�lam�yor!"
 
 #: eitscan.c:159
 msgid "Starting EPG scan"
@@ -59,7 +59,7 @@ msgstr "Kumandan
 
 #: interface.c:80
 msgid "Do not press any key..."
-msgstr "Tu�lara basmay�n�z..."
+msgstr "Tu�lara basma..."
 
 #: interface.c:86
 msgid "Phase 2: Learning specific key codes"
@@ -68,7 +68,7 @@ msgstr "Faz 2: Belirli tu
 #: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
-msgstr "'%s' i�in tu� se�iniz"
+msgstr "'%s' i�in tu� se�"
 
 #: interface.c:106
 msgid "Press 'Up' to confirm"
@@ -84,7 +84,7 @@ msgstr "(Geri d
 
 #: interface.c:142
 msgid "(press 'Down' to end key definition)"
-msgstr "(Sona erdirmek i�in 'A�a��' bas)"
+msgstr "(Bitirmek i�in 'A�a��' bas)"
 
 #: interface.c:146
 msgid "(press 'Menu' to skip this key)"
@@ -200,11 +200,11 @@ msgstr "
 
 #: keys.c:48
 msgid "Key$Volume+"
-msgstr "Ses+"
+msgstr "Vol�m+"
 
 #: keys.c:49
 msgid "Key$Volume-"
-msgstr "Ses-"
+msgstr "Vol�m-"
 
 #: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
@@ -240,39 +240,39 @@ msgstr "Komutlar"
 
 #: keys.c:58
 msgid "Key$User1"
-msgstr ""
+msgstr "Kullan�c�1"
 
 #: keys.c:59
 msgid "Key$User2"
-msgstr ""
+msgstr "Kullan�c�2"
 
 #: keys.c:60
 msgid "Key$User3"
-msgstr ""
+msgstr "Kullan�c�3"
 
 #: keys.c:61
 msgid "Key$User4"
-msgstr ""
+msgstr "Kullan�c�4"
 
 #: keys.c:62
 msgid "Key$User5"
-msgstr ""
+msgstr "Kullan�c�5"
 
 #: keys.c:63
 msgid "Key$User6"
-msgstr ""
+msgstr "Kullan�c�6"
 
 #: keys.c:64
 msgid "Key$User7"
-msgstr ""
+msgstr "Kullan�c�7"
 
 #: keys.c:65
 msgid "Key$User8"
-msgstr ""
+msgstr "Kullan�c�8"
 
 #: keys.c:66
 msgid "Key$User9"
-msgstr ""
+msgstr "Kullan�c�9"
 
 #: menu.c:69
 msgid "Free To Air"
@@ -547,7 +547,7 @@ msgstr "L
 
 #: menu.c:1754
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM yan�t vermiyor!"
 
 #: menu.c:1784
 msgid "Recording info"
@@ -639,35 +639,35 @@ msgstr "Mesaj g
 
 #: menu.c:2217
 msgid "Setup.OSD$Use small font"
-msgstr "K���k harf kullan"
+msgstr "K���k font kullan"
 
 #: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 #: menu.c:2219
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Ola�an font"
 
 #: menu.c:2220
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "K���k font"
 
 #: menu.c:2221
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "�ak�l� font"
 
 #: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Ola�an font boyutu (pixel)"
 
 #: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "K���k font boyutu (pixel)"
 
 #: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "�ak�l� font boyutu (pixel)"
 
 #: menu.c:2225
 msgid "Setup.OSD$Channel info position"
@@ -837,15 +837,15 @@ msgstr "
 
 #: menu.c:2560
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM s�f�rland�"
 
 #: menu.c:2561
 msgid "CAM present"
-msgstr ""
+msgstr "CAM mevcut"
 
 #: menu.c:2562
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM haz�r"
 
 #: menu.c:2585 menu.c:2815
 msgid "CAM"
@@ -869,7 +869,7 @@ msgstr "CAM men
 
 #: menu.c:2624
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM kullan�l�yor - ger�ekden s�f�rla?"
 
 #: menu.c:2626
 msgid "Can't reset CAM!"
@@ -901,7 +901,7 @@ msgstr "Ola
 
 #: menu.c:2666
 msgid "Setup.Recording$Pause priority"
-msgstr "Ola�an duraklama prioritesi"
+msgstr "Duraklama prioritesi"
 
 #: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
@@ -973,11 +973,11 @@ msgstr "SVDRP zaman a
 
 #: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Kanal de�i�tirme zaman a��m� (sn)"
+msgstr "Zaping zaman a��m� (sn)"
 
 #: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Kanal giri� zaman a��m� (ms)"
 
 #: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
@@ -1149,7 +1149,7 @@ msgstr "Kapat
 
 #: shutdown.c:152
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Kesim aktif - buna ra�men kapat?"
 
 #: shutdown.c:162
 msgid "Recording - shut down anyway?"
@@ -1167,11 +1167,11 @@ msgstr "buna ra
 #: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Eklenti %s %ld dakikada a��l�yor, devam et?"
 
 #: shutdown.c:195
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Kesim aktif - buna ra�men yeniden ba�lat?"
 
 #: shutdown.c:205
 msgid "Recording - restart anyway?"
@@ -1184,7 +1184,7 @@ msgstr "buna ra
 #. TRANSLATORS: note the trailing blank!
 #: skinclassic.c:553
 msgid "Volume "
-msgstr "Ses "
+msgstr "Vol�m "
 
 #: skinclassic.c:702
 msgid "Classic VDR"
@@ -1242,7 +1242,7 @@ msgstr "Kay
 
 #: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR daha sonra kapanacak - zorlamak i�in Kapat'a bas"
 
 #: vdr.c:1046
 msgid "Press any key to cancel shutdown"
@@ -1262,9 +1262,9 @@ msgstr "Kesim bitti"
 
 #: vdr.c:1175
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Yeniden ba�latmay� iptal etmek i�in herhangi bir tu�a bas"
 
 #: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR %s dakikada kapanacak"
diff --git a/rcu.c b/rcu.c
index d81c0b6a0..34b438775 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.15 2006/12/02 11:12:28 kls Exp $
+ * $Id: rcu.c 1.16 2007/08/24 13:15:48 kls Exp $
  */
 
 #include "rcu.h"
@@ -257,7 +257,7 @@ void cRcuRemote::SetNumber(int n, bool Hex)
   data = m;
 }
 
-void cRcuRemote::SetString(char *s)
+void cRcuRemote::SetString(const char *s)
 {
   const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
   int n = 0;
diff --git a/rcu.h b/rcu.h
index 7592dc2b1..8824f6602 100644
--- a/rcu.h
+++ b/rcu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.h 1.6 2005/12/31 15:09:25 kls Exp $
+ * $Id: rcu.h 1.7 2007/08/24 13:15:48 kls Exp $
  */
 
 #ifndef __RCU_H
@@ -31,7 +31,7 @@ class cRcuRemote : public cRemote, private cThread, private cStatus {
   void SetMode(unsigned char Mode);
   void SetNumber(int n, bool Hex = false);
   void SetPoints(unsigned char Dp, bool On);
-  void SetString(char *s);
+  void SetString(const char *s);
   bool DetectCode(unsigned char *Code);
   virtual void Action(void);
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
diff --git a/svdrp.c b/svdrp.c
index 3694ebb80..933375f46 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.102 2007/06/23 13:14:59 kls Exp $
+ * $Id: svdrp.c 1.103 2007/08/25 09:28:26 kls Exp $
  */
 
 #include "svdrp.h"
@@ -216,10 +216,12 @@ const char *HelpPages[] = {
   "HITK [ <key> ]\n"
   "    Hit the given remote control key. Without option a list of all\n"
   "    valid key names is given.",
-  "LSTC [ <number> | <name> ]\n"
+  "LSTC [ :groups | <number> | <name> ]\n"
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
-  "    containing the given string as part of their name are listed.",
+  "    containing the given string as part of their name are listed.\n"
+  "    If ':groups' is given, all channels are listed including group\n"
+  "    separators. The channel number of a group separator is always 0.",
   "LSTE [ <channel> ] [ now | next | at <time> ]\n"
   "    List EPG data. Without any parameters all data of all channels is\n"
   "    listed. If a channel is given (either by number or by channel ID),\n"
@@ -862,7 +864,8 @@ void cSVDRP::CmdHITK(const char *Option)
 
 void cSVDRP::CmdLSTC(const char *Option)
 {
-  if (*Option) {
+  bool WithGroupSeps = strcasecmp(Option, ":groups") == 0;
+  if (*Option && !WithGroupSeps) {
      if (isnumber(Option)) {
         cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
         if (channel)
@@ -889,7 +892,9 @@ void cSVDRP::CmdLSTC(const char *Option)
      }
   else if (Channels.MaxNumber() >= 1) {
      for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-         if (!channel->GroupSep())
+         if (WithGroupSeps)
+            Reply(channel->Next() ? -250: 250, "%d %s", channel->GroupSep() ? 0 : channel->Number(), *channel->ToText());
+         else if (!channel->GroupSep())
             Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), *channel->ToText());
          }
      }
diff --git a/thread.c b/thread.c
index 4eb64f1ea..a0647d0ea 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.61 2007/06/17 12:43:40 kls Exp $
+ * $Id: thread.c 1.62 2007/08/24 13:15:48 kls Exp $
  */
 
 #include "thread.h"
@@ -416,7 +416,7 @@ bool cPipe::Open(const char *Command, const char *Mode)
      return false;
      }
 
-  char *mode = "w";
+  const char *mode = "w";
   int iopipe = 0;
 
   if (pid > 0) { // parent process
diff --git a/tools.h b/tools.h
index bd77f8576..28dbd5ea0 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.107 2007/08/05 12:11:52 kls Exp $
+ * $Id: tools.h 1.108 2007/08/25 14:16:39 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -464,6 +464,12 @@ template<class T> class cVector {
        Realloc(allocated * 4 / 2); // increase size by 50%
     data[size++] = Data;
   }
+  virtual void Remove(int Index)
+  {
+    if (Index < size - 1)
+       memmove(&data[Index], &data[Index + 1], (size - Index) * sizeof(T));
+    size--;
+  }
   virtual void Clear(void) {}
   void Sort(__compar_fn_t Compare)
   {
diff --git a/vdr.c b/vdr.c
index 0f9cf5f91..81ae6ecb4 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.298 2007/08/18 13:03:46 kls Exp $
+ * $Id: vdr.c 1.299 2007/08/25 08:51:13 kls Exp $
  */
 
 #include <getopt.h>
@@ -536,7 +536,7 @@ int main(int argc, char *argv[])
   // Configuration data:
 
   if (!ConfigDirectory)
-     ConfigDirectory = VideoDirectory;
+     ConfigDirectory = CONFDIR;
 
   cPlugin::SetConfigDirectory(ConfigDirectory);
   cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));

From dbf38b7c68911187b6a48688b738c31612d35984 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Oct 2007 18:00:00 +0200
Subject: [PATCH 176/307] =?UTF-8?q?Version=201.5.10=20-=20Implemented=20ha?=
 =?UTF-8?q?ndling=20DVB=20subtitles=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler,=20and=20also=20to=20=20=20Pekka=20Virtanen=20for=20w?=
 =?UTF-8?q?riting=20the=20subtitle=20plugin,=20which=20helped=20in=20imple?=
 =?UTF-8?q?menting=20=20=20subtitle=20handling=20in=20VDR).=20-=20The=20ne?=
 =?UTF-8?q?w=20remote=20control=20key=20"Subtitles"=20can=20be=20used=20to?=
 =?UTF-8?q?=20bring=20up=20the=20list=20=20=20of=20available=20subtitles.?=
 =?UTF-8?q?=20-=20The=20new=20setup=20option=20"DVB/Subtitle=20languages"?=
 =?UTF-8?q?=20can=20be=20used=20to=20define=20the=20=20=20preferred=20lang?=
 =?UTF-8?q?uages=20for=20subtitles.=20-=20Fixed=20selecting=20the=20audio?=
 =?UTF-8?q?=20track=20when=20pressing=20Ok=20in=20the=20Audio=20menu=20(th?=
 =?UTF-8?q?anks=20=20=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Implement?=
 =?UTF-8?q?ed=20display=20of=20DVB=20subtitles=20in=20live=20viewing=20mod?=
 =?UTF-8?q?e.=20-=20Implemented=20subtitle=20track=20selection.=20-=20Impl?=
 =?UTF-8?q?emented=20bitmap=20color=20reduction=20and=20shrinking=20to=20d?=
 =?UTF-8?q?isplay=20subtitles=20even=20=20=20on=20devices=20that=20can't?=
 =?UTF-8?q?=20display=20the=20necessary=20number=20of=20colors.=20-=20Adde?=
 =?UTF-8?q?d=20compatibility=20mode=20for=20playback=20of=20recordings=20m?=
 =?UTF-8?q?ade=20with=20the=20subtitles=20=20=20plugin=20(with=20some=20he?=
 =?UTF-8?q?lp=20from=20Rolf=20Ahrenberg).=20-=20The=20new=20setup=20option?=
 =?UTF-8?q?=20"DVB/Subtitle=20offset"=20can=20be=20used=20to=20shift=20the?=
 =?UTF-8?q?=20location=20=20=20of=20the=20subtitles=20in=20the=20vertical?=
 =?UTF-8?q?=20direction.=20-=20The=20new=20setup=20options=20"DVB/Subtitle?=
 =?UTF-8?q?=20foreground/background=20transparency"=20=20=20define=20an=20?=
 =?UTF-8?q?additional=20level=20of=20transparency=20for=20the=20foreground?=
 =?UTF-8?q?=20and=20background=20=20=20color=20of=20subtitles.=20-=20Exist?=
 =?UTF-8?q?ing=20recordings=20made=20with=20the=20subtitle=20plugin=20can?=
 =?UTF-8?q?=20be=20given=20an=20'X'=20record=20=20=20in=20their=20info.vdr?=
 =?UTF-8?q?=20file,=20so=20that=20subtitles=20can=20be=20automatically=20s?=
 =?UTF-8?q?elected=20upon=20=20=20replay,=20according=20to=20the=20preferr?=
 =?UTF-8?q?ed=20language=20setup,=20as=20in=20=20=20X=203=2003=20ger=20deu?=
 =?UTF-8?q?tsch=20=20=20(see=20vdr.5).=20Note=20that=20these=20entries=20n?=
 =?UTF-8?q?eed=20to=20be=20added=20in=20the=20proper=20sequence,=20=20=20s?=
 =?UTF-8?q?o=20that=20they=20correspond=20with=20the=20actual=20track=20la?=
 =?UTF-8?q?nguages=20in=20the=20recording.=20-=20Now=20generating=20transl?=
 =?UTF-8?q?ation=20files=20without=20line=20numbers=20to=20avoid=20unneces?=
 =?UTF-8?q?sarily=20=20=20large=20diffs.=20Plugin=20authors=20may=20want?=
 =?UTF-8?q?=20to=20replace=20the=20-F=20option=20with=20=20=20--no-locatio?=
 =?UTF-8?q?n=20in=20the=20xgettext=20and=20msgmerge=20calls=20in=20their?=
 =?UTF-8?q?=20Makefiles.=20-=20Updated=20the=20Finnish=20OSD=20texts=20(th?=
 =?UTF-8?q?anks=20to=20Rolf=20Ahrenberg).=20-=20Added=20a=20missing=20Chan?=
 =?UTF-8?q?nels.SetModified(true)=20call=20when=20deleting=20or=20moving?=
 =?UTF-8?q?=20a=20=20=20channel=20in=20the=20Channels=20menu=20(reported?=
 =?UTF-8?q?=20by=20Halim=20Sahin).=20-=20Fixed=20a=20missing=20'-'=20at=20?=
 =?UTF-8?q?the=20next=20to=20last=20line=20of=20SVDRP=20help=20texts=20(re?=
 =?UTF-8?q?ported=20by=20=20=20Denis=20Knauf).=20-=20Added=20a=20missing?=
 =?UTF-8?q?=20SetVolumeDevice()=20call=20in=20cDevice::SetPrimaryDevice()?=
 =?UTF-8?q?=20(reported=20=20=20by=20Reinhard=20Nissl).=20-=20Fixed=20a=20?=
 =?UTF-8?q?crash=20when=20pressing=20Left=20while=20at=20the=20first=20cha?=
 =?UTF-8?q?racter=20of=20a=20cMenuEditStrItem=20=20=20(thanks=20to=20Chris?=
 =?UTF-8?q?tian=20Wieninger).=20-=20Only=20creating=20a=20new=20cDvbOsdPro?=
 =?UTF-8?q?vider=20in=20cDvbDevice::MakePrimaryDevice()=20if=20'On'=20=20?=
 =?UTF-8?q?=20is=20true=20(i.e.=20this=20device=20is=20being=20made=20the?=
 =?UTF-8?q?=20primary=20device).=20-=20Updated=20the=20Italian=20OSD=20tex?=
 =?UTF-8?q?ts=20(thanks=20to=20Diego=20Pierotto).=20-=20Fixed=20handling?=
 =?UTF-8?q?=20reallocated=20memory=20in=20cCharSetConv::Convert()=20(repor?=
 =?UTF-8?q?ted=20by=20Udo=20=20=20Richter).=20-=20Fixed=20a=20new[]/delete?=
 =?UTF-8?q?=20mismatch=20in=20cMenuEditStrItem::LeaveEditMode()=20(thanks?=
 =?UTF-8?q?=20to=20=20=20Udo=20Richter).=20-=20Implemented=20sending=20all?=
 =?UTF-8?q?=20frames=20to=20devices=20that=20can=20handle=20them=20in=20fa?=
 =?UTF-8?q?st=20forward=20=20=20trick=20speeds=20(thanks=20to=20Timo=20Esk?=
 =?UTF-8?q?ola).=20-=20Updated=20the=20Hungarian=20language=20texts=20(tha?=
 =?UTF-8?q?nks=20to=20Thomas=20G=C3=BCnther).=20-=20Fixed=20description=20?=
 =?UTF-8?q?of=20DeviceSetAvailableTrack()=20and=20cReceiver(),=20and=20add?=
 =?UTF-8?q?ed=20an=20=20=20example=20~cMyReceiver()=20in=20PLUGINS.html=20?=
 =?UTF-8?q?(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Improved=20t?=
 =?UTF-8?q?he=20description=20of=20where=20logging=20goes=20in=20the=20INS?=
 =?UTF-8?q?TALL=20file=20(thanks=20to=20=20=20Elias=20Luttinen).=20-=20Add?=
 =?UTF-8?q?ed=20a=20note=20about=20how=20to=20initiate=20internationalizat?=
 =?UTF-8?q?ion=20support=20to=20the=20=20=20README.i18n=20file.=20The=20Ma?=
 =?UTF-8?q?kefile=20generated=20by=20the=20'newplugin'=20script=20now=20ha?=
 =?UTF-8?q?s=20the=20=20=20'i18n'=20target=20automatically=20create=20an?=
 =?UTF-8?q?=20initial=20'po/pluginname.pot'=20file.=20=20=20Plugin=20autho?=
 =?UTF-8?q?rs=20may=20want=20to=20add=20the=20'$(I18Npot)'=20dependency=20?=
 =?UTF-8?q?to=20the=20'i18n'=20=20=20target=20in=20their=20Makefiles,=20as?=
 =?UTF-8?q?=20in=20=20=20i18n:=20$(I18Npot)=20$(I18Nmo)=20=20=20(based=20o?=
 =?UTF-8?q?n=20a=20suggestion=20by=20Torsten=20Kunkel).=20-=20Removed=20a?=
 =?UTF-8?q?=20duplicate=20','=20from=20the=20ca=5FES.po=20file=20(thanks?=
 =?UTF-8?q?=20to=20Thomas=20G=C3=BCnther).=20-=20Added=20the=20'=C3=9F'=20?=
 =?UTF-8?q?character=20to=20the=20"allowed=20characters"=20in=20the=20de?=
 =?UTF-8?q?=5FDE.po=20file=20=20=20(suggested=20by=20Thomas=20G=C3=BCnther?=
 =?UTF-8?q?).=20-=20Made=20the=20default=20copy=20ctor=20of=20cRecording?=
 =?UTF-8?q?=20private=20(thanks=20to=20Markus=20Hahn).=20=20=20Same=20for?=
 =?UTF-8?q?=20the=20assign=20operator.=20-=20Added=20cRecording::Undelete(?=
 =?UTF-8?q?)=20(based=20on=20a=20patch=20from=20Markus=20Hahn).=20-=20Adde?=
 =?UTF-8?q?d=20cDevice::CloseFilter()=20to=20allow=20a=20device=20to=20hav?=
 =?UTF-8?q?e=20complete=20control=20over=20=20=20both=20opening=20and=20cl?=
 =?UTF-8?q?osing=20section=20filters=20(thanks=20to=20Rolf=20Ahrenberg).?=
 =?UTF-8?q?=20-=20Some=20fixes=20to=20PLUGINS.html=20(thanks=20to=20Rolf?=
 =?UTF-8?q?=20Ahrenberg).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |   41 ++
 HISTORY                             |   71 ++
 INSTALL                             |    5 +-
 MANUAL                              |   26 +
 Makefile                            |    8 +-
 PLUGINS.html                        |   54 +-
 PLUGINS/src/hello/Makefile          |    8 +-
 PLUGINS/src/hello/po/ca_ES.po       |   12 +-
 PLUGINS/src/hello/po/cs_CZ.po       |   14 +-
 PLUGINS/src/hello/po/da_DK.po       |   12 +-
 PLUGINS/src/hello/po/de_DE.po       |   14 +-
 PLUGINS/src/hello/po/el_GR.po       |   12 +-
 PLUGINS/src/hello/po/es_ES.po       |   12 +-
 PLUGINS/src/hello/po/et_EE.po       |   12 +-
 PLUGINS/src/hello/po/fi_FI.po       |   14 +-
 PLUGINS/src/hello/po/fr_FR.po       |   12 +-
 PLUGINS/src/hello/po/hr_HR.po       |   12 +-
 PLUGINS/src/hello/po/hu_HU.po       |   12 +-
 PLUGINS/src/hello/po/it_IT.po       |   12 +-
 PLUGINS/src/hello/po/nl_NL.po       |   12 +-
 PLUGINS/src/hello/po/nn_NO.po       |   12 +-
 PLUGINS/src/hello/po/pl_PL.po       |   12 +-
 PLUGINS/src/hello/po/pt_PT.po       |   12 +-
 PLUGINS/src/hello/po/ro_RO.po       |   12 +-
 PLUGINS/src/hello/po/ru_RU.po       |   14 +-
 PLUGINS/src/hello/po/sl_SI.po       |   12 +-
 PLUGINS/src/hello/po/sv_SE.po       |   12 +-
 PLUGINS/src/hello/po/tr_TR.po       |   12 +-
 PLUGINS/src/skincurses/HISTORY      |    4 +
 PLUGINS/src/skincurses/Makefile     |    8 +-
 PLUGINS/src/skincurses/po/de_DE.po  |    4 -
 PLUGINS/src/skincurses/po/fi_FI.po  |    4 -
 PLUGINS/src/skincurses/skincurses.c |    6 +-
 README.i18n                         |   18 +-
 channels.c                          |   22 +-
 channels.h                          |    6 +-
 config.c                            |   17 +-
 config.h                            |   14 +-
 device.c                            |  188 ++++-
 device.h                            |   46 +-
 dvbdevice.c                         |    9 +-
 dvbdevice.h                         |    3 +-
 dvbosd.c                            |   16 +-
 dvbplayer.c                         |   10 +-
 dvbsubtitle.c                       | 1029 +++++++++++++++++++++++++++
 dvbsubtitle.h                       |   43 ++
 eit.c                               |    6 +-
 i18n-to-gettext.pl                  |    4 +-
 keys.c                              |    3 +-
 keys.h                              |    3 +-
 menu.c                              |  164 ++++-
 menu.h                              |   20 +-
 menuitems.c                         |   12 +-
 newplugin                           |    8 +-
 osd.c                               |  106 ++-
 osd.h                               |   33 +-
 pat.c                               |   27 +-
 player.h                            |    3 +-
 po/ca_ES.po                         |  395 ++--------
 po/cs_CZ.po                         |  393 ++--------
 po/da_DK.po                         |  393 ++--------
 po/de_DE.po                         |  395 ++--------
 po/el_GR.po                         |  393 ++--------
 po/es_ES.po                         |  393 ++--------
 po/et_EE.po                         |  393 ++--------
 po/fi_FI.po                         |  393 ++--------
 po/fr_FR.po                         |  393 ++--------
 po/hr_HR.po                         |  393 ++--------
 po/hu_HU.po                         |  418 ++---------
 po/it_IT.po                         |  544 ++++----------
 po/nl_NL.po                         |  393 ++--------
 po/nn_NO.po                         |  391 ++--------
 po/pl_PL.po                         |  393 ++--------
 po/pt_PT.po                         |  391 ++--------
 po/ro_RO.po                         |  393 ++--------
 po/ru_RU.po                         |  393 ++--------
 po/sl_SI.po                         |  393 ++--------
 po/sv_SE.po                         |  393 ++--------
 po/tr_TR.po                         |  393 ++--------
 recording.c                         |   39 +-
 recording.h                         |    8 +-
 remux.c                             |   30 +-
 remux.h                             |    4 +-
 sections.c                          |    4 +-
 svdrp.c                             |    4 +-
 tools.c                             |    4 +-
 vdr.5                               |    6 +-
 vdr.c                               |   14 +-
 88 files changed, 3423 insertions(+), 7428 deletions(-)
 create mode 100644 dvbsubtitle.c
 create mode 100644 dvbsubtitle.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bddbeed12..34b4803e2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1024,6 +1024,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for improving cControl::Launch() to keep 'control' from pointing to uninitialized
  memory
  for adding internationalization to the "skincurses" plugin
+ for helping with adding compatibility mode for playback of recordings made with
+ the subtitles plugin
+ for implementing cDevice::CloseFilter()
+ for some fixes to PLUGINS.html
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1138,6 +1142,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing a busy loop in fast forward if the next video data file is missing
  for adding a debug error message to cReceiver::~cReceiver() in case it is still
  attached to a device
+ for reporting a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1293,6 +1298,8 @@ Marcus M
 Pekka Virtanen <pekka.virtanen@sci.fi>
  for adding language code handling to the subtitling descriptor in 'libsi'
  for adding missing NULL checks when accessing sectionHandler in device.c
+ for writing the subtitle plugin, which helped in implementing subtitle handling
+ in VDR
 
 John Kennedy <rkennedy@ix.netcom.com>
  for publishing "A Fast Bresenham Algorithm For Drawing Ellipses" (found at
@@ -1419,6 +1426,10 @@ Marco Schl
  for fixing a problem with characters >0x7F in the modified version of skipspace()
  for reporting a faulty comment in Make.config.template
  for fixing checking for ttDolbyLast in cDevice::SetCurrentAudioTrack()
+ for fixing selecting the audio track when pressing Ok in the Audio menu
+ for implementing handling DVB subtitles
+ for fixing the description of DeviceSetAvailableTrack() and cReceiver(), and adding
+ an example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1522,6 +1533,8 @@ Udo Richter <udo_richter@gmx.de>
  for fixing handling single byte characters >0x7F in Utf8ToArray()
  for fixing clearing color buttons in the 'curses' skin
  for adding a missing error report to cCuttingThread::Action()
+ for reporting a problem in handling reallocated memory in cCharSetConv::Convert()
+ for fixing a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1772,6 +1785,9 @@ Thomas G
  show the current APIVERSION
  for fixing i18n characters for the Hungarian texts
  for implementing using nl_langinfo(CODESET) to determine the local codeset to use
+ for removing a duplicate ',' from the ca_ES.po file
+ for suggesting to add the '�' character to the "allowed characters" in the
+ de_DE.po file
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -1878,6 +1894,8 @@ Christian Wieninger <cwieninger@gmx.de>
  for reporting a problem with the device selection in case of timer conflicts
  for a patch that fixed part of a crash in i18n character set conversion
  for reporting a bug in stripping the context in I18nTranslate()
+ for fixing a crash when pressing Left while at the first character of a
+ cMenuEditStrItem
 
 Thiemo Gehrke <tgehrke@reel-multimedia.com>
  for suggesting to add a setup option to turn off the automatic timeout of the
@@ -1949,6 +1967,8 @@ Markus Hahn <mhahn@reel-multimedia.com>
  for suggesting that the "Back" key should restore the original string when pressed
  while editing a string item
  for fixing detection of Premiere NVOD channel links
+ for making the default copy ctor of cRecording private
+ for a patch that was used to implement cRecording::Undelete()
 
 Jaroslaw Swierczynski <swiergot@gmail.com>
  for updating the Polish OSD texts and the fontosd-iso8859-2.c file
@@ -2169,3 +2189,24 @@ Bruno Roussel <bruno.roussel@free.fr>
 Matthias Becker <becker.matthias@gmail.com>
  for suggesting to add a new i18n macro that can be used by plugins to mark
  texts they want to reuse from VDR's core translations
+
+Halim Sahin <halim.sahin@t-online.de>
+ for reporting that the channels.conf file was not written when stopping VDR after
+ deleting or moving a channel in the Channels menu
+
+Denis Knauf <denis.knauf@gmail.com>
+ for reporting a missing '-' at the next to last line of SVDRP help texts
+
+Diego Pierotto <vdr-italian@tiscali.it>
+ for translating OSD texts to the Italian language
+
+Timo Eskola <timo@tolleri.net>
+ for implementing sending all frames to devices that can handle them in fast forward
+ trick speeds
+
+Elias Luttinen <el@iki.fi>
+ for improving the description of where logging goes in the INSTALL file
+
+Torsten Kunkel <vdrml@tkunkel.de>
+ for pointing out that it was not obvious how to initiate internationalization
+ support for a plugin
diff --git a/HISTORY b/HISTORY
index c89b2183c..91d32fb38 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5416,3 +5416,74 @@ Video Disk Recorder Revision History
   function to hand through the Level.
 - Fixed checking for ttDolbyLast in cDevice::SetCurrentAudioTrack() (thanks
   to Marco Schl��ler).
+
+2007-10-14: Version 1.5.10
+
+- Implemented handling DVB subtitles (thanks to Marco Schl��ler, and also to
+  Pekka Virtanen for writing the subtitle plugin, which helped in implementing
+  subtitle handling in VDR).
+- The new remote control key "Subtitles" can be used to bring up the list
+  of available subtitles.
+- The new setup option "DVB/Subtitle languages" can be used to define the
+  preferred languages for subtitles.
+- Fixed selecting the audio track when pressing Ok in the Audio menu (thanks
+  to Marco Schl��ler).
+- Implemented display of DVB subtitles in live viewing mode.
+- Implemented subtitle track selection.
+- Implemented bitmap color reduction and shrinking to display subtitles even
+  on devices that can't display the necessary number of colors.
+- Added compatibility mode for playback of recordings made with the subtitles
+  plugin (with some help from Rolf Ahrenberg).
+- The new setup option "DVB/Subtitle offset" can be used to shift the location
+  of the subtitles in the vertical direction.
+- The new setup options "DVB/Subtitle foreground/background transparency"
+  define an additional level of transparency for the foreground and background
+  color of subtitles.
+- Existing recordings made with the subtitle plugin can be given an 'X' record
+  in their info.vdr file, so that subtitles can be automatically selected upon
+  replay, according to the preferred language setup, as in
+  X 3 03 ger deutsch
+  (see vdr.5). Note that these entries need to be added in the proper sequence,
+  so that they correspond with the actual track languages in the recording.
+- Now generating translation files without line numbers to avoid unnecessarily
+  large diffs. Plugin authors may want to replace the -F option with
+  --no-location in the xgettext and msgmerge calls in their Makefiles.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added a missing Channels.SetModified(true) call when deleting or moving a
+  channel in the Channels menu (reported by Halim Sahin).
+- Fixed a missing '-' at the next to last line of SVDRP help texts (reported by
+  Denis Knauf).
+- Added a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice() (reported
+  by Reinhard Nissl).
+- Fixed a crash when pressing Left while at the first character of a cMenuEditStrItem
+  (thanks to Christian Wieninger).
+- Only creating a new cDvbOsdProvider in cDvbDevice::MakePrimaryDevice() if 'On'
+  is true (i.e. this device is being made the primary device).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed handling reallocated memory in cCharSetConv::Convert() (reported by Udo
+  Richter).
+- Fixed a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode() (thanks to
+  Udo Richter).
+- Implemented sending all frames to devices that can handle them in fast forward
+  trick speeds (thansk to Timo Eskola).
+- Updated the Hungarian language texts (thanks to Thomas G�nther).
+- Fixed description of DeviceSetAvailableTrack() and cReceiver(), and added an
+  example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
+- Improved the description of where logging goes in the INSTALL file (thanks to
+  Elias Luttinen).
+- Added a note about how to initiate internationalization support to the
+  README.i18n file. The Makefile generated by the 'newplugin' script now has the
+  'i18n' target automatically create an initial 'po/pluginname.pot' file.
+  Plugin authors may want to add the '$(I18Npot)' dependency to the 'i18n'
+  target in their Makefiles, as in
+  i18n: $(I18Npot) $(I18Nmo)
+  (based on a suggestion by Torsten Kunkel).
+- Removed a duplicate ',' from the ca_ES.po file (thanks to Thomas G�nther).
+- Added the '�' character to the "allowed charcaters" in the de_DE.po file
+  (suggested by Thomas G�nther).
+- Made the default copy ctor of cRecording private (thanks to Markus Hahn).
+  Same for the assign operator.
+- Added cRecording::Undelete() (based on a patch from Markus Hahn).
+- Added cDevice::CloseFilter() to allow a device to have complete control over
+  both opening and closing section filters (thanks to Rolf Ahrenberg).
+- Some fixes to PLUGINS.html (thanks to Rolf Ahrenberg).
diff --git a/INSTALL b/INSTALL
index a26e43bb0..573c6c084 100644
--- a/INSTALL
+++ b/INSTALL
@@ -66,8 +66,9 @@ to the 'make' command. Alternatively, you can call VDR with the command
 line option '--vfat'.
 
 When running, the 'vdr' program writes status information into the
-system log file (/var/log/messages). You may want to watch these
-messages (tail -f /var/log/mesages) to see if there are any problems.
+system log file, which is usually /var/log/messages (or /var/log/user.log,
+depending on your syslog configuration). You may want to watch these
+messages (tail -f /var/log/messages) to see if there are any problems.
 
 The program can be controlled via a network connection to its SVDRP
 port ("Simple Video Disk Recorder Protocol"). By default, it listens
diff --git a/MANUAL b/MANUAL
index 60c6a71fb..106533c1d 100644
--- a/MANUAL
+++ b/MANUAL
@@ -59,6 +59,7 @@ Version 1.4
   Mute        mute
 
   Audio       select audio track
+  Subtitles   select subtitles
 
   Schedule    \
   Channels    |
@@ -675,6 +676,31 @@ Version 1.4
                          many "Audio language" options which allow you to select the
                          individual preferred languages.
 
+  Display subtitles = no If set to 'yes', the first available subtitles in the list
+                         of preferred subtitle languages will be turned on when
+                         switching to a channel that provides subtitles.
+
+  Subtitle languages = 0 Some tv stations broadcast various subtitle tracks in different
+                         languages. This option allows you to define which language(s)
+                         you prefer in such cases. By default, or if none of the
+                         preferred languages is broadcast, no subtitles will
+                         be selected when switching to such a channel. If this option
+                         is set to a non-zero value, the menu page will contain that
+                         many "Subtitle language" options which allow you to select the
+                         individual preferred languages.
+
+  Subtitle offset = 0    Allows you to shift the location of the subtitles in the
+                         vertical direction. The valid range is -50...50. This option
+                         is only avialable if "Display subtitles" is set to 'yes'.
+
+  Subtitle foreground transparency = 0
+  Subtitle background transparency = 0
+                         These define an additional level of transparency for the
+                         foreground and background color of subtitles. Valid ranges
+                         are 0...9 for foreground transparency, and 0...10 for
+                         background transparency. By default the values as broadcast
+                         are used.
+
   LNB:
 
   SLOF               = 11700  The switching frequency (in MHz) between low and
diff --git a/Makefile b/Makefile
index 294ca7884..aea69957e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.106 2007/08/25 08:52:17 kls Exp $
+# $Id: Makefile 1.108 2007/10/13 09:26:40 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -37,7 +37,7 @@ DOXYFILE = Doxyfile
 SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o dvbosd.o\
-       dvbplayer.o dvbspu.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
+       dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
        skinclassic.o skins.o skinsttng.o sources.o spu.o status.o svdrp.o themes.o thread.o\
@@ -114,10 +114,10 @@ I18Npot   = $(PODIR)/vdr.pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
 
 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 
 i18n: $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
diff --git a/PLUGINS.html b/PLUGINS.html
index 0b0b49563..e34ab0ec8 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.1 are marked like this.
-<!--X1.5.1--></td></tr></table>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.3 are marked like this.
 <!--X1.5.3--></td></tr></table>
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.7 are marked like this.
 <!--X1.5.7--></td></tr></table>
-<!--X1.5.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.8 are marked like this.
 <!--X1.5.8--></td></tr></table>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.10 are marked like this.
+<!--X1.5.10--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -64,9 +64,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Housekeeping">Housekeeping</a>
 <li><a href="#Main thread hook">Main thread hook</a>
 <li><a href="#Activity">Activity</a>
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <li><a href="#Wakeup">Wakeup</a>
-<!--X1.5.1--></td></tr></table>
 <li><a href="#Setup parameters">Setup parameters</a>
 <li><a href="#The Setup menu">The Setup menu</a>
 <li><a href="#Configuration files">Configuration files</a>
@@ -685,7 +683,6 @@ <h1>Table Of Contents</h1>
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
 
-<!--X1.5.1--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Wakeup"><hr><h2>Wakeup</h2>
 
 <center><i><b>Wake me up before you go-go</b></i></center><p>
@@ -718,7 +715,6 @@ <h1>Table Of Contents</h1>
 return a string when <tt>Active()</tt> is called at that time, otherwise VDR may shut down
 again instantly. If <tt>WakeupTime()</tt> returns a time that is not in
 the future, the time will be ignored.
-<!--X1.5.1--></td></tr></table>
 
 <a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
@@ -910,7 +906,7 @@ <h1>Table Of Contents</h1>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
 
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 If a plugin displays texts to the user, it should prepare for internationalization
 of these texts. All that is necessary for this is to mark every text that is
 presented to the user as translatable, as in
@@ -921,7 +917,7 @@ <h1>Table Of Contents</h1>
 
 The text given here must be the English version, and the returned pointer is either
 a translated version (if available) or the original string.
-<!--X1.5.8--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Texts are searched for in the domain registered for this plugin.
 If a plugin wants to make use of texts defined by the core VDR code, it can use
 the special <tt>trVDR()</tt> macro to mark these texts without having them
@@ -944,7 +940,7 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 The system VDR is running on may use a character encoding where a single character
 (or <i>symbol</i>) consists of more than one byte (UTF-8, as opposed to, for instance,
 ISO8859-1, where every character is represented by a single byte in memory).
@@ -1332,7 +1328,9 @@ <h1>Table Of Contents</h1>
 available audio tracks by calling
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, uint32_t Flags = 0)
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL)
+<!--X1.5.10--></td></tr></table>
 </pre></td></tr></table><p>
 
 See <tt>device.h</tt> for details about the parameters for track handling.
@@ -1458,10 +1456,20 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-:cReceiver(0, -1, Pid)
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+:cReceiver(tChannelID(), -1, Pid)
+<!--X1.5.10--></td></tr></table>
 {
 }
 
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%><pre>
+cMyReceiver::~cMyReceiver()
+{
+  cReceiver::Detach();
+  ...
+}
+<!--X1.5.10--></pre></td></tr></table>
+
 void cMyReceiver::Activate(bool On)
 {
   // start your own thread for processing the received data
@@ -1606,7 +1614,7 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Special consideration may have to be given to color usage if the OSD provides
 8bpp (256 colors). In that case, fonts may be drawn using <i>anti-aliasing</i>,
 which requires several blended color values between the foreground and background
@@ -1778,7 +1786,7 @@ <h1>Table Of Contents</h1>
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual bool ProvidesSource(int Source) const;
 virtual bool ProvidesTransponder(const cChannel *Channel) const;
-virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
+virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 </pre></td></tr></table><p>
 
@@ -1824,6 +1832,9 @@ <h1>Table Of Contents</h1>
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual int64_t GetSTC(void);
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+virtual bool HasIBPTrickSpeed(void);
+<!--X1.5.10--></td></tr></table>
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
 virtual void Play(void);
@@ -1838,7 +1849,7 @@ <h1>Table Of Contents</h1>
 functionality:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int Si
+virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
 virtual void SetVideoFormat(bool VideoFormat16_9);
 virtual void SetVolumeDevice(int Volume);
 </pre></td></tr></table><p>
@@ -1847,13 +1858,16 @@ <h1>Table Of Contents</h1>
 <b>Section Filtering</b>
 <p>
 If your device provides section filtering capabilities it can implement
-the function
+the functions
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+virtual void CloseFilter(int Handle);
+<!--X1.5.10--></td></tr></table>
 </pre></td></tr></table><p>
 
-which must open a file handle that delivers section data for the given
+which must open and close a file handle that delivers section data for the given
 filter parameters.
 <p>
 In order to actually start section handling, the
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 80b6c8cb1..92e8af4a4 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.18 2007/08/19 14:18:59 kls Exp $
+# $Id: Makefile 1.20 2007/10/14 09:23:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -80,12 +80,12 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
 
 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 
-i18n: $(I18Nmo)
+i18n: $(I18Npot) $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index fb239525a..f1f2a5839 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index cc5c80a3d..756a3f04d 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "P��telsk� pozdrav"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "Ahoj"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "�as pozdravu (s)"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "Pou��t alternativn� pozdrav"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "Ahoj sv�te!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "Nazdar vespolek!"
+
+msgid "Hello world!"
+msgstr "Ahoj sv�te!"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index 266a7a479..f3dc75b40 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index cb2b9dd0a..5a3c127b3 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "Ein freundlicher Gru�"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "Hallo"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "Dauer des Gru�es (s)"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "Alternativen Gru� verwenden"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "Hallo Welt!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "Tach zusammen!"
+
+msgid "Hello world!"
+msgstr "Hallo Welt!"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index 468251415..2862841d7 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index c59a4b83a..ee74cca6c 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index ca4eb5f10..802465f40 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 516634d4c..f67109b3c 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,26 +18,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "Yst�v�llisin terveisin"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "Hei"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "Tervehdysaika (s)"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "K�yt� vaihtoehtoista tervehdyst�"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "Hei maailma!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "Mit� kuuluu?"
+
+msgid "Hello world!"
+msgstr "Hei maailma!"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index e23815b17..f50541946 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,26 +18,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index ca84dc759..ef14e622d 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index a6c470c04..dc5434679 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index 4e7386b8f..f3f050904 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index ae81781e5..59e8f0485 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index 45d2cc91c..e9d5f329f 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 5c3db8738..9187318d6 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index f2cd23c9a..b76f1fd19 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index 43d97f13a..f2db4ac46 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index eeacdca89..0f429acae 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "��������� �����������"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "������!"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "����������������� �����������"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "�������������� �����������"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "���������� ���!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "��� ���������?"
+
+msgid "Hello world!"
+msgstr "���������� ���!"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index 783528a2f..dcc35e3e6 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index b897ce2a3..c7728cd82 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index bcf7ceb4a..ce9eddaa8 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
+msgid "Howdy folks!"
 msgstr ""
 
-#: hello.c:129
-msgid "Howdy folks!"
+msgid "Hello world!"
 msgstr ""
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 02065a4de..34efba9cc 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -57,3 +57,7 @@ VDR Plugin 'skincurses' Revision History
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
 - Added internationalization.
+
+2007-08-26: Version 0.1.4
+
+- Adapted to the new Level parameter of cOsd.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 5199dd8b5..3eea4ddfb 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2007/08/19 14:19:07 kls Exp $
+# $Id: Makefile 1.13 2007/10/14 09:23:25 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -78,12 +78,12 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
 
 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 
-i18n: $(I18Nmo)
+i18n: $(I18Npot) $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index e80cdc63c..98659dffe 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -15,18 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: skincurses.c:15
 msgid "A text only skin"
 msgstr "Eine reine Text-Oberfl�che"
 
-#: skincurses.c:566
 msgid "Key$Mute"
 msgstr "Stumm"
 
-#: skincurses.c:569
 msgid "Volume "
 msgstr "Lautst�rke"
 
-#: skincurses.c:699
 msgid "Text mode"
 msgstr "Text-Modus"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index d4a474295..1f527cd57 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -15,18 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: skincurses.c:15
 msgid "A text only skin"
 msgstr "Tekstipohjainen ulkoasu"
 
-#: skincurses.c:566
 msgid "Key$Mute"
 msgstr "Mykistys"
 
-#: skincurses.c:569
 msgid "Volume "
 msgstr "��nenvoimakkuus "
 
-#: skincurses.c:699
 msgid "Text mode"
 msgstr "Teksti"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 0553de9c1..b9a4fc065 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.17 2007/08/15 14:01:54 kls Exp $
+ * $Id: skincurses.c 1.18 2007/08/26 20:16:59 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.3";
+static const char *VERSION        = "0.1.4";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -72,7 +72,7 @@ class cCursesOsd : public cOsd {
   };
 
 cCursesOsd::cCursesOsd(int Left, int Top)
-:cOsd(Left, Top)
+:cOsd(Left, Top, 0)
 {
   savedRegion = NULL;
 
diff --git a/README.i18n b/README.i18n
index 2df584891..0c505b6f6 100644
--- a/README.i18n
+++ b/README.i18n
@@ -7,6 +7,19 @@ these texts. The instructions apply equally to VDR itself or any
 plugin.
 
 
+How to initiate internationalization support
+--------------------------------------------
+
+Not every plugin necessarily has texts that are visible to the
+user, therefore there is by default no 'po' directory.
+If your plugin source contains texts marked for translation
+with tr(), you need to
+
+- Change into the source directory.
+- Enter the command 'mkdir po'.
+
+After that, continue with "How to translate to a new language".
+
 How to translate to a new language
 ----------------------------------
 
@@ -18,15 +31,16 @@ How to translate to a new language
   will create a new *.po file for your language.
 - Edit the new *.po file and translate the texts.
   You can do this either with your favorite text editor, or
-  with a specialited tool like POEdit, GTranslator, KBabel
+  with a specialized tool like POEdit, GTranslator, KBabel
   or whatever you have.
 
 How to maintain an existing language file
 -----------------------------------------
 
+- Change into the source directory.
 - Do a 'make i18n' to have the *.po files brought up-to-date
   with the texts in the source code.
-- Edit the new *.po file and translate the texts.
+- Edit the modified *.po file(s) and translate the texts.
   If you are using a plain text editor, you should search for
   empty strings ("") to find new, untranslated texts. Also,
   look for the "fuzzy" keyword to find translations that have
diff --git a/channels.c b/channels.c
index d725ac763..b01bb9319 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.54 2007/07/21 14:55:01 kls Exp $
+ * $Id: channels.c 1.55 2007/10/12 14:40:53 kls Exp $
  */
 
 #include "channels.h"
@@ -440,12 +440,12 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
   return q - s;
 }
 
-void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid)
+void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
 {
   int mod = CHANNELMOD_NONE;
   if (vpid != Vpid || ppid != Ppid || tpid != Tpid)
      mod |= CHANNELMOD_PIDS;
-  int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs);
+  int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs) | IntArraysDiffer(spids, Spids, slangs, SLangs);
   if (m & STRDIFF)
      mod |= CHANNELMOD_LANGS;
   if (m & VALDIFF)
@@ -468,7 +468,16 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE
         q += IntArrayToString(q, Dpids, 10, DLangs);
         }
      *q = 0;
-     dsyslog("changing pids of channel %d from %d+%d:%s:%d to %d+%d:%s:%d", Number(), vpid, ppid, OldApidsBuf, tpid, Vpid, Ppid, NewApidsBuf, Tpid);
+     const int SBufferSize = MAXSPIDS * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
+     char OldSpidsBuf[SBufferSize];
+     char NewSpidsBuf[SBufferSize];
+     q = OldSpidsBuf;
+     q += IntArrayToString(q, spids, 10, slangs);
+     *q = 0;
+     q = NewSpidsBuf;
+     q += IntArrayToString(q, Spids, 10, SLangs);
+     *q = 0;
+     dsyslog("changing pids of channel %d from %d+%d:%s:%s:%d to %d+%d:%s:%s:%d", Number(), vpid, ppid, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, NewApidsBuf, NewSpidsBuf, Tpid);
      vpid = Vpid;
      ppid = Ppid;
      for (int i = 0; i < MAXAPIDS; i++) {
@@ -481,6 +490,11 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE
          strn0cpy(dlangs[i], DLangs[i], MAXLANGCODE2);
          }
      dpids[MAXDPIDS] = 0;
+     for (int i = 0; i < MAXSPIDS; i++) {
+         spids[i] = Spids[i];
+         strn0cpy(slangs[i], SLangs[i], MAXLANGCODE2);
+         }
+     spids[MAXSPIDS] = 0;
      tpid = Tpid;
      modification |= mod;
      Channels.SetModified();
diff --git a/channels.h b/channels.h
index 6381a2016..6eaa66f92 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.44 2007/07/21 14:58:36 kls Exp $
+ * $Id: channels.h 1.45 2007/09/02 10:23:11 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -33,7 +33,7 @@
 
 #define MAXAPIDS 32 // audio
 #define MAXDPIDS 16 // dolby (AC3 + DTS)
-#define MAXSPIDS  8 // subtitles
+#define MAXSPIDS 32 // subtitles
 #define MAXCAIDS  8 // conditional access
 
 #define MAXLANGCODE1 4 // a 3 letter language code, zero terminated
@@ -212,7 +212,7 @@ class cChannel : public cListObject {
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
-  void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid);
+  void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
   void SetLinkChannels(cLinkChannels *LinkChannels);
diff --git a/config.c b/config.c
index aed0936a1..1305ffbb5 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.156 2007/08/12 12:09:37 kls Exp $
+ * $Id: config.c 1.157 2007/10/06 14:28:58 kls Exp $
  */
 
 #include "config.h"
@@ -236,6 +236,11 @@ cSetup::cSetup(void)
   MarginStart = 2;
   MarginStop = 10;
   AudioLanguages[0] = -1;
+  DisplaySubtitles = 0;
+  SubtitleLanguages[0] = -1;
+  SubtitleOffset = 0;
+  SubtitleFgTransparency = 0;
+  SubtitleBgTransparency = 0;
   EPGLanguages[0] = -1;
   EPGScanTimeout = 5;
   EPGBugfixLevel = 3;
@@ -406,6 +411,11 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
   else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
   else if (!strcasecmp(Name, "AudioLanguages"))      return ParseLanguages(Value, AudioLanguages);
+  else if (!strcasecmp(Name, "DisplaySubtitles"))    DisplaySubtitles   = atoi(Value);
+  else if (!strcasecmp(Name, "SubtitleLanguages"))   return ParseLanguages(Value, SubtitleLanguages);
+  else if (!strcasecmp(Name, "SubtitleOffset"))      SubtitleOffset     = atoi(Value);
+  else if (!strcasecmp(Name, "SubtitleFgTransparency")) SubtitleFgTransparency = atoi(Value);
+  else if (!strcasecmp(Name, "SubtitleBgTransparency")) SubtitleBgTransparency = atoi(Value);
   else if (!strcasecmp(Name, "EPGLanguages"))        return ParseLanguages(Value, EPGLanguages);
   else if (!strcasecmp(Name, "EPGScanTimeout"))      EPGScanTimeout     = atoi(Value);
   else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
@@ -483,6 +493,11 @@ bool cSetup::Save(void)
   Store("MarginStart",        MarginStart);
   Store("MarginStop",         MarginStop);
   StoreLanguages("AudioLanguages", AudioLanguages);
+  Store("DisplaySubtitles",   DisplaySubtitles);
+  StoreLanguages("SubtitleLanguages", SubtitleLanguages);
+  Store("SubtitleOffset",     SubtitleOffset);
+  Store("SubtitleFgTransparency", SubtitleFgTransparency);
+  Store("SubtitleBgTransparency", SubtitleBgTransparency);
   StoreLanguages("EPGLanguages", EPGLanguages);
   Store("EPGScanTimeout",     EPGScanTimeout);
   Store("EPGBugfixLevel",     EPGBugfixLevel);
diff --git a/config.h b/config.h
index a5efb9b72..e51637f6e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.298 2007/08/19 16:02:50 kls Exp $
+ * $Id: config.h 1.299 2007/10/06 14:27:18 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.9"
-#define VDRVERSNUM   10509  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.10"
+#define VDRVERSNUM   10510  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.9"
-#define APIVERSNUM   10509  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.10"
+#define APIVERSNUM   10510  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -220,6 +220,10 @@ class cSetup : public cConfig<cSetupLine> {
   int TimeTransponder;
   int MarginStart, MarginStop;
   int AudioLanguages[I18N_MAX_LANGUAGES + 1];
+  int DisplaySubtitles;
+  int SubtitleLanguages[I18N_MAX_LANGUAGES + 1];
+  int SubtitleOffset;
+  int SubtitleFgTransparency, SubtitleBgTransparency;
   int EPGLanguages[I18N_MAX_LANGUAGES + 1];
   int EPGScanTimeout;
   int EPGBugfixLevel;
diff --git a/device.c b/device.c
index e23b74b84..73decabb9 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.142 2007/08/26 11:11:42 kls Exp $
+ * $Id: device.c 1.145 2007/10/14 13:09:19 kls Exp $
  */
 
 #include "device.h"
@@ -19,6 +19,75 @@
 #include "status.h"
 #include "transfer.h"
 
+// --- cLiveSubtitle ---------------------------------------------------------
+
+#define LIVESUBTITLEBUFSIZE  KILOBYTE(100)
+
+class cLiveSubtitle : public cReceiver, public cThread {
+private:
+  cRingBufferLinear *ringBuffer;
+  cRemux *remux;
+protected:
+  virtual void Activate(bool On);
+  virtual void Receive(uchar *Data, int Length);
+  virtual void Action(void);
+public:
+  cLiveSubtitle(int SPid);
+  virtual ~cLiveSubtitle();
+  };
+
+cLiveSubtitle::cLiveSubtitle(int SPid)
+:cReceiver(tChannelID(), -1, SPid)
+,cThread("live subtitle")
+{
+  ringBuffer = new cRingBufferLinear(LIVESUBTITLEBUFSIZE, TS_SIZE * 2, true, "Live Subtitle");
+  int NoPids = 0;
+  int SPids[] = { SPid, 0 };
+  remux = new cRemux(0, &NoPids, &NoPids, SPids);
+}
+
+cLiveSubtitle::~cLiveSubtitle()
+{
+  cReceiver::Detach();
+  delete remux;
+  delete ringBuffer;
+}
+
+void cLiveSubtitle::Activate(bool On)
+{
+  if (On)
+     Start();
+  else
+     Cancel(3);
+}
+
+void cLiveSubtitle::Receive(uchar *Data, int Length)
+{
+  if (Running()) {
+     int p = ringBuffer->Put(Data, Length);
+     if (p != Length && Running())
+        ringBuffer->ReportOverflow(Length - p);
+     }
+}
+
+void cLiveSubtitle::Action(void)
+{
+  while (Running()) {
+        int Count;
+        uchar *b = ringBuffer->Get(Count);
+        if (b) {
+           Count = remux->Put(b, Count);
+           if (Count)
+              ringBuffer->Del(Count);
+           }
+        b = remux->Get(Count);
+        if (b) {
+           Count = cDevice::PrimaryDevice()->PlaySubtitle(b, Count);
+           remux->Del(Count);
+           }
+        }
+}
+
 // --- cPesAssembler ---------------------------------------------------------
 
 class cPesAssembler {
@@ -172,6 +241,10 @@ cDevice::cDevice(void)
   ClrAvailableTracks();
   currentAudioTrack = ttNone;
   currentAudioTrackMissingCount = 0;
+  currentSubtitleTrack = ttNone;
+  liveSubtitle = NULL;
+  dvbSubtitleConverter = NULL;
+  autoSelectPreferredSubtitleLanguage = true;
 
   for (int i = 0; i < MAXRECEIVERS; i++)
       receiver[i] = NULL;
@@ -186,6 +259,8 @@ cDevice::~cDevice()
 {
   Detach(player);
   DetachAllReceivers();
+  delete liveSubtitle;
+  delete dvbSubtitleConverter;
   delete nitFilter;
   delete sdtFilter;
   delete patFilter;
@@ -251,6 +326,7 @@ bool cDevice::SetPrimaryDevice(int n)
      primaryDevice = device[n];
      primaryDevice->MakePrimaryDevice(true);
      primaryDevice->SetVideoFormat(Setup.VideoFormat);
+     primaryDevice->SetVolumeDevice(Setup.CurrentVolume);
      return true;
      }
   esyslog("ERROR: invalid primary device number: %d", n + 1);
@@ -576,6 +652,11 @@ int cDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   return -1;
 }
 
+void cDevice::CloseFilter(int Handle)
+{
+  close(Handle);
+}
+
 void cDevice::AttachFilter(cFilter *Filter)
 {
   if (sectionHandler)
@@ -674,8 +755,11 @@ bool cDevice::SwitchChannel(int Direction)
 
 eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 {
-  if (LiveView)
+  if (LiveView) {
      StopReplay();
+     DELETENULL(liveSubtitle);
+     DELETENULL(dvbSubtitleConverter);
+     }
 
   cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, 0, LiveView) : this;
 
@@ -735,8 +819,11 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
            for (int i = 0; i < MAXDPIDS; i++)
                SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i));
            }
+        for (int i = 0; i < MAXSPIDS; i++)
+            SetAvailableTrack(ttSubtitle, i, Channel->Spid(i), Channel->Slang(i));
         if (!NeedsTransferMode)
            EnsureAudioTrack(true);
+        EnsureSubtitleTrack();
         }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }
@@ -848,6 +935,7 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly, bool IdsOnly)
      SetAudioChannel(0); // fall back to stereo
      currentAudioTrackMissingCount = 0;
      currentAudioTrack = ttNone;
+     currentSubtitleTrack = ttNone;
      }
 }
 
@@ -855,18 +943,23 @@ bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const c
 {
   eTrackType t = eTrackType(Type + Index);
   if (Type == ttAudio && IS_AUDIO_TRACK(t) ||
-      Type == ttDolby && IS_DOLBY_TRACK(t)) {
+      Type == ttDolby && IS_DOLBY_TRACK(t) ||
+      Type == ttSubtitle && IS_SUBTITLE_TRACK(t)) {
      if (Language)
         strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language));
      if (Description)
         Utf8Strn0Cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
      if (Id) {
         availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
-        int numAudioTracks = NumAudioTracks();
-        if (!availableTracks[currentAudioTrack].id && numAudioTracks && currentAudioTrackMissingCount++ > numAudioTracks * 10)
-           EnsureAudioTrack();
-        else if (t == currentAudioTrack)
-           currentAudioTrackMissingCount = 0;
+        if (Type == ttAudio || Type == ttDolby) {
+           int numAudioTracks = NumAudioTracks();
+           if (!availableTracks[currentAudioTrack].id && numAudioTracks && currentAudioTrackMissingCount++ > numAudioTracks * 10)
+              EnsureAudioTrack();
+           else if (t == currentAudioTrack)
+              currentAudioTrackMissingCount = 0;
+           }
+        else if (Type == ttSubtitle && autoSelectPreferredSubtitleLanguage)
+           EnsureSubtitleTrack();
         }
      return true;
      }
@@ -880,16 +973,26 @@ const tTrackId *cDevice::GetTrack(eTrackType Type)
   return (ttNone < Type && Type < ttMaxTrackTypes) ? &availableTracks[Type] : NULL;
 }
 
-int cDevice::NumAudioTracks(void) const
+int cDevice::NumTracks(eTrackType FirstTrack, eTrackType LastTrack) const
 {
   int n = 0;
-  for (int i = ttAudioFirst; i <= ttDolbyLast; i++) {
+  for (int i = FirstTrack; i <= LastTrack; i++) {
       if (availableTracks[i].id)
          n++;
       }
   return n;
 }
 
+int cDevice::NumAudioTracks(void) const
+{
+  return NumTracks(ttAudioFirst, ttDolbyLast);
+}
+
+int cDevice::NumSubtitleTracks(void) const
+{
+  return NumTracks(ttSubtitleFirst, ttSubtitleLast);
+}
+
 bool cDevice::SetCurrentAudioTrack(eTrackType Type)
 {
   if (ttNone < Type && Type <= ttDolbyLast) {
@@ -908,6 +1011,30 @@ bool cDevice::SetCurrentAudioTrack(eTrackType Type)
   return false;
 }
 
+bool cDevice::SetCurrentSubtitleTrack(eTrackType Type, bool Manual)
+{
+  if (Type == ttNone || IS_SUBTITLE_TRACK(Type)) {
+     currentSubtitleTrack = Type;
+     autoSelectPreferredSubtitleLanguage = !Manual;
+     if (dvbSubtitleConverter)
+        dvbSubtitleConverter->Reset();
+     if (Type == ttNone && dvbSubtitleConverter) {
+        cMutexLock MutexLock(&mutexCurrentSubtitleTrack);
+        DELETENULL(dvbSubtitleConverter);
+        }
+     DELETENULL(liveSubtitle);
+     if (currentSubtitleTrack != ttNone && !Replaying() && !Transferring()) {
+        const tTrackId *TrackId = GetTrack(currentSubtitleTrack);
+        if (TrackId && TrackId->id) {
+           liveSubtitle = new cLiveSubtitle(TrackId->id);
+           AttachReceiver(liveSubtitle);
+           }
+        }
+     return true;
+     }
+  return false;
+}
+
 void cDevice::EnsureAudioTrack(bool Force)
 {
   if (Force || !availableTracks[currentAudioTrack].id) {
@@ -939,6 +1066,25 @@ void cDevice::EnsureAudioTrack(bool Force)
      }
 }
 
+void cDevice::EnsureSubtitleTrack(void)
+{
+  if (Setup.DisplaySubtitles) {
+     eTrackType PreferredTrack = ttSubtitleFirst;
+     int LanguagePreference = -1;
+     for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
+         const tTrackId *TrackId = GetTrack(eTrackType(i));
+         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference))
+            PreferredTrack = eTrackType(i);
+         }
+     // Make sure we're set to an available subtitle track:
+     const tTrackId *Track = GetTrack(GetCurrentSubtitleTrack());
+     if (!Track || !Track->id || PreferredTrack != GetCurrentSubtitleTrack())
+        SetCurrentSubtitleTrack(PreferredTrack);
+     }
+  else
+     SetCurrentSubtitleTrack(ttNone);
+}
+
 bool cDevice::CanReplay(void) const
 {
   return HasDecoder();
@@ -961,6 +1107,8 @@ void cDevice::TrickSpeed(int Speed)
 void cDevice::Clear(void)
 {
   Audios.ClearAudio();
+  if (dvbSubtitleConverter)
+     dvbSubtitleConverter->Reset();
 }
 
 void cDevice::Play(void)
@@ -1016,6 +1164,9 @@ void cDevice::Detach(cPlayer *Player)
      player = NULL; // avoids recursive calls to Detach()
      p->Activate(false);
      p->device = NULL;
+     cMutexLock MutexLock(&mutexCurrentSubtitleTrack);
+     delete dvbSubtitleConverter;
+     dvbSubtitleConverter = NULL;
      SetPlayMode(pmNone);
      SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
      Audios.ClearAudio();
@@ -1051,6 +1202,13 @@ int cDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
   return -1;
 }
 
+int cDevice::PlaySubtitle(const uchar *Data, int Length)
+{
+  if (!dvbSubtitleConverter)
+     dvbSubtitleConverter = new cDvbSubtitleConverter;
+  return dvbSubtitleConverter->Convert(Data, Length);
+}
+
 int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 {
   cMutexLock MutexLock(&mutexCurrentAudioTrack);
@@ -1076,6 +1234,11 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                break;
           case 0xBD: { // private stream 1
                int PayloadOffset = Data[8] + 9;
+
+               // Compatibility mode for old subtitles plugin:
+               if ((Data[PayloadOffset - 3] & 0x81) == 1 && Data[PayloadOffset - 2] == 0x81)
+                  PayloadOffset--;
+
                uchar SubStreamId = Data[PayloadOffset];
                uchar SubStreamType = SubStreamId & 0xF0;
                uchar SubStreamIndex = SubStreamId & 0x1F;
@@ -1090,6 +1253,9 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                switch (SubStreamType) {
                  case 0x20: // SPU
                  case 0x30: // SPU
+                      SetAvailableTrack(ttSubtitle, SubStreamIndex, SubStreamId);
+                      if (!VideoOnly && currentSubtitleTrack != ttNone && SubStreamId == availableTracks[currentSubtitleTrack].id)
+                         w = PlaySubtitle(Start, d);
                       break;
                  case 0x80: // AC3 & DTS
                       if (Setup.UseDolbyDigital) {
@@ -1139,6 +1305,8 @@ int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
 {
   if (!Data) {
      pesAssembler->Reset();
+     if (dvbSubtitleConverter)
+        dvbSubtitleConverter->Reset();
      return 0;
      }
   int Result = 0;
diff --git a/device.h b/device.h
index e74c88416..825aadf5e 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.82 2007/07/22 11:20:13 kls Exp $
+ * $Id: device.h 1.85 2007/10/14 13:09:12 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -12,6 +12,7 @@
 
 #include "channels.h"
 #include "ci.h"
+#include "dvbsubtitle.h"
 #include "eit.h"
 #include "filter.h"
 #include "nit.h"
@@ -70,16 +71,15 @@ enum eTrackType { ttNone,
                   ttDolby,
                   ttDolbyFirst = ttDolby,
                   ttDolbyLast  = ttDolbyFirst + 15, // MAXDPIDS - 1
-                  /* future...
                   ttSubtitle,
                   ttSubtitleFirst = ttSubtitle,
-                  ttSubtitleLast  = ttSubtitleFirst + 7, // MAXSPIDS - 1
-                  */
+                  ttSubtitleLast  = ttSubtitleFirst + 31, // MAXSPIDS - 1
                   ttMaxTrackTypes
                 };
 
 #define IS_AUDIO_TRACK(t) (ttAudioFirst <= (t) && (t) <= ttAudioLast)
 #define IS_DOLBY_TRACK(t) (ttDolbyFirst <= (t) && (t) <= ttDolbyLast)
+#define IS_SUBTITLE_TRACK(t) (ttSubtitleFirst <= (t) && (t) <= ttSubtitleLast)
 
 struct tTrackId {
   uint16_t id;                  // The PES packet id or the PID.
@@ -90,10 +90,12 @@ struct tTrackId {
 class cPlayer;
 class cReceiver;
 class cPesAssembler;
+class cLiveSubtitle;
 
 /// The cDevice class is the base from which actual devices can be derived.
 
 class cDevice : public cThread {
+  friend class cLiveSubtitle;
 private:
   static int numDevices;
   static int useDevice;
@@ -185,6 +187,9 @@ class cDevice : public cThread {
 
 // SPU facilities
 
+private:
+  cLiveSubtitle *liveSubtitle;
+  cDvbSubtitleConverter *dvbSubtitleConverter;
 public:
   virtual cSpuDecoder *GetSpuDecoder(void);
          ///< Returns a pointer to the device's SPU decoder (or NULL, if this
@@ -303,6 +308,11 @@ class cDevice : public cThread {
        ///< Opens a file handle for the given filter data.
        ///< A derived device that provides section data must
        ///< implement this function.
+  virtual void CloseFilter(int Handle);
+       ///< Closes a file handle that has previously been opened
+       ///< by OpenFilter(). If this is as simple as calling close(Handle),
+       ///< a derived class need not implement this function, because this
+       ///< is done by the default implementation.
   void AttachFilter(cFilter *Filter);
        ///< Attaches the given filter to this device.
   void Detach(cFilter *Filter);
@@ -362,8 +372,11 @@ class cDevice : public cThread {
 private:
   tTrackId availableTracks[ttMaxTrackTypes];
   eTrackType currentAudioTrack;
+  eTrackType currentSubtitleTrack;
   cMutex mutexCurrentAudioTrack;
+  cMutex mutexCurrentSubtitleTrack;
   int currentAudioTrackMissingCount;
+  bool autoSelectPreferredSubtitleLanguage;
   bool pre_1_3_19_PrivateStream;
 protected:
   virtual void SetAudioTrackDevice(eTrackType Type);
@@ -384,18 +397,33 @@ class cDevice : public cThread {
   const tTrackId *GetTrack(eTrackType Type);
        ///< Returns a pointer to the given track id, or NULL if Type is not
        ///< less than ttMaxTrackTypes.
+  int NumTracks(eTrackType FirstTrack, eTrackType LastTrack) const;
+       ///< Returns the number of tracks in the given range that are currently
+       ///< available.
   int NumAudioTracks(void) const;
        ///< Returns the number of audio tracks that are currently available.
        ///< This is just for information, to quickly find out whether there
        ///< is more than one audio track.
+  int NumSubtitleTracks(void) const;
+       ///< Returns the number of subtitle tracks that are currently available.
   eTrackType GetCurrentAudioTrack(void) { return currentAudioTrack; }
   bool SetCurrentAudioTrack(eTrackType Type);
        ///< Sets the current audio track to the given Type.
        ///< \return Returns true if Type is a valid audio track, false otherwise.
+  eTrackType GetCurrentSubtitleTrack(void) { return currentSubtitleTrack; }
+  bool SetCurrentSubtitleTrack(eTrackType Type, bool Manual = false);
+       ///< Sets the current subtitle track to the given Type.
+       ///< IF Manual is true, no automatic preferred subtitle language selection
+       ///< will be done for the rest of the current replay session, or until
+       ///< the channel is changed.
+       ///< \return Returns true if Type is a valid subtitle track, false otherwise.
   void EnsureAudioTrack(bool Force = false);
        ///< Makes sure an audio track is selected that is actually available.
        ///< If Force is true, the language and Dolby Digital settings will
        ///< be verified even if the current audio track is available.
+  void EnsureSubtitleTrack(void);
+       ///< Makes sure one of the preferred language subtitle tracks is selected.
+       ///< Only has an effect if Setup.DisplaySubtitles is on.
 
 // Audio facilities
 
@@ -454,6 +482,13 @@ class cDevice : public cThread {
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
        ///< \return Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
+  virtual int PlaySubtitle(const uchar *Data, int Length);
+       ///< Plays the given data block as a subtitle.
+       ///< Data points to exactly one complete PES packet of the given Length.
+       ///< PlaySubtitle() shall process the packet either as a whole (returning
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< \return Returns the number of bytes actually taken from Data, or -1
+       ///< in case of an error.
   virtual int PlayPesPacket(const uchar *Data, int Length, bool VideoOnly = false);
        ///< Plays the single PES packet in Data with the given Length.
        ///< If VideoOnly is true, only the video will be displayed,
@@ -464,6 +499,9 @@ class cDevice : public cThread {
        ///< Gets the current System Time Counter, which can be used to
        ///< synchronize audio and video. If this device is unable to
        ///< provide the STC, -1 will be returned.
+  virtual bool HasIBPTrickSpeed(void) { return false; }
+       ///< Returns true if this device can handle all frames in 'fast forward'
+       ///< trick speeds.
   virtual void TrickSpeed(int Speed);
        ///< Sets the device into a mode where replay is done slower.
        ///< Every single frame shall then be displayed the given number of
diff --git a/dvbdevice.c b/dvbdevice.c
index 7d1a5c8c6..1a396064d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.165 2007/08/17 13:37:56 kls Exp $
+ * $Id: dvbdevice.c 1.167 2007/10/14 12:56:03 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -483,7 +483,7 @@ bool cDvbDevice::Initialize(void)
 
 void cDvbDevice::MakePrimaryDevice(bool On)
 {
-  if (HasDecoder())
+  if (On && HasDecoder())
      new cDvbOsdProvider(fd_osd);
 }
 
@@ -711,6 +711,11 @@ int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   return -1;
 }
 
+void cDvbDevice::CloseFilter(int Handle)
+{
+  close(Handle);
+}
+
 void cDvbDevice::TurnOffLiveMode(bool LiveView)
 {
   if (LiveView) {
diff --git a/dvbdevice.h b/dvbdevice.h
index 63c38d15b..755727693 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.44 2007/02/25 12:23:57 kls Exp $
+ * $Id: dvbdevice.h 1.45 2007/10/14 13:01:25 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -83,6 +83,7 @@ class cDvbDevice : public cDevice {
 
 protected:
   virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+  virtual void CloseFilter(int Handle);
 
 // Common Interface facilities:
 
diff --git a/dvbosd.c b/dvbosd.c
index 87c8dec21..e076a3c99 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.31 2007/08/26 09:39:20 kls Exp $
+ * $Id: dvbosd.c 1.32 2007/09/16 08:55:54 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -32,6 +32,7 @@ class cDvbOsd : public cOsd {
   cDvbOsd(int Left, int Top, int OsdDev, uint Level);
   virtual ~cDvbOsd();
   virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+  virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
   virtual void Flush(void);
   };
 
@@ -106,6 +107,19 @@ eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
   return Result;
 }
 
+eOsdError cDvbOsd::SetAreas(const tArea *Areas, int NumAreas)
+{
+  if (shown) {
+     cBitmap *Bitmap;
+     for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+         Cmd(OSD_SetWindow, 0, i + 1);
+         Cmd(OSD_Close);
+         }
+     shown = false;
+     }
+  return cOsd::SetAreas(Areas, NumAreas);
+}
+
 void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
   if (osdDev >= 0) {
diff --git a/dvbplayer.c b/dvbplayer.c
index 99b3f5cef..a072a445f 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.46 2007/04/28 14:55:22 kls Exp $
+ * $Id: dvbplayer.c 1.47 2007/10/13 12:20:58 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -400,7 +400,13 @@ void cDvbPlayer::Action(void)
                        uchar FileNumber;
                        int FileOffset;
                        bool TimeShiftMode = index->IsStillRecording();
-                       int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                       int Index = -1;
+                       if (DeviceHasIBPTrickSpeed() && playDir == pdForward) {
+                          if (index->Get(readIndex + 1, &FileNumber, &FileOffset, NULL, &Length))
+                             Index = readIndex + 1;
+                          }
+                       else
+                          Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
                        if (Index >= 0) {
                           if (!NextFile(FileNumber, FileOffset)) {
                              readIndex = Index;
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
new file mode 100644
index 000000000..1f7e6b7bb
--- /dev/null
+++ b/dvbsubtitle.c
@@ -0,0 +1,1029 @@
+/*
+ * dvbsubtitle.c: DVB subtitles
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original author: Marco Schl��ler <marco@lordzodiac.de>
+ * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
+ *
+ * $Id: dvbsubtitle.c 1.1 2007/10/14 14:02:35 kls Exp $
+ */
+
+#include "dvbsubtitle.h"
+#include "device.h"
+
+#define PAGE_COMPOSITION_SEGMENT   0x10
+#define REGION_COMPOSITION_SEGMENT 0x11
+#define CLUT_DEFINITION_SEGMENT    0x12
+#define OBJECT_DATA_SEGMENT        0x13
+#define END_OF_DISPLAY_SET_SEGMENT 0x80
+
+// Set these to 'true' for debug output:
+static bool DebugConverter = false;
+static bool DebugSegments = false;
+static bool DebugPages = false;
+static bool DebugRegions = false;
+static bool DebugObjects = false;
+static bool DebugCluts = false;
+
+#define dbgconverter(a...) if (DebugConverter) fprintf(stderr, a)
+#define dbgsegments(a...) if (DebugSegments) fprintf(stderr, a)
+#define dbgpages(a...) if (DebugPages) fprintf(stderr, a)
+#define dbgregions(a...) if (DebugRegions) fprintf(stderr, a)
+#define dbgobjects(a...) if (DebugObjects) fprintf(stderr, a)
+#define dbgcluts(a...) if (DebugCluts) fprintf(stderr, a)
+
+// --- cSubtitleClut ---------------------------------------------------------
+
+class cSubtitleClut : public cListObject {
+private:
+  int clutId;
+  int version;
+  cPalette palette2;
+  cPalette palette4;
+  cPalette palette8;
+public:
+  cSubtitleClut(int ClutId);
+  int ClutId(void) { return clutId; }
+  int Version(void) { return version; }
+  void SetVersion(int Version) { version = Version; }
+  void SetColor(int Bpp, int Index, tColor Color);
+  const cPalette *GetPalette(int Bpp);
+  };
+
+cSubtitleClut::cSubtitleClut(int ClutId)
+:palette2(2)
+,palette4(4)
+,palette8(8)
+{
+  clutId = ClutId;
+  version = -1;
+}
+
+void cSubtitleClut::SetColor(int Bpp, int Index, tColor Color)
+{
+  switch (Bpp) {
+    case 2: palette2.SetColor(Index, Color); break;
+    case 4: palette4.SetColor(Index, Color); break;
+    case 8: palette8.SetColor(Index, Color); break;
+    default: esyslog("ERROR: wrong Bpp in cSubtitleClut::SetColor(%d, %d, %08X)", Bpp, Index, Color);
+    }
+}
+
+const cPalette *cSubtitleClut::GetPalette(int Bpp)
+{
+  switch (Bpp) {
+    case 2: return &palette2;
+    case 4: return &palette4;
+    case 8: return &palette8;
+    default: esyslog("ERROR: wrong Bpp in cSubtitleClut::GetPalette(%d)", Bpp);
+    }
+  return &palette8;
+}
+
+// --- cSubtitleObject -------------------------------------------------------
+
+class cSubtitleObject : public cListObject {
+private:
+  int objectId;
+  int version;
+  int codingMethod;
+  bool nonModifyingColorFlag;
+  int nibblePos;
+  uchar backgroundColor;
+  uchar foregroundColor;
+  int providerFlag;
+  int px;
+  int py;
+  cBitmap *bitmap;
+  void DrawLine(int x, int y, tIndex Index, int Length);
+  uchar Get2Bits(const uchar *Data, int &Index);
+  uchar Get4Bits(const uchar *Data, int &Index);
+  bool Decode2BppCodeString(const uchar *Data, int &Index, int&x, int y);
+  bool Decode4BppCodeString(const uchar *Data, int &Index, int&x, int y);
+  bool Decode8BppCodeString(const uchar *Data, int &Index, int&y, int y);
+public:
+  cSubtitleObject(int ObjectId, cBitmap *Bitmap);
+  int ObjectId(void) { return objectId; }
+  int Version(void) { return version; }
+  int CodingMethod(void) { return codingMethod; }
+  bool NonModifyingColorFlag(void) { return nonModifyingColorFlag; }
+  void DecodeSubBlock(const uchar *Data, int Length, bool Even);
+  void SetVersion(int Version) { version = Version; }
+  void SetBackgroundColor(uchar BackgroundColor) { backgroundColor = BackgroundColor; }
+  void SetForegroundColor(uchar ForegroundColor) { foregroundColor = ForegroundColor; }
+  void SetNonModifyingColorFlag(bool NonModifyingColorFlag) { nonModifyingColorFlag = NonModifyingColorFlag; }
+  void SetCodingMethod(int CodingMethod) { codingMethod = CodingMethod; }
+  void SetPosition(int x, int y) { px = x; py = y; }
+  void SetProviderFlag(int ProviderFlag) { providerFlag = ProviderFlag; }
+  };
+
+cSubtitleObject::cSubtitleObject(int ObjectId, cBitmap *Bitmap)
+{
+  objectId = ObjectId;
+  version = -1;
+  codingMethod = -1;
+  nonModifyingColorFlag = false;
+  nibblePos = 0;
+  backgroundColor = 0;
+  foregroundColor = 0;
+  providerFlag = -1;
+  px = py = 0;
+  bitmap = Bitmap;
+}
+
+void cSubtitleObject::DecodeSubBlock(const uchar *Data, int Length, bool Even)
+{
+  int x = 0;
+  int y = Even ? 0 : 1;
+  for (int index = 0; index < Length; ) {
+      switch (Data[index++]) {
+        case 0x10: {
+             nibblePos = 8;
+             while (Decode2BppCodeString(Data, index, x, y) && index < Length)
+                   ;
+             if (!nibblePos)
+                index++;
+             break;
+             }
+        case 0x11: {
+             nibblePos = 4;
+             while (Decode4BppCodeString(Data, index, x, y) && index < Length)
+                   ;
+             if (!nibblePos)
+                index++;
+             break;
+             }
+        case 0x12:
+             while (Decode8BppCodeString(Data, index, x, y) && index < Length)
+                   ;
+             break;
+        case 0x20: //TODO
+             dbgobjects("sub block 2 to 4 map");
+             index += 4;
+             break;
+        case 0x21: //TODO
+             dbgobjects("sub block 2 to 8 map");
+             index += 4;
+             break;
+        case 0x22: //TODO
+             dbgobjects("sub block 4 to 8 map");
+             index += 16;
+             break;
+        case 0xF0:
+             x = 0;
+             y += 2;
+             break;
+        }
+      }
+}
+
+void cSubtitleObject::DrawLine(int x, int y, tIndex Index, int Length)
+{
+  if (nonModifyingColorFlag && Index == 1)
+     return;
+  x += px;
+  y += py;
+  for (int pos = x; pos < x + Length; pos++)
+      bitmap->SetIndex(pos, y, Index);
+}
+
+uchar cSubtitleObject::Get2Bits(const uchar *Data, int &Index)
+{
+  uchar result = Data[Index];
+  if (!nibblePos) {
+     Index++;
+     nibblePos = 8;
+     }
+  nibblePos -= 2;
+  return (result >> nibblePos) & 0x03;
+}
+
+uchar cSubtitleObject::Get4Bits(const uchar *Data, int &Index)
+{
+  uchar result = Data[Index];
+  if (!nibblePos) {
+     Index++;
+     nibblePos = 4;
+     }
+  else {
+     result >>= 4;
+     nibblePos -= 4;
+     }
+  return result & 0x0F;
+}
+
+bool cSubtitleObject::Decode2BppCodeString(const uchar *Data, int &Index, int &x, int y)
+{
+  int rl = 0;
+  int color = 0;
+  uchar code = Get2Bits(Data, Index);
+  if (code) {
+     color = code;
+     rl = 1;
+     }
+  else {
+     code = Get2Bits(Data, Index);
+     if (code & 2) { // switch_1
+        rl = ((code & 1) << 2) + Get2Bits(Data, Index) + 3;
+        color = Get2Bits(Data, Index);
+        }
+     else if (code & 1)
+        rl = 1; //color 0
+     else {
+        code = Get2Bits(Data, Index);
+        switch (code & 0x3) { //switch_3
+          case 0:
+               return false;
+          case 1:
+               rl = 2; //color 0
+               break;
+          case 2:
+               rl = (Get2Bits(Data, Index) << 2) + Get2Bits(Data, Index) + 12;
+               color = Get2Bits(Data, Index);
+               break;
+          case 3:
+               rl = (Get2Bits(Data, Index) << 6) + (Get2Bits(Data, Index) << 4) + (Get2Bits(Data, Index) << 2) + Get2Bits(Data, Index) + 29;
+               color = Get2Bits(Data, Index);
+               break;
+          }
+        }
+     }
+  DrawLine(x, y, color, rl);
+  x += rl;
+  return true;
+}
+
+bool cSubtitleObject::Decode4BppCodeString(const uchar *Data, int &Index, int &x, int y)
+{
+  int rl = 0;
+  int color = 0;
+  uchar code = Get4Bits(Data, Index);
+  if (code) {
+     color = code;
+     rl = 1;
+     }
+  else {
+     code = Get4Bits(Data, Index);
+     if (code & 8) { // switch_1
+        if (code & 4) { //switch_2
+           switch (code & 3) { //switch_3
+             case 0: // color 0
+                  rl = 1;
+                  break;
+             case 1: // color 0
+                  rl = 2;
+                  break;
+             case 2:
+                  rl = Get4Bits(Data, Index) + 9;
+                  color = Get4Bits(Data, Index);
+                  break;
+             case 3:
+                  rl = (Get4Bits(Data, Index) << 4) + Get4Bits(Data, Index) + 25;
+                  color = Get4Bits(Data, Index);
+                  break;
+             }
+           }
+        else {
+           rl = (code & 3) + 4;
+           color = Get4Bits(Data, Index);
+           }
+        }
+     else { // color 0
+        if (!code)
+           return false;
+        rl = code + 2;
+        }
+     }
+  DrawLine(x, y, color, rl);
+  x += rl;
+  return true;
+}
+
+bool cSubtitleObject::Decode8BppCodeString(const uchar *Data, int &Index, int &x, int y)
+{
+  int rl = 0;
+  int color = 0;
+  uchar code = Data[Index++];
+  if (code) {
+     color = code;
+     rl = 1;
+     }
+  else {
+     code = Data[Index++];
+     rl = code & 0x63;
+     if (code & 0x80)
+        color = Data[Index++];
+     else if (!rl)
+        return false; //else color 0
+     }
+  DrawLine(x, y, color, rl);
+  x += rl;
+  return true;
+}
+
+// --- cSubtitleRegion -------------------------------------------------------
+
+class cSubtitleRegion : public cListObject, public cBitmap {
+private:
+  int regionId;
+  int version;
+  int clutId;
+  int horizontalAddress;
+  int verticalAddress;
+  int level;
+  cList<cSubtitleObject> objects;
+public:
+  cSubtitleRegion(int RegionId);
+  int RegionId(void) { return regionId; }
+  int Version(void) { return version; }
+  int ClutId(void) { return clutId; }
+  int Level(void) { return level; }
+  int Depth(void) { return Bpp(); }
+  void FillRegion(tIndex Index);
+  cSubtitleObject *GetObjectById(int ObjectId, bool New = false);
+  int HorizontalAddress(void) { return horizontalAddress; }
+  int VerticalAddress(void) { return verticalAddress; }
+  void SetVersion(int Version) { version = Version; }
+  void SetClutId(int ClutId) { clutId = ClutId; }
+  void SetLevel(int Level);
+  void SetDepth(int Depth);
+  void SetHorizontalAddress(int HorizontalAddress) { horizontalAddress = HorizontalAddress; }
+  void SetVerticalAddress(int VerticalAddress) { verticalAddress = VerticalAddress; }
+  };
+
+cSubtitleRegion::cSubtitleRegion(int RegionId)
+:cBitmap(1, 1, 4)
+{
+  regionId = RegionId;
+  version = -1;
+  clutId = -1;
+  horizontalAddress = 0;
+  verticalAddress = 0;
+  level = 0;
+}
+
+void cSubtitleRegion::FillRegion(tIndex Index)
+{
+  dbgregions("FillRegion %d\n", Index);
+  for (int y = 0; y < Height(); y++) {
+      for (int x = 0; x < Width(); x++)
+          SetIndex(x, y, Index);
+      }
+}
+
+cSubtitleObject *cSubtitleRegion::GetObjectById(int ObjectId, bool New)
+{
+  cSubtitleObject *result = NULL;
+  for (cSubtitleObject *so = objects.First(); so; so = objects.Next(so)) {
+      if (so->ObjectId() == ObjectId)
+         result = so;
+      }
+  if (!result && New) {
+     result = new cSubtitleObject(ObjectId, this);
+     objects.Add(result);
+     }
+  return result;
+}
+
+void cSubtitleRegion::SetLevel(int Level)
+{
+  if (Level > 0 && Level < 4)
+     level = 1 << Level;
+}
+
+void cSubtitleRegion::SetDepth(int Depth)
+{
+  if (Depth > 0 && Depth < 4)
+     SetBpp(1 << Depth);
+}
+
+// --- cDvbSubtitlePage ------------------------------------------------------
+
+class cDvbSubtitlePage : public cListObject {
+private:
+  int pageId;
+  int version;
+  int state;
+  int64_t pts;
+  int timeout;
+  cList<cSubtitleClut> cluts;
+public:
+  cList<cSubtitleRegion> regions;
+  cDvbSubtitlePage(int PageId);
+  virtual ~cDvbSubtitlePage();
+  int PageId(void) { return pageId; }
+  int Version(void) { return version; }
+  int State(void) { return state; }
+  tArea *GetAreas(void);
+  cSubtitleClut *GetClutById(int ClutId, bool New = false);
+  cSubtitleObject *GetObjectById(int ObjectId);
+  cSubtitleRegion *GetRegionById(int RegionId, bool New = false);
+  int64_t Pts(void) const { return pts; }
+  int Timeout(void) { return timeout; }
+  void SetVersion(int Version) { version = Version; }
+  void SetPts(int64_t Pts) { pts = Pts; }
+  void SetState(int State);
+  void SetTimeout(int Timeout) { timeout = Timeout; }
+  void UpdateRegionPalette(cSubtitleClut *Clut);
+  };
+
+cDvbSubtitlePage::cDvbSubtitlePage(int PageId)
+{
+  pageId = PageId;
+  version = -1;
+  state = -1;
+  pts = 0;
+  timeout = 0;
+}
+
+cDvbSubtitlePage::~cDvbSubtitlePage()
+{
+}
+
+tArea *cDvbSubtitlePage::GetAreas(void)
+{
+  if (regions.Count() > 0) {
+     tArea *Areas = new tArea[regions.Count()];
+     tArea *a = Areas;
+     for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
+         a->x1 = sr->HorizontalAddress();
+         a->y1 = sr->VerticalAddress();
+         a->x2 = sr->HorizontalAddress() + sr->Width() - 1;
+         a->y2 = sr->VerticalAddress() + sr->Height() - 1;
+         a->bpp = sr->Bpp();
+         while ((a->Width() & 3) != 0)
+               a->x2++; // aligns width to a multiple of 4, so 2, 4 and 8 bpp will work
+         a++;
+         }
+     return Areas;
+     }
+  return NULL;
+}
+
+cSubtitleClut *cDvbSubtitlePage::GetClutById(int ClutId, bool New)
+{
+  cSubtitleClut *result = NULL;
+  for (cSubtitleClut *sc = cluts.First(); sc; sc = cluts.Next(sc)) {
+      if (sc->ClutId() == ClutId)
+         result = sc;
+      }
+  if (!result && New) {
+     result = new cSubtitleClut(ClutId);
+     cluts.Add(result);
+     }
+  return result;
+}
+
+cSubtitleRegion *cDvbSubtitlePage::GetRegionById(int RegionId, bool New)
+{
+  cSubtitleRegion *result = NULL;
+  for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
+      if (sr->RegionId() == RegionId)
+         result = sr;
+      }
+  if (!result && New) {
+     result = new cSubtitleRegion(RegionId);
+     regions.Add(result);
+     }
+  return result;
+}
+
+cSubtitleObject *cDvbSubtitlePage::GetObjectById(int ObjectId)
+{
+  cSubtitleObject *result = NULL;
+  for (cSubtitleRegion *sr = regions.First(); sr && !result; sr = regions.Next(sr))
+      result = sr->GetObjectById(ObjectId);
+  return result;
+}
+
+void cDvbSubtitlePage::SetState(int State)
+{
+  state = State;
+  switch (state) {
+    case 0: // normal case - page update
+         dbgpages("page update\n");
+         break;
+    case 1: // aquisition point - page refresh
+         dbgpages("page refresh\n");
+         regions.Clear();
+         break;
+    case 2: // mode change - new page
+         dbgpages("new Page\n");
+         regions.Clear();
+         cluts.Clear();
+         break;
+    case 3: // reserved
+         break;
+    }
+}
+
+void cDvbSubtitlePage::UpdateRegionPalette(cSubtitleClut *Clut)
+{
+  for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
+      if (sr->ClutId() == Clut->ClutId())
+         sr->Replace(*Clut->GetPalette(sr->Bpp()));
+      }
+}
+
+// --- cDvbSubtitleAssembler -------------------------------------------------
+
+class cDvbSubtitleAssembler {
+private:
+  uchar *data;
+  int length;
+  int pos;
+  int size;
+  bool Realloc(int Size);
+public:
+  cDvbSubtitleAssembler(void);
+  virtual ~cDvbSubtitleAssembler();
+  void Reset(void);
+  unsigned char *Get(int &Length);
+  void Put(const uchar *Data, int Length);
+  };
+
+cDvbSubtitleAssembler::cDvbSubtitleAssembler(void)
+{
+  data = NULL;
+  size = 0;
+  Reset();
+}
+
+cDvbSubtitleAssembler::~cDvbSubtitleAssembler()
+{
+  free(data);
+}
+
+void cDvbSubtitleAssembler::Reset(void)
+{
+  length = 0;
+  pos = 0;
+}
+
+bool cDvbSubtitleAssembler::Realloc(int Size)
+{
+  if (Size > size) {
+     size = max(Size, 2048);
+     data = (uchar *)realloc(data, size);
+     if (!data) {
+        esyslog("ERROR: can't allocate memory for subtitle assembler");
+        length = 0;
+        size = 0;
+        return false;
+        }
+     }
+  return true;
+}
+
+unsigned char *cDvbSubtitleAssembler::Get(int &Length)
+{
+  if (length > pos + 5) {
+      Length = (data[pos + 4] << 8) + data[pos + 5] + 6;
+      if (length >= pos + Length) {
+         unsigned char *result = data + pos;
+         pos += Length;
+         return result;
+         }
+     }
+  return NULL;
+}
+
+void cDvbSubtitleAssembler::Put(const uchar *Data, int Length)
+{
+  if (Length && Realloc(length + Length)) {
+     memcpy(data + length, Data, Length);
+     length += Length;
+     }
+}
+
+// --- cDvbSubtitleBitmaps ---------------------------------------------------
+
+class cDvbSubtitleBitmaps : public cListObject {
+private:
+  int64_t pts;
+  int timeout;
+  tArea *areas;
+  int numAreas;
+  cVector<cBitmap *> bitmaps;
+public:
+  cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas);
+  ~cDvbSubtitleBitmaps();
+  int64_t Pts(void) { return pts; }
+  int Timeout(void) { return timeout; }
+  void AddBitmap(cBitmap *Bitmap);
+  void Draw(cOsd *Osd);
+  };
+
+cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas)
+{
+  pts = Pts;
+  timeout = Timeout;
+  areas = Areas;
+  numAreas = NumAreas;
+}
+
+cDvbSubtitleBitmaps::~cDvbSubtitleBitmaps()
+{
+  delete[] areas;
+  for (int i = 0; i < bitmaps.Size(); i++)
+      delete bitmaps[i];
+}
+
+void cDvbSubtitleBitmaps::AddBitmap(cBitmap *Bitmap)
+{
+  bitmaps.Append(Bitmap);
+}
+
+void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
+{
+  if (Osd->SetAreas(areas, numAreas) == oeOk) {
+     for (int i = 0; i < bitmaps.Size(); i++)
+         Osd->DrawBitmap(bitmaps[i]->X0(), bitmaps[i]->Y0(), *bitmaps[i]);
+     Osd->Flush();
+     }
+}
+
+// --- cDvbSubtitleConverter -------------------------------------------------
+
+int cDvbSubtitleConverter::setupLevel = 0;
+
+cDvbSubtitleConverter::cDvbSubtitleConverter(void)
+:cThread("subtitleConverter")
+{
+  dvbSubtitleAssembler = new cDvbSubtitleAssembler;
+  osd = NULL;
+  pages = new cList<cDvbSubtitlePage>;
+  bitmaps = new cList<cDvbSubtitleBitmaps>;
+  Start();
+}
+
+cDvbSubtitleConverter::~cDvbSubtitleConverter()
+{
+  Cancel(3);
+  delete dvbSubtitleAssembler;
+  delete osd;
+  delete bitmaps;
+  delete pages;
+}
+
+void cDvbSubtitleConverter::SetupChanged(void)
+{
+  setupLevel++;
+}
+
+void cDvbSubtitleConverter::Reset(void)
+{
+  dbgconverter("Converter reset -----------------------\n");
+  dvbSubtitleAssembler->Reset();
+  Lock();
+  pages->Clear();
+  bitmaps->Clear();
+  DELETENULL(osd);
+  Unlock();
+}
+
+int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
+{
+  if (Data && Length > 8) {
+     int PayloadOffset = Data[8] + 9;
+     int SubstreamHeaderLength = 4;
+     bool ResetSubtitleAssembler = Data[PayloadOffset + 3] == 0x00;
+
+     // Compatibility mode for old subtitles plugin:
+     if ((Data[PayloadOffset - 3] & 0x81) == 1 && Data[PayloadOffset - 2] == 0x81) {
+        PayloadOffset--;
+        SubstreamHeaderLength = 1;
+        ResetSubtitleAssembler = Data[8] >= 5;
+        }
+
+     if (Length > PayloadOffset + SubstreamHeaderLength) {
+        int64_t pts = 0;
+        if ((Data[7] & 0x80) && Data[8] >= 5) {
+           pts  = (((int64_t)Data[ 9]) & 0x0E) << 29;
+           pts |= ( (int64_t)Data[10])         << 22;
+           pts |= (((int64_t)Data[11]) & 0xFE) << 14;
+           pts |= ( (int64_t)Data[12])         <<  7;
+           pts |= (((int64_t)Data[13]) & 0xFE) >>  1;
+           dbgconverter("Converter PTS: %lld\n", pts);
+           }
+        const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
+        int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
+        if (ResetSubtitleAssembler)
+           dvbSubtitleAssembler->Reset();
+
+        if (length > 3) {
+           if (data[0] == 0x20 && data[1] == 0x00 && data[2] == 0x0F)
+              dvbSubtitleAssembler->Put(data + 2, length - 2);
+           else
+              dvbSubtitleAssembler->Put(data, length);
+
+           int Count;
+           while (true) {
+                 unsigned char *b = dvbSubtitleAssembler->Get(Count);
+                 if (b && b[0] == 0x0F) {
+                    if (ExtractSegment(b, Count, pts) == -1)
+                       break;
+                    }
+                 else
+                    break;
+                 }
+           }
+        return Length;
+        }
+     }
+  return 0;
+}
+
+#define LimitTo32Bit(n) (n & 0x00000000FFFFFFFFL)
+#define MAXDELTA 40000 // max. reasonable PTS/STC delta in ms
+
+void cDvbSubtitleConverter::Action(void)
+{
+  int LastSetupLevel = setupLevel;
+  cTimeMs Timeout;
+  while (Running()) {
+        if (osd) {
+           int NewSetupLevel = setupLevel;
+           if (Timeout.TimedOut() || LastSetupLevel != NewSetupLevel) {
+              DELETENULL(osd);
+              }
+           LastSetupLevel = NewSetupLevel;
+           }
+        int WaitMs = 100;
+        Lock();
+        if (cDvbSubtitleBitmaps *sb = bitmaps->First()) {
+           int64_t STC = cDevice::PrimaryDevice()->GetSTC();
+           int64_t Delta = 0;
+           if (STC >= 0) {
+              Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
+              if (Delta > (int64_t(1) << 31))
+                 Delta -= (int64_t(1) << 32);
+              else if (Delta < -((int64_t(1) << 31) - 1))
+                 Delta += (int64_t(1) << 32);
+              }
+           else {
+              //TODO sync on PTS? are there actually devices that don't deliver an STC?
+              }
+           Delta /= 90; // STC and PTS are in 1/90000s
+           if (abs(Delta) <= MAXDELTA) {
+              if (Delta <= 0) {
+                 dbgconverter("Got %d bitmaps, showing #%d\n", bitmaps->Count(), sb->Index() + 1);
+                 if (AssertOsd()) {
+                    sb->Draw(osd);
+                    Timeout.Set(sb->Timeout() * 1000);
+                    dbgconverter("PTS: %lld  STC: %lld (%lld) timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
+                    }
+                 bitmaps->Del(sb);
+                 }
+              else
+                 WaitMs = min(max(Delta, int64_t(0)), int64_t(1000));
+              }
+           else
+              bitmaps->Del(sb);
+           }
+        Unlock();
+        cCondWait::SleepMs(WaitMs);
+        }
+}
+
+tColor cDvbSubtitleConverter::yuv2rgb(int Y, int Cb, int Cr)
+{
+  int Ey, Epb, Epr;
+  int Eg, Eb, Er;
+
+  Ey = (Y - 16);
+  Epb = (Cb - 128);
+  Epr = (Cr - 128);
+  /* ITU-R 709 */
+  Er = max(min(((298 * Ey             + 460 * Epr) / 256), 255), 0);
+  Eg = max(min(((298 * Ey -  55 * Epb - 137 * Epr) / 256), 255), 0);
+  Eb = max(min(((298 * Ey + 543 * Epb            ) / 256), 255), 0);
+
+  return (Er << 16) | (Eg << 8) | Eb;
+}
+
+bool cDvbSubtitleConverter::AssertOsd(void)
+{
+  return osd || (osd = cOsdProvider::NewOsd(0, Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
+}
+
+int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
+{
+  if (Length > 5 && Data[0] == 0x0F) {
+     int segmentLength = (Data[4] << 8) + Data[5] + 6;
+     if (segmentLength > Length)
+        return -1;
+     int segmentType = Data[1];
+     int pageId = (Data[2] << 8) + Data[3];
+     cDvbSubtitlePage *page = NULL;
+     LOCK_THREAD;
+     for (cDvbSubtitlePage *sp = pages->First(); sp; sp = pages->Next(sp)) {
+         if (sp->PageId() == pageId) {
+            page = sp;
+            break;
+            }
+         }
+     if (!page) {
+        page = new cDvbSubtitlePage(pageId);
+        pages->Add(page);
+        dbgpages("Create SubtitlePage %d  (total pages = %d)\n", pageId, pages->Count());
+        }
+     switch (segmentType) {
+       case PAGE_COMPOSITION_SEGMENT: {
+            dbgsegments("PAGE_COMPOSITION_SEGMENT\n");
+            int pageVersion = (Data[6 + 1] & 0xF0) >> 4;
+            if (pageVersion == page->Version())
+               break; // no update
+            page->SetVersion(pageVersion);
+            if (Pts)
+               page->SetPts(Pts);
+            page->SetTimeout(Data[6]);
+            page->SetState((Data[6 + 1] & 0x0C) >> 2);
+            page->regions.Clear();
+            dbgpages("Update page id %d version %d pts %lld timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
+            for (int i = 6 + 2; i < segmentLength; i += 6) {
+                cSubtitleRegion *region = page->GetRegionById(Data[i], true);
+                region->SetHorizontalAddress((Data[i + 2] << 8) + Data[i + 3]);
+                region->SetVerticalAddress((Data[i + 4] << 8) + Data[i + 5]);
+                }
+            break;
+            }
+       case REGION_COMPOSITION_SEGMENT: {
+            dbgsegments("REGION_COMPOSITION_SEGMENT\n");
+            cSubtitleRegion *region = page->GetRegionById(Data[6]);
+            if (!region)
+               break;
+            int regionVersion = (Data[6 + 1] & 0xF0) >> 4;
+            if (regionVersion == region->Version())
+               break; // no update
+            region->SetVersion(regionVersion);
+            bool regionFillFlag = (Data[6 + 1] & 0x08) >> 3;
+            int regionWidth = (Data[6 + 2] << 8) | Data[6 + 3];
+            int regionHeight = (Data[6 + 4] << 8) | Data[6 + 5];
+            region->SetSize(regionWidth, regionHeight);
+            region->SetLevel((Data[6 + 6] & 0xE0) >> 5);
+            region->SetDepth((Data[6 + 6] & 0x1C) >> 2);
+            region->SetClutId(Data[6 + 7]);
+            dbgregions("Region pageId %d id %d version %d fill %d width %d height %d level %d depth %d clutId %d\n", pageId, region->RegionId(), region->Version(), regionFillFlag, regionWidth, regionHeight, region->Level(), region->Depth(), region->ClutId());
+            if (regionFillFlag) {
+               switch (region->Bpp()) {
+                 case 2: region->FillRegion((Data[6 + 9] & 0x0C) >> 2); break;
+                 case 4: region->FillRegion((Data[6 + 9] & 0xF0) >> 4); break;
+                 case 8: region->FillRegion(Data[6 + 8]); break;
+                 }
+               }
+            for (int i = 6 + 10; i < segmentLength; i += 6) {
+                cSubtitleObject *object = region->GetObjectById((Data[i] << 8) | Data[i + 1], true);
+                int objectType = (Data[i + 2] & 0xC0) >> 6;
+                object->SetCodingMethod(objectType);
+                object->SetProviderFlag((Data[i + 2] & 0x30) >> 4);
+                int objectHorizontalPosition = ((Data[i + 2] & 0x0F) << 8) | Data[i + 3];
+                int objectVerticalPosition = ((Data[i + 4] & 0x0F) << 8) | Data[i + 5];
+                object->SetPosition(objectHorizontalPosition, objectVerticalPosition);
+                if (objectType == 0x01 || objectType == 0x02) {
+                   object->SetForegroundColor(Data[i + 6]);
+                   object->SetBackgroundColor(Data[i + 7]);
+                   i += 2;
+                   }
+                }
+            break;
+            }
+       case CLUT_DEFINITION_SEGMENT: {
+            dbgsegments("CLUT_DEFINITION_SEGMENT\n");
+            cSubtitleClut *clut =  page->GetClutById(Data[6], true);
+            int clutVersion = (Data[6 + 1] & 0xF0) >> 4;
+            if (clutVersion == clut->Version())
+               break; // no update
+            clut->SetVersion(clutVersion);
+            dbgcluts("Clut pageId %d id %d version %d\n", pageId, clut->ClutId(), clut->Version());
+            for (int i = 6 + 2; i < segmentLength; i += 2) {
+                uchar clutEntryId = Data[i];
+                bool fullRangeFlag = Data[i + 1] & 1;
+                uchar yval;
+                uchar crval;
+                uchar cbval;
+                uchar tval;
+                if (fullRangeFlag) {
+                   yval  = Data[i + 2];
+                   crval = Data[i + 3];
+                   cbval = Data[i + 4];
+                   tval  = Data[i + 5];
+                   }
+                else {
+                   yval   =   Data[i + 2] & 0xFC;
+                   crval  =  (Data[i + 2] & 0x03) << 6;
+                   crval |=  (Data[i + 3] & 0xC0) >> 2;
+                   cbval  =  (Data[i + 3] & 0x3C) << 2;
+                   tval   =  (Data[i + 3] & 0x03) << 6;
+                   }
+                tColor value = 0;
+                if (yval) {
+                   value = yuv2rgb(yval, cbval, crval);
+                   value |= ((10 - (clutEntryId ? Setup.SubtitleFgTransparency : Setup.SubtitleBgTransparency)) * (255 - tval) / 10) << 24;
+                   }
+                int EntryFlags = Data[i + 1];
+                dbgcluts("%2d %d %d %d %08X\n", clutEntryId, (EntryFlags & 0x80) ? 2 : 0, (EntryFlags & 0x40) ? 4 : 0, (EntryFlags & 0x20) ? 8 : 0, value);
+                if ((EntryFlags & 0x80) != 0)
+                   clut->SetColor(2, clutEntryId, value);
+                if ((EntryFlags & 0x40) != 0)
+                   clut->SetColor(4, clutEntryId, value);
+                if ((EntryFlags & 0x20) != 0)
+                   clut->SetColor(8, clutEntryId, value);
+                i += fullRangeFlag ? 4 : 2;
+                }
+            dbgcluts("\n");
+            page->UpdateRegionPalette(clut);
+            break;
+            }
+       case OBJECT_DATA_SEGMENT: {
+            dbgsegments("OBJECT_DATA_SEGMENT\n");
+            cSubtitleObject *object = page->GetObjectById((Data[6] << 8) | Data[6 + 1]);
+            if (!object)
+               break;
+            int objectVersion = (Data[6 + 2] & 0xF0) >> 4;
+            if (objectVersion == object->Version())
+               break; // no update
+            object->SetVersion(objectVersion);
+            int codingMethod = (Data[6 + 2] & 0x0C) >> 2;
+            object->SetNonModifyingColorFlag(Data[6 + 2] & 0x01);
+            dbgobjects("Object pageId %d id %d version %d method %d modify %d\n", pageId, object->ObjectId(), object->Version(), object->CodingMethod(), object->NonModifyingColorFlag());
+            if (codingMethod == 0) { // coding of pixels
+               int i = 6 + 3;
+               int topFieldLength = (Data[i] << 8) | Data[i + 1];
+               int bottomFieldLength = (Data[i + 2] << 8) | Data[i + 3];
+               object->DecodeSubBlock(Data + i + 4, topFieldLength, true);
+               if (bottomFieldLength)
+                  object->DecodeSubBlock(Data + i + 4 + topFieldLength, bottomFieldLength, false);
+               else
+                  object->DecodeSubBlock(Data + i + 4, topFieldLength, false);
+               }
+            else if (codingMethod == 1) { // coded as a string of characters
+               //TODO implement textual subtitles
+               }
+            break;
+            }
+       case END_OF_DISPLAY_SET_SEGMENT: {
+            dbgsegments("END_OF_DISPLAY_SET_SEGMENT\n");
+            FinishPage(page);
+            }
+       default:
+            dbgsegments("*** unknown segment type: %02X\n", segmentType);
+       }
+     return segmentLength;
+     }
+  return -1;
+}
+
+void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
+{
+  if (!AssertOsd())
+     return;
+  tArea *Areas = Page->GetAreas();
+  int NumAreas = Page->regions.Count();
+  int Bpp = 8;
+  bool Reduced = false;
+  while (osd->CanHandleAreas(Areas, NumAreas) != oeOk) {
+        int HalfBpp = Bpp / 2;
+        if (HalfBpp >= 2) {
+           for (int i = 0; i < NumAreas; i++) {
+               if (Areas[i].bpp >= Bpp) {
+                  Areas[i].bpp = HalfBpp;
+                  Reduced = true;
+                  }
+               }
+           Bpp = HalfBpp;
+           }
+        else
+           return; // unable to draw bitmaps
+        }
+  if (Reduced) {
+     for (int i = 0; i < NumAreas; i++) {
+         cSubtitleRegion *sr = Page->regions.Get(i);
+         if (sr->Bpp() != Areas[i].bpp) {
+            if (sr->Level() <= Areas[i].bpp) {
+               //TODO this is untested - didn't have any such subtitle stream
+               cSubtitleClut *Clut = Page->GetClutById(sr->ClutId());
+               if (Clut) {
+                  dbgregions("reduce region %d bpp %d level %d area bpp %d\n", sr->RegionId(), sr->Bpp(), sr->Level(), Areas[i].bpp);
+                  sr->ReduceBpp(*Clut->GetPalette(sr->Bpp()));
+                  }
+               }
+            else {
+               dbgregions("condense region %d bpp %d level %d area bpp %d\n", sr->RegionId(), sr->Bpp(), sr->Level(), Areas[i].bpp);
+               sr->ShrinkBpp(Areas[i].bpp);
+               }
+            }
+         }
+     }
+  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas);
+  bitmaps->Add(Bitmaps);
+  for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
+      int posX = sr->HorizontalAddress();
+      int posY = sr->VerticalAddress();
+      cBitmap *bm = new cBitmap(sr->Width(), sr->Height(), sr->Bpp(), posX, posY);
+      bm->DrawBitmap(posX, posY, *sr);
+      Bitmaps->AddBitmap(bm);
+      }
+}
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
new file mode 100644
index 000000000..f7dec1904
--- /dev/null
+++ b/dvbsubtitle.h
@@ -0,0 +1,43 @@
+/*
+ * dvbsubtitle.h: DVB subtitles
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original author: Marco Schl��ler <marco@lordzodiac.de>
+ *
+ * $Id: dvbsubtitle.h 1.1 2007/10/14 14:02:46 kls Exp $
+ */
+
+#ifndef __DVBSUBTITLE_H
+#define __DVBSUBTITLE_H
+
+#include "osd.h"
+#include "thread.h"
+#include "tools.h"
+
+class cDvbSubtitlePage;
+class cDvbSubtitleAssembler;
+class cDvbSubtitleBitmaps;
+
+class cDvbSubtitleConverter : public cThread {
+private:
+  static int setupLevel;
+  cDvbSubtitleAssembler *dvbSubtitleAssembler;
+  cOsd *osd;
+  cList<cDvbSubtitlePage> *pages;
+  cList<cDvbSubtitleBitmaps> *bitmaps;
+  tColor yuv2rgb(int Y, int Cb, int Cr);
+  bool AssertOsd(void);
+  int ExtractSegment(const uchar *Data, int Length, int64_t Pts);
+  void FinishPage(cDvbSubtitlePage *Page);
+public:
+  cDvbSubtitleConverter(void);
+  virtual ~cDvbSubtitleConverter();
+  void Action(void);
+  void Reset(void);
+  int Convert(const uchar *Data, int Length);
+  static void SetupChanged(void);
+  };
+
+#endif //__DVBSUBTITLE_H
diff --git a/eit.c b/eit.c
index dcac1164d..5ed25d19b 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.125 2007/07/28 13:16:43 kls Exp $
+ * $Id: eit.c 1.126 2007/08/26 10:56:33 kls Exp $
  */
 
 #include "eit.h"
@@ -219,11 +219,11 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  SI::ComponentDescriptor *cd = (SI::ComponentDescriptor *)d;
                  uchar Stream = cd->getStreamContent();
                  uchar Type = cd->getComponentType();
-                 if (1 <= Stream && Stream <= 2 && Type != 0) {
+                 if (1 <= Stream && Stream <= 3 && Type != 0) { // 1=video, 2=audio, 3=subtitles
                     if (!Components)
                        Components = new cComponents;
                     char buffer[Utf8BufSize(256)];
-                    Components->SetComponent(Components->NumComponents(), cd->getStreamContent(), cd->getComponentType(), I18nNormalizeLanguageCode(cd->languageCode), cd->description.getText(buffer, sizeof(buffer)));
+                    Components->SetComponent(Components->NumComponents(), Stream, Type, I18nNormalizeLanguageCode(cd->languageCode), cd->description.getText(buffer, sizeof(buffer)));
                     }
                  }
                  break;
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index e46c64401..1be38fafd 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 1.4 2007/08/24 13:19:34 kls Exp $
+# $Id: i18n-to-gettext.pl 1.5 2007/10/14 14:14:22 kls Exp $
 
 # How to convert an actual plugin:
 #
@@ -319,7 +319,7 @@
 $(I18Npo): $(I18Npot)
 	msgmerge -U --no-wrap -F --backup=none -q $@ $<
 
-i18n: $(I18Nmo)
+i18n: $(I18Npot) $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
diff --git a/keys.c b/keys.c
index 58ae1fa6e..615b6f8a1 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.15 2007/08/11 11:30:18 kls Exp $
+ * $Id: keys.c 1.16 2007/08/26 12:35:21 kls Exp $
  */
 
 #include "keys.h"
@@ -49,6 +49,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kVolDn,         trNOOP("Key$Volume-")     },
                     { kMute,          trNOOP("Key$Mute")        },
                     { kAudio,         trNOOP("Key$Audio")       },
+                    { kSubtitles,     trNOOP("Key$Subtitles")   },
                     { kSchedule,      trNOOP("Key$Schedule")    },
                     { kChannels,      trNOOP("Key$Channels")    },
                     { kTimers,        trNOOP("Key$Timers")      },
diff --git a/keys.h b/keys.h
index 2adcad8a0..cb2b2eb08 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.13 2007/08/24 13:15:48 kls Exp $
+ * $Id: keys.h 1.14 2007/08/26 12:34:50 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -43,6 +43,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kVolDn,
              kMute,
              kAudio,
+             kSubtitles,
              kSchedule,
              kChannels,
              kTimers,
diff --git a/menu.c b/menu.c
index 444fd7507..853d1e76e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.461 2007/08/24 13:15:48 kls Exp $
+ * $Id: menu.c 1.463 2007/10/13 10:10:20 kls Exp $
  */
 
 #include "menu.h"
@@ -260,6 +260,8 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Apid2"),        &data.apids[1], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Dpid1"),        &data.dpids[0], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Dpid2"),        &data.dpids[1], 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Spid1"),        &data.spids[0], 0, 0x1FFF));
+  Add(new cMenuEditIntItem( tr("Spid2"),        &data.spids[1], 0, 0x1FFF));
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
   Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0]));
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 1, 0xFFFF));
@@ -523,6 +525,7 @@ eOSState cMenuChannels::Delete(void)
         Channels.Del(channel);
         cOsdMenu::Del(Index);
         Propagate();
+        Channels.SetModified(true);
         isyslog("channel %d deleted", DeletedChannel);
         if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
            if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
@@ -547,6 +550,7 @@ void cMenuChannels::Move(int From, int To)
      Channels.Move(FromChannel, ToChannel);
      cOsdMenu::Move(From, To);
      Propagate();
+     Channels.SetModified(true);
      isyslog("channel %d moved to %d", FromNumber, ToNumber);
      if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
         if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
@@ -2400,6 +2404,8 @@ class cMenuSetupDVB : public cMenuSetupBase {
 private:
   int originalNumAudioLanguages;
   int numAudioLanguages;
+  int originalNumSubtitleLanguages;
+  int numSubtitleLanguages;
   void Setup(void);
   const char *videoDisplayFormatTexts[3];
   const char *updateChannelsTexts[6];
@@ -2412,7 +2418,10 @@ cMenuSetupDVB::cMenuSetupDVB(void)
 {
   for (numAudioLanguages = 0; numAudioLanguages < I18nLanguages()->Size() && data.AudioLanguages[numAudioLanguages] >= 0; numAudioLanguages++)
       ;
+  for (numSubtitleLanguages = 0; numSubtitleLanguages < I18nLanguages()->Size() && data.SubtitleLanguages[numSubtitleLanguages] >= 0; numSubtitleLanguages++)
+      ;
   originalNumAudioLanguages = numAudioLanguages;
+  originalNumSubtitleLanguages = numSubtitleLanguages;
   videoDisplayFormatTexts[0] = tr("pan&scan");
   videoDisplayFormatTexts[1] = tr("letterbox");
   videoDisplayFormatTexts[2] = tr("center cut out");
@@ -2442,6 +2451,15 @@ void cMenuSetupDVB::Setup(void)
   Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"),       &numAudioLanguages, 0, I18nLanguages()->Size()));
   for (int i = 0; i < numAudioLanguages; i++)
       Add(new cMenuEditStraItem(tr("Setup.DVB$Audio language"),    &data.AudioLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
+  Add(new cMenuEditBoolItem(tr("Setup.DVB$Display subtitles"),     &data.DisplaySubtitles));
+  if (data.DisplaySubtitles) {
+     Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle languages"),    &numSubtitleLanguages, 0, I18nLanguages()->Size()));
+     for (int i = 0; i < numSubtitleLanguages; i++)
+         Add(new cMenuEditStraItem(tr("Setup.DVB$Subtitle language"), &data.SubtitleLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
+     Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle offset"),                  &data.SubtitleOffset,       -50, 50));
+     Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle foreground transparency"), &data.SubtitleFgTransparency, 0, 9));
+     Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle background transparency"), &data.SubtitleBgTransparency, 0, 10));
+     }
 
   SetCurrent(Get(current));
   Display();
@@ -2453,11 +2471,15 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
   int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
   bool oldVideoFormat = ::Setup.VideoFormat;
   bool newVideoFormat = data.VideoFormat;
+  bool oldDisplaySubtitles = ::Setup.DisplaySubtitles;
+  bool newDisplaySubtitles = data.DisplaySubtitles;
   int oldnumAudioLanguages = numAudioLanguages;
+  int oldnumSubtitleLanguages = numSubtitleLanguages;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (Key != kNone) {
      bool DoSetup = data.VideoFormat != newVideoFormat;
+     DoSetup |= data.DisplaySubtitles != newDisplaySubtitles;
      if (numAudioLanguages != oldnumAudioLanguages) {
         for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
             data.AudioLanguages[i] = 0;
@@ -2476,6 +2498,24 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
         data.AudioLanguages[numAudioLanguages] = -1;
         DoSetup = true;
         }
+     if (numSubtitleLanguages != oldnumSubtitleLanguages) {
+        for (int i = oldnumSubtitleLanguages; i < numSubtitleLanguages; i++) {
+            data.SubtitleLanguages[i] = 0;
+            for (int l = 0; l < I18nLanguages()->Size(); l++) {
+                int k;
+                for (k = 0; k < oldnumSubtitleLanguages; k++) {
+                    if (data.SubtitleLanguages[k] == l)
+                       break;
+                    }
+                if (k >= oldnumSubtitleLanguages) {
+                   data.SubtitleLanguages[i] = l;
+                   break;
+                   }
+                }
+            }
+        data.SubtitleLanguages[numSubtitleLanguages] = -1;
+        DoSetup = true;
+        }
      if (DoSetup)
         Setup();
      }
@@ -2486,6 +2526,9 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
         cDevice::PrimaryDevice()->SetVideoDisplayFormat(eVideoDisplayFormat(::Setup.VideoDisplayFormat));
      if (::Setup.VideoFormat != oldVideoFormat)
         cDevice::PrimaryDevice()->SetVideoFormat(::Setup.VideoFormat);
+     if (::Setup.DisplaySubtitles != oldDisplaySubtitles)
+        cDevice::PrimaryDevice()->EnsureSubtitleTrack();
+     cDvbSubtitleConverter::SetupChanged();
      }
   return state;
 }
@@ -3128,14 +3171,18 @@ static void SetTrackDescriptions(int LiveChannel)
   if (Components) {
      int indexAudio = 0;
      int indexDolby = 0;
+     int indexSubtitle = 0;
      for (int i = 0; i < Components->NumComponents(); i++) {
          const tComponent *p = Components->Component(i);
-         if (p->stream == 2) {
-            if (p->type == 0x05)
-               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, LiveChannel ? NULL : p->language, p->description);
-            else
-               cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, LiveChannel ? NULL : p->language, p->description);
-            }
+         switch (p->stream) {
+           case 2: if (p->type == 0x05)
+                      cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, LiveChannel ? NULL : p->language, p->description);
+                   else
+                      cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, LiveChannel ? NULL : p->language, p->description);
+                   break;
+           case 3: cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, indexSubtitle++, 0, LiveChannel ? NULL : p->language, p->description);
+                   break;
+           }
          }
      }
 }
@@ -3491,7 +3538,7 @@ cDisplayTracks::cDisplayTracks(void)
          numTracks++;
          }
       }
-  descriptions[numTracks] = 0;
+  descriptions[numTracks] = NULL;
   timeout.Set(TRACKTIMEOUT);
   displayTracks = Skins.Current()->DisplayTracks(tr("Button$Audio"), numTracks, descriptions);
   Show();
@@ -3569,7 +3616,7 @@ eOSState cDisplayTracks::ProcessKey(eKeys Key)
          timeout.Set(TRACKTIMEOUT);
          break;
     case kOk:
-         if (track != cDevice::PrimaryDevice()->GetCurrentAudioTrack())
+         if (types[track] != cDevice::PrimaryDevice()->GetCurrentAudioTrack())
             oldTrack = -1; // make sure we explicitly switch to that track
          timeout.Set();
          break;
@@ -3588,6 +3635,105 @@ eOSState cDisplayTracks::ProcessKey(eKeys Key)
   return timeout.TimedOut() ? osEnd : osContinue;
 }
 
+// --- cDisplaySubtitleTracks ------------------------------------------------
+
+cDisplaySubtitleTracks *cDisplaySubtitleTracks::currentDisplayTracks = NULL;
+
+cDisplaySubtitleTracks::cDisplaySubtitleTracks(void)
+:cOsdObject(true)
+{
+  SetTrackDescriptions(!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring() ? cDevice::CurrentChannel() : 0);
+  currentDisplayTracks = this;
+  numTracks = track = 0;
+  types[numTracks] = ttNone;
+  descriptions[numTracks] = strdup(tr("No subtitles"));
+  numTracks++;
+  eTrackType CurrentSubtitleTrack = cDevice::PrimaryDevice()->GetCurrentSubtitleTrack();
+  for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
+      const tTrackId *TrackId = cDevice::PrimaryDevice()->GetTrack(eTrackType(i));
+      if (TrackId && TrackId->id) {
+         types[numTracks] = eTrackType(i);
+         descriptions[numTracks] = strdup(*TrackId->description ? TrackId->description : *TrackId->language ? TrackId->language : *itoa(i));
+         if (i == CurrentSubtitleTrack)
+            track = numTracks;
+         numTracks++;
+         }
+      }
+  descriptions[numTracks] = NULL;
+  timeout.Set(TRACKTIMEOUT);
+  displayTracks = Skins.Current()->DisplayTracks(tr("Button$Subtitles"), numTracks, descriptions);
+  Show();
+}
+
+cDisplaySubtitleTracks::~cDisplaySubtitleTracks()
+{
+  delete displayTracks;
+  currentDisplayTracks = NULL;
+  for (int i = 0; i < numTracks; i++)
+      free(descriptions[i]);
+  cStatus::MsgOsdClear();
+}
+
+void cDisplaySubtitleTracks::Show(void)
+{
+  displayTracks->SetTrack(track, descriptions);
+  displayTracks->Flush();
+  //cStatus::MsgSetSubtitleTrack(track, descriptions); //TODO better make a more general cStatus::MsgSetTrack(tr("Subtitles"), track, descriptions)
+}
+
+cDisplaySubtitleTracks *cDisplaySubtitleTracks::Create(void)
+{
+  if (cDevice::PrimaryDevice()->NumSubtitleTracks() > 0) {
+     if (!currentDisplayTracks)
+        new cDisplaySubtitleTracks;
+     return currentDisplayTracks;
+     }
+  Skins.Message(mtWarning, tr("No subtitles available!"));
+  return NULL;
+}
+
+void cDisplaySubtitleTracks::Process(eKeys Key)
+{
+  if (currentDisplayTracks)
+     currentDisplayTracks->ProcessKey(Key);
+}
+
+eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
+{
+  int oldTrack = track;
+  switch (Key) {
+    case kUp|k_Repeat:
+    case kUp:
+    case kDown|k_Repeat:
+    case kDown:
+         if (NORMALKEY(Key) == kUp && track > 0)
+            track--;
+         else if (NORMALKEY(Key) == kDown && track < numTracks - 1)
+            track++;
+         timeout.Set(TRACKTIMEOUT);
+         break;
+    case kSubtitles|k_Repeat:
+    case kSubtitles:
+         if (++track >= numTracks)
+            track = 0;
+         timeout.Set(TRACKTIMEOUT);
+         break;
+    case kOk:
+         if (types[track] != cDevice::PrimaryDevice()->GetCurrentSubtitleTrack())
+            oldTrack = -1; // make sure we explicitly switch to that track
+         timeout.Set();
+         break;
+    case kNone: break;
+    default: if ((Key & k_Release) == 0)
+                return osEnd;
+    }
+  if (track != oldTrack) {
+     Show();
+     cDevice::PrimaryDevice()->SetCurrentSubtitleTrack(types[track], true);
+     }
+  return timeout.TimedOut() ? osEnd : osContinue;
+}
+
 // --- cRecordControl --------------------------------------------------------
 
 cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
diff --git a/menu.h b/menu.h
index 1613aa4e7..1bca9209e 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.88 2007/08/12 10:35:42 kls Exp $
+ * $Id: menu.h 1.89 2007/08/26 14:35:57 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -128,6 +128,24 @@ class cDisplayTracks : public cOsdObject {
   eOSState ProcessKey(eKeys Key);
   };
 
+class cDisplaySubtitleTracks : public cOsdObject {
+private:
+  cSkinDisplayTracks *displayTracks;
+  cTimeMs timeout;
+  eTrackType types[ttMaxTrackTypes];
+  char *descriptions[ttMaxTrackTypes + 1]; // list is NULL terminated
+  int numTracks, track;
+  static cDisplaySubtitleTracks *currentDisplayTracks;
+  virtual void Show(void);
+  cDisplaySubtitleTracks(void);
+public:
+  virtual ~cDisplaySubtitleTracks();
+  static bool IsOpen(void) { return currentDisplayTracks != NULL; }
+  static cDisplaySubtitleTracks *Create(void);
+  static void Process(eKeys Key);
+  eOSState ProcessKey(eKeys Key);
+  };
+
 cOsdObject *CamControl(void);
 
 class cMenuRecordingItem;
diff --git a/menuitems.c b/menuitems.c
index a900e4a8b..732aea25e 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.51 2007/08/17 13:48:07 kls Exp $
+ * $Id: menuitems.c 1.53 2007/10/13 12:05:37 kls Exp $
  */
 
 #include "menuitems.h"
@@ -302,11 +302,11 @@ void cMenuEditStrItem::LeaveEditMode(bool SaveValue)
         stripspace(value);
         }
      lengthUtf8 = 0;
-     delete valueUtf8;
+     delete[] valueUtf8;
      valueUtf8 = NULL;
-     delete allowedUtf8;
+     delete[] allowedUtf8;
      allowedUtf8 = NULL;
-     delete charMapUtf8;
+     delete[] charMapUtf8;
      charMapUtf8 = NULL;
      pos = -1;
      offset = 0;
@@ -499,9 +499,9 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                     if (!insert || newchar)
                        pos--;
                     newchar = true;
+                    if (!insert && Utf8is(alpha, valueUtf8[pos]))
+                       uppercase = Utf8is(upper, valueUtf8[pos]);
                     }
-                 if (!insert && Utf8is(alpha, valueUtf8[pos]))
-                    uppercase = Utf8is(upper, valueUtf8[pos]);
                  break;
     case kRight|k_Repeat:
     case kRight: if (InEditMode())
diff --git a/newplugin b/newplugin
index 368007b13..57d814e86 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.36 2007/08/19 14:19:49 kls Exp $
+# $Id: newplugin 1.38 2007/10/14 09:13:17 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -139,12 +139,12 @@ I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 	msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$(wildcard *.c)
 
 \$(I18Npo): \$(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q \$\@ \$<
+	msgmerge -U --no-wrap --no-location --backup=none -q \$\@ \$<
 
-i18n: \$(I18Nmo)
+i18n: \$(I18Npot) \$(I18Nmo)
 	\@mkdir -p \$(LOCALEDIR)
 	for i in \$(I18Ndirs); do\\
 	    mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\
diff --git a/osd.c b/osd.c
index 1c91184d6..47a11b216 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.74 2007/08/26 09:44:50 kls Exp $
+ * $Id: osd.c 1.75 2007/10/12 12:38:36 kls Exp $
  */
 
 #include "osd.h"
@@ -82,7 +82,7 @@ void cPalette::SetColor(int Index, tColor Color)
      }
 }
 
-const tColor *cPalette::Colors(int &NumColors)
+const tColor *cPalette::Colors(int &NumColors) const
 {
   NumColors = numColors;
   return numColors ? color : NULL;
@@ -112,7 +112,7 @@ void cPalette::Replace(const cPalette &Palette)
   antiAliasGranularity = Palette.antiAliasGranularity;
 }
 
-tColor cPalette::Blend(tColor ColorFg, tColor ColorBg, uint8_t Level)
+tColor cPalette::Blend(tColor ColorFg, tColor ColorBg, uint8_t Level) const
 {
   if (antiAliasGranularity > 0)
      Level = uint8_t(int(Level / antiAliasGranularity + 0.5) * antiAliasGranularity);
@@ -131,7 +131,7 @@ tColor cPalette::Blend(tColor ColorFg, tColor ColorBg, uint8_t Level)
   return (A << 24) | (R << 16) | (G << 8) | B;
 }
 
-int cPalette::ClosestColor(tColor Color, int MaxDiff)
+int cPalette::ClosestColor(tColor Color, int MaxDiff) const
 {
   int n = 0;
   int d = INT_MAX;
@@ -640,6 +640,79 @@ const tIndex *cBitmap::Data(int x, int y)
   return &bitmap[y * width + x];
 }
 
+void cBitmap::ReduceBpp(const cPalette &Palette)
+{
+  int NewBpp = Palette.Bpp();
+  if (Bpp() == 4 && NewBpp == 2) {
+     for (int i = width * height; i--; ) {
+         tIndex p = bitmap[i];
+         bitmap[i] = (p >> 2) | ((p & 0x03) != 0);
+         }
+     }
+  else if (Bpp() == 8) {
+     if (NewBpp == 2) {
+        for (int i = width * height; i--; ) {
+            tIndex p = bitmap[i];
+            bitmap[i] = (p >> 6) | ((p & 0x30) != 0);
+            }
+        }
+     else if (NewBpp == 4) {
+        for (int i = width * height; i--; ) {
+            tIndex p = bitmap[i];
+            bitmap[i] = p >> 4;
+            }
+        }
+     else
+        return;
+     }
+  else
+     return;
+  SetBpp(NewBpp);
+  Replace(Palette);
+}
+
+void cBitmap::ShrinkBpp(int NewBpp)
+{
+  int NumOldColors;
+  const tColor *Colors = this->Colors(NumOldColors);
+  if (Colors) {
+     // Find the most frequently used colors and create a map table:
+     int Used[MAXNUMCOLORS] = { 0 };
+     int Map[MAXNUMCOLORS] = { 0 };
+     for (int i = width * height; i--; )
+         Used[bitmap[i]]++;
+     int MaxNewColors = (NewBpp == 4) ? 16 : 4;
+     cPalette NewPalette(NewBpp);
+     for (int i = 0; i < MaxNewColors; i++) {
+         int Max = 0;
+         int Index = -1;
+         for (int n = 0; n < NumOldColors; n++) {
+             if (Used[n] > Max) {
+                Max = Used[n];
+                Index = n;
+                }
+             }
+         if (Index >= 0) {
+            Used[Index] = 0;
+            Map[Index] = i;
+            NewPalette.SetColor(i, Colors[Index]);
+            }
+         else
+            break;
+         }
+     // Complete the map table for all other colors (will be set to closest match):
+     for (int n = 0; n < NumOldColors; n++) {
+         if (Used[n])
+            Map[n] = NewPalette.Index(Colors[n]);
+         }
+     // Do the actual index mapping:
+     for (int i = width * height; i--; )
+         bitmap[i] = Map[bitmap[i]];
+     SetBpp(NewBpp);
+     Replace(NewPalette);
+     }
+}
+
 // --- cOsd ------------------------------------------------------------------
 
 int cOsd::osdLeft = 0;
@@ -720,19 +793,18 @@ eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 
 eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
 {
-  eOsdError Result = oeUnknown;
-  if (numBitmaps == 0) {
-     Result = CanHandleAreas(Areas, NumAreas);
-     if (Result == oeOk) {
-        width = height = 0;
-        for (int i = 0; i < NumAreas; i++) {
-            bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
-            width = max(width, Areas[i].x2 + 1);
-            height = max(height, Areas[i].y2 + 1);
-            }
-        }
+  eOsdError Result = CanHandleAreas(Areas, NumAreas);
+  if (Result == oeOk) {
+     while (numBitmaps)
+           delete bitmaps[--numBitmaps];
+     width = height = 0;
+     for (int i = 0; i < NumAreas; i++) {
+         bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
+         width = max(width, Areas[i].x2 + 1);
+         height = max(height, Areas[i].y2 + 1);
+         }
      }
-  if (Result != oeOk)
+  else
      esyslog("ERROR: cOsd::SetAreas returned %d", Result);
   return Result;
 }
@@ -818,7 +890,7 @@ cOsdProvider::~cOsdProvider()
 
 cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
 {
-  if (Level == 0 && cOsd::IsOpen())
+  if (Level == OSD_LEVEL_DEFAULT && cOsd::IsOpen())
      esyslog("ERROR: attempt to open OSD while it is already open - using dummy OSD!");
   else if (osdProvider) {
      cOsd *ActiveOsd = cOsd::Osds.Size() ? cOsd::Osds[0] : NULL;
diff --git a/osd.h b/osd.h
index 604b2d227..42ebc1aa6 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.57 2007/08/26 09:45:38 kls Exp $
+ * $Id: osd.h 1.58 2007/10/12 14:28:44 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -17,6 +17,9 @@
 #include "font.h"
 #include "tools.h"
 
+#define OSD_LEVEL_DEFAULT     0
+#define OSD_LEVEL_SUBTITLES  10
+
 #define MAXNUMCOLORS 256
 
 enum {
@@ -69,7 +72,7 @@ class cPalette {
         ///< a single color combination, and may not be able to serve all
         ///< requested colors. By default the palette assumes there will be
         ///< 10 fixed colors and 10 color combinations.
-  int Bpp(void) { return bpp; }
+  int Bpp(void) const { return bpp; }
   void Reset(void);
         ///< Resets the palette, making it contain no colors.
   int Index(tColor Color);
@@ -77,7 +80,7 @@ class cPalette {
         ///< If Color is not yet contained in this palette, it will be added if
         ///< there is a free slot. If the color can't be added to this palette,
         ///< the closest existing color will be returned.
-  tColor Color(int Index) { return Index < maxColors ? color[Index] : 0; }
+  tColor Color(int Index) const { return Index < maxColors ? color[Index] : 0; }
         ///< Returns the color at the given Index. If Index is outside the valid
         ///< range, 0 will be returned.
   void SetBpp(int Bpp);
@@ -87,7 +90,7 @@ class cPalette {
         ///< Sets the palette entry at Index to Color. If Index is larger than
         ///< the number of currently used entries in this palette, the entries
         ///< in between will have undefined values.
-  const tColor *Colors(int &NumColors);
+  const tColor *Colors(int &NumColors) const;
         ///< Returns a pointer to the complete color table and stores the
         ///< number of valid entries in NumColors. If no colors have been
         ///< stored yet, NumColors will be set to 0 and the function will
@@ -102,14 +105,14 @@ class cPalette {
   void Replace(const cPalette &Palette);
         ///< Replaces the colors of this palette with the colors from the given
         ///< palette.
-  tColor Blend(tColor ColorFg, tColor ColorBg, uint8_t Level);
+  tColor Blend(tColor ColorFg, tColor ColorBg, uint8_t Level) const;
         ///< Determines a color that consists of a linear blend between ColorFg
         ///< and ColorBg. If Level is 0, the result is ColorBg, if it is 255,
         ///< the result is ColorFg. If SetAntiAliasGranularity() has been called previously,
         ///< Level will be mapped to a limited range of levels that allow to make best
         ///< use of the palette entries.
-  int ClosestColor(tColor Color, int MaxDiff = INT_MAX);
-        ///< Returns the index of a color in this paltte that is closest to the given
+  int ClosestColor(tColor Color, int MaxDiff = INT_MAX) const;
+        ///< Returns the index of a color in this palette that is closest to the given
         ///< Color. MaxDiff can be used to control the maximum allowed color difference.
         ///< If no color with a maximum difference of MaxDiff can be found, -1 will
         ///< be returned. With the default value of INT_MAX, there will always be
@@ -232,6 +235,17 @@ class cBitmap : public cPalette {
        ///< Returns the address of the index byte at the given coordinates.
   tColor GetColor(int x, int y) { return Color(*Data(x, y)); }
        ///< Returns the color at the given coordinates.
+  void ReduceBpp(const cPalette &Palette);
+       ///< Reduces the color depth of the bitmap to that of the given Palette.
+       ///< If Palette's color depth is not smaller than the bitmap's current
+       ///< color depth, or if it is not one of 4bpp or 2bpp, nothing happens. After
+       ///< reducing the color depth the current palette is replaced with
+       ///< the given one.
+  void ShrinkBpp(int NewBpp);
+       ///< Shrinks the color depth of the bitmap to NewBpp by keeping only
+       ///< the 2^NewBpp most frequently used colors as defined in the current palette.
+       ///< If NewBpp is not smaller than the bitmap's current color depth,
+       ///< or if it is not one of 4bpp or 2bpp, nothing happens.
   };
 
 struct tArea {
@@ -292,7 +306,7 @@ class cOsd {
        ///< This may be useful for plugins that determine the scaling of the
        ///< video image and need to scale the OSD accordingly to fit on the
        ///< screen.
-  static int IsOpen(void) { return Osds.Size() && Osds[0]->level == 0; }
+  static int IsOpen(void) { return Osds.Size() && Osds[0]->level == OSD_LEVEL_DEFAULT; }
        ///< Returns true if there is currently a level 0 OSD open.
   int Left(void) { return left; }
   int Top(void) { return top; }
@@ -327,6 +341,7 @@ class cOsd {
        ///< If the OSD has been divided into several sub-areas, all areas that
        ///< are part of the rectangle that surrounds a given drawing operation
        ///< will be drawn into, with the proper offsets.
+       ///< A new call overwrites any previous settings
   virtual void SaveRegion(int x1, int y1, int x2, int y2);
        ///< Saves the region defined by the given coordinates for later restoration
        ///< through RestoreRegion(). Only one saved region can be active at any
@@ -398,7 +413,7 @@ class cOsdProvider {
   cOsdProvider(void);
       //XXX maybe parameter to make this one "sticky"??? (frame-buffer etc.)
   virtual ~cOsdProvider();
-  static cOsd *NewOsd(int Left, int Top, uint Level = 0);
+  static cOsd *NewOsd(int Left, int Top, uint Level = OSD_LEVEL_DEFAULT);
       ///< Returns a pointer to a newly created cOsd object, which will be located
       ///< at the given coordinates. When the cOsd object is no longer needed, the
       ///< caller must delete it. If the OSD is already in use, or there is no OSD
diff --git a/pat.c b/pat.c
index 559111de2..a71f2d5c8 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.17 2007/01/05 10:41:55 kls Exp $
+ * $Id: pat.c 1.18 2007/09/02 10:44:19 kls Exp $
  */
 
 #include "pat.h"
@@ -331,11 +331,14 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
         int Dpids[MAXDPIDS + 1] = { 0 };
+        int Spids[MAXSPIDS + 1] = { 0 };
         char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
         char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
+        char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
+        int NumSpids = 0;
         for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
@@ -387,6 +390,26 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                             case SI::AC3DescriptorTag:
                                  dpid = stream.getPid();
                                  break;
+                            case SI::SubtitlingDescriptorTag:
+                                 if (NumSpids < MAXSPIDS) {
+                                    Spids[NumSpids] = stream.getPid();
+                                    SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
+                                    SI::SubtitlingDescriptor::Subtitling sub;
+                                    char *s = SLangs[NumSpids];
+                                    int n = 0;
+                                    for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
+                                        if (sub.languageCode[0]) {
+                                           if (n > 0)
+                                              *s++ = '+';
+                                           strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
+                                           s += strlen(s);
+                                           if (n++ > 1)
+                                              break;
+                                           }
+                                        }
+                                    NumSpids++;
+                                    }
+                                 break;
                             case SI::TeletextDescriptorTag:
                                  Tpid = stream.getPid();
                                  break;
@@ -416,7 +439,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                 }
             }
         if (Setup.UpdateChannels >= 2) {
-           Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid);
+           Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
            Channel->SetCaIds(CaDescriptors->CaIds());
            }
         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
diff --git a/player.h b/player.h
index 11d16563b..87957e9dc 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.19 2006/01/06 11:29:27 kls Exp $
+ * $Id: player.h 1.20 2007/10/13 12:18:10 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -24,6 +24,7 @@ class cPlayer {
   bool DeviceSetCurrentAudioTrack(eTrackType Type) { return device ? device->SetCurrentAudioTrack(Type) : false; }
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
+  bool DeviceHasIBPTrickSpeed(void) { return device ? device->HasIBPTrickSpeed() : false; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
   void DeviceClear(void) { if (device) device->Clear(); }
   void DevicePlay(void) { if (device) device->Play(); }
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 72093c1c0..afef80836 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,1256 +17,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Canal no disponible!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "No puc iniciar el mode de transfer�ncia!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr ""
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr ""
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Catal�"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "cat"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: Detectant el tipus de receptor"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Premeu qualsevol tecla del comandament"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Codi detectat!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "No premeu cap tecla..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: Aprenentantge de les funcions"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Premeu una tecla per '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Premeu 'Amunt' per confirmar"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Premeu 'Avall' per continuar"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Premeu 'Amunt' per retornar)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Premeu 'Avall' per finalitzar l'aprenentatge)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "Premeu 'Men�' per obviar aquesta tecla"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Aprenent les tecles del comandament a dist�ncia"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Guardant els codis de les tecles"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Premeu 'Amunt' per guardar, 'Avall' per anul�lar"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Amunt"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Avall"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Men�"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "D'acord"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Retornar"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Esquerra"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Dreta"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Vermell"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Verd"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Groc"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Blau"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr ""
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Reproduir"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pausa"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Aturar"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Gravar"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Endavant r�pidament"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Enrera r�pidament"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Aturar"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Canal +"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Canal -"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volum +"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volum -"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "En silenci"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr ""
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Guia de Programaci�"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Canals"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Temporitzadors"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Veure programes gravats"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Configuraci�"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Ordres"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr ""
 
-#: menu.c:71
 msgid "encrypted"
 msgstr ""
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Editar canal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nom"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Origen"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Freq��ncia"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "PID V�deo"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "PID �udio (1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "PID �udio (2)"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "PID AC3 (1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "PID Teletext"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Acc�s Condicional"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polaritzaci�"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversi�"
 
-#: menu.c:274
 msgid "off"
 msgstr "off"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "cap"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulaci�"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Amplada de banda"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmissi�"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Protegir"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Jerarquia"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Propietats del canal duplicades!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Canals"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Esborrar"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Editar"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marcar"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nou"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Esborrar"
+
+msgid "Button$Mark"
+msgstr "Marcar"
+
 msgid "Channel is being used by a timer!"
 msgstr "Canal en �s per un temporitzador!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Esborrar el canal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Editar temporitzador"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Actiu"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Canal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dia"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Inici"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Fi"
 
-#: menu.c:667
 msgid "VPS"
 msgstr ""
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioritat"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Durada"
 
-#: menu.c:670
 msgid "File"
 msgstr "Arxiu"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Primer dia"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Temporitzadors"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr ""
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "On/Off"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr ""
+
 msgid "Delete timer?"
 msgstr "Esborrar el temporitzador?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Temporitzador activat - Esborrar de totes maneres?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr ""
+
 msgid "Button$Record"
 msgstr "Gravar"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Canviar"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr ""
+msgid "What's on now?"
+msgstr "Qu� fan ara?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Qu� fan despr�s?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Qu� fan ara?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Seg�ent"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Ara"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programar"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "No puc canviar de canal!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Guia de Programaci� - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr ""
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr ""
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr ""
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr ""
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr ""
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Reproduir"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Enrera"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Veure programes gravats"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Obrir"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Ordres"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Error a l'accedir a la gravaci�!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Esborrar gravaci�?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Error a l'esborrar la gravaci�!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Ordres de gravaci�"
 
-#: menu.c:2203
 msgid "never"
 msgstr ""
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr ""
 
-#: menu.c:2205
 msgid "always"
 msgstr ""
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "Informaci� en pantalla"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Idioma"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr ""
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr ""
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr ""
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr ""
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Amplada"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Al�ada"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Durada dels missatges (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr ""
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Posici� de la informaci� del canal"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "a baix"
 
-#: menu.c:2225
 msgid "top"
 msgstr "a dalt"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr ""
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informaci� del canvi de canal"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr ""
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Despla�ar p�gina sencera"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr ""
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr ""
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Gravacions en subcarpetes"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Guia de Programes"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr ""
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "M�xim d'Hores a cercar per la Guia"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivell de correcci� de la Guia"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr ""
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Ajustar l'hora del sistema"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Usar el temps del m�ltiplex"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr ""
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr ""
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "no"
 
-#: menu.c:2420
 msgid "names only"
 msgstr ""
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr ""
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr ""
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr ""
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "Tarja DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Tarja DVB prim�ria"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Format del v�deo"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr ""
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr ""
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr ""
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr ""
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr ""
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "Configuraci� de l'LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilitzar DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Freq��ncia LNB baixa (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Freq��ncia LNB alta (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CI Acc�s condicional"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Men�"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reiniciar"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr ""
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "No puc obrir el men� de la CAM!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Opcions de Gravaci�"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Marge d'inici de gravaci� (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marge de fi de gravaci� (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "L�mit primari"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Prioritat per defecte"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durada predefinida"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritat de la pausa"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Durada de la pausa (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Utilitzar el nom de l'episodi"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr ""
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr ""
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marcar gravaci� instant�nia"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Anomenar gravacions instant�nies"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Temps de gravaci� instant�nia (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Mida m�xima de l'arxiu (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Separar arxius"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Opcions de Reproducci�"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Mode de multivelocitat"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar mode de reproducci�"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Miscel�l�nia"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Temps m�nim en pausa (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Temps m�nim d'inactivitat (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr ""
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Aquest plugin no admet configuraci�!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configuraci�"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Segur que voleu reiniciar?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Aturar la gravaci� "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Guia de Programaci�"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disc"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disc"
+
 msgid "free"
 msgstr "lliure"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Aturar la reproducci�"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr ""
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pausa"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Continuar"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Aturar"
 
+msgid "Button$Resume"
+msgstr "Continuar"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Cancel�lar l'edici� "
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Aturar la gravaci�?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Cancel�lar l'edici�?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr ""
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pausa d'emissi� en directe..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Salta a:"
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "No hi ha marques d'edici� definides"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "No puc iniciar el proc�s d'edici�!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Proc�s d'edici� iniciat"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Proc�s d'edici� iniciat anteriorment!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~,/_@�"
+msgstr " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.#~,/_@�"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "s�"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Inserir"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Sobrescriure"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Inserir"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Amunt/Avall per una nova localitzaci� - OK per moure"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Canal bloquejat (gravant)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Disc gaireb� ple!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci� -s !"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Gravant - Apagar de totes maneres?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Hi ha una gravaci� en %ld minuts - Apagar de totes maneres?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "Apagar de totes maneres?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Gravant - Reiniciar de totes maneres?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "Reiniciar de totes maneres?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volum "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr ""
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr ""
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "LMCJVSG"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "Dl Dm Dc Dj Dv Ds Dg "
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Dilluns"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Dijous"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Divendres"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Prem qualsevol tecla per cancel�lar l'aturada"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Canviant a la interf�cie DVB prim�ria..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Proc�s d'edici� fallit!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proc�s d'edici� finalitzat"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 07439ab02..e73471963 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kan�l nen� dostupn�!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Nelze za��t s p�enosem"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Za��n� prohled�v�n� EPG"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Bez n�zvu"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "�esky"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "cze"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "F�ze 1: Detekce typu k�du"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Stiskn�te libovolnou kl�vesu ovl�d�n�"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "K�d byl detekov�n!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Nema�kejte ��dn� kl�vesy..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "F�ze 2: U�en� konkr�tn�ho k�du kl�ves"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Stiskn�te kl�vesu pro '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Stiskn�te 'Nahoru' pro potvrzen�"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Stiskn�te 'Dol�' pro pokra�ov�n�"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(stiskn�te 'Nahoru' pro zp�t)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(stiskn�te 'Dol�' pro ukon�en�)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "U�en� k�d� d�lkov�ho ovl�d�n�"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "F�ze 3: Ulo�en� k�d�"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Stiskn�te 'Nahoru' pro ulo�en�, 'Dol�' pro zru�en�"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Nahoru"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Dol�"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Zp�t"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Vlevo"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Vpravo"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "�erven�"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Zelen�"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "�lut�"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Modr�"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "P�ehr�t"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "P�eru�it"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Zastavit"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Nahr�t"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Dop�edu"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Dozadu"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "D�le"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Zp�t"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Vyp�na�"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kan�l+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kan�l-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "P�edch�zej�c� kan�l"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Hlasitost+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Hlasitost-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Ticho"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Zvuk"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program (EPG)"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kan�ly"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "�asova�e"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Nahr�vky"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Nastaven�"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "P��kazy"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "voln�"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "k�dovan�"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Editace kan�lu"
 
-#: menu.c:254
 msgid "Name"
 msgstr "N�zev"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Zdroj"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvence"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarizace"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "vyp."
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "��dn�"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulace"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "���ka p�sma"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "P�enos"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Nastaven� kan�l� nejsou unik�tn�!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kan�ly"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Smazat"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Editace"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Ozna�it"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nov�"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Smazat"
+
+msgid "Button$Mark"
+msgstr "Ozna�it"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kan�l je dr�en� �asova�em nahr�vek!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Smazat kan�l?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Editace �asova�e"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktivn�"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kan�l"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Den"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Za��tek"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Konec"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Priorita"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "�ivotnost"
 
-#: menu.c:670
 msgid "File"
 msgstr "Soubor"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Prvn� den"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "�asova�e"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Zap./Vyp."
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Smazat �asova�?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Prob�h� nahr�v�n� - opravdu smazat?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Ud�lost"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "�asova�"
+
 msgid "Button$Record"
 msgstr "Nahr�t"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "P�epnout"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "�asova�"
+msgid "What's on now?"
+msgstr "Aktu�ln� program"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "N�sleduj�c� program"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Aktu�ln� program"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Dal��"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Nyn�"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kan�l nelze p�epnout!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Tato ud�lost - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Tato ud�lost - v�echny kan�ly"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "V�echny ud�lost - v�echny kan�ly"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Pros�m vlo�te %d znak�!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Detail nahr�vky"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "P�ehr�t"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Na za��tek"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Nahr�vky"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Otev��t"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "P��kazy"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Chyba p�i p��stupu k nahr�vk�m!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Smazat nahr�vku?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Chyba p�i maz�n� nahr�vky!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "P��kazy nahr�v�n�"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nikdy"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "podle vzhledu"
 
-#: menu.c:2205
 msgid "always"
 msgstr "v�dy"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Jazyk"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Vzhled"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "T�ma"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Vlevo"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Naho�e"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "���ka"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "V��ka"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "�as zobrazen� zp�vy (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Pou��vat mal� p�smo"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozice informace o kan�lu"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "dole"
 
-#: menu.c:2225
 msgid "top"
 msgstr "haho�e"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "�as zobr. informace o kan�lu (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informace p�i zm�n� kan�lu"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "�asov� limit informace o kan�lu"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Rolovat strany"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Z konce na za��tek"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Kl�vesa Menu zav�r�"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Seznam nahr�vek"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Sn�mat"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "�asov� limit pro sn�m�n� EPG (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "EPG �rove� chyb"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Ukazovat star�� EPG data (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Nastavit syst�mov� �as"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Pou��t �as z kan�lu"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Preferovan� jazyky"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Preferovan� jazyk"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "dost�edu o��znout"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "ne"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "jen n�zvy"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "jen PIDs"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "n�zvy a PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "p�idat nov� kan�ly"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "p�idat nov� transpond�ry"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�rn� DVB interface"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Form�t videa"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Form�t zobrazen� videa"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Pou��vat zvuk v Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Aktualizace kan�l�"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Jazyky zvuku"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Jazyk zvuku"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Pou��vat DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Doln� frekvence LNB (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Horn� frekvence LNB (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reset"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Otev�r� se menu CAM..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Menu CAM nen� dostupn�"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "CAM modul nelze restartovat!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Nahr�v�n�"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Nahr�vat p�ed za��tkem (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Nahr�vat po konci (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Prim�rn� limit"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "V�choz� priorita"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "V�choz� �ivotnost"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorita p�eru�en�"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "�ivotnost p�eru�en� (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Pou��vat n�zev epizody"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Pou��vat VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "�asov� rezerva pro VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Ozna�it okam�it� nahr�vky"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Pojmenovat okam�it� nahr�vky"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "D�lka okam�it�ho nahr�v�n� (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maxim�ln� velikost nahr�vky (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "D�lit editovan� soubory"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "P�ehr�v�n�"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "V�cerychlostn� m�d"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Zobrazit re�im p�ehr�v�n�"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnoven�"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "R�zn�"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Min. pauza mezi ud�lostmi (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "�asov� limit neaktivnosti (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "�asov� limit SVDRP (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�asov� limit Zap (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kan�l po spu�t�n�"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "jako naposledy"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spu�t�n�"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Moduly"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Modul nem� konfigura�n� parametry!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Nastaven�"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Restart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Opravdu restartovat?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Zastavit nahr�v�n� "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program (EPG)"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "volno"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Zastavit p�ehr�v�n�"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Zvuk"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Zastavit"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Pokra�ovat"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Ukon�it"
 
+msgid "Button$Resume"
+msgstr "Pokra�ovat"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Zru�it editaci"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Ukon�it nahr�v�n�?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Zru�it editaci?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Zvuk nen� dostupn�!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "��dn� DVB karta nen� voln� pro nahr�v�n�"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "P�eru�uje se b��c� program ..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Skok: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Nejsou definov�ny edita�n� zna�ky!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Nelze za��t edita�n� proces!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Edita�n� proces za�al"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Edita�n� proces je ji� aktivn�!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "ano"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Vlo�it"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "P�epsat"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Vlo�it"
+
 msgid "Plugin"
 msgstr "Modul"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Nahoru/Dolu pro novou pozici - Ok p�esune"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kan�l je blokovan� (nahr�v� se)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Disk bude brzy zapln�n!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnut� nen� mo�n� - chb� volba '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Syst�m je zanepr�zdn�n - p�esto vypnout?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "p�esto vypnout?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Syst�m je zanepr�zdn�n - p�esto restartovat?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "p�esto restartovat?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Hlasitost "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klasick� VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konzola"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "PUS�PSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "Po �t St �t P� So Ne "
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Pond�l�"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "�ter�"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "St�eda"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "�tvrtek"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "P�tek"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Sobota"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Ned�le"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Brzo za�ne nahr�v�n� VPS!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Za�alo nahr�v�n�"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Jak�koliv kl�vesa zru�� vypnut�"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "P�epnout prim�rn� DVB..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Edita�n� proces selhal!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Edita�n� proces skon�il"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index 61ff64244..a5e38fa61 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanal er ikke tilg�ngelig!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Kan ikke starte Transfer Mode!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Starter EPG skanning"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Ingen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Dansk"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "dan"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: Detekterer fjernbetjenings-kodetype"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Tryk vilk�rlig tast p� fjernbetjeningen"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Fjernbetjenings-kodetype fundet!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Tryk ikke p� nogen tast..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: L�r individuelle tast koder"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Tryk tasten for '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Tryk 'Op' for at bekr�fte"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Tryk 'Ned' for at forts�tte"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(tryk 'Op' for at g� tilbage)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(tryk 'Ned' for at afslutte indl�ringen)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(tryk 'Menu' for at springe denne tast over)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "L�rer fjernbetjeningstaster"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Gemmer tast koder"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Tryk 'Op' for at gemme, 'Ned' for at annullere"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Op"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Ned"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Tilbage"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Venstre"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "H�jre"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "R�d"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Gr�n"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Gul"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Bl�"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Afspil"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pause"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Optag"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Spol fremad"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Spol tilbage"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Fremad"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Tilbage"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Sluk"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Foreg�ende kanal"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Lydstyrke+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Lydstyrke-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Sluk lyd"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Programoversigt"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanaler"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timere"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Optagelser"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Indstillinger"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Kommandoer"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "Free To Air"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "kodet"
 
-#: menu.c:177
 msgid "auto"
 msgstr "automatisk"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Rediger kanal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Navn"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Kilde"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisation"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "fra"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "ingen"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "B�ndbredde"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarki"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanalindstillinger er ikke entydige!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanaler"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Slet"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Rediger"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Mark�r"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Ny"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Slet"
+
+msgid "Button$Mark"
+msgstr "Mark�r"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanal anvendes af en timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Slet kanal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Rediger timer"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiv"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dag"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Start"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Stop"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioritet"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Levetid"
 
-#: menu.c:670
 msgid "File"
 msgstr "Fil"
 
-#: menu.c:686
 msgid "First day"
 msgstr "F�rste dag"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timere"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Til/Fra"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Slet timer?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timerstyret optagelse i gang - slet alligevel?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Udsendelse"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Timer"
+
 msgid "Button$Record"
 msgstr "Optag"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Skift"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Timer"
+msgid "What's on now?"
+msgstr "Hvad vises nu?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Hvad vises som det n�ste?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Hvad vises nu?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "N�ste"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Nu"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kan ikke skifte kanal!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Denne udsendelse - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Denne udsendelse - alle kanaler"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Alle udsendelser - alle kanaler"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Indtast venligst %d cifre!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Optagelses info"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Afspil"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Forfra"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Optagelser"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "�bn"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Kommandoer"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Fejl ved l�sning af optagelse!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Slet optagelse?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Fejl ved sletning af optagelse!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Optage kommandoer"
 
-#: menu.c:2203
 msgid "never"
 msgstr "aldrig"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "skin afh�ngig"
 
-#: menu.c:2205
 msgid "always"
 msgstr "altid"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Sprog"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Venstre"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Top"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Bredde"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "H�jde"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tid beskeder skal vises (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Anvend lille skrift"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Placering af kanalinfo"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "bund"
 
-#: menu.c:2225
 msgid "top"
 msgstr "top"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Tid kanalinfo skal vises (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Info ved kanalskift"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Timeout ved anmodet kanal info"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scroll sidevis"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Scroll rundt"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Menu taste lukker"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Optagelser i foldere"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Skan"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Tid f�r EPG skanning (t)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Niveau for EPG fejlrettelse"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vise gammel EPG info (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Indstil system tid"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Anvend tid fra transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Foretrukne sprog"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Foretrukket sprog"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nej"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "kun navne"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "kun PIDs"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "navne og PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "tilf. ny kanaler"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "tilf. ny transp."
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhed"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Video display format"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Anvend Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Opdat�r kanaler"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio sprog (ant.)"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio sprog"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Anvend DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Nedre LNB frekvens (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�vre LNB frekvens (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Nulstille"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "�bner CAM menu..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Kan ikke �bne CAM menuen!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Kan ikke nulstille CAM!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Optagelse"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Margin ved start (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margin ved stop (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Prim�r gr�nse"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Standard prioritet"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standard levetid (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Pause prioritet"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Pause levetid (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Anvend udsendelsesnavn"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Anvend VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS margin (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Mark�r direkte optagelse"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Navngiv direkte optagelse"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "L�ngde af direkte optagelse (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Max. video filst�rrelse (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Opdel redigerede filer"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Afspilning"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Multi hastighedsmodus"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Vis afspilningsmodus"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Mindste h�ndelsespause (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Min. bruger inaktivitet (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP timeout (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal ved opstart"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "som f�r"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lydstyrke ved opstart"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Denne plugin har ingen parametre"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Indstillinger"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Genstart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Vil du virkelig genstarte?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Stop optagelse "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Programoversigt"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "fri"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Stop afspilning"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pause"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Forts�t"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stop"
 
+msgid "Button$Resume"
+msgstr "Forts�t"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Afbryd redigering"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Stop optagelse?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Afbryd redigering?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Ingen lyd tilg�ngelig!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "For lidt harddisk plads til optagelse!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ingen fri DVB enhed til optagelse!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pausere live udsendelse..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Hop: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Der er ikke sat nogen redigeringsm�rker!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Kan ikke starte redigeringsprocessen!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Redigeringsproces startet"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Redigeringsproces er allerede aktiv!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Inds�t"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Overskriv"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Inds�t"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Op/Ned for ny placering - OK for at flytte"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanal blokeret (optagelse i gang)"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Kun lidt diskplads tilbage!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke slukke - parameter '-s' ikke angivet!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Optagelse igang - sluk alligevel?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Optagelse om %ld minutter - sluk alligevel?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "sluk alligevel?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Optagelse igang - genstart alligevel?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "genstart alligevel?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Lydstyrke "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klassisk VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsol"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "ManTirOnsTorFreL�rS�n"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Mandag"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Fredag"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS optagelse starter snart!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Optagelse startet"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Tryk vilk�rlig tast for at annullere sluk"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Skifter prim�r DVB enhed..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Redigeringsproces fejlede!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigeringsproces afsluttet"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 0da285cbd..cb5d78d51 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanal nicht verf�gbar!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Transfer-Mode kann nicht gestartet werden!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Kein Titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Deutsch"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "deu"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Phase 1: System der Fernbedienung ermitteln"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Eine Taste auf der Fernbedienung dr�cken"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "System der Fernbedienung erkannt!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Keine Taste dr�cken..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Phase 2: Tastenbelegung anlernen"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Taste f�r '%s' dr�cken"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "'Auf' dr�cken zum Best�tigen"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "'Ab' dr�cken zum Weitermachen"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "('Auf' dr�cken, um zur�ckzugehen)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "('Ab' dr�cken zum Beenden)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "('Men�' dr�cken zum �berspringen)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Fernbedienung anlernen"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Phase 3: Tastenbelegung abspeichern"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "'Auf' speichert, 'Ab' bricht ab"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Auf"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Ab"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Men�"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Zur�ck"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Links"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Rechts"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Rot"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Gr�n"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Gelb"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Blau"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Wiedergabe"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pause"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stopp"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Aufnehmen"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Vorlauf"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "R�cklauf"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Vorw�rts"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Zur�ck"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Ausschalten"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Vorheriger Kanal"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Lautst�rke+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Lautst�rke-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Stumm"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr "Untertitel"
+
 msgid "Key$Schedule"
 msgstr "Programm"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kan�le"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timer"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Aufzeichnungen"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Einstellungen"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Befehle"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr "Benutzer1"
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr "Benutzer2"
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr "Benutzer3"
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr "Benutzer4"
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr "Benutzer5"
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr "Benutzer6"
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr "Benutzer7"
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr "Benutzer8"
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr "Benutzer9"
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "frei empfangbar"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "verschl�sselt"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Kanal editieren"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Name"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Quelle"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frequenz"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr "Spid1"
+
+msgid "Spid2"
+msgstr "Spid2"
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisation"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "aus"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "keine"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanaleinstellungen sind nicht eindeutig!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kan�le"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "L�schen"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Editieren"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Markieren"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Neu"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "L�schen"
+
+msgid "Button$Mark"
+msgstr "Markieren"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanal wird von einem Timer benutzt!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Kanal l�schen?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Timer editieren"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiv"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Tag"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Anfang"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Ende"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Priorit�t"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Lebensdauer"
 
-#: menu.c:670
 msgid "File"
 msgstr "Datei"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Erster Tag"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timer"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Ein/Aus"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Timer l�schen?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timer zeichnet auf - trotzdem l�schen?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Sendung"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Timer"
+
 msgid "Button$Record"
 msgstr "Aufnehmen"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Umschalten"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Timer"
+msgid "What's on now?"
+msgstr "Was l�uft jetzt?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Was l�uft als n�chstes?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Was l�uft jetzt?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "N�chste"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Jetzt"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programm"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kanal kann nicht umgeschaltet werden!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programm - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Diese Sendung - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Diese Sendung - alle Kan�le"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Alle Sendungen - alle Kan�le"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Bitte geben Sie %d Ziffern ein!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr "CAM antwortet nicht!"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Aufzeichnung"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Wiedergabe"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Anfang"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Aufzeichnungen"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "�ffnen"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Befehle"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Fehler beim Ansprechen der Aufzeichnung!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Aufzeichnung l�schen?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Fehler beim L�schen der Aufzeichnung!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Befehle f�r Aufzeichnungen"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nie"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "je nach Oberfl�che"
 
-#: menu.c:2205
 msgid "always"
 msgstr "immer"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Sprache"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Oberfl�che"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Thema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Links"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Oben"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Breite"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "H�he"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Anzeigedauer f�r Nachrichten (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Kleine Schrift benutzen"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr "Kantengl�ttung"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr "Standard-Schriftart"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr "Kleine Schriftart"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr "Festbreiten-Schriftart"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr "Standard-Schriftgr��e (pixel)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr "Kleine Schriftgr��e (pixel)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr "Festbreiten-Schriftgr��e (pixel)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanalinfo-Position"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "unten"
 
-#: menu.c:2225
 msgid "top"
 msgstr "oben"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Anzeigedauer f�r Kanalinfo (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Info beim Kanalwechsel"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Angeforderte Kanalinfo schlie�en"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Seitenweise scrollen"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Rundum scrollen"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Menu-Taste schlie�t"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Aufnahmeverzeichnisse"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Scan"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Zeit bis zur EPG-Aktualisierung (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "EPG-Fehlerbereinigung"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Alte EPG-Daten anzeigen (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Systemzeit stellen"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Transponder f�r Systemzeit"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Bevorzugte Sprachen"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "Letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "Center-cut-out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nein"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "nur Namen"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "nur PIDs"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "Namen und PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "neue Kan�le hinzuf�gen"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "neue Transponder hinzuf�gen"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�res DVB-Interface"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Videoformat"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Video-Anzeigeformat"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby-Digital-Ton benutzen"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Kan�le aktualisieren"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio-Sprachen"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio-Sprache"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr "Untertitel anzeigen"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "Untertitel-Sprachen"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "Untertitel-Sprache"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "Untertitel-Offset"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "Untertitel-Transparenz Vordergrund"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "Untertitel-Transparenz Hintergrund"
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "DiSEqC benutzen"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Untere LNB-Frequenz (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Obere LNB-Frequenz (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr "CAM zur�ckgesetzt"
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr "CAM vorhanden"
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr "CAM bereit"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Men�"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "R�cksetzen"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "CAM-Men� wird ge�ffnet..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "CAM-Men� kann nicht ge�ffnet werden!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr "CAM wird benutzt - wirklich zur�cksetzen?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Zur�cksetzen des CAM fehlgeschlagen!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Aufnahme"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Vorlauf zum Timer-Beginn (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Nachlauf am Timer-Ende (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Prim�r-Limit"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Default-Priorit�t"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Default-Lebensdauer (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Pause-Priorit�t"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Pause-Lebensdauer (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Episodenname verwenden"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS benutzen"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Zeitvorlauf bei VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Direktaufzeichnung markieren"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Direktaufzeichnung benennen"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Dauer der Direktaufzeichnung (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Max. Videodateigr��e (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Editierte Dateien aufteilen"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Wiedergabe"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Mehrstufiger Vor-/R�cklauf"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Wiedergabestatus anzeigen"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Br�ckenzeit zwischen Timern (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "VDR ausschalten bei Inaktivit�t (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP trennen bei Inaktivit�t (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Mindestzeit f�r Kanalhistorie (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Zeitlimit f�r Kanaleingabe (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal beim Einschalten"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "wie vorher"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lautst�rke beim Einschalten"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Dieses Plugin hat keine Parameter!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Neustart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Wirklich neu starten?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Aufzeichnung beenden "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Programm"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "frei"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Wiedergabe beenden"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pause"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Weiter"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Beenden"
 
+msgid "Button$Resume"
+msgstr "Weiter"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Schneiden abbrechen"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Aufzeichnung beenden?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Schneiden abbrechen?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Kein Audio verf�gbar!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr "Keine Untertitel"
+
+msgid "Button$Subtitles"
+msgstr "Untertitel"
+
+msgid "No subtitles available!"
+msgstr "Keine Untertitel verf�gbar!"
+
 msgid "Not enough disk space to start recording!"
 msgstr "Nicht gen�gend Plattenplatz f�r Aufnahme!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Keine freie DVB-Karte zum Aufnehmen!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Live-Signal wird angehalten..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Springen: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Keine Schnittmarken gesetzt!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Schnitt kann nicht gestartet werden!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Schnitt gestartet"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Schnitt bereits aktiv!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bcdefghijklmno�pqrstu�vwxyz0123456789-.#~,/_@"
+msgstr " a�bcdefghijklmno�pqrs�tu�vwxyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Einf�gen"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�berschreiben"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Einf�gen"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Auf/Ab f�r neue Position - dann OK"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanal blockiert (zeichnet auf)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Platte beinahe voll!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ausschalten unm�glich - Option '-s' fehlt!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr "Schnitt l�uft - trotzdem ausschalten?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Aufnahme l�uft - trotzdem ausschalten?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Aufnahme in %ld Minuten - trotzdem ausschalten?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "trotzdem ausschalten?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Plugin %s wacht in %ld Min auf, weiter?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr "Schnitt l�uft - trotzdem neu starten?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Aufnahme l�uft - trotzdem neu starten?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "trotzdem neu starten?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Lautst�rke "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klassischer VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG-Konsolen"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "MonDieMitDonFreSamSon"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Montag"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Freitag"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Samstag"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-Aufnahme beginnt in K�rze!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR schaltet sp�ter aus - Power zum erzwingen"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Taste dr�cken, um Ausschalten abzubrechen"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Prim�res Interface wird umgeschaltet..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Schnitt gescheitert!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Schnitt beendet"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Taste dr�cken, um Neustart abzubrechen"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR wird in %s Minuten ausschalten"
diff --git a/po/el_GR.po b/po/el_GR.po
index 363246db9..f20481565 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "�� ������ ��� ����� ���������!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "�������� ��������� ���������� ���������!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "���� ������ EPG"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "����� �����"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "��������"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "ell"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "���� 1: ��������� ������ RC"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "����� ��� ������� ��� ���������������"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "������� ������� RC!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "��� ����� �������..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "���� 2: �������� ����������� ��������"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "����� �� ������� ��� '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "����� '����' ��� �������"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "����� '����' ��� ��������"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(����� '����' ��� ���������"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(����� '����' ��� ���������� �������� ��������)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "����� '�����' ��� ���������� ����� ��� ��������"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "�������� �������� �������������"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "���� 3: ���������� �������"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "����� '����' ��� ����������, '����' ��� �������"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "����"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "����"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "�����"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "��"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "����"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "��������"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "�����"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "�������"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "�������"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "�������"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "����"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "�����������"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "�����������"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "�����"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "T����"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "E������"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "�������� ������"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "�������� ����"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "K�������"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "������+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "������-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "������+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "������-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "�������"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "����"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "���������"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "�������"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "��������������������"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "��������"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "���������"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "�������"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr ""
 
-#: menu.c:71
 msgid "encrypted"
 msgstr ""
 
-#: menu.c:177
 msgid "auto"
 msgstr "��������"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "����������� ��������"
 
-#: menu.c:254
 msgid "Name"
 msgstr "�����"
 
-#: menu.c:255
 msgid "Source"
 msgstr "����"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "���������"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "B����� PID"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "������"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "����������"
 
-#: menu.c:274
 msgid "off"
 msgstr "�������"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "������ ������ H"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "������"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "������ ������ L"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "����������"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "����� ����������"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "��������"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "���������"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "���������"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "�� ��������� ��� �������� ����������������!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "�������"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "��������"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "����������"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "�������"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "N��"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "��������"
+
+msgid "Button$Mark"
+msgstr "�������"
+
 msgid "Channel is being used by a timer!"
 msgstr "�� ������ ��������������� ��� �������������������!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "�������� ��������?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "����������� ��������������������"
 
-#: menu.c:662
 msgid "Active"
 msgstr "������"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "������"
 
-#: menu.c:664
 msgid "Day"
 msgstr "�����"
 
-#: menu.c:665
 msgid "Start"
 msgstr "����"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "�����"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "�������������"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "�������� ���������"
 
-#: menu.c:670
 msgid "File"
 msgstr "������"
 
-#: menu.c:686
 msgid "First day"
 msgstr "����� ����"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "��������������������"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "�����������"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "A����/K������"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "�����������"
+
 msgid "Delete timer?"
 msgstr "�������� ��������������������;?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "�������������������� �� ������� - �������� �������?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "�������"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr ""
+
 msgid "Button$Record"
 msgstr "�������"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "A�����"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr ""
+msgid "What's on now?"
+msgstr "������ ���������"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "������� ���������"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "������ ���������"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "�������"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "����"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "���������"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "������ �������� �������!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "��������� - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr ""
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr ""
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr ""
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr ""
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "����������� E�������"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "�����������"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "�������� ���� ����"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "��������"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "�������"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "�������"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "�������� ���� ���������� ��������!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "�������� ��������?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "����� ���� ��� �������� ��� �������!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "������� ��� ��������"
 
-#: menu.c:2203
 msgid "never"
 msgstr "����"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "�������� ��� ��� ���������"
 
-#: menu.c:2205
 msgid "always"
 msgstr "�����"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "������"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "���������"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "����"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "��������"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "�����"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "������"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "����"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "������ �������� ��������� (�)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "������������� ������ ��������������"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "���� ����������� ��������"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "����"
 
-#: menu.c:2225
 msgid "top"
 msgstr "����"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "������ ��������� ����������� �������� �� (�)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "����������� ���� ������ ��������"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr ""
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "������ �������"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "������ ����-����"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr ""
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "������� ��������"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "������������ ������ ������������"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "������"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "������ ��������� �������� EPG �� ����"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "������ ��������� ������ EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "������� ������������ ����������� (�����)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "����������� ���� ����������"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "������������ ����������� ����"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "������������� �������"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "������������ ������"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "���"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "���� �������"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "������� ��� PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "�������� ���� ��������"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "�������� ���� �����������"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "����� DVB �����"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "����� ������"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "����� ����������� ������"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "����� ���� Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "��������� ��������"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "������� ����"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "������ ����"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "������������ DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "���� LNB-��������� (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "��� LNB-��������� (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "M����"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "���������"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr ""
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "������� � �������� ��� CAM �����!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "������� � ��������� ��� CAM"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "�������"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "��������� ������ ���� ���� (�����)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "��������� ������ ��� ����� (�����)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "�������� ����"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "�������������� �������������"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "�������������� �������� ��������� (������)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "������������� ������������"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "�������� �����������"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "����� �������� ����������"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "����� VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "��������� VPS (�)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "������� ��������� ��������"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "�������� ��������� ��������"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "�������� ��������� �������� (�����)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "������� ������� ������� (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "����������� �������������� �������"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "�����������"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "������� ��������� ���������"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "������� ���������� ������������"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "�������"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "��������� ������ ���������� (�����)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "��������� ������ �������� (�����)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP ������� (�)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "������� ������� (�)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "����������"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "���� � �������� ��� ���� �����������!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "���������"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "������������"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "N� ����� ������� ������������?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " ����� ������� "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "���������"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "������"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "������"
+
 msgid "free"
 msgstr "���������"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " ����� ������������"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "����"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "�����"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "���������"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "�����"
 
+msgid "Button$Resume"
+msgstr "���������"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " ������� ������������"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "������� ��������?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "A������ ������������?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "�� ���������� ����"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "���������� DVB ������ ��� �������!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "������ �������� �������"
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "����������: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "��� ����� ������� ������ ������������"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "�������� ��������� ��� ������������!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "������ � �����������"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "����������� ��������� �� �������!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "���"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "AB�/���"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "��������"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�������������"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "��������"
+
 msgid "Plugin"
 msgstr "��������"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "����/���� ��� ��� ����. ���� ��"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "�� ������ ����� ������������ (������ �������)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "� ������� �������� �� �������!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�������� �� ����� �����������. ��������� � ���������� '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "������� ������� - ������ �� ����� �����������?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "���������� ������� �� %ld ����� - ������ �� �����������?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "������ �� ����� �����������?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "������� ������� - ������ �� ����� ������������?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "������ �� ����� ������������?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "������ "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "������� VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "������ ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "�������"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "������������������K��"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "�������"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "�����"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "�������"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "������"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "���������"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "�������"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "�������"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "����� ��� ������� ��� ������� �����������"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "� ����� DVB ����� �������..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "� ����������� �������!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "� ����������� ��������"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index bab0dfaca..82cc030db 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "!Canal no disponible!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "�No se puede iniciar el modo de transferencia!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Sin t�tulo"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Espa�ol"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "esl"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: Detectando tipo de mando"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Pulse cualquier tecla en el mando"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "�C�digo RC detectado!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "No pulse ninguna tecla..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: Aprendiendo c�digos espec�ficos"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Pulse la tecla para '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Pulse 'Arriba' para confirmar"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Pulse 'Abajo' para continuar"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Pulse 'Arriba' para retornar)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Pulse 'Abajo' para terminar el aprendizaje)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "Pulse 'Men�' para omitir esta tecla"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Aprendiendo teclas del mando"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Guardando los c�digos de teclas"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Pulse 'Arriba' para guardar, 'Abajo' para anular"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Arriba"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Abajo"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Men�"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Retornar"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Izquierda"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Derecha"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Rojo"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Verde"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Amarillo"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Azul"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Reproducir"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pausa"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Parar"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Grabar"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Avance r�pido"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Retroceso r�pido"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Apagar"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Canal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Canal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volumen+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volumen-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Mudo"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Gu�a de Programaci�n"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Canales"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Programar grabaciones"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Grabaciones"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Configuraci�n"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "�rdenes"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "en abierto"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "cifrado"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Modificar canal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nombre"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Fuente"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Acceso condicional (CA)"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarizaci�n"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "T.s�mbolos"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "off"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "ninguno"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulaci�n"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmisi�n"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Int.Guarda"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Jerarqu�a"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Canales"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Borrar"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Modificar"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marcar"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nuevo"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Borrar"
+
+msgid "Button$Mark"
+msgstr "Marcar"
+
 msgid "Channel is being used by a timer!"
 msgstr "�Hay una grabaci�n programada para este canal!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "�Eliminar canal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Modificar programaci�n"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Activo"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Canal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "D�a"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Comienzo"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Fin"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioridad"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Duraci�n"
 
-#: menu.c:670
 msgid "File"
 msgstr "Fichero"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Primer d�a"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Programar grabaciones"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "On/Off"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "�Eliminar programaci�n?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Todav�a est� grabando - �eliminar realmente?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Evento"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Programa"
+
 msgid "Button$Record"
 msgstr "Grabar"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Cambiar"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Programa"
+msgid "What's on now?"
+msgstr "�Qu� hay ahora?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "�Qu� hay despu�s?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "�Qu� hay ahora?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Despu�s"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Ahora"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Gu�a"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "�No se puede cambiar de canal!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Gu�a de programaci�n - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Este evento - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Este evento - todos los canales"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Todos los eventos - todos los canales"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "�Escriba %d d�gitos!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Informaci�n de grabaci�n"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Play"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Rebobinar"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Grabaciones"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Abrir"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "�rdenes"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "�Error al acceder a la grabaci�n!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "�Eliminar grabacion?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "�Error al borrar la grabaci�n!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "�rdenes de grabaci�n"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nunca"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "seg�n skin"
 
-#: menu.c:2205
 msgid "always"
 msgstr "siempre"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "Men�s en pantalla"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Idioma"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Izquierda"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Arriba"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Anchura"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Altura"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Duraci�n de los mensajes (sg)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Usar letra peque�a"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Posici�n para informaci�n de canal"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "abajo"
 
-#: menu.c:2225
 msgid "top"
 msgstr "arriba"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Tiempo de informaci�n de canal (sg)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Mostrar info al cambiar de canal"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Auto-cerrar al solicitar info de canal"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Deslizar p�ginas enteras"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Rotar arriba/abajo al deslizar"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Cerrar al pulsar bot�n de men�"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Mostrar directorios de grabaciones"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Gu�a de Programaci�n"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Escanear"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Tiempo de exploraci�n de EPG (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivel de correcci�n de EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Mostrar datos antiguos de EPG (m)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Ajustar reloj de sistema"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Transponder del que tomar la hora"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Idiomas preferidos"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Idioma preferido"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "no"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "s�lo nombres"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nombres y PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "a�adir canales"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "a�adir transponders"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Interfaz DVB primario"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Formato de v�deo"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Formato de visualizaci�n"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Usar Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Actualizar canales"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Idiomas de audio"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Idioma de audio"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilizar DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Frecuencia inferior del LNB (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecuencia superior del LNB (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Men�"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reiniciar"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Abriendo el men� CAM..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "�No se puede abrir el men� CAM!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "�No se puede reiniciar CAM!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Opciones de grabaci�n"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Comenzar grabaci�n antes (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Acabar grabaci�n despu�s (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "L�mite primario"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Prioridad por defecto"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Duraci�n por defecto (d�as)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioridad en modo pausa"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Duraci�n en modo pausa (d�as)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Utilizar nombre de episodo"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Usar servicio VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margen VPS (sg)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marcar grabaciones inmediatas"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nombrar grabaciones inmediatas"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Tiempo de grabaci�n inmediata (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Tama�o m�ximo de fichero (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Partir ficheros editados"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Opciones de reproducci�n"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Modo multi-velocidad"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar modo de reproducci�n"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Tiempo m�n. antes de un evento (m)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Tiempo m�n. de inactividad (m)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Tiempo de espera de SVDRP (sg)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Considerar canal como visto (sg)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Este plugin no admite configuraci�n"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configuraci�n"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "�Reiniciar realmente?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Parar grabaci�n "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Gu�a de Programaci�n"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disco"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disco"
+
 msgid "free"
 msgstr "libre"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Parar reproduci�n"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pausa"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Continuar"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Parar"
 
+msgid "Button$Resume"
+msgstr "Continuar"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Anular edici�n"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "�Parar grabaci�n?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "�Cancelar edici�n?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "�No hay audio disponible!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "�Ning�n dispositivo DVB disponible para grabar!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pausa de la emisi�n en directo..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Saltar: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "�No se definieron marcas de edici�n!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "�No se puede iniciar el proceso de edici�n!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Proceso de edici�n iniciado"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "�El proceso de edici�n ya est� activo!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "s�"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Insertar"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Sobreescribir"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Insertar"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Arriba/Abajo para mover - OK para confirmar"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "�Canal bloqueado (grabando)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "�Poco espacio en disco!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�No se puede apagar - falta el par�metro '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Grabaci�n en curso - �apagar igualmente?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Grabaci�n dentro de %ld minutos, �apagar realmente?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "�apagar igualmente?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Grabaci�n en curso - �reiniciar igualmente?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "�reiniciar igualmente?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volumen "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "VDR cl�sico"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "Paneles ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "LMXJVSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "LunMarMieJueVieSabDom"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Lunes"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Martes"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Mi�rcoles"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Jueves"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Viernes"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "S�bado"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Domingo"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Iniciando grabaci�n"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pulse una tecla para interrumpir apagar"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Cambiando el interfaz DVB primario..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "�Proceso de edici�n fallido!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proceso de edici�n terminado"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 56b8382be..fd63f1e28 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanal ei ole k�ttesaadav!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Siirdemooduse start eba�nnestus!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine k�ivitatud"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Pealkiri puudub"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "eesti"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "est"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Samm 1: Kodeerimiss�steemi tuvastamine"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Vajuta puldil suvalist klahvi"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Kodeerimiss�steem tuvastatud!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "�ra vajuta puldil �htki klahvi..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Samm 2: Klahvide �petamine"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Vajuta klahvile '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Kinnitamiseks vajuta '�les'"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "J�tkamiseks vajuta 'Alla'"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(tagasiminekuks vajuta '�les')"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(l�petamiseks vajuta 'Alla')"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(selle klahvi vahelej�tmiseks vajuta 'Men��')"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Kaugjuhtimispuldi �petamine"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Samm 3: Klavhikoodide salvestamine"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "�les"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Alla"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Men��"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Tagasi"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Vasakule"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Paremale"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Punane"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Roheline"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Kollane"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Sinine"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Start"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Paus"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stopp"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Salvestamine"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Edasikerimine"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Tagasikerimine"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "J�rgmine"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Eelmine"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Toide"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Eelmine kanal"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Helitugevus+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Helitugevus-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "H��letu"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Kava"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanalid"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Taimer"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Salvestused"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "S�tted"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "K�sud"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "FTA"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "kr�ptitud"
 
-#: menu.c:177
 msgid "auto"
 msgstr "automaatne"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Kanali muutmine"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nimi"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Allikas"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Sagedus"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisatsioon"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversioon"
 
-#: menu.c:274
 msgid "off"
 msgstr "v�ljas"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "t�hi"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulatsioon"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Ribalaius"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmissioon"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanalid"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Kustuta"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Muuda"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Siirda"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Uus"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Kustuta"
+
+msgid "Button$Mark"
+msgstr "Siirda"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanal on taimeri kasutuses!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Kustutada kanal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Taimeri muutmine"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiivne"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "P�ev"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Start"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Stopp"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioriteet"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Eluiga"
 
-#: menu.c:670
 msgid "File"
 msgstr "Fail"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Esimene p�ev"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Taimer"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "On/Off"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Kustutada taimer?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Salvestus aktiivne - kustutada?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Saade"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Taimer"
+
 msgid "Button$Record"
 msgstr "Salvesta"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Vali"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Taimer"
+msgid "What's on now?"
+msgstr "Hetkel eetris"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "J�rgmisena eetris"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Hetkel eetris"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Tulekul"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "N��d"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Ajakava"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kanali vahetus ei ole v�imalik!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Ajakava - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Sama saade - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Sama saade - k�ik kanalid"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "K�ik saated - k�ik kanalid"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Palun sisesta %d numbrit!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr "CAM ei vasta"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Salvestuse info"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Start"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Algusesse"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Salvestused"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Ava"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "K�sud"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Salvestuse taasesitus eba�nnestus!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Kustutada salvestus?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Salvestuse kustutamine eba�nnestus!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Salvestuse k�sud"
 
-#: menu.c:2203
 msgid "never"
 msgstr "mitte kunagi"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "kestast s�ltuv"
 
-#: menu.c:2205
 msgid "always"
 msgstr "alati"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "Ekraanimen��"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Keel"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Kest"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Teema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Vasakule"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "�lesse"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Laius"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "K�rgus"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Teate esitusaeg (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "V�ikese fondi kasutamine"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr "Fondi silumine"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr "Vaikefont"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr "V�ike font"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr "Fikseeritud font"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr "Vaikefondi suurus (px)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr "V�ikese fondi suurus (px)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr "Fiks. fondi suurus (px)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanaliinfo asukoht"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "all"
 
-#: menu.c:2225
 msgid "top"
 msgstr "�leval"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanaliinfo esitusaeg (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanaliinfo n�itamine"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Kanaliinfo kuvamise ajapiirang"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Lehek�lje kerimine"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Ridade kerimine"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Sulgemine Men�� klahviga"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Kausta nime salvestamine"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Uuenda"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG skaneerimise viide (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "EPG veaparanduse tase"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vana EPG viide (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Kella s�nkroniseerimine"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Kella s�nkroniseerimise transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Eelistatuid keeli"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Eelistatud keel"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "ei"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "ainult nimed"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "ainult PID-id"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nimi ja PID-id"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "uute kanalite lisamine"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "uute transponderite lisamine"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Esmane DVB seade"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "TV k�lgsuhe"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Video kuvamise formaat"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby Digital kasutamine"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Kanalite uuendamine"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio keeli"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio keel"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "DiSEqC kasutamine"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "LO LNB sagedus (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "HI LNB sagedus (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr "CAM taask�ivitamine"
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr "CAM esitletud"
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr "CAM t��valmis"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Men��"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Nullimine"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "CAM-men�� avamine..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Ei saa avada CAM men��d!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr "CAM on kasutuses - taask�ivitada?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "CAM mooduli taask�ivitus eba�nnestus!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Salvestamine"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Salvestamise algusvaru (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Salvestamise l�puvaru (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Esmane prioriteet"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Vaikimisi prioriteet"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Salvestuse eluiga (p�evi)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Pausi prioriteet"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Pausi eluiga (p�evi)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Episoodi nime kasutamine"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS-i kasutamine"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS-i algusvaru (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Otsesalvestuse m�rgistamine"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Otsesalvestuse nimi"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Otsesalvestuse kestus (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimaalne failisuurus (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Failide t�keldamine"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Taasesitus"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Multi-kiiruse moodus"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Korduse moodus"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "J�tkamise ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Muud s�tted"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Min. s�ndmuse kestus (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Min. kasutaja tegevusetus (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP ooteaeg (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanalivahetuse ooteaeg (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanali sisestamise ajalimiit (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal k�ivitamisel"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "nagu enne"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus k�ivitamisel"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Laiendusmoodulid"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Sellel laienudusmoodulil ei ole seadeid!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "S�tted"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Restart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Restart?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " L�petada salvestamine "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Kava"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Ketas"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Ketas"
+
 msgid "free"
 msgstr "vaba"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " L�petada taasesitamine"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Paus"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "J�tka"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stopp"
 
+msgid "Button$Resume"
+msgstr "J�tka"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Katkestada redigeerimine"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "L�petada salvestamine?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "T�histada muudatus?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Audio k�ttesaamatu!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Ebapiisavalt kettaruumi salvestamise alustamiseks!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Puudub vaba DVB seade salvestamiseks!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Saate edastamise peatamine..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "H�pe: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Redigeerimise markerid puuduvad!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Redigeerimise start eba�nnestus!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Redigeerimine algas"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Redigeerimine juba aktiivne!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abcdefghijklmnopqrs�z�tuvw����xy0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "jah"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Lisa (INS)"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Asenda (OVR)"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Lisa (INS)"
+
 msgid "Plugin"
 msgstr "Laiendusmoodul"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "'�les/Alla' uus asukoht - 'OK' kinnitus"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanal lukus (salvestamine aktiivne)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "K�vaketas t�is!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr "Redigeerimine aktiive - l�litan v�lja?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Salvestamine aktiivne - l�litada v�lja?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Salvestamine algab %ld minuti p�rast - l�litada v�lja?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "l�litada v�lja?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Laiendusmoodul %s �rkab %ld minuti p�rast, j�tkata?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr "Redigeerimine aktiivne - taask�ivitada?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Salvestamine aktiivne - restart?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "restart?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Helitugevus "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klassikaline VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsool"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr " E  T  K  N  R  L  P "
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Esmasp�ev"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Teisip�ev"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Kolmap�ev"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Neljap�ev"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Reede"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Laup�ev"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "P�hap�ev"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS salvestamine tulekul!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Salvestamine algas"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR l�litub v�lja hiljem - vajuta Power kiirendamiseks"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Esmase DVB seadme �mberl�litus..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Redigeerimine eba�nnestus"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigeerimine l�petatud"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR l�litub v�lja %s minuti p�rast"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 09b83b4fe..da676d07d 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,1256 +18,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanava ei ole k�ytett�viss�!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Siirtotilan aloitus ep�onnistui!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan p�ivitys aloitettu"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Ei esityst�"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "suomi"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "fin"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Vaihe 1: Koodauksen tunnistaminen"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Paina mit� tahansa kaukos��timen n�pp�int�"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "N�pp�inpainallus vastaanotettu!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "�l� paina kaukos��timen n�pp�imi�..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Vaihe 2: N�pp�inkoodien opettelu"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Paina n�pp�int� toiminnolle '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Hyv�ksy painamalla 'Yl�s'"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Jatka painamalla 'Alas'"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(palaa takaisin painamalla 'Yl�s')"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(lopeta opettaminen painamalla 'Alas')"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "n�pp�imen puuttuessa paina 'Valikko'"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Kaukos��timen opettaminen"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Vaihe 3: N�pp�inkoodien tallentaminen"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Yl�s"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Alas"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Valikko"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Takaisin"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Vasemmalle"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Oikealle"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Punainen"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Vihre�"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Keltainen"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Sininen"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Tiedot"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Toista"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Tauko"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Lopeta"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Tallenna"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Pikakelaus >>"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Pikakelaus <<"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Seuraava"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Edellinen"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Virta"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanava +"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanava -"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Edellinen kanava"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "��nenvoimakkuus +"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "��nenvoimakkuus -"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Mykistys"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "��ni"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr "Tekstitys"
+
 msgid "Key$Schedule"
 msgstr "Ohjelmisto"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanavat"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Ajastimet"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Tallenteet"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Asetukset"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Komennot"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr "Lis�n�pp�in 1"
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr "Lis�n�pp�in 2"
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr "Lis�n�pp�in 3"
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr "Lis�n�pp�in 4"
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr "Lis�n�pp�in 5"
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr "Lis�n�pp�in 6"
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr "Lis�n�pp�in 7"
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr "Lis�n�pp�in 8"
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr "Lis�n�pp�in 9"
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "vapaa"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "salattu"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Muokkaa kanavaa"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nimi"
 
-#: menu.c:255
 msgid "Source"
 msgstr "L�hde"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Taajuus"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Kuva-PID"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "PCR-PID"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "��ni-PID (1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "��ni-PID (2)"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dolby-PID (1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dolby-PID (2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr "Tekstitys-PID (1)"
+
+msgid "Spid2"
+msgstr "Tekstitys-PID (2)"
+
 msgid "Tpid"
 msgstr "Teksti-TV-PID"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Salaus (CA)"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Palvelu-ID"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisaatio"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Symbolinopeus"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversio"
 
-#: menu.c:274
 msgid "off"
 msgstr "pois"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "Suojaustaso (HP)"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "tyhj�"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "Suojaustaso (LP)"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulaatio"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Kaistanleveys"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmissio"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Suojav�li"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarkia"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanavat"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Poista"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Muokkaa"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Siirr�"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Uusi"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Poista"
+
+msgid "Button$Mark"
+msgstr "Siirr�"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanava on ajastimen k�yt�ss�!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Poistetaanko kanava?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Muokkaa ajastinta"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanava"
 
-#: menu.c:664
 msgid "Day"
 msgstr "P�iv�"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Aloitus"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Lopetus"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Elinik�"
 
-#: menu.c:670
 msgid "File"
 msgstr "Tiedosto"
 
-#: menu.c:686
 msgid "First day"
 msgstr "1. p�iv�"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Ajastimet"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Tiedot"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "P��ll�/Pois"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Tiedot"
+
 msgid "Delete timer?"
 msgstr "Poistetaanko ajastin?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Ajastettu tallennus k�ynniss� - poistetaanko silti?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Ajastin"
+
 msgid "Button$Record"
 msgstr "Tallenna"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Valitse"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Ajastin"
+msgid "What's on now?"
+msgstr "Menossa nyt"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Tulossa seuraavaksi"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Menossa nyt"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Seuraavaksi"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Nyt"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Ohjelmisto"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kanavan vaihtaminen ei mahdollista!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Ohjelmisto - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "T�m� tapahtuma - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "T�m� tapahtuma - kaikki kanavat"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Kaikki tapahtumat - kaikki kanavat"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Sy�t� %d numeroa!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr "CA-moduuli ei vastaa!"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Tallenteen tiedot"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Toista"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Alkuun"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Tallenteet"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Avaa"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Komennot"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Tallenteen toistaminen ep�onnistui!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Poistetaanko tallenne?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Tallenteen poistaminen ep�onnistui!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Tallennekomennot"
 
-#: menu.c:2203
 msgid "never"
 msgstr "ei koskaan"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "ulkoasun mukaan"
 
-#: menu.c:2205
 msgid "always"
 msgstr "aina"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "Kuvaruutun�ytt�"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Kieli"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Ulkoasu"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Teema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Vaakakeskitys"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Pystykeskitys"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Leveys"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Korkeus"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Viestien esitysaika (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "K�yt� pieni� kirjasimia"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr "K�yt� reunan pehmennyst�"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr "Oletuskirjasintyyppi"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr "Pieni kirjasintyyppi"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr "Tasav�linen kirjasintyyppi"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr "Oletuskirjasintyypin koko (px)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr "Pienen kirjasintyypin koko (px)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr "Tasav�lisen kirjasintyypin koko (px)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanavatiedon sijainti"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "alareuna"
 
-#: menu.c:2225
 msgid "top"
 msgstr "yl�reuna"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanavatiedon esitysaika (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "N�yt� kanavatieto vaihdettaessa"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Sulje erikseen avattu kanavatieto"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Valikoiden vieritys sivuttain"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Valikoiden vieritys ymp�ri"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Sulje valikkon�pp�imell�"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "N�yt� tallennehakemistot"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Ohjelmaopas"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "P�ivit�"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Ohjelmaoppaan taustap�ivitys (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Ohjelmaoppaan korjaustaso"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vanha tieto n�kyy (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Tahdista kellonaika"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Vastaanota kellonaika transponderilta"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Suosikkikielet"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Suosikkikieli"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "ei"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "vain nimet"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "vain PID:it"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nimet ja PID:it"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "uudet kanavat"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "uudet transponderit"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Ensisijainen DVB-sovitin"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Kuvasuhde"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "N�ytt�muoto"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "K�yt� Dolby Digital -��nt�"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "P�ivit� kanavat"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "��nen kielet"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "��nen kieli"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr "N�yt� tekstitys"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "Tekstityskielet"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "Tekstityskieli"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "Tekstityksen tasaus"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "Tekstityksen l�pin�kyvyys"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "Tekstityksen taustan l�pin�kyvyys"
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "K�yt� DiSEqC-kytkint�"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "LNB-rajataajuus (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "LNB-alataajuus (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "LNB-yl�taajuus (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr "CAM nollaus"
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr "CAM havaittu"
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr "CAM valmis"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Valikko"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Nollaa"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Avataan CA-moduulin valikkoa..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "CA-moduulin valikko ei saatavilla"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr "CA-moduuli k�yt�ss� - nollataanko?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "CA-moduulin nollaus ep�onnistui!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Tallennus"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Aloitusmarginaali (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Lopetusmarginaali (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Ensisijaisen sovittimen prioriteettiraja"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Tallenteen oletusprioriteetti"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Tallenteen oletuselinik� (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Taukotallenteen prioriteetti"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Taukotallenteen elinik� (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "K�yt� jakson nime�"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "K�yt� VPS-toimintoa"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS-toiminnon aloitusmarginaali (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Merkitse pikatallenne"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nime� pikatallenne"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Pikatallennuksen kesto (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Suurin tiedostokoko (Mt)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Jaottele muokatut tallenteet"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Toisto"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "K�yt� toiston moninopeustilaa"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "N�yt� toiston tila"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Tapahtuman odotusaika (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "K�ytt�j�toiminnon odotusaika (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP-komennon odotusaika (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanavavalinnan odotusaika (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanavasy�tteen odotusaika (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanava k�ynnistett�ess�"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "edellinen"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��nenvoimakkuus k�ynnistett�ess�"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Laajennokset"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "T�ll� laajennoksella ei ole asetuksia!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Asetukset"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "K�ynnist� uudelleen"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "K�ynnistet��nk� uudelleen?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Lopeta tallennus "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Ohjelmisto"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Levy"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Levy"
+
 msgid "free"
 msgstr "vapaana"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Lopeta toisto"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "��ni"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Tauko"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Jatka"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Lopeta"
 
+msgid "Button$Resume"
+msgstr "Jatka"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Peru muokkaus"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Lopetetaanko tallennus?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Perutaanko muokkaus?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "��nen kieli ei ole valittavissa!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr "Ei tekstityst�"
+
+msgid "Button$Subtitles"
+msgstr "Tekstitys"
+
+msgid "No subtitles available!"
+msgstr "Tekstitys ei ole valittavissa!"
+
 msgid "Not enough disk space to start recording!"
 msgstr "Tallennustilan puute est�� tallennuksen!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ei vapaata DVB-viritint� tallennukselle!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pys�ytet��n l�hetys..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Siirry: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Muokkausmerkinn�t puuttuvat!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Muokkauksen aloitus ep�onnistui!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Muokkaus aloitettu"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Muokkaus on jo k�ynniss�!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "kyll�"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Lis��"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Korvaa"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Lis��"
+
 msgid "Plugin"
 msgstr "Laajennos"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanava lukittu (tallennus k�ynniss�)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Tallennustila loppumassa!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr "Muokkaus kesken - sammutetaanko?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Tallennus kesken - sammutetaanko?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Tallennus alkaa %ld min kuluttua - sammutetaanko?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "sammutetaanko?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Laajennos %s her�� %ld minuutin kuluttua - sammutetaanko?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr "Muokkaus kesken - k�ynnistet��nk� uudelleen?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Tallennus kesken - k�ynnistet��nk� uudelleen?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "k�ynnistet��nk� uudelleen?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "��nenvoimakkuus "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klassinen VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsoli"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "Ma Ti Ke To Pe La Su "
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Maanantai"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Torstai"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Perjantai"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-tallennus on alkamassa!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR sammuu my�hemmin - pakota virtan�pp�imell�"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Peru sammutus painamalla mit� tahansa n�pp�int�"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Muokkaus ep�onnistui!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Muokkaus valmis"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Peru uudelleenk�ynnistys painamalla mit� tahansa n�pp�int�"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR sammuu %s minuutin kuluttua"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 4e5551cbf..d19d62754 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-17 13:45+0200\n"
 "Last-Translator: Bruno Roussel <bruno.roussel@free.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -20,1256 +20,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Cha�ne non disponible !"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Impossible d'utiliser le mode transfert !"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Mise � jour du guide des programmes"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Sans titre"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Fran�ais"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "fra"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Phase 1: D�tection du type de code"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Appuyer sur une touche de la t�l�commande"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Code de la t�l�commande d�tect� !"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "N'appuyer sur aucune touche ..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Phase 2: Apprentissage des codes des touches"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Appuyer sur la touche '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Appuyer sur 'Haut' pour confirmer"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Appuyer sur 'Bas' pour continuer"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Appuyer sur 'Haut' pour revenir en arri�re)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Appuyer sur 'Bas' pour terminer)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "('Menu' pour passer cette touche)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Apprentissage des codes de t�l�commande"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Phase 3: Sauvegarde des codes des touches"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Haut"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Bas"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Retour"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Gauche"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Droite"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Rouge"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Vert"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Jaune"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Bleu"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Lecture"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pause"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Enregistrement"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Avance rapide"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Retour rapide"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Suivant"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Pr�c�dent"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Arr�t"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Cha�ne+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Cha�ne-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Cha�ne pr�c�dente"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volume+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volume-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Coupure du son"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Programmes"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Cha�nes"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Programmation"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Enregistrements"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Configuration"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Commandes"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr "Utilisateur1"
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr "Utilisateur2"
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr "Utilisateur3"
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr "Utilisateur4"
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr "Utilisateur5"
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr "Utilisateur6"
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr "Utilisateur7"
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr "Utilisateur8"
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr "Utilisateur9"
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "Aucun cryptage"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "Crypt�"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Modifier une cha�ne"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nom"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Source"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Fr�quence"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "PID Vid�o"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "PID Audio (1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "PID Audio (2)"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "PID AC3 (1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "PID T�l�texte"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Cryptage"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisation"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Fr�q. Symbole"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "off"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "aucun"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bande passante"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hi�rarchie"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Caract�ristiques des cha�nes non uniques"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Cha�nes"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Supprimer"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Modifier"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marquer"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nouveau"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Supprimer"
+
+msgid "Button$Mark"
+msgstr "Marquer"
+
 msgid "Channel is being used by a timer!"
 msgstr "Cette cha�ne est en cours d'utilisation !"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Supprimer la cha�ne ?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Changer la programmation"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Actif"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Cha�ne"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Jour"
 
-#: menu.c:665
 msgid "Start"
 msgstr "D�but"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Fin"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Priorit�"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Dur�e de vie"
 
-#: menu.c:670
 msgid "File"
 msgstr "Fichier"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Premier jour"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Programmation"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Marche/Arr"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Supprimer la programmation ?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Enregistrement en cours - suppression confirm�e ?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Ev�nement"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Programmation"
+
 msgid "Button$Record"
 msgstr "Enregistre"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Regarder"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Programmation"
+msgid "What's on now?"
+msgstr "Programmes en cours"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Prochains programmes"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Programmes en cours"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Apr�s"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Maintenant"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programme"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Impossible de changer de cha�ne !"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programmes - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Cet �v�nement -%s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Cet �v�nement - toutes les cha�nes"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Tous les �v�nements - toutes les cha�nes"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Veuillez entrer %d chiffres !"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr "Pas de r�ponse de la CAM"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Infos sur l'enregistrement"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Lire"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Retour"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Enregistrements"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Ouvrir"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Commandes"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Impossible d'acc�der � l'enregistrement"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Supprimer l'enregistrement ?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Erreur de suppression de l'enregistrement !"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Commandes d'enregistrement"
 
-#: menu.c:2203
 msgid "never"
 msgstr "jamais"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "d�pend du skin"
 
-#: menu.c:2205
 msgid "always"
 msgstr "toujours"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "Affichage des menus"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Langue"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Th�me"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Gauche"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Haut"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Largeur"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Hauteur"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Dur�e affichage message (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Utiliser les petites polices"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr "Anti-aliasing"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr "Police par d�faut"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr "Petite police"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr "Police taille fixe"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr "Taille police par d�faut (pixel)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr "Taille petite police par d�faut (pixel)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr "Taille police fixe par d�faut (pixel)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Position infos cha�nes"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "bas"
 
-#: menu.c:2225
 msgid "top"
 msgstr "haut"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Dur�e affichage infos cha�nes (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Affichage progr. en cours"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Demande d'infos de cha�ne termin�e"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "D�filement par pages"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "D�filement rotatif"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Menu bouton ferm�"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Dossiers d'enregistrements"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Guide des programmes"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Scan"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Inactivit� avant rech. EPG (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Niveau de correction EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Montrer l'EPG p�rim� (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Ajuster l'heure du syst�me"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Utiliser l'heure de la cha�ne"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Langues pr�f�r�es"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Langue pr�f�r�e"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "non"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "noms uniquement"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "PIDs uniquement"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "noms et PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "ajouter cha�nes"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "ajouter transpondeurs"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "Cartes DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Carte DVB primaire"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Format vid�o"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Format d'affichage"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Utiliser le Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Mettre � jour les cha�nes"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Langues audio"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Langue audio"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utiliser le DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "Limite de bandes LNB (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Fr�quence basse LNB (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Fr�quence haute LNB (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr "CAM remise � z�ro"
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr "CAM pr�sente"
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr "CAM pr�te"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "Acc�s conditionnel"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "R�initialisation"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Ouverture du menu CAM"
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Impossible d'ouvrir le menu CAM !"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr "CAM en cours d'utilisation - Remettre � z�ro ?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Impossible de r�initialiser la CAM !"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Enregistrement"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Marge ant�rieure (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marge post�rieure (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Limite primaire"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Priorit� par d�faut"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Dur�e de vie par d�faut (j)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorit� des pauses"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Dur�e de vie des pauses (j)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Utiliser le nom de l'�pisode"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Utiliser le VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Marge VPS"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marquage enregistr. imm�diats"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Noms enregistr. imm�diats"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Dur�e enregistr. imm�diat (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Taille maxi des fichiers (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "S�parer les s�quences �dit�es"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Lecture"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Mode multi-vitesses"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Affichage mode de lecture"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "MinEventTimeout (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Dur�e minimale d'inact. (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Temps maxi SVDRP (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Prise en compte cha�ne (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Entr�e cha�ne timeout (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Cha�ne initiale"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "comme avant"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Ce plugin n'a pas de param�tres!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configuration"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Red�marrer"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Vraiment red�marrer ?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Arr�ter l'enregistrement "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Programmes"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disque"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disque"
+
 msgid "free"
 msgstr "restant"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Arr�ter la lecture"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pause"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Reprendre"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Arr�t"
 
+msgid "Button$Resume"
+msgstr "Reprendre"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Annuler le montage"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Arr�ter l'enregistrement ?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Annuler les modifications ?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Pas d'audio disponible !"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Espace disque insuffisant pour d�marrer l'enregistrement !"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Pas de carte DVB disponible pour l'enregistrement !"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pause de l'�mission en direct..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Acc�s direct : "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Pas de marques d'�dition d�finies !"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Impossible de commencer le montage !"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Op�ration de montage lanc�e"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Montage d�j� en cours !"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "oui"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Ins�rer"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Ecraser"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Ins�rer"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Haut/Bas -> nouvelle place - OK -> d�placer"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Cha�ne verrouill�e (enregistrement en cours) !"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Disque presque plein !"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Arr�t impossible - option '-s' absente !"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr "Edition en cours - confirmez l'arr�t ?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Enregistrement en cours - confirmez l'arr�t ?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Enregistrement dans %ld minutes - confirmez l'arr�t"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "confirmez l'arr�t"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Le plugin %s d�marre dans %ld min, continuer ?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr "Edition en cours - red�marrer ?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Enregistrement en cours - red�marrer ?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "red�marrer ?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volume "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "VDR Classique"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "Consoles ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "LunMarMerJeuVenSamDim"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Lundi"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Vendredi"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Samedi"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Enregistrement VPS commence procha�nement"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Enregistrement a commenc�"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR doit s'arr�ter plus tard - Appuyer sur Power pour forcer"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Appuyez sur une touche pour annuler l'arr�t"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Changement de carte DVB primaire..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Echec du montage !"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Montage termin�"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Appuyer sur une touche pour annuler le red�marrage"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR s'arr�tera dans %s minutes"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 1798657c1..572cbd433 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,1256 +16,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan program ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Program nije dostupan!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Ne mogu zapo�eti 'prijenosni' na�in!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Po�injem EPG-scan"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Bez titla"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Hrvatski"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "hrv"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Faza 1: detektiranje k�da daljinskog upravlja�a."
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Pritisnite tipku na daljinskom upravlja�u"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "K�d daljinskog upravlja�a je prepoznat!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Ne pritiskajte tipku..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Faza 2: U�enje posebnih k�dova"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Pritisnite tipku za '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Pritisnite 'Gore' za potvrdu"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Pritisnite 'Dolje' za nastavak"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(pritisnite 'Gore' za nazad)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(pritisnite 'Dolje' za kraj)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "pritisnite 'Izbor' da presko�ite ovu tipku"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "U�enje k�da daljinskog upravlja�a"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Faza 3: Spremanje k�dova tipki"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "'Gore' za potvrdu, 'Dolje' za prekid"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Gore"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Dolje"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Izbor"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Nazad"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Lijevo"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Desno"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Crveno"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Zeleno"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "�uto"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Plavo"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Start"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pauza"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Snimaj"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Naprijed"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Nazad"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Isklju�i"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Program +"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Program -"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Glasnije"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Ti�e"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Bez zvuka"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr ""
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Raspored"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Programi"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Termini"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Snimke"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Konfiguracija"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Naredbe"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr ""
 
-#: menu.c:71
 msgid "encrypted"
 msgstr ""
 
-#: menu.c:177
 msgid "auto"
 msgstr "automatski"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Ure�ivanje programa"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Naziv"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Izvor"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvencija"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Kodiranje (CA)"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarizacija"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inverzija"
 
-#: menu.c:274
 msgid "off"
 msgstr "ugasi"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "nijedan"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulacija"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandwidth"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Prijenos"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Za�tita"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hijerarhija"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Parametri programa nisu jednozna�ni!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Programi"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Obri�i"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Promijeni"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Ozna�i"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Novi"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Obri�i"
+
+msgid "Button$Mark"
+msgstr "Ozna�i"
+
 msgid "Channel is being used by a timer!"
 msgstr "Program je trenutno zauzet terminom za snimanje"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Obrisati program?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Ure�ivanje termina"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktivan"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Program"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dan"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Po�etak"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Kraj"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioritet"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Trajanje"
 
-#: menu.c:670
 msgid "File"
 msgstr "Datoteka"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Prvi dan"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Termini"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "De-/Aktiviraj"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Obrisati termin?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Jo� snimam - zaista obrisati?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Emisija"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr ""
+
 msgid "Button$Record"
 msgstr "Snimi"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Prebaci"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr ""
+msgid "What's on now?"
+msgstr "�to je trenutno na programu?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "�to slijedi?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "�to je trenutno na programu?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Slijedi"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Trenutno"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Raspored"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Ne mogu prebaciti program!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Raspored - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr ""
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr ""
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr ""
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr ""
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr ""
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Start"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Na po�etak"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Snimke"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Otvori"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Naredbe"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Gre�ka pri pristupanju snimke!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Obrisati snimku?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Gre�ka pri brisanju snimke!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Naredbe za snimanje"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nikada"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "ovisno o povr�ini"
 
-#: menu.c:2205
 msgid "always"
 msgstr "uvijek"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Jezik"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Povr�ina"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Lijevo"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Gore"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "�irina"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Visina"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Vrijeme prikaza poruka (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Koristi mala slova"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacije o programu"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "dolje"
 
-#: menu.c:2225
 msgid "top"
 msgstr "gore"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Vrijeme prikaza informacije o programu (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informacije kod promjene kanala"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr ""
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Listaj po stranicama"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "S kraja sko�i na po�etak"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr ""
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Imenik za snimke"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Pregled emisija (EPG)"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Pretra�i"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Vrijeme do EPG pregleda (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivo popravka EPG gre�aka"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Prika�i stare EPG podatke (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Podesi vrijeme sistema"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Transponder za pode�avanje sata"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Preferirani jezici"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Preferirani jezik"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "ne"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "samo imena"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "imena i identifikatore (PIDs)"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "dodaj nove programe"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "dodaj nove transpondere"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarni DVB ure�aj"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Format video prikaza"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Koristi Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Aktualiziraj programe"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio jezici"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio jezik"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Koristi DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "Frekv. preklopa SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Donja LNB frekv. (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Gornja LNB frekv. (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Izbor"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reset"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr ""
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Ne mogu otvoriti CAM izbor!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Ne mogu resetirati CAM"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Snimanje"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Rezerva na po�etku snimanja (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Rezerva na kraju (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Standardno ograni�enje"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Standardni prioritet"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standardno trajanje (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet pauze"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Trajanje pauze (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Koristi ime epizode"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Koristi VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Vremenska rezerva kod VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Ozna�i direktno snimanje"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Imenuj direktno snimanje"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Trajanje direktnog snimanja (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimalna veli�ina datoteke (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Podijeli ure�ene datoteke"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Reprodukcija"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "MultiSpeed na�in"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i na�in prikazivanja"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Ostalo"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minimalno vrijeme pauze"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minimalno vrijeme neaktivnosti (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP vrijeme neaktivnosti"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr ""
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Dodaci (Plugins)"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Ovaj dodatak (Plugin) nema parametara!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Konfiguracija"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Restart sistema"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Zaista ponovo pokrenuti?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Prekini snimanje "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Raspored"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "slobodno"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr ""
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pauza"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Nastavi"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stop"
 
+msgid "Button$Resume"
+msgstr "Nastavi"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Prekini ure�ivanje"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Zaustaviti snimanje?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Otkazati ure�ivanje?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Audio nedostupan"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nema slobodnog DVB ure�aja za snimanje!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Zaustavljanje �ivog signala..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Sko�i: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Nijedna prekidna to�ka nije postavljena!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Ne mogu zapo�eti ure�ivanje!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Rezanje je zapo�eto"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Ure�ivanje je ve� aktivirano!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "da"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Umetni"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Prepi�i"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Umetni"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Gore/Dolje na novu poziciju - zatim OK"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Program blokiran (snimanje)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Nedovoljno prostora na disku"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Snimanje traje - svejedno isklju�iti?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Snimanje za %ld minuta - svejedno isklju�iti?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "svejedno isklju�iti?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Snimanje traje - svejedno restart sistema?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "svejedno restart sistema?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Glasno�a "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzole"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "PUS�PSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "PonUtoSri�etPetSubNed"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Ponedjeljak"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Srijeda"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "�etvrtak"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Petak"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Subota"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite tipku ako ne �elite ugasiti sistem"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Preklapanje primarnog DVB ure�aja..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Rezanje neuspje�no!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Rezanje zavr�eno"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 495aa40e5..a42dee016 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -3,1269 +3,997 @@
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
+# Thomas G�nther <tom@toms-cafe.de>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"PO-Revision-Date: 2007-10-13 14:32+0200\n"
+"Last-Translator: Thomas G�nther <tom@toms-cafe.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Az ad� nem el�rhet�"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Transfer-Mode nem ind�that�!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "EPG adatok aktualiz�l�sa"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "n�v n�lk�l"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Magyar"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "hun"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Nyomjon meg egy gombot a t�vir�ny�t�n"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "T�vir�ny�t� k�dja felismerve!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Ne nyomjon meg gombot..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "M�sodik l�p�s: az egyes gombok betan�t�sa"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "'%s' gomb megnyom�sa"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "'Fel' megnyom�sa az elfogad�shoz"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "'Le' megnyom�sa a folytat�shoz"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
-msgstr "(�Fel' megnyom�sa a visszat�r�shez)"
+msgstr "('Fel' megnyom�sa a visszat�r�shez)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "('Le' megnyom�sa a befejez�shez)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "T�vir�ny�t� betan�t�sa"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Harmadik l�p�s: k�d ment�se"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Fel' ment�s, 'Le� m�gse"
+msgstr "'Fel' ment�s, 'Le' m�gse"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Fel"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Le"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Men�"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Vissza"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Balra"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Jobbra"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Piros"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Z�ld"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "S�rga"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "K�k"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Inform�ci�"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Lej�tsz�s"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Sz�net"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Felvenni"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "El�re p�rgetni"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Vissza p�rgetni"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "El�re"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Vissza"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Kikapcsolni"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Csatorna+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Csatorna-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Az el�z� ad�s"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Hanger�+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Hanger�-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Csend"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Hang"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Csatorn�k"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Id�z�t�"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Felvett ad�sok"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Be�ll�t�sok"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Parancsok"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "K�dolatlan"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "K�dolt"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Csatorn�k be�ll�t�sa"
 
-#: menu.c:254
 msgid "Name"
 msgstr "N�v"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Forr�s"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvencia"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polariz�ci�"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "ki"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "semmi"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandwidth"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Csatorn�k"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "T�r�lni"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Be�ll�tani"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Megjel�lni"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "�j"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "T�r�lni"
+
+msgid "Button$Mark"
+msgstr "Megjel�lni"
+
 msgid "Channel is being used by a timer!"
 msgstr "Az ad�t az id�z�t� haszn�lja!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Csatorna t�rl�se?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Id�z�t� megv�ltoztat�sa"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiv"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Csatorna"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Nap"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Kezdet"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "V�ge"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Priorit�s"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "�lettartam"
 
-#: menu.c:670
 msgid "File"
 msgstr "File"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Els� nap"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Id�z�t�"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Inform�ci�"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Be/Ki"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Inform�ci�"
+
 msgid "Delete timer?"
 msgstr "Id�z�t� t�rl�se?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Felv�tel folyamatban van - m�gis t�r�lni?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Ad�s"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Id�z�t�"
+
 msgid "Button$Record"
 msgstr "Felvenni"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "�tkapcsolni"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Id�z�t�"
+msgid "What's on now?"
+msgstr "Mi megy most?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Mi k�vetkezik?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Mi megy most?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "K�vetkez�"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Most"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Az ad�t nem lehet elkapcsolni"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Ez az ad�s - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Ez az ad�s - �sszes ad�"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Az �sszes ad�s - az �sszes ad�"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "�ss�n be %d sz�mot!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Felv�tel"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Lej�tszani"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Vissza az elej�re"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Felvett ad�sok"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Kinyitni"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Parancsok"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Hiba a felv�tel hozz�f�r�s�n�l"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Felv�tel t�rl�se?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Hiba a felv�tel t�rl�s�n�l!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Parancsok a felvett filmekhez"
 
-#: menu.c:2203
 msgid "never"
 msgstr "soha"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "Men� n�zet�t�l f�gg�en"
 
-#: menu.c:2205
 msgid "always"
 msgstr "mindig"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Nyelv"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Men� n�zet"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "T�ma"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Balra"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Fent"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Sz�less�g"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Magass�g"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Inform�ci� felt�ntet�s�nek id�tartama"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Kisbet�t haszn�lni"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Ad�sinform�ci� pozici�ja"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "lent"
 
-#: menu.c:2225
 msgid "top"
 msgstr "Fent"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Inform�ci� az ad� v�lt�s�n�l"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "A lek�rdezett ad�sinform�ci� bez�r�sa"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Oldalank�nt l�ptetmi"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Korl�tlan l�ptet�s"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "A men� gomb z�r"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Felv�telek list�ja"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Ad�skeres�s"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Fennmaradt id� az EPG-�j�t�sig (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "EPG hibaelh�r�t�s"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "R�gi EPG adatok megmutat�sa (perc)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Az id� be�ll�t�sa"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Id�h�z tartoz� Transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Kedvenc nyelvek"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Kedvenc nyelv"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nem"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "kiz�r�lag nevek"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "kiz�r�lag PID-k"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nevek �s PID-k"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "�j ad�k hozz�ad�sa"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "�j transponder hozz�ad�sa"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Els� DVB interface"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Video form�tum"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
-msgstr "K�perny�form�tum"
+msgstr "K�perny�form�tum"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby-Digital hangot haszn�lni"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Ad�k aktualiz�l�sa"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio-nyelvek"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio-nyelv"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "DiSEqC haszn�lata"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Als� LNB-frekvencia (MHZ)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Fels� LNB-frekvencia (MHZ)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Men�"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reset"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "A CAM-men� nyit�s alatt..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "A CAM-Men� nem nyithat�"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "A CAM-Reset nem siker�lt"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Felv�tel"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Id�eltol�d�s a kezd�sn�l (perc)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Id�eltol�d�s a befejez�sn�l (perc)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Prim�r-hat�r"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Default priority"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Default �lettartam"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Sz�net priorit�s"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Sz�net �lettartama"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Epiz�dn�v felhaszn�l�sa"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS-t haszn�lni"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Id�eltol�d�s VPS-n�l (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Direktfelv�tel megjel�l�se"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Direktfelv�tel megnevez�se"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Felv�tel id�tartama (perc)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Max. video File-terjedelem (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Feldolgozott File-k feloszt�sa"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Lej�tsz�s"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "MultiSpeed funkci�"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Lej�tsz�s felt�ntet�se"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Lej�tsz�s ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Egy�b"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Id�zit�sek k�z�tti id�tartam (perc)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "VDR le�ll haszn�lat n�lk�l (perc)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP sz�tkapcsol haszn�lat n�lk�l(s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Ad�sv�lt�s ideje (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Ad�s a bekapcsol�sn�l"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "ahogy az el�bb"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hanger� a bekapcsol�sn�l"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Ennek a plugin-nak nincs setup-parametere!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Be�ll�t�sok"
 
-#: menu.c:2821
 msgid "Restart"
-msgstr "�jraind�t�s"
+msgstr "�jraind�t�s"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "T�nyleg �jraind�tani?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
-msgstr " Felv�telt befejezni"
+msgstr " Felv�telt befejezni "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Lemez"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Lemez"
+
 msgid "free"
 msgstr "szabad"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Lej�tsz�st befejzni"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Hang"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Sz�net"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Tov�bb"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stop"
 
+msgid "Button$Resume"
+msgstr "Tov�bb"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " V�g�st megszak�tani"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Felv�tel befejezni?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "V�g�st befejezni?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Hang nem lehets�ges!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Nincs elegend� hely a felv�telre"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nincs szabad DVB k�rtya a felv�telhez!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Az �l� ad�s meg�ll�tva..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
-msgstr "Ugr�s:"
+msgstr "Ugr�s: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "A v�g�pont nincs kijel�lve"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "A v�g�s nem ind�that�!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "V�g�s elind�tva"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "A v�g�s m�r aktiv�lt!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~,/_@"
+msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "igen"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Beilleszteni"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�t�rni"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Beilleszteni"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
-msgstr "Fel/Le egy uj opci��rt - azt�n OK"
+msgstr "Fel/Le egy �j opci��rt - azt�n OK"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Az ad� blokkolva (felv�tel)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "A merev lemez majdnem tele!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Felv�tel folyamatban van - m�gis kikapcsolni?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "m�gis kikapcsolni?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Felv�tel folyamatban van - m�gis �jraind�tani?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "m�gis �jraind�tani?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
-msgstr "Hanger�"
+msgstr "Hanger� "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klasszikus VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzol"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "HKSCPSV"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "H�tKedSzeCs�P�nSzoVas"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "H�tf�"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Cs�t�rt�k"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "P�ntek"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Szombat"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Vas�rnap"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-felv�tel r�gt�n kezd�dik!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
-msgstr "A felv�tel elinditva Nd"
+msgstr "A felv�tel elind�tva"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Prim�r Interface �tkapcsolva..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "V�g�s sikertelen!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "V�g�s befejezve"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index e87b05fbf..2a2ed957f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -4,12 +4,13 @@
 # Alberto Carraro <bertocar@tin.it>, 2001
 # Antonio Ospite <ospite@studenti.unina.it>, 2003
 # Sean Carlos <seanc@libero.it>, 2005
+# Diego Pierotto <vdr-italian@tiscali.it>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,1256 +18,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Canale non disponibile!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
-msgstr "Impossibile iniziare la modalita' di trasferimento!"
+msgstr "Impossibile iniziare la modalit� di trasferimento!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Senza titolo"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Italiano"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "ita"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: tipo ricevitore RC"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
-msgstr "Premere un tasto dell'unita' RC"
+msgstr "Premi un tasto dell'unit� RC"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Codice RC rilevato!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Non premere alcun tasto..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: Codici specifici dei tasti"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Premere il tasto per '%s'"
+msgstr "Premi il tasto per '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
-msgstr "Premere 'Su' per confermare"
+msgstr "Premi 'Su' per confermare"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
-msgstr "Premere 'Giu' per continuare"
+msgstr "Premi 'Gi�' per continuare"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
-msgstr "(premere 'Su' per tornare indietro)"
+msgstr "(premi 'Su' per tornare indietro)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
-msgstr "('Giu' per finire la definizione tasti)"
+msgstr "(premi 'Gi�' per concludere la definizione tasti)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
-msgstr "(premere 'Menu' per saltare questo tasto)"
+msgstr "(premi 'Menu' per saltare questo tasto)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
-msgstr "Apprendimento tasti unita' remota"
+msgstr "Apprendimento tasti unit� remota"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Salvataggio codici tasti"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Su' per salvare, 'Giu' per annullare"
+msgstr "'Premi 'Su' per salvare, 'Gi�' per annullare"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Su"
 
-#: keys.c:15
 msgid "Key$Down"
-msgstr "Giu"
+msgstr "Gi�"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Indietro"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Sinistra"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Destra"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Rosso"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Verde"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Giallo"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Blu"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Informazioni"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Riproduzione"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pausa"
 
-#: keys.c:38
 msgid "Key$Stop"
-msgstr "Stop"
+msgstr "Ferma"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Registrazione"
 
-#: keys.c:40
 msgid "Key$FastFwd"
-msgstr "Avanti Veloce"
+msgstr "Avanti veloce"
 
-#: keys.c:41
 msgid "Key$FastRew"
-msgstr "Indietro Veloce"
+msgstr "Indietro veloce"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Prossimo"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Precedente"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Power"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Canale +"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Canale -"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Canale Prec."
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volume +"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volume -"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Muto"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Programmi"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Canali"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timer"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Registrazioni"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Opzioni"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Comandi"
 
-#: keys.c:58
 msgid "Key$User1"
-msgstr ""
+msgstr "Utente1"
 
-#: keys.c:59
 msgid "Key$User2"
-msgstr ""
+msgstr "Utente2"
 
-#: keys.c:60
 msgid "Key$User3"
-msgstr ""
+msgstr "Utente3"
 
-#: keys.c:61
 msgid "Key$User4"
-msgstr ""
+msgstr "Utente4"
 
-#: keys.c:62
 msgid "Key$User5"
-msgstr ""
+msgstr "Utente5"
 
-#: keys.c:63
 msgid "Key$User6"
-msgstr ""
+msgstr "Utente6"
 
-#: keys.c:64
 msgid "Key$User7"
-msgstr ""
+msgstr "Utente7"
 
-#: keys.c:65
 msgid "Key$User8"
-msgstr ""
+msgstr "Utente8"
 
-#: keys.c:66
 msgid "Key$User9"
-msgstr ""
+msgstr "Utente9"
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "in chiaro"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "criptato"
 
-#: menu.c:177
 msgid "auto"
 msgstr "automatico"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Modifica canale"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nome"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Sorgente"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frequenza"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "PID Video"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "PID Pcr"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "PID Audio (1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "PID Audio (2)"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "PID AC3 (1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "PID Teletext"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarizzazione"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "SymbolRate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "off"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "nessuno"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Banda passante"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Canali"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Cancella"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Modifica"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marca"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nuovo"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Cancella"
+
+msgid "Button$Mark"
+msgstr "Marca"
+
 msgid "Channel is being used by a timer!"
 msgstr "Canale occupato da un timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Cancellare il canale?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Modifica timer"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Attivo"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Canale"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Giorno"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Inizio"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Fine"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
-msgstr "Priorita'"
+msgstr "Priorit�"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Durata"
 
-#: menu.c:670
 msgid "File"
 msgstr "Nome"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Primo giorno"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timer"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Informazioni"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "On/Off"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Informazioni"
+
 msgid "Delete timer?"
 msgstr "Cancellare il timer?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timer in registrazione - cancellare?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Eventi"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Timer"
+
 msgid "Button$Record"
 msgstr "Registra"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Cambia"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Timer"
+msgid "What's on now?"
+msgstr "In programmazione adesso"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Prossimi programmi"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "In programmazione adesso"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Prossimo"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Adesso"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programma"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Impossibile cambiare canale!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programma - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Questo evento - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Questo evento - tutti i canali"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Tutti gli eventi - tutti i canali"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Inserire %d cifre!"
+msgstr "Inserisci %d cifre!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
-msgstr ""
+msgstr "La CAM non risponde!"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Informazioni registrazione"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Riproduci"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Riavvolgi"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Registrazioni"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Apri"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Comandi"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Errore nell'accedere alla registrazione!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Cancellare la registrazione?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Errore nel cancellare la registrazione!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Comandi di registrazione"
 
-#: menu.c:2203
 msgid "never"
 msgstr "mai"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "in base allo stile"
 
-#: menu.c:2205
 msgid "always"
 msgstr "sempre"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Lingua"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Stile interfaccia"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema colori"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Sinistra"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "In alto"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Larghezza OSD"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Altezza OSD"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tempo del messaggio (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Utilizzare caratteri piccoli"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Caratteri predefiniti"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Caratteri piccoli"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Caratteri fissi"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Dimensione caratteri predefiniti (pixel)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Dimensione caratteri piccoli (pixel)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Dimensione caratteri fissi (pixel)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Posizione informazioni canale"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "in basso"
 
-#: menu.c:2225
 msgid "top"
 msgstr "in alto"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Durata informazioni canale (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Mostrare informazioni al cambio canale"
+msgstr "Mostra informazioni al cambio canale"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Scadenza informazioni canale richieste"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
-msgstr "Scorrere per pagine"
+msgstr "Scorri per pagine"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Scorrere riavvolgendo"
+msgstr "Scorri riavvolgendo"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
-msgstr "Usare il bottone Menu per chiudere"
+msgstr "Utilizza il pulsante Menu per chiudere"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Directory di registrazione"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Guida programmi EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Scansione"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Timeout scansione aggiorn. EPG (ore)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Livello correzione EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Visualizzazione dati vecchi (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
-msgstr "Settare orario automatico"
+msgstr "Imposta orario automatico"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Utilizzare orario da transponder"
+msgstr "Utilizza orario da transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Lingue preferite"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Lingua preferita"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "no"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "solo nomi"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "solo PID"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nomi e PID"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "nuovi canali"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "nuovi transponder"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "Scheda DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Scheda DVB primaria"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Formato video"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Formato di visualizz. video"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
-msgstr "Aggiornare i canali"
+msgstr "Aggiorna i canali"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
-msgstr "Lingue per l'Audio"
+msgstr "Lingue per l'audio"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
-msgstr "Lingua per l'Audio"
+msgstr "Lingua per l'audio"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
 
-#: menu.c:2505 menu.c:2814
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilizza DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Freq LO LNB (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Freq HI LNB (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
-msgstr ""
+msgstr "Reimposta la CAM"
 
-#: menu.c:2561
 msgid "CAM present"
-msgstr ""
+msgstr "La CAM � presente"
 
-#: menu.c:2562
 msgid "CAM ready"
-msgstr ""
+msgstr "La CAM � pronta"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
-msgstr "Resetta"
+msgstr "Reimposta"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Apertura menu CAM..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Impossibile aprire il menu CAM!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "La CAM � in uso - vuoi reimpostarla?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Registrazione"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Margine iniziale (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margine finale (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Limite primario"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
-msgstr "Priorita' predefinita"
+msgstr "Priorit� predefinita"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durata predefinita (gg)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorita' di pausa"
+msgstr "Priorit� di pausa"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Durata pausa (gg)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
-msgstr "Usare nome episodio"
+msgstr "Utilizza nome episodio"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
-msgstr "Usare VPS"
+msgstr "Utilizza VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margine VPS"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Marcare registrazione immediata"
+msgstr "Marca registrazione immediata"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nome registrazione immediata"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Tempo registrazione immediata (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dimensione massima file video (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Dividi i file modificati"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Riproduzione"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Modalita' multispeed"
+msgstr "Modalit� multispeed"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
-msgstr "Mostrare modalita' riproduzione"
+msgstr "Mostra modalit� riproduzione"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di rispristino"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Generici"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Scadenza minima evento (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Periodo minimo di inattivita' (min)"
+msgstr "Periodo minimo di inattivit� (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Scadenza SVDRP (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Scadenza Zapping (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Scadenza voce canale (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canale iniziale"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "come prima"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Questo plugin non ha parametri di configurazione!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Opzioni"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Riavvio"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Eseguire un riavvio?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
-msgstr " Stop registrazione "
+msgstr " Ferma registrazione "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Programmi"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disco"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disco"
+
 msgid "free"
 msgstr "liberi"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
-msgstr " Stop riproduzione"
+msgstr " Ferma riproduzione"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pausa"
 
-#: menu.c:2984
+msgid "Button$Stop"
+msgstr "Ferma"
+
 msgid "Button$Resume"
 msgstr "Riprendi"
 
-#: menu.c:2984
-msgid "Button$Stop"
-msgstr "Stop"
-
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
-msgstr " Annullare modifiche"
+msgstr " Annulla modifiche"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Fermare la registrazione?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Annullare la modifica?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Nessun audio disponibile!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Spazio su disco insufficiente per registrare!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nessuna periferica DVB disponibile per registrare!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pausa del canale in visione..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Vai a: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Nessun marcatore di modifica definito!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
-msgstr "Impossibile iniziare processo di modifica!"
+msgstr "Impossibile iniziare il processo di modifica!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Processo di modifica iniziato"
 
-#: menu.c:4191
 msgid "Editing process already active!"
-msgstr "Processo di modifica gia' attivo!"
+msgstr "Processo di modifica gi� attivo!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
-msgstr "si"
+msgstr "s�"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Inserisci"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Sovrascrivi"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Inserisci"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
-msgstr "Su/Giu per nuova posizione - OK per muovere"
+msgstr "Su/Gi� per nuova posizione - OK per muovere"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Canale bloccato (in registrazione)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Poco spazio su disco!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Impossibile spegnere - parametro '-s' non passato!"
+msgstr "Impossibile spegnere - parametro '-s' non assegnato!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Modifica in corso - spegnere comunque?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
-msgstr "In registrazione - spegnere comunque?"
+msgstr "Registrazione in corso - spegnere comunque?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Registrazione fra %ld minuti - spegnere comunque?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "spegnere comunque?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Il plugin %s si ripristina tra %ld min, continuare?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Modifica in corso - riavviare comunque?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
-msgstr "In registrazione - riavviare comunque?"
+msgstr "Registrazione in corso - riavviare comunque?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "riavviare comunque?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volume "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "VDR Classico"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "Consolle ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "LunMarMerGioVenSabDom"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Luned�"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Marted�"
 
-#: tools.c:877
 msgid "Wednesday"
-msgstr "mercoled�"
+msgstr "Mercoled�"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Gioved�"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Venerd�"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Sabato"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Domenica"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Registrazione VPS imminente!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Registrazione avviata"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR si spegner� pi� tardi - premi Power per forzare"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
-msgstr "Premere un tasto per annullare lo spegnimento"
+msgstr "Premi un tasto per annullare lo spegnimento"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
-msgstr "Cambio su card DVB primaria..."
+msgstr "Cambio della scheda DVB primaria..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Processo di modifica fallito!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Processo di modifica terminato"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Premi un tasto per annullare il riavvio"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR si spegner� tra %s minuti"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f06f56ffb..449a848ba 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,1256 +17,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanaal niet beschikbaar"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Kan Transfer-Mode niet starten"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Geen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Nederlands"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "dut"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: detecteren type afstandsbediening"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Druk op een willekeurige knop"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Afstandsbediening code herkend!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Druk niet op een knop..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: Leren specifieke toets-codes"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Druk knop voor '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Druk 'Omhoog' om te bevestigen"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Druk 'Omlaag' om verder te gaan"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(druk 'Omhoog' om terug te gaan)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Druk 'Omlaag' om te beeindigen)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "Druk 'Menu' om deze toets over te slaan"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Leren toetsen afstandsbediening"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Opslaan toets codes"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "'Omhoog' te bewaren, 'Omlaag' voor annuleren"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Omhoog"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Omlaag"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Terug"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Links"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Rechts"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Rood"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Groen"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Geel"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Blauw"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Weergeven"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pauze"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Opnemen"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Vooruitspoelen"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Terugspoelen"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Uitschakelen"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanaal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanaal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volume+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volume-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Geluid onderbreken"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Gids"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanalen"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timers"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Opnames"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Instellingen"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Commando's"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr ""
 
-#: menu.c:71
 msgid "encrypted"
 msgstr ""
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Kanaal aanpassen"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Naam"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Bron"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frequentie"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisatie"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "uit"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "geen"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandwidth"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanalen"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Verwijder"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Verander"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Verplaats"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nieuw"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Verwijder"
+
+msgid "Button$Mark"
+msgstr "Verplaats"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanaal wordt gebruikt door een timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Kanaal verwijderen?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Timer veranderen"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Actief"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanaal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dag"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Begin"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Einde"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Bewaarduur"
 
-#: menu.c:670
 msgid "File"
 msgstr "Filenaam"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Eerste dag"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timers"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Aan/Uit"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Timer verwijderen?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timer neemt nog op - toch verwijderen?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Uitzending"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr ""
+
 msgid "Button$Record"
 msgstr "Opnemen"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Selecteer"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr ""
+msgid "What's on now?"
+msgstr "Wat is er nu?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Wat komt er hierna?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Wat is er nu?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Hierna"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Nu"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programma"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kan geen kanaal wisselen!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programma - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr ""
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr ""
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr ""
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Vul %d cijfers in!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Opname info"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Afspelen"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Naar begin"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Opnames"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Openen"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Commando's"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Fout bij lezen opname!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Opname verwijderen?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Fout bij verwijderen opname!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Opname commando's"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nooit"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "skin afhankelijk"
 
-#: menu.c:2205
 msgid "always"
 msgstr "altijd"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Taal"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Thema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Links"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Boven"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Breedte"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Hoogte"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Weergave duur van berichten (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Klein lettertype gebruiken"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanaal info positie"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "onder"
 
-#: menu.c:2225
 msgid "top"
 msgstr "boven"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Duur tonen kanaal-informatie (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanaal info tonen"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr ""
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scrollen per pagina"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Rondom scrollen"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr ""
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Opname directories"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Scan"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG-scan Timeout (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "EPG foutcorrectieniveau"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Oude EPG data tonen (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Systeem klok instellen"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Gebruik transponder tijd voor systeem"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Voorkeurstalen"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Voorkeurstaal"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nee"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "alleen namen"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "namen en PIDs"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "nieuwe kanalen toevoegen"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "nieuwe transponders toevoegen"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Eerste DVB kaart"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Videoformaat"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Video display formaat"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby Digital gebruiken"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Kanalen actualiseren"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio talen"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio taal"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "DiSEqC gebruiken"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Laagste LNB frequentie (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Hoogste LNB frequentie (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Herstart"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "CAM-menu wordt geopend..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Kan CAM-menu niet openen!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Kan CAM niet herstarten!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Opname"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Tijd marge begin (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Tijd marge eind (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Eerste grens"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Standaard prioriteit"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standaard levensduur (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Pauze prioriteit"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Pauze levensduur (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Gebruik episode naam"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS gebruiken"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Marge VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Direkte opnamen markeren"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Naam direkt-opname"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Duur van de directe opname (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximale omvang video file (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Bewerkte files opdelen"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Afspelen"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Multi-speed mode"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Weergave mode aangeven"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Overig"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minimale event time-out (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minimum gebruikers inactiviteit (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Deze plugin heeft geen instelparameters"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Instellingen"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Herstart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Werkelijk opnieuw starten?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Stop opnemen "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Gids"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "vrij"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Stop afspelen"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pauze"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Verder"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Eindigen"
 
+msgid "Button$Resume"
+msgstr "Verder"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Bewerken afbreken"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Opname stoppen?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Bewerken afbreken?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Geen audio beschikbaar!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Geen vrije DVB kaart om op te nemen!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pauzeren live uitzending..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Springen: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Geen bewerkingsmarkeringen gedefinieerd!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Kan niet beginnen met bewerken!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Bewerken is gestart"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Bewerken is al actief!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Invoegen"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Overschrijven"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Invoegen"
+
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Gebruik Omhoog/Omlaag - daarna Ok"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanaal geblokkeerd (neemt op)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Disk bijna vol!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Opname loopt - toch uitschakelen?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Opname in %ld minuten - toch uitschakelen?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "toch uitschakelen?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Opname loopt - toch opnieuw starten?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "toch opnieuw starten?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volume "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "VDR Klassiek"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Consoles"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "MaaDinWoeDonVryZatZon"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "maandag"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Zondag"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Druk een toets om shutdown af te breken"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Eerste DVB-kaart wordt omgeschakeld..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Bewerken is mislukt!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Bewerken is klaar"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 62e3a5994..50d75b2c3 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,1256 +16,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr ""
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Kan ikke starte transfer modus!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr ""
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr ""
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Norsk"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "nor"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: Finne fjernkontroll-kodetype"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Trykk en av tastene p� fjernkontrollen"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Fjernkontroll-kodetype funnet!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Ikke trykk p� noen av tastene..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: L�re spesifikke tastekoder"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Trykk tasten for '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Trykk 'Opp' for � bekrefte"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Trykk Ned' for � fortsette"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(trykk 'Opp' for � g� tilbake)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(trykk 'Ned' for � avslutte innl�ring)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr ""
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "L�re fjernkontrolltaster"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Lagre tastekoder"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Trykk 'Opp' for � lagre, 'Ned' for � avbryte"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Opp"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Ned"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Meny"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Tilbake"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Venstre"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "H�yre"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "R�d"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Gr�nn"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Gul"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Bl�"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr ""
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr ""
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr ""
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr ""
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr ""
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr ""
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr ""
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Power"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr ""
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr ""
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volum+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volum-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Lyd av"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr ""
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Programmer"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanaler"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timere"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Opptak"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Konfigurasjon"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Kommandoer"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr ""
 
-#: menu.c:71
 msgid "encrypted"
 msgstr ""
 
-#: menu.c:177
 msgid "auto"
 msgstr ""
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Editer kanal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Navn"
 
-#: menu.c:255
 msgid "Source"
 msgstr ""
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "AC3pid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "AC3pid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tekst-TV pid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Kortleser"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisasjon"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr ""
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr ""
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandwidth"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr ""
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanaler"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Slett"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Editer"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marker"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Ny"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Slett"
+
+msgid "Button$Mark"
+msgstr "Marker"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanalen er i bruk av en timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Slette kanal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Editer timer"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiv"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dag"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Start"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Slutt"
 
-#: menu.c:667
 msgid "VPS"
 msgstr ""
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioritet"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Levetid"
 
-#: menu.c:670
 msgid "File"
 msgstr "Filnavn"
 
-#: menu.c:686
 msgid "First day"
 msgstr "F�rste dag"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timere"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr ""
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Av/P�"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr ""
+
 msgid "Delete timer?"
 msgstr "Slette timer?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timer gj�r opptak - vil du slette likevel?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Hendelse"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr ""
+
 msgid "Button$Record"
 msgstr "Ta opp"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Skift til"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr ""
+msgid "What's on now?"
+msgstr "Hvilket program sendes n�?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Hvilket program er neste?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Hvilket program sendes n�?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Neste"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "N�"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programmer"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Ikke mulig � skifte kanal!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program Guide - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr ""
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr ""
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr ""
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr ""
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr ""
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Spill av"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Spol tilbake"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Opptak"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "�pne"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Kommandoer"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Feil under lesing av opptak!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Slette opptak?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Feil under sletting av opptak!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr ""
 
-#: menu.c:2203
 msgid "never"
 msgstr ""
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr ""
 
-#: menu.c:2205
 msgid "always"
 msgstr ""
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Spr�k"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr ""
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr ""
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr ""
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr ""
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Bredde"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "H�yde"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tid meldinger skal vises (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr ""
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Posisjon p� kanalinformasjon"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "nedre"
 
-#: menu.c:2225
 msgid "top"
 msgstr "�vre"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr ""
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Info ved kanalskifte"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr ""
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Rask rulling i menyer"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr ""
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr ""
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Kataloger til opptak"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Programoversikt"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr ""
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Ledig tid f�r EPG-s�k (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Niv� for EPG-feilretting"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr ""
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Juster system-klokken"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Bruk klokke fra transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr ""
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr ""
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nei"
 
-#: menu.c:2420
 msgid "names only"
 msgstr ""
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr ""
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr ""
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr ""
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB-enheter"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Hoved DVB-enhet"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "TV-Format"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr ""
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr ""
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr ""
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr ""
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr ""
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Bruk DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "LO-grensefrekvens (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "LO-frekvens i lavb�ndet (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "LO-frekvens i h�yb�ndet (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Meny"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr ""
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr ""
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr ""
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr ""
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Opptak"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Opptaksmargin start (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Opptaksmargin slutt (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Prioritetsgrense HovedDVB"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Normal prioritet (Timer)"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal levetid timer (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr ""
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr ""
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Bruk episodenavn"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr ""
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr ""
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Markere direkteopptak"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Navngi direkteopptak"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr ""
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimal st�rrelse p� videofiler (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Splitt redigerte filer"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Spill av"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Multispeed modus"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Vis avspillingsmodus"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minste hendelsespause (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minimumstid med inaktivitet (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Ubrukt SVDRP-levetid (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr ""
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr ""
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Konfigurasjon"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Start p� nytt"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Vil du virkelig starte p� nytt?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Stopp opptak fra "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Programmer"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "ledig"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Stopp avspilling"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr ""
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr ""
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Fortsett"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stopp"
 
+msgid "Button$Resume"
+msgstr "Fortsett"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Avbryt redigering"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Stoppe opptak?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Avbryte redigering?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Pas d'audio disponible!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ingen ledige DVB enheter for opptak!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr ""
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Hopp: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr ""
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Kan ikke starte redigeringsprosessen!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Redigeringsprosess startet"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Redigeringsprosessen er allerede aktiv!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr ""
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
+msgid "Button$Overwrite"
 msgstr ""
 
-#: menuitems.c:320
-msgid "Button$Overwrite"
+msgid "Button$Insert"
 msgstr ""
 
-#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Opp/Ned for ny plass - OK for � flytte"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanalen er l�st (opptak)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Lite ledig diskplass!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke sl� av - startet uten parameteret '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Gj�r opptak - sl� av likevel?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Skal gj�re opptak om %ld minutter - sl� av likevel?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "sl� av likevel?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Gj�r opptak - starte p� nytt likevel?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "starte p� nytt likevel?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volum "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr ""
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr ""
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "ManTirOnsTorFreL�rS�n"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Manday"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Tirsday"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Onsday"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Fredag"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Trykk en tast for ikke � sl� av"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Bytter f�rste DVB-enhet..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Feil under redigering!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigeringsprosess avsluttet"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 60b93ac7d..426ea3715 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kana� nie jest dost�pny!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Nie mo�na uruchomi� trybu transferu!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Bez tytu�u"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Polski"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "pol"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Etap 1: Wykrywanie rodzaju kodu pilota"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Naci�nij dowolny klawisz na pilocie"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Wykryto kod pilota!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Nie naciskaj teraz �adnego klawisza..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Etap 2: Nauka konkretnych kod�w klawiszy"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Naci�nij klawisz dla '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Naci�nij 'Do g�ry' aby potwierdzi�"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Naci�nij 'Na d�' aby kontynuowa�"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(naci�nij 'Do g�ry' aby si� cofn��)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(naci�nij 'Na d�' aby zako�czy� definiowanie)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(naci�nij 'Menu' aby pomin�� ten klawisz)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Nauka klawiszy pilota"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Etap 3: Zapisywanie kod�w klawiszy"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Naci�nij 'Do g�ry' aby zapisa�, 'Na d�' - aby anulowa�"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Do g�ry"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Na d�"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Wstecz"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "W lewo"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "W prawo"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Czerwony"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Zielony"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "��ty"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Niebieski"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Odtw�rz"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pauza"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Nagrywaj"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Do przodu"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Do ty�u"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Dalej"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Wstecz"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Wy��cz"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kana�+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kana�-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Poprzedni kana�"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "G�o�niej"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Ciszej"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Wycisz"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "D�wi�k"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kana�y"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timery"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Nagrania"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Ustawienia"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Polecenia"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "nieszyfrowany"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "szyfrowany"
 
-#: menu.c:177
 msgid "auto"
 msgstr "auto"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Edycja kana�u"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nazwa"
 
-#: menu.c:255
 msgid "Source"
 msgstr "�r�d�o"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Cz�stotliwo��"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polaryzacja"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inwersja"
 
-#: menu.c:274
 msgid "off"
 msgstr "wy��cz"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "brak"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulacja"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Pasmo"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmisja"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchia"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kana�y"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Usu�"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Edytuj"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Zaznacz"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nowy"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Usu�"
+
+msgid "Button$Mark"
+msgstr "Zaznacz"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kana� jest u�ywany przez timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Usun�� kana�?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Edycja timera"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktywny"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kana�"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dzie�"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Pocz�tek"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Koniec"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Priorytet"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Czas �ycia"
 
-#: menu.c:670
 msgid "File"
 msgstr "Plik"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Pierwszy dzie�"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timery"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "W�/Wy�"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Usun�� timer?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Trwa nagrywanie - na pewno usun��?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Audycja"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Timer"
+
 msgid "Button$Record"
 msgstr "Nagraj"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Prze��cz"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Timer"
+msgid "What's on now?"
+msgstr "Program bie��cy"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Nast�pne audycje"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Program bie��cy"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Nast�pnie"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Teraz"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Nie mo�na prze��czy� kana�u!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Ta audycja - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Ta audycja - wszystkie kana�y"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Wszystkie audycje - wszystkie kana�y"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Prosz� poda� %d cyfr!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Informacje o nagraniu"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Odtw�rz"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Pocz�tek"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Nagrania"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Otw�rz"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Polecenia"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Bl�d podczas dost�pu do nagrania!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Usun�� nagranie?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Bl�d podczas usuwania nagrania!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Polecenia nagra�"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nigdy"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "zal. od sk�rki"
 
-#: menu.c:2205
 msgid "always"
 msgstr "zawsze"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "J�zyk"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Sk�rka"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Motyw"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Od lewej"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Od g�ry"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Szeroko��"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Wysoko��"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Czas trwania wiadomo�ci (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "U�ywaj ma�ej czcionki"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozycja informacji o kanale"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "d�"
 
-#: menu.c:2225
 msgid "top"
 msgstr "g�ra"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Czas trwania informacji o kanale (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informacja przy zmianie kana�u"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Czas oczekiwania na informacje"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Przesuwaj stronami"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Skrajne pozycje s�siaduj�"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Przycisk Menu zamyka"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Katalogi nagra�"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Skanuj"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Czas skanowania EPG (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Stopie� poprawek b��d�w EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Czas przechowywania EPG (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Ustawiaj czas systemowy"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "U�yj czasu z transpondera"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Preferowanych j�zyk�w"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Preferowany j�zyk"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nie"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "tylko nazwy"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "tylko PID-y"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nazwy i PID-y"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "dodawaj nowe kana�y"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "dodawaj nowe transpondery"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pierwszy interfejs DVB"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Format obrazu"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Format wy�wietlania obrazu"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "U�ywaj Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Aktualizuj kana�y"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "J�zyk�w d�wi�ku"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "J�zyk d�wi�ku"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "U�ywaj DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Dolna cz�stotliwo�� LNB (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "G�rna cz�stotliwo�� LNB (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reset"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Otwieram menu CAM..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Nie mo�na otworzy� menu CAM!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Nie mo�na zresetowa� CAM!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Nagranie"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Margines na pocz�tku (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margines na ko�cu (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Podstawowy limit"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Domy�lny priorytet"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Domy�lny czas �ycia (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorytet pauzy"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Czas �ycia pauzy (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "U�ywaj nazwy epizodu"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "U�ywaj VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margines VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Zaznaczaj natychm. nagrywanie"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nazywaj natychm. nagrywanie"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Czas natychm. nagrywania (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksymalny rozmiar pliku (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Dziel edytowane pliki"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Odtwarzanie"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Tryb wielopr�dko�ciowy"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Pokazuj tryb odtwarzania"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "R�ne"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minimalny czas audycji (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minimalny czas nieaktywno�ci (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Czas oczekiwania na SVDRP (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Czas oczekiwania na zap (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Pocz�tkowy kana�"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "jak ostatnio"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Ta wtyczka nie ma �adnych ustawie�!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Ustawienia"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Restart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Na pewno zrestartowa�?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Zatrzymaj nagrywanie "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Dysk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Dysk"
+
 msgid "free"
 msgstr "wolnego"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Zatrzymaj odtwarzanie"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "D�wi�k"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pauza"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Wzn�w"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Zatrzymaj"
 
+msgid "Button$Resume"
+msgstr "Wzn�w"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Anuluj edycj�"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Zatrzyma� nagrywanie?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Anulowa� monta�?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "D�wi�k nie jest dost�pny!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Brak miejsca na dysku do nagrywania!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Brak wolnej karty DVB do nagrywania!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pauzuj� program na �ywo..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Skok: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Nie zdefiniowano znacznik�w monta�u!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Nie mo�na uruchomi� procesu edycji!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Proces edycji rozpocz�ty"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Proces edycji jest ju� aktywny!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "tak"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Wstaw"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Nadpisz"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Wstaw"
+
 msgid "Plugin"
 msgstr "Wtyczka"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Do g�ry/Na d� na now� pozycj� - Ok zatwierdza"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kana� zablokowany (trwa nagrywanie)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Ma�o miejsca na dysku!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Trwa nagrywanie - wy��czy� mimo to?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Nagrywanie za %ld minut - wy��czy� mimo to?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "wy��czy� mimo to?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Trwa nagrywanie - zrestartowa� mimo to?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "zrestartowa� mimo to?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "G�o�no�� "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klasyczny VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "Panel ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "PW�CPSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "PonWto�roCzwPi�SobNie"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "poniedzia�ek"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "�roda"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Pi�tek"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Sobota"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Wkr�tce nagranie VPS!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Naci�nij dowolny klawisz aby nie wy��cza�"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Prz곱czam na pierwszy interfejs DVB..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Proces edycji nie powi�d� si�!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proces edycji zako�czony"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ff15f57c5..650f8733d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal Inv�lido! ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr ""
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Imposs�vel iniciar modo de transfer�ncia!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr ""
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr ""
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Portugu�s"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "por"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: detectar tipo de receptor"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Pressione qualquer tecla do telecomando"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "C�digo do telecomando detectado!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "N�o pressione nada..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fase 2: A aprender c�digos especificos"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Pressione tecla para '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Pressione 'Cima' para confirmar"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Pressione 'Baixo' para continuar"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Pressione 'Cima' para voltar)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Pressione 'Baixo' para terminar a defini��o)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr ""
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Aprender as teclas do telecomando"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: A salvar os c�digos das teclas"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "'Cima' para Salvar, 'Baixo' para Cancelar"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Cima"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Baixo"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Menu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Voltar"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Esquerda"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Direita"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Vermelho"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Verde"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Amarelo"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Azul"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr ""
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr ""
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr ""
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr ""
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr ""
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr ""
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr ""
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr ""
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Ligar"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr ""
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr ""
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr ""
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volume+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volume-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Sem som"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr ""
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Programa��o"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Canais"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timers"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Grava��es"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Configurar"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Comandos"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr ""
 
-#: menu.c:71
 msgid "encrypted"
 msgstr ""
 
-#: menu.c:177
 msgid "auto"
 msgstr ""
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Modificar canal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nome"
 
-#: menu.c:255
 msgid "Source"
 msgstr ""
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frequ�ncia"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "PID de V�deo"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "PID �udio (1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "PID AC3 (1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "PID Teletexto"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Encripta��o"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polariza��o"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "off"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr ""
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandwidth"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr ""
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Canais"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Apagar"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Modificar"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marcar"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Novo"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Apagar"
+
+msgid "Button$Mark"
+msgstr "Marcar"
+
 msgid "Channel is being used by a timer!"
 msgstr "Canal a ser utilizador por um timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Apagar o canal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Modificar timer"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Activo"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Canal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dia"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Inicio"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Fim"
 
-#: menu.c:667
 msgid "VPS"
 msgstr ""
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioridade"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Dura��o"
 
-#: menu.c:670
 msgid "File"
 msgstr "Ficheiro"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Primeiro dia"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timers"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr ""
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "On/Off"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr ""
+
 msgid "Delete timer?"
 msgstr "Apagar o timer?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timer activo - t�m a certeza que quer apagar?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Evento"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr ""
+
 msgid "Button$Record"
 msgstr "Gravar"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Seleccionar"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr ""
+msgid "What's on now?"
+msgstr "Programa actual?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Pr�ximo Programa?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Programa actual?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Proximo"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Agora"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Programa��o"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "N�o pode mudar de canal!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programa - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr ""
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr ""
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr ""
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr ""
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr ""
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Play"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Rebobinar"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Grava��es"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Abrir"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Comandos"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Erro ao aceder � grava��o"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Apagar a grava��o?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Erro enquanto apagava uma grava��o!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr ""
 
-#: menu.c:2203
 msgid "never"
 msgstr ""
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr ""
 
-#: menu.c:2205
 msgid "always"
 msgstr ""
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Linguagem"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr ""
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr ""
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr ""
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr ""
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Largura"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Altura"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Mostrar contador (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr ""
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Posi��o de info dos canais"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "fundo"
 
-#: menu.c:2225
 msgid "top"
 msgstr "topo"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr ""
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Mostrar info ao mudar de Canal"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr ""
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scroll da p�gina no menu"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr ""
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr ""
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Directorias de grava��o"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr ""
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Expirou o EPG (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "N�vel de correct��o EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr ""
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Ajustar rel�gio do sistema"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Usar rel�gio do transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr ""
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr ""
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "n�o"
 
-#: menu.c:2420
 msgid "names only"
 msgstr ""
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr ""
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr ""
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr ""
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr ""
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Interface DVB prim�rio"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Formato v�deo"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr ""
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr ""
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr ""
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr ""
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr ""
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilizar DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "Limite de bandas LNB (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Frequ�ncia base LNB (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frequ�ncia alta LNB (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Menu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr ""
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr ""
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr ""
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr ""
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "A gravar"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Margem inicial (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margem final (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Limite Prim�rio"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Prioridade por defeito"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Validade por defeito (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr ""
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr ""
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Utilizar o nome do epis�dio"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr ""
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr ""
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marca de grava��o r�pida"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nome de grava��o r�pida"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr ""
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Tamanho m�ximo dos ficheiros (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Quebrar ficheiros"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Replay"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Modo de multi-speed"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar modo de replay"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Outros"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Per�odo m�nimo de pausa (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Per�odo m�nimo de inactividade (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Timeout SVDRP (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr ""
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr ""
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugins"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr ""
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configurar"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Tem a certeza que quer reiniciar?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Parar grava��o "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Programa��o"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "livre"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Parar reprodu��o"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr ""
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr ""
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Continuar"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Parar"
 
+msgid "Button$Resume"
+msgstr "Continuar"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Anular modifica��o"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Parar Grava��o?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Cancelar Modifica��es?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr ""
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr ""
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nenhuma placa DVB disponivel para gravar!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr ""
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Saltar: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr ""
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "N�o pode iniciar a modifica��o!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Processo de modifica��o iniciado"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Processo de modifica��o j� activo!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr ""
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "sim"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
+msgid "Button$Overwrite"
 msgstr ""
 
-#: menuitems.c:320
-msgid "Button$Overwrite"
+msgid "Button$Insert"
 msgstr ""
 
-#: menuitems.c:971
 msgid "Plugin"
 msgstr "Plugin"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Cima/Baixo para nova localiza��o - Ok para mover"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Canal bloqueado (a gravar)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Espa�o em disco reduzido!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Imposs�vel desligar - falta a op��o '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Em grava��o - quer mesmo desligar?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Em grava��o dentro de %ld minutos - quer mesmo desligar?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "quer mesmo desligar?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Em grava��o - quer mesmo reiniciar?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "quer mesmo reiniciar?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volume "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr ""
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr ""
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "SegTerQuaQuiSexSabDom"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Segunda"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Ter�a"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Quinta"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Sexta"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "S�bado"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Domingo"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr ""
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr ""
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pressione qualquer tecla para cancelar"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "A mudar interface DVB prim�rio..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Falha no processo de modifica��o"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Processo de modifica��o terminado"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 933389e9e..207c73c70 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,1256 +16,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Canal indisponibil"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Nu pot porni modul de transfer!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Pornesc achizi�ia EPG"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "F�r� titlu"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Rom�n�"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "rom"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Faza 1: Detec�ia tipului telecomenzii"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Ap�sa�i o tast� pe telecomand�"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "S-a detectat tipul telecomenzii!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Nu ap�sa�i nici o tast�..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Faza 2: �nv��area codurilor anumitor taste"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Ap�sa�i tasta pentru '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Ap�sa�i 'Sus' pentru confirmare"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Ap�sa�i 'Jos' pentru continuare"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Ap�sa�i 'Sus' pentru revenire)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Ap�sa�i 'Jos' pentru terminare)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "�nv��are taste telecomand�"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Faza 3: Salvarea codurilor de taste"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Sus"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Jos"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Meniu"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "OK"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "�napoi"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "St�nga"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Dreapta"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Ro�u"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Verde"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Galben"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Albastru"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Redare"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pauz�"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stop"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "�nregistrare"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Derulare �nainte"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Derulare �napoi"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Urm�tor"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Anterior"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "�nchidere"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Canal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Canal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Canal anterior"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volum+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volum-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "F�r� sunet"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Sunet"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program (EPG)"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Canale"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timer-e"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "�nregistr�ri"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Configura�ie"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Comenzi"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "FTA (necriptat)"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "criptat"
 
-#: menu.c:177
 msgid "auto"
 msgstr "automat"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Modificare canal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Nume"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Surs�"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frecven��"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "PID Video"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "PID Audio (1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "PID Audio (2)"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "PID AC3 (1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "PID Teletext"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA (Acces Condi�ional)"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarizare"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Rat� simboluri"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversiune"
 
-#: menu.c:274
 msgid "off"
 msgstr "inactiv"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "niciuna(ul)"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modula�ie"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "L�rgime de band�"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmisie"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Ierarhie"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Canale"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "�terge"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Modific�"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Marcheaz�"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Nou"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "�terge"
+
+msgid "Button$Mark"
+msgstr "Marcheaz�"
+
 msgid "Channel is being used by a timer!"
 msgstr "Canalul este utilizat de un timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "�terg canalul?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Modificare timer"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Activ"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Canal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Ziua"
 
-#: menu.c:665
 msgid "Start"
 msgstr "�nceput"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Sf�r�it"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioritate"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Timp de p�strare"
 
-#: menu.c:670
 msgid "File"
 msgstr "Fi�ier"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Prima zi"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timer-e"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Act./Inact."
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "�terg timer-ul?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timer-ul tocmai �nregistreaz� - �terg, totu�i?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Emisiune"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Timer"
+
 msgid "Button$Record"
 msgstr "�nregistr."
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Comut�"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Timer"
+msgid "What's on now?"
+msgstr "Ce emisiuni sunt acum?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Ce emisiuni urmeaz�?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Ce emisiuni sunt acum?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Urm�tor"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Acum"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Nu pot comuta canalul!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programul canalului %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Aceast� emisiune - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Aceast� emisiune - toate canalele"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Toate emisiunile - toate canalele"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "V� rog introduce�i %d cifre!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Detaliile �nregistr�rii"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Redare"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "�napoi"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "�nregistr�ri"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Deschide"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Comenzi"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Eroare la accesarea �nregistr�rii"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "�terg �nregistrarea?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Eroare la �tergerea �nregistr�rii!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Comenzi pentru �nregistr�ri"
 
-#: menu.c:2203
 msgid "never"
 msgstr "niciodat�"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "dep. de skin"
 
-#: menu.c:2205
 msgid "always"
 msgstr "�ntotdeauna"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Limba OSD"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tem�"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "St�nga"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Sus"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "L��ime OSD"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "�n�l�ime OSD"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Timp afi�are mesaje (sec)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Utilizare fonturi mici"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozi�ia informa�iilor despre canal"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "jos"
 
-#: menu.c:2225
 msgid "top"
 msgstr "sus"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Durata afi��rii info-canal (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informa�ii la comutarea canalului"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Durata afi��rii informa�ii canal"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Deruleaz� pagini"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Derulare circular�"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Tasta 'Meniu' �nchide"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Directoare �nregistr�ri"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "C�utare canale"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Interval achizi�ie EPG (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivel corec�ie EPG"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Date EPG expirate cel mult (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Potrive�te ceasul sistem"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Preia ora din transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Limbi preferate"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Limba preferat�"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nu"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "doar numele"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "Numai PID-uri"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "nume si PID-uri"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "ad�ugare canale noi"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "ad�ugare transpondere noi"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "Dispozitiv DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Dispozitiv DVB primar"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Format video"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Formatul red�rii video"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Sunet Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Actualizare canale"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Limbi sunet"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Limba sunetului"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilizare DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "Frecven�� comutare band�, SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Frecvn�� LNB inferioar� (Mhz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecvn�� LNB superioar� (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Meniu"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Resetare"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Deschid meniul CAM..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Nu pot deschide meniul CAM"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Nu pot reseta CAM"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "�nregistrare"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Marj� la pornire (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marj� la oprire (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Limit� primar�"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Prioritate implicit�"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Timp de p�strare predefinit (zile)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritate pauz�"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "P�strarea emisiunilor 'pauzate' (zile)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Utilizeaz� numele episodului"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Utilizeaz� VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Marj� de timp la utilizare VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marcheaz� �nregistrare imediat�"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nume �nregistrare imediat�"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Timpul de �nregistare imediat� (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dimensiune maxim� a fi�ierului video (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Separare fi�iere montate"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Redare"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Mod multi-vitez�"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Afi�eaz� redarea"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Durat� minim� emisiuni (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Durata minim� de inactivitate (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Timeout SVDRP (sec)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Interval zapping (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canalul de pornire"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "ca mai �nainte"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Plugin-uri"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Acest plugin nu se configureaz�!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Configura�ie"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Repornire"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Sigur repornesc?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Opre�te �nregistrarea "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program (EPG)"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disc"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disc"
+
 msgid "free"
 msgstr "liber"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Opre�te redarea"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Sunet"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pauz�"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Continuare"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stop"
 
+msgid "Button$Resume"
+msgstr "Continuare"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Opre�te montajul �nregistr�rii"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Opresc �nregistrarea?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Opresc montajul �nregistr�rii?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Lipse�te sunetul!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Insuficient spa�iul pe disc pentru �nregistrare!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Trec �n pauz� emisiunea transmis�..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Salt la: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Nu pot porni montajul �nregistr�rii!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Montajul �nregistr�rii a �nceput"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Montajul �nregistr�rii este deja activ!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "da"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Insereaz�"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Suprascrie"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Insereaz�"
+
 msgid "Plugin"
 msgstr "Plugin (modul adi�ional)"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Sus/Jos pentru noua loca�ie - OK pentru a muta"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Canal blocat (�nregistrare)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Spa�iul pe disc e foarte sc�zut!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nu pot �nchide - vezi op�iunea '-s'"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Tocmai se �nregistreaz� - �nchid, totu�i?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "�nregistrez peste %ld minute - �nchid, totu�i?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "�nchid, totu�i?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Tocmai se �nregistreaz� - repornesc, totu�i?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "repornesc, totu�i?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volum "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "VDR clasic"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "Cons. ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "LunMarMieJoiVinS�mDum"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Luni"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Mar�i"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Joi"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Vineri"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "S�mb�t�"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Duminic�"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Urmeaz� o �nregistrare VPS!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "A �nceput �nregistrarea"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Apas� orice tast� pentru a anula �nchiderea"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Comut dispozitiv DVB primar..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Montajul �nregistr�rii a e�uat"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Montajul �nregistr�rii s-a terminat"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index ec18474df..f1a0f883f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "����� ����������!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "���������� �������� ����� ��������!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "��� ��������"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "�������"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "rus"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "��� 1: ����������� ���� ���� ������"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "������� ����� ������ �� ������"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "��������� ��� ������!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "�� ��������� ������..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "��� 2: ������� ����� ��������� ������"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "������� ������ '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "������� '�����' ����� �����������"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "������� '����' ����� ����������"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(������� '�����' ����� ���������)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(������� '����' ����� ��������� ��������� ������)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(������� '����' ����� ���������� ������)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "�������� ������"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "��� 3: ����������� ����� ������"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "������� '�����' ����� ���������, '����' ����� ����������"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "�����"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "����"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "����"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "�����"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "������"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "�������"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "�������"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "�������"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "������"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "�����"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "����"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "���������������"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "�����"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "����"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "������"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "��������� ������"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "��������� �����"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "������"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "�����"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "���������"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "����� +"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "����� -"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "���������� �����"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "��������� +"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "��������� -"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "��������� ����"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "����"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "�������"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "������"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "�������"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "������"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "���������"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "�������"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "FTA (��������������)"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "������������"
 
-#: menu.c:177
 msgid "auto"
 msgstr "����"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "�������������� ������"
 
-#: menu.c:254
 msgid "Name"
 msgstr "��������"
 
-#: menu.c:255
 msgid "Source"
 msgstr "��������"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "�������"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid (�����)"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1 (����� 1)"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2 (����� 2)"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1 (AC3 1)"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2 (AC3 2)"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid (���������)"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA (�������)"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "�����������"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "����. ��������"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "��������"
 
-#: menu.c:274
 msgid "off"
 msgstr "����"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "������"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "���������"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "��������"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "��������"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "������"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "��������"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "������"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "�������"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "�������������"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "�����������"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "��������"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "�������"
+
+msgid "Button$Mark"
+msgstr "�����������"
+
 msgid "Channel is being used by a timer!"
 msgstr "����� ����� ��������!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "������� �����?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "��������� �������"
 
-#: menu.c:662
 msgid "Active"
 msgstr "�����������"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "�����"
 
-#: menu.c:664
 msgid "Day"
 msgstr "����"
 
-#: menu.c:665
 msgid "Start"
 msgstr "������"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "�����"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS ��������"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "���������"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "���� ��������"
 
-#: menu.c:670
 msgid "File"
 msgstr "����"
 
-#: menu.c:686
 msgid "First day"
 msgstr "������ ����"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "�������"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "����"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "���/����"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "����"
+
 msgid "Delete timer?"
 msgstr "������� ������?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "���� ������ �� ������� - ������������� �������?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "��������"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "������"
+
 msgid "Button$Record"
 msgstr "������"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "�����������"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "������"
+msgid "What's on now?"
+msgstr "������ � �����:"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "����� � ���������:"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "������ � �����:"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "�����"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "������"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "���������"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "���������� ����������� �����!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "��������� - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "��� �������� - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "��� �������� - ��� ������"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "��� �������� - ��� ������"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "������� %d �����"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr "CAM �� ��������"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "���� � ������"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "�������������"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "�����"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "������"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "�������"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "�������"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "������ ������� � ������!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "������� ������?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "������ �������� ������!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "������� ������"
 
-#: menu.c:2203
 msgid "never"
 msgstr "�������"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "�������� �����"
 
-#: menu.c:2205
 msgid "always"
 msgstr "������"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "����"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "����"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "�����"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "����"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "������ �����"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "������ ������"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "������"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "������"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "������������ ������ ��������� (���)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "������������ ������ �����"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr "����������� �������"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr "����������� ����"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr "������ ����"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr "������������� ����"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr "������ ����� ��� ���� (pixel)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr "������ ������� ����� (pixel)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr "������ �������������� ����� (pixel)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "��������� ���� ���������� � ������"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "�����"
 
-#: menu.c:2225
 msgid "top"
 msgstr "������"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "����� ���������� � ������ (���)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "���������� ���������� � ������"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "���������� � ������ �������"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "��������� ������� ����"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "����������� ���������"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "������ ���� �������"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "�������� �������� �������"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "�������"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "�����������"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "�������� ������������ �������� (�)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "������� ��������� ������"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "�������� ���������� ������ (���)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "���������� ��������� �����"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "������������ ����� ������������"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "�������������� ����� (�������)"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "������"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "��������������"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "���������"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "�������� �����"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "���"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "������ ��������"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "������ PID�"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "�������� � PID�"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "����� ������"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "���. ������������"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "�������� DVB-����������"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "������ �����"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "�������������� �����������"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "�������� Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "��������� ��������� �������"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "�������������� ����� (����)"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "������"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "���������"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "������������ DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "������� ������������ (SLOF) (���)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "������ ������� ���������� (���)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "������� ������� ���������� (���)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr "CAM ����������"
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr "CAM ������������"
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr "CAM �����"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "�������� ������"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "����"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "�����"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "�������� ���� ������ ��������� ������� (CAM)"
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "���� CAM-������ ����������!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr "CAM ������������ - ������������� �����������?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "������ ����������� CAM-������!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "������"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "���������� ������ ������ (���)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "������������ ��������� ������ (���)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "���. ��������� ������� ���. ����������"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "��������� ������� �� ���������"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "���� �������� ������ �� ��������� (�)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "��������� ����������� ���������"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "�������� ����������� ��������� (�)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "������������ ����� �� ��������"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "������������ ������� VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "�������� ����� VPS (���)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "�������� ��������� ������� ������"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "����� ���������� ������ �������"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "������������ ������ ������ (���)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "����. ������ ���������� (��)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "������ ����������������� �����"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "���������������"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "��������������� �����"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "���������� ����� ���������������"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ���������������"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "������"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "���. ����� �������� ������� (���)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "���. ����� �������� ����� (���)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "�������� ������ ����. SVDRP (���)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�������� ������������ ������ (���)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "������ ������� ��� ����� ������ (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "����� ��� ���������"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "��� ������"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��������� ��� ���������"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "������ ����������"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "������ �� ����� ���������� ���������!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "���������"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "�������������"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "������������� �������������?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " ���������� ������ "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "�������"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "����"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "����"
+
 msgid "free"
 msgstr "��������"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " ���������� ���������������"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "����"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "�����"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "����������"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "����"
 
+msgid "Button$Resume"
+msgstr "����������"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " �������� ������ ������"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "���������� ������?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "�������� ��������������?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "����������� ����!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "������������ ����� �� ����� ��� ������ ������"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "��� ���������� DVB-���������� ��� ������!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "����� ����������� ���������..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "�������: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "�� ������ ����� ��� �������!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "���������� ������ ������ ������!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "����� ������ ������"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "������� ������������ ��� �������!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "��"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "���/���"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "�������"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "������"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "�������"
+
 msgid "Plugin"
 msgstr "������"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\""
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "����� ������������ (���� ������)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "������������ ����� �� �����!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "���������� ���������� - �� ����� �������� '-s'!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr "���� ������ - ������������� ���������?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "���� ������ - ������������� ���������?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "����� %ld ����� �������� ������ - ������������� ���������?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "������������� ���������?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Plugin %s ��������� ����� %ld ����� - ����������?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr "������� ������� - ������������� �������������?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "���� ������ - ������������� �������������?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "������������� �������������?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "��������� "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "������������"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG ������"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "���ǿ��"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "��ݲ�������ҿ����Ѳ��"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "�����������"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "�������"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "�����"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "�������"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "�������"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "�������"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "�����������"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS-������ ����� ��������"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "������ ������"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR ���������� ����� - ������� Power ��� ���������"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "������� ����� ������ ����� �������� ����������."
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "����� ��������� DVB-����������..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "������ �� ����� ������� ������!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "������ �������"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "������� ����� ������ ��� ������ ������������"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR ���������� ����� %s �����"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index c62b2724a..e45c6d9ab 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,1256 +16,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanal ni razpolo�ljiv!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Ne morem za�eti s prenosnim na�inom!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "Brez naziva"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Slovenski"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "slv"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Faza 1: Sprejemanje IR kode"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Pritisnite tipko na upravljalcu"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "IR koda sprejeta!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Ne pritiskajte tipk..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Faza 2: U�enje posebnih kod"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Pritisnite tipko za '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Pritisnite tipko 'Gor' za potrditev"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Pritisnite tipko 'Dol' za nadaljevanje"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(pritisnite 'Gor' za nazaj)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(pritisnite 'Dol' za konec)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "pritisnite 'Meni' za preskok te tipke"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "U�enje kod upravljalca"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Faza 3: Shranjevanje kod tipk"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "'Gor' za potrditev, 'Dol' za prekinitev"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Gor"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Dol"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Meni"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Nazaj"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Levo"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Desno"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "Rde�a"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Zelena"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Rumena"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Modra"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Predvajaj"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pavza"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Ustavi"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Snemaj"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Hitro naprej"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Hitro nazaj"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Naprej"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Nazaj"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Izklop"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Program+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Program-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "Prej�nji kanal"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Glasnost+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Glasnost-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Izklop zvoka"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Zvok"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanali"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Termini"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Posnetki"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Nastavitve"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Ukazi"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "nekodiran"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "kodiran"
 
-#: menu.c:177
 msgid "auto"
 msgstr "avtomatsko"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Uredi kanal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Ime"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Pozicija"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvenca"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarizacija"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inverzija"
 
-#: menu.c:274
 msgid "off"
 msgstr "izklop"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "nobeden"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulacija"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Pasovna �irina"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Prenos"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Za��ita"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarhija"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Nastavitve kanala niso edinstvene!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanali"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Izbri�i"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "Uredi"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "Ozna�i"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Novo"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Izbri�i"
+
+msgid "Button$Mark"
+msgstr "Ozna�i"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanal je zavzet s terminom za snemanje!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Izbri�i kanal?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Uredi termin"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktivno"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Program"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dan"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Za�etek"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Konec"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Veljavnost"
 
-#: menu.c:670
 msgid "File"
 msgstr "Datoteka"
 
-#: menu.c:686
 msgid "First day"
 msgstr "Prvi dan"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Termini"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "Vklop/Izklop"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Izbri�i termin?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Snemanje po terminu - zares izbri�i?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Oddaja"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Termini"
+
 msgid "Button$Record"
 msgstr "Posnemi"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Preklopi"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Termini"
+msgid "What's on now?"
+msgstr "Kaj je na sporedu?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Kaj sledi?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Kaj je na sporedu?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Sledi"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Sedaj"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Ne morem preklopiti kanala!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Ta oddaja - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Ta oddaja - vsi kanali"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Vse oddaje - vsi kanali"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Prosim vnesite %d �tevilk!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Podatki o snemanju"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Predvajaj"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Na za�etek"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Posnetki"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "Odpri"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Ukazi"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Napaka pri dostopu do posnetka!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Izbri�i posnetek?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Napaka pri brisanju posnetka!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Ukazi za snemanje"
 
-#: menu.c:2203
 msgid "never"
 msgstr "nikoli"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "odvisno od preobleke"
 
-#: menu.c:2205
 msgid "always"
 msgstr "vedno"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Jezik"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Preobleka"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Levo"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "Zgoraj"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "�irina"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Vi�ina"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "�as prikaza sporo�ila (s)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Uporabi male �rke"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacije o kanalu"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "spodaj"
 
-#: menu.c:2225
 msgid "top"
 msgstr "zgoraj"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "�as prikaza podatka o kanalu (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Poka�i naziv kanala"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "�as prikaza informacije o kanalu"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Drsni meni"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Iz konca sko�i na za�etek"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Meni gumb zapre meni"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Direktoriji za posnetke"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "Programski vodnik"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "I��i"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "�as do EPG pregleda (h)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivo za popravilo EPG napak"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Prika�i stare EPG podatke (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Nastavi sistemski �as"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Transponder za nastavitev �asa"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Prednostni jeziki"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Prednostni jezik"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "ne"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "samo imena"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "samo PIDe"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "imena in PIDe"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "dodaj nove programe"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "dodaj nove oddajnike"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarna naprava"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Format video prikaza"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Uporabljaj Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Posodobi kanale"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Jeziki za zvok"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Jezik za zvok"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Uporabi DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "Frekvenca preklopa (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Spodnja LNB-frek. (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Zgornja LNB-frek. (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Meni"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "Reset"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "Odpiram CAM meni..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Ne morem odpreti CAM menija!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Ne morem resetirati CAM-a!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Snemanje"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Premik za�etka snemanja (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Zamik konca snemanja (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Primarna meja"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Privzeta prioriteta"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Privzeti �ivljenski �as (d)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioriteta pavze"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "�as pavze (d)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Uporabi ime epizode"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Uporabi VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "�asovna rezerva pri VPS (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Ozna�i direktno snemanje"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Ime za direktno snemanje"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "�as direktnega snemanja (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Najve�ja velikost datoteke (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Razdeli urejene datoteke"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Predvajanje"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Re�im z ve� hitrostmi"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i re�im predvajanja"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Ostalo"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Najmanj�i �as dogodka (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Najmanj�i �as neaktivnosti (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP �as neaktivnosti (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�as ugla�evanja (s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Privzeti kanal"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "kot prej"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Ta vstavek nima nastavitvenih parametrov!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Nastavitve"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Ponoven zagon"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Zares ponoven zagon?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Prekini snemanje "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "prosto"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Prekini predvajanje"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Zvok"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pavza"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Nadaljuj"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Ustavi"
 
+msgid "Button$Resume"
+msgstr "Nadaljuj"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Prekini urejanje"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Prekini snemanje?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "�elite prekiniti urejanje?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Zvok ni dosegljiv!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Premalo prostora na disku za snemanje!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Ni proste DVB naprave za snemanje!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Ustavljanje predvajanja v �ivo..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Sko�i: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Nobena prekinitvena to�ka ni definirana!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Ne morem za�eti urejanja!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Urejanje se je za�elo"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Urejanje je �e aktivno!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "da"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Vstavi"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Prepi�i"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Vstavi"
+
 msgid "Plugin"
 msgstr "Vstavek"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Gor/Dol za novo poz. - Ok za premik"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Zaklenjen kanal (snemanje)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Premalo prostora na disku!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Snemanje - zares izklopi?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Snemanje �ez %ld minut, zares izklopi?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "zares izklopi?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Snemanje - zares ponoven zagon?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "zares ponoven zagon?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Glasnost "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konsola"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "PTSCPSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "PonTorSreCetPetSobNed"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Torek"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "sreda"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "�etrtek"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Petek"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Sobota"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "Sledi VPS snemanje!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite katerikoli gumb za preklic izklopa"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Preklapljanje primarne DVB naprave..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Napaka pri procesu urejanja!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Proces urejanja je kon�an"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index bf84d1699..bc879a19c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,1256 +16,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanalen �r inte tillg�nglig!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Kan inte starta Transfer Mode!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG skanning"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "ingen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "Svenska"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "sve"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Steg1: identifiering av kod"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Tryck valfri tangent p� fj�rrkontrollen"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Koden detekterad!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Tryck inte p� n�gon knapp..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Fas 2: Inl�rning av specifika knapp-koder"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Tryck p� knappen f�r '%s'"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Tryck 'Upp' f�r att bekr�fta"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Tryck 'Ner' f�r att bekr�fta"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Tryck 'Upp' f�r att backa)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Tryck 'Ner' f�r att avsluta inl�rningen)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(Tryck 'Meny' f�r att hoppa �ver knappen.)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Inl�rning av fj�rrkontrollsknappar"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Fas 3: Spara knappkoder"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta."
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Upp"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "Ner"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Meny"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Ok"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Tillbaka"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "V�nster"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "H�ger"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "R�d"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Gr�n"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Gul"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Bl�"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Info"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "Spela upp"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Pausa"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Stoppa"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Spela in"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "Snabbspolning fram�t"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Snabbspolning bak�t"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "N�sta"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "Bak�t"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "P�/Av"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "F�rra kanalen"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Volym+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Volym-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Ljud Av"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Ljud"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanaler"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Timers"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Inspelningar"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Inst�llningar"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Kommandon"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr ""
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr ""
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr ""
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr ""
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr ""
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr ""
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr ""
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr ""
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr ""
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "Okodad"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "krypterad"
 
-#: menu.c:177
 msgid "auto"
 msgstr "automatisk"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "�ndra kanal"
 
-#: menu.c:254
 msgid "Name"
 msgstr "Namn"
 
-#: menu.c:255
 msgid "Source"
 msgstr "K�lla"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "VPID"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "APID1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "APID2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "DPID1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "DPID2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "TPID"
 
-#: menu.c:264
 msgid "CA"
 msgstr "Kortl�sare"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Polarisation"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "Inversion"
 
-#: menu.c:274
 msgid "off"
 msgstr "av"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "ingen"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Modulation"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bandbredd"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "Transmission"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Guard"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanaler"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Ta bort"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "�ndra"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "M�rk"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Ny"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Ta bort"
+
+msgid "Button$Mark"
+msgstr "M�rk"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanalen anv�nds av en timer!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Ta bort kanalen?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "�ndra timer"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktiv"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "Dag"
 
-#: menu.c:665
 msgid "Start"
 msgstr "B�rjar"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Slutar"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "Prioritet"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "Livstid"
 
-#: menu.c:670
 msgid "File"
 msgstr "Filnamn"
 
-#: menu.c:686
 msgid "First day"
 msgstr "F�rsta dag"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Timers"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Info"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "P�/Av"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Info"
+
 msgid "Delete timer?"
 msgstr "Ta bort timern?"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Timerstyrd inspelning p�g�r - Avbryta �nd�?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "S�ndning"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Timer"
+
 msgid "Button$Record"
 msgstr "Inspelning"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "Byt"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Timer"
+msgid "What's on now?"
+msgstr "Vad s�nds nu?"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Vilket �r n�sta program?"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "Vad s�nds nu?"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "N�sta"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "Nu"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Om�jligt att byta kanal!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Den h�r s�ndningen - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Den h�r s�ndningen - alla kanaler"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "Alla tillf�llen - alla kanaler"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Mata in %d siffror!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr ""
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Inspelning"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "Spela upp"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "�terspolning"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Inspelningar"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "�ppna"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Kommandon"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Inspelningen g�r inte att l�sa!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Ta bort inspelningen?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Inspelningen g�r inte att ta bort!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Inspelningskommandon"
 
-#: menu.c:2203
 msgid "never"
 msgstr "aldrig"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "skin beroende"
 
-#: menu.c:2205
 msgid "always"
 msgstr "alltid"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Spr�k"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "V�nster"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "�vre"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Bredd"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "H�jd"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tid f�r meddelanden (sek)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "Anv�nd liten font"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr ""
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr ""
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr ""
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr ""
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr ""
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr ""
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Placering av kanalinformation"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "undre"
 
-#: menu.c:2225
 msgid "top"
 msgstr "�vre"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanal information (s)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Information vid kanalbyte"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Timeout f�r kanalinformation"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Bl�ddra sidor"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Rulla texten"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Menyknappen st�nger"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Kataloger f�r inspelningar"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Skanna"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG s�kning timeout"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Niv� f�r EPG bugfix"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Visa gammal information (min)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "St�ll in systemtid"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Anv�nd klockan fr�n transponder"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "�nskade spr�k"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "�nskat spr�k"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "nej"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "bara namn"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "bara PIDs"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "namn och PID"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "l�gg till nya kanaler"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "l�gg till nya transponders"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhet"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Format f�r video display"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Anv�nd Dolby Digital"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Uppdatera kanaler"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Antal ljudspr�k"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Ljudspr�k"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Anv�nd DiSEqC"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Undre LNB frekvens (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�vre LNB frekvens (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr ""
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr ""
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr ""
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Meny"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "�terst�ll"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "�ppnar CAM menyn..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "Det g�r inte att �ppna CAM menyn!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr ""
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "Kan inte �terst�lla CAM!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Inspelning"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Marginal f�r start (min)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marginal f�r stopp (min)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Prim�r gr�ns"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Normal prioritet"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal livstid (dagar)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet f�r direktinspelning"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Livstid f�r direktinspelning (dagar)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Anv�nd episodnamn"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "Anv�nd VPS"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS marginal (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "M�rk direktinspelning"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Namnge direktinspelning"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Direktinspelning l�ngd (min)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximal filstorlek f�r inspelning (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "Dela upp redigerade filer"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Uppspelning"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Multispeed mode"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "Visa uppspelningsl�ge"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "�teruppta ID"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minsta h�ndelse-pause (min)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minsta anv�ndar-inaktivitet (min)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout(s)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal vid uppstart"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "som f�rut"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Moduler"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Den h�r modulen har inga parametrar"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Inst�llningar"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Omstart"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Vill du verkligen starta om?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " Avsluta inspelning "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "ledigt"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Ljud"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Pausa"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "Forts�tt"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Stopp"
 
+msgid "Button$Resume"
+msgstr "Forts�tt"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Avbryt redigering"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Stanna inspelning?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Avbryta redigeringen?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Ljud saknas!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Otillr�cklingt diskutrymme f�r inspelning!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Det finns ingen ledig DVB enhet f�r inspelning!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Pausar direktinspelningen"
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Hopp: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Det finns inga redigeringsm�rken"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Kan inte starta redigering!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Redigeringen startar"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Redigeringen �r redan aktiv!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "ja"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Infoga"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "Skriv �ver"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Infoga"
+
 msgid "Plugin"
 msgstr "Modul"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "Upp/Ner f�r nya platsen - d�refter OK f�r att flytta"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanalen �r l�st (inspelning p�g�r)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "L�gt diskutrymme!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan inte avsluta, m�ste anv�nda parameter '-s'"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr ""
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Inspelning p�g�r, vill du �nd� avbryta?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Inspelning startar om %ld minuter, vill du avsluta?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "vill du �nd� avbryta?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr ""
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr ""
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Inspelning p�g�r, vill du �nd� starta om?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "vill du �nd� starta om?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Volym "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klassisk VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsol"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "M�nTisOnsTorFreL�rS�n"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "M�ndag"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Fredag"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "strax VPS inspelning..."
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Inspelningen har startat"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr ""
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Tryck valfri knapp f�r att �terkalla avst�ngningen"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Byter prim�r DVB enhet..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Redigeringsprocessen misslyckades"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Redigering avslutad"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr ""
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 487c426f6..3036d13ae 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"POT-Creation-Date: 2007-10-13 11:29+0200\n"
 "PO-Revision-Date: 2007-08-24 14:37+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,1256 +15,983 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: channels.c:1077 menu.c:707
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
 
-#: device.c:634 device.c:670
 msgid "Channel not available!"
 msgstr "Kanal kullan�lam�yor!"
 
-#: device.c:636
 msgid "Can't start Transfer Mode!"
 msgstr "Transfer modu ba�lat�lam�yor!"
 
-#: eitscan.c:159
 msgid "Starting EPG scan"
 msgstr "EPG tarama ba�l�yor"
 
-#: epg.c:346 epg.c:441
 msgid "No title"
 msgstr "�sim yok"
 
 #. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:30
 msgid "LanguageName$English"
 msgstr "T�rk�e"
 
 #. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:32
 msgid "LanguageCode$eng"
 msgstr "tur"
 
-#: interface.c:75
 msgid "Phase 1: Detecting RC code type"
 msgstr "Faz 1: Kumandan�n kodu aran�yor"
 
-#: interface.c:76
 msgid "Press any key on the RC unit"
 msgstr "Kumandada herhangi bir tu�a bas"
 
-#: interface.c:79
 msgid "RC code detected!"
 msgstr "Kumandan�n kodu bulundu!"
 
-#: interface.c:80
 msgid "Do not press any key..."
 msgstr "Tu�lara basma..."
 
-#: interface.c:86
 msgid "Phase 2: Learning specific key codes"
 msgstr "Faz 2: Belirli tu� kodu e�itiliyor"
 
-#: interface.c:90
 #, c-format
 msgid "Press key for '%s'"
 msgstr "'%s' i�in tu� se�"
 
-#: interface.c:106
 msgid "Press 'Up' to confirm"
 msgstr "Onaylamak i�in 'Yukar�' bas"
 
-#: interface.c:107
 msgid "Press 'Down' to continue"
 msgstr "Devam etmek i�in 'A�a��' bas"
 
-#: interface.c:138
 msgid "(press 'Up' to go back)"
 msgstr "(Geri d�nmek i�in 'Yukar�' bas)"
 
-#: interface.c:142
 msgid "(press 'Down' to end key definition)"
 msgstr "(Bitirmek i�in 'A�a��' bas)"
 
-#: interface.c:146
 msgid "(press 'Menu' to skip this key)"
 msgstr "(Tu�u atlamak i�in 'Men�' bas)"
 
-#: interface.c:167
 msgid "Learning Remote Control Keys"
 msgstr "Uzaktan kumandan�n tu�lar� e�itiliyor"
 
-#: interface.c:180
 msgid "Phase 3: Saving key codes"
 msgstr "Faz 3: Tu� ayarlar�n� kesinle�tir"
 
-#: interface.c:181
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Kesinle�tirmek i�in 'Yukar�', Iptal etmek i�in 'A�a��' bas"
 
-#: keys.c:14
 msgid "Key$Up"
 msgstr "Yukar�"
 
-#: keys.c:15
 msgid "Key$Down"
 msgstr "A�a��"
 
-#: keys.c:16
 msgid "Key$Menu"
 msgstr "Men�"
 
-#: keys.c:17
 msgid "Key$Ok"
 msgstr "Tamam"
 
-#: keys.c:18
 msgid "Key$Back"
 msgstr "Geri"
 
-#: keys.c:19
 msgid "Key$Left"
 msgstr "Sol"
 
-#: keys.c:20
 msgid "Key$Right"
 msgstr "Sa�"
 
-#: keys.c:21
 msgid "Key$Red"
 msgstr "K�rm�z�"
 
-#: keys.c:22
 msgid "Key$Green"
 msgstr "Ye�il"
 
-#: keys.c:23
 msgid "Key$Yellow"
 msgstr "Sar�"
 
-#: keys.c:24
 msgid "Key$Blue"
 msgstr "Mavi"
 
-#: keys.c:35
 msgid "Key$Info"
 msgstr "Bilgi"
 
-#: keys.c:36
 msgid "Key$Play"
 msgstr "G�ster"
 
-#: keys.c:37
 msgid "Key$Pause"
 msgstr "Durakla"
 
-#: keys.c:38
 msgid "Key$Stop"
 msgstr "Durdur"
 
-#: keys.c:39
 msgid "Key$Record"
 msgstr "Kay�t et"
 
-#: keys.c:40
 msgid "Key$FastFwd"
 msgstr "�leri sar"
 
-#: keys.c:41
 msgid "Key$FastRew"
 msgstr "Geri sar"
 
-#: keys.c:42
 msgid "Key$Next"
 msgstr "Sonraki"
 
-#: keys.c:43
 msgid "Key$Prev"
 msgstr "�nceki"
 
-#: keys.c:44
 msgid "Key$Power"
 msgstr "Kapat"
 
-#: keys.c:45
 msgid "Key$Channel+"
 msgstr "Kanal+"
 
-#: keys.c:46
 msgid "Key$Channel-"
 msgstr "Kanal-"
 
-#: keys.c:47
 msgid "Key$PrevChannel"
 msgstr "�nceki kanal"
 
-#: keys.c:48
 msgid "Key$Volume+"
 msgstr "Vol�m+"
 
-#: keys.c:49
 msgid "Key$Volume-"
 msgstr "Vol�m-"
 
-#: keys.c:50 skinclassic.c:549
 msgid "Key$Mute"
 msgstr "Sessiz"
 
-#: keys.c:51
 msgid "Key$Audio"
 msgstr "Audio"
 
-#: keys.c:52
+msgid "Key$Subtitles"
+msgstr ""
+
 msgid "Key$Schedule"
 msgstr "Program"
 
-#: keys.c:53
 msgid "Key$Channels"
 msgstr "Kanallar"
 
-#: keys.c:54
 msgid "Key$Timers"
 msgstr "Zamanlay�c�"
 
-#: keys.c:55
 msgid "Key$Recordings"
 msgstr "Kay�tlar"
 
-#: keys.c:56
 msgid "Key$Setup"
 msgstr "Ayarlar"
 
-#: keys.c:57
 msgid "Key$Commands"
 msgstr "Komutlar"
 
-#: keys.c:58
 msgid "Key$User1"
 msgstr "Kullan�c�1"
 
-#: keys.c:59
 msgid "Key$User2"
 msgstr "Kullan�c�2"
 
-#: keys.c:60
 msgid "Key$User3"
 msgstr "Kullan�c�3"
 
-#: keys.c:61
 msgid "Key$User4"
 msgstr "Kullan�c�4"
 
-#: keys.c:62
 msgid "Key$User5"
 msgstr "Kullan�c�5"
 
-#: keys.c:63
 msgid "Key$User6"
 msgstr "Kullan�c�6"
 
-#: keys.c:64
 msgid "Key$User7"
 msgstr "Kullan�c�7"
 
-#: keys.c:65
 msgid "Key$User8"
 msgstr "Kullan�c�8"
 
-#: keys.c:66
 msgid "Key$User9"
 msgstr "Kullan�c�9"
 
-#: menu.c:69
 msgid "Free To Air"
 msgstr "�ifresiz"
 
-#: menu.c:71
 msgid "encrypted"
 msgstr "�ifreli"
 
-#: menu.c:177
 msgid "auto"
 msgstr "otomatik"
 
-#: menu.c:229
 msgid "Edit channel"
 msgstr "Kanal ayarlar�n� de�i�tir"
 
-#: menu.c:254
 msgid "Name"
 msgstr "�sim"
 
-#: menu.c:255
 msgid "Source"
 msgstr "Kaynak"
 
-#: menu.c:256
 msgid "Frequency"
 msgstr "Frekans"
 
-#: menu.c:257
 msgid "Vpid"
 msgstr "Vpid"
 
-#: menu.c:258
 msgid "Ppid"
 msgstr "Ppid"
 
-#: menu.c:259
 msgid "Apid1"
 msgstr "Apid1"
 
-#: menu.c:260
 msgid "Apid2"
 msgstr "Apid2"
 
-#: menu.c:261
 msgid "Dpid1"
 msgstr "Dpid1"
 
-#: menu.c:262
 msgid "Dpid2"
 msgstr "Dpid2"
 
-#: menu.c:263
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
 msgid "Tpid"
 msgstr "Tpid"
 
-#: menu.c:264
 msgid "CA"
 msgstr "CA"
 
-#: menu.c:265
 msgid "Sid"
 msgstr "Sid"
 
-#: menu.c:272
 msgid "Polarization"
 msgstr "Kutupla�ma"
 
-#: menu.c:273
 msgid "Srate"
 msgstr "Srate"
 
-#: menu.c:274
 msgid "Inversion"
 msgstr "�nversiyon"
 
-#: menu.c:274
 msgid "off"
 msgstr "kapal�"
 
-#: menu.c:275
 msgid "CoderateH"
 msgstr "CoderateH"
 
-#: menu.c:275 menu.c:276 menu.c:281
 msgid "none"
 msgstr "hi�"
 
-#: menu.c:276
 msgid "CoderateL"
 msgstr "CoderateL"
 
-#: menu.c:277
 msgid "Modulation"
 msgstr "Mod�lasyon"
 
-#: menu.c:278
 msgid "Bandwidth"
 msgstr "Bant geni�li�i"
 
-#: menu.c:279
 msgid "Transmission"
 msgstr "�letim"
 
-#: menu.c:280
 msgid "Guard"
 msgstr "Koruma"
 
-#: menu.c:281
 msgid "Hierarchy"
 msgstr "Hiyerar�i"
 
-#: menu.c:312
 msgid "Channel settings are not unique!"
 msgstr "Kanal ayarlar� belli de��l!"
 
-#: menu.c:402 menu.c:2923
 msgid "Channels"
 msgstr "Kanallar"
 
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
-msgid "Button$Delete"
-msgstr "Sil"
-
-#: menu.c:432
 msgid "Button$Edit"
 msgstr "De�i�tir"
 
-#: menu.c:432
-msgid "Button$Mark"
-msgstr "��aretle"
-
-#: menu.c:432 menu.c:847
 msgid "Button$New"
 msgstr "Yeni"
 
-#: menu.c:512
+msgid "Button$Delete"
+msgstr "Sil"
+
+msgid "Button$Mark"
+msgstr "��aretle"
+
 msgid "Channel is being used by a timer!"
 msgstr "Kanal zamanlay�c�dan kullan�l�yor!"
 
-#: menu.c:515
 msgid "Delete channel?"
 msgstr "Kanal� sil?"
 
-#: menu.c:652
 msgid "Edit timer"
 msgstr "Zamanlay�c�y� ayarla"
 
-#: menu.c:662
 msgid "Active"
 msgstr "Aktif"
 
-#: menu.c:663
 msgid "Channel"
 msgstr "Kanal"
 
-#: menu.c:664
 msgid "Day"
 msgstr "G�n"
 
-#: menu.c:665
 msgid "Start"
 msgstr "Ba�lang��"
 
-#: menu.c:666
 msgid "Stop"
 msgstr "Biti�"
 
-#: menu.c:667
 msgid "VPS"
 msgstr "VPS"
 
-#: menu.c:668
 msgid "Priority"
 msgstr "�ncelik"
 
-#: menu.c:669
 msgid "Lifetime"
 msgstr "�mr�"
 
-#: menu.c:670
 msgid "File"
 msgstr "K�t�k"
 
-#: menu.c:686
 msgid "First day"
 msgstr "�lk g�n"
 
-#: menu.c:811 menu.c:2924
 msgid "Timers"
 msgstr "Zamanlay�c�"
 
-#: menu.c:847 menu.c:1920
-msgid "Button$Info"
-msgstr "Bilgi"
-
-#: menu.c:847
 msgid "Button$On/Off"
 msgstr "A�/Kapat"
 
-#: menu.c:890
+msgid "Button$Info"
+msgstr "Bilgi"
+
 msgid "Delete timer?"
 msgstr "Zamanlay�c�y� sil"
 
-#: menu.c:892 menu.c:2031
 msgid "Timer still recording - really delete?"
 msgstr "Zamanlay�c� kay�t ediyor - buna ra�men sil?"
 
-#: menu.c:948
 msgid "Event"
 msgstr "Yay�n"
 
-#: menu.c:958 menu.c:1137 menu.c:1380 menu.c:1501 menu.c:2984
+msgid "Button$Timer"
+msgstr "Zamanlay�c�"
+
 msgid "Button$Record"
 msgstr "Kay�t et"
 
-#: menu.c:958 menu.c:1138 menu.c:1501
 msgid "Button$Switch"
 msgstr "De�i�tir"
 
-#: menu.c:958 menu.c:1137 menu.c:1380
-msgid "Button$Timer"
-msgstr "Zamanlay�c�"
+msgid "What's on now?"
+msgstr "�imdiki yay�nlar"
 
-#: menu.c:1093
 msgid "What's on next?"
 msgstr "Gelecek yay�nlar"
 
-#: menu.c:1093
-msgid "What's on now?"
-msgstr "�imdiki yay�nlar"
-
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Next"
 msgstr "Sonra"
 
-#: menu.c:1138 menu.c:1381 menu.c:1501
 msgid "Button$Now"
 msgstr "�imdi"
 
-#: menu.c:1138
 msgid "Button$Schedule"
 msgstr "Program"
 
-#: menu.c:1158 menu.c:1450
 msgid "Can't switch channel!"
 msgstr "Kanala de�i�tirelemiyor!"
 
-#: menu.c:1283
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
 
-#: menu.c:1304
 #, c-format
 msgid "This event - %s"
 msgstr "Bu yay�n - %s"
 
-#: menu.c:1323
 msgid "This event - all channels"
 msgstr "Bu yay�n - t�m kanallar"
 
-#: menu.c:1342
 msgid "All events - all channels"
 msgstr "T�m yay�nlar - t�m kanallar"
 
-#: menu.c:1712
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "L�tfen %d rakam veriniz!"
 
-#: menu.c:1754
 msgid "CAM not responding!"
 msgstr "CAM yan�t vermiyor!"
 
-#: menu.c:1784
 msgid "Recording info"
 msgstr "Kay�t bilgisi"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Play"
 msgstr "G�ster"
 
-#: menu.c:1789 menu.c:1920
 msgid "Button$Rewind"
 msgstr "Baslang��"
 
-#: menu.c:1879 menu.c:2925
 msgid "Recordings"
 msgstr "Kay�tlar"
 
-#: menu.c:1918
 msgid "Button$Open"
 msgstr "A�"
 
-#: menu.c:1920 menu.c:2902 menu.c:2944 menu.c:3037
 msgid "Commands"
 msgstr "Komutlar"
 
-#: menu.c:1970
 msgid "Error while accessing recording!"
 msgstr "Kay�t okuma hatas�!"
 
-#: menu.c:2028
 msgid "Delete recording?"
 msgstr "Kay�t� sil?"
 
-#: menu.c:2058
 msgid "Error while deleting recording!"
 msgstr "Kay�t silme hatas�!"
 
-#: menu.c:2089
 msgid "Recording commands"
 msgstr "Kay�t komutlar�"
 
-#: menu.c:2203
 msgid "never"
 msgstr "hi�"
 
-#: menu.c:2204
 msgid "skin dependent"
 msgstr "y�zeye ba�imli"
 
-#: menu.c:2205
 msgid "always"
 msgstr "hep"
 
-#: menu.c:2207 menu.c:2811
 msgid "OSD"
 msgstr "OSD"
 
-#: menu.c:2208
 msgid "Setup.OSD$Language"
 msgstr "Dil"
 
-#: menu.c:2209
 msgid "Setup.OSD$Skin"
 msgstr "Y�zey"
 
-#: menu.c:2211
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#: menu.c:2212
 msgid "Setup.OSD$Left"
 msgstr "Sol"
 
-#: menu.c:2213
 msgid "Setup.OSD$Top"
 msgstr "�st"
 
-#: menu.c:2214
 msgid "Setup.OSD$Width"
 msgstr "Geni�lik"
 
-#: menu.c:2215
 msgid "Setup.OSD$Height"
 msgstr "Y�kseklik"
 
-#: menu.c:2216
 msgid "Setup.OSD$Message time (s)"
 msgstr "Mesaj g�sterme zaman� (sn)"
 
-#: menu.c:2217
 msgid "Setup.OSD$Use small font"
 msgstr "K���k font kullan"
 
-#: menu.c:2218
 msgid "Setup.OSD$Anti-alias"
 msgstr "Anti-alias"
 
-#: menu.c:2219
 msgid "Setup.OSD$Default font"
 msgstr "Ola�an font"
 
-#: menu.c:2220
 msgid "Setup.OSD$Small font"
 msgstr "K���k font"
 
-#: menu.c:2221
 msgid "Setup.OSD$Fixed font"
 msgstr "�ak�l� font"
 
-#: menu.c:2222
 msgid "Setup.OSD$Default font size (pixel)"
 msgstr "Ola�an font boyutu (pixel)"
 
-#: menu.c:2223
 msgid "Setup.OSD$Small font size (pixel)"
 msgstr "K���k font boyutu (pixel)"
 
-#: menu.c:2224
 msgid "Setup.OSD$Fixed font size (pixel)"
 msgstr "�ak�l� font boyutu (pixel)"
 
-#: menu.c:2225
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanal bilgi pozisyonu"
 
-#: menu.c:2225
 msgid "bottom"
 msgstr "alt"
 
-#: menu.c:2225
 msgid "top"
 msgstr "�st"
 
-#: menu.c:2226
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanal bilgi g�sterme zaman� (sn)"
 
-#: menu.c:2227
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanal de�i�tirme bilgisi"
 
-#: menu.c:2228
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Kanal bilginin zaman a��m�"
 
-#: menu.c:2229
 msgid "Setup.OSD$Scroll pages"
 msgstr "Sayfa kayd�rma"
 
-#: menu.c:2230
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Sar�m kayd�rma"
 
-#: menu.c:2231
 msgid "Setup.OSD$Menu key closes"
 msgstr "Men� d��mesi kapat�yor"
 
-#: menu.c:2232
 msgid "Setup.OSD$Recording directories"
 msgstr "Kay�t dizinleri"
 
-#: menu.c:2323 menu.c:2812
 msgid "EPG"
 msgstr "EPG"
 
-#: menu.c:2324
 msgid "Button$Scan"
 msgstr "Tara"
 
-#: menu.c:2334
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG tarama zaman a��m� (sa)"
 
-#: menu.c:2335
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "EPG hata ��z�mleme �l��s�"
 
-#: menu.c:2336
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Eski EPG g�ster (dak)"
 
-#: menu.c:2337
 msgid "Setup.EPG$Set system time"
 msgstr "Bilgisayar saatini ayarla"
 
-#: menu.c:2339
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Bilgisayar saati i�in uydu al�c�-verici"
 
 #. TRANSLATORS: note the plural!
-#: menu.c:2341
 msgid "Setup.EPG$Preferred languages"
 msgstr "Dil tercihleri"
 
 #. TRANSLATORS: note the singular!
-#: menu.c:2344
 msgid "Setup.EPG$Preferred language"
 msgstr "Dil tercihi"
 
-#: menu.c:2416
 msgid "pan&scan"
 msgstr "pan&scan"
 
-#: menu.c:2417
 msgid "letterbox"
 msgstr "letterbox"
 
-#: menu.c:2418
 msgid "center cut out"
 msgstr "center cut out"
 
-#: menu.c:2419 menuitems.c:121
 msgid "no"
 msgstr "hay�r"
 
-#: menu.c:2420
 msgid "names only"
 msgstr "s�rf isimler"
 
-#: menu.c:2421
 msgid "PIDs only"
 msgstr "s�rf PID'ler"
 
-#: menu.c:2422
 msgid "names and PIDs"
 msgstr "�simler ve PID'ler"
 
-#: menu.c:2423
 msgid "add new channels"
 msgstr "yeni kanallar ekle"
 
-#: menu.c:2424
 msgid "add new transponders"
 msgstr "yeni uydu al�c�-verici ekle"
 
-#: menu.c:2426 menu.c:2813
 msgid "DVB"
 msgstr "DVB"
 
-#: menu.c:2436
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primer DVB aray�z�"
 
-#: menu.c:2437
 msgid "Setup.DVB$Video format"
 msgstr "Video format�"
 
-#: menu.c:2439
 msgid "Setup.DVB$Video display format"
 msgstr "Video g�r�nt� bi�imi"
 
-#: menu.c:2440
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby Dijital ses kullan"
 
-#: menu.c:2441
 msgid "Setup.DVB$Update channels"
 msgstr "Kanallar� yenile"
 
-#: menu.c:2442
 msgid "Setup.DVB$Audio languages"
 msgstr "Audio dilleri"
 
-#: menu.c:2444
 msgid "Setup.DVB$Audio language"
 msgstr "Audio dili"
 
-#: menu.c:2505 menu.c:2814
+msgid "Setup.DVB$Display subtitles"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle language"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
 msgid "LNB"
 msgstr "LNB"
 
-#: menu.c:2515
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "DiSEqC kullan"
 
-#: menu.c:2517
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
-#: menu.c:2518
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "Alt LNB frekans� (MHz)"
 
-#: menu.c:2519
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�st LNB frekans� (MHz)"
 
-#: menu.c:2560
 msgid "CAM reset"
 msgstr "CAM s�f�rland�"
 
-#: menu.c:2561
 msgid "CAM present"
 msgstr "CAM mevcut"
 
-#: menu.c:2562
 msgid "CAM ready"
 msgstr "CAM haz�r"
 
-#: menu.c:2585 menu.c:2815
 msgid "CAM"
 msgstr "CAM"
 
-#: menu.c:2590
 msgid "Button$Menu"
 msgstr "Men�"
 
-#: menu.c:2590
 msgid "Button$Reset"
 msgstr "S�f�rla"
 
-#: menu.c:2598
 msgid "Opening CAM menu..."
 msgstr "CAM men�s� a��l�yor..."
 
-#: menu.c:2615
 msgid "Can't open CAM menu!"
 msgstr "CAM men�s� a��lam�yor!"
 
-#: menu.c:2624
 msgid "CAM is in use - really reset?"
 msgstr "CAM kullan�l�yor - ger�ekden s�f�rla?"
 
-#: menu.c:2626
 msgid "Can't reset CAM!"
 msgstr "CAM s�f�rlanamad�!"
 
-#: menu.c:2660 menu.c:2816
 msgid "Recording"
 msgstr "Kay�t"
 
-#: menu.c:2661
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Ba��nda tolerans (dak)"
 
-#: menu.c:2662
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Sonunda tolerans (dak)"
 
-#: menu.c:2663
 msgid "Setup.Recording$Primary limit"
 msgstr "Primer limit"
 
-#: menu.c:2664
 msgid "Setup.Recording$Default priority"
 msgstr "Ola�an priorite"
 
-#: menu.c:2665
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Ola�an �ekim �mr� (g�n)"
 
-#: menu.c:2666
 msgid "Setup.Recording$Pause priority"
 msgstr "Duraklama prioritesi"
 
-#: menu.c:2667
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Duraklama �mr� (g�n)"
 
-#: menu.c:2668
 msgid "Setup.Recording$Use episode name"
 msgstr "Episod ismini kullan"
 
-#: menu.c:2669
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS kullan"
 
-#: menu.c:2670
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS tolerans (s)"
 
-#: menu.c:2671
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Derhal �ekimi i�aretle"
 
-#: menu.c:2672
 msgid "Setup.Recording$Name instant recording"
 msgstr "Derhal �ekimi isimlendir"
 
-#: menu.c:2673
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Derhal �ekim s�resi (dak)"
 
-#: menu.c:2674
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimum Video k�t�k b�y�kl�g� (MB)"
 
-#: menu.c:2675
 msgid "Setup.Recording$Split edited files"
 msgstr "D�zenlenmi� k�t�kleri ay�r"
 
-#: menu.c:2689 menu.c:2817
 msgid "Replay"
 msgstr "Tekrar"
 
-#: menu.c:2690
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Katl� h�z sarma"
 
-#: menu.c:2691
 msgid "Setup.Replay$Show replay mode"
 msgstr "G�steri� bilgisi"
 
-#: menu.c:2692
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
-#: menu.c:2711 menu.c:2818
 msgid "Miscellaneous"
 msgstr "Di�erler"
 
-#: menu.c:2712
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minimum olay zaman a��m� (dak)"
 
-#: menu.c:2713
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minimum kullan�c� hareketsizli�i (dak)"
 
-#: menu.c:2714
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP zaman a��m� (sn) "
 
-#: menu.c:2715
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zaping zaman a��m� (sn)"
 
-#: menu.c:2716
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanal giri� zaman a��m� (ms)"
 
-#: menu.c:2717
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "A��l��daki kanal"
 
-#: menu.c:2717 menu.c:2718
 msgid "Setup.Miscellaneous$as before"
 msgstr "�nceki gibi"
 
-#: menu.c:2718
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "A��l��daki ses"
 
-#: menu.c:2747 menu.c:2820
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: menu.c:2777
 msgid "This plugin has no setup parameters!"
 msgstr "Bu eklentinin d�zenek parametresi yok!"
 
-#: menu.c:2808 menu.c:2942 menuitems.c:950
 msgid "Setup"
 msgstr "Ayarlar"
 
-#: menu.c:2821
 msgid "Restart"
 msgstr "Yeniden ba�lat"
 
-#: menu.c:2826
 msgid "Really restart?"
 msgstr "Ger�ekten yeniden ba�lat?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
-#: menu.c:2878
 msgid " Stop recording "
 msgstr " �ekimi bitir "
 
-#: menu.c:2922
 msgid "Schedule"
 msgstr "Program"
 
-#: menu.c:2966
-msgid "Disk"
-msgstr "Disk"
-
-#: menu.c:2966
 msgid "VDR"
 msgstr "VDR"
 
-#: menu.c:2966
+msgid "Disk"
+msgstr "Disk"
+
 msgid "free"
 msgstr "bo�"
 
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2978
 msgid " Stop replaying"
 msgstr " G�steri�i bitir"
 
-#: menu.c:2984 menu.c:3496
 msgid "Button$Audio"
 msgstr "Audio"
 
-#: menu.c:2984
 msgid "Button$Pause"
 msgstr "Durakla"
 
-#: menu.c:2984
-msgid "Button$Resume"
-msgstr "S�rd�r"
-
-#: menu.c:2984
 msgid "Button$Stop"
 msgstr "Durdur"
 
+msgid "Button$Resume"
+msgstr "S�rd�r"
+
 #. TRANSLATORS: note the leading blank!
-#: menu.c:2992
 msgid " Cancel editing"
 msgstr " Kesimi iptal et"
 
-#: menu.c:3038
 msgid "Stop recording?"
 msgstr "Kay�t� durdur?"
 
-#: menu.c:3046
 msgid "Cancel editing?"
 msgstr "Kesimi iptal et?"
 
-#: menu.c:3526
 msgid "No audio available!"
 msgstr "Audio yok!"
 
-#: menu.c:3736
+msgid "No subtitles"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
+msgid "No subtitles available!"
+msgstr ""
+
 msgid "Not enough disk space to start recording!"
 msgstr "Kay�t i�in yeterince kapasite yok!"
 
-#: menu.c:3767 vdr.c:1017 vdr.c:1077
 msgid "No free DVB device to record!"
 msgstr "Kullan�lmayan DVB kart� bulunmad�!"
 
-#: menu.c:3797
 msgid "Pausing live video..."
 msgstr "Naklen yay�n duraklat�l�yor..."
 
 #. TRANSLATORS: note the trailing blank!
-#: menu.c:4040
 msgid "Jump: "
 msgstr "Atla: "
 
-#: menu.c:4184
 msgid "No editing marks defined!"
 msgstr "Kesim i�aretleri belirtilmemi�!"
 
-#: menu.c:4186
 msgid "Can't start editing process!"
 msgstr "Kesim ba�lat�lam�yor!"
 
-#: menu.c:4188
 msgid "Editing process started"
 msgstr "Kesim ba�land�"
 
-#: menu.c:4191
 msgid "Editing process already active!"
 msgstr "Kesim hen�z aktif!"
 
-#: menuitems.c:21
 msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
 msgstr " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.#~,/_@"
 
-#: menuitems.c:122
 msgid "yes"
 msgstr "evet"
 
-#: menuitems.c:288
 msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9"
 
-#: menuitems.c:320
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
-#: menuitems.c:320
-msgid "Button$Insert"
-msgstr "Ekle"
-
-#: menuitems.c:320
 msgid "Button$Overwrite"
 msgstr "�st�ne yaz"
 
-#: menuitems.c:971
+msgid "Button$Insert"
+msgstr "Ekle"
+
 msgid "Plugin"
 msgstr "Eklenti"
 
-#: osdbase.c:446
 msgid "Up/Dn for new location - OK to move"
 msgstr "'Yukar�/A�a��' yeni posizyon se� - 'Tamam' ta��"
 
-#: player.c:84
 msgid "Channel locked (recording)!"
 msgstr "Kanal ge�ersiz (kay�t ediliyor)!"
 
-#: recording.c:189
 msgid "Low disk space!"
 msgstr "Kay�t kapasitesi az!"
 
-#: shutdown.c:148
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kapat�lam�yor - '-s' se�ene�i verilmemi�!"
 
-#: shutdown.c:152
 msgid "Editing - shut down anyway?"
 msgstr "Kesim aktif - buna ra�men kapat?"
 
-#: shutdown.c:162
 msgid "Recording - shut down anyway?"
 msgstr "Kay�t ediliyor - buna ra�men kapat?"
 
-#: shutdown.c:169
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Kay�t %ld dakikada ba�l�yor - buna ra�men kapat?"
 
-#: shutdown.c:174
 msgid "shut down anyway?"
 msgstr "buna ra�men kapat?"
 
-#: shutdown.c:184
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Eklenti %s %ld dakikada a��l�yor, devam et?"
 
-#: shutdown.c:195
 msgid "Editing - restart anyway?"
 msgstr "Kesim aktif - buna ra�men yeniden ba�lat?"
 
-#: shutdown.c:205
 msgid "Recording - restart anyway?"
 msgstr "Kay�t ediliyor - buna ra�men yeniden ba�lat?"
 
-#: shutdown.c:209
 msgid "restart anyway?"
 msgstr "buna ra�men yeniden ba�lat?"
 
 #. TRANSLATORS: note the trailing blank!
-#: skinclassic.c:553
 msgid "Volume "
 msgstr "Vol�m "
 
-#: skinclassic.c:702
 msgid "Classic VDR"
 msgstr "Klasik VDR"
 
-#: skinsttng.c:1136
 msgid "ST:TNG Panels"
 msgstr "ST:TNG paneli"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
-#: timers.c:222
 msgid "MTWTFSS"
 msgstr "PS�PCCP"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
-#: tools.c:856
 msgid "MonTueWedThuFriSatSun"
 msgstr "PztSal�arPerCumCmtPaz"
 
-#: tools.c:875
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: tools.c:876
 msgid "Tuesday"
 msgstr "Sal�"
 
-#: tools.c:877
 msgid "Wednesday"
 msgstr "�ar�amba"
 
-#: tools.c:878
 msgid "Thursday"
 msgstr "Per�embe"
 
-#: tools.c:879
 msgid "Friday"
 msgstr "Cuma"
 
-#: tools.c:880
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: tools.c:881
 msgid "Sunday"
 msgstr "Pazar"
 
-#: vdr.c:863
 msgid "Upcoming VPS recording!"
 msgstr "VPS �ekim yak�nda ba�l�yor!"
 
-#: vdr.c:1025 vdr.c:1081
 msgid "Recording started"
 msgstr "Kay�t ba�land�"
 
-#: vdr.c:1034
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR daha sonra kapanacak - zorlamak i�in Kapat'a bas"
 
-#: vdr.c:1046
 msgid "Press any key to cancel shutdown"
 msgstr "Kapatmay� iptal etmek i�in herhangi bir tu�a bas"
 
-#: vdr.c:1099
 msgid "Switching primary DVB..."
 msgstr "Primer DVB aray�z� de�i�tiriliyor..."
 
-#: vdr.c:1167
 msgid "Editing process failed!"
 msgstr "Kesim ba�ar�s�z!"
 
-#: vdr.c:1169
 msgid "Editing process finished"
 msgstr "Kesim bitti"
 
-#: vdr.c:1175
 msgid "Press any key to cancel restart"
 msgstr "Yeniden ba�latmay� iptal etmek i�in herhangi bir tu�a bas"
 
-#: vdr.c:1195
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR %s dakikada kapanacak"
diff --git a/recording.c b/recording.c
index 22bb9556b..51846114b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.154 2007/06/17 13:10:12 kls Exp $
+ * $Id: recording.c 1.156 2007/10/14 10:21:54 kls Exp $
  */
 
 #include "recording.h"
@@ -296,6 +296,17 @@ cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
                strn0cpy(Component->language, s, sizeof(Component->language));
             }
          }
+     // The same applies to subtitles:
+     for (int i = 0; i < MAXSPIDS; i++) {
+         const char *s = Channel->Slang(i);
+         if (*s) {
+            tComponent *Component = Components->GetComponent(i, 3, 3);
+            if (!Component)
+               Components->SetComponent(Components->NumComponents(), 3, 3, s, NULL);
+            else if (strlen(s) > strlen(Component->language))
+               strn0cpy(Component->language, s, sizeof(Component->language));
+            }
+         }
      if (Components != event->Components())
         ((cEvent *)event)->SetComponents(Components);
      }
@@ -818,6 +829,32 @@ bool cRecording::Remove(void)
   return RemoveVideoFile(FileName());
 }
 
+bool cRecording::Undelete(void)
+{
+  bool result = true;
+  char *NewName = strdup(FileName());
+  char *ext = strrchr(NewName, '.');
+  if (ext && strcmp(ext, DELEXT) == 0) {
+     strncpy(ext, RECEXT, strlen(ext));
+     if (access(NewName, F_OK) == 0) {
+        // the new name already exists, so let's not remove that one:
+        esyslog("ERROR: attempt to undelete '%s', while recording '%s' exists", FileName(), NewName);
+        result = false;
+        }
+     else {
+        isyslog("undeleting recording '%s'", FileName());
+        if (access(FileName(), F_OK) == 0)
+           result = RenameVideoFile(FileName(), NewName);
+        else {
+           isyslog("deleted recording '%s' vanished", FileName());
+           result = false;
+           }
+        }
+     }
+  free(NewName);
+  return result;
+}
+
 void cRecording::ResetResume(void) const
 {
   resume = RESUME_NOT_INITIALIZED;
diff --git a/recording.h b/recording.h
index 045bb24f0..4bdcd1b24 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.57 2007/06/17 12:53:05 kls Exp $
+ * $Id: recording.h 1.59 2007/10/14 10:11:34 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -72,6 +72,8 @@ class cRecording : public cListObject {
   mutable char *name;
   mutable int fileSizeMB;
   cRecordingInfo *info;
+  cRecording(const cRecording&); // can't copy cRecording
+  cRecording &operator=(const cRecording &); // can't assign cRecording
   static char *StripEpisodeName(char *s);
   char *SortName(void) const;
   int GetResume(void) const;
@@ -100,6 +102,10 @@ class cRecording : public cListObject {
   bool Remove(void);
        // Actually removes the file from the disk
        // Returns false in case of error
+  bool Undelete(void);
+       // Changes the file name so that it will be visible in the "Recordings" menu again and
+       // not processed by cRemoveDeletedRecordingsThread.
+       // Returns false in case of error
   };
 
 class cRecordings : public cList<cRecording>, public cThread {
diff --git a/remux.c b/remux.c
index ccc5b00d5..aed382986 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.58 2007/02/24 16:36:10 kls Exp $
+ * $Id: remux.c 1.59 2007/09/22 12:08:22 kls Exp $
  */
 
 #include "remux.h"
@@ -1555,6 +1555,13 @@ void cTS2PES::send_ipack(void)
             buf[7] = 0x00;
             buf[8] = 0x00;
             count = 9;
+            if (!repacker && subStreamId) {
+               buf[9] = subStreamId;
+               buf[10] = 1;
+               buf[11] = 0;
+               buf[12] = 1;
+               count = 13;
+               }
             break;
     case 1:
             buf[6] = 0x0F;
@@ -1766,6 +1773,19 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                   return;
                }
 
+            if (!repacker && subStreamId) {
+               while (c < Count && found < (hlength + 9) && found < plength + 6) {
+                     write_ipack(Buf + c, 1);
+                     c++;
+                     found++;
+                     }
+               if (found == (hlength + 9)) {
+                  uchar sbuf[] = { 0x01, 0x00, 0x00 };
+                  write_ipack(&subStreamId, 1);
+                  write_ipack(sbuf, 3);
+                  }
+               }
+
             while (c < Count && found < plength + 6) {
                   int l = Count - c;
                   if (l + found > plength + 6)
@@ -1856,7 +1876,7 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
 cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure)
 {
   exitOnFailure = ExitOnFailure;
-  isRadio = VPid == 0 || VPid == 1 || VPid == 0x1FFF;
+  noVideo = VPid == 0 || VPid == 1 || VPid == 0x1FFF;
   numUPTerrors = 0;
   synced = false;
   skipped = 0;
@@ -1888,13 +1908,11 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
      while (*DPids && numTracks < MAXTRACKS && n < MAXDPIDS)
            ts2pes[numTracks++] = new cTS2PES(*DPids++, resultBuffer, IPACKS, 0x00, 0x80 + n++, new cDolbyRepacker);
      }
-  /* future...
   if (SPids) {
      int n = 0;
      while (*SPids && numTracks < MAXTRACKS && n < MAXSPIDS)
-           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, IPACKS, 0x00, 0x28 + n++);
+           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, IPACKS, 0x00, 0x20 + n++);
      }
-  */
 }
 
 cRemux::~cRemux()
@@ -2080,7 +2098,7 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
                l = GetPacketLength(data, resultCount, i);
                if (l < 0)
                   return resultData;
-               if (isRadio) {
+               if (noVideo) {
                   if (!synced) {
                      if (PictureType)
                         *PictureType = I_FRAME;
diff --git a/remux.h b/remux.h
index 2f1175638..1b7727ec7 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.16 2006/03/25 12:27:30 kls Exp $
+ * $Id: remux.h 1.17 2007/09/02 10:19:06 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -37,7 +37,7 @@ class cTS2PES;
 class cRemux {
 private:
   bool exitOnFailure;
-  bool isRadio;
+  bool noVideo;
   int numUPTerrors;
   bool synced;
   int skipped;
diff --git a/sections.c b/sections.c
index 4df6c2599..afb4f0bdf 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.14 2005/09/18 11:30:29 kls Exp $
+ * $Id: sections.c 1.15 2007/10/14 12:52:07 kls Exp $
  */
 
 #include "sections.h"
@@ -105,7 +105,7 @@ void cSectionHandler::Del(const cFilterData *FilterData)
   for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) {
       if (fh->filterData.Is(FilterData->pid, FilterData->tid, FilterData->mask)) {
          if (--fh->used <= 0) {
-            close(fh->handle);
+            device->CloseFilter(fh->handle);
             filterHandles.Del(fh);
             break;
             }
diff --git a/svdrp.c b/svdrp.c
index 933375f46..c8cd5be89 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.103 2007/08/25 09:28:26 kls Exp $
+ * $Id: svdrp.c 1.104 2007/10/13 10:17:48 kls Exp $
  */
 
 #include "svdrp.h"
@@ -819,7 +819,7 @@ void cSVDRP::CmdHELP(const char *Option)
   if (*Option) {
      const char *hp = GetHelpPage(Option, HelpPages);
      if (hp)
-        Reply(214, "%s", hp);
+        Reply(-214, "%s", hp);
      else {
         Reply(504, "HELP topic \"%s\" unknown", Option);
         return;
diff --git a/tools.c b/tools.c
index 642704ca6..bbbcf82f3 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.135 2007/08/05 12:18:15 kls Exp $
+ * $Id: tools.c 1.136 2007/10/13 12:00:21 kls Exp $
  */
 
 #include "tools.h"
@@ -791,7 +791,7 @@ const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
                  size_t d = ToPtr - result;
                  size_t r = length / 2;
                  length += r;
-                 result = (char *)realloc(result, length);
+                 Converted = result = (char *)realloc(result, length);
                  ToLength += r;
                  ToPtr = result + d;
                  }
diff --git a/vdr.5 b/vdr.5
index 6ea1e49d3..e01b2779e 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.63 2007/08/05 12:58:35 kls Exp $
+.\" $Id: vdr.5 1.64 2007/08/26 10:57:08 kls Exp $
 .\"
 .TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files"
 .SH NAME
@@ -557,6 +557,8 @@ a recording is split into several files. The contents of these files is
 0xC0...0xDF for audio 1...32 (up to 32 audio tracks may occur).
 Dolby Digital data is stored in packets with ids 0xBD ("Private Stream 1")
 and substream ids 0x80...0x87.
+DVB subtitle data is stored in packets with ids 0xBD ("Private Stream 1")
+and substream ids 0x20...0x27.
 .SS INDEX
 The file \fIindex.vdr\fR (if present in a recording directory) contains
 the (binary) index data into each of the the recording files
@@ -646,7 +648,7 @@ l l.
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
-<stream>       @is the stream content (1 = video, 2 = audio)
+<stream>       @is the stream content (1 = video, 2 = audio, 3 = subtitles)
 <type>         @is the stream type according to ETSI EN 300 468
 <language>     @is the three letter language code (optionally two codes, separated by '+')
 <descr>        @is the description of this stream component
diff --git a/vdr.c b/vdr.c
index 81ae6ecb4..b22dec3ca 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.299 2007/08/25 08:51:13 kls Exp $
+ * $Id: vdr.c 1.300 2007/08/26 14:36:48 kls Exp $
  */
 
 #include <getopt.h>
@@ -1009,6 +1009,18 @@ int main(int argc, char *argv[])
                   cDisplayTracks::Process(key);
                key = kNone;
                break;
+          // Subtitle track control:
+          case kSubtitles:
+               if (cControl::Control())
+                  cControl::Control()->Hide();
+               if (!cDisplaySubtitleTracks::IsOpen()) {
+                  DELETE_MENU;
+                  Menu = cDisplaySubtitleTracks::Create();
+                  }
+               else
+                  cDisplaySubtitleTracks::Process(key);
+               key = kNone;
+               break;
           // Pausing live video:
           case kPause:
                if (!cControl::Control()) {

From 182cd78af06cee95594307b792b8951153c4888e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 Nov 2007 18:00:00 +0100
Subject: [PATCH 177/307] =?UTF-8?q?Version=201.5.11=20-=20Fixed=20checking?=
 =?UTF-8?q?=20compatibility=20mode=20for=20old=20subtitles=20plugin=20(tha?=
 =?UTF-8?q?nks=20to=20Marco=20=20=20Schl=C3=BC=C3=9Fler).=20-=20Updated=20?=
 =?UTF-8?q?the=20French=20OSD=20texts=20(thanks=20to=20Michael=20Nival).?=
 =?UTF-8?q?=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to=20?=
 =?UTF-8?q?Arthur=20Konovalov).=20-=20Updated=20the=20Italian=20OSD=20text?=
 =?UTF-8?q?s=20(thanks=20to=20Diego=20Pierotto).=20-=20The=20"Play"=20key?=
 =?UTF-8?q?=20now=20starts=20replay=20of=20the=20selected=20recording=20in?=
 =?UTF-8?q?=20the=20Recordings=20=20=20menu=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4);=20-=20Improved=20shutdown=20handling=20(thanks=20to=20?=
 =?UTF-8?q?Udo=20Richter).=20-=20Housekeeping=20now=20waits=20for=20a=20wh?=
 =?UTF-8?q?ile=20after=20a=20replay=20has=20ended=20(thanks=20to=20Udo=20R?=
 =?UTF-8?q?ichter).=20-=20Added=20more=20special=20characters=20to=20the?=
 =?UTF-8?q?=20list=20of=20allowed=20characters=20when=20entering=20=20=20s?=
 =?UTF-8?q?trings=20(thanks=20to=20Thomas=20G=C3=BCnther).=20-=20Added=20U?=
 =?UTF-8?q?krainian=20language=20texts=20(thanks=20to=20Yarema=20Aka=20Kne?=
 =?UTF-8?q?dlyk).=20-=20Added=20a=20workaround=20for=20recovering=20from?=
 =?UTF-8?q?=20wrongfully=20interpreted=20"pre=201.3.19=20PS1=20packets".?=
 =?UTF-8?q?=20-=20Fixed=20a=20possible=20blocking=20in=20replay=20when=20s?=
 =?UTF-8?q?ubtitles=20are=20active.=20-=20Fixed=20displaying=20subtitles?=
 =?UTF-8?q?=20in=20live=20mode.=20-=20Fixed=20handling=20CONFDIR=20(thanks?=
 =?UTF-8?q?=20to=20Rolf=20Ahrenberg).=20-=20Added=20some=20missing=20'cons?=
 =?UTF-8?q?t'=20keywords=20(thanks=20to=20Sascha=20Volkenandt).=20-=20The?=
 =?UTF-8?q?=20'Allowed'=20parameter=20in=20cMenuEditStrItem()=20is=20now?=
 =?UTF-8?q?=20NULL=20by=20default,=20which=20results=20=20=20in=20using=20?=
 =?UTF-8?q?tr(FileNameChars)=20(suggested=20by=20Thomas=20G=C3=BCnther).?=
 =?UTF-8?q?=20-=20Added=20a=20missing=20'.'=20to=20the=20date=20returned?=
 =?UTF-8?q?=20by=20DayDateTime()=20(thanks=20to=20Lauri=20Nurmi).=20-=20Im?=
 =?UTF-8?q?proved=20the=20'i18n'=20target=20in=20the=20Makefile=20to=20avo?=
 =?UTF-8?q?id=20unnecessary=20work=20(thanks=20to=20=20=20Stefan=20Huelswi?=
 =?UTF-8?q?tt).=20The=20'newplugin'=20and=20'i18n-to-gettext.pl'=20scripts?=
 =?UTF-8?q?=20have=20been=20=20=20changed=20accordingly.=20Plugin=20author?=
 =?UTF-8?q?s=20may=20want=20to=20adjust=20the=20'i18n'=20target=20=20=20of?=
 =?UTF-8?q?=20their=20Makefiles.=20-=20Fixed=20a=20crash=20if=20no=20fonts?=
 =?UTF-8?q?=20are=20found=20(thanks=20to=20Mario=20Ivankovits=20and=20Clem?=
 =?UTF-8?q?ens=20=20=20Kirchgatterer).=20-=20Fixed=20decoding=20filename?=
 =?UTF-8?q?=20characters=20in=20case=20there=20are=20not=20two=20hex=20dig?=
 =?UTF-8?q?its=20after=20=20=20the=20'#'=20(reported=20by=20Helmut=20Auer)?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                    |  27 +
 HISTORY                         |  31 +
 Makefile                        |  24 +-
 PLUGINS/src/hello/Makefile      |  22 +-
 PLUGINS/src/skincurses/Makefile |  22 +-
 config.h                        |  10 +-
 device.c                        |  26 +-
 device.h                        |   4 +-
 dvbsubtitle.c                   |  17 +-
 font.c                          |  26 +-
 i18n-to-gettext.pl              |  24 +-
 i18n.c                          |   3 +-
 menu.c                          |   9 +-
 menuitems.c                     |   8 +-
 menuitems.h                     |   4 +-
 newplugin                       |  22 +-
 osdbase.h                       |  10 +-
 po/ca_ES.po                     |   6 +-
 po/cs_CZ.po                     |   8 +-
 po/da_DK.po                     |   8 +-
 po/de_DE.po                     |   8 +-
 po/el_GR.po                     |   6 +-
 po/es_ES.po                     |   8 +-
 po/et_EE.po                     |  78 +--
 po/fi_FI.po                     |   8 +-
 po/fr_FR.po                     |  39 +-
 po/hr_HR.po                     |   6 +-
 po/hu_HU.po                     |   8 +-
 po/it_IT.po                     |  38 +-
 po/nl_NL.po                     |   6 +-
 po/nn_NO.po                     |   4 +-
 po/pl_PL.po                     |   8 +-
 po/pt_PT.po                     |   4 +-
 po/ro_RO.po                     |   8 +-
 po/ru_RU.po                     |   8 +-
 po/sl_SI.po                     |   8 +-
 po/sv_SE.po                     |   8 +-
 po/tr_TR.po                     |   8 +-
 po/uk_UA.po                     | 999 ++++++++++++++++++++++++++++++++
 recording.c                     |  11 +-
 remux.c                         |   7 +-
 shutdown.c                      |  13 +-
 thread.c                        |   4 +-
 tools.c                         |   4 +-
 vdr.c                           |  13 +-
 45 files changed, 1355 insertions(+), 268 deletions(-)
 create mode 100644 po/uk_UA.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 34b4803e2..e49400a46 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -222,6 +222,7 @@ Stefan Huelswitt <huels@iname.com>
  for reporting a double fdopen() in cPipe::Open()
  for suggesting to increase the APIVERSION to allow plugins that relied on the
  cStatus::MsgSetVolume() bug to react properly
+ for improving the 'i18n' target in the Makefile to avoid unnecessary work
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -587,6 +588,8 @@ Helmut Auer <vdr@helmutauer.de>
  is a recording going on or about to start, and the user insists in shutting down now
  for suggesting to make the channel entry timeout configurable
  for a patch that was used to implement the SVDRP command REMO
+ for reporting a possible crash in decoding filename characters in case there are
+ not two hex digits after the '#'
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -743,6 +746,7 @@ Georg Hitsch <georg@hitsch.at>
 Clemens Kirchgatterer <clemens@thf.ath.cx>
  for suggesting to change source directory name for plugins from 'SRC' to 'src'
  for reporting a problem with user defined CFLAGS in libdtv/libvdr/Makefile
+ for suggesting an error log message if no fonts are found
 
 Emil Naepflein <Emil.Naepflein@philosys.de>
  for suggesting to take an active SVDRP connection into account when doing shutdown or
@@ -889,6 +893,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for a patch that was used for implementing setting the user id
  for pointing out that the canonical spelling of codesets is with '-'
  for a hint on using _nl_msg_cat_cntr
+ for adding some missing 'const' keywords
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -1028,6 +1033,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  the subtitles plugin
  for implementing cDevice::CloseFilter()
  for some fixes to PLUGINS.html
+ for fixing handling CONFDIR
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1430,6 +1436,7 @@ Marco Schl
  for implementing handling DVB subtitles
  for fixing the description of DeviceSetAvailableTrack() and cReceiver(), and adding
  an example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
+ for fixing checking compatibility mode for old subtitles plugin
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1535,6 +1542,8 @@ Udo Richter <udo_richter@gmx.de>
  for adding a missing error report to cCuttingThread::Action()
  for reporting a problem in handling reallocated memory in cCharSetConv::Convert()
  for fixing a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode()
+ for improving shutdown handling
+ for making housekeeping wait for a while after a replay has ended
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1709,6 +1718,8 @@ Ville Skytt
  for suggesting to add the "...or (at your option) any later version" phrase to the
  license information of all plugins, and also the 'newplugin' script
  for fixing the link to the GPL2 at http://www.gnu.org in vdr.c
+ for making the "Play" key start replay of the selected recording in the Recordings
+ menu
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1788,6 +1799,10 @@ Thomas G
  for removing a duplicate ',' from the ca_ES.po file
  for suggesting to add the '�' character to the "allowed characters" in the
  de_DE.po file
+ for adding more special characters to the list of allowed characters when entering
+ strings
+ for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default,
+ which results in using tr(FileNameChars)
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -2210,3 +2225,15 @@ Elias Luttinen <el@iki.fi>
 Torsten Kunkel <vdrml@tkunkel.de>
  for pointing out that it was not obvious how to initiate internationalization
  support for a plugin
+
+Michael Nival <mnival@club-internet.fr>
+ for translating OSD texts to the French language
+
+Yarema Aka Knedlyk <yupadmin@gmail.com>
+ for translating OSD texts to the Ukrainian language
+
+Lauri Nurmi <lanurmi@iki.fi>
+ for adding a missing '.' to the date returned by DayDateTime()
+
+Mario Ivankovits <mario@ops.co.at>
+ for fixing a crash if no fonts are found
diff --git a/HISTORY b/HISTORY
index 91d32fb38..6984bbd46 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5487,3 +5487,34 @@ Video Disk Recorder Revision History
 - Added cDevice::CloseFilter() to allow a device to have complete control over
   both opening and closing section filters (thanks to Rolf Ahrenberg).
 - Some fixes to PLUGINS.html (thanks to Rolf Ahrenberg).
+
+2007-11-04: Version 1.5.11
+
+- Fixed checking compatibility mode for old subtitles plugin (thanks to Marco
+  Schl��ler).
+- Updated the French OSD texts (thanks to Michael Nival).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- The "Play" key now starts replay of the selected recording in the Recordings
+  menu (thanks to Ville Skytt�);
+- Improved shutdown handling (thanks to Udo Richter).
+- Housekeeping now waits for a while after a replay has ended (thanks to Udo Richter).
+- Added more special characters to the list of allowed characters when entering
+  strings (thanks to Thomas G�nther).
+- Added Ukrainian language texts (thanks to Yarema Aka Knedlyk).
+- Added a workaround for recovering from wrongfully interpreted "pre 1.3.19 PS1 packets".
+- Fixed a possible blocking in replay when subtitles are active.
+- Fixed displaying subtitles in live mode.
+- Fixed handling CONFDIR (thanks to Rolf Ahrenberg).
+- Added some missing 'const' keywords (thanks to Sascha Volkenandt).
+- The 'Allowed' parameter in cMenuEditStrItem() is now NULL by default, which results
+  in using tr(FileNameChars) (suggested by Thomas G�nther).
+- Added a missing '.' to the date returned by DayDateTime() (thanks to Lauri Nurmi).
+- Improved the 'i18n' target in the Makefile to avoid unnecessary work (thanks to
+  Stefan Huelswitt). The 'newplugin' and 'i18n-to-gettext.pl' scripts have been
+  changed accordingly. Plugin authors may want to adjust the 'i18n' target
+  of their Makefiles.
+- Fixed a crash if no fonts are found (thanks to Mario Ivankovits and Clemens
+  Kirchgatterer).
+- Fixed decoding filename characters in case there are not two hex digits after
+  the '#' (reported by Helmut Auer).
diff --git a/Makefile b/Makefile
index aea69957e..f32773c8f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.108 2007/10/13 09:26:40 kls Exp $
+# $Id: Makefile 1.110 2007/11/04 10:15:59 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -27,7 +27,7 @@ PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
 
 VIDEODIR = /video
-CONFDIR ?= $(VIDEODIR)
+CONFDIR  = $(VIDEODIR)
 
 DOXYGEN  = /usr/bin/doxygen
 DOXYFILE = Doxyfile
@@ -106,25 +106,25 @@ $(SILIB):
 PODIR     = po
 LOCALEDIR = locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/vdr.pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
 
-$(I18Npo): $(I18Npot)
+%.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
 
-i18n: $(I18Nmo)
-	@mkdir -p $(LOCALEDIR)
-	for i in $(I18Ndirs); do\
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr.mo;\
-	    done
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs)
 
 install-i18n:
 	@mkdir -p $(DESTDIR)$(LOCDIR)
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 92e8af4a4..185b527ed 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.20 2007/10/14 09:23:04 kls Exp $
+# $Id: Makefile 1.21 2007/11/04 10:52:15 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -72,25 +72,25 @@ $(DEPFILE): Makefile
 PODIR     = po
 LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
 
-$(I18Npo): $(I18Npot)
+%.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
 
-i18n: $(I18Npot) $(I18Nmo)
-	@mkdir -p $(LOCALEDIR)
-	for i in $(I18Ndirs); do\
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
-	    done
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs)
 
 ### Targets:
 
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 3eea4ddfb..17f8540cc 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.13 2007/10/14 09:23:25 kls Exp $
+# $Id: Makefile 1.14 2007/11/04 10:52:13 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -70,25 +70,25 @@ $(DEPFILE): Makefile
 PODIR     = po
 LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
 
-$(I18Npo): $(I18Npot)
+%.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
 
-i18n: $(I18Npot) $(I18Nmo)
-	@mkdir -p $(LOCALEDIR)
-	for i in $(I18Ndirs); do\
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
-	    done
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs)
 
 ### Targets:
 
diff --git a/config.h b/config.h
index e51637f6e..02f1b53d7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.299 2007/10/06 14:27:18 kls Exp $
+ * $Id: config.h 1.300 2007/10/17 18:34:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.10"
-#define VDRVERSNUM   10510  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.11"
+#define VDRVERSNUM   10511  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.10"
-#define APIVERSNUM   10510  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.11"
+#define APIVERSNUM   10511  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 73decabb9..b8e5a8f55 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.145 2007/10/14 13:09:19 kls Exp $
+ * $Id: device.c 1.147 2007/11/03 13:30:09 kls Exp $
  */
 
 #include "device.h"
@@ -209,6 +209,9 @@ int cPesAssembler::PacketSize(const uchar *data)
 // The default priority for non-primary devices:
 #define DEFAULTPRIORITY  -1
 
+// The minimum number of unknown PS1 packets to consider this a "pre 1.3.19 private stream":
+#define MIN_PRE_1_3_19_PRIVATESTREAM 10
+
 int cDevice::numDevices = 0;
 int cDevice::useDevice = 0;
 int cDevice::nextCardIndex = 0;
@@ -931,7 +934,7 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly, bool IdsOnly)
         }
      else
         memset(availableTracks, 0, sizeof(availableTracks));
-     pre_1_3_19_PrivateStream = false;
+     pre_1_3_19_PrivateStream = 0;
      SetAudioChannel(0); // fall back to stereo
      currentAudioTrackMissingCount = 0;
      currentAudioTrack = ttNone;
@@ -1236,7 +1239,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                int PayloadOffset = Data[8] + 9;
 
                // Compatibility mode for old subtitles plugin:
-               if ((Data[PayloadOffset - 3] & 0x81) == 1 && Data[PayloadOffset - 2] == 0x81)
+               if ((Data[7] & 0x01) && (Data[PayloadOffset - 3] & 0x81) == 0x01 && Data[PayloadOffset - 2] == 0x81)
                   PayloadOffset--;
 
                uchar SubStreamId = Data[PayloadOffset];
@@ -1245,11 +1248,13 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
 pre_1_3_19_PrivateStreamDeteced:
-               if (pre_1_3_19_PrivateStream) {
+               if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
                   SubStreamId = c;
                   SubStreamType = 0x80;
                   SubStreamIndex = 0;
                   }
+               else if (pre_1_3_19_PrivateStream)
+                  pre_1_3_19_PrivateStream--; // every known PS1 packet counts down towards 0 to recover from glitches...
                switch (SubStreamType) {
                  case 0x20: // SPU
                  case 0x30: // SPU
@@ -1277,11 +1282,14 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                       break;
                  default:
                       // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
-                      if (!pre_1_3_19_PrivateStream) {
-                         dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode");
-                         ClrAvailableTracks();
-                         pre_1_3_19_PrivateStream = true;
-                         goto pre_1_3_19_PrivateStreamDeteced;
+                      if (pre_1_3_19_PrivateStream <= MIN_PRE_1_3_19_PRIVATESTREAM) {
+                         dsyslog("unknown PS1 packet, substream id = %02X (counter is at %d)", SubStreamId, pre_1_3_19_PrivateStream);
+                         pre_1_3_19_PrivateStream += 2; // ...and every unknown PS1 packet counts up (the very first one counts twice, but that's ok)
+                         if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
+                            dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode - substream id = %02X", SubStreamId);
+                            ClrAvailableTracks();
+                            goto pre_1_3_19_PrivateStreamDeteced;
+                            }
                          }
                  }
                }
diff --git a/device.h b/device.h
index 825aadf5e..9bd823e7b 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.85 2007/10/14 13:09:12 kls Exp $
+ * $Id: device.h 1.86 2007/10/21 09:21:52 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -377,7 +377,7 @@ class cDevice : public cThread {
   cMutex mutexCurrentSubtitleTrack;
   int currentAudioTrackMissingCount;
   bool autoSelectPreferredSubtitleLanguage;
-  bool pre_1_3_19_PrivateStream;
+  int pre_1_3_19_PrivateStream;
 protected:
   virtual void SetAudioTrackDevice(eTrackType Type);
        ///< Sets the current audio track to the given value.
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 1f7e6b7bb..e84559425 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 1.1 2007/10/14 14:02:35 kls Exp $
+ * $Id: dvbsubtitle.c 1.2 2007/11/03 14:36:07 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -692,7 +692,7 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
      bool ResetSubtitleAssembler = Data[PayloadOffset + 3] == 0x00;
 
      // Compatibility mode for old subtitles plugin:
-     if ((Data[PayloadOffset - 3] & 0x81) == 1 && Data[PayloadOffset - 2] == 0x81) {
+     if ((Data[7] & 0x01) && (Data[PayloadOffset - 3] & 0x81) == 0x01 && Data[PayloadOffset - 2] == 0x81) {
         PayloadOffset--;
         SubstreamHeaderLength = 1;
         ResetSubtitleAssembler = Data[8] >= 5;
@@ -730,8 +730,8 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
                     break;
                  }
            }
-        return Length;
         }
+     return Length;
      }
   return 0;
 }
@@ -767,7 +767,7 @@ void cDvbSubtitleConverter::Action(void)
               //TODO sync on PTS? are there actually devices that don't deliver an STC?
               }
            Delta /= 90; // STC and PTS are in 1/90000s
-           if (abs(Delta) <= MAXDELTA) {
+           if (Delta <= MAXDELTA) {
               if (Delta <= 0) {
                  dbgconverter("Got %d bitmaps, showing #%d\n", bitmaps->Count(), sb->Index() + 1);
                  if (AssertOsd()) {
@@ -777,8 +777,8 @@ void cDvbSubtitleConverter::Action(void)
                     }
                  bitmaps->Del(sb);
                  }
-              else
-                 WaitMs = min(max(Delta, int64_t(0)), int64_t(1000));
+              else if (Delta < WaitMs)
+                 WaitMs = Delta;
               }
            else
               bitmaps->Del(sb);
@@ -830,6 +830,8 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
         pages->Add(page);
         dbgpages("Create SubtitlePage %d  (total pages = %d)\n", pageId, pages->Count());
         }
+     if (Pts)
+        page->SetPts(Pts);
      switch (segmentType) {
        case PAGE_COMPOSITION_SEGMENT: {
             dbgsegments("PAGE_COMPOSITION_SEGMENT\n");
@@ -837,8 +839,6 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             if (pageVersion == page->Version())
                break; // no update
             page->SetVersion(pageVersion);
-            if (Pts)
-               page->SetPts(Pts);
             page->SetTimeout(Data[6]);
             page->SetState((Data[6 + 1] & 0x0C) >> 2);
             page->regions.Clear();
@@ -968,6 +968,7 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             dbgsegments("END_OF_DISPLAY_SET_SEGMENT\n");
             FinishPage(page);
             }
+            break;
        default:
             dbgsegments("*** unknown segment type: %02X\n", segmentType);
        }
diff --git a/font.c b/font.c
index 19753bfcb..73b77fbb1 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.21 2007/06/23 11:25:42 kls Exp $
+ * $Id: font.c 1.22 2007/11/04 11:08:12 kls Exp $
  */
 
 #include "font.h"
@@ -395,17 +395,21 @@ cString cFont::GetFontFileName(const char *FontName)
      FcConfigSubstitute(NULL, pat, FcMatchPattern);
      FcDefaultSubstitute(pat);
      FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
-     for (int i = 0; i < fontset->nfont; i++) {
-         FcBool scalable;
-         FcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable);
-         if (scalable) {
-            FcChar8 *s = NULL;
-            FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &s);
-            FontFileName = (char *)s;
-            break;
+     if (fontset) {
+        for (int i = 0; i < fontset->nfont; i++) {
+            FcBool scalable;
+            FcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable);
+            if (scalable) {
+               FcChar8 *s = NULL;
+               FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &s);
+               FontFileName = (char *)s;
+               break;
+               }
             }
-         }
-     FcFontSetDestroy(fontset);
+        FcFontSetDestroy(fontset);
+        }
+     else
+        esyslog("ERROR: no usable font found for '%s'", FontName);
      FcPatternDestroy(pat);
      free(fn);
      FcFini();
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index 1be38fafd..309a47208 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 1.5 2007/10/14 14:14:22 kls Exp $
+# $Id: i18n-to-gettext.pl 1.6 2007/11/04 10:57:36 kls Exp $
 
 # How to convert an actual plugin:
 #
@@ -306,25 +306,25 @@
 PODIR     = po
 LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<} . $MSGIDBUGS . q{>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<} . $MSGIDBUGS . q{>' -o $@ $^
 
-$(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
 
-i18n: $(I18Npot) $(I18Nmo)
-	@mkdir -p $(LOCALEDIR)
-	for i in $(I18Ndirs); do\
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
-	    done
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs)
 
 };
 
diff --git a/i18n.c b/i18n.c
index da699d97d..a018f238f 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.317 2007/08/24 14:03:47 kls Exp $
+ * $Id: i18n.c 1.318 2007/11/01 10:38:27 kls Exp $
  *
  *
  */
@@ -59,6 +59,7 @@ const char *LanguageCodeList[] = {
   "dan",
   "cze,ces",
   "tur",
+  "ukr",
   NULL
   };
 
diff --git a/menu.c b/menu.c
index 853d1e76e..7b8ce9a22 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.463 2007/10/13 10:10:20 kls Exp $
+ * $Id: menu.c 1.465 2007/11/03 15:02:00 kls Exp $
  */
 
 #include "menu.h"
@@ -251,7 +251,7 @@ void cMenuEditChannel::Setup(void)
 
   // Parameters for all types of sources:
   strn0cpy(name, data.name, sizeof(name));
-  Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name), tr(FileNameChars)));
+  Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name)));
   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
   Add(new cMenuEditIntItem( tr("Vpid"),         &data.vpid,  0, 0x1FFF));
@@ -671,7 +671,7 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
      Add(new cMenuEditBitItem( tr("VPS"),          &data.flags, tfVps));
      Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
-     Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file), tr(FileNameChars)));
+     Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file)));
      SetFirstDayItem();
      }
   Timers.IncBeingEdited();
@@ -2107,6 +2107,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
+       case kPlay:
        case kOk:     return Play();
        case kRed:    return (helpKeys > 1 && RecordingCommands.Count()) ? Commands() : Play();
        case kGreen:  return Rewind();
@@ -2712,7 +2713,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use VPS"),                   &data.UseVps));
   Add(new cMenuEditIntItem( tr("Setup.Recording$VPS margin (s)"),            &data.VpsMargin, 0));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
-  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
+  Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord)));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
diff --git a/menuitems.c b/menuitems.c
index 732aea25e..a7ceef299 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.53 2007/10/13 12:05:37 kls Exp $
+ * $Id: menuitems.c 1.55 2007/11/03 15:01:01 kls Exp $
  */
 
 #include "menuitems.h"
@@ -18,7 +18,7 @@
 
 #define AUTO_ADVANCE_TIMEOUT  1500 // ms before auto advance when entering characters via numeric keys
 
-const char *FileNameChars = trNOOP(" abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@");
+const char *FileNameChars = trNOOP("FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&");
 
 // --- cMenuEditItem ---------------------------------------------------------
 
@@ -256,7 +256,7 @@ cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, co
 {
   value = Value;
   length = Length;
-  allowed = Allowed;
+  allowed = Allowed ? Allowed : tr(FileNameChars);
   pos = -1;
   offset = 0;
   insert = uppercase = false;
@@ -285,7 +285,7 @@ void cMenuEditStrItem::EnterEditMode(void)
      int l = strlen(allowed) + 1;
      allowedUtf8 = new uint[l];
      Utf8ToArray(allowed, allowedUtf8, l);
-     const char *charMap = tr(" 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9");
+     const char *charMap = tr("CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9");
      l = strlen(charMap) + 1;
      charMapUtf8 = new uint[l];
      Utf8ToArray(charMap, charMapUtf8, l);
diff --git a/menuitems.h b/menuitems.h
index 50778b161..21890a3de 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.21 2007/06/08 11:53:37 kls Exp $
+ * $Id: menuitems.h 1.22 2007/11/03 14:59:47 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -101,7 +101,7 @@ class cMenuEditStrItem : public cMenuEditItem {
   void LeaveEditMode(bool SaveValue = false);
   bool InEditMode(void) { return valueUtf8 != NULL; }
 public:
-  cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
+  cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed = NULL);
   ~cMenuEditStrItem();
   virtual eOSState ProcessKey(eKeys Key);
   };
diff --git a/newplugin b/newplugin
index 57d814e86..e025f74fa 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.38 2007/10/14 09:13:17 kls Exp $
+# $Id: newplugin 1.39 2007/11/04 10:42:52 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -131,25 +131,25 @@ DEPFILE = .dependencies
 PODIR     = po
 LOCALEDIR = \$(VDRDIR)/locale
 I18Npo    = \$(wildcard \$(PODIR)/*.po)
-I18Nmo    = \$(addsuffix .mo, \$(foreach file, \$(I18Npo), \$(basename \$(file))))
-I18Ndirs  = \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))
+I18Nmsgs  = \$(addprefix \$(LOCALEDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
 I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$^
 
-\$(I18Npo): \$(I18Npot)
+%.po: \$(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q \$\@ \$<
+	\@touch \$\@
 
-i18n: \$(I18Npot) \$(I18Nmo)
-	\@mkdir -p \$(LOCALEDIR)
-	for i in \$(I18Ndirs); do\\
-	    mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\
-	    cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/vdr-\$(PLUGIN).mo;\\
-	    done
+\$(I18Nmsgs): \$(LOCALEDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
+	\@mkdir -p \$(dir \$@)
+	cp \$< \$\@
+
+.PHONY: i18n
+i18n: \$(I18Nmsgs)
 
 ### Targets:
 
diff --git a/osdbase.h b/osdbase.h
index 032a64ed9..b62b071b9 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.16 2007/06/09 11:49:00 kls Exp $
+ * $Id: osdbase.h 1.17 2007/11/03 14:50:52 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -57,11 +57,11 @@ class cOsdItem : public cListObject {
   cOsdItem(eOSState State = osUnknown);
   cOsdItem(const char *Text, eOSState State = osUnknown, bool Selectable = true);
   virtual ~cOsdItem();
-  bool Selectable(void) { return selectable; }
+  bool Selectable(void) const { return selectable; }
   void SetText(const char *Text, bool Copy = true);
   void SetSelectable(bool Selectable);
   void SetFresh(bool Fresh);
-  const char *Text(void) { return text; }
+  const char *Text(void) const { return text; }
   virtual void Set(void) {}
   virtual eOSState ProcessKey(eKeys Key);
   };
@@ -77,7 +77,7 @@ class cOsdObject {
   cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
   virtual ~cOsdObject() {}
   virtual bool NeedsFastResponse(void) { return needsFastResponse; }
-  bool IsMenu(void) { return isMenu; }
+  bool IsMenu(void) const { return isMenu; }
   virtual void Show(void);
   virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
   };
@@ -124,7 +124,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
   virtual bool NeedsFastResponse(void) { return subMenu ? subMenu->NeedsFastResponse() : cOsdObject::NeedsFastResponse(); }
-  int Current(void) { return current; }
+  int Current(void) const { return current; }
   void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
   virtual void Display(void);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index afef80836..c874f431d 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -872,13 +872,13 @@ msgstr "Proc
 msgid "Editing process already active!"
 msgstr "Proc�s d'edici� iniciat anteriorment!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.#~,/_@�"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&�"
 
 msgid "yes"
 msgstr "s�"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
 msgid "Button$ABC/abc"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index e73471963..cdd5715b8 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -870,14 +870,14 @@ msgstr "Edita
 msgid "Editing process already active!"
 msgstr "Edita�n� proces je ji� aktivn�!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "ano"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/da_DK.po b/po/da_DK.po
index a5e38fa61..b11e105a3 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -870,14 +870,14 @@ msgstr "Redigeringsproces startet"
 msgid "Editing process already active!"
 msgstr "Redigeringsproces er allerede aktiv!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "ja"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/de_DE.po b/po/de_DE.po
index cb5d78d51..621c3fc37 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -870,14 +870,14 @@ msgstr "Schnitt gestartet"
 msgid "Editing process already active!"
 msgstr "Schnitt bereits aktiv!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bcdefghijklmno�pqrs�tu�vwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bcdefghijklmno�pqrs�tu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "ja"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs�7\ttuv�8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/el_GR.po b/po/el_GR.po
index f20481565..1e79779b4 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -870,13 +870,13 @@ msgstr "
 msgid "Editing process already active!"
 msgstr "����������� ��������� �� �������!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " ��������������������������������0123456789-.#~,/_@abcdefghijklmnopqrstuvwxyz"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " ��������������������������������0123456789-.,#~\\^$[]|()*+?{}/:%@&abcdefghijklmnopqrstuvwxyz"
 
 msgid "yes"
 msgstr "���"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
 msgid "Button$ABC/abc"
diff --git a/po/es_ES.po b/po/es_ES.po
index 82cc030db..39450a866 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -870,14 +870,14 @@ msgstr "Proceso de edici
 msgid "Editing process already active!"
 msgstr "�El proceso de edici�n ya est� activo!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "s�"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/et_EE.po b/po/et_EE.po
index fd63f1e28..f8edfc149 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -166,7 +166,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subtiitrid"
 
 msgid "Key$Schedule"
 msgstr "Kava"
@@ -187,31 +187,31 @@ msgid "Key$Commands"
 msgstr "K�sud"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Lisaklahv1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Lisaklahv2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Lisaklahv3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Lisaklahv4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Lisaklahv5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Lisaklahv6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Lisaklahv7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Lisaklahv8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Lisaklahv9"
 
 msgid "Free To Air"
 msgstr "FTA"
@@ -253,10 +253,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -283,7 +283,7 @@ msgid "CoderateH"
 msgstr "CoderateH"
 
 msgid "none"
-msgstr "t�hi"
+msgstr "puudu"
 
 msgid "CoderateL"
 msgstr "CoderateL"
@@ -397,7 +397,7 @@ msgid "Button$Next"
 msgstr "Tulekul"
 
 msgid "Button$Now"
-msgstr "N��d"
+msgstr "Hetkel"
 
 msgid "Button$Schedule"
 msgstr "Ajakava"
@@ -457,7 +457,7 @@ msgid "Recording commands"
 msgstr "Salvestuse k�sud"
 
 msgid "never"
-msgstr "mitte kunagi"
+msgstr "ei"
 
 msgid "skin dependent"
 msgstr "kestast s�ltuv"
@@ -529,10 +529,10 @@ msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanaliinfo esitusaeg (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Kanaliinfo n�itamine"
+msgstr "Kanaliinfo kuvamine"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Kanaliinfo kuvamise ajapiirang"
+msgstr "Kanaliinfo ajapiirang"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Lehek�lje kerimine"
@@ -556,7 +556,7 @@ msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG skaneerimise viide (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG veaparanduse tase"
+msgstr "EPG veaparandustase"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vana EPG viide (min)"
@@ -565,7 +565,7 @@ msgid "Setup.EPG$Set system time"
 msgstr "Kella s�nkroniseerimine"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Kella s�nkroniseerimise transponder"
+msgstr "S�nkroniseerimise transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -588,19 +588,19 @@ msgid "no"
 msgstr "ei"
 
 msgid "names only"
-msgstr "ainult nimed"
+msgstr "nimed"
 
 msgid "PIDs only"
-msgstr "ainult PID-id"
+msgstr "PID-id"
 
 msgid "names and PIDs"
-msgstr "nimi ja PID-id"
+msgstr "nimed ja PID-id"
 
 msgid "add new channels"
-msgstr "uute kanalite lisamine"
+msgstr "kanalite lisamine"
 
 msgid "add new transponders"
-msgstr "uute transponderite lisamine"
+msgstr "transponderite lisamine"
 
 msgid "DVB"
 msgstr "DVB"
@@ -627,22 +627,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio keel"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Subtiitrite kuvamine"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Subtiitrite keeli"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Subtiitri keel"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Subtiitrite nihe"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Subtiitri l�bipaistvus"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Subtiitri tausta l�bipaistvus"
 
 msgid "LNB"
 msgstr "LNB"
@@ -837,13 +837,13 @@ msgid "No audio available!"
 msgstr "Audio k�ttesaamatu!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Subtiitrid v�ljas"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subtiitrid"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Subtiitrid puuduvad"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Ebapiisavalt kettaruumi salvestamise alustamiseks!"
@@ -870,14 +870,14 @@ msgstr "Redigeerimine algas"
 msgid "Editing process already active!"
 msgstr "Redigeerimine juba aktiivne!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abcdefghijklmnopqrs�z�tuvw����xy0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrs�z�tuvw����xy0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "jah"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -904,7 +904,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Redigeerimine aktiive - l�litan v�lja?"
+msgstr "Redigeerimine aktiive - l�litada v�lja?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Salvestamine aktiivne - l�litada v�lja?"
@@ -921,7 +921,7 @@ msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Laiendusmoodul %s �rkab %ld minuti p�rast, j�tkata?"
 
 msgid "Editing - restart anyway?"
-msgstr "Redigeerimine aktiivne - taask�ivitada?"
+msgstr "Redigeerimine aktiivne - restart?"
 
 msgid "Recording - restart anyway?"
 msgstr "Salvestamine aktiivne - restart?"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index da676d07d..6ab26386e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -873,14 +873,14 @@ msgstr "Muokkaus aloitettu"
 msgid "Editing process already active!"
 msgstr "Muokkaus on jo k�ynniss�!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "kyll�"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index d19d62754..de25e8047 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,15 +7,16 @@
 # Nicolas Huillard <nhuillard@e-dition.fr>, 2005
 # Pierre Briec <pbriec@free.fr>, 2006
 # Bruno Roussel <bruno.roussel@free.fr>, 2007
+# Michael Nival <mnival@club-internet.fr>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:29+0200\n"
-"PO-Revision-Date: 2007-08-17 13:45+0200\n"
-"Last-Translator: Bruno Roussel <bruno.roussel@free.fr>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2007-10-18 16:12+0100\n"
+"Last-Translator: Michael Nival <mnival@club-internet.fr>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -171,7 +172,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Sous-Titres"
 
 msgid "Key$Schedule"
 msgstr "Programmes"
@@ -258,10 +259,10 @@ msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Sous-Titre (1)"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Sous-Titre (2)"
 
 msgid "Tpid"
 msgstr "PID T�l�texte"
@@ -632,22 +633,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Langue audio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Afficher les Sous-Titres"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Langues des Sous-Titres"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Langue de Sous-Titre"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Offset du Sous-Titre"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparence de l'avant-plan"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparence du fond"
 
 msgid "LNB"
 msgstr "LNB"
@@ -842,13 +843,13 @@ msgid "No audio available!"
 msgstr "Pas d'audio disponible !"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Pas de Sous-Titres"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Sous-Titres"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Pas de Sous-Titres disponible !"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Espace disque insuffisant pour d�marrer l'enregistrement !"
@@ -875,14 +876,14 @@ msgstr "Op
 msgid "Editing process already active!"
 msgstr "Montage d�j� en cours !"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "oui"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 572cbd433..f0712a0cb 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -871,13 +871,13 @@ msgstr "Rezanje je zapo
 msgid "Editing process already active!"
 msgstr "Ure�ivanje je ve� aktivirano!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "da"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
 msgid "Button$ABC/abc"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index a42dee016..6f8b9add4 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -872,14 +872,14 @@ msgstr "V
 msgid "Editing process already active!"
 msgstr "A v�g�s m�r aktiv�lt!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "igen"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/it_IT.po b/po/it_IT.po
index 2a2ed957f..18eced8bc 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,9 +11,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:29+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Sean Carlos <seanc@libero.it>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2007-10-16 02:15+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Key$Sottotitoli"
 
 msgid "Key$Schedule"
 msgstr "Programmi"
@@ -256,10 +256,10 @@ msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "PID Teletext"
@@ -630,22 +630,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Lingua per l'audio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Setup.DVB$Mostra sottotitoli"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Setup.DVB$Lingue sottotitoli"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Setup.DVB$Lingua sottotitoli"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Setup.DVB$Posizione sottotitolo"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Setup.DVB$Trasparenza primo piano sottotitoli"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Setup.DVB$Trasparenza sfondo sottotitoli"
 
 msgid "LNB"
 msgstr "LNB"
@@ -840,13 +840,13 @@ msgid "No audio available!"
 msgstr "Nessun audio disponibile!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Nessun sottotitolo"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Button$Sottotitoli"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Nessun sottotitolo disponibile!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Spazio su disco insufficiente per registrare!"
@@ -873,14 +873,14 @@ msgstr "Processo di modifica iniziato"
 msgid "Editing process already active!"
 msgstr "Processo di modifica gi� attivo!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "s�"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 449a848ba..c8a9b3687 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -872,13 +872,13 @@ msgstr "Bewerken is gestart"
 msgid "Editing process already active!"
 msgstr "Bewerken is al actief!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@����������"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&����������"
 
 msgid "yes"
 msgstr "ja"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
 msgid "Button$ABC/abc"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 50d75b2c3..806399220 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -871,13 +871,13 @@ msgstr "Redigeringsprosess startet"
 msgid "Editing process already active!"
 msgstr "Redigeringsprosessen er allerede aktiv!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
 msgid "yes"
 msgstr "ja"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
 msgid "Button$ABC/abc"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 426ea3715..966384087 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -870,14 +870,14 @@ msgstr "Proces edycji rozpocz
 msgid "Editing process already active!"
 msgstr "Proces edycji jest ju� aktywny!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "tak"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 650f8733d..8439538f9 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -870,13 +870,13 @@ msgstr "Processo de modifica
 msgid "Editing process already active!"
 msgstr "Processo de modifica��o j� activo!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
 msgid "yes"
 msgstr "sim"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
 msgid "Button$ABC/abc"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 207c73c70..52b34521c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -871,14 +871,14 @@ msgstr "Montajul 
 msgid "Editing process already active!"
 msgstr "Montajul �nregistr�rii este deja activ!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "da"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f1a0f883f..f752e0e86 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -870,14 +870,14 @@ msgstr "
 msgid "Editing process already active!"
 msgstr "������� ������������ ��� �������!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "��"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
 
 msgid "Button$ABC/abc"
 msgstr "���/���"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index e45c6d9ab..da1de4de7 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -871,14 +871,14 @@ msgstr "Urejanje se je za
 msgid "Editing process already active!"
 msgstr "Urejanje je �e aktivno!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abc�defghijklmnopqrs�tuvwxyz�0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abc�defghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "da"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index bc879a19c..cde4ca7d5 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -871,14 +871,14 @@ msgstr "Redigeringen startar"
 msgid "Editing process already active!"
 msgstr "Redigeringen �r redan aktiv!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "ja"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 3036d13ae..461a3229f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -870,14 +870,14 @@ msgstr "Kesim ba
 msgid "Editing process already active!"
 msgstr "Kesim hen�z aktif!"
 
-msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
-msgstr " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.#~,/_@"
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "evet"
 
-msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9"
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/uk_UA.po b/po/uk_UA.po
new file mode 100644
index 000000000..fdddc9018
--- /dev/null
+++ b/po/uk_UA.po
@@ -0,0 +1,999 @@
+# VDR language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.10\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-11-01 11:36+0100\n"
+"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "*** Invalid Channel ***"
+msgstr "*** ������������ ����� ***"
+
+msgid "Channel not available!"
+msgstr "����� �����������!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "��������� �������� ����� ��������!"
+
+msgid "Starting EPG scan"
+msgstr "������� EPG-����������"
+
+msgid "No title"
+msgstr "��� �����"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "����������"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "ukr"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "���� 1: ���������� ���� ���� ������"
+
+msgid "Press any key on the RC unit"
+msgstr "��������� ����-��� ������ �� ������"
+
+msgid "RC code detected!"
+msgstr "��������� ��� ������!"
+
+msgid "Do not press any key..."
+msgstr "�� ���������� ������..."
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "���� 2: ������������ ����� ��� ����������� ������"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "��������� ������ '%s'"
+
+msgid "Press 'Up' to confirm"
+msgstr "��������� '�����' ��� �������������"
+
+msgid "Press 'Down' to continue"
+msgstr "��������� '����' ��� �����������"
+
+msgid "(press 'Up' to go back)"
+msgstr "(��������� '�����' ��� ����������)"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "(��������� '����' ��� ���������� ��������� ������)"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "(��������� '����' ��� ���������� ������)"
+
+msgid "Learning Remote Control Keys"
+msgstr "�������� ������"
+
+msgid "Phase 3: Saving key codes"
+msgstr "���� 3: �����'���������� ����� ������"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "��������� '�����' ��� ����������, '����' ��� �������"
+
+msgid "Key$Up"
+msgstr "�����"
+
+msgid "Key$Down"
+msgstr "����"
+
+msgid "Key$Menu"
+msgstr "����"
+
+msgid "Key$Ok"
+msgstr "Ok"
+
+msgid "Key$Back"
+msgstr "�����"
+
+msgid "Key$Left"
+msgstr "������"
+
+msgid "Key$Right"
+msgstr "�������"
+
+msgid "Key$Red"
+msgstr "�������"
+
+msgid "Key$Green"
+msgstr "������"
+
+msgid "Key$Yellow"
+msgstr "�����"
+
+msgid "Key$Blue"
+msgstr "����"
+
+msgid "Key$Info"
+msgstr "����"
+
+msgid "Key$Play"
+msgstr "�����������"
+
+msgid "Key$Pause"
+msgstr "�����"
+
+msgid "Key$Stop"
+msgstr "����"
+
+msgid "Key$Record"
+msgstr "�����"
+
+msgid "Key$FastFwd"
+msgstr "��������� ������"
+
+msgid "Key$FastRew"
+msgstr "��������� �����"
+
+msgid "Key$Next"
+msgstr "������"
+
+msgid "Key$Prev"
+msgstr "�����"
+
+msgid "Key$Power"
+msgstr "���������"
+
+msgid "Key$Channel+"
+msgstr "����� +"
+
+msgid "Key$Channel-"
+msgstr "����� -"
+
+msgid "Key$PrevChannel"
+msgstr "���������� �����"
+
+msgid "Key$Volume+"
+msgstr "�������� +"
+
+msgid "Key$Volume-"
+msgstr "�������� -"
+
+msgid "Key$Mute"
+msgstr "��������� ����"
+
+msgid "Key$Audio"
+msgstr "����"
+
+msgid "Key$Subtitles"
+msgstr "��������"
+
+msgid "Key$Schedule"
+msgstr "�������"
+
+msgid "Key$Channels"
+msgstr "������"
+
+msgid "Key$Timers"
+msgstr "�������"
+
+msgid "Key$Recordings"
+msgstr "������"
+
+msgid "Key$Setup"
+msgstr "������������"
+
+msgid "Key$Commands"
+msgstr "�������"
+
+msgid "Key$User1"
+msgstr ""
+
+msgid "Key$User2"
+msgstr ""
+
+msgid "Key$User3"
+msgstr ""
+
+msgid "Key$User4"
+msgstr ""
+
+msgid "Key$User5"
+msgstr ""
+
+msgid "Key$User6"
+msgstr ""
+
+msgid "Key$User7"
+msgstr ""
+
+msgid "Key$User8"
+msgstr ""
+
+msgid "Key$User9"
+msgstr ""
+
+msgid "Free To Air"
+msgstr "FTA (������������)"
+
+msgid "encrypted"
+msgstr "����������"
+
+msgid "auto"
+msgstr "����"
+
+msgid "Edit channel"
+msgstr "������������ ������"
+
+msgid "Name"
+msgstr "�����"
+
+msgid "Source"
+msgstr "�������"
+
+msgid "Frequency"
+msgstr "�������"
+
+msgid "Vpid"
+msgstr "Vpid (�����)"
+
+msgid "Ppid"
+msgstr "Ppid"
+
+msgid "Apid1"
+msgstr "Apid1 (����� 1)"
+
+msgid "Apid2"
+msgstr "Apid2 (����� 2)"
+
+msgid "Dpid1"
+msgstr "Dpid1 (AC3 1)"
+
+msgid "Dpid2"
+msgstr "Dpid2 (AC3 2)"
+
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
+msgid "Tpid"
+msgstr "Tpid (���������)"
+
+msgid "CA"
+msgstr "CA (�������)"
+
+msgid "Sid"
+msgstr "Sid"
+
+msgid "Polarization"
+msgstr "�����������"
+
+msgid "Srate"
+msgstr "����. ���������"
+
+msgid "Inversion"
+msgstr "��������"
+
+msgid "off"
+msgstr "����"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "none"
+msgstr "������"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "���������"
+
+msgid "Bandwidth"
+msgstr "��������"
+
+msgid "Transmission"
+msgstr "��������"
+
+msgid "Guard"
+msgstr "������"
+
+msgid "Hierarchy"
+msgstr "��������"
+
+msgid "Channel settings are not unique!"
+msgstr "��������� ������ �� �����!"
+
+msgid "Channels"
+msgstr "������"
+
+msgid "Button$Edit"
+msgstr "�����������"
+
+msgid "Button$New"
+msgstr "������"
+
+msgid "Button$Delete"
+msgstr "��������"
+
+msgid "Button$Mark"
+msgstr "�����������"
+
+msgid "Channel is being used by a timer!"
+msgstr "����� ������� ��������!"
+
+msgid "Delete channel?"
+msgstr "�������� �����?"
+
+msgid "Edit timer"
+msgstr "������������ �������"
+
+msgid "Active"
+msgstr "����������"
+
+msgid "Channel"
+msgstr "�����"
+
+msgid "Day"
+msgstr "����"
+
+msgid "Start"
+msgstr "�������"
+
+msgid "Stop"
+msgstr "������"
+
+msgid "VPS"
+msgstr "VPS ��������"
+
+msgid "Priority"
+msgstr "���������"
+
+msgid "Lifetime"
+msgstr "����� ����������"
+
+msgid "File"
+msgstr "����"
+
+msgid "First day"
+msgstr "������ ����"
+
+msgid "Timers"
+msgstr "�������"
+
+msgid "Button$On/Off"
+msgstr "���/����"
+
+msgid "Button$Info"
+msgstr "����"
+
+msgid "Delete timer?"
+msgstr "�������� ������?"
+
+msgid "Timer still recording - really delete?"
+msgstr "��� ����� �� ������� - ������ ��������?"
+
+msgid "Event"
+msgstr "��������"
+
+msgid "Button$Timer"
+msgstr "������"
+
+msgid "Button$Record"
+msgstr "�����"
+
+msgid "Button$Switch"
+msgstr "�����������"
+
+msgid "What's on now?"
+msgstr "����� � �����:"
+
+msgid "What's on next?"
+msgstr "���� � ��������:"
+
+msgid "Button$Next"
+msgstr "����"
+
+msgid "Button$Now"
+msgstr "�����"
+
+msgid "Button$Schedule"
+msgstr "��������"
+
+msgid "Can't switch channel!"
+msgstr "��������� ����������� �����!"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "�������� - %s"
+
+#, c-format
+msgid "This event - %s"
+msgstr "�� �������� - %s"
+
+msgid "This event - all channels"
+msgstr "�� �������� - ��� ������"
+
+msgid "All events - all channels"
+msgstr "��� �������� - ��� ������"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "��������� %d �����"
+
+msgid "CAM not responding!"
+msgstr "CAM �� ����������"
+
+msgid "Recording info"
+msgstr "��� �����"
+
+msgid "Button$Play"
+msgstr "����������"
+
+msgid "Button$Rewind"
+msgstr "�����"
+
+msgid "Recordings"
+msgstr "������"
+
+msgid "Button$Open"
+msgstr "��������"
+
+msgid "Commands"
+msgstr "�������"
+
+msgid "Error while accessing recording!"
+msgstr "������� ������� �� ������!"
+
+msgid "Delete recording?"
+msgstr "������� �����?"
+
+msgid "Error while deleting recording!"
+msgstr "������� ��������� ������!"
+
+msgid "Recording commands"
+msgstr "������� ������"
+
+msgid "never"
+msgstr "������"
+
+msgid "skin dependent"
+msgstr "������ � ������"
+
+msgid "always"
+msgstr "������"
+
+msgid "OSD"
+msgstr "����"
+
+msgid "Setup.OSD$Language"
+msgstr "����"
+
+msgid "Setup.OSD$Skin"
+msgstr "�����"
+
+msgid "Setup.OSD$Theme"
+msgstr "����"
+
+msgid "Setup.OSD$Left"
+msgstr "������� �����"
+
+msgid "Setup.OSD$Top"
+msgstr "������� ������"
+
+msgid "Setup.OSD$Width"
+msgstr "������"
+
+msgid "Setup.OSD$Height"
+msgstr "������"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "���������� ������ ����������� (���)"
+
+msgid "Setup.OSD$Use small font"
+msgstr "��������������� ����� �����"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "������������ �������"
+
+msgid "Setup.OSD$Default font"
+msgstr "����������� ����"
+
+msgid "Setup.OSD$Small font"
+msgstr "����� ����"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "���������� ����"
+
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr "������ ����� ��� ���� (pixel)"
+
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr "������ ������ ����� (pixel)"
+
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr "������ ����������� ����� (pixel)"
+
+msgid "Setup.OSD$Channel info position"
+msgstr "��������� ����� ���������� ��� �����"
+
+msgid "bottom"
+msgstr "�����"
+
+msgid "top"
+msgstr "������"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "����� ���������� ��� ����� (���)"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "���������� ���������� ��� �����"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "���������� ��� ����� �������"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "��������� �������� ����"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "�������� ���������"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "������ ���� �������"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "�������� ���������� �������"
+
+msgid "EPG"
+msgstr "�������"
+
+msgid "Button$Scan"
+msgstr "�����������"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "�������� ���������� �������� (�)"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "������ �������� �������"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "���������� ���������� ����� (��)"
+
+msgid "Setup.EPG$Set system time"
+msgstr "��������� �������� ���"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "����������� ��� ������������"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "������ ���� (�������)"
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "�������"
+
+msgid "pan&scan"
+msgstr "������������"
+
+msgid "letterbox"
+msgstr "����������"
+
+msgid "center cut out"
+msgstr "�������� �����"
+
+msgid "no"
+msgstr "��"
+
+msgid "names only"
+msgstr "������ �����"
+
+msgid "PIDs only"
+msgstr "������ PID�"
+
+msgid "names and PIDs"
+msgstr "����� � PID�"
+
+msgid "add new channels"
+msgstr "������ ���� ������"
+
+msgid "add new transponders"
+msgstr "������ ���� ������������"
+
+msgid "DVB"
+msgstr "DVB"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "�������� DVB-��������"
+
+msgid "Setup.DVB$Video format"
+msgstr "������ �����"
+
+msgid "Setup.DVB$Video display format"
+msgstr "������������ ����������"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "�������� Dolby Digital"
+
+msgid "Setup.DVB$Update channels"
+msgstr "���������� ��������� �������"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "������ ���� (����)"
+
+msgid "Setup.DVB$Audio language"
+msgstr "�������"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "���������� ��������"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "���� ���������"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "���� ���������"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "������� ���������"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr ""
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr ""
+
+msgid "LNB"
+msgstr "���������"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "��������������� DiSEqC"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "������� ������������ (SLOF) (���)"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "����� ������� ���������� (���)"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "������ ������� ���������� (���)"
+
+msgid "CAM reset"
+msgstr "���������������� CAM"
+
+msgid "CAM present"
+msgstr "CAM ���������"
+
+msgid "CAM ready"
+msgstr "CAM �������"
+
+msgid "CAM"
+msgstr "������� ������"
+
+msgid "Button$Menu"
+msgstr "����"
+
+msgid "Button$Reset"
+msgstr "�������"
+
+msgid "Opening CAM menu..."
+msgstr "��������� ���� ������ �������� ������� (CAM)"
+
+msgid "Can't open CAM menu!"
+msgstr "���� CAM-������ ����������!"
+
+msgid "CAM is in use - really reset?"
+msgstr "CAM ���������������� - ������ ���������������?"
+
+msgid "Can't reset CAM!"
+msgstr "������� ����������� CAM-������!"
+
+msgid "Recording"
+msgstr "�����"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "������������ ������� ������ (��)"
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "���������� ������� ������ (��)"
+
+msgid "Setup.Recording$Primary limit"
+msgstr "���. ��������� ���������� ���. ��������"
+
+msgid "Setup.Recording$Default priority"
+msgstr "��������� ������� �� ������������"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "����� ���������� ������ �� ������������ (�)"
+
+msgid "Setup.Recording$Pause priority"
+msgstr "��������� ������������ ���������"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "���������� ������������ ��������� (�)"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "��������� ����� �� ��������"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "��������������� ������� VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "�������� ��� VPS (���)"
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "��������� �������� ������ ������"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "����� ����������� ������ �������"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "����������� ������� ������ (��)"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "����. ������ ���������� (��)"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "������ �������������� �����"
+
+msgid "Replay"
+msgstr "��������"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "���������������� �����"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "���������� ����� ���������"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "ID ���������"
+
+msgid "Miscellaneous"
+msgstr "�����"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "���. ��� ���������� ����� (��)"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "���. ��� ���������� ����� (��)"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "��������� ������ �'������� SVDRP (���)"
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "�������� ������������ ������ (���)"
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "�������� ���� ��� ������������ ������ (ms)"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "����� ��� ���������"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "�� ������"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "�������� ��� ���������"
+
+msgid "Plugins"
+msgstr "������ ����������"
+
+msgid "This plugin has no setup parameters!"
+msgstr "������ �� ��� ���������� �����������!"
+
+msgid "Setup"
+msgstr "������������"
+
+msgid "Restart"
+msgstr "�������������"
+
+msgid "Really restart?"
+msgstr "������ �������������?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr " �������� ����� "
+
+msgid "Schedule"
+msgstr "�������"
+
+msgid "VDR"
+msgstr "VDR"
+
+msgid "Disk"
+msgstr "����"
+
+msgid "free"
+msgstr "������"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr " �������� �����������"
+
+msgid "Button$Audio"
+msgstr "����"
+
+msgid "Button$Pause"
+msgstr "�����"
+
+msgid "Button$Stop"
+msgstr "����"
+
+msgid "Button$Resume"
+msgstr "����������"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr " ��������� ������ ������"
+
+msgid "Stop recording?"
+msgstr "��������� �����?"
+
+msgid "Cancel editing?"
+msgstr "��������� ������������?"
+
+msgid "No audio available!"
+msgstr "��������� ����!"
+
+msgid "No subtitles"
+msgstr "����� ���������"
+
+msgid "Button$Subtitles"
+msgstr "��������"
+
+msgid "No subtitles available!"
+msgstr "��������� �����!"
+
+msgid "Not enough disk space to start recording!"
+msgstr "����������� ����� �� ����� ��� ������� ������"
+
+msgid "No free DVB device to record!"
+msgstr "����� �������� DVB-�������� ��� ������!"
+
+msgid "Pausing live video..."
+msgstr "����� ������������ ���������..."
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "�������: "
+
+msgid "No editing marks defined!"
+msgstr "�� ������ ����� ��� �������!"
+
+msgid "Can't start editing process!"
+msgstr "��������� ������ ������ ������!"
+
+msgid "Editing process started"
+msgstr "������ ������ �������"
+
+msgid "Editing process already active!"
+msgstr "������ ������������ ��� ���������!"
+
+#, fuzzy
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz�����������������������������������0123456789-.#~,/_@"
+
+msgid "yes"
+msgstr "���"
+
+#, fuzzy
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.#~,/_@1\tabc����2\tdef������3\tghi������4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
+
+msgid "Button$ABC/abc"
+msgstr "���/���"
+
+msgid "Button$Overwrite"
+msgstr "������"
+
+msgid "Button$Insert"
+msgstr "�������"
+
+msgid "Plugin"
+msgstr "������"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "���������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\""
+
+msgid "Channel locked (recording)!"
+msgstr "����� ����������� (��� �����)!"
+
+msgid "Low disk space!"
+msgstr "����������� ����� �� �����!"
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "����������� ��������� - �� ������ �������� '-s'!"
+
+msgid "Editing - shut down anyway?"
+msgstr "��� ������ - ������ ���������?"
+
+msgid "Recording - shut down anyway?"
+msgstr "��� ����� - ������ ���������?"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "����� %ld ������ ��������� ����� - ������ ���������?"
+
+msgid "shut down anyway?"
+msgstr "������ ���������?"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Plugin %s ���������� ����� %ld ������ - ����������?"
+
+msgid "Editing - restart anyway?"
+msgstr "������ ������� - ������ �������������?"
+
+msgid "Recording - restart anyway?"
+msgstr "��� ����� - ������ �������������?"
+
+msgid "restart anyway?"
+msgstr "������ �������������?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "�������� "
+
+msgid "Classic VDR"
+msgstr "���������"
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG ������"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr "���ǿ��"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr "��ݲ�������ҿ����ѽ��"
+
+msgid "Monday"
+msgstr "���������"
+
+msgid "Tuesday"
+msgstr "��������"
+
+msgid "Wednesday"
+msgstr "������"
+
+msgid "Thursday"
+msgstr "������"
+
+msgid "Friday"
+msgstr "�'������"
+
+msgid "Saturday"
+msgstr "������"
+
+msgid "Sunday"
+msgstr "������"
+
+msgid "Upcoming VPS recording!"
+msgstr "VPS-����� ����� ���������"
+
+msgid "Recording started"
+msgstr "����� �������"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR ����������� �������� - ��������� Power ��� ������������"
+
+msgid "Press any key to cancel shutdown"
+msgstr "��������� ����-��� ������ ��� ������� ����������."
+
+msgid "Switching primary DVB..."
+msgstr "����� ��������� DVB-��������..."
+
+msgid "Editing process failed!"
+msgstr "������� ��� ��� ������� ������!"
+
+msgid "Editing process finished"
+msgstr "������ ���������"
+
+msgid "Press any key to cancel restart"
+msgstr "��������� ����-��� ������ ��� ������� ����������������"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR ����������� ����� %s ������"
diff --git a/recording.c b/recording.c
index 51846114b..7999f7241 100644
--- a/recording.c
+++ b/recording.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.156 2007/10/14 10:21:54 kls Exp $
+ * $Id: recording.c 1.157 2007/11/04 11:17:43 kls Exp $
  */
 
 #include "recording.h"
+#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -448,12 +449,14 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                 case '/': *p = '~'; break;
                 // encoded characters:
                 case '#': {
-                     if (strlen(p) > 2) {
+                     if (strlen(p) > 2 && isxdigit(*(p + 1)) && isxdigit(*(p + 2))) {
                         char buf[3];
                         sprintf(buf, "%c%c", *(p + 1), *(p + 2));
                         unsigned char c = strtol(buf, NULL, 16);
-                        *p = c;
-                        memmove(p + 1, p + 3, strlen(p) - 2);
+                        if (c) {
+                           *p = c;
+                           memmove(p + 1, p + 3, strlen(p) - 2);
+                           }
                         }
                      }
                      break;
diff --git a/remux.c b/remux.c
index aed382986..78c86fdd2 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.59 2007/09/22 12:08:22 kls Exp $
+ * $Id: remux.c 1.60 2007/11/03 14:18:07 kls Exp $
  */
 
 #include "remux.h"
@@ -1427,6 +1427,7 @@ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
 #define MMAX_PLENGTH (64*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland or HDTV 1920x1080
 
 #define IPACKS 2048
+#define SUBTITLE_PACKS  KILOBYTE(32)
 
 // Start codes:
 #define SC_SEQUENCE 0xB3  // "sequence header code"
@@ -1911,7 +1912,7 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   if (SPids) {
      int n = 0;
      while (*SPids && numTracks < MAXTRACKS && n < MAXSPIDS)
-           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, IPACKS, 0x00, 0x20 + n++);
+           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, SUBTITLE_PACKS, 0x00, 0x20 + n++);
      }
 }
 
@@ -2009,7 +2010,7 @@ int cRemux::Put(const uchar *Data, int Count)
          break;
       if (Data[i] != TS_SYNC_BYTE)
          break;
-      if (resultBuffer->Free() < 2 * IPACKS)
+      if (resultBuffer->Free() < SUBTITLE_PACKS)
          break; // A cTS2PES might write one full packet and also a small rest
       int pid = GetPid(Data + i + 1);
       if (Data[i + 3] & 0x10) { // got payload
diff --git a/shutdown.c b/shutdown.c
index 4029a78c1..4fde54403 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 1.1 2007/02/24 17:24:11 kls Exp $
+ * $Id: shutdown.c 1.2 2007/10/19 14:33:40 kls Exp $
  */
 
 #include "shutdown.h"
@@ -110,9 +110,11 @@ void cShutdownHandler::CheckManualStart(int ManualStart)
      // Set inactive after MinUserInactivity
      SetUserInactiveTimeout();
      }
-  else
+  else {
      // Set inactive from now on
+     dsyslog("scheduled wakeup time in %ld minutes, assuming automatic start of VDR", Delta / 60);
      SetUserInactive();
+     }
 }
 
 void cShutdownHandler::SetShutdownCommand(const char *ShutdownCommand)
@@ -126,8 +128,13 @@ void cShutdownHandler::CallShutdownCommand(time_t WakeupTime, int Channel, const
   time_t Delta = WakeupTime ? WakeupTime - time(NULL) : 0;
   cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\"$"), UserShutdown);
   isyslog("executing '%s'", *cmd);
-  if (SystemExec(cmd, true) == 0)
+  int Status = SystemExec(cmd, true);
+  if (!WIFEXITED(Status) || WEXITSTATUS(Status))
+     esyslog("SystemExec() failed with status %d", Status);
+  else {
      Setup.NextWakeupTime = WakeupTime; // Remember this wakeup time for comparison on reboot
+     Setup.Save();
+     }
 }
 
 void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force)
diff --git a/thread.c b/thread.c
index a0647d0ea..958312426 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.62 2007/08/24 13:15:48 kls Exp $
+ * $Id: thread.c 1.63 2007/10/19 14:30:13 kls Exp $
  */
 
 #include "thread.h"
@@ -518,7 +518,7 @@ int SystemExec(const char *Command, bool Detached)
      if (Detached) {
         // Fork again and let first child die - grandchild stays alive without parent
         if (fork() > 0)
-           exit(0);
+           _exit(0);
         // Start a new session
         pid_t sid = setsid();
         if (sid < 0)
diff --git a/tools.c b/tools.c
index bbbcf82f3..ba7b0cf90 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.136 2007/10/13 12:00:21 kls Exp $
+ * $Id: tools.c 1.137 2007/11/03 15:34:07 kls Exp $
  */
 
 #include "tools.h"
@@ -896,7 +896,7 @@ cString DayDateTime(time_t t)
      time(&t);
   struct tm tm_r;
   tm *tm = localtime_r(&t, &tm_r);
-  snprintf(buffer, sizeof(buffer), "%s %02d.%02d %02d:%02d", *WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
+  snprintf(buffer, sizeof(buffer), "%s %02d.%02d. %02d:%02d", *WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
   return buffer;
 }
 
diff --git a/vdr.c b/vdr.c
index b22dec3ca..a4e6e1f46 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.300 2007/08/26 14:36:48 kls Exp $
+ * $Id: vdr.c 1.302 2007/11/03 14:46:29 kls Exp $
  */
 
 #include <getopt.h>
@@ -181,6 +181,7 @@ int main(int argc, char *argv[])
 
 #define DEFAULTSVDRPPORT 2001
 #define DEFAULTWATCHDOG     0 // seconds
+#define DEFAULTCONFDIR CONFDIR
 #define DEFAULTPLUGINDIR PLUGINDIR
 #define DEFAULTEPGDATAFILENAME "epg.data"
 
@@ -382,8 +383,7 @@ int main(int argc, char *argv[])
      if (DisplayHelp) {
         printf("Usage: vdr [OPTIONS]\n\n"          // for easier orientation, this is column 80|
                "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
-               "  -c DIR,   --config=DIR   read config files from DIR (default is to read them\n"
-               "                           from the video directory)\n"
+               "  -c DIR,   --config=DIR   read config files from DIR (default: %s)\n"
                "  -d,       --daemon       run in daemon mode\n"
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
                "                           there may be several -D options (default: all DVB\n"
@@ -425,6 +425,7 @@ int main(int argc, char *argv[])
                "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                "                           seconds (default: %d); '0' disables the watchdog\n"
                "\n",
+               DEFAULTCONFDIR,
                DEFAULTEPGDATAFILENAME,
                DEFAULTPLUGINDIR,
                LIRC_DEVICE,
@@ -523,6 +524,7 @@ int main(int argc, char *argv[])
   int PreviousChannel[2] = { 1, 1 };
   int PreviousChannelIndex = 0;
   time_t LastChannelChanged = time(NULL);
+  time_t LastInteract = 0;
   int MaxLatencyTime = 0;
   bool InhibitEpgScan = false;
   bool IsInfoMenu = false;
@@ -536,7 +538,7 @@ int main(int argc, char *argv[])
   // Configuration data:
 
   if (!ConfigDirectory)
-     ConfigDirectory = CONFDIR;
+     ConfigDirectory = DEFAULTCONFDIR;
 
   cPlugin::SetConfigDirectory(ConfigDirectory);
   cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
@@ -1069,6 +1071,7 @@ int main(int argc, char *argv[])
           }
         Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
         if (Interact) {
+           LastInteract = Now;
            eOSState state = Interact->ProcessKey(key);
            if (state == osUnknown && Interact != cControl::Control()) {
               if (ISMODELESSKEY(key) && cControl::Control()) {
@@ -1195,7 +1198,7 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Handle housekeeping tasks
 
            // Shutdown:

From 29b2d48bb53df75f1cb978e72bc709a6658d6e5c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 18 Nov 2007 18:00:00 +0100
Subject: [PATCH 178/307] Version 1.5.12 - Fixed assembling PS1 packets in
 cTS2PES::instant_repack() (thanks to Reinhard   Nissl). - Updated the Russian
 OSD texts (thanks to Oleg Roitburd). - Fixed handling small PES packets that
 caused subtitles to be displayed late   in live mode (based on a patch from
 Reinhard Nissl). - Fixed stopping live subtitles when a player is attached to
 the device. - Fixed suddenly stopping subtitles in live mode.

---
 CONTRIBUTORS |  3 +++
 HISTORY      | 10 ++++++++++
 config.h     | 10 +++++-----
 device.c     |  4 +++-
 po/ru_RU.po  | 49 +++++++++++++++++++++++++------------------------
 remux.c      | 36 +++++++++++++++++++++++++++++-------
 ringbuffer.c | 18 +++++++++++-------
 ringbuffer.h |  9 ++++++++-
 8 files changed, 94 insertions(+), 45 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e49400a46..60a99e72b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1149,6 +1149,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for adding a debug error message to cReceiver::~cReceiver() in case it is still
  attached to a device
  for reporting a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice()
+ for fixing assembling PS1 packets in cTS2PES::instant_repack()
+ for a patch that was used to fix handling small PES packets that caused subtitles
+ to be displayed late in live mode
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
diff --git a/HISTORY b/HISTORY
index 6984bbd46..7379bd10c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5518,3 +5518,13 @@ Video Disk Recorder Revision History
   Kirchgatterer).
 - Fixed decoding filename characters in case there are not two hex digits after
   the '#' (reported by Helmut Auer).
+
+2007-11-18: Version 1.5.12
+
+- Fixed assembling PS1 packets in cTS2PES::instant_repack() (thanks to Reinhard
+  Nissl).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Fixed handling small PES packets that caused subtitles to be displayed late
+  in live mode (based on a patch from Reinhard Nissl).
+- Fixed stopping live subtitles when a player is attached to the device.
+- Fixed suddenly stopping subtitles in live mode.
diff --git a/config.h b/config.h
index 02f1b53d7..9ecda2778 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.300 2007/10/17 18:34:17 kls Exp $
+ * $Id: config.h 1.301 2007/11/10 13:38:19 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.11"
-#define VDRVERSNUM   10511  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.12"
+#define VDRVERSNUM   10512  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.11"
-#define APIVERSNUM   10511  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.12"
+#define APIVERSNUM   10512  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index b8e5a8f55..84473af09 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.147 2007/11/03 13:30:09 kls Exp $
+ * $Id: device.c 1.148 2007/11/17 15:39:28 kls Exp $
  */
 
 #include "device.h"
@@ -1148,6 +1148,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (CanReplay()) {
      if (player)
         Detach(player);
+     DELETENULL(liveSubtitle);
+     DELETENULL(dvbSubtitleConverter);
      pesAssembler->Reset();
      player = Player;
      if (!Transferring())
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f752e0e86..6e4f41ac4 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2,15 +2,16 @@
 # Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
+# Oleg Roitburd <oleg@roitburd.de>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:29+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2007-11-05 14:24+0100\n"
+"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,7 +167,7 @@ msgid "Key$Audio"
 msgstr "����"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "��������"
 
 msgid "Key$Schedule"
 msgstr "�������"
@@ -187,31 +188,31 @@ msgid "Key$Commands"
 msgstr "�������"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "������������1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "������������2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "������������3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "������������4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "������������5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "������������6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "������������7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "������������8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "������������9"
 
 msgid "Free To Air"
 msgstr "FTA (��������������)"
@@ -253,10 +254,10 @@ msgid "Dpid2"
 msgstr "Dpid2 (AC3 2)"
 
 msgid "Spid1"
-msgstr ""
+msgstr "�������� ���1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "�������� ���2"
 
 msgid "Tpid"
 msgstr "Tpid (���������)"
@@ -627,22 +628,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "������"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "���������� ��������"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "����� ���������"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "���� ���������"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "����� ���������"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "������������ ��������� ����� ���������"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "������������ ���� ���������"
 
 msgid "LNB"
 msgstr "���������"
@@ -837,13 +838,13 @@ msgid "No audio available!"
 msgstr "����������� ����!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "��� ���������"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "��������"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "�������� ����������!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "������������ ����� �� ����� ��� ������ ������"
diff --git a/remux.c b/remux.c
index 78c86fdd2..e265c40f8 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.60 2007/11/03 14:18:07 kls Exp $
+ * $Id: remux.c 1.63 2007/11/18 14:45:28 kls Exp $
  */
 
 #include "remux.h"
@@ -1427,7 +1427,6 @@ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
 #define MMAX_PLENGTH (64*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland or HDTV 1920x1080
 
 #define IPACKS 2048
-#define SUBTITLE_PACKS  KILOBYTE(32)
 
 // Start codes:
 #define SC_SEQUENCE 0xB3  // "sequence header code"
@@ -1750,13 +1749,13 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
        case VIDEO_STREAM_S ... VIDEO_STREAM_E:
        case PRIVATE_STREAM1:
 
-            if (mpeg == 2 && found == 9) {
+            if (mpeg == 2 && found == 9 && count < found) { // make sure to not write the data twice by looking at count
                write_ipack(&flag1, 1);
                write_ipack(&flag2, 1);
                write_ipack(&hlength, 1);
                }
 
-            if (mpeg == 1 && found == mpeg1_required) {
+            if (mpeg == 1 && found == mpeg1_required && count < found) { // make sure to not write the data twice by looking at count
                write_ipack(&flag1, 1);
                if (mpeg1_required > 7) {
                   write_ipack(&flag2, 1);
@@ -1870,6 +1869,29 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
      instant_repack(Buf + 4 + off, TS_SIZE - 4 - off);
 }
 
+// --- cRingBufferLinearPes --------------------------------------------------
+
+class cRingBufferLinearPes : public cRingBufferLinear {
+protected:
+  virtual int DataReady(const uchar *Data, int Count);
+public:
+  cRingBufferLinearPes(int Size, int Margin = 0, bool Statistics = false, const char *Description = NULL)
+  :cRingBufferLinear(Size, Margin, Statistics, Description) {}
+  };
+
+int cRingBufferLinearPes::DataReady(const uchar *Data, int Count)
+{
+  int c = cRingBufferLinear::DataReady(Data, Count);
+  if (!c && Count >= 6) {
+     if (!Data[0] && !Data[1] && Data[2] == 0x01) {
+        int Length = 6 + Data[4] * 256 + Data[5];
+        if (Length <= Count)
+           return Length;
+        }
+     }
+  return c;
+}
+
 // --- cRemux ----------------------------------------------------------------
 
 #define RESULTBUFFERSIZE KILOBYTE(256)
@@ -1883,7 +1905,7 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   skipped = 0;
   numTracks = 0;
   resultSkipped = 0;
-  resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
+  resultBuffer = new cRingBufferLinearPes(RESULTBUFFERSIZE, IPACKS, false, "Result");
   resultBuffer->SetTimeouts(0, 100);
   if (VPid)
 #define TEST_cVideoRepacker
@@ -1912,7 +1934,7 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   if (SPids) {
      int n = 0;
      while (*SPids && numTracks < MAXTRACKS && n < MAXSPIDS)
-           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, SUBTITLE_PACKS, 0x00, 0x20 + n++);
+           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, IPACKS, 0x00, 0x20 + n++);
      }
 }
 
@@ -2010,7 +2032,7 @@ int cRemux::Put(const uchar *Data, int Count)
          break;
       if (Data[i] != TS_SYNC_BYTE)
          break;
-      if (resultBuffer->Free() < SUBTITLE_PACKS)
+      if (resultBuffer->Free() < 2 * IPACKS)
          break; // A cTS2PES might write one full packet and also a small rest
       int pid = GetPid(Data + i + 1);
       if (Data[i + 3] & 0x10) { // got payload
diff --git a/ringbuffer.c b/ringbuffer.c
index 0633bd37c..d74706ab4 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.24 2006/06/16 09:32:13 kls Exp $
+ * $Id: ringbuffer.c 1.25 2007/11/17 13:49:34 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -187,6 +187,11 @@ cRingBufferLinear::~cRingBufferLinear()
   free(description);
 }
 
+int cRingBufferLinear::DataReady(const uchar *Data, int Count)
+{
+  return Count >= margin ? Count : 0;
+}
+
 int cRingBufferLinear::Available(void)
 {
   int diff = head - tail;
@@ -284,7 +289,6 @@ int cRingBufferLinear::Put(const uchar *Data, int Count)
 
 uchar *cRingBufferLinear::Get(int &Count)
 {
-  uchar *p = NULL;
   int Head = head;
   if (getThreadTid <= 0)
      getThreadTid = cThread::ThreadId();
@@ -299,13 +303,13 @@ uchar *cRingBufferLinear::Get(int &Count)
   int cont = (diff >= 0) ? diff : Size() + diff - margin;
   if (cont > rest)
      cont = rest;
-  if (cont >= margin) {
-     p = buffer + tail;
+  uchar *p = buffer + tail;
+  if ((cont = DataReady(p, cont)) > 0) {
      Count = gotten = cont;
+     return p;
      }
-  if (!p)
-     WaitForGet();
-  return p;
+  WaitForGet();
+  return NULL;
 }
 
 void cRingBufferLinear::Del(int Count)
diff --git a/ringbuffer.h b/ringbuffer.h
index dba0e6193..f6664cf8f 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.17 2005/12/10 10:54:51 kls Exp $
+ * $Id: ringbuffer.h 1.18 2007/11/17 13:49:34 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -60,6 +60,13 @@ class cRingBufferLinear : public cRingBuffer {
   int gotten;
   uchar *buffer;
   char *description;
+protected:
+  virtual int DataReady(const uchar *Data, int Count);
+    ///< By default a ring buffer has data ready as soon as there are at least
+    ///< 'margin' bytes available. A derived class can reimplement this function
+    ///< if it has other conditions that define when data is ready.
+    ///< The return value is either 0 if there is not yet enough data available,
+    ///< or the number of bytes from the beginning of Data that are "ready".
 public:
   cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false, const char *Description = NULL);
     ///< Creates a linear ring buffer.

From fc4c8740a72e6c7cea5a001e19fdacb63c3cc538 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Jan 2008 18:00:00 +0100
Subject: [PATCH 179/307] =?UTF-8?q?Version=201.5.13=20-=20Fixed=20the=20de?=
 =?UTF-8?q?claration=20of=20cSubtitleObject::Decode8BppCodeString()=20(tha?=
 =?UTF-8?q?nks=20to=20=20=20Gregoire=20Favre).=20-=20The=20new=20setup=20o?=
 =?UTF-8?q?ption=20"Miscellaneous/Emergency=20exit"=20can=20be=20used=20to?=
 =?UTF-8?q?=20turn=20off=20=20=20the=20automatic=20restart=20of=20VDR=20in?=
 =?UTF-8?q?=20case=20a=20recording=20fails=20for=20some=20reason.=20-=20Th?=
 =?UTF-8?q?e=20kInfo=20key=20is=20now=20propagated=20to=20any=20open=20men?=
 =?UTF-8?q?u,=20so=20that=20it=20can=20react=20to=20it=20=20=20in=20a=20co?=
 =?UTF-8?q?ntext=20sensitive=20manner=20(suggested=20by=20Andreas=20Brugge?=
 =?UTF-8?q?r).=20If=20there=20is=20=20=20no=20menu=20open=20it=20will=20sh?=
 =?UTF-8?q?ow=20the=20info=20of=20the=20current=20broadcast=20or=20replay.?=
 =?UTF-8?q?=20-=20cTimeMs=20now=20uses=20the=20monotonic=20clock,=20if=20a?=
 =?UTF-8?q?vailable=20(thanks=20to=20Petri=20Hintukainen).=20-=20Fixed=20c?=
 =?UTF-8?q?Vector::Clear()=20and=20cStringList::Clear().=20-=20Added=20cSt?=
 =?UTF-8?q?ring::Truncate().=20-=20Fixed=20the=20"i18n:"=20target=20in=20t?=
 =?UTF-8?q?he=20"newplugin"=20script,=20so=20that=20it=20can=20create=20th?=
 =?UTF-8?q?e=20=20=20initial=20*.pot=20file.=20-=20Fixed=20handling=20the?=
 =?UTF-8?q?=20'-l'=20option.=20-=20Fixed=20error=20handling=20in=20cCuttin?=
 =?UTF-8?q?gThread::Action()=20(thanks=20to=20Udo=20Richter).=20-=20Fixed?=
 =?UTF-8?q?=20a=20loss=20of=20the=20date=20display=20in=20the=20"classic"?=
 =?UTF-8?q?=20skin's=20main=20menu=20(reported=20by=20=20=20Andreas=20Brug?=
 =?UTF-8?q?ger).=20-=20Added=20a=20missing=20setting=20of=20lastFreeMB=20i?=
 =?UTF-8?q?n=20cMenuMain::Update()=20(reported=20by=20=20=20Andreas=20Brug?=
 =?UTF-8?q?ger).=20-=20Added=20'-Wno-parentheses'=20to=20the=20compiler=20?=
 =?UTF-8?q?options=20in=20order=20to=20avoid=20silly=20compiler=20=20=20wa?=
 =?UTF-8?q?rnings=20for=20expressions=20like=20'a=20||=20b=20&&=20c',=20wh?=
 =?UTF-8?q?ere=20GCC=204.3=20wants=20to=20force=20the=20=20=20programmer?=
 =?UTF-8?q?=20to=20write=20'a=20||=20(b=20&&=20c)',=20while=20everybody=20?=
 =?UTF-8?q?knows=20that=20'&&'=20links=20=20=20stronger=20than=20'||'=20(r?=
 =?UTF-8?q?eported=20by=20Tobias=20Grimm).=20-=20Updated=20the=20Hungarian?=
 =?UTF-8?q?=20language=20texts=20(thanks=20to=20Istv=C3=A1n=20F=C3=BCley).?=
 =?UTF-8?q?=20-=20Fixed=20displaying=20weekday=20names=20in=20the=20Schedu?=
 =?UTF-8?q?le=20menu=20if=20the=20system=20uses=20UTF-8=20=20=20(reported?=
 =?UTF-8?q?=20by=20Jiri=20Dobry).=20-=20The=20new=20plugin=20"pictures"=20?=
 =?UTF-8?q?implements=20a=20simple=20picture=20viewer.=20=20=20See=20PLUGI?=
 =?UTF-8?q?NS/src/pictures/README=20for=20details.=20-=20The=20automatic?=
 =?UTF-8?q?=20shutdown=20is=20now=20suppressed=20if=20the=20remote=20contr?=
 =?UTF-8?q?ol=20is=20currently=20=20=20disabled=20(suggested=20by=20Helmut?=
 =?UTF-8?q?=20Auer,=20implemented=20by=20Udo=20Richter).=20-=20Added=20a?=
 =?UTF-8?q?=20section=20about=20"Logging"=20to=20PLUGINS.html=20(suggested?=
 =?UTF-8?q?=20by=20Torsten=20Kunkel).=20-=20Enhanced=20the=20SVDRP=20comma?=
 =?UTF-8?q?nd=20CLRE=20to=20allow=20clearing=20the=20EPG=20data=20of=20a?=
 =?UTF-8?q?=20particular=20=20=20channel=20(thanks=20to=20Benjamin=20Hess)?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     |  23 +++
 HISTORY                          |  35 ++++
 MANUAL                           |  11 +-
 Make.config.template             |   4 +-
 Makefile                         |   6 +-
 PLUGINS.html                     |  53 +++--
 PLUGINS/src/hello/Makefile       |   4 +-
 PLUGINS/src/osddemo/Makefile     |   4 +-
 PLUGINS/src/pictures/COPYING     | 340 +++++++++++++++++++++++++++++++
 PLUGINS/src/pictures/HISTORY     |   6 +
 PLUGINS/src/pictures/Makefile    | 110 ++++++++++
 PLUGINS/src/pictures/README      | 119 +++++++++++
 PLUGINS/src/pictures/entry.c     | 144 +++++++++++++
 PLUGINS/src/pictures/entry.h     |  36 ++++
 PLUGINS/src/pictures/menu.c      | 129 ++++++++++++
 PLUGINS/src/pictures/menu.h      |  31 +++
 PLUGINS/src/pictures/pic2mpg     | 176 ++++++++++++++++
 PLUGINS/src/pictures/pictures.c  | 124 +++++++++++
 PLUGINS/src/pictures/player.c    | 249 ++++++++++++++++++++++
 PLUGINS/src/pictures/player.h    |  47 +++++
 PLUGINS/src/pictures/po/de_DE.po |  32 +++
 PLUGINS/src/servicedemo/Makefile |   4 +-
 PLUGINS/src/sky/Makefile         |   4 +-
 PLUGINS/src/status/Makefile      |   4 +-
 PLUGINS/src/svdrpdemo/Makefile   |   4 +-
 config.c                         |   5 +-
 config.h                         |  11 +-
 cutter.c                         |   6 +-
 dvbsubtitle.c                    |   4 +-
 menu.c                           |  15 +-
 newplugin                        |   6 +-
 po/ca_ES.po                      |   5 +-
 po/cs_CZ.po                      |   5 +-
 po/da_DK.po                      |   5 +-
 po/de_DE.po                      |   7 +-
 po/el_GR.po                      |   5 +-
 po/es_ES.po                      |   5 +-
 po/et_EE.po                      |   5 +-
 po/fi_FI.po                      |   5 +-
 po/fr_FR.po                      |   5 +-
 po/hr_HR.po                      |   5 +-
 po/hu_HU.po                      | 123 +++++------
 po/it_IT.po                      |   5 +-
 po/nl_NL.po                      |   5 +-
 po/nn_NO.po                      |   5 +-
 po/pl_PL.po                      |   5 +-
 po/pt_PT.po                      |   5 +-
 po/ro_RO.po                      |   5 +-
 po/ru_RU.po                      |   5 +-
 po/sl_SI.po                      |   5 +-
 po/sv_SE.po                      |   5 +-
 po/tr_TR.po                      |   5 +-
 po/uk_UA.po                      |   5 +-
 remux.c                          |   6 +-
 shutdown.c                       |  15 +-
 skinclassic.c                    |   7 +-
 svdrp.c                          |  60 +++++-
 tools.c                          |  48 ++++-
 tools.h                          |   8 +-
 vdr.c                            |  16 +-
 60 files changed, 1982 insertions(+), 154 deletions(-)
 create mode 100644 PLUGINS/src/pictures/COPYING
 create mode 100644 PLUGINS/src/pictures/HISTORY
 create mode 100644 PLUGINS/src/pictures/Makefile
 create mode 100644 PLUGINS/src/pictures/README
 create mode 100644 PLUGINS/src/pictures/entry.c
 create mode 100644 PLUGINS/src/pictures/entry.h
 create mode 100644 PLUGINS/src/pictures/menu.c
 create mode 100644 PLUGINS/src/pictures/menu.h
 create mode 100755 PLUGINS/src/pictures/pic2mpg
 create mode 100644 PLUGINS/src/pictures/pictures.c
 create mode 100644 PLUGINS/src/pictures/player.c
 create mode 100644 PLUGINS/src/pictures/player.h
 create mode 100644 PLUGINS/src/pictures/po/de_DE.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 60a99e72b..7f5acb858 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -531,6 +531,7 @@ Gregoire Favre <greg@ulima.unil.ch>
  for translating OSD texts to the French language
  for suggesting to initiate an "emergency exit" if there are UPT errors during a
  recording
+ for fixing the declaration of cSubtitleObject::Decode8BppCodeString()
 
 Sven Grothklags <sven@uni-paderborn.de>
  for fixing the cutting mechanism to make it re-sync in case a frame is larger
@@ -590,6 +591,8 @@ Helmut Auer <vdr@helmutauer.de>
  for a patch that was used to implement the SVDRP command REMO
  for reporting a possible crash in decoding filename characters in case there are
  not two hex digits after the '#'
+ for suggesting to suppress the automatic shutdown if the remote control is
+ currently disabled
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1547,6 +1550,8 @@ Udo Richter <udo_richter@gmx.de>
  for fixing a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode()
  for improving shutdown handling
  for making housekeeping wait for a while after a replay has ended
+ for fixing error handling in cCuttingThread::Action()
+ for suppressing the automatic shutdown if the remote control is currently disabled
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1599,6 +1604,10 @@ Andreas Brugger <brougs78@gmx.net>
  for reporting a typo in the change to the "Use small font" setup option in version
  1.3.47 in the HISTORY and CONTRIBUTORS file
  for reporting a missing 'const' in cRecordingInfo::ChannelID()
+ for suggesting to propagate the kInfo key to any open menu, so that it can react to
+ it in a context sensitive manner
+ for reporting a loss of the date display in the "classic" skin's main menu
+ for reporting a missing setting of lastFreeMB in cMenuMain::Update()
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
@@ -1940,6 +1949,7 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
  for making cRemote::PutMacro() set a lock while it expands the macro
  for pointing out that plugins from cRemote::PutMacro() and cRemote::CallPlugin()
  need to be handled separately
+ for making cTimeMs use the monotonic clock
 
 Marcel Schaeben <mts280@gmx.de>
  for his "Easy Input" patch
@@ -2060,6 +2070,7 @@ Tobias Grimm <listaccount@e-tobi.net>
  for fixing a memory leak in handling external EPG data
  for fixing a memory leak in closing the video file during replay
  for fixing deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD()
+ for reporting that GCC 4.3 issues a silly warning for expressions like 'a || b && c'
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2228,6 +2239,7 @@ Elias Luttinen <el@iki.fi>
 Torsten Kunkel <vdrml@tkunkel.de>
  for pointing out that it was not obvious how to initiate internationalization
  support for a plugin
+ for suggesting to add a section about "Logging" to PLUGINS.html
 
 Michael Nival <mnival@club-internet.fr>
  for translating OSD texts to the French language
@@ -2240,3 +2252,14 @@ Lauri Nurmi <lanurmi@iki.fi>
 
 Mario Ivankovits <mario@ops.co.at>
  for fixing a crash if no fonts are found
+
+Istv�n F�ley <ifuley@tigercomp.ro>
+ for translating OSD texts to the Hungarian language
+
+Jiri Dobry <jdobry@centrum.cz>
+ for reporting a bug in displaying weekday names in the Schedule menu if the system
+ uses UTF-8
+
+Benjamin Hess <benjamin.h@gmx.ch>
+ for enhancing the SVDRP command CLRE to allow clearing the EPG data of a particular
+ channel
diff --git a/HISTORY b/HISTORY
index 7379bd10c..3c953253b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5528,3 +5528,38 @@ Video Disk Recorder Revision History
   in live mode (based on a patch from Reinhard Nissl).
 - Fixed stopping live subtitles when a player is attached to the device.
 - Fixed suddenly stopping subtitles in live mode.
+
+2008-01-13: Version 1.5.13
+
+- Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to
+  Gregoire Favre).
+- The new setup option "Miscellaneous/Emergency exit" can be used to turn off
+  the automatic restart of VDR in case a recording fails for some reason.
+- The kInfo key is now propagated to any open menu, so that it can react to it
+  in a context sensitive manner (suggested by Andreas Brugger). If there is
+  no menu open it will show the info of the current broadcast or replay.
+- cTimeMs now uses the monotonic clock, if available (thanks to Petri Hintukainen).
+- Fixed cVector::Clear() and cStringList::Clear().
+- Added cString::Truncate().
+- Fixed the "i18n:" target in the "newplugin" script, so that it can create the
+  initial *.pot file.
+- Fixed handling the '-l' option.
+- Fixed error handling in cCuttingThread::Action() (thanks to Udo Richter).
+- Fixed a loss of the date display in the "classic" skin's main menu (reported by
+  Andreas Brugger).
+- Added a missing setting of lastFreeMB in cMenuMain::Update() (reported by
+  Andreas Brugger).
+- Added '-Wno-parentheses' to the compiler options in order to avoid silly compiler
+  warnings for expessions like 'a || b && c', where GCC 4.3 wants to force the
+  programmer to write 'a || (b && c)', while everybody knows that '&&' links
+  stronger than '||' (reported by Tobias Grimm).
+- Updated the Hungarian language texts (thanks to Istv�n F�ley).
+- Fixed displaying weekday names in the Schedule menu if the system uses UTF-8
+  (reported by Jiri Dobry).
+- The new plugin "pictures" implements a simple picture viewer.
+  See PLUGINS/src/pictures/README for details.
+- The automatic shutdown is now suppressed if the remote control is currently
+  disabled (suggested by Helmut Auer, implemented by Udo Richter).
+- Added a section about "Logging" to PLUGINS.html (suggested by Torsten Kunkel).
+- Enhanced the SVDRP command CLRE to allow clearing the EPG data of a particular
+  channel (thanks to Benjamin Hess).
diff --git a/MANUAL b/MANUAL
index 106533c1d..8798728d9 100644
--- a/MANUAL
+++ b/MANUAL
@@ -37,7 +37,8 @@ Version 1.4
   If your remote control provides additional keys, they can be used for the
   following functions:
 
-  Info        display information on the currently viewed programme or recording
+  Info        display information on the currently viewed programme or recording,
+              or on the current item in a menu
   Play        resume normal replay
   Pause       pause replay or live video
   Stop        stop replay
@@ -850,6 +851,14 @@ Version 1.4
                          VDR was stopped will be used. The valid range is from
                          0 (silent) to 255 (loudest).
 
+  Emergency exit = yes   If, for some reason, a recording fails because the video
+                         data stream is broken, or the CAM doesn't decrypt etc.,
+                         VDR automatically exits in order to allow the surrounding
+                         wrapper script to reload the DVB drivers. If this option
+                         is set to 'no', the "emergency exit" will be ignored,
+                         hoping that the problem will go away by itself (as, for
+                         instance, with bad weather conditions).
+
 * Executing system commands
 
   The "VDR" menu option "Commands" allows you to execute any system commands
diff --git a/Make.config.template b/Make.config.template
index a4b4812b2..9063d666c 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.15 2007/08/25 08:53:45 kls Exp $
+# $Id: Make.config.template 1.16 2008/01/13 12:54:09 kls Exp $
 
 ### The C compiler and options:
 
@@ -14,7 +14,7 @@ CC       = gcc
 CFLAGS   = -g -O2 -Wall
 
 CXX      = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ifdef PLUGIN
 CFLAGS   += -fPIC
diff --git a/Makefile b/Makefile
index f32773c8f..bbf670341 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.110 2007/11/04 10:15:59 kls Exp $
+# $Id: Makefile 1.112 2008/01/13 12:53:17 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -12,7 +12,7 @@ CC       ?= gcc
 CFLAGS   ?= -g -O2 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 LSIDIR   = ./libsi
 DESTDIR ?=
@@ -20,7 +20,7 @@ PREFIX  ?= /usr/local
 MANDIR   = $(PREFIX)/share/man
 BINDIR   = $(PREFIX)/bin
 LOCDIR   = ./locale
-LIBS     = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig
+LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
 INCLUDES = -I/usr/include/freetype2
 
 PLUGINDIR= ./PLUGINS
diff --git a/PLUGINS.html b/PLUGINS.html
index e34ab0ec8..5644b6845 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -14,18 +14,18 @@
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.3 are marked like this.
-<!--X1.5.3--></td></tr></table>
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.7 are marked like this.
 <!--X1.5.7--></td></tr></table>
-<!--X1.5.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.8 are marked like this.
 <!--X1.5.8--></td></tr></table>
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.5.10 are marked like this.
 <!--X1.5.10--></td></tr></table>
+<!--X1.5.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.5.13 are marked like this.
+<!--X1.5.13--></td></tr></table>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -59,6 +59,9 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
 <li><a href="#Shutting down">Shutting down</a>
+<!--X1.5.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<li><a href="#Logging">Logging</a>
+<!--X1.5.13--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
 <li><a href="#User interaction">User interaction</a>
 <li><a href="#Housekeeping">Housekeeping</a>
@@ -540,6 +543,26 @@ <h1>Table Of Contents</h1>
 returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
 as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
 
+<!--X1.5.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<a name="Logging"><hr><h2>Logging</h2>
+
+If the plugin should print log messages, you can use <tt>dsyslog()</tt>, <tt>isyslog()</tt> or <tt>esyslog()</tt>.<br>
+<ul>
+<li><tt>dsyslog()</tt> prints the log message only if the log level of vdr is set to 3.
+<li><tt>isyslog()</tt> prints the log message only if the log level of vdr is set to 2 or above.
+<li><tt>esyslog()</tt> prints the log message only if the log level of vdr is set to 1 or above.
+</ul>
+The output of this log is the syslog of the system vdr is running on.
+The logmessage can be formatted like <tt>printf()</tt>, as in
+
+<p><table><tr><td bgcolor=#F0F0F0><pre>
+esyslog("pluginname: error #%d has occurred", ErrorNumber);
+</pre></td></tr></table><p>
+
+Note that the log messages will be given as provided, the plugin's name will not
+automatically be added, so make shure your log messages are obvious enough.
+<!--X1.5.13--></td></tr></table>
+
 <a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
 <center><i><b>Today's special is...</b></i></center><p>
@@ -906,7 +929,7 @@ <h1>Table Of Contents</h1>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
 
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.5.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 If a plugin displays texts to the user, it should prepare for internationalization
 of these texts. All that is necessary for this is to mark every text that is
 presented to the user as translatable, as in
@@ -917,7 +940,7 @@ <h1>Table Of Contents</h1>
 
 The text given here must be the English version, and the returned pointer is either
 a translated version (if available) or the original string.
-<!--X1.5.8--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.5.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Texts are searched for in the domain registered for this plugin.
 If a plugin wants to make use of texts defined by the core VDR code, it can use
 the special <tt>trVDR()</tt> macro to mark these texts without having them
@@ -940,7 +963,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 The system VDR is running on may use a character encoding where a single character
 (or <i>symbol</i>) consists of more than one byte (UTF-8, as opposed to, for instance,
 ISO8859-1, where every character is represented by a single byte in memory).
@@ -951,7 +973,6 @@ <h1>Table Of Contents</h1>
 and are defined in <tt>VDR/tools.h</tt>.
 Most of the time a plugin doesn't need to care about this, but when it comes to
 handling individual characters these functions may come in handy.
-<!--X1.5.3--></td></tr></table>
 <!--X1.5.7--></td></tr></table>
 
 <a name="Custom services"><hr><h2>Custom services</h2>
@@ -1328,7 +1349,7 @@ <h1>Table Of Contents</h1>
 available audio tracks by calling
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL)
 <!--X1.5.10--></td></tr></table>
 </pre></td></tr></table><p>
@@ -1456,13 +1477,13 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 :cReceiver(tChannelID(), -1, Pid)
 <!--X1.5.10--></td></tr></table>
 {
 }
 
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%><pre>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%><pre>
 cMyReceiver::~cMyReceiver()
 {
   cReceiver::Detach();
@@ -1614,7 +1635,6 @@ <h1>Table Of Contents</h1>
 areas. Drawing areas are always rectangular and may not overlap (but do not need
 to be adjacent).
 <p>
-<!--X1.5.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Special consideration may have to be given to color usage if the OSD provides
 8bpp (256 colors). In that case, fonts may be drawn using <i>anti-aliasing</i>,
 which requires several blended color values between the foreground and background
@@ -1628,7 +1648,6 @@ <h1>Table Of Contents</h1>
 
 which allows the system to evenly distribute the palette entries to the various
 color combinations (see <tt>VDR/osd.h</tt> for details).
-<!--X1.5.3--></td></tr></table>
 <p>
 Directly accessing the OSD is only allowed from the foreground thread, which
 restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuAction()</tt>
@@ -1832,7 +1851,7 @@ <h1>Table Of Contents</h1>
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual int64_t GetSTC(void);
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual bool HasIBPTrickSpeed(void);
 <!--X1.5.10--></td></tr></table>
 virtual void TrickSpeed(int Speed);
@@ -1862,7 +1881,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual void CloseFilter(int Handle);
 <!--X1.5.10--></td></tr></table>
 </pre></td></tr></table><p>
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 185b527ed..c4ea46fdb 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.21 2007/11/04 10:52:15 kls Exp $
+# $Id: Makefile 1.22 2008/01/13 12:59:58 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 568faa679..e85663f71 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.10 2007/08/15 13:05:24 kls Exp $
+# $Id: Makefile 1.11 2008/01/13 13:00:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/pictures/COPYING b/PLUGINS/src/pictures/COPYING
new file mode 100644
index 000000000..f90922eea
--- /dev/null
+++ b/PLUGINS/src/pictures/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
new file mode 100644
index 000000000..c04a6280b
--- /dev/null
+++ b/PLUGINS/src/pictures/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'pictures' Revision History
+--------------------------------------
+
+2008-01-13: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
new file mode 100644
index 000000000..d9499443f
--- /dev/null
+++ b/PLUGINS/src/pictures/Makefile
@@ -0,0 +1,110 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.2 2008/01/13 13:00:04 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
+#
+PLUGIN = pictures
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### The directory environment:
+
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
+
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o entry.o menu.o player.o
+
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+### Dependencies:
+
+MAKEDEP = $(CXX) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
+### Targets:
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/PLUGINS/src/pictures/README b/PLUGINS/src/pictures/README
new file mode 100644
index 000000000..bd6bb7d2d
--- /dev/null
+++ b/PLUGINS/src/pictures/README
@@ -0,0 +1,119 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          www.cadsoft.de/vdr
+
+Latest version available at: www.cadsoft.de/vdr
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
+
+Description:
+============
+
+The 'pictures' plugin implements a simple picture viewer.
+
+There is already an 'image' plugin out there which has a lot more
+functionality than this one, but it's way too complex for my taste,
+and also converts the image files on-the-fly, which makes it slow
+on slow hardware.
+
+This plugin assumes that the pictures have already been converted to
+MPEG frames (with the 'pic2mpg' script that comes with this archive),
+and doesn't implement any fancy features like zooming, panning or
+tiled previews. It's just a very simple viewer.
+
+It also assumes a rather particular directory structure (see below),
+which I have found to fit well for my needs. If you use a different
+structure, the plugin should still work, but the information displayed
+in the caption may not be as expected.
+
+Remote control key functions while in the Pictures menu:
+========================================================
+
+- Left/right/Up/Down:  navigate in the menu as usual.
+- Ok:                  opens a directory or displays the selected
+                       picture.
+- Red/Play:            start a slide show at the first picture in the
+                       selected directory (or at the selected picture).
+
+Remote control key functions while displaying pictures:
+=======================================================
+
+- Left/Right:  advances to the previous/next picture. At the end of a directory
+               it automatically advances to the first picture of the next
+               directory and displays the caption.
+- Up/Play:     start the slide show.
+- Down/Pause:  stop the slide show.
+- Blue/Stop:   exit from the picture viewer.
+- Green/Prev:  skip to the first picture in the previous directory.
+- Yellow/Next: skip to the first picture in the next directory.
+- Ok:          toggle the caption display.
+- Back:        return to the picture selection menu.
+
+The slide show starts with the picture immediately following the one that
+is currently visible, and continues until the last available picture,
+automatically crossing directories as necessary.
+
+Pressing any of the Left/Right, Green/Prev, Yellow/Next or Back keys
+automatically stops an ongoing slide show.
+
+Directory structure:
+====================
+
+The 'pictures' plugin requires a particular directory structure in order to
+work properly. Starting at some base directory (e.g. "/path/to/pictures"),
+there is one directory level marking the year in which the pictures were
+taken, followed by a level with a properly sortable combination of month
+and description, and finally the plain picture files, as in
+
+/path/to/pictures/YEAR/MONTH_DESCRIPTION/*.jpg
+
+For example
+
+/path/to/pictures/2007/06a_Vacation_in_Colorado/dsc01234.jpg
+/path/to/pictures/2007/06a_Vacation_in_Colorado/dsc01235.jpg
+/path/to/pictures/2007/06b_Our_cat/dsc01236.jpg
+
+The MONTH is "01" for January through "12" for December. If there is more
+than one entry for one month, it should be followed by a letter to make them
+sort correctly. Note that this is just a suggestion on how to make the
+directories sort in the correct chronological order. Instead of the two digit
+month number, optionally followed by a letter, you can use anything else you
+like. There must be an underscore between the MONTH and the DESCRIPTION part,
+and any underscores within the DESCRIPTION will be converted to blanks when
+displaying the description (this is done so that blanks can be avoided in
+the directory names).
+
+Preparing the files:
+====================
+
+In order to display the pictures as "still pictures" on the DVB device, they
+need to be converted into MPEG frames. This procedure takes some time, and
+would make viewing pictures sluggish, especially on slow hardware. Therefore
+the script "pic2mpg" must be used to convert all picture files before
+using this plugin, as in
+
+pic2mpg /path/to/pictures /path/to/pictures.MPG
+
+This will recursively walk through all pictures in the source directory and
+convert them into MPEG frames, stored in the destination directory. The
+extension ".MPG" is just a suggestion, you can name the directory anything
+you like, and it doesn't have to start with the same path as the source
+directory. Just don't make the destination directory a subdirectory of
+the source directory, because this would surely lead to problems.
+See "pic2mpg -h" for a list of available options.
+The pic2mpg conversion can be run any time, even if converted pictures
+already exist. It will only convert pictures that haven't been converted
+yet. Any changes to the source directory will be reflected in the destination
+directory accordingly after pic2mpg has finished (note that this especially
+means that any files or directories in the destination tree that have no
+corresponding entry in the source tree will be deleted!). So you can run
+pic2mpg, for instance, after copying new pictures into your picture
+directory, or after making any other kind of changes to your existing
+pictures. It might even be a good idea to run pic2mpg in a (nightly)
+cron job.
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
new file mode 100644
index 000000000..006a359e5
--- /dev/null
+++ b/PLUGINS/src/pictures/entry.c
@@ -0,0 +1,144 @@
+/*
+ * entry.c: Data structure to handle still pictures
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: entry.c 1.1 2008/01/06 09:52:41 kls Exp $
+ */
+
+#include "entry.h"
+
+cPictureEntry::cPictureEntry(const char *Name, const cPictureEntry *Parent, bool IsDirectory)
+{
+  name = strdup(Name);
+  parent = Parent;
+  isDirectory = IsDirectory;
+  entries = NULL;
+}
+
+cPictureEntry::~cPictureEntry()
+{
+  free(name);
+  delete entries;
+}
+
+int cPictureEntry::Compare(const cListObject &ListObject) const
+{
+  cPictureEntry *p = (cPictureEntry *)&ListObject;
+  if (IsDirectory() && !p->IsDirectory())
+     return -1;
+  if (!IsDirectory() && p->IsDirectory())
+     return +1;
+  if (IsDirectory())
+     return strcoll(name, p->name);
+  else
+     return strcmp(name, p->name); // correctly sorts dsc01234.jpg and dsc01234a.jpg in case pictures have been "squeezed in"
+}
+
+cString cPictureEntry::Path(void) const
+{
+  return parent ? AddDirectory(parent->Path(), name) : name;
+}
+
+void cPictureEntry::Load(void) const
+{
+  if (isDirectory && !entries) {
+     cString Directory = Path();
+     cReadDir d(Directory);
+     if (d.Ok()) {
+        struct dirent *e;
+        while ((e = d.Next()) != NULL) {
+              if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
+                 struct stat ds;
+                 if (stat(AddDirectory(Directory, e->d_name), &ds) == 0) {
+                    if (!entries)
+                       entries = new cList<cPictureEntry>;
+                    entries->Add(new cPictureEntry(e->d_name, this, S_ISDIR(ds.st_mode)));
+                    }
+                 }
+              }
+        if (entries)
+           entries->Sort();
+        }
+     else
+        LOG_ERROR_STR(*Directory);
+     }
+}
+
+const cList<cPictureEntry> *cPictureEntry::Entries(void) const
+{
+  Load();
+  return entries;
+}
+
+const cPictureEntry *cPictureEntry::FirstPicture(void) const
+{
+  Load();
+  if (entries) {
+     for (cPictureEntry *pe = entries->First(); pe; pe = entries->Next(pe)) {
+         if (pe->IsDirectory()) {
+            const cPictureEntry *p = pe->FirstPicture();
+            if (p)
+               return p;
+            }
+         else
+            return pe;
+         }
+     }
+  return NULL;
+}
+
+const cPictureEntry *cPictureEntry::LastPicture(void) const
+{
+  Load();
+  if (entries) {
+     for (cPictureEntry *pe = entries->Last(); pe; pe = entries->Prev(pe)) {
+         if (pe->IsDirectory()) {
+            const cPictureEntry *p = pe->LastPicture();
+            if (p)
+               return p;
+            }
+         else
+            return pe;
+         }
+     }
+  return NULL;
+}
+
+const cPictureEntry *cPictureEntry::PrevPicture(const cPictureEntry *This) const
+{
+  if (This) {
+     const cPictureEntry *pe = (cPictureEntry *)entries->Prev(This);
+     if (pe) {
+        if (pe->IsDirectory()) {
+           const cPictureEntry *p = pe->LastPicture();
+           if (p)
+              return p;
+           return PrevPicture(pe);
+           }
+        return pe;
+        }
+     }
+  if (parent)
+     return parent->PrevPicture(this);
+  return NULL;
+}
+
+const cPictureEntry *cPictureEntry::NextPicture(const cPictureEntry *This) const
+{
+  if (This) {
+     cPictureEntry *pe = (cPictureEntry *)entries->Next(This);
+     if (pe) {
+        if (pe->IsDirectory()) {
+           const cPictureEntry *p = pe->FirstPicture();
+           if (p)
+              return p;
+           return NextPicture(pe);
+           }
+        return pe;
+        }
+     }
+  if (parent)
+     return parent->NextPicture(this);
+  return NULL;
+}
diff --git a/PLUGINS/src/pictures/entry.h b/PLUGINS/src/pictures/entry.h
new file mode 100644
index 000000000..5c72e5ed5
--- /dev/null
+++ b/PLUGINS/src/pictures/entry.h
@@ -0,0 +1,36 @@
+/*
+ * entry.h: Data structure to handle still pictures
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: entry.h 1.1 2008/01/06 12:30:50 kls Exp $
+ */
+
+#ifndef _ENTRY_H
+#define _ENTRY_H
+
+#include <vdr/tools.h>
+
+class cPictureEntry : public cListObject {
+private:
+  char *name;
+  const cPictureEntry *parent;
+  bool isDirectory;
+  mutable cList<cPictureEntry> *entries;
+  void Load(void) const;
+public:
+  cPictureEntry(const char *Name, const cPictureEntry *Parent, bool IsDirectory);
+  virtual ~cPictureEntry();
+  virtual int Compare(const cListObject &ListObject) const;
+  const char *Name(void) const { return name; }
+  const cPictureEntry *Parent(void) const { return parent; }
+  bool IsDirectory(void) const { return isDirectory; }
+  cString Path(void) const;
+  const cList<cPictureEntry> *Entries(void) const;
+  const cPictureEntry *FirstPicture(void) const;
+  const cPictureEntry *LastPicture(void) const;
+  const cPictureEntry *PrevPicture(const cPictureEntry *This = NULL) const;
+  const cPictureEntry *NextPicture(const cPictureEntry *This = NULL) const;
+  };
+
+#endif //_ENTRY_H
diff --git a/PLUGINS/src/pictures/menu.c b/PLUGINS/src/pictures/menu.c
new file mode 100644
index 000000000..6a64d480a
--- /dev/null
+++ b/PLUGINS/src/pictures/menu.c
@@ -0,0 +1,129 @@
+/*
+ * menu.c: A menu for still pictures
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: menu.c 1.1 2008/01/13 11:35:18 kls Exp $
+ */
+
+#include "menu.h"
+#include <vdr/tools.h>
+#include "entry.h"
+#include "player.h"
+
+char PictureDirectory[PATH_MAX] = "";
+
+static bool PathStartsWith(const char *Path, const char *Name)
+{
+  if (Path && Name) {
+     while (*Name) {
+           if (*Path++ != *Name++)
+              return false;
+           }
+     if (*Path && *Path != '/')
+        return false;
+     return true;
+     }
+  return false;
+}
+
+static const char *NextLevel(const char *Path)
+{
+  if (Path) {
+     const char *p = strchr(Path, '/');
+     return p ? p + 1 : NULL;
+     }
+  return Path;
+}
+
+cPictureEntry *cPictureMenu::pictures = NULL;
+
+cPictureMenu::cPictureMenu(const cPictureEntry *PictureEntry, const char *Path)
+:cOsdMenu(tr("Pictures"))
+{
+  pictureEntry = PictureEntry;
+  if (!pictureEntry)
+     pictureEntry = pictures = new cPictureEntry(PictureDirectory, NULL, true);
+  if (pictureEntry->Parent()) {
+     if (!pictureEntry->Parent()->Parent())
+        SetTitle(pictureEntry->Name()); // Year
+     else
+        SetTitle(cString::sprintf("%s: %s", pictureEntry->Parent()->Name(), *HandleUnderscores(pictureEntry->Name()))); // Year/Description
+     }
+  Set(Path);
+}
+
+cPictureMenu::~cPictureMenu()
+{
+  if (pictures && pictureEntry && !pictureEntry->Parent())
+     DELETENULL(pictures);
+}
+
+void cPictureMenu::Set(const char *Path)
+{
+  Clear();
+  const cList<cPictureEntry> *l = pictureEntry->Entries();
+  if (l) {
+     for (const cPictureEntry *e = l->First(); e; e = l->Next(e)) {
+         cString Name = HandleUnderscores(e->Name());
+         if (!e->IsDirectory())
+            Name.Truncate(-4); // don't display the ".mpg" extension
+         Add(new cOsdItem(HandleUnderscores(Name)), PathStartsWith(Path, e->Name()));
+         }
+     }
+  SetHelp(Count() ? trVDR("Button$Play") : NULL, NULL, NULL, cPictureControl::Active() ? trVDR("Button$Stop") : NULL);
+  if (Current() >= 0) {
+     const char *p = NextLevel(Path);
+     if (p)
+        SelectItem(p);
+     }
+}
+
+eOSState cPictureMenu::SelectItem(const char *Path, bool SlideShow)
+{
+  cOsdItem *Item = Get(Current());
+  if (Item) {
+     const cList<cPictureEntry> *l = pictureEntry->Entries();
+     if (l) {
+        cPictureEntry *pe = l->Get(Current());
+        if (pe) {
+           if (SlideShow) {
+              cControl::Launch(new cPictureControl(pictures, pe, true));
+              pictures = NULL; // cPictureControl takes ownership
+              return osEnd;
+              }
+           if (pe->IsDirectory())
+              return AddSubMenu(new cPictureMenu(pe, Path));
+           else if (!Path) {
+              cControl::Launch(new cPictureControl(pictures, pe));
+              pictures = NULL; // cPictureControl takes ownership
+              return osEnd;
+              }
+           }
+        }
+     }
+  return osContinue;
+}
+
+eOSState cPictureMenu::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+  if (state == osUnknown) {
+     switch (Key) {
+       case kRed:
+       case kPlay:   return SelectItem(NULL, true);
+       case kBlue:
+       case kStop:   if (cPictureControl::Active())
+                        return osStopReplay;
+                     break;
+       case kOk:     return SelectItem();
+       default:      break;
+       }
+     }
+  return state;
+}
+
+cPictureMenu *cPictureMenu::CreatePictureMenu(void)
+{
+  return new cPictureMenu(NULL, cPictureControl::LastDisplayed());
+}
diff --git a/PLUGINS/src/pictures/menu.h b/PLUGINS/src/pictures/menu.h
new file mode 100644
index 000000000..ace753e8c
--- /dev/null
+++ b/PLUGINS/src/pictures/menu.h
@@ -0,0 +1,31 @@
+/*
+ * menu.h: A menu for still pictures
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: menu.h 1.1 2008/01/12 11:22:52 kls Exp $
+ */
+
+#ifndef _MENU_H
+#define _MENU_H
+
+#include <vdr/osdbase.h>
+#include <vdr/tools.h>
+#include "entry.h"
+
+extern char PictureDirectory[PATH_MAX];
+
+class cPictureMenu : public cOsdMenu {
+private:
+  static cPictureEntry *pictures;
+  const cPictureEntry *pictureEntry;
+  void Set(const char *Path);
+  eOSState SelectItem(const char *Path = NULL, bool SlideShow = false);
+public:
+  cPictureMenu(const cPictureEntry *PictureEntry, const char *Path = NULL);
+  ~cPictureMenu();
+  virtual eOSState ProcessKey(eKeys Key);
+  static cPictureMenu *CreatePictureMenu(void);
+  };
+
+#endif //_MENU_H
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
new file mode 100755
index 000000000..57916852a
--- /dev/null
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -0,0 +1,176 @@
+#!/usr/bin/perl
+
+# pic2mpg: Convert picture files to MPEG still frames
+#
+# Converts either a single picture file or all files in a
+# given directory (recursively) to MPEG still frames.
+#
+# See the README file for copyright information and how to reach the author.
+#
+# $Id: pic2mpg 1.1 2008/01/13 11:09:12 kls Exp $
+
+## TODO implement HDTV (1920 x 1080)
+
+use File::Path;
+use Getopt::Std;
+use Image::Size;
+
+$Usage = qq{
+Usage: $0 [options] picture-dir mpeg-dir
+       $0 [options] picture-file mpeg-file
+
+Options: -a             Aspect ratio 4:3 (default is 16:9)
+         -h             print Help
+         -f             Force conversion
+         -n             NTSC (default is PAL)
+         -v num         Verbose (0=none, 1=list files, 2=detailed)
+         -x percent     X overscan in percent
+         -y percent     Y overscan in percent
+};
+
+getopts("ahfnv:x:y:") || die $Usage;
+
+die $Usage if $opt_h;
+
+$Aspect    = $opt_a;
+$Force     = $opt_f;
+$NTSC      = $opt_n;
+$Verbose   = $opt_v;
+$OverscanX = $opt_x;
+$OverscanY = $opt_y;
+
+$ListFiles = $Verbose >= 1;
+$Detailed  = $Verbose >= 2;
+
+# Screen size:
+
+$SW = $NTSC ? 720 : 720;
+$SH = $NTSC ? 480 : 576;
+
+$ScreenRatio = $Aspect ? 4 / 3 : 16 / 9;
+
+# Converter programs:
+
+%PNMCONV = (
+  bmp  => "bmptopnm",
+  gif  => "giftopnm",
+  jpeg => "jpegtopnm",
+  jpg  => "jpegtopnm",
+  png  => "pngtopnm",
+  pnm  => "cat",
+  tif  => "tifftopnm",
+  tiff => "tifftopnm",
+  );
+
+# Command options:
+
+die "$0: missing parameter\n" unless $ARGV[0] && $ARGV[1];
+die "$0: file or directory not found: $ARGV[0]\n" unless -e $ARGV[0];
+die "$0: source and destination must be different\n" if $ARGV[0] eq $ARGV[1];
+
+$verbose1  = $Detailed ? "--verbose" : "";
+$verbose2  = $Detailed ? "-v 2" : "-v 0";
+$system1   = $NTSC ? "" : "--pal";
+$system2   = $NTSC ? "n" : "p";
+$framerate = $NTSC ? "30000:1001" : "25:1";
+$aspect    = $Aspect ? "2" : "3";
+
+# Convert a single file:
+
+if (-f $ARGV[0]) {
+   die "$0: mixed file and directory ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -f $ARGV[1];
+   ConvertFile($ARGV[0], $ARGV[1]);
+   exit;
+   }
+
+die "$0: mixed directory and file ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -d $ARGV[1];
+
+$PICDIR = $ARGV[0];
+$MPGDIR = $ARGV[1];
+
+# Convert pictures to mpegs:
+
+chdir($PICDIR) || die "$PICDIR: $!\n";
+
+@Pictures = `find -type f`;
+chomp(@Pictures);
+
+for $pic (@Pictures) {
+    my $mpg = "$MPGDIR/$pic.mpg";
+    if ($Force || !-e $mpg || -M $mpg > -M $pic) {
+       (my $dir = $mpg) =~ s/\/[^\/]*$//;
+       mkpath($dir);
+       ConvertFile($pic, $mpg);
+       }
+    }
+
+# Remove mpegs without pictures:
+
+chdir($MPGDIR) || die "$MPGDIR: $!\n";
+
+@Mpegs = `find -type f`;
+chomp(@Mpegs);
+
+for $mpg (@Mpegs) {
+    my $pic = "$PICDIR/$mpg";
+    $pic =~ s/\.mpg$//;
+    if (!-e $pic) {
+       print "removing $mpg\n";
+       unlink($mpg);
+       }
+    }
+
+# Remove empty directories:
+
+chdir($MPGDIR) || die "$MPGDIR: $!\n";
+
+for ($i = 0; $i < 10; $i++) { # dirs might become empty when removing empty subdirs
+    @Dirs = `find -type d -empty`;
+    chomp(@Dirs);
+    last unless @Dirs;
+
+    for $dir (@Dirs) {
+        $dir = EscapeMeta($dir);
+        print "removing $dir\n";
+        !system("rm -rf $dir") || die "$dir: $!\n";
+        }
+    }
+
+# Actual file conversion:
+
+sub ConvertFile
+{
+  my ($Pict, $Mpeg) = @_;
+  (my $Type) = $Pict =~ /\.([^\.]*)$/;
+  die "unknown file type '$Type': '$Pict'\n" unless defined $PNMCONV{$Type};
+  my ($w, $h) = imgsize($Pict);
+  print "image size is $w x $h\n" if ($Detailed);
+  if ($w / $h <= $ScreenRatio) {
+     $w = $h * $ScreenRatio;
+     }
+  else {
+     $h = $w / $ScreenRatio;
+     }
+  my $ScaleW = $SW / $w * (100 - 2 * $OverscanX) / 100;
+  my $ScaleH = $SH / $h * (100 - 2 * $OverscanY) / 100;
+  $Pict = EscapeMeta($Pict);
+  $Mpeg = EscapeMeta($Mpeg);
+  print "$Pict -> $Mpeg\n" if $ListFiles;
+  my $Cmd = "$PNMCONV{$Type} $Pict 2> /dev/null |"
+          . "pnmscale $verbose1 --xscale=$ScaleW --yscale=$ScaleH |"
+          . "pnmpad $verbose1 --black --width $SW --height $SH |"
+          . "ppmntsc $verbose1 $system1 |"
+          . "ppmtoy4m $verbose2 -F $framerate -I p -S 420mpeg2 |"
+          . "mpeg2enc $verbose2 -f 3 -b 12500 -a $aspect -q 1 -n $system2 -o $Mpeg";
+  !system($Cmd) || die "$Cmd: $!\n";
+  $Cmd = "touch -r $Pict $Mpeg";
+  !system($Cmd) || die "$Cmd: $!\n";
+}
+
+sub EscapeMeta
+{
+  my $META = ' !"#$%&\'()*;<>?[\\]`{|}~';
+  my $s = shift;
+  $s =~ s/([$META])/\\$1/g;
+  return $s;
+}
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
new file mode 100644
index 000000000..aa06c986e
--- /dev/null
+++ b/PLUGINS/src/pictures/pictures.c
@@ -0,0 +1,124 @@
+/*
+ * pictures.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: pictures.c 1.1 2008/01/12 14:46:52 kls Exp $
+ */
+
+#include <getopt.h>
+#include <vdr/plugin.h>
+#include "menu.h"
+#include "player.h"
+
+static const char *VERSION       = "0.0.1";
+static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
+static const char *MAINMENUENTRY = trNOOP("Pictures");
+
+// --- cMenuSetupPictures ----------------------------------------------------
+
+class cMenuSetupPictures : public cMenuSetupPage {
+private:
+  char newPictureDirectory[PATH_MAX];
+  int newSlideShowDelay;
+protected:
+  virtual void Store(void);
+public:
+  cMenuSetupPictures(void);
+  };
+
+cMenuSetupPictures::cMenuSetupPictures(void)
+{
+  strn0cpy(newPictureDirectory, PictureDirectory, sizeof(newPictureDirectory));
+  newSlideShowDelay = SlideShowDelay;
+  Add(new cMenuEditStrItem(tr("Picture directory"),    newPictureDirectory, sizeof(newPictureDirectory)));
+  Add(new cMenuEditIntItem(tr("Slide show delay (s)"), &newSlideShowDelay));
+}
+
+void cMenuSetupPictures::Store(void)
+{
+  SetupStore("PictureDirectory", strn0cpy(PictureDirectory, newPictureDirectory, sizeof(PictureDirectory)));
+  SetupStore("SlideShowDelay",   SlideShowDelay = newSlideShowDelay);
+}
+
+// --- cPluginPictures -------------------------------------------------------
+
+class cPluginPictures : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  cPluginPictures(void);
+  virtual ~cPluginPictures();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return tr(DESCRIPTION); }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
+  virtual cOsdObject *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginPictures::cPluginPictures(void)
+{
+  // Initialize any member variables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+}
+
+cPluginPictures::~cPluginPictures()
+{
+  // Clean up after yourself!
+}
+
+const char *cPluginPictures::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return "  -d DIR,   --dir=DIR      set the picture directory to DIR\n";
+}
+
+bool cPluginPictures::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  static struct option long_options[] = {
+       { "dir",      required_argument, NULL, 'd' },
+       { NULL }
+     };
+
+  int c;
+  while ((c = getopt_long(argc, argv, "d:s:", long_options, NULL)) != -1) {
+        switch (c) {
+          case 'd': strn0cpy(PictureDirectory, optarg, sizeof(PictureDirectory));
+                    break;
+          default:  return false;
+          }
+        }
+  return true;
+}
+
+cOsdObject *cPluginPictures::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  if (*PictureDirectory)
+     return cPictureMenu::CreatePictureMenu();
+  Skins.Message(mtWarning, tr("No picture directory has been defined!"));
+  return NULL;
+}
+
+cMenuSetupPage *cPluginPictures::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return new cMenuSetupPictures;
+}
+
+bool cPluginPictures::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  if      (!strcasecmp(Name, "PictureDirectory")) strn0cpy(PictureDirectory, Value, sizeof(PictureDirectory));
+  else if (!strcasecmp(Name, "SlideShowDelay"))   SlideShowDelay = atoi(Value);
+  else
+     return false;
+  return true;
+}
+
+VDRPLUGINCREATOR(cPluginPictures); // Don't touch this!
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
new file mode 100644
index 000000000..9e07fc53a
--- /dev/null
+++ b/PLUGINS/src/pictures/player.c
@@ -0,0 +1,249 @@
+/*
+ * player.c: A player for still pictures
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: player.c 1.1 2008/01/13 11:29:27 kls Exp $
+ */
+
+#include "player.h"
+#include <vdr/remote.h>
+#include <vdr/tools.h>
+
+int SlideShowDelay = 3; // seconds
+
+cString HandleUnderscores(const char *s)
+{
+  // Skip anything before and including the first '_' and replace
+  // any remaining '_' with blanks:
+  const char *p = strchr(s, '_');
+  if (p) {
+     p++;
+     char buf[strlen(p) + 1];
+     strcpy(buf, p);
+     return strreplace(buf, '_', ' ');
+     }
+  return s;
+}
+
+// --- cPicturePlayer --------------------------------------------------------
+
+class cPicturePlayer : public cPlayer {
+private:
+  int size;
+  int length;
+  uchar *buffer;
+  virtual void Activate(bool On);
+public:
+  cPicturePlayer(void);
+  ~cPicturePlayer();
+  void SetPicture(const char *FileName);
+  };
+
+cPicturePlayer::cPicturePlayer(void)
+{
+  size = KILOBYTE(100); // will be adjusted automatically if files are larger
+  length = 0;
+  buffer = MALLOC(uchar, size);
+}
+
+cPicturePlayer::~cPicturePlayer()
+{
+  free(buffer);
+}
+
+void cPicturePlayer::Activate(bool On)
+{
+  if (length > 0)
+     DeviceStillPicture(buffer, length);
+}
+
+void cPicturePlayer::SetPicture(const char *FileName)
+{
+  int f = open(FileName, O_RDONLY);
+  if (f >= 0) {
+     for (;;) {
+         length = read(f, buffer, size);
+         if (length > 0) {
+            if (length >= size) {
+               size = size * 3 / 2;
+               buffer = (uchar *)realloc(buffer, size);
+               lseek(f, 0, SEEK_SET);
+               continue;
+               }
+            DeviceStillPicture(buffer, length);
+            }
+         else
+            LOG_ERROR_STR(FileName);
+         break;
+         }
+     close(f);
+     }
+  else
+     LOG_ERROR_STR(FileName);
+}
+
+// --- cPictureControl -------------------------------------------------------
+
+int cPictureControl::active = 0;
+cString cPictureControl::lastDisplayed;
+
+cPictureControl::cPictureControl(cPictureEntry *Pictures, const cPictureEntry *PictureEntry, bool SlideShow)
+:cControl(player = new cPicturePlayer)
+{
+  pictures = Pictures;
+  pictureEntry = PictureEntry;
+  osd = NULL;
+  lastPath = "/";
+  slideShow = SlideShow;
+  alwaysDisplayCaption = false;
+  NextPicture(slideShow && pictureEntry->IsDirectory() ? 1 : 0);
+  active++;
+}
+
+cPictureControl::~cPictureControl()
+{
+  active--;
+  delete osd;
+  delete player;
+  delete pictures;
+}
+
+void cPictureControl::NextPicture(int Direction)
+{
+  if (Direction) {
+     const cPictureEntry *pe = Direction > 0 ? pictureEntry->NextPicture() : pictureEntry->PrevPicture();
+     if (pe)
+        pictureEntry = pe;
+     }
+  if (pictureEntry) {
+     player->SetPicture(pictureEntry->Path());
+     DisplayCaption();
+     }
+}
+
+void cPictureControl::NextDirectory(int Direction)
+{
+  // This only works reliable if a directory contains only subdirectories or pictures, not both!
+  if (Direction) {
+     const cPictureEntry *pe = Direction > 0 ? pictureEntry->Parent()->Entries()->Last()->NextPicture() : pictureEntry->Parent()->Entries()->First()->PrevPicture();
+     if (pe && Direction < 0)
+        pe = pe->Parent()->Entries()->First();
+     if (pe && pe != pictureEntry) {
+        pictureEntry = pe;
+        player->SetPicture(pictureEntry->Path());
+        DisplayCaption();
+        }
+     }
+}
+
+static void DrawTextOutlined(cOsd *Osd, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font)
+{
+  for (int dx = -1; dx <= 1; dx++) {
+      for (int dy = -1; dy <= 1; dy++) {
+          if (dx || dy)
+             Osd->DrawText(x + dx, y + dy, s, ColorBg, clrTransparent, Font);
+          }
+      }
+  Osd->DrawText(x, y, s, ColorFg, clrTransparent, Font);
+}
+
+void cPictureControl::DisplayCaption(void)
+{
+  bool Force = false;
+  cString Path = pictureEntry->Path();
+  lastDisplayed = Path + strlen(pictures->Name()) + 1;
+  const char *p = strrchr(Path, '/');
+  const char *q = strrchr(lastPath, '/');
+  if (p && q) {
+     int lp = p - Path;
+     int lq = q - lastPath;
+     if (lp != lq || strncmp(lastPath, Path, lp)) {
+        lastPath = Path;
+        Force = true;
+        }
+     }
+  if (!alwaysDisplayCaption && !Force) {
+     DELETENULL(osd);
+     return;
+     }
+  const cFont *Font = cFont::GetFont(fontOsd);
+  int w = cOsd::OsdWidth();
+  int h = 2 * Font->Height();
+  if (!osd) {
+     osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - h, OSD_LEVEL_SUBTITLES);
+     tArea Areas[] = { { 0, 0, w, h, 8 } };
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { 0, 0, w, h, 4 } };
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
+     }
+  const char *Year = pictureEntry->Parent()->Parent() ? pictureEntry->Parent()->Parent()->Name() : "";
+  cString Description = HandleUnderscores(pictureEntry->Parent()->Name());
+  osd->DrawRectangle(0, 0, w - 1, h - 1, clrTransparent);
+  DrawTextOutlined(osd, 0, 0, Description, clrWhite, clrBlack, Font);
+  DrawTextOutlined(osd, 0, h / 2, Year, clrWhite, clrBlack, Font);
+  struct stat sb;
+  if (stat(Path, &sb) == 0) {
+     cString Time = DayDateTime(sb.st_mtime);
+     DrawTextOutlined(osd, w - Font->Width(Time), h / 2, Time, clrWhite, clrBlack, Font);
+     }
+  p++;
+  Path.Truncate(-4); // don't display the ".mpg" extension
+  DrawTextOutlined(osd, w - Font->Width(p), 0, p, clrWhite, clrBlack, Font);
+  osd->Flush();
+}
+
+eOSState cPictureControl::ProcessKey(eKeys Key)
+{
+  switch (Key) {
+    case kUp:
+    case kPlay:   slideShowDelay.Set();
+                  slideShow = true;
+                  break;
+    case kDown:
+    case kPause:  slideShow = false;
+                  break;
+    case kLeft|k_Repeat:
+    case kLeft:   NextPicture(-1);
+                  slideShow = false;
+                  break;
+    case kRight|k_Repeat:
+    case kRight:  NextPicture(+1);
+                  slideShow = false;
+                  break;
+    case kOk:     if (osd && !alwaysDisplayCaption)
+                     DELETENULL(osd);
+                  else {
+                     alwaysDisplayCaption = !alwaysDisplayCaption;
+                     DisplayCaption();
+                     }
+                  break;
+    case kGreen:
+    case kPrev:   NextDirectory(-1);
+                  slideShow = false;
+                  break;
+    case kYellow:
+    case kNext:   NextDirectory(+1);
+                  slideShow = false;
+                  break;
+    case kBlue:
+    case kStop:   return osEnd;
+    case kBack:   slideShow = false;
+                  cRemote::CallPlugin(PLUGIN_NAME_I18N);
+                  break;
+    default: break;
+    }
+  if (slideShow && slideShowDelay.TimedOut()) {
+     NextPicture(+1);
+     slideShowDelay.Set(SlideShowDelay * 1000);
+     }
+  return osContinue;
+}
+
+const char *cPictureControl::LastDisplayed(void)
+{
+  return lastDisplayed;
+}
diff --git a/PLUGINS/src/pictures/player.h b/PLUGINS/src/pictures/player.h
new file mode 100644
index 000000000..ee9488f11
--- /dev/null
+++ b/PLUGINS/src/pictures/player.h
@@ -0,0 +1,47 @@
+/*
+ * player.h: A player for still pictures
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: player.h 1.1 2008/01/12 16:21:57 kls Exp $
+ */
+
+#ifndef _PLAYER_H
+#define _PLAYER_H
+
+#include <vdr/osd.h>
+#include <vdr/player.h>
+#include <vdr/tools.h>
+#include "entry.h"
+
+extern int SlideShowDelay;
+
+cString HandleUnderscores(const char *s);
+
+class cPicturePlayer;
+
+class cPictureControl : public cControl {
+private:
+  static int active;
+  static cString lastDisplayed;
+  cPictureEntry *pictures;
+  const cPictureEntry *pictureEntry;
+  cPicturePlayer *player;
+  cOsd *osd;
+  cString lastPath;
+  cTimeMs slideShowDelay;
+  bool slideShow;
+  bool alwaysDisplayCaption;
+  void NextPicture(int Direction);
+  void NextDirectory(int Direction);
+  void DisplayCaption(void);
+  virtual void Hide(void) {}
+public:
+  cPictureControl(cPictureEntry *Pictures, const cPictureEntry *PictureEntry, bool SlideShow = false);
+  virtual ~cPictureControl();
+  virtual eOSState ProcessKey(eKeys Key);
+  static bool Active(void) { return active > 0; }
+  static const char *LastDisplayed(void);
+  };
+
+#endif //_PLAYER_H
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
new file mode 100644
index 000000000..48f942e5b
--- /dev/null
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@cadsoft.de>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pictures 0.0.1\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2008-01-12 17:41+0100\n"
+"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Pictures"
+msgstr "Bilder"
+
+msgid "A simple picture viewer"
+msgstr "Ein einfacher Bildbetrachter"
+
+msgid "Picture directory"
+msgstr "Bilder-Verzeichnis"
+
+msgid "Slide show delay (s)"
+msgstr "Dia-Schau Wartezeit"
+
+msgid "No picture directory has been defined!"
+msgstr "Es wurde kein Bilder-Verzeichnis angegeben!"
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 9625953fb..a20009afa 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2007/08/15 13:05:42 kls Exp $
+# $Id: Makefile 1.10 2008/01/13 13:00:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 52a520bc6..30fbb42c4 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.10 2007/08/15 13:06:08 kls Exp $
+# $Id: Makefile 1.11 2008/01/13 13:00:16 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 2c66d200d..d725a39ae 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.14 2007/08/15 13:06:17 kls Exp $
+# $Id: Makefile 1.15 2008/01/13 13:00:18 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index a69444691..7715284b7 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2007/08/15 13:06:28 kls Exp $
+# $Id: Makefile 1.9 2008/01/13 13:00:20 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/config.c b/config.c
index 1305ffbb5..31365f80b 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.157 2007/10/06 14:28:58 kls Exp $
+ * $Id: config.c 1.158 2007/11/25 13:46:27 kls Exp $
  */
 
 #include "config.h"
@@ -289,6 +289,7 @@ cSetup::cSetup(void)
   CurrentDolby = 0;
   InitialChannel = 0;
   InitialVolume = -1;
+  EmergencyExit = 1;
 }
 
 cSetup& cSetup::operator= (const cSetup &s)
@@ -464,6 +465,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
   else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = atoi(Value);
   else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
+  else if (!strcasecmp(Name, "EmergencyExit"))       EmergencyExit      = atoi(Value);
   else
      return false;
   return true;
@@ -546,6 +548,7 @@ bool cSetup::Save(void)
   Store("CurrentDolby",       CurrentDolby);
   Store("InitialChannel",     InitialChannel);
   Store("InitialVolume",      InitialVolume);
+  Store("EmergencyExit",      EmergencyExit);
 
   Sort();
 
diff --git a/config.h b/config.h
index 9ecda2778..ba3a38411 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.301 2007/11/10 13:38:19 kls Exp $
+ * $Id: config.h 1.303 2007/11/25 13:45:48 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.12"
-#define VDRVERSNUM   10512  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.13"
+#define VDRVERSNUM   10513  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.12"
-#define APIVERSNUM   10512  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.13"
+#define APIVERSNUM   10513  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -266,6 +266,7 @@ class cSetup : public cConfig<cSetupLine> {
   int CurrentDolby;
   int InitialChannel;
   int InitialVolume;
+  int EmergencyExit;
   int __EndData__;
   cSetup(void);
   cSetup& operator= (const cSetup &s);
diff --git a/cutter.c b/cutter.c
index b596f3f4d..42f3ab377 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.17 2007/08/25 10:33:18 kls Exp $
+ * $Id: cutter.c 1.18 2008/01/13 12:22:21 kls Exp $
  */
 
 #include "cutter.h"
@@ -111,7 +111,9 @@ void cCuttingThread::Action(void)
                  }
               }
            else {
-              error = "index";
+              // Error, unless we're past the last cut-in and there's no cut-out
+              if (Mark || LastMark)
+                 error = "index";
               break;
               }
 
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index e84559425..16a02c694 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 1.2 2007/11/03 14:36:07 kls Exp $
+ * $Id: dvbsubtitle.c 1.3 2007/11/25 13:33:08 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -102,7 +102,7 @@ class cSubtitleObject : public cListObject {
   uchar Get4Bits(const uchar *Data, int &Index);
   bool Decode2BppCodeString(const uchar *Data, int &Index, int&x, int y);
   bool Decode4BppCodeString(const uchar *Data, int &Index, int&x, int y);
-  bool Decode8BppCodeString(const uchar *Data, int &Index, int&y, int y);
+  bool Decode8BppCodeString(const uchar *Data, int &Index, int&x, int y);
 public:
   cSubtitleObject(int ObjectId, cBitmap *Bitmap);
   int ObjectId(void) { return objectId; }
diff --git a/menu.c b/menu.c
index 7b8ce9a22..b7ecf2a51 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.465 2007/11/03 15:02:00 kls Exp $
+ * $Id: menu.c 1.469 2008/01/13 13:59:33 kls Exp $
  */
 
 #include "menu.h"
@@ -931,6 +931,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        case kRed:    state = OnOff(); break; // must go through SetHelpKeys()!
        case kGreen:  return New();
        case kYellow: state = Delete(); break;
+       case kInfo:
        case kBlue:   return Info();
                      break;
        default: break;
@@ -986,6 +987,7 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
                   cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
                   return osContinue;
+    case kInfo:   return osBack;
     default: break;
     }
 
@@ -1057,12 +1059,13 @@ bool cMenuScheduleItem::Update(bool Force)
      char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
      char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' ';
      const char *csn = channel ? channel->ShortName(true) : NULL;
+     cString eds = event->GetDateString();
      if (channel && withDate)
-        asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
+        asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
      else if (channel)
         asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title());
      else
-        asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", 6, *event->GetDateString(), *event->GetTimeString(), t, v, r, event->Title());
+        asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
      SetText(buffer, false);
      result = true;
      }
@@ -1216,6 +1219,7 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                      }
                      break;
        case kBlue:   return Switch();
+       case kInfo:
        case kOk:     if (Count())
                         return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true, true));
                      break;
@@ -1486,6 +1490,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        case kBlue:   if (Count() && otherChannel)
                         return Switch();
                      break;
+       case kInfo:
        case kOk:     if (Count())
                         return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel, true));
                      break;
@@ -1815,6 +1820,7 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
                   DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
                   cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft);
                   return osContinue;
+    case kInfo:   return osBack;
     default: break;
     }
 
@@ -2112,6 +2118,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kRed:    return (helpKeys > 1 && RecordingCommands.Count()) ? Commands() : Play();
        case kGreen:  return Rewind();
        case kYellow: return Delete();
+       case kInfo:
        case kBlue:   return Info();
        case k1...k9: return Commands(Key);
        case kNone:   if (Recordings.StateChanged(recordingsState))
@@ -2760,6 +2767,7 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0));
   Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
+  Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"),             &data.EmergencyExit));
 }
 
 // --- cMenuSetupPluginItem --------------------------------------------------
@@ -3008,6 +3016,7 @@ bool cMenuMain::Update(bool Force)
         Minutes %= 60;
         //XXX -> skin function!!!
         SetTitle(cString::sprintf("%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free")));
+        lastFreeMB = FreeMB;
         result = true;
         }
      lastDiskSpaceCheck = time(NULL);
diff --git a/newplugin b/newplugin
index e025f74fa..d4d82fe83 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.39 2007/11/04 10:42:52 kls Exp $
+# $Id: newplugin 1.41 2008/01/13 13:00:23 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -77,7 +77,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -149,7 +149,7 @@ I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 	cp \$< \$\@
 
 .PHONY: i18n
-i18n: \$(I18Nmsgs)
+i18n: \$(I18Nmsgs) \$(I18Npot)
 
 ### Targets:
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c874f431d..fa5c84709 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -778,6 +778,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index cdd5715b8..c3ae43cdb 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr "jako naposledy"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spu�t�n�"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Moduly"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index b11e105a3..e08e7e46d 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr "som f
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lydstyrke ved opstart"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 621c3fc37..05f139e58 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -776,6 +776,9 @@ msgstr "wie vorher"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lautst�rke beim Einschalten"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "Notausstieg"
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 1e79779b4..4595fb1f9 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "����������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 39450a866..a90a74e0f 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index f8edfc149..d5c47cd0e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr "nagu enne"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus k�ivitamisel"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Laiendusmoodulid"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 6ab26386e..b0de1e516 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -779,6 +779,9 @@ msgstr "edellinen"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��nenvoimakkuus k�ynnistett�ess�"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Laajennokset"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index de25e8047..35d35af59 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-10-18 16:12+0100\n"
 "Last-Translator: Michael Nival <mnival@club-internet.fr>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -782,6 +782,9 @@ msgstr "comme avant"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index f0712a0cb..a7bf2e172 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -777,6 +777,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Dodaci (Plugins)"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 6f8b9add4..ebd244fef 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -4,15 +4,16 @@
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
 # Thomas G�nther <tom@toms-cafe.de>, 2007
+# Istv�n F�ley <ifuley@tigercomp.ro>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
-"PO-Revision-Date: 2007-10-13 14:32+0200\n"
-"Last-Translator: Thomas G�nther <tom@toms-cafe.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"POT-Creation-Date: 2008-01-13 14:21+0100\n"
+"PO-Revision-Date: 2007-12-01 21:42+0200\n"
+"Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -168,7 +169,7 @@ msgid "Key$Audio"
 msgstr "Hang"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Feliratok"
 
 msgid "Key$Schedule"
 msgstr "Program"
@@ -189,31 +190,31 @@ msgid "Key$Commands"
 msgstr "Parancsok"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Felhaszn�l�1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Felhaszn�l�2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Felhaszn�l�3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Felhaszn�l�4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Felhaszn�l�5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Felhaszn�l�6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Felhaszn�l�7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Felhaszn�l�8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Felhaszn�l�9"
 
 msgid "Free To Air"
 msgstr "K�dolatlan"
@@ -255,10 +256,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -291,19 +292,19 @@ msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "Modulation"
+msgstr "Modul�ci�"
 
 msgid "Bandwidth"
-msgstr "Bandwidth"
+msgstr "S�vsz�less�g"
 
 msgid "Transmission"
-msgstr "Transmission"
+msgstr "�tvitel"
 
 msgid "Guard"
 msgstr "Guard"
 
 msgid "Hierarchy"
-msgstr "Hierarchy"
+msgstr "Hierarhia"
 
 msgid "Channel settings are not unique!"
 msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
@@ -426,7 +427,7 @@ msgid "Please enter %d digits!"
 msgstr "�ss�n be %d sz�mot!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "A CAM nem v�laszol!"
 
 msgid "Recording info"
 msgstr "Felv�tel"
@@ -498,25 +499,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Kisbet�t haszn�lni"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Alap�rtelmezett bet�tipus"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Kis bet�tipus"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "K�t�tt bet�tipus"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Alap�rtelmezett bet�tipus m�ret (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Kis bet�tipus m�ret (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "K�t�tt bet�tipus m�ret (pixel)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Ad�sinform�ci� pozici�ja"
@@ -593,10 +594,10 @@ msgid "names only"
 msgstr "kiz�r�lag nevek"
 
 msgid "PIDs only"
-msgstr "kiz�r�lag PID-k"
+msgstr "kiz�r�lag PIDek"
 
 msgid "names and PIDs"
-msgstr "nevek �s PID-k"
+msgstr "nevek �s PIDek"
 
 msgid "add new channels"
 msgstr "�j ad�k hozz�ad�sa"
@@ -623,28 +624,28 @@ msgid "Setup.DVB$Update channels"
 msgstr "Ad�k aktualiz�l�sa"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Audio-nyelvek"
+msgstr "Audio nyelvek"
 
 msgid "Setup.DVB$Audio language"
-msgstr "Audio-nyelv"
+msgstr "Audio nyelv"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Felirat l�that�"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Felirat nyelvek"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Felirat nyelv"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Felirat eltol�sa"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Felirat transzparenci�ja"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Felirat h�tter�nek transzparenci�ja"
 
 msgid "LNB"
 msgstr "LNB"
@@ -662,13 +663,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Fels� LNB-frekvencia (MHZ)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM �jraind�t�s"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM jelen"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM m�k�dik"
 
 msgid "CAM"
 msgstr "CAM"
@@ -680,16 +681,16 @@ msgid "Button$Reset"
 msgstr "Reset"
 
 msgid "Opening CAM menu..."
-msgstr "A CAM-men� nyit�s alatt..."
+msgstr "A CAM men� nyit�s alatt..."
 
 msgid "Can't open CAM menu!"
-msgstr "A CAM-Men� nem nyithat�"
+msgstr "A CAM men� nem nyithat�"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM haszn�latban - val�ban �jraind�tjuk?"
 
 msgid "Can't reset CAM!"
-msgstr "A CAM-Reset nem siker�lt"
+msgstr "A CAM �jraind�t�s nem siker�lt"
 
 msgid "Recording"
 msgstr "Felv�tel"
@@ -704,10 +705,10 @@ msgid "Setup.Recording$Primary limit"
 msgstr "Prim�r-hat�r"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Default priority"
+msgstr "Alap�rtelmezett priorit�s"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Default �lettartam"
+msgstr "Alap�rtelmezett �lettartam"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Sz�net priorit�s"
@@ -767,7 +768,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Ad�sv�lt�s ideje (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Csatornav�lt�s timeout (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Ad�s a bekapcsol�sn�l"
@@ -778,6 +779,10 @@ msgstr "ahogy az el
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hanger� a bekapcsol�sn�l"
 
+#, fuzzy
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "ahogy az el�bb"
+
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -839,13 +844,13 @@ msgid "No audio available!"
 msgstr "Hang nem lehets�ges!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Felirat ki"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Feliratok"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "A csatorn�n nincs felirat!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Nincs elegend� hely a felv�telre"
@@ -870,7 +875,7 @@ msgid "Editing process started"
 msgstr "V�g�s elind�tva"
 
 msgid "Editing process already active!"
-msgstr "A v�g�s m�r aktiv�lt!"
+msgstr "A v�g�s m�r akt�v!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
@@ -906,7 +911,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Szerkeszt�s folyamatban - val�ban le�ll�tjuk?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Felv�tel folyamatban van - m�gis kikapcsolni?"
@@ -920,10 +925,10 @@ msgstr "m
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "A(z) %s plugin  �breszt %ld perc m�lva, folytatjuk?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Szerkeszt�s folyamatban - val�ban �jraind�tjuk?"
 
 msgid "Recording - restart anyway?"
 msgstr "Felv�tel folyamatban van - m�gis �jraind�tani?"
@@ -977,10 +982,10 @@ msgid "Recording started"
 msgstr "A felv�tel elind�tva"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "A VDR k�s�bb fog le�llni - Kikapcs gombbal k�nyszer�tett le�ll�t�s"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Nyomj egy gombot a le�ll�s meg�ll�t�s�hoz"
+msgstr "Nyomj egy gombot a le�ll�s megszak�t�s�hoz"
 
 msgid "Switching primary DVB..."
 msgstr "Prim�r Interface �tkapcsolva..."
@@ -992,8 +997,8 @@ msgid "Editing process finished"
 msgstr "V�g�s befejezve"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Nyomj egy gombot az �jraind�t�s megszak�t�s�hoz"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "A VDR le�ll %s perc m�lva"
diff --git a/po/it_IT.po b/po/it_IT.po
index 18eced8bc..2f88680b6 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-10-16 02:15+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -779,6 +779,9 @@ msgstr "come prima"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c8a9b3687..e945befa4 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -778,6 +778,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 806399220..bd2238e30 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -777,6 +777,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 966384087..d8be8772d 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr "jak ostatnio"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Wtyczki"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8439538f9..1786077d9 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugins"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 52b34521c..72fc8b9b2 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -777,6 +777,9 @@ msgstr "ca mai 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Plugin-uri"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 6e4f41ac4..6f6038edc 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-11-05 14:24+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -777,6 +777,9 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��������� ��� ���������"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "������ ����������"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index da1de4de7..002b82cd1 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -777,6 +777,9 @@ msgstr "kot prej"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Vstavki"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index cde4ca7d5..40d3c252a 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -777,6 +777,9 @@ msgstr "som f
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Moduler"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 461a3229f..57a73090c 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-10-13 11:29+0200\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-24 14:37+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "A��l��daki ses"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "Eklentiler"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index fdddc9018..70afcaf84 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-01 11:36+0100\n"
+"POT-Creation-Date: 2007-11-25 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -776,6 +776,9 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "�������� ��� ���������"
 
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr ""
+
 msgid "Plugins"
 msgstr "������ ����������"
 
diff --git a/remux.c b/remux.c
index e265c40f8..9b9aa24fe 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.63 2007/11/18 14:45:28 kls Exp $
+ * $Id: remux.c 1.64 2007/11/25 13:56:03 kls Exp $
  */
 
 #include "remux.h"
@@ -2099,8 +2099,10 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
                if (pt != NO_PICTURE) {
                   if (pt < I_FRAME || B_FRAME < pt) {
                      esyslog("ERROR: unknown picture type '%d'", pt);
-                     if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure)
+                     if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure) {
                         ShutdownHandler.RequestEmergencyExit();
+                        numUPTerrors = 0;
+                        }
                      }
                   else if (!synced) {
                      if (pt == I_FRAME) {
diff --git a/shutdown.c b/shutdown.c
index 4fde54403..ea137edf9 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 1.2 2007/10/19 14:33:40 kls Exp $
+ * $Id: shutdown.c 1.4 2008/01/13 14:27:29 kls Exp $
  */
 
 #include "shutdown.h"
@@ -95,9 +95,13 @@ cShutdownHandler::~cShutdownHandler()
 
 void cShutdownHandler::RequestEmergencyExit(void)
 {
-  esyslog("initiating emergency exit");
-  emergencyExitRequested = true;
-  Exit(1);
+  if (Setup.EmergencyExit) {
+     esyslog("initiating emergency exit");
+     emergencyExitRequested = true;
+     Exit(1);
+     }
+  else
+     dsyslog("emergency exit request ignored according to setup");
 }
 
 void cShutdownHandler::CheckManualStart(int ManualStart)
@@ -150,6 +154,9 @@ void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force)
 
 bool cShutdownHandler::ConfirmShutdown(bool Interactive)
 {
+  if (!Interactive && !cRemote::Enabled())
+     return false;
+
   if (!shutdownCommand) {
      if (Interactive)
         Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
diff --git a/skinclassic.c b/skinclassic.c
index 144d0722b..11b5ce441 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.18 2007/07/29 12:35:03 kls Exp $
+ * $Id: skinclassic.c 1.19 2008/01/13 12:38:00 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -162,6 +162,7 @@ class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
   int x0, x1;
   int y0, y1, y2, y3, y4, y5;
   int lineHeight;
+  int dateWidth;
   cString lastDate;
   void SetScrollbar(void);
 public:
@@ -186,6 +187,7 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   lineHeight = font->Height();
+  dateWidth = 0;
   x0 = 0;
   x1 = cOsd::OsdWidth();
   y0 = 0;
@@ -253,7 +255,7 @@ void cSkinClassicDisplayMenu::Clear(void)
 void cSkinClassicDisplayMenu::SetTitle(const char *Title)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x1 - x0);
+  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x1 - x0 - dateWidth);
 }
 
 void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
@@ -395,6 +397,7 @@ void cSkinClassicDisplayMenu::Flush(void)
      int w = font->Width(date);
      osd->DrawText(x1 - w - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font, w);
      lastDate = date;
+     dateWidth = max(w + 2, dateWidth);
      }
   osd->Flush();
 }
diff --git a/svdrp.c b/svdrp.c
index c8cd5be89..2ac3a4bbd 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.104 2007/10/13 10:17:48 kls Exp $
+ * $Id: svdrp.c 1.105 2008/01/13 15:06:25 kls Exp $
  */
 
 #include "svdrp.h"
@@ -185,8 +185,9 @@ const char *HelpPages[] = {
   "    Switch channel up, down or to the given channel number, name or id.\n"
   "    Without option (or after successfully switching to the channel)\n"
   "    it returns the current channel number and name.",
-  "CLRE\n"
-  "    Clear the entire EPG list.",
+  "CLRE [ <number> | <name> | <id> ]\n"
+  "    Clear the EPG list of the given channel number, name or id.\n"
+  "    Without option it clears the entire EPG list.",
   "DELC <number>\n"
   "    Delete channel.",
   "DELR <number>\n"
@@ -538,8 +539,57 @@ void cSVDRP::CmdCHAN(const char *Option)
 
 void cSVDRP::CmdCLRE(const char *Option)
 {
-  cSchedules::ClearAll();
-  Reply(250, "EPG data cleared");
+  if (*Option) {
+     tChannelID ChannelID = tChannelID::InvalidID;
+     if (isnumber(Option)) {
+        int o = strtol(Option, NULL, 10);
+        if (o >= 1 && o <= Channels.MaxNumber())
+           ChannelID = Channels.GetByNumber(o)->GetChannelID();
+        }
+     else {
+        ChannelID = tChannelID::FromString(Option);
+        if (ChannelID == tChannelID::InvalidID) {
+           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+               if (!Channel->GroupSep()) {
+                  if (strcasecmp(Channel->Name(), Option) == 0) {
+                     ChannelID = Channel->GetChannelID();
+                     break;
+                     }
+                  }
+               }
+           }
+        }
+     if (!(ChannelID == tChannelID::InvalidID)) {
+        cSchedulesLock SchedulesLock(true, 1000);
+        cSchedules *s = (cSchedules *)cSchedules::Schedules(SchedulesLock);
+        if (s) {
+           cSchedule *Schedule = NULL;
+           ChannelID.ClrRid();
+           for (cSchedule *p = s->First(); p; p = s->Next(p)) {
+               if (p->ChannelID() == ChannelID) {
+                  Schedule = p;
+                  break;
+                  }
+               }
+           if (Schedule) {
+              Schedule->Cleanup(INT_MAX);
+              Reply(250, "EPG data of channel \"%s\" cleared", Option);
+              }
+           else {
+              Reply(550, "No EPG data found for channel \"%s\"", Option);
+              return;
+              }
+           }
+        else
+           Reply(451, "Can't get EPG data");
+        }
+     else
+        Reply(501, "Undefined channel \"%s\"", Option);
+     }
+  else {
+     cSchedules::ClearAll();
+     Reply(250, "EPG data cleared");
+     }
 }
 
 void cSVDRP::CmdDELC(const char *Option)
diff --git a/tools.c b/tools.c
index ba7b0cf90..98d2501f0 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.137 2007/11/03 15:34:07 kls Exp $
+ * $Id: tools.c 1.140 2008/01/13 11:26:30 kls Exp $
  */
 
 #include "tools.h"
@@ -545,6 +545,41 @@ cTimeMs::cTimeMs(int Ms)
 
 uint64_t cTimeMs::Now(void)
 {
+#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
+#define MIN_RESOLUTION 5 // ms
+  static bool initialized = false;
+  static bool monotonic = false;
+  struct timespec tp;
+  if (!initialized) {
+     // check if monotonic timer is available and provides enough accurate resolution:
+     if (clock_getres(CLOCK_MONOTONIC, &tp) == 0) {
+        long Resolution = tp.tv_nsec;
+        // require a minimum resolution:
+        if (tp.tv_sec == 0 && tp.tv_nsec <= MIN_RESOLUTION * 1000000) {
+           if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+              dsyslog("cTimeMs: using monotonic clock (resolution is %ld ns)", Resolution);
+              monotonic = true;
+              }
+           else
+              esyslog("cTimeMs: clock_gettime(CLOCK_MONOTONIC) failed");
+           }
+        else
+           dsyslog("cTimeMs: not using monotonic clock - resolution is too bad (%ld s %ld ns)", tp.tv_sec, tp.tv_nsec);
+        }
+     else
+        esyslog("cTimeMs: clock_getres(CLOCK_MONOTONIC) failed");
+     initialized = true;
+     }
+  if (monotonic) {
+     if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+        return (uint64_t(tp.tv_sec)) * 1000 + tp.tv_nsec / 1000000;
+     esyslog("cTimeMs: clock_gettime(CLOCK_MONOTONIC) failed");
+     monotonic = false;
+     // fall back to gettimeofday()
+     }
+#else
+#  warning Posix monotonic clock not available
+#endif
   struct timeval t;
   if (gettimeofday(&t, NULL) == 0)
      return (uint64_t(t.tv_sec)) * 1000 + t.tv_usec / 1000;
@@ -838,6 +873,16 @@ cString &cString::operator=(const cString &String)
   return *this;
 }
 
+cString &cString::Truncate(int Index)
+{
+  int l = strlen(s);
+  if (Index < 0)
+     Index = l + Index;
+  if (Index >= 0 && Index < l)
+     s[Index] = 0;
+  return *this;
+}
+
 cString cString::sprintf(const char *fmt, ...)
 {
   va_list ap;
@@ -1174,6 +1219,7 @@ void cStringList::Clear(void)
 {
   for (int i = 0; i < Size(); i++)
       free(At(i));
+  cVector<char *>::Clear();
 }
 
 // --- cFileNameList ---------------------------------------------------------
diff --git a/tools.h b/tools.h
index 28dbd5ea0..3c804b521 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.108 2007/08/25 14:16:39 kls Exp $
+ * $Id: tools.h 1.110 2008/01/13 11:22:26 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -159,6 +159,7 @@ class cString {
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
   cString &operator=(const cString &String);
+  cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string).
   static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
   };
 
@@ -470,7 +471,10 @@ template<class T> class cVector {
        memmove(&data[Index], &data[Index + 1], (size - Index) * sizeof(T));
     size--;
   }
-  virtual void Clear(void) {}
+  virtual void Clear(void)
+  {
+    size = 0;
+  }
   void Sort(__compar_fn_t Compare)
   {
     qsort(data, size, sizeof(T), Compare);
diff --git a/vdr.c b/vdr.c
index a4e6e1f46..05b9e4878 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.302 2007/11/03 14:46:29 kls Exp $
+ * $Id: vdr.c 1.305 2008/01/13 11:51:53 kls Exp $
  */
 
 #include <getopt.h>
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
                        }
                     break;
           case 'l' | 0x100:
-                    LircDevice = optarg ? : LIRC_DEVICE;
+                    LircDevice = optarg ? optarg : LIRC_DEVICE;
                     break;
           case 'm': MuteAudio = true;
                     break;
@@ -345,7 +345,8 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
-          case 'w': if (isnumber(optarg)) { int t = atoi(optarg);
+          case 'w': if (isnumber(optarg)) {
+                       int t = atoi(optarg);
                        if (t >= 0) {
                           WatchdogTimeout = t;
                           break;
@@ -914,9 +915,11 @@ int main(int argc, char *argv[])
                break;
           // Info:
           case kInfo: {
-               bool WasInfoMenu = IsInfoMenu;
-               DELETE_MENU;
-               if (!WasInfoMenu) {
+               if (IsInfoMenu) {
+                  key = kNone; // nobody else needs to see this key
+                  DELETE_MENU;
+                  }
+               else if (!Menu) {
                   IsInfoMenu = true;
                   if (cControl::Control()) {
                      cControl::Control()->Hide();
@@ -930,6 +933,7 @@ int main(int argc, char *argv[])
                      cRemote::Put(kOk, true);
                      cRemote::Put(kSchedule, true);
                      }
+                  key = kNone; // nobody else needs to see this key
                   }
                }
                break;

From e3887083391d10f8cfcd1d8ac65a99d9978f05f2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 27 Jan 2008 18:00:00 +0100
Subject: [PATCH 180/307] =?UTF-8?q?Version=201.5.14=20-=20Fixed=20the=20Pl?=
 =?UTF-8?q?ay=20function=20in=20the=20pictures=20plugin.=20-=20Updated=20t?=
 =?UTF-8?q?he=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).?=
 =?UTF-8?q?=20-=20Updated=20the=20Makefile=20of=20the=20skincurses=20plugi?=
 =?UTF-8?q?n=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20The=20new=20option?=
 =?UTF-8?q?=20--localedir=20can=20be=20used=20to=20set=20the=20locale=20di?=
 =?UTF-8?q?rectory=20at=20runtime=20=20=20(based=20on=20a=20patch=20from?=
 =?UTF-8?q?=20Stefan=20Huelswitt).=20-=20Fixed=20finding=20new=20transpond?=
 =?UTF-8?q?ers=20(thanks=20to=20Winfried=20K=C3=B6hler).=20-=20Implemented?=
 =?UTF-8?q?=20handling=20of=20DVB-S2=20(thanks=20to=20Marco=20Schl=C3=BC?=
 =?UTF-8?q?=C3=9Fler=20and=20Reinhard=20Nissl=20=20=20for=20a=20patch=20th?=
 =?UTF-8?q?at=20was=20used=20to=20implement=20this).=20VDR=20now=20require?=
 =?UTF-8?q?s=20the=20"multiproto"=20=20=20DVB=20driver,=20e.g.=20from=20ht?=
 =?UTF-8?q?tp://jusst.de/hg/multiproto.=20-=20Removed=20switching=20to=20t?=
 =?UTF-8?q?he=20next=20higher=20or=20lower=20channel=20if=20the=20current?=
 =?UTF-8?q?=20channel=20=20=20is=20not=20available,=20in=20order=20to=20al?=
 =?UTF-8?q?low=20staying=20on=20an=20encrypted=20channel=20that=20takes=20?=
 =?UTF-8?q?=20=20a=20while=20for=20the=20CAM=20to=20start=20decrypting.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                     |   7 +
 HISTORY                          |  15 ++
 PLUGINS/src/pictures/HISTORY     |   6 +
 PLUGINS/src/pictures/entry.c     |   7 +-
 PLUGINS/src/pictures/pictures.c  |   4 +-
 PLUGINS/src/pictures/player.c    |   3 +-
 PLUGINS/src/pictures/po/fi_FI.po |  32 ++++
 PLUGINS/src/skincurses/HISTORY   |   4 +
 PLUGINS/src/skincurses/Makefile  |  15 +-
 channels.c                       | 218 ++++++++++++++--------
 channels.h                       |  22 ++-
 config.h                         |  10 +-
 device.c                         |  23 ++-
 device.h                         |   8 +-
 dvbdevice.c                      | 301 +++++++++++++++++++------------
 dvbdevice.h                      |  10 +-
 i18n.c                           |   6 +-
 i18n.h                           |   6 +-
 menu.c                           |  80 +-------
 menuitems.c                      |  60 +++++-
 menuitems.h                      |  13 +-
 nit.c                            |  44 +++--
 pat.c                            |   3 +-
 po/ca_ES.po                      |  44 +++--
 po/cs_CZ.po                      |  44 +++--
 po/da_DK.po                      |  44 +++--
 po/de_DE.po                      |  44 +++--
 po/el_GR.po                      |  44 +++--
 po/es_ES.po                      |  44 +++--
 po/et_EE.po                      |  44 +++--
 po/fi_FI.po                      |  46 +++--
 po/fr_FR.po                      |  44 +++--
 po/hr_HR.po                      |  44 +++--
 po/hu_HU.po                      |  44 +++--
 po/it_IT.po                      |  44 +++--
 po/nl_NL.po                      |  44 +++--
 po/nn_NO.po                      |  44 +++--
 po/pl_PL.po                      |  44 +++--
 po/pt_PT.po                      |  44 +++--
 po/ro_RO.po                      |  44 +++--
 po/ru_RU.po                      |  44 +++--
 po/sl_SI.po                      |  44 +++--
 po/sv_SE.po                      |  44 +++--
 po/tr_TR.po                      |  44 +++--
 po/uk_UA.po                      |  44 +++--
 sdt.c                            |   3 +-
 vdr.5                            |  18 +-
 vdr.c                            |  21 ++-
 48 files changed, 1298 insertions(+), 611 deletions(-)
 create mode 100644 PLUGINS/src/pictures/po/fi_FI.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7f5acb858..d79f152be 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -223,6 +223,7 @@ Stefan Huelswitt <huels@iname.com>
  for suggesting to increase the APIVERSION to allow plugins that relied on the
  cStatus::MsgSetVolume() bug to react properly
  for improving the 'i18n' target in the Makefile to avoid unnecessary work
+ for a patch that was used to implement the --localedir option
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -1037,6 +1038,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for implementing cDevice::CloseFilter()
  for some fixes to PLUGINS.html
  for fixing handling CONFDIR
+ for updating the Makefile of the skincurses plugin
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1155,6 +1157,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing assembling PS1 packets in cTS2PES::instant_repack()
  for a patch that was used to fix handling small PES packets that caused subtitles
  to be displayed late in live mode
+ for a patch that was used to implement handling of DVB-S2
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1443,6 +1446,7 @@ Marco Schl
  for fixing the description of DeviceSetAvailableTrack() and cReceiver(), and adding
  an example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
  for fixing checking compatibility mode for old subtitles plugin
+ for a patch that was used to implement handling of DVB-S2
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -2263,3 +2267,6 @@ Jiri Dobry <jdobry@centrum.cz>
 Benjamin Hess <benjamin.h@gmx.ch>
  for enhancing the SVDRP command CLRE to allow clearing the EPG data of a particular
  channel
+
+Winfried Koehler <w_koehl@gmx.de>
+ for fixing finding new transponders
diff --git a/HISTORY b/HISTORY
index 3c953253b..1400840b1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5563,3 +5563,18 @@ Video Disk Recorder Revision History
 - Added a section about "Logging" to PLUGINS.html (suggested by Torsten Kunkel).
 - Enhanced the SVDRP command CLRE to allow clearing the EPG data of a particular
   channel (thanks to Benjamin Hess).
+
+2008-01-27: Version 1.5.14
+
+- Fixed the Play function in the pictures plugin.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Makefile of the skincurses plugin (thanks to Rolf Ahrenberg).
+- The new option --localedir can be used to set the locale directory at runtime
+  (based on a patch from Stefan Huelswitt).
+- Fixed finding new transponders (thanks to Winfried K�hler).
+- Implemented handling of DVB-S2 (thanks to Marco Schl��ler and Reinhald Nissl
+  for a patch that was used to implement this). VDR now requires the "multiproto"
+  DVB driver, e.g. from http://jusst.de/hg/multiproto.
+- Removed switching to the next higher or lower channel if the current channel
+  is not available, in order to allow staying on an encrypted channel that takes
+  a while for the CAM to start decrypting.
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index c04a6280b..462c02f11 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -4,3 +4,9 @@ VDR Plugin 'pictures' Revision History
 2008-01-13: Version 0.0.1
 
 - Initial revision.
+
+2008-01-19: Version 0.0.2
+
+- Fixed the Play function (when used from a directory in the pictures menu
+  it always started with the next directory).
+- Added Finnish texts (thanks to Rolf Ahrenberg <rahrenbe@cc.hut.fi>).
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index 006a359e5..e03858c93 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.c 1.1 2008/01/06 09:52:41 kls Exp $
+ * $Id: entry.c 1.2 2008/01/18 15:49:51 kls Exp $
  */
 
 #include "entry.h"
@@ -138,6 +138,11 @@ const cPictureEntry *cPictureEntry::NextPicture(const cPictureEntry *This) const
         return pe;
         }
      }
+  else if (IsDirectory()) {
+     const cPictureEntry *p = FirstPicture();
+     if (p)
+        return p;
+     }
   if (parent)
      return parent->NextPicture(this);
   return NULL;
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index aa06c986e..e3015e401 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 1.1 2008/01/12 14:46:52 kls Exp $
+ * $Id: pictures.c 1.2 2008/01/19 11:20:03 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.1";
+static const char *VERSION       = "0.0.2";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index 9e07fc53a..b942be527 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 1.1 2008/01/13 11:29:27 kls Exp $
+ * $Id: player.c 1.2 2008/01/19 11:01:58 kls Exp $
  */
 
 #include "player.h"
@@ -95,6 +95,7 @@ cPictureControl::cPictureControl(cPictureEntry *Pictures, const cPictureEntry *P
   pictureEntry = PictureEntry;
   osd = NULL;
   lastPath = "/";
+  slideShowDelay.Set(SlideShowDelay * 1000);
   slideShow = SlideShow;
   alwaysDisplayCaption = false;
   NextPicture(slideShow && pictureEntry->IsDirectory() ? 1 : 0);
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
new file mode 100644
index 000000000..df5a4a11b
--- /dev/null
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pictures 0.0.1\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2008-01-12 17:41+0100\n"
+"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Language-Team: Finnish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Pictures"
+msgstr "Kuvat"
+
+msgid "A simple picture viewer"
+msgstr "Yksinkertainen kuvaselain"
+
+msgid "Picture directory"
+msgstr "Kuvahakemisto"
+
+msgid "Slide show delay (s)"
+msgstr "Diaesityksen viive (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Kuvahakemistoa ei ole m��ritelty!"
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 34efba9cc..e5bfa49d8 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -61,3 +61,7 @@ VDR Plugin 'skincurses' Revision History
 2007-08-26: Version 0.1.4
 
 - Adapted to the new Level parameter of cOsd.
+
+2008-01-19:
+
+- Updated the Makefile of the skincurses plugin (thanks to Rolf Ahrenberg).
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 17f8540cc..4dc4e28ad 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,11 +1,13 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.14 2007/11/04 10:52:13 kls Exp $
+# $Id: Makefile 1.15 2008/01/19 11:40:33 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
 #
 PLUGIN = skincurses
 
@@ -16,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -56,9 +58,9 @@ all: libvdr-$(PLUGIN).so i18n
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
@@ -88,7 +90,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	cp $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs)
+i18n: $(I18Nmsgs) $(I18Npot)
 
 ### Targets:
 
@@ -105,5 +107,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/channels.c b/channels.c
index b01bb9319..dd1967f18 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.55 2007/10/12 14:40:53 kls Exp $
+ * $Id: channels.c 1.56 2008/01/27 13:59:53 kls Exp $
  */
 
 #include "channels.h"
@@ -21,67 +21,114 @@
 // -- Channel Parameter Maps -------------------------------------------------
 
 const tChannelParameterMap InversionValues[] = {
-  {   0, INVERSION_OFF },
-  {   1, INVERSION_ON },
-  { 999, INVERSION_AUTO },
+  {   0, DVBFE_INVERSION_OFF, trNOOP("off") },
+  {   1, DVBFE_INVERSION_ON,  trNOOP("on") },
+  { 999, DVBFE_INVERSION_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap BandwidthValues[] = {
-  {   6, BANDWIDTH_6_MHZ },
-  {   7, BANDWIDTH_7_MHZ },
-  {   8, BANDWIDTH_8_MHZ },
-  { 999, BANDWIDTH_AUTO },
+  {   5, DVBFE_BANDWIDTH_5_MHZ, "5 MHz" },
+  {   6, DVBFE_BANDWIDTH_6_MHZ, "6 MHz" },
+  {   7, DVBFE_BANDWIDTH_7_MHZ, "7 MHz" },
+  {   8, DVBFE_BANDWIDTH_8_MHZ, "8 MHz" },
+  { 999, DVBFE_BANDWIDTH_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap CoderateValues[] = {
-  {   0, FEC_NONE },
-  {  12, FEC_1_2 },
-  {  23, FEC_2_3 },
-  {  34, FEC_3_4 },
-  {  45, FEC_4_5 },
-  {  56, FEC_5_6 },
-  {  67, FEC_6_7 },
-  {  78, FEC_7_8 },
-  {  89, FEC_8_9 },
-  { 999, FEC_AUTO },
+  {   0, DVBFE_FEC_NONE, trNOOP("none") },
+  {  12, DVBFE_FEC_1_2,  "1/2" },
+  {  13, DVBFE_FEC_1_3,  "1/3" },
+  {  14, DVBFE_FEC_1_4,  "1/4" },
+  {  23, DVBFE_FEC_2_3,  "2/3" },
+  {  25, DVBFE_FEC_2_5,  "2/5" },
+  {  34, DVBFE_FEC_3_4,  "3/4" },
+  {  35, DVBFE_FEC_3_5,  "3/5" },
+  {  45, DVBFE_FEC_4_5,  "4/5" },
+  {  56, DVBFE_FEC_5_6,  "5/6" },
+  {  67, DVBFE_FEC_6_7,  "6/7" },
+  {  78, DVBFE_FEC_7_8,  "7/8" },
+  {  89, DVBFE_FEC_8_9,  "8/9" },
+  { 910, DVBFE_FEC_9_10, "9/10" },
+  { 999, DVBFE_FEC_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap ModulationValues[] = {
-  {   0, QPSK },
-  {  16, QAM_16 },
-  {  32, QAM_32 },
-  {  64, QAM_64 },
-  { 128, QAM_128 },
-  { 256, QAM_256 },
-  { 999, QAM_AUTO },
+  {   0, DVBFE_MOD_NONE,    trNOOP("none") },
+  {   4, DVBFE_MOD_QAM4,    "QAM4" },
+  {  16, DVBFE_MOD_QAM16,   "QAM16" },
+  {  32, DVBFE_MOD_QAM32,   "QAM32" },
+  {  64, DVBFE_MOD_QAM64,   "QAM64" },
+  { 128, DVBFE_MOD_QAM128,  "QAM128" },
+  { 256, DVBFE_MOD_QAM256,  "QAM256" },
+  { 512, DVBFE_MOD_QAM512,  "QAM512" },
+  {1024, DVBFE_MOD_QAM1024, "QAM1024" },
+  {   1, DVBFE_MOD_BPSK,    "BPSK" },
+  {   2, DVBFE_MOD_QPSK,    "QPSK" },
+  {   3, DVBFE_MOD_OQPSK,   "OQPSK" },
+  {   5, DVBFE_MOD_8PSK,    "8PSK" },
+  {   6, DVBFE_MOD_16APSK,  "16APSK" },
+  {   7, DVBFE_MOD_32APSK,  "32APSK" },
+  {   8, DVBFE_MOD_OFDM,    "OFDM" },
+  {   9, DVBFE_MOD_COFDM,   "COFDM" },
+  {  10, DVBFE_MOD_VSB8,    "VSB8" },
+  {  11, DVBFE_MOD_VSB16,   "VSB16" },
+  { 998, DVBFE_MOD_QAMAUTO, "QAMAUTO" },
+  { 999, DVBFE_MOD_AUTO },
+  { -1 }
+  };
+
+const tChannelParameterMap SystemValues[] = {
+  {   0, DVBFE_DELSYS_DVBS,  "DVB-S" },
+  {   1, DVBFE_DELSYS_DVBS2, "DVB-S2" },
   { -1 }
   };
 
 const tChannelParameterMap TransmissionValues[] = {
-  {   2, TRANSMISSION_MODE_2K },
-  {   8, TRANSMISSION_MODE_8K },
-  { 999, TRANSMISSION_MODE_AUTO },
+  {   2, DVBFE_TRANSMISSION_MODE_2K, "2K" },
+  {   4, DVBFE_TRANSMISSION_MODE_4K, "4K" },
+  {   8, DVBFE_TRANSMISSION_MODE_8K, "8K" },
+  { 999, DVBFE_TRANSMISSION_MODE_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap GuardValues[] = {
-  {   4, GUARD_INTERVAL_1_4 },
-  {   8, GUARD_INTERVAL_1_8 },
-  {  16, GUARD_INTERVAL_1_16 },
-  {  32, GUARD_INTERVAL_1_32 },
-  { 999, GUARD_INTERVAL_AUTO },
+  {   4, DVBFE_GUARD_INTERVAL_1_4,  "1/4" },
+  {   8, DVBFE_GUARD_INTERVAL_1_8,  "1/8" },
+  {  16, DVBFE_GUARD_INTERVAL_1_16, "1/16" },
+  {  32, DVBFE_GUARD_INTERVAL_1_32, "1/32" },
+  { 999, DVBFE_GUARD_INTERVAL_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap HierarchyValues[] = {
-  {   0, HIERARCHY_NONE },
-  {   1, HIERARCHY_1 },
-  {   2, HIERARCHY_2 },
-  {   4, HIERARCHY_4 },
-  { 999, HIERARCHY_AUTO },
+  {   0, DVBFE_HIERARCHY_OFF, trNOOP("off") },
+  {   1, DVBFE_HIERARCHY_ON,  trNOOP("on") },
+  { 999, DVBFE_HIERARCHY_AUTO },
+  { -1 }
+  };
+
+const tChannelParameterMap AlphaValues[] = {
+  {   0, 0 },
+  {   1, DVBFE_ALPHA_1 },
+  {   2, DVBFE_ALPHA_2 },
+  {   4, DVBFE_ALPHA_4 },
+  { -1 }
+  };
+
+const tChannelParameterMap PriorityValues[] = {
+  {   0, DVBFE_STREAM_PRIORITY_HP, trNOOP("high") },
+  {   1, DVBFE_STREAM_PRIORITY_LP, trNOOP("low") },
+  { -1 }
+  };
+
+const tChannelParameterMap RollOffValues[] = {
+  {   0, DVBFE_ROLLOFF_UNKNOWN },
+  {  20, DVBFE_ROLLOFF_20, "0.20" },
+  {  25, DVBFE_ROLLOFF_25, "0.25" },
+  {  35, DVBFE_ROLLOFF_35, "0.35" },
   { -1 }
   };
 
@@ -107,11 +154,14 @@ int DriverIndex(int Value, const tChannelParameterMap *Map)
   return -1;
 }
 
-int MapToUser(int Value, const tChannelParameterMap *Map)
+int MapToUser(int Value, const tChannelParameterMap *Map, const char **String)
 {
   int n = DriverIndex(Value, Map);
-  if (n >= 0)
+  if (n >= 0) {
+     if (String)
+        *String = tr(Map[n].userString);
      return Map[n].userValue;
+     }
   return -1;
 }
 
@@ -167,14 +217,18 @@ cChannel::cChannel(void)
   provider = strdup("");
   portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-  inversion    = INVERSION_AUTO;
-  bandwidth    = BANDWIDTH_AUTO;
-  coderateH    = FEC_AUTO;
-  coderateL    = FEC_AUTO;
-  modulation   = QAM_AUTO;
-  transmission = TRANSMISSION_MODE_AUTO;
-  guard        = GUARD_INTERVAL_AUTO;
-  hierarchy    = HIERARCHY_AUTO;
+  inversion    = DVBFE_INVERSION_AUTO;
+  bandwidth    = DVBFE_BANDWIDTH_AUTO;
+  coderateH    = DVBFE_FEC_AUTO;
+  coderateL    = DVBFE_FEC_AUTO;
+  modulation   = DVBFE_MOD_AUTO;
+  system       = DVBFE_DELSYS_DVBS;
+  transmission = DVBFE_TRANSMISSION_MODE_AUTO;
+  guard        = DVBFE_GUARD_INTERVAL_AUTO;
+  hierarchy    = DVBFE_HIERARCHY_AUTO;
+  alpha        = 0;
+  priority     = DVBFE_STREAM_PRIORITY_HP;
+  rollOff      = DVBFE_ROLLOFF_UNKNOWN;
   modification = CHANNELMOD_NONE;
   schedule     = NULL;
   linkChannels = NULL;
@@ -277,13 +331,17 @@ void cChannel::CopyTransponderData(const cChannel *Channel)
      coderateH    = Channel->coderateH;
      coderateL    = Channel->coderateL;
      modulation   = Channel->modulation;
+     system       = Channel->system;
      transmission = Channel->transmission;
      guard        = Channel->guard;
      hierarchy    = Channel->hierarchy;
+     alpha        = Channel->alpha;
+     priority     = Channel->priority;
+     rollOff      = Channel->rollOff;
      }
 }
 
-bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
+bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
 {
   // Workarounds for broadcaster stupidity:
   // Some providers broadcast the transponder frequency of their channels with two different
@@ -297,19 +355,22 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
   if (abs(srate - Srate) <= 1)
      Srate = srate;
 
-  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), *cSource::ToString(source), frequency, polarization, srate, coderateH, *cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
+  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH || modulation != Modulation || system != System || rollOff != RollOff) {
+     cString OldParameters = ParametersToString();
      source = Source;
      frequency = Frequency;
      polarization = Polarization;
      srate = Srate;
      coderateH = CoderateH;
-     modulation = QPSK;
+     modulation = Modulation;
+     system = System;
+     rollOff = RollOff;
      schedule = NULL;
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %d:%s:%s:%d to %d:%s:%s:%d", Number(), frequency, *OldParameters, *cSource::ToString(source), srate, Frequency, *ParametersToString(), *cSource::ToString(Source), Srate);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      }
   return true;
 }
@@ -317,29 +378,26 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
 bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH)
 {
   if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, modulation, srate, coderateH, *cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
+     cString OldParameters = ParametersToString();
      source = Source;
      frequency = Frequency;
      modulation = Modulation;
      srate = Srate;
      coderateH = CoderateH;
      schedule = NULL;
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %d:%s:%s:%d to %d:%s:%s:%d", Number(), frequency, *OldParameters, *cSource::ToString(source), srate, Frequency, *ParametersToString(), *cSource::ToString(Source), Srate);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      }
   return true;
 }
 
-bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission)
+bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, int Alpha, int Priority)
 {
-  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, *cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
+  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission || alpha != Alpha || priority != Priority) {
+     cString OldParameters = ParametersToString();
      source = Source;
      frequency = Frequency;
      bandwidth = Bandwidth;
@@ -349,7 +407,14 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
      coderateL = CoderateL;
      guard = Guard;
      transmission = Transmission;
+     alpha = Alpha;
+     priority = Priority;
      schedule = NULL;
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %d:%s:%s to %d:%s:%s", Number(), frequency, *OldParameters, *cSource::ToString(source), Frequency, *ParametersToString(), *cSource::ToString(Source));
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      }
   return true;
 }
@@ -597,13 +662,17 @@ cString cChannel::ParametersToString(void) const
   char *q = buffer;
   *q = 0;
   ST(" S ")  q += sprintf(q, "%c", polarization);
-  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("  T")  q += PrintParameter(q, 'A', MapToUser(alpha, AlphaValues));
+  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
   ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
   ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
-  ST("C T")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
-  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
-  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
+  ST("  T")  q += PrintParameter(q, 'P', MapToUser(priority, PriorityValues));
+  ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
+  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
   return buffer;
 }
@@ -628,6 +697,7 @@ bool cChannel::StringToParameters(const char *s)
 {
   while (s && *s) {
         switch (toupper(*s)) {
+          case 'A': s = ParseParameter(s, alpha, AlphaValues); break;
           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
           case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
@@ -636,7 +706,11 @@ bool cChannel::StringToParameters(const char *s)
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
           case 'L': polarization = *s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
+          case 'Z':// for compatibility with the original DVB-S2 patch - may be removed in future versions
+          case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
+          case 'P': s = ParseParameter(s, priority, PriorityValues); break;
           case 'R': polarization = *s++; break;
+          case 'S': s = ParseParameter(s, system, SystemValues); break;
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = *s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
diff --git a/channels.h b/channels.h
index 6eaa66f92..e69867848 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.45 2007/09/02 10:23:11 kls Exp $
+ * $Id: channels.h 1.46 2008/01/26 16:04:26 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -50,10 +50,10 @@
 struct tChannelParameterMap {
   int userValue;
   int driverValue;
+  const char *userString;
   };
 
-//XXX into cChannel???
-int MapToUser(int Value, const tChannelParameterMap *Map);
+int MapToUser(int Value, const tChannelParameterMap *Map, const char **String = NULL);
 int MapToDriver(int Value, const tChannelParameterMap *Map);
 int UserIndex(int Value, const tChannelParameterMap *Map);
 int DriverIndex(int Value, const tChannelParameterMap *Map);
@@ -62,9 +62,13 @@ extern const tChannelParameterMap InversionValues[];
 extern const tChannelParameterMap BandwidthValues[];
 extern const tChannelParameterMap CoderateValues[];
 extern const tChannelParameterMap ModulationValues[];
+extern const tChannelParameterMap SystemValues[];
 extern const tChannelParameterMap TransmissionValues[];
 extern const tChannelParameterMap GuardValues[];
 extern const tChannelParameterMap HierarchyValues[];
+extern const tChannelParameterMap AlphaValues[];
+extern const tChannelParameterMap PriorityValues[];
+extern const tChannelParameterMap RollOffValues[];
 
 struct tChannelID {
 private:
@@ -140,9 +144,13 @@ class cChannel : public cListObject {
   int coderateH;
   int coderateL;
   int modulation;
+  int system;
   int transmission;
   int guard;
   int hierarchy;
+  int alpha;
+  int priority;
+  int rollOff;
   int __EndData__;
   int modification;
   mutable const cSchedule *schedule;
@@ -194,9 +202,13 @@ class cChannel : public cListObject {
   int CoderateH(void) const { return coderateH; }
   int CoderateL(void) const { return coderateL; }
   int Modulation(void) const { return modulation; }
+  int System(void) const { return system; }
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
+  int Alpha(void) const { return alpha; }
+  int Priority(void) const { return priority; }
+  int RollOff(void) const { return rollOff; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
   bool IsCable(void) const { return cSource::IsCable(source); }
@@ -206,9 +218,9 @@ class cChannel : public cListObject {
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
   void CopyTransponderData(const cChannel *Channel);
-  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
+  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
+  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
diff --git a/config.h b/config.h
index ba3a38411..e0a0284e5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.303 2007/11/25 13:45:48 kls Exp $
+ * $Id: config.h 1.304 2008/01/19 12:08:29 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.13"
-#define VDRVERSNUM   10513  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.14"
+#define VDRVERSNUM   10514  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.13"
-#define APIVERSNUM   10513  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.14"
+#define APIVERSNUM   10514  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 84473af09..e1c654d1e 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.148 2007/11/17 15:39:28 kls Exp $
+ * $Id: device.c 1.149 2008/01/27 10:40:46 kls Exp $
  */
 
 #include "device.h"
@@ -359,6 +359,21 @@ cDevice *cDevice::GetDevice(int Index)
   return (0 <= Index && Index < numDevices) ? device[Index] : NULL;
 }
 
+static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
+{
+  int MaxNumProvidedSystems = 1 << AvailableBits;
+  int NumProvidedSystems = Device->NumProvidedSystems();
+  if (NumProvidedSystems > MaxNumProvidedSystems) {
+     esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->CardIndex() + 1, NumProvidedSystems, MaxNumProvidedSystems);
+     NumProvidedSystems = MaxNumProvidedSystems;
+     }
+  else if (NumProvidedSystems <= 0) {
+     esyslog("ERROR: device %d reported an invalid number (%d) of supported delivery systems - assuming 1", Device->CardIndex() + 1, NumProvidedSystems);
+     NumProvidedSystems = 1;
+     }
+  return NumProvidedSystems;
+}
+
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView)
 {
   // Collect the current priorities of all CAM slots that can decrypt the channel:
@@ -408,6 +423,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
              imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
+             imp <<= 2; imp |= GetClippedNumProvidedSystems(2, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
              imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
@@ -696,6 +712,11 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
   return false;
 }
 
+int cDevice::NumProvidedSystems(void) const
+{
+  return 0;
+}
+
 bool cDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return false;
diff --git a/device.h b/device.h
index 9bd823e7b..5f53d1a28 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.86 2007/10/21 09:21:52 kls Exp $
+ * $Id: device.h 1.87 2008/01/27 10:35:18 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -224,6 +224,12 @@ class cDevice : public cThread {
          ///< function itself actually returns true.
          ///< The default implementation always returns false, so a derived cDevice
          ///< class that can provide channels must implement this function.
+  virtual int NumProvidedSystems(void) const;
+         ///< Returns the number of individual "delivery systems" this device provides.
+         ///< The default implementation returns 0, so any derived class that can
+         ///< actually provide channels must implement this function.
+         ///< The result of this function is used when selecting a device, in order
+         ///< to avoid devices that provide more than one system.
   virtual bool IsTunedToTransponder(const cChannel *Channel);
          ///< Returns true if this device is currently tuned to the given Channel's
          ///< transponder.
diff --git a/dvbdevice.c b/dvbdevice.c
index 1a396064d..5680cbb23 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.167 2007/10/14 12:56:03 kls Exp $
+ * $Id: dvbdevice.c 1.168 2008/01/27 14:35:54 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -76,7 +76,7 @@ class cDvbTuner : public cThread {
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
-  fe_type_t frontendType;
+  dvbfe_delsys frontendType;
   cChannel channel;
   const char *diseqcCommands;
   eTunerStatus tunerStatus;
@@ -87,14 +87,14 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
+  cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
@@ -104,7 +104,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
   lastTimeoutReport = 0;
   diseqcCommands = NULL;
   tunerStatus = tsIdle;
-  if (frontendType == FE_QPSK)
+  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
   Start();
@@ -120,7 +120,26 @@ cDvbTuner::~cDvbTuner()
 
 bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 {
-  return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Transponder() == Channel->Transponder();
+  if (tunerStatus == tsIdle)
+     return false; // not tuned to
+  if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder())
+     return false; // sufficient mismatch
+  char Type = **cSource::ToString(Channel->Source());
+#define ST(s, p) if (strchr(s, Type)) if (channel.p() != Channel->p()) return false;
+  // Polarization is already checked as part of the Transponder.
+  ST("  T", Alpha);
+  ST("  T", Bandwidth);
+  ST("CST", CoderateH);
+  ST("  T", CoderateL);
+  ST("  T", Guard);
+  ST("CST", Inversion);
+  ST("CST", Modulation);
+  ST(" S ", RollOff);
+  ST("  T", Priority);
+  ST(" S ", System);
+  ST("  T", Transmission);
+  ST("  T", Hierarchy);
+  return true;
 }
 
 void cDvbTuner::Set(const cChannel *Channel, bool Tune)
@@ -173,114 +192,126 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbTuner::SetFrontend(void)
 {
-  dvb_frontend_parameters Frontend;
-
+  dvbfe_params Frontend;
   memset(&Frontend, 0, sizeof(Frontend));
 
-  switch (frontendType) {
-    case FE_QPSK: { // DVB-S
-
-         unsigned int frequency = channel.Frequency();
-
-         if (Setup.DiSEqC) {
-            cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
-            if (diseqc) {
-               if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
-                  cDiseqc::eDiseqcActions da;
-                  for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
-                      switch (da) {
-                        case cDiseqc::daNone:      break;
-                        case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
-                        case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
-                        case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
-                        case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
-                        case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
-                        case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
-                        case cDiseqc::daCodes: {
-                             int n = 0;
-                             uchar *codes = diseqc->Codes(n);
-                             if (codes) {
-                                struct dvb_diseqc_master_cmd cmd;
-                                memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
-                                cmd.msg_len = n;
-                                CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-                                }
-                             }
-                             break;
-                        }
-                      }
-                  diseqcCommands = diseqc->Commands();
+  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) {
+     unsigned int frequency = channel.Frequency();
+     if (Setup.DiSEqC) {
+        cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
+        if (diseqc) {
+           if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
+              cDiseqc::eDiseqcActions da;
+              for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
+                  switch (da) {
+                    case cDiseqc::daNone:      break;
+                    case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+                    case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+                    case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+                    case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+                    case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+                    case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+                    case cDiseqc::daCodes: {
+                         int n = 0;
+                         uchar *codes = diseqc->Codes(n);
+                         if (codes) {
+                            struct dvb_diseqc_master_cmd cmd;
+                            memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
+                            cmd.msg_len = n;
+                            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+                            }
+                         }
+                         break;
+                    }
                   }
-               frequency -= diseqc->Lof();
-               }
-            else {
-               esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
-               return false;
-               }
-            }
-         else {
-            int tone = SEC_TONE_OFF;
-
-            if (frequency < (unsigned int)Setup.LnbSLOF) {
-               frequency -= Setup.LnbFrequLo;
-               tone = SEC_TONE_OFF;
-               }
-            else {
-               frequency -= Setup.LnbFrequHi;
-               tone = SEC_TONE_ON;
-               }
-            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-            CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
-            CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
-            }
-
-         frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
-         Frontend.frequency = frequency * 1000UL;
-         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-         Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL;
-         Frontend.u.qpsk.fec_inner = fe_code_rate_t(channel.CoderateH());
-
-         tuneTimeout = DVBS_TUNE_TIMEOUT;
-         lockTimeout = DVBS_LOCK_TIMEOUT;
-         }
-         break;
-    case FE_QAM: { // DVB-C
-
-         // Frequency and symbol rate:
+              diseqcCommands = diseqc->Commands();
+              }
+           frequency -= diseqc->Lof();
+           }
+        else {
+           esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
+           return false;
+           }
+        }
+     else {
+        int tone = SEC_TONE_OFF;
+        if (frequency < (unsigned int)Setup.LnbSLOF) {
+           frequency -= Setup.LnbFrequLo;
+           tone = SEC_TONE_OFF;
+           }
+        else {
+           frequency -= Setup.LnbFrequHi;
+           tone = SEC_TONE_ON;
+           }
+        int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+        CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+        CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+        }
+     frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
+
+     Frontend.delivery = dvbfe_delsys(channel.System());
+     Frontend.frequency = frequency * 1000UL;
+     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+     if (Frontend.delivery == DVBFE_DELSYS_DVBS) {
+        Frontend.delsys.dvbs.modulation = dvbfe_modulation(channel.Modulation());
+        Frontend.delsys.dvbs.symbol_rate = channel.Srate() * 1000UL;
+        Frontend.delsys.dvbs.fec = dvbfe_fec(channel.CoderateH());
+        }
+     else {
+        Frontend.delsys.dvbs2.modulation = dvbfe_modulation(channel.Modulation());
+        Frontend.delsys.dvbs2.symbol_rate = channel.Srate() * 1000UL;
+        Frontend.delsys.dvbs2.fec = dvbfe_fec(channel.CoderateH());
+        Frontend.delsys.dvbs2.rolloff = dvbfe_rolloff(channel.RollOff());
+        }
 
-         Frontend.frequency = FrequencyToHz(channel.Frequency());
-         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-         Frontend.u.qam.symbol_rate = channel.Srate() * 1000UL;
-         Frontend.u.qam.fec_inner = fe_code_rate_t(channel.CoderateH());
-         Frontend.u.qam.modulation = fe_modulation_t(channel.Modulation());
+     tuneTimeout = DVBS_TUNE_TIMEOUT;
+     lockTimeout = DVBS_LOCK_TIMEOUT;
 
-         tuneTimeout = DVBC_TUNE_TIMEOUT;
-         lockTimeout = DVBC_LOCK_TIMEOUT;
-         }
-         break;
-    case FE_OFDM: { // DVB-T
-
-         // Frequency and OFDM paramaters:
-
-         Frontend.frequency = FrequencyToHz(channel.Frequency());
-         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-         Frontend.u.ofdm.bandwidth = fe_bandwidth_t(channel.Bandwidth());
-         Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(channel.CoderateH());
-         Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(channel.CoderateL());
-         Frontend.u.ofdm.constellation = fe_modulation_t(channel.Modulation());
-         Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(channel.Transmission());
-         Frontend.u.ofdm.guard_interval = fe_guard_interval_t(channel.Guard());
-         Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(channel.Hierarchy());
-
-         tuneTimeout = DVBT_TUNE_TIMEOUT;
-         lockTimeout = DVBT_LOCK_TIMEOUT;
-         }
-         break;
-    default:
-         esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-         return false;
+     dvbfe_info feinfo;
+     feinfo.delivery = Frontend.delivery;
+     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
+     }
+  else if (frontendType & DVBFE_DELSYS_DVBC) {
+     Frontend.delivery = DVBFE_DELSYS_DVBC;
+     Frontend.frequency = FrequencyToHz(channel.Frequency());
+     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+     Frontend.delsys.dvbc.symbol_rate = channel.Srate() * 1000UL;
+     Frontend.delsys.dvbc.fec = dvbfe_fec(channel.CoderateH());
+     Frontend.delsys.dvbc.modulation = dvbfe_modulation(channel.Modulation());
+
+     tuneTimeout = DVBC_TUNE_TIMEOUT;
+     lockTimeout = DVBC_LOCK_TIMEOUT;
+
+     dvbfe_info feinfo;
+     feinfo.delivery = Frontend.delivery;
+     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
+     }
+  else if (frontendType & DVBFE_DELSYS_DVBT) {
+     Frontend.delivery = DVBFE_DELSYS_DVBT;
+     Frontend.frequency = FrequencyToHz(channel.Frequency());
+     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+     Frontend.delsys.dvbt.bandwidth = dvbfe_bandwidth(channel.Bandwidth());
+     Frontend.delsys.dvbt.code_rate_HP = dvbfe_fec(channel.CoderateH());
+     Frontend.delsys.dvbt.code_rate_LP = dvbfe_fec(channel.CoderateL());
+     Frontend.delsys.dvbt.constellation = dvbfe_modulation(channel.Modulation());
+     Frontend.delsys.dvbt.transmission_mode = dvbfe_transmission_mode(channel.Transmission());
+     Frontend.delsys.dvbt.guard_interval = dvbfe_guard_interval(channel.Guard());
+     Frontend.delsys.dvbt.hierarchy = dvbfe_hierarchy(channel.Hierarchy());
+     Frontend.delsys.dvbt.alpha = dvbfe_alpha(channel.Alpha());
+     Frontend.delsys.dvbt.priority = dvbfe_stream_priority(channel.Priority());
+
+     tuneTimeout = DVBT_TUNE_TIMEOUT;
+     lockTimeout = DVBT_LOCK_TIMEOUT;
+
+     dvbfe_info feinfo;
+     feinfo.delivery = Frontend.delivery;
+     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
+     }
+  else {
+     esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+     return false;
     }
-  if (ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend) < 0) {
+  if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) {
      esyslog("ERROR: frontend %d: %m", cardIndex);
      return false;
      }
@@ -351,11 +382,23 @@ void cDvbTuner::Action(void)
 int cDvbDevice::devVideoOffset = -1;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 
+const char *DeliverySystems[] = {
+  "DVBS",
+  "DSS",
+  "DVBS2",
+  "DVBC",
+  "DVBT",
+  "DVBH",
+  "ATSC",
+  NULL
+  };
+
 cDvbDevice::cDvbDevice(int n)
 {
   ciAdapter = NULL;
   dvbTuner = NULL;
-  frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
+  frontendType = DVBFE_DELSYS_DUMMY;
+  numProvidedSystems = 0;
   spuDecoder = NULL;
   digitalAudio = false;
   playMode = pmNone;
@@ -417,9 +460,22 @@ cDvbDevice::cDvbDevice(int n)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-     dvb_frontend_info feinfo;
-     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
-        frontendType = feinfo.type;
+     if (ioctl(fd_frontend, DVBFE_GET_DELSYS, &frontendType) >= 0) {
+        const char **DeliverySystem = DeliverySystems;
+        cString ds;
+        for (int i = 0; i < 32; i++) {
+            if (frontendType & (1u << i)) {
+               numProvidedSystems++;
+               if (*DeliverySystem)
+                  ds = cString::sprintf("%s %s", *ds ? *ds : "", *DeliverySystem);
+               else
+                  esyslog("ERROR: unknown delivery system %d", i);
+               }
+            if (*DeliverySystem)
+               DeliverySystem++;
+            }
+        if (*ds)
+           isyslog("device %d provides:%s", CardIndex() + 1, *ds);
         dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
         }
      else
@@ -743,14 +799,20 @@ bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
   return type == cSource::stNone
-      || type == cSource::stCable && frontendType == FE_QAM
-      || type == cSource::stSat   && frontendType == FE_QPSK
-      || type == cSource::stTerr  && frontendType == FE_OFDM;
+      || type == cSource::stCable && (frontendType & DVBFE_DELSYS_DVBC)
+      || type == cSource::stSat   && (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
+      || type == cSource::stTerr  && (frontendType & DVBFE_DELSYS_DVBT);
 }
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 {
-  return ProvidesSource(Channel->Source()) && (!cSource::IsSat(Channel->Source()) || !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()));
+  if (!ProvidesSource(Channel->Source()))
+     return false; // doesn't provide source
+  if (!cSource::IsSat(Channel->Source()))
+     return true; // source is sufficient for non sat
+  if (!(frontendType & Channel->System()))
+     return false; // requires modulation system which frontend doesn't provide
+  return !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
 }
 
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
@@ -759,7 +821,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if (ProvidesSource(Channel->Source())) {
+  if (ProvidesTransponder(Channel)) {
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
@@ -791,6 +853,11 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
+int cDvbDevice::NumProvidedSystems(void) const
+{
+  return numProvidedSystems;
+}
+
 bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return dvbTuner->IsTunedTo(Channel);
diff --git a/dvbdevice.h b/dvbdevice.h
index 755727693..eca00dd6e 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.45 2007/10/14 13:01:25 kls Exp $
+ * $Id: dvbdevice.h 1.46 2008/01/27 10:21:02 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -15,8 +15,8 @@
 #include "device.h"
 #include "dvbspu.h"
 
-#if DVB_API_VERSION != 3
-#error VDR requires Linux DVB driver API version 3!
+#if DVB_API_VERSION != 3 || DVB_API_VERSION_MINOR != 3
+#error VDR requires Linux DVB driver API version 3.3!
 #endif
 
 #define MAXDVBDEVICES  8
@@ -35,7 +35,8 @@ class cDvbDevice : public cDevice {
          ///< Must be called before accessing any DVB functions.
          ///< \return True if any devices are available.
 private:
-  fe_type_t frontendType;
+  dvbfe_delsys frontendType;
+  int numProvidedSystems;
   int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca;
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -66,6 +67,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual int NumProvidedSystems(void) const;
   virtual bool IsTunedToTransponder(const cChannel *Channel);
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
diff --git a/i18n.c b/i18n.c
index a018f238f..66111f479 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.318 2007/11/01 10:38:27 kls Exp $
+ * $Id: i18n.c 1.319 2008/01/19 12:07:11 kls Exp $
  *
  *
  */
@@ -100,8 +100,10 @@ static void SetEnvLanguage(const char *Locale)
   ++_nl_msg_cat_cntr;
 }
 
-void I18nInitialize(void)
+void I18nInitialize(const char *LocaleDir)
 {
+  if (LocaleDir)
+     I18nLocaleDir = LocaleDir;
   LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
   LanguageNames.Append(strdup(SkipContext(LanguageName)));
   LanguageCodes.Append(strdup(LanguageCodeList[0]));
diff --git a/i18n.h b/i18n.h
index cbe42b99a..8f960ea36 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.24 2007/08/24 13:35:18 kls Exp $
+ * $Id: i18n.h 1.25 2008/01/19 11:56:19 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -19,8 +19,10 @@ typedef const char *tI18nPhrase[22]; ///< obsolete - switch to 'gettext'!
 #define I18N_MAX_LOCALE_LEN 16       // for buffers that hold en_US etc.
 #define I18N_MAX_LANGUAGES  256      // for buffers that hold all available languages
 
-void I18nInitialize(void);
+void I18nInitialize(const char *LocaleDir = NULL);
    ///< Detects all available locales and loads the language names and codes.
+   ///< If LocaleDir is given, it must point to a static string that lives
+   ///< for the entire lifetime of the program.
 void I18nRegister(const char *Plugin);
    ///< Registers the named plugin, so that it can use internationalized texts.
 void I18nSetLocale(const char *Locale);
diff --git a/menu.c b/menu.c
index b7ecf2a51..4499b5f00 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.469 2008/01/13 13:59:33 kls Exp $
+ * $Id: menu.c 1.470 2008/01/26 16:29:05 kls Exp $
  */
 
 #include "menu.h"
@@ -148,70 +148,6 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuEditMapItem ------------------------------------------------------
-
-class cMenuEditMapItem : public cMenuEditItem {
-protected:
-  int *value;
-  const tChannelParameterMap *map;
-  const char *zeroString;
-  virtual void Set(void);
-public:
-  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  map = Map;
-  zeroString = ZeroString;
-  Set();
-}
-
-void cMenuEditMapItem::Set(void)
-{
-  int n = MapToUser(*value, map);
-  if (n == 999)
-     SetValue(tr("auto"));
-  else if (n == 0 && zeroString)
-     SetValue(zeroString);
-  else if (n >= 0) {
-     char buf[16];
-     snprintf(buf, sizeof(buf), "%d", n);
-     SetValue(buf);
-     }
-  else
-     SetValue("???");
-}
-
-eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     int newValue = *value;
-     int n = DriverIndex(*value, map);
-     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        if (n-- > 0)
-           newValue = map[n].driverValue;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (map[++n].userValue >= 0)
-           newValue = map[n].driverValue;
-        }
-     else
-        return state;
-     if (newValue != *value) {
-        *value = newValue;
-        Set();
-        }
-     state = osContinue;
-     }
-  return state;
-}
-
 // --- cMenuEditChannel ------------------------------------------------------
 
 class cMenuEditChannel : public cOsdMenu {
@@ -272,15 +208,19 @@ void cMenuEditChannel::Setup(void)
   XXX*/
   // Parameters for specific types of sources:
   ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr"));
+  ST(" S ")  Add(new cMenuEditMapItem( tr("System"),       &data.system,       SystemValues));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
-  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues, tr("off")));
-  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues, tr("none")));
-  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues, tr("none")));
-  ST("C T")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues, "QPSK"));
+  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues));
+  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues));
+  ST("CST")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Bandwidth"),    &data.bandwidth,    BandwidthValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Alpha"),        &data.alpha,        AlphaValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Priority"),     &data.priority,     PriorityValues));
+  ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
 
   SetCurrent(Get(current));
   Display();
diff --git a/menuitems.c b/menuitems.c
index a7ceef299..15f729bdf 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.55 2007/11/03 15:01:01 kls Exp $
+ * $Id: menuitems.c 1.56 2008/01/26 16:07:07 kls Exp $
  */
 
 #include "menuitems.h"
@@ -937,6 +937,64 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEditMapItem ------------------------------------------------------
+
+cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  map = Map;
+  zeroString = ZeroString;
+  Set();
+}
+
+void cMenuEditMapItem::Set(void)
+{
+  const char *s = NULL;
+  int n = MapToUser(*value, map, &s);
+  if (n == 999)
+     SetValue(tr("auto"));
+  else if (n == 0 && zeroString)
+     SetValue(zeroString);
+  else if (n >= 0) {
+     if (s)
+        SetValue(s);
+     else {
+        char buf[16];
+        snprintf(buf, sizeof(buf), "%d", n);
+        SetValue(buf);
+        }
+     }
+  else
+     SetValue("???");
+}
+
+eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     int newValue = *value;
+     int n = DriverIndex(*value, map);
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (n-- > 0)
+           newValue = map[n].driverValue;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (map[++n].userValue >= 0)
+           newValue = map[n].driverValue;
+        }
+     else
+        return state;
+     if (newValue != *value) {
+        *value = newValue;
+        Set();
+        }
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuSetupPage --------------------------------------------------------
 
 cMenuSetupPage::cMenuSetupPage(void)
diff --git a/menuitems.h b/menuitems.h
index 21890a3de..0fe4713c6 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.22 2007/11/03 14:59:47 kls Exp $
+ * $Id: menuitems.h 1.23 2008/01/26 15:52:53 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -159,6 +159,17 @@ class cMenuEditTimeItem : public cMenuEditItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuEditMapItem : public cMenuEditItem {
+protected:
+  int *value;
+  const tChannelParameterMap *map;
+  const char *zeroString;
+  virtual void Set(void);
+public:
+  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cPlugin;
 
 class cMenuSetupPage : public cOsdMenu {
diff --git a/nit.c b/nit.c
index ba80a68ff..32ac18a24 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.15 2007/08/17 14:02:45 kls Exp $
+ * $Id: nit.c 1.17 2008/01/26 15:08:01 kls Exp $
  */
 
 #include "nit.h"
@@ -127,8 +127,13 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100;
                  static char Polarizations[] = { 'h', 'v', 'l', 'r' };
                  char Polarization = Polarizations[sd->getPolarization()];
-                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
+                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
+                 static int Modulations[] = { DVBFE_MOD_AUTO, DVBFE_MOD_QPSK, DVBFE_MOD_8PSK, DVBFE_MOD_QAM16 };
+                 int Modulation = Modulations[sd->getModulationType()];
+                 int System = sd->getModulationSystem() ? DVBFE_DELSYS_DVBS2 : DVBFE_DELSYS_DVBS;
+                 static int RollOffs[] = { DVBFE_ROLLOFF_35, DVBFE_ROLLOFF_25, DVBFE_ROLLOFF_20, DVBFE_ROLLOFF_UNKNOWN };
+                 int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : DVBFE_ROLLOFF_UNKNOWN;
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
@@ -145,6 +150,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
+                           found = true;
                            if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
                                   if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), transponder)) {
@@ -154,15 +160,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
+                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, Modulation, System, RollOff);
                            }
-                        found = true;
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
+                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate, Modulation, System, RollOff))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
@@ -176,9 +181,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Source = cSource::FromData(cSource::stCable);
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
-                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
+                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
+                 static int Modulations[] = { DVBFE_MOD_NONE, DVBFE_MOD_QAM16, DVBFE_MOD_QAM32, DVBFE_MOD_QAM64, DVBFE_MOD_QAM128, DVBFE_MOD_QAM256, QAM_AUTO };
                  int Modulation = Modulations[min(sd->getModulation(), 6)];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
@@ -196,6 +201,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
+                           found = true;
                            if (!ISTRANSPONDER(Frequency / 1000, transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
                                   if (ISTRANSPONDER(Frequencies[n] / 1000, transponder)) {
@@ -207,7 +213,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder
                               Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
                            }
-                        found = true;
                         }
                     if (!found) {
                         for (int n = 0; n < NumFrequencies; n++) {
@@ -226,19 +231,22 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = Frequencies[0] = sd->getFrequency() * 10;
-                 static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
+                 static int Bandwidths[] = { DVBFE_BANDWIDTH_8_MHZ, DVBFE_BANDWIDTH_7_MHZ, DVBFE_BANDWIDTH_6_MHZ, DVBFE_BANDWIDTH_5_MHZ, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO };
                  int Bandwidth = Bandwidths[sd->getBandwidth()];
-                 static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
+                 static int Constellations[] = { DVBFE_MOD_QPSK, DVBFE_MOD_QAM16, DVBFE_MOD_QAM64, DVBFE_MOD_AUTO };
                  int Constellation = Constellations[sd->getConstellation()];
-                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
-                 int Hierarchy = Hierarchies[sd->getHierarchy()];
-                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
+                 static int CodeRates[] = { DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO };
                  int CodeRateHP = CodeRates[sd->getCodeRateHP()];
                  int CodeRateLP = CodeRates[sd->getCodeRateLP()];
-                 static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
+                 static int GuardIntervals[] = { DVBFE_GUARD_INTERVAL_1_32, DVBFE_GUARD_INTERVAL_1_16, DVBFE_GUARD_INTERVAL_1_8, DVBFE_GUARD_INTERVAL_1_4 };
                  int GuardInterval = GuardIntervals[sd->getGuardInterval()];
-                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
+                 static int TransmissionModes[] = { DVBFE_TRANSMISSION_MODE_2K, DVBFE_TRANSMISSION_MODE_8K, DVBFE_TRANSMISSION_MODE_4K, DVBFE_TRANSMISSION_MODE_AUTO };
                  int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
+                 static int Priorities[] = { DVBFE_STREAM_PRIORITY_LP, DVBFE_STREAM_PRIORITY_HP };
+                 int Priority = Priorities[sd->getPriority()];
+                 static int Alphas[] = { 0, DVBFE_ALPHA_1, DVBFE_ALPHA_2, DVBFE_ALPHA_4 };
+                 int Alpha = Alphas[sd->getHierarchy() & 3];
+                 int Hierarchy = Alpha ? DVBFE_HIERARCHY_ON : DVBFE_HIERARCHY_OFF;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
                         if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
@@ -254,6 +262,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
+                           found = true;
                            if (!ISTRANSPONDER(Frequency / 1000000, transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
                                   if (ISTRANSPONDER(Frequencies[n] / 1000000, transponder)) {
@@ -263,15 +272,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
+                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority);
                            }
-                        found = true;
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
+                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
diff --git a/pat.c b/pat.c
index a71f2d5c8..bc84e43d0 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.18 2007/09/02 10:44:19 kls Exp $
+ * $Id: pat.c 1.19 2008/01/27 13:53:43 kls Exp $
  */
 
 #include "pat.h"
@@ -343,6 +343,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
+//TODO        case 0x1B: // MPEG4
                       Vpid = stream.getPid();
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
diff --git a/po/ca_ES.po b/po/ca_ES.po
index fa5c84709..90d6ae975 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,6 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "cap"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
 
@@ -221,9 +236,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Editar canal"
 
@@ -272,21 +284,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polaritzaci�"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversi�"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "cap"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -305,6 +314,15 @@ msgstr "Protegir"
 msgid "Hierarchy"
 msgstr "Jerarquia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritat"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Propietats del canal duplicades!"
 
@@ -350,9 +368,6 @@ msgstr "Fi"
 msgid "VPS"
 msgstr ""
 
-msgid "Priority"
-msgstr "Prioritat"
-
 msgid "Lifetime"
 msgstr "Durada"
 
@@ -893,6 +908,9 @@ msgstr "Sobrescriure"
 msgid "Button$Insert"
 msgstr "Inserir"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index c3ae43cdb..812c1fcba 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "vyp."
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "��dn�"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
@@ -219,9 +234,6 @@ msgstr "voln
 msgid "encrypted"
 msgstr "k�dovan�"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Editace kan�lu"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizace"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "vyp."
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "��dn�"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorita"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastaven� kan�l� nejsou unik�tn�!"
 
@@ -348,9 +366,6 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorita"
-
 msgid "Lifetime"
 msgstr "�ivotnost"
 
@@ -891,6 +906,9 @@ msgstr "P
 msgid "Button$Insert"
 msgstr "Vlo�it"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Modul"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index e08e7e46d..53b1bee1f 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "fra"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ingen"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
 
@@ -219,9 +234,6 @@ msgstr "Free To Air"
 msgid "encrypted"
 msgstr "kodet"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Edit channel"
 msgstr "Rediger kanal"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "fra"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ingen"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarki"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalindstillinger er ikke entydige!"
 
@@ -348,9 +366,6 @@ msgstr "Stop"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -891,6 +906,9 @@ msgstr "Overskriv"
 msgid "Button$Insert"
 msgstr "Inds�t"
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 05f139e58..4ead23bcf 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "aus"
+
+msgid "on"
+msgstr "ein"
+
+msgid "none"
+msgstr "keine"
+
+msgid "high"
+msgstr "hoch"
+
+msgid "low"
+msgstr "niedrig"
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
 
@@ -219,9 +234,6 @@ msgstr "frei empfangbar"
 msgid "encrypted"
 msgstr "verschl�sselt"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Kanal editieren"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr "System"
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "aus"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "keine"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
+msgid "Alpha"
+msgstr "Alpha"
+
+msgid "Priority"
+msgstr "Priorit�t"
+
+msgid "Rolloff"
+msgstr "Rolloff"
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaleinstellungen sind nicht eindeutig!"
 
@@ -348,9 +366,6 @@ msgstr "Ende"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�t"
-
 msgid "Lifetime"
 msgstr "Lebensdauer"
 
@@ -891,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Einf�gen"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 4595fb1f9..3655d6db5 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "�������"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "������"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
 
@@ -219,9 +234,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr "��������"
-
 msgid "Edit channel"
 msgstr "����������� ��������"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "������"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "����������"
 
-msgid "off"
-msgstr "�������"
-
 msgid "CoderateH"
 msgstr "������ ������ H"
 
-msgid "none"
-msgstr "������"
-
 msgid "CoderateL"
 msgstr "������ ������ L"
 
@@ -303,6 +312,15 @@ msgstr "
 msgid "Hierarchy"
 msgstr "���������"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "�������������"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "�� ��������� ��� �������� ����������������!"
 
@@ -348,9 +366,6 @@ msgstr "
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "�������������"
-
 msgid "Lifetime"
 msgstr "�������� ���������"
 
@@ -891,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "��������"
 
+msgid "auto"
+msgstr "��������"
+
 msgid "Plugin"
 msgstr "��������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index a90a74e0f..ee8a94f40 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ninguno"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
@@ -219,9 +234,6 @@ msgstr "en abierto"
 msgid "encrypted"
 msgstr "cifrado"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Modificar canal"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizaci�n"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "T.s�mbolos"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ninguno"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Int.Guarda"
 msgid "Hierarchy"
 msgstr "Jerarqu�a"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioridad"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
 
@@ -348,9 +366,6 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioridad"
-
 msgid "Lifetime"
 msgstr "Duraci�n"
 
@@ -891,6 +906,9 @@ msgstr "Sobreescribir"
 msgid "Button$Insert"
 msgstr "Insertar"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index d5c47cd0e..878db2173 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "v�ljas"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "puudu"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
 
@@ -219,9 +234,6 @@ msgstr "FTA"
 msgid "encrypted"
 msgstr "kr�ptitud"
 
-msgid "auto"
-msgstr "automaatne"
-
 msgid "Edit channel"
 msgstr "Kanali muutmine"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisatsioon"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversioon"
 
-msgid "off"
-msgstr "v�ljas"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "puudu"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
 
@@ -348,9 +366,6 @@ msgstr "Stopp"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteet"
-
 msgid "Lifetime"
 msgstr "Eluiga"
 
@@ -891,6 +906,9 @@ msgstr "Asenda (OVR)"
 msgid "Button$Insert"
 msgstr "Lisa (INS)"
 
+msgid "auto"
+msgstr "automaatne"
+
 msgid "Plugin"
 msgstr "Laiendusmoodul"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b0de1e516..4ac17cff8 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "pois"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "tyhj�"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
@@ -222,9 +237,6 @@ msgstr "vapaa"
 msgid "encrypted"
 msgstr "salattu"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Muokkaa kanavaa"
 
@@ -273,21 +285,18 @@ msgstr "Palvelu-ID"
 msgid "Polarization"
 msgstr "Polarisaatio"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Symbolinopeus"
 
 msgid "Inversion"
 msgstr "Inversio"
 
-msgid "off"
-msgstr "pois"
-
 msgid "CoderateH"
 msgstr "Suojaustaso (HP)"
 
-msgid "none"
-msgstr "tyhj�"
-
 msgid "CoderateL"
 msgstr "Suojaustaso (LP)"
 
@@ -306,6 +315,15 @@ msgstr "Suojav
 msgid "Hierarchy"
 msgstr "Hierarkia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteetti"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
 
@@ -351,9 +369,6 @@ msgstr "Lopetus"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteetti"
-
 msgid "Lifetime"
 msgstr "Elinik�"
 
@@ -780,7 +795,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��nenvoimakkuus k�ynnistett�ess�"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "K�yt� h�t�sammutusta"
 
 msgid "Plugins"
 msgstr "Laajennokset"
@@ -894,6 +909,9 @@ msgstr "Korvaa"
 msgid "Button$Insert"
 msgstr "Lis��"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Laajennos"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 35d35af59..846694164 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-10-18 16:12+0100\n"
 "Last-Translator: Michael Nival <mnival@club-internet.fr>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -21,6 +21,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "aucun"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
 
@@ -225,9 +240,6 @@ msgstr "Aucun cryptage"
 msgid "encrypted"
 msgstr "Crypt�"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Modifier une cha�ne"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Fr�q. Symbole"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "aucun"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hi�rarchie"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorit�"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Caract�ristiques des cha�nes non uniques"
 
@@ -354,9 +372,6 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�"
-
 msgid "Lifetime"
 msgstr "Dur�e de vie"
 
@@ -897,6 +912,9 @@ msgstr "Ecraser"
 msgid "Button$Insert"
 msgstr "Ins�rer"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index a7bf2e172..421d8c3a2 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "ugasi"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "nijedan"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan program ***"
 
@@ -220,9 +235,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr "automatski"
-
 msgid "Edit channel"
 msgstr "Ure�ivanje programa"
 
@@ -271,21 +283,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizacija"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
-msgid "off"
-msgstr "ugasi"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "nijedan"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -304,6 +313,15 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hijerarhija"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametri programa nisu jednozna�ni!"
 
@@ -349,9 +367,6 @@ msgstr "Kraj"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Trajanje"
 
@@ -892,6 +907,9 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Umetni"
 
+msgid "auto"
+msgstr "automatski"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index ebd244fef..e2f674e98 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-13 14:21+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "ki"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "semmi"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
 
@@ -222,9 +237,6 @@ msgstr "K
 msgid "encrypted"
 msgstr "K�dolt"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Csatorn�k be�ll�t�sa"
 
@@ -273,21 +285,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polariz�ci�"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "ki"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "semmi"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -306,6 +315,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorit�s"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
 
@@ -351,9 +369,6 @@ msgstr "V
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�s"
-
 msgid "Lifetime"
 msgstr "�lettartam"
 
@@ -895,6 +910,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Beilleszteni"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 2f88680b6..d93f2068a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-10-16 02:15+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "nessuno"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
@@ -222,9 +237,6 @@ msgstr "in chiaro"
 msgid "encrypted"
 msgstr "criptato"
 
-msgid "auto"
-msgstr "automatico"
-
 msgid "Edit channel"
 msgstr "Modifica canale"
 
@@ -273,21 +285,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizzazione"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "SymbolRate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "nessuno"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -306,6 +315,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorit�"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
 
@@ -351,9 +369,6 @@ msgstr "Fine"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�"
-
 msgid "Lifetime"
 msgstr "Durata"
 
@@ -894,6 +909,9 @@ msgstr "Sovrascrivi"
 msgid "Button$Insert"
 msgstr "Inserisci"
 
+msgid "auto"
+msgstr "automatico"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index e945befa4..9fc1177bc 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,6 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "uit"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "geen"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
@@ -221,9 +236,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Kanaal aanpassen"
 
@@ -272,21 +284,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisatie"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "uit"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "geen"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -305,6 +314,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteit"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
 
@@ -350,9 +368,6 @@ msgstr "Einde"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteit"
-
 msgid "Lifetime"
 msgstr "Bewaarduur"
 
@@ -893,6 +908,9 @@ msgstr "Overschrijven"
 msgid "Button$Insert"
 msgstr "Invoegen"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index bd2238e30..4c4c26713 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
 
@@ -220,9 +235,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr ""
-
 msgid "Edit channel"
 msgstr "Editer kanal"
 
@@ -271,21 +283,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisasjon"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr ""
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr ""
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -304,6 +313,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr ""
 
@@ -349,9 +367,6 @@ msgstr "Slutt"
 msgid "VPS"
 msgstr ""
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -892,6 +907,9 @@ msgstr ""
 msgid "Button$Insert"
 msgstr ""
 
+msgid "auto"
+msgstr ""
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d8be8772d..3ffef6a1d 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "wy��cz"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "brak"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
@@ -219,9 +234,6 @@ msgstr "nieszyfrowany"
 msgid "encrypted"
 msgstr "szyfrowany"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Edycja kana�u"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polaryzacja"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inwersja"
 
-msgid "off"
-msgstr "wy��cz"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "brak"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorytet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
 
@@ -348,9 +366,6 @@ msgstr "Koniec"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorytet"
-
 msgid "Lifetime"
 msgstr "Czas �ycia"
 
@@ -891,6 +906,9 @@ msgstr "Nadpisz"
 msgid "Button$Insert"
 msgstr "Wstaw"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Wtyczka"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1786077d9..1d78201c1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal Inv�lido! ***"
 
@@ -219,9 +234,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr ""
-
 msgid "Edit channel"
 msgstr "Modificar canal"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polariza��o"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr ""
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioridade"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr ""
 
@@ -348,9 +366,6 @@ msgstr "Fim"
 msgid "VPS"
 msgstr ""
 
-msgid "Priority"
-msgstr "Prioridade"
-
 msgid "Lifetime"
 msgstr "Dura��o"
 
@@ -891,6 +906,9 @@ msgstr ""
 msgid "Button$Insert"
 msgstr ""
 
+msgid "auto"
+msgstr ""
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 72fc8b9b2..21bc1b866 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "inactiv"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "niciuna(ul)"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
@@ -220,9 +235,6 @@ msgstr "FTA (necriptat)"
 msgid "encrypted"
 msgstr "criptat"
 
-msgid "auto"
-msgstr "automat"
-
 msgid "Edit channel"
 msgstr "Modificare canal"
 
@@ -271,21 +283,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizare"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Rat� simboluri"
 
 msgid "Inversion"
 msgstr "Inversiune"
 
-msgid "off"
-msgstr "inactiv"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "niciuna(ul)"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -304,6 +313,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Ierarhie"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritate"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
 
@@ -349,9 +367,6 @@ msgstr "Sf
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritate"
-
 msgid "Lifetime"
 msgstr "Timp de p�strare"
 
@@ -892,6 +907,9 @@ msgstr "Suprascrie"
 msgid "Button$Insert"
 msgstr "Insereaz�"
 
+msgid "auto"
+msgstr "automat"
+
 msgid "Plugin"
 msgstr "Plugin (modul adi�ional)"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 6f6038edc..2fe55adbe 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-11-05 14:24+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "����"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "������"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -220,9 +235,6 @@ msgstr "FTA (
 msgid "encrypted"
 msgstr "������������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Edit channel"
 msgstr "�������������� ������"
 
@@ -271,21 +283,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "�����������"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "����. ��������"
 
 msgid "Inversion"
 msgstr "��������"
 
-msgid "off"
-msgstr "����"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "������"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -304,6 +313,15 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "���������"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
 
@@ -349,9 +367,6 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
-msgid "Priority"
-msgstr "���������"
-
 msgid "Lifetime"
 msgstr "���� ��������"
 
@@ -892,6 +907,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
+msgid "auto"
+msgstr "����"
+
 msgid "Plugin"
 msgstr "������"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 002b82cd1..584838b13 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "izklop"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "nobeden"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
 
@@ -220,9 +235,6 @@ msgstr "nekodiran"
 msgid "encrypted"
 msgstr "kodiran"
 
-msgid "auto"
-msgstr "avtomatsko"
-
 msgid "Edit channel"
 msgstr "Uredi kanal"
 
@@ -271,21 +283,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizacija"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
-msgid "off"
-msgstr "izklop"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "nobeden"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -304,6 +313,15 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hierarhija"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteta"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastavitve kanala niso edinstvene!"
 
@@ -349,9 +367,6 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteta"
-
 msgid "Lifetime"
 msgstr "Veljavnost"
 
@@ -892,6 +907,9 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Vstavi"
 
+msgid "auto"
+msgstr "avtomatsko"
+
 msgid "Plugin"
 msgstr "Vstavek"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 40d3c252a..68920f2a1 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "av"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ingen"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
@@ -220,9 +235,6 @@ msgstr "Okodad"
 msgid "encrypted"
 msgstr "krypterad"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Edit channel"
 msgstr "�ndra kanal"
 
@@ -271,21 +283,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "av"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ingen"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -304,6 +313,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
 
@@ -349,9 +367,6 @@ msgstr "Slutar"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Livstid"
 
@@ -892,6 +907,9 @@ msgstr "Skriv 
 msgid "Button$Insert"
 msgstr "Infoga"
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "Plugin"
 msgstr "Modul"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 57a73090c..0b25c72f2 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-24 14:37+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "kapal�"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "hi�"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
 
@@ -219,9 +234,6 @@ msgstr "
 msgid "encrypted"
 msgstr "�ifreli"
 
-msgid "auto"
-msgstr "otomatik"
-
 msgid "Edit channel"
 msgstr "Kanal ayarlar�n� de�i�tir"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Kutupla�ma"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "�nversiyon"
 
-msgid "off"
-msgstr "kapal�"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "hi�"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "Koruma"
 msgid "Hierarchy"
 msgstr "Hiyerar�i"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "�ncelik"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanal ayarlar� belli de��l!"
 
@@ -348,9 +366,6 @@ msgstr "Biti
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "�ncelik"
-
 msgid "Lifetime"
 msgstr "�mr�"
 
@@ -891,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Ekle"
 
+msgid "auto"
+msgstr "otomatik"
+
 msgid "Plugin"
 msgstr "Eklenti"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 70afcaf84..62ec8cfb5 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-11-25 14:59+0100\n"
+"POT-Creation-Date: 2008-01-27 15:00+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "����"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "������"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -219,9 +234,6 @@ msgstr "FTA (
 msgid "encrypted"
 msgstr "����������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Edit channel"
 msgstr "������������ ������"
 
@@ -270,21 +282,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "�����������"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "����. ���������"
 
 msgid "Inversion"
 msgstr "��������"
 
-msgid "off"
-msgstr "����"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "������"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -303,6 +312,15 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "���������"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� �����!"
 
@@ -348,9 +366,6 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
-msgid "Priority"
-msgstr "���������"
-
 msgid "Lifetime"
 msgstr "����� ����������"
 
@@ -893,6 +908,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
+msgid "auto"
+msgstr "����"
+
 msgid "Plugin"
 msgstr "������"
 
diff --git a/sdt.c b/sdt.c
index 29422d8aa..2ddd7e31e 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.17 2007/06/10 08:50:49 kls Exp $
+ * $Id: sdt.c 1.18 2008/01/27 13:24:25 kls Exp $
  */
 
 #include "sdt.h"
@@ -55,6 +55,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    case 0x02: // digital radio sound service
                    case 0x04: // NVOD reference service
                    case 0x05: // NVOD time-shifted service
+                   case 0x19: // digital HD television service
                         {
                         char NameBuf[Utf8BufSize(1024)];
                         char ShortNameBuf[Utf8BufSize(1024)];
diff --git a/vdr.5 b/vdr.5
index e01b2779e..3c836104e 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.64 2007/08/26 10:57:08 kls Exp $
+.\" $Id: vdr.5 1.65 2008/01/26 14:16:51 kls Exp $
 .\"
 .TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files"
 .SH NAME
@@ -83,19 +83,23 @@ meaning (and allowed values) are
 .TS
 tab (@);
 l l.
-\fBB\fR@Bandwidth (6, 7, 8)
-\fBC\fR@Code rate high priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
-\fBD\fR@Code rate low priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
+\fBA\fR@Alpha (0, 1, 2, 4)
+\fBB\fR@Bandwidth (5, 6, 7, 8)
+\fBC\fR@Code rate high priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
+\fBD\fR@coDe rate low priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
-\fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
+\fBM\fR@Modulation (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 32, 64, 128, 256, 512, 998, 1024)
+\fBO\fR@rollOff (0, 20, 25, 35)
+\fBP\fR@Priority (0, 1)
 \fBR\fR@Right circular polarization
-\fBT\fR@Transmission mode (2, 8)
+\fBT\fR@Transmission mode (2, 4, 8)
 \fBV\fR@Vertical polarization
-\fBY\fR@Hierarchy (0, 1, 2, 4)
+\fBY\fR@hierarchY (0, 1)
 .TE
+
 The polarization parameters have no integer numbers following them. This is for
 compatibility with files from older versions and also to keep the DVB-S entries
 as simple as possible.
diff --git a/vdr.c b/vdr.c
index 05b9e4878..2ad39733a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.305 2008/01/13 11:51:53 kls Exp $
+ * $Id: vdr.c 1.307 2008/01/27 14:38:45 kls Exp $
  */
 
 #include <getopt.h>
@@ -198,6 +198,7 @@ int main(int argc, char *argv[])
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
+  const char *LocaleDir = NULL;
 
   bool UseKbd = true;
   const char *LircDevice = NULL;
@@ -229,6 +230,7 @@ int main(int argc, char *argv[])
       { "help",     no_argument,       NULL, 'h' },
       { "lib",      required_argument, NULL, 'L' },
       { "lirc",     optional_argument, NULL, 'l' | 0x100 },
+      { "localedir",required_argument, NULL, 'l' | 0x200 },
       { "log",      required_argument, NULL, 'l' },
       { "mute",     no_argument,       NULL, 'm' },
       { "no-kbd",   no_argument,       NULL, 'n' | 0x100 },
@@ -306,6 +308,14 @@ int main(int argc, char *argv[])
           case 'l' | 0x100:
                     LircDevice = optarg ? optarg : LIRC_DEVICE;
                     break;
+          case 'l' | 0x200:
+                    if (access(optarg, R_OK | X_OK) == 0)
+                       LocaleDir = optarg;
+                    else {
+                       fprintf(stderr, "vdr: can't access locale directory: %s\n", optarg);
+                       return 2;
+                       }
+                    break;
           case 'm': MuteAudio = true;
                     break;
           case 'n' | 0x100:
@@ -407,6 +417,8 @@ int main(int argc, char *argv[])
                "  -L DIR,   --lib=DIR      search for plugins in DIR (default is %s)\n"
                "            --lirc[=PATH]  use a LIRC remote control device, attached to PATH\n"
                "                           (default: %s)\n"
+               "            --localedir=DIR search for locale files in DIR (default is\n"
+               "                           %s)\n"
                "  -m,       --mute         mute audio of the primary DVB device at startup\n"
                "            --no-kbd       don't use the keyboard as an input device\n"
                "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
@@ -430,6 +442,7 @@ int main(int argc, char *argv[])
                DEFAULTEPGDATAFILENAME,
                DEFAULTPLUGINDIR,
                LIRC_DEVICE,
+               LOCDIR,
                DEFAULTSVDRPPORT,
                RCU_DEVICE,
                VideoDirectory,
@@ -515,7 +528,7 @@ int main(int argc, char *argv[])
 
   // Initialize internationalization:
 
-  I18nInitialize();
+  I18nInitialize(LocaleDir);
 
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
@@ -717,9 +730,7 @@ int main(int argc, char *argv[])
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
               if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
                  if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
-                     && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
-                     && !cDevice::SwitchChannel(1) // ...or the next higher available one...
-                     && !cDevice::SwitchChannel(-1)) // ...or the next lower available one
+                     && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel))) // ...or the one used by the last timer...
                     ;
                  }
               lastTime = Now; // don't do this too often

From 9279cb21cd311cbb141d506ba9d17c3a057b4d3c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Feb 2008 18:00:00 +0100
Subject: [PATCH 181/307] =?UTF-8?q?Version=201.5.15=20-=20Updated=20the=20?=
 =?UTF-8?q?Italian=20OSD=20texts=20(thanks=20to=20Diego=20Pierotto).=20-?=
 =?UTF-8?q?=20Added=20option=20-i=20to=20the=20pictures=20plugin's=20pic2m?=
 =?UTF-8?q?pg=20to=20ignore=20unknown=20file=20types.=20-=20Revoked=20the?=
 =?UTF-8?q?=20switch=20to=20the=20"multiproto"=20driver=20in=20order=20to?=
 =?UTF-8?q?=20make=20a=20new=20stable=20=20=20version=20before=20making=20?=
 =?UTF-8?q?this=20big=20switch=20and=20forcing=20all=20users=20to=20instal?=
 =?UTF-8?q?l=20a=20=20=20driver=20that=20is=20not=20yet=20in=20the=20kerne?=
 =?UTF-8?q?l=20source.=20The=20removed=20code=20will=20reappear=20=20=20in?=
 =?UTF-8?q?=20version=201.7.0.=20=20=20Note=20that=20you=20may=20need=20to?=
 =?UTF-8?q?=20switch=20back=20to=20an=20older=20version=20of=20your=20chan?=
 =?UTF-8?q?nels.conf=20=20=20file=20if=20you=20have=20already=20used=20ver?=
 =?UTF-8?q?sion=201.5.14,=20because=20it=20introduced=20new=20parameters.?=
 =?UTF-8?q?=20-=20Added=20the=20new=20command=20line=20option=20--userdump?=
 =?UTF-8?q?=20to=20enable=20core=20dumps=20in=20case=20VDR=20=20=20is=20ru?=
 =?UTF-8?q?n=20as=20root=20with=20option=20-u=20(thanks=20to=20Hans-Werner?=
 =?UTF-8?q?=20Hilse).=20-=20Speeded=20up=20anti-aliased=20font=20rendering?=
 =?UTF-8?q?=20by=20caching=20the=20blend=20indexes=20(based=20on=20=20=20a?=
 =?UTF-8?q?=20suggestion=20by=20Martin=20Wache).=20-=20Fixed=20setting=20t?=
 =?UTF-8?q?he=20OSD=20area=20in=20the=20pictures=20plugin.=20-=20Ignoring?=
 =?UTF-8?q?=20"repeat"=20and=20"release"=20keys=20in=20the=20time=20search?=
 =?UTF-8?q?=20entry=20mode=20during=20replay,=20=20=20to=20avoid=20inadver?=
 =?UTF-8?q?tently=20leaving=20it=20in=20case=20a=20key=20is=20pressed=20to?=
 =?UTF-8?q?o=20long=20(suggested=20=20=20by=20Andreas=20Brugger).=20-=20Im?=
 =?UTF-8?q?proved=20sending=20all=20frames=20to=20devices=20that=20can=20h?=
 =?UTF-8?q?andle=20them=20in=20fast=20forward=20=20=20trick=20speeds,=20in?=
 =?UTF-8?q?cluding=20subtitles=20(thanks=20to=20Timo=20Eskola).=20-=20The?=
 =?UTF-8?q?=20section=20handler=20is=20now=20stopped=20before=20the=20devi?=
 =?UTF-8?q?ce=20is=20destroyed,=20to=20avoid=20=20=20accessing=20file=20ha?=
 =?UTF-8?q?ndles=20after=20they=20have=20become=20invalid=20(thanks=20to?=
 =?UTF-8?q?=20Reinhard=20=20=20Nissl=20for=20reporting=20an=20invalid=20ac?=
 =?UTF-8?q?cess=20when=20ending=20VDR,=20and=20to=20Deti=20Fliegl=20for=20?=
 =?UTF-8?q?=20=20a=20patch=20that=20was=20used=20to=20implement=20StopSect?=
 =?UTF-8?q?ionHandler()).=20-=20Fixed=20setting=20the=20date=20in=20the=20?=
 =?UTF-8?q?channel=20display=20of=20the=20classic=20and=20sttng=20skins,?=
 =?UTF-8?q?=20=20=20to=20avoid=20unnecessary=20OSD=20access=20(thanks=20to?=
 =?UTF-8?q?=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20The=20free=20disk=20spac?=
 =?UTF-8?q?e=20is=20now=20also=20displayed=20in=20the=20title=20of=20the?=
 =?UTF-8?q?=20"Recordings"=20=20=20menu=20(suggested=20by=20Walter=20Koch)?=
 =?UTF-8?q?.=20-=20Changed=20the=20message=20"Upcoming=20VPS=20recording!"?=
 =?UTF-8?q?=20to=20"Upcoming=20recording!"=20because=20=20=20it=20applies?=
 =?UTF-8?q?=20to=20non-VPS=20recordings=20as=20well.=20-=20Fixed=20a=20los?=
 =?UTF-8?q?s=20of=20a=20timer's=20'recording'=20flag=20after=20modifying?=
 =?UTF-8?q?=20it=20via=20MODT.=20-=20Fixed=20detecting=20directories=20in?=
 =?UTF-8?q?=20cFileNameList::Load().=20-=20Running=20the=20thread=20that?=
 =?UTF-8?q?=20removes=20deleted=20recordings=20at=20a=20low=20priority=20t?=
 =?UTF-8?q?o=20(maybe)=20=20=20avoid=20stuttering=20replay=20in=20case=20t?=
 =?UTF-8?q?he=20thread=20is=20run=20during=20replay.=20-=20Limiting=20the?=
 =?UTF-8?q?=20length=20of=20the=20recording=20name=20in=20timers=20in=20ca?=
 =?UTF-8?q?se=20VDR=20is=20run=20with=20=20=20--vfat,=20in=20order=20to=20?=
 =?UTF-8?q?avoid=20names=20that=20are=20too=20long=20for=20Windows=20(sugg?=
 =?UTF-8?q?ested=20by=20Rolf=20=20=20Ahrenberg).=20-=20Using=20cString::sp?=
 =?UTF-8?q?rintf()=20instead=20of=20asprintf()=20(thanks=20to=20Wolfgang?=
 =?UTF-8?q?=20Rohdewald=20=20=20for=20pointing=20out=20a=20possible=20prob?=
 =?UTF-8?q?lem=20if=20the=20return=20value=20is=20not=20checked).=20=20=20?=
 =?UTF-8?q?Plugin=20authors=20may=20want=20to=20consider=20doing=20the=20s?=
 =?UTF-8?q?ame.=20For=20convenience=20there=20is=20now=20=20=20an=20additi?=
 =?UTF-8?q?onal=20version=20of=20cString::sprintf()=20that=20accepts=20a?=
 =?UTF-8?q?=20va=5Flist=20parameter.=20-=20When=20deleting=20the=20recordi?=
 =?UTF-8?q?ng=20that=20is=20currently=20replayed,=20the=20replay=20is=20no?=
 =?UTF-8?q?w=20=20=20stopped=20immediately=20(thanks=20to=20Mikko=20Matila?=
 =?UTF-8?q?inen=20for=20reporting=20a=20possible=20crash=20=20=20if=20the?=
 =?UTF-8?q?=20Info=20key=20is=20pressed=20after=20deleting=20the=20current?=
 =?UTF-8?q?ly=20replayed=20recording).=20-=20Updated=20the=20Russian=20OSD?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Oleg=20Roitburd).=20-=20When=20determ?=
 =?UTF-8?q?ining=20the=20amount=20of=20free=20disk=20space,=20any=20delete?=
 =?UTF-8?q?d=20(but=20not=20yet=20removed)=20=20=20recordings=20on=20diffe?=
 =?UTF-8?q?rent=20file=20systems=20(that=20are=20mounted=20under=20the=20v?=
 =?UTF-8?q?ideo=20directory)=20=20=20are=20no=20longer=20taken=20into=20ac?=
 =?UTF-8?q?count.=20-=20When=20running=20out=20of=20disk=20space=20during?=
 =?UTF-8?q?=20a=20recording,=20only=20such=20deleted=20or=20old=20=20=20re?=
 =?UTF-8?q?cordings=20are=20removed,=20that=20actually=20are=20on=20the=20?=
 =?UTF-8?q?video=20directory=20file=20system(s).=20=20=20This=20prevents?=
 =?UTF-8?q?=20VDR=20from=20accidentally=20deleting=20recordings=20on=20oth?=
 =?UTF-8?q?er=20file=20systems,=20=20=20which=20would=20not=20add=20any=20?=
 =?UTF-8?q?free=20space=20to=20the=20video=20directory.=20-=20Implemented?=
 =?UTF-8?q?=20the=20cStatus,=20cDevice=20and=20cPlayer=20functions=20for?=
 =?UTF-8?q?=20setting=20subtitle=20tracks=20=20=20in=20plugins=20(thanks?=
 =?UTF-8?q?=20to=20Petri=20Hintukainen).=20-=20Added=20cStatus::TimerChang?=
 =?UTF-8?q?e()=20to=20inform=20plugins=20about=20changes=20to=20the=20list?=
 =?UTF-8?q?=20of=20timers=20=20=20(based=20on=20a=20patch=20from=20Benedik?=
 =?UTF-8?q?t=20Elser).=20-=20Added=20new=20cStatus=20functions=20to=20the?=
 =?UTF-8?q?=20'status'=20plugin.=20-=20Added=20missing=20#include=20<limit?=
 =?UTF-8?q?s.h>=20to=20epg.c=20and=20menuitems.h=20(thanks=20to=20Ville=20?=
 =?UTF-8?q?Skytt=C3=A4).=20-=20The=20new=20function=20cSkin::SetScrollbar(?=
 =?UTF-8?q?)=20can=20be=20implemented=20by=20skins=20to=20display=20=20=20?=
 =?UTF-8?q?a=20scrollbar=20in=20every=20list=20menu.=20The=20'classic'=20a?=
 =?UTF-8?q?nd=20'sttng'=20skins=20have=20been=20=20=20changed=20accordingl?=
 =?UTF-8?q?y,=20as=20well=20as=20the=20'skincurses'=20plugin.=20-=20Introd?=
 =?UTF-8?q?uced=20'operator=20const=20void=20*=20()'=20in=20cString=20to?=
 =?UTF-8?q?=20catch=20cases=20where=20operator*()=20=20=20should=20be=20us?=
 =?UTF-8?q?ed.=20-=20Fixed=20calculating=20the=20scrollbar=20sizes=20in=20?=
 =?UTF-8?q?the=20skins.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  29 +++
 HISTORY                             |  67 +++++-
 INSTALL                             |   2 +-
 MANUAL                              |   2 +-
 Make.config.template                |   2 +-
 PLUGINS.html                        |  35 +---
 PLUGINS/src/hello/po/it_IT.po       |  22 +-
 PLUGINS/src/pictures/HISTORY        |  14 ++
 PLUGINS/src/pictures/entry.c        |   4 +-
 PLUGINS/src/pictures/pic2mpg        |  13 +-
 PLUGINS/src/pictures/pictures.c     |   4 +-
 PLUGINS/src/pictures/player.c       |   6 +-
 PLUGINS/src/pictures/po/fr_FR.po    |  32 +++
 PLUGINS/src/pictures/po/it_IT.po    |  32 +++
 PLUGINS/src/skincurses/HISTORY      |   5 +
 PLUGINS/src/skincurses/po/it_IT.po  |  28 +++
 PLUGINS/src/skincurses/skincurses.c |  53 +++--
 PLUGINS/src/status/HISTORY          |   4 +
 PLUGINS/src/status/status.c         |  34 +++-
 UPDATE-1.2.0                        |   2 +-
 UPDATE-1.6.0                        | 142 +++++++++++++
 channels.c                          | 238 ++++++++--------------
 channels.h                          |  22 +-
 config.c                            |  24 +--
 config.h                            |  10 +-
 device.c                            |  60 +++---
 device.h                            |  17 +-
 diseqc.c                            |   6 +-
 dvbdevice.c                         | 302 +++++++++++-----------------
 dvbdevice.h                         |  10 +-
 dvbplayer.c                         |  17 +-
 epg.c                               |   3 +-
 font.c                              |  22 +-
 interface.c                         |   7 +-
 keys.c                              |  10 +-
 menu.c                              | 255 ++++++++++++++---------
 menu.h                              |   7 +-
 menuitems.c                         |  65 +-----
 menuitems.h                         |  14 +-
 nit.c                               |  38 ++--
 osdbase.c                           |   3 +-
 pat.c                               |   3 +-
 player.h                            |   7 +-
 plugin.c                            |  14 +-
 po/ca_ES.po                         |  58 ++----
 po/cs_CZ.po                         |  60 ++----
 po/da_DK.po                         |  60 ++----
 po/de_DE.po                         |  60 ++----
 po/el_GR.po                         |  58 ++----
 po/es_ES.po                         |  58 ++----
 po/et_EE.po                         |  62 ++----
 po/fi_FI.po                         |  60 ++----
 po/fr_FR.po                         |  60 ++----
 po/hr_HR.po                         |  58 ++----
 po/hu_HU.po                         |  60 ++----
 po/it_IT.po                         |  60 ++----
 po/nl_NL.po                         |  58 ++----
 po/nn_NO.po                         |  58 ++----
 po/pl_PL.po                         |  60 ++----
 po/pt_PT.po                         |  58 ++----
 po/ro_RO.po                         |  60 ++----
 po/ru_RU.po                         |  64 +++---
 po/sl_SI.po                         |  60 ++----
 po/sv_SE.po                         |  60 ++----
 po/tr_TR.po                         |  60 ++----
 po/uk_UA.po                         |  60 ++----
 recording.c                         | 100 +++++----
 sdt.c                               |   3 +-
 skinclassic.c                       | 122 ++++++-----
 skins.c                             |   6 +-
 skins.h                             |   7 +-
 skinsttng.c                         |  57 ++++--
 sources.c                           |   6 +-
 spu.c                               |   4 +-
 status.c                            |  14 +-
 status.h                            |  17 +-
 svdrp.c                             |  18 +-
 themes.c                            |  10 +-
 thread.c                            |   4 +-
 timers.c                            |  55 ++++-
 timers.h                            |   9 +-
 tools.c                             |  78 ++++---
 tools.h                             |   5 +-
 vdr.1                               |  14 +-
 vdr.5                               |  24 +--
 vdr.c                               |  20 +-
 videodir.c                          |  11 +-
 videodir.h                          |   3 +-
 88 files changed, 1764 insertions(+), 1821 deletions(-)
 create mode 100644 PLUGINS/src/pictures/po/fr_FR.po
 create mode 100755 PLUGINS/src/pictures/po/it_IT.po
 create mode 100755 PLUGINS/src/skincurses/po/it_IT.po
 create mode 100644 UPDATE-1.6.0

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d79f152be..580331b4f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -86,6 +86,7 @@ Deti Fliegl <deti@fliegl.de>
  for implementing the 'CurrentChannel' setup parameter
  for fixing setting the OSD size in the 'Confirm' interface call
  for fixing handling improper buffer lengths in the EIT parser
+ for a patch that was used to implement StopSectionHandler()
 
 Dave Chapman <dave@dchapman.com>
  for implementing support for the teletext PID
@@ -1039,6 +1040,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for some fixes to PLUGINS.html
  for fixing handling CONFDIR
  for updating the Makefile of the skincurses plugin
+ for suggesting to limit the length of the recording name in timers created via
+ SVDRP in case VDR is run with --vfat, in order to avoid names that are too long
+ for Windows
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1158,6 +1162,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for a patch that was used to fix handling small PES packets that caused subtitles
  to be displayed late in live mode
  for a patch that was used to implement handling of DVB-S2
+ for reporting an invalid access in the section handler when ending VDR
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1447,6 +1452,8 @@ Marco Schl
  an example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
  for fixing checking compatibility mode for old subtitles plugin
  for a patch that was used to implement handling of DVB-S2
+ for fixing setting the date in the channel display of the classic and sttng skins,
+ to avoid unnecessary OSD access
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1612,6 +1619,8 @@ Andreas Brugger <brougs78@gmx.net>
  it in a context sensitive manner
  for reporting a loss of the date display in the "classic" skin's main menu
  for reporting a missing setting of lastFreeMB in cMenuMain::Update()
+ for suggesting to ignore "repeat" and "release" keys in the time search entry mode
+ during replay, to avoid inadvertently leaving it in case a key is pressed too long
 
 Dino Ravnic <dino.ravnic@fer.hr>
  for fixing some characters in the iso8859-2 font file
@@ -1664,6 +1673,8 @@ Marco Kremer <vdr.hgm.bg@gmx.net>
 Walter Koch <koch@u32.de>
  for adding channels for DVB-T D�sseldorf and K�ln (Germany) to channels.cont.terr
  for fixing some missing '-' in the German OSD texts
+ for suggesting to display the free disk space also in the title of the "Recordings"
+ menu
 
 Rolf Groppe <rolf@groppe.de>
  for suggesting to fall back to 'stereo' when switching channels in case the user
@@ -1678,6 +1689,8 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for removing an unnecessary #include from osd.c
  for reporting a problem with with numerical input to switch channels if Up, Down,
  Channel+ or Channel- is pressed
+ for pointing out a possible problem with asprintf() if the return value is not
+ checked
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
@@ -1736,6 +1749,7 @@ Ville Skytt
  for fixing the link to the GPL2 at http://www.gnu.org in vdr.c
  for making the "Play" key start replay of the selected recording in the Recordings
  menu
+ for adding missing #include <limits.h> to epg.c and menuitems.h
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1782,6 +1796,7 @@ Martin Wache <M.Wache@gmx.net>
  for adding a sleep in cDvbPlayer::Action() in case there is no data to send to the
  device, which avoids a busy loop on very fast machines
  for fixing a possible crash when loading an invalid XPM file
+ for suggesting to speed up anti-aliased font rendering by caching the blend indexes
 
 Matthias Lenk <matthias.lenk@amd.com>
  for reporting an out-of-bounds memory access with audio language ids
@@ -1954,6 +1969,8 @@ Petri Hintukainen <Petri.Hintukainen@hut.fi>
  for pointing out that plugins from cRemote::PutMacro() and cRemote::CallPlugin()
  need to be handled separately
  for making cTimeMs use the monotonic clock
+ for implementing the cStatus, cDevice and cPlayer functions for setting subtitle
+ tracks in plugins
 
 Marcel Schaeben <mts280@gmx.de>
  for his "Easy Input" patch
@@ -2270,3 +2287,15 @@ Benjamin Hess <benjamin.h@gmx.ch>
 
 Winfried Koehler <w_koehl@gmx.de>
  for fixing finding new transponders
+
+Hans-Werner Hilse <hilse@web.de>
+ for adding the command line option --userdump to enable core dumps in case VDR
+ is run as root with option -u
+
+Mikko Matilainen <mikkom@iki.fi>
+ for reporting a possible crash if the Info key is pressed after deleting the
+ currently replayed recording
+
+Benedikt Elser <elser@in.tum.de>
+ for a patch that was used to add cStatus::TimerChange() to inform plugins about
+ changes to the list of timers
diff --git a/HISTORY b/HISTORY
index 1400840b1..8e2abc86a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5465,7 +5465,7 @@ Video Disk Recorder Revision History
 - Fixed a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode() (thanks to
   Udo Richter).
 - Implemented sending all frames to devices that can handle them in fast forward
-  trick speeds (thansk to Timo Eskola).
+  trick speeds (thanks to Timo Eskola).
 - Updated the Hungarian language texts (thanks to Thomas G�nther).
 - Fixed description of DeviceSetAvailableTrack() and cReceiver(), and added an
   example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
@@ -5578,3 +5578,68 @@ Video Disk Recorder Revision History
 - Removed switching to the next higher or lower channel if the current channel
   is not available, in order to allow staying on an encrypted channel that takes
   a while for the CAM to start decrypting.
+
+2008-02-17: Version 1.5.15
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Added option -i to the pictures plugin's pic2mpg to ignore unknown file types.
+- Revoked the switch to the "multiproto" driver in order to make a new stable
+  version before making this big switch and forcing all users to install a
+  driver that is not yet in the kernel source. The removed code will reappear
+  in version 1.7.0.
+  Note that you may need to switch back to an older version of your channels.conf
+  file if you have already used version 1.5.14, because it introduced new parameters.
+- Added the new command line option --userdump to enable core dumps in case VDR
+  is run as root with option -u (thanks to Hans-Werner Hilse).
+- Speeded up anti-aliased font rendering by caching the blend indexes (based on
+  a suggestion by Martin Wache).
+- Fixed setting the OSD area in the pictures plugin.
+- Ignoring "repeat" and "release" keys in the time search entry mode during replay,
+  to avoid inadvertently leaving it in case a key is pressed too long (suggested
+  by Andreas Brugger).
+- Improved sending all frames to devices that can handle them in fast forward
+  trick speeds, including subtitles (thanks to Timo Eskola).
+- The section handler is now stopped before the device is destroyed, to avoid
+  accessing file handles after they have become invalid (thanks to Reinhard
+  Nissl for reporting an invalid access when ending VDR, and to Deti Fliegl for
+  a patch that was used to implement StopSectionHandler()).
+- Fixed setting the date in the channel display of the classic and sttng skins,
+  to avoid unnecessary OSD access (thanks to Marco Schl��ler).
+- The free disk space is now also displayed in the title of the "Recordings"
+  menu (suggested by Walter Koch).
+- Changed the message "Upcoming VPS recording!" to "Upcoming recording!" because
+  it applies to non-VPS recordings as well.
+- Fixed a loss of a timer's 'recording' flag after modifying it via MODT.
+- Fixed detecting directories in cFileNameList::Load().
+- Running the thread that removes deleted recordings at a low priority to (maybe)
+  avoid stuttering replay in case the thread is run during replay.
+- Limiting the length of the recording name in timers in case VDR is run with
+  --vfat, in order to avoid names that are too long for Windows (suggested by Rolf
+  Ahrenberg).
+- Using cString::sprintf() instead of asprintf() (thanks to Wolfgang Rohdewald
+  for pointing out a possible problem if the return value is not checked).
+  Plugin authors may want to consider doing the same. For convenience there is now
+  an additional version of cString::sprintf() that accepts a va_list parameter.
+- When deleting the recording that is currently replayed, the replay is now
+  stopped immediately (thanks to Mikko Matilainen for reporting a possible crash
+  if the Info key is pressed after deleting the currently replayed recording).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- When determining the amount of free disk space, any deleted (but not yet removed)
+  recordings on different file systems (that are mounted under the video directory)
+  are no longer taken into account.
+- When running out of disk space during a recording, only such deleted or old
+  recordings are removed, that actually are on the video directory file system(s).
+  This prevents VDR from accidentally deleting recordings on other file systems,
+  which would not add any free space to the video directory.
+- Implemented the cStatus, cDevice and cPlayer functions for setting subtitle tracks
+  in plugins (thanks to Petri Hintukainen).
+- Added cStatus::TimerChange() to inform plugins about changes to the list of timers
+  (based on a patch from Benedikt Elser).
+- Added new cStatus functions to the 'status' plugin.
+- Added missing #include <limits.h> to epg.c and menuitems.h (thanks to Ville Skytt�).
+- The new function cSkin::SetScrollbar() can be implemented by skins to display
+  a scrollbar in every list menu. The 'classic' and 'sttng' skins have been
+  changed accordingly, as well as the 'skincurses' plugin.
+- Introduced 'operator const void * ()' in cString to catch cases where operator*()
+  should be used.
+- Fixed calculating the scrollbar sizes in the skins.
diff --git a/INSTALL b/INSTALL
index 573c6c084..fd5983c56 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 1.5
+Version 1.6
 -----------
 
 Compiling and running the program:
diff --git a/MANUAL b/MANUAL
index 8798728d9..c67ec2288 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,7 +1,7 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
-Version 1.4
+Version 1.6
 -----------
 
 * Remote Control Keys
diff --git a/Make.config.template b/Make.config.template
index 9063d666c..32284fcac 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -19,7 +19,7 @@ CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 ifdef PLUGIN
 CFLAGS   += -fPIC
 CXXFLAGS += -fPIC
-endif 
+endif
 
 ### The directory environment:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 5644b6845..71286b3b7 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,27 +6,14 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
-<center><b>Version 1.5.8</b></center>
+<center><b>Version 1.6</b></center>
 <p>
 <center>
-Copyright &copy; 2006 Klaus Schmidinger<br>
+Copyright &copy; 2008 Klaus Schmidinger<br>
 <a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </center>
 <p>
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.7 are marked like this.
-<!--X1.5.7--></td></tr></table>
-<!--X1.5.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.8 are marked like this.
-<!--X1.5.8--></td></tr></table>
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.10 are marked like this.
-<!--X1.5.10--></td></tr></table>
-<!--X1.5.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.5.13 are marked like this.
-<!--X1.5.13--></td></tr></table>
-<p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
 This interface allows programmers to develop additional functionality for VDR completely
@@ -59,9 +46,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Command line help">Command line help</a>
 <li><a href="#Getting started">Getting started</a>
 <li><a href="#Shutting down">Shutting down</a>
-<!--X1.5.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <li><a href="#Logging">Logging</a>
-<!--X1.5.13--></td></tr></table>
 <li><a href="#Main menu entry">Main menu entry</a>
 <li><a href="#User interaction">User interaction</a>
 <li><a href="#Housekeeping">Housekeeping</a>
@@ -543,7 +528,6 @@ <h1>Table Of Contents</h1>
 returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
 as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
 
-<!--X1.5.13--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <a name="Logging"><hr><h2>Logging</h2>
 
 If the plugin should print log messages, you can use <tt>dsyslog()</tt>, <tt>isyslog()</tt> or <tt>esyslog()</tt>.<br>
@@ -561,7 +545,6 @@ <h1>Table Of Contents</h1>
 
 Note that the log messages will be given as provided, the plugin's name will not
 automatically be added, so make shure your log messages are obvious enough.
-<!--X1.5.13--></td></tr></table>
 
 <a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
@@ -929,7 +912,6 @@ <h1>Table Of Contents</h1>
 
 <center><i><b>Welcome to Babylon!</b></i></center><p>
 
-<!--X1.5.7--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 If a plugin displays texts to the user, it should prepare for internationalization
 of these texts. All that is necessary for this is to mark every text that is
 presented to the user as translatable, as in
@@ -940,12 +922,10 @@ <h1>Table Of Contents</h1>
 
 The text given here must be the English version, and the returned pointer is either
 a translated version (if available) or the original string.
-<!--X1.5.8--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Texts are searched for in the domain registered for this plugin.
 If a plugin wants to make use of texts defined by the core VDR code, it can use
 the special <tt>trVDR()</tt> macro to mark these texts without having them
 appear in its own translation file.
-<!--X1.5.8--></td></tr></table>
 <p>
 Sometimes texts are stored in an array, in which case they need to be marked
 differently, using the trNOOP() macro. The actual translation is then done
@@ -973,7 +953,6 @@ <h1>Table Of Contents</h1>
 and are defined in <tt>VDR/tools.h</tt>.
 Most of the time a plugin doesn't need to care about this, but when it comes to
 handling individual characters these functions may come in handy.
-<!--X1.5.7--></td></tr></table>
 
 <a name="Custom services"><hr><h2>Custom services</h2>
 
@@ -1349,9 +1328,7 @@ <h1>Table Of Contents</h1>
 available audio tracks by calling
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL)
-<!--X1.5.10--></td></tr></table>
 </pre></td></tr></table><p>
 
 See <tt>device.h</tt> for details about the parameters for track handling.
@@ -1477,19 +1454,15 @@ <h1>Table Of Contents</h1>
   };
 
 cMyReceiver::cMyReceiver(int Pid)
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 :cReceiver(tChannelID(), -1, Pid)
-<!--X1.5.10--></td></tr></table>
 {
 }
 
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%><pre>
 cMyReceiver::~cMyReceiver()
 {
   cReceiver::Detach();
   ...
 }
-<!--X1.5.10--></pre></td></tr></table>
 
 void cMyReceiver::Activate(bool On)
 {
@@ -1851,9 +1824,7 @@ <h1>Table Of Contents</h1>
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual int64_t GetSTC(void);
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual bool HasIBPTrickSpeed(void);
-<!--X1.5.10--></td></tr></table>
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
 virtual void Play(void);
@@ -1881,9 +1852,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td bgcolor=#F0F0F0><pre>
 virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
-<!--X1.5.10--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 virtual void CloseFilter(int Handle);
-<!--X1.5.10--></td></tr></table>
 </pre></td></tr></table><p>
 
 which must open and close a file handle that delivers section data for the given
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index f3f050904..c6fbdb1c6 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -1,36 +1,34 @@
 # VDR plugin language source file.
 # Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Alberto Carraro <bertocar@tin.it>, 2001
-# Antonio Ospite <ospite@studenti.unina.it>, 2003
-# Sean Carlos <seanc@libero.it>, 2005
+# Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
-"PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Sean Carlos <seanc@libero.it>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2008-01-27 20:11+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr ""
+msgstr "Un saluto cordiale"
 
 msgid "Hello"
-msgstr ""
+msgstr "Ciao"
 
 msgid "Greeting time (s)"
-msgstr ""
+msgstr "Tempo saluto (s)"
 
 msgid "Use alternate greeting"
-msgstr ""
+msgstr "Utilizza saluto alternativo"
 
 msgid "Howdy folks!"
-msgstr ""
+msgstr "Come state gente!"
 
 msgid "Hello world!"
-msgstr ""
+msgstr "Ciao mondo!"
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 462c02f11..174fd30d4 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -10,3 +10,17 @@ VDR Plugin 'pictures' Revision History
 - Fixed the Play function (when used from a directory in the pictures menu
   it always started with the next directory).
 - Added Finnish texts (thanks to Rolf Ahrenberg <rahrenbe@cc.hut.fi>).
+
+2008-01-27: Version 0.0.3
+
+- Added French texts (thanks to Patrice Staudt <ipatrice.staudt@laposte.net>).
+
+2008-02-02: Version 0.0.4
+
+- Added option -i to pic2mpg to ignore unknown file types.
+
+2008-02-17: Version 0.0.5
+
+- Fixed setting the OSD area.
+- Introduced 'operator const void * ()' in cString to catch cases where operator*()
+  should be used.
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index e03858c93..427585e6d 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.c 1.2 2008/01/18 15:49:51 kls Exp $
+ * $Id: entry.c 1.3 2008/02/17 13:42:34 kls Exp $
  */
 
 #include "entry.h"
@@ -37,7 +37,7 @@ int cPictureEntry::Compare(const cListObject &ListObject) const
 
 cString cPictureEntry::Path(void) const
 {
-  return parent ? AddDirectory(parent->Path(), name) : name;
+  return parent ? *AddDirectory(parent->Path(), name) : name;
 }
 
 void cPictureEntry::Load(void) const
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 57916852a..6cd743595 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 1.1 2008/01/13 11:09:12 kls Exp $
+# $Id: pic2mpg 1.2 2008/02/02 11:34:43 kls Exp $
 
 ## TODO implement HDTV (1920 x 1080)
 
@@ -20,20 +20,22 @@ Usage: $0 [options] picture-dir mpeg-dir
        $0 [options] picture-file mpeg-file
 
 Options: -a             Aspect ratio 4:3 (default is 16:9)
-         -h             print Help
          -f             Force conversion
+         -h             print Help
+         -i             Ignore unknown file types
          -n             NTSC (default is PAL)
          -v num         Verbose (0=none, 1=list files, 2=detailed)
          -x percent     X overscan in percent
          -y percent     Y overscan in percent
 };
 
-getopts("ahfnv:x:y:") || die $Usage;
+getopts("afhinv:x:y:") || die $Usage;
 
 die $Usage if $opt_h;
 
 $Aspect    = $opt_a;
 $Force     = $opt_f;
+$Ignore    = $opt_i;
 $NTSC      = $opt_n;
 $Verbose   = $opt_v;
 $OverscanX = $opt_x;
@@ -142,7 +144,10 @@ sub ConvertFile
 {
   my ($Pict, $Mpeg) = @_;
   (my $Type) = $Pict =~ /\.([^\.]*)$/;
-  die "unknown file type '$Type': '$Pict'\n" unless defined $PNMCONV{$Type};
+  if (!defined $PNMCONV{$Type}) {
+     return if ($Ignore);
+     die "unknown file type '$Type': '$Pict'\n";
+     }
   my ($w, $h) = imgsize($Pict);
   print "image size is $w x $h\n" if ($Detailed);
   if ($w / $h <= $ScreenRatio) {
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index e3015e401..6e64c4e3d 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 1.2 2008/01/19 11:20:03 kls Exp $
+ * $Id: pictures.c 1.5 2008/02/09 12:15:52 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.2";
+static const char *VERSION       = "0.0.5";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index b942be527..8981b6007 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 1.2 2008/01/19 11:01:58 kls Exp $
+ * $Id: player.c 1.3 2008/02/09 12:13:10 kls Exp $
  */
 
 #include "player.h"
@@ -173,11 +173,11 @@ void cPictureControl::DisplayCaption(void)
   int h = 2 * Font->Height();
   if (!osd) {
      osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - h, OSD_LEVEL_SUBTITLES);
-     tArea Areas[] = { { 0, 0, w, h, 8 } };
+     tArea Areas[] = { { 0, 0, w - 1, h - 1, 8 } };
      if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      else {
-        tArea Areas[] = { { 0, 0, w, h, 4 } };
+        tArea Areas[] = { { 0, 0, w - 1, h - 1, 4 } };
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
         }
      }
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
new file mode 100644
index 000000000..54933aae0
--- /dev/null
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Patrice Staudt <patrice.staudt@laposte.net>, 2008."
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pictures 0.0.1\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2008-01-12 17:41+0100\n"
+"Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
+"Language-Team: France\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Pictures"
+msgstr "Images"
+
+msgid "A simple picture viewer"
+msgstr "Un simple visualiseur d'images"
+
+msgid "Picture directory"
+msgstr "Dossier des images"
+
+msgid "Slide show delay (s)"
+msgstr "Pause entre deux images (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Aucun dossier n'est d�finit!"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
new file mode 100755
index 000000000..d16fc4c5d
--- /dev/null
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Diego Pierotto <vdr-italian@tiscali.it>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pictures 0.0.1\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2008-01-27 20:22+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Pictures"
+msgstr "Immagini"
+
+msgid "A simple picture viewer"
+msgstr "Un semplice visualizzatore immagini"
+
+msgid "Picture directory"
+msgstr "Directory immagini"
+
+msgid "Slide show delay (s)"
+msgstr "Ritardo diapositive (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Nessuna directory immagini impostata!"
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index e5bfa49d8..45b79bb1b 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -65,3 +65,8 @@ VDR Plugin 'skincurses' Revision History
 2008-01-19:
 
 - Updated the Makefile of the skincurses plugin (thanks to Rolf Ahrenberg).
+
+2008-02-15: Version 0.1.5
+
+- Using cString::sprintf() instead of asprintf().
+- Implemented cSkinCursesDisplayMenu::SetScrollbar().
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
new file mode 100755
index 000000000..8dc4556a8
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -0,0 +1,28 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Diego Pierotto <vdr-italian@tiscali.it>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"PO-Revision-Date: 2008-01-27 20:35+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A text only skin"
+msgstr "Una interfaccia solo testo"
+
+msgid "Key$Mute"
+msgstr "Muto"
+
+msgid "Volume "
+msgstr "Volume "
+
+msgid "Text mode"
+msgstr "Modalit� testo"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index b9a4fc065..2f0bea928 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.18 2007/08/26 20:16:59 kls Exp $
+ * $Id: skincurses.c 1.20 2008/02/17 14:28:19 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.4";
+static const char *VERSION        = "0.1.5";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -166,7 +166,7 @@ void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Co
      }
   SetColor(ColorFg, ColorBg);
   wmove(window, y, x); // ncurses wants 'y' before 'x'!
-  waddnstr(window, s, ScOsdWidth - x);
+  waddnstr(window, s, Width ? Width : ScOsdWidth - x);
 }
 
 void cCursesOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
@@ -261,7 +261,8 @@ void cSkinCursesDisplayChannel::Flush(void)
 class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
 private:
   cOsd *osd;
-  void SetScrollbar(void);
+  void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
+  void SetTextScrollbar(void);
 public:
   cSkinCursesDisplayMenu(void);
   virtual ~cSkinCursesDisplayMenu();
@@ -272,6 +273,7 @@ class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
   virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetScrollbar(int Total, int Offset);
   virtual void SetEvent(const cEvent *Event);
   virtual void SetRecording(const cRecording *Recording);
   virtual void SetText(const char *Text, bool FixedFont);
@@ -290,25 +292,31 @@ cSkinCursesDisplayMenu::~cSkinCursesDisplayMenu()
   delete osd;
 }
 
-void cSkinCursesDisplayMenu::SetScrollbar(void)
+void cSkinCursesDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown)
 {
-  if (textScroller.CanScroll()) {
-     int yt = textScroller.Top();
-     int yb = yt + textScroller.Height() - 1;
+  if (Total > 0 && Total > Shown) {
+     int yt = Top;
+     int yb = yt + Height - 1;
      int st = yt;
      int sb = yb;
-     int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
-     int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
+     int tt = st + (sb - st + 1) * Offset / Total;
+     int tb = tt + (sb - st + 1) * Shown / Total;
      int xl = ScOsdWidth - 1;
-     osd->DrawRectangle(xl, st, xl, sb, clrCyan);
-     osd->DrawRectangle(xl, tt, xl, tb, clrWhite);
+     osd->DrawRectangle(xl, st, xl, sb, clrWhite);
+     osd->DrawRectangle(xl, tt, xl, tb, clrCyan);
      }
 }
 
+void cSkinCursesDisplayMenu::SetTextScrollbar(void)
+{
+  if (textScroller.CanScroll())
+     DrawScrollbar(textScroller.Total(), textScroller.Offset(), textScroller.Shown(), textScroller.Top(), textScroller.Height(), textScroller.CanScrollUp(), textScroller.CanScrollDown());
+}
+
 void cSkinCursesDisplayMenu::Scroll(bool Up, bool Page)
 {
   cSkinDisplayMenu::Scroll(Up, Page);
-  SetScrollbar();
+  SetTextScrollbar();
 }
 
 int cSkinCursesDisplayMenu::MaxItems(void)
@@ -366,12 +374,17 @@ void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current,
       const char *s = GetTabbedText(Text, i);
       if (s) {
          int xt = Tab(i) / 12;// Tab() is in "pixel" - see also skins.c!!!
-         osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, ScOsdWidth - xt);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, ScOsdWidth - 2 - xt);
          }
       if (!Tab(i + 1))
          break;
       }
-  SetEditableWidth(ScOsdWidth - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
+  SetEditableWidth(ScOsdWidth - 2 - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
+}
+
+void cSkinCursesDisplayMenu::SetScrollbar(int Total, int Offset)
+{
+  DrawScrollbar(Total, Offset, MaxItems(), 2, MaxItems(), Offset > 0, Offset + MaxItems() < Total);
 }
 
 void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
@@ -384,10 +397,8 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
   snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
-     char *buffer;
-     asprintf(&buffer, " VPS: %s", *Event->GetVpsString());
+     cString buffer = cString::sprintf(" VPS: %s", *Event->GetVpsString());
      osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
-     free(buffer);
      }
   y += ts.Height();
   y += 1;
@@ -400,7 +411,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
   y += 1;
   if (!isempty(Event->Description())) {
      textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground);
-     SetScrollbar();
+     SetTextScrollbar();
      }
 }
 
@@ -428,14 +439,14 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
   y += 1;
   if (!isempty(Info->Description())) {
      textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground);
-     SetScrollbar();
+     SetTextScrollbar();
      }
 }
 
 void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
 {
   textScroller.Set(osd, 0, 2, ScOsdWidth - 2, ScOsdHeight - 4, Text, &Font, clrWhite, clrBackground);
-  SetScrollbar();
+  SetTextScrollbar();
 }
 
 void cSkinCursesDisplayMenu::Flush(void)
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 97bc7e2ee..f65206893 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -40,3 +40,7 @@ VDR Plugin 'status' Revision History
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
+
+2008-02-16: Version 0.3.0
+
+- Added new cStatus functions.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index fa5f0d41e..395987139 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.9 2007/08/15 13:19:44 kls Exp $
+ * $Id: status.c 1.10 2008/02/16 15:41:05 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.2.1";
+static const char *VERSION        = "0.3.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -17,20 +17,30 @@ static const char *MAINMENUENTRY  = NULL;
 
 class cStatusTest : public cStatus {
 protected:
+  virtual void TimerChange(const cTimer *Timer, eTimerChange Change);
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
   virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
   virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
   virtual void SetVolume(int Volume, bool Absolute);
+  virtual void SetAudioTrack(int Index, const char * const *Tracks);
+  virtual void SetAudioChannel(int AudioChannel);
+  virtual void SetSubtitleTrack(int Index, const char * const *Tracks);
   virtual void OsdClear(void);
   virtual void OsdTitle(const char *Title);
   virtual void OsdStatusMessage(const char *Message);
   virtual void OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue);
+  virtual void OsdItem(const char *Text, int Index);
   virtual void OsdCurrentItem(const char *Text);
   virtual void OsdTextItem(const char *Text, bool Scroll);
   virtual void OsdChannel(const char *Text);
   virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle);
   };
 
+void cStatusTest::TimerChange(const cTimer *Timer, eTimerChange Change)
+{
+  dsyslog("status: cStatusTest::TimerChange  %s %d", Timer ? *Timer->ToText(true) : "-", Change);
+}
+
 void cStatusTest::ChannelSwitch(const cDevice *Device, int ChannelNumber)
 {
   dsyslog("status: cStatusTest::ChannelSwitch  %d %d", Device->CardIndex(), ChannelNumber);
@@ -51,6 +61,21 @@ void cStatusTest::SetVolume(int Volume, bool Absolute)
   dsyslog("status: cStatusTest::SetVolume  %d %d", Volume, Absolute);
 }
 
+void cStatusTest::SetAudioTrack(int Index, const char * const *Tracks)
+{
+  dsyslog("status: cStatusTest::SetAudioTrack  %d %s", Index, Tracks[Index]);
+}
+
+void cStatusTest::SetAudioChannel(int AudioChannel)
+{
+  dsyslog("status: cStatusTest::SetAudioChannel  %d", AudioChannel);
+}
+
+void cStatusTest::SetSubtitleTrack(int Index, const char * const *Tracks)
+{
+  dsyslog("status: cStatusTest::SetSubtitleTrack  %d %s", Index, Tracks[Index]);
+}
+
 void cStatusTest::OsdClear(void)
 {
   dsyslog("status: cStatusTest::OsdClear");
@@ -71,6 +96,11 @@ void cStatusTest::OsdHelpKeys(const char *Red, const char *Green, const char *Ye
   dsyslog("status: cStatusTest::OsdHelpKeys %s - %s - %s - %s", Red, Green, Yellow, Blue);
 }
 
+void cStatusTest::OsdItem(const char *Text, int Index)
+{
+  //dsyslog("status: cStatusTest::OsdItem  %s %d", Text, Index);
+}
+
 void cStatusTest::OsdCurrentItem(const char *Text)
 {
   dsyslog("status: cStatusTest::OsdCurrentItem %s", Text);
diff --git a/UPDATE-1.2.0 b/UPDATE-1.2.0
index 8934196f6..473d042a9 100644
--- a/UPDATE-1.2.0
+++ b/UPDATE-1.2.0
@@ -1,7 +1,7 @@
 This is a summary of the changes in VDR 1.2.0 since the last stable
 version 1.0.4. It only contains things that are of actual importance
 to the user and doesn't mention the many fixes and improvements that
-have been made "behind the scenes". 
+have been made "behind the scenes".
 
 See the file HISTORY for a detailed list of all changes.
 
diff --git a/UPDATE-1.6.0 b/UPDATE-1.6.0
new file mode 100644
index 000000000..33abde069
--- /dev/null
+++ b/UPDATE-1.6.0
@@ -0,0 +1,142 @@
+This is a summary of the changes in VDR 1.6.0 since the last stable
+version 1.4.7. It only contains things that are of actual importance
+to the user and doesn't mention the many fixes and improvements that
+have been made "behind the scenes".
+
+See the file HISTORY for a detailed list of all changes.
+
+Subtitles:
+
+- Implemented handling DVB subtitles.
+- The new setup option "DVB/Subtitle languages" can be used to define the
+  preferred languages for subtitles.
+- The new setup option "DVB/Subtitle offset" can be used to shift the location
+  of the subtitles in the vertical direction.
+- The new setup options "DVB/Subtitle foreground/background transparency"
+  define an additional level of transparency for the foreground and background
+  color of subtitles.
+
+UTF-8 support:
+
+- VDR now fully supports UTF-8.
+- The actual character encoding on a given system will be determined from the
+  environment. On a system that uses, for instance, ISO8859-1, VDR will encode
+  everything in that code (as far as possible).
+
+Plugins:
+
+- The new remote control key "Subtitles" can be used to bring up the list
+  of available subtitles.
+- Plugins can now implement the new function WakeupTime() to request VDR to wake
+  up at a particular time.
+
+Remote control:
+
+- The "Play" key now starts replay of the selected recording in the Recordings
+  menu
+- The kInfo key is now propagated to any open menu, so that it can react to it
+  in a context sensitive manner. If there is no menu open it will show the info
+  of the current broadcast or replay.
+
+OSD:
+
+- The OSD now uses Freetype fonts.
+- If the OSD device in use has at least 8bpp bitmap depth and this is also
+  used by the current skin, Freetype fonts are displayed "anti-aliased".
+  The new setup parameter "OSD/Anti-alias" can be used to turn this off.
+- Changed the parameter "OSD font" to "Default font" in "Setup/OSD".
+- There can now be more than one OSD at the same time. At any given time,
+  however, only one of them can be active (and thus visible). This is to
+  allow displaying things like subtitles in an easy way. A cOsd therefore
+  now has a "Level", and only the OSD with the smallest level will be
+  displayed. The level 0 OSD is special, and there can only be one with
+  this level. If there is more than one OSD with a particular level, only
+  the one that was created first will be displayed.
+  Plugins that provide an OSD need to adjust their cOsdProvider::CreateOsd()
+  function to hand through the Level.
+- Skins can now have scrollbars in all list menus.
+
+Channels:
+
+- The new Setup parameter "Channel entry timeout" can be used to customize the time
+  since the last keypress until a numerically entered channel number is considered
+  complete, and the channel is switched (suggested by Helmut Auer). Setting this
+  parameter to 0 turns off the automatic channel switching, and the user will
+  have to confirm the entry by pressing the "Ok" key.
+
+Recordings:
+
+- The info.vdr file now also stores the name of the channel.
+- When deleting the recording that is currently replayed, the replay is now
+  stopped immediately.
+- When determining the amount of free disk space, any deleted (but not yet removed)
+  recordings on different file systems (that are mounted under the video directory)
+  are no longer taken into account.
+- When running out of disk space during a recording, only such deleted or old
+  recordings are removed, that actually are on the video directory file system(s).
+  This prevents VDR from accidentally deleting recordings on other file systems,
+  which would not add any free space to the video directory.
+
+SVDRP:
+
+- The new SVDRP command REMO can be used to turn VDR's remote control off and
+  on in case other programs need to be controlled.
+- Improved performance of the SVDRP commands LSTC and CHAN when used with a
+  channel name.
+- The SVDRP command LSTC can now list the channels with group separators if the
+  option ':groups' is given.
+- Enhanced the SVDRP command CLRE to allow clearing the EPG data of a particular
+  channel.
+
+Conditional Access:
+
+- It is now automatically detected which CAM can actually decrypt a channel.
+- CAMs can now be dynamically assigned to the various devices, provided the
+  hardware in use implements such a possibility.
+- Improved handling of the CAM menu.
+- Several encrypted channels on the same transponder can now be decrypted
+  simultaneously with one CAM, if the CAM supports this.
+- Ca values in the range 0...F in channels.conf can still be used to assign a channel
+  to a particular device, but this will no longer work with encrypted channels because
+  without valid CA ids VDR can't decide which CAM slot to use. However, since VDR now
+  automatically determines which CAM can decrypt which channel, setting fixed
+  channel/device relations should no longer be necessary.
+  IF AN ENCRYPTED CHANNEL CAN'T BE DECRYPTED AND YOU HAVE A CA VALUE IN THE RANGE
+  0...F FOR THAT CHANNEL, SET IT TO 0 (FTA) AND TUNE TO THE CHANNEL AGAIN.
+- Removed switching to the next higher or lower channel if the current channel
+  is not available, in order to allow staying on an encrypted channel that takes
+  a while for the CAM to start decrypting.
+
+Internationalization:
+
+- Internationalization is now done with 'gettext'.
+  See README.i18n for information on how to create new or maintain existing
+  translations.
+- The parameter OSDLanguage in 'setup.conf' is now a string and holds the locale
+  code of the selected OSD language (e.g. en_US). If Setup.OSDLanguage is not
+  set to a particular locale that is found in VDR's locale directory, the
+  locale as defined in the system environment is used by default.
+- The new option --localedir can be used to set the locale directory at runtime.
+- Added Turkish language texts.
+- Added Ukrainian language texts.
+
+Misc:
+
+- Improved shutdown handling.
+- The HUP signal now forces a restart of VDR.
+- All logging now goes to LOG_ERR, because some systems split error, info and
+  debug messages into separate files, which repeatedly caused extra efforts to
+  find out when incomplete log excerpts were attached to problem reports in
+  the past.
+- The new setup option "Miscellaneous/Emergency exit" can be used to turn off
+  the automatic restart of VDR in case a recording fails for some reason.
+- The new plugin "pictures" implements a simple picture viewer.
+  See PLUGINS/src/pictures/README for details.
+- Added the new command line option --userdump to enable core dumps in case VDR
+  is run as root with option -u.
+- The free disk space is now also displayed in the title of the "Recordings"
+  menu.
+- Changed the message "Upcoming VPS recording!" to "Upcoming recording!" because
+  it applies to non-VPS recordings as well.
+- Limiting the length of the recording name in timers in case VDR is run with
+  --vfat, in order to avoid names that are too long for Windows.
diff --git a/channels.c b/channels.c
index dd1967f18..9730a4369 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.56 2008/01/27 13:59:53 kls Exp $
+ * $Id: channels.c 1.59 2008/02/10 15:45:38 kls Exp $
  */
 
 #include "channels.h"
@@ -18,117 +18,70 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// -- Channel Parameter Maps -------------------------------------------------
+// --- Channel Parameter Maps ------------------------------------------------
 
 const tChannelParameterMap InversionValues[] = {
-  {   0, DVBFE_INVERSION_OFF, trNOOP("off") },
-  {   1, DVBFE_INVERSION_ON,  trNOOP("on") },
-  { 999, DVBFE_INVERSION_AUTO },
+  {   0, INVERSION_OFF },
+  {   1, INVERSION_ON },
+  { 999, INVERSION_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap BandwidthValues[] = {
-  {   5, DVBFE_BANDWIDTH_5_MHZ, "5 MHz" },
-  {   6, DVBFE_BANDWIDTH_6_MHZ, "6 MHz" },
-  {   7, DVBFE_BANDWIDTH_7_MHZ, "7 MHz" },
-  {   8, DVBFE_BANDWIDTH_8_MHZ, "8 MHz" },
-  { 999, DVBFE_BANDWIDTH_AUTO },
+  {   6, BANDWIDTH_6_MHZ },
+  {   7, BANDWIDTH_7_MHZ },
+  {   8, BANDWIDTH_8_MHZ },
+  { 999, BANDWIDTH_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap CoderateValues[] = {
-  {   0, DVBFE_FEC_NONE, trNOOP("none") },
-  {  12, DVBFE_FEC_1_2,  "1/2" },
-  {  13, DVBFE_FEC_1_3,  "1/3" },
-  {  14, DVBFE_FEC_1_4,  "1/4" },
-  {  23, DVBFE_FEC_2_3,  "2/3" },
-  {  25, DVBFE_FEC_2_5,  "2/5" },
-  {  34, DVBFE_FEC_3_4,  "3/4" },
-  {  35, DVBFE_FEC_3_5,  "3/5" },
-  {  45, DVBFE_FEC_4_5,  "4/5" },
-  {  56, DVBFE_FEC_5_6,  "5/6" },
-  {  67, DVBFE_FEC_6_7,  "6/7" },
-  {  78, DVBFE_FEC_7_8,  "7/8" },
-  {  89, DVBFE_FEC_8_9,  "8/9" },
-  { 910, DVBFE_FEC_9_10, "9/10" },
-  { 999, DVBFE_FEC_AUTO },
+  {   0, FEC_NONE },
+  {  12, FEC_1_2 },
+  {  23, FEC_2_3 },
+  {  34, FEC_3_4 },
+  {  45, FEC_4_5 },
+  {  56, FEC_5_6 },
+  {  67, FEC_6_7 },
+  {  78, FEC_7_8 },
+  {  89, FEC_8_9 },
+  { 999, FEC_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap ModulationValues[] = {
-  {   0, DVBFE_MOD_NONE,    trNOOP("none") },
-  {   4, DVBFE_MOD_QAM4,    "QAM4" },
-  {  16, DVBFE_MOD_QAM16,   "QAM16" },
-  {  32, DVBFE_MOD_QAM32,   "QAM32" },
-  {  64, DVBFE_MOD_QAM64,   "QAM64" },
-  { 128, DVBFE_MOD_QAM128,  "QAM128" },
-  { 256, DVBFE_MOD_QAM256,  "QAM256" },
-  { 512, DVBFE_MOD_QAM512,  "QAM512" },
-  {1024, DVBFE_MOD_QAM1024, "QAM1024" },
-  {   1, DVBFE_MOD_BPSK,    "BPSK" },
-  {   2, DVBFE_MOD_QPSK,    "QPSK" },
-  {   3, DVBFE_MOD_OQPSK,   "OQPSK" },
-  {   5, DVBFE_MOD_8PSK,    "8PSK" },
-  {   6, DVBFE_MOD_16APSK,  "16APSK" },
-  {   7, DVBFE_MOD_32APSK,  "32APSK" },
-  {   8, DVBFE_MOD_OFDM,    "OFDM" },
-  {   9, DVBFE_MOD_COFDM,   "COFDM" },
-  {  10, DVBFE_MOD_VSB8,    "VSB8" },
-  {  11, DVBFE_MOD_VSB16,   "VSB16" },
-  { 998, DVBFE_MOD_QAMAUTO, "QAMAUTO" },
-  { 999, DVBFE_MOD_AUTO },
-  { -1 }
-  };
-
-const tChannelParameterMap SystemValues[] = {
-  {   0, DVBFE_DELSYS_DVBS,  "DVB-S" },
-  {   1, DVBFE_DELSYS_DVBS2, "DVB-S2" },
+  {   0, QPSK },
+  {  16, QAM_16 },
+  {  32, QAM_32 },
+  {  64, QAM_64 },
+  { 128, QAM_128 },
+  { 256, QAM_256 },
+  { 999, QAM_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap TransmissionValues[] = {
-  {   2, DVBFE_TRANSMISSION_MODE_2K, "2K" },
-  {   4, DVBFE_TRANSMISSION_MODE_4K, "4K" },
-  {   8, DVBFE_TRANSMISSION_MODE_8K, "8K" },
-  { 999, DVBFE_TRANSMISSION_MODE_AUTO },
+  {   2, TRANSMISSION_MODE_2K },
+  {   8, TRANSMISSION_MODE_8K },
+  { 999, TRANSMISSION_MODE_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap GuardValues[] = {
-  {   4, DVBFE_GUARD_INTERVAL_1_4,  "1/4" },
-  {   8, DVBFE_GUARD_INTERVAL_1_8,  "1/8" },
-  {  16, DVBFE_GUARD_INTERVAL_1_16, "1/16" },
-  {  32, DVBFE_GUARD_INTERVAL_1_32, "1/32" },
-  { 999, DVBFE_GUARD_INTERVAL_AUTO },
+  {   4, GUARD_INTERVAL_1_4 },
+  {   8, GUARD_INTERVAL_1_8 },
+  {  16, GUARD_INTERVAL_1_16 },
+  {  32, GUARD_INTERVAL_1_32 },
+  { 999, GUARD_INTERVAL_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap HierarchyValues[] = {
-  {   0, DVBFE_HIERARCHY_OFF, trNOOP("off") },
-  {   1, DVBFE_HIERARCHY_ON,  trNOOP("on") },
-  { 999, DVBFE_HIERARCHY_AUTO },
-  { -1 }
-  };
-
-const tChannelParameterMap AlphaValues[] = {
-  {   0, 0 },
-  {   1, DVBFE_ALPHA_1 },
-  {   2, DVBFE_ALPHA_2 },
-  {   4, DVBFE_ALPHA_4 },
-  { -1 }
-  };
-
-const tChannelParameterMap PriorityValues[] = {
-  {   0, DVBFE_STREAM_PRIORITY_HP, trNOOP("high") },
-  {   1, DVBFE_STREAM_PRIORITY_LP, trNOOP("low") },
-  { -1 }
-  };
-
-const tChannelParameterMap RollOffValues[] = {
-  {   0, DVBFE_ROLLOFF_UNKNOWN },
-  {  20, DVBFE_ROLLOFF_20, "0.20" },
-  {  25, DVBFE_ROLLOFF_25, "0.25" },
-  {  35, DVBFE_ROLLOFF_35, "0.35" },
+  {   0, HIERARCHY_NONE },
+  {   1, HIERARCHY_1 },
+  {   2, HIERARCHY_2 },
+  {   4, HIERARCHY_4 },
+  { 999, HIERARCHY_AUTO },
   { -1 }
   };
 
@@ -154,14 +107,11 @@ int DriverIndex(int Value, const tChannelParameterMap *Map)
   return -1;
 }
 
-int MapToUser(int Value, const tChannelParameterMap *Map, const char **String)
+int MapToUser(int Value, const tChannelParameterMap *Map)
 {
   int n = DriverIndex(Value, Map);
-  if (n >= 0) {
-     if (String)
-        *String = tr(Map[n].userString);
+  if (n >= 0)
      return Map[n].userValue;
-     }
   return -1;
 }
 
@@ -173,7 +123,7 @@ int MapToDriver(int Value, const tChannelParameterMap *Map)
   return -1;
 }
 
-// -- tChannelID -------------------------------------------------------------
+// --- tChannelID ------------------------------------------------------------
 
 const tChannelID tChannelID::InvalidID;
 
@@ -208,7 +158,7 @@ tChannelID &tChannelID::ClrPolarization(void)
   return *this;
 }
 
-// -- cChannel ---------------------------------------------------------------
+// --- cChannel --------------------------------------------------------------
 
 cChannel::cChannel(void)
 {
@@ -217,18 +167,14 @@ cChannel::cChannel(void)
   provider = strdup("");
   portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-  inversion    = DVBFE_INVERSION_AUTO;
-  bandwidth    = DVBFE_BANDWIDTH_AUTO;
-  coderateH    = DVBFE_FEC_AUTO;
-  coderateL    = DVBFE_FEC_AUTO;
-  modulation   = DVBFE_MOD_AUTO;
-  system       = DVBFE_DELSYS_DVBS;
-  transmission = DVBFE_TRANSMISSION_MODE_AUTO;
-  guard        = DVBFE_GUARD_INTERVAL_AUTO;
-  hierarchy    = DVBFE_HIERARCHY_AUTO;
-  alpha        = 0;
-  priority     = DVBFE_STREAM_PRIORITY_HP;
-  rollOff      = DVBFE_ROLLOFF_UNKNOWN;
+  inversion    = INVERSION_AUTO;
+  bandwidth    = BANDWIDTH_AUTO;
+  coderateH    = FEC_AUTO;
+  coderateL    = FEC_AUTO;
+  modulation   = QAM_AUTO;
+  transmission = TRANSMISSION_MODE_AUTO;
+  guard        = GUARD_INTERVAL_AUTO;
+  hierarchy    = HIERARCHY_AUTO;
   modification = CHANNELMOD_NONE;
   schedule     = NULL;
   linkChannels = NULL;
@@ -331,17 +277,13 @@ void cChannel::CopyTransponderData(const cChannel *Channel)
      coderateH    = Channel->coderateH;
      coderateL    = Channel->coderateL;
      modulation   = Channel->modulation;
-     system       = Channel->system;
      transmission = Channel->transmission;
      guard        = Channel->guard;
      hierarchy    = Channel->hierarchy;
-     alpha        = Channel->alpha;
-     priority     = Channel->priority;
-     rollOff      = Channel->rollOff;
      }
 }
 
-bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
+bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
 {
   // Workarounds for broadcaster stupidity:
   // Some providers broadcast the transponder frequency of their channels with two different
@@ -355,22 +297,19 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
   if (abs(srate - Srate) <= 1)
      Srate = srate;
 
-  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH || modulation != Modulation || system != System || rollOff != RollOff) {
-     cString OldParameters = ParametersToString();
+  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), *cSource::ToString(source), frequency, polarization, srate, coderateH, *cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      source = Source;
      frequency = Frequency;
      polarization = Polarization;
      srate = Srate;
      coderateH = CoderateH;
-     modulation = Modulation;
-     system = System;
-     rollOff = RollOff;
+     modulation = QPSK;
      schedule = NULL;
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %d:%s:%s:%d to %d:%s:%s:%d", Number(), frequency, *OldParameters, *cSource::ToString(source), srate, Frequency, *ParametersToString(), *cSource::ToString(Source), Srate);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
      }
   return true;
 }
@@ -378,26 +317,29 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
 bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH)
 {
   if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
-     cString OldParameters = ParametersToString();
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, modulation, srate, coderateH, *cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      source = Source;
      frequency = Frequency;
      modulation = Modulation;
      srate = Srate;
      coderateH = CoderateH;
      schedule = NULL;
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %d:%s:%s:%d to %d:%s:%s:%d", Number(), frequency, *OldParameters, *cSource::ToString(source), srate, Frequency, *ParametersToString(), *cSource::ToString(Source), Srate);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
      }
   return true;
 }
 
-bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, int Alpha, int Priority)
+bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission)
 {
-  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission || alpha != Alpha || priority != Priority) {
-     cString OldParameters = ParametersToString();
+  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, *cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      source = Source;
      frequency = Frequency;
      bandwidth = Bandwidth;
@@ -407,14 +349,7 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
      coderateL = CoderateL;
      guard = Guard;
      transmission = Transmission;
-     alpha = Alpha;
-     priority = Priority;
      schedule = NULL;
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %d:%s:%s to %d:%s:%s", Number(), frequency, *OldParameters, *cSource::ToString(source), Frequency, *ParametersToString(), *cSource::ToString(Source));
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
      }
   return true;
 }
@@ -662,17 +597,13 @@ cString cChannel::ParametersToString(void) const
   char *q = buffer;
   *q = 0;
   ST(" S ")  q += sprintf(q, "%c", polarization);
-  ST("  T")  q += PrintParameter(q, 'A', MapToUser(alpha, AlphaValues));
-  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
+  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
   ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
   ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
-  ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
-  ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
-  ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST("  T")  q += PrintParameter(q, 'P', MapToUser(priority, PriorityValues));
-  ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
+  ST("C T")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+  ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
   return buffer;
 }
@@ -697,7 +628,6 @@ bool cChannel::StringToParameters(const char *s)
 {
   while (s && *s) {
         switch (toupper(*s)) {
-          case 'A': s = ParseParameter(s, alpha, AlphaValues); break;
           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
           case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
@@ -706,11 +636,7 @@ bool cChannel::StringToParameters(const char *s)
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
           case 'L': polarization = *s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
-          case 'Z':// for compatibility with the original DVB-S2 patch - may be removed in future versions
-          case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
-          case 'P': s = ParseParameter(s, priority, PriorityValues); break;
           case 'R': polarization = *s++; break;
-          case 'S': s = ParseParameter(s, system, SystemValues); break;
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = *s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
@@ -732,12 +658,12 @@ cString cChannel::ToText(const cChannel *Channel)
      q += sprintf(q, ";%s", Channel->provider);
   *q = 0;
   strreplace(FullName, ':', '|');
-  char *buffer;
+  cString buffer;
   if (Channel->groupSep) {
      if (Channel->number)
-        asprintf(&buffer, ":@%d %s\n", Channel->number, FullName);
+        buffer = cString::sprintf(":@%d %s\n", Channel->number, FullName);
      else
-        asprintf(&buffer, ":%s\n", FullName);
+        buffer = cString::sprintf(":%s\n", FullName);
      }
   else {
      char vpidbuf[32];
@@ -759,9 +685,9 @@ cString cChannel::ToText(const cChannel *Channel)
      q = caidbuf;
      q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->ParametersToString(), *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->ParametersToString(), *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
-  return cString(buffer, true);
+  return buffer;
 }
 
 cString cChannel::ToText(void) const
@@ -924,7 +850,7 @@ bool cChannel::Save(FILE *f)
   return fprintf(f, "%s", *ToText()) > 0;
 }
 
-// -- cChannelSorter ---------------------------------------------------------
+// --- cChannelSorter --------------------------------------------------------
 
 class cChannelSorter : public cListObject {
 public:
@@ -940,7 +866,7 @@ class cChannelSorter : public cListObject {
     }
   };
 
-// -- cChannels --------------------------------------------------------------
+// --- cChannels -------------------------------------------------------------
 
 cChannels Channels;
 
diff --git a/channels.h b/channels.h
index e69867848..c3073d1c4 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.46 2008/01/26 16:04:26 kls Exp $
+ * $Id: channels.h 1.47 2008/02/08 13:48:31 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -50,10 +50,10 @@
 struct tChannelParameterMap {
   int userValue;
   int driverValue;
-  const char *userString;
   };
 
-int MapToUser(int Value, const tChannelParameterMap *Map, const char **String = NULL);
+//XXX into cChannel???
+int MapToUser(int Value, const tChannelParameterMap *Map);
 int MapToDriver(int Value, const tChannelParameterMap *Map);
 int UserIndex(int Value, const tChannelParameterMap *Map);
 int DriverIndex(int Value, const tChannelParameterMap *Map);
@@ -62,13 +62,9 @@ extern const tChannelParameterMap InversionValues[];
 extern const tChannelParameterMap BandwidthValues[];
 extern const tChannelParameterMap CoderateValues[];
 extern const tChannelParameterMap ModulationValues[];
-extern const tChannelParameterMap SystemValues[];
 extern const tChannelParameterMap TransmissionValues[];
 extern const tChannelParameterMap GuardValues[];
 extern const tChannelParameterMap HierarchyValues[];
-extern const tChannelParameterMap AlphaValues[];
-extern const tChannelParameterMap PriorityValues[];
-extern const tChannelParameterMap RollOffValues[];
 
 struct tChannelID {
 private:
@@ -144,13 +140,9 @@ class cChannel : public cListObject {
   int coderateH;
   int coderateL;
   int modulation;
-  int system;
   int transmission;
   int guard;
   int hierarchy;
-  int alpha;
-  int priority;
-  int rollOff;
   int __EndData__;
   int modification;
   mutable const cSchedule *schedule;
@@ -202,13 +194,9 @@ class cChannel : public cListObject {
   int CoderateH(void) const { return coderateH; }
   int CoderateL(void) const { return coderateL; }
   int Modulation(void) const { return modulation; }
-  int System(void) const { return system; }
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
-  int Alpha(void) const { return alpha; }
-  int Priority(void) const { return priority; }
-  int RollOff(void) const { return rollOff; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
   bool IsCable(void) const { return cSource::IsCable(source); }
@@ -218,9 +206,9 @@ class cChannel : public cListObject {
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
   void CopyTransponderData(const cChannel *Channel);
-  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
+  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority);
+  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
diff --git a/config.c b/config.c
index 31365f80b..090a6a1d8 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.158 2007/11/25 13:46:27 kls Exp $
+ * $Id: config.c 1.161 2008/02/17 13:39:00 kls Exp $
  */
 
 #include "config.h"
@@ -62,10 +62,10 @@ const char *cCommand::Execute(const char *Parameters)
 {
   free(result);
   result = NULL;
-  char *cmdbuf = NULL;
+  cString cmdbuf;
   if (Parameters)
-     asprintf(&cmdbuf, "%s %s", command, Parameters);
-  const char *cmd = cmdbuf ? cmdbuf : command;
+     cmdbuf = cString::sprintf("%s %s", command, Parameters);
+  const char *cmd = *cmdbuf ? *cmdbuf : command;
   dsyslog("executing command '%s'", cmd);
   cPipe p;
   if (p.Open(cmd, "r")) {
@@ -82,11 +82,10 @@ const char *cCommand::Execute(const char *Parameters)
      }
   else
      esyslog("ERROR: can't open pipe for command '%s'", cmd);
-  free(cmdbuf);
   return result;
 }
 
-// -- cSVDRPhost -------------------------------------------------------------
+// --- cSVDRPhost ------------------------------------------------------------
 
 cSVDRPhost::cSVDRPhost(void)
 {
@@ -122,12 +121,12 @@ bool cSVDRPhost::Accepts(in_addr_t Address)
   return (Address & mask) == (addr.s_addr & mask);
 }
 
-// -- cCommands --------------------------------------------------------------
+// --- cCommands -------------------------------------------------------------
 
 cCommands Commands;
 cCommands RecordingCommands;
 
-// -- cSVDRPhosts ------------------------------------------------------------
+// --- cSVDRPhosts -----------------------------------------------------------
 
 cSVDRPhosts SVDRPhosts;
 
@@ -142,7 +141,7 @@ bool cSVDRPhosts::Acceptable(in_addr_t Address)
   return false;
 }
 
-// -- cSetupLine -------------------------------------------------------------
+// --- cSetupLine ------------------------------------------------------------
 
 cSetupLine::cSetupLine(void)
 {
@@ -208,7 +207,7 @@ bool cSetupLine::Save(FILE *f)
   return fprintf(f, "%s%s%s = %s\n", plugin ? plugin : "", plugin ? "." : "", name, value) > 0;
 }
 
-// -- cSetup -----------------------------------------------------------------
+// --- cSetup ----------------------------------------------------------------
 
 cSetup Setup;
 
@@ -322,10 +321,7 @@ void cSetup::Store(const char *Name, const char *Value, const char *Plugin, bool
 
 void cSetup::Store(const char *Name, int Value, const char *Plugin)
 {
-  char *buffer = NULL;
-  asprintf(&buffer, "%d", Value);
-  Store(Name, buffer, Plugin);
-  free(buffer);
+  Store(Name, cString::sprintf("%d", Value), Plugin);
 }
 
 bool cSetup::Load(const char *FileName)
diff --git a/config.h b/config.h
index e0a0284e5..3a25b7b19 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.304 2008/01/19 12:08:29 kls Exp $
+ * $Id: config.h 1.305 2008/02/05 15:35:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.14"
-#define VDRVERSNUM   10514  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.15"
+#define VDRVERSNUM   10515  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.14"
-#define APIVERSNUM   10514  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.5.15"
+#define APIVERSNUM   10515  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index e1c654d1e..aaa025401 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.149 2008/01/27 10:40:46 kls Exp $
+ * $Id: device.c 1.153 2008/02/16 13:52:11 kls Exp $
  */
 
 #include "device.h"
@@ -264,11 +264,6 @@ cDevice::~cDevice()
   DetachAllReceivers();
   delete liveSubtitle;
   delete dvbSubtitleConverter;
-  delete nitFilter;
-  delete sdtFilter;
-  delete patFilter;
-  delete eitFilter;
-  delete sectionHandler;
   delete pesAssembler;
 }
 
@@ -359,21 +354,6 @@ cDevice *cDevice::GetDevice(int Index)
   return (0 <= Index && Index < numDevices) ? device[Index] : NULL;
 }
 
-static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
-{
-  int MaxNumProvidedSystems = 1 << AvailableBits;
-  int NumProvidedSystems = Device->NumProvidedSystems();
-  if (NumProvidedSystems > MaxNumProvidedSystems) {
-     esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->CardIndex() + 1, NumProvidedSystems, MaxNumProvidedSystems);
-     NumProvidedSystems = MaxNumProvidedSystems;
-     }
-  else if (NumProvidedSystems <= 0) {
-     esyslog("ERROR: device %d reported an invalid number (%d) of supported delivery systems - assuming 1", Device->CardIndex() + 1, NumProvidedSystems);
-     NumProvidedSystems = 1;
-     }
-  return NumProvidedSystems;
-}
-
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView)
 {
   // Collect the current priorities of all CAM slots that can decrypt the channel:
@@ -423,7 +403,6 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
              imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
-             imp <<= 2; imp |= GetClippedNumProvidedSystems(2, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
              imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
@@ -666,6 +645,22 @@ void cDevice::StartSectionHandler(void)
      }
 }
 
+void cDevice::StopSectionHandler(void)
+{
+  if (sectionHandler) {
+     delete nitFilter;
+     delete sdtFilter;
+     delete patFilter;
+     delete eitFilter;
+     delete sectionHandler;
+     nitFilter = NULL;
+     sdtFilter = NULL;
+     patFilter = NULL;
+     eitFilter = NULL;
+     sectionHandler = NULL;
+     }
+}
+
 int cDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
 {
   return -1;
@@ -712,11 +707,6 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
   return false;
 }
 
-int cDevice::NumProvidedSystems(void) const
-{
-  return 0;
-}
-
 bool cDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return false;
@@ -900,6 +890,10 @@ void cDevice::SetAudioTrackDevice(eTrackType Type)
 {
 }
 
+void cDevice::SetSubtitleTrackDevice(eTrackType Type)
+{
+}
+
 bool cDevice::ToggleMute(void)
 {
   int OldVolume = volume;
@@ -1047,6 +1041,10 @@ bool cDevice::SetCurrentSubtitleTrack(eTrackType Type, bool Manual)
         DELETENULL(dvbSubtitleConverter);
         }
      DELETENULL(liveSubtitle);
+     if (player)
+        player->SetSubtitleTrack(currentSubtitleTrack, GetTrack(currentSubtitleTrack));
+     else
+        SetSubtitleTrackDevice(currentSubtitleTrack);
      if (currentSubtitleTrack != ttNone && !Replaying() && !Transferring()) {
         const tTrackId *TrackId = GetTrack(currentSubtitleTrack);
         if (TrackId && TrackId->id) {
@@ -1252,7 +1250,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                break;
           case 0xC0 ... 0xDF: // audio
                SetAvailableTrack(ttAudio, c - 0xC0, c);
-               if (!VideoOnly && c == availableTracks[currentAudioTrack].id) {
+               if ((!VideoOnly || HasIBPTrickSpeed()) && c == availableTracks[currentAudioTrack].id) {
                   w = PlayAudio(Start, d, c);
                   if (FirstLoop)
                      Audios.PlayAudio(Data, Length, c);
@@ -1282,13 +1280,13 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                  case 0x20: // SPU
                  case 0x30: // SPU
                       SetAvailableTrack(ttSubtitle, SubStreamIndex, SubStreamId);
-                      if (!VideoOnly && currentSubtitleTrack != ttNone && SubStreamId == availableTracks[currentSubtitleTrack].id)
+                      if ((!VideoOnly || HasIBPTrickSpeed()) && currentSubtitleTrack != ttNone && SubStreamId == availableTracks[currentSubtitleTrack].id)
                          w = PlaySubtitle(Start, d);
                       break;
                  case 0x80: // AC3 & DTS
                       if (Setup.UseDolbyDigital) {
                          SetAvailableTrack(ttDolby, SubStreamIndex, SubStreamId);
-                         if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
+                         if ((!VideoOnly || HasIBPTrickSpeed()) && SubStreamId == availableTracks[currentAudioTrack].id) {
                             w = PlayAudio(Start, d, SubStreamId);
                             if (FirstLoop)
                                Audios.PlayAudio(Data, Length, SubStreamId);
@@ -1297,7 +1295,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                       break;
                  case 0xA0: // LPCM
                       SetAvailableTrack(ttAudio, SubStreamIndex, SubStreamId);
-                      if (!VideoOnly && SubStreamId == availableTracks[currentAudioTrack].id) {
+                      if ((!VideoOnly || HasIBPTrickSpeed()) && SubStreamId == availableTracks[currentAudioTrack].id) {
                          w = PlayAudio(Start, d, SubStreamId);
                          if (FirstLoop)
                             Audios.PlayAudio(Data, Length, SubStreamId);
diff --git a/device.h b/device.h
index 5f53d1a28..376e43f02 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.87 2008/01/27 10:35:18 kls Exp $
+ * $Id: device.h 1.90 2008/02/16 13:50:11 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -224,12 +224,6 @@ class cDevice : public cThread {
          ///< function itself actually returns true.
          ///< The default implementation always returns false, so a derived cDevice
          ///< class that can provide channels must implement this function.
-  virtual int NumProvidedSystems(void) const;
-         ///< Returns the number of individual "delivery systems" this device provides.
-         ///< The default implementation returns 0, so any derived class that can
-         ///< actually provide channels must implement this function.
-         ///< The result of this function is used when selecting a device, in order
-         ///< to avoid devices that provide more than one system.
   virtual bool IsTunedToTransponder(const cChannel *Channel);
          ///< Returns true if this device is currently tuned to the given Channel's
          ///< transponder.
@@ -308,7 +302,12 @@ class cDevice : public cThread {
 protected:
   void StartSectionHandler(void);
        ///< A derived device that provides section data must call
-       ///< this function to actually set up the section handler.
+       ///< this function (typically in its constructor) to actually set
+       ///< up the section handler.
+  void StopSectionHandler(void);
+       ///< A device that has called StartSectionHandler() must call this
+       ///< function (typically in its destructor) to stop the section
+       ///< handler.
 public:
   virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
        ///< Opens a file handle for the given filter data.
@@ -387,6 +386,8 @@ class cDevice : public cThread {
 protected:
   virtual void SetAudioTrackDevice(eTrackType Type);
        ///< Sets the current audio track to the given value.
+  virtual void SetSubtitleTrackDevice(eTrackType Type);
+       ///< Sets the current subtitle track to the given value.
 public:
   void ClrAvailableTracks(bool DescriptionsOnly = false, bool IdsOnly = false);
        ///< Clears the list of currently availabe tracks. If DescriptionsOnly
diff --git a/diseqc.c b/diseqc.c
index 7dc308b68..3ce60d296 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.5 2005/12/30 15:41:48 kls Exp $
+ * $Id: diseqc.c 1.6 2008/02/10 14:09:27 kls Exp $
  */
 
 #include "diseqc.h"
@@ -12,7 +12,7 @@
 #include "sources.h"
 #include "thread.h"
 
-// -- cDiseqc ----------------------------------------------------------------
+// --- cDiseqc ---------------------------------------------------------------
 
 cDiseqc::cDiseqc(void)
 {
@@ -122,7 +122,7 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(char **CurrentAction)
   return daNone;
 }
 
-// -- cDiseqcs ---------------------------------------------------------------
+// --- cDiseqcs --------------------------------------------------------------
 
 cDiseqcs Diseqcs;
 
diff --git a/dvbdevice.c b/dvbdevice.c
index 5680cbb23..c7408d35f 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.168 2008/01/27 14:35:54 kls Exp $
+ * $Id: dvbdevice.c 1.170 2008/02/09 16:11:44 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -76,7 +76,7 @@ class cDvbTuner : public cThread {
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
-  dvbfe_delsys frontendType;
+  fe_type_t frontendType;
   cChannel channel;
   const char *diseqcCommands;
   eTunerStatus tunerStatus;
@@ -87,14 +87,14 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType);
+  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
@@ -104,7 +104,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType)
   lastTimeoutReport = 0;
   diseqcCommands = NULL;
   tunerStatus = tsIdle;
-  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
+  if (frontendType == FE_QPSK)
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
   Start();
@@ -120,26 +120,7 @@ cDvbTuner::~cDvbTuner()
 
 bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 {
-  if (tunerStatus == tsIdle)
-     return false; // not tuned to
-  if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder())
-     return false; // sufficient mismatch
-  char Type = **cSource::ToString(Channel->Source());
-#define ST(s, p) if (strchr(s, Type)) if (channel.p() != Channel->p()) return false;
-  // Polarization is already checked as part of the Transponder.
-  ST("  T", Alpha);
-  ST("  T", Bandwidth);
-  ST("CST", CoderateH);
-  ST("  T", CoderateL);
-  ST("  T", Guard);
-  ST("CST", Inversion);
-  ST("CST", Modulation);
-  ST(" S ", RollOff);
-  ST("  T", Priority);
-  ST(" S ", System);
-  ST("  T", Transmission);
-  ST("  T", Hierarchy);
-  return true;
+  return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Transponder() == Channel->Transponder();
 }
 
 void cDvbTuner::Set(const cChannel *Channel, bool Tune)
@@ -192,126 +173,114 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbTuner::SetFrontend(void)
 {
-  dvbfe_params Frontend;
+  dvb_frontend_parameters Frontend;
+
   memset(&Frontend, 0, sizeof(Frontend));
 
-  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) {
-     unsigned int frequency = channel.Frequency();
-     if (Setup.DiSEqC) {
-        cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
-        if (diseqc) {
-           if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
-              cDiseqc::eDiseqcActions da;
-              for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
-                  switch (da) {
-                    case cDiseqc::daNone:      break;
-                    case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
-                    case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
-                    case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
-                    case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
-                    case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
-                    case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
-                    case cDiseqc::daCodes: {
-                         int n = 0;
-                         uchar *codes = diseqc->Codes(n);
-                         if (codes) {
-                            struct dvb_diseqc_master_cmd cmd;
-                            memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
-                            cmd.msg_len = n;
-                            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-                            }
-                         }
-                         break;
-                    }
+  switch (frontendType) {
+    case FE_QPSK: { // DVB-S
+
+         unsigned int frequency = channel.Frequency();
+
+         if (Setup.DiSEqC) {
+            cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
+            if (diseqc) {
+               if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
+                  cDiseqc::eDiseqcActions da;
+                  for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
+                      switch (da) {
+                        case cDiseqc::daNone:      break;
+                        case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+                        case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+                        case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+                        case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+                        case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+                        case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+                        case cDiseqc::daCodes: {
+                             int n = 0;
+                             uchar *codes = diseqc->Codes(n);
+                             if (codes) {
+                                struct dvb_diseqc_master_cmd cmd;
+                                memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
+                                cmd.msg_len = n;
+                                CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+                                }
+                             }
+                             break;
+                        }
+                      }
+                  diseqcCommands = diseqc->Commands();
                   }
-              diseqcCommands = diseqc->Commands();
-              }
-           frequency -= diseqc->Lof();
-           }
-        else {
-           esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
-           return false;
-           }
-        }
-     else {
-        int tone = SEC_TONE_OFF;
-        if (frequency < (unsigned int)Setup.LnbSLOF) {
-           frequency -= Setup.LnbFrequLo;
-           tone = SEC_TONE_OFF;
-           }
-        else {
-           frequency -= Setup.LnbFrequHi;
-           tone = SEC_TONE_ON;
-           }
-        int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-        CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
-        CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
-        }
-     frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
-
-     Frontend.delivery = dvbfe_delsys(channel.System());
-     Frontend.frequency = frequency * 1000UL;
-     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-     if (Frontend.delivery == DVBFE_DELSYS_DVBS) {
-        Frontend.delsys.dvbs.modulation = dvbfe_modulation(channel.Modulation());
-        Frontend.delsys.dvbs.symbol_rate = channel.Srate() * 1000UL;
-        Frontend.delsys.dvbs.fec = dvbfe_fec(channel.CoderateH());
-        }
-     else {
-        Frontend.delsys.dvbs2.modulation = dvbfe_modulation(channel.Modulation());
-        Frontend.delsys.dvbs2.symbol_rate = channel.Srate() * 1000UL;
-        Frontend.delsys.dvbs2.fec = dvbfe_fec(channel.CoderateH());
-        Frontend.delsys.dvbs2.rolloff = dvbfe_rolloff(channel.RollOff());
-        }
+               frequency -= diseqc->Lof();
+               }
+            else {
+               esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
+               return false;
+               }
+            }
+         else {
+            int tone = SEC_TONE_OFF;
 
-     tuneTimeout = DVBS_TUNE_TIMEOUT;
-     lockTimeout = DVBS_LOCK_TIMEOUT;
+            if (frequency < (unsigned int)Setup.LnbSLOF) {
+               frequency -= Setup.LnbFrequLo;
+               tone = SEC_TONE_OFF;
+               }
+            else {
+               frequency -= Setup.LnbFrequHi;
+               tone = SEC_TONE_ON;
+               }
+            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+            CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+            CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+            }
 
-     dvbfe_info feinfo;
-     feinfo.delivery = Frontend.delivery;
-     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
-     }
-  else if (frontendType & DVBFE_DELSYS_DVBC) {
-     Frontend.delivery = DVBFE_DELSYS_DVBC;
-     Frontend.frequency = FrequencyToHz(channel.Frequency());
-     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-     Frontend.delsys.dvbc.symbol_rate = channel.Srate() * 1000UL;
-     Frontend.delsys.dvbc.fec = dvbfe_fec(channel.CoderateH());
-     Frontend.delsys.dvbc.modulation = dvbfe_modulation(channel.Modulation());
-
-     tuneTimeout = DVBC_TUNE_TIMEOUT;
-     lockTimeout = DVBC_LOCK_TIMEOUT;
-
-     dvbfe_info feinfo;
-     feinfo.delivery = Frontend.delivery;
-     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
-     }
-  else if (frontendType & DVBFE_DELSYS_DVBT) {
-     Frontend.delivery = DVBFE_DELSYS_DVBT;
-     Frontend.frequency = FrequencyToHz(channel.Frequency());
-     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-     Frontend.delsys.dvbt.bandwidth = dvbfe_bandwidth(channel.Bandwidth());
-     Frontend.delsys.dvbt.code_rate_HP = dvbfe_fec(channel.CoderateH());
-     Frontend.delsys.dvbt.code_rate_LP = dvbfe_fec(channel.CoderateL());
-     Frontend.delsys.dvbt.constellation = dvbfe_modulation(channel.Modulation());
-     Frontend.delsys.dvbt.transmission_mode = dvbfe_transmission_mode(channel.Transmission());
-     Frontend.delsys.dvbt.guard_interval = dvbfe_guard_interval(channel.Guard());
-     Frontend.delsys.dvbt.hierarchy = dvbfe_hierarchy(channel.Hierarchy());
-     Frontend.delsys.dvbt.alpha = dvbfe_alpha(channel.Alpha());
-     Frontend.delsys.dvbt.priority = dvbfe_stream_priority(channel.Priority());
-
-     tuneTimeout = DVBT_TUNE_TIMEOUT;
-     lockTimeout = DVBT_LOCK_TIMEOUT;
-
-     dvbfe_info feinfo;
-     feinfo.delivery = Frontend.delivery;
-     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
-     }
-  else {
-     esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-     return false;
+         frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
+         Frontend.frequency = frequency * 1000UL;
+         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+         Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL;
+         Frontend.u.qpsk.fec_inner = fe_code_rate_t(channel.CoderateH());
+
+         tuneTimeout = DVBS_TUNE_TIMEOUT;
+         lockTimeout = DVBS_LOCK_TIMEOUT;
+         }
+         break;
+    case FE_QAM: { // DVB-C
+
+         // Frequency and symbol rate:
+
+         Frontend.frequency = FrequencyToHz(channel.Frequency());
+         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+         Frontend.u.qam.symbol_rate = channel.Srate() * 1000UL;
+         Frontend.u.qam.fec_inner = fe_code_rate_t(channel.CoderateH());
+         Frontend.u.qam.modulation = fe_modulation_t(channel.Modulation());
+
+         tuneTimeout = DVBC_TUNE_TIMEOUT;
+         lockTimeout = DVBC_LOCK_TIMEOUT;
+         }
+         break;
+    case FE_OFDM: { // DVB-T
+
+         // Frequency and OFDM paramaters:
+
+         Frontend.frequency = FrequencyToHz(channel.Frequency());
+         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+         Frontend.u.ofdm.bandwidth = fe_bandwidth_t(channel.Bandwidth());
+         Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(channel.CoderateH());
+         Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(channel.CoderateL());
+         Frontend.u.ofdm.constellation = fe_modulation_t(channel.Modulation());
+         Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(channel.Transmission());
+         Frontend.u.ofdm.guard_interval = fe_guard_interval_t(channel.Guard());
+         Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(channel.Hierarchy());
+
+         tuneTimeout = DVBT_TUNE_TIMEOUT;
+         lockTimeout = DVBT_LOCK_TIMEOUT;
+         }
+         break;
+    default:
+         esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+         return false;
     }
-  if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) {
+  if (ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend) < 0) {
      esyslog("ERROR: frontend %d: %m", cardIndex);
      return false;
      }
@@ -382,23 +351,11 @@ void cDvbTuner::Action(void)
 int cDvbDevice::devVideoOffset = -1;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 
-const char *DeliverySystems[] = {
-  "DVBS",
-  "DSS",
-  "DVBS2",
-  "DVBC",
-  "DVBT",
-  "DVBH",
-  "ATSC",
-  NULL
-  };
-
 cDvbDevice::cDvbDevice(int n)
 {
   ciAdapter = NULL;
   dvbTuner = NULL;
-  frontendType = DVBFE_DELSYS_DUMMY;
-  numProvidedSystems = 0;
+  frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
   spuDecoder = NULL;
   digitalAudio = false;
   playMode = pmNone;
@@ -460,22 +417,9 @@ cDvbDevice::cDvbDevice(int n)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-     if (ioctl(fd_frontend, DVBFE_GET_DELSYS, &frontendType) >= 0) {
-        const char **DeliverySystem = DeliverySystems;
-        cString ds;
-        for (int i = 0; i < 32; i++) {
-            if (frontendType & (1u << i)) {
-               numProvidedSystems++;
-               if (*DeliverySystem)
-                  ds = cString::sprintf("%s %s", *ds ? *ds : "", *DeliverySystem);
-               else
-                  esyslog("ERROR: unknown delivery system %d", i);
-               }
-            if (*DeliverySystem)
-               DeliverySystem++;
-            }
-        if (*ds)
-           isyslog("device %d provides:%s", CardIndex() + 1, *ds);
+     dvb_frontend_info feinfo;
+     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
+        frontendType = feinfo.type;
         dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
         }
      else
@@ -489,6 +433,7 @@ cDvbDevice::cDvbDevice(int n)
 
 cDvbDevice::~cDvbDevice()
 {
+  StopSectionHandler();
   delete spuDecoder;
   delete dvbTuner;
   delete ciAdapter;
@@ -799,20 +744,14 @@ bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
   return type == cSource::stNone
-      || type == cSource::stCable && (frontendType & DVBFE_DELSYS_DVBC)
-      || type == cSource::stSat   && (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
-      || type == cSource::stTerr  && (frontendType & DVBFE_DELSYS_DVBT);
+      || type == cSource::stCable && frontendType == FE_QAM
+      || type == cSource::stSat   && frontendType == FE_QPSK
+      || type == cSource::stTerr  && frontendType == FE_OFDM;
 }
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 {
-  if (!ProvidesSource(Channel->Source()))
-     return false; // doesn't provide source
-  if (!cSource::IsSat(Channel->Source()))
-     return true; // source is sufficient for non sat
-  if (!(frontendType & Channel->System()))
-     return false; // requires modulation system which frontend doesn't provide
-  return !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
+  return ProvidesSource(Channel->Source()) && (!cSource::IsSat(Channel->Source()) || !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()));
 }
 
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
@@ -821,7 +760,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if (ProvidesTransponder(Channel)) {
+  if (ProvidesSource(Channel->Source())) {
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
@@ -853,11 +792,6 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
-int cDvbDevice::NumProvidedSystems(void) const
-{
-  return numProvidedSystems;
-}
-
 bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return dvbTuner->IsTunedTo(Channel);
diff --git a/dvbdevice.h b/dvbdevice.h
index eca00dd6e..7bd3e545f 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.46 2008/01/27 10:21:02 kls Exp $
+ * $Id: dvbdevice.h 1.47 2008/02/08 13:48:31 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -15,8 +15,8 @@
 #include "device.h"
 #include "dvbspu.h"
 
-#if DVB_API_VERSION != 3 || DVB_API_VERSION_MINOR != 3
-#error VDR requires Linux DVB driver API version 3.3!
+#if DVB_API_VERSION != 3
+#error VDR requires Linux DVB driver API version 3!
 #endif
 
 #define MAXDVBDEVICES  8
@@ -35,8 +35,7 @@ class cDvbDevice : public cDevice {
          ///< Must be called before accessing any DVB functions.
          ///< \return True if any devices are available.
 private:
-  dvbfe_delsys frontendType;
-  int numProvidedSystems;
+  fe_type_t frontendType;
   int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca;
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -67,7 +66,6 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
-  virtual int NumProvidedSystems(void) const;
   virtual bool IsTunedToTransponder(const cChannel *Channel);
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
diff --git a/dvbplayer.c b/dvbplayer.c
index a072a445f..64fa559b0 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.47 2007/10/13 12:20:58 kls Exp $
+ * $Id: dvbplayer.c 1.48 2008/02/09 15:10:54 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -537,8 +537,10 @@ void cDvbPlayer::Pause(void)
      Play();
   else {
      LOCK_THREAD;
-     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))
-        Empty();
+     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
+        if (!(DeviceHasIBPTrickSpeed() && playDir == pdForward))
+           Empty();
+        }
      DeviceFreeze();
      playMode = pmPause;
      }
@@ -548,8 +550,10 @@ void cDvbPlayer::Play(void)
 {
   if (playMode != pmPlay) {
      LOCK_THREAD;
-     if (playMode == pmStill || playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))
-        Empty();
+     if (playMode == pmStill || playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
+        if (!(DeviceHasIBPTrickSpeed() && playDir == pdForward))
+           Empty();
+        }
      DevicePlay();
      playMode = pmPlay;
      playDir = pdForward;
@@ -572,7 +576,8 @@ void cDvbPlayer::Forward(void)
             // run into pmPlay
        case pmPlay: {
             LOCK_THREAD;
-            Empty();
+            if (!(DeviceHasIBPTrickSpeed() && playDir == pdForward))
+               Empty();
             DeviceMute();
             playMode = pmFast;
             playDir = pdForward;
diff --git a/epg.c b/epg.c
index 37a0553c7..e01a7827e 100644
--- a/epg.c
+++ b/epg.c
@@ -7,11 +7,12 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.82 2007/06/10 12:52:19 kls Exp $
+ * $Id: epg.c 1.83 2008/02/16 16:09:12 kls Exp $
  */
 
 #include "epg.h"
 #include <ctype.h>
+#include <limits.h>
 #include <time.h>
 #include "libsi/si.h"
 #include "timers.h"
diff --git a/font.c b/font.c
index 73b77fbb1..2f14d14f6 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.22 2007/11/04 11:08:12 kls Exp $
+ * $Id: font.c 1.23 2008/02/09 11:52:25 kls Exp $
  */
 
 #include "font.h"
@@ -241,10 +241,16 @@ int cFreetypeFont::Width(const char *s) const
   return w;
 }
 
+#define MAX_BLEND_LEVELS 256
+
 void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const
 {
   if (s && height) { // checking height to make sure we actually have a valid font
      bool AntiAliased = Setup.AntiAlias && Bitmap->Bpp() >= 8;
+     bool TransparentBackground = ColorBg == clrTransparent;
+     int16_t BlendLevelIndex[MAX_BLEND_LEVELS]; // tIndex is 8 bit unsigned, so a negative value can be used to mark unused entries
+     if (AntiAliased && !TransparentBackground)
+        memset(BlendLevelIndex, 0xFF, sizeof(BlendLevelIndex)); // initializes the array with negative values
      tIndex fg = Bitmap->Index(ColorFg);
      uint prevSym = 0;
      while (*s) {
@@ -266,12 +272,16 @@ void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColo
                          if (bt > 0x00) {
                             int px = x + pitch + g->Left() + kerning;
                             int py = y + row + (height - Bottom() - g->Top());
+                            tColor bg;
                             if (bt == 0xFF)
-                               Bitmap->SetIndex(px, py, fg);
-                            else {
-                               tColor bg = (ColorBg != clrTransparent) ? ColorBg : Bitmap->GetColor(px, py);
-                               Bitmap->SetIndex(px, py, Bitmap->Index(Bitmap->Blend(ColorFg, bg, bt)));
-                               }
+                               bg = fg;
+                            else if (TransparentBackground)
+                               bg = Bitmap->Index(Bitmap->Blend(ColorFg, Bitmap->GetColor(px, py), bt));
+                            else if (BlendLevelIndex[bt] >= 0)
+                               bg = BlendLevelIndex[bt];
+                            else
+                               bg = BlendLevelIndex[bt] = Bitmap->Index(Bitmap->Blend(ColorFg, ColorBg, bt));
+                            Bitmap->SetIndex(px, py, bg);
                             }
                          }
                       else { //monochrome rendering
diff --git a/interface.c b/interface.c
index efdf7371d..6ad3c59f9 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.76 2007/08/04 14:39:25 kls Exp $
+ * $Id: interface.c 1.77 2008/02/10 15:49:15 kls Exp $
  */
 
 #include "interface.h"
@@ -86,10 +86,7 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
      DisplayMenu->SetItem(tr("Phase 2: Learning specific key codes"), 2, false, false);
      eKeys NewKey = kUp;
      while (NewKey != kNone) {
-           char *Prompt;
-           asprintf(&Prompt, tr("Press key for '%s'"), cKey::ToString(NewKey, true));
-           DisplayMenu->SetItem(Prompt, 4, false, false);
-           free(Prompt);
+           DisplayMenu->SetItem(cString::sprintf(tr("Press key for '%s'"), cKey::ToString(NewKey, true)), 4, false, false);
            cRemote::Clear();
            DisplayMenu->Flush();
            for (eKeys k = NewKey; k == NewKey; ) {
diff --git a/keys.c b/keys.c
index 615b6f8a1..19e12e5ec 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.16 2007/08/26 12:35:21 kls Exp $
+ * $Id: keys.c 1.17 2008/02/10 14:08:48 kls Exp $
  */
 
 #include "keys.h"
@@ -70,7 +70,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kNone,                 NULL               },
                   };
 
-// -- cKey -------------------------------------------------------------------
+// --- cKey ------------------------------------------------------------------
 
 cKey::cKey(void)
 {
@@ -149,7 +149,7 @@ const char *cKey::ToString(eKeys Key, bool Translate)
   return NULL;
 }
 
-// -- cKeys ------------------------------------------------------------------
+// --- cKeys -----------------------------------------------------------------
 
 cKeys Keys;
 
@@ -194,7 +194,7 @@ void cKeys::PutSetup(const char *Remote, const char *Setup)
      esyslog("ERROR: called PutSetup() for %s, but setup has already been defined!", Remote);
 }
 
-// -- cKeyMacro --------------------------------------------------------------
+// --- cKeyMacro -------------------------------------------------------------
 
 cKeyMacro::cKeyMacro(void)
 {
@@ -260,7 +260,7 @@ bool cKeyMacro::Parse(char *s)
   return true;
 }
 
-// -- cKeyMacros -------------------------------------------------------------
+// --- cKeyMacros ------------------------------------------------------------
 
 cKeyMacros KeyMacros;
 
diff --git a/menu.c b/menu.c
index 4499b5f00..7abe1bad5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.470 2008/01/26 16:29:05 kls Exp $
+ * $Id: menu.c 1.477 2008/02/16 13:53:26 kls Exp $
  */
 
 #include "menu.h"
@@ -32,7 +32,7 @@
 
 #define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
-#define DISKSPACECHEK     5 // seconds between disk space checks in the main menu
+#define DISKSPACECHEK     5 // seconds between disk space checks
 #define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
                             // within which it will go directly into the "Edit timer" menu to allow
                             // further parameter settings
@@ -47,6 +47,44 @@
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
 
+// --- cFreeDiskSpace --------------------------------------------------------
+
+#define MB_PER_MINUTE 25.75 // this is just an estimate!
+
+class cFreeDiskSpace {
+private:
+  static time_t lastDiskSpaceCheck;
+  static int lastFreeMB;
+  static cString freeDiskSpaceString;
+public:
+  static bool HasChanged(bool ForceCheck = false);
+  static const char *FreeDiskSpaceString(void) { HasChanged(); return freeDiskSpaceString; }
+  };
+
+time_t cFreeDiskSpace::lastDiskSpaceCheck = 0;
+int cFreeDiskSpace::lastFreeMB = 0;
+cString cFreeDiskSpace::freeDiskSpaceString;
+
+cFreeDiskSpace FreeDiskSpace;
+
+bool cFreeDiskSpace::HasChanged(bool ForceCheck)
+{
+  if (ForceCheck || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK) {
+     int FreeMB;
+     int Percent = VideoDiskSpace(&FreeMB);
+     lastDiskSpaceCheck = time(NULL);
+     if (ForceCheck || FreeMB != lastFreeMB) {
+        int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+        int Hours = Minutes / 60;
+        Minutes %= 60;
+        freeDiskSpaceString = cString::sprintf("%s %d%%  -  %2d:%02d %s", tr("Disk"), Percent, Hours, Minutes, tr("free"));
+        lastFreeMB = FreeMB;
+        return true;
+        }
+     }
+  return false;
+}
+
 // --- cMenuEditCaItem -------------------------------------------------------
 
 class cMenuEditCaItem : public cMenuEditIntItem {
@@ -109,12 +147,8 @@ cMenuEditSrcItem::cMenuEditSrcItem(const char *Name, int *Value)
 
 void cMenuEditSrcItem::Set(void)
 {
-  if (source) {
-     char *buffer = NULL;
-     asprintf(&buffer, "%s - %s", *cSource::ToString(source->Code()), source->Description());
-     SetValue(buffer);
-     free(buffer);
-     }
+  if (source)
+     SetValue(cString::sprintf("%s - %s", *cSource::ToString(source->Code()), source->Description()));
   else
      cMenuEditIntItem::Set();
 }
@@ -148,6 +182,70 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEditMapItem ------------------------------------------------------
+
+class cMenuEditMapItem : public cMenuEditItem {
+protected:
+  int *value;
+  const tChannelParameterMap *map;
+  const char *zeroString;
+  virtual void Set(void);
+public:
+  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  map = Map;
+  zeroString = ZeroString;
+  Set();
+}
+
+void cMenuEditMapItem::Set(void)
+{
+  int n = MapToUser(*value, map);
+  if (n == 999)
+     SetValue(tr("auto"));
+  else if (n == 0 && zeroString)
+     SetValue(zeroString);
+  else if (n >= 0) {
+     char buf[16];
+     snprintf(buf, sizeof(buf), "%d", n);
+     SetValue(buf);
+     }
+  else
+     SetValue("???");
+}
+
+eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     int newValue = *value;
+     int n = DriverIndex(*value, map);
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (n-- > 0)
+           newValue = map[n].driverValue;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (map[++n].userValue >= 0)
+           newValue = map[n].driverValue;
+        }
+     else
+        return state;
+     if (newValue != *value) {
+        *value = newValue;
+        Set();
+        }
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuEditChannel ------------------------------------------------------
 
 class cMenuEditChannel : public cOsdMenu {
@@ -208,19 +306,15 @@ void cMenuEditChannel::Setup(void)
   XXX*/
   // Parameters for specific types of sources:
   ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr"));
-  ST(" S ")  Add(new cMenuEditMapItem( tr("System"),       &data.system,       SystemValues));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
-  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues));
-  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues));
-  ST("CST")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues));
+  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues, tr("off")));
+  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues, tr("none")));
+  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues, tr("none")));
+  ST("C T")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues, "QPSK"));
   ST("  T")  Add(new cMenuEditMapItem( tr("Bandwidth"),    &data.bandwidth,    BandwidthValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Alpha"),        &data.alpha,        AlphaValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Priority"),     &data.priority,     PriorityValues));
-  ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
 
   SetCurrent(Get(current));
   Display();
@@ -304,16 +398,16 @@ int cMenuChannelItem::Compare(const cListObject &ListObject) const
 
 void cMenuChannelItem::Set(void)
 {
-  char *buffer = NULL;
+  cString buffer;
   if (!channel->GroupSep()) {
      if (sortMode == csmProvider)
-        asprintf(&buffer, "%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
+        buffer = cString::sprintf("%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
      else
-        asprintf(&buffer, "%d\t%s", channel->Number(), channel->Name());
+        buffer = cString::sprintf("%d\t%s", channel->Number(), channel->Name());
      }
   else
-     asprintf(&buffer, "---\t%s ----------------------------------------------------------------", channel->Name());
-  SetText(buffer, false);
+     buffer = cString::sprintf("---\t%s ----------------------------------------------------------------", channel->Name());
+  SetText(buffer);
 }
 
 // --- cMenuChannels ---------------------------------------------------------
@@ -718,8 +812,7 @@ void cMenuTimerItem::Set(void)
      strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
      day = buffer;
      }
-  char *buffer = NULL;
-  asprintf(&buffer, "%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
+  SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
                     *name,
@@ -729,8 +822,7 @@ void cMenuTimerItem::Set(void)
                     timer->Start() % 100,
                     timer->Stop() / 100,
                     timer->Stop() % 100,
-                    timer->File());
-  SetText(buffer, false);
+                    timer->File()));
 }
 
 // --- cMenuTimers -----------------------------------------------------------
@@ -994,19 +1086,19 @@ bool cMenuScheduleItem::Update(bool Force)
   int OldTimerMatch = timerMatch;
   Timers.GetMatch(event, &timerMatch);
   if (Force || timerMatch != OldTimerMatch) {
-     char *buffer = NULL;
+     cString buffer;
      char t = TimerMatchChars[timerMatch];
      char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
      char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' ';
      const char *csn = channel ? channel->ShortName(true) : NULL;
      cString eds = event->GetDateString();
      if (channel && withDate)
-        asprintf(&buffer, "%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
+        buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
      else if (channel)
-        asprintf(&buffer, "%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title());
+        buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title());
      else
-        asprintf(&buffer, "%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
-     SetText(buffer, false);
+        buffer = cString::sprintf("%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
+     SetText(buffer);
      result = true;
      }
   return result;
@@ -1227,10 +1319,7 @@ void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel *
 {
   Clear();
   SetCols(7, 6, 4);
-  char *buffer = NULL;
-  asprintf(&buffer, tr("Schedule - %s"), Channel->Name());
-  SetTitle(buffer);
-  free(buffer);
+  SetTitle(cString::sprintf(tr("Schedule - %s"), Channel->Name()));
   if (schedules && Channel) {
      const cSchedule *Schedule = schedules->GetSchedule(Channel);
      if (Schedule) {
@@ -1248,10 +1337,7 @@ void cMenuSchedule::PrepareScheduleThisThis(const cEvent *Event, const cChannel
 {
   Clear();
   SetCols(7, 6, 4);
-  char *buffer = NULL;
-  asprintf(&buffer, tr("This event - %s"), Channel->Name());
-  SetTitle(buffer);
-  free(buffer);
+  SetTitle(cString::sprintf(tr("This event - %s"), Channel->Name()));
   if (schedules && Channel && Event) {
      const cSchedule *Schedule = schedules->GetSchedule(Channel);
      if (Schedule) {
@@ -1492,17 +1578,11 @@ eOSState cMenuCommands::Execute(void)
 {
   cCommand *command = commands->Get(Current());
   if (command) {
-     char *buffer = NULL;
      bool confirmed = true;
-     if (command->Confirm()) {
-        asprintf(&buffer, "%s?", command->Title());
-        confirmed = Interface->Confirm(buffer);
-        free(buffer);
-        }
+     if (command->Confirm())
+        confirmed = Interface->Confirm(cString::sprintf("%s?", command->Title()));
      if (confirmed) {
-        asprintf(&buffer, "%s...", command->Title());
-        Skins.Message(mtStatus, buffer);
-        free(buffer);
+        Skins.Message(mtStatus, cString::sprintf("%s...", command->Title()));
         const char *Result = command->Execute(parameters);
         Skins.Message(mtStatus, NULL);
         if (Result)
@@ -1818,9 +1898,7 @@ void cMenuRecordingItem::IncrementCounter(bool New)
   totalEntries++;
   if (New)
      newEntries++;
-  char *buffer = NULL;
-  asprintf(&buffer, "%d\t%d\t%s", totalEntries, newEntries, name);
-  SetText(buffer, false);
+  SetText(cString::sprintf("%d\t%d\t%s", totalEntries, newEntries, name));
 }
 
 // --- cMenuRecordings -------------------------------------------------------
@@ -1838,6 +1916,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
      SetCurrent(First());
   else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
      return;
+  SetFreeDiskDisplay(true);
   Display();
   SetHelpKeys();
 }
@@ -1848,6 +1927,16 @@ cMenuRecordings::~cMenuRecordings()
   free(base);
 }
 
+bool cMenuRecordings::SetFreeDiskDisplay(bool Force)
+{
+  if (FreeDiskSpace.HasChanged(Force)) {
+     //XXX -> skin function!!!
+     SetTitle(cString::sprintf("%s  -  %s", base ? base : tr("Recordings"), FreeDiskSpace.FreeDiskSpaceString()));
+     return true;
+     }
+  return false;
+}
+
 void cMenuRecordings::SetHelpKeys(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
@@ -1909,6 +1998,7 @@ void cMenuRecordings::Set(bool Refresh)
          }
       }
   free(LastItemText);
+  Refresh |= SetFreeDiskDisplay(Refresh);
   if (Refresh)
      Display();
 }
@@ -1926,13 +2016,12 @@ bool cMenuRecordings::Open(bool OpenSubMenus)
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && ri->IsDirectory()) {
      const char *t = ri->Name();
-     char *buffer = NULL;
+     cString buffer;
      if (base) {
-        asprintf(&buffer, "%s~%s", base, t);
+        buffer = cString::sprintf("%s~%s", base, t);
         t = buffer;
         }
      AddSubMenu(new cMenuRecordings(t, level + 1, OpenSubMenus));
-     free(buffer);
      return true;
      }
   return false;
@@ -1995,11 +2084,14 @@ eOSState cMenuRecordings::Delete(void)
            }
         cRecording *recording = GetRecording(ri);
         if (recording) {
+           if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), ri->FileName()) == 0)
+              cControl::Shutdown();
            if (recording->Delete()) {
               cReplayControl::ClearLastReplayed(ri->FileName());
               Recordings.DelByName(ri->FileName());
               cOsdMenu::Del(Current());
               SetHelpKeys();
+              SetFreeDiskDisplay(true);
               Display();
               if (!Count())
                  return osBack;
@@ -2033,11 +2125,8 @@ eOSState cMenuRecordings::Commands(eKeys Key)
   if (ri && !ri->IsDirectory()) {
      cRecording *recording = GetRecording(ri);
      if (recording) {
-        char *parameter = NULL;
-        asprintf(&parameter, "\"%s\"", *strescape(recording->FileName(), "\"$"));
         cMenuCommands *menu;
-        eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, parameter));
-        free(parameter);
+        eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(recording->FileName(), "\"$"))));
         if (Key != kNone)
            state = menu->ProcessKey(Key);
         return state;
@@ -2074,8 +2163,12 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
         return osBack;
      Display();
      }
-  if (!HasSubMenu() && Key != kNone)
-     SetHelpKeys();
+  if (!HasSubMenu()) {
+     if (HadSubMenu)
+        SetFreeDiskDisplay();
+     if (Key != kNone)
+        SetHelpKeys();
+     }
   return state;
 }
 
@@ -2740,12 +2833,8 @@ cMenuSetupPlugins::cMenuSetupPlugins(void)
   SetHasHotkeys();
   for (int i = 0; ; i++) {
       cPlugin *p = cPluginManager::GetPlugin(i);
-      if (p) {
-         char *buffer = NULL;
-         asprintf(&buffer, "%s (%s) - %s", p->Name(), p->Version(), p->Description());
-         Add(new cMenuSetupPluginItem(hk(buffer), i));
-         free(buffer);
-         }
+      if (p)
+         Add(new cMenuSetupPluginItem(hk(cString::sprintf("%s (%s) - %s", p->Name(), p->Version(), p->Description())), i));
       else
          break;
       }
@@ -2874,8 +2963,6 @@ cOsdObject *cMenuMain::pluginOsdObject = NULL;
 cMenuMain::cMenuMain(eOSState State)
 :cOsdMenu("")
 {
-  lastDiskSpaceCheck = 0;
-  lastFreeMB = 0;
   replaying = false;
   stopReplayItem = NULL;
   cancelEditingItem = NULL;
@@ -2940,26 +3027,15 @@ void cMenuMain::Set(void)
   Display();
 }
 
-#define MB_PER_MINUTE 25.75 // this is just an estimate!
-
 bool cMenuMain::Update(bool Force)
 {
   bool result = false;
 
   // Title with disk usage:
-  if (Force || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK) {
-     int FreeMB;
-     int Percent = VideoDiskSpace(&FreeMB);
-     if (Force || FreeMB != lastFreeMB) {
-        int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
-        int Hours = Minutes / 60;
-        Minutes %= 60;
-        //XXX -> skin function!!!
-        SetTitle(cString::sprintf("%s  -  %s %d%%  -  %2d:%02d %s", tr("VDR"), tr("Disk"), Percent, Hours, Minutes, tr("free")));
-        lastFreeMB = FreeMB;
-        result = true;
-        }
-     lastDiskSpaceCheck = time(NULL);
+  if (FreeDiskSpace.HasChanged(Force)) {
+     //XXX -> skin function!!!
+     SetTitle(cString::sprintf("%s  -  %s", tr("VDR"), FreeDiskSpace.FreeDiskSpaceString()));
+     result = true;
      }
 
   bool NewReplaying = cControl::Control() != NULL;
@@ -3000,10 +3076,8 @@ bool cMenuMain::Update(bool Force)
            }
      const char *s = NULL;
      while ((s = cRecordControls::GetInstantId(s)) != NULL) {
-           char *buffer = NULL;
-           asprintf(&buffer, "%s%s", tr(STOP_RECORDING), s);
            cOsdItem *item = new cOsdItem(osStopRecord);
-           item->SetText(buffer, false);
+           item->SetText(cString::sprintf("%s%s", tr(STOP_RECORDING), s));
            Add(item);
            if (!stopRecordingItem)
               stopRecordingItem = item;
@@ -3628,7 +3702,7 @@ void cDisplaySubtitleTracks::Show(void)
 {
   displayTracks->SetTrack(track, descriptions);
   displayTracks->Flush();
-  //cStatus::MsgSetSubtitleTrack(track, descriptions); //TODO better make a more general cStatus::MsgSetTrack(tr("Subtitles"), track, descriptions)
+  cStatus::MsgSetSubtitleTrack(track, descriptions);
 }
 
 cDisplaySubtitleTracks *cDisplaySubtitleTracks::Create(void)
@@ -3694,7 +3768,6 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   cSchedules::Schedules(SchedulesLock);
 
   event = NULL;
-  instantId = NULL;
   fileName = NULL;
   recorder = NULL;
   device = Device;
@@ -3704,7 +3777,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      timer = new cTimer(true, Pause);
      Timers.Add(timer);
      Timers.SetModified();
-     asprintf(&instantId, cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
+     instantId = cString::sprintf(cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
      }
   timer->SetPending(true);
   timer->SetRecording(true);
@@ -3759,7 +3832,6 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
 cRecordControl::~cRecordControl()
 {
   Stop();
-  free(instantId);
   free(fileName);
 }
 
@@ -4183,7 +4255,8 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
          timeSearchActive = false;
          break;
     default:
-         timeSearchActive = false;
+         if (!(Key & k_Flags)) // ignore repeat/release keys
+            timeSearchActive = false;
          break;
     }
 
diff --git a/menu.h b/menu.h
index 1bca9209e..1d478d9b9 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.89 2007/08/26 14:35:57 kls Exp $
+ * $Id: menu.h 1.91 2008/02/10 16:01:53 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -56,8 +56,6 @@ class cMenuEvent : public cOsdMenu {
 
 class cMenuMain : public cOsdMenu {
 private:
-  time_t lastDiskSpaceCheck;
-  int lastFreeMB;
   bool replaying;
   cOsdItem *stopReplayItem;
   cOsdItem *cancelEditingItem;
@@ -156,6 +154,7 @@ class cMenuRecordings : public cOsdMenu {
   int level;
   int recordingsState;
   int helpKeys;
+  bool SetFreeDiskDisplay(bool Force = false);
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
   bool Open(bool OpenSubMenus = false);
@@ -178,7 +177,7 @@ class cRecordControl {
   cTimer *timer;
   cRecorder *recorder;
   const cEvent *event;
-  char *instantId;
+  cString instantId;
   char *fileName;
   bool GetEvent(void);
 public:
diff --git a/menuitems.c b/menuitems.c
index 15f729bdf..4aba66c6e 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.56 2008/01/26 16:07:07 kls Exp $
+ * $Id: menuitems.c 1.58 2008/02/10 16:03:30 kls Exp $
  */
 
 #include "menuitems.h"
@@ -34,9 +34,8 @@ cMenuEditItem::~cMenuEditItem()
 
 void cMenuEditItem::SetValue(const char *Value)
 {
-  char *buffer = NULL;
-  asprintf(&buffer, "%s:\t%s", name, Value);
-  SetText(buffer, false);
+  cString buffer = cString::sprintf("%s:\t%s", name, Value);
+  SetText(buffer);
   cStatus::MsgOsdCurrentItem(buffer);
 }
 
@@ -937,64 +936,6 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuEditMapItem ------------------------------------------------------
-
-cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  map = Map;
-  zeroString = ZeroString;
-  Set();
-}
-
-void cMenuEditMapItem::Set(void)
-{
-  const char *s = NULL;
-  int n = MapToUser(*value, map, &s);
-  if (n == 999)
-     SetValue(tr("auto"));
-  else if (n == 0 && zeroString)
-     SetValue(zeroString);
-  else if (n >= 0) {
-     if (s)
-        SetValue(s);
-     else {
-        char buf[16];
-        snprintf(buf, sizeof(buf), "%d", n);
-        SetValue(buf);
-        }
-     }
-  else
-     SetValue("???");
-}
-
-eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     int newValue = *value;
-     int n = DriverIndex(*value, map);
-     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        if (n-- > 0)
-           newValue = map[n].driverValue;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (map[++n].userValue >= 0)
-           newValue = map[n].driverValue;
-        }
-     else
-        return state;
-     if (newValue != *value) {
-        *value = newValue;
-        Set();
-        }
-     state = osContinue;
-     }
-  return state;
-}
-
 // --- cMenuSetupPage --------------------------------------------------------
 
 cMenuSetupPage::cMenuSetupPage(void)
diff --git a/menuitems.h b/menuitems.h
index 0fe4713c6..0170f9b5c 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.23 2008/01/26 15:52:53 kls Exp $
+ * $Id: menuitems.h 1.25 2008/02/16 16:09:58 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
 #define __MENUITEMS_H
 
+#include <limits.h>
 #include "osdbase.h"
 
 extern const char *FileNameChars;
@@ -159,17 +160,6 @@ class cMenuEditTimeItem : public cMenuEditItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-class cMenuEditMapItem : public cMenuEditItem {
-protected:
-  int *value;
-  const tChannelParameterMap *map;
-  const char *zeroString;
-  virtual void Set(void);
-public:
-  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
 class cPlugin;
 
 class cMenuSetupPage : public cOsdMenu {
diff --git a/nit.c b/nit.c
index 32ac18a24..a2ff2d7d5 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.17 2008/01/26 15:08:01 kls Exp $
+ * $Id: nit.c 1.18 2008/02/08 13:48:31 kls Exp $
  */
 
 #include "nit.h"
@@ -127,13 +127,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100;
                  static char Polarizations[] = { 'h', 'v', 'l', 'r' };
                  char Polarization = Polarizations[sd->getPolarization()];
-                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { DVBFE_MOD_AUTO, DVBFE_MOD_QPSK, DVBFE_MOD_8PSK, DVBFE_MOD_QAM16 };
-                 int Modulation = Modulations[sd->getModulationType()];
-                 int System = sd->getModulationSystem() ? DVBFE_DELSYS_DVBS2 : DVBFE_DELSYS_DVBS;
-                 static int RollOffs[] = { DVBFE_ROLLOFF_35, DVBFE_ROLLOFF_25, DVBFE_ROLLOFF_20, DVBFE_ROLLOFF_UNKNOWN };
-                 int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : DVBFE_ROLLOFF_UNKNOWN;
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
@@ -160,14 +155,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, Modulation, System, RollOff);
+                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate, Modulation, System, RollOff))
+                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
@@ -181,9 +176,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Source = cSource::FromData(cSource::stCable);
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
-                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { DVBFE_MOD_NONE, DVBFE_MOD_QAM16, DVBFE_MOD_QAM32, DVBFE_MOD_QAM64, DVBFE_MOD_QAM128, DVBFE_MOD_QAM256, QAM_AUTO };
+                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
                  int Modulation = Modulations[min(sd->getModulation(), 6)];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
@@ -231,22 +226,19 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = Frequencies[0] = sd->getFrequency() * 10;
-                 static int Bandwidths[] = { DVBFE_BANDWIDTH_8_MHZ, DVBFE_BANDWIDTH_7_MHZ, DVBFE_BANDWIDTH_6_MHZ, DVBFE_BANDWIDTH_5_MHZ, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO };
+                 static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
                  int Bandwidth = Bandwidths[sd->getBandwidth()];
-                 static int Constellations[] = { DVBFE_MOD_QPSK, DVBFE_MOD_QAM16, DVBFE_MOD_QAM64, DVBFE_MOD_AUTO };
+                 static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
                  int Constellation = Constellations[sd->getConstellation()];
-                 static int CodeRates[] = { DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO };
+                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
+                 int Hierarchy = Hierarchies[sd->getHierarchy()];
+                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
                  int CodeRateHP = CodeRates[sd->getCodeRateHP()];
                  int CodeRateLP = CodeRates[sd->getCodeRateLP()];
-                 static int GuardIntervals[] = { DVBFE_GUARD_INTERVAL_1_32, DVBFE_GUARD_INTERVAL_1_16, DVBFE_GUARD_INTERVAL_1_8, DVBFE_GUARD_INTERVAL_1_4 };
+                 static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
                  int GuardInterval = GuardIntervals[sd->getGuardInterval()];
-                 static int TransmissionModes[] = { DVBFE_TRANSMISSION_MODE_2K, DVBFE_TRANSMISSION_MODE_8K, DVBFE_TRANSMISSION_MODE_4K, DVBFE_TRANSMISSION_MODE_AUTO };
+                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
                  int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
-                 static int Priorities[] = { DVBFE_STREAM_PRIORITY_LP, DVBFE_STREAM_PRIORITY_HP };
-                 int Priority = Priorities[sd->getPriority()];
-                 static int Alphas[] = { 0, DVBFE_ALPHA_1, DVBFE_ALPHA_2, DVBFE_ALPHA_4 };
-                 int Alpha = Alphas[sd->getHierarchy() & 3];
-                 int Hierarchy = Alpha ? DVBFE_HIERARCHY_ON : DVBFE_HIERARCHY_OFF;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
                         if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
@@ -272,14 +264,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority);
+                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority))
+                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
diff --git a/osdbase.c b/osdbase.c
index 173734961..0d9b6d853 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.31 2007/06/09 10:07:46 kls Exp $
+ * $Id: osdbase.c 1.32 2008/02/17 11:33:04 kls Exp $
  */
 
 #include "osdbase.h"
@@ -236,6 +236,7 @@ void cOsdMenu::Display(void)
          i++;
          }
      }
+  displayMenu->SetScrollbar(count, first);
   if (!isempty(status))
      displayMenu->SetMessage(mtStatus, status);
 }
diff --git a/pat.c b/pat.c
index bc84e43d0..9b41b16b0 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.19 2008/01/27 13:53:43 kls Exp $
+ * $Id: pat.c 1.20 2008/02/08 13:48:31 kls Exp $
  */
 
 #include "pat.h"
@@ -343,7 +343,6 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
-//TODO        case 0x1B: // MPEG4
                       Vpid = stream.getPid();
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
diff --git a/player.h b/player.h
index 87957e9dc..47a4e3d5c 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.20 2007/10/13 12:18:10 kls Exp $
+ * $Id: player.h 1.21 2008/02/16 13:50:11 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -22,6 +22,7 @@ class cPlayer {
   void DeviceClrAvailableTracks(bool DescriptionsOnly = false) { if (device) device->ClrAvailableTracks(DescriptionsOnly); }
   bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description) : false; }
   bool DeviceSetCurrentAudioTrack(eTrackType Type) { return device ? device->SetCurrentAudioTrack(Type) : false; }
+  bool DeviceSetCurrentSubtitleTrack(eTrackType Type) { return device ? device->SetCurrentSubtitleTrack(Type) : false; }
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   bool DeviceHasIBPTrickSpeed(void) { return device ? device->HasIBPTrickSpeed() : false; }
@@ -58,6 +59,10 @@ class cPlayer {
        // Sets the current audio track to the given value.
        // This is just a virtual hook for players that need to do special things
        // in order to switch audio tracks.
+  virtual void SetSubtitleTrack(eTrackType Type, const tTrackId *TrackId) {}
+       // Sets the current subtitle track to the given value.
+       // This is just a virtual hook for players that need to do special things
+       // in order to switch subtitle tracks.
   };
 
 class cControl : public cOsdObject {
diff --git a/plugin.c b/plugin.c
index a39453cd1..8fab11fac 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.26 2007/08/05 12:48:50 kls Exp $
+ * $Id: plugin.c 1.28 2008/02/17 13:32:12 kls Exp $
  */
 
 #include "plugin.h"
@@ -142,12 +142,11 @@ void cPlugin::SetConfigDirectory(const char *Dir)
 
 const char *cPlugin::ConfigDirectory(const char *PluginName)
 {
-  static char *buffer = NULL;
+  static cString buffer;
   if (!cThread::IsMainThread())
      esyslog("ERROR: plugin '%s' called cPlugin::ConfigDirectory(), which is not thread safe!", PluginName ? PluginName : "<no name given>");
-  free(buffer);
-  asprintf(&buffer, "%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
-  return MakeDirs(buffer, true) ? buffer : NULL;
+  buffer = cString::sprintf("%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+  return MakeDirs(buffer, true) ? *buffer : NULL;
 }
 
 // --- cDll ------------------------------------------------------------------
@@ -317,10 +316,7 @@ void cPluginManager::AddPlugin(const char *Args)
   char *p = strchr(s, ' ');
   if (p)
      *p = 0;
-  char *buffer = NULL;
-  asprintf(&buffer, "%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION);
-  dlls.Add(new cDll(buffer, Args));
-  free(buffer);
+  dlls.Add(new cDll(cString::sprintf("%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION), Args));
   free(s);
 }
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 90d6ae975..02855b79a 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,21 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "off"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "cap"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
 
@@ -230,12 +215,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disc"
+
+msgid "free"
+msgstr "lliure"
+
 msgid "Free To Air"
 msgstr ""
 
 msgid "encrypted"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Editar canal"
 
@@ -284,18 +278,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polaritzaci�"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversi�"
 
+msgid "off"
+msgstr "off"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "cap"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -314,15 +311,6 @@ msgstr "Protegir"
 msgid "Hierarchy"
 msgstr "Jerarquia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritat"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Propietats del canal duplicades!"
 
@@ -368,6 +356,9 @@ msgstr "Fi"
 msgid "VPS"
 msgstr ""
 
+msgid "Priority"
+msgstr "Prioritat"
+
 msgid "Lifetime"
 msgstr "Durada"
 
@@ -821,12 +812,6 @@ msgstr "Guia de Programaci
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disc"
-
-msgid "free"
-msgstr "lliure"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Aturar la reproducci�"
@@ -908,9 +893,6 @@ msgstr "Sobrescriure"
 msgid "Button$Insert"
 msgstr "Inserir"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -991,7 +973,7 @@ msgstr "Dissabte"
 msgid "Sunday"
 msgstr "Diumenge"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 812c1fcba..0d7c197f6 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "vyp."
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "��dn�"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "volno"
+
 msgid "Free To Air"
 msgstr "voln�"
 
 msgid "encrypted"
 msgstr "k�dovan�"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Editace kan�lu"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizace"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "vyp."
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "��dn�"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorita"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Nastaven� kan�l� nejsou unik�tn�!"
 
@@ -366,6 +354,9 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorita"
+
 msgid "Lifetime"
 msgstr "�ivotnost"
 
@@ -819,12 +810,6 @@ msgstr "Program (EPG)"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "volno"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zastavit p�ehr�v�n�"
@@ -906,9 +891,6 @@ msgstr "P
 msgid "Button$Insert"
 msgstr "Vlo�it"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Modul"
 
@@ -989,8 +971,8 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Ned�le"
 
-msgid "Upcoming VPS recording!"
-msgstr "Brzo za�ne nahr�v�n� VPS!"
+msgid "Upcoming recording!"
+msgstr "Brzo za�ne nahr�v�n�!"
 
 msgid "Recording started"
 msgstr "Za�alo nahr�v�n�"
diff --git a/po/da_DK.po b/po/da_DK.po
index 53b1bee1f..8e6ac9608 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "fra"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "ingen"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "fri"
+
 msgid "Free To Air"
 msgstr "Free To Air"
 
 msgid "encrypted"
 msgstr "kodet"
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "Edit channel"
 msgstr "Rediger kanal"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "fra"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "ingen"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarki"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanalindstillinger er ikke entydige!"
 
@@ -366,6 +354,9 @@ msgstr "Stop"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -819,12 +810,6 @@ msgstr "Programoversigt"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "fri"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspilning"
@@ -906,9 +891,6 @@ msgstr "Overskriv"
 msgid "Button$Insert"
 msgstr "Inds�t"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -989,8 +971,8 @@ msgstr "L
 msgid "Sunday"
 msgstr "S�ndag"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS optagelse starter snart!"
+msgid "Upcoming recording!"
+msgstr "Optagelse starter snart!"
 
 msgid "Recording started"
 msgstr "Optagelse startet"
diff --git a/po/de_DE.po b/po/de_DE.po
index 4ead23bcf..035b01980 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "aus"
-
-msgid "on"
-msgstr "ein"
-
-msgid "none"
-msgstr "keine"
-
-msgid "high"
-msgstr "hoch"
-
-msgid "low"
-msgstr "niedrig"
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
 
@@ -228,12 +213,21 @@ msgstr "Benutzer8"
 msgid "Key$User9"
 msgstr "Benutzer9"
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "frei"
+
 msgid "Free To Air"
 msgstr "frei empfangbar"
 
 msgid "encrypted"
 msgstr "verschl�sselt"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Kanal editieren"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
-msgid "System"
-msgstr "System"
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "aus"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "keine"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-msgid "Alpha"
-msgstr "Alpha"
-
-msgid "Priority"
-msgstr "Priorit�t"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "Kanaleinstellungen sind nicht eindeutig!"
 
@@ -366,6 +354,9 @@ msgstr "Ende"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�t"
+
 msgid "Lifetime"
 msgstr "Lebensdauer"
 
@@ -819,12 +810,6 @@ msgstr "Programm"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "frei"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Wiedergabe beenden"
@@ -906,9 +891,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Einf�gen"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -989,8 +971,8 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-Aufnahme beginnt in K�rze!"
+msgid "Upcoming recording!"
+msgstr "Aufnahme beginnt in K�rze!"
 
 msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
diff --git a/po/el_GR.po b/po/el_GR.po
index 3655d6db5..59d9f4310 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "�������"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "������"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "������"
+
+msgid "free"
+msgstr "���������"
+
 msgid "Free To Air"
 msgstr ""
 
 msgid "encrypted"
 msgstr ""
 
+msgid "auto"
+msgstr "��������"
+
 msgid "Edit channel"
 msgstr "����������� ��������"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "������"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "����������"
 
+msgid "off"
+msgstr "�������"
+
 msgid "CoderateH"
 msgstr "������ ������ H"
 
+msgid "none"
+msgstr "������"
+
 msgid "CoderateL"
 msgstr "������ ������ L"
 
@@ -312,15 +309,6 @@ msgstr "
 msgid "Hierarchy"
 msgstr "���������"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "�������������"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "�� ��������� ��� �������� ����������������!"
 
@@ -366,6 +354,9 @@ msgstr "
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "�������������"
+
 msgid "Lifetime"
 msgstr "�������� ���������"
 
@@ -819,12 +810,6 @@ msgstr "
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "������"
-
-msgid "free"
-msgstr "���������"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ����� ������������"
@@ -906,9 +891,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "��������"
 
-msgid "auto"
-msgstr "��������"
-
 msgid "Plugin"
 msgstr "��������"
 
@@ -989,7 +971,7 @@ msgstr "
 msgid "Sunday"
 msgstr "�������"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/es_ES.po b/po/es_ES.po
index ee8a94f40..a470a72bf 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "off"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "ninguno"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "libre"
+
 msgid "Free To Air"
 msgstr "en abierto"
 
 msgid "encrypted"
 msgstr "cifrado"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Modificar canal"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizaci�n"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "T.s�mbolos"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "off"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "ninguno"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Int.Guarda"
 msgid "Hierarchy"
 msgstr "Jerarqu�a"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioridad"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
 
@@ -366,6 +354,9 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioridad"
+
 msgid "Lifetime"
 msgstr "Duraci�n"
 
@@ -819,12 +810,6 @@ msgstr "Gu
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "libre"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reproduci�n"
@@ -906,9 +891,6 @@ msgstr "Sobreescribir"
 msgid "Button$Insert"
 msgstr "Insertar"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -989,7 +971,7 @@ msgstr "S
 msgid "Sunday"
 msgstr "Domingo"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/et_EE.po b/po/et_EE.po
index 878db2173..f7477dd26 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "v�ljas"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "puudu"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
 
@@ -228,12 +213,21 @@ msgstr "Lisaklahv8"
 msgid "Key$User9"
 msgstr "Lisaklahv9"
 
+msgid "Disk"
+msgstr "Ketas"
+
+msgid "free"
+msgstr "vaba"
+
 msgid "Free To Air"
 msgstr "FTA"
 
 msgid "encrypted"
 msgstr "kr�ptitud"
 
+msgid "auto"
+msgstr "automaatne"
+
 msgid "Edit channel"
 msgstr "Kanali muutmine"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisatsioon"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversioon"
 
+msgid "off"
+msgstr "v�ljas"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "puudu"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteet"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
 
@@ -366,6 +354,9 @@ msgstr "Stopp"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteet"
+
 msgid "Lifetime"
 msgstr "Eluiga"
 
@@ -792,7 +783,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus k�ivitamisel"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "H�dav�ljumine"
 
 msgid "Plugins"
 msgstr "Laiendusmoodulid"
@@ -819,12 +810,6 @@ msgstr "Kava"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Ketas"
-
-msgid "free"
-msgstr "vaba"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " L�petada taasesitamine"
@@ -906,9 +891,6 @@ msgstr "Asenda (OVR)"
 msgid "Button$Insert"
 msgstr "Lisa (INS)"
 
-msgid "auto"
-msgstr "automaatne"
-
 msgid "Plugin"
 msgstr "Laiendusmoodul"
 
@@ -989,8 +971,8 @@ msgstr "Laup
 msgid "Sunday"
 msgstr "P�hap�ev"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS salvestamine tulekul!"
+msgid "Upcoming recording!"
+msgstr "Salvestamine tulekul!"
 
 msgid "Recording started"
 msgstr "Salvestamine algas"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 4ac17cff8..8a7e75a84 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,21 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "pois"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "tyhj�"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
@@ -231,12 +216,21 @@ msgstr "Lis
 msgid "Key$User9"
 msgstr "Lis�n�pp�in 9"
 
+msgid "Disk"
+msgstr "Levy"
+
+msgid "free"
+msgstr "vapaana"
+
 msgid "Free To Air"
 msgstr "vapaa"
 
 msgid "encrypted"
 msgstr "salattu"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Muokkaa kanavaa"
 
@@ -285,18 +279,21 @@ msgstr "Palvelu-ID"
 msgid "Polarization"
 msgstr "Polarisaatio"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Symbolinopeus"
 
 msgid "Inversion"
 msgstr "Inversio"
 
+msgid "off"
+msgstr "pois"
+
 msgid "CoderateH"
 msgstr "Suojaustaso (HP)"
 
+msgid "none"
+msgstr "tyhj�"
+
 msgid "CoderateL"
 msgstr "Suojaustaso (LP)"
 
@@ -315,15 +312,6 @@ msgstr "Suojav
 msgid "Hierarchy"
 msgstr "Hierarkia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteetti"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
 
@@ -369,6 +357,9 @@ msgstr "Lopetus"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteetti"
+
 msgid "Lifetime"
 msgstr "Elinik�"
 
@@ -822,12 +813,6 @@ msgstr "Ohjelmisto"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Levy"
-
-msgid "free"
-msgstr "vapaana"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lopeta toisto"
@@ -909,9 +894,6 @@ msgstr "Korvaa"
 msgid "Button$Insert"
 msgstr "Lis��"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Laajennos"
 
@@ -992,8 +974,8 @@ msgstr "Lauantai"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-tallennus on alkamassa!"
+msgid "Upcoming recording!"
+msgstr "Tallennus on alkamassa!"
 
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 846694164..8bf2ca0cc 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-10-18 16:12+0100\n"
 "Last-Translator: Michael Nival <mnival@club-internet.fr>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -21,21 +21,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "off"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "aucun"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
 
@@ -234,12 +219,21 @@ msgstr "Utilisateur8"
 msgid "Key$User9"
 msgstr "Utilisateur9"
 
+msgid "Disk"
+msgstr "Disque"
+
+msgid "free"
+msgstr "restant"
+
 msgid "Free To Air"
 msgstr "Aucun cryptage"
 
 msgid "encrypted"
 msgstr "Crypt�"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Modifier une cha�ne"
 
@@ -288,18 +282,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Fr�q. Symbole"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "off"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "aucun"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -318,15 +315,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hi�rarchie"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorit�"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Caract�ristiques des cha�nes non uniques"
 
@@ -372,6 +360,9 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�"
+
 msgid "Lifetime"
 msgstr "Dur�e de vie"
 
@@ -825,12 +816,6 @@ msgstr "Programmes"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disque"
-
-msgid "free"
-msgstr "restant"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Arr�ter la lecture"
@@ -912,9 +897,6 @@ msgstr "Ecraser"
 msgid "Button$Insert"
 msgstr "Ins�rer"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -995,8 +977,8 @@ msgstr "Samedi"
 msgid "Sunday"
 msgstr "Dimanche"
 
-msgid "Upcoming VPS recording!"
-msgstr "Enregistrement VPS commence procha�nement"
+msgid "Upcoming recording!"
+msgstr "Enregistrement commence procha�nement"
 
 msgid "Recording started"
 msgstr "Enregistrement a commenc�"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 421d8c3a2..14e456d03 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "ugasi"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "nijedan"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan program ***"
 
@@ -229,12 +214,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "slobodno"
+
 msgid "Free To Air"
 msgstr ""
 
 msgid "encrypted"
 msgstr ""
 
+msgid "auto"
+msgstr "automatski"
+
 msgid "Edit channel"
 msgstr "Ure�ivanje programa"
 
@@ -283,18 +277,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizacija"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
+msgid "off"
+msgstr "ugasi"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "nijedan"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,15 +310,6 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hijerarhija"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Parametri programa nisu jednozna�ni!"
 
@@ -367,6 +355,9 @@ msgstr "Kraj"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Trajanje"
 
@@ -820,12 +811,6 @@ msgstr "Raspored"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "slobodno"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
@@ -907,9 +892,6 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Umetni"
 
-msgid "auto"
-msgstr "automatski"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -990,7 +972,7 @@ msgstr "Subota"
 msgid "Sunday"
 msgstr "Nedjelja"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index e2f674e98..5d10fe9dc 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -18,21 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "ki"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "semmi"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
 
@@ -231,12 +216,21 @@ msgstr "Felhaszn
 msgid "Key$User9"
 msgstr "Felhaszn�l�9"
 
+msgid "Disk"
+msgstr "Lemez"
+
+msgid "free"
+msgstr "szabad"
+
 msgid "Free To Air"
 msgstr "K�dolatlan"
 
 msgid "encrypted"
 msgstr "K�dolt"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Csatorn�k be�ll�t�sa"
 
@@ -285,18 +279,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polariz�ci�"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "ki"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "semmi"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -315,15 +312,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorit�s"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
 
@@ -369,6 +357,9 @@ msgstr "V
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�s"
+
 msgid "Lifetime"
 msgstr "�lettartam"
 
@@ -823,12 +814,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Lemez"
-
-msgid "free"
-msgstr "szabad"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lej�tsz�st befejzni"
@@ -910,9 +895,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Beilleszteni"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -993,8 +975,8 @@ msgstr "Szombat"
 msgid "Sunday"
 msgstr "Vas�rnap"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-felv�tel r�gt�n kezd�dik!"
+msgid "Upcoming recording!"
+msgstr "Felv�tel r�gt�n kezd�dik!"
 
 msgid "Recording started"
 msgstr "A felv�tel elind�tva"
diff --git a/po/it_IT.po b/po/it_IT.po
index d93f2068a..413a8d15f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-10-16 02:15+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -18,21 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "off"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "nessuno"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
@@ -231,12 +216,21 @@ msgstr "Utente8"
 msgid "Key$User9"
 msgstr "Utente9"
 
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "liberi"
+
 msgid "Free To Air"
 msgstr "in chiaro"
 
 msgid "encrypted"
 msgstr "criptato"
 
+msgid "auto"
+msgstr "automatico"
+
 msgid "Edit channel"
 msgstr "Modifica canale"
 
@@ -285,18 +279,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizzazione"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "SymbolRate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "off"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "nessuno"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -315,15 +312,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorit�"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
 
@@ -369,6 +357,9 @@ msgstr "Fine"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�"
+
 msgid "Lifetime"
 msgstr "Durata"
 
@@ -822,12 +813,6 @@ msgstr "Programmi"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "liberi"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Ferma riproduzione"
@@ -909,9 +894,6 @@ msgstr "Sovrascrivi"
 msgid "Button$Insert"
 msgstr "Inserisci"
 
-msgid "auto"
-msgstr "automatico"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -992,8 +974,8 @@ msgstr "Sabato"
 msgid "Sunday"
 msgstr "Domenica"
 
-msgid "Upcoming VPS recording!"
-msgstr "Registrazione VPS imminente!"
+msgid "Upcoming recording!"
+msgstr "Registrazione imminente!"
 
 msgid "Recording started"
 msgstr "Registrazione avviata"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9fc1177bc..59deeefed 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,21 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "uit"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "geen"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
@@ -230,12 +215,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "vrij"
+
 msgid "Free To Air"
 msgstr ""
 
 msgid "encrypted"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Kanaal aanpassen"
 
@@ -284,18 +278,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisatie"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "uit"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "geen"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -314,15 +311,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteit"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
 
@@ -368,6 +356,9 @@ msgstr "Einde"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteit"
+
 msgid "Lifetime"
 msgstr "Bewaarduur"
 
@@ -821,12 +812,6 @@ msgstr "Gids"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "vrij"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspelen"
@@ -908,9 +893,6 @@ msgstr "Overschrijven"
 msgid "Button$Insert"
 msgstr "Invoegen"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -991,7 +973,7 @@ msgstr "Zaterdag"
 msgid "Sunday"
 msgstr "Zondag"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 4c4c26713..56dd16957 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr ""
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr ""
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
 
@@ -229,12 +214,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "ledig"
+
 msgid "Free To Air"
 msgstr ""
 
 msgid "encrypted"
 msgstr ""
 
+msgid "auto"
+msgstr ""
+
 msgid "Edit channel"
 msgstr "Editer kanal"
 
@@ -283,18 +277,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisasjon"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr ""
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr ""
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,15 +310,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr ""
 
@@ -367,6 +355,9 @@ msgstr "Slutt"
 msgid "VPS"
 msgstr ""
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -820,12 +811,6 @@ msgstr "Programmer"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "ledig"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stopp avspilling"
@@ -907,9 +892,6 @@ msgstr ""
 msgid "Button$Insert"
 msgstr ""
 
-msgid "auto"
-msgstr ""
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -990,7 +972,7 @@ msgstr "L
 msgid "Sunday"
 msgstr "S�ndag"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 3ffef6a1d..319ba76bc 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "wy��cz"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "brak"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Dysk"
+
+msgid "free"
+msgstr "wolnego"
+
 msgid "Free To Air"
 msgstr "nieszyfrowany"
 
 msgid "encrypted"
 msgstr "szyfrowany"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Edit channel"
 msgstr "Edycja kana�u"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polaryzacja"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inwersja"
 
+msgid "off"
+msgstr "wy��cz"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "brak"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorytet"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
 
@@ -366,6 +354,9 @@ msgstr "Koniec"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorytet"
+
 msgid "Lifetime"
 msgstr "Czas �ycia"
 
@@ -819,12 +810,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Dysk"
-
-msgid "free"
-msgstr "wolnego"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zatrzymaj odtwarzanie"
@@ -906,9 +891,6 @@ msgstr "Nadpisz"
 msgid "Button$Insert"
 msgstr "Wstaw"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Wtyczka"
 
@@ -989,8 +971,8 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Niedziela"
 
-msgid "Upcoming VPS recording!"
-msgstr "Wkr�tce nagranie VPS!"
+msgid "Upcoming recording!"
+msgstr "Wkr�tce nagranie!"
 
 msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1d78201c1..e33bfb4e5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "off"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr ""
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal Inv�lido! ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "livre"
+
 msgid "Free To Air"
 msgstr ""
 
 msgid "encrypted"
 msgstr ""
 
+msgid "auto"
+msgstr ""
+
 msgid "Edit channel"
 msgstr "Modificar canal"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polariza��o"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "off"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr ""
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioridade"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr ""
 
@@ -366,6 +354,9 @@ msgstr "Fim"
 msgid "VPS"
 msgstr ""
 
+msgid "Priority"
+msgstr "Prioridade"
+
 msgid "Lifetime"
 msgstr "Dura��o"
 
@@ -819,12 +810,6 @@ msgstr "Programa
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "livre"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reprodu��o"
@@ -906,9 +891,6 @@ msgstr ""
 msgid "Button$Insert"
 msgstr ""
 
-msgid "auto"
-msgstr ""
-
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -989,7 +971,7 @@ msgstr "S
 msgid "Sunday"
 msgstr "Domingo"
 
-msgid "Upcoming VPS recording!"
+msgid "Upcoming recording!"
 msgstr ""
 
 msgid "Recording started"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 21bc1b866..0a5bc5a18 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "inactiv"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "niciuna(ul)"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
@@ -229,12 +214,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disc"
+
+msgid "free"
+msgstr "liber"
+
 msgid "Free To Air"
 msgstr "FTA (necriptat)"
 
 msgid "encrypted"
 msgstr "criptat"
 
+msgid "auto"
+msgstr "automat"
+
 msgid "Edit channel"
 msgstr "Modificare canal"
 
@@ -283,18 +277,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizare"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Rat� simboluri"
 
 msgid "Inversion"
 msgstr "Inversiune"
 
+msgid "off"
+msgstr "inactiv"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "niciuna(ul)"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,15 +310,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Ierarhie"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritate"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
 
@@ -367,6 +355,9 @@ msgstr "Sf
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritate"
+
 msgid "Lifetime"
 msgstr "Timp de p�strare"
 
@@ -820,12 +811,6 @@ msgstr "Program (EPG)"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disc"
-
-msgid "free"
-msgstr "liber"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Opre�te redarea"
@@ -907,9 +892,6 @@ msgstr "Suprascrie"
 msgid "Button$Insert"
 msgstr "Insereaz�"
 
-msgid "auto"
-msgstr "automat"
-
 msgid "Plugin"
 msgstr "Plugin (modul adi�ional)"
 
@@ -990,8 +972,8 @@ msgstr "S
 msgid "Sunday"
 msgstr "Duminic�"
 
-msgid "Upcoming VPS recording!"
-msgstr "Urmeaz� o �nregistrare VPS!"
+msgid "Upcoming recording!"
+msgstr "Urmeaz� o �nregistrare!"
 
 msgid "Recording started"
 msgstr "A �nceput �nregistrarea"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2fe55adbe..c513a2c50 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,29 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
-"PO-Revision-Date: 2007-11-05 14:24+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"PO-Revision-Date: 2008-02-15 16:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "����"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "������"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -229,12 +214,21 @@ msgstr "
 msgid "Key$User9"
 msgstr "������������9"
 
+msgid "Disk"
+msgstr "����"
+
+msgid "free"
+msgstr "��������"
+
 msgid "Free To Air"
 msgstr "FTA (��������������)"
 
 msgid "encrypted"
 msgstr "������������"
 
+msgid "auto"
+msgstr "����"
+
 msgid "Edit channel"
 msgstr "�������������� ������"
 
@@ -283,18 +277,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "�����������"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "����. ��������"
 
 msgid "Inversion"
 msgstr "��������"
 
+msgid "off"
+msgstr "����"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "������"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,15 +310,6 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "���������"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
 
@@ -367,6 +355,9 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
+msgid "Priority"
+msgstr "���������"
+
 msgid "Lifetime"
 msgstr "���� ��������"
 
@@ -793,7 +784,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��������� ��� ���������"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "��������� �����"
 
 msgid "Plugins"
 msgstr "������ ����������"
@@ -820,12 +811,6 @@ msgstr "
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "����"
-
-msgid "free"
-msgstr "��������"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ���������� ���������������"
@@ -907,9 +892,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Plugin"
 msgstr "������"
 
@@ -990,8 +972,8 @@ msgstr "
 msgid "Sunday"
 msgstr "�����������"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-������ ����� ��������"
+msgid "Upcoming recording!"
+msgstr "������ ����� ��������"
 
 msgid "Recording started"
 msgstr "������ ������"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 584838b13..6f591bb2f 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "izklop"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "nobeden"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
 
@@ -229,12 +214,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "prosto"
+
 msgid "Free To Air"
 msgstr "nekodiran"
 
 msgid "encrypted"
 msgstr "kodiran"
 
+msgid "auto"
+msgstr "avtomatsko"
+
 msgid "Edit channel"
 msgstr "Uredi kanal"
 
@@ -283,18 +277,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizacija"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
+msgid "off"
+msgstr "izklop"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "nobeden"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,15 +310,6 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hierarhija"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteta"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Nastavitve kanala niso edinstvene!"
 
@@ -367,6 +355,9 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteta"
+
 msgid "Lifetime"
 msgstr "Veljavnost"
 
@@ -820,12 +811,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "prosto"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini predvajanje"
@@ -907,9 +892,6 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Vstavi"
 
-msgid "auto"
-msgstr "avtomatsko"
-
 msgid "Plugin"
 msgstr "Vstavek"
 
@@ -990,8 +972,8 @@ msgstr "Sobota"
 msgid "Sunday"
 msgstr "Nedelja"
 
-msgid "Upcoming VPS recording!"
-msgstr "Sledi VPS snemanje!"
+msgid "Upcoming recording!"
+msgstr "Sledi snemanje!"
 
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 68920f2a1..1adebd78c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "av"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "ingen"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
@@ -229,12 +214,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "ledigt"
+
 msgid "Free To Air"
 msgstr "Okodad"
 
 msgid "encrypted"
 msgstr "krypterad"
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "Edit channel"
 msgstr "�ndra kanal"
 
@@ -283,18 +277,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
+msgid "off"
+msgstr "av"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "ingen"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,15 +310,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
 
@@ -367,6 +355,9 @@ msgstr "Slutar"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Livstid"
 
@@ -820,12 +811,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "ledigt"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
@@ -907,9 +892,6 @@ msgstr "Skriv 
 msgid "Button$Insert"
 msgstr "Infoga"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Plugin"
 msgstr "Modul"
 
@@ -990,8 +972,8 @@ msgstr "L
 msgid "Sunday"
 msgstr "S�ndag"
 
-msgid "Upcoming VPS recording!"
-msgstr "strax VPS inspelning..."
+msgid "Upcoming recording!"
+msgstr "strax inspelning..."
 
 msgid "Recording started"
 msgstr "Inspelningen har startat"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 0b25c72f2..c886683f4 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-24 14:37+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "kapal�"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "hi�"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
 
@@ -228,12 +213,21 @@ msgstr "Kullan
 msgid "Key$User9"
 msgstr "Kullan�c�9"
 
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "bo�"
+
 msgid "Free To Air"
 msgstr "�ifresiz"
 
 msgid "encrypted"
 msgstr "�ifreli"
 
+msgid "auto"
+msgstr "otomatik"
+
 msgid "Edit channel"
 msgstr "Kanal ayarlar�n� de�i�tir"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Kutupla�ma"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "�nversiyon"
 
+msgid "off"
+msgstr "kapal�"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "hi�"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "Koruma"
 msgid "Hierarchy"
 msgstr "Hiyerar�i"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "�ncelik"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanal ayarlar� belli de��l!"
 
@@ -366,6 +354,9 @@ msgstr "Biti
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "�ncelik"
+
 msgid "Lifetime"
 msgstr "�mr�"
 
@@ -819,12 +810,6 @@ msgstr "Program"
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "bo�"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " G�steri�i bitir"
@@ -906,9 +891,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Ekle"
 
-msgid "auto"
-msgstr "otomatik"
-
 msgid "Plugin"
 msgstr "Eklenti"
 
@@ -989,8 +971,8 @@ msgstr "Cumartesi"
 msgid "Sunday"
 msgstr "Pazar"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS �ekim yak�nda ba�l�yor!"
+msgid "Upcoming recording!"
+msgstr "�ekim yak�nda ba�l�yor!"
 
 msgid "Recording started"
 msgstr "Kay�t ba�land�"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 62ec8cfb5..96f4ec85c 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-01-27 15:00+0100\n"
+"POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,21 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "off"
-msgstr "����"
-
-msgid "on"
-msgstr ""
-
-msgid "none"
-msgstr "������"
-
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -228,12 +213,21 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
+msgid "Disk"
+msgstr "����"
+
+msgid "free"
+msgstr "������"
+
 msgid "Free To Air"
 msgstr "FTA (������������)"
 
 msgid "encrypted"
 msgstr "����������"
 
+msgid "auto"
+msgstr "����"
+
 msgid "Edit channel"
 msgstr "������������ ������"
 
@@ -282,18 +276,21 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "�����������"
 
-msgid "System"
-msgstr ""
-
 msgid "Srate"
 msgstr "����. ���������"
 
 msgid "Inversion"
 msgstr "��������"
 
+msgid "off"
+msgstr "����"
+
 msgid "CoderateH"
 msgstr "CoderateH"
 
+msgid "none"
+msgstr "������"
+
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,15 +309,6 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "���������"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� �����!"
 
@@ -366,6 +354,9 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
+msgid "Priority"
+msgstr "���������"
+
 msgid "Lifetime"
 msgstr "����� ����������"
 
@@ -819,12 +810,6 @@ msgstr "
 msgid "VDR"
 msgstr "VDR"
 
-msgid "Disk"
-msgstr "����"
-
-msgid "free"
-msgstr "������"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " �������� �����������"
@@ -908,9 +893,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Plugin"
 msgstr "������"
 
@@ -991,8 +973,8 @@ msgstr "
 msgid "Sunday"
 msgstr "������"
 
-msgid "Upcoming VPS recording!"
-msgstr "VPS-����� ����� ���������"
+msgid "Upcoming recording!"
+msgstr "����� ����� ���������"
 
 msgid "Recording started"
 msgstr "����� �������"
diff --git a/recording.c b/recording.c
index 7999f7241..4ecf4a96c 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.157 2007/11/04 11:17:43 kls Exp $
+ * $Id: recording.c 1.161 2008/02/16 13:31:39 kls Exp $
  */
 
 #include "recording.h"
@@ -81,6 +81,7 @@ cRemoveDeletedRecordingsThread::cRemoveDeletedRecordingsThread(void)
 
 void cRemoveDeletedRecordingsThread::Action(void)
 {
+  SetPriority(19);
   // Make sure only one instance of VDR does this:
   cLockFile LockFile(VideoDirectory);
   if (LockFile.Lock()) {
@@ -143,10 +144,12 @@ void AssertFreeDiskSpace(int Priority, bool Force)
         cThreadLock DeletedRecordingsLock(&DeletedRecordings);
         if (DeletedRecordings.Count()) {
            cRecording *r = DeletedRecordings.First();
-           cRecording *r0 = r;
+           cRecording *r0 = NULL;
            while (r) {
-                 if (r->start < r0->start)
-                    r0 = r;
+                 if (IsOnVideoDirectoryFileSystem(r->FileName())) { // only remove recordings that will actually increase the free video disk space
+                    if (!r0 || r->start < r0->start)
+                       r0 = r;
+                    }
                  r = DeletedRecordings.Next(r);
                  }
            if (r0 && r0->Remove()) {
@@ -155,11 +158,13 @@ void AssertFreeDiskSpace(int Priority, bool Force)
               return;
               }
            }
-        // DeletedRecordings was empty, so to be absolutely sure there are no
-        // deleted recordings we need to double check:
-        DeletedRecordings.Update(true);
-        if (DeletedRecordings.Count())
-           return; // the next call will actually remove it
+        else {
+           // DeletedRecordings was empty, so to be absolutely sure there are no
+           // deleted recordings we need to double check:
+           DeletedRecordings.Update(true);
+           if (DeletedRecordings.Count())
+              return; // the next call will actually remove it
+           }
         // No "deleted" files to remove, so let's see if we can delete a recording:
         isyslog("...no deleted recording found, trying to delete an old recording...");
         cThreadLock RecordingsLock(&Recordings);
@@ -167,15 +172,17 @@ void AssertFreeDiskSpace(int Priority, bool Force)
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
-                 if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
-                    if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
-                        (r->lifetime > 0 && (time(NULL) - r->start) / SECSINDAY >= r->lifetime)) { // the recording's guaranteed lifetime has expired
-                       if (r0) {
-                          if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
-                             r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
+                 if (IsOnVideoDirectoryFileSystem(r->FileName())) { // only delete recordings that will actually increase the free video disk space
+                    if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
+                       if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
+                           (r->lifetime > 0 && (time(NULL) - r->start) / SECSINDAY >= r->lifetime)) { // the recording's guaranteed lifetime has expired
+                          if (r0) {
+                             if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
+                                r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
+                             }
+                          else
+                             r0 = r;
                           }
-                       else
-                          r0 = r;
                        }
                     }
                  r = Recordings.Next(r);
@@ -350,7 +357,7 @@ bool cRecordingInfo::Read(FILE *f)
                          char *p = strchr(t, ' ');
                          if (p) {
                             free(channelName);
-                            asprintf(&channelName, "%s", compactspace(p));
+                            channelName = strdup(compactspace(p));
                             *p = 0; // strips optional channel name
                             }
                          if (*t)
@@ -524,7 +531,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   else if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
      name = strdup(Timer->File());
   else
-     asprintf(&name, "%s~%s", Timer->File(), Subtitle);
+     name = strdup(cString::sprintf("%s~%s", Timer->File(), Subtitle));
   // substitute characters that would cause problems in file names:
   strreplace(name, '\n', ' ');
   start = Timer->StartTime();
@@ -565,22 +572,19 @@ cRecording::cRecording(const char *FileName)
         }
      GetResume();
      // read an optional info file:
-     char *InfoFileName = NULL;
-     asprintf(&InfoFileName, "%s%s", fileName, INFOFILESUFFIX);
+     cString InfoFileName = cString::sprintf("%s%s", fileName, INFOFILESUFFIX);
      FILE *f = fopen(InfoFileName, "r");
      if (f) {
         if (!info->Read(f))
-           esyslog("ERROR: EPG data problem in file %s", InfoFileName);
+           esyslog("ERROR: EPG data problem in file %s", *InfoFileName);
         fclose(f);
         }
      else if (errno != ENOENT)
-        LOG_ERROR_STR(InfoFileName);
-     free(InfoFileName);
+        LOG_ERROR_STR(*InfoFileName);
 #ifdef SUMMARYFALLBACK
      // fall back to the old 'summary.vdr' if there was no 'info.vdr':
      if (isempty(info->Title())) {
-        char *SummaryFileName = NULL;
-        asprintf(&SummaryFileName, "%s%s", fileName, SUMMARYFILESUFFIX);
+        cString SummaryFileName = cString::sprintf("%s%s", fileName, SUMMARYFILESUFFIX);
         FILE *f = fopen(SummaryFileName, "r");
         if (f) {
            int line = 0;
@@ -626,8 +630,7 @@ cRecording::cRecording(const char *FileName)
                free(data[i]);
            }
         else if (errno != ENOENT)
-           LOG_ERROR_STR(SummaryFileName);
-        free(SummaryFileName);
+           LOG_ERROR_STR(*SummaryFileName);
         }
 #endif
      }
@@ -696,7 +699,7 @@ const char *cRecording::FileName(void) const
      struct tm tm_r;
      struct tm *t = localtime_r(&start, &tm_r);
      name = ExchangeChars(name, true);
-     asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
+     fileName = strdup(cString::sprintf(NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime));
      name = ExchangeChars(name, false);
      }
   return fileName;
@@ -715,7 +718,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
         s++;
      else
         s = name;
-     asprintf(&titleBuffer, "%02d.%02d.%02d%c%02d:%02d%c%c%s",
+     titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%c%s",
                             t->tm_mday,
                             t->tm_mon + 1,
                             t->tm_year % 100,
@@ -724,7 +727,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
                             t->tm_min,
                             New,
                             Delimiter,
-                            s);
+                            s));
      // let's not display a trailing '~':
      if (!NewIndicator)
         stripspace(titleBuffer);
@@ -784,16 +787,14 @@ bool cRecording::IsEdited(void) const
 
 bool cRecording::WriteInfo(void)
 {
-  char *InfoFileName = NULL;
-  asprintf(&InfoFileName, "%s%s", fileName, INFOFILESUFFIX);
+  cString InfoFileName = cString::sprintf("%s%s", fileName, INFOFILESUFFIX);
   FILE *f = fopen(InfoFileName, "w");
   if (f) {
      info->Write(f);
      fclose(f);
      }
   else
-     LOG_ERROR_STR(InfoFileName);
-  free(InfoFileName);
+     LOG_ERROR_STR(*InfoFileName);
   return true;
 }
 
@@ -910,8 +911,7 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
   struct dirent *e;
   while ((Foreground || Running()) && (e = d.Next()) != NULL) {
         if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-           char *buffer;
-           asprintf(&buffer, "%s/%s", DirName, e->d_name);
+           char *buffer = strdup(AddDirectory(DirName, e->d_name));
            struct stat st;
            if (stat(buffer, &st) == 0) {
               int Link = 0;
@@ -993,10 +993,12 @@ bool cRecordings::Update(bool Wait)
 
 cRecording *cRecordings::GetByName(const char *FileName)
 {
-  for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (strcmp(recording->FileName(), FileName) == 0)
-         return recording;
-      }
+  if (FileName) {
+     for (cRecording *recording = First(); recording; recording = Next(recording)) {
+         if (strcmp(recording->FileName(), FileName) == 0)
+            return recording;
+         }
+     }
   return NULL;
 }
 
@@ -1039,7 +1041,7 @@ int cRecordings::TotalFileSizeMB(void)
   int size = 0;
   LOCK_THREAD;
   for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (recording->fileSizeMB > 0)
+      if (recording->fileSizeMB > 0 && IsOnVideoDirectoryFileSystem(recording->FileName()))
          size += recording->fileSizeMB;
       }
   return size;
@@ -1070,9 +1072,7 @@ cMark::~cMark()
 
 cString cMark::ToText(void)
 {
-  char *buffer;
-  asprintf(&buffer, "%s%s%s\n", *IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
-  return cString(buffer, true);
+  return cString::sprintf("%s%s%s\n", *IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
 }
 
 bool cMark::Parse(const char *s)
@@ -1161,11 +1161,9 @@ const char *cRecordingUserCommand::command = NULL;
 void cRecordingUserCommand::InvokeCommand(const char *State, const char *RecordingFileName)
 {
   if (command) {
-     char *cmd;
-     asprintf(&cmd, "%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\"$"));
-     isyslog("executing '%s'", cmd);
+     cString cmd = cString::sprintf("%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\"$"));
+     isyslog("executing '%s'", *cmd);
      SystemExec(cmd);
-     free(cmd);
      }
 }
 
@@ -1409,10 +1407,6 @@ bool cIndexFile::IsStillRecording()
 
 // --- cFileName -------------------------------------------------------------
 
-#include <errno.h>
-#include <unistd.h>
-#include "videodir.h"
-
 #define MAXFILESPERRECORDING 255
 #define RECORDFILESUFFIX    "/%03d.vdr"
 #define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
diff --git a/sdt.c b/sdt.c
index 2ddd7e31e..1a360e23c 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.18 2008/01/27 13:24:25 kls Exp $
+ * $Id: sdt.c 1.19 2008/02/08 13:48:31 kls Exp $
  */
 
 #include "sdt.h"
@@ -55,7 +55,6 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    case 0x02: // digital radio sound service
                    case 0x04: // NVOD reference service
                    case 0x05: // NVOD time-shifted service
-                   case 0x19: // digital HD television service
                         {
                         char NameBuf[Utf8BufSize(1024)];
                         char ShortNameBuf[Utf8BufSize(1024)];
diff --git a/skinclassic.c b/skinclassic.c
index 11b5ce441..ad26cfdc0 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.19 2008/01/13 12:38:00 kls Exp $
+ * $Id: skinclassic.c 1.25 2008/02/17 14:23:36 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -77,6 +77,7 @@ class cSkinClassicDisplayChannel : public cSkinDisplayChannel {
   int lineHeight;
   int timeWidth;
   bool message;
+  cString lastDate;
 public:
   cSkinClassicDisplayChannel(bool WithInfo);
   virtual ~cSkinClassicDisplayChannel();
@@ -113,6 +114,7 @@ void cSkinClassicDisplayChannel::SetChannel(const cChannel *Channel, int Number)
 {
   osd->DrawRectangle(0, 0, osd->Width() - 1, lineHeight - 1, Theme.Color(clrBackground));
   osd->DrawText(2, 0, ChannelString(Channel, Number), Theme.Color(clrChannelName), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+  lastDate = NULL;
 }
 
 void cSkinClassicDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
@@ -147,9 +149,12 @@ void cSkinClassicDisplayChannel::Flush(void)
 {
   if (!message) {
      cString date = DayDateTime();
-     const cFont *font = cFont::GetFont(fontSml);
-     int w = font->Width(date);
-     osd->DrawText(osd->Width() - w - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml), w);
+     if (!*lastDate || strcmp(date, lastDate)) {
+        const cFont *font = cFont::GetFont(fontSml);
+        int w = font->Width(date);
+        osd->DrawText(osd->Width() - w - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml), w);
+        lastDate = date;
+        }
      }
   osd->Flush();
 }
@@ -159,12 +164,13 @@ void cSkinClassicDisplayChannel::Flush(void)
 class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
 private:
   cOsd *osd;
-  int x0, x1;
+  int x0, x1, x2, x3;
   int y0, y1, y2, y3, y4, y5;
   int lineHeight;
   int dateWidth;
   cString lastDate;
-  void SetScrollbar(void);
+  void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
+  void SetTextScrollbar(void);
 public:
   cSkinClassicDisplayMenu(void);
   virtual ~cSkinClassicDisplayMenu();
@@ -175,6 +181,7 @@ class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
   virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetScrollbar(int Total, int Offset);
   virtual void SetEvent(const cEvent *Event);
   virtual void SetRecording(const cRecording *Recording);
   virtual void SetText(const char *Text, bool FixedFont);
@@ -189,7 +196,9 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
   lineHeight = font->Height();
   dateWidth = 0;
   x0 = 0;
-  x1 = cOsd::OsdWidth();
+  x1 = x0 + 10;
+  x3 = cOsd::OsdWidth();
+  x2 = x3 - 2 * ScrollWidth;
   y0 = 0;
   y1 = lineHeight;
   y2 = y1 + lineHeight;
@@ -197,22 +206,22 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
   y4 = y5 - lineHeight;
   y3 = y4 - lineHeight;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
-  tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 8 } };
+  tArea Areas[] = { { x0, y0, x3 - 1, y5 - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x1 - 1, y5 - 1, 4 } };
+     tArea Areas[] = { { x0, y0, x3 - 1, y5 - 1, 4 } };
      if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      else {
-        tArea Areas[] = { { x0, y0, x1 - 1, y1 - 1, 2 },
-                          { x0, y1, x1 - 1, y3 - 1, 2 },
-                          { x0, y3, x1 - 1, y5 - 1, 4 }
+        tArea Areas[] = { { x0, y0, x3 - 1, y1 - 1, 2 },
+                          { x0, y1, x3 - 1, y3 - 1, 2 },
+                          { x0, y3, x3 - 1, y5 - 1, 4 }
                         };
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
         }
      }
-  osd->DrawRectangle(x0, y0, x1 - 1, y5 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(x0, y0, x3 - 1, y5 - 1, Theme.Color(clrBackground));
 }
 
 cSkinClassicDisplayMenu::~cSkinClassicDisplayMenu()
@@ -220,25 +229,31 @@ cSkinClassicDisplayMenu::~cSkinClassicDisplayMenu()
   delete osd;
 }
 
-void cSkinClassicDisplayMenu::SetScrollbar(void)
+void cSkinClassicDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown)
 {
-  if (textScroller.CanScroll()) {
-     int yt = textScroller.Top();
-     int yb = yt + textScroller.Height();
+  if (Total > 0 && Total > Shown) {
+     int yt = Top;
+     int yb = yt + Height - 1;
      int st = yt;
      int sb = yb;
-     int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
-     int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
-     int xl = x1 - ScrollWidth;
-     osd->DrawRectangle(xl, st, x1 - 1, sb, Theme.Color(clrMenuScrollbarTotal));
-     osd->DrawRectangle(xl, tt, x1 - 1, tb, Theme.Color(clrMenuScrollbarShown));
+     int tt = st + (sb - st + 1) * Offset / Total;
+     int tb = tt + (sb - st + 1) * Shown / Total;
+     int xl = x3 - ScrollWidth;
+     osd->DrawRectangle(xl, st, x3 - 1, sb, Theme.Color(clrMenuScrollbarTotal));
+     osd->DrawRectangle(xl, tt, x3 - 1, tb, Theme.Color(clrMenuScrollbarShown));
      }
 }
 
+void cSkinClassicDisplayMenu::SetTextScrollbar(void)
+{
+  if (textScroller.CanScroll())
+     DrawScrollbar(textScroller.Total(), textScroller.Offset(), textScroller.Shown(), textScroller.Top(), textScroller.Height(), textScroller.CanScrollUp(), textScroller.CanScrollDown());
+}
+
 void cSkinClassicDisplayMenu::Scroll(bool Up, bool Page)
 {
   cSkinDisplayMenu::Scroll(Up, Page);
-  SetScrollbar();
+  SetTextScrollbar();
 }
 
 int cSkinClassicDisplayMenu::MaxItems(void)
@@ -249,24 +264,24 @@ int cSkinClassicDisplayMenu::MaxItems(void)
 void cSkinClassicDisplayMenu::Clear(void)
 {
   textScroller.Reset();
-  osd->DrawRectangle(x0, y1, x1 - 1, y4 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(x0, y1, x3 - 1, y4 - 1, Theme.Color(clrBackground));
 }
 
 void cSkinClassicDisplayMenu::SetTitle(const char *Title)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x1 - x0 - dateWidth);
+  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x3 - x0 - dateWidth);
 }
 
 void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  int w = x1 - x0;
+  int w = x3 - x0;
   int t0 = x0;
   int t1 = x0 + w / 4;
   int t2 = x0 + w / 2;
-  int t3 = x1 - w / 4;
-  int t4 = x1;
+  int t3 = x3 - w / 4;
+  int t4 = x3;
   osd->DrawText(t0, y4, Red,    Theme.Color(clrButtonRedFg),    Red    ? Theme.Color(clrButtonRedBg)    : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter);
   osd->DrawText(t1, y4, Green,  Theme.Color(clrButtonGreenFg),  Green  ? Theme.Color(clrButtonGreenBg)  : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter);
   osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Yellow ? Theme.Color(clrButtonYellowBg) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter);
@@ -277,9 +292,9 @@ void cSkinClassicDisplayMenu::SetMessage(eMessageType Type, const char *Text)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   if (Text)
-     osd->DrawText(x0, y3, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x1 - x0, 0, taCenter);
+     osd->DrawText(x0, y3, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), font, x3 - x0, 0, taCenter);
   else
-     osd->DrawRectangle(x0, y3, x1 - 1, y4 - 1, Theme.Color(clrBackground));
+     osd->DrawRectangle(x0, y3, x3 - 1, y4 - 1, Theme.Color(clrBackground));
 }
 
 void cSkinClassicDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable)
@@ -299,12 +314,17 @@ void cSkinClassicDisplayMenu::SetItem(const char *Text, int Index, bool Current,
       const char *s = GetTabbedText(Text, i);
       if (s) {
          int xt = x0 + Tab(i);
-         osd->DrawText(xt, y, s, ColorFg, ColorBg, font, x1 - xt);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, font, x2 - xt);
          }
       if (!Tab(i + 1))
          break;
       }
-  SetEditableWidth(x1 - x0 - Tab(1));
+  SetEditableWidth(x2 - x0 - Tab(1));
+}
+
+void cSkinClassicDisplayMenu::SetScrollbar(int Total, int Offset)
+{
+  DrawScrollbar(Total, Offset, MaxItems(), y2, MaxItems() * lineHeight, Offset > 0, Offset + MaxItems() < Total);
 }
 
 void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
@@ -312,33 +332,30 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
   if (!Event)
      return;
   const cFont *font = cFont::GetFont(fontOsd);
-  int xl = x0 + 10;
   int y = y2;
   cTextScroller ts;
   char t[32];
   snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
-  ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
+  ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
-     char *buffer;
-     asprintf(&buffer, " VPS: %s ", *Event->GetVpsString());
+     cString buffer = cString::sprintf(" VPS: %s ", *Event->GetVpsString());
      const cFont *font = cFont::GetFont(fontSml);
      int w = font->Width(buffer);
-     osd->DrawText(x1 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
-     free(buffer);
+     osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
      }
   y += ts.Height();
   y += font->Height();
-  ts.Set(osd, xl, y, x1 - xl, y3 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
+  ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
   y += ts.Height();
   if (!isempty(Event->ShortText())) {
      const cFont *font = cFont::GetFont(fontSml);
-     ts.Set(osd, xl, y, x1 - xl, y3 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+     ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
   y += font->Height();
   if (!isempty(Event->Description())) {
-     textScroller.Set(osd, xl, y, x1 - xl - 2 * ScrollWidth, y3 - y, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
-     SetScrollbar();
+     textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
+     SetTextScrollbar();
      }
 }
 
@@ -348,40 +365,39 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
      return;
   const cRecordingInfo *Info = Recording->Info();
   const cFont *font = cFont::GetFont(fontOsd);
-  int xl = x0 + 10;
   int y = y2;
   cTextScroller ts;
   char t[32];
   snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
-  ts.Set(osd, xl, y, x1 - xl, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
+  ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   y += font->Height();
   const char *Title = Info->Title();
   if (isempty(Title))
      Title = Recording->Name();
-  ts.Set(osd, xl, y, x1 - xl, y3 - y, Title, font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
+  ts.Set(osd, x1, y, x2 - x1, y3 - y, Title, font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
   y += ts.Height();
   if (!isempty(Info->ShortText())) {
      const cFont *font = cFont::GetFont(fontSml);
-     ts.Set(osd, xl, y, x1 - xl, y3 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+     ts.Set(osd, x1, y, x2 - x1, y3 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
   y += font->Height();
   if (!isempty(Info->Description())) {
-     textScroller.Set(osd, xl, y, x1 - xl - 2 * ScrollWidth, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
-     SetScrollbar();
+     textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
+     SetTextScrollbar();
      }
 }
 
 void cSkinClassicDisplayMenu::SetText(const char *Text, bool FixedFont)
 {
-  textScroller.Set(osd, x0, y2, GetTextAreaWidth(), y3 - y2, Text, GetTextAreaFont(FixedFont), Theme.Color(clrMenuText), Theme.Color(clrBackground));
-  SetScrollbar();
+  textScroller.Set(osd, x1, y2, GetTextAreaWidth(), y3 - y2, Text, GetTextAreaFont(FixedFont), Theme.Color(clrMenuText), Theme.Color(clrBackground));
+  SetTextScrollbar();
 }
 
 int cSkinClassicDisplayMenu::GetTextAreaWidth(void) const
 {
-  return x1 - x0 - 2 * ScrollWidth;
+return x2 - x1;
 }
 
 const cFont *cSkinClassicDisplayMenu::GetTextAreaFont(bool FixedFont) const
@@ -392,10 +408,10 @@ const cFont *cSkinClassicDisplayMenu::GetTextAreaFont(bool FixedFont) const
 void cSkinClassicDisplayMenu::Flush(void)
 {
   cString date = DayDateTime();
-  if (!lastDate || strcmp(date, lastDate)) {
+  if (!*lastDate || strcmp(date, lastDate)) {
      const cFont *font = cFont::GetFont(fontOsd);
      int w = font->Width(date);
-     osd->DrawText(x1 - w - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font, w);
+     osd->DrawText(x3 - w - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font, w);
      lastDate = date;
      dateWidth = max(w + 2, dateWidth);
      }
diff --git a/skins.c b/skins.c
index f442e5adc..46a858cfe 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.13 2007/01/04 13:08:55 kls Exp $
+ * $Id: skins.c 1.14 2008/02/17 11:31:09 kls Exp $
  */
 
 #include "skins.h"
@@ -108,6 +108,10 @@ const char *cSkinDisplayMenu::GetTabbedText(const char *s, int Tab)
   return buffer;
 }
 
+void cSkinDisplayMenu::SetScrollbar(int Total, int Offset)
+{
+}
+
 int cSkinDisplayMenu::GetTextAreaWidth(void) const
 {
   return 0;
diff --git a/skins.h b/skins.h
index a0f03880d..9e83c0cad 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.15 2007/01/04 13:08:55 kls Exp $
+ * $Id: skins.h 1.16 2008/02/17 11:30:56 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -144,6 +144,11 @@ class cSkinDisplayMenu : public cSkinDisplay {
   virtual void SetItem(const cRecording *Recording, int Index, bool Current, bool Selectable);
   --> false: call SetItem(text)
   */
+  virtual void SetScrollbar(int Total, int Offset);
+       ///< Sets the Total number of items in the currently displayed list, and the
+       ///< Offset of the first item that is currently displayed (the skin knows how
+       ///< many items it can display at once, see MaxItems()). This can be used to
+       ///< display a scollbar.
   virtual void SetEvent(const cEvent *Event) = 0;
        ///< Sets the Event that shall be displayed, using the entire central area
        ///< of the menu. The Event's 'description' shall be displayed using a
diff --git a/skinsttng.c b/skinsttng.c
index 4f576a7c7..0aa22b72f 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.21 2007/06/17 13:51:56 kls Exp $
+ * $Id: skinsttng.c 1.26 2008/02/17 14:23:45 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -129,6 +129,7 @@ class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel {
   tColor frameColor;
   bool message;
   const cEvent *present;
+  cString lastDate;
   int lastSeen;
   tTrackId lastTrackId;
   static cBitmap bmTeletext, bmRadio, bmAudio, bmDolbyDigital, bmEncrypted, bmRecording;
@@ -307,7 +308,10 @@ void cSkinSTTNGDisplayChannel::Flush(void)
         const cFont *font = cFont::GetFont(fontSml);
         cString date = DayDateTime();
         int w = font->Width(date);
-        osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrChannelDate), frameColor, font, w);
+        if (!*lastDate || strcmp(date, lastDate)) {
+           osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrChannelDate), frameColor, font, w);
+           lastDate = date;
+           }
         cDevice *Device = cDevice::PrimaryDevice();
         const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
         if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
@@ -325,7 +329,7 @@ void cSkinSTTNGDisplayChannel::Flush(void)
      if (seen != lastSeen) {
         osd->DrawRectangle(x1 + Gap, y3, x1 + Gap + ScrollWidth - 1, y4 - 1, Theme.Color(clrChannelTimebarRest));
         if (seen)
-        osd->DrawRectangle(x1 + Gap, y3, x1 + Gap + ScrollWidth - 1, y3 + seen, Theme.Color(clrChannelTimebarSeen));
+           osd->DrawRectangle(x1 + Gap, y3, x1 + Gap + ScrollWidth - 1, y3 + seen, Theme.Color(clrChannelTimebarSeen));
         lastSeen = seen;
         }
      }
@@ -344,7 +348,8 @@ class cSkinSTTNGDisplayMenu : public cSkinDisplayMenu {
   int currentIndex;
   bool message;
   cString lastDate;
-  void SetScrollbar(void);
+  void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
+  void SetTextScrollbar(void);
 public:
   cSkinSTTNGDisplayMenu(void);
   virtual ~cSkinSTTNGDisplayMenu();
@@ -355,6 +360,7 @@ class cSkinSTTNGDisplayMenu : public cSkinDisplayMenu {
   virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
   virtual void SetMessage(eMessageType Type, const char *Text);
   virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetScrollbar(int Total, int Offset);
   virtual void SetEvent(const cEvent *Event);
   virtual void SetRecording(const cRecording *Recording);
   virtual void SetText(const char *Text, bool FixedFont);
@@ -431,37 +437,43 @@ cSkinSTTNGDisplayMenu::~cSkinSTTNGDisplayMenu()
   delete osd;
 }
 
-void cSkinSTTNGDisplayMenu::SetScrollbar(void)
+void cSkinSTTNGDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown)
 {
-  if (textScroller.CanScroll()) {
+  if (Total > 0 && Total > Shown) {
      int h  = lineHeight;
-     int yt = textScroller.Top();
-     int yb = yt + textScroller.Height();
+     int yt = Top;
+     int yb = yt + Height - 1;
      int st = yt + h + Gap;
      int sb = yb - h - Gap;
-     int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total();
-     int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total();
+     int tt = st + (sb - st + 1) * Offset / Total;
+     int tb = tt + (sb - st + 1) * Shown / Total;
      osd->DrawRectangle(x5, st, x5 + ScrollWidth - 1, sb, Theme.Color(clrMenuScrollbarTotal));
      osd->DrawRectangle(x5, tt, x5 + ScrollWidth - 1, tb, Theme.Color(clrMenuScrollbarShown));
      osd->DrawRectangle(x5, yt, x6 - 1, yt + h - 1, frameColor);
      osd->DrawEllipse  (x6, yt, x7 - 1, yt + h - 1, frameColor, 5);
      osd->DrawRectangle(x5, yb - h, x6 - 1, yb - 1, frameColor);
      osd->DrawEllipse  (x6, yb - h, x7 - 1, yb - 1, frameColor, 5);
-     if (textScroller.CanScrollUp()) {
+     if (CanScrollUp) {
         cBitmap bm(arrowup_xpm);
         osd->DrawBitmap(x5 + (x7 - x5 - bm.Width()) / 2 - 2, yt + (h - bm.Height()) / 2, bm, Theme.Color(clrMenuScrollbarArrow), frameColor);
         }
-     if (textScroller.CanScrollDown()) {
+     if (CanScrollDown) {
         cBitmap bm(arrowdown_xpm);
         osd->DrawBitmap(x5 + (x7 - x5 - bm.Width()) / 2 - 2, yb - h + (h - bm.Height()) / 2, bm, Theme.Color(clrMenuScrollbarArrow), frameColor);
         }
-     }
+   }
+}
+
+void cSkinSTTNGDisplayMenu::SetTextScrollbar(void)
+{
+  if (textScroller.CanScroll())
+     DrawScrollbar(textScroller.Total(), textScroller.Offset(), textScroller.Shown(), textScroller.Top(), textScroller.Height(), textScroller.CanScrollUp(), textScroller.CanScrollDown());
 }
 
 void cSkinSTTNGDisplayMenu::Scroll(bool Up, bool Page)
 {
   cSkinDisplayMenu::Scroll(Up, Page);
-  SetScrollbar();
+  SetTextScrollbar();
 }
 
 int cSkinSTTNGDisplayMenu::MaxItems(void)
@@ -554,6 +566,11 @@ void cSkinSTTNGDisplayMenu::SetItem(const char *Text, int Index, bool Current, b
   SetEditableWidth(x4 - x3 - 5 - Tab(1));
 }
 
+void cSkinSTTNGDisplayMenu::SetScrollbar(int Total, int Offset)
+{
+  DrawScrollbar(Total, Offset, MaxItems(), y3 + Roundness, MaxItems() * lineHeight, Offset > 0, Offset + MaxItems() < Total);
+}
+
 void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
 {
   if (!Event)
@@ -566,15 +583,13 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
   snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
-     char *buffer;
-     asprintf(&buffer, " VPS: %s ", *Event->GetVpsString());
+     cString buffer = cString::sprintf(" VPS: %s ", *Event->GetVpsString());
      const cFont *font = cFont::GetFont(fontSml);
      int w = font->Width(buffer);
      osd->DrawText(x4 - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w);
      int yb = y + font->Height();
      osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor);
      osd->DrawEllipse  (x6, y, x7 - 1, yb - 1, frameColor, 5);
-     free(buffer);
      }
   y += ts.Height();
   y += font->Height();
@@ -594,7 +609,7 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
      osd->DrawEllipse  (x1, yt - Roundness, x2, yt,             frameColor, -3);
      osd->DrawRectangle(x1, yt,             x2, yb,             frameColor);
      osd->DrawEllipse  (x1, yb,             x2, yb + Roundness, frameColor, -2);
-     SetScrollbar();
+     SetTextScrollbar();
      }
 }
 
@@ -631,14 +646,14 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
      osd->DrawEllipse  (x1, yt - Roundness, x2, yt,             frameColor, -3);
      osd->DrawRectangle(x1, yt,             x2, yb,             frameColor);
      osd->DrawEllipse  (x1, yb,             x2, yb + Roundness, frameColor, -2);
-     SetScrollbar();
+     SetTextScrollbar();
      }
 }
 
 void cSkinSTTNGDisplayMenu::SetText(const char *Text, bool FixedFont)
 {
   textScroller.Set(osd, x3, y3, GetTextAreaWidth(), y4 - y3, Text, GetTextAreaFont(FixedFont), Theme.Color(clrMenuText), Theme.Color(clrBackground));
-  SetScrollbar();
+  SetTextScrollbar();
 }
 
 int cSkinSTTNGDisplayMenu::GetTextAreaWidth(void) const
@@ -657,7 +672,7 @@ void cSkinSTTNGDisplayMenu::Flush(void)
 {
   if (!message) {
      cString date = DayDateTime();
-     if (!lastDate || strcmp(date, lastDate)) {
+     if (!*lastDate || strcmp(date, lastDate)) {
         const cFont *font = cFont::GetFont(fontSml);
         int w = font->Width(date);
         osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrMenuDate), frameColor, font, w);
diff --git a/sources.c b/sources.c
index 2f08debda..65002a5ab 100644
--- a/sources.c
+++ b/sources.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 1.3 2004/12/26 11:58:52 kls Exp $
+ * $Id: sources.c 1.4 2008/02/10 14:07:26 kls Exp $
  */
 
 #include "sources.h"
 #include <ctype.h>
 
-// -- cSource ----------------------------------------------------------------
+// --- cSource ---------------------------------------------------------------
 
 cSource::cSource(void)
 {
@@ -101,7 +101,7 @@ int cSource::FromData(eSourceType SourceType, int Position, bool East)
   return code;
 }
 
-// -- cSources ---------------------------------------------------------------
+// --- cSources --------------------------------------------------------------
 
 cSources Sources;
 
diff --git a/spu.c b/spu.c
index ebe4192de..feb2d61c8 100644
--- a/spu.c
+++ b/spu.c
@@ -6,13 +6,13 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.c 1.3 2006/04/17 12:48:33 kls Exp $
+ * $Id: spu.c 1.4 2008/02/10 14:06:48 kls Exp $
  */
 
 #include "spu.h"
 #include <inttypes.h>
 
-// -- cSpuDecoder ------------------------------------------------------------
+// --- cSpuDecoder -----------------------------------------------------------
 /*
 cSpuDecoder::cSpuDecoder()
 {};
diff --git a/status.c b/status.c
index 4a7da49a8..1d7a8d42b 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 1.8 2005/12/31 15:10:10 kls Exp $
+ * $Id: status.c 1.10 2008/02/16 14:46:31 kls Exp $
  */
 
 #include "status.h"
@@ -23,6 +23,12 @@ cStatus::~cStatus()
   statusMonitors.Del(this, false);
 }
 
+void cStatus::MsgTimerChange(const cTimer *Timer, eTimerChange Change)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->TimerChange(Timer, Change);
+}
+
 void cStatus::MsgChannelSwitch(const cDevice *Device, int ChannelNumber)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
@@ -59,6 +65,12 @@ void cStatus::MsgSetAudioChannel(int AudioChannel)
       sm->SetAudioChannel(AudioChannel);
 }
 
+void cStatus::MsgSetSubtitleTrack(int Index, const char * const *Tracks)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->SetSubtitleTrack(Index, Tracks);
+}
+
 void cStatus::MsgOsdClear(void)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
diff --git a/status.h b/status.h
index 651974418..b6c4d8b4d 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.10 2007/08/12 10:34:40 kls Exp $
+ * $Id: status.h 1.12 2008/02/16 15:00:33 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -15,11 +15,21 @@
 #include "player.h"
 #include "tools.h"
 
+enum eTimerChange { tcMod, tcAdd, tcDel };
+
+class cTimer;
+
 class cStatus : public cListObject {
 private:
   static cList<cStatus> statusMonitors;
 protected:
   // These functions can be implemented by derived classes to receive status information:
+  virtual void TimerChange(const cTimer *Timer, eTimerChange Change) {}
+               // Indicates a change in the timer settings.
+               // If Change is tcAdd or tcDel, Timer points to the timer that has
+               // been added or will be deleted, respectively. In case of tcMod,
+               // Timer is NULL; this indicates that some timer has been changed.
+               // Note that tcAdd and tcDel are always also followed by a tcMod.
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber) {}
                // Indicates a channel switch on the given DVB device.
                // If ChannelNumber is 0, this is before the channel is being switched,
@@ -44,6 +54,9 @@ class cStatus : public cListObject {
   virtual void SetAudioChannel(int AudioChannel) {}
                // The audio channel has been set to the given value.
                // 0=stereo, 1=left, 2=right, -1=no information available.
+  virtual void SetSubtitleTrack(int Index, const char * const *Tracks) {}
+               // The subtitle track has been set to the one given by Index, which
+               // points into the Tracks array of strings. Tracks is NULL terminated.
   virtual void OsdClear(void) {}
                // The OSD has been cleared.
   virtual void OsdTitle(const char *Title) {}
@@ -71,12 +84,14 @@ class cStatus : public cListObject {
   cStatus(void);
   virtual ~cStatus();
   // These functions are called whenever the related status information changes:
+  static void MsgTimerChange(const cTimer *Timer, eTimerChange Change);
   static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber);
   static void MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On);
   static void MsgReplaying(const cControl *Control, const char *Name, const char *FileName, bool On);
   static void MsgSetVolume(int Volume, bool Absolute);
   static void MsgSetAudioTrack(int Index, const char * const *Tracks);
   static void MsgSetAudioChannel(int AudioChannel);
+  static void MsgSetSubtitleTrack(int Index, const char * const *Tracks);
   static void MsgOsdClear(void);
   static void MsgOsdTitle(const char *Title);
   static void MsgOsdStatusMessage(const char *Message);
diff --git a/svdrp.c b/svdrp.c
index 2ac3a4bbd..4317535a1 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.105 2008/01/13 15:06:25 kls Exp $
+ * $Id: svdrp.c 1.109 2008/02/17 13:36:01 kls Exp $
  */
 
 #include "svdrp.h"
@@ -421,8 +421,8 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
      if (Code != 0) {
         va_list ap;
         va_start(ap, fmt);
-        char *buffer;
-        vasprintf(&buffer, fmt, ap);
+        cString buffer = cString::sprintf(fmt, ap);
+        va_end(ap);
         const char *s = buffer;
         while (s && *s) {
               const char *n = strchr(s, '\n');
@@ -435,8 +435,6 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
                  break;
               s = n ? n + 1 : NULL;
               }
-        free(buffer);
-        va_end(ap);
         }
      else {
         Reply(451, "Zero return code - looks like a programming error!");
@@ -728,7 +726,7 @@ void cSVDRP::CmdEDIT(const char *Option)
 
 void cSVDRP::CmdGRAB(const char *Option)
 {
-  char *FileName = NULL;
+  const char *FileName = NULL;
   bool Jpeg = true;
   int Quality = -1, SizeX = -1, SizeY = -1;
   if (*Option) {
@@ -797,10 +795,10 @@ void cSVDRP::CmdGRAB(const char *Option)
      char RealFileName[PATH_MAX];
      if (FileName) {
         if (grabImageDir) {
-           char *s = 0;
+           cString s;
            char *slash = strrchr(FileName, '/');
            if (!slash) {
-              asprintf(&s, "%s/%s", grabImageDir, FileName);
+              s = AddDirectory(grabImageDir, FileName);
               FileName = s;
               }
            slash = strrchr(FileName, '/'); // there definitely is one
@@ -810,12 +808,10 @@ void cSVDRP::CmdGRAB(const char *Option)
            if (!r) {
               LOG_ERROR_STR(FileName);
               Reply(501, "Invalid file name \"%s\"", FileName);
-              free(s);
               return;
               }
            strcat(RealFileName, slash);
            FileName = RealFileName;
-           free(s);
            if (strncmp(FileName, grabImageDir, strlen(grabImageDir)) != 0) {
               Reply(501, "Invalid file name \"%s\"", FileName);
               return;
@@ -1424,7 +1420,7 @@ void cSVDRP::CmdPLUG(const char *Option)
         else {
            int ReplyCode = 900;
            cString s = plugin->SVDRPCommand(cmd, option, ReplyCode);
-           if (s)
+           if (*s)
               Reply(abs(ReplyCode), "%s", *s);
            else
               Reply(500, "Command unrecognized: \"%s\"", cmd);
diff --git a/themes.c b/themes.c
index 21294c388..e6ee87e31 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.7 2007/08/05 14:11:35 kls Exp $
+ * $Id: themes.c 1.8 2008/02/10 16:25:00 kls Exp $
  */
 
 #include "themes.h"
@@ -285,18 +285,14 @@ void cThemes::SetThemesDirectory(const char *ThemesDirectory)
 
 void cThemes::Load(const char *SkinName, const char *ThemeName, cTheme *Theme)
 {
-  char *FileName = NULL;
-  asprintf(&FileName, "%s/%s-%s.theme", themesDirectory, SkinName, ThemeName);
+  cString FileName = cString::sprintf("%s/%s-%s.theme", themesDirectory, SkinName, ThemeName);
   if (access(FileName, F_OK) == 0) // the file exists
      Theme->Load(FileName);
-  free(FileName);
 }
 
 void cThemes::Save(const char *SkinName, cTheme *Theme)
 {
-  char *FileName = NULL;
-  asprintf(&FileName, "%s/%s-%s.theme", themesDirectory, SkinName, Theme->Name());
+  cString FileName = cString::sprintf("%s/%s-%s.theme", themesDirectory, SkinName, Theme->Name());
   if (access(FileName, F_OK) != 0) // the file does not exist
      Theme->Save(FileName);
-  free(FileName);
 }
diff --git a/thread.c b/thread.c
index 958312426..2d84918dd 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.63 2007/10/19 14:30:13 kls Exp $
+ * $Id: thread.c 1.64 2008/02/15 14:17:42 kls Exp $
  */
 
 #include "thread.h"
@@ -231,7 +231,7 @@ void cThread::SetDescription(const char *Description, ...)
   if (Description) {
      va_list ap;
      va_start(ap, Description);
-     vasprintf(&description, Description, ap);
+     description = strdup(cString::sprintf(Description, ap));
      va_end(ap);
      }
 }
diff --git a/timers.c b/timers.c
index f70ab9d18..c76511e8c 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.68 2007/08/04 09:23:33 kls Exp $
+ * $Id: timers.c 1.73 2008/02/16 14:47:40 kls Exp $
  */
 
 #include "timers.h"
@@ -13,13 +13,17 @@
 #include "device.h"
 #include "i18n.h"
 #include "libsi/si.h"
+#include "recording.h"
 #include "remote.h"
+#include "status.h"
+
+#define VFAT_MAX_FILENAME 40 // same as MAX_SUBTITLE_LENGTH in recording.c
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// -- cTimer -----------------------------------------------------------------
+// --- cTimer ----------------------------------------------------------------
 
 cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
 {
@@ -99,13 +103,14 @@ cTimer::~cTimer()
 cTimer& cTimer::operator= (const cTimer &Timer)
 {
   if (&Timer != this) {
+     uint OldFlags = flags & tfRecording;
      startTime    = Timer.startTime;
      stopTime     = Timer.stopTime;
      lastSetEvent = 0;
      recording    = Timer.recording;
      pending      = Timer.pending;
      inVpsMargin  = Timer.inVpsMargin;
-     flags        = Timer.flags;
+     flags        = Timer.flags | OldFlags;
      channel      = Timer.channel;
      day          = Timer.day;
      weekdays     = Timer.weekdays;
@@ -132,20 +137,17 @@ int cTimer::Compare(const cListObject &ListObject) const
   return r;
 }
 
-cString cTimer::ToText(bool UseChannelID)
+cString cTimer::ToText(bool UseChannelID) const
 {
-  char *buffer;
   strreplace(file, ':', '|');
-  asprintf(&buffer, "%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays, true), start, stop, priority, lifetime, file, aux ? aux : "");
+  cString buffer = cString::sprintf("%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays, true), start, stop, priority, lifetime, file, aux ? aux : "");
   strreplace(file, '|', ':');
-  return cString(buffer, true);
+  return buffer;
 }
 
 cString cTimer::ToDescr(void) const
 {
-  char *buffer;
-  asprintf(&buffer, "%d (%d %04d-%04d %s'%s')", Index() + 1, Channel()->Number(), start, stop, HasFlags(tfVps) ? "VPS " : "", file);
-  return cString(buffer, true);
+  return cString::sprintf("%d (%d %04d-%04d %s'%s')", Index() + 1, Channel()->Number(), start, stop, HasFlags(tfVps) ? "VPS " : "", file);
 }
 
 int cTimer::TimeToInt(int t)
@@ -287,6 +289,18 @@ bool cTimer::Parse(const char *s)
         }
      //TODO add more plausibility checks
      result = ParseDay(daybuffer, day, weekdays);
+     if (VfatFileSystem) {
+        char *p = strrchr(filebuffer, '~');
+        if (p)
+           p++;
+        else
+           p = filebuffer;
+        if (strlen(p) > VFAT_MAX_FILENAME) {
+           dsyslog("timer file name too long for VFAT file system: '%s'", p);
+           p[VFAT_MAX_FILENAME] = 0;
+           dsyslog("timer file name truncated to '%s'", p);
+           }
+        }
      Utf8Strn0Cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      if (isnumber(channelbuffer))
@@ -607,7 +621,7 @@ void cTimer::OnOff(void)
   Matches(); // refresh start and end time
 }
 
-// -- cTimers ----------------------------------------------------------------
+// --- cTimers ---------------------------------------------------------------
 
 cTimers Timers;
 
@@ -683,9 +697,28 @@ cTimer *cTimers::GetNextActiveTimer(void)
 
 void cTimers::SetModified(void)
 {
+  cStatus::MsgTimerChange(NULL, tcMod);
   state++;
 }
 
+void cTimers::Add(cTimer *Timer, cTimer *After)
+{
+  cConfig<cTimer>::Add(Timer, After);
+  cStatus::MsgTimerChange(Timer, tcAdd);
+}
+
+void cTimers::Ins(cTimer *Timer, cTimer *Before)
+{
+  cConfig<cTimer>::Ins(Timer, Before);
+  cStatus::MsgTimerChange(Timer, tcAdd);
+}
+
+void cTimers::Del(cTimer *Timer, bool DeleteObject)
+{
+  cStatus::MsgTimerChange(Timer, tcDel);
+  cConfig<cTimer>::Del(Timer, DeleteObject);
+}
+
 bool cTimers::Modified(int &State)
 {
   bool Result = state != State;
diff --git a/timers.h b/timers.h
index 64d562b06..a18f9f879 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.30 2007/06/03 13:24:58 kls Exp $
+ * $Id: timers.h 1.31 2008/02/16 14:33:23 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -38,7 +38,7 @@ class cTimer : public cListObject {
   int stop;
   int priority;
   int lifetime;
-  char file[MaxFileName];
+  mutable char file[MaxFileName];
   char *aux;
   const cEvent *event;
 public:
@@ -62,7 +62,7 @@ class cTimer : public cListObject {
   const char *File(void) const { return file; }
   time_t FirstDay(void) const { return weekdays ? day : 0; }
   const char *Aux(void) const { return aux; }
-  cString ToText(bool UseChannelID = false);
+  cString ToText(bool UseChannelID = false) const;
   cString ToDescr(void) const;
   const cEvent *Event(void) const { return event; }
   bool Parse(const char *s);
@@ -119,6 +119,9 @@ class cTimers : public cConfig<cTimer> {
       ///< Upon return the internal state will be stored in State.
   void SetEvents(void);
   void DeleteExpired(void);
+  void Add(cTimer *Timer, cTimer *After = NULL);
+  void Ins(cTimer *Timer, cTimer *Before = NULL);
+  void Del(cTimer *Timer, bool DeleteObject = true);
   };
 
 extern cTimers Timers;
diff --git a/tools.c b/tools.c
index 98d2501f0..64f4464d1 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.140 2008/01/13 11:26:30 kls Exp $
+ * $Id: tools.c 1.143 2008/02/16 13:38:22 kls Exp $
  */
 
 #include "tools.h"
@@ -267,9 +267,7 @@ bool isnumber(const char *s)
 
 cString AddDirectory(const char *DirName, const char *FileName)
 {
-  char *buf;
-  asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
-  return cString(buf, true);
+  return cString::sprintf("%s/%s", DirName && *DirName ? DirName : ".", FileName);
 }
 
 cString itoa(int n)
@@ -279,6 +277,21 @@ cString itoa(int n)
   return buf;
 }
 
+bool EntriesOnSameFileSystem(const char *File1, const char *File2)
+{
+  struct statfs statFs;
+  if (statfs(File1, &statFs) == 0) {
+     fsid_t fsid1 = statFs.f_fsid;
+     if (statfs(File2, &statFs) == 0)
+        return memcmp(&statFs.f_fsid, &fsid1, sizeof(fsid1)) == 0;
+     else
+        LOG_ERROR_STR(File2);
+     }
+  else
+     LOG_ERROR_STR(File1);
+  return false;
+}
+
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB)
 {
   if (UsedMB)
@@ -352,15 +365,14 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
            struct dirent *e;
            while ((e = d.Next()) != NULL) {
                  if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-                    char *buffer;
-                    asprintf(&buffer, "%s/%s", FileName, e->d_name);
+                    cString buffer = AddDirectory(FileName, e->d_name);
                     if (FollowSymlinks) {
                        int size = strlen(buffer) * 2; // should be large enough
                        char *l = MALLOC(char, size);
                        int n = readlink(buffer, l, size);
                        if (n < 0) {
                           if (errno != EINVAL)
-                             LOG_ERROR_STR(buffer);
+                             LOG_ERROR_STR(*buffer);
                           }
                        else if (n < size) {
                           l[n] = 0;
@@ -372,10 +384,9 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                           esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
                        free(l);
                        }
-                    dsyslog("removing %s", buffer);
+                    dsyslog("removing %s", *buffer);
                     if (remove(buffer) < 0)
-                       LOG_ERROR_STR(buffer);
-                    free(buffer);
+                       LOG_ERROR_STR(*buffer);
                     }
                  }
            }
@@ -405,8 +416,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
      struct dirent *e;
      while ((e = d.Next()) != NULL) {
            if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..") && strcmp(e->d_name, "lost+found")) {
-              char *buffer;
-              asprintf(&buffer, "%s/%s", DirName, e->d_name);
+              cString buffer = AddDirectory(DirName, e->d_name);
               struct stat st;
               if (stat(buffer, &st) == 0) {
                  if (S_ISDIR(st.st_mode)) {
@@ -417,10 +427,9 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
                     empty = false;
                  }
               else {
-                 LOG_ERROR_STR(buffer);
+                 LOG_ERROR_STR(*buffer);
                  empty = false;
                  }
-              free(buffer);
               }
            }
      if (RemoveThis && empty) {
@@ -445,8 +454,7 @@ int DirSizeMB(const char *DirName)
      struct dirent *e;
      while (size >= 0 && (e = d.Next()) != NULL) {
            if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-              char *buffer;
-              asprintf(&buffer, "%s/%s", DirName, e->d_name);
+              cString buffer = AddDirectory(DirName, e->d_name);
               struct stat st;
               if (stat(buffer, &st) == 0) {
                  if (S_ISDIR(st.st_mode)) {
@@ -460,10 +468,9 @@ int DirSizeMB(const char *DirName)
                     size += st.st_size / MEGABYTE(1);
                  }
               else {
-                 LOG_ERROR_STR(buffer);
+                 LOG_ERROR_STR(*buffer);
                  size = -1;
                  }
-              free(buffer);
               }
            }
      return size;
@@ -489,13 +496,12 @@ char *ReadLink(const char *FileName)
 
 bool SpinUpDisk(const char *FileName)
 {
-  char *buf = NULL;
   for (int n = 0; n < 10; n++) {
-      free(buf);
+      cString buf;
       if (DirectoryOk(FileName))
-         asprintf(&buf, "%s/vdr-%06d", *FileName ? FileName : ".", n);
+         buf = cString::sprintf("%s/vdr-%06d", *FileName ? FileName : ".", n);
       else
-         asprintf(&buf, "%s.vdr-%06d", FileName, n);
+         buf = cString::sprintf("%s.vdr-%06d", FileName, n);
       if (access(buf, F_OK) != 0) { // the file does not exist
          timeval tp1, tp2;
          gettimeofday(&tp1, NULL);
@@ -503,21 +509,19 @@ bool SpinUpDisk(const char *FileName)
          // O_SYNC doesn't work on all file systems
          if (f >= 0) {
             if (fdatasync(f) < 0)
-               LOG_ERROR_STR(buf);
+               LOG_ERROR_STR(*buf);
             close(f);
             remove(buf);
             gettimeofday(&tp2, NULL);
             double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0;
             if (seconds > 0.5)
                dsyslog("SpinUpDisk took %.2f seconds", seconds);
-            free(buf);
             return true;
             }
          else
-            LOG_ERROR_STR(buf);
+            LOG_ERROR_STR(*buf);
          }
       }
-  free(buf);
   esyslog("ERROR: SpinUpDisk failed");
   return false;
 }
@@ -888,7 +892,21 @@ cString cString::sprintf(const char *fmt, ...)
   va_list ap;
   va_start(ap, fmt);
   char *buffer;
-  vasprintf(&buffer, fmt, ap);
+  if (!fmt || vasprintf(&buffer, fmt, ap) < 0) {
+     esyslog("error in vasprintf('%s', ...)", fmt);
+     buffer = strdup("???");
+     }
+  va_end(ap);
+  return cString(buffer, true);
+}
+
+cString cString::sprintf(const char *fmt, va_list &ap)
+{
+  char *buffer;
+  if (!fmt || vasprintf(&buffer, fmt, ap) < 0) {
+     esyslog("error in vasprintf('%s', ...)", fmt);
+     buffer = strdup("???");
+     }
   return cString(buffer, true);
 }
 
@@ -1241,8 +1259,8 @@ bool cFileNameList::Load(const char *Directory, bool DirsOnly)
               if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
                  if (DirsOnly) {
                     struct stat ds;
-                    if (stat(e->d_name, &ds) == 0) {
-                       if (S_ISDIR(ds.st_mode))
+                    if (stat(AddDirectory(Directory, e->d_name), &ds) == 0) {
+                       if (!S_ISDIR(ds.st_mode))
                           continue;
                        }
                     }
@@ -1622,7 +1640,7 @@ cLockFile::cLockFile(const char *Directory)
   fileName = NULL;
   f = -1;
   if (DirectoryOk(Directory))
-     asprintf(&fileName, "%s/%s", Directory, LOCKFILENAME);
+     fileName = strdup(AddDirectory(Directory, LOCKFILENAME));
 }
 
 cLockFile::~cLockFile()
diff --git a/tools.h b/tools.h
index 3c804b521..6a1077469 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.110 2008/01/13 11:22:26 kls Exp $
+ * $Id: tools.h 1.113 2008/02/17 13:41:27 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -156,11 +156,13 @@ class cString {
   cString(const char *S = NULL, bool TakePointer = false);
   cString(const cString &String);
   virtual ~cString();
+  operator const void * () const { return s; } // to catch cases where operator*() should be used
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
   cString &operator=(const cString &String);
   cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string).
   static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+  static cString sprintf(const char *fmt, va_list &ap);
   };
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);
@@ -192,6 +194,7 @@ int numdigits(int n);
 bool isnumber(const char *s);
 cString itoa(int n);
 cString AddDirectory(const char *DirName, const char *FileName);
+bool EntriesOnSameFileSystem(const char *File1, const char *File2);
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
diff --git a/vdr.1 b/vdr.1
index 1fa653928..67348d3a5 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2006 Klaus Schmidinger
+.\" Copyright (C) 2008 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.29 2007/02/24 17:40:20 kls Exp $
+.\" $Id: vdr.1 1.32 2008/02/10 14:23:12 kls Exp $
 .\"
-.TH vdr 1 "07 Jan 2007" "1.4.5" "Video Disk Recorder"
+.TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -88,6 +88,9 @@ Each of them will apply to the \fB\-P\fR options following it.
 Use a LIRC remote control device.
 If \fIpath\fR is omitted, vdr uses \fI/dev/lircd\fR.
 .TP
+.BI \-\-localedir= dir
+Search for locale files in \fIdir\fR (default is ./locale).
+.TP
 .B \-m, \-\-mute
 Mute audio of the primary DVB device at startup.
 .TP
@@ -139,6 +142,9 @@ be set from the transponder data, but for security reasons
 vdr can switch to a lesser privileged user id during normal
 operation.
 .TP
+.BI \-\-userdump
+allow coredumps if -u is given (only for debugging).
+.TP
 .BI \-\-vfat
 Encode special characters in recording names to avoid problems
 with VFAT file systems.
@@ -226,7 +232,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2006 Klaus Schmidinger.
+Copyright \(co 2008 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index 3c836104e..bec9d5d36 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2006 Klaus Schmidinger
+.\" Copyright (C) 2008 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.65 2008/01/26 14:16:51 kls Exp $
+.\" $Id: vdr.5 1.67 2008/02/10 14:25:07 kls Exp $
 .\"
-.TH vdr 5 "07 Jan 2007" "1.4.5" "Video Disk Recorder Files"
+.TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -83,23 +83,19 @@ meaning (and allowed values) are
 .TS
 tab (@);
 l l.
-\fBA\fR@Alpha (0, 1, 2, 4)
-\fBB\fR@Bandwidth (5, 6, 7, 8)
-\fBC\fR@Code rate high priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
-\fBD\fR@coDe rate low priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
+\fBB\fR@Bandwidth (6, 7, 8)
+\fBC\fR@Code rate high priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
+\fBD\fR@Code rate low priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
-\fBM\fR@Modulation (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 32, 64, 128, 256, 512, 998, 1024)
-\fBO\fR@rollOff (0, 20, 25, 35)
-\fBP\fR@Priority (0, 1)
+\fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
 \fBR\fR@Right circular polarization
-\fBT\fR@Transmission mode (2, 4, 8)
+\fBT\fR@Transmission mode (2, 8)
 \fBV\fR@Vertical polarization
-\fBY\fR@hierarchY (0, 1)
+\fBY\fR@Hierarchy (0, 1, 2, 4)
 .TE
-
 The polarization parameters have no integer numbers following them. This is for
 compatibility with files from older versions and also to keep the DVB-S entries
 as simple as possible.
@@ -673,7 +669,7 @@ Written by Klaus Schmidinger.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2006 Klaus Schmidinger.
+Copyright \(co 2008 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index 2ad39733a..9f8dcdcda 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1,7 +1,7 @@
 /*
  * vdr.c: Video Disk Recorder main program
  *
- * Copyright (C) 2000, 2003, 2006 Klaus Schmidinger
+ * Copyright (C) 2000, 2003, 2006, 2008 Klaus Schmidinger
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.307 2008/01/27 14:38:45 kls Exp $
+ * $Id: vdr.c 1.310 2008/02/10 14:23:31 kls Exp $
  */
 
 #include <getopt.h>
@@ -86,7 +86,7 @@
 
 static int LastSignal = 0;
 
-static bool SetUser(const char *UserName)
+static bool SetUser(const char *UserName, bool UserDump)//XXX name?
 {
   if (UserName) {
      struct passwd *user = getpwnam(UserName);
@@ -106,10 +106,8 @@ static bool SetUser(const char *UserName)
         fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
         return false;
         }
-     if (prctl(PR_SET_DUMPABLE, 2, 0, 0, 0) < 0) {
+     if (UserDump && prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0)
         fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
-        // always non-fatal, and will not work with kernel < 2.6.13
-        }
      }
   return true;
 }
@@ -187,6 +185,7 @@ int main(int argc, char *argv[])
 
   bool StartedAsRoot = false;
   const char *VdrUser = NULL;
+  bool UserDump = false;
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *AudioCommand = NULL;
   const char *ConfigDirectory = NULL;
@@ -241,6 +240,7 @@ int main(int argc, char *argv[])
       { "shutdown", required_argument, NULL, 's' },
       { "terminal", required_argument, NULL, 't' },
       { "user",     required_argument, NULL, 'u' },
+      { "userdump", no_argument,       NULL, 'u' | 0x100 },
       { "version",  no_argument,       NULL, 'V' },
       { "vfat",     no_argument,       NULL, 'v' | 0x100 },
       { "video",    required_argument, NULL, 'v' },
@@ -346,6 +346,9 @@ int main(int argc, char *argv[])
           case 'u': if (*optarg)
                        VdrUser = optarg;
                     break;
+          case 'u' | 0x100:
+                    UserDump = true;
+                    break;
           case 'V': DisplayVersion = true;
                     break;
           case 'v' | 0x100:
@@ -376,7 +379,7 @@ int main(int argc, char *argv[])
      if (strcmp(VdrUser, "root")) {
         if (!SetKeepCaps(true))
            return 2;
-        if (!SetUser(VdrUser))
+        if (!SetUser(VdrUser, UserDump))
            return 2;
         if (!SetKeepCaps(false))
            return 2;
@@ -431,6 +434,7 @@ int main(int argc, char *argv[])
                "  -t TTY,   --terminal=TTY controlling tty\n"
                "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
                "                           root\n"
+               "            --userdump     allow coredumps if -u is given (debugging)\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
                "            --vfat         encode special characters in recording names to\n"
@@ -874,7 +878,7 @@ int main(int argc, char *argv[])
                         if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
                            // the previous SwitchChannel() has switched away the current live channel
                            Channels.SwitchTo(Timer->Channel()->Number()); // avoids toggling between old channel and black screen
-                           Skins.Message(mtInfo, tr("Upcoming VPS recording!"));
+                           Skins.Message(mtInfo, tr("Upcoming recording!"));
                            }
                         }
                      }
diff --git a/videodir.c b/videodir.c
index a07ed28eb..e61e3cbc7 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.14 2005/12/18 10:33:20 kls Exp $
+ * $Id: videodir.c 1.15 2008/02/16 13:00:03 kls Exp $
  */
 
 #include "videodir.h"
@@ -232,3 +232,12 @@ void RemoveEmptyVideoDirectories(void)
      } while (Dir.Next());
 }
 
+bool IsOnVideoDirectoryFileSystem(const char *FileName)
+{
+  cVideoDirectory Dir;
+  do {
+     if (EntriesOnSameFileSystem(Dir.Name(), FileName))
+        return true;
+     } while (Dir.Next());
+  return false;
+}
diff --git a/videodir.h b/videodir.h
index 6dd2d8c1f..253e07b03 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.6 2005/10/31 11:50:23 kls Exp $
+ * $Id: videodir.h 1.7 2008/02/16 12:53:11 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -23,5 +23,6 @@ bool VideoFileSpaceAvailable(int SizeMB);
 int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
 cString PrefixVideoFileName(const char *FileName, char Prefix);
 void RemoveEmptyVideoDirectories(void);
+bool IsOnVideoDirectoryFileSystem(const char *FileName);
 
 #endif //__VIDEODIR_H

From 83d7a4b7838a8209c05c53b5e625bf965d3bf585 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 24 Feb 2008 18:00:00 +0100
Subject: [PATCH 182/307] =?UTF-8?q?Version=201.5.16=20-=20Fixed=20setting?=
 =?UTF-8?q?=20the=20current=20subtitle=20track=20in=20Transfer-Mode=20(rep?=
 =?UTF-8?q?orted=20by=20Petri=20Helin,=20=20=20thanks=20to=20Reinhard=20Ni?=
 =?UTF-8?q?ssl=20for=20pointing=20out=20that=20cDevice::Transferring()=20d?=
 =?UTF-8?q?oesn't=20=20=20return=20the=20right=20value=20in=20the=20early?=
 =?UTF-8?q?=20stage=20of=20channel=20switching).=20-=20Updated=20the=20Dan?=
 =?UTF-8?q?ish=20OSD=20texts=20(thanks=20to=20Mogens=20Elneff).=20-=20Upda?=
 =?UTF-8?q?ted=20the=20Dutch=20OSD=20texts=20(thanks=20to=20Carel=20Willem?=
 =?UTF-8?q?se).=20-=20Fixed=20various=20spelling=20errors=20and=20improved?=
 =?UTF-8?q?=20PLUGINS.html=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Up?=
 =?UTF-8?q?dated=20the=20Italian=20OSD=20texts=20(thanks=20to=20Diego=20Pi?=
 =?UTF-8?q?erotto).=20-=20Fixed=20the=20format=20in=20cRemote::Put()=20to?=
 =?UTF-8?q?=20use=20"%016llX"=20instead=20of=20"%016LX"=20(thanks=20=20=20?=
 =?UTF-8?q?to=20Ludwig=20Nussel=20for=20pointing=20this=20out).=20-=20Revi?=
 =?UTF-8?q?sed=20the=20fix=20of=20calculating=20the=20scrollbar=20height?=
 =?UTF-8?q?=20in=20the=20skins.=20The=20scrollbar=20=20=20handle=20now=20a?=
 =?UTF-8?q?lways=20has=20a=20height=20that=20is=20at=20least=20the=20width?=
 =?UTF-8?q?=20of=20the=20scrollbar.=20-=20When=20switching=20the=20device?=
 =?UTF-8?q?=20that's=20used=20for=20live=20viewing=20away=20from=20the=20c?=
 =?UTF-8?q?urrent=20=20=20transponder=20in=20favor=20of=20an=20upcoming=20?=
 =?UTF-8?q?recording,=20an=20attempt=20is=20now=20made=20to=20stay=20=20?=
 =?UTF-8?q?=20on=20the=20current=20channel=20by=20possibly=20going=20into?=
 =?UTF-8?q?=20'Transfer=20Mode'.=20-=20The=20CAM=20menu=20now=20stays=20op?=
 =?UTF-8?q?en=20as=20long=20as=20it=20is=20automatically=20updated,=20even?=
 =?UTF-8?q?=20without=20=20=20pressing=20a=20remote=20control=20key.=20Thi?=
 =?UTF-8?q?s=20is=20important=20when=20updating=20the=20CAM=20firmware=20?=
 =?UTF-8?q?=20=20from=20the=20transponder.=20-=20No=20longer=20trying=20to?=
 =?UTF-8?q?=20switch=20to=20an=20available=20channel=20if=20the=20primary?=
 =?UTF-8?q?=20device=20has=20=20=20no=20valid=20programme=20and=20a=20menu?=
 =?UTF-8?q?=20is=20open=20(avoids=20interference=20with=20the=20CAM=20in?=
 =?UTF-8?q?=20=20=20case=20a=20CAM=20menu=20is=20open).=20-=20Increased=20?=
 =?UTF-8?q?the=20valid=20range=20of=20the=20"Subtitle=20offset"=20setup=20?=
 =?UTF-8?q?option=20to=20-100...100=20=20=20(thanks=20to=20Rolf=20Ahrenber?=
 =?UTF-8?q?g).=20-=20Added=20the=20backslash=20('\')=20to=20the=20list=20o?=
 =?UTF-8?q?f=20characters=20that=20need=20to=20be=20escaped=20=20=20when?=
 =?UTF-8?q?=20executing=20external=20commands=20(thanks=20to=20Peter=20Bie?=
 =?UTF-8?q?ringer=20for=20reporting=20this=20one).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |  27 +-
 HISTORY                             |  85 ++++---
 MANUAL                              |   4 +-
 PLUGINS.html                        | 378 +++++++++++++++-------------
 PLUGINS/src/skincurses/HISTORY      |   5 +
 PLUGINS/src/skincurses/skincurses.c |  15 +-
 config.h                            |   6 +-
 device.c                            |   9 +-
 device.h                            |   6 +-
 menu.c                              |   7 +-
 po/da_DK.po                         |  84 +++----
 po/it_IT.po                         |  76 +++---
 po/nl_NL.po                         | 151 +++++------
 recording.c                         |   4 +-
 remote.c                            |  11 +-
 remote.h                            |   5 +-
 shutdown.c                          |   4 +-
 skinclassic.c                       |  13 +-
 skinsttng.c                         |  13 +-
 vdr.c                               |   8 +-
 20 files changed, 499 insertions(+), 412 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 580331b4f..85902fd93 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -122,7 +122,7 @@ Henning Holtschneider <hh@holtschneider.com>
  for pointing out a possible hangup when reading a broken epg.data file
 
 Paulo Lopes <pmml@netvita.pt>
- for translating OSD texts to the Portugese language
+ for translating OSD texts to the Portuguese language
 
 Markus Lang <pretender@gaze.de> and Ulrich R�der <dynamite@efr-net.de>
  for making DiSEqC support configurable
@@ -186,7 +186,7 @@ Stefan Huelswitt <huels@iname.com>
  for reporting a bug in handling of Ca parameters with values <= MAXDEVICES, which
  don't indicate an actual encrypted channel
  for implementing setting the "broken link" flag for GOPs at the beginning of a new
- video sequence, which avoids artefacts when cutting
+ video sequence, which avoids artifacts when cutting
  for suggesting to add VDRVERSNUM to config.h
  for fixing a memory leak in cNonBlockingFileReader
  for fixing an uninitialized variable in cDisplayChannel
@@ -899,6 +899,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for pointing out that the canonical spelling of codesets is with '-'
  for a hint on using _nl_msg_cat_cntr
  for adding some missing 'const' keywords
+ for pointing out that "%016llX" should be used instead of "%016LX"
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -1043,6 +1044,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for suggesting to limit the length of the recording name in timers created via
  SVDRP in case VDR is run with --vfat, in order to avoid names that are too long
  for Windows
+ for increasing the valid range of the "Subtitle offset" setup option to -100...100
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1060,6 +1062,8 @@ Peter Bieringer <pb@bieringer.de>
  for adding more error messages and line numbers when reading EPG data and info.vdr
  for fixing handling "more than 3 byte" key sequences in cKbdRemote::ReadKeySequence()
  for suggesting to ignore lines tagged with '#' in the 'info.vdr' file of a recording
+ for reporting a problem with the backslash ('\') in parameters when executing
+ external commands
 
 Alexander Damhuis <ad@phonedation.de>
  for reporting problems when deleting a timer that is currently recording
@@ -1082,7 +1086,7 @@ Thomas Schmidt <tschmidt@debian.org>
  for reporting a crash when canceling a newly created timer
  for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated
  for making VDR use the default configuration directory as defined in the CONFDIR
- varable in the Makefile
+ variable in the Makefile
 
 Michael Walle <michael.walle@web.de>
  for reporting a bug in channel switching after Left/Right has been pressed
@@ -1163,6 +1167,8 @@ Reinhard Nissl <rnissl@gmx.de>
  to be displayed late in live mode
  for a patch that was used to implement handling of DVB-S2
  for reporting an invalid access in the section handler when ending VDR
+ for pointing out that cDevice::Transferring() doesn't return the right value in the
+ early stage of channel switching
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1350,7 +1356,7 @@ Wayne Keer <syphir@syphir.sytes.net>
  for reporting a spelling error in 'canceling'
  for adding some 'mkdir -p' to the Makefile's 'install' target
  for reporting some missing braces in remux.c
- for suggesting to modifiy the Makefile to copy and clean up additional libraries
+ for suggesting to modify the Makefile to copy and clean up additional libraries
  a plugin might provide
 
 Marco Schl��ler <marco@lordzodiac.de>
@@ -1449,7 +1455,7 @@ Marco Schl
  for fixing selecting the audio track when pressing Ok in the Audio menu
  for implementing handling DVB subtitles
  for fixing the description of DeviceSetAvailableTrack() and cReceiver(), and adding
- an example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schl��ler).
+ an example ~cMyReceiver() in PLUGINS.html
  for fixing checking compatibility mode for old subtitles plugin
  for a patch that was used to implement handling of DVB-S2
  for fixing setting the date in the channel display of the classic and sttng skins,
@@ -1750,6 +1756,7 @@ Ville Skytt
  for making the "Play" key start replay of the selected recording in the Recordings
  menu
  for adding missing #include <limits.h> to epg.c and menuitems.h
+ for fixing various spelling errors and improving PLUGINS.html
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1884,7 +1891,7 @@ Philip Prindeville <philipp_subx@redfish-solutions.com>
 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
  for making VDR use use daemon() instead of fork() to run in daemon mode
  for fixing a possible endless loop in a menu with no selectable items if
- Setup.MenuScrollWrap is true (thanks to Enrico Scholz)
+ Setup.MenuScrollWrap is true
 
 Nicolas Huillard <nhuillard@e-dition.fr>
  for translating OSD texts to the French language
@@ -2132,7 +2139,7 @@ Prakash Punnoor <prakash@punnoor.de>
 Anssi Hannula <anssi.hannula@gmail.com>
  for a patch that was used to implement processing the "frequency list descriptor"
  for suggesting that cDevice::GetDevice() should prefer any device that's already
- receiving and doesn't require detatching receivers
+ receiving and doesn't require detaching receivers
  for improving handling Transfer Mode devices when selecting a device to receive
  for fixing handling frequencies in NitFilter::Process()
  for making non-primary devices in Transfer mode be also used for recording
@@ -2202,11 +2209,12 @@ J
  for reporting that cPlugin::Active() was called too often
 
 Peter Pinnau <vdr@unterbrecher.de>
- for reporting that 'uint32_t' requires uncluding stdint.h in font.h on some systems
+ for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
 
 Petri Helin <phelin@googlemail.com>
  for suggesting to avoid budget DVB cards with Common Interface when tuning to an
  FTA channel
+ for reporting a bug in setting the current subtitle track in Transfer-Mode
 
 Oktay Yolge�en <oktay_73@yahoo.de>
  for translating OSD texts to the Turkish language
@@ -2299,3 +2307,6 @@ Mikko Matilainen <mikkom@iki.fi>
 Benedikt Elser <elser@in.tum.de>
  for a patch that was used to add cStatus::TimerChange() to inform plugins about
  changes to the list of timers
+
+Carel Willemse <ca_willemse@planet.nl>
+ for translating OSD texts to the Dutch language
diff --git a/HISTORY b/HISTORY
index 8e2abc86a..56ff6fa49 100644
--- a/HISTORY
+++ b/HISTORY
@@ -247,10 +247,10 @@ Video Disk Recorder Revision History
 2000-11-01: Version 0.67
 
 - The EIT information is now gathered in a separate thread.
-- The sytem time can now be synchronized to the time broadcast in the DVB data
+- The system time can now be synchronized to the time broadcast in the DVB data
   stream. This can be enabled in the "Setup" menu by setting "SetSystemTime" to
   1.  Note that this works only if VDR is running under a user ID that has
-  permisson to set the system time.
+  permission to set the system time.
 - The new item "Schedule" in the "Main" menu opens VDR's EPG (thanks to Robert
   Schneider). See the MANUAL file for a detailed description.
 - The new setup parameters MarginStart and MarginStop define how long (in
@@ -640,7 +640,7 @@ Video Disk Recorder Revision History
 - The new command line option '-E' can be used to define where the EPG data
   shall be written to. This is especially useful if VDR runs in a system
   that turns off the video disk when it is not used, and therefore needs
-  to write the EPG file to a ramdisk (or turn off writing it alltogether).
+  to write the EPG file to a ramdisk (or turn off writing it altogether).
   See 'vdr --help' for details.
 - Making sure the disk is up and running before starting recording (this
   is important for systems that turn off the video disk when it is not used).
@@ -776,7 +776,7 @@ Video Disk Recorder Revision History
   set to INVERSION_AUTO, which should work with all channels on Astra).
 - Removing unnecessary double quotes from EPG Subtitle in EPGBugfixLevel >=1.
 - EPG info is now updated if the contents changes but the ID remains the same.
-- Fixed handling SVDRP commands whith more than one blank between the command
+- Fixed handling SVDRP commands with more than one blank between the command
   word and the options.
 - The current volume setting is now saved to setup.conf and restored at the
   next program start.
@@ -907,7 +907,7 @@ Video Disk Recorder Revision History
   in the call to the shutdown command (option '-s') and the recording command
   (option '-r').
 - Improved error handling in the editing process; the resulting file will be
-  deleted if an error occured.
+  deleted if an error occurred.
 - A message is now prompted at the end of the editing process, indicating
   whether the process succeeded or failed.
 - Fixed setting the LastActivity timestamp after a shutdown prompt (thanks to
@@ -1058,7 +1058,7 @@ Video Disk Recorder Revision History
 - Changed the meaning of the 'Ca' parameter in 'channels.conf'. Each channel can
   now define which decryption method it needs in order to be accessed. The new
   configuration file 'ca.conf' contains the defined values, and the default
-  'channels.conf' has been modifed to contain the new values for 'Premiere World'
+  'channels.conf' has been modified to contain the new values for 'Premiere World'
   and 'ORF'. If you use the default 'channels.conf' and have the conditional
   access hardware to receive encrypted channels, please make sure you copy the
   file 'ca.conf' into your /video directory (or wherever your configuration files
@@ -1369,7 +1369,7 @@ Video Disk Recorder Revision History
   cPlayer and cControl have been given the functions GetIndex() and GetReplayMode() to
   allow access to the player's status.
 - Added cOsd::OpenRaw() to create a raw OSD (needed for displaying SPUs).
-- Changed the symantics of the Name parameter in cStatus::Recording() and
+- Changed the semantics of the Name parameter in cStatus::Recording() and
   cStatus::Replaying(). It is no longer the full directory name of the recording,
   but rather just the basic name. This has been changed to allow players that can't
   provide a name to simply use a string that describes the player type (like, e.g.,
@@ -1661,7 +1661,7 @@ Video Disk Recorder Revision History
 - Implemented new keys to directly access the VDR main menu functions "Schedule",
   "Channels", "Timers", "Recordings", "Setup" and "Commands". If your remote
   control provides keys you want to assign these functions to, you can delete
-  your 'remote.cof' file and restart VDR to  go through the key learning procedure
+  your 'remote.conf' file and restart VDR to  go through the key learning procedure
   again in order to assign these new keys. See MANUAL for more information.
 - The new configuration file 'keymacros.conf' can be used to assign macros to
   the color buttons in normal viewing mode, as well as to up to 9 user defined
@@ -1905,7 +1905,7 @@ Video Disk Recorder Revision History
 - Fixed handling channels in the "Channels" menu in case there are ':@nnn' group
   separators without names (thanks to Guy Roussin for reporting this one).
 - The SVDRP command CHAN now also accepts channel IDs.
-- Increased the timeout until an index file is considerd no longer to be written
+- Increased the timeout until an index file is considered no longer to be written
   (sometimes in time shift with heavy system load the index file was closed too
   early by the replay thread).
 - Implemented "Link Layer" based CAM support, which hopefully will solve the
@@ -2006,7 +2006,7 @@ Video Disk Recorder Revision History
 - Added some missing cAudio handling calls (thanks to Werner Fink).
 - Replaced the 'for' loops in StripAudioPackets() with memset() calls (thanks to
   Werner Fink).
-- Further increased the timeout until an index file is considerd no longer to be
+- Further increased the timeout until an index file is considered no longer to be
   written.
 - Fixed a crash in case the index file can't be accessed any more during replay
   (thanks to Stefan Huelswitt for reporting this one).
@@ -2068,7 +2068,7 @@ Video Disk Recorder Revision History
 - Fixed deleting the last recording in the "Recordings" menu, which started pausing
   live video (thanks to Christoph Friederich for reporting this one).
 - Now setting the "broken link" flag for GOPs at the beginning of a new video
-  sequence, which avoids artefacts when cutting (thanks to Stefan Huelswitt).
+  sequence, which avoids artifacts when cutting (thanks to Stefan Huelswitt).
 - Removed the Mute() call from cDvbDevice::StillPicture() (suggested by Andreas
   Schultz).
 - Updated 'channels.conf.terr' for Berlin (thanks to Andreas Brachold).
@@ -2136,7 +2136,7 @@ Video Disk Recorder Revision History
 - Updated 'channels.conf.terr' for Berlin (thanks to Juri Haberland).
 - Avoiding short display of the "Main" menu when pressing the "Recordings" button
   or the "Back" button during replay.
-- Further increased the timeout until an index file is considerd no longer to be
+- Further increased the timeout until an index file is considered no longer to be
   written.
 - Implemented separate PausePriority and PauseLifetime parameters for the recordings
   created when pausing live video (suggested by Alfred Zastrow).
@@ -2168,7 +2168,7 @@ Video Disk Recorder Revision History
 - Updated 'channels.conf.cable' (thanks to Stefan Hu�feldt).
 - Fixed reading 'epg.data' for channels with non-zero RID (thanks to Oliver
   Endriss for reporting this one).
-- Fixed EPG bugfix statistics to avoid log entires for undefined channels (thanks
+- Fixed EPG bugfix statistics to avoid log entries for undefined channels (thanks
   to Lars Bl�ser for reporting this one).
 - No longer waiting inside cIndexFile::CatchUp() to avoid shortly blocking replay
   at the end of a recording.
@@ -2218,7 +2218,7 @@ Video Disk Recorder Revision History
   Ahrenberg).
 - Completed the Italian OSD texts (thanks to Antonio Ospite).
 - Fixed breaking off replay in case the user hits "Play" or "Pause" too soon after
-  going into "Pause live video" mode (thanks to Karim Afifi for reporting ths one).
+  going into "Pause live video" mode (thanks to Karim Afifi for reporting this one).
 - Some corrections to the Catalanian OSD texts (thanks to Jordi Vil�).
 - Single event timers are now deleted if the recording they are doing is
   deleted before the timer ends.
@@ -2247,7 +2247,7 @@ Video Disk Recorder Revision History
   Josten).
 - Fixed device handling in the CICAM menu in case a VDR instance was started
   with a specific device using the -D option (thanks to Gerald Raaf for reporting
-  ths one).
+  this one).
 - Initializing the current channel to '1' to avoid a crash in creating a new
   timer in case there is no device in the system that can actually receive any
   channel (thanks to Malcolm Caldwell for reporting this one).
@@ -2448,7 +2448,7 @@ Video Disk Recorder Revision History
 2003-10-26: Version 1.2.6pre4
 
 - Fixed handling CAM menus in case the CAM connection fails while the menu
-  is being presented (thanks to Thomas v. Keller for reportign this one).
+  is being presented (thanks to Thomas v. Keller for reporting this one).
 - Added missing 'const' to some cChannel member functions (thanks to Torsten
   Herz).
 
@@ -2668,7 +2668,7 @@ Video Disk Recorder Revision History
   recording exceeds 10 (suggested by Gregoire Favre). Since the UPT error doesn't
   happen on my system, this has not been explicitly tested.
   The "preliminary fix" for the UPT error in VDR/dvbdevice.c has been disabled
-  by default, since it makes channel switching unpleasently slow. If you want
+  by default, since it makes channel switching unpleasantly slow. If you want
   to have that workaround back, you can uncomment the line
   //#define WAIT_FOR_LOCK_AFTER_TUNING 1
   in VDR/dvbdevice.c.
@@ -2815,7 +2815,7 @@ Video Disk Recorder Revision History
 - Added a hint to PLUGINS.html about how to name a plugin that implements a skin.
 - Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Single shot timers and events now show the day of week (adopted with some changes
-  from the "elchi" patch, orginally introduced by Oskar Signell). Plugins that use
+  from the "elchi" patch, originally introduced by Oskar Signell). Plugins that use
   cEvent::GetDateString() should note that this function now returns a longer
   string, including the day of week. The new function const char *WeekDayName(time_t t)
   can be called with a time_t value to get the day of week for that time.
@@ -3267,7 +3267,7 @@ Video Disk Recorder Revision History
 - Skins need to implement the new cSkinDisplayTrack class to display the audio
   track menu.
 - The ST:TNG skin now displays the current audio track description (if any) at the
-  botton left side.
+  bottom left side.
 - The new setup option "DVB/Audio languages" can be used to control which audio
   language shall be selected in case a channel broadcasts in different languages
   (see MANUAL for details).
@@ -3959,7 +3959,7 @@ Video Disk Recorder Revision History
   (thanks to Holger Brunn).
 - The new function Skins.QueueMessage() can be called from a background thread
   to queue a message for display. See VDR/skins.h for details.
-- The SVDRP command MESG uses the new message queueing facility, so MESG
+- The SVDRP command MESG uses the new message queuing facility, so MESG
   commands may now be executed at any time, and the message will be displayed
   (no more "pending message").
 
@@ -4483,7 +4483,7 @@ Video Disk Recorder Revision History
 - Fixed a typo in skins.h (thanks to Alexander Rieger).
 - cSkins::QueueMessage() called from a background thread with an empty message
   now clears all messages that have been previously queued by that thread and have
-  not yet beed displayed (thanks to Alexander Rieger).
+  not yet been displayed (thanks to Alexander Rieger).
 - Fixed handling the color button texts when switching from the 'Schedule' menu of
   a channel without EPG info to the 'What's on now' menu (reported by Rolf
   Ahrenberg).
@@ -4736,7 +4736,7 @@ Video Disk Recorder Revision History
 - Fixed handling VPS timers in case the EPG event hasn't been 'seen' in a while.
 - Fixed calculating the cache size in cUnbufferedFile::Read() (thanks to Artur Skawina).
 - Removed -fPIC from VDR's and libsi's Makefile (suggested by Prakash Punnoor).
-- Modifed the device selection to better handle timer conflicts (reported by
+- Modified the device selection to better handle timer conflicts (reported by
   Christian Wieninger).
 - Avoiding a compiler warning in libsi's TypeLoop::operator[].
 - Now processing the "frequency list descriptor" (based on a patch from Anssi Hannula).
@@ -4827,7 +4827,7 @@ Video Disk Recorder Revision History
 - Fixed handling client side termination of SVDRP connections (thanks to Frank
   Schmirler).
 - cDevice::GetDevice() now prefers any device that's already receiving and doesn't
-  require detatching receivers (suggested by Anssi Hannula).
+  require detaching receivers (suggested by Anssi Hannula).
 - Fixed handling numeric keys in the channel display after switching channel groups
   (thanks to Andreas Regel).
 - Menu items derived from cMenuEditIntItem now loop though their values if they
@@ -4893,7 +4893,7 @@ Video Disk Recorder Revision History
 
 - Revoked the change to cDevice::GetDevice() that was introduced in version 1.4.1-2,
   which made it prefer any device that's already receiving and doesn't require
-  detatching receivers. This change has caused some unwanted behavior, so further
+  detaching receivers. This change has caused some unwanted behavior, so further
   testing is necessary.
 
 2006-09-03: Version 1.4.2-1
@@ -5041,7 +5041,7 @@ Video Disk Recorder Revision History
   decrypting the current channel again.
 - The Setup/CAM menu now dynamically refreshes its items and displays whether
   a CAM is present or ready. The 'Reset' function no longer leaves the menu.
-- The CAM menu will now be openend when pressing the Ok key on a slot entry.
+- The CAM menu will now be opened when pressing the Ok key on a slot entry.
 - The CAM menu now stays within the current menu context and doesn't close and
   reopen the menu every time an option is selected.
 - When an encrypted channel is switched to for the first time, VDR now checks
@@ -5400,7 +5400,7 @@ Video Disk Recorder Revision History
   texts they want to reuse from VDR's core translations (suggested by Matthias
   Becker).
 - VDR now uses the default configuration directory as defined in the CONFDIR
-  varable in the Makefile (thanks to Thomas Schmidt).
+  variable in the Makefile (thanks to Thomas Schmidt).
 - The SVDRP command LSTC can now list the channels with group separators if the
   option ':groups' is given (thanks to Andreas Mair).
 - Added a missing error report to cCuttingThread::Action() (thanks to Udo
@@ -5479,7 +5479,7 @@ Video Disk Recorder Revision History
   i18n: $(I18Npot) $(I18Nmo)
   (based on a suggestion by Torsten Kunkel).
 - Removed a duplicate ',' from the ca_ES.po file (thanks to Thomas G�nther).
-- Added the '�' character to the "allowed charcaters" in the de_DE.po file
+- Added the '�' character to the "allowed characters" in the de_DE.po file
   (suggested by Thomas G�nther).
 - Made the default copy ctor of cRecording private (thanks to Markus Hahn).
   Same for the assign operator.
@@ -5550,7 +5550,7 @@ Video Disk Recorder Revision History
 - Added a missing setting of lastFreeMB in cMenuMain::Update() (reported by
   Andreas Brugger).
 - Added '-Wno-parentheses' to the compiler options in order to avoid silly compiler
-  warnings for expessions like 'a || b && c', where GCC 4.3 wants to force the
+  warnings for expressions like 'a || b && c', where GCC 4.3 wants to force the
   programmer to write 'a || (b && c)', while everybody knows that '&&' links
   stronger than '||' (reported by Tobias Grimm).
 - Updated the Hungarian language texts (thanks to Istv�n F�ley).
@@ -5572,7 +5572,7 @@ Video Disk Recorder Revision History
 - The new option --localedir can be used to set the locale directory at runtime
   (based on a patch from Stefan Huelswitt).
 - Fixed finding new transponders (thanks to Winfried K�hler).
-- Implemented handling of DVB-S2 (thanks to Marco Schl��ler and Reinhald Nissl
+- Implemented handling of DVB-S2 (thanks to Marco Schl��ler and Reinhard Nissl
   for a patch that was used to implement this). VDR now requires the "multiproto"
   DVB driver, e.g. from http://jusst.de/hg/multiproto.
 - Removed switching to the next higher or lower channel if the current channel
@@ -5643,3 +5643,30 @@ Video Disk Recorder Revision History
 - Introduced 'operator const void * ()' in cString to catch cases where operator*()
   should be used.
 - Fixed calculating the scrollbar sizes in the skins.
+
+2008-02-24: Version 1.5.16
+
+- Fixed setting the current subtitle track in Transfer-Mode (reported by Petri Helin,
+  thanks to Reinhard Nissl for pointing out that cDevice::Transferring() doesn't
+  return the right value in the early stage of channel switching).
+- Updated the Danish OSD texts (thanks to Mogens Elneff).
+- Updated the Dutch OSD texts (thanks to Carel Willemse).
+- Fixed various spelling errors and improved PLUGINS.html (thanks to Ville Skytt�).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed the format in cRemote::Put() to use "%016llX" instead of "%016LX" (thanks
+  to Ludwig Nussel for pointing this out).
+- Revised the fix of calculating the scrollbar height in the skins. The scrollbar
+  handle now always has a height that is at least the width of the scrollbar.
+- When switching the device that's used for live viewing away from the current
+  transponder in favor of an upcoming recording, an attempt is now made to stay
+  on the current channel by possibly going into 'Transfer Mode'.
+- The CAM menu now stays open as long as it is automatically updated, even without
+  pressing a remote control key. This is important when updating the CAM firmware
+  from the transponder.
+- No longer trying to switch to an available channel if the primary device has
+  no valid programme and a menu is open (avoids interference with the CAM in
+  case a CAM menu is open).
+- Increased the valid range of the "Subtitle offset" setup option to -100...100
+  (thanks to Rolf Ahrenberg).
+- Added the backslash ('\') to the list of characters that need to be escaped
+  when executing external commands (thanks to Peter Bieringer for reporting this one).
diff --git a/MANUAL b/MANUAL
index c67ec2288..bb128f50b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -691,8 +691,8 @@ Version 1.6
                          individual preferred languages.
 
   Subtitle offset = 0    Allows you to shift the location of the subtitles in the
-                         vertical direction. The valid range is -50...50. This option
-                         is only avialable if "Display subtitles" is set to 'yes'.
+                         vertical direction. The valid range is -100...100. This option
+                         is only available if "Display subtitles" is set to 'yes'.
 
   Subtitle foreground transparency = 0
   Subtitle background transparency = 0
diff --git a/PLUGINS.html b/PLUGINS.html
index 71286b3b7..9dc48e7fb 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1,18 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>The VDR Plugin System</title>
+<style type="text/css">
+html, body {
+    background-color: white;
+}
+.blurb {
+    font-style: italic;
+    font-weight: bold;
+    text-align: center;
+}
+.center {
+    text-align: center;
+}
+.code {
+    background-color: #f0f0f0;
+}
+</style>
 </head>
-<body bgcolor="white">
+<body>
 
-<center><h1>The VDR Plugin System</h1></center>
+<div class="center">
+<h1>The VDR Plugin System</h1>
 
-<center><b>Version 1.6</b></center>
+<b>Version 1.6</b>
 <p>
-<center>
 Copyright &copy; 2008 Klaus Schmidinger<br>
 <a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
-</center>
+</div>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -78,11 +96,11 @@ <h1>Table Of Contents</h1>
 </ul>
 </ul>
 
-<a name="Part I - The External Interface"><hr><center><h1>Part I - The External Interface</h1></center>
+<hr><h1 class="center"><a name="Part I - The External Interface">Part I - The External Interface</a></h1>
 
-<a name="Quick start"><hr><h2>Quick start</h2>
+<hr><h2><a name="Quick start">Quick start</a></h2>
 
-<center><i><b>Can't wait, can't wait!</b></i></center><p>
+<div class="blurb">Can't wait, can't wait!</div><p>
 
 Actually you should read this entire document before starting to work with VDR plugins,
 but you probably want to see something happening right away <tt>;-)</tt>
@@ -102,9 +120,9 @@ <h1>Table Of Contents</h1>
 If you enjoyed this brief glimpse into VDR plugin handling, read through the rest of
 this document and eventually write your own VDR plugin.
 
-<a name="The name of the plugin"><hr><h2>The name of the plugin</h2>
+<hr><h2><a name="The name of the plugin">The name of the plugin</a></h2>
 
-<center><i><b>Give me some I.D.!</b></i></center><p>
+<div class="blurb">Give me some I.D.!</div><p>
 
 One of the first things to consider when writing a VDR plugin is giving the thing
 a proper name. This name will be used in the VDR command line in order to load
@@ -119,22 +137,22 @@ <h1>Table Of Contents</h1>
 <p>
 A plugin can access its name through the (non virtual) member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *Name(void);
 </pre></td></tr></table><p>
 
 The actual name is derived from the plugin's library file name, as defined in the
 next chapter.
 
-<a name="The plugin directory structure"><hr><h2>The plugin directory structure</h2>
+<hr><h2><a name="The plugin directory structure">The plugin directory structure</a></h2>
 
-<center><i><b>Where is everybody?</b></i></center><p>
+<div class="blurb">Where is everybody?</div><p>
 
 By default plugins are located in a directory named <tt>PLUGINS</tt> below the
 VDR source directory. Inside this directory the following subdirectory structure
 is used:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 VDR/PLUGINS/src
 VDR/PLUGINS/src/hello
 VDR/PLUGINS/lib
@@ -154,7 +172,7 @@ <h1>Table Of Contents</h1>
 <p>
 <table border=2>
 <tr><td align=center><b><tt>libvdr-</tt></b></td><td align=center><b><tt>hello</tt></b></td><td align=center><b><tt>.so.</tt></b></td><td align=center><b><tt>1.1.0</tt></b></td></tr>
-<tr><td align=center><font size=-1>VDR plugin<br>library prefix</font></td><td align=center><font size=-1>name of<br>the plugin</font></td><td align=center><font size=-1>shared object<br>indicator</font></td><td align=center><font size=-1>API version number<br>this plugin was<br>compiled for</font></td></tr>
+<tr><td align=center><small>VDR plugin<br>library prefix</small></td><td align=center><small>name of<br>the plugin</small></td><td align=center><small>shared object<br>indicator</small></td><td align=center><small>API version number<br>this plugin was<br>compiled for</small></td></tr>
 </table>
 <p>
 The <i>API version number</i> refers to the plugin API version number of the VDR
@@ -186,7 +204,7 @@ <h1>Table Of Contents</h1>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/src</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
 
@@ -206,9 +224,9 @@ <h1>Table Of Contents</h1>
 <tt>libhello-bar.so.0.0.1</tt>
 <p>
 
-<a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
+<hr><h2><a name="Initializing a new plugin directory">Initializing a new plugin directory</a></h2>
 
-<center><i><b>A room with a view</b></i></center><p>
+<div class="blurb">A room with a view</div><p>
 
 Call the Perl script <tt>newplugin</tt> from the VDR source directory to create
 a new plugin directory with a <tt>Makefile</tt> and a main source file implementing
@@ -225,9 +243,9 @@ <h1>Table Of Contents</h1>
 Add further files and maybe subdirectories to your plugin source directory as
 necessary. Don't forget to adapt the <tt>Makefile</tt> appropriately.
 
-<a name="The actual implementation"><hr><h2>The actual implementation</h2>
+<hr><h2><a name="The actual implementation">The actual implementation</a></h2>
 
-<center><i><b>Use the source, Luke!</b></i></center><p>
+<div class="blurb">Use the source, Luke!</div><p>
 
 A newly initialized plugin doesn't really do very much yet.
 If you <a href="#Loading plugins into VDR">load it into VDR</a> you will find a new
@@ -250,7 +268,7 @@ <h1>Table Of Contents</h1>
 <p>
 At the end of the plugin's source file you will find a line that looks like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 VDRPLUGINCREATOR(cPluginHello);
 </pre></td></tr></table><p>
 
@@ -263,7 +281,7 @@ <h1>Table Of Contents</h1>
 Header files usually contain preprocessor statements that prevent the same
 file (or rather its contents, to be precise) from being included more than once, like
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #ifndef __I18N_H
 #define __I18N_H
 
@@ -292,13 +310,13 @@ <h1>Table Of Contents</h1>
 <tt>i18n.h</tt> it uses the macro <tt>_I18N__H</tt> (one underline at the beginning
 and two replacing the dot).
 
-<a name="Construction and Destruction"><hr><h2>Construction and Destruction</h2>
+<hr><h2><a name="Construction and Destruction">Construction and Destruction</a></h2>
 
-<center><i><b>What goes up, must come down...</b></i></center><p>
+<div class="blurb">What goes up, must come down...</div><p>
 
 The constructor and destructor of a plugin are defined as
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cPlugin(void);
 virtual ~cPlugin();
 </pre></td></tr></table><p>
@@ -321,15 +339,15 @@ <h1>Table Of Contents</h1>
 Of course, if your plugin doesn't define any member variables that need to be
 initialized (and deleted), you don't need to implement either of these functions.
 
-<a name="Version number"><hr><h2>Version number</h2>
+<hr><h2><a name="Version number">Version number</a></h2>
 
-<center><i><b>Which incarnation is this?</b></i></center><p>
+<div class="blurb">Which incarnation is this?</div><p>
 
 Every plugin must have a version number of its own, which does not necessarily
 have to be in any way related to the VDR version number.
 VDR requests a plugin's version number through a call to the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual const char *Version(void) = 0;
 </pre></td></tr></table><p>
 
@@ -340,7 +358,7 @@ <h1>Table Of Contents</h1>
 be as long as really necessary, and shall not contain the plugin's name itself.
 Here's an example:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 static const char *VERSION = "0.0.1";
 
 const char *cPluginHello::Version(void)
@@ -354,6 +372,7 @@ <h1>Table Of Contents</h1>
 <pre>
 static const char *VERSION = ...
 </pre>
+<p>
 just like shown in the above example. This is a convention that allows the <tt>Makefile</tt>
 to extract the version number when generating the file name for the distribution archive.
 <p>
@@ -366,19 +385,19 @@ <h1>Table Of Contents</h1>
 a version number are not limited to single digits, so a version number of <tt>1.2.15</tt>
 would be acceptable.
 
-<a name="Description"><hr><h2>Description</h2>
+<hr><h2><a name="Description">Description</a></h2>
 
-<center><i><b>What is it that you do?</b></i></center><p>
+<div class="blurb">What is it that you do?</div><p>
 
 In order to tell the user what exactly a plugin does, it must implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual const char *Description(void) = 0;
 </pre></td></tr></table><p>
 
 which returns a short, one line description of the plugin's purpose:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 static const char *DESCRIPTION = "A friendly greeting";
 
 virtual const char *Description(void)
@@ -390,15 +409,15 @@ <h1>Table Of Contents</h1>
 Note the <tt>tr()</tt> around the <tt>DESCRIPTION</tt>, which allows the description
 to be <a href="#Internationalization">internationalized</a>.
 
-<a name="Command line arguments"><hr><h2>Command line arguments</h2>
+<hr><h2><a name="Command line arguments">Command line arguments</a></h2>
 
-<center><i><b>Taking orders</b></i></center><p>
+<div class="blurb">Taking orders</div><p>
 
 A VDR plugin can have command line arguments just like any normal program.
 If a plugin wants to react on command line arguments, it needs to implement
 the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool ProcessArgs(int argc, char *argv[]);
 </pre></td></tr></table><p>
 
@@ -415,7 +434,7 @@ <h1>Table Of Contents</h1>
 will survive the entire lifetime of the plugin, so it is safe to store pointers to
 these values inside the plugin. Here's an example:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 bool cPluginHello::ProcessArgs(int argc, char *argv[])
 {
   // Implement command line argument processing here if applicable.
@@ -444,13 +463,13 @@ <h1>Table Of Contents</h1>
 <i>false</i> from a call to its <tt>ProcessArgs()</tt> function will cause VDR
 to exit.
 
-<a name="Command line help"><hr><h2>Command line help</h2>
+<hr><h2><a name="Command line help">Command line help</a></h2>
 
-<center><i><b>Tell me about it...</b></i></center><p>
+<div class="blurb">Tell me about it...</div><p>
 
 If a plugin accepts command line options, it should implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual const char *CommandLineHelp(void);
 </pre></td></tr></table><p>
 
@@ -458,7 +477,7 @@ <h1>Table Of Contents</h1>
 The returned string should contain the command line help for this plugin, formatted
 in the same way as done by VDR itself:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *cPluginHello::CommandLineHelp(void)
 {
   // Return a string that describes all known command line options.
@@ -473,15 +492,15 @@ <h1>Table Of Contents</h1>
 Note that all lines should be terminated with a newline character, and should
 be shorter than 80 characters.
 
-<a name="Getting started"><hr><h2>Getting started</h2>
+<hr><h2><a name="Getting started">Getting started</a></h2>
 
-<center><i><b>Let's get ready to rumble!</b></i></center><p>
+<div class="blurb">Let's get ready to rumble!</div><p>
 
 If a plugin implements a function that runs in the background (presumably in a
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement one of the functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool Initialize(void);
 virtual bool Start(void);
 </pre></td></tr></table><p>
@@ -511,13 +530,13 @@ <h1>Table Of Contents</h1>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement either of these functions.
 
-<a name="Shutting down"><hr><h2>Shutting down</h2>
+<hr><h2><a name="Shutting down">Shutting down</a></h2>
 
-<center><i><b>Stop it, right there!</b></i></center><p>
+<div class="blurb">Stop it, right there!</div><p>
 
 If a plugin performs any background tasks, it shall implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual void Stop(void);
 </pre></td></tr></table><p>
 
@@ -528,8 +547,9 @@ <h1>Table Of Contents</h1>
 returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
 as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
 
-<a name="Logging"><hr><h2>Logging</h2>
+<hr><h2><a name="Logging">Logging</a></h2>
 
+<p>
 If the plugin should print log messages, you can use <tt>dsyslog()</tt>, <tt>isyslog()</tt> or <tt>esyslog()</tt>.<br>
 <ul>
 <li><tt>dsyslog()</tt> prints the log message only if the log level of vdr is set to 3.
@@ -539,21 +559,21 @@ <h1>Table Of Contents</h1>
 The output of this log is the syslog of the system vdr is running on.
 The logmessage can be formatted like <tt>printf()</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 esyslog("pluginname: error #%d has occurred", ErrorNumber);
 </pre></td></tr></table><p>
 
 Note that the log messages will be given as provided, the plugin's name will not
-automatically be added, so make shure your log messages are obvious enough.
+automatically be added, so make sure your log messages are obvious enough.
 
-<a name="Main menu entry"><hr><h2>Main menu entry</h2>
+<hr><h2><a name="Main menu entry">Main menu entry</a></h2>
 
-<center><i><b>Today's special is...</b></i></center><p>
+<div class="blurb">Today's special is...</div><p>
 
 If the plugin implements a feature that the user shall be able to access
 from VDR's main menu, it needs to implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual const char *MainMenuEntry(void);
 </pre></td></tr></table><p>
 
@@ -561,7 +581,7 @@ <h1>Table Of Contents</h1>
 this plugin will not have an item in the main menu. Here's an example of a
 plugin that will have a main menu item:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 static const char *MAINMENUENTRY = "Hello";
 
 const char *cPluginHello::MainMenuEntry(void)
@@ -574,13 +594,13 @@ <h1>Table Of Contents</h1>
 after the <i>Recordings</i> item, in the same sequence as they were given
 in the call to VDR.
 
-<a name="User interaction"><hr><h2>User interaction</h2>
+<hr><h2><a name="User interaction">User interaction</a></h2>
 
-<center><i><b>It's showtime!</b></i></center><p>
+<div class="blurb">It's showtime!</div><p>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
 
@@ -607,14 +627,14 @@ <h1>Table Of Contents</h1>
 the plugin should launch a separate thread to do this.
 </b>
 
-<a name="Housekeeping"><hr><h2>Housekeeping</h2>
+<hr><h2><a name="Housekeeping">Housekeeping</a></h2>
 
-<center><i><b>Chores, chores...</b></i></center><p>
+<div class="blurb">Chores, chores...</div><p>
 
 From time to time a plugin may want to do some regular tasks, like cleaning
 up some files or other things. In order to do this it can implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual void Housekeeping(void);
 </pre></td></tr></table><p>
 
@@ -632,9 +652,9 @@ <h1>Table Of Contents</h1>
 the plugin should launch a separate thread to do this.
 </b>
 
-<a name="Main thread hook"><hr><h2>Main thread hook</h2>
+<hr><h2><a name="Main thread hook">Main thread hook</a></h2>
 
-<center><i><b>Pushing in...</b></i></center><p>
+<div class="blurb">Pushing in...</div><p>
 
 Normally a plugin only reacts on user input if directly called through its
 <a href="#Main menu entry">main menu entry</a>, or performs some background
@@ -642,7 +662,7 @@ <h1>Table Of Contents</h1>
 something in the context of the main program thread, without being explicitly
 called up by the user. In such a case it can implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual void MainThreadHook(void);
 </pre></td></tr></table><p>
 
@@ -653,21 +673,21 @@ <h1>Table Of Contents</h1>
 as soon as possible! If you spend too much time in this function, the user
 interface performance will become sluggish!</b>
 
-<a name="Activity"><hr><h2>Activity</h2>
+<hr><h2><a name="Activity">Activity</a></h2>
 
-<center><i><b>Now is not a good time!</b></i></center><p>
+<div class="blurb">Now is not a good time!</div><p>
 
 If a plugin is running a background task that should be finished before shutting
 down the system, it can implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual cString Active(void);
 </pre></td></tr></table><p>
 
 which shall return an empty string if it is ok to shut down, and a proper message
 if not:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cString cDoSomethingPlugin::Active(void)
 {
   if (busy)
@@ -689,15 +709,15 @@ <h1>Table Of Contents</h1>
 the shutdown will take place. As soon as one prompt is not confirmed, no
 further plugins will be queried and no shutdown will be done.
 
-<a name="Wakeup"><hr><h2>Wakeup</h2>
+<hr><h2><a name="Wakeup">Wakeup</a></h2>
 
-<center><i><b>Wake me up before you go-go</b></i></center><p>
+<div class="blurb">Wake me up before you go-go</div><p>
 
 If a plugin wants to schedule activity for a later time, or wants to perform
 periodic activity at a certain time at night, and if VDR shall wake up from
 shutdown at that time, the plugin can implement the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual time_t WakeupTime(void);
 </pre></td></tr></table><p>
 
@@ -706,7 +726,7 @@ <h1>Table Of Contents</h1>
 timer time, whichever comes first, to the shutdown script. The following sample
 will wake up VDR every night at 1:00:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 time_t MyPlugin::WakeupTime(void)
 {
   time_t Now = time(NULL);
@@ -722,14 +742,14 @@ <h1>Table Of Contents</h1>
 again instantly. If <tt>WakeupTime()</tt> returns a time that is not in
 the future, the time will be ignored.
 
-<a name="Setup parameters"><hr><h2>Setup parameters</h2>
+<hr><h2><a name="Setup parameters">Setup parameters</a></h2>
 
-<center><i><b>Remember me...</b></i></center><p>
+<div class="blurb">Remember me...</div><p>
 
 If a plugin requires its own setup parameters, it needs to implement the following
 functions to handle these parameters:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual cMenuSetupPage *SetupMenu(void);
 virtual bool SetupParse(const char *Name, const char *Value);
 </pre></td></tr></table><p>
@@ -744,7 +764,7 @@ <h1>Table Of Contents</h1>
 the log file (and program execution will continue).
 A possible implementation of <tt>SetupParse()</tt> could look like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 bool cPluginHello::SetupParse(const char *Name, const char *Value)
 {
   // Parse your own setup parameters and store their values.
@@ -770,7 +790,7 @@ <h1>Table Of Contents</h1>
 <p>
 To store its values in the global setup, a plugin has to call the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 void SetupStore(const char *Name, <i>type</i> Value);
 </pre></td></tr></table><p>
 
@@ -795,15 +815,15 @@ <h1>Table Of Contents</h1>
 <tt>SetupStore()</tt> and <tt>SetupParse()</tt> without presenting these
 parameters to the user.
 
-<a name="The Setup menu"><hr><h2>The Setup menu</h2>
+<hr><h2><a name="The Setup menu">The Setup menu</a></h2>
 
-<center><i><b>Have it your way!</b></i></center><p>
+<div class="blurb">Have it your way!</div><p>
 
 To implement a <i>Setup</i> menu, a plugin needs to derive a class from
 <tt>cMenuSetupPage</tt> and implement its constructor and the pure virtual
 <tt>Store()</tt> member function:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 int GreetingTime = 3;
 int UseAlternateGreeting = false;
 
@@ -853,9 +873,9 @@ <h1>Table Of Contents</h1>
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<a name="Configuration files"><hr><h2>Configuration files</h2>
+<hr><h2><a name="Configuration files">Configuration files</a></h2>
 
-<center><i><b>I want my own stuff!</b></i></center><p>
+<div class="blurb">I want my own stuff!</div><p>
 
 There may be situations where a plugin requires configuration files of its own, maybe
 for data that can't be stored in the simple <a href="#Setup parameters">setup parameters</a>
@@ -864,7 +884,7 @@ <h1>Table Of Contents</h1>
 sees fit, it might be a good idea to put them in a common place, preferably
 where other configuration data already exists. VDR provides the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *ConfigDirectory(const char *PluginName = NULL);
 </pre></td></tr></table><p>
 
@@ -887,7 +907,7 @@ <h1>Table Of Contents</h1>
 the <tt>ConfigDirectory()</tt> function can be given an additional string that will
 be appended to the returned directory name, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *MyConfigDir = ConfigDirectory(Name());
 </pre></td></tr></table><p>
 
@@ -904,19 +924,19 @@ <h1>Table Of Contents</h1>
 class. This allows it to be called even from outside any member function of the derived
 plugin class, by writing
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *MyConfigDir = cPlugin::ConfigDirectory();
 </pre></td></tr></table><p>
 
-<a name="Internationalization"><hr><h2>Internationalization</h2>
+<hr><h2><a name="Internationalization">Internationalization</a></h2>
 
-<center><i><b>Welcome to Babylon!</b></i></center><p>
+<div class="blurb">Welcome to Babylon!</div><p>
 
 If a plugin displays texts to the user, it should prepare for internationalization
 of these texts. All that is necessary for this is to mark every text that is
 presented to the user as translatable, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *s = tr("Hello world!");
 </pre></td></tr></table><p>
 
@@ -931,7 +951,7 @@ <h1>Table Of Contents</h1>
 differently, using the trNOOP() macro. The actual translation is then done
 when such a text is used, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char *Texts = {
   trNOOP("First text"),
   trNOOP("Second text"),
@@ -954,9 +974,9 @@ <h1>Table Of Contents</h1>
 Most of the time a plugin doesn't need to care about this, but when it comes to
 handling individual characters these functions may come in handy.
 
-<a name="Custom services"><hr><h2>Custom services</h2>
+<hr><h2><a name="Custom services">Custom services</a></h2>
 
-<center><i><b>What can I do for you?</b></i></center><p>
+<div class="blurb">What can I do for you?</div><p>
 
 In some situations, two plugins may want to communicate directly, talking about things
 that VDR doesn't handle itself. For example, a plugin may want to use features
@@ -964,7 +984,7 @@ <h1>Table Of Contents</h1>
 things it does. To receive requests or messages, a plugin can implement the
 following function:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool Service(const char *Id, void *Data = NULL);
 </pre></td></tr></table><p>
 
@@ -981,7 +1001,7 @@ <h1>Table Of Contents</h1>
 may be called, for example whether the service may be called from every thread, or
 just from the main thread. A possible implementation could look like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 struct Hello_SetGreetingTime_v1_0 {
   int NewGreetingTime;
   };
@@ -1004,7 +1024,7 @@ <h1>Table Of Contents</h1>
 To send messages to, or request services from a specific plugin, one plugin can directly
 call another plugin's service function:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 Hello_SetGreetingTime_v1_0 hellodata;
 hellodata.NewGreetingTime = 3;
 cPlugin *Plugin = cPluginManager::GetPlugin("hello");
@@ -1022,21 +1042,21 @@ <h1>Table Of Contents</h1>
 <tt>cPluginManager::CallAllServices()</tt>. This function returns <tt>true</tt> if
 any plugin handled the request, or <tt>false</tt> if no plugin handled the request.
 
-<a name="SVDRP commands"><hr><h2>SVDRP commands</h2>
+<hr><h2><a name="SVDRP commands">SVDRP commands</a></h2>
 
-<center><i><b>Infinite Diversity in Infinite Combinations</b></i></center><p>
+<div class="blurb">Infinite Diversity in Infinite Combinations</div><p>
 
 A plugin can implement its own SVDRP commands through the two functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual const char **SVDRPHelpPages(void);
-virtual cString SVDRPCommand(const char *Cmd, const char *Option, int &ReplyCode);
+virtual cString SVDRPCommand(const char *Cmd, const char *Option, int &amp;ReplyCode);
 </pre></td></tr></table><p>
 
 The <tt>SVDRPHelpPages()</tt> function must return a pointer to a list of help
 strings for all of the plugin's SVDRP commands, like this
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 const char **cPluginSvdrpdemo::SVDRPHelpPages(void)
 {
   static const char *HelpPages[] = {
@@ -1067,8 +1087,8 @@ <h1>Table Of Contents</h1>
 Here's an example of such a function, which implements the commands advertised in
 the above help texts:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
-cString cPluginSvdrpdemo::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+<p><table><tr><td class="code"><pre>
+cString cPluginSvdrpdemo::SVDRPCommand(const char *Command, const char *Option, int &amp;ReplyCode)
 {
   if (strcasecmp(Command, "DATE") == 0) {
      // we use the default reply code here
@@ -1113,26 +1133,26 @@ <h1>Table Of Contents</h1>
 when presenting them to the caller, and the continuation character ('<tt>-</tt>')
 will be set for all but the last one.
 
-<a name="Loading plugins into VDR"><hr><h2>Loading plugins into VDR</h2>
+<hr><h2><a name="Loading plugins into VDR">Loading plugins into VDR</a></h2>
 
-<center><i><b>Saddling up!</b></i></center><p>
+<div class="blurb">Saddling up!</div><p>
 
 Plugins are loaded into VDR using the command line option <b><tt>-P</tt></b>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 vdr -Phello
 </pre></td></tr></table><p>
 
 If the plugin accepts command line options, they are given as part of the argument
 to the <b><tt>-P</tt></b> option, which then has to be enclosed in quotes:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 vdr -P"hello -a abc -b"
 </pre></td></tr></table><p>
 
 Any number of plugins can be loaded this way, each with its own <b><tt>-P</tt></b> option:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 vdr -P"hello -a abc -b" -Pdvd -Pmp3
 </pre></td></tr></table><p>
 
@@ -1140,7 +1160,7 @@ <h1>Table Of Contents</h1>
 cannot be found at their default location) you need to tell VDR the location of
 the plugins through the <b><tt>-L</tt></b> option:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 vdr -L/usr/lib/vdr -Phello
 </pre></td></tr></table><p>
 
@@ -1153,9 +1173,9 @@ <h1>Table Of Contents</h1>
 <a href="#The plugin directory structure">naming convention</a>,
 and display their help and/or version information in addition to its own output.
 
-<a name="Building the distribution package"><hr><h2>Building the distribution package</h2>
+<hr><h2><a name="Building the distribution package">Building the distribution package</a></h2>
 
-<center><i><b>Let's get this show on the road!</b></i></center><p>
+<div class="blurb">Let's get this show on the road!</div><p>
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
@@ -1165,30 +1185,30 @@ <h1>Table Of Contents</h1>
 <p>
 Simply change into your source directory and execute <tt>make dist</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cd VDR/PLUGINS/src/hello
 make dist
 </pre></td></tr></table><p>
 
 After this you should find a file named like
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 vdr-hello-0.0.1.tgz
 </pre></td></tr></table><p>
 
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<a name="Part II - The Internal Interface"><hr><center><h1>Part II - The Internal Interface</h1></center>
+<hr><h1 class="center"><a name="Part II - The Internal Interface">Part II - The Internal Interface</a></h1>
 
-<a name="Status monitor"><hr><h2>Status monitor</h2>
+<hr><h2><a name="Status monitor">Status monitor</a></h2>
 
-<center><i><b>A piece of the action</b></i></center><p>
+<div class="blurb">A piece of the action</div><p>
 
 If a plugin wants to get informed on various events in VDR, it can derive a class from
 <tt>cStatus</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/status.h&gt;
 
 class cMyStatusMonitor : public cStatus {
@@ -1208,7 +1228,7 @@ <h1>Table Of Contents</h1>
 An object of this class will be informed whenever the channel is switched on one of
 the DVB devices. It could be used in a plugin like this:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/plugin.h&gt;
 
 class cPluginStatus : public cPlugin {
@@ -1254,14 +1274,14 @@ <h1>Table Of Contents</h1>
 member functions are available in <tt>cStatus</tt>. You only need to implement
 the functions you actually want to use.
 
-<a name="Players"><hr><h2>Players</h2>
+<hr><h2><a name="Players">Players</a></h2>
 
-<center><i><b>Play it again, Sam!</b></i></center><p>
+<div class="blurb">Play it again, Sam!</div><p>
 
 Implementing a player is a two step process.
 First you need the actual player class, which is derived from the abstract <tt>cPlayer</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/player.h&gt;
 
 class cMyPlayer : public cPlayer {
@@ -1277,7 +1297,7 @@ <h1>Table Of Contents</h1>
 thread which, e.g.,  reads data from a file, you can additionally derive your class from
 <tt>cThread</tt> and implement the necessary functionality:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/player.h&gt;
 
 class cMyPlayer : public cPlayer, cThread {
@@ -1295,7 +1315,7 @@ <h1>Table Of Contents</h1>
 <p>
 To play the actual data, the player needs to call its member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 int PlayPes(const uchar *Data, int Length, bool VideoOnly);
 </pre></td></tr></table><p>
 
@@ -1308,7 +1328,7 @@ <h1>Table Of Contents</h1>
 DVB device doesn't run out of data.
 To avoid busy loops the player should call its member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 bool DevicePoll(cPoller &amp;Poller, int TimeoutMs = 0);
 </pre></td></tr></table><p>
 
@@ -1320,14 +1340,14 @@ <h1>Table Of Contents</h1>
 requirements in order to set a given track, it can implement the
 following function to allow the device to set a specific track:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual void SetAudioTrack(eTrackType Type, const tTrackId *TrackId)
 </pre></td></tr></table><p>
 
 A player that has special requirements about audio tracks should announce its
 available audio tracks by calling
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL)
 </pre></td></tr></table><p>
 
@@ -1336,7 +1356,7 @@ <h1>Table Of Contents</h1>
 The second part needed here is a control object that receives user input from the main
 program loop and reacts on this by telling the player what to do:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/player.h&gt;
 
 class cMyControl : public cControl {
@@ -1355,7 +1375,7 @@ <h1>Table Of Contents</h1>
 hand over a pointer to it to the <tt>cControl</tt> base class, so that it
 can be later attached to the primary DVB device:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cMyControl::cMyControl(void)
 :cControl(player = new cMyPlayer)
 {
@@ -1386,7 +1406,7 @@ <h1>Table Of Contents</h1>
 infrastructure like displaying a list of playable stuff etc) simply has to call the
 static function <tt>cControl::Launch()</tt> with the player control object, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cControl::Launch(new cMyControl);
 </pre></td></tr></table><p>
 
@@ -1397,7 +1417,7 @@ <h1>Table Of Contents</h1>
 <p>
 The <tt>cPlayer</tt> class has a member function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 void DeviceStillPicture(const uchar *Data, int Length);
 </pre></td></tr></table><p>
 
@@ -1435,14 +1455,14 @@ <h1>Table Of Contents</h1>
 that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
 
-<a name="Receivers"><hr><h2>Receivers</h2>
+<hr><h2><a name="Receivers">Receivers</a></h2>
 
-<center><i><b>Tapping into the stream...</b></i></center><p>
+<div class="blurb">Tapping into the stream...</div><p>
 
 In order to receive any kind of data from a <tt>cDevice</tt>, a plugin must set up an
 object derived from the <tt>cReceiver</tt> class:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/receiver.h&gt;
 
 class cMyReceiver : public cReceiver, cThread {
@@ -1486,7 +1506,7 @@ <h1>Table Of Contents</h1>
 Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
 a <tt>cDevice</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cMyReceiver *Receiver = new cMyReceiver(123);
 
 cDevice::ActualDevice()-&gt;AttachReceiver(Receiver);
@@ -1500,15 +1520,15 @@ <h1>Table Of Contents</h1>
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<a name="Filters"><hr><h2>Filters</h2>
+<hr><h2><a name="Filters">Filters</a></h2>
 
-<center><i><b>A Fistful of Data</b></i></center><p>
+<div class="blurb">A Fistful of Data</div><p>
 
 If you want to receive section data you have to implement a derived <tt>cFilter</tt>
 class which at least implements the <tt>Process()</tt> function and a constructor
 that sets the (initial) filter parameters:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/filter.h&gt;
 
 class cMyFilter : public cFilter {
@@ -1533,7 +1553,7 @@ <h1>Table Of Contents</h1>
 An instance of such a filter needs to be attached to the device from
 which it shall receive data, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cMyFilter *Filter = new cMyFilter();
 
 cDevice::ActualDevice()-&gt;AttachFilter(Filter);
@@ -1544,14 +1564,14 @@ <h1>Table Of Contents</h1>
 <p>
 See VDR/eit.c or VDR/pat.c to learn how to process filter data.
 
-<a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
+<hr><h2><a name="The On Screen Display">The On Screen Display</a></h2>
 
-<center><i><b>Window to the world</b></i></center><p>
+<div class="blurb">Window to the world</div><p>
 
 If a plugin needs to have total control over the OSD, it can call the
 static function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/osd.h&gt;
 
 cOsd *MyOsd = cOsdProvider::NewOsd(x, y);
@@ -1561,7 +1581,7 @@ <h1>Table Of Contents</h1>
 of the OSD area on the screen. Such an OSD doesn't display anything
 yet, so you need to at least call the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 tArea Area = { 0, 0, 100, 100, 4 };
 MyOsd-&gt;SetAreas(&amp;Area, 1);
 </pre></td></tr></table><p>
@@ -1580,7 +1600,7 @@ <h1>Table Of Contents</h1>
 all over the OSD area, a plugin can divide the total drawing area into several
 sub-areas with different color depths and separate color palettes, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 tArea Area = { 0, 0, 99, 99, 4 };
 if (osd-&gt;CanHandleAreas(Area, 1) == oeOk)
    osd-&gt;SetAreas(&amp;Area, 1);
@@ -1615,7 +1635,7 @@ <h1>Table Of Contents</h1>
 combination (and thus be unable to draw any other colors at all), it may be
 useful to call
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 osd-&gt;SetAntiAliasGranularity();
 </pre></td></tr></table><p>
 
@@ -1629,15 +1649,15 @@ <h1>Table Of Contents</h1>
 If a plugin runs a separate thread and wants to issue a message directly from
 within that tread, it can call
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 int cSkins::QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
 </pre></td></tr></table><p>
 
 to queue that message for display. See <tt>VDR/skins.h</tt> for details.
 
-<a name="Skins"><hr><h2>Skins</h2>
+<hr><h2><a name="Skins">Skins</a></h2>
 
-<center><i><b>The emperor's new clothes</b></i></center><p>
+<div class="blurb">The emperor's new clothes</div><p>
 
 The way VDR displays its menus to the user is implemented through <i>skins</i>.
 A particular skin provides several functions that return objects to be used
@@ -1652,7 +1672,7 @@ <h1>Table Of Contents</h1>
 The first step in implementing a new skin is to derive a class from <tt>cSkin</tt>
 that provides the handling objects necessary to do the actual work:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include "skins.h"
 
 class cMySkin : public cSkin {
@@ -1676,7 +1696,7 @@ <h1>Table Of Contents</h1>
 To add your new skin to the list of skins available to the user in Setup/OSD/Skin,
 all you need to do is create a new object of your skin class, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 new cMySkin;
 </pre></td></tr></table><p>
 
@@ -1686,15 +1706,15 @@ <h1>Table Of Contents</h1>
 In order to be able to easily identify plugins that implement a skin it is recommended
 that the name of such a plugin should be
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 skinxyz
 </pre></td></tr></table><p>
 
 where <tt>xyz</tt> is the actual name of the skin.
 
-<a name="Themes"><hr><h2>Themes</h2>
+<hr><h2><a name="Themes">Themes</a></h2>
 
-<center><i><b>Eye of the beholder...</b></i></center><p>
+<div class="blurb">Eye of the beholder...</div><p>
 
 A <i>theme</i> is a collection of colors that can be used by a <a href="#Skins">skin</a>.
 Since every skin most likely has its own idea about what parts of it can be
@@ -1705,13 +1725,13 @@ <h1>Table Of Contents</h1>
 <p>
 In order to make a skin "themeable" is shall create an object of type cTheme, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 static cTheme Theme;
 </pre></td></tr></table><p>
 
 The next step is to define the colors that shall be provided by this theme, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 THEME_CLR(Theme, clrTitle,        0xFFBC8024);
 THEME_CLR(Theme, clrButtonRedFg,  clrWhite);
 THEME_CLR(Theme, clrButtonRedBg,  clrRed);
@@ -1732,7 +1752,7 @@ <h1>Table Of Contents</h1>
 In the actual drawing code of a skin, the color names defined with the <tt>THEME_CLR()</tt>
 macros can be used to fetch the actual color values from the theme, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 osd-&gt;DrawText(x, y, s, Theme.Color(clrButtonRedFg), Theme.Color(clrButtonRedBg), font);
 </pre></td></tr></table><p>
 
@@ -1740,9 +1760,9 @@ <h1>Table Of Contents</h1>
 <tt>THEME_CLR()</tt> line, but may be overwritten through user supplied theme
 files (see <tt>man vdr(5)</tt> for information about the format of a theme file).
 
-<a name="Devices"><hr><h2>Devices</h2>
+<hr><h2><a name="Devices">Devices</a></h2>
 
-<center><i><b>Expanding the possibilities</b></i></center><p>
+<div class="blurb">Expanding the possibilities</div><p>
 
 By default VDR is based on using DVB PCI cards that are supported by the
 LinuxDVB driver. However, a plugin can implement additional devices that
@@ -1756,7 +1776,7 @@ <h1>Table Of Contents</h1>
 <p>
 To implement an additional device, a plugin must derive a class from <tt>cDevice</tt>:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/device.h&gt;
 
 class cMyDevice : public cDevice {
@@ -1775,7 +1795,7 @@ <h1>Table Of Contents</h1>
 If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool ProvidesSource(int Source) const;
 virtual bool ProvidesTransponder(const cChannel *Channel) const;
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
@@ -1791,7 +1811,7 @@ <h1>Table Of Contents</h1>
 If the device can provide more than a single audio track, it can implement the
 following function to make them available:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual void SetAudioTrackDevice(eTrackType Type);
 virtual int GetAudioChannelDevice(void);
 virtual void SetAudioChannelDevice(int AudioChannel);
@@ -1802,7 +1822,7 @@ <h1>Table Of Contents</h1>
 <p>
 A device that can be used for recording must implement the functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 virtual bool OpenDvr(void);
 virtual void CloseDvr(void);
@@ -1819,7 +1839,7 @@ <h1>Table Of Contents</h1>
 <p>
 The functions to implement replaying capabilities are
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool HasDecoder(void) const;
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1838,7 +1858,7 @@ <h1>Table Of Contents</h1>
 In addition, the following functions may be implemented to provide further
 functionality:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
 virtual void SetVideoFormat(bool VideoFormat16_9);
 virtual void SetVolumeDevice(int Volume);
@@ -1850,7 +1870,7 @@ <h1>Table Of Contents</h1>
 If your device provides section filtering capabilities it can implement
 the functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
 virtual void CloseFilter(int Handle);
 </pre></td></tr></table><p>
@@ -1861,7 +1881,7 @@ <h1>Table Of Contents</h1>
 In order to actually start section handling, the
 device also needs to call the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 StartSectionHandler();
 </pre></td></tr></table><p>
 
@@ -1879,7 +1899,7 @@ <h1>Table Of Contents</h1>
 function is called, returns an object derived from <tt>cOsd</tt>, which can be used to
 access the device's OSD:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 class cMyOsdProvider : public cOsdProvider {
 public:
   cMyOsdProvider(void);
@@ -1890,7 +1910,7 @@ <h1>Table Of Contents</h1>
 In its <tt>MakePrimaryDevice()</tt> function the device shall create an object
 of this class, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 void cMyDevice::MakePrimaryDevice(bool On)
 {
   new cMyOsdProvider;
@@ -1927,9 +1947,9 @@ <h1>Table Of Contents</h1>
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<a name="Audio"><hr><h2>Audio</h2>
+<hr><h2><a name="Audio">Audio</a></h2>
 
-<center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
+<div class="blurb">"The stereo effect may only be experienced if stereo equipment is used!"</div><p>
 
 There are many different ways to replay additional audio tracks, like Dolby Digital.
 So VDR offers a plugin interface that allows for the implementation of any kind of
@@ -1938,7 +1958,7 @@ <h1>Table Of Contents</h1>
 To implement a new audio output facility, simply derive a class from <tt>cAudio</tt>,
 as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/audio.h&gt;
 #include &lt;vdr/thread.h&gt;
 
@@ -1970,9 +1990,9 @@ <h1>Table Of Contents</h1>
 The <tt>Mute()</tt> and <tt>Clear()</tt> functions will be called whenever the audio shall
 be muted, or any buffered data shall be cleared, respectively.
 
-<a name="Remote Control"><hr><h2>Remote Control</h2>
+<hr><h2><a name="Remote Control">Remote Control</a></h2>
 
-<center><i><b>The joy of zapping!</b></i></center><p>
+<div class="blurb">The joy of zapping!</div><p>
 
 There are several ways to control the operation of VDR. The builtin methods
 are using the PC keyboard, a homebuilt RCU unit or the LIRC interface.
@@ -1982,7 +2002,7 @@ <h1>Table Of Contents</h1>
 The simplest method for a plugin to issue commands to VDR is to call the
 static function <tt>cRemote::Put(eKeys Key)</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cRemote::Put(kUp);
 </pre></td></tr></table><p>
 
@@ -1994,7 +2014,7 @@ <h1>Table Of Contents</h1>
 be supported by the actual remote control in use, you may want to derive your
 own remote control class from <tt>cRemote</tt>, as in
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 #include &lt;vdr/remote.h&gt;
 #include &lt;vdr/thread.h&gt;
 
@@ -2019,7 +2039,7 @@ <h1>Table Of Contents</h1>
 <p>
 The constructor of your remote control class should look like this
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 cMyRemote::cMyRemote(const char *Name)
 :cRemote(Name)
 {
@@ -2039,7 +2059,7 @@ <h1>Table Of Contents</h1>
 If your remote control for some reason can't work (maybe because it was unable to
 open some file handle it requires) it can implement the virtual function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool Ready(void);
 </pre></td></tr></table><p>
 
@@ -2060,7 +2080,7 @@ <h1>Table Of Contents</h1>
 readily available next time VDR starts (without having to go through the initialization
 procedure again) it can use the <tt>cRemote</tt> member functions
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 void PutSetup(const char *Setup);
 const char *GetSetup(void);
 </pre></td></tr></table><p>
@@ -2074,7 +2094,7 @@ <h1>Table Of Contents</h1>
 expressed as a character string. So whatever data your remote control provides
 needs to be given to the base class by calling
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 Put(const char *Code, bool Repeat = false, bool Release = false);
 </pre></td></tr></table><p>
 
@@ -2085,15 +2105,15 @@ <h1>Table Of Contents</h1>
 value, there is another <tt>Put()</tt> function available for your convenience,
 which takes a 64 bit unsigned integer value instead of a character string:
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 Put(uint64 Code, bool Repeat = false, bool Release = false);
 </pre></td></tr></table><p>
 
 The other parameters have the same meaning as in the first version of this function.
 
-<a name="Conditional Access"><hr><h2>Conditional Access</h2>
+<hr><h2><a name="Conditional Access">Conditional Access</a></h2>
 
-<center><i><b>Members only!</b></i></center><p>
+<div class="blurb">Members only!</div><p>
 
 Pay TV providers usually encrypt their broadcasts, so that only viewers who
 have the proper smart card can watch them. Such a smart card needs to be inserted
@@ -2120,7 +2140,7 @@ <h1>Table Of Contents</h1>
 for example). The decision whether the adapter can actually be assigned to different
 devices is made in the function
 
-<p><table><tr><td bgcolor=#F0F0F0><pre>
+<p><table><tr><td class="code"><pre>
 virtual bool Assign(cDevice *Device, bool Query = false);
 </pre></td></tr></table><p>
 
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 45b79bb1b..6088c8b60 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -70,3 +70,8 @@ VDR Plugin 'skincurses' Revision History
 
 - Using cString::sprintf() instead of asprintf().
 - Implemented cSkinCursesDisplayMenu::SetScrollbar().
+
+2008-02-23: Version 0.1.6
+
+- Revised the fix of calculating the scrollbar height in the skins. The scrollbar
+  handle now always has a height that is at least the width of the scrollbar.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 2f0bea928..ed30a5e71 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.20 2008/02/17 14:28:19 kls Exp $
+ * $Id: skincurses.c 1.22 2008/02/23 10:38:04 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.5";
+static const char *VERSION        = "0.1.6";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -296,14 +296,15 @@ void cSkinCursesDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int
 {
   if (Total > 0 && Total > Shown) {
      int yt = Top;
-     int yb = yt + Height - 1;
+     int yb = yt + Height;
      int st = yt;
      int sb = yb;
-     int tt = st + (sb - st + 1) * Offset / Total;
-     int tb = tt + (sb - st + 1) * Shown / Total;
+     int th = max(int((sb - st) * double(Shown) / Total + 0.5), 1);
+     int tt = min(int(st + (sb - st) * double(Offset) / Total + 0.5), sb - th);
+     int tb = min(tt + th, sb);
      int xl = ScOsdWidth - 1;
-     osd->DrawRectangle(xl, st, xl, sb, clrWhite);
-     osd->DrawRectangle(xl, tt, xl, tb, clrCyan);
+     osd->DrawRectangle(xl, st, xl, sb - 1, clrWhite);
+     osd->DrawRectangle(xl, tt, xl, tb - 1, clrCyan);
      }
 }
 
diff --git a/config.h b/config.h
index 3a25b7b19..d0fdf38cb 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.305 2008/02/05 15:35:11 kls Exp $
+ * $Id: config.h 1.306 2008/02/17 16:04:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.15"
-#define VDRVERSNUM   10515  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.16"
+#define VDRVERSNUM   10516  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/device.c b/device.c
index aaa025401..7c82d97f6 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.153 2008/02/16 13:52:11 kls Exp $
+ * $Id: device.c 1.155 2008/02/23 13:09:01 kls Exp $
  */
 
 #include "device.h"
@@ -218,6 +218,7 @@ int cDevice::nextCardIndex = 0;
 int cDevice::currentChannel = 1;
 cDevice *cDevice::device[MAXDEVICES] = { NULL };
 cDevice *cDevice::primaryDevice = NULL;
+cDevice *cDevice::avoidDevice = NULL;
 
 cDevice::cDevice(void)
 {
@@ -356,6 +357,8 @@ cDevice *cDevice::GetDevice(int Index)
 
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView)
 {
+  cDevice *AvoidDevice = avoidDevice;
+  avoidDevice = NULL;
   // Collect the current priorities of all CAM slots that can decrypt the channel:
   int NumCamSlots = CamSlots.Count();
   int SlotPriority[NumCamSlots];
@@ -385,6 +388,8 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
       if (NumUsableSlots && SlotPriority[j] > MAXPRIORITY)
          continue; // there is no CAM available in this slot
       for (int i = 0; i < numDevices; i++) {
+          if (device[i] == AvoidDevice)
+             continue; // this device shall be temporarily avoided
           if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
              continue; // a specific card was requested, but not this one
           if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
@@ -1159,7 +1164,7 @@ bool cDevice::Replaying(void) const
 
 bool cDevice::Transferring(void) const
 {
-  return dynamic_cast<cTransfer *>(player) != NULL;
+  return ActualDevice() != PrimaryDevice();
 }
 
 bool cDevice::AttachPlayer(cPlayer *Player)
diff --git a/device.h b/device.h
index 376e43f02..06daa5ea5 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.90 2008/02/16 13:50:11 kls Exp $
+ * $Id: device.h 1.91 2008/02/23 13:13:04 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -101,6 +101,7 @@ class cDevice : public cThread {
   static int useDevice;
   static cDevice *device[MAXDEVICES];
   static cDevice *primaryDevice;
+  static cDevice *avoidDevice;
 public:
   static int NumDevices(void) { return numDevices; }
          ///< Returns the total number of devices.
@@ -145,6 +146,9 @@ class cDevice : public cThread {
          ///< this device/CAM combination will be skipped in the next call to
          ///< GetDevice().
          ///< See also ProvidesChannel().
+  static void SetAvoidDevice(cDevice *Device) { avoidDevice = Device; }
+         ///< Sets the given Device to be temporarily avoided in the next call to
+         ///< GetDevice(const cChannel, int, bool).
   static void Shutdown(void);
          ///< Closes down all devices.
          ///< Must be called at the end of the program.
diff --git a/menu.c b/menu.c
index 7abe1bad5..37da3ddc8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.477 2008/02/16 13:53:26 kls Exp $
+ * $Id: menu.c 1.480 2008/02/24 10:28:46 kls Exp $
  */
 
 #include "menu.h"
@@ -1697,6 +1697,7 @@ void cMenuCam::Set(void)
         AddMultiLineItem(ciMenu->BottomText());
         dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->BottomText());
         }
+     cRemote::TriggerLastActivity();
      }
   else if (ciEnquiry) {
      Clear();
@@ -2126,7 +2127,7 @@ eOSState cMenuRecordings::Commands(eKeys Key)
      cRecording *recording = GetRecording(ri);
      if (recording) {
         cMenuCommands *menu;
-        eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(recording->FileName(), "\"$"))));
+        eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(recording->FileName(), "\\\"$"))));
         if (Key != kNone)
            state = menu->ProcessKey(Key);
         return state;
@@ -2497,7 +2498,7 @@ void cMenuSetupDVB::Setup(void)
      Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle languages"),    &numSubtitleLanguages, 0, I18nLanguages()->Size()));
      for (int i = 0; i < numSubtitleLanguages; i++)
          Add(new cMenuEditStraItem(tr("Setup.DVB$Subtitle language"), &data.SubtitleLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
-     Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle offset"),                  &data.SubtitleOffset,       -50, 50));
+     Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle offset"),                  &data.SubtitleOffset,      -100, 100));
      Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle foreground transparency"), &data.SubtitleFgTransparency, 0, 9));
      Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle background transparency"), &data.SubtitleBgTransparency, 0, 10));
      }
diff --git a/po/da_DK.po b/po/da_DK.po
index 8e6ac9608..22f9c4686 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -166,7 +166,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Undertekster"
 
 msgid "Key$Schedule"
 msgstr "Programoversigt"
@@ -187,31 +187,31 @@ msgid "Key$Commands"
 msgstr "Kommandoer"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Bruger1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Bruger2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Bruger3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Bruger4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Bruger5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Bruger6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Bruger7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Bruger8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Bruger9"
 
 msgid "Disk"
 msgstr "Disk"
@@ -259,10 +259,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -430,7 +430,7 @@ msgid "Please enter %d digits!"
 msgstr "Indtast venligst %d cifre!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM svarer ikke!"
 
 msgid "Recording info"
 msgstr "Optagelses info"
@@ -502,25 +502,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Anvend lille skrift"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Standard skrift"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Lille skrift"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fast skrift"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Standard skrift st�rrelse (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Lille skrift st�rrelse (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Fast skrift st�rrelse (pixel)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Placering af kanalinfo"
@@ -633,22 +633,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio sprog"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Vis undertekster"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Undertekst sprog (ant.)"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Undertekst sprog"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Undertekst offset"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Undertekst forgrundsgennemsigtighed"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Undertekst baggrundsgennemsigtighed"
 
 msgid "LNB"
 msgstr "LNB"
@@ -666,13 +666,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�vre LNB frekvens (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM nulstil"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM til stede"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM klar"
 
 msgid "CAM"
 msgstr "CAM"
@@ -681,7 +681,7 @@ msgid "Button$Menu"
 msgstr "Menu"
 
 msgid "Button$Reset"
-msgstr "Nulstille"
+msgstr "Nulstil"
 
 msgid "Opening CAM menu..."
 msgstr "�bner CAM menu..."
@@ -690,7 +690,7 @@ msgid "Can't open CAM menu!"
 msgstr "Kan ikke �bne CAM menuen!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM er i brug - virkelig nulstille?"
 
 msgid "Can't reset CAM!"
 msgstr "Kan ikke nulstille CAM!"
@@ -771,7 +771,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Kanal adgang timeout (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal ved opstart"
@@ -783,7 +783,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lydstyrke ved opstart"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "N�dudgang"
 
 msgid "Plugins"
 msgstr "Plugins"
@@ -840,13 +840,13 @@ msgid "No audio available!"
 msgstr "Ingen lyd tilg�ngelig!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Ingen undertekster"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Undertekster"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Ingen undertekster tilg�ngelig!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "For lidt harddisk plads til optagelse!"
@@ -907,7 +907,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke slukke - parameter '-s' ikke angivet!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Redigering igang - sluk alligevel?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Optagelse igang - sluk alligevel?"
@@ -921,10 +921,10 @@ msgstr "sluk alligevel?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s v�gner om %ld min, forts�t?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Redigering igang - genstart alligevel?"
 
 msgid "Recording - restart anyway?"
 msgstr "Optagelse igang - genstart alligevel?"
@@ -978,7 +978,7 @@ msgid "Recording started"
 msgstr "Optagelse startet"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR slukker senere - tryk Sluk for at tvinge"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Tryk vilk�rlig tast for at annullere sluk"
@@ -993,8 +993,8 @@ msgid "Editing process finished"
 msgstr "Redigeringsproces afsluttet"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Tryk vilk�rlig knap for at annullere genstart"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR slukker om %s minutter"
diff --git a/po/it_IT.po b/po/it_IT.po
index 413a8d15f..030fa6f8a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-10-16 02:15+0100\n"
+"PO-Revision-Date: 2008-02-21 20:29+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Channel not available!"
 msgstr "Canale non disponibile!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Impossibile iniziare la modalit� di trasferimento!"
+msgstr "Impossibile avviare la modalit� di trasferimento!"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -42,7 +42,7 @@ msgid "LanguageCode$eng"
 msgstr "ita"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Fase 1: tipo ricevitore RC"
+msgstr "Fase 1: Rilevamento tipo codice RC"
 
 msgid "Press any key on the RC unit"
 msgstr "Premi un tasto dell'unit� RC"
@@ -54,7 +54,7 @@ msgid "Do not press any key..."
 msgstr "Non premere alcun tasto..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Fase 2: Codici specifici dei tasti"
+msgstr "Fase 2: Apprendimento codici specifici dei tasti"
 
 #, c-format
 msgid "Press key for '%s'"
@@ -82,7 +82,7 @@ msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Salvataggio codici tasti"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Premi 'Su' per salvare, 'Gi�' per annullare"
+msgstr "Premi 'Su' per salvare, 'Gi�' per annullare"
 
 msgid "Key$Up"
 msgstr "Su"
@@ -169,7 +169,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr "Key$Sottotitoli"
+msgstr "Sottotitoli"
 
 msgid "Key$Schedule"
 msgstr "Programmi"
@@ -226,7 +226,7 @@ msgid "Free To Air"
 msgstr "in chiaro"
 
 msgid "encrypted"
-msgstr "criptato"
+msgstr "codificato"
 
 msgid "auto"
 msgstr "automatico"
@@ -283,7 +283,7 @@ msgid "Srate"
 msgstr "SymbolRate"
 
 msgid "Inversion"
-msgstr "Inversion"
+msgstr "Inversione"
 
 msgid "off"
 msgstr "off"
@@ -298,19 +298,19 @@ msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "Modulation"
+msgstr "Modulazione"
 
 msgid "Bandwidth"
 msgstr "Banda passante"
 
 msgid "Transmission"
-msgstr "Transmission"
+msgstr "Trasmissione"
 
 msgid "Guard"
 msgstr "Guard"
 
 msgid "Hierarchy"
-msgstr "Hierarchy"
+msgstr "Gerarchia"
 
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
@@ -325,16 +325,16 @@ msgid "Button$New"
 msgstr "Nuovo"
 
 msgid "Button$Delete"
-msgstr "Cancella"
+msgstr "Elimina"
 
 msgid "Button$Mark"
-msgstr "Marca"
+msgstr "Segna"
 
 msgid "Channel is being used by a timer!"
 msgstr "Canale occupato da un timer!"
 
 msgid "Delete channel?"
-msgstr "Cancellare il canale?"
+msgstr "Eliminare il canale?"
 
 msgid "Edit timer"
 msgstr "Modifica timer"
@@ -373,16 +373,16 @@ msgid "Timers"
 msgstr "Timer"
 
 msgid "Button$On/Off"
-msgstr "On/Off"
+msgstr "Attivo/Disattivo"
 
 msgid "Button$Info"
 msgstr "Informazioni"
 
 msgid "Delete timer?"
-msgstr "Cancellare il timer?"
+msgstr "Eliminare il timer?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Timer in registrazione - cancellare?"
+msgstr "Timer in registrazione - eliminare?"
 
 msgid "Event"
 msgstr "Eventi"
@@ -457,10 +457,10 @@ msgid "Error while accessing recording!"
 msgstr "Errore nell'accedere alla registrazione!"
 
 msgid "Delete recording?"
-msgstr "Cancellare la registrazione?"
+msgstr "Eliminare la registrazione?"
 
 msgid "Error while deleting recording!"
-msgstr "Errore nel cancellare la registrazione!"
+msgstr "Errore eliminazione della registrazione!"
 
 msgid "Recording commands"
 msgstr "Comandi di registrazione"
@@ -469,7 +469,7 @@ msgid "never"
 msgstr "mai"
 
 msgid "skin dependent"
-msgstr "in base allo stile"
+msgstr "in base allo stile interfaccia"
 
 msgid "always"
 msgstr "sempre"
@@ -502,7 +502,7 @@ msgid "Setup.OSD$Message time (s)"
 msgstr "Tempo del messaggio (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "Utilizzare caratteri piccoli"
+msgstr "Utilizza caratteri piccoli"
 
 msgid "Setup.OSD$Anti-alias"
 msgstr "Anti-alias"
@@ -541,7 +541,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Mostra informazioni al cambio canale"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Scadenza informazioni canale richieste"
+msgstr "Scadenza richieste informazioni canale"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scorri per pagine"
@@ -550,7 +550,7 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "Scorri riavvolgendo"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Utilizza il pulsante Menu per chiudere"
+msgstr "Utilizza il tasto Menu per chiudere"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Directory di registrazione"
@@ -562,13 +562,13 @@ msgid "Button$Scan"
 msgstr "Scansione"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Timeout scansione aggiorn. EPG (ore)"
+msgstr "Scadenza scansione aggiorn. EPG (ore)"
 
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Livello correzione EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Visualizzazione dati vecchi (min)"
+msgstr "Visualizzazione vecchi dati EPG (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Imposta orario automatico"
@@ -636,22 +636,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Lingua per l'audio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Setup.DVB$Mostra sottotitoli"
+msgstr "Mostra sottotitoli"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "Setup.DVB$Lingue sottotitoli"
+msgstr "Lingue sottotitoli"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "Setup.DVB$Lingua sottotitoli"
+msgstr "Lingua sottotitoli"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Setup.DVB$Posizione sottotitolo"
+msgstr "Posizione sottotitoli"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Setup.DVB$Trasparenza primo piano sottotitoli"
+msgstr "Trasparenza primo piano sottotitoli"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Setup.DVB$Trasparenza sfondo sottotitoli"
+msgstr "Trasparenza sfondo sottotitoli"
 
 msgid "LNB"
 msgstr "LNB"
@@ -729,10 +729,10 @@ msgid "Setup.Recording$Use VPS"
 msgstr "Utilizza VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "Margine VPS"
+msgstr "Margine VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Marca registrazione immediata"
+msgstr "Segna registrazione immediata"
 
 msgid "Setup.Recording$Name instant recording"
 msgstr "Nome registrazione immediata"
@@ -756,7 +756,7 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Mostra modalit� riproduzione"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID di rispristino"
+msgstr "ID di ripristino"
 
 msgid "Miscellaneous"
 msgstr "Generici"
@@ -786,7 +786,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Uscita d'emergenza"
 
 msgid "Plugins"
 msgstr "Plugins"
@@ -846,7 +846,7 @@ msgid "No subtitles"
 msgstr "Nessun sottotitolo"
 
 msgid "Button$Subtitles"
-msgstr "Button$Sottotitoli"
+msgstr "Sottotitoli"
 
 msgid "No subtitles available!"
 msgstr "Nessun sottotitolo disponibile!"
@@ -868,10 +868,10 @@ msgid "No editing marks defined!"
 msgstr "Nessun marcatore di modifica definito!"
 
 msgid "Can't start editing process!"
-msgstr "Impossibile iniziare il processo di modifica!"
+msgstr "Impossibile avviare il processo di modifica!"
 
 msgid "Editing process started"
-msgstr "Processo di modifica iniziato"
+msgstr "Processo di modifica avviato"
 
 msgid "Editing process already active!"
 msgstr "Processo di modifica gi� attivo!"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 59deeefed..729423e38 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -4,14 +4,15 @@
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
 # Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
+# Carel Willemse <ca_willemse@planet.nl>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
+"PO-Revision-Date: 2008-02-18 17:50+0200\n"
+"Last-Translator: Carel Willemse <ca_willemse@planet.nl>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -138,10 +139,10 @@ msgid "Key$FastRew"
 msgstr "Terugspoelen"
 
 msgid "Key$Next"
-msgstr ""
+msgstr "Volgende"
 
 msgid "Key$Prev"
-msgstr ""
+msgstr "Vorige"
 
 msgid "Key$Power"
 msgstr "Uitschakelen"
@@ -153,7 +154,7 @@ msgid "Key$Channel-"
 msgstr "Kanaal-"
 
 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "VorigKanaal"
 
 msgid "Key$Volume+"
 msgstr "Volume+"
@@ -168,10 +169,10 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Ondertiteling"
 
 msgid "Key$Schedule"
-msgstr "Gids"
+msgstr "ProgrammaGids"
 
 msgid "Key$Channels"
 msgstr "Kanalen"
@@ -189,43 +190,43 @@ msgid "Key$Commands"
 msgstr "Commando's"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Gebruiker1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Gebruiker2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Gebruiker3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Gebruiker4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Gebruiker5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Gebruiker6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Gebruiker7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Gebruiker8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Gebruiker9"
 
 msgid "Disk"
-msgstr "Disk"
+msgstr "Schijf"
 
 msgid "free"
 msgstr "vrij"
 
 msgid "Free To Air"
-msgstr ""
+msgstr "Vrij te ontvangen"
 
 msgid "encrypted"
-msgstr ""
+msgstr "gecodeerd"
 
 msgid "auto"
 msgstr "auto"
@@ -261,10 +262,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -297,19 +298,19 @@ msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "Modulation"
+msgstr "Modulatie"
 
 msgid "Bandwidth"
-msgstr "Bandwidth"
+msgstr "Bandbreedte"
 
 msgid "Transmission"
-msgstr "Transmission"
+msgstr "Transmissie"
 
 msgid "Guard"
 msgstr "Guard"
 
 msgid "Hierarchy"
-msgstr "Hierarchy"
+msgstr "Hierarchie"
 
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
@@ -363,7 +364,7 @@ msgid "Lifetime"
 msgstr "Bewaarduur"
 
 msgid "File"
-msgstr "Filenaam"
+msgstr "Bestandnaam"
 
 msgid "First day"
 msgstr "Eerste dag"
@@ -387,7 +388,7 @@ msgid "Event"
 msgstr "Uitzending"
 
 msgid "Button$Timer"
-msgstr ""
+msgstr "Timer"
 
 msgid "Button$Record"
 msgstr "Opnemen"
@@ -408,7 +409,7 @@ msgid "Button$Now"
 msgstr "Nu"
 
 msgid "Button$Schedule"
-msgstr "Programma"
+msgstr "Programmagids"
 
 msgid "Can't switch channel!"
 msgstr "Kan geen kanaal wisselen!"
@@ -419,20 +420,20 @@ msgstr "Programma - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr ""
+msgstr "Deze uitzending - %s"
 
 msgid "This event - all channels"
-msgstr ""
+msgstr "Deze uitzending - alle kanalen"
 
 msgid "All events - all channels"
-msgstr ""
+msgstr "Alle uitzendingen - alle kanalen"
 
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Vul %d cijfers in!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM reageert niet!"
 
 msgid "Recording info"
 msgstr "Opname info"
@@ -504,25 +505,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Klein lettertype gebruiken"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Standaard lettertype"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Kleine lettertype"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Letter met vaste breedte"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Afmetingen standaard lettertype (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Afmetingen klein lettertype (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Afmetingen lettertype met vaste breedte (pixel)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanaal info positie"
@@ -540,7 +541,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanaal info tonen"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr ""
+msgstr "Tijdsduur opgevraagde kanaalinfo."
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scrollen per pagina"
@@ -549,10 +550,10 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "Rondom scrollen"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr ""
+msgstr "Menu toets sluit ook af"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Opname directories"
+msgstr "Opname mappen"
 
 msgid "EPG"
 msgstr "EPG"
@@ -599,7 +600,7 @@ msgid "names only"
 msgstr "alleen namen"
 
 msgid "PIDs only"
-msgstr ""
+msgstr "alleen PIDs"
 
 msgid "names and PIDs"
 msgstr "namen en PIDs"
@@ -635,22 +636,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio taal"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Toon ondertiteling"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Talen ondertiteling"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Taal ondertiteling"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Positie ondertiteling"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparantie voorgrond ondertiteling"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparantie achtergrond ondertiteling"
 
 msgid "LNB"
 msgstr "LNB"
@@ -668,13 +669,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Hoogste LNB frequentie (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM herstarten"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM aanwezig"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM gereed"
 
 msgid "CAM"
 msgstr "CAM"
@@ -692,7 +693,7 @@ msgid "Can't open CAM menu!"
 msgstr "Kan CAM-menu niet openen!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM wordt gebruikt - werkelijk herstarten?"
 
 msgid "Can't reset CAM!"
 msgstr "Kan CAM niet herstarten!"
@@ -773,19 +774,19 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Tijdsduur kanaalinvoer (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Opstartkanaal"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "zoals eerder"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Opstartvolume"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Nooduitgang"
 
 msgid "Plugins"
 msgstr "Plugins"
@@ -807,7 +808,7 @@ msgid " Stop recording "
 msgstr " Stop opnemen "
 
 msgid "Schedule"
-msgstr "Gids"
+msgstr "Programmagids"
 
 msgid "VDR"
 msgstr "VDR"
@@ -826,7 +827,7 @@ msgid "Button$Stop"
 msgstr "Eindigen"
 
 msgid "Button$Resume"
-msgstr "Verder"
+msgstr "Hervat"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
@@ -842,16 +843,16 @@ msgid "No audio available!"
 msgstr "Geen audio beschikbaar!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Geen ondertiteling"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Ondertiteling"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Geen ondertiteling beschikbaar"
 
 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "Onvoldoende hardeschijfruimte voor deze opname!"
 
 msgid "No free DVB device to record!"
 msgstr "Geen vrije DVB kaart om op te nemen!"
@@ -903,13 +904,13 @@ msgid "Channel locked (recording)!"
 msgstr "Kanaal geblokkeerd (neemt op)!"
 
 msgid "Low disk space!"
-msgstr "Disk bijna vol!"
+msgstr "Hardeschijf bijna vol!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Bewerken aktief - toch uitschakelen?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Opname loopt - toch uitschakelen?"
@@ -923,10 +924,10 @@ msgstr "toch uitschakelen?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s wordt binnen %ld min. aktief, doorgaan?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Bewerken aktief - toch herstarten?"
 
 msgid "Recording - restart anyway?"
 msgstr "Opname loopt - toch opnieuw starten?"
@@ -953,13 +954,13 @@ msgid "MonTueWedThuFriSatSun"
 msgstr "MaaDinWoeDonVryZatZon"
 
 msgid "Monday"
-msgstr "maandag"
+msgstr "Maandag"
 
 msgid "Tuesday"
 msgstr "Dinsdag"
 
 msgid "Wednesday"
-msgstr "woensdag"
+msgstr "Woensdag"
 
 msgid "Thursday"
 msgstr "Donderdag"
@@ -974,13 +975,13 @@ msgid "Sunday"
 msgstr "Zondag"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "Opname start binnenkort!"
 
 msgid "Recording started"
-msgstr ""
+msgstr "Opname is gestart!"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR zal later uitschakelen - Druk 'Power' om te forceren"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Druk een toets om shutdown af te breken"
@@ -995,8 +996,8 @@ msgid "Editing process finished"
 msgstr "Bewerken is klaar"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Druk een willekeurige toets om herstarten af te breken"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR zal na %s minuten uitschakelen"
diff --git a/recording.c b/recording.c
index 4ecf4a96c..1535b46b8 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.161 2008/02/16 13:31:39 kls Exp $
+ * $Id: recording.c 1.162 2008/02/24 10:28:53 kls Exp $
  */
 
 #include "recording.h"
@@ -1161,7 +1161,7 @@ const char *cRecordingUserCommand::command = NULL;
 void cRecordingUserCommand::InvokeCommand(const char *State, const char *RecordingFileName)
 {
   if (command) {
-     cString cmd = cString::sprintf("%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\"$"));
+     cString cmd = cString::sprintf("%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\\\"$"));
      isyslog("executing '%s'", *cmd);
      SystemExec(cmd);
      }
diff --git a/remote.c b/remote.c
index c7eb7fb97..733ae31ca 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.57 2007/04/30 12:27:56 kls Exp $
+ * $Id: remote.c 1.59 2008/02/23 14:14:46 kls Exp $
  */
 
 #include "remote.h"
@@ -121,7 +121,7 @@ bool cRemote::PutMacro(eKeys Key)
 bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
 {
   char buffer[32];
-  snprintf(buffer, sizeof(buffer), "%016LX", Code);
+  snprintf(buffer, sizeof(buffer), "%016llX", Code);
   return Put(buffer, Repeat, Release);
 }
 
@@ -185,7 +185,7 @@ eKeys cRemote::Get(int WaitMs, char **UnknownCode)
             out = 0;
          if ((k & k_Repeat) != 0)
             repeatTimeout.Set(REPEATTIMEOUT);
-         lastActivity = time(NULL);
+         TriggerLastActivity();
          return enabled ? k : kNone;
          }
       else if (!WaitMs || !keyPressed.TimedWait(mutex, WaitMs) && repeatTimeout.TimedOut())
@@ -198,6 +198,11 @@ eKeys cRemote::Get(int WaitMs, char **UnknownCode)
       }
 }
 
+void cRemote::TriggerLastActivity(void)
+{
+  lastActivity = time(NULL);
+}
+
 // --- cRemotes --------------------------------------------------------------
 
 cRemotes Remotes;
diff --git a/remote.h b/remote.h
index a38d66160..46ad9564a 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.40 2007/04/30 12:37:37 kls Exp $
+ * $Id: remote.h 1.41 2008/02/23 14:38:47 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -67,6 +67,9 @@ class cRemote : public cListObject {
   static eKeys Get(int WaitMs = 1000, char **UnknownCode = NULL);
   static time_t LastActivity(void) { return lastActivity; }
       ///< Absolute time when last key was delivered by Get().
+  static void TriggerLastActivity(void);
+      ///< Simulates user activity, for instance to keep the current menu open
+      ///< even if no remote control key has been pressed.
   };
 
 class cRemotes : public cList<cRemote> {};
diff --git a/shutdown.c b/shutdown.c
index ea137edf9..d71a3a134 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 1.4 2008/01/13 14:27:29 kls Exp $
+ * $Id: shutdown.c 1.5 2008/02/24 10:29:00 kls Exp $
  */
 
 #include "shutdown.h"
@@ -130,7 +130,7 @@ void cShutdownHandler::SetShutdownCommand(const char *ShutdownCommand)
 void cShutdownHandler::CallShutdownCommand(time_t WakeupTime, int Channel, const char *File, bool UserShutdown)
 {
   time_t Delta = WakeupTime ? WakeupTime - time(NULL) : 0;
-  cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\"$"), UserShutdown);
+  cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\\\"$"), UserShutdown);
   isyslog("executing '%s'", *cmd);
   int Status = SystemExec(cmd, true);
   if (!WIFEXITED(Status) || WEXITSTATUS(Status))
diff --git a/skinclassic.c b/skinclassic.c
index ad26cfdc0..6c36278ba 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.25 2008/02/17 14:23:36 kls Exp $
+ * $Id: skinclassic.c 1.27 2008/02/23 10:31:58 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -233,14 +233,15 @@ void cSkinClassicDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, in
 {
   if (Total > 0 && Total > Shown) {
      int yt = Top;
-     int yb = yt + Height - 1;
+     int yb = yt + Height;
      int st = yt;
      int sb = yb;
-     int tt = st + (sb - st + 1) * Offset / Total;
-     int tb = tt + (sb - st + 1) * Shown / Total;
+     int th = max(int((sb - st) * double(Shown) / Total + 0.5), ScrollWidth);
+     int tt = min(int(st + (sb - st) * double(Offset) / Total + 0.5), sb - th);
+     int tb = min(tt + th, sb);
      int xl = x3 - ScrollWidth;
-     osd->DrawRectangle(xl, st, x3 - 1, sb, Theme.Color(clrMenuScrollbarTotal));
-     osd->DrawRectangle(xl, tt, x3 - 1, tb, Theme.Color(clrMenuScrollbarShown));
+     osd->DrawRectangle(xl, st, x3 - 1, sb - 1, Theme.Color(clrMenuScrollbarTotal));
+     osd->DrawRectangle(xl, tt, x3 - 1, tb - 1, Theme.Color(clrMenuScrollbarShown));
      }
 }
 
diff --git a/skinsttng.c b/skinsttng.c
index 0aa22b72f..f6298411c 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.26 2008/02/17 14:23:45 kls Exp $
+ * $Id: skinsttng.c 1.28 2008/02/23 10:23:44 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -442,13 +442,14 @@ void cSkinSTTNGDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int
   if (Total > 0 && Total > Shown) {
      int h  = lineHeight;
      int yt = Top;
-     int yb = yt + Height - 1;
+     int yb = yt + Height;
      int st = yt + h + Gap;
      int sb = yb - h - Gap;
-     int tt = st + (sb - st + 1) * Offset / Total;
-     int tb = tt + (sb - st + 1) * Shown / Total;
-     osd->DrawRectangle(x5, st, x5 + ScrollWidth - 1, sb, Theme.Color(clrMenuScrollbarTotal));
-     osd->DrawRectangle(x5, tt, x5 + ScrollWidth - 1, tb, Theme.Color(clrMenuScrollbarShown));
+     int th = max(int((sb - st) * double(Shown) / Total + 0.5), ScrollWidth);
+     int tt = min(int(st + (sb - st) * double(Offset) / Total + 0.5), sb - th);
+     int tb = min(tt + th, sb);
+     osd->DrawRectangle(x5, st, x5 + ScrollWidth - 1, sb - 1, Theme.Color(clrMenuScrollbarTotal));
+     osd->DrawRectangle(x5, tt, x5 + ScrollWidth - 1, tb - 1, Theme.Color(clrMenuScrollbarShown));
      osd->DrawRectangle(x5, yt, x6 - 1, yt + h - 1, frameColor);
      osd->DrawEllipse  (x6, yt, x7 - 1, yt + h - 1, frameColor, 5);
      osd->DrawRectangle(x5, yb - h, x6 - 1, yb - 1, frameColor);
diff --git a/vdr.c b/vdr.c
index 9f8dcdcda..af690ea7e 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.310 2008/02/10 14:23:31 kls Exp $
+ * $Id: vdr.c 1.312 2008/02/23 15:36:01 kls Exp $
  */
 
 #include <getopt.h>
@@ -730,7 +730,7 @@ int main(int argc, char *argv[])
         // Make sure we have a visible programme in case device usage has changed:
         if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
-           if (Now - lastTime > MINCHANNELWAIT) {
+           if (!Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
               if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
                  if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
@@ -877,7 +877,9 @@ int main(int argc, char *argv[])
                            }
                         if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
                            // the previous SwitchChannel() has switched away the current live channel
-                           Channels.SwitchTo(Timer->Channel()->Number()); // avoids toggling between old channel and black screen
+                           cDevice::SetAvoidDevice(Device);
+                           if (!Channels.SwitchTo(cDevice::CurrentChannel())) // try to switch to the original channel on a different device...
+                              Channels.SwitchTo(Timer->Channel()->Number()); // ...or avoid toggling between old channel and black screen
                            Skins.Message(mtInfo, tr("Upcoming recording!"));
                            }
                         }

From 0872cba0a10c1350e6f694ea2296947428a97326 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 2 Mar 2008 18:00:00 +0100
Subject: [PATCH 183/307] =?UTF-8?q?Version=201.5.17=20-=20Updated=20the=20?=
 =?UTF-8?q?Swedish=20OSD=20texts=20(thanks=20to=20Tomas=20Berglund).=20-?=
 =?UTF-8?q?=20Made=20the=20'pic2mpg'=20script=20of=20the=20'pictures'=20pl?=
 =?UTF-8?q?ugin=20work=20with=20uppercase=20filename=20=20=20extensions=20?=
 =?UTF-8?q?and=20relative=20paths=20(thanks=20to=20Stefan=20Wagner=20for?=
 =?UTF-8?q?=20reporting=20this=20one).=20-=20Updated=20the=20Romanian=20OS?=
 =?UTF-8?q?D=20texts=20(thanks=20to=20Lucian=20Muresan).=20-=20Updated=20t?=
 =?UTF-8?q?he=20Dutch=20OSD=20texts=20(thanks=20to=20Johan=20Schuring).=20?=
 =?UTF-8?q?-=20Stripping=20control=20codes=200x86=20and=200x87=20from=20SI?=
 =?UTF-8?q?=20strings.=20-=20Updated=20French=20language=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Jean-Claude=20Repetto).=20-=20Fixed=20handling=203=20an?=
 =?UTF-8?q?d=204=20byte=20UTF-8=20symbols=20in=20Utf8CharGet()=20(thanks?=
 =?UTF-8?q?=20to=20Andreas=20=20=20Mair).=20-=20Fixed=20a=20crash=20in=20c?=
 =?UTF-8?q?FreetypeFont::DrawText()=20if=20an=20unknown=20symbol=20is=20en?=
 =?UTF-8?q?countered=20=20=20(thanks=20to=20Tobias=20Grimm).=20Unknown=20s?=
 =?UTF-8?q?ymbols=20are=20replaced=20with=20a=20'=3F'.=20-=20Updated=20the?=
 =?UTF-8?q?=20Slovenian=20OSD=20texts=20(thanks=20to=20Matjaz=20Thaler).?=
 =?UTF-8?q?=20-=20Updated=20the=20Czech=20OSD=20texts=20(thanks=20to=20Vla?=
 =?UTF-8?q?dim=C3=ADr=20B=C3=A1rta=20and=20Jiri=20Dobry).=20-=20Updated=20?=
 =?UTF-8?q?the=20Turkish=20OSD=20texts=20(thanks=20to=20Oktay=20Yolge?=
 =?UTF-8?q?=C3=A7en).=20-=20The=20'plugins'=20target=20in=20the=20Makefile?=
 =?UTF-8?q?=20now=20returns=20an=20error=20exit=20code=20if=20one=20of=20t?=
 =?UTF-8?q?he=20=20=20plugins=20failed=20to=20compile=20(suggested=20by=20?=
 =?UTF-8?q?Tobias=20Grimm).=20-=20Rendering=20the=20non-breaking=20space?=
 =?UTF-8?q?=20symbol=20as=20a=20blank=20(thanks=20to=20Tobias=20Grimm).=20?=
 =?UTF-8?q?-=20Changed=20the=20default=20character=20set=20for=20SI=20data?=
 =?UTF-8?q?=20from=20ISO6937=20(as=20required=20by=20the=20DVB=20=20=20sta?=
 =?UTF-8?q?ndard=20ETSI=20EN=20300=20468)=20to=20ISO-8859-9,=20in=20order?=
 =?UTF-8?q?=20to=20work=20around=20the=20stupidity=20of=20=20=20some=20pro?=
 =?UTF-8?q?viders,=20who=20actually=20use=20ISO-8859-9,=20but=20fail=20to?=
 =?UTF-8?q?=20correctly=20announce=20that.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                       | 13 +++-
 HISTORY                            | 25 +++++++-
 Makefile                           |  4 +-
 PLUGINS/src/hello/po/ca_ES.po      |  6 +-
 PLUGINS/src/hello/po/cs_CZ.po      |  6 +-
 PLUGINS/src/hello/po/da_DK.po      |  6 +-
 PLUGINS/src/hello/po/de_DE.po      |  6 +-
 PLUGINS/src/hello/po/el_GR.po      |  6 +-
 PLUGINS/src/hello/po/es_ES.po      |  6 +-
 PLUGINS/src/hello/po/et_EE.po      |  6 +-
 PLUGINS/src/hello/po/fi_FI.po      |  6 +-
 PLUGINS/src/hello/po/fr_FR.po      |  6 +-
 PLUGINS/src/hello/po/hr_HR.po      |  6 +-
 PLUGINS/src/hello/po/hu_HU.po      |  6 +-
 PLUGINS/src/hello/po/it_IT.po      |  6 +-
 PLUGINS/src/hello/po/nl_NL.po      |  6 +-
 PLUGINS/src/hello/po/nn_NO.po      |  6 +-
 PLUGINS/src/hello/po/pl_PL.po      |  6 +-
 PLUGINS/src/hello/po/pt_PT.po      |  6 +-
 PLUGINS/src/hello/po/ro_RO.po      |  6 +-
 PLUGINS/src/hello/po/ru_RU.po      |  6 +-
 PLUGINS/src/hello/po/sl_SI.po      |  6 +-
 PLUGINS/src/hello/po/sv_SE.po      |  6 +-
 PLUGINS/src/hello/po/tr_TR.po      |  6 +-
 PLUGINS/src/pictures/HISTORY       |  5 ++
 PLUGINS/src/pictures/pic2mpg       |  9 +--
 PLUGINS/src/pictures/pictures.c    |  4 +-
 PLUGINS/src/pictures/po/de_DE.po   |  4 +-
 PLUGINS/src/pictures/po/fi_FI.po   |  4 +-
 PLUGINS/src/pictures/po/fr_FR.po   |  8 +--
 PLUGINS/src/pictures/po/it_IT.po   |  2 +-
 PLUGINS/src/skincurses/po/de_DE.po |  6 +-
 PLUGINS/src/skincurses/po/fi_FI.po |  6 +-
 PLUGINS/src/skincurses/po/it_IT.po |  6 +-
 config.h                           |  6 +-
 font.c                             | 11 +++-
 libsi/si.c                         |  6 +-
 po/ca_ES.po                        |  6 +-
 po/cs_CZ.po                        | 99 +++++++++++++++---------------
 po/da_DK.po                        |  8 +--
 po/de_DE.po                        |  8 +--
 po/el_GR.po                        |  8 +--
 po/es_ES.po                        |  8 +--
 po/et_EE.po                        |  8 +--
 po/fi_FI.po                        | 10 +--
 po/fr_FR.po                        | 76 +++++++++++------------
 po/hr_HR.po                        |  8 +--
 po/hu_HU.po                        | 10 +--
 po/it_IT.po                        | 11 ++--
 po/nl_NL.po                        | 17 ++---
 po/nn_NO.po                        |  6 +-
 po/pl_PL.po                        | 11 ++--
 po/pt_PT.po                        |  6 +-
 po/ro_RO.po                        | 94 ++++++++++++++--------------
 po/ru_RU.po                        | 10 +--
 po/sl_SI.po                        | 92 +++++++++++++--------------
 po/sv_SE.po                        | 73 +++++++++++-----------
 po/tr_TR.po                        | 36 +++++------
 po/uk_UA.po                        |  6 +-
 tools.c                            |  8 +--
 60 files changed, 461 insertions(+), 403 deletions(-)
 mode change 100755 => 100644 PLUGINS/src/pictures/po/it_IT.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 85902fd93..9287677c2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -957,6 +957,7 @@ Andreas Mair <andreas@vdr-developer.org>
  not NULL
  for making the SVDRP command LSTC list the channels with group separators if the
  option ':groups' is given
+ for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet()
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -2093,12 +2094,16 @@ Jurij Retzlaff <jurij@topofweb.de>
 Richard Lithvall <richard@lithvall.se>
  for adding a tolerance for symbol rate values that are off by one
 
-Tobias Grimm <listaccount@e-tobi.net>
+Tobias Grimm <tobias.grimm@e-tobi.net>
  for suggesting to use geteuid() to check whether VDR is running as user 'root'
  for fixing a memory leak in handling external EPG data
  for fixing a memory leak in closing the video file during replay
  for fixing deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD()
  for reporting that GCC 4.3 issues a silly warning for expressions like 'a || b && c'
+ for fixing a crash in cFreetypeFont::DrawText() if an unknown symbol is encountered
+ for suggesting that the 'plugins' target in the Makefile should return an error exit
+ code if one of the plugins failed to compile
+ for making the non-breaking space symbol be rendered as a blank
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2310,3 +2315,9 @@ Benedikt Elser <elser@in.tum.de>
 
 Carel Willemse <ca_willemse@planet.nl>
  for translating OSD texts to the Dutch language
+
+Tomas Berglund <tomber@telia.com>
+ for translating OSD texts to the Swedish language
+
+Johan Schuring <johan.schuring@vetteblei.nl>
+ for translating OSD texts to the Dutch language
diff --git a/HISTORY b/HISTORY
index 56ff6fa49..ef4477c02 100644
--- a/HISTORY
+++ b/HISTORY
@@ -531,7 +531,7 @@ Video Disk Recorder Revision History
 2001-06-26: Version 0.83
 
 - Avoiding "Device or resource busy" error message when setting PIDs.
-- Added Portugese language texts (thanks to Paulo Lopes).
+- Added Portuguese language texts (thanks to Paulo Lopes).
 - Recording and replaying Dolby Digital (AC3) sound.
 - No longer getting stuck when a channel doesn't sync while switching
   with the 'Up' and 'Down' keys.
@@ -5670,3 +5670,26 @@ Video Disk Recorder Revision History
   (thanks to Rolf Ahrenberg).
 - Added the backslash ('\') to the list of characters that need to be escaped
   when executing external commands (thanks to Peter Bieringer for reporting this one).
+
+2008-03-02: Version 1.5.17
+
+- Updated the Swedish OSD texts (thanks to Tomas Berglund).
+- Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename
+  extensions and relative paths (thanks to Stefan Wagner for reporting this one).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the Dutch OSD texts (thanks to Johan Schuring).
+- Stripping control codes 0x86 and 0x87 from SI strings.
+- Updated French language texts (thanks to Jean-Claude Repetto).
+- Fixed handling 3 and 4 byte UTF-8 symbols in Utf8CharGet() (thanks to Andreas
+  Mair).
+- Fixed a crash in cFreetypeFont::DrawText() if an unknown symbol is encountered
+  (thanks to Tobias Grimm). Unknown symbols are replaced with a '?'.
+- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
+- Updated the Czech OSD texts (thanks to Vladim�r B�rta and Jiri Dobry).
+- Updated the Turkish OSD texts (thanks to Oktay Yolge�en).
+- The 'plugins' target in the Makefile now returns an error exit code if one of the
+  plugins failed to compile (suggested by Tobias Grimm).
+- Rendering the non-breaking space symbol as a blank (thanks to Tobias Grimm).
+- Changed the default character set for SI data from ISO6937 (as required by the DVB
+  standard ETSI EN 300 468) to ISO-8859-9, in order to work around the stupidity of
+  some providers, who actually use ISO-8859-9, but fail to correctly announce that.
diff --git a/Makefile b/Makefile
index bbf670341..b07b1dfba 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.112 2008/01/13 12:53:17 kls Exp $
+# $Id: Makefile 1.113 2008/02/29 21:43:03 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -153,7 +153,7 @@ plugins: include-dir
 	    $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\
 	    done;\
 	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
-	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; fi
+	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
 
 clean-plugins:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index f1f2a5839..6d6e01521 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -7,12 +7,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Catalanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index 756a3f04d..d90d417eb 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index f3dc75b40..904f4d525 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index 5a3c127b3..aef2ca773 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <kls@cadsoft.de>, 2000
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index 2862841d7..a0366c0f1 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index ee74cca6c..a5f3bf2ba 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index 802465f40..2fefc5d83 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <kasjas@hot.ee>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Estonian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index f67109b3c..68d723c8b 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002
@@ -8,12 +8,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index f50541946..6b69f3ba8 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003
@@ -8,12 +8,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index ef14e622d..768611dd2 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -1,17 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Drazen Dupor <drazen.dupor@dupor.com>, 2004
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index dc5434679..c349a761c 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -1,17 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index c6fbdb1c6..e4295c6e9 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 59e8f0485..0eb798ff7 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
@@ -7,12 +7,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index e9d5f329f..9b3682dae 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -1,17 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Norwegian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 9187318d6..0d6c69609 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index b76f1fd19..7cca3704a 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index f2db4ac46..87df8e42a 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -1,17 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Romanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index 0f429acae..c7d1ea9b5 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index dcc35e3e6..cf27896af 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -1,17 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Slovenian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index c7728cd82..b3c0cc206 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -1,17 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index ce9eddaa8..74585b46c 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 174fd30d4..243c07689 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -24,3 +24,8 @@ VDR Plugin 'pictures' Revision History
 - Fixed setting the OSD area.
 - Introduced 'operator const void * ()' in cString to catch cases where operator*()
   should be used.
+
+2008-02-29: Version 0.0.6
+
+- Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename
+  extensions and relative paths (reported by Stefan Wagner <stefanwag@gmx.at>).
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 6cd743595..af58f9757 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,11 +7,12 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 1.2 2008/02/02 11:34:43 kls Exp $
+# $Id: pic2mpg 1.4 2008/02/29 14:34:22 kls Exp $
 
 ## TODO implement HDTV (1920 x 1080)
 
 use File::Path;
+use File::Spec;
 use Getopt::Std;
 use Image::Size;
 
@@ -87,8 +88,8 @@ if (-f $ARGV[0]) {
 
 die "$0: mixed directory and file ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -d $ARGV[1];
 
-$PICDIR = $ARGV[0];
-$MPGDIR = $ARGV[1];
+$PICDIR = File::Spec->rel2abs($ARGV[0]);
+$MPGDIR = File::Spec->rel2abs($ARGV[1]);
 
 # Convert pictures to mpegs:
 
@@ -143,7 +144,7 @@ for ($i = 0; $i < 10; $i++) { # dirs might become empty when removing empty subd
 sub ConvertFile
 {
   my ($Pict, $Mpeg) = @_;
-  (my $Type) = $Pict =~ /\.([^\.]*)$/;
+  (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
   if (!defined $PNMCONV{$Type}) {
      return if ($Ignore);
      die "unknown file type '$Type': '$Pict'\n";
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 6e64c4e3d..bb03c3016 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 1.5 2008/02/09 12:15:52 kls Exp $
+ * $Id: pictures.c 1.6 2008/02/29 14:38:31 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.5";
+static const char *VERSION       = "0.0.6";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index 48f942e5b..62811aecf 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2008.
+# Klaus Schmidinger <kls@cadsoft.de>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index df5a4a11b..932807fa1 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008.
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 54933aae0..379ee3558 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Patrice Staudt <patrice.staudt@laposte.net>, 2008."
+# Patrice Staudt <ipatrice.staudt@laposte.net>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
-"Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
-"Language-Team: France\n"
+"Last-Translator: Patrice Staudt <ipatrice.staudt@laposte.net>\n"
+"Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
old mode 100755
new mode 100644
index d16fc4c5d..62d0bdffa
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index 98659dffe..5e3ce2cad 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <kls@cadsoft.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-08-15 16:04+0200\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 1f527cd57..89779cca6 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-08-14 20:54+0300\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 8dc4556a8..038b6e525 100755
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -1,16 +1,16 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-08-15 16:04+0200\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/config.h b/config.h
index d0fdf38cb..cfeaef2cf 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.306 2008/02/17 16:04:52 kls Exp $
+ * $Id: config.h 1.307 2008/02/24 12:29:54 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.16"
-#define VDRVERSNUM   10516  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.17"
+#define VDRVERSNUM   10517  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/font.c b/font.c
index 2f14d14f6..b458e8902 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.23 2008/02/09 11:52:25 kls Exp $
+ * $Id: font.c 1.25 2008/03/01 10:19:41 kls Exp $
  */
 
 #include "font.h"
@@ -184,6 +184,10 @@ int cFreetypeFont::Kerning(cGlyph *Glyph, uint PrevSym) const
 
 cGlyph* cFreetypeFont::Glyph(uint CharCode, bool AntiAliased) const
 {
+  // Non-breaking space:
+  if (CharCode == 0xA0)
+     CharCode = 0x20;
+
   // Lookup in cache:
   cList<cGlyph> *glyphCache = AntiAliased ? &glyphCacheAntiAliased : &glyphCacheMonochrome;
   for (cGlyph *g = glyphCache->First(); g; g = glyphCache->Next(g)) {
@@ -214,6 +218,9 @@ cGlyph* cFreetypeFont::Glyph(uint CharCode, bool AntiAliased) const
         return Glyph;
         }
      }
+#define UNKNOWN_GLYPH_INDICATOR '?'
+  if (CharCode != UNKNOWN_GLYPH_INDICATOR)
+     return Glyph(UNKNOWN_GLYPH_INDICATOR, AntiAliased);
   return NULL;
 }
 
@@ -258,6 +265,8 @@ void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColo
            uint sym = Utf8CharGet(s, sl);
            s += sl;
            cGlyph *g = Glyph(sym, AntiAliased);
+           if (!g)
+              continue;
            int kerning = Kerning(g, prevSym);
            prevSym = sym;
            uchar *buffer = g->Bitmap();
diff --git a/libsi/si.c b/libsi/si.c
index c75f19a9f..43ef03824 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.22 2007/07/21 13:49:48 kls Exp $
+ *   $Id: si.c 1.24 2008/03/01 12:02:01 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -340,6 +340,9 @@ bool SetSystemCharacterTable(const char *CharacterTable) {
 // and length are adjusted accordingly.
 static const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL) {
    const char *cs = "ISO6937";
+   cs = "ISO-8859-9"; // Workaround for broadcaster stupidity: according to
+   // "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some
+   // broadcasters actually use ISO-8859-9, but fail to correctly announce that.
    if (isSingleByte)
       *isSingleByte = false;
    if (length <= 0)
@@ -415,7 +418,6 @@ void String::decodeText(char *buffer, int size) {
       if (    ((' ' <= *from) && (*from <= '~'))
            || (*from == '\n')
            || (0xA0 <= *from)
-           || (*from == 0x86 || *from == 0x87)
          )
          *to++ = *from;
       else if (*from == 0x8A)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 02855b79a..bfa168041 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -7,12 +7,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Catalanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 0d7c197f6..336a7e673 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,16 +1,17 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
+# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006, 2008
+# Ji�� Dobr� <jdobry@centrum.cz>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2008-02-28 15:00+0200\n"
+"Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
+"Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,7 +167,7 @@ msgid "Key$Audio"
 msgstr "Zvuk"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Titulky"
 
 msgid "Key$Schedule"
 msgstr "Program (EPG)"
@@ -187,31 +188,31 @@ msgid "Key$Commands"
 msgstr "P��kazy"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "U�ivatel1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "U�ivatel2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "U�ivatel3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "U�ivatel4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "U�ivatel5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "U�ivatel6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "U�ivatel7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "U�ivatel8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "U�ivatel9"
 
 msgid "Disk"
 msgstr "Disk"
@@ -259,10 +260,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -430,7 +431,7 @@ msgid "Please enter %d digits!"
 msgstr "Pros�m vlo�te %d znak�!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM neodpov�d�!"
 
 msgid "Recording info"
 msgstr "Detail nahr�vky"
@@ -502,25 +503,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Pou��vat mal� p�smo"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Vyhladit p�smo"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "V�choz� p�smo"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Mal� p�smo"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fixn� p�smo"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Velikost v�choz�ho p�sma (pixely)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Velikost mal�ho p�sma (pixely)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Velikost fixn�ho p�sma (pixely)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozice informace o kan�lu"
@@ -633,22 +634,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Jazyk zvuku"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Zobrazovat titulky"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Jazyky titulk�"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Jazyk titulk�"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Posunut� titulk�"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Pr�hlednost p�sma titulk�"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Pr�hlednost pozad� titulk�"
 
 msgid "LNB"
 msgstr "LNB"
@@ -666,13 +667,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Horn� frekvence LNB (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Reset CAMu"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM p��tomen"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM p�ipraven"
 
 msgid "CAM"
 msgstr "CAM"
@@ -690,7 +691,7 @@ msgid "Can't open CAM menu!"
 msgstr "Menu CAM nen� dostupn�"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM se pou��v� - opravdu restartovat?"
 
 msgid "Can't reset CAM!"
 msgstr "CAM modul nelze restartovat!"
@@ -771,7 +772,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�asov� limit Zap (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Prodleva p�i volb� kan�lu (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kan�l po spu�t�n�"
@@ -783,7 +784,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spu�t�n�"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Nouzov� ukon�en�"
 
 msgid "Plugins"
 msgstr "Moduly"
@@ -840,13 +841,13 @@ msgid "No audio available!"
 msgstr "Zvuk nen� dostupn�!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Bez titulk�"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Titulky"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "��dn� dostupn� titulky!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!"
@@ -904,10 +905,10 @@ msgid "Low disk space!"
 msgstr "Disk bude brzy zapln�n!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Vypnut� nen� mo�n� - chb� volba '-s'!"
+msgstr "Vypnut� nen� mo�n� - chyb� volba '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Edituji - p�esto vypnout?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Syst�m je zanepr�zdn�n - p�esto vypnout?"
@@ -921,10 +922,10 @@ msgstr "p
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Modul %s startuje za %ld min., pokra�ovat?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Edituji - p�esto restartovat?"
 
 msgid "Recording - restart anyway?"
 msgstr "Syst�m je zanepr�zdn�n - p�esto restartovat?"
@@ -944,7 +945,7 @@ msgstr "ST:TNG konzola"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "PUS�PSN"
+msgstr "P�S�PSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
@@ -978,7 +979,7 @@ msgid "Recording started"
 msgstr "Za�alo nahr�v�n�"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "Vypnut� VDR bude odlo�eno - vypnete kl�vesou Power"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Jak�koliv kl�vesa zru�� vypnut�"
@@ -993,8 +994,8 @@ msgid "Editing process finished"
 msgstr "Edita�n� proces skon�il"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Jak�koliv kl�vesa zru�� restart"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR se vypne za %s minut"
diff --git a/po/da_DK.po b/po/da_DK.po
index 22f9c4686..11fc18370 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Mogens Elneff <mogens@elneff.dk>, 2004
+# Mogens Elneff <mogens@elneff.dk>, 2004, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 035b01980..60921ca46 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2000
+# Klaus Schmidinger <kls@cadsoft.de>, 2000-2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/el_GR.po b/po/el_GR.po
index 59d9f4310..abf4e75c9 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
+# Dimitrios Dimitrakos <mail@dimitrios.de>, 2002, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index a470a72bf..3626752cb 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
+# Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/et_EE.po b/po/et_EE.po
index f7477dd26..9b10cf655 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Arthur Konovalov <kasjas@hot.ee>, 2004
+# Arthur Konovalov <kasjas@hot.ee>, 2004, 2005, 2006, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Estonian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 8a7e75a84..5d1f00763 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,19 +1,19 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
-# Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002
+# Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002, 2003
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003, 2004, 2005, 2006, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 8bf2ca0cc..854914974 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,8 +1,8 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Jean-Claude Repetto <jc@repetto.org>, 2001
-# Olivier Jacques <jacquesolivier@hotmail.com>, 2003
+# Jean-Claude Repetto <jc@repetto.org>, 2001, 2002, 2008
+# Olivier Jacques <jacquesolivier@hotmail.com>, 2003, 2005
 # Gregoire Favre <greg@magma.unil.ch>, 2003
 # Nicolas Huillard <nhuillard@e-dition.fr>, 2005
 # Pierre Briec <pbriec@free.fr>, 2006
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-10-18 16:12+0100\n"
-"Last-Translator: Michael Nival <mnival@club-internet.fr>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2008-02-27 18:14+0100\n"
+"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
+"Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -172,7 +172,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr "Sous-Titres"
+msgstr "Sous-titres"
 
 msgid "Key$Schedule"
 msgstr "Programmes"
@@ -226,7 +226,7 @@ msgid "free"
 msgstr "restant"
 
 msgid "Free To Air"
-msgstr "Aucun cryptage"
+msgstr "En clair"
 
 msgid "encrypted"
 msgstr "Crypt�"
@@ -265,16 +265,16 @@ msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
 msgid "Spid1"
-msgstr "Sous-Titre (1)"
+msgstr "Sous-titre (1)"
 
 msgid "Spid2"
-msgstr "Sous-Titre (2)"
+msgstr "Sous-titre (2)"
 
 msgid "Tpid"
-msgstr "PID T�l�texte"
+msgstr "PID t�l�texte"
 
 msgid "CA"
-msgstr "Cryptage"
+msgstr "Acc�s conditionnel"
 
 msgid "Sid"
 msgstr "Sid"
@@ -283,7 +283,7 @@ msgid "Polarization"
 msgstr "Polarisation"
 
 msgid "Srate"
-msgstr "Fr�q. Symbole"
+msgstr "Fr�q. symbole"
 
 msgid "Inversion"
 msgstr "Inversion"
@@ -310,7 +310,7 @@ msgid "Transmission"
 msgstr "Transmission"
 
 msgid "Guard"
-msgstr "Guard"
+msgstr "Intervalle de garde"
 
 msgid "Hierarchy"
 msgstr "Hi�rarchie"
@@ -394,7 +394,7 @@ msgid "Button$Timer"
 msgstr "Programmation"
 
 msgid "Button$Record"
-msgstr "Enregistre"
+msgstr "Enregistrer"
 
 msgid "Button$Switch"
 msgstr "Regarder"
@@ -406,7 +406,7 @@ msgid "What's on next?"
 msgstr "Prochains programmes"
 
 msgid "Button$Next"
-msgstr "Apr�s"
+msgstr "Apr�s"
 
 msgid "Button$Now"
 msgstr "Maintenant"
@@ -436,7 +436,7 @@ msgid "Please enter %d digits!"
 msgstr "Veuillez entrer %d chiffres !"
 
 msgid "CAM not responding!"
-msgstr "Pas de r�ponse de la CAM"
+msgstr "Pas de r�ponse du CAM"
 
 msgid "Recording info"
 msgstr "Infos sur l'enregistrement"
@@ -508,7 +508,7 @@ msgid "Setup.OSD$Use small font"
 msgstr "Utiliser les petites polices"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Anti-aliasing"
+msgstr "Anti-cr�nelage"
 
 msgid "Setup.OSD$Default font"
 msgstr "Police par d�faut"
@@ -639,16 +639,16 @@ msgid "Setup.DVB$Audio language"
 msgstr "Langue audio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Afficher les Sous-Titres"
+msgstr "Afficher les sous-titres"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "Langues des Sous-Titres"
+msgstr "Langues des sous-titres"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "Langue de Sous-Titre"
+msgstr "Langue des sous-titres"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Offset du Sous-Titre"
+msgstr "Offset des sous-titres"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
 msgstr "Transparence de l'avant-plan"
@@ -672,13 +672,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Fr�quence haute LNB (MHz)"
 
 msgid "CAM reset"
-msgstr "CAM remise � z�ro"
+msgstr "CAM remis � z�ro"
 
 msgid "CAM present"
-msgstr "CAM pr�sente"
+msgstr "CAM pr�sent"
 
 msgid "CAM ready"
-msgstr "CAM pr�te"
+msgstr "CAM pr�t"
 
 msgid "CAM"
 msgstr "Acc�s conditionnel"
@@ -699,7 +699,7 @@ msgid "CAM is in use - really reset?"
 msgstr "CAM en cours d'utilisation - Remettre � z�ro ?"
 
 msgid "Can't reset CAM!"
-msgstr "Impossible de r�initialiser la CAM !"
+msgstr "Impossible de r�initialiser le CAM !"
 
 msgid "Recording"
 msgstr "Enregistrement"
@@ -744,7 +744,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Dur�e enregistr. imm�diat (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Taille maxi des fichiers (MB)"
+msgstr "Taille maxi des fichiers (Mo)"
 
 msgid "Setup.Recording$Split edited files"
 msgstr "S�parer les s�quences �dit�es"
@@ -789,13 +789,13 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Arr�t d'urgence"
 
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Greffons"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ce plugin n'a pas de param�tres!"
+msgstr "Ce greffon n'a pas de param�tres!"
 
 msgid "Setup"
 msgstr "Configuration"
@@ -843,16 +843,16 @@ msgid "Cancel editing?"
 msgstr "Annuler les modifications ?"
 
 msgid "No audio available!"
-msgstr "Pas d'audio disponible !"
+msgstr "Pas de son disponible !"
 
 msgid "No subtitles"
-msgstr "Pas de Sous-Titres"
+msgstr "Pas de sous-titres"
 
 msgid "Button$Subtitles"
-msgstr "Sous-Titres"
+msgstr "Sous-titres"
 
 msgid "No subtitles available!"
-msgstr "Pas de Sous-Titres disponible !"
+msgstr "Pas de sous-titres disponible !"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Espace disque insuffisant pour d�marrer l'enregistrement !"
@@ -943,7 +943,7 @@ msgid "Volume "
 msgstr "Volume "
 
 msgid "Classic VDR"
-msgstr "VDR Classique"
+msgstr "VDR classique"
 
 msgid "ST:TNG Panels"
 msgstr "Consoles ST:TNG"
@@ -978,10 +978,10 @@ msgid "Sunday"
 msgstr "Dimanche"
 
 msgid "Upcoming recording!"
-msgstr "Enregistrement commence procha�nement"
+msgstr "L'enregistrement va commencer !"
 
 msgid "Recording started"
-msgstr "Enregistrement a commenc�"
+msgstr "L'enregistrement a commenc�"
 
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR doit s'arr�ter plus tard - Appuyer sur Power pour forcer"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 14e456d03..cc9f6f351 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -1,17 +1,17 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Drazen Dupor <drazen.dupor@dupor.com>, 2004
+# Drazen Dupor <drazen.dupor@dupor.com>, 2004, 2005
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 5d10fe9dc..7fe04eef3 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,19 +1,19 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Istvan Koenigsberger <istvnko@hotmail.com>, 2002
-# Guido Josten <guido.josten@t-online.de>, 2002
+# Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
+# Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
 # Thomas G�nther <tom@toms-cafe.de>, 2007
 # Istv�n F�ley <ifuley@tigercomp.ro>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index 030fa6f8a..54e491991 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,19 +1,20 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Alberto Carraro <bertocar@tin.it>, 2001
-# Antonio Ospite <ospite@studenti.unina.it>, 2003
+# Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
 # Sean Carlos <seanc@libero.it>, 2005
-# Diego Pierotto <vdr-italian@tiscali.it>, 2007
+# Nino Gerbino <ngerb@interfree.it>, 2006
+# Diego Pierotto <vdr-italian@tiscali.it>, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2008-02-21 20:29+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 729423e38..57282ea24 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,19 +1,20 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
-# Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
+# Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003, 2005
 # Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
 # Carel Willemse <ca_willemse@planet.nl>, 2008
+# Johan Schuring <johan.schuring@vetteblei.nl>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2008-02-18 17:50+0200\n"
-"Last-Translator: Carel Willemse <ca_willemse@planet.nl>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2008-02-26 17:20+0100\n"
+"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
+"Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -877,13 +878,13 @@ msgid "Editing process already active!"
 msgstr "Bewerken is al actief!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&����������"
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "ja"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 56dd16957..0147c069e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1,17 +1,17 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Norwegian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 319ba76bc..354079144 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,16 +1,17 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Michael Rakowski <mrak@gmx.de>, 2002
+# Michael Rakowski <mrak@gmx.de>, 2002, 2003
+# Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Last-Translator: Jaroslaw Swierczynski <swiergot@gmail.com>\n"
+"Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e33bfb4e5..7cc286902 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 0a5bc5a18..56225568d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -1,20 +1,22 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
-# Lucian Muresan <lucianm@users.sourceforge.net>, 2004
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Romanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-Country: ROMANIA\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
@@ -167,7 +169,7 @@ msgid "Key$Audio"
 msgstr "Sunet"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subtitrare"
 
 msgid "Key$Schedule"
 msgstr "Program (EPG)"
@@ -188,31 +190,31 @@ msgid "Key$Commands"
 msgstr "Comenzi"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Utilizator1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Utilizator2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Utilizator3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Utilizator4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Utilizator5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Utilizator6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Utilizator7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Utilizator8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Utilizator9"
 
 msgid "Disk"
 msgstr "Disc"
@@ -260,10 +262,10 @@ msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "PID Teletext"
@@ -431,7 +433,7 @@ msgid "Please enter %d digits!"
 msgstr "V� rog introduce�i %d cifre!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM-ul nu reac�ioneaz�!"
 
 msgid "Recording info"
 msgstr "Detaliile �nregistr�rii"
@@ -503,25 +505,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Utilizare fonturi mici"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Antialiere"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Font implicit"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Font mic"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Font cu l��ime fix�"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "M�rimea implicit� a fontului (pixeli)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "M�rimea 'mic�' a fontului (pixeli)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "M�rimea 'fix�' a fontului (pixeli)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozi�ia informa�iilor despre canal"
@@ -634,22 +636,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Limba sunetului"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Afi�eaz� subtitrare"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Limbi subtitrare"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Limb� subtitrare"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Offset subtitrare"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparen�a prim-planului subtitr�rii"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparen�a fundalului subtitr�rii"
 
 msgid "LNB"
 msgstr "LNB"
@@ -667,13 +669,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecvn�� LNB superioar� (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Resetare CAM"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM preyent"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM preg�tit"
 
 msgid "CAM"
 msgstr "CAM"
@@ -691,7 +693,7 @@ msgid "Can't open CAM menu!"
 msgstr "Nu pot deschide meniul CAM"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM-ul este in folosin�� - totu�i resetez?"
 
 msgid "Can't reset CAM!"
 msgstr "Nu pot reseta CAM"
@@ -772,7 +774,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Interval zapping (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Timeout la introducerea canalului (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canalul de pornire"
@@ -784,7 +786,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Oprire de urgen��"
 
 msgid "Plugins"
 msgstr "Plugin-uri"
@@ -841,13 +843,13 @@ msgid "No audio available!"
 msgstr "Lipse�te sunetul!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Nu afi�eaz� subtirare"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subtitrare"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Subtitrare indisponibil�!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Insuficient spa�iul pe disc pentru �nregistrare!"
@@ -908,7 +910,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nu pot �nchide - vezi op�iunea '-s'"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Montajul tocmai se efectueaz� - �nchid, totu�i?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Tocmai se �nregistreaz� - �nchid, totu�i?"
@@ -922,10 +924,10 @@ msgstr "
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin-ul %s se va trezi +n %ld min, continui?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Montajul tocmai se efectueaz� - repornesc, totu�i?"
 
 msgid "Recording - restart anyway?"
 msgstr "Tocmai se �nregistreaz� - repornesc, totu�i?"
@@ -979,7 +981,7 @@ msgid "Recording started"
 msgstr "A �nceput �nregistrarea"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR se va �nchide mai t�rziu - ap�sa�i 'Power' pentru a for�a"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Apas� orice tast� pentru a anula �nchiderea"
@@ -994,8 +996,8 @@ msgid "Editing process finished"
 msgstr "Montajul �nregistr�rii s-a terminat"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Ap�sa�i orice tast� pentru a anula repornirea"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR se va �nchide �n %s minute"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c513a2c50..0f868a43e 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,17 +1,17 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
-# Oleg Roitburd <oleg@roitburd.de>, 2007
+# Vyacheslav Dikonov <sdiconov@mail.ru>, 2004, 2005
+# Oleg Roitburd <oleg@roitburd.de>, 2005, 2006, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2008-02-15 16:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6f591bb2f..ce7361b14 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -1,17 +1,17 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
-# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
+# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Slovenian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,7 +167,7 @@ msgid "Key$Audio"
 msgstr "Zvok"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Podnapisi"
 
 msgid "Key$Schedule"
 msgstr "Program"
@@ -188,31 +188,31 @@ msgid "Key$Commands"
 msgstr "Ukazi"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Uporabnik1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Uporabnik2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Uporabnik3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Uporabnik4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Uporabnik5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Uporabnik6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Uporabnik7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Uporabnik8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Uporabnik9"
 
 msgid "Disk"
 msgstr "Disk"
@@ -260,10 +260,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -431,7 +431,7 @@ msgid "Please enter %d digits!"
 msgstr "Prosim vnesite %d �tevilk!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM se ne odziva!"
 
 msgid "Recording info"
 msgstr "Podatki o snemanju"
@@ -503,25 +503,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Uporabi male �rke"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Privzeteta pisava"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Mala pisava"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fiksna pisava"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Privzeta velikost pisave (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Majhna velikost pisave (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Pozicija informacije o kanalu"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacije o kanalu"
@@ -634,22 +634,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Jezik za zvok"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Prika�i podnapise"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Jeziki za podnapise"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Jezik za podnapise"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Izravnava podnapisov"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparentnost podnapisov"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparentnost ozadja podnapisov"
 
 msgid "LNB"
 msgstr "LNB"
@@ -667,13 +667,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Zgornja LNB-frek. (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Reset CAM-a"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM prisoten"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM pripravljen"
 
 msgid "CAM"
 msgstr "CAM"
@@ -691,7 +691,7 @@ msgid "Can't open CAM menu!"
 msgstr "Ne morem odpreti CAM menija!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM je v uporabi - zares resetiraj?"
 
 msgid "Can't reset CAM!"
 msgstr "Ne morem resetirati CAM-a!"
@@ -772,7 +772,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�as ugla�evanja (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Timeout za vnos kanala (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Privzeti kanal"
@@ -784,7 +784,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Izhod v sili"
 
 msgid "Plugins"
 msgstr "Vstavki"
@@ -841,13 +841,13 @@ msgid "No audio available!"
 msgstr "Zvok ni dosegljiv!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Ni podnapisov"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Podnapisi"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Podnapisi niso dosegljivi!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Premalo prostora na disku za snemanje!"
@@ -908,7 +908,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Urejanje - zares izklopi?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Snemanje - zares izklopi?"
@@ -922,10 +922,10 @@ msgstr "zares izklopi?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Vstavek %s se zbudi v %ld min, nadaljuj?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Urejanje - zares ponoven zagon?"
 
 msgid "Recording - restart anyway?"
 msgstr "Snemanje - zares ponoven zagon?"
@@ -979,7 +979,7 @@ msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR se bo zaustavil kasneje - pritisni Power za takoj�en izklop"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite katerikoli gumb za preklic izklopa"
@@ -994,8 +994,8 @@ msgid "Editing process finished"
 msgstr "Proces urejanja je kon�an"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Pritisni katerokoli tipko za preklic ponovnega zagona"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR se bo zaustavil v %s minutah"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1adebd78c..e184a46f5 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,17 +1,18 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Tomas Prybil <tomas@prybil.se>, 2002
+# Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
+# Tomas Berglund <tomber@telia.com>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2008-02-24 13:27+0200\n"
+"Last-Translator: Tomas Berglund <tomber@telia.com>\n"
+"Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,7 +168,7 @@ msgid "Key$Audio"
 msgstr "Ljud"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Textning"
 
 msgid "Key$Schedule"
 msgstr "Program"
@@ -260,10 +261,10 @@ msgid "Dpid2"
 msgstr "DPID2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "SPID1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "SPID2"
 
 msgid "Tpid"
 msgstr "TPID"
@@ -503,25 +504,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Anv�nd liten font"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Kantutj�mning OSD"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Standard typsnitt"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Sm� typsnitt"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fast typsnitt"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Fontstorlek standard (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Fontstorlek liten text (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Fast fontstorlek (pixel)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Placering av kanalinformation"
@@ -634,22 +635,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Ljudspr�k"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Visa textning"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Textningsspr�k"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Textningsspr�k"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Sidof�rskjutning textremsa"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparent f�rgrund textremsa"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparent bakgrund textremsa"
 
 msgid "LNB"
 msgstr "LNB"
@@ -667,13 +668,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�vre LNB frekvens (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM omstart"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM n�rvarande"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM klar"
 
 msgid "CAM"
 msgstr "CAM"
@@ -691,7 +692,7 @@ msgid "Can't open CAM menu!"
 msgstr "Det g�r inte att �ppna CAM menyn!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM upptagen, vill du verkligen starta om?"
 
 msgid "Can't reset CAM!"
 msgstr "Kan inte �terst�lla CAM!"
@@ -772,7 +773,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout(s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Timeout kanal (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal vid uppstart"
@@ -841,13 +842,13 @@ msgid "No audio available!"
 msgstr "Ljud saknas!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Ingen textning"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Knapp$Textning"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Ingen textning tillg�nglig!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Otillr�cklingt diskutrymme f�r inspelning!"
@@ -908,7 +909,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan inte avsluta, m�ste anv�nda parameter '-s'"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Editering p�g�r, vill du avsluta �nd�?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Inspelning p�g�r, vill du �nd� avbryta?"
@@ -922,10 +923,10 @@ msgstr "vill du 
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s aktiv om %ld min, vill du forts�tta?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editering p�g�r, vill du �nd� starta om?"
 
 msgid "Recording - restart anyway?"
 msgstr "Inspelning p�g�r, vill du �nd� starta om?"
@@ -979,7 +980,7 @@ msgid "Recording started"
 msgstr "Inspelningen har startat"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR kommer att st�ngas av senare - tryck p�/av f�r att st�nga av nu"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Tryck valfri knapp f�r att �terkalla avst�ngningen"
@@ -994,8 +995,8 @@ msgid "Editing process finished"
 msgstr "Redigering avslutad"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Tryck valfri knapp f�r att �terkalla omstart"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR kommer att st�ngas ned om %s minuter"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index c886683f4..f4e433ed5 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Oktay Yolge�en <oktay_73@yahoo.de>, 2007
+# Oktay Yolge�en <oktay_73@yahoo.de>, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-24 14:37+0200\n"
+"PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,7 +166,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Altyaz�"
 
 msgid "Key$Schedule"
 msgstr "Program"
@@ -259,10 +259,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -633,22 +633,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio dili"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Altyaz� g�ster"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Altyaz� dilleri"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Altyaz� dili"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Altyaz� ofset"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Altyaz� �n �effafl�k"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Altyaz� arka �effafl�k"
 
 msgid "LNB"
 msgstr "LNB"
@@ -783,7 +783,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "A��l��daki ses"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Acil c�k��"
 
 msgid "Plugins"
 msgstr "Eklentiler"
@@ -840,13 +840,13 @@ msgid "No audio available!"
 msgstr "Audio yok!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Altyaz� yok"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Altyaz�"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Altyaz� bulunamad�"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Kay�t i�in yeterince kapasite yok!"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 96f4ec85c..3109351c2 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.10\n"
+"Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tools.c b/tools.c
index 64f4464d1..e5bb40a9f 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.143 2008/02/16 13:38:22 kls Exp $
+ * $Id: tools.c 1.144 2008/02/29 13:16:39 kls Exp $
  */
 
 #include "tools.h"
@@ -630,9 +630,9 @@ uint Utf8CharGet(const char *s, int Length)
   if (!Length)
      Length = Utf8CharLen(s);
   switch (Length) {
-    case 2: return ((*s & 0x1F) << 6) |  (*(s + 1) & 0x3F);
-    case 3: return ((*s & 0x0F) << 4) | ((*(s + 1) & 0x3F) << 6) |  (*(s + 2) & 0x3F);
-    case 4: return ((*s & 0x07) << 2) | ((*(s + 1) & 0x3F) << 4) | ((*(s + 2) & 0x3F) << 6) | (*(s + 3) & 0x3F);
+    case 2: return ((*s & 0x1F) <<  6) |  (*(s + 1) & 0x3F);
+    case 3: return ((*s & 0x0F) << 12) | ((*(s + 1) & 0x3F) <<  6) |  (*(s + 2) & 0x3F);
+    case 4: return ((*s & 0x07) << 18) | ((*(s + 1) & 0x3F) << 12) | ((*(s + 2) & 0x3F) << 6) | (*(s + 3) & 0x3F);
     }
   return *s;
 }

From 7ba8708b5b38ea311a3a1247f7d74032a0530b82 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 16 Mar 2008 18:00:00 +0100
Subject: [PATCH 184/307] Version 1.5.18 - Added a missing reset of maxNumber
 in cChannels::Renumber() (reported by Sundararaj   Reel). - Revoked the fixed
 change of the default character set for SI data and introduced   an
 environment variable to control it (thanks to Ales Jurik for reporting broken
   SI data on the Czech/Slovak channels, which actually do follow the
 standard).   Users who want to set the default character set to something
 different can do this   by setting the environment variable
 VDR_CHARSET_OVERRIDE to something like   ISO-8859-9. - Fixed a signed
 character used as index in cBase64Encoder::NextLine() (thanks   to Tobias
 Grimm). - Updated the Spanish and Catalanian OSD texts (thanks to Luca
 Olivetti). - Fixed automatically selecting the preferred subtitle language
 (based on a patch   from Rolf Ahrenberg). - Updated the Ukrainian OSD texts
 (thanks to Yarema Aka Knedlyk). - Updated the Italian OSD texts (thanks to
 Diego Pierotto). - Updated the Polish OSD texts (thanks to Michael Rakowski).
 - Fixed formatting the name section in the VDR man pages (thanks to Tobias
 Grimm). - Updated the Swedish OSD texts (thanks to Magnus Andersson). - Added
 Russian translations to the 'skincurses' and 'pictures' plugins (thanks   to
 Alexander Gross). - Fixed displaying the free disk space when entering the
 recordings menu where the   last replayed recording was in a subdirectory,
 and pressing Back (thanks to Rolf   Ahrenberg). - Fixed tuning to a live
 channel after a recording has been stopped using the   'Back' key. -
 Resetting a timer's 'pending' flag when it has ended.

---
 CONTRIBUTORS                        |  20 +++
 HISTORY                             |  29 ++++
 PLUGINS/src/pictures/HISTORY        |   4 +
 PLUGINS/src/pictures/pictures.c     |   4 +-
 PLUGINS/src/pictures/po/ru_RU.po    |  33 +++++
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/po/ru_RU.po  |  29 ++++
 PLUGINS/src/skincurses/skincurses.c |   4 +-
 channels.c                          |   5 +-
 config.h                            |   6 +-
 device.c                            |   8 +-
 libsi/si.c                          |   8 +-
 menu.c                              |   9 +-
 po/ca_ES.po                         | 205 ++++++++++++++--------------
 po/es_ES.po                         | 109 +++++++--------
 po/it_IT.po                         |  82 +++++------
 po/pl_PL.po                         |  90 ++++++------
 po/sv_SE.po                         |  27 ++--
 po/uk_UA.po                         |  32 ++---
 tools.c                             |   4 +-
 vdr.1                               |   4 +-
 vdr.5                               |   4 +-
 vdr.c                               |   7 +-
 23 files changed, 430 insertions(+), 297 deletions(-)
 create mode 100644 PLUGINS/src/pictures/po/ru_RU.po
 create mode 100644 PLUGINS/src/skincurses/po/ru_RU.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9287677c2..4dd00de63 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1046,6 +1046,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  SVDRP in case VDR is run with --vfat, in order to avoid names that are too long
  for Windows
  for increasing the valid range of the "Subtitle offset" setup option to -100...100
+ for a patch that was used to fix automatically selecting the preferred subtitle
+ language
+ for fixing displaying the free disk space when entering the recordings menu where
+ the last replayed recording was in a subdirectory, and pressing Back
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1715,6 +1719,7 @@ Luca Olivetti <luca@ventoso.org>
  for suggesting to implement a timeout for remote controls that don't deliver
  "repeat" keypresses very fast
  for reporting a broken entry 'A111.1W' in sources.conf
+ for translating OSD texts to the Spanish and Catalanian language
 
 Mikko Salo <mikko.salo@ppe.inet.fi>
  for suggesting to make the setup option "DVB/Video display format" available only
@@ -2104,6 +2109,8 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for suggesting that the 'plugins' target in the Makefile should return an error exit
  code if one of the plugins failed to compile
  for making the non-breaking space symbol be rendered as a blank
+ for fixing a signed character used as index in cBase64Encoder::NextLine()
+ for fixing formatting the name section in the VDR man pages
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2321,3 +2328,16 @@ Tomas Berglund <tomber@telia.com>
 
 Johan Schuring <johan.schuring@vetteblei.nl>
  for translating OSD texts to the Dutch language
+
+Sundararaj Reel <sundararaj.reel@googlemail.com>
+ for reporting a missing reset of maxNumber in cChannels::Renumber()
+
+Ales Jurik <ajurik@quick.cz>
+ for reporting broken SI data on Czech/Slovak channels after changing the default
+ character set to ISO-8859-9
+
+Magnus Andersson <svankan@bahnhof.se>
+ for translating OSD texts to the Swedish language
+
+Alexander Gross <Bikalexander@gmail.com>
+ for adding Russian translations to the 'skincurses' and 'pictures' plugins
diff --git a/HISTORY b/HISTORY
index ef4477c02..10cb4cec8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5693,3 +5693,32 @@ Video Disk Recorder Revision History
 - Changed the default character set for SI data from ISO6937 (as required by the DVB
   standard ETSI EN 300 468) to ISO-8859-9, in order to work around the stupidity of
   some providers, who actually use ISO-8859-9, but fail to correctly announce that.
+
+2008-03-16: Version 1.5.18
+
+- Added a missing reset of maxNumber in cChannels::Renumber() (reported by Sundararaj
+  Reel).
+- Revoked the fixed change of the default character set for SI data and introduced
+  an environment variable to control it (thanks to Ales Jurik for reporting broken
+  SI data on the Czech/Slovak channels, which actually do follow the standard).
+  Users who want to set the default character set to something different can do this
+  by setting the environment variable VDR_CHARSET_OVERRIDE to something like
+  ISO-8859-9.
+- Fixed a signed character used as index in cBase64Encoder::NextLine() (thanks
+  to Tobias Grimm).
+- Updated the Spanish and Catalanian OSD texts (thanks to Luca Olivetti).
+- Fixed automatically selecting the preferred subtitle language (based on a patch
+  from Rolf Ahrenberg).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Updated the Polish OSD texts (thanks to Michael Rakowski).
+- Fixed formatting the name section in the VDR man pages (thanks to Tobias Grimm).
+- Updated the Swedish OSD texts (thanks to Magnus Andersson).
+- Added Russian translations to the 'skincurses' and 'pictures' plugins (thanks
+  to Alexander Gross).
+- Fixed displaying the free disk space when entering the recordings menu where the
+  last replayed recording was in a subdirectory, and pressing Back (thanks to Rolf
+  Ahrenberg).
+- Fixed tuning to a live channel after a recording has been stopped using the
+  'Back' key.
+- Resetting a timer's 'pending' flag when it has ended.
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 243c07689..5f24a7475 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -29,3 +29,7 @@ VDR Plugin 'pictures' Revision History
 
 - Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename
   extensions and relative paths (reported by Stefan Wagner <stefanwag@gmx.at>).
+
+2008-03-14: Version 0.0.7
+
+- Added Russian translations (thanks to Alexander Gross).
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index bb03c3016..6130f1952 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 1.6 2008/02/29 14:38:31 kls Exp $
+ * $Id: pictures.c 1.7 2008/03/14 12:57:19 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.6";
+static const char *VERSION       = "0.0.7";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
new file mode 100644
index 000000000..d88f3ef60
--- /dev/null
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -0,0 +1,33 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Alexander Gross <Bikalexander@gmail.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2008-03-14 00:45+0100\n"
+"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "Pictures"
+msgstr "�����������"
+
+msgid "A simple picture viewer"
+msgstr "������� ��������� ��������� �����������"
+
+msgid "Picture directory"
+msgstr "������� �����������"
+
+msgid "Slide show delay (s)"
+msgstr "��������  �����-��� (���)"
+
+msgid "No picture directory has been defined!"
+msgstr "�� ��������� ������� �����������!"
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 6088c8b60..cf793cd2c 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -75,3 +75,7 @@ VDR Plugin 'skincurses' Revision History
 
 - Revised the fix of calculating the scrollbar height in the skins. The scrollbar
   handle now always has a height that is at least the width of the scrollbar.
+
+2008-03-14: Version 0.1.7
+
+- Added Russian translations (thanks to Alexander Gross).
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
new file mode 100644
index 000000000..609071ed8
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -0,0 +1,29 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Alexander Gross <Bikalexander@gmail.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"PO-Revision-Date: 2008-03-14 00:21+0100\n"
+"Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "A text only skin"
+msgstr "������ ��������� ���������"
+
+msgid "Key$Mute"
+msgstr "����. ���������"
+
+msgid "Volume "
+msgstr "���������"
+
+msgid "Text mode"
+msgstr "����� ������"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index ed30a5e71..9499e23dd 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.22 2008/02/23 10:38:04 kls Exp $
+ * $Id: skincurses.c 1.23 2008/03/14 12:57:14 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.6";
+static const char *VERSION        = "0.1.7";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/channels.c b/channels.c
index 9730a4369..86d023801 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.59 2008/02/10 15:45:38 kls Exp $
+ * $Id: channels.c 1.60 2008/03/05 16:42:50 kls Exp $
  */
 
 #include "channels.h"
@@ -947,9 +947,10 @@ int cChannels::GetPrevNormal(int Idx)
   return channel ? Idx : -1;
 }
 
-void cChannels::ReNumber( void )
+void cChannels::ReNumber(void)
 {
   channelsHashSid.Clear();
+  maxNumber = 0;
   int Number = 1;
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (channel->GroupSep()) {
diff --git a/config.h b/config.h
index cfeaef2cf..809ada352 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.307 2008/02/24 12:29:54 kls Exp $
+ * $Id: config.h 1.308 2008/03/16 11:37:13 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.17"
-#define VDRVERSNUM   10517  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.5.18"
+#define VDRVERSNUM   10518  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/device.c b/device.c
index 7c82d97f6..95bcb9108 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.155 2008/02/23 13:09:01 kls Exp $
+ * $Id: device.c 1.157 2008/03/09 10:03:34 kls Exp $
  */
 
 #include "device.h"
@@ -1096,8 +1096,8 @@ void cDevice::EnsureAudioTrack(bool Force)
 void cDevice::EnsureSubtitleTrack(void)
 {
   if (Setup.DisplaySubtitles) {
-     eTrackType PreferredTrack = ttSubtitleFirst;
-     int LanguagePreference = -1;
+     eTrackType PreferredTrack = ttNone;
+     int LanguagePreference = INT_MAX; // higher than the maximum possible value
      for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
          const tTrackId *TrackId = GetTrack(eTrackType(i));
          if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference))
@@ -1416,7 +1416,7 @@ bool cDevice::Receiving(bool CheckAny) const
 
 #define TS_SCRAMBLING_CONTROL  0xC0
 #define TS_SCRAMBLING_TIMEOUT     3 // seconds to wait until a TS becomes unscrambled
-#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked a known to decrypt
+#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked as known to decrypt
 
 void cDevice::Action(void)
 {
diff --git a/libsi/si.c b/libsi/si.c
index 43ef03824..49464bafb 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.24 2008/03/01 12:02:01 kls Exp $
+ *   $Id: si.c 1.25 2008/03/05 17:00:55 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <iconv.h>
 #include <malloc.h>
+#include <stdlib.h> // for broadcaster stupidity workaround
 #include <string.h>
 #include "descriptor.h"
 
@@ -340,9 +341,12 @@ bool SetSystemCharacterTable(const char *CharacterTable) {
 // and length are adjusted accordingly.
 static const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL) {
    const char *cs = "ISO6937";
-   cs = "ISO-8859-9"; // Workaround for broadcaster stupidity: according to
+   // Workaround for broadcaster stupidity: according to
    // "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some
    // broadcasters actually use ISO-8859-9, but fail to correctly announce that.
+   static const char *CharsetOverride = getenv("VDR_CHARSET_OVERRIDE");
+   if (CharsetOverride)
+      cs = CharsetOverride;
    if (isSingleByte)
       *isSingleByte = false;
    if (length <= 0)
diff --git a/menu.c b/menu.c
index 37da3ddc8..b7eab4568 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.480 2008/02/24 10:28:46 kls Exp $
+ * $Id: menu.c 1.482 2008/03/16 11:15:28 kls Exp $
  */
 
 #include "menu.h"
@@ -1913,11 +1913,11 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
   helpKeys = -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   Set();
+  SetFreeDiskDisplay(true);
   if (Current() < 0)
      SetCurrent(First());
   else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
      return;
-  SetFreeDiskDisplay(true);
   Display();
   SetHelpKeys();
 }
@@ -3879,8 +3879,11 @@ void cRecordControl::Stop(void)
 
 bool cRecordControl::Process(time_t t)
 {
-  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t))
+  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t)) {
+     if (timer)
+        timer->SetPending(false);
      return false;
+     }
   AssertFreeDiskSpace(timer->Priority());
   return true;
 }
diff --git a/po/ca_ES.po b/po/ca_ES.po
index bfa168041..208d04946 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -4,14 +4,15 @@
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
 # Jordi Vil� <jvila@tinet.org>, 2003
+# Luca Olivetti <luca@ventoso.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
+"PO-Revision-Date: 2008-03-02 19:02+0100\n"
+"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -27,10 +28,10 @@ msgid "Can't start Transfer Mode!"
 msgstr "No puc iniciar el mode de transfer�ncia!"
 
 msgid "Starting EPG scan"
-msgstr ""
+msgstr "Iniciant exploraci� EPG"
 
 msgid "No title"
-msgstr ""
+msgstr "Sense t�tol"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -117,7 +118,7 @@ msgid "Key$Blue"
 msgstr "Blau"
 
 msgid "Key$Info"
-msgstr ""
+msgstr "Informaci�"
 
 msgid "Key$Play"
 msgstr "Reproduir"
@@ -138,10 +139,10 @@ msgid "Key$FastRew"
 msgstr "Enrera r�pidament"
 
 msgid "Key$Next"
-msgstr ""
+msgstr "Seg�ent"
 
 msgid "Key$Prev"
-msgstr ""
+msgstr "Anterior"
 
 msgid "Key$Power"
 msgstr "Aturar"
@@ -153,7 +154,7 @@ msgid "Key$Channel-"
 msgstr "Canal -"
 
 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "Canal anterior"
 
 msgid "Key$Volume+"
 msgstr "Volum +"
@@ -165,10 +166,10 @@ msgid "Key$Mute"
 msgstr "En silenci"
 
 msgid "Key$Audio"
-msgstr ""
+msgstr "�udio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subt�tols"
 
 msgid "Key$Schedule"
 msgstr "Guia de Programaci�"
@@ -189,31 +190,31 @@ msgid "Key$Commands"
 msgstr "Ordres"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Usuari 1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Usuari 2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Usuari 3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Usuari 4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Usuari 5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Usuari 6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Usuari 7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Usuari 8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Usuari 9"
 
 msgid "Disk"
 msgstr "Disc"
@@ -222,10 +223,10 @@ msgid "free"
 msgstr "lliure"
 
 msgid "Free To Air"
-msgstr ""
+msgstr "No codificat"
 
 msgid "encrypted"
-msgstr ""
+msgstr "Codificat"
 
 msgid "auto"
 msgstr "auto"
@@ -261,10 +262,10 @@ msgid "Dpid2"
 msgstr "PID AC3 (2)"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "PID Teletext"
@@ -354,7 +355,7 @@ msgid "Stop"
 msgstr "Fi"
 
 msgid "VPS"
-msgstr ""
+msgstr "VPS"
 
 msgid "Priority"
 msgstr "Prioritat"
@@ -375,7 +376,7 @@ msgid "Button$On/Off"
 msgstr "On/Off"
 
 msgid "Button$Info"
-msgstr ""
+msgstr "Informaci�"
 
 msgid "Delete timer?"
 msgstr "Esborrar el temporitzador?"
@@ -387,7 +388,7 @@ msgid "Event"
 msgstr "Esdeveniment"
 
 msgid "Button$Timer"
-msgstr ""
+msgstr "Temporitzador"
 
 msgid "Button$Record"
 msgstr "Gravar"
@@ -419,23 +420,23 @@ msgstr "Guia de Programaci
 
 #, c-format
 msgid "This event - %s"
-msgstr ""
+msgstr "Aquest esdeveniment - %s"
 
 msgid "This event - all channels"
-msgstr ""
+msgstr "Aquest esdeveniment - tots els canals"
 
 msgid "All events - all channels"
-msgstr ""
+msgstr "Tots els esdeveniments - tots els canals"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr ""
+msgstr "Si us plau introdueixi %d digitos"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM no respon"
 
 msgid "Recording info"
-msgstr ""
+msgstr "Informaci� de la gravaci�"
 
 msgid "Button$Play"
 msgstr "Reproduir"
@@ -465,13 +466,13 @@ msgid "Recording commands"
 msgstr "Ordres de gravaci�"
 
 msgid "never"
-msgstr ""
+msgstr "mai"
 
 msgid "skin dependent"
-msgstr ""
+msgstr "dep�n de l'aparen�a"
 
 msgid "always"
-msgstr ""
+msgstr "sempre"
 
 msgid "OSD"
 msgstr "Informaci� en pantalla"
@@ -480,16 +481,16 @@ msgid "Setup.OSD$Language"
 msgstr "Idioma"
 
 msgid "Setup.OSD$Skin"
-msgstr ""
+msgstr "Aparen�a"
 
 msgid "Setup.OSD$Theme"
-msgstr ""
+msgstr "Tema"
 
 msgid "Setup.OSD$Left"
-msgstr ""
+msgstr "Esquerra"
 
 msgid "Setup.OSD$Top"
-msgstr ""
+msgstr "A dalt"
 
 msgid "Setup.OSD$Width"
 msgstr "Amplada"
@@ -501,28 +502,28 @@ msgid "Setup.OSD$Message time (s)"
 msgstr "Durada dels missatges (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr ""
+msgstr "Usar font petita"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Antidentat"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Font predeterminada"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Font petita"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Font fixa"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Mida font predeterminada (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Mida font petita"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Mida font fixa"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posici� de la informaci� del canal"
@@ -534,22 +535,22 @@ msgid "top"
 msgstr "a dalt"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr ""
+msgstr "Temps de l'informaci� de canal (s)"
 
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informaci� del canvi de canal"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr ""
+msgstr "Temps d'espera informaci� de canal sol�licitada"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Despla�ar p�gina sencera"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr ""
+msgstr "Despla�ament circular"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr ""
+msgstr "Tecla menu tanca"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Gravacions en subcarpetes"
@@ -558,7 +559,7 @@ msgid "EPG"
 msgstr "Guia de Programes"
 
 msgid "Button$Scan"
-msgstr ""
+msgstr "Escaneig"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "M�xim d'Hores a cercar per la Guia"
@@ -567,7 +568,7 @@ msgid "Setup.EPG$EPG bugfix level"
 msgstr "Nivell de correcci� de la Guia"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr ""
+msgstr "Temps manteniment EPG (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Ajustar l'hora del sistema"
@@ -577,11 +578,11 @@ msgstr "Usar el temps del m
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr ""
+msgstr "Idiomes preferits"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr ""
+msgstr "Idioma preferit"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -596,19 +597,19 @@ msgid "no"
 msgstr "no"
 
 msgid "names only"
-msgstr ""
+msgstr "nom�s noms"
 
 msgid "PIDs only"
-msgstr ""
+msgstr "nom�s PIDs"
 
 msgid "names and PIDs"
-msgstr ""
+msgstr "noms i PIDs"
 
 msgid "add new channels"
-msgstr ""
+msgstr "afegir nous canals"
 
 msgid "add new transponders"
-msgstr ""
+msgstr "afegir nous transponders"
 
 msgid "DVB"
 msgstr "Tarja DVB"
@@ -620,37 +621,37 @@ msgid "Setup.DVB$Video format"
 msgstr "Format del v�deo"
 
 msgid "Setup.DVB$Video display format"
-msgstr ""
+msgstr "Format de visualitzaci� de v�deo"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr ""
+msgstr "Fer servir Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr ""
+msgstr "Actualitza canals"
 
 msgid "Setup.DVB$Audio languages"
-msgstr ""
+msgstr "Idiomes d'�udio"
 
 msgid "Setup.DVB$Audio language"
-msgstr ""
+msgstr "Idioma d'�udio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Visualitza subt�tols"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Idiomes subt�tols"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Idioma subt�tols"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Despla�ament subt�tols"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transpar�ncia primer pla subt�tols"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transpar�ncia fons subt�tols"
 
 msgid "LNB"
 msgstr "Configuraci� de l'LNB"
@@ -668,16 +669,16 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Freq��ncia LNB alta (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Reiniciar CAM"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM present"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM preparat"
 
 msgid "CAM"
-msgstr "CI Acc�s condicional"
+msgstr "CAM"
 
 msgid "Button$Menu"
 msgstr "Men�"
@@ -686,13 +687,13 @@ msgid "Button$Reset"
 msgstr "Reiniciar"
 
 msgid "Opening CAM menu..."
-msgstr ""
+msgstr "Obrint menu CAM..."
 
 msgid "Can't open CAM menu!"
 msgstr "No puc obrir el men� de la CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM en �s - reiniciar?"
 
 msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
@@ -725,10 +726,10 @@ msgid "Setup.Recording$Use episode name"
 msgstr "Utilitzar el nom de l'episodi"
 
 msgid "Setup.Recording$Use VPS"
-msgstr ""
+msgstr "Fer servir VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr ""
+msgstr "Marge VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Marcar gravaci� instant�nia"
@@ -770,22 +771,22 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr ""
+msgstr "Temps d'espera Zap (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Temps d'introducci� canal (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Canal inicial"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "anterior"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Volum inicial"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Sortida d'emerg�ncia"
 
 msgid "Plugins"
 msgstr "Plugins"
@@ -817,7 +818,7 @@ msgid " Stop replaying"
 msgstr " Aturar la reproducci�"
 
 msgid "Button$Audio"
-msgstr ""
+msgstr "�udio"
 
 msgid "Button$Pause"
 msgstr "Pausa"
@@ -839,19 +840,19 @@ msgid "Cancel editing?"
 msgstr "Cancel�lar l'edici�?"
 
 msgid "No audio available!"
-msgstr ""
+msgstr "No hi ha �udio disponible!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Sense subt�tols"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subt�tols"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "No hi ha subt�tols disponibles!"
 
 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "No hi ha espai en disc per a iniciar la gravaci�!"
 
 msgid "No free DVB device to record!"
 msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
@@ -882,7 +883,7 @@ msgid "yes"
 msgstr "s�"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -909,7 +910,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci� -s !"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Editant - Apagar de totes maneres?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Gravant - Apagar de totes maneres?"
@@ -923,10 +924,10 @@ msgstr "Apagar de totes maneres?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "El plugin %s s'activar� en %ld minuts, continuar?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editant - Reiniciar de totes maneres?"
 
 msgid "Recording - restart anyway?"
 msgstr "Gravant - Reiniciar de totes maneres?"
@@ -939,10 +940,10 @@ msgid "Volume "
 msgstr "Volum "
 
 msgid "Classic VDR"
-msgstr ""
+msgstr "VDR clasico"
 
 msgid "ST:TNG Panels"
-msgstr ""
+msgstr "Quadres ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -974,13 +975,13 @@ msgid "Sunday"
 msgstr "Diumenge"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "Gravaci� a punt d'iniciar!"
 
 msgid "Recording started"
-msgstr ""
+msgstr "Gravaci� comen�ada"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR s'apagar� m�s tard, prem Power per a for�ar"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Prem qualsevol tecla per cancel�lar l'aturada"
@@ -995,8 +996,8 @@ msgid "Editing process finished"
 msgstr "Proc�s d'edici� finalitzat"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Prem qualsevol tecla per cancel�lar el reinici"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR s'apagar� en %s minuts"
diff --git a/po/es_ES.po b/po/es_ES.po
index 3626752cb..ed1ea5b4e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
+# Luca Olivetti <luca@ventoso.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
+"POT-Creation-Date: 2008-03-02 17:25+0100\n"
+"PO-Revision-Date: 2008-03-02 19:02+0100\n"
+"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -136,10 +137,10 @@ msgid "Key$FastRew"
 msgstr "Retroceso r�pido"
 
 msgid "Key$Next"
-msgstr ""
+msgstr "Siguiente"
 
 msgid "Key$Prev"
-msgstr ""
+msgstr "Anterior"
 
 msgid "Key$Power"
 msgstr "Apagar"
@@ -151,7 +152,7 @@ msgid "Key$Channel-"
 msgstr "Canal-"
 
 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "Canal anterior"
 
 msgid "Key$Volume+"
 msgstr "Volumen+"
@@ -166,7 +167,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subt�tulos"
 
 msgid "Key$Schedule"
 msgstr "Gu�a de Programaci�n"
@@ -187,31 +188,31 @@ msgid "Key$Commands"
 msgstr "�rdenes"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Usuario 1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Usuario 2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Usuario 3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Usuario 4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Usuario 5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Usuario 6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Usuario 7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Usuario 8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Usuario 9"
 
 msgid "Disk"
 msgstr "Disco"
@@ -259,10 +260,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -430,13 +431,13 @@ msgid "Please enter %d digits!"
 msgstr "�Escriba %d d�gitos!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "�CAM no responde!"
 
 msgid "Recording info"
 msgstr "Informaci�n de grabaci�n"
 
 msgid "Button$Play"
-msgstr "Play"
+msgstr "Reproducir"
 
 msgid "Button$Rewind"
 msgstr "Rebobinar"
@@ -502,25 +503,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "Usar letra peque�a"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Alisado de fuentes"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Fuente por defecto"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Fuente peque�a"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fuente fija"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Tama�o fuente por defecto (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Tama�o fuente peque�a (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Tama�o fuente fija (pixel)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posici�n para informaci�n de canal"
@@ -597,7 +598,7 @@ msgid "names only"
 msgstr "s�lo nombres"
 
 msgid "PIDs only"
-msgstr ""
+msgstr "s�lo PIDs"
 
 msgid "names and PIDs"
 msgstr "nombres y PIDs"
@@ -633,22 +634,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Idioma de audio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Visualizar subt�tulos"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Idiomas subt�tulos"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Idioma subt�tulos"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Desplazamiento subt�tulos"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparencia primer plano subt�tulos"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparencia fondo subt�tulos"
 
 msgid "LNB"
 msgstr "LNB"
@@ -666,13 +667,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecuencia superior del LNB (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Reset CAM"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM presente"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM preparado"
 
 msgid "CAM"
 msgstr "CAM"
@@ -690,7 +691,7 @@ msgid "Can't open CAM menu!"
 msgstr "�No se puede abrir el men� CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM en uso - �reiniciar?"
 
 msgid "Can't reset CAM!"
 msgstr "�No se puede reiniciar CAM!"
@@ -771,19 +772,19 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Considerar canal como visto (sg)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Tiempo introducci�n canal (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Canal inicial"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "anterior"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Volumen inicial"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Salida de emergencia"
 
 msgid "Plugins"
 msgstr "Plugins"
@@ -840,16 +841,16 @@ msgid "No audio available!"
 msgstr "�No hay audio disponible!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Sin subt�tulos"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subt�tulos"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "�No hay subt�tulos disponibles!"
 
 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "�Sin espacio en disco para iniciar grabaci�n!"
 
 msgid "No free DVB device to record!"
 msgstr "�Ning�n dispositivo DVB disponible para grabar!"
@@ -907,7 +908,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "�No se puede apagar - falta el par�metro '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Editando -�apagar igualmente?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Grabaci�n en curso - �apagar igualmente?"
@@ -921,10 +922,10 @@ msgstr "
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s inicia en %ld min, �continuar?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editando - �reiniciar igualmente?"
 
 msgid "Recording - restart anyway?"
 msgstr "Grabaci�n en curso - �reiniciar igualmente?"
@@ -972,13 +973,13 @@ msgid "Sunday"
 msgstr "Domingo"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "�Grabaci�n a punto de empezar!"
 
 msgid "Recording started"
 msgstr "Iniciando grabaci�n"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR se apagar� m�s tarde - pulse Power para forzar"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Pulse una tecla para interrumpir apagar"
@@ -993,8 +994,8 @@ msgid "Editing process finished"
 msgstr "Proceso de edici�n terminado"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Pulse cualquier tecla para cancelar reinicio"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR se apagar� en %s minutos"
diff --git a/po/it_IT.po b/po/it_IT.po
index 54e491991..c3356c2aa 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2008-02-21 20:29+0100\n"
+"PO-Revision-Date: 2008-03-08 21:06+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team:  Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgid "Channel not available!"
 msgstr "Canale non disponibile!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Impossibile avviare la modalit� di trasferimento!"
+msgstr "Impossibile avviare mod. trasferimento!"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -55,11 +55,11 @@ msgid "Do not press any key..."
 msgstr "Non premere alcun tasto..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Fase 2: Apprendimento codici specifici dei tasti"
+msgstr "Fase 2: Apprendimento codici dei tasti"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Premi il tasto per '%s'"
+msgstr "Premi il tasto '%s'"
 
 msgid "Press 'Up' to confirm"
 msgstr "Premi 'Su' per confermare"
@@ -71,13 +71,13 @@ msgid "(press 'Up' to go back)"
 msgstr "(premi 'Su' per tornare indietro)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(premi 'Gi�' per concludere la definizione tasti)"
+msgstr "(premi 'Gi�' per concludere definizione tasti)"
 
 msgid "(press 'Menu' to skip this key)"
 msgstr "(premi 'Menu' per saltare questo tasto)"
 
 msgid "Learning Remote Control Keys"
-msgstr "Apprendimento tasti unit� remota"
+msgstr "Apprendimento tasti RC"
 
 msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Salvataggio codici tasti"
@@ -119,10 +119,10 @@ msgid "Key$Blue"
 msgstr "Blu"
 
 msgid "Key$Info"
-msgstr "Informazioni"
+msgstr "Info"
 
 msgid "Key$Play"
-msgstr "Riproduzione"
+msgstr "Riproduci"
 
 msgid "Key$Pause"
 msgstr "Pausa"
@@ -131,7 +131,7 @@ msgid "Key$Stop"
 msgstr "Ferma"
 
 msgid "Key$Record"
-msgstr "Registrazione"
+msgstr "Registra"
 
 msgid "Key$FastFwd"
 msgstr "Avanti veloce"
@@ -368,16 +368,16 @@ msgid "File"
 msgstr "Nome"
 
 msgid "First day"
-msgstr "Primo giorno"
+msgstr "1� giorno"
 
 msgid "Timers"
 msgstr "Timer"
 
 msgid "Button$On/Off"
-msgstr "Attivo/Disattivo"
+msgstr "On/Off"
 
 msgid "Button$Info"
-msgstr "Informazioni"
+msgstr "Info"
 
 msgid "Delete timer?"
 msgstr "Eliminare il timer?"
@@ -386,7 +386,7 @@ msgid "Timer still recording - really delete?"
 msgstr "Timer in registrazione - eliminare?"
 
 msgid "Event"
-msgstr "Eventi"
+msgstr "Evento"
 
 msgid "Button$Timer"
 msgstr "Timer"
@@ -437,7 +437,7 @@ msgid "CAM not responding!"
 msgstr "La CAM non risponde!"
 
 msgid "Recording info"
-msgstr "Informazioni registrazione"
+msgstr "Info registrazione"
 
 msgid "Button$Play"
 msgstr "Riproduci"
@@ -455,13 +455,13 @@ msgid "Commands"
 msgstr "Comandi"
 
 msgid "Error while accessing recording!"
-msgstr "Errore nell'accedere alla registrazione!"
+msgstr "Errore accesso alla registrazione!"
 
 msgid "Delete recording?"
 msgstr "Eliminare la registrazione?"
 
 msgid "Error while deleting recording!"
-msgstr "Errore eliminazione della registrazione!"
+msgstr "Errore eliminazione registrazione!"
 
 msgid "Recording commands"
 msgstr "Comandi di registrazione"
@@ -518,16 +518,16 @@ msgid "Setup.OSD$Fixed font"
 msgstr "Caratteri fissi"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Dimensione caratteri predefiniti (pixel)"
+msgstr "Dim. caratteri pred. (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Dimensione caratteri piccoli (pixel)"
+msgstr "Dim. caratteri piccoli (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Dimensione caratteri fissi (pixel)"
+msgstr "Dim. caratteri fissi (pixel)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Posizione informazioni canale"
+msgstr "Posizione info canale"
 
 msgid "bottom"
 msgstr "in basso"
@@ -536,13 +536,13 @@ msgid "top"
 msgstr "in alto"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Durata informazioni canale (s)"
+msgstr "Durata info canale (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Mostra informazioni al cambio canale"
+msgstr "Mostra info al cambio canale"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Scadenza richieste informazioni canale"
+msgstr "Scadenza richieste info canale"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scorri per pagine"
@@ -551,7 +551,7 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "Scorri riavvolgendo"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Utilizza il tasto Menu per chiudere"
+msgstr "Tasto Menu per chiudere"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Directory di registrazione"
@@ -563,13 +563,13 @@ msgid "Button$Scan"
 msgstr "Scansione"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Scadenza scansione aggiorn. EPG (ore)"
+msgstr "Scadenza aggiorn. EPG (ore)"
 
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Livello correzione EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Visualizzazione vecchi dati EPG (min)"
+msgstr "Mostra vecchi dati EPG (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Imposta orario automatico"
@@ -631,10 +631,10 @@ msgid "Setup.DVB$Update channels"
 msgstr "Aggiorna i canali"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Lingue per l'audio"
+msgstr "Lingue audio"
 
 msgid "Setup.DVB$Audio language"
-msgstr "Lingua per l'audio"
+msgstr "Lingua audio"
 
 msgid "Setup.DVB$Display subtitles"
 msgstr "Mostra sottotitoli"
@@ -649,7 +649,7 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "Posizione sottotitoli"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Trasparenza primo piano sottotitoli"
+msgstr "Trasparenza sottotitoli"
 
 msgid "Setup.DVB$Subtitle background transparency"
 msgstr "Trasparenza sfondo sottotitoli"
@@ -733,16 +733,16 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margine VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Segna registrazione immediata"
+msgstr "Segna reg. immediata"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Nome registrazione immediata"
+msgstr "Nome reg. immediata"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Tempo registrazione immediata (min)"
+msgstr "Tempo reg. immediata (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Dimensione massima file video (MB)"
+msgstr "Dim. massima file video (MB)"
 
 msgid "Setup.Recording$Split edited files"
 msgstr "Dividi i file modificati"
@@ -763,10 +763,10 @@ msgid "Miscellaneous"
 msgstr "Generici"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Scadenza minima evento (min)"
+msgstr "Scadenza min. evento (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Periodo minimo di inattivit� (min)"
+msgstr "Periodo min. inattivit� (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Scadenza SVDRP (s)"
@@ -787,13 +787,13 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "Uscita d'emergenza"
+msgstr "Uscita di emergenza"
 
 msgid "Plugins"
 msgstr "Plugins"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Questo plugin non ha parametri di configurazione!"
+msgstr "Il plugin non ha parametri di configurazione!"
 
 msgid "Setup"
 msgstr "Opzioni"
@@ -838,7 +838,7 @@ msgid "Stop recording?"
 msgstr "Fermare la registrazione?"
 
 msgid "Cancel editing?"
-msgstr "Annullare la modifica?"
+msgstr "Annullare le modifiche?"
 
 msgid "No audio available!"
 msgstr "Nessun audio disponibile!"
@@ -878,13 +878,13 @@ msgid "Editing process already active!"
 msgstr "Processo di modifica gi� attivo!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&�"
 
 msgid "yes"
 msgstr "s�"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+�?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 354079144..ff21e961a 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,7 +1,7 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Michael Rakowski <mrak@gmx.de>, 2002, 2003
+# Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
 #
 msgid ""
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Jaroslaw Swierczynski <swiergot@gmail.com>\n"
-"Language-Team: Polish\n"
+"PO-Revision-Date: 2008-03-09 12:59+0100\n"
+"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
+"Language-Team:  Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,7 +167,7 @@ msgid "Key$Audio"
 msgstr "D�wi�k"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Podtytu�y"
 
 msgid "Key$Schedule"
 msgstr "Program"
@@ -188,31 +188,31 @@ msgid "Key$Commands"
 msgstr "Polecenia"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "U�ytkownik 1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "U�ytkownik 2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "U�ytkownik 3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "U�ytkownik 4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "U�ytkownik 5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "U�ytkownik 6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "U�ytkownik 7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "U�ytkownik 8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "U�ytkownik 9"
 
 msgid "Disk"
 msgstr "Dysk"
@@ -260,10 +260,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -431,7 +431,7 @@ msgid "Please enter %d digits!"
 msgstr "Prosz� poda� %d cyfr!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM nie reaguje!"
 
 msgid "Recording info"
 msgstr "Informacje o nagraniu"
@@ -503,25 +503,25 @@ msgid "Setup.OSD$Use small font"
 msgstr "U�ywaj ma�ej czcionki"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Wyg�adzanie"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Standardowa  czcionka"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Ma�a czcionka"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Sta�a czcionka"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Standardowa czcionka wyj�ciowa (pixle)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Ma�a czcionka wyj�ciowa (pixle)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Ustalona czcionka wyj�ciowa (pixle)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozycja informacji o kanale"
@@ -634,22 +634,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "J�zyk d�wi�ku"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Obraz napis�w"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "J�zyki napisu"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "J�zyk napisu"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Zr�wnowa�y� napis"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Prze�rocze podtytu��w: Prz�d"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Prze�rocze podtytu��w: T�o"
 
 msgid "LNB"
 msgstr "LNB"
@@ -667,13 +667,13 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "G�rna cz�stotliwo�� LNB (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "CAM zresetowany"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM obecny"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM gotowy"
 
 msgid "CAM"
 msgstr "CAM"
@@ -691,7 +691,7 @@ msgid "Can't open CAM menu!"
 msgstr "Nie mo�na otworzy� menu CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM jest w u�yciu - naprawd� zresetowa�?"
 
 msgid "Can't reset CAM!"
 msgstr "Nie mo�na zresetowa� CAM!"
@@ -772,7 +772,7 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Czas oczekiwania na zap (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Min�� czas wej�cia do kana�u"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Pocz�tkowy kana�"
@@ -784,7 +784,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Wyj�cie awaryjne"
 
 msgid "Plugins"
 msgstr "Wtyczki"
@@ -841,13 +841,13 @@ msgid "No audio available!"
 msgstr "D�wi�k nie jest dost�pny!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Brak napis�w"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Napisy"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Napisy nie s� dost�pne"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Brak miejsca na dysku do nagrywania!"
@@ -908,7 +908,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Monta� w trakcie  - Wy��czy� mimo to?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Trwa nagrywanie - wy��czy� mimo to?"
@@ -922,10 +922,10 @@ msgstr "wy
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Wtyczka %s obudzi si� za %ld min, kontynuowa�?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Monta� w trakcie  - Zrestartowa� mimo to?"
 
 msgid "Recording - restart anyway?"
 msgstr "Trwa nagrywanie - zrestartowa� mimo to?"
@@ -979,7 +979,7 @@ msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR zostanie wy��czony p�niej - Naci�nij Wy��cz (Power) aby wymusi�"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Naci�nij dowolny klawisz aby nie wy��cza�"
@@ -994,8 +994,8 @@ msgid "Editing process finished"
 msgstr "Proces edycji zako�czony"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Naci�nij dowolny klawisz aby nie zrestartowa�"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR zostanie wy��czony za %s minut"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e184a46f5..8a204ddbd 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -4,14 +4,15 @@
 # Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 # Tomas Berglund <tomber@telia.com>, 2008
+# Magnus Andersson <svankan@bahnhof.se>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2008-02-24 13:27+0200\n"
-"Last-Translator: Tomas Berglund <tomber@telia.com>\n"
+"PO-Revision-Date: 2008-03-12 18:25+0100\n"
+"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -189,31 +190,31 @@ msgid "Key$Commands"
 msgstr "Kommandon"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Anv�ndare1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Anv�ndare2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Anv�ndare3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Anv�ndare4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Anv�ndare5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Anv�ndare6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Anv�ndare7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Anv�ndare8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Anv�ndare9"
 
 msgid "Disk"
 msgstr "Disk"
@@ -432,7 +433,7 @@ msgid "Please enter %d digits!"
 msgstr "Mata in %d siffror!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM svarar inte!"
 
 msgid "Recording info"
 msgstr "Inspelning"
@@ -785,7 +786,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Of�rutsedd avslutning"
 
 msgid "Plugins"
 msgstr "Moduler"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 3109351c2..5d55d8c66 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,14 +1,14 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"PO-Revision-Date: 2008-03-07 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
@@ -187,31 +187,31 @@ msgid "Key$Commands"
 msgstr "�������"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "����������1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "����������2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "����������3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "����������4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "����������5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "����������6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "����������7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "����������8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "����������8"
 
 msgid "Disk"
 msgstr "����"
@@ -259,10 +259,10 @@ msgid "Dpid2"
 msgstr "Dpid2 (AC3 2)"
 
 msgid "Spid1"
-msgstr ""
+msgstr "�������� ���1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "�������� ���2"
 
 msgid "Tpid"
 msgstr "Tpid (���������)"
@@ -645,10 +645,10 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "������� ���������"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "���������� ���������� ����� ���������"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "���������� �������� ����� ���������"
 
 msgid "LNB"
 msgstr "���������"
@@ -783,7 +783,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "�������� ��� ���������"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "��������� �����"
 
 msgid "Plugins"
 msgstr "������ ����������"
diff --git a/tools.c b/tools.c
index e5bb40a9f..70ccb0e3c 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.144 2008/02/29 13:16:39 kls Exp $
+ * $Id: tools.c 1.145 2008/03/05 17:23:47 kls Exp $
  */
 
 #include "tools.h"
@@ -1102,7 +1102,7 @@ const char *cBase64Encoder::NextLine(void)
   int r = 0;
   while (i < length && r < maxResult - 3) {
         result[r++] = b64[(data[i] >> 2) & 0x3F];
-        char c = (data[i] << 4) & 0x3F;
+        uchar c = (data[i] << 4) & 0x3F;
         if (++i < length)
            c |= (data[i] >> 4) & 0x0F;
         result[r++] = b64[c];
diff --git a/vdr.1 b/vdr.1
index 67348d3a5..8510610c8 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,11 +8,11 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.32 2008/02/10 14:23:12 kls Exp $
+.\" $Id: vdr.1 1.33 2008/03/09 16:07:06 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
-vdr - the Video Disk Recorder
+vdr \- the Video Disk Recorder
 .SH SYNOPSIS
 .B vdr
 [options]
diff --git a/vdr.5 b/vdr.5
index bec9d5d36..56dd48d3b 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,11 +8,11 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.67 2008/02/10 14:25:07 kls Exp $
+.\" $Id: vdr.5 1.68 2008/03/09 15:46:57 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
-vdr file formats - the Video Disk Recorder Files
+vdr_files \- the Video Disk Recorder Files
 .SH DESCRIPTION
 This page describes the formats of the various files \fBvdr\fR uses to
 store configuration data and recordings.
diff --git a/vdr.c b/vdr.c
index af690ea7e..5ea62d692 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.312 2008/02/23 15:36:01 kls Exp $
+ * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -546,6 +546,7 @@ int main(int argc, char *argv[])
   int MaxLatencyTime = 0;
   bool InhibitEpgScan = false;
   bool IsInfoMenu = false;
+  bool CheckHasProgramme = false;
   cSkin *CurrentSkin = NULL;
 
   // Load plugins:
@@ -730,7 +731,7 @@ int main(int argc, char *argv[])
         // Make sure we have a visible programme in case device usage has changed:
         if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
-           if (!Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
+           if ((!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
               if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
                  if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
@@ -739,6 +740,7 @@ int main(int argc, char *argv[])
                  }
               lastTime = Now; // don't do this too often
               LastTimerChannel = -1;
+              CheckHasProgramme = false;
               }
            }
         // Restart the Watchdog timer:
@@ -1120,6 +1122,7 @@ int main(int argc, char *argv[])
                             DELETE_MENU;
                             cControl::Shutdown();
                             Menu = new cMenuMain(osRecordings);
+                            CheckHasProgramme = true; // to have live tv after stopping replay with 'Back'
                             break;
              case osReplay: DELETE_MENU;
                             cControl::Shutdown();

From fa56503b9a050ec0f0445d48f9bc167b9abe5ee1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Mar 2008 18:00:00 +0100
Subject: [PATCH 185/307] Version 1.6.0 - Updated the Croatian language texts
 (thanks to Adrian Caval). - Added Chinese language texts (thanks to Nan
 Feng). - Updated the Portuguese language texts. - Added a note about
 VDR_CHARSET_OVERRIDE to the INSTALL file.

---
 CONTRIBUTORS                  |    6 +
 HISTORY                       |    7 +
 INSTALL                       |   10 +
 PLUGINS/src/hello/HISTORY     |    4 +
 PLUGINS/src/hello/hello.c     |    4 +-
 PLUGINS/src/hello/po/hr_HR.po |   19 +-
 PLUGINS/src/sky/HISTORY       |    5 +
 PLUGINS/src/sky/getskyepg.pl  |    4 +-
 PLUGINS/src/sky/sky.c         |    4 +-
 UPDATE-1.6.0                  |    1 +
 config.h                      |   10 +-
 po/hr_HR.po                   |  267 ++++-----
 po/pt_PT.po                   |  406 ++++++-------
 po/zh_CN.po                   | 1003 +++++++++++++++++++++++++++++++++
 14 files changed, 1393 insertions(+), 357 deletions(-)
 create mode 100644 po/zh_CN.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4dd00de63..6ce5d2569 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2341,3 +2341,9 @@ Magnus Andersson <svankan@bahnhof.se>
 
 Alexander Gross <Bikalexander@gmail.com>
  for adding Russian translations to the 'skincurses' and 'pictures' plugins
+
+Adrian Caval <anrxc@sysphere.org>
+ for translating OSD texts to the Croatian language
+
+Nan Feng <nfgx@21cn.com>
+ for translating OSD texts to the Chinese language
diff --git a/HISTORY b/HISTORY
index 10cb4cec8..c94d1d2b6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5722,3 +5722,10 @@ Video Disk Recorder Revision History
 - Fixed tuning to a live channel after a recording has been stopped using the
   'Back' key.
 - Resetting a timer's 'pending' flag when it has ended.
+
+2008-03-23: Version 1.6.0
+
+- Updated the Croatian language texts (thanks to Adrian Caval).
+- Added Chinese language texts (thanks to Nan Feng).
+- Updated the Portuguese language texts.
+- Added a note about VDR_CHARSET_OVERRIDE to the INSTALL file.
diff --git a/INSTALL b/INSTALL
index fd5983c56..f61cb3bbb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -117,6 +117,16 @@ in English.
 Note that for VDR's internationalized texts to work, the LANG environment
 variable must be set to a valid locale!
 
+Workaround for providers not encoding their EPG data correctly
+--------------------------------------------------------------
+
+According to "ETSI EN 300 468" the default character set fo SI data is
+ISO6937. But unfortunately some broadcasters actually use ISO-8859-9 or
+other encodings, but fail to correctly announce that.
+Users who want to set the default character set to something different can
+do this by setting the environment variable VDR_CHARSET_OVERRIDE to something
+like ISO-8859-9.
+
 Automatic restart in case of hangups:
 -------------------------------------
 
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index d4c9d3787..b4d09aba1 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -58,3 +58,7 @@ VDR Plugin 'hello' Revision History
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
+
+2008-03-18: Version 0.2.2
+
+- Updated the Croatian language texts (thanks to Adrian Caval).
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 273217e08..4d87d04f9 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.14 2007/08/15 13:17:16 kls Exp $
+ * $Id: hello.c 1.15 2008/03/18 17:13:25 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.1";
+static const char *VERSION        = "0.2.2";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index 768611dd2..5f0d7b74e 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -1,35 +1,34 @@
 # VDR plugin language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
 # This file is distributed under the same license as the VDR package.
-# Drazen Dupor <drazen.dupor@dupor.com>, 2004
-# Dino Ravnic <dino.ravnic@fer.hr>, 2004
+# Adrian Caval <anrxc@sysphere.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
-"PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
+"PO-Revision-Date: 2008-03-17 19:52+0100\n"
+"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr ""
+msgstr "Prijateljska dobrodo�lica"
 
 msgid "Hello"
-msgstr ""
+msgstr "Pozdrav"
 
 msgid "Greeting time (s)"
-msgstr ""
+msgstr "Trajanje dobrodo�lice (s)"
 
 msgid "Use alternate greeting"
-msgstr ""
+msgstr "Koristi alternativni pozdrav"
 
 msgid "Howdy folks!"
-msgstr ""
+msgstr "Pozdrav ljudi!"
 
 msgid "Hello world!"
-msgstr ""
+msgstr "Pozdrav svijete!"
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index b089c4a1a..b39b65d9e 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -59,3 +59,8 @@ VDR Plugin 'sky' Revision History
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
+
+2008-03-22:Version 0.3.7
+
+- Removed the full path from the 'logger' call in the getskyepg.pl script (this
+  program is apparently "on the move" through the file system...).
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index 6388caaed..d42744dd1 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 1.6 2006/12/02 09:52:49 kls Exp $
+# $Id: getskyepg.pl 1.7 2008/03/22 10:17:42 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
@@ -44,7 +44,7 @@
 $SkyWebPage = "www.bleb.org/tv/data/listings";
 $WGET = "/usr/bin/wget -q -O-";
 $WGET .= " -U '$IDENT'" unless $User;
-$LOGGER = "/usr/bin/logger -t SKYEPG";
+$LOGGER = "logger -t SKYEPG";
 
 $DST = -3600; # Daylight Saving Time offset
 $SecsInDay = 86400;
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index f2aa0cf89..0393dc2cd 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.14 2007/08/15 13:19:24 kls Exp $
+ * $Id: sky.c 1.15 2008/03/22 10:19:32 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -15,7 +15,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.6";
+static const char *VERSION        = "0.3.7";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
diff --git a/UPDATE-1.6.0 b/UPDATE-1.6.0
index 33abde069..6c3941d0a 100644
--- a/UPDATE-1.6.0
+++ b/UPDATE-1.6.0
@@ -119,6 +119,7 @@ Internationalization:
 - The new option --localedir can be used to set the locale directory at runtime.
 - Added Turkish language texts.
 - Added Ukrainian language texts.
+- Added Chinese language texts.
 
 Misc:
 
diff --git a/config.h b/config.h
index 809ada352..822ee1767 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.308 2008/03/16 11:37:13 kls Exp $
+ * $Id: config.h 1.310 2008/03/23 10:26:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.5.18"
-#define VDRVERSNUM   10518  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.6.0"
+#define VDRVERSNUM   10600  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.5.15"
-#define APIVERSNUM   10515  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.6.0"
+#define APIVERSNUM   10600  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/po/hr_HR.po b/po/hr_HR.po
index cc9f6f351..079063382 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -3,33 +3,34 @@
 # This file is distributed under the same license as the VDR package.
 # Drazen Dupor <drazen.dupor@dupor.com>, 2004, 2005
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
+# Adrian Caval <anrxc@sysphere.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
+"PO-Revision-Date: 2008-03-17 19:00+0100\n"
+"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Neispravan program ***"
+msgstr "*** Neispravan Program ***"
 
 msgid "Channel not available!"
 msgstr "Program nije dostupan!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Ne mogu zapo�eti 'prijenosni' na�in!"
+msgstr "Nemogu�e zapo�eti Prijenos!!"
 
 msgid "Starting EPG scan"
-msgstr "Po�injem EPG-scan"
+msgstr "Po�injem EPG pretragu"
 
 msgid "No title"
-msgstr "Bez titla"
+msgstr "Bez naziva"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -40,16 +41,16 @@ msgid "LanguageCode$eng"
 msgstr "hrv"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Faza 1: detektiranje k�da daljinskog upravlja�a."
+msgstr "Faza 1: detektiranje k�da daljinskog upravlja�a"
 
 msgid "Press any key on the RC unit"
-msgstr "Pritisnite tipku na daljinskom upravlja�u"
+msgstr "Pritisnite jednu tipku na daljinskom upravlja�u"
 
 msgid "RC code detected!"
 msgstr "K�d daljinskog upravlja�a je prepoznat!"
 
 msgid "Do not press any key..."
-msgstr "Ne pritiskajte tipku..."
+msgstr "Ne priti��ite tipke..."
 
 msgid "Phase 2: Learning specific key codes"
 msgstr "Faza 2: U�enje posebnih k�dova"
@@ -71,10 +72,10 @@ msgid "(press 'Down' to end key definition)"
 msgstr "(pritisnite 'Dolje' za kraj)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "pritisnite 'Izbor' da presko�ite ovu tipku"
+msgstr "pritisnite 'Izbornik' da presko�ite ovu tipku"
 
 msgid "Learning Remote Control Keys"
-msgstr "U�enje k�da daljinskog upravlja�a"
+msgstr "U�enje rasporeda tipki daljinskog upravlja�a"
 
 msgid "Phase 3: Saving key codes"
 msgstr "Faza 3: Spremanje k�dova tipki"
@@ -89,7 +90,7 @@ msgid "Key$Down"
 msgstr "Dolje"
 
 msgid "Key$Menu"
-msgstr "Izbor"
+msgstr "Izbornik"
 
 msgid "Key$Ok"
 msgstr "Ok"
@@ -137,22 +138,22 @@ msgid "Key$FastRew"
 msgstr "Nazad"
 
 msgid "Key$Next"
-msgstr ""
+msgstr "Sljede�e"
 
 msgid "Key$Prev"
-msgstr ""
+msgstr "Prethodno"
 
 msgid "Key$Power"
-msgstr "Isklju�i"
+msgstr "Power"
 
 msgid "Key$Channel+"
-msgstr "Program +"
+msgstr "Program+"
 
 msgid "Key$Channel-"
-msgstr "Program -"
+msgstr "Program-"
 
 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "PrethodniKanal"
 
 msgid "Key$Volume+"
 msgstr "Glasnije"
@@ -164,10 +165,10 @@ msgid "Key$Mute"
 msgstr "Bez zvuka"
 
 msgid "Key$Audio"
-msgstr ""
+msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Titlovi"
 
 msgid "Key$Schedule"
 msgstr "Raspored"
@@ -176,43 +177,43 @@ msgid "Key$Channels"
 msgstr "Programi"
 
 msgid "Key$Timers"
-msgstr "Termini"
+msgstr "Tajmeri"
 
 msgid "Key$Recordings"
 msgstr "Snimke"
 
 msgid "Key$Setup"
-msgstr "Konfiguracija"
+msgstr "Postavke"
 
 msgid "Key$Commands"
 msgstr "Naredbe"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Korisnik1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Korisnik2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Korisnik3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Korisnik4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Korisnik5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Korisnik6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Korisnik7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Korisnik8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Korisnik9"
 
 msgid "Disk"
 msgstr "Disk"
@@ -221,10 +222,10 @@ msgid "free"
 msgstr "slobodno"
 
 msgid "Free To Air"
-msgstr ""
+msgstr "Slobodno"
 
 msgid "encrypted"
-msgstr ""
+msgstr "kriptirano"
 
 msgid "auto"
 msgstr "automatski"
@@ -260,10 +261,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -284,13 +285,13 @@ msgid "Inversion"
 msgstr "Inverzija"
 
 msgid "off"
-msgstr "ugasi"
+msgstr "isklju�i"
 
 msgid "CoderateH"
 msgstr "CoderateH"
 
 msgid "none"
-msgstr "nijedan"
+msgstr "ni�ta"
 
 msgid "CoderateL"
 msgstr "CoderateL"
@@ -299,7 +300,7 @@ msgid "Modulation"
 msgstr "Modulacija"
 
 msgid "Bandwidth"
-msgstr "Bandwidth"
+msgstr "Propusnost"
 
 msgid "Transmission"
 msgstr "Prijenos"
@@ -311,7 +312,7 @@ msgid "Hierarchy"
 msgstr "Hijerarhija"
 
 msgid "Channel settings are not unique!"
-msgstr "Parametri programa nisu jednozna�ni!"
+msgstr "Postavke programa nisu jedinstvene!"
 
 msgid "Channels"
 msgstr "Programi"
@@ -329,13 +330,13 @@ msgid "Button$Mark"
 msgstr "Ozna�i"
 
 msgid "Channel is being used by a timer!"
-msgstr "Program je trenutno zauzet terminom za snimanje"
+msgstr "Program je trenutno zauzet tajmerom!"
 
 msgid "Delete channel?"
 msgstr "Obrisati program?"
 
 msgid "Edit timer"
-msgstr "Ure�ivanje termina"
+msgstr "Ure�ivanje tajmera"
 
 msgid "Active"
 msgstr "Aktivan"
@@ -368,25 +369,25 @@ msgid "First day"
 msgstr "Prvi dan"
 
 msgid "Timers"
-msgstr "Termini"
+msgstr "Tajmeri"
 
 msgid "Button$On/Off"
-msgstr "De-/Aktiviraj"
+msgstr "De/Aktiviraj"
 
 msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Obrisati termin?"
+msgstr "Obrisati tajmer?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Jo� snimam - zaista obrisati?"
+msgstr "Tajmer jo� snima - zaista obrisati?"
 
 msgid "Event"
 msgstr "Emisija"
 
 msgid "Button$Timer"
-msgstr ""
+msgstr "Tajmer"
 
 msgid "Button$Record"
 msgstr "Snimi"
@@ -410,7 +411,7 @@ msgid "Button$Schedule"
 msgstr "Raspored"
 
 msgid "Can't switch channel!"
-msgstr "Ne mogu prebaciti program!"
+msgstr "Nemogu�e prebaciti program!"
 
 #, c-format
 msgid "Schedule - %s"
@@ -418,23 +419,23 @@ msgstr "Raspored - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr ""
+msgstr "Ovaj doga�aj - %s"
 
 msgid "This event - all channels"
-msgstr ""
+msgstr "Ovaj doga�aj - svi kanali"
 
 msgid "All events - all channels"
-msgstr ""
+msgstr "Svi doga�aji - svi kanali"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr ""
+msgstr "Molim unesite %d znamenki!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM ne odgovara!"
 
 msgid "Recording info"
-msgstr ""
+msgstr "Detalji snimanja"
 
 msgid "Button$Play"
 msgstr "Start"
@@ -503,34 +504,34 @@ msgid "Setup.OSD$Use small font"
 msgstr "Koristi mala slova"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Zadani font"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Maleni font"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Nepromjenjiv font"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Veli�ina zadanog fonta (piksel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Veli�ina malenog fonta (piksel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Veli�ina nepromjenjivog fonta (piksel)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Pozicija informacije o programu"
+msgstr "Pozicija informacija o programu"
 
 msgid "bottom"
-msgstr "dolje"
+msgstr "dno"
 
 msgid "top"
-msgstr "gore"
+msgstr "vrh"
 
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Vrijeme prikaza informacije o programu (s)"
@@ -539,7 +540,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Informacije kod promjene kanala"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr ""
+msgstr "Trenutak prikaza informacije o kanalu"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Listaj po stranicama"
@@ -548,13 +549,13 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "S kraja sko�i na po�etak"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr ""
+msgstr "Tipka Izbornik zatvara"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Imenik za snimke"
 
 msgid "EPG"
-msgstr "Pregled emisija (EPG)"
+msgstr "EPG (elektronski programski vodi�)"
 
 msgid "Button$Scan"
 msgstr "Pretra�i"
@@ -563,16 +564,16 @@ msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Vrijeme do EPG pregleda (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Nivo popravka EPG gre�aka"
+msgstr "Razina popravka EPG gre�aka"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Prika�i stare EPG podatke (min)"
+msgstr "Vrijeme EPG zadr�avanja (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Podesi vrijeme sistema"
+msgstr "Podesi sistemsko vrijeme"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Transponder za pode�avanje sata"
+msgstr "Koristi vrijeme sa transpondera"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -583,13 +584,13 @@ msgid "Setup.EPG$Preferred language"
 msgstr "Preferirani jezik"
 
 msgid "pan&scan"
-msgstr "pan&scan"
+msgstr "pro�iri I ispitaj"
 
 msgid "letterbox"
-msgstr "letterbox"
+msgstr "pravokutnik"
 
 msgid "center cut out"
-msgstr "center cut out"
+msgstr "izre�i sredinu"
 
 msgid "no"
 msgstr "ne"
@@ -598,10 +599,10 @@ msgid "names only"
 msgstr "samo imena"
 
 msgid "PIDs only"
-msgstr ""
+msgstr "Samo PID-ovi"
 
 msgid "names and PIDs"
-msgstr "imena i identifikatore (PIDs)"
+msgstr "imena i identifikatori (PIDs)"
 
 msgid "add new channels"
 msgstr "dodaj nove programe"
@@ -634,22 +635,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio jezik"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Prika�i titlove"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Jezici titla"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Jezik titla"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Pomak titla"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transparentnost titla"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transparentnost pozadine titla"
 
 msgid "LNB"
 msgstr "LNB"
@@ -667,34 +668,34 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Gornja LNB frekv. (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Ponovno pokreni CAM"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM prisutan"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM spreman"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Menu"
-msgstr "Izbor"
+msgstr "Izbornik"
 
 msgid "Button$Reset"
-msgstr "Reset"
+msgstr "Ponovno pokreni"
 
 msgid "Opening CAM menu..."
-msgstr ""
+msgstr "Otvaram CAM izbornik..."
 
 msgid "Can't open CAM menu!"
-msgstr "Ne mogu otvoriti CAM izbor!"
+msgstr "Otvaranje CAM izbornika neuspje�no!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM se koristi - ponovno pokrenuti unato�?"
 
 msgid "Can't reset CAM!"
-msgstr "Ne mogu resetirati CAM"
+msgstr "Ponovno pokretanje CAM-a neuspje�no!"
 
 msgid "Recording"
 msgstr "Snimanje"
@@ -709,10 +710,10 @@ msgid "Setup.Recording$Primary limit"
 msgstr "Standardno ograni�enje"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Standardni prioritet"
+msgstr "Zadani prioritet"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Standardno trajanje (d)"
+msgstr "Zadano trajanje (d)"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet pauze"
@@ -748,7 +749,7 @@ msgid "Replay"
 msgstr "Reprodukcija"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "MultiSpeed na�in"
+msgstr "Vi�estruke brzine prikaza"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i na�in prikazivanja"
@@ -757,7 +758,7 @@ msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
 msgid "Miscellaneous"
-msgstr "Ostalo"
+msgstr "Raznovrsno"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minimalno vrijeme pauze"
@@ -769,31 +770,31 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP vrijeme neaktivnosti"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr ""
+msgstr "Zap istje�e (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Upis kanala istje�e (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Po�etni kanal"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "kao prethodno"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Po�etna ja�ina zvuka"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Izlaz u slu�aju nu�de"
 
 msgid "Plugins"
-msgstr "Dodaci (Plugins)"
+msgstr "Dodaci"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ovaj dodatak (Plugin) nema parametara!"
+msgstr "Ovaj dodatak nema parametara!"
 
 msgid "Setup"
-msgstr "Konfiguracija"
+msgstr "Postavke"
 
 msgid "Restart"
 msgstr "Restart sistema"
@@ -816,7 +817,7 @@ msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
 
 msgid "Button$Audio"
-msgstr ""
+msgstr "Audio"
 
 msgid "Button$Pause"
 msgstr "Pauza"
@@ -841,47 +842,47 @@ msgid "No audio available!"
 msgstr "Audio nedostupan"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Bez titlova"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Titlovi"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Titlovi nisu dostupni!"
 
 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "Nema dovoljno praznog prostora za snimanje!"
 
 msgid "No free DVB device to record!"
 msgstr "Nema slobodnog DVB ure�aja za snimanje!"
 
 msgid "Pausing live video..."
-msgstr "Zaustavljanje �ivog signala..."
+msgstr "Zaustavljanje izravnog prijenosa..."
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Sko�i: "
 
 msgid "No editing marks defined!"
-msgstr "Nijedna prekidna to�ka nije postavljena!"
+msgstr "Nijedna to�ka rezanja nije odre�ena!"
 
 msgid "Can't start editing process!"
 msgstr "Ne mogu zapo�eti ure�ivanje!"
 
 msgid "Editing process started"
-msgstr "Rezanje je zapo�eto"
+msgstr "Ure�ivanje zapo�elo"
 
 msgid "Editing process already active!"
-msgstr "Ure�ivanje je ve� aktivirano!"
+msgstr "Ure�ivanje je ve� u tijeku!!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr "abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "da"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -893,45 +894,45 @@ msgid "Button$Insert"
 msgstr "Umetni"
 
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Dodatak"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Gore/Dolje na novu poziciju - zatim OK"
+msgstr "Gore/Dolje na novu poziciju - OK za potvdru"
 
 msgid "Channel locked (recording)!"
-msgstr "Program blokiran (snimanje)!"
+msgstr "Program zaklju�an (snimanje)!"
 
 msgid "Low disk space!"
-msgstr "Nedovoljno prostora na disku"
+msgstr "Malo prostora na disku!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Ure�ivanje u tijeku - isklju�iti unato�?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Snimanje traje - svejedno isklju�iti?"
+msgstr "Snimanje traje - isklju�iti unato�?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Snimanje za %ld minuta - svejedno isklju�iti?"
+msgstr "Snimanje za %ld minuta - isklju�iti unato�?"
 
 msgid "shut down anyway?"
 msgstr "svejedno isklju�iti?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Dodatak %s se budi u %ld min, nastavi?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Ure�ivanje u tijeku - ponovno pokreni unato�?"
 
 msgid "Recording - restart anyway?"
-msgstr "Snimanje traje - svejedno restart sistema?"
+msgstr "Snimanje je u tijeku - ponovno pokreni unato�?"
 
 msgid "restart anyway?"
-msgstr "svejedno restart sistema?"
+msgstr "ponovno pokreni unato�?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -941,7 +942,7 @@ msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG Konzole"
+msgstr "ST:TNG Panele"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -973,19 +974,19 @@ msgid "Sunday"
 msgstr "Nedjelja"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "Obnovljena snimka!"
 
 msgid "Recording started"
-msgstr ""
+msgstr "Snimanje zapo�elo"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR �e se isklju�iti kasnije - pritisnite Power za prisilno isklju�enje"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Pritisnite tipku ako ne �elite ugasiti sistem"
+msgstr "Pritisnite tipku za prekid isklju�ivanja"
 
 msgid "Switching primary DVB..."
-msgstr "Preklapanje primarnog DVB ure�aja..."
+msgstr "Prebacivanje primarnog DVB ure�aja..."
 
 msgid "Editing process failed!"
 msgstr "Rezanje neuspje�no!"
@@ -994,8 +995,8 @@ msgid "Editing process finished"
 msgstr "Rezanje zavr�eno"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Pritisnite jednu tipku za poni�tenje ponovnog podizanja"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR �e se isklju�iti za %s minuta"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 7cc286902..1cdbfa2fe 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,27 +8,27 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-02-10 12:22+0100\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
+"PO-Revision-Date: 2008-03-18 17:04+0100\n"
+"Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Canal Inv�lido! ***"
+msgstr "*** Canal inv�lido ***"
 
 msgid "Channel not available!"
-msgstr ""
+msgstr "Canal indisponivel!"
 
 msgid "Can't start Transfer Mode!"
 msgstr "Imposs�vel iniciar modo de transfer�ncia!"
 
 msgid "Starting EPG scan"
-msgstr ""
+msgstr "Iniciar a procura de EPG"
 
 msgid "No title"
-msgstr ""
+msgstr "Sem t�tulo"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -39,7 +39,7 @@ msgid "LanguageCode$eng"
 msgstr "por"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Fase 1: detectar tipo de receptor"
+msgstr "Fase 1: Detectar tipo de telecomando"
 
 msgid "Press any key on the RC unit"
 msgstr "Pressione qualquer tecla do telecomando"
@@ -48,10 +48,10 @@ msgid "RC code detected!"
 msgstr "C�digo do telecomando detectado!"
 
 msgid "Do not press any key..."
-msgstr "N�o pressione nada..."
+msgstr "N�o pressione nenhuma tecla..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Fase 2: A aprender c�digos especificos"
+msgstr "Fase 2: A aprender c�digos de teclas espec�ficos"
 
 #, c-format
 msgid "Press key for '%s'"
@@ -64,13 +64,13 @@ msgid "Press 'Down' to continue"
 msgstr "Pressione 'Baixo' para continuar"
 
 msgid "(press 'Up' to go back)"
-msgstr "(Pressione 'Cima' para voltar)"
+msgstr "(Pressione 'Cima' para voltar atr�s)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(Pressione 'Baixo' para terminar a defini��o)"
+msgstr "(Pressione 'Baixo' para terminar a defini��o de teclas)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr ""
+msgstr "(Pressione 'Menu' para saltar esta tecla)"
 
 msgid "Learning Remote Control Keys"
 msgstr "Aprender as teclas do telecomando"
@@ -79,7 +79,7 @@ msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: A salvar os c�digos das teclas"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Cima' para Salvar, 'Baixo' para Cancelar"
+msgstr "Precione 'Cima' para gravar, 'Baixo' para cancelar"
 
 msgid "Key$Up"
 msgstr "Cima"
@@ -94,7 +94,7 @@ msgid "Key$Ok"
 msgstr "Ok"
 
 msgid "Key$Back"
-msgstr "Voltar"
+msgstr "Voltar atr�s"
 
 msgid "Key$Left"
 msgstr "Esquerda"
@@ -115,43 +115,43 @@ msgid "Key$Blue"
 msgstr "Azul"
 
 msgid "Key$Info"
-msgstr ""
+msgstr "Info"
 
 msgid "Key$Play"
-msgstr ""
+msgstr "Reproduzir"
 
 msgid "Key$Pause"
-msgstr ""
+msgstr "Pausa"
 
 msgid "Key$Stop"
-msgstr "Stop"
+msgstr "Parar"
 
 msgid "Key$Record"
-msgstr ""
+msgstr "Gravar"
 
 msgid "Key$FastFwd"
-msgstr ""
+msgstr "Avan�o R�pido"
 
 msgid "Key$FastRew"
-msgstr ""
+msgstr "Retrocedo R�pido"
 
 msgid "Key$Next"
-msgstr ""
+msgstr "Seguinte"
 
 msgid "Key$Prev"
-msgstr ""
+msgstr "Anterior"
 
 msgid "Key$Power"
-msgstr "Ligar"
+msgstr "On/Off"
 
 msgid "Key$Channel+"
-msgstr ""
+msgstr "Canal+"
 
 msgid "Key$Channel-"
-msgstr ""
+msgstr "Canal-"
 
 msgid "Key$PrevChannel"
-msgstr ""
+msgstr "Canal anterior"
 
 msgid "Key$Volume+"
 msgstr "Volume+"
@@ -163,112 +163,112 @@ msgid "Key$Mute"
 msgstr "Sem som"
 
 msgid "Key$Audio"
-msgstr ""
+msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Legendas"
 
 msgid "Key$Schedule"
-msgstr "Programa��o"
+msgstr "Guia de programa��o"
 
 msgid "Key$Channels"
 msgstr "Canais"
 
 msgid "Key$Timers"
-msgstr "Timers"
+msgstr "Grava��es programadas"
 
 msgid "Key$Recordings"
 msgstr "Grava��es"
 
 msgid "Key$Setup"
-msgstr "Configurar"
+msgstr "Configura��o"
 
 msgid "Key$Commands"
 msgstr "Comandos"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Definida1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Definida2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Definida3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Definida4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Definida5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Definida6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Definida7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Definida8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Definida9"
 
 msgid "Disk"
-msgstr "Disk"
+msgstr "Disco"
 
 msgid "free"
 msgstr "livre"
 
 msgid "Free To Air"
-msgstr ""
+msgstr "FTA"
 
 msgid "encrypted"
-msgstr ""
+msgstr "Codificado"
 
 msgid "auto"
-msgstr ""
+msgstr "Autom�tico"
 
 msgid "Edit channel"
-msgstr "Modificar canal"
+msgstr "Editar canal"
 
 msgid "Name"
 msgstr "Nome"
 
 msgid "Source"
-msgstr ""
+msgstr "Origem"
 
 msgid "Frequency"
 msgstr "Frequ�ncia"
 
 msgid "Vpid"
-msgstr "PID de V�deo"
+msgstr "Vpid"
 
 msgid "Ppid"
 msgstr "Ppid"
 
 msgid "Apid1"
-msgstr "PID �udio (1)"
+msgstr "Apid1"
 
 msgid "Apid2"
 msgstr "Apid2"
 
 msgid "Dpid1"
-msgstr "PID AC3 (1)"
+msgstr "Dpid1"
 
 msgid "Dpid2"
-msgstr "PID AC3 (2)"
+msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
-msgstr "PID Teletexto"
+msgstr "Tpid"
 
 msgid "CA"
-msgstr "Encripta��o"
+msgstr "CA"
 
 msgid "Sid"
 msgstr "Sid"
@@ -280,7 +280,7 @@ msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
-msgstr "Inversion"
+msgstr "Invers�o"
 
 msgid "off"
 msgstr "off"
@@ -289,34 +289,34 @@ msgid "CoderateH"
 msgstr "CoderateH"
 
 msgid "none"
-msgstr ""
+msgstr "nenhum"
 
 msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "Modulation"
+msgstr "Modula��o"
 
 msgid "Bandwidth"
 msgstr "Bandwidth"
 
 msgid "Transmission"
-msgstr "Transmission"
+msgstr "Transmiss�o"
 
 msgid "Guard"
 msgstr "Guard"
 
 msgid "Hierarchy"
-msgstr "Hierarchy"
+msgstr "Hierarquia"
 
 msgid "Channel settings are not unique!"
-msgstr ""
+msgstr "Propriedades do canal n�o s�o �nicas!"
 
 msgid "Channels"
 msgstr "Canais"
 
 msgid "Button$Edit"
-msgstr "Modificar"
+msgstr "Editar"
 
 msgid "Button$New"
 msgstr "Novo"
@@ -328,13 +328,13 @@ msgid "Button$Mark"
 msgstr "Marcar"
 
 msgid "Channel is being used by a timer!"
-msgstr "Canal a ser utilizador por um timer!"
+msgstr "Canal a ser utilizador por uma grava��o programada!"
 
 msgid "Delete channel?"
 msgstr "Apagar o canal?"
 
 msgid "Edit timer"
-msgstr "Modificar timer"
+msgstr "Editar gava��o programada"
 
 msgid "Active"
 msgstr "Activo"
@@ -352,7 +352,7 @@ msgid "Stop"
 msgstr "Fim"
 
 msgid "VPS"
-msgstr ""
+msgstr "VPS"
 
 msgid "Priority"
 msgstr "Prioridade"
@@ -367,76 +367,76 @@ msgid "First day"
 msgstr "Primeiro dia"
 
 msgid "Timers"
-msgstr "Timers"
+msgstr "Grava��es programadas"
 
 msgid "Button$On/Off"
 msgstr "On/Off"
 
 msgid "Button$Info"
-msgstr ""
+msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Apagar o timer?"
+msgstr "Apagar a grava��o programada?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Timer activo - t�m a certeza que quer apagar?"
+msgstr "Grava��o programada activa - quer mesmo apagar?"
 
 msgid "Event"
 msgstr "Evento"
 
 msgid "Button$Timer"
-msgstr ""
+msgstr "Grava��o programada"
 
 msgid "Button$Record"
 msgstr "Gravar"
 
 msgid "Button$Switch"
-msgstr "Seleccionar"
+msgstr "Mudar"
 
 msgid "What's on now?"
-msgstr "Programa actual?"
+msgstr "O que est� a dar agora?"
 
 msgid "What's on next?"
-msgstr "Pr�ximo Programa?"
+msgstr "O que vai dar a seguir?"
 
 msgid "Button$Next"
-msgstr "Proximo"
+msgstr "depois"
 
 msgid "Button$Now"
 msgstr "Agora"
 
 msgid "Button$Schedule"
-msgstr "Programa��o"
+msgstr "Guia de Programa��o"
 
 msgid "Can't switch channel!"
-msgstr "N�o pode mudar de canal!"
+msgstr "Imposs�vel mudar de canal!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Programa - %s"
+msgstr "Guia de programa��o - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr ""
+msgstr "Este evento - %s"
 
 msgid "This event - all channels"
-msgstr ""
+msgstr "Este evento - todos os canais"
 
 msgid "All events - all channels"
-msgstr ""
+msgstr "Todos os eventos - todos os canais"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr ""
+msgstr "Por favor insira %d digitos!"
 
 msgid "CAM not responding!"
-msgstr ""
+msgstr "CAM n�o responde!"
 
 msgid "Recording info"
-msgstr ""
+msgstr "Informa��o da grava��o"
 
 msgid "Button$Play"
-msgstr "Play"
+msgstr "Reproduzir"
 
 msgid "Button$Rewind"
 msgstr "Rebobinar"
@@ -451,43 +451,43 @@ msgid "Commands"
 msgstr "Comandos"
 
 msgid "Error while accessing recording!"
-msgstr "Erro ao aceder � grava��o"
+msgstr "Erro ao aceder � grava��o!"
 
 msgid "Delete recording?"
 msgstr "Apagar a grava��o?"
 
 msgid "Error while deleting recording!"
-msgstr "Erro enquanto apagava uma grava��o!"
+msgstr "Erro ao apagar grava��o!"
 
 msgid "Recording commands"
-msgstr ""
+msgstr "Comandos de grava��o"
 
 msgid "never"
-msgstr ""
+msgstr "nunca"
 
 msgid "skin dependent"
-msgstr ""
+msgstr "Dependente da skin"
 
 msgid "always"
-msgstr ""
+msgstr "sempre"
 
 msgid "OSD"
 msgstr "OSD"
 
 msgid "Setup.OSD$Language"
-msgstr "Linguagem"
+msgstr "Idioma"
 
 msgid "Setup.OSD$Skin"
-msgstr ""
+msgstr "Skin"
 
 msgid "Setup.OSD$Theme"
-msgstr ""
+msgstr "Tema"
 
 msgid "Setup.OSD$Left"
-msgstr ""
+msgstr "Esquerda"
 
 msgid "Setup.OSD$Top"
-msgstr ""
+msgstr "Topo"
 
 msgid "Setup.OSD$Width"
 msgstr "Largura"
@@ -496,31 +496,31 @@ msgid "Setup.OSD$Height"
 msgstr "Altura"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Mostrar contador (s)"
+msgstr "Dura��o das mensagem (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr ""
+msgstr "Usar fonte pequena"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Fonte por defeito"
 
 msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Fonte pequena"
 
 msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Fonte Fixa"
 
 msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Tamanho por defeito de fonte (pixel)"
 
 msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Tamanho da fonte pequena (pixel)"
 
 msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Tamanho da fonte fixa (pixel)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posi��o de info dos canais"
@@ -532,54 +532,54 @@ msgid "top"
 msgstr "topo"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr ""
+msgstr "Tempo de info dos canais (s)"
 
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Mostrar info ao mudar de Canal"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr ""
+msgstr "Timeout da info dos canais pedidos"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Scroll da p�gina no menu"
+msgstr "Scroll das p�ginas"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr ""
+msgstr "Scroll circular"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr ""
+msgstr "Tecla Menu fecha"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Directorias de grava��o"
 
 msgid "EPG"
-msgstr "EPG"
+msgstr "Guia de programa��o"
 
 msgid "Button$Scan"
-msgstr ""
+msgstr "Procurar"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Expirou o EPG (h)"
+msgstr "Timeout da procura de EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "N�vel de correct��o EPG"
+msgstr "N�vel de correc��o EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr ""
+msgstr "Tempo de Linger de EPG (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Ajustar rel�gio do sistema"
+msgstr "Acertar hora do sistema"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Usar rel�gio do transponder"
+msgstr "Usar hora do transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr ""
+msgstr "Idiomas preferidos"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr ""
+msgstr "Idioma preferido"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -594,19 +594,19 @@ msgid "no"
 msgstr "n�o"
 
 msgid "names only"
-msgstr ""
+msgstr "Apenas nomes"
 
 msgid "PIDs only"
-msgstr ""
+msgstr "Apenas PIDs"
 
 msgid "names and PIDs"
-msgstr ""
+msgstr "Nomes e PIDs"
 
 msgid "add new channels"
-msgstr ""
+msgstr "Adicionar novos canais"
 
 msgid "add new transponders"
-msgstr ""
+msgstr "adicionar novos transponders"
 
 msgid "DVB"
 msgstr "DVB"
@@ -615,40 +615,40 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Interface DVB prim�rio"
 
 msgid "Setup.DVB$Video format"
-msgstr "Formato v�deo"
+msgstr "Formato de v�deo"
 
 msgid "Setup.DVB$Video display format"
-msgstr ""
+msgstr "Formato de v�deo visivel"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr ""
+msgstr "Usar Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr ""
+msgstr "Actualizar canais"
 
 msgid "Setup.DVB$Audio languages"
-msgstr ""
+msgstr "Idiomas de audio"
 
 msgid "Setup.DVB$Audio language"
-msgstr ""
+msgstr "Idioma de audio"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Mostrar legendas"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Idiomas das legendas"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Idioma da legenda"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Posi��o das legendas"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Transpar�ncia de foreground das legendas"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Transpar�ncia de background das legendas"
 
 msgid "LNB"
 msgstr "LNB"
@@ -657,22 +657,22 @@ msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilizar DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "Limite de bandas LNB (MHz)"
+msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Frequ�ncia base LNB (MHz)"
+msgstr "Frequ�ncia baixa LNB (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frequ�ncia alta LNB (MHz)"
 
 msgid "CAM reset"
-msgstr ""
+msgstr "Reiniciar CAM"
 
 msgid "CAM present"
-msgstr ""
+msgstr "CAM presente"
 
 msgid "CAM ready"
-msgstr ""
+msgstr "CAM preparada"
 
 msgid "CAM"
 msgstr "CAM"
@@ -681,22 +681,22 @@ msgid "Button$Menu"
 msgstr "Menu"
 
 msgid "Button$Reset"
-msgstr ""
+msgstr "Reiniciar"
 
 msgid "Opening CAM menu..."
-msgstr ""
+msgstr "A abrir menu da CAM..."
 
 msgid "Can't open CAM menu!"
-msgstr ""
+msgstr "N�o � poss�vel abrir menu da CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM em uso - quer mesmo reiniciar?"
 
 msgid "Can't reset CAM!"
-msgstr ""
+msgstr "N�o � poss�vel reiniciar a CAM"
 
 msgid "Recording"
-msgstr "A gravar"
+msgstr "Op��es de grava��o"
 
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "Margem inicial (min)"
@@ -714,85 +714,85 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Validade por defeito (d)"
 
 msgid "Setup.Recording$Pause priority"
-msgstr ""
+msgstr "Prioridade da pausa"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr ""
+msgstr "Validade da pausa"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Utilizar o nome do epis�dio"
 
 msgid "Setup.Recording$Use VPS"
-msgstr ""
+msgstr "Usar VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr ""
+msgstr "Margem do VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Marca de grava��o r�pida"
+msgstr "Marcar grava��es imediatas"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Nome de grava��o r�pida"
+msgstr "Dar nome a grava��es imediatas"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr ""
+msgstr "Tempo de grava��o imediata (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Tamanho m�ximo dos ficheiros (MB)"
+msgstr "Tamanho m�ximo dos ficheiros de video (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Quebrar ficheiros"
+msgstr "Dividir ficheiros editados"
 
 msgid "Replay"
-msgstr "Replay"
+msgstr "Op��es de reprodu��o"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Modo de multi-speed"
+msgstr "Modo de velocidade multipla"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Mostrar modo de replay"
+msgstr "Mostrar modo de reprodu��o"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "Resume ID"
+msgstr "ID de continua��o"
 
 msgid "Miscellaneous"
 msgstr "Outros"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Per�odo m�nimo de pausa (min)"
+msgstr "Tempo de espera m�nimo antes de um evento (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Per�odo m�nimo de inactividade (min)"
+msgstr "Tempo m�nimo de inactividade (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "Timeout SVDRP (s)"
+msgstr "Tempo de espera de SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr ""
+msgstr "Tempo de espera entre mudan�a de canais (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Tempo de espera ao entrar num canal (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr ""
+msgstr "Canal inicial"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr ""
+msgstr "Como estava"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr ""
+msgstr "Volume inicial"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "Sa�da de emerg�ncia"
 
 msgid "Plugins"
 msgstr "Plugins"
 
 msgid "This plugin has no setup parameters!"
-msgstr ""
+msgstr "Este plugin n�o tem par�metros configur�veis!"
 
 msgid "Setup"
-msgstr "Configurar"
+msgstr "Configura��o"
 
 msgid "Restart"
 msgstr "Reiniciar"
@@ -805,7 +805,7 @@ msgid " Stop recording "
 msgstr " Parar grava��o "
 
 msgid "Schedule"
-msgstr "Programa��o"
+msgstr "Guia de programa��o"
 
 msgid "VDR"
 msgstr "VDR"
@@ -815,10 +815,10 @@ msgid " Stop replaying"
 msgstr " Parar reprodu��o"
 
 msgid "Button$Audio"
-msgstr ""
+msgstr "Audio"
 
 msgid "Button$Pause"
-msgstr ""
+msgstr "Pausa"
 
 msgid "Button$Stop"
 msgstr "Parar"
@@ -828,68 +828,68 @@ msgstr "Continuar"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Anular modifica��o"
+msgstr " Cancelar edi��o"
 
 msgid "Stop recording?"
 msgstr "Parar Grava��o?"
 
 msgid "Cancel editing?"
-msgstr "Cancelar Modifica��es?"
+msgstr "Cancelar Edi��o?"
 
 msgid "No audio available!"
-msgstr ""
+msgstr "Audio n�o dispon�vel"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Sem legendas"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Legendas"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Sem legendas dispon�veis!"
 
 msgid "Not enough disk space to start recording!"
-msgstr ""
+msgstr "Espa�o livre de disco insuficiente para gravar!"
 
 msgid "No free DVB device to record!"
 msgstr "Nenhuma placa DVB disponivel para gravar!"
 
 msgid "Pausing live video..."
-msgstr ""
+msgstr "Video em directo em pausa..."
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Saltar: "
 
 msgid "No editing marks defined!"
-msgstr ""
+msgstr "N�o est�o definidas marcas de edi��o!"
 
 msgid "Can't start editing process!"
-msgstr "N�o pode iniciar a modifica��o!"
+msgstr "N�o pode iniciar o processo de edi��o!"
 
 msgid "Editing process started"
-msgstr "Processo de modifica��o iniciado"
+msgstr "Processo de edi��o iniciado"
 
 msgid "Editing process already active!"
-msgstr "Processo de modifica��o j� activo!"
+msgstr "Processo de edi��o j� activo!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr ""
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "yes"
 msgstr "sim"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr ""
+msgstr "Substituir"
 
 msgid "Button$Insert"
-msgstr ""
+msgstr "Inserir"
 
 msgid "Plugin"
 msgstr "Plugin"
@@ -907,7 +907,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Imposs�vel desligar - falta a op��o '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "A editar - quer mesmo desligar?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Em grava��o - quer mesmo desligar?"
@@ -921,10 +921,10 @@ msgstr "quer mesmo desligar?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s vai iniciar em %ld min, continuar?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "A editar - quer mesmo reiniciar?"
 
 msgid "Recording - restart anyway?"
 msgstr "Em grava��o - quer mesmo reiniciar?"
@@ -937,10 +937,10 @@ msgid "Volume "
 msgstr "Volume "
 
 msgid "Classic VDR"
-msgstr ""
+msgstr "VDR classico"
 
 msgid "ST:TNG Panels"
-msgstr ""
+msgstr "Paineis ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -948,7 +948,7 @@ msgstr "STQQSSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "SegTerQuaQuiSexSabDom"
+msgstr "SegTerQuaQuiSexS�bDom"
 
 msgid "Monday"
 msgstr "Segunda"
@@ -972,29 +972,29 @@ msgid "Sunday"
 msgstr "Domingo"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "Grava��o agendada!"
 
 msgid "Recording started"
-msgstr ""
+msgstr "Grava��o iniciada"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR vai desligar mais tarde - pressione On/Off para for�ar"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Pressione qualquer tecla para cancelar"
+msgstr "Pressione qualquer tecla para n�o desligar"
 
 msgid "Switching primary DVB..."
 msgstr "A mudar interface DVB prim�rio..."
 
 msgid "Editing process failed!"
-msgstr "Falha no processo de modifica��o"
+msgstr "Falha no processo de edi��o"
 
 msgid "Editing process finished"
-msgstr "Processo de modifica��o terminado"
+msgstr "Processo de edi��o terminado"
 
 msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Pressione qualquer tecla para n�o reiniciar"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR vai desligar em %s minutos"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 000000000..eaa9079ad
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,1003 @@
+# VDR language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Nan Feng <nfgx@21cn.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2008-03-22 13:28+0100\n"
+"PO-Revision-Date: 2008-03-21 08:44+0800\n"
+"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "*** Invalid Channel ***"
+msgstr "***无效频道 ***"
+
+msgid "Channel not available!"
+msgstr "频道不可用!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "不能启动传送模式"
+
+msgid "Starting EPG scan"
+msgstr "开始节目单扫描"
+
+msgid "No title"
+msgstr "没有标题"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "中文"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "中文"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "阶段 1: 检测RC代码类型"
+
+msgid "Press any key on the RC unit"
+msgstr "请按在RC单元下按任意键"
+
+msgid "RC code detected!"
+msgstr "发现RC代码!"
+
+msgid "Do not press any key..."
+msgstr "不按下任何键... "
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "阶段 2: 学习特殊的按键代码"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "请按 '%s' 键"
+
+msgid "Press 'Up' to confirm"
+msgstr "请按 '上' 确认"
+
+msgid "Press 'Down' to continue"
+msgstr "请按 '下' 继续"
+
+msgid "(press 'Up' to go back)"
+msgstr "(请按上返回)"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "(请按下结束键定义)"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "(请按菜单键跳过)"
+
+msgid "Learning Remote Control Keys"
+msgstr "学习遥控控制按键"
+
+msgid "Phase 3: Saving key codes"
+msgstr "阶段 3: 保存代码"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "请按上保存，按下取消"
+
+msgid "Key$Up"
+msgstr "上"
+
+msgid "Key$Down"
+msgstr "下"
+
+msgid "Key$Menu"
+msgstr "菜单"
+
+msgid "Key$Ok"
+msgstr "Ok"
+
+msgid "Key$Back"
+msgstr "返回"
+
+msgid "Key$Left"
+msgstr "左"
+
+msgid "Key$Right"
+msgstr "右"
+
+msgid "Key$Red"
+msgstr "红"
+
+msgid "Key$Green"
+msgstr "绿"
+
+msgid "Key$Yellow"
+msgstr "黄"
+
+msgid "Key$Blue"
+msgstr "蓝"
+
+msgid "Key$Info"
+msgstr "信息"
+
+msgid "Key$Play"
+msgstr "播放"
+
+msgid "Key$Pause"
+msgstr "暂停"
+
+msgid "Key$Stop"
+msgstr "停止"
+
+msgid "Key$Record"
+msgstr "回放列表"
+
+msgid "Key$FastFwd"
+msgstr "快速往前"
+
+msgid "Key$FastRew"
+msgstr "快速往后"
+
+msgid "Key$Next"
+msgstr "下一段"
+
+msgid "Key$Prev"
+msgstr "普遍"
+
+msgid "Key$Power"
+msgstr "电源"
+
+msgid "Key$Channel+"
+msgstr "频道+"
+
+msgid "Key$Channel-"
+msgstr "频道-"
+
+msgid "Key$PrevChannel"
+msgstr "节目"
+
+msgid "Key$Volume+"
+msgstr "音量+"
+
+msgid "Key$Volume-"
+msgstr "音量-"
+
+msgid "Key$Mute"
+msgstr "静音"
+
+msgid "Key$Audio"
+msgstr "声道"
+
+msgid "Key$Subtitles"
+msgstr "字幕"
+
+msgid "Key$Schedule"
+msgstr "附表"
+
+msgid "Key$Channels"
+msgstr "频道列表"
+
+msgid "Key$Timers"
+msgstr "时间"
+
+msgid "Key$Recordings"
+msgstr "录像"
+
+msgid "Key$Setup"
+msgstr "设置"
+
+msgid "Key$Commands"
+msgstr "命令"
+
+msgid "Key$User1"
+msgstr "用户1"
+
+msgid "Key$User2"
+msgstr "用户2"
+
+msgid "Key$User3"
+msgstr "用户3"
+
+msgid "Key$User4"
+msgstr "用户4"
+
+msgid "Key$User5"
+msgstr "用户5"
+
+msgid "Key$User6"
+msgstr "用户6"
+
+msgid "Key$User7"
+msgstr "用户7"
+
+msgid "Key$User8"
+msgstr "用户8"
+
+msgid "Key$User9"
+msgstr "用户9"
+
+msgid "Disk"
+msgstr "磁盘"
+
+msgid "free"
+msgstr "剩余"
+
+msgid "Free To Air"
+msgstr "剩余空间"
+
+msgid "encrypted"
+msgstr "加密"
+
+msgid "auto"
+msgstr "自动"
+
+msgid "Edit channel"
+msgstr "编辑频道"
+
+msgid "Name"
+msgstr "名字"
+
+msgid "Source"
+msgstr "来源"
+
+msgid "Frequency"
+msgstr "频率"
+
+msgid "Vpid"
+msgstr "Vpid"
+
+msgid "Ppid"
+msgstr "Ppid"
+
+msgid "Apid1"
+msgstr "Apid1"
+
+msgid "Apid2"
+msgstr "Apid2"
+
+msgid "Dpid1"
+msgstr "Dpid1"
+
+msgid "Dpid2"
+msgstr "Dpid2"
+
+msgid "Spid1"
+msgstr "Spid1"
+
+msgid "Spid2"
+msgstr "Spid2"
+
+msgid "Tpid"
+msgstr "Tpid"
+
+msgid "CA"
+msgstr "CA"
+
+msgid "Sid"
+msgstr "Sid"
+
+msgid "Polarization"
+msgstr "极化"
+
+msgid "Srate"
+msgstr "比率"
+
+msgid "Inversion"
+msgstr "倒置"
+
+msgid "off"
+msgstr "关"
+
+msgid "CoderateH"
+msgstr "高符号频率"
+
+msgid "none"
+msgstr "无"
+
+msgid "CoderateL"
+msgstr "论符号频率"
+
+msgid "Modulation"
+msgstr "调制"
+
+msgid "Bandwidth"
+msgstr "带宽"
+
+msgid "Transmission"
+msgstr "传送"
+
+msgid "Guard"
+msgstr "防护"
+
+msgid "Hierarchy"
+msgstr "层次"
+
+msgid "Channel settings are not unique!"
+msgstr "频道设置不是唯一的！"
+
+msgid "Channels"
+msgstr "频道"
+
+msgid "Button$Edit"
+msgstr "编辑"
+
+msgid "Button$New"
+msgstr "新增"
+
+msgid "Button$Delete"
+msgstr "删除"
+
+msgid "Button$Mark"
+msgstr "标记"
+
+msgid "Channel is being used by a timer!"
+msgstr "频道正在使用定时器！"
+
+msgid "Delete channel?"
+msgstr "是否删除频道？"
+
+msgid "Edit timer"
+msgstr "编辑计时器"
+
+msgid "Active"
+msgstr "活跃的"
+
+msgid "Channel"
+msgstr "频道"
+
+msgid "Day"
+msgstr "天"
+
+msgid "Start"
+msgstr "开始"
+
+msgid "Stop"
+msgstr "停止"
+
+msgid "VPS"
+msgstr "VPS"
+
+msgid "Priority"
+msgstr "优先"
+
+msgid "Lifetime"
+msgstr "终生"
+
+msgid "File"
+msgstr "文件"
+
+msgid "First day"
+msgstr "第一天"
+
+msgid "Timers"
+msgstr "计时器"
+
+msgid "Button$On/Off"
+msgstr "开/关"
+
+msgid "Button$Info"
+msgstr "信息"
+
+msgid "Delete timer?"
+msgstr "是否删除时间？"
+
+msgid "Timer still recording - really delete?"
+msgstr "计时器仍在录制-真的删除？ "
+
+msgid "Event"
+msgstr "事件"
+
+msgid "Button$Timer"
+msgstr "时间"
+
+msgid "Button$Record"
+msgstr "记录"
+
+msgid "Button$Switch"
+msgstr "开关"
+
+msgid "What's on now?"
+msgstr "现在播放的节目?"
+
+msgid "What's on next?"
+msgstr "下一播放的节目?"
+
+msgid "Button$Next"
+msgstr "下一步"
+
+msgid "Button$Now"
+msgstr "现在"
+
+msgid "Button$Schedule"
+msgstr "任务表"
+
+msgid "Can't switch channel!"
+msgstr "不能切换频道"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "时间表 - %s"
+
+#, c-format
+msgid "This event - %s"
+msgstr "这个事件- %s"
+
+msgid "This event - all channels"
+msgstr "这个事件-所有频道"
+
+msgid "All events - all channels"
+msgstr "所有事件-所有频道"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "请输入 %d 数字!"
+
+msgid "CAM not responding!"
+msgstr "CAM 没有响应！"
+
+msgid "Recording info"
+msgstr "记录信息"
+
+msgid "Button$Play"
+msgstr "播放"
+
+msgid "Button$Rewind"
+msgstr "重绕"
+
+msgid "Recordings"
+msgstr "记录"
+
+msgid "Button$Open"
+msgstr "打开"
+
+msgid "Commands"
+msgstr "命令"
+
+msgid "Error while accessing recording!"
+msgstr "存取记录错误！"
+
+msgid "Delete recording?"
+msgstr "是否删除记录？"
+
+msgid "Error while deleting recording!"
+msgstr "删除记录错误！"
+
+msgid "Recording commands"
+msgstr "记录命令"
+
+msgid "never"
+msgstr "从不"
+
+msgid "skin dependent"
+msgstr "外壳选择"
+
+msgid "always"
+msgstr "总是"
+
+msgid "OSD"
+msgstr "OSD"
+
+msgid "Setup.OSD$Language"
+msgstr "语言"
+
+msgid "Setup.OSD$Skin"
+msgstr "外壳"
+
+msgid "Setup.OSD$Theme"
+msgstr "主题"
+
+msgid "Setup.OSD$Left"
+msgstr "左"
+
+msgid "Setup.OSD$Top"
+msgstr "顶部"
+
+msgid "Setup.OSD$Width"
+msgstr "宽"
+
+msgid "Setup.OSD$Height"
+msgstr "高"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "时间信息 (s)"
+
+msgid "Setup.OSD$Use small font"
+msgstr "使用小字体"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "抗锯齿"
+
+msgid "Setup.OSD$Default font"
+msgstr "默认字体"
+
+msgid "Setup.OSD$Small font"
+msgstr "小字体"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "固定字体"
+
+msgid "Setup.OSD$Default font size (pixel)"
+msgstr "默认字体大小 (像素)"
+
+msgid "Setup.OSD$Small font size (pixel)"
+msgstr "小字体 (像素)"
+
+msgid "Setup.OSD$Fixed font size (pixel)"
+msgstr "固定的字体 (像素)"
+
+msgid "Setup.OSD$Channel info position"
+msgstr "频道信息位置"
+
+msgid "bottom"
+msgstr "底部"
+
+msgid "top"
+msgstr "头部"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "频道时间信息 (s)"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "频道信息开关"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "超时需求频道信息"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "滚动页"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "滚动限制"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "彩单关闭结束"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "记录目录"
+
+msgid "EPG"
+msgstr "节目单"
+
+msgid "Button$Scan"
+msgstr "扫描"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "节目单扫描超时 (h)"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "节目单问题修复级别"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "节目单停留时间 (min)"
+
+msgid "Setup.EPG$Set system time"
+msgstr "设置系统时间"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "转发器使用时间"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "首选语种 "
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "首选语言"
+
+msgid "pan&scan"
+msgstr "pan&scan"
+
+msgid "letterbox"
+msgstr "小盒子模式"
+
+msgid "center cut out"
+msgstr "Center-cut-out"
+
+msgid "no"
+msgstr "不"
+
+msgid "names only"
+msgstr "names only"
+
+msgid "PIDs only"
+msgstr "PIDs only"
+
+msgid "names and PIDs"
+msgstr "names and PIDs"
+
+msgid "add new channels"
+msgstr "添加新频道"
+
+msgid "add new transponders"
+msgstr "添加新转发器"
+
+msgid "DVB"
+msgstr "DVB"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "主要DVB接口"
+
+msgid "Setup.DVB$Video format"
+msgstr "视频格式"
+
+msgid "Setup.DVB$Video display format"
+msgstr "视频显示格式"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "杜比-数码-使用"
+
+msgid "Setup.DVB$Update channels"
+msgstr "更新频道"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "声道语言"
+
+msgid "Setup.DVB$Audio language"
+msgstr "声道语言"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "显示字幕"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "字幕语种"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "字幕语言"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "字幕关闭"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "字幕前景透明度"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "字幕背景透明度"
+
+msgid "LNB"
+msgstr "高频头"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "使用切换器"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "低本振频率 (MHz)"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "高本振频率 (MHz)"
+
+msgid "CAM reset"
+msgstr "CAM 重置"
+
+msgid "CAM present"
+msgstr "现在的CAM"
+
+msgid "CAM ready"
+msgstr "CAM 准备"
+
+msgid "CAM"
+msgstr "CAM"
+
+msgid "Button$Menu"
+msgstr "菜单"
+
+msgid "Button$Reset"
+msgstr "重启"
+
+msgid "Opening CAM menu..."
+msgstr "打开CAM菜单..."
+
+msgid "Can't open CAM menu!"
+msgstr "不能打开CAM菜单"
+
+msgid "CAM is in use - really reset?"
+msgstr "CAM正在使用-是否重启？"
+
+msgid "Can't reset CAM!"
+msgstr "不能重启CAM"
+
+msgid "Recording"
+msgstr "记录中"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "时间正在开始 (min)"
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "时间正在停止 (min)"
+
+msgid "Setup.Recording$Primary limit"
+msgstr "主要限制"
+
+msgid "Setup.Recording$Default priority"
+msgstr "默认优先"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "默认终身 (d)"
+
+msgid "Setup.Recording$Pause priority"
+msgstr "暂停优先"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "暂停终身 (d)"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "插入使用名字"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "使用VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS 时间 (s)"
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "标记直接记录"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "名字直接记录"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "直接录像时间(min)"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "最大的视频文件容量 (MB)"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "分离编辑文件"
+
+msgid "Replay"
+msgstr "回放"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "媒体速度模式"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "显示回放模式"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "恢复 ID"
+
+msgid "Miscellaneous"
+msgstr "混杂的"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Min. 结果超时 (min)"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Min. 使用者静止 (min)"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP 超时 (s)"
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Zap 超时 (s)"
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "频道进入超时 (ms)"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "初始频道"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "之前"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "初始化声音"
+
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "突发事件退出"
+
+msgid "Plugins"
+msgstr "插件"
+
+msgid "This plugin has no setup parameters!"
+msgstr "这个插件没有设置参数!"
+
+msgid "Setup"
+msgstr "设置"
+
+msgid "Restart"
+msgstr "重启"
+
+msgid "Really restart?"
+msgstr "是否重启？"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr "停止记录"
+
+msgid "Schedule"
+msgstr "时间表"
+
+msgid "VDR"
+msgstr "VDR"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr "停止回放"
+
+msgid "Button$Audio"
+msgstr "声道"
+
+msgid "Button$Pause"
+msgstr "暂停"
+
+msgid "Button$Stop"
+msgstr "停止"
+
+msgid "Button$Resume"
+msgstr "重置"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr "取消编辑"
+
+msgid "Stop recording?"
+msgstr "停止记录"
+
+msgid "Cancel editing?"
+msgstr "取消编辑"
+
+msgid "No audio available!"
+msgstr "声道不可用"
+
+msgid "No subtitles"
+msgstr "没有字幕"
+
+msgid "Button$Subtitles"
+msgstr "字幕"
+
+msgid "No subtitles available!"
+msgstr "字幕不可用"
+
+msgid "Not enough disk space to start recording!"
+msgstr "没有足够的空间记录"
+
+msgid "No free DVB device to record!"
+msgstr "没有空闲的DVB设备记录"
+
+msgid "Pausing live video..."
+msgstr "暂停当前视频"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "跳过: "
+
+msgid "No editing marks defined!"
+msgstr "无编辑标记定义!"
+
+msgid "Can't start editing process!"
+msgstr "不能开始编辑处理"
+
+msgid "Editing process started"
+msgstr "编辑处理开始"
+
+msgid "Editing process already active!"
+msgstr "编辑处理已经激活"
+
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr "abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+
+msgid "yes"
+msgstr "是"
+
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+msgid "Button$Overwrite"
+msgstr "覆盖"
+
+msgid "Button$Insert"
+msgstr "插入"
+
+msgid "Plugin"
+msgstr "插件"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "上/下 新的定位 - OK 移动"
+
+msgid "Channel locked (recording)!"
+msgstr "频道已经锁定 (记录)!"
+
+msgid "Low disk space!"
+msgstr "低磁盘空间!"
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "不能关机 - 操作 '-s' 不允许!"
+
+msgid "Editing - shut down anyway?"
+msgstr "编辑-立即关机?"
+
+msgid "Recording - shut down anyway?"
+msgstr "录像-立即关机?"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "记录在 %ld 分钟，立即关机?"
+
+msgid "shut down anyway?"
+msgstr "立即关机?"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "插件 %s 唤醒在 %ld 分钟，是否继续?"
+
+msgid "Editing - restart anyway?"
+msgstr "编辑 - 现在重启?"
+
+msgid "Recording - restart anyway?"
+msgstr "记录 - 现在重启？"
+
+msgid "restart anyway?"
+msgstr "现在重启？"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "音量"
+
+msgid "Classic VDR"
+msgstr "经典 VDR"
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG 面板"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr "MDMDFSS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr "一二三四五六日"
+
+msgid "Monday"
+msgstr "星期一"
+
+msgid "Tuesday"
+msgstr "星期二"
+
+msgid "Wednesday"
+msgstr "星期三"
+
+msgid "Thursday"
+msgstr "星期四"
+
+msgid "Friday"
+msgstr "星期五"
+
+msgid "Saturday"
+msgstr "星期六"
+
+msgid "Sunday"
+msgstr "星期天"
+
+msgid "Upcoming recording!"
+msgstr "即将的记录！"
+
+msgid "Recording started"
+msgstr "记录开始！"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR即将关闭 - 按电源强制关闭"
+
+msgid "Press any key to cancel shutdown"
+msgstr "按下任何键即可取消关机"
+
+msgid "Switching primary DVB..."
+msgstr "切换主要的DVB.."
+
+msgid "Editing process failed!"
+msgstr "编辑过程失败"
+
+msgid "Editing process finished"
+msgstr "编辑过程完毕"
+
+msgid "Press any key to cancel restart"
+msgstr "请按任意键重启"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR将要在%s分钟关闭"

From 771986b89fc19b4ae65179ccf7dd8082512f8b7d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Apr 2008 18:00:00 +0200
Subject: [PATCH 186/307] Version 1.7.0 - Re-implemented handling of DVB-S2,
 which first appeared in version 1.5.14, but was   revoked in version 1.5.15
 in favor of making a stable version 1.6.0. VDR now   requires the
 "multiproto" DVB driver, e.g. from http://jusst.de/hg/multiproto.   Note that
 the channels.conf file now supports additional parameters, so you may   want
 to make sure you have a backup of this file in case you need to go back to  
 the previous version of VDR! - Fixed displaying transponder data when it is
 modified (thanks to Reinhard Nissl). - Fixed handling the counter in
 detection of pre 1.3.19 PS data (thanks to Reinhard   Nissl). - Improved
 logging system time changes to avoid problems on slow systems under   heavy
 load (suggested by Helmut Auer). - Now setting the thread name, so that it
 can be seen in 'top -H' (thanks to Rolf   Ahrenberg). - Fixed initializing
 the timer's flags in the cTimer copy constructor (thanks to   Andreas Mair).
 - Fixed setting the OSD level in the 'osddemo' example (thanks to Wolfgang
 Rohdewald). - Increased the time between checking the CAM status to 500ms to
 avoid problems   with some CAMs (reported by Arthur Konovalov).

---
 CONTRIBUTORS                        |   8 +
 HISTORY                             |  32 +++
 Make.config.template                |   2 +-
 Makefile                            |   2 +-
 PLUGINS/src/hello/Makefile          |   2 +-
 PLUGINS/src/hello/hello.c           |   2 +-
 PLUGINS/src/osddemo/HISTORY         |   4 +
 PLUGINS/src/osddemo/Makefile        |   2 +-
 PLUGINS/src/osddemo/osddemo.c       |   6 +-
 PLUGINS/src/pictures/Makefile       |   2 +-
 PLUGINS/src/pictures/entry.c        |   2 +-
 PLUGINS/src/pictures/entry.h        |   2 +-
 PLUGINS/src/pictures/menu.c         |   2 +-
 PLUGINS/src/pictures/menu.h         |   2 +-
 PLUGINS/src/pictures/pic2mpg        |   2 +-
 PLUGINS/src/pictures/pictures.c     |   2 +-
 PLUGINS/src/pictures/player.c       |   2 +-
 PLUGINS/src/pictures/player.h       |   2 +-
 PLUGINS/src/servicedemo/Makefile    |   2 +-
 PLUGINS/src/servicedemo/svccli.c    |   2 +-
 PLUGINS/src/servicedemo/svcsvr.c    |   2 +-
 PLUGINS/src/skincurses/Makefile     |   2 +-
 PLUGINS/src/skincurses/po/it_IT.po  |   0
 PLUGINS/src/skincurses/skincurses.c |   2 +-
 PLUGINS/src/sky/Makefile            |   2 +-
 PLUGINS/src/sky/getskyepg.pl        |   2 +-
 PLUGINS/src/sky/sky.c               |   2 +-
 PLUGINS/src/status/Makefile         |   2 +-
 PLUGINS/src/status/status.c         |   2 +-
 PLUGINS/src/svdrpdemo/Makefile      |   2 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c   |   2 +-
 audio.c                             |   2 +-
 audio.h                             |   2 +-
 channels.c                          | 225 ++++++++++++++-------
 channels.h                          |  23 ++-
 ci.c                                |   4 +-
 ci.h                                |   2 +-
 config.c                            |   2 +-
 config.h                            |  10 +-
 cutter.c                            |   2 +-
 cutter.h                            |   2 +-
 device.c                            |  28 ++-
 device.h                            |   8 +-
 diseqc.c                            |   2 +-
 diseqc.h                            |   2 +-
 dvbci.c                             |   2 +-
 dvbci.h                             |   2 +-
 dvbdevice.c                         | 303 +++++++++++++++++-----------
 dvbdevice.h                         |  10 +-
 dvbosd.c                            |   2 +-
 dvbosd.h                            |   2 +-
 dvbplayer.c                         |   2 +-
 dvbplayer.h                         |   2 +-
 dvbspu.c                            |   2 +-
 dvbspu.h                            |   2 +-
 dvbsubtitle.c                       |   2 +-
 dvbsubtitle.h                       |   2 +-
 eit.c                               |   8 +-
 eit.h                               |   2 +-
 eitscan.c                           |   2 +-
 eitscan.h                           |   2 +-
 epg.c                               |   2 +-
 epg.h                               |   2 +-
 epg2html.pl                         |   2 +-
 filter.c                            |   2 +-
 filter.h                            |   2 +-
 font.c                              |   2 +-
 font.h                              |   2 +-
 i18n-to-gettext.pl                  |   2 +-
 i18n.c                              |   2 +-
 i18n.h                              |   2 +-
 interface.c                         |   2 +-
 interface.h                         |   2 +-
 keys.c                              |   2 +-
 keys.h                              |   2 +-
 libsi/Makefile                      |   2 +-
 libsi/descriptor.c                  |   2 +-
 libsi/descriptor.h                  |   2 +-
 libsi/gendescr.pl                   |   2 +-
 libsi/headers.h                     |   2 +-
 libsi/section.c                     |   2 +-
 libsi/section.h                     |   2 +-
 libsi/si.c                          |   2 +-
 libsi/si.h                          |   2 +-
 libsi/util.c                        |   2 +-
 libsi/util.h                        |   2 +-
 lirc.c                              |   2 +-
 lirc.h                              |   2 +-
 menu.c                              |  80 +-------
 menu.h                              |   2 +-
 menuitems.c                         |  60 +++++-
 menuitems.h                         |  13 +-
 newplugin                           |   2 +-
 nit.c                               |  38 ++--
 nit.h                               |   2 +-
 osd.c                               |   2 +-
 osd.h                               |   2 +-
 osdbase.c                           |   2 +-
 osdbase.h                           |   2 +-
 pat.c                               |   3 +-
 pat.h                               |   2 +-
 player.c                            |   2 +-
 player.h                            |   2 +-
 plugin.c                            |   2 +-
 plugin.h                            |   2 +-
 po/ca_ES.po                         |  44 ++--
 po/cs_CZ.po                         |  44 ++--
 po/da_DK.po                         |  44 ++--
 po/de_DE.po                         |  44 ++--
 po/el_GR.po                         |  44 ++--
 po/es_ES.po                         |  44 ++--
 po/et_EE.po                         |  44 ++--
 po/fi_FI.po                         |  44 ++--
 po/fr_FR.po                         |  44 ++--
 po/hr_HR.po                         |  44 ++--
 po/hu_HU.po                         |  47 +++--
 po/it_IT.po                         |  44 ++--
 po/nl_NL.po                         |  44 ++--
 po/nn_NO.po                         |  44 ++--
 po/pl_PL.po                         |  44 ++--
 po/pt_PT.po                         |  44 ++--
 po/ro_RO.po                         |  44 ++--
 po/ru_RU.po                         |  44 ++--
 po/sl_SI.po                         |  44 ++--
 po/sv_SE.po                         |  44 ++--
 po/tr_TR.po                         |  44 ++--
 po/uk_UA.po                         |  46 +++--
 po/zh_CN.po                         |  44 ++--
 rcu.c                               |   2 +-
 rcu.h                               |   2 +-
 receiver.c                          |   2 +-
 receiver.h                          |   2 +-
 recorder.c                          |   2 +-
 recorder.h                          |   2 +-
 recording.c                         |   2 +-
 recording.h                         |   2 +-
 remote.c                            |   2 +-
 remote.h                            |   2 +-
 remux.c                             |   2 +-
 remux.h                             |   2 +-
 ringbuffer.c                        |   2 +-
 ringbuffer.h                        |   2 +-
 runvdr                              |   2 +-
 sdt.c                               |   3 +-
 sdt.h                               |   2 +-
 sections.c                          |   2 +-
 sections.h                          |   2 +-
 shutdown.c                          |   2 +-
 shutdown.h                          |   2 +-
 skinclassic.c                       |   2 +-
 skinclassic.h                       |   2 +-
 skins.c                             |   2 +-
 skins.h                             |   2 +-
 skinsttng.c                         |   2 +-
 skinsttng.h                         |   2 +-
 sources.c                           |   2 +-
 sources.h                           |   2 +-
 spu.c                               |   2 +-
 spu.h                               |   2 +-
 status.c                            |   2 +-
 status.h                            |   2 +-
 summary2info.pl                     |   2 +-
 svdrp.c                             |   2 +-
 svdrp.h                             |   2 +-
 themes.c                            |   2 +-
 themes.h                            |   2 +-
 thread.c                            |  10 +-
 thread.h                            |   2 +-
 timers.c                            |   3 +-
 timers.h                            |   2 +-
 tools.c                             |   2 +-
 tools.h                             |   2 +-
 transfer.c                          |   2 +-
 transfer.h                          |   2 +-
 vdr.1                               |   2 +-
 vdr.5                               |  18 +-
 vdr.c                               |   2 +-
 videodir.c                          |   2 +-
 videodir.h                          |   2 +-
 179 files changed, 1428 insertions(+), 752 deletions(-)
 mode change 100755 => 100644 PLUGINS/src/skincurses/po/it_IT.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6ce5d2569..d02b08d01 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -595,6 +595,8 @@ Helmut Auer <vdr@helmutauer.de>
  not two hex digits after the '#'
  for suggesting to suppress the automatic shutdown if the remote control is
  currently disabled
+ for suggesting to improve logging system time changes to avoid problems on slow
+ systems under heavy load
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -958,6 +960,7 @@ Andreas Mair <andreas@vdr-developer.org>
  for making the SVDRP command LSTC list the channels with group separators if the
  option ':groups' is given
  for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet()
+ for fixing initializing the timer's flags in the cTimer copy constructor
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1050,6 +1053,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  language
  for fixing displaying the free disk space when entering the recordings menu where
  the last replayed recording was in a subdirectory, and pressing Back
+ for setting the thread name, so that it can be seen in 'top -H'
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1174,6 +1178,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting an invalid access in the section handler when ending VDR
  for pointing out that cDevice::Transferring() doesn't return the right value in the
  early stage of channel switching
+ for fixing displaying transponder data when it is modified
+ for fixing handling the counter in detection of pre 1.3.19 PS data
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1506,6 +1512,7 @@ Arthur Konovalov <kasjas@hot.ee>
  for translating OSD texts to the Estonian language
  for fixing a missing ',' in the Greek OSD texts
  for fixing a missing ',' in the Swedish OSD texts
+ for reporting problems with CAMs when checking the CAM status too frequently
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -1702,6 +1709,7 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  Channel+ or Channel- is pressed
  for pointing out a possible problem with asprintf() if the return value is not
  checked
+ for fixing setting the OSD level in the 'osddemo' example
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
diff --git a/HISTORY b/HISTORY
index c94d1d2b6..e5424f8a5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5729,3 +5729,35 @@ Video Disk Recorder Revision History
 - Added Chinese language texts (thanks to Nan Feng).
 - Updated the Portuguese language texts.
 - Added a note about VDR_CHARSET_OVERRIDE to the INSTALL file.
+
+2008-04-13: Version 1.7.0
+
+- Re-implemented handling of DVB-S2, which first appeared in version 1.5.14, but was
+  revoked in version 1.5.15 in favor of making a stable version 1.6.0. VDR now
+  requires the "multiproto" DVB driver, e.g. from http://jusst.de/hg/multiproto.
+  Note that the channels.conf file now supports additional parameters, so you may
+  want to make sure you have a backup of this file in case you need to go back to
+  the previous version of VDR!
+- Fixed displaying transponder data when it is modified (thanks to Reinhard Nissl).
+- Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard
+  Nissl).
+- Improved logging system time changes to avoid problems on slow systems under
+  heavy load (suggested by Helmut Auer).
+- Now setting the thread name, so that it can be seen in 'top -H' (thanks to Rolf
+  Ahrenberg).
+- Fixed initializing the timer's flags in the cTimer copy constructor (thanks to
+  Andreas Mair).
+- Fixed setting the OSD level in the 'osddemo' example (thanks to Wolfgang Rohdewald).
+- Increased the time between checking the CAM status to 500ms to avoid problems
+  with some CAMs (reported by Arthur Konovalov).
+
+2008-04-13: Version 1.6.0-1
+
+- Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard
+  Nissl).
+- Improved logging system time changes to avoid problems on slow systems under
+  heavy load (suggested by Helmut Auer).
+- Fixed initializing the timer's flags in the cTimer copy constructor (thanks to
+  Andreas Mair).
+- Increased the time between checking the CAM status to 500ms to avoid problems
+  with some CAMs (reported by Arthur Konovalov).
diff --git a/Make.config.template b/Make.config.template
index 32284fcac..03e781382 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.16 2008/01/13 12:54:09 kls Exp $
+# $Id: Make.config.template 2.0 2008/01/13 12:54:09 kls Exp $
 
 ### The C compiler and options:
 
diff --git a/Makefile b/Makefile
index b07b1dfba..265110261 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.113 2008/02/29 21:43:03 kls Exp $
+# $Id: Makefile 2.0 2008/02/29 21:43:03 kls Exp $
 
 .DELETE_ON_ERROR:
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index c4ea46fdb..9cd356209 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.22 2008/01/13 12:59:58 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 12:59:58 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 4d87d04f9..f3a6588f7 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.15 2008/03/18 17:13:25 kls Exp $
+ * $Id: hello.c 2.0 2008/03/18 17:13:25 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index b0f300a46..4217cb1e7 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -17,3 +17,7 @@ VDR Plugin 'osddemo' Revision History
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
+
+2008-04-13: Version 0.1.3
+
+- Fixed setting the OSD level (thanks to Wolfgang Rohdewald).
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index e85663f71..1b1c62280 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2008/01/13 13:00:01 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 13:00:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index a4c0b8f86..2a9e09a66 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 1.4 2007/08/15 13:17:55 kls Exp $
+ * $Id: osddemo.c 2.1 2008/04/13 12:59:57 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.2";
+static const char *VERSION        = "0.1.3";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -41,7 +41,7 @@ cLineGame::~cLineGame()
 
 void cLineGame::Show(void)
 {
-  osd = cOsdProvider::NewOsd(100, 50);
+  osd = cOsdProvider::NewOsd(100, 50, 50);
   if (osd) {
      tArea Area = { 0, 0, 99, 199,  4 };
      osd->SetAreas(&Area, 1);
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index d9499443f..4935a609a 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2008/01/13 13:00:04 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 13:00:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index 427585e6d..1438481e5 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.c 1.3 2008/02/17 13:42:34 kls Exp $
+ * $Id: entry.c 2.0 2008/02/17 13:42:34 kls Exp $
  */
 
 #include "entry.h"
diff --git a/PLUGINS/src/pictures/entry.h b/PLUGINS/src/pictures/entry.h
index 5c72e5ed5..60b777374 100644
--- a/PLUGINS/src/pictures/entry.h
+++ b/PLUGINS/src/pictures/entry.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.h 1.1 2008/01/06 12:30:50 kls Exp $
+ * $Id: entry.h 2.0 2008/01/06 12:30:50 kls Exp $
  */
 
 #ifndef _ENTRY_H
diff --git a/PLUGINS/src/pictures/menu.c b/PLUGINS/src/pictures/menu.c
index 6a64d480a..8c51d5268 100644
--- a/PLUGINS/src/pictures/menu.c
+++ b/PLUGINS/src/pictures/menu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: menu.c 1.1 2008/01/13 11:35:18 kls Exp $
+ * $Id: menu.c 2.0 2008/01/13 11:35:18 kls Exp $
  */
 
 #include "menu.h"
diff --git a/PLUGINS/src/pictures/menu.h b/PLUGINS/src/pictures/menu.h
index ace753e8c..9090fd0ad 100644
--- a/PLUGINS/src/pictures/menu.h
+++ b/PLUGINS/src/pictures/menu.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: menu.h 1.1 2008/01/12 11:22:52 kls Exp $
+ * $Id: menu.h 2.0 2008/01/12 11:22:52 kls Exp $
  */
 
 #ifndef _MENU_H
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index af58f9757..d31751032 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 1.4 2008/02/29 14:34:22 kls Exp $
+# $Id: pic2mpg 2.0 2008/02/29 14:34:22 kls Exp $
 
 ## TODO implement HDTV (1920 x 1080)
 
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 6130f1952..9c4e515c0 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 1.7 2008/03/14 12:57:19 kls Exp $
+ * $Id: pictures.c 2.0 2008/03/14 12:57:19 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index 8981b6007..a0123e4c8 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 1.3 2008/02/09 12:13:10 kls Exp $
+ * $Id: player.c 2.0 2008/02/09 12:13:10 kls Exp $
  */
 
 #include "player.h"
diff --git a/PLUGINS/src/pictures/player.h b/PLUGINS/src/pictures/player.h
index ee9488f11..67a274dfb 100644
--- a/PLUGINS/src/pictures/player.h
+++ b/PLUGINS/src/pictures/player.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.h 1.1 2008/01/12 16:21:57 kls Exp $
+ * $Id: player.h 2.0 2008/01/12 16:21:57 kls Exp $
  */
 
 #ifndef _PLAYER_H
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index a20009afa..ea7e66a45 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.10 2008/01/13 13:00:07 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 13:00:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 6e812b417..a426416e1 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 1.2 2007/08/15 13:18:08 kls Exp $
+ * $Id: svccli.c 2.0 2007/08/15 13:18:08 kls Exp $
  */
 
 #include <stdlib.h>
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 9ccb73cec..1eea1d577 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 1.2 2007/08/15 13:18:59 kls Exp $
+ * $Id: svcsvr.c 2.0 2007/08/15 13:18:59 kls Exp $
  */
 
 #include <stdlib.h>
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 4dc4e28ad..1d6d9c59b 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.15 2008/01/19 11:40:33 kls Exp $
+# $Id: Makefile 2.0 2008/01/19 11:40:33 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
old mode 100755
new mode 100644
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 9499e23dd..8a7a846e1 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 1.23 2008/03/14 12:57:14 kls Exp $
+ * $Id: skincurses.c 2.0 2008/03/14 12:57:14 kls Exp $
  */
 
 #include <ncurses.h>
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 30fbb42c4..87fbcba74 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2008/01/13 13:00:16 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 13:00:16 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index d42744dd1..da553baf6 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 1.7 2008/03/22 10:17:42 kls Exp $
+# $Id: getskyepg.pl 2.0 2008/03/22 10:17:42 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 0393dc2cd..cb9b9c538 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.15 2008/03/22 10:19:32 kls Exp $
+ * $Id: sky.c 2.0 2008/03/22 10:19:32 kls Exp $
  */
 
 #include <sys/socket.h>
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index d725a39ae..81d4163b7 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.15 2008/01/13 13:00:18 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 13:00:18 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 395987139..5c1f7dae6 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.10 2008/02/16 15:41:05 kls Exp $
+ * $Id: status.c 2.0 2008/02/16 15:41:05 kls Exp $
  */
 
 #include <vdr/plugin.h>
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 7715284b7..c835f3cb2 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2008/01/13 13:00:20 kls Exp $
+# $Id: Makefile 2.0 2008/01/13 13:00:20 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 008d25b0f..d618e260b 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 1.3 2007/08/15 13:19:57 kls Exp $
+ * $Id: svdrpdemo.c 2.0 2007/08/15 13:19:57 kls Exp $
  */
 
 #include <vdr/plugin.h>
diff --git a/audio.c b/audio.c
index 7109a7d4b..dbf18f2b5 100644
--- a/audio.c
+++ b/audio.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 1.5 2006/05/28 15:03:24 kls Exp $
+ * $Id: audio.c 2.0 2006/05/28 15:03:24 kls Exp $
  */
 
 #include "audio.h"
diff --git a/audio.h b/audio.h
index 03ec01dbc..5f84aaa6e 100644
--- a/audio.h
+++ b/audio.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.h 1.3 2005/02/12 12:20:19 kls Exp $
+ * $Id: audio.h 2.0 2005/02/12 12:20:19 kls Exp $
  */
 
 #ifndef __AUDIO_H
diff --git a/channels.c b/channels.c
index 86d023801..3c3e74380 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.60 2008/03/05 16:42:50 kls Exp $
+ * $Id: channels.c 2.2 2008/04/12 13:49:12 kls Exp $
  */
 
 #include "channels.h"
@@ -21,67 +21,114 @@
 // --- Channel Parameter Maps ------------------------------------------------
 
 const tChannelParameterMap InversionValues[] = {
-  {   0, INVERSION_OFF },
-  {   1, INVERSION_ON },
-  { 999, INVERSION_AUTO },
+  {   0, DVBFE_INVERSION_OFF, trNOOP("off") },
+  {   1, DVBFE_INVERSION_ON,  trNOOP("on") },
+  { 999, DVBFE_INVERSION_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap BandwidthValues[] = {
-  {   6, BANDWIDTH_6_MHZ },
-  {   7, BANDWIDTH_7_MHZ },
-  {   8, BANDWIDTH_8_MHZ },
-  { 999, BANDWIDTH_AUTO },
+  {   5, DVBFE_BANDWIDTH_5_MHZ, "5 MHz" },
+  {   6, DVBFE_BANDWIDTH_6_MHZ, "6 MHz" },
+  {   7, DVBFE_BANDWIDTH_7_MHZ, "7 MHz" },
+  {   8, DVBFE_BANDWIDTH_8_MHZ, "8 MHz" },
+  { 999, DVBFE_BANDWIDTH_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap CoderateValues[] = {
-  {   0, FEC_NONE },
-  {  12, FEC_1_2 },
-  {  23, FEC_2_3 },
-  {  34, FEC_3_4 },
-  {  45, FEC_4_5 },
-  {  56, FEC_5_6 },
-  {  67, FEC_6_7 },
-  {  78, FEC_7_8 },
-  {  89, FEC_8_9 },
-  { 999, FEC_AUTO },
+  {   0, DVBFE_FEC_NONE, trNOOP("none") },
+  {  12, DVBFE_FEC_1_2,  "1/2" },
+  {  13, DVBFE_FEC_1_3,  "1/3" },
+  {  14, DVBFE_FEC_1_4,  "1/4" },
+  {  23, DVBFE_FEC_2_3,  "2/3" },
+  {  25, DVBFE_FEC_2_5,  "2/5" },
+  {  34, DVBFE_FEC_3_4,  "3/4" },
+  {  35, DVBFE_FEC_3_5,  "3/5" },
+  {  45, DVBFE_FEC_4_5,  "4/5" },
+  {  56, DVBFE_FEC_5_6,  "5/6" },
+  {  67, DVBFE_FEC_6_7,  "6/7" },
+  {  78, DVBFE_FEC_7_8,  "7/8" },
+  {  89, DVBFE_FEC_8_9,  "8/9" },
+  { 910, DVBFE_FEC_9_10, "9/10" },
+  { 999, DVBFE_FEC_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap ModulationValues[] = {
-  {   0, QPSK },
-  {  16, QAM_16 },
-  {  32, QAM_32 },
-  {  64, QAM_64 },
-  { 128, QAM_128 },
-  { 256, QAM_256 },
-  { 999, QAM_AUTO },
+  {   0, DVBFE_MOD_NONE,    trNOOP("none") },
+  {   4, DVBFE_MOD_QAM4,    "QAM4" },
+  {  16, DVBFE_MOD_QAM16,   "QAM16" },
+  {  32, DVBFE_MOD_QAM32,   "QAM32" },
+  {  64, DVBFE_MOD_QAM64,   "QAM64" },
+  { 128, DVBFE_MOD_QAM128,  "QAM128" },
+  { 256, DVBFE_MOD_QAM256,  "QAM256" },
+  { 512, DVBFE_MOD_QAM512,  "QAM512" },
+  {1024, DVBFE_MOD_QAM1024, "QAM1024" },
+  {   1, DVBFE_MOD_BPSK,    "BPSK" },
+  {   2, DVBFE_MOD_QPSK,    "QPSK" },
+  {   3, DVBFE_MOD_OQPSK,   "OQPSK" },
+  {   5, DVBFE_MOD_8PSK,    "8PSK" },
+  {   6, DVBFE_MOD_16APSK,  "16APSK" },
+  {   7, DVBFE_MOD_32APSK,  "32APSK" },
+  {   8, DVBFE_MOD_OFDM,    "OFDM" },
+  {   9, DVBFE_MOD_COFDM,   "COFDM" },
+  {  10, DVBFE_MOD_VSB8,    "VSB8" },
+  {  11, DVBFE_MOD_VSB16,   "VSB16" },
+  { 998, DVBFE_MOD_QAMAUTO, "QAMAUTO" },
+  { 999, DVBFE_MOD_AUTO },
+  { -1 }
+  };
+
+const tChannelParameterMap SystemValues[] = {
+  {   0, DVBFE_DELSYS_DVBS,  "DVB-S" },
+  {   1, DVBFE_DELSYS_DVBS2, "DVB-S2" },
   { -1 }
   };
 
 const tChannelParameterMap TransmissionValues[] = {
-  {   2, TRANSMISSION_MODE_2K },
-  {   8, TRANSMISSION_MODE_8K },
-  { 999, TRANSMISSION_MODE_AUTO },
+  {   2, DVBFE_TRANSMISSION_MODE_2K, "2K" },
+  {   4, DVBFE_TRANSMISSION_MODE_4K, "4K" },
+  {   8, DVBFE_TRANSMISSION_MODE_8K, "8K" },
+  { 999, DVBFE_TRANSMISSION_MODE_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap GuardValues[] = {
-  {   4, GUARD_INTERVAL_1_4 },
-  {   8, GUARD_INTERVAL_1_8 },
-  {  16, GUARD_INTERVAL_1_16 },
-  {  32, GUARD_INTERVAL_1_32 },
-  { 999, GUARD_INTERVAL_AUTO },
+  {   4, DVBFE_GUARD_INTERVAL_1_4,  "1/4" },
+  {   8, DVBFE_GUARD_INTERVAL_1_8,  "1/8" },
+  {  16, DVBFE_GUARD_INTERVAL_1_16, "1/16" },
+  {  32, DVBFE_GUARD_INTERVAL_1_32, "1/32" },
+  { 999, DVBFE_GUARD_INTERVAL_AUTO },
   { -1 }
   };
 
 const tChannelParameterMap HierarchyValues[] = {
-  {   0, HIERARCHY_NONE },
-  {   1, HIERARCHY_1 },
-  {   2, HIERARCHY_2 },
-  {   4, HIERARCHY_4 },
-  { 999, HIERARCHY_AUTO },
+  {   0, DVBFE_HIERARCHY_OFF, trNOOP("off") },
+  {   1, DVBFE_HIERARCHY_ON,  trNOOP("on") },
+  { 999, DVBFE_HIERARCHY_AUTO },
+  { -1 }
+  };
+
+const tChannelParameterMap AlphaValues[] = {
+  {   0, 0 },
+  {   1, DVBFE_ALPHA_1 },
+  {   2, DVBFE_ALPHA_2 },
+  {   4, DVBFE_ALPHA_4 },
+  { -1 }
+  };
+
+const tChannelParameterMap PriorityValues[] = {
+  {   0, DVBFE_STREAM_PRIORITY_HP, trNOOP("high") },
+  {   1, DVBFE_STREAM_PRIORITY_LP, trNOOP("low") },
+  { -1 }
+  };
+
+const tChannelParameterMap RollOffValues[] = {
+  {   0, DVBFE_ROLLOFF_UNKNOWN },
+  {  20, DVBFE_ROLLOFF_20, "0.20" },
+  {  25, DVBFE_ROLLOFF_25, "0.25" },
+  {  35, DVBFE_ROLLOFF_35, "0.35" },
   { -1 }
   };
 
@@ -107,11 +154,14 @@ int DriverIndex(int Value, const tChannelParameterMap *Map)
   return -1;
 }
 
-int MapToUser(int Value, const tChannelParameterMap *Map)
+int MapToUser(int Value, const tChannelParameterMap *Map, const char **String)
 {
   int n = DriverIndex(Value, Map);
-  if (n >= 0)
+  if (n >= 0) {
+     if (String)
+        *String = tr(Map[n].userString);
      return Map[n].userValue;
+     }
   return -1;
 }
 
@@ -167,14 +217,18 @@ cChannel::cChannel(void)
   provider = strdup("");
   portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-  inversion    = INVERSION_AUTO;
-  bandwidth    = BANDWIDTH_AUTO;
-  coderateH    = FEC_AUTO;
-  coderateL    = FEC_AUTO;
-  modulation   = QAM_AUTO;
-  transmission = TRANSMISSION_MODE_AUTO;
-  guard        = GUARD_INTERVAL_AUTO;
-  hierarchy    = HIERARCHY_AUTO;
+  inversion    = DVBFE_INVERSION_AUTO;
+  bandwidth    = DVBFE_BANDWIDTH_AUTO;
+  coderateH    = DVBFE_FEC_AUTO;
+  coderateL    = DVBFE_FEC_AUTO;
+  modulation   = DVBFE_MOD_AUTO;
+  system       = DVBFE_DELSYS_DVBS;
+  transmission = DVBFE_TRANSMISSION_MODE_AUTO;
+  guard        = DVBFE_GUARD_INTERVAL_AUTO;
+  hierarchy    = DVBFE_HIERARCHY_AUTO;
+  alpha        = 0;
+  priority     = DVBFE_STREAM_PRIORITY_HP;
+  rollOff      = DVBFE_ROLLOFF_UNKNOWN;
   modification = CHANNELMOD_NONE;
   schedule     = NULL;
   linkChannels = NULL;
@@ -277,13 +331,17 @@ void cChannel::CopyTransponderData(const cChannel *Channel)
      coderateH    = Channel->coderateH;
      coderateL    = Channel->coderateL;
      modulation   = Channel->modulation;
+     system       = Channel->system;
      transmission = Channel->transmission;
      guard        = Channel->guard;
      hierarchy    = Channel->hierarchy;
+     alpha        = Channel->alpha;
+     priority     = Channel->priority;
+     rollOff      = Channel->rollOff;
      }
 }
 
-bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
+bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
 {
   // Workarounds for broadcaster stupidity:
   // Some providers broadcast the transponder frequency of their channels with two different
@@ -297,19 +355,22 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
   if (abs(srate - Srate) <= 1)
      Srate = srate;
 
-  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) {
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%c:%d:%d to %s:%d:%c:%d:%d", Number(), *cSource::ToString(source), frequency, polarization, srate, coderateH, *cSource::ToString(Source), Frequency, Polarization, Srate, CoderateH);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
+  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH || modulation != Modulation || system != System || rollOff != RollOff) {
+     cString OldTransponderData = TransponderDataToString();
      source = Source;
      frequency = Frequency;
      polarization = Polarization;
      srate = Srate;
      coderateH = CoderateH;
-     modulation = QPSK;
+     modulation = Modulation;
+     system = System;
+     rollOff = RollOff;
      schedule = NULL;
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      }
   return true;
 }
@@ -317,29 +378,26 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
 bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH)
 {
   if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d to %s:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, modulation, srate, coderateH, *cSource::ToString(Source), Frequency, Modulation, Srate, CoderateH);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
+     cString OldTransponderData = TransponderDataToString();
      source = Source;
      frequency = Frequency;
      modulation = Modulation;
      srate = Srate;
      coderateH = CoderateH;
      schedule = NULL;
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      }
   return true;
 }
 
-bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission)
+bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, int Alpha, int Priority)
 {
-  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s:%d:%d:%d:%d:%d:%d:%d:%d to %s:%d:%d:%d:%d:%d:%d:%d:%d", Number(), *cSource::ToString(source), frequency, bandwidth, modulation, hierarchy, coderateH, coderateL, guard, transmission, *cSource::ToString(Source), Frequency, Bandwidth, Modulation, Hierarchy, CoderateH, CoderateL, Guard, Transmission);
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
+  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission || alpha != Alpha || priority != Priority) {
+     cString OldTransponderData = TransponderDataToString();
      source = Source;
      frequency = Frequency;
      bandwidth = Bandwidth;
@@ -349,7 +407,14 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
      coderateL = CoderateL;
      guard = Guard;
      transmission = Transmission;
+     alpha = Alpha;
+     priority = Priority;
      schedule = NULL;
+     if (Number()) {
+        dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
+        modification |= CHANNELMOD_TRANSP;
+        Channels.SetModified();
+        }
      }
   return true;
 }
@@ -587,6 +652,13 @@ static int PrintParameter(char *p, char Name, int Value)
   return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
 }
 
+cString cChannel::TransponderDataToString(void) const
+{
+  if (cSource::IsTerr(source))
+     return cString::sprintf("%d:%s:%s", frequency, *ParametersToString(), *cSource::ToString(source));
+  return cString::sprintf("%d:%s:%s:%d", frequency, *ParametersToString(), *cSource::ToString(source), srate);
+}
+
 cString cChannel::ParametersToString(void) const
 {
   char type = **cSource::ToString(source);
@@ -597,13 +669,17 @@ cString cChannel::ParametersToString(void) const
   char *q = buffer;
   *q = 0;
   ST(" S ")  q += sprintf(q, "%c", polarization);
-  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("  T")  q += PrintParameter(q, 'A', MapToUser(alpha, AlphaValues));
+  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
   ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
   ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
-  ST("C T")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
-  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
-  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
+  ST("  T")  q += PrintParameter(q, 'P', MapToUser(priority, PriorityValues));
+  ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
+  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
   return buffer;
 }
@@ -628,6 +704,7 @@ bool cChannel::StringToParameters(const char *s)
 {
   while (s && *s) {
         switch (toupper(*s)) {
+          case 'A': s = ParseParameter(s, alpha, AlphaValues); break;
           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
           case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
@@ -636,7 +713,11 @@ bool cChannel::StringToParameters(const char *s)
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
           case 'L': polarization = *s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
+          case 'Z':// for compatibility with the original DVB-S2 patch - may be removed in future versions
+          case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
+          case 'P': s = ParseParameter(s, priority, PriorityValues); break;
           case 'R': polarization = *s++; break;
+          case 'S': s = ParseParameter(s, system, SystemValues); break;
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = *s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
diff --git a/channels.h b/channels.h
index c3073d1c4..4d26ec247 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.47 2008/02/08 13:48:31 kls Exp $
+ * $Id: channels.h 2.2 2008/04/12 13:46:50 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -50,10 +50,10 @@
 struct tChannelParameterMap {
   int userValue;
   int driverValue;
+  const char *userString;
   };
 
-//XXX into cChannel???
-int MapToUser(int Value, const tChannelParameterMap *Map);
+int MapToUser(int Value, const tChannelParameterMap *Map, const char **String = NULL);
 int MapToDriver(int Value, const tChannelParameterMap *Map);
 int UserIndex(int Value, const tChannelParameterMap *Map);
 int DriverIndex(int Value, const tChannelParameterMap *Map);
@@ -62,9 +62,13 @@ extern const tChannelParameterMap InversionValues[];
 extern const tChannelParameterMap BandwidthValues[];
 extern const tChannelParameterMap CoderateValues[];
 extern const tChannelParameterMap ModulationValues[];
+extern const tChannelParameterMap SystemValues[];
 extern const tChannelParameterMap TransmissionValues[];
 extern const tChannelParameterMap GuardValues[];
 extern const tChannelParameterMap HierarchyValues[];
+extern const tChannelParameterMap AlphaValues[];
+extern const tChannelParameterMap PriorityValues[];
+extern const tChannelParameterMap RollOffValues[];
 
 struct tChannelID {
 private:
@@ -140,14 +144,19 @@ class cChannel : public cListObject {
   int coderateH;
   int coderateL;
   int modulation;
+  int system;
   int transmission;
   int guard;
   int hierarchy;
+  int alpha;
+  int priority;
+  int rollOff;
   int __EndData__;
   int modification;
   mutable const cSchedule *schedule;
   cLinkChannels *linkChannels;
   cChannel *refChannel;
+  cString TransponderDataToString(void) const;
   cString ParametersToString(void) const;
   bool StringToParameters(const char *s);
 public:
@@ -194,9 +203,13 @@ class cChannel : public cListObject {
   int CoderateH(void) const { return coderateH; }
   int CoderateL(void) const { return coderateL; }
   int Modulation(void) const { return modulation; }
+  int System(void) const { return system; }
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
+  int Alpha(void) const { return alpha; }
+  int Priority(void) const { return priority; }
+  int RollOff(void) const { return rollOff; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
   bool IsCable(void) const { return cSource::IsCable(source); }
@@ -206,9 +219,9 @@ class cChannel : public cListObject {
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
   void CopyTransponderData(const cChannel *Channel);
-  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH);
+  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
+  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
diff --git a/ci.c b/ci.c
index 05a1bd4e9..4d3df3e09 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.48 2007/04/30 13:02:49 kls Exp $
+ * $Id: ci.c 2.1 2008/04/13 13:28:52 kls Exp $
  */
 
 #include "ci.h"
@@ -1525,7 +1525,7 @@ void cCiAdapter::Action(void)
 
 cCamSlots CamSlots;
 
-#define MODULE_CHECK_INTERVAL 100 // ms
+#define MODULE_CHECK_INTERVAL 500 // ms
 #define MODULE_RESET_TIMEOUT    2 // s
 
 cCamSlot::cCamSlot(cCiAdapter *CiAdapter)
diff --git a/ci.h b/ci.h
index 37514a52a..c31dccff2 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.23 2007/01/03 12:49:10 kls Exp $
+ * $Id: ci.h 2.0 2007/01/03 12:49:10 kls Exp $
  */
 
 #ifndef __CI_H
diff --git a/config.c b/config.c
index 090a6a1d8..d3e1deec7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.161 2008/02/17 13:39:00 kls Exp $
+ * $Id: config.c 2.0 2008/02/17 13:39:00 kls Exp $
  */
 
 #include "config.h"
diff --git a/config.h b/config.h
index 822ee1767..7fad138e5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.310 2008/03/23 10:26:10 kls Exp $
+ * $Id: config.h 2.1 2008/04/12 13:02:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.6.0"
-#define VDRVERSNUM   10600  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.0"
+#define VDRVERSNUM   10700  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.6.0"
-#define APIVERSNUM   10600  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.0"
+#define APIVERSNUM   10700  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 42f3ab377..a19dba01e 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 1.18 2008/01/13 12:22:21 kls Exp $
+ * $Id: cutter.c 2.0 2008/01/13 12:22:21 kls Exp $
  */
 
 #include "cutter.h"
diff --git a/cutter.h b/cutter.h
index 8275281fc..e27ceb6b8 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 1.1 2002/06/22 10:03:15 kls Exp $
+ * $Id: cutter.h 2.0 2002/06/22 10:03:15 kls Exp $
  */
 
 #ifndef __CUTTER_H
diff --git a/device.c b/device.c
index 95bcb9108..12b8dd956 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.157 2008/03/09 10:03:34 kls Exp $
+ * $Id: device.c 2.2 2008/04/12 14:12:14 kls Exp $
  */
 
 #include "device.h"
@@ -355,6 +355,21 @@ cDevice *cDevice::GetDevice(int Index)
   return (0 <= Index && Index < numDevices) ? device[Index] : NULL;
 }
 
+static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
+{
+  int MaxNumProvidedSystems = 1 << AvailableBits;
+  int NumProvidedSystems = Device->NumProvidedSystems();
+  if (NumProvidedSystems > MaxNumProvidedSystems) {
+     esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->CardIndex() + 1, NumProvidedSystems, MaxNumProvidedSystems);
+     NumProvidedSystems = MaxNumProvidedSystems;
+     }
+  else if (NumProvidedSystems <= 0) {
+     esyslog("ERROR: device %d reported an invalid number (%d) of supported delivery systems - assuming 1", Device->CardIndex() + 1, NumProvidedSystems);
+     NumProvidedSystems = 1;
+     }
+  return NumProvidedSystems;
+}
+
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView)
 {
   cDevice *AvoidDevice = avoidDevice;
@@ -408,6 +423,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
              imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
+             imp <<= 2; imp |= GetClippedNumProvidedSystems(2, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
              imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
@@ -712,6 +728,11 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
   return false;
 }
 
+int cDevice::NumProvidedSystems(void) const
+{
+  return 0;
+}
+
 bool cDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return false;
@@ -1273,7 +1294,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                uchar SubStreamIndex = SubStreamId & 0x1F;
 
                // Compatibility mode for old VDR recordings, where 0xBD was only AC3:
-pre_1_3_19_PrivateStreamDeteced:
+pre_1_3_19_PrivateStreamDetected:
                if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
                   SubStreamId = c;
                   SubStreamType = 0x80;
@@ -1314,7 +1335,8 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                          if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) {
                             dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode - substream id = %02X", SubStreamId);
                             ClrAvailableTracks();
-                            goto pre_1_3_19_PrivateStreamDeteced;
+                            pre_1_3_19_PrivateStream = MIN_PRE_1_3_19_PRIVATESTREAM + 1;
+                            goto pre_1_3_19_PrivateStreamDetected;
                             }
                          }
                  }
diff --git a/device.h b/device.h
index 06daa5ea5..2712f91ea 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.91 2008/02/23 13:13:04 kls Exp $
+ * $Id: device.h 2.1 2008/04/12 11:11:23 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -228,6 +228,12 @@ class cDevice : public cThread {
          ///< function itself actually returns true.
          ///< The default implementation always returns false, so a derived cDevice
          ///< class that can provide channels must implement this function.
+  virtual int NumProvidedSystems(void) const;
+         ///< Returns the number of individual "delivery systems" this device provides.
+         ///< The default implementation returns 0, so any derived class that can
+         ///< actually provide channels must implement this function.
+         ///< The result of this function is used when selecting a device, in order
+         ///< to avoid devices that provide more than one system.
   virtual bool IsTunedToTransponder(const cChannel *Channel);
          ///< Returns true if this device is currently tuned to the given Channel's
          ///< transponder.
diff --git a/diseqc.c b/diseqc.c
index 3ce60d296..91f6d5fd2 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.6 2008/02/10 14:09:27 kls Exp $
+ * $Id: diseqc.c 2.0 2008/02/10 14:09:27 kls Exp $
  */
 
 #include "diseqc.h"
diff --git a/diseqc.h b/diseqc.h
index 602bdecb6..c60cb8121 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 1.2 2002/12/07 13:54:02 kls Exp $
+ * $Id: diseqc.h 2.0 2002/12/07 13:54:02 kls Exp $
  */
 
 #ifndef __DISEQC_H
diff --git a/dvbci.c b/dvbci.c
index 9d44008cb..5289bbde4 100644
--- a/dvbci.c
+++ b/dvbci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.c 1.1 2007/01/04 12:49:10 kls Exp $
+ * $Id: dvbci.c 2.0 2007/01/04 12:49:10 kls Exp $
  */
 
 #include "dvbci.h"
diff --git a/dvbci.h b/dvbci.h
index 1669c8cc0..adbe40d39 100644
--- a/dvbci.h
+++ b/dvbci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.h 1.1 2006/11/26 11:19:42 kls Exp $
+ * $Id: dvbci.h 2.0 2006/11/26 11:19:42 kls Exp $
  */
 
 #ifndef __DVBCI_H
diff --git a/dvbdevice.c b/dvbdevice.c
index c7408d35f..eef74429e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.170 2008/02/09 16:11:44 kls Exp $
+ * $Id: dvbdevice.c 2.2 2008/04/13 14:15:35 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -76,7 +76,7 @@ class cDvbTuner : public cThread {
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
-  fe_type_t frontendType;
+  dvbfe_delsys frontendType;
   cChannel channel;
   const char *diseqcCommands;
   eTunerStatus tunerStatus;
@@ -87,14 +87,14 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType);
+  cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
@@ -104,7 +104,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_type_t FrontendType)
   lastTimeoutReport = 0;
   diseqcCommands = NULL;
   tunerStatus = tsIdle;
-  if (frontendType == FE_QPSK)
+  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
   Start();
@@ -120,7 +120,26 @@ cDvbTuner::~cDvbTuner()
 
 bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
 {
-  return tunerStatus != tsIdle && channel.Source() == Channel->Source() && channel.Transponder() == Channel->Transponder();
+  if (tunerStatus == tsIdle)
+     return false; // not tuned to
+  if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder())
+     return false; // sufficient mismatch
+  char Type = **cSource::ToString(Channel->Source());
+#define ST(s, p) if (strchr(s, Type)) if (channel.p() != Channel->p()) return false;
+  // Polarization is already checked as part of the Transponder.
+  ST("  T", Alpha);
+  ST("  T", Bandwidth);
+  ST("CST", CoderateH);
+  ST("  T", CoderateL);
+  ST("  T", Guard);
+  ST("CST", Inversion);
+  ST("CST", Modulation);
+  ST(" S ", RollOff);
+  ST("  T", Priority);
+  ST(" S ", System);
+  ST("  T", Transmission);
+  ST("  T", Hierarchy);
+  return true;
 }
 
 void cDvbTuner::Set(const cChannel *Channel, bool Tune)
@@ -173,114 +192,126 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbTuner::SetFrontend(void)
 {
-  dvb_frontend_parameters Frontend;
-
+  dvbfe_params Frontend;
   memset(&Frontend, 0, sizeof(Frontend));
 
-  switch (frontendType) {
-    case FE_QPSK: { // DVB-S
-
-         unsigned int frequency = channel.Frequency();
-
-         if (Setup.DiSEqC) {
-            cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
-            if (diseqc) {
-               if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
-                  cDiseqc::eDiseqcActions da;
-                  for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
-                      switch (da) {
-                        case cDiseqc::daNone:      break;
-                        case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
-                        case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
-                        case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
-                        case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
-                        case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
-                        case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
-                        case cDiseqc::daCodes: {
-                             int n = 0;
-                             uchar *codes = diseqc->Codes(n);
-                             if (codes) {
-                                struct dvb_diseqc_master_cmd cmd;
-                                memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
-                                cmd.msg_len = n;
-                                CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-                                }
-                             }
-                             break;
-                        }
-                      }
-                  diseqcCommands = diseqc->Commands();
+  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) {
+     unsigned int frequency = channel.Frequency();
+     if (Setup.DiSEqC) {
+        cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
+        if (diseqc) {
+           if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
+              cDiseqc::eDiseqcActions da;
+              for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
+                  switch (da) {
+                    case cDiseqc::daNone:      break;
+                    case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+                    case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+                    case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+                    case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+                    case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+                    case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+                    case cDiseqc::daCodes: {
+                         int n = 0;
+                         uchar *codes = diseqc->Codes(n);
+                         if (codes) {
+                            struct dvb_diseqc_master_cmd cmd;
+                            memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
+                            cmd.msg_len = n;
+                            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
+                            }
+                         }
+                         break;
+                    }
                   }
-               frequency -= diseqc->Lof();
-               }
-            else {
-               esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
-               return false;
-               }
-            }
-         else {
-            int tone = SEC_TONE_OFF;
-
-            if (frequency < (unsigned int)Setup.LnbSLOF) {
-               frequency -= Setup.LnbFrequLo;
-               tone = SEC_TONE_OFF;
-               }
-            else {
-               frequency -= Setup.LnbFrequHi;
-               tone = SEC_TONE_ON;
-               }
-            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-            CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
-            CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
-            }
-
-         frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
-         Frontend.frequency = frequency * 1000UL;
-         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-         Frontend.u.qpsk.symbol_rate = channel.Srate() * 1000UL;
-         Frontend.u.qpsk.fec_inner = fe_code_rate_t(channel.CoderateH());
-
-         tuneTimeout = DVBS_TUNE_TIMEOUT;
-         lockTimeout = DVBS_LOCK_TIMEOUT;
-         }
-         break;
-    case FE_QAM: { // DVB-C
-
-         // Frequency and symbol rate:
+              diseqcCommands = diseqc->Commands();
+              }
+           frequency -= diseqc->Lof();
+           }
+        else {
+           esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
+           return false;
+           }
+        }
+     else {
+        int tone = SEC_TONE_OFF;
+        if (frequency < (unsigned int)Setup.LnbSLOF) {
+           frequency -= Setup.LnbFrequLo;
+           tone = SEC_TONE_OFF;
+           }
+        else {
+           frequency -= Setup.LnbFrequHi;
+           tone = SEC_TONE_ON;
+           }
+        int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+        CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
+        CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
+        }
+     frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
+
+     Frontend.delivery = dvbfe_delsys(channel.System());
+     Frontend.frequency = frequency * 1000UL;
+     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+     if (Frontend.delivery == DVBFE_DELSYS_DVBS) {
+        Frontend.delsys.dvbs.modulation = dvbfe_modulation(channel.Modulation());
+        Frontend.delsys.dvbs.symbol_rate = channel.Srate() * 1000UL;
+        Frontend.delsys.dvbs.fec = dvbfe_fec(channel.CoderateH());
+        }
+     else {
+        Frontend.delsys.dvbs2.modulation = dvbfe_modulation(channel.Modulation());
+        Frontend.delsys.dvbs2.symbol_rate = channel.Srate() * 1000UL;
+        Frontend.delsys.dvbs2.fec = dvbfe_fec(channel.CoderateH());
+        Frontend.delsys.dvbs2.rolloff = dvbfe_rolloff(channel.RollOff());
+        }
 
-         Frontend.frequency = FrequencyToHz(channel.Frequency());
-         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-         Frontend.u.qam.symbol_rate = channel.Srate() * 1000UL;
-         Frontend.u.qam.fec_inner = fe_code_rate_t(channel.CoderateH());
-         Frontend.u.qam.modulation = fe_modulation_t(channel.Modulation());
+     tuneTimeout = DVBS_TUNE_TIMEOUT;
+     lockTimeout = DVBS_LOCK_TIMEOUT;
 
-         tuneTimeout = DVBC_TUNE_TIMEOUT;
-         lockTimeout = DVBC_LOCK_TIMEOUT;
-         }
-         break;
-    case FE_OFDM: { // DVB-T
-
-         // Frequency and OFDM paramaters:
-
-         Frontend.frequency = FrequencyToHz(channel.Frequency());
-         Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-         Frontend.u.ofdm.bandwidth = fe_bandwidth_t(channel.Bandwidth());
-         Frontend.u.ofdm.code_rate_HP = fe_code_rate_t(channel.CoderateH());
-         Frontend.u.ofdm.code_rate_LP = fe_code_rate_t(channel.CoderateL());
-         Frontend.u.ofdm.constellation = fe_modulation_t(channel.Modulation());
-         Frontend.u.ofdm.transmission_mode = fe_transmit_mode_t(channel.Transmission());
-         Frontend.u.ofdm.guard_interval = fe_guard_interval_t(channel.Guard());
-         Frontend.u.ofdm.hierarchy_information = fe_hierarchy_t(channel.Hierarchy());
-
-         tuneTimeout = DVBT_TUNE_TIMEOUT;
-         lockTimeout = DVBT_LOCK_TIMEOUT;
-         }
-         break;
-    default:
-         esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
-         return false;
-    }
-  if (ioctl(fd_frontend, FE_SET_FRONTEND, &Frontend) < 0) {
+     dvbfe_info feinfo;
+     feinfo.delivery = Frontend.delivery;
+     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
+     }
+  else if (frontendType & DVBFE_DELSYS_DVBC) {
+     Frontend.delivery = DVBFE_DELSYS_DVBC;
+     Frontend.frequency = FrequencyToHz(channel.Frequency());
+     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+     Frontend.delsys.dvbc.symbol_rate = channel.Srate() * 1000UL;
+     Frontend.delsys.dvbc.fec = dvbfe_fec(channel.CoderateH());
+     Frontend.delsys.dvbc.modulation = dvbfe_modulation(channel.Modulation());
+
+     tuneTimeout = DVBC_TUNE_TIMEOUT;
+     lockTimeout = DVBC_LOCK_TIMEOUT;
+
+     dvbfe_info feinfo;
+     feinfo.delivery = Frontend.delivery;
+     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
+     }
+  else if (frontendType & DVBFE_DELSYS_DVBT) {
+     Frontend.delivery = DVBFE_DELSYS_DVBT;
+     Frontend.frequency = FrequencyToHz(channel.Frequency());
+     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
+     Frontend.delsys.dvbt.bandwidth = dvbfe_bandwidth(channel.Bandwidth());
+     Frontend.delsys.dvbt.code_rate_HP = dvbfe_fec(channel.CoderateH());
+     Frontend.delsys.dvbt.code_rate_LP = dvbfe_fec(channel.CoderateL());
+     Frontend.delsys.dvbt.constellation = dvbfe_modulation(channel.Modulation());
+     Frontend.delsys.dvbt.transmission_mode = dvbfe_transmission_mode(channel.Transmission());
+     Frontend.delsys.dvbt.guard_interval = dvbfe_guard_interval(channel.Guard());
+     Frontend.delsys.dvbt.hierarchy = dvbfe_hierarchy(channel.Hierarchy());
+     Frontend.delsys.dvbt.alpha = dvbfe_alpha(channel.Alpha());
+     Frontend.delsys.dvbt.priority = dvbfe_stream_priority(channel.Priority());
+
+     tuneTimeout = DVBT_TUNE_TIMEOUT;
+     lockTimeout = DVBT_LOCK_TIMEOUT;
+
+     dvbfe_info feinfo;
+     feinfo.delivery = Frontend.delivery;
+     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
+     }
+  else {
+     esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
+     return false;
+     }
+  if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) {
      esyslog("ERROR: frontend %d: %m", cardIndex);
      return false;
      }
@@ -351,11 +382,23 @@ void cDvbTuner::Action(void)
 int cDvbDevice::devVideoOffset = -1;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 
+const char *DeliverySystems[] = {
+  "DVBS",
+  "DSS",
+  "DVBS2",
+  "DVBC",
+  "DVBT",
+  "DVBH",
+  "ATSC",
+  NULL
+  };
+
 cDvbDevice::cDvbDevice(int n)
 {
   ciAdapter = NULL;
   dvbTuner = NULL;
-  frontendType = fe_type_t(-1); // don't know how else to initialize this - there is no FE_UNKNOWN
+  frontendType = DVBFE_DELSYS_DUMMY;
+  numProvidedSystems = 0;
   spuDecoder = NULL;
   digitalAudio = false;
   playMode = pmNone;
@@ -417,9 +460,22 @@ cDvbDevice::cDvbDevice(int n)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-     dvb_frontend_info feinfo;
-     if (ioctl(fd_frontend, FE_GET_INFO, &feinfo) >= 0) {
-        frontendType = feinfo.type;
+     if (ioctl(fd_frontend, DVBFE_GET_DELSYS, &frontendType) >= 0) {
+        const char **DeliverySystem = DeliverySystems;
+        cString ds;
+        for (int i = 0; i < 32; i++) {
+            if (frontendType & (1u << i)) {
+               numProvidedSystems++;
+               if (*DeliverySystem)
+                  ds = cString::sprintf("%s %s", *ds ? *ds : "", *DeliverySystem);
+               else
+                  esyslog("ERROR: unknown delivery system %d", i);
+               }
+            if (*DeliverySystem)
+               DeliverySystem++;
+            }
+        if (*ds)
+           isyslog("device %d provides:%s", CardIndex() + 1, *ds);
         dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
         }
      else
@@ -744,14 +800,20 @@ bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
   return type == cSource::stNone
-      || type == cSource::stCable && frontendType == FE_QAM
-      || type == cSource::stSat   && frontendType == FE_QPSK
-      || type == cSource::stTerr  && frontendType == FE_OFDM;
+      || type == cSource::stCable && (frontendType & DVBFE_DELSYS_DVBC)
+      || type == cSource::stSat   && (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
+      || type == cSource::stTerr  && (frontendType & DVBFE_DELSYS_DVBT);
 }
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 {
-  return ProvidesSource(Channel->Source()) && (!cSource::IsSat(Channel->Source()) || !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization()));
+  if (!ProvidesSource(Channel->Source()))
+     return false; // doesn't provide source
+  if (!cSource::IsSat(Channel->Source()))
+     return true; // source is sufficient for non sat
+  if (!(frontendType & Channel->System()))
+     return false; // requires modulation system which frontend doesn't provide
+  return !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
 }
 
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
@@ -760,7 +822,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if (ProvidesSource(Channel->Source())) {
+  if (ProvidesTransponder(Channel)) {
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
@@ -792,6 +854,11 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
+int cDvbDevice::NumProvidedSystems(void) const
+{
+  return numProvidedSystems;
+}
+
 bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return dvbTuner->IsTunedTo(Channel);
diff --git a/dvbdevice.h b/dvbdevice.h
index 7bd3e545f..3990eaa0e 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 1.47 2008/02/08 13:48:31 kls Exp $
+ * $Id: dvbdevice.h 2.1 2008/04/12 11:20:48 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -15,8 +15,8 @@
 #include "device.h"
 #include "dvbspu.h"
 
-#if DVB_API_VERSION != 3
-#error VDR requires Linux DVB driver API version 3!
+#if DVB_API_VERSION != 3 || DVB_API_VERSION_MINOR != 3
+#error VDR requires Linux DVB driver API version 3.3!
 #endif
 
 #define MAXDVBDEVICES  8
@@ -35,7 +35,8 @@ class cDvbDevice : public cDevice {
          ///< Must be called before accessing any DVB functions.
          ///< \return True if any devices are available.
 private:
-  fe_type_t frontendType;
+  dvbfe_delsys frontendType;
+  int numProvidedSystems;
   int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca;
 protected:
   virtual void MakePrimaryDevice(bool On);
@@ -66,6 +67,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual int NumProvidedSystems(void) const;
   virtual bool IsTunedToTransponder(const cChannel *Channel);
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
diff --git a/dvbosd.c b/dvbosd.c
index e076a3c99..ab34cbddb 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.32 2007/09/16 08:55:54 kls Exp $
+ * $Id: dvbosd.c 2.0 2007/09/16 08:55:54 kls Exp $
  */
 
 #include "dvbosd.h"
diff --git a/dvbosd.h b/dvbosd.h
index ae8afb6d0..3eb56f041 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.19 2007/08/25 13:49:34 kls Exp $
+ * $Id: dvbosd.h 2.0 2007/08/25 13:49:34 kls Exp $
  */
 
 #ifndef __DVBOSD_H
diff --git a/dvbplayer.c b/dvbplayer.c
index 64fa559b0..0fe8d3499 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.48 2008/02/09 15:10:54 kls Exp $
+ * $Id: dvbplayer.c 2.0 2008/02/09 15:10:54 kls Exp $
  */
 
 #include "dvbplayer.h"
diff --git a/dvbplayer.h b/dvbplayer.h
index 41590257b..2fb3b7883 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 1.2 2002/06/23 10:13:51 kls Exp $
+ * $Id: dvbplayer.h 2.0 2002/06/23 10:13:51 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
diff --git a/dvbspu.c b/dvbspu.c
index 1ca5435fc..bef80c3a1 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.22 2007/02/03 10:13:18 kls Exp $
+ * $Id: dvbspu.c 2.0 2007/02/03 10:13:18 kls Exp $
  */
 
 #include "dvbspu.h"
diff --git a/dvbspu.h b/dvbspu.h
index 1812b14b1..8606c8264 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 1.12 2006/04/17 12:47:29 kls Exp $
+ * $Id: dvbspu.h 2.0 2006/04/17 12:47:29 kls Exp $
  */
 
 #ifndef __DVBSPU_H
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 16a02c694..10d76b53d 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 1.3 2007/11/25 13:33:08 kls Exp $
+ * $Id: dvbsubtitle.c 2.0 2007/11/25 13:33:08 kls Exp $
  */
 
 #include "dvbsubtitle.h"
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index f7dec1904..bd8e76e32 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 1.1 2007/10/14 14:02:46 kls Exp $
+ * $Id: dvbsubtitle.h 2.0 2007/10/14 14:02:46 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
diff --git a/eit.c b/eit.c
index 5ed25d19b..d32629ef7 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.126 2007/08/26 10:56:33 kls Exp $
+ * $Id: eit.c 2.1 2008/04/13 11:27:06 kls Exp $
  */
 
 #include "eit.h"
@@ -300,9 +300,9 @@ cTDT::cTDT(const u_char *Data)
   if (diff > 2) {
      mutex.Lock();
      if (abs(diff - lastDiff) < 3) {
-        isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim);
-        isyslog("Local Time  = %s (%ld)", *TimeToString(sattim), sattim);
-        if (stime(&sattim) < 0)
+        if (stime(&sattim) == 0)
+           isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(sattim), sattim);
+        else
            esyslog("ERROR while setting system time: %m");
         }
      lastDiff = diff;
diff --git a/eit.h b/eit.h
index c57dd519b..ae3f9d12f 100644
--- a/eit.h
+++ b/eit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eit.h 1.30 2003/12/21 14:51:50 kls Exp $
+ * $Id: eit.h 2.0 2003/12/21 14:51:50 kls Exp $
  */
 
 #ifndef __EIT_H
diff --git a/eitscan.c b/eitscan.c
index 5966f50f4..d419d319e 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.30 2006/01/07 14:10:17 kls Exp $
+ * $Id: eitscan.c 2.0 2006/01/07 14:10:17 kls Exp $
  */
 
 #include "eitscan.h"
diff --git a/eitscan.h b/eitscan.h
index 8f6e391da..fb2d3ff65 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 1.9 2005/09/04 10:51:35 kls Exp $
+ * $Id: eitscan.h 2.0 2005/09/04 10:51:35 kls Exp $
  */
 
 #ifndef __EITSCAN_H
diff --git a/epg.c b/epg.c
index e01a7827e..5570e8e9d 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.83 2008/02/16 16:09:12 kls Exp $
+ * $Id: epg.c 2.0 2008/02/16 16:09:12 kls Exp $
  */
 
 #include "epg.h"
diff --git a/epg.h b/epg.h
index 792bb1362..9acfa8264 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.35 2006/10/07 13:47:19 kls Exp $
+ * $Id: epg.h 2.0 2006/10/07 13:47:19 kls Exp $
  */
 
 #ifndef __EPG_H
diff --git a/epg2html.pl b/epg2html.pl
index a18ec08b1..9fc41a6a9 100755
--- a/epg2html.pl
+++ b/epg2html.pl
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 1.7 2006/04/17 12:19:08 kls Exp $
+# $Id: epg2html.pl 2.0 2006/04/17 12:19:08 kls Exp $
 
 @Index = ();
 
diff --git a/filter.c b/filter.c
index 08bde5a44..4de678560 100644
--- a/filter.c
+++ b/filter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.c 1.4 2004/01/11 13:31:34 kls Exp $
+ * $Id: filter.c 2.0 2004/01/11 13:31:34 kls Exp $
  */
 
 #include "filter.h"
diff --git a/filter.h b/filter.h
index 9bd163fea..b85ab07a7 100644
--- a/filter.h
+++ b/filter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.h 1.3 2004/01/11 13:31:59 kls Exp $
+ * $Id: filter.h 2.0 2004/01/11 13:31:59 kls Exp $
  */
 
 #ifndef __FILTER_H
diff --git a/font.c b/font.c
index b458e8902..2fb23c0d0 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.25 2008/03/01 10:19:41 kls Exp $
+ * $Id: font.c 2.0 2008/03/01 10:19:41 kls Exp $
  */
 
 #include "font.h"
diff --git a/font.h b/font.h
index 4794304a1..6d68d75d6 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 1.20 2007/06/23 10:09:14 kls Exp $
+ * $Id: font.h 2.0 2007/06/23 10:09:14 kls Exp $
  */
 
 #ifndef __FONT_H
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index 309a47208..e2f5fedae 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 1.6 2007/11/04 10:57:36 kls Exp $
+# $Id: i18n-to-gettext.pl 2.0 2007/11/04 10:57:36 kls Exp $
 
 # How to convert an actual plugin:
 #
diff --git a/i18n.c b/i18n.c
index 66111f479..40e900645 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.319 2008/01/19 12:07:11 kls Exp $
+ * $Id: i18n.c 2.0 2008/01/19 12:07:11 kls Exp $
  *
  *
  */
diff --git a/i18n.h b/i18n.h
index 8f960ea36..014d8df22 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 1.25 2008/01/19 11:56:19 kls Exp $
+ * $Id: i18n.h 2.0 2008/01/19 11:56:19 kls Exp $
  */
 
 #ifndef __I18N_H
diff --git a/interface.c b/interface.c
index 6ad3c59f9..64bf9756d 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.77 2008/02/10 15:49:15 kls Exp $
+ * $Id: interface.c 2.0 2008/02/10 15:49:15 kls Exp $
  */
 
 #include "interface.h"
diff --git a/interface.h b/interface.h
index 2b3f979ac..9e10f40b2 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 1.31 2004/05/01 11:11:13 kls Exp $
+ * $Id: interface.h 2.0 2004/05/01 11:11:13 kls Exp $
  */
 
 #ifndef __INTERFACE_H
diff --git a/keys.c b/keys.c
index 19e12e5ec..f05e9370b 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.17 2008/02/10 14:08:48 kls Exp $
+ * $Id: keys.c 2.0 2008/02/10 14:08:48 kls Exp $
  */
 
 #include "keys.h"
diff --git a/keys.h b/keys.h
index cb2b2eb08..2d2e46ca5 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 1.14 2007/08/26 12:34:50 kls Exp $
+ * $Id: keys.h 2.0 2007/08/26 12:34:50 kls Exp $
  */
 
 #ifndef __KEYS_H
diff --git a/libsi/Makefile b/libsi/Makefile
index cfc889b87..1472a3b6c 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 1.6 2006/05/26 10:40:19 kls Exp $
+# $Id: Makefile 2.0 2006/05/26 10:40:19 kls Exp $
 
 ### The C++ compiler and options:
 
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index f3bb34428..06b22dc4e 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 1.22 2007/02/03 11:45:58 kls Exp $
+ *   $Id: descriptor.c 2.0 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 161793e5e..7df076e38 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 1.16 2007/02/03 11:45:58 kls Exp $
+ *   $Id: descriptor.h 2.0 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/gendescr.pl b/libsi/gendescr.pl
index e2b206f7f..d28890f6c 100755
--- a/libsi/gendescr.pl
+++ b/libsi/gendescr.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: gendescr.pl 1.2 2003/12/13 10:40:53 kls Exp $
+# $Id: gendescr.pl 2.0 2003/12/13 10:40:53 kls Exp $
 
 print "Name (ohne ...Descriptor):";
 $name=<STDIN>;
diff --git a/libsi/headers.h b/libsi/headers.h
index db1e261e3..1e09d6c93 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 1.9 2007/02/03 11:45:58 kls Exp $
+ *   $Id: headers.h 2.0 2007/02/03 11:45:58 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/section.c b/libsi/section.c
index 6dd43df7b..8c86f4645 100644
--- a/libsi/section.c
+++ b/libsi/section.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.c 1.5 2006/04/14 10:53:44 kls Exp $
+ *   $Id: section.c 2.0 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/section.h b/libsi/section.h
index 29af7f4bd..d8b5244be 100644
--- a/libsi/section.h
+++ b/libsi/section.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.h 1.4 2006/04/14 10:53:44 kls Exp $
+ *   $Id: section.h 2.0 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/si.c b/libsi/si.c
index 49464bafb..bf00041c2 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 1.25 2008/03/05 17:00:55 kls Exp $
+ *   $Id: si.c 2.0 2008/03/05 17:00:55 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/si.h b/libsi/si.h
index a156d767d..3d2cfc0da 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 1.17 2007/04/22 13:32:09 kls Exp $
+ *   $Id: si.h 2.0 2007/04/22 13:32:09 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/util.c b/libsi/util.c
index b0db93e16..36a80d083 100644
--- a/libsi/util.c
+++ b/libsi/util.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.c 1.7 2006/02/18 11:17:50 kls Exp $
+ *   $Id: util.c 2.0 2006/02/18 11:17:50 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/util.h b/libsi/util.h
index 08b16141b..b0300805c 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 1.7 2006/02/25 10:13:28 kls Exp $
+ *   $Id: util.h 2.0 2006/02/25 10:13:28 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/lirc.c b/lirc.c
index c4838b16b..f157df907 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.15 2006/05/28 08:48:13 kls Exp $
+ * $Id: lirc.c 2.0 2006/05/28 08:48:13 kls Exp $
  */
 
 #include "lirc.h"
diff --git a/lirc.h b/lirc.h
index 3c4735a88..fb6745ffb 100644
--- a/lirc.h
+++ b/lirc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 1.4 2006/01/27 16:00:19 kls Exp $
+ * $Id: lirc.h 2.0 2006/01/27 16:00:19 kls Exp $
  */
 
 #ifndef __LIRC_H
diff --git a/menu.c b/menu.c
index b7eab4568..da90018bd 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.482 2008/03/16 11:15:28 kls Exp $
+ * $Id: menu.c 2.1 2008/04/12 11:37:17 kls Exp $
  */
 
 #include "menu.h"
@@ -182,70 +182,6 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
   return state;
 }
 
-// --- cMenuEditMapItem ------------------------------------------------------
-
-class cMenuEditMapItem : public cMenuEditItem {
-protected:
-  int *value;
-  const tChannelParameterMap *map;
-  const char *zeroString;
-  virtual void Set(void);
-public:
-  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
-cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
-:cMenuEditItem(Name)
-{
-  value = Value;
-  map = Map;
-  zeroString = ZeroString;
-  Set();
-}
-
-void cMenuEditMapItem::Set(void)
-{
-  int n = MapToUser(*value, map);
-  if (n == 999)
-     SetValue(tr("auto"));
-  else if (n == 0 && zeroString)
-     SetValue(zeroString);
-  else if (n >= 0) {
-     char buf[16];
-     snprintf(buf, sizeof(buf), "%d", n);
-     SetValue(buf);
-     }
-  else
-     SetValue("???");
-}
-
-eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
-{
-  eOSState state = cMenuEditItem::ProcessKey(Key);
-
-  if (state == osUnknown) {
-     int newValue = *value;
-     int n = DriverIndex(*value, map);
-     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        if (n-- > 0)
-           newValue = map[n].driverValue;
-        }
-     else if (NORMALKEY(Key) == kRight) {
-        if (map[++n].userValue >= 0)
-           newValue = map[n].driverValue;
-        }
-     else
-        return state;
-     if (newValue != *value) {
-        *value = newValue;
-        Set();
-        }
-     state = osContinue;
-     }
-  return state;
-}
-
 // --- cMenuEditChannel ------------------------------------------------------
 
 class cMenuEditChannel : public cOsdMenu {
@@ -306,15 +242,19 @@ void cMenuEditChannel::Setup(void)
   XXX*/
   // Parameters for specific types of sources:
   ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr"));
+  ST(" S ")  Add(new cMenuEditMapItem( tr("System"),       &data.system,       SystemValues));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
-  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues, tr("off")));
-  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues, tr("none")));
-  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues, tr("none")));
-  ST("C T")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues, "QPSK"));
+  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues));
+  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues));
+  ST("CST")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Bandwidth"),    &data.bandwidth,    BandwidthValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues, tr("none")));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Alpha"),        &data.alpha,        AlphaValues));
+  ST("  T")  Add(new cMenuEditMapItem( tr("Priority"),     &data.priority,     PriorityValues));
+  ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
 
   SetCurrent(Get(current));
   Display();
diff --git a/menu.h b/menu.h
index 1d478d9b9..6ab9904a4 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.91 2008/02/10 16:01:53 kls Exp $
+ * $Id: menu.h 2.0 2008/02/10 16:01:53 kls Exp $
  */
 
 #ifndef __MENU_H
diff --git a/menuitems.c b/menuitems.c
index 4aba66c6e..200834ecc 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.58 2008/02/10 16:03:30 kls Exp $
+ * $Id: menuitems.c 2.1 2008/04/12 12:05:25 kls Exp $
  */
 
 #include "menuitems.h"
@@ -936,6 +936,64 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEditMapItem ------------------------------------------------------
+
+cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  map = Map;
+  zeroString = ZeroString;
+  Set();
+}
+
+void cMenuEditMapItem::Set(void)
+{
+  const char *s = NULL;
+  int n = MapToUser(*value, map, &s);
+  if (n == 999)
+     SetValue(tr("auto"));
+  else if (n == 0 && zeroString)
+     SetValue(zeroString);
+  else if (n >= 0) {
+     if (s)
+        SetValue(s);
+     else {
+        char buf[16];
+        snprintf(buf, sizeof(buf), "%d", n);
+        SetValue(buf);
+        }
+     }
+  else
+     SetValue("???");
+}
+
+eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     int newValue = *value;
+     int n = DriverIndex(*value, map);
+     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (n-- > 0)
+           newValue = map[n].driverValue;
+        }
+     else if (NORMALKEY(Key) == kRight) {
+        if (map[++n].userValue >= 0)
+           newValue = map[n].driverValue;
+        }
+     else
+        return state;
+     if (newValue != *value) {
+        *value = newValue;
+        Set();
+        }
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuSetupPage --------------------------------------------------------
 
 cMenuSetupPage::cMenuSetupPage(void)
diff --git a/menuitems.h b/menuitems.h
index 0170f9b5c..8d68b7d43 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 1.25 2008/02/16 16:09:58 kls Exp $
+ * $Id: menuitems.h 2.1 2008/04/12 12:03:59 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -160,6 +160,17 @@ class cMenuEditTimeItem : public cMenuEditItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuEditMapItem : public cMenuEditItem {
+protected:
+  int *value;
+  const tChannelParameterMap *map;
+  const char *zeroString;
+  virtual void Set(void);
+public:
+  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cPlugin;
 
 class cMenuSetupPage : public cOsdMenu {
diff --git a/newplugin b/newplugin
index d4d82fe83..22e2b72e3 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.41 2008/01/13 13:00:23 kls Exp $
+# $Id: newplugin 2.0 2008/01/13 13:00:23 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
diff --git a/nit.c b/nit.c
index a2ff2d7d5..7f0154a09 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 1.18 2008/02/08 13:48:31 kls Exp $
+ * $Id: nit.c 2.1 2008/04/12 12:06:40 kls Exp $
  */
 
 #include "nit.h"
@@ -127,8 +127,13 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100;
                  static char Polarizations[] = { 'h', 'v', 'l', 'r' };
                  char Polarization = Polarizations[sd->getPolarization()];
-                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
+                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
+                 static int Modulations[] = { DVBFE_MOD_AUTO, DVBFE_MOD_QPSK, DVBFE_MOD_8PSK, DVBFE_MOD_QAM16 };
+                 int Modulation = Modulations[sd->getModulationType()];
+                 int System = sd->getModulationSystem() ? DVBFE_DELSYS_DVBS2 : DVBFE_DELSYS_DVBS;
+                 static int RollOffs[] = { DVBFE_ROLLOFF_35, DVBFE_ROLLOFF_25, DVBFE_ROLLOFF_20, DVBFE_ROLLOFF_UNKNOWN };
+                 int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : DVBFE_ROLLOFF_UNKNOWN;
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
@@ -155,14 +160,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
+                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, Modulation, System, RollOff);
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
+                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate, Modulation, System, RollOff))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
@@ -176,9 +181,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Source = cSource::FromData(cSource::stCable);
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
-                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
+                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
+                 static int Modulations[] = { DVBFE_MOD_NONE, DVBFE_MOD_QAM16, DVBFE_MOD_QAM32, DVBFE_MOD_QAM64, DVBFE_MOD_QAM128, DVBFE_MOD_QAM256, QAM_AUTO };
                  int Modulation = Modulations[min(sd->getModulation(), 6)];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
@@ -226,19 +231,22 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = Frequencies[0] = sd->getFrequency() * 10;
-                 static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO };
+                 static int Bandwidths[] = { DVBFE_BANDWIDTH_8_MHZ, DVBFE_BANDWIDTH_7_MHZ, DVBFE_BANDWIDTH_6_MHZ, DVBFE_BANDWIDTH_5_MHZ, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO };
                  int Bandwidth = Bandwidths[sd->getBandwidth()];
-                 static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
+                 static int Constellations[] = { DVBFE_MOD_QPSK, DVBFE_MOD_QAM16, DVBFE_MOD_QAM64, DVBFE_MOD_AUTO };
                  int Constellation = Constellations[sd->getConstellation()];
-                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
-                 int Hierarchy = Hierarchies[sd->getHierarchy()];
-                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
+                 static int CodeRates[] = { DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO };
                  int CodeRateHP = CodeRates[sd->getCodeRateHP()];
                  int CodeRateLP = CodeRates[sd->getCodeRateLP()];
-                 static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
+                 static int GuardIntervals[] = { DVBFE_GUARD_INTERVAL_1_32, DVBFE_GUARD_INTERVAL_1_16, DVBFE_GUARD_INTERVAL_1_8, DVBFE_GUARD_INTERVAL_1_4 };
                  int GuardInterval = GuardIntervals[sd->getGuardInterval()];
-                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
+                 static int TransmissionModes[] = { DVBFE_TRANSMISSION_MODE_2K, DVBFE_TRANSMISSION_MODE_8K, DVBFE_TRANSMISSION_MODE_4K, DVBFE_TRANSMISSION_MODE_AUTO };
                  int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
+                 static int Priorities[] = { DVBFE_STREAM_PRIORITY_LP, DVBFE_STREAM_PRIORITY_HP };
+                 int Priority = Priorities[sd->getPriority()];
+                 static int Alphas[] = { 0, DVBFE_ALPHA_1, DVBFE_ALPHA_2, DVBFE_ALPHA_4 };
+                 int Alpha = Alphas[sd->getHierarchy() & 3];
+                 int Hierarchy = Alpha ? DVBFE_HIERARCHY_ON : DVBFE_HIERARCHY_OFF;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
                         if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
@@ -264,14 +272,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
+                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority);
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
+                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
diff --git a/nit.h b/nit.h
index c4ac82b58..e93f5bf66 100644
--- a/nit.h
+++ b/nit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.h 1.3 2007/06/10 08:50:21 kls Exp $
+ * $Id: nit.h 2.0 2007/06/10 08:50:21 kls Exp $
  */
 
 #ifndef __NIT_H
diff --git a/osd.c b/osd.c
index 47a11b216..925d60596 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.75 2007/10/12 12:38:36 kls Exp $
+ * $Id: osd.c 2.0 2007/10/12 12:38:36 kls Exp $
  */
 
 #include "osd.h"
diff --git a/osd.h b/osd.h
index 42ebc1aa6..9950a2d53 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.58 2007/10/12 14:28:44 kls Exp $
+ * $Id: osd.h 2.0 2007/10/12 14:28:44 kls Exp $
  */
 
 #ifndef __OSD_H
diff --git a/osdbase.c b/osdbase.c
index 0d9b6d853..a8f591d73 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 1.32 2008/02/17 11:33:04 kls Exp $
+ * $Id: osdbase.c 2.0 2008/02/17 11:33:04 kls Exp $
  */
 
 #include "osdbase.h"
diff --git a/osdbase.h b/osdbase.h
index b62b071b9..0997c2751 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.17 2007/11/03 14:50:52 kls Exp $
+ * $Id: osdbase.h 2.0 2007/11/03 14:50:52 kls Exp $
  */
 
 #ifndef __OSDBASE_H
diff --git a/pat.c b/pat.c
index 9b41b16b0..a16607c5f 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 1.20 2008/02/08 13:48:31 kls Exp $
+ * $Id: pat.c 2.1 2008/04/12 13:34:50 kls Exp $
  */
 
 #include "pat.h"
@@ -343,6 +343,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
+//TODO        case 0x1B: // MPEG4
                       Vpid = stream.getPid();
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
diff --git a/pat.h b/pat.h
index a8053ae9c..700f91c8e 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 1.7 2007/01/05 10:42:11 kls Exp $
+ * $Id: pat.h 2.0 2007/01/05 10:42:11 kls Exp $
  */
 
 #ifndef __PAT_H
diff --git a/player.c b/player.c
index c96fc1ab1..34905658c 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 1.12 2007/07/20 15:25:24 kls Exp $
+ * $Id: player.c 2.0 2007/07/20 15:25:24 kls Exp $
  */
 
 #include "player.h"
diff --git a/player.h b/player.h
index 47a4e3d5c..3636dbafc 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 1.21 2008/02/16 13:50:11 kls Exp $
+ * $Id: player.h 2.0 2008/02/16 13:50:11 kls Exp $
  */
 
 #ifndef __PLAYER_H
diff --git a/plugin.c b/plugin.c
index 8fab11fac..848e84303 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.28 2008/02/17 13:32:12 kls Exp $
+ * $Id: plugin.c 2.0 2008/02/17 13:32:12 kls Exp $
  */
 
 #include "plugin.h"
diff --git a/plugin.h b/plugin.h
index f457bd04b..4d70f9211 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.15 2007/08/04 09:56:26 kls Exp $
+ * $Id: plugin.h 2.0 2007/08/04 09:56:26 kls Exp $
  */
 
 #ifndef __PLUGIN_H
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 208d04946..0fd40910a 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "cap"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
 
@@ -228,9 +243,6 @@ msgstr "No codificat"
 msgid "encrypted"
 msgstr "Codificat"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Editar canal"
 
@@ -279,21 +291,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polaritzaci�"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversi�"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "cap"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,6 +321,15 @@ msgstr "Protegir"
 msgid "Hierarchy"
 msgstr "Jerarquia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritat"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Propietats del canal duplicades!"
 
@@ -357,9 +375,6 @@ msgstr "Fi"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritat"
-
 msgid "Lifetime"
 msgstr "Durada"
 
@@ -894,6 +909,9 @@ msgstr "Sobrescriure"
 msgid "Button$Insert"
 msgstr "Inserir"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 336a7e673..dd0ced311 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "vyp."
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "��dn�"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
@@ -226,9 +241,6 @@ msgstr "voln
 msgid "encrypted"
 msgstr "k�dovan�"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Editace kan�lu"
 
@@ -277,21 +289,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizace"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "vyp."
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "��dn�"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -310,6 +319,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorita"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastaven� kan�l� nejsou unik�tn�!"
 
@@ -355,9 +373,6 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorita"
-
 msgid "Lifetime"
 msgstr "�ivotnost"
 
@@ -892,6 +907,9 @@ msgstr "P
 msgid "Button$Insert"
 msgstr "Vlo�it"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Modul"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 11fc18370..53633b2fd 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "fra"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ingen"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
 
@@ -225,9 +240,6 @@ msgstr "Free To Air"
 msgid "encrypted"
 msgstr "kodet"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Edit channel"
 msgstr "Rediger kanal"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "fra"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ingen"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarki"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalindstillinger er ikke entydige!"
 
@@ -354,9 +372,6 @@ msgstr "Stop"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -891,6 +906,9 @@ msgstr "Overskriv"
 msgid "Button$Insert"
 msgstr "Inds�t"
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 60921ca46..f53e810ba 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: German\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "aus"
+
+msgid "on"
+msgstr "ein"
+
+msgid "none"
+msgstr "keine"
+
+msgid "high"
+msgstr "hoch"
+
+msgid "low"
+msgstr "niedrig"
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
 
@@ -225,9 +240,6 @@ msgstr "frei empfangbar"
 msgid "encrypted"
 msgstr "verschl�sselt"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Kanal editieren"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr "System"
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "aus"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "keine"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
+msgid "Alpha"
+msgstr "Alpha"
+
+msgid "Priority"
+msgstr "Priorit�t"
+
+msgid "Rolloff"
+msgstr "Rolloff"
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaleinstellungen sind nicht eindeutig!"
 
@@ -354,9 +372,6 @@ msgstr "Ende"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�t"
-
 msgid "Lifetime"
 msgstr "Lebensdauer"
 
@@ -891,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Einf�gen"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index abf4e75c9..337c6b097 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "�������"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "������"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
 
@@ -225,9 +240,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr "��������"
-
 msgid "Edit channel"
 msgstr "����������� ��������"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "������"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "����������"
 
-msgid "off"
-msgstr "�������"
-
 msgid "CoderateH"
 msgstr "������ ������ H"
 
-msgid "none"
-msgstr "������"
-
 msgid "CoderateL"
 msgstr "������ ������ L"
 
@@ -309,6 +318,15 @@ msgstr "
 msgid "Hierarchy"
 msgstr "���������"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "�������������"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "�� ��������� ��� �������� ����������������!"
 
@@ -354,9 +372,6 @@ msgstr "
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "�������������"
-
 msgid "Lifetime"
 msgstr "�������� ���������"
 
@@ -891,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "��������"
 
+msgid "auto"
+msgstr "��������"
+
 msgid "Plugin"
 msgstr "��������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index ed1ea5b4e..61c871749 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-03-02 17:25+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ninguno"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
@@ -226,9 +241,6 @@ msgstr "en abierto"
 msgid "encrypted"
 msgstr "cifrado"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Modificar canal"
 
@@ -277,21 +289,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizaci�n"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "T.s�mbolos"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ninguno"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -310,6 +319,15 @@ msgstr "Int.Guarda"
 msgid "Hierarchy"
 msgstr "Jerarqu�a"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioridad"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
 
@@ -355,9 +373,6 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioridad"
-
 msgid "Lifetime"
 msgstr "Duraci�n"
 
@@ -892,6 +907,9 @@ msgstr "Sobreescribir"
 msgid "Button$Insert"
 msgstr "Insertar"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 9b10cf655..70d59be46 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "v�ljas"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "puudu"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
 
@@ -225,9 +240,6 @@ msgstr "FTA"
 msgid "encrypted"
 msgstr "kr�ptitud"
 
-msgid "auto"
-msgstr "automaatne"
-
 msgid "Edit channel"
 msgstr "Kanali muutmine"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisatsioon"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversioon"
 
-msgid "off"
-msgstr "v�ljas"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "puudu"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
 
@@ -354,9 +372,6 @@ msgstr "Stopp"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteet"
-
 msgid "Lifetime"
 msgstr "Eluiga"
 
@@ -891,6 +906,9 @@ msgstr "Asenda (OVR)"
 msgid "Button$Insert"
 msgstr "Lisa (INS)"
 
+msgid "auto"
+msgstr "automaatne"
+
 msgid "Plugin"
 msgstr "Laiendusmoodul"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 5d1f00763..6be05ef2d 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "poissa"
+
+msgid "on"
+msgstr "p��ll�"
+
+msgid "none"
+msgstr "tyhj�"
+
+msgid "high"
+msgstr "korkea"
+
+msgid "low"
+msgstr "matala"
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
@@ -228,9 +243,6 @@ msgstr "vapaa"
 msgid "encrypted"
 msgstr "salattu"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Muokkaa kanavaa"
 
@@ -279,21 +291,18 @@ msgstr "Palvelu-ID"
 msgid "Polarization"
 msgstr "Polarisaatio"
 
+msgid "System"
+msgstr "Systeemi"
+
 msgid "Srate"
 msgstr "Symbolinopeus"
 
 msgid "Inversion"
 msgstr "Inversio"
 
-msgid "off"
-msgstr "pois"
-
 msgid "CoderateH"
 msgstr "Suojaustaso (HP)"
 
-msgid "none"
-msgstr "tyhj�"
-
 msgid "CoderateL"
 msgstr "Suojaustaso (LP)"
 
@@ -312,6 +321,15 @@ msgstr "Suojav
 msgid "Hierarchy"
 msgstr "Hierarkia"
 
+msgid "Alpha"
+msgstr "Alpha"
+
+msgid "Priority"
+msgstr "Prioriteetti"
+
+msgid "Rolloff"
+msgstr "Rolloff"
+
 msgid "Channel settings are not unique!"
 msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
 
@@ -357,9 +375,6 @@ msgstr "Lopetus"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteetti"
-
 msgid "Lifetime"
 msgstr "Elinik�"
 
@@ -894,6 +909,9 @@ msgstr "Korvaa"
 msgid "Button$Insert"
 msgstr "Lis��"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Laajennos"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 854914974..db886635e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -21,6 +21,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "aucun"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
 
@@ -231,9 +246,6 @@ msgstr "En clair"
 msgid "encrypted"
 msgstr "Crypt�"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Modifier une cha�ne"
 
@@ -282,21 +294,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Fr�q. symbole"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "aucun"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -315,6 +324,15 @@ msgstr "Intervalle de garde"
 msgid "Hierarchy"
 msgstr "Hi�rarchie"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorit�"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Caract�ristiques des cha�nes non uniques"
 
@@ -360,9 +378,6 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�"
-
 msgid "Lifetime"
 msgstr "Dur�e de vie"
 
@@ -897,6 +912,9 @@ msgstr "Ecraser"
 msgid "Button$Insert"
 msgstr "Ins�rer"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 079063382..69c2ee449 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -17,6 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "isklju�i"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ni�ta"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Program ***"
 
@@ -227,9 +242,6 @@ msgstr "Slobodno"
 msgid "encrypted"
 msgstr "kriptirano"
 
-msgid "auto"
-msgstr "automatski"
-
 msgid "Edit channel"
 msgstr "Ure�ivanje programa"
 
@@ -278,21 +290,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizacija"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
-msgid "off"
-msgstr "isklju�i"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ni�ta"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -311,6 +320,15 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hijerarhija"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Postavke programa nisu jedinstvene!"
 
@@ -356,9 +374,6 @@ msgstr "Kraj"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Trajanje"
 
@@ -893,6 +908,9 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Umetni"
 
+msgid "auto"
+msgstr "automatski"
+
 msgid "Plugin"
 msgstr "Dodatak"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7fe04eef3..e2629e837 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "ki"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "semmi"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
 
@@ -228,9 +243,6 @@ msgstr "K
 msgid "encrypted"
 msgstr "K�dolt"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Csatorn�k be�ll�t�sa"
 
@@ -279,21 +291,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polariz�ci�"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "ki"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "semmi"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,6 +321,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorit�s"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
 
@@ -357,9 +375,6 @@ msgstr "V
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�s"
-
 msgid "Lifetime"
 msgstr "�lettartam"
 
@@ -785,9 +800,8 @@ msgstr "ahogy az el
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hanger� a bekapcsol�sn�l"
 
-#, fuzzy
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "ahogy az el�bb"
+msgstr ""
 
 msgid "Plugins"
 msgstr "Plugins"
@@ -895,6 +909,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Beilleszteni"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index c3356c2aa..f122b3e6f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-08 21:06+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  Italian\n"
@@ -19,6 +19,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "nessuno"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
@@ -229,9 +244,6 @@ msgstr "in chiaro"
 msgid "encrypted"
 msgstr "codificato"
 
-msgid "auto"
-msgstr "automatico"
-
 msgid "Edit channel"
 msgstr "Modifica canale"
 
@@ -280,21 +292,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizzazione"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "SymbolRate"
 
 msgid "Inversion"
 msgstr "Inversione"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "nessuno"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,6 +322,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Gerarchia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorit�"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
 
@@ -358,9 +376,6 @@ msgstr "Fine"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorit�"
-
 msgid "Lifetime"
 msgstr "Durata"
 
@@ -895,6 +910,9 @@ msgstr "Sovrascrivi"
 msgid "Button$Insert"
 msgstr "Inserisci"
 
+msgid "auto"
+msgstr "automatico"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 57282ea24..547df255e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -19,6 +19,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "uit"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "geen"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
@@ -229,9 +244,6 @@ msgstr "Vrij te ontvangen"
 msgid "encrypted"
 msgstr "gecodeerd"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Kanaal aanpassen"
 
@@ -280,21 +292,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisatie"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "uit"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "geen"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -313,6 +322,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteit"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
 
@@ -358,9 +376,6 @@ msgstr "Einde"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteit"
-
 msgid "Lifetime"
 msgstr "Bewaarduur"
 
@@ -895,6 +910,9 @@ msgstr "Overschrijven"
 msgid "Button$Insert"
 msgstr "Invoegen"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 0147c069e..670f0dd3b 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
 
@@ -226,9 +241,6 @@ msgstr ""
 msgid "encrypted"
 msgstr ""
 
-msgid "auto"
-msgstr ""
-
 msgid "Edit channel"
 msgstr "Editer kanal"
 
@@ -277,21 +289,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisasjon"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr ""
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr ""
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -310,6 +319,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr ""
 
@@ -355,9 +373,6 @@ msgstr "Slutt"
 msgid "VPS"
 msgstr ""
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -892,6 +907,9 @@ msgstr ""
 msgid "Button$Insert"
 msgstr ""
 
+msgid "auto"
+msgstr ""
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index ff21e961a..e5bcd373b 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "wy��cz"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "brak"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
@@ -226,9 +241,6 @@ msgstr "nieszyfrowany"
 msgid "encrypted"
 msgstr "szyfrowany"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Edit channel"
 msgstr "Edycja kana�u"
 
@@ -277,21 +289,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polaryzacja"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inwersja"
 
-msgid "off"
-msgstr "wy��cz"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "brak"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -310,6 +319,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Priorytet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
 
@@ -355,9 +373,6 @@ msgstr "Koniec"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Priorytet"
-
 msgid "Lifetime"
 msgstr "Czas �ycia"
 
@@ -892,6 +907,9 @@ msgstr "Nadpisz"
 msgid "Button$Insert"
 msgstr "Wstaw"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "Plugin"
 msgstr "Wtyczka"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1cdbfa2fe..143d0e949 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "nenhum"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal inv�lido ***"
 
@@ -225,9 +240,6 @@ msgstr "FTA"
 msgid "encrypted"
 msgstr "Codificado"
 
-msgid "auto"
-msgstr "Autom�tico"
-
 msgid "Edit channel"
 msgstr "Editar canal"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polariza��o"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Invers�o"
 
-msgid "off"
-msgstr "off"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "nenhum"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarquia"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioridade"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Propriedades do canal n�o s�o �nicas!"
 
@@ -354,9 +372,6 @@ msgstr "Fim"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioridade"
-
 msgid "Lifetime"
 msgstr "Dura��o"
 
@@ -891,6 +906,9 @@ msgstr "Substituir"
 msgid "Button$Insert"
 msgstr "Inserir"
 
+msgid "auto"
+msgstr "Autom�tico"
+
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 56225568d..9236f2da9 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -18,6 +18,21 @@ msgstr ""
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
+msgid "off"
+msgstr "inactiv"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "niciuna(ul)"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
@@ -228,9 +243,6 @@ msgstr "FTA (necriptat)"
 msgid "encrypted"
 msgstr "criptat"
 
-msgid "auto"
-msgstr "automat"
-
 msgid "Edit channel"
 msgstr "Modificare canal"
 
@@ -279,21 +291,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizare"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Rat� simboluri"
 
 msgid "Inversion"
 msgstr "Inversiune"
 
-msgid "off"
-msgstr "inactiv"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "niciuna(ul)"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,6 +321,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Ierarhie"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritate"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
 
@@ -357,9 +375,6 @@ msgstr "Sf
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritate"
-
 msgid "Lifetime"
 msgstr "Timp de p�strare"
 
@@ -894,6 +909,9 @@ msgstr "Suprascrie"
 msgid "Button$Insert"
 msgstr "Insereaz�"
 
+msgid "auto"
+msgstr "automat"
+
 msgid "Plugin"
 msgstr "Plugin (modul adi�ional)"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0f868a43e..0938736ab 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-15 16:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "����"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "������"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -226,9 +241,6 @@ msgstr "FTA (
 msgid "encrypted"
 msgstr "������������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Edit channel"
 msgstr "�������������� ������"
 
@@ -277,21 +289,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "�����������"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "����. ��������"
 
 msgid "Inversion"
 msgstr "��������"
 
-msgid "off"
-msgstr "����"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "������"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -310,6 +319,15 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "���������"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
 
@@ -355,9 +373,6 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
-msgid "Priority"
-msgstr "���������"
-
 msgid "Lifetime"
 msgstr "���� ��������"
 
@@ -892,6 +907,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
+msgid "auto"
+msgstr "����"
+
 msgid "Plugin"
 msgstr "������"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index ce7361b14..5e4ef3b18 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -16,6 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "izklop"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "nobeden"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
 
@@ -226,9 +241,6 @@ msgstr "nekodiran"
 msgid "encrypted"
 msgstr "kodiran"
 
-msgid "auto"
-msgstr "avtomatsko"
-
 msgid "Edit channel"
 msgstr "Uredi kanal"
 
@@ -277,21 +289,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarizacija"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
-msgid "off"
-msgstr "izklop"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "nobeden"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -310,6 +319,15 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hierarhija"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteta"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastavitve kanala niso edinstvene!"
 
@@ -355,9 +373,6 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioriteta"
-
 msgid "Lifetime"
 msgstr "Veljavnost"
 
@@ -892,6 +907,9 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Vstavi"
 
+msgid "auto"
+msgstr "avtomatsko"
+
 msgid "Plugin"
 msgstr "Vstavek"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 8a204ddbd..92613d055 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "av"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "ingen"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
@@ -228,9 +243,6 @@ msgstr "Okodad"
 msgid "encrypted"
 msgstr "krypterad"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Edit channel"
 msgstr "�ndra kanal"
 
@@ -279,21 +291,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Polarisation"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
 
-msgid "off"
-msgstr "av"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "ingen"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -312,6 +321,15 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
 
@@ -357,9 +375,6 @@ msgstr "Slutar"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Lifetime"
 msgstr "Livstid"
 
@@ -894,6 +909,9 @@ msgstr "Skriv 
 msgid "Button$Insert"
 msgstr "Infoga"
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "Plugin"
 msgstr "Modul"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index f4e433ed5..9e7251a3b 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "kapal�"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "hi�"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
 
@@ -225,9 +240,6 @@ msgstr "
 msgid "encrypted"
 msgstr "�ifreli"
 
-msgid "auto"
-msgstr "otomatik"
-
 msgid "Edit channel"
 msgstr "Kanal ayarlar�n� de�i�tir"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "Kutupla�ma"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
 msgstr "�nversiyon"
 
-msgid "off"
-msgstr "kapal�"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "hi�"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "Koruma"
 msgid "Hierarchy"
 msgstr "Hiyerar�i"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "�ncelik"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanal ayarlar� belli de��l!"
 
@@ -354,9 +372,6 @@ msgstr "Biti
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "�ncelik"
-
 msgid "Lifetime"
 msgstr "�mr�"
 
@@ -891,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Ekle"
 
+msgid "auto"
+msgstr "otomatik"
+
 msgid "Plugin"
 msgstr "Eklenti"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 5d55d8c66..fb734de55 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-02-10 12:22+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-07 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "off"
+msgstr "����"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "������"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -225,9 +240,6 @@ msgstr "FTA (
 msgid "encrypted"
 msgstr "����������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Edit channel"
 msgstr "������������ ������"
 
@@ -276,21 +288,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "�����������"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "����. ���������"
 
 msgid "Inversion"
 msgstr "��������"
 
-msgid "off"
-msgstr "����"
-
 msgid "CoderateH"
 msgstr "CoderateH"
 
-msgid "none"
-msgstr "������"
-
 msgid "CoderateL"
 msgstr "CoderateL"
 
@@ -309,6 +318,15 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "���������"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� �����!"
 
@@ -354,9 +372,6 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
-msgid "Priority"
-msgstr "���������"
-
 msgid "Lifetime"
 msgstr "����� ����������"
 
@@ -873,14 +888,12 @@ msgstr "
 msgid "Editing process already active!"
 msgstr "������ ������������ ��� ���������!"
 
-#, fuzzy
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz�����������������������������������0123456789-.#~,/_@"
 
 msgid "yes"
 msgstr "���"
 
-#, fuzzy
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabc����2\tdef������3\tghi������4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
 
@@ -893,6 +906,9 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
+msgid "auto"
+msgstr "����"
+
 msgid "Plugin"
 msgstr "������"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eaa9079ad..5ff19cf71 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-03-22 13:28+0100\n"
+"POT-Creation-Date: 2008-04-12 14:19+0200\n"
 "PO-Revision-Date: 2008-03-21 08:44+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -18,6 +18,21 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+msgid "off"
+msgstr "关"
+
+msgid "on"
+msgstr ""
+
+msgid "none"
+msgstr "无"
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
 msgid "*** Invalid Channel ***"
 msgstr "***无效频道 ***"
 
@@ -228,9 +243,6 @@ msgstr "剩余空间"
 msgid "encrypted"
 msgstr "加密"
 
-msgid "auto"
-msgstr "自动"
-
 msgid "Edit channel"
 msgstr "编辑频道"
 
@@ -279,21 +291,18 @@ msgstr "Sid"
 msgid "Polarization"
 msgstr "极化"
 
+msgid "System"
+msgstr ""
+
 msgid "Srate"
 msgstr "比率"
 
 msgid "Inversion"
 msgstr "倒置"
 
-msgid "off"
-msgstr "关"
-
 msgid "CoderateH"
 msgstr "高符号频率"
 
-msgid "none"
-msgstr "无"
-
 msgid "CoderateL"
 msgstr "论符号频率"
 
@@ -312,6 +321,15 @@ msgstr "防护"
 msgid "Hierarchy"
 msgstr "层次"
 
+msgid "Alpha"
+msgstr ""
+
+msgid "Priority"
+msgstr "优先"
+
+msgid "Rolloff"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "频道设置不是唯一的！"
 
@@ -357,9 +375,6 @@ msgstr "停止"
 msgid "VPS"
 msgstr "VPS"
 
-msgid "Priority"
-msgstr "优先"
-
 msgid "Lifetime"
 msgstr "终生"
 
@@ -894,6 +909,9 @@ msgstr "覆盖"
 msgid "Button$Insert"
 msgstr "插入"
 
+msgid "auto"
+msgstr "自动"
+
 msgid "Plugin"
 msgstr "插件"
 
diff --git a/rcu.c b/rcu.c
index 34b438775..2e2031417 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.16 2007/08/24 13:15:48 kls Exp $
+ * $Id: rcu.c 2.0 2007/08/24 13:15:48 kls Exp $
  */
 
 #include "rcu.h"
diff --git a/rcu.h b/rcu.h
index 8824f6602..a0ca2339a 100644
--- a/rcu.h
+++ b/rcu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.h 1.7 2007/08/24 13:15:48 kls Exp $
+ * $Id: rcu.h 2.0 2007/08/24 13:15:48 kls Exp $
  */
 
 #ifndef __RCU_H
diff --git a/receiver.c b/receiver.c
index 82c414dcb..f4c0a78e3 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.7 2007/08/12 11:52:59 kls Exp $
+ * $Id: receiver.c 2.0 2007/08/12 11:52:59 kls Exp $
  */
 
 #include "receiver.h"
diff --git a/receiver.h b/receiver.h
index e223274ad..35930d2da 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 1.5 2007/01/05 11:00:36 kls Exp $
+ * $Id: receiver.h 2.0 2007/01/05 11:00:36 kls Exp $
  */
 
 #ifndef __RECEIVER_H
diff --git a/recorder.c b/recorder.c
index 7bcd0cc72..93424da73 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 1.19 2007/02/24 16:36:24 kls Exp $
+ * $Id: recorder.c 2.0 2007/02/24 16:36:24 kls Exp $
  */
 
 #include "recorder.h"
diff --git a/recorder.h b/recorder.h
index 920d90954..d0ce9bd14 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 1.5 2007/01/05 10:44:05 kls Exp $
+ * $Id: recorder.h 2.0 2007/01/05 10:44:05 kls Exp $
  */
 
 #ifndef __RECORDER_H
diff --git a/recording.c b/recording.c
index 1535b46b8..9468f7999 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.162 2008/02/24 10:28:53 kls Exp $
+ * $Id: recording.c 2.0 2008/02/24 10:28:53 kls Exp $
  */
 
 #include "recording.h"
diff --git a/recording.h b/recording.h
index 4bdcd1b24..a201f5ac1 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 1.59 2007/10/14 10:11:34 kls Exp $
+ * $Id: recording.h 2.0 2007/10/14 10:11:34 kls Exp $
  */
 
 #ifndef __RECORDING_H
diff --git a/remote.c b/remote.c
index 733ae31ca..37a6bbd27 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 1.59 2008/02/23 14:14:46 kls Exp $
+ * $Id: remote.c 2.0 2008/02/23 14:14:46 kls Exp $
  */
 
 #include "remote.h"
diff --git a/remote.h b/remote.h
index 46ad9564a..4478f7fd7 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.41 2008/02/23 14:38:47 kls Exp $
+ * $Id: remote.h 2.0 2008/02/23 14:38:47 kls Exp $
  */
 
 #ifndef __REMOTE_H
diff --git a/remux.c b/remux.c
index 9b9aa24fe..6b422091d 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.64 2007/11/25 13:56:03 kls Exp $
+ * $Id: remux.c 2.0 2007/11/25 13:56:03 kls Exp $
  */
 
 #include "remux.h"
diff --git a/remux.h b/remux.h
index 1b7727ec7..d996957bc 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.17 2007/09/02 10:19:06 kls Exp $
+ * $Id: remux.h 2.0 2007/09/02 10:19:06 kls Exp $
  */
 
 #ifndef __REMUX_H
diff --git a/ringbuffer.c b/ringbuffer.c
index d74706ab4..e825b8309 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 1.25 2007/11/17 13:49:34 kls Exp $
+ * $Id: ringbuffer.c 2.0 2007/11/17 13:49:34 kls Exp $
  */
 
 #include "ringbuffer.h"
diff --git a/ringbuffer.h b/ringbuffer.h
index f6664cf8f..012731605 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 1.18 2007/11/17 13:49:34 kls Exp $
+ * $Id: ringbuffer.h 2.0 2007/11/17 13:49:34 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
diff --git a/runvdr b/runvdr
index 96c95bf2c..1c3cc7e7f 100755
--- a/runvdr
+++ b/runvdr
@@ -20,7 +20,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.19 2006/05/14 16:02:05 kls Exp $
+# $Id: runvdr 2.0 2006/05/14 16:02:05 kls Exp $
 
 VDRPRG="./vdr"
 VDRCMD="$VDRPRG -w 60 $*"
diff --git a/sdt.c b/sdt.c
index 1a360e23c..0b11bb7cc 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 1.19 2008/02/08 13:48:31 kls Exp $
+ * $Id: sdt.c 2.1 2008/04/12 13:33:55 kls Exp $
  */
 
 #include "sdt.h"
@@ -55,6 +55,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    case 0x02: // digital radio sound service
                    case 0x04: // NVOD reference service
                    case 0x05: // NVOD time-shifted service
+                   case 0x19: // digital HD television service
                         {
                         char NameBuf[Utf8BufSize(1024)];
                         char ShortNameBuf[Utf8BufSize(1024)];
diff --git a/sdt.h b/sdt.h
index a427119c3..2566672a2 100644
--- a/sdt.h
+++ b/sdt.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.h 1.2 2004/01/05 14:30:14 kls Exp $
+ * $Id: sdt.h 2.0 2004/01/05 14:30:14 kls Exp $
  */
 
 #ifndef __SDT_H
diff --git a/sections.c b/sections.c
index afb4f0bdf..6b9cbe24d 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 1.15 2007/10/14 12:52:07 kls Exp $
+ * $Id: sections.c 2.0 2007/10/14 12:52:07 kls Exp $
  */
 
 #include "sections.h"
diff --git a/sections.h b/sections.h
index f11f4794e..3b00c8b5f 100644
--- a/sections.h
+++ b/sections.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.h 1.5 2005/08/13 11:23:55 kls Exp $
+ * $Id: sections.h 2.0 2005/08/13 11:23:55 kls Exp $
  */
 
 #ifndef __SECTIONS_H
diff --git a/shutdown.c b/shutdown.c
index d71a3a134..09d4a1a1f 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 1.5 2008/02/24 10:29:00 kls Exp $
+ * $Id: shutdown.c 2.0 2008/02/24 10:29:00 kls Exp $
  */
 
 #include "shutdown.h"
diff --git a/shutdown.h b/shutdown.h
index 4dff8eabf..af0c0464e 100644
--- a/shutdown.h
+++ b/shutdown.h
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.h 1.1 2007/02/24 17:23:59 kls Exp $
+ * $Id: shutdown.h 2.0 2007/02/24 17:23:59 kls Exp $
  */
 
 #ifndef __SHUTDOWN_H
diff --git a/skinclassic.c b/skinclassic.c
index 6c36278ba..a73e97cc1 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 1.27 2008/02/23 10:31:58 kls Exp $
+ * $Id: skinclassic.c 2.0 2008/02/23 10:31:58 kls Exp $
  */
 
 #include "skinclassic.h"
diff --git a/skinclassic.h b/skinclassic.h
index 2ac69b1b4..60878e4ba 100644
--- a/skinclassic.h
+++ b/skinclassic.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.h 1.2 2005/01/02 14:38:56 kls Exp $
+ * $Id: skinclassic.h 2.0 2005/01/02 14:38:56 kls Exp $
  */
 
 #ifndef __SKINCLASSIC_H
diff --git a/skins.c b/skins.c
index 46a858cfe..8c67a80c7 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.14 2008/02/17 11:31:09 kls Exp $
+ * $Id: skins.c 2.0 2008/02/17 11:31:09 kls Exp $
  */
 
 #include "skins.h"
diff --git a/skins.h b/skins.h
index 9e83c0cad..6f41da50e 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 1.16 2008/02/17 11:30:56 kls Exp $
+ * $Id: skins.h 2.0 2008/02/17 11:30:56 kls Exp $
  */
 
 #ifndef __SKINS_H
diff --git a/skinsttng.c b/skinsttng.c
index f6298411c..5513c914d 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 1.28 2008/02/23 10:23:44 kls Exp $
+ * $Id: skinsttng.c 2.0 2008/02/23 10:23:44 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
diff --git a/skinsttng.h b/skinsttng.h
index 11a964221..cef3b910f 100644
--- a/skinsttng.h
+++ b/skinsttng.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.h 1.2 2005/01/02 14:39:29 kls Exp $
+ * $Id: skinsttng.h 2.0 2005/01/02 14:39:29 kls Exp $
  */
 
 #ifndef __SKINSTTNG_H
diff --git a/sources.c b/sources.c
index 65002a5ab..d3ec44e56 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 1.4 2008/02/10 14:07:26 kls Exp $
+ * $Id: sources.c 2.0 2008/02/10 14:07:26 kls Exp $
  */
 
 #include "sources.h"
diff --git a/sources.h b/sources.h
index ae941f84f..bf8a07d86 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 1.4 2005/05/14 09:30:41 kls Exp $
+ * $Id: sources.h 2.0 2005/05/14 09:30:41 kls Exp $
  */
 
 #ifndef __SOURCES_H
diff --git a/spu.c b/spu.c
index feb2d61c8..9e38eecde 100644
--- a/spu.c
+++ b/spu.c
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.c 1.4 2008/02/10 14:06:48 kls Exp $
+ * $Id: spu.c 2.0 2008/02/10 14:06:48 kls Exp $
  */
 
 #include "spu.h"
diff --git a/spu.h b/spu.h
index 39c721fbc..3a8ab3eab 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 1.5 2006/04/17 12:48:55 kls Exp $
+ * $Id: spu.h 2.0 2006/04/17 12:48:55 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
diff --git a/status.c b/status.c
index 1d7a8d42b..c542a3c56 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 1.10 2008/02/16 14:46:31 kls Exp $
+ * $Id: status.c 2.0 2008/02/16 14:46:31 kls Exp $
  */
 
 #include "status.h"
diff --git a/status.h b/status.h
index b6c4d8b4d..d05ec18a0 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.12 2008/02/16 15:00:33 kls Exp $
+ * $Id: status.h 2.0 2008/02/16 15:00:33 kls Exp $
  */
 
 #ifndef __STATUS_H
diff --git a/summary2info.pl b/summary2info.pl
index 15300e5d9..697602498 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 1.6 2006/04/17 12:19:24 kls Exp $
+# $Id: summary2info.pl 2.0 2006/04/17 12:19:24 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
diff --git a/svdrp.c b/svdrp.c
index 4317535a1..b69485e1b 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.109 2008/02/17 13:36:01 kls Exp $
+ * $Id: svdrp.c 2.0 2008/02/17 13:36:01 kls Exp $
  */
 
 #include "svdrp.h"
diff --git a/svdrp.h b/svdrp.h
index deee42ca0..9f726ed94 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 1.29 2007/04/30 12:28:28 kls Exp $
+ * $Id: svdrp.h 2.0 2007/04/30 12:28:28 kls Exp $
  */
 
 #ifndef __SVDRP_H
diff --git a/themes.c b/themes.c
index e6ee87e31..451fb8b2b 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 1.8 2008/02/10 16:25:00 kls Exp $
+ * $Id: themes.c 2.0 2008/02/10 16:25:00 kls Exp $
  */
 
 #include "themes.h"
diff --git a/themes.h b/themes.h
index 562429367..3563bb089 100644
--- a/themes.h
+++ b/themes.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.h 1.2 2007/08/05 14:10:22 kls Exp $
+ * $Id: themes.h 2.0 2007/08/05 14:10:22 kls Exp $
  */
 
 #ifndef __THEMES_H
diff --git a/thread.c b/thread.c
index 2d84918dd..0c3b4f5be 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.64 2008/02/15 14:17:42 kls Exp $
+ * $Id: thread.c 2.1 2008/04/13 11:53:56 kls Exp $
  */
 
 #include "thread.h"
@@ -17,6 +17,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <sys/prctl.h>
 #include <unistd.h>
 #include "tools.h"
 
@@ -239,8 +240,13 @@ void cThread::SetDescription(const char *Description, ...)
 void *cThread::StartThread(cThread *Thread)
 {
   Thread->childThreadId = ThreadId();
-  if (Thread->description)
+  if (Thread->description) {
      dsyslog("%s thread started (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
+#ifdef PR_SET_NAME
+     if (prctl(PR_SET_NAME, Thread->description, 0, 0, 0) < 0)
+        esyslog("%s thread naming failed (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
+#endif
+     }
   Thread->Action();
   if (Thread->description)
      dsyslog("%s thread ended (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
diff --git a/thread.h b/thread.h
index 6eaa79a7b..25a0b8b5f 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.39 2007/02/24 16:13:28 kls Exp $
+ * $Id: thread.h 2.0 2007/02/24 16:13:28 kls Exp $
  */
 
 #ifndef __THREAD_H
diff --git a/timers.c b/timers.c
index c76511e8c..b963dee0d 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.73 2008/02/16 14:47:40 kls Exp $
+ * $Id: timers.c 2.1 2008/04/13 12:41:41 kls Exp $
  */
 
 #include "timers.h"
@@ -92,6 +92,7 @@ cTimer::cTimer(const cTimer &Timer)
   channel = NULL;
   aux = NULL;
   event = NULL;
+  flags = tfNone;
   *this = Timer;
 }
 
diff --git a/timers.h b/timers.h
index a18f9f879..8f67add62 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.31 2008/02/16 14:33:23 kls Exp $
+ * $Id: timers.h 2.0 2008/02/16 14:33:23 kls Exp $
  */
 
 #ifndef __TIMERS_H
diff --git a/tools.c b/tools.c
index 70ccb0e3c..bf0ac0f05 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.145 2008/03/05 17:23:47 kls Exp $
+ * $Id: tools.c 2.0 2008/03/05 17:23:47 kls Exp $
  */
 
 #include "tools.h"
diff --git a/tools.h b/tools.h
index 6a1077469..dd9884098 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.113 2008/02/17 13:41:27 kls Exp $
+ * $Id: tools.h 2.0 2008/02/17 13:41:27 kls Exp $
  */
 
 #ifndef __TOOLS_H
diff --git a/transfer.c b/transfer.c
index 79efab5eb..04d88a155 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.34 2007/01/05 10:45:28 kls Exp $
+ * $Id: transfer.c 2.0 2007/01/05 10:45:28 kls Exp $
  */
 
 #include "transfer.h"
diff --git a/transfer.h b/transfer.h
index c891808bb..dd6d40404 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 1.12 2007/01/05 10:45:45 kls Exp $
+ * $Id: transfer.h 2.0 2007/01/05 10:45:45 kls Exp $
  */
 
 #ifndef __TRANSFER_H
diff --git a/vdr.1 b/vdr.1
index 8510610c8..f5ffb9de9 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.33 2008/03/09 16:07:06 kls Exp $
+.\" $Id: vdr.1 2.0 2008/03/09 16:07:06 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
diff --git a/vdr.5 b/vdr.5
index 56dd48d3b..6f35e86a2 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.68 2008/03/09 15:46:57 kls Exp $
+.\" $Id: vdr.5 2.1 2008/04/12 10:46:32 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -83,19 +83,23 @@ meaning (and allowed values) are
 .TS
 tab (@);
 l l.
-\fBB\fR@Bandwidth (6, 7, 8)
-\fBC\fR@Code rate high priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
-\fBD\fR@Code rate low priority (0, 12, 23, 34, 45, 56, 67, 78, 89)
+\fBA\fR@Alpha (0, 1, 2, 4)
+\fBB\fR@Bandwidth (5, 6, 7, 8)
+\fBC\fR@Code rate high priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
+\fBD\fR@coDe rate low priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
-\fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
+\fBM\fR@Modulation (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 32, 64, 128, 256, 512, 998, 1024)
+\fBO\fR@rollOff (0, 20, 25, 35)
+\fBP\fR@Priority (0, 1)
 \fBR\fR@Right circular polarization
-\fBT\fR@Transmission mode (2, 8)
+\fBT\fR@Transmission mode (2, 4, 8)
 \fBV\fR@Vertical polarization
-\fBY\fR@Hierarchy (0, 1, 2, 4)
+\fBY\fR@hierarchY (0, 1)
 .TE
+
 The polarization parameters have no integer numbers following them. This is for
 compatibility with files from older versions and also to keep the DVB-S entries
 as simple as possible.
diff --git a/vdr.c b/vdr.c
index 5ea62d692..aafb0e654 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $
+ * $Id: vdr.c 2.0 2008/03/14 13:22:39 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/videodir.c b/videodir.c
index e61e3cbc7..7331a85c1 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 1.15 2008/02/16 13:00:03 kls Exp $
+ * $Id: videodir.c 2.0 2008/02/16 13:00:03 kls Exp $
  */
 
 #include "videodir.h"
diff --git a/videodir.h b/videodir.h
index 253e07b03..5e9aef5ab 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 1.7 2008/02/16 12:53:11 kls Exp $
+ * $Id: videodir.h 2.0 2008/02/16 12:53:11 kls Exp $
  */
 
 #ifndef __VIDEODIR_H

From c848ab793a302dc067663ec4a06395745e443c9d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sat, 6 Sep 2008 18:00:00 +0200
Subject: [PATCH 187/307] =?UTF-8?q?Version=201.7.1=20-=20Adapted=20the=20t?=
 =?UTF-8?q?uning=20code=20to=20the=20new=20DVBFE=5FSET=5FDELSYS=20API=20(t?=
 =?UTF-8?q?hanks=20to=20Reinhard=20Nissl).=20=20=20VDR=20now=20uses=20the?=
 =?UTF-8?q?=20driver=20from=20http://jusst.de/hg/multiproto=5Fplus.=20-=20?=
 =?UTF-8?q?Updated=20the=20Italian=20OSD=20texts=20(thanks=20to=20Diego=20?=
 =?UTF-8?q?Pierotto).=20-=20Removed=20obsolete=20$(NCURSESLIB)=20from=20th?=
 =?UTF-8?q?e=20Makefile.=20-=20Implemented=20handling=20the=20standard=20c?=
 =?UTF-8?q?omponent=20descriptor=20for=20AC3=20(stream=3D4),=20as=20it=20?=
 =?UTF-8?q?=20=20will=20soon=20be=20used=20by=20the=20German=20ARD=20chann?=
 =?UTF-8?q?els=20(thanks=20to=20Michael=20Pennewi=C3=9F=20for=20=20=20adva?=
 =?UTF-8?q?nce=20information=20about=20this=20change).=20The=20previously?=
 =?UTF-8?q?=20used=20"Premiere=20pseudo=20=20=20standard"=20(stream=3D2,?=
 =?UTF-8?q?=20type=3D5)=20still=20works,=20but=20has=20apparently=20been?=
 =?UTF-8?q?=20wrongfully=20used=20=20=20by=20broadcasters=20from=20the=20b?=
 =?UTF-8?q?eginning.=20-=20Added=20missing=20description=20of=20the=20'S'?=
 =?UTF-8?q?=20channel=20parameter=20to=20vdr.5=20(reported=20by=20=20=20Re?=
 =?UTF-8?q?inhard=20Nissl).=20-=20The=20SVDRP=20signon=20message=20now=20i?=
 =?UTF-8?q?ndicates=20the=20character=20encoding=20in=20use,=20as=20in=20?=
 =?UTF-8?q?=20=20"220=20video=20SVDRP=20VideoDiskRecorder=201.7.1;=20Fri?=
 =?UTF-8?q?=20May=20=202=2016:17:10=202008;=20ISO-8859-1".=20=20=20This=20?=
 =?UTF-8?q?may=20be=20useful=20for=20instance=20for=20external=20tools=20t?=
 =?UTF-8?q?hat=20provide=20EPG=20data,=20so=20that=20=20=20they=20can=20co?=
 =?UTF-8?q?rrectly=20encode=20the=20strings.=20-=20No=20longer=20calling?=
 =?UTF-8?q?=20FcFini()=20to=20avoid=20problems=20with=20older=20(broken)?=
 =?UTF-8?q?=20versions=20of=20=20=20fontconfig=20(suggested=20by=20Edgar?=
 =?UTF-8?q?=20Toernig).=20-=20Removed=20the=20compile=20time=20option=20VF?=
 =?UTF-8?q?AT=20to=20allow=20users=20of=20precompiled=20binary=20=20=20dis?=
 =?UTF-8?q?tributions=20to=20have=20full=20control=20over=20whether=20or?=
 =?UTF-8?q?=20not=20to=20use=20the=20--vfat=20option=20=20=20at=20runtime?=
 =?UTF-8?q?=20(suggested=20by=20Michael=20Nork).=20-=20First=20step=20towa?=
 =?UTF-8?q?rds=20switching=20to=20TS=20(Transport=20Stream)=20as=20recordi?=
 =?UTF-8?q?ng=20format:=20=20=20+=20The=20new=20function=20cDevice::PlayTs?=
 =?UTF-8?q?()=20is=20used=20to=20play=20TS=20packets.=20=20=20+=20The=20ne?=
 =?UTF-8?q?w=20functions=20cDevice::PlayTsVideo()=20and=20cDevice::PlayTsA?=
 =?UTF-8?q?udio()=20=20=20=20=20are=20used=20to=20play=20video=20and=20aud?=
 =?UTF-8?q?io=20TS=20packets,=20respectively.=20=20=20+=20The=20new=20func?=
 =?UTF-8?q?tion=20cAudio::PlayTs()=20is=20used=20to=20play=20audio=20TS=20?=
 =?UTF-8?q?packets.=20=20=20+=20The=20new=20class=20cPatPmtGenerator=20is?=
 =?UTF-8?q?=20used=20to=20generate=20a=20PAT/PMT=20pair=20that=20precedes?=
 =?UTF-8?q?=20=20=20=20=20the=20TS=20data=20in=20Transfer=20Mode.=20=20=20?=
 =?UTF-8?q?+=20The=20new=20class=20cPatPmtParser=20is=20used=20by=20cDevic?=
 =?UTF-8?q?e=20to=20parse=20the=20PAT/PMT=20data=20in=20a=20=20=20=20=20TS?=
 =?UTF-8?q?=20in=20order=20to=20find=20out=20which=20streams=20it=20contai?=
 =?UTF-8?q?ns.=20=20=20+=20The=20new=20class=20cTsToPes=20is=20used=20to?=
 =?UTF-8?q?=20convert=20TS=20packets=20to=20a=20PES=20packet.=20=20=20+=20?=
 =?UTF-8?q?cTransfer=20no=20longer=20uses=20cRemux,=20and=20doesn't=20run?=
 =?UTF-8?q?=20a=20separate=20thread=20any=20more.=20=20=20=20=20It=20just?=
 =?UTF-8?q?=20generates=20a=20PAT/PMT=20and=20sends=20all=20received=20TS?=
 =?UTF-8?q?=20packets=20to=20the=20primary=20=20=20=20=20device's=20PlayTs?=
 =?UTF-8?q?().=20=20=20+=20Live=20subtitle=20display=20no=20longer=20uses?=
 =?UTF-8?q?=20a=20ring=20buffer=20and=20separate=20thread.=20=20=20+=20cPe?=
 =?UTF-8?q?sAssembler=20has=20been=20removed.=20Old=20VDR=20recordings=20o?=
 =?UTF-8?q?nly=20contain=20complete=20PES=20=20=20=20=20packets.=20=20=20+?=
 =?UTF-8?q?=20Since=20a=20TS=20needs=20to=20have=20a=20PAT/PMT,=20which=20?=
 =?UTF-8?q?requires=20the=20video=20stream=20type=20to=20=20=20=20=20be=20?=
 =?UTF-8?q?explicitly=20given,=20the=20format=20of=20the=20VPID=20field=20?=
 =?UTF-8?q?in=20the=20channels.conf=20file=20=20=20=20=20and=20the=20SVDRP?=
 =?UTF-8?q?=20commands=20NEWC/MODC/LSTC=20has=20been=20extended.=20The=20v?=
 =?UTF-8?q?ideo=20stream=20type=20=20=20=20=20now=20follows=20the=20VPID?=
 =?UTF-8?q?=20and=20optional=20PPID,=20separated=20by=20an=20'=3D'=20sign.?=
 =?UTF-8?q?=20-=20Updated=20the=20sources.conf=20file=20(thanks=20to=20Ole?=
 =?UTF-8?q?g=20Roitburd).=20-=20Fixed=20a=20possible=20integer=20overflow?=
 =?UTF-8?q?=20in=20GetAbsTime()=20(thanks=20to=20Alexander=20Rieger).=20-?=
 =?UTF-8?q?=20Fixed=20a=20problem=20with=20calling=20isyslog()=20from=20wi?=
 =?UTF-8?q?thin=20the=20SignalHandler()=20(thanks=20=20=20to=20Udo=20Richt?=
 =?UTF-8?q?er).=20-=20Replaced=20the=20Finnish=20language=20code=20"smi"?=
 =?UTF-8?q?=20with=20"suo"=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Fixed?=
 =?UTF-8?q?=20wrong=20value=20for=20TableIdBAT=20in=20libsi/si.h=20(thanks?=
 =?UTF-8?q?=20to=20Winfried=20K=C3=B6hler).=20-=20Errors=20in=20config=20f?=
 =?UTF-8?q?iles=20no=20longer=20keep=20VDR=20from=20starting.=20-=20Remove?=
 =?UTF-8?q?d=20unneeded=20include=20files=20<linux/dvb/dmx.h>=20und=20<tim?=
 =?UTF-8?q?e.h>=20from=20remux.h=20=20=20(reported=20by=20Tobias=20Grimm).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                  |  20 ++
 HISTORY                       |  70 +++++
 INSTALL                       |  11 +-
 Makefile                      |   9 +-
 PLUGINS/src/hello/HISTORY     |   4 +
 PLUGINS/src/hello/hello.c     |   4 +-
 PLUGINS/src/hello/po/tr_TR.po |  14 +-
 audio.c                       |  31 ++-
 audio.h                       |   9 +-
 channels.c                    |  28 +-
 channels.h                    |   6 +-
 config.h                      |   7 +-
 device.c                      | 286 +++++++-------------
 device.h                      |  55 +++-
 dvbdevice.c                   |  27 +-
 dvbdevice.h                   |   4 +-
 dvbsubtitle.c                 |  62 +++--
 dvbsubtitle.h                 |   5 +-
 eit.c                         |   4 +-
 epg.c                         |   8 +-
 font.c                        |   6 +-
 i18n.c                        |   4 +-
 libsi/si.h                    |   4 +-
 libsi/util.h                  |   4 +-
 menu.c                        |   4 +-
 pat.c                         |  11 +-
 player.h                      |   6 +-
 po/it_IT.po                   |  32 +--
 recording.c                   |  14 +-
 remux.c                       | 477 +++++++++++++++++++++++++++++++++-
 remux.h                       | 193 +++++++++++++-
 sources.conf                  | 100 +++----
 svdrp.c                       |   4 +-
 thread.c                      |  13 +-
 tools.h                       |   4 +-
 transfer.c                    |  95 ++-----
 transfer.h                    |  10 +-
 vdr.5                         |  11 +-
 vdr.c                         |  30 +--
 39 files changed, 1199 insertions(+), 487 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d02b08d01..acab6b220 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1054,6 +1054,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing displaying the free disk space when entering the recordings menu where
  the last replayed recording was in a subdirectory, and pressing Back
  for setting the thread name, so that it can be seen in 'top -H'
+ for replacing the Finnish language code "smi" with "suo"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1180,6 +1181,8 @@ Reinhard Nissl <rnissl@gmx.de>
  early stage of channel switching
  for fixing displaying transponder data when it is modified
  for fixing handling the counter in detection of pre 1.3.19 PS data
+ for adapting the tuning code to the new DVBFE_SET_DELSYS API
+ for reporting the missing description of the 'S' channel parameter in vdr.5
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1328,6 +1331,8 @@ Marc Hoppe <MarcHoppe@gmx.de>
 
 Michael Pennewi� <M.Pennewiss@ARD-Digital.de>
  for pointing out that an empty EPG event means there is currently no running event
+ for advance information about the use of the standard component descriptor for AC3
+ (stream=4) on the German ARD channels
 
 Marcus M�nnig <minibbjd@gmx.de>
  for adding some 3-letter language codes
@@ -1581,6 +1586,7 @@ Udo Richter <udo_richter@gmx.de>
  for making housekeeping wait for a while after a replay has ended
  for fixing error handling in cCuttingThread::Action()
  for suppressing the automatic shutdown if the remote control is currently disabled
+ for fixing a problem with calling isyslog() from within the SignalHandler()
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1898,6 +1904,7 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for fixing cTimer::operator=() in case a cTimer variable is assigned to itself
  for making the list of tracks given in cStatus::SetAudioTrack() NULL terminated
  for fixing handling kLeft in the calls to cStatus::MsgOsdTextItem()
+ for fixing a possible integer overflow in GetAbsTime()
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
@@ -2119,6 +2126,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for making the non-breaking space symbol be rendered as a blank
  for fixing a signed character used as index in cBase64Encoder::NextLine()
  for fixing formatting the name section in the VDR man pages
+ for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2355,3 +2363,15 @@ Adrian Caval <anrxc@sysphere.org>
 
 Nan Feng <nfgx@21cn.com>
  for translating OSD texts to the Chinese language
+
+Edgar Toernig <froese@gmx.de>
+ for suggesting to not call FcFini() to avoid problems with older (broken) versions
+ of fontconfig
+
+Michael Nork <mnork0@gmx.net>
+ for suggesting to remove the compile time option VFAT to allow users of precompiled
+ binary distributions to have full control over whether or not to use the --vfat
+ option at runtime
+
+Winfried K�hler <w_koehl@gmx.de>
+ for fixing wrong value for TableIdBAT in libsi/si.h
diff --git a/HISTORY b/HISTORY
index e5424f8a5..0994e1b09 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5761,3 +5761,73 @@ Video Disk Recorder Revision History
   Andreas Mair).
 - Increased the time between checking the CAM status to 500ms to avoid problems
   with some CAMs (reported by Arthur Konovalov).
+
+2008-09-06: Version 1.7.1
+
+- Adapted the tuning code to the new DVBFE_SET_DELSYS API (thanks to Reinhard Nissl).
+  VDR now uses the driver from http://jusst.de/hg/multiproto_plus.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Removed obsolete $(NCURSESLIB) from the Makefile.
+- Implemented handling the standard component descriptor for AC3 (stream=4), as it
+  will soon be used by the German ARD channels (thanks to Michael Pennewi� for
+  advance information about this change). The previously used "Premiere pseudo
+  standard" (stream=2, type=5) still works, but has apparently been wrongfully used
+  by broadcasters from the beginning.
+- Added missing description of the 'S' channel parameter to vdr.5 (reported by
+  Reinhard Nissl).
+- The SVDRP signon message now indicates the character encoding in use, as in
+  "220 video SVDRP VideoDiskRecorder 1.7.1; Fri May  2 16:17:10 2008; ISO-8859-1".
+  This may be useful for instance for external tools that provide EPG data, so that
+  they can correctly encode the strings.
+- No longer calling FcFini() to avoid problems with older (broken) versions of
+  fontconfig (suggested by Edgar Toernig).
+- Removed the compile time option VFAT to allow users of precompiled binary
+  distributions to have full control over whether or not to use the --vfat option
+  at runtime (suggested by Michael Nork).
+- First step towards switching to TS (Transport Stream) as recording format:
+  + The new function cDevice::PlayTs() is used to play TS packets.
+  + The new functions cDevice::PlayTsVideo() and cDevice::PlayTsAudio()
+    are used to play video and audio TS packets, respectively.
+  + The new function cAudio::PlayTs() is used to play audio TS packets.
+  + The new class cPatPmtGenerator is used to generate a PAT/PMT pair that precedes
+    the TS data in Transfer Mode.
+  + The new class cPatPmtParser is used by cDevice to parse the PAT/PMT data in a
+    TS in order to find out which streams it contains.
+  + The new class cTsToPes is used to convert TS packets to a PES packet.
+  + cTransfer no longer uses cRemux, and doesn't run a separate thread any more.
+    It just generates a PAT/PMT and sends all received TS packets to the primary
+    device's PlayTs().
+  + Live subtitle display no longer uses a ring buffer and separate thread.
+  + cPesAssembler has been removed. Old VDR recordings only contain complete PES
+    packets.
+  + Since a TS needs to have a PAT/PMT, which requires the video stream type to
+    be explicitly given, the format of the VPID field in the channels.conf file
+    and the SVDRP commands NEWC/MODC/LSTC has been extended. The video stream type
+    now follows the VPID and optional PPID, separated by an '=' sign.
+- Updated the sources.conf file (thanks to Oleg Roitburd).
+- Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger).
+- Fixed a problem with calling isyslog() from within the SignalHandler() (thanks
+  to Udo Richter).
+- Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
+- Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried K�hler).
+- Errors in config files no longer keep VDR from starting.
+- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+  (reported by Tobias Grimm).
+
+2008-09-06: Version 1.6.0-2
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- The SVDRP signon message now indicates the character encoding in use, as in
+  "220 video SVDRP VideoDiskRecorder 1.7.1; Fri May  2 16:17:10 2008; ISO-8859-1".
+  This may be useful for instance for external tools that provide EPG data, so that
+  they can correctly encode the strings.
+- No longer calling FcFini() to avoid problems with older (broken) versions of
+  fontconfig (suggested by Edgar Toernig).
+- Updated the sources.conf file (thanks to Oleg Roitburd).
+- Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger).
+- Fixed a problem with calling isyslog() from within the SignalHandler() (thanks
+  to Udo Richter).
+- Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
+- Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried K�hler).
+- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+  (reported by Tobias Grimm).
diff --git a/INSTALL b/INSTALL
index f61cb3bbb..7294fabe0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 1.6
+Version 1.7
 -----------
 
 Compiling and running the program:
@@ -57,13 +57,8 @@ These options accept an optional path to the remote control device,
 the defaults of which can be set via the RCU_DEVICE and LIRC_DEVICE macros,
 respectively.
 
-If your video directory will be on a VFAT partition, add the compile
-time switch
-
-  VFAT=1
-
-to the 'make' command. Alternatively, you can call VDR with the command
-line option '--vfat'.
+If your video directory will be on a VFAT partition, you can call VDR with
+the command line option '--vfat'.
 
 When running, the 'vdr' program writes status information into the
 system log file, which is usually /var/log/messages (or /var/log/user.log,
diff --git a/Makefile b/Makefile
index 265110261..c6efa3733 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.0 2008/02/29 21:43:03 kls Exp $
+# $Id: Makefile 2.2 2008/05/03 10:13:43 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -70,11 +70,6 @@ DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 
-ifdef VFAT
-# for people who want their video directory on a VFAT partition
-DEFINES += -DVFAT
-endif
-
 all: vdr i18n
 
 # Implicit rules:
@@ -94,7 +89,7 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(SILIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
 
 # The libsi library:
 
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index b4d09aba1..14e78f6e6 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -62,3 +62,7 @@ VDR Plugin 'hello' Revision History
 2008-03-18: Version 0.2.2
 
 - Updated the Croatian language texts (thanks to Adrian Caval).
+
+2008-009-06 Version 0.2.3
+
+- Updated the Turkish language texts (thanks to Oktay Yolge�en).
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index f3a6588f7..86adee67c 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.0 2008/03/18 17:13:25 kls Exp $
+ * $Id: hello.c 2.1 2008/09/06 15:07:12 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.2";
+static const char *VERSION        = "0.2.3";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index 74585b46c..4202881d5 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
-"PO-Revision-Date: 2007-08-11 12:34+0200\n"
+"PO-Revision-Date: 2008-05-12 22:34:4800\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr ""
+msgstr "Dost�a selam"
 
 msgid "Hello"
-msgstr ""
+msgstr "Merhaba"
 
 msgid "Greeting time (s)"
-msgstr ""
+msgstr "Selam vakiti (s)"
 
 msgid "Use alternate greeting"
-msgstr ""
+msgstr "Alternatif selam kullan"
 
 msgid "Howdy folks!"
-msgstr ""
+msgstr "Selam dostlar!"
 
 msgid "Hello world!"
-msgstr ""
+msgstr "Merhaba d�nya!"
diff --git a/audio.c b/audio.c
index dbf18f2b5..66430d54d 100644
--- a/audio.c
+++ b/audio.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 2.0 2006/05/28 15:03:24 kls Exp $
+ * $Id: audio.c 2.1 2008/07/06 11:42:58 kls Exp $
  */
 
 #include "audio.h"
@@ -32,6 +32,12 @@ void cAudios::PlayAudio(const uchar *Data, int Length, uchar Id)
       audio->Play(Data, Length, Id);
 }
 
+void cAudios::PlayTsAudio(const uchar *Data, int Length)
+{
+  for (cAudio *audio = First(); audio; audio = Next(audio))
+      audio->PlayTs(Data, Length);
+}
+
 void cAudios::MuteAudio(bool On)
 {
   for (cAudio *audio = First(); audio; audio = Next(audio))
@@ -86,6 +92,29 @@ void cExternalAudio::Play(const uchar *Data, int Length, uchar Id)
      }
 }
 
+void cExternalAudio::PlayTs(const uchar *Data, int Length)
+{
+  if (command && !mute) {
+     if (pipe || pipe.Open(command, "w")) {
+        int written = 0;
+        while (Length > 0) {
+              int w = fwrite(Data + written, 1, Length, pipe);
+              if (w < 0) {
+                 LOG_ERROR;
+                 break;
+                 }
+              Length -= w;
+              written += w;
+              }
+        }
+     else {
+        esyslog("ERROR: can't open pipe to audio command '%s'", command);
+        free(command);
+        command = NULL;
+        }
+     }
+}
+
 void cExternalAudio::Mute(bool On)
 {
   mute = On;
diff --git a/audio.h b/audio.h
index 5f84aaa6e..f99a84ae0 100644
--- a/audio.h
+++ b/audio.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.h 2.0 2005/02/12 12:20:19 kls Exp $
+ * $Id: audio.h 2.1 2008/07/06 11:39:21 kls Exp $
  */
 
 #ifndef __AUDIO_H
@@ -24,6 +24,11 @@ class cAudio : public cListObject {
        ///< be copied and processed in a separate thread. The Data is always a
        ///< complete PES audio packet. Id indicates the type of audio data this
        ///< packet holds.
+  virtual void PlayTs(const uchar *Data, int Length) = 0;
+       ///< Plays the given block of audio Data. Must return as soon as possible.
+       ///< If the entire block of data can't be processed immediately, it must
+       ///< be copied and processed in a separate thread. The Data is always a
+       ///< complete TS audio packet.
   virtual void Mute(bool On) = 0;
        ///< Immediately sets the audio device to be silent (On==true) or to
        ///< normal replay (On==false).
@@ -34,6 +39,7 @@ class cAudio : public cListObject {
 class cAudios : public cList<cAudio> {
 public:
   void PlayAudio(const uchar *Data, int Length, uchar Id);
+  void PlayTsAudio(const uchar *Data, int Length);
   void MuteAudio(bool On);
   void ClearAudio(void);
   };
@@ -49,6 +55,7 @@ class cExternalAudio : public cAudio {
   cExternalAudio(const char *Command);
   virtual ~cExternalAudio();
   virtual void Play(const uchar *Data, int Length, uchar Id);
+  virtual void PlayTs(const uchar *Data, int Length);
   virtual void Mute(bool On);
   virtual void Clear(void);
   };
diff --git a/channels.c b/channels.c
index 3c3e74380..134c19e02 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.2 2008/04/12 13:49:12 kls Exp $
+ * $Id: channels.c 2.3 2008/07/06 12:59:41 kls Exp $
  */
 
 #include "channels.h"
@@ -505,10 +505,10 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
   return q - s;
 }
 
-void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
+void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
 {
   int mod = CHANNELMOD_NONE;
-  if (vpid != Vpid || ppid != Ppid || tpid != Tpid)
+  if (vpid != Vpid || ppid != Ppid || vtype != Vtype || tpid != Tpid)
      mod |= CHANNELMOD_PIDS;
   int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs) | IntArraysDiffer(spids, Spids, slangs, SLangs);
   if (m & STRDIFF)
@@ -542,9 +542,10 @@ void cChannel::SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE
      q = NewSpidsBuf;
      q += IntArrayToString(q, Spids, 10, SLangs);
      *q = 0;
-     dsyslog("changing pids of channel %d from %d+%d:%s:%s:%d to %d+%d:%s:%s:%d", Number(), vpid, ppid, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, NewApidsBuf, NewSpidsBuf, Tpid);
+     dsyslog("changing pids of channel %d from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid);
      vpid = Vpid;
      ppid = Ppid;
+     vtype = Vtype;
      for (int i = 0; i < MAXAPIDS; i++) {
          apids[i] = Apids[i];
          strn0cpy(alangs[i], ALangs[i], MAXLANGCODE2);
@@ -752,6 +753,8 @@ cString cChannel::ToText(const cChannel *Channel)
      q += snprintf(q, sizeof(vpidbuf), "%d", Channel->vpid);
      if (Channel->ppid && Channel->ppid != Channel->vpid)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
+     if (Channel->vtype)
+        q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "=%d", Channel->vtype);
      *q = 0;
      const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia
      char apidbuf[BufferSize];
@@ -813,22 +816,27 @@ bool cChannel::Parse(const char *s)
            tpid = 0;
            }
         vpid = ppid = 0;
+        vtype = 2; // default is MPEG-2
         apids[0] = 0;
         dpids[0] = 0;
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
 
-           char *p = strchr(vpidbuf, '+');
-           if (p)
+           char *p;
+           if ((p = strchr(vpidbuf, '=')) != NULL) {
+              *p++ = 0;
+              if (sscanf(p, "%d", &vtype) != 1)
+                 return false;
+              }
+           if ((p = strchr(vpidbuf, '+')) != NULL) {
               *p++ = 0;
-           if (sscanf(vpidbuf, "%d", &vpid) != 1)
-              return false;
-           if (p) {
               if (sscanf(p, "%d", &ppid) != 1)
                  return false;
               }
-           else
+           if (sscanf(vpidbuf, "%d", &vpid) != 1)
+              return false;
+           if (!ppid)
               ppid = vpid;
 
            char *dpidbuf = strchr(apidbuf, ';');
diff --git a/channels.h b/channels.h
index 4d26ec247..0bf0288b1 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.2 2008/04/12 13:46:50 kls Exp $
+ * $Id: channels.h 2.3 2008/07/06 11:49:37 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -124,6 +124,7 @@ class cChannel : public cListObject {
   int srate;
   int vpid;
   int ppid;
+  int vtype;
   int apids[MAXAPIDS + 1]; // list is zero-terminated
   char alangs[MAXAPIDS][MAXLANGCODE2];
   int dpids[MAXDPIDS + 1]; // list is zero-terminated
@@ -178,6 +179,7 @@ class cChannel : public cListObject {
   int Srate(void) const { return srate; }
   int Vpid(void) const { return vpid; }
   int Ppid(void) const { return ppid; }
+  int Vtype(void) const { return vtype; }
   const int *Apids(void) const { return apids; }
   const int *Dpids(void) const { return dpids; }
   const int *Spids(void) const { return spids; }
@@ -225,7 +227,7 @@ class cChannel : public cListObject {
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
-  void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+  void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
   void SetLinkChannels(cLinkChannels *LinkChannels);
diff --git a/config.h b/config.h
index 7fad138e5..12a4e12c8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.1 2008/04/12 13:02:10 kls Exp $
+ * $Id: config.h 2.3 2008/09/06 14:06:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.0"
-#define VDRVERSNUM   10700  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.1"
+#define VDRVERSNUM   10701  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
@@ -122,7 +122,6 @@ template<class T> class cConfig : public cList<T> {
                       esyslog("ERROR: error in %s, line %d", fileName, line);
                       delete l;
                       result = false;
-                      break;
                       }
                    }
                 }
diff --git a/device.c b/device.c
index 12b8dd956..06f6864c0 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.2 2008/04/12 14:12:14 kls Exp $
+ * $Id: device.c 2.3 2008/07/06 13:22:21 kls Exp $
  */
 
 #include "device.h"
@@ -21,16 +21,9 @@
 
 // --- cLiveSubtitle ---------------------------------------------------------
 
-#define LIVESUBTITLEBUFSIZE  KILOBYTE(100)
-
-class cLiveSubtitle : public cReceiver, public cThread {
-private:
-  cRingBufferLinear *ringBuffer;
-  cRemux *remux;
+class cLiveSubtitle : public cReceiver {
 protected:
-  virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
-  virtual void Action(void);
 public:
   cLiveSubtitle(int SPid);
   virtual ~cLiveSubtitle();
@@ -38,170 +31,17 @@ class cLiveSubtitle : public cReceiver, public cThread {
 
 cLiveSubtitle::cLiveSubtitle(int SPid)
 :cReceiver(tChannelID(), -1, SPid)
-,cThread("live subtitle")
 {
-  ringBuffer = new cRingBufferLinear(LIVESUBTITLEBUFSIZE, TS_SIZE * 2, true, "Live Subtitle");
-  int NoPids = 0;
-  int SPids[] = { SPid, 0 };
-  remux = new cRemux(0, &NoPids, &NoPids, SPids);
 }
 
 cLiveSubtitle::~cLiveSubtitle()
 {
   cReceiver::Detach();
-  delete remux;
-  delete ringBuffer;
-}
-
-void cLiveSubtitle::Activate(bool On)
-{
-  if (On)
-     Start();
-  else
-     Cancel(3);
 }
 
 void cLiveSubtitle::Receive(uchar *Data, int Length)
 {
-  if (Running()) {
-     int p = ringBuffer->Put(Data, Length);
-     if (p != Length && Running())
-        ringBuffer->ReportOverflow(Length - p);
-     }
-}
-
-void cLiveSubtitle::Action(void)
-{
-  while (Running()) {
-        int Count;
-        uchar *b = ringBuffer->Get(Count);
-        if (b) {
-           Count = remux->Put(b, Count);
-           if (Count)
-              ringBuffer->Del(Count);
-           }
-        b = remux->Get(Count);
-        if (b) {
-           Count = cDevice::PrimaryDevice()->PlaySubtitle(b, Count);
-           remux->Del(Count);
-           }
-        }
-}
-
-// --- cPesAssembler ---------------------------------------------------------
-
-class cPesAssembler {
-private:
-  uchar *data;
-  uint32_t tag;
-  int length;
-  int size;
-  bool Realloc(int Size);
-public:
-  cPesAssembler(void);
-  ~cPesAssembler();
-  int ExpectedLength(void) { return PacketSize(data); }
-  static int PacketSize(const uchar *data);
-  int Length(void) { return length; }
-  const uchar *Data(void) { return data; } // only valid if Length() >= 4
-  void Reset(void);
-  void Put(uchar c);
-  void Put(const uchar *Data, int Length);
-  bool IsPes(void);
-  };
-
-cPesAssembler::cPesAssembler(void)
-{
-  data = NULL;
-  size = 0;
-  Reset();
-}
-
-cPesAssembler::~cPesAssembler()
-{
-  free(data);
-}
-
-void cPesAssembler::Reset(void)
-{
-  tag = 0xFFFFFFFF;
-  length = 0;
-}
-
-bool cPesAssembler::Realloc(int Size)
-{
-  if (Size > size) {
-     size = max(Size, 2048);
-     data = (uchar *)realloc(data, size);
-     if (!data) {
-        esyslog("ERROR: can't allocate memory for PES assembler");
-        length = 0;
-        size = 0;
-        return false;
-        }
-     }
-  return true;
-}
-
-void cPesAssembler::Put(uchar c)
-{
-  if (length < 4) {
-     tag = (tag << 8) | c;
-     if ((tag & 0xFFFFFF00) == 0x00000100) {
-        if (Realloc(4)) {
-           *(uint32_t *)data = htonl(tag);
-           length = 4;
-           }
-        }
-     else if (length < 3)
-        length++;
-     }
-  else if (Realloc(length + 1))
-     data[length++] = c;
-}
-
-void cPesAssembler::Put(const uchar *Data, int Length)
-{
-  while (length < 4 && Length > 0) {
-        Put(*Data++);
-        Length--;
-        }
-  if (Length && Realloc(length + Length)) {
-     memcpy(data + length, Data, Length);
-     length += Length;
-     }
-}
-
-int cPesAssembler::PacketSize(const uchar *data)
-{
-  // we need atleast 6 bytes of data here !!!
-  switch (data[3]) {
-    default:
-    case 0x00 ... 0xB8: // video stream start codes
-    case 0xB9: // Program end
-    case 0xBC: // Programm stream map
-    case 0xF0 ... 0xFF: // reserved
-         return 6;
-
-    case 0xBA: // Pack header
-         if ((data[4] & 0xC0) == 0x40) // MPEG2
-            return 14;
-         // to be absolutely correct we would have to add the stuffing bytes
-         // as well, but at this point we only may have 6 bytes of data avail-
-         // able. So it's up to the higher level to resync...
-         //return 14 + (data[13] & 0x07); // add stuffing bytes
-         else // MPEG1
-            return 12;
-
-    case 0xBB: // System header
-    case 0xBD: // Private stream1
-    case 0xBE: // Padding stream
-    case 0xBF: // Private stream2 (navigation data)
-    case 0xC0 ... 0xCF: // all the rest (the real packets)
-    case 0xD0 ... 0xDF:
-    case 0xE0 ... 0xEF:
-         return 6 + data[4] * 256 + data[5];
-    }
+  cDevice::PrimaryDevice()->PlayTs(Data, Length);
 }
 
 // --- cDevice ---------------------------------------------------------------
@@ -241,7 +81,6 @@ cDevice::cDevice(void)
   startScrambleDetection = 0;
 
   player = NULL;
-  pesAssembler = new cPesAssembler;
   ClrAvailableTracks();
   currentAudioTrack = ttNone;
   currentAudioTrackMissingCount = 0;
@@ -265,7 +104,6 @@ cDevice::~cDevice()
   DetachAllReceivers();
   delete liveSubtitle;
   delete dvbSubtitleConverter;
-  delete pesAssembler;
 }
 
 bool cDevice::WaitForAllDevicesReady(int Timeout)
@@ -1195,7 +1033,6 @@ bool cDevice::AttachPlayer(cPlayer *Player)
         Detach(player);
      DELETENULL(liveSubtitle);
      DELETENULL(dvbSubtitleConverter);
-     pesAssembler->Reset();
      player = Player;
      if (!Transferring())
         ClrAvailableTracks(false, true);
@@ -1256,7 +1093,7 @@ int cDevice::PlaySubtitle(const uchar *Data, int Length)
 {
   if (!dvbSubtitleConverter)
      dvbSubtitleConverter = new cDvbSubtitleConverter;
-  return dvbSubtitleConverter->Convert(Data, Length);
+  return dvbSubtitleConverter->ConvertFragments(Data, Length);
 }
 
 int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
@@ -1360,42 +1197,16 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
 {
   if (!Data) {
-     pesAssembler->Reset();
      if (dvbSubtitleConverter)
         dvbSubtitleConverter->Reset();
      return 0;
      }
-  int Result = 0;
-  if (pesAssembler->Length()) {
-     // Make sure we have a complete PES header:
-     while (pesAssembler->Length() < 6 && Length > 0) {
-           pesAssembler->Put(*Data++);
-           Length--;
-           Result++;
-           }
-     if (pesAssembler->Length() < 6)
-        return Result; // Still no complete PES header - wait for more
-     int l = pesAssembler->ExpectedLength();
-     int Rest = min(l - pesAssembler->Length(), Length);
-     pesAssembler->Put(Data, Rest);
-     Data += Rest;
-     Length -= Rest;
-     Result += Rest;
-     if (pesAssembler->Length() < l)
-        return Result; // Still no complete PES packet - wait for more
-     // Now pesAssembler contains one complete PES packet.
-     int w = PlayPesPacket(pesAssembler->Data(), pesAssembler->Length(), VideoOnly);
-     if (w > 0)
-        pesAssembler->Reset();
-     return Result > 0 ? Result : w < 0 ? w : 0;
-     }
   int i = 0;
   while (i <= Length - 6) {
         if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
-           int l = cPesAssembler::PacketSize(&Data[i]);
+           int l = PesLength(Data + i);
            if (i + l > Length) {
-              // Store incomplete PES packet for later completion:
-              pesAssembler->Put(Data + i, Length - i);
+              esyslog("ERROR: incomplete PES packet!");
               return Length;
               }
            int w = PlayPesPacket(Data + i, l, VideoOnly);
@@ -1408,10 +1219,91 @@ int cDevice::PlayPes(const uchar *Data, int Length, bool VideoOnly)
            i++;
         }
   if (i < Length)
-     pesAssembler->Put(Data + i, Length - i);
+     esyslog("ERROR: leftover PES data!");
+  return Length;
+}
+
+int cDevice::PlayTsVideo(const uchar *Data, int Length)
+{
+  // Video PES has no explicit length, so we can only determine the end of
+  // a PES packet when the next TS packet that starts a payload comes in:
+  if (TsPayloadStart(Data)) {
+     if (const uchar *p = tsToPesVideo.GetPes(Length)) {
+        int w = PlayVideo(p, Length);
+        if (w > 0)
+           tsToPesVideo.Reset();
+        else
+           return w;
+        }
+     }
+  tsToPesVideo.PutTs(Data, Length);
+  return Length;
+}
+
+int cDevice::PlayTsAudio(const uchar *Data, int Length)
+{
+  bool PayloadStart = TsPayloadStart(Data);
+  for (int Pass = 0; Pass < 2; Pass++) {
+      if (Pass == 0 && !PayloadStart) // if no new payload is started, we can always put the packet into the converter
+         tsToPesAudio.PutTs(Data, Length);
+      if (const uchar *p = tsToPesAudio.GetPes(Length)) {
+         int w = PlayAudio(p, Length, 0);
+         if (w > 0)
+            tsToPesAudio.Reset();
+         else if (PayloadStart)
+            return w; // must get out the old packet before starting a new one
+         }
+      if (Pass == 0 && PayloadStart)
+         tsToPesAudio.PutTs(Data, Length);
+      }
   return Length;
 }
 
+int cDevice::PlayTsSubtitle(const uchar *Data, int Length)
+{
+  if (!dvbSubtitleConverter)
+     dvbSubtitleConverter = new cDvbSubtitleConverter;
+  tsToPesSubtitle.PutTs(Data, Length);
+  if (const uchar *p = tsToPesSubtitle.GetPes(Length)) {
+     dvbSubtitleConverter->Convert(p, Length);
+     tsToPesSubtitle.Reset();
+     }
+  return Length;
+}
+
+//TODO detect and report continuity errors?
+int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
+{
+  if (Length == TS_SIZE) {
+     if (!TsHasPayload(Data))
+        return Length; // silently ignore TS packets w/o payload
+     int PayloadOffset = TsPayloadOffset(Data);
+     if (PayloadOffset < Length) {
+        int Pid = TsPid(Data);
+        if (Pid == 0)
+           patPmtParser.ParsePat(Data + PayloadOffset, Length - PayloadOffset);
+        else if (Pid == patPmtParser.PmtPid())
+           patPmtParser.ParsePmt(Data + PayloadOffset, Length - PayloadOffset);
+        else if (Pid == patPmtParser.Vpid())
+           return PlayTsVideo(Data, Length);
+        else if (Pid == availableTracks[currentAudioTrack].id) {
+           if (!VideoOnly || HasIBPTrickSpeed()) {
+              int w = PlayTsAudio(Data, Length);
+              if (w > 0)
+                 Audios.PlayTsAudio(Data, Length);
+              return w;
+              }
+           }
+        else if (Pid == availableTracks[currentSubtitleTrack].id) {
+           if (!VideoOnly || HasIBPTrickSpeed())
+              return PlayTsSubtitle(Data, Length);
+           }
+        return Length;
+        }
+     }
+  return -1;
+}
+
 int cDevice::Priority(void) const
 {
   int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
@@ -1448,7 +1340,7 @@ void cDevice::Action(void)
            uchar *b = NULL;
            if (GetTSPacket(b)) {
               if (b) {
-                 int Pid = (((uint16_t)b[1] & PID_MASK_HI) << 8) | b[2];
+                 int Pid = TsPid(b);
                  // Check whether the TS packets are scrambled:
                  bool DetachReceivers = false;
                  bool DescramblingOk = false;
diff --git a/device.h b/device.h
index 2712f91ea..8924aa92a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.1 2008/04/12 11:11:23 kls Exp $
+ * $Id: device.h 2.2 2008/07/06 11:25:42 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -17,6 +17,7 @@
 #include "filter.h"
 #include "nit.h"
 #include "pat.h"
+#include "remux.h"
 #include "ringbuffer.h"
 #include "sdt.h"
 #include "sections.h"
@@ -30,10 +31,6 @@
 #define MAXVOLUME         255
 #define VOLUMEDELTA         5 // used to increase/decrease the volume
 
-#define TS_SIZE          188
-#define TS_SYNC_BYTE     0x47
-#define PID_MASK_HI      0x1F
-
 enum eSetChannelResult { scrOk, scrNotAvailable, scrNoTransfer, scrFailed };
 
 enum ePlayMode { pmNone,           // audio/video from decoder
@@ -89,7 +86,6 @@ struct tTrackId {
 
 class cPlayer;
 class cReceiver;
-class cPesAssembler;
 class cLiveSubtitle;
 
 /// The cDevice class is the base from which actual devices can be derived.
@@ -477,7 +473,10 @@ class cDevice : public cThread {
 
 private:
   cPlayer *player;
-  cPesAssembler *pesAssembler;
+  cPatPmtParser patPmtParser;
+  cTsToPes tsToPesVideo;
+  cTsToPes tsToPesAudio;
+  cTsToPes tsToPesSubtitle;
 protected:
   virtual bool CanReplay(void) const;
        ///< Returns true if this device can currently start a replay session.
@@ -511,6 +510,33 @@ class cDevice : public cThread {
        ///< If VideoOnly is true, only the video will be displayed,
        ///< which is necessary for trick modes like 'fast forward'.
        ///< Data must point to one single, complete PES packet.
+  virtual int PlayTsVideo(const uchar *Data, int Length);
+       ///< Plays the given data block as video.
+       ///< Data points to exactly one complete TS packet of the given Length
+       ///< (which is always TS_SIZE).
+       ///< PlayTsVideo() shall process the packet either as a whole (returning
+       ///< a positive number, which needs not necessarily be Length) or not at all
+       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< The default implementation collects all incoming TS payload belonging
+       ///< to one PES packet and calls PlayVideo() with the resulting packet.
+  virtual int PlayTsAudio(const uchar *Data, int Length);
+       ///< Plays the given data block as audio.
+       ///< Data points to exactly one complete TS packet of the given Length
+       ///< (which is always TS_SIZE).
+       ///< PlayTsAudio() shall process the packet either as a whole (returning
+       ///< a positive number, which needs not necessarily be Length) or not at all
+       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< The default implementation collects all incoming TS payload belonging
+       ///< to one PES packet and calls PlayAudio() with the resulting packet.
+  virtual int PlayTsSubtitle(const uchar *Data, int Length);
+       ///< Plays the given data block as a subtitle.
+       ///< Data points to exactly one complete TS packet of the given Length
+       ///< (which is always TS_SIZE).
+       ///< PlayTsSubtitle() shall process the packet either as a whole (returning
+       ///< a positive number, which needs not necessarily be Length) or not at all
+       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< The default implementation collects all incoming TS payload belonging
+       ///< to one PES packet and displays the resulting subtitle via the OSD.
 public:
   virtual int64_t GetSTC(void);
        ///< Gets the current System Time Counter, which can be used to
@@ -565,6 +591,21 @@ class cDevice : public cThread {
        ///< to a complete packet with data from the next call to PlayPes().
        ///< That way any functions called from within PlayPes() will be
        ///< guaranteed to always receive complete PES packets.
+  virtual int PlayTs(const uchar *Data, int Length, bool VideoOnly = false);
+       ///< Plays the given TS packet.
+       ///< If VideoOnly is true, only the video will be displayed,
+       ///< which is necessary for trick modes like 'fast forward'.
+       ///< Data points to a single TS packet, Length is always TS_SIZE (the total
+       ///< size of a single TS packet).
+       ///< A derived device can reimplement this function to handle the
+       ///< TS packets itself. Any packets the derived function can't handle
+       ///< must be sent to the base class function. This applies especially
+       ///< to the PAT/PMT packets.
+       ///< Returns -1 in case of error, otherwise the number of actually
+       ///< processed bytes is returned, which may be less than Length.
+       ///< PlayTs() shall process the packet either as a whole (returning
+       ///< a positive number, which needs not necessarily be Length) or not at all
+       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
   bool Replaying(void) const;
        ///< Returns true if we are currently replaying.
   bool Transferring(void) const;
diff --git a/dvbdevice.c b/dvbdevice.c
index eef74429e..40479263b 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.2 2008/04/13 14:15:35 kls Exp $
+ * $Id: dvbdevice.c 2.4 2008/07/06 13:58:56 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -266,10 +266,6 @@ bool cDvbTuner::SetFrontend(void)
 
      tuneTimeout = DVBS_TUNE_TIMEOUT;
      lockTimeout = DVBS_LOCK_TIMEOUT;
-
-     dvbfe_info feinfo;
-     feinfo.delivery = Frontend.delivery;
-     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
      }
   else if (frontendType & DVBFE_DELSYS_DVBC) {
      Frontend.delivery = DVBFE_DELSYS_DVBC;
@@ -281,10 +277,6 @@ bool cDvbTuner::SetFrontend(void)
 
      tuneTimeout = DVBC_TUNE_TIMEOUT;
      lockTimeout = DVBC_LOCK_TIMEOUT;
-
-     dvbfe_info feinfo;
-     feinfo.delivery = Frontend.delivery;
-     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
      }
   else if (frontendType & DVBFE_DELSYS_DVBT) {
      Frontend.delivery = DVBFE_DELSYS_DVBT;
@@ -302,15 +294,12 @@ bool cDvbTuner::SetFrontend(void)
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
      lockTimeout = DVBT_LOCK_TIMEOUT;
-
-     dvbfe_info feinfo;
-     feinfo.delivery = Frontend.delivery;
-     CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
      }
   else {
      esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
      return false;
      }
+  CHECK(ioctl(fd_frontend, DVBFE_SET_DELSYS, &Frontend.delivery));
   if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) {
      esyslog("ERROR: frontend %d: %m", cardIndex);
      return false;
@@ -1247,6 +1236,18 @@ int cDvbDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
   return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
 }
 
+int cDvbDevice::PlayTsVideo(const uchar *Data, int Length)
+{
+  Length = TsGetPayload(&Data);
+  return PlayVideo(Data, Length);
+}
+
+int cDvbDevice::PlayTsAudio(const uchar *Data, int Length)
+{
+  Length = TsGetPayload(&Data);
+  return PlayAudio(Data, Length, 0);
+}
+
 bool cDvbDevice::OpenDvr(void)
 {
   CloseDvr();
diff --git a/dvbdevice.h b/dvbdevice.h
index 3990eaa0e..bb219d486 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.1 2008/04/12 11:20:48 kls Exp $
+ * $Id: dvbdevice.h 2.2 2008/06/01 09:48:04 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -138,6 +138,8 @@ class cDvbDevice : public cDevice {
   virtual bool SetPlayMode(ePlayMode PlayMode);
   virtual int PlayVideo(const uchar *Data, int Length);
   virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
+  virtual int PlayTsVideo(const uchar *Data, int Length);
+  virtual int PlayTsAudio(const uchar *Data, int Length);
 public:
   virtual int64_t GetSTC(void);
   virtual void TrickSpeed(int Speed);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 10d76b53d..69dc6fa9b 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.0 2007/11/25 13:33:08 kls Exp $
+ * $Id: dvbsubtitle.c 2.1 2008/05/25 14:36:24 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -580,12 +580,12 @@ bool cDvbSubtitleAssembler::Realloc(int Size)
 unsigned char *cDvbSubtitleAssembler::Get(int &Length)
 {
   if (length > pos + 5) {
-      Length = (data[pos + 4] << 8) + data[pos + 5] + 6;
-      if (length >= pos + Length) {
-         unsigned char *result = data + pos;
-         pos += Length;
-         return result;
-         }
+     Length = (data[pos + 4] << 8) + data[pos + 5] + 6;
+     if (length >= pos + Length) {
+        unsigned char *result = data + pos;
+        pos += Length;
+        return result;
+        }
      }
   return NULL;
 }
@@ -684,10 +684,10 @@ void cDvbSubtitleConverter::Reset(void)
   Unlock();
 }
 
-int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
+int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
 {
   if (Data && Length > 8) {
-     int PayloadOffset = Data[8] + 9;
+     int PayloadOffset = PesPayloadOffset(Data);
      int SubstreamHeaderLength = 4;
      bool ResetSubtitleAssembler = Data[PayloadOffset + 3] == 0x00;
 
@@ -699,15 +699,9 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
         }
 
      if (Length > PayloadOffset + SubstreamHeaderLength) {
-        int64_t pts = 0;
-        if ((Data[7] & 0x80) && Data[8] >= 5) {
-           pts  = (((int64_t)Data[ 9]) & 0x0E) << 29;
-           pts |= ( (int64_t)Data[10])         << 22;
-           pts |= (((int64_t)Data[11]) & 0xFE) << 14;
-           pts |= ( (int64_t)Data[12])         <<  7;
-           pts |= (((int64_t)Data[13]) & 0xFE) >>  1;
+        int64_t pts = PesGetPts(Data);
+        if (pts)
            dbgconverter("Converter PTS: %lld\n", pts);
-           }
         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
         int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
         if (ResetSubtitleAssembler)
@@ -736,6 +730,40 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
   return 0;
 }
 
+int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
+{
+  if (Data && Length > 8) {
+     int PayloadOffset = PesPayloadOffset(Data);
+     if (Length > PayloadOffset) {
+        int64_t pts = PesGetPts(Data);
+        if (pts)
+           dbgconverter("Converter PTS: %lld\n", pts);
+        const uchar *data = Data + PayloadOffset;
+        int length = Length - PayloadOffset;
+        if (length > 3) {
+           if (data[0] == 0x20 && data[1] == 0x00 && data[2] == 0x0F) {
+              data += 2;
+              length -= 2;
+              }
+           const uchar *b = data;
+           while (length > 0) {
+                 if (b[0] == 0x0F) {
+                    int n = ExtractSegment(b, length, pts);
+                    if (n < 0)
+                       break;
+                    b += n;
+                    length -= n;
+                    }
+                 else
+                    break;
+                 }
+           }
+        }
+     return Length;
+     }
+  return 0;
+}
+
 #define LimitTo32Bit(n) (n & 0x00000000FFFFFFFFL)
 #define MAXDELTA 40000 // max. reasonable PTS/STC delta in ms
 
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index bd8e76e32..06bdea4d0 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.0 2007/10/14 14:02:46 kls Exp $
+ * $Id: dvbsubtitle.h 2.1 2008/05/25 14:36:52 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -17,7 +17,7 @@
 #include "tools.h"
 
 class cDvbSubtitlePage;
-class cDvbSubtitleAssembler;
+class cDvbSubtitleAssembler; // for legacy PES recordings
 class cDvbSubtitleBitmaps;
 
 class cDvbSubtitleConverter : public cThread {
@@ -36,6 +36,7 @@ class cDvbSubtitleConverter : public cThread {
   virtual ~cDvbSubtitleConverter();
   void Action(void);
   void Reset(void);
+  int ConvertFragments(const uchar *Data, int Length); // for legacy PES recordings
   int Convert(const uchar *Data, int Length);
   static void SetupChanged(void);
   };
diff --git a/eit.c b/eit.c
index d32629ef7..774b66713 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.1 2008/04/13 11:27:06 kls Exp $
+ * $Id: eit.c 2.2 2008/05/01 15:33:27 kls Exp $
  */
 
 #include "eit.h"
@@ -219,7 +219,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  SI::ComponentDescriptor *cd = (SI::ComponentDescriptor *)d;
                  uchar Stream = cd->getStreamContent();
                  uchar Type = cd->getComponentType();
-                 if (1 <= Stream && Stream <= 3 && Type != 0) { // 1=video, 2=audio, 3=subtitles
+                 if (1 <= Stream && Stream <= 4 && Type != 0) { // 1=video, 2=audio, 3=subtitles, 4=AC3
                     if (!Components)
                        Components = new cComponents;
                     char buffer[Utf8BufSize(256)];
diff --git a/epg.c b/epg.c
index 5570e8e9d..0c52a0c86 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.0 2008/02/16 16:09:12 kls Exp $
+ * $Id: epg.c 2.1 2008/05/01 14:53:55 kls Exp $
  */
 
 #include "epg.h"
@@ -88,8 +88,10 @@ void cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *
 tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
 {
   for (int i = 0; i < numComponents; i++) {
-      // In case of an audio stream the 'type' check actually just distinguishes between "normal" and "Dolby Digital":
-      if (components[i].stream == Stream && (Stream != 2 || (components[i].type < 5) == (Type < 5))) {
+      if (components[i].stream == Stream && (
+          Type == 0 || // don't care about the actual Type
+          Stream == 2 && (components[i].type < 5) == (Type < 5) // fallback "Dolby" component according to the "Premiere pseudo standard"
+         )) {
          if (!Index--)
             return &components[i];
          }
diff --git a/font.c b/font.c
index 2fb23c0d0..f962a09c3 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 2.0 2008/03/01 10:19:41 kls Exp $
+ * $Id: font.c 2.1 2008/05/02 16:16:51 kls Exp $
  */
 
 #include "font.h"
@@ -395,7 +395,7 @@ bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
      FcFontSetDestroy(fontset);
      FcPatternDestroy(pat);
      FcObjectSetDestroy(os);
-     FcFini();
+     //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once
      FontNames->Sort();
      }
   return FontNames->Size() > 0;
@@ -431,7 +431,7 @@ cString cFont::GetFontFileName(const char *FontName)
         esyslog("ERROR: no usable font found for '%s'", FontName);
      FcPatternDestroy(pat);
      free(fn);
-     FcFini();
+     //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once
      }
   return FontFileName;
 }
diff --git a/i18n.c b/i18n.c
index 40e900645..98544d2ab 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.0 2008/01/19 12:07:11 kls Exp $
+ * $Id: i18n.c 2.1 2008/09/06 12:24:43 kls Exp $
  *
  *
  */
@@ -45,7 +45,7 @@ const char *LanguageCodeList[] = {
   "por",
   "fra,fre",
   "nor",
-  "fin,smi",
+  "fin,suo",
   "pol",
   "esl,spa",
   "ell,gre",
diff --git a/libsi/si.h b/libsi/si.h
index 3d2cfc0da..9d47d306c 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 2.0 2007/04/22 13:32:09 kls Exp $
+ *   $Id: si.h 2.1 2008/09/06 12:44:06 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -28,7 +28,7 @@ enum TableId { TableIdPAT = 0x00, //program association section
                TableIdNIT_other  = 0x41, //network information section, other network
                TableIdSDT = 0x42, //service description section
                TableIdSDT_other  = 0x46,
-               TableIdBAT = 0x46, //bouquet association section
+               TableIdBAT = 0x4A, //bouquet association section
                TableIdEIT_presentFollowing = 0x4E, //event information section
                TableIdEIT_presentFollowing_other = 0x4F,
                //range from 0x50 to 0x5F
diff --git a/libsi/util.h b/libsi/util.h
index b0300805c..486267234 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 2.0 2006/02/25 10:13:28 kls Exp $
+ *   $Id: util.h 2.1 2008/05/22 10:49:08 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -148,9 +148,9 @@ class CRC32 {
    CRC32(const char *d, int len, u_int32_t CRCvalue=0xFFFFFFFF);
    bool isValid() { return crc32(data, length, value) == 0; }
    static bool isValid(const char *d, int len, u_int32_t CRCvalue=0xFFFFFFFF) { return crc32(d, len, CRCvalue) == 0; }
+   static u_int32_t crc32(const char *d, int len, u_int32_t CRCvalue);
 protected:
    static u_int32_t crc_table[256];
-   static u_int32_t crc32 (const char *d, int len, u_int32_t CRCvalue);
 
    const char *data;
    int length;
diff --git a/menu.c b/menu.c
index da90018bd..7fa1e3f11 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.1 2008/04/12 11:37:17 kls Exp $
+ * $Id: menu.c 2.2 2008/05/01 14:37:24 kls Exp $
  */
 
 #include "menu.h"
@@ -3147,6 +3147,8 @@ static void SetTrackDescriptions(int LiveChannel)
                    break;
            case 3: cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, indexSubtitle++, 0, LiveChannel ? NULL : p->language, p->description);
                    break;
+           case 4: cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, LiveChannel ? NULL : p->language, p->description);
+                   break;
            }
          }
      }
diff --git a/pat.c b/pat.c
index a16607c5f..528578424 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.1 2008/04/12 13:34:50 kls Exp $
+ * $Id: pat.c 2.2 2008/07/06 14:01:32 kls Exp $
  */
 
 #include "pat.h"
@@ -328,7 +328,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         // Scan the stream-specific loop:
         SI::PMT::Stream stream;
         int Vpid = 0;
-        int Ppid = pmt.getPCRPid();
+        int Ppid = 0;
+        int Vtype = 0;
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
         int Dpids[MAXDPIDS + 1] = { 0 };
         int Spids[MAXSPIDS + 1] = { 0 };
@@ -343,8 +344,10 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
-//TODO        case 0x1B: // MPEG4
+              case 0x1B: // MPEG4
                       Vpid = stream.getPid();
+                      Ppid = pmt.getPCRPid();
+                      Vtype = stream.getStreamType();
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
               case 4: // STREAMTYPE_13818_AUDIO
@@ -440,7 +443,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                 }
             }
         if (Setup.UpdateChannels >= 2) {
-           Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+           Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
            Channel->SetCaIds(CaDescriptors->CaIds());
            }
         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
diff --git a/player.h b/player.h
index 3636dbafc..7279102c4 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 2.0 2008/02/16 13:50:11 kls Exp $
+ * $Id: player.h 2.1 2008/08/15 14:07:48 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -42,6 +42,10 @@ class cPlayer {
        // Sends the given PES Data to the device and returns the number of
        // bytes that have actually been accepted by the device (or a
        // negative value in case of an error).
+  int PlayTs(const uchar *Data, int Length, bool VideoOnly = false) { return device ? device->PlayTs(Data, Length, VideoOnly) : -1; }
+       // Sends the given TS packet to the device and returns a positive number
+       // if the packet has been accepted by the device, or a negative value in
+       // case of an error.
 public:
   cPlayer(ePlayMode PlayMode = pmAudioVideo);
   virtual ~cPlayer();
diff --git a/po/it_IT.po b/po/it_IT.po
index f122b3e6f..0b8852b6d 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-04-12 14:19+0200\n"
-"PO-Revision-Date: 2008-03-08 21:06+0100\n"
+"PO-Revision-Date: 2008-08-25 02:36+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  Italian\n"
+"Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -236,7 +236,7 @@ msgid "Disk"
 msgstr "Disco"
 
 msgid "free"
-msgstr "liberi"
+msgstr "disponibili"
 
 msgid "Free To Air"
 msgstr "in chiaro"
@@ -377,7 +377,7 @@ msgid "VPS"
 msgstr "VPS"
 
 msgid "Lifetime"
-msgstr "Durata"
+msgstr "Scadenza"
 
 msgid "File"
 msgstr "Nome"
@@ -419,20 +419,20 @@ msgid "What's on next?"
 msgstr "Prossimi programmi"
 
 msgid "Button$Next"
-msgstr "Prossimo"
+msgstr "Prossimi"
 
 msgid "Button$Now"
 msgstr "Adesso"
 
 msgid "Button$Schedule"
-msgstr "Programma"
+msgstr "Programmi"
 
 msgid "Can't switch channel!"
 msgstr "Impossibile cambiare canale!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Programma - %s"
+msgstr "Programmi - %s"
 
 #, c-format
 msgid "This event - %s"
@@ -515,7 +515,7 @@ msgid "Setup.OSD$Height"
 msgstr "Altezza OSD"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Tempo del messaggio (s)"
+msgstr "Durata del messaggio (s)"
 
 msgid "Setup.OSD$Use small font"
 msgstr "Utilizza caratteri piccoli"
@@ -587,7 +587,7 @@ msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Mostra vecchi dati EPG (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Imposta orario automatico"
+msgstr "Imposta orario di sistema"
 
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Utilizza orario da transponder"
@@ -637,13 +637,13 @@ msgid "Setup.DVB$Video format"
 msgstr "Formato video"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Formato di visualizz. video"
+msgstr "Formato visualizzazione video"
 
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Aggiorna i canali"
+msgstr "Aggiornamento canali"
 
 msgid "Setup.DVB$Audio languages"
 msgstr "Lingue audio"
@@ -730,13 +730,13 @@ msgid "Setup.Recording$Default priority"
 msgstr "Priorit� predefinita"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Durata predefinita (gg)"
+msgstr "Scadenza predefinita (gg)"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorit� di pausa"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Durata pausa (gg)"
+msgstr "Scadenza pausa (gg)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Utilizza nome episodio"
@@ -754,7 +754,7 @@ msgid "Setup.Recording$Name instant recording"
 msgstr "Nome reg. immediata"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Tempo reg. immediata (min)"
+msgstr "Durata reg. immediata (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dim. massima file video (MB)"
@@ -917,7 +917,7 @@ msgid "Plugin"
 msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Su/Gi� per nuova posizione - OK per muovere"
+msgstr "Su/Gi� per nuova posizione - OK per spostare"
 
 msgid "Channel locked (recording)!"
 msgstr "Canale bloccato (in registrazione)!"
@@ -936,7 +936,7 @@ msgstr "Registrazione in corso - spegnere comunque?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Registrazione fra %ld minuti - spegnere comunque?"
+msgstr "Registrazione tra %ld minuti - spegnere comunque?"
 
 msgid "shut down anyway?"
 msgstr "spegnere comunque?"
diff --git a/recording.c b/recording.c
index 9468f7999..340e68a7f 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.0 2008/02/24 10:28:53 kls Exp $
+ * $Id: recording.c 2.3 2008/06/12 21:46:08 kls Exp $
  */
 
 #include "recording.h"
@@ -31,8 +31,8 @@
 /* This was the original code, which works fine in a Linux only environment.
    Unfortunately, because of Windows and its brain dead file system, we have
    to use a more complicated approach, in order to allow users who have enabled
-   the VFAT compile time option to see their recordings even if they forget to
-   enable VFAT when compiling a new version of VDR... Gee, do I hate Windows.
+   the --vfat command line option to see their recordings even if they forget to
+   enable --vfat when restarting VDR... Gee, do I hate Windows.
    (kls 2002-07-27)
 #define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
@@ -297,7 +297,9 @@ cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
      for (int i = 0; i < MAXDPIDS; i++) {
          const char *s = Channel->Dlang(i);
          if (*s) {
-            tComponent *Component = Components->GetComponent(i, 2, 5);
+            tComponent *Component = Components->GetComponent(i, 4, 0); // AC3 component according to the DVB standard
+            if (!Component)
+               Component = Components->GetComponent(i, 2, 5); // fallback "Dolby" component according to the "Premiere pseudo standard"
             if (!Component)
                Components->SetComponent(Components->NumComponents(), 2, 5, s, NULL);
             else if (strlen(s) > strlen(Component->language))
@@ -1483,8 +1485,8 @@ cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
                  return SetOffset(Number + 1); // file exists and has non zero size, let's try next suffix
               else {
                  // zero size file, remove it
-                 dsyslog ("cFileName::SetOffset: removing zero-sized file %s", fileName);
-                 unlink (fileName);
+                 dsyslog("cFileName::SetOffset: removing zero-sized file %s", fileName);
+                 unlink(fileName);
                  }
               }
            else
diff --git a/remux.c b/remux.c
index 6b422091d..8312a7444 100644
--- a/remux.c
+++ b/remux.c
@@ -11,15 +11,24 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 2.0 2007/11/25 13:56:03 kls Exp $
+ * $Id: remux.c 2.1 2008/08/15 14:49:34 kls Exp $
  */
 
 #include "remux.h"
 #include <stdlib.h>
 #include "channels.h"
+#include "device.h"
+#include "libsi/si.h"
+#include "libsi/section.h"
+#include "libsi/descriptor.h"
 #include "shutdown.h"
 #include "tools.h"
 
+// Set this to 'true' for debug output:
+static bool DebugPatPmt = false;
+
+#define dbgpatpmt(a...) if (DebugPatPmt) fprintf(stderr, a)
+
 ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
 {
   if (Count < 7)
@@ -1413,7 +1422,6 @@ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
 //pts_dts flags
 #define PTS_ONLY         0x80
 
-#define TS_SIZE        188
 #define PID_MASK_HI    0x1F
 #define CONT_CNT_MASK  0x0F
 
@@ -2007,8 +2015,6 @@ int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &Pic
   return -1;
 }
 
-#define TS_SYNC_BYTE 0x47
-
 int cRemux::Put(const uchar *Data, int Count)
 {
   int used = 0;
@@ -2182,3 +2188,466 @@ void cRemux::SetBrokenLink(uchar *Data, int Length)
   else
      dsyslog("SetBrokenLink: no video packet in frame");
 }
+
+// --- cPatPmtGenerator ------------------------------------------------------
+
+cPatPmtGenerator::cPatPmtGenerator(void)
+{
+  numPmtPackets = 0;
+  patCounter = pmtCounter = 0;
+  patVersion = pmtVersion = 0;
+  esInfoLength = NULL;
+  GeneratePat();
+}
+
+void cPatPmtGenerator::IncCounter(int &Counter, uchar *TsPacket)
+{
+  TsPacket[3] = (TsPacket[3] & 0xF0) | Counter;
+  if (++Counter > 0x0F)
+     Counter = 0x00;
+}
+
+void cPatPmtGenerator::IncVersion(int &Version)
+{
+  if (++Version > 0x1F)
+     Version = 0x00;
+}
+
+void cPatPmtGenerator::IncEsInfoLength(int Length)
+{
+  if (esInfoLength) {
+     Length += ((*esInfoLength & 0x0F) << 8) | *(esInfoLength + 1);
+     *esInfoLength = 0xF0 | (Length >> 8);
+     *(esInfoLength + 1) = Length;
+     }
+}
+
+int cPatPmtGenerator::MakeStream(uchar *Target, uchar Type, int Pid)
+{
+  int i = 0;
+  Target[i++] = Type; // stream type
+  Target[i++] = 0xE0 | (Pid >> 8); // dummy (3), pid hi (5)
+  Target[i++] = Pid; // pid lo
+  esInfoLength = &Target[i];
+  Target[i++] = 0xF0; // dummy (4), ES info length hi
+  Target[i++] = 0x00; // ES info length lo
+  return i;
+}
+
+int cPatPmtGenerator::MakeAC3Descriptor(uchar *Target)
+{
+  int i = 0;
+  Target[i++] = SI::AC3DescriptorTag;
+  Target[i++] = 0x01; // length
+  Target[i++] = 0x00;
+  IncEsInfoLength(i);
+  return i;
+}
+
+int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Language)
+{
+  int i = 0;
+  Target[i++] = SI::SubtitlingDescriptorTag;
+  Target[i++] = 0x08; // length
+  Target[i++] = *Language++;
+  Target[i++] = *Language++;
+  Target[i++] = *Language++;
+  Target[i++] = 0x00; // subtitling type
+  Target[i++] = 0x00; // composition page id hi
+  Target[i++] = 0x01; // composition page id lo
+  Target[i++] = 0x00; // ancillary page id hi
+  Target[i++] = 0x01; // ancillary page id lo
+  IncEsInfoLength(i);
+  return i;
+}
+
+int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language)
+{
+  int i = 0;
+  Target[i++] = SI::ISO639LanguageDescriptorTag;
+  Target[i++] = 0x04; // length
+  Target[i++] = *Language++;
+  Target[i++] = *Language++;
+  Target[i++] = *Language++;
+  Target[i++] = 0x01; // audio type
+  IncEsInfoLength(i);
+  return i;
+}
+
+int cPatPmtGenerator::MakeCRC(uchar *Target, const uchar *Data, int Length)
+{
+  int crc = SI::CRC32::crc32((const char *)Data, Length, 0xFFFFFFFF);
+  int i = 0;
+  Target[i++] = crc >> 24;
+  Target[i++] = crc >> 16;
+  Target[i++] = crc >> 8;
+  Target[i++] = crc;
+  return i;
+}
+
+#define P_TSID    0x8008 // pseudo TS ID
+#define P_PNR     0x0084 // pseudo Program Number
+#define P_PMT_PID 0x0084 // pseudo PMT pid
+
+void cPatPmtGenerator::GeneratePat(void)
+{
+  memset(pat, 0xFF, sizeof(pat));
+  uchar *p = pat;
+  int i = 0;
+  p[i++] = 0x47; // TS indicator
+  p[i++] = 0x40; // flags (3), pid hi (5)
+  p[i++] = 0x00; // pid lo
+  p[i++] = 0x10; // flags (4), continuity counter (4)
+  int PayloadStart = i;
+  p[i++] = 0x00; // table id
+  p[i++] = 0xB0; // section syntax indicator (1), dummy (3), section length hi (4)
+  int SectionLength = i;
+  p[i++] = 0x00; // section length lo (filled in later)
+  p[i++] = P_TSID >> 8;   // TS id hi
+  p[i++] = P_TSID & 0xFF; // TS id lo
+  p[i++] = 0xC1 | (patVersion << 1); // dummy (2), version number (5), current/next indicator (1)
+  p[i++] = 0x00; // section number
+  p[i++] = 0x00; // last section number
+  p[i++] = P_PNR >> 8;   // program number hi
+  p[i++] = P_PNR & 0xFF; // program number lo
+  p[i++] = 0xE0 | (P_PMT_PID >> 8); // dummy (3), PMT pid hi (5)
+  p[i++] = P_PMT_PID & 0xFF; // PMT pid lo
+  pat[SectionLength] = i - SectionLength - 1 + 4; // -2 = SectionLength storage, +4 = length of CRC
+  MakeCRC(pat + i, pat + PayloadStart, i - PayloadStart);
+  IncVersion(patVersion);
+}
+
+void cPatPmtGenerator::GeneratePmt(tChannelID ChannelID)
+{
+  // generate the complete PMT section:
+  uchar buf[MAX_SECTION_SIZE];
+  memset(buf, 0xFF, sizeof(buf));
+  numPmtPackets = 0;
+  cChannel *Channel = Channels.GetByChannelID(ChannelID);
+  if (Channel) {
+     int Vpid = Channel->Vpid();
+     uchar *p = buf;
+     int i = 0;
+     p[i++] = 0x02; // table id
+     int SectionLength = i;
+     p[i++] = 0xB0; // section syntax indicator (1), dummy (3), section length hi (4)
+     p[i++] = 0x00; // section length lo (filled in later)
+     p[i++] = P_PNR >> 8;   // program number hi
+     p[i++] = P_PNR & 0xFF; // program number lo
+     p[i++] = 0xC1 | (pmtVersion << 1); // dummy (2), version number (5), current/next indicator (1)
+     p[i++] = 0x00; // section number
+     p[i++] = 0x00; // last section number
+     p[i++] = 0xE0 | (Vpid >> 8); // dummy (3), PCR pid hi (5)
+     p[i++] = Vpid; // PCR pid lo
+     p[i++] = 0xF0; // dummy (4), program info length hi (4)
+     p[i++] = 0x00; // program info length lo
+
+     if (Vpid)
+        i += MakeStream(buf + i, Channel->Vtype(), Vpid);
+     for (int n = 0; Channel->Apid(n); n++) {
+         i += MakeStream(buf + i, 0x04, Channel->Apid(n));
+         const char *Alang = Channel->Alang(n);
+         i += MakeLanguageDescriptor(buf + i, Alang);
+         if (Alang[3] == '+')
+            i += MakeLanguageDescriptor(buf + i, Alang + 3);
+         }
+     for (int n = 0; Channel->Dpid(n); n++) {
+         i += MakeStream(buf + i, 0x06, Channel->Dpid(n));
+         i += MakeAC3Descriptor(buf + i);
+         i += MakeLanguageDescriptor(buf + i, Channel->Dlang(n));
+         }
+     for (int n = 0; Channel->Spid(n); n++) {
+         i += MakeStream(buf + i, 0x06, Channel->Spid(n));
+         i += MakeSubtitlingDescriptor(buf + i, Channel->Slang(n));
+         }
+
+     int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC
+     buf[SectionLength] |= (sl >> 8) & 0x0F;
+     buf[SectionLength + 1] = sl;
+     MakeCRC(buf + i, buf, i);
+     // split the PMT section into several TS packets:
+     uchar *q = buf;
+     while (i > 0) {
+           uchar *p = pmt[numPmtPackets++];
+           int j = 0;
+           p[j++] = 0x47; // TS indicator
+           p[j++] = 0x40 | (P_PNR >> 8); // flags (3), pid hi (5)
+           p[j++] = P_PNR & 0xFF; // pid lo
+           p[j++] = 0x10; // flags (4), continuity counter (4)
+           int l = TS_SIZE - j;
+           memcpy(p + j, q, l);
+           q += l;
+           i -= l;
+           }
+     IncVersion(pmtVersion);
+     }
+  else
+     esyslog("ERROR: can't find channel %s", *ChannelID.ToString());
+}
+
+uchar *cPatPmtGenerator::GetPat(void)
+{
+  IncCounter(patCounter, pat);
+  return pat;
+}
+
+uchar *cPatPmtGenerator::GetPmt(int &Index)
+{
+  if (Index < numPmtPackets) {
+     IncCounter(patCounter, pmt[Index]);
+     return pmt[Index++];
+     }
+  return NULL;
+}
+
+// --- cPatPmtParser ---------------------------------------------------------
+
+cPatPmtParser::cPatPmtParser(void)
+{
+  pmtSize = 0;
+  pmtPid = -1;
+  vpid = vtype = 0;
+}
+
+void cPatPmtParser::ParsePat(const uchar *Data, int Length)
+{
+  // The PAT is always assumed to fit into a single TS packet
+  SI::PAT Pat(Data, false);
+  if (Pat.CheckCRCAndParse()) {
+     dbgpatpmt("PAT: TSid = %d, c/n = %d, v = %d, s = %d, ls = %d\n", Pat.getTransportStreamId(), Pat.getCurrentNextIndicator(), Pat.getVersionNumber(), Pat.getSectionNumber(), Pat.getLastSectionNumber());
+     SI::PAT::Association assoc;
+     for (SI::Loop::Iterator it; Pat.associationLoop.getNext(assoc, it); ) {
+         dbgpatpmt("     isNITPid = %d\n", assoc.isNITPid());
+         if (!assoc.isNITPid()) {
+            pmtPid = assoc.getPid();
+            dbgpatpmt("     service id = %d, pid = %d\n", assoc.getServiceId(), assoc.getPid());
+            }
+         }
+     }
+  else
+     esyslog("ERROR: can't parse PAT");
+}
+
+void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+{
+  // The PMT may extend over several TS packets, so we need to assemble them
+  if (pmtSize == 0) {
+     // this is the first packet
+     if (SectionLength(Data, Length) > Length) {
+        if (Length <= int(sizeof(pmt))) {
+           memcpy(pmt, Data, Length);
+           pmtSize = Length;
+           }
+        else
+           esyslog("ERROR: PMT packet length too big (%d byte)!", Length);
+        return;
+        }
+     // the packet contains the entire PMT section, so we run into the actual parsing
+     }
+  else {
+     // this is a following packet, so we add it to the pmt storage
+     if (Length <= int(sizeof(pmt)) - pmtSize) {
+        memcpy(pmt + pmtSize, Data, Length);
+        pmtSize += Length;
+        }
+     else {
+        esyslog("ERROR: PMT section length too big (%d byte)!", pmtSize + Length);
+        pmtSize = 0;
+        }
+     if (SectionLength(pmt, pmtSize) > pmtSize)
+        return; // more packets to come
+     // the PMT section is now complete, so we run into the actual parsing
+     Data = pmt;
+     }
+  SI::PMT Pmt(Data, false);
+  if (Pmt.CheckCRCAndParse()) {
+     dbgpatpmt("PMT: sid = %d, c/n = %d, v = %d, s = %d, ls = %d\n", Pmt.getServiceId(), Pmt.getCurrentNextIndicator(), Pmt.getVersionNumber(), Pmt.getSectionNumber(), Pmt.getLastSectionNumber());
+     dbgpatpmt("     pcr = %d\n", Pmt.getPCRPid());
+     cDevice::PrimaryDevice()->ClrAvailableTracks(false, true);
+     int NumApids = 0;
+     int NumDpids = 0;
+     int NumSpids = 0;
+     SI::PMT::Stream stream;
+     for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
+         dbgpatpmt("     stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
+         switch (stream.getStreamType()) {
+           case 0x02: // STREAMTYPE_13818_VIDEO
+           case 0x1B: // MPEG4
+                      vpid = stream.getPid();
+                      vtype = stream.getStreamType();
+                      break;
+           case 0x04: // STREAMTYPE_13818_AUDIO
+                      {
+                      if (NumApids < MAXAPIDS) {
+                         char ALangs[MAXLANGCODE2] = "";
+                         SI::Descriptor *d;
+                         for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                             switch (d->getDescriptorTag()) {
+                               case SI::ISO639LanguageDescriptorTag: {
+                                    SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                    SI::ISO639LanguageDescriptor::Language l;
+                                    char *s = ALangs;
+                                    int n = 0;
+                                    for (SI::Loop::Iterator it; ld->languageLoop.getNext(l, it); ) {
+                                        if (*ld->languageCode != '-') { // some use "---" to indicate "none"
+                                           dbgpatpmt(" '%s'", l.languageCode);
+                                           if (n > 0)
+                                              *s++ = '+';
+                                           strn0cpy(s, I18nNormalizeLanguageCode(l.languageCode), MAXLANGCODE1);
+                                           s += strlen(s);
+                                           if (n++ > 1)
+                                              break;
+                                           }
+                                        }
+                                    }
+                                    break;
+                               default: ;
+                               }
+                             delete d;
+                             }
+                         cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, NumApids, stream.getPid(), ALangs);
+                         NumApids++;
+                         }
+                      }
+                      break;
+           case 0x06: // STREAMTYPE_13818_PES_PRIVATE
+                      {
+                      int dpid = 0;
+                      char lang[MAXLANGCODE1] = "";
+                      SI::Descriptor *d;
+                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                          switch (d->getDescriptorTag()) {
+                            case SI::AC3DescriptorTag:
+                                 dbgpatpmt(" AC3");
+                                 dpid = stream.getPid();
+                                 break;
+                            case SI::SubtitlingDescriptorTag:
+                                 dbgpatpmt(" subtitling");
+                                 if (NumSpids < MAXSPIDS) {
+                                    SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
+                                    SI::SubtitlingDescriptor::Subtitling sub;
+                                    char SLangs[MAXLANGCODE2] = "";
+                                    char *s = SLangs;
+                                    int n = 0;
+                                    for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
+                                        if (sub.languageCode[0]) {
+                                           dbgpatpmt(" '%s'", sub.languageCode);
+                                           if (n > 0)
+                                              *s++ = '+';
+                                           strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
+                                           s += strlen(s);
+                                           if (n++ > 1)
+                                              break;
+                                           }
+                                        }
+                                    cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, stream.getPid(), SLangs);
+                                    NumSpids++;
+                                    }
+                                 break;
+                            case SI::ISO639LanguageDescriptorTag: {
+                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                 dbgpatpmt(" '%s'", ld->languageCode);
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                 }
+                                 break;
+                            default: ;
+                            }
+                          delete d;
+                          }
+                      if (dpid) {
+                         if (NumDpids < MAXDPIDS) {
+                            cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
+                            NumDpids++;
+                            }
+                         }
+                      }
+                      break;
+           }
+         dbgpatpmt("\n");
+         cDevice::PrimaryDevice()->EnsureAudioTrack(true);
+         cDevice::PrimaryDevice()->EnsureSubtitleTrack();
+         }
+     }
+  else
+     esyslog("ERROR: can't parse PMT");
+  pmtSize = 0;
+}
+
+// --- cTsToPes --------------------------------------------------------------
+
+cTsToPes::cTsToPes(void)
+{
+  data = NULL;
+  size = length = 0;
+  synced = false;
+}
+
+cTsToPes::~cTsToPes()
+{
+  free(data);
+}
+
+void cTsToPes::PutTs(const uchar *Data, int Length)
+{
+  if (TsPayloadStart(Data))
+     Reset();
+  else if (!size)
+     return; // skip everything before the first payload start
+  Length = TsGetPayload(&Data);
+  if (length + Length > size) {
+     size = max(KILOBYTE(2), length + Length);
+     data = (uchar *)realloc(data, size);
+     }
+  memcpy(data + length, Data, Length);
+  length += Length;
+}
+
+const uchar *cTsToPes::GetPes(int &Length)
+{
+  if (PesLongEnough(length)) {
+     Length = PesLength(data);
+     if (Length <= length) {
+        Length = length; // in case the PES packet has no explicit length, as is the case for video PES
+        return data;
+        }
+     }
+  return NULL;
+}
+
+void cTsToPes::Reset(void)
+{
+  length = 0;
+}
+
+// --- Some helper functions for debugging -----------------------------------
+
+void BlockDump(const char *Name, const u_char *Data, int Length)
+{
+  printf("--- %s\n", Name);
+  for (int i = 0; i < Length; i++) {
+      if (i && (i % 16) == 0)
+         printf("\n");
+      printf(" %02X", Data[i]);
+      }
+  printf("\n");
+}
+
+void TsDump(const char *Name, const u_char *Data, int Length)
+{
+  printf("%s: %04X", Name, Length);
+  int n = min(Length, 20);
+  for (int i = 0; i < n; i++)
+      printf(" %02X", Data[i]);
+  if (n < Length) {
+     printf(" ...");
+     n = max(n, Length - 10);
+     for (n = max(n, Length - 10); n < Length; n++)
+         printf(" %02X", Data[n]);
+     }
+  printf("\n");
+}
+
+void PesDump(const char *Name, const u_char *Data, int Length)
+{
+  TsDump(Name, Data, Length);
+}
diff --git a/remux.h b/remux.h
index d996957bc..fe792ebf7 100644
--- a/remux.h
+++ b/remux.h
@@ -4,14 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.0 2007/09/02 10:19:06 kls Exp $
+ * $Id: remux.h 2.2 2008/09/06 14:48:28 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
-#include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
-#include <linux/dvb/dmx.h>
+#include "channels.h"
 #include "ringbuffer.h"
 #include "tools.h"
 
@@ -81,4 +80,192 @@ class cRemux {
   static int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
   };
 
+// Some TS handling tools.
+// The following functions all take a pointer to one complete TS packet.
+
+#define TS_SYNC_BYTE          0x47
+#define TS_SIZE               188
+#define TS_ADAPT_FIELD_EXISTS 0x20
+#define TS_PAYLOAD_EXISTS     0x10
+#define TS_CONT_CNT_MASK      0x0F
+#define TS_PAYLOAD_START      0x40
+#define TS_ERROR              0x80
+#define TS_PID_MASK_HI        0x1F
+
+inline int TsHasPayload(const uchar *p)
+{
+  return p[3] & TS_PAYLOAD_EXISTS;
+}
+
+inline int TsPayloadStart(const uchar *p)
+{
+  return p[1] & TS_PAYLOAD_START;
+}
+
+inline int TsError(const uchar *p)
+{
+  return p[1] & TS_ERROR;
+}
+
+inline int TsPid(const uchar *p)
+{
+  return (p[1] & TS_PID_MASK_HI) * 256 + p[2];
+}
+
+inline int TsPayloadOffset(const uchar *p)
+{
+  return (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
+}
+
+inline int TsGetPayload(const uchar **p)
+{
+  int o = TsPayloadOffset(*p);
+  *p += o;
+  return TS_SIZE - o;
+}
+
+inline int TsContinuityCounter(const uchar *p)
+{
+  return p[3] & TS_CONT_CNT_MASK;
+}
+
+// Some PES handling tools:
+// The following functions that take a pointer to PES data all assume that
+// there is enough data so that PesLongEnough() returns true.
+
+inline bool PesLongEnough(int Length)
+{
+  return Length >= 6;
+}
+
+inline int PesLength(const uchar *p)
+{
+  return 6 + p[4] * 256 + p[5];
+}
+
+inline int PesPayloadOffset(const uchar *p)
+{
+  return 9 + p[8];
+}
+
+inline int64_t PesGetPts(const uchar *p)
+{
+  if ((p[7] & 0x80) && p[8] >= 5) {
+     return ((((int64_t)p[ 9]) & 0x0E) << 29) |
+            (( (int64_t)p[10])         << 22) |
+            ((((int64_t)p[11]) & 0xFE) << 14) |
+            (( (int64_t)p[12])         <<  7) |
+            ((((int64_t)p[13]) & 0xFE) >>  1);
+     }
+  return 0;
+}
+
+// PAT/PMT Generator:
+
+#define MAX_SECTION_SIZE 4096 // maximum size of an SI section
+#define MAX_PMT_TS  (MAX_SECTION_SIZE / TS_SIZE + 1)
+
+class cPatPmtGenerator {
+private:
+  uchar pat[TS_SIZE]; // the PAT always fits into a single TS packet
+  uchar pmt[MAX_PMT_TS][TS_SIZE]; // the PMT may well extend over several TS packets
+  int numPmtPackets;
+  int patCounter;
+  int pmtCounter;
+  int patVersion;
+  int pmtVersion;
+  uchar *esInfoLength;
+  void IncCounter(int &Counter, uchar *TsPacket);
+  void IncVersion(int &Version);
+  void IncEsInfoLength(int Length);
+protected:
+  int MakeStream(uchar *Target, uchar Type, int Pid);
+  int MakeAC3Descriptor(uchar *Target);
+  int MakeSubtitlingDescriptor(uchar *Target, const char *Language);
+  int MakeLanguageDescriptor(uchar *Target, const char *Language);
+  int MakeCRC(uchar *Target, const uchar *Data, int Length);
+public:
+  cPatPmtGenerator(void);
+  void GeneratePat(void);
+       ///< Generates a PAT section for later use with GetPat().
+       ///< This function is called by default from the constructor.
+  void GeneratePmt(tChannelID ChannelID);
+       ///< Generates a PMT section for the given ChannelId, for later use
+       ///< with GetPmt().
+  uchar *GetPat(void);
+       ///< Returns a pointer to the PAT section, which consist of exactly
+       ///< one TS packet.
+  uchar *GetPmt(int &Index);
+       ///< Returns a pointer to the Index'th TS packet of the PMT section.
+       ///< Index must be initialized to 0 and will be incremented by each
+       ///< call to GetPmt(). Returns NULL is all packets of the PMT section
+       ///< have been fetched..
+  };
+
+// PAT/PMT Parser:
+
+class cPatPmtParser {
+private:
+  uchar pmt[MAX_SECTION_SIZE];
+  int pmtSize;
+  int pmtPid;
+  int vpid;
+  int vtype;
+protected:
+  int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
+public:
+  cPatPmtParser(void);
+  void ParsePat(const uchar *Data, int Length);
+       ///< Parses the given PAT Data, which is the payload of a single TS packet
+       ///< from the PAT stream. The PAT may consist only of a single TS packet.
+  void ParsePmt(const uchar *Data, int Length);
+       ///< Parses the given PMT Data, which is the payload of a single TS packet
+       ///< from the PMT stream. The PMT may consist of several TS packets, which
+       ///< are delivered to the parser through several subsequent calls to
+       ///< ParsePmt(). The whole PMT data will be processed once the last packet
+       ///< has been received.
+  int PmtPid(void) { return pmtPid; }
+       ///< Returns the PMT pid as defined by the current PAT.
+       ///< If no PAT has been received yet, -1 will be returned.
+  int Vpid(void) { return vpid; }
+       ///< Returns the video pid as defined by the current PMT.
+  int Vtype(void) { return vtype; }
+  };
+
+// TS to PES converter:
+// Puts together the payload of several TS packets that form one PES
+// packet.
+
+class cTsToPes {
+private:
+  uchar *data;
+  int size;
+  int length;
+  bool synced;
+public:
+  cTsToPes(void);
+  ~cTsToPes();
+  void PutTs(const uchar *Data, int Length);
+       ///< Puts the payload data of the single TS packet at Data into the converter.
+       ///< Length is always 188.
+       ///< If the given TS packet starts a new PES payload packet, the converter
+       ///< will be automatically reset. Any packets before the first one that starts
+       ///< a new PES payload packet will be ignored.
+  const uchar *GetPes(int &Length);
+       ///< Gets a pointer to the complete PES packet, or NULL if the packet
+       ///< is not complete yet. If the packet is complete, Length will contain
+       ///< the total packet length. The returned pointer is only valid until
+       ///< the next call to PutTs() or Reset(), or until this object is destroyed.
+  void Reset(void);
+       ///< Resets the converter. This needs to be called after a PES packet has
+       ///< been fetched by a call to GetPes(), and before the next call to
+       ///< PutTs().
+  };
+
+// Some helper functions for debugging:
+
+void BlockDump(const char *Name, const u_char *Data, int Length);
+void TsDump(const char *Name, const u_char *Data, int Length);
+void PesDump(const char *Name, const u_char *Data, int Length);
+
 #endif // __REMUX_H
diff --git a/sources.conf b/sources.conf
index 7cc105e40..078897f28 100644
--- a/sources.conf
+++ b/sources.conf
@@ -19,29 +19,34 @@
 
 # Europe
 
-S5E     Sirius 2/3
+S3E     Telecom 2C
+S4E     Eurobird 4
+S5E     Sirius 4
 S7E     Eutelsat W3A
+S9E     Eurobird 9
 S10E    Eutelsat W1
-S13E    Hotbird 1-3/6/7A
+S13E    Hotbird 6/7A/8
 S16E    Eutelsat W2
-S19.2E  Astra 1B/C/E/F/G/H/2C
+S19.2E  Astra F/G/H/KR/L
 S21.0E  Afristar 1
 S21.6E  Eutelsat W6
-S23.5E  Astra 1D 3A
-S26E    Arabsat 2D/2C/3A
+S23.5E  Astra 1E/3A
+S25.5E  Eurobird 2
+S26E    Badr 3/4/6
 S28.2E  Astra 2D/A/B
-S28.5E  Eurobird 1 & Astra 2A/B/D
+S28.5E  Eurobird 1 & Astra 2A/B/C/D
 S30.5E  Arabsat 2B
+S31.5E  Astra 1D/5A
 S33E    Eurobird 3 & Intelsat 802
 S36E    Eutelsat W4 & Sesat
 S38E    Paksat 1
 S39E    Hellas Sat 2
 S40E    Express AM1
-S42E    Turksat 1C/2A
+S42E    Turksat 2A/3A
 S45E    Intelsat 12
 S49E    Yamal 202
 S53E    Express AM 22
-S55E    Insat 3E & Intelsat 702
+S55E    Insat 3E 
 S56E    Bonum 1
 S57E    NSS 703
 S60E    Intelsat 904
@@ -54,10 +59,10 @@ S72E    Intelsat 4
 
 # Asia
 
-S74E    Insat 3C & Edusat
-S75E    LMI 1
+S74E    Insat 3C/4CR & Edusat
+S75E    ABS 1
 S76.5E  Telstar 10
-S78.5E  Thaicom 2/3
+S78.5E  Thaicom 2/5
 S80E    Express AM2
 S83E    Insat 2E/3B/4A
 S85.2E  Intelsat 709
@@ -65,14 +70,17 @@ S87.5E  Chinastar 1
 S88E    ST 1
 S90E    Yamal 201
 S91.5E  Measat 1
-S93.5E  Insat 3A
+S92.2E  Chinasat 9
+S93.5E  Insat 3A/4B
 S95E    NSS 6
-S96.5E  Express AM 11
+S96.5E  Express AM 33
+S98.5E  Protostar 1
 S100.5E Asiasat 2
 S103E   Express A2
+S105E   Asiastar
 S105.5E Asiasat 3S
 S107.7E Cakrawarta 1
-S108E   Telkom 1 & AAP 1
+S108E   Telkom 1 & NSS 11
 S110E   N-Sat 110 & BSAT 1A/2A
 S110.5E Sinosat 1
 S113E   Palapa C2 & Koreasat 2
@@ -81,38 +89,38 @@ S118E   Telkom 2
 S120E   Thaicom 1A
 S122.2E Asiasat 4
 S124E   JCSAT 4a
+S125E   Sinosat 3
 S128E   JCSAT 3
-S132E   N-Star A
+S132E   Vinasat 1 & JCSAT5a
 S134E   Apstar 6
-S136E   N-Star B
 S138E   Telstar 18
 S140E   Express AM 3
 S144E   Superbird C
 S146E   Agila 2
 S148E   Measat 2
 S150E   JCSAT R
-S152E   Optus B3
+S152E   Optus D2
 S154E   JCSAT 2A
 S156E   Optus C1
 S158E   Superbird A
-S160E   Optus B1
+S160E   Optus D1
 S162E   Superbird B2
-S164E   Optus A3
+S164E   Optus B3
 S166E   Intelsat 8
 S169E   Intelsat 2
-S172E   AMC 23
+S172E   GE 23
 S180E   Intelsat 701
 S177W   NSS 5
 
 # Atlantic
 
-S1W     Thor 2/3 & Intelsat 10-02
-S4W     Amos 1/2
+S1W     Thor 3/5 & Intelsat 10-02
+S4W     Amos 1/2/3
 S5W     Atlantic Bird 3
-S7W     Nilesat 101 & 102
+S7W     Nilesat 101/102 & Atlantic Bird 4
 S8W     Telecom 2D & Atlantic Bird 2
 S11W    Express A3
-S12.5W  Atlantic Bird 2
+S12.5W  Atlantic Bird 1
 S14W    Express A4
 S15W    Telstar 12
 S18W    Intelsat 901
@@ -123,9 +131,9 @@ S27.5W  Intelsat 907
 S30W    Hispasat 1C/1D
 S31.5W  Intelsat 801
 S34.5W  Intelsat 903
-S37.5W  Telstar 11 & AMC 12
+S37.5W  NSS 10
 S40.5W  NSS 806
-S43W    Intelsat 3R/6B
+S43W    Intelsat 3R/11
 S45W    Intelsat 1R
 S50W    Intelsat 705
 S53W    Intelsat 707
@@ -137,47 +145,45 @@ S61W    Amazonas
 
 S61.5W  Echostar 3 & Rainbow 1
 S63W    Estrelo de Sul 1
-S65W    Brasilsat B2
-S70W    Brasilsat B1
+S65W    Star One C1
+S70W    Star One C2
 S72W    Nahuel 1 & AMC 6
-S72.5W  DirecTV 1
-S74W    SBS 6
-S77W    Echostar 4
+S72.5W  DirecTV 1R & Echostar 6
+S74W    Horizons 2
+S77W    Echostar 4 & Galaxy 4R
 S79W    AMC5
-S79.5W  Nimiq 3
 S82W    Nimiq 2
 S83W    AMC 9
-S84W    Brasilsat B3
-S85W    AMC 2
+S84W    Brasilsat B3/4
+S85W    AMC 16
 S85.1W  XM 3
 S87W    AMC3
 S89W    Galaxy 28
-S91W    Galaxy 11 & Nimiq 1
-S91.5W  DirecTV 2
-S92W    Brasilsat B4
+S91W    Galaxy 11/17 & Nimiq 1
+S92W    Brasilsat B2
 S93W    Galaxy 26
 S95W    Galaxy 3C
 S97W    Galaxy 25
-S99W    Galaxy 4R
-S99.2W  Spaceway 2
-S101W   DirecTV 1R/4S/8 & AMC4
+S99W    Galaxy 16
+S99.2W  Spaceway 2 & DirecTV 11
+S101W   DirecTV 4S/8 & AMC 2/4
 S103W   AMC1
-S105W   AMC15
+S105W   AMC15/18
 S107.3W Anik F1/F1R
-S110W   DirecTV 5 & Echostar 6/8/10
+S110W   DirecTV 5 & Echostar 8/10
 S111.1W Anik F2
-S113W   Solidaridad 2
-S119W   Echostar 7 & DirecTV 7S
+S113W   SatMex 6
+S116.8W SatMex 5
+S119W   Anik F3 & Echostar 7 & DirecTV 7S
 S121W   Echostar 9 & Galaxy 23
-S123W   Galaxy 10R
+S123W   Galaxy 18
 S125W   Galaxy 14
 S127W   Galaxy 13/Horizons 1
 S129W   Echostar 5 & Galaxy 27
 S131W   AMC 11
-S133W   Galaxy15/1R
+S133W   Galaxy15
 S135W   AMC 10
 S137W   AMC 7
-S138.5W Echostar 10
 S139W   AMC 8
 S148W   Echostar 1/2
 
diff --git a/svdrp.c b/svdrp.c
index b69485e1b..a9d09f3ce 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.0 2008/02/17 13:36:01 kls Exp $
+ * $Id: svdrp.c 2.1 2008/05/02 14:15:38 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1606,7 +1606,7 @@ bool cSVDRP::Process(void)
         char buffer[BUFSIZ];
         gethostname(buffer, sizeof(buffer));
         time_t now = time(NULL);
-        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, *TimeToString(now));
+        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", buffer, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8");
         }
      if (NewConnection)
         lastActivity = time(NULL);
diff --git a/thread.c b/thread.c
index 0c3b4f5be..f7e365e86 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.1 2008/04/13 11:53:56 kls Exp $
+ * $Id: thread.c 2.2 2008/09/06 09:39:43 kls Exp $
  */
 
 #include "thread.h"
@@ -25,11 +25,12 @@ static bool GetAbsTime(struct timespec *Abstime, int MillisecondsFromNow)
 {
   struct timeval now;
   if (gettimeofday(&now, NULL) == 0) {           // get current time
-     now.tv_usec += MillisecondsFromNow * 1000;  // add the timeout
-     while (now.tv_usec >= 1000000) {            // take care of an overflow
-           now.tv_sec++;
-           now.tv_usec -= 1000000;
-           }
+     now.tv_sec  += MillisecondsFromNow / 1000;  // add full seconds
+     now.tv_usec += (MillisecondsFromNow % 1000) * 1000;  // add microseconds
+     if (now.tv_usec >= 1000000) {               // take care of an overflow
+        now.tv_sec++;
+        now.tv_usec -= 1000000;
+        }
      Abstime->tv_sec = now.tv_sec;          // seconds
      Abstime->tv_nsec = now.tv_usec * 1000; // nano seconds
      return true;
diff --git a/tools.h b/tools.h
index dd9884098..e660967b7 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.0 2008/02/17 13:41:27 kls Exp $
+ * $Id: tools.h 2.1 2008/05/22 10:26:57 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -136,7 +136,7 @@ class cCharSetConv {
      ///< If ToCode is NULL, "UTF-8" is used.
   ~cCharSetConv();
   const char *Convert(const char *From, char *To = NULL, size_t ToLength = 0);
-     ///< Converts the given Text from FromCode to ToCode (as set in the cosntructor).
+     ///< Converts the given Text from FromCode to ToCode (as set in the constructor).
      ///< If To is given, it is used to copy at most ToLength bytes of the result
      ///< (including the terminating 0) into that buffer. If To is not given,
      ///< the result is copied into a dynamically allocated buffer and is valid as
diff --git a/transfer.c b/transfer.c
index 04d88a155..9a6aee3d5 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,109 +4,52 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.0 2007/01/05 10:45:28 kls Exp $
+ * $Id: transfer.c 2.1 2008/08/15 14:32:12 kls Exp $
  */
 
 #include "transfer.h"
 
-#define TRANSFERBUFSIZE  MEGABYTE(2)
-#define POLLTIMEOUTS_BEFORE_DEVICECLEAR 6
-
 // --- cTransfer -------------------------------------------------------------
 
 cTransfer::cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids)
 :cReceiver(ChannelID, -1, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
-,cThread("transfer")
 {
-  ringBuffer = new cRingBufferLinear(TRANSFERBUFSIZE, TS_SIZE * 2, true, "Transfer");
-  remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids);
+  patPmtGenerator.GeneratePmt(ChannelID);
 }
 
 cTransfer::~cTransfer()
 {
   cReceiver::Detach();
   cPlayer::Detach();
-  delete remux;
-  delete ringBuffer;
 }
 
 void cTransfer::Activate(bool On)
 {
-  if (On)
-     Start();
-  else {
-     Cancel(3);
-     cPlayer::Detach();
+  if (On) {
+     PlayTs(patPmtGenerator.GetPat(), TS_SIZE);
+     int Index = 0;
+     while (uchar *pmt = patPmtGenerator.GetPmt(Index))
+           PlayTs(pmt, TS_SIZE);
      }
 }
 
 void cTransfer::Receive(uchar *Data, int Length)
 {
-  if (cPlayer::IsAttached() && Running()) {
-     int p = ringBuffer->Put(Data, Length);
-     if (p != Length && Running())
-        ringBuffer->ReportOverflow(Length - p);
+  if (cPlayer::IsAttached()) {
+     // Transfer Mode means "live tv", so there's no point in doing any additional
+     // buffering here. The TS packets *must* get through here! However, every
+     // now and then there may be conditions where the packet just can't be
+     // handled when offered the first time, so that's why we try several times:
+     for (int i = 0; i < 100; i++) {
+         if (PlayTs(Data, Length) > 0)
+            return;
+         fprintf(stderr, "-");//XXX just for testing - remove when stable
+         cCondWait::SleepMs(10);
+         }
+     esyslog("ERROR: TS packet not accepted in Transfer Mode");
      }
 }
 
-void cTransfer::Action(void)
-{
-  int PollTimeouts = 0;
-  uchar *p = NULL;
-  int Result = 0;
-  while (Running()) {
-        int Count;
-        uchar *b = ringBuffer->Get(Count);
-        if (b) {
-           if (ringBuffer->Available() > TRANSFERBUFSIZE * 9 / 10) {
-              // If the buffer runs full, we have no chance of ever catching up
-              // since the data comes in at the same rate as it goes out (it's "live").
-              // So let's clear the buffer instead of suffering from permanent
-              // overflows.
-              dsyslog("clearing transfer buffer to avoid overflows");
-              DeviceClear();
-              ringBuffer->Clear();
-              remux->Clear();
-              PlayPes(NULL, 0);
-              p = NULL;
-              continue;
-              }
-           Count = remux->Put(b, Count);
-           if (Count)
-              ringBuffer->Del(Count);
-           }
-        if (!p)
-           p = remux->Get(Result);
-        if (p) {
-           cPoller Poller;
-           if (DevicePoll(Poller, 100)) {
-              PollTimeouts = 0;
-              int w = PlayPes(p, Result);
-              if (w > 0) {
-                 p += w;
-                 Result -= w;
-                 remux->Del(w);
-                 if (Result <= 0)
-                    p = NULL;
-                 }
-              else if (w < 0 && FATALERRNO)
-                 LOG_ERROR;
-              }
-           else {
-              PollTimeouts++;
-              if (PollTimeouts == POLLTIMEOUTS_BEFORE_DEVICECLEAR) {
-                 dsyslog("clearing device because of consecutive poll timeouts");
-                 DeviceClear();
-                 ringBuffer->Clear();
-                 remux->Clear();
-                 PlayPes(NULL, 0);
-                 p = NULL;
-                 }
-              }
-           }
-        }
-}
-
 // --- cTransferControl ------------------------------------------------------
 
 cDevice *cTransferControl::receiverDevice = NULL;
diff --git a/transfer.h b/transfer.h
index dd6d40404..be75fde69 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 2.0 2007/01/05 10:45:45 kls Exp $
+ * $Id: transfer.h 2.1 2008/05/25 12:44:49 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -13,17 +13,13 @@
 #include "player.h"
 #include "receiver.h"
 #include "remux.h"
-#include "ringbuffer.h"
-#include "thread.h"
 
-class cTransfer : public cReceiver, public cPlayer, public cThread {
+class cTransfer : public cReceiver, public cPlayer {
 private:
-  cRingBufferLinear *ringBuffer;
-  cRemux *remux;
+  cPatPmtGenerator patPmtGenerator;
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
-  virtual void Action(void);
 public:
   cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids);
   virtual ~cTransfer();
diff --git a/vdr.5 b/vdr.5
index 6f35e86a2..ee8fe617a 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.1 2008/04/12 10:46:32 kls Exp $
+.\" $Id: vdr.5 2.4 2008/07/06 13:00:19 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -95,6 +95,7 @@ l l.
 \fBO\fR@rollOff (0, 20, 25, 35)
 \fBP\fR@Priority (0, 1)
 \fBR\fR@Right circular polarization
+\fBS\fR@delivery System (0, 1)
 \fBT\fR@Transmission mode (2, 4, 8)
 \fBV\fR@Vertical polarization
 \fBY\fR@hierarchY (0, 1)
@@ -125,7 +126,13 @@ The symbol rate of this channel (DVB-S and DVB-C only).
 The video PID (set to '0' for radio channels).
 If this channel uses a separate PCR PID, it follows the VPID, separated by a
 plus sign, as in
+
 .B ...:164+17:...
+
+If this channel has a video mode other than 0, the mode
+follows the pids, separated by an '=' sign, as in
+
+.B ...:164+17=27:...
 .TP
 .B APID
 The audio PID (either one number, or several, separated by commas).
@@ -652,7 +659,7 @@ l l.
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
-<stream>       @is the stream content (1 = video, 2 = audio, 3 = subtitles)
+<stream>       @is the stream content (1 = video, 2 = audio, 3 = subtitles, 4 = AC3)
 <type>         @is the stream type according to ETSI EN 300 468
 <language>     @is the three letter language code (optionally two codes, separated by '+')
 <descr>        @is the description of this stream component
diff --git a/vdr.c b/vdr.c
index aafb0e654..fa36b8817 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 2.0 2008/03/14 13:22:39 kls Exp $
+ * $Id: vdr.c 2.3 2008/09/06 14:08:44 kls Exp $
  */
 
 #include <getopt.h>
@@ -141,7 +141,6 @@ static bool SetKeepCaps(bool On)
 
 static void SignalHandler(int signum)
 {
-  isyslog("caught signal %d", signum);
   switch (signum) {
     case SIGPIPE:
          break;
@@ -210,9 +209,6 @@ int main(int argc, char *argv[])
 #elif defined(REMOTE_RCU)
   RcuDevice = RCU_DEVICE;
 #endif
-#if defined(VFAT)
-  VfatFileSystem = true;
-#endif
 #if defined(VDR_USER)
   VdrUser = VDR_USER;
 #endif
@@ -563,17 +559,15 @@ int main(int argc, char *argv[])
   cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
 
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
-  if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
-        Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC) &&
-        Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
-        Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
-        Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&
-        RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true) &&
-        SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true) &&
-        Keys.Load(AddDirectory(ConfigDirectory, "remote.conf")) &&
-        KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true)
-        ))
-     EXIT(2);
+  Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true);
+  Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC);
+  Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true);
+  Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
+  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true);
+  RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true);
+  SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
+  Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
+  KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
 
   if (!*cFont::GetFontFileName(Setup.FontOsd)) {
      const char *msg = "no fonts available - OSD will not show any text!";
@@ -1288,9 +1282,11 @@ int main(int argc, char *argv[])
   ReportEpgBugFixStats();
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
-  isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode());
+  if (LastSignal)
+     isyslog("caught signal %d", LastSignal);
   if (ShutdownHandler.EmergencyExitRequested())
      esyslog("emergency exit!");
+  isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode());
   if (SysLogLevel > 0)
      closelog();
   if (HasStdin)

From 1834751c4510edb66c96d0b741def5922738e74c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Dec 2008 16:54:12 +0100
Subject: [PATCH 188/307] Version 1.7.2 - Added a note about 'Id' being
 obsolete to the description of cDevice::PlayAudio(). - Switched to the new
 S2API driver API, which was decided to become the official   DVB API in the
 kernel (based on patches from Igor M. Liplianin, Niels Wagenaar   and Edgar
 Hucek). VDR now uses the S2API driver from http://linuxtv.org/hg/v4l-dvb.  
 In order to correctly detect DVB-S2 capable devices, you need to apply the
 patch   from
 ftp://ftp.cadsoft.de/vdr/Developer/v4l-dvb-s2api-add-s2-capability.diff to  
 the driver source, because the S2API doesn't provide a way of telling whether
 a   device can handle DVB-S2 transponders. - The cDvbTuner::IsTunedTo()
 function now also checks the symbol rate in case of   DVB-S and DVB-C. -
 Improved handling PES video packets with zero length when converting from TS
 to PES.   For good replay in Transfer Mode on full featured DVB cards you may
 want to apply   the patch from
 ftp://ftp.cadsoft.de/vdr/Developer/av7110_v4ldvb_api5_audiobuf_test_1.diff  
 to the driver (thanks to Oliver Endriss).

---
 CONTRIBUTORS            |  11 +++
 HISTORY                 |  17 ++++
 PLUGINS/src/sky/HISTORY |   8 +-
 PLUGINS/src/sky/sky.c   |   8 +-
 channels.c              | 171 +++++++++++++++--------------------
 channels.h              |  10 +--
 config.h                |   6 +-
 device.c                |  16 ++--
 device.h                |   5 +-
 dvbdevice.c             | 191 +++++++++++++++++++++++++---------------
 dvbdevice.h             |   9 +-
 menu.c                  |   4 +-
 menuitems.c             |   6 +-
 nit.c                   |  37 ++++----
 po/ca_ES.po             |  23 ++---
 po/cs_CZ.po             |  23 ++---
 po/da_DK.po             |  23 ++---
 po/de_DE.po             |  23 ++---
 po/el_GR.po             |  23 ++---
 po/es_ES.po             |  23 ++---
 po/et_EE.po             |  23 ++---
 po/fi_FI.po             |  23 ++---
 po/fr_FR.po             |  23 ++---
 po/hr_HR.po             |  23 ++---
 po/hu_HU.po             |  23 ++---
 po/it_IT.po             |  23 ++---
 po/nl_NL.po             |  23 ++---
 po/nn_NO.po             |  21 ++---
 po/pl_PL.po             |  23 ++---
 po/pt_PT.po             |  23 ++---
 po/ro_RO.po             |  23 ++---
 po/ru_RU.po             |  23 ++---
 po/sl_SI.po             |  23 ++---
 po/sv_SE.po             |  23 ++---
 po/tr_TR.po             |  23 ++---
 po/uk_UA.po             |  23 ++---
 po/zh_CN.po             |  23 ++---
 remux.c                 |  37 ++++++--
 remux.h                 |   8 +-
 vdr.5                   |  16 ++--
 40 files changed, 473 insertions(+), 614 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index acab6b220..ea2127342 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -656,6 +656,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for making VDR no longer stop removing empty directories if an error occurs
  for reporting a bug in handling relative volume settings that unmute the audio in
  the call to cStatus::MsgSetVolume()
+ for providing a driver patch that allows replaying TS->PES converted video in
+ Transfer Mode
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -2375,3 +2377,12 @@ Michael Nork <mnork0@gmx.net>
 
 Winfried K�hler <w_koehl@gmx.de>
  for fixing wrong value for TableIdBAT in libsi/si.h
+
+Igor M. Liplianin <liplianin@tut.by>
+ for a patch that was used to convert VDR to the S2API driver API
+
+Niels Wagenaar <n.wagenaar@xs4all.nl>
+ for a patch that was used to convert VDR to the S2API driver API
+
+Edgar Hucek <gimli@dark-green.com>
+ for a patch that was used to convert VDR to the S2API driver API
diff --git a/HISTORY b/HISTORY
index 0994e1b09..239e00bc8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5831,3 +5831,20 @@ Video Disk Recorder Revision History
 - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried K�hler).
 - Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
   (reported by Tobias Grimm).
+
+2008-12-14: Version 1.7.2
+
+- Added a note about 'Id' being obsolete to the description of cDevice::PlayAudio().
+- Switched to the new S2API driver API, which was decided to become the official
+  DVB API in the kernel (based on patches from Igor M. Liplianin, Niels Wagenaar
+  and Edgar Hucek). VDR now uses the S2API driver from http://linuxtv.org/hg/v4l-dvb.
+  In order to correctly detect DVB-S2 capable devices, you need to apply the patch
+  from ftp://ftp.cadsoft.de/vdr/Developer/v4l-dvb-s2api-add-s2-capability.diff to
+  the driver source, because the S2API doesn't provide a way of telling whether a
+  device can handle DVB-S2 transponders.
+- The cDvbTuner::IsTunedTo() function now also checks the symbol rate in case of
+  DVB-S and DVB-C.
+- Improved handling PES video packets with zero length when converting from TS to PES.
+  For good replay in Transfer Mode on full featured DVB cards you may want to apply
+  the patch from ftp://ftp.cadsoft.de/vdr/Developer/av7110_v4ldvb_api5_audiobuf_test_1.diff
+  to the driver (thanks to Oliver Endriss).
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index b39b65d9e..25b8fc873 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -55,12 +55,16 @@ VDR Plugin 'sky' Revision History
   as a query string.
 - The getskyepg.pl script now replaces "&amp;" with "&".
 
-2007-08-15:Version 0.3.6
+2007-08-15: Version 0.3.6
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
 
-2008-03-22:Version 0.3.7
+2008-03-22: Version 0.3.7
 
 - Removed the full path from the 'logger' call in the getskyepg.pl script (this
   program is apparently "on the move" through the file system...).
+ 
+2008-09-07: Version 0.3.8
+
+- Fixed renamed constants (thanks to Udo Richter).
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index cb9b9c538..75bd9ec50 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 2.0 2008/03/22 10:19:32 kls Exp $
+ * $Id: sky.c 2.1 2008/09/07 11:54:07 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -15,7 +15,7 @@
 #include <vdr/plugin.h>
 #include <vdr/sources.h>
 
-static const char *VERSION        = "0.3.7";
+static const char *VERSION        = "0.3.8";
 static const char *DESCRIPTION    = "Sky Digibox interface";
 
 // --- cDigiboxDevice --------------------------------------------------------
@@ -160,12 +160,12 @@ bool cDigiboxDevice::GetTSPacket(uchar *&Data)
      Data = tsBuffer->Get();
      if (Data) {
         // insert the actual PIDs:
-        int Pid = (((uint16_t)Data[1] & PID_MASK_HI) << 8) | Data[2];
+        int Pid = (((uint16_t)Data[1] & TS_PID_MASK_HI) << 8) | Data[2];
         if (Pid == DUMMYAPID)
            Pid = apid;
         else if (Pid == DUMMYVPID)
            Pid = vpid;
-        Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~PID_MASK_HI);
+        Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~TS_PID_MASK_HI);
         Data[2] = Pid & 0xFF;
         }
      return true;
diff --git a/channels.c b/channels.c
index 134c19e02..b4fea76ba 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.3 2008/07/06 12:59:41 kls Exp $
+ * $Id: channels.c 2.4 2008/12/13 11:42:15 kls Exp $
  */
 
 #include "channels.h"
@@ -21,114 +21,86 @@
 // --- Channel Parameter Maps ------------------------------------------------
 
 const tChannelParameterMap InversionValues[] = {
-  {   0, DVBFE_INVERSION_OFF, trNOOP("off") },
-  {   1, DVBFE_INVERSION_ON,  trNOOP("on") },
-  { 999, DVBFE_INVERSION_AUTO },
+  {   0, INVERSION_OFF,  trNOOP("off") },
+  {   1, INVERSION_ON,   trNOOP("on") },
+  { 999, INVERSION_AUTO, trNOOP("auto") },
   { -1 }
   };
 
 const tChannelParameterMap BandwidthValues[] = {
-  {   5, DVBFE_BANDWIDTH_5_MHZ, "5 MHz" },
-  {   6, DVBFE_BANDWIDTH_6_MHZ, "6 MHz" },
-  {   7, DVBFE_BANDWIDTH_7_MHZ, "7 MHz" },
-  {   8, DVBFE_BANDWIDTH_8_MHZ, "8 MHz" },
-  { 999, DVBFE_BANDWIDTH_AUTO },
+  {   6, 6000000, "6 MHz" },
+  {   7, 7000000, "7 MHz" },
+  {   8, 8000000, "8 MHz" },
   { -1 }
   };
 
 const tChannelParameterMap CoderateValues[] = {
-  {   0, DVBFE_FEC_NONE, trNOOP("none") },
-  {  12, DVBFE_FEC_1_2,  "1/2" },
-  {  13, DVBFE_FEC_1_3,  "1/3" },
-  {  14, DVBFE_FEC_1_4,  "1/4" },
-  {  23, DVBFE_FEC_2_3,  "2/3" },
-  {  25, DVBFE_FEC_2_5,  "2/5" },
-  {  34, DVBFE_FEC_3_4,  "3/4" },
-  {  35, DVBFE_FEC_3_5,  "3/5" },
-  {  45, DVBFE_FEC_4_5,  "4/5" },
-  {  56, DVBFE_FEC_5_6,  "5/6" },
-  {  67, DVBFE_FEC_6_7,  "6/7" },
-  {  78, DVBFE_FEC_7_8,  "7/8" },
-  {  89, DVBFE_FEC_8_9,  "8/9" },
-  { 910, DVBFE_FEC_9_10, "9/10" },
-  { 999, DVBFE_FEC_AUTO },
+  {   0, FEC_NONE, trNOOP("none") },
+  {  12, FEC_1_2,  "1/2" },
+  {  23, FEC_2_3,  "2/3" },
+  {  34, FEC_3_4,  "3/4" },
+  {  35, FEC_3_5,  "3/5" },
+  {  45, FEC_4_5,  "4/5" },
+  {  56, FEC_5_6,  "5/6" },
+  {  67, FEC_6_7,  "6/7" },
+  {  78, FEC_7_8,  "7/8" },
+  {  89, FEC_8_9,  "8/9" },
+  { 910, FEC_9_10, "9/10" },
+  { 999, FEC_AUTO, trNOOP("auto") },
   { -1 }
   };
 
 const tChannelParameterMap ModulationValues[] = {
-  {   0, DVBFE_MOD_NONE,    trNOOP("none") },
-  {   4, DVBFE_MOD_QAM4,    "QAM4" },
-  {  16, DVBFE_MOD_QAM16,   "QAM16" },
-  {  32, DVBFE_MOD_QAM32,   "QAM32" },
-  {  64, DVBFE_MOD_QAM64,   "QAM64" },
-  { 128, DVBFE_MOD_QAM128,  "QAM128" },
-  { 256, DVBFE_MOD_QAM256,  "QAM256" },
-  { 512, DVBFE_MOD_QAM512,  "QAM512" },
-  {1024, DVBFE_MOD_QAM1024, "QAM1024" },
-  {   1, DVBFE_MOD_BPSK,    "BPSK" },
-  {   2, DVBFE_MOD_QPSK,    "QPSK" },
-  {   3, DVBFE_MOD_OQPSK,   "OQPSK" },
-  {   5, DVBFE_MOD_8PSK,    "8PSK" },
-  {   6, DVBFE_MOD_16APSK,  "16APSK" },
-  {   7, DVBFE_MOD_32APSK,  "32APSK" },
-  {   8, DVBFE_MOD_OFDM,    "OFDM" },
-  {   9, DVBFE_MOD_COFDM,   "COFDM" },
-  {  10, DVBFE_MOD_VSB8,    "VSB8" },
-  {  11, DVBFE_MOD_VSB16,   "VSB16" },
-  { 998, DVBFE_MOD_QAMAUTO, "QAMAUTO" },
-  { 999, DVBFE_MOD_AUTO },
+  {  16, QAM_16,   "QAM16" },
+  {  32, QAM_32,   "QAM32" },
+  {  64, QAM_64,   "QAM64" },
+  { 128, QAM_128,  "QAM128" },
+  { 256, QAM_256,  "QAM256" },
+  {   2, QPSK,     "QPSK" },
+  {   5, PSK_8,    "8PSK" },
+  {   6, APSK_16,  "16APSK" },
+  {  10, VSB_8,    "VSB8" },
+  {  11, VSB_16,   "VSB16" },
+  { 998, QAM_AUTO, "QAMAUTO" },
   { -1 }
   };
 
 const tChannelParameterMap SystemValues[] = {
-  {   0, DVBFE_DELSYS_DVBS,  "DVB-S" },
-  {   1, DVBFE_DELSYS_DVBS2, "DVB-S2" },
+  {   0, SYS_DVBS,  "DVB-S" },
+  {   1, SYS_DVBS2, "DVB-S2" },
   { -1 }
   };
 
 const tChannelParameterMap TransmissionValues[] = {
-  {   2, DVBFE_TRANSMISSION_MODE_2K, "2K" },
-  {   4, DVBFE_TRANSMISSION_MODE_4K, "4K" },
-  {   8, DVBFE_TRANSMISSION_MODE_8K, "8K" },
-  { 999, DVBFE_TRANSMISSION_MODE_AUTO },
+  {   2, TRANSMISSION_MODE_2K,   "2K" },
+  {   8, TRANSMISSION_MODE_8K,   "8K" },
+  { 999, TRANSMISSION_MODE_AUTO, trNOOP("auto") },
   { -1 }
   };
 
 const tChannelParameterMap GuardValues[] = {
-  {   4, DVBFE_GUARD_INTERVAL_1_4,  "1/4" },
-  {   8, DVBFE_GUARD_INTERVAL_1_8,  "1/8" },
-  {  16, DVBFE_GUARD_INTERVAL_1_16, "1/16" },
-  {  32, DVBFE_GUARD_INTERVAL_1_32, "1/32" },
-  { 999, DVBFE_GUARD_INTERVAL_AUTO },
+  {   4, GUARD_INTERVAL_1_4,  "1/4" },
+  {   8, GUARD_INTERVAL_1_8,  "1/8" },
+  {  16, GUARD_INTERVAL_1_16, "1/16" },
+  {  32, GUARD_INTERVAL_1_32, "1/32" },
+  { 999, GUARD_INTERVAL_AUTO, trNOOP("auto") },
   { -1 }
   };
 
 const tChannelParameterMap HierarchyValues[] = {
-  {   0, DVBFE_HIERARCHY_OFF, trNOOP("off") },
-  {   1, DVBFE_HIERARCHY_ON,  trNOOP("on") },
-  { 999, DVBFE_HIERARCHY_AUTO },
-  { -1 }
-  };
-
-const tChannelParameterMap AlphaValues[] = {
-  {   0, 0 },
-  {   1, DVBFE_ALPHA_1 },
-  {   2, DVBFE_ALPHA_2 },
-  {   4, DVBFE_ALPHA_4 },
-  { -1 }
-  };
-
-const tChannelParameterMap PriorityValues[] = {
-  {   0, DVBFE_STREAM_PRIORITY_HP, trNOOP("high") },
-  {   1, DVBFE_STREAM_PRIORITY_LP, trNOOP("low") },
+  {   0, HIERARCHY_NONE, trNOOP("none") },
+  {   1, HIERARCHY_1,    "1" },
+  {   2, HIERARCHY_2,    "2" },
+  {   4, HIERARCHY_4,    "4" },
+  { 999, HIERARCHY_AUTO, trNOOP("auto") },
   { -1 }
   };
 
 const tChannelParameterMap RollOffValues[] = {
-  {   0, DVBFE_ROLLOFF_UNKNOWN },
-  {  20, DVBFE_ROLLOFF_20, "0.20" },
-  {  25, DVBFE_ROLLOFF_25, "0.25" },
-  {  35, DVBFE_ROLLOFF_35, "0.35" },
+  {   0, ROLLOFF_AUTO, trNOOP("auto") },
+  {  20, ROLLOFF_20, "0.20" },
+  {  25, ROLLOFF_25, "0.25" },
+  {  35, ROLLOFF_35, "0.35" },
   { -1 }
   };
 
@@ -217,18 +189,16 @@ cChannel::cChannel(void)
   provider = strdup("");
   portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-  inversion    = DVBFE_INVERSION_AUTO;
-  bandwidth    = DVBFE_BANDWIDTH_AUTO;
-  coderateH    = DVBFE_FEC_AUTO;
-  coderateL    = DVBFE_FEC_AUTO;
-  modulation   = DVBFE_MOD_AUTO;
-  system       = DVBFE_DELSYS_DVBS;
-  transmission = DVBFE_TRANSMISSION_MODE_AUTO;
-  guard        = DVBFE_GUARD_INTERVAL_AUTO;
-  hierarchy    = DVBFE_HIERARCHY_AUTO;
-  alpha        = 0;
-  priority     = DVBFE_STREAM_PRIORITY_HP;
-  rollOff      = DVBFE_ROLLOFF_UNKNOWN;
+  inversion    = INVERSION_AUTO;
+  bandwidth    = 8000000;
+  coderateH    = FEC_AUTO;
+  coderateL    = FEC_AUTO;
+  modulation   = QPSK;
+  system       = SYS_DVBS;
+  transmission = TRANSMISSION_MODE_AUTO;
+  guard        = GUARD_INTERVAL_AUTO;
+  hierarchy    = HIERARCHY_AUTO;
+  rollOff      = ROLLOFF_AUTO;
   modification = CHANNELMOD_NONE;
   schedule     = NULL;
   linkChannels = NULL;
@@ -335,8 +305,6 @@ void cChannel::CopyTransponderData(const cChannel *Channel)
      transmission = Channel->transmission;
      guard        = Channel->guard;
      hierarchy    = Channel->hierarchy;
-     alpha        = Channel->alpha;
-     priority     = Channel->priority;
      rollOff      = Channel->rollOff;
      }
 }
@@ -394,9 +362,9 @@ bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation
   return true;
 }
 
-bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission, int Alpha, int Priority)
+bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission)
 {
-  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission || alpha != Alpha || priority != Priority) {
+  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
      cString OldTransponderData = TransponderDataToString();
      source = Source;
      frequency = Frequency;
@@ -407,8 +375,6 @@ bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth,
      coderateL = CoderateL;
      guard = Guard;
      transmission = Transmission;
-     alpha = Alpha;
-     priority = Priority;
      schedule = NULL;
      if (Number()) {
         dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
@@ -670,7 +636,6 @@ cString cChannel::ParametersToString(void) const
   char *q = buffer;
   *q = 0;
   ST(" S ")  q += sprintf(q, "%c", polarization);
-  ST("  T")  q += PrintParameter(q, 'A', MapToUser(alpha, AlphaValues));
   ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
   ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
   ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
@@ -678,7 +643,6 @@ cString cChannel::ParametersToString(void) const
   ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
   ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
   ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST("  T")  q += PrintParameter(q, 'P', MapToUser(priority, PriorityValues));
   ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
   ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
@@ -701,11 +665,18 @@ static const char *ParseParameter(const char *s, int &Value, const tChannelParam
   return NULL;
 }
 
+static const char *SkipDigits(const char *s)
+{
+  while (*++s && isdigit(*s))
+        ;
+  return s;
+}
+
 bool cChannel::StringToParameters(const char *s)
 {
   while (s && *s) {
         switch (toupper(*s)) {
-          case 'A': s = ParseParameter(s, alpha, AlphaValues); break;
+          case 'A': s = SkipDigits(s); break; // for compatibility with the "multiproto" approach - may be removed in future versions
           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
           case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
@@ -714,14 +685,14 @@ bool cChannel::StringToParameters(const char *s)
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
           case 'L': polarization = *s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
-          case 'Z':// for compatibility with the original DVB-S2 patch - may be removed in future versions
           case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
-          case 'P': s = ParseParameter(s, priority, PriorityValues); break;
+          case 'P': s = SkipDigits(s); break; // for compatibility with the "multiproto" approach - may be removed in future versions
           case 'R': polarization = *s++; break;
           case 'S': s = ParseParameter(s, system, SystemValues); break;
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = *s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
+          case 'Z': s = SkipDigits(s); break; // for compatibility with the original DVB-S2 patch - may be removed in future versions
           default: esyslog("ERROR: unknown parameter key '%c'", *s);
                    return false;
           }
diff --git a/channels.h b/channels.h
index 0bf0288b1..a3c1d433c 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.3 2008/07/06 11:49:37 kls Exp $
+ * $Id: channels.h 2.4 2008/11/22 13:35:52 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -66,8 +66,6 @@ extern const tChannelParameterMap SystemValues[];
 extern const tChannelParameterMap TransmissionValues[];
 extern const tChannelParameterMap GuardValues[];
 extern const tChannelParameterMap HierarchyValues[];
-extern const tChannelParameterMap AlphaValues[];
-extern const tChannelParameterMap PriorityValues[];
 extern const tChannelParameterMap RollOffValues[];
 
 struct tChannelID {
@@ -149,8 +147,6 @@ class cChannel : public cListObject {
   int transmission;
   int guard;
   int hierarchy;
-  int alpha;
-  int priority;
   int rollOff;
   int __EndData__;
   int modification;
@@ -209,8 +205,6 @@ class cChannel : public cListObject {
   int Transmission(void) const { return transmission; }
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
-  int Alpha(void) const { return alpha; }
-  int Priority(void) const { return priority; }
   int RollOff(void) const { return rollOff; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
@@ -223,7 +217,7 @@ class cChannel : public cListObject {
   void CopyTransponderData(const cChannel *Channel);
   bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
   bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority);
+  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
diff --git a/config.h b/config.h
index 12a4e12c8..8b672ff18 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.3 2008/09/06 14:06:56 kls Exp $
+ * $Id: config.h 2.4 2008/09/14 13:46:13 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.1"
-#define VDRVERSNUM   10701  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.2"
+#define VDRVERSNUM   10702  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/device.c b/device.c
index 06f6864c0..7d42a5eb6 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.3 2008/07/06 13:22:21 kls Exp $
+ * $Id: device.c 2.4 2008/12/13 14:30:28 kls Exp $
  */
 
 #include "device.h"
@@ -1228,13 +1228,13 @@ int cDevice::PlayTsVideo(const uchar *Data, int Length)
   // Video PES has no explicit length, so we can only determine the end of
   // a PES packet when the next TS packet that starts a payload comes in:
   if (TsPayloadStart(Data)) {
-     if (const uchar *p = tsToPesVideo.GetPes(Length)) {
-        int w = PlayVideo(p, Length);
-        if (w > 0)
-           tsToPesVideo.Reset();
-        else
-           return w;
-        }
+     int l;
+     while (const uchar *p = tsToPesVideo.GetPes(l)) {
+           int w = PlayVideo(p, l);
+           if (w < 0)
+              return w;
+           }
+     tsToPesVideo.Reset();
      }
   tsToPesVideo.PutTs(Data, Length);
   return Length;
diff --git a/device.h b/device.h
index 8924aa92a..2ce658c03 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.2 2008/07/06 11:25:42 kls Exp $
+ * $Id: device.h 2.3 2008/09/14 13:44:54 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -494,6 +494,9 @@ class cDevice : public cThread {
        ///< Plays the given data block as audio.
        ///< Data points to exactly one complete PES packet of the given Length.
        ///< Id indicates the type of audio data this packet holds.
+       ///< Note that as of version 1.7.1 Id is obsolete and may be 0 (in case of
+       ///< TS replay). Plugins that need to know this Id shall read it from the
+       ///< actual PES data (it's the 4th byte).
        ///< PlayAudio() shall process the packet either as a whole (returning
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
        ///< \return Returns the number of bytes actually taken from Data, or -1
diff --git a/dvbdevice.c b/dvbdevice.c
index 40479263b..e0b05a15d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.4 2008/07/06 13:58:56 kls Exp $
+ * $Id: dvbdevice.c 2.6 2008/12/13 14:38:07 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -27,6 +27,13 @@
 #include "status.h"
 #include "transfer.h"
 
+// FIXME: temporary workaround until the S2API driver supports detecting
+// S2 capability in a clean way. This macro allows compiling VDR with an
+// unpatched driver. However, with an unpatched driver it will not support
+// DVB-S2 hardware. If you have DVB-S2 hardware you need to either patch
+// the driver or modify the line that uses this macro in cDvbDevice::cDvbDevice().
+#define FE_CAN_2ND_GEN_MODULATION 0x10000000
+
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
 
@@ -76,7 +83,7 @@ class cDvbTuner : public cThread {
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
-  dvbfe_delsys frontendType;
+  fe_delivery_system frontendType;
   cChannel channel;
   const char *diseqcCommands;
   eTunerStatus tunerStatus;
@@ -87,14 +94,14 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType);
+  cDvbTuner(int Fd_Frontend, int CardIndex, fe_delivery_system FrontendType);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel, bool Tune);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_delivery_system FrontendType)
 {
   fd_frontend = Fd_Frontend;
   cardIndex = CardIndex;
@@ -104,7 +111,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, dvbfe_delsys FrontendType)
   lastTimeoutReport = 0;
   diseqcCommands = NULL;
   tunerStatus = tsIdle;
-  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
+  if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
   SetDescription("tuner on device %d", cardIndex + 1);
   Start();
@@ -127,7 +134,6 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   char Type = **cSource::ToString(Channel->Source());
 #define ST(s, p) if (strchr(s, Type)) if (channel.p() != Channel->p()) return false;
   // Polarization is already checked as part of the Transponder.
-  ST("  T", Alpha);
   ST("  T", Bandwidth);
   ST("CST", CoderateH);
   ST("  T", CoderateL);
@@ -135,8 +141,8 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   ST("CST", Inversion);
   ST("CST", Modulation);
   ST(" S ", RollOff);
-  ST("  T", Priority);
   ST(" S ", System);
+  ST("CS ", Srate);
   ST("  T", Transmission);
   ST("  T", Hierarchy);
   return true;
@@ -192,10 +198,27 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbTuner::SetFrontend(void)
 {
-  dvbfe_params Frontend;
+#define MAXFRONTENDCMDS 16
+#define SETCMD(c, d) { Frontend[CmdSeq.num].cmd = (c);\
+                       Frontend[CmdSeq.num].u.data = (d);\
+                       if (CmdSeq.num++ > MAXFRONTENDCMDS) {\
+                          esyslog("ERROR: too many tuning commands on frontend %d", cardIndex);\
+                          return false;\
+                          }\
+                     }
+  dtv_property Frontend[MAXFRONTENDCMDS];
   memset(&Frontend, 0, sizeof(Frontend));
+  dtv_properties CmdSeq;
+  memset(&CmdSeq, 0, sizeof(CmdSeq));
+  CmdSeq.props = Frontend;
+  SETCMD(DTV_CLEAR, 0);
+  if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
+     esyslog("ERROR: frontend %d: %m", cardIndex);
+     return false;
+     }
+  CmdSeq.num = 0;
 
-  if (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2)) {
+  if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
      unsigned int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
         cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
@@ -249,48 +272,56 @@ bool cDvbTuner::SetFrontend(void)
         }
      frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
 
-     Frontend.delivery = dvbfe_delsys(channel.System());
-     Frontend.frequency = frequency * 1000UL;
-     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-     if (Frontend.delivery == DVBFE_DELSYS_DVBS) {
-        Frontend.delsys.dvbs.modulation = dvbfe_modulation(channel.Modulation());
-        Frontend.delsys.dvbs.symbol_rate = channel.Srate() * 1000UL;
-        Frontend.delsys.dvbs.fec = dvbfe_fec(channel.CoderateH());
+     // DVB-S/DVB-S2 (common parts)
+     SETCMD(DTV_DELIVERY_SYSTEM, channel.System());
+     SETCMD(DTV_FREQUENCY, frequency * 1000UL);
+     SETCMD(DTV_MODULATION, channel.Modulation());
+     SETCMD(DTV_SYMBOL_RATE, channel.Srate() * 1000UL);
+     SETCMD(DTV_INNER_FEC, channel.CoderateH());
+     SETCMD(DTV_INVERSION, channel.Inversion());
+     if (channel.System() == SYS_DVBS2) {
+        if (frontendType == SYS_DVBS2) {
+           // DVB-S2
+           SETCMD(DTV_PILOT, PILOT_AUTO);
+           SETCMD(DTV_ROLLOFF, channel.RollOff());
+           }
+        else {
+           esyslog("ERROR: frontend %d doesn't provide DVB-S2", cardIndex);
+           return false;
+           }
         }
      else {
-        Frontend.delsys.dvbs2.modulation = dvbfe_modulation(channel.Modulation());
-        Frontend.delsys.dvbs2.symbol_rate = channel.Srate() * 1000UL;
-        Frontend.delsys.dvbs2.fec = dvbfe_fec(channel.CoderateH());
-        Frontend.delsys.dvbs2.rolloff = dvbfe_rolloff(channel.RollOff());
+        // DVB-S
+        SETCMD(DTV_ROLLOFF, ROLLOFF_35); // DVB-S always has a ROLLOFF of 0.35
         }
 
      tuneTimeout = DVBS_TUNE_TIMEOUT;
      lockTimeout = DVBS_LOCK_TIMEOUT;
      }
-  else if (frontendType & DVBFE_DELSYS_DVBC) {
-     Frontend.delivery = DVBFE_DELSYS_DVBC;
-     Frontend.frequency = FrequencyToHz(channel.Frequency());
-     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-     Frontend.delsys.dvbc.symbol_rate = channel.Srate() * 1000UL;
-     Frontend.delsys.dvbc.fec = dvbfe_fec(channel.CoderateH());
-     Frontend.delsys.dvbc.modulation = dvbfe_modulation(channel.Modulation());
+  else if (frontendType == SYS_DVBC_ANNEX_AC || frontendType == SYS_DVBC_ANNEX_B) {
+     // DVB-C
+     SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
+     SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
+     SETCMD(DTV_INVERSION, channel.Inversion());
+     SETCMD(DTV_SYMBOL_RATE, channel.Srate() * 1000UL);
+     SETCMD(DTV_INNER_FEC, channel.CoderateH());
+     SETCMD(DTV_MODULATION, channel.Modulation());
 
      tuneTimeout = DVBC_TUNE_TIMEOUT;
      lockTimeout = DVBC_LOCK_TIMEOUT;
      }
-  else if (frontendType & DVBFE_DELSYS_DVBT) {
-     Frontend.delivery = DVBFE_DELSYS_DVBT;
-     Frontend.frequency = FrequencyToHz(channel.Frequency());
-     Frontend.inversion = fe_spectral_inversion_t(channel.Inversion());
-     Frontend.delsys.dvbt.bandwidth = dvbfe_bandwidth(channel.Bandwidth());
-     Frontend.delsys.dvbt.code_rate_HP = dvbfe_fec(channel.CoderateH());
-     Frontend.delsys.dvbt.code_rate_LP = dvbfe_fec(channel.CoderateL());
-     Frontend.delsys.dvbt.constellation = dvbfe_modulation(channel.Modulation());
-     Frontend.delsys.dvbt.transmission_mode = dvbfe_transmission_mode(channel.Transmission());
-     Frontend.delsys.dvbt.guard_interval = dvbfe_guard_interval(channel.Guard());
-     Frontend.delsys.dvbt.hierarchy = dvbfe_hierarchy(channel.Hierarchy());
-     Frontend.delsys.dvbt.alpha = dvbfe_alpha(channel.Alpha());
-     Frontend.delsys.dvbt.priority = dvbfe_stream_priority(channel.Priority());
+  else if (frontendType == SYS_DVBT) {
+     // DVB-T
+     SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
+     SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
+     SETCMD(DTV_INVERSION, channel.Inversion());
+     SETCMD(DTV_BANDWIDTH_HZ, channel.Bandwidth());
+     SETCMD(DTV_CODE_RATE_HP, channel.CoderateH());
+     SETCMD(DTV_CODE_RATE_LP, channel.CoderateL());
+     SETCMD(DTV_MODULATION, channel.Modulation());
+     SETCMD(DTV_TRANSMISSION_MODE, channel.Transmission());
+     SETCMD(DTV_GUARD_INTERVAL, channel.Guard());
+     SETCMD(DTV_HIERARCHY, channel.Hierarchy());
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
      lockTimeout = DVBT_LOCK_TIMEOUT;
@@ -299,8 +330,8 @@ bool cDvbTuner::SetFrontend(void)
      esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
      return false;
      }
-  CHECK(ioctl(fd_frontend, DVBFE_SET_DELSYS, &Frontend.delivery));
-  if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) {
+  SETCMD(DTV_TUNE, 0);
+  if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
      esyslog("ERROR: frontend %d: %m", cardIndex);
      return false;
      }
@@ -372,13 +403,22 @@ int cDvbDevice::devVideoOffset = -1;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 
 const char *DeliverySystems[] = {
-  "DVBS",
+  "UNDEFINED",
+  "DVB-C",
+  "DVB-C",
+  "DVB-T",
   "DSS",
-  "DVBS2",
-  "DVBC",
-  "DVBT",
-  "DVBH",
+  "DVB-S",
+  "DVB-S2",
+  "DVB-H",
+  "ISDBT",
+  "ISDBS",
+  "ISDBC",
   "ATSC",
+  "ATSCMH",
+  "DMBTH",
+  "CMMB",
+  "DAB",
   NULL
   };
 
@@ -386,7 +426,7 @@ cDvbDevice::cDvbDevice(int n)
 {
   ciAdapter = NULL;
   dvbTuner = NULL;
-  frontendType = DVBFE_DELSYS_DUMMY;
+  frontendType = SYS_UNDEFINED;
   numProvidedSystems = 0;
   spuDecoder = NULL;
   digitalAudio = false;
@@ -449,26 +489,24 @@ cDvbDevice::cDvbDevice(int n)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-     if (ioctl(fd_frontend, DVBFE_GET_DELSYS, &frontendType) >= 0) {
-        const char **DeliverySystem = DeliverySystems;
-        cString ds;
-        for (int i = 0; i < 32; i++) {
-            if (frontendType & (1u << i)) {
-               numProvidedSystems++;
-               if (*DeliverySystem)
-                  ds = cString::sprintf("%s %s", *ds ? *ds : "", *DeliverySystem);
-               else
-                  esyslog("ERROR: unknown delivery system %d", i);
-               }
-            if (*DeliverySystem)
-               DeliverySystem++;
-            }
-        if (*ds)
-           isyslog("device %d provides:%s", CardIndex() + 1, *ds);
-        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
+     if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) >= 0) {
+        switch (frontendInfo.type) {
+          case FE_QPSK: frontendType = (frontendInfo.caps & FE_CAN_2ND_GEN_MODULATION) ? SYS_DVBS2 : SYS_DVBS; break;
+          case FE_OFDM: frontendType = SYS_DVBT; break;
+          case FE_QAM:  frontendType = SYS_DVBC_ANNEX_AC; break;
+          case FE_ATSC: frontendType = SYS_ATSC; break;
+          default: esyslog("ERROR: unknown frontend type %d on device %d", frontendInfo.type, CardIndex() + 1);
+          }
         }
      else
         LOG_ERROR;
+     if (frontendType != SYS_UNDEFINED) {
+        numProvidedSystems++;
+        if (frontendType == SYS_DVBS2)
+           numProvidedSystems++;
+        isyslog("device %d provides %s (\"%s\")", CardIndex() + 1, DeliverySystems[frontendType], frontendInfo.name);
+        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
+        }
      }
   else
      esyslog("ERROR: can't open DVB device %d", n);
@@ -789,9 +827,9 @@ bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
   return type == cSource::stNone
-      || type == cSource::stCable && (frontendType & DVBFE_DELSYS_DVBC)
-      || type == cSource::stSat   && (frontendType & (DVBFE_DELSYS_DVBS | DVBFE_DELSYS_DVBS2))
-      || type == cSource::stTerr  && (frontendType & DVBFE_DELSYS_DVBT);
+      || type == cSource::stCable && (frontendType == SYS_DVBC_ANNEX_AC || frontendType == SYS_DVBC_ANNEX_B)
+      || type == cSource::stSat   && (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
+      || type == cSource::stTerr  && (frontendType == SYS_DVBT);
 }
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
@@ -800,7 +838,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
      return false; // doesn't provide source
   if (!cSource::IsSat(Channel->Source()))
      return true; // source is sufficient for non sat
-  if (!(frontendType & Channel->System()))
+  if (frontendType == SYS_DVBS && Channel->System() == SYS_DVBS2)
      return false; // requires modulation system which frontend doesn't provide
   return !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
 }
@@ -1228,18 +1266,25 @@ bool cDvbDevice::Flush(int TimeoutMs)
 
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+  int w;
+  do {
+     w = WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+     } while (w != Length);
+  return w;
 }
 
 int cDvbDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
-  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
+  int w;
+  do {
+     w = WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
+     } while (w != Length);
+  return w;
 }
 
 int cDvbDevice::PlayTsVideo(const uchar *Data, int Length)
 {
-  Length = TsGetPayload(&Data);
-  return PlayVideo(Data, Length);
+  return cDevice::PlayTsVideo(Data, Length);
 }
 
 int cDvbDevice::PlayTsAudio(const uchar *Data, int Length)
diff --git a/dvbdevice.h b/dvbdevice.h
index bb219d486..c3b0cedb0 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.2 2008/06/01 09:48:04 kls Exp $
+ * $Id: dvbdevice.h 2.3 2008/12/06 13:31:12 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -15,8 +15,8 @@
 #include "device.h"
 #include "dvbspu.h"
 
-#if DVB_API_VERSION != 3 || DVB_API_VERSION_MINOR != 3
-#error VDR requires Linux DVB driver API version 3.3!
+#if DVB_API_VERSION != 5 || DVB_API_VERSION_MINOR != 0
+#error VDR requires Linux DVB driver API version 5.0!
 #endif
 
 #define MAXDVBDEVICES  8
@@ -35,8 +35,9 @@ class cDvbDevice : public cDevice {
          ///< Must be called before accessing any DVB functions.
          ///< \return True if any devices are available.
 private:
-  dvbfe_delsys frontendType;
+  dvb_frontend_info frontendInfo;
   int numProvidedSystems;
+  fe_delivery_system frontendType;
   int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca;
 protected:
   virtual void MakePrimaryDevice(bool On);
diff --git a/menu.c b/menu.c
index 7fa1e3f11..58ea2dd74 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.2 2008/05/01 14:37:24 kls Exp $
+ * $Id: menu.c 2.3 2008/11/22 15:18:00 kls Exp $
  */
 
 #include "menu.h"
@@ -252,8 +252,6 @@ void cMenuEditChannel::Setup(void)
   ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
   ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Alpha"),        &data.alpha,        AlphaValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Priority"),     &data.priority,     PriorityValues));
   ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
 
   SetCurrent(Get(current));
diff --git a/menuitems.c b/menuitems.c
index 200834ecc..82d50821b 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.1 2008/04/12 12:05:25 kls Exp $
+ * $Id: menuitems.c 2.2 2008/12/13 11:35:31 kls Exp $
  */
 
 #include "menuitems.h"
@@ -951,9 +951,7 @@ void cMenuEditMapItem::Set(void)
 {
   const char *s = NULL;
   int n = MapToUser(*value, map, &s);
-  if (n == 999)
-     SetValue(tr("auto"));
-  else if (n == 0 && zeroString)
+  if (n == 0 && zeroString)
      SetValue(zeroString);
   else if (n >= 0) {
      if (s)
diff --git a/nit.c b/nit.c
index 7f0154a09..5155f2a0a 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.1 2008/04/12 12:06:40 kls Exp $
+ * $Id: nit.c 2.2 2008/12/06 15:46:50 kls Exp $
  */
 
 #include "nit.h"
@@ -127,13 +127,13 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100;
                  static char Polarizations[] = { 'h', 'v', 'l', 'r' };
                  char Polarization = Polarizations[sd->getPolarization()];
-                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { DVBFE_MOD_AUTO, DVBFE_MOD_QPSK, DVBFE_MOD_8PSK, DVBFE_MOD_QAM16 };
+                 static int Modulations[] = { QPSK, PSK_8, QAM_16 };
                  int Modulation = Modulations[sd->getModulationType()];
-                 int System = sd->getModulationSystem() ? DVBFE_DELSYS_DVBS2 : DVBFE_DELSYS_DVBS;
-                 static int RollOffs[] = { DVBFE_ROLLOFF_35, DVBFE_ROLLOFF_25, DVBFE_ROLLOFF_20, DVBFE_ROLLOFF_UNKNOWN };
-                 int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : DVBFE_ROLLOFF_UNKNOWN;
+                 int System = sd->getModulationSystem() ? SYS_DVBS2 : SYS_DVBS;
+                 static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
+                 int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO;
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
@@ -181,9 +181,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  int Source = cSource::FromData(cSource::stCable);
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
-                 static int CodeRates[] = { DVBFE_FEC_NONE, DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_8_9, DVBFE_FEC_3_5, DVBFE_FEC_4_5, DVBFE_FEC_9_10, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_NONE };
+                 static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { DVBFE_MOD_NONE, DVBFE_MOD_QAM16, DVBFE_MOD_QAM32, DVBFE_MOD_QAM64, DVBFE_MOD_QAM128, DVBFE_MOD_QAM256, QAM_AUTO };
+                 static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
                  int Modulation = Modulations[min(sd->getModulation(), 6)];
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
@@ -231,22 +231,19 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
                  int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = Frequencies[0] = sd->getFrequency() * 10;
-                 static int Bandwidths[] = { DVBFE_BANDWIDTH_8_MHZ, DVBFE_BANDWIDTH_7_MHZ, DVBFE_BANDWIDTH_6_MHZ, DVBFE_BANDWIDTH_5_MHZ, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO, DVBFE_BANDWIDTH_AUTO };
+                 static int Bandwidths[] = { 8000000, 7000000, 6000000, 0, 0, 0, 0, 0 };
                  int Bandwidth = Bandwidths[sd->getBandwidth()];
-                 static int Constellations[] = { DVBFE_MOD_QPSK, DVBFE_MOD_QAM16, DVBFE_MOD_QAM64, DVBFE_MOD_AUTO };
+                 static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
                  int Constellation = Constellations[sd->getConstellation()];
-                 static int CodeRates[] = { DVBFE_FEC_1_2, DVBFE_FEC_2_3, DVBFE_FEC_3_4, DVBFE_FEC_5_6, DVBFE_FEC_7_8, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO, DVBFE_FEC_AUTO };
+                 static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
+                 int Hierarchy = Hierarchies[sd->getHierarchy()];
+                 static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
                  int CodeRateHP = CodeRates[sd->getCodeRateHP()];
                  int CodeRateLP = CodeRates[sd->getCodeRateLP()];
-                 static int GuardIntervals[] = { DVBFE_GUARD_INTERVAL_1_32, DVBFE_GUARD_INTERVAL_1_16, DVBFE_GUARD_INTERVAL_1_8, DVBFE_GUARD_INTERVAL_1_4 };
+                 static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
                  int GuardInterval = GuardIntervals[sd->getGuardInterval()];
-                 static int TransmissionModes[] = { DVBFE_TRANSMISSION_MODE_2K, DVBFE_TRANSMISSION_MODE_8K, DVBFE_TRANSMISSION_MODE_4K, DVBFE_TRANSMISSION_MODE_AUTO };
+                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
                  int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
-                 static int Priorities[] = { DVBFE_STREAM_PRIORITY_LP, DVBFE_STREAM_PRIORITY_HP };
-                 int Priority = Priorities[sd->getPriority()];
-                 static int Alphas[] = { 0, DVBFE_ALPHA_1, DVBFE_ALPHA_2, DVBFE_ALPHA_4 };
-                 int Alpha = Alphas[sd->getHierarchy() & 3];
-                 int Hierarchy = Alpha ? DVBFE_HIERARCHY_ON : DVBFE_HIERARCHY_OFF;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
                         if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
@@ -272,14 +269,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority);
+                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode, Alpha, Priority))
+                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0fd40910a..d86ebc4fb 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -24,15 +24,12 @@ msgstr "off"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "cap"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
 
@@ -321,12 +318,6 @@ msgstr "Protegir"
 msgid "Hierarchy"
 msgstr "Jerarquia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritat"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -375,6 +366,9 @@ msgstr "Fi"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritat"
+
 msgid "Lifetime"
 msgstr "Durada"
 
@@ -909,9 +903,6 @@ msgstr "Sobrescriure"
 msgid "Button$Insert"
 msgstr "Inserir"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index dd0ced311..cd5b66b26 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -22,15 +22,12 @@ msgstr "vyp."
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "��dn�"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
@@ -319,12 +316,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorita"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -373,6 +364,9 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorita"
+
 msgid "Lifetime"
 msgstr "�ivotnost"
 
@@ -907,9 +901,6 @@ msgstr "P
 msgid "Button$Insert"
 msgstr "Vlo�it"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Modul"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 53633b2fd..ffe5a8d2b 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -21,15 +21,12 @@ msgstr "fra"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "none"
 msgstr "ingen"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
 
@@ -318,12 +315,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarki"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -372,6 +363,9 @@ msgstr "Stop"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -906,9 +900,6 @@ msgstr "Overskriv"
 msgid "Button$Insert"
 msgstr "Inds�t"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index f53e810ba..0dba2b45b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: German\n"
@@ -21,15 +21,12 @@ msgstr "aus"
 msgid "on"
 msgstr "ein"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "keine"
 
-msgid "high"
-msgstr "hoch"
-
-msgid "low"
-msgstr "niedrig"
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
 
@@ -318,12 +315,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-msgid "Alpha"
-msgstr "Alpha"
-
-msgid "Priority"
-msgstr "Priorit�t"
-
 msgid "Rolloff"
 msgstr "Rolloff"
 
@@ -372,6 +363,9 @@ msgstr "Ende"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�t"
+
 msgid "Lifetime"
 msgstr "Lebensdauer"
 
@@ -906,9 +900,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Einf�gen"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 337c6b097..7446e8acd 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -21,15 +21,12 @@ msgstr "
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "��������"
+
 msgid "none"
 msgstr "������"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
 
@@ -318,12 +315,6 @@ msgstr "
 msgid "Hierarchy"
 msgstr "���������"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "�������������"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -372,6 +363,9 @@ msgstr "
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "�������������"
+
 msgid "Lifetime"
 msgstr "�������� ���������"
 
@@ -906,9 +900,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "��������"
 
-msgid "auto"
-msgstr "��������"
-
 msgid "Plugin"
 msgstr "��������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 61c871749..ef504965c 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -22,15 +22,12 @@ msgstr "off"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "ninguno"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
@@ -319,12 +316,6 @@ msgstr "Int.Guarda"
 msgid "Hierarchy"
 msgstr "Jerarqu�a"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioridad"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -373,6 +364,9 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioridad"
+
 msgid "Lifetime"
 msgstr "Duraci�n"
 
@@ -907,9 +901,6 @@ msgstr "Sobreescribir"
 msgid "Button$Insert"
 msgstr "Insertar"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 70d59be46..dcbe854d3 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian\n"
@@ -21,15 +21,12 @@ msgstr "v
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "automaatne"
+
 msgid "none"
 msgstr "puudu"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
 
@@ -318,12 +315,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteet"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -372,6 +363,9 @@ msgstr "Stopp"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteet"
+
 msgid "Lifetime"
 msgstr "Eluiga"
 
@@ -906,9 +900,6 @@ msgstr "Asenda (OVR)"
 msgid "Button$Insert"
 msgstr "Lisa (INS)"
 
-msgid "auto"
-msgstr "automaatne"
-
 msgid "Plugin"
 msgstr "Laiendusmoodul"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 6be05ef2d..76df2cf01 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -24,15 +24,12 @@ msgstr "poissa"
 msgid "on"
 msgstr "p��ll�"
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "tyhj�"
 
-msgid "high"
-msgstr "korkea"
-
-msgid "low"
-msgstr "matala"
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
@@ -321,12 +318,6 @@ msgstr "Suojav
 msgid "Hierarchy"
 msgstr "Hierarkia"
 
-msgid "Alpha"
-msgstr "Alpha"
-
-msgid "Priority"
-msgstr "Prioriteetti"
-
 msgid "Rolloff"
 msgstr "Rolloff"
 
@@ -375,6 +366,9 @@ msgstr "Lopetus"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteetti"
+
 msgid "Lifetime"
 msgstr "Elinik�"
 
@@ -909,9 +903,6 @@ msgstr "Korvaa"
 msgid "Button$Insert"
 msgstr "Lis��"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Laajennos"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index db886635e..706f56fb4 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -27,15 +27,12 @@ msgstr "off"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "aucun"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
 
@@ -324,12 +321,6 @@ msgstr "Intervalle de garde"
 msgid "Hierarchy"
 msgstr "Hi�rarchie"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorit�"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -378,6 +369,9 @@ msgstr "Fin"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�"
+
 msgid "Lifetime"
 msgstr "Dur�e de vie"
 
@@ -912,9 +906,6 @@ msgstr "Ecraser"
 msgid "Button$Insert"
 msgstr "Ins�rer"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 69c2ee449..afddcefef 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -23,15 +23,12 @@ msgstr "isklju
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "automatski"
+
 msgid "none"
 msgstr "ni�ta"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Program ***"
 
@@ -320,12 +317,6 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hijerarhija"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -374,6 +365,9 @@ msgstr "Kraj"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Trajanje"
 
@@ -908,9 +902,6 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Umetni"
 
-msgid "auto"
-msgstr "automatski"
-
 msgid "Plugin"
 msgstr "Dodatak"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index e2629e837..b9821d5d8 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -24,15 +24,12 @@ msgstr "ki"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "semmi"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
 
@@ -321,12 +318,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarhia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorit�s"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -375,6 +366,9 @@ msgstr "V
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�s"
+
 msgid "Lifetime"
 msgstr "�lettartam"
 
@@ -909,9 +903,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Beilleszteni"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 0b8852b6d..944b80db2 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-08-25 02:36+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
@@ -25,15 +25,12 @@ msgstr "off"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "automatico"
+
 msgid "none"
 msgstr "nessuno"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
@@ -322,12 +319,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Gerarchia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorit�"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -376,6 +367,9 @@ msgstr "Fine"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorit�"
+
 msgid "Lifetime"
 msgstr "Scadenza"
 
@@ -910,9 +904,6 @@ msgstr "Sovrascrivi"
 msgid "Button$Insert"
 msgstr "Inserisci"
 
-msgid "auto"
-msgstr "automatico"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 547df255e..17a095343 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -25,15 +25,12 @@ msgstr "uit"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "geen"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
@@ -322,12 +319,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteit"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -376,6 +367,9 @@ msgstr "Einde"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteit"
+
 msgid "Lifetime"
 msgstr "Bewaarduur"
 
@@ -910,9 +904,6 @@ msgstr "Overschrijven"
 msgid "Button$Insert"
 msgstr "Invoegen"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 670f0dd3b..06f6b8764 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -22,13 +22,10 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-msgid "none"
-msgstr ""
-
-msgid "high"
+msgid "auto"
 msgstr ""
 
-msgid "low"
+msgid "none"
 msgstr ""
 
 msgid "*** Invalid Channel ***"
@@ -319,12 +316,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -373,6 +364,9 @@ msgstr "Slutt"
 msgid "VPS"
 msgstr ""
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Levetid"
 
@@ -907,9 +901,6 @@ msgstr ""
 msgid "Button$Insert"
 msgstr ""
 
-msgid "auto"
-msgstr ""
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index e5bcd373b..ea70463ee 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -22,15 +22,12 @@ msgstr "wy
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "auto"
+
 msgid "none"
 msgstr "brak"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
@@ -319,12 +316,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Priorytet"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -373,6 +364,9 @@ msgstr "Koniec"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Priorytet"
+
 msgid "Lifetime"
 msgstr "Czas �ycia"
 
@@ -907,9 +901,6 @@ msgstr "Nadpisz"
 msgid "Button$Insert"
 msgstr "Wstaw"
 
-msgid "auto"
-msgstr "auto"
-
 msgid "Plugin"
 msgstr "Wtyczka"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 143d0e949..2182f66bc 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -21,15 +21,12 @@ msgstr "off"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "Autom�tico"
+
 msgid "none"
 msgstr "nenhum"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal inv�lido ***"
 
@@ -318,12 +315,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarquia"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioridade"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -372,6 +363,9 @@ msgstr "Fim"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioridade"
+
 msgid "Lifetime"
 msgstr "Dura��o"
 
@@ -906,9 +900,6 @@ msgstr "Substituir"
 msgid "Button$Insert"
 msgstr "Inserir"
 
-msgid "auto"
-msgstr "Autom�tico"
-
 msgid "Plugin"
 msgstr "Plugin"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 9236f2da9..b7a5ca954 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -24,15 +24,12 @@ msgstr "inactiv"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "automat"
+
 msgid "none"
 msgstr "niciuna(ul)"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
@@ -321,12 +318,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Ierarhie"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritate"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -375,6 +366,9 @@ msgstr "Sf
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritate"
+
 msgid "Lifetime"
 msgstr "Timp de p�strare"
 
@@ -909,9 +903,6 @@ msgstr "Suprascrie"
 msgid "Button$Insert"
 msgstr "Insereaz�"
 
-msgid "auto"
-msgstr "automat"
-
 msgid "Plugin"
 msgstr "Plugin (modul adi�ional)"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0938736ab..a6d8a4fd1 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-15 16:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -22,15 +22,12 @@ msgstr "
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "����"
+
 msgid "none"
 msgstr "������"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -319,12 +316,6 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "���������"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -373,6 +364,9 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
+msgid "Priority"
+msgstr "���������"
+
 msgid "Lifetime"
 msgstr "���� ��������"
 
@@ -907,9 +901,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Plugin"
 msgstr "������"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 5e4ef3b18..6f3d041e5 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -22,15 +22,12 @@ msgstr "izklop"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "avtomatsko"
+
 msgid "none"
 msgstr "nobeden"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
 
@@ -319,12 +316,6 @@ msgstr "Za
 msgid "Hierarchy"
 msgstr "Hierarhija"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioriteta"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -373,6 +364,9 @@ msgstr "Konec"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioriteta"
+
 msgid "Lifetime"
 msgstr "Veljavnost"
 
@@ -907,9 +901,6 @@ msgstr "Prepi
 msgid "Button$Insert"
 msgstr "Vstavi"
 
-msgid "auto"
-msgstr "avtomatsko"
-
 msgid "Plugin"
 msgstr "Vstavek"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 92613d055..5f8d20dee 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -24,15 +24,12 @@ msgstr "av"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "automatisk"
+
 msgid "none"
 msgstr "ingen"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
@@ -321,12 +318,6 @@ msgstr "Guard"
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -375,6 +366,9 @@ msgstr "Slutar"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 msgid "Lifetime"
 msgstr "Livstid"
 
@@ -909,9 +903,6 @@ msgstr "Skriv 
 msgid "Button$Insert"
 msgstr "Infoga"
 
-msgid "auto"
-msgstr "automatisk"
-
 msgid "Plugin"
 msgstr "Modul"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 9e7251a3b..a5496d380 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -21,15 +21,12 @@ msgstr "kapal
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "otomatik"
+
 msgid "none"
 msgstr "hi�"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
 
@@ -318,12 +315,6 @@ msgstr "Koruma"
 msgid "Hierarchy"
 msgstr "Hiyerar�i"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "�ncelik"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -372,6 +363,9 @@ msgstr "Biti
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "�ncelik"
+
 msgid "Lifetime"
 msgstr "�mr�"
 
@@ -906,9 +900,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "Ekle"
 
-msgid "auto"
-msgstr "otomatik"
-
 msgid "Plugin"
 msgstr "Eklenti"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index fb734de55..9fe0013f6 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-07 14:17+0200\n"
 "Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -21,15 +21,12 @@ msgstr "
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "����"
+
 msgid "none"
 msgstr "������"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
@@ -318,12 +315,6 @@ msgstr "
 msgid "Hierarchy"
 msgstr "��������"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "���������"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -372,6 +363,9 @@ msgstr "
 msgid "VPS"
 msgstr "VPS ��������"
 
+msgid "Priority"
+msgstr "���������"
+
 msgid "Lifetime"
 msgstr "����� ����������"
 
@@ -906,9 +900,6 @@ msgstr "
 msgid "Button$Insert"
 msgstr "�������"
 
-msgid "auto"
-msgstr "����"
-
 msgid "Plugin"
 msgstr "������"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5ff19cf71..04d16ce79 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-04-12 14:19+0200\n"
+"POT-Creation-Date: 2008-12-14 16:10+0100\n"
 "PO-Revision-Date: 2008-03-21 08:44+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -24,15 +24,12 @@ msgstr "关"
 msgid "on"
 msgstr ""
 
+msgid "auto"
+msgstr "自动"
+
 msgid "none"
 msgstr "无"
 
-msgid "high"
-msgstr ""
-
-msgid "low"
-msgstr ""
-
 msgid "*** Invalid Channel ***"
 msgstr "***无效频道 ***"
 
@@ -321,12 +318,6 @@ msgstr "防护"
 msgid "Hierarchy"
 msgstr "层次"
 
-msgid "Alpha"
-msgstr ""
-
-msgid "Priority"
-msgstr "优先"
-
 msgid "Rolloff"
 msgstr ""
 
@@ -375,6 +366,9 @@ msgstr "停止"
 msgid "VPS"
 msgstr "VPS"
 
+msgid "Priority"
+msgstr "优先"
+
 msgid "Lifetime"
 msgstr "终生"
 
@@ -909,9 +903,6 @@ msgstr "覆盖"
 msgid "Button$Insert"
 msgstr "插入"
 
-msgid "auto"
-msgstr "自动"
-
 msgid "Plugin"
 msgstr "插件"
 
diff --git a/remux.c b/remux.c
index 8312a7444..193854959 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 2.1 2008/08/15 14:49:34 kls Exp $
+ * $Id: remux.c 2.2 2008/12/13 14:30:15 kls Exp $
  */
 
 #include "remux.h"
@@ -2578,7 +2578,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
 cTsToPes::cTsToPes(void)
 {
   data = NULL;
-  size = length = 0;
+  size = length = offset = 0;
   synced = false;
 }
 
@@ -2602,12 +2602,35 @@ void cTsToPes::PutTs(const uchar *Data, int Length)
   length += Length;
 }
 
+#define MAXPESLENGTH 0xFFF0
+
 const uchar *cTsToPes::GetPes(int &Length)
 {
-  if (PesLongEnough(length)) {
-     Length = PesLength(data);
-     if (Length <= length) {
-        Length = length; // in case the PES packet has no explicit length, as is the case for video PES
+  if (offset < length && PesLongEnough(length)) {
+     if (!PesHasLength(data)) // this is a video PES packet with undefined length
+        offset = 6; // trigger setting PES length for initial slice
+     if (offset) {
+        uchar *p = data + offset - 6;
+        if (p != data) {
+           p -= 3;
+           memmove(p, data, 4);
+           }
+        int l = min(length - offset, MAXPESLENGTH);
+        offset += l;
+        if (p != data) {
+           l += 3;
+           p[6]  = 0x80;
+           p[7]  = 0x00;
+           p[8]  = 0x00;
+           }
+        p[4] = l / 256;
+        p[5] = l & 0xFF;
+        Length = l + 6;
+        return p;
+        }
+     else {
+        Length = PesLength(data);
+        offset = Length; // to make sure we break out in case of garbage data
         return data;
         }
      }
@@ -2616,7 +2639,7 @@ const uchar *cTsToPes::GetPes(int &Length)
 
 void cTsToPes::Reset(void)
 {
-  length = 0;
+  length = offset = 0;
 }
 
 // --- Some helper functions for debugging -----------------------------------
diff --git a/remux.h b/remux.h
index fe792ebf7..f471504f6 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.2 2008/09/06 14:48:28 kls Exp $
+ * $Id: remux.h 2.3 2008/12/13 13:55:07 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -138,6 +138,11 @@ inline bool PesLongEnough(int Length)
   return Length >= 6;
 }
 
+inline bool PesHasLength(const uchar *p)
+{
+  return p[4] | p[5];
+}
+
 inline int PesLength(const uchar *p)
 {
   return 6 + p[4] * 256 + p[5];
@@ -241,6 +246,7 @@ class cTsToPes {
   uchar *data;
   int size;
   int length;
+  int offset;
   bool synced;
 public:
   cTsToPes(void);
diff --git a/vdr.5 b/vdr.5
index ee8fe617a..384ab7066 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.4 2008/07/06 13:00:19 kls Exp $
+.\" $Id: vdr.5 2.5 2008/11/22 15:23:10 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -83,22 +83,20 @@ meaning (and allowed values) are
 .TS
 tab (@);
 l l.
-\fBA\fR@Alpha (0, 1, 2, 4)
-\fBB\fR@Bandwidth (5, 6, 7, 8)
-\fBC\fR@Code rate high priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
-\fBD\fR@coDe rate low priority (0, 12, 13, 14, 23, 25, 34, 35, 45, 56, 67, 78, 89, 910)
+\fBB\fR@Bandwidth (6, 7, 8)
+\fBC\fR@Code rate high priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910)
+\fBD\fR@coDe rate low priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910)
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
-\fBM\fR@Modulation (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 32, 64, 128, 256, 512, 998, 1024)
+\fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998)
 \fBO\fR@rollOff (0, 20, 25, 35)
-\fBP\fR@Priority (0, 1)
 \fBR\fR@Right circular polarization
 \fBS\fR@delivery System (0, 1)
-\fBT\fR@Transmission mode (2, 4, 8)
+\fBT\fR@Transmission mode (2, 8)
 \fBV\fR@Vertical polarization
-\fBY\fR@hierarchY (0, 1)
+\fBY\fR@hierarchY (0, 1, 2, 4)
 .TE
 
 The polarization parameters have no integer numbers following them. This is for

From c2966475942fcb9d4b8d41dbf026ff57630a1ad6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Tue, 6 Jan 2009 20:31:53 +0100
Subject: [PATCH 189/307] =?UTF-8?q?Version=201.7.3=20-=20Updated=20the=20R?=
 =?UTF-8?q?ussian=20OSD=20texts=20(thanks=20to=20Oleg=20Roitburd).=20-=20F?=
 =?UTF-8?q?ixed=20handling=20the=20'pointer=20field'=20in=20generating=20a?=
 =?UTF-8?q?nd=20parsing=20PAT/PMT=20(thanks=20to=20=20=20Frank=20Schmirler?=
 =?UTF-8?q?).=20-=20Fixed=20handling=20modulation=20types=20for=20DVB-S=20?=
 =?UTF-8?q?transponders=20when=20processing=20the=20NIT.=20-=20Changed=20c?=
 =?UTF-8?q?DvbDevice::GrabImage()=20to=20use=20V4L2=20(thanks=20to=20Marco?=
 =?UTF-8?q?=20Schl=FC=DFler).=20-=20Added=20a=20poll=20to=20cDvbDevice::Pl?=
 =?UTF-8?q?ayVideo()=20and=20cDvbDevice::PlayAudio()=20to=20avoid=20=20=20?=
 =?UTF-8?q?excessive=20CPU=20load=20(this=20is=20just=20a=20makeshift=20so?=
 =?UTF-8?q?lution=20until=20the=20FF=20DVB=20cards=20=20=20can=20play=20TS?=
 =?UTF-8?q?=20directly).=20-=20The=20recording=20format=20is=20now=20Trans?=
 =?UTF-8?q?port=20Stream.=20Existing=20recordings=20in=20PES=20format=20?=
 =?UTF-8?q?=20=20can=20still=20be=20replayed=20and=20edited,=20but=20new?=
 =?UTF-8?q?=20recordings=20are=20done=20in=20TS.=20=20=20All=20code=20for?=
 =?UTF-8?q?=20recording=20in=20PES=20has=20been=20removed.=20=20=20The=20f?=
 =?UTF-8?q?ollowing=20changes=20were=20made=20to=20switch=20to=20TS=20reco?=
 =?UTF-8?q?rding=20format:=20=20=20+=20The=20index=20file=20format=20has?=
 =?UTF-8?q?=20been=20changed=20to=20support=20file=20sizes=20of=20up=20to?=
 =?UTF-8?q?=201TB=20=20=20=20=20(previously=202GB),=20and=20up=20to=206553?=
 =?UTF-8?q?5=20separate=20files=20per=20recording=20(previously=20=20=20?=
 =?UTF-8?q?=20=20255).=20=20=20+=20The=20recording=20file=20names=20are=20?=
 =?UTF-8?q?now=20of=20the=20form=2000001.ts=20(previously=20001.vdr).=20?=
 =?UTF-8?q?=20=20+=20The=20frame=20rate=20is=20now=20detected=20by=20looki?=
 =?UTF-8?q?ng=20at=20two=20subsequent=20PTS=20values.=20=20=20=20=20The=20?=
 =?UTF-8?q?"frame=20duration"=20(in=20multiples=20of=201/90000)=20is=20sto?=
 =?UTF-8?q?red=20in=20the=20info.vdr=20=20=20=20=20file=20using=20the=20ne?=
 =?UTF-8?q?w=20tag=20F=20(thanks=20to=20Artur=20Skawina=20for=20helping=20?=
 =?UTF-8?q?to=20get=20the=20=20=20=20=20IndexToHMSF()=20calculation=20righ?=
 =?UTF-8?q?t).=20=20=20+=20Several=20functions=20now=20have=20an=20additio?=
 =?UTF-8?q?nal=20parameter=20FramesPerSecond.=20=20=20+=20Several=20functi?=
 =?UTF-8?q?ons=20now=20have=20an=20additional=20parameter=20IsPesRecording?=
 =?UTF-8?q?.=20=20=20+=20The=20functionality=20of=20cFileWriter=20was=20mo?=
 =?UTF-8?q?ved=20into=20cRecorder,=20and=20cRemux=20is=20=20=20=20=20now?=
 =?UTF-8?q?=20obsolete.=20This=20also=20avoids=20one=20level=20of=20data?=
 =?UTF-8?q?=20copying=20while=20recording.=20=20=20+=20cRemux,=20cRingBuff?=
 =?UTF-8?q?erLinearPes,=20cTS2PES=20and=20all=20c*Repacker=20classes=20hav?=
 =?UTF-8?q?e=20been=20=20=20=20=20removed.=20=20=20+=20A=20PAT/PMT=20is=20?=
 =?UTF-8?q?inserted=20before=20every=20independent=20frame,=20so=20that=20?=
 =?UTF-8?q?no=20extra=20=20=20=20=20measures=20need=20to=20be=20taken=20wh?=
 =?UTF-8?q?en=20editing=20a=20recording.=20=20=20+=20The=20directory=20nam?=
 =?UTF-8?q?e=20for=20a=20recording=20has=20been=20changed=20from=20=20=20?=
 =?UTF-8?q?=20=20YYYY-MM-DD-hh[.:]mm.pr.lt.rec=20(pr=3Dpriority,=20lt=3Dli?=
 =?UTF-8?q?fetime)=20to=20=20=20=20=20YYYY-MM-DD-hh.mm.ch-ri.rec=20(ch=3Dc?=
 =?UTF-8?q?hannel,=20ri=3DresumeId).=20=20=20=20=20Priority=20and=20Lifeti?=
 =?UTF-8?q?me=20are=20now=20stored=20in=20the=20info.vdr=20file=20with=20t?=
 =?UTF-8?q?he=20new=20=20=20=20=20tags=20P=20and=20L=20(if=20no=20such=20f?=
 =?UTF-8?q?ile=20exists,=20the=20maximum=20values=20are=20assumed=20by=20?=
 =?UTF-8?q?=20=20=20=20default,=20which=20avoids=20inadvertently=20deletin?=
 =?UTF-8?q?g=20a=20recording=20if=20disk=20space=20=20=20=20=20is=20low).?=
 =?UTF-8?q?=20No=20longer=20storing=20Priority=20and=20Lifetime=20in=20the?=
 =?UTF-8?q?=20directory=20name=20=20=20=20=20avoids=20starting=20a=20new?=
 =?UTF-8?q?=20recording=20if=20one=20of=20these=20is=20changed=20in=20the?=
 =?UTF-8?q?=20timer=20=20=20=20=20and=20the=20recording=20is=20re-started?=
 =?UTF-8?q?=20for=20some=20reason.=20=20=20=20=20Instead=20of=20Priority?=
 =?UTF-8?q?=20and=20Lifetime,=20the=20directory=20name=20now=20contains=20?=
 =?UTF-8?q?the=20=20=20=20=20channel=20number=20from=20which=20the=20recor?=
 =?UTF-8?q?ding=20was=20made,=20and=20the=20"resume=20id"=20of=20=20=20=20?=
 =?UTF-8?q?=20this=20instance=20of=20VDR.=20This=20avoids=20problems=20if?=
 =?UTF-8?q?=20several=20VDR=20instances=20record=20=20=20=20=20the=20same?=
 =?UTF-8?q?=20show=20on=20different=20channels,=20or=20even=20on=20the=20s?=
 =?UTF-8?q?ame=20channel.=20=20=20=20=20The=20'-'=20between=20channel=20nu?=
 =?UTF-8?q?mber=20and=20resumeId=20prevents=20older=20versions=20of=20=20?=
 =?UTF-8?q?=20=20=20VDR=20from=20"seeing"=20these=20recordings,=20which=20?=
 =?UTF-8?q?makes=20sure=20they=20won't=20even=20try=20=20=20=20=20to=20rep?=
 =?UTF-8?q?lay=20them,=20or=20remove=20them=20in=20case=20the=20disk=20run?=
 =?UTF-8?q?s=20full.=20=20=20+=20The=20semantics=20of=20PlayTs*()=20have?=
 =?UTF-8?q?=20been=20changed.=20These=20functions=20are=20now=20=20=20=20?=
 =?UTF-8?q?=20required=20to=20return=20the=20given=20Length=20(which=20is?=
 =?UTF-8?q?=20TS=5FSIZE)=20if=20they=20have=20=20=20=20=20processed=20the?=
 =?UTF-8?q?=20TS=20packet.=20=20=20+=20The=20files=20"index",=20"info",=20?=
 =?UTF-8?q?"marks"=20and=20"resume"=20within=20a=20TS=20recording=20=20=20?=
 =?UTF-8?q?=20=20directory=20are=20now=20created=20without=20the=20".vdr"?=
 =?UTF-8?q?=20extension.=20=20=20+=20The=20"resume"=20file=20is=20no=20lon?=
 =?UTF-8?q?ger=20a=20binary=20file,=20but=20contains=20tagged=20lines=20?=
 =?UTF-8?q?=20=20=20=20to=20be=20able=20to=20store=20additional=20informat?=
 =?UTF-8?q?ion,=20like=20the=20selected=20audio=20or=20=20=20=20=20subtitl?=
 =?UTF-8?q?e=20track.=20=20=20+=20cDevice::StillPicture()=20will=20now=20b?=
 =?UTF-8?q?e=20called=20with=20either=20TS=20or=20PES=20data.=20=20=20+=20?=
 =?UTF-8?q?cDvbPlayer::Goto()=20no=20longer=20appends=20a=20"sequence=20en?=
 =?UTF-8?q?d=20code"=20to=20the=20data.=20=20=20=20=20If=20the=20output=20?=
 =?UTF-8?q?device=20needs=20this,=20it=20has=20to=20take=20care=20of=20it?=
 =?UTF-8?q?=20by=20itself.=20-=20Fixed=20cPatPmtParser::ParsePmt()=20to=20?=
 =?UTF-8?q?reset=20vpid=20and=20vtype=20when=20switching=20from=20=20=20a?=
 =?UTF-8?q?=20video=20to=20an=20audio=20channel=20(thanks=20to=20Reinhard?=
 =?UTF-8?q?=20Nissl).=20-=20cDvbDevice=20now=20uses=20the=20FE=5FCAN=5F2G?=
 =?UTF-8?q?=5FMODULATION=20flag=20to=20determine=20whether=20a=20device=20?=
 =?UTF-8?q?=20=20can=20handle=20DVB-S2.=20The=20#define=20is=20still=20the?=
 =?UTF-8?q?re=20to=20allow=20people=20with=20older=20drivers=20=20=20who?=
 =?UTF-8?q?=20don't=20need=20DVB-S2=20to=20use=20this=20version=20without?=
 =?UTF-8?q?=20pathcing.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |    6 +
 HISTORY      |   63 ++
 Makefile     |    4 +-
 config.h     |   10 +-
 cutter.c     |   31 +-
 device.c     |   50 +-
 device.h     |   19 +-
 dvbdevice.c  |  168 ++--
 dvbplayer.c  |   80 +-
 menu.c       |   27 +-
 nit.c        |    4 +-
 player.h     |    5 +-
 po/ru_RU.po  |    8 +-
 recorder.c   |  172 ++--
 recorder.h   |   16 +-
 recording.c  |  353 ++++++--
 recording.h  |   61 +-
 remux.c      | 2217 +++-----------------------------------------------
 remux.h      |  149 ++--
 svdrp.c      |   16 +-
 tools.c      |    6 +-
 vdr.5        |   54 +-
 22 files changed, 967 insertions(+), 2552 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea2127342..7bc1b740b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -284,6 +284,8 @@ Artur Skawina <skawina@geocities.com>
  for fixing calculating the cache size in cUnbufferedFile::Read()
  for making the /video/.update file be touched _after_ an editing process is finished
  in order to avoid excessive disk access
+ for helping to get the IndexToHMSF() calculation right with non-integer frame
+ rates
 
 Werner Fink <werner@suse.de>
  for making I/O more robust by handling EINTR
@@ -1185,6 +1187,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing handling the counter in detection of pre 1.3.19 PS data
  for adapting the tuning code to the new DVBFE_SET_DELSYS API
  for reporting the missing description of the 'S' channel parameter in vdr.5
+ for fixing cPatPmtParser::ParsePmt() to reset vpid and vtype when switching from
+ a video to an audio channel
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1478,6 +1482,7 @@ Marco Schl
  for a patch that was used to implement handling of DVB-S2
  for fixing setting the date in the channel display of the classic and sttng skins,
  to avoid unnecessary OSD access
+ for changing cDvbDevice::GrabImage() to use V4L2
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -2201,6 +2206,7 @@ Frank Schmirler <vdr@schmirler.de>
  for making entering text via the numeric keys check the characters against the
  allowed characters
  for fixing handling address masks in SVDRP host settings
+ for fixing handling the 'pointer field' in generating and parsing PAT/PMT
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
diff --git a/HISTORY b/HISTORY
index 239e00bc8..68bdc338b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5848,3 +5848,66 @@ Video Disk Recorder Revision History
   For good replay in Transfer Mode on full featured DVB cards you may want to apply
   the patch from ftp://ftp.cadsoft.de/vdr/Developer/av7110_v4ldvb_api5_audiobuf_test_1.diff
   to the driver (thanks to Oliver Endriss).
+
+2009-01-06: Version 1.7.3
+
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Fixed handling the 'pointer field' in generating and parsing PAT/PMT (thanks to
+  Frank Schmirler).
+- Fixed handling modulation types for DVB-S transponders when processing the NIT.
+- Changed cDvbDevice::GrabImage() to use V4L2 (thanks to Marco Schl��ler).
+- Added a poll to cDvbDevice::PlayVideo() and cDvbDevice::PlayAudio() to avoid
+  excessive CPU load (this is just a makeshift solution until the FF DVB cards
+  can play TS directly).
+- The recording format is now Transport Stream. Existing recordings in PES format
+  can still be replayed and edited, but new recordings are done in TS.
+  All code for recording in PES has been removed.
+  The following changes were made to switch to TS recording format:
+  + The index file format has been changed to support file sizes of up to 1TB
+    (previously 2GB), and up to 65535 separate files per recording (previously
+    255).
+  + The recording file names are now of the form 00001.ts (previously 001.vdr).
+  + The frame rate is now detected by looking at two subsequent PTS values.
+    The "frame duration" (in multiples of 1/90000) is stored in the info.vdr
+    file using the new tag F (thanks to Artur Skawina for helping to get the
+    IndexToHMSF() calculation right).
+  + Several functions now have an additional parameter FramesPerSecond.
+  + Several functions now have an additional parameter IsPesRecording.
+  + The functionality of cFileWriter was moved into cRecorder, and cRemux is
+    now obsolete. This also avoids one level of data copying while recording.
+  + cRemux, cRingBufferLinearPes, cTS2PES and all c*Repacker classes have been
+    removed.
+  + A PAT/PMT is inserted before every independent frame, so that no extra
+    measures need to be taken when editing a recording.
+  + The directory name for a recording has been changed from
+    YYYY-MM-DD-hh[.:]mm.pr.lt.rec (pr=priority, lt=lifetime) to
+    YYYY-MM-DD-hh.mm.ch-ri.rec (ch=channel, ri=resumeId).
+    Priority and Lifetime are now stored in the info.vdr file with the new
+    tags P and L (if no such file exists, the maximum values are assumed by
+    default, which avoids inadvertently deleting a recording if disk space
+    is low). No longer storing Priority and Lifetime in the directory name
+    avoids starting a new recording if one of these is changed in the timer
+    and the recording is re-started for some reason.
+    Instead of Priority and Lifetime, the directory name now contains the
+    channel number from which the recording was made, and the "resume id" of
+    this instance of VDR. This avoids problems if several VDR instances record
+    the same show on different channels, or even on the same channel.
+    The '-' between channel number and resumeId prevents older versions of
+    VDR from "seeing" these recordings, which makes sure they won't even try
+    to replay them, or remove them in case the disk runs full.
+  + The semantics of PlayTs*() have been changed. These functions are now
+    required to return the given Length (which is TS_SIZE) if they have
+    processed the TS packet.
+  + The files "index", "info", "marks" and "resume" within a TS recording
+    directory are now created without the ".vdr" extension.
+  + The "resume" file is no longer a binary file, but contains tagged lines
+    to be able to store additional information, like the selected audio or
+    subtitle track.
+  + cDevice::StillPicture() will now be called with either TS or PES data.
+  + cDvbPlayer::Goto() no longer appends a "sequence end code" to the data.
+    If the output device needs this, it has to take care of it by itself.
+- Fixed cPatPmtParser::ParsePmt() to reset vpid and vtype when switching from
+  a video to an audio channel (thanks to Reinhard Nissl).
+- cDvbDevice now uses the FE_CAN_2G_MODULATION flag to determine whether a device
+  can handle DVB-S2. The #define is still there to allow people with older drivers
+  who don't need DVB-S2 to use this version without pathcing.
diff --git a/Makefile b/Makefile
index c6efa3733..74a683394 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.2 2008/05/03 10:13:43 kls Exp $
+# $Id: Makefile 2.3 2008/12/24 15:21:09 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -60,6 +60,8 @@ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
 
 DEFINES += -D_GNU_SOURCE
 
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DCONFDIR=\"$(CONFDIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
diff --git a/config.h b/config.h
index 8b672ff18..76c856677 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.4 2008/09/14 13:46:13 kls Exp $
+ * $Id: config.h 2.5 2008/12/24 14:29:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.2"
-#define VDRVERSNUM   10702  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.3"
+#define VDRVERSNUM   10703  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.0"
-#define APIVERSNUM   10700  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.3"
+#define APIVERSNUM   10703  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index a19dba01e..20a9e676f 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.0 2008/01/13 12:22:21 kls Exp $
+ * $Id: cutter.c 2.1 2009/01/06 14:40:48 kls Exp $
  */
 
 #include "cutter.h"
@@ -37,12 +37,14 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
   fromFile = toFile = NULL;
   fromFileName = toFileName = NULL;
   fromIndex = toIndex = NULL;
-  if (fromMarks.Load(FromFileName) && fromMarks.Count()) {
-     fromFileName = new cFileName(FromFileName, false, true);
-     toFileName = new cFileName(ToFileName, true, true);
-     fromIndex = new cIndexFile(FromFileName, false);
-     toIndex = new cIndexFile(ToFileName, true);
-     toMarks.Load(ToFileName); // doesn't actually load marks, just sets the file name
+  cRecording Recording(FromFileName);
+  bool isPesRecording = Recording.IsPesRecording();
+  if (fromMarks.Load(FromFileName, Recording.FramesPerSecond(), isPesRecording) && fromMarks.Count()) {
+     fromFileName = new cFileName(FromFileName, false, true, isPesRecording);
+     toFileName = new cFileName(ToFileName, true, true, isPesRecording);
+     fromIndex = new cIndexFile(FromFileName, false, isPesRecording);
+     toIndex = new cIndexFile(ToFileName, true, isPesRecording);
+     toMarks.Load(ToFileName, Recording.FramesPerSecond(), isPesRecording); // doesn't actually load marks, just sets the file name
      Start();
      }
   else
@@ -69,7 +71,7 @@ void cCuttingThread::Action(void)
      fromFile->SetReadAhead(MEGABYTE(20));
      int Index = Mark->position;
      Mark = fromMarks.Next(Mark);
-     int FileSize = 0;
+     off_t FileSize = 0;
      int CurrentFileNumber = 0;
      int LastIFrame = 0;
      toMarks.Add(0);
@@ -78,9 +80,10 @@ void cCuttingThread::Action(void)
      bool LastMark = false;
      bool cutIn = true;
      while (Running()) {
-           uchar FileNumber;
-           int FileOffset, Length;
-           uchar PictureType;
+           uint16_t FileNumber;
+           off_t FileOffset;
+           int Length;
+           bool Independent;
 
            // Make sure there is enough disk space:
 
@@ -88,7 +91,7 @@ void cCuttingThread::Action(void)
 
            // Read one frame:
 
-           if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) {
+           if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &Independent, &Length)) {
               if (FileNumber != CurrentFileNumber) {
                  fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
                  fromFile->SetReadAhead(MEGABYTE(20));
@@ -119,7 +122,7 @@ void cCuttingThread::Action(void)
 
            // Write one frame:
 
-           if (PictureType == I_FRAME) { // every file shall start with an I_FRAME
+           if (Independent) { // every file shall start with an independent frame
               if (LastMark) // edited version shall end before next I-frame
                  break;
               if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
@@ -141,7 +144,7 @@ void cCuttingThread::Action(void)
               error = "safe_write";
               break;
               }
-           if (!toIndex->Write(PictureType, toFileName->Number(), FileSize)) {
+           if (!toIndex->Write(Independent, toFileName->Number(), FileSize)) {
               error = "toIndex";
               break;
               }
diff --git a/device.c b/device.c
index 7d42a5eb6..8cd0b1e18 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.4 2008/12/13 14:30:28 kls Exp $
+ * $Id: device.c 2.5 2009/01/06 09:55:13 kls Exp $
  */
 
 #include "device.h"
@@ -1014,6 +1014,48 @@ void cDevice::Mute(void)
 
 void cDevice::StillPicture(const uchar *Data, int Length)
 {
+  if (Data[0] == 0x47) {
+     // TS data
+     cTsToPes TsToPes;
+     uchar *buf = NULL;
+     int Size = 0;
+     while (Length >= TS_SIZE) {
+           int PayloadOffset = TsPayloadOffset(Data);
+           int Pid = TsPid(Data);
+           if (Pid == 0)
+              patPmtParser.ParsePat(Data + PayloadOffset, TS_SIZE - PayloadOffset);
+           else if (Pid == patPmtParser.PmtPid())
+              patPmtParser.ParsePmt(Data + PayloadOffset, TS_SIZE - PayloadOffset);
+           else if (Pid == patPmtParser.Vpid()) {
+              if (TsPayloadStart(Data)) {
+                 int l;
+                 while (const uchar *p = TsToPes.GetPes(l)) {
+                       int Offset = Size;
+                       Size += l;
+                       buf = (uchar *)realloc(buf, Size);
+                       if (!buf)
+                          return;
+                       memcpy(buf + Offset, p, l);
+                       }
+                 TsToPes.Reset();
+                 }
+              TsToPes.PutTs(Data, TS_SIZE);
+              }
+           Length -= TS_SIZE;
+           Data += TS_SIZE;
+           }
+     int l;
+     while (const uchar *p = TsToPes.GetPes(l)) {
+           int Offset = Size;
+           Size += l;
+           buf = (uchar *)realloc(buf, Size);
+           if (!buf)
+              return;
+           memcpy(buf + Offset, p, l);
+           }
+     StillPicture(buf, Size);
+     free(buf);
+     }
 }
 
 bool cDevice::Replaying(void) const
@@ -1301,6 +1343,11 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
         return Length;
         }
      }
+  else if (Data == NULL) {
+     tsToPesVideo.Reset();
+     tsToPesAudio.Reset();
+     tsToPesSubtitle.Reset();
+     }
   return -1;
 }
 
@@ -1328,7 +1375,6 @@ bool cDevice::Receiving(bool CheckAny) const
   return false;
 }
 
-#define TS_SCRAMBLING_CONTROL  0xC0
 #define TS_SCRAMBLING_TIMEOUT     3 // seconds to wait until a TS becomes unscrambled
 #define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked as known to decrypt
 
diff --git a/device.h b/device.h
index 2ce658c03..7c4a70988 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.3 2008/09/14 13:44:54 kls Exp $
+ * $Id: device.h 2.4 2009/01/05 16:28:06 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -518,8 +518,7 @@ class cDevice : public cThread {
        ///< Data points to exactly one complete TS packet of the given Length
        ///< (which is always TS_SIZE).
        ///< PlayTsVideo() shall process the packet either as a whole (returning
-       ///< a positive number, which needs not necessarily be Length) or not at all
-       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< The default implementation collects all incoming TS payload belonging
        ///< to one PES packet and calls PlayVideo() with the resulting packet.
   virtual int PlayTsAudio(const uchar *Data, int Length);
@@ -527,8 +526,7 @@ class cDevice : public cThread {
        ///< Data points to exactly one complete TS packet of the given Length
        ///< (which is always TS_SIZE).
        ///< PlayTsAudio() shall process the packet either as a whole (returning
-       ///< a positive number, which needs not necessarily be Length) or not at all
-       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< The default implementation collects all incoming TS payload belonging
        ///< to one PES packet and calls PlayAudio() with the resulting packet.
   virtual int PlayTsSubtitle(const uchar *Data, int Length);
@@ -536,8 +534,7 @@ class cDevice : public cThread {
        ///< Data points to exactly one complete TS packet of the given Length
        ///< (which is always TS_SIZE).
        ///< PlayTsSubtitle() shall process the packet either as a whole (returning
-       ///< a positive number, which needs not necessarily be Length) or not at all
-       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< The default implementation collects all incoming TS payload belonging
        ///< to one PES packet and displays the resulting subtitle via the OSD.
 public:
@@ -573,6 +570,10 @@ class cDevice : public cThread {
        ///< all registered cAudio objects are notified.
   virtual void StillPicture(const uchar *Data, int Length);
        ///< Displays the given I-frame as a still picture.
+       ///< Data points either to TS (first byte is 0x47) or PES (first byte
+       ///< is 0x00) data of the given Length. The default implementation
+       ///< converts TS to PES and calls itself again, allowing a derived class
+       ///< to display PES if it can't handle TS directly.
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
        ///< Returns true if the device itself or any of the file handles in
        ///< Poller is ready for further action.
@@ -600,12 +601,14 @@ class cDevice : public cThread {
        ///< which is necessary for trick modes like 'fast forward'.
        ///< Data points to a single TS packet, Length is always TS_SIZE (the total
        ///< size of a single TS packet).
+       ///< If Data is NULL any leftover data from a previous call will be
+       ///< discarded.
        ///< A derived device can reimplement this function to handle the
        ///< TS packets itself. Any packets the derived function can't handle
        ///< must be sent to the base class function. This applies especially
        ///< to the PAT/PMT packets.
        ///< Returns -1 in case of error, otherwise the number of actually
-       ///< processed bytes is returned, which may be less than Length.
+       ///< processed bytes is returned, which must be Length.
        ///< PlayTs() shall process the packet either as a whole (returning
        ///< a positive number, which needs not necessarily be Length) or not at all
        ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
diff --git a/dvbdevice.c b/dvbdevice.c
index e0b05a15d..6aa0056fe 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.6 2008/12/13 14:38:07 kls Exp $
+ * $Id: dvbdevice.c 2.10 2009/01/06 14:52:54 kls Exp $
  */
 
 #include "dvbdevice.h"
 #include <errno.h>
 #include <limits.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
@@ -491,7 +491,7 @@ cDvbDevice::cDvbDevice(int n)
   if (fd_frontend >= 0) {
      if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) >= 0) {
         switch (frontendInfo.type) {
-          case FE_QPSK: frontendType = (frontendInfo.caps & FE_CAN_2ND_GEN_MODULATION) ? SYS_DVBS2 : SYS_DVBS; break;
+          case FE_QPSK: frontendType = (frontendInfo.caps & FE_CAN_2G_MODULATION) ? SYS_DVBS2 : SYS_DVBS; break;
           case FE_OFDM: frontendType = SYS_DVBT; break;
           case FE_QAM:  frontendType = SYS_DVBC_ANNEX_AC; break;
           case FE_ATSC: frontendType = SYS_ATSC; break;
@@ -604,69 +604,103 @@ uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int S
   int videoDev = open(buffer, O_RDWR);
   if (videoDev >= 0) {
      uchar *result = NULL;
-     struct video_mbuf mbuf;
-     if (ioctl(videoDev, VIDIOCGMBUF, &mbuf) == 0) {
-        int msize = mbuf.size;
-        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-        if (mem && mem != (unsigned char *)-1) {
-           // set up the size and RGB
-           struct video_capability vc;
-           if (ioctl(videoDev, VIDIOCGCAP, &vc) == 0) {
-              struct video_mmap vm;
-              vm.frame = 0;
-              if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
-                  (SizeY > 0) && (SizeY <= vc.maxheight)) {
-                 vm.width = SizeX;
-                 vm.height = SizeY;
-                 }
-              else {
-                 vm.width = vc.maxwidth;
-                 vm.height = vc.maxheight;
-                 }
-              vm.format = VIDEO_PALETTE_RGB24;
-              if (ioctl(videoDev, VIDIOCMCAPTURE, &vm) == 0 && ioctl(videoDev, VIDIOCSYNC, &vm.frame) == 0) {
-                 // make RGB out of BGR:
-                 int memsize = vm.width * vm.height;
-                 unsigned char *mem1 = mem;
-                 for (int i = 0; i < memsize; i++) {
-                     unsigned char tmp = mem1[2];
-                     mem1[2] = mem1[0];
-                     mem1[0] = tmp;
-                     mem1 += 3;
-                     }
-
-                 if (Quality < 0)
-                    Quality = 100;
-
-                 dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
-                 if (Jpeg) {
-                    // convert to JPEG:
-                    result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality);
-                    if (!result)
-                       esyslog("ERROR: failed to convert image to JPEG");
-                    }
-                 else {
-                    // convert to PNM:
-                    char buf[32];
-                    snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", vm.width, vm.height);
-                    int l = strlen(buf);
-                    int bytes = memsize * 3;
-                    Size = l + bytes;
-                    result = MALLOC(uchar, Size);
-                    if (result) {
-                       memcpy(result, buf, l);
-                       memcpy(result + l, mem, bytes);
+     // set up the size and RGB
+     v4l2_format fmt;
+     memset(&fmt, 0, sizeof(fmt));
+     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     fmt.fmt.pix.width = SizeX;
+     fmt.fmt.pix.height = SizeY;
+     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
+     fmt.fmt.pix.field = V4L2_FIELD_ANY;
+     if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) {
+        v4l2_requestbuffers reqBuf;
+        memset(&reqBuf, 0, sizeof(reqBuf));
+        reqBuf.count = 2;
+        reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        reqBuf.memory = V4L2_MEMORY_MMAP;
+        if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) {
+           v4l2_buffer mbuf;
+           memset(&mbuf, 0, sizeof(mbuf));
+           mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+           mbuf.memory = V4L2_MEMORY_MMAP;
+           if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) {
+              int msize = mbuf.length;
+              unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
+              if (mem && mem != (unsigned char *)-1) {
+                 v4l2_buffer buf;
+                 memset(&buf, 0, sizeof(buf));
+                 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                 buf.memory = V4L2_MEMORY_MMAP;
+                 buf.index = 0;
+                 if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) {
+                    v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                    if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) {
+                       memset(&buf, 0, sizeof(buf));
+                       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                       buf.memory = V4L2_MEMORY_MMAP;
+                       buf.index = 0;
+                       if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) {
+                          if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) {
+                             // make RGB out of BGR:
+                             int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height;
+                             unsigned char *mem1 = mem;
+                             for (int i = 0; i < memsize; i++) {
+                                 unsigned char tmp = mem1[2];
+                                 mem1[2] = mem1[0];
+                                 mem1[0] = tmp;
+                                 mem1 += 3;
+                                 }
+
+                             if (Quality < 0)
+                                Quality = 100;
+
+                             dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height);
+                             if (Jpeg) {
+                                // convert to JPEG:
+                                result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality);
+                                if (!result)
+                                   esyslog("ERROR: failed to convert image to JPEG");
+                                }
+                             else {
+                                // convert to PNM:
+                                char buf[32];
+                                snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
+                                int l = strlen(buf);
+                                int bytes = memsize * 3;
+                                Size = l + bytes;
+                                result = MALLOC(uchar, Size);
+                                if (result) {
+                                   memcpy(result, buf, l);
+                                   memcpy(result + l, mem, bytes);
+                                   }
+                                else
+                                   esyslog("ERROR: failed to convert image to PNM");
+                                }
+                             }
+                          else
+                             esyslog("ERROR: video device VIDIOC_STREAMOFF failed");
+                          }
+                       else
+                          esyslog("ERROR: video device VIDIOC_DQBUF failed");
                        }
                     else
-                       esyslog("ERROR: failed to convert image to PNM");
+                       esyslog("ERROR: video device VIDIOC_STREAMON failed");
                     }
+                 else
+                    esyslog("ERROR: video device VIDIOC_QBUF failed");
+                 munmap(mem, msize);
                  }
+              else
+                 esyslog("ERROR: failed to memmap video device");
               }
-           munmap(mem, msize);
+           else
+              esyslog("ERROR: video device VIDIOC_QUERYBUF failed");
            }
         else
-           esyslog("ERROR: failed to memmap video device");
+           esyslog("ERROR: video device VIDIOC_REQBUFS failed");
         }
+     else
+        esyslog("ERROR: video device VIDIOC_S_FMT failed");
      close(videoDev);
      return result;
      }
@@ -1179,7 +1213,11 @@ void cDvbDevice::Mute(void)
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
 {
-  if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
+  if (Data[0] == 0x47) {
+     // TS data
+     cDevice::StillPicture(Data, Length);
+     }
+  else if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
      // PES data
      char *buf = MALLOC(char, Length);
      if (!buf)
@@ -1269,6 +1307,10 @@ int cDvbDevice::PlayVideo(const uchar *Data, int Length)
   int w;
   do {
      w = WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+     if (w < 0 && errno == EAGAIN) {
+        cPoller Poller(fd_video, true);
+        Poller.Poll(200);
+        }
      } while (w != Length);
   return w;
 }
@@ -1278,6 +1320,10 @@ int cDvbDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
   int w;
   do {
      w = WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
+     if (w < 0 && errno == EAGAIN) {
+        cPoller Poller(fd_audio, true);
+        Poller.Poll(200);
+        }
      } while (w != Length);
   return w;
 }
@@ -1289,8 +1335,8 @@ int cDvbDevice::PlayTsVideo(const uchar *Data, int Length)
 
 int cDvbDevice::PlayTsAudio(const uchar *Data, int Length)
 {
-  Length = TsGetPayload(&Data);
-  return PlayAudio(Data, Length, 0);
+  int w = PlayAudio(Data, TsGetPayload(&Data), 0);
+  return w >= 0 ? Length : w;
 }
 
 bool cDvbDevice::OpenDvr(void)
diff --git a/dvbplayer.c b/dvbplayer.c
index 0fe8d3499..9de7e4861 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.0 2008/02/09 15:10:54 kls Exp $
+ * $Id: dvbplayer.c 2.1 2009/01/05 16:52:40 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -182,8 +182,8 @@ bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
 
 #define PLAYERBUFSIZE  MEGABYTE(1)
 
-// The number of frames to back up when resuming an interrupted replay session:
-#define RESUMEBACKUP (10 * FRAMESPERSEC)
+// The number of seconds to back up when resuming an interrupted replay session:
+#define RESUMEBACKUP 10
 
 class cDvbPlayer : public cPlayer, cThread {
 private:
@@ -196,6 +196,8 @@ class cDvbPlayer : public cPlayer, cThread {
   cFileName *fileName;
   cIndexFile *index;
   cUnbufferedFile *replayFile;
+  double framesPerSecond;
+  bool isPesRecording;
   bool eof;
   bool firstPacket;
   ePlayModes playMode;
@@ -223,6 +225,7 @@ class cDvbPlayer : public cPlayer, cThread {
   int SkipFrames(int Frames);
   void SkipSeconds(int Seconds);
   void Goto(int Position, bool Still = false);
+  virtual double FramesPerSecond(void) { return framesPerSecond; }
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
   };
@@ -240,6 +243,9 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   ringBuffer = NULL;
   backTrace = NULL;
   index = NULL;
+  cRecording Recording(FileName);
+  framesPerSecond = Recording.FramesPerSecond();
+  isPesRecording = Recording.IsPesRecording();
   eof = false;
   firstPacket = true;
   playMode = pmPlay;
@@ -249,13 +255,13 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   readFrame = NULL;
   playFrame = NULL;
   isyslog("replay %s", FileName);
-  fileName = new cFileName(FileName, false);
+  fileName = new cFileName(FileName, false, false, isPesRecording);
   replayFile = fileName->Open();
   if (!replayFile)
      return;
   ringBuffer = new cRingBufferFrame(PLAYERBUFSIZE);
   // Create the index file:
-  index = new cIndexFile(FileName, false);
+  index = new cIndexFile(FileName, false, isPesRecording);
   if (!index)
      esyslog("ERROR: can't allocate index");
   else if (!index->Ok()) {
@@ -327,8 +333,8 @@ int cDvbPlayer::Resume(void)
   if (index) {
      int Index = index->GetResume();
      if (Index >= 0) {
-        uchar FileNumber;
-        int FileOffset;
+        uint16_t FileNumber;
+        off_t FileOffset;
         if (index->Get(Index, &FileNumber, &FileOffset) && NextFile(FileNumber, FileOffset))
            return Index;
         }
@@ -341,7 +347,7 @@ bool cDvbPlayer::Save(void)
   if (index) {
      int Index = writeIndex;
      if (Index >= 0) {
-        Index -= RESUMEBACKUP;
+        Index -= RESUMEBACKUP * framesPerSecond;
         if (Index > 0)
            Index = index->GetNextIFrame(Index, false);
         else
@@ -371,7 +377,7 @@ void cDvbPlayer::Action(void)
 
   readIndex = Resume();
   if (readIndex >= 0)
-     isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true));
+     isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
 
   nonBlockingFileReader = new cNonBlockingFileReader;
   int Length = 0;
@@ -397,8 +403,8 @@ void cDvbPlayer::Action(void)
               if (!readFrame && (replayFile || readIndex >= 0)) {
                  if (!nonBlockingFileReader->Reading()) {
                     if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
-                       uchar FileNumber;
-                       int FileOffset;
+                       uint16_t FileNumber;
+                       off_t FileOffset;
                        bool TimeShiftMode = index->IsStillRecording();
                        int Index = -1;
                        if (DeviceHasIBPTrickSpeed() && playDir == pdForward) {
@@ -435,8 +441,8 @@ void cDvbPlayer::Action(void)
                        readIndex = Index;
                        }
                     else if (index) {
-                       uchar FileNumber;
-                       int FileOffset;
+                       uint16_t FileNumber;
+                       off_t FileOffset;
                        readIndex++;
                        if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
                           readIndex = -1;
@@ -496,14 +502,22 @@ void cDvbPlayer::Action(void)
                  pc = playFrame->Count();
                  if (p) {
                     if (firstPacket) {
-                       PlayPes(NULL, 0);
-                       cRemux::SetBrokenLink(p, pc);
+                       if (isPesRecording) {
+                          PlayPes(NULL, 0);
+                          cRemux::SetBrokenLink(p, pc);
+                          }
+                       else
+                          PlayTs(NULL, 0);
                        firstPacket = false;
                        }
                     }
                  }
               if (p) {
-                 int w = PlayPes(p, pc, playMode != pmPlay);
+                 int w;
+                 if (isPesRecording)
+                    w = PlayPes(p, pc, playMode != pmPlay);
+                 else
+                    w = PlayTs(p, TS_SIZE, playMode != pmPlay);
                  if (w > 0) {
                     p += w;
                     pc -= w;
@@ -513,7 +527,7 @@ void cDvbPlayer::Action(void)
                     break;
                     }
                  }
-              if (pc == 0) {
+              if (pc <= 0) {
                  writeIndex = playFrame->Index();
                  backTrace->Add(playFrame->Index(), playFrame->Count());
                  ringBuffer->Drop(playFrame);
@@ -678,7 +692,7 @@ void cDvbPlayer::SkipSeconds(int Seconds)
      Empty();
      int Index = writeIndex;
      if (Index >= 0) {
-        Index = max(Index + Seconds * FRAMESPERSEC, 0);
+        Index = max(Index + SecondsToFrames(Seconds, framesPerSecond), 0);
         if (Index > 0)
            Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
         if (Index >= 0)
@@ -695,38 +709,16 @@ void cDvbPlayer::Goto(int Index, bool Still)
      Empty();
      if (++Index <= 0)
         Index = 1; // not '0', to allow GetNextIFrame() below to work!
-     uchar FileNumber;
-     int FileOffset, Length;
+     uint16_t FileNumber;
+     off_t FileOffset;
+     int Length;
      Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
      if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
-        uchar b[MAXFRAMESIZE + 4 + 5 + 4];
+        uchar b[MAXFRAMESIZE];
         int r = ReadFrame(replayFile, b, Length, sizeof(b));
         if (r > 0) {
            if (playMode == pmPause)
               DevicePlay();
-           // append sequence end code to get the image shown immediately with softdevices
-           if (r > 6 && (b[3] & 0xF0) == 0xE0) { // make sure to append it only to a video packet
-              b[r++] = 0x00;
-              b[r++] = 0x00;
-              b[r++] = 0x01;
-              b[r++] = b[3];
-              if (b[6] & 0x80) { // MPEG 2
-                 b[r++] = 0x00;
-                 b[r++] = 0x07;
-                 b[r++] = 0x80;
-                 b[r++] = 0x00;
-                 b[r++] = 0x00;
-                 }
-              else { // MPEG 1
-                 b[r++] = 0x00;
-                 b[r++] = 0x05;
-                 b[r++] = 0x0F;
-                 }
-              b[r++] = 0x00;
-              b[r++] = 0x00;
-              b[r++] = 0x01;
-              b[r++] = 0xB7;
-              }
            DeviceStillPicture(b, r);
            }
         playMode = pmStill;
diff --git a/menu.c b/menu.c
index 58ea2dd74..beb7fb879 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.3 2008/11/22 15:18:00 kls Exp $
+ * $Id: menu.c 2.4 2009/01/06 14:34:17 kls Exp $
  */
 
 #include "menu.h"
@@ -1989,10 +1989,13 @@ eOSState cMenuRecordings::Rewind(void)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
-     cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
-     cResumeFile ResumeFile(ri->FileName());
-     ResumeFile.Delete();
-     return Play();
+     cRecording *recording = GetRecording(ri);
+     if (recording) {
+        cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
+        cResumeFile ResumeFile(ri->FileName(), recording->IsPesRecording());
+        ResumeFile.Delete();
+        return Play();
+        }
      }
   return osContinue;
 }
@@ -4014,9 +4017,9 @@ cReplayControl::cReplayControl(void)
   lastSpeed = -2; // an invalid value
   timeoutShow = 0;
   timeSearchActive = false;
-  marks.Load(fileName);
   cRecording Recording(fileName);
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
+  marks.Load(fileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
   SetTrackDescriptions(false);
 }
 
@@ -4126,7 +4129,7 @@ bool cReplayControl::ShowProgress(bool Initial)
         lastCurrent = lastTotal = -1;
         }
      if (Total != lastTotal) {
-        displayReplay->SetTotal(IndexToHMSF(Total));
+        displayReplay->SetTotal(IndexToHMSF(Total, false, FramesPerSecond()));
         if (!Initial)
            displayReplay->Flush();
         }
@@ -4134,7 +4137,7 @@ bool cReplayControl::ShowProgress(bool Initial)
         displayReplay->SetProgress(Current, Total);
         if (!Initial)
            displayReplay->Flush();
-        displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames));
+        displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames, FramesPerSecond()));
         displayReplay->Flush();
         lastCurrent = Current;
         }
@@ -4167,8 +4170,8 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
 {
 #define STAY_SECONDS_OFF_END 10
   int Seconds = (timeSearchTime >> 24) * 36000 + ((timeSearchTime & 0x00FF0000) >> 16) * 3600 + ((timeSearchTime & 0x0000FF00) >> 8) * 600 + (timeSearchTime & 0x000000FF) * 60;
-  int Current = (lastCurrent / FRAMESPERSEC);
-  int Total = (lastTotal / FRAMESPERSEC);
+  int Current = (lastCurrent / FramesPerSecond());
+  int Total = (lastTotal / FramesPerSecond());
   switch (Key) {
     case k0 ... k9:
          if (timeSearchPos < 4) {
@@ -4195,7 +4198,7 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
     case kDown:
     case kOk:
          Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
-         Goto(Seconds * FRAMESPERSEC, Key == kDown || Key == kPause || Key == kOk);
+         Goto(SecondsToFrames(Seconds, FramesPerSecond()), Key == kDown || Key == kPause || Key == kOk);
          timeSearchActive = false;
          break;
     default:
@@ -4317,7 +4320,7 @@ void cReplayControl::EditTest(void)
         if ((m->Index() & 0x01) != 0)
            m = marks.Next(m);
         if (m) {
-           Goto(m->position - SecondsToFrames(3));
+           Goto(m->position - SecondsToFrames(3, FramesPerSecond()));
            Play();
            }
         }
diff --git a/nit.c b/nit.c
index 5155f2a0a..2ec89609c 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.2 2008/12/06 15:46:50 kls Exp $
+ * $Id: nit.c 2.3 2008/12/20 10:57:50 kls Exp $
  */
 
 #include "nit.h"
@@ -129,7 +129,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  char Polarization = Polarizations[sd->getPolarization()];
                  static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
                  int CodeRate = CodeRates[sd->getFecInner()];
-                 static int Modulations[] = { QPSK, PSK_8, QAM_16 };
+                 static int Modulations[] = { QAM_AUTO, QPSK, PSK_8, QAM_16 };
                  int Modulation = Modulations[sd->getModulationType()];
                  int System = sd->getModulationSystem() ? SYS_DVBS2 : SYS_DVBS;
                  static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
diff --git a/player.h b/player.h
index 7279102c4..9bd5a368c 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 2.1 2008/08/15 14:07:48 kls Exp $
+ * $Id: player.h 2.2 2009/01/05 13:04:10 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -50,6 +50,8 @@ class cPlayer {
   cPlayer(ePlayMode PlayMode = pmAudioVideo);
   virtual ~cPlayer();
   bool IsAttached(void) { return device != NULL; }
+  virtual double FramesPerSecond(void) { return DEFAULTFRAMESPERSECOND; }
+       // Returns the number of frames per second of the currently played material.
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return false; }
        // Returns the current and total frame index, optionally snapped to the
        // nearest I-frame.
@@ -82,6 +84,7 @@ class cControl : public cOsdObject {
   virtual ~cControl();
   virtual void Hide(void) = 0;
   virtual cOsdObject *GetInfo(void);
+  double FramesPerSecond(void) { return player->FramesPerSecond(); }
   bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
   bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
   static void Launch(cControl *Control);
diff --git a/po/ru_RU.po b/po/ru_RU.po
index a6d8a4fd1..a3c19cd9b 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-12-14 16:10+0100\n"
-"PO-Revision-Date: 2008-02-15 16:37+0100\n"
+"PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgid "off"
 msgstr "����"
 
 msgid "on"
-msgstr ""
+msgstr "���"
 
 msgid "auto"
 msgstr "����"
@@ -287,7 +287,7 @@ msgid "Polarization"
 msgstr "�����������"
 
 msgid "System"
-msgstr ""
+msgstr "�������"
 
 msgid "Srate"
 msgstr "����. ��������"
@@ -317,7 +317,7 @@ msgid "Hierarchy"
 msgstr "��������"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
diff --git a/recorder.c b/recorder.c
index 93424da73..83024ac1b 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,13 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.0 2007/02/24 16:36:24 kls Exp $
+ * $Id: recorder.c 2.1 2009/01/06 12:38:01 kls Exp $
  */
 
 #include "recorder.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
 #include "shutdown.h"
 
 #define RECORDERBUFSIZE  MEGABYTE(5)
@@ -22,33 +19,34 @@
 #define MINFREEDISKSPACE    (512) // MB
 #define DISKCHECKINTERVAL   100 // seconds
 
-// --- cFileWriter -----------------------------------------------------------
-
-class cFileWriter : public cThread {
-private:
-  cRemux *remux;
-  cFileName *fileName;
-  cIndexFile *index;
-  uchar pictureType;
-  int fileSize;
-  cUnbufferedFile *recordFile;
-  time_t lastDiskSpaceCheck;
-  bool RunningLowOnDiskSpace(void);
-  bool NextFile(void);
-protected:
-  virtual void Action(void);
-public:
-  cFileWriter(const char *FileName, cRemux *Remux);
-  virtual ~cFileWriter();
-  };
+// --- cRecorder -------------------------------------------------------------
 
-cFileWriter::cFileWriter(const char *FileName, cRemux *Remux)
-:cThread("file writer")
+cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
+:cReceiver(ChannelID, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
+,cThread("recording")
+,recordingInfo(FileName)
 {
+  // Make sure the disk is up and running:
+
+  SpinUpDisk(FileName);
+
+  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
+  ringBuffer->SetTimeouts(0, 100);
+  cChannel *Channel = Channels.GetByChannelID(ChannelID);
+  int Pid = VPid;
+  int Type = Channel ? Channel->Vtype() : 0;
+  if (!Pid && APids) {
+     Pid = APids[0];
+     Type = 0x04;
+     }
+  if (!Pid && DPids) {
+     Pid = DPids[0];
+     Type = 0x06;
+     }
+  frameDetector = new cFrameDetector(Pid, Type);
+  patPmtGenerator.GeneratePmt(ChannelID);
   fileName = NULL;
-  remux = Remux;
   index = NULL;
-  pictureType = NO_PICTURE;
   fileSize = 0;
   lastDiskSpaceCheck = time(NULL);
   fileName = new cFileName(FileName, true);
@@ -62,14 +60,16 @@ cFileWriter::cFileWriter(const char *FileName, cRemux *Remux)
      // let's continue without index, so we'll at least have the recording
 }
 
-cFileWriter::~cFileWriter()
+cRecorder::~cRecorder()
 {
-  Cancel(3);
+  Detach();
   delete index;
   delete fileName;
+  delete frameDetector;
+  delete ringBuffer;
 }
 
-bool cFileWriter::RunningLowOnDiskSpace(void)
+bool cRecorder::RunningLowOnDiskSpace(void)
 {
   if (time(NULL) > lastDiskSpaceCheck + DISKCHECKINTERVAL) {
      int Free = FreeDiskSpaceMB(fileName->Name());
@@ -82,10 +82,10 @@ bool cFileWriter::RunningLowOnDiskSpace(void)
   return false;
 }
 
-bool cFileWriter::NextFile(void)
+bool cRecorder::NextFile(void)
 {
-  if (recordFile && pictureType == I_FRAME) { // every file shall start with an I_FRAME
-     if (fileSize > MEGABYTE(Setup.MaxVideoFileSize) || RunningLowOnDiskSpace()) {
+  if (recordFile && frameDetector->IndependentFrame()) { // every file shall start with an independent frame
+     if (fileSize > MEGABYTE(off_t(Setup.MaxVideoFileSize)) || RunningLowOnDiskSpace()) {
         recordFile = fileName->NextFile();
         fileSize = 0;
         }
@@ -93,67 +93,10 @@ bool cFileWriter::NextFile(void)
   return recordFile != NULL;
 }
 
-void cFileWriter::Action(void)
-{
-  time_t t = time(NULL);
-  while (Running()) {
-        int Count;
-        uchar *p = remux->Get(Count, &pictureType);
-        if (p) {
-           if (!Running() && pictureType == I_FRAME) // finish the recording before the next 'I' frame
-              break;
-           if (NextFile()) {
-              if (index && pictureType != NO_PICTURE)
-                 index->Write(pictureType, fileName->Number(), fileSize);
-              if (recordFile->Write(p, Count) < 0) {
-                 LOG_ERROR_STR(fileName->Name());
-                 break;
-                 }
-              fileSize += Count;
-              remux->Del(Count);
-              }
-           else
-              break;
-           t = time(NULL);
-           }
-        else if (time(NULL) - t > MAXBROKENTIMEOUT) {
-           esyslog("ERROR: video data stream broken");
-           ShutdownHandler.RequestEmergencyExit();
-           t = time(NULL);
-           }
-        }
-}
-
-// --- cRecorder -------------------------------------------------------------
-
-cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
-:cReceiver(ChannelID, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
-,cThread("recording")
-{
-  // Make sure the disk is up and running:
-
-  SpinUpDisk(FileName);
-
-  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
-  ringBuffer->SetTimeouts(0, 100);
-  remux = new cRemux(VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids, true);
-  writer = new cFileWriter(FileName, remux);
-}
-
-cRecorder::~cRecorder()
-{
-  Detach();
-  delete writer;
-  delete remux;
-  delete ringBuffer;
-}
-
 void cRecorder::Activate(bool On)
 {
-  if (On) {
-     writer->Start();
+  if (On)
      Start();
-     }
   else
      Cancel(3);
 }
@@ -169,15 +112,54 @@ void cRecorder::Receive(uchar *Data, int Length)
 
 void cRecorder::Action(void)
 {
+  time_t t = time(NULL);
+  bool Synced = false;
+  bool InfoWritten = false;
   while (Running()) {
         int r;
         uchar *b = ringBuffer->Get(r);
         if (b) {
-           int Count = remux->Put(b, r);
-           if (Count)
+           int Count = frameDetector->Analyze(b, r);
+           if (Count) {
+              if (!Running() && frameDetector->IndependentFrame()) // finish the recording before the next independent frame
+                 break;
+              if (Synced |= frameDetector->IndependentFrame()) { // start with first independent frame
+                 if (!InfoWritten) {
+                    if (recordingInfo.Read()) {
+                       if (frameDetector->FramesPerSecond() > 0 && recordingInfo.FramesPerSecond() != frameDetector->FramesPerSecond()) {
+                          recordingInfo.SetFramesPerSecond(frameDetector->FramesPerSecond());
+                          recordingInfo.Write();
+                          }
+                       }
+                    InfoWritten = true;
+                    }
+                 if (!NextFile())
+                    break;
+                 if (index && frameDetector->NewFrame())
+                    index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
+                 if (frameDetector->IndependentFrame()) {
+                    recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
+                    fileSize += TS_SIZE;
+                    int Index = 0;
+                    while (uchar *pmt = patPmtGenerator.GetPmt(Index)) {
+                          recordFile->Write(pmt, TS_SIZE);
+                          fileSize += TS_SIZE;
+                          }
+                    }
+                 if (recordFile->Write(b, Count) < 0) {
+                    LOG_ERROR_STR(fileName->Name());
+                    break;
+                    }
+                 fileSize += Count;
+                 t = time(NULL);
+                 }
               ringBuffer->Del(Count);
-           else
-              cCondWait::SleepMs(100); // avoid busy loop when resultBuffer is full in cRemux::Put()
+              }
+           }
+        if (time(NULL) - t > MAXBROKENTIMEOUT) {
+           esyslog("ERROR: video data stream broken");
+           ShutdownHandler.RequestEmergencyExit();
+           t = time(NULL);
            }
         }
 }
diff --git a/recorder.h b/recorder.h
index d0ce9bd14..40a32224b 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 2.0 2007/01/05 10:44:05 kls Exp $
+ * $Id: recorder.h 2.1 2009/01/06 10:44:58 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -16,13 +16,19 @@
 #include "ringbuffer.h"
 #include "thread.h"
 
-class cFileWriter;
-
 class cRecorder : public cReceiver, cThread {
 private:
   cRingBufferLinear *ringBuffer;
-  cRemux *remux;
-  cFileWriter *writer;
+  cFrameDetector *frameDetector;
+  cPatPmtGenerator patPmtGenerator;
+  cFileName *fileName;
+  cIndexFile *index;
+  cUnbufferedFile *recordFile;
+  cRecordingInfo recordingInfo;
+  off_t fileSize;
+  time_t lastDiskSpaceCheck;
+  bool RunningLowOnDiskSpace(void);
+  bool NextFile(void);
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
diff --git a/recording.c b/recording.c
index 340e68a7f..2948343c9 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.3 2008/06/12 21:46:08 kls Exp $
+ * $Id: recording.c 2.4 2009/01/06 14:41:11 kls Exp $
  */
 
 #include "recording.h"
@@ -12,6 +12,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -19,7 +20,6 @@
 #include "channels.h"
 #include "i18n.h"
 #include "interface.h"
-#include "remux.h" //XXX+ I_FRAME
 #include "skins.h"
 #include "tools.h"
 #include "videodir.h"
@@ -37,15 +37,17 @@
 #define DATAFORMAT   "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
 #define NAMEFORMAT   "%s/%s/" DATAFORMAT
 */
-#define DATAFORMAT   "%4d-%02d-%02d.%02d%*c%02d.%02d.%02d" RECEXT
-#define NAMEFORMAT   "%s/%s/" "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
+#define DATAFORMATPES   "%4d-%02d-%02d.%02d%*c%02d.%02d.%02d" RECEXT
+#define NAMEFORMATPES   "%s/%s/" "%4d-%02d-%02d.%02d.%02d.%02d.%02d" RECEXT
+#define DATAFORMATTS    "%4d-%02d-%02d.%02d.%02d.%d-%d" RECEXT
+#define NAMEFORMATTS    "%s/%s/" DATAFORMATTS
 
-#define RESUMEFILESUFFIX  "/resume%s%s.vdr"
+#define RESUMEFILESUFFIX  "/resume%s%s"
 #ifdef SUMMARYFALLBACK
 #define SUMMARYFILESUFFIX "/summary.vdr"
 #endif
-#define INFOFILESUFFIX    "/info.vdr"
-#define MARKSFILESUFFIX   "/marks.vdr"
+#define INFOFILESUFFIX    "/info"
+#define MARKSFILESUFFIX   "/marks"
 
 #define MINDISKSPACE 1024 // MB
 
@@ -202,12 +204,14 @@ void AssertFreeDiskSpace(int Priority, bool Force)
 
 // --- cResumeFile -----------------------------------------------------------
 
-cResumeFile::cResumeFile(const char *FileName)
+cResumeFile::cResumeFile(const char *FileName, bool IsPesRecording)
 {
-  fileName = MALLOC(char, strlen(FileName) + strlen(RESUMEFILESUFFIX) + 1);
+  isPesRecording = IsPesRecording;
+  const char *Suffix = isPesRecording ? RESUMEFILESUFFIX ".vdr" : RESUMEFILESUFFIX;
+  fileName = MALLOC(char, strlen(FileName) + strlen(Suffix) + 1);
   if (fileName) {
      strcpy(fileName, FileName);
-     sprintf(fileName + strlen(fileName), RESUMEFILESUFFIX, Setup.ResumeID ? "." : "", Setup.ResumeID ? *itoa(Setup.ResumeID) : "");
+     sprintf(fileName + strlen(fileName), Suffix, Setup.ResumeID ? "." : "", Setup.ResumeID ? *itoa(Setup.ResumeID) : "");
      }
   else
      esyslog("ERROR: can't allocate memory for resume file name");
@@ -227,16 +231,37 @@ int cResumeFile::Read(void)
         if ((st.st_mode & S_IWUSR) == 0) // no write access, assume no resume
            return -1;
         }
-     int f = open(fileName, O_RDONLY);
-     if (f >= 0) {
-        if (safe_read(f, &resume, sizeof(resume)) != sizeof(resume)) {
-           resume = -1;
+     if (isPesRecording) {
+        int f = open(fileName, O_RDONLY);
+        if (f >= 0) {
+           if (safe_read(f, &resume, sizeof(resume)) != sizeof(resume)) {
+              resume = -1;
+              LOG_ERROR_STR(fileName);
+              }
+           close(f);
+           }
+        else if (errno != ENOENT)
            LOG_ERROR_STR(fileName);
+        }
+     else {
+        FILE *f = fopen(fileName, "r");
+        if (f) {
+           cReadLine ReadLine;
+           char *s;
+           int line = 0;
+           while ((s = ReadLine.Read(f)) != NULL) {
+                 ++line;
+                 char *t = skipspace(s + 1);
+                 switch (*s) {
+                   case 'I': resume = atoi(t);
+                             break;
+                   }
+                 }
+           fclose(f);
            }
-        close(f);
+        else if (errno != ENOENT)
+           LOG_ERROR_STR(fileName);
         }
-     else if (errno != ENOENT)
-        LOG_ERROR_STR(fileName);
      }
   return resume;
 }
@@ -244,12 +269,24 @@ int cResumeFile::Read(void)
 bool cResumeFile::Save(int Index)
 {
   if (fileName) {
-     int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, DEFFILEMODE);
-     if (f >= 0) {
-        if (safe_write(f, &Index, sizeof(Index)) < 0)
+     if (isPesRecording) {
+        int f = open(fileName, O_WRONLY | O_CREAT | O_TRUNC, DEFFILEMODE);
+        if (f >= 0) {
+           if (safe_write(f, &Index, sizeof(Index)) < 0)
+              LOG_ERROR_STR(fileName);
+           close(f);
+           Recordings.ResetResume(fileName);
+           return true;
+           }
+        }
+     else {
+        FILE *f = fopen(fileName, "w");
+        if (f) {
+           fprintf(f, "I %d\n", Index);
+           fclose(f);
+           }
+        else
            LOG_ERROR_STR(fileName);
-        close(f);
-        Recordings.ResetResume(fileName);
         return true;
         }
      }
@@ -274,6 +311,10 @@ cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
   ownEvent = Event ? NULL : new cEvent(0);
   event = ownEvent ? ownEvent : Event;
   aux = NULL;
+  framesPerSecond = DEFAULTFRAMESPERSECOND;
+  priority = MAXPRIORITY;
+  lifetime = MAXLIFETIME;
+  fileName = NULL;
   if (Channel) {
      // Since the EPG data's component records can carry only a single
      // language code, let's see whether the channel's PID data has
@@ -322,11 +363,25 @@ cRecordingInfo::cRecordingInfo(const cChannel *Channel, const cEvent *Event)
      }
 }
 
+cRecordingInfo::cRecordingInfo(const char *FileName)
+{
+  channelID = tChannelID::InvalidID;
+  channelName = NULL;
+  ownEvent = new cEvent(0);
+  event = ownEvent;
+  aux = NULL;
+  framesPerSecond = DEFAULTFRAMESPERSECOND;
+  priority = MAXPRIORITY;
+  lifetime = MAXLIFETIME;
+  fileName = strdup(cString::sprintf("%s%s", FileName, INFOFILESUFFIX));
+}
+
 cRecordingInfo::~cRecordingInfo()
 {
   delete ownEvent;
   free(aux);
   free(channelName);
+  free(fileName);
 }
 
 void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description)
@@ -345,6 +400,11 @@ void cRecordingInfo::SetAux(const char *Aux)
   aux = Aux ? strdup(Aux) : NULL;
 }
 
+void cRecordingInfo::SetFramesPerSecond(double FramesPerSecond)
+{
+  framesPerSecond = FramesPerSecond;
+}
+
 bool cRecordingInfo::Read(FILE *f)
 {
   if (ownEvent) {
@@ -382,6 +442,12 @@ bool cRecordingInfo::Read(FILE *f)
                             }
                        }
                        break;
+             case 'F': framesPerSecond = atof(t);
+                       break;
+             case 'L': lifetime = atoi(t);
+                       break;
+             case 'P': priority = atoi(t);
+                       break;
              case '@': free(aux);
                        aux = strdup(t);
                        break;
@@ -403,11 +469,48 @@ bool cRecordingInfo::Write(FILE *f, const char *Prefix) const
   if (channelID.Valid())
      fprintf(f, "%sC %s%s%s\n", Prefix, *channelID.ToString(), channelName ? " " : "", channelName ? channelName : "");
   event->Dump(f, Prefix, true);
+  fprintf(f, "%sF %.10g\n", Prefix, framesPerSecond);
+  fprintf(f, "%sP %d\n", Prefix, priority);
+  fprintf(f, "%sL %d\n", Prefix, lifetime);
   if (aux)
      fprintf(f, "%s@ %s\n", Prefix, aux);
   return true;
 }
 
+bool cRecordingInfo::Read(void)
+{
+  bool Result = false;
+  if (fileName) {
+     FILE *f = fopen(fileName, "r");
+     if (f) {
+        if (Read(f))
+           Result = true;
+        else
+           esyslog("ERROR: EPG data problem in file %s", fileName);
+        fclose(f);
+        }
+     else if (errno != ENOENT)
+        LOG_ERROR_STR(fileName);
+     }
+  return Result;
+}
+
+bool cRecordingInfo::Write(void) const
+{
+  bool Result = false;
+  if (fileName) {
+     cSafeFile f(fileName);
+     if (f.Open()) {
+        if (Write(f))
+           Result = true;
+        f.Close();
+        }
+     else
+        LOG_ERROR_STR(fileName);
+     }
+  return Result;
+}
+
 // --- cRecording ------------------------------------------------------------
 
 #define RESUME_NOT_INITIALIZED (-2)
@@ -497,6 +600,10 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   fileName = NULL;
   name = NULL;
   fileSizeMB = -1; // unknown
+  channel = Timer->Channel()->Number();
+  resumeId = Setup.ResumeID;
+  isPesRecording = false;
+  framesPerSecond = DEFAULTFRAMESPERSECOND;
   deleted = 0;
   // set up the actual name:
   const char *Title = Event ? Event->Title() : NULL;
@@ -542,12 +649,20 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   // handle info:
   info = new cRecordingInfo(Timer->Channel(), Event);
   info->SetAux(Timer->Aux());
+  info->priority = priority;
+  info->lifetime = lifetime;
 }
 
 cRecording::cRecording(const char *FileName)
 {
   resume = RESUME_NOT_INITIALIZED;
   fileSizeMB = -1; // unknown
+  channel = -1;
+  resumeId = -1;
+  priority = MAXPRIORITY; // assume maximum in case there is no info file
+  lifetime = MAXLIFETIME;
+  isPesRecording = false;
+  framesPerSecond = DEFAULTFRAMESPERSECOND;
   deleted = 0;
   titleBuffer = NULL;
   sortBuffer = NULL;
@@ -562,7 +677,8 @@ cRecording::cRecording(const char *FileName)
      struct tm tm_r;
      struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
      t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
-     if (7 == sscanf(p + 1, DATAFORMAT, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
+     if (7 == sscanf(p + 1, DATAFORMATTS, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &channel, &resumeId)
+      || 7 == sscanf(p + 1, DATAFORMATPES, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
         t.tm_year -= 1900;
         t.tm_mon--;
         t.tm_sec = 0;
@@ -571,14 +687,22 @@ cRecording::cRecording(const char *FileName)
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
         name = ExchangeChars(name, false);
+        isPesRecording = resumeId < 0;
         }
+     else
+        return;
      GetResume();
      // read an optional info file:
-     cString InfoFileName = cString::sprintf("%s%s", fileName, INFOFILESUFFIX);
+     cString InfoFileName = cString::sprintf("%s%s", fileName, isPesRecording ? INFOFILESUFFIX ".vdr" : INFOFILESUFFIX);
      FILE *f = fopen(InfoFileName, "r");
      if (f) {
         if (!info->Read(f))
            esyslog("ERROR: EPG data problem in file %s", *InfoFileName);
+        else if (!isPesRecording) {
+           priority = info->priority;
+           lifetime = info->lifetime;
+           framesPerSecond = info->framesPerSecond;
+           }
         fclose(f);
         }
      else if (errno != ENOENT)
@@ -683,7 +807,7 @@ char *cRecording::SortName(void) const
 int cRecording::GetResume(void) const
 {
   if (resume == RESUME_NOT_INITIALIZED) {
-     cResumeFile ResumeFile(FileName());
+     cResumeFile ResumeFile(FileName(), isPesRecording);
      resume = ResumeFile.Read();
      }
   return resume;
@@ -700,8 +824,11 @@ const char *cRecording::FileName(void) const
   if (!fileName) {
      struct tm tm_r;
      struct tm *t = localtime_r(&start, &tm_r);
+     const char *fmt = isPesRecording ? NAMEFORMATPES : NAMEFORMATTS;
+     int ch = isPesRecording ? priority : channel;
+     int ri = isPesRecording ? lifetime : resumeId;
      name = ExchangeChars(name, true);
-     fileName = strdup(cString::sprintf(NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime));
+     fileName = strdup(cString::sprintf(fmt, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri));
      name = ExchangeChars(name, false);
      }
   return fileName;
@@ -789,7 +916,7 @@ bool cRecording::IsEdited(void) const
 
 bool cRecording::WriteInfo(void)
 {
-  cString InfoFileName = cString::sprintf("%s%s", fileName, INFOFILESUFFIX);
+  cString InfoFileName = cString::sprintf("%s%s", fileName, isPesRecording ? INFOFILESUFFIX ".vdr" : INFOFILESUFFIX);
   FILE *f = fopen(InfoFileName, "w");
   if (f) {
      info->Write(f);
@@ -1061,10 +1188,14 @@ void cRecordings::ResetResume(const char *ResumeFileName)
 
 // --- cMark -----------------------------------------------------------------
 
-cMark::cMark(int Position, const char *Comment)
+double MarkFramesPerSecond = DEFAULTFRAMESPERSECOND;
+cMutex MutexMarkFramesPerSecond;
+
+cMark::cMark(int Position, const char *Comment, double FramesPerSecond)
 {
   position = Position;
   comment = Comment ? strdup(Comment) : NULL;
+  framesPerSecond = FramesPerSecond;
 }
 
 cMark::~cMark()
@@ -1074,14 +1205,15 @@ cMark::~cMark()
 
 cString cMark::ToText(void)
 {
-  return cString::sprintf("%s%s%s\n", *IndexToHMSF(position, true), comment ? " " : "", comment ? comment : "");
+  return cString::sprintf("%s%s%s\n", *IndexToHMSF(position, true, framesPerSecond), comment ? " " : "", comment ? comment : "");
 }
 
 bool cMark::Parse(const char *s)
 {
   free(comment);
   comment = NULL;
-  position = HMSFToIndex(s);
+  framesPerSecond = MarkFramesPerSecond;
+  position = HMSFToIndex(s, framesPerSecond);
   const char *p = strchr(s, ' ');
   if (p) {
      p = skipspace(p);
@@ -1098,9 +1230,12 @@ bool cMark::Save(FILE *f)
 
 // --- cMarks ----------------------------------------------------------------
 
-bool cMarks::Load(const char *RecordingFileName)
+bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool IsPesRecording)
 {
-  if (cConfig<cMark>::Load(AddDirectory(RecordingFileName, MARKSFILESUFFIX))) {
+  cMutexLock MutexLock(&MutexMarkFramesPerSecond);
+  framesPerSecond = FramesPerSecond;
+  MarkFramesPerSecond = framesPerSecond;
+  if (cConfig<cMark>::Load(AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX))) {
      Sort();
      return true;
      }
@@ -1123,7 +1258,7 @@ cMark *cMarks::Add(int Position)
 {
   cMark *m = Get(Position);
   if (!m) {
-     cConfig<cMark>::Add(m = new cMark(Position));
+     cConfig<cMark>::Add(m = new cMark(Position, NULL, framesPerSecond));
      Sort();
      }
   return m;
@@ -1169,12 +1304,9 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
      }
 }
 
-// --- XXX+
-
-//XXX+ somewhere else???
 // --- cIndexFile ------------------------------------------------------------
 
-#define INDEXFILESUFFIX     "/index.vdr"
+#define INDEXFILESUFFIX     "/index"
 
 // The number of frames to stay off the end in case of time shift:
 #define INDEXSAFETYLIMIT 150 // frames
@@ -1185,33 +1317,56 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 // The minimum age of an index file for considering it no longer to be written:
 #define MININDEXAGE    3600 // seconds
 
-cIndexFile::cIndexFile(const char *FileName, bool Record)
-:resumeFile(FileName)
+struct tIndexPes {
+  uint32_t offset;
+  uchar type;
+  uchar number;
+  uint16_t reserved;
+  };
+
+struct tIndexTs {
+  uint64_t offset:40; // up to 1TB per file (not using off_t here - must definitely be exactly 64 bit!)
+  int reserved:7;     // reserved for future use
+  int independent:1;  // marks frames that can be displayed by themselves (for trick modes)
+  uint16_t number:16; // up to 64K files per recording
+  tIndexTs(off_t Offset, bool Independent, uint16_t Number)
+  {
+    offset = Offset;
+    reserved = 0;
+    independent = Independent;
+    number = Number;
+  }
+  };
+
+cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
+:resumeFile(FileName, IsPesRecording)
 {
   f = -1;
   fileName = NULL;
   size = 0;
   last = -1;
   index = NULL;
+  isPesRecording = IsPesRecording;
   if (FileName) {
-     fileName = MALLOC(char, strlen(FileName) + strlen(INDEXFILESUFFIX) + 1);
+     const char *Suffix = isPesRecording ? INDEXFILESUFFIX ".vdr" : INDEXFILESUFFIX;
+     fileName = MALLOC(char, strlen(FileName) + strlen(Suffix) + 1);
      if (fileName) {
         strcpy(fileName, FileName);
         char *pFileExt = fileName + strlen(fileName);
-        strcpy(pFileExt, INDEXFILESUFFIX);
+        strcpy(pFileExt, Suffix);
         int delta = 0;
         if (access(fileName, R_OK) == 0) {
            struct stat buf;
            if (stat(fileName, &buf) == 0) {
-              delta = buf.st_size % sizeof(tIndex);
+              delta = buf.st_size % sizeof(tIndexTs);
               if (delta) {
-                 delta = sizeof(tIndex) - delta;
-                 esyslog("ERROR: invalid file size (%ld) in '%s'", buf.st_size, fileName);
+                 delta = sizeof(tIndexTs) - delta;
+                 esyslog("ERROR: invalid file size (%lld) in '%s'", buf.st_size, fileName);
                  }
-              last = (buf.st_size + delta) / sizeof(tIndex) - 1;
+              last = (buf.st_size + delta) / sizeof(tIndexTs) - 1;
               if (!Record && last >= 0) {
                  size = last + 1;
-                 index = MALLOC(tIndex, size);
+                 index = MALLOC(tIndexTs, size);
                  if (index) {
                     f = open(fileName, O_RDONLY);
                     if (f >= 0) {
@@ -1223,12 +1378,14 @@ cIndexFile::cIndexFile(const char *FileName, bool Record)
                           f = -1;
                           }
                        // we don't close f here, see CatchUp()!
+                       else if (isPesRecording)
+                          ConvertFromPes(index, size);
                        }
                     else
                        LOG_ERROR_STR(fileName);
                     }
                  else
-                    esyslog("ERROR: can't allocate %zd bytes for index '%s'", size * sizeof(tIndex), fileName);
+                    esyslog("ERROR: can't allocate %zd bytes for index '%s'", size * sizeof(tIndexTs), fileName);
                  }
               }
            else
@@ -1261,6 +1418,18 @@ cIndexFile::~cIndexFile()
   free(index);
 }
 
+void cIndexFile::ConvertFromPes(tIndexTs *IndexTs, int Count)
+{
+  tIndexPes IndexPes;
+  while (Count-- > 0) {
+        memcpy(&IndexPes, IndexTs, sizeof(IndexPes));
+        IndexTs->offset = IndexPes.offset;
+        IndexTs->independent = IndexPes.type == 1; // I_FRAME
+        IndexTs->number = IndexPes.number;
+        IndexTs++;
+        }
+}
+
 bool cIndexFile::CatchUp(int Index)
 {
   // returns true unless something really goes wrong, so that 'index' becomes NULL
@@ -1275,17 +1444,17 @@ bool cIndexFile::CatchUp(int Index)
                f = -1;
                break;
                }
-            int newLast = buf.st_size / sizeof(tIndex) - 1;
+            int newLast = buf.st_size / sizeof(tIndexTs) - 1;
             if (newLast > last) {
                if (size <= newLast) {
                   size *= 2;
                   if (size <= newLast)
                      size = newLast + 1;
                   }
-               index = (tIndex *)realloc(index, size * sizeof(tIndex));
+               index = (tIndexTs *)realloc(index, size * sizeof(tIndexTs));
                if (index) {
-                  int offset = (last + 1) * sizeof(tIndex);
-                  int delta = (newLast - last) * sizeof(tIndex);
+                  int offset = (last + 1) * sizeof(tIndexTs);
+                  int delta = (newLast - last) * sizeof(tIndexTs);
                   if (lseek(f, offset, SEEK_SET) == offset) {
                      if (safe_read(f, &index[last + 1], delta) != delta) {
                         esyslog("ERROR: can't read from index");
@@ -1295,6 +1464,8 @@ bool cIndexFile::CatchUp(int Index)
                         f = -1;
                         break;
                         }
+                     if (isPesRecording)
+                        ConvertFromPes(&index[last + 1], newLast - last);
                      last = newLast;
                      }
                   else
@@ -1314,10 +1485,10 @@ bool cIndexFile::CatchUp(int Index)
   return index != NULL;
 }
 
-bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
+bool cIndexFile::Write(bool Independent, uint16_t FileNumber, off_t FileOffset)
 {
   if (f >= 0) {
-     tIndex i = { FileOffset, PictureType, FileNumber, 0 };
+     tIndexTs i(FileOffset, Independent, FileNumber);
      if (safe_write(f, &i, sizeof(i)) < 0) {
         LOG_ERROR_STR(fileName);
         close(f);
@@ -1329,14 +1500,14 @@ bool cIndexFile::Write(uchar PictureType, uchar FileNumber, int FileOffset)
   return f >= 0;
 }
 
-bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType, int *Length)
+bool cIndexFile::Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *Independent, int *Length)
 {
   if (CatchUp(Index)) {
      if (Index >= 0 && Index < last) {
         *FileNumber = index[Index].number;
         *FileOffset = index[Index].offset;
-        if (PictureType)
-           *PictureType = index[Index].type;
+        if (Independent)
+           *Independent = index[Index].independent;
         if (Length) {
            int fn = index[Index + 1].number;
            int fo = index[Index + 1].offset;
@@ -1351,24 +1522,24 @@ bool cIndexFile::Get(int Index, uchar *FileNumber, int *FileOffset, uchar *Pictu
   return false;
 }
 
-int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *FileOffset, int *Length, bool StayOffEnd)
+int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off_t *FileOffset, int *Length, bool StayOffEnd)
 {
   if (CatchUp()) {
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
          if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? INDEXSAFETYLIMIT : 0)) {
-            if (index[Index].type == I_FRAME) {
-               if (FileNumber)
-                  *FileNumber = index[Index].number;
-               else
-                  FileNumber = &index[Index].number;
-               if (FileOffset)
-                  *FileOffset = index[Index].offset;
-               else
-                  FileOffset = &index[Index].offset;
+            if (index[Index].independent) {
+               uint16_t fn;
+               if (!FileNumber)
+                  FileNumber = &fn;
+               off_t fo;
+               if (!FileOffset)
+                  FileOffset = &fo;
+               *FileNumber = index[Index].number;
+               *FileOffset = index[Index].offset;
                if (Length) {
-                  // all recordings end with a non-I_FRAME, so the following should be safe:
+                  // all recordings end with a non-independent frame, so the following should be safe:
                   int fn = index[Index + 1].number;
                   int fo = index[Index + 1].offset;
                   if (fn == *FileNumber)
@@ -1388,13 +1559,13 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uchar *FileNumber, int *F
   return -1;
 }
 
-int cIndexFile::Get(uchar FileNumber, int FileOffset)
+int cIndexFile::Get(uint16_t FileNumber, off_t FileOffset)
 {
   if (CatchUp()) {
      //TODO implement binary search!
      int i;
      for (i = 0; i < last; i++) {
-         if (index[i].number > FileNumber || (index[i].number == FileNumber) && index[i].offset >= FileOffset)
+         if (index[i].number > FileNumber || (index[i].number == FileNumber) && off_t(index[i].offset) >= FileOffset)
             break;
          }
      return i;
@@ -1409,16 +1580,19 @@ bool cIndexFile::IsStillRecording()
 
 // --- cFileName -------------------------------------------------------------
 
-#define MAXFILESPERRECORDING 255
-#define RECORDFILESUFFIX    "/%03d.vdr"
+#define MAXFILESPERRECORDINGPES 255
+#define RECORDFILESUFFIXPES     "/%03d.vdr"
+#define MAXFILESPERRECORDINGTS  65535
+#define RECORDFILESUFFIXTS      "/%05d.ts"
 #define RECORDFILESUFFIXLEN 20 // some additional bytes for safety...
 
-cFileName::cFileName(const char *FileName, bool Record, bool Blocking)
+cFileName::cFileName(const char *FileName, bool Record, bool Blocking, bool IsPesRecording)
 {
   file = NULL;
   fileNumber = 0;
   record = Record;
   blocking = Blocking;
+  isPesRecording = IsPesRecording;
   // Prepare the file name:
   fileName = MALLOC(char, strlen(FileName) + RECORDFILESUFFIXLEN);
   if (!fileName) {
@@ -1442,14 +1616,14 @@ cUnbufferedFile *cFileName::Open(void)
      int BlockingFlag = blocking ? 0 : O_NONBLOCK;
      if (record) {
         dsyslog("recording to '%s'", fileName);
-        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | BlockingFlag);
+        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | O_LARGEFILE | BlockingFlag);
         if (!file)
            LOG_ERROR_STR(fileName);
         }
      else {
         if (access(fileName, R_OK) == 0) {
            dsyslog("playing '%s'", fileName);
-           file = cUnbufferedFile::Create(fileName, O_RDONLY | BlockingFlag);
+           file = cUnbufferedFile::Create(fileName, O_RDONLY | O_LARGEFILE | BlockingFlag);
            if (!file)
               LOG_ERROR_STR(fileName);
            }
@@ -1469,13 +1643,14 @@ void cFileName::Close(void)
      }
 }
 
-cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
+cUnbufferedFile *cFileName::SetOffset(int Number, off_t Offset)
 {
   if (fileNumber != Number)
      Close();
-  if (0 < Number && Number <= MAXFILESPERRECORDING) {
+  int MaxFilesPerRecording = isPesRecording ? MAXFILESPERRECORDINGPES : MAXFILESPERRECORDINGTS;
+  if (0 < Number && Number <= MaxFilesPerRecording) {
      fileNumber = Number;
-     sprintf(pFileNumber, RECORDFILESUFFIX, fileNumber);
+     sprintf(pFileNumber, isPesRecording ? RECORDFILESUFFIXPES : RECORDFILESUFFIXTS, fileNumber);
      if (record) {
         if (access(fileName, F_OK) == 0) {
            // files exists, check if it has non-zero size
@@ -1506,7 +1681,7 @@ cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
         }
      return file;
      }
-  esyslog("ERROR: max number of files (%d) exceeded", MAXFILESPERRECORDING);
+  esyslog("ERROR: max number of files (%d) exceeded", MaxFilesPerRecording);
   return NULL;
 }
 
@@ -1517,11 +1692,12 @@ cUnbufferedFile *cFileName::NextFile(void)
 
 // --- Index stuff -----------------------------------------------------------
 
-cString IndexToHMSF(int Index, bool WithFrame)
+cString IndexToHMSF(int Index, bool WithFrame, double FramesPerSecond)
 {
   char buffer[16];
-  int f = (Index % FRAMESPERSEC) + 1;
-  int s = (Index / FRAMESPERSEC);
+  double Seconds;
+  int f = modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond + 1;
+  int s = int(Seconds);
   int m = s / 60 % 60;
   int h = s / 3600;
   s %= 60;
@@ -1529,17 +1705,20 @@ cString IndexToHMSF(int Index, bool WithFrame)
   return buffer;
 }
 
-int HMSFToIndex(const char *HMSF)
+int HMSFToIndex(const char *HMSF, double FramesPerSecond)
 {
-  int h, m, s, f = 0;
-  if (3 <= sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f))
-     return (h * 3600 + m * 60 + s) * FRAMESPERSEC + f - 1;
+  int h, m, s, f = 1;
+  int n = sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f);
+  if (n == 1)
+     return h - 1; // plain frame number
+  if (n >= 3)
+     return int(round((h * 3600 + m * 60 + s) * FramesPerSecond)) + f - 1;
   return 0;
 }
 
-int SecondsToFrames(int Seconds)
+int SecondsToFrames(int Seconds, double FramesPerSecond)
 {
-  return Seconds * FRAMESPERSEC;
+  return round(Seconds * FramesPerSecond);
 }
 
 // --- ReadFrame -------------------------------------------------------------
diff --git a/recording.h b/recording.h
index a201f5ac1..a1d497d73 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.0 2007/10/14 10:11:34 kls Exp $
+ * $Id: recording.h 2.1 2009/01/06 10:49:59 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -30,8 +30,9 @@ void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
 class cResumeFile {
 private:
   char *fileName;
+  bool isPesRecording;
 public:
-  cResumeFile(const char *FileName);
+  cResumeFile(const char *FileName, bool IsPesRecording);
   ~cResumeFile();
   int Read(void);
   bool Save(int Index);
@@ -46,10 +47,15 @@ class cRecordingInfo {
   const cEvent *event;
   cEvent *ownEvent;
   char *aux;
+  double framesPerSecond;
+  int priority;
+  int lifetime;
+  char *fileName;
   cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
   void SetData(const char *Title, const char *ShortText, const char *Description);
   void SetAux(const char *Aux);
 public:
+  cRecordingInfo(const char *FileName);
   ~cRecordingInfo();
   tChannelID ChannelID(void) const { return channelID; }
   const char *ChannelName(void) const { return channelName; }
@@ -58,8 +64,12 @@ class cRecordingInfo {
   const char *Description(void) const { return event->Description(); }
   const cComponents *Components(void) const { return event->Components(); }
   const char *Aux(void) const { return aux; }
+  double FramesPerSecond(void) const { return framesPerSecond; }
+  void SetFramesPerSecond(double FramesPerSecond);
   bool Read(FILE *f);
   bool Write(FILE *f, const char *Prefix = "") const;
+  bool Read(void);
+  bool Write(void) const;
   };
 
 class cRecording : public cListObject {
@@ -71,6 +81,10 @@ class cRecording : public cListObject {
   mutable char *fileName;
   mutable char *name;
   mutable int fileSizeMB;
+  int channel;
+  int resumeId;
+  bool isPesRecording;
+  double framesPerSecond;
   cRecordingInfo *info;
   cRecording(const cRecording&); // can't copy cRecording
   cRecording &operator=(const cRecording &); // can't assign cRecording
@@ -93,8 +107,10 @@ class cRecording : public cListObject {
   const char *PrefixFileName(char Prefix);
   int HierarchyLevels(void) const;
   void ResetResume(void) const;
+  double FramesPerSecond(void) { return framesPerSecond; }
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
+  bool IsPesRecording(void) const { return isPesRecording; }
   bool WriteInfo(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
@@ -149,11 +165,15 @@ class cRecordings : public cList<cRecording>, public cThread {
 extern cRecordings Recordings;
 extern cRecordings DeletedRecordings;
 
+#define DEFAULTFRAMESPERSECOND 25.0
+
 class cMark : public cListObject {
+private:
+  double framesPerSecond;
 public:
   int position;
   char *comment;
-  cMark(int Position = 0, const char *Comment = NULL);
+  cMark(int Position = 0, const char *Comment = NULL, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
   virtual ~cMark();
   cString ToText(void);
   bool Parse(const char *s);
@@ -161,8 +181,10 @@ class cMark : public cListObject {
   };
 
 class cMarks : public cConfig<cMark> {
+private:
+  double framesPerSecond;
 public:
-  bool Load(const char *RecordingFileName);
+  bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
   void Sort(void);
   cMark *Add(int Position);
   cMark *Get(int Position);
@@ -182,9 +204,6 @@ class cRecordingUserCommand {
   static void InvokeCommand(const char *State, const char *RecordingFileName);
   };
 
-//XXX+
-#define FRAMESPERSEC 25
-
 // The maximum size of a single frame (up to HDTV 1920x1080):
 #define MAXFRAMESIZE  KILOBYTE(512)
 
@@ -197,24 +216,27 @@ class cRecordingUserCommand {
 #define MAXVIDEOFILESIZE 2000 // MB
 #define MINVIDEOFILESIZE  100 // MB
 
+struct tIndexTs;
+
 class cIndexFile {
 private:
-  struct tIndex { int offset; uchar type; uchar number; short reserved; };
   int f;
   char *fileName;
   int size, last;
-  tIndex *index;
+  tIndexTs *index;
+  bool isPesRecording;
   cResumeFile resumeFile;
   cMutex mutex;
+  void ConvertFromPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
 public:
-  cIndexFile(const char *FileName, bool Record);
+  cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false);
   ~cIndexFile();
   bool Ok(void) { return index != NULL; }
-  bool Write(uchar PictureType, uchar FileNumber, int FileOffset);
-  bool Get(int Index, uchar *FileNumber, int *FileOffset, uchar *PictureType = NULL, int *Length = NULL);
-  int GetNextIFrame(int Index, bool Forward, uchar *FileNumber = NULL, int *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
-  int Get(uchar FileNumber, int FileOffset);
+  bool Write(bool Independent, uint16_t FileNumber, off_t FileOffset);
+  bool Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *Independent = NULL, int *Length = NULL);
+  int GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber = NULL, off_t *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
+  int Get(uint16_t FileNumber, off_t FileOffset);
   int Last(void) { CatchUp(); return last; }
   int GetResume(void) { return resumeFile.Read(); }
   bool StoreResume(int Index) { return resumeFile.Save(Index); }
@@ -228,22 +250,23 @@ class cFileName {
   char *fileName, *pFileNumber;
   bool record;
   bool blocking;
+  bool isPesRecording;
 public:
-  cFileName(const char *FileName, bool Record, bool Blocking = false);
+  cFileName(const char *FileName, bool Record, bool Blocking = false, bool IsPesRecording = false);
   ~cFileName();
   const char *Name(void) { return fileName; }
   int Number(void) { return fileNumber; }
   cUnbufferedFile *Open(void);
   void Close(void);
-  cUnbufferedFile *SetOffset(int Number, int Offset = 0);
+  cUnbufferedFile *SetOffset(int Number, off_t Offset = 0);
   cUnbufferedFile *NextFile(void);
   };
 
-cString IndexToHMSF(int Index, bool WithFrame = false);
+cString IndexToHMSF(int Index, bool WithFrame = false, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
       // Converts the given index to a string, optionally containing the frame number.
-int HMSFToIndex(const char *HMSF);
+int HMSFToIndex(const char *HMSF, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
       // Converts the given string (format: "hh:mm:ss.ff") to an index.
-int SecondsToFrames(int Seconds); //XXX+ ->player???
+int SecondsToFrames(int Seconds, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
       // Returns the number of frames corresponding to the given number of seconds.
 
 int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max);
diff --git a/remux.c b/remux.c
index 193854959..840f5df75 100644
--- a/remux.c
+++ b/remux.c
@@ -1,22 +1,13 @@
 /*
- * remux.c: A streaming MPEG2 remultiplexer
+ * remux.h: Tools for detecting frames and handling PAT/PMT
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * The parts of this code that implement cTS2PES have been taken from
- * the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
- * VDR's needs.
- *
- * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
- * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
- *
- * $Id: remux.c 2.2 2008/12/13 14:30:15 kls Exp $
+ * $Id: remux.c 2.5 2009/01/06 14:46:21 kls Exp $
  */
 
 #include "remux.h"
-#include <stdlib.h>
-#include "channels.h"
 #include "device.h"
 #include "libsi/si.h"
 #include "libsi/section.h"
@@ -24,10 +15,12 @@
 #include "shutdown.h"
 #include "tools.h"
 
-// Set this to 'true' for debug output:
+// Set these to 'true' for debug output:
 static bool DebugPatPmt = false;
+static bool DebugFrames = false;
 
 #define dbgpatpmt(a...) if (DebugPatPmt) fprintf(stderr, a)
+#define dbgframes(a...) if (DebugFrames) fprintf(stderr, a)
 
 ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
 {
@@ -95,2083 +88,10 @@ ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset,
   return phMPEG1; // MPEG 1
 }
 
-// --- cRepacker -------------------------------------------------------------
-
-#define MIN_LOG_INTERVAL 10 // min. # of seconds between two consecutive log messages of a cRepacker
-#define LOG(a...) (LogAllowed() && (esyslog(a), true))
-
-class cRepacker {
-protected:
-  bool initiallySyncing;
-  int maxPacketSize;
-  uint8_t subStreamId;
-  time_t lastLog;
-  int suppressedLogMessages;
-  bool LogAllowed(void);
-  void DroppedData(const char *Reason, int Count) { LOG("%s (dropped %d bytes)", Reason, Count); }
-public:
-  static int Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded);
-  cRepacker(void);
-  virtual ~cRepacker() {}
-  virtual void Reset(void) { initiallySyncing = true; }
-  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count) = 0;
-  virtual int BreakAt(const uchar *Data, int Count) = 0;
-  virtual int QuerySnoopSize(void) { return 0; }
-  void SetMaxPacketSize(int MaxPacketSize) { maxPacketSize = MaxPacketSize; }
-  void SetSubStreamId(uint8_t SubStreamId) { subStreamId = SubStreamId; }
-  };
-
-cRepacker::cRepacker(void)
-{
-  initiallySyncing = true;
-  maxPacketSize = 6 + 65535;
-  subStreamId = 0;
-  suppressedLogMessages = 0;;
-  lastLog = 0;
-}
-
-bool cRepacker::LogAllowed(void)
-{
-  bool Allowed = time(NULL) - lastLog >= MIN_LOG_INTERVAL;
-  lastLog = time(NULL);
-  if (Allowed) {
-     if (suppressedLogMessages) {
-        esyslog("%d cRepacker messages suppressed", suppressedLogMessages);
-        suppressedLogMessages = 0;
-        }
-     }
-  else
-     suppressedLogMessages++;
-  return Allowed;
-}
-
-int cRepacker::Put(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count, int CapacityNeeded)
-{
-  if (CapacityNeeded >= Count && ResultBuffer->Free() < CapacityNeeded) {
-     esyslog("ERROR: possible result buffer overflow, dropped %d out of %d byte", CapacityNeeded, CapacityNeeded);
-     return 0;
-     }
-  int n = ResultBuffer->Put(Data, Count);
-  if (n != Count)
-     esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Count - n, Count);
-  return n;
-}
-
-// --- cCommonRepacker -------------------------------------------------------
-
-class cCommonRepacker : public cRepacker {
-protected:
-  int skippedBytes;
-  int packetTodo;
-  uchar fragmentData[6 + 65535 + 3];
-  int fragmentLen;
-  uchar pesHeader[6 + 3 + 255 + 3];
-  int pesHeaderLen;
-  uchar pesHeaderBackup[6 + 3 + 255];
-  int pesHeaderBackupLen;
-  uint32_t scanner;
-  uint32_t localScanner;
-  int localStart;
-  bool PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
-  virtual int QuerySnoopSize() { return 4; }
-  virtual void Reset(void);
-  };
-
-void cCommonRepacker::Reset(void)
-{
-  cRepacker::Reset();
-  skippedBytes = 0;
-  packetTodo = 0;
-  fragmentLen = 0;
-  pesHeaderLen = 0;
-  pesHeaderBackupLen = 0;
-  localStart = -1;
-}
-
-bool cCommonRepacker::PushOutPacket(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
-{
-  // enter packet length into PES header ...
-  if (fragmentLen > 0) { // ... which is contained in the fragment buffer
-     // determine PES packet payload
-     int PacketLen = fragmentLen + Count - 6;
-     fragmentData[ 4 ] = PacketLen >> 8;
-     fragmentData[ 5 ] = PacketLen & 0xFF;
-     // just skip packets with no payload
-     int PesPayloadOffset = 0;
-     if (AnalyzePesHeader(fragmentData, fragmentLen, PesPayloadOffset) <= phInvalid)
-        LOG("cCommonRepacker: invalid PES packet encountered in fragment buffer!");
-     else if (6 + PacketLen <= PesPayloadOffset) {
-        fragmentLen = 0;
-        return true; // skip empty packet
-        }
-     // amount of data to put into result buffer: a negative Count value means
-     // to strip off any partially contained start code.
-     int Bite = fragmentLen + (Count >= 0 ? 0 : Count);
-     // put data into result buffer
-     int n = Put(ResultBuffer, fragmentData, Bite, 6 + PacketLen);
-     fragmentLen = 0;
-     if (n != Bite)
-        return false;
-     }
-  else if (pesHeaderLen > 0) { // ... which is contained in the PES header buffer
-     int PacketLen = pesHeaderLen + Count - 6;
-     pesHeader[ 4 ] = PacketLen >> 8;
-     pesHeader[ 5 ] = PacketLen & 0xFF;
-     // just skip packets with no payload
-     int PesPayloadOffset = 0;
-     if (AnalyzePesHeader(pesHeader, pesHeaderLen, PesPayloadOffset) <= phInvalid)
-        LOG("cCommonRepacker: invalid PES packet encountered in header buffer!");
-     else if (6 + PacketLen <= PesPayloadOffset) {
-        pesHeaderLen = 0;
-        return true; // skip empty packet
-        }
-     // amount of data to put into result buffer: a negative Count value means
-     // to strip off any partially contained start code.
-     int Bite = pesHeaderLen + (Count >= 0 ? 0 : Count);
-     // put data into result buffer
-     int n = Put(ResultBuffer, pesHeader, Bite, 6 + PacketLen);
-     pesHeaderLen = 0;
-     if (n != Bite)
-        return false;
-     }
-  // append further payload
-  if (Count > 0) {
-     // amount of data to put into result buffer
-     int Bite = Count;
-     // put data into result buffer
-     int n = Put(ResultBuffer, Data, Bite, Bite);
-     if (n != Bite)
-        return false;
-     }
-  // we did it ;-)
-  return true;
-}
-
-// --- cVideoRepacker --------------------------------------------------------
-
-class cVideoRepacker : public cCommonRepacker {
-private:
-  enum eState {
-    syncing,
-    findPicture,
-    scanPicture
-    };
-  int state;
-  void HandleStartCode(const uchar *const Data, cRingBufferLinear *const ResultBuffer, const uchar *&Payload, const uchar StreamID, const ePesHeader MpegLevel);
-  inline bool ScanDataForStartCodeSlow(const uchar *const Data);
-  inline bool ScanDataForStartCodeFast(const uchar *&Data, const uchar *Limit);
-  inline bool ScanDataForStartCode(const uchar *&Data, int &Done, int &Todo);
-  inline void AdjustCounters(const int Delta, int &Done, int &Todo);
-  inline bool ScanForEndOfPictureSlow(const uchar *&Data);
-  inline bool ScanForEndOfPictureFast(const uchar *&Data, const uchar *Limit);
-  inline bool ScanForEndOfPicture(const uchar *&Data, const uchar *Limit);
-public:
-  cVideoRepacker(void);
-  virtual void Reset(void);
-  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
-  virtual int BreakAt(const uchar *Data, int Count);
-  };
-
-cVideoRepacker::cVideoRepacker(void)
-{
-  Reset();
-}
-
-void cVideoRepacker::Reset(void)
-{
-  cCommonRepacker::Reset();
-  scanner = 0xFFFFFFFF;
-  state = syncing;
-}
-
-void cVideoRepacker::HandleStartCode(const uchar *const Data, cRingBufferLinear *const ResultBuffer, const uchar *&Payload, const uchar StreamID, const ePesHeader MpegLevel)
-{
-  // synchronisation is detected some bytes after frame start.
-  const int SkippedBytesLimit = 4;
-
-  // which kind of start code have we got?
-  switch (*Data) {
-    case 0xB9 ... 0xFF: // system start codes
-         LOG("cVideoRepacker: found system start code: stream seems to be scrambled or not demultiplexed");
-         break;
-    case 0xB0 ... 0xB1: // reserved start codes
-    case 0xB6:
-         LOG("cVideoRepacker: found reserved start code: stream seems to be scrambled");
-         break;
-    case 0xB4: // sequence error code
-         LOG("cVideoRepacker: found sequence error code: stream seems to be damaged");
-    case 0xB2: // user data start code
-    case 0xB5: // extension start code
-         break;
-    case 0xB7: // sequence end code
-    case 0xB3: // sequence header code
-    case 0xB8: // group start code
-    case 0x00: // picture start code
-         if (state == scanPicture) {
-            // the above start codes indicate that the current picture is done. So
-            // push out the packet to start a new packet for the next picuture. If
-            // the byte count get's negative then the current buffer ends in a
-            // partitial start code that must be stripped off, as it shall be put
-            // in the next packet.
-            PushOutPacket(ResultBuffer, Payload, Data - 3 - Payload);
-            // go on with syncing to the next picture
-            state = syncing;
-            }
-         if (state == syncing) {
-            if (initiallySyncing) // omit report for the typical initial case
-               initiallySyncing = false;
-            else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-               LOG("cVideoRepacker: skipped %d bytes to sync on next picture", skippedBytes - SkippedBytesLimit);
-            skippedBytes = 0;
-            // if there is a PES header available, then use it ...
-            if (pesHeaderBackupLen > 0) {
-               // ISO 13818-1 says:
-               // In the case of video, if a PTS is present in a PES packet header
-               // it shall refer to the access unit containing the first picture start
-               // code that commences in this PES packet. A picture start code commences
-               // in PES packet if the first byte of the picture start code is present
-               // in the PES packet.
-               memcpy(pesHeader, pesHeaderBackup, pesHeaderBackupLen);
-               pesHeaderLen = pesHeaderBackupLen;
-               pesHeaderBackupLen = 0;
-               }
-            else {
-               // ... otherwise create a continuation PES header
-               pesHeaderLen = 0;
-               pesHeader[pesHeaderLen++] = 0x00;
-               pesHeader[pesHeaderLen++] = 0x00;
-               pesHeader[pesHeaderLen++] = 0x01;
-               pesHeader[pesHeaderLen++] = StreamID; // video stream ID
-               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-               pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-
-               if (MpegLevel == phMPEG2) {
-                  pesHeader[pesHeaderLen++] = 0x80;
-                  pesHeader[pesHeaderLen++] = 0x00;
-                  pesHeader[pesHeaderLen++] = 0x00;
-                  }
-               else
-                  pesHeader[pesHeaderLen++] = 0x0F;
-               }
-            // append the first three bytes of the start code
-            pesHeader[pesHeaderLen++] = 0x00;
-            pesHeader[pesHeaderLen++] = 0x00;
-            pesHeader[pesHeaderLen++] = 0x01;
-            // the next packet's payload will begin with the fourth byte of
-            // the start code (= the actual code)
-            Payload = Data;
-            // as there is no length information available, assume the
-            // maximum we can hold in one PES packet
-            packetTodo = maxPacketSize - pesHeaderLen;
-            // go on with finding the picture data
-            state++;
-            }
-         break;
-    case 0x01 ... 0xAF: // slice start codes
-         if (state == findPicture) {
-            // go on with scanning the picture data
-            state++;
-            }
-         break;
-    }
-}
-
-bool cVideoRepacker::ScanDataForStartCodeSlow(const uchar *const Data)
-{
-  scanner <<= 8;
-  bool FoundStartCode = (scanner == 0x00000100);
-  scanner |= *Data;
-  return FoundStartCode;
-}
-
-bool cVideoRepacker::ScanDataForStartCodeFast(const uchar *&Data, const uchar *Limit)
-{
-  Limit--;
-
-  while (Data < Limit && (Data = (const uchar *)memchr(Data, 0x01, Limit - Data))) {
-        if (Data[-2] || Data[-1])
-           Data += 3;
-        else {
-           scanner = 0x00000100 | *++Data;
-           return true;
-           }
-        }
-
-  Data = Limit;
-  uint32_t *Scanner = (uint32_t *)(Data - 3);
-  scanner = ntohl(*Scanner);
-  return false;
-}
-
-bool cVideoRepacker::ScanDataForStartCode(const uchar *&Data, int &Done, int &Todo)
-{
-  const uchar *const DataOrig = Data;
-  const int MinDataSize = 4;
-
-  if (Todo < MinDataSize || (state != syncing && packetTodo < MinDataSize))
-     return ScanDataForStartCodeSlow(Data);
-
-  int Limit = Todo;
-  if (state != syncing && Limit > packetTodo)
-     Limit = packetTodo;
-
-  if (ScanDataForStartCodeSlow(Data))
-     return true;
-
-  if (ScanDataForStartCodeSlow(++Data)) {
-     AdjustCounters(1, Done, Todo);
-     return true;
-     }
-  ++Data;
-
-  bool FoundStartCode = ScanDataForStartCodeFast(Data, DataOrig + Limit);
-  AdjustCounters(Data - DataOrig, Done, Todo);
-  return FoundStartCode;
-}
-
-void cVideoRepacker::AdjustCounters(const int Delta, int &Done, int &Todo)
-{
-  Done += Delta;
-  Todo -= Delta;
-
-  if (state <= syncing)
-     skippedBytes += Delta;
-  else
-     packetTodo -= Delta;
-}
-
-void cVideoRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
-{
-  // synchronisation is detected some bytes after frame start.
-  const int SkippedBytesLimit = 4;
-
-  // reset local scanner
-  localStart = -1;
-
-  int pesPayloadOffset = 0;
-  bool continuationHeader = false;
-  ePesHeader mpegLevel = AnalyzePesHeader(Data, Count, pesPayloadOffset, &continuationHeader);
-  if (mpegLevel <= phInvalid) {
-     DroppedData("cVideoRepacker: no valid PES packet header found", Count);
-     return;
-     }
-  if (!continuationHeader) {
-    // backup PES header
-    pesHeaderBackupLen = pesPayloadOffset;
-    memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
-    }
-
-  // skip PES header
-  int done = pesPayloadOffset;
-  int todo = Count - done;
-  const uchar *data = Data + done;
-  // remember start of the data
-  const uchar *payload = data;
-
-  while (todo > 0) {
-        // collect number of skipped bytes while syncing
-        if (state <= syncing)
-           skippedBytes++;
-        // did we reach a start code?
-        if (ScanDataForStartCode(data, done, todo))
-           HandleStartCode(data, ResultBuffer, payload, Data[3], mpegLevel);
-        // move on
-        data++;
-        done++;
-        todo--;
-        // do we have to start a new packet as there is no more space left?
-        if (state != syncing && --packetTodo <= 0) {
-           // we connot start a new packet here if the current might end in a start
-           // code and this start code shall possibly be put in the next packet. So
-           // overfill the current packet until we can safely detect that we won't
-           // break a start code into pieces:
-           //
-           // A) the last four bytes were a start code.
-           // B) the current byte introduces a start code.
-           // C) the last three bytes begin a start code.
-           //
-           // Todo : Data                          : Rule : Result
-           // -----:-------------------------------:------:-------
-           //      : XX 00 00 00 01 YY|YY YY YY YY :      :
-           //    0 :                ^^|            : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX 00 00 00 01|YY YY YY YY :      :
-           //    0 :                ^^|            : B    : wait
-           //   -1 :                  |^^          : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX XX 00 00 00|01 YY YY YY :      :
-           //    0 :                ^^|            : C    : wait
-           //   -1 :                  |^^          : B    : wait
-           //   -2 :                  |   ^^       : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX XX XX 00 00|00 01 YY YY :      :
-           //    0 :                ^^|            : C    : wait
-           //   -1 :                  |^^          : C    : wait
-           //   -2 :                  |   ^^       : B    : wait
-           //   -3 :                  |      ^^    : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX XX XX XX 00|00 00 01 YY :      :
-           //    0 :                ^^|            : C    : wait
-           //   -1 :                  |^^          : C    : wait
-           //   -2 :                  |   ^^       :      : push
-           // -----:-------------------------------:------:-------
-           bool A = ((scanner & 0xFFFFFF00) == 0x00000100);
-           bool B = ((scanner &   0xFFFFFF) ==   0x000001);
-           bool C = ((scanner &       0xFF) ==       0x00) && (packetTodo >= -1);
-           if (A || (!B && !C)) {
-              // actually we cannot push out an overfull packet. So we'll have to
-              // adjust the byte count and payload start as necessary. If the byte
-              // count get's negative we'll have to append the excess from fragment's
-              // tail to the next PES header.
-              int bite = data + packetTodo - payload;
-              const uchar *excessData = fragmentData + fragmentLen + bite;
-              // a negative byte count means to drop some bytes from the current
-              // fragment's tail, to not exceed the maximum packet size.
-              PushOutPacket(ResultBuffer, payload, bite);
-              // create a continuation PES header
-              pesHeaderLen = 0;
-              pesHeader[pesHeaderLen++] = 0x00;
-              pesHeader[pesHeaderLen++] = 0x00;
-              pesHeader[pesHeaderLen++] = 0x01;
-              pesHeader[pesHeaderLen++] = Data[3]; // video stream ID
-              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-
-              if (mpegLevel == phMPEG2) {
-                 pesHeader[pesHeaderLen++] = 0x80;
-                 pesHeader[pesHeaderLen++] = 0x00;
-                 pesHeader[pesHeaderLen++] = 0x00;
-                 }
-              else
-                 pesHeader[pesHeaderLen++] = 0x0F;
-
-              // copy any excess data
-              while (bite++ < 0) {
-                    // append the excess data here
-                    pesHeader[pesHeaderLen++] = *excessData++;
-                    packetTodo++;
-                    }
-              // the next packet's payload will begin here
-              payload = data + packetTodo;
-              // as there is no length information available, assume the
-              // maximum we can hold in one PES packet
-              packetTodo += maxPacketSize - pesHeaderLen;
-              }
-           }
-        }
-  // the packet is done. Now store any remaining data into fragment buffer
-  // if we are no longer syncing.
-  if (state != syncing) {
-     // append the PES header ...
-     int bite = pesHeaderLen;
-     pesHeaderLen = 0;
-     if (bite > 0) {
-        memcpy(fragmentData + fragmentLen, pesHeader, bite);
-        fragmentLen += bite;
-        }
-     // append payload. It may contain part of a start code at it's end,
-     // which will be removed when the next packet gets processed.
-     bite = data - payload;
-     if (bite > 0) {
-        memcpy(fragmentData + fragmentLen, payload, bite);
-        fragmentLen += bite;
-        }
-     }
-  // report that syncing dropped some bytes
-  if (skippedBytes > SkippedBytesLimit) {
-     if (!initiallySyncing) // omit report for the typical initial case
-        LOG("cVideoRepacker: skipped %d bytes while syncing on next picture", skippedBytes - SkippedBytesLimit);
-     skippedBytes = SkippedBytesLimit;
-     }
-}
-
-bool cVideoRepacker::ScanForEndOfPictureSlow(const uchar *&Data)
-{
-  localScanner <<= 8;
-  localScanner |= *Data++;
-  // check start codes which follow picture data
-  switch (localScanner) {
-    case 0x00000100: // picture start code
-    case 0x000001B8: // group start code
-    case 0x000001B3: // sequence header code
-    case 0x000001B7: // sequence end code
-         return true;
-    }
-  return false;
-}
-
-bool cVideoRepacker::ScanForEndOfPictureFast(const uchar *&Data, const uchar *Limit)
-{
-  Limit--;
-
-  while (Data < Limit && (Data = (const uchar *)memchr(Data, 0x01, Limit - Data))) {
-        if (Data[-2] || Data[-1])
-           Data += 3;
-        else {
-           localScanner = 0x00000100 | *++Data;
-           // check start codes which follow picture data
-           switch (localScanner) {
-             case 0x00000100: // picture start code
-             case 0x000001B8: // group start code
-             case 0x000001B3: // sequence header code
-             case 0x000001B7: // sequence end code
-                  Data++;
-                  return true;
-             default:
-                  Data += 3;
-             }
-           }
-        }
-
-  Data = Limit + 1;
-  uint32_t *LocalScanner = (uint32_t *)(Data - 4);
-  localScanner = ntohl(*LocalScanner);
-  return false;
-}
-
-bool cVideoRepacker::ScanForEndOfPicture(const uchar *&Data, const uchar *Limit)
-{
-  const uchar *const DataOrig = Data;
-  const int MinDataSize = 4;
-  bool FoundEndOfPicture;
-
-  if (Limit - Data <= MinDataSize) {
-     FoundEndOfPicture = false;
-     while (Data < Limit) {
-           if (ScanForEndOfPictureSlow(Data)) {
-              FoundEndOfPicture = true;
-              break;
-              }
-           }
-     }
-  else {
-     FoundEndOfPicture = true;
-     if (!ScanForEndOfPictureSlow(Data)) {
-        if (!ScanForEndOfPictureSlow(Data)) {
-           if (!ScanForEndOfPictureFast(Data, Limit))
-              FoundEndOfPicture = false;
-           }
-        }
-     }
-
-  localStart += (Data - DataOrig);
-  return FoundEndOfPicture;
-}
-
-int cVideoRepacker::BreakAt(const uchar *Data, int Count)
-{
-  if (initiallySyncing)
-     return -1; // fill the packet buffer completely until we have synced once
-
-  int PesPayloadOffset = 0;
-
-  if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= phInvalid)
-     return -1; // not enough data for test
-
-  // just detect end of picture
-  if (state == scanPicture) {
-     // setup local scanner
-     if (localStart < 0) {
-        localScanner = scanner;
-        localStart = 0;
-        }
-     // start where we've stopped at the last run
-     const uchar *data = Data + PesPayloadOffset + localStart;
-     const uchar *limit = Data + Count;
-     // scan data
-     if (ScanForEndOfPicture(data, limit))
-        return data - Data;
-     }
-  // just fill up packet and append next start code
-  return PesPayloadOffset + packetTodo + 4;
-}
-
-// --- cAudioRepacker --------------------------------------------------------
-
-class cAudioRepacker : public cCommonRepacker {
-private:
-  static int bitRates[2][3][16];
-  enum eState {
-    syncing,
-    scanFrame
-    };
-  int state;
-  int frameTodo;
-  int frameSize;
-  int cid;
-  static bool IsValidAudioHeader(uint32_t Header, bool Mpeg2, int *FrameSize = NULL);
-public:
-  cAudioRepacker(int Cid);
-  virtual void Reset(void);
-  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
-  virtual int BreakAt(const uchar *Data, int Count);
-  };
-
-int cAudioRepacker::bitRates[2][3][16] = { // all values are specified as kbits/s
-  {
-    { 0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 }, // MPEG 1, Layer I
-    { 0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, -1 }, // MPEG 1, Layer II
-    { 0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, -1 }  // MPEG 1, Layer III
-  },
-  {
-    { 0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1 }, // MPEG 2, Layer I
-    { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1 }, // MPEG 2, Layer II/III
-    { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1 }  // MPEG 2, Layer II/III
-  }
-  };
-
-cAudioRepacker::cAudioRepacker(int Cid)
-{
-  cid = Cid;
-  Reset();
-}
-
-void cAudioRepacker::Reset(void)
-{
-  cCommonRepacker::Reset();
-  scanner = 0;
-  state = syncing;
-  frameTodo = 0;
-  frameSize = 0;
-}
-
-bool cAudioRepacker::IsValidAudioHeader(uint32_t Header, bool Mpeg2, int *FrameSize)
-{
-  int syncword           = (Header & 0xFFF00000) >> 20;
-  int id                 = (Header & 0x00080000) >> 19;
-  int layer              = (Header & 0x00060000) >> 17;
-//int protection_bit     = (Header & 0x00010000) >> 16;
-  int bitrate_index      = (Header & 0x0000F000) >> 12;
-  int sampling_frequency = (Header & 0x00000C00) >> 10;
-  int padding_bit        = (Header & 0x00000200) >>  9;
-//int private_bit        = (Header & 0x00000100) >>  8;
-//int mode               = (Header & 0x000000C0) >>  6;
-//int mode_extension     = (Header & 0x00000030) >>  4;
-//int copyright          = (Header & 0x00000008) >>  3;
-//int orignal_copy       = (Header & 0x00000004) >>  2;
-  int emphasis           = (Header & 0x00000003);
-
-  if (syncword != 0xFFF)
-     return false;
-
-  if (id == 0 && !Mpeg2) // reserved in MPEG 1
-     return false;
-
-  if (layer == 0) // reserved
-     return false;
-
-  if (bitrate_index == 0xF) // forbidden
-     return false;
-
-  if (sampling_frequency == 3) // reserved
-     return false;
-
-  if (emphasis == 2) // reserved
-     return false;
-
-  if (FrameSize) {
-     if (bitrate_index == 0)
-        *FrameSize = 0;
-     else {
-        static int samplingFrequencies[2][4] = { // all values are specified in Hz
-          { 44100, 48000, 32000, -1 }, // MPEG 1
-          { 22050, 24000, 16000, -1 }  // MPEG 2
-          };
-
-        static int slots_per_frame[2][3] = {
-          { 12, 144, 144 }, // MPEG 1, Layer I, II, III
-          { 12, 144,  72 }  // MPEG 2, Layer I, II, III
-          };
-
-        int mpegIndex = 1 - id;
-        int layerIndex = 3 - layer;
-
-        // Layer I (i. e., layerIndex == 0) has a larger slot size
-        int slotSize = (layerIndex == 0) ? 4 : 1; // bytes
-
-        int br = 1000 * bitRates[mpegIndex][layerIndex][bitrate_index]; // bits/s
-        int sf = samplingFrequencies[mpegIndex][sampling_frequency];
-
-        int N = slots_per_frame[mpegIndex][layerIndex] * br / sf; // slots
-
-        *FrameSize = (N + padding_bit) * slotSize; // bytes
-        }
-     }
-
-  return true;
-}
-
-void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
-{
-  // synchronisation is detected some bytes after frame start.
-  const int SkippedBytesLimit = 4;
-
-  // reset local scanner
-  localStart = -1;
-
-  int pesPayloadOffset = 0;
-  bool continuationHeader = false;
-  ePesHeader mpegLevel = AnalyzePesHeader(Data, Count, pesPayloadOffset, &continuationHeader);
-  if (mpegLevel <= phInvalid) {
-     DroppedData("cAudioRepacker: no valid PES packet header found", Count);
-     return;
-     }
-  if (!continuationHeader) {
-     // backup PES header
-     pesHeaderBackupLen = pesPayloadOffset;
-     memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
-     }
-
-  // skip PES header
-  int done = pesPayloadOffset;
-  int todo = Count - done;
-  const uchar *data = Data + done;
-  // remember start of the data
-  const uchar *payload = data;
-
-  while (todo > 0) {
-        // collect number of skipped bytes while syncing
-        if (state <= syncing)
-           skippedBytes++;
-        // did we reach an audio frame header?
-        scanner <<= 8;
-        scanner |= *data;
-        if ((scanner & 0xFFF00000) == 0xFFF00000) {
-           if (frameTodo <= 0 && (frameSize == 0 || skippedBytes >= 4) && IsValidAudioHeader(scanner, mpegLevel == phMPEG2, &frameSize)) {
-              if (state == scanFrame) {
-                 // As a new audio frame starts here, the previous one is done. So push
-                 // out the packet to start a new packet for the next audio frame. If
-                 // the byte count gets negative then the current buffer ends in a
-                 // partitial audio frame header that must be stripped off, as it shall
-                 // be put in the next packet.
-                 PushOutPacket(ResultBuffer, payload, data - 3 - payload);
-                 // go on with syncing to the next audio frame
-                 state = syncing;
-                 }
-              if (state == syncing) {
-                 if (initiallySyncing) // omit report for the typical initial case
-                    initiallySyncing = false;
-                 else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                    LOG("cAudioRepacker(0x%02X): skipped %d bytes to sync on next audio frame", cid, skippedBytes - SkippedBytesLimit);
-                 skippedBytes = 0;
-                 // if there is a PES header available, then use it ...
-                 if (pesHeaderBackupLen > 0) {
-                    // ISO 13818-1 says:
-                    // In the case of audio, if a PTS is present in a PES packet header
-                    // it shall refer to the access unit commencing in the PES packet. An
-                    // audio access unit commences in a PES packet if the first byte of
-                    // the audio access unit is present in the PES packet.
-                    memcpy(pesHeader, pesHeaderBackup, pesHeaderBackupLen);
-                    pesHeaderLen = pesHeaderBackupLen;
-                    pesHeaderBackupLen = 0;
-                    }
-                 else {
-                    // ... otherwise create a continuation PES header
-                    pesHeaderLen = 0;
-                    pesHeader[pesHeaderLen++] = 0x00;
-                    pesHeader[pesHeaderLen++] = 0x00;
-                    pesHeader[pesHeaderLen++] = 0x01;
-                    pesHeader[pesHeaderLen++] = Data[3]; // audio stream ID
-                    pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-                    pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-
-                    if (mpegLevel == phMPEG2) {
-                       pesHeader[pesHeaderLen++] = 0x80;
-                       pesHeader[pesHeaderLen++] = 0x00;
-                       pesHeader[pesHeaderLen++] = 0x00;
-                       }
-                    else
-                       pesHeader[pesHeaderLen++] = 0x0F;
-                    }
-                 // append the first three bytes of the audio frame header
-                 pesHeader[pesHeaderLen++] = 0xFF;
-                 pesHeader[pesHeaderLen++] = (scanner >> 16) & 0xFF;
-                 pesHeader[pesHeaderLen++] = (scanner >>  8) & 0xFF;
-                 // the next packet's payload will begin with the fourth byte of
-                 // the audio frame header (= the actual byte)
-                 payload = data;
-                 // maximum we can hold in one PES packet
-                 packetTodo = maxPacketSize - pesHeaderLen;
-                 // expected remainder of audio frame: so far we have read 3 bytes from the frame header
-                 frameTodo = frameSize - 3;
-                 // go on with collecting the frame's data
-                 state++;
-                 }
-              }
-           }
-        data++;
-        done++;
-        todo--;
-        // do we have to start a new packet as the current is done?
-        if (frameTodo > 0) {
-           if (--frameTodo == 0) {
-              // the current audio frame is is done now. So push out the packet to
-              // start a new packet for the next audio frame.
-              PushOutPacket(ResultBuffer, payload, data - payload);
-              // go on with syncing to the next audio frame
-              state = syncing;
-              }
-           }
-        // do we have to start a new packet as there is no more space left?
-        if (state != syncing && --packetTodo <= 0) {
-           // We connot start a new packet here if the current might end in an audio
-           // frame header and this header shall possibly be put in the next packet. So
-           // overfill the current packet until we can safely detect that we won't
-           // break an audio frame header into pieces:
-           //
-           // A) the last four bytes were an audio frame header.
-           // B) the last three bytes introduce an audio frame header.
-           // C) the last two bytes introduce an audio frame header.
-           // D) the last byte introduces an audio frame header.
-           //
-           // Todo : Data                          : Rule : Result
-           // -----:-------------------------------:------:-------
-           //      : XX XX FF Fz zz zz|YY YY YY YY :      :
-           //    0 :                ^^|            : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX XX FF Fz zz|zz YY YY YY :      :
-           //    0 :                ^^|            : B    : wait
-           //   -1 :                  |^^          : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX XX XX FF Fz|zz zz YY YY :      :
-           //    0 :                ^^|            : C    : wait
-           //   -1 :                  |^^          : B    : wait
-           //   -2 :                  |   ^^       : A    : push
-           // -----:-------------------------------:------:-------
-           //      : XX XX XX XX XX FF|Fz zz zz YY :      :
-           //    0 :                ^^|            : D    : wait
-           //   -1 :                  |^^          : C    : wait
-           //   -2 :                  |   ^^       : B    : wait
-           //   -3 :                  |      ^^    : A    : push
-           // -----:-------------------------------:------:-------
-           bool A = ((scanner & 0xFFF00000) == 0xFFF00000);
-           bool B = ((scanner &   0xFFF000) ==   0xFFF000);
-           bool C = ((scanner &     0xFFF0) ==     0xFFF0);
-           bool D = ((scanner &       0xFF) ==       0xFF);
-           if (A || (!B && !C && !D)) {
-              // Actually we cannot push out an overfull packet. So we'll have to
-              // adjust the byte count and payload start as necessary. If the byte
-              // count gets negative we'll have to append the excess from fragment's
-              // tail to the next PES header.
-              int bite = data + packetTodo - payload;
-              const uchar *excessData = fragmentData + fragmentLen + bite;
-              // A negative byte count means to drop some bytes from the current
-              // fragment's tail, to not exceed the maximum packet size.
-              PushOutPacket(ResultBuffer, payload, bite);
-              // create a continuation PES header
-              pesHeaderLen = 0;
-              pesHeader[pesHeaderLen++] = 0x00;
-              pesHeader[pesHeaderLen++] = 0x00;
-              pesHeader[pesHeaderLen++] = 0x01;
-              pesHeader[pesHeaderLen++] = Data[3]; // audio stream ID
-              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-              pesHeader[pesHeaderLen++] = 0x00; // length still unknown
-
-              if (mpegLevel == phMPEG2) {
-                 pesHeader[pesHeaderLen++] = 0x80;
-                 pesHeader[pesHeaderLen++] = 0x00;
-                 pesHeader[pesHeaderLen++] = 0x00;
-                 }
-              else
-                 pesHeader[pesHeaderLen++] = 0x0F;
-
-              // copy any excess data
-              while (bite++ < 0) {
-                    // append the excess data here
-                    pesHeader[pesHeaderLen++] = *excessData++;
-                    packetTodo++;
-                    }
-              // the next packet's payload will begin here
-              payload = data + packetTodo;
-              // as there is no length information available, assume the
-              // maximum we can hold in one PES packet
-              packetTodo += maxPacketSize - pesHeaderLen;
-              }
-           }
-        }
-  // The packet is done. Now store any remaining data into fragment buffer
-  // if we are no longer syncing.
-  if (state != syncing) {
-     // append the PES header ...
-     int bite = pesHeaderLen;
-     pesHeaderLen = 0;
-     if (bite > 0) {
-        memcpy(fragmentData + fragmentLen, pesHeader, bite);
-        fragmentLen += bite;
-        }
-     // append payload. It may contain part of an audio frame header at it's
-     // end, which will be removed when the next packet gets processed.
-     bite = data - payload;
-     if (bite > 0) {
-        memcpy(fragmentData + fragmentLen, payload, bite);
-        fragmentLen += bite;
-        }
-     }
-  // report that syncing dropped some bytes
-  if (skippedBytes > SkippedBytesLimit) {
-     if (!initiallySyncing) // omit report for the typical initial case
-        LOG("cAudioRepacker(0x%02X): skipped %d bytes while syncing on next audio frame", cid, skippedBytes - SkippedBytesLimit);
-     skippedBytes = SkippedBytesLimit;
-     }
-}
-
-int cAudioRepacker::BreakAt(const uchar *Data, int Count)
-{
-  if (initiallySyncing)
-     return -1; // fill the packet buffer completely until we have synced once
-
-  int PesPayloadOffset = 0;
-
-  ePesHeader MpegLevel = AnalyzePesHeader(Data, Count, PesPayloadOffset);
-  if (MpegLevel <= phInvalid)
-     return -1; // not enough data for test
-
-  // determine amount of data to fill up packet and to append next audio frame header
-  int packetRemainder = PesPayloadOffset + packetTodo + 4;
-
-  // just detect end of an audio frame
-  if (state == scanFrame) {
-     // when remaining audio frame size is known, then omit scanning
-     if (frameTodo > 0) {
-        // determine amount of data to fill up audio frame and to append next audio frame header
-        int remaining = PesPayloadOffset + frameTodo + 4;
-        if (remaining < packetRemainder)
-           return remaining;
-        return packetRemainder;
-        }
-     // setup local scanner
-     if (localStart < 0) {
-        localScanner = scanner;
-        localStart = 0;
-        }
-     // start where we've stopped at the last run
-     const uchar *data = Data + PesPayloadOffset + localStart;
-     const uchar *limit = Data + Count;
-     // scan data
-     while (data < limit) {
-           localStart++;
-           localScanner <<= 8;
-           localScanner |= *data++;
-           // check whether the next audio frame follows
-           if (((localScanner & 0xFFF00000) == 0xFFF00000) && IsValidAudioHeader(localScanner, MpegLevel == phMPEG2))
-              return data - Data;
-           }
-     }
-  // just fill up packet and append next audio frame header
-  return packetRemainder;
-}
-
-// --- cDolbyRepacker --------------------------------------------------------
-
-class cDolbyRepacker : public cRepacker {
-private:
-  static int frameSizes[];
-  uchar fragmentData[6 + 65535];
-  int fragmentLen;
-  int fragmentTodo;
-  uchar pesHeader[6 + 3 + 255 + 4 + 4];
-  int pesHeaderLen;
-  uchar pesHeaderBackup[6 + 3 + 255];
-  int pesHeaderBackupLen;
-  uchar chk1;
-  uchar chk2;
-  int ac3todo;
-  enum eState {
-    find_0b,
-    find_77,
-    store_chk1,
-    store_chk2,
-    get_length,
-    output_packet
-    };
-  int state;
-  int skippedBytes;
-  void ResetPesHeader(bool ContinuationFrame = false);
-  void AppendSubStreamID(bool ContinuationFrame = false);
-  bool FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite);
-  bool StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite);
-public:
-  cDolbyRepacker(void);
-  virtual void Reset(void);
-  virtual void Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count);
-  virtual int BreakAt(const uchar *Data, int Count);
-  };
-
-// frameSizes are in words, i. e. multiply them by 2 to get bytes
-int cDolbyRepacker::frameSizes[] = {
-  // fs = 48 kHz
-    64,   64,   80,   80,   96,   96,  112,  112,  128,  128,  160,  160,  192,  192,  224,  224,
-   256,  256,  320,  320,  384,  384,  448,  448,  512,  512,  640,  640,  768,  768,  896,  896,
-  1024, 1024, 1152, 1152, 1280, 1280,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  // fs = 44.1 kHz
-    69,   70,   87,   88,  104,  105,  121,  122,  139,  140,  174,  175,  208,  209,  243,  244,
-   278,  279,  348,  349,  417,  418,  487,  488,  557,  558,  696,  697,  835,  836,  975,  976,
-  1114, 1115, 1253, 1254, 1393, 1394,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  // fs = 32 kHz
-    96,   96,  120,  120,  144,  144,  168,  168,  192,  192,  240,  240,  288,  288,  336,  336,
-   384,  384,  480,  480,  576,  576,  672,  672,  768,  768,  960,  960, 1152, 1152, 1344, 1344,
-  1536, 1536, 1728, 1728, 1920, 1920,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  //
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  };
-
-cDolbyRepacker::cDolbyRepacker(void)
-{
-  pesHeader[0] = 0x00;
-  pesHeader[1] = 0x00;
-  pesHeader[2] = 0x01;
-  pesHeader[3] = 0xBD;
-  pesHeader[4] = 0x00;
-  pesHeader[5] = 0x00;
-  Reset();
-}
-
-void cDolbyRepacker::AppendSubStreamID(bool ContinuationFrame)
-{
-  if (subStreamId) {
-     pesHeader[pesHeaderLen++] = subStreamId;
-     // number of ac3 frames "starting" in this packet (1 by design).
-     pesHeader[pesHeaderLen++] = 0x01;
-     // offset to start of first ac3 frame (0 means "no ac3 frame starting"
-     // so 1 (by design) addresses the first byte after the next two bytes).
-     pesHeader[pesHeaderLen++] = 0x00;
-     pesHeader[pesHeaderLen++] = (ContinuationFrame ? 0x00 : 0x01);
-     }
-}
-
-void cDolbyRepacker::ResetPesHeader(bool ContinuationFrame)
-{
-  pesHeader[6] = 0x80;
-  pesHeader[7] = 0x00;
-  pesHeader[8] = 0x00;
-  pesHeaderLen = 9;
-  AppendSubStreamID(ContinuationFrame);
-}
-
-void cDolbyRepacker::Reset(void)
-{
-  cRepacker::Reset();
-  ResetPesHeader();
-  state = find_0b;
-  ac3todo = 0;
-  chk1 = 0;
-  chk2 = 0;
-  fragmentLen = 0;
-  fragmentTodo = 0;
-  pesHeaderBackupLen = 0;
-  skippedBytes = 0;
-}
-
-bool cDolbyRepacker::FinishRemainder(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite)
-{
-  bool success = true;
-  // enough data available to put PES packet into buffer?
-  if (fragmentTodo <= Todo) {
-     // output a previous fragment first
-     if (fragmentLen > 0) {
-        Bite = fragmentLen;
-        int n = Put(ResultBuffer, fragmentData, Bite, fragmentLen + fragmentTodo);
-        if (Bite != n)
-           success = false;
-        fragmentLen = 0;
-        }
-     Bite = fragmentTodo;
-     if (success) {
-        int n = Put(ResultBuffer, Data, Bite, Bite);
-        if (Bite != n)
-           success = false;
-        }
-     fragmentTodo = 0;
-     // ac3 frame completely processed?
-     if (Bite >= ac3todo)
-        state = find_0b; // go on with finding start of next packet
-     }
-  else {
-     // copy the fragment into separate buffer for later processing
-     Bite = Todo;
-     memcpy(fragmentData + fragmentLen, Data, Bite);
-     fragmentLen += Bite;
-     fragmentTodo -= Bite;
-     }
-  return success;
-}
-
-bool cDolbyRepacker::StartNewPacket(cRingBufferLinear *ResultBuffer, const uchar *const Data, const int Todo, int &Bite)
-{
-  bool success = true;
-  int packetLen = pesHeaderLen + ac3todo;
-  // limit packet to maximum size
-  if (packetLen > maxPacketSize)
-     packetLen = maxPacketSize;
-  pesHeader[4] = (packetLen - 6) >> 8;
-  pesHeader[5] = (packetLen - 6) & 0xFF;
-  Bite = pesHeaderLen;
-  // enough data available to put PES packet into buffer?
-  if (packetLen - pesHeaderLen <= Todo) {
-     int n = Put(ResultBuffer, pesHeader, Bite, packetLen);
-     if (Bite != n)
-        success = false;
-     Bite = packetLen - pesHeaderLen;
-     if (success) {
-        n = Put(ResultBuffer, Data, Bite, Bite);
-        if (Bite != n)
-           success = false;
-        }
-     // ac3 frame completely processed?
-     if (Bite >= ac3todo)
-        state = find_0b; // go on with finding start of next packet
-     }
-  else {
-     fragmentTodo = packetLen;
-     // copy the pesheader into separate buffer for later processing
-     memcpy(fragmentData + fragmentLen, pesHeader, Bite);
-     fragmentLen += Bite;
-     fragmentTodo -= Bite;
-     // copy the fragment into separate buffer for later processing
-     Bite = Todo;
-     memcpy(fragmentData + fragmentLen, Data, Bite);
-     fragmentLen += Bite;
-     fragmentTodo -= Bite;
-     }
-  return success;
-}
-
-void cDolbyRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data, int Count)
-{
-  // synchronisation is detected some bytes after frame start.
-  const int SkippedBytesLimit = 4;
-
-  // check for MPEG 2
-  if ((Data[6] & 0xC0) != 0x80) {
-     DroppedData("cDolbyRepacker: MPEG 2 PES header expected", Count);
-     return;
-     }
-
-  // backup PES header
-  if (Data[6] != 0x80 || Data[7] != 0x00 || Data[8] != 0x00) {
-     pesHeaderBackupLen = 6 + 3 + Data[8];
-     memcpy(pesHeaderBackup, Data, pesHeaderBackupLen);
-     }
-
-  // skip PES header
-  int done = 6 + 3 + Data[8];
-  int todo = Count - done;
-  const uchar *data = Data + done;
-
-  // look for 0x0B 0x77 <chk1> <chk2> <frameSize>
-  while (todo > 0) {
-        switch (state) {
-          case find_0b:
-               if (*data == 0x0B) {
-                  state++;
-                  // copy header information once for later use
-                  if (pesHeaderBackupLen > 0) {
-                     pesHeaderLen = pesHeaderBackupLen;
-                     pesHeaderBackupLen = 0;
-                     memcpy(pesHeader, pesHeaderBackup, pesHeaderLen);
-                     AppendSubStreamID();
-                     }
-                  }
-               data++;
-               done++;
-               todo--;
-               skippedBytes++; // collect number of skipped bytes while syncing
-               continue;
-          case find_77:
-               if (*data != 0x77) {
-                  state = find_0b;
-                  continue;
-                  }
-               data++;
-               done++;
-               todo--;
-               skippedBytes++; // collect number of skipped bytes while syncing
-               state++;
-               continue;
-          case store_chk1:
-               chk1 = *data++;
-               done++;
-               todo--;
-               skippedBytes++; // collect number of skipped bytes while syncing
-               state++;
-               continue;
-          case store_chk2:
-               chk2 = *data++;
-               done++;
-               todo--;
-               skippedBytes++; // collect number of skipped bytes while syncing
-               state++;
-               continue;
-          case get_length:
-               ac3todo = 2 * frameSizes[*data];
-               // frameSizeCode was invalid => restart searching
-               if (ac3todo <= 0) {
-                  // reset PES header instead of using a wrong one
-                  ResetPesHeader();
-                  if (chk1 == 0x0B) {
-                     if (chk2 == 0x77) {
-                        state = store_chk1;
-                        continue;
-                        }
-                     if (chk2 == 0x0B) {
-                        state = find_77;
-                        continue;
-                        }
-                     state = find_0b;
-                     continue;
-                     }
-                  if (chk2 == 0x0B) {
-                     state = find_77;
-                     continue;
-                     }
-                  state = find_0b;
-                  continue;
-                  }
-               if (initiallySyncing) // omit report for the typical initial case
-                  initiallySyncing = false;
-               else if (skippedBytes > SkippedBytesLimit) // report that syncing dropped some bytes
-                  LOG("cDolbyRepacker: skipped %d bytes to sync on next AC3 frame", skippedBytes - SkippedBytesLimit);
-               skippedBytes = 0;
-               // append read data to header for common output processing
-               pesHeader[pesHeaderLen++] = 0x0B;
-               pesHeader[pesHeaderLen++] = 0x77;
-               pesHeader[pesHeaderLen++] = chk1;
-               pesHeader[pesHeaderLen++] = chk2;
-               ac3todo -= 4;
-               state++;
-               // fall through to output
-          case output_packet: {
-               int bite = 0;
-               // finish remainder of ac3 frame?
-               if (fragmentTodo > 0)
-                  FinishRemainder(ResultBuffer, data, todo, bite);
-               else {
-                  // start a new packet
-                  StartNewPacket(ResultBuffer, data, todo, bite);
-                  // prepare for next (continuation) packet
-                  ResetPesHeader(state == output_packet);
-                  }
-               data += bite;
-               done += bite;
-               todo -= bite;
-               ac3todo -= bite;
-               }
-          }
-        }
-  // report that syncing dropped some bytes
-  if (skippedBytes > SkippedBytesLimit) {
-     if (!initiallySyncing) // omit report for the typical initial case
-        LOG("cDolbyRepacker: skipped %d bytes while syncing on next AC3 frame", skippedBytes - 4);
-     skippedBytes = SkippedBytesLimit;
-     }
-}
-
-int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
-{
-  if (initiallySyncing)
-     return -1; // fill the packet buffer completely until we have synced once
-  // enough data for test?
-  if (Count < 6 + 3)
-     return -1;
-  // check for MPEG 2
-  if ((Data[6] & 0xC0) != 0x80)
-     return -1;
-  int headerLen = Data[8] + 6 + 3;
-  // break after fragment tail?
-  if (ac3todo > 0)
-     return headerLen + ac3todo;
-  // enough data for test?
-  if (Count < headerLen + 5)
-     return -1;
-  const uchar *data = Data + headerLen;
-  // break after ac3 frame?
-  if (data[0] == 0x0B && data[1] == 0x77 && frameSizes[data[4]] > 0)
-     return headerLen + 2 * frameSizes[data[4]];
-  return -1;
-}
-
-// --- cTS2PES ---------------------------------------------------------------
-
-#include <netinet/in.h>
-
-//XXX TODO: these should really be available in some driver header file!
-#define PROG_STREAM_MAP  0xBC
-#ifndef PRIVATE_STREAM1
-#define PRIVATE_STREAM1  0xBD
-#endif
-#define PADDING_STREAM   0xBE
-#ifndef PRIVATE_STREAM2
-#define PRIVATE_STREAM2  0xBF
-#endif
-#define AUDIO_STREAM_S   0xC0
-#define AUDIO_STREAM_E   0xDF
 #define VIDEO_STREAM_S   0xE0
-#define VIDEO_STREAM_E   0xEF
-#define ECM_STREAM       0xF0
-#define EMM_STREAM       0xF1
-#define DSM_CC_STREAM    0xF2
-#define ISO13522_STREAM  0xF3
-#define PROG_STREAM_DIR  0xFF
-
-//pts_dts flags
-#define PTS_ONLY         0x80
-
-#define PID_MASK_HI    0x1F
-#define CONT_CNT_MASK  0x0F
-
-// Flags:
-#define PAY_LOAD       0x10
-#define ADAPT_FIELD    0x20
-#define PAY_START      0x40
-#define TS_ERROR       0x80
-
-#define MAX_PLENGTH  0xFFFF          // the maximum PES packet length (theoretically)
-#define MMAX_PLENGTH (64*MAX_PLENGTH) // some stations send PES packets that are extremely large, e.g. DVB-T in Finland or HDTV 1920x1080
-
-#define IPACKS 2048
-
-// Start codes:
-#define SC_SEQUENCE 0xB3  // "sequence header code"
-#define SC_GROUP    0xB8  // "group start code"
-#define SC_PICTURE  0x00  // "picture start code"
-
-#define MAXNONUSEFULDATA (10*1024*1024)
-#define MAXNUMUPTERRORS  10
-
-class cTS2PES {
-private:
-  int pid;
-  int size;
-  int found;
-  int count;
-  uint8_t *buf;
-  uint8_t cid;
-  uint8_t rewriteCid;
-  uint8_t subStreamId;
-  int plength;
-  uint8_t plen[2];
-  uint8_t flag1;
-  uint8_t flag2;
-  uint8_t hlength;
-  int mpeg;
-  uint8_t check;
-  int mpeg1_required;
-  int mpeg1_stuffing;
-  bool done;
-  cRingBufferLinear *resultBuffer;
-  int tsErrors;
-  int ccErrors;
-  int ccCounter;
-  cRepacker *repacker;
-  static uint8_t headr[];
-  void store(uint8_t *Data, int Count);
-  void reset_ipack(void);
-  void send_ipack(void);
-  void write_ipack(const uint8_t *Data, int Count);
-  void instant_repack(const uint8_t *Buf, int Count);
-public:
-  cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t RewriteCid = 0x00, uint8_t SubStreamId = 0x00, cRepacker *Repacker = NULL);
-  ~cTS2PES();
-  int Pid(void) { return pid; }
-  void ts_to_pes(const uint8_t *Buf); // don't need count (=188)
-  void Clear(void);
-  };
-
-uint8_t cTS2PES::headr[] = { 0x00, 0x00, 0x01 };
-
-cTS2PES::cTS2PES(int Pid, cRingBufferLinear *ResultBuffer, int Size, uint8_t RewriteCid, uint8_t SubStreamId, cRepacker *Repacker)
-{
-  pid = Pid;
-  resultBuffer = ResultBuffer;
-  size = Size;
-  rewriteCid = RewriteCid;
-  subStreamId = SubStreamId;
-  repacker = Repacker;
-  if (repacker) {
-     repacker->SetMaxPacketSize(size);
-     repacker->SetSubStreamId(subStreamId);
-     size += repacker->QuerySnoopSize();
-     }
-
-  tsErrors = 0;
-  ccErrors = 0;
-  ccCounter = -1;
-
-  if (!(buf = MALLOC(uint8_t, size)))
-     esyslog("Not enough memory for ts_transform");
-
-  reset_ipack();
-}
-
-cTS2PES::~cTS2PES()
-{
-  if (tsErrors || ccErrors)
-     dsyslog("cTS2PES got %d TS errors, %d TS continuity errors", tsErrors, ccErrors);
-  free(buf);
-  delete repacker;
-}
-
-void cTS2PES::Clear(void)
-{
-  reset_ipack();
-  if (repacker)
-     repacker->Reset();
-}
-
-void cTS2PES::store(uint8_t *Data, int Count)
-{
-  if (repacker)
-     repacker->Repack(resultBuffer, Data, Count);
-  else
-     cRepacker::Put(resultBuffer, Data, Count, Count);
-}
-
-void cTS2PES::reset_ipack(void)
-{
-  found = 0;
-  cid = 0;
-  plength = 0;
-  flag1 = 0;
-  flag2 = 0;
-  hlength = 0;
-  mpeg = 0;
-  check = 0;
-  mpeg1_required = 0;
-  mpeg1_stuffing = 0;
-  done = false;
-  count = 0;
-}
-
-void cTS2PES::send_ipack(void)
-{
-  if (count <= ((mpeg == 2) ? 9 : 7)) // skip empty packets
-     return;
-  buf[3] = rewriteCid ? rewriteCid : cid;
-  buf[4] = (uint8_t)(((count - 6) & 0xFF00) >> 8);
-  buf[5] = (uint8_t)((count - 6) & 0x00FF);
-  store(buf, count);
-
-  switch (mpeg) {
-    case 2:
-            buf[6] = 0x80;
-            buf[7] = 0x00;
-            buf[8] = 0x00;
-            count = 9;
-            if (!repacker && subStreamId) {
-               buf[9] = subStreamId;
-               buf[10] = 1;
-               buf[11] = 0;
-               buf[12] = 1;
-               count = 13;
-               }
-            break;
-    case 1:
-            buf[6] = 0x0F;
-            count = 7;
-            break;
-    }
-}
-
-void cTS2PES::write_ipack(const uint8_t *Data, int Count)
-{
-  if (count < 6) {
-     memcpy(buf, headr, 3);
-     count = 6;
-     }
-
-  // determine amount of data to process
-  int bite = Count;
-  if (count + bite > size)
-     bite = size - count;
-  if (repacker) {
-     int breakAt = repacker->BreakAt(buf, count);
-     // avoid memcpy of data after break location
-     if (0 <= breakAt && breakAt < count + bite) {
-        bite = breakAt - count;
-        if (bite < 0) // should never happen
-           bite = 0;
-        }
-     }
-
-  memcpy(buf + count, Data, bite);
-  count += bite;
-
-  if (repacker) {
-     // determine break location
-     int breakAt = repacker->BreakAt(buf, count);
-     if (breakAt > size) // won't fit into packet?
-        breakAt = -1;
-     if (breakAt > count) // not enough data?
-        breakAt = -1;
-     // push out data before break location
-     if (breakAt > 0) {
-        // adjust bite if above memcpy was to large
-        bite -= count - breakAt;
-        count = breakAt;
-        send_ipack();
-        // recurse for data after break location
-        if (Count - bite > 0)
-           write_ipack(Data + bite, Count - bite);
-        }
-     }
-
-  // push out data when buffer is full
-  if (count >= size) {
-     send_ipack();
-     // recurse for remaining data
-     if (Count - bite > 0)
-        write_ipack(Data + bite, Count - bite);
-     }
-}
-
-void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
-{
-  int c = 0;
-
-  while (c < Count && (mpeg == 0 || (mpeg == 1 && found < mpeg1_required) || (mpeg == 2 && found < 9)) && (found < 5 || !done)) {
-        switch (found ) {
-          case 0:
-          case 1:
-                  if (Buf[c] == 0x00)
-                     found++;
-                  else
-                     found = 0;
-                  c++;
-                  break;
-          case 2:
-                  if (Buf[c] == 0x01)
-                     found++;
-                  else if (Buf[c] != 0)
-                     found = 0;
-                  c++;
-                  break;
-          case 3:
-                  cid = 0;
-                  switch (Buf[c]) {
-                    case PROG_STREAM_MAP:
-                    case PRIVATE_STREAM2:
-                    case PROG_STREAM_DIR:
-                    case ECM_STREAM     :
-                    case EMM_STREAM     :
-                    case PADDING_STREAM :
-                    case DSM_CC_STREAM  :
-                    case ISO13522_STREAM:
-                         done = true;
-                    case PRIVATE_STREAM1:
-                    case VIDEO_STREAM_S ... VIDEO_STREAM_E:
-                    case AUDIO_STREAM_S ... AUDIO_STREAM_E:
-                         found++;
-                         cid = Buf[c++];
-                         break;
-                    default:
-                         found = 0;
-                         break;
-                    }
-                  break;
-          case 4:
-                  if (Count - c > 1) {
-                     unsigned short *pl = (unsigned short *)(Buf + c);
-                     plength = ntohs(*pl);
-                     c += 2;
-                     found += 2;
-                     mpeg1_stuffing = 0;
-                     }
-                  else {
-                     plen[0] = Buf[c];
-                     found++;
-                     return;
-                     }
-                  break;
-          case 5: {
-                    plen[1] = Buf[c++];
-                    unsigned short *pl = (unsigned short *)plen;
-                    plength = ntohs(*pl);
-                    found++;
-                    mpeg1_stuffing = 0;
-                  }
-                  break;
-          case 6:
-                  if (!done) {
-                     flag1 = Buf[c++];
-                     found++;
-                     if (mpeg1_stuffing == 0) { // first stuffing iteration: determine MPEG level
-                        if ((flag1 & 0xC0) == 0x80)
-                           mpeg = 2;
-                        else {
-                           mpeg = 1;
-                           mpeg1_required = 7;
-                           }
-                        }
-                     if (mpeg == 1) {
-                        if (flag1 == 0xFF) { // MPEG1 stuffing
-                           if (++mpeg1_stuffing > 16)
-                              found = 0; // invalid MPEG1 header
-                           else { // ignore stuffing
-                              found--;
-                              if (plength > 0)
-                                 plength--;
-                              }
-                           }
-                        else if ((flag1 & 0xC0) == 0x40) // STD_buffer_scale/size
-                           mpeg1_required += 2;
-                        else if (flag1 != 0x0F && (flag1 & 0xF0) != 0x20 && (flag1 & 0xF0) != 0x30)
-                           found = 0; // invalid MPEG1 header
-                        else {
-                           flag2 = 0;
-                           hlength = 0;
-                           }
-                        }
-                     }
-                  break;
-          case 7:
-                  if (!done && (mpeg == 2 || mpeg1_required > 7)) {
-                     flag2 = Buf[c++];
-                     found++;
-                     }
-                  break;
-          case 8:
-                  if (!done && (mpeg == 2 || mpeg1_required > 7)) {
-                     hlength = Buf[c++];
-                     found++;
-                     if (mpeg == 1 && hlength != 0x0F && (hlength & 0xF0) != 0x20 && (hlength & 0xF0) != 0x30)
-                        found = 0; // invalid MPEG1 header
-                     }
-                  break;
-          default:
-                  break;
-          }
-        }
-
-  if (!plength)
-     plength = MMAX_PLENGTH - 6;
-
-  if (done || ((mpeg == 2 && found >= 9) || (mpeg == 1 && found >= mpeg1_required))) {
-     switch (cid) {
-       case AUDIO_STREAM_S ... AUDIO_STREAM_E:
-       case VIDEO_STREAM_S ... VIDEO_STREAM_E:
-       case PRIVATE_STREAM1:
-
-            if (mpeg == 2 && found == 9 && count < found) { // make sure to not write the data twice by looking at count
-               write_ipack(&flag1, 1);
-               write_ipack(&flag2, 1);
-               write_ipack(&hlength, 1);
-               }
-
-            if (mpeg == 1 && found == mpeg1_required && count < found) { // make sure to not write the data twice by looking at count
-               write_ipack(&flag1, 1);
-               if (mpeg1_required > 7) {
-                  write_ipack(&flag2, 1);
-                  write_ipack(&hlength, 1);
-                  }
-               }
-
-            if (mpeg == 2 && (flag2 & PTS_ONLY) && found < 14) {
-               while (c < Count && found < 14) {
-                     write_ipack(Buf + c, 1);
-                     c++;
-                     found++;
-                     }
-               if (c == Count)
-                  return;
-               }
-
-            if (!repacker && subStreamId) {
-               while (c < Count && found < (hlength + 9) && found < plength + 6) {
-                     write_ipack(Buf + c, 1);
-                     c++;
-                     found++;
-                     }
-               if (found == (hlength + 9)) {
-                  uchar sbuf[] = { 0x01, 0x00, 0x00 };
-                  write_ipack(&subStreamId, 1);
-                  write_ipack(sbuf, 3);
-                  }
-               }
-
-            while (c < Count && found < plength + 6) {
-                  int l = Count - c;
-                  if (l + found > plength + 6)
-                     l = plength + 6 - found;
-                  write_ipack(Buf + c, l);
-                  found += l;
-                  c += l;
-                  }
-
-            break;
-       }
-
-     if (done) {
-        if (found + Count - c < plength + 6) {
-           found += Count - c;
-           c = Count;
-           }
-        else {
-           c += plength + 6 - found;
-           found = plength + 6;
-           }
-        }
-
-     if (plength && found == plength + 6) {
-        if (plength == MMAX_PLENGTH - 6)
-           esyslog("ERROR: PES packet length overflow in remuxer (stream corruption)");
-        send_ipack();
-        reset_ipack();
-        if (c < Count)
-           instant_repack(Buf + c, Count - c);
-        }
-     }
-  return;
-}
-
-void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188)
-{
-  if (!Buf)
-     return;
-
-  if (Buf[1] & TS_ERROR)
-     tsErrors++;
-
-  if (!(Buf[3] & (ADAPT_FIELD | PAY_LOAD)))
-     return; // discard TS packet with adaption_field_control set to '00'.
-
-  if ((Buf[3] & PAY_LOAD) && ((Buf[3] ^ ccCounter) & CONT_CNT_MASK)) {
-     // This should check duplicates and packets which do not increase the counter.
-     // But as the errors usually come in bursts this should be enough to
-     // show you there is something wrong with signal quality.
-     if (ccCounter != -1 && ((Buf[3] ^ (ccCounter + 1)) & CONT_CNT_MASK)) {
-        ccErrors++;
-        // Enable this if you are having problems with signal quality.
-        // These are the errors I used to get with Nova-T when antenna
-        // was not positioned correcly (not transport errors). //tvr
-        //dsyslog("TS continuity error (%d)", ccCounter);
-        }
-     ccCounter = Buf[3] & CONT_CNT_MASK;
-     }
-
-  if (Buf[1] & PAY_START) {
-     if (found > 6) {
-        if (plength != MMAX_PLENGTH - 6 && plength != found - 6)
-           dsyslog("PES packet shortened to %d bytes (expected: %d bytes)", found, plength + 6);
-        plength = found - 6;
-        send_ipack();
-        reset_ipack();
-        }
-     found = 0;
-     }
-
-  uint8_t off = 0;
-
-  if (Buf[3] & ADAPT_FIELD) {  // adaptation field?
-     off = Buf[4] + 1;
-     if (off + 4 > 187)
-        return;
-     }
-
-  if (Buf[3] & PAY_LOAD)
-     instant_repack(Buf + 4 + off, TS_SIZE - 4 - off);
-}
-
-// --- cRingBufferLinearPes --------------------------------------------------
-
-class cRingBufferLinearPes : public cRingBufferLinear {
-protected:
-  virtual int DataReady(const uchar *Data, int Count);
-public:
-  cRingBufferLinearPes(int Size, int Margin = 0, bool Statistics = false, const char *Description = NULL)
-  :cRingBufferLinear(Size, Margin, Statistics, Description) {}
-  };
-
-int cRingBufferLinearPes::DataReady(const uchar *Data, int Count)
-{
-  int c = cRingBufferLinear::DataReady(Data, Count);
-  if (!c && Count >= 6) {
-     if (!Data[0] && !Data[1] && Data[2] == 0x01) {
-        int Length = 6 + Data[4] * 256 + Data[5];
-        if (Length <= Count)
-           return Length;
-        }
-     }
-  return c;
-}
 
 // --- cRemux ----------------------------------------------------------------
 
-#define RESULTBUFFERSIZE KILOBYTE(256)
-
-cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure)
-{
-  exitOnFailure = ExitOnFailure;
-  noVideo = VPid == 0 || VPid == 1 || VPid == 0x1FFF;
-  numUPTerrors = 0;
-  synced = false;
-  skipped = 0;
-  numTracks = 0;
-  resultSkipped = 0;
-  resultBuffer = new cRingBufferLinearPes(RESULTBUFFERSIZE, IPACKS, false, "Result");
-  resultBuffer->SetTimeouts(0, 100);
-  if (VPid)
-#define TEST_cVideoRepacker
-#ifdef TEST_cVideoRepacker
-     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0xE0, 0x00, new cVideoRepacker);
-#else
-     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0xE0);
-#endif
-  if (APids) {
-     int n = 0;
-     while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS) {
-#define TEST_cAudioRepacker
-#ifdef TEST_cAudioRepacker
-           ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n, 0x00, new cAudioRepacker(0xC0 + n));
-           n++;
-#else
-           ts2pes[numTracks++] = new cTS2PES(*APids++, resultBuffer, IPACKS, 0xC0 + n++);
-#endif
-           }
-     }
-  if (DPids) {
-     int n = 0;
-     while (*DPids && numTracks < MAXTRACKS && n < MAXDPIDS)
-           ts2pes[numTracks++] = new cTS2PES(*DPids++, resultBuffer, IPACKS, 0x00, 0x80 + n++, new cDolbyRepacker);
-     }
-  if (SPids) {
-     int n = 0;
-     while (*SPids && numTracks < MAXTRACKS && n < MAXSPIDS)
-           ts2pes[numTracks++] = new cTS2PES(*SPids++, resultBuffer, IPACKS, 0x00, 0x20 + n++);
-     }
-}
-
-cRemux::~cRemux()
-{
-  for (int t = 0; t < numTracks; t++)
-      delete ts2pes[t];
-  delete resultBuffer;
-}
-
-int cRemux::GetPid(const uchar *Data)
-{
-  return (((uint16_t)Data[0] & PID_MASK_HI) << 8) | (Data[1] & 0xFF);
-}
-
-int cRemux::GetPacketLength(const uchar *Data, int Count, int Offset)
-{
-  // Returns the length of the packet starting at Offset, or -1 if Count is
-  // too small to contain the entire packet.
-  int Length = (Offset + 5 < Count) ? (Data[Offset + 4] << 8) + Data[Offset + 5] + 6 : -1;
-  if (Length > 0 && Offset + Length <= Count)
-     return Length;
-  return -1;
-}
-
-int cRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType)
-{
-  // Scans the video packet starting at Offset and returns its length.
-  // If the return value is -1 the packet was not completely in the buffer.
-  int Length = GetPacketLength(Data, Count, Offset);
-  if (Length > 0) {
-     int PesPayloadOffset = 0;
-     if (AnalyzePesHeader(Data + Offset, Length, PesPayloadOffset) >= phMPEG1) {
-        const uchar *p = Data + Offset + PesPayloadOffset + 2;
-        const uchar *pLimit = Data + Offset + Length - 3;
-#ifdef TEST_cVideoRepacker
-        // cVideoRepacker ensures that a new PES packet is started for a new sequence,
-        // group or picture which allows us to easily skip scanning through a huge
-        // amount of video data.
-        if (p < pLimit) {
-           if (p[-2] || p[-1] || p[0] != 0x01)
-              pLimit = 0; // skip scanning: packet doesn't start with 0x000001
-           else {
-              switch (p[1]) {
-                case SC_SEQUENCE:
-                case SC_GROUP:
-                case SC_PICTURE:
-                     break;
-                default: // skip scanning: packet doesn't start a new sequence, group or picture
-                     pLimit = 0;
-                }
-              }
-           }
-#endif
-        while (p < pLimit && (p = (const uchar *)memchr(p, 0x01, pLimit - p))) {
-              if (!p[-2] && !p[-1]) { // found 0x000001
-                 switch (p[1]) {
-                   case SC_PICTURE: PictureType = (p[3] >> 3) & 0x07;
-                                    return Length;
-                   }
-                 p += 4; // continue scanning after 0x01ssxxyy
-                 }
-              else
-                 p += 3; // continue scanning after 0x01xxyy
-              }
-        }
-     PictureType = NO_PICTURE;
-     return Length;
-     }
-  return -1;
-}
-
-int cRemux::Put(const uchar *Data, int Count)
-{
-  int used = 0;
-
-  // Make sure we are looking at a TS packet:
-
-  while (Count > TS_SIZE) {
-        if (Data[0] == TS_SYNC_BYTE && Data[TS_SIZE] == TS_SYNC_BYTE)
-           break;
-        Data++;
-        Count--;
-        used++;
-        }
-  if (used)
-     esyslog("ERROR: skipped %d byte to sync on TS packet", used);
-
-  // Convert incoming TS data into multiplexed PES:
-
-  for (int i = 0; i < Count; i += TS_SIZE) {
-      if (Count - i < TS_SIZE)
-         break;
-      if (Data[i] != TS_SYNC_BYTE)
-         break;
-      if (resultBuffer->Free() < 2 * IPACKS)
-         break; // A cTS2PES might write one full packet and also a small rest
-      int pid = GetPid(Data + i + 1);
-      if (Data[i + 3] & 0x10) { // got payload
-         for (int t = 0; t < numTracks; t++) {
-             if (ts2pes[t]->Pid() == pid) {
-                ts2pes[t]->ts_to_pes(Data + i);
-                break;
-                }
-             }
-         }
-      used += TS_SIZE;
-      }
-
-  // Check if we're getting anywhere here:
-  if (!synced && skipped >= 0) {
-     if (skipped > MAXNONUSEFULDATA) {
-        esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
-        skipped = -1;
-        if (exitOnFailure)
-           ShutdownHandler.RequestEmergencyExit();
-        }
-     else
-        skipped += used;
-     }
-
-  return used;
-}
-
-uchar *cRemux::Get(int &Count, uchar *PictureType)
-{
-  // Remove any previously skipped data from the result buffer:
-
-  if (resultSkipped > 0) {
-     resultBuffer->Del(resultSkipped);
-     resultSkipped = 0;
-     }
-
-#if 0
-  // Test recording without determining the real frame borders:
-  if (PictureType)
-     *PictureType = I_FRAME;
-  return resultBuffer->Get(Count);
-#endif
-
-  // Check for frame borders:
-
-  if (PictureType)
-     *PictureType = NO_PICTURE;
-
-  Count = 0;
-  uchar *resultData = NULL;
-  int resultCount = 0;
-  uchar *data = resultBuffer->Get(resultCount);
-  if (data) {
-     for (int i = 0; i < resultCount - 3; i++) {
-         if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
-            int l = 0;
-            uchar StreamType = data[i + 3];
-            if (VIDEO_STREAM_S <= StreamType && StreamType <= VIDEO_STREAM_E) {
-               uchar pt = NO_PICTURE;
-               l = ScanVideoPacket(data, resultCount, i, pt);
-               if (l < 0)
-                  return resultData;
-               if (pt != NO_PICTURE) {
-                  if (pt < I_FRAME || B_FRAME < pt) {
-                     esyslog("ERROR: unknown picture type '%d'", pt);
-                     if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure) {
-                        ShutdownHandler.RequestEmergencyExit();
-                        numUPTerrors = 0;
-                        }
-                     }
-                  else if (!synced) {
-                     if (pt == I_FRAME) {
-                        if (PictureType)
-                           *PictureType = pt;
-                        resultSkipped = i; // will drop everything before this position
-                        SetBrokenLink(data + i, l);
-                        synced = true;
-                        }
-                     }
-                  else if (Count)
-                     return resultData;
-                  else if (PictureType)
-                     *PictureType = pt;
-                  }
-               }
-            else { //if (AUDIO_STREAM_S <= StreamType && StreamType <= AUDIO_STREAM_E || StreamType == PRIVATE_STREAM1) {
-               l = GetPacketLength(data, resultCount, i);
-               if (l < 0)
-                  return resultData;
-               if (noVideo) {
-                  if (!synced) {
-                     if (PictureType)
-                        *PictureType = I_FRAME;
-                     resultSkipped = i; // will drop everything before this position
-                     synced = true;
-                     }
-                  else if (Count)
-                     return resultData;
-                  else if (PictureType)
-                     *PictureType = I_FRAME;
-                  }
-               }
-            if (synced) {
-               if (!Count)
-                  resultData = data + i;
-               Count += l;
-               }
-            else
-               resultSkipped = i + l;
-            if (l > 0)
-               i += l - 1; // the loop increments, too
-            }
-         }
-     }
-  return resultData;
-}
-
-void cRemux::Del(int Count)
-{
-  resultBuffer->Del(Count);
-}
-
-void cRemux::Clear(void)
-{
-  for (int t = 0; t < numTracks; t++)
-      ts2pes[t]->Clear();
-  resultBuffer->Clear();
-  synced = false;
-  skipped = 0;
-  resultSkipped = 0;
-}
-
 void cRemux::SetBrokenLink(uchar *Data, int Length)
 {
   int PesPayloadOffset = 0;
@@ -2298,6 +218,7 @@ void cPatPmtGenerator::GeneratePat(void)
   p[i++] = 0x40; // flags (3), pid hi (5)
   p[i++] = 0x00; // pid lo
   p[i++] = 0x10; // flags (4), continuity counter (4)
+  p[i++] = 0x00; // pointer field (payload unit start indicator is set)
   int PayloadStart = i;
   p[i++] = 0x00; // table id
   p[i++] = 0xB0; // section syntax indicator (1), dummy (3), section length hi (4)
@@ -2367,13 +288,18 @@ void cPatPmtGenerator::GeneratePmt(tChannelID ChannelID)
      MakeCRC(buf + i, buf, i);
      // split the PMT section into several TS packets:
      uchar *q = buf;
+     bool pusi = true;
      while (i > 0) {
            uchar *p = pmt[numPmtPackets++];
            int j = 0;
            p[j++] = 0x47; // TS indicator
-           p[j++] = 0x40 | (P_PNR >> 8); // flags (3), pid hi (5)
+           p[j++] = (pusi ? 0x40 : 0x00) | (P_PNR >> 8); // flags (3), pid hi (5)
            p[j++] = P_PNR & 0xFF; // pid lo
            p[j++] = 0x10; // flags (4), continuity counter (4)
+           if (pusi) {
+              p[j++] = 0x00; // pointer field (payload unit start indicator is set)
+              pusi = false;
+              }
            int l = TS_SIZE - j;
            memcpy(p + j, q, l);
            q += l;
@@ -2412,6 +338,7 @@ cPatPmtParser::cPatPmtParser(void)
 void cPatPmtParser::ParsePat(const uchar *Data, int Length)
 {
   // The PAT is always assumed to fit into a single TS packet
+  Data += Data[0] + 1; // process pointer_field
   SI::PAT Pat(Data, false);
   if (Pat.CheckCRCAndParse()) {
      dbgpatpmt("PAT: TSid = %d, c/n = %d, v = %d, s = %d, ls = %d\n", Pat.getTransportStreamId(), Pat.getCurrentNextIndicator(), Pat.getVersionNumber(), Pat.getSectionNumber(), Pat.getLastSectionNumber());
@@ -2432,7 +359,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
 {
   // The PMT may extend over several TS packets, so we need to assemble them
   if (pmtSize == 0) {
-     // this is the first packet
+     Data += Data[0] + 1; // this is the first packet
+     Length -= Data[0] + 1;
      if (SectionLength(Data, Length) > Length) {
         if (Length <= int(sizeof(pmt))) {
            memcpy(pmt, Data, Length);
@@ -2467,6 +395,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
      int NumApids = 0;
      int NumDpids = 0;
      int NumSpids = 0;
+     vpid = vtype = 0;
      SI::PMT::Stream stream;
      for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
          dbgpatpmt("     stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
@@ -2674,3 +603,117 @@ void PesDump(const char *Name, const u_char *Data, int Length)
 {
   TsDump(Name, Data, Length);
 }
+
+// --- cFrameDetector --------------------------------------------------------
+
+cFrameDetector::cFrameDetector(int Pid, int Type)
+{
+  pid = Pid;
+  type = Type;
+  newFrame = independentFrame = false;
+  lastPts = 0;
+  isVideo = type == 0x02 || type == 0x1B; // MPEG 2 or MPEG 4
+  frameDuration = 0;
+  framesPerPayloadUnit = 0;
+  scanning = false;
+  scanner = 0;
+}
+
+int cFrameDetector::Analyze(const uchar *Data, int Length)
+{
+  newFrame = independentFrame = false;
+  if (Length >= TS_SIZE) {
+     if (TsHasPayload(Data) && !TsIsScrambled(Data) && TsPid(Data) == pid) {
+        if (TsPayloadStart(Data)) {
+           if (!frameDuration) {
+              const uchar *Pes = Data + TsPayloadOffset(Data);
+              if (PesHasPts(Pes)) {
+                 int64_t Pts = PesGetPts(Pes);
+                 if (Pts < lastPts) { // avoid wrapping
+                    lastPts = 0;
+                    framesPerPayloadUnit = 0;
+                    }
+                 if ((!lastPts || !framesPerPayloadUnit) && Pts != lastPts)
+                    lastPts = Pts;
+                 else {
+                    int64_t Delta = Pts - lastPts;
+                    if (isVideo) {
+                       if (Delta % 3600 == 0)
+                          frameDuration = 3600; // PAL, 25 fps
+                       else if (Delta % 3003 == 0)
+                          frameDuration = 3003; // NTSC, 29.97 fps
+                       else {
+                          frameDuration = 3600; // unknown, assuming 25 fps
+                          dsyslog("unknown frame duration, assuming 25 fps (PTS: %lld - %lld = %lld  FPPU = %d)\n", Pts, lastPts, Delta, framesPerPayloadUnit);
+                          }
+                       }
+                    else // audio
+                       frameDuration = Delta; // PTS of audio frames is always increasing
+                    dbgframes("PTS: %lld - %lld = %lld -> FD = %d  FPS = %5.2f  FPPU = %d\n", Pts, lastPts, Delta, frameDuration, 90000.0 / frameDuration, framesPerPayloadUnit);
+                    }
+                 }
+              }
+           scanner = 0;
+           scanning = true;
+           }
+        if (scanning) {
+           int PayloadOffset = TsPayloadOffset(Data);
+           if (TsPayloadStart(Data))
+              PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
+           for (int i = PayloadOffset; i < TS_SIZE; i++) {
+               scanner <<= 8;
+               scanner |= Data[i];
+               switch (type) {
+                 case 0x02: // MPEG 2 video
+                      if (scanner == 0x00000100) { // Picture Start Code
+                         if (frameDuration) {
+                            newFrame = true;
+                            independentFrame = ((Data[i + 2] >> 3) & 0x07) == 1; // I-Frame
+                            if (framesPerPayloadUnit == 1) {
+                               scanning = false;
+                               return TS_SIZE;
+                               }
+                            }
+                         else {
+                            framesPerPayloadUnit++;
+                            dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
+                            }
+                         scanner = 0;
+                         }
+                      break;
+                 case 0x1B: // MPEG 4 video
+                      if (scanner == 0x00000109) { // Access Unit Delimiter
+                         if (frameDuration) {
+                            newFrame = true;
+                            independentFrame = Data[i + 1] == 0x10;
+                            if (framesPerPayloadUnit == 1) {
+                               scanning = false;
+                               return TS_SIZE;
+                               }
+                            }
+                         else {
+                            framesPerPayloadUnit++;
+                            dbgframes("%02X ", Data[i + 1]);
+                            }
+                         scanner = 0;
+                         }
+                      break;
+                 case 0x04: // MPEG audio
+                 case 0x06: // AC3 audio
+                      if (frameDuration) {
+                         newFrame = true;
+                         independentFrame = true;
+                         }
+                      else
+                         framesPerPayloadUnit = 1;
+                      break;
+                 default: esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
+                          pid = 0; // let's just ignore any further data
+                 }
+               }
+           }
+        }
+     return TS_SIZE;
+     }
+  return 0;
+}
diff --git a/remux.h b/remux.h
index f471504f6..9a0921d1f 100644
--- a/remux.h
+++ b/remux.h
@@ -1,17 +1,16 @@
 /*
- * remux.h: A streaming MPEG2 remultiplexer
+ * remux.h: Tools for detecting frames and handling PAT/PMT
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.3 2008/12/13 13:55:07 kls Exp $
+ * $Id: remux.h 2.4 2009/01/06 12:40:43 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
 #include "channels.h"
-#include "ringbuffer.h"
 #include "tools.h"
 
 enum ePesHeader {
@@ -23,61 +22,9 @@ enum ePesHeader {
 
 ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader = NULL);
 
-// Picture types:
-#define NO_PICTURE 0
-#define I_FRAME    1
-#define P_FRAME    2
-#define B_FRAME    3
-
-#define MAXTRACKS 64
-
-class cTS2PES;
-
 class cRemux {
-private:
-  bool exitOnFailure;
-  bool noVideo;
-  int numUPTerrors;
-  bool synced;
-  int skipped;
-  cTS2PES *ts2pes[MAXTRACKS];
-  int numTracks;
-  cRingBufferLinear *resultBuffer;
-  int resultSkipped;
-  int GetPid(const uchar *Data);
 public:
-  cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure = false);
-       ///< Creates a new remuxer for the given PIDs. VPid is the video PID, while
-       ///< APids, DPids and SPids are pointers to zero terminated lists of audio,
-       ///< dolby and subtitle PIDs (the pointers may be NULL if there is no such
-       ///< PID). If ExitOnFailure is true, the remuxer will initiate an "emergency
-       ///< exit" in case of problems with the data stream.
-  ~cRemux();
-  void SetTimeouts(int PutTimeout, int GetTimeout) { resultBuffer->SetTimeouts(PutTimeout, GetTimeout); }
-       ///< By default cRemux assumes that Put() and Get() are called from different
-       ///< threads, and uses a timeout in the Get() function in case there is no
-       ///< data available. SetTimeouts() can be used to modify these timeouts.
-       ///< Especially if Put() and Get() are called from the same thread, setting
-       ///< both timeouts to 0 is recommended.
-  int Put(const uchar *Data, int Count);
-       ///< Puts at most Count bytes of Data into the remuxer.
-       ///< \return Returns the number of bytes actually consumed from Data.
-  uchar *Get(int &Count, uchar *PictureType = NULL);
-       ///< Gets all currently available data from the remuxer.
-       ///< \return Count contains the number of bytes the result points to, and
-       ///< PictureType (if not NULL) will contain one of NO_PICTURE, I_FRAME, P_FRAME
-       ///< or B_FRAME.
-  void Del(int Count);
-       ///< Deletes Count bytes from the remuxer. Count must be the number returned
-       ///< from a previous call to Get(). Several calls to Del() with fractions of
-       ///< a previously returned Count may be made, but the total sum of all Count
-       ///< values must be exactly what the previous Get() has returned.
-  void Clear(void);
-       ///< Clears the remuxer of all data it might still contain, keeping the PID
-       ///< settings as they are.
   static void SetBrokenLink(uchar *Data, int Length);
-  static int GetPacketLength(const uchar *Data, int Count, int Offset);
-  static int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
   };
 
 // Some TS handling tools.
@@ -85,24 +32,39 @@ class cRemux {
 
 #define TS_SYNC_BYTE          0x47
 #define TS_SIZE               188
+#define TS_ERROR              0x80
+#define TS_PAYLOAD_START      0x40
+#define TS_TRANSPORT_PRIORITY 0x20
+#define TS_PID_MASK_HI        0x1F
+#define TS_SCRAMBLING_CONTROL 0xC0
 #define TS_ADAPT_FIELD_EXISTS 0x20
 #define TS_PAYLOAD_EXISTS     0x10
 #define TS_CONT_CNT_MASK      0x0F
-#define TS_PAYLOAD_START      0x40
-#define TS_ERROR              0x80
-#define TS_PID_MASK_HI        0x1F
-
-inline int TsHasPayload(const uchar *p)
+#define TS_ADAPT_DISCONT      0x80
+#define TS_ADAPT_RANDOM_ACC   0x40 // would be perfect for detecting independent frames, but unfortunately not used by all broadcasters
+#define TS_ADAPT_ELEM_PRIO    0x20
+#define TS_ADAPT_PCR          0x10
+#define TS_ADAPT_OPCR         0x08
+#define TS_ADAPT_SPLICING     0x04
+#define TS_ADAPT_TP_PRIVATE   0x02
+#define TS_ADAPT_EXTENSION    0x01
+
+inline bool TsHasPayload(const uchar *p)
 {
   return p[3] & TS_PAYLOAD_EXISTS;
 }
 
-inline int TsPayloadStart(const uchar *p)
+inline bool TsHasAdaptationField(const uchar *p)
+{
+  return p[3] & TS_ADAPT_FIELD_EXISTS;
+}
+
+inline bool TsPayloadStart(const uchar *p)
 {
   return p[1] & TS_PAYLOAD_START;
 }
 
-inline int TsError(const uchar *p)
+inline bool TsError(const uchar *p)
 {
   return p[1] & TS_ERROR;
 }
@@ -112,6 +74,11 @@ inline int TsPid(const uchar *p)
   return (p[1] & TS_PID_MASK_HI) * 256 + p[2];
 }
 
+inline bool TsIsScrambled(const uchar *p)
+{
+  return p[3] & TS_SCRAMBLING_CONTROL;
+}
+
 inline int TsPayloadOffset(const uchar *p)
 {
   return (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
@@ -129,6 +96,11 @@ inline int TsContinuityCounter(const uchar *p)
   return p[3] & TS_CONT_CNT_MASK;
 }
 
+inline int TsGetAdaptationField(const uchar *p)
+{
+  return TsHasAdaptationField(p) ? p[5] : 0x00;
+}
+
 // Some PES handling tools:
 // The following functions that take a pointer to PES data all assume that
 // there is enough data so that PesLongEnough() returns true.
@@ -153,16 +125,18 @@ inline int PesPayloadOffset(const uchar *p)
   return 9 + p[8];
 }
 
+inline bool PesHasPts(const uchar *p)
+{
+  return (p[7] & 0x80) && p[8] >= 5;
+}
+
 inline int64_t PesGetPts(const uchar *p)
 {
-  if ((p[7] & 0x80) && p[8] >= 5) {
-     return ((((int64_t)p[ 9]) & 0x0E) << 29) |
-            (( (int64_t)p[10])         << 22) |
-            ((((int64_t)p[11]) & 0xFE) << 14) |
-            (( (int64_t)p[12])         <<  7) |
-            ((((int64_t)p[13]) & 0xFE) >>  1);
-     }
-  return 0;
+  return ((((int64_t)p[ 9]) & 0x0E) << 29) |
+         (( (int64_t)p[10])         << 22) |
+         ((((int64_t)p[11]) & 0xFE) << 14) |
+         (( (int64_t)p[12])         <<  7) |
+         ((((int64_t)p[13]) & 0xFE) >>  1);
 }
 
 // PAT/PMT Generator:
@@ -274,4 +248,39 @@ void BlockDump(const char *Name, const u_char *Data, int Length);
 void TsDump(const char *Name, const u_char *Data, int Length);
 void PesDump(const char *Name, const u_char *Data, int Length);
 
+// Frame detector:
+
+class cFrameDetector {
+private:
+  int pid;
+  int type;
+  bool newFrame;
+  bool independentFrame;
+  int64_t lastPts;
+  bool isVideo;
+  int frameDuration;
+  int framesPerPayloadUnit;
+  bool scanning;
+  uint32_t scanner;
+public:
+  cFrameDetector(int Pid, int Type);
+  int Analyze(const uchar *Data, int Length);
+      ///< Analyzes the TS packets pointed to by Data. Length is the number of
+      ///< bytes Data points to, and must be a multiple of 188.
+      ///< Returns the number of bytes that have been analyzed and may be written
+      ///< to the recording file. If the return value is 0, the data was not
+      ///< sufficient for analyzing and Analyze() needs to be called again with
+      ///< more actual data.
+  bool NewFrame(void) { return newFrame; }
+      ///< Returns true if the data given to the last call to Analyze() started a
+      ///< new frame.
+  bool IndependentFrame(void) { return independentFrame; }
+      ///< Returns true if a new frame was detected and this is an independent frame
+      ///< (i.e. one that can be displayed by itself, without using data from any
+      ///< other frames).
+  double FramesPerSecond(void) { return frameDuration ? 90000.0 / frameDuration : 0; }
+      ///< Returns the number of frames per second, or 0 if this information is not
+      ///< available.
+  };
+
 #endif // __REMUX_H
diff --git a/svdrp.c b/svdrp.c
index a9d09f3ce..69b3e21e6 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.1 2008/05/02 14:15:38 kls Exp $
+ * $Id: svdrp.c 2.2 2009/01/06 14:35:45 kls Exp $
  */
 
 #include "svdrp.h"
@@ -701,7 +701,7 @@ void cSVDRP::CmdEDIT(const char *Option)
         cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            cMarks Marks;
-           if (Marks.Load(recording->FileName()) && Marks.Count()) {
+           if (Marks.Load(recording->FileName(), recording->FramesPerSecond(), recording->IsPesRecording()) && Marks.Count()) {
               if (!cCutter::Active()) {
                  if (cCutter::Start(recording->FileName()))
                     Reply(250, "Editing recording \"%s\" [%s]", Option, recording->Title());
@@ -1338,15 +1338,9 @@ void cSVDRP::CmdPLAY(const char *Option)
            cControl::Shutdown();
            if (*option) {
               int pos = 0;
-              if (strcasecmp(option, "BEGIN") != 0) {
-                 int h, m = 0, s = 0, f = 1;
-                 int x = sscanf(option, "%d:%d:%d.%d", &h, &m, &s, &f);
-                 if (x == 1)
-                    pos = h;
-                 else if (x >= 3)
-                    pos = (h * 3600 + m * 60 + s) * FRAMESPERSEC + f - 1;
-                 }
-              cResumeFile resume(recording->FileName());
+              if (strcasecmp(option, "BEGIN") != 0)
+                 pos = HMSFToIndex(option, recording->FramesPerSecond());
+              cResumeFile resume(recording->FileName(), recording->IsPesRecording());
               if (pos <= 0)
                  resume.Delete();
               else
diff --git a/tools.c b/tools.c
index bf0ac0f05..627bcf877 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.0 2008/03/05 17:23:47 kls Exp $
+ * $Id: tools.c 2.1 2008/12/24 15:25:15 kls Exp $
  */
 
 #include "tools.h"
@@ -1589,7 +1589,7 @@ ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
               //    last (partial) page might be skipped, writeback will start only after
               //    second call; the third call will still include this page and finally
               //    drop it from cache.
-              off_t headdrop = min(begin, WRITE_BUFFER * 2L);
+              off_t headdrop = min(begin, off_t(WRITE_BUFFER * 2));
               posix_fadvise(fd, begin - headdrop, lastpos - begin + headdrop, POSIX_FADV_DONTNEED);
               }
            begin = lastpos = curpos;
@@ -1608,7 +1608,7 @@ ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
               // kind of write gathering enabled), but the syncs cause (io) load..
               // Uncomment the next line if you think you need them.
               //fdatasync(fd);
-              off_t headdrop = min(curpos - totwritten, totwritten * 2L);
+              off_t headdrop = min(curpos - totwritten, off_t(totwritten * 2));
               posix_fadvise(fd, curpos - totwritten - headdrop, totwritten + headdrop, POSIX_FADV_DONTNEED);
               totwritten = 0;
               }
diff --git a/vdr.5 b/vdr.5
index 384ab7066..9e01fd4db 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.5 2008/11/22 15:23:10 kls Exp $
+.\" $Id: vdr.5 2.6 2009/01/06 12:37:35 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -334,7 +334,7 @@ of these cannot be determined, \fBTITLE\fR will default to the channel name, and
 An arbitrary string that can be used by external applications to store any
 kind of data related to this timer. The string must not contain any newline
 characters. If this field is not empty, its contents will be written into the
-\fIinfo.vdr\fR file of the recording with the '@' tag.
+\fIinfo\fR file of the recording with the '@' tag.
 .SS SOURCES
 The file \fIsources.conf\fR defines the codes to be used in the \fBSource\fR field
 of channels in \fIchannels.conf\fR and assigns descriptive texts to them.
@@ -558,41 +558,55 @@ messages file will be actually used.
 If a theme file doesn't contain a Description, the name of the theme (as
 given in the theme's file name) will be used.
 .SS AUDIO/VIDEO DATA
-The files \fI001.vdr\fR...\fI255.vdr\fR are the actual recorded MPEG data
+The files \fI00001.ts\fR...\fI65535.ts\fR are the actual recorded data
 files. In order to keep the size of an individual file below a given limit,
-a recording is split into several files. The contents of these files is
-\fBPacketized Elementary Stream\fR (PES) and contains ES packets with ids
-0xE0...0xEF for video (only one of these may actually occur in a file),
-0xC0...0xDF for audio 1...32 (up to 32 audio tracks may occur).
-Dolby Digital data is stored in packets with ids 0xBD ("Private Stream 1")
-and substream ids 0x80...0x87.
-DVB subtitle data is stored in packets with ids 0xBD ("Private Stream 1")
-and substream ids 0x20...0x27.
+a recording may be split into several files. The contents of these files is
+\fBTransport Stream\fR (TS) and contains data packets that are each 188 byte
+long and start with 0x47. Data is stored exactly as it is broadcast, with
+a generated PAT/PMT inserted right before every independent frame.
 .SS INDEX
-The file \fIindex.vdr\fR (if present in a recording directory) contains
+The file \fIindex\fR (if present in a recording directory) contains
 the (binary) index data into each of the the recording files
-\fI001.vdr\fR...\fI255.vdr\fR. It is used during replay to determine
+\fI00001.ts\fR...\fI65535.ts\fR. It is used during replay to determine
 the current position within the recording, and to implement skipping
 and fast forward/back functions.
 See the definition of the \fBcIndexFile\fR class for details about the
 actual contents of this file.
 .SS INFO
-The file \fIinfo.vdr\fR (if present in a recording directory) contains
+The file \fIinfo\fR (if present in a recording directory) contains
 a description of the recording, derived from the EPG data at recording time
 (if such data was available). The \fBAux\fR field of the corresponding
 timer (if given) is copied into this file, using the '@' tag.
 This is a plain ASCII file and contains tagged lines like the \fBEPG DATA\fR
 file (see the description of the \fIepg.data\fR file). Note that the lowercase
-tags ('c' and 'e') will not appear in an \fIinfo.vdr\fR file.
+tags ('c' and 'e') will not appear in an \fIinfo\fR file.
 Lines tagged with '#' are ignored and can be used by external tools to
 store arbitrary information.
+
+In addition to the tags used in the \fIepg.data\fR file, the following tag
+characters are defined:
+.TS
+tab (|);
+l l.
+\fBF\fR|<frame duration>
+\fBL\fR|<lifetime>
+\fBP\fR|<priority>
+\fB@\fR|<auxiliary data>
+.TE
 .SS RESUME
-The file \fIresume.vdr\fR (if present in a recording directory) contains
+The file \fIresume\fR (if present in a recording directory) contains
 the position within the recording where the last replay session left off.
-The data is a four byte (binary) integer value and defines an offset into
-the file \fIindex.vdr\fR.
+The file consists of tagged lines that describe the various parameters
+necessary to pick up replay where it left off.
+
+The following tag characters are defined:
+.TS
+tab (@);
+l l.
+\fBI\fR@<offset into the file \fIindex\fR>
+.TE
 .SS MARKS
-The file \fImarks.vdr\fR (if present in a recording directory) contains
+The file \fImarks\fR (if present in a recording directory) contains
 the editing marks defined for this recording.
 Each line contains the definition of one mark in the following format:
 
@@ -641,8 +655,6 @@ All other tags are optional (although every event
 should at least have a \fBT\fR entry).
 There may be several \fBX\fR tags, depending on the number of tracks (video, audio etc.)
 the event provides.
-The special tag character \fB@\fR is used to mark the \fBauxiliary data\fR from
-a timer definition in the \fIinfo.vdr\fR file.
 
 .TS
 tab (@);

From 084e16c057ab195a76c2117c631a2fe10a904238 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 25 Jan 2009 13:13:00 +0100
Subject: [PATCH 190/307] =?UTF-8?q?Version=201.7.4=20-=20Removed=20the=20'?=
 =?UTF-8?q?#define=20FE=5FCAN=5F2ND=5FGEN=5FMODULATION',=20since=20it=20wa?=
 =?UTF-8?q?s=20wrong=20and=20the=20=20=20flag=20is=20now=20in=20the=20driv?=
 =?UTF-8?q?er,=20anyway.=20-=20The=20full-featured=20DVB=20cards=20are=20n?=
 =?UTF-8?q?ow=20given=20the=20TS=20data=20directly=20for=20replay=20=20=20?=
 =?UTF-8?q?(thanks=20to=20Oliver=20Endriss=20for=20enhancing=20the=20av711?=
 =?UTF-8?q?0=20driver=20to=20make=20it=20replay=20=20=20TS=20data).=20The?=
 =?UTF-8?q?=20patch=20from=20ftp://ftp.cadsoft.de/vdr/Developer/av7110=5Ft?=
 =?UTF-8?q?s=5Freplay=5F=5F1.diff=20=20=20implements=20this=20change=20in?=
 =?UTF-8?q?=20the=20driver.=20=20=20The=20patch=20av7110=5Fv4ldvb=5Fapi5?=
 =?UTF-8?q?=5Faudiobuf=5Ftest=5F1.diff=20mentioned=20in=20version=201.7.2?=
 =?UTF-8?q?=20=20=20is=20still=20necessary=20to=20avoid=20audio=20and=20vi?=
 =?UTF-8?q?deo=20glitches=20on=20some=20channels.=20-=20Added=20a=20typeca?=
 =?UTF-8?q?st=20in=20cUnbufferedFile::Write()=20to=20avoid=20an=20error=20?=
 =?UTF-8?q?message=20when=20=20=20compiling=20on=2064=20bit=20systems.=20-?=
 =?UTF-8?q?=20Added=20some=20missing=20'const'=20statements=20to=20cBitmap?=
 =?UTF-8?q?=20(thanks=20to=20Andreas=20Regel).=20-=20Fixed=20returning=20c?=
 =?UTF-8?q?omplete=20PES=20packets=20in=20cTsToPes::GetPes()=20(thanks=20t?=
 =?UTF-8?q?o=20Reinhard=20=20=20Nissl).=20-=20Added=20a=20missing=20Detach?=
 =?UTF-8?q?()=20in=20cTransfer::Activate()=20(thanks=20to=20Marco=20Schl?=
 =?UTF-8?q?=FC=DFler).=20-=20Added=20clearing=20the=20TS=20buffers=20in=20?=
 =?UTF-8?q?cDevice::Detach()=20(thanks=20to=20Marco=20Schl=FC=DFler).=20-?=
 =?UTF-8?q?=20Fixed=20incrementing=20the=20continuity=20counter=20in=20cPa?=
 =?UTF-8?q?tPmtGenerator::GetPmt()=20(thanks=20=20=20to=20Johann=20Friedri?=
 =?UTF-8?q?chs).=20-=20Fixed=20removing=20deleted=20recordings=20in=20case?=
 =?UTF-8?q?=20there=20is=20a=20problem.=20Once=20a=20recording=20=20=20cau?=
 =?UTF-8?q?sed=20a=20problem=20with=20removing,=20no=20others=20were=20rem?=
 =?UTF-8?q?oved=20any=20more=20and=20an=20ongoing=20=20=20recording=20coul?=
 =?UTF-8?q?d=20fill=20up=20the=20disk=20and=20cause=20other=20recordings?=
 =?UTF-8?q?=20to=20be=20deleted=20=20=20automatically=20(reported=20by=20R?=
 =?UTF-8?q?einhard=20Nissl).=20-=20Added=20"DEFINES=20+=3D=20-D=5FFILE=5FO?=
 =?UTF-8?q?FFSET=5FBITS=3D64=20-D=5FLARGEFILE=5FSOURCE=20-D=5FLARGEFILE64?=
 =?UTF-8?q?=5FSOURCE"=20=20=20to=20Make.config.template=20(thanks=20to=20J?=
 =?UTF-8?q?ohann=20Friedrichs=20for=20pointing=20this=20out).=20=20=20Plug?=
 =?UTF-8?q?in=20authors=20should=20add=20this=20line=20to=20their=20Makefi?=
 =?UTF-8?q?le=20or=20Make.config=20if=20they=20use=20=20=20file=20access?=
 =?UTF-8?q?=20functions=20that=20need=20special=20versions=20for=2064=20bi?=
 =?UTF-8?q?t=20offsets.=20-=20The=20new=20command=20line=20option=20-i=20c?=
 =?UTF-8?q?an=20be=20used=20to=20set=20an=20"instance=20id",=20which=20wil?=
 =?UTF-8?q?l=20=20=20be=20used=20to=20distinguish=20recordings=20of=20the?=
 =?UTF-8?q?=20same=20broadcast=20made=20by=20different=20instances=20=20?=
 =?UTF-8?q?=20of=20VDR=20(suggested=20by=20Frank=20Schmirler).=20This=20re?=
 =?UTF-8?q?places=20the=20use=20of=20the=20"resume=20id"=20=20=20that=20wa?=
 =?UTF-8?q?s=20introduced=20in=20version=201.7.3.=20-=20Added=20checking?=
 =?UTF-8?q?=20mutexCurrentAudioTrack=20to=20cDevice::PlayTs()=20(thanks=20?=
 =?UTF-8?q?to=20Reinhard=20=20=20Nissl=20for=20pointing=20this=20out).=20-?=
 =?UTF-8?q?=20Fixed=20handling=20the=20pointer=20field=20in=20cPatPmtParse?=
 =?UTF-8?q?r::ParsePmt()=20(thanks=20to=20Frank=20=20=20Schmirler=20-=20so?=
 =?UTF-8?q?rry=20I=20swapped=20two=20lines=20when=20adopting=20the=20origi?=
 =?UTF-8?q?nal=20patch).=20-=20Checking=20the=20remaining=20packet=20lengt?=
 =?UTF-8?q?h=20after=20processing=20the=20pointer=20field=20in=20=20=20cPa?=
 =?UTF-8?q?tPmtParser::ParsePat()=20and=20cPatPmtParser::ParsePmt()=20(sug?=
 =?UTF-8?q?gested=20by=20Frank=20=20=20Schmirler).=20-=20Checking=20the=20?=
 =?UTF-8?q?pointer=20field=20in=20cPatPmtParser::ParsePmt()=20only=20in=20?=
 =?UTF-8?q?'payload=20start'=20=20=20packets=20(suggested=20by=20Frank=20S?=
 =?UTF-8?q?chmirler).=20-=20Changed=20cPatPmtGenerator=20to=20make=20sure?=
 =?UTF-8?q?=20the=20PMT=20pid=20doesn't=20collide=20with=20any=20of=20=20?=
 =?UTF-8?q?=20the=20actual=20pids=20of=20the=20channel.=20-=20Fixed=20cDev?=
 =?UTF-8?q?ice::PlayTsAudio()=20and=20made=20cDevice::PlayTsVideo()=20retu?=
 =?UTF-8?q?rn=200=20if=20=20=20PlayVideo()=20didn't=20play=20anything.=20-?=
 =?UTF-8?q?=20Added=20an=20'int'=20typecast=20to=20calculations=20involvin?=
 =?UTF-8?q?g=20FramesPerSecond()=20to=20avoid=20=20=20compiler=20warnings?=
 =?UTF-8?q?=20(reported=20by=20Winfried=20Koehler).=20-=20Fixed=20detectin?=
 =?UTF-8?q?g=20frames=20for=20pure=20audio=20recordings.=20-=20Fixed=20edi?=
 =?UTF-8?q?ting=20PES=20recordings.=20The=20frame=20type=20in=20the=20inde?=
 =?UTF-8?q?x.vdr=20file=20generated=20for=20=20=20the=20edited=20PES=20rec?=
 =?UTF-8?q?ording=20is=20set=20to=201=20for=20I-frames=20and=202=20for=20a?=
 =?UTF-8?q?ll=20others=20(P-=20and=20=20=20B-frames).=20The=20exact=20fram?=
 =?UTF-8?q?e=20type=20doesn't=20matter=20for=20VDR,=20it=20only=20needs=20?=
 =?UTF-8?q?to=20know=20if=20=20=20it's=20an=20I-frame=20or=20not.=20-=20Th?=
 =?UTF-8?q?e=20PAT/PMT=20is=20now=20only=20processed=20if=20its=20version?=
 =?UTF-8?q?=20changes=20(reported=20by=20Reinhard=20=20=20Nissl).=20-=20Fi?=
 =?UTF-8?q?xed=20handling=20the=20maximum=20video=20file=20size=20(reporte?=
 =?UTF-8?q?d=20by=20Udo=20Richter).=20-=20Improved=20fast-forward/-rewind?=
 =?UTF-8?q?=20for=20audio=20recordings.=20The=20actual=20data=20is=20now?=
 =?UTF-8?q?=20sent=20=20=20to=20the=20output=20device,=20so=20that=20it=20?=
 =?UTF-8?q?can=20be=20replayed=20and=20thus=20cause=20the=20proper=20delay?=
 =?UTF-8?q?.=20=20=20For=20pure=20audio=20recordings=20the=20audio=20is=20?=
 =?UTF-8?q?no=20longer=20muted=20in=20fast-forward/-rewind=20=20=20mode,?=
 =?UTF-8?q?=20so=20that=20some=20orientation=20regarding=20the=20position?=
 =?UTF-8?q?=20within=20the=20recording=20is=20=20=20possible.=20There=20ma?=
 =?UTF-8?q?y=20still=20be=20some=20offset=20in=20the=20replay=20position?=
 =?UTF-8?q?=20displayed=20by=20the=20=20=20progress=20indicator=20when=20s?=
 =?UTF-8?q?witching=20from=20fast-forward/-rewind=20to=20play=20mode,=20as?=
 =?UTF-8?q?=20well=20=20=20as=20in=20the=20current=20position=20during=20n?=
 =?UTF-8?q?ormal=20play=20mode.=20This=20is=20due=20to=20the=20various=20?=
 =?UTF-8?q?=20=20buffers=20between=20the=20player=20and=20the=20output=20d?=
 =?UTF-8?q?evice=20and=20will=20be=20addressed=20later.=20=20=20Note=20the?=
 =?UTF-8?q?=20new=20function=20cDevice::IsPlayingVideo(),=20which=20is=20u?=
 =?UTF-8?q?sed=20to=20inform=20the=20=20=20player=20whether=20there=20is?=
 =?UTF-8?q?=20video=20data=20in=20the=20currently=20replayed=20stream.=20I?=
 =?UTF-8?q?f=20a=20derived=20=20=20cDevice=20class=20reimplements=20PlayTs?=
 =?UTF-8?q?()=20or=20PlayPes(),=20it=20also=20needs=20to=20make=20sure=20t?=
 =?UTF-8?q?his=20=20=20new=20function=20works=20as=20expected.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS         |  21 +++++++++
 HISTORY              |  77 +++++++++++++++++++++++++++++---
 Make.config.template |   3 +-
 PLUGINS.html         |  15 +++++--
 config.c             |   4 +-
 config.h             |  10 ++---
 cutter.c             |   8 +++-
 device.c             |  46 +++++++++----------
 device.h             |  15 ++++---
 dvbdevice.c          |  34 +++------------
 dvbplayer.c          |  23 ++++++----
 menu.c               |   9 ++--
 osd.c                |   4 +-
 osd.h                |   6 +--
 player.h             |   3 +-
 recorder.c           |   4 +-
 recording.c          |  37 +++++++++++-----
 recording.h          |  21 +++++----
 remux.c              | 102 ++++++++++++++++++++++++++++++++-----------
 remux.h              |  33 +++++++++-----
 tools.c              |   4 +-
 transfer.c           |   6 ++-
 vdr.1                |  11 ++++-
 vdr.c                |  12 ++++-
 24 files changed, 351 insertions(+), 157 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7bc1b740b..848c367b2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -660,6 +660,8 @@ Oliver Endriss <o.endriss@gmx.de>
  the call to cStatus::MsgSetVolume()
  for providing a driver patch that allows replaying TS->PES converted video in
  Transfer Mode
+ for providing a driver patch that allows direct replaying of TS video on full-featured
+ DVB cards
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1189,6 +1191,12 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting the missing description of the 'S' channel parameter in vdr.5
  for fixing cPatPmtParser::ParsePmt() to reset vpid and vtype when switching from
  a video to an audio channel
+ for fixing returning complete PES packets in cTsToPes::GetPes()
+ for reporting a possible problem with removing deleted recordings
+ for pointing out that a check of mutexCurrentAudioTrack needs to be done in
+ to cDevice::PlayTs()
+ for reporting that the PAT/PMT is processed too often, even if its version
+ hasn't changed
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1313,6 +1321,7 @@ Andreas Regel <andreas.regel@gmx.de>
  for implementing palette replace mode in the OSD bitmaps
  for fixing handling numeric keys in the channel display after switching channel
  groups
+ for adding some missing 'const' statements to cBitmap
 
 Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1483,6 +1492,8 @@ Marco Schl
  for fixing setting the date in the channel display of the classic and sttng skins,
  to avoid unnecessary OSD access
  for changing cDvbDevice::GrabImage() to use V4L2
+ for adding a missing Detach() in cTransfer::Activate()
+ for adding clearing the TS buffers in cDevice::Detach()
 
 J�rgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1594,6 +1605,7 @@ Udo Richter <udo_richter@gmx.de>
  for fixing error handling in cCuttingThread::Action()
  for suppressing the automatic shutdown if the remote control is currently disabled
  for fixing a problem with calling isyslog() from within the SignalHandler()
+ for reporting a problem with handling the maximum video file size
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2207,6 +2219,8 @@ Frank Schmirler <vdr@schmirler.de>
  allowed characters
  for fixing handling address masks in SVDRP host settings
  for fixing handling the 'pointer field' in generating and parsing PAT/PMT
+ for suggesting to use an "instance id" instead of the "resume id" to distinguish
+ recordings of the same broadcast made by different instances of VDR
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
@@ -2331,6 +2345,7 @@ Benjamin Hess <benjamin.h@gmx.ch>
 
 Winfried Koehler <w_koehl@gmx.de>
  for fixing finding new transponders
+ for reporting a compiler warning in calculations involving FramesPerSecond()
 
 Hans-Werner Hilse <hilse@web.de>
  for adding the command line option --userdump to enable core dumps in case VDR
@@ -2392,3 +2407,9 @@ Niels Wagenaar <n.wagenaar@xs4all.nl>
 
 Edgar Hucek <gimli@dark-green.com>
  for a patch that was used to convert VDR to the S2API driver API
+
+Johann Friedrichs <johann.friedrichs@web.de>
+ for fixing incrementing the continuity counter in cPatPmtGenerator::GetPmt()
+ for pointing out that "DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ -D_LARGEFILE64_SOURCE" should be added to Make.config.
+  to Make.config.template (thanks to Johann Friedrichs for pointing this out).
diff --git a/HISTORY b/HISTORY
index 68bdc338b..1cbc1bdb6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5868,9 +5868,9 @@ Video Disk Recorder Revision History
     255).
   + The recording file names are now of the form 00001.ts (previously 001.vdr).
   + The frame rate is now detected by looking at two subsequent PTS values.
-    The "frame duration" (in multiples of 1/90000) is stored in the info.vdr
-    file using the new tag F (thanks to Artur Skawina for helping to get the
-    IndexToHMSF() calculation right).
+    The "frames per second" is stored in the "info" file using the new tag F
+    (thanks to Artur Skawina for helping to get the IndexToHMSF() calculation
+    right).
   + Several functions now have an additional parameter FramesPerSecond.
   + Several functions now have an additional parameter IsPesRecording.
   + The functionality of cFileWriter was moved into cRecorder, and cRemux is
@@ -5882,7 +5882,7 @@ Video Disk Recorder Revision History
   + The directory name for a recording has been changed from
     YYYY-MM-DD-hh[.:]mm.pr.lt.rec (pr=priority, lt=lifetime) to
     YYYY-MM-DD-hh.mm.ch-ri.rec (ch=channel, ri=resumeId).
-    Priority and Lifetime are now stored in the info.vdr file with the new
+    Priority and Lifetime are now stored in the "info" file with the new
     tags P and L (if no such file exists, the maximum values are assumed by
     default, which avoids inadvertently deleting a recording if disk space
     is low). No longer storing Priority and Lifetime in the directory name
@@ -5910,4 +5910,71 @@ Video Disk Recorder Revision History
   a video to an audio channel (thanks to Reinhard Nissl).
 - cDvbDevice now uses the FE_CAN_2G_MODULATION flag to determine whether a device
   can handle DVB-S2. The #define is still there to allow people with older drivers
-  who don't need DVB-S2 to use this version without pathcing.
+  who don't need DVB-S2 to use this version without patching.
+
+2009-01-25: Version 1.7.4
+
+- Removed the '#define FE_CAN_2ND_GEN_MODULATION', since it was wrong and the
+  flag is now in the driver, anyway.
+- The full-featured DVB cards are now given the TS data directly for replay
+  (thanks to Oliver Endriss for enhancing the av7110 driver to make it replay
+  TS data). The patch from ftp://ftp.cadsoft.de/vdr/Developer/av7110_ts_replay__1.diff
+  implements this change in the driver.
+  The patch av7110_v4ldvb_api5_audiobuf_test_1.diff mentioned in version 1.7.2
+  is still necessary to avoid audio and video glitches on some channels.
+- Added a typecast in cUnbufferedFile::Write() to avoid an error message when
+  compiling on 64 bit systems.
+- Added some missing 'const' statements to cBitmap (thanks to Andreas Regel).
+- Fixed returning complete PES packets in cTsToPes::GetPes() (thanks to Reinhard
+  Nissl).
+- Added a missing Detach() in cTransfer::Activate() (thanks to Marco Schl��ler).
+- Added clearing the TS buffers in cDevice::Detach() (thanks to Marco Schl��ler).
+- Fixed incrementing the continuity counter in cPatPmtGenerator::GetPmt() (thanks
+  to Johann Friedrichs).
+- Fixed removing deleted recordings in case there is a problem. Once a recording
+  caused a problem with removing, no others were removed any more and an ongoing
+  recording could fill up the disk and cause other recordings to be deleted
+  automatically (reported by Reinhard Nissl).
+- Added "DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+  to Make.config.template (thanks to Johann Friedrichs for pointing this out).
+  Plugin authors should add this line to their Makefile or Make.config if they use
+  file access functions that need special versions for 64 bit offsets.
+- The new command line option -i can be used to set an "instance id", which will
+  be used to distinguish recordings of the same broadcast made by different instances
+  of VDR (suggested by Frank Schmirler). This replaces the use of the "resume id"
+  that was introduced in version 1.7.3.
+- Added checking mutexCurrentAudioTrack to cDevice::PlayTs() (thanks to Reinhard
+  Nissl for pointing this out).
+- Fixed handling the pointer field in cPatPmtParser::ParsePmt() (thanks to Frank
+  Schmirler - sorry I swapped two lines when adopting the original patch).
+- Checking the remaining packet length after processing the pointer field in
+  cPatPmtParser::ParsePat() and cPatPmtParser::ParsePmt() (suggested by Frank
+  Schmirler).
+- Checking the pointer field in cPatPmtParser::ParsePmt() only in 'payload start'
+  packets (suggested by Frank Schmirler).
+- Changed cPatPmtGenerator to make sure the PMT pid doesn't collide with any of
+  the actual pids of the channel.
+- Fixed cDevice::PlayTsAudio() and made cDevice::PlayTsVideo() return 0 if
+  PlayVideo() didn't play anything.
+- Added an 'int' typecast to calculations involving FramesPerSecond() to avoid
+  compiler warnings (reported by Winfried Koehler).
+- Fixed detecting frames for pure audio recordings.
+- Fixed editing PES recordings. The frame type in the index.vdr file generated for
+  the edited PES recording is set to 1 for I-frames and 2 for all others (P- and
+  B-frames). The exact frame type doesn't matter for VDR, it only needs to know if
+  it's an I-frame or not.
+- The PAT/PMT is now only processed if its version changes (reported by Reinhard
+  Nissl).
+- Fixed handling the maximum video file size (reported by Udo Richter).
+- Improved fast-forward/-rewind for audio recordings. The actual data is now sent
+  to the output device, so that it can be replayed and thus cause the proper delay.
+  For pure audio recordings the audio is no longer muted in fast-forward/-rewind
+  mode, so that some orientation regarding the position within the recording is
+  possible. There may still be some offset in the replay position displayed by the
+  progress indicator when switching from fast-forward/-rewind to play mode, as well
+  as in the current position during normal play mode. This is due to the various
+  buffers between the player and the output device and will be addressed later.
+  Note the new function cDevice::IsPlayingVideo(), which is used to inform the
+  player whether there is video data in the currently replayed stream. If a derived
+  cDevice class reimplements PlayTs() or PlayPes(), it also needs to make sure this
+  new function works as expected.
diff --git a/Make.config.template b/Make.config.template
index 03e781382..758fc1455 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.0 2008/01/13 12:54:09 kls Exp $
+# $Id: Make.config.template 2.1 2009/01/18 10:46:13 kls Exp $
 
 ### The C compiler and options:
 
@@ -19,6 +19,7 @@ CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 ifdef PLUGIN
 CFLAGS   += -fPIC
 CXXFLAGS += -fPIC
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 endif
 
 ### The directory environment:
diff --git a/PLUGINS.html b/PLUGINS.html
index 9dc48e7fb..dfee73952 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -16,7 +16,10 @@
     text-align: center;
 }
 .code {
-    background-color: #f0f0f0;
+    background-color: #F0F0F0;
+}
+.modified {
+    background-color: #FFDDDD;
 }
 </style>
 </head>
@@ -25,12 +28,15 @@
 <div class="center">
 <h1>The VDR Plugin System</h1>
 
-<b>Version 1.6</b>
+<b>Version 1.7</b>
 <p>
-Copyright &copy; 2008 Klaus Schmidinger<br>
+Copyright &copy; 2009 Klaus Schmidinger<br>
 <a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
 <a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
 </div>
+<div class="modified">
+Important modifications introduced since version 1.6 are marked like this.
+</div modified>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -1844,6 +1850,9 @@ <h1>Table Of Contents</h1>
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual int64_t GetSTC(void);
+<div class="modified">
+virtual bool IsPlayingVideo(void) const;
+</div modified>
 virtual bool HasIBPTrickSpeed(void);
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
diff --git a/config.c b/config.c
index d3e1deec7..1132b1219 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.0 2008/02/17 13:39:00 kls Exp $
+ * $Id: config.c 2.1 2009/01/24 15:05:32 kls Exp $
  */
 
 #include "config.h"
@@ -275,7 +275,7 @@ cSetup::cSetup(void)
   FontOsdSize = 22;
   FontSmlSize = 18;
   FontFixSize = 20;
-  MaxVideoFileSize = MAXVIDEOFILESIZE;
+  MaxVideoFileSize = MAXVIDEOFILESIZEDEFAULT;
   SplitEditedFiles = 0;
   MinEventTimeout = 30;
   MinUserInactivity = 300;
diff --git a/config.h b/config.h
index 76c856677..0041f83da 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.5 2008/12/24 14:29:56 kls Exp $
+ * $Id: config.h 2.6 2009/01/06 16:56:27 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.3"
-#define VDRVERSNUM   10703  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.4"
+#define VDRVERSNUM   10704  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.3"
-#define APIVERSNUM   10703  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.4"
+#define APIVERSNUM   10704  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 20a9e676f..73ac873f6 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.1 2009/01/06 14:40:48 kls Exp $
+ * $Id: cutter.c 2.2 2009/01/24 15:19:26 kls Exp $
  */
 
 #include "cutter.h"
@@ -22,6 +22,7 @@ class cCuttingThread : public cThread {
   cFileName *fromFileName, *toFileName;
   cIndexFile *fromIndex, *toIndex;
   cMarks fromMarks, toMarks;
+  off_t maxVideoFileSize;
 protected:
   virtual void Action(void);
 public:
@@ -45,6 +46,9 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
      fromIndex = new cIndexFile(FromFileName, false, isPesRecording);
      toIndex = new cIndexFile(ToFileName, true, isPesRecording);
      toMarks.Load(ToFileName, Recording.FramesPerSecond(), isPesRecording); // doesn't actually load marks, just sets the file name
+     maxVideoFileSize = MEGABYTE(Setup.MaxVideoFileSize);
+     if (isPesRecording && maxVideoFileSize > MEGABYTE(MAXVIDEOFILESIZEPES))
+        maxVideoFileSize = MEGABYTE(MAXVIDEOFILESIZEPES);
      Start();
      }
   else
@@ -125,7 +129,7 @@ void cCuttingThread::Action(void)
            if (Independent) { // every file shall start with an independent frame
               if (LastMark) // edited version shall end before next I-frame
                  break;
-              if (FileSize > MEGABYTE(Setup.MaxVideoFileSize)) {
+              if (FileSize > maxVideoFileSize) {
                  toFile = toFileName->NextFile();
                  if (!toFile) {
                     error = "toFile 1";
diff --git a/device.c b/device.c
index 8cd0b1e18..1f806e026 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.5 2009/01/06 09:55:13 kls Exp $
+ * $Id: device.c 2.11 2009/01/25 11:10:56 kls Exp $
  */
 
 #include "device.h"
@@ -81,6 +81,7 @@ cDevice::cDevice(void)
   startScrambleDetection = 0;
 
   player = NULL;
+  isPlayingVideo = false;
   ClrAvailableTracks();
   currentAudioTrack = ttNone;
   currentAudioTrackMissingCount = 0;
@@ -1020,12 +1021,11 @@ void cDevice::StillPicture(const uchar *Data, int Length)
      uchar *buf = NULL;
      int Size = 0;
      while (Length >= TS_SIZE) {
-           int PayloadOffset = TsPayloadOffset(Data);
            int Pid = TsPid(Data);
            if (Pid == 0)
-              patPmtParser.ParsePat(Data + PayloadOffset, TS_SIZE - PayloadOffset);
+              patPmtParser.ParsePat(Data, TS_SIZE);
            else if (Pid == patPmtParser.PmtPid())
-              patPmtParser.ParsePmt(Data + PayloadOffset, TS_SIZE - PayloadOffset);
+              patPmtParser.ParsePmt(Data, TS_SIZE);
            else if (Pid == patPmtParser.Vpid()) {
               if (TsPayloadStart(Data)) {
                  int l;
@@ -1098,7 +1098,9 @@ void cDevice::Detach(cPlayer *Player)
      dvbSubtitleConverter = NULL;
      SetPlayMode(pmNone);
      SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
+     PlayTs(NULL, 0);
      Audios.ClearAudio();
+     isPlayingVideo = false;
      }
 }
 
@@ -1151,6 +1153,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
         switch (c) {
           case 0xBE:          // padding stream, needed for MPEG1
           case 0xE0 ... 0xEF: // video
+               isPlayingVideo = true;
                w = PlayVideo(Start, d);
                break;
           case 0xC0 ... 0xDF: // audio
@@ -1273,7 +1276,7 @@ int cDevice::PlayTsVideo(const uchar *Data, int Length)
      int l;
      while (const uchar *p = tsToPesVideo.GetPes(l)) {
            int w = PlayVideo(p, l);
-           if (w < 0)
+           if (w <= 0)
               return w;
            }
      tsToPesVideo.Reset();
@@ -1284,20 +1287,15 @@ int cDevice::PlayTsVideo(const uchar *Data, int Length)
 
 int cDevice::PlayTsAudio(const uchar *Data, int Length)
 {
-  bool PayloadStart = TsPayloadStart(Data);
-  for (int Pass = 0; Pass < 2; Pass++) {
-      if (Pass == 0 && !PayloadStart) // if no new payload is started, we can always put the packet into the converter
-         tsToPesAudio.PutTs(Data, Length);
-      if (const uchar *p = tsToPesAudio.GetPes(Length)) {
-         int w = PlayAudio(p, Length, 0);
-         if (w > 0)
-            tsToPesAudio.Reset();
-         else if (PayloadStart)
-            return w; // must get out the old packet before starting a new one
-         }
-      if (Pass == 0 && PayloadStart)
-         tsToPesAudio.PutTs(Data, Length);
-      }
+  // Audio PES always has an explicit length and consists of single packets:
+  int l;
+  if (const uchar *p = tsToPesAudio.GetPes(l)) {
+     int w = PlayAudio(p, l, 0);
+     if (w <= 0)
+        return w;
+     tsToPesAudio.Reset();
+     }
+  tsToPesAudio.PutTs(Data, Length);
   return Length;
 }
 
@@ -1321,13 +1319,16 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
         return Length; // silently ignore TS packets w/o payload
      int PayloadOffset = TsPayloadOffset(Data);
      if (PayloadOffset < Length) {
+        cMutexLock MutexLock(&mutexCurrentAudioTrack);
         int Pid = TsPid(Data);
         if (Pid == 0)
-           patPmtParser.ParsePat(Data + PayloadOffset, Length - PayloadOffset);
+           patPmtParser.ParsePat(Data, Length);
         else if (Pid == patPmtParser.PmtPid())
-           patPmtParser.ParsePmt(Data + PayloadOffset, Length - PayloadOffset);
-        else if (Pid == patPmtParser.Vpid())
+           patPmtParser.ParsePmt(Data, Length);
+        else if (Pid == patPmtParser.Vpid()) {
+           isPlayingVideo = true;
            return PlayTsVideo(Data, Length);
+           }
         else if (Pid == availableTracks[currentAudioTrack].id) {
            if (!VideoOnly || HasIBPTrickSpeed()) {
               int w = PlayTsAudio(Data, Length);
@@ -1344,6 +1345,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
         }
      }
   else if (Data == NULL) {
+     patPmtParser.Reset();
      tsToPesVideo.Reset();
      tsToPesAudio.Reset();
      tsToPesSubtitle.Reset();
diff --git a/device.h b/device.h
index 7c4a70988..67c9be44c 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.4 2009/01/05 16:28:06 kls Exp $
+ * $Id: device.h 2.6 2009/01/25 11:04:39 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -477,6 +477,7 @@ class cDevice : public cThread {
   cTsToPes tsToPesVideo;
   cTsToPes tsToPesAudio;
   cTsToPes tsToPesSubtitle;
+  bool isPlayingVideo;
 protected:
   virtual bool CanReplay(void) const;
        ///< Returns true if this device can currently start a replay session.
@@ -487,7 +488,7 @@ class cDevice : public cThread {
        ///< Plays the given data block as video.
        ///< Data points to exactly one complete PES packet of the given Length.
        ///< PlayVideo() shall process the packet either as a whole (returning
-       ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< \return Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
   virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
@@ -498,14 +499,14 @@ class cDevice : public cThread {
        ///< TS replay). Plugins that need to know this Id shall read it from the
        ///< actual PES data (it's the 4th byte).
        ///< PlayAudio() shall process the packet either as a whole (returning
-       ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< \return Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
   virtual int PlaySubtitle(const uchar *Data, int Length);
        ///< Plays the given data block as a subtitle.
        ///< Data points to exactly one complete PES packet of the given Length.
        ///< PlaySubtitle() shall process the packet either as a whole (returning
-       ///< Length) or not at all (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< \return Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
   virtual int PlayPesPacket(const uchar *Data, int Length, bool VideoOnly = false);
@@ -542,6 +543,9 @@ class cDevice : public cThread {
        ///< Gets the current System Time Counter, which can be used to
        ///< synchronize audio and video. If this device is unable to
        ///< provide the STC, -1 will be returned.
+  virtual bool IsPlayingVideo(void) const { return isPlayingVideo; }
+       ///< \return Returns true if the currently attached player has delivered
+       ///< any video packets.
   virtual bool HasIBPTrickSpeed(void) { return false; }
        ///< Returns true if this device can handle all frames in 'fast forward'
        ///< trick speeds.
@@ -610,8 +614,7 @@ class cDevice : public cThread {
        ///< Returns -1 in case of error, otherwise the number of actually
        ///< processed bytes is returned, which must be Length.
        ///< PlayTs() shall process the packet either as a whole (returning
-       ///< a positive number, which needs not necessarily be Length) or not at all
-       ///< (returning 0 or -1 and setting 'errno' to EAGAIN).
+       ///< Length) or not at all returning 0 or -1 and setting 'errno' accordingly).
   bool Replaying(void) const;
        ///< Returns true if we are currently replaying.
   bool Transferring(void) const;
diff --git a/dvbdevice.c b/dvbdevice.c
index 6aa0056fe..56001917a 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.10 2009/01/06 14:52:54 kls Exp $
+ * $Id: dvbdevice.c 2.12 2009/01/10 10:07:33 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -27,13 +27,6 @@
 #include "status.h"
 #include "transfer.h"
 
-// FIXME: temporary workaround until the S2API driver supports detecting
-// S2 capability in a clean way. This macro allows compiling VDR with an
-// unpatched driver. However, with an unpatched driver it will not support
-// DVB-S2 hardware. If you have DVB-S2 hardware you need to either patch
-// the driver or modify the line that uses this macro in cDvbDevice::cDvbDevice().
-#define FE_CAN_2ND_GEN_MODULATION 0x10000000
-
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
 
@@ -1304,39 +1297,22 @@ bool cDvbDevice::Flush(int TimeoutMs)
 
 int cDvbDevice::PlayVideo(const uchar *Data, int Length)
 {
-  int w;
-  do {
-     w = WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-     if (w < 0 && errno == EAGAIN) {
-        cPoller Poller(fd_video, true);
-        Poller.Poll(200);
-        }
-     } while (w != Length);
-  return w;
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
 int cDvbDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
-  int w;
-  do {
-     w = WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
-     if (w < 0 && errno == EAGAIN) {
-        cPoller Poller(fd_audio, true);
-        Poller.Poll(200);
-        }
-     } while (w != Length);
-  return w;
+  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
 }
 
 int cDvbDevice::PlayTsVideo(const uchar *Data, int Length)
 {
-  return cDevice::PlayTsVideo(Data, Length);
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
 int cDvbDevice::PlayTsAudio(const uchar *Data, int Length)
 {
-  int w = PlayAudio(Data, TsGetPayload(&Data), 0);
-  return w >= 0 ? Length : w;
+  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
 }
 
 bool cDvbDevice::OpenDvr(void)
diff --git a/dvbplayer.c b/dvbplayer.c
index 9de7e4861..6e004403a 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.1 2009/01/05 16:52:40 kls Exp $
+ * $Id: dvbplayer.c 2.3 2009/01/25 11:11:39 kls Exp $
  */
 
 #include "dvbplayer.h"
+#include <math.h>
 #include <stdlib.h>
 #include "recording.h"
 #include "remux.h"
@@ -347,7 +348,7 @@ bool cDvbPlayer::Save(void)
   if (index) {
      int Index = writeIndex;
      if (Index >= 0) {
-        Index -= RESUMEBACKUP * framesPerSecond;
+        Index -= int(round(RESUMEBACKUP * framesPerSecond));
         if (Index > 0)
            Index = index->GetNextIFrame(Index, false);
         else
@@ -411,8 +412,12 @@ void cDvbPlayer::Action(void)
                           if (index->Get(readIndex + 1, &FileNumber, &FileOffset, NULL, &Length))
                              Index = readIndex + 1;
                           }
-                       else
-                          Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                       else {
+                          int d = int(round(0.4 * framesPerSecond));
+                          if (playDir != pdForward)
+                             d = -d;
+                          Index = index->GetNextIFrame(readIndex + d, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                          }
                        if (Index >= 0) {
                           if (!NextFile(FileNumber, FileOffset)) {
                              readIndex = Index;
@@ -515,9 +520,9 @@ void cDvbPlayer::Action(void)
               if (p) {
                  int w;
                  if (isPesRecording)
-                    w = PlayPes(p, pc, playMode != pmPlay);
+                    w = PlayPes(p, pc, playMode != pmPlay && DeviceIsPlayingVideo());
                  else
-                    w = PlayTs(p, TS_SIZE, playMode != pmPlay);
+                    w = PlayTs(p, TS_SIZE, playMode != pmPlay && DeviceIsPlayingVideo());
                  if (w > 0) {
                     p += w;
                     pc -= w;
@@ -592,7 +597,8 @@ void cDvbPlayer::Forward(void)
             LOCK_THREAD;
             if (!(DeviceHasIBPTrickSpeed() && playDir == pdForward))
                Empty();
-            DeviceMute();
+            if (DeviceIsPlayingVideo())
+               DeviceMute();
             playMode = pmFast;
             playDir = pdForward;
             trickSpeed = NORMAL_SPEED;
@@ -638,7 +644,8 @@ void cDvbPlayer::Backward(void)
        case pmPlay: {
             LOCK_THREAD;
             Empty();
-            DeviceMute();
+            if (DeviceIsPlayingVideo())
+               DeviceMute();
             playMode = pmFast;
             playDir = pdBackward;
             trickSpeed = NORMAL_SPEED;
diff --git a/menu.c b/menu.c
index beb7fb879..fa6006514 100644
--- a/menu.c
+++ b/menu.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.4 2009/01/06 14:34:17 kls Exp $
+ * $Id: menu.c 2.6 2009/01/24 15:05:43 kls Exp $
  */
 
 #include "menu.h"
 #include <ctype.h>
 #include <limits.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -2697,7 +2698,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
   Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord)));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
 }
 
@@ -4170,8 +4171,8 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
 {
 #define STAY_SECONDS_OFF_END 10
   int Seconds = (timeSearchTime >> 24) * 36000 + ((timeSearchTime & 0x00FF0000) >> 16) * 3600 + ((timeSearchTime & 0x0000FF00) >> 8) * 600 + (timeSearchTime & 0x000000FF) * 60;
-  int Current = (lastCurrent / FramesPerSecond());
-  int Total = (lastTotal / FramesPerSecond());
+  int Current = int(round(lastCurrent / FramesPerSecond()));
+  int Total = int(round(lastTotal / FramesPerSecond()));
   switch (Key) {
     case k0 ... k9:
          if (timeSearchPos < 4) {
diff --git a/osd.c b/osd.c
index 925d60596..32614d875 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.0 2007/10/12 12:38:36 kls Exp $
+ * $Id: osd.c 2.1 2009/01/16 14:34:32 kls Exp $
  */
 
 #include "osd.h"
@@ -635,7 +635,7 @@ void cBitmap::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
      }
 }
 
-const tIndex *cBitmap::Data(int x, int y)
+const tIndex *cBitmap::Data(int x, int y) const
 {
   return &bitmap[y * width + x];
 }
diff --git a/osd.h b/osd.h
index 9950a2d53..addbf0ecc 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.0 2007/10/12 14:28:44 kls Exp $
+ * $Id: osd.h 2.1 2009/01/16 14:37:03 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -231,9 +231,9 @@ class cBitmap : public cPalette {
        ///< 5: vertical,   rising,  upper
        ///< 6: vertical,   falling, lower
        ///< 7: vertical,   falling, upper
-  const tIndex *Data(int x, int y);
+  const tIndex *Data(int x, int y) const;
        ///< Returns the address of the index byte at the given coordinates.
-  tColor GetColor(int x, int y) { return Color(*Data(x, y)); }
+  tColor GetColor(int x, int y) const { return Color(*Data(x, y)); }
        ///< Returns the color at the given coordinates.
   void ReduceBpp(const cPalette &Palette);
        ///< Reduces the color depth of the bitmap to that of the given Palette.
diff --git a/player.h b/player.h
index 9bd5a368c..d252c5747 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 2.2 2009/01/05 13:04:10 kls Exp $
+ * $Id: player.h 2.3 2009/01/25 11:03:44 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -26,6 +26,7 @@ class cPlayer {
   bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   bool DeviceHasIBPTrickSpeed(void) { return device ? device->HasIBPTrickSpeed() : false; }
+  bool DeviceIsPlayingVideo(void) { return device ? device->IsPlayingVideo() : false; }
   void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
   void DeviceClear(void) { if (device) device->Clear(); }
   void DevicePlay(void) { if (device) device->Play(); }
diff --git a/recorder.c b/recorder.c
index 83024ac1b..7e41c8d0e 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.1 2009/01/06 12:38:01 kls Exp $
+ * $Id: recorder.c 2.2 2009/01/23 15:33:37 kls Exp $
  */
 
 #include "recorder.h"
@@ -44,7 +44,7 @@ cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, i
      Type = 0x06;
      }
   frameDetector = new cFrameDetector(Pid, Type);
-  patPmtGenerator.GeneratePmt(ChannelID);
+  patPmtGenerator.SetChannel(Channel);
   fileName = NULL;
   index = NULL;
   fileSize = 0;
diff --git a/recording.c b/recording.c
index 2948343c9..9c7db99fa 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.4 2009/01/06 14:41:11 kls Exp $
+ * $Id: recording.c 2.8 2009/01/24 13:11:04 kls Exp $
  */
 
 #include "recording.h"
@@ -64,6 +64,7 @@
 #define MAX_LINK_LEVEL  6
 
 bool VfatFileSystem = false;
+int InstanceId = 0;
 
 cRecordings DeletedRecordings(true);
 
@@ -154,9 +155,10 @@ void AssertFreeDiskSpace(int Priority, bool Force)
                     }
                  r = DeletedRecordings.Next(r);
                  }
-           if (r0 && r0->Remove()) {
+           if (r0) {
+              if (r0->Remove())
+                 LastFreeDiskCheck += REMOVELATENCY / Factor;
               DeletedRecordings.Del(r0);
-              LastFreeDiskCheck += REMOVELATENCY / Factor;
               return;
               }
            }
@@ -601,7 +603,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   name = NULL;
   fileSizeMB = -1; // unknown
   channel = Timer->Channel()->Number();
-  resumeId = Setup.ResumeID;
+  instanceId = InstanceId;
   isPesRecording = false;
   framesPerSecond = DEFAULTFRAMESPERSECOND;
   deleted = 0;
@@ -658,7 +660,7 @@ cRecording::cRecording(const char *FileName)
   resume = RESUME_NOT_INITIALIZED;
   fileSizeMB = -1; // unknown
   channel = -1;
-  resumeId = -1;
+  instanceId = -1;
   priority = MAXPRIORITY; // assume maximum in case there is no info file
   lifetime = MAXLIFETIME;
   isPesRecording = false;
@@ -677,7 +679,7 @@ cRecording::cRecording(const char *FileName)
      struct tm tm_r;
      struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
      t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
-     if (7 == sscanf(p + 1, DATAFORMATTS, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &channel, &resumeId)
+     if (7 == sscanf(p + 1, DATAFORMATTS, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &channel, &instanceId)
       || 7 == sscanf(p + 1, DATAFORMATPES, &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &priority, &lifetime)) {
         t.tm_year -= 1900;
         t.tm_mon--;
@@ -687,7 +689,7 @@ cRecording::cRecording(const char *FileName)
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
         name = ExchangeChars(name, false);
-        isPesRecording = resumeId < 0;
+        isPesRecording = instanceId < 0;
         }
      else
         return;
@@ -826,7 +828,7 @@ const char *cRecording::FileName(void) const
      struct tm *t = localtime_r(&start, &tm_r);
      const char *fmt = isPesRecording ? NAMEFORMATPES : NAMEFORMATTS;
      int ch = isPesRecording ? priority : channel;
-     int ri = isPesRecording ? lifetime : resumeId;
+     int ri = isPesRecording ? lifetime : instanceId;
      name = ExchangeChars(name, true);
      fileName = strdup(cString::sprintf(fmt, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri));
      name = ExchangeChars(name, false);
@@ -1430,6 +1432,19 @@ void cIndexFile::ConvertFromPes(tIndexTs *IndexTs, int Count)
         }
 }
 
+void cIndexFile::ConvertToPes(tIndexTs *IndexTs, int Count)
+{
+  tIndexPes IndexPes;
+  while (Count-- > 0) {
+        IndexPes.offset = uint32_t(IndexTs->offset);
+        IndexPes.type = IndexTs->independent ? 1 : 2; // I_FRAME : "not I_FRAME" (exact frame type doesn't matter)
+        IndexPes.number = IndexTs->number;
+        IndexPes.reserved = 0;
+        memcpy(IndexTs, &IndexPes, sizeof(*IndexTs));
+        IndexTs++;
+        }
+}
+
 bool cIndexFile::CatchUp(int Index)
 {
   // returns true unless something really goes wrong, so that 'index' becomes NULL
@@ -1489,6 +1504,8 @@ bool cIndexFile::Write(bool Independent, uint16_t FileNumber, off_t FileOffset)
 {
   if (f >= 0) {
      tIndexTs i(FileOffset, Independent, FileNumber);
+     if (isPesRecording)
+        ConvertToPes(&i, 1);
      if (safe_write(f, &i, sizeof(i)) < 0) {
         LOG_ERROR_STR(fileName);
         close(f);
@@ -1696,7 +1713,7 @@ cString IndexToHMSF(int Index, bool WithFrame, double FramesPerSecond)
 {
   char buffer[16];
   double Seconds;
-  int f = modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond + 1;
+  int f = int(modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond + 1);
   int s = int(Seconds);
   int m = s / 60 % 60;
   int h = s / 3600;
@@ -1718,7 +1735,7 @@ int HMSFToIndex(const char *HMSF, double FramesPerSecond)
 
 int SecondsToFrames(int Seconds, double FramesPerSecond)
 {
-  return round(Seconds * FramesPerSecond);
+  return int(round(Seconds * FramesPerSecond));
 }
 
 // --- ReadFrame -------------------------------------------------------------
diff --git a/recording.h b/recording.h
index a1d497d73..5256a8ee4 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.1 2009/01/06 10:49:59 kls Exp $
+ * $Id: recording.h 2.4 2009/01/24 15:24:19 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -19,6 +19,7 @@
 #include "tools.h"
 
 extern bool VfatFileSystem;
+extern int InstanceId;
 
 void RemoveDeletedRecordings(void);
 void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
@@ -82,7 +83,7 @@ class cRecording : public cListObject {
   mutable char *name;
   mutable int fileSizeMB;
   int channel;
-  int resumeId;
+  int instanceId;
   bool isPesRecording;
   double framesPerSecond;
   cRecordingInfo *info;
@@ -208,13 +209,14 @@ class cRecordingUserCommand {
 #define MAXFRAMESIZE  KILOBYTE(512)
 
 // The maximum file size is limited by the range that can be covered
-// with 'int'. 4GB might be possible (if the range is considered
-// 'unsigned'), 2GB should be possible (even if the range is considered
-// 'signed'), so let's use 2000MB for absolute safety (the actual file size
-// may be slightly higher because we stop recording only before the next
-// 'I' frame, to have a complete Group Of Pictures):
-#define MAXVIDEOFILESIZE 2000 // MB
-#define MINVIDEOFILESIZE  100 // MB
+// with a 40 bit 'unsigned int', which is 1TB. The actual maximum value
+// used is 6MB below the theoretical maximum, to have some safety (the
+// actual file size may be slightly higher because we stop recording only
+// before the next independent frame, to have a complete Group Of Pictures):
+#define MAXVIDEOFILESIZETS  1048570 // MB
+#define MAXVIDEOFILESIZEPES    2000 // MB
+#define MINVIDEOFILESIZE        100 // MB
+#define MAXVIDEOFILESIZEDEFAULT MAXVIDEOFILESIZEPES
 
 struct tIndexTs;
 
@@ -228,6 +230,7 @@ class cIndexFile {
   cResumeFile resumeFile;
   cMutex mutex;
   void ConvertFromPes(tIndexTs *IndexTs, int Count);
+  void ConvertToPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
 public:
   cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false);
diff --git a/remux.c b/remux.c
index 840f5df75..b00862142 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.5 2009/01/06 14:46:21 kls Exp $
+ * $Id: remux.c 2.13 2009/01/24 13:44:45 kls Exp $
  */
 
 #include "remux.h"
@@ -111,13 +111,14 @@ void cRemux::SetBrokenLink(uchar *Data, int Length)
 
 // --- cPatPmtGenerator ------------------------------------------------------
 
-cPatPmtGenerator::cPatPmtGenerator(void)
+cPatPmtGenerator::cPatPmtGenerator(cChannel *Channel)
 {
   numPmtPackets = 0;
   patCounter = pmtCounter = 0;
   patVersion = pmtVersion = 0;
+  pmtPid = 0;
   esInfoLength = NULL;
-  GeneratePat();
+  SetChannel(Channel);
 }
 
 void cPatPmtGenerator::IncCounter(int &Counter, uchar *TsPacket)
@@ -206,16 +207,31 @@ int cPatPmtGenerator::MakeCRC(uchar *Target, const uchar *Data, int Length)
 }
 
 #define P_TSID    0x8008 // pseudo TS ID
-#define P_PNR     0x0084 // pseudo Program Number
 #define P_PMT_PID 0x0084 // pseudo PMT pid
+#define MAXPID    0x2000 // the maximum possible number of pids
+
+void cPatPmtGenerator::GeneratePmtPid(cChannel *Channel)
+{
+  bool Used[MAXPID] = { false };
+#define SETPID(p) { if ((p) >= 0 && (p) < MAXPID) Used[p] = true; }
+#define SETPIDS(l) { const int *p = l; while (*p) { SETPID(*p); p++; } }
+  SETPID(Channel->Vpid());
+  SETPID(Channel->Ppid());
+  SETPID(Channel->Tpid());
+  SETPIDS(Channel->Apids());
+  SETPIDS(Channel->Dpids());
+  SETPIDS(Channel->Spids());
+  for (pmtPid = P_PMT_PID; Used[pmtPid]; pmtPid++)
+      ;
+}
 
 void cPatPmtGenerator::GeneratePat(void)
 {
   memset(pat, 0xFF, sizeof(pat));
   uchar *p = pat;
   int i = 0;
-  p[i++] = 0x47; // TS indicator
-  p[i++] = 0x40; // flags (3), pid hi (5)
+  p[i++] = TS_SYNC_BYTE; // TS indicator
+  p[i++] = TS_PAYLOAD_START; // flags (3), pid hi (5)
   p[i++] = 0x00; // pid lo
   p[i++] = 0x10; // flags (4), continuity counter (4)
   p[i++] = 0x00; // pointer field (payload unit start indicator is set)
@@ -229,22 +245,21 @@ void cPatPmtGenerator::GeneratePat(void)
   p[i++] = 0xC1 | (patVersion << 1); // dummy (2), version number (5), current/next indicator (1)
   p[i++] = 0x00; // section number
   p[i++] = 0x00; // last section number
-  p[i++] = P_PNR >> 8;   // program number hi
-  p[i++] = P_PNR & 0xFF; // program number lo
-  p[i++] = 0xE0 | (P_PMT_PID >> 8); // dummy (3), PMT pid hi (5)
-  p[i++] = P_PMT_PID & 0xFF; // PMT pid lo
+  p[i++] = pmtPid >> 8;   // program number hi
+  p[i++] = pmtPid & 0xFF; // program number lo
+  p[i++] = 0xE0 | (pmtPid >> 8); // dummy (3), PMT pid hi (5)
+  p[i++] = pmtPid & 0xFF; // PMT pid lo
   pat[SectionLength] = i - SectionLength - 1 + 4; // -2 = SectionLength storage, +4 = length of CRC
   MakeCRC(pat + i, pat + PayloadStart, i - PayloadStart);
   IncVersion(patVersion);
 }
 
-void cPatPmtGenerator::GeneratePmt(tChannelID ChannelID)
+void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
 {
   // generate the complete PMT section:
   uchar buf[MAX_SECTION_SIZE];
   memset(buf, 0xFF, sizeof(buf));
   numPmtPackets = 0;
-  cChannel *Channel = Channels.GetByChannelID(ChannelID);
   if (Channel) {
      int Vpid = Channel->Vpid();
      uchar *p = buf;
@@ -253,8 +268,8 @@ void cPatPmtGenerator::GeneratePmt(tChannelID ChannelID)
      int SectionLength = i;
      p[i++] = 0xB0; // section syntax indicator (1), dummy (3), section length hi (4)
      p[i++] = 0x00; // section length lo (filled in later)
-     p[i++] = P_PNR >> 8;   // program number hi
-     p[i++] = P_PNR & 0xFF; // program number lo
+     p[i++] = pmtPid >> 8;   // program number hi
+     p[i++] = pmtPid & 0xFF; // program number lo
      p[i++] = 0xC1 | (pmtVersion << 1); // dummy (2), version number (5), current/next indicator (1)
      p[i++] = 0x00; // section number
      p[i++] = 0x00; // last section number
@@ -292,9 +307,9 @@ void cPatPmtGenerator::GeneratePmt(tChannelID ChannelID)
      while (i > 0) {
            uchar *p = pmt[numPmtPackets++];
            int j = 0;
-           p[j++] = 0x47; // TS indicator
-           p[j++] = (pusi ? 0x40 : 0x00) | (P_PNR >> 8); // flags (3), pid hi (5)
-           p[j++] = P_PNR & 0xFF; // pid lo
+           p[j++] = TS_SYNC_BYTE; // TS indicator
+           p[j++] = (pusi ? TS_PAYLOAD_START : 0x00) | (pmtPid >> 8); // flags (3), pid hi (5)
+           p[j++] = pmtPid & 0xFF; // pid lo
            p[j++] = 0x10; // flags (4), continuity counter (4)
            if (pusi) {
               p[j++] = 0x00; // pointer field (payload unit start indicator is set)
@@ -307,8 +322,15 @@ void cPatPmtGenerator::GeneratePmt(tChannelID ChannelID)
            }
      IncVersion(pmtVersion);
      }
-  else
-     esyslog("ERROR: can't find channel %s", *ChannelID.ToString());
+}
+
+void cPatPmtGenerator::SetChannel(cChannel *Channel)
+{
+  if (Channel) {
+     GeneratePmtPid(Channel);
+     GeneratePat();
+     GeneratePmt(Channel);
+     }
 }
 
 uchar *cPatPmtGenerator::GetPat(void)
@@ -320,7 +342,7 @@ uchar *cPatPmtGenerator::GetPat(void)
 uchar *cPatPmtGenerator::GetPmt(int &Index)
 {
   if (Index < numPmtPackets) {
-     IncCounter(patCounter, pmt[Index]);
+     IncCounter(pmtCounter, pmt[Index]);
      return pmt[Index++];
      }
   return NULL;
@@ -329,19 +351,33 @@ uchar *cPatPmtGenerator::GetPmt(int &Index)
 // --- cPatPmtParser ---------------------------------------------------------
 
 cPatPmtParser::cPatPmtParser(void)
+{
+  Reset();
+}
+
+void cPatPmtParser::Reset(void)
 {
   pmtSize = 0;
+  patVersion = pmtVersion = -1;
   pmtPid = -1;
   vpid = vtype = 0;
 }
 
 void cPatPmtParser::ParsePat(const uchar *Data, int Length)
 {
+  // Unpack the TS packet:
+  int PayloadOffset = TsPayloadOffset(Data);
+  Data += PayloadOffset;
+  Length -= PayloadOffset;
   // The PAT is always assumed to fit into a single TS packet
+  if ((Length -= Data[0] + 1) <= 0)
+     return;
   Data += Data[0] + 1; // process pointer_field
   SI::PAT Pat(Data, false);
   if (Pat.CheckCRCAndParse()) {
      dbgpatpmt("PAT: TSid = %d, c/n = %d, v = %d, s = %d, ls = %d\n", Pat.getTransportStreamId(), Pat.getCurrentNextIndicator(), Pat.getVersionNumber(), Pat.getSectionNumber(), Pat.getLastSectionNumber());
+     if (patVersion == Pat.getVersionNumber())
+        return;
      SI::PAT::Association assoc;
      for (SI::Loop::Iterator it; Pat.associationLoop.getNext(assoc, it); ) {
          dbgpatpmt("     isNITPid = %d\n", assoc.isNITPid());
@@ -350,6 +386,7 @@ void cPatPmtParser::ParsePat(const uchar *Data, int Length)
             dbgpatpmt("     service id = %d, pid = %d\n", assoc.getServiceId(), assoc.getPid());
             }
          }
+     patVersion = Pat.getVersionNumber();
      }
   else
      esyslog("ERROR: can't parse PAT");
@@ -357,10 +394,17 @@ void cPatPmtParser::ParsePat(const uchar *Data, int Length)
 
 void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
 {
+  // Unpack the TS packet:
+  bool PayloadStart = TsPayloadStart(Data);
+  int PayloadOffset = TsPayloadOffset(Data);
+  Data += PayloadOffset;
+  Length -= PayloadOffset;
   // The PMT may extend over several TS packets, so we need to assemble them
-  if (pmtSize == 0) {
+  if (PayloadStart) {
+     pmtSize = 0;
+     if ((Length -= Data[0] + 1) <= 0)
+        return;
      Data += Data[0] + 1; // this is the first packet
-     Length -= Data[0] + 1;
      if (SectionLength(Data, Length) > Length) {
         if (Length <= int(sizeof(pmt))) {
            memcpy(pmt, Data, Length);
@@ -372,7 +416,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
         }
      // the packet contains the entire PMT section, so we run into the actual parsing
      }
-  else {
+  else if (pmtSize > 0) {
      // this is a following packet, so we add it to the pmt storage
      if (Length <= int(sizeof(pmt)) - pmtSize) {
         memcpy(pmt + pmtSize, Data, Length);
@@ -387,10 +431,14 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
      // the PMT section is now complete, so we run into the actual parsing
      Data = pmt;
      }
+  else
+     return; // fragment of broken packet - ignore
   SI::PMT Pmt(Data, false);
   if (Pmt.CheckCRCAndParse()) {
      dbgpatpmt("PMT: sid = %d, c/n = %d, v = %d, s = %d, ls = %d\n", Pmt.getServiceId(), Pmt.getCurrentNextIndicator(), Pmt.getVersionNumber(), Pmt.getSectionNumber(), Pmt.getLastSectionNumber());
      dbgpatpmt("     pcr = %d\n", Pmt.getPCRPid());
+     if (pmtVersion == Pmt.getVersionNumber())
+        return;
      cDevice::PrimaryDevice()->ClrAvailableTracks(false, true);
      int NumApids = 0;
      int NumDpids = 0;
@@ -496,6 +544,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
          cDevice::PrimaryDevice()->EnsureAudioTrack(true);
          cDevice::PrimaryDevice()->EnsureSubtitleTrack();
          }
+     pmtVersion = Pmt.getVersionNumber();
      }
   else
      esyslog("ERROR: can't parse PMT");
@@ -559,8 +608,10 @@ const uchar *cTsToPes::GetPes(int &Length)
         }
      else {
         Length = PesLength(data);
-        offset = Length; // to make sure we break out in case of garbage data
-        return data;
+        if (Length <= length) {
+           offset = Length; // to make sure we break out in case of garbage data
+           return data;
+           }
         }
      }
   return NULL;
@@ -703,6 +754,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                       if (frameDuration) {
                          newFrame = true;
                          independentFrame = true;
+                         scanning = false;
                          }
                       else
                          framesPerPayloadUnit = 1;
diff --git a/remux.h b/remux.h
index 9a0921d1f..8cb1223a2 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.4 2009/01/06 12:40:43 kls Exp $
+ * $Id: remux.h 2.7 2009/01/24 13:38:10 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -153,6 +153,7 @@ class cPatPmtGenerator {
   int pmtCounter;
   int patVersion;
   int pmtVersion;
+  int pmtPid;
   uchar *esInfoLength;
   void IncCounter(int &Counter, uchar *TsPacket);
   void IncVersion(int &Version);
@@ -163,16 +164,20 @@ class cPatPmtGenerator {
   int MakeSubtitlingDescriptor(uchar *Target, const char *Language);
   int MakeLanguageDescriptor(uchar *Target, const char *Language);
   int MakeCRC(uchar *Target, const uchar *Data, int Length);
-public:
-  cPatPmtGenerator(void);
+  void GeneratePmtPid(cChannel *Channel);
+       ///< Generates a PMT pid that doesn't collide with any of the actual
+       ///< pids of the Channel.
   void GeneratePat(void);
        ///< Generates a PAT section for later use with GetPat().
-       ///< This function is called by default from the constructor.
-  void GeneratePmt(tChannelID ChannelID);
-       ///< Generates a PMT section for the given ChannelId, for later use
+  void GeneratePmt(cChannel *Channel);
+       ///< Generates a PMT section for the given Channel, for later use
        ///< with GetPmt().
+public:
+  cPatPmtGenerator(cChannel *Channel = NULL);
+  void SetChannel(cChannel *Channel);
+       ///< Sets the Channel for which the PAT/PMT shall be generated.
   uchar *GetPat(void);
-       ///< Returns a pointer to the PAT section, which consist of exactly
+       ///< Returns a pointer to the PAT section, which consists of exactly
        ///< one TS packet.
   uchar *GetPmt(int &Index);
        ///< Returns a pointer to the Index'th TS packet of the PMT section.
@@ -187,6 +192,8 @@ class cPatPmtParser {
 private:
   uchar pmt[MAX_SECTION_SIZE];
   int pmtSize;
+  int patVersion;
+  int pmtVersion;
   int pmtPid;
   int vpid;
   int vtype;
@@ -194,12 +201,16 @@ class cPatPmtParser {
   int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
 public:
   cPatPmtParser(void);
+  void Reset(void);
+       ///< Resets the parser. This function must be called whenever a new
+       ///< stream is parsed.
   void ParsePat(const uchar *Data, int Length);
-       ///< Parses the given PAT Data, which is the payload of a single TS packet
-       ///< from the PAT stream. The PAT may consist only of a single TS packet.
+       ///< Parses the PAT data from the single TS packet in Data.
+       ///< Length is always TS_SIZE.
   void ParsePmt(const uchar *Data, int Length);
-       ///< Parses the given PMT Data, which is the payload of a single TS packet
-       ///< from the PMT stream. The PMT may consist of several TS packets, which
+       ///< Parses the PMT data from the single TS packet in Data.
+       ///< Length is always TS_SIZE.
+       ///< The PMT may consist of several TS packets, which
        ///< are delivered to the parser through several subsequent calls to
        ///< ParsePmt(). The whole PMT data will be processed once the last packet
        ///< has been received.
diff --git a/tools.c b/tools.c
index 627bcf877..f49206f09 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.1 2008/12/24 15:25:15 kls Exp $
+ * $Id: tools.c 2.2 2009/01/16 14:29:08 kls Exp $
  */
 
 #include "tools.h"
@@ -1608,7 +1608,7 @@ ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
               // kind of write gathering enabled), but the syncs cause (io) load..
               // Uncomment the next line if you think you need them.
               //fdatasync(fd);
-              off_t headdrop = min(curpos - totwritten, off_t(totwritten * 2));
+              off_t headdrop = min(off_t(curpos - totwritten), off_t(totwritten * 2));
               posix_fadvise(fd, curpos - totwritten - headdrop, totwritten + headdrop, POSIX_FADV_DONTNEED);
               totwritten = 0;
               }
diff --git a/transfer.c b/transfer.c
index 9a6aee3d5..a2ec9b45b 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.1 2008/08/15 14:32:12 kls Exp $
+ * $Id: transfer.c 2.3 2009/01/23 15:34:26 kls Exp $
  */
 
 #include "transfer.h"
@@ -14,7 +14,7 @@
 cTransfer::cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids)
 :cReceiver(ChannelID, -1, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
 {
-  patPmtGenerator.GeneratePmt(ChannelID);
+  patPmtGenerator.SetChannel(Channels.GetByChannelID(ChannelID));
 }
 
 cTransfer::~cTransfer()
@@ -31,6 +31,8 @@ void cTransfer::Activate(bool On)
      while (uchar *pmt = patPmtGenerator.GetPmt(Index))
            PlayTs(pmt, TS_SIZE);
      }
+  else
+     cPlayer::Detach();
 }
 
 void cTransfer::Receive(uchar *Data, int Length)
diff --git a/vdr.1 b/vdr.1
index f5ffb9de9..3df168475 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.0 2008/03/09 16:07:06 kls Exp $
+.\" $Id: vdr.1 2.1 2009/01/18 11:05:56 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -71,6 +71,15 @@ grabbing images to disk is disabled.
 .B \-h, \-\-help
 Print a help message and exit.
 .TP
+.BI \-i\  instance ,\ \-\-instance= instance
+Use \fIinstance\fR as the id of this VDR instance (default is 0).
+In an environment where several instances of VDR use the same video
+directory, this parameter can be set to a positive integer value
+that's unique for each instance, so that they won't interfere with
+each other in case they record exactly the same broadcast.
+The number given here will be part of the directory name in which
+the recordings will be stored.
+.TP
 .BI \-l\  level ,\ \-\-log= level
 Set logging to \fIlevel\fR.
 \fB0\fR\ =\ no logging, \fB1\fR\ =\ errors only,
diff --git a/vdr.c b/vdr.c
index fa36b8817..34ad856f3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 2.3 2008/09/06 14:08:44 kls Exp $
+ * $Id: vdr.c 2.4 2009/01/18 11:02:37 kls Exp $
  */
 
 #include <getopt.h>
@@ -223,6 +223,7 @@ int main(int argc, char *argv[])
       { "epgfile",  required_argument, NULL, 'E' },
       { "grab",     required_argument, NULL, 'g' },
       { "help",     no_argument,       NULL, 'h' },
+      { "instance", required_argument, NULL, 'i' },
       { "lib",      required_argument, NULL, 'L' },
       { "lirc",     optional_argument, NULL, 'l' | 0x100 },
       { "localedir",required_argument, NULL, 'l' | 0x200 },
@@ -245,7 +246,7 @@ int main(int argc, char *argv[])
     };
 
   int c;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:g:hl:L:mp:P:r:s:t:u:v:Vw:", long_options, NULL)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:E:g:hi:l:L:mp:P:r:s:t:u:v:Vw:", long_options, NULL)) != -1) {
         switch (c) {
           case 'a': AudioCommand = optarg;
                     break;
@@ -268,6 +269,13 @@ int main(int argc, char *argv[])
                     break;
           case 'h': DisplayHelp = true;
                     break;
+          case 'i': if (isnumber(optarg)) {
+                       InstanceId = atoi(optarg);
+                       if (InstanceId >= 0)
+                          break;
+                       }
+                    fprintf(stderr, "vdr: invalid instance id: %s\n", optarg);
+                    return 2;
           case 'l': {
                       char *p = strchr(optarg, '.');
                       if (p)

From 1aadb31fb355550bb415ed971322a9bcb80f9325 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 12 Apr 2009 22:29:35 +0200
Subject: [PATCH 191/307] =?UTF-8?q?Version=201.7.5=20-=20Fixed=20a=20hangu?=
 =?UTF-8?q?p=20when=20replaying=20a=20TS=20recording=20with=20subtitles=20?=
 =?UTF-8?q?activated=20(reported=20=20=20by=20Timo=20Helkio).=20-=20Fixed?=
 =?UTF-8?q?=20handling=20the=20'new'=20indicator=20in=20the=20recordings?=
 =?UTF-8?q?=20menu=20for=20TS=20recordings=20=20=20(thanks=20to=20Derek=20?=
 =?UTF-8?q?Kelly).=20-=20Added=20cap=5Fsys=5Fnice=20to=20the=20capabilitie?=
 =?UTF-8?q?s=20that=20are=20not=20dropped=20(thanks=20to=20Rolf=20=20=20Ah?=
 =?UTF-8?q?renberg).=20-=20Updated=20the=20Italian=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Diego=20Pierotto).=20-=20Added=20cRecordingInfo::GetEve?=
 =?UTF-8?q?nt()=20(thanks=20to=20Marcel=20Unbehaun).=20-=20Improved=20sync?=
 =?UTF-8?q?hronizing=20the=20progress=20display,=20trick=20modes=20and=20s?=
 =?UTF-8?q?ubtitle=20display=20=20=20to=20the=20actual=20audio/video.=20Th?=
 =?UTF-8?q?is=20now=20works=20independent=20of=20any=20buffer=20sizes=20th?=
 =?UTF-8?q?e=20=20=20output=20device=20might=20use.=20=20=20+=20The=20cBac?=
 =?UTF-8?q?kTrace=20class=20has=20been=20replaced=20with=20cPtsIndex,=20wh?=
 =?UTF-8?q?ich=20keeps=20track=20=20=20=20=20of=20the=20PTS=20timestamps?=
 =?UTF-8?q?=20of=20recently=20played=20frames.=20=20=20+=20cDevice::GetSTC?=
 =?UTF-8?q?()=20is=20now=20required=20to=20deliver=20the=20STC=20even=20in?=
 =?UTF-8?q?=20trick=20modes.=20=20=20=20=20It=20is=20sufficient=20if=20it?=
 =?UTF-8?q?=20returns=20the=20PTS=20of=20the=20most=20recently=20presented?=
 =?UTF-8?q?=20=20=20=20=20audio/video=20frame.=20=20=20+=20The=20full-feat?=
 =?UTF-8?q?ured=20DVB=20cards=20need=20an=20improved=20firmware=20in=20ord?=
 =?UTF-8?q?er=20to=20return=20=20=20=20=20proper=20STC=20values=20in=20tri?=
 =?UTF-8?q?ck=20modes=20(thanks=20to=20Oliver=20Endriss=20for=20enhancing?=
 =?UTF-8?q?=20the=20=20=20=20=20av7110=20firmware).=20-=20Adapted=20cFrame?=
 =?UTF-8?q?Detector::Analyze()=20to=20HD=20NTSC=20broadcasts=20that=20spli?=
 =?UTF-8?q?t=20frames=20over=20=20=20several=20payload=20units=20(thanks?=
 =?UTF-8?q?=20to=20Derek=20Kelly=20for=20reporting=20this=20and=20helping?=
 =?UTF-8?q?=20in=20=20=20testing).=20-=20Modified=20cFrameDetector::Analyz?=
 =?UTF-8?q?e()=20to=20make=20it=20process=20whole=20frames=20at=20once,=20?=
 =?UTF-8?q?so=20=20=20that=20file=20I/O=20overhead=20is=20minimized=20duri?=
 =?UTF-8?q?ng=20recording=20(reported=20by=20G=C3=BCnter=20=20=20Niedermei?=
 =?UTF-8?q?er).=20-=20Added=20command=20line=20help=20for=20the=20'-i'=20o?=
 =?UTF-8?q?ption.=20-=20Fixed=20cDvbPlayer::NextFile()=20to=20handle=20fil?=
 =?UTF-8?q?es=20larger=20than=202GB=20(thanks=20to=20Jose=20=20=20Alberto?=
 =?UTF-8?q?=20Reguero).=20-=20Improved=20replay=20at=20the=20begin=20and?=
 =?UTF-8?q?=20end=20of=20a=20recording.=20The=20very=20first=20and=20very?=
 =?UTF-8?q?=20last=20=20=20frame=20is=20now=20sent=20to=20the=20output=20d?=
 =?UTF-8?q?evice=20repeatedly=20until=20GetSTC()=20reports=20that=20it=20?=
 =?UTF-8?q?=20=20has=20been=20played.=20cDvbPlayer::Action()=20no=20longer?=
 =?UTF-8?q?=20calls=20DeviceFlush()=20(thanks=20to=20=20=20Reinhard=20Niss?=
 =?UTF-8?q?l=20for=20making=20sure=20vdr-xine=20no=20longer=20needs=20this?=
 =?UTF-8?q?).=20-=20Added=20missing=20'[]'=20to=20the=20delete=20operator?=
 =?UTF-8?q?=20in=20cMenuEditStrItem::~cMenuEditStrItem().=20-=20Added=20mi?=
 =?UTF-8?q?ssing=20virtual=20destructor=20to=20cPalette.=20-=20Now=20freei?=
 =?UTF-8?q?ng=20configDirectory=20before=20setting=20it=20to=20a=20new=20v?=
 =?UTF-8?q?alue=20in=20=20=20cPlugin::SetConfigDirectory().=20-=20Fixed=20?=
 =?UTF-8?q?a=20crash=20when=20jumping=20to=20an=20editing=20mark=20in=20an?=
 =?UTF-8?q?=20audio=20recording.=20-=20Fixed=20the=20'VideoOnly'=20conditi?=
 =?UTF-8?q?on=20in=20the=20PlayPes()=20and=20PlayTs()=20calls=20in=20=20?=
 =?UTF-8?q?=20cDvbPlayer::Action()=20(thanks=20to=20Reinhard=20Nissl).=20-?=
 =?UTF-8?q?=20cDevice::PlayTs()=20now=20plays=20as=20many=20TS=20packets?=
 =?UTF-8?q?=20as=20possible=20in=20one=20call.=20-=20Making=20sure=20any?=
 =?UTF-8?q?=20floating=20point=20numbers=20written=20use=20a=20decimal=20p?=
 =?UTF-8?q?oint=20(thanks=20to=20=20=20Oliver=20Endriss=20for=20pointing?=
 =?UTF-8?q?=20out=20a=20problem=20with=20the=20F=20record=20in=20the=20inf?=
 =?UTF-8?q?o=20file=20of=20=20=20a=20recording).=20-=20Fixed=20detecting?=
 =?UTF-8?q?=20the=20frame=20rate=20for=20radio=20recordings.=20-=20Added?=
 =?UTF-8?q?=20missing=20AUDIO=5FPAUSE/AUDIO=5FCONTINUE=20calls=20to=20cDvb?=
 =?UTF-8?q?Device=20(thanks=20to=20Oliver=20=20=20Endriss).=20-=20No=20lon?=
 =?UTF-8?q?ger=20writing=20the=20video=20type=20into=20channels.conf=20if?=
 =?UTF-8?q?=20VPID=20is=200=20(thanks=20to=20=20=20Oliver=20Endriss=20for?=
 =?UTF-8?q?=20reporting=20this).=20-=20Improved=20efficiency=20of=20cEIT::?=
 =?UTF-8?q?cEIT()=20(thanks=20to=20Tobias=20Bratfisch).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |  28 +++++-
 HISTORY      |  52 ++++++++++
 INSTALL      |   3 +-
 channels.c   |   4 +-
 config.h     |  10 +-
 device.c     |  82 +++++++++-------
 device.h     |  17 +++-
 dvbdevice.c  |  12 ++-
 dvbplayer.c  | 271 +++++++++++++++++++++++++++++----------------------
 eit.c        |  41 ++++----
 menuitems.c  |   8 +-
 osd.c        |   6 +-
 osd.h        |   3 +-
 player.h     |   3 +-
 plugin.c     |   3 +-
 po/it_IT.po  |  67 +++++++------
 recorder.c   |   5 +-
 recording.c  |   3 +-
 recording.h  |   3 +-
 remux.c      | 203 +++++++++++++++++++++++++-------------
 remux.h      |  27 +++--
 ringbuffer.c |   5 +-
 ringbuffer.h |   6 +-
 vdr.c        |  12 ++-
 24 files changed, 556 insertions(+), 318 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 848c367b2..15a605e3c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -662,6 +662,13 @@ Oliver Endriss <o.endriss@gmx.de>
  Transfer Mode
  for providing a driver patch that allows direct replaying of TS video on full-featured
  DVB cards
+ for improving the firmware of FF DVB cards to allow getting the current STC value
+ even in trick modes
+ for pointing out a problem with the decimal point of the F record in the info file of
+ a recording
+ for adding missing AUDIO_PAUSE/AUDIO_CONTINUE calls to cDvbDevice
+ for reporting that the video type is unnecessarily written into channels.conf if
+ VPID is 0
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1061,6 +1068,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  the last replayed recording was in a subdirectory, and pressing Back
  for setting the thread name, so that it can be seen in 'top -H'
  for replacing the Finnish language code "smi" with "suo"
+ for adding cap_sys_nice to the capabilities that are not dropped
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1197,6 +1205,9 @@ Reinhard Nissl <rnissl@gmx.de>
  to cDevice::PlayTs()
  for reporting that the PAT/PMT is processed too often, even if its version
  hasn't changed
+ for making sure vdr-xine no longer needs cDvbPlayer::Action() to call DeviceFlush()
+ for fixing the 'VideoOnly' condition in the PlayPes() and PlayTs() calls in
+ cDvbPlayer::Action()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -2279,6 +2290,7 @@ Alexander Riedel <alexander-riedel@t-online.de>
 
 Jose Alberto Reguero <jareguero@telefonica.net>
  for a patch that fixed part of a crash in i18n character set conversion
+ for fixing cDvbPlayer::NextFile() to handle files larger than 2GB
 
 Patrice Staudt <staudt@engsystem.net>
  for adding full weekday names to i18n.c for plugins to use
@@ -2290,6 +2302,7 @@ Tobias Bratfisch <tobias@reel-multimedia.com>
  for optimizing cMenuEditChrItem::Set()
  for optimizing cNitFilter::Process()
  for reducing the number of time(NULL) calls in vdr.c's main loop to a single call
+ for improving efficiency of cEIT::cEIT()
 
 Bruno Roussel <bruno.roussel@free.fr>
  for translating OSD texts to the French language
@@ -2412,4 +2425,17 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for fixing incrementing the continuity counter in cPatPmtGenerator::GetPmt()
  for pointing out that "DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  -D_LARGEFILE64_SOURCE" should be added to Make.config.
-  to Make.config.template (thanks to Johann Friedrichs for pointing this out).
+
+Timo Helkio <timolavi@mbnet.fi>
+ for reporting a hangup when replaying a TS recording with subtitles activated
+
+Derek Kelly (user.vdr@gmail.com)
+ for fixing handling the 'new' indicator in the recordings menu for TS recordings
+ for reporting a problem with HD NTSC broadcasts that split frames over several payload
+ units
+
+Marcel Unbehaun <frostworks@gmx.de>
+ for adding cRecordingInfo::GetEvent()
+
+G�nter Niedermeier <linuxtv@ncs-online.de>
+ for reporting a problem with file I/O overhead during recording in TS format
diff --git a/HISTORY b/HISTORY
index 1cbc1bdb6..086c92af1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5978,3 +5978,55 @@ Video Disk Recorder Revision History
   player whether there is video data in the currently replayed stream. If a derived
   cDevice class reimplements PlayTs() or PlayPes(), it also needs to make sure this
   new function works as expected.
+
+2009-04-12: Version 1.7.5
+
+- Fixed a hangup when replaying a TS recording with subtitles activated (reported
+  by Timo Helkio).
+- Fixed handling the 'new' indicator in the recordings menu for TS recordings
+  (thanks to Derek Kelly).
+- Added cap_sys_nice to the capabilities that are not dropped (thanks to Rolf
+  Ahrenberg).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Added cRecordingInfo::GetEvent() (thanks to Marcel Unbehaun).
+- Improved synchronizing the progress display, trick modes and subtitle display
+  to the actual audio/video. This now works independent of any buffer sizes the
+  output device might use.
+  + The cBackTrace class has been replaced with cPtsIndex, which keeps track
+    of the PTS timestamps of recently played frames.
+  + cDevice::GetSTC() is now required to deliver the STC even in trick modes.
+    It is sufficient if it returns the PTS of the most recently presented
+    audio/video frame.
+  + The full-featured DVB cards need an improved firmware in order to return
+    proper STC values in trick modes (thanks to Oliver Endriss for enhancing the
+    av7110 firmware).
+- Adapted cFrameDetector::Analyze() to HD NTSC broadcasts that split frames over
+  several payload units (thanks to Derek Kelly for reporting this and helping in
+  testing).
+- Modified cFrameDetector::Analyze() to make it process whole frames at once, so
+  that file I/O overhead is minimized during recording (reported by G�nter
+  Niedermeier).
+- Added command line help for the '-i' option.
+- Fixed cDvbPlayer::NextFile() to handle files larger than 2GB (thanks to Jose
+  Alberto Reguero).
+- Improved replay at the begin and end of a recording. The very first and very last
+  frame is now sent to the output device repeatedly until GetSTC() reports that it
+  has been played. cDvbPlayer::Action() no longer calls DeviceFlush() (thanks to
+  Reinhard Nissl for making sure vdr-xine no longer needs this).
+- Added missing '[]' to the delete operator in cMenuEditStrItem::~cMenuEditStrItem().
+- Added missing virtual destructor to cPalette.
+- Now freeing configDirectory before setting it to a new value in
+  cPlugin::SetConfigDirectory().
+- Fixed a crash when jumping to an editing mark in an audio recording.
+- Fixed the 'VideoOnly' condition in the PlayPes() and PlayTs() calls in
+  cDvbPlayer::Action() (thanks to Reinhard Nissl).
+- cDevice::PlayTs() now plays as many TS packets as possible in one call.
+- Making sure any floating point numbers written use a decimal point (thanks to
+  Oliver Endriss for pointing out a problem with the F record in the info file of
+  a recording).
+- Fixed detecting the frame rate for radio recordings.
+- Added missing AUDIO_PAUSE/AUDIO_CONTINUE calls to cDvbDevice (thanks to Oliver
+  Endriss).
+- No longer writing the video type into channels.conf if VPID is 0 (thanks to
+  Oliver Endriss for reporting this).
+- Improved efficiency of cEIT::cEIT() (thanks to Tobias Bratfisch).
diff --git a/INSTALL b/INSTALL
index 7294fabe0..f4b63d715 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,8 +16,7 @@ to Make.config and adjust the definition of DVBDIR in that file.
 
 Refer to http://linuxtv.org for more information about the Linux-DVB driver.
 
-VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
-to work properly.
+VDR requires the Linux-DVB driver version that supports the S2API interface.
 
 You will also need to install the following libraries, as well as their
 "devel" packages to get the necessary header files for compiling VDR:
diff --git a/channels.c b/channels.c
index b4fea76ba..46a8196ba 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.4 2008/12/13 11:42:15 kls Exp $
+ * $Id: channels.c 2.5 2009/04/10 11:29:55 kls Exp $
  */
 
 #include "channels.h"
@@ -724,7 +724,7 @@ cString cChannel::ToText(const cChannel *Channel)
      q += snprintf(q, sizeof(vpidbuf), "%d", Channel->vpid);
      if (Channel->ppid && Channel->ppid != Channel->vpid)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
-     if (Channel->vtype)
+     if (Channel->vpid && Channel->vtype)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "=%d", Channel->vtype);
      *q = 0;
      const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia
diff --git a/config.h b/config.h
index 0041f83da..6e15ba4a9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.6 2009/01/06 16:56:27 kls Exp $
+ * $Id: config.h 2.7 2009/01/30 16:05:34 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.4"
-#define VDRVERSNUM   10704  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.5"
+#define VDRVERSNUM   10705  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.4"
-#define APIVERSNUM   10704  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.5"
+#define APIVERSNUM   10705  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 1f806e026..ccf176c4f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.11 2009/01/25 11:10:56 kls Exp $
+ * $Id: device.c 2.13 2009/04/05 12:15:41 kls Exp $
  */
 
 #include "device.h"
@@ -1304,8 +1304,9 @@ int cDevice::PlayTsSubtitle(const uchar *Data, int Length)
   if (!dvbSubtitleConverter)
      dvbSubtitleConverter = new cDvbSubtitleConverter;
   tsToPesSubtitle.PutTs(Data, Length);
-  if (const uchar *p = tsToPesSubtitle.GetPes(Length)) {
-     dvbSubtitleConverter->Convert(p, Length);
+  int l;
+  if (const uchar *p = tsToPesSubtitle.GetPes(l)) {
+     dvbSubtitleConverter->Convert(p, l);
      tsToPesSubtitle.Reset();
      }
   return Length;
@@ -1314,43 +1315,54 @@ int cDevice::PlayTsSubtitle(const uchar *Data, int Length)
 //TODO detect and report continuity errors?
 int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 {
-  if (Length == TS_SIZE) {
-     if (!TsHasPayload(Data))
-        return Length; // silently ignore TS packets w/o payload
-     int PayloadOffset = TsPayloadOffset(Data);
-     if (PayloadOffset < Length) {
-        cMutexLock MutexLock(&mutexCurrentAudioTrack);
-        int Pid = TsPid(Data);
-        if (Pid == 0)
-           patPmtParser.ParsePat(Data, Length);
-        else if (Pid == patPmtParser.PmtPid())
-           patPmtParser.ParsePmt(Data, Length);
-        else if (Pid == patPmtParser.Vpid()) {
-           isPlayingVideo = true;
-           return PlayTsVideo(Data, Length);
-           }
-        else if (Pid == availableTracks[currentAudioTrack].id) {
-           if (!VideoOnly || HasIBPTrickSpeed()) {
-              int w = PlayTsAudio(Data, Length);
-              if (w > 0)
-                 Audios.PlayTsAudio(Data, Length);
-              return w;
-              }
-           }
-        else if (Pid == availableTracks[currentSubtitleTrack].id) {
-           if (!VideoOnly || HasIBPTrickSpeed())
-              return PlayTsSubtitle(Data, Length);
-           }
-        return Length;
-        }
-     }
-  else if (Data == NULL) {
+  int Played = 0;
+  if (Data == NULL) {
      patPmtParser.Reset();
      tsToPesVideo.Reset();
      tsToPesAudio.Reset();
      tsToPesSubtitle.Reset();
      }
-  return -1;
+  else {
+     cMutexLock MutexLock(&mutexCurrentAudioTrack);
+     while (Length >= TS_SIZE) {
+           if (TsHasPayload(Data)) { // silently ignore TS packets w/o payload
+              int PayloadOffset = TsPayloadOffset(Data);
+              if (PayloadOffset < TS_SIZE) {
+                 int Pid = TsPid(Data);
+                 if (Pid == 0)
+                    patPmtParser.ParsePat(Data, TS_SIZE);
+                 else if (Pid == patPmtParser.PmtPid())
+                    patPmtParser.ParsePmt(Data, TS_SIZE);
+                 else if (Pid == patPmtParser.Vpid()) {
+                    isPlayingVideo = true;
+                    int w = PlayTsVideo(Data, TS_SIZE);
+                    if (w < 0)
+                       return Played ? Played : w;
+                    if (w == 0)
+                       break;
+                    }
+                 else if (Pid == availableTracks[currentAudioTrack].id) {
+                    if (!VideoOnly || HasIBPTrickSpeed()) {
+                       int w = PlayTsAudio(Data, TS_SIZE);
+                       if (w < 0)
+                          return Played ? Played : w;
+                       if (w == 0)
+                          break;
+                       Audios.PlayTsAudio(Data, TS_SIZE);
+                       }
+                    }
+                 else if (Pid == availableTracks[currentSubtitleTrack].id) {
+                    if (!VideoOnly || HasIBPTrickSpeed())
+                       PlayTsSubtitle(Data, TS_SIZE);
+                    }
+                 }
+              }
+           Played += TS_SIZE;
+           Length -= TS_SIZE;
+           Data += TS_SIZE;
+           }
+     }
+  return Played;
 }
 
 int cDevice::Priority(void) const
diff --git a/device.h b/device.h
index 67c9be44c..c3a170b22 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.6 2009/01/25 11:04:39 kls Exp $
+ * $Id: device.h 2.9 2009/04/05 12:12:44 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -543,6 +543,13 @@ class cDevice : public cThread {
        ///< Gets the current System Time Counter, which can be used to
        ///< synchronize audio and video. If this device is unable to
        ///< provide the STC, -1 will be returned.
+       ///< The value returned doesn't need to be an actual "clock" value,
+       ///< it is sufficient if it holds the PTS (Presentation Time Stamp) of
+       ///< the most recently presented frame. A proper value must be returned
+       ///< in normal replay mode as well as in any trick modes (like slow motion,
+       ///< fast forward/rewind).
+       ///< Only the lower 32 bit of this value are actually used, since some
+       ///< devices can't handle the msb correctly.
   virtual bool IsPlayingVideo(void) const { return isPlayingVideo; }
        ///< \return Returns true if the currently attached player has delivered
        ///< any video packets.
@@ -588,7 +595,7 @@ class cDevice : public cThread {
        ///< data which was bufferd so far has been processed.
        ///< If TimeoutMs is not zero, the device will wait up to the given
        ///< number of milliseconds before returning in case there is still
-       ///< data in the buffers..
+       ///< data in the buffers.
   virtual int PlayPes(const uchar *Data, int Length, bool VideoOnly = false);
        ///< Plays all valid PES packets in Data with the given Length.
        ///< If Data is NULL any leftover data from a previous call will be
@@ -612,9 +619,9 @@ class cDevice : public cThread {
        ///< must be sent to the base class function. This applies especially
        ///< to the PAT/PMT packets.
        ///< Returns -1 in case of error, otherwise the number of actually
-       ///< processed bytes is returned, which must be Length.
-       ///< PlayTs() shall process the packet either as a whole (returning
-       ///< Length) or not at all returning 0 or -1 and setting 'errno' accordingly).
+       ///< processed bytes is returned.
+       ///< PlayTs() shall process the TS packets either as a whole (returning
+       ///< n*TS_SIZE) or not at all, returning 0 or -1 and setting 'errno' accordingly).
   bool Replaying(void) const;
        ///< Returns true if we are currently replaying.
   bool Transferring(void) const;
diff --git a/dvbdevice.c b/dvbdevice.c
index 56001917a..942abf11d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.12 2009/01/10 10:07:33 kls Exp $
+ * $Id: dvbdevice.c 2.14 2009/04/10 09:54:24 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1172,8 +1172,10 @@ void cDvbDevice::Play(void)
         CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
      }
   else {
-     if (fd_audio >= 0)
+     if (fd_audio >= 0) {
         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
+        }
      if (fd_video >= 0)
         CHECK(ioctl(fd_video, VIDEO_CONTINUE));
      }
@@ -1187,8 +1189,10 @@ void cDvbDevice::Freeze(void)
         CHECK(ioctl(fd_audio, AUDIO_PAUSE));
      }
   else {
-     if (fd_audio >= 0)
+     if (fd_audio >= 0) {
         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
+        }
      if (fd_video >= 0)
         CHECK(ioctl(fd_video, VIDEO_FREEZE));
      }
@@ -1206,6 +1210,8 @@ void cDvbDevice::Mute(void)
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
 {
+  if (!Data || Length < TS_SIZE)
+     return;
   if (Data[0] == 0x47) {
      // TS data
      cDevice::StillPicture(Data, Length);
diff --git a/dvbplayer.c b/dvbplayer.c
index 6e004403a..9de0fca9a 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.3 2009/01/25 11:11:39 kls Exp $
+ * $Id: dvbplayer.c 2.11 2009/04/05 13:04:33 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -16,59 +16,69 @@
 #include "thread.h"
 #include "tools.h"
 
-// --- cBackTrace ------------------------------------------------------------
+// --- cPtsIndex -------------------------------------------------------------
 
-#define AVG_FRAME_SIZE 15000         // an assumption about the average frame size
-#define DVB_BUF_SIZE   (256 * 1024)  // an assumption about the dvb firmware buffer size
-#define BACKTRACE_ENTRIES (DVB_BUF_SIZE / AVG_FRAME_SIZE + 20) // how many entries are needed to backtrace buffer contents
+#define PTSINDEX_ENTRIES 500
 
-class cBackTrace {
+class cPtsIndex {
 private:
-  int index[BACKTRACE_ENTRIES];
-  int length[BACKTRACE_ENTRIES];
-  int pos, num;
+  struct tPtsIndex {
+    uint32_t pts; // no need for 33 bit - some devices don't even supply the msb
+    int index;
+    };
+  tPtsIndex pi[PTSINDEX_ENTRIES];
+  int w, r;
+  int lastFound;
+  cMutex mutex;
 public:
-  cBackTrace(void);
+  cPtsIndex(void);
   void Clear(void);
-  void Add(int Index, int Length);
-  int Get(bool Forward);
+  void Put(uint32_t Pts, int Index);
+  int FindIndex(uint32_t Pts);
   };
 
-cBackTrace::cBackTrace(void)
+cPtsIndex::cPtsIndex(void)
 {
+  lastFound = 0;
   Clear();
 }
 
-void cBackTrace::Clear(void)
+void cPtsIndex::Clear(void)
 {
-  pos = num = 0;
+  cMutexLock MutexLock(&mutex);
+  w = r = 0;
 }
 
-void cBackTrace::Add(int Index, int Length)
+void cPtsIndex::Put(uint32_t Pts, int Index)
 {
-  index[pos] = Index;
-  length[pos] = Length;
-  if (++pos >= BACKTRACE_ENTRIES)
-     pos = 0;
-  if (num < BACKTRACE_ENTRIES)
-     num++;
+  cMutexLock MutexLock(&mutex);
+  pi[w].pts = Pts;
+  pi[w].index = Index;
+  w = (w + 1) % PTSINDEX_ENTRIES;
+  if (w == r)
+     r = (r + 1) % PTSINDEX_ENTRIES;
 }
 
-int cBackTrace::Get(bool Forward)
+int cPtsIndex::FindIndex(uint32_t Pts)
 {
-  int p = pos;
-  int n = num;
-  int l = DVB_BUF_SIZE + (Forward ? 0 : 256 * 1024); //XXX (256 * 1024) == DVB_BUF_SIZE ???
-  int i = -1;
-
-  while (n && l > 0) {
-        if (--p < 0)
-           p = BACKTRACE_ENTRIES - 1;
-        i = index[p] - 1;
-        l -= length[p];
-        n--;
-        }
-  return i;
+  cMutexLock MutexLock(&mutex);
+  if (w == r)
+     return lastFound; // list is empty, let's not jump way off the last known position
+  uint32_t Delta = 0xFFFFFFFF;
+  int Index = -1;
+  for (int i = w; i != r; ) {
+      if (--i < 0)
+         i = PTSINDEX_ENTRIES - 1;
+      uint32_t d = pi[i].pts < Pts ? Pts - pi[i].pts : pi[i].pts - Pts;
+      if (d > 0x7FFFFFFF)
+         d = 0xFFFFFFFF - d; // handle rollover
+      if (d < Delta) {
+         Delta = d;
+         Index = pi[i].index;
+         }
+      }
+  lastFound = Index;
+  return Index;
 }
 
 // --- cNonBlockingFileReader ------------------------------------------------
@@ -183,8 +193,8 @@ bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
 
 #define PLAYERBUFSIZE  MEGABYTE(1)
 
-// The number of seconds to back up when resuming an interrupted replay session:
-#define RESUMEBACKUP 10
+#define RESUMEBACKUP 10 // number of seconds to back up when resuming an interrupted replay session
+#define MAXSTUCKATEOF 3 // max. number of seconds to wait in case the device doesn't play the last frame
 
 class cDvbPlayer : public cPlayer, cThread {
 private:
@@ -193,7 +203,7 @@ class cDvbPlayer : public cPlayer, cThread {
   static int Speeds[];
   cNonBlockingFileReader *nonBlockingFileReader;
   cRingBufferFrame *ringBuffer;
-  cBackTrace *backTrace;
+  cPtsIndex ptsIndex;
   cFileName *fileName;
   cIndexFile *index;
   cUnbufferedFile *replayFile;
@@ -204,12 +214,13 @@ class cDvbPlayer : public cPlayer, cThread {
   ePlayModes playMode;
   ePlayDirs playDir;
   int trickSpeed;
-  int readIndex, writeIndex;
+  int readIndex;
+  bool readIndependent;
   cFrame *readFrame;
   cFrame *playFrame;
   void TrickSpeed(int Increment);
   void Empty(void);
-  bool NextFile(uchar FileNumber = 0, int FileOffset = -1);
+  bool NextFile(uint16_t FileNumber = 0, off_t FileOffset = -1);
   int Resume(void);
   bool Save(void);
 protected:
@@ -242,7 +253,6 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
 {
   nonBlockingFileReader = NULL;
   ringBuffer = NULL;
-  backTrace = NULL;
   index = NULL;
   cRecording Recording(FileName);
   framesPerSecond = Recording.FramesPerSecond();
@@ -252,7 +262,8 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   playMode = pmPlay;
   playDir = pdForward;
   trickSpeed = NORMAL_SPEED;
-  readIndex = writeIndex = -1;
+  readIndex = -1;
+  readIndependent = false;
   readFrame = NULL;
   playFrame = NULL;
   isyslog("replay %s", FileName);
@@ -269,17 +280,15 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
      delete index;
      index = NULL;
      }
-  backTrace = new cBackTrace;
 }
 
 cDvbPlayer::~cDvbPlayer()
 {
-  Detach();
   Save();
+  Detach();
   delete readFrame; // might not have been stored in the buffer in Action()
   delete index;
   delete fileName;
-  delete backTrace;
   delete ringBuffer;
 }
 
@@ -308,18 +317,18 @@ void cDvbPlayer::Empty(void)
   LOCK_THREAD;
   if (nonBlockingFileReader)
      nonBlockingFileReader->Clear();
-  if ((readIndex = backTrace->Get(playDir == pdForward)) < 0)
-     readIndex = writeIndex;
+  if (!firstPacket) // don't set the readIndex twice if Empty() is called more than once
+     readIndex = ptsIndex.FindIndex(DeviceGetSTC());
   delete readFrame; // might not have been stored in the buffer in Action()
   readFrame = NULL;
   playFrame = NULL;
   ringBuffer->Clear();
-  backTrace->Clear();
+  ptsIndex.Clear();
   DeviceClear();
   firstPacket = true;
 }
 
-bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset)
+bool cDvbPlayer::NextFile(uint16_t FileNumber, off_t FileOffset)
 {
   if (FileNumber > 0)
      replayFile = fileName->SetOffset(FileNumber, FileOffset);
@@ -346,7 +355,7 @@ int cDvbPlayer::Resume(void)
 bool cDvbPlayer::Save(void)
 {
   if (index) {
-     int Index = writeIndex;
+     int Index = ptsIndex.FindIndex(DeviceGetSTC());
      if (Index >= 0) {
         Index -= int(round(RESUMEBACKUP * framesPerSecond));
         if (Index > 0)
@@ -384,8 +393,12 @@ void cDvbPlayer::Action(void)
   int Length = 0;
   bool Sleep = false;
   bool WaitingForData = false;
+  time_t StuckAtEof = 0;
+  uint32_t LastStc = 0;
+  int LastReadIFrame = -1;
+  int SwitchToPlayFrame = 0;
 
-  while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) {
+  while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
         if (Sleep) {
            if (WaitingForData)
               nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
@@ -403,60 +416,47 @@ void cDvbPlayer::Action(void)
            if (playMode != pmStill && playMode != pmPause) {
               if (!readFrame && (replayFile || readIndex >= 0)) {
                  if (!nonBlockingFileReader->Reading()) {
-                    if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
+                    if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
                        uint16_t FileNumber;
                        off_t FileOffset;
                        bool TimeShiftMode = index->IsStillRecording();
                        int Index = -1;
+                       readIndependent = false;
                        if (DeviceHasIBPTrickSpeed() && playDir == pdForward) {
-                          if (index->Get(readIndex + 1, &FileNumber, &FileOffset, NULL, &Length))
+                          if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length))
                              Index = readIndex + 1;
                           }
                        else {
                           int d = int(round(0.4 * framesPerSecond));
                           if (playDir != pdForward)
                              d = -d;
-                          Index = index->GetNextIFrame(readIndex + d, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                          int NewIndex = readIndex + d;
+                          if (NewIndex <= 0 && readIndex > 0)
+                             NewIndex = 1; // make sure the very first frame is delivered
+                          NewIndex = index->GetNextIFrame(NewIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                          if (NewIndex < 0 && TimeShiftMode && playDir == pdForward)
+                             SwitchToPlayFrame = Index;
+                          Index = NewIndex;
+                          readIndependent = true;
                           }
                        if (Index >= 0) {
-                          if (!NextFile(FileNumber, FileOffset)) {
-                             readIndex = Index;
-                             continue;
-                             }
-                          }
-                       else {
-                          if (!TimeShiftMode && playDir == pdForward) {
-                             // hit end of recording: signal end of file but don't change playMode
-                             readIndex = -1;
-                             eof = true;
+                          readIndex = Index;
+                          if (!NextFile(FileNumber, FileOffset))
                              continue;
-                             }
-                          // hit begin of recording: wait for device buffers to drain
-                          // before changing play mode:
-                          if (!DeviceFlush(100))
-                             continue;
-                          // can't call Play() here, because those functions may only be
-                          // called from the foreground thread - and we also don't need
-                          // to empty the buffer here
-                          DevicePlay();
-                          playMode = pmPlay;
-                          playDir = pdForward;
-                          continue;
                           }
-                       readIndex = Index;
+                       else
+                          eof = true;
                        }
                     else if (index) {
                        uint16_t FileNumber;
                        off_t FileOffset;
-                       readIndex++;
-                       if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
-                          readIndex = -1;
+                       if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
+                          readIndex++;
+                       else
                           eof = true;
-                          continue;
-                          }
                        }
                     else // allows replay even if the index file is missing
-                       Length = MAXFRAMESIZE;
+                       Length = MAXFRAMESIZE / TS_SIZE * TS_SIZE;// FIXME: use a linear ringbuffer in this case, and fix cDevice::PlayPes()
                     if (Length == -1)
                        Length = MAXFRAMESIZE; // this means we read up to EOF (see cIndex)
                     else if (Length > MAXFRAMESIZE) {
@@ -465,19 +465,26 @@ void cDvbPlayer::Action(void)
                        }
                     b = MALLOC(uchar, Length);
                     }
-                 int r = nonBlockingFileReader->Read(replayFile, b, Length);
-                 if (r > 0) {
-                    WaitingForData = false;
-                    readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
-                    b = NULL;
-                    }
-                 else if (r == 0)
-                    eof = true;
-                 else if (r < 0 && errno == EAGAIN)
-                    WaitingForData = true;
-                 else if (r < 0 && FATALERRNO) {
-                    LOG_ERROR;
-                    break;
+                 if (!eof) {
+                    int r = nonBlockingFileReader->Read(replayFile, b, Length);
+                    if (r > 0) {
+                       WaitingForData = false;
+                       uint32_t Pts = 0;
+                       if (readIndependent) {
+                          Pts = isPesRecording ? PesGetPts(b) : TsGetPts(b, r);
+                          LastReadIFrame = readIndex;
+                          }
+                       readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts); // hands over b to the ringBuffer
+                       b = NULL;
+                       }
+                    else if (r == 0)
+                       eof = true;
+                    else if (r < 0 && errno == EAGAIN)
+                       WaitingForData = true;
+                    else if (r < 0 && FATALERRNO) {
+                       LOG_ERROR;
+                       break;
+                       }
                     }
                  }
 
@@ -506,6 +513,8 @@ void cDvbPlayer::Action(void)
                  p = playFrame->Data();
                  pc = playFrame->Count();
                  if (p) {
+                    if (playFrame->Index() >= 0)
+                       ptsIndex.Put(playFrame->Pts(), playFrame->Index());
                     if (firstPacket) {
                        if (isPesRecording) {
                           PlayPes(NULL, 0);
@@ -520,28 +529,57 @@ void cDvbPlayer::Action(void)
               if (p) {
                  int w;
                  if (isPesRecording)
-                    w = PlayPes(p, pc, playMode != pmPlay && DeviceIsPlayingVideo());
+                    w = PlayPes(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
                  else
-                    w = PlayTs(p, TS_SIZE, playMode != pmPlay && DeviceIsPlayingVideo());
+                    w = PlayTs(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
                  if (w > 0) {
                     p += w;
                     pc -= w;
                     }
-                 else if (w < 0 && FATALERRNO) {
+                 else if (w < 0 && FATALERRNO)
                     LOG_ERROR;
-                    break;
-                    }
                  }
               if (pc <= 0) {
-                 writeIndex = playFrame->Index();
-                 backTrace->Add(playFrame->Index(), playFrame->Count());
-                 ringBuffer->Drop(playFrame);
+                 if (!eof || (playDir != pdForward && playFrame->Index() > 0) || (playDir == pdForward && playFrame->Index() < readIndex))
+                    ringBuffer->Drop(playFrame); // the very first and last frame are continously repeated to flush data through the device
                  playFrame = NULL;
                  p = NULL;
                  }
               }
            else
               Sleep = true;
+
+           // Handle hitting begin/end of recording:
+
+           if (eof || SwitchToPlayFrame) {
+              bool SwitchToPlay = false;
+              uint32_t Stc = DeviceGetSTC();
+              if (Stc != LastStc)
+                 StuckAtEof = 0;
+              else if (!StuckAtEof)
+                 StuckAtEof = time(NULL);
+              else if (time(NULL) - StuckAtEof > MAXSTUCKATEOF) {
+                 if (playDir == pdForward)
+                    break; // automatically stop at end of recording
+                 SwitchToPlay = true;
+                 }
+              LastStc = Stc;
+              int Index = ptsIndex.FindIndex(Stc);
+              if (playDir == pdForward && !SwitchToPlayFrame) {
+                 if (Index >= LastReadIFrame)
+                    break; // automatically stop at end of recording
+                 }
+              else if (Index <= 0 || SwitchToPlayFrame && Index >= SwitchToPlayFrame)
+                 SwitchToPlay = true;
+              if (SwitchToPlay) {
+                 if (!SwitchToPlayFrame)
+                    Empty();
+                 DevicePlay();
+                 playMode = pmPlay;
+                 playDir = pdForward;
+                 SwitchToPlayFrame = 0;
+                 }
+              }
            }
         }
 
@@ -614,6 +652,7 @@ void cDvbPlayer::Forward(void)
                Pause();
                break;
                }
+            Empty();
             // run into pmPause
        case pmStill:
        case pmPause:
@@ -661,6 +700,7 @@ void cDvbPlayer::Backward(void)
                Pause();
                break;
                }
+            Empty();
             // run into pmPause
        case pmStill:
        case pmPause: {
@@ -696,14 +736,14 @@ void cDvbPlayer::SkipSeconds(int Seconds)
 {
   if (index && Seconds) {
      LOCK_THREAD;
+     int Index = ptsIndex.FindIndex(DeviceGetSTC());
      Empty();
-     int Index = writeIndex;
      if (Index >= 0) {
         Index = max(Index + SecondsToFrames(Seconds, framesPerSecond), 0);
         if (Index > 0)
            Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
         if (Index >= 0)
-           readIndex = writeIndex = Index - 1; // Action() will first increment it!
+           readIndex = Index - 1; // Action() will first increment it!
         }
      Play();
      }
@@ -727,25 +767,22 @@ void cDvbPlayer::Goto(int Index, bool Still)
            if (playMode == pmPause)
               DevicePlay();
            DeviceStillPicture(b, r);
+           ptsIndex.Put(isPesRecording ? PesGetPts(b) : TsGetPts(b, r), Index);
            }
         playMode = pmStill;
         }
-     readIndex = writeIndex = Index;
+     readIndex = Index;
      }
 }
 
 bool cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
-     if (playMode == pmStill)
-        Current = max(readIndex, 0);
-     else {
-        Current = max(writeIndex, 0);
-        if (SnapToIFrame) {
-           int i1 = index->GetNextIFrame(Current + 1, false);
-           int i2 = index->GetNextIFrame(Current, true);
-           Current = (abs(Current - i1) <= abs(Current - i2)) ? i1 : i2;
-           }
+     Current = ptsIndex.FindIndex(DeviceGetSTC());
+     if (SnapToIFrame) {
+        int i1 = index->GetNextIFrame(Current + 1, false);
+        int i2 = index->GetNextIFrame(Current, true);
+        Current = (abs(Current - i1) <= abs(Current - i2)) ? i1 : i2;
         }
      Total = index->Last();
      return true;
diff --git a/eit.c b/eit.c
index 774b66713..b78c11796 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.2 2008/05/01 15:33:27 kls Exp $
+ * $Id: eit.c 2.3 2009/04/11 10:03:24 kls Exp $
  */
 
 #include "eit.h"
@@ -42,20 +42,25 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   bool HasExternalData = false;
   time_t SegmentStart = 0;
   time_t SegmentEnd = 0;
+  time_t Now = time(NULL);
+  struct tm tm_r;
+  struct tm t = *localtime_r(&Now, &tm_r); // this initializes the time zone in 't'
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
       bool ExternalData = false;
+      int StartTime = SiEitEvent.getStartTime();
+      int Duration = SiEitEvent.getDuration();
       // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
-      if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getStartTime() > 0 && SiEitEvent.getDuration() == 0)
+      if (StartTime == 0 || StartTime > 0 && Duration == 0)
          continue;
       Empty = false;
       if (!SegmentStart)
-         SegmentStart = SiEitEvent.getStartTime();
-      SegmentEnd = SiEitEvent.getStartTime() + SiEitEvent.getDuration();
+         SegmentStart = StartTime;
+      SegmentEnd = StartTime + Duration;
       cEvent *newEvent = NULL;
       cEvent *rEvent = NULL;
-      cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), SiEitEvent.getStartTime());
+      cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), StartTime);
       if (!pEvent) {
          if (OnlyRunningStatus)
             continue;
@@ -70,14 +75,15 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          pEvent->SetSeen();
          // If the existing event has a zero table ID it was defined externally and shall
          // not be overwritten.
-         if (pEvent->TableID() == 0x00) {
+         uchar TableID = pEvent->TableID();
+         if (TableID == 0x00) {
             if (pEvent->Version() == getVersionNumber())
                continue;
             HasExternalData = ExternalData = true;
             }
          // If the new event has a higher table ID, let's skip it.
          // The lower the table ID, the more "current" the information.
-         else if (Tid > pEvent->TableID())
+         else if (Tid > TableID)
             continue;
          // If the new event comes from the same table and has the same version number
          // as the existing one, let's skip it to avoid unnecessary work.
@@ -85,14 +91,14 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          // the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on
          // each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned
          // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
-         else if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
+         else if (Tid == TableID && pEvent->Version() == getVersionNumber())
             continue;
          }
       if (!ExternalData) {
          pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
          pEvent->SetTableID(Tid);
-         pEvent->SetStartTime(SiEitEvent.getStartTime());
-         pEvent->SetDuration(SiEitEvent.getDuration());
+         pEvent->SetStartTime(StartTime);
+         pEvent->SetDuration(Duration);
          }
       if (newEvent)
          pSchedule->AddEvent(newEvent);
@@ -148,9 +154,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  break;
             case SI::PDCDescriptorTag: {
                  SI::PDCDescriptor *pd = (SI::PDCDescriptor *)d;
-                 time_t now = time(NULL);
-                 struct tm tm_r;
-                 struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
                  t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
                  int month = t.tm_mon;
                  t.tm_mon = pd->getMonth() - 1;
@@ -183,8 +186,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d;
                  tChannelID linkID(Source, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
                  if (ld->getLinkageType() == 0xB0) { // Premiere World
-                    time_t now = time(NULL);
-                    bool hit = SiEitEvent.getStartTime() <= now && now < SiEitEvent.getStartTime() + SiEitEvent.getDuration();
+                    bool hit = StartTime <= Now && Now < StartTime + Duration;
                     if (hit) {
                        char linkName[ld->privateData.getLength() + 1];
                        strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
@@ -260,11 +262,12 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          channel->SetLinkChannels(LinkChannels);
       Modified = true;
       }
-  if (Empty && Tid == 0x4E && getSectionNumber() == 0)
-     // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
-     pSchedule->ClrRunningStatus(channel);
-  if (Tid == 0x4E)
+  if (Tid == 0x4E) {
+     if (Empty && getSectionNumber() == 0)
+        // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
+        pSchedule->ClrRunningStatus(channel);
      pSchedule->SetPresentSeen();
+     }
   if (OnlyRunningStatus)
      return;
   if (Modified) {
diff --git a/menuitems.c b/menuitems.c
index 82d50821b..6702384cc 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.2 2008/12/13 11:35:31 kls Exp $
+ * $Id: menuitems.c 2.3 2009/04/05 10:15:12 kls Exp $
  */
 
 #include "menuitems.h"
@@ -271,9 +271,9 @@ cMenuEditStrItem::cMenuEditStrItem(const char *Name, char *Value, int Length, co
 
 cMenuEditStrItem::~cMenuEditStrItem()
 {
-  delete valueUtf8;
-  delete allowedUtf8;
-  delete charMapUtf8;
+  delete[] valueUtf8;
+  delete[] allowedUtf8;
+  delete[] charMapUtf8;
 }
 
 void cMenuEditStrItem::EnterEditMode(void)
diff --git a/osd.c b/osd.c
index 32614d875..d8e511265 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.1 2009/01/16 14:34:32 kls Exp $
+ * $Id: osd.c 2.2 2009/04/05 10:17:25 kls Exp $
  */
 
 #include "osd.h"
@@ -24,6 +24,10 @@ cPalette::cPalette(int Bpp)
   SetAntiAliasGranularity(10, 10);
 }
 
+cPalette::~cPalette()
+{
+}
+
 void cPalette::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
 {
   if (FixedColors >= MAXNUMCOLORS || BlendColors == 0)
diff --git a/osd.h b/osd.h
index addbf0ecc..769095273 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.1 2009/01/16 14:37:03 kls Exp $
+ * $Id: osd.h 2.2 2009/04/05 10:16:05 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -62,6 +62,7 @@ class cPalette {
 public:
   cPalette(int Bpp = 8);
         ///< Initializes the palette with the given color depth.
+  virtual ~cPalette();
   void SetAntiAliasGranularity(uint FixedColors, uint BlendColors);
         ///< Allows the system to optimize utilization of the limited color
         ///< palette entries when generating blended colors for anti-aliasing.
diff --git a/player.h b/player.h
index d252c5747..77d00d5ef 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 2.3 2009/01/25 11:03:44 kls Exp $
+ * $Id: player.h 2.4 2009/03/08 12:29:10 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -34,6 +34,7 @@ class cPlayer {
   void DeviceMute(void) { if (device) device->Mute(); }
   void DeviceSetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat) { if (device) device->SetVideoDisplayFormat(VideoDisplayFormat); }
   void DeviceStillPicture(const uchar *Data, int Length) { if (device) device->StillPicture(Data, Length); }
+  uint64_t DeviceGetSTC(void) { return device ? device->GetSTC() : -1; }
   void Detach(void);
   virtual void Activate(bool On) {}
        // This function is called right after the cPlayer has been attached to
diff --git a/plugin.c b/plugin.c
index 848e84303..240d4b481 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 2.0 2008/02/17 13:32:12 kls Exp $
+ * $Id: plugin.c 2.1 2009/04/05 10:16:48 kls Exp $
  */
 
 #include "plugin.h"
@@ -137,6 +137,7 @@ void cPlugin::RegisterI18n(const void *)
 
 void cPlugin::SetConfigDirectory(const char *Dir)
 {
+  free(configDirectory);
   configDirectory = strdup(Dir);
 }
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 944b80db2..9b6d2fd06 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,18 +12,21 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
 "POT-Creation-Date: 2008-12-14 16:10+0100\n"
-"PO-Revision-Date: 2008-08-25 02:36+0100\n"
+"PO-Revision-Date: 2009-02-08 18:58+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 msgid "off"
 msgstr "off"
 
 msgid "on"
-msgstr ""
+msgstr "on"
 
 msgid "auto"
 msgstr "automatico"
@@ -58,7 +61,7 @@ msgid "Phase 1: Detecting RC code type"
 msgstr "Fase 1: Rilevamento tipo codice RC"
 
 msgid "Press any key on the RC unit"
-msgstr "Premi un tasto dell'unit� RC"
+msgstr "Premi un tasto dell'unità RC"
 
 msgid "RC code detected!"
 msgstr "Codice RC rilevato!"
@@ -77,13 +80,13 @@ msgid "Press 'Up' to confirm"
 msgstr "Premi 'Su' per confermare"
 
 msgid "Press 'Down' to continue"
-msgstr "Premi 'Gi�' per continuare"
+msgstr "Premi 'Giù' per continuare"
 
 msgid "(press 'Up' to go back)"
 msgstr "(premi 'Su' per tornare indietro)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(premi 'Gi�' per concludere definizione tasti)"
+msgstr "(premi 'Giù' per concludere definizione tasti)"
 
 msgid "(press 'Menu' to skip this key)"
 msgstr "(premi 'Menu' per saltare questo tasto)"
@@ -95,13 +98,13 @@ msgid "Phase 3: Saving key codes"
 msgstr "Fase 3: Salvataggio codici tasti"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Premi 'Su' per salvare, 'Gi�' per annullare"
+msgstr "Premi 'Su' per salvare, 'Giù' per annullare"
 
 msgid "Key$Up"
 msgstr "Su"
 
 msgid "Key$Down"
-msgstr "Gi�"
+msgstr "Giù"
 
 msgid "Key$Menu"
 msgstr "Menu"
@@ -290,7 +293,7 @@ msgid "Polarization"
 msgstr "Polarizzazione"
 
 msgid "System"
-msgstr ""
+msgstr "Sistema"
 
 msgid "Srate"
 msgstr "SymbolRate"
@@ -320,7 +323,7 @@ msgid "Hierarchy"
 msgstr "Gerarchia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
@@ -368,7 +371,7 @@ msgid "VPS"
 msgstr "VPS"
 
 msgid "Priority"
-msgstr "Priorit�"
+msgstr "Priorità"
 
 msgid "Lifetime"
 msgstr "Scadenza"
@@ -377,7 +380,7 @@ msgid "File"
 msgstr "Nome"
 
 msgid "First day"
-msgstr "1� giorno"
+msgstr "1° giorno"
 
 msgid "Timers"
 msgstr "Timer"
@@ -682,10 +685,10 @@ msgid "CAM reset"
 msgstr "Reimposta la CAM"
 
 msgid "CAM present"
-msgstr "La CAM � presente"
+msgstr "La CAM è presente"
 
 msgid "CAM ready"
-msgstr "La CAM � pronta"
+msgstr "La CAM è pronta"
 
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
@@ -703,7 +706,7 @@ msgid "Can't open CAM menu!"
 msgstr "Impossibile aprire il menu CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr "La CAM � in uso - vuoi reimpostarla?"
+msgstr "La CAM è in uso - vuoi reimpostarla?"
 
 msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
@@ -721,13 +724,13 @@ msgid "Setup.Recording$Primary limit"
 msgstr "Limite primario"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Priorit� predefinita"
+msgstr "Priorità predefinita"
 
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Scadenza predefinita (gg)"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorit� di pausa"
+msgstr "Priorità di pausa"
 
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Scadenza pausa (gg)"
@@ -760,10 +763,10 @@ msgid "Replay"
 msgstr "Riproduzione"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Modalit� multispeed"
+msgstr "Modalità multispeed"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Mostra modalit� riproduzione"
+msgstr "Mostra modalità riproduzione"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
@@ -775,7 +778,7 @@ msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Scadenza min. evento (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Periodo min. inattivit� (min)"
+msgstr "Periodo min. inattività (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Scadenza SVDRP (s)"
@@ -884,16 +887,16 @@ msgid "Editing process started"
 msgstr "Processo di modifica avviato"
 
 msgid "Editing process already active!"
-msgstr "Processo di modifica gi� attivo!"
+msgstr "Processo di modifica già attivo!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a��bcde��fghi��jklmno�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&�"
+msgstr " aáàbcdeéèfghiìîjklmnoòpqrstuùvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&°"
 
 msgid "yes"
-msgstr "s�"
+msgstr "sì"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+�?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno�6\tpqrs7\ttu�v8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+°?{}/:%@&\taàbc2\tdeèf3\tghiì4\tjkl5\tmnoò6\tpqrs7\ttuùv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -908,7 +911,7 @@ msgid "Plugin"
 msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Su/Gi� per nuova posizione - OK per spostare"
+msgstr "Su/Giù per nuova posizione - OK per spostare"
 
 msgid "Channel locked (recording)!"
 msgstr "Canale bloccato (in registrazione)!"
@@ -964,19 +967,19 @@ msgid "MonTueWedThuFriSatSun"
 msgstr "LunMarMerGioVenSabDom"
 
 msgid "Monday"
-msgstr "Luned�"
+msgstr "Lunedì"
 
 msgid "Tuesday"
-msgstr "Marted�"
+msgstr "Martedì"
 
 msgid "Wednesday"
-msgstr "Mercoled�"
+msgstr "Mercoledì"
 
 msgid "Thursday"
-msgstr "Gioved�"
+msgstr "Giovedì"
 
 msgid "Friday"
-msgstr "Venerd�"
+msgstr "Venerdì"
 
 msgid "Saturday"
 msgstr "Sabato"
@@ -991,7 +994,7 @@ msgid "Recording started"
 msgstr "Registrazione avviata"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR si spegner� pi� tardi - premi Power per forzare"
+msgstr "VDR si spegnerà più tardi - premi Power per forzare"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Premi un tasto per annullare lo spegnimento"
@@ -1010,4 +1013,4 @@ msgstr "Premi un tasto per annullare il riavvio"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR si spegner� tra %s minuti"
+msgstr "VDR si spegnerà tra %s minuti"
diff --git a/recorder.c b/recorder.c
index 7e41c8d0e..d8f22ce19 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.2 2009/01/23 15:33:37 kls Exp $
+ * $Id: recorder.c 2.3 2009/03/20 15:49:02 kls Exp $
  */
 
 #include "recorder.h"
@@ -113,7 +113,6 @@ void cRecorder::Receive(uchar *Data, int Length)
 void cRecorder::Action(void)
 {
   time_t t = time(NULL);
-  bool Synced = false;
   bool InfoWritten = false;
   while (Running()) {
         int r;
@@ -123,7 +122,7 @@ void cRecorder::Action(void)
            if (Count) {
               if (!Running() && frameDetector->IndependentFrame()) // finish the recording before the next independent frame
                  break;
-              if (Synced |= frameDetector->IndependentFrame()) { // start with first independent frame
+              if (frameDetector->Synced()) {
                  if (!InfoWritten) {
                     if (recordingInfo.Read()) {
                        if (frameDetector->FramesPerSecond() > 0 && recordingInfo.FramesPerSecond() != frameDetector->FramesPerSecond()) {
diff --git a/recording.c b/recording.c
index 9c7db99fa..2b44b1a46 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.8 2009/01/24 13:11:04 kls Exp $
+ * $Id: recording.c 2.9 2009/01/30 16:27:19 kls Exp $
  */
 
 #include "recording.h"
@@ -286,6 +286,7 @@ bool cResumeFile::Save(int Index)
         if (f) {
            fprintf(f, "I %d\n", Index);
            fclose(f);
+           Recordings.ResetResume(fileName);
            }
         else
            LOG_ERROR_STR(fileName);
diff --git a/recording.h b/recording.h
index 5256a8ee4..151e76029 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.4 2009/01/24 15:24:19 kls Exp $
+ * $Id: recording.h 2.5 2009/02/28 10:50:12 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -60,6 +60,7 @@ class cRecordingInfo {
   ~cRecordingInfo();
   tChannelID ChannelID(void) const { return channelID; }
   const char *ChannelName(void) const { return channelName; }
+  const cEvent *GetEvent(void) const { return event; }
   const char *Title(void) const { return event->Title(); }
   const char *ShortText(void) const { return event->ShortText(); }
   const char *Description(void) const { return event->Description(); }
diff --git a/remux.c b/remux.c
index b00862142..89fe85d41 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.13 2009/01/24 13:44:45 kls Exp $
+ * $Id: remux.c 2.17 2009/04/05 14:07:48 kls Exp $
  */
 
 #include "remux.h"
@@ -109,6 +109,21 @@ void cRemux::SetBrokenLink(uchar *Data, int Length)
      dsyslog("SetBrokenLink: no video packet in frame");
 }
 
+// --- Some TS handling tools ------------------------------------------------
+
+int64_t TsGetPts(const uchar *p, int l)
+{
+  // Find the first packet with a PTS and use it:
+  while (l > 0) {
+        const uchar *d = p;
+        if (TsPayloadStart(d) && TsGetPayload(&d) && PesHasPts(d))
+           return PesGetPts(d);
+        p += TS_SIZE;
+        l -= TS_SIZE;
+        }
+  return -1;
+}
+
 // --- cPatPmtGenerator ------------------------------------------------------
 
 cPatPmtGenerator::cPatPmtGenerator(cChannel *Channel)
@@ -661,111 +676,163 @@ cFrameDetector::cFrameDetector(int Pid, int Type)
 {
   pid = Pid;
   type = Type;
+  synced = false;
   newFrame = independentFrame = false;
-  lastPts = 0;
+  numPtsValues = 0;
+  numIFrames = 0;
   isVideo = type == 0x02 || type == 0x1B; // MPEG 2 or MPEG 4
   frameDuration = 0;
-  framesPerPayloadUnit = 0;
+  framesInPayloadUnit = framesPerPayloadUnit = 0;
+  payloadUnitOfFrame = 0;
   scanning = false;
   scanner = 0;
 }
 
+static int CmpUint32(const void *p1, const void *p2)
+{
+  if (*(uint32_t *)p1 < *(uint32_t *)p2) return -1;
+  if (*(uint32_t *)p1 > *(uint32_t *)p2) return  1;
+  return 0;
+}
+
 int cFrameDetector::Analyze(const uchar *Data, int Length)
 {
+  int Processed = 0;
   newFrame = independentFrame = false;
-  if (Length >= TS_SIZE) {
-     if (TsHasPayload(Data) && !TsIsScrambled(Data) && TsPid(Data) == pid) {
-        if (TsPayloadStart(Data)) {
-           if (!frameDuration) {
-              const uchar *Pes = Data + TsPayloadOffset(Data);
-              if (PesHasPts(Pes)) {
-                 int64_t Pts = PesGetPts(Pes);
-                 if (Pts < lastPts) { // avoid wrapping
-                    lastPts = 0;
-                    framesPerPayloadUnit = 0;
+  while (Length >= TS_SIZE) {
+        if (TsHasPayload(Data) && !TsIsScrambled(Data) && TsPid(Data) == pid) {
+           if (TsPayloadStart(Data)) {
+              if (!frameDuration) {
+                 // frame duration unknown, so collect a sequenece of PTS values:
+                 if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
+                    const uchar *Pes = Data + TsPayloadOffset(Data);
+                    if (PesHasPts(Pes)) {
+                       ptsValues[numPtsValues] = PesGetPts(Pes);
+                       // check for rollover:
+                       if (numPtsValues && ptsValues[numPtsValues - 1] > 0xF0000000 && ptsValues[numPtsValues] < 0x10000000) {
+                          dbgframes("#");
+                          numPtsValues = 0;
+                          numIFrames = 0;
+                          }
+                       else
+                          numPtsValues++;
+                       }
                     }
-                 if ((!lastPts || !framesPerPayloadUnit) && Pts != lastPts)
-                    lastPts = Pts;
                  else {
-                    int64_t Delta = Pts - lastPts;
+                    // find the smallest PTS delta:
+                    qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
+                    numPtsValues--;
+                    for (int i = 0; i < numPtsValues; i++)
+                        ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
+                    qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
+                    uint32_t Delta = ptsValues[0];
+                    // determine frame info:
                     if (isVideo) {
                        if (Delta % 3600 == 0)
                           frameDuration = 3600; // PAL, 25 fps
                        else if (Delta % 3003 == 0)
                           frameDuration = 3003; // NTSC, 29.97 fps
+                       else if (Delta == 1501) {
+                          frameDuration = 3003; // NTSC, 29.97 fps
+                          framesPerPayloadUnit = -2;
+                          }
                        else {
                           frameDuration = 3600; // unknown, assuming 25 fps
-                          dsyslog("unknown frame duration, assuming 25 fps (PTS: %lld - %lld = %lld  FPPU = %d)\n", Pts, lastPts, Delta, framesPerPayloadUnit);
+                          dsyslog("unknown frame duration (%d), assuming 25 fps", Delta);
                           }
                        }
                     else // audio
                        frameDuration = Delta; // PTS of audio frames is always increasing
-                    dbgframes("PTS: %lld - %lld = %lld -> FD = %d  FPS = %5.2f  FPPU = %d\n", Pts, lastPts, Delta, frameDuration, 90000.0 / frameDuration, framesPerPayloadUnit);
+                    dbgframes("\nframe duration = %d  FPS = %5.2f  FPPU = %d\n", frameDuration, 90000.0 / frameDuration, framesPerPayloadUnit);
                     }
                  }
+              scanner = 0;
+              scanning = true;
               }
-           scanner = 0;
-           scanning = true;
-           }
-        if (scanning) {
-           int PayloadOffset = TsPayloadOffset(Data);
-           if (TsPayloadStart(Data))
-              PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
-           for (int i = PayloadOffset; i < TS_SIZE; i++) {
-               scanner <<= 8;
-               scanner |= Data[i];
-               switch (type) {
-                 case 0x02: // MPEG 2 video
-                      if (scanner == 0x00000100) { // Picture Start Code
-                         if (frameDuration) {
+           if (scanning) {
+              int PayloadOffset = TsPayloadOffset(Data);
+              if (TsPayloadStart(Data)) {
+                 PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
+                 if (!framesPerPayloadUnit)
+                    framesPerPayloadUnit = framesInPayloadUnit;
+                 if (DebugFrames && !synced)
+                    dbgframes("/");
+                 }
+              for (int i = PayloadOffset; scanning && i < TS_SIZE; i++) {
+                  scanner <<= 8;
+                  scanner |= Data[i];
+                  switch (type) {
+                    case 0x02: // MPEG 2 video
+                         if (scanner == 0x00000100) { // Picture Start Code
+                            if (synced && Processed)
+                               return Processed;
                             newFrame = true;
                             independentFrame = ((Data[i + 2] >> 3) & 0x07) == 1; // I-Frame
-                            if (framesPerPayloadUnit == 1) {
-                               scanning = false;
-                               return TS_SIZE;
+                            if (synced) {
+                               if (framesPerPayloadUnit <= 1)
+                                  scanning = false;
                                }
+                            else {
+                               framesInPayloadUnit++;
+                               if (independentFrame)
+                                  numIFrames++;
+                               dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
+                               }
+                            scanner = 0;
                             }
-                         else {
-                            framesPerPayloadUnit++;
-                            dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
-                            }
-                         scanner = 0;
-                         }
-                      break;
-                 case 0x1B: // MPEG 4 video
-                      if (scanner == 0x00000109) { // Access Unit Delimiter
-                         if (frameDuration) {
+                         break;
+                    case 0x1B: // MPEG 4 video
+                         if (scanner == 0x00000109) { // Access Unit Delimiter
+                            if (synced && Processed)
+                               return Processed;
                             newFrame = true;
                             independentFrame = Data[i + 1] == 0x10;
-                            if (framesPerPayloadUnit == 1) {
-                               scanning = false;
-                               return TS_SIZE;
+                            if (synced) {
+                               if (framesPerPayloadUnit < 0) {
+                                  payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
+                                  if (payloadUnitOfFrame != 0 && independentFrame)
+                                     payloadUnitOfFrame = 0;
+                                  if (payloadUnitOfFrame)
+                                     newFrame = false;
+                                  }
+                               if (framesPerPayloadUnit <= 1)
+                                  scanning = false;
                                }
+                            else {
+                               framesInPayloadUnit++;
+                               if (independentFrame)
+                                  numIFrames++;
+                               dbgframes("%02X ", Data[i + 1]);
+                               }
+                            scanner = 0;
                             }
-                         else {
-                            framesPerPayloadUnit++;
-                            dbgframes("%02X ", Data[i + 1]);
-                            }
-                         scanner = 0;
-                         }
-                      break;
-                 case 0x04: // MPEG audio
-                 case 0x06: // AC3 audio
-                      if (frameDuration) {
+                         break;
+                    case 0x04: // MPEG audio
+                    case 0x06: // AC3 audio
+                         if (synced && Processed)
+                            return Processed;
                          newFrame = true;
                          independentFrame = true;
+                         if (!synced) {
+                            framesInPayloadUnit = 1;
+                            if (TsPayloadStart(Data))
+                               numIFrames++;
+                            }
                          scanning = false;
-                         }
-                      else
-                         framesPerPayloadUnit = 1;
-                      break;
-                 default: esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
-                          pid = 0; // let's just ignore any further data
+                         break;
+                    default: esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
+                             pid = 0; // let's just ignore any further data
+                    }
+                  }
+              if (!synced && frameDuration && independentFrame) {
+                 synced = true;
+                 dbgframes("*");
                  }
-               }
+              }
            }
+        Data += TS_SIZE;
+        Length -= TS_SIZE;
+        Processed += TS_SIZE;
         }
-     return TS_SIZE;
-     }
-  return 0;
+  return Processed;
 }
diff --git a/remux.h b/remux.h
index 8cb1223a2..ccb38821c 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.7 2009/01/24 13:38:10 kls Exp $
+ * $Id: remux.h 2.9 2009/03/27 13:38:59 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -101,6 +101,10 @@ inline int TsGetAdaptationField(const uchar *p)
   return TsHasAdaptationField(p) ? p[5] : 0x00;
 }
 
+// The following functions all take a pointer to a sequence of complete TS packets.
+
+int64_t TsGetPts(const uchar *p, int l);
+
 // Some PES handling tools:
 // The following functions that take a pointer to PES data all assume that
 // there is enough data so that PesLongEnough() returns true.
@@ -263,14 +267,22 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 class cFrameDetector {
 private:
+  enum { MaxPtsValues = 150 };
   int pid;
   int type;
+  bool synced;
   bool newFrame;
   bool independentFrame;
-  int64_t lastPts;
+  uint32_t ptsValues[MaxPtsValues]; // 32 bit is enough - we only need the delta
+  int numPtsValues;
+  int numIFrames;
   bool isVideo;
   int frameDuration;
-  int framesPerPayloadUnit;
+  int framesInPayloadUnit;
+  int framesPerPayloadUnit; // Some broadcasters send one frame per payload unit (== 1),
+                            // some put an entire GOP into one payload unit (> 1), and
+                            // some spread a single frame over several payload units (< 0).
+  int payloadUnitOfFrame;
   bool scanning;
   uint32_t scanner;
 public:
@@ -278,10 +290,11 @@ class cFrameDetector {
   int Analyze(const uchar *Data, int Length);
       ///< Analyzes the TS packets pointed to by Data. Length is the number of
       ///< bytes Data points to, and must be a multiple of 188.
-      ///< Returns the number of bytes that have been analyzed and may be written
-      ///< to the recording file. If the return value is 0, the data was not
-      ///< sufficient for analyzing and Analyze() needs to be called again with
-      ///< more actual data.
+      ///< Returns the number of bytes that have been analyzed.
+      ///< If the return value is 0, the data was not sufficient for analyzing and
+      ///< Analyze() needs to be called again with more actual data.
+  bool Synced(void) { return synced; }
+      ///< Returns true if the frame detector has synced on the data stream.
   bool NewFrame(void) { return newFrame; }
       ///< Returns true if the data given to the last call to Analyze() started a
       ///< new frame.
diff --git a/ringbuffer.c b/ringbuffer.c
index e825b8309..a9912ff67 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 2.0 2007/11/17 13:49:34 kls Exp $
+ * $Id: ringbuffer.c 2.1 2009/02/24 11:32:14 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -335,11 +335,12 @@ void cRingBufferLinear::Del(int Count)
 
 // --- cFrame ----------------------------------------------------------------
 
-cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index)
+cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index, uint32_t Pts)
 {
   count = abs(Count);
   type = Type;
   index = Index;
+  pts = Pts;
   if (Count < 0)
      data = (uchar *)Data;
   else {
diff --git a/ringbuffer.h b/ringbuffer.h
index 012731605..e470db9b8 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 2.0 2007/11/17 13:49:34 kls Exp $
+ * $Id: ringbuffer.h 2.1 2009/02/24 11:31:32 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -108,8 +108,9 @@ class cFrame {
   int count;
   eFrameType type;
   int index;
+  uint32_t pts;
 public:
-  cFrame(const uchar *Data, int Count, eFrameType = ftUnknown, int Index = -1);
+  cFrame(const uchar *Data, int Count, eFrameType = ftUnknown, int Index = -1, uint32_t Pts = 0);
     ///< Creates a new cFrame object.
     ///< If Count is negative, the cFrame object will take ownership of the given
     ///< Data. Otherwise it will allocate Count bytes of memory and copy Data.
@@ -118,6 +119,7 @@ class cFrame {
   int Count(void) const { return count; }
   eFrameType Type(void) const { return type; }
   int Index(void) const { return index; }
+  uint32_t Pts(void) const { return pts; }
   };
 
 class cRingBufferFrame : public cRingBuffer {
diff --git a/vdr.c b/vdr.c
index 34ad856f3..36942a51a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 2.4 2009/01/18 11:02:37 kls Exp $
+ * $Id: vdr.c 2.7 2009/04/05 13:21:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -112,10 +112,10 @@ static bool SetUser(const char *UserName, bool UserDump)//XXX name?
   return true;
 }
 
-static bool SetCapSysTime(void)
+static bool DropCaps(void)
 {
-  // drop all capabilities except cap_sys_time
-  cap_t caps = cap_from_text("= cap_sys_time=ep");
+  // drop all capabilities except selected ones
+  cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time=ep");
   if (!caps) {
      fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
      return false;
@@ -387,7 +387,7 @@ int main(int argc, char *argv[])
            return 2;
         if (!SetKeepCaps(false))
            return 2;
-        if (!SetCapSysTime())
+        if (!DropCaps())
            return 2;
         }
      }
@@ -416,6 +416,7 @@ int main(int argc, char *argv[])
                "                           existing directory, without any \"..\", double '/'\n"
                "                           or symlinks (default: none, same as -g-)\n"
                "  -h,       --help         print this help and exit\n"
+               "  -i ID,    --instance=ID  use ID as the id of this VDR instance (default: 0)\n"
                "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                "                           0 = no logging, 1 = errors only,\n"
                "                           2 = errors and info, 3 = errors, info and debug\n"
@@ -533,6 +534,7 @@ int main(int argc, char *argv[])
      isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
      cCharSetConv::SetSystemCharacterTable(CodeSet);
      }
+  setlocale(LC_NUMERIC, "C"); // makes sure any floating point numbers written use a decimal point
 
   // Initialize internationalization:
 

From 733a2becc44a02daf10b97d24b8a9c8b00de3964 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 26 Apr 2009 12:19:00 +0200
Subject: [PATCH 192/307] Version 1.7.6 - cDevice::PlayTs() now syncs on the TS
 packet sync bytes. - Made MAXFRAMESIZE a multiple of TS_SIZE to avoid
 breaking up TS packets. - No longer resetting the patPmtParser in
 cDevice::PlayTs(), because this   caused the selected audio and subtitle
 tracks to fall back to the default. - The SVDRP command PUTE now supports
 reading the EPG data from a given file   (thanks to Helmut Auer). - Added
 cThread::SetIOPriority() and using it in cRemoveDeletedRecordingsThread  
 (thanks to Rolf Ahrenberg). - Fixed the MEGABYTE() macro to make it correctly
 handle parameters resulting in   values larger than 2GB. - Added
 cDevice::NumProvidedSystems() to PLUGINS.html (was missing since it had  
 been implemented). - Fixed distortions when switching to the next file during
 replay. - Fixed detecting the frame rate for streams with PTS distances of
 1800, which   apparently split one frame over two payload units. - Added
 missing 'const' to cRecording::FramesPerSecond() (thanks to Joachim Wilke). -
 Any TS packets in the first "frame" after a cut in an edited recording that
 don't   belong to a payload unit that started in that frame now get their TEI
 flag set,   so that a decoder will ignore them together with any PES data
 collected for that   PID so far (thanks to Oliver Endriss for reporting
 chirping sound disturbences at   editing points in TS recordings). -
 cDvbPlayer::Empty() subtracts 1 from readIndex, because Action() will first  
 increment it. - Only storing non-zero Pts values in ptsIndex. - Added a note
 to the INSTALL file about using subdirectories to split a large   disk into
 separate areas for VDR's video data and other stuff (suggested by   Udo
 Richter).

---
 CONTRIBUTORS |   6 +
 HISTORY      |  30 +++++
 INSTALL      |   9 +-
 PLUGINS.html |   3 +
 channels.c   |   6 +-
 config.h     |  10 +-
 cutter.c     |  10 +-
 device.c     |  16 ++-
 dvbplayer.c  | 368 ++++++++++++++++++++++++++-------------------------
 recording.c  |   3 +-
 recording.h  |   6 +-
 remux.c      |  28 +++-
 remux.h      |   5 +-
 svdrp.c      |  35 +++--
 thread.c     |   8 +-
 thread.h     |   3 +-
 tools.h      |   4 +-
 17 files changed, 335 insertions(+), 215 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 15a605e3c..18c326c5f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -599,6 +599,7 @@ Helmut Auer <vdr@helmutauer.de>
  currently disabled
  for suggesting to improve logging system time changes to avoid problems on slow
  systems under heavy load
+ for making the SVDRP command PUTE support reading the EPG data from a given file
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -669,6 +670,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for adding missing AUDIO_PAUSE/AUDIO_CONTINUE calls to cDvbDevice
  for reporting that the video type is unnecessarily written into channels.conf if
  VPID is 0
+ for reporting chirping sound disturbences at editing points in TS recordings
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1069,6 +1071,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for setting the thread name, so that it can be seen in 'top -H'
  for replacing the Finnish language code "smi" with "suo"
  for adding cap_sys_nice to the capabilities that are not dropped
+ for adding cThread::SetIOPriority() and using it in cRemoveDeletedRecordingsThread
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1617,6 +1620,8 @@ Udo Richter <udo_richter@gmx.de>
  for suppressing the automatic shutdown if the remote control is currently disabled
  for fixing a problem with calling isyslog() from within the SignalHandler()
  for reporting a problem with handling the maximum video file size
+ for suggesting to add a note to the INSTALL file about using subdirectories to
+ split a large disk into separate areas for VDR's video data and other stuff
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1652,6 +1657,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
  one that fits the input
  for reporting a problem with cStatus::MsgOsdTextItem() being called without a text
  for reporting a missing install-i18n in the install target in the Makefile
+ for adding a missing 'const' to cRecording::FramesPerSecond()
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
diff --git a/HISTORY b/HISTORY
index 086c92af1..aa547be50 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6030,3 +6030,33 @@ Video Disk Recorder Revision History
 - No longer writing the video type into channels.conf if VPID is 0 (thanks to
   Oliver Endriss for reporting this).
 - Improved efficiency of cEIT::cEIT() (thanks to Tobias Bratfisch).
+
+2009-04-26: Version 1.7.6
+
+- cDevice::PlayTs() now syncs on the TS packet sync bytes.
+- Made MAXFRAMESIZE a multiple of TS_SIZE to avoid breaking up TS packets.
+- No longer resetting the patPmtParser in cDevice::PlayTs(), because this
+  caused the selected audio and subtitle tracks to fall back to the default.
+- The SVDRP command PUTE now supports reading the EPG data from a given file
+  (thanks to Helmut Auer).
+- Added cThread::SetIOPriority() and using it in cRemoveDeletedRecordingsThread
+  (thanks to Rolf Ahrenberg).
+- Fixed the MEGABYTE() macro to make it correctly handle parameters resulting in
+  values larger than 2GB.
+- Added cDevice::NumProvidedSystems() to PLUGINS.html (was missing since it had
+  been implemented).
+- Fixed distortions when switching to the next file during replay.
+- Fixed detecting the frame rate for streams with PTS distances of 1800, which
+  apparently split one frame over two payload units.
+- Added missing 'const' to cRecording::FramesPerSecond() (thanks to Joachim Wilke).
+- Any TS packets in the first "frame" after a cut in an edited recording that don't
+  belong to a payload unit that started in that frame now get their TEI flag set,
+  so that a decoder will ignore them together with any PES data collected for that
+  PID so far (thanks to Oliver Endriss for reporting chirping sound disturbences at
+  editing points in TS recordings).
+- cDvbPlayer::Empty() subtracts 1 from readIndex, because Action() will first
+  increment it.
+- Only storing non-zero Pts values in ptsIndex.
+- Added a note to the INSTALL file about using subdirectories to split a large
+  disk into separate areas for VDR's video data and other stuff (suggested by
+  Udo Richter).
diff --git a/INSTALL b/INSTALL
index f4b63d715..d68333825 100644
--- a/INSTALL
+++ b/INSTALL
@@ -324,7 +324,14 @@ with the name of the basic directory when running 'vdr':
 Note that you should not copy any non-VDR files into the /videoX directories,
 since this might cause a lot of unnecessary disk access when VDR cleans up those
 directories and there is a large number of files and/or subdirectories in
-there.
+there. If you have a large disk that you want to use for VDR's video data as
+well as other stuff, you may want to create a subdirectory for VDR, as in
+
+   /mydisk/video0
+
+and put your other stuff into, say,
+
+   /mydisk/otherstuff
 
 If your video directory is mounted via a Samba share, and you are experiencing
 problems with replaying in fast forward mode, you can comment out the line
diff --git a/PLUGINS.html b/PLUGINS.html
index dfee73952..719e70f44 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1802,6 +1802,9 @@ <h1>Table Of Contents</h1>
 selecting which channel it shall tune to:
 
 <p><table><tr><td class="code"><pre>
+<div class="modified">
+virtual int NumProvidedSystems(void) const;
+</div modified>
 virtual bool ProvidesSource(int Source) const;
 virtual bool ProvidesTransponder(const cChannel *Channel) const;
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
diff --git a/channels.c b/channels.c
index 46a8196ba..1e857009a 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.5 2009/04/10 11:29:55 kls Exp $
+ * $Id: channels.c 2.6 2009/04/25 13:57:32 kls Exp $
  */
 
 #include "channels.h"
@@ -535,7 +535,7 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][
 
 void cChannel::SetCaIds(const int *CaIds)
 {
-  if (caids[0] && caids[0] <= 0x00FF)
+  if (caids[0] && caids[0] <= CA_USER_MAX)
      return; // special values will not be overwritten
   if (IntArraysDiffer(caids, CaIds)) {
      char OldCaIdsBuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
@@ -864,7 +864,7 @@ bool cChannel::Parse(const char *s)
               while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
                     if (NumCaIds < MAXCAIDS) {
                        caids[NumCaIds++] = strtol(q, NULL, 16) & 0xFFFF;
-                       if (NumCaIds == 1 && caids[0] <= 0x00FF)
+                       if (NumCaIds == 1 && caids[0] <= CA_USER_MAX)
                           break;
                        }
                     else
diff --git a/config.h b/config.h
index 6e15ba4a9..8dae45630 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.7 2009/01/30 16:05:34 kls Exp $
+ * $Id: config.h 2.8 2009/04/12 14:20:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.5"
-#define VDRVERSNUM   10705  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.6"
+#define VDRVERSNUM   10706  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.5"
-#define APIVERSNUM   10705  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.6"
+#define APIVERSNUM   10706  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 73ac873f6..e83c5ac16 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.2 2009/01/24 15:19:26 kls Exp $
+ * $Id: cutter.c 2.3 2009/04/19 10:56:33 kls Exp $
  */
 
 #include "cutter.h"
@@ -18,6 +18,7 @@
 class cCuttingThread : public cThread {
 private:
   const char *error;
+  bool isPesRecording;
   cUnbufferedFile *fromFile, *toFile;
   cFileName *fromFileName, *toFileName;
   cIndexFile *fromIndex, *toIndex;
@@ -39,7 +40,7 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
   fromFileName = toFileName = NULL;
   fromIndex = toIndex = NULL;
   cRecording Recording(FromFileName);
-  bool isPesRecording = Recording.IsPesRecording();
+  isPesRecording = Recording.IsPesRecording();
   if (fromMarks.Load(FromFileName, Recording.FramesPerSecond(), isPesRecording) && fromMarks.Count()) {
      fromFileName = new cFileName(FromFileName, false, true, isPesRecording);
      toFileName = new cFileName(ToFileName, true, true, isPesRecording);
@@ -140,7 +141,10 @@ void cCuttingThread::Action(void)
               LastIFrame = 0;
 
               if (cutIn) {
-                 cRemux::SetBrokenLink(buffer, Length);
+                 if (isPesRecording)
+                    cRemux::SetBrokenLink(buffer, Length);
+                 else
+                    TsSetTeiOnBrokenPackets(buffer, Length);
                  cutIn = false;
                  }
               }
diff --git a/device.c b/device.c
index ccf176c4f..61216207f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.13 2009/04/05 12:15:41 kls Exp $
+ * $Id: device.c 2.16 2009/04/18 09:41:00 kls Exp $
  */
 
 #include "device.h"
@@ -1075,6 +1075,7 @@ bool cDevice::AttachPlayer(cPlayer *Player)
         Detach(player);
      DELETENULL(liveSubtitle);
      DELETENULL(dvbSubtitleConverter);
+     patPmtParser.Reset();
      player = Player;
      if (!Transferring())
         ClrAvailableTracks(false, true);
@@ -1099,6 +1100,7 @@ void cDevice::Detach(cPlayer *Player)
      SetPlayMode(pmNone);
      SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
      PlayTs(NULL, 0);
+     patPmtParser.Reset();
      Audios.ClearAudio();
      isPlayingVideo = false;
      }
@@ -1317,14 +1319,24 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 {
   int Played = 0;
   if (Data == NULL) {
-     patPmtParser.Reset();
      tsToPesVideo.Reset();
      tsToPesAudio.Reset();
      tsToPesSubtitle.Reset();
      }
+  else if (Length < TS_SIZE) {
+     esyslog("ERROR: skipped %d bytes of TS fragment", Length);
+     return Length;
+     }
   else {
      cMutexLock MutexLock(&mutexCurrentAudioTrack);
      while (Length >= TS_SIZE) {
+           if (Data[0] != TS_SYNC_BYTE) {
+              int Skipped = 1;
+              while (Skipped < Length && (Data[Skipped] != TS_SYNC_BYTE || Length - Skipped > TS_SIZE && Data[Skipped + TS_SIZE] != TS_SYNC_BYTE))
+                    Skipped++;
+              esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
+              return Played + Skipped;
+              }
            if (TsHasPayload(Data)) { // silently ignore TS packets w/o payload
               int PayloadOffset = TsPayloadOffset(Data);
               if (PayloadOffset < TS_SIZE) {
diff --git a/dvbplayer.c b/dvbplayer.c
index 9de0fca9a..219de497f 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.11 2009/04/05 13:04:33 kls Exp $
+ * $Id: dvbplayer.c 2.15 2009/04/19 15:19:10 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -318,7 +318,7 @@ void cDvbPlayer::Empty(void)
   if (nonBlockingFileReader)
      nonBlockingFileReader->Clear();
   if (!firstPacket) // don't set the readIndex twice if Empty() is called more than once
-     readIndex = ptsIndex.FindIndex(DeviceGetSTC());
+     readIndex = ptsIndex.FindIndex(DeviceGetSTC()) - 1;  // Action() will first increment it!
   delete readFrame; // might not have been stored in the buffer in Action()
   readFrame = NULL;
   playFrame = NULL;
@@ -398,189 +398,191 @@ void cDvbPlayer::Action(void)
   int LastReadIFrame = -1;
   int SwitchToPlayFrame = 0;
 
-  while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
-        if (Sleep) {
-           if (WaitingForData)
-              nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
-           else
-              cCondWait::SleepMs(3); // this keeps the CPU load low
+  while (Running()) {
+        if (WaitingForData)
+           nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
+        else if (Sleep) {
+           cPoller Poller;
+           DevicePoll(Poller, 10);
            Sleep = false;
            }
-        cPoller Poller;
-        if (DevicePoll(Poller, 100)) {
-
-           LOCK_THREAD;
-
-           // Read the next frame from the file:
-
-           if (playMode != pmStill && playMode != pmPause) {
-              if (!readFrame && (replayFile || readIndex >= 0)) {
-                 if (!nonBlockingFileReader->Reading()) {
-                    if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
-                       uint16_t FileNumber;
-                       off_t FileOffset;
-                       bool TimeShiftMode = index->IsStillRecording();
-                       int Index = -1;
-                       readIndependent = false;
-                       if (DeviceHasIBPTrickSpeed() && playDir == pdForward) {
-                          if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length))
-                             Index = readIndex + 1;
-                          }
-                       else {
-                          int d = int(round(0.4 * framesPerSecond));
-                          if (playDir != pdForward)
-                             d = -d;
-                          int NewIndex = readIndex + d;
-                          if (NewIndex <= 0 && readIndex > 0)
-                             NewIndex = 1; // make sure the very first frame is delivered
-                          NewIndex = index->GetNextIFrame(NewIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
-                          if (NewIndex < 0 && TimeShiftMode && playDir == pdForward)
-                             SwitchToPlayFrame = Index;
-                          Index = NewIndex;
-                          readIndependent = true;
-                          }
-                       if (Index >= 0) {
-                          readIndex = Index;
-                          if (!NextFile(FileNumber, FileOffset))
-                             continue;
-                          }
-                       else
-                          eof = true;
-                       }
-                    else if (index) {
-                       uint16_t FileNumber;
-                       off_t FileOffset;
-                       if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
-                          readIndex++;
-                       else
-                          eof = true;
-                       }
-                    else // allows replay even if the index file is missing
-                       Length = MAXFRAMESIZE / TS_SIZE * TS_SIZE;// FIXME: use a linear ringbuffer in this case, and fix cDevice::PlayPes()
-                    if (Length == -1)
-                       Length = MAXFRAMESIZE; // this means we read up to EOF (see cIndex)
-                    else if (Length > MAXFRAMESIZE) {
-                       esyslog("ERROR: frame larger than buffer (%d > %d)", Length, MAXFRAMESIZE);
-                       Length = MAXFRAMESIZE;
-                       }
-                    b = MALLOC(uchar, Length);
-                    }
-                 if (!eof) {
-                    int r = nonBlockingFileReader->Read(replayFile, b, Length);
-                    if (r > 0) {
-                       WaitingForData = false;
-                       uint32_t Pts = 0;
-                       if (readIndependent) {
-                          Pts = isPesRecording ? PesGetPts(b) : TsGetPts(b, r);
-                          LastReadIFrame = readIndex;
-                          }
-                       readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts); // hands over b to the ringBuffer
-                       b = NULL;
-                       }
-                    else if (r == 0)
-                       eof = true;
-                    else if (r < 0 && errno == EAGAIN)
-                       WaitingForData = true;
-                    else if (r < 0 && FATALERRNO) {
-                       LOG_ERROR;
-                       break;
-                       }
-                    }
-                 }
-
-              // Store the frame in the buffer:
-
-              if (readFrame) {
-                 if (ringBuffer->Put(readFrame))
-                    readFrame = NULL;
-                 }
-              }
-           else
-              Sleep = true;
-
-           // Get the next frame from the buffer:
-
-           if (!playFrame) {
-              playFrame = ringBuffer->Get();
-              p = NULL;
-              pc = 0;
-              }
-
-           // Play the frame:
-
-           if (playFrame) {
-              if (!p) {
-                 p = playFrame->Data();
-                 pc = playFrame->Count();
-                 if (p) {
-                    if (playFrame->Index() >= 0)
-                       ptsIndex.Put(playFrame->Pts(), playFrame->Index());
-                    if (firstPacket) {
-                       if (isPesRecording) {
-                          PlayPes(NULL, 0);
-                          cRemux::SetBrokenLink(p, pc);
-                          }
-                       else
-                          PlayTs(NULL, 0);
-                       firstPacket = false;
-                       }
-                    }
-                 }
-              if (p) {
-                 int w;
-                 if (isPesRecording)
-                    w = PlayPes(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
-                 else
-                    w = PlayTs(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
-                 if (w > 0) {
-                    p += w;
-                    pc -= w;
-                    }
-                 else if (w < 0 && FATALERRNO)
-                    LOG_ERROR;
-                 }
-              if (pc <= 0) {
-                 if (!eof || (playDir != pdForward && playFrame->Index() > 0) || (playDir == pdForward && playFrame->Index() < readIndex))
-                    ringBuffer->Drop(playFrame); // the very first and last frame are continously repeated to flush data through the device
-                 playFrame = NULL;
-                 p = NULL;
-                 }
-              }
-           else
-              Sleep = true;
-
-           // Handle hitting begin/end of recording:
-
-           if (eof || SwitchToPlayFrame) {
-              bool SwitchToPlay = false;
-              uint32_t Stc = DeviceGetSTC();
-              if (Stc != LastStc)
-                 StuckAtEof = 0;
-              else if (!StuckAtEof)
-                 StuckAtEof = time(NULL);
-              else if (time(NULL) - StuckAtEof > MAXSTUCKATEOF) {
-                 if (playDir == pdForward)
-                    break; // automatically stop at end of recording
-                 SwitchToPlay = true;
-                 }
-              LastStc = Stc;
-              int Index = ptsIndex.FindIndex(Stc);
-              if (playDir == pdForward && !SwitchToPlayFrame) {
-                 if (Index >= LastReadIFrame)
-                    break; // automatically stop at end of recording
-                 }
-              else if (Index <= 0 || SwitchToPlayFrame && Index >= SwitchToPlayFrame)
-                 SwitchToPlay = true;
-              if (SwitchToPlay) {
-                 if (!SwitchToPlayFrame)
-                    Empty();
-                 DevicePlay();
-                 playMode = pmPlay;
-                 playDir = pdForward;
-                 SwitchToPlayFrame = 0;
-                 }
-              }
-           }
+        {
+          LOCK_THREAD;
+
+          // Read the next frame from the file:
+
+          if (playMode != pmStill && playMode != pmPause) {
+             if (!readFrame && (replayFile || readIndex >= 0)) {
+                if (!nonBlockingFileReader->Reading()) {
+                   if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
+                      uint16_t FileNumber;
+                      off_t FileOffset;
+                      bool TimeShiftMode = index->IsStillRecording();
+                      int Index = -1;
+                      readIndependent = false;
+                      if (DeviceHasIBPTrickSpeed() && playDir == pdForward) {
+                         if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length))
+                            Index = readIndex + 1;
+                         }
+                      else {
+                         int d = int(round(0.4 * framesPerSecond));
+                         if (playDir != pdForward)
+                            d = -d;
+                         int NewIndex = readIndex + d;
+                         if (NewIndex <= 0 && readIndex > 0)
+                            NewIndex = 1; // make sure the very first frame is delivered
+                         NewIndex = index->GetNextIFrame(NewIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                         if (NewIndex < 0 && TimeShiftMode && playDir == pdForward)
+                            SwitchToPlayFrame = Index;
+                         Index = NewIndex;
+                         readIndependent = true;
+                         }
+                      if (Index >= 0) {
+                         readIndex = Index;
+                         if (!NextFile(FileNumber, FileOffset))
+                            continue;
+                         }
+                      else
+                         eof = true;
+                      }
+                   else if (index) {
+                      uint16_t FileNumber;
+                      off_t FileOffset;
+                      if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
+                         readIndex++;
+                      else
+                         eof = true;
+                      }
+                   else // allows replay even if the index file is missing
+                      Length = MAXFRAMESIZE;
+                   if (Length == -1)
+                      Length = MAXFRAMESIZE; // this means we read up to EOF (see cIndex)
+                   else if (Length > MAXFRAMESIZE) {
+                      esyslog("ERROR: frame larger than buffer (%d > %d)", Length, MAXFRAMESIZE);
+                      Length = MAXFRAMESIZE;
+                      }
+                   b = MALLOC(uchar, Length);
+                   }
+                if (!eof) {
+                   int r = nonBlockingFileReader->Read(replayFile, b, Length);
+                   if (r > 0) {
+                      WaitingForData = false;
+                      uint32_t Pts = 0;
+                      if (readIndependent) {
+                         Pts = isPesRecording ? PesGetPts(b) : TsGetPts(b, r);
+                         LastReadIFrame = readIndex;
+                         }
+                      readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts); // hands over b to the ringBuffer
+                      b = NULL;
+                      }
+                   else if (r == 0)
+                      eof = true;
+                   else if (r < 0 && errno == EAGAIN)
+                      WaitingForData = true;
+                   else if (r < 0 && FATALERRNO) {
+                      LOG_ERROR;
+                      break;
+                      }
+                   }
+                }
+
+             // Store the frame in the buffer:
+
+             if (readFrame) {
+                if (ringBuffer->Put(readFrame))
+                   readFrame = NULL;
+                else
+                   Sleep = true;
+                }
+             }
+          else
+             Sleep = true;
+
+          // Get the next frame from the buffer:
+
+          if (!playFrame) {
+             playFrame = ringBuffer->Get();
+             p = NULL;
+             pc = 0;
+             }
+
+          // Play the frame:
+
+          if (playFrame) {
+             if (!p) {
+                p = playFrame->Data();
+                pc = playFrame->Count();
+                if (p) {
+                   if (playFrame->Index() >= 0 && playFrame->Pts() != 0)
+                      ptsIndex.Put(playFrame->Pts(), playFrame->Index());
+                   if (firstPacket) {
+                      if (isPesRecording) {
+                         PlayPes(NULL, 0);
+                         cRemux::SetBrokenLink(p, pc);
+                         }
+                      else
+                         PlayTs(NULL, 0);
+                      firstPacket = false;
+                      }
+                   }
+                }
+             if (p) {
+                int w;
+                if (isPesRecording)
+                   w = PlayPes(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
+                else
+                   w = PlayTs(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
+                if (w > 0) {
+                   p += w;
+                   pc -= w;
+                   }
+                else if (w < 0 && FATALERRNO)
+                   LOG_ERROR;
+                else
+                   Sleep = true;
+                }
+             if (pc <= 0) {
+                if (!eof || (playDir != pdForward && playFrame->Index() > 0) || (playDir == pdForward && playFrame->Index() < readIndex))
+                   ringBuffer->Drop(playFrame); // the very first and last frame are continously repeated to flush data through the device
+                playFrame = NULL;
+                p = NULL;
+                }
+             }
+          else
+             Sleep = true;
+
+          // Handle hitting begin/end of recording:
+
+          if (eof || SwitchToPlayFrame) {
+             bool SwitchToPlay = false;
+             uint32_t Stc = DeviceGetSTC();
+             if (Stc != LastStc)
+                StuckAtEof = 0;
+             else if (!StuckAtEof)
+                StuckAtEof = time(NULL);
+             else if (time(NULL) - StuckAtEof > MAXSTUCKATEOF) {
+                if (playDir == pdForward)
+                   break; // automatically stop at end of recording
+                SwitchToPlay = true;
+                }
+             LastStc = Stc;
+             int Index = ptsIndex.FindIndex(Stc);
+             if (playDir == pdForward && !SwitchToPlayFrame) {
+                if (Index >= LastReadIFrame)
+                   break; // automatically stop at end of recording
+                }
+             else if (Index <= 0 || SwitchToPlayFrame && Index >= SwitchToPlayFrame)
+                SwitchToPlay = true;
+             if (SwitchToPlay) {
+                if (!SwitchToPlayFrame)
+                   Empty();
+                DevicePlay();
+                playMode = pmPlay;
+                playDir = pdForward;
+                SwitchToPlayFrame = 0;
+                }
+             }
+        }
         }
 
   cNonBlockingFileReader *nbfr = nonBlockingFileReader;
diff --git a/recording.c b/recording.c
index 2b44b1a46..c86b16364 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.9 2009/01/30 16:27:19 kls Exp $
+ * $Id: recording.c 2.12 2009/04/13 13:50:39 kls Exp $
  */
 
 #include "recording.h"
@@ -85,6 +85,7 @@ cRemoveDeletedRecordingsThread::cRemoveDeletedRecordingsThread(void)
 void cRemoveDeletedRecordingsThread::Action(void)
 {
   SetPriority(19);
+  SetIOPriority(7);
   // Make sure only one instance of VDR does this:
   cLockFile LockFile(VideoDirectory);
   if (LockFile.Lock()) {
diff --git a/recording.h b/recording.h
index 151e76029..d55cfdf06 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.5 2009/02/28 10:50:12 kls Exp $
+ * $Id: recording.h 2.7 2009/04/19 09:00:45 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -109,7 +109,7 @@ class cRecording : public cListObject {
   const char *PrefixFileName(char Prefix);
   int HierarchyLevels(void) const;
   void ResetResume(void) const;
-  double FramesPerSecond(void) { return framesPerSecond; }
+  double FramesPerSecond(void) const { return framesPerSecond; }
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
@@ -207,7 +207,7 @@ class cRecordingUserCommand {
   };
 
 // The maximum size of a single frame (up to HDTV 1920x1080):
-#define MAXFRAMESIZE  KILOBYTE(512)
+#define MAXFRAMESIZE  (KILOBYTE(512) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE to avoid breaking up TS packets
 
 // The maximum file size is limited by the range that can be covered
 // with a 40 bit 'unsigned int', which is 1TB. The actual maximum value
diff --git a/remux.c b/remux.c
index 89fe85d41..10e5145cf 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.17 2009/04/05 14:07:48 kls Exp $
+ * $Id: remux.c 2.19 2009/04/19 10:59:56 kls Exp $
  */
 
 #include "remux.h"
@@ -124,6 +124,24 @@ int64_t TsGetPts(const uchar *p, int l)
   return -1;
 }
 
+void TsSetTeiOnBrokenPackets(uchar *p, int l)
+{
+  bool Processed[MAXPID] = { false };
+  while (l >= TS_SIZE) {
+        if (*p != TS_SYNC_BYTE)
+           break;
+        int Pid = TsPid(p);
+        if (!Processed[Pid]) {
+           if (!TsPayloadStart(p))
+              p[1] |= TS_ERROR;
+           else
+              Processed[Pid] = true;
+           }
+        l -= TS_SIZE;
+        p += TS_SIZE;
+        }
+}
+
 // --- cPatPmtGenerator ------------------------------------------------------
 
 cPatPmtGenerator::cPatPmtGenerator(cChannel *Channel)
@@ -582,6 +600,10 @@ cTsToPes::~cTsToPes()
 
 void cTsToPes::PutTs(const uchar *Data, int Length)
 {
+  if (TsError(Data)) {
+     Reset();
+     return; // ignore packets with TEI set, and drop any PES data collected so far
+     }
   if (TsPayloadStart(Data))
      Reset();
   else if (!size)
@@ -732,6 +754,10 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                           frameDuration = 3600; // PAL, 25 fps
                        else if (Delta % 3003 == 0)
                           frameDuration = 3003; // NTSC, 29.97 fps
+                       else if (Delta == 1800) {
+                          frameDuration = 3600; // PAL, 25 fps
+                          framesPerPayloadUnit = -2;
+                          }
                        else if (Delta == 1501) {
                           frameDuration = 3003; // NTSC, 29.97 fps
                           framesPerPayloadUnit = -2;
diff --git a/remux.h b/remux.h
index ccb38821c..063acaa65 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.9 2009/03/27 13:38:59 kls Exp $
+ * $Id: remux.h 2.10 2009/04/19 10:57:09 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -49,6 +49,8 @@ class cRemux {
 #define TS_ADAPT_TP_PRIVATE   0x02
 #define TS_ADAPT_EXTENSION    0x01
 
+#define MAXPID 0x2000 // for arrays that use a PID as the index
+
 inline bool TsHasPayload(const uchar *p)
 {
   return p[3] & TS_PAYLOAD_EXISTS;
@@ -104,6 +106,7 @@ inline int TsGetAdaptationField(const uchar *p)
 // The following functions all take a pointer to a sequence of complete TS packets.
 
 int64_t TsGetPts(const uchar *p, int l);
+void TsSetTeiOnBrokenPackets(uchar *p, int l);
 
 // Some PES handling tools:
 // The following functions that take a pointer to PES data all assume that
diff --git a/svdrp.c b/svdrp.c
index 69b3e21e6..cc2f712cd 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.2 2009/01/06 14:35:45 kls Exp $
+ * $Id: svdrp.c 2.3 2009/04/13 13:35:29 kls Exp $
  */
 
 #include "svdrp.h"
@@ -288,11 +288,14 @@ const char *HelpPages[] = {
   "    If 'help' is followed by a command, the detailed help for that command is\n"
   "    given. The keyword 'main' initiates a call to the main menu function of the\n"
   "    given plugin.\n",
-  "PUTE\n"
+  "PUTE [ file ]\n"
   "    Put data into the EPG list. The data entered has to strictly follow the\n"
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
   "    by itself terminates the input and starts processing of the data (all\n"
-  "    entered data is buffered until the terminating '.' is seen).",
+  "    entered data is buffered until the terminating '.' is seen).\n"
+  "    If a file name is given, epg data will be read from this file (which\n"
+  "    must be accessible under the given name from the machine VDR is running\n"
+  "    on). In case of file input, no terminating '.' shall be given.\n",
   "REMO [ on | off ]\n"
   "    Turns the remote control on or off. Without a parameter, the current\n"
   "    status of the remote control is reported.",
@@ -1435,11 +1438,27 @@ void cSVDRP::CmdPLUG(const char *Option)
 
 void cSVDRP::CmdPUTE(const char *Option)
 {
-  delete PUTEhandler;
-  PUTEhandler = new cPUTEhandler;
-  Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
-  if (PUTEhandler->Status() != 354)
-     DELETENULL(PUTEhandler);
+  if (*Option) {
+     FILE *f = fopen(Option, "r");
+     if (f) {
+        if (cSchedules::Read(f)) {
+           cSchedules::Cleanup(true);
+           Reply(250, "EPG data processed from \"%s\"", Option);
+           }
+        else
+           Reply(451, "Error while processing EPG from \"%s\"", Option);
+        fclose(f);
+        }
+     else
+        Reply(501, "Cannot open file \"%s\"", Option);
+     }
+  else {     
+     delete PUTEhandler;
+     PUTEhandler = new cPUTEhandler;
+     Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
+     if (PUTEhandler->Status() != 354)
+        DELETENULL(PUTEhandler);
+     }
 }
 
 void cSVDRP::CmdREMO(const char *Option)
diff --git a/thread.c b/thread.c
index f7e365e86..e6a88980e 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.2 2008/09/06 09:39:43 kls Exp $
+ * $Id: thread.c 2.3 2009/04/13 13:50:39 kls Exp $
  */
 
 #include "thread.h"
@@ -226,6 +226,12 @@ void cThread::SetPriority(int Priority)
      LOG_ERROR;
 }
 
+void cThread::SetIOPriority(int Priority)
+{
+  if (syscall(SYS_ioprio_set, 1, 0, (Priority & 0xff) | (2 << 13)) < 0) // best effort class
+     LOG_ERROR;
+}
+
 void cThread::SetDescription(const char *Description, ...)
 {
   free(description);
diff --git a/thread.h b/thread.h
index 25a0b8b5f..d4919eb60 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 2.0 2007/02/24 16:13:28 kls Exp $
+ * $Id: thread.h 2.1 2009/04/13 13:50:39 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -87,6 +87,7 @@ class cThread {
   static void *StartThread(cThread *Thread);
 protected:
   void SetPriority(int Priority);
+  void SetIOPriority(int Priority);
   void Lock(void) { mutex.Lock(); }
   void Unlock(void) { mutex.Unlock(); }
   virtual void Action(void) = 0;
diff --git a/tools.h b/tools.h
index e660967b7..22b7e99bc 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.1 2008/05/22 10:26:57 kls Exp $
+ * $Id: tools.h 2.2 2009/04/14 20:41:39 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -38,7 +38,7 @@ extern int SysLogLevel;
 #define SECSINDAY  86400
 
 #define KILOBYTE(n) ((n) * 1024)
-#define MEGABYTE(n) ((n) * 1024 * 1024)
+#define MEGABYTE(n) ((n) * 1024LL * 1024LL)
 
 #define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
 

From 991eda006700f1703bcec528c1ff178a4cab9048 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 May 2009 17:15:00 +0200
Subject: [PATCH 193/307] Version 1.7.7 - The new function
 cDevice::GetVideoSize() returns the size and aspect ratio   of the video
 material currently displayed. This function is used to determine   the proper
 size of the OSD. Plugin authors should implement this function in   classes
 derived from cDevice, if they are able to replay video. - The OSD and font
 sizes are now defined in percent of the actual video display   size. The
 maximum OSD size has been raised to 1920x1080, to allow full   screen OSD on
 HD systems. - The OSD size is now automatically adjusted to the actual video
 display   (provided the output device implements the GetVideoSize()
 function). - cFrameDetector::Analyze() now syncs on the TS packet sync bytes
 (thanks to   Oliver Endriss for reporting broken index generation after a
 buffer overflow).

---
 CONTRIBUTORS |  1 +
 HISTORY      | 14 +++++++++++
 MANUAL       | 22 +++++++++--------
 PLUGINS.html | 11 +++++++++
 config.c     | 32 ++++++++++++++++++++++---
 config.h     | 23 +++++++++++-------
 device.c     | 14 ++++++++++-
 device.h     | 12 +++++++++-
 dvbdevice.c  | 19 ++++++++++++++-
 dvbdevice.h  |  3 ++-
 font.c       |  6 ++---
 font.h       |  3 ++-
 menu.c       | 52 ++++++++++++++++++----------------------
 menuitems.c  | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 menuitems.h  | 14 ++++++++++-
 osd.c        | 30 ++++++++++++++++++++++-
 osd.h        | 10 +++++++-
 po/ca_ES.po  | 28 +++++++++++-----------
 po/cs_CZ.po  | 28 +++++++++++-----------
 po/da_DK.po  | 28 +++++++++++-----------
 po/de_DE.po  | 28 +++++++++++-----------
 po/el_GR.po  | 22 ++++++++---------
 po/es_ES.po  | 28 +++++++++++-----------
 po/et_EE.po  | 28 +++++++++++-----------
 po/fi_FI.po  | 28 +++++++++++-----------
 po/fr_FR.po  | 28 +++++++++++-----------
 po/hr_HR.po  | 28 +++++++++++-----------
 po/hu_HU.po  | 28 +++++++++++-----------
 po/it_IT.po  | 28 +++++++++++-----------
 po/nl_NL.po  | 28 +++++++++++-----------
 po/nn_NO.po  | 18 +++++++-------
 po/pl_PL.po  | 28 +++++++++++-----------
 po/pt_PT.po  | 28 +++++++++++-----------
 po/ro_RO.po  | 28 +++++++++++-----------
 po/ru_RU.po  | 28 +++++++++++-----------
 po/sl_SI.po  | 28 +++++++++++-----------
 po/sv_SE.po  | 28 +++++++++++-----------
 po/tr_TR.po  | 28 +++++++++++-----------
 po/uk_UA.po  | 28 +++++++++++-----------
 po/zh_CN.po  | 28 +++++++++++-----------
 remux.c      |  9 ++++++-
 vdr.c        |  8 ++++++-
 42 files changed, 600 insertions(+), 379 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 18c326c5f..7bdc251b4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -671,6 +671,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting that the video type is unnecessarily written into channels.conf if
  VPID is 0
  for reporting chirping sound disturbences at editing points in TS recordings
+ for reporting broken index generation in TS recordings after a buffer overflow
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index aa547be50..d94e1612a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6060,3 +6060,17 @@ Video Disk Recorder Revision History
 - Added a note to the INSTALL file about using subdirectories to split a large
   disk into separate areas for VDR's video data and other stuff (suggested by
   Udo Richter).
+
+2009-05-03: Version 1.7.7
+
+- The new function cDevice::GetVideoSize() returns the size and aspect ratio
+  of the video material currently displayed. This function is used to determine
+  the proper size of the OSD. Plugin authors should implement this function in
+  classes derived from cDevice, if they are able to replay video.
+- The OSD and font sizes are now defined in percent of the actual video display
+  size. The maximum OSD size has been raised to 1920x1080, to allow full
+  screen OSD on HD systems.
+- The OSD size is now automatically adjusted to the actual video display
+  (provided the output device implements the GetVideoSize() function).
+- cFrameDetector::Analyze() now syncs on the TS packet sync bytes (thanks to
+  Oliver Endriss for reporting broken index generation after a buffer overflow).
diff --git a/MANUAL b/MANUAL
index bb128f50b..ebf89fd4c 100644
--- a/MANUAL
+++ b/MANUAL
@@ -489,12 +489,13 @@ Version 1.6
 
   Theme = Default        Defines the "theme" to use with the current skin.
 
-  Left = 54              The top and left offset of the OSD.
-  Top = 45               The valid ranges are left=0...672, top=0...567.
+  Left = 8               The left and top offset of the OSD, in percent of the
+  Top = 8                total video display width and height, respectively.
+                         The valid range is 0...50%.
 
-  Width = 624            The width and height of the OSD.
-  Height = 486           The valid ranges are width=480...672, height=324...567.
-                         The Width must be a multiple of 8.
+  Width = 87             The width and height of the OSD, in percent of the
+  Height = 84            total video display width and height, respectively.
+                         The valid range is 50...100%.
 
   Message time = 1       The time (in seconds) how long an informational
                          message shall be displayed on the OSD. The valid range
@@ -516,11 +517,12 @@ Version 1.6
   Fixed font = Courier:Bold
                          The names of the various fonts to use.
 
-  Default font size = 22
-  Small font size = 18
-  Fixed font size = 20
-                         The sizes (in pixel) of the various fonts. Valid range is
-                         10...64.
+  Default font size = 3.8
+  Small font size = 3.5
+  Fixed font size = 3.1
+                         The sizes (in percent of the total video display height)
+                         of the various fonts. The valid range is 1...10%, at
+                         a resolution of 0.1%.
 
   Channel info position = bottom
                          The position of the channel info window in the OSD
diff --git a/PLUGINS.html b/PLUGINS.html
index 719e70f44..344015b1e 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1939,6 +1939,17 @@ <h1>Table Of Contents</h1>
 a "full featured" DVB card) or through a graphics adapter that overlays its
 output with the video signal, doesn't matter.
 
+<div class="modified">
+In order to be able to determine the proper size of the OSD, the device
+should implement the function
+
+<p><table><tr><td class="code"><pre>
+virtual void GetVideoSize(int &amp;Width, int &amp;Height, eVideoAspect &amp;Aspect);
+</pre></td></tr></table><p>
+
+By default, an OSD size of 480x324 with an aspect ratio of 4:3 is assumed.
+</div modified>
+
 <p>
 <b>Initializing new devices</b>
 <p>
diff --git a/config.c b/config.c
index 1132b1219..669228b72 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.1 2009/01/24 15:05:32 kls Exp $
+ * $Id: config.c 2.2 2009/05/03 13:58:08 kls Exp $
  */
 
 #include "config.h"
@@ -262,6 +262,10 @@ cSetup::cSetup(void)
   UseDolbyDigital = 1;
   ChannelInfoPos = 0;
   ChannelInfoTime = 5;
+  OSDLeftP = 0.08;
+  OSDTopP = 0.08;
+  OSDWidthP = 0.87;
+  OSDHeightP = 0.84;
   OSDLeft = 54;
   OSDTop = 45;
   OSDWidth = 624;
@@ -272,6 +276,9 @@ cSetup::cSetup(void)
   strcpy(FontOsd, DefaultFontOsd);
   strcpy(FontSml, DefaultFontSml);
   strcpy(FontFix, DefaultFontFix);
+  FontOsdSizeP = 0.038;
+  FontSmlSizeP = 0.035;
+  FontFixSizeP = 0.031;
   FontOsdSize = 22;
   FontSmlSize = 18;
   FontFixSize = 20;
@@ -324,6 +331,11 @@ void cSetup::Store(const char *Name, int Value, const char *Plugin)
   Store(Name, cString::sprintf("%d", Value), Plugin);
 }
 
+void cSetup::Store(const char *Name, double &Value, const char *Plugin)
+{
+  Store(Name, cString::sprintf("%f", Value), Plugin);
+}
+
 bool cSetup::Load(const char *FileName)
 {
   if (cConfig<cSetupLine>::Load(FileName, true)) {
@@ -435,16 +447,23 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UseDolbyDigital"))     UseDolbyDigital    = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoTime"))     ChannelInfoTime    = atoi(Value);
+  else if (!strcasecmp(Name, "OSDLeftP"))            OSDLeftP           = atof(Value);
+  else if (!strcasecmp(Name, "OSDTopP"))             OSDTopP            = atof(Value);
+  else if (!strcasecmp(Name, "OSDWidthP"))           OSDWidthP          = atof(Value);
+  else if (!strcasecmp(Name, "OSDHeightP"))          OSDHeightP         = atof(Value);
   else if (!strcasecmp(Name, "OSDLeft"))             OSDLeft            = atoi(Value);
   else if (!strcasecmp(Name, "OSDTop"))              OSDTop             = atoi(Value);
-  else if (!strcasecmp(Name, "OSDWidth"))          { OSDWidth           = atoi(Value); if (OSDWidth  < 100) OSDWidth  *= 12; OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
-  else if (!strcasecmp(Name, "OSDHeight"))         { OSDHeight          = atoi(Value); if (OSDHeight < 100) OSDHeight *= 27; }
+  else if (!strcasecmp(Name, "OSDWidth"))          { OSDWidth           = atoi(Value); OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
+  else if (!strcasecmp(Name, "OSDHeight"))           OSDHeight          = atoi(Value);
   else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
   else if (!strcasecmp(Name, "UseSmallFont"))        UseSmallFont       = atoi(Value);
   else if (!strcasecmp(Name, "AntiAlias"))           AntiAlias          = atoi(Value);
   else if (!strcasecmp(Name, "FontOsd"))             Utf8Strn0Cpy(FontOsd, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontSml"))             Utf8Strn0Cpy(FontSml, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontFix"))             Utf8Strn0Cpy(FontFix, Value, MAXFONTNAME);
+  else if (!strcasecmp(Name, "FontOsdSizeP"))        FontOsdSizeP       = atof(Value);
+  else if (!strcasecmp(Name, "FontSmlSizeP"))        FontSmlSizeP       = atof(Value);
+  else if (!strcasecmp(Name, "FontFixSizeP"))        FontFixSizeP       = atof(Value);
   else if (!strcasecmp(Name, "FontOsdSize"))         FontOsdSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontSmlSize"))         FontSmlSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontFixSize"))         FontFixSize        = atoi(Value);
@@ -518,6 +537,10 @@ bool cSetup::Save(void)
   Store("UseDolbyDigital",    UseDolbyDigital);
   Store("ChannelInfoPos",     ChannelInfoPos);
   Store("ChannelInfoTime",    ChannelInfoTime);
+  Store("OSDLeftP",           OSDLeftP);
+  Store("OSDTopP",            OSDTopP);
+  Store("OSDWidthP",          OSDWidthP);
+  Store("OSDHeightP",         OSDHeightP);
   Store("OSDLeft",            OSDLeft);
   Store("OSDTop",             OSDTop);
   Store("OSDWidth",           OSDWidth);
@@ -528,6 +551,9 @@ bool cSetup::Save(void)
   Store("FontOsd",            FontOsd);
   Store("FontSml",            FontSml);
   Store("FontFix",            FontFix);
+  Store("FontOsdSizeP",       FontOsdSizeP);
+  Store("FontSmlSizeP",       FontSmlSizeP);
+  Store("FontFixSizeP",       FontFixSizeP);
   Store("FontOsdSize",        FontOsdSize);
   Store("FontSmlSize",        FontSmlSize);
   Store("FontFixSize",        FontFixSize);
diff --git a/config.h b/config.h
index 8dae45630..5a884ca4e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.8 2009/04/12 14:20:52 kls Exp $
+ * $Id: config.h 2.9 2009/05/03 13:15:35 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.6"
-#define VDRVERSNUM   10706  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.7"
+#define VDRVERSNUM   10707  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.6"
-#define APIVERSNUM   10706  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.7"
+#define APIVERSNUM   10707  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -39,10 +39,10 @@
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
 
-#define MINOSDWIDTH  480
-#define MAXOSDWIDTH  672
-#define MINOSDHEIGHT 324
-#define MAXOSDHEIGHT 567
+#define MINOSDWIDTH   480
+#define MAXOSDWIDTH  1920
+#define MINOSDHEIGHT  324
+#define MAXOSDHEIGHT 1080
 
 #define MaxFileName 256
 #define MaxSkinName 16
@@ -195,6 +195,7 @@ class cSetup : public cConfig<cSetupLine> {
   cSetupLine *Get(const char *Name, const char *Plugin = NULL);
   void Store(const char *Name, const char *Value, const char *Plugin = NULL, bool AllowMultiple = false);
   void Store(const char *Name, int Value, const char *Plugin = NULL);
+  void Store(const char *Name, double &Value, const char *Plugin = NULL);
 public:
   // Also adjust cMenuSetup (menu.c) when adding parameters here!
   int __BeginData__;
@@ -243,6 +244,7 @@ class cSetup : public cConfig<cSetupLine> {
   int UseDolbyDigital;
   int ChannelInfoPos;
   int ChannelInfoTime;
+  double OSDLeftP, OSDTopP, OSDWidthP, OSDHeightP;
   int OSDLeft, OSDTop, OSDWidth, OSDHeight;
   int OSDMessageTime;
   int UseSmallFont;
@@ -250,6 +252,9 @@ class cSetup : public cConfig<cSetupLine> {
   char FontOsd[MAXFONTNAME];
   char FontSml[MAXFONTNAME];
   char FontFix[MAXFONTNAME];
+  double FontOsdSizeP;
+  double FontSmlSizeP;
+  double FontFixSizeP;
   int FontOsdSize;
   int FontSmlSize;
   int FontFixSize;
diff --git a/device.c b/device.c
index 61216207f..ca2c3b3ce 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.16 2009/04/18 09:41:00 kls Exp $
+ * $Id: device.c 2.17 2009/05/02 12:17:39 kls Exp $
  */
 
 #include "device.h"
@@ -19,6 +19,11 @@
 #include "status.h"
 #include "transfer.h"
 
+const char *VideoAspectString[] = { "4:3",
+                                    "16:9",
+                                    "2.21:9"
+                                  };
+
 // --- cLiveSubtitle ---------------------------------------------------------
 
 class cLiveSubtitle : public cReceiver {
@@ -384,6 +389,13 @@ eVideoSystem cDevice::GetVideoSystem(void)
   return vsPAL;
 }
 
+void cDevice::GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect)
+{
+  Width = MINOSDWIDTH;
+  Height = MINOSDHEIGHT;
+  Aspect = va4_3;
+}
+
 //#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
 #define PRINTPIDS(s)
 
diff --git a/device.h b/device.h
index c3a170b22..74f1277ae 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.9 2009/04/05 12:12:44 kls Exp $
+ * $Id: device.h 2.10 2009/05/02 12:16:20 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -56,6 +56,13 @@ enum eVideoSystem { vsPAL,
                     vsNTSC
                   };
 
+enum eVideoAspect { va4_3,
+                    va16_9,
+                    va221_9
+                  };
+
+extern const char *VideoAspectString[];
+
 enum eVideoDisplayFormat { vdfPanAndScan,
                            vdfLetterBox,
                            vdfCenterCutOut
@@ -377,6 +384,9 @@ class cDevice : public cThread {
   virtual eVideoSystem GetVideoSystem(void);
          ///< Returns the video system of the currently displayed material
          ///< (default is PAL).
+  virtual void GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect);
+         ///< Returns the With, Height and Aspect ratio of the currently
+         ///< displayed material.
 
 // Track facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index 942abf11d..84f0e97c6 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.14 2009/04/10 09:54:24 kls Exp $
+ * $Id: dvbdevice.c 2.15 2009/05/03 13:49:41 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -746,6 +746,23 @@ eVideoSystem cDvbDevice::GetVideoSystem(void)
   return VideoSystem;
 }
 
+void cDvbDevice::GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect)
+{
+  video_size_t vs;
+  if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+     Width = vs.w;
+     if (Width < 720) // FIXME: some channels result in a With of, e.g. 544, but the final video *is* 720 wide
+        Width = 720;
+     Height = vs.h;
+     Aspect = eVideoAspect(vs.aspect_ratio);
+     if (Width >= MINOSDWIDTH && Width <= MAXOSDWIDTH && Height >= MINOSDHEIGHT && Height <= MAXOSDHEIGHT)
+        return;
+     }
+  else
+     LOG_ERROR;
+  cDevice::GetVideoSize(Width, Height, Aspect);
+}
+
 bool cDvbDevice::SetAudioBypass(bool On)
 {
   if (setTransferModeForDolbyDigital != 1)
diff --git a/dvbdevice.h b/dvbdevice.h
index c3b0cedb0..4e325ca23 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.3 2008/12/06 13:31:12 kls Exp $
+ * $Id: dvbdevice.h 2.4 2009/05/02 10:44:40 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -107,6 +107,7 @@ class cDvbDevice : public cDevice {
   virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
   virtual void SetVideoFormat(bool VideoFormat16_9);
   virtual eVideoSystem GetVideoSystem(void);
+  virtual void GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect);
 
 // Track facilities
 
diff --git a/font.c b/font.c
index f962a09c3..3fa97df79 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 2.1 2008/05/02 16:16:51 kls Exp $
+ * $Id: font.c 2.2 2009/05/03 11:15:39 kls Exp $
  */
 
 #include "font.h"
@@ -145,7 +145,7 @@ cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
                                     0,    // horizontal device resolution
                                     0);   // vertical device resolution
            if (!error) {
-              height = ((face->size->metrics.ascender-face->size->metrics.descender) + 63) / 64;
+              height = (face->size->metrics.ascender - face->size->metrics.descender + 63) / 64;
               bottom = abs((face->size->metrics.descender - 63) / 64);
               }
            else
@@ -328,7 +328,7 @@ cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
 void cFont::SetFont(eDvbFont Font, const char *Name, int CharHeight)
 {
-  cFont *f = CreateFont(Name, CharHeight);
+  cFont *f = CreateFont(Name, min(max(CharHeight, MINFONTSIZE), MAXFONTSIZE));
   if (!f || !f->Height())
      f = new cDummyFont;
   delete fonts[Font];
diff --git a/font.h b/font.h
index 6d68d75d6..5b9ec642f 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.0 2007/06/23 10:09:14 kls Exp $
+ * $Id: font.h 2.1 2009/05/03 11:00:19 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -15,6 +15,7 @@
 #include "tools.h"
 
 #define MAXFONTNAME 64
+#define MINFONTSIZE 10
 #define MAXFONTSIZE 64
 
 enum eDvbFont {
diff --git a/menu.c b/menu.c
index fa6006514..423f6f2a7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.6 2009/01/24 15:05:43 kls Exp $
+ * $Id: menu.c 2.7 2009/05/03 13:30:13 kls Exp $
  */
 
 #include "menu.h"
@@ -2197,19 +2197,19 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"),                   &skinIndex, numSkins, skinDescriptions));
   if (themes.NumThemes())
   Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"),                  &themeIndex, themes.NumThemes(), themes.Descriptions()));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Left"),                   &data.OSDLeft, 0, MAXOSDWIDTH));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Top"),                    &data.OSDTop, 0, MAXOSDHEIGHT));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Width"),                  &data.OSDWidth, MINOSDWIDTH, MAXOSDWIDTH));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Height"),                 &data.OSDHeight, MINOSDHEIGHT, MAXOSDHEIGHT));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Left (%)"),               &data.OSDLeftP, 0.0, 0.5));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Top (%)"),                &data.OSDTopP, 0.0, 0.5));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Width (%)"),              &data.OSDWidthP, 0.5, 1.0));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Height (%)"),             &data.OSDHeightP, 0.5, 1.0));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"),       &data.OSDMessageTime, 1, 60));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Use small font"),         &data.UseSmallFont, 3, useSmallFontTexts));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Anti-alias"),             &data.AntiAlias));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Default font"),           &fontOsdIndex, fontOsdNames.Size(), &fontOsdNames[0]));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Small font"),             &fontSmlIndex, fontSmlNames.Size(), &fontSmlNames[0]));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font"),             &fontFixIndex, fontFixNames.Size(), &fontFixNames[0]));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Default font size (pixel)"), &data.FontOsdSize, 10, MAXFONTSIZE));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Small font size (pixel)"),&data.FontSmlSize, 10, MAXFONTSIZE));
-  Add(new cMenuEditIntItem( tr("Setup.OSD$Fixed font size (pixel)"),&data.FontFixSize, 10, MAXFONTSIZE));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Default font size (%)"),  &data.FontOsdSizeP, 0.01, 0.1, 1));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Small font size (%)"),    &data.FontSmlSizeP, 0.01, 0.1, 1));
+  Add(new cMenuEditPrcItem( tr("Setup.OSD$Fixed font size (%)"),    &data.FontFixSizeP, 0.01, 0.1, 1));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"),  &data.ChannelInfoPos, tr("bottom"), tr("top")));
   Add(new cMenuEditIntItem( tr("Setup.OSD$Channel info time (s)"),  &data.ChannelInfoTime, 1, 60));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch));
@@ -2224,7 +2224,7 @@ void cMenuSetupOSD::Set(void)
 
 eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
 {
-  bool ModifiedApperance = false;
+  bool ModifiedAppearance = false;
 
   if (Key == kOk) {
      I18nSetLocale(data.OSDLanguage);
@@ -2233,43 +2233,37 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         if (Skin) {
            Utf8Strn0Cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin));
            Skins.SetCurrent(Skin->Name());
-           ModifiedApperance = true;
+           ModifiedAppearance = true;
            }
         }
      if (themes.NumThemes() && Skins.Current()->Theme()) {
         Skins.Current()->Theme()->Load(themes.FileName(themeIndex));
         Utf8Strn0Cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme));
-        ModifiedApperance |= themeIndex != originalThemeIndex;
-        }
-     if (data.OSDLeft != Setup.OSDLeft || data.OSDTop != Setup.OSDTop || data.OSDWidth != Setup.OSDWidth || data.OSDHeight != Setup.OSDHeight) {
-        data.OSDWidth &= ~0x07; // OSD width must be a multiple of 8
-        ModifiedApperance = true;
+        ModifiedAppearance |= themeIndex != originalThemeIndex;
         }
+     if (data.OSDLeftP != Setup.OSDLeftP || data.OSDTopP != Setup.OSDTopP || data.OSDWidthP != Setup.OSDWidthP || data.OSDHeightP != Setup.OSDHeightP)
+        ModifiedAppearance = true;
      if (data.UseSmallFont != Setup.UseSmallFont || data.AntiAlias != Setup.AntiAlias)
-        ModifiedApperance = true;
+        ModifiedAppearance = true;
      Utf8Strn0Cpy(data.FontOsd, fontOsdNames[fontOsdIndex], sizeof(data.FontOsd));
      Utf8Strn0Cpy(data.FontSml, fontSmlNames[fontSmlIndex], sizeof(data.FontSml));
      Utf8Strn0Cpy(data.FontFix, fontFixNames[fontFixIndex], sizeof(data.FontFix));
-     if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSize != Setup.FontOsdSize) {
-        cFont::SetFont(fontOsd, data.FontOsd, data.FontOsdSize);
-        ModifiedApperance = true;
-        }
-     if (strcmp(data.FontSml, Setup.FontSml) || data.FontSmlSize != Setup.FontSmlSize) {
-        cFont::SetFont(fontSml, data.FontSml, data.FontSmlSize);
-        ModifiedApperance = true;
-        }
-     if (strcmp(data.FontFix, Setup.FontFix) || data.FontFixSize != Setup.FontFixSize) {
-        cFont::SetFont(fontFix, data.FontFix, data.FontFixSize);
-        ModifiedApperance = true;
-        }
+     if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSizeP != Setup.FontOsdSizeP)
+        ModifiedAppearance = true;
+     if (strcmp(data.FontSml, Setup.FontSml) || data.FontSmlSizeP != Setup.FontSmlSizeP)
+        ModifiedAppearance = true;
+     if (strcmp(data.FontFix, Setup.FontFix) || data.FontFixSizeP != Setup.FontFixSizeP)
+        ModifiedAppearance = true;
      }
 
   int oldSkinIndex = skinIndex;
   int oldOsdLanguageIndex = osdLanguageIndex;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
-  if (ModifiedApperance)
+  if (ModifiedAppearance) {
+     cOsdProvider::UpdateOsdSize(true);
      SetDisplayMenu();
+     }
 
   if (osdLanguageIndex != oldOsdLanguageIndex || skinIndex != oldSkinIndex) {
      strn0cpy(data.OSDLanguage, I18nLocale(osdLanguageIndex), sizeof(data.OSDLanguage));
diff --git a/menuitems.c b/menuitems.c
index 6702384cc..df14b10d4 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.3 2009/04/05 10:15:12 kls Exp $
+ * $Id: menuitems.c 2.4 2009/05/03 13:37:55 kls Exp $
  */
 
 #include "menuitems.h"
 #include <ctype.h>
+#include <math.h>
 #include <wctype.h>
 #include "i18n.h"
 #include "plugin.h"
@@ -200,6 +201,71 @@ eOSState cMenuEditNumItem::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEditPrcItem ------------------------------------------------------
+
+cMenuEditPrcItem::cMenuEditPrcItem(const char *Name, double *Value, double Min, double Max, int Decimals)
+:cMenuEditItem(Name)
+{
+  value = Value;
+  min = Min;
+  max = Max;
+  decimals = Decimals;
+  factor = 100;
+  while (Decimals-- > 0)
+        factor *= 10;
+  if (*value < min)
+     *value = min;
+  else if (*value > max)
+     *value = max;
+  Set();
+}
+
+void cMenuEditPrcItem::Set(void)
+{
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%.*f", decimals, *value * 100);
+  SetValue(buf);
+}
+
+eOSState cMenuEditPrcItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditItem::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     double newValue = round(*value * factor); // avoids precision problems
+     Key = NORMALKEY(Key);
+     switch (Key) {
+       case kNone: break;
+       case k0 ... k9:
+            if (fresh) {
+               newValue = 0;
+               fresh = false;
+               }
+            newValue = newValue * 10 + (Key - k0);
+            break;
+       case kLeft: // TODO might want to increase the delta if repeated quickly?
+            newValue--;
+            fresh = true;
+            break;
+       case kRight:
+            newValue++;
+            fresh = true;
+            break;
+       default:
+            if (*value < min) { *value = min; Set(); }
+            if (*value > max) { *value = max; Set(); }
+            return state;
+       }
+     newValue /= factor;
+     if (newValue != *value && (!fresh || min <= newValue) && newValue <= max) {
+        *value = newValue;
+        Set();
+        }
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cMenuEditChrItem ------------------------------------------------------
 
 cMenuEditChrItem::cMenuEditChrItem(const char *Name, char *Value, const char *Allowed)
diff --git a/menuitems.h b/menuitems.h
index 8d68b7d43..48324757f 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.1 2008/04/12 12:03:59 kls Exp $
+ * $Id: menuitems.h 2.2 2009/05/03 12:50:34 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -64,6 +64,18 @@ class cMenuEditNumItem : public cMenuEditItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuEditPrcItem : public cMenuEditItem {
+protected:
+  double *value;
+  double min, max;
+  int decimals;
+  int factor;
+  virtual void Set(void);
+public:
+  cMenuEditPrcItem(const char *Name, double *Value, double Min = 0.0, double Max = 1.0, int Decimals = 0);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuEditChrItem : public cMenuEditItem {
 private:
   char *value;
diff --git a/osd.c b/osd.c
index d8e511265..2ed1acf71 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.2 2009/04/05 10:17:25 kls Exp $
+ * $Id: osd.c 2.3 2009/05/03 13:52:47 kls Exp $
  */
 
 #include "osd.h"
@@ -14,6 +14,7 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
+#include "device.h"
 #include "tools.h"
 
 // --- cPalette --------------------------------------------------------------
@@ -880,6 +881,9 @@ void cOsd::Flush(void)
 // --- cOsdProvider ----------------------------------------------------------
 
 cOsdProvider *cOsdProvider::osdProvider = NULL;
+int cOsdProvider::oldWidth = 0;
+int cOsdProvider::oldHeight = 0;
+int cOsdProvider::oldAspect = va4_3;
 
 cOsdProvider::cOsdProvider(void)
 {
@@ -911,6 +915,30 @@ cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
   return new cOsd(Left, Top, 999); // create a dummy cOsd, so that access won't result in a segfault
 }
 
+void cOsdProvider::UpdateOsdSize(bool Force)
+{
+  int Width;
+  int Height;
+  eVideoAspect Aspect;
+  cDevice::PrimaryDevice()->GetVideoSize(Width, Height, Aspect);
+  if (Width != oldWidth || Height != oldHeight || Aspect != oldAspect || Force) {
+     Setup.OSDLeft = int(round(Width * Setup.OSDLeftP));
+     Setup.OSDTop = int(round(Height * Setup.OSDTopP));
+     Setup.OSDWidth = int(round(Width * Setup.OSDWidthP)) & ~0x07; // OSD width must be a multiple of 8
+     Setup.OSDHeight = int(round(Height * Setup.OSDHeightP));
+     Setup.FontOsdSize = int(round(Height * Setup.FontOsdSizeP));
+     Setup.FontFixSize = int(round(Height * Setup.FontFixSizeP));
+     Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP));
+     cFont::SetFont(fontOsd, Setup.FontOsd, Setup.FontOsdSize);
+     cFont::SetFont(fontFix, Setup.FontFix, Setup.FontFixSize);
+     cFont::SetFont(fontSml, Setup.FontSml, Setup.FontSmlSize);
+     oldWidth = Width;
+     oldHeight = Height;
+     oldAspect = Aspect;
+     dsyslog("OSD size changed to %dx%d @ %s", Width, Height, VideoAspectString[Aspect]);
+     }
+}
+
 void cOsdProvider::Shutdown(void)
 {
   delete osdProvider;
diff --git a/osd.h b/osd.h
index 769095273..ba79fdead 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.2 2009/04/05 10:16:05 kls Exp $
+ * $Id: osd.h 2.3 2009/05/03 13:52:10 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -406,6 +406,9 @@ class cOsd {
 class cOsdProvider {
 private:
   static cOsdProvider *osdProvider;
+  static int oldWidth;
+  static int oldHeight;
+  static int oldAspect;
 protected:
   virtual cOsd *CreateOsd(int Left, int Top, uint Level) = 0;
       ///< Returns a pointer to a newly created cOsd object, which will be located
@@ -420,6 +423,11 @@ class cOsdProvider {
       ///< caller must delete it. If the OSD is already in use, or there is no OSD
       ///< provider, a dummy OSD is returned so that the caller may always use the
       ///< returned pointer without having to check it every time it is accessed.
+  static void UpdateOsdSize(bool Force = false);
+      ///< Inquires the actual size of the video display and adjusts the OSD and
+      ///< font sizes accordingly. If Force is true, all settings are recalculated,
+      ///< even if the video resolution hasn't changed since the last call to
+      ///< this funtion.
   static void Shutdown(void);
       ///< Shuts down the OSD provider facility by deleting the current OSD provider.
   };
diff --git a/po/ca_ES.po b/po/ca_ES.po
index d86ebc4fb..0ab2de62e 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -495,17 +495,17 @@ msgstr "Aparen
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Esquerra"
+msgid "Setup.OSD$Left (%)"
+msgstr "Esquerra (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "A dalt"
+msgid "Setup.OSD$Top (%)"
+msgstr "A dalt (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Amplada"
+msgid "Setup.OSD$Width (%)"
+msgstr "Amplada (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Al�ada"
+msgid "Setup.OSD$Height (%)"
+msgstr "Al�ada (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Durada dels missatges (s)"
@@ -525,14 +525,14 @@ msgstr "Font petita"
 msgid "Setup.OSD$Fixed font"
 msgstr "Font fixa"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Mida font predeterminada (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Mida font predeterminada (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Mida font petita"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Mida font petita (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Mida font fixa"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Mida font fixa (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posici� de la informaci� del canal"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index cd5b66b26..a50a33d63 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -493,17 +493,17 @@ msgstr "Vzhled"
 msgid "Setup.OSD$Theme"
 msgstr "T�ma"
 
-msgid "Setup.OSD$Left"
-msgstr "Vlevo"
+msgid "Setup.OSD$Left (%)"
+msgstr "Vlevo (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Naho�e"
+msgid "Setup.OSD$Top (%)"
+msgstr "Naho�e (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "���ka"
+msgid "Setup.OSD$Width (%)"
+msgstr "���ka (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "V��ka"
+msgid "Setup.OSD$Height (%)"
+msgstr "V��ka (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "�as zobrazen� zp�vy (s)"
@@ -523,14 +523,14 @@ msgstr "Mal
 msgid "Setup.OSD$Fixed font"
 msgstr "Fixn� p�smo"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Velikost v�choz�ho p�sma (pixely)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Velikost v�choz�ho p�sma (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Velikost mal�ho p�sma (pixely)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Velikost mal�ho p�sma (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Velikost fixn�ho p�sma (pixely)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Velikost fixn�ho p�sma (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozice informace o kan�lu"
diff --git a/po/da_DK.po b/po/da_DK.po
index ffe5a8d2b..e8d05c8e9 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -492,17 +492,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Venstre"
+msgid "Setup.OSD$Left (%)"
+msgstr "Venstre (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Top"
+msgid "Setup.OSD$Top (%)"
+msgstr "Top (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Bredde"
+msgid "Setup.OSD$Width (%)"
+msgstr "Bredde (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "H�jde"
+msgid "Setup.OSD$Height (%)"
+msgstr "H�jde (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tid beskeder skal vises (s)"
@@ -522,14 +522,14 @@ msgstr "Lille skrift"
 msgid "Setup.OSD$Fixed font"
 msgstr "Fast skrift"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Standard skrift st�rrelse (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Standard skrift st�rrelse (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Lille skrift st�rrelse (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Lille skrift st�rrelse (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Fast skrift st�rrelse (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Fast skrift st�rrelse (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Placering af kanalinfo"
diff --git a/po/de_DE.po b/po/de_DE.po
index 0dba2b45b..6b55d6abd 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -492,17 +492,17 @@ msgstr "Oberfl
 msgid "Setup.OSD$Theme"
 msgstr "Thema"
 
-msgid "Setup.OSD$Left"
-msgstr "Links"
+msgid "Setup.OSD$Left (%)"
+msgstr "Links (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Oben"
+msgid "Setup.OSD$Top (%)"
+msgstr "Oben (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Breite"
+msgid "Setup.OSD$Width (%)"
+msgstr "Breite (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "H�he"
+msgid "Setup.OSD$Height (%)"
+msgstr "H�he (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Anzeigedauer f�r Nachrichten (s)"
@@ -522,14 +522,14 @@ msgstr "Kleine Schriftart"
 msgid "Setup.OSD$Fixed font"
 msgstr "Festbreiten-Schriftart"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Standard-Schriftgr��e (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Standard-Schriftgr��e (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Kleine Schriftgr��e (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Kleine Schriftgr��e (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Festbreiten-Schriftgr��e (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Festbreiten-Schriftgr��e (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanalinfo-Position"
diff --git a/po/el_GR.po b/po/el_GR.po
index 7446e8acd..90ff04d9d 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -492,17 +492,17 @@ msgstr "
 msgid "Setup.OSD$Theme"
 msgstr "����"
 
-msgid "Setup.OSD$Left"
-msgstr "��������"
+msgid "Setup.OSD$Left (%)"
+msgstr "�������� (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "�����"
+msgid "Setup.OSD$Top (%)"
+msgstr "����� (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "������"
+msgid "Setup.OSD$Width (%)"
+msgstr "������ (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "����"
+msgid "Setup.OSD$Height (%)"
+msgstr "���� (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "������ �������� ��������� (�)"
@@ -522,13 +522,13 @@ msgstr ""
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-msgid "Setup.OSD$Default font size (pixel)"
+msgid "Setup.OSD$Default font size (%)"
 msgstr ""
 
-msgid "Setup.OSD$Small font size (pixel)"
+msgid "Setup.OSD$Small font size (%)"
 msgstr ""
 
-msgid "Setup.OSD$Fixed font size (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
 msgstr ""
 
 msgid "Setup.OSD$Channel info position"
diff --git a/po/es_ES.po b/po/es_ES.po
index ef504965c..667d65074 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -493,17 +493,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Izquierda"
+msgid "Setup.OSD$Left (%)"
+msgstr "Izquierda (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Arriba"
+msgid "Setup.OSD$Top (%)"
+msgstr "Arriba (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Anchura"
+msgid "Setup.OSD$Width (%)"
+msgstr "Anchura (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Altura"
+msgid "Setup.OSD$Height (%)"
+msgstr "Altura (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Duraci�n de los mensajes (sg)"
@@ -523,14 +523,14 @@ msgstr "Fuente peque
 msgid "Setup.OSD$Fixed font"
 msgstr "Fuente fija"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Tama�o fuente por defecto (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Tama�o fuente por defecto (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Tama�o fuente peque�a (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Tama�o fuente peque�a (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Tama�o fuente fija (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Tama�o fuente fija (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posici�n para informaci�n de canal"
diff --git a/po/et_EE.po b/po/et_EE.po
index dcbe854d3..ff66d8a50 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -492,17 +492,17 @@ msgstr "Kest"
 msgid "Setup.OSD$Theme"
 msgstr "Teema"
 
-msgid "Setup.OSD$Left"
-msgstr "Vasakule"
+msgid "Setup.OSD$Left (%)"
+msgstr "Vasakule (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "�lesse"
+msgid "Setup.OSD$Top (%)"
+msgstr "�lesse (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Laius"
+msgid "Setup.OSD$Width (%)"
+msgstr "Laius (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "K�rgus"
+msgid "Setup.OSD$Height (%)"
+msgstr "K�rgus (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Teate esitusaeg (s)"
@@ -522,14 +522,14 @@ msgstr "V
 msgid "Setup.OSD$Fixed font"
 msgstr "Fikseeritud font"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Vaikefondi suurus (px)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Vaikefondi suurus (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "V�ikese fondi suurus (px)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "V�ikese fondi suurus (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Fiks. fondi suurus (px)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Fiks. fondi suurus (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanaliinfo asukoht"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 76df2cf01..ed5b94dbf 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -495,17 +495,17 @@ msgstr "Ulkoasu"
 msgid "Setup.OSD$Theme"
 msgstr "Teema"
 
-msgid "Setup.OSD$Left"
-msgstr "Vaakakeskitys"
+msgid "Setup.OSD$Left (%)"
+msgstr "Vaakakeskitys (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Pystykeskitys"
+msgid "Setup.OSD$Top (%)"
+msgstr "Pystykeskitys (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Leveys"
+msgid "Setup.OSD$Width (%)"
+msgstr "Leveys (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Korkeus"
+msgid "Setup.OSD$Height (%)"
+msgstr "Korkeus (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Viestien esitysaika (s)"
@@ -525,14 +525,14 @@ msgstr "Pieni kirjasintyyppi"
 msgid "Setup.OSD$Fixed font"
 msgstr "Tasav�linen kirjasintyyppi"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Oletuskirjasintyypin koko (px)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Oletuskirjasintyypin koko (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Pienen kirjasintyypin koko (px)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Pienen kirjasintyypin koko (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Tasav�lisen kirjasintyypin koko (px)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Tasav�lisen kirjasintyypin koko (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanavatiedon sijainti"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 706f56fb4..535362597 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -498,17 +498,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Th�me"
 
-msgid "Setup.OSD$Left"
-msgstr "Gauche"
+msgid "Setup.OSD$Left (%)"
+msgstr "Gauche (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Haut"
+msgid "Setup.OSD$Top (%)"
+msgstr "Haut (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Largeur"
+msgid "Setup.OSD$Width (%)"
+msgstr "Largeur (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Hauteur"
+msgid "Setup.OSD$Height (%)"
+msgstr "Hauteur (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Dur�e affichage message (s)"
@@ -528,14 +528,14 @@ msgstr "Petite police"
 msgid "Setup.OSD$Fixed font"
 msgstr "Police taille fixe"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Taille police par d�faut (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Taille police par d�faut (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Taille petite police par d�faut (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Taille petite police par d�faut (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Taille police fixe par d�faut (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Taille police fixe par d�faut (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Position infos cha�nes"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index afddcefef..9b409e3e5 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -494,17 +494,17 @@ msgstr "Povr
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Lijevo"
+msgid "Setup.OSD$Left (%)"
+msgstr "Lijevo (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Gore"
+msgid "Setup.OSD$Top (%)"
+msgstr "Gore (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "�irina"
+msgid "Setup.OSD$Width (%)"
+msgstr "�irina (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Visina"
+msgid "Setup.OSD$Height (%)"
+msgstr "Visina (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Vrijeme prikaza poruka (s)"
@@ -524,14 +524,14 @@ msgstr "Maleni font"
 msgid "Setup.OSD$Fixed font"
 msgstr "Nepromjenjiv font"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Veli�ina zadanog fonta (piksel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Veli�ina zadanog fonta (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Veli�ina malenog fonta (piksel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Veli�ina malenog fonta (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Veli�ina nepromjenjivog fonta (piksel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Veli�ina nepromjenjivog fonta (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacija o programu"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b9821d5d8..5c0a88772 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -495,17 +495,17 @@ msgstr "Men
 msgid "Setup.OSD$Theme"
 msgstr "T�ma"
 
-msgid "Setup.OSD$Left"
-msgstr "Balra"
+msgid "Setup.OSD$Left (%)"
+msgstr "Balra (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Fent"
+msgid "Setup.OSD$Top (%)"
+msgstr "Fent (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Sz�less�g"
+msgid "Setup.OSD$Width (%)"
+msgstr "Sz�less�g (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Magass�g"
+msgid "Setup.OSD$Height (%)"
+msgstr "Magass�g (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Inform�ci� felt�ntet�s�nek id�tartama"
@@ -525,14 +525,14 @@ msgstr "Kis bet
 msgid "Setup.OSD$Fixed font"
 msgstr "K�t�tt bet�tipus"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Alap�rtelmezett bet�tipus m�ret (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Alap�rtelmezett bet�tipus m�ret (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Kis bet�tipus m�ret (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Kis bet�tipus m�ret (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "K�t�tt bet�tipus m�ret (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "K�t�tt bet�tipus m�ret (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Ad�sinform�ci� pozici�ja"
diff --git a/po/it_IT.po b/po/it_IT.po
index 9b6d2fd06..877191b08 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -499,17 +499,17 @@ msgstr "Stile interfaccia"
 msgid "Setup.OSD$Theme"
 msgstr "Tema colori"
 
-msgid "Setup.OSD$Left"
-msgstr "Sinistra"
+msgid "Setup.OSD$Left (%)"
+msgstr "Sinistra (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "In alto"
+msgid "Setup.OSD$Top (%)"
+msgstr "In alto (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Larghezza OSD"
+msgid "Setup.OSD$Width (%)"
+msgstr "Larghezza OSD (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Altezza OSD"
+msgid "Setup.OSD$Height (%)"
+msgstr "Altezza OSD (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Durata del messaggio (s)"
@@ -529,14 +529,14 @@ msgstr "Caratteri piccoli"
 msgid "Setup.OSD$Fixed font"
 msgstr "Caratteri fissi"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Dim. caratteri pred. (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Dim. caratteri pred. (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Dim. caratteri piccoli (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Dim. caratteri piccoli (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Dim. caratteri fissi (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Dim. caratteri fissi (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posizione info canale"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 17a095343..36a99220d 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -496,17 +496,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Thema"
 
-msgid "Setup.OSD$Left"
-msgstr "Links"
+msgid "Setup.OSD$Left (%)"
+msgstr "Links (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Boven"
+msgid "Setup.OSD$Top (%)"
+msgstr "Boven (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Breedte"
+msgid "Setup.OSD$Width (%)"
+msgstr "Breedte (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Hoogte"
+msgid "Setup.OSD$Height (%)"
+msgstr "Hoogte (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Weergave duur van berichten (s)"
@@ -526,14 +526,14 @@ msgstr "Kleine lettertype"
 msgid "Setup.OSD$Fixed font"
 msgstr "Letter met vaste breedte"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Afmetingen standaard lettertype (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Afmetingen standaard lettertype (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Afmetingen klein lettertype (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Afmetingen klein lettertype (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Afmetingen lettertype met vaste breedte (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Afmetingen lettertype met vaste breedte (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanaal info positie"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 06f6b8764..2445b0232 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -493,17 +493,17 @@ msgstr ""
 msgid "Setup.OSD$Theme"
 msgstr ""
 
-msgid "Setup.OSD$Left"
+msgid "Setup.OSD$Left (%)"
 msgstr ""
 
-msgid "Setup.OSD$Top"
+msgid "Setup.OSD$Top (%)"
 msgstr ""
 
-msgid "Setup.OSD$Width"
-msgstr "Bredde"
+msgid "Setup.OSD$Width (%)"
+msgstr "Bredde (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "H�yde"
+msgid "Setup.OSD$Height (%)"
+msgstr "H�yde (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tid meldinger skal vises (s)"
@@ -523,13 +523,13 @@ msgstr ""
 msgid "Setup.OSD$Fixed font"
 msgstr ""
 
-msgid "Setup.OSD$Default font size (pixel)"
+msgid "Setup.OSD$Default font size (%)"
 msgstr ""
 
-msgid "Setup.OSD$Small font size (pixel)"
+msgid "Setup.OSD$Small font size (%)"
 msgstr ""
 
-msgid "Setup.OSD$Fixed font size (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
 msgstr ""
 
 msgid "Setup.OSD$Channel info position"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index ea70463ee..860094a48 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -493,17 +493,17 @@ msgstr "Sk
 msgid "Setup.OSD$Theme"
 msgstr "Motyw"
 
-msgid "Setup.OSD$Left"
-msgstr "Od lewej"
+msgid "Setup.OSD$Left (%)"
+msgstr "Od lewej (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Od g�ry"
+msgid "Setup.OSD$Top (%)"
+msgstr "Od g�ry (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Szeroko��"
+msgid "Setup.OSD$Width (%)"
+msgstr "Szeroko�� (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Wysoko��"
+msgid "Setup.OSD$Height (%)"
+msgstr "Wysoko�� (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Czas trwania wiadomo�ci (s)"
@@ -523,14 +523,14 @@ msgstr "Ma
 msgid "Setup.OSD$Fixed font"
 msgstr "Sta�a czcionka"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Standardowa czcionka wyj�ciowa (pixle)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Standardowa czcionka wyj�ciowa (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Ma�a czcionka wyj�ciowa (pixle)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Ma�a czcionka wyj�ciowa (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Ustalona czcionka wyj�ciowa (pixle)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Ustalona czcionka wyj�ciowa (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozycja informacji o kanale"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 2182f66bc..fa4767f40 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -492,17 +492,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Esquerda"
+msgid "Setup.OSD$Left (%)"
+msgstr "Esquerda (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Topo"
+msgid "Setup.OSD$Top (%)"
+msgstr "Topo (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Largura"
+msgid "Setup.OSD$Width (%)"
+msgstr "Largura (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Altura"
+msgid "Setup.OSD$Height (%)"
+msgstr "Altura (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Dura��o das mensagem (s)"
@@ -522,14 +522,14 @@ msgstr "Fonte pequena"
 msgid "Setup.OSD$Fixed font"
 msgstr "Fonte Fixa"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Tamanho por defeito de fonte (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Tamanho por defeito de fonte (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Tamanho da fonte pequena (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Tamanho da fonte pequena (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Tamanho da fonte fixa (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Tamanho da fonte fixa (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Posi��o de info dos canais"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index b7a5ca954..0c6013cbf 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -495,17 +495,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Tem�"
 
-msgid "Setup.OSD$Left"
-msgstr "St�nga"
+msgid "Setup.OSD$Left (%)"
+msgstr "St�nga (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Sus"
+msgid "Setup.OSD$Top (%)"
+msgstr "Sus (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "L��ime OSD"
+msgid "Setup.OSD$Width (%)"
+msgstr "L��ime OSD (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "�n�l�ime OSD"
+msgid "Setup.OSD$Height (%)"
+msgstr "�n�l�ime OSD (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Timp afi�are mesaje (sec)"
@@ -525,14 +525,14 @@ msgstr "Font mic"
 msgid "Setup.OSD$Fixed font"
 msgstr "Font cu l��ime fix�"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "M�rimea implicit� a fontului (pixeli)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "M�rimea implicit� a fontului (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "M�rimea 'mic�' a fontului (pixeli)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "M�rimea 'mic�' a fontului (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "M�rimea 'fix�' a fontului (pixeli)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "M�rimea 'fix�' a fontului (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozi�ia informa�iilor despre canal"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index a3c19cd9b..a0a255575 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -493,17 +493,17 @@ msgstr "
 msgid "Setup.OSD$Theme"
 msgstr "����"
 
-msgid "Setup.OSD$Left"
-msgstr "������ �����"
+msgid "Setup.OSD$Left (%)"
+msgstr "������ ����� (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "������ ������"
+msgid "Setup.OSD$Top (%)"
+msgstr "������ ������ (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "������"
+msgid "Setup.OSD$Width (%)"
+msgstr "������ (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "������"
+msgid "Setup.OSD$Height (%)"
+msgstr "������ (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "������������ ������ ��������� (���)"
@@ -523,14 +523,14 @@ msgstr "
 msgid "Setup.OSD$Fixed font"
 msgstr "������������� ����"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "������ ����� ��� ���� (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "������ ����� ��� ���� (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "������ ������� ����� (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "������ ������� ����� (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "������ �������������� ����� (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "������ �������������� ����� (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "��������� ���� ���������� � ������"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6f3d041e5..347e59915 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -493,17 +493,17 @@ msgstr "Preobleka"
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Levo"
+msgid "Setup.OSD$Left (%)"
+msgstr "Levo (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "Zgoraj"
+msgid "Setup.OSD$Top (%)"
+msgstr "Zgoraj (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "�irina"
+msgid "Setup.OSD$Width (%)"
+msgstr "�irina (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Vi�ina"
+msgid "Setup.OSD$Height (%)"
+msgstr "Vi�ina (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "�as prikaza sporo�ila (s)"
@@ -523,14 +523,14 @@ msgstr "Mala pisava"
 msgid "Setup.OSD$Fixed font"
 msgstr "Fiksna pisava"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Privzeta velikost pisave (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Privzeta velikost pisave (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Majhna velikost pisave (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Majhna velikost pisave (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Pozicija informacije o kanalu"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr ""
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacije o kanalu"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 5f8d20dee..d47da8a26 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -495,17 +495,17 @@ msgstr "Skin"
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "V�nster"
+msgid "Setup.OSD$Left (%)"
+msgstr "V�nster (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "�vre"
+msgid "Setup.OSD$Top (%)"
+msgstr "�vre (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Bredd"
+msgid "Setup.OSD$Width (%)"
+msgstr "Bredd (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "H�jd"
+msgid "Setup.OSD$Height (%)"
+msgstr "H�jd (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Tid f�r meddelanden (sek)"
@@ -525,14 +525,14 @@ msgstr "Sm
 msgid "Setup.OSD$Fixed font"
 msgstr "Fast typsnitt"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Fontstorlek standard (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Fontstorlek standard (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "Fontstorlek liten text (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Fontstorlek liten text (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "Fast fontstorlek (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Fast fontstorlek (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Placering av kanalinformation"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index a5496d380..abdb594ce 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -492,17 +492,17 @@ msgstr "Y
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-msgid "Setup.OSD$Left"
-msgstr "Sol"
+msgid "Setup.OSD$Left (%)"
+msgstr "Sol (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "�st"
+msgid "Setup.OSD$Top (%)"
+msgstr "�st (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "Geni�lik"
+msgid "Setup.OSD$Width (%)"
+msgstr "Geni�lik (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "Y�kseklik"
+msgid "Setup.OSD$Height (%)"
+msgstr "Y�kseklik (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Mesaj g�sterme zaman� (sn)"
@@ -522,14 +522,14 @@ msgstr "K
 msgid "Setup.OSD$Fixed font"
 msgstr "�ak�l� font"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "Ola�an font boyutu (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Ola�an font boyutu (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "K���k font boyutu (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "K���k font boyutu (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "�ak�l� font boyutu (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "�ak�l� font boyutu (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanal bilgi pozisyonu"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 9fe0013f6..3d566fc0d 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -492,17 +492,17 @@ msgstr "
 msgid "Setup.OSD$Theme"
 msgstr "����"
 
-msgid "Setup.OSD$Left"
-msgstr "������� �����"
+msgid "Setup.OSD$Left (%)"
+msgstr "������� ����� (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "������� ������"
+msgid "Setup.OSD$Top (%)"
+msgstr "������� ������ (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "������"
+msgid "Setup.OSD$Width (%)"
+msgstr "������ (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "������"
+msgid "Setup.OSD$Height (%)"
+msgstr "������ (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "���������� ������ ����������� (���)"
@@ -522,14 +522,14 @@ msgstr "
 msgid "Setup.OSD$Fixed font"
 msgstr "���������� ����"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "������ ����� ��� ���� (pixel)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "������ ����� ��� ���� (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "������ ������ ����� (pixel)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "������ ������ ����� (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "������ ����������� ����� (pixel)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "������ ����������� ����� (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "��������� ����� ���������� ��� �����"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 04d16ce79..92b20a713 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -495,17 +495,17 @@ msgstr "外壳"
 msgid "Setup.OSD$Theme"
 msgstr "主题"
 
-msgid "Setup.OSD$Left"
-msgstr "左"
+msgid "Setup.OSD$Left (%)"
+msgstr "左 (%)"
 
-msgid "Setup.OSD$Top"
-msgstr "顶部"
+msgid "Setup.OSD$Top (%)"
+msgstr "顶部 (%)"
 
-msgid "Setup.OSD$Width"
-msgstr "宽"
+msgid "Setup.OSD$Width (%)"
+msgstr "宽 (%)"
 
-msgid "Setup.OSD$Height"
-msgstr "高"
+msgid "Setup.OSD$Height (%)"
+msgstr "高 (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "时间信息 (s)"
@@ -525,14 +525,14 @@ msgstr "小字体"
 msgid "Setup.OSD$Fixed font"
 msgstr "固定字体"
 
-msgid "Setup.OSD$Default font size (pixel)"
-msgstr "默认字体大小 (像素)"
+msgid "Setup.OSD$Default font size (%)"
+msgstr "默认字体大小 (%)"
 
-msgid "Setup.OSD$Small font size (pixel)"
-msgstr "小字体 (像素)"
+msgid "Setup.OSD$Small font size (%)"
+msgstr "小字体 (%)"
 
-msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr "固定的字体 (像素)"
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "固定的字体 (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "频道信息位置"
diff --git a/remux.c b/remux.c
index 10e5145cf..58c05311f 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.19 2009/04/19 10:59:56 kls Exp $
+ * $Id: remux.c 2.20 2009/05/03 14:43:25 kls Exp $
  */
 
 #include "remux.h"
@@ -722,6 +722,13 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
   int Processed = 0;
   newFrame = independentFrame = false;
   while (Length >= TS_SIZE) {
+        if (Data[0] != TS_SYNC_BYTE) {
+           int Skipped = 1;
+           while (Skipped < Length && (Data[Skipped] != TS_SYNC_BYTE || Length - Skipped > TS_SIZE && Data[Skipped + TS_SIZE] != TS_SYNC_BYTE))
+                 Skipped++;
+           esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
+           return Processed + Skipped;
+           }
         if (TsHasPayload(Data) && !TsIsScrambled(Data) && TsPid(Data) == pid) {
            if (TsPayloadStart(Data)) {
               if (!frameDuration) {
diff --git a/vdr.c b/vdr.c
index 36942a51a..46e420099 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 2.7 2009/04/05 13:21:46 kls Exp $
+ * $Id: vdr.c 2.8 2009/05/03 10:33:06 kls Exp $
  */
 
 #include <getopt.h>
@@ -747,6 +747,12 @@ int main(int argc, char *argv[])
               CheckHasProgramme = false;
               }
            }
+        // Update the OSD size:
+        {
+          static time_t lastOsdSizeUpdate = 0;
+          if (Now != lastOsdSizeUpdate) // once per second
+             cOsdProvider::UpdateOsdSize();
+        }
         // Restart the Watchdog timer:
         if (WatchdogTimeout > 0) {
            int LatencyTime = WatchdogTimeout - alarm(WatchdogTimeout);

From ab6f2ccf424896a80b6e2fdf9ab9313ea4b7f316 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Jun 2009 13:49:00 +0200
Subject: [PATCH 194/307] =?UTF-8?q?Version=201.7.8=20-=20The=20name=20of?=
 =?UTF-8?q?=20the=20function=20cDevice::GetVideoSize()=20wasn't=20very=20w?=
 =?UTF-8?q?ell=20chosen=20=20=20for=20its=20purpose=20of=20defining=20the?=
 =?UTF-8?q?=20optimum=20size=20of=20the=20OSD=20for=20the=20current=20=20?=
 =?UTF-8?q?=20output=20device.=20Therefore=20a=20new=20function=20named=20?=
 =?UTF-8?q?cDevice::GetOsdSize()=20has=20=20=20been=20introduced=20(sugges?=
 =?UTF-8?q?ted=20by=20Rolf=20Ahrenberg).=20Plugin=20authors=20should=20=20?=
 =?UTF-8?q?=20implement=20this=20function=20in=20classes=20derived=20from?=
 =?UTF-8?q?=20cDevice,=20if=20they=20are=20able=20=20=20to=20replay=20vide?=
 =?UTF-8?q?o.=20cDevice::GetVideoSize()=20still=20exists=20and=20should=20?=
 =?UTF-8?q?return=20the=20=20=20actual=20size=20of=20the=20video=20materia?=
 =?UTF-8?q?l=20that=20is=20currently=20replayed.=20Note=20that=20=20=20bec?=
 =?UTF-8?q?ause=20of=20the=20many=20possible=20aspect=20ratios=20for=20vid?=
 =?UTF-8?q?eo=20material,=20the=20type=20=20=20of=20the=20Aspect=20paramet?=
 =?UTF-8?q?er=20of=20GetVideoSize()=20has=20been=20changed=20to=20'double'?=
 =?UTF-8?q?,=20=20=20and=20the=20Aspect=20parameter=20in=20both=20function?=
 =?UTF-8?q?s=20is=20named=20differently,=20because=20=20=20it=20returns=20?=
 =?UTF-8?q?different=20values=20(suggested=20by=20Reinhard=20Nissl).=20=20?=
 =?UTF-8?q?=20Thanks=20to=20Oliver=20Endriss=20for=20his=20input=20on=20ca?=
 =?UTF-8?q?lculating=20the=20Aspect=20factor=20in=20=20=20GetOsdSize().=20?=
 =?UTF-8?q?-=20Fixed=20the=20way=20the=20OSD=20size=20is=20determined=20on?=
 =?UTF-8?q?=20full=20featured=20DVB=20cards=20(thanks=20=20=20to=20Oliver?=
 =?UTF-8?q?=20Endriss).=20-=20Increased=20MAXOSDHEIGHT=20to=201200=20(sugg?=
 =?UTF-8?q?ested=20by=20Nicolas=20Huillard).=20-=20Removed=20limitation=20?=
 =?UTF-8?q?to=20PAL=20resolution=20from=20SPU=20handling.=20-=20Checking?=
 =?UTF-8?q?=20fd=5Fvideo=20in=20cDvbDevice::GetVideoSize()=20to=20avoid=20?=
 =?UTF-8?q?error=20messages=20on=20=20=20systems=20with=20no=20real=20prim?=
 =?UTF-8?q?ary=20replay=20device=20(reported=20by=20Martin=20Neuditschko).?=
 =?UTF-8?q?=20-=20Added=20a=20note=20to=20cTsToPes::GetPes()=20about=20hav?=
 =?UTF-8?q?ing=20to=20call=20it=20repeatedly,=20once=20=20=20it=20has=20re?=
 =?UTF-8?q?turned=20a=20non-NULL=20value.=20-=20Added=20MPEG=201=20handlin?=
 =?UTF-8?q?g=20to=20remux.c=20(thanks=20to=20Ales=20Jurik).=20-=20Fixed=20?=
 =?UTF-8?q?use=20of=20time=5Ft=20in=20cEIT::cEIT()=20(thanks=20to=20Tobias?=
 =?UTF-8?q?=20Bratfisch).=20-=20Added=20missing=20update=20of=20lastOsdSiz?=
 =?UTF-8?q?eUpdate.=20-=20EIT=20events=20are=20now=20only=20processed=20if?=
 =?UTF-8?q?=20a=20plausible=20system=20time=20is=20available,=20to=20=20?=
 =?UTF-8?q?=20avoid=20wrong=20handling=20of=20PDC=20descriptors=20(thanks?=
 =?UTF-8?q?=20to=20Tobias=20Bratfisch).=20-=20Removed=20unused=20'synced'?=
 =?UTF-8?q?=20member=20from=20cTsToPes=20(reported=20by=20Christoph=20Haub?=
 =?UTF-8?q?rich).=20-=20Added=20a=20note=20to=20cTsToPes=20about=20all=20T?=
 =?UTF-8?q?S=20packets=20having=20to=20belong=20to=20the=20same=20PID,=20?=
 =?UTF-8?q?=20=20and=20that=20for=20video=20data=20GetPes()=20may=20only?=
 =?UTF-8?q?=20be=20called=20if=20the=20next=20TS=20packet=20that=20=20=20w?=
 =?UTF-8?q?ill=20be=20given=20to=20PutTs()=20has=20the=20"payload=20start"?=
 =?UTF-8?q?=20flag=20set=20(suggested=20by=20Christoph=20=20=20Haubrich).?=
 =?UTF-8?q?=20-=20Added=20a=20note=20about=20the=20meaning=20of=20PERCENTA?=
 =?UTF-8?q?GEDELTA=20in=20cRingBuffer::UpdatePercentage()=20=20=20(thanks?=
 =?UTF-8?q?=20to=20Rolf=20Ahrenberg).=20-=20The=20new=20setup=20option=20"?=
 =?UTF-8?q?Recording/Pause=20key=20handling"=20can=20be=20used=20to=20defi?=
 =?UTF-8?q?ne=20=20=20what=20happens=20if=20the=20Pause=20key=20on=20the?=
 =?UTF-8?q?=20remote=20control=20is=20pressed=20during=20=20=20live=20tv?=
 =?UTF-8?q?=20(thanks=20to=20Timo=20Eskola).=20-=20Added=20a=20note=20abou?=
 =?UTF-8?q?t=20cFont::GetFont()=20not=20being=20thread-safe.=20-=20Fixed?=
 =?UTF-8?q?=20generating=20PAT/PMT=20version=20numbers=20in=20case=20the?=
 =?UTF-8?q?=20PIDs=20change=20during=20=20=20recording=20(reported=20by=20?=
 =?UTF-8?q?Reinhard=20Nissl).=20-=20Updated=20the=20Ukrainian=20OSD=20text?=
 =?UTF-8?q?s=20(thanks=20to=20Yarema=20Aka=20Knedlyk).=20-=20Fixed=20a=20m?=
 =?UTF-8?q?emory=20leak=20when=20reaching=20the=20end=20of=20a=20recording?=
 =?UTF-8?q?=20during=20replay=20(reported=20=20=20by=20Reinhard=20Nissl).?=
 =?UTF-8?q?=20-=20Fixed=20calling=20close(-1)=20in=20cUnbufferedFile::Clos?=
 =?UTF-8?q?e()=20(reported=20by=20Reinhard=20Nissl).=20-=20Added=20a=20wor?=
 =?UTF-8?q?karound=20for=20the=20broken=20linux-dvb=20driver=20header=20fi?=
 =?UTF-8?q?les=20(based=20on=20a=20patch=20=20=20from=20Tobias=20Grimm).?=
 =?UTF-8?q?=20-=20Fixed=20handling=20the=20length=20of=20DiSEqC=20command?=
 =?UTF-8?q?=20sequences=20(reported=20by=20Reinhard=20Nissl).=20-=20Fixed?=
 =?UTF-8?q?=20cOsdMenu::Display()=20in=20case=20the=20menu=20size=20has=20?=
 =?UTF-8?q?changed=20(thanks=20to=20=20=20Reinhard=20Nissl).=20-=20Added?=
 =?UTF-8?q?=20some=20missing=20'const'=20keywords=20to=20avoid=20compilati?=
 =?UTF-8?q?on=20errors=20with=20gcc=204.4=20=20=20(thanks=20to=20Ville=20S?=
 =?UTF-8?q?kytt=C3=A4=20and=20Ludwig=20Nussel).=20-=20Modified=20cSVDRP::C?=
 =?UTF-8?q?mdGRAB()=20to=20avoid=20writing=20into=20const=20data=20(report?=
 =?UTF-8?q?ed=20by=20=20=20Ludwig=20Nussel).=20-=20Fixed=20calculating=20m?=
 =?UTF-8?q?enu=20colum=20widths=20in=20case=20the=20font=20has=20a=20size?=
 =?UTF-8?q?=20other=20than=20the=20=20=20default=20size=20(reported=20by?=
 =?UTF-8?q?=20Reinhard=20Nissl).=20-=20Added=20a=20plausibility=20check=20?=
 =?UTF-8?q?for=20the=20OSD=20percentage=20parameters=20=20=20to=20avoid=20?=
 =?UTF-8?q?problems=20in=20case=20the=20values=20are=20stored=20in=20the?=
 =?UTF-8?q?=20setup.conf=20=20=20file=20in=20a=20=20wrong=20way.=20-=20Fix?=
 =?UTF-8?q?ed=20variable=20types=20in=20cIndexFile=20(reported=20by=20Udo?=
 =?UTF-8?q?=20Richter).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS |  32 +++
 HISTORY      |  61 +++++
 MANUAL       |   7 +
 PLUGINS.html |   4 +-
 config.c     |  20 +-
 config.h     |  14 +-
 device.c     |  23 +-
 device.h     |  31 ++-
 dvbdevice.c  |  71 ++++--
 dvbdevice.h  |   6 +-
 dvbplayer.c  |  84 +++----
 dvbspu.c     |  31 ++-
 dvbspu.h     |   8 +-
 eit.c        |   9 +-
 font.h       |  10 +-
 menu.c       |   8 +-
 osd.c        |  11 +-
 osd.h        |   4 +-
 osdbase.c    |   3 +-
 po/ca_ES.po  |  17 +-
 po/cs_CZ.po  |  17 +-
 po/da_DK.po  |  17 +-
 po/de_DE.po  |  17 +-
 po/el_GR.po  |  17 +-
 po/es_ES.po  |  17 +-
 po/et_EE.po  |  17 +-
 po/fi_FI.po  |  17 +-
 po/fr_FR.po  |  17 +-
 po/hr_HR.po  |  17 +-
 po/hu_HU.po  |  17 +-
 po/it_IT.po  |  17 +-
 po/nl_NL.po  |  17 +-
 po/nn_NO.po  |  17 +-
 po/pl_PL.po  |  17 +-
 po/pt_PT.po  |  17 +-
 po/ro_RO.po  |  17 +-
 po/ru_RU.po  |  17 +-
 po/sl_SI.po  |  17 +-
 po/sv_SE.po  |  17 +-
 po/tr_TR.po  |  17 +-
 po/uk_UA.po  | 655 ++++++++++++++++++++++++++-------------------------
 po/zh_CN.po  |  17 +-
 recorder.c   |   8 +-
 recording.c  |  68 +++++-
 recording.h  |   3 +-
 remux.c      |  41 +++-
 remux.h      |  31 ++-
 ringbuffer.c |   4 +-
 skins.c      |   5 +-
 svdrp.c      |  15 +-
 tools.c      |  14 +-
 vdr.c        |  14 +-
 52 files changed, 1147 insertions(+), 522 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7bdc251b4..7cdfa22bb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -672,6 +672,8 @@ Oliver Endriss <o.endriss@gmx.de>
  VPID is 0
  for reporting chirping sound disturbences at editing points in TS recordings
  for reporting broken index generation in TS recordings after a buffer overflow
+ for fixing the way the OSD size is determined on full featured DVB cards
+ for his input on calculating the Aspect factor in GetOsdSize()
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -918,6 +920,8 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for a hint on using _nl_msg_cat_cntr
  for adding some missing 'const' keywords
  for pointing out that "%016llX" should be used instead of "%016LX"
+ for adding some missing 'const' keywords to avoid compilation errors with gcc 4.4
+ for reporting that cSVDRP::CmdGRAB() writes into const data
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -1073,6 +1077,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for replacing the Finnish language code "smi" with "suo"
  for adding cap_sys_nice to the capabilities that are not dropped
  for adding cThread::SetIOPriority() and using it in cRemoveDeletedRecordingsThread
+ for suggesting to introduce cDevice::GetOsdSize()
+ for adding a note about the meaning of PERCENTAGEDELTA in cRingBuffer::UpdatePercentage()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1212,6 +1218,17 @@ Reinhard Nissl <rnissl@gmx.de>
  for making sure vdr-xine no longer needs cDvbPlayer::Action() to call DeviceFlush()
  for fixing the 'VideoOnly' condition in the PlayPes() and PlayTs() calls in
  cDvbPlayer::Action()
+ for reporting a problem in case the PIDs change during recording
+ for reporting a memory leak when reaching the end of a recording during replay
+ for reporting a call to close(-1) in cUnbufferedFile::Close()
+ for reporting a possible problem in handling the length of DiSEqC command sequences
+ for fixing cOsdMenu::Display() in case the menu size has changed
+ for suggesting to change the type of the Aspect parameter of GetVideoSize()
+ to 'double'
+ for suggesting to use different names for the Aspect parameter in GetVideoSize()
+ and GetOsdSize()
+ for reporting a problem with calculating menu colum widths in case the font has a
+ size other than the default size
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1623,6 +1640,7 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a problem with handling the maximum video file size
  for suggesting to add a note to the INSTALL file about using subdirectories to
  split a large disk into separate areas for VDR's video data and other stuff
+ for reporting wrong variable types in cIndexFile
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1814,6 +1832,7 @@ Ville Skytt
  menu
  for adding missing #include <limits.h> to epg.c and menuitems.h
  for fixing various spelling errors and improving PLUGINS.html
+ for adding some missing 'const' keywords to avoid compilation errors with gcc 4.4
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1953,6 +1972,7 @@ Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 
 Nicolas Huillard <nhuillard@e-dition.fr>
  for translating OSD texts to the French language
+ for suggesting to increase MAXOSDHEIGHT to 1200
 
 Patrick Fischer <patrick_fischer@gmx.de>
  for reporting an error in the cFilter example in PLUGINS.html
@@ -2126,6 +2146,9 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  check to it
  for changing cBitmap::DrawText() to always draw the background unless ColorBg
  is clrTransparent
+ for reporting unused 'synced' member in cTsToPes
+ for suggesting to add a note to cTsToPes about all TS packets having to belong to
+ the same PID
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2164,6 +2187,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for fixing a signed character used as index in cBase64Encoder::NextLine()
  for fixing formatting the name section in the VDR man pages
  for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h
+ for a patch that added a workaround for the broken linux-dvb driver header files
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2310,6 +2334,8 @@ Tobias Bratfisch <tobias@reel-multimedia.com>
  for optimizing cNitFilter::Process()
  for reducing the number of time(NULL) calls in vdr.c's main loop to a single call
  for improving efficiency of cEIT::cEIT()
+ for fixing the use of time_t in cEIT::cEIT()
+ for making EIT events be processed only if a plausible system time is available
 
 Bruno Roussel <bruno.roussel@free.fr>
  for translating OSD texts to the French language
@@ -2331,6 +2357,7 @@ Diego Pierotto <vdr-italian@tiscali.it>
 Timo Eskola <timo@tolleri.net>
  for implementing sending all frames to devices that can handle them in fast forward
  trick speeds
+ for implementing the setup option "Recording/Pause key handling"
 
 Elias Luttinen <el@iki.fi>
  for improving the description of where logging goes in the INSTALL file
@@ -2394,6 +2421,7 @@ Sundararaj Reel <sundararaj.reel@googlemail.com>
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
  character set to ISO-8859-9
+ for adding MPEG 1 handling to remux.c
 
 Magnus Andersson <svankan@bahnhof.se>
  for translating OSD texts to the Swedish language
@@ -2446,3 +2474,7 @@ Marcel Unbehaun <frostworks@gmx.de>
 
 G�nter Niedermeier <linuxtv@ncs-online.de>
  for reporting a problem with file I/O overhead during recording in TS format
+
+Martin Neuditschko <yosuke.tomoe@gmx.net>
+ for reporting a problem with error messages from cDvbDevice::GetVideoSize()
+ on systems with no real primary replay device
diff --git a/HISTORY b/HISTORY
index d94e1612a..bf32b6a14 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6074,3 +6074,64 @@ Video Disk Recorder Revision History
   (provided the output device implements the GetVideoSize() function).
 - cFrameDetector::Analyze() now syncs on the TS packet sync bytes (thanks to
   Oliver Endriss for reporting broken index generation after a buffer overflow).
+
+2009-06-13: Version 1.7.8
+
+- The name of the function cDevice::GetVideoSize() wasn't very well chosen
+  for its purpose of defining the optimum size of the OSD for the current
+  output device. Therefore a new function named cDevice::GetOsdSize() has
+  been introduced (suggested by Rolf Ahrenberg). Plugin authors should
+  implement this function in classes derived from cDevice, if they are able
+  to replay video. cDevice::GetVideoSize() still exists and should return the
+  actual size of the video material that is currently replayed. Note that
+  because of the many possible aspect ratios for video material, the type
+  of the Aspect parameter of GetVideoSize() has been changed to 'double',
+  and the Aspect parameter in both functions is named differently, because
+  it returns different values (suggested by Reinhard Nissl).
+  Thanks to Oliver Endriss for his input on calculating the Aspect factor in
+  GetOsdSize().
+- Fixed the way the OSD size is determined on full featured DVB cards (thanks
+  to Oliver Endriss).
+- Increased MAXOSDHEIGHT to 1200 (suggested by Nicolas Huillard).
+- Removed limitation to PAL resolution from SPU handling.
+- Checking fd_video in cDvbDevice::GetVideoSize() to avoid error messages on
+  systems with no real primary replay device (reported by Martin Neuditschko).
+- Added a note to cTsToPes::GetPes() about having to call it repeatedly, once
+  it has returned a non-NULL value.
+- Added MPEG 1 handling to remux.c (thanks to Ales Jurik).
+- Fixed use of time_t in cEIT::cEIT() (thanks to Tobias Bratfisch).
+- Added missing update of lastOsdSizeUpdate.
+- EIT events are now only processed if a plausible system time is available, to
+  avoid wrong handling of PDC descriptors (thanks to Tobias Bratfisch).
+- Removed unused 'synced' member from cTsToPes (reported by Christoph Haubrich).
+- Added a note to cTsToPes about all TS packets having to belong to the same PID,
+  and that for video data GetPes() may only be called if the next TS packet that
+  will be given to PutTs() has the "payload start" flag set (suggested by Christoph
+  Haubrich).
+- Added a note about the meaning of PERCENTAGEDELTA in cRingBuffer::UpdatePercentage()
+  (thanks to Rolf Ahrenberg).
+- The new setup option "Recording/Pause key handling" can be used to define
+  what happens if the Pause key on the remote control is pressed during
+  live tv (thanks to Timo Eskola).
+- Added a note about cFont::GetFont() not being thread-safe.
+- Fixed generating PAT/PMT version numbers in case the PIDs change during
+  recording (reported by Reinhard Nissl).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Fixed a memory leak when reaching the end of a recording during replay (reported
+  by Reinhard Nissl).
+- Fixed calling close(-1) in cUnbufferedFile::Close() (reported by Reinhard Nissl).
+- Added a workaround for the broken linux-dvb driver header files (based on a patch
+  from Tobias Grimm).
+- Fixed handling the length of DiSEqC command sequences (reported by Reinhard Nissl).
+- Fixed cOsdMenu::Display() in case the menu size has changed (thanks to
+  Reinhard Nissl).
+- Added some missing 'const' keywords to avoid compilation errors with gcc 4.4
+  (thanks to Ville Skytt� and Ludwig Nussel).
+- Modified cSVDRP::CmdGRAB() to avoid writing into const data (reported by
+  Ludwig Nussel).
+- Fixed calculating menu colum widths in case the font has a size other than the
+  default size (reported by Reinhard Nissl).
+- Added a plausibility check for the OSD percentage parameters
+  to avoid problems in case the values are stored in the setup.conf
+  file in a  wrong way.
+- Fixed variable types in cIndexFile (reported by Udo Richter).
diff --git a/MANUAL b/MANUAL
index ebf89fd4c..e4f6284f7 100644
--- a/MANUAL
+++ b/MANUAL
@@ -748,6 +748,13 @@ Version 1.6
   Pause priority = 10    The Priority and Lifetime values used when pausing live
   Pause lifetime = 1     video.
 
+  Pause key handling = 3 Defines what happens if the Pause key on the remote control
+                         is pressed during live tv.
+                         0 = do not pause live video
+                         1 = confirm pause live video
+                         2 = pause live video
+                         The default is 2.
+
   Use episode name = yes Repeating timers use the EPG's 'Episode name' information
                          to create recording file names in a hierarchical structure
                          (for instance to gather all episodes of a series in a
diff --git a/PLUGINS.html b/PLUGINS.html
index 344015b1e..e8fa16a78 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1944,10 +1944,10 @@ <h1>Table Of Contents</h1>
 should implement the function
 
 <p><table><tr><td class="code"><pre>
-virtual void GetVideoSize(int &amp;Width, int &amp;Height, eVideoAspect &amp;Aspect);
+virtual void GetOsdSize(int &amp;Width, int &amp;Height, double &amp;Aspect);
 </pre></td></tr></table><p>
 
-By default, an OSD size of 480x324 with an aspect ratio of 4:3 is assumed.
+By default, an OSD size of 720x480 with an aspect ratio of 1.0 is assumed.
 </div modified>
 
 <p>
diff --git a/config.c b/config.c
index 669228b72..df82baaa8 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.2 2009/05/03 13:58:08 kls Exp $
+ * $Id: config.c 2.5 2009/06/13 10:25:05 kls Exp $
  */
 
 #include "config.h"
@@ -20,6 +20,8 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
+#define ChkDoublePlausibility(Variable, Default) { if (Variable < 0.00001) Variable = Default; }
+
 // --- cCommand --------------------------------------------------------------
 
 char *cCommand::result = NULL;
@@ -250,6 +252,7 @@ cSetup::cSetup(void)
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 99;
+  PauseKeyHandling = 2;
   PausePriority = 10;
   PauseLifetime = 1;
   UseSubtitle = 1;
@@ -270,6 +273,7 @@ cSetup::cSetup(void)
   OSDTop = 45;
   OSDWidth = 624;
   OSDHeight = 486;
+  OSDAspect = 1.0;
   OSDMessageTime = 1;
   UseSmallFont = 1;
   AntiAlias = 1;
@@ -435,6 +439,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+  else if (!strcasecmp(Name, "PauseKeyHandling"))    PauseKeyHandling   = atoi(Value);
   else if (!strcasecmp(Name, "PausePriority"))       PausePriority      = atoi(Value);
   else if (!strcasecmp(Name, "PauseLifetime"))       PauseLifetime      = atoi(Value);
   else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
@@ -449,21 +454,22 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "ChannelInfoTime"))     ChannelInfoTime    = atoi(Value);
   else if (!strcasecmp(Name, "OSDLeftP"))            OSDLeftP           = atof(Value);
   else if (!strcasecmp(Name, "OSDTopP"))             OSDTopP            = atof(Value);
-  else if (!strcasecmp(Name, "OSDWidthP"))           OSDWidthP          = atof(Value);
-  else if (!strcasecmp(Name, "OSDHeightP"))          OSDHeightP         = atof(Value);
+  else if (!strcasecmp(Name, "OSDWidthP"))         { OSDWidthP          = atof(Value); ChkDoublePlausibility(OSDWidthP, 0.87); }
+  else if (!strcasecmp(Name, "OSDHeightP"))        { OSDHeightP         = atof(Value); ChkDoublePlausibility(OSDHeightP, 0.84); }
   else if (!strcasecmp(Name, "OSDLeft"))             OSDLeft            = atoi(Value);
   else if (!strcasecmp(Name, "OSDTop"))              OSDTop             = atoi(Value);
   else if (!strcasecmp(Name, "OSDWidth"))          { OSDWidth           = atoi(Value); OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
   else if (!strcasecmp(Name, "OSDHeight"))           OSDHeight          = atoi(Value);
+  else if (!strcasecmp(Name, "OSDAspect"))           OSDAspect          = atof(Value);
   else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
   else if (!strcasecmp(Name, "UseSmallFont"))        UseSmallFont       = atoi(Value);
   else if (!strcasecmp(Name, "AntiAlias"))           AntiAlias          = atoi(Value);
   else if (!strcasecmp(Name, "FontOsd"))             Utf8Strn0Cpy(FontOsd, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontSml"))             Utf8Strn0Cpy(FontSml, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontFix"))             Utf8Strn0Cpy(FontFix, Value, MAXFONTNAME);
-  else if (!strcasecmp(Name, "FontOsdSizeP"))        FontOsdSizeP       = atof(Value);
-  else if (!strcasecmp(Name, "FontSmlSizeP"))        FontSmlSizeP       = atof(Value);
-  else if (!strcasecmp(Name, "FontFixSizeP"))        FontFixSizeP       = atof(Value);
+  else if (!strcasecmp(Name, "FontOsdSizeP"))      { FontOsdSizeP       = atof(Value); ChkDoublePlausibility(FontOsdSizeP, 0.038); }
+  else if (!strcasecmp(Name, "FontSmlSizeP"))      { FontSmlSizeP       = atof(Value); ChkDoublePlausibility(FontSmlSizeP, 0.035); }
+  else if (!strcasecmp(Name, "FontFixSizeP"))      { FontFixSizeP       = atof(Value); ChkDoublePlausibility(FontFixSizeP, 0.031); }
   else if (!strcasecmp(Name, "FontOsdSize"))         FontOsdSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontSmlSize"))         FontSmlSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontFixSize"))         FontFixSize        = atoi(Value);
@@ -525,6 +531,7 @@ bool cSetup::Save(void)
   Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
+  Store("PauseKeyHandling",   PauseKeyHandling);
   Store("PausePriority",      PausePriority);
   Store("PauseLifetime",      PauseLifetime);
   Store("UseSubtitle",        UseSubtitle);
@@ -545,6 +552,7 @@ bool cSetup::Save(void)
   Store("OSDTop",             OSDTop);
   Store("OSDWidth",           OSDWidth);
   Store("OSDHeight",          OSDHeight);
+  Store("OSDAspect",          OSDAspect);
   Store("OSDMessageTime",     OSDMessageTime);
   Store("UseSmallFont",       UseSmallFont);
   Store("AntiAlias",          AntiAlias);
diff --git a/config.h b/config.h
index 5a884ca4e..7a41d4019 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.9 2009/05/03 13:15:35 kls Exp $
+ * $Id: config.h 2.13 2009/05/21 11:11:32 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.7"
-#define VDRVERSNUM   10707  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.8"
+#define VDRVERSNUM   10708  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.7"
-#define APIVERSNUM   10707  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.8"
+#define APIVERSNUM   10708  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -42,7 +42,7 @@
 #define MINOSDWIDTH   480
 #define MAXOSDWIDTH  1920
 #define MINOSDHEIGHT  324
-#define MAXOSDHEIGHT 1080
+#define MAXOSDHEIGHT 1200
 
 #define MaxFileName 256
 #define MaxSkinName 16
@@ -234,6 +234,7 @@ class cSetup : public cConfig<cSetupLine> {
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
+  int PauseKeyHandling;
   int UseSubtitle;
   int UseVps;
   int VpsMargin;
@@ -246,6 +247,7 @@ class cSetup : public cConfig<cSetupLine> {
   int ChannelInfoTime;
   double OSDLeftP, OSDTopP, OSDWidthP, OSDHeightP;
   int OSDLeft, OSDTop, OSDWidth, OSDHeight;
+  double OSDAspect;
   int OSDMessageTime;
   int UseSmallFont;
   int AntiAlias;
diff --git a/device.c b/device.c
index ca2c3b3ce..834b6ead7 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.17 2009/05/02 12:17:39 kls Exp $
+ * $Id: device.c 2.23 2009/06/06 13:25:58 kls Exp $
  */
 
 #include "device.h"
@@ -19,11 +19,6 @@
 #include "status.h"
 #include "transfer.h"
 
-const char *VideoAspectString[] = { "4:3",
-                                    "16:9",
-                                    "2.21:9"
-                                  };
-
 // --- cLiveSubtitle ---------------------------------------------------------
 
 class cLiveSubtitle : public cReceiver {
@@ -66,6 +61,7 @@ cDevice *cDevice::primaryDevice = NULL;
 cDevice *cDevice::avoidDevice = NULL;
 
 cDevice::cDevice(void)
+:patPmtParser(true)
 {
   cardIndex = nextCardIndex++;
 
@@ -389,11 +385,18 @@ eVideoSystem cDevice::GetVideoSystem(void)
   return vsPAL;
 }
 
-void cDevice::GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect)
+void cDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
+{
+  Width = 0;
+  Height = 0;
+  VideoAspect = 1.0;
+}
+
+void cDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
 {
-  Width = MINOSDWIDTH;
-  Height = MINOSDHEIGHT;
-  Aspect = va4_3;
+  Width = 720;
+  Height = 480;
+  PixelAspect = 1.0;
 }
 
 //#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
diff --git a/device.h b/device.h
index 74f1277ae..8ac859460 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.10 2009/05/02 12:16:20 kls Exp $
+ * $Id: device.h 2.15 2009/06/06 11:15:49 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -56,13 +56,6 @@ enum eVideoSystem { vsPAL,
                     vsNTSC
                   };
 
-enum eVideoAspect { va4_3,
-                    va16_9,
-                    va221_9
-                  };
-
-extern const char *VideoAspectString[];
-
 enum eVideoDisplayFormat { vdfPanAndScan,
                            vdfLetterBox,
                            vdfCenterCutOut
@@ -384,9 +377,25 @@ class cDevice : public cThread {
   virtual eVideoSystem GetVideoSystem(void);
          ///< Returns the video system of the currently displayed material
          ///< (default is PAL).
-  virtual void GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect);
-         ///< Returns the With, Height and Aspect ratio of the currently
-         ///< displayed material.
+  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
+         ///< Returns the With, Height and VideoAspect ratio of the currently
+         ///< displayed video material. The data returned by this function is
+         ///< only used for informational purposes (if any). Width and
+         ///< Height are given in pixel (e.g. 720x576) and VideoAspect is
+         ///< e.g. 1.33333 for a 4:3 broadcast, or 1.77778 for 16:9.
+         ///< The default implementation returns 0 for Width and Height
+         ///< and 1.0 for VideoAspect.
+  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
+         ///< Returns the With, Height and PixelAspect ratio the OSD should use
+         ///< to best fit the resolution of the output device. If PixelAspect
+         ///< is not 1.0, the OSD may take this as a hint to scale its
+         ///< graphics in a way that, e.g., a circle will actually
+         ///< show up as a circle on the screen, and not as an ellipse.
+         ///< Values greater than 1.0 mean to stretch the graphics in the
+         ///< vertical direction (or shrink it in the horizontal direction,
+         ///< depending on which dimension shall be fixed). Values less than
+         ///< 1.0 work the other way round. Note that the OSD is not guaranteed
+         ///< to actually use this hint.
 
 // Track facilities
 
diff --git a/dvbdevice.c b/dvbdevice.c
index 84f0e97c6..dd425c8af 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.15 2009/05/03 13:49:41 kls Exp $
+ * $Id: dvbdevice.c 2.21 2009/06/06 11:17:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -232,8 +232,8 @@ bool cDvbTuner::SetFrontend(void)
                          uchar *codes = diseqc->Codes(n);
                          if (codes) {
                             struct dvb_diseqc_master_cmd cmd;
-                            memcpy(cmd.msg, codes, min(n, int(sizeof(cmd.msg))));
-                            cmd.msg_len = n;
+                            cmd.msg_len = min(n, int(sizeof(cmd.msg)));
+                            memcpy(cmd.msg, codes, cmd.msg_len);
                             CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
                             }
                          }
@@ -736,31 +736,62 @@ void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
 eVideoSystem cDvbDevice::GetVideoSystem(void)
 {
   eVideoSystem VideoSystem = vsPAL;
-  video_size_t vs;
-  if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-     if (vs.h == 480 || vs.h == 240)
-        VideoSystem = vsNTSC;
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        if (vs.h == 480 || vs.h == 240)
+           VideoSystem = vsNTSC;
+        }
+     else
+        LOG_ERROR;
      }
-  else
-     LOG_ERROR;
   return VideoSystem;
 }
 
-void cDvbDevice::GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect)
+void cDvbDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
 {
-  video_size_t vs;
-  if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-     Width = vs.w;
-     if (Width < 720) // FIXME: some channels result in a With of, e.g. 544, but the final video *is* 720 wide
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        Width = vs.w;
+        Height = vs.h;
+        switch (vs.aspect_ratio) {
+          default:
+          case VIDEO_FORMAT_4_3:   VideoAspect =  4.0 / 3.0; break;
+          case VIDEO_FORMAT_16_9:  VideoAspect = 16.0 / 9.0; break;
+          case VIDEO_FORMAT_221_1: VideoAspect =       2.21; break;
+          }
+        return;
+        }
+     else
+        LOG_ERROR;
+     }
+  cDevice::GetVideoSize(Width, Height, VideoAspect);
+}
+
+void cDvbDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
+{
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
         Width = 720;
-     Height = vs.h;
-     Aspect = eVideoAspect(vs.aspect_ratio);
-     if (Width >= MINOSDWIDTH && Width <= MAXOSDWIDTH && Height >= MINOSDHEIGHT && Height <= MAXOSDHEIGHT)
+        if (vs.h != 480 && vs.h != 240)
+           Height = 576; // PAL
+        else
+           Height = 480; // NTSC
+        switch (Setup.VideoFormat ? vs.aspect_ratio : VIDEO_FORMAT_4_3) {
+          default:
+          case VIDEO_FORMAT_4_3:   PixelAspect =  4.0 / 3.0; break;
+          case VIDEO_FORMAT_221_1: // FF DVB cards only distinguish between 4:3 and 16:9
+          case VIDEO_FORMAT_16_9:  PixelAspect = 16.0 / 9.0; break;
+          }
+        PixelAspect /= double(Width) / Height;
         return;
+        }
+     else
+        LOG_ERROR;
      }
-  else
-     LOG_ERROR;
-  cDevice::GetVideoSize(Width, Height, Aspect);
+  cDevice::GetOsdSize(Width, Height, PixelAspect);
 }
 
 bool cDvbDevice::SetAudioBypass(bool On)
diff --git a/dvbdevice.h b/dvbdevice.h
index 4e325ca23..e3e28d027 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.4 2009/05/02 10:44:40 kls Exp $
+ * $Id: dvbdevice.h 2.8 2009/06/06 11:16:47 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
 #define __DVBDEVICE_H
 
+#include <sys/mman.h> // FIXME: workaround for broken linux-dvb header files
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/version.h>
 #include "device.h"
@@ -107,7 +108,8 @@ class cDvbDevice : public cDevice {
   virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
   virtual void SetVideoFormat(bool VideoFormat16_9);
   virtual eVideoSystem GetVideoSystem(void);
-  virtual void GetVideoSize(int &Width, int &Height, eVideoAspect &Aspect);
+  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
+  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
 
 // Track facilities
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 219de497f..9f964620d 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.15 2009/04/19 15:19:10 kls Exp $
+ * $Id: dvbplayer.c 2.17 2009/05/31 14:12:42 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -89,7 +89,6 @@ class cNonBlockingFileReader : public cThread {
   uchar *buffer;
   int wanted;
   int length;
-  bool hasData;
   cCondWait newSet;
   cCondVar newDataCond;
   cMutex newDataMutex;
@@ -99,7 +98,8 @@ class cNonBlockingFileReader : public cThread {
   cNonBlockingFileReader(void);
   ~cNonBlockingFileReader();
   void Clear(void);
-  int Read(cUnbufferedFile *File, uchar *Buffer, int Length);
+  void Request(cUnbufferedFile *File, int Length);
+  int Result(uchar **Buffer);
   bool Reading(void) { return buffer; }
   bool WaitForDataMs(int msToWait);
   };
@@ -110,7 +110,6 @@ cNonBlockingFileReader::cNonBlockingFileReader(void)
   f = NULL;
   buffer = NULL;
   wanted = length = 0;
-  hasData = false;
   Start();
 }
 
@@ -128,29 +127,27 @@ void cNonBlockingFileReader::Clear(void)
   free(buffer);
   buffer = NULL;
   wanted = length = 0;
-  hasData = false;
+  Unlock();
+}
+
+void cNonBlockingFileReader::Request(cUnbufferedFile *File, int Length)
+{
+  Lock();
+  Clear();
+  wanted = Length;
+  buffer = MALLOC(uchar, wanted);
+  f = File;
   Unlock();
   newSet.Signal();
 }
 
-int cNonBlockingFileReader::Read(cUnbufferedFile *File, uchar *Buffer, int Length)
+int cNonBlockingFileReader::Result(uchar **Buffer)
 {
-  if (hasData && buffer) {
-     if (buffer != Buffer) {
-        esyslog("ERROR: cNonBlockingFileReader::Read() called with different buffer!");
-        errno = EINVAL;
-        return -1;
-        }
+  LOCK_THREAD;
+  if (buffer && length == wanted) {
+     *Buffer = buffer;
      buffer = NULL;
-     return length;
-     }
-  if (!buffer) {
-     f = File;
-     buffer = Buffer;
-     wanted = Length;
-     length = 0;
-     hasData = false;
-     newSet.Signal();
+     return wanted;
      }
   errno = EAGAIN;
   return -1;
@@ -160,20 +157,23 @@ void cNonBlockingFileReader::Action(void)
 {
   while (Running()) {
         Lock();
-        if (!hasData && f && buffer) {
+        if (f && buffer && length < wanted) {
            int r = f->Read(buffer + length, wanted - length);
-           if (r >= 0) {
+           if (r > 0)
               length += r;
-              if (!r || length == wanted) { // r == 0 means EOF
-                 cMutexLock NewDataLock(&newDataMutex);
-                 hasData = true;
-                 newDataCond.Broadcast();
-                 }
+           else if (r == 0) { // r == 0 means EOF
+              if (length > 0)
+                 wanted = length; // already read something, so return the rest
+              else
+                 length = wanted = 0; // report EOF
               }
-           else if (r < 0 && FATALERRNO) {
+           else if (FATALERRNO) {
               LOG_ERROR;
-              length = r; // this will forward the error status to the caller
-              hasData = true;
+              length = wanted = r; // this will forward the error status to the caller
+              }
+           if (length == wanted) {
+              cMutexLock NewDataLock(&newDataMutex);
+              newDataCond.Broadcast();
               }
            }
         Unlock();
@@ -184,7 +184,7 @@ void cNonBlockingFileReader::Action(void)
 bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
 {
   cMutexLock NewDataLock(&newDataMutex);
-  if (hasData)
+  if (buffer && length == wanted)
      return true;
   return newDataCond.TimedWait(newDataMutex, msToWait);
 }
@@ -381,7 +381,6 @@ void cDvbPlayer::Activate(bool On)
 
 void cDvbPlayer::Action(void)
 {
-  uchar *b = NULL;
   uchar *p = NULL;
   int pc = 0;
 
@@ -461,10 +460,12 @@ void cDvbPlayer::Action(void)
                       esyslog("ERROR: frame larger than buffer (%d > %d)", Length, MAXFRAMESIZE);
                       Length = MAXFRAMESIZE;
                       }
-                   b = MALLOC(uchar, Length);
+                   if (!eof)
+                      nonBlockingFileReader->Request(replayFile, Length);
                    }
                 if (!eof) {
-                   int r = nonBlockingFileReader->Read(replayFile, b, Length);
+                   uchar *b = NULL;
+                   int r = nonBlockingFileReader->Result(&b);
                    if (r > 0) {
                       WaitingForData = false;
                       uint32_t Pts = 0;
@@ -473,15 +474,16 @@ void cDvbPlayer::Action(void)
                          LastReadIFrame = readIndex;
                          }
                       readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts); // hands over b to the ringBuffer
-                      b = NULL;
                       }
-                   else if (r == 0)
-                      eof = true;
                    else if (r < 0 && errno == EAGAIN)
                       WaitingForData = true;
-                   else if (r < 0 && FATALERRNO) {
-                      LOG_ERROR;
-                      break;
+                   else {
+                      if (r == 0)
+                         eof = true;
+                      else if (r < 0 && FATALERRNO) {
+                         LOG_ERROR;
+                         break;
+                         }
                       }
                    }
                 }
diff --git a/dvbspu.c b/dvbspu.c
index bef80c3a1..aaf608d0a 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.0 2007/02/03 10:13:18 kls Exp $
+ * $Id: dvbspu.c 2.1 2009/05/09 16:25:59 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -55,18 +55,16 @@ void cDvbSpuPalette::setPalette(const uint32_t * pal)
 #define setMin(a, b) if (a > b) a = b
 #define setMax(a, b) if (a < b) a = b
 
-#define spuXres   720
-#define spuYres   576
-
 #define revRect(r1, r2) { r1.x1 = r2.x2; r1.y1 = r2.y2; r1.x2 = r2.x1; r1.y2 = r2.y1; }
 
 cDvbSpuBitmap::cDvbSpuBitmap(sDvbSpuRect size,
                              uint8_t * fodd, uint8_t * eodd,
                              uint8_t * feven, uint8_t * eeven)
 {
-    if (size.x1 < 0 || size.y1 < 0 || size.x2 >= spuXres
-        || size.y2 >= spuYres)
-        throw;
+    size.x1 = max(size.x1, 0);
+    size.y1 = max(size.y1, 0);
+    size.x2 = min(size.x2, Setup.OSDWidth);
+    size.y2 = min(size.y2, Setup.OSDHeight);
 
     bmpsize = size;
     revRect(minsize[0], size);
@@ -74,10 +72,11 @@ cDvbSpuBitmap::cDvbSpuBitmap(sDvbSpuRect size,
     revRect(minsize[2], size);
     revRect(minsize[3], size);
 
-    if (!(bmp = new uint8_t[spuXres * spuYres * sizeof(uint8_t)]))
-        throw;
+    int MemSize = bmpsize.width() * bmpsize.height() * sizeof(uint8_t);
+    bmp = new uint8_t[MemSize];
 
-    memset(bmp, 0, spuXres * spuYres * sizeof(uint8_t));
+    if (bmp)
+       memset(bmp, 0, MemSize);
     putFieldData(0, fodd, eodd);
     putFieldData(1, feven, eeven);
 }
@@ -94,10 +93,10 @@ cBitmap *cDvbSpuBitmap::getBitmap(const aDvbSpuPalDescr paldescr,
     int h = size.height();
     int w = size.width();
 
-    if (size.y1 + h >= spuYres)
-        h = spuYres - size.y1 - 1;
-    if (size.x1 + w >= spuXres)
-        w = spuXres - size.x1 - 1;
+    if (size.y1 + h >= bmpsize.height())
+        h = bmpsize.height() - size.y1 - 1;
+    if (size.x1 + w >= bmpsize.width())
+        w = bmpsize.width() - size.x1 - 1;
 
     if (w & 0x03)
         w += 4 - (w & 0x03);
@@ -114,7 +113,7 @@ cBitmap *cDvbSpuBitmap::getBitmap(const aDvbSpuPalDescr paldescr,
     // set the content
     for (int yp = 0; yp < h; yp++) {
         for (int xp = 0; xp < w; xp++) {
-            uint8_t idx = bmp[(size.y1 + yp) * spuXres + size.x1 + xp];
+            uint8_t idx = bmp[(size.y1 + yp) * bmpsize.width() + size.x1 + xp];
             ret->SetIndex(xp, yp, idx);
         }
     }
@@ -150,7 +149,7 @@ bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
 
 void cDvbSpuBitmap::putPixel(int xp, int yp, int len, uint8_t colorid)
 {
-    memset(bmp + spuXres * yp + xp, colorid, len);
+    memset(bmp + bmpsize.width() * yp + xp, colorid, len);
     setMin(minsize[colorid].x1, xp);
     setMin(minsize[colorid].y1, yp);
     setMax(minsize[colorid].x2, xp + len - 1);
diff --git a/dvbspu.h b/dvbspu.h
index 8606c8264..685681bee 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 2.0 2006/04/17 12:47:29 kls Exp $
+ * $Id: dvbspu.h 2.1 2009/05/09 16:26:45 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -32,10 +32,10 @@ typedef struct sDvbSpuRect {
     int x1, y1;
     int x2, y2;
 
-    int width() {
+    int width() const {
         return x2 - x1 + 1;
     };
-    int height() {
+    int height() const {
         return y2 - y1 + 1;
     };
 
@@ -63,8 +63,6 @@ class cDvbSpuPalette {
 // --- cDvbSpuBitmap----------------------------------------------------------
 
 class cDvbSpuBitmap {
-
-  public:
   private:
     sDvbSpuRect bmpsize;
     sDvbSpuRect minsize[4];
diff --git a/eit.c b/eit.c
index b78c11796..1189a1087 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.3 2009/04/11 10:03:24 kls Exp $
+ * $Id: eit.c 2.5 2009/05/15 12:34:43 kls Exp $
  */
 
 #include "eit.h"
@@ -17,6 +17,8 @@
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
 
+#define VALID_TIME (31536000 * 2) // two years
+
 // --- cEIT ------------------------------------------------------------------
 
 class cEIT : public SI::EIT {
@@ -46,10 +48,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   struct tm tm_r;
   struct tm t = *localtime_r(&Now, &tm_r); // this initializes the time zone in 't'
 
+  if (Now < VALID_TIME)
+     return; // we need the current time for handling PDC descriptors
+
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
       bool ExternalData = false;
-      int StartTime = SiEitEvent.getStartTime();
+      time_t StartTime = SiEitEvent.getStartTime();
       int Duration = SiEitEvent.getDuration();
       // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
       if (StartTime == 0 || StartTime > 0 && Duration == 0)
diff --git a/font.h b/font.h
index 5b9ec642f..eadf88c1d 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.1 2009/05/03 11:00:19 kls Exp $
+ * $Id: font.h 2.2 2009/05/23 10:10:40 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -55,9 +55,11 @@ class cFont {
   static const cFont *GetFont(eDvbFont Font);
           ///< Gets the given Font, which was previously set by a call to SetFont().
           ///< If no SetFont() call has been made, the font as defined in the setup is returned.
-          ///< The caller must not use the returned font outside the scope in which
-          ///< it was retrieved by the call to GetFont(), because a call to SetFont()
-          ///< may delete an existing font.
+          ///< GetFont() is not thread-safe, and shall only be called from the main
+          ///< thread! A font returned by GetFont() must only be used locally inside the
+          ///< function it was retrieved from, and no long term pointer to it shall be kept,
+          ///< because the cFont object may become invalid at any time after the
+          ///< function that called GetFont() has returned.
   static cFont *CreateFont(const char *Name, int CharHeight, int CharWidth = 0);
           ///< Creates a new font object with the given Name and makes its characters
           ///< CharHeight pixels high. If CharWidth is given, it overwrites the font's
diff --git a/menu.c b/menu.c
index 423f6f2a7..cd1b30a67 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.7 2009/05/03 13:30:13 kls Exp $
+ * $Id: menu.c 2.8 2009/05/21 11:10:38 kls Exp $
  */
 
 #include "menu.h"
@@ -2672,18 +2672,24 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
 // --- cMenuSetupRecord ------------------------------------------------------
 
 class cMenuSetupRecord : public cMenuSetupBase {
+private:
+  const char *pauseKeyHandlingTexts[3];
 public:
   cMenuSetupRecord(void);
   };
 
 cMenuSetupRecord::cMenuSetupRecord(void)
 {
+  pauseKeyHandlingTexts[0] = tr("do not pause live video");
+  pauseKeyHandlingTexts[1] = tr("confirm pause live video");
+  pauseKeyHandlingTexts[2] = tr("pause live video");
   SetSection(tr("Recording"));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"),     &data.MarginStart));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"),      &data.MarginStop));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),             &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),          &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"),      &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditStraItem(tr("Setup.Recording$Pause key handling"),        &data.PauseKeyHandling, 3, pauseKeyHandlingTexts));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Pause priority"),            &data.PausePriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Pause lifetime (d)"),        &data.PauseLifetime, 0, MAXLIFETIME));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
diff --git a/osd.c b/osd.c
index 2ed1acf71..d16dafbd8 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.3 2009/05/03 13:52:47 kls Exp $
+ * $Id: osd.c 2.5 2009/05/09 10:42:35 kls Exp $
  */
 
 #include "osd.h"
@@ -883,7 +883,7 @@ void cOsd::Flush(void)
 cOsdProvider *cOsdProvider::osdProvider = NULL;
 int cOsdProvider::oldWidth = 0;
 int cOsdProvider::oldHeight = 0;
-int cOsdProvider::oldAspect = va4_3;
+double cOsdProvider::oldAspect = 1.0;
 
 cOsdProvider::cOsdProvider(void)
 {
@@ -919,13 +919,14 @@ void cOsdProvider::UpdateOsdSize(bool Force)
 {
   int Width;
   int Height;
-  eVideoAspect Aspect;
-  cDevice::PrimaryDevice()->GetVideoSize(Width, Height, Aspect);
+  double Aspect;
+  cDevice::PrimaryDevice()->GetOsdSize(Width, Height, Aspect);
   if (Width != oldWidth || Height != oldHeight || Aspect != oldAspect || Force) {
      Setup.OSDLeft = int(round(Width * Setup.OSDLeftP));
      Setup.OSDTop = int(round(Height * Setup.OSDTopP));
      Setup.OSDWidth = int(round(Width * Setup.OSDWidthP)) & ~0x07; // OSD width must be a multiple of 8
      Setup.OSDHeight = int(round(Height * Setup.OSDHeightP));
+     Setup.OSDAspect = Aspect;
      Setup.FontOsdSize = int(round(Height * Setup.FontOsdSizeP));
      Setup.FontFixSize = int(round(Height * Setup.FontFixSizeP));
      Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP));
@@ -935,7 +936,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
      oldWidth = Width;
      oldHeight = Height;
      oldAspect = Aspect;
-     dsyslog("OSD size changed to %dx%d @ %s", Width, Height, VideoAspectString[Aspect]);
+     dsyslog("OSD size changed to %dx%d @ %g", Width, Height, Aspect);
      }
 }
 
diff --git a/osd.h b/osd.h
index ba79fdead..f10247ead 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.3 2009/05/03 13:52:10 kls Exp $
+ * $Id: osd.h 2.4 2009/05/08 13:41:03 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -408,7 +408,7 @@ class cOsdProvider {
   static cOsdProvider *osdProvider;
   static int oldWidth;
   static int oldHeight;
-  static int oldAspect;
+  static double oldAspect;
 protected:
   virtual cOsd *CreateOsd(int Left, int Top, uint Level) = 0;
       ///< Returns a pointer to a newly created cOsd object, which will be located
diff --git a/osdbase.c b/osdbase.c
index a8f591d73..9b59c0507 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.0 2008/02/17 11:33:04 kls Exp $
+ * $Id: osdbase.c 2.1 2009/06/01 11:54:50 kls Exp $
  */
 
 #include "osdbase.h"
@@ -217,6 +217,7 @@ void cOsdMenu::Display(void)
          }
      if (current < 0)
         current = 0; // just for safety - there HAS to be a current item!
+     first = min(first, max(0, count - displayMenuItems)); // in case the menu size has changed
      if (current - first >= displayMenuItems || current < first) {
         first = current - displayMenuItems / 2;
         if (first + displayMenuItems > count)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0ab2de62e..e04085986 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -707,6 +707,15 @@ msgstr "CAM en 
 msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Opcions de Gravaci�"
 
@@ -725,6 +734,9 @@ msgstr "Prioritat per defecte"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durada predefinida"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritat de la pausa"
 
@@ -986,6 +998,9 @@ msgstr "Diumenge"
 msgid "Upcoming recording!"
 msgstr "Gravaci� a punt d'iniciar!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Gravaci� comen�ada"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index a50a33d63..34a941b52 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -705,6 +705,15 @@ msgstr "CAM se pou
 msgid "Can't reset CAM!"
 msgstr "CAM modul nelze restartovat!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Nahr�v�n�"
 
@@ -723,6 +732,9 @@ msgstr "V
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "V�choz� �ivotnost"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorita p�eru�en�"
 
@@ -984,6 +996,9 @@ msgstr "Ned
 msgid "Upcoming recording!"
 msgstr "Brzo za�ne nahr�v�n�!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Za�alo nahr�v�n�"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index e8d05c8e9..cd533a078 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -704,6 +704,15 @@ msgstr "CAM er i brug - virkelig nulstille?"
 msgid "Can't reset CAM!"
 msgstr "Kan ikke nulstille CAM!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Optagelse"
 
@@ -722,6 +731,9 @@ msgstr "Standard prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standard levetid (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Pause prioritet"
 
@@ -983,6 +995,9 @@ msgstr "S
 msgid "Upcoming recording!"
 msgstr "Optagelse starter snart!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Optagelse startet"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 6b55d6abd..eea68172f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: German\n"
@@ -704,6 +704,15 @@ msgstr "CAM wird benutzt - wirklich zur
 msgid "Can't reset CAM!"
 msgstr "Zur�cksetzen des CAM fehlgeschlagen!"
 
+msgid "do not pause live video"
+msgstr "Live-Signal nicht anhalten"
+
+msgid "confirm pause live video"
+msgstr "Anhalten des Live-Signals best�tigen"
+
+msgid "pause live video"
+msgstr "Live-Signal anhalten"
+
 msgid "Recording"
 msgstr "Aufnahme"
 
@@ -722,6 +731,9 @@ msgstr "Default-Priorit
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Default-Lebensdauer (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr "Funktion der Pause-Taste"
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Pause-Priorit�t"
 
@@ -983,6 +995,9 @@ msgstr "Sonntag"
 msgid "Upcoming recording!"
 msgstr "Aufnahme beginnt in K�rze!"
 
+msgid "Pause live video?"
+msgstr "Live-Signal anhalten?"
+
 msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 90ff04d9d..bcdcb8e83 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -704,6 +704,15 @@ msgstr ""
 msgid "Can't reset CAM!"
 msgstr "������� � ��������� ��� CAM"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "�������"
 
@@ -722,6 +731,9 @@ msgstr "
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "�������������� �������� ��������� (������)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "������������� ������������"
 
@@ -983,6 +995,9 @@ msgstr "
 msgid "Upcoming recording!"
 msgstr ""
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 667d65074..58cb41434 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -705,6 +705,15 @@ msgstr "CAM en uso - 
 msgid "Can't reset CAM!"
 msgstr "�No se puede reiniciar CAM!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Opciones de grabaci�n"
 
@@ -723,6 +732,9 @@ msgstr "Prioridad por defecto"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Duraci�n por defecto (d�as)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioridad en modo pausa"
 
@@ -984,6 +996,9 @@ msgstr "Domingo"
 msgid "Upcoming recording!"
 msgstr "�Grabaci�n a punto de empezar!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Iniciando grabaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index ff66d8a50..b0477c293 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian\n"
@@ -704,6 +704,15 @@ msgstr "CAM on kasutuses - taask
 msgid "Can't reset CAM!"
 msgstr "CAM mooduli taask�ivitus eba�nnestus!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Salvestamine"
 
@@ -722,6 +731,9 @@ msgstr "Vaikimisi prioriteet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Salvestuse eluiga (p�evi)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Pausi prioriteet"
 
@@ -983,6 +995,9 @@ msgstr "P
 msgid "Upcoming recording!"
 msgstr "Salvestamine tulekul!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Salvestamine algas"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index ed5b94dbf..e62b9f65e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -707,6 +707,15 @@ msgstr "CA-moduuli k
 msgid "Can't reset CAM!"
 msgstr "CA-moduulin nollaus ep�onnistui!"
 
+msgid "do not pause live video"
+msgstr "�l� pys�yt� l�hetyst�"
+
+msgid "confirm pause live video"
+msgstr "varmista l�hetyksen pys�ytt�minen"
+
+msgid "pause live video"
+msgstr "pys�yt� l�hetys"
+
 msgid "Recording"
 msgstr "Tallennus"
 
@@ -725,6 +734,9 @@ msgstr "Tallenteen oletusprioriteetti"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Tallenteen oletuselinik� (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr "Taukon�pp�imen toiminta"
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Taukotallenteen prioriteetti"
 
@@ -986,6 +998,9 @@ msgstr "Sunnuntai"
 msgid "Upcoming recording!"
 msgstr "Tallennus on alkamassa!"
 
+msgid "Pause live video?"
+msgstr "Pys�ytet��nk� l�hetys?"
+
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 535362597..e1ef364ca 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -710,6 +710,15 @@ msgstr "CAM en cours d'utilisation - Remettre 
 msgid "Can't reset CAM!"
 msgstr "Impossible de r�initialiser le CAM !"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Enregistrement"
 
@@ -728,6 +737,9 @@ msgstr "Priorit
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Dur�e de vie par d�faut (j)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorit� des pauses"
 
@@ -989,6 +1001,9 @@ msgstr "Dimanche"
 msgid "Upcoming recording!"
 msgstr "L'enregistrement va commencer !"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "L'enregistrement a commenc�"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 9b409e3e5..f69c24a64 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -706,6 +706,15 @@ msgstr "CAM se koristi - ponovno pokrenuti unato
 msgid "Can't reset CAM!"
 msgstr "Ponovno pokretanje CAM-a neuspje�no!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Snimanje"
 
@@ -724,6 +733,9 @@ msgstr "Zadani prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Zadano trajanje (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet pauze"
 
@@ -985,6 +997,9 @@ msgstr "Nedjelja"
 msgid "Upcoming recording!"
 msgstr "Obnovljena snimka!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Snimanje zapo�elo"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 5c0a88772..fad18a4a6 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -707,6 +707,15 @@ msgstr "CAM haszn
 msgid "Can't reset CAM!"
 msgstr "A CAM �jraind�t�s nem siker�lt"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Felv�tel"
 
@@ -725,6 +734,9 @@ msgstr "Alap
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Alap�rtelmezett �lettartam"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Sz�net priorit�s"
 
@@ -986,6 +998,9 @@ msgstr "Vas
 msgid "Upcoming recording!"
 msgstr "Felv�tel r�gt�n kezd�dik!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "A felv�tel elind�tva"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 877191b08..09429cbc1 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2009-02-08 18:58+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
@@ -711,6 +711,15 @@ msgstr "La CAM è in uso - vuoi reimpostarla?"
 msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Registrazione"
 
@@ -729,6 +738,9 @@ msgstr "Priorità predefinita"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Scadenza predefinita (gg)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorità di pausa"
 
@@ -990,6 +1002,9 @@ msgstr "Domenica"
 msgid "Upcoming recording!"
 msgstr "Registrazione imminente!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Registrazione avviata"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 36a99220d..ef5c97654 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -708,6 +708,15 @@ msgstr "CAM wordt gebruikt - werkelijk herstarten?"
 msgid "Can't reset CAM!"
 msgstr "Kan CAM niet herstarten!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Opname"
 
@@ -726,6 +735,9 @@ msgstr "Standaard prioriteit"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standaard levensduur (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Pauze prioriteit"
 
@@ -987,6 +999,9 @@ msgstr "Zondag"
 msgid "Upcoming recording!"
 msgstr "Opname start binnenkort!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Opname is gestart!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 2445b0232..daf56f1ef 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -705,6 +705,15 @@ msgstr ""
 msgid "Can't reset CAM!"
 msgstr ""
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Opptak"
 
@@ -723,6 +732,9 @@ msgstr "Normal prioritet (Timer)"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal levetid timer (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr ""
 
@@ -984,6 +996,9 @@ msgstr "S
 msgid "Upcoming recording!"
 msgstr ""
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 860094a48..d88717891 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -705,6 +705,15 @@ msgstr "CAM jest w u
 msgid "Can't reset CAM!"
 msgstr "Nie mo�na zresetowa� CAM!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Nagranie"
 
@@ -723,6 +732,9 @@ msgstr "Domy
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Domy�lny czas �ycia (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorytet pauzy"
 
@@ -984,6 +996,9 @@ msgstr "Niedziela"
 msgid "Upcoming recording!"
 msgstr "Wkr�tce nagranie!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index fa4767f40..ba23834d4 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -704,6 +704,15 @@ msgstr "CAM em uso - quer mesmo reiniciar?"
 msgid "Can't reset CAM!"
 msgstr "N�o � poss�vel reiniciar a CAM"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Op��es de grava��o"
 
@@ -722,6 +731,9 @@ msgstr "Prioridade por defeito"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Validade por defeito (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioridade da pausa"
 
@@ -983,6 +995,9 @@ msgstr "Domingo"
 msgid "Upcoming recording!"
 msgstr "Grava��o agendada!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Grava��o iniciada"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 0c6013cbf..30aee23ca 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -707,6 +707,15 @@ msgstr "CAM-ul este in folosin
 msgid "Can't reset CAM!"
 msgstr "Nu pot reseta CAM"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "�nregistrare"
 
@@ -725,6 +734,9 @@ msgstr "Prioritate implicit
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Timp de p�strare predefinit (zile)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritate pauz�"
 
@@ -986,6 +998,9 @@ msgstr "Duminic
 msgid "Upcoming recording!"
 msgstr "Urmeaz� o �nregistrare!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "A �nceput �nregistrarea"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index a0a255575..0c61dce43 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -705,6 +705,15 @@ msgstr "CAM 
 msgid "Can't reset CAM!"
 msgstr "������ ����������� CAM-������!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "������"
 
@@ -723,6 +732,9 @@ msgstr "
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "���� �������� ������ �� ��������� (�)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "��������� ����������� ���������"
 
@@ -984,6 +996,9 @@ msgstr "
 msgid "Upcoming recording!"
 msgstr "������ ����� ��������"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "������ ������"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 347e59915..35b604357 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -705,6 +705,15 @@ msgstr "CAM je v uporabi - zares resetiraj?"
 msgid "Can't reset CAM!"
 msgstr "Ne morem resetirati CAM-a!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Snemanje"
 
@@ -723,6 +732,9 @@ msgstr "Privzeta prioriteta"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Privzeti �ivljenski �as (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioriteta pavze"
 
@@ -984,6 +996,9 @@ msgstr "Nedelja"
 msgid "Upcoming recording!"
 msgstr "Sledi snemanje!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index d47da8a26..e4fbe25a8 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -707,6 +707,15 @@ msgstr "CAM upptagen, vill du verkligen starta om?"
 msgid "Can't reset CAM!"
 msgstr "Kan inte �terst�lla CAM!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Inspelning"
 
@@ -725,6 +734,9 @@ msgstr "Normal prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal livstid (dagar)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet f�r direktinspelning"
 
@@ -986,6 +998,9 @@ msgstr "S
 msgid "Upcoming recording!"
 msgstr "strax inspelning..."
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Inspelningen har startat"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index abdb594ce..44bf894ed 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -704,6 +704,15 @@ msgstr "CAM kullan
 msgid "Can't reset CAM!"
 msgstr "CAM s�f�rlanamad�!"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "Kay�t"
 
@@ -722,6 +731,9 @@ msgstr "Ola
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Ola�an �ekim �mr� (g�n)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "Duraklama prioritesi"
 
@@ -983,6 +995,9 @@ msgstr "Pazar"
 msgid "Upcoming recording!"
 msgstr "�ekim yak�nda ba�l�yor!"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Kay�t ba�land�"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 3d566fc0d..79b8121fc 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -5,261 +5,261 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
-"PO-Revision-Date: 2008-03-07 14:17+0200\n"
-"Last-Translator: Yarema Aka Knedlyk <yupadmin@gmail.com>\n"
+"POT-Creation-Date: 2009-05-31 11:11+0200\n"
+"PO-Revision-Date: 2009-05-31 13:17+0200\n"
+"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "off"
-msgstr "����"
+msgstr "викл"
 
 msgid "on"
-msgstr ""
+msgstr "вкл"
 
 msgid "auto"
-msgstr "����"
+msgstr "авто"
 
 msgid "none"
-msgstr "������"
+msgstr "нічого"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** ������������ ����� ***"
+msgstr "*** Неправильний канал ***"
 
 msgid "Channel not available!"
-msgstr "����� �����������!"
+msgstr "Канал недоступний!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "��������� �������� ����� ��������!"
+msgstr "Неможливо включити режим пропуску!"
 
 msgid "Starting EPG scan"
-msgstr "������� EPG-����������"
+msgstr "Починаю EPG-сканування"
 
 msgid "No title"
-msgstr "��� �����"
+msgstr "Без назви"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
-msgstr "����������"
+msgstr "Українська"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
 msgstr "ukr"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "���� 1: ���������� ���� ���� ������"
+msgstr "Крок 1: Визначення типу коду пульта"
 
 msgid "Press any key on the RC unit"
-msgstr "��������� ����-��� ������ �� ������"
+msgstr "Натисніть будь-яку кнопку на пульті"
 
 msgid "RC code detected!"
-msgstr "��������� ��� ������!"
+msgstr "Визначено код пульта!"
 
 msgid "Do not press any key..."
-msgstr "�� ���������� ������..."
+msgstr "Не натискайте кнопки..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "���� 2: ������������ ����� ��� ����������� ������"
+msgstr "Крок 2: Приписування кодів для відповідних кнопок"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "��������� ������ '%s'"
+msgstr "Натисніть кнопку '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "��������� '�����' ��� �������������"
+msgstr "Натисніть 'Вверх' для підтвердження"
 
 msgid "Press 'Down' to continue"
-msgstr "��������� '����' ��� �����������"
+msgstr "Натисніть 'Вниз' для продовження"
 
 msgid "(press 'Up' to go back)"
-msgstr "(��������� '�����' ��� ����������)"
+msgstr "(Натисніть 'Вверх' для повернення)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(��������� '����' ��� ���������� ��������� ������)"
+msgstr "(Натисніть 'Вниз' для закінчення настройки пульта)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(��������� '����' ��� ���������� ������)"
+msgstr "(Натисніть 'Меню' щоб пропустити кнопку)"
 
 msgid "Learning Remote Control Keys"
-msgstr "�������� ������"
+msgstr "Навчання пульта"
 
 msgid "Phase 3: Saving key codes"
-msgstr "���� 3: �����'���������� ����� ������"
+msgstr "Крок 3: Запам'ятовування кодів кнопок"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "��������� '�����' ��� ����������, '����' ��� �������"
+msgstr "Натисніть 'Вверх' для закінчення, 'Вниз' для відмови"
 
 msgid "Key$Up"
-msgstr "�����"
+msgstr "Вверх"
 
 msgid "Key$Down"
-msgstr "����"
+msgstr "Вниз"
 
 msgid "Key$Menu"
-msgstr "����"
+msgstr "Меню"
 
 msgid "Key$Ok"
 msgstr "Ok"
 
 msgid "Key$Back"
-msgstr "�����"
+msgstr "Назад"
 
 msgid "Key$Left"
-msgstr "������"
+msgstr "Наліво"
 
 msgid "Key$Right"
-msgstr "�������"
+msgstr "Направо"
 
 msgid "Key$Red"
-msgstr "�������"
+msgstr "Червона"
 
 msgid "Key$Green"
-msgstr "������"
+msgstr "Зелена"
 
 msgid "Key$Yellow"
-msgstr "�����"
+msgstr "Жовта"
 
 msgid "Key$Blue"
-msgstr "����"
+msgstr "Синя"
 
 msgid "Key$Info"
-msgstr "����"
+msgstr "Інфо"
 
 msgid "Key$Play"
-msgstr "�����������"
+msgstr "Програвання"
 
 msgid "Key$Pause"
-msgstr "�����"
+msgstr "Пауза"
 
 msgid "Key$Stop"
-msgstr "����"
+msgstr "Стоп"
 
 msgid "Key$Record"
-msgstr "�����"
+msgstr "Запис"
 
 msgid "Key$FastFwd"
-msgstr "��������� ������"
+msgstr "Прокрутка вперед"
 
 msgid "Key$FastRew"
-msgstr "��������� �����"
+msgstr "Прокрутка назад"
 
 msgid "Key$Next"
-msgstr "������"
+msgstr "Вперед"
 
 msgid "Key$Prev"
-msgstr "�����"
+msgstr "Назад"
 
 msgid "Key$Power"
-msgstr "���������"
+msgstr "Виключити"
 
 msgid "Key$Channel+"
-msgstr "����� +"
+msgstr "Канал +"
 
 msgid "Key$Channel-"
-msgstr "����� -"
+msgstr "Канал -"
 
 msgid "Key$PrevChannel"
-msgstr "���������� �����"
+msgstr "Попередній канал"
 
 msgid "Key$Volume+"
-msgstr "�������� +"
+msgstr "Гучність +"
 
 msgid "Key$Volume-"
-msgstr "�������� -"
+msgstr "Гучність -"
 
 msgid "Key$Mute"
-msgstr "��������� ����"
+msgstr "Виключити звук"
 
 msgid "Key$Audio"
-msgstr "����"
+msgstr "Мова"
 
 msgid "Key$Subtitles"
-msgstr "��������"
+msgstr "Субтитри"
 
 msgid "Key$Schedule"
-msgstr "�������"
+msgstr "Телегід"
 
 msgid "Key$Channels"
-msgstr "������"
+msgstr "Канали"
 
 msgid "Key$Timers"
-msgstr "�������"
+msgstr "Таймери"
 
 msgid "Key$Recordings"
-msgstr "������"
+msgstr "Записи"
 
 msgid "Key$Setup"
-msgstr "������������"
+msgstr "Налаштування"
 
 msgid "Key$Commands"
-msgstr "�������"
+msgstr "Команди"
 
 msgid "Key$User1"
-msgstr "����������1"
+msgstr "Користувач1"
 
 msgid "Key$User2"
-msgstr "����������2"
+msgstr "Користувач2"
 
 msgid "Key$User3"
-msgstr "����������3"
+msgstr "Користувач3"
 
 msgid "Key$User4"
-msgstr "����������4"
+msgstr "Користувач4"
 
 msgid "Key$User5"
-msgstr "����������5"
+msgstr "Користувач5"
 
 msgid "Key$User6"
-msgstr "����������6"
+msgstr "Користувач6"
 
 msgid "Key$User7"
-msgstr "����������7"
+msgstr "Користувач7"
 
 msgid "Key$User8"
-msgstr "����������8"
+msgstr "Користувач8"
 
 msgid "Key$User9"
-msgstr "����������8"
+msgstr "Користувач8"
 
 msgid "Disk"
-msgstr "����"
+msgstr "Диск"
 
 msgid "free"
-msgstr "������"
+msgstr "вільно"
 
 msgid "Free To Air"
-msgstr "FTA (������������)"
+msgstr "FTA (незакодовано)"
 
 msgid "encrypted"
-msgstr "����������"
+msgstr "закодовано"
 
 msgid "Edit channel"
-msgstr "������������ ������"
+msgstr "Редагування каналу"
 
 msgid "Name"
-msgstr "�����"
+msgstr "Назва"
 
 msgid "Source"
-msgstr "�������"
+msgstr "Джерело"
 
 msgid "Frequency"
-msgstr "�������"
+msgstr "Частота"
 
 msgid "Vpid"
-msgstr "Vpid (�����)"
+msgstr "Vpid (відео)"
 
 msgid "Ppid"
 msgstr "Ppid"
 
 msgid "Apid1"
-msgstr "Apid1 (����� 1)"
+msgstr "Apid1 (аудіо 1)"
 
 msgid "Apid2"
-msgstr "Apid2 (����� 2)"
+msgstr "Apid2 (аудіо 2)"
 
 msgid "Dpid1"
 msgstr "Dpid1 (AC3 1)"
@@ -268,31 +268,31 @@ msgid "Dpid2"
 msgstr "Dpid2 (AC3 2)"
 
 msgid "Spid1"
-msgstr "�������� ���1"
+msgstr "Субтитри 1"
 
 msgid "Spid2"
-msgstr "�������� ���2"
+msgstr "Субтитри 2"
 
 msgid "Tpid"
-msgstr "Tpid (���������)"
+msgstr "Tpid (телетекст)"
 
 msgid "CA"
-msgstr "CA (�������)"
+msgstr "CA (декодер)"
 
 msgid "Sid"
 msgstr "Sid"
 
 msgid "Polarization"
-msgstr "�����������"
+msgstr "Поляризація"
 
 msgid "System"
-msgstr ""
+msgstr "Система"
 
 msgid "Srate"
-msgstr "����. ���������"
+msgstr "Симв. швидкість"
 
 msgid "Inversion"
-msgstr "��������"
+msgstr "Інверсія"
 
 msgid "CoderateH"
 msgstr "CoderateH"
@@ -301,709 +301,724 @@ msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "���������"
+msgstr "Модуляція"
 
 msgid "Bandwidth"
-msgstr "��������"
+msgstr "Діапазон"
 
 msgid "Transmission"
-msgstr "��������"
+msgstr "Передача"
 
 msgid "Guard"
-msgstr "������"
+msgstr "Захист"
 
 msgid "Hierarchy"
-msgstr "��������"
+msgstr "Ієрархія"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Крен"
 
 msgid "Channel settings are not unique!"
-msgstr "��������� ������ �� �����!"
+msgstr "Настройки каналу не єдині!"
 
 msgid "Channels"
-msgstr "������"
+msgstr "Канали"
 
 msgid "Button$Edit"
-msgstr "�����������"
+msgstr "Редагувати"
 
 msgid "Button$New"
-msgstr "������"
+msgstr "Додати"
 
 msgid "Button$Delete"
-msgstr "��������"
+msgstr "Видалити"
 
 msgid "Button$Mark"
-msgstr "�����������"
+msgstr "Перемістити"
 
 msgid "Channel is being used by a timer!"
-msgstr "����� ������� ��������!"
+msgstr "Канал зайнятий таймером!"
 
 msgid "Delete channel?"
-msgstr "�������� �����?"
+msgstr "Видалити канал?"
 
 msgid "Edit timer"
-msgstr "������������ �������"
+msgstr "Налаштування таймера"
 
 msgid "Active"
-msgstr "����������"
+msgstr "Активовано"
 
 msgid "Channel"
-msgstr "�����"
+msgstr "Канал"
 
 msgid "Day"
-msgstr "����"
+msgstr "День"
 
 msgid "Start"
-msgstr "�������"
+msgstr "Початок"
 
 msgid "Stop"
-msgstr "������"
+msgstr "Кінець"
 
 msgid "VPS"
-msgstr "VPS ��������"
+msgstr "VPS поправка"
 
 msgid "Priority"
-msgstr "���������"
+msgstr "Пріоритет"
 
 msgid "Lifetime"
-msgstr "����� ����������"
+msgstr "Строк зберігання"
 
 msgid "File"
-msgstr "����"
+msgstr "Файл"
 
 msgid "First day"
-msgstr "������ ����"
+msgstr "Перший день"
 
 msgid "Timers"
-msgstr "�������"
+msgstr "Таймери"
 
 msgid "Button$On/Off"
-msgstr "���/����"
+msgstr "Вкл/Викл"
 
 msgid "Button$Info"
-msgstr "����"
+msgstr "Інфо"
 
 msgid "Delete timer?"
-msgstr "�������� ������?"
+msgstr "Видалити таймер?"
 
 msgid "Timer still recording - really delete?"
-msgstr "��� ����� �� ������� - ������ ��������?"
+msgstr "Йде запис по таймеру - дійсно видалити?"
 
 msgid "Event"
-msgstr "��������"
+msgstr "Передача"
 
 msgid "Button$Timer"
-msgstr "������"
+msgstr "Таймер"
 
 msgid "Button$Record"
-msgstr "�����"
+msgstr "Запис"
 
 msgid "Button$Switch"
-msgstr "�����������"
+msgstr "Переключити"
 
 msgid "What's on now?"
-msgstr "����� � �����:"
+msgstr "Зараз в ефірі:"
 
 msgid "What's on next?"
-msgstr "���� � ��������:"
+msgstr "Далі в програмі:"
 
 msgid "Button$Next"
-msgstr "����"
+msgstr "Далі"
 
 msgid "Button$Now"
-msgstr "�����"
+msgstr "Зараз"
 
 msgid "Button$Schedule"
-msgstr "��������"
+msgstr "Програма"
 
 msgid "Can't switch channel!"
-msgstr "��������� ����������� �����!"
+msgstr "Неможливо переключити канал!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "�������� - %s"
+msgstr "Програма - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "�� �������� - %s"
+msgstr "Ця передача - %s"
 
 msgid "This event - all channels"
-msgstr "�� �������� - ��� ������"
+msgstr "Ця передача - всі канали"
 
 msgid "All events - all channels"
-msgstr "��� �������� - ��� ������"
+msgstr "Всі передачі - всі канали"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "��������� %d �����"
+msgstr "Натисніть %d цифри!"
 
 msgid "CAM not responding!"
-msgstr "CAM �� ����������"
+msgstr "CAM не відповідає!"
 
 msgid "Recording info"
-msgstr "��� �����"
+msgstr "Про запис"
 
 msgid "Button$Play"
-msgstr "����������"
+msgstr "Програвати"
 
 msgid "Button$Rewind"
-msgstr "�����"
+msgstr "Назад"
 
 msgid "Recordings"
-msgstr "������"
+msgstr "Записи"
 
 msgid "Button$Open"
-msgstr "��������"
+msgstr "Відкрити"
 
 msgid "Commands"
-msgstr "�������"
+msgstr "Команди"
 
 msgid "Error while accessing recording!"
-msgstr "������� ������� �� ������!"
+msgstr "Помилка доступу до запису!"
 
 msgid "Delete recording?"
-msgstr "������� �����?"
+msgstr "Витерти запис?"
 
 msgid "Error while deleting recording!"
-msgstr "������� ��������� ������!"
+msgstr "Помилка видалення запису!"
 
 msgid "Recording commands"
-msgstr "������� ������"
+msgstr "Команди запису"
 
 msgid "never"
-msgstr "������"
+msgstr "ніколи"
 
 msgid "skin dependent"
-msgstr "������ � ������"
+msgstr "згідно з стилем"
 
 msgid "always"
-msgstr "������"
+msgstr "завжди"
 
 msgid "OSD"
-msgstr "����"
+msgstr "OSD меню"
 
 msgid "Setup.OSD$Language"
-msgstr "����"
+msgstr "Мова"
 
 msgid "Setup.OSD$Skin"
-msgstr "�����"
+msgstr "Стиль"
 
 msgid "Setup.OSD$Theme"
-msgstr "����"
+msgstr "Тема"
 
 msgid "Setup.OSD$Left (%)"
-msgstr "������� ����� (%)"
+msgstr "Відступ зліва (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr "������� ������ (%)"
+msgstr "Відступ зверху (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "������ (%)"
+msgstr "Ширина (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "������ (%)"
+msgstr "Висота (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "���������� ������ ����������� (���)"
+msgstr "Тривалість показу повідомлень (сек)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "��������������� ����� �����"
+msgstr "Використовувати малий фонт"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "������������ �������"
+msgstr "Згладжування фонтів"
 
 msgid "Setup.OSD$Default font"
-msgstr "����������� ����"
+msgstr "Стандартний фонт"
 
 msgid "Setup.OSD$Small font"
-msgstr "����� ����"
+msgstr "Малий фонт"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "���������� ����"
+msgstr "Фіксований фонт"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "������ ����� ��� ���� (%)"
+msgstr "Размір фонта для меню (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "������ ������ ����� (%)"
+msgstr "Размір малого фонта (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "������ ����������� ����� (%)"
+msgstr "Размір фіксованого фонта (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "��������� ����� ���������� ��� �����"
+msgstr "Положення вікна інформації про канал"
 
 msgid "bottom"
-msgstr "�����"
+msgstr "внизу"
 
 msgid "top"
-msgstr "������"
+msgstr "вверху"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "����� ���������� ��� ����� (���)"
+msgstr "Показ інформації про канал (сек)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "���������� ���������� ��� �����"
+msgstr "Показ канал-інфо при переключанні "
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "���������� ��� ����� �������"
+msgstr "Інформацію про канал закрити"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "��������� �������� ����"
+msgstr "Прокрутка сторінок меню"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "�������� ���������"
+msgstr "Циклічна прокрутка"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "������ ���� �������"
+msgstr "Кнопку Меню закрити"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "�������� ���������� �������"
+msgstr "Каталоги зберігання записів"
 
 msgid "EPG"
-msgstr "�������"
+msgstr "Телегід"
 
 msgid "Button$Scan"
-msgstr "�����������"
+msgstr "Сканувати"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "�������� ���������� �������� (�)"
+msgstr "Затримка сканування телегіда (ч)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "������ �������� �������"
+msgstr "Рівень корекції помилок"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "���������� ���������� ����� (��)"
+msgstr "Зберігання застарілих даних (хв)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "��������� �������� ���"
+msgstr "Встановити системий час"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "����������� ��� ������������"
+msgstr "Використати час транспондера"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "������ ���� (�������)"
+msgstr "Бажані мови (телегід)"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "�������"
+msgstr "Бажана мова (телегід)"
 
 msgid "pan&scan"
-msgstr "������������"
+msgstr "панорамувати"
 
 msgid "letterbox"
-msgstr "����������"
+msgstr "зменшувати"
 
 msgid "center cut out"
-msgstr "�������� �����"
+msgstr "обрізати по боках"
 
 msgid "no"
-msgstr "��"
+msgstr "ні"
 
 msgid "names only"
-msgstr "������ �����"
+msgstr "тільки назви"
 
 msgid "PIDs only"
-msgstr "������ PID�"
+msgstr "Тільки PIDи"
 
 msgid "names and PIDs"
-msgstr "����� � PID�"
+msgstr "назви і PIDи"
 
 msgid "add new channels"
-msgstr "������ ���� ������"
+msgstr "додати нові канали"
 
 msgid "add new transponders"
-msgstr "������ ���� ������������"
+msgstr "додати нові транспондери"
 
 msgid "DVB"
 msgstr "DVB"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "�������� DVB-��������"
+msgstr "Основний DVB-пристрій"
 
 msgid "Setup.DVB$Video format"
-msgstr "������ �����"
+msgstr "Формат відео"
 
 msgid "Setup.DVB$Video display format"
-msgstr "������������ ����������"
+msgstr "Формат зображення відео"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "�������� Dolby Digital"
+msgstr "Використовувати Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "���������� ��������� �������"
+msgstr "Оновлювати настройки каналів"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "������ ���� (����)"
+msgstr "Бажані мови (звук)"
 
 msgid "Setup.DVB$Audio language"
-msgstr "�������"
+msgstr "Мова аудіо"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "���������� ��������"
+msgstr "Показувати субтитри"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "���� ���������"
+msgstr "Мови субтитрів"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "���� ���������"
+msgstr "Мова субтитрів"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "������� ���������"
+msgstr "Відступ субтитрів"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "���������� ���������� ����� ���������"
+msgstr "Прозорість переднього плану субтитрів"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "���������� �������� ����� ���������"
+msgstr "Прозорість заднього плану субтитрів"
 
 msgid "LNB"
-msgstr "���������"
+msgstr "Конвертер"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "��������������� DiSEqC"
+msgstr "Використовувати DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "������� ������������ (SLOF) (���)"
+msgstr "Частота переключання (SLOF) (МГц)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "����� ������� ���������� (���)"
+msgstr "Нижня частота конвертера (МГц)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "������ ������� ���������� (���)"
+msgstr "Верхня частота конвертера (МГц)"
 
 msgid "CAM reset"
-msgstr "���������������� CAM"
+msgstr "Перезавантаження CAM"
 
 msgid "CAM present"
-msgstr "CAM ���������"
+msgstr "CAM присутній"
 
 msgid "CAM ready"
-msgstr "CAM �������"
+msgstr "CAM готовий"
 
 msgid "CAM"
-msgstr "������� ������"
+msgstr "CAM (Умовний доступ)"
 
 msgid "Button$Menu"
-msgstr "����"
+msgstr "Меню"
 
 msgid "Button$Reset"
-msgstr "�������"
+msgstr "Скинути"
 
 msgid "Opening CAM menu..."
-msgstr "��������� ���� ������ �������� ������� (CAM)"
+msgstr "Відкриваю меню CAM-модуля..."
 
 msgid "Can't open CAM menu!"
-msgstr "���� CAM-������ ����������!"
+msgstr "Меню CAM-модуля недоступне!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM ���������������� - ������ ���������������?"
+msgstr "CAM використовується - дійсно перезавантажити?"
 
 msgid "Can't reset CAM!"
-msgstr "������� ����������� CAM-������!"
+msgstr "Помилка перезапуску CAM-модуля!"
+
+msgid "do not pause live video"
+msgstr "не призупиняти перегляд"
+
+msgid "confirm pause live video"
+msgstr "підтвердити призупинення перегляду"
+
+msgid "pause live video"
+msgstr "призупинити перегляд"
 
 msgid "Recording"
-msgstr "�����"
+msgstr "Запис"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "������������ ������� ������ (��)"
+msgstr "Випередження початку запису (хв)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "���������� ������� ������ (��)"
+msgstr "Запізнення зупинки запису (хв)"
 
 msgid "Setup.Recording$Primary limit"
-msgstr "���. ��������� ���������� ���. ��������"
+msgstr "Мін. пріоритет захоплення осн. пристрою"
 
 msgid "Setup.Recording$Default priority"
-msgstr "��������� ������� �� ������������"
+msgstr "Пріоритет таймера по замовчуванню"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "����� ���������� ������ �� ������������ (�)"
+msgstr "Строк зберігання запису по замовчуванню (дні)"
+
+msgid "Setup.Recording$Pause key handling"
+msgstr "Обробка клавіші відкладеного перегляду"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "��������� ������������ ���������"
+msgstr "Пріоритет відкладеного перегляду"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "���������� ������������ ��������� (�)"
+msgstr "Зберігання відкладеного перегляду (дні)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "��������� ����� �� ��������"
+msgstr "Використовувати назву епізоду"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "��������������� ������� VPS"
+msgstr "Використовувати сигнали VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "�������� ��� VPS (���)"
+msgstr "Буферний час VPS (сек)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "��������� �������� ������ ������"
+msgstr "Помітити зроблені вручну записи"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "����� ����������� ������ �������"
+msgstr "Схема найменувань ручних записів"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "����������� ������� ������ (��)"
+msgstr "Протяжність ручного запису (хв)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "����. ������ ���������� (��)"
+msgstr "Макс. размір відеофайлу (Мб)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "������ �������������� �����"
+msgstr "Ділити відредаговані файли"
 
 msgid "Replay"
-msgstr "��������"
+msgstr "Перегляд"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "���������������� �����"
+msgstr "Багатошвидкісний режим"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "���������� ����� ���������"
+msgstr "Віображати режим перегляду"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID ���������"
+msgstr "ID перегляду"
 
 msgid "Miscellaneous"
-msgstr "�����"
+msgstr "Різне"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "���. ��� ���������� ����� (��)"
+msgstr "Мін. час очікування події (хв)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "���. ��� ���������� ����� (��)"
+msgstr "Мін. час очікування вводу (хв)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "��������� ������ �'������� SVDRP (���)"
+msgstr "Затримкка обриву з'єднання SVDRP (сек)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "�������� ������������ ������ (���)"
+msgstr "Затримка переключання каналу (сек)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "�������� ���� ��� ������������ ������ (ms)"
+msgstr "Затримка часу для впровадження каналу (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "����� ��� ���������"
+msgstr "Канал при включенні"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "�� ������"
+msgstr "як раніше"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "�������� ��� ���������"
+msgstr "Гучність при включенні"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "��������� �����"
+msgstr "Аварійний вихід"
 
 msgid "Plugins"
-msgstr "������ ����������"
+msgstr "Модулі розширення"
 
 msgid "This plugin has no setup parameters!"
-msgstr "������ �� ��� ���������� �����������!"
+msgstr "Модуль не має параметрів налаштувань!"
 
 msgid "Setup"
-msgstr "������������"
+msgstr "Налаштування"
 
 msgid "Restart"
-msgstr "�������������"
+msgstr "Перезапустити"
 
 msgid "Really restart?"
-msgstr "������ �������������?"
+msgstr "Дійсно перезапустити?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " �������� ����� "
+msgstr " Зупинити запис "
 
 msgid "Schedule"
-msgstr "�������"
+msgstr "Телегід"
 
 msgid "VDR"
 msgstr "VDR"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " �������� �����������"
+msgstr " Зупинити програвання"
 
 msgid "Button$Audio"
-msgstr "����"
+msgstr "Мова аудіо"
 
 msgid "Button$Pause"
-msgstr "�����"
+msgstr "Пауза"
 
 msgid "Button$Stop"
-msgstr "����"
+msgstr "Стоп"
 
 msgid "Button$Resume"
-msgstr "����������"
+msgstr "Продовжити"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " ��������� ������ ������"
+msgstr " Перервати монтаж запису"
 
 msgid "Stop recording?"
-msgstr "��������� �����?"
+msgstr "Припинити запис?"
 
 msgid "Cancel editing?"
-msgstr "��������� ������������?"
+msgstr "Перервати редактування?"
 
 msgid "No audio available!"
-msgstr "��������� ����!"
+msgstr "Відсутній звук!"
 
 msgid "No subtitles"
-msgstr "����� ���������"
+msgstr "Немає субтитрів"
 
 msgid "Button$Subtitles"
-msgstr "��������"
+msgstr "Субтитри"
 
 msgid "No subtitles available!"
-msgstr "��������� �����!"
+msgstr "Субтитрів немає!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "����������� ����� �� ����� ��� ������� ������"
+msgstr "Недостатньо місця на диску для початку запису"
 
 msgid "No free DVB device to record!"
-msgstr "����� �������� DVB-�������� ��� ������!"
+msgstr "Немає вільного DVB-пристрою для запису!"
 
 msgid "Pausing live video..."
-msgstr "����� ������������ ���������..."
+msgstr "Режим відкладеного перегляду..."
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "�������: "
+msgstr "Перейти: "
 
 msgid "No editing marks defined!"
-msgstr "�� ������ ����� ��� �������!"
+msgstr "Не задано міток для монтажу!"
 
 msgid "Can't start editing process!"
-msgstr "��������� ������ ������ ������!"
+msgstr "Неможливо почати монтаж запису!"
 
 msgid "Editing process started"
-msgstr "������ ������ �������"
+msgstr "Монтаж запису почався"
 
 msgid "Editing process already active!"
-msgstr "������ ������������ ��� ���������!"
+msgstr "Процес відеомонтажу вже запущений!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrstuvwxyz�����������������������������������0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyzабвгдеєёжзиіїйклмнопрстуфхцчшщъыьюя0123456789-.#~,/_@"
 
 msgid "yes"
-msgstr "���"
+msgstr "так"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabc����2\tdef������3\tghi������4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
+msgstr " 0\t-.#~,/_@1\tabcабвг2\tdefдеєёжз3\tghiиіїйкл4\tjklмно5\tmnoпрс6\tpqrsтуфх7\ttuvцчшщъ8\twxyzыьэюя9"
 
 msgid "Button$ABC/abc"
-msgstr "���/���"
+msgstr "АБВ/абв"
 
 msgid "Button$Overwrite"
-msgstr "������"
+msgstr "Заміна"
 
 msgid "Button$Insert"
-msgstr "�������"
+msgstr "Вставка"
 
 msgid "Plugin"
-msgstr "������"
+msgstr "Модуль"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "���������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\""
+msgstr "Натискайте \"Вверх\"/\"Вниз\" для вибору позиції, а потім \"OK\""
 
 msgid "Channel locked (recording)!"
-msgstr "����� ����������� (��� �����)!"
+msgstr "Канал заблоковано (йде запис)!"
 
 msgid "Low disk space!"
-msgstr "����������� ����� �� �����!"
+msgstr "Недостатньо місця на диску!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "����������� ��������� - �� ������ �������� '-s'!"
+msgstr "Виключенння неможливе - не задано параметр '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "��� ������ - ������ ���������?"
+msgstr "Йде монтаж - дійсно виключити?"
 
 msgid "Recording - shut down anyway?"
-msgstr "��� ����� - ������ ���������?"
+msgstr "Йде запис - дійсно виключити?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "����� %ld ������ ��������� ����� - ������ ���������?"
+msgstr "Через %ld хвилин почнеться запис - дійсно виключити?"
 
 msgid "shut down anyway?"
-msgstr "������ ���������?"
+msgstr "дійсно виключити?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Plugin %s ���������� ����� %ld ������ - ����������?"
+msgstr "Модуль %s включиться через %ld хвилин - продовжити?"
 
 msgid "Editing - restart anyway?"
-msgstr "������ ������� - ������ �������������?"
+msgstr "Процес монтажу - дійсно перезапустити?"
 
 msgid "Recording - restart anyway?"
-msgstr "��� ����� - ������ �������������?"
+msgstr "Йде запис - дійсно перезапустити?"
 
 msgid "restart anyway?"
-msgstr "������ �������������?"
+msgstr "дійсно перезапустити?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "�������� "
+msgstr "Гучність "
 
 msgid "Classic VDR"
-msgstr "���������"
+msgstr "Класичний VDR"
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG ������"
+msgstr "ST:TNG панелі"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "���ǿ��"
+msgstr "ПВСЧПСН"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "��ݲ�������ҿ����ѽ��"
+msgstr "ПонВтрСрдЧтвПтнСубНед"
 
 msgid "Monday"
-msgstr "���������"
+msgstr "Понеділок"
 
 msgid "Tuesday"
-msgstr "��������"
+msgstr "Вівторок"
 
 msgid "Wednesday"
-msgstr "������"
+msgstr "Середа"
 
 msgid "Thursday"
-msgstr "������"
+msgstr "Четвер"
 
 msgid "Friday"
-msgstr "�'������"
+msgstr "П'ятниця"
 
 msgid "Saturday"
-msgstr "������"
+msgstr "Субота"
 
 msgid "Sunday"
-msgstr "������"
+msgstr "Неділя"
 
 msgid "Upcoming recording!"
-msgstr "����� ����� ���������"
+msgstr "Запис скоро почнеться"
+
+msgid "Pause live video?"
+msgstr "Режим відкладеного перегляду..."
 
 msgid "Recording started"
-msgstr "����� �������"
+msgstr "Запис почався"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR ����������� �������� - ��������� Power ��� ������������"
+msgstr "VDR виключиться ппізніше - натисніть Power для пришвидшення"
 
 msgid "Press any key to cancel shutdown"
-msgstr "��������� ����-��� ������ ��� ������� ����������."
+msgstr "Натисніть будь-яку кнопку для відміни виключення."
 
 msgid "Switching primary DVB..."
-msgstr "����� ��������� DVB-��������..."
+msgstr "Зміна основного DVB-пристрою..."
 
 msgid "Editing process failed!"
-msgstr "������� ��� ��� ������� ������!"
+msgstr "Помилка під час монтажу запису!"
 
 msgid "Editing process finished"
-msgstr "������ ���������"
+msgstr "Монтаж закінчено"
 
 msgid "Press any key to cancel restart"
-msgstr "��������� ����-��� ������ ��� ������� ����������������"
+msgstr "Натисніть будь-яку кнопку для відміни перезавантаження"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR ����������� ����� %s ������"
+msgstr "VDR виключиться через %s хвилин"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 92b20a713..f27677576 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2008-12-14 16:10+0100\n"
+"POT-Creation-Date: 2009-05-21 13:18+0200\n"
 "PO-Revision-Date: 2008-03-21 08:44+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -707,6 +707,15 @@ msgstr "CAM正在使用-是否重启？"
 msgid "Can't reset CAM!"
 msgstr "不能重启CAM"
 
+msgid "do not pause live video"
+msgstr ""
+
+msgid "confirm pause live video"
+msgstr ""
+
+msgid "pause live video"
+msgstr ""
+
 msgid "Recording"
 msgstr "记录中"
 
@@ -725,6 +734,9 @@ msgstr "默认优先"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "默认终身 (d)"
 
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause priority"
 msgstr "暂停优先"
 
@@ -986,6 +998,9 @@ msgstr "星期天"
 msgid "Upcoming recording!"
 msgstr "即将的记录！"
 
+msgid "Pause live video?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "记录开始！"
 
diff --git a/recorder.c b/recorder.c
index d8f22ce19..4e48a51e5 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.3 2009/03/20 15:49:02 kls Exp $
+ * $Id: recorder.c 2.4 2009/05/23 12:18:25 kls Exp $
  */
 
 #include "recorder.h"
@@ -44,12 +44,14 @@ cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, i
      Type = 0x06;
      }
   frameDetector = new cFrameDetector(Pid, Type);
-  patPmtGenerator.SetChannel(Channel);
-  fileName = NULL;
   index = NULL;
   fileSize = 0;
   lastDiskSpaceCheck = time(NULL);
   fileName = new cFileName(FileName, true);
+  int PatVersion, PmtVersion;
+  if (fileName->GetLastPatPmtVersions(PatVersion, PmtVersion))
+     patPmtGenerator.SetVersions(PatVersion + 1, PmtVersion + 1);
+  patPmtGenerator.SetChannel(Channel);
   recordFile = fileName->Open();
   if (!recordFile)
      return;
diff --git a/recording.c b/recording.c
index c86b16364..2ff7f6fa8 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.12 2009/04/13 13:50:39 kls Exp $
+ * $Id: recording.c 2.16 2009/06/13 13:34:08 kls Exp $
  */
 
 #include "recording.h"
@@ -20,6 +20,7 @@
 #include "channels.h"
 #include "i18n.h"
 #include "interface.h"
+#include "remux.h"
 #include "skins.h"
 #include "tools.h"
 #include "videodir.h"
@@ -622,8 +623,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
      Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
      Subtitle = SubtitleBuffer;
      }
-  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
-  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
+  const char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
+  const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
      name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
@@ -672,7 +673,7 @@ cRecording::cRecording(const char *FileName)
   sortBuffer = NULL;
   fileName = strdup(FileName);
   FileName += strlen(VideoDirectory) + 1;
-  char *p = strrchr(FileName, '/');
+  const char *p = strrchr(FileName, '/');
 
   name = NULL;
   info = new cRecordingInfo;
@@ -1528,8 +1529,8 @@ bool cIndexFile::Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *I
         if (Independent)
            *Independent = index[Index].independent;
         if (Length) {
-           int fn = index[Index + 1].number;
-           int fo = index[Index + 1].offset;
+           uint16_t fn = index[Index + 1].number;
+           off_t fo = index[Index + 1].offset;
            if (fn == *FileNumber)
               *Length = fo - *FileOffset;
            else
@@ -1559,8 +1560,8 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off
                *FileOffset = index[Index].offset;
                if (Length) {
                   // all recordings end with a non-independent frame, so the following should be safe:
-                  int fn = index[Index + 1].number;
-                  int fo = index[Index + 1].offset;
+                  uint16_t fn = index[Index + 1].number;
+                  off_t fo = index[Index + 1].offset;
                   if (fn == *FileNumber)
                      *Length = fo - *FileOffset;
                   else {
@@ -1629,6 +1630,57 @@ cFileName::~cFileName()
   free(fileName);
 }
 
+bool cFileName::GetLastPatPmtVersions(int &PatVersion, int &PmtVersion)
+{
+  if (fileName && !isPesRecording) {
+     // Find the last recording file:
+     int Number = 1;
+     for (; Number <= MAXFILESPERRECORDINGTS + 1; Number++) { // +1 to correctly set Number in case there actually are that many files
+         sprintf(pFileNumber, RECORDFILESUFFIXTS, Number);
+         if (access(fileName, F_OK) != 0) { // file doesn't exist
+            Number--;
+            break;
+            }
+         }
+     for (; Number > 0; Number--) {
+         // Search for a PAT packet from the end of the file:
+         cPatPmtParser PatPmtParser;
+         sprintf(pFileNumber, RECORDFILESUFFIXTS, Number);
+         int fd = open(fileName, O_RDONLY | O_LARGEFILE, DEFFILEMODE);
+         if (fd >= 0) {
+            off_t pos = lseek(fd, -TS_SIZE, SEEK_END);
+            while (pos >= 0) {
+                  // Read and parse the PAT/PMT:
+                  uchar buf[TS_SIZE];
+                  while (read(fd, buf, sizeof(buf)) == sizeof(buf)) {
+                        if (buf[0] == TS_SYNC_BYTE) {
+                           int Pid = TsPid(buf);
+                           if (Pid == 0)
+                              PatPmtParser.ParsePat(buf, sizeof(buf));
+                           else if (Pid == PatPmtParser.PmtPid()) {
+                              PatPmtParser.ParsePmt(buf, sizeof(buf));
+                              if (PatPmtParser.GetVersions(PatVersion, PmtVersion)) {
+                                 close(fd);
+                                 return true;
+                                 }
+                              }
+                           else
+                              break; // PAT/PMT is always in one sequence
+                           }
+                        else
+                           return false;
+                        }
+                  pos = lseek(fd, pos - TS_SIZE, SEEK_SET);
+                  }
+            close(fd);
+            }
+         else
+            break;
+         }
+     }
+  return false;
+}
+
 cUnbufferedFile *cFileName::Open(void)
 {
   if (!file) {
diff --git a/recording.h b/recording.h
index d55cfdf06..81c72fd46 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.7 2009/04/19 09:00:45 kls Exp $
+ * $Id: recording.h 2.8 2009/05/23 12:14:42 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -260,6 +260,7 @@ class cFileName {
   ~cFileName();
   const char *Name(void) { return fileName; }
   int Number(void) { return fileNumber; }
+  bool GetLastPatPmtVersions(int &PatVersion, int &PmtVersion);
   cUnbufferedFile *Open(void);
   void Close(void);
   cUnbufferedFile *SetOffset(int Number, off_t Offset = 0);
diff --git a/remux.c b/remux.c
index 58c05311f..97c139c9b 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.20 2009/05/03 14:43:25 kls Exp $
+ * $Id: remux.c 2.24 2009/06/06 13:24:57 kls Exp $
  */
 
 #include "remux.h"
@@ -357,6 +357,12 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
      }
 }
 
+void cPatPmtGenerator::SetVersions(int PatVersion, int PmtVersion)
+{
+  patVersion = PatVersion & 0x1F;
+  pmtVersion = PmtVersion & 0x1F;
+}
+
 void cPatPmtGenerator::SetChannel(cChannel *Channel)
 {
   if (Channel) {
@@ -383,8 +389,9 @@ uchar *cPatPmtGenerator::GetPmt(int &Index)
 
 // --- cPatPmtParser ---------------------------------------------------------
 
-cPatPmtParser::cPatPmtParser(void)
+cPatPmtParser::cPatPmtParser(bool UpdatePrimaryDevice)
 {
+  updatePrimaryDevice = UpdatePrimaryDevice;
   Reset();
 }
 
@@ -472,7 +479,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
      dbgpatpmt("     pcr = %d\n", Pmt.getPCRPid());
      if (pmtVersion == Pmt.getVersionNumber())
         return;
-     cDevice::PrimaryDevice()->ClrAvailableTracks(false, true);
+     if (updatePrimaryDevice)
+        cDevice::PrimaryDevice()->ClrAvailableTracks(false, true);
      int NumApids = 0;
      int NumDpids = 0;
      int NumSpids = 0;
@@ -481,6 +489,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
      for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
          dbgpatpmt("     stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
          switch (stream.getStreamType()) {
+           case 0x01: // STREAMTYPE_11172_VIDEO
            case 0x02: // STREAMTYPE_13818_VIDEO
            case 0x1B: // MPEG4
                       vpid = stream.getPid();
@@ -515,7 +524,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                                }
                              delete d;
                              }
-                         cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, NumApids, stream.getPid(), ALangs);
+                         if (updatePrimaryDevice)
+                            cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, NumApids, stream.getPid(), ALangs);
                          NumApids++;
                          }
                       }
@@ -550,7 +560,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                                               break;
                                            }
                                         }
-                                    cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, stream.getPid(), SLangs);
+                                    if (updatePrimaryDevice)
+                                       cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, stream.getPid(), SLangs);
                                     NumSpids++;
                                     }
                                  break;
@@ -566,7 +577,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                           }
                       if (dpid) {
                          if (NumDpids < MAXDPIDS) {
-                            cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
+                            if (updatePrimaryDevice)
+                               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
                             NumDpids++;
                             }
                          }
@@ -574,8 +586,10 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       break;
            }
          dbgpatpmt("\n");
-         cDevice::PrimaryDevice()->EnsureAudioTrack(true);
-         cDevice::PrimaryDevice()->EnsureSubtitleTrack();
+         if (updatePrimaryDevice) {
+            cDevice::PrimaryDevice()->EnsureAudioTrack(true);
+            cDevice::PrimaryDevice()->EnsureSubtitleTrack();
+            }
          }
      pmtVersion = Pmt.getVersionNumber();
      }
@@ -584,13 +598,19 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
   pmtSize = 0;
 }
 
+bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion)
+{
+  PatVersion = patVersion;
+  PmtVersion = pmtVersion;
+  return patVersion >= 0 && pmtVersion >= 0;
+}
+
 // --- cTsToPes --------------------------------------------------------------
 
 cTsToPes::cTsToPes(void)
 {
   data = NULL;
   size = length = offset = 0;
-  synced = false;
 }
 
 cTsToPes::~cTsToPes()
@@ -702,7 +722,7 @@ cFrameDetector::cFrameDetector(int Pid, int Type)
   newFrame = independentFrame = false;
   numPtsValues = 0;
   numIFrames = 0;
-  isVideo = type == 0x02 || type == 0x1B; // MPEG 2 or MPEG 4
+  isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or 4
   frameDuration = 0;
   framesInPayloadUnit = framesPerPayloadUnit = 0;
   payloadUnitOfFrame = 0;
@@ -795,6 +815,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                   scanner <<= 8;
                   scanner |= Data[i];
                   switch (type) {
+                    case 0x01: // MPEG 1 video
                     case 0x02: // MPEG 2 video
                          if (scanner == 0x00000100) { // Picture Start Code
                             if (synced && Processed)
diff --git a/remux.h b/remux.h
index 063acaa65..0dd1a9ab3 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.10 2009/04/19 10:57:09 kls Exp $
+ * $Id: remux.h 2.17 2009/06/06 13:26:23 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -181,6 +181,15 @@ class cPatPmtGenerator {
        ///< with GetPmt().
 public:
   cPatPmtGenerator(cChannel *Channel = NULL);
+  void SetVersions(int PatVersion, int PmtVersion);
+       ///< Sets the version numbers for the generated PAT and PMT, in case
+       ///< this generator is used to, e.g.,  continue a previously interrupted
+       ///< recording (in which case the numbers given should be derived from
+       ///< the PAT/PMT versions last used in the existing recording, incremented
+       ///< by 1. If the given numbers exceed the allowed range of 0..31, the
+       ///< higher bits will automatically be cleared.
+       ///< SetVersions() needs to be called before SetChannel() in order to
+       ///< have an effect from the very start.
   void SetChannel(cChannel *Channel);
        ///< Sets the Channel for which the PAT/PMT shall be generated.
   uchar *GetPat(void);
@@ -204,10 +213,11 @@ class cPatPmtParser {
   int pmtPid;
   int vpid;
   int vtype;
+  bool updatePrimaryDevice;
 protected:
   int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
 public:
-  cPatPmtParser(void);
+  cPatPmtParser(bool UpdatePrimaryDevice = false);
   void Reset(void);
        ///< Resets the parser. This function must be called whenever a new
        ///< stream is parsed.
@@ -221,6 +231,9 @@ class cPatPmtParser {
        ///< are delivered to the parser through several subsequent calls to
        ///< ParsePmt(). The whole PMT data will be processed once the last packet
        ///< has been received.
+  bool GetVersions(int &PatVersion, int &PmtVersion);
+       ///< Returns true if a valid PAT/PMT has been parsed and stores
+       ///< the current version numbers in the given variables.
   int PmtPid(void) { return pmtPid; }
        ///< Returns the PMT pid as defined by the current PAT.
        ///< If no PAT has been received yet, -1 will be returned.
@@ -239,7 +252,6 @@ class cTsToPes {
   int size;
   int length;
   int offset;
-  bool synced;
 public:
   cTsToPes(void);
   ~cTsToPes();
@@ -249,11 +261,24 @@ class cTsToPes {
        ///< If the given TS packet starts a new PES payload packet, the converter
        ///< will be automatically reset. Any packets before the first one that starts
        ///< a new PES payload packet will be ignored.
+       ///< Once a TS packet has been put into a cTsToPes converter, all subsequent
+       ///< packets until the next call to Reset() must belong to the same PID as
+       ///< the first packet. There is no check whether this actually is the case, so
+       ///< the caller is responsible for making sure this condition is met.
   const uchar *GetPes(int &Length);
        ///< Gets a pointer to the complete PES packet, or NULL if the packet
        ///< is not complete yet. If the packet is complete, Length will contain
        ///< the total packet length. The returned pointer is only valid until
        ///< the next call to PutTs() or Reset(), or until this object is destroyed.
+       ///< Once GetPes() has returned a non-NULL value, it must be called
+       ///< repeatedly, and the data processed, until it returns NULL. This
+       ///< is because video packets may be larger than the data a single
+       ///< PES packet with an actual length field can hold, and are therefore
+       ///< split into several PES packets with smaller sizes.
+       ///< Note that for video data GetPes() may only be called if the next
+       ///< TS packet that will be given to PutTs() has the "payload start" flag
+       ///< set, because this is the only way to determine the end of a video PES
+       ///< packet.
   void Reset(void);
        ///< Resets the converter. This needs to be called after a PES packet has
        ///< been fetched by a call to GetPes(), and before the next call to
diff --git a/ringbuffer.c b/ringbuffer.c
index a9912ff67..fd8123ec2 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 2.1 2009/02/24 11:32:14 kls Exp $
+ * $Id: ringbuffer.c 2.2 2009/05/17 10:05:17 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -43,7 +43,7 @@ void cRingBuffer::UpdatePercentage(int Fill)
 {
   if (Fill > maxFill)
      maxFill = Fill;
-  int percent = Fill * 100 / (Size() - 1) / PERCENTAGEDELTA * PERCENTAGEDELTA;
+  int percent = Fill * 100 / (Size() - 1) / PERCENTAGEDELTA * PERCENTAGEDELTA; // clamp down to nearest quantum
   if (percent != lastPercent) {
      if (percent >= PERCENTAGETHRESHOLD && percent > lastPercent || percent < PERCENTAGETHRESHOLD && lastPercent >= PERCENTAGETHRESHOLD) {
         dsyslog("buffer usage: %d%% (tid=%d)", percent, getThreadTid);
diff --git a/skins.c b/skins.c
index 8c67a80c7..a0815e268 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.0 2008/02/17 11:31:09 kls Exp $
+ * $Id: skins.c 2.1 2009/06/06 15:12:31 kls Exp $
  */
 
 #include "skins.h"
@@ -78,8 +78,9 @@ void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
   tabs[3] = Tab3 ? tabs[2] + Tab3 : 0;
   tabs[4] = Tab4 ? tabs[3] + Tab4 : 0;
   tabs[5] = Tab5 ? tabs[4] + Tab5 : 0;
+  int AvgCharWidth = Setup.FontOsdSize * 3 / 5; // just an estimate
   for (int i = 1; i < MaxTabs; i++)
-      tabs[i] *= 12;//XXX average character width of font used for items - see also skincurses.c!!!
+      tabs[i] *= AvgCharWidth;
 }
 
 void cSkinDisplayMenu::Scroll(bool Up, bool Page)
diff --git a/svdrp.c b/svdrp.c
index cc2f712cd..416b86980 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.3 2009/04/13 13:35:29 kls Exp $
+ * $Id: svdrp.c 2.5 2009/06/06 14:03:55 kls Exp $
  */
 
 #include "svdrp.h"
@@ -739,7 +739,7 @@ void cSVDRP::CmdGRAB(const char *Option)
      char *strtok_next;
      FileName = strtok_r(p, delim, &strtok_next);
      // image type:
-     char *Extension = strrchr(FileName, '.');
+     const char *Extension = strrchr(FileName, '.');
      if (Extension) {
         if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
            Jpeg = true;
@@ -798,16 +798,17 @@ void cSVDRP::CmdGRAB(const char *Option)
      char RealFileName[PATH_MAX];
      if (FileName) {
         if (grabImageDir) {
-           cString s;
-           char *slash = strrchr(FileName, '/');
+           cString s(FileName);
+           FileName = s;
+           const char *slash = strrchr(FileName, '/');
            if (!slash) {
               s = AddDirectory(grabImageDir, FileName);
               FileName = s;
               }
            slash = strrchr(FileName, '/'); // there definitely is one
-           *slash = 0;
-           char *r = realpath(FileName, RealFileName);
-           *slash = '/';
+           cString t(s);
+           t.Truncate(slash - FileName);
+           char *r = realpath(t, RealFileName);
            if (!r) {
               LOG_ERROR_STR(FileName);
               Reply(501, "Invalid file name \"%s\"", FileName);
diff --git a/tools.c b/tools.c
index f49206f09..9ef61f57d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.2 2009/01/16 14:29:08 kls Exp $
+ * $Id: tools.c 2.3 2009/05/31 11:43:24 kls Exp $
  */
 
 #include "tools.h"
@@ -1473,16 +1473,18 @@ int cUnbufferedFile::Open(const char *FileName, int Flags, mode_t Mode)
 
 int cUnbufferedFile::Close(void)
 {
-#ifdef USE_FADVISE
   if (fd >= 0) {
+#ifdef USE_FADVISE
      if (totwritten)    // if we wrote anything make sure the data has hit the disk before
         fdatasync(fd);  // calling fadvise, as this is our last chance to un-cache it.
      posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
-     }
 #endif
-  int OldFd = fd;
-  fd = -1;
-  return close(OldFd);
+     int OldFd = fd;
+     fd = -1;
+     return close(OldFd);
+     }
+  errno = EBADF;
+  return -1;
 }
 
 // When replaying and going e.g. FF->PLAY the position jumps back 2..8M
diff --git a/vdr.c b/vdr.c
index 46e420099..2384895c3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 2.8 2009/05/03 10:33:06 kls Exp $
+ * $Id: vdr.c 2.10 2009/05/21 11:14:48 kls Exp $
  */
 
 #include <getopt.h>
@@ -750,8 +750,10 @@ int main(int argc, char *argv[])
         // Update the OSD size:
         {
           static time_t lastOsdSizeUpdate = 0;
-          if (Now != lastOsdSizeUpdate) // once per second
+          if (Now != lastOsdSizeUpdate) { // once per second
              cOsdProvider::UpdateOsdSize();
+             lastOsdSizeUpdate = Now;
+             }
         }
         // Restart the Watchdog timer:
         if (WatchdogTimeout > 0) {
@@ -1060,8 +1062,12 @@ int main(int argc, char *argv[])
           case kPause:
                if (!cControl::Control()) {
                   DELETE_MENU;
-                  if (!cRecordControls::PauseLiveVideo())
-                     Skins.Message(mtError, tr("No free DVB device to record!"));
+                  if (Setup.PauseKeyHandling) {
+                     if (Setup.PauseKeyHandling > 1 || Interface->Confirm(tr("Pause live video?"))) {
+                        if (!cRecordControls::PauseLiveVideo())
+                           Skins.Message(mtError, tr("No free DVB device to record!"));
+                        }
+                     }
                   key = kNone; // nobody else needs to see this key
                   }
                break;

From 06bf4c453e22a9bf03f5ec46f7b45593e2cb326c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 23 Aug 2009 16:04:00 +0200
Subject: [PATCH 195/307] Version 1.7.9 - Fixed storing the current OSD size in
 case the device has   changed it in its setup menu (reported by Reinhard
 Nissl). - Fixed cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in case
 only part of the   buffer has been accepted by the device (reported by Udo
 Richter). - Changed the EIT filter setup to save a few handles on devices
 that do hardware   filtering. - Fixed deleting expired timers if they have
 the VPS flag set, but the event they   are assigned to doesn't have a VPS
 tag. - Fixed handling file name length on VFAT systems in case they   contain
 UTF-8 characters (thanks to Rolf Ahrenberg). - Fixed generating CaPmts in
 case audio and video are encrypted using different   ECM pids. - Updated
 vdr.1 to use the new file names in recording directories. - Fixed
 cRecordings::DelByName() to avoid compilation errors with gcc 4.4   (thanks
 to Matthias Schwarzott). - Increased the value of MAXFRAMESIZE to better suit
 HD recordings (thanks to   Reinhard Nissl). - Implemented full handling of
 subtitling descriptors (thanks to Mikko Tuumanen).

---
 CONTRIBUTORS | 11 +++++++
 HISTORY      | 23 ++++++++++++-
 channels.c   | 18 ++++++++++-
 channels.h   |  9 +++++-
 ci.c         | 40 +++++++++++++++--------
 config.h     | 10 +++---
 device.c     | 10 ++++--
 eit.c        | 33 ++++++++++---------
 menu.c       |  3 +-
 pat.c        | 91 +++++++++++++++++++++++++++++-----------------------
 pat.h        |  4 +--
 recording.c  |  4 +--
 recording.h  |  4 +--
 remux.c      | 36 +++++++++++++++------
 remux.h      | 10 ++++--
 timers.c     | 20 +++++++++---
 vdr.1        | 12 +++----
 17 files changed, 228 insertions(+), 110 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7cdfa22bb..f80bce2fd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1079,6 +1079,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding cThread::SetIOPriority() and using it in cRemoveDeletedRecordingsThread
  for suggesting to introduce cDevice::GetOsdSize()
  for adding a note about the meaning of PERCENTAGEDELTA in cRingBuffer::UpdatePercentage()
+ for fixing handling file name length on VFAT systems in case they
+ contain UTF-8 characters
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1229,6 +1231,9 @@ Reinhard Nissl <rnissl@gmx.de>
  and GetOsdSize()
  for reporting a problem with calculating menu colum widths in case the font has a
  size other than the default size
+ for reporting a bug in storing the current OSD size in case the
+ device has changed it in its setup menu
+ for increasing the value of MAXFRAMESIZE to better suit HD recordings
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1641,6 +1646,8 @@ Udo Richter <udo_richter@gmx.de>
  for suggesting to add a note to the INSTALL file about using subdirectories to
  split a large disk into separate areas for VDR's video data and other stuff
  for reporting wrong variable types in cIndexFile
+ for reporting a problem with cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in
+ case only part of the buffer has been accepted by the device
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2281,6 +2288,7 @@ Matthias Schwarzott <zzam@gentoo.org>
  for adding DESTDIR and PREFIX handling to the Makefile
  for fixing some compiler warnings with gcc-4.2.0
  for fixing setting the locale file name in i18n-to-gettext.pl
+ for fixing cRecordings::DelByName() to avoid compilation errors with gcc 4.4
 
 Martin Ostermann <martin@familie-ostermann.de>
  for fixing processing the PDCDescriptor in 'libsi' on big endian systems
@@ -2478,3 +2486,6 @@ G
 Martin Neuditschko <yosuke.tomoe@gmx.net>
  for reporting a problem with error messages from cDvbDevice::GetVideoSize()
  on systems with no real primary replay device
+
+Mikko Tuumanen <mikko.tuumanen@utu.fi>
+ for implementing full handling of subtitling descriptors
diff --git a/HISTORY b/HISTORY
index bf32b6a14..6ff2517e6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6133,5 +6133,26 @@ Video Disk Recorder Revision History
   default size (reported by Reinhard Nissl).
 - Added a plausibility check for the OSD percentage parameters
   to avoid problems in case the values are stored in the setup.conf
-  file in a  wrong way.
+  file in a wrong way.
 - Fixed variable types in cIndexFile (reported by Udo Richter).
+
+2009-08-23: Version 1.7.9
+
+- Fixed storing the current OSD size in case the device has
+  changed it in its setup menu (reported by Reinhard Nissl).
+- Fixed cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in case only part of the
+  buffer has been accepted by the device (reported by Udo Richter).
+- Changed the EIT filter setup to save a few handles on devices that do hardware
+  filtering.
+- Fixed deleting expired timers if they have the VPS flag set, but the event they
+  are assigned to doesn't have a VPS tag.
+- Fixed handling file name length on VFAT systems in case they
+  contain UTF-8 characters (thanks to Rolf Ahrenberg).
+- Fixed generating CaPmts in case audio and video are encrypted using different
+  ECM pids.
+- Updated vdr.1 to use the new file names in recording directories.
+- Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4
+  (thanks to Matthias Schwarzott).
+- Increased the value of MAXFRAMESIZE to better suit HD recordings (thanks to
+  Reinhard Nissl).
+- Implemented full handling of subtitling descriptors (thanks to Mikko Tuumanen).
diff --git a/channels.c b/channels.c
index 1e857009a..590271d65 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.6 2009/04/25 13:57:32 kls Exp $
+ * $Id: channels.c 2.7 2009/08/16 15:08:49 kls Exp $
  */
 
 #include "channels.h"
@@ -533,6 +533,22 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][
      }
 }
 
+void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds)
+{
+  if (SubtitlingTypes) {
+     for (int i = 0; i < MAXSPIDS; i++)
+         subtitlingTypes[i] = SubtitlingTypes[i];
+     }
+  if (CompositionPageIds) {
+     for (int i = 0; i < MAXSPIDS; i++)
+         compositionPageIds[i] = CompositionPageIds[i];
+     }
+  if (AncillaryPageIds) {
+     for (int i = 0; i < MAXSPIDS; i++)
+         ancillaryPageIds[i] = AncillaryPageIds[i];
+     }
+}
+
 void cChannel::SetCaIds(const int *CaIds)
 {
   if (caids[0] && caids[0] <= CA_USER_MAX)
diff --git a/channels.h b/channels.h
index a3c1d433c..c012a7d44 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.4 2008/11/22 13:35:52 kls Exp $
+ * $Id: channels.h 2.5 2009/08/16 14:58:26 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -129,6 +129,9 @@ class cChannel : public cListObject {
   char dlangs[MAXDPIDS][MAXLANGCODE2];
   int spids[MAXSPIDS + 1]; // list is zero-terminated
   char slangs[MAXSPIDS][MAXLANGCODE2];
+  uchar subtitlingTypes[MAXSPIDS];
+  uint16_t compositionPageIds[MAXSPIDS];
+  uint16_t ancillaryPageIds[MAXSPIDS];
   int tpid;
   int caids[MAXCAIDS + 1]; // list is zero-terminated
   int nid;
@@ -185,6 +188,9 @@ class cChannel : public cListObject {
   const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
   const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
   const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
+  uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS ? subtitlingTypes[i] : 0); }
+  uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS ? compositionPageIds[i] : 0); }
+  uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS ? ancillaryPageIds[i] : 0); }
   int Tpid(void) const { return tpid; }
   const int *Caids(void) const { return caids; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
@@ -226,6 +232,7 @@ class cChannel : public cListObject {
   void SetCaDescriptors(int Level);
   void SetLinkChannels(cLinkChannels *LinkChannels);
   void SetRefChannel(cChannel *RefChannel);
+  void SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds);
   };
 
 class cChannels : public cRwLock, public cConfig<cChannel> {
diff --git a/ci.c b/ci.c
index 4d3df3e09..8db1853cf 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.1 2008/04/13 13:28:52 kls Exp $
+ * $Id: ci.c 2.3 2009/08/16 13:21:07 kls Exp $
  */
 
 #include "ci.h"
@@ -551,6 +551,8 @@ bool cCiApplicationInformation::EnterMenu(void)
 
 // --- cCiCaPmt --------------------------------------------------------------
 
+#define MAXCASYSTEMIDS 64
+
 // Ca Pmt List Management:
 
 #define CPLM_MORE    0x00
@@ -574,9 +576,10 @@ class cCiCaPmt : public cListObject {
   int length;
   int esInfoLengthPos;
   uint8_t capmt[2048]; ///< XXX is there a specified maximum?
-  int caDescriptorsLength;
-  uint8_t caDescriptors[2048];
-  bool streamFlag;
+  int source;
+  int transponder;
+  int programNumber;
+  int caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
   void AddCaDescriptors(int Length, const uint8_t *Data);
 public:
   cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds);
@@ -589,7 +592,17 @@ class cCiCaPmt : public cListObject {
 cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds)
 {
   cmdId = CmdId;
-  caDescriptorsLength = GetCaDescriptors(Source, Transponder, ProgramNumber, CaSystemIds, sizeof(caDescriptors), caDescriptors, streamFlag);
+  source = Source;
+  transponder = Transponder;
+  programNumber = ProgramNumber;
+  int i = 0;
+  if (CaSystemIds) {
+     for (; CaSystemIds[i]; i++)
+         caSystemIds[i] = CaSystemIds[i];
+     }
+  caSystemIds[i] = 0;
+  uint8_t caDescriptors[512];
+  int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, 0);
   length = 0;
   capmt[length++] = CPLM_ONLY;
   capmt[length++] = (ProgramNumber >> 8) & 0xFF;
@@ -597,8 +610,9 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
   capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
   esInfoLengthPos = length;
   capmt[length++] = 0x00; // program_info_length H (at program level)
-  capmt[length++] = 0x00; // program_info_length L
-  if (!streamFlag)
+  capmt[length++] = 0x01; // program_info_length L
+  capmt[length++] = cmdId;
+  if (caDescriptorsLength > 0)
      AddCaDescriptors(caDescriptorsLength, caDescriptors);
 }
 
@@ -610,14 +624,17 @@ void cCiCaPmt::SetListManagement(uint8_t ListManagement)
 void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
 {
   if (Pid) {
+     uint8_t caDescriptors[512];
+     int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, Pid);
      //XXX buffer overflow check???
      capmt[length++] = StreamType;
      capmt[length++] = (Pid >> 8) & 0xFF;
      capmt[length++] =  Pid       & 0xFF;
      esInfoLengthPos = length;
      capmt[length++] = 0x00; // ES_info_length H (at ES level)
-     capmt[length++] = 0x00; // ES_info_length L
-     if (streamFlag)
+     capmt[length++] = 0x01; // ES_info_length L
+     capmt[length++] = cmdId;
+     if (caDescriptorsLength > 0)
         AddCaDescriptors(caDescriptorsLength, caDescriptors);
      }
 }
@@ -625,8 +642,7 @@ void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
 void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 {
   if (esInfoLengthPos) {
-     if (length + Length < int(sizeof(capmt))) {
-        capmt[length++] = cmdId;
+     if (length + Length <= int(sizeof(capmt))) {
         memcpy(capmt + length, Data, Length);
         length += Length;
         int l = length - esInfoLengthPos - 2;
@@ -643,8 +659,6 @@ void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 
 // --- cCiConditionalAccessSupport -------------------------------------------
 
-#define MAXCASYSTEMIDS 64
-
 // CA Enable Ids:
 
 #define CAEI_POSSIBLE                  0x01
diff --git a/config.h b/config.h
index 7a41d4019..eec81bfcd 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.13 2009/05/21 11:11:32 kls Exp $
+ * $Id: config.h 2.14 2009/06/21 10:02:49 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.8"
-#define VDRVERSNUM   10708  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.9"
+#define VDRVERSNUM   10709  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.8"
-#define APIVERSNUM   10708  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.9"
+#define APIVERSNUM   10709  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 834b6ead7..5b9b5141a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.23 2009/06/06 13:25:58 kls Exp $
+ * $Id: device.c 2.25 2009/08/16 10:54:36 kls Exp $
  */
 
 #include "device.h"
@@ -1293,8 +1293,10 @@ int cDevice::PlayTsVideo(const uchar *Data, int Length)
      int l;
      while (const uchar *p = tsToPesVideo.GetPes(l)) {
            int w = PlayVideo(p, l);
-           if (w <= 0)
+           if (w <= 0) {
+              tsToPesVideo.SetRepeatLast();
               return w;
+              }
            }
      tsToPesVideo.Reset();
      }
@@ -1308,8 +1310,10 @@ int cDevice::PlayTsAudio(const uchar *Data, int Length)
   int l;
   if (const uchar *p = tsToPesAudio.GetPes(l)) {
      int w = PlayAudio(p, l, 0);
-     if (w <= 0)
+     if (w <= 0) {
+        tsToPesAudio.SetRepeatLast();
         return w;
+        }
      tsToPesAudio.Reset();
      }
   tsToPesAudio.PutTs(Data, Length);
diff --git a/eit.c b/eit.c
index 1189a1087..486784b2a 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.5 2009/05/15 12:34:43 kls Exp $
+ * $Id: eit.c 2.6 2009/06/21 13:46:20 kls Exp $
  */
 
 #include "eit.h"
@@ -322,29 +322,30 @@ cTDT::cTDT(const u_char *Data)
 
 cEitFilter::cEitFilter(void)
 {
-  Set(0x12, 0x4E, 0xFE);  // event info, actual(0x4E)/other(0x4F) TS, present/following
-  Set(0x12, 0x50, 0xF0);  // event info, actual TS, schedule(0x50)/schedule for future days(0x5X)
-  Set(0x12, 0x60, 0xF0);  // event info, other  TS, schedule(0x60)/schedule for future days(0x6X)
-  Set(0x14, 0x70);        // TDT
+  Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X)
+  if (Setup.SetSystemTime && Setup.TimeTransponder)
+     Set(0x14, 0x70);     // TDT
 }
 
 void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
   switch (Pid) {
     case 0x12: {
-         cSchedulesLock SchedulesLock(true, 10);
-         cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
-         if (Schedules)
-            cEIT EIT(Schedules, Source(), Tid, Data);
-         else {
-            // If we don't get a write lock, let's at least get a read lock, so
-            // that we can set the running status and 'seen' timestamp (well, actually
-            // with a read lock we shouldn't be doing that, but it's only integers that
-            // get changed, so it should be ok)
-            cSchedulesLock SchedulesLock;
+         if (Tid >= 0x4E && Tid <= 0x6F) {
+            cSchedulesLock SchedulesLock(true, 10);
             cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
             if (Schedules)
-               cEIT EIT(Schedules, Source(), Tid, Data, true);
+               cEIT EIT(Schedules, Source(), Tid, Data);
+            else {
+               // If we don't get a write lock, let's at least get a read lock, so
+               // that we can set the running status and 'seen' timestamp (well, actually
+               // with a read lock we shouldn't be doing that, but it's only integers that
+               // get changed, so it should be ok)
+               cSchedulesLock SchedulesLock;
+               cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
+               if (Schedules)
+                  cEIT EIT(Schedules, Source(), Tid, Data, true);
+               }
             }
          }
          break;
diff --git a/menu.c b/menu.c
index cd1b30a67..05793e821 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.8 2009/05/21 11:10:38 kls Exp $
+ * $Id: menu.c 2.9 2009/06/21 09:56:06 kls Exp $
  */
 
 #include "menu.h"
@@ -2133,6 +2133,7 @@ cMenuSetupBase::cMenuSetupBase(void)
 void cMenuSetupBase::Store(void)
 {
   Setup = data;
+  cOsdProvider::UpdateOsdSize(true);
   Setup.Save();
 }
 
diff --git a/pat.c b/pat.c
index 528578424..cc96cd9df 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.2 2008/07/06 14:01:32 kls Exp $
+ * $Id: pat.c 2.4 2009/08/16 15:01:03 kls Exp $
  */
 
 #include "pat.h"
@@ -21,23 +21,23 @@
 class cCaDescriptor : public cListObject {
 private:
   int caSystem;
-  bool stream;
+  int esPid;
   int length;
   uchar *data;
 public:
-  cCaDescriptor(int CaSystem, int CaPid, bool Stream, int Length, const uchar *Data);
+  cCaDescriptor(int CaSystem, int CaPid, int EsPid, int Length, const uchar *Data);
   virtual ~cCaDescriptor();
   bool operator== (const cCaDescriptor &arg) const;
   int CaSystem(void) { return caSystem; }
-  int Stream(void) { return stream; }
+  int EsPid(void) { return esPid; }
   int Length(void) const { return length; }
   const uchar *Data(void) const { return data; }
   };
 
-cCaDescriptor::cCaDescriptor(int CaSystem, int CaPid, bool Stream, int Length, const uchar *Data)
+cCaDescriptor::cCaDescriptor(int CaSystem, int CaPid, int EsPid, int Length, const uchar *Data)
 {
   caSystem = CaSystem;
-  stream = Stream;
+  esPid = EsPid;
   length = Length + 6;
   data = MALLOC(uchar, length);
   data[0] = SI::CaDescriptorTag;
@@ -57,7 +57,7 @@ cCaDescriptor::~cCaDescriptor()
 
 bool cCaDescriptor::operator== (const cCaDescriptor &arg) const
 {
-  return length == arg.length && memcmp(data, arg.data, length) == 0;
+  return esPid == arg.esPid && length == arg.length && memcmp(data, arg.data, length) == 0;
 }
 
 // --- cCaDescriptors --------------------------------------------------------
@@ -77,8 +77,8 @@ class cCaDescriptors : public cListObject {
   bool Is(int Source, int Transponder, int ServiceId);
   bool Is(cCaDescriptors * CaDescriptors);
   bool Empty(void) { return caDescriptors.Count() == 0; }
-  void AddCaDescriptor(SI::CaDescriptor *d, bool Stream);
-  int GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+  void AddCaDescriptor(SI::CaDescriptor *d, int EsPid);
+  int GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
   const int *CaIds(void) { return caIds; }
   };
 
@@ -126,9 +126,9 @@ void cCaDescriptors::AddCaId(int CaId)
      }
 }
 
-void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
+void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, int EsPid)
 {
-  cCaDescriptor *nca = new cCaDescriptor(d->getCaType(), d->getCaPid(), Stream, d->privateData.getLength(), d->privateData.getData());
+  cCaDescriptor *nca = new cCaDescriptor(d->getCaType(), d->getCaPid(), EsPid, d->privateData.getLength(), d->privateData.getData());
   for (cCaDescriptor *ca = caDescriptors.First(); ca; ca = caDescriptors.Next(ca)) {
       if (*ca == *nca) {
          delete nca;
@@ -141,37 +141,39 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
 #ifdef DEBUG_CA_DESCRIPTORS
   char buffer[1024];
   char *q = buffer;
-  q += sprintf(q, "CAM: %04X %5d %5d %04X %d -", source, transponder, serviceId, d->getCaType(), Stream);
+  q += sprintf(q, "CAM: %04X %5d %5d %04X %04X -", source, transponder, serviceId, d->getCaType(), EsPid);
   for (int i = 0; i < nca->Length(); i++)
       q += sprintf(q, " %02X", nca->Data()[i]);
   dsyslog(buffer);
 #endif
 }
 
-int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+// EsPid is to select the "type" of CaDescriptor to be returned
+// >0 - CaDescriptor for the particular esPid
+// =0 - common CaDescriptor
+// <0 - all CaDescriptors regardless of type (old default)
+
+int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
 {
   if (!CaSystemIds || !*CaSystemIds)
      return 0;
   if (BufSize > 0 && Data) {
      int length = 0;
-     int IsStream = -1;
      for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
-         const int *caids = CaSystemIds;
-         do {
-            if (d->CaSystem() == *caids) {
-               if (length + d->Length() <= BufSize) {
-                  if (IsStream >= 0 && IsStream != d->Stream())
-                     dsyslog("CAM: different stream flag in CA descriptors");
-                  IsStream = d->Stream();
-                  memcpy(Data + length, d->Data(), d->Length());
-                  length += d->Length();
+         if (EsPid < 0 || d->EsPid() == EsPid) {
+            const int *caids = CaSystemIds;
+            do {
+               if (d->CaSystem() == *caids) {
+                  if (length + d->Length() <= BufSize) {
+                     memcpy(Data + length, d->Data(), d->Length());
+                     length += d->Length();
+                     }
+                  else
+                     return -1;
                   }
-               else
-                  return -1;
-               }
-            } while (*++caids);
+               } while (*++caids);
+            }
          }
-     StreamFlag = IsStream == 1;
      return length;
      }
   return -1;
@@ -187,7 +189,7 @@ class cCaDescriptorHandler : public cList<cCaDescriptors> {
       // Returns 0 if this is an already known descriptor,
       // 1 if it is an all new descriptor with actual contents,
       // and 2 if an existing descriptor was changed.
-  int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+  int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
   };
 
 int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
@@ -208,22 +210,21 @@ int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
   return CaDescriptors->Empty() ? 0 : 1;
 }
 
-int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
 {
   cMutexLock MutexLock(&mutex);
-  StreamFlag = false;
   for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
       if (ca->Is(Source, Transponder, ServiceId))
-         return ca->GetCaDescriptors(CaSystemIds, BufSize, Data, StreamFlag);
+         return ca->GetCaDescriptors(CaSystemIds, BufSize, Data, EsPid);
       }
   return 0;
 }
 
 cCaDescriptorHandler CaDescriptorHandler;
 
-int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
 {
-  return CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, BufSize, Data, StreamFlag);
+  return CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, BufSize, Data, EsPid);
 }
 
 // --- cPatFilter ------------------------------------------------------------
@@ -322,7 +323,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         cCaDescriptors *CaDescriptors = new cCaDescriptors(Channel->Source(), Channel->Transponder(), Channel->Sid());
         // Scan the common loop:
         for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)pmt.commonDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
-            CaDescriptors->AddCaDescriptor(d, false);
+            CaDescriptors->AddCaDescriptor(d, 0);
             delete d;
             }
         // Scan the stream-specific loop:
@@ -333,6 +334,9 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
         int Dpids[MAXDPIDS + 1] = { 0 };
         int Spids[MAXSPIDS + 1] = { 0 };
+        uchar SubtitlingTypes[MAXSPIDS + 1] = { 0 };
+        uint16_t CompositionPageIds[MAXSPIDS + 1] = { 0 };
+        uint16_t AncillaryPageIds[MAXSPIDS + 1] = { 0 };
         char ALangs[MAXAPIDS][MAXLANGCODE2] = { "" };
         char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
         char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
@@ -341,11 +345,12 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int NumDpids = 0;
         int NumSpids = 0;
         for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
+            int esPid = stream.getPid();
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
               case 0x1B: // MPEG4
-                      Vpid = stream.getPid();
+                      Vpid = esPid;
                       Ppid = pmt.getPCRPid();
                       Vtype = stream.getStreamType();
                       break;
@@ -353,7 +358,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               case 4: // STREAMTYPE_13818_AUDIO
                       {
                       if (NumApids < MAXAPIDS) {
-                         Apids[NumApids] = stream.getPid();
+                         Apids[NumApids] = esPid;
                          SI::Descriptor *d;
                          for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                              switch (d->getDescriptorTag()) {
@@ -392,17 +397,20 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                           switch (d->getDescriptorTag()) {
                             case SI::AC3DescriptorTag:
-                                 dpid = stream.getPid();
+                                 dpid = esPid;
                                  break;
                             case SI::SubtitlingDescriptorTag:
                                  if (NumSpids < MAXSPIDS) {
-                                    Spids[NumSpids] = stream.getPid();
+                                    Spids[NumSpids] = esPid;
                                     SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
                                     SI::SubtitlingDescriptor::Subtitling sub;
                                     char *s = SLangs[NumSpids];
                                     int n = 0;
                                     for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
                                         if (sub.languageCode[0]) {
+                                           SubtitlingTypes[NumSpids] = sub.getSubtitlingType();
+                                           CompositionPageIds[NumSpids] = sub.getCompositionPageId();
+                                           AncillaryPageIds[NumSpids] = sub.getAncillaryPageId();
                                            if (n > 0)
                                               *s++ = '+';
                                            strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
@@ -415,7 +423,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                     }
                                  break;
                             case SI::TeletextDescriptorTag:
-                                 Tpid = stream.getPid();
+                                 Tpid = esPid;
                                  break;
                             case SI::ISO639LanguageDescriptorTag: {
                                  SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
@@ -438,13 +446,14 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               //default: printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());//XXX
               }
             for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)stream.streamDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
-                CaDescriptors->AddCaDescriptor(d, true);
+                CaDescriptors->AddCaDescriptor(d, esPid);
                 delete d;
                 }
             }
         if (Setup.UpdateChannels >= 2) {
            Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
            Channel->SetCaIds(CaDescriptors->CaIds());
+           Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
            }
         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
         }
diff --git a/pat.h b/pat.h
index 700f91c8e..1aa4afc50 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 2.0 2007/01/05 10:42:11 kls Exp $
+ * $Id: pat.h 2.1 2009/06/14 11:14:00 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -32,7 +32,7 @@ class cPatFilter : public cFilter {
   void Trigger(void);
   };
 
-int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag);
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
          ///< Gets all CA descriptors for a given channel.
          ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
          ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
diff --git a/recording.c b/recording.c
index 2ff7f6fa8..f3c2c5ab5 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.16 2009/06/13 13:34:08 kls Exp $
+ * $Id: recording.c 2.17 2009/08/16 10:39:43 kls Exp $
  */
 
 #include "recording.h"
@@ -1156,7 +1156,7 @@ void cRecordings::DelByName(const char *FileName)
   if (recording) {
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      Del(recording, false);
-     char *ext = strrchr(recording->FileName(), '.');
+     char *ext = strrchr(recording->fileName, '.');
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
         recording->fileSizeMB = DirSizeMB(recording->FileName());
diff --git a/recording.h b/recording.h
index 81c72fd46..4014c5dd9 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.8 2009/05/23 12:14:42 kls Exp $
+ * $Id: recording.h 2.9 2009/08/16 15:35:30 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -207,7 +207,7 @@ class cRecordingUserCommand {
   };
 
 // The maximum size of a single frame (up to HDTV 1920x1080):
-#define MAXFRAMESIZE  (KILOBYTE(512) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE to avoid breaking up TS packets
+#define MAXFRAMESIZE  (KILOBYTE(1024) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE to avoid breaking up TS packets
 
 // The maximum file size is limited by the range that can be covered
 // with a 40 bit 'unsigned int', which is 1TB. The actual maximum value
diff --git a/remux.c b/remux.c
index 97c139c9b..d97314359 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.24 2009/06/06 13:24:57 kls Exp $
+ * $Id: remux.c 2.26 2009/08/16 15:13:42 kls Exp $
  */
 
 #include "remux.h"
@@ -198,7 +198,7 @@ int cPatPmtGenerator::MakeAC3Descriptor(uchar *Target)
   return i;
 }
 
-int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Language)
+int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId)
 {
   int i = 0;
   Target[i++] = SI::SubtitlingDescriptorTag;
@@ -206,11 +206,11 @@ int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Langua
   Target[i++] = *Language++;
   Target[i++] = *Language++;
   Target[i++] = *Language++;
-  Target[i++] = 0x00; // subtitling type
-  Target[i++] = 0x00; // composition page id hi
-  Target[i++] = 0x01; // composition page id lo
-  Target[i++] = 0x00; // ancillary page id hi
-  Target[i++] = 0x01; // ancillary page id lo
+  Target[i++] = SubtitlingType;
+  Target[i++] = CompositionPageId >> 8;
+  Target[i++] = CompositionPageId & 0xFF;
+  Target[i++] = AncillaryPageId >> 8;
+  Target[i++] = AncillaryPageId & 0xFF;
   IncEsInfoLength(i);
   return i;
 }
@@ -327,7 +327,7 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
          }
      for (int n = 0; Channel->Spid(n); n++) {
          i += MakeStream(buf + i, 0x06, Channel->Spid(n));
-         i += MakeSubtitlingDescriptor(buf + i, Channel->Slang(n));
+         i += MakeSubtitlingDescriptor(buf + i, Channel->Slang(n), Channel->SubtitlingType(n), Channel->CompositionPageId(n), Channel->AncillaryPageId(n));
          }
 
      int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC
@@ -610,7 +610,8 @@ bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion)
 cTsToPes::cTsToPes(void)
 {
   data = NULL;
-  size = length = offset = 0;
+  size = 0;
+  Reset();
 }
 
 cTsToPes::~cTsToPes()
@@ -641,6 +642,11 @@ void cTsToPes::PutTs(const uchar *Data, int Length)
 
 const uchar *cTsToPes::GetPes(int &Length)
 {
+  if (repeatLast) {
+     repeatLast = false;
+     Length = lastLength;
+     return lastData;
+     }
   if (offset < length && PesLongEnough(length)) {
      if (!PesHasLength(data)) // this is a video PES packet with undefined length
         offset = 6; // trigger setting PES length for initial slice
@@ -661,12 +667,16 @@ const uchar *cTsToPes::GetPes(int &Length)
         p[4] = l / 256;
         p[5] = l & 0xFF;
         Length = l + 6;
+        lastLength = Length;
+        lastData = p;
         return p;
         }
      else {
         Length = PesLength(data);
         if (Length <= length) {
            offset = Length; // to make sure we break out in case of garbage data
+           lastLength = Length;
+           lastData = data;
            return data;
            }
         }
@@ -674,9 +684,17 @@ const uchar *cTsToPes::GetPes(int &Length)
   return NULL;
 }
 
+void cTsToPes::SetRepeatLast(void)
+{
+  repeatLast = true;
+}
+
 void cTsToPes::Reset(void)
 {
   length = offset = 0;
+  lastData = NULL;
+  lastLength = 0;
+  repeatLast = false;
 }
 
 // --- Some helper functions for debugging -----------------------------------
diff --git a/remux.h b/remux.h
index 0dd1a9ab3..e6025fa59 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.17 2009/06/06 13:26:23 kls Exp $
+ * $Id: remux.h 2.19 2009/08/16 15:15:33 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -168,7 +168,7 @@ class cPatPmtGenerator {
 protected:
   int MakeStream(uchar *Target, uchar Type, int Pid);
   int MakeAC3Descriptor(uchar *Target);
-  int MakeSubtitlingDescriptor(uchar *Target, const char *Language);
+  int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
   int MakeLanguageDescriptor(uchar *Target, const char *Language);
   int MakeCRC(uchar *Target, const uchar *Data, int Length);
   void GeneratePmtPid(cChannel *Channel);
@@ -252,6 +252,9 @@ class cTsToPes {
   int size;
   int length;
   int offset;
+  uchar *lastData;
+  int lastLength;
+  bool repeatLast;
 public:
   cTsToPes(void);
   ~cTsToPes();
@@ -279,6 +282,9 @@ class cTsToPes {
        ///< TS packet that will be given to PutTs() has the "payload start" flag
        ///< set, because this is the only way to determine the end of a video PES
        ///< packet.
+  void SetRepeatLast(void);
+       ///< Makes the next call to GetPes() return exactly the same data as the
+       ///< last one (provided there was no call to Reset() in the meantime).
   void Reset(void);
        ///< Resets the converter. This needs to be called after a PES packet has
        ///< been fetched by a call to GetPes(), and before the next call to
diff --git a/timers.c b/timers.c
index b963dee0d..a684bb4a4 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.1 2008/04/13 12:41:41 kls Exp $
+ * $Id: timers.c 2.3 2009/08/09 12:43:20 kls Exp $
  */
 
 #include "timers.h"
@@ -51,6 +51,11 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   event = NULL;
   if (Instant && channel)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
+  if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) {
+     dsyslog("timer file name too long for VFAT file system: '%s'", file);
+     file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
+     dsyslog("timer file name truncated to '%s'", file);
+     }
 }
 
 cTimer::cTimer(const cEvent *Event)
@@ -83,6 +88,11 @@ cTimer::cTimer(const cEvent *Event)
   const char *Title = Event->Title();
   if (!isempty(Title))
      Utf8Strn0Cpy(file, Event->Title(), sizeof(file));
+  if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) {
+     dsyslog("timer file name too long for VFAT file system: '%s'", file);
+     file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
+     dsyslog("timer file name truncated to '%s'", file);
+     }
   aux = NULL;
   event = NULL; // let SetEvent() be called to get a log message
 }
@@ -296,13 +306,13 @@ bool cTimer::Parse(const char *s)
            p++;
         else
            p = filebuffer;
-        if (strlen(p) > VFAT_MAX_FILENAME) {
+        if (Utf8StrLen(p) > VFAT_MAX_FILENAME) {
            dsyslog("timer file name too long for VFAT file system: '%s'", p);
-           p[VFAT_MAX_FILENAME] = 0;
+           p[Utf8SymChars(p, VFAT_MAX_FILENAME)] = 0;
            dsyslog("timer file name truncated to '%s'", p);
            }
         }
-     Utf8Strn0Cpy(file, filebuffer, MaxFileName);
+     Utf8Strn0Cpy(file, filebuffer, sizeof(file));
      strreplace(file, '|', ':');
      if (isnumber(channelbuffer))
         channel = Channels.GetByNumber(atoi(channelbuffer));
@@ -463,7 +473,7 @@ int cTimer::Matches(const cEvent *Event, int *Overlap) const
 
 bool cTimer::Expired(void) const
 {
-  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event);
+  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event || !event->Vps());
 }
 
 time_t cTimer::StartTime(void) const
diff --git a/vdr.1 b/vdr.1
index 3df168475..62edad8e5 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.1 2009/01/18 11:05:56 kls Exp $
+.\" $Id: vdr.1 2.2 2009/08/16 10:28:39 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -205,16 +205,16 @@ User definable commands (executed from the \fBCommands\fR menu).
 SVDRP host configuration, defining which hosts or networks are given
 access to the SVDRP port.
 .TP
-.I marks.vdr
+.I marks
 Contains the editing marks defined for a recording.
 .TP
-.I info.vdr
+.I info
 Contains a description of the recording.
 .TP
-.I resume.vdr
+.I resume
 Contains the index into the recording where the last replay session left off.
 .TP
-.I index.vdr
+.I index
 Contains the file number, offset and type of each frame of the recording.
 .TP
 .I remote.conf
@@ -223,7 +223,7 @@ Contains the key assignments for the remote control.
 .I keymacros.conf
 Contains user defined remote control key macros.
 .TP
-.IR 001.vdr\  ...\  255.vdr
+.IR 00001.ts\  ...\  65535.ts
 The actual data files of a recording.
 .TP
 .I epg.data

From ea01358b3bca9d55402ba632c95cdd6458abfdb3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 22 Nov 2009 15:58:00 +0100
Subject: [PATCH 196/307] Version 1.7.10 - Updated the Italian OSD texts
 (thanks to Diego Pierotto). - Fixed wrong bracketing in
 cChannel::SubtitlingType() etc.   (thanks to Rolf Ahrenberg). - Fixed not
 logging changes for channels that have no number   (reported by Timothy D.
 Lenz). - Changed the project's URLs and email to tvdr.de. - Added Lithuanian
 language translations (thanks to Valdemaras Pipiras). - Updated Chinese
 language texts (thanks to Nan Feng). - Only checking DVB_API_VERSION to be
 >=5 in order to stay compileable in case   the DVB API version number is
 increased (the API claims to always be backward   compatible). - Fixed saving
 terminal settings when running in background (thanks to Manuel   Reimer). -
 Fixed cFrameDetector::Analyze() to handle video streams where the frame type 
  is not detectable from the first TS packet of a frame. - Fixed writing the
 PCR pid into the PMT in cPatPmtGenerator::GeneratePmt()   (reported by Rene
 van den Braken). - Added Slovakian language texts (thanks to Milan Hrala). -
 Fixed EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0 (thanks
   to Frank Schmirler). - Fixed starting a recording at an I-frame. - Fixed
 generating the index for recordings from channels that put a whole   GOP into
 one payload unit. - The index file for TS recordings is now regenerated
 on-the-fly if a   recording is replayed that has no index. This can also be
 used to   re-create a broken index file by manually deleting the index file
 and then   replaying the recording (at least until the index file has been
 generated). - The cRingBufferLinear::Read() function now returns -1 and sets
 errno to   EAGAIN if the buffer is already full. - Fixed handling DVB
 subtitles for PES recordings (thanks to Rolf Ahrenberg). - Added the audio id
 to the call of PlayAudio() in cDevice::PlayTsAudio()   (thanks to Andreas
 Schaefers). - Fixed references to old *.vdr file names in MANUAL (reported by
 Arthur Konovalov). - Reverted "Removed limitation to PAL resolution from SPU
 handling" because it   cause nothing but trouble. Besides, the core VDR
 doesn't use this, anyway. - Fixed the default value for "Pause key handling"
 in the MANUAL (reported by   Diego Pierotto).

---
 CONTRIBUTORS                       |   29 +-
 HISTORY                            |   48 +-
 INSTALL                            |    2 +-
 MANUAL                             |    8 +-
 Makefile                           |    4 +-
 PLUGINS.html                       |    4 +-
 PLUGINS/src/hello/Makefile         |    4 +-
 PLUGINS/src/hello/README           |    6 +-
 PLUGINS/src/hello/po/ca_ES.po      |    4 +-
 PLUGINS/src/hello/po/cs_CZ.po      |    4 +-
 PLUGINS/src/hello/po/da_DK.po      |    4 +-
 PLUGINS/src/hello/po/de_DE.po      |    8 +-
 PLUGINS/src/hello/po/el_GR.po      |    4 +-
 PLUGINS/src/hello/po/es_ES.po      |    4 +-
 PLUGINS/src/hello/po/et_EE.po      |    4 +-
 PLUGINS/src/hello/po/fi_FI.po      |    4 +-
 PLUGINS/src/hello/po/fr_FR.po      |    4 +-
 PLUGINS/src/hello/po/hr_HR.po      |    4 +-
 PLUGINS/src/hello/po/hu_HU.po      |    4 +-
 PLUGINS/src/hello/po/it_IT.po      |    4 +-
 PLUGINS/src/hello/po/nl_NL.po      |    4 +-
 PLUGINS/src/hello/po/nn_NO.po      |    4 +-
 PLUGINS/src/hello/po/pl_PL.po      |    4 +-
 PLUGINS/src/hello/po/pt_PT.po      |    4 +-
 PLUGINS/src/hello/po/ro_RO.po      |    4 +-
 PLUGINS/src/hello/po/ru_RU.po      |    4 +-
 PLUGINS/src/hello/po/sk_SK.po      |   35 +
 PLUGINS/src/hello/po/sl_SI.po      |    4 +-
 PLUGINS/src/hello/po/sv_SE.po      |    4 +-
 PLUGINS/src/hello/po/tr_TR.po      |    4 +-
 PLUGINS/src/hello/po/zh_CN.po      |   38 +
 PLUGINS/src/osddemo/README         |    6 +-
 PLUGINS/src/pictures/Makefile      |    4 +-
 PLUGINS/src/pictures/README        |    6 +-
 PLUGINS/src/pictures/po/de_DE.po   |    8 +-
 PLUGINS/src/pictures/po/fi_FI.po   |    4 +-
 PLUGINS/src/pictures/po/fr_FR.po   |    4 +-
 PLUGINS/src/pictures/po/it_IT.po   |    4 +-
 PLUGINS/src/pictures/po/ru_RU.po   |    4 +-
 PLUGINS/src/pictures/po/sk_SK.po   |   32 +
 PLUGINS/src/servicedemo/README     |    4 +-
 PLUGINS/src/skincurses/Makefile    |    4 +-
 PLUGINS/src/skincurses/README      |    6 +-
 PLUGINS/src/skincurses/po/de_DE.po |    8 +-
 PLUGINS/src/skincurses/po/fi_FI.po |    4 +-
 PLUGINS/src/skincurses/po/it_IT.po |    4 +-
 PLUGINS/src/skincurses/po/ru_RU.po |    4 +-
 PLUGINS/src/skincurses/po/sk_SK.po |   29 +
 PLUGINS/src/sky/README             |    6 +-
 PLUGINS/src/sky/getskyepg.pl       |    6 +-
 PLUGINS/src/status/README          |    6 +-
 PLUGINS/src/svdrpdemo/README       |    6 +-
 README                             |    4 +-
 README.i18n                        |    2 +-
 UPDATE-1.2.0                       |    2 +-
 channels.c                         |   13 +-
 channels.h                         |    8 +-
 config.h                           |   10 +-
 device.c                           |    4 +-
 device.h                           |    5 +-
 dvbdevice.h                        |    6 +-
 dvbspu.c                           |   34 +-
 dvbsubtitle.c                      |    4 +-
 i18n-to-gettext.pl                 |   12 +-
 po/ca_ES.po                        |   12 +-
 po/cs_CZ.po                        |   12 +-
 po/da_DK.po                        |   12 +-
 po/de_DE.po                        |   16 +-
 po/el_GR.po                        |   12 +-
 po/es_ES.po                        |   12 +-
 po/et_EE.po                        |   12 +-
 po/fi_FI.po                        |   12 +-
 po/fr_FR.po                        |   12 +-
 po/hr_HR.po                        |   12 +-
 po/hu_HU.po                        |   12 +-
 po/it_IT.po                        |   24 +-
 po/lt_LT.po                        | 1030 +++++++++++++++++++++++++++
 po/nl_NL.po                        |   12 +-
 po/nn_NO.po                        |   12 +-
 po/pl_PL.po                        |   12 +-
 po/pt_PT.po                        |   12 +-
 po/ro_RO.po                        |   12 +-
 po/ru_RU.po                        |   12 +-
 po/sk_SK.po                        | 1031 ++++++++++++++++++++++++++++
 po/sl_SI.po                        |   12 +-
 po/sv_SE.po                        |   12 +-
 po/tr_TR.po                        |   12 +-
 po/uk_UA.po                        |   12 +-
 po/zh_CN.po                        |  194 +++---
 recorder.c                         |   44 +-
 recording.c                        |  150 +++-
 recording.h                        |    5 +-
 remux.c                            |  287 ++++----
 remux.h                            |   20 +-
 ringbuffer.c                       |   45 +-
 ringbuffer.h                       |    4 +-
 sources.conf                       |    2 +-
 svdrp.c                            |    4 +-
 tools.c                            |   12 +-
 vdr.1                              |    4 +-
 vdr.5                              |    4 +-
 vdr.c                              |    7 +-
 102 files changed, 3150 insertions(+), 502 deletions(-)
 create mode 100644 PLUGINS/src/hello/po/sk_SK.po
 create mode 100644 PLUGINS/src/hello/po/zh_CN.po
 create mode 100644 PLUGINS/src/pictures/po/sk_SK.po
 create mode 100644 PLUGINS/src/skincurses/po/sk_SK.po
 create mode 100644 po/lt_LT.po
 create mode 100644 po/sk_SK.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f80bce2fd..2e0eab90f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,7 +1,7 @@
 Tons of suggestions, bugreports, patches and other contributions have been
 provided by the people on the 'linux-dvb' and 'vdr' mailing lists
 Special thanks go to the following individuals (if your name is missing here,
-please send an email to kls@cadsoft.de):
+please send an email to kls@tvdr.de):
 
 Carsten Koch <Carsten.Koch@icem.de>
  for adding LIRC support
@@ -526,7 +526,7 @@ Andreas B
 Onno Kreuzinger <ok@solutas.net>
  for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
 
-Rudi Hofer (Rudi.Hofer@cadsoft.de)
+Rudi Hofer (Rudi.Hofer@gmx.de)
  for his help in keeping 'channels.conf' up to date
 
 Gregoire Favre <greg@ulima.unil.ch>
@@ -1081,6 +1081,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding a note about the meaning of PERCENTAGEDELTA in cRingBuffer::UpdatePercentage()
  for fixing handling file name length on VFAT systems in case they
  contain UTF-8 characters
+ for fixing wrong bracketing in cChannel::SubtitlingType() etc.
+ for fixing handling DVB subtitles for PES recordings
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1573,6 +1575,7 @@ Arthur Konovalov <kasjas@hot.ee>
  for fixing a missing ',' in the Greek OSD texts
  for fixing a missing ',' in the Swedish OSD texts
  for reporting problems with CAMs when checking the CAM status too frequently
+ for reporting references to old *.vdr file names in MANUAL
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -2270,6 +2273,7 @@ Frank Schmirler <vdr@schmirler.de>
  for fixing handling the 'pointer field' in generating and parsing PAT/PMT
  for suggesting to use an "instance id" instead of the "resume id" to distinguish
  recordings of the same broadcast made by different instances of VDR
+ for fixing EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
@@ -2361,6 +2365,7 @@ Denis Knauf <denis.knauf@gmail.com>
 
 Diego Pierotto <vdr-italian@tiscali.it>
  for translating OSD texts to the Italian language
+ for reporting a wrong default value for "Pause key handling" in the MANUAL
 
 Timo Eskola <timo@tolleri.net>
  for implementing sending all frames to devices that can handle them in fast forward
@@ -2489,3 +2494,23 @@ Martin Neuditschko <yosuke.tomoe@gmx.net>
 
 Mikko Tuumanen <mikko.tuumanen@utu.fi>
  for implementing full handling of subtitling descriptors
+
+Timothy D. Lenz <tlenz@vorgon.com>
+ for reporting a problem with logging changes for channels that
+ have no number
+
+Valdemaras Pipiras <valdemaras@ambernet.lt>
+ for translating OSD texts to the Lithuanian language
+
+Manuel Reimer <Manuel.Reimer@gmx.de>
+ for fixing saving terminal settings when running in background
+
+Rene van den Braken <rene@vandenbraken.name>
+ for reporting a bug in writing the PCR pid into the PMT in
+ cPatPmtGenerator::GeneratePmt()
+
+Milan Hrala <hrala.milan@gmail.com>
+ for translating OSD texts to the Slovakian language
+
+Andreas Schaefers <andreas_schaefers@gmx.de>
+ for adding the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()
diff --git a/HISTORY b/HISTORY
index 6ff2517e6..70321b015 100644
--- a/HISTORY
+++ b/HISTORY
@@ -922,7 +922,7 @@ Video Disk Recorder Revision History
   give the user some feedback in case this takes longer.
 - Status messages are now displayed centered.
 - Removed the 'Tools' subdirectory from the VDR archive. All contributed tools
-  can now be found at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.
+  can now be found at ftp://ftp.tvdr.de/vdr/Tools.
 
 2002-01-29: Version 0.99pre3
 
@@ -5839,14 +5839,14 @@ Video Disk Recorder Revision History
   DVB API in the kernel (based on patches from Igor M. Liplianin, Niels Wagenaar
   and Edgar Hucek). VDR now uses the S2API driver from http://linuxtv.org/hg/v4l-dvb.
   In order to correctly detect DVB-S2 capable devices, you need to apply the patch
-  from ftp://ftp.cadsoft.de/vdr/Developer/v4l-dvb-s2api-add-s2-capability.diff to
+  from ftp://ftp.tvdr.de/vdr/Developer/v4l-dvb-s2api-add-s2-capability.diff to
   the driver source, because the S2API doesn't provide a way of telling whether a
   device can handle DVB-S2 transponders.
 - The cDvbTuner::IsTunedTo() function now also checks the symbol rate in case of
   DVB-S and DVB-C.
 - Improved handling PES video packets with zero length when converting from TS to PES.
   For good replay in Transfer Mode on full featured DVB cards you may want to apply
-  the patch from ftp://ftp.cadsoft.de/vdr/Developer/av7110_v4ldvb_api5_audiobuf_test_1.diff
+  the patch from ftp://ftp.tvdr.de/vdr/Developer/av7110_v4ldvb_api5_audiobuf_test_1.diff
   to the driver (thanks to Oliver Endriss).
 
 2009-01-06: Version 1.7.3
@@ -5918,7 +5918,7 @@ Video Disk Recorder Revision History
   flag is now in the driver, anyway.
 - The full-featured DVB cards are now given the TS data directly for replay
   (thanks to Oliver Endriss for enhancing the av7110 driver to make it replay
-  TS data). The patch from ftp://ftp.cadsoft.de/vdr/Developer/av7110_ts_replay__1.diff
+  TS data). The patch from ftp://ftp.tvdr.de/vdr/Developer/av7110_ts_replay__1.diff
   implements this change in the driver.
   The patch av7110_v4ldvb_api5_audiobuf_test_1.diff mentioned in version 1.7.2
   is still necessary to avoid audio and video glitches on some channels.
@@ -6156,3 +6156,43 @@ Video Disk Recorder Revision History
 - Increased the value of MAXFRAMESIZE to better suit HD recordings (thanks to
   Reinhard Nissl).
 - Implemented full handling of subtitling descriptors (thanks to Mikko Tuumanen).
+
+2009-11-22: Version 1.7.10
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed wrong bracketing in cChannel::SubtitlingType() etc.
+  (thanks to Rolf Ahrenberg).
+- Fixed not logging changes for channels that have no number
+  (reported by Timothy D. Lenz).
+- Changed the project's URLs and email to tvdr.de.
+- Added Lithuanian language translations (thanks to Valdemaras Pipiras).
+- Updated Chinese language texts (thanks to Nan Feng).
+- Only checking DVB_API_VERSION to be >=5 in order to stay compileable in case
+  the DVB API version number is increased (the API claims to always be backward
+  compatible).
+- Fixed saving terminal settings when running in background (thanks to Manuel
+  Reimer).
+- Fixed cFrameDetector::Analyze() to handle video streams where the frame type
+  is not detectable from the first TS packet of a frame.
+- Fixed writing the PCR pid into the PMT in cPatPmtGenerator::GeneratePmt()
+  (reported by Rene van den Braken).
+- Added Slovakian language texts (thanks to Milan Hrala).
+- Fixed EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0 (thanks
+  to Frank Schmirler).
+- Fixed starting a recording at an I-frame.
+- Fixed generating the index for recordings from channels that put a whole
+  GOP into one payload unit.
+- The index file for TS recordings is now regenerated on-the-fly if a
+  recording is replayed that has no index. This can also be used to
+  re-create a broken index file by manually deleting the index file and then
+  replaying the recording (at least until the index file has been generated).
+- The cRingBufferLinear::Read() function now returns -1 and sets errno to
+  EAGAIN if the buffer is already full.
+- Fixed handling DVB subtitles for PES recordings (thanks to Rolf Ahrenberg).
+- Added the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()
+  (thanks to Andreas Schaefers).
+- Fixed references to old *.vdr file names in MANUAL (reported by Arthur Konovalov).
+- Reverted "Removed limitation to PAL resolution from SPU handling" because it
+  cause nothing but trouble. Besides, the core VDR doesn't use this, anyway.
+- Fixed the default value for "Pause key handling" in the MANUAL (reported by
+  Diego Pierotto).
diff --git a/INSTALL b/INSTALL
index d68333825..3af62d77b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,7 +47,7 @@ to one of the following values in the 'make' call to make the respective control
 the default:
 
   REMOTE=RCU    control via the "Remote Control Unit" receiver
-                (see http://www.cadsoft.de/vdr/remote.htm)
+                (see http://www.tvdr.de/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
 
diff --git a/MANUAL b/MANUAL
index e4f6284f7..7382a8de4 100644
--- a/MANUAL
+++ b/MANUAL
@@ -748,7 +748,7 @@ Version 1.6
   Pause priority = 10    The Priority and Lifetime values used when pausing live
   Pause lifetime = 1     video.
 
-  Pause key handling = 3 Defines what happens if the Pause key on the remote control
+  Pause key handling = 2 Defines what happens if the Pause key on the remote control
                          is pressed during live tv.
                          0 = do not pause live video
                          1 = confirm pause live video
@@ -804,7 +804,7 @@ Version 1.6
                          During the actual editing process VDR writes the result
                          into files that may grow up to MaxVideoFileSize. If you
                          prefer to have each marked sequence stored in a separate
-                         file (named 001.vdr, 002.vdr, ...) you can set this
+                         file (named 00001.ts, 00002.ts, ...) you can set this
                          option to 'yes'.
 
   Replay:
@@ -819,8 +819,8 @@ Version 1.6
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
                          files for each recording. The valid range is 0...99, with
-                         0 resulting in a file named 'resume.vdr', and any other
-                         value resulting in 'resume.n.vdr'.
+                         0 resulting in a file named 'resume', and any other
+                         value resulting in 'resume.n'.
 
   Miscellaneous:
 
diff --git a/Makefile b/Makefile
index 74a683394..703b801f6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.3 2008/12/24 15:21:09 kls Exp $
+# $Id: Makefile 2.4 2009/10/18 13:59:25 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -110,7 +110,7 @@ I18Npot   = $(PODIR)/vdr.pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS.html b/PLUGINS.html
index e8fa16a78..9167a4b9a 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -31,8 +31,8 @@ <h1>The VDR Plugin System</h1>
 <b>Version 1.7</b>
 <p>
 Copyright &copy; 2009 Klaus Schmidinger<br>
-<a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
-<a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
+<a href="mailto:kls@tvdr.de">kls@tvdr.de</a><br>
+<a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
 <div class="modified">
 Important modifications introduced since version 1.6 are marked like this.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 9cd356209..ea5b8063b 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 12:59:58 kls Exp $
+# $Id: Makefile 2.1 2009/10/18 14:00:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -79,7 +79,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/hello/README b/PLUGINS/src/hello/README
index 5c5d3b0dd..e3c46a9da 100644
--- a/PLUGINS/src/hello/README
+++ b/PLUGINS/src/hello/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
 
-Project's homepage:          www.cadsoft.de/people/kls/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index 6d6e01521..008b97eda 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index d90d417eb..c4fa57135 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index 904f4d525..f05412a1a 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index aef2ca773..43d6f2b77 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2000
+# Klaus Schmidinger <kls@tvdr.de>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index a0366c0f1..adcb3cd91 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index a5f3bf2ba..33af9695f 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index 2fefc5d83..f83d03c0f 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <kasjas@hot.ee>, 2004
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 68d723c8b..476fe4cde 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index 6b69f3ba8..6adcce522 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index 5f0d7b74e..752d1eddd 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Adrian Caval <anrxc@sysphere.org>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2008-03-17 19:52+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index c349a761c..307913235 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index e4295c6e9..0f2216089 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 0eb798ff7..5ea7b6a71 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index 9b3682dae..400c864f5 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 0d6c69609..07bff4d32 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index 7cca3704a..3d7a09fd5 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index 87df8e42a..7562690dd 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index c7d1ea9b5..5544ff826 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
new file mode 100644
index 000000000..a878a95bd
--- /dev/null
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -0,0 +1,35 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"PO-Revision-Date: 2009-09-30 09:48+0100\n"
+"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
+"Language-Team: Slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A friendly greeting"
+msgstr "Priate�sk� pozdrav"
+
+msgid "Hello"
+msgstr "Ahoj"
+
+msgid "Greeting time (s)"
+msgstr "�as pozdravu (s)"
+
+msgid "Use alternate greeting"
+msgstr "Pou�i� n�hradn� pozdrav"
+
+msgid "Howdy folks!"
+msgstr "Ahojte v�etci!"
+
+msgid "Hello world!"
+msgstr "Ahoj svet!"
+
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index cf27896af..cc489a49a 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index b3c0cc206..a390fcfb9 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index 4202881d5..34f627fa0 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2008-05-12 22:34:4800\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
new file mode 100644
index 000000000..558557262
--- /dev/null
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -0,0 +1,38 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Marc Rovira Vall <tm05462@salleURL.edu>, 2003
+# Ramon Roca <ramon.roca@xcombo.com>, 2003
+# Jordi Vilà <jvila@tinet.org>, 2003
+# Nan Feng VDR <nfgx@21cn.com>, 2009.2
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"PO-Revision-Date: 2009-01-23 09:48+0800\n"
+"Last-Translator: senin\n"
+"Language-Team: Catalanian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A friendly greeting"
+msgstr "友好的问候"
+
+msgid "Hello"
+msgstr "你好"
+
+msgid "Greeting time (s)"
+msgstr "问候时间 (s)"
+
+msgid "Use alternate greeting"
+msgstr "使用替代贺卡"
+
+msgid "Howdy folks!"
+msgstr "你好人！"
+
+msgid "Hello world!"
+msgstr "世界您好！"
+
diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README
index 96f8912ba..50d36d8c2 100644
--- a/PLUGINS/src/osddemo/README
+++ b/PLUGINS/src/osddemo/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
 
-Project's homepage:          http://www.cadsoft.de/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: http://www.cadsoft.de/vdr
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 4935a609a..46a262f2d 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 13:00:04 kls Exp $
+# $Id: Makefile 2.1 2009/10/18 14:02:41 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -79,7 +79,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/pictures/README b/PLUGINS/src/pictures/README
index bd6bb7d2d..bc21526be 100644
--- a/PLUGINS/src/pictures/README
+++ b/PLUGINS/src/pictures/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
 
-Project's homepage:          www.cadsoft.de/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: www.cadsoft.de/vdr
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index 62811aecf..abeaa6e14 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2008
+# Klaus Schmidinger <kls@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
-"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 932807fa1..bbcb69724 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 379ee3558..a99758f1d 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Patrice Staudt <ipatrice.staudt@laposte.net>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Patrice Staudt <ipatrice.staudt@laposte.net>\n"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index 62d0bdffa..d30f040b9 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index d88f3ef60..46ed5c52d 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2008-01-12 17:38+0100\n"
 "PO-Revision-Date: 2008-03-14 00:45+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
new file mode 100644
index 000000000..38ba5cba0
--- /dev/null
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@tvdr.de>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2009-09-30 12:54+0100\n"
+"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
+"Language-Team: Slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Pictures"
+msgstr "Obr�zky"
+
+msgid "A simple picture viewer"
+msgstr "Jednoduch� prehliada� obr�zkov"
+
+msgid "Picture directory"
+msgstr "Umiestnenie obr�zkov"
+
+msgid "Slide show delay (s)"
+msgstr "Oneskorenie prezent�cia (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Neboli preuk�zan� �iadne fotky v adres�ri!"
+
diff --git a/PLUGINS/src/servicedemo/README b/PLUGINS/src/servicedemo/README
index db7ad5b9f..95bbc01b6 100644
--- a/PLUGINS/src/servicedemo/README
+++ b/PLUGINS/src/servicedemo/README
@@ -2,9 +2,9 @@ This is a "plugin" for the Video Disk Recorder (VDR).
 
 Written by:                  Udo Richter <udo_richter@gmx.de>
 
-Project's homepage:          www.cadsoft.de/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: www.cadsoft.de/vdr
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 1d6d9c59b..cade79578 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/19 11:40:33 kls Exp $
+# $Id: Makefile 2.1 2009/10/18 14:03:30 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -79,7 +79,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README
index b6ad9ec33..20b56541c 100644
--- a/PLUGINS/src/skincurses/README
+++ b/PLUGINS/src/skincurses/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
 
-Project's homepage:          www.cadsoft.de/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: www.cadsoft.de/vdr
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index 5e3ce2cad..ccf2de6a2 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2007
+# Klaus Schmidinger <kls@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-08-15 16:04+0200\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
-"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 89779cca6..71f7297e1 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-08-14 20:54+0300\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 038b6e525..3355fe898 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-08-15 16:04+0200\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index 609071ed8..afb2530bc 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2007-08-15 16:04+0200\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
new file mode 100644
index 000000000..f1b947732
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -0,0 +1,29 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@tvdr.de>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"PO-Revision-Date: 2009-09-30 12:52+0100\n"
+"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
+"Language-Team: Slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A text only skin"
+msgstr "Iba text vzh�adu"
+
+msgid "Key$Mute"
+msgstr "Stlmi� zvuk"
+
+msgid "Volume "
+msgstr "Hlasitos�"
+
+msgid "Text mode"
+msgstr "Textov� re�im"
+
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
index 51b2d51d8..19d5d988e 100644
--- a/PLUGINS/src/sky/README
+++ b/PLUGINS/src/sky/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
 
-Project's homepage:          www.cadsoft.de/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: www.cadsoft.de/vdr
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
index da553baf6..dfca96a52 100755
--- a/PLUGINS/src/sky/getskyepg.pl
+++ b/PLUGINS/src/sky/getskyepg.pl
@@ -8,7 +8,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: getskyepg.pl 2.0 2008/03/22 10:17:42 kls Exp $
+# $Id: getskyepg.pl 2.1 2009/10/18 14:05:47 kls Exp $
 
 use Getopt::Std;
 use Time::Local;
@@ -35,10 +35,10 @@
 
 # See "Rules for using this data" on http://bleb.org/tv/data/listings.
 # In case you modify this script in a way that changes its behavior
-# towards the www.bleb.org website, please replace 'vdrbugs@cadsoft.de'
+# towards the www.bleb.org website, please replace 'vdr-bugs@tvdr.de'
 # with your own email address! That way Andrew Flegg <andrew@bleb.org>,
 # who runs that web site, can contact you in case of problems.
-$IDENT = "VDR::getskyepg.pl, http://www.cadsoft.de/vdr - vdrbugs\@cadsoft.de";
+$IDENT = "VDR::getskyepg.pl, http://www.tvdr.de - vdr-bugs\@tvdr.de";
 $GAP = 2;
 
 $SkyWebPage = "www.bleb.org/tv/data/listings";
diff --git a/PLUGINS/src/status/README b/PLUGINS/src/status/README
index f7bcd2f49..b73e6be2a 100644
--- a/PLUGINS/src/status/README
+++ b/PLUGINS/src/status/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
 
-Project's homepage:          www.cadsoft.de/people/kls/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PLUGINS/src/svdrpdemo/README b/PLUGINS/src/svdrpdemo/README
index 4ca6821d4..8ae9e8ada 100644
--- a/PLUGINS/src/svdrpdemo/README
+++ b/PLUGINS/src/svdrpdemo/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
+Written by:                  Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
 
-Project's homepage:          http://www.cadsoft.de/vdr
+Project's homepage:          http://www.tvdr.de
 
-Latest version available at: http://www.cadsoft.de/vdr
+Latest version available at: http://www.tvdr.de
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/README b/README
index c70b825b2..28d4b98e5 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Video Disk Recorder ('VDR')
 These files contain the source code of the "Video Disk Recorder",
 which is based on the DVB driver of the LinuxTV project (http://linuxtv.org).
 For details about the "Video Disk Recorder" project please
-refer to http://www.cadsoft.de/vdr.
+refer to http://www.tvdr.de.
 
 There is also a remote control unit described on those
 Web pages, which can be used within this program.
@@ -17,7 +17,7 @@ The MANUAL file describes how to operate the VDR.
 The CONTRIBUTORS file lists all the people who have contributed to the
 development of VDR.
 
-The author can be contacted at kls@cadsoft.de.
+The author can be contacted at kls@tvdr.de.
 
 Yet another "set-top box"?
 --------------------------
diff --git a/README.i18n b/README.i18n
index 0c505b6f6..476d5b632 100644
--- a/README.i18n
+++ b/README.i18n
@@ -52,5 +52,5 @@ How to maintain an existing language file
 
 Once you have created or updated a translation file, please
 send it to the maintainer of the respective plugin (in case
-it belongs to a plugin) or to kls@cadsoft.de (for core VDR
+it belongs to a plugin) or to kls@tvdr.de (for core VDR
 language files).
diff --git a/UPDATE-1.2.0 b/UPDATE-1.2.0
index 473d042a9..445dfefa4 100644
--- a/UPDATE-1.2.0
+++ b/UPDATE-1.2.0
@@ -10,7 +10,7 @@ Plugins:
 - Implemented a universal plugin interface. See the file PLUGINS.html
   for a detailed description. The man page vdr(1) describes the new options '-L'
   and '-P' used to load plugins.
-  See http://www.cadsoft.de/vdr/plugins.htm for a list of available plugins.
+  See http://www.tvdr.de/plugins.htm for a list of available plugins.
 - Rearranged the remote control key handling to allow plugins to implement
   additional types of remote controls (see PLUGINS.html, section "Remote Control").
   The previously used files 'keys.conf' and 'keys-pc.conf' have been replaced
diff --git a/channels.c b/channels.c
index 590271d65..cca0eee09 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.7 2009/08/16 15:08:49 kls Exp $
+ * $Id: channels.c 2.8 2009/08/30 11:25:50 kls Exp $
  */
 
 #include "channels.h"
@@ -508,7 +508,8 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][
      q = NewSpidsBuf;
      q += IntArrayToString(q, Spids, 10, SLangs);
      *q = 0;
-     dsyslog("changing pids of channel %d from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid);
+     if (Number())
+        dsyslog("changing pids of channel %d from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid);
      vpid = Vpid;
      ppid = Ppid;
      vtype = Vtype;
@@ -558,7 +559,8 @@ void cChannel::SetCaIds(const int *CaIds)
      char NewCaIdsBuf[MAXCAIDS * 5 + 10];
      IntArrayToString(OldCaIdsBuf, caids, 16);
      IntArrayToString(NewCaIdsBuf, CaIds, 16);
-     dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
+     if (Number())
+        dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
      for (int i = 0; i <= MAXCAIDS; i++) { // <= to copy the terminating 0
          caids[i] = CaIds[i];
          if (!CaIds[i])
@@ -574,7 +576,7 @@ void cChannel::SetCaDescriptors(int Level)
   if (Level > 0) {
      modification |= CHANNELMOD_CA;
      Channels.SetModified();
-     if (Level > 1)
+     if (Number() && Level > 1)
         dsyslog("changing ca descriptors of channel %d", Number());
      }
 }
@@ -622,7 +624,8 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
      }
   else
      q += sprintf(q, " none");
-  dsyslog(buffer);
+  if (Number())
+     dsyslog(buffer);
 }
 
 void cChannel::SetRefChannel(cChannel *RefChannel)
diff --git a/channels.h b/channels.h
index c012a7d44..634fa5a38 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.5 2009/08/16 14:58:26 kls Exp $
+ * $Id: channels.h 2.6 2009/08/30 11:05:54 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -188,9 +188,9 @@ class cChannel : public cListObject {
   const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
   const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
   const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
-  uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS ? subtitlingTypes[i] : 0); }
-  uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS ? compositionPageIds[i] : 0); }
-  uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS ? ancillaryPageIds[i] : 0); }
+  uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : 0; }
+  uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : 0; }
+  uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : 0; }
   int Tpid(void) const { return tpid; }
   const int *Caids(void) const { return caids; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
diff --git a/config.h b/config.h
index eec81bfcd..6afe902af 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.14 2009/06/21 10:02:49 kls Exp $
+ * $Id: config.h 2.15 2009/08/29 12:47:03 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.9"
-#define VDRVERSNUM   10709  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.10"
+#define VDRVERSNUM   10710  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.9"
-#define APIVERSNUM   10709  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.10"
+#define APIVERSNUM   10710  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 5b9b5141a..3a60fe433 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.25 2009/08/16 10:54:36 kls Exp $
+ * $Id: device.c 2.26 2009/11/22 13:19:03 kls Exp $
  */
 
 #include "device.h"
@@ -1309,7 +1309,7 @@ int cDevice::PlayTsAudio(const uchar *Data, int Length)
   // Audio PES always has an explicit length and consists of single packets:
   int l;
   if (const uchar *p = tsToPesAudio.GetPes(l)) {
-     int w = PlayAudio(p, l, 0);
+     int w = PlayAudio(p, l, p[3]);
      if (w <= 0) {
         tsToPesAudio.SetRepeatLast();
         return w;
diff --git a/device.h b/device.h
index 8ac859460..5698fde24 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.15 2009/06/06 11:15:49 kls Exp $
+ * $Id: device.h 2.16 2009/11/22 13:21:00 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -514,9 +514,6 @@ class cDevice : public cThread {
        ///< Plays the given data block as audio.
        ///< Data points to exactly one complete PES packet of the given Length.
        ///< Id indicates the type of audio data this packet holds.
-       ///< Note that as of version 1.7.1 Id is obsolete and may be 0 (in case of
-       ///< TS replay). Plugins that need to know this Id shall read it from the
-       ///< actual PES data (it's the 4th byte).
        ///< PlayAudio() shall process the packet either as a whole (returning
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
        ///< \return Returns the number of bytes actually taken from Data, or -1
diff --git a/dvbdevice.h b/dvbdevice.h
index e3e28d027..3e35d91ad 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.8 2009/06/06 11:16:47 kls Exp $
+ * $Id: dvbdevice.h 2.9 2009/10/25 13:58:20 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -16,8 +16,8 @@
 #include "device.h"
 #include "dvbspu.h"
 
-#if DVB_API_VERSION != 5 || DVB_API_VERSION_MINOR != 0
-#error VDR requires Linux DVB driver API version 5.0!
+#if DVB_API_VERSION < 5
+#error VDR requires Linux DVB driver API version 5.0 or higher!
 #endif
 
 #define MAXDVBDEVICES  8
diff --git a/dvbspu.c b/dvbspu.c
index aaf608d0a..76ed4056c 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.1 2009/05/09 16:25:59 kls Exp $
+ * $Id: dvbspu.c 2.2 2009/11/22 14:17:59 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -55,6 +55,9 @@ void cDvbSpuPalette::setPalette(const uint32_t * pal)
 #define setMin(a, b) if (a > b) a = b
 #define setMax(a, b) if (a < b) a = b
 
+#define spuXres   720
+#define spuYres   576
+
 #define revRect(r1, r2) { r1.x1 = r2.x2; r1.y1 = r2.y2; r1.x2 = r2.x1; r1.y2 = r2.y1; }
 
 cDvbSpuBitmap::cDvbSpuBitmap(sDvbSpuRect size,
@@ -63,8 +66,8 @@ cDvbSpuBitmap::cDvbSpuBitmap(sDvbSpuRect size,
 {
     size.x1 = max(size.x1, 0);
     size.y1 = max(size.y1, 0);
-    size.x2 = min(size.x2, Setup.OSDWidth);
-    size.y2 = min(size.y2, Setup.OSDHeight);
+    size.x2 = min(size.x2, spuXres - 1);
+    size.y2 = min(size.y2, spuYres - 1);
 
     bmpsize = size;
     revRect(minsize[0], size);
@@ -72,7 +75,7 @@ cDvbSpuBitmap::cDvbSpuBitmap(sDvbSpuRect size,
     revRect(minsize[2], size);
     revRect(minsize[3], size);
 
-    int MemSize = bmpsize.width() * bmpsize.height() * sizeof(uint8_t);
+    int MemSize = spuXres * spuYres * sizeof(uint8_t);
     bmp = new uint8_t[MemSize];
 
     if (bmp)
@@ -93,10 +96,10 @@ cBitmap *cDvbSpuBitmap::getBitmap(const aDvbSpuPalDescr paldescr,
     int h = size.height();
     int w = size.width();
 
-    if (size.y1 + h >= bmpsize.height())
-        h = bmpsize.height() - size.y1 - 1;
-    if (size.x1 + w >= bmpsize.width())
-        w = bmpsize.width() - size.x1 - 1;
+    if (size.y1 + h >= spuYres)
+        h = spuYres - size.y1 - 1;
+    if (size.x1 + w >= spuXres)
+        w = spuXres - size.x1 - 1;
 
     if (w & 0x03)
         w += 4 - (w & 0x03);
@@ -111,11 +114,13 @@ cBitmap *cDvbSpuBitmap::getBitmap(const aDvbSpuPalDescr paldescr,
     }
 
     // set the content
-    for (int yp = 0; yp < h; yp++) {
-        for (int xp = 0; xp < w; xp++) {
-            uint8_t idx = bmp[(size.y1 + yp) * bmpsize.width() + size.x1 + xp];
-            ret->SetIndex(xp, yp, idx);
-        }
+    if (bmp) {
+       for (int yp = 0; yp < h; yp++) {
+           for (int xp = 0; xp < w; xp++) {
+               uint8_t idx = bmp[(size.y1 + yp) * spuXres + size.x1 + xp];
+               ret->SetIndex(xp, yp, idx);
+           }
+       }
     }
     return ret;
 }
@@ -149,7 +154,8 @@ bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
 
 void cDvbSpuBitmap::putPixel(int xp, int yp, int len, uint8_t colorid)
 {
-    memset(bmp + bmpsize.width() * yp + xp, colorid, len);
+    if (bmp)
+       memset(bmp + spuXres * yp + xp, colorid, len);
     setMin(minsize[colorid].x1, xp);
     setMin(minsize[colorid].y1, yp);
     setMax(minsize[colorid].x2, xp + len - 1);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 69dc6fa9b..cd77fde6b 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.1 2008/05/25 14:36:24 kls Exp $
+ * $Id: dvbsubtitle.c 2.2 2009/11/22 12:28:53 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -699,7 +699,7 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
         }
 
      if (Length > PayloadOffset + SubstreamHeaderLength) {
-        int64_t pts = PesGetPts(Data);
+        int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : 0;
         if (pts)
            dbgconverter("Converter PTS: %lld\n", pts);
         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index e2f5fedae..29d9345d3 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 2.0 2007/11/04 10:57:36 kls Exp $
+# $Id: i18n-to-gettext.pl 2.1 2009/10/18 14:07:49 kls Exp $
 
 # How to convert an actual plugin:
 #
@@ -87,7 +87,7 @@
 # Plugin specific information:
 
 $TITLE = "VDR plugin language source file";
-$COPYRIGHT = "2007 Klaus Schmidinger <kls\@cadsoft.de>";
+$COPYRIGHT = "2007 Klaus Schmidinger <kls\@tvdr.de>";
 $PACKAGE = "VDR";
 $VERSION = "1.5.7";
 $MSGIDBUGS = "" || die "enter your email address here"; # escape the '@', as in "user\@domain.tld"
@@ -152,8 +152,8 @@
   );
 
 @TRANSLATORS = (
-  "Klaus Schmidinger <kls\@cadsoft.de>, 2000",
-  "Klaus Schmidinger <kls\@cadsoft.de>, 2000",
+  "Klaus Schmidinger <kls\@tvdr.de>, 2000",
+  "Klaus Schmidinger <kls\@tvdr.de>, 2000",
   "Miha Setina <mihasetina\@softhome.net>, 2000; Matjaz Thaler <matjaz.thaler\@guest.arnes.si>, 2003",
   "Alberto Carraro <bertocar\@tin.it>, 2001; Antonio Ospite <ospite\@studenti.unina.it>, 2003; Sean Carlos <seanc\@libero.it>, 2005",
   "Arnold Niessen <niessen\@iae.nl> <arnold.niessen\@philips.com>, 2001; Hans Dingemans <hans.dingemans\@tacticalops.nl>, 2003; Maarten Wisse <Maarten.Wisse\@urz.uni-hd.de>, 2005",
@@ -177,8 +177,8 @@
   );
 
 @LASTTRANSLATOR = (
-  "Klaus Schmidinger <kls\@cadsoft.de>",
-  "Klaus Schmidinger <kls\@cadsoft.de>",
+  "Klaus Schmidinger <kls\@tvdr.de>",
+  "Klaus Schmidinger <kls\@tvdr.de>",
   "Matjaz Thaler <matjaz.thaler\@guest.arnes.si>",
   "Sean Carlos <seanc\@libero.it>",
   "Maarten Wisse <Maarten.Wisse\@urz.uni-hd.de>",
diff --git a/po/ca_ES.po b/po/ca_ES.po
index e04085986..8915752e5 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -927,6 +927,12 @@ msgstr "Canal bloquejat (gravant)!"
 msgid "Low disk space!"
 msgstr "Disc gaireb� ple!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci� -s !"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 34a941b52..b32c293e2 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006, 2008
 # Ji�� Dobr� <jdobry@centrum.cz>, 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -925,6 +925,12 @@ msgstr "Kan
 msgid "Low disk space!"
 msgstr "Disk bude brzy zapln�n!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnut� nen� mo�n� - chyb� volba '-s'!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index cd533a078..5bcf77697 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,13 +1,13 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -924,6 +924,12 @@ msgstr "Kanal blokeret (optagelse i gang)"
 msgid "Low disk space!"
 msgstr "Kun lidt diskplads tilbage!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke slukke - parameter '-s' ikke angivet!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index eea68172f..c6c875dd3 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,15 +1,15 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2000-2008
+# Klaus Schmidinger <kls@tvdr.de>, 2000-2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
-"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -924,6 +924,12 @@ msgstr "Kanal blockiert (zeichnet auf)!"
 msgid "Low disk space!"
 msgstr "Platte beinahe voll!"
 
+msgid "Regenerating index file"
+msgstr "Index-Datei wird regeneriert"
+
+msgid "Index file regeneration complete"
+msgstr "Regenerierung der Index-Datei abgeschlossen"
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ausschalten unm�glich - Option '-s' fehlt!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index bcdcb8e83..c89b68976 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,13 +1,13 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002, 2006
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -924,6 +924,12 @@ msgstr "
 msgid "Low disk space!"
 msgstr "� ������� �������� �� �������!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�������� �� ����� �����������. ��������� � ���������� '-s'!"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 58cb41434..6cc9cee68 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
 # Luca Olivetti <luca@ventoso.org>, 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -925,6 +925,12 @@ msgstr "
 msgid "Low disk space!"
 msgstr "�Poco espacio en disco!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�No se puede apagar - falta el par�metro '-s'!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index b0477c293..2823c742e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,13 +1,13 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <kasjas@hot.ee>, 2004, 2005, 2006, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian\n"
@@ -924,6 +924,12 @@ msgstr "Kanal lukus (salvestamine aktiivne)!"
 msgid "Low disk space!"
 msgstr "K�vaketas t�is!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index e62b9f65e..9718e53fb 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002, 2003
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -927,6 +927,12 @@ msgstr "Kanava lukittu (tallennus k
 msgid "Low disk space!"
 msgstr "Tallennustila loppumassa!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e1ef364ca..8f6778a65 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001, 2002, 2008
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003, 2005
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -930,6 +930,12 @@ msgstr "Cha
 msgid "Low disk space!"
 msgstr "Disque presque plein !"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Arr�t impossible - option '-s' absente !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index f69c24a64..32976b85f 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Drazen Dupor <drazen.dupor@dupor.com>, 2004, 2005
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -926,6 +926,12 @@ msgstr "Program zaklju
 msgid "Low disk space!"
 msgstr "Malo prostora na disku!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index fad18a4a6..e3d2b70d6 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -927,6 +927,12 @@ msgstr "Az ad
 msgid "Low disk space!"
 msgstr "A merev lemez majdnem tele!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 09429cbc1..9032a7c8f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alberto Carraro <bertocar@tin.it>, 2001
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
-"PO-Revision-Date: 2009-02-08 18:58+0100\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"PO-Revision-Date: 2009-08-29 11:16+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -712,13 +712,13 @@ msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "non pausare video dal vivo"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "conferma pausa video dal vivo"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pausa video dal vivo"
 
 msgid "Recording"
 msgstr "Registrazione"
@@ -739,7 +739,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Scadenza predefinita (gg)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gestione tasto Pausa"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorità di pausa"
@@ -931,6 +931,12 @@ msgstr "Canale bloccato (in registrazione)!"
 msgid "Low disk space!"
 msgstr "Poco spazio su disco!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Impossibile spegnere - parametro '-s' non assegnato!"
 
@@ -1003,7 +1009,7 @@ msgid "Upcoming recording!"
 msgstr "Registrazione imminente!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Pausare video dal vivo?"
 
 msgid "Recording started"
 msgstr "Registrazione avviata"
diff --git a/po/lt_LT.po b/po/lt_LT.po
new file mode 100644
index 000000000..c50a74b66
--- /dev/null
+++ b/po/lt_LT.po
@@ -0,0 +1,1030 @@
+# VDR language source file.
+# Copyright (C) 2009 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.7.9\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"PO-Revision-Date: 2009-10-17 14:19+0200\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
+"Language-Team: Lithuanian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "off"
+msgstr "įjungt"
+
+msgid "on"
+msgstr "išjungt"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "none"
+msgstr "nėra"
+
+msgid "*** Invalid Channel ***"
+msgstr "*** Klaidingas kanalas ***"
+
+msgid "Channel not available!"
+msgstr "Kanalas neegzistuoja!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Negali pradėti perdavimo"
+
+msgid "Starting EPG scan"
+msgstr "Pradedamas EPG skanavimas"
+
+msgid "No title"
+msgstr "Be pavadinimo"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "Lietuviškai"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "lit"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "1 žingsnis: Nustatinėjamas distancinio pulto kodo tipas"
+
+msgid "Press any key on the RC unit"
+msgstr "Spauskite bet kurį distancinio pulto mygtuką"
+
+msgid "RC code detected!"
+msgstr "Gautas distancinio pulto mygtuko kodas!"
+
+msgid "Do not press any key..."
+msgstr "Nekiškite nagų prie distancinio pulto..."
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "2 žingsnis: Atskirų mygtukų kodų nuskaitymas"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Spauskite '%s' mygtuką"
+
+msgid "Press 'Up' to confirm"
+msgstr "Patvirtinimui, spausti mygtuką 'į viršų'"
+
+msgid "Press 'Down' to continue"
+msgstr "Jei norite tęsti, spauskite mygtuką 'į apačią'"
+
+msgid "(press 'Up' to go back)"
+msgstr "Grįžimui atgal, spausti mygtuką 'į viršų'"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "Norėdami baigti mygtukų nustaymus, spauskite mygtuką 'į apačią'"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "Spauskit 'Meniu', jei norit praleisti šį mygtuką"
+
+msgid "Learning Remote Control Keys"
+msgstr "Distancinio pulto mygtukų kodų nuskaitymas"
+
+msgid "Phase 3: Saving key codes"
+msgstr "3 žingsnis: Mygtukų kodų užsaugojimas"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Spausti 'į viršų' kad užsaugoti, 'į apačią' kad atmesti"
+
+msgid "Key$Up"
+msgstr "Į viršų"
+
+msgid "Key$Down"
+msgstr "Į apačią"
+
+msgid "Key$Menu"
+msgstr "Meniu"
+
+msgid "Key$Ok"
+msgstr "Ok"
+
+msgid "Key$Back"
+msgstr "Atgal"
+
+msgid "Key$Left"
+msgstr "Į kairę"
+
+msgid "Key$Right"
+msgstr "Į dešinę"
+
+msgid "Key$Red"
+msgstr "Raudona"
+
+msgid "Key$Green"
+msgstr "Žalia"
+
+msgid "Key$Yellow"
+msgstr "Geltona"
+
+msgid "Key$Blue"
+msgstr "Mėlyna"
+
+msgid "Key$Info"
+msgstr "Info"
+
+msgid "Key$Play"
+msgstr "Grona"
+
+msgid "Key$Pause"
+msgstr "Pristabdyti"
+
+msgid "Key$Stop"
+msgstr "Sustabdyti"
+
+msgid "Key$Record"
+msgstr "Įrašyti"
+
+msgid "Key$FastFwd"
+msgstr "Prasukimas į priekimas"
+
+msgid "Key$FastRew"
+msgstr "Persukimas atgal"
+
+msgid "Key$Next"
+msgstr "Sekantis"
+
+msgid "Key$Prev"
+msgstr "Prieš einantis"
+
+msgid "Key$Power"
+msgstr "Išjungti"
+
+msgid "Key$Channel+"
+msgstr "Kanalas +"
+
+msgid "Key$Channel-"
+msgstr "Kanalas -"
+
+msgid "Key$PrevChannel"
+msgstr "Priš tai buvęs"
+
+msgid "Key$Volume+"
+msgstr "Garsas +"
+
+msgid "Key$Volume-"
+msgstr "Garsas -"
+
+msgid "Key$Mute"
+msgstr "Nutildymas"
+
+msgid "Key$Audio"
+msgstr "Audio"
+
+msgid "Key$Subtitles"
+msgstr "Subtitrai"
+
+msgid "Key$Schedule"
+msgstr "Programa"
+
+msgid "Key$Channels"
+msgstr "Kanalai"
+
+msgid "Key$Timers"
+msgstr "Laikmačiai"
+
+msgid "Key$Recordings"
+msgstr "Įrašai"
+
+msgid "Key$Setup"
+msgstr "Nustatymai"
+
+msgid "Key$Commands"
+msgstr "Komandos"
+
+msgid "Key$User1"
+msgstr "Vartotojas1"
+
+msgid "Key$User2"
+msgstr "Vartotojas2"
+
+msgid "Key$User3"
+msgstr "Vartotojas3"
+
+msgid "Key$User4"
+msgstr "Vartotojas4"
+
+msgid "Key$User5"
+msgstr "Vartotojas5"
+
+msgid "Key$User6"
+msgstr "Vartotojas6"
+
+msgid "Key$User7"
+msgstr "Vartotojas7"
+
+msgid "Key$User8"
+msgstr "Vartotojas8"
+
+msgid "Key$User9"
+msgstr "Vartotojas9"
+
+msgid "Disk"
+msgstr "Diskas"
+
+msgid "free"
+msgstr "laisva"
+
+msgid "Free To Air"
+msgstr "Nekoduotas kanalas"
+
+msgid "encrypted"
+msgstr "koduota"
+
+msgid "Edit channel"
+msgstr "Koreguoti kanalą"
+
+msgid "Name"
+msgstr "Pavadinimas"
+
+msgid "Source"
+msgstr "Šaltinis"
+
+msgid "Frequency"
+msgstr "Dažnis"
+
+msgid "Vpid"
+msgstr "Vpid (video)"
+
+msgid "Ppid"
+msgstr "Ppid"
+
+msgid "Apid1"
+msgstr "Apid1 (aidio 1)"
+
+msgid "Apid2"
+msgstr "Apid2 (aidio 2)"
+
+msgid "Dpid1"
+msgstr "Dpid1 (AC3 1)"
+
+msgid "Dpid2"
+msgstr "Dpid2 (AC3 2)"
+
+msgid "Spid1"
+msgstr "Subtitrų pid1"
+
+msgid "Spid2"
+msgstr "Subtitrų pid2"
+
+msgid "Tpid"
+msgstr "Tpid (teletekstas)"
+
+msgid "CA"
+msgstr "CA (dekodavimo sistema)"
+
+msgid "Sid"
+msgstr "Serviso id"
+
+msgid "Polarization"
+msgstr "Poliarizacija"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Srate"
+msgstr "Perdavimo greitis (Symbol rate)"
+
+msgid "Inversion"
+msgstr "Inversija"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Moduliacija"
+
+msgid "Bandwidth"
+msgstr "Pralaidumas"
+
+msgid "Transmission"
+msgstr "Perdavimas"
+
+msgid "Guard"
+msgstr "Apsauga"
+
+msgid "Hierarchy"
+msgstr "Hierarchija"
+
+msgid "Rolloff"
+msgstr "Rolloff"
+
+msgid "Channel settings are not unique!"
+msgstr "Kanalų nustatymai neunikalūs!"
+
+msgid "Channels"
+msgstr "Kanalai"
+
+msgid "Button$Edit"
+msgstr "Koreguoti"
+
+msgid "Button$New"
+msgstr "Naujas"
+
+msgid "Button$Delete"
+msgstr "Trinti"
+
+msgid "Button$Mark"
+msgstr "Žymėti"
+
+msgid "Channel is being used by a timer!"
+msgstr "Kanalą šiuo metu naudoja laikmačio procesas!"
+
+msgid "Delete channel?"
+msgstr "Ištrinti kanalą?"
+
+msgid "Edit timer"
+msgstr "Koreguoti laikmatį"
+
+msgid "Active"
+msgstr "Aktyvus"
+
+msgid "Channel"
+msgstr "Kanalas"
+
+msgid "Day"
+msgstr "Diena"
+
+msgid "Start"
+msgstr "Pradžia"
+
+msgid "Stop"
+msgstr "Sabaiga"
+
+msgid "VPS"
+msgstr "VPS"
+
+msgid "Priority"
+msgstr "Prioritetas"
+
+msgid "Lifetime"
+msgstr "Galiojimas"
+
+msgid "File"
+msgstr "Failas"
+
+msgid "First day"
+msgstr "Pirma diena"
+
+msgid "Timers"
+msgstr "Laikmačiai"
+
+msgid "Button$On/Off"
+msgstr "Įj/Išj"
+
+msgid "Button$Info"
+msgstr "Info"
+
+msgid "Delete timer?"
+msgstr "Ištrinti laikmatį?"
+
+msgid "Timer still recording - really delete?"
+msgstr "Laikmatis vis dar vykdo įrašymą - vistiek ištrinti?"
+
+msgid "Event"
+msgstr "Laida"
+
+msgid "Button$Timer"
+msgstr "Laikmatis"
+
+msgid "Button$Record"
+msgstr "Įrašymas"
+
+msgid "Button$Switch"
+msgstr "Perjungti"
+
+msgid "What's on now?"
+msgstr "Kas transliuojama šiuo metu?"
+
+msgid "What's on next?"
+msgstr "Kas bus transliuojama vėliau?"
+
+msgid "Button$Next"
+msgstr "Sekantis"
+
+msgid "Button$Now"
+msgstr "Dabar"
+
+msgid "Button$Schedule"
+msgstr "Programa"
+
+msgid "Can't switch channel!"
+msgstr "Negali perjunti kanalo!"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "Programa - %s"
+
+#, c-format
+msgid "This event - %s"
+msgstr "Ši laida - %s"
+
+msgid "This event - all channels"
+msgstr "Ši laida - visi kanalai"
+
+msgid "All events - all channels"
+msgstr "Visos laidos - visi kanalai"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Įveskite %d skaičius!"
+
+msgid "CAM not responding!"
+msgstr "Dekodavimo modulis (CAM) neveikia!"
+
+msgid "Recording info"
+msgstr "Informacija apie įrašus"
+
+msgid "Button$Play"
+msgstr "Groti"
+
+msgid "Button$Rewind"
+msgstr "Atsukti"
+
+msgid "Recordings"
+msgstr "Įrašai"
+
+msgid "Button$Open"
+msgstr "Atidaryti"
+
+msgid "Commands"
+msgstr "Komandos"
+
+msgid "Error while accessing recording!"
+msgstr "Klaida atidarant įrašą!"
+
+msgid "Delete recording?"
+msgstr "Ištrinti įrašą?"
+
+msgid "Error while deleting recording!"
+msgstr "Klaida trinant įrašą!"
+
+msgid "Recording commands"
+msgstr "Įrašymo komandos"
+
+msgid "never"
+msgstr "niekada"
+
+msgid "skin dependent"
+msgstr "priklauso nuo stiliaus"
+
+msgid "always"
+msgstr "visada"
+
+msgid "OSD"
+msgstr "OSD (ekrano užsklanda)"
+
+msgid "Setup.OSD$Language"
+msgstr "Kalba"
+
+msgid "Setup.OSD$Skin"
+msgstr "Stilius"
+
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+msgid "Setup.OSD$Left (%)"
+msgstr "Atitraukimas nuo kairės (%)"
+
+msgid "Setup.OSD$Top (%)"
+msgstr "Atitraukimas nuo viršaus (%)"
+
+msgid "Setup.OSD$Width (%)"
+msgstr "Plotis (%)"
+
+msgid "Setup.OSD$Height (%)"
+msgstr "Aukštis (%)"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "Žinutės parodymo laikas (s)"
+
+msgid "Setup.OSD$Use small font"
+msgstr "Naudoti mažą šriftą"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "Šriftų pagražinimas"
+
+msgid "Setup.OSD$Default font"
+msgstr "Numatytas šriftas"
+
+msgid "Setup.OSD$Small font"
+msgstr "Mažas šriftas"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "Nustatyto dydžio šriftas"
+
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Numatyto šrifto dydis  (%)"
+
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Mažo šrifto dydis (%)"
+
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Nustatyto dydžio šrifto dydis (%)"
+
+msgid "Setup.OSD$Channel info position"
+msgstr "Kanalo informacijos lango pozicija"
+
+msgid "bottom"
+msgstr "iš apačios"
+
+msgid "top"
+msgstr "iš viršaus"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Kanalo informacijos lango rodymo laikas (s)"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Rodyti informacijos perjungiant kanalą"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Uždaryti informaciją apie kanalą"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "Pereiti/Persukti per puslapius"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Cikliškai pereiti"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "Uždaryti Meniu mygtuku"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "Įrašų katalogai"
+
+msgid "EPG"
+msgstr "Elektroninis programų gidas (EPG)"
+
+msgid "Button$Scan"
+msgstr "Skanuoti"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "EPG skanavimo užlaikymas (h)"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG klaidų taisymo lygis"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Pasenusių EPG duomenų saugojomas (min)"
+
+msgid "Setup.EPG$Set system time"
+msgstr "Nustatyti sistemos laiką"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Naudoti siųstuvo laiką"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "Pageidaujamos kalbos"
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "Pageidaujama kalba"
+
+msgid "pan&scan"
+msgstr "panŲscan"
+
+msgid "letterbox"
+msgstr "letterbox"
+
+msgid "center cut out"
+msgstr "center cut out"
+
+msgid "no"
+msgstr "ne"
+
+msgid "names only"
+msgstr "tik pavadinimai"
+
+msgid "PIDs only"
+msgstr "tik PID'ai"
+
+msgid "names and PIDs"
+msgstr "pavadinimai ir PID'ai"
+
+msgid "add new channels"
+msgstr "pridėti naujų kanalų"
+
+msgid "add new transponders"
+msgstr "pridėti naujų siųstuvų"
+
+msgid "DVB"
+msgstr "DVB"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Pirminiė DVB įvestis"
+
+msgid "Setup.DVB$Video format"
+msgstr "Video formatas"
+
+msgid "Setup.DVB$Video display format"
+msgstr "Plačiaekranis formatas"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Įjungti Dolby Digital"
+
+msgid "Setup.DVB$Update channels"
+msgstr "Atnaujinti kanalus"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "Garso takeliai"
+
+msgid "Setup.DVB$Audio language"
+msgstr "Garso takelis"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "Rodyti subtitrus"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "Subtitrų kalbos"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "Subtitrų kalba"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "Subtitrų pozicionavimo nuokrypis"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "Subtitrų priekinio vaizdo permatomumas"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "Subtitrų fono permatomumas"
+
+msgid "LNB"
+msgstr "Konverteris (LNB)"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Įjungti DiSEqC"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Žemasis LNB dažnis (MHz)"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Aukštasis LNB dažnis (MHz)"
+
+msgid "CAM reset"
+msgstr "Dekodavimo modulis (CAM) perkrautas"
+
+msgid "CAM present"
+msgstr "Dekodavimo modulis (CAM) įjungtas"
+
+msgid "CAM ready"
+msgstr "Dekodavimo modulis (CAM) paruoštas darbui"
+
+msgid "CAM"
+msgstr "Dekodavimo modulis (CAM)"
+
+msgid "Button$Menu"
+msgstr "Meniu"
+
+msgid "Button$Reset"
+msgstr "Perkrauti"
+
+msgid "Opening CAM menu..."
+msgstr "Atidaromas dekodavimo modulio meniu..."
+
+msgid "Can't open CAM menu!"
+msgstr "Negali atidaryti dekodavimo modulio meniu!"
+
+msgid "CAM is in use - really reset?"
+msgstr "Dekodavimo modulis šiuo metu naudojamas - tikrai perkrauti?"
+
+msgid "Can't reset CAM!"
+msgstr "Negali perkrauti dekodavimo modulio!"
+
+msgid "do not pause live video"
+msgstr "nepristabdyti 'gyvo' video srauto"
+
+msgid "confirm pause live video"
+msgstr "patvirtinti 'gyvo' video srauto pristabdymą"
+
+msgid "pause live video"
+msgstr "pristabdyti 'gyvą' video srautą"
+
+msgid "Recording"
+msgstr "Įrašymas"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Įrašo pradžios užlaikymo laikas (min)"
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Įrašo pabaigos užlaikymo laikas (min)"
+
+msgid "Setup.Recording$Primary limit"
+msgstr "Pagrindinio įvesties įrenginio suderinimo prioritetas"
+
+msgid "Setup.Recording$Default priority"
+msgstr "Numatytas laikmačio prioritetas"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Numatytasis įrašo saugojimo laikas (d)"
+
+msgid "Setup.Recording$Pause key handling"
+msgstr "Pauzės mygtuko interpretavimas"
+
+msgid "Setup.Recording$Pause priority"
+msgstr "Atidėtos peržiūros prioritetas"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Atidėtos peržiūroso saugojimas (d)"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "Grupuoti pagal epizodus"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "Naudoti VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "VPS buferio laikas (s)"
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Pažymėti rankiniu būdu vykdomus įrašus"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "Rankiniu būdu vykdomų įrašų įvardinimo schama"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Rankiniu būdu vykdomo įrašo laikas (min)"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maks. video failo dydis (MB)"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "Suskaidyti koreguotus failus"
+
+msgid "Replay"
+msgstr "Pakartoti"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Daugiagreitis ręžimas"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "Rodyti atvaizdavimo ręžimą"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "Kūrinio ID"
+
+msgid "Miscellaneous"
+msgstr "Kiti"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Min. įvykio laukimo laikas (min)"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Min. įvesties laukimo laikas (min)"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP užlaikymas (s)"
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Kanalo perjungimo užlaikymas (s)"
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "Užlaikymas (ms) kanalo įvedimui"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kanalas įjungimo metu"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "kaip anksčiau"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Garsas įjungimo metu"
+
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "Avarinis išėjimas"
+
+msgid "Plugins"
+msgstr "Įskiepai"
+
+msgid "This plugin has no setup parameters!"
+msgstr "Šis įskiepas neturi nustatymo parametrų!"
+
+msgid "Setup"
+msgstr "Nustatymai"
+
+msgid "Restart"
+msgstr "Perkrauti"
+
+msgid "Really restart?"
+msgstr "Tikrai perkrauti?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr " Sustabdyti įrašinėjimą "
+
+msgid "Schedule"
+msgstr "Programa"
+
+msgid "VDR"
+msgstr "VDR"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr " Sustabdyti kartojimą"
+
+msgid "Button$Audio"
+msgstr "Garsas"
+
+msgid "Button$Pause"
+msgstr "Pristabdyti"
+
+msgid "Button$Stop"
+msgstr "Sustabdyti"
+
+msgid "Button$Resume"
+msgstr "Pradėti"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr " Sustabdyti koregavimą"
+
+msgid "Stop recording?"
+msgstr "Sustabdyti įrašinėjimą?"
+
+msgid "Cancel editing?"
+msgstr "Atmesti koregavimą?"
+
+msgid "No audio available!"
+msgstr "Garsas nepateikiamas!"
+
+msgid "No subtitles"
+msgstr "Nėra subtitrų"
+
+msgid "Button$Subtitles"
+msgstr "Subtitrai"
+
+msgid "No subtitles available!"
+msgstr "Subtitrai nepateikiami!"
+
+msgid "Not enough disk space to start recording!"
+msgstr "Nepakanka vietos diske,  kad būtų galima įrašinėti!"
+
+msgid "No free DVB device to record!"
+msgstr "Nėra laisvų DVB įrenginių, kad būtų galima įrašinėti!"
+
+msgid "Pausing live video..."
+msgstr "Sustabdomas 'gyvo' video grojimas..."
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "Peršokti: "
+
+msgid "No editing marks defined!"
+msgstr "Nenustatytos koregavimo žymės!"
+
+msgid "Can't start editing process!"
+msgstr "Negali pradėti koregavimo!"
+
+msgid "Editing process started"
+msgstr "Koregavimo procesas prasidėjo"
+
+msgid "Editing process already active!"
+msgstr "Koregavimo procesas jau aktyvus!"
+
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " aąbcčdeęėfghiįjklmnopqrsštuųūvwxyzž0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+
+msgid "yes"
+msgstr "taip"
+
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\taąbcč2\tdeęėf3\tghiį4\tjkl5\tmno6\tpqrsš7\ttuųūv8\twxyzž9"
+
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+msgid "Button$Overwrite"
+msgstr "Perrąšyti"
+
+msgid "Button$Insert"
+msgstr "Įterpti"
+
+msgid "Plugin"
+msgstr "Įskiepas"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "Spauskite mygtukus į viršų / į apačią ir OK kad perkelti į kitą vietą"
+
+msgid "Channel locked (recording)!"
+msgstr "Kanalas užblokuotas (įrašinėjama)!"
+
+msgid "Low disk space!"
+msgstr "Mažai vietos diske!"
+
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Sistemos negalima išjungti, nes starto metu nebuvo komandinėj eilutėj paduota savybė '-s'!"
+
+msgid "Editing - shut down anyway?"
+msgstr "Koreguojama - išjungti vistiek?"
+
+msgid "Recording - shut down anyway?"
+msgstr "Įrašinėjama - išjungti vistiek?"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Įrašas prasidės po %ld minučių, išjungti vistiek?"
+
+msgid "shut down anyway?"
+msgstr "išjungti bet kokiu atveju?"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Įskiepas %s aktyvuosis po %ld min, tęsti toliau?"
+
+msgid "Editing - restart anyway?"
+msgstr "Koreguojama - perkrauti vistiek?"
+
+msgid "Recording - restart anyway?"
+msgstr "Įrašinėjama - perkrauti vistiek?"
+
+msgid "restart anyway?"
+msgstr "perkrati bet kokiu atveju?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "Garsas "
+
+msgid "Classic VDR"
+msgstr "Klasikinis VDR"
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Skydeliai"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr "PATKPŠS"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr "PirAntTreKetPenŠešSek"
+
+msgid "Monday"
+msgstr "Pirmadienis"
+
+msgid "Tuesday"
+msgstr "Antradienis"
+
+msgid "Wednesday"
+msgstr "Trečiadienis"
+
+msgid "Thursday"
+msgstr "Ketvirtadienis"
+
+msgid "Friday"
+msgstr "Penktadienis"
+
+msgid "Saturday"
+msgstr "Šeštadienis"
+
+msgid "Sunday"
+msgstr "Sekmadienis"
+
+msgid "Upcoming recording!"
+msgstr "Tuoj įsijungs įrašinėjimas!"
+
+msgid "Pause live video?"
+msgstr "Sustabdyti 'gyvą' video srautą?"
+
+msgid "Recording started"
+msgstr "Įrašymas prasidėjo"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR išsijungs vėliau - paspauskite Power mygtuką kad padarytumėte tai dabar"
+
+msgid "Press any key to cancel shutdown"
+msgstr "Paspauskit bet kurį mygtuką kad sustabdytumėte sistemos išjungimą"
+
+msgid "Switching primary DVB..."
+msgstr "Sukeičiamas pirminis DVB įrenginys..."
+
+msgid "Editing process failed!"
+msgstr "Koregavimas nepavyko!"
+
+msgid "Editing process finished"
+msgstr "Koregavimas baigtas"
+
+msgid "Press any key to cancel restart"
+msgstr "Paspauskit bet kurį mygtuką kad sustabdytumėte perkrovimą"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR išsijungs per %s minutes"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ef5c97654..99a8f4502 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003, 2005
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -928,6 +928,12 @@ msgstr "Kanaal geblokkeerd (neemt op)!"
 msgid "Low disk space!"
 msgstr "Hardeschijf bijna vol!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index daf56f1ef..070e974b0 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -925,6 +925,12 @@ msgstr "Kanalen er l
 msgid "Low disk space!"
 msgstr "Lite ledig diskplass!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke sl� av - startet uten parameteret '-s'!"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d88717891..daca48f4f 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -925,6 +925,12 @@ msgstr "Kana
 msgid "Low disk space!"
 msgstr "Ma�o miejsca na dysku!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ba23834d4..cee93d7cf 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,13 +1,13 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -924,6 +924,12 @@ msgstr "Canal bloqueado (a gravar)!"
 msgid "Low disk space!"
 msgstr "Espa�o em disco reduzido!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Imposs�vel desligar - falta a op��o '-s'!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 30aee23ca..6059aa58d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -927,6 +927,12 @@ msgstr "Canal blocat (
 msgid "Low disk space!"
 msgstr "Spa�iul pe disc e foarte sc�zut!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nu pot �nchide - vezi op�iunea '-s'"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0c61dce43..3de704375 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004, 2005
 # Oleg Roitburd <oleg@roitburd.de>, 2005, 2006, 2007, 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -925,6 +925,12 @@ msgstr "
 msgid "Low disk space!"
 msgstr "������������ ����� �� �����!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "���������� ���������� - �� ����� �������� '-s'!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
new file mode 100644
index 000000000..8471140dd
--- /dev/null
+++ b/po/sk_SK.po
@@ -0,0 +1,1031 @@
+# VDR language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006, 2008
+# Ji�� Dobr� <jdobry@centrum.cz>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.6.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"PO-Revision-Date: 2009-09-30 12:50+0100\n"
+"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
+"Language-Team: Slovak\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "off"
+msgstr "vypnut�"
+
+msgid "on"
+msgstr "zapnut�"
+
+msgid "auto"
+msgstr "automaticky"
+
+msgid "none"
+msgstr "�iadny"
+
+msgid "*** Invalid Channel ***"
+msgstr "*** Neplatn� kan�l ***"
+
+msgid "Channel not available!"
+msgstr "Kan�l nie je dostupn�!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nem��e spusti� prenos!"
+
+msgid "Starting EPG scan"
+msgstr "Za��na preh�ad�va� EPG"
+
+msgid "No title"
+msgstr "Bez n�zvu"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "Slovensky"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "sk"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "F�za 1: Detekcia typu k�du"
+
+msgid "Press any key on the RC unit"
+msgstr "Stla�te �ubovoln� kl�vesu ovl�dania"
+
+msgid "RC code detected!"
+msgstr "K�d bol zisten�!"
+
+msgid "Do not press any key..."
+msgstr "Nestl��ajte �iadne kl�vesy..."
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "F�za 2: Ur�enie konkr�tneho k�du kl�ves"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Stla�te kl�vesu pre '%s'"
+
+msgid "Press 'Up' to confirm"
+msgstr "Stla�te 'Hore' pre potvrdenie"
+
+msgid "Press 'Down' to continue"
+msgstr "Stla�te 'Dole' pre pokra�ovanie"
+
+msgid "(press 'Up' to go back)"
+msgstr "(stla�te 'hore' pre n�vrat)"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "(stla�te 'dole' pre skon�enie)"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "(stla�te 'Menu' pre presko�enie defin�cie kl�vesy)"
+
+msgid "Learning Remote Control Keys"
+msgstr "Ur�enie k�du dia�kov�ho ovl�dania"
+
+msgid "Phase 3: Saving key codes"
+msgstr "F�za 3: Ulo�enie k�du"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Stla�te 'hore' pre ulo�enie, 'Dole' pre zru�enie"
+
+msgid "Key$Up"
+msgstr "Hore"
+
+msgid "Key$Down"
+msgstr "Dole"
+
+msgid "Key$Menu"
+msgstr "Menu"
+
+msgid "Key$Ok"
+msgstr "Ok"
+
+msgid "Key$Back"
+msgstr "Sp�"
+
+msgid "Key$Left"
+msgstr "V�avo"
+
+msgid "Key$Right"
+msgstr "Vpravo"
+
+msgid "Key$Red"
+msgstr "�erven�"
+
+msgid "Key$Green"
+msgstr "Zelen�"
+
+msgid "Key$Yellow"
+msgstr "�lt�"
+
+msgid "Key$Blue"
+msgstr "Modr�"
+
+msgid "Key$Info"
+msgstr "Info"
+
+msgid "Key$Play"
+msgstr "Prehra�"
+
+msgid "Key$Pause"
+msgstr "Preru�i�"
+
+msgid "Key$Stop"
+msgstr "Zastavi�"
+
+msgid "Key$Record"
+msgstr "Nahra�"
+
+msgid "Key$FastFwd"
+msgstr "Preto�i� dopredu"
+
+msgid "Key$FastRew"
+msgstr "Preto�i� sp�"
+
+msgid "Key$Next"
+msgstr "�alej"
+
+msgid "Key$Prev"
+msgstr "Sp�"
+
+msgid "Key$Power"
+msgstr "Vyp�na�"
+
+msgid "Key$Channel+"
+msgstr "Kan�l+"
+
+msgid "Key$Channel-"
+msgstr "Kan�l-"
+
+msgid "Key$PrevChannel"
+msgstr "Predch�dzaj�ci kan�l"
+
+msgid "Key$Volume+"
+msgstr "Hlasitos�+"
+
+msgid "Key$Volume-"
+msgstr "Hlasitos� -"
+
+msgid "Key$Mute"
+msgstr "Ticho"
+
+msgid "Key$Audio"
+msgstr "Zvuk"
+
+msgid "Key$Subtitles"
+msgstr "Titulky"
+
+msgid "Key$Schedule"
+msgstr "Program (EPG)"
+
+msgid "Key$Channels"
+msgstr "Kan�ly"
+
+msgid "Key$Timers"
+msgstr "Pl�ny nahr�vania"
+
+msgid "Key$Recordings"
+msgstr "Z�znamy"
+
+msgid "Key$Setup"
+msgstr "Nastavenie"
+
+msgid "Key$Commands"
+msgstr "Pr�kazy"
+
+msgid "Key$User1"
+msgstr "U��vate�1"
+
+msgid "Key$User2"
+msgstr "U��vate�2"
+
+msgid "Key$User3"
+msgstr "U��vate�3"
+
+msgid "Key$User4"
+msgstr "U��vate�4"
+
+msgid "Key$User5"
+msgstr "U��vate�5"
+
+msgid "Key$User6"
+msgstr "U��vate�6"
+
+msgid "Key$User7"
+msgstr "U��vate�7"
+
+msgid "Key$User8"
+msgstr "U��vate�8"
+
+msgid "Key$User9"
+msgstr "U��vate�9"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "volne"
+
+msgid "Free To Air"
+msgstr "volne ��rite�n�"
+
+msgid "encrypted"
+msgstr "k�dovan�"
+
+msgid "Edit channel"
+msgstr "�pravy kan�lu"
+
+msgid "Name"
+msgstr "N�zov"
+
+msgid "Source"
+msgstr "Zdroj"
+
+msgid "Frequency"
+msgstr "Frekvencia"
+
+msgid "Vpid"
+msgstr "Vpid"
+
+msgid "Ppid"
+msgstr "Ppid"
+
+msgid "Apid1"
+msgstr "Apid1"
+
+msgid "Apid2"
+msgstr "Apid2"
+
+msgid "Dpid1"
+msgstr "Dpid1"
+
+msgid "Dpid2"
+msgstr "Dpid2"
+
+msgid "Spid1"
+msgstr "Spid1"
+
+msgid "Spid2"
+msgstr "Spid2"
+
+msgid "Tpid"
+msgstr "Tpid"
+
+msgid "CA"
+msgstr "CA"
+
+msgid "Sid"
+msgstr "Sid"
+
+msgid "Polarization"
+msgstr "Polariz�cia"
+
+msgid "System"
+msgstr "syst�m"
+
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modul�cia"
+
+msgid "Bandwidth"
+msgstr "��rka p�sma"
+
+msgid "Transmission"
+msgstr "Prenos"
+
+msgid "Guard"
+msgstr "Ochrana"
+
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+msgid "Rolloff"
+msgstr ""
+
+msgid "Channel settings are not unique!"
+msgstr "Nastavenia kan�lu nie s� oby�ajn�!"
+
+msgid "Channels"
+msgstr "Kan�ly"
+
+msgid "Button$Edit"
+msgstr "�pravy"
+
+msgid "Button$New"
+msgstr "Nov�"
+
+msgid "Button$Delete"
+msgstr "Zmaza�"
+
+msgid "Button$Mark"
+msgstr "Ozna�i�"
+
+msgid "Channel is being used by a timer!"
+msgstr "Pl�n nahr�vania pr�ve pou��va kan�l!"
+
+msgid "Delete channel?"
+msgstr "Odstr�ni� kan�l?"
+
+msgid "Edit timer"
+msgstr "�prava pl�nu nahr�vania"
+
+msgid "Active"
+msgstr "V �innosti"
+
+msgid "Channel"
+msgstr "Kan�l"
+
+msgid "Day"
+msgstr "De�"
+
+msgid "Start"
+msgstr "Za�iatok"
+
+msgid "Stop"
+msgstr "Koniec"
+
+msgid "VPS"
+msgstr "VPS"
+
+msgid "Priority"
+msgstr "Priorita"
+
+msgid "Lifetime"
+msgstr "�ivotnos�"
+
+msgid "File"
+msgstr "S�bor"
+
+msgid "First day"
+msgstr "Prv� de�"
+
+msgid "Timers"
+msgstr "Pl�ny nahr�vania"
+
+msgid "Button$On/Off"
+msgstr "Zap./Vyp."
+
+msgid "Button$Info"
+msgstr "Info"
+
+msgid "Delete timer?"
+msgstr "Zmaza� pl�n nahr�vania?"
+
+msgid "Timer still recording - really delete?"
+msgstr "Pr�ve nahr�va- naozaj zmaza�?"
+
+msgid "Event"
+msgstr "Udalosti"
+
+msgid "Button$Timer"
+msgstr "Pl�ny"
+
+msgid "Button$Record"
+msgstr "Nahra�"
+
+msgid "Button$Switch"
+msgstr "Prepn��"
+
+msgid "What's on now?"
+msgstr "Aktu�lny program"
+
+msgid "What's on next?"
+msgstr "N�sleduj�ci program"
+
+msgid "Button$Next"
+msgstr "�alej"
+
+msgid "Button$Now"
+msgstr "Teraz"
+
+msgid "Button$Schedule"
+msgstr "TV program"
+
+msgid "Can't switch channel!"
+msgstr "Kan�l nejde prepn��!"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "TV program - %s"
+
+#, c-format
+msgid "This event - %s"
+msgstr "Tato udalos� - %s"
+
+msgid "This event - all channels"
+msgstr "Tato udalos� - v�etky kan�ly"
+
+msgid "All events - all channels"
+msgstr "V�etky udalosti - v�etky kan�ly"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Pros�m vlo�te %d znakov!"
+
+msgid "CAM not responding!"
+msgstr "CAM neodpoved�!"
+
+msgid "Recording info"
+msgstr "Podrobnosti z�znamu"
+
+msgid "Button$Play"
+msgstr "Prehra�"
+
+msgid "Button$Rewind"
+msgstr "Na za�iatok"
+
+msgid "Recordings"
+msgstr "Z�znamy"
+
+msgid "Button$Open"
+msgstr "Otvori�"
+
+msgid "Commands"
+msgstr "Pr�kazy"
+
+msgid "Error while accessing recording!"
+msgstr "Chyba pri pr�stupe k z�znamom!"
+
+msgid "Delete recording?"
+msgstr "Zmaza� z�znam?"
+
+msgid "Error while deleting recording!"
+msgstr "Pri vymaz�van� z�znamu pri�lo k chybe!"
+
+msgid "Recording commands"
+msgstr "Pr�kazy nahr�vania"
+
+msgid "never"
+msgstr "nikdy"
+
+msgid "skin dependent"
+msgstr "pod�a vzh�adu"
+
+msgid "always"
+msgstr "v�dy"
+
+msgid "OSD"
+msgstr "OSD"
+
+msgid "Setup.OSD$Language"
+msgstr "Jazyk"
+
+msgid "Setup.OSD$Skin"
+msgstr "Vzh�ad"
+
+msgid "Setup.OSD$Theme"
+msgstr "T�ma"
+
+msgid "Setup.OSD$Left (%)"
+msgstr "V�avo (%)"
+
+msgid "Setup.OSD$Top (%)"
+msgstr "Navrchu (%)"
+
+msgid "Setup.OSD$Width (%)"
+msgstr "��rka (%)"
+
+msgid "Setup.OSD$Height (%)"
+msgstr "V��ka (%)"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "�as zobrazenia spr�vy (s)"
+
+msgid "Setup.OSD$Use small font"
+msgstr "Pou��va� mal� p�smo"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "Vyhladi� p�smo"
+
+msgid "Setup.OSD$Default font"
+msgstr "Predvolen� p�smo"
+
+msgid "Setup.OSD$Small font"
+msgstr "Mal� p�smo"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "Ur�en� p�smo"
+
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Ve�kos� predvolen�ho p�sma (%)"
+
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Ve�kos� mal�ho p�sma (%)"
+
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Ve�kos� ur�en�ho p�sma (%)"
+
+msgid "Setup.OSD$Channel info position"
+msgstr "Poz�cia inform�ci� o kan�le"
+
+msgid "bottom"
+msgstr "na spodku"
+
+msgid "top"
+msgstr "na vrchu"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "�as zobr. inform�ci� o kan�le (s)"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Inform�cie pri zmene kan�lu"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "�asov� limit na inform�ciu o kan�le"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "Rolova� strany"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Z konca na za�iatok"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "Kl�vesa Menu zaviera"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "Zoznam z�znamov"
+
+msgid "EPG"
+msgstr "EPG"
+
+msgid "Button$Scan"
+msgstr "Sn�ma�"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "�asov� limit pre sn�manie EPG (h)"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "EPG �rove� chyb"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Ukazova� star�ie EPG d�ta (min)"
+
+msgid "Setup.EPG$Set system time"
+msgstr "Nastavi� syst�mov� �as"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Pou�i� �as z kan�lu"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "Uprednost�ova� jazyky"
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "Uprednostni� jazyk"
+
+msgid "pan&scan"
+msgstr "pan&scan"
+
+msgid "letterbox"
+msgstr "letterbox"
+
+msgid "center cut out"
+msgstr "oreza� do stredu"
+
+msgid "no"
+msgstr "nie"
+
+msgid "names only"
+msgstr "iba n�zvy"
+
+msgid "PIDs only"
+msgstr "iba PID-y"
+
+msgid "names and PIDs"
+msgstr "n�zvy a PID-y"
+
+msgid "add new channels"
+msgstr "prida� nov� kan�ly"
+
+msgid "add new transponders"
+msgstr "prida� nov� transpond�ry"
+
+msgid "DVB"
+msgstr "DVB"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Hlavn� DVB rozhranie"
+
+msgid "Setup.DVB$Video format"
+msgstr "Form�t videa"
+
+msgid "Setup.DVB$Video display format"
+msgstr "Form�t zobrazenia videa"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Pou��va� zvuk v Dolby Digital"
+
+msgid "Setup.DVB$Update channels"
+msgstr "Aktualiz�cia kan�lov"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "Jazyky zvuku"
+
+msgid "Setup.DVB$Audio language"
+msgstr "Jazyk zvuku"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "Zobrazova� titulky"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "Jazyky titulkov"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "Jazyk titulkov"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "Posunutie titulkov"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "Prieh�adnos� p�sma titulkov"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "Prieh�adnos� pozadia titulkov"
+
+msgid "LNB"
+msgstr "LNB"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Pou��va� DiSEqC"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Doln� frekvencia LNB (MHz)"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Horn� frekvencia LNB (MHz)"
+
+msgid "CAM reset"
+msgstr "Reset CAMu"
+
+msgid "CAM present"
+msgstr "CAM pr�tomn�"
+
+msgid "CAM ready"
+msgstr "CAM pripraven�"
+
+msgid "CAM"
+msgstr "CAM"
+
+msgid "Button$Menu"
+msgstr "Menu"
+
+msgid "Button$Reset"
+msgstr "Reset"
+
+msgid "Opening CAM menu..."
+msgstr "Otv�ra sa menu CAM..."
+
+msgid "Can't open CAM menu!"
+msgstr "Menu CAM nie je dostupn�"
+
+msgid "CAM is in use - really reset?"
+msgstr "CAM sa pou��va - naozaj re�tartova�?"
+
+msgid "Can't reset CAM!"
+msgstr "CAM modul nejde re�tartova�!"
+
+msgid "do not pause live video"
+msgstr "nepreru�ova� �iv� vysielanie"
+
+msgid "confirm pause live video"
+msgstr "Potrdi� preru�enie �iv�ho vysielania"
+
+msgid "pause live video"
+msgstr "Preru�i� �iv� vysielanie"
+
+msgid "Recording"
+msgstr "Nahr�vanie"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Nahr�va� pred za�iatkom (min)"
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Nahr�va� po konci (min)"
+
+msgid "Setup.Recording$Primary limit"
+msgstr "Hlavn� limit"
+
+msgid "Setup.Recording$Default priority"
+msgstr "Predvolen� priorita"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Predvolen� �ivotnos�"
+
+msgid "Setup.Recording$Pause key handling"
+msgstr ""
+
+msgid "Setup.Recording$Pause priority"
+msgstr "Priorita preru�enia"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "�ivotnos� preru�enia (d)"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "Pou��va� n�zov epiz�dy"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "Pou��va� VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "�asov� rezerva pre VPS (s)"
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Ozna�i� okam�it� nahr�vky"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "Premenova� okam�it� nahr�vky"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "D�ka okam�it�ho nahr�vania (min)"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maxim�lna ve�kos� nahr�vky (MB)"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "Deli� upravovan� s�bory"
+
+msgid "Replay"
+msgstr "Prehr�vanie"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Viac r�chlostn� re�im"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "Zobrazi� sp�sob prehr�vania"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "ID obnovenie"
+
+msgid "Miscellaneous"
+msgstr "R�zne"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Min. pauza medzi udalos�ami (min)"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "�asov� limit ne�innosti (min)"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "�asov� limit SVDRP (s)"
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "�asov� limit Zap (s)"
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "�as pri vo�be kan�la (ms)"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Kan�l po spusten�"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "ako naposledy"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Hlasitos� po spusten�"
+
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "N�dzov� ukon�enie"
+
+msgid "Plugins"
+msgstr "Moduly"
+
+msgid "This plugin has no setup parameters!"
+msgstr "Modul nem� konfigura�n� parametre!"
+
+msgid "Setup"
+msgstr "Nastavenie"
+
+msgid "Restart"
+msgstr "Re�tart"
+
+msgid "Really restart?"
+msgstr "Opravdu re�tartova�?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr " Zastavi� nahr�vanie"
+
+msgid "Schedule"
+msgstr "TV program"
+
+msgid "VDR"
+msgstr "VDR"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr " Zastavi� prehr�vanie"
+
+msgid "Button$Audio"
+msgstr "Zvuk"
+
+msgid "Button$Pause"
+msgstr "Pozastavi�"
+
+msgid "Button$Stop"
+msgstr "Zastavi�"
+
+msgid "Button$Resume"
+msgstr "Pokra�ova�"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr " Zru�i� �pravu"
+
+msgid "Stop recording?"
+msgstr "Ukon�i� nahr�vanie?"
+
+msgid "Cancel editing?"
+msgstr "Zru�i� �pravy?"
+
+msgid "No audio available!"
+msgstr "Zvuk nie je dostupn�!"
+
+msgid "No subtitles"
+msgstr "Bez titulkov"
+
+msgid "Button$Subtitles"
+msgstr "Titulky"
+
+msgid "No subtitles available!"
+msgstr "�iadne dostupn� titulky!"
+
+msgid "Not enough disk space to start recording!"
+msgstr "M�lo voln�ho miesta na nahr�vanie!"
+
+msgid "No free DVB device to record!"
+msgstr "�iadna DVB karta nie je voln� pre nahr�vanie"
+
+msgid "Pausing live video..."
+msgstr "Preru�uje sa be�iaci program ..."
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "Skok: "
+
+msgid "No editing marks defined!"
+msgstr "Nie s� ur�en� upravovan� zna�ky!"
+
+msgid "Can't start editing process!"
+msgstr "Nem��e za�a� spracovanie �prav!"
+
+msgid "Editing process started"
+msgstr "Spracovanie �prav za�alo"
+
+msgid "Editing process already active!"
+msgstr "Spracovanie �prav je v �innosti!"
+
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a��bc�d�e�fghi�jkl�mn�o��pqr�s�t�u�vwxy�z�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+
+msgid "yes"
+msgstr "�no"
+
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
+
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+msgid "Button$Overwrite"
+msgstr "Prep�sa�"
+
+msgid "Button$Insert"
+msgstr "Vlo�i�"
+
+msgid "Plugin"
+msgstr "Modul"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "Hore/Dole na nov� poz�ciu - Ok presune"
+
+msgid "Channel locked (recording)!"
+msgstr "Kan�l je zamknut� (nahr�va sa)!"
+
+msgid "Low disk space!"
+msgstr "Za chv��ku bude pln� disk!"
+
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Vypnutie nie je mo�n� - ch�ba vo�ba '-s'!"
+
+msgid "Editing - shut down anyway?"
+msgstr "Upravujem - aj tak vypn��?"
+
+msgid "Recording - shut down anyway?"
+msgstr "Nahr�va - aj tak vypn��?"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Nahr�vanie za�ne za %ld min�t - aj tak vypn��?"
+
+msgid "shut down anyway?"
+msgstr "Aj tak vypn��?"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Modul %s �tartuje za %ld min., pokra�ova�?"
+
+msgid "Editing - restart anyway?"
+msgstr "Upravuje sa - aj tak re�tartova�?"
+
+msgid "Recording - restart anyway?"
+msgstr "Nahr�va - aj tak re�tartova�?"
+
+msgid "restart anyway?"
+msgstr "Aj tak re�tartova�?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "Hlasitos�"
+
+msgid "Classic VDR"
+msgstr "Klasick� VDR"
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG konzola"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr "P�S�PSN"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr "Po Ut St �t Pi So Ne "
+
+msgid "Monday"
+msgstr "Pondelok"
+
+msgid "Tuesday"
+msgstr "Utorok"
+
+msgid "Wednesday"
+msgstr "Streda"
+
+msgid "Thursday"
+msgstr "�tvrtok"
+
+msgid "Friday"
+msgstr "Piatok"
+
+msgid "Saturday"
+msgstr "Sobota"
+
+msgid "Sunday"
+msgstr "Nede�a"
+
+msgid "Upcoming recording!"
+msgstr "Onedlho za�ne nahr�vanie!"
+
+msgid "Pause live video?"
+msgstr "Preru�i� �iv� vysielanie?"
+
+msgid "Recording started"
+msgstr "Za�alo nahr�vanie"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "Vypnutie VDR bude odlo�en� - vypnete kl�vesou Power"
+
+msgid "Press any key to cancel shutdown"
+msgstr "Ktor�ko�vek kl�vesa zru�� vypnutie"
+
+msgid "Switching primary DVB..."
+msgstr "Prep�na hlavn� DVB..."
+
+msgid "Editing process failed!"
+msgstr "Spracovanie �prav zlyhalo!"
+
+msgid "Editing process finished"
+msgstr "Spracovanie �prav skon�ilo"
+
+msgid "Press any key to cancel restart"
+msgstr "ktor�ko�vek  kl�vesa zru�� re�tart"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR sa vypne za %s min�t"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 35b604357..4f89ff779 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -925,6 +925,12 @@ msgstr "Zaklenjen kanal (snemanje)!"
 msgid "Low disk space!"
 msgstr "Premalo prostora na disku!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e4fbe25a8..d368bb656 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -927,6 +927,12 @@ msgstr "Kanalen 
 msgid "Low disk space!"
 msgstr "L�gt diskutrymme!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan inte avsluta, m�ste anv�nda parameter '-s'"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 44bf894ed..39138d597 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,13 +1,13 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -924,6 +924,12 @@ msgstr "Kanal ge
 msgid "Low disk space!"
 msgstr "Kay�t kapasitesi az!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kapat�lam�yor - '-s' se�ene�i verilmemi�!"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 79b8121fc..6c2f58ab9 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,13 +1,13 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-31 11:11+0200\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
 "PO-Revision-Date: 2009-05-31 13:17+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -924,6 +924,12 @@ msgstr "Канал заблоковано (йде запис)!"
 msgid "Low disk space!"
 msgstr "Недостатньо місця на диску!"
 
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Виключенння неможливе - не задано параметр '-s'!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f27677576..03bddab9b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Nan Feng <nfgx@21cn.com>, 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2009-05-21 13:18+0200\n"
-"PO-Revision-Date: 2008-03-21 08:44+0800\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "off"
 msgstr "关"
 
 msgid "on"
-msgstr ""
+msgstr "开"
 
 msgid "auto"
 msgstr "自动"
@@ -31,7 +31,7 @@ msgid "none"
 msgstr "无"
 
 msgid "*** Invalid Channel ***"
-msgstr "***无效频道 ***"
+msgstr "***无效的频道 ***"
 
 msgid "Channel not available!"
 msgstr "频道不可用!"
@@ -47,7 +47,7 @@ msgstr "没有标题"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
-msgstr "中文"
+msgstr "简体中文"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
@@ -63,7 +63,7 @@ msgid "RC code detected!"
 msgstr "发现RC代码!"
 
 msgid "Do not press any key..."
-msgstr "不按下任何键... "
+msgstr "不要按下任何键... "
 
 msgid "Phase 2: Learning specific key codes"
 msgstr "阶段 2: 学习特殊的按键代码"
@@ -94,7 +94,7 @@ msgid "Phase 3: Saving key codes"
 msgstr "阶段 3: 保存代码"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "请按上保存，按下取消"
+msgstr "请按上保存,按下取消."
 
 msgid "Key$Up"
 msgstr "上"
@@ -229,10 +229,10 @@ msgid "Key$User9"
 msgstr "用户9"
 
 msgid "Disk"
-msgstr "磁盘"
+msgstr "硬盘已使用"
 
 msgid "free"
-msgstr "剩余"
+msgstr "可录像时间"
 
 msgid "Free To Air"
 msgstr "剩余空间"
@@ -247,7 +247,7 @@ msgid "Name"
 msgstr "名字"
 
 msgid "Source"
-msgstr "来源"
+msgstr "卫星源"
 
 msgid "Frequency"
 msgstr "频率"
@@ -286,16 +286,16 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Polarization"
-msgstr "极化"
+msgstr "极化方式"
 
 msgid "System"
-msgstr ""
+msgstr "卫星系统"
 
 msgid "Srate"
-msgstr "比率"
+msgstr "符号率"
 
 msgid "Inversion"
-msgstr "倒置"
+msgstr "反向"
 
 msgid "CoderateH"
 msgstr "高符号频率"
@@ -319,13 +319,13 @@ msgid "Hierarchy"
 msgstr "层次"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "越零率"
 
 msgid "Channel settings are not unique!"
 msgstr "频道设置不是唯一的！"
 
 msgid "Channels"
-msgstr "频道"
+msgstr "频道列表"
 
 msgid "Button$Edit"
 msgstr "编辑"
@@ -340,7 +340,7 @@ msgid "Button$Mark"
 msgstr "标记"
 
 msgid "Channel is being used by a timer!"
-msgstr "频道正在使用定时器！"
+msgstr "频道正在录像！"
 
 msgid "Delete channel?"
 msgstr "是否删除频道？"
@@ -379,7 +379,7 @@ msgid "First day"
 msgstr "第一天"
 
 msgid "Timers"
-msgstr "计时器"
+msgstr "录像中列表"
 
 msgid "Button$On/Off"
 msgstr "开/关"
@@ -391,7 +391,7 @@ msgid "Delete timer?"
 msgstr "是否删除时间？"
 
 msgid "Timer still recording - really delete?"
-msgstr "计时器仍在录制-真的删除？ "
+msgstr "录像中-是否的删除？ "
 
 msgid "Event"
 msgstr "事件"
@@ -400,7 +400,7 @@ msgid "Button$Timer"
 msgstr "时间"
 
 msgid "Button$Record"
-msgstr "记录"
+msgstr "录像"
 
 msgid "Button$Switch"
 msgstr "开关"
@@ -409,7 +409,7 @@ msgid "What's on now?"
 msgstr "现在播放的节目?"
 
 msgid "What's on next?"
-msgstr "下一播放的节目?"
+msgstr "下一个播放的节目?"
 
 msgid "Button$Next"
 msgstr "下一步"
@@ -418,14 +418,14 @@ msgid "Button$Now"
 msgstr "现在"
 
 msgid "Button$Schedule"
-msgstr "任务表"
+msgstr "任务列表"
 
 msgid "Can't switch channel!"
 msgstr "不能切换频道"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "时间表 - %s"
+msgstr "任务列表 - %s"
 
 #, c-format
 msgid "This event - %s"
@@ -445,31 +445,31 @@ msgid "CAM not responding!"
 msgstr "CAM 没有响应！"
 
 msgid "Recording info"
-msgstr "记录信息"
+msgstr "录像信息"
 
 msgid "Button$Play"
 msgstr "播放"
 
 msgid "Button$Rewind"
-msgstr "重绕"
+msgstr "重放"
 
 msgid "Recordings"
-msgstr "记录"
+msgstr "录像回放列表"
 
 msgid "Button$Open"
 msgstr "打开"
 
 msgid "Commands"
-msgstr "命令"
+msgstr "常用操作命令"
 
 msgid "Error while accessing recording!"
-msgstr "存取记录错误！"
+msgstr "存取录像错误！"
 
 msgid "Delete recording?"
-msgstr "是否删除记录？"
+msgstr "是否删除录像？"
 
 msgid "Error while deleting recording!"
-msgstr "删除记录错误！"
+msgstr "删除录像错误！"
 
 msgid "Recording commands"
 msgstr "记录命令"
@@ -478,52 +478,52 @@ msgid "never"
 msgstr "从不"
 
 msgid "skin dependent"
-msgstr "外壳选择"
+msgstr "皮肤选择"
 
 msgid "always"
 msgstr "总是"
 
 msgid "OSD"
-msgstr "OSD"
+msgstr "系统菜单设置"
 
 msgid "Setup.OSD$Language"
-msgstr "语言"
+msgstr "语言选择"
 
 msgid "Setup.OSD$Skin"
-msgstr "外壳"
+msgstr "皮肤选择"
 
 msgid "Setup.OSD$Theme"
-msgstr "主题"
+msgstr "主题选择"
 
 msgid "Setup.OSD$Left (%)"
-msgstr "左 (%)"
+msgstr "左边距离设置 (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr "顶部 (%)"
+msgstr "顶部距离设置 (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "宽 (%)"
+msgstr "宽度设置 (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "高 (%)"
+msgstr "高度设置 (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "时间信息 (s)"
+msgstr "显示信息时间(秒)"
 
 msgid "Setup.OSD$Use small font"
 msgstr "使用小字体"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "抗锯齿"
+msgstr "抗锯齿选择"
 
 msgid "Setup.OSD$Default font"
-msgstr "默认字体"
+msgstr "默认字体选择"
 
 msgid "Setup.OSD$Small font"
-msgstr "小字体"
+msgstr "小字体选择"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "固定字体"
+msgstr "固定字体选择"
 
 msgid "Setup.OSD$Default font size (%)"
 msgstr "默认字体大小 (%)"
@@ -559,13 +559,13 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "滚动限制"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "彩单关闭结束"
+msgstr "菜单关闭结束"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "记录目录"
+msgstr "录像目录"
 
 msgid "EPG"
-msgstr "节目单"
+msgstr "电子节目单设置"
 
 msgid "Button$Scan"
 msgstr "扫描"
@@ -594,25 +594,25 @@ msgid "Setup.EPG$Preferred language"
 msgstr "首选语言"
 
 msgid "pan&scan"
-msgstr "pan&scan"
+msgstr "pan&scan模式"
 
 msgid "letterbox"
-msgstr "小盒子模式"
+msgstr "letterbox模式"
 
 msgid "center cut out"
-msgstr "Center-cut-out"
+msgstr "Center-cut-out模式"
 
 msgid "no"
 msgstr "不"
 
 msgid "names only"
-msgstr "names only"
+msgstr "仅是名字"
 
 msgid "PIDs only"
-msgstr "PIDs only"
+msgstr "仅是PIDs"
 
 msgid "names and PIDs"
-msgstr "names and PIDs"
+msgstr "名字和PIDs"
 
 msgid "add new channels"
 msgstr "添加新频道"
@@ -621,10 +621,10 @@ msgid "add new transponders"
 msgstr "添加新转发器"
 
 msgid "DVB"
-msgstr "DVB"
+msgstr "卫星卡设置"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "主要DVB接口"
+msgstr "使用中卫星卡接口"
 
 msgid "Setup.DVB$Video format"
 msgstr "视频格式"
@@ -663,13 +663,13 @@ msgid "Setup.DVB$Subtitle background transparency"
 msgstr "字幕背景透明度"
 
 msgid "LNB"
-msgstr "高频头"
+msgstr "切换器设置"
 
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "使用切换器"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "SLOF (MHz)"
+msgstr "切换频率 (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "低本振频率 (MHz)"
@@ -678,22 +678,22 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "高本振频率 (MHz)"
 
 msgid "CAM reset"
-msgstr "CAM 重置"
+msgstr "CAM重置"
 
 msgid "CAM present"
-msgstr "现在的CAM"
+msgstr "存在的CAM"
 
 msgid "CAM ready"
-msgstr "CAM 准备"
+msgstr "CAM准备"
 
 msgid "CAM"
-msgstr "CAM"
+msgstr "CAM设置"
 
 msgid "Button$Menu"
 msgstr "菜单"
 
 msgid "Button$Reset"
-msgstr "重启"
+msgstr "重新启动系统"
 
 msgid "Opening CAM menu..."
 msgstr "打开CAM菜单..."
@@ -717,7 +717,7 @@ msgid "pause live video"
 msgstr ""
 
 msgid "Recording"
-msgstr "记录中"
+msgstr "录像设置"
 
 msgid "Setup.Recording$Margin at start (min)"
 msgstr "时间正在开始 (min)"
@@ -735,7 +735,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "默认终身 (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "暂停关键的处理"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "暂停优先"
@@ -768,7 +768,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "分离编辑文件"
 
 msgid "Replay"
-msgstr "回放"
+msgstr "回放设置"
 
 msgid "Setup.Replay$Multi speed mode"
 msgstr "媒体速度模式"
@@ -780,7 +780,7 @@ msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
 msgid "Miscellaneous"
-msgstr "混杂的"
+msgstr "其它设置"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Min. 结果超时 (min)"
@@ -810,26 +810,26 @@ msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "突发事件退出"
 
 msgid "Plugins"
-msgstr "插件"
+msgstr "插件设置"
 
 msgid "This plugin has no setup parameters!"
 msgstr "这个插件没有设置参数!"
 
 msgid "Setup"
-msgstr "设置"
+msgstr "VDR系统设置"
 
 msgid "Restart"
-msgstr "重启"
+msgstr " 重启VDR系统"
 
 msgid "Really restart?"
 msgstr "是否重启？"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr "停止记录"
+msgstr "是否停止录像?"
 
 msgid "Schedule"
-msgstr "时间表"
+msgstr "任务列表"
 
 msgid "VDR"
 msgstr "VDR"
@@ -855,13 +855,13 @@ msgid " Cancel editing"
 msgstr "取消编辑"
 
 msgid "Stop recording?"
-msgstr "停止记录"
+msgstr "停止录像"
 
 msgid "Cancel editing?"
 msgstr "取消编辑"
 
 msgid "No audio available!"
-msgstr "声道不可用"
+msgstr "音频不可用"
 
 msgid "No subtitles"
 msgstr "没有字幕"
@@ -873,10 +873,10 @@ msgid "No subtitles available!"
 msgstr "字幕不可用"
 
 msgid "Not enough disk space to start recording!"
-msgstr "没有足够的空间记录"
+msgstr "没有足够的空间录像"
 
 msgid "No free DVB device to record!"
-msgstr "没有空闲的DVB设备记录"
+msgstr "没有空闲的DVB设备录像"
 
 msgid "Pausing live video..."
 msgstr "暂停当前视频"
@@ -922,10 +922,16 @@ msgid "Up/Dn for new location - OK to move"
 msgstr "上/下 新的定位 - OK 移动"
 
 msgid "Channel locked (recording)!"
-msgstr "频道已经锁定 (记录)!"
+msgstr "频道已经锁定 (录像)!"
 
 msgid "Low disk space!"
-msgstr "低磁盘空间!"
+msgstr "磁盘空间不足!"
+
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "不能关机 - 操作 '-s' 不允许!"
@@ -934,45 +940,45 @@ msgid "Editing - shut down anyway?"
 msgstr "编辑-立即关机?"
 
 msgid "Recording - shut down anyway?"
-msgstr "录像-立即关机?"
+msgstr "录像中,是否立即关机?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "记录在 %ld 分钟，立即关机?"
+msgstr "录像已有 %ld 分钟，立即关机?"
 
 msgid "shut down anyway?"
-msgstr "立即关机?"
+msgstr "是否立即关机?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "插件 %s 唤醒在 %ld 分钟，是否继续?"
 
 msgid "Editing - restart anyway?"
-msgstr "编辑 - 现在重启?"
+msgstr "编辑中,是否现在重启?"
 
 msgid "Recording - restart anyway?"
-msgstr "记录 - 现在重启？"
+msgstr "录像中,是否现在重启?"
 
 msgid "restart anyway?"
-msgstr "现在重启？"
+msgstr "现在重启?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "音量"
+msgstr "音量调整"
 
 msgid "Classic VDR"
-msgstr "经典 VDR"
+msgstr "经典VDR面板"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG 面板"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "MDMDFSS"
+msgstr "MTWTFSS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "一二三四五六日"
+msgstr "星期一星期二星期三星期四星期五星期六星期天"
 
 msgid "Monday"
 msgstr "星期一"
@@ -996,22 +1002,22 @@ msgid "Sunday"
 msgstr "星期天"
 
 msgid "Upcoming recording!"
-msgstr "即将的记录！"
+msgstr "准备录像！"
 
 msgid "Pause live video?"
 msgstr ""
 
 msgid "Recording started"
-msgstr "记录开始！"
+msgstr "录像开始！"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR即将关闭 - 按电源强制关闭"
+msgstr "VDR即将关闭 - 按电源强制关闭！"
 
 msgid "Press any key to cancel shutdown"
 msgstr "按下任何键即可取消关机"
 
 msgid "Switching primary DVB..."
-msgstr "切换主要的DVB.."
+msgstr "切换主要的DVB设备."
 
 msgid "Editing process failed!"
 msgstr "编辑过程失败"
@@ -1024,4 +1030,4 @@ msgstr "请按任意键重启"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR将要在%s分钟关闭"
+msgstr "VDR系统将要在%s分钟关闭"
diff --git a/recorder.c b/recorder.c
index 4e48a51e5..145d02061 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.4 2009/05/23 12:18:25 kls Exp $
+ * $Id: recorder.c 2.6 2009/11/21 15:58:12 kls Exp $
  */
 
 #include "recorder.h"
@@ -30,7 +30,7 @@ cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, i
 
   SpinUpDisk(FileName);
 
-  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
+  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE, true, "Recorder");
   ringBuffer->SetTimeouts(0, 100);
   cChannel *Channel = Channels.GetByChannelID(ChannelID);
   int Pid = VPid;
@@ -116,6 +116,7 @@ void cRecorder::Action(void)
 {
   time_t t = time(NULL);
   bool InfoWritten = false;
+  bool FirstIframeSeen = false;
   while (Running()) {
         int r;
         uchar *b = ringBuffer->Get(r);
@@ -134,25 +135,28 @@ void cRecorder::Action(void)
                        }
                     InfoWritten = true;
                     }
-                 if (!NextFile())
-                    break;
-                 if (index && frameDetector->NewFrame())
-                    index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
-                 if (frameDetector->IndependentFrame()) {
-                    recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
-                    fileSize += TS_SIZE;
-                    int Index = 0;
-                    while (uchar *pmt = patPmtGenerator.GetPmt(Index)) {
-                          recordFile->Write(pmt, TS_SIZE);
-                          fileSize += TS_SIZE;
-                          }
-                    }
-                 if (recordFile->Write(b, Count) < 0) {
-                    LOG_ERROR_STR(fileName->Name());
-                    break;
+                 if (FirstIframeSeen || frameDetector->IndependentFrame()) {
+                    FirstIframeSeen = true; // start recording with the first I-frame
+                    if (!NextFile())
+                       break;
+                    if (index && frameDetector->NewFrame())
+                       index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
+                    if (frameDetector->IndependentFrame()) {
+                       recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
+                       fileSize += TS_SIZE;
+                       int Index = 0;
+                       while (uchar *pmt = patPmtGenerator.GetPmt(Index)) {
+                             recordFile->Write(pmt, TS_SIZE);
+                             fileSize += TS_SIZE;
+                             }
+                       }
+                    if (recordFile->Write(b, Count) < 0) {
+                       LOG_ERROR_STR(fileName->Name());
+                       break;
+                       }
+                    fileSize += Count;
+                    t = time(NULL);
                     }
-                 fileSize += Count;
-                 t = time(NULL);
                  }
               ringBuffer->Del(Count);
               }
diff --git a/recording.c b/recording.c
index f3c2c5ab5..ab94c32ac 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.17 2009/08/16 10:39:43 kls Exp $
+ * $Id: recording.c 2.18 2009/11/22 11:20:53 kls Exp $
  */
 
 #include "recording.h"
@@ -21,6 +21,7 @@
 #include "i18n.h"
 #include "interface.h"
 #include "remux.h"
+#include "ringbuffer.h"
 #include "skins.h"
 #include "tools.h"
 #include "videodir.h"
@@ -1309,6 +1310,124 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
      }
 }
 
+// --- cIndexFileGenerator ---------------------------------------------------
+
+#define IFG_BUFFER_SIZE KILOBYTE(100)
+
+class cIndexFileGenerator : public cThread {
+private:
+  cString recordingName;
+protected:
+  virtual void Action(void);
+public:
+  cIndexFileGenerator(const char *RecordingName);
+  ~cIndexFileGenerator();
+  };
+
+cIndexFileGenerator::cIndexFileGenerator(const char *RecordingName)
+:cThread("index file generator")
+,recordingName(RecordingName)
+{
+  Start();
+}
+
+cIndexFileGenerator::~cIndexFileGenerator()
+{
+  Cancel(3);
+}
+
+void cIndexFileGenerator::Action(void)
+{
+  bool IndexFileComplete = false;
+  bool Rewind = false;
+  cFileName FileName(recordingName, false);
+  cUnbufferedFile *ReplayFile = FileName.Open();
+  cRingBufferLinear Buffer(IFG_BUFFER_SIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE);
+  cPatPmtParser PatPmtParser;
+  cFrameDetector FrameDetector;
+  cIndexFile IndexFile(recordingName, true);
+  int BufferChunks = KILOBYTE(1); // no need to read a lot at the beginning when parsing PAT/PMT
+  off_t FileSize = 0;
+  off_t FrameOffset = -1;
+  Skins.QueueMessage(mtInfo, tr("Regenerating index file"));
+  while (Running()) {
+        // Rewind input file:
+        if (Rewind) {
+           ReplayFile = FileName.SetOffset(1);
+           Buffer.Clear();
+           Rewind = false;
+           }
+        // Process data:
+        int Length;
+        uchar *Data = Buffer.Get(Length);
+        if (Data) {
+           if (FrameDetector.Synced()) {
+              // Step 3 - generate the index:
+              if (TsPid(Data) == PATPID)
+                 FrameOffset = FileSize; // the PAT/PMT is at the beginning of an I-frame
+              int Processed = FrameDetector.Analyze(Data, Length);
+              if (Processed > 0) {
+                 if (FrameDetector.NewFrame()) {
+                    IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize);
+                    FrameOffset = -1;
+                    }
+                 FileSize += Processed;
+                 Buffer.Del(Processed);
+                 }
+              }
+           else if (PatPmtParser.Vpid()) {
+              // Step 2 - sync FrameDetector:
+              int Processed = FrameDetector.Analyze(Data, Length);
+              if (Processed > 0) {
+                 if (FrameDetector.Synced()) {
+                    // Synced FrameDetector, so rewind for actual processing:
+                    FrameDetector.Reset();
+                    Rewind = true;
+                    }
+                 Buffer.Del(Processed);
+                 }
+              }
+           else {
+              // Step 1 - parse PAT/PMT:
+              uchar *p = Data;
+              while (Length >= TS_SIZE) {
+                    int Pid = TsPid(p);
+                    if (Pid == 0)
+                       PatPmtParser.ParsePat(p, TS_SIZE);
+                    else if (Pid == PatPmtParser.PmtPid())
+                       PatPmtParser.ParsePmt(p, TS_SIZE);
+                    Length -= TS_SIZE;
+                    p += TS_SIZE;
+                    if (PatPmtParser.Vpid()) {
+                       // Found Vpid, so rewind to sync FrameDetector:
+                       FrameDetector.SetPid(PatPmtParser.Vpid(), PatPmtParser.Vtype());
+                       BufferChunks = IFG_BUFFER_SIZE;
+                       Rewind = true;
+                       break;
+                       }
+                    }
+              Buffer.Del(p - Data);
+              }
+           }
+        // Read data:
+        else if (ReplayFile) {
+           int Result = Buffer.Read(ReplayFile, BufferChunks);
+           if (Result == 0) // EOF
+              ReplayFile = FileName.NextFile();
+           }
+        // Recording has been processed:
+        else {
+           IndexFileComplete = true;
+           break;
+           }
+        }
+  // Delete the index file if the recording has not been processed entirely:
+  if (IndexFileComplete)
+     Skins.QueueMessage(mtInfo, tr("Index file regeneration complete"));
+  else
+     IndexFile.Delete();
+}
+
 // --- cIndexFile ------------------------------------------------------------
 
 #define INDEXFILESUFFIX     "/index"
@@ -1343,6 +1462,9 @@ struct tIndexTs {
   }
   };
 
+#define MAXWAITFORINDEXFILE     10 // max. time to wait for the regenerated index file (seconds)
+#define INDEXFILECHECKINTERVAL 500 // ms between checks for existence of the regenerated index file
+
 cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
 :resumeFile(FileName, IsPesRecording)
 {
@@ -1352,6 +1474,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
   last = -1;
   index = NULL;
   isPesRecording = IsPesRecording;
+  indexFileGenerator = NULL;
   if (FileName) {
      const char *Suffix = isPesRecording ? INDEXFILESUFFIX ".vdr" : INDEXFILESUFFIX;
      fileName = MALLOC(char, strlen(FileName) + strlen(Suffix) + 1);
@@ -1360,6 +1483,18 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
         char *pFileExt = fileName + strlen(fileName);
         strcpy(pFileExt, Suffix);
         int delta = 0;
+        if (!Record && access(fileName, R_OK) != 0) {
+           // Index file doesn't exist, so try to regenerate it:
+           if (!isPesRecording) { // sorry, can only do this for TS recordings
+              resumeFile.Delete(); // just in case
+              indexFileGenerator = new cIndexFileGenerator(FileName);
+              // Wait until the index file exists:
+              time_t tmax = time(NULL) + MAXWAITFORINDEXFILE;
+              do {
+                 cCondWait::SleepMs(INDEXFILECHECKINTERVAL); // start with a sleep, to give it a head start
+                 } while (access(fileName, R_OK) != 0 && time(NULL) < tmax);
+              }
+           }
         if (access(fileName, R_OK) == 0) {
            struct stat buf;
            if (stat(fileName, &buf) == 0) {
@@ -1421,6 +1556,7 @@ cIndexFile::~cIndexFile()
      close(f);
   free(fileName);
   free(index);
+  delete indexFileGenerator;
 }
 
 void cIndexFile::ConvertFromPes(tIndexTs *IndexTs, int Count)
@@ -1598,6 +1734,18 @@ bool cIndexFile::IsStillRecording()
   return f >= 0;
 }
 
+void cIndexFile::Delete(void)
+{
+  if (fileName) {
+     dsyslog("deleting index file '%s'", fileName);
+     if (f >= 0) {
+        close(f);
+        f = -1;
+        }
+     unlink(fileName);
+     }
+}
+
 // --- cFileName -------------------------------------------------------------
 
 #define MAXFILESPERRECORDINGPES 255
diff --git a/recording.h b/recording.h
index 4014c5dd9..bc3479fe4 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.9 2009/08/16 15:35:30 kls Exp $
+ * $Id: recording.h 2.10 2009/11/21 16:12:55 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -220,6 +220,7 @@ class cRecordingUserCommand {
 #define MAXVIDEOFILESIZEDEFAULT MAXVIDEOFILESIZEPES
 
 struct tIndexTs;
+class cIndexFileGenerator;
 
 class cIndexFile {
 private:
@@ -229,6 +230,7 @@ class cIndexFile {
   tIndexTs *index;
   bool isPesRecording;
   cResumeFile resumeFile;
+  cIndexFileGenerator *indexFileGenerator;
   cMutex mutex;
   void ConvertFromPes(tIndexTs *IndexTs, int Count);
   void ConvertToPes(tIndexTs *IndexTs, int Count);
@@ -245,6 +247,7 @@ class cIndexFile {
   int GetResume(void) { return resumeFile.Read(); }
   bool StoreResume(int Index) { return resumeFile.Save(Index); }
   bool IsStillRecording(void);
+  void Delete(void);
   };
 
 class cFileName {
diff --git a/remux.c b/remux.c
index d97314359..c5055b697 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.26 2009/08/16 15:13:42 kls Exp $
+ * $Id: remux.c 2.29 2009/11/22 11:23:27 kls Exp $
  */
 
 #include "remux.h"
@@ -264,8 +264,8 @@ void cPatPmtGenerator::GeneratePat(void)
   uchar *p = pat;
   int i = 0;
   p[i++] = TS_SYNC_BYTE; // TS indicator
-  p[i++] = TS_PAYLOAD_START; // flags (3), pid hi (5)
-  p[i++] = 0x00; // pid lo
+  p[i++] = TS_PAYLOAD_START | (PATPID >> 8); // flags (3), pid hi (5)
+  p[i++] = PATPID & 0xFF; // pid lo
   p[i++] = 0x10; // flags (4), continuity counter (4)
   p[i++] = 0x00; // pointer field (payload unit start indicator is set)
   int PayloadStart = i;
@@ -295,6 +295,7 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
   numPmtPackets = 0;
   if (Channel) {
      int Vpid = Channel->Vpid();
+     int Ppid = Channel->Ppid();
      uchar *p = buf;
      int i = 0;
      p[i++] = 0x02; // table id
@@ -306,8 +307,8 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
      p[i++] = 0xC1 | (pmtVersion << 1); // dummy (2), version number (5), current/next indicator (1)
      p[i++] = 0x00; // section number
      p[i++] = 0x00; // last section number
-     p[i++] = 0xE0 | (Vpid >> 8); // dummy (3), PCR pid hi (5)
-     p[i++] = Vpid; // PCR pid lo
+     p[i++] = 0xE0 | (Ppid >> 8); // dummy (3), PCR pid hi (5)
+     p[i++] = Ppid; // PCR pid lo
      p[i++] = 0xF0; // dummy (4), program info length hi (4)
      p[i++] = 0x00; // program info length lo
 
@@ -732,20 +733,20 @@ void PesDump(const char *Name, const u_char *Data, int Length)
 
 // --- cFrameDetector --------------------------------------------------------
 
+#define EMPTY_SCANNER (0xFFFFFFFF)
+
 cFrameDetector::cFrameDetector(int Pid, int Type)
 {
-  pid = Pid;
-  type = Type;
+  SetPid(Pid, Type);
   synced = false;
   newFrame = independentFrame = false;
   numPtsValues = 0;
   numIFrames = 0;
-  isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or 4
   frameDuration = 0;
   framesInPayloadUnit = framesPerPayloadUnit = 0;
   payloadUnitOfFrame = 0;
   scanning = false;
-  scanner = 0;
+  scanner = EMPTY_SCANNER;
 }
 
 static int CmpUint32(const void *p1, const void *p2)
@@ -755,8 +756,24 @@ static int CmpUint32(const void *p1, const void *p2)
   return 0;
 }
 
+void cFrameDetector::SetPid(int Pid, int Type)
+{
+  pid = Pid;
+  type = Type;
+  isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or 4
+}
+
+void cFrameDetector::Reset(void)
+{
+  newFrame = independentFrame = false;
+  payloadUnitOfFrame = 0;
+  scanning = false;
+  scanner = EMPTY_SCANNER;
+}
+
 int cFrameDetector::Analyze(const uchar *Data, int Length)
 {
+  int SeenPayloadStart = false;
   int Processed = 0;
   newFrame = independentFrame = false;
   while (Length >= TS_SIZE) {
@@ -767,140 +784,156 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
            esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
            return Processed + Skipped;
            }
-        if (TsHasPayload(Data) && !TsIsScrambled(Data) && TsPid(Data) == pid) {
-           if (TsPayloadStart(Data)) {
-              if (!frameDuration) {
-                 // frame duration unknown, so collect a sequenece of PTS values:
-                 if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
-                    const uchar *Pes = Data + TsPayloadOffset(Data);
-                    if (PesHasPts(Pes)) {
-                       ptsValues[numPtsValues] = PesGetPts(Pes);
-                       // check for rollover:
-                       if (numPtsValues && ptsValues[numPtsValues - 1] > 0xF0000000 && ptsValues[numPtsValues] < 0x10000000) {
-                          dbgframes("#");
-                          numPtsValues = 0;
-                          numIFrames = 0;
+        if (TsHasPayload(Data) && !TsIsScrambled(Data)) {
+           int Pid = TsPid(Data);
+           if (Pid == pid) {
+              if (TsPayloadStart(Data)) {
+                 SeenPayloadStart = true;
+                 if (synced && Processed)
+                    return Processed;
+                 if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
+                    return 0; // need more data, in case the frame type is not stored in the first TS packet
+                 if (!frameDuration) {
+                    // frame duration unknown, so collect a sequence of PTS values:
+                    if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
+                       const uchar *Pes = Data + TsPayloadOffset(Data);
+                       if (PesHasPts(Pes)) {
+                          ptsValues[numPtsValues] = PesGetPts(Pes);
+                          // check for rollover:
+                          if (numPtsValues && ptsValues[numPtsValues - 1] > 0xF0000000 && ptsValues[numPtsValues] < 0x10000000) {
+                             dbgframes("#");
+                             numPtsValues = 0;
+                             numIFrames = 0;
+                             }
+                          else
+                             numPtsValues++;
                           }
-                       else
-                          numPtsValues++;
                        }
-                    }
-                 else {
-                    // find the smallest PTS delta:
-                    qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
-                    numPtsValues--;
-                    for (int i = 0; i < numPtsValues; i++)
-                        ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
-                    qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
-                    uint32_t Delta = ptsValues[0];
-                    // determine frame info:
-                    if (isVideo) {
-                       if (Delta % 3600 == 0)
-                          frameDuration = 3600; // PAL, 25 fps
-                       else if (Delta % 3003 == 0)
-                          frameDuration = 3003; // NTSC, 29.97 fps
-                       else if (Delta == 1800) {
-                          frameDuration = 3600; // PAL, 25 fps
-                          framesPerPayloadUnit = -2;
-                          }
-                       else if (Delta == 1501) {
-                          frameDuration = 3003; // NTSC, 29.97 fps
-                          framesPerPayloadUnit = -2;
-                          }
-                       else {
-                          frameDuration = 3600; // unknown, assuming 25 fps
-                          dsyslog("unknown frame duration (%d), assuming 25 fps", Delta);
+                    else {
+                       // find the smallest PTS delta:
+                       qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
+                       numPtsValues--;
+                       for (int i = 0; i < numPtsValues; i++)
+                           ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
+                       qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
+                       uint32_t Delta = ptsValues[0];
+                       // determine frame info:
+                       if (isVideo) {
+                          if (Delta % 3600 == 0)
+                             frameDuration = 3600; // PAL, 25 fps
+                          else if (Delta % 3003 == 0)
+                             frameDuration = 3003; // NTSC, 29.97 fps
+                          else if (Delta == 1800) {
+                             frameDuration = 3600; // PAL, 25 fps
+                             framesPerPayloadUnit = -2;
+                             }
+                          else if (Delta == 1501) {
+                             frameDuration = 3003; // NTSC, 29.97 fps
+                             framesPerPayloadUnit = -2;
+                             }
+                          else {
+                             frameDuration = 3600; // unknown, assuming 25 fps
+                             dsyslog("unknown frame duration (%d), assuming 25 fps", Delta);
+                             }
                           }
+                       else // audio
+                          frameDuration = Delta; // PTS of audio frames is always increasing
+                       dbgframes("\nframe duration = %d  FPS = %5.2f  FPPU = %d\n", frameDuration, 90000.0 / frameDuration, framesPerPayloadUnit);
                        }
-                    else // audio
-                       frameDuration = Delta; // PTS of audio frames is always increasing
-                    dbgframes("\nframe duration = %d  FPS = %5.2f  FPPU = %d\n", frameDuration, 90000.0 / frameDuration, framesPerPayloadUnit);
                     }
+                 scanner = EMPTY_SCANNER;
+                 scanning = true;
                  }
-              scanner = 0;
-              scanning = true;
-              }
-           if (scanning) {
-              int PayloadOffset = TsPayloadOffset(Data);
-              if (TsPayloadStart(Data)) {
-                 PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
-                 if (!framesPerPayloadUnit)
-                    framesPerPayloadUnit = framesInPayloadUnit;
-                 if (DebugFrames && !synced)
-                    dbgframes("/");
-                 }
-              for (int i = PayloadOffset; scanning && i < TS_SIZE; i++) {
-                  scanner <<= 8;
-                  scanner |= Data[i];
-                  switch (type) {
-                    case 0x01: // MPEG 1 video
-                    case 0x02: // MPEG 2 video
-                         if (scanner == 0x00000100) { // Picture Start Code
-                            if (synced && Processed)
-                               return Processed;
-                            newFrame = true;
-                            independentFrame = ((Data[i + 2] >> 3) & 0x07) == 1; // I-Frame
-                            if (synced) {
-                               if (framesPerPayloadUnit <= 1)
-                                  scanning = false;
+              if (scanning) {
+                 int PayloadOffset = TsPayloadOffset(Data);
+                 if (TsPayloadStart(Data)) {
+                    PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
+                    if (!framesPerPayloadUnit)
+                       framesPerPayloadUnit = framesInPayloadUnit;
+                    if (DebugFrames && !synced)
+                       dbgframes("/");
+                    }
+                 for (int i = PayloadOffset; scanning && i < TS_SIZE; i++) {
+                     scanner <<= 8;
+                     scanner |= Data[i];
+                     switch (type) {
+                       case 0x01: // MPEG 1 video
+                       case 0x02: // MPEG 2 video
+                            if (scanner == 0x00000100) { // Picture Start Code
+                               scanner = EMPTY_SCANNER;
+                               if (synced && !SeenPayloadStart && Processed)
+                                  return Processed; // flush everything before this new frame
+                               newFrame = true;
+                               independentFrame = ((Data[i + 2] >> 3) & 0x07) == 1; // I-Frame
+                               if (synced) {
+                                  if (framesPerPayloadUnit <= 1)
+                                     scanning = false;
+                                  }
+                               else {
+                                  framesInPayloadUnit++;
+                                  if (independentFrame)
+                                     numIFrames++;
+                                  dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
+                                  }
+                               if (synced)
+                                  return Processed + TS_SIZE; // flag this new frame
                                }
-                            else {
-                               framesInPayloadUnit++;
-                               if (independentFrame)
-                                  numIFrames++;
-                               dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
+                            break;
+                       case 0x1B: // MPEG 4 video
+                            if (scanner == 0x00000109) { // Access Unit Delimiter
+                               scanner = EMPTY_SCANNER;
+                               if (synced && !SeenPayloadStart && Processed)
+                                  return Processed; // flush everything before this new frame
+                               newFrame = true;
+                               independentFrame = Data[i + 1] == 0x10;
+                               if (synced) {
+                                  if (framesPerPayloadUnit < 0) {
+                                     payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
+                                     if (payloadUnitOfFrame != 0 && independentFrame)
+                                        payloadUnitOfFrame = 0;
+                                     if (payloadUnitOfFrame)
+                                        newFrame = false;
+                                     }
+                                  if (framesPerPayloadUnit <= 1)
+                                     scanning = false;
+                                  }
+                               else {
+                                  framesInPayloadUnit++;
+                                  if (independentFrame)
+                                     numIFrames++;
+                                  dbgframes("%02X ", Data[i + 1]);
+                                  }
+                               if (synced)
+                                  return Processed + TS_SIZE; // flag this new frame
                                }
-                            scanner = 0;
-                            }
-                         break;
-                    case 0x1B: // MPEG 4 video
-                         if (scanner == 0x00000109) { // Access Unit Delimiter
+                            break;
+                       case 0x04: // MPEG audio
+                       case 0x06: // AC3 audio
                             if (synced && Processed)
                                return Processed;
                             newFrame = true;
-                            independentFrame = Data[i + 1] == 0x10;
-                            if (synced) {
-                               if (framesPerPayloadUnit < 0) {
-                                  payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
-                                  if (payloadUnitOfFrame != 0 && independentFrame)
-                                     payloadUnitOfFrame = 0;
-                                  if (payloadUnitOfFrame)
-                                     newFrame = false;
-                                  }
-                               if (framesPerPayloadUnit <= 1)
-                                  scanning = false;
-                               }
-                            else {
-                               framesInPayloadUnit++;
-                               if (independentFrame)
+                            independentFrame = true;
+                            if (!synced) {
+                               framesInPayloadUnit = 1;
+                               if (TsPayloadStart(Data))
                                   numIFrames++;
-                               dbgframes("%02X ", Data[i + 1]);
                                }
-                            scanner = 0;
-                            }
-                         break;
-                    case 0x04: // MPEG audio
-                    case 0x06: // AC3 audio
-                         if (synced && Processed)
-                            return Processed;
-                         newFrame = true;
-                         independentFrame = true;
-                         if (!synced) {
-                            framesInPayloadUnit = 1;
-                            if (TsPayloadStart(Data))
-                               numIFrames++;
-                            }
-                         scanning = false;
-                         break;
-                    default: esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
-                             pid = 0; // let's just ignore any further data
+                            scanning = false;
+                            break;
+                       default: esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
+                                pid = 0; // let's just ignore any further data
+                       }
+                     }
+                 if (!synced && frameDuration && independentFrame) {
+                    synced = true;
+                    dbgframes("*");
+                    Reset();
+                    return Processed + TS_SIZE;
                     }
-                  }
-              if (!synced && frameDuration && independentFrame) {
-                 synced = true;
-                 dbgframes("*");
                  }
               }
+           else if (Pid == PATPID && synced && Processed)
+              return Processed; // allow the caller to see any PAT packets
            }
         Data += TS_SIZE;
         Length -= TS_SIZE;
diff --git a/remux.h b/remux.h
index e6025fa59..ad099c6a4 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.19 2009/08/16 15:15:33 kls Exp $
+ * $Id: remux.h 2.20 2009/11/21 15:55:34 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -49,6 +49,7 @@ class cRemux {
 #define TS_ADAPT_TP_PRIVATE   0x02
 #define TS_ADAPT_EXTENSION    0x01
 
+#define PATPID 0x0000 // PAT PID (constant 0)
 #define MAXPID 0x2000 // for arrays that use a PID as the index
 
 inline bool TsHasPayload(const uchar *p)
@@ -238,8 +239,11 @@ class cPatPmtParser {
        ///< Returns the PMT pid as defined by the current PAT.
        ///< If no PAT has been received yet, -1 will be returned.
   int Vpid(void) { return vpid; }
-       ///< Returns the video pid as defined by the current PMT.
+       ///< Returns the video pid as defined by the current PMT, or 0 if no video
+       ///< pid has been detected, yet.
   int Vtype(void) { return vtype; }
+       ///< Returns the video stream type as defined by the current PMT, or 0 if no video
+       ///< stream type has been detected, yet.
   };
 
 // TS to PES converter:
@@ -299,6 +303,8 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 // Frame detector:
 
+#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 2
+
 class cFrameDetector {
 private:
   enum { MaxPtsValues = 150 };
@@ -320,7 +326,15 @@ class cFrameDetector {
   bool scanning;
   uint32_t scanner;
 public:
-  cFrameDetector(int Pid, int Type);
+  cFrameDetector(int Pid = 0, int Type = 0);
+      ///< Sets up a frame detector for the given Pid and stream Type.
+      ///< If no Pid and Type is given, they need to be set by a separate
+      ///< call to SetPid().
+  void SetPid(int Pid, int Type);
+      ///< Sets the Pid and stream Type to detect frames for.
+  void Reset(void);
+      ///< Resets any counters and flags used while syncing and prepares
+      ///< the frame detector for actual work.
   int Analyze(const uchar *Data, int Length);
       ///< Analyzes the TS packets pointed to by Data. Length is the number of
       ///< bytes Data points to, and must be a multiple of 188.
diff --git a/ringbuffer.c b/ringbuffer.c
index fd8123ec2..1bdeaccc6 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 2.2 2009/05/17 10:05:17 kls Exp $
+ * $Id: ringbuffer.c 2.3 2009/11/22 11:14:36 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -200,7 +200,7 @@ int cRingBufferLinear::Available(void)
 
 void cRingBufferLinear::Clear(void)
 {
-  tail = head;
+  tail = head = margin;
 #ifdef DEBUGRINGBUFFERS
   lastHead = head;
   lastTail = tail;
@@ -217,7 +217,8 @@ int cRingBufferLinear::Read(int FileHandle, int Max)
   int free = (diff > 0) ? diff - 1 : Size() - head;
   if (Tail <= margin)
      free--;
-  int Count = 0;
+  int Count = -1;
+  errno = EAGAIN;
   if (free > 0) {
      if (0 < Max && Max < free)
         free = Max;
@@ -247,6 +248,44 @@ int cRingBufferLinear::Read(int FileHandle, int Max)
   return Count;
 }
 
+int cRingBufferLinear::Read(cUnbufferedFile *File, int Max)
+{
+  int Tail = tail;
+  int diff = Tail - head;
+  int free = (diff > 0) ? diff - 1 : Size() - head;
+  if (Tail <= margin)
+     free--;
+  int Count = -1;
+  errno = EAGAIN;
+  if (free > 0) {
+     if (0 < Max && Max < free)
+        free = Max;
+     Count = File->Read(buffer + head, free);
+     if (Count > 0) {
+        int Head = head + Count;
+        if (Head >= Size())
+           Head = margin;
+        head = Head;
+        if (statistics) {
+           int fill = head - Tail;
+           if (fill < 0)
+              fill = Size() + fill;
+           else if (fill >= Size())
+              fill = Size() - 1;
+           UpdatePercentage(fill);
+           }
+        }
+     }
+#ifdef DEBUGRINGBUFFERS
+  lastHead = head;
+  lastPut = Count;
+#endif
+  EnableGet();
+  if (free == 0)
+     WaitForPut();
+  return Count;
+}
+
 int cRingBufferLinear::Put(const uchar *Data, int Count)
 {
   if (Count > 0) {
diff --git a/ringbuffer.h b/ringbuffer.h
index e470db9b8..83281b288 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 2.1 2009/02/24 11:31:32 kls Exp $
+ * $Id: ringbuffer.h 2.2 2009/11/08 11:52:25 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -84,6 +84,8 @@ class cRingBufferLinear : public cRingBuffer {
     ///< Only one actual read() call is done.
     ///< \return Returns the number of bytes actually read and stored, or
     ///< an error value from the actual read() call.
+  int Read(cUnbufferedFile *File, int Max = 0);
+    ///< Like Read(int FileHandle, int Max), but reads fom a cUnbufferedFile).
   int Put(const uchar *Data, int Count);
     ///< Puts at most Count bytes of Data into the ring buffer.
     ///< \return Returns the number of bytes actually stored.
diff --git a/sources.conf b/sources.conf
index 078897f28..c9b385cac 100644
--- a/sources.conf
+++ b/sources.conf
@@ -12,7 +12,7 @@
 # '/' means same (or very little deviation) orbital position & host.
 # A value in () means this satellite is still in it's test phase.
 #
-# Please contact kls@cadsoft.de before assigning a new code
+# Please contact kls@tvdr.de before assigning a new code
 # to a description, in order to keep them unique.
 
 # Satellites
diff --git a/svdrp.c b/svdrp.c
index 416b86980..5729052a2 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.5 2009/06/06 14:03:55 kls Exp $
+ * $Id: svdrp.c 2.6 2009/10/18 14:08:58 kls Exp $
  */
 
 #include "svdrp.h"
@@ -887,7 +887,7 @@ void cSVDRP::CmdHELP(const char *Option)
          PrintHelpTopics(hp);
          }
      Reply(-214, "To report bugs in the implementation send email to");
-     Reply(-214, "    vdr-bugs@cadsoft.de");
+     Reply(-214, "    vdr-bugs@tvdr.de");
      }
   Reply(214, "End of HELP info");
 }
diff --git a/tools.c b/tools.c
index 9ef61f57d..fae876355 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.3 2009/05/31 11:43:24 kls Exp $
+ * $Id: tools.c 2.4 2009/11/06 15:21:17 kls Exp $
  */
 
 #include "tools.h"
@@ -279,11 +279,11 @@ cString itoa(int n)
 
 bool EntriesOnSameFileSystem(const char *File1, const char *File2)
 {
-  struct statfs statFs;
-  if (statfs(File1, &statFs) == 0) {
-     fsid_t fsid1 = statFs.f_fsid;
-     if (statfs(File2, &statFs) == 0)
-        return memcmp(&statFs.f_fsid, &fsid1, sizeof(fsid1)) == 0;
+  struct stat st;
+  if (stat(File1, &st) == 0) {
+     dev_t dev1 = st.st_dev;
+     if (stat(File2, &st) == 0)
+        return st.st_dev == dev1;
      else
         LOG_ERROR_STR(File2);
      }
diff --git a/vdr.1 b/vdr.1
index 62edad8e5..97780dd59 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.2 2009/08/16 10:28:39 kls Exp $
+.\" $Id: vdr.1 2.3 2009/10/18 14:09:03 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -239,7 +239,7 @@ be used to trigger an update of the list of recordings in the "Recordings" menu.
 Written by Klaus Schmidinger, with contributions from many others.
 See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
-Report bugs to <vdr\-bugs@cadsoft.de>.
+Report bugs to <vdr\-bugs@tvdr.de>.
 .SH COPYRIGHT
 Copyright \(co 2008 Klaus Schmidinger.
 
diff --git a/vdr.5 b/vdr.5
index 9e01fd4db..e1023af1b 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.6 2009/01/06 12:37:35 kls Exp $
+.\" $Id: vdr.5 2.7 2009/10/18 14:09:07 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -688,7 +688,7 @@ not to collide with the ids of existing data.
 .SH AUTHOR
 Written by Klaus Schmidinger.
 .SH REPORTING BUGS
-Report bugs to <vdr\-bugs@cadsoft.de>.
+Report bugs to <vdr\-bugs@tvdr.de>.
 .SH COPYRIGHT
 Copyright \(co 2008 Klaus Schmidinger.
 
diff --git a/vdr.c b/vdr.c
index 2384895c3..f03409ac9 100644
--- a/vdr.c
+++ b/vdr.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
- * The author can be reached at kls@cadsoft.de
+ * The author can be reached at kls@tvdr.de
  *
- * The project's page is at http://www.cadsoft.de/vdr
+ * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.10 2009/05/21 11:14:48 kls Exp $
+ * $Id: vdr.c 2.12 2009/10/25 14:45:47 kls Exp $
  */
 
 #include <getopt.h>
@@ -507,6 +507,7 @@ int main(int argc, char *argv[])
      stdout = freopen(Terminal, "w", stdout);
      stderr = freopen(Terminal, "w", stderr);
      HasStdin = true;
+     tcgetattr(STDIN_FILENO, &savedTm);
      }
 
   isyslog("VDR version %s started", VDRVERSION);

From 939081e274d0a9868e5ba9a7951666ad508afb96 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Wed, 6 Jan 2010 13:34:00 +0100
Subject: [PATCH 197/307] =?UTF-8?q?Version=201.7.11=20-=20Fixed=20resettin?=
 =?UTF-8?q?g=20the=20file=20size=20when=20regenerating=20the=20index=20fil?=
 =?UTF-8?q?e.=20-=20The=20new=20function=20cDevice::PatPmtParser()=20can?=
 =?UTF-8?q?=20be=20used=20in=20derived=20devices=20to=20access=20=20=20the?=
 =?UTF-8?q?=20PAT/PMT=20of=20the=20currently=20replayed=20material.=20-=20?=
 =?UTF-8?q?Updated=20the=20Italian=20OSD=20texts=20(thanks=20to=20Diego=20?=
 =?UTF-8?q?Pierotto).=20-=20The=20PCR=20pid=20in=20generated=20PMTs=20is?=
 =?UTF-8?q?=20now=20set=20to=200x1FFF=20("no=20PCR=20pid")=20in=20=20=20cP?=
 =?UTF-8?q?atPmtGenerator::GeneratePmt(),=20because=20VDR=20doesn't=20reco?=
 =?UTF-8?q?rd=20the=20PCR=20pid.=20-=20Updated=20the=20Estonian=20OSD=20te?=
 =?UTF-8?q?xts=20(thanks=20to=20Arthur=20Konovalov).=20-=20The=20'sky'=20p?=
 =?UTF-8?q?lugin=20is=20no=20longer=20part=20of=20the=20VDR=20source.=20-?=
 =?UTF-8?q?=20Improved=20SPU=20handling=20on=20devices=20with=20limited=20?=
 =?UTF-8?q?OSD=20capabilities=20(thanks=20to=20=20=20Matthieu=20Castet).?=
 =?UTF-8?q?=20-=20Several=20code=20modifications=20to=20avoid=20compiler?=
 =?UTF-8?q?=20warnings=20(thanks=20to=20Winfried=20K=C3=B6hler).=20-=20Add?=
 =?UTF-8?q?ed=20stream=20type=2011172=20AUDIO=20to=20cPatPmtParser::ParseP?=
 =?UTF-8?q?mt()=20(thanks=20to=20Johann=20=20=20Friedrichs).=20-=20Removed?=
 =?UTF-8?q?=20debug=20output=20of=20'-'=20from=20cTransfer::Receive().=20-?=
 =?UTF-8?q?=20Added=20defines=20for=20large=20files=20to=20the=20'newplugi?=
 =?UTF-8?q?n'=20script=20(reported=20by=20Udo=20Richter).=20-=20Removed=20?=
 =?UTF-8?q?the=20workaround=20for=20short=20channel=20names=20of=20"Kabel?=
 =?UTF-8?q?=20Deutschland",=20because=20=20=20apparently=20they=20now=20ha?=
 =?UTF-8?q?ve=20their=20data=20according=20to=20the=20DVB=20standard=20(th?=
 =?UTF-8?q?anks=20to=20=20=20Johann=20Friedrichs).=20-=20Some=20fixes=20to?=
 =?UTF-8?q?=20dvbspu.[hc]=20(thanks=20to=20Johann=20Friedrichs).=20-=20Fix?=
 =?UTF-8?q?ed=20a=20busy=20loop=20when=20moving=20editing=20marks=20(thank?=
 =?UTF-8?q?s=20to=20Johann=20Friedrichs).=20-=20Updated=20sources.conf=20(?=
 =?UTF-8?q?thanks=20to=20Derek=20Kelly).=20-=20Modified=20cCharSetConv=20s?=
 =?UTF-8?q?o=20that=20it=20can=20be=20used=20to=20convert=20from=20"whatev?=
 =?UTF-8?q?er=20VDR=20uses"=20=20=20to=20a=20given=20code=20(thanks=20to?=
 =?UTF-8?q?=20Joachim=20Wilke).=20-=20Channel=20names=20containing=20comma?=
 =?UTF-8?q?s=20are=20now=20handled=20correctly=20in=20channels.conf.=20=20?=
 =?UTF-8?q?=20If=20a=20channel's=20short=20name=20contains=20a=20comma,=20?=
 =?UTF-8?q?it=20is=20replaced=20with=20a=20'.'.=20-=20cDevice=20now=20logs?=
 =?UTF-8?q?=20the=20device=20number=20when=20a=20new=20device=20is=20creat?=
 =?UTF-8?q?ed.=20-=20Fixed=20handling=20STREAMTYPE=5F11172=5FAUDIO=20in=20?=
 =?UTF-8?q?cPatPmtParser::ParsePmt().=20-=20cParsePatPmt=20now=20has=20fun?=
 =?UTF-8?q?ctions=20to=20retrieve=20the=20audio,=20dolby=20and=20subtitle?=
 =?UTF-8?q?=20pids.=20-=20cPatFilter::Process()=20now=20only=20stores=20CA?=
 =?UTF-8?q?=20descriptors=20for=20video=20and=20audio=20pids=20=20=20(than?=
 =?UTF-8?q?ks=20to=20Francesco=20Saverio=20Schiavarelli=20for=20reporting?=
 =?UTF-8?q?=20a=20problem=20with=20channels=20=20=20that=20have=20some=20e?=
 =?UTF-8?q?ncrypted=20components=20that=20VDR=20doesn't=20use).=20-=20cDev?=
 =?UTF-8?q?ice::AddPid()=20now=20stores=20the=20stream=20type=20of=20the?=
 =?UTF-8?q?=20given=20pid=20(thanks=20to=20Andreas=20=20=20Regel).=20-=20A?=
 =?UTF-8?q?dded=20cFont::FontName()=20and=20cFont::Size()=20(thanks=20to?=
 =?UTF-8?q?=20Andreas=20Regel).=20-=20cPatPmtParser=20now=20also=20stores?=
 =?UTF-8?q?=20the=20audio=20stream=20types.=20-=20The=20support=20for=20fu?=
 =?UTF-8?q?ll=20featured=20DVB=20cards=20of=20the=20TT/FuSi=20design=20has?=
 =?UTF-8?q?=20been=20moved=20=20=20into=20the=20new=20plugin=20'dvbsddevic?=
 =?UTF-8?q?e'.=20On=20systems=20that=20use=20such=20a=20card=20as=20their?=
 =?UTF-8?q?=20=20=20primary=20device,=20this=20plugin=20now=20needs=20to?=
 =?UTF-8?q?=20be=20loaded=20when=20running=20VDR=20in=20order=20=20=20to?=
 =?UTF-8?q?=20view=20live=20or=20recorded=20video.=20If=20the=20plugin=20i?=
 =?UTF-8?q?s=20not=20loaded,=20the=20card=20will=20=20=20be=20treated=20li?=
 =?UTF-8?q?ke=20a=20budget=20DVB=20card,=20and=20there=20will=20be=20no=20?=
 =?UTF-8?q?OSD=20or=20viewing=20=20=20capability.=20-=20Fixed=20handling?=
 =?UTF-8?q?=20the=20"CA=20PMT"=20generation=20(revised=20a=20change=20not?=
 =?UTF-8?q?=20mentioned=20in=20version=20=20=201.7.9's=20changes,=20which?=
 =?UTF-8?q?=20caused=20a=20malfunction=20with=20Conax=20and=20Viaccess=20C?=
 =?UTF-8?q?AMs).=20-=20Fixed=20stopping=20subtitle=20display=20when=20swit?=
 =?UTF-8?q?ching=20the=20primary=20device=20(thanks=20to=20=20=20Anssi=20H?=
 =?UTF-8?q?annula).=20=20=20IMPORTANT=20NOTE=20TO=20PLUGIN=20AUTHORS:=20a?=
 =?UTF-8?q?=20plugin=20that=20implements=20a=20derived=20cDevice=20=20=20c?=
 =?UTF-8?q?lass=20that=20can=20replay=20video=20must=20now=20call=20the=20?=
 =?UTF-8?q?MakePrimaryDevice()=20function=20of=20=20=20its=20base=20class.?=
 =?UTF-8?q?=20-=20Fixed=20compiler=20warnings=20"format=20not=20a=20string?=
 =?UTF-8?q?=20literal=20and=20no=20format=20arguments"=20=20=20in=20some?=
 =?UTF-8?q?=20syslog=20calls=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20The?=
 =?UTF-8?q?=20new=20command=20line=20options=20--edit=20and=20--genindex?=
 =?UTF-8?q?=20can=20be=20used=20to=20edit=20a=20=20=20recording=20or=20gen?=
 =?UTF-8?q?erate=20its=20index=20without=20actually=20starting=20the=20ent?=
 =?UTF-8?q?ire=20VDR=20=20=20(based=20on=20a=20patch=20from=20Helmut=20Aue?=
 =?UTF-8?q?r).=20-=20Improved=20the=20description=20of=20the=20transponder?=
 =?UTF-8?q?=20parameters=20in=20vdr.5=20(thanks=20to=20=20=20Winfried=20K?=
 =?UTF-8?q?=C3=B6hler).=20-=20Avoiding=20setting=20the=20video=20stream=20?=
 =?UTF-8?q?type=20to=202=20if=20the=20vpid=20is=200=20(problem=20reported?=
 =?UTF-8?q?=20=20=20by=20Arthur=20Konovalov).=20-=20Implemented=20handling?=
 =?UTF-8?q?=20the=20"Content=20Descriptor"=20(based=20on=20a=20patch=20fro?=
 =?UTF-8?q?m=20Rolf=20=20=20Ahrenberg).=20The=20'classic',=20'sttng'=20and?=
 =?UTF-8?q?=20'curses'=20skins=20display=20the=20textual=20=20=20represent?=
 =?UTF-8?q?ation=20of=20the=20content=20descriptors=20as=20"genre".=20The?=
 =?UTF-8?q?=20epg.data=20file=20stores=20=20=20the=20genre=20using=20the?=
 =?UTF-8?q?=20tag=20character=20'G'.=20-=20Implemented=20handling=20the=20?=
 =?UTF-8?q?"Parental=20Rating=20Descriptor"=20(based=20on=20a=20patch=20fr?=
 =?UTF-8?q?om=20Rolf=20=20=20Ahrenberg).=20The=20'classic',=20'sttng'=20an?=
 =?UTF-8?q?d=20'curses'=20skins=20display=20the=20parental=20=20=20rating?=
 =?UTF-8?q?=20(if=20given)=20in=20their=20event=20displays.=20The=20epg.da?=
 =?UTF-8?q?ta=20file=20stores=20=20=20the=20parental=20rating=20using=20th?=
 =?UTF-8?q?e=20tag=20character=20'R'.=20=20=20IMPORTANT=20NOTE:=20if=20VDR?=
 =?UTF-8?q?=20doesn't=20display=20a=20parental=20rating,=20this=20does=20n?=
 =?UTF-8?q?ot=20=20=20necessarily=20mean=20that=20the=20given=20programme?=
 =?UTF-8?q?=20is=20suitable=20for=20all=20audiences!=20-=20Rearranged=20cE?=
 =?UTF-8?q?vent=20members=20to=20minimize=20memory=20waste.=20-=20After=20?=
 =?UTF-8?q?a=20CLRE=20command,=20no=20further=20EPG=20processing=20is=20no?=
 =?UTF-8?q?w=20done=20for=2010=20seconds,=20=20=20so=20that=20data=20sent?=
 =?UTF-8?q?=20with=20subsequent=20PUTE=20commands=20doesn't=20interfere=20?=
 =?UTF-8?q?with=20data=20=20=20from=20the=20broadcasters=20(suggested=20by?=
 =?UTF-8?q?=20Helmut=20Auer).=20-=20Added=20support=20for=20DVB=20cards=20?=
 =?UTF-8?q?with=20multiple=20fontends.=20Note=20that=20this=20only=20=20?=
 =?UTF-8?q?=20works=20for=20DVB=20cards=20where=20each=20frontend=20can=20?=
 =?UTF-8?q?be=20used=20independently=20of=20all=20=20=20the=20others=20on?=
 =?UTF-8?q?=20the=20same=20adapter.=20-=20Fixed=20plugin=20arguments=20cor?=
 =?UTF-8?q?ruption=20with=20glibc=202.11=20on=20x86=5F64=20(thanks=20to=20?=
 =?UTF-8?q?=20=20Anssi=20Hannula).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                                  |  31 +-
 HISTORY                                       |  79 ++
 Makefile                                      |   4 +-
 PLUGINS/src/{sky => dvbsddevice}/COPYING      |   0
 PLUGINS/src/dvbsddevice/HISTORY               |  12 +
 PLUGINS/src/{sky => dvbsddevice}/Makefile     |  43 +-
 PLUGINS/src/dvbsddevice/README                |  20 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c         |  35 +
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c       | 799 ++++++++++++++++
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h       | 107 +++
 .../src/dvbsddevice/dvbsdffosd.c              |  36 +-
 PLUGINS/src/dvbsddevice/dvbsdffosd.h          |  22 +
 PLUGINS/src/hello/HISTORY                     |   6 +-
 PLUGINS/src/hello/hello.c                     |   6 +-
 PLUGINS/src/pictures/HISTORY                  |   4 +
 PLUGINS/src/pictures/pictures.c               |   6 +-
 PLUGINS/src/skincurses/HISTORY                |   5 +
 PLUGINS/src/skincurses/skincurses.c           |  26 +-
 PLUGINS/src/sky/HISTORY                       |  70 --
 PLUGINS/src/sky/README                        |  49 -
 PLUGINS/src/sky/channels.conf.sky             |  34 -
 PLUGINS/src/sky/getskyepg.pl                  | 260 -----
 PLUGINS/src/sky/lircd.conf.sky                | 299 ------
 PLUGINS/src/sky/sky.c                         | 303 ------
 Syd                                           |   0
 channels.c                                    |  31 +-
 channels.h                                    |   8 +-
 ci.c                                          |  42 +-
 config.c                                      |   4 +-
 config.h                                      |  10 +-
 cutter.c                                      |  30 +-
 cutter.h                                      |   4 +-
 device.c                                      |  14 +-
 device.h                                      |  12 +-
 diseqc.c                                      |   6 +-
 dvbdevice.c                                   | 899 +++---------------
 dvbdevice.h                                   | 112 +--
 dvbosd.h                                      |  23 -
 dvbplayer.c                                   |   6 +-
 dvbspu.c                                      | 128 ++-
 dvbspu.h                                      |   8 +-
 dvbsubtitle.c                                 |  15 +-
 eit.c                                         |  51 +-
 eit.h                                         |   5 +-
 epg.c                                         | 193 +++-
 epg.h                                         |  27 +-
 font.c                                        |   9 +-
 font.h                                        |   7 +-
 libsi/si.c                                    |   3 +-
 libsi/si.h                                    |   4 +-
 menu.c                                        |  13 +-
 menuitems.c                                   |   7 +-
 newplugin                                     |   4 +-
 nit.c                                         |   3 +-
 osd.c                                         |   8 +-
 pat.c                                         |  20 +-
 plugin.c                                      |  10 +-
 po/ca_ES.po                                   | 243 ++++-
 po/cs_CZ.po                                   | 243 ++++-
 po/da_DK.po                                   | 243 ++++-
 po/de_DE.po                                   | 243 ++++-
 po/el_GR.po                                   | 243 ++++-
 po/es_ES.po                                   | 243 ++++-
 po/et_EE.po                                   | 343 ++++++-
 po/fi_FI.po                                   | 243 ++++-
 po/fr_FR.po                                   | 243 ++++-
 po/hr_HR.po                                   | 243 ++++-
 po/hu_HU.po                                   | 243 ++++-
 po/it_IT.po                                   | 249 ++++-
 po/lt_LT.po                                   | 243 ++++-
 po/nl_NL.po                                   | 243 ++++-
 po/nn_NO.po                                   | 243 ++++-
 po/pl_PL.po                                   | 243 ++++-
 po/pt_PT.po                                   | 243 ++++-
 po/ro_RO.po                                   | 243 ++++-
 po/ru_RU.po                                   | 243 ++++-
 po/sk_SK.po                                   | 243 ++++-
 po/sl_SI.po                                   | 243 ++++-
 po/sv_SE.po                                   | 243 ++++-
 po/tr_TR.po                                   | 243 ++++-
 po/uk_UA.po                                   | 243 ++++-
 po/zh_CN.po                                   | 243 ++++-
 receiver.c                                    |   4 +-
 recorder.c                                    |   4 +-
 recording.c                                   |  66 +-
 recording.h                                   |  10 +-
 remote.c                                      |   8 +-
 remux.c                                       |  40 +-
 remux.h                                       |  35 +-
 sdt.c                                         |  13 +-
 skinclassic.c                                 |  30 +-
 skinsttng.c                                   |  37 +-
 sources.conf                                  |   5 +-
 svdrp.c                                       |  11 +-
 tools.c                                       |   9 +-
 tools.h                                       |  17 +-
 transfer.c                                    |   3 +-
 vdr.1                                         |  18 +-
 vdr.5                                         |  65 +-
 vdr.c                                         |  14 +-
 100 files changed, 8342 insertions(+), 2200 deletions(-)
 rename PLUGINS/src/{sky => dvbsddevice}/COPYING (100%)
 create mode 100644 PLUGINS/src/dvbsddevice/HISTORY
 rename PLUGINS/src/{sky => dvbsddevice}/Makefile (60%)
 create mode 100644 PLUGINS/src/dvbsddevice/README
 create mode 100644 PLUGINS/src/dvbsddevice/dvbsddevice.c
 create mode 100644 PLUGINS/src/dvbsddevice/dvbsdffdevice.c
 create mode 100644 PLUGINS/src/dvbsddevice/dvbsdffdevice.h
 rename dvbosd.c => PLUGINS/src/dvbsddevice/dvbsdffosd.c (87%)
 create mode 100644 PLUGINS/src/dvbsddevice/dvbsdffosd.h
 delete mode 100644 PLUGINS/src/sky/HISTORY
 delete mode 100644 PLUGINS/src/sky/README
 delete mode 100644 PLUGINS/src/sky/channels.conf.sky
 delete mode 100755 PLUGINS/src/sky/getskyepg.pl
 delete mode 100644 PLUGINS/src/sky/lircd.conf.sky
 delete mode 100644 PLUGINS/src/sky/sky.c
 create mode 100644 Syd
 delete mode 100644 dvbosd.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2e0eab90f..1c1da6902 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -600,6 +600,9 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to improve logging system time changes to avoid problems on slow
  systems under heavy load
  for making the SVDRP command PUTE support reading the EPG data from a given file
+ for a patch that was used to implement the command line options --edit and
+ --genindex
+ for suggesting to disable EPG processing for a while after a CLRE command
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1083,6 +1086,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  contain UTF-8 characters
  for fixing wrong bracketing in cChannel::SubtitlingType() etc.
  for fixing handling DVB subtitles for PES recordings
+ for fixing compiler warnings "format not a string literal and no format arguments"
+ in some syslog calls
+ for a patch that was used to implement handling the "component descriptor" ("genre")
+ for a patch that was used to implement handling the "parental rating descriptor"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1361,6 +1368,8 @@ Andreas Regel <andreas.regel@gmx.de>
  for fixing handling numeric keys in the channel display after switching channel
  groups
  for adding some missing 'const' statements to cBitmap
+ for making cDevice::AddPid() store the stream type of the given pid
+ for adding cFont::FontName() and cFont::Size()
 
 Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1570,12 +1579,13 @@ Dick Streefland <Dick.Streefland@xs4all.nl>
 Kimmo Tykkala <tykkala@iki.fi>
  for pointing out a problem in showing the replay mode if the OSD is currently in use
 
-Arthur Konovalov <kasjas@hot.ee>
+Arthur Konovalov <artlov@gmail.com>
  for translating OSD texts to the Estonian language
  for fixing a missing ',' in the Greek OSD texts
  for fixing a missing ',' in the Swedish OSD texts
  for reporting problems with CAMs when checking the CAM status too frequently
  for reporting references to old *.vdr file names in MANUAL
+ for reporting that the video stream type was set to 2 even if the vpid was 0
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -1651,6 +1661,7 @@ Udo Richter <udo_richter@gmx.de>
  for reporting wrong variable types in cIndexFile
  for reporting a problem with cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in
  case only part of the buffer has been accepted by the device
+ for reporting missing defines for large files in the 'newplugin' script
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1687,6 +1698,8 @@ Joachim Wilke <vdr@joachim-wilke.de>
  for reporting a problem with cStatus::MsgOsdTextItem() being called without a text
  for reporting a missing install-i18n in the install target in the Makefile
  for adding a missing 'const' to cRecording::FramesPerSecond()
+ for modifying cCharSetConv so that it can be used to convert from "whatever VDR uses"
+ to a given code
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -2250,6 +2263,8 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for suggesting to change the default for LOCDIR in Makefile and Make.config.template
  to "./locale", so that internationalization works by default when running VDR
  from within its source directory
+ for fixing stopping subtitle display when switching the primary device
+ for fixing plugin arguments corruption with glibc 2.11 on x86_64
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2459,6 +2474,8 @@ Michael Nork <mnork0@gmx.net>
 
 Winfried K�hler <w_koehl@gmx.de>
  for fixing wrong value for TableIdBAT in libsi/si.h
+ for making several code modifications to avoid compiler warnings
+ for improving the description of the transponder parameters in vdr.5
 
 Igor M. Liplianin <liplianin@tut.by>
  for a patch that was used to convert VDR to the S2API driver API
@@ -2473,6 +2490,10 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for fixing incrementing the continuity counter in cPatPmtGenerator::GetPmt()
  for pointing out that "DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  -D_LARGEFILE64_SOURCE" should be added to Make.config.
+ for adding stream type 11172 AUDIO to cPatPmtParser::ParsePmt()
+ for removing the workaround for short channel names of "Kabel Deutschland"
+ for some fixes to dvbspu.[hc]
+ for fixing a busy loop when moving editing marks
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -2481,6 +2502,7 @@ Derek Kelly (user.vdr@gmail.com)
  for fixing handling the 'new' indicator in the recordings menu for TS recordings
  for reporting a problem with HD NTSC broadcasts that split frames over several payload
  units
+ for updating sources.conf
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2514,3 +2536,10 @@ Milan Hrala <hrala.milan@gmail.com>
 
 Andreas Schaefers <andreas_schaefers@gmx.de>
  for adding the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()
+
+Matthieu Castet <castet.matthieu@free.fr>
+ for improving SPU handling on devices with limited OSD capabilities
+
+Francesco Saverio Schiavarelli <fschiava@libero.it>
+  for reporting a problem with channels that have some encrypted components that
+  VDR doesn't use
diff --git a/HISTORY b/HISTORY
index 70321b015..84430d592 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6196,3 +6196,82 @@ Video Disk Recorder Revision History
   cause nothing but trouble. Besides, the core VDR doesn't use this, anyway.
 - Fixed the default value for "Pause key handling" in the MANUAL (reported by
   Diego Pierotto).
+
+2010-01-06: Version 1.7.11
+
+- Fixed resetting the file size when regenerating the index file.
+- The new function cDevice::PatPmtParser() can be used in derived devices to access
+  the PAT/PMT of the currently replayed material.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- The PCR pid in generated PMTs is now set to 0x1FFF ("no PCR pid") in
+  cPatPmtGenerator::GeneratePmt(), because VDR doesn't record the PCR pid.
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- The 'sky' plugin is no longer part of the VDR source.
+- Improved SPU handling on devices with limited OSD capabilities (thanks to
+  Matthieu Castet).
+- Several code modifications to avoid compiler warnings (thanks to Winfried K�hler).
+- Added stream type 11172 AUDIO to cPatPmtParser::ParsePmt() (thanks to Johann
+  Friedrichs).
+- Removed debug output of '-' from cTransfer::Receive().
+- Added defines for large files to the 'newplugin' script (reported by Udo Richter).
+- Removed the workaround for short channel names of "Kabel Deutschland", because
+  apparently they now have their data according to the DVB standard (thanks to
+  Johann Friedrichs).
+- Some fixes to dvbspu.[hc] (thanks to Johann Friedrichs).
+- Fixed a busy loop when moving editing marks (thanks to Johann Friedrichs).
+- Updated sources.conf (thanks to Derek Kelly).
+- Modified cCharSetConv so that it can be used to convert from "whatever VDR uses"
+  to a given code (thanks to Joachim Wilke).
+- Channel names containing commas are now handled correctly in channels.conf.
+  If a channel's short name contains a comma, it is replaced with a '.'.
+- cDevice now logs the device number when a new device is created.
+- Fixed handling STREAMTYPE_11172_AUDIO in cPatPmtParser::ParsePmt().
+- cParsePatPmt now has functions to retrieve the audio, dolby and subtitle pids.
+- cPatFilter::Process() now only stores CA descriptors for video and audio pids
+  (thanks to Francesco Saverio Schiavarelli for reporting a problem with channels
+  that have some encrypted components that VDR doesn't use).
+- cDevice::AddPid() now stores the stream type of the given pid (thanks to Andreas
+  Regel).
+- Added cFont::FontName() and cFont::Size() (thanks to Andreas Regel).
+- cPatPmtParser now also stores the audio stream types.
+- The support for full featured DVB cards of the TT/FuSi design has been moved
+  into the new plugin 'dvbsddevice'. On systems that use such a card as their
+  primary device, this plugin now needs to be loaded when running VDR in order
+  to view live or recorded video. If the plugin is not loaded, the card will
+  be treated like a budget DVB card, and there will be no OSD or viewing
+  capability.
+- Fixed handling the "CA PMT" generation (revised a change not mentioned in version
+  1.7.9's changes, which caused a malfunction with Conax and Viaccess CAMs).
+- Fixed stopping subtitle display when switching the primary device (thanks to
+  Anssi Hannula).
+  IMPORTANT NOTE TO PLUGIN AUTHORS: a plugin that implements a derived cDevice
+  class that can replay video must now call the MakePrimaryDevice() function of
+  its base class.
+- Fixed compiler warnings "format not a string literal and no format arguments"
+  in some syslog calls (thanks to Rolf Ahrenberg).
+- The new command line options --edit and --genindex can be used to edit a
+  recording or generate its index without actually starting the entire VDR
+  (based on a patch from Helmut Auer).
+- Improved the description of the transponder parameters in vdr.5 (thanks to
+  Winfried K�hler).
+- Avoiding setting the video stream type to 2 if the vpid is 0 (problem reported
+  by Arthur Konovalov).
+- Implemented handling the "Content Descriptor" (based on a patch from Rolf
+  Ahrenberg). The 'classic', 'sttng' and 'curses' skins display the textual
+  representation of the content descriptors as "genre". The epg.data file stores
+  the genre using the tag character 'G'.
+- Implemented handling the "Parental Rating Descriptor" (based on a patch from Rolf
+  Ahrenberg). The 'classic', 'sttng' and 'curses' skins display the parental
+  rating (if given) in their event displays. The epg.data file stores
+  the parental rating using the tag character 'R'.
+  IMPORTANT NOTE: if VDR doesn't display a parental rating, this does not
+  necessarily mean that the given programme is suitable for all audiences!
+- Rearranged cEvent members to minimize memory waste.
+- After a CLRE command, no further EPG processing is now done for 10 seconds,
+  so that data sent with subsequent PUTE commands doesn't interfere with data
+  from the broadcasters (suggested by Helmut Auer).
+- Added support for DVB cards with multiple fontends. Note that this only
+  works for DVB cards where each frontend can be used independently of all
+  the others on the same adapter.
+- Fixed plugin arguments corruption with glibc 2.11 on x86_64 (thanks to
+  Anssi Hannula).
diff --git a/Makefile b/Makefile
index 703b801f6..e13ea5ecd 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.4 2009/10/18 13:59:25 kls Exp $
+# $Id: Makefile 2.5 2009/12/29 11:20:50 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -36,7 +36,7 @@ DOXYFILE = Doxyfile
 
 SILIB    = $(LSIDIR)/libsi.a
 
-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o dvbosd.o\
+OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
diff --git a/PLUGINS/src/sky/COPYING b/PLUGINS/src/dvbsddevice/COPYING
similarity index 100%
rename from PLUGINS/src/sky/COPYING
rename to PLUGINS/src/dvbsddevice/COPYING
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
new file mode 100644
index 000000000..18cd62507
--- /dev/null
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -0,0 +1,12 @@
+VDR Plugin 'dvbsddevice' Revision History
+-----------------------------------------
+
+2009-12-28: Version 0.0.1
+
+- Initial revision.
+
+2010-01-04: Version 0.0.2
+
+- Calling the MakePrimaryDevice() function of the base class to allow
+  the cDevice to stop displaying subtitles.
+- Added support for DVB cards with multiple fontends.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/dvbsddevice/Makefile
similarity index 60%
rename from PLUGINS/src/sky/Makefile
rename to PLUGINS/src/dvbsddevice/Makefile
index 87fbcba74..8ef273c64 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,13 +1,15 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 13:00:16 kls Exp $
+# $Id: Makefile 1.1 2009/12/29 11:53:18 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
 #
-PLUGIN = sky
+PLUGIN = dvbsddevice
 
 ### The version number of this plugin (taken from the main source file):
 
@@ -43,28 +45,55 @@ INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o
+OBJS = $(PLUGIN).o dvbsdffdevice.o dvbsdffosd.o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so
+all: libvdr-$(PLUGIN).so i18n
 
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
@@ -80,4 +109,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/PLUGINS/src/dvbsddevice/README b/PLUGINS/src/dvbsddevice/README
new file mode 100644
index 000000000..9b1280fee
--- /dev/null
+++ b/PLUGINS/src/dvbsddevice/README
@@ -0,0 +1,20 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
+
+Project's homepage:          http://www.tvdr.de
+
+Latest version available at: ftp://ftp.tvdr.de/vdr
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
+
+Description:
+
+The 'dvbsddevice' plugin implements the output device for the
+"Full Featured" DVB cards based on the TechnoTrend/Fujitsu-Siemens
+design. This code was originally part of the core VDR source, and
+was moved into this plugin in VDR version 1.7.11.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
new file mode 100644
index 000000000..e2248e9b6
--- /dev/null
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -0,0 +1,35 @@
+/*
+ * dvbsddevice.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbsddevice.c 1.2 2010/01/01 15:01:01 kls Exp $
+ */
+
+#include <vdr/plugin.h>
+#include "dvbsdffdevice.h"
+
+static const char *VERSION        = "0.0.2";
+static const char *DESCRIPTION    = "SD Full Featured DVB device";
+
+class cPluginDvbsddevice : public cPlugin {
+private:
+  cDvbSdFfDeviceProbe *probe;
+public:
+  cPluginDvbsddevice(void);
+  virtual ~cPluginDvbsddevice();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  };
+
+cPluginDvbsddevice::cPluginDvbsddevice(void)
+{
+  probe = new cDvbSdFfDeviceProbe;
+}
+
+cPluginDvbsddevice::~cPluginDvbsddevice()
+{
+  delete probe;
+}
+
+VDRPLUGINCREATOR(cPluginDvbsddevice); // Don't touch this!
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
new file mode 100644
index 000000000..21a60a523
--- /dev/null
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -0,0 +1,799 @@
+/*
+ * dvbsdffdevice.h: The DVB SD Full Featured device interface
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbsdffdevice.c 2.25 2010/01/04 12:56:56 kls Exp $
+ */
+
+#include "dvbsdffdevice.h"
+#include <errno.h>
+#include <limits.h>
+#include <linux/videodev2.h>
+#include <linux/dvb/audio.h>
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/video.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include "dvbsdffosd.h"
+#include "vdr/eitscan.h"
+#include "vdr/transfer.h"
+
+// --- cDvbSdFfDevice --------------------------------------------------------
+
+int cDvbSdFfDevice::devVideoOffset = -1;
+
+cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend)
+:cDvbDevice(Adapter, Frontend)
+{
+  spuDecoder = NULL;
+  digitalAudio = false;
+  playMode = pmNone;
+
+  // Devices that are only present on cards with decoders:
+
+  fd_osd      = DvbOpen(DEV_DVB_OSD,    adapter, frontend, O_RDWR);
+  fd_video    = DvbOpen(DEV_DVB_VIDEO,  adapter, frontend, O_RDWR | O_NONBLOCK);
+  fd_audio    = DvbOpen(DEV_DVB_AUDIO,  adapter, frontend, O_RDWR | O_NONBLOCK);
+  fd_stc      = DvbOpen(DEV_DVB_DEMUX,  adapter, frontend, O_RDWR);
+
+  // The offset of the /dev/video devices:
+
+  if (devVideoOffset < 0) { // the first one checks this
+     FILE *f = NULL;
+     char buffer[PATH_MAX];
+     for (int ofs = 0; ofs < 100; ofs++) {
+         snprintf(buffer, sizeof(buffer), "/proc/video/dev/video%d", ofs);
+         if ((f = fopen(buffer, "r")) != NULL) {
+            if (fgets(buffer, sizeof(buffer), f)) {
+               if (strstr(buffer, "DVB Board")) { // found the _first_ DVB card
+                  devVideoOffset = ofs;
+                  dsyslog("video device offset is %d", devVideoOffset);
+                  break;
+                  }
+               }
+            else
+               break;
+            fclose(f);
+            }
+         else
+            break;
+         }
+     if (devVideoOffset < 0)
+        devVideoOffset = 0;
+     if (f)
+        fclose(f);
+     }
+  devVideoIndex = devVideoOffset >= 0 ? devVideoOffset++ : -1;
+
+  // Video format:
+
+  SetVideoFormat(Setup.VideoFormat);
+}
+
+cDvbSdFfDevice::~cDvbSdFfDevice()
+{
+  delete spuDecoder;
+  // We're not explicitly closing any device files here, since this sometimes
+  // caused segfaults. Besides, the program is about to terminate anyway...
+}
+
+void cDvbSdFfDevice::MakePrimaryDevice(bool On)
+{
+  if (On)
+     new cDvbOsdProvider(fd_osd);
+  cDvbDevice::MakePrimaryDevice(On);
+}
+
+bool cDvbSdFfDevice::HasDecoder(void) const
+{
+  return true;
+}
+
+cSpuDecoder *cDvbSdFfDevice::GetSpuDecoder(void)
+{
+  if (!spuDecoder && IsPrimaryDevice())
+     spuDecoder = new cDvbSpuDecoder();
+  return spuDecoder;
+}
+
+uchar *cDvbSdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
+{
+  if (devVideoIndex < 0)
+     return NULL;
+  char buffer[PATH_MAX];
+  snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, devVideoIndex);
+  int videoDev = open(buffer, O_RDWR);
+  if (videoDev >= 0) {
+     uchar *result = NULL;
+     // set up the size and RGB
+     v4l2_format fmt;
+     memset(&fmt, 0, sizeof(fmt));
+     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     fmt.fmt.pix.width = SizeX;
+     fmt.fmt.pix.height = SizeY;
+     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
+     fmt.fmt.pix.field = V4L2_FIELD_ANY;
+     if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) {
+        v4l2_requestbuffers reqBuf;
+        memset(&reqBuf, 0, sizeof(reqBuf));
+        reqBuf.count = 2;
+        reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        reqBuf.memory = V4L2_MEMORY_MMAP;
+        if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) {
+           v4l2_buffer mbuf;
+           memset(&mbuf, 0, sizeof(mbuf));
+           mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+           mbuf.memory = V4L2_MEMORY_MMAP;
+           if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) {
+              int msize = mbuf.length;
+              unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
+              if (mem && mem != (unsigned char *)-1) {
+                 v4l2_buffer buf;
+                 memset(&buf, 0, sizeof(buf));
+                 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                 buf.memory = V4L2_MEMORY_MMAP;
+                 buf.index = 0;
+                 if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) {
+                    v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                    if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) {
+                       memset(&buf, 0, sizeof(buf));
+                       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                       buf.memory = V4L2_MEMORY_MMAP;
+                       buf.index = 0;
+                       if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) {
+                          if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) {
+                             // make RGB out of BGR:
+                             int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height;
+                             unsigned char *mem1 = mem;
+                             for (int i = 0; i < memsize; i++) {
+                                 unsigned char tmp = mem1[2];
+                                 mem1[2] = mem1[0];
+                                 mem1[0] = tmp;
+                                 mem1 += 3;
+                                 }
+
+                             if (Quality < 0)
+                                Quality = 100;
+
+                             dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height);
+                             if (Jpeg) {
+                                // convert to JPEG:
+                                result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality);
+                                if (!result)
+                                   esyslog("ERROR: failed to convert image to JPEG");
+                                }
+                             else {
+                                // convert to PNM:
+                                char buf[32];
+                                snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
+                                int l = strlen(buf);
+                                int bytes = memsize * 3;
+                                Size = l + bytes;
+                                result = MALLOC(uchar, Size);
+                                if (result) {
+                                   memcpy(result, buf, l);
+                                   memcpy(result + l, mem, bytes);
+                                   }
+                                else
+                                   esyslog("ERROR: failed to convert image to PNM");
+                                }
+                             }
+                          else
+                             esyslog("ERROR: video device VIDIOC_STREAMOFF failed");
+                          }
+                       else
+                          esyslog("ERROR: video device VIDIOC_DQBUF failed");
+                       }
+                    else
+                       esyslog("ERROR: video device VIDIOC_STREAMON failed");
+                    }
+                 else
+                    esyslog("ERROR: video device VIDIOC_QBUF failed");
+                 munmap(mem, msize);
+                 }
+              else
+                 esyslog("ERROR: failed to memmap video device");
+              }
+           else
+              esyslog("ERROR: video device VIDIOC_QUERYBUF failed");
+           }
+        else
+           esyslog("ERROR: video device VIDIOC_REQBUFS failed");
+        }
+     else
+        esyslog("ERROR: video device VIDIOC_S_FMT failed");
+     close(videoDev);
+     return result;
+     }
+  else
+     LOG_ERROR_STR(buffer);
+  return NULL;
+}
+
+void cDvbSdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
+{
+  cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
+  if (Setup.VideoFormat) {
+     CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
+     }
+  else {
+     switch (VideoDisplayFormat) {
+       case vdfPanAndScan:
+            CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_PAN_SCAN));
+            break;
+       case vdfLetterBox:
+            CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
+            break;
+       case vdfCenterCutOut:
+            CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT));
+            break;
+       default: esyslog("ERROR: unknown video display format %d", VideoDisplayFormat);
+       }
+     }
+}
+
+void cDvbSdFfDevice::SetVideoFormat(bool VideoFormat16_9)
+{
+  CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
+  SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
+}
+
+eVideoSystem cDvbSdFfDevice::GetVideoSystem(void)
+{
+  eVideoSystem VideoSystem = vsPAL;
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        if (vs.h == 480 || vs.h == 240)
+           VideoSystem = vsNTSC;
+        }
+     else
+        LOG_ERROR;
+     }
+  return VideoSystem;
+}
+
+void cDvbSdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
+{
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        Width = vs.w;
+        Height = vs.h;
+        switch (vs.aspect_ratio) {
+          default:
+          case VIDEO_FORMAT_4_3:   VideoAspect =  4.0 / 3.0; break;
+          case VIDEO_FORMAT_16_9:  VideoAspect = 16.0 / 9.0; break;
+          case VIDEO_FORMAT_221_1: VideoAspect =       2.21; break;
+          }
+        return;
+        }
+     else
+        LOG_ERROR;
+     }
+  cDevice::GetVideoSize(Width, Height, VideoAspect);
+}
+
+void cDvbSdFfDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
+{
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        Width = 720;
+        if (vs.h != 480 && vs.h != 240)
+           Height = 576; // PAL
+        else
+           Height = 480; // NTSC
+        switch (Setup.VideoFormat ? vs.aspect_ratio : VIDEO_FORMAT_4_3) {
+          default:
+          case VIDEO_FORMAT_4_3:   PixelAspect =  4.0 / 3.0; break;
+          case VIDEO_FORMAT_221_1: // FF DVB cards only distinguish between 4:3 and 16:9
+          case VIDEO_FORMAT_16_9:  PixelAspect = 16.0 / 9.0; break;
+          }
+        PixelAspect /= double(Width) / Height;
+        return;
+        }
+     else
+        LOG_ERROR;
+     }
+  cDevice::GetOsdSize(Width, Height, PixelAspect);
+}
+
+bool cDvbSdFfDevice::SetAudioBypass(bool On)
+{
+  if (setTransferModeForDolbyDigital != 1)
+     return false;
+  return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
+}
+
+//                                   ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
+static dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_PCR, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
+
+bool cDvbSdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
+{
+  if (Handle->pid) {
+     dmx_pes_filter_params pesFilterParams;
+     memset(&pesFilterParams, 0, sizeof(pesFilterParams));
+     if (On) {
+        if (Handle->handle < 0) {
+           Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
+           if (Handle->handle < 0) {
+              LOG_ERROR;
+              return false;
+              }
+           }
+        pesFilterParams.pid     = Handle->pid;
+        pesFilterParams.input   = DMX_IN_FRONTEND;
+        pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
+        pesFilterParams.pes_type= PesTypes[Type < ptOther ? Type : ptOther];
+        pesFilterParams.flags   = DMX_IMMEDIATE_START;
+        if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+           LOG_ERROR;
+           return false;
+           }
+        }
+     else if (!Handle->used) {
+        CHECK(ioctl(Handle->handle, DMX_STOP));
+        if (Type <= ptTeletext) {
+           pesFilterParams.pid     = 0x1FFF;
+           pesFilterParams.input   = DMX_IN_FRONTEND;
+           pesFilterParams.output  = DMX_OUT_DECODER;
+           pesFilterParams.pes_type= PesTypes[Type];
+           pesFilterParams.flags   = DMX_IMMEDIATE_START;
+           CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
+           if (PesTypes[Type] == DMX_PES_VIDEO) // let's only do this once
+              SetPlayMode(pmNone); // necessary to switch a PID from DMX_PES_VIDEO/AUDIO to DMX_PES_OTHER
+           }
+        close(Handle->handle);
+        Handle->handle = -1;
+        }
+     }
+  return true;
+}
+
+void cDvbSdFfDevice::TurnOffLiveMode(bool LiveView)
+{
+  if (LiveView) {
+     // Avoid noise while switching:
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     }
+
+  // Turn off live PIDs:
+
+  DetachAll(pidHandles[ptAudio].pid);
+  DetachAll(pidHandles[ptVideo].pid);
+  DetachAll(pidHandles[ptPcr].pid);
+  DetachAll(pidHandles[ptTeletext].pid);
+  DelPid(pidHandles[ptAudio].pid);
+  DelPid(pidHandles[ptVideo].pid);
+  DelPid(pidHandles[ptPcr].pid, ptPcr);
+  DelPid(pidHandles[ptTeletext].pid);
+  DelPid(pidHandles[ptDolby].pid);
+}
+
+bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
+{
+  int apid = Channel->Apid(0);
+  int vpid = Channel->Vpid();
+  int dpid = Channel->Dpid(0);
+
+  bool DoTune = !IsTunedToTransponder(Channel);
+
+  bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
+  bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
+
+  bool TurnOffLivePIDs = DoTune
+                         || !IsPrimaryDevice()
+                         || LiveView // for a new live view the old PIDs need to be turned off
+                         || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                         ;
+
+  bool StartTransferMode = IsPrimaryDevice() && !DoTune
+                           && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
+                              || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                              );
+  if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
+     StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
+
+  bool TurnOnLivePIDs = !StartTransferMode && LiveView;
+
+  // Turn off live PIDs if necessary:
+
+  if (TurnOffLivePIDs)
+     TurnOffLiveMode(LiveView);
+
+  // Set the tuner:
+
+  if (!cDvbDevice::SetChannelDevice(Channel, LiveView))
+     return false;
+
+  // If this channel switch was requested by the EITScanner we don't wait for
+  // a lock and don't set any live PIDs (the EITScanner will wait for the lock
+  // by itself before setting any filters):
+
+  if (EITScanner.UsesDevice(this)) //XXX
+     return true;
+
+  // PID settings:
+
+  if (TurnOnLivePIDs) {
+     SetAudioBypass(false);
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo) && AddPid(apid, ptAudio))) {
+        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
+        return false;
+        }
+     if (IsPrimaryDevice())
+        AddPid(Channel->Tpid(), ptTeletext);
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schl��ler <marco@lordzodiac.de> this works
+                                                   // to avoid missing audio after replaying a DVD; with 'false' there is an audio disturbance when switching
+                                                   // between two channels on the same transponder on DVB-S
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+     }
+  else if (StartTransferMode)
+     cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), vpid, Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+
+  return true;
+}
+
+int cDvbSdFfDevice::GetAudioChannelDevice(void)
+{
+  audio_status_t as;
+  CHECK(ioctl(fd_audio, AUDIO_GET_STATUS, &as));
+  return as.channel_select;
+}
+
+void cDvbSdFfDevice::SetAudioChannelDevice(int AudioChannel)
+{
+  CHECK(ioctl(fd_audio, AUDIO_CHANNEL_SELECT, AudioChannel));
+}
+
+void cDvbSdFfDevice::SetVolumeDevice(int Volume)
+{
+  if (digitalAudio)
+     Volume = 0;
+  audio_mixer_t am;
+  // conversion for linear volume response:
+  am.volume_left = am.volume_right = 2 * Volume - Volume * Volume / 255;
+  CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
+}
+
+void cDvbSdFfDevice::SetDigitalAudioDevice(bool On)
+{
+  if (digitalAudio != On) {
+     if (digitalAudio)
+        cCondWait::SleepMs(1000); // Wait until any leftover digital data has been flushed
+     digitalAudio = On;
+     SetVolumeDevice(On || IsMute() ? 0 : CurrentVolume());
+     }
+}
+
+void cDvbSdFfDevice::SetAudioTrackDevice(eTrackType Type)
+{
+  const tTrackId *TrackId = GetTrack(Type);
+  if (TrackId && TrackId->id) {
+     SetAudioBypass(false);
+     if (IS_AUDIO_TRACK(Type) || (IS_DOLBY_TRACK(Type) && SetAudioBypass(true))) {
+        if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
+           DetachAll(pidHandles[ptAudio].pid);
+           if (CamSlot())
+              CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
+           pidHandles[ptAudio].pid = TrackId->id;
+           SetPid(&pidHandles[ptAudio], ptAudio, true);
+           if (CamSlot()) {
+              CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
+              CamSlot()->StartDecrypting();
+              }
+           }
+        }
+     else if (IS_DOLBY_TRACK(Type)) {
+        if (setTransferModeForDolbyDigital == 0)
+           return;
+        // Currently this works only in Transfer Mode
+        ForceTransferMode();
+        }
+     }
+}
+
+bool cDvbSdFfDevice::CanReplay(void) const
+{
+  return cDevice::CanReplay();
+}
+
+bool cDvbSdFfDevice::SetPlayMode(ePlayMode PlayMode)
+{
+  if (PlayMode != pmExtern_THIS_SHOULD_BE_AVOIDED && fd_video < 0 && fd_audio < 0) {
+     // reopen the devices
+     fd_video = DvbOpen(DEV_DVB_VIDEO, adapter, frontend, O_RDWR | O_NONBLOCK);
+     fd_audio = DvbOpen(DEV_DVB_AUDIO, adapter, frontend, O_RDWR | O_NONBLOCK);
+     SetVideoFormat(Setup.VideoFormat);
+     }
+
+  switch (PlayMode) {
+    case pmNone:
+         // special handling to return from PCM replay:
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_video, VIDEO_PLAY));
+
+         CHECK(ioctl(fd_video, VIDEO_STOP, true));
+         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+         CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
+         break;
+    case pmAudioVideo:
+    case pmAudioOnlyBlack:
+         if (playMode == pmNone)
+            TurnOffLiveMode(true);
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
+         CHECK(ioctl(fd_audio, AUDIO_PLAY));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_video, VIDEO_PLAY));
+         break;
+    case pmAudioOnly:
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
+         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+         CHECK(ioctl(fd_audio, AUDIO_PLAY));
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
+         break;
+    case pmVideoOnly:
+         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+         CHECK(ioctl(fd_video, VIDEO_STOP, true));
+         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
+         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+         CHECK(ioctl(fd_audio, AUDIO_PLAY));
+         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
+         CHECK(ioctl(fd_video, VIDEO_PLAY));
+         break;
+    case pmExtern_THIS_SHOULD_BE_AVOIDED:
+         close(fd_video);
+         close(fd_audio);
+         fd_video = fd_audio = -1;
+         break;
+    default: esyslog("ERROR: unknown playmode %d", PlayMode);
+    }
+  playMode = PlayMode;
+  return true;
+}
+
+int64_t cDvbSdFfDevice::GetSTC(void)
+{
+  if (fd_stc >= 0) {
+     struct dmx_stc stc;
+     stc.num = 0;
+     if (ioctl(fd_stc, DMX_GET_STC, &stc) == -1) {
+        esyslog("ERROR: stc %d: %m", CardIndex() + 1);
+        return -1;
+        }
+     return stc.stc / stc.base;
+     }
+  return -1;
+}
+
+void cDvbSdFfDevice::TrickSpeed(int Speed)
+{
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
+}
+
+void cDvbSdFfDevice::Clear(void)
+{
+  if (fd_video >= 0)
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+  if (fd_audio >= 0)
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+  cDevice::Clear();
+}
+
+void cDvbSdFfDevice::Play(void)
+{
+  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
+     }
+  else {
+     if (fd_audio >= 0) {
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
+        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
+        }
+     if (fd_video >= 0)
+        CHECK(ioctl(fd_video, VIDEO_CONTINUE));
+     }
+  cDevice::Play();
+}
+
+void cDvbSdFfDevice::Freeze(void)
+{
+  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
+     if (fd_audio >= 0)
+        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
+     }
+  else {
+     if (fd_audio >= 0) {
+        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
+        }
+     if (fd_video >= 0)
+        CHECK(ioctl(fd_video, VIDEO_FREEZE));
+     }
+  cDevice::Freeze();
+}
+
+void cDvbSdFfDevice::Mute(void)
+{
+  if (fd_audio >= 0) {
+     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     }
+  cDevice::Mute();
+}
+
+void cDvbSdFfDevice::StillPicture(const uchar *Data, int Length)
+{
+  if (!Data || Length < TS_SIZE)
+     return;
+  if (Data[0] == 0x47) {
+     // TS data
+     cDevice::StillPicture(Data, Length);
+     }
+  else if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
+     // PES data
+     char *buf = MALLOC(char, Length);
+     if (!buf)
+        return;
+     int i = 0;
+     int blen = 0;
+     while (i < Length - 6) {
+           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
+              int len = Data[i + 4] * 256 + Data[i + 5];
+              if ((Data[i + 3] & 0xF0) == 0xE0) { // video packet
+                 // skip PES header
+                 int offs = i + 6;
+                 // skip header extension
+                 if ((Data[i + 6] & 0xC0) == 0x80) {
+                    // MPEG-2 PES header
+                    if (Data[i + 8] >= Length)
+                       break;
+                    offs += 3;
+                    offs += Data[i + 8];
+                    len -= 3;
+                    len -= Data[i + 8];
+                    if (len < 0 || offs + len > Length)
+                       break;
+                    }
+                 else {
+                    // MPEG-1 PES header
+                    while (offs < Length && len > 0 && Data[offs] == 0xFF) {
+                          offs++;
+                          len--;
+                          }
+                    if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
+                       offs += 2;
+                       len -= 2;
+                       }
+                    if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
+                       offs += 5;
+                       len -= 5;
+                       }
+                    else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
+                       offs += 10;
+                       len -= 10;
+                       }
+                    else if (offs < Length && len > 0) {
+                       offs++;
+                       len--;
+                       }
+                    }
+                 if (blen + len > Length) // invalid PES length field
+                    break;
+                 memcpy(&buf[blen], &Data[offs], len);
+                 i = offs + len;
+                 blen += len;
+                 }
+              else if (Data[i + 3] >= 0xBD && Data[i + 3] <= 0xDF) // other PES packets
+                 i += len + 6;
+              else
+                 i++;
+              }
+           else
+              i++;
+           }
+     video_still_picture sp = { buf, blen };
+     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+     free(buf);
+     }
+  else {
+     // non-PES data
+     video_still_picture sp = { (char *)Data, Length };
+     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
+     }
+}
+
+bool cDvbSdFfDevice::Poll(cPoller &Poller, int TimeoutMs)
+{
+  Poller.Add((playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video, true);
+  return Poller.Poll(TimeoutMs);
+}
+
+bool cDvbSdFfDevice::Flush(int TimeoutMs)
+{
+  //TODO actually this function should wait until all buffered data has been processed by the card, but how?
+  return true;
+}
+
+int cDvbSdFfDevice::PlayVideo(const uchar *Data, int Length)
+{
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+}
+
+int cDvbSdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
+{
+  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
+}
+
+int cDvbSdFfDevice::PlayTsVideo(const uchar *Data, int Length)
+{
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+}
+
+int cDvbSdFfDevice::PlayTsAudio(const uchar *Data, int Length)
+{
+  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
+}
+
+// --- cDvbSdFfDeviceProbe ---------------------------------------------------
+
+bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
+{
+  static uint32_t SubsystemIds[] = {
+    0x110A0000, // Fujitsu Siemens DVB-C
+    0x13C20000, // Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C
+    0x13C20001, // Technotrend/Hauppauge WinTV DVB-T rev1.X
+    0x13C20002, // Technotrend/Hauppauge WinTV DVB-C rev2.X
+    0x13C20003, // Technotrend/Hauppauge WinTV Nexus-S rev2.X
+    0x13C20004, // Galaxis DVB-S rev1.3
+    0x13C20006, // Fujitsu Siemens DVB-S rev1.6
+    0x13C20008, // Technotrend/Hauppauge DVB-T
+    0x13C2000A, // Technotrend/Hauppauge WinTV Nexus-CA rev1.X
+    0x13C2000E, // Technotrend/Hauppauge WinTV Nexus-S rev2.3
+    0x13C21002, // Technotrend/Hauppauge WinTV DVB-S rev1.3 SE
+    0x00000000
+    };
+  cString FileName;
+  cReadLine ReadLine;
+  FILE *f = NULL;
+  uint32_t SubsystemId = 0;
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId = strtoul(s, NULL, 0) << 16;
+     fclose(f);
+     }
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId |= strtoul(s, NULL, 0);
+     fclose(f);
+     }
+  for (uint32_t *sid = SubsystemIds; *sid; sid++) {
+      if (*sid == SubsystemId) {
+         dsyslog("creating cDvbSdFfDevice");
+         new cDvbSdFfDevice(Adapter, Frontend);
+         return true;
+         }
+      }
+  return false; 
+}
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
new file mode 100644
index 000000000..b382bf624
--- /dev/null
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -0,0 +1,107 @@
+/*
+ * dvbsdffdevice.h: The DVB SD Full Featured device interface
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbsdffdevice.h 2.11 2010/01/04 11:01:14 kls Exp $
+ */
+
+#ifndef __DVBSDFFDEVICE_H
+#define __DVBSDFFDEVICE_H
+
+#include "vdr/dvbdevice.h"
+#include "vdr/dvbspu.h"
+
+/// The cDvbSdFfDevice implements a DVB device which can be accessed through the Linux DVB driver API.
+
+class cDvbSdFfDevice : public cDvbDevice {
+private:
+  int fd_osd, fd_audio, fd_video, fd_stc;
+protected:
+  virtual void MakePrimaryDevice(bool On);
+public:
+  cDvbSdFfDevice(int Adapter, int Frontend);
+  virtual ~cDvbSdFfDevice();
+  virtual bool HasDecoder(void) const;
+
+// SPU facilities
+
+private:
+  cDvbSpuDecoder *spuDecoder;
+public:
+  virtual cSpuDecoder *GetSpuDecoder(void);
+
+// Channel facilities
+
+private:
+  void TurnOffLiveMode(bool LiveView);
+protected:
+  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+
+// PID handle facilities
+
+private:
+  bool SetAudioBypass(bool On);
+protected:
+  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
+
+// Image Grab facilities
+
+private:
+  static int devVideoOffset;
+  int devVideoIndex;
+public:
+  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+
+// Video format facilities
+
+public:
+  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
+  virtual void SetVideoFormat(bool VideoFormat16_9);
+  virtual eVideoSystem GetVideoSystem(void);
+  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
+  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
+
+// Track facilities
+
+protected:
+  virtual void SetAudioTrackDevice(eTrackType Type);
+
+// Audio facilities
+
+private:
+  bool digitalAudio;
+protected:
+  virtual int GetAudioChannelDevice(void);
+  virtual void SetAudioChannelDevice(int AudioChannel);
+  virtual void SetVolumeDevice(int Volume);
+  virtual void SetDigitalAudioDevice(bool On);
+
+// Player facilities
+
+protected:
+  ePlayMode playMode;
+  virtual bool CanReplay(void) const;
+  virtual bool SetPlayMode(ePlayMode PlayMode);
+  virtual int PlayVideo(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
+  virtual int PlayTsVideo(const uchar *Data, int Length);
+  virtual int PlayTsAudio(const uchar *Data, int Length);
+public:
+  virtual int64_t GetSTC(void);
+  virtual void TrickSpeed(int Speed);
+  virtual void Clear(void);
+  virtual void Play(void);
+  virtual void Freeze(void);
+  virtual void Mute(void);
+  virtual void StillPicture(const uchar *Data, int Length);
+  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
+  virtual bool Flush(int TimeoutMs = 0);
+  };
+
+class cDvbSdFfDeviceProbe : public cDvbDeviceProbe {
+public:
+  virtual bool Probe(int Adapter, int Frontend);
+  };
+ 
+#endif //__DVBSDFFDEVICE_H
diff --git a/dvbosd.c b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
similarity index 87%
rename from dvbosd.c
rename to PLUGINS/src/dvbsddevice/dvbsdffosd.c
index ab34cbddb..4ff8db98c 100644
--- a/dvbosd.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
@@ -1,26 +1,24 @@
 /*
- * dvbosd.c: Implementation of the DVB On Screen Display
+ * dvbsdffosd.c: Implementation of the DVB SD Full Featured On Screen Display
  *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
+ * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbosd.c 2.0 2007/09/16 08:55:54 kls Exp $
+ * $Id: dvbsdffosd.c 2.1 2009/12/29 11:52:48 kls Exp $
  */
 
-#include "dvbosd.h"
+#include "dvbsdffosd.h"
 #include <linux/dvb/osd.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/unistd.h>
-#include "dvbdevice.h"
-#include "tools.h"
+#include "vdr/tools.h"
 
-// --- cDvbOsd ---------------------------------------------------------------
+// --- cDvbSdFfOsd -----------------------------------------------------------
 
 #define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
 #define MAXOSDMEMORY  92000 // number of bytes available to the OSD (for unmodified DVB cards)
 
-class cDvbOsd : public cOsd {
+class cDvbSdFfOsd : public cOsd {
 private:
   int osdDev;
   int osdMem;
@@ -29,14 +27,14 @@ class cDvbOsd : public cOsd {
 protected:
   virtual void SetActive(bool On);
 public:
-  cDvbOsd(int Left, int Top, int OsdDev, uint Level);
-  virtual ~cDvbOsd();
+  cDvbSdFfOsd(int Left, int Top, int OsdDev, uint Level);
+  virtual ~cDvbSdFfOsd();
   virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
   virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
   virtual void Flush(void);
   };
 
-cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev, uint Level)
+cDvbSdFfOsd::cDvbSdFfOsd(int Left, int Top, int OsdDev, uint Level)
 :cOsd(Left, Top, Level)
 {
   osdDev = OsdDev;
@@ -55,12 +53,12 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev, uint Level)
      }
 }
 
-cDvbOsd::~cDvbOsd()
+cDvbSdFfOsd::~cDvbSdFfOsd()
 {
   SetActive(false);
 }
 
-void cDvbOsd::SetActive(bool On)
+void cDvbSdFfOsd::SetActive(bool On)
 {
   if (On != Active()) {
      cOsd::SetActive(On);
@@ -85,7 +83,7 @@ void cDvbOsd::SetActive(bool On)
      }
 }
 
-eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
+eOsdError cDvbSdFfOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
   eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
   if (Result == oeOk) {
@@ -107,7 +105,7 @@ eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
   return Result;
 }
 
-eOsdError cDvbOsd::SetAreas(const tArea *Areas, int NumAreas)
+eOsdError cDvbSdFfOsd::SetAreas(const tArea *Areas, int NumAreas)
 {
   if (shown) {
      cBitmap *Bitmap;
@@ -120,7 +118,7 @@ eOsdError cDvbOsd::SetAreas(const tArea *Areas, int NumAreas)
   return cOsd::SetAreas(Areas, NumAreas);
 }
 
-void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
+void cDvbSdFfOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
 {
   if (osdDev >= 0) {
      osd_cmd_t dc;
@@ -135,7 +133,7 @@ void cDvbOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, co
      }
 }
 
-void cDvbOsd::Flush(void)
+void cDvbSdFfOsd::Flush(void)
 {
   if (!Active())
      return;
@@ -211,5 +209,5 @@ cDvbOsdProvider::cDvbOsdProvider(int OsdDev)
 
 cOsd *cDvbOsdProvider::CreateOsd(int Left, int Top, uint Level)
 {
-  return new cDvbOsd(Left, Top, osdDev, Level);
+  return new cDvbSdFfOsd(Left, Top, osdDev, Level);
 }
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.h b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
new file mode 100644
index 000000000..8a1bc6257
--- /dev/null
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
@@ -0,0 +1,22 @@
+/*
+ * dvbsdffosd.h: Implementation of the DVB SD Full Featured On Screen Display
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbsdffosd.h 2.1 2009/12/29 11:52:05 kls Exp $
+ */
+
+#ifndef __DVBSDFFODF_H
+#define __DVBSDFFODF_H
+
+#include "vdr/osd.h"
+
+class cDvbOsdProvider : public cOsdProvider {
+private:
+  int osdDev;
+public:
+  cDvbOsdProvider(int OsdDev);
+  virtual cOsd *CreateOsd(int Left, int Top, uint Level);
+  };
+
+#endif //__DVBSDFFODF_H
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 14e78f6e6..9adeab9ef 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -63,6 +63,10 @@ VDR Plugin 'hello' Revision History
 
 - Updated the Croatian language texts (thanks to Adrian Caval).
 
-2008-009-06 Version 0.2.3
+2008-09-06: Version 0.2.3
 
 - Updated the Turkish language texts (thanks to Oktay Yolge�en).
+
+2009-12-06: Version 0.2.4
+
+- Several code modifications to avoid compiler warnings (thanks to Winfried K�hler).
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 86adee67c..32a74e3f8 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.1 2008/09/06 15:07:12 kls Exp $
+ * $Id: hello.c 2.2 2009/12/06 12:30:15 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.3";
+static const char *VERSION        = "0.2.4";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
@@ -96,7 +96,7 @@ bool cPluginHello::ProcessArgs(int argc, char *argv[])
   static struct option long_options[] = {
        { "aaa",      required_argument, NULL, 'a' },
        { "bbb",      no_argument,       NULL, 'b' },
-       { NULL }
+       { NULL,       no_argument,       NULL,  0  }
      };
 
   int c;
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 5f24a7475..34da9388d 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -33,3 +33,7 @@ VDR Plugin 'pictures' Revision History
 2008-03-14: Version 0.0.7
 
 - Added Russian translations (thanks to Alexander Gross).
+
+2009-12-06: Version 0.0.8
+
+- Several code modifications to avoid compiler warnings (thanks to Winfried K�hler).
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 9c4e515c0..9de688904 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.0 2008/03/14 12:57:19 kls Exp $
+ * $Id: pictures.c 2.1 2009/12/06 12:30:21 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.7";
+static const char *VERSION       = "0.0.8";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
@@ -82,7 +82,7 @@ bool cPluginPictures::ProcessArgs(int argc, char *argv[])
   // Implement command line argument processing here if applicable.
   static struct option long_options[] = {
        { "dir",      required_argument, NULL, 'd' },
-       { NULL }
+       { NULL,       no_argument,       NULL,  0  }
      };
 
   int c;
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index cf793cd2c..ca820f9b9 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -79,3 +79,8 @@ VDR Plugin 'skincurses' Revision History
 2008-03-14: Version 0.1.7
 
 - Added Russian translations (thanks to Alexander Gross).
+
+2010-01-03: Version 0.1.8
+
+- Displaying "genre" in event descriptions.
+- Displaying "parental rating" in event descriptions.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 8a7a846e1..d8134f60d 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.0 2008/03/14 12:57:14 kls Exp $
+ * $Id: skincurses.c 2.3 2010/01/03 14:59:16 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.7";
+static const char *VERSION        = "0.1.8";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -402,6 +402,10 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
      osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
      }
   y += ts.Height();
+  if (Event->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
+     osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
+     }
   y += 1;
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Event->Title(), &Font, clrCyan, clrBackground);
   y += ts.Height();
@@ -409,6 +413,13 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
      ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Event->ShortText(), &Font, clrYellow, clrBackground);
      y += ts.Height();
      }
+  for (int i = 0; Event->Contents(i); i++) {
+      const char *s = Event->ContentToString(Event->Contents(i));
+      if (!isempty(s)) {
+         ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, s, &Font, clrYellow, clrBackground);
+         y += 1;
+         }
+      }
   y += 1;
   if (!isempty(Event->Description())) {
      textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground);
@@ -427,6 +438,10 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
   snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   y += ts.Height();
+  if (Info->GetEvent()->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString());
+     osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font);
+     }
   y += 1;
   const char *Title = Info->Title();
   if (isempty(Title))
@@ -437,6 +452,13 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
      ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, Info->ShortText(), &Font, clrYellow, clrBackground);
      y += ts.Height();
      }
+  for (int i = 0; Info->GetEvent()->Contents(i); i++) {
+      const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i));
+      if (!isempty(s)) {
+         ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, s, &Font, clrYellow, clrBackground);
+         y += 1;
+         }
+      }
   y += 1;
   if (!isempty(Info->Description())) {
      textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground);
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
deleted file mode 100644
index 25b8fc873..000000000
--- a/PLUGINS/src/sky/HISTORY
+++ /dev/null
@@ -1,70 +0,0 @@
-VDR Plugin 'sky' Revision History
----------------------------------
-
-2002-12-01: Version 0.0.1
-
-- Initial revision.
-
-2002-12-13: Version 0.1.0
-
-- Changed setting of CXX and CXXFLAGS variables in Makefile.
-
-2003-05-09: Version 0.1.1
-
-- Changed Start() to Initialize().
-
-2004-01-04: Version 0.2.0
-
-- Implemented automatic PID switching and channel detection
-
-2004-02-15: Version 0.3.0
-
-- Now using the actual channel IDs a derived from the data stream.
-- Switched EPG data retrieval to http://www.bleb.org.
-- Added automatic DST detection to getskyepg.pl.
-- Fixed handling receivers, so that a recording on the same channel
-  won't interrupt an ongoing Transfer mode.
-
-2004-10-16: Version 0.3.1
-
-- Improved buffer handling.
-
-2004-12-12: Version 0.3.2
-
-- Changed Apid access in cChannel.
-
-2004-12-19: Version 0.3.3
-
-- Made several functions threadsafe.
-- Removed delay_ms(), using cCondWait::SleepMs() instead.
-
-2005-09-17: Version 0.3.4
-
-- Added a missing include statement.
-
-2006-03-26: Version 0.3.5
-
-- Fixed format string handling.
-
-2006-12-02: Version 0.3.5 (version number not increased)
-
-- Made the getskyepg.pl script send a user agent message to
-  the server, according to the rules at http://bleb.org/tv/data/listings.
-  If your version of 'wget' doesn't support the -U option to set the user agent,
-  use the new option -U of getskyepg.pl to have the information added to the URL
-  as a query string.
-- The getskyepg.pl script now replaces "&amp;" with "&".
-
-2007-08-15: Version 0.3.6
-
-- Moved the "all" target in the Makefile before the "Implicit rules",
-  so that a plain "make" will compile everything.
-
-2008-03-22: Version 0.3.7
-
-- Removed the full path from the 'logger' call in the getskyepg.pl script (this
-  program is apparently "on the move" through the file system...).
- 
-2008-09-07: Version 0.3.8
-
-- Fixed renamed constants (thanks to Udo Richter).
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
deleted file mode 100644
index 19d5d988e..000000000
--- a/PLUGINS/src/sky/README
+++ /dev/null
@@ -1,49 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
-
-Project's homepage:          http://www.tvdr.de
-
-Latest version available at: http://www.tvdr.de
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-See the file COPYING for more information.
-
-Description:
-
-The 'sky' plugin implements a new device for VDR, which is based on the
-MPEG2 encoder card described at linuxtv.org/mpeg2/kfir.xml. It
-allows you to connect the analog a/v output of your Sky Digibox to VDR,
-so that you can enjoy the full recording flexibility of VDR with your
-Sky subscription. Note that this is NOT something that does anything
-illegal, like decrypting the Sky programme without a subscription. You
-will need a Sky Digibox and a valid subscription in order to use this
-plugin.
-
-The 'kfir' module must be loaded with the option 'streamtype=4' to make it
-produce a Transport Stream.
-
-The Digibox is remotely controlled through VDR via LIRC (see lirc.org).
-The file lircd.conf.sky contains the remote control codes necessary to
-control the Digibox.
-
-In order to access the Sky channels VDR needs to know the channel number
-under which each channel is stored in the Sky Digibox. These numbers are
-stored in the file 'channels.conf.sky', together with the channel IDs as
-derived from the actual channel data and the names under which the EPG
-data for each channel can be found (see below). Copy this file to your
-plugins config directory, in a subdirectory named 'sky', as in
-
-/video/plugins/sky/channels.conf.sky
-
-The Sky EPG is available on the Internet at http://www.bleb.org.
-The Perl script getskyepg.pl extracts the EPG data from these pages
-and sends it to VDR via an SVDRP connection. The channel names as
-used on the bleb.org pages are defined in the channels.conf.sky file.
-You can keep your EPG data up-to-date by entering a call to getskyepg.pl
-into your /etc/crontab. Call 'getskyepg.pl -h' for a list of options.
-The getskyepg.pl script requires the programs /usr/bin/wget and /usr/bin/logger
-to be installed on your system.
diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky
deleted file mode 100644
index 5f0b77360..000000000
--- a/PLUGINS/src/sky/channels.conf.sky
+++ /dev/null
@@ -1,34 +0,0 @@
-# Sky channel definitions
-#
-# Syntax:
-# 
-# ChannelID:ChannelNumber:EPGname
-#
-# where
-#
-# ChannelID is the channel ID as derived from the actual channel
-#           data as broadcast in the data stream (see man vdr(5)).
-#
-# ChannelNumber is the number of this channel as you have to
-#               enter it on the DigiBox remote control.
-#
-# EPGname is the name of the page at www.bleb.org that has EPG
-#         data for this channel (without the '.xml'). If no such
-#         page exists, 'x' is entered.
-#
-S28.2E-2-2027-4705:106:sky_one
-S28.2E-2-2027-5104:107:sky_two
-S28.2E-2-2044-10070:118:itv2
-S28.2E-2-2023-4905:130:scifi
-S28.2E-2-2025-5904:127:paramount
-S28.2E-2-2009-6201:551:discovery
-S28.2E-2-2030-4809:310:sky_cinema
-S28.2E-2-2007-4303:301:sky_movies1
-S28.2E-2-2007-4302:302:sky_movies2
-S28.2E-2-2007-4403:303:sky_movies3
-S28.2E-2-2011-4402:304:sky_movies4
-S28.2E-2-2011-4503:305:sky_movies5
-S28.2E-2-2011-4502:306:sky_movies6
-S28.2E-2-2030-4603:307:sky_movies7
-S28.2E-2-2007-5502:308:sky_movies8
-S28.2E-2-2030-4602:309:sky_movies9
diff --git a/PLUGINS/src/sky/getskyepg.pl b/PLUGINS/src/sky/getskyepg.pl
deleted file mode 100755
index dfca96a52..000000000
--- a/PLUGINS/src/sky/getskyepg.pl
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/usr/bin/perl
-
-# getskyepg.pl: Get EPG data for Sky channels from the Internet
-#
-# Connects to a running VDR instance via SVDRP, gets the channel data
-# for the Sky channels and connects to Internet web pages to extract the
-# EPG data for these channels. The result is sent to VDR via SVDRP.
-#
-# See the README file for copyright information and how to reach the author.
-#
-# $Id: getskyepg.pl 2.1 2009/10/18 14:05:47 kls Exp $
-
-use Getopt::Std;
-use Time::Local;
-
-$Usage = qq{
-Usage: $0 [options]
-
-Options: -c filename        channel config file name (default: channels.conf.sky)
-         -d hostname        destination hostname (default: localhost)
-         -p port            SVDRP port number (default: 2001)
-         -S source          channel source (default: S28.2E)
-         -D days            days to get EPG for (1..7, default: 2)
-         -U                 use this if your version of 'wget' doesn't support -U
-};
-
-die $Usage if (!getopts("c:d:D:hp:S:U") || $opt_h);
-
-$Conf   = $opt_c || "channels.conf.sky";
-$Dest   = $opt_d || "localhost";
-$Port   = $opt_p || 2001;
-$Source = $opt_S || "S28.2E";
-$Days   = $opt_D || 2;
-$User   = $opt_U;
-
-# See "Rules for using this data" on http://bleb.org/tv/data/listings.
-# In case you modify this script in a way that changes its behavior
-# towards the www.bleb.org website, please replace 'vdr-bugs@tvdr.de'
-# with your own email address! That way Andrew Flegg <andrew@bleb.org>,
-# who runs that web site, can contact you in case of problems.
-$IDENT = "VDR::getskyepg.pl, http://www.tvdr.de - vdr-bugs\@tvdr.de";
-$GAP = 2;
-
-$SkyWebPage = "www.bleb.org/tv/data/listings";
-$WGET = "/usr/bin/wget -q -O-";
-$WGET .= " -U '$IDENT'" unless $User;
-$LOGGER = "logger -t SKYEPG";
-
-$DST = -3600; # Daylight Saving Time offset
-$SecsInDay = 86400;
-
-@Channels = ();
-
-$idxSource = 0;
-$idxNumber = 1;
-$idxName = 2;
-
-Error("days out of range: $Days") unless (1 <= $Days && $Days <= 7);
-
-sub Log
-{
-  system("$LOGGER '@_'");
-}
-
-sub Error
-{
-  Log(@_);
-  die "$0: @_\n";
-}
-
-sub GetChannels
-{
-  open(CHANNELS, $Conf) || Error("$Conf: $!");
-  while (<CHANNELS>) {
-        chomp;
-        next if (/^#/);
-        my @a = split(":");
-        push(@Channels, [@a]) unless ($a[$idxName] eq "x");
-        }
-  close(CHANNELS);
-}
-
-GetChannels();
-
-sub GetPage
-{
-  my $channel = shift;
-  my $day = shift;
-  $day--;
-  my $url = "http://$SkyWebPage/$day/$channel.xml";
-  $url .= "?$IDENT" if $User;
-  Log("reading $url");
-  my @page = split("\n", `$WGET '$url'`);
-  Log("received " . ($#page + 1) . " lines");
-  return @page;
-}
-
-sub ReplaceTags
-{
-  my $s = shift;
-  $s =~ s/&amp;/&/g;
-  return $s;
-}
-
-sub StripWhitespace
-{
-  my $s = shift;
-  $s =~ s/\s*(.*)\s*/$1/;
-  $s =~ s/\s+/ /g;
-  return $s;
-}
-
-sub Extract
-{
-  my $s = shift;
-  my $t = shift;
-  $s =~ /<$t>([^<]*)<\/$t>/;
-  return ReplaceTags(StripWhitespace($1));
-}
-
-# In order to get the duration we need to buffer the last event:
-$Id = "";
-$Time = 0;
-$Title = "";
-$Subtitle = "";
-$Desc = "";
-
-sub GetEpgData
-{
-  my ($channel, $channelID) = @_;
-  my $numEvents = 0;
-  SVDRPsend("C $channelID");
-  $Time = 0;
-  for $day (1 .. $Days) {
-      my $dt = 0;
-      my @page = GetPage($channel, $day);
-      my $data = "";
-      for $line (@page) {
-          chomp($line);
-          if ($line =~ /<programme>/) {
-             $data = "";
-             }
-          elsif ($line =~ /<\/programme>/) {
-             my $title = Extract($data, "title");
-             my $subtitle = Extract($data, "subtitle");
-             my $desc = Extract($data, "desc");
-             my $start = Extract($data, "start");
-             # 'end' is useless, because it is sometimes missing :-(
-             # my $end = Extract($data, "end");
-             if (!$subtitle) {
-                # They sometimes write all info into the description, as in
-                # Episode: some description.
-                # Why don't they just fill in the data correctly?
-                my ($s, $d) = ($desc =~ /([^:]*)[:](.*)/);
-                if ($s && $d) {
-                   $subtitle = $s;
-                   $desc = $d;
-                   }
-                }
-             # 'start' and 'end' as time of day isn't of much use here, since
-             # the page for one day contains data that actually belongs to the
-             # next day (after midnight). Oh well, lets reconstruct the missing
-             # information:
-             $start = "0" . $start if (length($start) < 4);
-             my ($h, $m) = ($start =~ /(..)(..)/);
-             $dt = $SecsInDay if ($h > 12);
-             # convert to time_t:
-             my @gmt = gmtime;
-             $gmt[0] = 0;  # seconds
-             $gmt[1] = $m; # minutes
-             $gmt[2] = $h; # hours
-             $time = timegm(@gmt) + ($day - 1) * $SecsInDay + ($h < 12 ? $dt : 0);
-             # compensate for DST:
-             $time += $DST if (localtime($time))[8];
-             # create EPG data:
-             if ($Time) {
-                $duration = $time - $Time;
-                SVDRPsend("E $Id $Time $duration");
-                SVDRPsend("T $Title");
-                SVDRPsend("S $Subtitle");
-                SVDRPsend("D $Desc");
-                SVDRPsend("e");
-                $numEvents++;
-                }
-             # buffer the last event:
-             $Id = $time / 60 % 0xFFFF; # this gives us unique ids for every minute of over 6 weeks
-             $Time = $time;
-             $Title = $title;
-             $Subtitle = $subtitle;
-             $Desc = $desc;
-             }
-          else {
-             $data .= $line;
-             }
-          }
-      sleep($GAP);
-      }
-  SVDRPsend("c");
-  Log("generated $numEvents EPG events");
-}
-
-sub ProcessEpg
-{
-  for (@Channels) {
-      my $channel = @$_[$idxName];
-      my $channelID = @$_[$idxSource];
-      Log("processing channel $channel - $channelID");
-      SVDRPsend("PUTE");
-      SVDRPreceive(354);
-      GetEpgData($channel, $channelID);
-      SVDRPsend(".");
-      SVDRPreceive(250);
-      }
-  Log("done");
-}
-
-#---------------------------------------------------------------------------
-# TODO: make this a Perl module??? What about Error()???
-
-use Socket;
-
-$Timeout = 300; # max. seconds to wait for response
-
-$SIG{ALRM} = sub { Error("timeout"); };
-alarm($Timeout);
-
-$iaddr = inet_aton($Dest)                   || Error("no host: $Dest");
-$paddr = sockaddr_in($Port, $iaddr);
-
-$proto = getprotobyname('tcp');
-socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || Error("socket: $!");
-connect(SOCK, $paddr)                       || Error("connect: $!");
-select(SOCK); $| = 1;
-SVDRPreceive(220);
-ProcessEpg();
-SVDRPsend("QUIT");
-
-sub SVDRPsend
-{
-  my $s = shift;
-  print SOCK "$s\r\n";
-}
-
-sub SVDRPreceive
-{
-  my $expect = shift | 0;
-  my @a = ();
-  while (<SOCK>) {
-        s/\s*$//; # 'chomp' wouldn't work with "\r\n"
-        push(@a, $_);
-        if (substr($_, 3, 1) ne "-") {
-           my $code = substr($_, 0, 3);
-           Error("expected SVDRP code $expect, but received $code") if ($code != $expect);
-           last;
-           }
-        }
-  return @a;
-}
-
-#---------------------------------------------------------------------------
diff --git a/PLUGINS/src/sky/lircd.conf.sky b/PLUGINS/src/sky/lircd.conf.sky
deleted file mode 100644
index 191dcb56c..000000000
--- a/PLUGINS/src/sky/lircd.conf.sky
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright (C) 1999 Christoph Bartelmus
-#
-# You may only use this file if you make it available to others,
-# i.e. if you send it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.6.4-CVS(serial) on Mon Jul  9 08:14:04 2001
-#
-# contributed by Steve Davies <steve@daviesfam.org>
-#
-# brand:                       sky
-# model no. of remote control: 
-# supported devices:              34000 20
-#
-#
-
-begin remote
-
-  name          SKY
-  flags         CONST_LENGTH|RAW_CODES
-  eps           30
-  aeps          100
-  ptrail        0
-  repeat        0     0
-  gap           149692
-  frequency     36000
-  duty_cycle    50
-
-  begin raw_codes
-
-    name 0
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444
-
-    name 1
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      888
-
-    name 2
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 888
-      444
-
-    name 3
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444
-      444
-
-    name 4
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 888 888 444 444
-      444
-
-    name 5
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 888 888 888
-
-    name 6
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 888
-      444
-
-    name 7
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444
-      444
-
-    name 8
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 888 888 444 444 444 444
-      444
-
-    name 9
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 888 888 444 444 888
-
-    name RED
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 444 444 888 888 444 444 888 888
-
-    name GREEN
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 444 444 888 888 444 444 444 444 888 444
-
-    name YELLOW
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 444 444 888 888 444 444 444 444 444 444
-
-    name BLUE
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 444 444 444 444 888 444 444 444 444 444 444
-      444
-
-    name TEXT
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 888 444 444 444 444 444 444 888 444 444
-      444
-
-    name BACKUP
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 888 888 444 444 444 444 444 444 444 444 888 444 444
-
-    name HELP
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 888 888 444 444 444 444 444 444 444 444 444 444 888
-
-    name CURSOR-LEFT
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 888 888 444 444 888 888 888 444
-
-    name CURSOR-DOWN
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 888 888 444 444 888 444 444 888
-
-    name CURSOR-RIGHT
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 888 888 444 444 888 888 444 444
-
-    name CURSOR-UP
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 888 888 444 444 888 444 444 444 444 444
-
-    name SELECT
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 888 888 888 444 444 444 444 888 444 444 444
-
-    name CHANNEL-DOWN
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 888 888 444 444 444 444 444 444 888
-
-    name CHANNEL-UP
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444
-      444
-
-    name I
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 888 444 444 888 444 444 888 888 888 444 444
-
-    name ONOFF
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 888 444 444 888 444 444
-      444
-
-    name SKY
-      2664 888 444 444 444 444 444 888 444 888 888 444 444 444 444 444
-      444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444
-      444 444 888 888 444 444 444 444 444 444 444 444 444 444 444 444
-      444
-
-          name TV
-             2830     724     583     333     553     339
-              548     791     543     795     977     357
-              527     364     524     367     524     368
-              522     369     521     370     520     371
-              519     372     519     372     519     372
-              518     372     518     374     963     818
-              516     376     510     381     509     382
-              954     828     508     407     481
-
-          name SKY
-             2829     726     580     336     551     340
-              547     791     540     798     977     366
-              519     364     523     367     521     370
-              521     370     520     371     520     371
-              520     371     519     372     518     373
-              517     374     517     374     957     825
-              512     379     512     380     513     377
-              511     381     506     410     477     413
-              483
-
-          name MUTE
-             2567     429     751     447     743     456
-             1335     464     734     466    1325     496
-              697     504     693     506    1284     513
-              681     518     681     517     679     520
-              678   26288    2533     462     734     489
-              705     470    1323     501     695     503
-             1287     511     683     516     683     518
-             1277     522     676     521     678     521
-              675     523     675   26286    2533     465
-              731     491     702     499    1293     504
-              692     507    1280     518     683     516
-              679     524    1272     522     675     529
-              670     523     682     517     675   26286
-             2532     465     729     493     702     473
-             1318     506     688     509    1282     517
-              680     519     677     524    1274     523
-              676
-
-          name VOLUME-UP
-             2568     430     766     433    1342     456
-              734     489     708     466    1326     497
-              699     505     686     508    1286     512
-              688     510     683     516     682     516
-              681   26284    2540     481     711     488
-             1301     498     703     495     695     504
-             1284     516     682     516     684     515
-             1276     522     675     523     675     524
-              674     524     675   26286    2532     490
-              709     489    1300     500     689     509
-              695     517    1270     516     683     520
-              675     519    1274     529     668     525
-              675     524     673     526     672   26288
-             2532     466     731     491    1300     499
-              695     503     692     509    1277     520
-              681     518     679     519    1278     520
-              675
-
-          name VOLUME-DOWN
-             2562     434    1348     451    1332     465
-              733     489     704     496    1296     504
-              690     507     694     511    1281     511
-              683     523     677     515     679     520
-              680   25687    2533     464    1330     491
-             1295     505     693     506     689     510
-             1293     505     684     516     678     520
-             1276     523     677     520     675     524
-              673     526     674   25686    2531     467
-             1324     498    1292     506     691     509
-              683     515    1280     518     678     521
-              675     523    1273     525     674     527
-              672     525     673     527     671   25685
-             2531     467    1320     501    1288     511
-              687     511     688     512    1282     516
-              678     521     675     524    1273
-
-          name TVGUIDE
-             2834     720     586     330     554     338
-              548     794     539     796     975     360
-              528     363     521     371     519     371
-              520     371     519     375     514     374
-              517     374     516     375     513     379
-              511     380     510     381     949     387
-              500     836     505     387     945     391
-              493     868     469     422     468
-
-          name BOXOFFICE
-             2833     745     564     329     555     338
-              548     790     545     793     982     352
-              529     362     526     365     522     370
-              519     371     519     372     519     372
-              518     373     517     374     513     378
-              515     376     507     384     506     385
-              945     390     496     396     498     392
-              496     419     468     847     936
-
-          name SERVICES
-             2829     725     585     330     555     338
-              548     798     537     794     979     356
-              528     368     522     363     523     369
-              521     370     521     370     520     370
-              520     371     520     371     520     371
-              519     372     519     372     518     373
-              964     371     517     375     513     377
-              511     404     489     402     485     828
-              514
-
-          name INTERACTIVE
-             2829     726     591     324     553     340
-              550     788     542     796     981     354
-              532     359     522     369     522     369
-              520     372     518     373     518     373
-              516     375     515     375     513     379
-              515     375     510     381     948     389
-              498     392     504     412     470     867
-              916     866     913
-
-  end raw_codes
-
-end remote
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
deleted file mode 100644
index 75bd9ec50..000000000
--- a/PLUGINS/src/sky/sky.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * sky.c: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: sky.c 2.1 2008/09/07 11:54:07 kls Exp $
- */
-
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <vdr/device.h>
-#include <vdr/plugin.h>
-#include <vdr/sources.h>
-
-static const char *VERSION        = "0.3.8";
-static const char *DESCRIPTION    = "Sky Digibox interface";
-
-// --- cDigiboxDevice --------------------------------------------------------
-
-#define DUMMYAPID  80
-#define DUMMYVPID 160
-
-class cSkyChannel : public cListObject {
-public:
-  tChannelID channelID;
-  int digiboxChannelNumber;
-  bool Parse(const char *s);
-  };
-
-bool cSkyChannel::Parse(const char *s)
-{
-  char *id = NULL;
-  if (2 == sscanf(s, "%a[^:]:%d", &id, &digiboxChannelNumber))
-     channelID = tChannelID::FromString(id);
-  free(id);
-  return digiboxChannelNumber && channelID.Valid();
-}
-
-class cSkyChannels : public cConfig<cSkyChannel> {
-public:
-  cSkyChannel *GetSkyChannel(const cChannel *Channel);
-  };
-
-cSkyChannel *cSkyChannels::GetSkyChannel(const cChannel *Channel)
-{
-  tChannelID ChannelID = Channel->GetChannelID();
-  for (cSkyChannel *sc = First(); sc; sc = Next(sc)) {
-      if (ChannelID == sc->channelID)
-         return sc;
-      }
-  return NULL;
-}
-
-cSkyChannels SkyChannels;
-
-class cDigiboxDevice : public cDevice {
-private:
-  int source;
-  int digiboxChannelNumber;
-  int fd_dvr;
-  int apid, vpid;
-  cTSBuffer *tsBuffer;
-  int fd_lirc;
-  void LircSend(const char *s);
-  void LircSend(int n);
-protected:
-  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
-  virtual bool OpenDvr(void);
-  virtual void CloseDvr(void);
-  virtual bool GetTSPacket(uchar *&Data);
-public:
-  cDigiboxDevice(void);
-  virtual ~cDigiboxDevice();
-  virtual bool ProvidesSource(int Source) const;
-  virtual bool ProvidesTransponder(const cChannel *Channel) const;
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsSetChannel = NULL) const;
-  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
-  };
-
-cDigiboxDevice::cDigiboxDevice(void)
-{
-  source = cSource::FromString("S28.2E");//XXX parameter???
-  digiboxChannelNumber = 0;
-  fd_dvr = -1;
-  apid = vpid = 0;
-  struct sockaddr_un addr;
-  addr.sun_family = AF_UNIX;
-  strn0cpy(addr.sun_path, "/dev/lircd", sizeof(addr.sun_path));//XXX parameter???
-  fd_lirc = socket(AF_UNIX, SOCK_STREAM, 0);
-  if (fd_lirc >= 0) {
-     if (connect(fd_lirc, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-        LOG_ERROR;
-        close(fd_lirc);
-        }
-     }
-  else
-     LOG_ERROR;
-}
-
-cDigiboxDevice::~cDigiboxDevice()
-{
-  if (fd_lirc >= 0)
-     close(fd_lirc);
-}
-
-void cDigiboxDevice::LircSend(const char *s)
-{
-  char buf[100];
-  snprintf(buf, sizeof(buf), "SEND_ONCE SKY %s\n", s);
-  dsyslog(buf);//XXX
-  if (write(fd_lirc, buf, strlen(buf)) < 0)
-     LOG_ERROR;//XXX _STR
-  cCondWait::SleepMs(200);
-}
-
-void cDigiboxDevice::LircSend(int n)
-{
-  char buf[10];
-  snprintf(buf, sizeof(buf), "%d", n);
-  char *p = buf;
-  while (*p) {
-        char q[10];
-        sprintf(q, "%c", *p);
-        LircSend(q);
-        p++;
-        }
-}
-
-bool cDigiboxDevice::SetPid(cPidHandle *Handle, int Type, bool On)
-{
-  //dsyslog("SetPid %d %d", Handle->pid, On);
-  return true;
-}
-
-bool cDigiboxDevice::OpenDvr(void)
-{
-  CloseDvr();
-  fd_dvr = open("/dev/video2", O_RDONLY | O_NONBLOCK);//XXX parameter???
-  if (fd_dvr >= 0)
-     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1);
-  return fd_dvr >= 0;
-}
-
-void cDigiboxDevice::CloseDvr(void)
-{
-  if (fd_dvr >= 0) {
-     close(fd_dvr);
-     fd_dvr = -1;
-     delete tsBuffer;
-     tsBuffer = NULL;
-     }
-}
-
-bool cDigiboxDevice::GetTSPacket(uchar *&Data)
-{
-  if (tsBuffer) {
-     Data = tsBuffer->Get();
-     if (Data) {
-        // insert the actual PIDs:
-        int Pid = (((uint16_t)Data[1] & TS_PID_MASK_HI) << 8) | Data[2];
-        if (Pid == DUMMYAPID)
-           Pid = apid;
-        else if (Pid == DUMMYVPID)
-           Pid = vpid;
-        Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~TS_PID_MASK_HI);
-        Data[2] = Pid & 0xFF;
-        }
-     return true;
-     }
-  return false;
-}
-
-bool cDigiboxDevice::ProvidesSource(int Source) const
-{
-  return source == Source;
-}
-
-bool cDigiboxDevice::ProvidesTransponder(const cChannel *Channel) const
-{
-  return false; // can't provide any actual transponder
-}
-
-bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
-{
-  bool result = false;
-  bool hasPriority = Priority < 0 || Priority > this->Priority();
-  bool needsDetachReceivers = true;
-
-  cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
-  if (SkyChannel) {
-     if (Receiving(true)) {
-        if (digiboxChannelNumber == SkyChannel->digiboxChannelNumber) {
-           needsDetachReceivers = false;
-           result = true;
-           }
-        else
-           result = hasPriority;
-        }
-     else
-        result = hasPriority;
-     }
-  if (NeedsDetachReceivers)
-     *NeedsDetachReceivers = needsDetachReceivers;
-  return result;
-}
-
-bool cDigiboxDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
-{
-  if (fd_lirc >= 0 && !Receiving(true)) { // if we are receiving the channel is already set!
-     cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
-     if (SkyChannel) {
-        digiboxChannelNumber = SkyChannel->digiboxChannelNumber;
-        apid = Channel->Apid(0);
-        vpid = Channel->Vpid();
-        //XXX only when recording??? -> faster channel switching!
-        LircSend("SKY"); // makes sure the Digibox is "on"
-        //XXX lircprint(fd_lirc, "BACKUP");
-        //XXX lircprint(fd_lirc, "BACKUP");
-        //XXX lircprint(fd_lirc, "BACKUP");
-        LircSend(digiboxChannelNumber);
-        }
-     }
-  return true;
-}
-
-// --- cPluginSky ------------------------------------------------------------
-
-class cPluginSky : public cPlugin {
-private:
-  // Add any member variables or functions you may need here.
-public:
-  cPluginSky(void);
-  virtual ~cPluginSky();
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
-  virtual const char *CommandLineHelp(void);
-  virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual bool Initialize(void);
-  virtual void Housekeeping(void);
-  virtual cMenuSetupPage *SetupMenu(void);
-  virtual bool SetupParse(const char *Name, const char *Value);
-  };
-
-cPluginSky::cPluginSky(void)
-{
-  // Initialize any member variables here.
-  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
-  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
-}
-
-cPluginSky::~cPluginSky()
-{
-  // Clean up after yourself!
-}
-
-const char *cPluginSky::CommandLineHelp(void)
-{
-  // Return a string that describes all known command line options.
-  return NULL;
-}
-
-bool cPluginSky::ProcessArgs(int argc, char *argv[])
-{
-  // Implement command line argument processing here if applicable.
-  return true;
-}
-
-bool cPluginSky::Initialize(void)
-{
-  // Initialize any background activities the plugin shall perform.
-  const char *ConfigDir = ConfigDirectory(Name());
-  if (ConfigDir) {
-     if (SkyChannels.Load(AddDirectory(ConfigDir, "channels.conf.sky"), true)) {
-        new cDigiboxDevice;
-        return true;
-        }
-     }
-  else
-     esyslog("ERROR: can't get config directory");
-  return false;
-}
-
-void cPluginSky::Housekeeping(void)
-{
-  // Perform any cleanup or other regular tasks.
-}
-
-cMenuSetupPage *cPluginSky::SetupMenu(void)
-{
-  // Return a setup menu in case the plugin supports one.
-  return NULL;
-}
-
-bool cPluginSky::SetupParse(const char *Name, const char *Value)
-{
-  // Parse your own setup parameters and store their values.
-  return false;
-}
-
-VDRPLUGINCREATOR(cPluginSky); // Don't touch this!
diff --git a/Syd b/Syd
new file mode 100644
index 000000000..e69de29bb
diff --git a/channels.c b/channels.c
index cca0eee09..c14df19c9 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.8 2009/08/30 11:25:50 kls Exp $
+ * $Id: channels.c 2.12 2010/01/02 17:38:40 kls Exp $
  */
 
 #include "channels.h"
@@ -24,14 +24,14 @@ const tChannelParameterMap InversionValues[] = {
   {   0, INVERSION_OFF,  trNOOP("off") },
   {   1, INVERSION_ON,   trNOOP("on") },
   { 999, INVERSION_AUTO, trNOOP("auto") },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap BandwidthValues[] = {
   {   6, 6000000, "6 MHz" },
   {   7, 7000000, "7 MHz" },
   {   8, 8000000, "8 MHz" },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap CoderateValues[] = {
@@ -47,7 +47,7 @@ const tChannelParameterMap CoderateValues[] = {
   {  89, FEC_8_9,  "8/9" },
   { 910, FEC_9_10, "9/10" },
   { 999, FEC_AUTO, trNOOP("auto") },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap ModulationValues[] = {
@@ -62,20 +62,20 @@ const tChannelParameterMap ModulationValues[] = {
   {  10, VSB_8,    "VSB8" },
   {  11, VSB_16,   "VSB16" },
   { 998, QAM_AUTO, "QAMAUTO" },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap SystemValues[] = {
   {   0, SYS_DVBS,  "DVB-S" },
   {   1, SYS_DVBS2, "DVB-S2" },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap TransmissionValues[] = {
   {   2, TRANSMISSION_MODE_2K,   "2K" },
   {   8, TRANSMISSION_MODE_8K,   "8K" },
   { 999, TRANSMISSION_MODE_AUTO, trNOOP("auto") },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap GuardValues[] = {
@@ -84,7 +84,7 @@ const tChannelParameterMap GuardValues[] = {
   {  16, GUARD_INTERVAL_1_16, "1/16" },
   {  32, GUARD_INTERVAL_1_32, "1/32" },
   { 999, GUARD_INTERVAL_AUTO, trNOOP("auto") },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap HierarchyValues[] = {
@@ -93,7 +93,7 @@ const tChannelParameterMap HierarchyValues[] = {
   {   2, HIERARCHY_2,    "2" },
   {   4, HIERARCHY_4,    "4" },
   { 999, HIERARCHY_AUTO, trNOOP("auto") },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 const tChannelParameterMap RollOffValues[] = {
@@ -101,7 +101,7 @@ const tChannelParameterMap RollOffValues[] = {
   {  20, ROLLOFF_20, "0.20" },
   {  25, ROLLOFF_25, "0.25" },
   {  35, ROLLOFF_35, "0.35" },
-  { -1 }
+  {  -1, 0, NULL }
   };
 
 int UserIndex(int Value, const tChannelParameterMap *Map)
@@ -259,6 +259,7 @@ int cChannel::Transponder(int Frequency, char Polarization)
     case 'v': Frequency += 200000; break;
     case 'l': Frequency += 300000; break;
     case 'r': Frequency += 400000; break;
+    default: esyslog("ERROR: invalid value for Polarization '%c'", Polarization);
     }
   return Frequency;
 }
@@ -625,7 +626,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
   else
      q += sprintf(q, " none");
   if (Number())
-     dsyslog(buffer);
+     dsyslog("%s", buffer);
 }
 
 void cChannel::SetRefChannel(cChannel *RefChannel)
@@ -726,6 +727,8 @@ cString cChannel::ToText(const cChannel *Channel)
   q += sprintf(q, "%s", Channel->name);
   if (!isempty(Channel->shortName))
      q += sprintf(q, ",%s", Channel->shortName);
+  else if (strchr(Channel->name, ','))
+     q += sprintf(q, ",");
   if (!isempty(Channel->provider))
      q += sprintf(q, ";%s", Channel->provider);
   *q = 0;
@@ -806,7 +809,7 @@ bool cChannel::Parse(const char *s)
            tpid = 0;
            }
         vpid = ppid = 0;
-        vtype = 2; // default is MPEG-2
+        vtype = 0;
         apids[0] = 0;
         dpids[0] = 0;
         ok = false;
@@ -828,6 +831,8 @@ bool cChannel::Parse(const char *s)
               return false;
            if (!ppid)
               ppid = vpid;
+           if (vpid && !vtype)
+              vtype = 2; // default is MPEG-2
 
            char *dpidbuf = strchr(apidbuf, ';');
            if (dpidbuf)
@@ -900,7 +905,7 @@ bool cChannel::Parse(const char *s)
            *p++ = 0;
            provider = strcpyrealloc(provider, p);
            }
-        p = strchr(namebuf, ',');
+        p = strrchr(namebuf, ','); // long name might contain a ',', so search for the rightmost one
         if (p) {
            *p++ = 0;
            shortName = strcpyrealloc(shortName, p);
diff --git a/channels.h b/channels.h
index 634fa5a38..b465f6a7b 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.6 2009/08/30 11:05:54 kls Exp $
+ * $Id: channels.h 2.7 2009/12/06 12:57:45 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -188,9 +188,9 @@ class cChannel : public cListObject {
   const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
   const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
   const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
-  uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : 0; }
-  uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : 0; }
-  uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : 0; }
+  uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : uchar(0); }
+  uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); }
+  uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); }
   int Tpid(void) const { return tpid; }
   const int *Caids(void) const { return caids; }
   int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
diff --git a/ci.c b/ci.c
index 8db1853cf..6c7b03107 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.3 2009/08/16 13:21:07 kls Exp $
+ * $Id: ci.c 2.6 2010/01/02 10:39:50 kls Exp $
  */
 
 #include "ci.h"
@@ -610,10 +610,8 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
   capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
   esInfoLengthPos = length;
   capmt[length++] = 0x00; // program_info_length H (at program level)
-  capmt[length++] = 0x01; // program_info_length L
-  capmt[length++] = cmdId;
-  if (caDescriptorsLength > 0)
-     AddCaDescriptors(caDescriptorsLength, caDescriptors);
+  capmt[length++] = 0x00; // program_info_length L
+  AddCaDescriptors(caDescriptorsLength, caDescriptors);
 }
 
 void cCiCaPmt::SetListManagement(uint8_t ListManagement)
@@ -632,22 +630,23 @@ void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
      capmt[length++] =  Pid       & 0xFF;
      esInfoLengthPos = length;
      capmt[length++] = 0x00; // ES_info_length H (at ES level)
-     capmt[length++] = 0x01; // ES_info_length L
-     capmt[length++] = cmdId;
-     if (caDescriptorsLength > 0)
-        AddCaDescriptors(caDescriptorsLength, caDescriptors);
+     capmt[length++] = 0x00; // ES_info_length L
+     AddCaDescriptors(caDescriptorsLength, caDescriptors);
      }
 }
 
 void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 {
   if (esInfoLengthPos) {
-     if (length + Length <= int(sizeof(capmt))) {
-        memcpy(capmt + length, Data, Length);
-        length += Length;
-        int l = length - esInfoLengthPos - 2;
-        capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
-        capmt[esInfoLengthPos + 1] =  l       & 0xFF;
+     if (length + Length < int(sizeof(capmt))) {
+        if (Length || cmdId == CPCI_QUERY) {
+           capmt[length++] = cmdId;
+           memcpy(capmt + length, Data, Length);
+           length += Length;
+           int l = length - esInfoLengthPos - 2;
+           capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
+           capmt[esInfoLengthPos + 1] =  l       & 0xFF;
+           }
         }
      else
         esyslog("ERROR: buffer overflow in CA descriptor");
@@ -1424,6 +1423,15 @@ bool cCiTransportConnection::Process(cTPDU *TPDU)
                    SendTPDU(T_DTC_REPLY);
                    state = stIDLE;
                    return true;
+              case T_RCV:
+              case T_CREATE_TC:
+              case T_CTC_REPLY:
+              case T_DTC_REPLY:
+              case T_NEW_TC:
+              case T_TC_ERROR:
+                   break;
+              default:
+                   esyslog("ERROR: unknown TPDU tag: 0x%02X (%s)", TPDU->Tag(), __FUNCTION__);
               }
             }
          else if (timer.TimedOut())
@@ -1443,6 +1451,8 @@ bool cCiTransportConnection::Process(cTPDU *TPDU)
             state = stIDLE;
             }
          return true;
+    default:
+         esyslog("ERROR: unknown state: %d (%s)", state, __FUNCTION__);
     }
   return true;
 }
@@ -1668,6 +1678,8 @@ void cCamSlot::Process(cTPDU *TPDU)
                NewConnection();
                resendPmt = caProgramList.Count() > 0;
                break;
+          default:
+               esyslog("ERROR: unknown module status %d (%s)", ms, __FUNCTION__);
           }
         lastModuleStatus = ms;
         }
diff --git a/config.c b/config.c
index df82baaa8..61de0f532 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.5 2009/06/13 10:25:05 kls Exp $
+ * $Id: config.c 2.6 2009/12/05 15:30:30 kls Exp $
  */
 
 #include "config.h"
@@ -76,7 +76,7 @@ const char *cCommand::Execute(const char *Parameters)
      while ((c = fgetc(p)) != EOF) {
            if (l % 20 == 0)
               result = (char *)realloc(result, l + 21);
-           result[l++] = c;
+           result[l++] = char(c);
            }
      if (result)
         result[l] = 0;
diff --git a/config.h b/config.h
index 6afe902af..f0cc67b77 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.15 2009/08/29 12:47:03 kls Exp $
+ * $Id: config.h 2.16 2009/11/22 19:55:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.10"
-#define VDRVERSNUM   10710  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.11"
+#define VDRVERSNUM   10711  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.10"
-#define APIVERSNUM   10710  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.11"
+#define APIVERSNUM   10711  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index e83c5ac16..ff6b4edb3 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.3 2009/04/19 10:56:33 kls Exp $
+ * $Id: cutter.c 2.4 2010/01/02 13:08:08 kls Exp $
  */
 
 #include "cutter.h"
@@ -274,3 +274,31 @@ bool cCutter::Ended(void)
   ended = false;
   return result;
 }
+
+#define CUTTINGCHECKINTERVAL 500 // ms between checks for the active cutting process
+
+bool CutRecording(const char *FileName)
+{
+  if (DirectoryOk(FileName)) {
+     cRecording Recording(FileName);
+     if (Recording.Name()) {
+        cMarks Marks;
+        if (Marks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording()) && Marks.Count()) {
+           if (cCutter::Start(FileName)) {
+              while (cCutter::Active())
+                    cCondWait::SleepMs(CUTTINGCHECKINTERVAL);
+              return true;
+              }
+           else
+              fprintf(stderr, "can't start editing process\n");
+           }
+        else
+           fprintf(stderr, "'%s' has no editing marks\n", FileName);
+        }
+     else
+        fprintf(stderr, "'%s' is not a recording\n", FileName);
+     }
+  else
+     fprintf(stderr, "'%s' is not a directory\n", FileName);
+  return false;
+}
diff --git a/cutter.h b/cutter.h
index e27ceb6b8..afc5e935e 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 2.0 2002/06/22 10:03:15 kls Exp $
+ * $Id: cutter.h 2.1 2010/01/02 12:09:54 kls Exp $
  */
 
 #ifndef __CUTTER_H
@@ -26,4 +26,6 @@ class cCutter {
   static bool Ended(void);
   };
 
+bool CutRecording(const char *FileName);
+
 #endif //__CUTTER_H
diff --git a/device.c b/device.c
index 3a60fe433..3228af204 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.26 2009/11/22 13:19:03 kls Exp $
+ * $Id: device.c 2.31 2010/01/01 15:40:35 kls Exp $
  */
 
 #include "device.h"
@@ -64,6 +64,7 @@ cDevice::cDevice(void)
 :patPmtParser(true)
 {
   cardIndex = nextCardIndex++;
+  dsyslog("new device number %d", CardIndex() + 1);
 
   SetDescription("receiver on device %d", CardIndex() + 1);
 
@@ -153,6 +154,10 @@ int cDevice::DeviceNumber(void) const
 
 void cDevice::MakePrimaryDevice(bool On)
 {
+  if (!On) {
+     DELETENULL(liveSubtitle);
+     DELETENULL(dvbSubtitleConverter);
+     }
 }
 
 bool cDevice::SetPrimaryDevice(int n)
@@ -371,6 +376,7 @@ void cDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
                case vdfCenterCutOut:
                     spuDecoder->setScaleMode(cSpuDecoder::eSpuNormal);
                     break;
+               default: esyslog("ERROR: invalid value for VideoDisplayFormat '%d'", VideoDisplayFormat);
                }
         }
      }
@@ -399,7 +405,7 @@ void cDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
   PixelAspect = 1.0;
 }
 
-//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
+//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog("%s", b); }
 #define PRINTPIDS(s)
 
 bool cDevice::HasPid(int Pid) const
@@ -411,7 +417,7 @@ bool cDevice::HasPid(int Pid) const
   return false;
 }
 
-bool cDevice::AddPid(int Pid, ePidType PidType)
+bool cDevice::AddPid(int Pid, ePidType PidType, int StreamType)
 {
   if (Pid || PidType == ptPcr) {
      int n = -1;
@@ -458,6 +464,7 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
         }
      if (n >= 0) {
         pidHandles[n].pid = Pid;
+        pidHandles[n].streamType = StreamType;
         pidHandles[n].used = 1;
         PRINTPIDS("C");
         if (!SetPid(&pidHandles[n], n, true)) {
@@ -611,6 +618,7 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
         case scrNoTransfer:   Skins.Message(mtError, tr("Can't start Transfer Mode!"));
                               return false;
         case scrFailed:       break; // loop will retry
+        default:              esyslog("ERROR: invalid return value from SetChannel");
         }
       esyslog("retrying");
       }
diff --git a/device.h b/device.h
index 5698fde24..897de2afe 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.16 2009/11/22 13:21:00 kls Exp $
+ * $Id: device.h 2.19 2010/01/01 15:04:27 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -176,6 +176,8 @@ class cDevice : public cThread {
          ///< anything the device needs to set up when it becomes the primary
          ///< device (On = true) or to shut down when it no longer is the primary
          ///< device (On = false), it should do so in this function.
+         ///< A derived class must call the MakePrimaryDevice() function of its
+         ///< base class.
 public:
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
@@ -277,14 +279,15 @@ class cDevice : public cThread {
   class cPidHandle {
   public:
     int pid;
+    int streamType;
     int handle;
     int used;
-    cPidHandle(void) { pid = used = 0; handle = -1; }
+    cPidHandle(void) { pid = streamType = used = 0; handle = -1; }
     };
   cPidHandle pidHandles[MAXPIDHANDLES];
   bool HasPid(int Pid) const;
          ///< Returns true if this device is currently receiving the given PID.
-  bool AddPid(int Pid, ePidType PidType = ptOther);
+  bool AddPid(int Pid, ePidType PidType = ptOther, int StreamType = 0);
          ///< Adds a PID to the set of PIDs this device shall receive.
   void DelPid(int Pid, ePidType PidType = ptOther);
          ///< Deletes a PID from the set of PIDs this device shall receive.
@@ -498,6 +501,9 @@ class cDevice : public cThread {
   cTsToPes tsToPesSubtitle;
   bool isPlayingVideo;
 protected:
+  const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
+       ///< Returns a pointer to the patPmtParser, so that a derived device
+       ///< can use the stream information from it.
   virtual bool CanReplay(void) const;
        ///< Returns true if this device can currently start a replay session.
   virtual bool SetPlayMode(ePlayMode PlayMode);
diff --git a/diseqc.c b/diseqc.c
index 91f6d5fd2..2bf6f0082 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.0 2008/02/10 14:09:27 kls Exp $
+ * $Id: diseqc.c 2.1 2009/12/05 15:57:02 kls Exp $
  */
 
 #include "diseqc.h"
@@ -36,7 +36,7 @@ bool cDiseqc::Parse(const char *s)
   if (4 <= fields && fields <= 5) {
      source = cSource::FromString(sourcebuf);
      if (Sources.Get(source)) {
-        polarization = toupper(polarization);
+        polarization = char(toupper(polarization));
         if (polarization == 'V' || polarization == 'H' || polarization == 'L' || polarization == 'R') {
            parsing = true;
            char *CurrentAction = NULL;
@@ -81,7 +81,7 @@ char *cDiseqc::Codes(char *s)
               errno = 0;
               int n = strtol(t, &p, 16);
               if (!errno && p != t && 0 <= n && n <= 255) {
-                 codes[numCodes++] = n;
+                 codes[numCodes++] = uchar(n);
                  t = skipspace(p);
                  }
               else {
diff --git a/dvbdevice.c b/dvbdevice.c
index dd425c8af..07e2dbb1d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -1,44 +1,22 @@
 /*
- * dvbdevice.c: The DVB device interface
+ * dvbdevice.c: The DVB device tuner interface
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.21 2009/06/06 11:17:20 kls Exp $
+ * $Id: dvbdevice.c 2.24 2010/01/04 14:06:24 kls Exp $
  */
 
 #include "dvbdevice.h"
 #include <errno.h>
 #include <limits.h>
-#include <linux/videodev2.h>
-#include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
-#include <linux/dvb/video.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include "channels.h"
 #include "diseqc.h"
 #include "dvbci.h"
-#include "dvbosd.h"
-#include "eitscan.h"
-#include "player.h"
-#include "receiver.h"
-#include "status.h"
-#include "transfer.h"
-
-#define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
-#define DO_MULTIPLE_RECORDINGS 1
-
-#define DEV_VIDEO         "/dev/video"
-#define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
-#define DEV_DVB_OSD       "osd"
-#define DEV_DVB_FRONTEND  "frontend"
-#define DEV_DVB_DVR       "dvr"
-#define DEV_DVB_DEMUX     "demux"
-#define DEV_DVB_VIDEO     "video"
-#define DEV_DVB_AUDIO     "audio"
-#define DEV_DVB_CA        "ca"
 
 #define DVBS_TUNE_TIMEOUT  9000 //ms
 #define DVBS_LOCK_TIMEOUT  2000 //ms
@@ -47,32 +25,13 @@
 #define DVBT_TUNE_TIMEOUT  9000 //ms
 #define DVBT_LOCK_TIMEOUT  2000 //ms
 
-class cDvbName {
-private:
-  char buffer[PATH_MAX];
-public:
-  cDvbName(const char *Name, int n) {
-    snprintf(buffer, sizeof(buffer), "%s%d/%s%d", DEV_DVB_ADAPTER, n, Name, 0);
-    }
-  const char *operator*() { return buffer; }
-  };
-
-static int DvbOpen(const char *Name, int n, int Mode, bool ReportError = false)
-{
-  const char *FileName = *cDvbName(Name, n);
-  int fd = open(FileName, Mode);
-  if (fd < 0 && ReportError)
-     LOG_ERROR_STR(FileName);
-  return fd;
-}
-
 // --- cDvbTuner -------------------------------------------------------------
 
 class cDvbTuner : public cThread {
 private:
   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
   int fd_frontend;
-  int cardIndex;
+  int adapter, frontend;
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
@@ -87,17 +46,18 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int CardIndex, fe_delivery_system FrontendType);
+  cDvbTuner(int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
   virtual ~cDvbTuner();
   bool IsTunedTo(const cChannel *Channel) const;
-  void Set(const cChannel *Channel, bool Tune);
+  void Set(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_delivery_system FrontendType)
+cDvbTuner::cDvbTuner(int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
 {
   fd_frontend = Fd_Frontend;
-  cardIndex = CardIndex;
+  adapter = Adapter;
+  frontend = Frontend;
   frontendType = FrontendType;
   tuneTimeout = 0;
   lockTimeout = 0;
@@ -106,7 +66,7 @@ cDvbTuner::cDvbTuner(int Fd_Frontend, int CardIndex, fe_delivery_system Frontend
   tunerStatus = tsIdle;
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
-  SetDescription("tuner on device %d", cardIndex + 1);
+  SetDescription("tuner on frontend %d/%d", adapter, frontend);
   Start();
 }
 
@@ -141,10 +101,10 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   return true;
 }
 
-void cDvbTuner::Set(const cChannel *Channel, bool Tune)
+void cDvbTuner::Set(const cChannel *Channel)
 {
   cMutexLock MutexLock(&mutex);
-  if (Tune)
+  if (!IsTunedTo(Channel))
      tunerStatus = tsSet;
   channel = *Channel;
   lastTimeoutReport = 0;
@@ -195,7 +155,7 @@ bool cDvbTuner::SetFrontend(void)
 #define SETCMD(c, d) { Frontend[CmdSeq.num].cmd = (c);\
                        Frontend[CmdSeq.num].u.data = (d);\
                        if (CmdSeq.num++ > MAXFRONTENDCMDS) {\
-                          esyslog("ERROR: too many tuning commands on frontend %d", cardIndex);\
+                          esyslog("ERROR: too many tuning commands on frontend %d/%d", adapter, frontend);\
                           return false;\
                           }\
                      }
@@ -206,7 +166,7 @@ bool cDvbTuner::SetFrontend(void)
   CmdSeq.props = Frontend;
   SETCMD(DTV_CLEAR, 0);
   if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
-     esyslog("ERROR: frontend %d: %m", cardIndex);
+     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
      return false;
      }
   CmdSeq.num = 0;
@@ -238,6 +198,7 @@ bool cDvbTuner::SetFrontend(void)
                             }
                          }
                          break;
+                    default: esyslog("ERROR: unknown diseqc command %d", da);
                     }
                   }
               diseqcCommands = diseqc->Commands();
@@ -279,7 +240,7 @@ bool cDvbTuner::SetFrontend(void)
            SETCMD(DTV_ROLLOFF, channel.RollOff());
            }
         else {
-           esyslog("ERROR: frontend %d doesn't provide DVB-S2", cardIndex);
+           esyslog("ERROR: frontend %d/%d doesn't provide DVB-S2", adapter, frontend);
            return false;
            }
         }
@@ -325,7 +286,7 @@ bool cDvbTuner::SetFrontend(void)
      }
   SETCMD(DTV_TUNE, 0);
   if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
-     esyslog("ERROR: frontend %d: %m", cardIndex);
+     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
      return false;
      }
   return true;
@@ -353,7 +314,7 @@ void cDvbTuner::Action(void)
                   tunerStatus = tsSet;
                   diseqcCommands = NULL;
                   if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
-                     isyslog("frontend %d timed out while tuning to channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                     isyslog("frontend %d/%d timed out while tuning to channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
                      }
                   continue;
@@ -362,13 +323,13 @@ void cDvbTuner::Action(void)
                if (Status & FE_REINIT) {
                   tunerStatus = tsSet;
                   diseqcCommands = NULL;
-                  isyslog("frontend %d was reinitialized", cardIndex);
+                  isyslog("frontend %d/%d was reinitialized", adapter, frontend);
                   lastTimeoutReport = 0;
                   continue;
                   }
                else if (Status & FE_HAS_LOCK) {
                   if (LostLock) {
-                     isyslog("frontend %d regained lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                     isyslog("frontend %d/%d regained lock on channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
                      LostLock = false;
                      }
                   tunerStatus = tsLocked;
@@ -377,12 +338,14 @@ void cDvbTuner::Action(void)
                   }
                else if (tunerStatus == tsLocked) {
                   LostLock = true;
-                  isyslog("frontend %d lost lock on channel %d, tp %d", cardIndex, channel.Number(), channel.Transponder());
+                  isyslog("frontend %d/%d lost lock on channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
                   tunerStatus = tsTuned;
                   Timer.Set(lockTimeout);
                   lastTimeoutReport = 0;
                   continue;
                   }
+               break;
+          default: esyslog("ERROR: unknown tuner status %d", tunerStatus);
           }
 
         if (tunerStatus != tsTuned)
@@ -392,7 +355,6 @@ void cDvbTuner::Action(void)
 
 // --- cDvbDevice ------------------------------------------------------------
 
-int cDvbDevice::devVideoOffset = -1;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 
 const char *DeliverySystems[] = {
@@ -415,30 +377,22 @@ const char *DeliverySystems[] = {
   NULL
   };
 
-cDvbDevice::cDvbDevice(int n)
+cDvbDevice::cDvbDevice(int Adapter, int Frontend)
 {
+  adapter = Adapter;
+  frontend = Frontend;
   ciAdapter = NULL;
   dvbTuner = NULL;
   frontendType = SYS_UNDEFINED;
   numProvidedSystems = 0;
-  spuDecoder = NULL;
-  digitalAudio = false;
-  playMode = pmNone;
 
   // Devices that are present on all card types:
 
-  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, n, O_RDWR | O_NONBLOCK);
-
-  // Devices that are only present on cards with decoders:
-
-  fd_osd      = DvbOpen(DEV_DVB_OSD,    n, O_RDWR);
-  fd_video    = DvbOpen(DEV_DVB_VIDEO,  n, O_RDWR | O_NONBLOCK);
-  fd_audio    = DvbOpen(DEV_DVB_AUDIO,  n, O_RDWR | O_NONBLOCK);
-  fd_stc      = DvbOpen(DEV_DVB_DEMUX,  n, O_RDWR);
+  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, adapter, frontend, O_RDWR | O_NONBLOCK);
 
   // Common Interface:
 
-  fd_ca       = DvbOpen(DEV_DVB_CA,     n, O_RDWR);
+  fd_ca = DvbOpen(DEV_DVB_CA, adapter, frontend, O_RDWR);
   if (fd_ca >= 0)
      ciAdapter = cDvbCiAdapter::CreateCiAdapter(this, fd_ca);
 
@@ -446,39 +400,6 @@ cDvbDevice::cDvbDevice(int n)
 
   fd_dvr = -1;
 
-  // The offset of the /dev/video devices:
-
-  if (devVideoOffset < 0) { // the first one checks this
-     FILE *f = NULL;
-     char buffer[PATH_MAX];
-     for (int ofs = 0; ofs < 100; ofs++) {
-         snprintf(buffer, sizeof(buffer), "/proc/video/dev/video%d", ofs);
-         if ((f = fopen(buffer, "r")) != NULL) {
-            if (fgets(buffer, sizeof(buffer), f)) {
-               if (strstr(buffer, "DVB Board")) { // found the _first_ DVB card
-                  devVideoOffset = ofs;
-                  dsyslog("video device offset is %d", devVideoOffset);
-                  break;
-                  }
-               }
-            else
-               break;
-            fclose(f);
-            }
-         else
-            break;
-         }
-     if (devVideoOffset < 0)
-        devVideoOffset = 0;
-     if (f)
-        fclose(f);
-     }
-  devVideoIndex = (devVideoOffset >= 0 && HasDecoder()) ? devVideoOffset++ : -1;
-
-  // Video format:
-
-  SetVideoFormat(Setup.VideoFormat);
-
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
@@ -488,7 +409,7 @@ cDvbDevice::cDvbDevice(int n)
           case FE_OFDM: frontendType = SYS_DVBT; break;
           case FE_QAM:  frontendType = SYS_DVBC_ANNEX_AC; break;
           case FE_ATSC: frontendType = SYS_ATSC; break;
-          default: esyslog("ERROR: unknown frontend type %d on device %d", frontendInfo.type, CardIndex() + 1);
+          default: esyslog("ERROR: unknown frontend type %d on frontend %d/%d", frontendInfo.type, adapter, frontend);
           }
         }
      else
@@ -497,12 +418,12 @@ cDvbDevice::cDvbDevice(int n)
         numProvidedSystems++;
         if (frontendType == SYS_DVBS2)
            numProvidedSystems++;
-        isyslog("device %d provides %s (\"%s\")", CardIndex() + 1, DeliverySystems[frontendType], frontendInfo.name);
-        dvbTuner = new cDvbTuner(fd_frontend, CardIndex(), frontendType);
+        isyslog("frontend %d/%d provides %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], frontendInfo.name);
+        dvbTuner = new cDvbTuner(fd_frontend, adapter, frontend, frontendType);
         }
      }
   else
-     esyslog("ERROR: can't open DVB device %d", n);
+     esyslog("ERROR: can't open DVB device %d/%d", adapter, frontend);
 
   StartSectionHandler();
 }
@@ -510,63 +431,86 @@ cDvbDevice::cDvbDevice(int n)
 cDvbDevice::~cDvbDevice()
 {
   StopSectionHandler();
-  delete spuDecoder;
   delete dvbTuner;
   delete ciAdapter;
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
 }
 
-bool cDvbDevice::Probe(const char *FileName)
+cString cDvbDevice::DvbName(const char *Name, int Adapter, int Frontend)
 {
+  return cString::sprintf("%s%d/%s%d", DEV_DVB_ADAPTER, Adapter, Name, Frontend);
+}
+
+int cDvbDevice::DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError)
+{
+  cString FileName = DvbName(Name, Adapter, Frontend);
+  int fd = open(FileName, Mode);
+  if (fd < 0 && ReportError)
+     LOG_ERROR_STR(*FileName);
+  return fd;
+}
+
+bool cDvbDevice::Exists(int Adapter, int Frontend)
+{
+  cString FileName = DvbName(DEV_DVB_FRONTEND, Adapter, Frontend);
   if (access(FileName, F_OK) == 0) {
-     dsyslog("probing %s", FileName);
      int f = open(FileName, O_RDONLY);
      if (f >= 0) {
         close(f);
         return true;
         }
      else if (errno != ENODEV && errno != EINVAL)
-        LOG_ERROR_STR(FileName);
+        LOG_ERROR_STR(*FileName);
      }
   else if (errno != ENOENT)
-     LOG_ERROR_STR(FileName);
+     LOG_ERROR_STR(*FileName);
   return false;
 }
 
-bool cDvbDevice::Initialize(void)
+bool cDvbDevice::Probe(int Adapter, int Frontend)
 {
-  int found = 0;
-  int i;
-  for (i = 0; i < MAXDVBDEVICES; i++) {
-      if (UseDevice(NextCardIndex())) {
-         if (Probe(*cDvbName(DEV_DVB_FRONTEND, i))) {
-            new cDvbDevice(i);
-            found++;
-            }
-         else
-            break;
-         }
-      else
-         NextCardIndex(1); // skips this one
+  cString FileName = DvbName(DEV_DVB_FRONTEND, Adapter, Frontend);
+  dsyslog("probing %s", *FileName);
+  for (cDvbDeviceProbe *dp = DvbDeviceProbes.First(); dp; dp = DvbDeviceProbes.Next(dp)) {
+      if (dp->Probe(Adapter, Frontend))
+         return true; // a plugin has created the actual device
       }
-  NextCardIndex(MAXDVBDEVICES - i); // skips the rest
-  if (found > 0)
-     isyslog("found %d video device%s", found, found > 1 ? "s" : "");
-  else
-     isyslog("no DVB device found");
-  return found > 0;
-}
-
-void cDvbDevice::MakePrimaryDevice(bool On)
-{
-  if (On && HasDecoder())
-     new cDvbOsdProvider(fd_osd);
+  dsyslog("creating cDvbDevice");
+  new cDvbDevice(Adapter, Frontend); // it's a "budget" device
+  return true;
 }
 
-bool cDvbDevice::HasDecoder(void) const
+bool cDvbDevice::Initialize(void)
 {
-  return fd_video >= 0 && fd_audio >= 0;
+  int Checked = 0;
+  int Found = 0;
+  for (int Adapter = 0; ; Adapter++) {
+      for (int Frontend = 0; ; Frontend++) {
+          if (Exists(Adapter, Frontend)) {
+             if (Checked++ < MAXDVBDEVICES) {
+                if (UseDevice(NextCardIndex())) {
+                   if (Probe(Adapter, Frontend))
+                      Found++;
+                   }
+                else
+                   NextCardIndex(1); // skips this one
+                }
+             }
+          else if (Frontend == 0)
+             goto LastAdapter;
+          else
+             goto NextAdapter;
+          }
+      NextAdapter: ;
+      }
+LastAdapter:
+  NextCardIndex(MAXDVBDEVICES - Checked); // skips the rest
+  if (Found > 0)
+     isyslog("found %d DVB device%s", Found, Found > 1 ? "s" : "");
+  else
+     isyslog("no DVB device found");
+  return Found > 0;
 }
 
 bool cDvbDevice::Ready(void)
@@ -576,234 +520,11 @@ bool cDvbDevice::Ready(void)
   return true;
 }
 
-cSpuDecoder *cDvbDevice::GetSpuDecoder(void)
-{
-  if (!spuDecoder && IsPrimaryDevice())
-     spuDecoder = new cDvbSpuDecoder();
-  return spuDecoder;
-}
-
 bool cDvbDevice::HasCi(void)
 {
   return ciAdapter;
 }
 
-uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
-{
-  if (devVideoIndex < 0)
-     return NULL;
-  char buffer[PATH_MAX];
-  snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, devVideoIndex);
-  int videoDev = open(buffer, O_RDWR);
-  if (videoDev >= 0) {
-     uchar *result = NULL;
-     // set up the size and RGB
-     v4l2_format fmt;
-     memset(&fmt, 0, sizeof(fmt));
-     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-     fmt.fmt.pix.width = SizeX;
-     fmt.fmt.pix.height = SizeY;
-     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
-     fmt.fmt.pix.field = V4L2_FIELD_ANY;
-     if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) {
-        v4l2_requestbuffers reqBuf;
-        memset(&reqBuf, 0, sizeof(reqBuf));
-        reqBuf.count = 2;
-        reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        reqBuf.memory = V4L2_MEMORY_MMAP;
-        if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) {
-           v4l2_buffer mbuf;
-           memset(&mbuf, 0, sizeof(mbuf));
-           mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-           mbuf.memory = V4L2_MEMORY_MMAP;
-           if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) {
-              int msize = mbuf.length;
-              unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-              if (mem && mem != (unsigned char *)-1) {
-                 v4l2_buffer buf;
-                 memset(&buf, 0, sizeof(buf));
-                 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                 buf.memory = V4L2_MEMORY_MMAP;
-                 buf.index = 0;
-                 if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) {
-                    v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                    if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) {
-                       memset(&buf, 0, sizeof(buf));
-                       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                       buf.memory = V4L2_MEMORY_MMAP;
-                       buf.index = 0;
-                       if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) {
-                          if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) {
-                             // make RGB out of BGR:
-                             int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height;
-                             unsigned char *mem1 = mem;
-                             for (int i = 0; i < memsize; i++) {
-                                 unsigned char tmp = mem1[2];
-                                 mem1[2] = mem1[0];
-                                 mem1[0] = tmp;
-                                 mem1 += 3;
-                                 }
-
-                             if (Quality < 0)
-                                Quality = 100;
-
-                             dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height);
-                             if (Jpeg) {
-                                // convert to JPEG:
-                                result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality);
-                                if (!result)
-                                   esyslog("ERROR: failed to convert image to JPEG");
-                                }
-                             else {
-                                // convert to PNM:
-                                char buf[32];
-                                snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
-                                int l = strlen(buf);
-                                int bytes = memsize * 3;
-                                Size = l + bytes;
-                                result = MALLOC(uchar, Size);
-                                if (result) {
-                                   memcpy(result, buf, l);
-                                   memcpy(result + l, mem, bytes);
-                                   }
-                                else
-                                   esyslog("ERROR: failed to convert image to PNM");
-                                }
-                             }
-                          else
-                             esyslog("ERROR: video device VIDIOC_STREAMOFF failed");
-                          }
-                       else
-                          esyslog("ERROR: video device VIDIOC_DQBUF failed");
-                       }
-                    else
-                       esyslog("ERROR: video device VIDIOC_STREAMON failed");
-                    }
-                 else
-                    esyslog("ERROR: video device VIDIOC_QBUF failed");
-                 munmap(mem, msize);
-                 }
-              else
-                 esyslog("ERROR: failed to memmap video device");
-              }
-           else
-              esyslog("ERROR: video device VIDIOC_QUERYBUF failed");
-           }
-        else
-           esyslog("ERROR: video device VIDIOC_REQBUFS failed");
-        }
-     else
-        esyslog("ERROR: video device VIDIOC_S_FMT failed");
-     close(videoDev);
-     return result;
-     }
-  else
-     LOG_ERROR_STR(buffer);
-  return NULL;
-}
-
-void cDvbDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
-{
-  cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
-  if (HasDecoder()) {
-     if (Setup.VideoFormat) {
-        CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
-        }
-     else {
-        switch (VideoDisplayFormat) {
-          case vdfPanAndScan:
-               CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_PAN_SCAN));
-               break;
-          case vdfLetterBox:
-               CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
-               break;
-          case vdfCenterCutOut:
-               CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT));
-               break;
-          }
-        }
-     }
-}
-
-void cDvbDevice::SetVideoFormat(bool VideoFormat16_9)
-{
-  if (HasDecoder()) {
-     CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
-     SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
-     }
-}
-
-eVideoSystem cDvbDevice::GetVideoSystem(void)
-{
-  eVideoSystem VideoSystem = vsPAL;
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        if (vs.h == 480 || vs.h == 240)
-           VideoSystem = vsNTSC;
-        }
-     else
-        LOG_ERROR;
-     }
-  return VideoSystem;
-}
-
-void cDvbDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
-{
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        Width = vs.w;
-        Height = vs.h;
-        switch (vs.aspect_ratio) {
-          default:
-          case VIDEO_FORMAT_4_3:   VideoAspect =  4.0 / 3.0; break;
-          case VIDEO_FORMAT_16_9:  VideoAspect = 16.0 / 9.0; break;
-          case VIDEO_FORMAT_221_1: VideoAspect =       2.21; break;
-          }
-        return;
-        }
-     else
-        LOG_ERROR;
-     }
-  cDevice::GetVideoSize(Width, Height, VideoAspect);
-}
-
-void cDvbDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
-{
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        Width = 720;
-        if (vs.h != 480 && vs.h != 240)
-           Height = 576; // PAL
-        else
-           Height = 480; // NTSC
-        switch (Setup.VideoFormat ? vs.aspect_ratio : VIDEO_FORMAT_4_3) {
-          default:
-          case VIDEO_FORMAT_4_3:   PixelAspect =  4.0 / 3.0; break;
-          case VIDEO_FORMAT_221_1: // FF DVB cards only distinguish between 4:3 and 16:9
-          case VIDEO_FORMAT_16_9:  PixelAspect = 16.0 / 9.0; break;
-          }
-        PixelAspect /= double(Width) / Height;
-        return;
-        }
-     else
-        LOG_ERROR;
-     }
-  cDevice::GetOsdSize(Width, Height, PixelAspect);
-}
-
-bool cDvbDevice::SetAudioBypass(bool On)
-{
-  if (setTransferModeForDolbyDigital != 1)
-     return false;
-  return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
-}
-
-//                            ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
-dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_PCR, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
-
 bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
   if (Handle->pid) {
@@ -811,7 +532,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
      memset(&pesFilterParams, 0, sizeof(pesFilterParams));
      if (On) {
         if (Handle->handle < 0) {
-           Handle->handle = DvbOpen(DEV_DVB_DEMUX, CardIndex(), O_RDWR | O_NONBLOCK, true);
+           Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
            if (Handle->handle < 0) {
               LOG_ERROR;
               return false;
@@ -819,8 +540,8 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            }
         pesFilterParams.pid     = Handle->pid;
         pesFilterParams.input   = DMX_IN_FRONTEND;
-        pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
-        pesFilterParams.pes_type= PesTypes[Type < ptOther ? Type : ptOther];
+        pesFilterParams.output  = DMX_OUT_TS_TAP;
+        pesFilterParams.pes_type= DMX_PES_OTHER;
         pesFilterParams.flags   = DMX_IMMEDIATE_START;
         if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
            LOG_ERROR;
@@ -833,11 +554,9 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            pesFilterParams.pid     = 0x1FFF;
            pesFilterParams.input   = DMX_IN_FRONTEND;
            pesFilterParams.output  = DMX_OUT_DECODER;
-           pesFilterParams.pes_type= PesTypes[Type];
+           pesFilterParams.pes_type= DMX_PES_OTHER;
            pesFilterParams.flags   = DMX_IMMEDIATE_START;
            CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
-           if (PesTypes[Type] == DMX_PES_VIDEO) // let's only do this once
-              SetPlayMode(pmNone); // necessary to switch a PID from DMX_PES_VIDEO/AUDIO to DMX_PES_OTHER
            }
         close(Handle->handle);
         Handle->handle = -1;
@@ -848,7 +567,7 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 
 int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
 {
-  const char *FileName = *cDvbName(DEV_DVB_DEMUX, CardIndex());
+  cString FileName = DvbName(DEV_DVB_DEMUX, adapter, frontend);
   int f = open(FileName, O_RDWR | O_NONBLOCK);
   if (f >= 0) {
      dmx_sct_filter_params sctFilterParams;
@@ -866,7 +585,7 @@ int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
         }
      }
   else
-     esyslog("ERROR: can't open filter handle on '%s'", FileName);
+     esyslog("ERROR: can't open filter handle on '%s'", *FileName);
   return -1;
 }
 
@@ -875,29 +594,6 @@ void cDvbDevice::CloseFilter(int Handle)
   close(Handle);
 }
 
-void cDvbDevice::TurnOffLiveMode(bool LiveView)
-{
-  if (LiveView) {
-     // Avoid noise while switching:
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     }
-
-  // Turn off live PIDs:
-
-  DetachAll(pidHandles[ptAudio].pid);
-  DetachAll(pidHandles[ptVideo].pid);
-  DetachAll(pidHandles[ptPcr].pid);
-  DetachAll(pidHandles[ptTeletext].pid);
-  DelPid(pidHandles[ptAudio].pid);
-  DelPid(pidHandles[ptVideo].pid);
-  DelPid(pidHandles[ptPcr].pid, ptPcr);
-  DelPid(pidHandles[ptTeletext].pid);
-  DelPid(pidHandles[ptDolby].pid);
-}
-
 bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
@@ -929,7 +625,6 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
            if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
-#ifdef DO_MULTIPLE_RECORDINGS
               if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
                  if (CamSlot()->CanDecrypt(Channel))
                     result = true;
@@ -938,11 +633,8 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                  }
               else if (!IsPrimaryDevice())
                  result = true;
-#ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
               else
                  result = Priority >= Setup.PrimaryLimit;
-#endif
-#endif
               }
            else
               result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
@@ -968,70 +660,7 @@ bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  int apid = Channel->Apid(0);
-  int vpid = Channel->Vpid();
-  int dpid = Channel->Dpid(0);
-
-  bool DoTune = !dvbTuner->IsTunedTo(Channel);
-
-  bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
-  bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
-
-  bool TurnOffLivePIDs = HasDecoder()
-                         && (DoTune
-                            || !IsPrimaryDevice()
-                            || LiveView // for a new live view the old PIDs need to be turned off
-                            || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                            );
-
-  bool StartTransferMode = IsPrimaryDevice() && !DoTune
-                           && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
-                              || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                              );
-  if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
-     StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
-
-  bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode && LiveView;
-
-#ifndef DO_MULTIPLE_RECORDINGS
-  TurnOffLivePIDs = TurnOnLivePIDs = true;
-  StartTransferMode = false;
-#endif
-
-  // Turn off live PIDs if necessary:
-
-  if (TurnOffLivePIDs)
-     TurnOffLiveMode(LiveView);
-
-  // Set the tuner:
-
-  dvbTuner->Set(Channel, DoTune);
-
-  // If this channel switch was requested by the EITScanner we don't wait for
-  // a lock and don't set any live PIDs (the EITScanner will wait for the lock
-  // by itself before setting any filters):
-
-  if (EITScanner.UsesDevice(this)) //XXX
-     return true;
-
-  // PID settings:
-
-  if (TurnOnLivePIDs) {
-     SetAudioBypass(false);
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo) && AddPid(apid, ptAudio))) {
-        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
-        return false;
-        }
-     if (IsPrimaryDevice())
-        AddPid(Channel->Tpid(), ptTeletext);
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schl��ler <marco@lordzodiac.de> this works
-                                                   // to avoid missing audio after replaying a DVD; with 'false' there is an audio disturbance when switching
-                                                   // between two channels on the same transponder on DVB-S
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     }
-  else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), vpid, Channel->Apids(), Channel->Dpids(), Channel->Spids()));
-
+  dvbTuner->Set(Channel);
   return true;
 }
 
@@ -1040,339 +669,15 @@ bool cDvbDevice::HasLock(int TimeoutMs)
   return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
 }
 
-int cDvbDevice::GetAudioChannelDevice(void)
-{
-  if (HasDecoder()) {
-     audio_status_t as;
-     CHECK(ioctl(fd_audio, AUDIO_GET_STATUS, &as));
-     return as.channel_select;
-     }
-  return 0;
-}
-
-void cDvbDevice::SetAudioChannelDevice(int AudioChannel)
-{
-  if (HasDecoder())
-     CHECK(ioctl(fd_audio, AUDIO_CHANNEL_SELECT, AudioChannel));
-}
-
-void cDvbDevice::SetVolumeDevice(int Volume)
-{
-  if (HasDecoder()) {
-     if (digitalAudio)
-        Volume = 0;
-     audio_mixer_t am;
-     // conversion for linear volume response:
-     am.volume_left = am.volume_right = 2 * Volume - Volume * Volume / 255;
-     CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
-     }
-}
-
-void cDvbDevice::SetDigitalAudioDevice(bool On)
-{
-  if (digitalAudio != On) {
-     if (digitalAudio)
-        cCondWait::SleepMs(1000); // Wait until any leftover digital data has been flushed
-     digitalAudio = On;
-     SetVolumeDevice(On || IsMute() ? 0 : CurrentVolume());
-     }
-}
-
 void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
 {
   setTransferModeForDolbyDigital = Mode;
 }
 
-void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
-{
-  const tTrackId *TrackId = GetTrack(Type);
-  if (TrackId && TrackId->id) {
-     SetAudioBypass(false);
-     if (IS_AUDIO_TRACK(Type) || (IS_DOLBY_TRACK(Type) && SetAudioBypass(true))) {
-        if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
-           DetachAll(pidHandles[ptAudio].pid);
-           if (CamSlot())
-              CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
-           pidHandles[ptAudio].pid = TrackId->id;
-           SetPid(&pidHandles[ptAudio], ptAudio, true);
-           if (CamSlot()) {
-              CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
-              CamSlot()->StartDecrypting();
-              }
-           }
-        }
-     else if (IS_DOLBY_TRACK(Type)) {
-        if (setTransferModeForDolbyDigital == 0)
-           return;
-        // Currently this works only in Transfer Mode
-        ForceTransferMode();
-        }
-     }
-}
-
-bool cDvbDevice::CanReplay(void) const
-{
-#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
-  if (Receiving())
-     return false;
-#endif
-  return cDevice::CanReplay();
-}
-
-bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
-{
-  if (PlayMode != pmExtern_THIS_SHOULD_BE_AVOIDED && fd_video < 0 && fd_audio < 0) {
-     // reopen the devices
-     fd_video = DvbOpen(DEV_DVB_VIDEO,  CardIndex(), O_RDWR | O_NONBLOCK);
-     fd_audio = DvbOpen(DEV_DVB_AUDIO,  CardIndex(), O_RDWR | O_NONBLOCK);
-     SetVideoFormat(Setup.VideoFormat);
-     }
-
-  switch (PlayMode) {
-    case pmNone:
-         // special handling to return from PCM replay:
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_video, VIDEO_PLAY));
-
-         CHECK(ioctl(fd_video, VIDEO_STOP, true));
-         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-         CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-         break;
-    case pmAudioVideo:
-    case pmAudioOnlyBlack:
-         if (playMode == pmNone)
-            TurnOffLiveMode(true);
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
-         CHECK(ioctl(fd_audio, AUDIO_PLAY));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_video, VIDEO_PLAY));
-         break;
-    case pmAudioOnly:
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-         CHECK(ioctl(fd_audio, AUDIO_PLAY));
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
-         break;
-    case pmVideoOnly:
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_video, VIDEO_STOP, true));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-         CHECK(ioctl(fd_audio, AUDIO_PLAY));
-         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_video, VIDEO_PLAY));
-         break;
-    case pmExtern_THIS_SHOULD_BE_AVOIDED:
-         close(fd_video);
-         close(fd_audio);
-         fd_video = fd_audio = -1;
-         break;
-    }
-  playMode = PlayMode;
-  return true;
-}
-
-int64_t cDvbDevice::GetSTC(void)
-{
-  if (fd_stc >= 0) {
-     struct dmx_stc stc;
-     stc.num = 0;
-     if (ioctl(fd_stc, DMX_GET_STC, &stc) == -1) {
-        esyslog("ERROR: stc %d: %m", CardIndex() + 1);
-        return -1;
-        }
-     return stc.stc / stc.base;
-     }
-  return -1;
-}
-
-void cDvbDevice::TrickSpeed(int Speed)
-{
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
-}
-
-void cDvbDevice::Clear(void)
-{
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-  cDevice::Clear();
-}
-
-void cDvbDevice::Play(void)
-{
-  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
-     if (fd_audio >= 0)
-        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
-     }
-  else {
-     if (fd_audio >= 0) {
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
-        }
-     if (fd_video >= 0)
-        CHECK(ioctl(fd_video, VIDEO_CONTINUE));
-     }
-  cDevice::Play();
-}
-
-void cDvbDevice::Freeze(void)
-{
-  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
-     if (fd_audio >= 0)
-        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
-     }
-  else {
-     if (fd_audio >= 0) {
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
-        }
-     if (fd_video >= 0)
-        CHECK(ioctl(fd_video, VIDEO_FREEZE));
-     }
-  cDevice::Freeze();
-}
-
-void cDvbDevice::Mute(void)
-{
-  if (fd_audio >= 0) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     }
-  cDevice::Mute();
-}
-
-void cDvbDevice::StillPicture(const uchar *Data, int Length)
-{
-  if (!Data || Length < TS_SIZE)
-     return;
-  if (Data[0] == 0x47) {
-     // TS data
-     cDevice::StillPicture(Data, Length);
-     }
-  else if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
-     // PES data
-     char *buf = MALLOC(char, Length);
-     if (!buf)
-        return;
-     int i = 0;
-     int blen = 0;
-     while (i < Length - 6) {
-           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
-              int len = Data[i + 4] * 256 + Data[i + 5];
-              if ((Data[i + 3] & 0xF0) == 0xE0) { // video packet
-                 // skip PES header
-                 int offs = i + 6;
-                 // skip header extension
-                 if ((Data[i + 6] & 0xC0) == 0x80) {
-                    // MPEG-2 PES header
-                    if (Data[i + 8] >= Length)
-                       break;
-                    offs += 3;
-                    offs += Data[i + 8];
-                    len -= 3;
-                    len -= Data[i + 8];
-                    if (len < 0 || offs + len > Length)
-                       break;
-                    }
-                 else {
-                    // MPEG-1 PES header
-                    while (offs < Length && len > 0 && Data[offs] == 0xFF) {
-                          offs++;
-                          len--;
-                          }
-                    if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
-                       offs += 2;
-                       len -= 2;
-                       }
-                    if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
-                       offs += 5;
-                       len -= 5;
-                       }
-                    else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
-                       offs += 10;
-                       len -= 10;
-                       }
-                    else if (offs < Length && len > 0) {
-                       offs++;
-                       len--;
-                       }
-                    }
-                 if (blen + len > Length) // invalid PES length field
-                    break;
-                 memcpy(&buf[blen], &Data[offs], len);
-                 i = offs + len;
-                 blen += len;
-                 }
-              else if (Data[i + 3] >= 0xBD && Data[i + 3] <= 0xDF) // other PES packets
-                 i += len + 6;
-              else
-                 i++;
-              }
-           else
-              i++;
-           }
-     video_still_picture sp = { buf, blen };
-     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
-     free(buf);
-     }
-  else {
-     // non-PES data
-     video_still_picture sp = { (char *)Data, Length };
-     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
-     }
-}
-
-bool cDvbDevice::Poll(cPoller &Poller, int TimeoutMs)
-{
-  Poller.Add((playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video, true);
-  return Poller.Poll(TimeoutMs);
-}
-
-bool cDvbDevice::Flush(int TimeoutMs)
-{
-  //TODO actually this function should wait until all buffered data has been processed by the card, but how?
-  return true;
-}
-
-int cDvbDevice::PlayVideo(const uchar *Data, int Length)
-{
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-}
-
-int cDvbDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
-{
-  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
-}
-
-int cDvbDevice::PlayTsVideo(const uchar *Data, int Length)
-{
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-}
-
-int cDvbDevice::PlayTsAudio(const uchar *Data, int Length)
-{
-  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
-}
-
 bool cDvbDevice::OpenDvr(void)
 {
   CloseDvr();
-  fd_dvr = DvbOpen(DEV_DVB_DVR, CardIndex(), O_RDONLY | O_NONBLOCK, true);
+  fd_dvr = DvbOpen(DEV_DVB_DVR, adapter, frontend, O_RDONLY | O_NONBLOCK, true);
   if (fd_dvr >= 0)
      tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1);
   return fd_dvr >= 0;
@@ -1396,3 +701,17 @@ bool cDvbDevice::GetTSPacket(uchar *&Data)
      }
   return false;
 }
+
+// --- cDvbDeviceProbe -------------------------------------------------------
+
+cList<cDvbDeviceProbe> DvbDeviceProbes;
+
+cDvbDeviceProbe::cDvbDeviceProbe(void)
+{
+  DvbDeviceProbes.Add(this);
+}
+
+cDvbDeviceProbe::~cDvbDeviceProbe()
+{
+  DvbDeviceProbes.Del(this, false);
+}
diff --git a/dvbdevice.h b/dvbdevice.h
index 3e35d91ad..b6cc950a6 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -1,10 +1,10 @@
 /*
- * dvbdevice.h: The DVB device interface
+ * dvbdevice.h: The DVB device tuner interface
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.9 2009/10/25 13:58:20 kls Exp $
+ * $Id: dvbdevice.h 2.11 2010/01/04 14:07:12 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -14,7 +14,6 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/version.h>
 #include "device.h"
-#include "dvbspu.h"
 
 #if DVB_API_VERSION < 5
 #error VDR requires Linux DVB driver API version 5.0 or higher!
@@ -22,49 +21,55 @@
 
 #define MAXDVBDEVICES  8
 
+#define DEV_VIDEO         "/dev/video"
+#define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
+#define DEV_DVB_OSD       "osd"
+#define DEV_DVB_FRONTEND  "frontend"
+#define DEV_DVB_DVR       "dvr"
+#define DEV_DVB_DEMUX     "demux"
+#define DEV_DVB_VIDEO     "video"
+#define DEV_DVB_AUDIO     "audio"
+#define DEV_DVB_CA        "ca"
+
 class cDvbTuner;
 
 /// The cDvbDevice implements a DVB device which can be accessed through the Linux DVB driver API.
 
 class cDvbDevice : public cDevice {
+protected:
+  static cString DvbName(const char *Name, int Adapter, int Frontend);
+  static int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError = false);
 private:
-  static bool Probe(const char *FileName);
+  static bool Exists(int Adapter, int Frontend);
+         ///< Checks whether the given adapter/frontend exists.
+  static bool Probe(int Adapter, int Frontend);
          ///< Probes for existing DVB devices.
 public:
   static bool Initialize(void);
          ///< Initializes the DVB devices.
          ///< Must be called before accessing any DVB functions.
          ///< \return True if any devices are available.
+protected:
+  int adapter, frontend;
 private:
   dvb_frontend_info frontendInfo;
   int numProvidedSystems;
   fe_delivery_system frontendType;
-  int fd_osd, fd_audio, fd_video, fd_dvr, fd_stc, fd_ca;
-protected:
-  virtual void MakePrimaryDevice(bool On);
+  int fd_dvr, fd_ca;
 public:
-  cDvbDevice(int n);
+  cDvbDevice(int Adapter, int Frontend);
   virtual ~cDvbDevice();
   virtual bool Ready(void);
-  virtual bool HasDecoder(void) const;
 
 // Common Interface facilities:
 
 private:
   cCiAdapter *ciAdapter;
 
-// SPU facilities
-
-private:
-  cDvbSpuDecoder *spuDecoder;
-public:
-  virtual cSpuDecoder *GetSpuDecoder(void);
-
 // Channel facilities
 
 private:
   cDvbTuner *dvbTuner;
-  void TurnOffLiveMode(bool LiveView);
 public:
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
@@ -78,8 +83,6 @@ class cDvbDevice : public cDevice {
 
 // PID handle facilities
 
-private:
-  bool SetAudioBypass(bool On);
 protected:
   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 
@@ -94,67 +97,18 @@ class cDvbDevice : public cDevice {
 public:
   virtual bool HasCi(void);
 
-// Image Grab facilities
-
-private:
-  static int devVideoOffset;
-  int devVideoIndex;
-public:
-  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-
-// Video format facilities
-
-public:
-  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
-  virtual void SetVideoFormat(bool VideoFormat16_9);
-  virtual eVideoSystem GetVideoSystem(void);
-  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
-  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
-
-// Track facilities
-
-protected:
-  virtual void SetAudioTrackDevice(eTrackType Type);
-
 // Audio facilities
 
-private:
-  bool digitalAudio;
-  static int setTransferModeForDolbyDigital;
 protected:
-  virtual int GetAudioChannelDevice(void);
-  virtual void SetAudioChannelDevice(int AudioChannel);
-  virtual void SetVolumeDevice(int Volume);
-  virtual void SetDigitalAudioDevice(bool On);
+  static int setTransferModeForDolbyDigital;
 public:
-  static void SetTransferModeForDolbyDigital(int Mode);
+  static void SetTransferModeForDolbyDigital(int Mode); // needs to be here for backwards compatibilty
          ///< Controls how the DVB device handles Transfer Mode when replaying
          ///< Dolby Digital audio.
          ///< 0 = don't set "audio bypass" in driver/firmware, don't force Transfer Mode
          ///< 1 = set "audio bypass" in driver/firmware, force Transfer Mode (default)
          ///< 2 = don't set "audio bypass" in driver/firmware, force Transfer Mode
 
-// Player facilities
-
-protected:
-  ePlayMode playMode;
-  virtual bool CanReplay(void) const;
-  virtual bool SetPlayMode(ePlayMode PlayMode);
-  virtual int PlayVideo(const uchar *Data, int Length);
-  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
-  virtual int PlayTsVideo(const uchar *Data, int Length);
-  virtual int PlayTsAudio(const uchar *Data, int Length);
-public:
-  virtual int64_t GetSTC(void);
-  virtual void TrickSpeed(int Speed);
-  virtual void Clear(void);
-  virtual void Play(void);
-  virtual void Freeze(void);
-  virtual void Mute(void);
-  virtual void StillPicture(const uchar *Data, int Length);
-  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
-  virtual bool Flush(int TimeoutMs = 0);
-
 // Receiver facilities
 
 private:
@@ -165,4 +119,22 @@ class cDvbDevice : public cDevice {
   virtual bool GetTSPacket(uchar *&Data);
   };
 
+// A plugin that implements a DVB device derived from cDvbDevice needs to create
+// a cDvbDeviceProbe derived object on the heap in order to have its Probe()
+// function called, where it can actually create the appropriate device.
+// The cDvbDeviceProbe object must be created in the plugin's constructor,
+// and deleted in its destructor.
+
+class cDvbDeviceProbe : public cListObject {
+public:
+  cDvbDeviceProbe(void);
+  virtual ~cDvbDeviceProbe();
+  virtual bool Probe(int Adapter, int Frontend) = 0;
+     ///< Probes for a DVB device at the given Adapter and creates the appropriate
+     ///< object derived from cDvbDevice if applicable.
+     ///< Returns true if a device has been created.
+  };
+
+extern cList<cDvbDeviceProbe> DvbDeviceProbes;
+
 #endif //__DVBDEVICE_H
diff --git a/dvbosd.h b/dvbosd.h
deleted file mode 100644
index 3eb56f041..000000000
--- a/dvbosd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * dvbosd.h: Implementation of the DVB On Screen Display
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: dvbosd.h 2.0 2007/08/25 13:49:34 kls Exp $
- */
-
-#ifndef __DVBOSD_H
-#define __DVBOSD_H
-
-#include "osd.h"
-
-class cDvbOsdProvider : public cOsdProvider {
-private:
-  int osdDev;
-public:
-  cDvbOsdProvider(int OsdDev);
-  virtual cOsd *CreateOsd(int Left, int Top, uint Level);
-  };
-
-#endif //__DVBOSD_H
diff --git a/dvbplayer.c b/dvbplayer.c
index 9f964620d..d02884b01 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.17 2009/05/31 14:12:42 kls Exp $
+ * $Id: dvbplayer.c 2.19 2009/12/13 13:49:56 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -404,6 +404,8 @@ void cDvbPlayer::Action(void)
            cPoller Poller;
            DevicePoll(Poller, 10);
            Sleep = false;
+           if (playMode == pmStill || playMode==pmPause)
+              cCondWait::SleepMs(3);
            }
         {
           LOCK_THREAD;
@@ -666,6 +668,7 @@ void cDvbPlayer::Forward(void)
             trickSpeed = NORMAL_SPEED;
             TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
             break;
+       default: esyslog("ERROR: unknown playMode %d (%s)", playMode, __FUNCTION__);
        }
      }
 }
@@ -717,6 +720,7 @@ void cDvbPlayer::Backward(void)
             TrickSpeed(Setup.MultiSpeedMode ? -1 : -MAX_SPEEDS);
             }
             break;
+       default: esyslog("ERROR: unknown playMode %d (%s)", playMode, __FUNCTION__);
        }
      }
 }
diff --git a/dvbspu.c b/dvbspu.c
index 76ed4056c..488bd89f6 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.2 2009/11/22 14:17:59 kls Exp $
+ * $Id: dvbspu.c 2.7 2009/12/26 15:51:15 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <math.h>
-#include "device.h"
 
 /*
  * cDvbSpubitmap:
@@ -147,7 +146,7 @@ bool cDvbSpuBitmap::getMinSize(const aDvbSpuPalDescr paldescr,
         DEBUG("MinSize: (%d, %d) x (%d, %d)\n",
               size.x1, size.y1, size.x2, size.y2);
     if (size.x1 > size.x2 || size.y1 > size.y2)
-       return false;
+        return false;
 
     return ret;
 }
@@ -340,6 +339,35 @@ sDvbSpuRect cDvbSpuDecoder::CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDv
     return size;
 }
 
+int cDvbSpuBitmap::getMinBpp(const aDvbSpuPalDescr paldescr)
+{
+    int col = 1;
+    for (int i = 0; i < 4; i++) {
+        if (paldescr[i].trans != 0) {
+                col++;
+        }
+    }
+    return col > 2 ? 4 : 2;
+}
+
+int cDvbSpuDecoder::CalcAreaBpp(cBitmap *fgbmp, cBitmap *bgbmp)
+{
+        int fgbpp = 0;
+        int bgbpp = 0;
+        int ret;
+    if (fgbmp) {
+            fgbpp = spubmp->getMinBpp(hlpDescr);
+    }
+    if (bgbmp) {
+            bgbpp = spubmp->getMinBpp(palDescr);
+    }
+    ret = fgbpp + bgbpp;
+    if (ret > 2)
+            ret = 4;
+    return ret;
+}
+
+
 void cDvbSpuDecoder::Draw(void)
 {
     cMutexLock MutexLock(&mutex);
@@ -347,43 +375,92 @@ void cDvbSpuDecoder::Draw(void)
         Hide();
         return;
     }
-
+    sDvbSpuRect bgsize;
     cBitmap *fg = NULL;
     cBitmap *bg = NULL;
-    sDvbSpuRect bgsize;
-    sDvbSpuRect hlsize;
-
-    hlsize.x1 = hlpsize.x1;
-    hlsize.y1 = hlpsize.y1;
-    hlsize.x2 = hlpsize.x2;
-    hlsize.y2 = hlpsize.y2;
 
     if (highlight)
-        fg = spubmp->getBitmap(hlpDescr, palette, hlsize);
+        fg = spubmp->getBitmap(hlpDescr, palette, hlpsize);
 
     if (spubmp->getMinSize(palDescr, bgsize))
         bg = spubmp->getBitmap(palDescr, palette, bgsize);
 
-    sDvbSpuRect areaSize = CalcAreaSize(hlsize, fg, bgsize, bg);
+    if (!fg || !bg || !osd)
+        Hide();
 
-    if (!fg || !bg || !osd) {
-       Hide();
-       }
+    if (osd == NULL) {
+            restricted_osd = false;
+            osd = cOsdProvider::NewOsd(0, 0);
 
-    if (bg || fg) {
-        if (osd == NULL) {
-           osd = cOsdProvider::NewOsd(0, 0);
-           if ((areaSize.width() & 3) != 0)
-              areaSize.x2 += 4 - (areaSize.width() & 3);
-           tArea Area = { areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2 };
-           if (osd->SetAreas(&Area, 1) != oeOk)
+            tArea Area = { size.x1, size.y1, size.x2, size.y2, 4};
+            if (osd->CanHandleAreas(&Area, 1) != oeOk)
+                    restricted_osd = true;
+            else
+                osd->SetAreas(&Area, 1);
+    }
+    if (restricted_osd) {
+            sDvbSpuRect hlsize;
+            bool setarea = false;
+            /* reduce fg area (only valid if there is no bg below) */
+            if (fg) {
+                    spubmp->getMinSize(hlpDescr,hlsize);
+                    /* clip to the highligh area */
+                    setMax(hlsize.x1, hlpsize.x1);
+                    setMax(hlsize.y1, hlpsize.y1);
+                    setMin(hlsize.x2, hlpsize.x2);
+                    setMin(hlsize.y2, hlpsize.y2);
+                    if (hlsize.x1 > hlsize.x2 || hlsize.y1 > hlsize.y2) {
+                            hlsize.x1 = hlsize.x2 = hlsize.y1 = hlsize.y2 = 0;
+                    }
+            }
+            sDvbSpuRect areaSize = CalcAreaSize((fg && bg) ? hlpsize : hlsize, fg, bgsize, bg);
+
+#define DIV(a, b) (a/b)?:1
+            for (int d = 1; !setarea && d <= 2; d++) {
+
+                    /* first try old behaviour */
+                    tArea Area = { areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, DIV(CalcAreaBpp(fg, bg), d) };
+
+                    if ((Area.Width() & 7) != 0)
+                            Area.x2 += 8 - (Area.Width() & 7);
+
+                    if (osd->CanHandleAreas(&Area, 1) == oeOk &&
+                        osd->SetAreas(&Area, 1) == oeOk)
+                            setarea = true;
+
+                    /* second try to split area if there is both area */
+                    if (!setarea && fg && bg) {
+                            tArea Area_Both [2] = {
+                                    {bgsize.x1, bgsize.y1, bgsize.x2, bgsize.y2, DIV(CalcAreaBpp(0, bg), d)},
+                                    {hlpsize.x1, hlpsize.y1, hlpsize.x2, hlpsize.y2, DIV(CalcAreaBpp(fg, 0), d)}
+                            };
+                            if (!Area_Both[0].Intersects(Area_Both[1])) {
+                                    /* there is no intersection. We can reduce hl */
+                                    Area_Both[1].x1 = hlsize.x1;
+                                    Area_Both[1].y1 = hlsize.y1;
+                                    Area_Both[1].x2 = hlsize.x2;
+                                    Area_Both[1].y2 = hlsize.y2;
+
+                                    if ((Area_Both[0].Width() & 7) != 0)
+                                            Area_Both[0].x2 += 8 - (Area_Both[0].Width() & 7);
+                                    if ((Area_Both[1].Width() & 7) != 0)
+                                            Area_Both[1].x2 += 8 - (Area_Both[1].Width() & 7);
+                                    if (osd->CanHandleAreas(Area_Both, 2) == oeOk &&
+                                        osd->SetAreas(Area_Both, 2) == oeOk)
+                                            setarea = true;
+                            }
+                    }
+            }
+            if (!setarea)
               dsyslog("dvbspu: AreaSize (%d, %d) (%d, %d) Bpp %d", areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2 );
-           }
+    }
 
+    /* we could draw use DrawPixel on osd */
+    if (bg || fg) {
         if (bg)
            osd->DrawBitmap(bgsize.x1, bgsize.y1, *bg);
         if (fg)
-           osd->DrawBitmap(hlsize.x1, hlsize.y1, *fg);
+           osd->DrawBitmap(hlpsize.x1, hlpsize.y1, *fg);
         delete fg;
         delete bg;
 
@@ -514,6 +591,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
                 }
             }
             if (fodd != 0 && feven != 0) {
+                Hide();
                 delete spubmp;
                 spubmp = new cDvbSpuBitmap(size, spu + fodd, spu + feven,
                                            spu + feven, spu + cmdOffs());
diff --git a/dvbspu.h b/dvbspu.h
index 685681bee..9e33e4548 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 2.1 2009/05/09 16:26:45 kls Exp $
+ * $Id: dvbspu.h 2.4 2009/12/13 12:07:00 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -80,6 +80,7 @@ class cDvbSpuBitmap {
 
     bool getMinSize(const aDvbSpuPalDescr paldescr,
                     sDvbSpuRect & size) const;
+    int getMinBpp(const aDvbSpuPalDescr paldescr);
     cBitmap *getBitmap(const aDvbSpuPalDescr paldescr,
                        const cDvbSpuPalette & pal,
                        sDvbSpuRect & size) const;
@@ -97,6 +98,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
     uint32_t spupts;
     bool clean;
     bool ready;
+    bool restricted_osd;
 
     enum spFlag { spNONE, spHIDE, spSHOW, spMENU };
     spFlag state;
@@ -129,6 +131,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
     };
 
     sDvbSpuRect CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDvbSpuRect bgsize, cBitmap *bgbmp);
+    int CalcAreaBpp(cBitmap *fgbmp, cBitmap *bgbmp);
 
   public:
     cDvbSpuDecoder();
@@ -194,8 +197,7 @@ inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
 
 inline uint32_t cDvbSpuPalette::getColor(uint8_t idx, uint8_t trans) const
 {
-    uint8_t t = trans == 0x0f ? 0xff : trans << 4;
-    return palette[idx] | (t << 24);
+    return palette[idx] | ((trans == 0x0f) ? 0xff000000 : (trans << 28));
 }
 
 #endif                          // __DVBSPU_H
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index cd77fde6b..221523fda 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.2 2009/11/22 12:28:53 kls Exp $
+ * $Id: dvbsubtitle.c 2.3 2009/12/05 16:11:54 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -160,21 +160,22 @@ void cSubtitleObject::DecodeSubBlock(const uchar *Data, int Length, bool Even)
                    ;
              break;
         case 0x20: //TODO
-             dbgobjects("sub block 2 to 4 map");
+             dbgobjects("sub block 2 to 4 map\n");
              index += 4;
              break;
         case 0x21: //TODO
-             dbgobjects("sub block 2 to 8 map");
+             dbgobjects("sub block 2 to 8 map\n");
              index += 4;
              break;
         case 0x22: //TODO
-             dbgobjects("sub block 4 to 8 map");
+             dbgobjects("sub block 4 to 8 map\n");
              index += 16;
              break;
         case 0xF0:
              x = 0;
              y += 2;
              break;
+        default: dbgobjects("unknown sub block %s %d\n", __FUNCTION__, __LINE__);
         }
       }
 }
@@ -233,7 +234,7 @@ bool cSubtitleObject::Decode2BppCodeString(const uchar *Data, int &Index, int &x
         rl = 1; //color 0
      else {
         code = Get2Bits(Data, Index);
-        switch (code & 0x3) { //switch_3
+        switch (code & 3) { //switch_3
           case 0:
                return false;
           case 1:
@@ -247,6 +248,7 @@ bool cSubtitleObject::Decode2BppCodeString(const uchar *Data, int &Index, int &x
                rl = (Get2Bits(Data, Index) << 6) + (Get2Bits(Data, Index) << 4) + (Get2Bits(Data, Index) << 2) + Get2Bits(Data, Index) + 29;
                color = Get2Bits(Data, Index);
                break;
+          default: ;
           }
         }
      }
@@ -283,6 +285,7 @@ bool cSubtitleObject::Decode4BppCodeString(const uchar *Data, int &Index, int &x
                   rl = (Get4Bits(Data, Index) << 4) + Get4Bits(Data, Index) + 25;
                   color = Get4Bits(Data, Index);
                   break;
+             default: ;
              }
            }
         else {
@@ -516,6 +519,7 @@ void cDvbSubtitlePage::SetState(int State)
          break;
     case 3: // reserved
          break;
+    default: dbgpages("unknown page state (%s %d)\n", __FUNCTION__, __LINE__);
     }
 }
 
@@ -900,6 +904,7 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
                  case 2: region->FillRegion((Data[6 + 9] & 0x0C) >> 2); break;
                  case 4: region->FillRegion((Data[6 + 9] & 0xF0) >> 4); break;
                  case 8: region->FillRegion(Data[6 + 8]); break;
+                 default: dbgregions("unknown bpp %d (%s %d)\n", region->Bpp(), __FUNCTION__, __LINE__);
                  }
                }
             for (int i = 6 + 10; i < segmentLength; i += 6) {
diff --git a/eit.c b/eit.c
index 486784b2a..72d05cb69 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.6 2009/06/21 13:46:20 kls Exp $
+ * $Id: eit.c 2.10 2010/01/03 15:35:21 kls Exp $
  */
 
 #include "eit.h"
@@ -153,9 +153,40 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                     }
                  }
                  break;
-            case SI::ContentDescriptorTag:
+            case SI::ContentDescriptorTag: {
+                 SI::ContentDescriptor *cd = (SI::ContentDescriptor *)d;
+                 SI::ContentDescriptor::Nibble Nibble;
+                 int NumContents = 0;
+                 uchar Contents[MAXEVCONTENTS] = { 0 };
+                 for (SI::Loop::Iterator it3; cd->nibbleLoop.getNext(Nibble, it3); ) {
+                     if (NumContents < MAXEVCONTENTS) {
+                        Contents[NumContents] = ((Nibble.getContentNibbleLevel1() & 0xF) << 4) | (Nibble.getContentNibbleLevel2() & 0xF);
+                        NumContents++;
+                        }
+                     }
+                 pEvent->SetContents(Contents);
+                 }
                  break;
-            case SI::ParentalRatingDescriptorTag:
+            case SI::ParentalRatingDescriptorTag: {
+                 int LanguagePreferenceRating = -1;
+                 SI::ParentalRatingDescriptor *prd = (SI::ParentalRatingDescriptor *)d;
+                 SI::ParentalRatingDescriptor::Rating Rating;
+                 for (SI::Loop::Iterator it3; prd->ratingLoop.getNext(Rating, it3); ) {
+                     if (I18nIsPreferredLanguage(Setup.EPGLanguages, Rating.languageCode, LanguagePreferenceRating)) {
+                        int ParentalRating = (Rating.getRating() & 0xFF);
+                        switch (ParentalRating) {
+                          // values defined by the DVB standard (minimum age = rating + 3 years):
+                          case 0x01 ... 0x0F: ParentalRating += 3; break;
+                          // values defined by broadcaster CSAT (now why didn't they just use 0x07, 0x09 and 0x0D?):
+                          case 0x11:          ParentalRating = 10; break;
+                          case 0x12:          ParentalRating = 12; break;
+                          case 0x13:          ParentalRating = 16; break;
+                          default:            ParentalRating = 0;
+                          }
+                        pEvent->SetParentalRating(ParentalRating);
+                        }
+                     }
+                 }
                  break;
             case SI::PDCDescriptorTag: {
                  SI::PDCDescriptor *pd = (SI::PDCDescriptor *)d;
@@ -320,6 +351,8 @@ cTDT::cTDT(const u_char *Data)
 
 // --- cEitFilter ------------------------------------------------------------
 
+time_t cEitFilter::disableUntil = 0;
+
 cEitFilter::cEitFilter(void)
 {
   Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X)
@@ -327,8 +360,19 @@ cEitFilter::cEitFilter(void)
      Set(0x14, 0x70);     // TDT
 }
 
+void cEitFilter::SetDisableUntil(time_t Time)
+{
+  disableUntil = Time;
+}
+
 void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
+  if (disableUntil) {
+     if (time(NULL) > disableUntil)
+        disableUntil = 0;
+     else
+        return;
+     }
   switch (Pid) {
     case 0x12: {
          if (Tid >= 0x4E && Tid <= 0x6F) {
@@ -354,5 +398,6 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             cTDT TDT(Data);
          }
          break;
+    default: ;
     }
 }
diff --git a/eit.h b/eit.h
index ae3f9d12f..b5523728d 100644
--- a/eit.h
+++ b/eit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eit.h 2.0 2003/12/21 14:51:50 kls Exp $
+ * $Id: eit.h 2.1 2010/01/03 15:28:34 kls Exp $
  */
 
 #ifndef __EIT_H
@@ -13,10 +13,13 @@
 #include "filter.h"
 
 class cEitFilter : public cFilter {
+private:
+  static time_t disableUntil;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
   cEitFilter(void);
+  static void SetDisableUntil(time_t Time);
   };
 
 #endif //__EIT_H
diff --git a/epg.c b/epg.c
index 0c52a0c86..e1cfe18d8 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.1 2008/05/01 14:53:55 kls Exp $
+ * $Id: epg.c 2.4 2010/01/03 14:10:20 kls Exp $
  */
 
 #include "epg.h"
@@ -112,6 +112,8 @@ cEvent::cEvent(tEventID EventID)
   shortText = NULL;
   description = NULL;
   components = NULL;
+  memset(contents, 0, sizeof(contents));
+  parentalRating = 0;
   startTime = 0;
   duration = 0;
   vps = 0;
@@ -186,6 +188,17 @@ void cEvent::SetComponents(cComponents *Components)
   components = Components;
 }
 
+void cEvent::SetContents(uchar *Contents)
+{
+  for (int i = 0; i < MAXEVCONTENTS; i++)
+      contents[i] = Contents[i];
+}
+
+void cEvent::SetParentalRating(int ParentalRating)
+{
+  parentalRating = ParentalRating;
+}
+
 void cEvent::SetStartTime(time_t StartTime)
 {
   if (startTime != StartTime) {
@@ -234,6 +247,155 @@ bool cEvent::IsRunning(bool OrAboutToStart) const
   return runningStatus >= (OrAboutToStart ? SI::RunningStatusStartsInAFewSeconds : SI::RunningStatusPausing);
 }
 
+const char *cEvent::ContentToString(uchar Content)
+{
+  switch (Content & 0xF0) {
+    case EVCONTENTMASK_MOVIEDRAMA:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Movie/Drama");
+           case 0x01: return tr("Content$Detective/Thriller");
+           case 0x02: return tr("Content$Adventure/Western/War");
+           case 0x03: return tr("Content$Science Fiction/Fantasy/Horror");
+           case 0x04: return tr("Content$Comedy");
+           case 0x05: return tr("Content$Soap/Melodrama/Folkloric");
+           case 0x06: return tr("Content$Romance");
+           case 0x07: return tr("Content$Serious/Classical/Religious/Historical Movie/Drama");
+           case 0x08: return tr("Content$Adult Movie/Drama");
+           }
+         break;
+    case EVCONTENTMASK_NEWSCURRENTAFFAIRS:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$News/Current Affairs");
+           case 0x01: return tr("Content$News/Weather Report");
+           case 0x02: return tr("Content$News Magazine");
+           case 0x03: return tr("Content$Documentary");
+           case 0x04: return tr("Content$Discussion/Inverview/Debate");
+           }
+         break;
+    case EVCONTENTMASK_SHOW:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Show/Game Show");
+           case 0x01: return tr("Content$Game Show/Quiz/Contest");
+           case 0x02: return tr("Content$Variety Show");
+           case 0x03: return tr("Content$Talk Show");
+           }
+         break;
+    case EVCONTENTMASK_SPORTS:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Sports");
+           case 0x01: return tr("Content$Special Event");
+           case 0x02: return tr("Content$Sport Magazine");
+           case 0x03: return tr("Content$Football/Soccer");
+           case 0x04: return tr("Content$Tennis/Squash");
+           case 0x05: return tr("Content$Team Sports");
+           case 0x06: return tr("Content$Athletics");
+           case 0x07: return tr("Content$Motor Sport");
+           case 0x08: return tr("Content$Water Sport");
+           case 0x09: return tr("Content$Winter Sports");
+           case 0x0A: return tr("Content$Equestrian");
+           case 0x0B: return tr("Content$Martial Sports");
+           }
+         break;
+    case EVCONTENTMASK_CHILDRENYOUTH:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Children's/Youth Programme");
+           case 0x01: return tr("Content$Pre-school Children's Programme");
+           case 0x02: return tr("Content$Entertainment Programme for 6 to 14");
+           case 0x03: return tr("Content$Entertainment Programme for 10 to 16");
+           case 0x04: return tr("Content$Informational/Educational/School Programme");
+           case 0x05: return tr("Content$Cartoons/Puppets");
+           }
+         break;
+    case EVCONTENTMASK_MUSICBALLETDANCE:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Music/Ballet/Dance");
+           case 0x01: return tr("Content$Rock/Pop");
+           case 0x02: return tr("Content$Serious/Classical Music");
+           case 0x03: return tr("Content$Folk/Tradional Music");
+           case 0x04: return tr("Content$Jazz");
+           case 0x05: return tr("Content$Musical/Opera");
+           case 0x06: return tr("Content$Ballet");
+           }
+         break;
+    case EVCONTENTMASK_ARTSCULTURE:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Arts/Culture");
+           case 0x01: return tr("Content$Performing Arts");
+           case 0x02: return tr("Content$Fine Arts");
+           case 0x03: return tr("Content$Religion");
+           case 0x04: return tr("Content$Popular Culture/Traditional Arts");
+           case 0x05: return tr("Content$Literature");
+           case 0x06: return tr("Content$Film/Cinema");
+           case 0x07: return tr("Content$Experimental Film/Video");
+           case 0x08: return tr("Content$Broadcasting/Press");
+           case 0x09: return tr("Content$New Media");
+           case 0x0A: return tr("Content$Arts/Culture Magazine");
+           case 0x0B: return tr("Content$Fashion");
+           }
+         break;
+    case EVCONTENTMASK_SOCIALPOLITICALECONOMICS:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Social/Political/Economics");
+           case 0x01: return tr("Content$Magazine/Report/Documentary");
+           case 0x02: return tr("Content$Economics/Social Advisory");
+           case 0x03: return tr("Content$Remarkable People");
+           }
+         break;
+    case EVCONTENTMASK_EDUCATIONALSCIENCE:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Education/Science/Factual");
+           case 0x01: return tr("Content$Nature/Animals/Environment");
+           case 0x02: return tr("Content$Technology/Natural Sciences");
+           case 0x03: return tr("Content$Medicine/Physiology/Psychology");
+           case 0x04: return tr("Content$Foreign Countries/Expeditions");
+           case 0x05: return tr("Content$Social/Spiritual Sciences");
+           case 0x06: return tr("Content$Further Education");
+           case 0x07: return tr("Content$Languages");
+           }
+         break;
+    case EVCONTENTMASK_LEISUREHOBBIES:
+         switch (Content & 0x0F) {
+           default:
+           case 0x00: return tr("Content$Leisure/Hobbies");
+           case 0x01: return tr("Content$Tourism/Travel");
+           case 0x02: return tr("Content$Handicraft");
+           case 0x03: return tr("Content$Motoring");
+           case 0x04: return tr("Content$Fitness & Health");
+           case 0x05: return tr("Content$Cooking");
+           case 0x06: return tr("Content$Advertisement/Shopping");
+           case 0x07: return tr("Content$Gardening");
+           }
+         break;
+    case EVCONTENTMASK_SPECIAL:
+         switch (Content & 0x0F) {
+           case 0x00: return tr("Content$Original Language");
+           case 0x01: return tr("Content$Black & White");
+           case 0x02: return tr("Content$Unpublished");
+           case 0x03: return tr("Content$Live Broadcast");
+           default: ;
+           }
+         break;
+    default: ;
+    }
+  return "";
+}
+
+cString cEvent::GetParentalRatingString(void) const
+{
+  if (parentalRating)
+     return cString::sprintf(tr("ParentalRating$from %d"), parentalRating);
+  return NULL;
+}
+
 cString cEvent::GetDateString(void) const
 {
   return DateString(startTime);
@@ -270,6 +432,14 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
         fprintf(f, "%sD %s\n", Prefix, description);
         strreplace(description, '|', '\n');
         }
+     if (contents[0]) {
+        fprintf(f, "%sG", Prefix);
+        for (int i = 0; Contents(i); i++)
+            fprintf(f, " %02X", Contents(i));
+        fprintf(f, "\n");
+        }
+     if (parentalRating)
+        fprintf(f, "%sR %d\n", Prefix, parentalRating);
      if (components) {
         for (int i = 0; i < components->NumComponents(); i++) {
             tComponent *p = components->Component(i);
@@ -296,6 +466,22 @@ bool cEvent::Parse(char *s)
     case 'D': strreplace(t, '|', '\n');
               SetDescription(t);
               break;
+    case 'G': {
+                memset(contents, 0, sizeof(contents));
+                for (int i = 0; i < MAXEVCONTENTS; i++) {
+                    char *tail = NULL;
+                    int c = strtol(t, &tail, 16);
+                    if (0x00 < c && c <= 0xFF) {
+                       contents[i] = c;
+                       t = tail;
+                       }
+                    else
+                       break;
+                    }
+              }
+              break;
+    case 'R': SetParentalRating(atoi(t));
+              break;
     case 'X': if (!components)
                  components = new cComponents;
               components->SetComponent(components->NumComponents(), t);
@@ -603,6 +789,7 @@ void cEvent::FixEpgBugs(void)
                      case 0x0F: p->description = strdup("HD 16:9"); break;
                      case 0x0C:
                      case 0x10: p->description = strdup("HD >16:9"); break;
+                     default: ;
                      }
                    EpgBugFixStat(9, ChannelID());
                    }
@@ -621,12 +808,13 @@ void cEvent::FixEpgBugs(void)
                 if (!p->description) {
                    switch (p->type) {
                      case 0x05: p->description = strdup("Dolby Digital"); break;
-                     // all others will just display the language
+                     default: ; // all others will just display the language
                      }
                    EpgBugFixStat(11, ChannelID());
                    }
                 }
                 break;
+           default: ;
            }
          }
      }
@@ -863,6 +1051,7 @@ void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtT
                p->Dump(f, Prefix);
             }
             break;
+       default: esyslog("ERROR: unknown DumpMode %d (%s %d)", DumpMode, __FUNCTION__, __LINE__);
        }
      fprintf(f, "%sc\n", Prefix);
      }
diff --git a/epg.h b/epg.h
index 9acfa8264..fbc9e061e 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.0 2006/10/07 13:47:19 kls Exp $
+ * $Id: epg.h 2.3 2010/01/03 14:39:14 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -19,6 +19,20 @@
 
 #define MAXEPGBUGFIXLEVEL 3
 
+#define MAXEVCONTENTS                          4
+#define EVCONTENTMASK_MOVIEDRAMA               0x10
+#define EVCONTENTMASK_NEWSCURRENTAFFAIRS       0x20
+#define EVCONTENTMASK_SHOW                     0x30
+#define EVCONTENTMASK_SPORTS                   0x40
+#define EVCONTENTMASK_CHILDRENYOUTH            0x50
+#define EVCONTENTMASK_MUSICBALLETDANCE         0x60
+#define EVCONTENTMASK_ARTSCULTURE              0x70
+#define EVCONTENTMASK_SOCIALPOLITICALECONOMICS 0x80
+#define EVCONTENTMASK_EDUCATIONALSCIENCE       0x90
+#define EVCONTENTMASK_LEISUREHOBBIES           0xA0
+#define EVCONTENTMASK_SPECIAL                  0xB0
+#define EVCONTENTMASK_USERDEFINED              0xF0
+
 enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
 
 struct tComponent {
@@ -53,15 +67,18 @@ typedef u_int32_t tEventID;
 class cEvent : public cListObject {
   friend class cSchedule;
 private:
+  // The sequence of these parameters is optimized for minimal memory waste!
   cSchedule *schedule;     // The Schedule this event belongs to
   tEventID eventID;        // Event ID of this event
   uchar tableID;           // Table ID this event came from
   uchar version;           // Version number of section this event came from
-  int runningStatus;       // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running
+  uchar runningStatus;     // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running
+  uchar parentalRating;    // Parental rating of this event
   char *title;             // Title of this event
   char *shortText;         // Short description of this event (typically the episode name in case of a series)
   char *description;       // Description of this event
   cComponents *components; // The stream components of this event
+  uchar contents[MAXEVCONTENTS]; // Contents of this event
   time_t startTime;        // Start time of this event
   int duration;            // Duration of this event in seconds
   time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
@@ -80,6 +97,8 @@ class cEvent : public cListObject {
   const char *ShortText(void) const { return shortText; }
   const char *Description(void) const { return description; }
   const cComponents *Components(void) const { return components; }
+  uchar Contents(int i = 0) const { return (0 <= i && i < MAXEVCONTENTS) ? contents[i] : 0; }
+  int ParentalRating(void) const { return parentalRating; }
   time_t StartTime(void) const { return startTime; }
   time_t EndTime(void) const { return startTime + duration; }
   int Duration(void) const { return duration; }
@@ -88,6 +107,8 @@ class cEvent : public cListObject {
   bool SeenWithin(int Seconds) const { return time(NULL) - seen < Seconds; }
   bool HasTimer(void) const;
   bool IsRunning(bool OrAboutToStart = false) const;
+  static const char *ContentToString(uchar Content);
+  cString GetParentalRatingString(void) const;
   cString GetDateString(void) const;
   cString GetTimeString(void) const;
   cString GetEndTimeString(void) const;
@@ -100,6 +121,8 @@ class cEvent : public cListObject {
   void SetShortText(const char *ShortText);
   void SetDescription(const char *Description);
   void SetComponents(cComponents *Components); // Will take ownership of Components!
+  void SetContents(uchar *Contents);
+  void SetParentalRating(int ParentalRating);
   void SetStartTime(time_t StartTime);
   void SetDuration(int Duration);
   void SetVps(time_t Vps);
diff --git a/font.c b/font.c
index 3fa97df79..515017bab 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 2.2 2009/05/03 11:15:39 kls Exp $
+ * $Id: font.c 2.4 2009/12/31 14:49:59 kls Exp $
  */
 
 #include "font.h"
@@ -93,6 +93,8 @@ void cGlyph::SetKerningCache(uint PrevSym, int Kerning)
 
 class cFreetypeFont : public cFont {
 private:
+  cString fontName;
+  int size;
   int height;
   int bottom;
   FT_Library library; ///< Handle to library
@@ -105,6 +107,8 @@ class cFreetypeFont : public cFont {
 public:
   cFreetypeFont(const char *Name, int CharHeight, int CharWidth = 0);
   virtual ~cFreetypeFont();
+  virtual const char *FontName(void) const { return fontName; }
+  virtual int Size(void) const { return size; }
   virtual int Width(uint c) const;
   virtual int Width(const char *s) const;
   virtual int Height(void) const { return height; }
@@ -113,6 +117,8 @@ class cFreetypeFont : public cFont {
 
 cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
 {
+  fontName = Name;
+  size = CharHeight;
   height = 0;
   bottom = 0;
   int error = FT_Init_FreeType(&library);
@@ -346,6 +352,7 @@ const cFont *cFont::GetFont(eDvbFont Font)
        case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break;
        case fontSml: SetFont(Font, Setup.FontSml, Setup.FontSmlSize); break;
        case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break;
+       default: esyslog("ERROR: unknown Font %d (%s %d)", Font, __FUNCTION__, __LINE__);
        }
      }
   return fonts[Font];
diff --git a/font.h b/font.h
index eadf88c1d..449b429f1 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.2 2009/05/23 10:10:40 kls Exp $
+ * $Id: font.h 2.3 2009/12/31 14:48:25 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -38,6 +38,11 @@ class cFont {
   static cFont *fonts[];
 public:
   virtual ~cFont() {}
+  virtual const char *FontName(void) const { return ""; }
+          ///< Returns the font name.
+  virtual int Size(void) const { return Height(); }
+          ///< Returns the original size as requested when the font was created.
+          ///< This may be different than the actual height. 
   virtual int Width(uint c) const = 0;
           ///< Returns the width of the given character in pixel.
   virtual int Width(const char *s) const = 0;
diff --git a/libsi/si.c b/libsi/si.c
index bf00041c2..01ab9bf2f 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.0 2008/03/05 17:00:55 kls Exp $
+ *   $Id: si.c 2.1 2009/12/05 16:20:12 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -720,6 +720,7 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
             break;
       }
       break;
+   default: ; // unknown domain, nothing to do
    }
    d->setData(da);
    return d;
diff --git a/libsi/si.h b/libsi/si.h
index 9d47d306c..b28b14abf 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 2.1 2008/09/06 12:44:06 kls Exp $
+ *   $Id: si.h 2.2 2009/12/06 11:37:35 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -411,6 +411,8 @@ template <typename T> class TypeLoop : public Loop {
             return data.FourBytes(index);
          case 8:
             return (SixtyFourBit(data.FourBytes(index)) << 32) | data.FourBytes(index+4);
+         default:
+            return 0; // just to avoid a compiler warning
          }
          return 0; // just to avoid a compiler warning
       }
diff --git a/menu.c b/menu.c
index 05793e821..b0077a0df 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.9 2009/06/21 09:56:06 kls Exp $
+ * $Id: menu.c 2.10 2009/12/06 11:29:05 kls Exp $
  */
 
 #include "menu.h"
@@ -1373,6 +1373,7 @@ eOSState cMenuSchedule::Number(void)
     case cMenuScheduleItem::ssmThisThis: PrepareScheduleThisThis(Event, Channel); break;
     case cMenuScheduleItem::ssmThisAll:  PrepareScheduleThisAll(Event, Channel); break;
     case cMenuScheduleItem::ssmAllAll:   PrepareScheduleAllAll(Event, Channel); break;
+    default: esyslog("ERROR: unknown SortMode %d (%s %d)", cMenuScheduleItem::SortMode(), __FUNCTION__, __LINE__);
     }
   CurrentItem = (cMenuScheduleItem *)Get(Current());
   Sort();
@@ -1897,6 +1898,7 @@ void cMenuRecordings::SetHelpKeys(void)
        case 1: SetHelp(tr("Button$Open")); break;
        case 2:
        case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), NewHelpKeys == 3 ? tr("Button$Info") : NULL);
+       default: ;
        }
      helpKeys = NewHelpKeys;
      }
@@ -2242,18 +2244,18 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         Utf8Strn0Cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme));
         ModifiedAppearance |= themeIndex != originalThemeIndex;
         }
-     if (data.OSDLeftP != Setup.OSDLeftP || data.OSDTopP != Setup.OSDTopP || data.OSDWidthP != Setup.OSDWidthP || data.OSDHeightP != Setup.OSDHeightP)
+     if (!(DoubleEqual(data.OSDLeftP, Setup.OSDLeftP) && DoubleEqual(data.OSDTopP, Setup.OSDTopP) && DoubleEqual(data.OSDWidthP, Setup.OSDWidthP) && DoubleEqual(data.OSDHeightP, Setup.OSDHeightP)))
         ModifiedAppearance = true;
      if (data.UseSmallFont != Setup.UseSmallFont || data.AntiAlias != Setup.AntiAlias)
         ModifiedAppearance = true;
      Utf8Strn0Cpy(data.FontOsd, fontOsdNames[fontOsdIndex], sizeof(data.FontOsd));
      Utf8Strn0Cpy(data.FontSml, fontSmlNames[fontSmlIndex], sizeof(data.FontSml));
      Utf8Strn0Cpy(data.FontFix, fontFixNames[fontFixIndex], sizeof(data.FontFix));
-     if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSizeP != Setup.FontOsdSizeP)
+     if (strcmp(data.FontOsd, Setup.FontOsd) || !DoubleEqual(data.FontOsdSizeP, Setup.FontOsdSizeP))
         ModifiedAppearance = true;
-     if (strcmp(data.FontSml, Setup.FontSml) || data.FontSmlSizeP != Setup.FontSmlSizeP)
+     if (strcmp(data.FontSml, Setup.FontSml) || !DoubleEqual(data.FontSmlSizeP, Setup.FontSmlSizeP))
         ModifiedAppearance = true;
-     if (strcmp(data.FontFix, Setup.FontFix) || data.FontFixSizeP != Setup.FontFixSizeP)
+     if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
         ModifiedAppearance = true;
      }
 
@@ -3152,6 +3154,7 @@ static void SetTrackDescriptions(int LiveChannel)
                    break;
            case 4: cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, LiveChannel ? NULL : p->language, p->description);
                    break;
+           default: ;
            }
          }
      }
diff --git a/menuitems.c b/menuitems.c
index df14b10d4..05521ad9c 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.4 2009/05/03 13:37:55 kls Exp $
+ * $Id: menuitems.c 2.5 2009/12/06 11:31:20 kls Exp $
  */
 
 #include "menuitems.h"
@@ -257,7 +257,7 @@ eOSState cMenuEditPrcItem::ProcessKey(eKeys Key)
             return state;
        }
      newValue /= factor;
-     if (newValue != *value && (!fresh || min <= newValue) && newValue <= max) {
+     if (!DoubleEqual(newValue, *value) && (!fresh || min <= newValue) && newValue <= max) {
         *value = newValue;
         Set();
         }
@@ -666,6 +666,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                                           return ProcessKey(kYellow);
                                           }
                                        break;
+                            default: ;
                             }
                           }
                        }
@@ -675,6 +676,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
                          case kfEnd:  pos = lengthUtf8 - 1; break;
                          case kfIns:  return ProcessKey(kGreen);
                          case kfDel:  return ProcessKey(kYellow);
+                         default: ;
                          }
                        }
                     }
@@ -975,6 +977,7 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
                      pos++;
                      }
                   break;
+          default: ;
           }
         }
      else if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
diff --git a/newplugin b/newplugin
index 22e2b72e3..52ef72ea2 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.0 2008/01/13 13:00:23 kls Exp $
+# $Id: newplugin 2.1 2009/12/06 15:31:58 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -104,6 +104,8 @@ INCLUDES += -I\$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
 ### The object files (add further files here):
 
 OBJS = \$(PLUGIN).o
diff --git a/nit.c b/nit.c
index 2ec89609c..38640409d 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.3 2008/12/20 10:57:50 kls Exp $
+ * $Id: nit.c 2.4 2009/12/06 11:36:16 kls Exp $
  */
 
 #include "nit.h"
@@ -110,6 +110,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                   case 1: f = BCD2INT(f) / 100; break;
                   case 2: f = BCD2INT(f) / 10; break;
                   case 3: f = f * 10;  break;
+                  default: ;
                   }
                 Frequencies[n++] = f;
                 }
diff --git a/osd.c b/osd.c
index d16dafbd8..5529f1212 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.5 2009/05/09 10:42:35 kls Exp $
+ * $Id: osd.c 2.6 2009/12/06 11:33:47 kls Exp $
  */
 
 #include "osd.h"
@@ -101,6 +101,7 @@ void cPalette::Take(const cPalette &Palette, tIndexes *Indexes, tColor ColorFg,
          switch (i) {
            case 0: Color = ColorBg; break;
            case 1: Color = ColorFg; break;
+           default: ;
            }
          }
       int n = Index(Color);
@@ -532,6 +533,7 @@ void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quad
     case 6:          cy = y2; rx /= 2; break;
     case 7: cx = x2;          ry /= 2; break;
     case 8:          cy = y1; rx /= 2; break;
+    default: ;
     }
   int TwoASquare = 2 * rx * rx;
   int TwoBSquare = 2 * ry * ry;
@@ -557,6 +559,7 @@ void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quad
           case -2: DrawRectangle(x1,     cy - y, cx - x, cy - y, Color); break;
           case -3: DrawRectangle(x1,     cy + y, cx - x, cy + y, Color); break;
           case -4: DrawRectangle(cx + x, cy + y, x2,     cy + y, Color); break;
+          default: ;
           }
         y++;
         StoppingY += TwoASquare;
@@ -591,6 +594,7 @@ void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quad
           case -2: DrawRectangle(x1,     cy - y, cx - x, cy - y, Color); break;
           case -3: DrawRectangle(x1,     cy + y, cx - x, cy + y, Color); break;
           case -4: DrawRectangle(cx + x, cy + y, x2,     cy + y, Color); break;
+          default: ;
           }
         x++;
         StoppingX += TwoBSquare;
@@ -921,7 +925,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
   int Height;
   double Aspect;
   cDevice::PrimaryDevice()->GetOsdSize(Width, Height, Aspect);
-  if (Width != oldWidth || Height != oldHeight || Aspect != oldAspect || Force) {
+  if (Width != oldWidth || Height != oldHeight || !DoubleEqual(Aspect, oldAspect) || Force) {
      Setup.OSDLeft = int(round(Width * Setup.OSDLeftP));
      Setup.OSDTop = int(round(Height * Setup.OSDTopP));
      Setup.OSDWidth = int(round(Width * Setup.OSDWidthP)) & ~0x07; // OSD width must be a multiple of 8
diff --git a/pat.c b/pat.c
index cc96cd9df..9b3ded61e 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.4 2009/08/16 15:01:03 kls Exp $
+ * $Id: pat.c 2.7 2010/01/01 15:40:05 kls Exp $
  */
 
 #include "pat.h"
@@ -144,7 +144,7 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, int EsPid)
   q += sprintf(q, "CAM: %04X %5d %5d %04X %04X -", source, transponder, serviceId, d->getCaType(), EsPid);
   for (int i = 0; i < nca->Length(); i++)
       q += sprintf(q, " %02X", nca->Data()[i]);
-  dsyslog(buffer);
+  dsyslog("%s", buffer);
 #endif
 }
 
@@ -345,6 +345,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int NumDpids = 0;
         int NumSpids = 0;
         for (SI::Loop::Iterator it; pmt.streamLoop.getNext(stream, it); ) {
+            bool ProcessCaDescriptors = false;
             int esPid = stream.getPid();
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
@@ -353,6 +354,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       Vpid = esPid;
                       Ppid = pmt.getPCRPid();
                       Vtype = stream.getStreamType();
+                      ProcessCaDescriptors = true;
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
               case 4: // STREAMTYPE_13818_AUDIO
@@ -385,6 +387,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                              }
                          NumApids++;
                          }
+                      ProcessCaDescriptors = true;
                       }
                       break;
               case 5: // STREAMTYPE_13818_PRIVATE
@@ -398,6 +401,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                           switch (d->getDescriptorTag()) {
                             case SI::AC3DescriptorTag:
                                  dpid = esPid;
+                                 ProcessCaDescriptors = true;
                                  break;
                             case SI::SubtitlingDescriptorTag:
                                  if (NumSpids < MAXSPIDS) {
@@ -443,12 +447,14 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       }
                       break;
-              //default: printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());//XXX
+              default: ;//printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());
               }
-            for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)stream.streamDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
-                CaDescriptors->AddCaDescriptor(d, esPid);
-                delete d;
-                }
+            if (ProcessCaDescriptors) {
+               for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)stream.streamDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
+                   CaDescriptors->AddCaDescriptor(d, esPid);
+                   delete d;
+                   }
+               }
             }
         if (Setup.UpdateChannels >= 2) {
            Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
diff --git a/plugin.c b/plugin.c
index 240d4b481..97b4436ab 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 2.1 2009/04/05 10:16:48 kls Exp $
+ * $Id: plugin.c 2.2 2010/01/06 11:36:46 kls Exp $
  */
 
 #include "plugin.h"
@@ -172,15 +172,15 @@ cDll::~cDll()
 static char *SkipQuote(char *s)
 {
   char c = *s;
-  strcpy(s, s + 1);
+  memmove(s, s + 1, strlen(s));
   while (*s && *s != c) {
         if (*s == '\\')
-           strcpy(s, s + 1);
+           memmove(s, s + 1, strlen(s));
         if (*s)
            s++;
         }
   if (*s) {
-     strcpy(s, s + 1);
+     memmove(s, s + 1, strlen(s));
      return s;
      }
   esyslog("ERROR: missing closing %c", c);
@@ -215,7 +215,7 @@ bool cDll::Load(bool Log)
               if (!q)
                  q = p;
               switch (*p) {
-                case '\\': strcpy(p, p + 1);
+                case '\\': memmove(p, p + 1, strlen(p));
                            if (*p)
                               p++;
                            else {
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8915752e5..14f3c2188 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -42,6 +42,247 @@ msgstr "No puc iniciar el mode de transfer
 msgid "Starting EPG scan"
 msgstr "Iniciant exploraci� EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Sense t�tol"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index b32c293e2..6394008e7 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -40,6 +40,247 @@ msgstr "Nelze za
 msgid "Starting EPG scan"
 msgstr "Za��n� prohled�v�n� EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Bez n�zvu"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 5bcf77697..faa3632da 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -39,6 +39,247 @@ msgstr "Kan ikke starte Transfer Mode!"
 msgid "Starting EPG scan"
 msgstr "Starter EPG skanning"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Ingen titel"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index c6c875dd3..ff25a3344 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-11-25 15:19+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
@@ -39,6 +39,247 @@ msgstr "Transfer-Mode kann nicht gestartet werden!"
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
 
+msgid "Content$Movie/Drama"
+msgstr "Film/Drama"
+
+msgid "Content$Detective/Thriller"
+msgstr "Detektiv/Thriller"
+
+msgid "Content$Adventure/Western/War"
+msgstr "Abenteuer/Western/Krieg"
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr "Science-Fiction/Fantasy/Horror"
+
+msgid "Content$Comedy"
+msgstr "Kom�die"
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr "Seife/Melodram/Folklore"
+
+msgid "Content$Romance"
+msgstr "Romanze"
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr "Ernst/Klassik/Religion/Historischer Film/Drama"
+
+msgid "Content$Adult Movie/Drama"
+msgstr "Erwachsenen-Film/Drama"
+
+msgid "Content$News/Current Affairs"
+msgstr "Aktuelle Angelegenheiten"
+
+msgid "Content$News/Weather Report"
+msgstr "Wetterbericht"
+
+msgid "Content$News Magazine"
+msgstr "Nachrichtenmagazin"
+
+msgid "Content$Documentary"
+msgstr "Dokumentation"
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr "Diskussion/Interview/Debatte"
+
+msgid "Content$Show/Game Show"
+msgstr "Show/Spielshow"
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr "Spielshow/Quiz/Wettbewerb"
+
+msgid "Content$Variety Show"
+msgstr "Variete-Show"
+
+msgid "Content$Talk Show"
+msgstr "Talkshow"
+
+msgid "Content$Sports"
+msgstr "Sport"
+
+msgid "Content$Special Event"
+msgstr "Besonderes Ereignis"
+
+msgid "Content$Sport Magazine"
+msgstr "Sportmagazin"
+
+msgid "Content$Football/Soccer"
+msgstr "Football/Fu�ball"
+
+msgid "Content$Tennis/Squash"
+msgstr "Tennis/Squash"
+
+msgid "Content$Team Sports"
+msgstr "Mannschaftssport"
+
+msgid "Content$Athletics"
+msgstr "Athletik"
+
+msgid "Content$Motor Sport"
+msgstr "Motorsport"
+
+msgid "Content$Water Sport"
+msgstr "Wassersport"
+
+msgid "Content$Winter Sports"
+msgstr "Wintersport"
+
+msgid "Content$Equestrian"
+msgstr "Reitsport"
+
+msgid "Content$Martial Sports"
+msgstr "Kampfsport"
+
+msgid "Content$Children's/Youth Programme"
+msgstr "Kinder/Jugendprogramm"
+
+msgid "Content$Pre-school Children's Programme"
+msgstr "Programm f�r Vorschulkinder"
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr "Unterhaltungsprogramm f�r 6 bis 14"
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr "Unterhaltungsprogramm f�r 10 bis 16"
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr "Informations/Lehr/Schul-Programm"
+
+msgid "Content$Cartoons/Puppets"
+msgstr "Zeichentrick/Puppen"
+
+msgid "Content$Music/Ballet/Dance"
+msgstr "Musik/Ballett/Tanz"
+
+msgid "Content$Rock/Pop"
+msgstr "Rock/Pop"
+
+msgid "Content$Serious/Classical Music"
+msgstr "Ernste/Klassische Musik"
+
+msgid "Content$Folk/Tradional Music"
+msgstr "Volks/Traditionelle Musik"
+
+msgid "Content$Jazz"
+msgstr "Jazz"
+
+msgid "Content$Musical/Opera"
+msgstr "Musical/Oper"
+
+msgid "Content$Ballet"
+msgstr "Ballett"
+
+msgid "Content$Arts/Culture"
+msgstr "Kunst/Kultur"
+
+msgid "Content$Performing Arts"
+msgstr "Darstellende K�nste"
+
+msgid "Content$Fine Arts"
+msgstr "Bildende K�nste"
+
+msgid "Content$Religion"
+msgstr "Religion"
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr "Pop-Kultur/Traditionelle K�nste"
+
+msgid "Content$Literature"
+msgstr "Literatur"
+
+msgid "Content$Film/Cinema"
+msgstr "Film/Kino"
+
+msgid "Content$Experimental Film/Video"
+msgstr "Experimentalfilm/Video"
+
+msgid "Content$Broadcasting/Press"
+msgstr "Rundfunk/Presse"
+
+msgid "Content$New Media"
+msgstr "Neue Medien"
+
+msgid "Content$Arts/Culture Magazine"
+msgstr "Kunst/Kulturmagazin"
+
+msgid "Content$Fashion"
+msgstr "Mode"
+
+msgid "Content$Social/Political/Economics"
+msgstr "Gesellschaft/Politik/Wirtschaft"
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr "Magazin/Bericht/Dokumentation"
+
+msgid "Content$Economics/Social Advisory"
+msgstr "Wirtschafts/Gesellschaftsberatung"
+
+msgid "Content$Remarkable People"
+msgstr "Bemerkenswerte Leute"
+
+msgid "Content$Education/Science/Factual"
+msgstr "Ausbildung/Wissenschaft/Sachlich"
+
+msgid "Content$Nature/Animals/Environment"
+msgstr "Natur/Tiere/Umwelt"
+
+msgid "Content$Technology/Natural Sciences"
+msgstr "Technik/Naturwissenschaften"
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr "Medizin/Physiologie/Psychologie"
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr "Ausland/Expeditionen"
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr "Sozial/Geisteswissenschaften"
+
+msgid "Content$Further Education"
+msgstr "Weiterbildung"
+
+msgid "Content$Languages"
+msgstr "Sprachen"
+
+msgid "Content$Leisure/Hobbies"
+msgstr "Freizeit/Hobbies"
+
+msgid "Content$Tourism/Travel"
+msgstr "Tourismus/Reisen"
+
+msgid "Content$Handicraft"
+msgstr "Handwerk"
+
+msgid "Content$Motoring"
+msgstr "Autofahren"
+
+msgid "Content$Fitness & Health"
+msgstr "Fitness & Gesundheit"
+
+msgid "Content$Cooking"
+msgstr "Kochen"
+
+msgid "Content$Advertisement/Shopping"
+msgstr "Werbung/Einkaufen"
+
+msgid "Content$Gardening"
+msgstr "Gartenbau"
+
+msgid "Content$Original Language"
+msgstr "Originalsprache"
+
+msgid "Content$Black & White"
+msgstr "Schwarz-wei�"
+
+msgid "Content$Unpublished"
+msgstr "Unver�ffentlicht"
+
+msgid "Content$Live Broadcast"
+msgstr "Live-Sendung"
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr "ab %d"
+
 msgid "No title"
 msgstr "Kein Titel"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index c89b68976..2c310abc3 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -39,6 +39,247 @@ msgstr "
 msgid "Starting EPG scan"
 msgstr "���� ������ EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "����� �����"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 6cc9cee68..6cb029ca8 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -40,6 +40,247 @@ msgstr "
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Sin t�tulo"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 2823c742e..f8a0f6015 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,15 +1,15 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Arthur Konovalov <kasjas@hot.ee>, 2004, 2005, 2006, 2007
+# Arthur Konovalov <artlov@gmail.com>, 2004-2009
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
+"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
@@ -19,7 +19,7 @@ msgid "off"
 msgstr "v�ljas"
 
 msgid "on"
-msgstr ""
+msgstr "sees"
 
 msgid "auto"
 msgstr "automaatne"
@@ -34,11 +34,252 @@ msgid "Channel not available!"
 msgstr "Kanal ei ole k�ttesaadav!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Siirdemooduse start eba�nnestus!"
+msgstr "Siirdemooduse start nurjus!"
 
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine k�ivitatud"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Pealkiri puudub"
 
@@ -286,7 +527,7 @@ msgid "Polarization"
 msgstr "Polarisatsioon"
 
 msgid "System"
-msgstr ""
+msgstr "S�steem"
 
 msgid "Srate"
 msgstr "Srate"
@@ -316,7 +557,7 @@ msgid "Hierarchy"
 msgstr "Hierarhia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
@@ -325,16 +566,16 @@ msgid "Channels"
 msgstr "Kanalid"
 
 msgid "Button$Edit"
-msgstr "Muuda"
+msgstr "Muutmine"
 
 msgid "Button$New"
 msgstr "Uus"
 
 msgid "Button$Delete"
-msgstr "Kustuta"
+msgstr "Kustutada"
 
 msgid "Button$Mark"
-msgstr "Siirda"
+msgstr "M�rkimine"
 
 msgid "Channel is being used by a timer!"
 msgstr "Kanal on taimeri kasutuses!"
@@ -343,7 +584,7 @@ msgid "Delete channel?"
 msgstr "Kustutada kanal?"
 
 msgid "Edit timer"
-msgstr "Taimeri muutmine"
+msgstr "Taimeri redigeerimine"
 
 msgid "Active"
 msgstr "Aktiivne"
@@ -397,10 +638,10 @@ msgid "Button$Timer"
 msgstr "Taimer"
 
 msgid "Button$Record"
-msgstr "Salvesta"
+msgstr "Salvestada"
 
 msgid "Button$Switch"
-msgstr "Vali"
+msgstr "Valida"
 
 msgid "What's on now?"
 msgstr "Hetkel eetris"
@@ -436,7 +677,7 @@ msgstr "K
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Palun sisesta %d numbrit!"
+msgstr "Palun sisestada %d numbrit!"
 
 msgid "CAM not responding!"
 msgstr "CAM ei vasta"
@@ -454,19 +695,19 @@ msgid "Recordings"
 msgstr "Salvestused"
 
 msgid "Button$Open"
-msgstr "Ava"
+msgstr "Avada"
 
 msgid "Commands"
 msgstr "K�sud"
 
 msgid "Error while accessing recording!"
-msgstr "Salvestuse taasesitus eba�nnestus!"
+msgstr "Salvestuse taasesitus nurjus!"
 
 msgid "Delete recording?"
 msgstr "Kustutada salvestus?"
 
 msgid "Error while deleting recording!"
-msgstr "Salvestuse kustutamine eba�nnestus!"
+msgstr "Salvestuse kustutamine nurjus!"
 
 msgid "Recording commands"
 msgstr "Salvestuse k�sud"
@@ -505,10 +746,10 @@ msgid "Setup.OSD$Height (%)"
 msgstr "K�rgus (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Teate esitusaeg (s)"
+msgstr "Teate kuvamisaeg (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "V�ikese fondi kasutamine"
+msgstr "V�ikese fondi kasutus"
 
 msgid "Setup.OSD$Anti-alias"
 msgstr "Fondi silumine"
@@ -541,7 +782,7 @@ msgid "top"
 msgstr "�leval"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Kanaliinfo esitusaeg (s)"
+msgstr "Kanaliinfo kuvamisaeg (s)"
 
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanaliinfo kuvamine"
@@ -565,7 +806,7 @@ msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "Uuenda"
+msgstr "Uuendada"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG skaneerimise viide (h)"
@@ -609,13 +850,13 @@ msgid "PIDs only"
 msgstr "PID-id"
 
 msgid "names and PIDs"
-msgstr "nimed ja PID-id"
+msgstr "nimed,PID-id"
 
 msgid "add new channels"
-msgstr "kanalite lisamine"
+msgstr "uued kanalid"
 
 msgid "add new transponders"
-msgstr "transponderite lisamine"
+msgstr "uued transponderid"
 
 msgid "DVB"
 msgstr "DVB"
@@ -690,7 +931,7 @@ msgid "Button$Menu"
 msgstr "Men��"
 
 msgid "Button$Reset"
-msgstr "Nullimine"
+msgstr "Reset"
 
 msgid "Opening CAM menu..."
 msgstr "CAM-men�� avamine..."
@@ -702,16 +943,16 @@ msgid "CAM is in use - really reset?"
 msgstr "CAM on kasutuses - taask�ivitada?"
 
 msgid "Can't reset CAM!"
-msgstr "CAM mooduli taask�ivitus eba�nnestus!"
+msgstr "CAM mooduli taask�ivitus nurjus!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "mitte peatada"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "peatam. kinnitus"
 
 msgid "pause live video"
-msgstr ""
+msgstr "peatada"
 
 msgid "Recording"
 msgstr "Salvestamine"
@@ -732,7 +973,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Salvestuse eluiga (p�evi)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Pausi klahvi k�sitsemine"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Pausi prioriteet"
@@ -741,7 +982,7 @@ msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Pausi eluiga (p�evi)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Episoodi nime kasutamine"
+msgstr "Episoodinime kasutamine"
 
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS-i kasutamine"
@@ -750,19 +991,19 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS-i algusvaru (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Otsesalvestuse m�rgistamine"
+msgstr "Kiirsalvestuse m�rgistamine"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Otsesalvestuse nimi"
+msgstr "Kiirsalvestuse nimi"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Otsesalvestuse kestus (min)"
+msgstr "Kiirsalvestuse kestus (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Maksimaalne failisuurus (MB)"
+msgstr "Maks. failisuurus (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Failide t�keldamine"
+msgstr "Failide jupitamine"
 
 msgid "Replay"
 msgstr "Taasesitus"
@@ -780,7 +1021,7 @@ msgid "Miscellaneous"
 msgstr "Muud s�tted"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Min. s�ndmuse kestus (min)"
+msgstr "Min. saate taimaut (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Min. kasutaja tegevusetus (min)"
@@ -798,7 +1039,7 @@ msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal k�ivitamisel"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "nagu enne"
+msgstr "endine"
 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus k�ivitamisel"
@@ -845,7 +1086,7 @@ msgid "Button$Stop"
 msgstr "Stopp"
 
 msgid "Button$Resume"
-msgstr "J�tka"
+msgstr "J�tkata"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
@@ -855,7 +1096,7 @@ msgid "Stop recording?"
 msgstr "L�petada salvestamine?"
 
 msgid "Cancel editing?"
-msgstr "T�histada muudatus?"
+msgstr "T�histada redigeermine?"
 
 msgid "No audio available!"
 msgstr "Audio k�ttesaamatu!"
@@ -876,7 +1117,7 @@ msgid "No free DVB device to record!"
 msgstr "Puudub vaba DVB seade salvestamiseks!"
 
 msgid "Pausing live video..."
-msgstr "Saate edastamise peatamine..."
+msgstr "Otse�lekande peatamine..."
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -886,10 +1127,10 @@ msgid "No editing marks defined!"
 msgstr "Redigeerimise markerid puuduvad!"
 
 msgid "Can't start editing process!"
-msgstr "Redigeerimise start eba�nnestus!"
+msgstr "Redigeerimise start nurjus!"
 
 msgid "Editing process started"
-msgstr "Redigeerimine algas"
+msgstr "Redigeerimine k�ivitatud"
 
 msgid "Editing process already active!"
 msgstr "Redigeerimine juba aktiivne!"
@@ -925,13 +1166,13 @@ msgid "Low disk space!"
 msgstr "K�vaketas t�is!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Indeksfaili regenereerimine"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Indeksfaili regenereerimine l�petatud"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "V�ljal�litamine eba�nnestus - '-s' parameeter puudub!"
+msgstr "V�ljal�litamine nurjus - '-s' parameeter puudub!"
 
 msgid "Editing - shut down anyway?"
 msgstr "Redigeerimine aktiive - l�litada v�lja?"
@@ -964,10 +1205,10 @@ msgid "Volume "
 msgstr "Helitugevus "
 
 msgid "Classic VDR"
-msgstr "Klassikaline VDR"
+msgstr "Classic VDR"
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG konsool"
+msgstr "ST:TNG Panels"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -1002,10 +1243,10 @@ msgid "Upcoming recording!"
 msgstr "Salvestamine tulekul!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Peatada otse�lekanne?"
 
 msgid "Recording started"
-msgstr "Salvestamine algas"
+msgstr "Salvestamine k�ivitatud"
 
 msgid "VDR will shut down later - press Power to force"
 msgstr "VDR l�litub v�lja hiljem - vajuta Power kiirendamiseks"
@@ -1017,7 +1258,7 @@ msgid "Switching primary DVB..."
 msgstr "Esmase DVB seadme �mberl�litus..."
 
 msgid "Editing process failed!"
-msgstr "Redigeerimine eba�nnestus"
+msgstr "Redigeerimine nurjus"
 
 msgid "Editing process finished"
 msgstr "Redigeerimine l�petatud"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 9718e53fb..410bd67f6 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -42,6 +42,247 @@ msgstr "Siirtotilan aloitus ep
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan p�ivitys aloitettu"
 
+msgid "Content$Movie/Drama"
+msgstr "Elokuva/draama"
+
+msgid "Content$Detective/Thriller"
+msgstr "Etsiv�/trilleri"
+
+msgid "Content$Adventure/Western/War"
+msgstr "Seikkailu/western/sota"
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr "Scifi/fantasia/kauhu"
+
+msgid "Content$Comedy"
+msgstr "Komedia"
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr "Saippua/melodraama/kansanperinne"
+
+msgid "Content$Romance"
+msgstr "Romanssi"
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr "Vakava/klassinen/uskonnollinen/historiallinen elokuva/draama"
+
+msgid "Content$Adult Movie/Drama"
+msgstr "Aikuiselokuva/draama"
+
+msgid "Content$News/Current Affairs"
+msgstr "Uutiset/ajankohtaisohjelma"
+
+msgid "Content$News/Weather Report"
+msgstr "Uutiset/s��tiedot"
+
+msgid "Content$News Magazine"
+msgstr "Uutismakasiini"
+
+msgid "Content$Documentary"
+msgstr "Dokumentti"
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr "Keskustelu/haastattelu/v�ittely"
+
+msgid "Content$Show/Game Show"
+msgstr "Show/visailu"
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr "Visailu/kilpailu"
+
+msgid "Content$Variety Show"
+msgstr "Varietee"
+
+msgid "Content$Talk Show"
+msgstr "Keskusteluohjelma"
+
+msgid "Content$Sports"
+msgstr "Urheilua"
+
+msgid "Content$Special Event"
+msgstr "Erikoistapahtuma"
+
+msgid "Content$Sport Magazine"
+msgstr "Urheilumakasiini"
+
+msgid "Content$Football/Soccer"
+msgstr "Jalkapallo"
+
+msgid "Content$Tennis/Squash"
+msgstr "Tennis/Squash"
+
+msgid "Content$Team Sports"
+msgstr "Joukkueurheilua"
+
+msgid "Content$Athletics"
+msgstr "Yleisurheilua"
+
+msgid "Content$Motor Sport"
+msgstr "Moottoriurheilua"
+
+msgid "Content$Water Sport"
+msgstr "Vesiurheilua"
+
+msgid "Content$Winter Sports"
+msgstr "Talviurheilua"
+
+msgid "Content$Equestrian"
+msgstr "Ratsastusta"
+
+msgid "Content$Martial Sports"
+msgstr "Kamppailu-urheilua"
+
+msgid "Content$Children's/Youth Programme"
+msgstr "Lasten ja nuorten ohjelma"
+
+msgid "Content$Pre-school Children's Programme"
+msgstr "Alle kouluik�isten ohjelma"
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr "Viihdeohjelma 6-14 vuotiaille"
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr "Viihdeohjelma 10-16 vuotiaille"
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr "Opetus/kouluohjelma"
+
+msgid "Content$Cartoons/Puppets"
+msgstr "Piirretty/nukke-esitys"
+
+msgid "Content$Music/Ballet/Dance"
+msgstr "Musiikki/baletti/tanssi"
+
+msgid "Content$Rock/Pop"
+msgstr "Rock/pop"
+
+msgid "Content$Serious/Classical Music"
+msgstr "Vakava/klassinen musiikki"
+
+msgid "Content$Folk/Tradional Music"
+msgstr "Folk/kansanmusiikki"
+
+msgid "Content$Jazz"
+msgstr "Jazz"
+
+msgid "Content$Musical/Opera"
+msgstr "Musikaali/ooppera"
+
+msgid "Content$Ballet"
+msgstr "Baletti"
+
+msgid "Content$Arts/Culture"
+msgstr "Taide/kulttuuri"
+
+msgid "Content$Performing Arts"
+msgstr "Performanssitaide"
+
+msgid "Content$Fine Arts"
+msgstr "Kuvataide"
+
+msgid "Content$Religion"
+msgstr "Uskonto"
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr "Populaarikulttuuri/perinnetaiteet"
+
+msgid "Content$Literature"
+msgstr "Kirjallisuus"
+
+msgid "Content$Film/Cinema"
+msgstr "Elokuvataide"
+
+msgid "Content$Experimental Film/Video"
+msgstr "Kokeellinen elokuva/video"
+
+msgid "Content$Broadcasting/Press"
+msgstr "Televisio/radio/lehdist�"
+
+msgid "Content$New Media"
+msgstr "Uusmedia"
+
+msgid "Content$Arts/Culture Magazine"
+msgstr "Taide/kulttuurimakasiini"
+
+msgid "Content$Fashion"
+msgstr "Muoti"
+
+msgid "Content$Social/Political/Economics"
+msgstr "Yhteiskunta/politiikka/talous"
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr "Makasiini/reportaasi/dokumentti"
+
+msgid "Content$Economics/Social Advisory"
+msgstr "Talous/yhteiskunnallinen neuvonta"
+
+msgid "Content$Remarkable People"
+msgstr "Merkitt�v�t henkil�t"
+
+msgid "Content$Education/Science/Factual"
+msgstr "Koulutus/tiede"
+
+msgid "Content$Nature/Animals/Environment"
+msgstr "Luonto/el�imet/ymp�rist�"
+
+msgid "Content$Technology/Natural Sciences"
+msgstr "Teknologia/luonnontiede"
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr "L��ketiede/fysiologia/psykologia"
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr "Vieraat maat/tutkimusretket"
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr "Yhteiskunta/hengelliset tieteet"
+
+msgid "Content$Further Education"
+msgstr "Jatkokoulutus"
+
+msgid "Content$Languages"
+msgstr "Kielet"
+
+msgid "Content$Leisure/Hobbies"
+msgstr "Vapaa-aika ja harrastukset"
+
+msgid "Content$Tourism/Travel"
+msgstr "Turismi/matkustaminen"
+
+msgid "Content$Handicraft"
+msgstr "K�sity�t"
+
+msgid "Content$Motoring"
+msgstr "Autoilu"
+
+msgid "Content$Fitness & Health"
+msgstr "Kuntoilu & terveys"
+
+msgid "Content$Cooking"
+msgstr "Ruuanlaitto"
+
+msgid "Content$Advertisement/Shopping"
+msgstr "Mainostaminen/ostaminen"
+
+msgid "Content$Gardening"
+msgstr "Puutarhanhoito"
+
+msgid "Content$Original Language"
+msgstr "Alkuper�iskieli"
+
+msgid "Content$Black & White"
+msgstr "Mustavalkoinen"
+
+msgid "Content$Unpublished"
+msgstr "Julkaisematon"
+
+msgid "Content$Live Broadcast"
+msgstr "Suoral�hetys"
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Ei esityst�"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 8f6778a65..9f2768a8d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -45,6 +45,247 @@ msgstr "Impossible d'utiliser le mode transfert !"
 msgid "Starting EPG scan"
 msgstr "Mise � jour du guide des programmes"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Sans titre"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 32976b85f..7d923afec 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -41,6 +41,247 @@ msgstr "Nemogu
 msgid "Starting EPG scan"
 msgstr "Po�injem EPG pretragu"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Bez naziva"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index e3d2b70d6..1517920e5 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -42,6 +42,247 @@ msgstr "Transfer-Mode nem ind
 msgid "Starting EPG scan"
 msgstr "EPG adatok aktualiz�l�sa"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "n�v n�lk�l"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 9032a7c8f..1a403add9 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
-"PO-Revision-Date: 2009-08-29 11:16+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"PO-Revision-Date: 2009-11-28 22:50+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -46,6 +46,247 @@ msgstr "Impossibile avviare mod. trasferimento!"
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Senza titolo"
 
@@ -932,10 +1173,10 @@ msgid "Low disk space!"
 msgstr "Poco spazio su disco!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Rigenerazione file indice"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Rigenerazione file indice completata"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Impossibile spegnere - parametro '-s' non assegnato!"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index c50a74b66..dd367546a 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.9\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2009-10-17 14:19+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -39,6 +39,247 @@ msgstr "Negali pradėti perdavimo"
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Be pavadinimo"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 99a8f4502..3634438fa 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -43,6 +43,247 @@ msgstr "Kan Transfer-Mode niet starten"
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Geen titel"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 070e974b0..56975a562 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -40,6 +40,247 @@ msgstr "Kan ikke starte transfer modus!"
 msgid "Starting EPG scan"
 msgstr ""
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index daca48f4f..0143db862 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -40,6 +40,247 @@ msgstr "Nie mo
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Bez tytu�u"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index cee93d7cf..e863f8c78 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -39,6 +39,247 @@ msgstr "Imposs
 msgid "Starting EPG scan"
 msgstr "Iniciar a procura de EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Sem t�tulo"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 6059aa58d..79a2690fb 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -42,6 +42,247 @@ msgstr "Nu pot porni modul de transfer!"
 msgid "Starting EPG scan"
 msgstr "Pornesc achizi�ia EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "F�r� titlu"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3de704375..eb71a20d1 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -40,6 +40,247 @@ msgstr "
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "��� ��������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 8471140dd..5068882c0 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2009-09-30 12:50+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak\n"
@@ -40,6 +40,247 @@ msgstr "Nem
 msgid "Starting EPG scan"
 msgstr "Za��na preh�ad�va� EPG"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Bez n�zvu"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 4f89ff779..7b3b05f2b 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -40,6 +40,247 @@ msgstr "Ne morem za
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Brez naziva"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index d368bb656..17a1da6c0 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -42,6 +42,247 @@ msgstr "Kan inte starta Transfer Mode!"
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG skanning"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "ingen titel"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 39138d597..e921986e9 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -39,6 +39,247 @@ msgstr "Transfer modu ba
 msgid "Starting EPG scan"
 msgstr "EPG tarama ba�l�yor"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "�sim yok"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 6c2f58ab9..17c837163 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2009-05-31 13:17+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -39,6 +39,247 @@ msgstr "Неможливо включити режим пропуску!"
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "Без назви"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 03bddab9b..1f6eaacd7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-11-22 12:28+0100\n"
+"POT-Creation-Date: 2010-01-03 15:10+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -42,6 +42,247 @@ msgstr "不能启动传送模式"
 msgid "Starting EPG scan"
 msgstr "开始节目单扫描"
 
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+msgid "Content$Languages"
+msgstr ""
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
 msgid "No title"
 msgstr "没有标题"
 
diff --git a/receiver.c b/receiver.c
index f4c0a78e3..08346e4f4 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.0 2007/08/12 11:52:59 kls Exp $
+ * $Id: receiver.c 2.1 2010/01/01 15:38:48 kls Exp $
  */
 
 #include "receiver.h"
@@ -40,7 +40,7 @@ cReceiver::~cReceiver()
 {
   if (device) {
      const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
-     esyslog(msg);
+     esyslog("%s", msg);
      fprintf(stderr, "%s\n", msg);
      *(char *)0 = 0; // cause a segfault
      }
diff --git a/recorder.c b/recorder.c
index 145d02061..7d01b075a 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.6 2009/11/21 15:58:12 kls Exp $
+ * $Id: recorder.c 2.7 2009/12/06 11:34:41 kls Exp $
  */
 
 #include "recorder.h"
@@ -128,7 +128,7 @@ void cRecorder::Action(void)
               if (frameDetector->Synced()) {
                  if (!InfoWritten) {
                     if (recordingInfo.Read()) {
-                       if (frameDetector->FramesPerSecond() > 0 && recordingInfo.FramesPerSecond() != frameDetector->FramesPerSecond()) {
+                       if (frameDetector->FramesPerSecond() > 0 && !DoubleEqual(recordingInfo.FramesPerSecond(), frameDetector->FramesPerSecond())) {
                           recordingInfo.SetFramesPerSecond(frameDetector->FramesPerSecond());
                           recordingInfo.Write();
                           }
diff --git a/recording.c b/recording.c
index ab94c32ac..41ad47aac 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.18 2009/11/22 11:20:53 kls Exp $
+ * $Id: recording.c 2.21 2010/01/02 13:46:05 kls Exp $
  */
 
 #include "recording.h"
@@ -260,6 +260,7 @@ int cResumeFile::Read(void)
                  switch (*s) {
                    case 'I': resume = atoi(t);
                              break;
+                   default: ;
                    }
                  }
            fclose(f);
@@ -443,8 +444,8 @@ bool cRecordingInfo::Read(FILE *f)
                             ownEvent->SetEventID(EventID);
                             ownEvent->SetStartTime(StartTime);
                             ownEvent->SetDuration(Duration);
-                            ownEvent->SetTableID(TableID);
-                            ownEvent->SetVersion(Version);
+                            ownEvent->SetTableID(uchar(TableID));
+                            ownEvent->SetVersion(uchar(Version));
                             }
                        }
                        break;
@@ -570,7 +571,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                      if (strlen(p) > 2 && isxdigit(*(p + 1)) && isxdigit(*(p + 2))) {
                         char buf[3];
                         sprintf(buf, "%c%c", *(p + 1), *(p + 2));
-                        unsigned char c = strtol(buf, NULL, 16);
+                        uchar c = uchar(strtol(buf, NULL, 16));
                         if (c) {
                            *p = c;
                            memmove(p + 1, p + 3, strlen(p) - 2);
@@ -582,6 +583,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                 case '\x01': *p = '\''; break;
                 case '\x02': *p = '/';  break;
                 case '\x03': *p = ':';  break;
+                default: ;
                 }
               }
            }
@@ -672,7 +674,9 @@ cRecording::cRecording(const char *FileName)
   deleted = 0;
   titleBuffer = NULL;
   sortBuffer = NULL;
-  fileName = strdup(FileName);
+  FileName = fileName = strdup(FileName);
+  if (*(fileName + strlen(fileName) - 1) == '/')
+     *(fileName + strlen(fileName) - 1) = 0;
   FileName += strlen(VideoDirectory) + 1;
   const char *p = strrchr(FileName, '/');
 
@@ -1412,8 +1416,11 @@ void cIndexFileGenerator::Action(void)
         // Read data:
         else if (ReplayFile) {
            int Result = Buffer.Read(ReplayFile, BufferChunks);
-           if (Result == 0) // EOF
+           if (Result == 0) { // EOF
               ReplayFile = FileName.NextFile();
+              FileSize = 0;
+              FrameOffset = -1;
+              }
            }
         // Recording has been processed:
         else {
@@ -1498,19 +1505,19 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
         if (access(fileName, R_OK) == 0) {
            struct stat buf;
            if (stat(fileName, &buf) == 0) {
-              delta = buf.st_size % sizeof(tIndexTs);
+              delta = int(buf.st_size % sizeof(tIndexTs));
               if (delta) {
                  delta = sizeof(tIndexTs) - delta;
                  esyslog("ERROR: invalid file size (%lld) in '%s'", buf.st_size, fileName);
                  }
-              last = (buf.st_size + delta) / sizeof(tIndexTs) - 1;
+              last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
               if (!Record && last >= 0) {
                  size = last + 1;
                  index = MALLOC(tIndexTs, size);
                  if (index) {
                     f = open(fileName, O_RDONLY);
                     if (f >= 0) {
-                       if ((int)safe_read(f, index, buf.st_size) != buf.st_size) {
+                       if (safe_read(f, index, size_t(buf.st_size)) != buf.st_size) {
                           esyslog("ERROR: can't read from file '%s'", fileName);
                           free(index);
                           index = NULL;
@@ -1576,8 +1583,8 @@ void cIndexFile::ConvertToPes(tIndexTs *IndexTs, int Count)
   tIndexPes IndexPes;
   while (Count-- > 0) {
         IndexPes.offset = uint32_t(IndexTs->offset);
-        IndexPes.type = IndexTs->independent ? 1 : 2; // I_FRAME : "not I_FRAME" (exact frame type doesn't matter)
-        IndexPes.number = IndexTs->number;
+        IndexPes.type = uchar(IndexTs->independent ? 1 : 2); // I_FRAME : "not I_FRAME" (exact frame type doesn't matter)
+        IndexPes.number = uchar(IndexTs->number);
         IndexPes.reserved = 0;
         memcpy(IndexTs, &IndexPes, sizeof(*IndexTs));
         IndexTs++;
@@ -1598,7 +1605,7 @@ bool cIndexFile::CatchUp(int Index)
                f = -1;
                break;
                }
-            int newLast = buf.st_size / sizeof(tIndexTs) - 1;
+            int newLast = int(buf.st_size / sizeof(tIndexTs) - 1);
             if (newLast > last) {
                if (size <= newLast) {
                   size *= 2;
@@ -1668,7 +1675,7 @@ bool cIndexFile::Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *I
            uint16_t fn = index[Index + 1].number;
            off_t fo = index[Index + 1].offset;
            if (fn == *FileNumber)
-              *Length = fo - *FileOffset;
+              *Length = int(fo - *FileOffset);
            else
               *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
            }
@@ -1699,7 +1706,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off
                   uint16_t fn = index[Index + 1].number;
                   off_t fo = index[Index + 1].offset;
                   if (fn == *FileNumber)
-                     *Length = fo - *FileOffset;
+                     *Length = int(fo - *FileOffset);
                   else {
                      esyslog("ERROR: 'I' frame at end of file #%d", *FileNumber);
                      *Length = -1;
@@ -1746,6 +1753,33 @@ void cIndexFile::Delete(void)
      }
 }
 
+bool GenerateIndex(const char *FileName) 
+{
+  if (DirectoryOk(FileName)) {
+     cRecording Recording(FileName);
+     if (Recording.Name()) {
+        if (!Recording.IsPesRecording()) {
+           cString IndexFileName = AddDirectory(FileName, INDEXFILESUFFIX);
+           unlink(IndexFileName);
+           cIndexFileGenerator *IndexFileGenerator = new cIndexFileGenerator(FileName);
+           while (IndexFileGenerator->Active())
+                 cCondWait::SleepMs(INDEXFILECHECKINTERVAL);
+           if (access(IndexFileName, R_OK) == 0)
+              return true;
+           else
+              fprintf(stderr, "cannot create '%s'\n", *IndexFileName);
+           }
+        else
+           fprintf(stderr, "'%s' is not a TS recording\n", FileName);
+        }
+     else
+        fprintf(stderr, "'%s' is not a recording\n", FileName);
+     }
+  else
+     fprintf(stderr, "'%s' is not a directory\n", FileName);
+  return false;
+}
+
 // --- cFileName -------------------------------------------------------------
 
 #define MAXFILESPERRECORDINGPES 255
@@ -1868,11 +1902,11 @@ cUnbufferedFile *cFileName::SetOffset(int Number, off_t Offset)
      Close();
   int MaxFilesPerRecording = isPesRecording ? MAXFILESPERRECORDINGPES : MAXFILESPERRECORDINGTS;
   if (0 < Number && Number <= MaxFilesPerRecording) {
-     fileNumber = Number;
+     fileNumber = uint16_t(Number);
      sprintf(pFileNumber, isPesRecording ? RECORDFILESUFFIXPES : RECORDFILESUFFIXTS, fileNumber);
      if (record) {
         if (access(fileName, F_OK) == 0) {
-           // files exists, check if it has non-zero size
+           // file exists, check if it has non-zero size
            struct stat buf;
            if (stat(fileName, &buf) == 0) {
               if (buf.st_size != 0)
diff --git a/recording.h b/recording.h
index bc3479fe4..663d66d2c 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.10 2009/11/21 16:12:55 kls Exp $
+ * $Id: recording.h 2.12 2010/01/02 12:10:07 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -253,7 +253,7 @@ class cIndexFile {
 class cFileName {
 private:
   cUnbufferedFile *file;
-  int fileNumber;
+  uint16_t fileNumber;
   char *fileName, *pFileNumber;
   bool record;
   bool blocking;
@@ -262,11 +262,11 @@ class cFileName {
   cFileName(const char *FileName, bool Record, bool Blocking = false, bool IsPesRecording = false);
   ~cFileName();
   const char *Name(void) { return fileName; }
-  int Number(void) { return fileNumber; }
+  uint16_t Number(void) { return fileNumber; }
   bool GetLastPatPmtVersions(int &PatVersion, int &PmtVersion);
   cUnbufferedFile *Open(void);
   void Close(void);
-  cUnbufferedFile *SetOffset(int Number, off_t Offset = 0);
+  cUnbufferedFile *SetOffset(int Number, off_t Offset = 0); // yes, Number is int for easier internal calculating
   cUnbufferedFile *NextFile(void);
   };
 
@@ -285,4 +285,6 @@ char *ExchangeChars(char *s, bool ToFileSystem);
       // be modified and may be reallocated if more space is needed. The return
       // value points to the resulting string, which may be different from s.
 
+bool GenerateIndex(const char *FileName);
+
 #endif //__RECORDING_H
diff --git a/remote.c b/remote.c
index 37a6bbd27..82d5f007b 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.0 2008/02/23 14:14:46 kls Exp $
+ * $Id: remote.c 2.1 2009/12/06 12:08:03 kls Exp $
  */
 
 #include "remote.h"
@@ -287,7 +287,9 @@ int cKbdRemote::MapCodeToFunc(uint64_t Code)
       if (p->code == Code)
          return p->func;
       }
-  return (Code <= 0xFF) ? Code : kfNone;
+  if (Code <= 0xFF)
+     return Code;
+  return kfNone;
 }
 
 int cKbdRemote::ReadKey(void)
@@ -337,9 +339,11 @@ uint64_t cKbdRemote::ReadKeySequence(void)
                                 k |= key1 & 0xFF;
                                 } while (key1 != 0x7E);
                              break;
+                        default: ;
                         }
                       }
                    break;
+              default: ;
               }
             }
         }
diff --git a/remux.c b/remux.c
index c5055b697..6d0069282 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.29 2009/11/22 11:23:27 kls Exp $
+ * $Id: remux.c 2.37 2009/12/29 15:56:33 kls Exp $
  */
 
 #include "remux.h"
@@ -295,7 +295,7 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
   numPmtPackets = 0;
   if (Channel) {
      int Vpid = Channel->Vpid();
-     int Ppid = Channel->Ppid();
+     int Ppid = 0x1FFF; // no PCR pid
      uchar *p = buf;
      int i = 0;
      p[i++] = 0x02; // table id
@@ -486,6 +486,11 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
      int NumDpids = 0;
      int NumSpids = 0;
      vpid = vtype = 0;
+     apids[0] = 0;
+     dpids[0] = 0;
+     spids[0] = 0;
+     atypes[0] = 0;
+     dtypes[0] = 0;
      SI::PMT::Stream stream;
      for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
          dbgpatpmt("     stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
@@ -496,17 +501,20 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       vpid = stream.getPid();
                       vtype = stream.getStreamType();
                       break;
+           case 0x03: // STREAMTYPE_11172_AUDIO
            case 0x04: // STREAMTYPE_13818_AUDIO
                       {
                       if (NumApids < MAXAPIDS) {
-                         char ALangs[MAXLANGCODE2] = "";
+                         apids[NumApids] = stream.getPid();
+                         atypes[NumApids] = stream.getStreamType();
+                         *alangs[NumApids] = 0;
                          SI::Descriptor *d;
                          for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                              switch (d->getDescriptorTag()) {
                                case SI::ISO639LanguageDescriptorTag: {
                                     SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
                                     SI::ISO639LanguageDescriptor::Language l;
-                                    char *s = ALangs;
+                                    char *s = alangs[NumApids];
                                     int n = 0;
                                     for (SI::Loop::Iterator it; ld->languageLoop.getNext(l, it); ) {
                                         if (*ld->languageCode != '-') { // some use "---" to indicate "none"
@@ -526,8 +534,9 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                              delete d;
                              }
                          if (updatePrimaryDevice)
-                            cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, NumApids, stream.getPid(), ALangs);
+                            cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, NumApids, apids[NumApids], alangs[NumApids]);
                          NumApids++;
+                         apids[NumApids]= 0;
                          }
                       }
                       break;
@@ -545,14 +554,21 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                             case SI::SubtitlingDescriptorTag:
                                  dbgpatpmt(" subtitling");
                                  if (NumSpids < MAXSPIDS) {
+                                    spids[NumSpids] = stream.getPid();
+                                    *slangs[NumSpids] = 0;
+                                    subtitlingTypes[NumSpids] = 0;
+                                    compositionPageIds[NumSpids] = 0;
+                                    ancillaryPageIds[NumSpids] = 0;
                                     SI::SubtitlingDescriptor *sd = (SI::SubtitlingDescriptor *)d;
                                     SI::SubtitlingDescriptor::Subtitling sub;
-                                    char SLangs[MAXLANGCODE2] = "";
-                                    char *s = SLangs;
+                                    char *s = slangs[NumSpids];
                                     int n = 0;
                                     for (SI::Loop::Iterator it; sd->subtitlingLoop.getNext(sub, it); ) {
                                         if (sub.languageCode[0]) {
                                            dbgpatpmt(" '%s'", sub.languageCode);
+                                           subtitlingTypes[NumSpids] = sub.getSubtitlingType();
+                                           compositionPageIds[NumSpids] = sub.getCompositionPageId();
+                                           ancillaryPageIds[NumSpids] = sub.getAncillaryPageId();
                                            if (n > 0)
                                               *s++ = '+';
                                            strn0cpy(s, I18nNormalizeLanguageCode(sub.languageCode), MAXLANGCODE1);
@@ -562,8 +578,9 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                                            }
                                         }
                                     if (updatePrimaryDevice)
-                                       cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, stream.getPid(), SLangs);
+                                       cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, spids[NumSpids], slangs[NumSpids]);
                                     NumSpids++;
+                                    spids[NumSpids]= 0;
                                     }
                                  break;
                             case SI::ISO639LanguageDescriptorTag: {
@@ -578,13 +595,18 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                           }
                       if (dpid) {
                          if (NumDpids < MAXDPIDS) {
+                            dpids[NumDpids] = dpid;
+                            dtypes[NumDpids] = stream.getStreamType();
+                            strn0cpy(dlangs[NumDpids], lang, sizeof(dlangs[NumDpids]));
                             if (updatePrimaryDevice)
                                cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
                             NumDpids++;
+                            dpids[NumDpids]= 0;
                             }
                          }
                       }
                       break;
+           default: ;
            }
          dbgpatpmt("\n");
          if (updatePrimaryDevice) {
@@ -599,7 +621,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
   pmtSize = 0;
 }
 
-bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion)
+bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion) const
 {
   PatVersion = patVersion;
   PmtVersion = pmtVersion;
diff --git a/remux.h b/remux.h
index ad099c6a4..39d6e093f 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.20 2009/11/21 15:55:34 kls Exp $
+ * $Id: remux.h 2.23 2009/12/29 15:53:54 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -214,6 +214,17 @@ class cPatPmtParser {
   int pmtPid;
   int vpid;
   int vtype;
+  int apids[MAXAPIDS + 1]; // list is zero-terminated
+  int atypes[MAXAPIDS + 1]; // list is zero-terminated
+  char alangs[MAXAPIDS][MAXLANGCODE2];
+  int dpids[MAXDPIDS + 1]; // list is zero-terminated
+  int dtypes[MAXDPIDS + 1]; // list is zero-terminated
+  char dlangs[MAXDPIDS][MAXLANGCODE2];
+  int spids[MAXSPIDS + 1]; // list is zero-terminated
+  char slangs[MAXSPIDS][MAXLANGCODE2];
+  uchar subtitlingTypes[MAXSPIDS];
+  uint16_t compositionPageIds[MAXSPIDS];
+  uint16_t ancillaryPageIds[MAXSPIDS];
   bool updatePrimaryDevice;
 protected:
   int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
@@ -232,18 +243,32 @@ class cPatPmtParser {
        ///< are delivered to the parser through several subsequent calls to
        ///< ParsePmt(). The whole PMT data will be processed once the last packet
        ///< has been received.
-  bool GetVersions(int &PatVersion, int &PmtVersion);
+  bool GetVersions(int &PatVersion, int &PmtVersion) const;
        ///< Returns true if a valid PAT/PMT has been parsed and stores
        ///< the current version numbers in the given variables.
-  int PmtPid(void) { return pmtPid; }
+  int PmtPid(void) const { return pmtPid; }
        ///< Returns the PMT pid as defined by the current PAT.
        ///< If no PAT has been received yet, -1 will be returned.
-  int Vpid(void) { return vpid; }
+  int Vpid(void) const { return vpid; }
        ///< Returns the video pid as defined by the current PMT, or 0 if no video
        ///< pid has been detected, yet.
-  int Vtype(void) { return vtype; }
+  int Vtype(void) const { return vtype; }
        ///< Returns the video stream type as defined by the current PMT, or 0 if no video
        ///< stream type has been detected, yet.
+  const int *Apids(void) const { return apids; }
+  const int *Dpids(void) const { return dpids; }
+  const int *Spids(void) const { return spids; }
+  int Apid(int i) const { return (0 <= i && i < MAXAPIDS) ? apids[i] : 0; }
+  int Dpid(int i) const { return (0 <= i && i < MAXDPIDS) ? dpids[i] : 0; }
+  int Spid(int i) const { return (0 <= i && i < MAXSPIDS) ? spids[i] : 0; }
+  int Atype(int i) const { return (0 <= i && i < MAXAPIDS) ? atypes[i] : 0; }
+  int Dtype(int i) const { return (0 <= i && i < MAXDPIDS) ? dtypes[i] : 0; }
+  const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
+  const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
+  const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
+  uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : uchar(0); }
+  uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); }
+  uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); }
   };
 
 // TS to PES converter:
diff --git a/sdt.c b/sdt.c
index 0b11bb7cc..1ed9b32a9 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 2.1 2008/04/12 13:33:55 kls Exp $
+ * $Id: sdt.c 2.4 2009/12/23 16:02:47 kls Exp $
  */
 
 #include "sdt.h"
@@ -65,16 +65,18 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         char *ps = compactspace(ShortNameBuf);
                         if (!*ps && cSource::IsCable(Source())) {
                            // Some cable providers don't mark short channel names according to the
-                           // standard, but rather go their own way and use "name>short name" or
-                           // "name, short name":
+                           // standard, but rather go their own way and use "name>short name":
                            char *p = strchr(pn, '>'); // fix for UPC Wien
-                           if (!p)
-                              p = strchr(pn, ','); // fix for "Kabel Deutschland"
                            if (p && p > pn) {
                               *p++ = 0;
                               strcpy(ShortNameBuf, skipspace(p));
                               }
                            }
+                        // Avoid ',' in short name (would cause trouble in channels.conf):
+                        for (char *p = ShortNameBuf; *p; p++) {
+                            if (*p == ',')
+                               *p = '.';
+                            }
                         sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
                         char *pp = compactspace(ProviderNameBuf);
                         if (channel) {
@@ -92,6 +94,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            patFilter->Trigger();
                            }
                         }
+                   default: ;
                    }
                  }
                  break;
diff --git a/skinclassic.c b/skinclassic.c
index a73e97cc1..7b45b1bcd 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.0 2008/02/23 10:31:58 kls Exp $
+ * $Id: skinclassic.c 2.3 2010/01/03 14:55:10 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -345,6 +345,12 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
      osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
      }
   y += ts.Height();
+  if (Event->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
+     }
   y += font->Height();
   ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
   y += ts.Height();
@@ -353,6 +359,14 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
      ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
+  for (int i = 0; Event->Contents(i); i++) {
+      const char *s = Event->ContentToString(Event->Contents(i));
+      if (!isempty(s)) {
+         const cFont *font = cFont::GetFont(fontSml);
+         ts.Set(osd, x1, y, x2 - x1, y3 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+         y += ts.Height();
+         }
+      }
   y += font->Height();
   if (!isempty(Event->Description())) {
      textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
@@ -372,6 +386,12 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
   snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
   ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
+  if (Info->GetEvent()->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w);
+     }
   y += font->Height();
   const char *Title = Info->Title();
   if (isempty(Title))
@@ -383,6 +403,14 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
      ts.Set(osd, x1, y, x2 - x1, y3 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
+  for (int i = 0; Info->GetEvent()->Contents(i); i++) {
+      const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i));
+      if (!isempty(s)) {
+         const cFont *font = cFont::GetFont(fontSml);
+         ts.Set(osd, x1, y, x2 - x1, y3 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+         y += ts.Height();
+         }
+      }
   y += font->Height();
   if (!isempty(Info->Description())) {
      textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
diff --git a/skinsttng.c b/skinsttng.c
index 5513c914d..555109175 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.0 2008/02/23 10:23:44 kls Exp $
+ * $Id: skinsttng.c 2.4 2010/01/03 14:51:35 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -593,6 +593,15 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
      osd->DrawEllipse  (x6, y, x7 - 1, yb - 1, frameColor, 5);
      }
   y += ts.Height();
+  if (Event->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(x4 - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w);
+     int yb = y + font->Height();
+     osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (x6, y, x7 - 1, yb - 1, frameColor, 5);
+     }
   y += font->Height();
   ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->Title(), font, Theme.Color(clrMenuEventTitle), Theme.Color(clrBackground));
   y += ts.Height();
@@ -601,6 +610,14 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
      ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
+  for (int i = 0; Event->Contents(i); i++) {
+      const char *s = Event->ContentToString(Event->Contents(i));
+      if (!isempty(s)) {
+         const cFont *font = cFont::GetFont(fontSml);
+         ts.Set(osd, xl, y, x4 - xl, y4 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+         y += ts.Height();
+         }
+      }
   y += font->Height();
   if (!isempty(Event->Description())) {
      int yt = y;
@@ -627,6 +644,15 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
   snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
+  if (Info->GetEvent()->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(x4 - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w);
+     int yb = y + font->Height();
+     osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (x6, y, x7 - 1, yb - 1, frameColor, 5);
+     }
   y += font->Height();
   const char *Title = Info->Title();
   if (isempty(Title))
@@ -638,6 +664,14 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
      ts.Set(osd, xl, y, x4 - xl, y4 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
+  for (int i = 0; Info->GetEvent()->Contents(i); i++) {
+      const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i));
+      if (!isempty(s)) {
+         const cFont *font = cFont::GetFont(fontSml);
+         ts.Set(osd, xl, y, x4 - xl, y4 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
+         y += ts.Height();
+         }
+      }
   y += font->Height();
   if (!isempty(Info->Description())) {
      int yt = y;
@@ -1068,6 +1102,7 @@ void cSkinSTTNGDisplayTracks::SetAudioChannel(int AudioChannel)
     case 0: bm = &bmAudioStereo; break;
     case 1: bm = &bmAudioLeft;   break;
     case 2: bm = &bmAudioRight;  break;
+    default: ;
     }
   if (bm)
      osd->DrawBitmap(x3 + 5, y6 + (y7 - y6 - bm->Height()) / 2, *bm, Theme.Color(clrChannelSymbolOn), frameColor);
diff --git a/sources.conf b/sources.conf
index c9b385cac..90f4a1c78 100644
--- a/sources.conf
+++ b/sources.conf
@@ -174,12 +174,13 @@ S110W   DirecTV 5 & Echostar 8/10
 S111.1W Anik F2
 S113W   SatMex 6
 S116.8W SatMex 5
-S119W   Anik F3 & Echostar 7 & DirecTV 7S
+S118.8W Anik F3
+S119W   Echostar 7 & DirecTV 7S
 S121W   Echostar 9 & Galaxy 23
 S123W   Galaxy 18
 S125W   Galaxy 14
 S127W   Galaxy 13/Horizons 1
-S129W   Echostar 5 & Galaxy 27
+S129W   Ciel 2 & Galaxy 27
 S131W   AMC 11
 S133W   Galaxy15
 S135W   AMC 10
diff --git a/svdrp.c b/svdrp.c
index 5729052a2..b181fcd52 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.6 2009/10/18 14:08:58 kls Exp $
+ * $Id: svdrp.c 2.7 2010/01/03 15:41:26 kls Exp $
  */
 
 #include "svdrp.h"
@@ -179,6 +179,8 @@ bool cPUTEhandler::Process(const char *s)
 // --- cSVDRP ----------------------------------------------------------------
 
 #define MAXHELPTOPIC 10
+#define EITDISABLETIME 10 // seconds until EIT processing is enabled again after a CLRE command
+                          // adjust the help for CLRE accordingly if changing this!
 
 const char *HelpPages[] = {
   "CHAN [ + | - | <number> | <name> | <id> ]\n"
@@ -187,7 +189,10 @@ const char *HelpPages[] = {
   "    it returns the current channel number and name.",
   "CLRE [ <number> | <name> | <id> ]\n"
   "    Clear the EPG list of the given channel number, name or id.\n"
-  "    Without option it clears the entire EPG list.",
+  "    Without option it clears the entire EPG list.\n"
+  "    After a CLRE command, no further EPG processing is done for 10\n"
+  "    seconds, so that data sent with subsequent PUTE commands doesn't\n"
+  "    interfere with data from the broadcasters.",
   "DELC <number>\n"
   "    Delete channel.",
   "DELR <number>\n"
@@ -574,6 +579,7 @@ void cSVDRP::CmdCLRE(const char *Option)
                }
            if (Schedule) {
               Schedule->Cleanup(INT_MAX);
+              cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
               Reply(250, "EPG data of channel \"%s\" cleared", Option);
               }
            else {
@@ -589,6 +595,7 @@ void cSVDRP::CmdCLRE(const char *Option)
      }
   else {
      cSchedules::ClearAll();
+     cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
      Reply(250, "EPG data cleared");
      }
 }
diff --git a/tools.c b/tools.c
index fae876355..39c17e2bc 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.4 2009/11/06 15:21:17 kls Exp $
+ * $Id: tools.c 2.6 2009/12/23 15:12:15 kls Exp $
  */
 
 #include "tools.h"
@@ -633,6 +633,7 @@ uint Utf8CharGet(const char *s, int Length)
     case 2: return ((*s & 0x1F) <<  6) |  (*(s + 1) & 0x3F);
     case 3: return ((*s & 0x0F) << 12) | ((*(s + 1) & 0x3F) <<  6) |  (*(s + 2) & 0x3F);
     case 4: return ((*s & 0x07) << 18) | ((*(s + 1) & 0x3F) << 12) | ((*(s + 2) & 0x3F) << 6) | (*(s + 3) & 0x3F);
+    default: ;
     }
   return *s;
 }
@@ -768,10 +769,10 @@ char *cCharSetConv::systemCharacterTable = NULL;
 cCharSetConv::cCharSetConv(const char *FromCode, const char *ToCode)
 {
   if (!FromCode)
-     FromCode = systemCharacterTable;
+     FromCode = systemCharacterTable ? systemCharacterTable : "UTF-8";
   if (!ToCode)
      ToCode = "UTF-8";
-  cd = (FromCode && ToCode) ? iconv_open(ToCode, FromCode) : (iconv_t)-1;
+  cd = iconv_open(ToCode, FromCode);
   result = NULL;
   length = 0;
 }
@@ -942,8 +943,8 @@ cString WeekDayNameFull(int WeekDay)
     case 4: return tr("Friday");
     case 5: return tr("Saturday");
     case 6: return tr("Sunday");
+    default: return "???";
     }
-  return "???";
 }
 
 cString WeekDayNameFull(time_t t)
diff --git a/tools.h b/tools.h
index 22b7e99bc..95c35ff3b 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.2 2009/04/14 20:41:39 kls Exp $
+ * $Id: tools.h 2.4 2009/12/23 15:14:39 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -13,7 +13,9 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <float.h>
 #include <iconv.h>
+#include <math.h>
 #include <poll.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -60,7 +62,7 @@ void syslog_with_tid(int priority, const char *format, ...) __attribute__ ((form
 int BCD2INT(int x);
 
 // Unfortunately there are no platform independent macros for unaligned
-// access. so we do it this way:
+// access, so we do it this way:
 
 template<class T> inline T get_unaligned(T *p)
 {
@@ -74,6 +76,14 @@ template<class T> inline void put_unaligned(unsigned int v, T* p)
   ((s *)p)->v = v;
 }
 
+// Comparing doubles for equality is unsafe, but unfortunately we can't
+// overwrite operator==(double, double), so this will have to do:
+
+inline bool DoubleEqual(double a, double b)
+{
+  return fabs(a - b) <= DBL_EPSILON;
+}
+
 // When handling strings that might contain UTF-8 characters, it may be necessary
 // to process a "symbol" that consists of several actual character bytes. The
 // following functions allow transparently accessing a "char *" string without
@@ -132,7 +142,8 @@ class cCharSetConv {
 public:
   cCharSetConv(const char *FromCode = NULL, const char *ToCode = NULL);
      ///< Sets up a character set converter to convert from FromCode to ToCode.
-     ///< If FromCode is NULL, the previously set systemCharacterTable is used.
+     ///< If FromCode is NULL, the previously set systemCharacterTable is used
+     ///< (or "UTF-8" if no systemCharacterTable has been set).
      ///< If ToCode is NULL, "UTF-8" is used.
   ~cCharSetConv();
   const char *Convert(const char *From, char *To = NULL, size_t ToLength = 0);
diff --git a/transfer.c b/transfer.c
index a2ec9b45b..02ef042cd 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.3 2009/01/23 15:34:26 kls Exp $
+ * $Id: transfer.c 2.4 2009/12/06 14:22:23 kls Exp $
  */
 
 #include "transfer.h"
@@ -45,7 +45,6 @@ void cTransfer::Receive(uchar *Data, int Length)
      for (int i = 0; i < 100; i++) {
          if (PlayTs(Data, Length) > 0)
             return;
-         fprintf(stderr, "-");//XXX just for testing - remove when stable
          cCondWait::SleepMs(10);
          }
      esyslog("ERROR: TS packet not accepted in Transfer Mode");
diff --git a/vdr.1 b/vdr.1
index 97780dd59..9bd1f0e73 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.3 2009/10/18 14:09:03 kls Exp $
+.\" $Id: vdr.1 2.4 2010/01/02 12:08:40 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -54,6 +54,11 @@ Run in daemon mode (implies \-\-no\-kbd).
 Use only the given DVB device (\fInum\fR = 0, 1, 2...).
 There may be several \fB\-D\fR options (by default all DVB devices will be used).
 .TP
+.BI \-\-edit= rec
+Edit the given recording.
+\fIrec\fR must be the full path name of an existing recording.
+The program will return immediately after editing the recording.
+.TP
 .BI \-E\  file ,\ \-\-epgfile= file
 Write the EPG data into the given \fIfile\fR
 (default is \fI/video/epg.data\fR).
@@ -61,6 +66,17 @@ Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
 .TP
+.BI \-\-genindex= rec
+Generate the index file for the given recording.
+\fIrec\fR must be the full path name of an existing recording.
+The recording must be in TS format.
+If the recording already has an index file, it will be deleted
+before creating the new one.
+The program will return immediately after generating the index.
+Note that using this option while another instance of VDR is
+currently replaying the given recording, or if the recording
+has not been finished yet, may lead to unexpected results.
+.TP
 .BI \-g,\ \-\-grab= dir
 Write images from the SVDRP command GRAB into the
 given directory \fIdir\fR. \fIdir\fR must be the full path name of an
diff --git a/vdr.5 b/vdr.5
index e1023af1b..875a7ded2 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.7 2009/10/18 14:09:07 kls Exp $
+.\" $Id: vdr.5 2.11 2010/01/03 13:37:07 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -45,7 +45,7 @@ Such a delimiter will not appear in the Channels menu.
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
-\fBRTL Television,RTL:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0\fR
+\fBRTL Television,RTL;RTL World:12187:hC34M2O0S0:S19.2E:27500:163=2:104=deu;106=deu:105:0:12003:1:1089:0\fR
 
 The line number of a channel definition (not counting group separators,
 and based on a possible previous '@...' parameter)
@@ -65,6 +65,10 @@ as in
 
 \fBRTL Television,RTL:...\fR
 
+If the short name itself would contain a comma, it is replaced with a '.'.
+Note that some long channel names may contain a comma, so the delimiting comma
+is always the rightmost one.
+
 If present, the name of the service provider or "bouquet" is appended
 to the channel name, separated by a semicolon, as in
 
@@ -99,6 +103,47 @@ l l.
 \fBY\fR@hierarchY (0, 1, 2, 4)
 .TE
 
+\fBBandwidth:\fR The bandwidth of the channel in MHz (DVB-T only).
+
+\fBCode rate high priority:\fR Forward Error Correction (FEC) of the high priority stream (DVB-T).
+For DVB-S/DVB-S2 this parameter specifies the inner FEC scheme.
+12 = 1/2, 23 = 2/3, 34 = 3/4, ...
+
+\fBCode rate low priority:\fR Forward Error Correction (FEC) of the low priority stream (DVB-T only).
+If no hierarchy is used, set to 0.
+
+\fBGuard interval:\fR The guard interval value (DVB-T only): 4 = 1/4, 8 = 1/8, 16 = 1/16, 32 = 1/32.
+
+\fBInversion:\fR Specifes whether the DVB frontend needs spectral inversion (DVB-T and DVB-C only). This is frontend specific, if in doubt, omit.
+
+\fBModulation:\fR Specifies the modulation/constellation of the channel as follows:
+.TS
+tab (@);
+l l.
+\fB2\fR@QPSK (DVB-S, DVB-S2, DVB-T)
+\fB5\fR@8PSK (DVB-S2)
+\fB6\fR@16APSK (DVB-S2)
+\fB10\fR@VSB8 (ATSC aerial)
+\fB11\fR@VSB16 (ATSC aerial)
+\fB16\fR@QAM16 (DVB-T)
+\fB64\fR@QAM64 (DVB-C, DVB-T)
+\fB128\fR@QAM128 (DVB-C)
+\fB256\fR@QAM256 (DVB-C)
+.TE
+
+\fBRolloff:\fR The Nyquist filter rolloff factor for DVB-S (\fB35\fR) and DVB-S2 (\fB35\fR, 25, 20),
+35 = 0.35, 25 = 0.25, 20 = 0.20, DVB-S/DVB-S2 default value is 0.35
+
+\fBTransmission mode:\fR Number of DVB-T OFDM carriers, 8 = 8k, 2 = 2k. If in doubt, try 8k.
+
+\fBHierarchy:\fR If set to 1, this transponder uses two streams, high priority and low priority.
+If in doubt, try 0 (off). (DVB-T only).
+
+\fBDelivery System:\fR The satellite delivery system (0 = DVB-S, 1 = DVB-S2).
+
+\fBPolarization:\fR Satellite antenna polarization.
+h = horizontal, v = vertical, r = circular right, l = circular left.
+
 The polarization parameters have no integer numbers following them. This is for
 compatibility with files from older versions and also to keep the DVB-S entries
 as simple as possible.
@@ -107,8 +152,17 @@ The special value \fB999\fR is used for "automatic", which means the driver
 will automatically determine the proper value (if possible).
 
 An example of a parameter field for a DVB-T channel might look like this:
+\fBB8C23D12G8M16T8Y0\fR
+
+An example of a parameter field for a DVB-C channel might look like this:
+\fBC0M64\fR
+
+An example of a parameter field for a DVB-S channel might look like this:
+\fBhC56M2O35S0\fR
+
+An example of a parameter field for a DVB-S2 channel might look like this:
+\fBhC910M2O35S1\fR
 
-\fBB8C23D12M64T2G32Y0\fR
 .TP
 .B Source
 The signal source of this channel, as defined in the file \fIsources.conf\fR.
@@ -641,6 +695,8 @@ l l.
 \fBT\fR@<title>
 \fBS\fR@<short text>
 \fBD\fR@<description>
+\fBG\fR@<genre> <genre>...
+\fBR\fR@<parental rating>
 \fBX\fR@<stream> <type> <language> <descr>
 \fBV\fR@<vps time>
 \fBe\fR@
@@ -653,6 +709,7 @@ of one or more \fBC\fR...\fBc\fR (Channel) entries. Inside these any number of
 \fBE\fR...\fBe\fR (Event) entries are allowed.
 All other tags are optional (although every event
 should at least have a \fBT\fR entry).
+
 There may be several \fBX\fR tags, depending on the number of tracks (video, audio etc.)
 the event provides.
 
@@ -669,6 +726,8 @@ l l.
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
+<genre>        @is a two digit hex code, as defined in  ETSI EN 300 468, table 28 (up to 4 genre codes are supported)
+<parental rating>@is the minimum age of the intended audience
 <stream>       @is the stream content (1 = video, 2 = audio, 3 = subtitles, 4 = AC3)
 <type>         @is the stream type according to ETSI EN 300 468
 <language>     @is the three letter language code (optionally two codes, separated by '+')
diff --git a/vdr.c b/vdr.c
index f03409ac9..e1bfc16af 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.12 2009/10/25 14:45:47 kls Exp $
+ * $Id: vdr.c 2.14 2010/01/02 11:52:40 kls Exp $
  */
 
 #include <getopt.h>
@@ -220,7 +220,9 @@ int main(int argc, char *argv[])
       { "config",   required_argument, NULL, 'c' },
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
+      { "edit",     required_argument, NULL, 'e' | 0x100 },
       { "epgfile",  required_argument, NULL, 'E' },
+      { "genindex", required_argument, NULL, 'g' | 0x100 },
       { "grab",     required_argument, NULL, 'g' },
       { "help",     no_argument,       NULL, 'h' },
       { "instance", required_argument, NULL, 'i' },
@@ -242,11 +244,11 @@ int main(int argc, char *argv[])
       { "vfat",     no_argument,       NULL, 'v' | 0x100 },
       { "video",    required_argument, NULL, 'v' },
       { "watchdog", required_argument, NULL, 'w' },
-      { NULL }
+      { NULL,       no_argument,       NULL,  0  }
     };
 
   int c;
-  while ((c = getopt_long(argc, argv, "a:c:dD:E:g:hi:l:L:mp:P:r:s:t:u:v:Vw:", long_options, NULL)) != -1) {
+  while ((c = getopt_long(argc, argv, "a:c:dD:e:E:g:hi:l:L:mp:P:r:s:t:u:v:Vw:", long_options, NULL)) != -1) {
         switch (c) {
           case 'a': AudioCommand = optarg;
                     break;
@@ -263,8 +265,12 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
                     return 2;
                     break;
+          case 'e' | 0x100:
+                    return CutRecording(optarg) ? 0 : 2;
           case 'E': EpgDataFileName = (*optarg != '-' ? optarg : NULL);
                     break;
+          case 'g' | 0x100:
+                    return GenerateIndex(optarg) ? 0 : 2;
           case 'g': cSVDRP::SetGrabImageDir(*optarg != '-' ? optarg : NULL);
                     break;
           case 'h': DisplayHelp = true;
@@ -406,11 +412,13 @@ int main(int argc, char *argv[])
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
                "                           there may be several -D options (default: all DVB\n"
                "                           devices will be used)\n"
+               "            --edit=REC     cut recording REC and exit\n"
                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
                "                           '%s' in the video directory)\n"
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
+               "            --genindex=REC generate index for recording REC and exit\n"
                "  -g DIR,   --grab=DIR     write images from the SVDRP command GRAB into the\n"
                "                           given DIR; DIR must be the full path name of an\n"
                "                           existing directory, without any \"..\", double '/'\n"

From 09a17d56e2a3f975a0467e8da4ca26c946b6ccf7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 31 Jan 2010 15:42:00 +0100
Subject: [PATCH 198/307] =?UTF-8?q?Version=201.7.12=20-=20Changed=20the=20?=
 =?UTF-8?q?EVCONTENTMASK=5F*=20macros=20to=20enums=20and=20changed=20"mask?=
 =?UTF-8?q?"=20to=20"group".=20-=20Updated=20the=20Estonian=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Arthur=20Konovalov).=20-=20The=20"Edit=20time?=
 =?UTF-8?q?r"=20menu=20can=20now=20set=20the=20folder=20for=20the=20record?=
 =?UTF-8?q?ing=20from=20a=20list=20of=20=20=20folders=20stored=20in=20"fol?=
 =?UTF-8?q?ders.conf".=20-=20Updated=20the=20Italian=20OSD=20texts=20(than?=
 =?UTF-8?q?ks=20to=20Diego=20Pierotto).=20-=20If=20svdrphosts.conf=20conta?=
 =?UTF-8?q?ins=20only=20the=20address=20of=20the=20local=20host,=20the=20S?=
 =?UTF-8?q?VDRP=20port=20=20=20is=20opened=20only=20for=20the=20local=20ho?=
 =?UTF-8?q?st=20(thanks=20to=20Manuel=20Reimer).=20-=20Renamed=20'runvdr'?=
 =?UTF-8?q?=20to=20'runvdr.template'=20and=20no=20longer=20copying=20it=20?=
 =?UTF-8?q?to=20the=20BINDIR=20=20=20in=20'make=20install'=20(thanks=20to?=
 =?UTF-8?q?=20Martin=20Dauskardt).=20-=20Added=20plain=20text=20error=20me?=
 =?UTF-8?q?ssages=20to=20log=20entries=20from=20cOsd::SetAreas()=20(sugges?=
 =?UTF-8?q?ted=20=20=20by=20Rolf=20Ahrenberg).=20-=20cPalette::ClosestColo?=
 =?UTF-8?q?r()=20now=20treats=20fully=20transparent=20colors=20as=20"equal?=
 =?UTF-8?q?";=20improved=20=20=20cDvbSpuBitmap::getMinBpp()=20(thanks=20to?=
 =?UTF-8?q?=20Matthieu=20Castet=20and=20Johann=20Friedrichs).=20-=20The=20?=
 =?UTF-8?q?new=20setup=20option=20"Miscellaneous/Channels=20wrap"=20contro?=
 =?UTF-8?q?ls=20whether=20the=20current=20=20=20channel=20wraps=20around?=
 =?UTF-8?q?=20the=20beginning=20or=20end=20of=20the=20channel=20list=20whe?=
 =?UTF-8?q?n=20zapping=20(thanks=20=20=20to=20Matti=20Lehtim=C3=A4ki).=20-?=
 =?UTF-8?q?=20Fixed=20determining=20the=20frame=20duration=20on=20channels?=
 =?UTF-8?q?=20where=20the=20PTS=20deltas=20jitter=20by=20=20=20+/-1=20arou?=
 =?UTF-8?q?nd=201800.=20-=20The=20PCR=20pid=20in=20generated=20PMTs=20is?=
 =?UTF-8?q?=20now=20set=20to=20the=20channel's=20PCR=20pid=20again.=20-=20?=
 =?UTF-8?q?Fixed=20determining=20the=20frame=20duration=20on=20channels=20?=
 =?UTF-8?q?where=20the=20PTS=20deltas=20jitter=20by=20=20=20+/-1=20around?=
 =?UTF-8?q?=203600.=20-=20The=20PCR=20pid=20is=20now=20recorded=20for=20ch?=
 =?UTF-8?q?annels=20where=20this=20is=20different=20from=20the=20video=20?=
 =?UTF-8?q?=20=20PID.=20To=20facilitate=20this,=20the=20interfaces=20of=20?=
 =?UTF-8?q?cTransfer,=20cTransferControl,=20cRecorder=20=20=20and=20cRecei?=
 =?UTF-8?q?ver=20have=20been=20modified,=20so=20that=20the=20PIDs=20are=20?=
 =?UTF-8?q?no=20longer=20given=20in=20separate=20=20=20parameters,=20but?=
 =?UTF-8?q?=20rather=20the=20whole=20channel=20is=20handed=20down=20for=20?=
 =?UTF-8?q?processing.=20The=20old=20=20=20constructor=20of=20cReceiver=20?=
 =?UTF-8?q?is=20still=20available,=20but=20it=20is=20recommended=20to=20pl?=
 =?UTF-8?q?ugin=20authors=20=20=20that=20they=20switch=20to=20the=20new=20?=
 =?UTF-8?q?interface=20as=20soon=20as=20possible.=20=20=20When=20replaying?=
 =?UTF-8?q?=20such=20a=20recording,=20the=20PCR=20packets=20are=20sent=20t?=
 =?UTF-8?q?o=20PlayTsVideo()=20-=20The=20files=20"commands.conf"=20and=20"?=
 =?UTF-8?q?reccmd.conf"=20can=20now=20contain=20nested=20lists=20of=20=20?=
 =?UTF-8?q?=20commands.=20See=20vdr.5=20for=20information=20about=20the=20?=
 =?UTF-8?q?new=20file=20format.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                            |  14 +-
 HISTORY                                 |  33 ++
 INSTALL                                 |  11 +-
 MANUAL                                  |  22 ++
 Makefile                                |   4 +-
 PLUGINS/src/dvbsddevice/HISTORY         |   5 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   4 +-
 Syd                                     |   0
 config.c                                | 236 ++++++++++----
 config.h                                |  61 ++--
 device.c                                |  15 +-
 dvbspu.c                                |   4 +-
 eit.c                                   |   6 +-
 epg.c                                   |  28 +-
 epg.h                                   |  35 ++-
 menu.c                                  | 402 ++++++++++++++++++++++--
 menu.h                                  |  27 +-
 osd.c                                   |  22 +-
 osd.h                                   |   4 +-
 osdbase.c                               |   4 +-
 osdbase.h                               |   4 +-
 po/ca_ES.po                             |  36 ++-
 po/cs_CZ.po                             |  36 ++-
 po/da_DK.po                             |  36 ++-
 po/de_DE.po                             |  38 ++-
 po/el_GR.po                             |  36 ++-
 po/es_ES.po                             |  36 ++-
 po/et_EE.po                             | 200 +++++++-----
 po/fi_FI.po                             |  36 ++-
 po/fr_FR.po                             |  36 ++-
 po/hr_HR.po                             |  36 ++-
 po/hu_HU.po                             |  36 ++-
 po/it_IT.po                             | 198 +++++++-----
 po/lt_LT.po                             |  36 ++-
 po/nl_NL.po                             |  36 ++-
 po/nn_NO.po                             |  36 ++-
 po/pl_PL.po                             |  36 ++-
 po/pt_PT.po                             |  36 ++-
 po/ro_RO.po                             |  36 ++-
 po/ru_RU.po                             |  36 ++-
 po/sk_SK.po                             |  36 ++-
 po/sl_SI.po                             |  36 ++-
 po/sv_SE.po                             |  36 ++-
 po/tr_TR.po                             |  36 ++-
 po/uk_UA.po                             |  36 ++-
 po/zh_CN.po                             |  36 ++-
 receiver.c                              |  75 ++++-
 receiver.h                              |  37 ++-
 recorder.c                              |  20 +-
 recorder.h                              |   8 +-
 recording.c                             |  26 +-
 recording.h                             |   4 +-
 remux.c                                 |  21 +-
 remux.h                                 |  14 +-
 runvdr => runvdr.template               |  14 +-
 svdrp.c                                 |   4 +-
 timers.c                                |   4 +-
 transfer.c                              |  12 +-
 transfer.h                              |   6 +-
 vdr.5                                   |  60 +++-
 vdr.c                                   |   7 +-
 62 files changed, 2030 insertions(+), 455 deletions(-)
 delete mode 100644 Syd
 rename runvdr => runvdr.template (79%)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1c1da6902..90dce69df 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1090,6 +1090,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  in some syslog calls
  for a patch that was used to implement handling the "component descriptor" ("genre")
  for a patch that was used to implement handling the "parental rating descriptor"
+ suggesting to add plain text error messages to log entries from cOsd::SetAreas()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1562,6 +1563,8 @@ Martin Dauskardt <md001@gmx.de>
  recorded
  for suggesting to add a table of the used trick speed values to the description of
  cDevice::TrickSpeed()
+ for renaming 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
+ in 'make install'
 
 Maynard Cedric <maynard.cedric@wanadoo.fr>
  for reporting a problem in handling the color button texts in cMenuEditStrItem
@@ -2494,6 +2497,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for removing the workaround for short channel names of "Kabel Deutschland"
  for some fixes to dvbspu.[hc]
  for fixing a busy loop when moving editing marks
+ for making cPalette::ClosestColor() treat fully transparent colors as "equal"
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -2526,6 +2530,8 @@ Valdemaras Pipiras <valdemaras@ambernet.lt>
 
 Manuel Reimer <Manuel.Reimer@gmx.de>
  for fixing saving terminal settings when running in background
+ for making the SVDRP port open only for the local host if svdrphosts.conf
+ contains only the address of the local host
 
 Rene van den Braken <rene@vandenbraken.name>
  for reporting a bug in writing the PCR pid into the PMT in
@@ -2539,7 +2545,11 @@ Andreas Schaefers <andreas_schaefers@gmx.de>
 
 Matthieu Castet <castet.matthieu@free.fr>
  for improving SPU handling on devices with limited OSD capabilities
+ for making cPalette::ClosestColor() treat fully transparent colors as "equal"
 
 Francesco Saverio Schiavarelli <fschiava@libero.it>
-  for reporting a problem with channels that have some encrypted components that
-  VDR doesn't use
+ for reporting a problem with channels that have some encrypted components that
+ VDR doesn't use
+
+Matti Lehtim�ki <matti.lehtimaki@gmail.com>
+ for implementing the setup option "Miscellaneous/Channels wrap"
diff --git a/HISTORY b/HISTORY
index 84430d592..df1bf6090 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6275,3 +6275,36 @@ Video Disk Recorder Revision History
   the others on the same adapter.
 - Fixed plugin arguments corruption with glibc 2.11 on x86_64 (thanks to
   Anssi Hannula).
+
+2010-01-31: Version 1.7.12
+
+- Changed the EVCONTENTMASK_* macros to enums and changed "mask" to "group".
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- The "Edit timer" menu can now set the folder for the recording from a list of
+  folders stored in "folders.conf".
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- If svdrphosts.conf contains only the address of the local host, the SVDRP port
+  is opened only for the local host (thanks to Manuel Reimer).
+- Renamed 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
+  in 'make install' (thanks to Martin Dauskardt).
+- Added plain text error messages to log entries from cOsd::SetAreas() (suggested
+  by Rolf Ahrenberg).
+- cPalette::ClosestColor() now treats fully transparent colors as "equal"; improved
+  cDvbSpuBitmap::getMinBpp() (thanks to Matthieu Castet and Johann Friedrichs).
+- The new setup option "Miscellaneous/Channels wrap" controls whether the current
+  channel wraps around the beginning or end of the channel list when zapping (thanks
+  to Matti Lehtim�ki).
+- Fixed determining the frame duration on channels where the PTS deltas jitter by
+  +/-1 around 1800.
+- The PCR pid in generated PMTs is now set to the channel's PCR pid again.
+- Fixed determining the frame duration on channels where the PTS deltas jitter by
+  +/-1 around 3600.
+- The PCR pid is now recorded for channels where this is different from the video
+  PID. To facilitate this, the interfaces of cTransfer, cTransferControl, cRecorder
+  and cReceiver have been modified, so that the PIDs are no longer given in separate
+  parameters, but rather the whole channel is handed down for processing. The old
+  constructor of cReceiver is still available, but it is recommended to plugin authors
+  that they switch to the new interface as soon as possible.
+  When replaying such a recording, the PCR packets are sent to PlayTsVideo()
+- The files "commands.conf" and "reccmd.conf" can now contain nested lists of
+  commands. See vdr.5 for information about the new file format.
diff --git a/INSTALL b/INSTALL
index 3af62d77b..e0fc016a4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -121,8 +121,12 @@ Users who want to set the default character set to something different can
 do this by setting the environment variable VDR_CHARSET_OVERRIDE to something
 like ISO-8859-9.
 
-Automatic restart in case of hangups:
--------------------------------------
+Start script with automatic restart in case of hangups:
+-------------------------------------------------------
+
+The VDR source directory contains a 'runvdr.template'. Just copy it as 'runvdr'
+into your /usr/bin or /usr/local/bin directory and adjust it to your particular
+requirements. (See the comments inside the script for more information.)
 
 If you run VDR using the 'runvdr' shell script it will use the built-in
 watchdog timer to restart the program in case something happens that
@@ -131,9 +135,6 @@ call to the VDR program, be sure to NOT use the '-d' option! Otherwise
 VDR will go into 'daemon' mode and the initial program call will return
 immediately! 'runvdr' needs to be started as user 'root'. Use the '-u'
 option to run the actual 'vdr' program under a different user id.
-Note that the 'runvdr' script needs to be adjusted to your particular
-requirements before you can actually use it. See the comments inside
-the script for more information.
 
 Setting the system time:
 ------------------------
diff --git a/MANUAL b/MANUAL
index 7382a8de4..405f6a8e5 100644
--- a/MANUAL
+++ b/MANUAL
@@ -474,6 +474,23 @@ Version 1.6
   A timer can also be programmed by pressing the "Red" key on the "Schedule",
   "Now", "Next" or "Event" menus.
 
+  The "Red" key in the "Edit timer" menu opens a list of folders, which can be
+  used to define the file name in which the recording will be stored.
+
+* Managing folders
+
+  The "Select folder" menu, which can be accessed by pressing the "Red" key in
+  the "Edit timer" menu, offers a list of folders that can be used for storing
+  a recording. In this menu, the "Green" key allows you to define a new folder
+  within the current one; if the "Sub folder" option is set to "yes", this will
+  be a folder that contains other folders (indicated by "..." following the
+  folder name in the list). The "Yellow" key deletes the current folder (note
+  that this will merely delete the folder definition stored in 'folders.conf'
+  and has no effect on existing timers or recordings). The "Blue" key can be
+  used to edit an existing folder definition. The "Red" key selects the current
+  folder, or enters a sub folder. Once a folder has been selected, the entire
+  path of the timer's file name will be replaced with the selected folder.
+
 * Parameters in the "Setup" menu
 
   Select "Setup" from the "VDR" menu to enter the setup menu. From there you can
@@ -860,6 +877,11 @@ Version 1.6
                          VDR was stopped will be used. The valid range is from
                          0 (silent) to 255 (loudest).
 
+  Channels wrap = no     During zapping with the "Up" and "Down" keys (or the
+                         "Channel+" and "Channel-" keys) the current channel will
+                         wrap around the beginning or end of the channel list if
+                         this parameter is set to 'yes'.
+
   Emergency exit = yes   If, for some reason, a recording fails because the video
                          data stream is broken, or the CAM doesn't decrypt etc.,
                          VDR automatically exits in order to allow the surrounding
diff --git a/Makefile b/Makefile
index e13ea5ecd..01408cb10 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.5 2009/12/29 11:20:50 kls Exp $
+# $Id: Makefile 2.6 2010/01/17 12:32:18 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -164,7 +164,7 @@ install: install-bin install-conf install-doc install-plugins install-i18n
 
 install-bin: vdr
 	@mkdir -p $(DESTDIR)$(BINDIR)
-	@cp --remove-destination vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)
+	@cp --remove-destination vdr svdrpsend.pl $(DESTDIR)$(BINDIR)
 
 # Configuration files:
 
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 18cd62507..0d1047b9f 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -10,3 +10,8 @@ VDR Plugin 'dvbsddevice' Revision History
 - Calling the MakePrimaryDevice() function of the base class to allow
   the cDevice to stop displaying subtitles.
 - Added support for DVB cards with multiple fontends.
+
+2010-01-30: Version 0.0.3
+
+- The PCR pid is now recorded for channels where this is different from the
+  video PID.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index e2248e9b6..cc48b2838 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.2 2010/01/01 15:01:01 kls Exp $
+ * $Id: dvbsddevice.c 1.3 2010/01/30 10:05:42 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 21a60a523..483381ffb 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.25 2010/01/04 12:56:56 kls Exp $
+ * $Id: dvbsdffdevice.c 2.26 2010/01/30 10:05:23 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -434,7 +434,7 @@ bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
      }
   else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), vpid, Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+     cControl::Launch(new cTransferControl(this, Channel));
 
   return true;
 }
diff --git a/Syd b/Syd
deleted file mode 100644
index e69de29bb..000000000
diff --git a/config.c b/config.c
index 61de0f532..acdf4c4f5 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.6 2009/12/05 15:30:30 kls Exp $
+ * $Id: config.c 2.10 2010/01/31 12:36:36 kls Exp $
  */
 
 #include "config.h"
@@ -22,71 +22,6 @@
 
 #define ChkDoublePlausibility(Variable, Default) { if (Variable < 0.00001) Variable = Default; }
 
-// --- cCommand --------------------------------------------------------------
-
-char *cCommand::result = NULL;
-
-cCommand::cCommand(void)
-{
-  title = command = NULL;
-  confirm = false;
-}
-
-cCommand::~cCommand()
-{
-  free(title);
-  free(command);
-}
-
-bool cCommand::Parse(const char *s)
-{
-  const char *p = strchr(s, ':');
-  if (p) {
-     int l = p - s;
-     if (l > 0) {
-        title = MALLOC(char, l + 1);
-        stripspace(strn0cpy(title, s, l + 1));
-        if (!isempty(title)) {
-           int l = strlen(title);
-           if (l > 1 && title[l - 1] == '?') {
-              confirm = true;
-              title[l - 1] = 0;
-              }
-           command = stripspace(strdup(skipspace(p + 1)));
-           return !isempty(command);
-           }
-        }
-     }
-  return false;
-}
-
-const char *cCommand::Execute(const char *Parameters)
-{
-  free(result);
-  result = NULL;
-  cString cmdbuf;
-  if (Parameters)
-     cmdbuf = cString::sprintf("%s %s", command, Parameters);
-  const char *cmd = *cmdbuf ? *cmdbuf : command;
-  dsyslog("executing command '%s'", cmd);
-  cPipe p;
-  if (p.Open(cmd, "r")) {
-     int l = 0;
-     int c;
-     while ((c = fgetc(p)) != EOF) {
-           if (l % 20 == 0)
-              result = (char *)realloc(result, l + 21);
-           result[l++] = char(c);
-           }
-     if (result)
-        result[l] = 0;
-     p.Close();
-     }
-  else
-     esyslog("ERROR: can't open pipe for command '%s'", cmd);
-  return result;
-}
-
 // --- cSVDRPhost ------------------------------------------------------------
 
 cSVDRPhost::cSVDRPhost(void)
@@ -118,20 +53,180 @@ bool cSVDRPhost::Parse(const char *s)
   return result != 0 && (mask != 0 || addr.s_addr == 0);
 }
 
+bool cSVDRPhost::IsLocalhost(void)
+{
+  return addr.s_addr == htonl(INADDR_LOOPBACK);
+}
+
 bool cSVDRPhost::Accepts(in_addr_t Address)
 {
   return (Address & mask) == (addr.s_addr & mask);
 }
 
-// --- cCommands -------------------------------------------------------------
+// --- cNestedItem -----------------------------------------------------------
+
+cNestedItem::cNestedItem(const char *Text, bool WithSubItems)
+{
+  text = strdup(Text ? Text : "");
+  subItems = WithSubItems ? new cList<cNestedItem> : NULL;
+}
+
+cNestedItem::~cNestedItem()
+{
+  delete subItems;
+  free(text);
+}
 
-cCommands Commands;
-cCommands RecordingCommands;
+int cNestedItem::Compare(const cListObject &ListObject) const
+{
+  return strcasecmp(text, ((cNestedItem *)&ListObject)->text);
+}
+
+void cNestedItem::AddSubItem(cNestedItem *Item)
+{
+  if (!subItems)
+     subItems = new cList<cNestedItem>;
+  if (Item)
+     subItems->Add(Item);
+}
+
+void cNestedItem::SetText(const char *Text)
+{
+  free(text);
+  text = strdup(Text ? Text : "");
+}
+
+void cNestedItem::SetSubItems(bool On)
+{
+  if (On && !subItems)
+     subItems = new cList<cNestedItem>;
+  else if (!On && subItems) {
+     delete subItems;
+     subItems = NULL;
+     }
+}
+
+// --- cNestedItemList -------------------------------------------------------
+
+cNestedItemList::cNestedItemList(void)
+{
+  fileName = NULL;
+}
+
+cNestedItemList::~cNestedItemList()
+{
+  free(fileName);
+}
+
+bool cNestedItemList::Parse(FILE *f, cList<cNestedItem> *List, int &Line)
+{
+  char *s;
+  cReadLine ReadLine;
+  while ((s = ReadLine.Read(f)) != NULL) {
+        Line++;
+        char *p = strchr(s, '#');
+        if (p)
+           *p = 0;
+        s = skipspace(stripspace(s));
+        if (!isempty(s)) {
+           p = s + strlen(s) - 1;
+           if (*p == '{') {
+              *p = 0;
+              stripspace(s);
+              cNestedItem *Item = new cNestedItem(s, true);
+              List->Add(Item);
+              if (!Parse(f, Item->SubItems(), Line))
+                 return false;
+              }
+           else if (*s == '}')
+              break;
+           else
+              List->Add(new cNestedItem(s));
+           }
+        }
+  return true;
+}
+
+bool cNestedItemList::Write(FILE *f, cList<cNestedItem> *List, int Indent)
+{
+  for (cNestedItem *Item = List->First(); Item; Item = List->Next(Item)) {
+      if (Item->SubItems()) {
+         fprintf(f, "%*s%s {\n", Indent, "", Item->Text());
+         Write(f, Item->SubItems(), Indent + 2);
+         fprintf(f, "%*s}\n", Indent + 2, "");
+         }
+      else
+         fprintf(f, "%*s%s\n", Indent, "", Item->Text());
+      }
+  return true;
+}
+
+void cNestedItemList::Clear(void)
+{
+  free(fileName);
+  fileName = NULL;
+  cList<cNestedItem>::Clear();
+}
+
+bool cNestedItemList::Load(const char *FileName)
+{
+  cList<cNestedItem>::Clear();
+  if (FileName) {
+     free(fileName);
+     fileName = strdup(FileName);
+     }
+  bool result = false;
+  if (fileName && access(fileName, F_OK) == 0) {
+     isyslog("loading %s", fileName);
+     FILE *f = fopen(fileName, "r");
+     if (f) {
+        int Line = 0;
+        result = Parse(f, this, Line);
+        fclose(f);
+        }
+     else {
+        LOG_ERROR_STR(fileName);
+        result = false;
+        }
+     }
+  return result;
+}
+
+bool cNestedItemList::Save(void)
+{
+  bool result = true;
+  cSafeFile f(fileName);
+  if (f.Open()) {
+     result = Write(f, this);
+     if (!f.Close())
+        result = false;
+     }
+  else
+     result = false;
+  return result;
+}
+
+// --- Folders and Commands --------------------------------------------------
+
+cNestedItemList Folders;
+cNestedItemList Commands;
+cNestedItemList RecordingCommands;
 
 // --- cSVDRPhosts -----------------------------------------------------------
 
 cSVDRPhosts SVDRPhosts;
 
+bool cSVDRPhosts::LocalhostOnly(void)
+{
+  cSVDRPhost *h = First();
+  while (h) {
+        if (!h->IsLocalhost())
+           return false;
+        h = (cSVDRPhost *)h->Next();
+        }
+  return true;
+}
+
 bool cSVDRPhosts::Acceptable(in_addr_t Address)
 {
   cSVDRPhost *h = First();
@@ -299,6 +394,7 @@ cSetup::cSetup(void)
   CurrentDolby = 0;
   InitialChannel = 0;
   InitialVolume = -1;
+  ChannelsWrap = 0;
   EmergencyExit = 1;
 }
 
@@ -486,6 +582,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
   else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = atoi(Value);
   else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
+  else if (!strcasecmp(Name, "ChannelsWrap"))        ChannelsWrap       = atoi(Value);
   else if (!strcasecmp(Name, "EmergencyExit"))       EmergencyExit      = atoi(Value);
   else
      return false;
@@ -578,6 +675,7 @@ bool cSetup::Save(void)
   Store("CurrentDolby",       CurrentDolby);
   Store("InitialChannel",     InitialChannel);
   Store("InitialVolume",      InitialVolume);
+  Store("ChannelsWrap",       ChannelsWrap);
   Store("EmergencyExit",      EmergencyExit);
 
   Sort();
diff --git a/config.h b/config.h
index f0cc67b77..be1d7bde7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.16 2009/11/22 19:55:04 kls Exp $
+ * $Id: config.h 2.21 2010/01/31 11:14:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.11"
-#define VDRVERSNUM   10711  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.12"
+#define VDRVERSNUM   10712  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.11"
-#define APIVERSNUM   10711  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.12"
+#define APIVERSNUM   10712  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -48,21 +48,6 @@
 #define MaxSkinName 16
 #define MaxThemeName 16
 
-class cCommand : public cListObject {
-private:
-  char *title;
-  char *command;
-  bool confirm;
-  static char *result;
-public:
-  cCommand(void);
-  virtual ~cCommand();
-  bool Parse(const char *s);
-  const char *Title(void) { return title; }
-  bool Confirm(void) { return confirm; }
-  const char *Execute(const char *Parameters = NULL);
-  };
-
 typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
 
 class cSVDRPhost : public cListObject {
@@ -72,6 +57,7 @@ class cSVDRPhost : public cListObject {
 public:
   cSVDRPhost(void);
   bool Parse(const char *s);
+  bool IsLocalhost(void);
   bool Accepts(in_addr_t Address);
   };
 
@@ -158,15 +144,43 @@ template<class T> class cConfig : public cList<T> {
   }
   };
 
-class cCommands : public cConfig<cCommand> {};
+class cNestedItem : public cListObject {
+private:
+  char *text;
+  cList<cNestedItem> *subItems;
+public:
+  cNestedItem(const char *Text, bool WithSubItems = false);
+  virtual ~cNestedItem();
+  virtual int Compare(const cListObject &ListObject) const;
+  const char *Text(void) const { return text; }
+  cList<cNestedItem> *SubItems(void) { return subItems; }
+  void AddSubItem(cNestedItem *Item);
+  void SetText(const char *Text);
+  void SetSubItems(bool On);
+  };
+
+class cNestedItemList : public cList<cNestedItem> {
+private:
+  char *fileName;
+  bool Parse(FILE *f, cList<cNestedItem> *List, int &Line);
+  bool Write(FILE *f, cList<cNestedItem> *List, int Indent = 0);
+public:
+  cNestedItemList(void);
+  virtual ~cNestedItemList();
+  void Clear(void);
+  bool Load(const char *FileName);
+  bool Save(void);
+  };
 
 class cSVDRPhosts : public cConfig<cSVDRPhost> {
 public:
+  bool LocalhostOnly(void);
   bool Acceptable(in_addr_t Address);
   };
 
-extern cCommands Commands;
-extern cCommands RecordingCommands;
+extern cNestedItemList Folders;
+extern cNestedItemList Commands;
+extern cNestedItemList RecordingCommands;
 extern cSVDRPhosts SVDRPhosts;
 
 class cSetupLine : public cListObject {
@@ -272,6 +286,7 @@ class cSetup : public cConfig<cSetupLine> {
   int CurrentDolby;
   int InitialChannel;
   int InitialVolume;
+  int ChannelsWrap;
   int EmergencyExit;
   int __EndData__;
   cSetup(void);
diff --git a/device.c b/device.c
index 3228af204..cb31b8341 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.31 2010/01/01 15:40:35 kls Exp $
+ * $Id: device.c 2.32 2010/01/30 11:06:51 kls Exp $
  */
 
 #include "device.h"
@@ -30,8 +30,8 @@ class cLiveSubtitle : public cReceiver {
   };
 
 cLiveSubtitle::cLiveSubtitle(int SPid)
-:cReceiver(tChannelID(), -1, SPid)
 {
+  AddPid(SPid);
 }
 
 cLiveSubtitle::~cLiveSubtitle()
@@ -676,7 +676,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (Device && CanReplay()) {
         cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (Device->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
-           cControl::Launch(new cTransferControl(Device, Channel->GetChannelID(), Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+           cControl::Launch(new cTransferControl(Device, Channel));
         else
            Result = scrNoTransfer;
         }
@@ -1364,10 +1364,10 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
               esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
               return Played + Skipped;
               }
+           int Pid = TsPid(Data);
            if (TsHasPayload(Data)) { // silently ignore TS packets w/o payload
               int PayloadOffset = TsPayloadOffset(Data);
               if (PayloadOffset < TS_SIZE) {
-                 int Pid = TsPid(Data);
                  if (Pid == 0)
                     patPmtParser.ParsePat(Data, TS_SIZE);
                  else if (Pid == patPmtParser.PmtPid())
@@ -1396,6 +1396,13 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
                     }
                  }
               }
+           else if (Pid == patPmtParser.Ppid()) {
+              int w = PlayTsVideo(Data, TS_SIZE);
+              if (w < 0)
+                 return Played ? Played : w;
+              if (w == 0)
+                 break;
+              }
            Played += TS_SIZE;
            Length -= TS_SIZE;
            Data += TS_SIZE;
diff --git a/dvbspu.c b/dvbspu.c
index 488bd89f6..951e2f8c7 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.7 2009/12/26 15:51:15 kls Exp $
+ * $Id: dvbspu.c 2.8 2010/01/17 13:43:27 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -347,7 +347,7 @@ int cDvbSpuBitmap::getMinBpp(const aDvbSpuPalDescr paldescr)
                 col++;
         }
     }
-    return col > 2 ? 4 : 2;
+    return col > 2 ? 2 : 1;
 }
 
 int cDvbSpuDecoder::CalcAreaBpp(cBitmap *fgbmp, cBitmap *bgbmp)
diff --git a/eit.c b/eit.c
index 72d05cb69..37a4a4be4 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.10 2010/01/03 15:35:21 kls Exp $
+ * $Id: eit.c 2.11 2010/01/08 15:17:09 kls Exp $
  */
 
 #include "eit.h"
@@ -157,9 +157,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  SI::ContentDescriptor *cd = (SI::ContentDescriptor *)d;
                  SI::ContentDescriptor::Nibble Nibble;
                  int NumContents = 0;
-                 uchar Contents[MAXEVCONTENTS] = { 0 };
+                 uchar Contents[MaxEventContents] = { 0 };
                  for (SI::Loop::Iterator it3; cd->nibbleLoop.getNext(Nibble, it3); ) {
-                     if (NumContents < MAXEVCONTENTS) {
+                     if (NumContents < MaxEventContents) {
                         Contents[NumContents] = ((Nibble.getContentNibbleLevel1() & 0xF) << 4) | (Nibble.getContentNibbleLevel2() & 0xF);
                         NumContents++;
                         }
diff --git a/epg.c b/epg.c
index e1cfe18d8..006a5de0c 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.4 2010/01/03 14:10:20 kls Exp $
+ * $Id: epg.c 2.5 2010/01/08 15:20:28 kls Exp $
  */
 
 #include "epg.h"
@@ -190,7 +190,7 @@ void cEvent::SetComponents(cComponents *Components)
 
 void cEvent::SetContents(uchar *Contents)
 {
-  for (int i = 0; i < MAXEVCONTENTS; i++)
+  for (int i = 0; i < MaxEventContents; i++)
       contents[i] = Contents[i];
 }
 
@@ -250,7 +250,7 @@ bool cEvent::IsRunning(bool OrAboutToStart) const
 const char *cEvent::ContentToString(uchar Content)
 {
   switch (Content & 0xF0) {
-    case EVCONTENTMASK_MOVIEDRAMA:
+    case ecgMovieDrama:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Movie/Drama");
@@ -264,7 +264,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x08: return tr("Content$Adult Movie/Drama");
            }
          break;
-    case EVCONTENTMASK_NEWSCURRENTAFFAIRS:
+    case ecgNewsCurrentAffairs:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$News/Current Affairs");
@@ -274,7 +274,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x04: return tr("Content$Discussion/Inverview/Debate");
            }
          break;
-    case EVCONTENTMASK_SHOW:
+    case ecgShow:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Show/Game Show");
@@ -283,7 +283,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x03: return tr("Content$Talk Show");
            }
          break;
-    case EVCONTENTMASK_SPORTS:
+    case ecgSports:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Sports");
@@ -300,7 +300,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x0B: return tr("Content$Martial Sports");
            }
          break;
-    case EVCONTENTMASK_CHILDRENYOUTH:
+    case ecgChildrenYouth:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Children's/Youth Programme");
@@ -311,7 +311,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x05: return tr("Content$Cartoons/Puppets");
            }
          break;
-    case EVCONTENTMASK_MUSICBALLETDANCE:
+    case ecgMusicBalletDance:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Music/Ballet/Dance");
@@ -323,7 +323,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x06: return tr("Content$Ballet");
            }
          break;
-    case EVCONTENTMASK_ARTSCULTURE:
+    case ecgArtsCulture:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Arts/Culture");
@@ -340,7 +340,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x0B: return tr("Content$Fashion");
            }
          break;
-    case EVCONTENTMASK_SOCIALPOLITICALECONOMICS:
+    case ecgSocialPoliticalEconomics:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Social/Political/Economics");
@@ -349,7 +349,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x03: return tr("Content$Remarkable People");
            }
          break;
-    case EVCONTENTMASK_EDUCATIONALSCIENCE:
+    case ecgEducationalScience:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Education/Science/Factual");
@@ -362,7 +362,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x07: return tr("Content$Languages");
            }
          break;
-    case EVCONTENTMASK_LEISUREHOBBIES:
+    case ecgLeisureHobbies:
          switch (Content & 0x0F) {
            default:
            case 0x00: return tr("Content$Leisure/Hobbies");
@@ -375,7 +375,7 @@ const char *cEvent::ContentToString(uchar Content)
            case 0x07: return tr("Content$Gardening");
            }
          break;
-    case EVCONTENTMASK_SPECIAL:
+    case ecgSpecial:
          switch (Content & 0x0F) {
            case 0x00: return tr("Content$Original Language");
            case 0x01: return tr("Content$Black & White");
@@ -468,7 +468,7 @@ bool cEvent::Parse(char *s)
               break;
     case 'G': {
                 memset(contents, 0, sizeof(contents));
-                for (int i = 0; i < MAXEVCONTENTS; i++) {
+                for (int i = 0; i < MaxEventContents; i++) {
                     char *tail = NULL;
                     int c = strtol(t, &tail, 16);
                     if (0x00 < c && c <= 0xFF) {
diff --git a/epg.h b/epg.h
index fbc9e061e..5555c2e9c 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.3 2010/01/03 14:39:14 kls Exp $
+ * $Id: epg.h 2.4 2010/01/08 15:20:34 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -19,19 +19,22 @@
 
 #define MAXEPGBUGFIXLEVEL 3
 
-#define MAXEVCONTENTS                          4
-#define EVCONTENTMASK_MOVIEDRAMA               0x10
-#define EVCONTENTMASK_NEWSCURRENTAFFAIRS       0x20
-#define EVCONTENTMASK_SHOW                     0x30
-#define EVCONTENTMASK_SPORTS                   0x40
-#define EVCONTENTMASK_CHILDRENYOUTH            0x50
-#define EVCONTENTMASK_MUSICBALLETDANCE         0x60
-#define EVCONTENTMASK_ARTSCULTURE              0x70
-#define EVCONTENTMASK_SOCIALPOLITICALECONOMICS 0x80
-#define EVCONTENTMASK_EDUCATIONALSCIENCE       0x90
-#define EVCONTENTMASK_LEISUREHOBBIES           0xA0
-#define EVCONTENTMASK_SPECIAL                  0xB0
-#define EVCONTENTMASK_USERDEFINED              0xF0
+enum { MaxEventContents = 4 };
+
+enum eEventContentGroup {
+  ecgMovieDrama               = 0x10,
+  ecgNewsCurrentAffairs       = 0x20,
+  ecgShow                     = 0x30,
+  ecgSports                   = 0x40,
+  ecgChildrenYouth            = 0x50,
+  ecgMusicBalletDance         = 0x60,
+  ecgArtsCulture              = 0x70,
+  ecgSocialPoliticalEconomics = 0x80,
+  ecgEducationalScience       = 0x90,
+  ecgLeisureHobbies           = 0xA0,
+  ecgSpecial                  = 0xB0,
+  ecgUserDefined              = 0xF0
+  };
 
 enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
 
@@ -78,7 +81,7 @@ class cEvent : public cListObject {
   char *shortText;         // Short description of this event (typically the episode name in case of a series)
   char *description;       // Description of this event
   cComponents *components; // The stream components of this event
-  uchar contents[MAXEVCONTENTS]; // Contents of this event
+  uchar contents[MaxEventContents]; // Contents of this event
   time_t startTime;        // Start time of this event
   int duration;            // Duration of this event in seconds
   time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
@@ -97,7 +100,7 @@ class cEvent : public cListObject {
   const char *ShortText(void) const { return shortText; }
   const char *Description(void) const { return description; }
   const cComponents *Components(void) const { return components; }
-  uchar Contents(int i = 0) const { return (0 <= i && i < MAXEVCONTENTS) ? contents[i] : 0; }
+  uchar Contents(int i = 0) const { return (0 <= i && i < MaxEventContents) ? contents[i] : 0; }
   int ParentalRating(void) const { return parentalRating; }
   time_t StartTime(void) const { return startTime; }
   time_t EndTime(void) const { return startTime + duration; }
diff --git a/menu.c b/menu.c
index b0077a0df..7ddf0cff1 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.10 2009/12/06 11:29:05 kls Exp $
+ * $Id: menu.c 2.14 2010/01/31 12:43:24 kls Exp $
  */
 
 #include "menu.h"
@@ -623,11 +623,276 @@ eOSState cMenuText::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuFolderItem -------------------------------------------------------
+
+class cMenuFolderItem : public cOsdItem {
+private:
+  cNestedItem *folder;
+public:
+  cMenuFolderItem(cNestedItem *Folder);
+  cNestedItem *Folder(void) { return folder; }
+  };
+
+cMenuFolderItem::cMenuFolderItem(cNestedItem *Folder)
+:cOsdItem(Folder->Text())
+{
+  folder = Folder;
+  if (folder->SubItems())
+     SetText(cString::sprintf("%s...", folder->Text()));
+}
+
+// --- cMenuEditFolder -------------------------------------------------------
+
+class cMenuEditFolder : public cOsdMenu {
+private:
+  cList<cNestedItem> *list;
+  cNestedItem *folder;
+  char name[PATH_MAX];
+  int subFolder;
+  eOSState Confirm(void);
+public:
+  cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNestedItem *Folder = NULL);
+  cString GetFolder(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuEditFolder::cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNestedItem *Folder)
+:cOsdMenu(Folder ? tr("Edit folder") : tr("New folder"), 12)
+{
+  list = List;
+  folder = Folder;
+  if (folder) {
+     strn0cpy(name, folder->Text(), sizeof(name));
+     subFolder = folder->SubItems() != NULL;
+     }
+  else {
+     *name = 0;
+     subFolder = 0;
+     cRemote::Put(kRight, true); // go right into string editing mode
+     }
+  if (!isempty(Dir)) {
+     cOsdItem *DirItem = new cOsdItem(Dir);
+     DirItem->SetSelectable(false);
+     Add(DirItem);
+     }
+  Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name)));
+  Add(new cMenuEditBoolItem(tr("Sub folder"), &subFolder));
+}
+
+cString cMenuEditFolder::GetFolder(void)
+{
+  return folder ? folder->Text() : "";
+}
+
+eOSState cMenuEditFolder::Confirm(void)
+{
+  if (!folder || strcmp(folder->Text(), name) != 0) {
+     // each name may occur only once in a folder list
+     for (cNestedItem *Folder = list->First(); Folder; Folder = list->Next(Folder)) {
+         if (strcmp(Folder->Text(), name) == 0) {
+            Skins.Message(mtError, tr("Folder name already exists!"));
+            return osContinue;
+            }
+         }
+     char *p = strpbrk(name, "\\{}#~"); // FOLDERDELIMCHAR
+     if (p) {
+        Skins.Message(mtError, cString::sprintf(tr("Folder name must not contain '%c'!"), *p));
+        return osContinue;
+        }
+     }
+  if (folder) {
+     folder->SetText(name);
+     folder->SetSubItems(subFolder);
+     }
+  else
+     list->Add(folder = new cNestedItem(name, subFolder));
+  return osEnd;
+}
+
+eOSState cMenuEditFolder::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:     return Confirm();
+       case kRed:
+       case kGreen:
+       case kYellow:
+       case kBlue:   return osContinue;
+       default: break;
+       }
+     }
+  return state;
+}
+
+// --- cMenuFolder -----------------------------------------------------------
+
+cMenuFolder::cMenuFolder(const char *Title, cNestedItemList *NestedItemList, const char *Path)
+:cOsdMenu(Title)
+{
+  list = nestedItemList = NestedItemList;
+  firstFolder = NULL;
+  editing = false;
+  Set();
+  SetHelpKeys();
+  DescendPath(Path);
+}
+
+cMenuFolder::cMenuFolder(const char *Title, cList<cNestedItem> *List, cNestedItemList *NestedItemList, const char *Dir, const char *Path)
+:cOsdMenu(Title)
+{
+  list = List;
+  nestedItemList = NestedItemList;
+  dir = Dir;
+  firstFolder = NULL;
+  editing = false;
+  Set();
+  SetHelpKeys();
+  DescendPath(Path);
+}
+
+void cMenuFolder::SetHelpKeys(void)
+{
+  SetHelp(firstFolder ? tr("Button$Select") : NULL, tr("Button$New"), firstFolder ? tr("Button$Delete") : NULL, firstFolder ? tr("Button$Edit") : NULL);
+}
+
+void cMenuFolder::Set(const char *CurrentFolder)
+{
+  firstFolder = NULL;
+  Clear();
+  if (!isempty(dir)) {
+     cOsdItem *DirItem = new cOsdItem(dir);
+     DirItem->SetSelectable(false);
+     Add(DirItem);
+     }
+  list->Sort();
+  for (cNestedItem *Folder = list->First(); Folder; Folder = list->Next(Folder)) {
+      cOsdItem *FolderItem = new cMenuFolderItem(Folder);
+      Add(FolderItem, CurrentFolder ? strcmp(Folder->Text(), CurrentFolder) == 0 : false);
+      if (!firstFolder)
+         firstFolder = FolderItem;
+      }
+}
+
+void cMenuFolder::DescendPath(const char *Path)
+{
+  if (Path) {
+     const char *p = strchr(Path, FOLDERDELIMCHAR);
+     if (p) {
+        for (cMenuFolderItem *Folder = (cMenuFolderItem *)firstFolder; Folder; Folder = (cMenuFolderItem *)Next(Folder)) {
+            if (strncmp(Folder->Folder()->Text(), Path, p - Path) == 0) {
+               SetCurrent(Folder);
+               if (Folder->Folder()->SubItems())
+                  AddSubMenu(new cMenuFolder(Title(), Folder->Folder()->SubItems(), nestedItemList, !isempty(dir) ? *cString::sprintf("%s%c%s", *dir, FOLDERDELIMCHAR, Folder->Folder()->Text()) : Folder->Folder()->Text(), p + 1));
+               break;
+               }
+            }
+        }
+    }
+}
+
+eOSState cMenuFolder::Select(void)
+{
+  if (firstFolder) {
+     cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
+     if (Folder) {
+        if (Folder->Folder()->SubItems())
+           return AddSubMenu(new cMenuFolder(Title(), Folder->Folder()->SubItems(), nestedItemList, !isempty(dir) ? *cString::sprintf("%s%c%s", *dir, FOLDERDELIMCHAR, Folder->Folder()->Text()) : Folder->Folder()->Text()));
+        else
+           return osEnd;
+        }
+     }
+  return osContinue;
+}
+
+eOSState cMenuFolder::New(void)
+{
+  editing = true;
+  return AddSubMenu(new cMenuEditFolder(dir, list));
+}
+
+eOSState cMenuFolder::Delete(void)
+{
+  if (!HasSubMenu() && firstFolder) {
+     cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
+     if (Folder && Interface->Confirm(Folder->Folder()->SubItems() ? tr("Delete folder and all sub folders?") : tr("Delete folder?"))) {
+        list->Del(Folder->Folder());
+        Del(Folder->Index());
+        firstFolder = Get(isempty(dir) ? 0 : 1);
+        Display();
+        SetHelpKeys();
+        nestedItemList->Save();
+        }
+     }
+  return osContinue;
+}
+
+eOSState cMenuFolder::Edit(void)
+{
+  if (!HasSubMenu() && firstFolder) {
+     cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
+     if (Folder) {
+        editing = true;
+        return AddSubMenu(new cMenuEditFolder(dir, list, Folder->Folder()));
+        }
+     }
+  return osContinue;
+}
+
+eOSState cMenuFolder::SetFolder(void)
+{
+  cMenuEditFolder *mef = (cMenuEditFolder *)SubMenu();
+  if (mef) {
+     Set(mef->GetFolder());
+     SetHelpKeys();
+     Display();
+     nestedItemList->Save();
+     }
+  return CloseSubMenu();
+}
+
+cString cMenuFolder::GetFolder(void)
+{
+  if (firstFolder) {
+     cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
+     if (Folder) {
+        cMenuFolder *mf = (cMenuFolder *)SubMenu();
+        if (mf)
+           return cString::sprintf("%s%c%s", Folder->Folder()->Text(), FOLDERDELIMCHAR, *mf->GetFolder());
+        return Folder->Folder()->Text();
+        }
+     }
+  return "";
+}
+
+eOSState cMenuFolder::ProcessKey(eKeys Key)
+{
+  if (!HasSubMenu())
+     editing = false;
+  eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (state == osUnknown) {
+     switch (Key) {
+       case kOk:
+       case kRed:    return Select();
+       case kGreen:  return New();
+       case kYellow: return Delete();
+       case kBlue:   return Edit();
+       default:      state = osContinue;
+       }
+     }
+  else if (state == osEnd && HasSubMenu() && editing)
+     state = SetFolder();
+  return state;
+}
+
 // --- cMenuEditTimer --------------------------------------------------------
 
 cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
+  file = NULL;
   firstday = NULL;
   timer = Timer;
   addIfConfirmed = New;
@@ -644,9 +909,10 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
      Add(new cMenuEditBitItem( tr("VPS"),          &data.flags, tfVps));
      Add(new cMenuEditIntItem( tr("Priority"),     &data.priority, 0, MAXPRIORITY));
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
-     Add(new cMenuEditStrItem( tr("File"),          data.file, sizeof(data.file)));
+     Add(file = new cMenuEditStrItem( tr("File"),   data.file, sizeof(data.file)));
      SetFirstDayItem();
      }
+  SetHelpKeys();
   Timers.IncBeingEdited();
 }
 
@@ -657,6 +923,11 @@ cMenuEditTimer::~cMenuEditTimer()
   Timers.DecBeingEdited();
 }
 
+void cMenuEditTimer::SetHelpKeys(void)
+{
+  SetHelp(tr("Button$Folder"));
+}
+
 void cMenuEditTimer::SetFirstDayItem(void)
 {
   if (!firstday && !data.IsSingleEvent()) {
@@ -670,6 +941,26 @@ void cMenuEditTimer::SetFirstDayItem(void)
      }
 }
 
+eOSState cMenuEditTimer::SetFolder(void)
+{
+  cMenuFolder *mf = (cMenuFolder *)SubMenu();
+  if (mf) {
+     cString Folder = mf->GetFolder();
+     char *p = strrchr(data.file, FOLDERDELIMCHAR);
+     if (p)
+        p++;
+     else
+        p = data.file;
+     if (!isempty(*Folder))
+        strn0cpy(data.file, cString::sprintf("%s%c%s", *Folder, FOLDERDELIMCHAR, p), sizeof(data.file));
+     else if (p != data.file)
+        memmove(data.file, p, strlen(p) + 1);
+     SetCurrent(file);
+     Display();
+     }
+  return CloseSubMenu();
+}
+
 eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
@@ -699,13 +990,15 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                           }
                      }
                      return osBack;
-       case kRed:
+       case kRed:    return AddSubMenu(new cMenuFolder(tr("Select folder"), &Folders, data.file));
        case kGreen:
        case kYellow:
        case kBlue:   return osContinue;
        default: break;
        }
      }
+  else if (state == osEnd && HasSubMenu())
+     state = SetFolder();
   if (Key != kNone)
      SetFirstDayItem();
   return state;
@@ -1490,44 +1783,100 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
 
 class cMenuCommands : public cOsdMenu {
 private:
-  cCommands *commands;
-  char *parameters;
+  cList<cNestedItem> *commands;
+  cString parameters;
+  cString title;
+  cString command;
+  bool confirm;
+  char *result;
+  bool Parse(const char *s);
   eOSState Execute(void);
 public:
-  cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
+  cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters = NULL);
   virtual ~cMenuCommands();
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters)
+cMenuCommands::cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters)
 :cOsdMenu(Title)
 {
+  result = NULL;
   SetHasHotkeys();
   commands = Commands;
-  parameters = Parameters ? strdup(Parameters) : NULL;
-  for (cCommand *command = commands->First(); command; command = commands->Next(command))
-      Add(new cOsdItem(hk(command->Title())));
+  parameters = Parameters;
+  for (cNestedItem *Command = commands->First(); Command; Command = commands->Next(Command)) {
+      const char *s = Command->Text();
+      if (Command->SubItems())
+         Add(new cOsdItem(hk(cString::sprintf("%s...", s))));
+      else if (Parse(s))
+         Add(new cOsdItem(hk(title)));
+      }
 }
 
 cMenuCommands::~cMenuCommands()
 {
-  free(parameters);
+  free(result);
+}
+
+bool cMenuCommands::Parse(const char *s)
+{
+  const char *p = strchr(s, ':');
+  if (p) {
+     int l = p - s;
+     if (l > 0) {
+        char t[l + 1];
+        stripspace(strn0cpy(t, s, l + 1));
+        l = strlen(t);
+        if (l > 1 && t[l - 1] == '?') {
+           t[l - 1] = 0;
+           confirm = true;
+           }
+        else
+           confirm = false;
+        title = t;
+        command = skipspace(p + 1);
+        return true;
+        }
+     }
+  return false;
 }
 
 eOSState cMenuCommands::Execute(void)
 {
-  cCommand *command = commands->Get(Current());
-  if (command) {
-     bool confirmed = true;
-     if (command->Confirm())
-        confirmed = Interface->Confirm(cString::sprintf("%s?", command->Title()));
-     if (confirmed) {
-        Skins.Message(mtStatus, cString::sprintf("%s...", command->Title()));
-        const char *Result = command->Execute(parameters);
-        Skins.Message(mtStatus, NULL);
-        if (Result)
-           return AddSubMenu(new cMenuText(command->Title(), Result, fontFix));
-        return osEnd;
+  cNestedItem *Command = commands->Get(Current());
+  if (Command) {
+     if (Command->SubItems())
+        return AddSubMenu(new cMenuCommands(Title(), Command->SubItems(), parameters));
+     if (Parse(Command->Text())) {
+        if (!confirm || Interface->Confirm(cString::sprintf("%s?", *title))) {
+           Skins.Message(mtStatus, cString::sprintf("%s...", *title));
+           free(result);
+           result = NULL;
+           cString cmdbuf;
+           if (!isempty(parameters))
+              cmdbuf = cString::sprintf("%s %s", *command, *parameters);
+           const char *cmd = *cmdbuf ? *cmdbuf : *command;
+           dsyslog("executing command '%s'", cmd);
+           cPipe p;
+           if (p.Open(cmd, "r")) {
+              int l = 0;
+              int c;
+              while ((c = fgetc(p)) != EOF) {
+                    if (l % 20 == 0)
+                       result = (char *)realloc(result, l + 21);
+                    result[l++] = char(c);
+                    }
+              if (result)
+                 result[l] = 0;
+              p.Close();
+              }
+           else
+              esyslog("ERROR: can't open pipe for command '%s'", cmd);
+           Skins.Message(mtStatus, NULL);
+           if (result)
+              return AddSubMenu(new cMenuText(title, result, fontFix));
+           return osEnd;
+           }
         }
      }
   return osContinue;
@@ -1921,7 +2270,7 @@ void cMenuRecordings::Set(bool Refresh)
   Clear();
   Recordings.Sort();
   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
-      if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == '~')) {
+      if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
          cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
          if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
             Add(Item);
@@ -2746,6 +3095,7 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0));
   Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
+  Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"),              &data.ChannelsWrap));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"),             &data.EmergencyExit));
 }
 
@@ -3245,6 +3595,8 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction
   if (Direction) {
      while (Channel) {
            Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
+           if (!Channel && Setup.ChannelsWrap)
+              Channel = Direction > 0 ? Channels.First() : Channels.Last();
            if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true))
               return Channel;
            }
@@ -3759,7 +4111,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   isyslog("record %s", fileName);
   if (MakeDirs(fileName, true)) {
      const cChannel *ch = timer->Channel();
-     recorder = new cRecorder(fileName, ch->GetChannelID(), timer->Priority(), ch->Vpid(), ch->Apids(), ch->Dpids(), ch->Spids());
+     recorder = new cRecorder(fileName, ch, timer->Priority());
      if (device->AttachReceiver(recorder)) {
         Recording.WriteInfo();
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
diff --git a/menu.h b/menu.h
index 6ab9904a4..d428a8dd8 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.0 2008/02/10 16:01:53 kls Exp $
+ * $Id: menu.h 2.1 2010/01/17 11:21:42 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -31,14 +31,39 @@ class cMenuText : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuFolder : public cOsdMenu {
+private:
+  cNestedItemList *nestedItemList;
+  cList<cNestedItem> *list;
+  cString dir;
+  cOsdItem *firstFolder;
+  bool editing;
+  void SetHelpKeys(void);
+  void Set(const char *CurrentFolder = NULL);
+  void DescendPath(const char *Path);
+  eOSState SetFolder(void);
+  eOSState Select(void);
+  eOSState New(void);
+  eOSState Delete(void);
+  eOSState Edit(void);
+  cMenuFolder(const char *Title, cList<cNestedItem> *List, cNestedItemList *NestedItemList, const char *Dir, const char *Path = NULL);
+public:
+  cMenuFolder(const char *Title, cNestedItemList *NestedItemList, const char *Path = NULL);
+  cString GetFolder(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuEditTimer : public cOsdMenu {
 private:
   cTimer *timer;
   cTimer data;
   int channel;
   bool addIfConfirmed;
+  cMenuEditStrItem *file;
   cMenuEditDateItem *firstday;
+  eOSState SetFolder(void);
   void SetFirstDayItem(void);
+  void SetHelpKeys(void);
 public:
   cMenuEditTimer(cTimer *Timer, bool New = false);
   virtual ~cMenuEditTimer();
diff --git a/osd.c b/osd.c
index 5529f1212..cc6033757 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.6 2009/12/06 11:33:47 kls Exp $
+ * $Id: osd.c 2.9 2010/01/22 15:58:39 kls Exp $
  */
 
 #include "osd.h"
@@ -145,12 +145,14 @@ int cPalette::ClosestColor(tColor Color, int MaxDiff) const
   int R1 = (Color & 0x00FF0000) >> 16;
   int G1 = (Color & 0x0000FF00) >>  8;
   int B1 = (Color & 0x000000FF);
-  for (int i = 0; i < numColors; i++) {
+  for (int i = 0; i < numColors && d > 0; i++) {
       int A2 = (color[i] & 0xFF000000) >> 24;
       int R2 = (color[i] & 0x00FF0000) >> 16;
       int G2 = (color[i] & 0x0000FF00) >>  8;
       int B2 = (color[i] & 0x000000FF);
-      int diff = (abs(A1 - A2) << 1) + (abs(R1 - R2) << 1) + (abs(G1 - G2) << 1) + (abs(B1 - B2) << 1);
+      int diff = 0;
+      if (A1 || A2) // fully transparent colors are considered equal
+         diff = (abs(A1 - A2) << 1) + (abs(R1 - R2) << 1) + (abs(G1 - G2) << 1) + (abs(B1 - B2) << 1);
       if (diff < d) {
          d = diff;
          n = i;
@@ -724,6 +726,18 @@ void cBitmap::ShrinkBpp(int NewBpp)
 
 // --- cOsd ------------------------------------------------------------------
 
+static const char *OsdErrorTexts[] = {
+  "ok",
+  "too many areas",
+  "too many colors",
+  "bpp not supported",
+  "areas overlap",
+  "wrong alignment",
+  "out of memory",
+  "wrong area size",
+  "unknown",
+  };
+
 int cOsd::osdLeft = 0;
 int cOsd::osdTop = 0;
 int cOsd::osdWidth = 0;
@@ -814,7 +828,7 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
          }
      }
   else
-     esyslog("ERROR: cOsd::SetAreas returned %d", Result);
+     esyslog("ERROR: cOsd::SetAreas returned %d (%s)", Result, Result < oeUnknown ? OsdErrorTexts[Result] : OsdErrorTexts[oeUnknown]);
   return Result;
 }
 
diff --git a/osd.h b/osd.h
index f10247ead..aa8a35ab1 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.4 2009/05/08 13:41:03 kls Exp $
+ * $Id: osd.h 2.5 2010/01/17 13:23:50 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -36,7 +36,7 @@ enum {
   clrWhite       = 0xFFFCFCFC,
   };
 
-enum eOsdError { oeOk,
+enum eOsdError { oeOk, // see also OsdErrorTexts in osd.c
                  oeTooManyAreas,
                  oeTooManyColors,
                  oeBppNotSupported,
diff --git a/osdbase.c b/osdbase.c
index 9b59c0507..0cdedb23f 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.1 2009/06/01 11:54:50 kls Exp $
+ * $Id: osdbase.c 2.2 2010/01/17 11:36:12 kls Exp $
  */
 
 #include "osdbase.h"
@@ -41,7 +41,7 @@ cOsdItem::~cOsdItem()
 void cOsdItem::SetText(const char *Text, bool Copy)
 {
   free(text);
-  text = Copy ? strdup(Text) : (char *)Text; // text assumes ownership!
+  text = Copy ? strdup(Text ? Text : "") : (char *)Text; // text assumes ownership!
 }
 
 void cOsdItem::SetSelectable(bool Selectable)
diff --git a/osdbase.h b/osdbase.h
index 0997c2751..91c5ff730 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 2.0 2007/11/03 14:50:52 kls Exp $
+ * $Id: osdbase.h 2.1 2010/01/16 14:25:31 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -102,6 +102,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   void SetCols(int c0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   void SetHasHotkeys(bool HasHotkeys = true);
   virtual void Clear(void);
+  const char *Title(void) { return title; }
   bool SelectableItem(int idx);
   void SetCurrent(cOsdItem *Item);
   void RefreshCurrent(void);
@@ -116,6 +117,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   eOSState AddSubMenu(cOsdMenu *SubMenu);
   eOSState CloseSubMenu();
   bool HasSubMenu(void) { return subMenu; }
+  cOsdMenu *SubMenu(void) { return subMenu; }
   void SetStatus(const char *s);
   void SetTitle(const char *Title);
   void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 14f3c2188..fcdf6724d 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -586,6 +586,31 @@ msgstr "Canal en 
 msgid "Delete channel?"
 msgstr "Esborrar el canal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Editar temporitzador"
 
@@ -616,9 +641,15 @@ msgstr "Durada"
 msgid "File"
 msgstr "Arxiu"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Primer dia"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Temporitzadors"
 
@@ -1047,6 +1078,9 @@ msgstr "anterior"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volum inicial"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sortida d'emerg�ncia"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 6394008e7..3bbd6eb31 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -584,6 +584,31 @@ msgstr "Kan
 msgid "Delete channel?"
 msgstr "Smazat kan�l?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Editace �asova�e"
 
@@ -614,9 +639,15 @@ msgstr "
 msgid "File"
 msgstr "Soubor"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Prvn� den"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "�asova�e"
 
@@ -1045,6 +1076,9 @@ msgstr "jako naposledy"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spu�t�n�"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Nouzov� ukon�en�"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index faa3632da..fbad90944 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -583,6 +583,31 @@ msgstr "Kanal anvendes af en timer!"
 msgid "Delete channel?"
 msgstr "Slet kanal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Rediger timer"
 
@@ -613,9 +638,15 @@ msgstr "Levetid"
 msgid "File"
 msgstr "Fil"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "F�rste dag"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timere"
 
@@ -1044,6 +1075,9 @@ msgstr "som f
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lydstyrke ved opstart"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "N�dudgang"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index ff25a3344..ad6401b59 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
-"PO-Revision-Date: 2007-11-25 15:19+0200\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -583,6 +583,31 @@ msgstr "Kanal wird von einem Timer benutzt!"
 msgid "Delete channel?"
 msgstr "Kanal l�schen?"
 
+msgid "Edit folder"
+msgstr "Verzeichnis editieren"
+
+msgid "New folder"
+msgstr "Neues Verzeichnis"
+
+msgid "Sub folder"
+msgstr "Unterverzeichnis"
+
+msgid "Folder name already exists!"
+msgstr "Verzeichnisname existiert bereits!"
+
+#, fuzzy, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr "Verzeichnisname darf kein '{', '}' oder '#' enthalten!"
+
+msgid "Button$Select"
+msgstr "Ausw�hlen"
+
+msgid "Delete folder and all sub folders?"
+msgstr "Verzeichnis und alle Unterverzeichnisse l�schen?"
+
+msgid "Delete folder?"
+msgstr "Verzeichnis l�schen?"
+
 msgid "Edit timer"
 msgstr "Timer editieren"
 
@@ -613,9 +638,15 @@ msgstr "Lebensdauer"
 msgid "File"
 msgstr "Datei"
 
+msgid "Button$Folder"
+msgstr "Verzeichnis"
+
 msgid "First day"
 msgstr "Erster Tag"
 
+msgid "Select folder"
+msgstr "Verzeichnis w�hlen"
+
 msgid "Timers"
 msgstr "Timer"
 
@@ -1044,6 +1075,9 @@ msgstr "wie vorher"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lautst�rke beim Einschalten"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr "Rundum zappen"
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Notausstieg"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 2c310abc3..e8382b86e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -583,6 +583,31 @@ msgstr "
 msgid "Delete channel?"
 msgstr "�������� ��������?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "����������� ��������������������"
 
@@ -613,9 +638,15 @@ msgstr "
 msgid "File"
 msgstr "������"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "����� ����"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "��������������������"
 
@@ -1044,6 +1075,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 6cb029ca8..d2bf5b000 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -584,6 +584,31 @@ msgstr "
 msgid "Delete channel?"
 msgstr "�Eliminar canal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Modificar programaci�n"
 
@@ -614,9 +639,15 @@ msgstr "Duraci
 msgid "File"
 msgstr "Fichero"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Primer d�a"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Programar grabaciones"
 
@@ -1045,6 +1076,9 @@ msgstr "anterior"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumen inicial"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Salida de emergencia"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index f8a0f6015..97e2aeec0 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,13 +1,13 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Arthur Konovalov <artlov@gmail.com>, 2004-2009
+# Arthur Konovalov <artlov@gmail.com>, 2004-2010
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian\n"
@@ -34,251 +34,251 @@ msgid "Channel not available!"
 msgstr "Kanal ei ole k�ttesaadav!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Siirdemooduse start nurjus!"
+msgstr "�lekandemooduse start nurjus!"
 
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine k�ivitatud"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/draama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Krimi/triller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Seiklus/western/s�da"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Scifi/fantaasia/�udus"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Kom��dia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Sari/Melodraama/p�rimuslik"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romanss"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "T�sine/klassikaline/religioosne/ajaloofilm/draama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "T�iskasvanutele/draama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Uudised/p�evakajaline"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Uudised/ilmateade"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Uudisteajakiri"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokumentaal"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Diskussioon/intervjuu/debatt"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Meelelahutus"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "S�um�ng/m�lum�ng/v�istlus"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Varietee"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Vestlussaade"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Eris�ndmus"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Spordiajakiri"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Jalgpall"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Meeskonnasport"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Kergej�ustik"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Autosport"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Veesport"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Talvesport"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Ratsutamine"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "V�itluskunst"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Laste- ja noortesaade"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Koolieelikutele"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Meelelahutus 6-14 aastastele"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Meelelahutus 10-16 aastastele"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "�ppe- ja haridussaade"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Joonisfilm/Nukufilm"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Muusika/ballett/tants"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Klassikaline muusika"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/rahvamuusika"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Muusikal/ooper"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballett"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Kunst/kultuur"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Performance"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Kaunid kunstid"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religioon"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Rahvakultuur/traditsiooniline kunst"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Kirjandus"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Filmikunst"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Eksperimentaalfilm/video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "TV/raadio/ajakirjandus"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Uus meedia"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Kultuuriajakiri"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Mood"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "�hiskond/poliitika/majandus"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Ajakiri/reportaa�/dokumentaal"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Majandus/majandusn�uanne"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "T�helepanuv��rsed isikud"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Haridus/teadus/faktid"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Loodus/loomad/keskkond"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tehnoloogia/loodusteadus"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Meditsiin/f�sioloogia/ps�hholoogia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "V�lisriigid/ekspeditsioon"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "�hiskondlik/Hingeteadus"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "T�iend�pe"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Keeled"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Vaba aeg/hobi"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turism/reisimine"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "K�sit��"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Autondus"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Tervis"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Kokasaade"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reklaam/teleturg"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Aiandus"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Originaalkeel"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Mustvalge"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Avaldamata"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Otse�lekanne"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "alates %d"
 
 msgid "No title"
 msgstr "Pealkiri puudub"
@@ -583,6 +583,31 @@ msgstr "Kanal on taimeri kasutuses!"
 msgid "Delete channel?"
 msgstr "Kustutada kanal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Taimeri redigeerimine"
 
@@ -613,9 +638,15 @@ msgstr "Eluiga"
 msgid "File"
 msgstr "Fail"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Esimene p�ev"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Taimer"
 
@@ -1044,6 +1075,9 @@ msgstr "endine"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus k�ivitamisel"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "H�dav�ljumine"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 410bd67f6..916b51e40 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -586,6 +586,31 @@ msgstr "Kanava on ajastimen k
 msgid "Delete channel?"
 msgstr "Poistetaanko kanava?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Muokkaa ajastinta"
 
@@ -616,9 +641,15 @@ msgstr "Elinik
 msgid "File"
 msgstr "Tiedosto"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "1. p�iv�"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Ajastimet"
 
@@ -1047,6 +1078,9 @@ msgstr "edellinen"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��nenvoimakkuus k�ynnistett�ess�"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "K�yt� h�t�sammutusta"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 9f2768a8d..4c4dcce05 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -589,6 +589,31 @@ msgstr "Cette cha
 msgid "Delete channel?"
 msgstr "Supprimer la cha�ne ?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Changer la programmation"
 
@@ -619,9 +644,15 @@ msgstr "Dur
 msgid "File"
 msgstr "Fichier"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Premier jour"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Programmation"
 
@@ -1050,6 +1081,9 @@ msgstr "comme avant"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Arr�t d'urgence"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 7d923afec..b7cf5a0f2 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -585,6 +585,31 @@ msgstr "Program je trenutno zauzet tajmerom!"
 msgid "Delete channel?"
 msgstr "Obrisati program?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Ure�ivanje tajmera"
 
@@ -615,9 +640,15 @@ msgstr "Trajanje"
 msgid "File"
 msgstr "Datoteka"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Prvi dan"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Tajmeri"
 
@@ -1046,6 +1077,9 @@ msgstr "kao prethodno"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Po�etna ja�ina zvuka"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izlaz u slu�aju nu�de"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 1517920e5..d09c8dd44 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -586,6 +586,31 @@ msgstr "Az ad
 msgid "Delete channel?"
 msgstr "Csatorna t�rl�se?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Id�z�t� megv�ltoztat�sa"
 
@@ -616,9 +641,15 @@ msgstr "
 msgid "File"
 msgstr "File"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Els� nap"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Id�z�t�"
 
@@ -1047,6 +1078,9 @@ msgstr "ahogy az el
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hanger� a bekapcsol�sn�l"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 1a403add9..3a8f2e221 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
-"PO-Revision-Date: 2009-11-28 22:50+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"PO-Revision-Date: 2010-01-12 23:53+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -47,245 +47,245 @@ msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Dramma"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Investigativo/Giallo"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Avventura/Western/Guerra"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Finzione/Fantasia/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Commedia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Telenovella/Melodramma/Folcloristico"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romanzo"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Serio/Classico/Religioso/Film storico/Dramma"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Film per adulti/Dramma"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Notizie/Ultima ora"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Notizie/Previsioni meteo"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Settimanale di attualità"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documentario"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussione/Intervista/Dibattito"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Spettacolo/Gioco a premi"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Gioco a premi/Quiz/Gara"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Spettacolo di varietà"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk Show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Evento speciale"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Settimanale di sport"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Calcio"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Sport di squadra"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletica"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Sport motoristici"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Sport acquatici"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Sport invernali"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equitazione"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Arti marziali"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Programmi per ragazzi/giovani"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Programmi per ragazzi prescolastici"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programmi di intrattenimento da 6 a 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programmi di intrattenimento da 10 a 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informativo/Educativo/Programma scolastico"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Cartoni/Pupazzi"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Musica/Balletto/Danza"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Musica Classica/Seria"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Musica Tradizionale/Folclore"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balletto"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arte/Cultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Arti di rendimento"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Arti fine"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religione"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Cultura popolare/Arti tradizionali"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Letteratura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Film sperimentale/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Trasmissione/Stampa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nuovo programma"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Arte/Settimanale di cultura"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Società/Politica/Economia"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Settimanale/Reportage/Documentario"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Economia/Consulenza sociale"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Personaggi importanti"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Educazione/Scienza/Fatti"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Natura/Animali/Ambiente"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tecnologia/Scienze naturali"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Filosofia/Psicologia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Paesi esteri/Spedizioni"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Società/Scienze spirituali"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Altra educazione"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Lingue"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Tempo libero/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turismo/Viaggi"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Artigianato"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motori"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Culturismo & Salute"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cucina"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Pubblicità/Acquisti"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Giardinaggio"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Lingua madre"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Bianco & Nero"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Non pubblicato"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Trasmissione dal vivo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "da %d"
 
 msgid "No title"
 msgstr "Senza titolo"
@@ -590,6 +590,31 @@ msgstr "Canale occupato da un timer!"
 msgid "Delete channel?"
 msgstr "Eliminare il canale?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Modifica timer"
 
@@ -620,9 +645,15 @@ msgstr "Scadenza"
 msgid "File"
 msgstr "Nome"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "1° giorno"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timer"
 
@@ -1051,6 +1082,9 @@ msgstr "come prima"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Uscita di emergenza"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index dd367546a..93583c57c 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.9\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2009-10-17 14:19+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -583,6 +583,31 @@ msgstr "Kanalą šiuo metu naudoja laikmačio procesas!"
 msgid "Delete channel?"
 msgstr "Ištrinti kanalą?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Koreguoti laikmatį"
 
@@ -613,9 +638,15 @@ msgstr "Galiojimas"
 msgid "File"
 msgstr "Failas"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Pirma diena"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Laikmačiai"
 
@@ -1044,6 +1075,9 @@ msgstr "kaip anksčiau"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Garsas įjungimo metu"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Avarinis išėjimas"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 3634438fa..fdfaf8d12 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -587,6 +587,31 @@ msgstr "Kanaal wordt gebruikt door een timer!"
 msgid "Delete channel?"
 msgstr "Kanaal verwijderen?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Timer veranderen"
 
@@ -617,9 +642,15 @@ msgstr "Bewaarduur"
 msgid "File"
 msgstr "Bestandnaam"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Eerste dag"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timers"
 
@@ -1048,6 +1079,9 @@ msgstr "zoals eerder"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Opstartvolume"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Nooduitgang"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 56975a562..1f50117f6 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -584,6 +584,31 @@ msgstr "Kanalen er i bruk av en timer!"
 msgid "Delete channel?"
 msgstr "Slette kanal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Editer timer"
 
@@ -614,9 +639,15 @@ msgstr "Levetid"
 msgid "File"
 msgstr "Filnavn"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "F�rste dag"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timere"
 
@@ -1045,6 +1076,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0143db862..038d058af 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -584,6 +584,31 @@ msgstr "Kana
 msgid "Delete channel?"
 msgstr "Usun�� kana�?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Edycja timera"
 
@@ -614,9 +639,15 @@ msgstr "Czas 
 msgid "File"
 msgstr "Plik"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Pierwszy dzie�"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timery"
 
@@ -1045,6 +1076,9 @@ msgstr "jak ostatnio"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Wyj�cie awaryjne"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e863f8c78..e409581c7 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -583,6 +583,31 @@ msgstr "Canal a ser utilizador por uma grava
 msgid "Delete channel?"
 msgstr "Apagar o canal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Editar gava��o programada"
 
@@ -613,9 +638,15 @@ msgstr "Dura
 msgid "File"
 msgstr "Ficheiro"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Primeiro dia"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Grava��es programadas"
 
@@ -1044,6 +1075,9 @@ msgstr "Como estava"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume inicial"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sa�da de emerg�ncia"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 79a2690fb..f52a7d8ba 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-02-25 00:39+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -586,6 +586,31 @@ msgstr "Canalul este utilizat de un timer!"
 msgid "Delete channel?"
 msgstr "�terg canalul?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Modificare timer"
 
@@ -616,9 +641,15 @@ msgstr "Timp de p
 msgid "File"
 msgstr "Fi�ier"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Prima zi"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timer-e"
 
@@ -1047,6 +1078,9 @@ msgstr "ca mai 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Oprire de urgen��"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index eb71a20d1..c6d6aca0f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -584,6 +584,31 @@ msgstr "
 msgid "Delete channel?"
 msgstr "������� �����?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "��������� �������"
 
@@ -614,9 +639,15 @@ msgstr "
 msgid "File"
 msgstr "����"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "������ ����"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "�������"
 
@@ -1045,6 +1076,9 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��������� ��� ���������"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "��������� �����"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 5068882c0..c66132ad9 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2009-09-30 12:50+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak\n"
@@ -584,6 +584,31 @@ msgstr "Pl
 msgid "Delete channel?"
 msgstr "Odstr�ni� kan�l?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "�prava pl�nu nahr�vania"
 
@@ -614,9 +639,15 @@ msgstr "
 msgid "File"
 msgstr "S�bor"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Prv� de�"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Pl�ny nahr�vania"
 
@@ -1045,6 +1076,9 @@ msgstr "ako naposledy"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitos� po spusten�"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "N�dzov� ukon�enie"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 7b3b05f2b..2c20440e3 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -584,6 +584,31 @@ msgstr "Kanal je zavzet s terminom za snemanje!"
 msgid "Delete channel?"
 msgstr "Izbri�i kanal?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Uredi termin"
 
@@ -614,9 +639,15 @@ msgstr "Veljavnost"
 msgid "File"
 msgstr "Datoteka"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Prvi dan"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Termini"
 
@@ -1045,6 +1076,9 @@ msgstr "kot prej"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izhod v sili"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 17a1da6c0..4ac9a0f56 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -586,6 +586,31 @@ msgstr "Kanalen anv
 msgid "Delete channel?"
 msgstr "Ta bort kanalen?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "�ndra timer"
 
@@ -616,9 +641,15 @@ msgstr "Livstid"
 msgid "File"
 msgstr "Filnamn"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "F�rsta dag"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Timers"
 
@@ -1047,6 +1078,9 @@ msgstr "som f
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Of�rutsedd avslutning"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index e921986e9..02a96424e 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -583,6 +583,31 @@ msgstr "Kanal zamanlay
 msgid "Delete channel?"
 msgstr "Kanal� sil?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Zamanlay�c�y� ayarla"
 
@@ -613,9 +638,15 @@ msgstr "
 msgid "File"
 msgstr "K�t�k"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "�lk g�n"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Zamanlay�c�"
 
@@ -1044,6 +1075,9 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "A��l��daki ses"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Acil c�k��"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 17c837163..7e3010c0c 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2009-05-31 13:17+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -583,6 +583,31 @@ msgstr "Канал зайнятий таймером!"
 msgid "Delete channel?"
 msgstr "Видалити канал?"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "Налаштування таймера"
 
@@ -613,9 +638,15 @@ msgstr "Строк зберігання"
 msgid "File"
 msgstr "Файл"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "Перший день"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "Таймери"
 
@@ -1044,6 +1075,9 @@ msgstr "як раніше"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Гучність при включенні"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Аварійний вихід"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f6eaacd7..1d12f71ea 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-03 15:10+0100\n"
+"POT-Creation-Date: 2010-01-17 16:18+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -586,6 +586,31 @@ msgstr "频道正在录像！"
 msgid "Delete channel?"
 msgstr "是否删除频道？"
 
+msgid "Edit folder"
+msgstr ""
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+msgid "Button$Select"
+msgstr ""
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+msgid "Delete folder?"
+msgstr ""
+
 msgid "Edit timer"
 msgstr "编辑计时器"
 
@@ -616,9 +641,15 @@ msgstr "终生"
 msgid "File"
 msgstr "文件"
 
+msgid "Button$Folder"
+msgstr ""
+
 msgid "First day"
 msgstr "第一天"
 
+msgid "Select folder"
+msgstr ""
+
 msgid "Timers"
 msgstr "录像中列表"
 
@@ -1047,6 +1078,9 @@ msgstr "之前"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "初始化声音"
 
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "突发事件退出"
 
diff --git a/receiver.c b/receiver.c
index 08346e4f4..f922e9802 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.1 2010/01/01 15:38:48 kls Exp $
+ * $Id: receiver.c 2.2 2010/01/30 10:25:38 kls Exp $
  */
 
 #include "receiver.h"
@@ -12,28 +12,26 @@
 #include <stdio.h>
 #include "tools.h"
 
+#ifdef LEGACY_CRECEIVER
 cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
 {
   device = NULL;
   channelID = ChannelID;
   priority = Priority;
   numPids = 0;
-  if (Pid)
-     pids[numPids++] = Pid;
-  if (Pids1) {
-     while (*Pids1 && numPids < MAXRECEIVEPIDS)
-           pids[numPids++] = *Pids1++;
-     }
-  if (Pids2) {
-     while (*Pids2 && numPids < MAXRECEIVEPIDS)
-           pids[numPids++] = *Pids2++;
-     }
-  if (Pids3) {
-     while (*Pids3 && numPids < MAXRECEIVEPIDS)
-           pids[numPids++] = *Pids3++;
-     }
-  if (numPids >= MAXRECEIVEPIDS)
-     dsyslog("too many PIDs in cReceiver");
+  AddPid(Pid);
+  AddPids(Pids1);
+  AddPids(Pids2);
+  AddPids(Pids3);
+}
+#endif
+
+cReceiver::cReceiver(const cChannel *Channel, int Priority)
+{
+  device = NULL;
+  priority = Priority;
+  numPids = 0;
+  SetPids(Channel);
 }
 
 cReceiver::~cReceiver()
@@ -46,6 +44,49 @@ cReceiver::~cReceiver()
      }
 }
 
+bool cReceiver::AddPid(int Pid)
+{
+  if (Pid) {
+     if (numPids < MAXRECEIVEPIDS)
+        pids[numPids++] = Pid;
+     else {
+        dsyslog("too many PIDs in cReceiver (Pid = %d)", Pid);
+        return false;
+        }
+     }
+  return true;
+}
+
+bool cReceiver::AddPids(const int *Pids)
+{
+  if (Pids) {
+     while (*Pids) {
+           if (!AddPid(*Pids++))
+              return false;
+           }
+     }
+  return true;
+}
+
+bool cReceiver::AddPids(int Pid1, int Pid2, int Pid3, int Pid4, int Pid5, int Pid6, int Pid7, int Pid8, int Pid9)
+{
+  return AddPid(Pid1) && AddPid(Pid2) && AddPid(Pid3) && AddPid(Pid4) && AddPid(Pid5) && AddPid(Pid6) && AddPid(Pid7) && AddPid(Pid8) && AddPid(Pid9);
+}
+
+bool cReceiver::SetPids(const cChannel *Channel)
+{
+  numPids = 0;
+  if (Channel) {
+     channelID = Channel->GetChannelID();
+     return AddPid(Channel->Vpid()) &&
+            (Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
+            AddPids(Channel->Apids()) &&
+            (!Setup.UseDolbyDigital || AddPids(Channel->Dpids())) &&
+            AddPids(Channel->Spids());
+     }
+return true;
+}
+
 bool cReceiver::WantsPid(int Pid)
 {
   if (Pid) {
diff --git a/receiver.h b/receiver.h
index 35930d2da..bd98a426f 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.0 2007/01/05 11:00:36 kls Exp $
+ * $Id: receiver.h 2.1 2010/01/30 10:25:19 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -14,6 +14,8 @@
 
 #define MAXRECEIVEPIDS  64 // the maximum number of PIDs per receiver
 
+#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
+
 class cReceiver {
   friend class cDevice;
 private:
@@ -38,20 +40,35 @@ class cReceiver {
                ///< will be delivered only ONCE, so the cReceiver must make sure that
                ///< it will be able to buffer the data if necessary.
 public:
+#ifdef LEGACY_CRECEIVER
   cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
-               ///< Creates a new receiver for the channel with the given ChannelID with
-               ///< the given Priority. Pid is a single PID (typically the video PID), while
-               ///< Pids1...Pids3 are pointers to zero terminated lists of PIDs.
-               ///< If any of these PIDs are 0, they will be silently ignored.
-               ///< The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
+#endif
+  cReceiver(const cChannel *Channel = NULL, int Priority = -1);
+               ///< Creates a new receiver for the given Channel with the given Priority.
+               ///< If Channel is not NULL, its pids set by a call to SetPids().
+               ///< Otherwise pids can be added to the receiver by separate calls to the AddPid[s]
+               ///< functions.
+               ///< The total number of PIDs added to a receiver must not exceed MAXRECEIVEPIDS.
                ///< Priority may be any value in the range -99..99. Negative values indicate
                ///< that this cReceiver may be detached at any time (without blocking the
                ///< cDevice it is attached to).
-               ///< The ChannelID is necessary to allow the device that will be used for this
-               ///< receiver to detect and store whether the channel can be decrypted in case
-               ///< this is an encrypted channel. If the channel is not encrypted or this
-               ///< detection is not wanted, an invalid tChannelID may be given.
   virtual ~cReceiver();
+  bool AddPid(int Pid);
+               ///< Adds the given Pid to the list of PIDs of this receiver.
+  bool AddPids(const int *Pids);
+               ///< Adds the given izero terminated list of Pids to the list of PIDs of this
+               ///< receiver.
+  bool AddPids(int Pid1, int Pid2, int Pid3 = 0, int Pid4 = 0, int Pid5 = 0, int Pid6 = 0, int Pid7 = 0, int Pid8 = 0, int Pid9 = 0);
+               ///< Adds the given Pids to the list of PIDs of this receiver.
+  bool SetPids(const cChannel *Channel);
+               ///< Sets the PIDs of this receiver to those of the given Channel,
+               ///< replacing and previously stored PIDs. If Channel is NULL, all
+               ///< PIDs will be cleared. Parameters in the Setup may control whether
+               ///< certain types of PIDs (like Dolby Digital, for instance) are
+               ///< actually set. The Channel's ID is stored and can later be retrieved
+               ///< through ChannelID(). The ChannelID is necessary to allow the device
+               ///< that will be used for this receiver to detect and store whether the
+               ///< channel can be decrypted in case this is an encrypted channel.
   tChannelID ChannelID(void) { return channelID; }
   bool IsAttached(void) { return device != NULL; }
                ///< Returns true if this receiver is (still) attached to a device.
diff --git a/recorder.c b/recorder.c
index 7d01b075a..60631e0a8 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.7 2009/12/06 11:34:41 kls Exp $
+ * $Id: recorder.c 2.8 2010/01/29 16:37:22 kls Exp $
  */
 
 #include "recorder.h"
@@ -21,8 +21,8 @@
 
 // --- cRecorder -------------------------------------------------------------
 
-cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
-:cReceiver(ChannelID, Priority, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
+cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority)
+:cReceiver(Channel, Priority)
 ,cThread("recording")
 ,recordingInfo(FileName)
 {
@@ -32,15 +32,15 @@ cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, i
 
   ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE, true, "Recorder");
   ringBuffer->SetTimeouts(0, 100);
-  cChannel *Channel = Channels.GetByChannelID(ChannelID);
-  int Pid = VPid;
-  int Type = Channel ? Channel->Vtype() : 0;
-  if (!Pid && APids) {
-     Pid = APids[0];
+
+  int Pid = Channel->Vpid();
+  int Type = Channel->Vtype();
+  if (!Pid && Channel->Apid(0)) {
+     Pid = Channel->Apid(0);
      Type = 0x04;
      }
-  if (!Pid && DPids) {
-     Pid = DPids[0];
+  if (!Pid && Channel->Dpid(0)) {
+     Pid = Channel->Dpid(0);
      Type = 0x06;
      }
   frameDetector = new cFrameDetector(Pid, Type);
diff --git a/recorder.h b/recorder.h
index 40a32224b..d11d7adfc 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 2.1 2009/01/06 10:44:58 kls Exp $
+ * $Id: recorder.h 2.2 2010/01/29 16:32:32 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -34,9 +34,9 @@ class cRecorder : public cReceiver, cThread {
   virtual void Receive(uchar *Data, int Length);
   virtual void Action(void);
 public:
-  cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids);
-               // Creates a new recorder for the channel with the given ChannelID and
-               // the given Priority that will record the given PIDs into the file FileName.
+  cRecorder(const char *FileName, const cChannel *Channel, int Priority);
+               // Creates a new recorder for the given Channel and
+               // the given Priority that will record into the file FileName.
   virtual ~cRecorder();
   };
 
diff --git a/recording.c b/recording.c
index 41ad47aac..ef78c40d6 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.21 2010/01/02 13:46:05 kls Exp $
+ * $Id: recording.c 2.22 2010/01/16 11:18:30 kls Exp $
  */
 
 #include "recording.h"
@@ -524,8 +524,8 @@ bool cRecordingInfo::Write(void) const
 
 struct tCharExchange { char a; char b; };
 tCharExchange CharExchange[] = {
-  { '~',  '/'    },
-  { '/',  '~'    },
+  { FOLDERDELIMCHAR,  '/' },
+  { '/',  FOLDERDELIMCHAR },
   { ' ',  '_'    },
   // backwards compatibility:
   { '\'', '\''   },
@@ -546,10 +546,10 @@ char *ExchangeChars(char *s, bool ToFileSystem)
               switch (*p) {
                      // characters that can be mapped to other characters:
                      case ' ': *p = '_'; break;
-                     case '~': *p = '/'; break;
+                     case FOLDERDELIMCHAR: *p = '/'; break;
                      // characters that have to be encoded:
                      default:
-                       if (strchr(InvalidChars, *p) || *p == '.' && (!*(p + 1) || *(p + 1) == '~')) { // Windows can't handle '.' at the end of file/directory names
+                       if (strchr(InvalidChars, *p) || *p == '.' && (!*(p + 1) || *(p + 1) == FOLDERDELIMCHAR)) { // Windows can't handle '.' at the end of file/directory names
                           int l = p - s;
                           s = (char *)realloc(s, strlen(s) + 10);
                           p = s + l;
@@ -565,7 +565,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
               switch (*p) {
                 // mapped characters:
                 case '_': *p = ' '; break;
-                case '/': *p = '~'; break;
+                case '/': *p = FOLDERDELIMCHAR; break;
                 // encoded characters:
                 case '#': {
                      if (strlen(p) > 2 && isxdigit(*(p + 1)) && isxdigit(*(p + 2))) {
@@ -635,7 +635,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
      // avoid blanks at the end:
      int l = strlen(name);
      while (l-- > 2) {
-           if (name[l] == ' ' && name[l - 1] != '~')
+           if (name[l] == ' ' && name[l - 1] != FOLDERDELIMCHAR)
               name[l] = 0;
            else
               break;
@@ -853,7 +853,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
      struct tm tm_r;
      struct tm *t = localtime_r(&start, &tm_r);
      char *s;
-     if (Level > 0 && (s = strrchr(name, '~')) != NULL)
+     if (Level > 0 && (s = strrchr(name, FOLDERDELIMCHAR)) != NULL)
         s++;
      else
         s = name;
@@ -867,18 +867,18 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
                             New,
                             Delimiter,
                             s));
-     // let's not display a trailing '~':
+     // let's not display a trailing FOLDERDELIMCHAR:
      if (!NewIndicator)
         stripspace(titleBuffer);
      s = &titleBuffer[strlen(titleBuffer) - 1];
-     if (*s == '~')
+     if (*s == FOLDERDELIMCHAR)
         *s = 0;
      }
   else if (Level < HierarchyLevels()) {
      const char *s = name;
      const char *p = s;
      while (*++s) {
-           if (*s == '~') {
+           if (*s == FOLDERDELIMCHAR) {
               if (Level--)
                  p = s + 1;
               else
@@ -911,7 +911,7 @@ int cRecording::HierarchyLevels(void) const
   const char *s = name;
   int level = 0;
   while (*++s) {
-        if (*s == '~')
+        if (*s == FOLDERDELIMCHAR)
            level++;
         }
   return level;
@@ -919,7 +919,7 @@ int cRecording::HierarchyLevels(void) const
 
 bool cRecording::IsEdited(void) const
 {
-  const char *s = strrchr(name, '~');
+  const char *s = strrchr(name, FOLDERDELIMCHAR);
   s = !s ? name : s + 1;
   return *s == '%';
 }
diff --git a/recording.h b/recording.h
index 663d66d2c..ac52ada2e 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.12 2010/01/02 12:10:07 kls Exp $
+ * $Id: recording.h 2.13 2010/01/16 11:16:20 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -18,6 +18,8 @@
 #include "timers.h"
 #include "tools.h"
 
+#define FOLDERDELIMCHAR '~'
+
 extern bool VfatFileSystem;
 extern int InstanceId;
 
diff --git a/remux.c b/remux.c
index 6d0069282..070a06aed 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.37 2009/12/29 15:56:33 kls Exp $
+ * $Id: remux.c 2.41 2010/01/30 10:43:12 kls Exp $
  */
 
 #include "remux.h"
@@ -144,7 +144,7 @@ void TsSetTeiOnBrokenPackets(uchar *p, int l)
 
 // --- cPatPmtGenerator ------------------------------------------------------
 
-cPatPmtGenerator::cPatPmtGenerator(cChannel *Channel)
+cPatPmtGenerator::cPatPmtGenerator(const cChannel *Channel)
 {
   numPmtPackets = 0;
   patCounter = pmtCounter = 0;
@@ -243,7 +243,7 @@ int cPatPmtGenerator::MakeCRC(uchar *Target, const uchar *Data, int Length)
 #define P_PMT_PID 0x0084 // pseudo PMT pid
 #define MAXPID    0x2000 // the maximum possible number of pids
 
-void cPatPmtGenerator::GeneratePmtPid(cChannel *Channel)
+void cPatPmtGenerator::GeneratePmtPid(const cChannel *Channel)
 {
   bool Used[MAXPID] = { false };
 #define SETPID(p) { if ((p) >= 0 && (p) < MAXPID) Used[p] = true; }
@@ -287,7 +287,7 @@ void cPatPmtGenerator::GeneratePat(void)
   IncVersion(patVersion);
 }
 
-void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
+void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
 {
   // generate the complete PMT section:
   uchar buf[MAX_SECTION_SIZE];
@@ -295,7 +295,7 @@ void cPatPmtGenerator::GeneratePmt(cChannel *Channel)
   numPmtPackets = 0;
   if (Channel) {
      int Vpid = Channel->Vpid();
-     int Ppid = 0x1FFF; // no PCR pid
+     int Ppid = Channel->Ppid();
      uchar *p = buf;
      int i = 0;
      p[i++] = 0x02; // table id
@@ -364,7 +364,7 @@ void cPatPmtGenerator::SetVersions(int PatVersion, int PmtVersion)
   pmtVersion = PmtVersion & 0x1F;
 }
 
-void cPatPmtGenerator::SetChannel(cChannel *Channel)
+void cPatPmtGenerator::SetChannel(const cChannel *Channel)
 {
   if (Channel) {
      GeneratePmtPid(Channel);
@@ -402,6 +402,7 @@ void cPatPmtParser::Reset(void)
   patVersion = pmtVersion = -1;
   pmtPid = -1;
   vpid = vtype = 0;
+  ppid = 0;
 }
 
 void cPatPmtParser::ParsePat(const uchar *Data, int Length)
@@ -486,6 +487,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
      int NumDpids = 0;
      int NumSpids = 0;
      vpid = vtype = 0;
+     ppid = 0;
      apids[0] = 0;
      dpids[0] = 0;
      spids[0] = 0;
@@ -500,6 +502,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
            case 0x1B: // MPEG4
                       vpid = stream.getPid();
                       vtype = stream.getStreamType();
+                      ppid = Pmt.getPCRPid();
                       break;
            case 0x03: // STREAMTYPE_11172_AUDIO
            case 0x04: // STREAMTYPE_13818_AUDIO
@@ -842,10 +845,12 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        // determine frame info:
                        if (isVideo) {
                           if (Delta % 3600 == 0)
-                             frameDuration = 3600; // PAL, 25 fps
+                             frameDuration = 3600; // PAL, 25 fps, exact timing
+                          else if (abs(Delta % 3600) == 3599 || abs(Delta % 3600) == 1)
+                             frameDuration = 3600; // PAL, 25 fps, timing with jitter
                           else if (Delta % 3003 == 0)
                              frameDuration = 3003; // NTSC, 29.97 fps
-                          else if (Delta == 1800) {
+                          else if (abs(Delta - 1800) <= 1) {
                              frameDuration = 3600; // PAL, 25 fps
                              framesPerPayloadUnit = -2;
                              }
diff --git a/remux.h b/remux.h
index 39d6e093f..1115c4ad9 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.23 2009/12/29 15:53:54 kls Exp $
+ * $Id: remux.h 2.24 2010/01/29 16:51:26 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -172,16 +172,16 @@ class cPatPmtGenerator {
   int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
   int MakeLanguageDescriptor(uchar *Target, const char *Language);
   int MakeCRC(uchar *Target, const uchar *Data, int Length);
-  void GeneratePmtPid(cChannel *Channel);
+  void GeneratePmtPid(const cChannel *Channel);
        ///< Generates a PMT pid that doesn't collide with any of the actual
        ///< pids of the Channel.
   void GeneratePat(void);
        ///< Generates a PAT section for later use with GetPat().
-  void GeneratePmt(cChannel *Channel);
+  void GeneratePmt(const cChannel *Channel);
        ///< Generates a PMT section for the given Channel, for later use
        ///< with GetPmt().
 public:
-  cPatPmtGenerator(cChannel *Channel = NULL);
+  cPatPmtGenerator(const cChannel *Channel = NULL);
   void SetVersions(int PatVersion, int PmtVersion);
        ///< Sets the version numbers for the generated PAT and PMT, in case
        ///< this generator is used to, e.g.,  continue a previously interrupted
@@ -191,7 +191,7 @@ class cPatPmtGenerator {
        ///< higher bits will automatically be cleared.
        ///< SetVersions() needs to be called before SetChannel() in order to
        ///< have an effect from the very start.
-  void SetChannel(cChannel *Channel);
+  void SetChannel(const cChannel *Channel);
        ///< Sets the Channel for which the PAT/PMT shall be generated.
   uchar *GetPat(void);
        ///< Returns a pointer to the PAT section, which consists of exactly
@@ -213,6 +213,7 @@ class cPatPmtParser {
   int pmtVersion;
   int pmtPid;
   int vpid;
+  int ppid;
   int vtype;
   int apids[MAXAPIDS + 1]; // list is zero-terminated
   int atypes[MAXAPIDS + 1]; // list is zero-terminated
@@ -252,6 +253,9 @@ class cPatPmtParser {
   int Vpid(void) const { return vpid; }
        ///< Returns the video pid as defined by the current PMT, or 0 if no video
        ///< pid has been detected, yet.
+  int Ppid(void) const { return ppid; }
+       ///< Returns the PCR pid as defined by the current PMT, or 0 if no PCR
+       ///< pid has been detected, yet.
   int Vtype(void) const { return vtype; }
        ///< Returns the video stream type as defined by the current PMT, or 0 if no video
        ///< stream type has been detected, yet.
diff --git a/runvdr b/runvdr.template
similarity index 79%
rename from runvdr
rename to runvdr.template
index 1c3cc7e7f..8eb21cf11 100755
--- a/runvdr
+++ b/runvdr.template
@@ -20,10 +20,20 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 2.0 2006/05/14 16:02:05 kls Exp $
+# $Id: runvdr 2.1 2010/01/17 12:39:27 kls Exp $
 
 VDRPRG="./vdr"
-VDRCMD="$VDRPRG -w 60 $*"
+
+VDROPTIONS="-w 60"
+# For other options see manpage vdr.1
+
+VDRPLUGINS=""
+# You will need to select your output device plugin if you want
+# to use VDR to watch video. For instance, for a "Full Featured"
+# DVB card that would be
+# VDRPLUGINS="-P dvbsddevice"
+
+VDRCMD="$VDRPRG $VDROPTIONS $VDRPLUGINS $*"
 
 KILL="/usr/bin/killall -q -TERM"
 
diff --git a/svdrp.c b/svdrp.c
index b181fcd52..cb9a93513 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.7 2010/01/03 15:41:26 kls Exp $
+ * $Id: svdrp.c 2.8 2010/01/17 12:23:31 kls Exp $
  */
 
 #include "svdrp.h"
@@ -79,7 +79,7 @@ bool cSocket::Open(void)
      struct sockaddr_in name;
      name.sin_family = AF_INET;
      name.sin_port = htons(port);
-     name.sin_addr.s_addr = htonl(INADDR_ANY);
+     name.sin_addr.s_addr = SVDRPhosts.LocalhostOnly() ? htonl(INADDR_LOOPBACK) : htonl(INADDR_ANY);
      if (bind(sock, (struct sockaddr *)&name, sizeof(name)) < 0) {
         LOG_ERROR;
         Close();
diff --git a/timers.c b/timers.c
index a684bb4a4..246fd8688 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.3 2009/08/09 12:43:20 kls Exp $
+ * $Id: timers.c 2.4 2010/01/16 11:18:53 kls Exp $
  */
 
 #include "timers.h"
@@ -301,7 +301,7 @@ bool cTimer::Parse(const char *s)
      //TODO add more plausibility checks
      result = ParseDay(daybuffer, day, weekdays);
      if (VfatFileSystem) {
-        char *p = strrchr(filebuffer, '~');
+        char *p = strrchr(filebuffer, FOLDERDELIMCHAR);
         if (p)
            p++;
         else
diff --git a/transfer.c b/transfer.c
index 02ef042cd..096fda34d 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,17 +4,17 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.4 2009/12/06 14:22:23 kls Exp $
+ * $Id: transfer.c 2.5 2010/01/30 11:10:25 kls Exp $
  */
 
 #include "transfer.h"
 
 // --- cTransfer -------------------------------------------------------------
 
-cTransfer::cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids)
-:cReceiver(ChannelID, -1, VPid, APids, Setup.UseDolbyDigital ? DPids : NULL, SPids)
+cTransfer::cTransfer(const cChannel *Channel)
+:cReceiver(Channel)
 {
-  patPmtGenerator.SetChannel(Channels.GetByChannelID(ChannelID));
+  patPmtGenerator.SetChannel(Channel);
 }
 
 cTransfer::~cTransfer()
@@ -55,8 +55,8 @@ void cTransfer::Receive(uchar *Data, int Length)
 
 cDevice *cTransferControl::receiverDevice = NULL;
 
-cTransferControl::cTransferControl(cDevice *ReceiverDevice, tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids)
-:cControl(transfer = new cTransfer(ChannelID, VPid, APids, DPids, SPids), true)
+cTransferControl::cTransferControl(cDevice *ReceiverDevice, const cChannel *Channel)
+:cControl(transfer = new cTransfer(Channel), true)
 {
   ReceiverDevice->AttachReceiver(transfer);
   receiverDevice = ReceiverDevice;
diff --git a/transfer.h b/transfer.h
index be75fde69..004d5b06c 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 2.1 2008/05/25 12:44:49 kls Exp $
+ * $Id: transfer.h 2.2 2010/01/29 16:38:09 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -21,7 +21,7 @@ class cTransfer : public cReceiver, public cPlayer {
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
 public:
-  cTransfer(tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids);
+  cTransfer(const cChannel *Channel);
   virtual ~cTransfer();
   };
 
@@ -30,7 +30,7 @@ class cTransferControl : public cControl {
   cTransfer *transfer;
   static cDevice *receiverDevice;
 public:
-  cTransferControl(cDevice *ReceiverDevice, tChannelID ChannelID, int VPid, const int *APids, const int *DPids, const int *SPids);
+  cTransferControl(cDevice *ReceiverDevice, const cChannel *Channel);
   ~cTransferControl();
   virtual void Hide(void) {}
   static cDevice *ReceiverDevice(void) { return receiverDevice; }
diff --git a/vdr.5 b/vdr.5
index 875a7ded2..4b2cb90b8 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.11 2010/01/03 13:37:07 kls Exp $
+.\" $Id: vdr.5 2.13 2010/01/31 12:59:50 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -489,6 +489,46 @@ Note that the color keys will only execute their macro function
 in "normal viewing" mode (i.e. when no other menu or player is active). The
 \fIUser1\fR...\fIUser9\fR keys will always execute their macro function.
 There may be up to 15 keys in such a key sequence.
+.SS FOLDERS
+The file \fIfolders.conf\fR contains the definitions of folders that can be used
+in the "Edit timer" menu. Each line contains one folder definition. Leading whitespace
+and everything after and including a '#' is ignored. A line ending with '{'
+defines a sub folder (i.e. a folder that contains other folders), and a line
+consisting of only '}' ends the definition of a sub folder.
+
+Example:
+
+Daily {
+.br
+  News
+.br
+  Soaps
+.br
+  }
+.br
+Archive {
+.br
+  Movies
+.br
+  Sports
+.br
+  Sci-Fi {
+.br
+    Star Trek
+.br
+    U.F.O.
+.br
+    }
+.br
+  }
+.br
+Comedy
+.br
+Science
+
+Note that these folder definitions are only used to set the file name under which
+a timer will store its recording. Changing these definitions in any way has no
+effect on existing timers or recordings.
 .SS COMMANDS
 The file \fIcommands.conf\fR contains the definitions of commands that can
 be executed from the \fBvdr\fR main menu's "Commands" option.
@@ -506,6 +546,24 @@ to make sure they are not executed inadvertently.
 
 Everything following (and including) a '#' character is considered to be comment.
 
+You can have nested layers of command menus by surrounding a sequence of
+commands with '{'...'}' and giving it a title, as in
+
+My Commands {
+.br
+  First list {
+    Do something: some command
+    Do something else: another command
+    }
+  Second list {
+    Even more: yet another command
+    So much more: and yet another one
+    }
+.br
+  }
+
+Command lists can be nested to any depth.
+
 By default the menu entries in the "Commands" menu will be numbered '1'...'9'
 to make them selectable by pressing the corresponding number key. If you want
 to use your own numbering scheme (maybe to skip certain numbers), just precede
diff --git a/vdr.c b/vdr.c
index e1bfc16af..e07730155 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.14 2010/01/02 11:52:40 kls Exp $
+ * $Id: vdr.c 2.16 2010/01/31 11:14:40 kls Exp $
  */
 
 #include <getopt.h>
@@ -582,11 +582,12 @@ int main(int argc, char *argv[])
   Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC);
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true);
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
-  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true);
-  RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true);
+  Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
+  RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"));
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
   Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
   KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
+  Folders.Load(AddDirectory(ConfigDirectory, "folders.conf"));
 
   if (!*cFont::GetFontFileName(Setup.FontOsd)) {
      const char *msg = "no fonts available - OSD will not show any text!";

From 5ce592e54a4aa741444afae8eb80dff47bc355fd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 28 Feb 2010 16:07:00 +0100
Subject: [PATCH 199/307] Version 1.7.13 - Updated the Italian OSD texts
 (thanks to Diego Pierotto). - Changed the position of Sirius 4 to S4.8E in
 sources.conf (thanks to Alexander Gross). - Updated the Finnish OSD texts
 (thanks to Rolf Ahrenberg). - Moved the declaration of cMenuCommands to
 menu.h, so that plugins can use it. - Added a note to the MANUAL, saying that
 adding new transponders only works if the   "EPG scan" is active (suggested
 by Halim Sahim). - Improved handling frames at the beginning and end of a
 recording in cDvbPlayer for   devices with large buffers (thanks to Reinhard
 Nissl). - Implemented cDeviceHook to allow plugins more control over which
 device can   provide which transponder (thanks to Reinhard Nissl). -
 Implemented cDevice::GetCurrentlyTunedTransponder() (thanks to Reinhard
 Nissl). - Moved strictly necessary Makefile options into Make.global, which
 is included   by all plugins (thanks to Paul Menzel). The Makefiles of
 existing plugins should be   modified like this:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  ------------------------------------------------------------
  --- PLUGINS/src/hello/Makefile  2009/10/18 14:00:07      2.1
  +++ PLUGINS/src/hello/Makefile  2010/02/06 14:50:03      2.2
  @@ -18,7 +18,7 @@
   ### The C++ compiler and options:

   CXX      ?= g++
  -CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
  +CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses

   ### The directory environment:

  @@ -26,6 +26,10 @@
   LIBDIR = ../../lib
   TMPDIR = /tmp

  +### Make sure that necessary options are included:
  +
  +include $(VDRDIR)/Make.global
  +
   ### Allow user defined options to overwrite defaults:

   -include $(VDRDIR)/Make.config
  ------------------------------------------------------------
- Added device definitions to the diseqc.conf file format, so that certain satellite
  positions can be limited to a given list of devices.
  This obsoletes the SOURCECAPS patch.
- Keeping subtitles visible when pausing replay (thanks to Rolf Ahrenberg).
- Fixed adding new transponders in case there is only a single channel in the
  channel list (reported by Halim Sahin).
- The file name in the "Timers" menu now shows only the base name of the recording
  without the folder path (if any). Otherwise with long folder paths the actual
  recording name was not visible at all.
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Exported some libsi functions (thanks to Lucian Muresan).
- Improved scalability of the default skins.
- Fixed the German translation of "Folder name must not contain '%c'!" (thanks to
  Frank Schmirler).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Plugins can now define new sources. In order to implement this, the following
  changes were made:
  + The transponder parameter string is no longer interpreted by cChannel, but rather
    stored as is and used only by the respective device. That way plugins can use a
    channel's parameter string to store arbitrary data (see vdr.5).
  + The new class cSourceParam can be used by plugins to define new sources, and to
    implement OSD items that will be used in the channel editor for editing the source
    specific parameters of a channel (see dvbdevice.c for an example of how this is
    done for the default DVB devices).
  + Purely numerical values are no longer accepted in the 'source' parameter of a
    channel.
  This obsoletes the PLUGINPARAM patch.
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- cSafeFile::Close() now flushes the file (suggested by Stephan Austermühle).
- The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital
  tracks appear in the "Audio" menu. Dolby Digital is always recorded.
  This obsoletes the DOLBYINREC patch.
---
 CONTRIBUTORS                        |  15 ++
 HISTORY                             |  75 ++++++
 MANUAL                              |  10 +-
 Make.config.template                |   3 +-
 Make.global                         |  17 ++
 Makefile                            |   7 +-
 PLUGINS.html                        |  40 ++++
 PLUGINS/src/dvbsddevice/Makefile    |  10 +-
 PLUGINS/src/hello/HISTORY           |   4 +
 PLUGINS/src/hello/Makefile          |   8 +-
 PLUGINS/src/hello/hello.c           |   4 +-
 PLUGINS/src/hello/po/lt_LT.po       |  34 +++
 PLUGINS/src/osddemo/Makefile        |   8 +-
 PLUGINS/src/pictures/HISTORY        |   4 +
 PLUGINS/src/pictures/Makefile       |   8 +-
 PLUGINS/src/pictures/pictures.c     |   4 +-
 PLUGINS/src/pictures/po/lt_LT.po    |  32 +++
 PLUGINS/src/servicedemo/Makefile    |   8 +-
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/Makefile     |   8 +-
 PLUGINS/src/skincurses/po/lt_LT.po  |  28 +++
 PLUGINS/src/skincurses/skincurses.c |   4 +-
 PLUGINS/src/status/Makefile         |   8 +-
 PLUGINS/src/svdrpdemo/Makefile      |   8 +-
 channels.c                          | 316 ++-----------------------
 channels.h                          |  54 +----
 config.h                            |  10 +-
 device.c                            |  35 ++-
 device.h                            |  22 +-
 diseqc.c                            |  31 ++-
 diseqc.conf                         |   4 +
 diseqc.h                            |   6 +-
 dvbdevice.c                         | 353 ++++++++++++++++++++++++----
 dvbdevice.h                         |  68 +++++-
 dvbplayer.c                         |  13 +-
 dvbsubtitle.c                       |  74 +++---
 dvbsubtitle.h                       |   4 +-
 eitscan.c                           |   4 +-
 epg.c                               |   4 +-
 libsi/si.c                          |  15 +-
 libsi/si.h                          |   9 +-
 menu.c                              |  56 ++---
 menu.h                              |  18 +-
 menuitems.c                         |   4 +-
 menuitems.h                         |   7 +-
 newplugin                           |  10 +-
 nit.c                               |  56 +++--
 po/ca_ES.po                         |  86 +++----
 po/cs_CZ.po                         |  86 +++----
 po/da_DK.po                         |  86 +++----
 po/de_DE.po                         |  88 +++----
 po/el_GR.po                         |  86 +++----
 po/es_ES.po                         |  86 +++----
 po/et_EE.po                         | 114 ++++-----
 po/fi_FI.po                         | 114 ++++-----
 po/fr_FR.po                         |  86 +++----
 po/hr_HR.po                         |  86 +++----
 po/hu_HU.po                         |  86 +++----
 po/it_IT.po                         | 110 ++++-----
 po/lt_LT.po                         | 280 +++++++++++-----------
 po/nl_NL.po                         |  86 +++----
 po/nn_NO.po                         |  84 +++----
 po/pl_PL.po                         |  86 +++----
 po/pt_PT.po                         |  86 +++----
 po/ro_RO.po                         | 294 +++++++++++------------
 po/ru_RU.po                         |  86 +++----
 po/sk_SK.po                         |  86 +++----
 po/sl_SI.po                         |  86 +++----
 po/sv_SE.po                         |  86 +++----
 po/tr_TR.po                         |  86 +++----
 po/uk_UA.po                         |  86 +++----
 po/zh_CN.po                         |  86 +++----
 receiver.c                          |   4 +-
 remux.c                             |   4 +-
 runvdr.template                     |   2 +-
 skinclassic.c                       |  26 +-
 skinsttng.c                         |  80 ++++---
 sourceparams.c                      |  43 ++++
 sourceparams.h                      |  53 +++++
 sources.c                           |  93 ++++----
 sources.conf                        |   6 +-
 sources.h                           |  16 +-
 tools.c                             |   4 +-
 vdr.5                               |  22 +-
 vdr.c                               |   4 +-
 85 files changed, 2527 insertions(+), 1986 deletions(-)
 create mode 100644 Make.global
 create mode 100644 PLUGINS/src/hello/po/lt_LT.po
 create mode 100644 PLUGINS/src/pictures/po/lt_LT.po
 create mode 100644 PLUGINS/src/skincurses/po/lt_LT.po
 create mode 100644 sourceparams.c
 create mode 100644 sourceparams.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 90dce69df..5b65c3af3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1091,6 +1091,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for a patch that was used to implement handling the "component descriptor" ("genre")
  for a patch that was used to implement handling the "parental rating descriptor"
  suggesting to add plain text error messages to log entries from cOsd::SetAreas()
+ for keeping subtitles visible when pausing replay
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1244,6 +1245,10 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting a bug in storing the current OSD size in case the
  device has changed it in its setup menu
  for increasing the value of MAXFRAMESIZE to better suit HD recordings
+ for improving handling frames at the beginning and end of a recording in cDvbPlayer
+ for devices with large buffers
+ for implementing cDeviceHook
+ for implementing cDevice::GetCurrentlyTunedTransponder()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1678,6 +1683,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
  for suggesting to make the function ExchangeChars()
  for reporting duplicate texts in i18n.c
  for suggesting to use 'gettext' for internationalization
+ for exporting some libsi functions
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -2292,6 +2298,7 @@ Frank Schmirler <vdr@schmirler.de>
  for suggesting to use an "instance id" instead of the "resume id" to distinguish
  recordings of the same broadcast made by different instances of VDR
  for fixing EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0
+ for fixing the German translation of "Folder name must not contain '%c'!"
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
@@ -2377,6 +2384,10 @@ Matthias Becker <becker.matthias@gmail.com>
 Halim Sahin <halim.sahin@t-online.de>
  for reporting that the channels.conf file was not written when stopping VDR after
  deleting or moving a channel in the Channels menu
+ for suggesting to add a note to the MANUAL, saying that adding new transponders only
+ works if the "EPG scan" is active
+ for reporting a problem with adding new transponders in case there is only a single
+ channel in the channel list
 
 Denis Knauf <denis.knauf@gmail.com>
  for reporting a missing '-' at the next to last line of SVDRP help texts
@@ -2459,6 +2470,7 @@ Magnus Andersson <svankan@bahnhof.se>
 
 Alexander Gross <Bikalexander@gmail.com>
  for adding Russian translations to the 'skincurses' and 'pictures' plugins
+ for changing the position of Sirius 4 to S4.8E in sources.conf
 
 Adrian Caval <anrxc@sysphere.org>
  for translating OSD texts to the Croatian language
@@ -2553,3 +2565,6 @@ Francesco Saverio Schiavarelli <fschiava@libero.it>
 
 Matti Lehtim�ki <matti.lehtimaki@gmail.com>
  for implementing the setup option "Miscellaneous/Channels wrap"
+
+Stephan Austerm�hle <au@hcsd.de>
+ for suggesting to flush the file in cSafeFile::Close()
diff --git a/HISTORY b/HISTORY
index df1bf6090..94bddf120 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6308,3 +6308,78 @@ Video Disk Recorder Revision History
   When replaying such a recording, the PCR packets are sent to PlayTsVideo()
 - The files "commands.conf" and "reccmd.conf" can now contain nested lists of
   commands. See vdr.5 for information about the new file format.
+  This obsoletes the CMDSUBMENU patch.
+
+2010-02-28: Version 1.7.13
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Changed the position of Sirius 4 to S4.8E in sources.conf (thanks to Alexander Gross).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Moved the declaration of cMenuCommands to menu.h, so that plugins can use it.
+- Added a note to the MANUAL, saying that adding new transponders only works if the
+  "EPG scan" is active (suggested by Halim Sahim).
+- Improved handling frames at the beginning and end of a recording in cDvbPlayer for
+  devices with large buffers (thanks to Reinhard Nissl).
+- Implemented cDeviceHook to allow plugins more control over which device can
+  provide which transponder (thanks to Reinhard Nissl).
+- Implemented cDevice::GetCurrentlyTunedTransponder() (thanks to Reinhard Nissl).
+- Moved strictly necessary Makefile options into Make.global, which is included
+  by all plugins (thanks to Paul Menzel). The Makefiles of existing plugins should be
+  modified like this:
+
+  ------------------------------------------------------------
+  --- PLUGINS/src/hello/Makefile  2009/10/18 14:00:07      2.1
+  +++ PLUGINS/src/hello/Makefile  2010/02/06 14:50:03      2.2
+  @@ -18,7 +18,7 @@
+   ### The C++ compiler and options:
+
+   CXX      ?= g++
+  -CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+  +CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+
+   ### The directory environment:
+
+  @@ -26,6 +26,10 @@
+   LIBDIR = ../../lib
+   TMPDIR = /tmp
+
+  +### Make sure that necessary options are included:
+  +
+  +include $(VDRDIR)/Make.global
+  +
+   ### Allow user defined options to overwrite defaults:
+
+   -include $(VDRDIR)/Make.config
+  ------------------------------------------------------------
+- Added device definitions to the diseqc.conf file format, so that certain satellite
+  positions can be limited to a given list of devices.
+  This obsoletes the SOURCECAPS patch.
+- Keeping subtitles visible when pausing replay (thanks to Rolf Ahrenberg).
+- Fixed adding new transponders in case there is only a single channel in the
+  channel list (reported by Halim Sahin).
+- The file name in the "Timers" menu now shows only the base name of the recording
+  without the folder path (if any). Otherwise with long folder paths the actual
+  recording name was not visible at all.
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Exported some libsi functions (thanks to Lucian Muresan).
+- Improved scalability of the default skins.
+- Fixed the German translation of "Folder name must not contain '%c'!" (thanks to
+  Frank Schmirler).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Plugins can now define new sources. In order to implement this, the following
+  changes were made:
+  + The transponder parameter string is no longer interpreted by cChannel, but rather
+    stored as is and used only by the respective device. That way plugins can use a
+    channel's parameter string to store arbitrary data (see vdr.5).
+  + The new class cSourceParam can be used by plugins to define new sources, and to
+    implement OSD items that will be used in the channel editor for editing the source
+    specific parameters of a channel (see dvbdevice.c for an example of how this is
+    done for the default DVB devices).
+  + Purely numerical values are no longer accepted in the 'source' parameter of a
+    channel.
+  This obsoletes the PLUGINPARAM patch.
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- cSafeFile::Close() now flushes the file (suggested by Stephan Austerm�hle).
+- The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital
+  tracks appear in the "Audio" menu. Dolby Digital is always recorded.
+  This obsoletes the DOLBYINREC patch.
diff --git a/MANUAL b/MANUAL
index 405f6a8e5..ff80f5533 100644
--- a/MANUAL
+++ b/MANUAL
@@ -675,17 +675,17 @@ Version 1.6
                          4:3.
 
   Use Dolby Digital = yes
-                         Turns recording of the Dolby Digital audio channels on
-                         or off. This may be useful if you don't have the equipment
-                         to replay Dolby Digital audio and want to save disk space.
-                         If turned off, Dolby Digital tracks also don't appear in the
-                         "Audio" menu.
+                         Controls whether Dolby Digital tracks appear in the "Audio"
+                         menu. This is useful if you don't have the equipment to
+                         replay Dolby Digital audio.
 
   Update channels = 5    Controls the automatic channel update function. '0' means
                          no update, '1' will only update channel names, '2' will
                          only update PIDs, '3' will update channel names and PIDs,
                          '4' will perform all updates and also add newly found channels,
                          and '5' will also add newly found transponders.
+                         Note that adding new transponders only works if the "EPG scan"
+                         is active.
 
   Audio languages = 0    Some tv stations broadcast various audio tracks in different
                          languages. This option allows you to define which language(s)
diff --git a/Make.config.template b/Make.config.template
index 758fc1455..3abb7241c 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.1 2009/01/18 10:46:13 kls Exp $
+# $Id: Make.config.template 2.2 2010/02/06 14:50:03 kls Exp $
 
 ### The C compiler and options:
 
@@ -19,7 +19,6 @@ CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 ifdef PLUGIN
 CFLAGS   += -fPIC
 CXXFLAGS += -fPIC
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 endif
 
 ### The directory environment:
diff --git a/Make.global b/Make.global
new file mode 100644
index 000000000..3b9272281
--- /dev/null
+++ b/Make.global
@@ -0,0 +1,17 @@
+#
+# Strictly necessary Makefile options for the Video Disk Recorder
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: Make.global 1.1 2010/02/06 14:54:12 kls Exp $
+
+# Plugins need to be compiled with position independent code, otherwise linking
+# VDR against it will fail.
+
+ifdef PLUGIN
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+endif
+
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
diff --git a/Makefile b/Makefile
index 01408cb10..31f05b04c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.6 2010/01/17 12:32:18 kls Exp $
+# $Id: Makefile 2.8 2010/02/21 11:44:38 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -32,6 +32,7 @@ CONFDIR  = $(VIDEODIR)
 DOXYGEN  = /usr/bin/doxygen
 DOXYFILE = Doxyfile
 
+include Make.global
 -include Make.config
 
 SILIB    = $(LSIDIR)/libsi.a
@@ -40,7 +41,7 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
-       skinclassic.o skins.o skinsttng.o sources.o spu.o status.o svdrp.o themes.o thread.o\
+       skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
 
 ifndef NO_KBD
@@ -60,8 +61,6 @@ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
 
 DEFINES += -D_GNU_SOURCE
 
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DCONFDIR=\"$(CONFDIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
diff --git a/PLUGINS.html b/PLUGINS.html
index 9167a4b9a..05fb7ed0e 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1970,6 +1970,46 @@ <h1>Table Of Contents</h1>
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
+<div class="modified">
+<p>
+<b>Device hooks</b>
+<p>
+VDR has builtin facilities that select which device is able to provide a given
+transponder. However, there may be situations where the setup is so special
+that it requires considerations that exceed the scope of the core VDR code.
+This is where <i>device hooks</i> can be used. 
+
+<p><table><tr><td class="code"><pre>
+class cMyDeviceHook : public cDeviceHook {
+public:
+  cMyDeviceHook(void);
+  virtual bool DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const;
+  };
+</pre></td></tr></table><p>
+
+In its <tt>DeviceProvidesTransponder()</tt> function the device hook can take
+whatever actions are necessary to determine whether the given Device can
+provide the given Channel's transponder, as in
+
+<p><table><tr><td class="code"><pre>
+void cMyDeviceHook::DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const
+{
+  if (<i>condition where Device can't provide Channel</i>)
+     return false;
+  return true;
+}
+</pre></td></tr></table><p>
+
+A plugin that creates a derived cDeviceHook shall do so in its <tt>Initialize()</tt>
+function, as in
+
+<p><table><tr><td class="code"><pre>
+new cMyDeviceHook;
+</pre></td></tr></table><p>
+
+and shall not delete this object. It will be automatically deleted when the program ends.
+</div modified>
+
 <hr><h2><a name="Audio">Audio</a></h2>
 
 <div class="blurb">"The stereo effect may only be experienced if stereo equipment is used!"</div><p>
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 8ef273c64..32d0f508d 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2009/12/29 11:53:18 kls Exp $
+# $Id: Makefile 1.2 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -26,6 +26,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
@@ -45,8 +49,6 @@ INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
 ### The object files (add further files here):
 
 OBJS = $(PLUGIN).o dvbsdffdevice.o dvbsdffosd.o
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 9adeab9ef..3b30315ab 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -70,3 +70,7 @@ VDR Plugin 'hello' Revision History
 2009-12-06: Version 0.2.4
 
 - Several code modifications to avoid compiler warnings (thanks to Winfried K�hler).
+
+2010-02-28: Version 0.2.5
+
+- Added Lithuanian language translations (thanks to Valdemaras Pipiras).
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index ea5b8063b..a5703f63c 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2009/10/18 14:00:07 kls Exp $
+# $Id: Makefile 2.2 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -26,6 +26,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 32a74e3f8..b7d141d73 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.2 2009/12/06 12:30:15 kls Exp $
+ * $Id: hello.c 2.3 2010/02/28 12:49:28 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.4";
+static const char *VERSION        = "0.2.5";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
new file mode 100644
index 000000000..26e0ff48e
--- /dev/null
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -0,0 +1,34 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.7.10\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"PO-Revision-Date: 2009-12-08 12:18+0200\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
+"Language-Team: Lietuviai\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A friendly greeting"
+msgstr "Draugiškas labas"
+
+msgid "Hello"
+msgstr "Labas!"
+
+msgid "Greeting time (s)"
+msgstr "Pasveikinomo laikas (s)"
+
+msgid "Use alternate greeting"
+msgstr "Naudoti alternatyvų pasveikinimą"
+
+msgid "Howdy folks!"
+msgstr "Kaip yr chebryte?"
+
+msgid "Hello world!"
+msgstr "Labas pasauli!"
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 1b1c62280..d9ed4c56a 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 13:00:01 kls Exp $
+# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -24,6 +24,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 34da9388d..309a2eb14 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -37,3 +37,7 @@ VDR Plugin 'pictures' Revision History
 2009-12-06: Version 0.0.8
 
 - Several code modifications to avoid compiler warnings (thanks to Winfried K�hler).
+
+2010-02-28: Version 0.0.9
+
+- Added Lithuanian language translations (thanks to Valdemaras Pipiras).
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 46a262f2d..19c6fc68d 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2009/10/18 14:02:41 kls Exp $
+# $Id: Makefile 2.2 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -26,6 +26,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 9de688904..6897e239c 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.1 2009/12/06 12:30:21 kls Exp $
+ * $Id: pictures.c 2.2 2010/02/28 12:49:55 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.8";
+static const char *VERSION       = "0.0.9";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
new file mode 100644
index 000000000..c6d16561c
--- /dev/null
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.7.10\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"PO-Revision-Date: 2009-12-08 12:41+0100\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>, 2009\n"
+"Language-Team: Lietuviai\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Pictures"
+msgstr "Nuotraukos"
+
+msgid "A simple picture viewer"
+msgstr "Paprasta nuotraukų naršyklė"
+
+msgid "Picture directory"
+msgstr "Nuotraukų katalogas"
+
+msgid "Slide show delay (s)"
+msgstr "Skaidrių peržiūros užlaikymas (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Nenustatytas nuotraukų katalogas!"
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index ea7e66a45..18bfd26a0 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 13:00:07 kls Exp $
+# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -26,6 +26,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index ca820f9b9..9e3377f3a 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -84,3 +84,7 @@ VDR Plugin 'skincurses' Revision History
 
 - Displaying "genre" in event descriptions.
 - Displaying "parental rating" in event descriptions.
+
+2010-02-28: Version 0.1.9
+
+- Added Lithuanian language translations (thanks to Valdemaras Pipiras).
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index cade79578..080c3e662 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2009/10/18 14:03:30 kls Exp $
+# $Id: Makefile 2.2 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -26,6 +26,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
new file mode 100644
index 000000000..3b34ee717
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -0,0 +1,28 @@
+# VDR plugin language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.7.12\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2009-10-13 11:52+0200\n"
+"PO-Revision-Date: 2010-02-22 18:18+0200\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
+"Language-Team: Lietuviai\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A text only skin"
+msgstr "Tekstinis apvalkalas"
+
+msgid "Key$Mute"
+msgstr "Išjungti garsą"
+
+msgid "Volume "
+msgstr "Garsas "
+
+msgid "Text mode"
+msgstr "Tekstinis ręžimas"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index d8134f60d..4abb8634d 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.3 2010/01/03 14:59:16 kls Exp $
+ * $Id: skincurses.c 2.4 2010/02/28 12:50:13 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.8";
+static const char *VERSION        = "0.1.9";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 81d4163b7..556a09e5b 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 13:00:18 kls Exp $
+# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -24,6 +24,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index c835f3cb2..4a803c6ba 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.0 2008/01/13 13:00:20 kls Exp $
+# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -24,6 +24,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
diff --git a/channels.c b/channels.c
index c14df19c9..a694d54a6 100644
--- a/channels.c
+++ b/channels.c
@@ -4,11 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.12 2010/01/02 17:38:40 kls Exp $
+ * $Id: channels.c 2.13 2010/02/21 13:36:04 kls Exp $
  */
 
 #include "channels.h"
-#include <linux/dvb/frontend.h>
 #include <ctype.h>
 #include "device.h"
 #include "epg.h"
@@ -18,133 +17,6 @@
 // format characters in order to allow any number of blanks after a numeric
 // value!
 
-// --- Channel Parameter Maps ------------------------------------------------
-
-const tChannelParameterMap InversionValues[] = {
-  {   0, INVERSION_OFF,  trNOOP("off") },
-  {   1, INVERSION_ON,   trNOOP("on") },
-  { 999, INVERSION_AUTO, trNOOP("auto") },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap BandwidthValues[] = {
-  {   6, 6000000, "6 MHz" },
-  {   7, 7000000, "7 MHz" },
-  {   8, 8000000, "8 MHz" },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap CoderateValues[] = {
-  {   0, FEC_NONE, trNOOP("none") },
-  {  12, FEC_1_2,  "1/2" },
-  {  23, FEC_2_3,  "2/3" },
-  {  34, FEC_3_4,  "3/4" },
-  {  35, FEC_3_5,  "3/5" },
-  {  45, FEC_4_5,  "4/5" },
-  {  56, FEC_5_6,  "5/6" },
-  {  67, FEC_6_7,  "6/7" },
-  {  78, FEC_7_8,  "7/8" },
-  {  89, FEC_8_9,  "8/9" },
-  { 910, FEC_9_10, "9/10" },
-  { 999, FEC_AUTO, trNOOP("auto") },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap ModulationValues[] = {
-  {  16, QAM_16,   "QAM16" },
-  {  32, QAM_32,   "QAM32" },
-  {  64, QAM_64,   "QAM64" },
-  { 128, QAM_128,  "QAM128" },
-  { 256, QAM_256,  "QAM256" },
-  {   2, QPSK,     "QPSK" },
-  {   5, PSK_8,    "8PSK" },
-  {   6, APSK_16,  "16APSK" },
-  {  10, VSB_8,    "VSB8" },
-  {  11, VSB_16,   "VSB16" },
-  { 998, QAM_AUTO, "QAMAUTO" },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap SystemValues[] = {
-  {   0, SYS_DVBS,  "DVB-S" },
-  {   1, SYS_DVBS2, "DVB-S2" },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap TransmissionValues[] = {
-  {   2, TRANSMISSION_MODE_2K,   "2K" },
-  {   8, TRANSMISSION_MODE_8K,   "8K" },
-  { 999, TRANSMISSION_MODE_AUTO, trNOOP("auto") },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap GuardValues[] = {
-  {   4, GUARD_INTERVAL_1_4,  "1/4" },
-  {   8, GUARD_INTERVAL_1_8,  "1/8" },
-  {  16, GUARD_INTERVAL_1_16, "1/16" },
-  {  32, GUARD_INTERVAL_1_32, "1/32" },
-  { 999, GUARD_INTERVAL_AUTO, trNOOP("auto") },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap HierarchyValues[] = {
-  {   0, HIERARCHY_NONE, trNOOP("none") },
-  {   1, HIERARCHY_1,    "1" },
-  {   2, HIERARCHY_2,    "2" },
-  {   4, HIERARCHY_4,    "4" },
-  { 999, HIERARCHY_AUTO, trNOOP("auto") },
-  {  -1, 0, NULL }
-  };
-
-const tChannelParameterMap RollOffValues[] = {
-  {   0, ROLLOFF_AUTO, trNOOP("auto") },
-  {  20, ROLLOFF_20, "0.20" },
-  {  25, ROLLOFF_25, "0.25" },
-  {  35, ROLLOFF_35, "0.35" },
-  {  -1, 0, NULL }
-  };
-
-int UserIndex(int Value, const tChannelParameterMap *Map)
-{
-  const tChannelParameterMap *map = Map;
-  while (map && map->userValue != -1) {
-        if (map->userValue == Value)
-           return map - Map;
-        map++;
-        }
-  return -1;
-}
-
-int DriverIndex(int Value, const tChannelParameterMap *Map)
-{
-  const tChannelParameterMap *map = Map;
-  while (map && map->userValue != -1) {
-        if (map->driverValue == Value)
-           return map - Map;
-        map++;
-        }
-  return -1;
-}
-
-int MapToUser(int Value, const tChannelParameterMap *Map, const char **String)
-{
-  int n = DriverIndex(Value, Map);
-  if (n >= 0) {
-     if (String)
-        *String = tr(Map[n].userString);
-     return Map[n].userValue;
-     }
-  return -1;
-}
-
-int MapToDriver(int Value, const tChannelParameterMap *Map)
-{
-  int n = UserIndex(Value, Map);
-  if (n >= 0)
-     return Map[n].driverValue;
-  return -1;
-}
-
 // --- tChannelID ------------------------------------------------------------
 
 const tChannelID tChannelID::InvalidID;
@@ -189,16 +61,6 @@ cChannel::cChannel(void)
   provider = strdup("");
   portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
-  inversion    = INVERSION_AUTO;
-  bandwidth    = 8000000;
-  coderateH    = FEC_AUTO;
-  coderateL    = FEC_AUTO;
-  modulation   = QPSK;
-  system       = SYS_DVBS;
-  transmission = TRANSMISSION_MODE_AUTO;
-  guard        = GUARD_INTERVAL_AUTO;
-  hierarchy    = HIERARCHY_AUTO;
-  rollOff      = ROLLOFF_AUTO;
   modification = CHANNELMOD_NONE;
   schedule     = NULL;
   linkChannels = NULL;
@@ -248,17 +110,18 @@ cChannel& cChannel::operator= (const cChannel &Channel)
   provider = strcpyrealloc(provider, Channel.provider);
   portalName = strcpyrealloc(portalName, Channel.portalName);
   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
+  parameters = Channel.parameters;
   return *this;
 }
 
 int cChannel::Transponder(int Frequency, char Polarization)
 {
   // some satellites have transponders at the same frequency, just with different polarization:
-  switch (tolower(Polarization)) {
-    case 'h': Frequency += 100000; break;
-    case 'v': Frequency += 200000; break;
-    case 'l': Frequency += 300000; break;
-    case 'r': Frequency += 400000; break;
+  switch (toupper(Polarization)) {
+    case 'H': Frequency += 100000; break;
+    case 'V': Frequency += 200000; break;
+    case 'L': Frequency += 300000; break;
+    case 'R': Frequency += 400000; break;
     default: esyslog("ERROR: invalid value for Polarization '%c'", Polarization);
     }
   return Frequency;
@@ -269,8 +132,11 @@ int cChannel::Transponder(void) const
   int tf = frequency;
   while (tf > 20000)
         tf /= 1000;
-  if (IsSat())
-     tf = Transponder(tf, polarization);
+  if (IsSat()) {
+     const char *p = strpbrk(parameters, "HVLRhvlr"); // lowercase for backwards compatibility
+     if (p)
+        tf = Transponder(tf, *p);
+     }
   return tf;
 }
 
@@ -296,22 +162,16 @@ void cChannel::CopyTransponderData(const cChannel *Channel)
      frequency    = Channel->frequency;
      source       = Channel->source;
      srate        = Channel->srate;
-     polarization = Channel->polarization;
-     inversion    = Channel->inversion;
-     bandwidth    = Channel->bandwidth;
-     coderateH    = Channel->coderateH;
-     coderateL    = Channel->coderateL;
-     modulation   = Channel->modulation;
-     system       = Channel->system;
-     transmission = Channel->transmission;
-     guard        = Channel->guard;
-     hierarchy    = Channel->hierarchy;
-     rollOff      = Channel->rollOff;
+     parameters   = Channel->parameters;
      }
 }
 
-bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff)
+bool cChannel::SetTransponderData(int Source, int Frequency, int Srate, const char *Parameters, bool Quiet)
 {
+  if (strchr(Parameters, ':')) {
+     esyslog("ERROR: parameter string '%s' contains ':'", Parameters);
+     return false;
+     }
   // Workarounds for broadcaster stupidity:
   // Some providers broadcast the transponder frequency of their channels with two different
   // values (like 12551 and 12552), so we need to allow for a little tolerance here
@@ -324,60 +184,14 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio
   if (abs(srate - Srate) <= 1)
      Srate = srate;
 
-  if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH || modulation != Modulation || system != System || rollOff != RollOff) {
-     cString OldTransponderData = TransponderDataToString();
-     source = Source;
-     frequency = Frequency;
-     polarization = Polarization;
-     srate = Srate;
-     coderateH = CoderateH;
-     modulation = Modulation;
-     system = System;
-     rollOff = RollOff;
-     schedule = NULL;
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
-     }
-  return true;
-}
-
-bool cChannel::SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH)
-{
-  if (source != Source || frequency != Frequency || modulation != Modulation || srate != Srate || coderateH != CoderateH) {
+  if (source != Source || frequency != Frequency || srate != Srate || strcmp(parameters, Parameters)) {
      cString OldTransponderData = TransponderDataToString();
      source = Source;
      frequency = Frequency;
-     modulation = Modulation;
      srate = Srate;
-     coderateH = CoderateH;
+     parameters = Parameters;
      schedule = NULL;
-     if (Number()) {
-        dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
-        modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
-        }
-     }
-  return true;
-}
-
-bool cChannel::SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CoderateH, int CoderateL, int Guard, int Transmission)
-{
-  if (source != Source || frequency != Frequency || bandwidth != Bandwidth || modulation != Modulation || hierarchy != Hierarchy || coderateH != CoderateH || coderateL != CoderateL || guard != Guard || transmission != Transmission) {
-     cString OldTransponderData = TransponderDataToString();
-     source = Source;
-     frequency = Frequency;
-     bandwidth = Bandwidth;
-     modulation = Modulation;
-     hierarchy = Hierarchy;
-     coderateH = CoderateH;
-     coderateL = CoderateL;
-     guard = Guard;
-     transmission = Transmission;
-     schedule = NULL;
-     if (Number()) {
+     if (Number() && !Quiet) {
         dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
         modification |= CHANNELMOD_TRANSP;
         Channels.SetModified();
@@ -634,90 +448,11 @@ void cChannel::SetRefChannel(cChannel *RefChannel)
   refChannel = RefChannel;
 }
 
-static int PrintParameter(char *p, char Name, int Value)
-{
-  return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
-}
-
 cString cChannel::TransponderDataToString(void) const
 {
   if (cSource::IsTerr(source))
-     return cString::sprintf("%d:%s:%s", frequency, *ParametersToString(), *cSource::ToString(source));
-  return cString::sprintf("%d:%s:%s:%d", frequency, *ParametersToString(), *cSource::ToString(source), srate);
-}
-
-cString cChannel::ParametersToString(void) const
-{
-  char type = **cSource::ToString(source);
-  if (isdigit(type))
-     type = 'S';
-#define ST(s) if (strchr(s, type))
-  char buffer[64];
-  char *q = buffer;
-  *q = 0;
-  ST(" S ")  q += sprintf(q, "%c", polarization);
-  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
-  ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
-  ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
-  ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
-  ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
-  ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
-  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-  ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
-  return buffer;
-}
-
-static const char *ParseParameter(const char *s, int &Value, const tChannelParameterMap *Map)
-{
-  if (*++s) {
-     char *p = NULL;
-     errno = 0;
-     int n = strtol(s, &p, 10);
-     if (!errno && p != s) {
-        Value = MapToDriver(n, Map);
-        if (Value >= 0)
-           return p;
-        }
-     }
-  esyslog("ERROR: invalid value for parameter '%c'", *(s - 1));
-  return NULL;
-}
-
-static const char *SkipDigits(const char *s)
-{
-  while (*++s && isdigit(*s))
-        ;
-  return s;
-}
-
-bool cChannel::StringToParameters(const char *s)
-{
-  while (s && *s) {
-        switch (toupper(*s)) {
-          case 'A': s = SkipDigits(s); break; // for compatibility with the "multiproto" approach - may be removed in future versions
-          case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
-          case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
-          case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
-          case 'G': s = ParseParameter(s, guard, GuardValues); break;
-          case 'H': polarization = *s++; break;
-          case 'I': s = ParseParameter(s, inversion, InversionValues); break;
-          case 'L': polarization = *s++; break;
-          case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
-          case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
-          case 'P': s = SkipDigits(s); break; // for compatibility with the "multiproto" approach - may be removed in future versions
-          case 'R': polarization = *s++; break;
-          case 'S': s = ParseParameter(s, system, SystemValues); break;
-          case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
-          case 'V': polarization = *s++; break;
-          case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
-          case 'Z': s = SkipDigits(s); break; // for compatibility with the original DVB-S2 patch - may be removed in future versions
-          default: esyslog("ERROR: unknown parameter key '%c'", *s);
-                   return false;
-          }
-        }
-  return true;
+     return cString::sprintf("%d:%s:%s", frequency, *parameters, *cSource::ToString(source));
+  return cString::sprintf("%d:%s:%s:%d", frequency, *parameters, *cSource::ToString(source), srate);
 }
 
 cString cChannel::ToText(const cChannel *Channel)
@@ -762,7 +497,7 @@ cString cChannel::ToText(const cChannel *Channel)
      q = caidbuf;
      q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
-     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->ParametersToString(), *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->parameters, *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -814,7 +549,8 @@ bool cChannel::Parse(const char *s)
         dpids[0] = 0;
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
-           ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0;
+           parameters = parambuf;
+           ok = (source = cSource::FromString(sourcebuf)) >= 0;
 
            char *p;
            if ((p = strchr(vpidbuf, '=')) != NULL) {
diff --git a/channels.h b/channels.h
index b465f6a7b..4ed135827 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.7 2009/12/06 12:57:45 kls Exp $
+ * $Id: channels.h 2.8 2010/02/21 14:05:49 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -47,27 +47,6 @@
 #define CA_ENCRYPTED_MIN 0x0100
 #define CA_ENCRYPTED_MAX 0xFFFF
 
-struct tChannelParameterMap {
-  int userValue;
-  int driverValue;
-  const char *userString;
-  };
-
-int MapToUser(int Value, const tChannelParameterMap *Map, const char **String = NULL);
-int MapToDriver(int Value, const tChannelParameterMap *Map);
-int UserIndex(int Value, const tChannelParameterMap *Map);
-int DriverIndex(int Value, const tChannelParameterMap *Map);
-
-extern const tChannelParameterMap InversionValues[];
-extern const tChannelParameterMap BandwidthValues[];
-extern const tChannelParameterMap CoderateValues[];
-extern const tChannelParameterMap ModulationValues[];
-extern const tChannelParameterMap SystemValues[];
-extern const tChannelParameterMap TransmissionValues[];
-extern const tChannelParameterMap GuardValues[];
-extern const tChannelParameterMap HierarchyValues[];
-extern const tChannelParameterMap RollOffValues[];
-
 struct tChannelID {
 private:
   int source;
@@ -110,6 +89,7 @@ class cSchedule;
 class cChannel : public cListObject {
   friend class cSchedules;
   friend class cMenuEditChannel;
+  friend class cDvbSourceParam;
 private:
   static cString ToText(const cChannel *Channel);
   char *name;
@@ -140,25 +120,13 @@ class cChannel : public cListObject {
   int rid;
   int number;    // Sequence number assigned on load
   bool groupSep;
-  char polarization;
-  int inversion;
-  int bandwidth;
-  int coderateH;
-  int coderateL;
-  int modulation;
-  int system;
-  int transmission;
-  int guard;
-  int hierarchy;
-  int rollOff;
   int __EndData__;
+  cString parameters;
   int modification;
   mutable const cSchedule *schedule;
   cLinkChannels *linkChannels;
   cChannel *refChannel;
   cString TransponderDataToString(void) const;
-  cString ParametersToString(void) const;
-  bool StringToParameters(const char *s);
 public:
   cChannel(void);
   cChannel(const cChannel &Channel);
@@ -201,17 +169,7 @@ class cChannel : public cListObject {
   int Number(void) const { return number; }
   void SetNumber(int Number) { number = Number; }
   bool GroupSep(void) const { return groupSep; }
-  char Polarization(void) const { return polarization; }
-  int Inversion(void) const { return inversion; }
-  int Bandwidth(void) const { return bandwidth; }
-  int CoderateH(void) const { return coderateH; }
-  int CoderateL(void) const { return coderateL; }
-  int Modulation(void) const { return modulation; }
-  int System(void) const { return system; }
-  int Transmission(void) const { return transmission; }
-  int Guard(void) const { return guard; }
-  int Hierarchy(void) const { return hierarchy; }
-  int RollOff(void) const { return rollOff; }
+  const char *Parameters(void) const { return parameters; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
   bool IsCable(void) const { return cSource::IsCable(source); }
@@ -221,9 +179,7 @@ class cChannel : public cListObject {
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
   void CopyTransponderData(const cChannel *Channel);
-  bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff);
-  bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH);
-  bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission);
+  bool SetTransponderData(int Source, int Frequency, int Srate, const char *Parameters, bool Quiet = false);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
diff --git a/config.h b/config.h
index be1d7bde7..e4237f75e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.21 2010/01/31 11:14:02 kls Exp $
+ * $Id: config.h 2.22 2010/02/05 15:38:32 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.12"
-#define VDRVERSNUM   10712  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.13"
+#define VDRVERSNUM   10713  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.12"
-#define APIVERSNUM   10712  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.13"
+#define APIVERSNUM   10713  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index cb31b8341..ac4d6d49a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.32 2010/01/30 11:06:51 kls Exp $
+ * $Id: device.c 2.35 2010/02/07 11:54:42 kls Exp $
  */
 
 #include "device.h"
@@ -44,6 +44,18 @@ void cLiveSubtitle::Receive(uchar *Data, int Length)
   cDevice::PrimaryDevice()->PlayTs(Data, Length);
 }
 
+// --- cDeviceHook -----------------------------------------------------------
+
+cDeviceHook::cDeviceHook(void)
+{
+  cDevice::deviceHooks.Add(this);
+}
+
+bool cDeviceHook::DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const
+{
+  return true;
+}
+
 // --- cDevice ---------------------------------------------------------------
 
 // The default priority for non-primary devices:
@@ -59,6 +71,7 @@ int cDevice::currentChannel = 1;
 cDevice *cDevice::device[MAXDEVICES] = { NULL };
 cDevice *cDevice::primaryDevice = NULL;
 cDevice *cDevice::avoidDevice = NULL;
+cList<cDeviceHook> cDevice::deviceHooks;
 
 cDevice::cDevice(void)
 :patPmtParser(true)
@@ -570,6 +583,17 @@ bool cDevice::ProvidesSource(int Source) const
   return false;
 }
 
+bool cDevice::DeviceHooksProvidesTransponder(const cChannel *Channel) const
+{
+  cDeviceHook *Hook = deviceHooks.First();
+  while (Hook) {
+        if (!Hook->DeviceProvidesTransponder(this, Channel))
+           return false;
+        Hook = deviceHooks.Next(Hook);
+        }
+  return true;
+}
+
 bool cDevice::ProvidesTransponder(const cChannel *Channel) const
 {
   return false;
@@ -594,6 +618,11 @@ int cDevice::NumProvidedSystems(void) const
   return 0;
 }
 
+const cChannel *cDevice::GetCurrentlyTunedTransponder(void) const
+{
+  return NULL;
+}
+
 bool cDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return false;
@@ -1024,11 +1053,15 @@ void cDevice::Clear(void)
 void cDevice::Play(void)
 {
   Audios.MuteAudio(mute);
+  if (dvbSubtitleConverter)
+     dvbSubtitleConverter->Freeze(false);
 }
 
 void cDevice::Freeze(void)
 {
   Audios.MuteAudio(true);
+  if (dvbSubtitleConverter)
+     dvbSubtitleConverter->Freeze(true);
 }
 
 void cDevice::Mute(void)
diff --git a/device.h b/device.h
index 897de2afe..9ce814a1a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.19 2010/01/01 15:04:27 kls Exp $
+ * $Id: device.h 2.21 2010/02/06 14:34:41 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -88,10 +88,18 @@ class cPlayer;
 class cReceiver;
 class cLiveSubtitle;
 
+class cDeviceHook : public cListObject {
+public:
+  cDeviceHook(void);
+  virtual bool DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const;
+          ///< Returns true if the given Device can provide the given Channel's transponder.
+  };
+
 /// The cDevice class is the base from which actual devices can be derived.
 
 class cDevice : public cThread {
   friend class cLiveSubtitle;
+  friend class cDeviceHook;
 private:
   static int numDevices;
   static int useDevice;
@@ -187,6 +195,13 @@ class cDevice : public cThread {
   virtual bool HasDecoder(void) const;
          ///< Tells whether this device has an MPEG decoder.
 
+// Device hooks
+
+private:
+  static cList<cDeviceHook> deviceHooks;
+protected:
+  bool DeviceHooksProvidesTransponder(const cChannel *Channel) const;
+
 // SPU facilities
 
 private:
@@ -232,6 +247,11 @@ class cDevice : public cThread {
          ///< actually provide channels must implement this function.
          ///< The result of this function is used when selecting a device, in order
          ///< to avoid devices that provide more than one system.
+  virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
+         ///< Returns a pointer to the currently tuned transponder.
+         ///< This is not one of the channels in the global cChannels list, but rather
+         ///< a local copy. The result may be NULL if the device is not tuned to any
+         ///< transponder.
   virtual bool IsTunedToTransponder(const cChannel *Channel);
          ///< Returns true if this device is currently tuned to the given Channel's
          ///< transponder.
diff --git a/diseqc.c b/diseqc.c
index 2bf6f0082..205444cdd 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.1 2009/12/05 15:57:02 kls Exp $
+ * $Id: diseqc.c 2.2 2010/02/06 15:43:31 kls Exp $
  */
 
 #include "diseqc.h"
@@ -16,6 +16,11 @@
 
 cDiseqc::cDiseqc(void)
 {
+  devices = 0;
+  source = 0;
+  slof = 0;
+  polarization = 0;
+  lof = 0;
   commands = NULL;
   parsing = false;
   numCodes = 0;
@@ -30,6 +35,21 @@ bool cDiseqc::Parse(const char *s)
 {
   bool result = false;
   char *sourcebuf = NULL;
+  if (*s && s[strlen(s) - 1] == ':') {
+     const char *p = s;
+     while (*p && *p != ':') {
+           char *t = NULL;
+           int d = strtol(p, &t, 10);
+           p = t;
+           if (0 < d && d < 32)
+              devices |= (1 << d - 1);
+           else {
+              esyslog("ERROR: invalid device number %d in '%s'", d, s);
+              return false;
+              }
+           }
+     return true;
+     }
   int fields = sscanf(s, "%a[^ ] %d %c %d %a[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
   if (fields == 4)
      commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument results in an empty string
@@ -126,9 +146,16 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(char **CurrentAction)
 
 cDiseqcs Diseqcs;
 
-cDiseqc *cDiseqcs::Get(int Source, int Frequency, char Polarization)
+cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization)
 {
+  int Devices = 0;
   for (cDiseqc *p = First(); p; p = Next(p)) {
+      if (p->Devices()) {
+         Devices = p->Devices();
+         continue;
+         }
+      if (Devices && !(Devices & (1 << Device - 1)))
+         continue;
       if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization))
         return p;
       }
diff --git a/diseqc.conf b/diseqc.conf
index 3dfc70368..c9ab3ad3a 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -23,6 +23,10 @@
 #
 # The 'command...' part is optional.
 #
+# A line containing space separated integer numbers, terminated with a ':',
+# defines that any following DiSEqC sequences apply only to the given list
+# of device numbers.
+#
 # Examples:
 
 # Full DiSEqC sequence:
diff --git a/diseqc.h b/diseqc.h
index c60cb8121..1b9a41d2c 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 2.0 2002/12/07 13:54:02 kls Exp $
+ * $Id: diseqc.h 2.1 2010/02/06 15:14:42 kls Exp $
  */
 
 #ifndef __DISEQC_H
@@ -26,6 +26,7 @@ class cDiseqc : public cListObject {
     };
   enum { MaxDiseqcCodes = 6 };
 private:
+  int devices;
   int source;
   int slof;
   char polarization;
@@ -48,6 +49,7 @@ class cDiseqc : public cListObject {
       // it. Call Execute() repeatedly (always providing the same CurrentAction pointer)
       // until it returns daNone. After a successful execution of all commands
       // *CurrentAction points to the value 0x00.
+  int Devices(void) const { return devices; }
   int Source(void) const { return source; }
   int Slof(void) const { return slof; }
   char Polarization(void) const { return polarization; }
@@ -58,7 +60,7 @@ class cDiseqc : public cListObject {
 
 class cDiseqcs : public cConfig<cDiseqc> {
 public:
-  cDiseqc *Get(int Source, int Frequency, char Polarization);
+  cDiseqc *Get(int Device, int Source, int Frequency, char Polarization);
   };
 
 extern cDiseqcs Diseqcs;
diff --git a/dvbdevice.c b/dvbdevice.c
index 07e2dbb1d..73f5261c1 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.24 2010/01/04 14:06:24 kls Exp $
+ * $Id: dvbdevice.c 2.29 2010/02/21 17:10:35 kls Exp $
  */
 
 #include "dvbdevice.h"
+#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <linux/dvb/dmx.h>
@@ -17,6 +18,8 @@
 #include "channels.h"
 #include "diseqc.h"
 #include "dvbci.h"
+#include "menuitems.h"
+#include "sourceparams.h"
 
 #define DVBS_TUNE_TIMEOUT  9000 //ms
 #define DVBS_LOCK_TIMEOUT  2000 //ms
@@ -25,11 +28,223 @@
 #define DVBT_TUNE_TIMEOUT  9000 //ms
 #define DVBT_LOCK_TIMEOUT  2000 //ms
 
+// --- DVB Parameter Maps ----------------------------------------------------
+
+const tDvbParameterMap InversionValues[] = {
+  {   0, INVERSION_OFF,  trNOOP("off") },
+  {   1, INVERSION_ON,   trNOOP("on") },
+  { 999, INVERSION_AUTO, trNOOP("auto") },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap BandwidthValues[] = {
+  {   6, 6000000, "6 MHz" },
+  {   7, 7000000, "7 MHz" },
+  {   8, 8000000, "8 MHz" },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap CoderateValues[] = {
+  {   0, FEC_NONE, trNOOP("none") },
+  {  12, FEC_1_2,  "1/2" },
+  {  23, FEC_2_3,  "2/3" },
+  {  34, FEC_3_4,  "3/4" },
+  {  35, FEC_3_5,  "3/5" },
+  {  45, FEC_4_5,  "4/5" },
+  {  56, FEC_5_6,  "5/6" },
+  {  67, FEC_6_7,  "6/7" },
+  {  78, FEC_7_8,  "7/8" },
+  {  89, FEC_8_9,  "8/9" },
+  { 910, FEC_9_10, "9/10" },
+  { 999, FEC_AUTO, trNOOP("auto") },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap ModulationValues[] = {
+  {  16, QAM_16,   "QAM16" },
+  {  32, QAM_32,   "QAM32" },
+  {  64, QAM_64,   "QAM64" },
+  { 128, QAM_128,  "QAM128" },
+  { 256, QAM_256,  "QAM256" },
+  {   2, QPSK,     "QPSK" },
+  {   5, PSK_8,    "8PSK" },
+  {   6, APSK_16,  "16APSK" },
+  {  10, VSB_8,    "VSB8" },
+  {  11, VSB_16,   "VSB16" },
+  { 998, QAM_AUTO, "QAMAUTO" },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap SystemValues[] = {
+  {   0, SYS_DVBS,  "DVB-S" },
+  {   1, SYS_DVBS2, "DVB-S2" },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap TransmissionValues[] = {
+  {   2, TRANSMISSION_MODE_2K,   "2K" },
+  {   8, TRANSMISSION_MODE_8K,   "8K" },
+  { 999, TRANSMISSION_MODE_AUTO, trNOOP("auto") },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap GuardValues[] = {
+  {   4, GUARD_INTERVAL_1_4,  "1/4" },
+  {   8, GUARD_INTERVAL_1_8,  "1/8" },
+  {  16, GUARD_INTERVAL_1_16, "1/16" },
+  {  32, GUARD_INTERVAL_1_32, "1/32" },
+  { 999, GUARD_INTERVAL_AUTO, trNOOP("auto") },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap HierarchyValues[] = {
+  {   0, HIERARCHY_NONE, trNOOP("none") },
+  {   1, HIERARCHY_1,    "1" },
+  {   2, HIERARCHY_2,    "2" },
+  {   4, HIERARCHY_4,    "4" },
+  { 999, HIERARCHY_AUTO, trNOOP("auto") },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap RollOffValues[] = {
+  {   0, ROLLOFF_AUTO, trNOOP("auto") },
+  {  20, ROLLOFF_20, "0.20" },
+  {  25, ROLLOFF_25, "0.25" },
+  {  35, ROLLOFF_35, "0.35" },
+  {  -1, 0, NULL }
+  };
+
+int UserIndex(int Value, const tDvbParameterMap *Map)
+{
+  const tDvbParameterMap *map = Map;
+  while (map && map->userValue != -1) {
+        if (map->userValue == Value)
+           return map - Map;
+        map++;
+        }
+  return -1;
+}
+
+int DriverIndex(int Value, const tDvbParameterMap *Map)
+{
+  const tDvbParameterMap *map = Map;
+  while (map && map->userValue != -1) {
+        if (map->driverValue == Value)
+           return map - Map;
+        map++;
+        }
+  return -1;
+}
+
+int MapToUser(int Value, const tDvbParameterMap *Map, const char **String)
+{
+  int n = DriverIndex(Value, Map);
+  if (n >= 0) {
+     if (String)
+        *String = tr(Map[n].userString);
+     return Map[n].userValue;
+     }
+  return -1;
+}
+
+int MapToDriver(int Value, const tDvbParameterMap *Map)
+{
+  int n = UserIndex(Value, Map);
+  if (n >= 0)
+     return Map[n].driverValue;
+  return -1;
+}
+
+// --- cDvbTransponderParameters ---------------------------------------------
+
+cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
+{
+  polarization = 0;
+  inversion    = INVERSION_AUTO;
+  bandwidth    = 8000000;
+  coderateH    = FEC_AUTO;
+  coderateL    = FEC_AUTO;
+  modulation   = QPSK;
+  system       = SYS_DVBS;
+  transmission = TRANSMISSION_MODE_AUTO;
+  guard        = GUARD_INTERVAL_AUTO;
+  hierarchy    = HIERARCHY_AUTO;
+  rollOff      = ROLLOFF_AUTO;
+  Parse(Parameters);
+}
+
+int cDvbTransponderParameters::PrintParameter(char *p, char Name, int Value) const
+{
+  return Value >= 0 && Value != 999 ? sprintf(p, "%c%d", Name, Value) : 0;
+}
+
+cString cDvbTransponderParameters::ToString(char Type) const
+{
+#define ST(s) if (strchr(s, Type))
+  char buffer[64];
+  char *q = buffer;
+  *q = 0;
+  ST(" S ")  q += sprintf(q, "%c", polarization);
+  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
+  ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
+  ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
+  ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
+  ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
+  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+  ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
+  return buffer;
+}
+
+const char *cDvbTransponderParameters::ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map)
+{
+  if (*++s) {
+     char *p = NULL;
+     errno = 0;
+     int n = strtol(s, &p, 10);
+     if (!errno && p != s) {
+        Value = MapToDriver(n, Map);
+        if (Value >= 0)
+           return p;
+        }
+     }
+  esyslog("ERROR: invalid value for parameter '%c'", *(s - 1));
+  return NULL;
+}
+
+bool cDvbTransponderParameters::Parse(const char *s)
+{
+  while (s && *s) {
+        switch (toupper(*s)) {
+          case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
+          case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
+          case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
+          case 'G': s = ParseParameter(s, guard, GuardValues); break;
+          case 'H': polarization = *s++; break;
+          case 'I': s = ParseParameter(s, inversion, InversionValues); break;
+          case 'L': polarization = *s++; break;
+          case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
+          case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
+          case 'R': polarization = *s++; break;
+          case 'S': s = ParseParameter(s, system, SystemValues); break;
+          case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
+          case 'V': polarization = *s++; break;
+          case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
+          default: esyslog("ERROR: unknown parameter key '%c'", *s);
+                   return false;
+          }
+        }
+  return true;
+}
+
 // --- cDvbTuner -------------------------------------------------------------
 
 class cDvbTuner : public cThread {
 private:
   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
+  int device;
   int fd_frontend;
   int adapter, frontend;
   int tuneTimeout;
@@ -46,15 +261,17 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
+  cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
   virtual ~cDvbTuner();
+  const cChannel *GetTransponder(void) const { return &channel; }
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
   };
 
-cDvbTuner::cDvbTuner(int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
+cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
 {
+  device = Device;
   fd_frontend = Fd_Frontend;
   adapter = Adapter;
   frontend = Frontend;
@@ -84,21 +301,8 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
      return false; // not tuned to
   if (channel.Source() != Channel->Source() || channel.Transponder() != Channel->Transponder())
      return false; // sufficient mismatch
-  char Type = **cSource::ToString(Channel->Source());
-#define ST(s, p) if (strchr(s, Type)) if (channel.p() != Channel->p()) return false;
   // Polarization is already checked as part of the Transponder.
-  ST("  T", Bandwidth);
-  ST("CST", CoderateH);
-  ST("  T", CoderateL);
-  ST("  T", Guard);
-  ST("CST", Inversion);
-  ST("CST", Modulation);
-  ST(" S ", RollOff);
-  ST(" S ", System);
-  ST("CS ", Srate);
-  ST("  T", Transmission);
-  ST("  T", Hierarchy);
-  return true;
+  return strcmp(channel.Parameters(), Channel->Parameters()) == 0;
 }
 
 void cDvbTuner::Set(const cChannel *Channel)
@@ -171,10 +375,12 @@ bool cDvbTuner::SetFrontend(void)
      }
   CmdSeq.num = 0;
 
+  cDvbTransponderParameters dtp(channel.Parameters());
+
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
      unsigned int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
-        cDiseqc *diseqc = Diseqcs.Get(channel.Source(), channel.Frequency(), channel.Polarization());
+        cDiseqc *diseqc = Diseqcs.Get(device, channel.Source(), channel.Frequency(), dtp.Polarization());
         if (diseqc) {
            if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
               cDiseqc::eDiseqcActions da;
@@ -220,24 +426,24 @@ bool cDvbTuner::SetFrontend(void)
            frequency -= Setup.LnbFrequHi;
            tone = SEC_TONE_ON;
            }
-        int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+        int volt = (dtp.Polarization() == 'v' || dtp.Polarization() == 'V' || dtp.Polarization() == 'r' || dtp.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
         CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
         CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
         }
      frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
 
      // DVB-S/DVB-S2 (common parts)
-     SETCMD(DTV_DELIVERY_SYSTEM, channel.System());
+     SETCMD(DTV_DELIVERY_SYSTEM, dtp.System());
      SETCMD(DTV_FREQUENCY, frequency * 1000UL);
-     SETCMD(DTV_MODULATION, channel.Modulation());
+     SETCMD(DTV_MODULATION, dtp.Modulation());
      SETCMD(DTV_SYMBOL_RATE, channel.Srate() * 1000UL);
-     SETCMD(DTV_INNER_FEC, channel.CoderateH());
-     SETCMD(DTV_INVERSION, channel.Inversion());
-     if (channel.System() == SYS_DVBS2) {
+     SETCMD(DTV_INNER_FEC, dtp.CoderateH());
+     SETCMD(DTV_INVERSION, dtp.Inversion());
+     if (dtp.System() == SYS_DVBS2) {
         if (frontendType == SYS_DVBS2) {
            // DVB-S2
            SETCMD(DTV_PILOT, PILOT_AUTO);
-           SETCMD(DTV_ROLLOFF, channel.RollOff());
+           SETCMD(DTV_ROLLOFF, dtp.RollOff());
            }
         else {
            esyslog("ERROR: frontend %d/%d doesn't provide DVB-S2", adapter, frontend);
@@ -256,10 +462,10 @@ bool cDvbTuner::SetFrontend(void)
      // DVB-C
      SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
      SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
-     SETCMD(DTV_INVERSION, channel.Inversion());
+     SETCMD(DTV_INVERSION, dtp.Inversion());
      SETCMD(DTV_SYMBOL_RATE, channel.Srate() * 1000UL);
-     SETCMD(DTV_INNER_FEC, channel.CoderateH());
-     SETCMD(DTV_MODULATION, channel.Modulation());
+     SETCMD(DTV_INNER_FEC, dtp.CoderateH());
+     SETCMD(DTV_MODULATION, dtp.Modulation());
 
      tuneTimeout = DVBC_TUNE_TIMEOUT;
      lockTimeout = DVBC_LOCK_TIMEOUT;
@@ -268,14 +474,14 @@ bool cDvbTuner::SetFrontend(void)
      // DVB-T
      SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
      SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
-     SETCMD(DTV_INVERSION, channel.Inversion());
-     SETCMD(DTV_BANDWIDTH_HZ, channel.Bandwidth());
-     SETCMD(DTV_CODE_RATE_HP, channel.CoderateH());
-     SETCMD(DTV_CODE_RATE_LP, channel.CoderateL());
-     SETCMD(DTV_MODULATION, channel.Modulation());
-     SETCMD(DTV_TRANSMISSION_MODE, channel.Transmission());
-     SETCMD(DTV_GUARD_INTERVAL, channel.Guard());
-     SETCMD(DTV_HIERARCHY, channel.Hierarchy());
+     SETCMD(DTV_INVERSION, dtp.Inversion());
+     SETCMD(DTV_BANDWIDTH_HZ, dtp.Bandwidth());
+     SETCMD(DTV_CODE_RATE_HP, dtp.CoderateH());
+     SETCMD(DTV_CODE_RATE_LP, dtp.CoderateL());
+     SETCMD(DTV_MODULATION, dtp.Modulation());
+     SETCMD(DTV_TRANSMISSION_MODE, dtp.Transmission());
+     SETCMD(DTV_GUARD_INTERVAL, dtp.Guard());
+     SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
      lockTimeout = DVBT_LOCK_TIMEOUT;
@@ -353,6 +559,62 @@ void cDvbTuner::Action(void)
         }
 }
 
+// --- cDvbSourceParam -------------------------------------------------------
+
+class cDvbSourceParam : public cSourceParam {
+private:
+  int param;
+  cChannel data;
+  cDvbTransponderParameters dtp;
+public:
+  cDvbSourceParam(char Source, const char *Description);
+  virtual void SetData(cChannel *Channel);
+  virtual void GetData(cChannel *Channel);
+  virtual cOsdItem *GetOsdItem(void);
+  };
+
+cDvbSourceParam::cDvbSourceParam(char Source, const char *Description)
+:cSourceParam(Source, Description)
+{
+  param = 0;
+}
+
+void cDvbSourceParam::SetData(cChannel *Channel)
+{
+  data = *Channel;
+  dtp.Parse(data.Parameters());
+  param = 0;
+}
+
+void cDvbSourceParam::GetData(cChannel *Channel)
+{
+  data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), dtp.ToString(Source()), true);
+  *Channel = data;
+}
+
+cOsdItem *cDvbSourceParam::GetOsdItem(void)
+{
+  char type = Source();
+#undef ST
+#define ST(s) if (strchr(s, type))
+  switch (param++) {
+    case  0: ST(" S ")  return new cMenuEditChrItem( tr("Polarization"), &dtp.polarization, "hvlr");             else return GetOsdItem();
+    case  1: ST(" S ")  return new cMenuEditMapItem( tr("System"),       &dtp.system,       SystemValues);       else return GetOsdItem();
+    case  2: ST("CS ")  return new cMenuEditIntItem( tr("Srate"),        &data.srate);                           else return GetOsdItem();
+    case  3: ST("CST")  return new cMenuEditMapItem( tr("Inversion"),    &dtp.inversion,    InversionValues);    else return GetOsdItem();
+    case  4: ST("CST")  return new cMenuEditMapItem( tr("CoderateH"),    &dtp.coderateH,    CoderateValues);     else return GetOsdItem();
+    case  5: ST("  T")  return new cMenuEditMapItem( tr("CoderateL"),    &dtp.coderateL,    CoderateValues);     else return GetOsdItem();
+    case  6: ST("CST")  return new cMenuEditMapItem( tr("Modulation"),   &dtp.modulation,   ModulationValues);   else return GetOsdItem();
+    case  7: ST("  T")  return new cMenuEditMapItem( tr("Bandwidth"),    &dtp.bandwidth,    BandwidthValues);    else return GetOsdItem();
+    case  8: ST("  T")  return new cMenuEditMapItem( tr("Transmission"), &dtp.transmission, TransmissionValues); else return GetOsdItem();
+    case  9: ST("  T")  return new cMenuEditMapItem( tr("Guard"),        &dtp.guard,        GuardValues);        else return GetOsdItem();
+    case 10: ST("  T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
+    case 11: ST(" S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
+    default: return NULL;
+    }
+  return NULL;
+}
+
 // --- cDvbDevice ------------------------------------------------------------
 
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
@@ -419,7 +681,7 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
         if (frontendType == SYS_DVBS2)
            numProvidedSystems++;
         isyslog("frontend %d/%d provides %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], frontendInfo.name);
-        dvbTuner = new cDvbTuner(fd_frontend, adapter, frontend, frontendType);
+        dvbTuner = new cDvbTuner(CardIndex() + 1, fd_frontend, adapter, frontend, frontendType);
         }
      }
   else
@@ -483,6 +745,9 @@ bool cDvbDevice::Probe(int Adapter, int Frontend)
 
 bool cDvbDevice::Initialize(void)
 {
+  new cDvbSourceParam('C', "DVB-C");
+  new cDvbSourceParam('S', "DVB-S");
+  new cDvbSourceParam('T', "DVB-T");
   int Checked = 0;
   int Found = 0;
   for (int Adapter = 0; ; Adapter++) {
@@ -608,10 +873,13 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
   if (!ProvidesSource(Channel->Source()))
      return false; // doesn't provide source
   if (!cSource::IsSat(Channel->Source()))
-     return true; // source is sufficient for non sat
-  if (frontendType == SYS_DVBS && Channel->System() == SYS_DVBS2)
+     return DeviceHooksProvidesTransponder(Channel); // source is sufficient for non sat
+  cDvbTransponderParameters dtp(Channel->Parameters());
+  if (frontendType == SYS_DVBS && dtp.System() == SYS_DVBS2)
      return false; // requires modulation system which frontend doesn't provide
-  return !Setup.DiSEqC || Diseqcs.Get(Channel->Source(), Channel->Frequency(), Channel->Polarization());
+  if (!Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization()))
+     return DeviceHooksProvidesTransponder(Channel);
+  return false;
 }
 
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
@@ -653,6 +921,11 @@ int cDvbDevice::NumProvidedSystems(void) const
   return numProvidedSystems;
 }
 
+const cChannel *cDvbDevice::GetCurrentlyTunedTransponder(void) const
+{
+  return dvbTuner->GetTransponder(); 
+}
+
 bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 {
   return dvbTuner->IsTunedTo(Channel);
diff --git a/dvbdevice.h b/dvbdevice.h
index b6cc950a6..dceedd138 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.11 2010/01/04 14:07:12 kls Exp $
+ * $Id: dvbdevice.h 2.13 2010/02/21 14:06:08 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -31,6 +31,71 @@
 #define DEV_DVB_AUDIO     "audio"
 #define DEV_DVB_CA        "ca"
 
+struct tDvbParameterMap {
+  int userValue;
+  int driverValue;
+  const char *userString;
+  };
+
+int MapToUser(int Value, const tDvbParameterMap *Map, const char **String = NULL);
+int MapToDriver(int Value, const tDvbParameterMap *Map);
+int UserIndex(int Value, const tDvbParameterMap *Map);
+int DriverIndex(int Value, const tDvbParameterMap *Map);
+
+extern const tDvbParameterMap InversionValues[];
+extern const tDvbParameterMap BandwidthValues[];
+extern const tDvbParameterMap CoderateValues[];
+extern const tDvbParameterMap ModulationValues[];
+extern const tDvbParameterMap SystemValues[];
+extern const tDvbParameterMap TransmissionValues[];
+extern const tDvbParameterMap GuardValues[];
+extern const tDvbParameterMap HierarchyValues[];
+extern const tDvbParameterMap RollOffValues[];
+
+class cDvbTransponderParameters {
+friend class cDvbSourceParam;
+private:
+  char polarization;
+  int inversion;
+  int bandwidth;
+  int coderateH;
+  int coderateL;
+  int modulation;
+  int system;
+  int transmission;
+  int guard;
+  int hierarchy;
+  int rollOff;
+  int PrintParameter(char *p, char Name, int Value) const;
+  const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map);
+public:
+  cDvbTransponderParameters(const char *Parameters = NULL);
+  char Polarization(void) const { return polarization; }
+  int Inversion(void) const { return inversion; }
+  int Bandwidth(void) const { return bandwidth; }
+  int CoderateH(void) const { return coderateH; }
+  int CoderateL(void) const { return coderateL; }
+  int Modulation(void) const { return modulation; }
+  int System(void) const { return system; }
+  int Transmission(void) const { return transmission; }
+  int Guard(void) const { return guard; }
+  int Hierarchy(void) const { return hierarchy; }
+  int RollOff(void) const { return rollOff; }
+  void SetPolarization(char Polarization) { polarization = Polarization; }
+  void SetInversion(int Inversion) { inversion = Inversion; }
+  void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; }
+  void SetCoderateH(int CoderateH) { coderateH = CoderateH; }
+  void SetCoderateL(int CoderateL) { coderateL = CoderateL; }
+  void SetModulation(int Modulation) { modulation = Modulation; }
+  void SetSystem(int System) { system = System; }
+  void SetTransmission(int Transmission) { transmission = Transmission; }
+  void SetGuard(int Guard) { guard = Guard; }
+  void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; }
+  void SetRollOff(int RollOff) { rollOff = RollOff; }
+  cString ToString(char Type) const;
+  bool Parse(const char *s);
+  };
+
 class cDvbTuner;
 
 /// The cDvbDevice implements a DVB device which can be accessed through the Linux DVB driver API.
@@ -75,6 +140,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
   virtual int NumProvidedSystems(void) const;
+  virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
   virtual bool IsTunedToTransponder(const cChannel *Channel);
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
diff --git a/dvbplayer.c b/dvbplayer.c
index d02884b01..caeae46c2 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.19 2009/12/13 13:49:56 kls Exp $
+ * $Id: dvbplayer.c 2.20 2010/02/06 12:34:28 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -396,6 +396,7 @@ void cDvbPlayer::Action(void)
   uint32_t LastStc = 0;
   int LastReadIFrame = -1;
   int SwitchToPlayFrame = 0;
+  cFrame *DropFrame = NULL;
 
   while (Running()) {
         if (WaitingForData)
@@ -502,6 +503,13 @@ void cDvbPlayer::Action(void)
           else
              Sleep = true;
 
+          if (DropFrame) {
+             if (!eof || (playDir != pdForward && DropFrame->Index() > 0) || (playDir == pdForward && DropFrame->Index() < readIndex)) {
+                ringBuffer->Drop(DropFrame); // the very first and last frame are continously repeated to flush data through the device
+                DropFrame = NULL;
+                }
+             }
+
           // Get the next frame from the buffer:
 
           if (!playFrame) {
@@ -546,8 +554,7 @@ void cDvbPlayer::Action(void)
                    Sleep = true;
                 }
              if (pc <= 0) {
-                if (!eof || (playDir != pdForward && playFrame->Index() > 0) || (playDir == pdForward && playFrame->Index() < readIndex))
-                   ringBuffer->Drop(playFrame); // the very first and last frame are continously repeated to flush data through the device
+                DropFrame = playFrame;
                 playFrame = NULL;
                 p = NULL;
                 }
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 221523fda..a02a01f33 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.3 2009/12/05 16:11:54 kls Exp $
+ * $Id: dvbsubtitle.c 2.4 2010/02/07 12:08:13 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -658,6 +658,7 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
 {
   dvbSubtitleAssembler = new cDvbSubtitleAssembler;
   osd = NULL;
+  frozen = false;
   pages = new cList<cDvbSubtitlePage>;
   bitmaps = new cList<cDvbSubtitleBitmaps>;
   Start();
@@ -685,6 +686,7 @@ void cDvbSubtitleConverter::Reset(void)
   pages->Clear();
   bitmaps->Clear();
   DELETENULL(osd);
+  frozen = false;
   Unlock();
 }
 
@@ -776,46 +778,48 @@ void cDvbSubtitleConverter::Action(void)
   int LastSetupLevel = setupLevel;
   cTimeMs Timeout;
   while (Running()) {
-        if (osd) {
-           int NewSetupLevel = setupLevel;
-           if (Timeout.TimedOut() || LastSetupLevel != NewSetupLevel) {
-              DELETENULL(osd);
-              }
-           LastSetupLevel = NewSetupLevel;
-           }
         int WaitMs = 100;
-        Lock();
-        if (cDvbSubtitleBitmaps *sb = bitmaps->First()) {
-           int64_t STC = cDevice::PrimaryDevice()->GetSTC();
-           int64_t Delta = 0;
-           if (STC >= 0) {
-              Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
-              if (Delta > (int64_t(1) << 31))
-                 Delta -= (int64_t(1) << 32);
-              else if (Delta < -((int64_t(1) << 31) - 1))
-                 Delta += (int64_t(1) << 32);
-              }
-           else {
-              //TODO sync on PTS? are there actually devices that don't deliver an STC?
+        if (!frozen) {
+           if (osd) {
+              int NewSetupLevel = setupLevel;
+              if (Timeout.TimedOut() || LastSetupLevel != NewSetupLevel) {
+                 DELETENULL(osd);
+                 }
+              LastSetupLevel = NewSetupLevel;
               }
-           Delta /= 90; // STC and PTS are in 1/90000s
-           if (Delta <= MAXDELTA) {
-              if (Delta <= 0) {
-                 dbgconverter("Got %d bitmaps, showing #%d\n", bitmaps->Count(), sb->Index() + 1);
-                 if (AssertOsd()) {
-                    sb->Draw(osd);
-                    Timeout.Set(sb->Timeout() * 1000);
-                    dbgconverter("PTS: %lld  STC: %lld (%lld) timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
+           Lock();
+           if (cDvbSubtitleBitmaps *sb = bitmaps->First()) {
+              int64_t STC = cDevice::PrimaryDevice()->GetSTC();
+              int64_t Delta = 0;
+              if (STC >= 0) {
+                 Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
+                 if (Delta > (int64_t(1) << 31))
+                    Delta -= (int64_t(1) << 32);
+                 else if (Delta < -((int64_t(1) << 31) - 1))
+                    Delta += (int64_t(1) << 32);
+                 }
+              else {
+                 //TODO sync on PTS? are there actually devices that don't deliver an STC?
+                 }
+              Delta /= 90; // STC and PTS are in 1/90000s
+              if (Delta <= MAXDELTA) {
+                 if (Delta <= 0) {
+                    dbgconverter("Got %d bitmaps, showing #%d\n", bitmaps->Count(), sb->Index() + 1);
+                    if (AssertOsd()) {
+                       sb->Draw(osd);
+                       Timeout.Set(sb->Timeout() * 1000);
+                       dbgconverter("PTS: %lld  STC: %lld (%lld) timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
+                       }
+                    bitmaps->Del(sb);
                     }
-                 bitmaps->Del(sb);
+                 else if (Delta < WaitMs)
+                    WaitMs = Delta;
                  }
-              else if (Delta < WaitMs)
-                 WaitMs = Delta;
+              else
+                 bitmaps->Del(sb);
               }
-           else
-              bitmaps->Del(sb);
+           Unlock();
            }
-        Unlock();
         cCondWait::SleepMs(WaitMs);
         }
 }
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index 06bdea4d0..c6775a9e2 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.1 2008/05/25 14:36:52 kls Exp $
+ * $Id: dvbsubtitle.h 2.2 2010/02/07 11:55:14 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -25,6 +25,7 @@ class cDvbSubtitleConverter : public cThread {
   static int setupLevel;
   cDvbSubtitleAssembler *dvbSubtitleAssembler;
   cOsd *osd;
+  bool frozen;
   cList<cDvbSubtitlePage> *pages;
   cList<cDvbSubtitleBitmaps> *bitmaps;
   tColor yuv2rgb(int Y, int Cb, int Cr);
@@ -36,6 +37,7 @@ class cDvbSubtitleConverter : public cThread {
   virtual ~cDvbSubtitleConverter();
   void Action(void);
   void Reset(void);
+  void Freeze(bool Status) { frozen = Status; }
   int ConvertFragments(const uchar *Data, int Length); // for legacy PES recordings
   int Convert(const uchar *Data, int Length);
   static void SetupChanged(void);
diff --git a/eitscan.c b/eitscan.c
index d419d319e..2b43e7181 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.0 2006/01/07 14:10:17 kls Exp $
+ * $Id: eitscan.c 2.1 2010/02/07 12:12:05 kls Exp $
  */
 
 #include "eitscan.h"
@@ -127,7 +127,7 @@ void cEITScanner::Activity(void)
 
 void cEITScanner::Process(void)
 {
-  if ((Setup.EPGScanTimeout || !lastActivity) && Channels.MaxNumber() > 1) { // !lastActivity means a scan was forced
+  if (Setup.EPGScanTimeout || !lastActivity) { // !lastActivity means a scan was forced
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         if (Channels.Lock(false, 10)) {
diff --git a/epg.c b/epg.c
index 006a5de0c..18d91fc71 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.5 2010/01/08 15:20:28 kls Exp $
+ * $Id: epg.c 2.6 2010/02/28 14:24:55 kls Exp $
  */
 
 #include "epg.h"
@@ -443,8 +443,6 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
      if (components) {
         for (int i = 0; i < components->NumComponents(); i++) {
             tComponent *p = components->Component(i);
-            if (!Setup.UseDolbyDigital && p->stream == 0x02 && p->type == 0x05)
-               continue;
             fprintf(f, "%sX %s\n", Prefix, *p->ToString());
             }
         }
diff --git a/libsi/si.c b/libsi/si.c
index 01ab9bf2f..0fd832d85 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.1 2009/12/05 16:20:12 kls Exp $
+ *   $Id: si.c 2.2 2010/02/13 10:31:52 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -311,6 +311,11 @@ static const char *CharacterTables2[] = {
 static const char *SystemCharacterTable = NULL;
 bool SystemCharacterTableIsSingleByte = true;
 
+bool systemCharacterTableIsSingleByte(void)
+{
+  return SystemCharacterTableIsSingleByte;
+}
+
 bool SetSystemCharacterTable(const char *CharacterTable) {
    if (CharacterTable) {
       for (unsigned int i = 0; i < NumEntries(CharacterTables1); i++) {
@@ -335,11 +340,7 @@ bool SetSystemCharacterTable(const char *CharacterTable) {
    return false;
 }
 
-// Determines the character table used in the given buffer and returns
-// a string indicating that table. If no table can be determined, the
-// default ISO6937 is returned. If a table can be determined, the buffer
-// and length are adjusted accordingly.
-static const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL) {
+const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte) {
    const char *cs = "ISO6937";
    // Workaround for broadcaster stupidity: according to
    // "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some
@@ -375,7 +376,7 @@ static const char *getCharacterTable(const unsigned char *&buffer, int &length,
    return cs;
 }
 
-static bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode)
+bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode)
 {
   if (SystemCharacterTable) {
      iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
diff --git a/libsi/si.h b/libsi/si.h
index b28b14abf..d6a1dc19d 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 2.2 2009/12/06 11:37:35 kls Exp $
+ *   $Id: si.h 2.3 2010/02/13 10:31:34 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -492,6 +492,13 @@ class String : public VariableLengthPart {
 // like "iso8859-15" or "utf-8" (case insensitive).
 // Returns true if the character table was recognized.
 bool SetSystemCharacterTable(const char *CharacterTable);
+// Determines the character table used in the given buffer and returns
+// a string indicating that table. If no table can be determined, the
+// default ISO6937 is returned. If a table can be determined, the buffer
+// and length are adjusted accordingly.
+const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL);
+bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode);
+bool systemCharacterTableIsSingleByte(void);
 
 } //end of namespace
 
diff --git a/menu.c b/menu.c
index 7ddf0cff1..655eb4c48 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.14 2010/01/31 12:43:24 kls Exp $
+ * $Id: menu.c 2.17 2010/02/21 14:09:19 kls Exp $
  */
 
 #include "menu.h"
@@ -24,6 +24,7 @@
 #include "recording.h"
 #include "remote.h"
 #include "shutdown.h"
+#include "sourceparams.h"
 #include "sources.h"
 #include "status.h"
 #include "themes.h"
@@ -189,6 +190,7 @@ class cMenuEditChannel : public cOsdMenu {
 private:
   cChannel *channel;
   cChannel data;
+  cSourceParam *sourceParam;
   char name[256];
   void Setup(void);
 public:
@@ -200,6 +202,7 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 :cOsdMenu(tr("Edit channel"), 16)
 {
   channel = Channel;
+  sourceParam = NULL;
   if (channel) {
      data = *channel;
      if (New) {
@@ -215,8 +218,6 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 void cMenuEditChannel::Setup(void)
 {
   int current = Current();
-  char type = **cSource::ToString(data.source);
-#define ST(s) if (strchr(s, type))
 
   Clear();
 
@@ -242,18 +243,13 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Rid"),          &data.rid, 0));
   XXX*/
   // Parameters for specific types of sources:
-  ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr"));
-  ST(" S ")  Add(new cMenuEditMapItem( tr("System"),       &data.system,       SystemValues));
-  ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
-  ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues));
-  ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("CoderateL"),    &data.coderateL,    CoderateValues));
-  ST("CST")  Add(new cMenuEditMapItem( tr("Modulation"),   &data.modulation,   ModulationValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Bandwidth"),    &data.bandwidth,    BandwidthValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Guard"),        &data.guard,        GuardValues));
-  ST("  T")  Add(new cMenuEditMapItem( tr("Hierarchy"),    &data.hierarchy,    HierarchyValues));
-  ST(" S ")  Add(new cMenuEditMapItem( tr("Rolloff"),      &data.rollOff,      RollOffValues));
+  sourceParam = SourceParams.Get(**cSource::ToString(data.source));
+  if (sourceParam) {
+     sourceParam->SetData(&data);
+     cOsdItem *Item;
+     while ((Item = sourceParam->GetOsdItem()) != NULL)
+           Add(Item);
+     }
 
   SetCurrent(Get(current));
   Display();
@@ -266,6 +262,8 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      if (Key == kOk) {
+        if (sourceParam)
+           sourceParam->GetData(&data);
         if (Channels.HasUniqueChannelID(&data, channel)) {
            data.name = strcpyrealloc(data.name, name);
            if (channel) {
@@ -289,8 +287,11 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
            }
         }
      }
-  if (Key != kNone && (data.source & cSource::st_Mask) != (oldSource & cSource::st_Mask))
+  if (Key != kNone && (data.source & cSource::st_Mask) != (oldSource & cSource::st_Mask)) {
+     if (sourceParam)
+        sourceParam->GetData(&data);
      Setup();
+     }
   return state;
 }
 
@@ -1044,6 +1045,11 @@ void cMenuTimerItem::Set(void)
      strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
      day = buffer;
      }
+  const char *File = strrchr(timer->File(), FOLDERDELIMCHAR);
+  if (File)
+     File++;
+  else
+     File = timer->File();
   SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
@@ -1054,7 +1060,7 @@ void cMenuTimerItem::Set(void)
                     timer->Start() % 100,
                     timer->Stop() / 100,
                     timer->Stop() % 100,
-                    timer->File()));
+                    File));
 }
 
 // --- cMenuTimers -----------------------------------------------------------
@@ -1781,22 +1787,6 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
 
 // --- cMenuCommands ---------------------------------------------------------
 
-class cMenuCommands : public cOsdMenu {
-private:
-  cList<cNestedItem> *commands;
-  cString parameters;
-  cString title;
-  cString command;
-  bool confirm;
-  char *result;
-  bool Parse(const char *s);
-  eOSState Execute(void);
-public:
-  cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters = NULL);
-  virtual ~cMenuCommands();
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-
 cMenuCommands::cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters)
 :cOsdMenu(Title)
 {
diff --git a/menu.h b/menu.h
index d428a8dd8..39de82d83 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.1 2010/01/17 11:21:42 kls Exp $
+ * $Id: menu.h 2.2 2010/02/06 10:17:24 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -53,6 +53,22 @@ class cMenuFolder : public cOsdMenu {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuCommands : public cOsdMenu {
+private:
+  cList<cNestedItem> *commands;
+  cString parameters;
+  cString title;
+  cString command;
+  bool confirm;
+  char *result;
+  bool Parse(const char *s);
+  eOSState Execute(void);
+public:
+  cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters = NULL);
+  virtual ~cMenuCommands();
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuEditTimer : public cOsdMenu {
 private:
   cTimer *timer;
diff --git a/menuitems.c b/menuitems.c
index 05521ad9c..7faf2b73b 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.5 2009/12/06 11:31:20 kls Exp $
+ * $Id: menuitems.c 2.6 2010/02/16 14:44:35 kls Exp $
  */
 
 #include "menuitems.h"
@@ -1007,7 +1007,7 @@ eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
 
 // --- cMenuEditMapItem ------------------------------------------------------
 
-cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
+cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tDvbParameterMap *Map, const char *ZeroString)
 :cMenuEditItem(Name)
 {
   value = Value;
diff --git a/menuitems.h b/menuitems.h
index 48324757f..4805e3fd7 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.2 2009/05/03 12:50:34 kls Exp $
+ * $Id: menuitems.h 2.3 2010/02/21 13:58:21 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
 #define __MENUITEMS_H
 
 #include <limits.h>
+#include "dvbdevice.h"
 #include "osdbase.h"
 
 extern const char *FileNameChars;
@@ -175,11 +176,11 @@ class cMenuEditTimeItem : public cMenuEditItem {
 class cMenuEditMapItem : public cMenuEditItem {
 protected:
   int *value;
-  const tChannelParameterMap *map;
+  const tDvbParameterMap *map;
   const char *zeroString;
   virtual void Set(void);
 public:
-  cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
+  cMenuEditMapItem(const char *Name, int *Value, const tDvbParameterMap *Map, const char *ZeroString = NULL);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/newplugin b/newplugin
index 52ef72ea2..ffc43d3ba 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.1 2009/12/06 15:31:58 kls Exp $
+# $Id: newplugin 2.2 2010/02/06 14:50:03 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -77,7 +77,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -85,6 +85,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include \$(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include \$(VDRDIR)/Make.config
@@ -104,8 +108,6 @@ INCLUDES += -I\$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
 ### The object files (add further files here):
 
 OBJS = \$(PLUGIN).o
diff --git a/nit.c b/nit.c
index 38640409d..dfd020761 100644
--- a/nit.c
+++ b/nit.c
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.4 2009/12/06 11:36:16 kls Exp $
+ * $Id: nit.c 2.5 2010/02/16 15:37:05 kls Exp $
  */
 
 #include "nit.h"
 #include <linux/dvb/frontend.h>
 #include "channels.h"
+#include "dvbdevice.h"
 #include "eitscan.h"
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
@@ -124,21 +125,22 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
           switch (d->getDescriptorTag()) {
             case SI::SatelliteDeliverySystemDescriptorTag: {
                  SI::SatelliteDeliverySystemDescriptor *sd = (SI::SatelliteDeliverySystemDescriptor *)d;
+                 cDvbTransponderParameters dtp;
                  int Source = cSource::FromData(cSource::stSat, BCD2INT(sd->getOrbitalPosition()), sd->getWestEastFlag());
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100;
-                 static char Polarizations[] = { 'h', 'v', 'l', 'r' };
-                 char Polarization = Polarizations[sd->getPolarization()];
+                 static char Polarizations[] = { 'H', 'V', 'L', 'R' };
+                 dtp.SetPolarization(Polarizations[sd->getPolarization()]);
                  static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
-                 int CodeRate = CodeRates[sd->getFecInner()];
+                 dtp.SetCoderateH(CodeRates[sd->getFecInner()]);
                  static int Modulations[] = { QAM_AUTO, QPSK, PSK_8, QAM_16 };
-                 int Modulation = Modulations[sd->getModulationType()];
-                 int System = sd->getModulationSystem() ? SYS_DVBS2 : SYS_DVBS;
+                 dtp.SetModulation(Modulations[sd->getModulationType()]);
+                 dtp.SetSystem(sd->getModulationSystem() ? SYS_DVBS2 : SYS_DVBS);
                  static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
-                 int RollOff = sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO;
+                 dtp.SetRollOff(sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
-                        if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Transponder())) {
+                        if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], dtp.Polarization()), Transponder())) {
                            nits[ThisNIT].hasTransponder = true;
                            //printf("has transponder %d\n", Transponder());
                            break;
@@ -152,23 +154,23 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
                            found = true;
-                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), transponder)) {
+                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
-                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), transponder)) {
+                                  if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], dtp.Polarization()), transponder)) {
                                      Frequency = Frequencies[n];
                                      break;
                                      }
                                   }
                               }
-                           if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate, Modulation, System, RollOff);
+                           if (ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), Transponder())) // only modify channels if we're actually receiving this transponder
+                              Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('S'));
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate, Modulation, System, RollOff))
+                           if (Channel->SetTransponderData(Source, Frequencies[n], SymbolRate, dtp.ToString('S')))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
@@ -179,13 +181,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  break;
             case SI::CableDeliverySystemDescriptorTag: {
                  SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
+                 cDvbTransponderParameters dtp;
                  int Source = cSource::FromData(cSource::stCable);
                  int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
                  //XXX FEC_outer???
                  static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
-                 int CodeRate = CodeRates[sd->getFecInner()];
+                 dtp.SetCoderateH(CodeRates[sd->getFecInner()]);
                  static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
-                 int Modulation = Modulations[min(sd->getModulation(), 6)];
+                 dtp.SetModulation(Modulations[min(sd->getModulation(), 6)]);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
@@ -212,14 +215,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
+                              Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('C'));
                            }
                         }
                     if (!found) {
                         for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
+                           if (Channel->SetTransponderData(Source, Frequencies[n], SymbolRate, dtp.ToString('C')))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
@@ -230,21 +233,22 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  break;
             case SI::TerrestrialDeliverySystemDescriptorTag: {
                  SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
+                 cDvbTransponderParameters dtp;
                  int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = Frequencies[0] = sd->getFrequency() * 10;
                  static int Bandwidths[] = { 8000000, 7000000, 6000000, 0, 0, 0, 0, 0 };
-                 int Bandwidth = Bandwidths[sd->getBandwidth()];
+                 dtp.SetBandwidth(Bandwidths[sd->getBandwidth()]);
                  static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
-                 int Constellation = Constellations[sd->getConstellation()];
+                 dtp.SetModulation(Constellations[sd->getConstellation()]);
                  static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
-                 int Hierarchy = Hierarchies[sd->getHierarchy()];
+                 dtp.SetHierarchy(Hierarchies[sd->getHierarchy()]);
                  static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
-                 int CodeRateHP = CodeRates[sd->getCodeRateHP()];
-                 int CodeRateLP = CodeRates[sd->getCodeRateLP()];
+                 dtp.SetCoderateH(CodeRates[sd->getCodeRateHP()]);
+                 dtp.SetCoderateL(CodeRates[sd->getCodeRateLP()]);
                  static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
-                 int GuardInterval = GuardIntervals[sd->getGuardInterval()];
+                 dtp.SetGuard(GuardIntervals[sd->getGuardInterval()]);
                  static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
-                 int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
+                 dtp.SetTransmission(TransmissionModes[sd->getTransmissionMode()]);
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
                         if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
@@ -270,14 +274,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
+                              Channel->SetTransponderData(Source, Frequency, 0, dtp.ToString('T'));
                            }
                         }
                     if (!found) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
-                           if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
+                           if (Channel->SetTransponderData(Source, Frequencies[n], 0, dtp.ToString('T')))
                               EITScanner.AddTransponder(Channel);
                            else
                               delete Channel;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index fcdf6724d..40198f8ed 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -18,6 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal incorrecte ***"
+
+msgid "Channel not available!"
+msgstr "Canal no disponible!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "No puc iniciar el mode de transfer�ncia!"
+
 msgid "off"
 msgstr "off"
 
@@ -30,14 +39,41 @@ msgstr "auto"
 msgid "none"
 msgstr "cap"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Canal incorrecte ***"
+msgid "Polarization"
+msgstr "Polaritzaci�"
 
-msgid "Channel not available!"
-msgstr "Canal no disponible!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "No puc iniciar el mode de transfer�ncia!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversi�"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulaci�"
+
+msgid "Bandwidth"
+msgstr "Amplada de banda"
+
+msgid "Transmission"
+msgstr "Transmissi�"
+
+msgid "Guard"
+msgstr "Protegir"
+
+msgid "Hierarchy"
+msgstr "Jerarquia"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Iniciant exploraci� EPG"
@@ -526,42 +562,6 @@ msgstr "Acc
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polaritzaci�"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversi�"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulaci�"
-
-msgid "Bandwidth"
-msgstr "Amplada de banda"
-
-msgid "Transmission"
-msgstr "Transmissi�"
-
-msgid "Guard"
-msgstr "Protegir"
-
-msgid "Hierarchy"
-msgstr "Jerarquia"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Propietats del canal duplicades!"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 3bbd6eb31..63b5d1c1f 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Neplatn� kan�l ***"
+
+msgid "Channel not available!"
+msgstr "Kan�l nen� dostupn�!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nelze za��t s p�enosem"
+
 msgid "off"
 msgstr "vyp."
 
@@ -28,14 +37,41 @@ msgstr "auto"
 msgid "none"
 msgstr "��dn�"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Neplatn� kan�l ***"
+msgid "Polarization"
+msgstr "Polarizace"
 
-msgid "Channel not available!"
-msgstr "Kan�l nen� dostupn�!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Nelze za��t s p�enosem"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulace"
+
+msgid "Bandwidth"
+msgstr "���ka p�sma"
+
+msgid "Transmission"
+msgstr "P�enos"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Za��n� prohled�v�n� EPG"
@@ -524,42 +560,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarizace"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulace"
-
-msgid "Bandwidth"
-msgstr "���ka p�sma"
-
-msgid "Transmission"
-msgstr "P�enos"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarchy"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Nastaven� kan�l� nejsou unik�tn�!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index fbad90944..99af59b52 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Ugyldig kanal! ***"
+
+msgid "Channel not available!"
+msgstr "Kanal er ikke tilg�ngelig!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Kan ikke starte Transfer Mode!"
+
 msgid "off"
 msgstr "fra"
 
@@ -27,14 +36,41 @@ msgstr "automatisk"
 msgid "none"
 msgstr "ingen"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Ugyldig kanal! ***"
+msgid "Polarization"
+msgstr "Polarisation"
 
-msgid "Channel not available!"
-msgstr "Kanal er ikke tilg�ngelig!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Kan ikke starte Transfer Mode!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulation"
+
+msgid "Bandwidth"
+msgstr "B�ndbredde"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarki"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Starter EPG skanning"
@@ -523,42 +559,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisation"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulation"
-
-msgid "Bandwidth"
-msgstr "B�ndbredde"
-
-msgid "Transmission"
-msgstr "Transmission"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarki"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanalindstillinger er ikke entydige!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index ad6401b59..6181eb306 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Ung�ltiger Kanal ***"
+
+msgid "Channel not available!"
+msgstr "Kanal nicht verf�gbar!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Transfer-Mode kann nicht gestartet werden!"
+
 msgid "off"
 msgstr "aus"
 
@@ -27,14 +36,41 @@ msgstr "auto"
 msgid "none"
 msgstr "keine"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Ung�ltiger Kanal ***"
+msgid "Polarization"
+msgstr "Polarisation"
 
-msgid "Channel not available!"
-msgstr "Kanal nicht verf�gbar!"
+msgid "System"
+msgstr "System"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Transfer-Mode kann nicht gestartet werden!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulation"
+
+msgid "Bandwidth"
+msgstr "Bandbreite"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarchie"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
@@ -523,42 +559,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisation"
-
-msgid "System"
-msgstr "System"
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulation"
-
-msgid "Bandwidth"
-msgstr "Bandbreite"
-
-msgid "Transmission"
-msgstr "Transmission"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarchie"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "Kanaleinstellungen sind nicht eindeutig!"
 
@@ -597,7 +597,7 @@ msgstr "Verzeichnisname existiert bereits!"
 
 #, fuzzy, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Verzeichnisname darf kein '{', '}' oder '#' enthalten!"
+msgstr "Verzeichnisname darf kein '%c' enthalten!"
 
 msgid "Button$Select"
 msgstr "Ausw�hlen"
diff --git a/po/el_GR.po b/po/el_GR.po
index e8382b86e..70f6e5463 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** ����� ������ ***"
+
+msgid "Channel not available!"
+msgstr "�� ������ ��� ����� ���������!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "�������� ��������� ���������� ���������!"
+
 msgid "off"
 msgstr "�������"
 
@@ -27,14 +36,41 @@ msgstr "
 msgid "none"
 msgstr "������"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** ����� ������ ***"
+msgid "Polarization"
+msgstr "������"
 
-msgid "Channel not available!"
-msgstr "�� ������ ��� ����� ���������!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "�������� ��������� ���������� ���������!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "����������"
+
+msgid "CoderateH"
+msgstr "������ ������ H"
+
+msgid "CoderateL"
+msgstr "������ ������ L"
+
+msgid "Modulation"
+msgstr "����������"
+
+msgid "Bandwidth"
+msgstr "����� ����������"
+
+msgid "Transmission"
+msgstr "��������"
+
+msgid "Guard"
+msgstr "���������"
+
+msgid "Hierarchy"
+msgstr "���������"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "���� ������ EPG"
@@ -523,42 +559,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "������"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "����������"
-
-msgid "CoderateH"
-msgstr "������ ������ H"
-
-msgid "CoderateL"
-msgstr "������ ������ L"
-
-msgid "Modulation"
-msgstr "����������"
-
-msgid "Bandwidth"
-msgstr "����� ����������"
-
-msgid "Transmission"
-msgstr "��������"
-
-msgid "Guard"
-msgstr "���������"
-
-msgid "Hierarchy"
-msgstr "���������"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "�� ��������� ��� �������� ����������������!"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index d2bf5b000..f78c8cb64 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal no v�lido ***"
+
+msgid "Channel not available!"
+msgstr "!Canal no disponible!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "�No se puede iniciar el modo de transferencia!"
+
 msgid "off"
 msgstr "off"
 
@@ -28,14 +37,41 @@ msgstr "auto"
 msgid "none"
 msgstr "ninguno"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Canal no v�lido ***"
+msgid "Polarization"
+msgstr "Polarizaci�n"
 
-msgid "Channel not available!"
-msgstr "!Canal no disponible!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "�No se puede iniciar el modo de transferencia!"
+msgid "Srate"
+msgstr "T.s�mbolos"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulaci�n"
+
+msgid "Bandwidth"
+msgstr "Ancho de banda"
+
+msgid "Transmission"
+msgstr "Transmisi�n"
+
+msgid "Guard"
+msgstr "Int.Guarda"
+
+msgid "Hierarchy"
+msgstr "Jerarqu�a"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
@@ -524,42 +560,6 @@ msgstr "Acceso condicional (CA)"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarizaci�n"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "T.s�mbolos"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulaci�n"
-
-msgid "Bandwidth"
-msgstr "Ancho de banda"
-
-msgid "Transmission"
-msgstr "Transmisi�n"
-
-msgid "Guard"
-msgstr "Int.Guarda"
-
-msgid "Hierarchy"
-msgstr "Jerarqu�a"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 97e2aeec0..047a2f72d 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Vigane kanal ***"
+
+msgid "Channel not available!"
+msgstr "Kanal ei ole k�ttesaadav!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "�lekandemooduse start nurjus!"
+
 msgid "off"
 msgstr "v�ljas"
 
@@ -27,14 +36,41 @@ msgstr "automaatne"
 msgid "none"
 msgstr "puudu"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Vigane kanal ***"
+msgid "Polarization"
+msgstr "Polarisatsioon"
 
-msgid "Channel not available!"
-msgstr "Kanal ei ole k�ttesaadav!"
+msgid "System"
+msgstr "S�steem"
 
-msgid "Can't start Transfer Mode!"
-msgstr "�lekandemooduse start nurjus!"
+msgid "Srate"
+msgstr "S�mbolikiirus"
+
+msgid "Inversion"
+msgstr "Inversioon"
+
+msgid "CoderateH"
+msgstr "VeaparandusH"
+
+msgid "CoderateL"
+msgstr "VeaparandusL"
+
+msgid "Modulation"
+msgstr "Modulatsioon"
+
+msgid "Bandwidth"
+msgstr "Ribalaius"
+
+msgid "Transmission"
+msgstr "Transmissioon"
+
+msgid "Guard"
+msgstr "Kaitseintervall"
+
+msgid "Hierarchy"
+msgstr "Hierarhia"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine k�ivitatud"
@@ -523,42 +559,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisatsioon"
-
-msgid "System"
-msgstr "S�steem"
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversioon"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulatsioon"
-
-msgid "Bandwidth"
-msgstr "Ribalaius"
-
-msgid "Transmission"
-msgstr "Transmissioon"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarhia"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
 
@@ -584,29 +584,29 @@ msgid "Delete channel?"
 msgstr "Kustutada kanal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Kausta muutmine"
 
 msgid "New folder"
-msgstr ""
+msgstr "Uus kaust"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Uus alamkaust"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Sellenimeline kaust juba olemas!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Kausta nimi ei saa sisaldada '%c' s�mbolit!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Vali"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Kustutada kaust ja k�ik alamkaustad?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Kustutada kaust?"
 
 msgid "Edit timer"
 msgstr "Taimeri redigeerimine"
@@ -639,13 +639,13 @@ msgid "File"
 msgstr "Fail"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Kaust"
 
 msgid "First day"
 msgstr "Esimene p�ev"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Kausta valik"
 
 msgid "Timers"
 msgstr "Taimer"
@@ -765,10 +765,10 @@ msgid "Setup.OSD$Theme"
 msgstr "Teema"
 
 msgid "Setup.OSD$Left (%)"
-msgstr "Vasakule (%)"
+msgstr "Nihe paremale (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr "�lesse (%)"
+msgstr "Nihe alla (%)"
 
 msgid "Setup.OSD$Width (%)"
 msgstr "Laius (%)"
@@ -825,7 +825,7 @@ msgid "Setup.OSD$Scroll pages"
 msgstr "Lehek�lje kerimine"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Ridade kerimine"
+msgstr "Ridade ringkerimine"
 
 msgid "Setup.OSD$Menu key closes"
 msgstr "Sulgemine Men�� klahviga"
@@ -1076,7 +1076,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus k�ivitamisel"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Kanalite ringkerimine"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "H�dav�ljumine"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 916b51e40..49af1561c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -18,6 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Virheellinen kanavavalinta ***"
+
+msgid "Channel not available!"
+msgstr "Kanava ei ole k�ytett�viss�!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Siirtotilan aloitus ep�onnistui!"
+
 msgid "off"
 msgstr "poissa"
 
@@ -30,14 +39,41 @@ msgstr "auto"
 msgid "none"
 msgstr "tyhj�"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Virheellinen kanavavalinta ***"
+msgid "Polarization"
+msgstr "Polarisaatio"
 
-msgid "Channel not available!"
-msgstr "Kanava ei ole k�ytett�viss�!"
+msgid "System"
+msgstr "Systeemi"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Siirtotilan aloitus ep�onnistui!"
+msgid "Srate"
+msgstr "Symbolinopeus"
+
+msgid "Inversion"
+msgstr "Inversio"
+
+msgid "CoderateH"
+msgstr "Suojaustaso (HP)"
+
+msgid "CoderateL"
+msgstr "Suojaustaso (LP)"
+
+msgid "Modulation"
+msgstr "Modulaatio"
+
+msgid "Bandwidth"
+msgstr "Kaistanleveys"
+
+msgid "Transmission"
+msgstr "Transmissio"
+
+msgid "Guard"
+msgstr "Suojav�li"
+
+msgid "Hierarchy"
+msgstr "Hierarkia"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan p�ivitys aloitettu"
@@ -281,7 +317,7 @@ msgstr "Suoral
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "K-%d"
 
 msgid "No title"
 msgstr "Ei esityst�"
@@ -526,42 +562,6 @@ msgstr "Salaus (CA)"
 msgid "Sid"
 msgstr "Palvelu-ID"
 
-msgid "Polarization"
-msgstr "Polarisaatio"
-
-msgid "System"
-msgstr "Systeemi"
-
-msgid "Srate"
-msgstr "Symbolinopeus"
-
-msgid "Inversion"
-msgstr "Inversio"
-
-msgid "CoderateH"
-msgstr "Suojaustaso (HP)"
-
-msgid "CoderateL"
-msgstr "Suojaustaso (LP)"
-
-msgid "Modulation"
-msgstr "Modulaatio"
-
-msgid "Bandwidth"
-msgstr "Kaistanleveys"
-
-msgid "Transmission"
-msgstr "Transmissio"
-
-msgid "Guard"
-msgstr "Suojav�li"
-
-msgid "Hierarchy"
-msgstr "Hierarkia"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
 
@@ -587,29 +587,29 @@ msgid "Delete channel?"
 msgstr "Poistetaanko kanava?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Muokkaa kansiota"
 
 msgid "New folder"
-msgstr ""
+msgstr "Uusi kansio"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Alikansio"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Kansio on jo olemassa!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Kansion nimess� ei saa olla '%c'-merkki�!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Valitse"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Poistetaanko kansio alikansioineen?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Poistetaanko kansio?"
 
 msgid "Edit timer"
 msgstr "Muokkaa ajastinta"
@@ -642,13 +642,13 @@ msgid "File"
 msgstr "Tiedosto"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Kansio"
 
 msgid "First day"
 msgstr "1. p�iv�"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Valitse kansio"
 
 msgid "Timers"
 msgstr "Ajastimet"
@@ -1079,7 +1079,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��nenvoimakkuus k�ynnistett�ess�"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Kanavien rullaus"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "K�yt� h�t�sammutusta"
@@ -1203,10 +1203,10 @@ msgid "Low disk space!"
 msgstr "Tallennustila loppumassa!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Luodaan indeksitiedosto uudelleen"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Indeksitiedosto valmistui"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 4c4dcce05..7b23a5eb2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -21,6 +21,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Cha�ne invalide ! ***"
+
+msgid "Channel not available!"
+msgstr "Cha�ne non disponible !"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Impossible d'utiliser le mode transfert !"
+
 msgid "off"
 msgstr "off"
 
@@ -33,14 +42,41 @@ msgstr "auto"
 msgid "none"
 msgstr "aucun"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Cha�ne invalide ! ***"
+msgid "Polarization"
+msgstr "Polarisation"
 
-msgid "Channel not available!"
-msgstr "Cha�ne non disponible !"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Impossible d'utiliser le mode transfert !"
+msgid "Srate"
+msgstr "Fr�q. symbole"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulation"
+
+msgid "Bandwidth"
+msgstr "Bande passante"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid "Guard"
+msgstr "Intervalle de garde"
+
+msgid "Hierarchy"
+msgstr "Hi�rarchie"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Mise � jour du guide des programmes"
@@ -529,42 +565,6 @@ msgstr "Acc
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisation"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Fr�q. symbole"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulation"
-
-msgid "Bandwidth"
-msgstr "Bande passante"
-
-msgid "Transmission"
-msgstr "Transmission"
-
-msgid "Guard"
-msgstr "Intervalle de garde"
-
-msgid "Hierarchy"
-msgstr "Hi�rarchie"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Caract�ristiques des cha�nes non uniques"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index b7cf5a0f2..56b1bd8d0 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -17,6 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Neispravan Program ***"
+
+msgid "Channel not available!"
+msgstr "Program nije dostupan!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nemogu�e zapo�eti Prijenos!!"
+
 msgid "off"
 msgstr "isklju�i"
 
@@ -29,14 +38,41 @@ msgstr "automatski"
 msgid "none"
 msgstr "ni�ta"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Neispravan Program ***"
+msgid "Polarization"
+msgstr "Polarizacija"
 
-msgid "Channel not available!"
-msgstr "Program nije dostupan!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Nemogu�e zapo�eti Prijenos!!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inverzija"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulacija"
+
+msgid "Bandwidth"
+msgstr "Propusnost"
+
+msgid "Transmission"
+msgstr "Prijenos"
+
+msgid "Guard"
+msgstr "Za�tita"
+
+msgid "Hierarchy"
+msgstr "Hijerarhija"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Po�injem EPG pretragu"
@@ -525,42 +561,6 @@ msgstr "Kodiranje (CA)"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarizacija"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inverzija"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulacija"
-
-msgid "Bandwidth"
-msgstr "Propusnost"
-
-msgid "Transmission"
-msgstr "Prijenos"
-
-msgid "Guard"
-msgstr "Za�tita"
-
-msgid "Hierarchy"
-msgstr "Hijerarhija"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Postavke programa nisu jedinstvene!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index d09c8dd44..212d2fe97 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -18,6 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** �rv�nytelen csatorna ***"
+
+msgid "Channel not available!"
+msgstr "Az ad� nem el�rhet�"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Transfer-Mode nem ind�that�!"
+
 msgid "off"
 msgstr "ki"
 
@@ -30,14 +39,41 @@ msgstr "auto"
 msgid "none"
 msgstr "semmi"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** �rv�nytelen csatorna ***"
+msgid "Polarization"
+msgstr "Polariz�ci�"
 
-msgid "Channel not available!"
-msgstr "Az ad� nem el�rhet�"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Transfer-Mode nem ind�that�!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modul�ci�"
+
+msgid "Bandwidth"
+msgstr "S�vsz�less�g"
+
+msgid "Transmission"
+msgstr "�tvitel"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarhia"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "EPG adatok aktualiz�l�sa"
@@ -526,42 +562,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polariz�ci�"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modul�ci�"
-
-msgid "Bandwidth"
-msgstr "S�vsz�less�g"
-
-msgid "Transmission"
-msgstr "�tvitel"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarhia"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 3a8f2e221..ba7c57ce2 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
-"PO-Revision-Date: 2010-01-12 23:53+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"PO-Revision-Date: 2010-01-31 23:06+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +22,15 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Canale NON valido ***"
+
+msgid "Channel not available!"
+msgstr "Canale non disponibile!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Impossibile avviare mod. trasferimento!"
+
 msgid "off"
 msgstr "off"
 
@@ -34,14 +43,41 @@ msgstr "automatico"
 msgid "none"
 msgstr "nessuno"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Canale NON valido ***"
+msgid "Polarization"
+msgstr "Polarizzazione"
 
-msgid "Channel not available!"
-msgstr "Canale non disponibile!"
+msgid "System"
+msgstr "Sistema"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Impossibile avviare mod. trasferimento!"
+msgid "Srate"
+msgstr "SymbolRate"
+
+msgid "Inversion"
+msgstr "Inversione"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulazione"
+
+msgid "Bandwidth"
+msgstr "Banda passante"
+
+msgid "Transmission"
+msgstr "Trasmissione"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Gerarchia"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -530,42 +566,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarizzazione"
-
-msgid "System"
-msgstr "Sistema"
-
-msgid "Srate"
-msgstr "SymbolRate"
-
-msgid "Inversion"
-msgstr "Inversione"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulazione"
-
-msgid "Bandwidth"
-msgstr "Banda passante"
-
-msgid "Transmission"
-msgstr "Trasmissione"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Gerarchia"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
 
@@ -591,29 +591,29 @@ msgid "Delete channel?"
 msgstr "Eliminare il canale?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Modifica cartella"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nuova cartella"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Sotto cartella"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Nome cartella già esistente!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Il nome cartella non deve contenere '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Seleziona"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Eliminare la cartella e sue sottocartelle?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Eliminare la cartella?"
 
 msgid "Edit timer"
 msgstr "Modifica timer"
@@ -646,13 +646,13 @@ msgid "File"
 msgstr "Nome"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Cartella"
 
 msgid "First day"
 msgstr "1° giorno"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Seleziona cartella"
 
 msgid "Timers"
 msgstr "Timer"
@@ -1083,7 +1083,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Riavvolgimento canali"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Uscita di emergenza"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 93583c57c..acf230979 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,25 +1,34 @@
 # VDR language source file.
 # Copyright (C) 2009 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Valdemaras Pipiras <varas@ambernet.lt>, 2009.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.9\n"
+"Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2010-01-17 16:18+0100\n"
-"PO-Revision-Date: 2009-10-17 14:19+0200\n"
+"PO-Revision-Date: 2010-02-22 18:05+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Klaidingas kanalas ***"
+
+msgid "Channel not available!"
+msgstr "Kanalas neegzistuoja!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Negali pradėti perdavimo"
+
 msgid "off"
-msgstr "įjungt"
+msgstr "įjungti"
 
 msgid "on"
-msgstr "išjungt"
+msgstr "išjungti"
 
 msgid "auto"
 msgstr "auto"
@@ -27,258 +36,285 @@ msgstr "auto"
 msgid "none"
 msgstr "nėra"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Klaidingas kanalas ***"
+msgid "Polarization"
+msgstr "Poliarizacija"
 
-msgid "Channel not available!"
-msgstr "Kanalas neegzistuoja!"
+msgid "System"
+msgstr "Sistema"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Negali pradėti perdavimo"
+msgid "Srate"
+msgstr "Perdavimo greitis (Symbol rate)"
+
+msgid "Inversion"
+msgstr "Inversija"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Moduliacija"
+
+msgid "Bandwidth"
+msgstr "Pralaidumas"
+
+msgid "Transmission"
+msgstr "Perdavimas"
+
+msgid "Guard"
+msgstr "Apsauga"
+
+msgid "Hierarchy"
+msgstr "Hierarchija"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detektyvas/Trileris"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Nuotykinis/Vesternas"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Mokslinė fantastika/Fentezi/Siaubo"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Komedija"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Muilo opera/Melodrama/Tautinio pobūdžio"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romantika"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Rimta/Klasika/Religija/Istorinis/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Filas suaugusiems"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Naujienos"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Naujenos/Orų prognozė"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Naujienų žurnalas"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokumentika"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Diskusijos/Interviu"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Laidos/Žaidimai"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Žaidimų laidos/Konkursas"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Įv. laida"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Pokalbių laida"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sportas"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Specialus įvykis"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Sporto žurnalas"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Futbolas"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenisas/Skvošas"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Komandinis sportas"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Lengvoji atletika"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Auto sportas"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Vandens sportas"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Žiemos sportas"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Jojimas"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Karo žaidimai"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Vaikams/paaugliams skirta programa"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Ikimokyklininkams skirta programa"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Pramogos vaikams nuo 6 iki 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Pramogos vaikams nuo 10 iki 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informacinė/Mokomoji programa"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Animacija"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Muzika/Baletas/Šokis"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Klasikinė muzika"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/Tradizinė muzika"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Džazas"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Muziklas/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Baletas"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Menas/Kultūra"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Vaizduojamasis menas"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Dailė"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religija"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Populiarioji kultūra/Tradiciniai menai"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatūra"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Filmas/Kinas"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Ekspermentinis filmas"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Transliavimas"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Naujoji media"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Menai/Kultūros žurnalas"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Mada"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Socialinis/Politinis/Ekonominis"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Žurnalas/Reportažas/Dokumentika"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomika/Socialinė patariamoji programa"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Puikūs žmonės"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Išsilavinimas/Mokslas"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Gamta/Gyvūvai/Aplinka"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technologijos/Gamtos mokslai"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Psichologija/Filosofija"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Užsienio šalys/Ekspedicijos"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Socialiniai/Dvasiniai mokslai"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Platesnis išsilavinimas"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Kalbos"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Poilsis/Hobis"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turizmas/Kelionės"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Amatai"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Autosportas"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitnesas ir sveikata"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Maiso ruošimas"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reklama/Prekyba"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Sodininkystė"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Orginali kalba"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Juoda ir balta"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Nepublikuota"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Tiesioginė transliacija"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "nuo %d"
 
 msgid "No title"
 msgstr "Be pavadinimo"
@@ -523,42 +559,6 @@ msgstr "CA (dekodavimo sistema)"
 msgid "Sid"
 msgstr "Serviso id"
 
-msgid "Polarization"
-msgstr "Poliarizacija"
-
-msgid "System"
-msgstr "Sistema"
-
-msgid "Srate"
-msgstr "Perdavimo greitis (Symbol rate)"
-
-msgid "Inversion"
-msgstr "Inversija"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Moduliacija"
-
-msgid "Bandwidth"
-msgstr "Pralaidumas"
-
-msgid "Transmission"
-msgstr "Perdavimas"
-
-msgid "Guard"
-msgstr "Apsauga"
-
-msgid "Hierarchy"
-msgstr "Hierarchija"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "Kanalų nustatymai neunikalūs!"
 
@@ -584,29 +584,29 @@ msgid "Delete channel?"
 msgstr "Ištrinti kanalą?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Koreguoti katalogą"
 
 msgid "New folder"
-msgstr ""
+msgstr "Naujas katalogas"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Pakatalogis"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Toks katalogo vardas jau egzistuoja!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Katalogo pavadinimas turi būti sudarytas iš '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Pasirinkti"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Ištrinti katalogą ir jo visus pakatalogius?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Ištrinti katalogą?"
 
 msgid "Edit timer"
 msgstr "Koreguoti laikmatį"
@@ -639,13 +639,13 @@ msgid "File"
 msgstr "Failas"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Katalogas"
 
 msgid "First day"
 msgstr "Pirma diena"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Pasirinkite katalogą"
 
 msgid "Timers"
 msgstr "Laikmačiai"
@@ -1076,7 +1076,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Garsas įjungimo metu"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Kanalų pridengimas"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Avarinis išėjimas"
@@ -1200,10 +1200,10 @@ msgid "Low disk space!"
 msgstr "Mažai vietos diske!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Pergeneruojamas index failas"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Index failo pergeneravimas baigtas"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sistemos negalima išjungti, nes starto metu nebuvo komandinėj eilutėj paduota savybė '-s'!"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index fdfaf8d12..1e1d3820f 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -19,6 +19,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Ongeldig kanaal ***"
+
+msgid "Channel not available!"
+msgstr "Kanaal niet beschikbaar"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Kan Transfer-Mode niet starten"
+
 msgid "off"
 msgstr "uit"
 
@@ -31,14 +40,41 @@ msgstr "auto"
 msgid "none"
 msgstr "geen"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Ongeldig kanaal ***"
+msgid "Polarization"
+msgstr "Polarisatie"
 
-msgid "Channel not available!"
-msgstr "Kanaal niet beschikbaar"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Kan Transfer-Mode niet starten"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulatie"
+
+msgid "Bandwidth"
+msgstr "Bandbreedte"
+
+msgid "Transmission"
+msgstr "Transmissie"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarchie"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
@@ -527,42 +563,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisatie"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulatie"
-
-msgid "Bandwidth"
-msgstr "Bandbreedte"
-
-msgid "Transmission"
-msgstr "Transmissie"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarchie"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 1f50117f6..11668c75b 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Ugyldig Kanal! ***"
+
+msgid "Channel not available!"
+msgstr ""
+
+msgid "Can't start Transfer Mode!"
+msgstr "Kan ikke starte transfer modus!"
+
 msgid "off"
 msgstr ""
 
@@ -28,14 +37,41 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Ugyldig Kanal! ***"
+msgid "Polarization"
+msgstr "Polarisasjon"
 
-msgid "Channel not available!"
+msgid "System"
 msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Kan ikke starte transfer modus!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulation"
+
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr ""
@@ -524,42 +560,6 @@ msgstr "Kortleser"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisasjon"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulation"
-
-msgid "Bandwidth"
-msgstr "Bandwidth"
-
-msgid "Transmission"
-msgstr "Transmission"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarchy"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 038d058af..d1944cb48 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Niepoprawny kana� ***"
+
+msgid "Channel not available!"
+msgstr "Kana� nie jest dost�pny!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nie mo�na uruchomi� trybu transferu!"
+
 msgid "off"
 msgstr "wy��cz"
 
@@ -28,14 +37,41 @@ msgstr "auto"
 msgid "none"
 msgstr "brak"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Niepoprawny kana� ***"
+msgid "Polarization"
+msgstr "Polaryzacja"
 
-msgid "Channel not available!"
-msgstr "Kana� nie jest dost�pny!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Nie mo�na uruchomi� trybu transferu!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inwersja"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulacja"
+
+msgid "Bandwidth"
+msgstr "Pasmo"
+
+msgid "Transmission"
+msgstr "Transmisja"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
@@ -524,42 +560,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polaryzacja"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inwersja"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulacja"
-
-msgid "Bandwidth"
-msgstr "Pasmo"
-
-msgid "Transmission"
-msgstr "Transmisja"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarchia"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e409581c7..99d81687c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal inv�lido ***"
+
+msgid "Channel not available!"
+msgstr "Canal indisponivel!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Imposs�vel iniciar modo de transfer�ncia!"
+
 msgid "off"
 msgstr "off"
 
@@ -27,14 +36,41 @@ msgstr "Autom
 msgid "none"
 msgstr "nenhum"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Canal inv�lido ***"
+msgid "Polarization"
+msgstr "Polariza��o"
 
-msgid "Channel not available!"
-msgstr "Canal indisponivel!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Imposs�vel iniciar modo de transfer�ncia!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Invers�o"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modula��o"
+
+msgid "Bandwidth"
+msgstr "Bandwidth"
+
+msgid "Transmission"
+msgstr "Transmiss�o"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarquia"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Iniciar a procura de EPG"
@@ -523,42 +559,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polariza��o"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Invers�o"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modula��o"
-
-msgid "Bandwidth"
-msgstr "Bandwidth"
-
-msgid "Transmission"
-msgstr "Transmiss�o"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarquia"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Propriedades do canal n�o s�o �nicas!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f52a7d8ba..31e6b1760 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
-# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
-"PO-Revision-Date: 2008-02-25 00:39+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"PO-Revision-Date: 2010-02-11 13:38+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,20 @@ msgstr ""
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Canal invalid ***"
+
+msgid "Channel not available!"
+msgstr "Canal indisponibil"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nu pot porni modul de transfer!"
+
 msgid "off"
-msgstr "inactiv"
+msgstr "oprit"
 
 msgid "on"
-msgstr ""
+msgstr "pornit"
 
 msgid "auto"
 msgstr "automat"
@@ -30,258 +39,285 @@ msgstr "automat"
 msgid "none"
 msgstr "niciuna(ul)"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Canal invalid ***"
+msgid "Polarization"
+msgstr "Polarizare"
 
-msgid "Channel not available!"
-msgstr "Canal indisponibil"
+msgid "System"
+msgstr "Sistem"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Nu pot porni modul de transfer!"
+msgid "Srate"
+msgstr "Rat� simboluri"
+
+msgid "Inversion"
+msgstr "Inversiune"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modula�ie"
+
+msgid "Bandwidth"
+msgstr "L�rgime de band�"
+
+msgid "Transmission"
+msgstr "Transmisie"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Ierarhie"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "Pornesc achizi�ia EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Dram�"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Poli�ist/Suspense"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Aventuri/Western/R�zboi"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Science-Fiction/Fantastic/Groaz�"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Comedie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Telenovel�/Melodram�/Folclor"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Film romantic"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Film serios/clasic/religios/istoric/Dram�"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Film pentru adul�i/Dram�"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "�tiri/Actualit��i"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "�tiri/Buletin meteorologic"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Magazin de �tiri"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documentar"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discu�ie/Interviu/Dezbatere"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Show/Jocuri"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Emisiune jocuri/quiz/concurs"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Variet��i"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk Show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Eveniment special"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Magazin sportiv"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Football/fotbal"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Sporturi de echip�"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletism"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Sport cu motor"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Sporturi acvatice"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Sporturi de iarn�"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Echita�ie"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Arte mar�iale"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Emisiune pentru copii/tineret"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Emisiune pentru copii pre�colari"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Divertisment pentru copii intre 6 - 16 ani"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Divertisment pentru copii intre 10 - 16 ani"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informa�ional/Educa�ional/Emisiune �coal�"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Desene animate/Teatru de p�pu�i"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Muzic�/Balet/Dans"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Muzic� clasic�/serioas�"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Muzic� folk/tradi�ional�"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Teatru muzical/Oper�/Operet�"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Art�/Cultur�"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Spectacole"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Belle arte"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religie"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Cultur� Pop/Arte tradi�ionale"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatur�"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Film experimental/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Radiodifuziune/Pres�"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Medii noi"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Art�/Magazin cultural"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Mod�"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Social/Politic/Economie"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazin/Reportaj/Documentar"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Economie/Consiliere social�"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Oameni remarcabili"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Educa�ie/�tiin��/Practic"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Natur�/Animale/Mediu"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tehnologie/�tiin�e naturale"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicin�/Fiziologie/Psihologie"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "��ri str�ine/Expedi�ii"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Social/�tiin�e spirituale"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Cursuri de aprofundare"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Limbi"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Timp liber/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turism/C�l�torie"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Me�te�ug"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motoare"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Mi�care & S�n�tate"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "G�tit"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Publicitate/Cump�r�turi"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Gr�din�rit"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Limba original�"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Alb-Negru"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Nepublicat"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Transmisie �n direct"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "de la %d ani"
 
 msgid "No title"
 msgstr "F�r� titlu"
@@ -526,42 +562,6 @@ msgstr "CA (Acces Condi
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarizare"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Rat� simboluri"
-
-msgid "Inversion"
-msgstr "Inversiune"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modula�ie"
-
-msgid "Bandwidth"
-msgstr "L�rgime de band�"
-
-msgid "Transmission"
-msgstr "Transmisie"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Ierarhie"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
 
@@ -587,29 +587,29 @@ msgid "Delete channel?"
 msgstr "�terg canalul?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Editeaz� directorul"
 
 msgid "New folder"
-msgstr ""
+msgstr "Director nou"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Sub-director"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Un director cu acela�i nume exist�!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Numele directorului nu poate s� con�in� '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Selecteaz�"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "�terg directorul �i toate sub-directoarele?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "�terg directorul?"
 
 msgid "Edit timer"
 msgstr "Modificare timer"
@@ -642,13 +642,13 @@ msgid "File"
 msgstr "Fi�ier"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Director"
 
 msgid "First day"
 msgstr "Prima zi"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Selecteaz� directorul"
 
 msgid "Timers"
 msgstr "Timer-e"
@@ -953,7 +953,7 @@ msgid "CAM reset"
 msgstr "Resetare CAM"
 
 msgid "CAM present"
-msgstr "CAM preyent"
+msgstr "CAM prezent"
 
 msgid "CAM ready"
 msgstr "CAM preg�tit"
@@ -980,13 +980,13 @@ msgid "Can't reset CAM!"
 msgstr "Nu pot reseta CAM"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "nu �nregistra emisiunea"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "confirm� �nregistrarea emisiunii"
 
 msgid "pause live video"
-msgstr ""
+msgstr "�nregistreaz� emisiunea"
 
 msgid "Recording"
 msgstr "�nregistrare"
@@ -1007,7 +1007,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Timp de p�strare predefinit (zile)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Func�ia tastei 'pauz�'"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritate pauz�"
@@ -1079,7 +1079,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Lista de canale �n bucl�"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Oprire de urgen��"
@@ -1203,10 +1203,10 @@ msgid "Low disk space!"
 msgstr "Spa�iul pe disc e foarte sc�zut!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Generez index"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Generarea indexului s-a incheiat"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nu pot �nchide - vezi op�iunea '-s'"
@@ -1280,7 +1280,7 @@ msgid "Upcoming recording!"
 msgstr "Urmeaz� o �nregistrare!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "�nregistrez emisiunea?"
 
 msgid "Recording started"
 msgstr "A �nceput �nregistrarea"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c6d6aca0f..0796c1949 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** ������������ ����� ***"
+
+msgid "Channel not available!"
+msgstr "����� ����������!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "���������� �������� ����� ��������!"
+
 msgid "off"
 msgstr "����"
 
@@ -28,14 +37,41 @@ msgstr "
 msgid "none"
 msgstr "������"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** ������������ ����� ***"
+msgid "Polarization"
+msgstr "�����������"
 
-msgid "Channel not available!"
-msgstr "����� ����������!"
+msgid "System"
+msgstr "�������"
 
-msgid "Can't start Transfer Mode!"
-msgstr "���������� �������� ����� ��������!"
+msgid "Srate"
+msgstr "����. ��������"
+
+msgid "Inversion"
+msgstr "��������"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "���������"
+
+msgid "Bandwidth"
+msgstr "��������"
+
+msgid "Transmission"
+msgstr "��������"
+
+msgid "Guard"
+msgstr "������"
+
+msgid "Hierarchy"
+msgstr "��������"
+
+msgid "Rolloff"
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
@@ -524,42 +560,6 @@ msgstr "CA (
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "�����������"
-
-msgid "System"
-msgstr "�������"
-
-msgid "Srate"
-msgstr "����. ��������"
-
-msgid "Inversion"
-msgstr "��������"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "���������"
-
-msgid "Bandwidth"
-msgstr "��������"
-
-msgid "Transmission"
-msgstr "��������"
-
-msgid "Guard"
-msgstr "������"
-
-msgid "Hierarchy"
-msgstr "��������"
-
-msgid "Rolloff"
-msgstr "Rolloff"
-
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index c66132ad9..f53c25132 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2009-09-30 12:50+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Neplatn� kan�l ***"
+
+msgid "Channel not available!"
+msgstr "Kan�l nie je dostupn�!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nem��e spusti� prenos!"
+
 msgid "off"
 msgstr "vypnut�"
 
@@ -28,14 +37,41 @@ msgstr "automaticky"
 msgid "none"
 msgstr "�iadny"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Neplatn� kan�l ***"
+msgid "Polarization"
+msgstr "Polariz�cia"
 
-msgid "Channel not available!"
-msgstr "Kan�l nie je dostupn�!"
+msgid "System"
+msgstr "syst�m"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Nem��e spusti� prenos!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modul�cia"
+
+msgid "Bandwidth"
+msgstr "��rka p�sma"
+
+msgid "Transmission"
+msgstr "Prenos"
+
+msgid "Guard"
+msgstr "Ochrana"
+
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Za��na preh�ad�va� EPG"
@@ -524,42 +560,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polariz�cia"
-
-msgid "System"
-msgstr "syst�m"
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modul�cia"
-
-msgid "Bandwidth"
-msgstr "��rka p�sma"
-
-msgid "Transmission"
-msgstr "Prenos"
-
-msgid "Guard"
-msgstr "Ochrana"
-
-msgid "Hierarchy"
-msgstr "Hierarchia"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Nastavenia kan�lu nie s� oby�ajn�!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 2c20440e3..88858e5ea 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -16,6 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Neznan kanal ***"
+
+msgid "Channel not available!"
+msgstr "Kanal ni razpolo�ljiv!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Ne morem za�eti s prenosnim na�inom!"
+
 msgid "off"
 msgstr "izklop"
 
@@ -28,14 +37,41 @@ msgstr "avtomatsko"
 msgid "none"
 msgstr "nobeden"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Neznan kanal ***"
+msgid "Polarization"
+msgstr "Polarizacija"
 
-msgid "Channel not available!"
-msgstr "Kanal ni razpolo�ljiv!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Ne morem za�eti s prenosnim na�inom!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inverzija"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulacija"
+
+msgid "Bandwidth"
+msgstr "Pasovna �irina"
+
+msgid "Transmission"
+msgstr "Prenos"
+
+msgid "Guard"
+msgstr "Za��ita"
+
+msgid "Hierarchy"
+msgstr "Hierarhija"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
@@ -524,42 +560,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarizacija"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inverzija"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulacija"
-
-msgid "Bandwidth"
-msgstr "Pasovna �irina"
-
-msgid "Transmission"
-msgstr "Prenos"
-
-msgid "Guard"
-msgstr "Za��ita"
-
-msgid "Hierarchy"
-msgstr "Hierarhija"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Nastavitve kanala niso edinstvene!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 4ac9a0f56..1c5821b5b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -18,6 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Felaktig kanal ***"
+
+msgid "Channel not available!"
+msgstr "Kanalen �r inte tillg�nglig!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Kan inte starta Transfer Mode!"
+
 msgid "off"
 msgstr "av"
 
@@ -30,14 +39,41 @@ msgstr "automatisk"
 msgid "none"
 msgstr "ingen"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Felaktig kanal ***"
+msgid "Polarization"
+msgstr "Polarisation"
 
-msgid "Channel not available!"
-msgstr "Kanalen �r inte tillg�nglig!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Kan inte starta Transfer Mode!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inversion"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulation"
+
+msgid "Bandwidth"
+msgstr "Bandbredd"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid "Guard"
+msgstr "Guard"
+
+msgid "Hierarchy"
+msgstr "Hierarchy"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG skanning"
@@ -526,42 +562,6 @@ msgstr "Kortl
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Polarisation"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "Inversion"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Modulation"
-
-msgid "Bandwidth"
-msgstr "Bandbredd"
-
-msgid "Transmission"
-msgstr "Transmission"
-
-msgid "Guard"
-msgstr "Guard"
-
-msgid "Hierarchy"
-msgstr "Hierarchy"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 02a96424e..763a6b64f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Ge�ersiz kanal ***"
+
+msgid "Channel not available!"
+msgstr "Kanal kullan�lam�yor!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Transfer modu ba�lat�lam�yor!"
+
 msgid "off"
 msgstr "kapal�"
 
@@ -27,14 +36,41 @@ msgstr "otomatik"
 msgid "none"
 msgstr "hi�"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Ge�ersiz kanal ***"
+msgid "Polarization"
+msgstr "Kutupla�ma"
 
-msgid "Channel not available!"
-msgstr "Kanal kullan�lam�yor!"
+msgid "System"
+msgstr ""
 
-msgid "Can't start Transfer Mode!"
-msgstr "Transfer modu ba�lat�lam�yor!"
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "�nversiyon"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Mod�lasyon"
+
+msgid "Bandwidth"
+msgstr "Bant geni�li�i"
+
+msgid "Transmission"
+msgstr "�letim"
+
+msgid "Guard"
+msgstr "Koruma"
+
+msgid "Hierarchy"
+msgstr "Hiyerar�i"
+
+msgid "Rolloff"
+msgstr ""
 
 msgid "Starting EPG scan"
 msgstr "EPG tarama ba�l�yor"
@@ -523,42 +559,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Kutupla�ma"
-
-msgid "System"
-msgstr ""
-
-msgid "Srate"
-msgstr "Srate"
-
-msgid "Inversion"
-msgstr "�nversiyon"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Mod�lasyon"
-
-msgid "Bandwidth"
-msgstr "Bant geni�li�i"
-
-msgid "Transmission"
-msgstr "�letim"
-
-msgid "Guard"
-msgstr "Koruma"
-
-msgid "Hierarchy"
-msgstr "Hiyerar�i"
-
-msgid "Rolloff"
-msgstr ""
-
 msgid "Channel settings are not unique!"
 msgstr "Kanal ayarlar� belli de��l!"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 7e3010c0c..2c080fe1a 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2009-05-31 13:17+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -15,6 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "*** Неправильний канал ***"
+
+msgid "Channel not available!"
+msgstr "Канал недоступний!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Неможливо включити режим пропуску!"
+
 msgid "off"
 msgstr "викл"
 
@@ -27,14 +36,41 @@ msgstr "авто"
 msgid "none"
 msgstr "нічого"
 
-msgid "*** Invalid Channel ***"
-msgstr "*** Неправильний канал ***"
+msgid "Polarization"
+msgstr "Поляризація"
 
-msgid "Channel not available!"
-msgstr "Канал недоступний!"
+msgid "System"
+msgstr "Система"
 
-msgid "Can't start Transfer Mode!"
-msgstr "Неможливо включити режим пропуску!"
+msgid "Srate"
+msgstr "Симв. швидкість"
+
+msgid "Inversion"
+msgstr "Інверсія"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Модуляція"
+
+msgid "Bandwidth"
+msgstr "Діапазон"
+
+msgid "Transmission"
+msgstr "Передача"
+
+msgid "Guard"
+msgstr "Захист"
+
+msgid "Hierarchy"
+msgstr "Ієрархія"
+
+msgid "Rolloff"
+msgstr "Крен"
 
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
@@ -523,42 +559,6 @@ msgstr "CA (декодер)"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "Поляризація"
-
-msgid "System"
-msgstr "Система"
-
-msgid "Srate"
-msgstr "Симв. швидкість"
-
-msgid "Inversion"
-msgstr "Інверсія"
-
-msgid "CoderateH"
-msgstr "CoderateH"
-
-msgid "CoderateL"
-msgstr "CoderateL"
-
-msgid "Modulation"
-msgstr "Модуляція"
-
-msgid "Bandwidth"
-msgstr "Діапазон"
-
-msgid "Transmission"
-msgstr "Передача"
-
-msgid "Guard"
-msgstr "Захист"
-
-msgid "Hierarchy"
-msgstr "Ієрархія"
-
-msgid "Rolloff"
-msgstr "Крен"
-
 msgid "Channel settings are not unique!"
 msgstr "Настройки каналу не єдині!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d12f71ea..30d109434 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-02-28 13:19+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -18,6 +18,15 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+msgid "*** Invalid Channel ***"
+msgstr "***无效的频道 ***"
+
+msgid "Channel not available!"
+msgstr "频道不可用!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "不能启动传送模式"
+
 msgid "off"
 msgstr "关"
 
@@ -30,14 +39,41 @@ msgstr "自动"
 msgid "none"
 msgstr "无"
 
-msgid "*** Invalid Channel ***"
-msgstr "***无效的频道 ***"
+msgid "Polarization"
+msgstr "极化方式"
 
-msgid "Channel not available!"
-msgstr "频道不可用!"
+msgid "System"
+msgstr "卫星系统"
 
-msgid "Can't start Transfer Mode!"
-msgstr "不能启动传送模式"
+msgid "Srate"
+msgstr "符号率"
+
+msgid "Inversion"
+msgstr "反向"
+
+msgid "CoderateH"
+msgstr "高符号频率"
+
+msgid "CoderateL"
+msgstr "论符号频率"
+
+msgid "Modulation"
+msgstr "调制"
+
+msgid "Bandwidth"
+msgstr "带宽"
+
+msgid "Transmission"
+msgstr "传送"
+
+msgid "Guard"
+msgstr "防护"
+
+msgid "Hierarchy"
+msgstr "层次"
+
+msgid "Rolloff"
+msgstr "越零率"
 
 msgid "Starting EPG scan"
 msgstr "开始节目单扫描"
@@ -526,42 +562,6 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
-msgid "Polarization"
-msgstr "极化方式"
-
-msgid "System"
-msgstr "卫星系统"
-
-msgid "Srate"
-msgstr "符号率"
-
-msgid "Inversion"
-msgstr "反向"
-
-msgid "CoderateH"
-msgstr "高符号频率"
-
-msgid "CoderateL"
-msgstr "论符号频率"
-
-msgid "Modulation"
-msgstr "调制"
-
-msgid "Bandwidth"
-msgstr "带宽"
-
-msgid "Transmission"
-msgstr "传送"
-
-msgid "Guard"
-msgstr "防护"
-
-msgid "Hierarchy"
-msgstr "层次"
-
-msgid "Rolloff"
-msgstr "越零率"
-
 msgid "Channel settings are not unique!"
 msgstr "频道设置不是唯一的！"
 
diff --git a/receiver.c b/receiver.c
index f922e9802..58dda78f6 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.2 2010/01/30 10:25:38 kls Exp $
+ * $Id: receiver.c 2.3 2010/02/28 14:25:32 kls Exp $
  */
 
 #include "receiver.h"
@@ -81,7 +81,7 @@ bool cReceiver::SetPids(const cChannel *Channel)
      return AddPid(Channel->Vpid()) &&
             (Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
             AddPids(Channel->Apids()) &&
-            (!Setup.UseDolbyDigital || AddPids(Channel->Dpids())) &&
+            AddPids(Channel->Dpids()) &&
             AddPids(Channel->Spids());
      }
 return true;
diff --git a/remux.c b/remux.c
index 070a06aed..2532c638b 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.41 2010/01/30 10:43:12 kls Exp $
+ * $Id: remux.c 2.42 2010/02/28 14:42:07 kls Exp $
  */
 
 #include "remux.h"
@@ -601,7 +601,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                             dpids[NumDpids] = dpid;
                             dtypes[NumDpids] = stream.getStreamType();
                             strn0cpy(dlangs[NumDpids], lang, sizeof(dlangs[NumDpids]));
-                            if (updatePrimaryDevice)
+                            if (updatePrimaryDevice && Setup.UseDolbyDigital)
                                cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
                             NumDpids++;
                             dpids[NumDpids]= 0;
diff --git a/runvdr.template b/runvdr.template
index 8eb21cf11..ebc2f04d0 100755
--- a/runvdr.template
+++ b/runvdr.template
@@ -20,7 +20,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 2.1 2010/01/17 12:39:27 kls Exp $
+# $Id: runvdr.template 2.1 2010/01/17 12:39:27 kls Exp $
 
 VDRPRG="./vdr"
 
diff --git a/skinclassic.c b/skinclassic.c
index 7b45b1bcd..385201074 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.3 2010/01/03 14:55:10 kls Exp $
+ * $Id: skinclassic.c 2.4 2010/02/13 13:44:48 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -13,7 +13,9 @@
 #include "osd.h"
 #include "themes.h"
 
-#define ScrollWidth  5
+#define ScrollWidth (Setup.FontOsdSize / 4)
+#define TextFrame   (Setup.FontOsdSize / 10)
+#define TextSpacing (Setup.FontOsdSize / 4)
 
 static cTheme Theme;
 
@@ -94,7 +96,7 @@ cSkinClassicDisplayChannel::cSkinClassicDisplayChannel(bool WithInfo)
   lineHeight = font->Height();
   message = false;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - Lines * lineHeight));
-  timeWidth = font->Width("00:00") + 4;
+  timeWidth = font->Width("00:00") + 2 * TextFrame;
   tArea Areas[] = { { 0, 0, cOsd::OsdWidth() - 1, Lines * lineHeight - 1, 8 } };
   if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
@@ -113,7 +115,7 @@ cSkinClassicDisplayChannel::~cSkinClassicDisplayChannel()
 void cSkinClassicDisplayChannel::SetChannel(const cChannel *Channel, int Number)
 {
   osd->DrawRectangle(0, 0, osd->Width() - 1, lineHeight - 1, Theme.Color(clrBackground));
-  osd->DrawText(2, 0, ChannelString(Channel, Number), Theme.Color(clrChannelName), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+  osd->DrawText(TextFrame, 0, ChannelString(Channel, Number), Theme.Color(clrChannelName), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
   lastDate = NULL;
 }
 
@@ -124,9 +126,9 @@ void cSkinClassicDisplayChannel::SetEvents(const cEvent *Present, const cEvent *
   for (int i = 0; i < 2; i++) {
       const cEvent *e = !i ? Present : Following;
       if (e) {
-         osd->DrawText(             2, (2 * i + 1) * lineHeight, e->GetTimeString(), Theme.Color(clrChannelEpgTimeFg), Theme.Color(clrChannelEpgTimeBg), cFont::GetFont(fontOsd));
-         osd->DrawText(timeWidth + 10, (2 * i + 1) * lineHeight, e->Title(), Theme.Color(clrChannelEpgTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
-         osd->DrawText(timeWidth + 10, (2 * i + 2) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml));
+         osd->DrawText(                  TextFrame, (2 * i + 1) * lineHeight, e->GetTimeString(), Theme.Color(clrChannelEpgTimeFg), Theme.Color(clrChannelEpgTimeBg), cFont::GetFont(fontOsd));
+         osd->DrawText(timeWidth + 2 * TextSpacing, (2 * i + 1) * lineHeight, e->Title(), Theme.Color(clrChannelEpgTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd));
+         osd->DrawText(timeWidth + 2 * TextSpacing, (2 * i + 2) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml));
          }
       }
 }
@@ -152,7 +154,7 @@ void cSkinClassicDisplayChannel::Flush(void)
      if (!*lastDate || strcmp(date, lastDate)) {
         const cFont *font = cFont::GetFont(fontSml);
         int w = font->Width(date);
-        osd->DrawText(osd->Width() - w - 2, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml), w);
+        osd->DrawText(osd->Width() - w - TextFrame, 0, date, Theme.Color(clrChannelDate), Theme.Color(clrBackground), cFont::GetFont(fontSml), w);
         lastDate = date;
         }
      }
@@ -196,7 +198,7 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
   lineHeight = font->Height();
   dateWidth = 0;
   x0 = 0;
-  x1 = x0 + 10;
+  x1 = x0 + 2 * TextSpacing;
   x3 = cOsd::OsdWidth();
   x2 = x3 - 2 * ScrollWidth;
   y0 = 0;
@@ -440,9 +442,9 @@ void cSkinClassicDisplayMenu::Flush(void)
   if (!*lastDate || strcmp(date, lastDate)) {
      const cFont *font = cFont::GetFont(fontOsd);
      int w = font->Width(date);
-     osd->DrawText(x3 - w - 2, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font, w);
+     osd->DrawText(x3 - w - TextFrame, y0, date, Theme.Color(clrMenuDate), Theme.Color(clrMenuTitleBg), font, w);
      lastDate = date;
-     dateWidth = max(w + 2, dateWidth);
+     dateWidth = max(w + TextFrame, dateWidth);
      }
   osd->Flush();
 }
@@ -638,7 +640,7 @@ cSkinClassicDisplayTracks::cSkinClassicDisplayTracks(const char *Title, int NumT
   int ItemsWidth = font->Width(Title);
   for (int i = 0; i < NumTracks; i++)
       ItemsWidth = max(ItemsWidth, font->Width(Tracks[i]));
-  ItemsWidth += 10;
+  ItemsWidth += 2 * TextSpacing;
   x0 = 0;
   x1 = cOsd::OsdWidth();
   int d = x1 - x0;
diff --git a/skinsttng.c b/skinsttng.c
index 555109175..b37a2e9d7 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.4 2010/01/03 14:51:35 kls Exp $
+ * $Id: skinsttng.c 2.5 2010/02/13 13:30:59 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -49,9 +49,12 @@
 #include "symbols/teletext.xpm"
 #include "symbols/volume.xpm"
 
-#define Roundness   10
-#define Gap          5
-#define ScrollWidth  5
+#define Roundness     (Setup.FontOsdSize / 2)
+#define Gap           (Setup.FontOsdSize / 5)
+#define ScrollWidth   (Setup.FontOsdSize / 4)
+#define TextFrame     (Setup.FontOsdSize / 10)
+#define TextSpacing   (Setup.FontOsdSize / 4)
+#define SymbolSpacing (Setup.FontOsdSize / 4)
 
 static cTheme Theme;
 
@@ -161,7 +164,7 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
   message = false;
   if (withInfo) {
      x0 = 0;
-     x1 = x0 + font->Width("00:00") + 4;
+     x1 = x0 + font->Width("00:00") + 2 * TextFrame;
      x2 = x1 + Roundness;
      x3 = x2 + Gap;
      x7 = cOsd::OsdWidth();
@@ -240,28 +243,27 @@ cSkinSTTNGDisplayChannel::~cSkinSTTNGDisplayChannel()
 void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
 {
   osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
-  int x = x4 - 5;
+  int x = x4 - SymbolSpacing;
   if (Channel && !Channel->GroupSep()) {
-     int d = 3;
      bool rec = cRecordControls::Active();
-     x -= bmRecording.Width() + d;
+     x -= bmRecording.Width() + SymbolSpacing;
      osd->DrawBitmap(x, y0 + (y1 - y0 - bmRecording.Height()) / 2, bmRecording, Theme.Color(rec ? clrChannelSymbolRecFg : clrChannelSymbolOff), rec ? Theme.Color(clrChannelSymbolRecBg) : frameColor);
-     x -= bmEncrypted.Width() + d;
+     x -= bmEncrypted.Width() + SymbolSpacing;
      osd->DrawBitmap(x, y0 + (y1 - y0 - bmEncrypted.Height()) / 2, bmEncrypted, Theme.Color(Channel->Ca() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
-     x -= bmDolbyDigital.Width() + d;
+     x -= bmDolbyDigital.Width() + SymbolSpacing;
      osd->DrawBitmap(x, y0 + (y1 - y0 - bmDolbyDigital.Height()) / 2, bmDolbyDigital, Theme.Color(Channel->Dpid(0) ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
-     x -= bmAudio.Width() + d;
+     x -= bmAudio.Width() + SymbolSpacing;
      osd->DrawBitmap(x, y0 + (y1 - y0 - bmAudio.Height()) / 2, bmAudio, Theme.Color(Channel->Apid(1) ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
      if (Channel->Vpid()) {
-        x -= bmTeletext.Width() + d;
+        x -= bmTeletext.Width() + SymbolSpacing;
         osd->DrawBitmap(x, y0 + (y1 - y0 - bmTeletext.Height()) / 2, bmTeletext, Theme.Color(Channel->Tpid() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
         }
      else if (Channel->Apid(0)) {
-        x -= bmRadio.Width() + d;
+        x -= bmRadio.Width() + SymbolSpacing;
         osd->DrawBitmap(x, y0 + (y1 - y0 - bmRadio.Height()) / 2, bmRadio, Theme.Color(clrChannelSymbolOn), frameColor);
         }
      }
-  osd->DrawText(x3 + 2, y0, ChannelString(Channel, Number), Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontOsd), x - x3 - 2);
+  osd->DrawText(x3 + TextFrame, y0, ChannelString(Channel, Number), Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontOsd), x - x3 - TextFrame);
 }
 
 void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
@@ -276,9 +278,9 @@ void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fo
   for (int i = 0; i < 2; i++) {
       const cEvent *e = !i ? Present : Following;
       if (e) {
-         osd->DrawText(x0 + 2, y3 + 2 * i * lineHeight, e->GetTimeString(), Theme.Color(clrChannelEpgTime), frameColor, cFont::GetFont(fontOsd));
-         osd->DrawText(x3 + 2, y3 + 2 * i * lineHeight, e->Title(), Theme.Color(clrChannelEpgTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd), x4 - x3 - 2);
-         osd->DrawText(x3 + 2, y3 + (2 * i + 1) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), x4 - x3 - 2);
+         osd->DrawText(x0 + TextFrame, y3 + 2 * i * lineHeight, e->GetTimeString(), Theme.Color(clrChannelEpgTime), frameColor, cFont::GetFont(fontOsd));
+         osd->DrawText(x3 + TextFrame, y3 + 2 * i * lineHeight, e->Title(), Theme.Color(clrChannelEpgTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd), x4 - x3 - TextFrame);
+         osd->DrawText(x3 + TextFrame, y3 + (2 * i + 1) * lineHeight, e->ShortText(), Theme.Color(clrChannelEpgShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), x4 - x3 - TextFrame);
          }
       }
 }
@@ -309,13 +311,13 @@ void cSkinSTTNGDisplayChannel::Flush(void)
         cString date = DayDateTime();
         int w = font->Width(date);
         if (!*lastDate || strcmp(date, lastDate)) {
-           osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrChannelDate), frameColor, font, w);
+           osd->DrawText(x4 - w - TextFrame, y7 - font->Height(), date, Theme.Color(clrChannelDate), frameColor, font, w);
            lastDate = date;
            }
         cDevice *Device = cDevice::PrimaryDevice();
         const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
         if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
-           osd->DrawText(x3 + 2, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 4);
+           osd->DrawText(x3 + TextFrame, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 2 * TextFrame);
            strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
            }
         }
@@ -493,7 +495,7 @@ void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
   const cFont *font = cFont::GetFont(fontOsd);
   const char *VDR = " VDR";
   int w = font->Width(VDR);
-  osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - w - x3 - 5);
+  osd->DrawText(x3 + TextSpacing, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - w - x3 - TextSpacing);
   osd->DrawText(x4 - w, y0, VDR, frameColor, clrBlack, font, w, lineHeight);
 }
 
@@ -501,9 +503,9 @@ void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const
 {
   cString date = DayDateTime();
   const cFont *font = cFont::GetFont(fontSml);
-  int d = 10;
+  int d = 2 * Gap;
   int d2 = d / 2;
-  int t4 = x4 - font->Width(date) - 2;
+  int t4 = x4 - font->Width(date) - TextFrame;
   int w = t4 - x3;
   int t0 = x3 + d2;
   int t1 = x3 + w / 4;
@@ -558,13 +560,13 @@ void cSkinSTTNGDisplayMenu::SetItem(const char *Text, int Index, bool Current, b
   for (int i = 0; i < MaxTabs; i++) {
       const char *s = GetTabbedText(Text, i);
       if (s) {
-         int xt = x3 + 5 + Tab(i);
+         int xt = x3 + TextSpacing + Tab(i);
          osd->DrawText(xt, y, s, ColorFg, ColorBg, font, x4 - xt);
          }
       if (!Tab(i + 1))
          break;
       }
-  SetEditableWidth(x4 - x3 - 5 - Tab(1));
+  SetEditableWidth(x4 - x3 - TextSpacing - Tab(1));
 }
 
 void cSkinSTTNGDisplayMenu::SetScrollbar(int Total, int Offset)
@@ -577,7 +579,7 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
   if (!Event)
      return;
   const cFont *font = cFont::GetFont(fontOsd);
-  int xl = x3 + 5;
+  int xl = x3 + TextSpacing;
   int y = y3;
   cTextScroller ts;
   char t[32];
@@ -637,7 +639,7 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
      return;
   const cRecordingInfo *Info = Recording->Info();
   const cFont *font = cFont::GetFont(fontOsd);
-  int xl = x3 + 5;
+  int xl = x3 + TextSpacing;
   int y = y3;
   cTextScroller ts;
   char t[32];
@@ -710,7 +712,7 @@ void cSkinSTTNGDisplayMenu::Flush(void)
      if (!*lastDate || strcmp(date, lastDate)) {
         const cFont *font = cFont::GetFont(fontSml);
         int w = font->Width(date);
-        osd->DrawText(x4 - w - 2, y7 - font->Height(), date, Theme.Color(clrMenuDate), frameColor, font, w);
+        osd->DrawText(x4 - w - TextFrame, y7 - font->Height(), date, Theme.Color(clrMenuDate), frameColor, font, w);
         lastDate = date;
         }
      }
@@ -806,7 +808,7 @@ cSkinSTTNGDisplayReplay::~cSkinSTTNGDisplayReplay()
 
 void cSkinSTTNGDisplayReplay::SetTitle(const char *Title)
 {
-  osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrReplayTitle), frameColor, cFont::GetFont(fontSml), x4 - x3 - 5);
+  osd->DrawText(x3 + TextSpacing, y0, Title, Theme.Color(clrReplayTitle), frameColor, cFont::GetFont(fontSml), x4 - x3 - TextSpacing);
 }
 
 static const char *const *ReplaySymbols[2][2][5] = {
@@ -844,7 +846,7 @@ void cSkinSTTNGDisplayReplay::SetTotal(const char *Total)
 {
   const cFont *font = cFont::GetFont(fontSml);
   int w = font->Width(Total);
-  osd->DrawText(x4 - w - 5, y6, Total, Theme.Color(clrReplayTotal), frameColor, font, w);
+  osd->DrawText(x4 - w - TextSpacing, y6, Total, Theme.Color(clrReplayTotal), frameColor, font, w);
 }
 
 void cSkinSTTNGDisplayReplay::SetJump(const char *Jump)
@@ -924,10 +926,10 @@ cSkinSTTNGDisplayVolume::~cSkinSTTNGDisplayVolume()
 
 void cSkinSTTNGDisplayVolume::SetVolume(int Current, int Total, bool Mute)
 {
-  int xl = x3 + 5;
-  int xr = x4 - 5;
-  int yt = y0 + 3;
-  int yb = y1 - 3;
+  int xl = x3 + TextSpacing;
+  int xr = x4 - TextSpacing;
+  int yt = y0 + TextFrame;
+  int yb = y1 - TextFrame;
   if (mute != Mute) {
      osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
      mute = Mute;
@@ -935,9 +937,9 @@ void cSkinSTTNGDisplayVolume::SetVolume(int Current, int Total, bool Mute)
   cBitmap bm(Mute ? mute_xpm : volume_xpm);
   osd->DrawBitmap(xl, y0 + (y1 - y0 - bm.Height()) / 2, bm, Theme.Color(clrVolumeSymbol), frameColor);
   if (!Mute) {
-     xl += bm.Width() + 5;
+     xl += bm.Width() + TextSpacing;
      int w = (y1 - y0) / 3;
-     int d = 3;
+     int d = TextFrame;
      int n = (xr - xl + d) / (w + d);
      int x = xr - n * (w + d);
      tColor Color = Theme.Color(clrVolumeBarLower);
@@ -988,7 +990,7 @@ cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTrack
   int ItemsWidth = font->Width(Title);
   for (int i = 0; i < NumTracks; i++)
       ItemsWidth = max(ItemsWidth, font->Width(Tracks[i]));
-  ItemsWidth += 10;
+  ItemsWidth += 2 * TextSpacing;
   x0 = 0;
   x1 = lineHeight / 2;
   x3 = (x1 + Roundness + Gap + 7) & ~0x07; // must be multiple of 8
@@ -1052,7 +1054,7 @@ cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTrack
   osd->DrawRectangle(x3, y6, x4 - 1, y7 - 1, frameColor);
   osd->DrawRectangle(x5, y6, x6 - 1, y7 - 1, frameColor);
   osd->DrawEllipse  (x6, y6, x7 - 1, y7 - 1, frameColor, 5);
-  osd->DrawText(x3 + 5, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - x3 - 5);
+  osd->DrawText(x3 + TextSpacing, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - x3 - TextSpacing);
   for (int i = 0; i < NumTracks; i++)
       SetItem(Tracks[i], i, false);
 }
@@ -1084,7 +1086,7 @@ void cSkinSTTNGDisplayTracks::SetItem(const char *Text, int Index, bool Current)
         }
      }
   const cFont *font = cFont::GetFont(fontOsd);
-  int xt = x3 + 5;
+  int xt = x3 + TextSpacing;
   osd->DrawText(xt, y, Text, ColorFg, ColorBg, font, x4 - xt);
 }
 
@@ -1105,7 +1107,7 @@ void cSkinSTTNGDisplayTracks::SetAudioChannel(int AudioChannel)
     default: ;
     }
   if (bm)
-     osd->DrawBitmap(x3 + 5, y6 + (y7 - y6 - bm->Height()) / 2, *bm, Theme.Color(clrChannelSymbolOn), frameColor);
+     osd->DrawBitmap(x3 + TextSpacing, y6 + (y7 - y6 - bm->Height()) / 2, *bm, Theme.Color(clrChannelSymbolOn), frameColor);
   else
      osd->DrawRectangle(x3, y6, x4 - 1, y7 - 1, frameColor);
 }
diff --git a/sourceparams.c b/sourceparams.c
new file mode 100644
index 000000000..9a55540b5
--- /dev/null
+++ b/sourceparams.c
@@ -0,0 +1,43 @@
+/*
+ * sourceparams.c: Source parameter handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sourceparams.c 1.1 2010/02/28 12:15:49 kls Exp $
+ */
+
+#include "sourceparams.h"
+#include "sources.h"
+
+// --- cSourceParam ----------------------------------------------------------
+
+cSourceParam::cSourceParam(char Source, const char *Description)
+{
+  source = Source;
+  if ('A' <= source && source <= 'Z') {
+     if (SourceParams.Get(source)) {
+        esyslog("ERROR: source parameters for '%c' already defined", source);
+        return;
+        }
+     SourceParams.Add(this);
+     if (Source != 'C' && Source != 'S' && Source != 'T')
+        Sources.Add(new cSource(Source, Description));
+     dsyslog("registered source parameters for '%c - %s'", source, Description);
+     }
+  else
+     esyslog("ERROR: invalid source '%c'", source);
+}
+
+// --- cSourceParams ---------------------------------------------------------
+
+cSourceParams SourceParams;
+
+cSourceParam *cSourceParams::Get(char Source) const
+{
+  for (cSourceParam *sp = First(); sp; sp = Next(sp)) {
+      if (sp->Source() == Source)
+         return sp;
+      }
+  return NULL;
+}
diff --git a/sourceparams.h b/sourceparams.h
new file mode 100644
index 000000000..be04b5677
--- /dev/null
+++ b/sourceparams.h
@@ -0,0 +1,53 @@
+/*
+ * sourceparams.h: Source parameter handling
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: sourceparams.h 1.1 2010/02/28 11:58:03 kls Exp $
+ */
+
+#ifndef __SOURCEPARAMS_H
+#define __SOURCEPARAMS_H
+
+#include "channels.h"
+#include "osdbase.h"
+#include "tools.h"
+
+class cSourceParam : public cListObject {
+private:
+  char source;
+public:
+  cSourceParam(char Source, const char *Description);
+    ///< Sets up a parameter handler for the given Source.
+    ///< Source must be in the range 'A'...'Z', and there can only
+    ///< be one cSourceParam for any given source.
+    ///< Description contains a short, one line description of this source.
+    ///< If a plugin sets up a new cSourceParam, this will also trigger
+    ///< defining the appropriate cSource automatically.
+    ///< Objects of cSourceParam shall only be created on the heap, and
+    ///< shall never be deleted (they will be deleted automatically when
+    ///< the program ends).
+  char Source(void) const { return source; }
+  virtual void SetData(cChannel *Channel) = 0;
+    ///< Sets all source specific parameters to those of the given Channel.
+    ///< Must also reset a counter to use with later calls to GetOsdItem().
+  virtual void GetData(cChannel *Channel) = 0;
+    ///< Copies all source specific parameters to the given Channel.
+  virtual cOsdItem *GetOsdItem(void) = 0;
+    ///< Returns all the OSD items necessary for editing the source
+    ///< specific parameters of the channel that was given in the last
+    ///< call to SetData(). Each call to GetOsdItem() returns exactly
+    ///< one such item. After all items have been fetched, any further
+    ///< calls to GetOsdItem() return NULL. After another call to
+    ///< SetData(), the OSD items can be fetched again.
+  };
+
+class cSourceParams : public cList<cSourceParam> {
+public:
+  cSourceParam *Get(char Source) const;
+  };
+
+extern cSourceParams SourceParams;
+
+#endif //__SOURCEPARAMS_H
diff --git a/sources.c b/sources.c
index d3ec44e56..66d441d78 100644
--- a/sources.c
+++ b/sources.c
@@ -4,11 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 2.0 2008/02/10 14:07:26 kls Exp $
+ * $Id: sources.c 2.1 2010/02/28 12:00:31 kls Exp $
  */
 
 #include "sources.h"
-#include <ctype.h>
 
 // --- cSource ---------------------------------------------------------------
 
@@ -18,6 +17,12 @@ cSource::cSource(void)
   description = NULL;
 }
 
+cSource::cSource(char Source, const char *Description)
+{
+  code = int(Source) << 24;
+  description = strdup(Description);
+}
+
 cSource::~cSource()
 {
   free(description);
@@ -36,58 +41,50 @@ cString cSource::ToString(int Code)
 {
   char buffer[16];
   char *q = buffer;
-  switch (Code & st_Mask) {
-    case stCable: *q++ = 'C'; break;
-    case stSat:   *q++ = 'S';
-                  {
-                    int pos = Code & ~st_Mask;
-                    q += snprintf(q, sizeof(buffer) - 2, "%u.%u", (pos & ~st_Neg) / 10, (pos & ~st_Neg) % 10); // can't simply use "%g" here since the silly 'locale' messes up the decimal point
-                    *q++ = (Code & st_Neg) ? 'E' : 'W';
-                  }
-                  break;
-    case stTerr:  *q++ = 'T'; break;
-    default:      *q++ = Code + '0'; // backward compatibility
-    }
+  *q++ = (Code & st_Mask) >> 24;
+  int n = (Code & st_Pos);
+  if (n > 0x00007FFF)
+     n |= 0xFFFF0000;
+  if (n) {
+     q += snprintf(q, sizeof(buffer) - 2, "%u.%u", abs(n) / 10, abs(n) % 10); // can't simply use "%g" here since the silly 'locale' messes up the decimal point
+     *q++ = (n < 0) ? 'E' : 'W';
+     }
   *q = 0;
   return buffer;
 }
 
 int cSource::FromString(const char *s)
 {
-  int type = stNone;
-  switch (toupper(*s)) {
-    case 'C': type = stCable; break;
-    case 'S': type = stSat;   break;
-    case 'T': type = stTerr;  break;
-    case '0' ... '9': type = *s - '0'; break; // backward compatibility
-    default: esyslog("ERROR: unknown source key '%c'", *s);
-             return stNone;
-    }
-  int code = type;
-  if (type == stSat) {
-     int pos = 0;
-     bool dot = false;
-     bool neg = false;
-     while (*++s) {
-           switch (toupper(*s)) {
-             case '0' ... '9': pos *= 10;
-                               pos += *s - '0';
-                               break;
-             case '.':         dot = true;
-                               break;
-             case 'E':         neg = true; // fall through to 'W'
-             case 'W':         if (!dot)
-                                  pos *= 10;
-                               break;
-             default: esyslog("ERROR: unknown source character '%c'", *s);
-                      return stNone;
-             }
-           }
-     if (neg)
-        pos |= st_Neg;
-     code |= pos;
+  if ('A' <= *s && *s <= 'Z') {
+     int code = int(*s) << 24;
+     if (code == stSat) {
+        int pos = 0;
+        bool dot = false;
+        bool neg = false;
+        while (*++s) {
+              switch (*s) {
+                case '0' ... '9': pos *= 10;
+                                  pos += *s - '0';
+                                  break;
+                case '.':         dot = true;
+                                  break;
+                case 'E':         neg = true; // fall through to 'W'
+                case 'W':         if (!dot)
+                                     pos *= 10;
+                                  break;
+                default: esyslog("ERROR: unknown source character '%c'", *s);
+                         return stNone;
+                }
+              }
+        if (neg)
+           pos = -pos;
+        code |= (pos & st_Pos);
+        }
+     return code;
      }
-  return code;
+  else
+    esyslog("ERROR: unknown source key '%c'", *s);
+  return stNone;
 }
 
 int cSource::FromData(eSourceType SourceType, int Position, bool East)
@@ -95,7 +92,7 @@ int cSource::FromData(eSourceType SourceType, int Position, bool East)
   int code = SourceType;
   if (SourceType == stSat) {
      if (East)
-        code |= st_Neg;
+        Position = -Position;
      code |= (Position & st_Pos);;
      }
   return code;
diff --git a/sources.conf b/sources.conf
index 90f4a1c78..034edae84 100644
--- a/sources.conf
+++ b/sources.conf
@@ -21,7 +21,7 @@
 
 S3E     Telecom 2C
 S4E     Eurobird 4
-S5E     Sirius 4
+S4.8E   Sirius 4
 S7E     Eutelsat W3A
 S9E     Eurobird 9
 S10E    Eutelsat W1
@@ -190,8 +190,8 @@ S148W   Echostar 1/2
 
 # Cable
 
-C       Cable
+C       DVB-C
 
 # Terrestrial
 
-T       Terrestrial
+T       DVB-T
diff --git a/sources.h b/sources.h
index bf8a07d86..3d00d2cfd 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 2.0 2005/05/14 09:30:41 kls Exp $
+ * $Id: sources.h 2.1 2010/02/21 16:11:19 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -15,19 +15,19 @@
 class cSource : public cListObject {
 public:
   enum eSourceType {
-    stNone  = 0x0000,
-    stCable = 0x4000,
-    stSat   = 0x8000,
-    stTerr  = 0xC000,
-    st_Mask = 0xC000,
-    st_Neg  = 0x0800,
-    st_Pos  = 0x07FF,
+    stNone  = 0x00000000,
+    stCable = ('C' << 24),
+    stSat   = ('S' << 24),
+    stTerr  = ('T' << 24),
+    st_Mask = 0xFF000000,
+    st_Pos  = 0x0000FFFF,
     };
 private:
   int code;
   char *description;
 public:
   cSource(void);
+  cSource(char Source, const char *Description);
   ~cSource();
   int Code(void) const { return code; }
   const char *Description(void) const { return description; }
diff --git a/tools.c b/tools.c
index 39c17e2bc..c989e2671 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.6 2009/12/23 15:12:15 kls Exp $
+ * $Id: tools.c 2.7 2010/02/28 13:31:46 kls Exp $
  */
 
 #include "tools.h"
@@ -1423,6 +1423,8 @@ bool cSafeFile::Close(void)
         LOG_ERROR_STR(tempName);
         result = false;
         }
+     fflush(f);
+     fsync(fileno(f));
      if (fclose(f) < 0) {
         LOG_ERROR_STR(tempName);
         result = false;
diff --git a/vdr.5 b/vdr.5
index 4b2cb90b8..7f5cce2e3 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.13 2010/01/31 12:59:50 kls Exp $
+.\" $Id: vdr.5 2.15 2010/02/21 14:29:06 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -142,7 +142,7 @@ If in doubt, try 0 (off). (DVB-T only).
 \fBDelivery System:\fR The satellite delivery system (0 = DVB-S, 1 = DVB-S2).
 
 \fBPolarization:\fR Satellite antenna polarization.
-h = horizontal, v = vertical, r = circular right, l = circular left.
+H = horizontal, V = vertical, R = circular right, L = circular left.
 
 The polarization parameters have no integer numbers following them. This is for
 compatibility with files from older versions and also to keep the DVB-S entries
@@ -163,13 +163,13 @@ An example of a parameter field for a DVB-S channel might look like this:
 An example of a parameter field for a DVB-S2 channel might look like this:
 \fBhC910M2O35S1\fR
 
+Plugins that implement devices that need their own set of parameters may
+store those in the parameters string in arbitrary format (not necessarily
+the "character/number" format listed above). The only condition is that
+the string may not contain colons (':') or newline characters.
 .TP
 .B Source
 The signal source of this channel, as defined in the file \fIsources.conf\fR.
-For compatibility with files from older versions numeric values will be accepted
-and also written back correctly, but they will have no meaning for the \fBDiSEqC\fR
-settings. You should replace the numerical values with the proper source identifiers
-defined in \fIsources.conf\fR.
 .TP
 .B Srate
 The symbol rate of this channel (DVB-S and DVB-C only).
@@ -406,6 +406,7 @@ l l.
 \fBC\fR@Cable
 \fBT\fR@Terrestrial
 .TE
+
 and is followed by further data pertaining to that particular source. In case of
 \fBS\fRatellite this is the orbital position in degrees, followed by \fBE\fR for
 east or \fBW\fR for west.
@@ -452,6 +453,15 @@ l l.
 There can be any number of actions in a line, including none at all - in which case
 the entry would be used only to set the LOF to use for the given frequency range
 and polarization.
+
+By default it is assumed that every DVB-S device can receive every satellite.
+If this is not the case in a particular setup, lines of the form
+
+\fB1 2 4:\fR
+
+may be inserted in the \fIdiseqc.conf\fR file, defining the devices that are able
+to receive the satellites following thereafter. In this case, only the devices
+1, 2 and 4 would be able to receive any satellites following this line.
 .SS REMOTE CONTROL KEYS
 The file \fIremote.conf\fR contains the key assignments for all remote control
 units. Each line consists of one key assignment in the following format:
diff --git a/vdr.c b/vdr.c
index e07730155..e7abdcb94 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.16 2010/01/31 11:14:40 kls Exp $
+ * $Id: vdr.c 2.17 2010/02/21 14:08:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -58,6 +58,7 @@
 #include "shutdown.h"
 #include "skinclassic.h"
 #include "skinsttng.h"
+#include "sourceparams.h"
 #include "sources.h"
 #include "themes.h"
 #include "timers.h"
@@ -1303,6 +1304,7 @@ int main(int argc, char *argv[])
   Remotes.Clear();
   Audios.Clear();
   Skins.Clear();
+  SourceParams.Clear();
   if (ShutdownHandler.GetExitCode() != 2) {
      Setup.CurrentChannel = cDevice::CurrentChannel();
      Setup.CurrentVolume  = cDevice::CurrentVolume();

From 1eb12b4973033212b39a53249d8fb452e6914a8a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 14 Mar 2010 11:56:00 +0100
Subject: [PATCH 200/307] Version 1.7.14 - Fixed handling empty strings in
 cSource::FromString(). - Assigned the source character 'I' to "IPTV"
 (suggested by Rolf Ahrenberg). - Assigned the source character 'V' to "Analog
 Video" (suggested by Lars Hanisch).   This obsoletes the ANALOGTV patch. -
 Added support for ATSC devices (thanks to Alex Lasnier).   This obsoletes the
 ATSC patch. - The "Source" item in the "Edit channel" menu now wraps around
 the list of sources   (suggested by Halim Sahin). - Fixed editing channel
 parameters. - The new setup option "Recording/Delete timeshift recording"
 controls whether a timeshift   recording is automatically deleted after
 viewing it.   This obsoletes the DELTIMESHIFTREC patch.   Note that the
 meaning of the values for this option is different from the DELTIMESHIFTREC  
 patch: 0 means timeshift recordings are not automatically deleted (the
 default behavior   as in previous versions), while 1 means to ask the user
 whether the recording shall be   deleted. - Added cChannel::IsSourceType() to
 test if a channel's source is of a given type. - Changed the polarization
 characters in cDvbSourceParam::GetOsdItem() to uppercase. - The full timer
 file name is now displayed if it ends with "TITLE" or "EPISODE"   (pointed
 out by Udo Richter). - Fixed "attempt to drop wrong frame from ring buffer"
 when skipping +/- one minute   during replay. - The new setup option "Folders
 in timer menu" controls whether the file names in   the timer menu are shown
 with their full folder path.

---
 CONTRIBUTORS   | 11 +++++++
 HISTORY        | 29 +++++++++++++++++-
 MANUAL         | 12 ++++++++
 channels.h     |  4 ++-
 config.c       |  8 ++++-
 config.h       | 12 ++++----
 dvbdevice.c    | 72 +++++++++++++++++++++++++++------------------
 dvbplayer.c    | 16 +++++-----
 menu.c         | 80 +++++++++++++++++++++++++++++++++++++++++---------
 menu.h         |  5 ++--
 pat.c          | 25 +++++++++++++++-
 po/ca_ES.po    | 20 ++++++++++---
 po/cs_CZ.po    | 20 ++++++++++---
 po/da_DK.po    | 20 ++++++++++---
 po/de_DE.po    | 22 ++++++++++----
 po/el_GR.po    | 20 ++++++++++---
 po/es_ES.po    | 20 ++++++++++---
 po/et_EE.po    | 20 ++++++++++---
 po/fi_FI.po    | 20 ++++++++++---
 po/fr_FR.po    | 20 ++++++++++---
 po/hr_HR.po    | 20 ++++++++++---
 po/hu_HU.po    | 20 ++++++++++---
 po/it_IT.po    | 20 ++++++++++---
 po/lt_LT.po    | 20 ++++++++++---
 po/nl_NL.po    | 20 ++++++++++---
 po/nn_NO.po    | 20 ++++++++++---
 po/pl_PL.po    | 20 ++++++++++---
 po/pt_PT.po    | 20 ++++++++++---
 po/ro_RO.po    | 20 ++++++++++---
 po/ru_RU.po    | 20 ++++++++++---
 po/sk_SK.po    | 20 ++++++++++---
 po/sl_SI.po    | 20 ++++++++++---
 po/sv_SE.po    | 20 ++++++++++---
 po/tr_TR.po    | 20 ++++++++++---
 po/uk_UA.po    | 20 ++++++++++---
 po/zh_CN.po    | 20 ++++++++++---
 recording.c    |  5 +---
 recording.h    |  4 ++-
 sourceparams.c |  4 +--
 sources.c      | 58 ++++++++++++++++++------------------
 sources.conf   |  9 ++++++
 sources.h      |  5 +++-
 vdr.5          |  6 ++--
 43 files changed, 667 insertions(+), 200 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5b65c3af3..b8d33c30d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1092,6 +1092,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for a patch that was used to implement handling the "parental rating descriptor"
  suggesting to add plain text error messages to log entries from cOsd::SetAreas()
  for keeping subtitles visible when pausing replay
+ for suggesting to assign the source character 'I' to "IPTV"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1670,6 +1671,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting a problem with cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in
  case only part of the buffer has been accepted by the device
  for reporting missing defines for large files in the 'newplugin' script
+ for pointing out that the full timer file name should be displayed if it ends with
+ "TITLE" or "EPISODE"
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2388,6 +2391,8 @@ Halim Sahin <halim.sahin@t-online.de>
  works if the "EPG scan" is active
  for reporting a problem with adding new transponders in case there is only a single
  channel in the channel list
+ for suggesting to make the "Source" item in the "Edit channel" menu wrap around the
+ list of sources
 
 Denis Knauf <denis.knauf@gmail.com>
  for reporting a missing '-' at the next to last line of SVDRP help texts
@@ -2568,3 +2573,9 @@ Matti Lehtim
 
 Stephan Austerm�hle <au@hcsd.de>
  for suggesting to flush the file in cSafeFile::Close()
+
+Lars Hanisch <dvb@flensrocker.de>
+ for suggesting to assign the source character 'V' to "Analog Video"
+
+Alex Lasnier <alex@fepg.org>
+ for adding tuning support for ATSC devices
diff --git a/HISTORY b/HISTORY
index 94bddf120..4b909c35c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6317,7 +6317,7 @@ Video Disk Recorder Revision History
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Moved the declaration of cMenuCommands to menu.h, so that plugins can use it.
 - Added a note to the MANUAL, saying that adding new transponders only works if the
-  "EPG scan" is active (suggested by Halim Sahim).
+  "EPG scan" is active (suggested by Halim Sahin).
 - Improved handling frames at the beginning and end of a recording in cDvbPlayer for
   devices with large buffers (thanks to Reinhard Nissl).
 - Implemented cDeviceHook to allow plugins more control over which device can
@@ -6383,3 +6383,30 @@ Video Disk Recorder Revision History
 - The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital
   tracks appear in the "Audio" menu. Dolby Digital is always recorded.
   This obsoletes the DOLBYINREC patch.
+
+2010-03-12: Version 1.7.14
+
+- Fixed handling empty strings in cSource::FromString().
+- Assigned the source character 'I' to "IPTV" (suggested by Rolf Ahrenberg).
+- Assigned the source character 'V' to "Analog Video" (suggested by Lars Hanisch).
+  This obsoletes the ANALOGTV patch.
+- Added support for ATSC devices (thanks to Alex Lasnier).
+  This obsoletes the ATSC patch.
+- The "Source" item in the "Edit channel" menu now wraps around the list of sources
+  (suggested by Halim Sahin).
+- Fixed editing channel parameters.
+- The new setup option "Recording/Delete timeshift recording" controls whether a timeshift
+  recording is automatically deleted after viewing it.
+  This obsoletes the DELTIMESHIFTREC patch.
+  Note that the meaning of the values for this option is different from the DELTIMESHIFTREC
+  patch: 0 means timeshift recordings are not automatically deleted (the default behavior
+  as in previous versions), while 1 means to ask the user whether the recording shall be
+  deleted.
+- Added cChannel::IsSourceType() to test if a channel's source is of a given type.
+- Changed the polarization characters in cDvbSourceParam::GetOsdItem() to uppercase.
+- The full timer file name is now displayed if it ends with "TITLE" or "EPISODE"
+  (pointed out by Udo Richter).
+- Fixed "attempt to drop wrong frame from ring buffer" when skipping +/- one minute
+  during replay.
+- The new setup option "Folders in timer menu" controls whether the file names in
+  the timer menu are shown with their full folder path.
diff --git a/MANUAL b/MANUAL
index ff80f5533..3fd528f33 100644
--- a/MANUAL
+++ b/MANUAL
@@ -584,6 +584,10 @@ Version 1.6
                          Turns displaying the Recordings menu as a hierarchical
                          directory structure on or off.
 
+  Folders in timer menu = yes
+                         Controls whether the full folder path is shown in the
+                         "Timers" menu, or just the basic recording name.
+
   EPG:
 
   EPG scan timeout = 5   The time (in hours) of user inactivity after which the
@@ -824,6 +828,14 @@ Version 1.6
                          file (named 00001.ts, 00002.ts, ...) you can set this
                          option to 'yes'.
 
+  Delete timeshift recording = 0
+                         Controls whether a timeshift recording is deleted after
+                         viewing it.
+                         0 = no
+                         1 = confirm
+                         2 = yes
+                         The default is 0.
+
   Replay:
 
   Multi speed mode = no  Defines the function of the "Left" and "Right" keys in
diff --git a/channels.h b/channels.h
index 4ed135827..5c9727f18 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.8 2010/02/21 14:05:49 kls Exp $
+ * $Id: channels.h 2.10 2010/03/07 13:47:13 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -172,9 +172,11 @@ class cChannel : public cListObject {
   const char *Parameters(void) const { return parameters; }
   const cLinkChannels* LinkChannels(void) const { return linkChannels; }
   const cChannel *RefChannel(void) const { return refChannel; }
+  bool IsAtsc(void) const { return cSource::IsAtsc(source); }
   bool IsCable(void) const { return cSource::IsCable(source); }
   bool IsSat(void) const { return cSource::IsSat(source); }
   bool IsTerr(void) const { return cSource::IsTerr(source); }
+  bool IsSourceType(char Source) const { return cSource::IsType(source, Source); }
   tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
diff --git a/config.c b/config.c
index acdf4c4f5..aa18ebcf9 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.10 2010/01/31 12:36:36 kls Exp $
+ * $Id: config.c 2.12 2010/03/12 16:41:37 kls Exp $
  */
 
 #include "config.h"
@@ -354,6 +354,7 @@ cSetup::cSetup(void)
   UseVps = 0;
   VpsMargin = 120;
   RecordingDirs = 1;
+  FoldersInTimerMenu = 1;
   VideoDisplayFormat = 1;
   VideoFormat = 0;
   UpdateChannels = 5;
@@ -383,6 +384,7 @@ cSetup::cSetup(void)
   FontFixSize = 20;
   MaxVideoFileSize = MAXVIDEOFILESIZEDEFAULT;
   SplitEditedFiles = 0;
+  DelTimeshiftRec = 0;
   MinEventTimeout = 30;
   MinUserInactivity = 300;
   NextWakeupTime = 0;
@@ -542,6 +544,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UseVps"))              UseVps             = atoi(Value);
   else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
+  else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
   else if (!strcasecmp(Name, "VideoDisplayFormat"))  VideoDisplayFormat = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
@@ -571,6 +574,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "FontFixSize"))         FontFixSize        = atoi(Value);
   else if (!strcasecmp(Name, "MaxVideoFileSize"))    MaxVideoFileSize   = atoi(Value);
   else if (!strcasecmp(Name, "SplitEditedFiles"))    SplitEditedFiles   = atoi(Value);
+  else if (!strcasecmp(Name, "DelTimeshiftRec"))     DelTimeshiftRec    = atoi(Value);
   else if (!strcasecmp(Name, "MinEventTimeout"))     MinEventTimeout    = atoi(Value);
   else if (!strcasecmp(Name, "MinUserInactivity"))   MinUserInactivity  = atoi(Value);
   else if (!strcasecmp(Name, "NextWakeupTime"))      NextWakeupTime     = atoi(Value);
@@ -635,6 +639,7 @@ bool cSetup::Save(void)
   Store("UseVps",             UseVps);
   Store("VpsMargin",          VpsMargin);
   Store("RecordingDirs",      RecordingDirs);
+  Store("FoldersInTimerMenu", FoldersInTimerMenu);
   Store("VideoDisplayFormat", VideoDisplayFormat);
   Store("VideoFormat",        VideoFormat);
   Store("UpdateChannels",     UpdateChannels);
@@ -664,6 +669,7 @@ bool cSetup::Save(void)
   Store("FontFixSize",        FontFixSize);
   Store("MaxVideoFileSize",   MaxVideoFileSize);
   Store("SplitEditedFiles",   SplitEditedFiles);
+  Store("DelTimeshiftRec",    DelTimeshiftRec);
   Store("MinEventTimeout",    MinEventTimeout);
   Store("MinUserInactivity",  MinUserInactivity);
   Store("NextWakeupTime",     NextWakeupTime);
diff --git a/config.h b/config.h
index e4237f75e..f4996bb3a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.22 2010/02/05 15:38:32 kls Exp $
+ * $Id: config.h 2.25 2010/03/12 16:02:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.13"
-#define VDRVERSNUM   10713  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.14"
+#define VDRVERSNUM   10714  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.13"
-#define APIVERSNUM   10713  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.14"
+#define APIVERSNUM   10714  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -253,6 +253,7 @@ class cSetup : public cConfig<cSetupLine> {
   int UseVps;
   int VpsMargin;
   int RecordingDirs;
+  int FoldersInTimerMenu;
   int VideoDisplayFormat;
   int VideoFormat;
   int UpdateChannels;
@@ -276,6 +277,7 @@ class cSetup : public cConfig<cSetupLine> {
   int FontFixSize;
   int MaxVideoFileSize;
   int SplitEditedFiles;
+  int DelTimeshiftRec;
   int MinEventTimeout, MinUserInactivity;
   time_t NextWakeupTime;
   int MultiSpeedMode;
diff --git a/dvbdevice.c b/dvbdevice.c
index 73f5261c1..75e0ca845 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.29 2010/02/21 17:10:35 kls Exp $
+ * $Id: dvbdevice.c 2.32 2010/03/07 13:58:24 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -27,6 +27,8 @@
 #define DVBC_LOCK_TIMEOUT  2000 //ms
 #define DVBT_TUNE_TIMEOUT  9000 //ms
 #define DVBT_LOCK_TIMEOUT  2000 //ms
+#define ATSC_TUNE_TIMEOUT  9000 //ms
+#define ATSC_LOCK_TIMEOUT  2000 //ms
 
 // --- DVB Parameter Maps ----------------------------------------------------
 
@@ -184,17 +186,17 @@ cString cDvbTransponderParameters::ToString(char Type) const
   char buffer[64];
   char *q = buffer;
   *q = 0;
-  ST(" S ")  q += sprintf(q, "%c", polarization);
-  ST("  T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
-  ST("CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
-  ST("  T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
-  ST("  T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-  ST("CST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
-  ST("CST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
-  ST(" S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST(" S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
-  ST("  T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-  ST("  T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
+  ST("  S ")  q += sprintf(q, "%c", polarization);
+  ST("   T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
+  ST(" CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
+  ST("   T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
+  ST("   T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+  ST("ACST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("ACST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST("  S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
+  ST("  S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
+  ST("   T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+  ST("   T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
   return buffer;
 }
 
@@ -486,6 +488,16 @@ bool cDvbTuner::SetFrontend(void)
      tuneTimeout = DVBT_TUNE_TIMEOUT;
      lockTimeout = DVBT_LOCK_TIMEOUT;
      }
+  else if (frontendType == SYS_ATSC) {
+     // ATSC
+     SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
+     SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
+     SETCMD(DTV_INVERSION, dtp.Inversion());
+     SETCMD(DTV_MODULATION, dtp.Modulation());
+     
+     tuneTimeout = ATSC_TUNE_TIMEOUT;
+     lockTimeout = ATSC_LOCK_TIMEOUT;     
+     }
   else {
      esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
      return false;
@@ -564,7 +576,7 @@ void cDvbTuner::Action(void)
 class cDvbSourceParam : public cSourceParam {
 private:
   int param;
-  cChannel data;
+  int srate;
   cDvbTransponderParameters dtp;
 public:
   cDvbSourceParam(char Source, const char *Description);
@@ -577,19 +589,19 @@ cDvbSourceParam::cDvbSourceParam(char Source, const char *Description)
 :cSourceParam(Source, Description)
 {
   param = 0;
+  srate = 0;
 }
 
 void cDvbSourceParam::SetData(cChannel *Channel)
 {
-  data = *Channel;
-  dtp.Parse(data.Parameters());
+  srate = Channel->Srate();
+  dtp.Parse(Channel->Parameters());
   param = 0;
 }
 
 void cDvbSourceParam::GetData(cChannel *Channel)
 {
-  data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), dtp.ToString(Source()), true);
-  *Channel = data;
+  Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), srate, dtp.ToString(Source()), true);
 }
 
 cOsdItem *cDvbSourceParam::GetOsdItem(void)
@@ -598,18 +610,18 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
 #undef ST
 #define ST(s) if (strchr(s, type))
   switch (param++) {
-    case  0: ST(" S ")  return new cMenuEditChrItem( tr("Polarization"), &dtp.polarization, "hvlr");             else return GetOsdItem();
-    case  1: ST(" S ")  return new cMenuEditMapItem( tr("System"),       &dtp.system,       SystemValues);       else return GetOsdItem();
-    case  2: ST("CS ")  return new cMenuEditIntItem( tr("Srate"),        &data.srate);                           else return GetOsdItem();
-    case  3: ST("CST")  return new cMenuEditMapItem( tr("Inversion"),    &dtp.inversion,    InversionValues);    else return GetOsdItem();
-    case  4: ST("CST")  return new cMenuEditMapItem( tr("CoderateH"),    &dtp.coderateH,    CoderateValues);     else return GetOsdItem();
-    case  5: ST("  T")  return new cMenuEditMapItem( tr("CoderateL"),    &dtp.coderateL,    CoderateValues);     else return GetOsdItem();
-    case  6: ST("CST")  return new cMenuEditMapItem( tr("Modulation"),   &dtp.modulation,   ModulationValues);   else return GetOsdItem();
-    case  7: ST("  T")  return new cMenuEditMapItem( tr("Bandwidth"),    &dtp.bandwidth,    BandwidthValues);    else return GetOsdItem();
-    case  8: ST("  T")  return new cMenuEditMapItem( tr("Transmission"), &dtp.transmission, TransmissionValues); else return GetOsdItem();
-    case  9: ST("  T")  return new cMenuEditMapItem( tr("Guard"),        &dtp.guard,        GuardValues);        else return GetOsdItem();
-    case 10: ST("  T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
-    case 11: ST(" S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
+    case  0: ST("  S ")  return new cMenuEditChrItem( tr("Polarization"), &dtp.polarization, "HVLR");             else return GetOsdItem();
+    case  1: ST("  S ")  return new cMenuEditMapItem( tr("System"),       &dtp.system,       SystemValues);       else return GetOsdItem();
+    case  2: ST(" CS ")  return new cMenuEditIntItem( tr("Srate"),        &srate);                                else return GetOsdItem();
+    case  3: ST("ACST")  return new cMenuEditMapItem( tr("Inversion"),    &dtp.inversion,    InversionValues);    else return GetOsdItem();
+    case  4: ST(" CST")  return new cMenuEditMapItem( tr("CoderateH"),    &dtp.coderateH,    CoderateValues);     else return GetOsdItem();
+    case  5: ST("   T")  return new cMenuEditMapItem( tr("CoderateL"),    &dtp.coderateL,    CoderateValues);     else return GetOsdItem();
+    case  6: ST("ACST")  return new cMenuEditMapItem( tr("Modulation"),   &dtp.modulation,   ModulationValues);   else return GetOsdItem();
+    case  7: ST("   T")  return new cMenuEditMapItem( tr("Bandwidth"),    &dtp.bandwidth,    BandwidthValues);    else return GetOsdItem();
+    case  8: ST("   T")  return new cMenuEditMapItem( tr("Transmission"), &dtp.transmission, TransmissionValues); else return GetOsdItem();
+    case  9: ST("   T")  return new cMenuEditMapItem( tr("Guard"),        &dtp.guard,        GuardValues);        else return GetOsdItem();
+    case 10: ST("   T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
+    case 11: ST("  S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
     default: return NULL;
     }
   return NULL;
@@ -745,6 +757,7 @@ bool cDvbDevice::Probe(int Adapter, int Frontend)
 
 bool cDvbDevice::Initialize(void)
 {
+  new cDvbSourceParam('A', "ATSC");
   new cDvbSourceParam('C', "DVB-C");
   new cDvbSourceParam('S', "DVB-S");
   new cDvbSourceParam('T', "DVB-T");
@@ -863,6 +876,7 @@ bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
   return type == cSource::stNone
+      || type == cSource::stAtsc  && (frontendType == SYS_ATSC)
       || type == cSource::stCable && (frontendType == SYS_DVBC_ANNEX_AC || frontendType == SYS_DVBC_ANNEX_B)
       || type == cSource::stSat   && (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
       || type == cSource::stTerr  && (frontendType == SYS_DVBT);
diff --git a/dvbplayer.c b/dvbplayer.c
index caeae46c2..017df6d4d 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.20 2010/02/06 12:34:28 kls Exp $
+ * $Id: dvbplayer.c 2.21 2010/03/07 14:24:26 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -218,6 +218,7 @@ class cDvbPlayer : public cPlayer, cThread {
   bool readIndependent;
   cFrame *readFrame;
   cFrame *playFrame;
+  cFrame *dropFrame;
   void TrickSpeed(int Increment);
   void Empty(void);
   bool NextFile(uint16_t FileNumber = 0, off_t FileOffset = -1);
@@ -266,6 +267,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   readIndependent = false;
   readFrame = NULL;
   playFrame = NULL;
+  dropFrame = NULL;
   isyslog("replay %s", FileName);
   fileName = new cFileName(FileName, false, false, isPesRecording);
   replayFile = fileName->Open();
@@ -322,6 +324,7 @@ void cDvbPlayer::Empty(void)
   delete readFrame; // might not have been stored in the buffer in Action()
   readFrame = NULL;
   playFrame = NULL;
+  dropFrame = NULL;
   ringBuffer->Clear();
   ptsIndex.Clear();
   DeviceClear();
@@ -396,7 +399,6 @@ void cDvbPlayer::Action(void)
   uint32_t LastStc = 0;
   int LastReadIFrame = -1;
   int SwitchToPlayFrame = 0;
-  cFrame *DropFrame = NULL;
 
   while (Running()) {
         if (WaitingForData)
@@ -503,10 +505,10 @@ void cDvbPlayer::Action(void)
           else
              Sleep = true;
 
-          if (DropFrame) {
-             if (!eof || (playDir != pdForward && DropFrame->Index() > 0) || (playDir == pdForward && DropFrame->Index() < readIndex)) {
-                ringBuffer->Drop(DropFrame); // the very first and last frame are continously repeated to flush data through the device
-                DropFrame = NULL;
+          if (dropFrame) {
+             if (!eof || (playDir != pdForward && dropFrame->Index() > 0) || (playDir == pdForward && dropFrame->Index() < readIndex)) {
+                ringBuffer->Drop(dropFrame); // the very first and last frame are continously repeated to flush data through the device
+                dropFrame = NULL;
                 }
              }
 
@@ -554,7 +556,7 @@ void cDvbPlayer::Action(void)
                    Sleep = true;
                 }
              if (pc <= 0) {
-                DropFrame = playFrame;
+                dropFrame = playFrame;
                 playFrame = NULL;
                 p = NULL;
                 }
diff --git a/menu.c b/menu.c
index 655eb4c48..e3b49ceec 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.17 2010/02/21 14:09:19 kls Exp $
+ * $Id: menu.c 2.21 2010/03/12 16:03:07 kls Exp $
  */
 
 #include "menu.h"
@@ -160,16 +160,23 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
   eOSState state = cMenuEditItem::ProcessKey(Key);
 
   if (state == osUnknown) {
-     if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly?
-        if (source && source->Prev()) {
-           source = (cSource *)source->Prev();
+     bool IsRepeat = Key & k_Repeat;
+     Key = NORMALKEY(Key);
+     if (Key == kLeft) { // TODO might want to increase the delta if repeated quickly?
+        if (source) {
+           if (source->Prev())
+              source = (cSource *)source->Prev();
+           else if (!IsRepeat)
+              source = Sources.Last();
            *value = source->Code();
            }
         }
-     else if (NORMALKEY(Key) == kRight) {
+     else if (Key == kRight) {
         if (source) {
            if (source->Next())
               source = (cSource *)source->Next();
+           else if (!IsRepeat)
+              source = Sources.First();
            }
         else
            source = Sources.First();
@@ -1045,8 +1052,8 @@ void cMenuTimerItem::Set(void)
      strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
      day = buffer;
      }
-  const char *File = strrchr(timer->File(), FOLDERDELIMCHAR);
-  if (File)
+  const char *File = Setup.FoldersInTimerMenu ? NULL : strrchr(timer->File(), FOLDERDELIMCHAR);
+  if (File && strcmp(File + 1, TIMERMACRO_TITLE) && strcmp(File + 1, TIMERMACRO_EPISODE))
      File++;
   else
      File = timer->File();
@@ -2560,6 +2567,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"),        &data.MenuKeyCloses));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
   SetCurrent(Get(current));
   Display();
 }
@@ -3016,6 +3024,7 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
 class cMenuSetupRecord : public cMenuSetupBase {
 private:
   const char *pauseKeyHandlingTexts[3];
+  const char *delTimeshiftRecTexts[3];
 public:
   cMenuSetupRecord(void);
   };
@@ -3025,6 +3034,9 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   pauseKeyHandlingTexts[0] = tr("do not pause live video");
   pauseKeyHandlingTexts[1] = tr("confirm pause live video");
   pauseKeyHandlingTexts[2] = tr("pause live video");
+  delTimeshiftRecTexts[0] = tr("no");
+  delTimeshiftRecTexts[1] = tr("confirm");
+  delTimeshiftRecTexts[2] = tr("yes");
   SetSection(tr("Recording"));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"),     &data.MarginStart));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"),      &data.MarginStop));
@@ -3042,6 +3054,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
+  Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts));
 }
 
 // --- cMenuSetupReplay ------------------------------------------------------
@@ -4156,14 +4169,15 @@ bool cRecordControl::GetEvent(void)
   return false;
 }
 
-void cRecordControl::Stop(void)
+void cRecordControl::Stop(bool ExecuteUserCommand)
 {
   if (timer) {
      DELETENULL(recorder);
      timer->SetRecording(false);
      timer = NULL;
      cStatus::MsgRecording(device, NULL, fileName, false);
-     cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
+     if (ExecuteUserCommand)
+        cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
      }
 }
 
@@ -4287,10 +4301,12 @@ const char *cRecordControls::GetInstantId(const char *LastInstantId)
 
 cRecordControl *cRecordControls::GetRecordControl(const char *FileName)
 {
-  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
-      if (RecordControls[i] && strcmp(RecordControls[i]->FileName(), FileName) == 0)
-         return RecordControls[i];
-      }
+  if (FileName) {
+     for (int i = 0; i < MAXRECORDCONTROLS; i++) {
+         if (RecordControls[i] && strcmp(RecordControls[i]->FileName(), FileName) == 0)
+            return RecordControls[i];
+         }
+     }
   return NULL;
 }
 
@@ -4379,6 +4395,38 @@ cReplayControl::~cReplayControl()
      currentReplayControl = NULL;
 }
 
+void cReplayControl::Stop(void)
+{
+  if (Setup.DelTimeshiftRec && fileName) {
+     cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
+     if (rc && rc->InstantId()) {
+        if (Active()) {
+           if (Setup.DelTimeshiftRec == 2 || Interface->Confirm(tr("Delete timeshift recording?"))) {
+              cTimer *timer = rc->Timer();
+              rc->Stop(false); // don't execute user command
+              if (timer) {
+                 isyslog("deleting timer %s", *timer->ToDescr());
+                 Timers.Del(timer);
+                 Timers.SetModified();
+                 }
+              cDvbPlayerControl::Stop();
+              cRecording *recording = Recordings.GetByName(fileName);;
+              if (recording) {
+                 if (recording->Delete()) {
+                    Recordings.DelByName(fileName);
+                    ClearLastReplayed(fileName);
+                    }
+                 else
+                    Skins.Message(mtError, tr("Error while deleting recording!"));
+                 }
+              return;
+              }
+           }
+        }
+     }
+  cDvbPlayerControl::Stop();
+}
+
 void cReplayControl::SetRecording(const char *FileName, const char *Title)
 {
   free(fileName);
@@ -4759,7 +4807,11 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    return osRecordings;
+            case kBack:    if (Setup.DelTimeshiftRec) { 
+                              cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
+                              return rc && rc->InstantId() ? osEnd : osRecordings;
+                              }
+                           return osRecordings;
             default:       return osUnknown;
             }
           }
diff --git a/menu.h b/menu.h
index 39de82d83..ec1c175b4 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.2 2010/02/06 10:17:24 kls Exp $
+ * $Id: menu.h 2.3 2010/03/06 16:15:59 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -226,7 +226,7 @@ class cRecordControl {
   virtual ~cRecordControl();
   bool Process(time_t t);
   cDevice *Device(void) { return device; }
-  void Stop(void);
+  void Stop(bool ExecuteUserCommand = true);
   const char *InstantId(void) { return instantId; }
   const char *FileName(void) { return fileName; }
   cTimer *Timer(void) { return timer; }
@@ -278,6 +278,7 @@ class cReplayControl : public cDvbPlayerControl {
 public:
   cReplayControl(void);
   virtual ~cReplayControl();
+  void Stop(void);
   virtual cOsdObject *GetInfo(void);
   virtual eOSState ProcessKey(eKeys Key);
   virtual void Show(void);
diff --git a/pat.c b/pat.c
index 9b3ded61e..0d084e5e3 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.7 2010/01/01 15:40:05 kls Exp $
+ * $Id: pat.c 2.8 2010/03/06 12:00:30 kls Exp $
  */
 
 #include "pat.h"
@@ -447,6 +447,29 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       }
                       break;
+              case 0x81: // STREAMTYPE_USER_PRIVATE
+                      if (Channel->IsAtsc()) { // ATSC AC-3
+                         char lang[MAXLANGCODE1] = { 0 };
+                         SI::Descriptor *d;
+                         for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                             switch (d->getDescriptorTag()) {
+                               case SI::ISO639LanguageDescriptorTag: {
+                                    SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                    strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                    }
+                                    break;
+                               default: ;
+                               }
+                             delete d;
+                             }
+                         if (NumDpids < MAXDPIDS) {
+                            Dpids[NumDpids] = esPid;
+                            strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                            NumDpids++;
+                            }
+                         ProcessCaDescriptors = true;
+                         }
+                      break;
               default: ;//printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());
               }
             if (ProcessCaDescriptors) {
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 40198f8ed..1dd35e316 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -836,6 +836,9 @@ msgstr "Tecla menu tanca"
 msgid "Setup.OSD$Recording directories"
 msgstr "Gravacions en subcarpetes"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guia de Programes"
 
@@ -988,6 +991,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "s�"
+
 msgid "Recording"
 msgstr "Opcions de Gravaci�"
 
@@ -1039,6 +1048,9 @@ msgstr "Mida m
 msgid "Setup.Recording$Split edited files"
 msgstr "Separar arxius"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Opcions de Reproducci�"
 
@@ -1156,6 +1168,9 @@ msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
 msgid "Pausing live video..."
 msgstr "Pausa d'emissi� en directe..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Salta a:"
@@ -1175,9 +1190,6 @@ msgstr "Proc
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bc�de��fghi�jklmno�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&�"
 
-msgid "yes"
-msgstr "s�"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 63b5d1c1f..e8c6687e0 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-02-28 15:00+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
 "Language-Team: Czech\n"
@@ -834,6 +834,9 @@ msgstr "Kl
 msgid "Setup.OSD$Recording directories"
 msgstr "Seznam nahr�vek"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -986,6 +989,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "ano"
+
 msgid "Recording"
 msgstr "Nahr�v�n�"
 
@@ -1037,6 +1046,9 @@ msgstr "Maxim
 msgid "Setup.Recording$Split edited files"
 msgstr "D�lit editovan� soubory"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "P�ehr�v�n�"
 
@@ -1154,6 +1166,9 @@ msgstr "
 msgid "Pausing live video..."
 msgstr "P�eru�uje se b��c� program ..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Skok: "
@@ -1173,9 +1188,6 @@ msgstr "Edita
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "ano"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 99af59b52..580d82afb 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -833,6 +833,9 @@ msgstr "Menu taste lukker"
 msgid "Setup.OSD$Recording directories"
 msgstr "Optagelser i foldere"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -985,6 +988,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
 msgid "Recording"
 msgstr "Optagelse"
 
@@ -1036,6 +1045,9 @@ msgstr "Max. video filst
 msgid "Setup.Recording$Split edited files"
 msgstr "Opdel redigerede filer"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Afspilning"
 
@@ -1153,6 +1165,9 @@ msgstr "Ingen fri DVB enhed til optagelse!"
 msgid "Pausing live video..."
 msgstr "Pausere live udsendelse..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Hop: "
@@ -1172,9 +1187,6 @@ msgstr "Redigeringsproces er allerede aktiv!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "ja"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 6181eb306..42caadc25 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
@@ -595,7 +595,7 @@ msgstr "Unterverzeichnis"
 msgid "Folder name already exists!"
 msgstr "Verzeichnisname existiert bereits!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Folder name must not contain '%c'!"
 msgstr "Verzeichnisname darf kein '%c' enthalten!"
 
@@ -833,6 +833,9 @@ msgstr "Menu-Taste schlie
 msgid "Setup.OSD$Recording directories"
 msgstr "Aufnahmeverzeichnisse"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr "Verzeichnisse im Timer-Men�"
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -985,6 +988,12 @@ msgstr "Anhalten des Live-Signals best
 msgid "pause live video"
 msgstr "Live-Signal anhalten"
 
+msgid "confirm"
+msgstr "best�tigen"
+
+msgid "yes"
+msgstr "ja"
+
 msgid "Recording"
 msgstr "Aufnahme"
 
@@ -1036,6 +1045,9 @@ msgstr "Max. Videodateigr
 msgid "Setup.Recording$Split edited files"
 msgstr "Editierte Dateien aufteilen"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr "Zeitversetzte Aufnahme l�schen"
+
 msgid "Replay"
 msgstr "Wiedergabe"
 
@@ -1153,6 +1165,9 @@ msgstr "Keine freie DVB-Karte zum Aufnehmen!"
 msgid "Pausing live video..."
 msgstr "Live-Signal wird angehalten..."
 
+msgid "Delete timeshift recording?"
+msgstr "Zeitversetzte Aufnahme l�schen?"
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Springen: "
@@ -1172,9 +1187,6 @@ msgstr "Schnitt bereits aktiv!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bcdefghijklmno�pqrs�tu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "ja"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno�6\tpqrs�7\ttuv�8\twxyz9"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 70f6e5463..344b641d3 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -833,6 +833,9 @@ msgstr ""
 msgid "Setup.OSD$Recording directories"
 msgstr "������� ��������"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "������������ ������ ������������"
 
@@ -985,6 +988,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "���"
+
 msgid "Recording"
 msgstr "�������"
 
@@ -1036,6 +1045,9 @@ msgstr "
 msgid "Setup.Recording$Split edited files"
 msgstr "����������� �������������� �������"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "�����������"
 
@@ -1153,6 +1165,9 @@ msgstr "
 msgid "Pausing live video..."
 msgstr "������ �������� �������"
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "����������: "
@@ -1172,9 +1187,6 @@ msgstr "
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " ��������������������������������0123456789-.,#~\\^$[]|()*+?{}/:%@&abcdefghijklmnopqrstuvwxyz"
 
-msgid "yes"
-msgstr "���"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f78c8cb64..4630a3bab 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -834,6 +834,9 @@ msgstr "Cerrar al pulsar bot
 msgid "Setup.OSD$Recording directories"
 msgstr "Mostrar directorios de grabaciones"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Gu�a de Programaci�n"
 
@@ -986,6 +989,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "s�"
+
 msgid "Recording"
 msgstr "Opciones de grabaci�n"
 
@@ -1037,6 +1046,9 @@ msgstr "Tama
 msgid "Setup.Recording$Split edited files"
 msgstr "Partir ficheros editados"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Opciones de reproducci�n"
 
@@ -1154,6 +1166,9 @@ msgstr "
 msgid "Pausing live video..."
 msgstr "Pausa de la emisi�n en directo..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Saltar: "
@@ -1173,9 +1188,6 @@ msgstr "
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bc�de�fghi�jklmn�o�pqrstu�vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "s�"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef�3\tghi�4\tjkl5\tmno��6\tpqrs7\ttuv�8\twxyz9"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 047a2f72d..803a53997 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian\n"
@@ -833,6 +833,9 @@ msgstr "Sulgemine Men
 msgid "Setup.OSD$Recording directories"
 msgstr "Kausta nime salvestamine"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -985,6 +988,12 @@ msgstr "peatam. kinnitus"
 msgid "pause live video"
 msgstr "peatada"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "jah"
+
 msgid "Recording"
 msgstr "Salvestamine"
 
@@ -1036,6 +1045,9 @@ msgstr "Maks. failisuurus (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Failide jupitamine"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Taasesitus"
 
@@ -1153,6 +1165,9 @@ msgstr "Puudub vaba DVB seade salvestamiseks!"
 msgid "Pausing live video..."
 msgstr "Otse�lekande peatamine..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "H�pe: "
@@ -1172,9 +1187,6 @@ msgstr "Redigeerimine juba aktiivne!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrs�z�tuvw����xy0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "jah"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 49af1561c..70e4d5823 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -836,6 +836,9 @@ msgstr "Sulje valikkon
 msgid "Setup.OSD$Recording directories"
 msgstr "N�yt� tallennehakemistot"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Ohjelmaopas"
 
@@ -988,6 +991,12 @@ msgstr "varmista l
 msgid "pause live video"
 msgstr "pys�yt� l�hetys"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "kyll�"
+
 msgid "Recording"
 msgstr "Tallennus"
 
@@ -1039,6 +1048,9 @@ msgstr "Suurin tiedostokoko (Mt)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Jaottele muokatut tallenteet"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Toisto"
 
@@ -1156,6 +1168,9 @@ msgstr "Ei vapaata DVB-viritint
 msgid "Pausing live video..."
 msgstr "Pys�ytet��n l�hetys..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Siirry: "
@@ -1175,9 +1190,6 @@ msgstr "Muokkaus on jo k
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "kyll�"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 7b23a5eb2..74d8ceba2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -839,6 +839,9 @@ msgstr "Menu bouton ferm
 msgid "Setup.OSD$Recording directories"
 msgstr "Dossiers d'enregistrements"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guide des programmes"
 
@@ -991,6 +994,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "oui"
+
 msgid "Recording"
 msgstr "Enregistrement"
 
@@ -1042,6 +1051,9 @@ msgstr "Taille maxi des fichiers (Mo)"
 msgid "Setup.Recording$Split edited files"
 msgstr "S�parer les s�quences �dit�es"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Lecture"
 
@@ -1159,6 +1171,9 @@ msgstr "Pas de carte DVB disponible pour l'enregistrement !"
 msgid "Pausing live video..."
 msgstr "Pause de l'�mission en direct..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Acc�s direct : "
@@ -1178,9 +1193,6 @@ msgstr "Montage d
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "oui"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 56b1bd8d0..55912e509 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -835,6 +835,9 @@ msgstr "Tipka Izbornik zatvara"
 msgid "Setup.OSD$Recording directories"
 msgstr "Imenik za snimke"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG (elektronski programski vodi�)"
 
@@ -987,6 +990,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "da"
+
 msgid "Recording"
 msgstr "Snimanje"
 
@@ -1038,6 +1047,9 @@ msgstr "Maksimalna veli
 msgid "Setup.Recording$Split edited files"
 msgstr "Podijeli ure�ene datoteke"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Reprodukcija"
 
@@ -1155,6 +1167,9 @@ msgstr "Nema slobodnog DVB ure
 msgid "Pausing live video..."
 msgstr "Zaustavljanje izravnog prijenosa..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Sko�i: "
@@ -1174,9 +1189,6 @@ msgstr "Ure
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr "abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "da"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 212d2fe97..ccc10cc6c 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -836,6 +836,9 @@ msgstr "A men
 msgid "Setup.OSD$Recording directories"
 msgstr "Felv�telek list�ja"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -988,6 +991,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "igen"
+
 msgid "Recording"
 msgstr "Felv�tel"
 
@@ -1039,6 +1048,9 @@ msgstr "Max. video File-terjedelem (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Feldolgozott File-k feloszt�sa"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Lej�tsz�s"
 
@@ -1156,6 +1168,9 @@ msgstr "Nincs szabad DVB k
 msgid "Pausing live video..."
 msgstr "Az �l� ad�s meg�ll�tva..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Ugr�s: "
@@ -1175,9 +1190,6 @@ msgstr "A v
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "igen"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index ba7c57ce2..c47828450 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2010-01-31 23:06+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
@@ -840,6 +840,9 @@ msgstr "Tasto Menu per chiudere"
 msgid "Setup.OSD$Recording directories"
 msgstr "Directory di registrazione"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guida programmi EPG"
 
@@ -992,6 +995,12 @@ msgstr "conferma pausa video dal vivo"
 msgid "pause live video"
 msgstr "pausa video dal vivo"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "sì"
+
 msgid "Recording"
 msgstr "Registrazione"
 
@@ -1043,6 +1052,9 @@ msgstr "Dim. massima file video (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Dividi i file modificati"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Riproduzione"
 
@@ -1160,6 +1172,9 @@ msgstr "Nessuna periferica DVB disponibile per registrare!"
 msgid "Pausing live video..."
 msgstr "Pausa del canale in visione..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Vai a: "
@@ -1179,9 +1194,6 @@ msgstr "Processo di modifica già attivo!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aáàbcdeéèfghiìîjklmnoòpqrstuùvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&°"
 
-msgid "yes"
-msgstr "sì"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+°?{}/:%@&\taàbc2\tdeèf3\tghiì4\tjkl5\tmnoò6\tpqrs7\ttuùv8\twxyz9"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index acf230979..d79f03fcd 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-01-17 16:18+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2010-02-22 18:05+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -833,6 +833,9 @@ msgstr "Uždaryti Meniu mygtuku"
 msgid "Setup.OSD$Recording directories"
 msgstr "Įrašų katalogai"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Elektroninis programų gidas (EPG)"
 
@@ -985,6 +988,12 @@ msgstr "patvirtinti 'gyvo' video srauto pristabdymą"
 msgid "pause live video"
 msgstr "pristabdyti 'gyvą' video srautą"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "taip"
+
 msgid "Recording"
 msgstr "Įrašymas"
 
@@ -1036,6 +1045,9 @@ msgstr "Maks. video failo dydis (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Suskaidyti koreguotus failus"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Pakartoti"
 
@@ -1153,6 +1165,9 @@ msgstr "Nėra laisvų DVB įrenginių, kad būtų galima įrašinėti!"
 msgid "Pausing live video..."
 msgstr "Sustabdomas 'gyvo' video grojimas..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Peršokti: "
@@ -1172,9 +1187,6 @@ msgstr "Koregavimo procesas jau aktyvus!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aąbcčdeęėfghiįjklmnopqrsštuųūvwxyzž0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "taip"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\taąbcč2\tdeęėf3\tghiį4\tjkl5\tmno6\tpqrsš7\ttuųūv8\twxyzž9"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 1e1d3820f..f4d912074 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -837,6 +837,9 @@ msgstr "Menu toets sluit ook af"
 msgid "Setup.OSD$Recording directories"
 msgstr "Opname mappen"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -989,6 +992,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
 msgid "Recording"
 msgstr "Opname"
 
@@ -1040,6 +1049,9 @@ msgstr "Maximale omvang video file (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Bewerkte files opdelen"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Afspelen"
 
@@ -1157,6 +1169,9 @@ msgstr "Geen vrije DVB kaart om op te nemen!"
 msgid "Pausing live video..."
 msgstr "Pauzeren live uitzending..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Springen: "
@@ -1176,9 +1191,6 @@ msgstr "Bewerken is al actief!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "ja"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 11668c75b..e739b35a2 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -834,6 +834,9 @@ msgstr ""
 msgid "Setup.OSD$Recording directories"
 msgstr "Kataloger til opptak"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Programoversikt"
 
@@ -986,6 +989,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
 msgid "Recording"
 msgstr "Opptak"
 
@@ -1037,6 +1046,9 @@ msgstr "Maksimal st
 msgid "Setup.Recording$Split edited files"
 msgstr "Splitt redigerte filer"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Spill av"
 
@@ -1154,6 +1166,9 @@ msgstr "Ingen ledige DVB enheter for opptak!"
 msgid "Pausing live video..."
 msgstr ""
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Hopp: "
@@ -1173,9 +1188,6 @@ msgstr "Redigeringsprosessen er allerede aktiv!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
-msgid "yes"
-msgstr "ja"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d1944cb48..9af022728 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -834,6 +834,9 @@ msgstr "Przycisk Menu zamyka"
 msgid "Setup.OSD$Recording directories"
 msgstr "Katalogi nagra�"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -986,6 +989,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "tak"
+
 msgid "Recording"
 msgstr "Nagranie"
 
@@ -1037,6 +1046,9 @@ msgstr "Maksymalny rozmiar pliku (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Dziel edytowane pliki"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Odtwarzanie"
 
@@ -1154,6 +1166,9 @@ msgstr "Brak wolnej karty DVB do nagrywania!"
 msgid "Pausing live video..."
 msgstr "Pauzuj� program na �ywo..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Skok: "
@@ -1173,9 +1188,6 @@ msgstr "Proces edycji jest ju
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "tak"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 99d81687c..edea421f5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -833,6 +833,9 @@ msgstr "Tecla Menu fecha"
 msgid "Setup.OSD$Recording directories"
 msgstr "Directorias de grava��o"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guia de programa��o"
 
@@ -985,6 +988,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "sim"
+
 msgid "Recording"
 msgstr "Op��es de grava��o"
 
@@ -1036,6 +1045,9 @@ msgstr "Tamanho m
 msgid "Setup.Recording$Split edited files"
 msgstr "Dividir ficheiros editados"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Op��es de reprodu��o"
 
@@ -1153,6 +1165,9 @@ msgstr "Nenhuma placa DVB disponivel para gravar!"
 msgid "Pausing live video..."
 msgstr "Video em directo em pausa..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Saltar: "
@@ -1172,9 +1187,6 @@ msgstr "Processo de edi
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "sim"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 31e6b1760..ffac7e9d1 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2010-02-11 13:38+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -836,6 +836,9 @@ msgstr "Tasta 'Meniu' 
 msgid "Setup.OSD$Recording directories"
 msgstr "Directoare �nregistr�ri"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -988,6 +991,12 @@ msgstr "confirm
 msgid "pause live video"
 msgstr "�nregistreaz� emisiunea"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "da"
+
 msgid "Recording"
 msgstr "�nregistrare"
 
@@ -1039,6 +1048,9 @@ msgstr "Dimensiune maxim
 msgid "Setup.Recording$Split edited files"
 msgstr "Separare fi�iere montate"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Redare"
 
@@ -1156,6 +1168,9 @@ msgstr "Nu mai sunt dispozitive DVB disponibile pentru 
 msgid "Pausing live video..."
 msgstr "Trec �n pauz� emisiunea transmis�..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Salt la: "
@@ -1175,9 +1190,6 @@ msgstr "Montajul 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "da"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0796c1949..440939442 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -834,6 +834,9 @@ msgstr "
 msgid "Setup.OSD$Recording directories"
 msgstr "�������� �������� �������"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "�������"
 
@@ -986,6 +989,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "��"
+
 msgid "Recording"
 msgstr "������"
 
@@ -1037,6 +1046,9 @@ msgstr "
 msgid "Setup.Recording$Split edited files"
 msgstr "������ ����������������� �����"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "���������������"
 
@@ -1154,6 +1166,9 @@ msgstr "
 msgid "Pausing live video..."
 msgstr "����� ����������� ���������..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "�������: "
@@ -1173,9 +1188,6 @@ msgstr "
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "��"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index f53c25132..bedb1338f 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2009-09-30 12:50+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak\n"
@@ -834,6 +834,9 @@ msgstr "Kl
 msgid "Setup.OSD$Recording directories"
 msgstr "Zoznam z�znamov"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -986,6 +989,12 @@ msgstr "Potrdi
 msgid "pause live video"
 msgstr "Preru�i� �iv� vysielanie"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "�no"
+
 msgid "Recording"
 msgstr "Nahr�vanie"
 
@@ -1037,6 +1046,9 @@ msgstr "Maxim
 msgid "Setup.Recording$Split edited files"
 msgstr "Deli� upravovan� s�bory"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Prehr�vanie"
 
@@ -1154,6 +1166,9 @@ msgstr "
 msgid "Pausing live video..."
 msgstr "Preru�uje sa be�iaci program ..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Skok: "
@@ -1173,9 +1188,6 @@ msgstr "Spracovanie 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a��bc�d�e�fghi�jkl�mn�o��pqr�s�t�u�vwxy�z�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "�no"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 88858e5ea..7f45b0272 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -834,6 +834,9 @@ msgstr "Meni gumb zapre meni"
 msgid "Setup.OSD$Recording directories"
 msgstr "Direktoriji za posnetke"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Programski vodnik"
 
@@ -986,6 +989,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "da"
+
 msgid "Recording"
 msgstr "Snemanje"
 
@@ -1037,6 +1046,9 @@ msgstr "Najve
 msgid "Setup.Recording$Split edited files"
 msgstr "Razdeli urejene datoteke"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Predvajanje"
 
@@ -1154,6 +1166,9 @@ msgstr "Ni proste DVB naprave za snemanje!"
 msgid "Pausing live video..."
 msgstr "Ustavljanje predvajanja v �ivo..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Sko�i: "
@@ -1173,9 +1188,6 @@ msgstr "Urejanje je 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abc�defghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "da"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1c5821b5b..732e1798e 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -836,6 +836,9 @@ msgstr "Menyknappen st
 msgid "Setup.OSD$Recording directories"
 msgstr "Kataloger f�r inspelningar"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -988,6 +991,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
 msgid "Recording"
 msgstr "Inspelning"
 
@@ -1039,6 +1048,9 @@ msgstr "Maximal filstorlek f
 msgid "Setup.Recording$Split edited files"
 msgstr "Dela upp redigerade filer"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Uppspelning"
 
@@ -1156,6 +1168,9 @@ msgstr "Det finns ingen ledig DVB enhet f
 msgid "Pausing live video..."
 msgstr "Pausar direktinspelningen"
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Hopp: "
@@ -1175,9 +1190,6 @@ msgstr "Redigeringen 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "ja"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 763a6b64f..1a3382cff 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -833,6 +833,9 @@ msgstr "Men
 msgid "Setup.OSD$Recording directories"
 msgstr "Kay�t dizinleri"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
@@ -985,6 +988,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "evet"
+
 msgid "Recording"
 msgstr "Kay�t"
 
@@ -1036,6 +1045,9 @@ msgstr "Maksimum Video k
 msgid "Setup.Recording$Split edited files"
 msgstr "D�zenlenmi� k�t�kleri ay�r"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Tekrar"
 
@@ -1153,6 +1165,9 @@ msgstr "Kullan
 msgid "Pausing live video..."
 msgstr "Naklen yay�n duraklat�l�yor..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Atla: "
@@ -1172,9 +1187,6 @@ msgstr "Kesim hen
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abc�defg�h�ijklmno�prs�tu�vyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "evet"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tg�h�i4\tjkl5\tmno�6\tprs�7\ttu�v8\tyz9"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 2c080fe1a..a373fb593 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2009-05-31 13:17+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -833,6 +833,9 @@ msgstr "Кнопку Меню закрити"
 msgid "Setup.OSD$Recording directories"
 msgstr "Каталоги зберігання записів"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "Телегід"
 
@@ -985,6 +988,12 @@ msgstr "підтвердити призупинення перегляду"
 msgid "pause live video"
 msgstr "призупинити перегляд"
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "так"
+
 msgid "Recording"
 msgstr "Запис"
 
@@ -1036,6 +1045,9 @@ msgstr "Макс. размір відеофайлу (Мб)"
 msgid "Setup.Recording$Split edited files"
 msgstr "Ділити відредаговані файли"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "Перегляд"
 
@@ -1153,6 +1165,9 @@ msgstr "Немає вільного DVB-пристрою для запису!"
 msgid "Pausing live video..."
 msgstr "Режим відкладеного перегляду..."
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Перейти: "
@@ -1172,9 +1187,6 @@ msgstr "Процес відеомонтажу вже запущений!"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyzабвгдеєёжзиіїйклмнопрстуфхцчшщъыьюя0123456789-.#~,/_@"
 
-msgid "yes"
-msgstr "так"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr " 0\t-.#~,/_@1\tabcабвг2\tdefдеєёжз3\tghiиіїйкл4\tjklмно5\tmnoпрс6\tpqrsтуфх7\ttuvцчшщъ8\twxyzыьэюя9"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 30d109434..48c4a3841 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-02-28 13:19+0100\n"
+"POT-Creation-Date: 2010-03-12 16:49+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -836,6 +836,9 @@ msgstr "菜单关闭结束"
 msgid "Setup.OSD$Recording directories"
 msgstr "录像目录"
 
+msgid "Setup.OSD$Folders in timer menu"
+msgstr ""
+
 msgid "EPG"
 msgstr "电子节目单设置"
 
@@ -988,6 +991,12 @@ msgstr ""
 msgid "pause live video"
 msgstr ""
 
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "是"
+
 msgid "Recording"
 msgstr "录像设置"
 
@@ -1039,6 +1048,9 @@ msgstr "最大的视频文件容量 (MB)"
 msgid "Setup.Recording$Split edited files"
 msgstr "分离编辑文件"
 
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr ""
+
 msgid "Replay"
 msgstr "回放设置"
 
@@ -1156,6 +1168,9 @@ msgstr "没有空闲的DVB设备录像"
 msgid "Pausing live video..."
 msgstr "暂停当前视频"
 
+msgid "Delete timeshift recording?"
+msgstr ""
+
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "跳过: "
@@ -1175,9 +1190,6 @@ msgstr "编辑处理已经激活"
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr "abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
-msgid "yes"
-msgstr "是"
-
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
diff --git a/recording.c b/recording.c
index ef78c40d6..96dc95f9a 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.22 2010/01/16 11:18:30 kls Exp $
+ * $Id: recording.c 2.23 2010/03/07 14:06:04 kls Exp $
  */
 
 #include "recording.h"
@@ -58,9 +58,6 @@
 #define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 
-#define TIMERMACRO_TITLE    "TITLE"
-#define TIMERMACRO_EPISODE  "EPISODE"
-
 #define MAX_SUBTITLE_LENGTH  40
 
 #define MAX_LINK_LEVEL  6
diff --git a/recording.h b/recording.h
index ac52ada2e..939878f2f 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.13 2010/01/16 11:16:20 kls Exp $
+ * $Id: recording.h 2.14 2010/03/07 14:06:15 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -19,6 +19,8 @@
 #include "tools.h"
 
 #define FOLDERDELIMCHAR '~'
+#define TIMERMACRO_TITLE    "TITLE"
+#define TIMERMACRO_EPISODE  "EPISODE"
 
 extern bool VfatFileSystem;
 extern int InstanceId;
diff --git a/sourceparams.c b/sourceparams.c
index 9a55540b5..043178955 100644
--- a/sourceparams.c
+++ b/sourceparams.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sourceparams.c 1.1 2010/02/28 12:15:49 kls Exp $
+ * $Id: sourceparams.c 1.2 2010/03/06 11:13:39 kls Exp $
  */
 
 #include "sourceparams.h"
@@ -21,7 +21,7 @@ cSourceParam::cSourceParam(char Source, const char *Description)
         return;
         }
      SourceParams.Add(this);
-     if (Source != 'C' && Source != 'S' && Source != 'T')
+     if (!strchr("ACST", Source)) // no, it's not "ATSC" ;-)
         Sources.Add(new cSource(Source, Description));
      dsyslog("registered source parameters for '%c - %s'", source, Description);
      }
diff --git a/sources.c b/sources.c
index 66d441d78..44bf7d070 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 2.1 2010/02/28 12:00:31 kls Exp $
+ * $Id: sources.c 2.2 2010/02/28 15:15:39 kls Exp $
  */
 
 #include "sources.h"
@@ -55,35 +55,37 @@ cString cSource::ToString(int Code)
 
 int cSource::FromString(const char *s)
 {
-  if ('A' <= *s && *s <= 'Z') {
-     int code = int(*s) << 24;
-     if (code == stSat) {
-        int pos = 0;
-        bool dot = false;
-        bool neg = false;
-        while (*++s) {
-              switch (*s) {
-                case '0' ... '9': pos *= 10;
-                                  pos += *s - '0';
-                                  break;
-                case '.':         dot = true;
-                                  break;
-                case 'E':         neg = true; // fall through to 'W'
-                case 'W':         if (!dot)
-                                     pos *= 10;
-                                  break;
-                default: esyslog("ERROR: unknown source character '%c'", *s);
-                         return stNone;
-                }
-              }
-        if (neg)
-           pos = -pos;
-        code |= (pos & st_Pos);
+  if (!isempty(s)) {
+     if ('A' <= *s && *s <= 'Z') {
+        int code = int(*s) << 24;
+        if (code == stSat) {
+           int pos = 0;
+           bool dot = false;
+           bool neg = false;
+           while (*++s) {
+                 switch (*s) {
+                   case '0' ... '9': pos *= 10;
+                                     pos += *s - '0';
+                                     break;
+                   case '.':         dot = true;
+                                     break;
+                   case 'E':         neg = true; // fall through to 'W'
+                   case 'W':         if (!dot)
+                                        pos *= 10;
+                                     break;
+                   default: esyslog("ERROR: unknown source character '%c'", *s);
+                            return stNone;
+                   }
+                 }
+           if (neg)
+              pos = -pos;
+           code |= (pos & st_Pos);
+           }
+        return code;
         }
-     return code;
+     else
+       esyslog("ERROR: unknown source key '%c'", *s);
      }
-  else
-    esyslog("ERROR: unknown source key '%c'", *s);
   return stNone;
 }
 
diff --git a/sources.conf b/sources.conf
index 034edae84..751d919c0 100644
--- a/sources.conf
+++ b/sources.conf
@@ -195,3 +195,12 @@ C       DVB-C
 # Terrestrial
 
 T       DVB-T
+
+# ATSC
+
+A       ATSC
+
+# Plugins
+
+I       IPTV
+V       Analog Video
diff --git a/sources.h b/sources.h
index 3d00d2cfd..6b362e389 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 2.1 2010/02/21 16:11:19 kls Exp $
+ * $Id: sources.h 2.3 2010/03/07 13:53:11 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -16,6 +16,7 @@ class cSource : public cListObject {
 public:
   enum eSourceType {
     stNone  = 0x00000000,
+    stAtsc  = ('A' << 24),
     stCable = ('C' << 24),
     stSat   = ('S' << 24),
     stTerr  = ('T' << 24),
@@ -35,9 +36,11 @@ class cSource : public cListObject {
   static cString ToString(int Code);
   static int FromString(const char *s);
   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
+  static bool IsAtsc(int Code) { return (Code & st_Mask) == stAtsc; }
   static bool IsCable(int Code) { return (Code & st_Mask) == stCable; }
   static bool IsSat(int Code) { return (Code & st_Mask) == stSat; }
   static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }
+  static bool IsType(int Code, char Source) { return int(Code & st_Mask) == (int(Source) << 24); }
   };
 
 class cSources : public cConfig<cSource> {
diff --git a/vdr.5 b/vdr.5
index 7f5cce2e3..dbef7dcc3 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.15 2010/02/21 14:29:06 kls Exp $
+.\" $Id: vdr.5 2.17 2010/03/06 14:04:54 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -402,14 +402,16 @@ The first character of the \fBcode\fR must be one of
 .TS
 tab (@);
 l l.
-\fBS\fR@Satellite
+\fBA\fR@ATSC
 \fBC\fR@Cable
+\fBS\fR@Satellite
 \fBT\fR@Terrestrial
 .TE
 
 and is followed by further data pertaining to that particular source. In case of
 \fBS\fRatellite this is the orbital position in degrees, followed by \fBE\fR for
 east or \fBW\fR for west.
+Plugins may define additional sources, using other characters in the range 'A'...'Z'.
 .SS DISEQC
 The file \fIdiseqc.conf\fR defines the \fBDiSEqC\fR control sequences to be sent
 to the DVB-S card in order to access a given satellite position and/or band.

From c2c45d68c644684e002a92ceee83af7550aaa1e4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 6 Jun 2010 14:49:00 +0200
Subject: [PATCH 201/307] =?UTF-8?q?Version=201.7.15=20-=20Added=20Macedoni?=
 =?UTF-8?q?an=20language=20texts=20(thanks=20to=20Dimitar=20Petrovski).=20?=
 =?UTF-8?q?-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to=20Art?=
 =?UTF-8?q?hur=20Konovalov).=20-=20Updated=20the=20Finnish=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Added=20handling=20o?=
 =?UTF-8?q?f=20EnhancedAC3DescriptorTag=20(thanks=20to=20Eric=20Valette).?=
 =?UTF-8?q?=20-=20The=20default=20SVDRP=20port=20is=20now=206419=20(regist?=
 =?UTF-8?q?ered=20with=20ICANN/IANA=20by=20Christian=20Tramnitz).=20=20=20?=
 =?UTF-8?q?Use=20'-p=202001'=20to=20switch=20back=20to=20the=20old=20port?=
 =?UTF-8?q?=20if=20necessary.=20-=20Updated=20the=20Italian=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Diego=20Pierotto).=20-=20cDvbDevice::Provides?=
 =?UTF-8?q?Transponder()=20now=20checks=20the=20modulation=20capabilities?=
 =?UTF-8?q?=20of=20the=20=20=20device=20(as=20far=20as=20the=20driver=20al?=
 =?UTF-8?q?lows=20this).=20-=20Fixed=20cFrameDetector::Analyze()=20in=20ca?=
 =?UTF-8?q?se=20part=20of=20the=20data=20has=20been=20processed=20and=20?=
 =?UTF-8?q?=20=20there=20is=20less=20than=20MIN=5FTS=5FPACKETS=5FFOR=5FFRA?=
 =?UTF-8?q?ME=5FDETECTOR=20left=20(reported=20by=20Derek=20Kelly).=20-=20A?=
 =?UTF-8?q?dded=20a=20note=20about=20not=20deleting=20cDeviceHook=20object?=
 =?UTF-8?q?s=20to=20device.h.=20-=20Added=20user=20defined=20key=20kUser0?=
 =?UTF-8?q?=20(suggested=20by=20Ulf=20Kiener).=20-=20Include=20paths=20are?=
 =?UTF-8?q?=20now=20added=20instead=20of=20overwriting=20INCLUDES=20in=20t?=
 =?UTF-8?q?he=20Makefile=20(thanks=20=20=20to=20Paul=20Menzel).=20-=20The?=
 =?UTF-8?q?=20various=20modulation=20types=20are=20now=20taken=20into=20ac?=
 =?UTF-8?q?count=20when=20selecting=20a=20device=20for=20=20=20a=20recordi?=
 =?UTF-8?q?ng=20or=20live=20viewing,=20so=20that=20devices=20that=20provid?=
 =?UTF-8?q?e=20more=20capabilities=20are=20=20=20spared.=20-=20Fixed=20gen?=
 =?UTF-8?q?erating=20PMT=20language=20descriptors=20for=20multi=20language?=
 =?UTF-8?q?=20PIDs=20(thanks=20to=20Rolf=20=20=20Ahrenberg).=20-=20Transpo?=
 =?UTF-8?q?nders=20that=20use=20"8psk=20turbo=20fec"=20(a=20non-standard?=
 =?UTF-8?q?=20mode=20used=20by=20North=20American=20=20=20providers)=20are?=
 =?UTF-8?q?=20now=20identified=20by=20assuming=20that=20all=208psk=20trans?=
 =?UTF-8?q?ponders=20on=20DVB-S=20use=20=20=20"turbo=20fec".=20In=20order?=
 =?UTF-8?q?=20to=20determine=20whether=20a=20certain=20device=20can=20hand?=
 =?UTF-8?q?le=20"turbo=20fec",=20=20=20the=20new=20driver=20flag=20FE=5FCA?=
 =?UTF-8?q?N=5FTURBO=5FFEC=20is=20checked.=20If=20your=20device=20can=20ha?=
 =?UTF-8?q?ndle=20"turbo=20=20=20fec",=20and=20your=20driver=20doesn't=20h?=
 =?UTF-8?q?ave=20that=20flag,=20yet,=20you=20can=20apply=20the=20patch=20f?=
 =?UTF-8?q?rom=20=20=20ftp://ftp.tvdr.de/vdr/Developer/v4l-dvb-add-FE=5FCA?=
 =?UTF-8?q?N=5FTURBO=5FFEC.diff.=20A=20temporary=20=20=20macro=20in=20dvbd?=
 =?UTF-8?q?evice.c=20defines=20the=20flag=20for=20all=20those=20who=20don'?=
 =?UTF-8?q?t=20need=20this=20in=20the=20=20=20driver,=20so=20that=20they?=
 =?UTF-8?q?=20can=20continue=20using=20an=20unmodified=20driver.=20=20=20T?=
 =?UTF-8?q?hanks=20to=20Derek=20Kelly=20for=20testing=20this.=20-=20Update?=
 =?UTF-8?q?d=20the=20Ukrainian=20OSD=20texts=20(thanks=20to=20Yarema=20Aka?=
 =?UTF-8?q?=20Knedlyk).=20-=20Fixed=20handling=20"none"=20color=20entries?=
 =?UTF-8?q?=20in=20XPM=20files=20(thanks=20to=20Thomas=20G=C3=BCnther).=20?=
 =?UTF-8?q?-=20Fixed=20a=20crash=20when=20creating=20a=20new=20channel=20i?=
 =?UTF-8?q?f=20the=20channel=20list=20is=20empty=20(reported=20=20=20by=20?=
 =?UTF-8?q?Halim=20Sahin).=20-=20Updated=20the=20Czech=20OSD=20texts=20(th?=
 =?UTF-8?q?anks=20to=20Radek=20Stastny).=20-=20Fixed=20a=20possible=20out?=
 =?UTF-8?q?=20of=20buffer=20memory=20access=20in=20case=20of=20bad=20TS=20?=
 =?UTF-8?q?data=20(reported=20=20=20by=20Rolf=20Ahrenberg).=20-=20Implemen?=
 =?UTF-8?q?ted=20handling=20of=20HD=20resolution=20subtitles=20according?=
 =?UTF-8?q?=20to=20v1.3.1=20of=20=20=20ETSI=20EN=20300=20743,=20chapter=20?=
 =?UTF-8?q?7.2.1=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20The=20EPG=20dat?=
 =?UTF-8?q?a=20now=20handles=20stream=20components=205=20(H.264-video)=20a?=
 =?UTF-8?q?nd=206=20(HEAAC-audio).=20-=20Fixed=20a=20problem=20with=20exte?=
 =?UTF-8?q?rnal=20Dolby=20Digital=20processing=20via=20the=20'-a'=20option?=
 =?UTF-8?q?=20in=20live=20=20=20mode=20and=20with=20TS=20recordings=20(rep?=
 =?UTF-8?q?orted=20by=20Christopher=20Reimer).=20-=20Added=20handling=20MP?=
 =?UTF-8?q?EG=20audio=20types=20"ISO/IEC=2014496-3=20Audio=20with=20LATM?=
 =?UTF-8?q?=20transport=20syntax"=20=20=20and=20"ISO/IEC=2013818-7=20Audio?=
 =?UTF-8?q?=20with=20ADTS=20transport=20syntax"=20(suggested=20by=20Luis?=
 =?UTF-8?q?=20Fernandes).=20=20=20See=20man=20vdr(5)=20on=20how=20the=20AP?=
 =?UTF-8?q?ID=20section=20of=20channels=20has=20been=20extended=20to=20sto?=
 =?UTF-8?q?re=20=20=20this=20information.=20-=20Added=20detecting=20channe?=
 =?UTF-8?q?ls=20that=20use=20service=20type=200x16.=20-=20Added=20full=20h?=
 =?UTF-8?q?andling=20of=20the=20stream=20types=20of=20Dolby=20Digital=20pi?=
 =?UTF-8?q?ds=20=20=20(thanks=20to=20Jose=20Alberto=20Reguero).=20-=20The?=
 =?UTF-8?q?=20new=20setup=20option=20"OSD/Number=20keys=20for=20characters?=
 =?UTF-8?q?"=20can=20be=20used=20to=20control=20whether=20=20=20the=20numb?=
 =?UTF-8?q?er=20keys=20can=20be=20used=20to=20enter=20characters=20in=20a?=
 =?UTF-8?q?=20text=20input=20field=20(suggested=20=20=20by=20Stefan=20Husk?=
 =?UTF-8?q?amp).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS  |   35 ++
 HISTORY       |   54 ++
 INSTALL       |    2 +-
 MANUAL        |    5 +
 Makefile      |    4 +-
 README        |    4 +
 audio.c       |    4 +-
 channels.c    |   55 +-
 channels.h    |    8 +-
 config.c      |    5 +-
 config.h      |   11 +-
 device.c      |    8 +-
 device.h      |    5 +-
 dvbdevice.c   |   46 +-
 dvbdevice.h   |    3 +-
 dvbsubtitle.c |   35 +-
 dvbsubtitle.h |    7 +-
 eit.c         |    4 +-
 keys.c        |    3 +-
 keys.h        |    4 +-
 menu.c        |    8 +-
 menuitems.c   |   93 ++--
 menuitems.h   |    3 +-
 osd.c         |    8 +-
 pat.c         |   13 +-
 po/ca_ES.po   |    8 +-
 po/cs_CZ.po   |  701 +++++++++++++-------------
 po/da_DK.po   |    8 +-
 po/de_DE.po   |    8 +-
 po/el_GR.po   |    8 +-
 po/es_ES.po   |    8 +-
 po/et_EE.po   |   20 +-
 po/fi_FI.po   |  276 ++++++-----
 po/fr_FR.po   |    8 +-
 po/hr_HR.po   |    8 +-
 po/hu_HU.po   |    8 +-
 po/it_IT.po   |   22 +-
 po/lt_LT.po   |    8 +-
 po/mk_MK.po   | 1324 +++++++++++++++++++++++++++++++++++++++++++++++++
 po/nl_NL.po   |    8 +-
 po/nn_NO.po   |    8 +-
 po/pl_PL.po   |    8 +-
 po/pt_PT.po   |    8 +-
 po/ro_RO.po   |    8 +-
 po/ru_RU.po   |    8 +-
 po/sk_SK.po   |    8 +-
 po/sl_SI.po   |    8 +-
 po/sv_SE.po   |    8 +-
 po/tr_TR.po   |    8 +-
 po/uk_UA.po   |  258 +++++-----
 po/zh_CN.po   |    8 +-
 remux.c       |   43 +-
 remux.h       |    7 +-
 sdt.c         |    3 +-
 svdrpsend.pl  |    4 +-
 vdr.1         |    6 +-
 vdr.5         |   13 +-
 vdr.c         |    6 +-
 58 files changed, 2498 insertions(+), 772 deletions(-)
 create mode 100644 po/mk_MK.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b8d33c30d..cd518120d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1093,6 +1093,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  suggesting to add plain text error messages to log entries from cOsd::SetAreas()
  for keeping subtitles visible when pausing replay
  for suggesting to assign the source character 'I' to "IPTV"
+ for fixing generating PMT language descriptors for multi language PIDs
+ for reporting a possible out of buffer memory access in case of bad TS data
+ for implementing handling of HD resolution subtitles according to v1.3.1 of
+ ETSI EN 300 743, chapter 7.2.1
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1358,6 +1362,7 @@ Christian Tramnitz <maillist@tramnitz.com>
  for terrestrial transponders
  for his support in debugging a problem in setting the source type for newly
  detected terrestrial transponders
+ for registering the default SVDRP port (6419) with ICANN/IANA
 
 Jens Rosenboom <me@jayr.de>
  for fixing the SVDRP command 'STAT DISK' to avoid a 'division by 0' in case
@@ -1952,6 +1957,7 @@ Thomas G
  strings
  for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default,
  which results in using tr(FileNameChars)
+ for fixing handling "none" color entries in XPM files
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -2336,6 +2342,7 @@ Boguslaw Juza <bogdan@uci.agh.edu.pl>
 Ulf Kiener <webmaster@ulf-kiener.de>
  for reporting a problem with audio track descriptions in the DVD plugin after a
  replay has been stopped
+ for suggesting to add user defined key kUser0
 
 J�rg Wendel <vdr-ml@jwendel.de>
  for reporting that cPlugin::Active() was called too often
@@ -2362,6 +2369,7 @@ Alexander Riedel <alexander-riedel@t-online.de>
 Jose Alberto Reguero <jareguero@telefonica.net>
  for a patch that fixed part of a crash in i18n character set conversion
  for fixing cDvbPlayer::NextFile() to handle files larger than 2GB
+ for implementing full handling of the stream types of Dolby Digital pids
 
 Patrice Staudt <staudt@engsystem.net>
  for adding full weekday names to i18n.c for plugins to use
@@ -2393,6 +2401,7 @@ Halim Sahin <halim.sahin@t-online.de>
  channel in the channel list
  for suggesting to make the "Source" item in the "Edit channel" menu wrap around the
  list of sources
+ for reporting a crash when creating a new channel if the channel list is empty
 
 Denis Knauf <denis.knauf@gmail.com>
  for reporting a missing '-' at the next to last line of SVDRP help texts
@@ -2524,6 +2533,8 @@ Derek Kelly (user.vdr@gmail.com)
  for reporting a problem with HD NTSC broadcasts that split frames over several payload
  units
  for updating sources.conf
+ for reporting a problem where the frame rate was not detected correctly
+ for testing the implementation of FE_CAN_TURBO_FEC
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2579,3 +2590,27 @@ Lars Hanisch <dvb@flensrocker.de>
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
+
+Dimitar Petrovski <dimeptr@gmail.com>
+ for translating OSD texts to the Macedonian language
+
+Eric Valette <eric.valette@free.fr>
+ for adding handling of EnhancedAC3DescriptorTag
+
+Paul Menzel <paulepanter@users.sourceforge.net>
+ for making include paths be added instead of overwriting INCLUDES in the Makefile
+
+Radek Stastny <dedkus@gmail.com>
+ for translating OSD texts to the Czech language
+
+Luis Fernandes <telping@gmail.com>
+ for suggesting to add handling MPEG audio type "ISO/IEC 14496-3 Audio with LATM
+ transport syntax"
+
+Christopher Reimer <reimer.christopher@freenet.de>
+ for reporting a problem with external Dolby Digital processing via the '-a' option
+ in live mode and with TS recordings
+
+Stefan Huskamp <coca_cola1@gmx.de>
+ for suggesting to make entering characters via the number keys
+ configurable
diff --git a/HISTORY b/HISTORY
index 4b909c35c..3976ba589 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6410,3 +6410,57 @@ Video Disk Recorder Revision History
   during replay.
 - The new setup option "Folders in timer menu" controls whether the file names in
   the timer menu are shown with their full folder path.
+
+2010-06-06: Version 1.7.15
+
+- Added Macedonian language texts (thanks to Dimitar Petrovski).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added handling of EnhancedAC3DescriptorTag (thanks to Eric Valette).
+- The default SVDRP port is now 6419 (registered with ICANN/IANA by Christian Tramnitz).
+  Use '-p 2001' to switch back to the old port if necessary.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- cDvbDevice::ProvidesTransponder() now checks the modulation capabilities of the
+  device (as far as the driver allows this).
+- Fixed cFrameDetector::Analyze() in case part of the data has been processed and
+  there is less than MIN_TS_PACKETS_FOR_FRAME_DETECTOR left (reported by Derek Kelly).
+- Added a note about not deleting cDeviceHook objects to device.h.
+- Added user defined key kUser0 (suggested by Ulf Kiener).
+- Include paths are now added instead of overwriting INCLUDES in the Makefile (thanks
+  to Paul Menzel).
+- The various modulation types are now taken into account when selecting a device for
+  a recording or live viewing, so that devices that provide more capabilities are
+  spared.
+- Fixed generating PMT language descriptors for multi language PIDs (thanks to Rolf
+  Ahrenberg).
+- Transponders that use "8psk turbo fec" (a non-standard mode used by North American
+  providers) are now identified by assuming that all 8psk transponders on DVB-S use
+  "turbo fec". In order to determine whether a certain device can handle "turbo fec",
+  the new driver flag FE_CAN_TURBO_FEC is checked. If your device can handle "turbo
+  fec", and your driver doesn't have that flag, yet, you can apply the patch from
+  ftp://ftp.tvdr.de/vdr/Developer/v4l-dvb-add-FE_CAN_TURBO_FEC.diff. A temporary
+  macro in dvbdevice.c defines the flag for all those who don't need this in the
+  driver, so that they can continue using an unmodified driver.
+  Thanks to Derek Kelly for testing this.
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Fixed handling "none" color entries in XPM files (thanks to Thomas G�nther).
+- Fixed a crash when creating a new channel if the channel list is empty (reported
+  by Halim Sahin).
+- Updated the Czech OSD texts (thanks to Radek Stastny).
+- Fixed a possible out of buffer memory access in case of bad TS data (reported
+  by Rolf Ahrenberg).
+- Implemented handling of HD resolution subtitles according to v1.3.1 of
+  ETSI EN 300 743, chapter 7.2.1 (thanks to Rolf Ahrenberg).
+- The EPG data now handles stream components 5 (H.264-video) and 6 (HEAAC-audio).
+- Fixed a problem with external Dolby Digital processing via the '-a' option in live
+  mode and with TS recordings (reported by Christopher Reimer).
+- Added handling MPEG audio types "ISO/IEC 14496-3 Audio with LATM transport syntax"
+  and "ISO/IEC 13818-7 Audio with ADTS transport syntax" (suggested by Luis Fernandes).
+  See man vdr(5) on how the APID section of channels has been extended to store
+  this information.
+- Added detecting channels that use service type 0x16.
+- Added full handling of the stream types of Dolby Digital pids
+  (thanks to Jose Alberto Reguero).
+- The new setup option "OSD/Number keys for characters" can be used to control whether
+  the number keys can be used to enter characters in a text input field (suggested
+  by Stefan Huskamp).
diff --git a/INSTALL b/INSTALL
index e0fc016a4..ee4f64a4f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -66,7 +66,7 @@ messages (tail -f /var/log/messages) to see if there are any problems.
 
 The program can be controlled via a network connection to its SVDRP
 port ("Simple Video Disk Recorder Protocol"). By default, it listens
-on port 2001 (use the --port=PORT option to change this). For details
+on port 6419 (use the --port=PORT option to change this). For details
 about the SVDRP syntax see the source file 'svdrp.c'.
 
 WARNING: DUE TO THE OPEN SVDRP PORT THIS PROGRAM MAY CONSTITUTE A
diff --git a/MANUAL b/MANUAL
index 3fd528f33..7fae53bbc 100644
--- a/MANUAL
+++ b/MANUAL
@@ -588,6 +588,11 @@ Version 1.6
                          Controls whether the full folder path is shown in the
                          "Timers" menu, or just the basic recording name.
 
+  Number keys for characters = yes
+                         Controls whether the number keys can be used to enter
+                         characters in a text input field. You may want to set this
+                         to "no" if you are using an actual keyboard to control VDR.
+
   EPG:
 
   EPG scan timeout = 5   The time (in hours) of user inactivity after which the
diff --git a/Makefile b/Makefile
index 31f05b04c..d788484d5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.8 2010/02/21 11:44:38 kls Exp $
+# $Id: Makefile 2.9 2010/04/10 12:40:15 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -21,7 +21,7 @@ MANDIR   = $(PREFIX)/share/man
 BINDIR   = $(PREFIX)/bin
 LOCDIR   = ./locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-INCLUDES = -I/usr/include/freetype2
+INCLUDES ?= -I/usr/include/freetype2
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
diff --git a/README b/README
index 28d4b98e5..9a1efb8f4 100644
--- a/README
+++ b/README
@@ -34,3 +34,7 @@ file management and even "on disk editing". The menus
 of commercial set-top boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
+
+
+"VDR Video Disk Recorder" is a registered trademark of Klaus Schmidinger. 
+"TVDR TV Done Right" is a registered trademark of Klaus Schmidinger. 
diff --git a/audio.c b/audio.c
index 66430d54d..abffa3ab3 100644
--- a/audio.c
+++ b/audio.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 2.1 2008/07/06 11:42:58 kls Exp $
+ * $Id: audio.c 2.2 2010/05/16 13:30:11 kls Exp $
  */
 
 #include "audio.h"
@@ -56,6 +56,7 @@ cExternalAudio::cExternalAudio(const char *Command)
 {
   command = strdup(Command);
   mute = false;
+  cDvbDevice::SetTransferModeForDolbyDigital(2);
 }
 
 cExternalAudio::~cExternalAudio()
@@ -68,7 +69,6 @@ void cExternalAudio::Play(const uchar *Data, int Length, uchar Id)
   if (command && !mute) {
      if (pipe || pipe.Open(command, "w")) {
         if (0x80 <= Id && Id <= 0x87 || Id == 0xBD) { // AC3
-           cDvbDevice::SetTransferModeForDolbyDigital(2);
            int written = Data[8] + 9; // skips the PES header
            if (Id != 0xBD)
               written += 4; // skips AC3 bytes
diff --git a/channels.c b/channels.c
index a694d54a6..ebc7eb197 100644
--- a/channels.c
+++ b/channels.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.13 2010/02/21 13:36:04 kls Exp $
+ * $Id: channels.c 2.16 2010/06/05 13:33:57 kls Exp $
  */
 
 #include "channels.h"
 #include <ctype.h>
 #include "device.h"
 #include "epg.h"
+#include "libsi/si.h"
 #include "timers.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
@@ -61,6 +62,7 @@ cChannel::cChannel(void)
   provider = strdup("");
   portalName = strdup("");
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
+  parameters = "";
   modification = CHANNELMOD_NONE;
   schedule     = NULL;
   linkChannels = NULL;
@@ -270,14 +272,21 @@ static int IntArraysDiffer(const int *a, const int *b, const char na[][MAXLANGCO
   return result;
 }
 
-static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[][MAXLANGCODE2] = NULL)
+static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[][MAXLANGCODE2] = NULL, const int *t = NULL)
 {
   char *q = s;
   int i = 0;
   while (a[i] || i == 0) {
         q += sprintf(q, Base == 16 ? "%s%X" : "%s%d", i ? "," : "", a[i]);
-        if (a[i] && n && *n[i])
-           q += sprintf(q, "=%s", n[i]);
+        const char *Delim = "=";
+        if (a[i]) {
+           if (n && *n[i]) {
+              q += sprintf(q, "%s%s", Delim, n[i]);
+              Delim = "";
+              }
+           if (t && t[i])
+              q += sprintf(q, "%s@%d", Delim, t[i]);
+           }
         if (!a[i])
            break;
         i++;
@@ -286,32 +295,32 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
   return q - s;
 }
 
-void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
+void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
 {
   int mod = CHANNELMOD_NONE;
   if (vpid != Vpid || ppid != Ppid || vtype != Vtype || tpid != Tpid)
      mod |= CHANNELMOD_PIDS;
-  int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs) | IntArraysDiffer(spids, Spids, slangs, SLangs);
+  int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(atypes, Atypes) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs) | IntArraysDiffer(dtypes, Dtypes) | IntArraysDiffer(spids, Spids, slangs, SLangs);
   if (m & STRDIFF)
      mod |= CHANNELMOD_LANGS;
   if (m & VALDIFF)
      mod |= CHANNELMOD_PIDS;
   if (mod) {
-     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia
+     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2 + 5) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod@type', +10: paranoia
      char OldApidsBuf[BufferSize];
      char NewApidsBuf[BufferSize];
      char *q = OldApidsBuf;
-     q += IntArrayToString(q, apids, 10, alangs);
+     q += IntArrayToString(q, apids, 10, alangs, atypes);
      if (dpids[0]) {
         *q++ = ';';
-        q += IntArrayToString(q, dpids, 10, dlangs);
+        q += IntArrayToString(q, dpids, 10, dlangs, dtypes);
         }
      *q = 0;
      q = NewApidsBuf;
-     q += IntArrayToString(q, Apids, 10, ALangs);
+     q += IntArrayToString(q, Apids, 10, ALangs, Atypes);
      if (Dpids[0]) {
         *q++ = ';';
-        q += IntArrayToString(q, Dpids, 10, DLangs);
+        q += IntArrayToString(q, Dpids, 10, DLangs, Dtypes);
         }
      *q = 0;
      const int SBufferSize = MAXSPIDS * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod', +10: paranoia
@@ -330,11 +339,13 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][
      vtype = Vtype;
      for (int i = 0; i < MAXAPIDS; i++) {
          apids[i] = Apids[i];
+         atypes[i] = Atypes[i];
          strn0cpy(alangs[i], ALangs[i], MAXLANGCODE2);
          }
      apids[MAXAPIDS] = 0;
      for (int i = 0; i < MAXDPIDS; i++) {
          dpids[i] = Dpids[i];
+         dtypes[i] = Dtypes[i];
          strn0cpy(dlangs[i], DLangs[i], MAXLANGCODE2);
          }
      dpids[MAXDPIDS] = 0;
@@ -484,13 +495,13 @@ cString cChannel::ToText(const cChannel *Channel)
      if (Channel->vpid && Channel->vtype)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "=%d", Channel->vtype);
      *q = 0;
-     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia
+     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2 + 5) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod@type', +10: paranoia
      char apidbuf[BufferSize];
      q = apidbuf;
-     q += IntArrayToString(q, Channel->apids, 10, Channel->alangs);
+     q += IntArrayToString(q, Channel->apids, 10, Channel->alangs, Channel->atypes);
      if (Channel->dpids[0]) {
         *q++ = ';';
-        q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs);
+        q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
         }
      *q = 0;
      char caidbuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
@@ -546,7 +557,9 @@ bool cChannel::Parse(const char *s)
         vpid = ppid = 0;
         vtype = 0;
         apids[0] = 0;
+        atypes[0] = 0;
         dpids[0] = 0;
+        dtypes[0] = 0;
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            parameters = parambuf;
@@ -579,9 +592,15 @@ bool cChannel::Parse(const char *s)
            char *strtok_next;
            while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
                  if (NumApids < MAXAPIDS) {
+                    atypes[NumApids] = 4; // backwards compatibility
                     char *l = strchr(q, '=');
                     if (l) {
                        *l++ = 0;
+                       char *t = strchr(l, '@');
+                       if (t) {
+                          *t++ = 0;
+                          atypes[NumApids] = strtol(t, NULL, 10);
+                          }
                        strn0cpy(alangs[NumApids], l, MAXLANGCODE2);
                        }
                     else
@@ -593,6 +612,7 @@ bool cChannel::Parse(const char *s)
                  p = NULL;
                  }
            apids[NumApids] = 0;
+           atypes[NumApids] = 0;
            if (dpidbuf) {
               char *p = dpidbuf;
               char *q;
@@ -600,9 +620,15 @@ bool cChannel::Parse(const char *s)
               char *strtok_next;
               while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
                     if (NumDpids < MAXDPIDS) {
+                       dtypes[NumDpids] = SI::AC3DescriptorTag; // backwards compatibility
                        char *l = strchr(q, '=');
                        if (l) {
                           *l++ = 0;
+                          char *t = strchr(l, '@');
+                          if (t) {
+                             *t++ = 0;
+                             dtypes[NumDpids] = strtol(t, NULL, 10);
+                             }
                           strn0cpy(dlangs[NumDpids], l, MAXLANGCODE2);
                           }
                        else
@@ -614,6 +640,7 @@ bool cChannel::Parse(const char *s)
                     p = NULL;
                     }
               dpids[NumDpids] = 0;
+              dtypes[NumDpids] = 0;
               }
 
            if (caidbuf) {
diff --git a/channels.h b/channels.h
index 5c9727f18..b8672974b 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.10 2010/03/07 13:47:13 kls Exp $
+ * $Id: channels.h 2.12 2010/06/05 13:12:54 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -104,8 +104,10 @@ class cChannel : public cListObject {
   int ppid;
   int vtype;
   int apids[MAXAPIDS + 1]; // list is zero-terminated
+  int atypes[MAXAPIDS + 1]; // list is zero-terminated
   char alangs[MAXAPIDS][MAXLANGCODE2];
   int dpids[MAXDPIDS + 1]; // list is zero-terminated
+  int dtypes[MAXAPIDS + 1]; // list is zero-terminated
   char dlangs[MAXDPIDS][MAXLANGCODE2];
   int spids[MAXSPIDS + 1]; // list is zero-terminated
   char slangs[MAXSPIDS][MAXLANGCODE2];
@@ -156,6 +158,8 @@ class cChannel : public cListObject {
   const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; }
   const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; }
   const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; }
+  int Atype(int i) const { return (0 <= i && i < MAXAPIDS) ? atypes[i] : 0; }
+  int Dtype(int i) const { return (0 <= i && i < MAXDPIDS) ? dtypes[i] : 0; }
   uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : uchar(0); }
   uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); }
   uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); }
@@ -185,7 +189,7 @@ class cChannel : public cListObject {
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
-  void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+  void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(const int *CaIds); // list must be zero-terminated
   void SetCaDescriptors(int Level);
   void SetLinkChannels(cLinkChannels *LinkChannels);
diff --git a/config.c b/config.c
index aa18ebcf9..73b11b18c 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.12 2010/03/12 16:41:37 kls Exp $
+ * $Id: config.c 2.13 2010/06/06 10:06:43 kls Exp $
  */
 
 #include "config.h"
@@ -355,6 +355,7 @@ cSetup::cSetup(void)
   VpsMargin = 120;
   RecordingDirs = 1;
   FoldersInTimerMenu = 1;
+  NumberKeysForChars = 1;
   VideoDisplayFormat = 1;
   VideoFormat = 0;
   UpdateChannels = 5;
@@ -545,6 +546,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
+  else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
   else if (!strcasecmp(Name, "VideoDisplayFormat"))  VideoDisplayFormat = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
@@ -640,6 +642,7 @@ bool cSetup::Save(void)
   Store("VpsMargin",          VpsMargin);
   Store("RecordingDirs",      RecordingDirs);
   Store("FoldersInTimerMenu", FoldersInTimerMenu);
+  Store("NumberKeysForChars", NumberKeysForChars);
   Store("VideoDisplayFormat", VideoDisplayFormat);
   Store("VideoFormat",        VideoFormat);
   Store("UpdateChannels",     UpdateChannels);
diff --git a/config.h b/config.h
index f4996bb3a..7041eb7ea 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.25 2010/03/12 16:02:53 kls Exp $
+ * $Id: config.h 2.27 2010/06/06 09:53:02 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.14"
-#define VDRVERSNUM   10714  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.15"
+#define VDRVERSNUM   10715  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.14"
-#define APIVERSNUM   10714  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.15"
+#define APIVERSNUM   10715  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -254,6 +254,7 @@ class cSetup : public cConfig<cSetupLine> {
   int VpsMargin;
   int RecordingDirs;
   int FoldersInTimerMenu;
+  int NumberKeysForChars;
   int VideoDisplayFormat;
   int VideoFormat;
   int UpdateChannels;
diff --git a/device.c b/device.c
index ac4d6d49a..681049b8e 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.35 2010/02/07 11:54:42 kls Exp $
+ * $Id: device.c 2.37 2010/06/03 13:35:02 kls Exp $
  */
 
 #include "device.h"
@@ -152,7 +152,7 @@ int cDevice::NextCardIndex(int n)
         esyslog("ERROR: nextCardIndex too big (%d)", nextCardIndex);
      }
   else if (n < 0)
-     esyslog("ERROR: invalid value in IncCardIndex(%d)", n);
+     esyslog("ERROR: invalid value in nextCardIndex(%d)", n);
   return nextCardIndex;
 }
 
@@ -215,7 +215,7 @@ cDevice *cDevice::GetDevice(int Index)
 
 static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
 {
-  int MaxNumProvidedSystems = 1 << AvailableBits;
+  int MaxNumProvidedSystems = (1 << AvailableBits) - 1;
   int NumProvidedSystems = Device->NumProvidedSystems();
   if (NumProvidedSystems > MaxNumProvidedSystems) {
      esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->CardIndex() + 1, NumProvidedSystems, MaxNumProvidedSystems);
@@ -281,7 +281,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
              imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
-             imp <<= 2; imp |= GetClippedNumProvidedSystems(2, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
+             imp <<= 4; imp |= GetClippedNumProvidedSystems(4, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
              imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
diff --git a/device.h b/device.h
index 9ce814a1a..cb3bc2caa 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.21 2010/02/06 14:34:41 kls Exp $
+ * $Id: device.h 2.22 2010/04/05 09:51:29 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -91,6 +91,9 @@ class cLiveSubtitle;
 class cDeviceHook : public cListObject {
 public:
   cDeviceHook(void);
+          ///< Creates a new device hook object.
+          ///< Do not delete this object - it will be automatically deleted when the
+          ///< program ends.
   virtual bool DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const;
           ///< Returns true if the given Device can provide the given Channel's transponder.
   };
diff --git a/dvbdevice.c b/dvbdevice.c
index 75e0ca845..f32b35008 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.32 2010/03/07 13:58:24 kls Exp $
+ * $Id: dvbdevice.c 2.38 2010/05/01 09:47:13 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -21,6 +21,8 @@
 #include "menuitems.h"
 #include "sourceparams.h"
 
+#define FE_CAN_TURBO_FEC  0x8000000 // TODO: remove this once it is defined in the driver
+
 #define DVBS_TUNE_TIMEOUT  9000 //ms
 #define DVBS_LOCK_TIMEOUT  2000 //ms
 #define DVBC_TUNE_TIMEOUT  9000 //ms
@@ -149,6 +151,14 @@ int MapToUser(int Value, const tDvbParameterMap *Map, const char **String)
   return -1;
 }
 
+const char *MapToUserString(int Value, const tDvbParameterMap *Map)
+{
+  int n = DriverIndex(Value, Map);
+  if (n >= 0)
+     return Map[n].userString;
+  return "???";
+}
+
 int MapToDriver(int Value, const tDvbParameterMap *Map)
 {
   int n = UserIndex(Value, Map);
@@ -692,7 +702,22 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
         numProvidedSystems++;
         if (frontendType == SYS_DVBS2)
            numProvidedSystems++;
-        isyslog("frontend %d/%d provides %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], frontendInfo.name);
+        char Modulations[64];
+        char *p = Modulations;
+        if (frontendInfo.caps & FE_CAN_QPSK)    { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QPSK, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_QAM_16)  { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_16, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_QAM_32)  { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_32, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_QAM_64)  { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_64, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_QAM_128) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_128, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_QAM_256) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_256, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_8VSB)    { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(VSB_8, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_16VSB)   { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(VSB_16, ModulationValues)); }
+        if (frontendInfo.caps & FE_CAN_TURBO_FEC){numProvidedSystems++; p += sprintf(p, ",%s", "TURBO_FEC"); }
+        if (p != Modulations)
+           p = Modulations + 1; // skips first ','
+        else
+           p = (char *)"unknown modulations";
+        isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], p, frontendInfo.name);
         dvbTuner = new cDvbTuner(CardIndex() + 1, fd_frontend, adapter, frontend, frontendType);
         }
      }
@@ -886,12 +911,21 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 {
   if (!ProvidesSource(Channel->Source()))
      return false; // doesn't provide source
-  if (!cSource::IsSat(Channel->Source()))
-     return DeviceHooksProvidesTransponder(Channel); // source is sufficient for non sat
   cDvbTransponderParameters dtp(Channel->Parameters());
-  if (frontendType == SYS_DVBS && dtp.System() == SYS_DVBS2)
+  if (dtp.System() == SYS_DVBS2 && frontendType == SYS_DVBS ||
+     dtp.Modulation() == QPSK     && !(frontendInfo.caps & FE_CAN_QPSK) ||
+     dtp.Modulation() == QAM_16   && !(frontendInfo.caps & FE_CAN_QAM_16) ||
+     dtp.Modulation() == QAM_32   && !(frontendInfo.caps & FE_CAN_QAM_32) ||
+     dtp.Modulation() == QAM_64   && !(frontendInfo.caps & FE_CAN_QAM_64) ||
+     dtp.Modulation() == QAM_128  && !(frontendInfo.caps & FE_CAN_QAM_128) ||
+     dtp.Modulation() == QAM_256  && !(frontendInfo.caps & FE_CAN_QAM_256) ||
+     dtp.Modulation() == QAM_AUTO && !(frontendInfo.caps & FE_CAN_QAM_AUTO) ||
+     dtp.Modulation() == VSB_8    && !(frontendInfo.caps & FE_CAN_8VSB) ||
+     dtp.Modulation() == VSB_16   && !(frontendInfo.caps & FE_CAN_16VSB) ||
+     dtp.Modulation() == PSK_8    && !(frontendInfo.caps & FE_CAN_TURBO_FEC) && dtp.System() == SYS_DVBS) // "turbo fec" is a non standard FEC used by North American broadcasters - this is a best guess to determine this condition
      return false; // requires modulation system which frontend doesn't provide
-  if (!Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization()))
+  if (!cSource::IsSat(Channel->Source()) ||
+     !Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization()))
      return DeviceHooksProvidesTransponder(Channel);
   return false;
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index dceedd138..ff606fd4a 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.13 2010/02/21 14:06:08 kls Exp $
+ * $Id: dvbdevice.h 2.14 2010/04/11 10:29:37 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -37,6 +37,7 @@ struct tDvbParameterMap {
   const char *userString;
   };
 
+const char *MapToUserString(int Value, const tDvbParameterMap *Map);
 int MapToUser(int Value, const tDvbParameterMap *Map, const char **String = NULL);
 int MapToDriver(int Value, const tDvbParameterMap *Map);
 int UserIndex(int Value, const tDvbParameterMap *Map);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index a02a01f33..6ecb3b78d 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.4 2010/02/07 12:08:13 kls Exp $
+ * $Id: dvbsubtitle.c 2.6 2010/06/05 14:03:55 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -17,6 +17,7 @@
 #define REGION_COMPOSITION_SEGMENT 0x11
 #define CLUT_DEFINITION_SEGMENT    0x12
 #define OBJECT_DATA_SEGMENT        0x13
+#define DISPLAY_DEFINITION_SEGMENT 0x14
 #define END_OF_DISPLAY_SET_SEGMENT 0x80
 
 // Set these to 'true' for debug output:
@@ -659,6 +660,11 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
   dvbSubtitleAssembler = new cDvbSubtitleAssembler;
   osd = NULL;
   frozen = false;
+  ddsVersionNumber = 0;
+  displayWidth = 720;
+  displayHeight = 576;
+  displayHorizontalOffset = 0;
+  displayVerticalOffset = 0;
   pages = new cList<cDvbSubtitlePage>;
   bitmaps = new cList<cDvbSubtitleBitmaps>;
   Start();
@@ -687,6 +693,11 @@ void cDvbSubtitleConverter::Reset(void)
   bitmaps->Clear();
   DELETENULL(osd);
   frozen = false;
+  ddsVersionNumber = 0;
+  displayWidth = 720;
+  displayHeight = 576;
+  displayHorizontalOffset = 0;
+  displayVerticalOffset = 0;
   Unlock();
 }
 
@@ -842,7 +853,7 @@ tColor cDvbSubtitleConverter::yuv2rgb(int Y, int Cb, int Cr)
 
 bool cDvbSubtitleConverter::AssertOsd(void)
 {
-  return osd || (osd = cOsdProvider::NewOsd(0, Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
+  return osd || (osd = cOsdProvider::NewOsd(displayHorizontalOffset, displayVerticalOffset + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
 }
 
 int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
@@ -1001,6 +1012,26 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
                }
             break;
             }
+       case DISPLAY_DEFINITION_SEGMENT: {
+            dbgsegments("DISPLAY_DEFINITION_SEGMENT\n");
+            int version = (Data[6] & 0xF0) >> 4;
+            if (version != ddsVersionNumber) {
+               int displayWindowFlag   = (Data[6] & 0x08) >> 3;
+               displayHorizontalOffset = 0;
+               displayVerticalOffset   = 0;
+               displayWidth            = ((Data[7] << 8) | Data[8]) + 1;
+               displayHeight           = ((Data[9] << 8) | Data[10]) + 1;
+               if (displayWindowFlag) { 
+                  displayHorizontalOffset = (Data[11] << 8) | Data[12];                                 // displayWindowHorizontalPositionMinimum
+                  displayWidth            = ((Data[13] << 8) | Data[14]) - displayHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
+                  displayVerticalOffset   = (Data[15] << 8) | Data[16];                                 // displayWindowVerticalPositionMinimum
+                  displayHeight           = ((Data[17] << 8) | Data[18]) - displayVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
+                  }
+               SetupChanged();
+               ddsVersionNumber = version;
+               }
+            break;
+            }
        case END_OF_DISPLAY_SET_SEGMENT: {
             dbgsegments("END_OF_DISPLAY_SET_SEGMENT\n");
             FinishPage(page);
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index c6775a9e2..688866101 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.2 2010/02/07 11:55:14 kls Exp $
+ * $Id: dvbsubtitle.h 2.3 2010/05/13 14:43:44 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -26,6 +26,11 @@ class cDvbSubtitleConverter : public cThread {
   cDvbSubtitleAssembler *dvbSubtitleAssembler;
   cOsd *osd;
   bool frozen;
+  int ddsVersionNumber;
+  int displayWidth;
+  int displayHeight;
+  int displayHorizontalOffset;
+  int displayVerticalOffset;
   cList<cDvbSubtitlePage> *pages;
   cList<cDvbSubtitleBitmaps> *bitmaps;
   tColor yuv2rgb(int Y, int Cb, int Cr);
diff --git a/eit.c b/eit.c
index 37a4a4be4..ed16163f5 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.11 2010/01/08 15:17:09 kls Exp $
+ * $Id: eit.c 2.12 2010/05/14 14:08:35 kls Exp $
  */
 
 #include "eit.h"
@@ -257,7 +257,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  SI::ComponentDescriptor *cd = (SI::ComponentDescriptor *)d;
                  uchar Stream = cd->getStreamContent();
                  uchar Type = cd->getComponentType();
-                 if (1 <= Stream && Stream <= 4 && Type != 0) { // 1=video, 2=audio, 3=subtitles, 4=AC3
+                 if (1 <= Stream && Stream <= 6 && Type != 0) { // 1=MPEG2-video, 2=MPEG1-audio, 3=subtitles, 4=AC3-audio, 5=H.264-video, 6=HEAAC-audio
                     if (!Components)
                        Components = new cComponents;
                     char buffer[Utf8BufSize(256)];
diff --git a/keys.c b/keys.c
index f05e9370b..3b7c27cc9 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 2.0 2008/02/10 14:08:48 kls Exp $
+ * $Id: keys.c 2.1 2010/04/05 10:05:58 kls Exp $
  */
 
 #include "keys.h"
@@ -56,6 +56,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { kRecordings,    trNOOP("Key$Recordings")  },
                     { kSetup,         trNOOP("Key$Setup")       },
                     { kCommands,      trNOOP("Key$Commands")    },
+                    { kUser0,         trNOOP("Key$User0")       },
                     { kUser1,         trNOOP("Key$User1")       },
                     { kUser2,         trNOOP("Key$User2")       },
                     { kUser3,         trNOOP("Key$User3")       },
diff --git a/keys.h b/keys.h
index 2d2e46ca5..3cc4371ab 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 2.0 2007/08/26 12:34:50 kls Exp $
+ * $Id: keys.h 2.1 2010/04/05 10:06:04 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -50,7 +50,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kRecordings,
              kSetup,
              kCommands,
-             kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9,
+             kUser0, kUser1, kUser2, kUser3, kUser4, kUser5, kUser6, kUser7, kUser8, kUser9,
              kNone,
              kKbd,
              // The following codes are used internally:
diff --git a/menu.c b/menu.c
index e3b49ceec..19cfabb3e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.21 2010/03/12 16:03:07 kls Exp $
+ * $Id: menu.c 2.24 2010/06/06 09:56:16 kls Exp $
  */
 
 #include "menu.h"
@@ -210,16 +210,18 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 {
   channel = Channel;
   sourceParam = NULL;
+  *name = 0;
   if (channel) {
      data = *channel;
+     strn0cpy(name, data.name, sizeof(name));
      if (New) {
         channel = NULL;
         data.nid = 0;
         data.tid = 0;
         data.rid = 0;
         }
-     Setup();
      }
+  Setup();
 }
 
 void cMenuEditChannel::Setup(void)
@@ -229,7 +231,6 @@ void cMenuEditChannel::Setup(void)
   Clear();
 
   // Parameters for all types of sources:
-  strn0cpy(name, data.name, sizeof(name));
   Add(new cMenuEditStrItem( tr("Name"),          name, sizeof(name)));
   Add(new cMenuEditSrcItem( tr("Source"),       &data.source));
   Add(new cMenuEditIntItem( tr("Frequency"),    &data.frequency));
@@ -2568,6 +2569,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"),        &data.MenuKeyCloses));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
   SetCurrent(Get(current));
   Display();
 }
diff --git a/menuitems.c b/menuitems.c
index 7faf2b73b..c5eba6e92 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.6 2010/02/16 14:44:35 kls Exp $
+ * $Id: menuitems.c 2.7 2010/06/06 10:37:08 kls Exp $
  */
 
 #include "menuitems.h"
@@ -488,6 +488,20 @@ uint cMenuEditStrItem::Inc(uint c, bool Up)
   return *p;
 }
 
+void cMenuEditStrItem::Type(uint c)
+{
+  if (insert && lengthUtf8 < length - 1)
+     Insert();
+  valueUtf8[pos] = c;
+  if (pos < length - 2)
+     pos++;
+  if (pos >= lengthUtf8) {
+     valueUtf8[pos] = ' ';
+     valueUtf8[pos + 1] = 0;
+     lengthUtf8 = pos + 1;
+     }
+}
+
 void cMenuEditStrItem::Insert(void)
 {
   memmove(valueUtf8 + pos + 1, valueUtf8 + pos, (lengthUtf8 - pos + 1) * sizeof(*valueUtf8));
@@ -597,39 +611,43 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
     case k0|k_Repeat ... k9|k_Repeat:
     case k0 ... k9: {
                  if (InEditMode()) {
-                    if (!SameKey) {
-                       if (!newchar)
-                          AdvancePos();
-                       currentCharUtf8 = NULL;
-                       }
-                    if (!currentCharUtf8 || !*currentCharUtf8 || *currentCharUtf8 == '\t') {
-                       // find the beginning of the character map entry for Key
-                       int n = NORMALKEY(Key) - k0;
-                       currentCharUtf8 = charMapUtf8;
-                       while (n > 0 && *currentCharUtf8) {
-                             if (*currentCharUtf8++ == '\t')
-                                n--;
+                    if (Setup.NumberKeysForChars) {
+                       if (!SameKey) {
+                          if (!newchar)
+                             AdvancePos();
+                          currentCharUtf8 = NULL;
+                          }
+                       if (!currentCharUtf8 || !*currentCharUtf8 || *currentCharUtf8 == '\t') {
+                          // find the beginning of the character map entry for Key
+                          int n = NORMALKEY(Key) - k0;
+                          currentCharUtf8 = charMapUtf8;
+                          while (n > 0 && *currentCharUtf8) {
+                                if (*currentCharUtf8++ == '\t')
+                                   n--;
+                                }
+                          // find first allowed character
+                          while (*currentCharUtf8 && *currentCharUtf8 != '\t' && !IsAllowed(*currentCharUtf8))
+                                currentCharUtf8++;
+                          }
+                       if (*currentCharUtf8 && *currentCharUtf8 != '\t') {
+                          if (insert && newchar) {
+                             // create a new character in insert mode
+                             if (lengthUtf8 < length - 1)
+                                Insert();
                              }
-                       // find first allowed character
-                       while (*currentCharUtf8 && *currentCharUtf8 != '\t' && !IsAllowed(*currentCharUtf8))
+                          valueUtf8[pos] = *currentCharUtf8;
+                          if (uppercase)
+                             valueUtf8[pos] = Utf8to(upper, valueUtf8[pos]);
+                          // find next allowed character
+                          do {
                              currentCharUtf8++;
-                       }
-                    if (*currentCharUtf8 && *currentCharUtf8 != '\t') {
-                       if (insert && newchar) {
-                          // create a new character in insert mode
-                          if (lengthUtf8 < length - 1)
-                             Insert();
+                             } while (*currentCharUtf8 && *currentCharUtf8 != '\t' && !IsAllowed(*currentCharUtf8));
+                          newchar = false;
+                          autoAdvanceTimeout.Set(AUTO_ADVANCE_TIMEOUT);
                           }
-                       valueUtf8[pos] = *currentCharUtf8;
-                       if (uppercase)
-                          valueUtf8[pos] = Utf8to(upper, valueUtf8[pos]);
-                       // find next allowed character
-                       do {
-                          currentCharUtf8++;
-                          } while (*currentCharUtf8 && *currentCharUtf8 != '\t' && !IsAllowed(*currentCharUtf8));
-                       newchar = false;
-                       autoAdvanceTimeout.Set(AUTO_ADVANCE_TIMEOUT);
                        }
+                    else
+                       Type('0' + NORMALKEY(Key) - k0);
                     }
                  else
                     return cMenuEditItem::ProcessKey(Key);
@@ -645,19 +663,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
     default:     if (InEditMode() && BASICKEY(Key) == kKbd) {
                     int c = KEYKBD(Key);
                     if (c <= 0xFF) { // FIXME what about other UTF-8 characters?
-                       uint *p = IsAllowed(Utf8to(lower, c));
-                       if (p) {
-                          if (insert && lengthUtf8 < length - 1)
-                             Insert();
-                          valueUtf8[pos] = c;
-                          if (pos < length - 2)
-                             pos++;
-                          if (pos >= lengthUtf8) {
-                             valueUtf8[pos] = ' ';
-                             valueUtf8[pos + 1] = 0;
-                             lengthUtf8 = pos + 1;
-                             }
-                          }
+                       if (IsAllowed(Utf8to(lower, c)))
+                          Type(c);
                        else {
                           switch (c) {
                             case 0x7F: // backspace
diff --git a/menuitems.h b/menuitems.h
index 4805e3fd7..6e8f1082f 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.3 2010/02/21 13:58:21 kls Exp $
+ * $Id: menuitems.h 2.4 2010/06/06 10:32:38 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -108,6 +108,7 @@ class cMenuEditStrItem : public cMenuEditItem {
   void AdvancePos(void);
   virtual void Set(void);
   uint Inc(uint c, bool Up);
+  void Type(uint c);
   void Insert(void);
   void Delete(void);
 protected:
diff --git a/osd.c b/osd.c
index cc6033757..9d4e6a42c 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.9 2010/01/22 15:58:39 kls Exp $
+ * $Id: osd.c 2.10 2010/05/02 13:56:53 kls Exp $
  */
 
 #include "osd.h"
@@ -360,10 +360,10 @@ bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
          }
       s = skipspace(s + 1);
       if (strcasecmp(s, "none") == 0) {
-         s = "#00000000";
          NoneColorIndex = i;
-         if (IgnoreNone)
-            continue;
+         if (!IgnoreNone)
+            SetColor(i, clrTransparent);
+         continue;
          }
       if (*s != '#') {
          esyslog("ERROR: unknown color code in XPM: '%c'", *s);
diff --git a/pat.c b/pat.c
index 0d084e5e3..56ad5aeb1 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.8 2010/03/06 12:00:30 kls Exp $
+ * $Id: pat.c 2.11 2010/06/05 13:26:47 kls Exp $
  */
 
 #include "pat.h"
@@ -332,7 +332,9 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = 0;
         int Vtype = 0;
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
+        int Atypes[MAXDPIDS + 1] = { 0 };
         int Dpids[MAXDPIDS + 1] = { 0 };
+        int Dtypes[MAXDPIDS + 1] = { 0 };
         int Spids[MAXSPIDS + 1] = { 0 };
         uchar SubtitlingTypes[MAXSPIDS + 1] = { 0 };
         uint16_t CompositionPageIds[MAXSPIDS + 1] = { 0 };
@@ -358,9 +360,12 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
               case 4: // STREAMTYPE_13818_AUDIO
+              case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport sytax
+              case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
                       {
                       if (NumApids < MAXAPIDS) {
                          Apids[NumApids] = esPid;
+                         Atypes[NumApids] = stream.getStreamType();
                          SI::Descriptor *d;
                          for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                              switch (d->getDescriptorTag()) {
@@ -395,12 +400,15 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               //XXX case 8: // STREAMTYPE_13818_DSMCC
                       {
                       int dpid = 0;
+                      int dtype = 0;
                       char lang[MAXLANGCODE1] = { 0 };
                       SI::Descriptor *d;
                       for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                           switch (d->getDescriptorTag()) {
                             case SI::AC3DescriptorTag:
+                            case SI::EnhancedAC3DescriptorTag:
                                  dpid = esPid;
+                                 dtype = d->getDescriptorTag();
                                  ProcessCaDescriptors = true;
                                  break;
                             case SI::SubtitlingDescriptorTag:
@@ -441,6 +449,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       if (dpid) {
                          if (NumDpids < MAXDPIDS) {
                             Dpids[NumDpids] = dpid;
+                            Dtypes[NumDpids] = dtype;
                             strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
                             NumDpids++;
                             }
@@ -480,7 +489,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                }
             }
         if (Setup.UpdateChannels >= 2) {
-           Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+           Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
            Channel->SetCaIds(CaDescriptors->CaIds());
            Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
            }
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 1dd35e316..247113ba7 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalanian\n"
@@ -478,6 +478,9 @@ msgstr "Configuraci
 msgid "Key$Commands"
 msgstr "Ordres"
 
+msgid "Key$User0"
+msgstr "Usuari 0"
+
 msgid "Key$User1"
 msgstr "Usuari 1"
 
@@ -839,6 +842,9 @@ msgstr "Gravacions en subcarpetes"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guia de Programes"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index e8c6687e0..f6313badd 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,381 +1,382 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006, 2008
-# Ji�� Dobr� <jdobry@centrum.cz>, 2008
+# Vladimír Bárta <vladimir.barta@k2atmitec.cz>, 2006, 2008
+# Jiří Dobrý <jdobry@centrum.cz>, 2008
+# Radek Šťastný <dedkus@gmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
-"PO-Revision-Date: 2008-02-28 15:00+0200\n"
-"Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, Ji�� Dobr� <jdobry@centrum.cz>\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"PO-Revision-Date: 2010-05-06 11:00+0200\n"
+"Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Neplatn� kan�l ***"
+msgstr "*** Neplatný kanál ***"
 
 msgid "Channel not available!"
-msgstr "Kan�l nen� dostupn�!"
+msgstr "Kanál není dostupný!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Nelze za��t s p�enosem"
+msgstr "Nelze začít s přenosem"
 
 msgid "off"
 msgstr "vyp."
 
 msgid "on"
-msgstr ""
+msgstr "zap. "
 
 msgid "auto"
 msgstr "auto"
 
 msgid "none"
-msgstr "��dn�"
+msgstr "žádný"
 
 msgid "Polarization"
 msgstr "Polarizace"
 
 msgid "System"
-msgstr ""
+msgstr "Systém"
 
 msgid "Srate"
-msgstr "Srate"
+msgstr ""
 
 msgid "Inversion"
-msgstr "Inversion"
+msgstr ""
 
 msgid "CoderateH"
-msgstr "CoderateH"
+msgstr ""
 
 msgid "CoderateL"
-msgstr "CoderateL"
+msgstr ""
 
 msgid "Modulation"
 msgstr "Modulace"
 
 msgid "Bandwidth"
-msgstr "���ka p�sma"
+msgstr "Šířka pásma"
 
 msgid "Transmission"
-msgstr "P�enos"
+msgstr "Přenos"
 
 msgid "Guard"
-msgstr "Guard"
+msgstr "Ochranný interval"
 
 msgid "Hierarchy"
-msgstr "Hierarchy"
+msgstr "Hierarchický mód"
 
 msgid "Rolloff"
 msgstr ""
 
 msgid "Starting EPG scan"
-msgstr "Za��n� prohled�v�n� EPG"
+msgstr "Začíná prohledávání EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "dobrodruřný/western/válečný"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Science Fiction/Fantasy/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "komedie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "mýdlová opera/melodrama/folklorní"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "romantický"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "skutečný/klasický/náboženství/historický film/drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "film pro dospělé/drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "aktuální události"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "počasí"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "zprávy"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "dokumentární"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "diskuze/rozhovor/debata"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "zábavné hry"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "soutěžní/vědomostní/soutěžní hra"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "varieté"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "diskuzní pořad"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "zvláštní událost"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "sportovní pořad"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "fotbal"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "týmové sporty"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "atletika"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "motorismus"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "vodní sporty"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "zimní sporty"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "jezdectví"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "bojové sporty"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "pro děti a mládež"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "pro předškloní děti"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "zábavné pro děti od 6 do 14 let"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "zábavné pro děti od 10 do 16 let"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "informační/zpravdajský/školní program"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "kreslené / loutky"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "hudba/balet/tanec"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "rock/pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "vážná/klasická hudba"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "folk/country"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "muzikál/opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "balet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "umění/kultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "múzické umění"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "výtvarné umění"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "náboženství"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "populární kultura/tradiční umění"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "film/kino"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "experimentální film/video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "vysílání/tisk"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "nová média"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "kulturní magazín"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "móda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "sociální/politické/ekonomické"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "časopis/report/dokumentární"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "ekonomika/sociální poradenství"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "významné osobnosti"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "vzdělávání/věda/fakta"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "příroda/zvířata/životní prostředí"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "technologie/přírodní vědy"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "medicína/filozofie/psychologie"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "zahraničí/expedice"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "sociální / duchovní vědy"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "další vzdělávání"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "jazyky"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "volný čas/koníčky"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "turistika/cestování"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "řemesla"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "motorismus"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "fittens a zdraví"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "vaření"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "reklama"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "zahradnictví"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "původní jazyky"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "černobílé"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "nepublikované"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "živé vysílání"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "Rodičovká kontrola od %d"
 
 msgid "No title"
-msgstr "Bez n�zvu"
+msgstr "Bez názvu"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
-msgstr "�esky"
+msgstr "Česky"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
 msgstr "cze"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "F�ze 1: Detekce typu k�du"
+msgstr "Fáze 1: Detekce typu kódu"
 
 msgid "Press any key on the RC unit"
-msgstr "Stiskn�te libovolnou kl�vesu ovl�d�n�"
+msgstr "Stiskněte libovolnou klávesu ovládání"
 
 msgid "RC code detected!"
-msgstr "K�d byl detekov�n!"
+msgstr "Kód byl detekován!"
 
 msgid "Do not press any key..."
-msgstr "Nema�kejte ��dn� kl�vesy..."
+msgstr "Nemačkejte žádné klávesy..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "F�ze 2: U�en� konkr�tn�ho k�du kl�ves"
+msgstr "Fáze 2: Učení konkrétního kódu kláves"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Stiskn�te kl�vesu pro '%s'"
+msgstr "Stiskněte klávesu pro '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Stiskn�te 'Nahoru' pro potvrzen�"
+msgstr "Stiskněte 'Nahoru' pro potvrzení"
 
 msgid "Press 'Down' to continue"
-msgstr "Stiskn�te 'Dol�' pro pokra�ov�n�"
+msgstr "Stiskněte 'Dolů' pro pokračování"
 
 msgid "(press 'Up' to go back)"
-msgstr "(stiskn�te 'Nahoru' pro zp�t)"
+msgstr "(stiskněte 'Nahoru' pro zpět)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(stiskn�te 'Dol�' pro ukon�en�)"
+msgstr "(stiskněte 'Dolů' pro ukončení)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(stiskn�te 'Menu' pro p�esko�en� definice kl�vesy)"
+msgstr "(stiskněte 'Menu' pro přeskočení definice klávesy)"
 
 msgid "Learning Remote Control Keys"
-msgstr "U�en� k�d� d�lkov�ho ovl�d�n�"
+msgstr "Učení kódů dálkového ovládání"
 
 msgid "Phase 3: Saving key codes"
-msgstr "F�ze 3: Ulo�en� k�d�"
+msgstr "Fáze 3: Uložení kódů"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Stiskn�te 'Nahoru' pro ulo�en�, 'Dol�' pro zru�en�"
+msgstr "Stiskněte 'Nahoru' pro uložení, 'Dolů' pro zrušení"
 
 msgid "Key$Up"
 msgstr "Nahoru"
 
 msgid "Key$Down"
-msgstr "Dol�"
+msgstr "Dolů"
 
 msgid "Key$Menu"
 msgstr "Menu"
@@ -384,7 +385,7 @@ msgid "Key$Ok"
 msgstr "Ok"
 
 msgid "Key$Back"
-msgstr "Zp�t"
+msgstr "Zpět"
 
 msgid "Key$Left"
 msgstr "Vlevo"
@@ -393,55 +394,55 @@ msgid "Key$Right"
 msgstr "Vpravo"
 
 msgid "Key$Red"
-msgstr "�erven�"
+msgstr "Červený"
 
 msgid "Key$Green"
-msgstr "Zelen�"
+msgstr "Zelený"
 
 msgid "Key$Yellow"
-msgstr "�lut�"
+msgstr "Žlutý"
 
 msgid "Key$Blue"
-msgstr "Modr�"
+msgstr "Modrý"
 
 msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play"
-msgstr "P�ehr�t"
+msgstr "Přehrát"
 
 msgid "Key$Pause"
-msgstr "P�eru�it"
+msgstr "Přerušit"
 
 msgid "Key$Stop"
 msgstr "Zastavit"
 
 msgid "Key$Record"
-msgstr "Nahr�t"
+msgstr "Nahrát"
 
 msgid "Key$FastFwd"
-msgstr "Dop�edu"
+msgstr "Dopředu"
 
 msgid "Key$FastRew"
 msgstr "Dozadu"
 
 msgid "Key$Next"
-msgstr "D�le"
+msgstr "Dále"
 
 msgid "Key$Prev"
-msgstr "Zp�t"
+msgstr "Zpět"
 
 msgid "Key$Power"
-msgstr "Vyp�na�"
+msgstr "Vypínač"
 
 msgid "Key$Channel+"
-msgstr "Kan�l+"
+msgstr "Kanál+"
 
 msgid "Key$Channel-"
-msgstr "Kan�l-"
+msgstr "Kanál-"
 
 msgid "Key$PrevChannel"
-msgstr "P�edch�zej�c� kan�l"
+msgstr "Předcházející kanál"
 
 msgid "Key$Volume+"
 msgstr "Hlasitost+"
@@ -462,46 +463,49 @@ msgid "Key$Schedule"
 msgstr "Program (EPG)"
 
 msgid "Key$Channels"
-msgstr "Kan�ly"
+msgstr "Kanály"
 
 msgid "Key$Timers"
-msgstr "�asova�e"
+msgstr "Časovače"
 
 msgid "Key$Recordings"
-msgstr "Nahr�vky"
+msgstr "Nahrávky"
 
 msgid "Key$Setup"
-msgstr "Nastaven�"
+msgstr "Nastavení"
 
 msgid "Key$Commands"
-msgstr "P��kazy"
+msgstr "Příkazy"
+
+msgid "Key$User0"
+msgstr "Uživatel0"
 
 msgid "Key$User1"
-msgstr "U�ivatel1"
+msgstr "Uživatel1"
 
 msgid "Key$User2"
-msgstr "U�ivatel2"
+msgstr "Uživatel2"
 
 msgid "Key$User3"
-msgstr "U�ivatel3"
+msgstr "Uživatel3"
 
 msgid "Key$User4"
-msgstr "U�ivatel4"
+msgstr "Uživatel4"
 
 msgid "Key$User5"
-msgstr "U�ivatel5"
+msgstr "Uživatel5"
 
 msgid "Key$User6"
-msgstr "U�ivatel6"
+msgstr "Uživatel6"
 
 msgid "Key$User7"
-msgstr "U�ivatel7"
+msgstr "Uživatel7"
 
 msgid "Key$User8"
-msgstr "U�ivatel8"
+msgstr "Uživatel8"
 
 msgid "Key$User9"
-msgstr "U�ivatel9"
+msgstr "Uživatel9"
 
 msgid "Disk"
 msgstr "Disk"
@@ -510,16 +514,16 @@ msgid "free"
 msgstr "volno"
 
 msgid "Free To Air"
-msgstr "voln�"
+msgstr "volný"
 
 msgid "encrypted"
-msgstr "k�dovan�"
+msgstr "kódovaný"
 
 msgid "Edit channel"
-msgstr "Editace kan�lu"
+msgstr "Editace kanálu"
 
 msgid "Name"
-msgstr "N�zev"
+msgstr "Název"
 
 msgid "Source"
 msgstr "Zdroj"
@@ -561,68 +565,68 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Channel settings are not unique!"
-msgstr "Nastaven� kan�l� nejsou unik�tn�!"
+msgstr "Nastavení kanálu není jedinečné!"
 
 msgid "Channels"
-msgstr "Kan�ly"
+msgstr "Kanály"
 
 msgid "Button$Edit"
 msgstr "Editace"
 
 msgid "Button$New"
-msgstr "Nov�"
+msgstr "Nový"
 
 msgid "Button$Delete"
 msgstr "Smazat"
 
 msgid "Button$Mark"
-msgstr "Ozna�it"
+msgstr "Označit"
 
 msgid "Channel is being used by a timer!"
-msgstr "Kan�l je dr�en� �asova�em nahr�vek!"
+msgstr "Na kanálu se právě nahrává!!"
 
 msgid "Delete channel?"
-msgstr "Smazat kan�l?"
+msgstr "Smazat kanál?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Změna složky"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nová složka"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Podsložka"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Složka již existuje!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Jméno složky nesmí obsahovat '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Vybrat"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Smazat složku včetně podsložek?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Smazat složku?"
 
 msgid "Edit timer"
-msgstr "Editace �asova�e"
+msgstr "Editace nahrávání"
 
 msgid "Active"
-msgstr "Aktivn�"
+msgstr "Aktivní"
 
 msgid "Channel"
-msgstr "Kan�l"
+msgstr "Kanál"
 
 msgid "Day"
 msgstr "Den"
 
 msgid "Start"
-msgstr "Za��tek"
+msgstr "Začátek"
 
 msgid "Stop"
 msgstr "Konec"
@@ -634,22 +638,22 @@ msgid "Priority"
 msgstr "Priorita"
 
 msgid "Lifetime"
-msgstr "�ivotnost"
+msgstr "Životnost"
 
 msgid "File"
 msgstr "Soubor"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Složka"
 
 msgid "First day"
-msgstr "Prvn� den"
+msgstr "První den"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Vybrat složku"
 
 msgid "Timers"
-msgstr "�asova�e"
+msgstr "Nahrávání"
 
 msgid "Button$On/Off"
 msgstr "Zap./Vyp."
@@ -658,40 +662,40 @@ msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Smazat �asova�?"
+msgstr "Smazat nahrávání?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Prob�h� nahr�v�n� - opravdu smazat?"
+msgstr "Probíhá nahrávání - opravdu smazat?"
 
 msgid "Event"
-msgstr "Ud�lost"
+msgstr "Událost"
 
 msgid "Button$Timer"
-msgstr "�asova�"
+msgstr "Nahrávání"
 
 msgid "Button$Record"
-msgstr "Nahr�t"
+msgstr "Nahrát"
 
 msgid "Button$Switch"
-msgstr "P�epnout"
+msgstr "Přepnout"
 
 msgid "What's on now?"
-msgstr "Aktu�ln� program"
+msgstr "Aktuální program"
 
 msgid "What's on next?"
-msgstr "N�sleduj�c� program"
+msgstr "Následující program"
 
 msgid "Button$Next"
-msgstr "Dal��"
+msgstr "Další"
 
 msgid "Button$Now"
-msgstr "Nyn�"
+msgstr "Nyní"
 
 msgid "Button$Schedule"
 msgstr "Program"
 
 msgid "Can't switch channel!"
-msgstr "Kan�l nelze p�epnout!"
+msgstr "Kanál nelze přepnout!"
 
 #, c-format
 msgid "Schedule - %s"
@@ -699,50 +703,50 @@ msgstr "Program - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "Tato ud�lost - %s"
+msgstr "Tato událost - %s"
 
 msgid "This event - all channels"
-msgstr "Tato ud�lost - v�echny kan�ly"
+msgstr "Tato událost - všechny kanály"
 
 msgid "All events - all channels"
-msgstr "V�echny ud�lost - v�echny kan�ly"
+msgstr "Všechny události - všechny kanály"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Pros�m vlo�te %d znak�!"
+msgstr "Prosím vložte %d znaků!"
 
 msgid "CAM not responding!"
-msgstr "CAM neodpov�d�!"
+msgstr "CAM neodpovídá!"
 
 msgid "Recording info"
-msgstr "Detail nahr�vky"
+msgstr "Detail nahrávky"
 
 msgid "Button$Play"
-msgstr "P�ehr�t"
+msgstr "Přehrát"
 
 msgid "Button$Rewind"
-msgstr "Na za��tek"
+msgstr "Na začátek"
 
 msgid "Recordings"
-msgstr "Nahr�vky"
+msgstr "Nahrávky"
 
 msgid "Button$Open"
-msgstr "Otev��t"
+msgstr "Otevřít"
 
 msgid "Commands"
-msgstr "P��kazy"
+msgstr "Příkazy"
 
 msgid "Error while accessing recording!"
-msgstr "Chyba p�i p��stupu k nahr�vk�m!"
+msgstr "Chyba při přístupu k nahrávkám!"
 
 msgid "Delete recording?"
-msgstr "Smazat nahr�vku?"
+msgstr "Smazat nahrávku?"
 
 msgid "Error while deleting recording!"
-msgstr "Chyba p�i maz�n� nahr�vky!"
+msgstr "Chyba při mazání nahrávky!"
 
 msgid "Recording commands"
-msgstr "P��kazy nahr�v�n�"
+msgstr "Příkazy nahrávání"
 
 msgid "never"
 msgstr "nikdy"
@@ -751,7 +755,7 @@ msgid "skin dependent"
 msgstr "podle vzhledu"
 
 msgid "always"
-msgstr "v�dy"
+msgstr "vždy"
 
 msgid "OSD"
 msgstr "OSD"
@@ -763,108 +767,111 @@ msgid "Setup.OSD$Skin"
 msgstr "Vzhled"
 
 msgid "Setup.OSD$Theme"
-msgstr "T�ma"
+msgstr "Téma"
 
 msgid "Setup.OSD$Left (%)"
 msgstr "Vlevo (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr "Naho�e (%)"
+msgstr "Nahoře (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "���ka (%)"
+msgstr "Šířka (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "V��ka (%)"
+msgstr "Výška (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "�as zobrazen� zp�vy (s)"
+msgstr "Čas zobrazení zprávy (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "Pou��vat mal� p�smo"
+msgstr "Používat malé písmo"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Vyhladit p�smo"
+msgstr "Vyhladit písmo"
 
 msgid "Setup.OSD$Default font"
-msgstr "V�choz� p�smo"
+msgstr "Výchozí písmo"
 
 msgid "Setup.OSD$Small font"
-msgstr "Mal� p�smo"
+msgstr "Malé písmo"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Fixn� p�smo"
+msgstr "Fixní písmo"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Velikost v�choz�ho p�sma (%)"
+msgstr "Velikost výchozího písma (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Velikost mal�ho p�sma (%)"
+msgstr "Velikost malého písma (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Velikost fixn�ho p�sma (%)"
+msgstr "Velikost fixního písma (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Pozice informace o kan�lu"
+msgstr "Pozice informace o kanálu"
 
 msgid "bottom"
 msgstr "dole"
 
 msgid "top"
-msgstr "haho�e"
+msgstr "hahoře"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "�as zobr. informace o kan�lu (s)"
+msgstr "Čas zobr. informace o kanálu (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Informace p�i zm�n� kan�lu"
+msgstr "Informace při změně kanálu"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "�asov� limit informace o kan�lu"
+msgstr "Časový limit informace o kanálu"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Rolovat strany"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Z konce na za��tek"
+msgstr "Z konce na začátek"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Kl�vesa Menu zav�r�"
+msgstr "Klávesa Menu zavírá"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Seznam nahr�vek"
+msgstr "Seznam nahrávek"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Složky v menu časovače"
+
+msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
 msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "Sn�mat"
+msgstr "Snímat"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "�asov� limit pro sn�m�n� EPG (h)"
+msgstr "Časový limit pro snímání EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG �rove� chyb"
+msgstr "EPG úroveň chyb"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Ukazovat star�� EPG data (min)"
+msgstr "Ukazovat starší EPG data (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Nastavit syst�mov� �as"
+msgstr "Nastavit systémový čas"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Pou��t �as z kan�lu"
+msgstr "Použít čas z kanálu"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "Preferovan� jazyky"
+msgstr "Preferované jazyky"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "Preferovan� jazyk"
+msgstr "Preferovaný jazyk"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -873,43 +880,43 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "dost�edu o��znout"
+msgstr "dostředu oříznout"
 
 msgid "no"
 msgstr "ne"
 
 msgid "names only"
-msgstr "jen n�zvy"
+msgstr "jen názvy"
 
 msgid "PIDs only"
-msgstr "jen PIDs"
+msgstr "jen PID"
 
 msgid "names and PIDs"
-msgstr "n�zvy a PIDs"
+msgstr "názvy a PID"
 
 msgid "add new channels"
-msgstr "p�idat nov� kan�ly"
+msgstr "přidat nové kanály"
 
 msgid "add new transponders"
-msgstr "p�idat nov� transpond�ry"
+msgstr "přidat nové transpondéry"
 
 msgid "DVB"
 msgstr "DVB"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "Prim�rn� DVB interface"
+msgstr "Primární DVB zařízení"
 
 msgid "Setup.DVB$Video format"
-msgstr "Form�t videa"
+msgstr "Formát videa"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Form�t zobrazen� videa"
+msgstr "Formát zobrazení videa"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "Pou��vat zvuk v Dolby Digital"
+msgstr "Používat zvuk v Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Aktualizace kan�l�"
+msgstr "Aktualizace kanálů"
 
 msgid "Setup.DVB$Audio languages"
 msgstr "Jazyky zvuku"
@@ -921,43 +928,43 @@ msgid "Setup.DVB$Display subtitles"
 msgstr "Zobrazovat titulky"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "Jazyky titulk�"
+msgstr "Jazyky titulků"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "Jazyk titulk�"
+msgstr "Jazyk titulků"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Posunut� titulk�"
+msgstr "Posunutí titulků"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Pr�hlednost p�sma titulk�"
+msgstr "Průhlednost písma titulků"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Pr�hlednost pozad� titulk�"
+msgstr "Průhlednost pozadí titulků"
 
 msgid "LNB"
 msgstr "LNB"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "Pou��vat DiSEqC"
+msgstr "Používat DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Doln� frekvence LNB (MHz)"
+msgstr "Dolní frekvence LNB (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Horn� frekvence LNB (MHz)"
+msgstr "Horní frekvence LNB (MHz)"
 
 msgid "CAM reset"
 msgstr "Reset CAMu"
 
 msgid "CAM present"
-msgstr "CAM p��tomen"
+msgstr "CAM přítomen"
 
 msgid "CAM ready"
-msgstr "CAM p�ipraven"
+msgstr "CAM připraven"
 
 msgid "CAM"
 msgstr "CAM"
@@ -969,139 +976,139 @@ msgid "Button$Reset"
 msgstr "Reset"
 
 msgid "Opening CAM menu..."
-msgstr "Otev�r� se menu CAM..."
+msgstr "Otevírá se menu CAM..."
 
 msgid "Can't open CAM menu!"
-msgstr "Menu CAM nen� dostupn�"
+msgstr "Menu CAM není dostupné"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM se pou��v� - opravdu restartovat?"
+msgstr "CAM se používá - opravdu restartovat?"
 
 msgid "Can't reset CAM!"
 msgstr "CAM modul nelze restartovat!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "nepřerusovat běžící program"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "potvdit přerušení běžícího programu"
 
 msgid "pause live video"
-msgstr ""
+msgstr "přerušit běžící program"
 
 msgid "confirm"
-msgstr ""
+msgstr "potvrdit"
 
 msgid "yes"
 msgstr "ano"
 
 msgid "Recording"
-msgstr "Nahr�v�n�"
+msgstr "Nahrávání"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Nahr�vat p�ed za��tkem (min)"
+msgstr "Nahrávat před začátkem (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Nahr�vat po konci (min)"
+msgstr "Nahrávat po konci (min)"
 
 msgid "Setup.Recording$Primary limit"
-msgstr "Prim�rn� limit"
+msgstr "Primární limit"
 
 msgid "Setup.Recording$Default priority"
-msgstr "V�choz� priorita"
+msgstr "Výchozí priorita"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "V�choz� �ivotnost"
+msgstr "Výchozí životnost"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Chování klávesy Přerušení"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorita p�eru�en�"
+msgstr "Priorita přerušení"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "�ivotnost p�eru�en� (d)"
+msgstr "Životnost přerušení (d)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Pou��vat n�zev epizody"
+msgstr "Používat název epizody"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "Pou��vat VPS"
+msgstr "Používat VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "�asov� rezerva pro VPS (s)"
+msgstr "Časová rezerva pro VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Ozna�it okam�it� nahr�vky"
+msgstr "Označit okamžité nahrávky"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Pojmenovat okam�it� nahr�vky"
+msgstr "Pojmenovat okamžité nahrávky"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "D�lka okam�it�ho nahr�v�n� (min)"
+msgstr "Délka okamžitého nahrávání (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Maxim�ln� velikost nahr�vky (MB)"
+msgstr "Maximální velikost nahrávky (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "D�lit editovan� soubory"
+msgstr "Dělit editované soubory"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Mazat nahrávky Timeshift"
 
 msgid "Replay"
-msgstr "P�ehr�v�n�"
+msgstr "Přehrávání"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "V�cerychlostn� m�d"
+msgstr "Vícerychlostní mód"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Zobrazit re�im p�ehr�v�n�"
+msgstr "Zobrazit režim přehrávání"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID obnoven�"
+msgstr "ID obnovení"
 
 msgid "Miscellaneous"
-msgstr "R�zn�"
+msgstr "Různé"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Min. pauza mezi ud�lostmi (min)"
+msgstr "Min. pauza mezi událostmi (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "�asov� limit neaktivnosti (min)"
+msgstr "Časový limit neaktivnosti (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "�asov� limit SVDRP (s)"
+msgstr "Časový limit SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "�asov� limit Zap (s)"
+msgstr "Časový limit Zap (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Prodleva p�i volb� kan�lu (ms)"
+msgstr "Prodleva při volbě kanálu (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Kan�l po spu�t�n�"
+msgstr "Kanál po spuštění"
 
 msgid "Setup.Miscellaneous$as before"
 msgstr "jako naposledy"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "Hlasitost po spu�t�n�"
+msgstr "Hlasitost po spuštění"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "Nouzov� ukon�en�"
+msgstr "Nouzové ukončení"
 
 msgid "Plugins"
 msgstr "Moduly"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Modul nem� konfigura�n� parametry!"
+msgstr "Modul nemá konfigurační parametry!"
 
 msgid "Setup"
-msgstr "Nastaven�"
+msgstr "Nastavení"
 
 msgid "Restart"
 msgstr "Restart"
@@ -1111,7 +1118,7 @@ msgstr "Opravdu restartovat?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " Zastavit nahr�v�n� "
+msgstr " Zastavit nahrávání "
 
 msgid "Schedule"
 msgstr "Program (EPG)"
@@ -1121,197 +1128,197 @@ msgstr "VDR"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " Zastavit p�ehr�v�n�"
+msgstr " Zastavit přehrávání"
 
 msgid "Button$Audio"
 msgstr "Zvuk"
 
 msgid "Button$Pause"
-msgstr "Zastavit"
+msgstr "Přerušit"
 
 msgid "Button$Stop"
-msgstr "Ukon�it"
+msgstr "Ukončit"
 
 msgid "Button$Resume"
-msgstr "Pokra�ovat"
+msgstr "Pokračovat"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Zru�it editaci"
+msgstr " Zrušit editaci"
 
 msgid "Stop recording?"
-msgstr "Ukon�it nahr�v�n�?"
+msgstr "Ukončit nahrávání?"
 
 msgid "Cancel editing?"
-msgstr "Zru�it editaci?"
+msgstr "Zrušit editaci?"
 
 msgid "No audio available!"
-msgstr "Zvuk nen� dostupn�!"
+msgstr "Zvuk není dostupný!"
 
 msgid "No subtitles"
-msgstr "Bez titulk�"
+msgstr "Bez titulků"
 
 msgid "Button$Subtitles"
 msgstr "Titulky"
 
 msgid "No subtitles available!"
-msgstr "��dn� dostupn� titulky!"
+msgstr "Žádné dostupné titulky!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Nedostatek voln�ho m�sta k zapo�et� nahr�v�n�!"
+msgstr "Nedostatek volného místa k započetí nahrávání!"
 
 msgid "No free DVB device to record!"
-msgstr "��dn� DVB karta nen� voln� pro nahr�v�n�"
+msgstr "Žádná DVB karta není volná pro nahrávání"
 
 msgid "Pausing live video..."
-msgstr "P�eru�uje se b��c� program ..."
+msgstr "Přerušuje se běžící program ..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Smazat Timeshift nahrávku?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Skok: "
 
 msgid "No editing marks defined!"
-msgstr "Nejsou definov�ny edita�n� zna�ky!"
+msgstr "Nejsou definovány editační značky!"
 
 msgid "Can't start editing process!"
-msgstr "Nelze za��t edita�n� proces!"
+msgstr "Nelze začít editační proces!"
 
 msgid "Editing process started"
-msgstr "Edita�n� proces za�al"
+msgstr "Editační proces začal"
 
 msgid "Editing process already active!"
-msgstr "Edita�n� proces je ji� aktivn�!"
+msgstr "Editační proces je již aktivní!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a�bc�d�e��fghi�jklmn�o�pqr�s�t�u��vwxy�z�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " aábcčdďeéěfghiíjklmnňoópqrřsštťuúůvwxyýzž0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef���3\tghi�4\tjkl5\tmno��6\tpqrs��7\ttuv���8\twxyz��9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcáč2\tdefďéě3\tghií4\tjkl5\tmnoňó6\tpqrsřš7\ttuvťúů8\twxyzýž9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr "P�epsat"
+msgstr "Přepsat"
 
 msgid "Button$Insert"
-msgstr "Vlo�it"
+msgstr "Vložit"
 
 msgid "Plugin"
 msgstr "Modul"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Nahoru/Dolu pro novou pozici - Ok p�esune"
+msgstr "Nahoru/Dolu pro novou pozici - Ok přesune"
 
 msgid "Channel locked (recording)!"
-msgstr "Kan�l je blokovan� (nahr�v� se)!"
+msgstr "Kanál je blokovaný (nahrává se)!"
 
 msgid "Low disk space!"
-msgstr "Disk bude brzy zapln�n!"
+msgstr "Disk bude brzy zaplněn!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Generování index souboru"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Generování index souboru dokončeno"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Vypnut� nen� mo�n� - chyb� volba '-s'!"
+msgstr "Vypnutí není možné - chybí volba '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Edituji - p�esto vypnout?"
+msgstr "Edituji - přesto vypnout?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Syst�m je zanepr�zdn�n - p�esto vypnout?"
+msgstr "Systém nahrává - přesto vypnout?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Nahr�v�n� za�ne za %ld minut - p�esto vypnout?"
+msgstr "Nahrávání začne za %ld minut - přesto vypnout?"
 
 msgid "shut down anyway?"
-msgstr "p�esto vypnout?"
+msgstr "přesto vypnout?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Modul %s startuje za %ld min., pokra�ovat?"
+msgstr "Modul %s startuje za %ld min., pokračovat?"
 
 msgid "Editing - restart anyway?"
-msgstr "Edituji - p�esto restartovat?"
+msgstr "Edituji - přesto restartovat?"
 
 msgid "Recording - restart anyway?"
-msgstr "Syst�m je zanepr�zdn�n - p�esto restartovat?"
+msgstr "Nahrávání - přesto restartovat?"
 
 msgid "restart anyway?"
-msgstr "p�esto restartovat?"
+msgstr "přesto restartovat?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
 msgstr "Hlasitost "
 
 msgid "Classic VDR"
-msgstr "Klasick� VDR"
+msgstr "Klasické VDR"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konzola"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "P�S�PSN"
+msgstr "PÚSČPSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "Po �t St �t P� So Ne "
+msgstr "Po Út St Čt Pá So Ne "
 
 msgid "Monday"
-msgstr "Pond�l�"
+msgstr "Pondělí"
 
 msgid "Tuesday"
-msgstr "�ter�"
+msgstr "Úterý"
 
 msgid "Wednesday"
-msgstr "St�eda"
+msgstr "Středa"
 
 msgid "Thursday"
-msgstr "�tvrtek"
+msgstr "Čtvrtek"
 
 msgid "Friday"
-msgstr "P�tek"
+msgstr "Pátek"
 
 msgid "Saturday"
 msgstr "Sobota"
 
 msgid "Sunday"
-msgstr "Ned�le"
+msgstr "Neděle"
 
 msgid "Upcoming recording!"
-msgstr "Brzo za�ne nahr�v�n�!"
+msgstr "Brzo začne nahrávání!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Přerušit běžící program?"
 
 msgid "Recording started"
-msgstr "Za�alo nahr�v�n�"
+msgstr "Začalo nahrávání"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "Vypnut� VDR bude odlo�eno - vypnete kl�vesou Power"
+msgstr "Vypnutí VDR bude odloženo - vypnete klávesou Power"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Jak�koliv kl�vesa zru�� vypnut�"
+msgstr "Jakákoliv klávesa zruší vypnutí"
 
 msgid "Switching primary DVB..."
-msgstr "P�epnout prim�rn� DVB..."
+msgstr "Přepnout primární DVB..."
 
 msgid "Editing process failed!"
-msgstr "Edita�n� proces selhal!"
+msgstr "Editační proces selhal!"
 
 msgid "Editing process finished"
-msgstr "Edita�n� proces skon�il"
+msgstr "Editační proces skončil"
 
 msgid "Press any key to cancel restart"
-msgstr "Jak�koliv kl�vesa zru�� restart"
+msgstr "Jakákoliv klávesa zruší restart"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
diff --git a/po/da_DK.po b/po/da_DK.po
index 580d82afb..40cdebd49 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish\n"
@@ -475,6 +475,9 @@ msgstr "Indstillinger"
 msgid "Key$Commands"
 msgstr "Kommandoer"
 
+msgid "Key$User0"
+msgstr "Bruger0"
+
 msgid "Key$User1"
 msgstr "Bruger1"
 
@@ -836,6 +839,9 @@ msgstr "Optagelser i foldere"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 42caadc25..4d4f3df20 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German\n"
@@ -475,6 +475,9 @@ msgstr "Einstellungen"
 msgid "Key$Commands"
 msgstr "Befehle"
 
+msgid "Key$User0"
+msgstr "Benutzer0"
+
 msgid "Key$User1"
 msgstr "Benutzer1"
 
@@ -836,6 +839,9 @@ msgstr "Aufnahmeverzeichnisse"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Verzeichnisse im Timer-Men�"
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr "Nummerntasten f�r Zeichen"
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 344b641d3..5414ebcd5 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek\n"
@@ -475,6 +475,9 @@ msgstr "
 msgid "Key$Commands"
 msgstr "�������"
 
+msgid "Key$User0"
+msgstr ""
+
 msgid "Key$User1"
 msgstr ""
 
@@ -836,6 +839,9 @@ msgstr "
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "������������ ������ ������������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 4630a3bab..217f77534 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish\n"
@@ -476,6 +476,9 @@ msgstr "Configuraci
 msgid "Key$Commands"
 msgstr "�rdenes"
 
+msgid "Key$User0"
+msgstr "Usuario 0"
+
 msgid "Key$User1"
 msgstr "Usuario 1"
 
@@ -837,6 +840,9 @@ msgstr "Mostrar directorios de grabaciones"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Gu�a de Programaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 803a53997..5010dc4ce 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian\n"
@@ -475,6 +475,9 @@ msgstr "S
 msgid "Key$Commands"
 msgstr "K�sud"
 
+msgid "Key$User0"
+msgstr "Lisaklahv0"
+
 msgid "Key$User1"
 msgstr "Lisaklahv1"
 
@@ -834,6 +837,9 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Kausta nime salvestamine"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Kaustad taimeri men��s"
+
+msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
 msgid "EPG"
@@ -911,7 +917,7 @@ msgid "Setup.DVB$Update channels"
 msgstr "Kanalite uuendamine"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Audio keeli"
+msgstr "Audio keeled"
 
 msgid "Setup.DVB$Audio language"
 msgstr "Audio keel"
@@ -920,7 +926,7 @@ msgid "Setup.DVB$Display subtitles"
 msgstr "Subtiitrite kuvamine"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "Subtiitrite keeli"
+msgstr "Subtiitrite keeled"
 
 msgid "Setup.DVB$Subtitle language"
 msgstr "Subtiitri keel"
@@ -989,7 +995,7 @@ msgid "pause live video"
 msgstr "peatada"
 
 msgid "confirm"
-msgstr ""
+msgstr "kinnitada"
 
 msgid "yes"
 msgstr "jah"
@@ -1046,13 +1052,13 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Failide jupitamine"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Kustutada ajanihke salvestus"
 
 msgid "Replay"
 msgstr "Taasesitus"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Multi-kiiruse moodus"
+msgstr "Mitmekiiruse moodus"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Korduse moodus"
@@ -1166,7 +1172,7 @@ msgid "Pausing live video..."
 msgstr "Otse�lekande peatamine..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Kustutada ajanihke salvestus?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 70e4d5823..cd57e7cdf 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
-# Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002, 2003
+# Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003, 2004, 2005, 2006, 2007, 2008
 #
@@ -10,34 +10,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
 msgid "Channel not available!"
-msgstr "Kanava ei ole k�ytett�viss�!"
+msgstr "Kanava ei ole käytettävissä!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Siirtotilan aloitus ep�onnistui!"
+msgstr "Siirtotilan aloitus epäonnistui!"
 
 msgid "off"
 msgstr "poissa"
 
 msgid "on"
-msgstr "p��ll�"
+msgstr "päällä"
 
 msgid "auto"
 msgstr "auto"
 
 msgid "none"
-msgstr "tyhj�"
+msgstr "tyhjä"
 
 msgid "Polarization"
 msgstr "Polarisaatio"
@@ -67,7 +67,7 @@ msgid "Transmission"
 msgstr "Transmissio"
 
 msgid "Guard"
-msgstr "Suojav�li"
+msgstr "Suojaväli"
 
 msgid "Hierarchy"
 msgstr "Hierarkia"
@@ -76,13 +76,13 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "Starting EPG scan"
-msgstr "Ohjelmaoppaan p�ivitys aloitettu"
+msgstr "Ohjelmaoppaan päivitys aloitettu"
 
 msgid "Content$Movie/Drama"
 msgstr "Elokuva/draama"
 
 msgid "Content$Detective/Thriller"
-msgstr "Etsiv�/trilleri"
+msgstr "Etsivä/trilleri"
 
 msgid "Content$Adventure/Western/War"
 msgstr "Seikkailu/western/sota"
@@ -109,7 +109,7 @@ msgid "Content$News/Current Affairs"
 msgstr "Uutiset/ajankohtaisohjelma"
 
 msgid "Content$News/Weather Report"
-msgstr "Uutiset/s��tiedot"
+msgstr "Uutiset/säätiedot"
 
 msgid "Content$News Magazine"
 msgstr "Uutismakasiini"
@@ -118,7 +118,7 @@ msgid "Content$Documentary"
 msgstr "Dokumentti"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr "Keskustelu/haastattelu/v�ittely"
+msgstr "Keskustelu/haastattelu/väittely"
 
 msgid "Content$Show/Game Show"
 msgstr "Show/visailu"
@@ -172,7 +172,7 @@ msgid "Content$Children's/Youth Programme"
 msgstr "Lasten ja nuorten ohjelma"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr "Alle kouluik�isten ohjelma"
+msgstr "Alle kouluikäisten ohjelma"
 
 msgid "Content$Entertainment Programme for 6 to 14"
 msgstr "Viihdeohjelma 6-14 vuotiaille"
@@ -232,7 +232,7 @@ msgid "Content$Experimental Film/Video"
 msgstr "Kokeellinen elokuva/video"
 
 msgid "Content$Broadcasting/Press"
-msgstr "Televisio/radio/lehdist�"
+msgstr "Televisio/radio/lehdistö"
 
 msgid "Content$New Media"
 msgstr "Uusmedia"
@@ -253,19 +253,19 @@ msgid "Content$Economics/Social Advisory"
 msgstr "Talous/yhteiskunnallinen neuvonta"
 
 msgid "Content$Remarkable People"
-msgstr "Merkitt�v�t henkil�t"
+msgstr "Merkittävät henkilöt"
 
 msgid "Content$Education/Science/Factual"
 msgstr "Koulutus/tiede"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr "Luonto/el�imet/ymp�rist�"
+msgstr "Luonto/eläimet/ympäristö"
 
 msgid "Content$Technology/Natural Sciences"
 msgstr "Teknologia/luonnontiede"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr "L��ketiede/fysiologia/psykologia"
+msgstr "Lääketiede/fysiologia/psykologia"
 
 msgid "Content$Foreign Countries/Expeditions"
 msgstr "Vieraat maat/tutkimusretket"
@@ -286,7 +286,7 @@ msgid "Content$Tourism/Travel"
 msgstr "Turismi/matkustaminen"
 
 msgid "Content$Handicraft"
-msgstr "K�sity�t"
+msgstr "Käsityöt"
 
 msgid "Content$Motoring"
 msgstr "Autoilu"
@@ -304,7 +304,7 @@ msgid "Content$Gardening"
 msgstr "Puutarhanhoito"
 
 msgid "Content$Original Language"
-msgstr "Alkuper�iskieli"
+msgstr "Alkuperäiskieli"
 
 msgid "Content$Black & White"
 msgstr "Mustavalkoinen"
@@ -313,14 +313,14 @@ msgid "Content$Unpublished"
 msgstr "Julkaisematon"
 
 msgid "Content$Live Broadcast"
-msgstr "Suoral�hetys"
+msgstr "Suoralähetys"
 
 #, c-format
 msgid "ParentalRating$from %d"
 msgstr "K-%d"
 
 msgid "No title"
-msgstr "Ei esityst�"
+msgstr "Ei esitystä"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -334,47 +334,47 @@ msgid "Phase 1: Detecting RC code type"
 msgstr "Vaihe 1: Koodauksen tunnistaminen"
 
 msgid "Press any key on the RC unit"
-msgstr "Paina mit� tahansa kaukos��timen n�pp�int�"
+msgstr "Paina mitä tahansa kaukosäätimen näppäintä"
 
 msgid "RC code detected!"
-msgstr "N�pp�inpainallus vastaanotettu!"
+msgstr "Näppäinpainallus vastaanotettu!"
 
 msgid "Do not press any key..."
-msgstr "�l� paina kaukos��timen n�pp�imi�..."
+msgstr "Älä paina kaukosäätimen näppäimiä..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Vaihe 2: N�pp�inkoodien opettelu"
+msgstr "Vaihe 2: Näppäinkoodien opettelu"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Paina n�pp�int� toiminnolle '%s'"
+msgstr "Paina näppäintä toiminnolle '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Hyv�ksy painamalla 'Yl�s'"
+msgstr "Hyväksy painamalla 'Ylös'"
 
 msgid "Press 'Down' to continue"
 msgstr "Jatka painamalla 'Alas'"
 
 msgid "(press 'Up' to go back)"
-msgstr "(palaa takaisin painamalla 'Yl�s')"
+msgstr "(palaa takaisin painamalla 'Ylös')"
 
 msgid "(press 'Down' to end key definition)"
 msgstr "(lopeta opettaminen painamalla 'Alas')"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "n�pp�imen puuttuessa paina 'Valikko'"
+msgstr "näppäimen puuttuessa paina 'Valikko'"
 
 msgid "Learning Remote Control Keys"
-msgstr "Kaukos��timen opettaminen"
+msgstr "Kaukosäätimen opettaminen"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Vaihe 3: N�pp�inkoodien tallentaminen"
+msgstr "Vaihe 3: Näppäinkoodien tallentaminen"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Paina 'Yl�s' tallentaaksesi ja 'Alas' peruuttaaksesi"
+msgstr "Paina 'Ylös' tallentaaksesi ja 'Alas' peruuttaaksesi"
 
 msgid "Key$Up"
-msgstr "Yl�s"
+msgstr "Ylös"
 
 msgid "Key$Down"
 msgstr "Alas"
@@ -398,7 +398,7 @@ msgid "Key$Red"
 msgstr "Punainen"
 
 msgid "Key$Green"
-msgstr "Vihre�"
+msgstr "Vihreä"
 
 msgid "Key$Yellow"
 msgstr "Keltainen"
@@ -446,16 +446,16 @@ msgid "Key$PrevChannel"
 msgstr "Edellinen kanava"
 
 msgid "Key$Volume+"
-msgstr "��nenvoimakkuus +"
+msgstr "Äänenvoimakkuus +"
 
 msgid "Key$Volume-"
-msgstr "��nenvoimakkuus -"
+msgstr "Äänenvoimakkuus -"
 
 msgid "Key$Mute"
 msgstr "Mykistys"
 
 msgid "Key$Audio"
-msgstr "��ni"
+msgstr "Ääni"
 
 msgid "Key$Subtitles"
 msgstr "Tekstitys"
@@ -478,32 +478,35 @@ msgstr "Asetukset"
 msgid "Key$Commands"
 msgstr "Komennot"
 
+msgid "Key$User0"
+msgstr "Lisänäppäin 0"
+
 msgid "Key$User1"
-msgstr "Lis�n�pp�in 1"
+msgstr "Lisänäppäin 1"
 
 msgid "Key$User2"
-msgstr "Lis�n�pp�in 2"
+msgstr "Lisänäppäin 2"
 
 msgid "Key$User3"
-msgstr "Lis�n�pp�in 3"
+msgstr "Lisänäppäin 3"
 
 msgid "Key$User4"
-msgstr "Lis�n�pp�in 4"
+msgstr "Lisänäppäin 4"
 
 msgid "Key$User5"
-msgstr "Lis�n�pp�in 5"
+msgstr "Lisänäppäin 5"
 
 msgid "Key$User6"
-msgstr "Lis�n�pp�in 6"
+msgstr "Lisänäppäin 6"
 
 msgid "Key$User7"
-msgstr "Lis�n�pp�in 7"
+msgstr "Lisänäppäin 7"
 
 msgid "Key$User8"
-msgstr "Lis�n�pp�in 8"
+msgstr "Lisänäppäin 8"
 
 msgid "Key$User9"
-msgstr "Lis�n�pp�in 9"
+msgstr "Lisänäppäin 9"
 
 msgid "Disk"
 msgstr "Levy"
@@ -524,7 +527,7 @@ msgid "Name"
 msgstr "Nimi"
 
 msgid "Source"
-msgstr "L�hde"
+msgstr "Lähde"
 
 msgid "Frequency"
 msgstr "Taajuus"
@@ -536,10 +539,10 @@ msgid "Ppid"
 msgstr "PCR-PID"
 
 msgid "Apid1"
-msgstr "��ni-PID (1)"
+msgstr "Ääni-PID (1)"
 
 msgid "Apid2"
-msgstr "��ni-PID (2)"
+msgstr "Ääni-PID (2)"
 
 msgid "Dpid1"
 msgstr "Dolby-PID (1)"
@@ -563,7 +566,7 @@ msgid "Sid"
 msgstr "Palvelu-ID"
 
 msgid "Channel settings are not unique!"
-msgstr "Kanava-asetukset eiv�t ole yksil�lliset!"
+msgstr "Kanava-asetukset eivät ole yksilölliset!"
 
 msgid "Channels"
 msgstr "Kanavat"
@@ -578,10 +581,10 @@ msgid "Button$Delete"
 msgstr "Poista"
 
 msgid "Button$Mark"
-msgstr "Siirr�"
+msgstr "Siirrä"
 
 msgid "Channel is being used by a timer!"
-msgstr "Kanava on ajastimen k�yt�ss�!"
+msgstr "Kanava on ajastimen käytössä!"
 
 msgid "Delete channel?"
 msgstr "Poistetaanko kanava?"
@@ -600,7 +603,7 @@ msgstr "Kansio on jo olemassa!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Kansion nimess� ei saa olla '%c'-merkki�!"
+msgstr "Kansion nimessä ei saa olla '%c'-merkkiä!"
 
 msgid "Button$Select"
 msgstr "Valitse"
@@ -621,7 +624,7 @@ msgid "Channel"
 msgstr "Kanava"
 
 msgid "Day"
-msgstr "P�iv�"
+msgstr "Päivä"
 
 msgid "Start"
 msgstr "Aloitus"
@@ -636,7 +639,7 @@ msgid "Priority"
 msgstr "Prioriteetti"
 
 msgid "Lifetime"
-msgstr "Elinik�"
+msgstr "Elinikä"
 
 msgid "File"
 msgstr "Tiedosto"
@@ -645,7 +648,7 @@ msgid "Button$Folder"
 msgstr "Kansio"
 
 msgid "First day"
-msgstr "1. p�iv�"
+msgstr "1. päivä"
 
 msgid "Select folder"
 msgstr "Valitse kansio"
@@ -654,7 +657,7 @@ msgid "Timers"
 msgstr "Ajastimet"
 
 msgid "Button$On/Off"
-msgstr "P��ll�/Pois"
+msgstr "Päällä/Pois"
 
 msgid "Button$Info"
 msgstr "Tiedot"
@@ -663,7 +666,7 @@ msgid "Delete timer?"
 msgstr "Poistetaanko ajastin?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Ajastettu tallennus k�ynniss� - poistetaanko silti?"
+msgstr "Ajastettu tallennus käynnissä - poistetaanko silti?"
 
 msgid "Event"
 msgstr "Tapahtuma"
@@ -701,17 +704,17 @@ msgstr "Ohjelmisto - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "T�m� tapahtuma - %s"
+msgstr "Tämä tapahtuma - %s"
 
 msgid "This event - all channels"
-msgstr "T�m� tapahtuma - kaikki kanavat"
+msgstr "Tämä tapahtuma - kaikki kanavat"
 
 msgid "All events - all channels"
 msgstr "Kaikki tapahtumat - kaikki kanavat"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Sy�t� %d numeroa!"
+msgstr "Syötä %d numeroa!"
 
 msgid "CAM not responding!"
 msgstr "CA-moduuli ei vastaa!"
@@ -735,13 +738,13 @@ msgid "Commands"
 msgstr "Komennot"
 
 msgid "Error while accessing recording!"
-msgstr "Tallenteen toistaminen ep�onnistui!"
+msgstr "Tallenteen toistaminen epäonnistui!"
 
 msgid "Delete recording?"
 msgstr "Poistetaanko tallenne?"
 
 msgid "Error while deleting recording!"
-msgstr "Tallenteen poistaminen ep�onnistui!"
+msgstr "Tallenteen poistaminen epäonnistui!"
 
 msgid "Recording commands"
 msgstr "Tallennekomennot"
@@ -756,7 +759,7 @@ msgid "always"
 msgstr "aina"
 
 msgid "OSD"
-msgstr "Kuvaruutun�ytt�"
+msgstr "Kuvaruutunäyttö"
 
 msgid "Setup.OSD$Language"
 msgstr "Kieli"
@@ -783,10 +786,10 @@ msgid "Setup.OSD$Message time (s)"
 msgstr "Viestien esitysaika (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "K�yt� pieni� kirjasimia"
+msgstr "Käytä pieniä kirjasimia"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "K�yt� reunan pehmennyst�"
+msgstr "Käytä reunan pehmennystä"
 
 msgid "Setup.OSD$Default font"
 msgstr "Oletuskirjasintyyppi"
@@ -795,7 +798,7 @@ msgid "Setup.OSD$Small font"
 msgstr "Pieni kirjasintyyppi"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Tasav�linen kirjasintyyppi"
+msgstr "Tasavälinen kirjasintyyppi"
 
 msgid "Setup.OSD$Default font size (%)"
 msgstr "Oletuskirjasintyypin koko (%)"
@@ -804,7 +807,7 @@ msgid "Setup.OSD$Small font size (%)"
 msgstr "Pienen kirjasintyypin koko (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Tasav�lisen kirjasintyypin koko (%)"
+msgstr "Tasavälisen kirjasintyypin koko (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanavatiedon sijainti"
@@ -813,13 +816,13 @@ msgid "bottom"
 msgstr "alareuna"
 
 msgid "top"
-msgstr "yl�reuna"
+msgstr "yläreuna"
 
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanavatiedon esitysaika (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "N�yt� kanavatieto vaihdettaessa"
+msgstr "Näytä kanavatieto vaihdettaessa"
 
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Sulje erikseen avattu kanavatieto"
@@ -828,31 +831,34 @@ msgid "Setup.OSD$Scroll pages"
 msgstr "Valikoiden vieritys sivuttain"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Valikoiden vieritys ymp�ri"
+msgstr "Valikoiden vieritys ympäri"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Sulje valikkon�pp�imell�"
+msgstr "Sulje valikkonäppäimellä"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "N�yt� tallennehakemistot"
+msgstr "Näytä tallennehakemistot"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Näytä kansiot ajastinvalikossa"
+
+msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
 msgid "EPG"
 msgstr "Ohjelmaopas"
 
 msgid "Button$Scan"
-msgstr "P�ivit�"
+msgstr "Päivitä"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Ohjelmaoppaan taustap�ivitys (h)"
+msgstr "Ohjelmaoppaan taustapäivitys (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Ohjelmaoppaan korjaustaso"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Vanha tieto n�kyy (min)"
+msgstr "Vanha tieto näkyy (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Tahdista kellonaika"
@@ -905,22 +911,22 @@ msgid "Setup.DVB$Video format"
 msgstr "Kuvasuhde"
 
 msgid "Setup.DVB$Video display format"
-msgstr "N�ytt�muoto"
+msgstr "Näyttömuoto"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "K�yt� Dolby Digital -��nt�"
+msgstr "Käytä Dolby Digital -ääntä"
 
 msgid "Setup.DVB$Update channels"
-msgstr "P�ivit� kanavat"
+msgstr "Päivitä kanavat"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "��nen kielet"
+msgstr "Äänen kielet"
 
 msgid "Setup.DVB$Audio language"
-msgstr "��nen kieli"
+msgstr "Äänen kieli"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "N�yt� tekstitys"
+msgstr "Näytä tekstitys"
 
 msgid "Setup.DVB$Subtitle languages"
 msgstr "Tekstityskielet"
@@ -932,16 +938,16 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "Tekstityksen tasaus"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Tekstityksen l�pin�kyvyys"
+msgstr "Tekstityksen läpinäkyvyys"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Tekstityksen taustan l�pin�kyvyys"
+msgstr "Tekstityksen taustan läpinäkyvyys"
 
 msgid "LNB"
 msgstr "LNB"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "K�yt� DiSEqC-kytkint�"
+msgstr "Käytä DiSEqC-kytkintä"
 
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "LNB-rajataajuus (MHz)"
@@ -950,7 +956,7 @@ msgid "Setup.LNB$Low LNB frequency (MHz)"
 msgstr "LNB-alataajuus (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "LNB-yl�taajuus (MHz)"
+msgstr "LNB-ylätaajuus (MHz)"
 
 msgid "CAM reset"
 msgstr "CAM nollaus"
@@ -977,25 +983,25 @@ msgid "Can't open CAM menu!"
 msgstr "CA-moduulin valikko ei saatavilla"
 
 msgid "CAM is in use - really reset?"
-msgstr "CA-moduuli k�yt�ss� - nollataanko?"
+msgstr "CA-moduuli käytössä - nollataanko?"
 
 msgid "Can't reset CAM!"
-msgstr "CA-moduulin nollaus ep�onnistui!"
+msgstr "CA-moduulin nollaus epäonnistui!"
 
 msgid "do not pause live video"
-msgstr "�l� pys�yt� l�hetyst�"
+msgstr "älä pysäytä lähetystä"
 
 msgid "confirm pause live video"
-msgstr "varmista l�hetyksen pys�ytt�minen"
+msgstr "varmista lähetyksen pysäyttäminen"
 
 msgid "pause live video"
-msgstr "pys�yt� l�hetys"
+msgstr "pysäytä lähetys"
 
 msgid "confirm"
-msgstr ""
+msgstr "varmista"
 
 msgid "yes"
-msgstr "kyll�"
+msgstr "kyllä"
 
 msgid "Recording"
 msgstr "Tallennus"
@@ -1013,22 +1019,22 @@ msgid "Setup.Recording$Default priority"
 msgstr "Tallenteen oletusprioriteetti"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Tallenteen oletuselinik� (d)"
+msgstr "Tallenteen oletuselinikä (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Taukon�pp�imen toiminta"
+msgstr "Taukonäppäimen toiminta"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Taukotallenteen prioriteetti"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Taukotallenteen elinik� (d)"
+msgstr "Taukotallenteen elinikä (d)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "K�yt� jakson nime�"
+msgstr "Käytä jakson nimeä"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "K�yt� VPS-toimintoa"
+msgstr "Käytä VPS-toimintoa"
 
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS-toiminnon aloitusmarginaali (s)"
@@ -1037,7 +1043,7 @@ msgid "Setup.Recording$Mark instant recording"
 msgstr "Merkitse pikatallenne"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Nime� pikatallenne"
+msgstr "Nimeä pikatallenne"
 
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Pikatallennuksen kesto (min)"
@@ -1049,16 +1055,16 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Jaottele muokatut tallenteet"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Poista ajansiirtotallenne"
 
 msgid "Replay"
 msgstr "Toisto"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "K�yt� toiston moninopeustilaa"
+msgstr "Käytä toiston moninopeustilaa"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "N�yt� toiston tila"
+msgstr "Näytä toiston tila"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
@@ -1070,7 +1076,7 @@ msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Tapahtuman odotusaika (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "K�ytt�j�toiminnon odotusaika (min)"
+msgstr "Käyttäjätoiminnon odotusaika (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP-komennon odotusaika (s)"
@@ -1079,37 +1085,37 @@ msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanavavalinnan odotusaika (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Kanavasy�tteen odotusaika (ms)"
+msgstr "Kanavasyötteen odotusaika (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Kanava k�ynnistett�ess�"
+msgstr "Kanava käynnistettäessä"
 
 msgid "Setup.Miscellaneous$as before"
 msgstr "edellinen"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "��nenvoimakkuus k�ynnistett�ess�"
+msgstr "Äänenvoimakkuus käynnistettäessä"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanavien rullaus"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "K�yt� h�t�sammutusta"
+msgstr "Käytä hätäsammutusta"
 
 msgid "Plugins"
 msgstr "Laajennokset"
 
 msgid "This plugin has no setup parameters!"
-msgstr "T�ll� laajennoksella ei ole asetuksia!"
+msgstr "Tällä laajennoksella ei ole asetuksia!"
 
 msgid "Setup"
 msgstr "Asetukset"
 
 msgid "Restart"
-msgstr "K�ynnist� uudelleen"
+msgstr "Käynnistä uudelleen"
 
 msgid "Really restart?"
-msgstr "K�ynnistet��nk� uudelleen?"
+msgstr "Käynnistetäänkö uudelleen?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
@@ -1126,7 +1132,7 @@ msgid " Stop replaying"
 msgstr " Lopeta toisto"
 
 msgid "Button$Audio"
-msgstr "��ni"
+msgstr "Ääni"
 
 msgid "Button$Pause"
 msgstr "Tauko"
@@ -1148,10 +1154,10 @@ msgid "Cancel editing?"
 msgstr "Perutaanko muokkaus?"
 
 msgid "No audio available!"
-msgstr "��nen kieli ei ole valittavissa!"
+msgstr "Äänen kieli ei ole valittavissa!"
 
 msgid "No subtitles"
-msgstr "Ei tekstityst�"
+msgstr "Ei tekstitystä"
 
 msgid "Button$Subtitles"
 msgstr "Tekstitys"
@@ -1160,38 +1166,38 @@ msgid "No subtitles available!"
 msgstr "Tekstitys ei ole valittavissa!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Tallennustilan puute est�� tallennuksen!"
+msgstr "Tallennustilan puute estää tallennuksen!"
 
 msgid "No free DVB device to record!"
-msgstr "Ei vapaata DVB-viritint� tallennukselle!"
+msgstr "Ei vapaata DVB-viritintä tallennukselle!"
 
 msgid "Pausing live video..."
-msgstr "Pys�ytet��n l�hetys..."
+msgstr "Pysäytetään lähetys..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Poistetaanko ajansiirtotallenne?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Siirry: "
 
 msgid "No editing marks defined!"
-msgstr "Muokkausmerkinn�t puuttuvat!"
+msgstr "Muokkausmerkinnät puuttuvat!"
 
 msgid "Can't start editing process!"
-msgstr "Muokkauksen aloitus ep�onnistui!"
+msgstr "Muokkauksen aloitus epäonnistui!"
 
 msgid "Editing process started"
 msgstr "Muokkaus aloitettu"
 
 msgid "Editing process already active!"
-msgstr "Muokkaus on jo k�ynniss�!"
+msgstr "Muokkaus on jo käynnissä!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyzåäö0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcäå2\tdef3\tghi4\tjkl5\tmnoö6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -1200,16 +1206,16 @@ msgid "Button$Overwrite"
 msgstr "Korvaa"
 
 msgid "Button$Insert"
-msgstr "Lis��"
+msgstr "Lisää"
 
 msgid "Plugin"
 msgstr "Laajennos"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "'Yl�s/Alas' uusi paikka - 'OK' hyv�ksy"
+msgstr "'Ylös/Alas' uusi paikka - 'OK' hyväksy"
 
 msgid "Channel locked (recording)!"
-msgstr "Kanava lukittu (tallennus k�ynniss�)!"
+msgstr "Kanava lukittu (tallennus käynnissä)!"
 
 msgid "Low disk space!"
 msgstr "Tallennustila loppumassa!"
@@ -1238,20 +1244,20 @@ msgstr "sammutetaanko?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Laajennos %s her�� %ld minuutin kuluttua - sammutetaanko?"
+msgstr "Laajennos %s herää %ld minuutin kuluttua - sammutetaanko?"
 
 msgid "Editing - restart anyway?"
-msgstr "Muokkaus kesken - k�ynnistet��nk� uudelleen?"
+msgstr "Muokkaus kesken - käynnistetäänkö uudelleen?"
 
 msgid "Recording - restart anyway?"
-msgstr "Tallennus kesken - k�ynnistet��nk� uudelleen?"
+msgstr "Tallennus kesken - käynnistetäänkö uudelleen?"
 
 msgid "restart anyway?"
-msgstr "k�ynnistet��nk� uudelleen?"
+msgstr "käynnistetäänkö uudelleen?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "��nenvoimakkuus "
+msgstr "Äänenvoimakkuus "
 
 msgid "Classic VDR"
 msgstr "Klassinen VDR"
@@ -1292,28 +1298,28 @@ msgid "Upcoming recording!"
 msgstr "Tallennus on alkamassa!"
 
 msgid "Pause live video?"
-msgstr "Pys�ytet��nk� l�hetys?"
+msgstr "Pysäytetäänkö lähetys?"
 
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR sammuu my�hemmin - pakota virtan�pp�imell�"
+msgstr "VDR sammuu myöhemmin - pakota virtanäppäimellä"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Peru sammutus painamalla mit� tahansa n�pp�int�"
+msgstr "Peru sammutus painamalla mitä tahansa näppäintä"
 
 msgid "Switching primary DVB..."
 msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
 
 msgid "Editing process failed!"
-msgstr "Muokkaus ep�onnistui!"
+msgstr "Muokkaus epäonnistui!"
 
 msgid "Editing process finished"
 msgstr "Muokkaus valmis"
 
 msgid "Press any key to cancel restart"
-msgstr "Peru uudelleenk�ynnistys painamalla mit� tahansa n�pp�int�"
+msgstr "Peru uudelleenkäynnistys painamalla mitä tahansa näppäintä"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 74d8ceba2..0d4cb7c2f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French\n"
@@ -481,6 +481,9 @@ msgstr "Configuration"
 msgid "Key$Commands"
 msgstr "Commandes"
 
+msgid "Key$User0"
+msgstr "Utilisateur0"
+
 msgid "Key$User1"
 msgstr "Utilisateur1"
 
@@ -842,6 +845,9 @@ msgstr "Dossiers d'enregistrements"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guide des programmes"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 55912e509..96ee695e0 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -477,6 +477,9 @@ msgstr "Postavke"
 msgid "Key$Commands"
 msgstr "Naredbe"
 
+msgid "Key$User0"
+msgstr "Korisnik0"
+
 msgid "Key$User1"
 msgstr "Korisnik1"
 
@@ -838,6 +841,9 @@ msgstr "Imenik za snimke"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG (elektronski programski vodi�)"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index ccc10cc6c..a17b209c2 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian\n"
@@ -478,6 +478,9 @@ msgstr "Be
 msgid "Key$Commands"
 msgstr "Parancsok"
 
+msgid "Key$User0"
+msgstr "Felhaszn�l�0"
+
 msgid "Key$User1"
 msgstr "Felhaszn�l�1"
 
@@ -839,6 +842,9 @@ msgstr "Felv
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index c47828450..89d42375b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -5,14 +5,14 @@
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
 # Sean Carlos <seanc@libero.it>, 2005
 # Nino Gerbino <ngerb@interfree.it>, 2006
-# Diego Pierotto <vdr-italian@tiscali.it>, 2007, 2008
+# Diego Pierotto <vdr-italian@tiscali.it>, 2007, 2008, 2010
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
-"PO-Revision-Date: 2010-01-31 23:06+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -482,6 +482,9 @@ msgstr "Opzioni"
 msgid "Key$Commands"
 msgstr "Comandi"
 
+msgid "Key$User0"
+msgstr "Utente0"
+
 msgid "Key$User1"
 msgstr "Utente1"
 
@@ -841,6 +844,9 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Directory di registrazione"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Cartelle nel menu timer"
+
+msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
 msgid "EPG"
@@ -996,7 +1002,7 @@ msgid "pause live video"
 msgstr "pausa video dal vivo"
 
 msgid "confirm"
-msgstr ""
+msgstr "conferma"
 
 msgid "yes"
 msgstr "sì"
@@ -1053,7 +1059,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Dividi i file modificati"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Elimina registrazione timeshift"
 
 msgid "Replay"
 msgstr "Riproduzione"
@@ -1173,7 +1179,7 @@ msgid "Pausing live video..."
 msgstr "Pausa del canale in visione..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Eliminare registrazione timeshift?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1192,10 +1198,10 @@ msgid "Editing process already active!"
 msgstr "Processo di modifica già attivo!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " aáàbcdeéèfghiìîjklmnoòpqrstuùvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&°"
+msgstr " aáàbcdeéèfghiíìjklmnoóòpqrstuúùvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&°"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+°?{}/:%@&\taàbc2\tdeèf3\tghiì4\tjkl5\tmnoò6\tpqrs7\ttuùv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+°?{}/:%@&\taáàbc2\tdeéèf3\tghiíì4\tjkl5\tmnoóò6\tpqrs7\ttuúùv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index d79f03fcd..02465e61b 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2010-02-22 18:05+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -475,6 +475,9 @@ msgstr "Nustatymai"
 msgid "Key$Commands"
 msgstr "Komandos"
 
+msgid "Key$User0"
+msgstr "Vartotojas0"
+
 msgid "Key$User1"
 msgstr "Vartotojas1"
 
@@ -836,6 +839,9 @@ msgstr "Įrašų katalogai"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Elektroninis programų gidas (EPG)"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
new file mode 100644
index 000000000..20727c73d
--- /dev/null
+++ b/po/mk_MK.po
@@ -0,0 +1,1324 @@
+# VDR language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Dimitar Petrovski <dimeptr@gmail.com>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR-1.7.14\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"PO-Revision-Date: 2010-03-11 00:54+0100\n"
+"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
+"Language-Team: Macedonian <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "*** Invalid Channel ***"
+msgstr "*** Невалиден Канал ***"
+
+msgid "Channel not available!"
+msgstr "Каналот е недостапен!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Невозможно е да се започне пренос!!"
+
+msgid "off"
+msgstr "исклучи"
+
+msgid "on"
+msgstr "вклучи"
+
+msgid "auto"
+msgstr "автоматски"
+
+msgid "none"
+msgstr "ништо"
+
+msgid "Polarization"
+msgstr "Поларизација"
+
+msgid "System"
+msgstr "Систем"
+
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Инверзија"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Модулација"
+
+msgid "Bandwidth"
+msgstr "Пропусност"
+
+msgid "Transmission"
+msgstr "Пренос"
+
+msgid "Guard"
+msgstr "Заштита"
+
+msgid "Hierarchy"
+msgstr "Хиерархија"
+
+msgid "Rolloff"
+msgstr "Рол-оф"
+
+msgid "Starting EPG scan"
+msgstr "Започнувам скенирање на EPG"
+
+msgid "Content$Movie/Drama"
+msgstr "Филм/Драма"
+
+msgid "Content$Detective/Thriller"
+msgstr "Детективски/Трилер"
+
+msgid "Content$Adventure/Western/War"
+msgstr "Авантура/Вестерн/Воен"
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr "Научна фантастика/Фантазија/Хорор"
+
+msgid "Content$Comedy"
+msgstr "Комедија"
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr "Сапуница/Мелодрама/Фолклорен"
+
+msgid "Content$Romance"
+msgstr "Романса"
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr "Сериозен/Класичен/Религиозен/Историски/Драма"
+
+msgid "Content$Adult Movie/Drama"
+msgstr "Филм за возрасни/Драма"
+
+msgid "Content$News/Current Affairs"
+msgstr "Вести/Тековни настани"
+
+msgid "Content$News/Weather Report"
+msgstr "Вести/Временска прогноза"
+
+msgid "Content$News Magazine"
+msgstr "Магазин"
+
+msgid "Content$Documentary"
+msgstr "Документарен"
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr "Дискусија/Интервју/Дебата"
+
+msgid "Content$Show/Game Show"
+msgstr "Шоу/Забавно шоу"
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr "Забавно шоу/Квиз/Натпревар"
+
+msgid "Content$Variety Show"
+msgstr "Разнолико шоу"
+
+msgid "Content$Talk Show"
+msgstr "Разговорно шоу"
+
+msgid "Content$Sports"
+msgstr "Спорт"
+
+msgid "Content$Special Event"
+msgstr "Специјален настан"
+
+msgid "Content$Sport Magazine"
+msgstr "Спортски магазин"
+
+msgid "Content$Football/Soccer"
+msgstr "Фудбал"
+
+msgid "Content$Tennis/Squash"
+msgstr "Тенис/Сквош"
+
+msgid "Content$Team Sports"
+msgstr "Тимски спортови"
+
+msgid "Content$Athletics"
+msgstr "Атлетика"
+
+msgid "Content$Motor Sport"
+msgstr "Мото спорт"
+
+msgid "Content$Water Sport"
+msgstr "Воден спорт"
+
+msgid "Content$Winter Sports"
+msgstr "Зимски спорт"
+
+msgid "Content$Equestrian"
+msgstr "Коњички"
+
+msgid "Content$Martial Sports"
+msgstr "Борилачки спорт"
+
+msgid "Content$Children's/Youth Programme"
+msgstr "Детски/Младински програм"
+
+msgid "Content$Pre-school Children's Programme"
+msgstr "Предшколски програм"
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr "Забавна програма од 6 до 14"
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr "Забавна програма од 10 до 16"
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr "Информативен/Образовен/Училишен програм"
+
+msgid "Content$Cartoons/Puppets"
+msgstr "Цртани/Куклени"
+
+msgid "Content$Music/Ballet/Dance"
+msgstr "Музика/Балет/Танц"
+
+msgid "Content$Rock/Pop"
+msgstr "Рок/Поп"
+
+msgid "Content$Serious/Classical Music"
+msgstr "Сериозна/Класична музика"
+
+msgid "Content$Folk/Tradional Music"
+msgstr "Фолк/Народна музика"
+
+msgid "Content$Jazz"
+msgstr "Џез"
+
+msgid "Content$Musical/Opera"
+msgstr "Музички/Опера"
+
+msgid "Content$Ballet"
+msgstr "Балет"
+
+msgid "Content$Arts/Culture"
+msgstr "Уметност/Култура"
+
+msgid "Content$Performing Arts"
+msgstr "Сценска уметност"
+
+msgid "Content$Fine Arts"
+msgstr "Применета уметност"
+
+msgid "Content$Religion"
+msgstr "Религија"
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr "Популарна култура/Традиционална уметност"
+
+msgid "Content$Literature"
+msgstr "Литература"
+
+msgid "Content$Film/Cinema"
+msgstr "Филм/Кино"
+
+msgid "Content$Experimental Film/Video"
+msgstr "Експериментален филм/Видео"
+
+msgid "Content$Broadcasting/Press"
+msgstr "Радиодифузно/Печат"
+
+msgid "Content$New Media"
+msgstr "Нов медиум"
+
+msgid "Content$Arts/Culture Magazine"
+msgstr "Уметност/Културен магазин"
+
+msgid "Content$Fashion"
+msgstr "Мода"
+
+msgid "Content$Social/Political/Economics"
+msgstr "Социјален/Политички/Економски"
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr "Магазин/Извештај/Докуметарец"
+
+msgid "Content$Economics/Social Advisory"
+msgstr "Економија/Социјален совети"
+
+msgid "Content$Remarkable People"
+msgstr "Исклучителни луѓе"
+
+msgid "Content$Education/Science/Factual"
+msgstr "Образовен/Научен/Фактички"
+
+msgid "Content$Nature/Animals/Environment"
+msgstr "Природа/Животни/Околина"
+
+msgid "Content$Technology/Natural Sciences"
+msgstr "Технологија/Природни науки"
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr "Медицина/Физиологија/Психологија"
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr "Странски земји/Експедиции"
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr "Социален/Духовни науки"
+
+msgid "Content$Further Education"
+msgstr "Понатамошно образование"
+
+msgid "Content$Languages"
+msgstr "Јазици"
+
+msgid "Content$Leisure/Hobbies"
+msgstr "Одмор/Хоби"
+
+msgid "Content$Tourism/Travel"
+msgstr "Туризам/Патувања"
+
+msgid "Content$Handicraft"
+msgstr "Ракотворби"
+
+msgid "Content$Motoring"
+msgstr "Возење"
+
+msgid "Content$Fitness & Health"
+msgstr "Фитнес и здравје"
+
+msgid "Content$Cooking"
+msgstr "Готвење"
+
+msgid "Content$Advertisement/Shopping"
+msgstr "Рекламирање/Шопинг"
+
+msgid "Content$Gardening"
+msgstr "Градинарство"
+
+msgid "Content$Original Language"
+msgstr "Оригинален јазик"
+
+msgid "Content$Black & White"
+msgstr "Црно бело"
+
+msgid "Content$Unpublished"
+msgstr "Необјавено"
+
+msgid "Content$Live Broadcast"
+msgstr "Емитување во живо"
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr "Препорачливо од %d год"
+
+msgid "No title"
+msgstr "Без наслов"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "Македонски"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "mkd"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "Фаза 1: Детекција на типот на далечински управувач "
+
+msgid "Press any key on the RC unit"
+msgstr "Притиснете копче на далечинскиот управувач"
+
+msgid "RC code detected!"
+msgstr "Кодот е детектиран!"
+
+msgid "Do not press any key..."
+msgstr "Не притискај никое копче..."
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "Фаза 2: Учење на специфични кодови"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Притисни копче за '%s'"
+
+msgid "Press 'Up' to confirm"
+msgstr "Притисни 'Горе' за потврда"
+
+msgid "Press 'Down' to continue"
+msgstr "Притисни 'Доле' за да продолжиш"
+
+msgid "(press 'Up' to go back)"
+msgstr "(притисни 'Горе' за назад)"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "(притисни'Доле' за крај)"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "(притисни 'Мени' за прескокнување на ова копче)"
+
+msgid "Learning Remote Control Keys"
+msgstr "Учење на коппчињата на далечинскиот управувач"
+
+msgid "Phase 3: Saving key codes"
+msgstr "Фаза 3: Зачувување на кодовите"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "Притисни 'Горе' за потврда, 'Доле' за откажување"
+
+msgid "Key$Up"
+msgstr "Горе"
+
+msgid "Key$Down"
+msgstr "Доле"
+
+msgid "Key$Menu"
+msgstr "Мени"
+
+msgid "Key$Ok"
+msgstr "Ок"
+
+msgid "Key$Back"
+msgstr "Назад"
+
+msgid "Key$Left"
+msgstr "Лево"
+
+msgid "Key$Right"
+msgstr "Десно"
+
+msgid "Key$Red"
+msgstr "Црвено"
+
+msgid "Key$Green"
+msgstr "Зелено"
+
+msgid "Key$Yellow"
+msgstr "Жолто"
+
+msgid "Key$Blue"
+msgstr "Сино"
+
+msgid "Key$Info"
+msgstr "Инфо"
+
+msgid "Key$Play"
+msgstr "Старт"
+
+msgid "Key$Pause"
+msgstr "Пауза"
+
+msgid "Key$Stop"
+msgstr "Стоп"
+
+msgid "Key$Record"
+msgstr "Снимај"
+
+msgid "Key$FastFwd"
+msgstr "Напред"
+
+msgid "Key$FastRew"
+msgstr "Назад"
+
+msgid "Key$Next"
+msgstr "Следно"
+
+msgid "Key$Prev"
+msgstr "Претходно"
+
+msgid "Key$Power"
+msgstr "Исклучи"
+
+msgid "Key$Channel+"
+msgstr "Канал+"
+
+msgid "Key$Channel-"
+msgstr "Канал-"
+
+msgid "Key$PrevChannel"
+msgstr "ПретходенКанал"
+
+msgid "Key$Volume+"
+msgstr "Глас+"
+
+msgid "Key$Volume-"
+msgstr "Глас-"
+
+msgid "Key$Mute"
+msgstr "Без звук"
+
+msgid "Key$Audio"
+msgstr "Аудио"
+
+msgid "Key$Subtitles"
+msgstr "Титл"
+
+msgid "Key$Schedule"
+msgstr "Распоред"
+
+msgid "Key$Channels"
+msgstr "Канали"
+
+msgid "Key$Timers"
+msgstr "Тајмери"
+
+msgid "Key$Recordings"
+msgstr "Снимки"
+
+msgid "Key$Setup"
+msgstr "Уредување"
+
+msgid "Key$Commands"
+msgstr "Наредби"
+
+msgid "Key$User0"
+msgstr "Корисник0"
+
+msgid "Key$User1"
+msgstr "Корисник1"
+
+msgid "Key$User2"
+msgstr "Корисник2"
+
+msgid "Key$User3"
+msgstr "Корисник3"
+
+msgid "Key$User4"
+msgstr "Корисник4"
+
+msgid "Key$User5"
+msgstr "Корисник5"
+
+msgid "Key$User6"
+msgstr "Корисник6"
+
+msgid "Key$User7"
+msgstr "Корисник7"
+
+msgid "Key$User8"
+msgstr "Корисник8"
+
+msgid "Key$User9"
+msgstr "Корисник9"
+
+msgid "Disk"
+msgstr "Диск"
+
+msgid "free"
+msgstr "слободен"
+
+msgid "Free To Air"
+msgstr "Слободно"
+
+msgid "encrypted"
+msgstr "енкриптиран"
+
+msgid "Edit channel"
+msgstr "Уреди канал"
+
+msgid "Name"
+msgstr "Име"
+
+msgid "Source"
+msgstr "Извор"
+
+msgid "Frequency"
+msgstr "Фрекфенција"
+
+msgid "Vpid"
+msgstr "Vpid"
+
+msgid "Ppid"
+msgstr "Ppid"
+
+msgid "Apid1"
+msgstr "Apid1"
+
+msgid "Apid2"
+msgstr "Apid2"
+
+msgid "Dpid1"
+msgstr "Dpid1"
+
+msgid "Dpid2"
+msgstr "Dpid2"
+
+msgid "Spid1"
+msgstr "Spid1"
+
+msgid "Spid2"
+msgstr "Spid2"
+
+msgid "Tpid"
+msgstr "Tpid"
+
+msgid "CA"
+msgstr "Кодирање (CA)"
+
+msgid "Sid"
+msgstr "Sid"
+
+msgid "Channel settings are not unique!"
+msgstr "Уредбите на каналот не се уникатни!"
+
+msgid "Channels"
+msgstr "Канали"
+
+msgid "Button$Edit"
+msgstr "Измени"
+
+msgid "Button$New"
+msgstr "Нов"
+
+msgid "Button$Delete"
+msgstr "Избриши"
+
+msgid "Button$Mark"
+msgstr "Обележи"
+
+msgid "Channel is being used by a timer!"
+msgstr "Каналот е мометално зафатен од тајмер!"
+
+msgid "Delete channel?"
+msgstr "Избриши канал?"
+
+msgid "Edit folder"
+msgstr "Уреди директориум"
+
+msgid "New folder"
+msgstr "Нов директориум"
+
+msgid "Sub folder"
+msgstr "Поддиректориум"
+
+msgid "Folder name already exists!"
+msgstr "Името веќе постои"
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr "Името на директориумот не смее да содржи '%c'"
+
+msgid "Button$Select"
+msgstr "Избери"
+
+msgid "Delete folder and all sub folders?"
+msgstr "Избриши директориум со сите поддиректориуми?"
+
+msgid "Delete folder?"
+msgstr "Избриши директориум?"
+
+msgid "Edit timer"
+msgstr "Уреди тајмер"
+
+msgid "Active"
+msgstr "Активен"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Day"
+msgstr "Ден"
+
+msgid "Start"
+msgstr "Почеток"
+
+msgid "Stop"
+msgstr "Крај"
+
+msgid "VPS"
+msgstr "VPS"
+
+msgid "Priority"
+msgstr "Приоритет"
+
+msgid "Lifetime"
+msgstr "Траење"
+
+msgid "File"
+msgstr "Датотека"
+
+msgid "Button$Folder"
+msgstr "Директориум"
+
+msgid "First day"
+msgstr "Прв ден"
+
+msgid "Select folder"
+msgstr "Избери директориум"
+
+msgid "Timers"
+msgstr "Тајмери"
+
+msgid "Button$On/Off"
+msgstr "Де/Активирај"
+
+msgid "Button$Info"
+msgstr "Инфо"
+
+msgid "Delete timer?"
+msgstr "Избриши тајмер?"
+
+msgid "Timer still recording - really delete?"
+msgstr "Тајмерот сеуште снима - бриши?"
+
+msgid "Event"
+msgstr "Емисија"
+
+msgid "Button$Timer"
+msgstr "Тајмер"
+
+msgid "Button$Record"
+msgstr "Сними"
+
+msgid "Button$Switch"
+msgstr "Смени"
+
+msgid "What's on now?"
+msgstr "Што е моментално на програмата?"
+
+msgid "What's on next?"
+msgstr "Што следи?"
+
+msgid "Button$Next"
+msgstr "Следи"
+
+msgid "Button$Now"
+msgstr "Моментално"
+
+msgid "Button$Schedule"
+msgstr "Распоред"
+
+msgid "Can't switch channel!"
+msgstr "Невозможно е да се смени канал!"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "Распоред - %s"
+
+#, c-format
+msgid "This event - %s"
+msgstr "Овој настан - %s"
+
+msgid "This event - all channels"
+msgstr "Овој настан - сите канали"
+
+msgid "All events - all channels"
+msgstr "Сите настани - сите канали"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Внеси %d цифри!"
+
+msgid "CAM not responding!"
+msgstr "CAM не одговара!"
+
+msgid "Recording info"
+msgstr "Детали на снимката"
+
+msgid "Button$Play"
+msgstr "Старт"
+
+msgid "Button$Rewind"
+msgstr "Премотај"
+
+msgid "Recordings"
+msgstr "Снимки"
+
+msgid "Button$Open"
+msgstr "Отвори"
+
+msgid "Commands"
+msgstr "Наредби"
+
+msgid "Error while accessing recording!"
+msgstr "Грешка при пристап до снимката!"
+
+msgid "Delete recording?"
+msgstr "Избриши снимка?"
+
+msgid "Error while deleting recording!"
+msgstr "Грешка при бришење на снимката!"
+
+msgid "Recording commands"
+msgstr "Наредби за снимање"
+
+msgid "never"
+msgstr "никогаш"
+
+msgid "skin dependent"
+msgstr "зависно од фасада"
+
+msgid "always"
+msgstr "секогаш"
+
+msgid "OSD"
+msgstr "OSD"
+
+msgid "Setup.OSD$Language"
+msgstr "Јазик"
+
+msgid "Setup.OSD$Skin"
+msgstr "Фасада"
+
+msgid "Setup.OSD$Theme"
+msgstr "Тема"
+
+msgid "Setup.OSD$Left (%)"
+msgstr "Лево (%)"
+
+msgid "Setup.OSD$Top (%)"
+msgstr "Горе (%)"
+
+msgid "Setup.OSD$Width (%)"
+msgstr "Ширина (%)"
+
+msgid "Setup.OSD$Height (%)"
+msgstr "Висина (%)"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "Време за приказ на пораките (сек)"
+
+msgid "Setup.OSD$Use small font"
+msgstr "Користи мал фонт"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "Anti-alias"
+
+msgid "Setup.OSD$Default font"
+msgstr "Основен фонт"
+
+msgid "Setup.OSD$Small font"
+msgstr "Мал фонт"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "Непроменлив фонт"
+
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Големина на основниот фонт (%)"
+
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Големина на малиот фонт (%)"
+
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Големина на непроменливиот фонт (%)"
+
+msgid "Setup.OSD$Channel info position"
+msgstr "Позиција на информациите за каналот"
+
+msgid "bottom"
+msgstr "дно"
+
+msgid "top"
+msgstr "врв"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Време за приказ на информациите за каналот (сек)"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Информации при промена на канал"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Прекин на приказ на информации за каналот"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "Листај по страници"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Скокни од крај на почеток"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "Копчето Мени затвара"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "Директориум за снимки"
+
+msgid "Setup.OSD$Folders in timer menu"
+msgstr "Директориуми во менито за тајмер"
+
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
+msgid "EPG"
+msgstr "EPG (електронски водич на програми)"
+
+msgid "Button$Scan"
+msgstr "Барај"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Време до барање на EPG (ч)"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Ниво на поправка на EPG грешки"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Време на задржување на EPG (мин)"
+
+msgid "Setup.EPG$Set system time"
+msgstr "Намести системско време"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Користи време од транспондер"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "Омилени јазици"
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "Омилен јазик"
+
+msgid "pan&scan"
+msgstr "прошири и барај"
+
+msgid "letterbox"
+msgstr "плико"
+
+msgid "center cut out"
+msgstr "исечи средина"
+
+msgid "no"
+msgstr "не"
+
+msgid "names only"
+msgstr "само имиња"
+
+msgid "PIDs only"
+msgstr "Само PID-ови"
+
+msgid "names and PIDs"
+msgstr "имиња и идентификатори (PIDs)"
+
+msgid "add new channels"
+msgstr "додај нови канали"
+
+msgid "add new transponders"
+msgstr "додај нови транспондери"
+
+msgid "DVB"
+msgstr "DVB"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Примарен DVB уред"
+
+msgid "Setup.DVB$Video format"
+msgstr "Видео формат"
+
+msgid "Setup.DVB$Video display format"
+msgstr "Формат на видeo приказ"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Користи Dolby Digital"
+
+msgid "Setup.DVB$Update channels"
+msgstr "Ажурирај канали"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "Аудио јазици"
+
+msgid "Setup.DVB$Audio language"
+msgstr "Аудио јазик"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "Прикажи титл"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "Јазици на титл"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "Јазик на титл"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "Поместување на титл"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "Провидност на титлот"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "Провидност на позадината на титлот"
+
+msgid "LNB"
+msgstr "LNB"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Користи DiSEqC"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "Фрекфенција на преклоп SLOF (MHz)"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Долна LNB фрекфенција (MHz)"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Форна LNB фрекфенција (MHz)"
+
+msgid "CAM reset"
+msgstr "Рестартирај CAM"
+
+msgid "CAM present"
+msgstr "CAM присутен"
+
+msgid "CAM ready"
+msgstr "CAM спремен"
+
+msgid "CAM"
+msgstr "CAM"
+
+msgid "Button$Menu"
+msgstr "Мени"
+
+msgid "Button$Reset"
+msgstr "Ресетирај"
+
+msgid "Opening CAM menu..."
+msgstr "Отварам CAM мени..."
+
+msgid "Can't open CAM menu!"
+msgstr "Неуспешно отварање на CAM менито!"
+
+msgid "CAM is in use - really reset?"
+msgstr "CAM е во употреба - рестартирај?"
+
+msgid "Can't reset CAM!"
+msgstr "Неуспешно рестартирање на CAM-от!"
+
+msgid "do not pause live video"
+msgstr "не паузирај пренос во живо"
+
+msgid "confirm pause live video"
+msgstr "потврди пауза на пренос во живо"
+
+msgid "pause live video"
+msgstr "пауза на пренос во живо"
+
+msgid "confirm"
+msgstr "потврди"
+
+msgid "yes"
+msgstr "да"
+
+msgid "Recording"
+msgstr "Снимање"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Резерва на почеток на снимање (мин)"
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Резерва на крајот на снимање (мин)"
+
+msgid "Setup.Recording$Primary limit"
+msgstr "Стандардно огранучување"
+
+msgid "Setup.Recording$Default priority"
+msgstr "Зададен приоритет"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Стандардно веметраење (денови)"
+
+msgid "Setup.Recording$Pause key handling"
+msgstr "Подесување на копчето пауза"
+
+msgid "Setup.Recording$Pause priority"
+msgstr "Приоритет на пауза"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Траење на пауза (денови)"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "Користи име на епизода"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "Користи VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Временска резерва на VPS (сек)"
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Означи директно снимање"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "Име на директно снимање"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Траење на директно снимање (мин)"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Максимална големина на датотека (MB)"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "Раздвои уредени датотеки"
+
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr "Избриши временски поместена снимка"
+
+msgid "Replay"
+msgstr "Репродукција"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Повеќебрзински режим"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "Прикажи начин на пуштање"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "ID на продолжеток"
+
+msgid "Miscellaneous"
+msgstr "Разно"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Минимално време на тајмаут (мин)"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Минимум неактивност на корисникот (мин)"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP тајмаут (сек)"
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Зап тајмаут (сек)"
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "Тајмаут за внес на канал (ms)"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Почетен канал"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "како претходно"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Почетна јачина на звук"
+
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr "Премотување канали"
+
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "Итен излез"
+
+msgid "Plugins"
+msgstr "Додатоци"
+
+msgid "This plugin has no setup parameters!"
+msgstr "Овој додаток нема параметри!"
+
+msgid "Setup"
+msgstr "Уредување"
+
+msgid "Restart"
+msgstr "Рестартирање"
+
+msgid "Really restart?"
+msgstr "Рестартирање?"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr " Запри снимање "
+
+msgid "Schedule"
+msgstr "Распоред"
+
+msgid "VDR"
+msgstr "VDR"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr " Запри пуштање"
+
+msgid "Button$Audio"
+msgstr "Аудио"
+
+msgid "Button$Pause"
+msgstr "Пауза"
+
+msgid "Button$Stop"
+msgstr "Стоп"
+
+msgid "Button$Resume"
+msgstr "Продолжи"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr " Откажи уредување"
+
+msgid "Stop recording?"
+msgstr "Запри снимање?"
+
+msgid "Cancel editing?"
+msgstr "Запри уредување?"
+
+msgid "No audio available!"
+msgstr "Аудио недостапно!"
+
+msgid "No subtitles"
+msgstr "Без титл"
+
+msgid "Button$Subtitles"
+msgstr "Титл"
+
+msgid "No subtitles available!"
+msgstr "Титлови недостапни!"
+
+msgid "Not enough disk space to start recording!"
+msgstr "Нема доволно празен простор за снимање!"
+
+msgid "No free DVB device to record!"
+msgstr "Нема слободни DVB уреди за снимање!"
+
+msgid "Pausing live video..."
+msgstr "Пауза на пренос во живо..."
+
+msgid "Delete timeshift recording?"
+msgstr "Избриши временски поместена снимка?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "Скокни:"
+
+msgid "No editing marks defined!"
+msgstr "Нема одредено ознаки за сечење!"
+
+msgid "Can't start editing process!"
+msgstr "Не може да почне уредување!"
+
+msgid "Editing process started"
+msgstr "Уредувањето започна"
+
+msgid "Editing process already active!"
+msgstr "Уредувањето е веќе во тек!!"
+
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr "абвгдѓежзѕијклљмнњопрстќуфхцчџш0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcабвг2\tdefдѓеж3\tghiзѕиј4\tjklклљм5\tmnoнњоп6\tpqrsрстќ7\ttuvуфхц8\twxyzчџш9"
+
+msgid "Button$ABC/abc"
+msgstr "АБВ/абв"
+
+msgid "Button$Overwrite"
+msgstr "Препиши"
+
+msgid "Button$Insert"
+msgstr "Вметни"
+
+msgid "Plugin"
+msgstr "Додаток"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "Горе/Доле за нова позиција - OK за потврда"
+
+msgid "Channel locked (recording)!"
+msgstr "Каналот е заклучен (снимање)!"
+
+msgid "Low disk space!"
+msgstr "Малку простор на дискот!"
+
+msgid "Regenerating index file"
+msgstr "Регенерирање на индекс датотека"
+
+msgid "Index file regeneration complete"
+msgstr "Регенерирањето на индексот заврши"
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Невозможно гаснење - недостасува опцијата '-s'!"
+
+msgid "Editing - shut down anyway?"
+msgstr "Уредување во тек - исклучи?"
+
+msgid "Recording - shut down anyway?"
+msgstr "Снимање во тек - исклучи?"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Снимање уште %ld минути - исклучи?"
+
+msgid "shut down anyway?"
+msgstr "сеедно исклучи?"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Додатокот %s се подига за %ld мин, продолжи?"
+
+msgid "Editing - restart anyway?"
+msgstr "Уредување во тек - рестартирај?"
+
+msgid "Recording - restart anyway?"
+msgstr "Снимање во тек - рестартирај?"
+
+msgid "restart anyway?"
+msgstr "сеедно рестартирај?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "Глас"
+
+msgid "Classic VDR"
+msgstr "Класичен VDR"
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Панели"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr "ПВСЧПСН"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr "ПонВтоСреЧетПетСабНед"
+
+msgid "Monday"
+msgstr "Понеделник"
+
+msgid "Tuesday"
+msgstr "Вторник"
+
+msgid "Wednesday"
+msgstr "Среда"
+
+msgid "Thursday"
+msgstr "Четврток"
+
+msgid "Friday"
+msgstr "Петок"
+
+msgid "Saturday"
+msgstr "Сабота"
+
+msgid "Sunday"
+msgstr "Недела"
+
+msgid "Upcoming recording!"
+msgstr "Претстои снимање!"
+
+msgid "Pause live video?"
+msgstr "Паузирај пренос во живо?"
+
+msgid "Recording started"
+msgstr "Снимањето почна"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR ќе се исклучи подоцна - притиснете Исклучи за присилно исклучување"
+
+msgid "Press any key to cancel shutdown"
+msgstr "Притиснете копче за отказ на исклучување"
+
+msgid "Switching primary DVB..."
+msgstr "Промена на примарниот DVB уред..."
+
+msgid "Editing process failed!"
+msgstr "Сечењето е неуспешно!"
+
+msgid "Editing process finished"
+msgstr "Сечењето заврши"
+
+msgid "Press any key to cancel restart"
+msgstr "Притиснете копче за откажување на рестарт"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR ќе се исклучи за %s минути"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f4d912074..f570337c4 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch\n"
@@ -479,6 +479,9 @@ msgstr "Instellingen"
 msgid "Key$Commands"
 msgstr "Commando's"
 
+msgid "Key$User0"
+msgstr "Gebruiker0"
+
 msgid "Key$User1"
 msgstr "Gebruiker1"
 
@@ -840,6 +843,9 @@ msgstr "Opname mappen"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index e739b35a2..2f40cfe98 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian\n"
@@ -476,6 +476,9 @@ msgstr "Konfigurasjon"
 msgid "Key$Commands"
 msgstr "Kommandoer"
 
+msgid "Key$User0"
+msgstr ""
+
 msgid "Key$User1"
 msgstr ""
 
@@ -837,6 +840,9 @@ msgstr "Kataloger til opptak"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Programoversikt"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 9af022728..9620e1bc7 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team:  Polish\n"
@@ -476,6 +476,9 @@ msgstr "Ustawienia"
 msgid "Key$Commands"
 msgstr "Polecenia"
 
+msgid "Key$User0"
+msgstr "U�ytkownik 0"
+
 msgid "Key$User1"
 msgstr "U�ytkownik 1"
 
@@ -837,6 +840,9 @@ msgstr "Katalogi nagra
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index edea421f5..0510d9dbd 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-03-18 17:04+0100\n"
 "Last-Translator: anonymous\n"
 "Language-Team: Portuguese\n"
@@ -475,6 +475,9 @@ msgstr "Configura
 msgid "Key$Commands"
 msgstr "Comandos"
 
+msgid "Key$User0"
+msgstr "Definida0"
+
 msgid "Key$User1"
 msgstr "Definida1"
 
@@ -836,6 +839,9 @@ msgstr "Directorias de grava
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guia de programa��o"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index ffac7e9d1..e0a211985 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2010-02-11 13:38+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian\n"
@@ -478,6 +478,9 @@ msgstr "Configura
 msgid "Key$Commands"
 msgstr "Comenzi"
 
+msgid "Key$User0"
+msgstr "Utilizator0"
+
 msgid "Key$User1"
 msgstr "Utilizator1"
 
@@ -839,6 +842,9 @@ msgstr "Directoare 
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 440939442..889b98b6c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -476,6 +476,9 @@ msgstr "
 msgid "Key$Commands"
 msgstr "�������"
 
+msgid "Key$User0"
+msgstr "������������0"
+
 msgid "Key$User1"
 msgstr "������������1"
 
@@ -837,6 +840,9 @@ msgstr "
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "�������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index bedb1338f..129fad3be 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2009-09-30 12:50+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak\n"
@@ -476,6 +476,9 @@ msgstr "Nastavenie"
 msgid "Key$Commands"
 msgstr "Pr�kazy"
 
+msgid "Key$User0"
+msgstr "U��vate�0"
+
 msgid "Key$User1"
 msgstr "U��vate�1"
 
@@ -837,6 +840,9 @@ msgstr "Zoznam z
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 7f45b0272..9f1e80690 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian\n"
@@ -476,6 +476,9 @@ msgstr "Nastavitve"
 msgid "Key$Commands"
 msgstr "Ukazi"
 
+msgid "Key$User0"
+msgstr "Uporabnik0"
+
 msgid "Key$User1"
 msgstr "Uporabnik1"
 
@@ -837,6 +840,9 @@ msgstr "Direktoriji za posnetke"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "Programski vodnik"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 732e1798e..e9d39dd5c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish\n"
@@ -478,6 +478,9 @@ msgstr "Inst
 msgid "Key$Commands"
 msgstr "Kommandon"
 
+msgid "Key$User0"
+msgstr "Anv�ndare0"
+
 msgid "Key$User1"
 msgstr "Anv�ndare1"
 
@@ -839,6 +842,9 @@ msgstr "Kataloger f
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 1a3382cff..9acd1c1ef 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish\n"
@@ -475,6 +475,9 @@ msgstr "Ayarlar"
 msgid "Key$Commands"
 msgstr "Komutlar"
 
+msgid "Key$User0"
+msgstr "Kullan�c�0"
+
 msgid "Key$User1"
 msgstr "Kullan�c�1"
 
@@ -836,6 +839,9 @@ msgstr "Kay
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index a373fb593..b62fca729 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,14 +1,14 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007, 2008
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007, 2008, 2010
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
-"PO-Revision-Date: 2009-05-31 13:17+0200\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgid "auto"
 msgstr "авто"
 
 msgid "none"
-msgstr "нічого"
+msgstr "нема"
 
 msgid "Polarization"
 msgstr "Поляризація"
@@ -76,245 +76,245 @@ msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Фільм/Драма"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Детектив/Тріллер"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Пригоди/Вестерн/Війна"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Наукова фантастика/Фантастика/Жахи"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Комедія"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Мильна опера/Мелодрама/Фольклор"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Романс"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Серйозне/Класика/Релігія/Історія/Драма"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Кіно для дорослих/Драма"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Новини/Поточні події"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Новини/Спорт"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Журнал новин"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Документальне"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Дискусія/Інтерв’ю/Дебати"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Шоу//Ігри"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Ігрове шоу/Тести"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Вар’єте"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Ток шоу"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Спорт"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Спеціальні події"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Спортивний журнал"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Футбол"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Теніс/Сквош"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Спортивні команди"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Атлетика"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Моторний спорт"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Водний спорт"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Зимовий спорт"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Кінний спорт"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Військовий спорт"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Дитяче/Молодіжні програми"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Дошкільні дитячі програми"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Програми для дітей від 6 до 14 років"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Програми для дітей від 10 до 16 років"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Інформаційні/Навчальні/Шкільна програма"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Мультфільми"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Музика/Балет/Танці"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Рок/Поп"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Серйозна/Класична музика"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Фльк/Традиційна музика"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Джаз"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Мюзикл/Опера"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Балет"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Мистецтво/Культура"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Дресирування"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Образотворче мистецтво"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Релігія"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Популярна культура/Традиційне мистецтво"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Література"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Кінофільм"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Експериментальний фільм/Відео"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Трансляція/Преса"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Нові медія"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Мистецтво/Культурний журнал"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Мода"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Соцільне/Політичне/Економічне"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Журнал/Рапорт/Документальне"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Економіка/Соціальний порадник"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Незвичайні люди"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Навчання/Наука/Факти"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Природа/Тварини/Навколишнє оточення"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Технологія/Природничі науки"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Медицина/Фізіологія/Психологія"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Зарубіжні країни/Експедиції"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Соціальна/Духовна наука"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Дальше навчання"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Мови"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Відпочинок/Хоббі"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Туризм/Подорожі"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Ремісниче"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Автомобільна справа"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Фітнес і здоров’я"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Готування їжі"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Реклама/Закупи"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Сад/Город"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Оригінальна мова"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Чорне і біле"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Неопубліковане"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Трансляція"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "з %d"
 
 msgid "No title"
 msgstr "Без назви"
@@ -337,7 +337,7 @@ msgid "RC code detected!"
 msgstr "Визначено код пульта!"
 
 msgid "Do not press any key..."
-msgstr "Не натискайте кнопки..."
+msgstr "Не натискайте жодної кнопки..."
 
 msgid "Phase 2: Learning specific key codes"
 msgstr "Крок 2: Приписування кодів для відповідних кнопок"
@@ -458,7 +458,7 @@ msgid "Key$Subtitles"
 msgstr "Субтитри"
 
 msgid "Key$Schedule"
-msgstr "Телегід"
+msgstr "Програма"
 
 msgid "Key$Channels"
 msgstr "Канали"
@@ -475,6 +475,9 @@ msgstr "Налаштування"
 msgid "Key$Commands"
 msgstr "Команди"
 
+msgid "Key$User0"
+msgstr "Користувач0"
+
 msgid "Key$User1"
 msgstr "Користувач1"
 
@@ -575,7 +578,7 @@ msgid "Button$Delete"
 msgstr "Видалити"
 
 msgid "Button$Mark"
-msgstr "Перемістити"
+msgstr "Помітити"
 
 msgid "Channel is being used by a timer!"
 msgstr "Канал зайнятий таймером!"
@@ -584,29 +587,29 @@ msgid "Delete channel?"
 msgstr "Видалити канал?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Редагувати каталог"
 
 msgid "New folder"
-msgstr ""
+msgstr "Новий каталог"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Підкаталог"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Назва каталогу вже існує!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Назва каталогу не повинна містити '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Вибрати"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Видалити каталог і всі підкаталоги?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Видалити каталог?"
 
 msgid "Edit timer"
 msgstr "Налаштування таймера"
@@ -639,13 +642,13 @@ msgid "File"
 msgstr "Файл"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Каталог"
 
 msgid "First day"
 msgstr "Перший день"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Вибрати каталог"
 
 msgid "Timers"
 msgstr "Таймери"
@@ -708,7 +711,7 @@ msgstr "Всі передачі - всі канали"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Натисніть %d цифри!"
+msgstr "Введіть %d цифри!"
 
 msgid "CAM not responding!"
 msgstr "CAM не відповідає!"
@@ -753,7 +756,7 @@ msgid "always"
 msgstr "завжди"
 
 msgid "OSD"
-msgstr "OSD меню"
+msgstr "Меню"
 
 msgid "Setup.OSD$Language"
 msgstr "Мова"
@@ -777,10 +780,10 @@ msgid "Setup.OSD$Height (%)"
 msgstr "Висота (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Тривалість показу повідомлень (сек)"
+msgstr "Час показу повідомлень (сек)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "Використовувати малий фонт"
+msgstr "Викор. малий фонт"
 
 msgid "Setup.OSD$Anti-alias"
 msgstr "Згладжування фонтів"
@@ -795,7 +798,7 @@ msgid "Setup.OSD$Fixed font"
 msgstr "Фіксований фонт"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Размір фонта для меню (%)"
+msgstr "Розмір типового фонта (%)"
 
 msgid "Setup.OSD$Small font size (%)"
 msgstr "Размір малого фонта (%)"
@@ -804,7 +807,7 @@ msgid "Setup.OSD$Fixed font size (%)"
 msgstr "Размір фіксованого фонта (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Положення вікна інформації про канал"
+msgstr "Положення інформації про канал"
 
 msgid "bottom"
 msgstr "внизу"
@@ -816,10 +819,10 @@ msgid "Setup.OSD$Channel info time (s)"
 msgstr "Показ інформації про канал (сек)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Показ канал-інфо при переключанні "
+msgstr "Інфо при переключанні каналу"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Інформацію про канал закрити"
+msgstr "Час очікування інфо про канал"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Прокрутка сторінок меню"
@@ -834,19 +837,22 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Каталоги зберігання записів"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Каталоги в меню таймера"
+
+msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
 msgid "EPG"
-msgstr "Телегід"
+msgstr "Телегід (EPG)"
 
 msgid "Button$Scan"
 msgstr "Сканувати"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Затримка сканування телегіда (ч)"
+msgstr "Затримка сканування телегіда (г)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Рівень корекції помилок"
+msgstr "Рівень корекції помилок EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Зберігання застарілих даних (хв)"
@@ -855,7 +861,7 @@ msgid "Setup.EPG$Set system time"
 msgstr "Встановити системий час"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Використати час транспондера"
+msgstr "Викор. час з транспондера"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -905,10 +911,10 @@ msgid "Setup.DVB$Video display format"
 msgstr "Формат зображення відео"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "Використовувати Dolby Digital"
+msgstr "Викор. Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Оновлювати настройки каналів"
+msgstr "Оновлювати канали"
 
 msgid "Setup.DVB$Audio languages"
 msgstr "Бажані мови (звук)"
@@ -974,7 +980,7 @@ msgid "Can't open CAM menu!"
 msgstr "Меню CAM-модуля недоступне!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM використовується - дійсно перезавантажити?"
+msgstr "CAM використовується - дійсно перезапустити?"
 
 msgid "Can't reset CAM!"
 msgstr "Помилка перезапуску CAM-модуля!"
@@ -989,7 +995,7 @@ msgid "pause live video"
 msgstr "призупинити перегляд"
 
 msgid "confirm"
-msgstr ""
+msgstr "підтвердити"
 
 msgid "yes"
 msgstr "так"
@@ -1022,10 +1028,10 @@ msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Зберігання відкладеного перегляду (дні)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Використовувати назву епізоду"
+msgstr "Викор. назву епізоду"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "Використовувати сигнали VPS"
+msgstr "Викор. VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Буферний час VPS (сек)"
@@ -1043,10 +1049,10 @@ msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Макс. размір відеофайлу (Мб)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Ділити відредаговані файли"
+msgstr "Поділити відредаговані файли"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Видалити записи з зсувом по часу"
 
 msgid "Replay"
 msgstr "Перегляд"
@@ -1058,7 +1064,7 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Віображати режим перегляду"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID перегляду"
+msgstr "ID продовження"
 
 msgid "Miscellaneous"
 msgstr "Різне"
@@ -1088,7 +1094,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Гучність при включенні"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Кінець каналів"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Аварійний вихід"
@@ -1136,13 +1142,13 @@ msgstr "Продовжити"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Перервати монтаж запису"
+msgstr " Перервати монтаж"
 
 msgid "Stop recording?"
 msgstr "Припинити запис?"
 
 msgid "Cancel editing?"
-msgstr "Перервати редактування?"
+msgstr "Перервати монтаж?"
 
 msgid "No audio available!"
 msgstr "Відсутній звук!"
@@ -1166,7 +1172,7 @@ msgid "Pausing live video..."
 msgstr "Режим відкладеного перегляду..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Видалити запис з часовим зсувом?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1212,10 +1218,10 @@ msgid "Low disk space!"
 msgstr "Недостатньо місця на диску!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Регенерація файлу індексів"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Регенерацію файлу індексу завершено"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Виключенння неможливе - не задано параметр '-s'!"
@@ -1286,10 +1292,10 @@ msgid "Sunday"
 msgstr "Неділя"
 
 msgid "Upcoming recording!"
-msgstr "Запис скоро почнеться"
+msgstr "Запис скоро почнеться!"
 
 msgid "Pause live video?"
-msgstr "Режим відкладеного перегляду..."
+msgstr "Призупинити перегляд?"
 
 msgid "Recording started"
 msgstr "Запис почався"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48c4a3841..bffa3017d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-03-12 16:49+0100\n"
+"POT-Creation-Date: 2010-06-06 12:52+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese\n"
@@ -478,6 +478,9 @@ msgstr "设置"
 msgid "Key$Commands"
 msgstr "命令"
 
+msgid "Key$User0"
+msgstr "用户0"
+
 msgid "Key$User1"
 msgstr "用户1"
 
@@ -839,6 +842,9 @@ msgstr "录像目录"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Number keys for characters"
+msgstr ""
+
 msgid "EPG"
 msgstr "电子节目单设置"
 
diff --git a/remux.c b/remux.c
index 2532c638b..520654448 100644
--- a/remux.c
+++ b/remux.c
@@ -1,10 +1,10 @@
 /*
- * remux.h: Tools for detecting frames and handling PAT/PMT
+ * remux.c: Tools for detecting frames and handling PAT/PMT
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.42 2010/02/28 14:42:07 kls Exp $
+ * $Id: remux.c 2.47 2010/06/05 13:32:15 kls Exp $
  */
 
 #include "remux.h"
@@ -188,10 +188,10 @@ int cPatPmtGenerator::MakeStream(uchar *Target, uchar Type, int Pid)
   return i;
 }
 
-int cPatPmtGenerator::MakeAC3Descriptor(uchar *Target)
+int cPatPmtGenerator::MakeAC3Descriptor(uchar *Target, uchar Type)
 {
   int i = 0;
-  Target[i++] = SI::AC3DescriptorTag;
+  Target[i++] = Type;
   Target[i++] = 0x01; // length
   Target[i++] = 0x00;
   IncEsInfoLength(i);
@@ -219,11 +219,17 @@ int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language
 {
   int i = 0;
   Target[i++] = SI::ISO639LanguageDescriptorTag;
-  Target[i++] = 0x04; // length
-  Target[i++] = *Language++;
-  Target[i++] = *Language++;
-  Target[i++] = *Language++;
-  Target[i++] = 0x01; // audio type
+  int Length = i++;
+  Target[Length] = 0x00; // length
+  for (const char *End = Language + strlen(Language); Language < End; ) {
+      Target[i++] = *Language++;
+      Target[i++] = *Language++;
+      Target[i++] = *Language++;
+      Target[i++] = 0x01;     // audio type
+      Target[Length] += 0x04; // length
+      if (*Language == '+')
+         Language++;
+      }
   IncEsInfoLength(i);
   return i;
 }
@@ -315,15 +321,13 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
      if (Vpid)
         i += MakeStream(buf + i, Channel->Vtype(), Vpid);
      for (int n = 0; Channel->Apid(n); n++) {
-         i += MakeStream(buf + i, 0x04, Channel->Apid(n));
+         i += MakeStream(buf + i, Channel->Atype(n), Channel->Apid(n));
          const char *Alang = Channel->Alang(n);
          i += MakeLanguageDescriptor(buf + i, Alang);
-         if (Alang[3] == '+')
-            i += MakeLanguageDescriptor(buf + i, Alang + 3);
          }
      for (int n = 0; Channel->Dpid(n); n++) {
          i += MakeStream(buf + i, 0x06, Channel->Dpid(n));
-         i += MakeAC3Descriptor(buf + i);
+         i += MakeAC3Descriptor(buf + i, Channel->Dtype(n));
          i += MakeLanguageDescriptor(buf + i, Channel->Dlang(n));
          }
      for (int n = 0; Channel->Spid(n); n++) {
@@ -506,6 +510,8 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       break;
            case 0x03: // STREAMTYPE_11172_AUDIO
            case 0x04: // STREAMTYPE_13818_AUDIO
+           case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport sytax
+           case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
                       {
                       if (NumApids < MAXAPIDS) {
                          apids[NumApids] = stream.getPid();
@@ -546,13 +552,16 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
            case 0x06: // STREAMTYPE_13818_PES_PRIVATE
                       {
                       int dpid = 0;
+                      int dtype = 0;
                       char lang[MAXLANGCODE1] = "";
                       SI::Descriptor *d;
                       for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
                           switch (d->getDescriptorTag()) {
                             case SI::AC3DescriptorTag:
+                            case SI::EnhancedAC3DescriptorTag:
                                  dbgpatpmt(" AC3");
                                  dpid = stream.getPid();
+                                 dtype = d->getDescriptorTag();
                                  break;
                             case SI::SubtitlingDescriptorTag:
                                  dbgpatpmt(" subtitling");
@@ -599,7 +608,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       if (dpid) {
                          if (NumDpids < MAXDPIDS) {
                             dpids[NumDpids] = dpid;
-                            dtypes[NumDpids] = stream.getStreamType();
+                            dtypes[NumDpids] = dtype;
                             strn0cpy(dlangs[NumDpids], lang, sizeof(dlangs[NumDpids]));
                             if (updatePrimaryDevice && Setup.UseDolbyDigital)
                                cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
@@ -659,6 +668,10 @@ void cTsToPes::PutTs(const uchar *Data, int Length)
   if (length + Length > size) {
      size = max(KILOBYTE(2), length + Length);
      data = (uchar *)realloc(data, size);
+     if (!data) {
+        Reset();
+        return;
+        }
      }
   memcpy(data + length, Data, Length);
   length += Length;
@@ -817,7 +830,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                  if (synced && Processed)
                     return Processed;
                  if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
-                    return 0; // need more data, in case the frame type is not stored in the first TS packet
+                    return Processed; // need more data, in case the frame type is not stored in the first TS packet
                  if (!frameDuration) {
                     // frame duration unknown, so collect a sequence of PTS values:
                     if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
diff --git a/remux.h b/remux.h
index 1115c4ad9..7b6218780 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.24 2010/01/29 16:51:26 kls Exp $
+ * $Id: remux.h 2.26 2010/06/05 13:27:55 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -84,7 +84,8 @@ inline bool TsIsScrambled(const uchar *p)
 
 inline int TsPayloadOffset(const uchar *p)
 {
-  return (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
+  int o = (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
+  return o <= TS_SIZE ? o : TS_SIZE;
 }
 
 inline int TsGetPayload(const uchar **p)
@@ -168,7 +169,7 @@ class cPatPmtGenerator {
   void IncEsInfoLength(int Length);
 protected:
   int MakeStream(uchar *Target, uchar Type, int Pid);
-  int MakeAC3Descriptor(uchar *Target);
+  int MakeAC3Descriptor(uchar *Target, uchar Type);
   int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
   int MakeLanguageDescriptor(uchar *Target, const char *Language);
   int MakeCRC(uchar *Target, const uchar *Data, int Length);
diff --git a/sdt.c b/sdt.c
index 1ed9b32a9..5f2502b02 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 2.4 2009/12/23 16:02:47 kls Exp $
+ * $Id: sdt.c 2.5 2010/05/16 14:23:21 kls Exp $
  */
 
 #include "sdt.h"
@@ -55,6 +55,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    case 0x02: // digital radio sound service
                    case 0x04: // NVOD reference service
                    case 0x05: // NVOD time-shifted service
+                   case 0x16: // digital SD television service
                    case 0x19: // digital HD television service
                         {
                         char NameBuf[Utf8BufSize(1024)];
diff --git a/svdrpsend.pl b/svdrpsend.pl
index 5efd504be..03d78fea2 100755
--- a/svdrpsend.pl
+++ b/svdrpsend.pl
@@ -7,13 +7,13 @@
 Usage: $0 options command...
 
 Options: -d hostname        destination hostname (default: localhost)
-         -p port            SVDRP port number (default: 2001)
+         -p port            SVDRP port number (default: 6419)
 };
 
 die $Usage if (!$ARGV[0] || !getopts("d:p:"));
 
 $Dest = $opt_d  || "localhost";
-$Port = $opt_p  || 2001;
+$Port = $opt_p  || 6419;
 $Cmd  = "@ARGV" || Error("missing command");
 
 $Timeout = 10; # max. seconds to wait for response
diff --git a/vdr.1 b/vdr.1
index 9bd1f0e73..ea93bddaa 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.4 2010/01/02 12:08:40 kls Exp $
+.\" $Id: vdr.1 2.5 2010/04/02 12:22:08 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -37,7 +37,7 @@ It can be controlled by the PC keyboard, a home built "Remote Control Unit"
 (RCU) or the "Linux Infrared Remote Control" (LIRC).
 
 Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP),
-which can be accessed on port 2001, for instance by \fBtelnet\fR.
+which can be accessed on port 6419, for instance by \fBtelnet\fR.
 .SH OPTIONS
 .TP
 .BI \-a\  cmd ,\ \-\-audio= cmd
@@ -124,7 +124,7 @@ Don't use the keyboard as an input device.
 .TP
 .BI \-p\  port ,\ \-\-port= port
 Use \fIport\fR for SVDRP. A value of \fB0\fR turns off SVDRP.
-The default SVDRP port is \fB2001\fR.
+The default SVDRP port is \fB6419\fR.
 You need to edit the file \fIsvdrphosts.conf\fR in order to enable
 access to the SVDRP port.
 .TP
diff --git a/vdr.5 b/vdr.5
index dbef7dcc3..68711b597 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.17 2010/03/06 14:04:54 kls Exp $
+.\" $Id: vdr.5 2.19 2010/05/16 12:15:48 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -204,6 +204,13 @@ can be indicated by adding a second language code, delimited by a '+' sign, as i
 
 .B ...:101=deu,102=eng+spa;103=deu,104=eng:...
 
+The audio type is appended with a separating '@' character, as in
+
+.B ...:101=deu@4,102=eng+spa@4,105=@4:...
+
+Note that if there is no language code, there still is the separating '='
+if there is an audio type.
+
 .TP
 .B TPID
 The teletext PID.
@@ -463,7 +470,9 @@ If this is not the case in a particular setup, lines of the form
 
 may be inserted in the \fIdiseqc.conf\fR file, defining the devices that are able
 to receive the satellites following thereafter. In this case, only the devices
-1, 2 and 4 would be able to receive any satellites following this line.
+1, 2 and 4 would be able to receive any satellites following this line and up
+to the next such line, or the end of the file. Devices may be listed more than
+once.
 .SS REMOTE CONTROL KEYS
 The file \fIremote.conf\fR contains the key assignments for all remote control
 units. Each line consists of one key assignment in the following format:
diff --git a/vdr.c b/vdr.c
index e7abdcb94..93f586a4a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.17 2010/02/21 14:08:09 kls Exp $
+ * $Id: vdr.c 2.19 2010/04/05 10:06:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
 
   // Command line options:
 
-#define DEFAULTSVDRPPORT 2001
+#define DEFAULTSVDRPPORT 6419
 #define DEFAULTWATCHDOG     0 // seconds
 #define DEFAULTCONFDIR CONFDIR
 #define DEFAULTPLUGINDIR PLUGINDIR
@@ -992,7 +992,7 @@ int main(int argc, char *argv[])
           case kRecordings: DirectMainFunction(osRecordings); break;
           case kSetup:      DirectMainFunction(osSetup); break;
           case kCommands:   DirectMainFunction(osCommands); break;
-          case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
+          case kUser0 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
           case k_Plugin: {
                const char *PluginName = cRemote::GetPlugin();
                if (PluginName) {

From 58db02442b375f5669416e6e744a8325ed363f99 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 19 Sep 2010 16:00:00 +0200
Subject: [PATCH 202/307] Version 1.7.16 - Updated the Italian OSD texts
 (thanks to Diego Pierotto). - Added missing Dtypes for ATSC (thanks to Alex
 Lasnier). - Updated the Portuguese language texts (thanks to Cristiano A.
 Silva). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Fixed
 the array size of Atypes in cPatFilter::Process() (thanks to   Rolf
 Ahrenberg). - Added locking to the cCutter functions to avoid a crash in case
 CutRecording()   is called from a plugin (reported by Andreas Mair). - Fixed
 DDS detection for HD resolution subtitles (thanks to Reinhard Nissl). - Fixed
 following symbolic links in RemoveFileOrDir(). - Added support for languages
 that are written right-to-left (based on a patch   from Osama Alrawab). See
 INSTALL for information on how to turn this on. - Added Arabian language
 texts (thanks to Osama Alrawab).

---
 CONTRIBUTORS                            |   11 +
 HISTORY                                 |   16 +
 INSTALL                                 |   11 +
 Makefile                                |    7 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |    6 +-
 PLUGINS/src/dvbsddevice/dvbsdffosd.c    |    4 +-
 PLUGINS/src/hello/po/fi_FI.po           |   10 +-
 PLUGINS/src/pictures/po/fi_FI.po        |    4 +-
 PLUGINS/src/skincurses/po/fi_FI.po      |    4 +-
 config.h                                |   10 +-
 cutter.c                                |    9 +-
 cutter.h                                |    5 +-
 dvbsubtitle.c                           |    6 +-
 font.c                                  |   41 +-
 font.h                                  |    7 +-
 i18n.c                                  |    5 +-
 pat.c                                   |    5 +-
 po/ar.po                                | 1409 +++++++++++++++++++++++
 po/fi_FI.po                             |    2 +-
 po/it_IT.po                             |    4 +-
 po/pt_PT.po                             |  565 ++++-----
 tools.c                                 |   39 +-
 22 files changed, 1847 insertions(+), 333 deletions(-)
 create mode 100644 po/ar.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cd518120d..0d9a16182 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -984,6 +984,7 @@ Andreas Mair <andreas@vdr-developer.org>
  option ':groups' is given
  for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet()
  for fixing initializing the timer's flags in the cTimer copy constructor
+ for reporting a crash in case CutRecording() is called from a plugin
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1097,6 +1098,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a possible out of buffer memory access in case of bad TS data
  for implementing handling of HD resolution subtitles according to v1.3.1 of
  ETSI EN 300 743, chapter 7.2.1
+ for fixing the array size of Atypes in cPatFilter::Process()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1254,6 +1256,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for devices with large buffers
  for implementing cDeviceHook
  for implementing cDevice::GetCurrentlyTunedTransponder()
+ for fixing DDS detection for HD resolution subtitles
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -2590,6 +2593,7 @@ Lars Hanisch <dvb@flensrocker.de>
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
+ for adding missing Dtypes for ATSC
 
 Dimitar Petrovski <dimeptr@gmail.com>
  for translating OSD texts to the Macedonian language
@@ -2614,3 +2618,10 @@ Christopher Reimer <reimer.christopher@freenet.de>
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
  configurable
+
+Cristiano A. Silva <arquithek@gmail.com>
+ for updating the Portuguese language texts
+
+Osama Alrawab <alrawab@hotmail.com>
+ for adding support for languages that are written right-to-left
+ for translating OSD texts to the Arabian language
diff --git a/HISTORY b/HISTORY
index 3976ba589..d170de5e4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6464,3 +6464,19 @@ Video Disk Recorder Revision History
 - The new setup option "OSD/Number keys for characters" can be used to control whether
   the number keys can be used to enter characters in a text input field (suggested
   by Stefan Huskamp).
+
+2010-09-19: Version 1.7.16
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Added missing Dtypes for ATSC (thanks to Alex Lasnier).
+- Updated the Portuguese language texts (thanks to Cristiano A. Silva).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed the array size of Atypes in cPatFilter::Process() (thanks to
+  Rolf Ahrenberg).
+- Added locking to the cCutter functions to avoid a crash in case CutRecording()
+  is called from a plugin (reported by Andreas Mair).
+- Fixed DDS detection for HD resolution subtitles (thanks to Reinhard Nissl).
+- Fixed following symbolic links in RemoveFileOrDir().
+- Added support for languages that are written right-to-left (based on a patch
+  from Osama Alrawab). See INSTALL for information on how to turn this on.
+- Added Arabian language texts (thanks to Osama Alrawab).
diff --git a/INSTALL b/INSTALL
index ee4f64a4f..e69768a79 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,6 +23,7 @@ You will also need to install the following libraries, as well as their
 
   fontconfig
   freetype2
+  fribidi (see "BiDi support" below)
   gettext
   libcap
   libjpeg
@@ -111,6 +112,16 @@ in English.
 Note that for VDR's internationalized texts to work, the LANG environment
 variable must be set to a valid locale!
 
+BiDi support
+------------
+
+Some languages are written right-to-left. In order to display such languages
+correctly, you need to build VDR with BIDI=1. This will link to the "fribidi"
+library and implement a function that prepares bidirectional texts to be
+displayed correctly. Since BiDi support adds some runtime overhead by requiring
+additional memory allocation and copying, this feature is not compiled in
+by default, so that users that have no need for this don't get any overhead.
+
 Workaround for providers not encoding their EPG data correctly
 --------------------------------------------------------------
 
diff --git a/Makefile b/Makefile
index d788484d5..26f54ea1d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.9 2010/04/10 12:40:15 kls Exp $
+# $Id: Makefile 2.10 2010/09/17 13:28:50 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -53,6 +53,11 @@ endif
 ifdef VDR_USER
 DEFINES += -DVDR_USER=\"$(VDR_USER)\"
 endif
+ifdef BIDI
+INCLUDES += -I/usr/include/fribidi
+DEFINES += -DBIDI
+LIBS += -lfribidi
+endif
 
 LIRC_DEVICE ?= /dev/lircd
 RCU_DEVICE  ?= /dev/ttyS1
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 483381ffb..8671b1ee1 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.26 2010/01/30 10:05:23 kls Exp $
+ * $Id: dvbsdffdevice.c 2.27 2010/09/19 12:43:33 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -15,9 +15,9 @@
 #include <linux/dvb/video.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include <vdr/eitscan.h>
+#include <vdr/transfer.h>
 #include "dvbsdffosd.h"
-#include "vdr/eitscan.h"
-#include "vdr/transfer.h"
 
 // --- cDvbSdFfDevice --------------------------------------------------------
 
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.c b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
index 4ff8db98c..4b60ef511 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffosd.c 2.1 2009/12/29 11:52:48 kls Exp $
+ * $Id: dvbsdffosd.c 2.2 2010/09/19 12:43:45 kls Exp $
  */
 
 #include "dvbsdffosd.h"
@@ -11,7 +11,7 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/unistd.h>
-#include "vdr/tools.h"
+#include <vdr/tools.h>
 
 // --- cDvbSdFfOsd -----------------------------------------------------------
 
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 476fe4cde..36677e0c0 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
-# Jaakko Hyv�tti <jaakko@hyvatti.iki.fi>, 2002
+# Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
 #
@@ -15,11 +15,11 @@ msgstr ""
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr "Yst�v�llisin terveisin"
+msgstr "Ystävällisin terveisin"
 
 msgid "Hello"
 msgstr "Hei"
@@ -28,10 +28,10 @@ msgid "Greeting time (s)"
 msgstr "Tervehdysaika (s)"
 
 msgid "Use alternate greeting"
-msgstr "K�yt� vaihtoehtoista tervehdyst�"
+msgstr "Käytä vaihtoehtoista tervehdystä"
 
 msgid "Howdy folks!"
-msgstr "Mit� kuuluu?"
+msgstr "Mitä kuuluu?"
 
 msgid "Hello world!"
 msgstr "Hei maailma!"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index bbcb69724..803fa9e06 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -12,7 +12,7 @@ msgstr ""
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,4 +29,4 @@ msgid "Slide show delay (s)"
 msgstr "Diaesityksen viive (s)"
 
 msgid "No picture directory has been defined!"
-msgstr "Kuvahakemistoa ei ole m��ritelty!"
+msgstr "Kuvahakemistoa ei ole määritelty!"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 71f7297e1..01fda4d53 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -12,7 +12,7 @@ msgstr ""
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A text only skin"
@@ -22,7 +22,7 @@ msgid "Key$Mute"
 msgstr "Mykistys"
 
 msgid "Volume "
-msgstr "��nenvoimakkuus "
+msgstr "Äänenvoimakkuus "
 
 msgid "Text mode"
 msgstr "Teksti"
diff --git a/config.h b/config.h
index 7041eb7ea..7c28d414a 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.27 2010/06/06 09:53:02 kls Exp $
+ * $Id: config.h 2.28 2010/09/12 11:31:21 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.15"
-#define VDRVERSNUM   10715  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.16"
+#define VDRVERSNUM   10716  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.15"
-#define APIVERSNUM   10715  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.16"
+#define APIVERSNUM   10716  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index ff6b4edb3..c1f49849f 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.4 2010/01/02 13:08:08 kls Exp $
+ * $Id: cutter.c 2.5 2010/08/29 13:35:18 kls Exp $
  */
 
 #include "cutter.h"
 #include "recording.h"
 #include "remux.h"
-#include "thread.h"
 #include "videodir.h"
 
 // --- cCuttingThread --------------------------------------------------------
@@ -194,6 +193,7 @@ void cCuttingThread::Action(void)
 
 // --- cCutter ---------------------------------------------------------------
 
+cMutex cCutter::mutex;
 char *cCutter::editedVersionName = NULL;
 cCuttingThread *cCutter::cuttingThread = NULL;
 bool cCutter::error = false;
@@ -201,6 +201,7 @@ bool cCutter::ended = false;
 
 bool cCutter::Start(const char *FileName)
 {
+  cMutexLock MutexLock(&mutex);
   if (!cuttingThread) {
      error = false;
      ended = false;
@@ -231,6 +232,7 @@ bool cCutter::Start(const char *FileName)
 
 void cCutter::Stop(void)
 {
+  cMutexLock MutexLock(&mutex);
   bool Interrupted = cuttingThread && cuttingThread->Active();
   const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
   delete cuttingThread;
@@ -247,6 +249,7 @@ void cCutter::Stop(void)
 
 bool cCutter::Active(void)
 {
+  cMutexLock MutexLock(&mutex);
   if (cuttingThread) {
      if (cuttingThread->Active())
         return true;
@@ -263,6 +266,7 @@ bool cCutter::Active(void)
 
 bool cCutter::Error(void)
 {
+  cMutexLock MutexLock(&mutex);
   bool result = error;
   error = false;
   return result;
@@ -270,6 +274,7 @@ bool cCutter::Error(void)
 
 bool cCutter::Ended(void)
 {
+  cMutexLock MutexLock(&mutex);
   bool result = ended;
   ended = false;
   return result;
diff --git a/cutter.h b/cutter.h
index afc5e935e..59c440082 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,16 +4,19 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 2.1 2010/01/02 12:09:54 kls Exp $
+ * $Id: cutter.h 2.2 2010/08/29 13:32:33 kls Exp $
  */
 
 #ifndef __CUTTER_H
 #define __CUTTER_H
 
+#include "thread.h"
+
 class cCuttingThread;
 
 class cCutter {
 private:
+  static cMutex mutex;
   static char *editedVersionName;
   static cCuttingThread *cuttingThread;
   static bool error;
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 6ecb3b78d..54943746c 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.6 2010/06/05 14:03:55 kls Exp $
+ * $Id: dvbsubtitle.c 2.7 2010/08/29 14:08:23 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -660,7 +660,7 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
   dvbSubtitleAssembler = new cDvbSubtitleAssembler;
   osd = NULL;
   frozen = false;
-  ddsVersionNumber = 0;
+  ddsVersionNumber = -1;
   displayWidth = 720;
   displayHeight = 576;
   displayHorizontalOffset = 0;
@@ -693,7 +693,7 @@ void cDvbSubtitleConverter::Reset(void)
   bitmaps->Clear();
   DELETENULL(osd);
   frozen = false;
-  ddsVersionNumber = 0;
+  ddsVersionNumber = -1;
   displayWidth = 720;
   displayHeight = 576;
   displayHorizontalOffset = 0;
diff --git a/font.c b/font.c
index 515017bab..4ff4017d6 100644
--- a/font.c
+++ b/font.c
@@ -4,12 +4,17 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 2.4 2009/12/31 14:49:59 kls Exp $
+ * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
+ *
+ * $Id: font.c 2.5 2010/09/19 11:49:19 kls Exp $
  */
 
 #include "font.h"
 #include <ctype.h>
 #include <fontconfig/fontconfig.h>
+#ifdef BIDI
+#include <fribidi.h>
+#endif
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "config.h"
@@ -240,6 +245,10 @@ int cFreetypeFont::Width(const char *s) const
 {
   int w = 0;
   if (s) {
+#ifdef BIDI
+     cString bs = Bidi(s);
+     s = bs;
+#endif
      uint prevSym = 0;
      while (*s) {
            int sl = Utf8CharLen(s);
@@ -259,6 +268,10 @@ int cFreetypeFont::Width(const char *s) const
 void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const
 {
   if (s && height) { // checking height to make sure we actually have a valid font
+#ifdef BIDI
+     cString bs = Bidi(s);
+     s = bs;
+#endif
      bool AntiAliased = Setup.AntiAlias && Bitmap->Bpp() >= 8;
      bool TransparentBackground = ColorBg == clrTransparent;
      int16_t BlendLevelIndex[MAX_BLEND_LEVELS]; // tIndex is 8 bit unsigned, so a negative value can be used to mark unused entries
@@ -443,6 +456,32 @@ cString cFont::GetFontFileName(const char *FontName)
   return FontFileName;
 }
 
+#ifdef BIDI
+cString cFont::Bidi(const char *Ltr)
+{
+  fribidi_set_mirroring(true);
+  fribidi_set_reorder_nsm(false);
+  FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8;
+  int LtrLen = strlen(Ltr);
+  FriBidiCharType Base = FRIBIDI_TYPE_L;
+  FriBidiChar *Logical = MALLOC(FriBidiChar, LtrLen + 1) ;
+  int RtlLen = fribidi_charset_to_unicode(fribidiCharset, const_cast<char *>(Ltr), LtrLen, Logical);
+  FriBidiChar *Visual = MALLOC(FriBidiChar, LtrLen + 1) ;
+  char *Rtl = NULL;
+  bool ok = fribidi_log2vis(Logical, RtlLen, &Base, Visual, NULL, NULL, NULL);
+  if (ok) {
+     fribidi_remove_bidi_marks(Visual, RtlLen, NULL, NULL, NULL);
+     Rtl = MALLOC(char, RtlLen * 4);
+     fribidi_unicode_to_charset(fribidiCharset, Visual, RtlLen, Rtl);
+     }
+  free(Logical);
+  free(Visual);
+  if (ok)
+     return cString(Rtl, true);
+  return cString(Ltr);
+}
+#endif
+
 // --- cTextWrapper ----------------------------------------------------------
 
 cTextWrapper::cTextWrapper(void)
diff --git a/font.h b/font.h
index 449b429f1..cb76671a5 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.3 2009/12/31 14:48:25 kls Exp $
+ * $Id: font.h 2.4 2010/09/19 11:48:37 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -82,6 +82,11 @@ class cFont {
           ///< Returns true if any font names were found.
   static cString GetFontFileName(const char *FontName);
           ///< Retruns the actual font file name for the given FontName.
+#ifdef BIDI
+  static cString Bidi(const char *Ltr);
+          ///< Converts any "right-to-left" parts in the "left-to-right" string Ltr
+          ///< to the proper language specific representation and returns the resulting string.
+#endif
   };
 
 class cTextWrapper {
diff --git a/i18n.c b/i18n.c
index 98544d2ab..d6430340b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,9 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.1 2008/09/06 12:24:43 kls Exp $
- *
- *
+ * $Id: i18n.c 2.2 2010/09/19 11:22:39 kls Exp $
  */
 
 /*
@@ -60,6 +58,7 @@ const char *LanguageCodeList[] = {
   "cze,ces",
   "tur",
   "ukr",
+  "ara",
   NULL
   };
 
diff --git a/pat.c b/pat.c
index 56ad5aeb1..736ddc21f 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.11 2010/06/05 13:26:47 kls Exp $
+ * $Id: pat.c 2.13 2010/06/13 11:12:12 kls Exp $
  */
 
 #include "pat.h"
@@ -332,7 +332,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = 0;
         int Vtype = 0;
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
-        int Atypes[MAXDPIDS + 1] = { 0 };
+        int Atypes[MAXAPIDS + 1] = { 0 };
         int Dpids[MAXDPIDS + 1] = { 0 };
         int Dtypes[MAXDPIDS + 1] = { 0 };
         int Spids[MAXSPIDS + 1] = { 0 };
@@ -473,6 +473,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                              }
                          if (NumDpids < MAXDPIDS) {
                             Dpids[NumDpids] = esPid;
+                            Dtypes[NumDpids] = SI::AC3DescriptorTag;
                             strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
                             NumDpids++;
                             }
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 000000000..82da18ab1
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,1409 @@
+# VDR language source file.
+# Copyright (C) 2008 Osama Alrawab <alrawab@hotmail.com>
+# This file is distributed under the same license as the VDR package.
+# Osama Alrawab <alrawab@hotmail.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.7.0\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2010-09-12 13:37+0200\n"
+"PO-Revision-Date: 2008-10-16 11:16-0400\n"
+"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
+"Language-Team: Arabic <ar@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,1249,-1\n"
+"X-Poedit-Language: Arabic\n"
+"X-Poedit-Country: LIBYA\n"
+"X-Generator: KBabel 1.11.4\n"
+
+msgid "*** Invalid Channel ***"
+msgstr "********قناة خاطئة***************"
+
+msgid "Channel not available!"
+msgstr "القناة غير متاحة"
+
+msgid "Can't start Transfer Mode!"
+msgstr "تعذر  بدء طور النقل"
+
+msgid "off"
+msgstr "ايقاف"
+
+#, fuzzy
+msgid "on"
+msgstr "لا يوجد"
+
+msgid "auto"
+msgstr "ذاتى"
+
+msgid "none"
+msgstr "لا يوجد"
+
+msgid "Polarization"
+msgstr "الاستقطاب"
+
+msgid "System"
+msgstr ""
+
+msgid "Srate"
+msgstr "معدل الترميز"
+
+msgid "Inversion"
+msgstr "قلب"
+
+msgid "CoderateH"
+msgstr "تون عالى"
+
+msgid "CoderateL"
+msgstr "تون منخفض"
+
+msgid "Modulation"
+msgstr "الترميز"
+
+msgid "Bandwidth"
+msgstr "العرض"
+
+msgid "Transmission"
+msgstr "الارسال"
+
+msgid "Guard"
+msgstr "الدرجة"
+
+msgid "Hierarchy"
+msgstr "الهرمية"
+
+#, fuzzy
+msgid "Rolloff"
+msgstr "ايقاف"
+
+msgid "Starting EPG scan"
+msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
+
+msgid "Content$Movie/Drama"
+msgstr ""
+
+msgid "Content$Detective/Thriller"
+msgstr ""
+
+msgid "Content$Adventure/Western/War"
+msgstr ""
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr ""
+
+msgid "Content$Comedy"
+msgstr ""
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr ""
+
+msgid "Content$Romance"
+msgstr ""
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr ""
+
+msgid "Content$Adult Movie/Drama"
+msgstr ""
+
+msgid "Content$News/Current Affairs"
+msgstr ""
+
+msgid "Content$News/Weather Report"
+msgstr ""
+
+msgid "Content$News Magazine"
+msgstr ""
+
+msgid "Content$Documentary"
+msgstr ""
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr ""
+
+msgid "Content$Show/Game Show"
+msgstr ""
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr ""
+
+msgid "Content$Variety Show"
+msgstr ""
+
+msgid "Content$Talk Show"
+msgstr ""
+
+msgid "Content$Sports"
+msgstr ""
+
+msgid "Content$Special Event"
+msgstr ""
+
+msgid "Content$Sport Magazine"
+msgstr ""
+
+msgid "Content$Football/Soccer"
+msgstr ""
+
+msgid "Content$Tennis/Squash"
+msgstr ""
+
+msgid "Content$Team Sports"
+msgstr ""
+
+msgid "Content$Athletics"
+msgstr ""
+
+msgid "Content$Motor Sport"
+msgstr ""
+
+msgid "Content$Water Sport"
+msgstr ""
+
+msgid "Content$Winter Sports"
+msgstr ""
+
+msgid "Content$Equestrian"
+msgstr ""
+
+msgid "Content$Martial Sports"
+msgstr ""
+
+msgid "Content$Children's/Youth Programme"
+msgstr ""
+
+msgid "Content$Pre-school Children's Programme"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr ""
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr ""
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr ""
+
+msgid "Content$Cartoons/Puppets"
+msgstr ""
+
+msgid "Content$Music/Ballet/Dance"
+msgstr ""
+
+msgid "Content$Rock/Pop"
+msgstr ""
+
+msgid "Content$Serious/Classical Music"
+msgstr ""
+
+msgid "Content$Folk/Tradional Music"
+msgstr ""
+
+msgid "Content$Jazz"
+msgstr ""
+
+msgid "Content$Musical/Opera"
+msgstr ""
+
+msgid "Content$Ballet"
+msgstr ""
+
+msgid "Content$Arts/Culture"
+msgstr ""
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr ""
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr ""
+
+msgid "Content$Literature"
+msgstr ""
+
+msgid "Content$Film/Cinema"
+msgstr ""
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr ""
+
+msgid "Content$Social/Political/Economics"
+msgstr ""
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr ""
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr ""
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+#, fuzzy
+msgid "Content$Languages"
+msgstr "اللغة"
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr ""
+
+msgid "Content$Unpublished"
+msgstr ""
+
+msgid "Content$Live Broadcast"
+msgstr ""
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr ""
+
+msgid "No title"
+msgstr "لايوجد عنوان"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "Arabic"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "ara"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "التحقق من مفاتيح  وحدة التحكم"
+
+msgid "Press any key on the RC unit"
+msgstr "الرجاء الضغط على اى زر فى وحدة التحكم"
+
+msgid "RC code detected!"
+msgstr "تم التعرف على الكود المرسل من وحدة التحكم"
+
+msgid "Do not press any key..."
+msgstr "الرجاء عدم ضغط اى زر"
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "الطور الثانى:تعريف الرموز الخاصة بالمفاتيح"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "%sالرجاء الضغط على الزر"
+
+msgid "Press 'Up' to confirm"
+msgstr "اضغط اعلى للتاكيد"
+
+msgid "Press 'Down' to continue"
+msgstr "اضغط اسفل للاستمرار"
+
+msgid "(press 'Up' to go back)"
+msgstr "(اضغط اعلى للرجوع للخلف)"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "(اضغط اسفل للانتهاء نت تعريف المفاتيح)"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "(اضغط قائمة لتخطى هذا المفتاح)"
+
+msgid "Learning Remote Control Keys"
+msgstr "التعرف على مفاتيح وحدة التحكم عن بعد"
+
+msgid "Phase 3: Saving key codes"
+msgstr "المرحلة الثالثة:حفظ اكواد المفاتيح"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "اضغط اعلى للحفظ او اسفل للالغاء"
+
+msgid "Key$Up"
+msgstr "اعلى"
+
+msgid "Key$Down"
+msgstr "اسفل"
+
+msgid "Key$Menu"
+msgstr "القائمة"
+
+msgid "Key$Ok"
+msgstr "تاكيد"
+
+msgid "Key$Back"
+msgstr "رجوع"
+
+msgid "Key$Left"
+msgstr "يسار"
+
+msgid "Key$Right"
+msgstr "يمين"
+
+msgid "Key$Red"
+msgstr "احمر"
+
+msgid "Key$Green"
+msgstr "اخضر"
+
+msgid "Key$Yellow"
+msgstr "اصفر"
+
+msgid "Key$Blue"
+msgstr "ازرق"
+
+msgid "Key$Info"
+msgstr "معلومات"
+
+msgid "Key$Play"
+msgstr "عرض"
+
+msgid "Key$Pause"
+msgstr "تجميد"
+
+msgid "Key$Stop"
+msgstr "ايقاف"
+
+msgid "Key$Record"
+msgstr "تسجيل"
+
+msgid "Key$FastFwd"
+msgstr "تقدم سريع"
+
+msgid "Key$FastRew"
+msgstr "رجوع سريع"
+
+msgid "Key$Next"
+msgstr "التالى"
+
+msgid "Key$Prev"
+msgstr "السابق"
+
+msgid "Key$Power"
+msgstr "تشغيل"
+
+msgid "Key$Channel+"
+msgstr "قناة +"
+
+msgid "Key$Channel-"
+msgstr "قناة -"
+
+msgid "Key$PrevChannel"
+msgstr "القناة السابقة"
+
+msgid "Key$Volume+"
+msgstr "صوت +"
+
+msgid "Key$Volume-"
+msgstr "صوت -"
+
+msgid "Key$Mute"
+msgstr "طمس"
+
+msgid "Key$Audio"
+msgstr "الصوت"
+
+msgid "Key$Subtitles"
+msgstr "ترجمة"
+
+msgid "Key$Schedule"
+msgstr "جدولة"
+
+msgid "Key$Channels"
+msgstr "قنوات"
+
+msgid "Key$Timers"
+msgstr "الموءقت"
+
+msgid "Key$Recordings"
+msgstr "البدء بالتسجيل"
+
+msgid "Key$Setup"
+msgstr "الاعدادات"
+
+msgid "Key$Commands"
+msgstr "اوامر"
+
+#, fuzzy
+msgid "Key$User0"
+msgstr "المستخدم 1"
+
+msgid "Key$User1"
+msgstr "المستخدم 1"
+
+msgid "Key$User2"
+msgstr "المستخدم 2"
+
+msgid "Key$User3"
+msgstr "المستخدم 3"
+
+msgid "Key$User4"
+msgstr "المستخدم 4"
+
+msgid "Key$User5"
+msgstr "المستخدم 5 "
+
+msgid "Key$User6"
+msgstr "المستخدم 6 "
+
+msgid "Key$User7"
+msgstr "المستخدم 7"
+
+msgid "Key$User8"
+msgstr "المستخدم 8"
+
+msgid "Key$User9"
+msgstr "المستخدم 9"
+
+msgid "Disk"
+msgstr "القرص الصلب"
+
+msgid "free"
+msgstr "مساحة حرة"
+
+msgid "Free To Air"
+msgstr "غير مشفر"
+
+msgid "encrypted"
+msgstr "مشفر"
+
+msgid "Edit channel"
+msgstr "تعديل القناة"
+
+msgid "Name"
+msgstr "الاسم"
+
+msgid "Source"
+msgstr "المصدر"
+
+msgid "Frequency"
+msgstr "التردد"
+
+msgid "Vpid"
+msgstr "PID الفيديو"
+
+msgid "Ppid"
+msgstr "PID Pcr"
+
+msgid "Apid1"
+msgstr "PID الصوت"
+
+msgid "Apid2"
+msgstr "PID الصوت 2"
+
+msgid "Dpid1"
+msgstr ""
+
+msgid "Dpid2"
+msgstr ""
+
+msgid "Spid1"
+msgstr ""
+
+msgid "Spid2"
+msgstr ""
+
+msgid "Tpid"
+msgstr ""
+
+msgid "CA"
+msgstr "الكامة"
+
+msgid "Sid"
+msgstr ""
+
+msgid "Channel settings are not unique!"
+msgstr "اعدادات القناة غبر موحد"
+
+msgid "Channels"
+msgstr "القنوات"
+
+msgid "Button$Edit"
+msgstr "اعدادات"
+
+msgid "Button$New"
+msgstr "جديد"
+
+msgid "Button$Delete"
+msgstr "حذف"
+
+msgid "Button$Mark"
+msgstr "علامة"
+
+msgid "Channel is being used by a timer!"
+msgstr "القناة مستخدمة من قبل الموءقت"
+
+msgid "Delete channel?"
+msgstr "حذف القناة"
+
+#, fuzzy
+msgid "Edit folder"
+msgstr "تعديل الموءقت"
+
+msgid "New folder"
+msgstr ""
+
+msgid "Sub folder"
+msgstr ""
+
+msgid "Folder name already exists!"
+msgstr ""
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr ""
+
+#, fuzzy
+msgid "Button$Select"
+msgstr "حذف"
+
+msgid "Delete folder and all sub folders?"
+msgstr ""
+
+#, fuzzy
+msgid "Delete folder?"
+msgstr "الغاء الموءقت"
+
+msgid "Edit timer"
+msgstr "تعديل الموءقت"
+
+msgid "Active"
+msgstr "نشط"
+
+msgid "Channel"
+msgstr "القناة"
+
+msgid "Day"
+msgstr "يوم"
+
+msgid "Start"
+msgstr "بدء"
+
+msgid "Stop"
+msgstr "ايقاف"
+
+msgid "VPS"
+msgstr ""
+
+msgid "Priority"
+msgstr "الاستقطاب"
+
+msgid "Lifetime"
+msgstr "معدل البقاء"
+
+msgid "File"
+msgstr "ملف"
+
+#, fuzzy
+msgid "Button$Folder"
+msgstr "الموءقت"
+
+msgid "First day"
+msgstr "اليوم الاول"
+
+msgid "Select folder"
+msgstr ""
+
+msgid "Timers"
+msgstr "الموءقت"
+
+msgid "Button$On/Off"
+msgstr "تشغيل/ايقاف"
+
+msgid "Button$Info"
+msgstr "معلومات"
+
+msgid "Delete timer?"
+msgstr "الغاء الموءقت"
+
+msgid "Timer still recording - really delete?"
+msgstr "الموءقت يقوم بالتسجيل هل تريد الالغاء ?"
+
+msgid "Event"
+msgstr "الحدث"
+
+msgid "Button$Timer"
+msgstr "الموءقت"
+
+msgid "Button$Record"
+msgstr "التسجيل"
+
+msgid "Button$Switch"
+msgstr "تبديل"
+
+msgid "What's on now?"
+msgstr "ماذا يوجد الان"
+
+msgid "What's on next?"
+msgstr "ما التالى"
+
+msgid "Button$Next"
+msgstr "التالى"
+
+msgid "Button$Now"
+msgstr "الان"
+
+msgid "Button$Schedule"
+msgstr "جدولة"
+
+msgid "Can't switch channel!"
+msgstr "لا يمكن تبديل القناة"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "%sجدولة"
+
+#, c-format
+msgid "This event - %s"
+msgstr " %sهذا الحدث"
+
+msgid "This event - all channels"
+msgstr "هذا الحدث لكل القنوات"
+
+msgid "All events - all channels"
+msgstr "جميع الاحداث لجميع القنوات"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "الرجاء ادخال %d رقم!"
+
+msgid "CAM not responding!"
+msgstr "الكامة لا تستجيب"
+
+msgid "Recording info"
+msgstr "معلومات التسجبل"
+
+msgid "Button$Play"
+msgstr "عرض"
+
+msgid "Button$Rewind"
+msgstr "اعادة"
+
+msgid "Recordings"
+msgstr "التسجيلات"
+
+msgid "Button$Open"
+msgstr "افتح"
+
+msgid "Commands"
+msgstr "الاوامر"
+
+msgid "Error while accessing recording!"
+msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
+
+msgid "Delete recording?"
+msgstr "حذف التسجيل"
+
+msgid "Error while deleting recording!"
+msgstr "حدث خطاء عند محاولة حذف التسجيل"
+
+msgid "Recording commands"
+msgstr "اوامر التسجيل"
+
+msgid "never"
+msgstr "ابدا"
+
+msgid "skin dependent"
+msgstr "متوقف على نوع الثوب"
+
+msgid "always"
+msgstr "دائما"
+
+msgid "OSD"
+msgstr "عرص على الشاشة"
+
+msgid "Setup.OSD$Language"
+msgstr "اللغة"
+
+msgid "Setup.OSD$Skin"
+msgstr " الثوب"
+
+msgid "Setup.OSD$Theme"
+msgstr " الثيمة"
+
+#, fuzzy
+msgid "Setup.OSD$Left (%)"
+msgstr "يسار"
+
+#, fuzzy
+msgid "Setup.OSD$Top (%)"
+msgstr "الى اعلى"
+
+#, fuzzy
+msgid "Setup.OSD$Width (%)"
+msgstr "العرض"
+
+#, fuzzy
+msgid "Setup.OSD$Height (%)"
+msgstr "ارتفاع"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "مواقيت الرسائل"
+
+msgid "Setup.OSD$Use small font"
+msgstr "استعمل خط صغير"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "محدد الحواف"
+
+msgid "Setup.OSD$Default font"
+msgstr "الخط الافتراضى"
+
+msgid "Setup.OSD$Small font"
+msgstr "الخط صغير"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "الخط ثابت"
+
+#, fuzzy
+msgid "Setup.OSD$Default font size (%)"
+msgstr "  حجم الخط الافتراضى"
+
+#, fuzzy
+msgid "Setup.OSD$Small font size (%)"
+msgstr "حجم الخط الصغير"
+
+#, fuzzy
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "حجم الخط الثابت"
+
+msgid "Setup.OSD$Channel info position"
+msgstr " موضع معلومات القناة"
+
+msgid "bottom"
+msgstr "اسفل"
+
+msgid "top"
+msgstr "الى اعلى"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "مدة معلومات القناة"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "معلومات القناة عند تبديل القنوات"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "مدة انتهاء معلومات القنات"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "تقليب الصفحات"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "طى الصفحات"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "زر اغلاق القاائمة"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "مجلد التسجيلات"
+
+#, fuzzy
+msgid "Setup.OSD$Folders in timer menu"
+msgstr "مدة معلومات القناة"
+
+#, fuzzy
+msgid "Setup.OSD$Number keys for characters"
+msgstr "زر اغلاق القاائمة"
+
+msgid "EPG"
+msgstr "الدليل الالكتونى للقنوات"
+
+msgid "Button$Scan"
+msgstr "بحث"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "اﻻنتهاء من البحث على الدليل الالكترونى للقنوات"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr " معدل اصلاح اخطاء الدليل الالكترونى"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "اقل مدة للدليل الالكترونى"
+
+msgid "Setup.EPG$Set system time"
+msgstr "اعداد توقيت النظام"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "الحصول على التوقيت من القناة"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "اللغة المفضلة"
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "اللغة المقضلة"
+
+msgid "pan&scan"
+msgstr "بحث خفيف"
+
+msgid "letterbox"
+msgstr "صندوق الحروف"
+
+msgid "center cut out"
+msgstr "قص من الوسط"
+
+msgid "no"
+msgstr "ﻻ"
+
+msgid "names only"
+msgstr "الاسماء فقط"
+
+msgid "PIDs only"
+msgstr "فقط PID"
+
+msgid "names and PIDs"
+msgstr "الاسماء و PID"
+
+msgid "add new channels"
+msgstr "اضافة قناة جديدة"
+
+msgid "add new transponders"
+msgstr "اضافة مصدر قنوات جديد"
+
+msgid "DVB"
+msgstr "الدى فى بى"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "كرت الستالايت الاولى"
+
+msgid "Setup.DVB$Video format"
+msgstr "نوع الفيديو  "
+
+msgid "Setup.DVB$Video display format"
+msgstr "نوع عرض الفديو"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "دولبى رقمى"
+
+msgid "Setup.DVB$Update channels"
+msgstr "تحديث القنوات"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "لغات الصوت"
+
+msgid "Setup.DVB$Audio language"
+msgstr "لغة الصوت"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "عرض الترجمة"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "لغات الترجمة"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "لغة الترجمة"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "معدل انحراف الترجمة"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "درجة شفافية الترجمة"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "شفافية الخلفية"
+
+msgid "LNB"
+msgstr "الاقط"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr " DiSEqC استعمل"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "التذبذب المحلى للاقط م هرتز"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "التردد المنخفض للاقط م هرتز"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "التردد المرتفع للاقط م هرتز"
+
+msgid "CAM reset"
+msgstr "اعادة تشغيل الكامة"
+
+msgid "CAM present"
+msgstr "الكامة موجودة"
+
+msgid "CAM ready"
+msgstr "الكامة جاهزة"
+
+msgid "CAM"
+msgstr "الكامة "
+
+msgid "Button$Menu"
+msgstr "القائمة"
+
+msgid "Button$Reset"
+msgstr "اعد الضبط"
+
+msgid "Opening CAM menu..."
+msgstr "فتح قائمة الكامة"
+
+msgid "Can't open CAM menu!"
+msgstr "تعذر فتح قائمة الكامة"
+
+msgid "CAM is in use - really reset?"
+msgstr "الكامة مستخدمة الان هل تريد اعادة تشغيلها"
+
+msgid "Can't reset CAM!"
+msgstr "تعذر اعادة تشغيل الكامة"
+
+#, fuzzy
+msgid "do not pause live video"
+msgstr "تجميد العرض الحى"
+
+#, fuzzy
+msgid "confirm pause live video"
+msgstr "تجميد العرض الحى"
+
+#, fuzzy
+msgid "pause live video"
+msgstr "تجميد العرض الحى"
+
+msgid "confirm"
+msgstr ""
+
+msgid "yes"
+msgstr "نعم"
+
+msgid "Recording"
+msgstr "تسجيل"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr ""
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr ""
+
+msgid "Setup.Recording$Primary limit"
+msgstr "الحدود الابتدائية"
+
+msgid "Setup.Recording$Default priority"
+msgstr "الاولويات الافتراضية"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "معدل البقاء باليوم"
+
+#, fuzzy
+msgid "Setup.Recording$Pause key handling"
+msgstr "معدل الايقاف باليوم"
+
+msgid "Setup.Recording$Pause priority"
+msgstr "تعطيل الاولويات"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "معدل الايقاف باليوم"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "استخدم اسم المرحلة"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "استعمل VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr ""
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "علم التسجيل الفورى"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "اسم التسجيل الفورى"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "مدة التسجيل الفورى بالدقيقة"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "اقصى حجم لملف الفيديو ب م ب"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "اقسم الملف المعدل"
+
+#, fuzzy
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr "اسم التسجيل الفورى"
+
+msgid "Replay"
+msgstr "اعادة عرض"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "موءقت النوم"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "اضهر طور الاعادة"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "رقم المواصلة"
+
+msgid "Miscellaneous"
+msgstr "متفرقات"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "مدة انتهاء الحدث بالدقيقة"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "اقل مدة لعدم تفاعل المستخدم بالدقيقة"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "مدة انتهاء مدخلات القناة بالدقيقة"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "القناة الاساسية"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "كسابق"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "فعل الصوت"
+
+#, fuzzy
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr "كسابق"
+
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "خروج طارىء"
+
+msgid "Plugins"
+msgstr "الملحقات"
+
+msgid "This plugin has no setup parameters!"
+msgstr "هذا الملحق لا يوجد له اعادات خاصة"
+
+msgid "Setup"
+msgstr "الاعدادات"
+
+msgid "Restart"
+msgstr "اعادة تشغيل"
+
+msgid "Really restart?"
+msgstr "هل حقا تريد اعادة التشغيل"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr " ايقاف التسجيل "
+
+msgid "Schedule"
+msgstr "جدولة"
+
+msgid "VDR"
+msgstr ""
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr " ايقاف الاعادة"
+
+msgid "Button$Audio"
+msgstr "الصوت"
+
+msgid "Button$Pause"
+msgstr "طمس"
+
+msgid "Button$Stop"
+msgstr "ايقاف"
+
+msgid "Button$Resume"
+msgstr "مواصلة"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr " تعديل القناة"
+
+msgid "Stop recording?"
+msgstr "ايقاف التسجيل"
+
+msgid "Cancel editing?"
+msgstr "الغاء التعديل"
+
+msgid "No audio available!"
+msgstr "لا يوجد صوت متاح"
+
+msgid "No subtitles"
+msgstr "لا توجد ترجمة متاحة"
+
+msgid "Button$Subtitles"
+msgstr "الترجمة"
+
+msgid "No subtitles available!"
+msgstr "لا ترجمة متاحة"
+
+msgid "Not enough disk space to start recording!"
+msgstr "لا يوجد مساحة كافية على القرص الصلب لبدء التسجيل"
+
+msgid "No free DVB device to record!"
+msgstr "لا يوجد كرت ستالايت متاح ليتم التسجيل"
+
+msgid "Pausing live video..."
+msgstr "تجميد العرض الحى"
+
+#, fuzzy
+msgid "Delete timeshift recording?"
+msgstr "حذف التسجيل"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "اقفز الى  "
+
+msgid "No editing marks defined!"
+msgstr "لاتوجد علامات تعديل معرفة"
+
+msgid "Can't start editing process!"
+msgstr "لا يمكن البدء فى عملية التعديل"
+
+msgid "Editing process started"
+msgstr "البدء فى التعديل"
+
+msgid "Editing process already active!"
+msgstr "عملية التعديل نشطة بالفعل"
+
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr ""
+
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr ""
+
+msgid "Button$ABC/abc"
+msgstr ""
+
+msgid "Button$Overwrite"
+msgstr "اعادة الكتابة"
+
+msgid "Button$Insert"
+msgstr "ادراج"
+
+msgid "Plugin"
+msgstr "الملحق"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "اعلى او اسفل ل الموضع الجديد و موافق للتحريك"
+
+msgid "Channel locked (recording)!"
+msgstr "القناة مقفلة للتسجيل"
+
+msgid "Low disk space!"
+msgstr "مساحة القرص غير كافية"
+
+msgid "Regenerating index file"
+msgstr ""
+
+msgid "Index file regeneration complete"
+msgstr ""
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "لا يمكن قفل الحاسوب الرمز s لم يحدد"
+
+msgid "Editing - shut down anyway?"
+msgstr "قم باغلاق الحاسوب على اى حال"
+
+msgid "Recording - shut down anyway?"
+msgstr "اغلق الحاسوب"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "تم تسجيل %ld دقيقة سيتم الاغلاق على اى حال"
+
+msgid "shut down anyway?"
+msgstr "الاغلاق على اى حال"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr ""
+
+msgid "Editing - restart anyway?"
+msgstr ""
+
+msgid "Recording - restart anyway?"
+msgstr ""
+
+msgid "restart anyway?"
+msgstr ""
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "الصوت "
+
+msgid "Classic VDR"
+msgstr "VDR تقليدى  "
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG شاشة "
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr ""
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr ""
+
+msgid "Monday"
+msgstr "الاحد"
+
+msgid "Tuesday"
+msgstr "الاثنين"
+
+msgid "Wednesday"
+msgstr "الاربعاء"
+
+msgid "Thursday"
+msgstr "الثلاثاء"
+
+msgid "Friday"
+msgstr "الجمعة"
+
+msgid "Saturday"
+msgstr "السبت"
+
+msgid "Sunday"
+msgstr "الاحد"
+
+msgid "Upcoming recording!"
+msgstr ""
+
+#, fuzzy
+msgid "Pause live video?"
+msgstr "تجميد العرض الحى"
+
+msgid "Recording started"
+msgstr "ابتداء التسجيل"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "البرنامج سيقوم بالاغلاق لاحقا اضغط زر  القفل لاتمام  عملية الاغلاق"
+
+msgid "Press any key to cancel shutdown"
+msgstr "اضغط اى زر لالغاء اقفال البرنامج"
+
+msgid "Switching primary DVB..."
+msgstr "تم الانتقال لكرت الستالايت الافتراضى"
+
+msgid "Editing process failed!"
+msgstr "تم فشل عملية التعديل"
+
+msgid "Editing process finished"
+msgstr "تم الانتهاء من التعديل"
+
+msgid "Press any key to cancel restart"
+msgstr "اضغط اى زر لالغاء اعادة التشغيل"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "البرنامج سيقوم بالاغلاق بعد%s دقيقة "
+
+#~ msgid "Path"
+#~ msgstr "المسار"
+
+#~ msgid "Timer commands"
+#~ msgstr "اوامر الموءقت"
+
+#~ msgid "Rename recording"
+#~ msgstr "اعادة تسمية التسجيل"
+
+#~ msgid "Date"
+#~ msgstr "التاريخ"
+
+#~ msgid "Length"
+#~ msgstr "الطول"
+
+#~ msgid "Size"
+#~ msgstr "الحجم"
+
+#~ msgid "Delete marks information?"
+#~ msgstr "حذف معلومات العلامة"
+
+#~ msgid "Delete resume information?"
+#~ msgstr "حذف معلومات المواصلة"
+
+#~ msgid "Setup.OSD$Main menu command position"
+#~ msgstr "موضع اوامر القائمة الرئسية"
+
+#~ msgid "Setup.EPG$Show progress bar"
+#~ msgstr "اضهار شريط التقدم"
+
+#~ msgid "Setup.Recording$Max. recording size (GB)"
+#~ msgstr "اقصى حجم للتسجيل م ب"
+
+#~ msgid "Setup.Recording$Hard Link Cutter"
+#~ msgstr "قاطع وصلات الاختصرات"
+
+#~ msgid "Setup.Recording$Show date"
+#~ msgstr "اظهر التاريخ"
+
+#~ msgid "Setup.Recording$Show time"
+#~ msgstr "اظهر تاريخ التعديل"
+
+#~ msgid "Setup.Recording$Show length"
+#~ msgstr "اظهر VPS"
+
+#~ msgid "Rename$Up"
+#~ msgstr "اعلى"
+
+#~ msgid "Rename$Down"
+#~ msgstr "اسفل"
+
+#~ msgid "Rename$Previous"
+#~ msgstr "السابق"
+
+#~ msgid "Rename$Next"
+#~ msgstr "التالى"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index cd57e7cdf..477c7dbf1 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -843,7 +843,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Näytä kansiot ajastinvalikossa"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
 msgid "EPG"
 msgstr "Ohjelmaopas"
diff --git a/po/it_IT.po b/po/it_IT.po
index 89d42375b..0ca9025f4 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2010-06-06 12:52+0200\n"
-"PO-Revision-Date: 2010-03-28 22:49+0100\n"
+"PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -847,7 +847,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Cartelle nel menu timer"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Tasti numerici per i caratteri"
 
 msgid "EPG"
 msgstr "Guida programmi EPG"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0510d9dbd..45507a841 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
+# Cris Silva <hudokkow@gmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2010-06-06 12:52+0200\n"
-"PO-Revision-Date: 2008-03-18 17:04+0100\n"
-"Last-Translator: anonymous\n"
+"PO-Revision-Date: 2010-03-28 22:49+0100\n"
+"Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -19,7 +20,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Canal inv�lido ***"
 
 msgid "Channel not available!"
-msgstr "Canal indisponivel!"
+msgstr "Canal indispon�vel!"
 
 msgid "Can't start Transfer Mode!"
 msgstr "Imposs�vel iniciar modo de transfer�ncia!"
@@ -28,10 +29,10 @@ msgid "off"
 msgstr "off"
 
 msgid "on"
-msgstr ""
+msgstr "on"
 
 msgid "auto"
-msgstr "Autom�tico"
+msgstr "autom�tico"
 
 msgid "none"
 msgstr "nenhum"
@@ -40,10 +41,10 @@ msgid "Polarization"
 msgstr "Polariza��o"
 
 msgid "System"
-msgstr ""
+msgstr "Sistema"
 
 msgid "Srate"
-msgstr "Srate"
+msgstr "SymbolRate"
 
 msgid "Inversion"
 msgstr "Invers�o"
@@ -58,263 +59,263 @@ msgid "Modulation"
 msgstr "Modula��o"
 
 msgid "Bandwidth"
-msgstr "Bandwidth"
+msgstr "Largura de banda"
 
 msgid "Transmission"
 msgstr "Transmiss�o"
 
 msgid "Guard"
-msgstr "Guard"
+msgstr "Guarda"
 
 msgid "Hierarchy"
 msgstr "Hierarquia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
-msgstr "Iniciar a procura de EPG"
+msgstr "A iniciar a busca do EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Filme/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Policial/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Aventura/Western/Guerra"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Fic��o Cient�fica/Fantasia/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Com�dia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Novela/Melodrama/Folcl�rico"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romance"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "S�rio/Cl�ssico/Religioso/Hist�rico/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Filme para adultos/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Not�cias/�ltima Hora"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Not�cias/Meteorologia"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Notici�rio"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Document�rio"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discuss�o/Entrevista/Debate"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Espect�culo/Concurso"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Concurso"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Espect�culo de variedades"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Entrevista"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Desporto"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Evento especial"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Magazine de desporto"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Futebol"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Desportos colectivos"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletismo"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Desportos motorizados"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Desportos aqu�ticos"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Desportos de Inverno"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equita��o"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Artes marciais"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Programa infanto-juvenil"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Programa infantil"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programa de entretenimento dos 6 aos 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programa de entretenimento dos 10 aos 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Programa informativo/educacional/escolar"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Desenhos animados"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "M�sica/Bailado/Dan�a"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "M�sica Cl�ssica/S�ria"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "M�sica Tradicional/Folclore"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/�pera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Bailado"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arte/Cultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Artes performativas"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Belas-artes"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religi�o"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Cultura popular/Arte tradicional"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Filme/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Filme/v�deo experimental"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Trasmiss�o/Imprensa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Programa novo"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Arte/Magazine cultural"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Sociedade/Pol�tica/Economia"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazine/Reportagem/Document�rio"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Economia/Sociedade"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Pessoas importantes"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Educa��o/Ci�ncia/Factos"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Natureza/Animais/Ambiente"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tecnologia/Ci�ncias naturais"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Filosofia/Psicologia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Pa�ses estrangeiros/Expedi��es"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Sociedade/Ci�ncias espirituais"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Outra educa��o"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "L�nguas"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Tempos livres/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turismo/Viagens"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Artesanato"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motorizados"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness & Sa�de"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Culin�ria"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Publicidade/Compras"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Jardinagem"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "L�ngua materna"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Branco & Preto"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "N�o publicado"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Transmiss�o ao vivo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "de %d"
 
 msgid "No title"
 msgstr "Sem t�tulo"
@@ -325,50 +326,50 @@ msgstr "Portugu
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
-msgstr "por"
+msgstr "prt"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Fase 1: Detectar tipo de telecomando"
+msgstr "Fase 1: A detectar c�digo RC"
 
 msgid "Press any key on the RC unit"
-msgstr "Pressione qualquer tecla do telecomando"
+msgstr "Pressione qualquer tecla"
 
 msgid "RC code detected!"
-msgstr "C�digo do telecomando detectado!"
+msgstr "C�digo RC detectado!"
 
 msgid "Do not press any key..."
-msgstr "N�o pressione nenhuma tecla..."
+msgstr "N�o pressione qualquer tecla..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Fase 2: A aprender c�digos de teclas espec�ficos"
+msgstr "Fase 2: A aprender c�digos espec�ficos"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Pressione tecla para '%s'"
+msgstr "Pressione a tecla para '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Pressione 'Cima' para confirmar"
+msgstr "Prima 'Cima' para confirmar"
 
 msgid "Press 'Down' to continue"
-msgstr "Pressione 'Baixo' para continuar"
+msgstr "Prima 'Baixo' para continuar"
 
 msgid "(press 'Up' to go back)"
-msgstr "(Pressione 'Cima' para voltar atr�s)"
+msgstr "(prima 'Cima' para voltar atr�s)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(Pressione 'Baixo' para terminar a defini��o de teclas)"
+msgstr "(prima 'Baixo' para concluir a defini��o de teclas)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(Pressione 'Menu' para saltar esta tecla)"
+msgstr "(prima 'Menu' para saltar esta tecla)"
 
 msgid "Learning Remote Control Keys"
-msgstr "Aprender as teclas do telecomando"
+msgstr "A aprender as teclas do comando"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Fase 3: A salvar os c�digos das teclas"
+msgstr "Fase 3: Guaradar os c�digos das teclas"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Precione 'Cima' para gravar, 'Baixo' para cancelar"
+msgstr "Prima 'Cima' para guardar, 'Baixo' para cancelar"
 
 msgid "Key$Up"
 msgstr "Cima"
@@ -422,7 +423,7 @@ msgid "Key$FastFwd"
 msgstr "Avan�o R�pido"
 
 msgid "Key$FastRew"
-msgstr "Retrocedo R�pido"
+msgstr "Retrocesso R�pido"
 
 msgid "Key$Next"
 msgstr "Seguinte"
@@ -440,7 +441,7 @@ msgid "Key$Channel-"
 msgstr "Canal-"
 
 msgid "Key$PrevChannel"
-msgstr "Canal anterior"
+msgstr "Canale anterior"
 
 msgid "Key$Volume+"
 msgstr "Volume+"
@@ -452,19 +453,19 @@ msgid "Key$Mute"
 msgstr "Sem som"
 
 msgid "Key$Audio"
-msgstr "Audio"
+msgstr "�udio"
 
 msgid "Key$Subtitles"
 msgstr "Legendas"
 
 msgid "Key$Schedule"
-msgstr "Guia de programa��o"
+msgstr "Programa��o"
 
 msgid "Key$Channels"
 msgstr "Canais"
 
 msgid "Key$Timers"
-msgstr "Grava��es programadas"
+msgstr "Grava��es agendadas"
 
 msgid "Key$Recordings"
 msgstr "Grava��es"
@@ -476,34 +477,34 @@ msgid "Key$Commands"
 msgstr "Comandos"
 
 msgid "Key$User0"
-msgstr "Definida0"
+msgstr "Defini��o0"
 
 msgid "Key$User1"
-msgstr "Definida1"
+msgstr "Defini��o1"
 
 msgid "Key$User2"
-msgstr "Definida2"
+msgstr "Defini��o2"
 
 msgid "Key$User3"
-msgstr "Definida3"
+msgstr "Defini��o3"
 
 msgid "Key$User4"
-msgstr "Definida4"
+msgstr "Defini��o4"
 
 msgid "Key$User5"
-msgstr "Definida5"
+msgstr "Defini��o5"
 
 msgid "Key$User6"
-msgstr "Definida6"
+msgstr "Defini��o6"
 
 msgid "Key$User7"
-msgstr "Definida7"
+msgstr "Defini��o7"
 
 msgid "Key$User8"
-msgstr "Definida8"
+msgstr "Defini��o8"
 
 msgid "Key$User9"
-msgstr "Definida9"
+msgstr "Defini��o9"
 
 msgid "Disk"
 msgstr "Disco"
@@ -515,10 +516,10 @@ msgid "Free To Air"
 msgstr "FTA"
 
 msgid "encrypted"
-msgstr "Codificado"
+msgstr "codificado"
 
 msgid "Edit channel"
-msgstr "Editar canal"
+msgstr "Editar Canal"
 
 msgid "Name"
 msgstr "Nome"
@@ -530,22 +531,22 @@ msgid "Frequency"
 msgstr "Frequ�ncia"
 
 msgid "Vpid"
-msgstr "Vpid"
+msgstr "PID V�deo"
 
 msgid "Ppid"
-msgstr "Ppid"
+msgstr "PID Pcr"
 
 msgid "Apid1"
-msgstr "Apid1"
+msgstr "PID �udio (1)"
 
 msgid "Apid2"
-msgstr "Apid2"
+msgstr "PID �udio (2)"
 
 msgid "Dpid1"
-msgstr "Dpid1"
+msgstr "PID AC3 (1)"
 
 msgid "Dpid2"
-msgstr "Dpid2"
+msgstr "PID AC3 (2)"
 
 msgid "Spid1"
 msgstr "Spid1"
@@ -554,7 +555,7 @@ msgid "Spid2"
 msgstr "Spid2"
 
 msgid "Tpid"
-msgstr "Tpid"
+msgstr "PID Teletext"
 
 msgid "CA"
 msgstr "CA"
@@ -563,7 +564,7 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Channel settings are not unique!"
-msgstr "Propriedades do canal n�o s�o �nicas!"
+msgstr "Par�metros do canal n�o s�o �nicos!"
 
 msgid "Channels"
 msgstr "Canais"
@@ -581,38 +582,38 @@ msgid "Button$Mark"
 msgstr "Marcar"
 
 msgid "Channel is being used by a timer!"
-msgstr "Canal a ser utilizador por uma grava��o programada!"
+msgstr "Canal ocupado com uma grava��o!"
 
 msgid "Delete channel?"
-msgstr "Apagar o canal?"
+msgstr "Apagar canal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Editar pasta"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nova pasta"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Subpasta"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Nome da pasta j� existe!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "O nome da pasta n�o pode conter '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Seleccionar"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Apagar pasta e todas as subpastas?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Apagar pasta?"
 
 msgid "Edit timer"
-msgstr "Editar gava��o programada"
+msgstr "Editar grava��o programada"
 
 msgid "Active"
 msgstr "Activo"
@@ -627,7 +628,7 @@ msgid "Start"
 msgstr "Inicio"
 
 msgid "Stop"
-msgstr "Fim"
+msgstr "Final"
 
 msgid "VPS"
 msgstr "VPS"
@@ -636,22 +637,22 @@ msgid "Priority"
 msgstr "Prioridade"
 
 msgid "Lifetime"
-msgstr "Dura��o"
+msgstr "Validade"
 
 msgid "File"
 msgstr "Ficheiro"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Pasta"
 
 msgid "First day"
-msgstr "Primeiro dia"
+msgstr "1� dia"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Seleccione a pasta"
 
 msgid "Timers"
-msgstr "Grava��es programadas"
+msgstr "Grava��es"
 
 msgid "Button$On/Off"
 msgstr "On/Off"
@@ -660,16 +661,16 @@ msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Apagar a grava��o programada?"
+msgstr "Eliminar grava��o programada?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Grava��o programada activa - quer mesmo apagar?"
+msgstr "Ainda a gravar - eliminar mesmo?"
 
 msgid "Event"
 msgstr "Evento"
 
 msgid "Button$Timer"
-msgstr "Grava��o programada"
+msgstr "Grava��o"
 
 msgid "Button$Record"
 msgstr "Gravar"
@@ -678,26 +679,26 @@ msgid "Button$Switch"
 msgstr "Mudar"
 
 msgid "What's on now?"
-msgstr "O que est� a dar agora?"
+msgstr "O que est� a passar agora?"
 
 msgid "What's on next?"
-msgstr "O que vai dar a seguir?"
+msgstr "O que vai passar a seguir?"
 
 msgid "Button$Next"
-msgstr "depois"
+msgstr "Seguinte"
 
 msgid "Button$Now"
 msgstr "Agora"
 
 msgid "Button$Schedule"
-msgstr "Guia de Programa��o"
+msgstr "Programa��o"
 
 msgid "Can't switch channel!"
 msgstr "Imposs�vel mudar de canal!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Guia de programa��o - %s"
+msgstr "Programa��o - %s"
 
 #, c-format
 msgid "This event - %s"
@@ -711,10 +712,10 @@ msgstr "Todos os eventos - todos os canais"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Por favor insira %d digitos!"
+msgstr "Por favor introduza %d d�gitos!"
 
 msgid "CAM not responding!"
-msgstr "CAM n�o responde!"
+msgstr "A CAM n�o responde!"
 
 msgid "Recording info"
 msgstr "Informa��o da grava��o"
@@ -723,7 +724,7 @@ msgid "Button$Play"
 msgstr "Reproduzir"
 
 msgid "Button$Rewind"
-msgstr "Rebobinar"
+msgstr "Retroceder"
 
 msgid "Recordings"
 msgstr "Grava��es"
@@ -735,22 +736,22 @@ msgid "Commands"
 msgstr "Comandos"
 
 msgid "Error while accessing recording!"
-msgstr "Erro ao aceder � grava��o!"
+msgstr "Erro a aceder �s grava��es!"
 
 msgid "Delete recording?"
-msgstr "Apagar a grava��o?"
+msgstr "Eliminar grava��o?"
 
 msgid "Error while deleting recording!"
-msgstr "Erro ao apagar grava��o!"
+msgstr "Erro a eliminar grava��o!"
 
 msgid "Recording commands"
-msgstr "Comandos de grava��o"
+msgstr "A gravar comandos"
 
 msgid "never"
 msgstr "nunca"
 
 msgid "skin dependent"
-msgstr "Dependente da skin"
+msgstr "dependente do tema"
 
 msgid "always"
 msgstr "sempre"
@@ -759,13 +760,13 @@ msgid "OSD"
 msgstr "OSD"
 
 msgid "Setup.OSD$Language"
-msgstr "Idioma"
+msgstr "L�ngua"
 
 msgid "Setup.OSD$Skin"
-msgstr "Skin"
+msgstr "Tema"
 
 msgid "Setup.OSD$Theme"
-msgstr "Tema"
+msgstr "Cor do tema"
 
 msgid "Setup.OSD$Left (%)"
 msgstr "Esquerda (%)"
@@ -774,13 +775,13 @@ msgid "Setup.OSD$Top (%)"
 msgstr "Topo (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "Largura (%)"
+msgstr "Largura de OSD (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "Altura (%)"
+msgstr "Altura de OSD (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Dura��o das mensagem (s)"
+msgstr "Dura��o de mensagem (s)"
 
 msgid "Setup.OSD$Use small font"
 msgstr "Usar fonte pequena"
@@ -789,87 +790,87 @@ msgid "Setup.OSD$Anti-alias"
 msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr "Fonte por defeito"
+msgstr "Fonte padr�o"
 
 msgid "Setup.OSD$Small font"
 msgstr "Fonte pequena"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Fonte Fixa"
+msgstr "Fonte fixa"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Tamanho por defeito de fonte (%)"
+msgstr "Tamanho da fonte padr�o (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Tamanho da fonte pequena (%)"
+msgstr "tamanho da fonte pequena (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Tamanho da fonte fixa (%)"
+msgstr "Fonte de tamanho fixo (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Posi��o de info dos canais"
+msgstr "Posi��o da informa��o de canal"
 
 msgid "bottom"
-msgstr "fundo"
+msgstr "baixo"
 
 msgid "top"
 msgstr "topo"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Tempo de info dos canais (s)"
+msgstr "Dura��o da informa��o do canal (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Mostrar info ao mudar de Canal"
+msgstr "Mostrar informa��o ao mudar de canal"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Timeout da info dos canais pedidos"
+msgstr "Tempo para mostar informa��o do canal"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Scroll das p�ginas"
+msgstr "Percorrer p�ginas"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Scroll circular"
+msgstr "Percorrer p�ginas de forma circular"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Tecla Menu fecha"
+msgstr "TTecla Menu fecha"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Directorias de grava��o"
+msgstr "Pasta de grava��es"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Pastas no menu de grava��es"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Teclas num�ricas para caracteres"
 
 msgid "EPG"
-msgstr "Guia de programa��o"
+msgstr "Guia de Programa��o"
 
 msgid "Button$Scan"
 msgstr "Procurar"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Timeout da procura de EPG (h)"
+msgstr "Procura do EPG termina ap�s (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "N�vel de correc��o EPG"
+msgstr "N�vel de correc��o do EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Tempo de Linger de EPG (min)"
+msgstr "Tempo de demora do EPG (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Acertar hora do sistema"
+msgstr "Configurar hora do sistema"
 
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Usar hora do transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "Idiomas preferidos"
+msgstr "L�nguas preferidas"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "Idioma preferido"
+msgstr "L�ngua preferida"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -884,31 +885,31 @@ msgid "no"
 msgstr "n�o"
 
 msgid "names only"
-msgstr "Apenas nomes"
+msgstr "apenas nomes"
 
 msgid "PIDs only"
-msgstr "Apenas PIDs"
+msgstr "apenas PIDs"
 
 msgid "names and PIDs"
-msgstr "Nomes e PIDs"
+msgstr "nomes e PIDs"
 
 msgid "add new channels"
-msgstr "Adicionar novos canais"
+msgstr "adicionar novos canais"
 
 msgid "add new transponders"
 msgstr "adicionar novos transponders"
 
 msgid "DVB"
-msgstr "DVB"
+msgstr "Placa DVB"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "Interface DVB prim�rio"
+msgstr "Placa DVB prim�ria"
 
 msgid "Setup.DVB$Video format"
 msgstr "Formato de v�deo"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Formato de v�deo visivel"
+msgstr "Formato de visualiza��o de v�deo"
 
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Usar Dolby Digital"
@@ -917,16 +918,16 @@ msgid "Setup.DVB$Update channels"
 msgstr "Actualizar canais"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Idiomas de audio"
+msgstr "Idiomas do �udio"
 
 msgid "Setup.DVB$Audio language"
-msgstr "Idioma de audio"
+msgstr "Idioma do �udio"
 
 msgid "Setup.DVB$Display subtitles"
 msgstr "Mostrar legendas"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "Idiomas das legendas"
+msgstr "Idioma das legendas"
 
 msgid "Setup.DVB$Subtitle language"
 msgstr "Idioma da legenda"
@@ -935,25 +936,25 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "Posi��o das legendas"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Transpar�ncia de foreground das legendas"
+msgstr "Transpar�ncia de topo das legendas"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Transpar�ncia de background das legendas"
+msgstr "Transpar�ncia de fundo das legendas"
 
 msgid "LNB"
 msgstr "LNB"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "Utilizar DiSEqC"
+msgstr "Usa DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Frequ�ncia baixa LNB (MHz)"
+msgstr "Frequ�ncia baixa do LNB (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Frequ�ncia alta LNB (MHz)"
+msgstr "Frequ�ncia alta do LNB (MHz)"
 
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
@@ -962,7 +963,7 @@ msgid "CAM present"
 msgstr "CAM presente"
 
 msgid "CAM ready"
-msgstr "CAM preparada"
+msgstr "CAM pronta"
 
 msgid "CAM"
 msgstr "CAM"
@@ -977,124 +978,124 @@ msgid "Opening CAM menu..."
 msgstr "A abrir menu da CAM..."
 
 msgid "Can't open CAM menu!"
-msgstr "N�o � poss�vel abrir menu da CAM!"
+msgstr "Imposs�vel abrir menu da CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM em uso - quer mesmo reiniciar?"
+msgstr "CAM em uso - reiniciar mesmo?"
 
 msgid "Can't reset CAM!"
-msgstr "N�o � poss�vel reiniciar a CAM"
+msgstr "Imposs�vel reiniciar a CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "n�o pausar emiss�o"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "confirmar pausa da emiss�o"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pausar emiss�o"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirmar"
 
 msgid "yes"
 msgstr "sim"
 
 msgid "Recording"
-msgstr "Op��es de grava��o"
+msgstr "Grava��o"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Margem inicial (min)"
+msgstr "Margem de in�cio (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Margem final (min)"
+msgstr "Margem do fim (min)"
 
 msgid "Setup.Recording$Primary limit"
-msgstr "Limite Prim�rio"
+msgstr "Limite prim�rio"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Prioridade por defeito"
+msgstr "PPrioridade padr�o"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Validade por defeito (d)"
+msgstr "Validade padr�o (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Comportamento da tecla Pausa"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioridade da pausa"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Validade da pausa"
+msgstr "Validade da pausa (d)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Utilizar o nome do epis�dio"
+msgstr "Usar nome do epis�dio"
 
 msgid "Setup.Recording$Use VPS"
 msgstr "Usar VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "Margem do VPS (s)"
+msgstr "Margem de VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Marcar grava��es imediatas"
+msgstr "Marcar grava��o instant�nea"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Dar nome a grava��es imediatas"
+msgstr "Nome da grava��o instant�nea"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Tempo de grava��o imediata (min)"
+msgstr "Validade da grava��o instant�nea (min)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Tamanho m�ximo dos ficheiros de video (MB)"
+msgstr "Tamanho m�ximo do ficheiro de v�deo (MB)"
 
 msgid "Setup.Recording$Split edited files"
 msgstr "Dividir ficheiros editados"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Eliminar grava��es timeshift"
 
 msgid "Replay"
-msgstr "Op��es de reprodu��o"
+msgstr "Reproduzir"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Modo de velocidade multipla"
+msgstr "Modo multi velocidade"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar modo de reprodu��o"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID de continua��o"
+msgstr "ID de resumo"
 
 msgid "Miscellaneous"
 msgstr "Outros"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Tempo de espera m�nimo antes de um evento (min)"
+msgstr "Tempo de espera m�nimo antes de evento (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Tempo m�nimo de inactividade (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "Tempo de espera de SVDRP (s)"
+msgstr "Tempo de espera SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Tempo de espera entre mudan�a de canais (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Tempo de espera ao entrar num canal (ms)"
+msgstr "Tempo de espera ao mudar de canal (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "Como estava"
+msgstr "como estava"
 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume inicial"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Retroceder canais"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sa�da de emerg�ncia"
@@ -1112,14 +1113,14 @@ msgid "Restart"
 msgstr "Reiniciar"
 
 msgid "Really restart?"
-msgstr "Tem a certeza que quer reiniciar?"
+msgstr "Quer mesmo reiniciar?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
 msgstr " Parar grava��o "
 
 msgid "Schedule"
-msgstr "Guia de programa��o"
+msgstr "Programa��o"
 
 msgid "VDR"
 msgstr "VDR"
@@ -1129,7 +1130,7 @@ msgid " Stop replaying"
 msgstr " Parar reprodu��o"
 
 msgid "Button$Audio"
-msgstr "Audio"
+msgstr "�udio"
 
 msgid "Button$Pause"
 msgstr "Pausa"
@@ -1145,13 +1146,13 @@ msgid " Cancel editing"
 msgstr " Cancelar edi��o"
 
 msgid "Stop recording?"
-msgstr "Parar Grava��o?"
+msgstr "Parar grava��o?"
 
 msgid "Cancel editing?"
-msgstr "Cancelar Edi��o?"
+msgstr "Cancelar edi��o?"
 
 msgid "No audio available!"
-msgstr "Audio n�o dispon�vel"
+msgstr "�udio indispon�vel!"
 
 msgid "No subtitles"
 msgstr "Sem legendas"
@@ -1160,47 +1161,47 @@ msgid "Button$Subtitles"
 msgstr "Legendas"
 
 msgid "No subtitles available!"
-msgstr "Sem legendas dispon�veis!"
+msgstr "Legendas indispon�veis!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Espa�o livre de disco insuficiente para gravar!"
+msgstr "Espa�o livre insuficiente para gravar!"
 
 msgid "No free DVB device to record!"
-msgstr "Nenhuma placa DVB disponivel para gravar!"
+msgstr "Nenhuma placa DVB dispon�vel para gravar!"
 
 msgid "Pausing live video..."
-msgstr "Video em directo em pausa..."
+msgstr "A pausar emiss�o..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Eliminar grava��o timeshift?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Saltar: "
 
 msgid "No editing marks defined!"
-msgstr "N�o est�o definidas marcas de edi��o!"
+msgstr "Marcas de edi��o n�o foram definidas!"
 
 msgid "Can't start editing process!"
-msgstr "N�o pode iniciar o processo de edi��o!"
+msgstr "Imposs�vel iniciar processo de edi��o!"
 
 msgid "Editing process started"
 msgstr "Processo de edi��o iniciado"
 
 msgid "Editing process already active!"
-msgstr "Processo de edi��o j� activo!"
+msgstr "Processo de edi��o est� activo!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " a��bcde��fghi��jklmno��pqrstu��vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&�"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+�?{}/:%@&\ta��bc2\tde��f3\tghi��4\tjkl5\tmno��6\tpqrs7\ttu��v8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr "Substituir"
+msgstr "Sobrescrever"
 
 msgid "Button$Insert"
 msgstr "Inserir"
@@ -1209,58 +1210,58 @@ msgid "Plugin"
 msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Cima/Baixo para nova localiza��o - Ok para mover"
+msgstr "Cima/Baixo para nova posi��o - OK para mover"
 
 msgid "Channel locked (recording)!"
 msgstr "Canal bloqueado (a gravar)!"
 
 msgid "Low disk space!"
-msgstr "Espa�o em disco reduzido!"
+msgstr "Espa�o em disco baixo!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "A regenerar �ndice do ficheiro"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Regenera��o do �ndice do ficheiro completa"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Imposs�vel desligar - falta a op��o '-s'!"
+msgstr "Imposs�vel desligar - falta o par�metro '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "A editar - quer mesmo desligar?"
+msgstr "A editar - desligar mesmo assim?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Em grava��o - quer mesmo desligar?"
+msgstr "A gravar - desligar mesmo assim?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Em grava��o dentro de %ld minutos - quer mesmo desligar?"
+msgstr "Grava��o programada em %ld minutos - desligar mesmo assim?"
 
 msgid "shut down anyway?"
-msgstr "quer mesmo desligar?"
+msgstr "desligar mesmo assim?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Plugin %s vai iniciar em %ld min, continuar?"
+msgstr "O plugin %s acorda daqui a %ld minuots, continuar?"
 
 msgid "Editing - restart anyway?"
-msgstr "A editar - quer mesmo reiniciar?"
+msgstr "A editar - reiniciar mesmo assim?"
 
 msgid "Recording - restart anyway?"
-msgstr "Em grava��o - quer mesmo reiniciar?"
+msgstr "Grava��o em curso - reiniciar mesmo assim?"
 
 msgid "restart anyway?"
-msgstr "quer mesmo reiniciar?"
+msgstr "reiniciar mesmo assim?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
 msgstr "Volume "
 
 msgid "Classic VDR"
-msgstr "VDR classico"
+msgstr "VDR Cl�ssico"
 
 msgid "ST:TNG Panels"
-msgstr "Paineis ST:TNG"
+msgstr "Consola ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -1268,7 +1269,7 @@ msgstr "STQQSSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "SegTerQuaQuiSexS�bDom"
+msgstr "SegTerQuaQuiSexSabDom"
 
 msgid "Monday"
 msgstr "Segunda"
@@ -1292,32 +1293,32 @@ msgid "Sunday"
 msgstr "Domingo"
 
 msgid "Upcoming recording!"
-msgstr "Grava��o agendada!"
+msgstr "Grava��o iminente!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Pausar emiss�o?"
 
 msgid "Recording started"
 msgstr "Grava��o iniciada"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR vai desligar mais tarde - pressione On/Off para for�ar"
+msgstr "O VDR vai desligar mais tarde  - pressione On/Off para for�ar"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Pressione qualquer tecla para n�o desligar"
+msgstr "Pressione qualquer tecla para cancelar o encerramento"
 
 msgid "Switching primary DVB..."
-msgstr "A mudar interface DVB prim�rio..."
+msgstr "A mudar placa de DVB prim�ria..."
 
 msgid "Editing process failed!"
-msgstr "Falha no processo de edi��o"
+msgstr "Processo de edi��o falhou!"
 
 msgid "Editing process finished"
-msgstr "Processo de edi��o terminado"
+msgstr "Processo de edi��o terminou"
 
 msgid "Press any key to cancel restart"
-msgstr "Pressione qualquer tecla para n�o reiniciar"
+msgstr "Pressione qualquer tecla para cancelar o reinicio"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR vai desligar em %s minutos"
+msgstr "O VDR vai desligar daqui a %s minutos"
diff --git a/tools.c b/tools.c
index c989e2671..3ce12ec55 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.7 2010/02/28 13:31:46 kls Exp $
+ * $Id: tools.c 2.8 2010/08/29 15:03:08 kls Exp $
  */
 
 #include "tools.h"
@@ -367,22 +367,31 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                  if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
                     cString buffer = AddDirectory(FileName, e->d_name);
                     if (FollowSymlinks) {
-                       int size = strlen(buffer) * 2; // should be large enough
-                       char *l = MALLOC(char, size);
-                       int n = readlink(buffer, l, size);
-                       if (n < 0) {
-                          if (errno != EINVAL)
-                             LOG_ERROR_STR(*buffer);
+                       struct stat st2;
+                       if (stat(buffer, &st2) == 0) {
+                          if (S_ISLNK(st2.st_mode)) {
+                             int size = st2.st_size + 1;
+                             char *l = MALLOC(char, size);
+                             int n = readlink(buffer, l, size - 1);
+                             if (n < 0) {
+                                if (errno != EINVAL)
+                                   LOG_ERROR_STR(*buffer);
+                                }
+                             else if (n < size) {
+                                l[n] = 0;
+                                dsyslog("removing %s", l);
+                                if (remove(l) < 0)
+                                   LOG_ERROR_STR(l);
+                                }
+                             else
+                                esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
+                             free(l);
+                             }
                           }
-                       else if (n < size) {
-                          l[n] = 0;
-                          dsyslog("removing %s", l);
-                          if (remove(l) < 0)
-                             LOG_ERROR_STR(l);
+                       else if (errno != ENOENT) {
+                          LOG_ERROR_STR(FileName);
+                          return false;
                           }
-                       else
-                          esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
-                       free(l);
                        }
                     dsyslog("removing %s", *buffer);
                     if (remove(buffer) < 0)

From 5619c0602bc623adeddf3385ada8c742aaea9762 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 13 Mar 2011 12:46:00 +0100
Subject: [PATCH 203/307] =?UTF-8?q?Version=201.7.17=20-=20Updated=20the=20?=
 =?UTF-8?q?Estonian=20OSD=20texts=20(thanks=20to=20Arthur=20Konovalov).=20?=
 =?UTF-8?q?-=20Fixed=20following=20symbolic=20links=20in=20RemoveFileOrDir?=
 =?UTF-8?q?()=20(cont'd)=20(thanks=20to=20=20=20Steffen=20Barszus).=20-=20?=
 =?UTF-8?q?Changed=20the=20description=20of=20cDevice::GetSTC()=20to=20mak?=
 =?UTF-8?q?e=20it=20mandatory=20for=20devices=20=20=20that=20can=20replay.?=
 =?UTF-8?q?=20-=20Removed=20the=20check=20for=20positive=20STC=20values=20?=
 =?UTF-8?q?from=20cDvbSubtitleConverter::Action().=20-=20Added=20cString::?=
 =?UTF-8?q?operator=3D(const=20char=20*String)=20(suggested=20by=20Antti?=
 =?UTF-8?q?=20Sepp=C3=A4l=C3=A4).=20-=20Some=20spelling=20fixes=20(thanks?=
 =?UTF-8?q?=20to=20Ville=20Skytt=C3=A4).=20-=20Passing=20package=20name=20?=
 =?UTF-8?q?and=20version=20to=20xgettext=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4).=20-=20Made=20'dist'=20target=20dependent=20on=20up=20t?=
 =?UTF-8?q?o=20date=20*.po=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Ad?=
 =?UTF-8?q?ded=20Language=20and=20fixed=20Language-Team=20header=20of=20*.?=
 =?UTF-8?q?po=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Updated=20the?=
 =?UTF-8?q?=20Lithuanian=20OSD=20texts=20(thanks=20to=20Valdemaras=20Pipir?=
 =?UTF-8?q?as).=20-=20Fixed=20detecting=20frames=20on=20channels=20that=20?=
 =?UTF-8?q?broadcast=20with=2050=20or=2060=20fps.=20=20=20This=20avoids=20?=
 =?UTF-8?q?artifacts=20during=20fast=20forward/rewind=20when=20replaying?=
 =?UTF-8?q?=20recordings=20from=20such=20=20=20channels.=20To=20fix=20the?=
 =?UTF-8?q?=20index=20of=20existing=20recordings=20from=20such=20channels,?=
 =?UTF-8?q?=20just=20delete=20the=20=20=20'index'=20file=20of=20the=20reco?=
 =?UTF-8?q?rding=20and=20VDR=20will=20generate=20a=20new=20one=20the=20nex?=
 =?UTF-8?q?t=20time=20you=20play=20it.=20=20=20You=20should=20also=20chang?=
 =?UTF-8?q?e=20the=20line=20"F=2025"=20to=20"F=2050"=20in=20the=20'info'?=
 =?UTF-8?q?=20file=20of=20that=20recording.=20-=20Added=20support=20for=20?=
 =?UTF-8?q?"registration=20descriptor"=20to=20'libsi'=20and=20using=20it?=
 =?UTF-8?q?=20in=20pat.c=20(thanks=20=20=20to=20Rolf=20Ahrenberg).=20-=20F?=
 =?UTF-8?q?ixed=20unjustified=20log=20entries=20about=20changed=20channel?=
 =?UTF-8?q?=20pids=20(reported=20by=20Derek=20Kelly).=20-=20Added=20an=20i?=
 =?UTF-8?q?nclude=20of=20VDR's=20'Make.global'=20to=20libsi's=20Makefile?=
 =?UTF-8?q?=20(thanks=20to=20Rolf=20=20=20Ahrenberg).=20-=20Removed=20disp?=
 =?UTF-8?q?laying=20the=20"contents"=20information=20from=20the=20"Classic?=
 =?UTF-8?q?=20VDR"=20and=20=20=20"ST:TNG=20Panels"=20skins,=20because=20it?=
 =?UTF-8?q?=20is=20often=20wrong=20and=20nothing=20but=20irritating.=20-?=
 =?UTF-8?q?=20Added=20typecasts=20to=20avoid=20gcc=204.5=20warnings=20in?=
 =?UTF-8?q?=20switch=20statements=20on=20eKeys=20=20=20variables=20where?=
 =?UTF-8?q?=20additional=20'k=5F...'=20flags=20are=20used.=20-=20Fixed=20i?=
 =?UTF-8?q?nclusion=20of=20<stdarg.h>=20(thanks=20to=20Henning=20Heinold).?=
 =?UTF-8?q?=20-=20Changed=20"frame=20duration"=20to=20"frame=20rate"=20in?=
 =?UTF-8?q?=20vdr.5=20(reported=20by=20Tobias=20Grimm).=20-=20Removing=20a?=
 =?UTF-8?q?=20cRemote=20from=20the=20Remotes=20list=20in=20case=20its=20in?=
 =?UTF-8?q?itialization=20failed=20(thanks=20=20=20to=20Dominik=20Strasser?=
 =?UTF-8?q?).=20-=20Added=20LDFLAGS=20to=20the=20linker=20calls=20in=20the?=
 =?UTF-8?q?=20Makefiles=20(thanks=20to=20Joerg=20Bornkessel=20and=20=20=20?=
 =?UTF-8?q?Paul=20Menzel).=20-=20Now=20updating=20the=20'frames=20per=20se?=
 =?UTF-8?q?cond'=20data=20in=20the=20list=20of=20recordings=20when=20a=20n?=
 =?UTF-8?q?ew=20=20=20recording=20is=20started=20that=20has=20a=20frame=20?=
 =?UTF-8?q?rate=20other=20than=20the=20default.=20-=20The=20include=20path?=
 =?UTF-8?q?=20to=20the=20freetype2=20header=20files=20is=20now=20retrieved?=
 =?UTF-8?q?=20via=20a=20call=20to=20=20=20'pkg-config=20--cflags=20freetyp?=
 =?UTF-8?q?e2'=20(suggested=20by=20Andreas=20Oberritter).=20-=20The=20OSD?=
 =?UTF-8?q?=20now=20has=20full=20TrueColor=20support.=20There=20can=20be?=
 =?UTF-8?q?=20several=20"pixmaps"=20that=20can=20=20=20be=20overlayed=20wi?=
 =?UTF-8?q?th=20alpha=20blending.=20All=20existing=20skins=20should=20work?=
 =?UTF-8?q?=20out=20of=20the=20box=20=20=20with=20the=20TrueColor=20OSD=20?=
 =?UTF-8?q?-=20the=20only=20exception=20being=20cOsd::GetBitmap().=20Since?=
 =?UTF-8?q?=20the=20=20=20TrueColor=20OSD=20doesn't=20use=20bitmaps,=20thi?=
 =?UTF-8?q?s=20function=20will=20return=20a=20dummy=20bitmap,=20which=20?=
 =?UTF-8?q?=20=20may=20not=20be=20what=20the=20plugin=20expects.=20As=20lo?=
 =?UTF-8?q?ng=20as=20this=20bitmap=20is=20only=20used=20for=20setting=20?=
 =?UTF-8?q?=20=20the=20palette,=20there=20is=20no=20problem.=20However,=20?=
 =?UTF-8?q?any=20other=20operations=20on=20this=20bitmap=20will=20=20=20ha?=
 =?UTF-8?q?ve=20no=20effect.=20See=20the=20description=20of=20the=20cPixma?=
 =?UTF-8?q?p=20functions=20in=20osd.h=20for=20details=20=20=20about=20the?=
 =?UTF-8?q?=20new=20functionalities.=20=20=20The=20"ST:TNG=20Panels"=20ski?=
 =?UTF-8?q?n=20has=20been=20enhanced=20to=20automatically=20use=20the=20Tr?=
 =?UTF-8?q?ueColor=20OSD=20=20=20if=20available.=20=20=20The=20"osddemo"?=
 =?UTF-8?q?=20plugin=20has=20been=20extended=20to=20show=20some=20of=20the?=
 =?UTF-8?q?=20possibilities=20of=20the=20=20=20TrueColor=20OSD=20if=20it?=
 =?UTF-8?q?=20is=20run=20on=20a=20system=20that=20actually=20provides=20Tr?=
 =?UTF-8?q?ueColor=20support.=20=20=20Thanks=20to=20Reinhard=20Nissl=20for?=
 =?UTF-8?q?=20some=20valuable=20input,=20help=20with=20debugging,=20and=20?=
 =?UTF-8?q?an=20=20=20implementation=20of=20the=20AlphaBlend()=20function.?=
 =?UTF-8?q?=20-=20Updated=20the=20Slovakian=20language=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Milan=20Hrala).=20-=20Added=20Serbian=20language=20text?=
 =?UTF-8?q?s=20(thanks=20to=20Milan=20Cvijanovic).=20-=20Fixed=20reallocat?=
 =?UTF-8?q?ing=20memory=20in=20the=20"pictures"=20plugin=20(reported=20by?=
 =?UTF-8?q?=20Paul=20Menzel,=20with=20=20=20input=20from=20Oliver=20Endris?=
 =?UTF-8?q?s).=20-=20Fixed=20reallocating=20memory=20in=20cTsToPes::PutTs(?=
 =?UTF-8?q?)=20(suggested=20by=20Oliver=20Endriss).=20-=20Now=20checking?=
 =?UTF-8?q?=20the=20result=20of=20all=20realloc()=20calls.=20-=20Fixed=20s?=
 =?UTF-8?q?etting=20up=20the=20'Recordings'=20menu=20in=20case=20there=20a?=
 =?UTF-8?q?re=20several=20recordings=20=20=20with=20exactly=20the=20same?=
 =?UTF-8?q?=20name=20(reported=20by=20Marcus=20Hilbrich).=20-=20Setting=20?=
 =?UTF-8?q?the=20audio=20type=20of=20language=20descriptors=20to=200x00=20?=
 =?UTF-8?q?in=20the=20PAT/PMT=20generator=20=20=20(thanks=20to=20Anssi=20H?=
 =?UTF-8?q?annula).=20-=20Changed=20the=20compiler=20optimization=20flag?=
 =?UTF-8?q?=20to=20-O3,=20which=20gives=20quite=20a=20performance=20=20=20?=
 =?UTF-8?q?boost=20in=20the=20AlphaBlend()=20function.=20-=20While=20repla?=
 =?UTF-8?q?ying,=20the=20editing=20marks=20are=20now=20updated=20every=201?=
 =?UTF-8?q?0=20seconds=20(based=20on=20a=20=20=20patch=20from=20Manuel=20R?=
 =?UTF-8?q?eimer).=20-=20Now=20reducing=20the=20thread=20and=20I/O=20prior?=
 =?UTF-8?q?ity=20cCuttingThread::Action()=20to=20make=20the=20=20=20foregr?=
 =?UTF-8?q?ound=20process=20more=20responsive=20(suggested=20by=20Frank=20?=
 =?UTF-8?q?Neumann).=20-=20Removed=20checking=20for=20minimum=20line=20len?=
 =?UTF-8?q?gth=20of=2021=20characters=20in=20the=20LIRC=20receiver=20code?=
 =?UTF-8?q?=20=20=20(reported=20by=20Gerald=20Dachs).=20-=20Updated=20the?=
 =?UTF-8?q?=20Romanian=20OSD=20texts=20(thanks=20to=20Lucian=20Muresan).?=
 =?UTF-8?q?=20-=20Now=20storing=20the=20original=20display=20size=20when?=
 =?UTF-8?q?=20handling=20DVB=20subtitles=20(thanks=20to=20=20=20Reinhard?=
 =?UTF-8?q?=20Nissl).=20-=20The=20original=20display=20size=20of=20subtitl?=
 =?UTF-8?q?es=20is=20now=20used=20to=20scale=20them=20properly=20when=20?=
 =?UTF-8?q?=20=20displaying=20them=20on=20an=20HD=20OSD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                        |   59 +-
 HISTORY                             |   90 +-
 Makefile                            |   12 +-
 PLUGINS/src/dvbsddevice/Makefile    |   10 +-
 PLUGINS/src/hello/Makefile          |   10 +-
 PLUGINS/src/hello/po/ca_ES.po       |    5 +-
 PLUGINS/src/hello/po/cs_CZ.po       |    5 +-
 PLUGINS/src/hello/po/da_DK.po       |    5 +-
 PLUGINS/src/hello/po/de_DE.po       |    5 +-
 PLUGINS/src/hello/po/el_GR.po       |    5 +-
 PLUGINS/src/hello/po/es_ES.po       |    5 +-
 PLUGINS/src/hello/po/et_EE.po       |    5 +-
 PLUGINS/src/hello/po/fi_FI.po       |    5 +-
 PLUGINS/src/hello/po/fr_FR.po       |    5 +-
 PLUGINS/src/hello/po/hr_HR.po       |    5 +-
 PLUGINS/src/hello/po/hu_HU.po       |    5 +-
 PLUGINS/src/hello/po/it_IT.po       |    5 +-
 PLUGINS/src/hello/po/lt_LT.po       |    5 +-
 PLUGINS/src/hello/po/nl_NL.po       |    5 +-
 PLUGINS/src/hello/po/nn_NO.po       |    5 +-
 PLUGINS/src/hello/po/pl_PL.po       |    5 +-
 PLUGINS/src/hello/po/pt_PT.po       |    5 +-
 PLUGINS/src/hello/po/ro_RO.po       |    5 +-
 PLUGINS/src/hello/po/ru_RU.po       |    5 +-
 PLUGINS/src/hello/po/sk_SK.po       |    6 +-
 PLUGINS/src/hello/po/sl_SI.po       |    5 +-
 PLUGINS/src/hello/po/sv_SE.po       |    5 +-
 PLUGINS/src/hello/po/tr_TR.po       |    5 +-
 PLUGINS/src/hello/po/zh_CN.po       |    6 +-
 PLUGINS/src/osddemo/HISTORY         |    4 +
 PLUGINS/src/osddemo/Makefile        |    6 +-
 PLUGINS/src/osddemo/README          |    7 +
 PLUGINS/src/osddemo/osddemo.c       |  369 +++++++-
 PLUGINS/src/pictures/HISTORY        |    4 +
 PLUGINS/src/pictures/Makefile       |   10 +-
 PLUGINS/src/pictures/pictures.c     |    4 +-
 PLUGINS/src/pictures/player.c       |   13 +-
 PLUGINS/src/pictures/po/de_DE.po    |    5 +-
 PLUGINS/src/pictures/po/fi_FI.po    |    5 +-
 PLUGINS/src/pictures/po/fr_FR.po    |    5 +-
 PLUGINS/src/pictures/po/it_IT.po    |    5 +-
 PLUGINS/src/pictures/po/lt_LT.po    |    5 +-
 PLUGINS/src/pictures/po/ru_RU.po    |    5 +-
 PLUGINS/src/pictures/po/sk_SK.po    |    6 +-
 PLUGINS/src/servicedemo/Makefile    |    8 +-
 PLUGINS/src/skincurses/Makefile     |   10 +-
 PLUGINS/src/skincurses/po/de_DE.po  |    5 +-
 PLUGINS/src/skincurses/po/fi_FI.po  |    5 +-
 PLUGINS/src/skincurses/po/it_IT.po  |    5 +-
 PLUGINS/src/skincurses/po/lt_LT.po  |    5 +-
 PLUGINS/src/skincurses/po/ru_RU.po  |    5 +-
 PLUGINS/src/skincurses/po/sk_SK.po  |    6 +-
 PLUGINS/src/skincurses/skincurses.c |    3 +-
 PLUGINS/src/status/Makefile         |    6 +-
 PLUGINS/src/svdrpdemo/Makefile      |    6 +-
 channels.c                          |   10 +-
 config.h                            |   10 +-
 cutter.c                            |    4 +-
 device.c                            |   30 +-
 device.h                            |    6 +-
 dvbsubtitle.c                       |  120 ++-
 dvbsubtitle.h                       |   12 +-
 epg.c                               |   27 +-
 epg.h                               |    4 +-
 font.c                              |   51 +-
 font.h                              |    8 +-
 i18n.c                              |    3 +-
 libsi/Makefile                      |    3 +-
 libsi/descriptor.c                  |   13 +-
 libsi/descriptor.h                  |   12 +-
 libsi/headers.h                     |   14 +-
 libsi/si.c                          |    6 +-
 libsi/util.h                        |    3 +-
 lirc.c                              |    5 +-
 menu.c                              |   34 +-
 menuitems.c                         |    6 +-
 newplugin                           |   10 +-
 osd.c                               | 1120 +++++++++++++++++++++-
 osd.h                               |  558 ++++++++++-
 osdbase.c                           |    4 +-
 pat.c                               |   64 +-
 po/ar.po                            |    3 +-
 po/ca_ES.po                         |    5 +-
 po/cs_CZ.po                         |    5 +-
 po/da_DK.po                         |    5 +-
 po/de_DE.po                         |    5 +-
 po/el_GR.po                         |    5 +-
 po/es_ES.po                         |    5 +-
 po/et_EE.po                         |    7 +-
 po/fi_FI.po                         |    5 +-
 po/fr_FR.po                         |    5 +-
 po/hr_HR.po                         |    5 +-
 po/hu_HU.po                         |    5 +-
 po/it_IT.po                         |    5 +-
 po/lt_LT.po                         |   31 +-
 po/mk_MK.po                         |    3 +-
 po/nl_NL.po                         |    5 +-
 po/nn_NO.po                         |    5 +-
 po/pl_PL.po                         |    5 +-
 po/pt_PT.po                         |    5 +-
 po/ro_RO.po                         |   19 +-
 po/ru_RU.po                         |    5 +-
 po/sk_SK.po                         |  264 +++---
 po/sl_SI.po                         |    5 +-
 po/sr_SR.po                         | 1351 +++++++++++++++++++++++++++
 po/sv_SE.po                         |    5 +-
 po/tr_TR.po                         |    5 +-
 po/uk_UA.po                         |    5 +-
 po/zh_CN.po                         |    5 +-
 receiver.c                          |    3 +-
 recorder.c                          |   16 +-
 recorder.h                          |    4 +-
 recording.c                         |  109 ++-
 recording.h                         |    8 +-
 remote.c                            |    3 +-
 remux.c                             |   59 +-
 remux.h                             |   10 +-
 skinclassic.c                       |   18 +-
 skinsttng.c                         |  137 +--
 svdrp.c                             |   14 +-
 themes.c                            |   32 +-
 tools.c                             |   71 +-
 tools.h                             |    8 +-
 vdr.5                               |    6 +-
 vdr.c                               |    6 +-
 125 files changed, 4534 insertions(+), 710 deletions(-)
 create mode 100644 po/sr_SR.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0d9a16182..74090c215 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -673,10 +673,11 @@ Oliver Endriss <o.endriss@gmx.de>
  for adding missing AUDIO_PAUSE/AUDIO_CONTINUE calls to cDvbDevice
  for reporting that the video type is unnecessarily written into channels.conf if
  VPID is 0
- for reporting chirping sound disturbences at editing points in TS recordings
+ for reporting chirping sound disturbances at editing points in TS recordings
  for reporting broken index generation in TS recordings after a buffer overflow
  for fixing the way the OSD size is determined on full featured DVB cards
  for his input on calculating the Aspect factor in GetOsdSize()
+ for suggesting a better way of handling calls to realloc()
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -740,6 +741,7 @@ Steffen Barszus <st_barszus@gmx.de>
  or Makefile.config as defaults
  for helping to debug a crash when using the --terminal option without having access
  to the given terminal
+ for fixing following symbolic links in RemoveFileOrDir()
 
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
@@ -1021,7 +1023,7 @@ Matthias Raus <matthias-raus@web.de>
  for reporting a problem with starting the editing process if no marks have been set
 
 Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and Jordi Vil� <jvila@tinet.org>
- for translating OSD texts to the Catalanian language
+ for translating OSD texts to the Catalan language
 
 Lars Bl�ser <LBlaeser@hofheim.de>
  for reporting a bug in EPG bugfix statistics which made log entries for undefined
@@ -1099,6 +1101,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for implementing handling of HD resolution subtitles according to v1.3.1 of
  ETSI EN 300 743, chapter 7.2.1
  for fixing the array size of Atypes in cPatFilter::Process()
+ for adding support for "registration descriptor" to 'libsi' and using it in pat.c
+ for adding an include of VDR's 'Make.global' to libsi's Makefile
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1247,7 +1251,7 @@ Reinhard Nissl <rnissl@gmx.de>
  to 'double'
  for suggesting to use different names for the Aspect parameter in GetVideoSize()
  and GetOsdSize()
- for reporting a problem with calculating menu colum widths in case the font has a
+ for reporting a problem with calculating menu column widths in case the font has a
  size other than the default size
  for reporting a bug in storing the current OSD size in case the
  device has changed it in its setup menu
@@ -1257,6 +1261,9 @@ Reinhard Nissl <rnissl@gmx.de>
  for implementing cDeviceHook
  for implementing cDevice::GetCurrentlyTunedTransponder()
  for fixing DDS detection for HD resolution subtitles
+ for some valuable input during development of the TrueColor OSD, help with
+ debugging, and an implementation of the AlphaBlend() function.
+ for storing the original display size when handling DVB subtitles
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1831,7 +1838,7 @@ Luca Olivetti <luca@ventoso.org>
  for suggesting to implement a timeout for remote controls that don't deliver
  "repeat" keypresses very fast
  for reporting a broken entry 'A111.1W' in sources.conf
- for translating OSD texts to the Spanish and Catalanian language
+ for translating OSD texts to the Spanish and Catalan language
 
 Mikko Salo <mikko.salo@ppe.inet.fi>
  for suggesting to make the setup option "DVB/Video display format" available only
@@ -1876,6 +1883,9 @@ Ville Skytt
  for adding missing #include <limits.h> to epg.c and menuitems.h
  for fixing various spelling errors and improving PLUGINS.html
  for adding some missing 'const' keywords to avoid compilation errors with gcc 4.4
+ for adding passing package name and version to xgettext
+ for making 'dist' target dependent on up to date *.po
+ for adding Language and fixing Language-Team header of *.po
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -1966,9 +1976,11 @@ David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
  own inline functions to avoid problems on platforms that don't provide these
 
-Marcus Hilbrich <s4440288@mail.inf.tu-dresden.de>
+Marcus Hilbrich <hilbrich@gmx.de>
  for a bug report that lead to fixing the EPG scan, so that it doesn't use the
  primary device if that is currently in Transfer-Mode from itself
+ for a bug report that led to fixing setting up the 'Recordings' menu in case there
+ are several recordings with exactly the same name
 
 Hardy Flor <HFlor@web.de>
  for a patch that was used as a base to implement SVDRP commands for plugins
@@ -2230,8 +2242,9 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for making the non-breaking space symbol be rendered as a blank
  for fixing a signed character used as index in cBase64Encoder::NextLine()
  for fixing formatting the name section in the VDR man pages
- for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h
+ for reporting unneeded include files <linux/dvb/dmx.h> and <time.h> in remux.h
  for a patch that added a workaround for the broken linux-dvb driver header files
+ for reporting a faulty "frame duration" instead of "frame rate" in vdr.5
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2286,6 +2299,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
  from within its source directory
  for fixing stopping subtitle display when switching the primary device
  for fixing plugin arguments corruption with glibc 2.11 on x86_64
+ for setting the audio type of language descriptors to 0x00 in the PAT/PMT generator
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2538,6 +2552,7 @@ Derek Kelly (user.vdr@gmail.com)
  for updating sources.conf
  for reporting a problem where the frame rate was not detected correctly
  for testing the implementation of FE_CAN_TURBO_FEC
+ for reporting unjustified log entries about changed channel pids
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2563,6 +2578,8 @@ Manuel Reimer <Manuel.Reimer@gmx.de>
  for fixing saving terminal settings when running in background
  for making the SVDRP port open only for the local host if svdrphosts.conf
  contains only the address of the local host
+ for a patch that was used as a base for making editing marks be updated every 10
+ seconds during replay
 
 Rene van den Braken <rene@vandenbraken.name>
  for reporting a bug in writing the PCR pid into the PMT in
@@ -2602,7 +2619,9 @@ Eric Valette <eric.valette@free.fr>
  for adding handling of EnhancedAC3DescriptorTag
 
 Paul Menzel <paulepanter@users.sourceforge.net>
- for making include paths be added instead of overwriting INCLUDES in the Makefile
+ for making include paths not be overwritten in the Makefile
+ for adding LDFLAGS to the linker calls in the Makefiles
+ for reporting a possible memory leak in the "pictures" plugin
 
 Radek Stastny <dedkus@gmail.com>
  for translating OSD texts to the Czech language
@@ -2625,3 +2644,29 @@ Cristiano A. Silva <arquithek@gmail.com>
 Osama Alrawab <alrawab@hotmail.com>
  for adding support for languages that are written right-to-left
  for translating OSD texts to the Arabian language
+
+Antti Sepp�l� <a.seppala@gmail.com>
+ for suggesting to add cString::operator=(const char *String)
+
+Henning Heinold <heinold@inf.fu-berlin.de>
+ for fixing inclusion of <stdarg.h>
+
+Dominik Strasser <dominik@die-strassers.de>
+ for making a cRemote be removed from the Remotes list in case its initialization failed
+
+Joerg Bornkessel <hd_brummy@gentoo.org>
+ for adding LDFLAGS to the linker calls in the Makefiles
+
+Andreas Oberritter <obi@opendreambox.org>
+ for suggesting to retrieve the include path to the freetype2 header files
+ via a call to 'pkg-config --cflags freetype2'
+
+Milan Cvijanovic <elcom_cvijo@hotmail.com>
+ for translating OSD texts to the Serbian language
+
+Frank Neumann <frank.neumann@hp.com>
+ for suggesting to reduce the thread and I/O priority cCuttingThread::Action()
+
+Gerald Dachs <vdr@dachsweb.de>
+ for reporting a problem with checking for minimum line length of 21 characters in
+ the LIRC receiver code
diff --git a/HISTORY b/HISTORY
index d170de5e4..f73f5cf2e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2154,7 +2154,7 @@ Video Disk Recorder Revision History
   called before trying to learn the keys (problem reported by Oliver Endriss).
 - No longer starting the editing process if no marks have been set (thanks to
   Matthias Raus for reporting this one).
-- Added Catalanian language texts (thanks to Marc Rovira Vall and Ramon Roca).
+- Added Catalan language texts (thanks to Marc Rovira Vall and Ramon Roca).
   Plugin authors may want to add the new entries to their I18N texts and contact
   the translators to have their texts translated. Note that there are now 16
   different OSD languages, so please make sure you have 16 versions for each of
@@ -2219,7 +2219,7 @@ Video Disk Recorder Revision History
 - Completed the Italian OSD texts (thanks to Antonio Ospite).
 - Fixed breaking off replay in case the user hits "Play" or "Pause" too soon after
   going into "Pause live video" mode (thanks to Karim Afifi for reporting this one).
-- Some corrections to the Catalanian OSD texts (thanks to Jordi Vil�).
+- Some corrections to the Catalan OSD texts (thanks to Jordi Vil�).
 - Single event timers are now deleted if the recording they are doing is
   deleted before the timer ends.
 - Fixed an uninitialized variable in cDisplayChannel (thanks to Stefan Huelswitt).
@@ -5706,7 +5706,7 @@ Video Disk Recorder Revision History
   ISO-8859-9.
 - Fixed a signed character used as index in cBase64Encoder::NextLine() (thanks
   to Tobias Grimm).
-- Updated the Spanish and Catalanian OSD texts (thanks to Luca Olivetti).
+- Updated the Spanish and Catalan OSD texts (thanks to Luca Olivetti).
 - Fixed automatically selecting the preferred subtitle language (based on a patch
   from Rolf Ahrenberg).
 - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
@@ -5811,7 +5811,7 @@ Video Disk Recorder Revision History
 - Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
 - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried K�hler).
 - Errors in config files no longer keep VDR from starting.
-- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+- Removed unneeded include files <linux/dvb/dmx.h> and <time.h> from remux.h
   (reported by Tobias Grimm).
 
 2008-09-06: Version 1.6.0-2
@@ -5829,7 +5829,7 @@ Video Disk Recorder Revision History
   to Udo Richter).
 - Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
 - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried K�hler).
-- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+- Removed unneeded include files <linux/dvb/dmx.h> and <time.h> from remux.h
   (reported by Tobias Grimm).
 
 2008-12-14: Version 1.7.2
@@ -6052,7 +6052,7 @@ Video Disk Recorder Revision History
 - Any TS packets in the first "frame" after a cut in an edited recording that don't
   belong to a payload unit that started in that frame now get their TEI flag set,
   so that a decoder will ignore them together with any PES data collected for that
-  PID so far (thanks to Oliver Endriss for reporting chirping sound disturbences at
+  PID so far (thanks to Oliver Endriss for reporting chirping sound disturbances at
   editing points in TS recordings).
 - cDvbPlayer::Empty() subtracts 1 from readIndex, because Action() will first
   increment it.
@@ -6426,7 +6426,7 @@ Video Disk Recorder Revision History
   there is less than MIN_TS_PACKETS_FOR_FRAME_DETECTOR left (reported by Derek Kelly).
 - Added a note about not deleting cDeviceHook objects to device.h.
 - Added user defined key kUser0 (suggested by Ulf Kiener).
-- Include paths are now added instead of overwriting INCLUDES in the Makefile (thanks
+- Include paths are no longer overwritten in the Makefile (thanks
   to Paul Menzel).
 - The various modulation types are now taken into account when selecting a device for
   a recording or live viewing, so that devices that provide more capabilities are
@@ -6480,3 +6480,79 @@ Video Disk Recorder Revision History
 - Added support for languages that are written right-to-left (based on a patch
   from Osama Alrawab). See INSTALL for information on how to turn this on.
 - Added Arabian language texts (thanks to Osama Alrawab).
+
+2011-03-12: Version 1.7.17
+
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to
+  Steffen Barszus).
+- Changed the description of cDevice::GetSTC() to make it mandatory for devices
+  that can replay.
+- Removed the check for positive STC values from cDvbSubtitleConverter::Action().
+- Added cString::operator=(const char *String) (suggested by Antti Sepp�l�).
+- Some spelling fixes (thanks to Ville Skytt�).
+- Passing package name and version to xgettext (thanks to Ville Skytt�).
+- Made 'dist' target dependent on up to date *.po (thanks to Ville Skytt�).
+- Added Language and fixed Language-Team header of *.po (thanks to Ville Skytt�).
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- Fixed detecting frames on channels that broadcast with 50 or 60 fps.
+  This avoids artifacts during fast forward/rewind when replaying recordings from such
+  channels. To fix the index of existing recordings from such channels, just delete the
+  'index' file of the recording and VDR will generate a new one the next time you play it.
+  You should also change the line "F 25" to "F 50" in the 'info' file of that recording.
+- Added support for "registration descriptor" to 'libsi' and using it in pat.c (thanks
+  to Rolf Ahrenberg).
+- Fixed unjustified log entries about changed channel pids (reported by Derek Kelly).
+- Added an include of VDR's 'Make.global' to libsi's Makefile (thanks to Rolf
+  Ahrenberg).
+- Removed displaying the "contents" information from the "Classic VDR" and
+  "ST:TNG Panels" skins, because it is often wrong and nothing but irritating.
+- Added typecasts to avoid gcc 4.5 warnings in switch statements on eKeys
+  variables where additional 'k_...' flags are used.
+- Fixed inclusion of <stdarg.h> (thanks to Henning Heinold).
+- Changed "frame duration" to "frame rate" in vdr.5 (reported by Tobias Grimm).
+- Removing a cRemote from the Remotes list in case its initialization failed (thanks
+  to Dominik Strasser).
+- Added LDFLAGS to the linker calls in the Makefiles (thanks to Joerg Bornkessel and
+  Paul Menzel).
+- Now updating the 'frames per second' data in the list of recordings when a new
+  recording is started that has a frame rate other than the default.
+- The include path to the freetype2 header files is now retrieved via a call to
+  'pkg-config --cflags freetype2' (suggested by Andreas Oberritter).
+- The OSD now has full TrueColor support. There can be several "pixmaps" that can
+  be overlayed with alpha blending. All existing skins should work out of the box
+  with the TrueColor OSD - the only exception being cOsd::GetBitmap(). Since the
+  TrueColor OSD doesn't use bitmaps, this function will return a dummy bitmap, which
+  may not be what the plugin expects. As long as this bitmap is only used for setting
+  the palette, there is no problem. However, any other operations on this bitmap will
+  have no effect. See the description of the cPixmap functions in osd.h for details
+  about the new functionalities.
+  The "ST:TNG Panels" skin has been enhanced to automatically use the TrueColor OSD
+  if available.
+  The "osddemo" plugin has been extended to show some of the possibilities of the
+  TrueColor OSD if it is run on a system that actually provides TrueColor support.
+  Thanks to Reinhard Nissl for some valuable input, help with debugging, and an
+  implementation of the AlphaBlend() function.
+- Updated the Slovakian language texts (thanks to Milan Hrala).
+- Added Serbian language texts (thanks to Milan Cvijanovic).
+- Fixed reallocating memory in the "pictures" plugin (reported by Paul Menzel, with
+  input from Oliver Endriss).
+- Fixed reallocating memory in cTsToPes::PutTs() (suggested by Oliver Endriss).
+- Now checking the result of all realloc() calls.
+- Fixed setting up the 'Recordings' menu in case there are several recordings
+  with exactly the same name (reported by Marcus Hilbrich).
+- Setting the audio type of language descriptors to 0x00 in the PAT/PMT generator
+  (thanks to Anssi Hannula).
+- Changed the compiler optimization flag to -O3, which gives quite a performance
+  boost in the AlphaBlend() function.
+- While replaying, the editing marks are now updated every 10 seconds (based on a
+  patch from Manuel Reimer).
+- Now reducing the thread and I/O priority cCuttingThread::Action() to make the
+  foreground process more responsive (suggested by Frank Neumann).
+- Removed checking for minimum line length of 21 characters in the LIRC receiver code
+  (reported by Gerald Dachs).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Now storing the original display size when handling DVB subtitles (thanks to
+  Reinhard Nissl).
+- The original display size of subtitles is now used to scale them properly when
+  displaying them on an HD OSD.
diff --git a/Makefile b/Makefile
index 26f54ea1d..e84849bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.10 2010/09/17 13:28:50 kls Exp $
+# $Id: Makefile 2.14 2011/02/27 09:59:11 kls Exp $
 
 .DELETE_ON_ERROR:
 
 CC       ?= gcc
-CFLAGS   ?= -g -O2 -Wall
+CFLAGS   ?= -g -O3 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 LSIDIR   = ./libsi
 DESTDIR ?=
@@ -21,7 +21,7 @@ MANDIR   = $(PREFIX)/share/man
 BINDIR   = $(PREFIX)/bin
 LOCDIR   = ./locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-INCLUDES ?= -I/usr/include/freetype2
+INCLUDES ?= $(shell pkg-config --cflags freetype2)
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
@@ -95,7 +95,7 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(SILIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
 
 # The libsi library:
 
@@ -114,7 +114,7 @@ I18Npot   = $(PODIR)/vdr.pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 32d0f508d..aa89feb62 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 1.6 2011/02/27 10:04:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@@ -99,10 +99,10 @@ i18n: $(I18Nmsgs) $(I18Npot)
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index a5703f63c..e9f06038b 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.2 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.6 2011/02/27 10:04:58 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@@ -99,10 +99,10 @@ i18n: $(I18Nmsgs)
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index 008b97eda..f126a54f7 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -9,13 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
-"Language-Team: Catalanian\n"
+"Language-Team: Catalan <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index c4fa57135..f15365253 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
-"Language-Team: Czech\n"
+"Language-Team: Czech <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 
 msgid "A friendly greeting"
 msgstr "P��telsk� pozdrav"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index f05412a1a..deef349f9 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
-"Language-Team: Danish\n"
+"Language-Team: Danish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index 43d6f2b77..f46e6f5ce 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
-"Language-Team: German\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 
 msgid "A friendly greeting"
 msgstr "Ein freundlicher Gru�"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index adcb3cd91..6ee9a3dff 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
-"Language-Team: Greek\n"
+"Language-Team: Greek <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index 33af9695f..e1997a8de 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
-"Language-Team: Spanish\n"
+"Language-Team: Spanish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index f83d03c0f..d762ebc44 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
-"Language-Team: Estonian\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 36677e0c0..1be796c14 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: Finnish\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 
 msgid "A friendly greeting"
 msgstr "Ystävällisin terveisin"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index 6adcce522..db7003784 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
-"Language-Team: French\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index 752d1eddd..6ebf6e81d 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-03-17 19:52+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
-"Language-Team: Croatian\n"
+"Language-Team: Croatian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 
 msgid "A friendly greeting"
 msgstr "Prijateljska dobrodo�lica"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index 307913235..66dbc30a1 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
-"Language-Team: Hungarian\n"
+"Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index 0f2216089..7ff552f22 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 
 msgid "A friendly greeting"
 msgstr "Un saluto cordiale"
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
index 26e0ff48e..d1ddf8173 100644
--- a/PLUGINS/src/hello/po/lt_LT.po
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2009-12-08 12:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
-"Language-Team: Lietuviai\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 
 msgid "A friendly greeting"
 msgstr "Draugiškas labas"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 5ea7b6a71..b749cc39a 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -9,13 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
-"Language-Team: Dutch\n"
+"Language-Team: Dutch <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index 400c864f5..b5f508b58 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
-"Language-Team: Norwegian\n"
+"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 07bff4d32..dfa80de45 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
-"Language-Team: Polish\n"
+"Language-Team: Polish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index 3d7a09fd5..429377cf9 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
-"Language-Team: Portuguese\n"
+"Language-Team: Portuguese <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index 7562690dd..d964223e8 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
-"Language-Team: Romanian\n"
+"Language-Team: Romanian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index 5544ff826..59d8ad165 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
-"Language-Team: Russian\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 
 msgid "A friendly greeting"
 msgstr "��������� �����������"
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
index a878a95bd..f7347fd3f 100644
--- a/PLUGINS/src/hello/po/sk_SK.po
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2009-09-30 09:48+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
-"Language-Team: Slovak\n"
+"Language-Team: Slovak <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 
 msgid "A friendly greeting"
 msgstr "Priate�sk� pozdrav"
@@ -32,4 +33,3 @@ msgstr "Ahojte v
 
 msgid "Hello world!"
 msgstr "Ahoj svet!"
-
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index cc489a49a..20f001907 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
-"Language-Team: Slovenian\n"
+"Language-Team: Slovenian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index a390fcfb9..c51e5594b 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
-"Language-Team: Swedish\n"
+"Language-Team: Swedish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index 34f627fa0..269dbd990 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-05-12 22:34:4800\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
-"Language-Team: Turkish\n"
+"Language-Team: Turkish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 
 msgid "A friendly greeting"
 msgstr "Dost�a selam"
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
index 558557262..beafc4ae8 100644
--- a/PLUGINS/src/hello/po/zh_CN.po
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2009-01-23 09:48+0800\n"
 "Last-Translator: senin\n"
-"Language-Team: Catalanian\n"
+"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 
 msgid "A friendly greeting"
 msgstr "友好的问候"
@@ -35,4 +36,3 @@ msgstr "你好人！"
 
 msgid "Hello world!"
 msgstr "世界您好！"
-
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 4217cb1e7..1270fbf67 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -21,3 +21,7 @@ VDR Plugin 'osddemo' Revision History
 2008-04-13: Version 0.1.3
 
 - Fixed setting the OSD level (thanks to Wolfgang Rohdewald).
+
+2011-02-20: Version 0.2.0
+
+- Added support for TrueColor OSD.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index d9ed4c56a..d93d802db 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.3 2011/02/27 10:05:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -72,7 +72,7 @@ $(DEPFILE): Makefile
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README
index 50d36d8c2..90ae29527 100644
--- a/PLUGINS/src/osddemo/README
+++ b/PLUGINS/src/osddemo/README
@@ -19,4 +19,11 @@ Demonstration of how a plugin can have its very own OSD setup.
 It's a very primitive game that opens a small window in which the
 user can draw lines with the Up, Down, Left and Right buttons.
 The color buttons are used to switch color.
+
+On a VDR system with TrueColor support it displays some of the
+possibilities available with the TrueColor OSD. Once the "Animation"
+pixmap is displayed, it can be moved around with the Up, Down, Left
+and Right buttons. The Red button turns off the "Tiled Pixmaps"
+display, and the Green button toggles the color display.
+
 Press Ok to close the window.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 2a9e09a66..2e6a33bfb 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.1 2008/04/13 12:59:57 kls Exp $
+ * $Id: osddemo.c 2.3 2011/02/26 12:08:13 kls Exp $
  */
 
+#include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.3";
+static const char *VERSION        = "0.2.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -22,7 +23,7 @@ class cLineGame : public cOsdObject {
   tColor color;
 public:
   cLineGame(void);
-  ~cLineGame();
+  virtual ~cLineGame();
   virtual void Show(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
@@ -73,6 +74,366 @@ eOSState cLineGame::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cTrueColorDemo --------------------------------------------------------
+
+class cTrueColorDemo : public cOsdObject, public cThread {
+private:
+  cOsd *osd;
+  cPoint cursor;
+  cRect cursorLimits;
+  bool clockwise;
+  cPixmap *destroyablePixmap;
+  cPixmap *toggleablePixmap;
+  virtual void Action(void);
+  cPixmap *CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font = NULL);
+public:
+  cTrueColorDemo(void);
+  virtual ~cTrueColorDemo();
+  virtual void Show(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cTrueColorDemo::cTrueColorDemo(void)
+{
+  osd = NULL;
+  clockwise = true;
+  destroyablePixmap = NULL;
+  toggleablePixmap = NULL;
+}
+
+cTrueColorDemo::~cTrueColorDemo()
+{
+  delete osd;
+}
+
+cPixmap *cTrueColorDemo::CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font)
+{
+  if (!Font)
+     Font = cFont::GetFont(fontOsd);
+  const int h = Font->Height(s);
+  int w = Font->Width(s);
+  cPixmap *Pixmap = osd->CreatePixmap(Layer, cRect((osd->Width() - w) / 2, Line, w, h));
+  if (Pixmap) {
+     Pixmap->Clear();
+     Pixmap->SetAlpha(0);
+     Pixmap->DrawText(cPoint(0, 0), s, ColorFg, ColorBg, Font);
+     }
+  return Pixmap;
+}
+
+void cTrueColorDemo::Action(void)
+{
+  cPixmap *FadeInPixmap = NULL;
+  cPixmap *FadeOutPixmap = NULL;
+  cPixmap *MovePixmap = NULL;
+  cPixmap *NextPixmap = NULL;
+  cPixmap *TilePixmap = NULL;
+  cPixmap *ScrollPixmap = NULL;
+  cPixmap *AnimPixmap = NULL;
+  int FrameTime = 40; // ms
+  int FadeTime = 1000; // ms
+  int MoveTime = 4000; // ms
+  int TileTime = 6000; // ms
+  int ScrollWaitTime = 1000; // ms
+  int ScrollLineTime = 200; // ms
+  int ScrollTotalTime = 8000; // ms
+  uint64_t Start = 0;
+  uint64_t ScrollStartTime = 0;
+  int ScrollLineNumber = 0;
+  cPoint MoveStart, MoveEnd;
+  cPoint TileStart, TileEnd;
+  cPoint ScrollStart, ScrollEnd;
+  int Line = osd->Height() / 20;
+  int StartLine = Line;
+  cPoint OldCursor;
+  int State = 0;
+  while (Running()) {
+        cPixmap::Lock();
+        bool Animated = false;
+        uint64_t Now = cTimeMs::Now();
+        if (FadeInPixmap) {
+           double t = min(double(Now - Start) / FadeTime, 1.0);
+           int Alpha = t * ALPHA_OPAQUE;
+           FadeInPixmap->SetAlpha(Alpha);
+           if (t >= 1)
+              FadeInPixmap = NULL;
+           Animated = true;
+           }
+        if (FadeOutPixmap) {
+           double t = min(double(Now - Start) / FadeTime, 1.0);
+           int Alpha = ALPHA_OPAQUE - t * ALPHA_OPAQUE;
+           FadeOutPixmap->SetAlpha(Alpha);
+           if (t >= 1)
+              FadeOutPixmap = NULL;
+           Animated = true;
+           }
+        if (MovePixmap) {
+           double t = min(double(Now - Start) / MoveTime, 1.0);
+           int x = MoveStart.X() + t * (MoveEnd.X() - MoveStart.X());
+           int y = MoveStart.Y() + t * (MoveEnd.Y() - MoveStart.Y());
+           cRect r = MovePixmap->ViewPort();
+           r.SetPoint(x, y);
+           MovePixmap->SetViewPort(r);
+           if (t >= 1)
+              MovePixmap = NULL;
+           Animated = true;
+           }
+        if (TilePixmap) {
+           double t = min(double(Now - Start) / TileTime, 1.0);
+           int x = TileStart.X() + t * (TileEnd.X() - TileStart.X());
+           int y = TileStart.Y() + t * (TileEnd.Y() - TileStart.Y());
+           TilePixmap->SetDrawPortPoint(cPoint(x, y));
+           if (t >= 1) {
+              destroyablePixmap = TilePixmap;
+              TilePixmap = NULL;
+              }
+           Animated = true;
+           }
+        if (ScrollPixmap) {
+           if (int(Now - Start) > ScrollWaitTime) {
+              if (ScrollStartTime) {
+                 double t = min(double(Now - ScrollStartTime) / ScrollLineTime, 1.0);
+                 int x = ScrollStart.X() + t * (ScrollEnd.X() - ScrollStart.X());
+                 int y = ScrollStart.Y() + t * (ScrollEnd.Y() - ScrollStart.Y());
+                 ScrollPixmap->SetDrawPortPoint(cPoint(x, y));
+                 if (t >= 1) {
+                    if (int(Now - Start) < ScrollTotalTime) {
+                       cRect r = ScrollPixmap->DrawPort();
+                       r.SetPoint(-r.X(), -r.Y());
+                       ScrollPixmap->Pan(cPoint(0, 0), r);
+                       const cFont *Font = cFont::GetFont(fontOsd);
+                       cString s = cString::sprintf("Line %d", ++ScrollLineNumber);
+                       ScrollPixmap->DrawRectangle(cRect(0, ScrollPixmap->ViewPort().Height(), ScrollPixmap->DrawPort().Width(), ScrollPixmap->DrawPort().Height()), clrTransparent);
+                       ScrollPixmap->DrawText(cPoint(0, ScrollPixmap->ViewPort().Height()), s, clrYellow, clrTransparent, Font);
+                       ScrollStartTime = Now;
+                       }
+                    else {
+                       FadeOutPixmap = ScrollPixmap;
+                       ScrollPixmap = NULL;
+                       Start = cTimeMs::Now();
+                       }
+                    }
+                 }
+              else
+                 ScrollStartTime = Now;
+              }
+           Animated = true;
+           }
+        if (AnimPixmap) {
+           int d = AnimPixmap->ViewPort().Height();
+           if (clockwise)
+              d = -d;
+           cPoint p = AnimPixmap->DrawPort().Point().Shifted(0, d);
+           if (clockwise && p.Y() <= -AnimPixmap->DrawPort().Height())
+              p.SetY(0);
+           else if (!clockwise && p.Y() > 0)
+              p.SetY(-(AnimPixmap->DrawPort().Height() - AnimPixmap->ViewPort().Height()));
+           AnimPixmap->SetDrawPortPoint(p);
+           }
+        if (!Animated) {
+           switch (State) {
+             case 0: {
+                       if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
+                          FadeInPixmap = CreateTextPixmap("VDR", Line, 1, clrYellow, clrTransparent, Font);
+                          if (FadeInPixmap)
+                             Line += FadeInPixmap->DrawPort().Height();
+                          delete Font;
+                          Start = cTimeMs::Now();
+                          }
+                       State++;
+                     }
+                     break;
+             case 1: { 
+                       FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent);
+                       if (FadeInPixmap)
+                          Line += FadeInPixmap->DrawPort().Height();
+                       Start = cTimeMs::Now();
+                       State++;
+                     }
+                     break;
+             case 2: {
+                       FadeInPixmap = CreateTextPixmap("True Color OSD Demo", Line, 1, clrYellow, clrTransparent);
+                       if (FadeInPixmap)
+                          Line += FadeInPixmap->DrawPort().Height();
+                       Start = cTimeMs::Now();
+                       State++;
+                     }
+                     break;
+             case 3: {
+                       if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
+                          NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font);
+                          if (NextPixmap) {
+                             FadeInPixmap = NextPixmap;
+                             }
+                          Start = cTimeMs::Now();
+                          StartLine = Line;
+                          Line += NextPixmap->DrawPort().Height();
+                          }
+                       State++;
+                     }
+                     break;
+             case 4: {
+                       Line += osd->Height() / 10;
+                       int w = osd->Width() / 2;
+                       int h = osd->Height() - Line - osd->Height() / 10;
+                       cImage Image(cSize(w, h));
+                       for (int y = 0; y < h; y++) {
+                           for (int x = 0; x < w; x++)
+                               Image.SetPixel(cPoint(x, y), HsvToColor(360 * double(x) / w, 1 - double(y) / h, 1) | 0xDF000000);
+                           }
+                       if (cPixmap *Pixmap = osd->CreatePixmap(2, cRect((osd->Width() - w) / 2, Line, w, h))) {
+                          Pixmap->DrawImage(cPoint(0, 0), Image);
+                          toggleablePixmap = Pixmap;
+                          }
+                       State++;
+                     }
+                     break;
+             case 5: {
+                       if (NextPixmap) {
+                          MovePixmap = NextPixmap;
+                          MoveStart = MovePixmap->ViewPort().Point();
+                          MoveEnd.Set(osd->Width() - MovePixmap->ViewPort().Width(), osd->Height() - MovePixmap->ViewPort().Height());
+                          Start = cTimeMs::Now();
+                          }
+                       State++;
+                     }
+                     break;
+             case 6: {
+                       TilePixmap = CreateTextPixmap("Tiled Pixmaps", StartLine, 1, clrRed, clrWhite);
+                       if (TilePixmap) {
+                          TilePixmap->SetViewPort(TilePixmap->ViewPort().Grown(TilePixmap->DrawPort().Width(), TilePixmap->DrawPort().Height()));
+                          TilePixmap->SetAlpha(200);
+                          TilePixmap->SetTile(true);
+                          TileStart = TilePixmap->DrawPort().Point();
+                          TileEnd = TileStart.Shifted(TilePixmap->ViewPort().Width(), TilePixmap->ViewPort().Height());
+                          MovePixmap = TilePixmap;
+                          MoveStart = MovePixmap->ViewPort().Point();
+                          MoveEnd.Set(10, osd->Height() - MovePixmap->ViewPort().Height() - 10);
+                          Start = cTimeMs::Now();
+                          }
+                       State++;
+                     }
+                     break;
+             case 7: {
+                       const cFont *Font = cFont::GetFont(fontOsd);
+                       const char *Text = "Scrolling Pixmaps";
+                       int w = Font->Width(Text);
+                       int h = Font->Height();
+                       if (cPixmap *Pixmap = osd->CreatePixmap(2, cRect((osd->Width() - w) / 2, StartLine, w, 2 * h), cRect(0, 0, w, 3 * h))) {
+                          Pixmap->Clear();
+                          Pixmap->DrawText(cPoint(0, 0), Text, clrYellow, clrTransparent, Font);
+                          cString s = cString::sprintf("Line %d", ++ScrollLineNumber);
+                          Pixmap->DrawText(cPoint(0, Pixmap->ViewPort().Height()), s, clrYellow, clrTransparent, Font);
+                          ScrollPixmap = Pixmap;
+                          ScrollStart.Set(0, 0);
+                          ScrollEnd.Set(0, -h);
+                          Start = cTimeMs::Now();
+                          }
+                       State++;
+                     }
+                     break;
+             case 8: {
+                       const cFont *Font = cFont::GetFont(fontSml);
+                       const char *Text = "Animation";
+                       const int Size = Font->Width(Text) + 10;
+                       const int NumDots = 12;
+                       const int AnimFrames = NumDots;
+                       // Temporarily using pixmap layer 0 to have the text alpha blended:
+                       AnimPixmap = osd->CreatePixmap(0, cRect((osd->Width() - Size) / 2, StartLine, Size, Size), cRect(0, 0, Size, Size * AnimFrames));
+                       if (AnimPixmap) {
+                          AnimPixmap->SetAlpha(0);
+                          AnimPixmap->Clear();
+                          const int Diameter = Size / 5;
+                          int xc = Size / 2 - Diameter / 2;
+                          for (int Frame = 0; Frame < AnimFrames; Frame++) {
+                              AnimPixmap->DrawEllipse(cRect(0, Frame * Size, Size, Size), 0xDDFFFFFF);
+                              int yc = Frame * Size + Size / 2 - Diameter / 2;
+                              int Color = 0xFF;
+                              int Delta = Color / NumDots / 3;
+                              for (int a = 0; a < NumDots; a++) {
+                                  double t = 2 * M_PI * (Frame + a) / NumDots;
+                                  int x = xc + ((Size - Diameter) / 2 - 5) * cos(t);
+                                  int y = yc + ((Size - Diameter) / 2 - 5) * sin(t);
+                                  AnimPixmap->DrawEllipse(cRect(x, y, Diameter, Diameter), ArgbToColor(0xFF, Color, Color, Color));
+                                  Color -= Delta;
+                                  }
+                              AnimPixmap->DrawText(cPoint(0, Frame * Size), Text, clrBlack, clrTransparent, cFont::GetFont(fontSml), Size, Size, taCenter);
+                              }
+                          AnimPixmap->SetLayer(3); // now setting the actual pixmap layer
+                          FadeInPixmap = AnimPixmap;
+                          LOCK_THREAD;
+                          OldCursor = cursor = AnimPixmap->ViewPort().Point();
+                          cursorLimits.Set(0, 0, osd->Width(), osd->Height());
+                          cursorLimits.SetRight(cursorLimits.Right() - Size);
+                          cursorLimits.SetBottom(cursorLimits.Bottom() - Size);
+                          cursorLimits.Grow(-10, -10);
+                          Start = cTimeMs::Now();
+                          }
+                       State++;
+                     }
+                     break;
+             case 9: {
+                       LOCK_THREAD;
+                       if (cursor != OldCursor) {
+                          MovePixmap = AnimPixmap;
+                          MoveStart = MovePixmap->ViewPort().Point();
+                          MoveEnd = OldCursor = cursor;
+                          MoveTime = 500;
+                          Start = cTimeMs::Now();
+                          }
+                     }
+                     break;
+             }
+           }
+        osd->Flush();
+        cPixmap::Unlock();
+        int Delta = cTimeMs::Now() - Now;
+        if (Delta < FrameTime)
+           cCondWait::SleepMs(FrameTime - Delta);
+        }
+}
+
+void cTrueColorDemo::Show(void)
+{
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop(), 50);
+  if (osd) {
+     tArea Area = { 0, 0, cOsd::OsdWidth() - 1, cOsd::OsdHeight() - 1,  32 };
+     if (osd->SetAreas(&Area, 1) == oeOk) {
+        osd->DrawRectangle(0, 0, osd->Width() -1 , osd->Height() - 1, clrGray50);
+        osd->Flush();
+        Start();
+        }
+     }
+}
+
+eOSState cTrueColorDemo::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdObject::ProcessKey(Key);
+  if (state == osUnknown) {
+     LOCK_PIXMAPS;
+     LOCK_THREAD;
+     const int d = 80;
+     switch (Key & ~k_Repeat) {
+       case kUp:     cursor.SetY(max(cursorLimits.Top(),    cursor.Y() - d)); clockwise = false; break;
+       case kDown:   cursor.SetY(min(cursorLimits.Bottom(), cursor.Y() + d)); clockwise = true; break;
+       case kLeft:   cursor.SetX(max(cursorLimits.Left(),   cursor.X() - d)); clockwise = false; break;
+       case kRight:  cursor.SetX(min(cursorLimits.Right(),  cursor.X() + d)); clockwise = true; break;
+       case kRed:    if (destroyablePixmap) {
+                        osd->DestroyPixmap(destroyablePixmap);
+                        destroyablePixmap = NULL;
+                        }
+                     break;
+       case kGreen:  if (toggleablePixmap)
+                        toggleablePixmap->SetLayer(-toggleablePixmap->Layer());
+                     break;
+       case kOk:     return osEnd;
+       default: return state;
+       }
+     state = osContinue;
+     }
+  return state;
+}
+
 // --- cPluginOsddemo --------------------------------------------------------
 
 class cPluginOsddemo : public cPlugin {
@@ -131,6 +492,8 @@ void cPluginOsddemo::Housekeeping(void)
 cOsdObject *cPluginOsddemo::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
+  if (cOsdProvider::SupportsTrueColor())
+     return new cTrueColorDemo;
   return new cLineGame;
 }
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 309a2eb14..332d77c4e 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -41,3 +41,7 @@ VDR Plugin 'pictures' Revision History
 2010-02-28: Version 0.0.9
 
 - Added Lithuanian language translations (thanks to Valdemaras Pipiras).
+
+2011-02-20: Version 0.1.0
+
+- Fixed reallocating memory (reported by Paul Menzel).
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 19c6fc68d..afdcc6165 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.2 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.6 2011/02/27 10:05:02 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@@ -99,10 +99,10 @@ i18n: $(I18Nmsgs) $(I18Npot)
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 6897e239c..8a890b1ce 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.2 2010/02/28 12:49:55 kls Exp $
+ * $Id: pictures.c 2.3 2011/02/20 16:50:01 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.0.9";
+static const char *VERSION       = "0.1.0";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index a0123e4c8..4b289ac9f 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 2.0 2008/02/09 12:13:10 kls Exp $
+ * $Id: player.c 2.1 2011/02/20 17:15:25 kls Exp $
  */
 
 #include "player.h"
@@ -66,8 +66,15 @@ void cPicturePlayer::SetPicture(const char *FileName)
          length = read(f, buffer, size);
          if (length > 0) {
             if (length >= size) {
-               size = size * 3 / 2;
-               buffer = (uchar *)realloc(buffer, size);
+               int NewSize = size * 3 / 2;
+               if (uchar *NewBuffer = (uchar *)realloc(buffer, NewSize)) {
+                  buffer = NewBuffer;
+                  size = NewSize;
+                  }
+               else {
+                  LOG_ERROR_STR("out of memory");
+                  break;
+                  }
                lseek(f, 0, SEEK_SET);
                continue;
                }
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index abeaa6e14..6e47101eb 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
-"Language-Team: German\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 803fa9e06..2d589f0be 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: Finnish\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index a99758f1d..54504312e 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Patrice Staudt <ipatrice.staudt@laposte.net>\n"
-"Language-Team: French\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index d30f040b9..a3ede6bac 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
index c6d16561c..a06341757 100644
--- a/PLUGINS/src/pictures/po/lt_LT.po
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2009-12-08 12:41+0100\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>, 2009\n"
-"Language-Team: Lietuviai\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index 46ed5c52d..dc1ba1230 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-03-14 00:45+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
-"Language-Team: Russian\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
index 38ba5cba0..a56c0d6c5 100644
--- a/PLUGINS/src/pictures/po/sk_SK.po
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2008-01-12 17:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2009-09-30 12:54+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
-"Language-Team: Slovak\n"
+"Language-Team: Slovak <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 
 msgid "Pictures"
 msgstr "Obr�zky"
@@ -29,4 +30,3 @@ msgstr "Oneskorenie prezent
 
 msgid "No picture directory has been defined!"
 msgstr "Neboli preuk�zan� �iadne fotky v adres�ri!"
-
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 18bfd26a0..2c8b17b40 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.3 2011/02/27 10:05:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -74,11 +74,11 @@ $(DEPFILE): Makefile
 ### Targets:
 
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
-	$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN1).o -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
-	$(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 080c3e662..a7ba1cf3c 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.2 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.6 2011/02/27 10:05:05 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@@ -99,10 +99,10 @@ i18n: $(I18Nmsgs) $(I18Npot)
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index ccf2de6a2..82edffc39 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
-"Language-Team: German\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 
 msgid "A text only skin"
 msgstr "Eine reine Text-Oberfl�che"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 01fda4d53..0cefeefe0 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-08-14 20:54+0300\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: Finnish\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 
 msgid "A text only skin"
 msgstr "Tekstipohjainen ulkoasu"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 3355fe898..d72077130 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 
 msgid "A text only skin"
 msgstr "Una interfaccia solo testo"
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index 3b34ee717..bb09d81da 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2009-10-13 11:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2010-02-22 18:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
-"Language-Team: Lietuviai\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 
 msgid "A text only skin"
 msgstr "Tekstinis apvalkalas"
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index afb2530bc..fae8a62d6 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
-"Language-Team: Russian\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "X-Generator: KBabel 1.11.4\n"
 
 msgid "A text only skin"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index f1b947732..aad3e4409 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"POT-Creation-Date: 2010-10-24 16:43+0200\n"
 "PO-Revision-Date: 2009-09-30 12:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
-"Language-Team: Slovak\n"
+"Language-Team: Slovak <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 
 msgid "A text only skin"
 msgstr "Iba text vzh�adu"
@@ -26,4 +27,3 @@ msgstr "Hlasitos
 
 msgid "Text mode"
 msgstr "Textov� re�im"
-
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 4abb8634d..84076cd4a 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.4 2010/02/28 12:50:13 kls Exp $
+ * $Id: skincurses.c 2.5 2011/01/04 08:52:03 kls Exp $
  */
 
 #include <ncurses.h>
@@ -23,6 +23,7 @@ class cCursesFont : public cFont {
   virtual int Width(const char *s) const { return s ? Utf8StrLen(s) : 0; }
   virtual int Height(void) const { return 1; }
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
+  virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
   };
 
 static const cCursesFont Font;
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 556a09e5b..f166981df 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.3 2011/02/27 10:05:08 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -72,7 +72,7 @@ $(DEPFILE): Makefile
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 4a803c6ba..2c84920d8 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.1 2010/02/06 14:50:03 kls Exp $
+# $Id: Makefile 2.3 2011/02/27 10:05:10 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -72,7 +72,7 @@ $(DEPFILE): Makefile
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
diff --git a/channels.c b/channels.c
index ebc7eb197..c689850b1 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.16 2010/06/05 13:33:57 kls Exp $
+ * $Id: channels.c 2.17 2010/11/07 12:24:59 kls Exp $
  */
 
 #include "channels.h"
@@ -262,12 +262,14 @@ static int IntArraysDiffer(const int *a, const int *b, const char na[][MAXLANGCO
 {
   int result = 0;
   for (int i = 0; a[i] || b[i]; i++) {
-      if (a[i] && na && nb && strcmp(na[i], nb[i]) != 0)
+      if (!a[i] || !b[i]) {
+         result |= VALDIFF;
+         break;
+         }
+      if (na && nb && strcmp(na[i], nb[i]) != 0)
          result |= STRDIFF;
       if (a[i] != b[i])
          result |= VALDIFF;
-      if (!a[i] || !b[i])
-         break;
       }
   return result;
 }
diff --git a/config.h b/config.h
index 7c28d414a..c9aeb5ec9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.28 2010/09/12 11:31:21 kls Exp $
+ * $Id: config.h 2.29 2010/10/24 11:22:35 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.16"
-#define VDRVERSNUM   10716  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.17"
+#define VDRVERSNUM   10717  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.16"
-#define APIVERSNUM   10716  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.17"
+#define APIVERSNUM   10717  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index c1f49849f..96739fdd5 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.5 2010/08/29 13:35:18 kls Exp $
+ * $Id: cutter.c 2.6 2011/03/06 14:54:33 kls Exp $
  */
 
 #include "cutter.h"
@@ -68,6 +68,8 @@ void cCuttingThread::Action(void)
 {
   cMark *Mark = fromMarks.First();
   if (Mark) {
+     SetPriority(19);
+     SetIOPriority(7);
      fromFile = fromFileName->Open();
      toFile = toFileName->Open();
      if (!fromFile || !toFile)
diff --git a/device.c b/device.c
index 681049b8e..60340c06f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.37 2010/06/03 13:35:02 kls Exp $
+ * $Id: device.c 2.38 2011/02/25 15:12:03 kls Exp $
  */
 
 #include "device.h"
@@ -1087,11 +1087,17 @@ void cDevice::StillPicture(const uchar *Data, int Length)
                  int l;
                  while (const uchar *p = TsToPes.GetPes(l)) {
                        int Offset = Size;
-                       Size += l;
-                       buf = (uchar *)realloc(buf, Size);
-                       if (!buf)
+                       int NewSize = Size + l;
+                       if (uchar *NewBuffer = (uchar *)realloc(buf, NewSize)) {
+                          Size = NewSize;
+                          buf = NewBuffer;
+                          memcpy(buf + Offset, p, l);
+                          }
+                       else {
+                          LOG_ERROR_STR("out of memory");
+                          free(buf);
                           return;
-                       memcpy(buf + Offset, p, l);
+                          }
                        }
                  TsToPes.Reset();
                  }
@@ -1103,11 +1109,17 @@ void cDevice::StillPicture(const uchar *Data, int Length)
      int l;
      while (const uchar *p = TsToPes.GetPes(l)) {
            int Offset = Size;
-           Size += l;
-           buf = (uchar *)realloc(buf, Size);
-           if (!buf)
+           int NewSize = Size + l;
+           if (uchar *NewBuffer = (uchar *)realloc(buf, NewSize)) {
+              Size = NewSize;
+              buf = NewBuffer;
+              memcpy(buf + Offset, p, l);
+              }
+           else {
+              esyslog("ERROR: out of memory");
+              free(buf);
               return;
-           memcpy(buf + Offset, p, l);
+              }
            }
      StillPicture(buf, Size);
      free(buf);
diff --git a/device.h b/device.h
index cb3bc2caa..1598af24a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.22 2010/04/05 09:51:29 kls Exp $
+ * $Id: device.h 2.23 2010/10/24 12:11:16 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -586,8 +586,8 @@ class cDevice : public cThread {
 public:
   virtual int64_t GetSTC(void);
        ///< Gets the current System Time Counter, which can be used to
-       ///< synchronize audio and video. If this device is unable to
-       ///< provide the STC, -1 will be returned.
+       ///< synchronize audio, video and subtitles. If this device is able to
+       ///< replay, it must provide an STC.
        ///< The value returned doesn't need to be an actual "clock" value,
        ///< it is sufficient if it holds the PTS (Presentation Time Stamp) of
        ///< the most recently presented frame. A proper value must be returned
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 54943746c..c1a0a0c27 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.7 2010/08/29 14:08:23 kls Exp $
+ * $Id: dvbsubtitle.c 2.11 2011/03/12 15:13:03 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -420,7 +420,7 @@ class cDvbSubtitlePage : public cListObject {
   int PageId(void) { return pageId; }
   int Version(void) { return version; }
   int State(void) { return state; }
-  tArea *GetAreas(void);
+  tArea *GetAreas(double Factor);
   cSubtitleClut *GetClutById(int ClutId, bool New = false);
   cSubtitleObject *GetObjectById(int ObjectId);
   cSubtitleRegion *GetRegionById(int RegionId, bool New = false);
@@ -446,16 +446,16 @@ cDvbSubtitlePage::~cDvbSubtitlePage()
 {
 }
 
-tArea *cDvbSubtitlePage::GetAreas(void)
+tArea *cDvbSubtitlePage::GetAreas(double Factor)
 {
   if (regions.Count() > 0) {
      tArea *Areas = new tArea[regions.Count()];
      tArea *a = Areas;
      for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
-         a->x1 = sr->HorizontalAddress();
-         a->y1 = sr->VerticalAddress();
-         a->x2 = sr->HorizontalAddress() + sr->Width() - 1;
-         a->y2 = sr->VerticalAddress() + sr->Height() - 1;
+         a->x1 = int(round(Factor * sr->HorizontalAddress()));
+         a->y1 = int(round(Factor * sr->VerticalAddress()));
+         a->x2 = int(round(Factor * (sr->HorizontalAddress() + sr->Width() - 1)));
+         a->y2 = int(round(Factor * (sr->VerticalAddress() + sr->Height() - 1)));
          a->bpp = sr->Bpp();
          while ((a->Width() & 3) != 0)
                a->x2++; // aligns width to a multiple of 4, so 2, 4 and 8 bpp will work
@@ -570,12 +570,17 @@ void cDvbSubtitleAssembler::Reset(void)
 bool cDvbSubtitleAssembler::Realloc(int Size)
 {
   if (Size > size) {
-     size = max(Size, 2048);
-     data = (uchar *)realloc(data, size);
-     if (!data) {
+     Size = max(Size, 2048);
+     if (uchar *NewBuffer = (uchar *)realloc(data, Size)) {
+        size = Size;
+        data = NewBuffer;
+        }
+     else {
         esyslog("ERROR: can't allocate memory for subtitle assembler");
         length = 0;
         size = 0;
+        free(data);
+        data = NULL;
         return false;
         }
      }
@@ -611,9 +616,10 @@ class cDvbSubtitleBitmaps : public cListObject {
   int timeout;
   tArea *areas;
   int numAreas;
+  double osdFactor;
   cVector<cBitmap *> bitmaps;
 public:
-  cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas);
+  cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactor);
   ~cDvbSubtitleBitmaps();
   int64_t Pts(void) { return pts; }
   int Timeout(void) { return timeout; }
@@ -621,12 +627,13 @@ class cDvbSubtitleBitmaps : public cListObject {
   void Draw(cOsd *Osd);
   };
 
-cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas)
+cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactor)
 {
   pts = Pts;
   timeout = Timeout;
   areas = Areas;
   numAreas = NumAreas;
+  osdFactor = OsdFactor;
 }
 
 cDvbSubtitleBitmaps::~cDvbSubtitleBitmaps()
@@ -644,8 +651,14 @@ void cDvbSubtitleBitmaps::AddBitmap(cBitmap *Bitmap)
 void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
 {
   if (Osd->SetAreas(areas, numAreas) == oeOk) {
-     for (int i = 0; i < bitmaps.Size(); i++)
-         Osd->DrawBitmap(bitmaps[i]->X0(), bitmaps[i]->Y0(), *bitmaps[i]);
+     for (int i = 0; i < bitmaps.Size(); i++) {
+         cBitmap *b = bitmaps[i];
+         if (osdFactor != 1.0)
+            b = b->Scale(osdFactor, osdFactor);
+         Osd->DrawBitmap(int(round(b->X0() * osdFactor)), int(round(b->Y0() * osdFactor)), *b);
+         if (b != bitmaps[i])
+            delete b;
+         }
      Osd->Flush();
      }
 }
@@ -661,10 +674,11 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
   osd = NULL;
   frozen = false;
   ddsVersionNumber = -1;
-  displayWidth = 720;
-  displayHeight = 576;
-  displayHorizontalOffset = 0;
-  displayVerticalOffset = 0;
+  displayWidth = windowWidth = 720;
+  displayHeight = windowHeight = 576;
+  windowHorizontalOffset = 0;
+  windowVerticalOffset = 0;
+  SetOsdData();
   pages = new cList<cDvbSubtitlePage>;
   bitmaps = new cList<cDvbSubtitleBitmaps>;
   Start();
@@ -694,10 +708,11 @@ void cDvbSubtitleConverter::Reset(void)
   DELETENULL(osd);
   frozen = false;
   ddsVersionNumber = -1;
-  displayWidth = 720;
-  displayHeight = 576;
-  displayHorizontalOffset = 0;
-  displayVerticalOffset = 0;
+  displayWidth = windowWidth = 720;
+  displayHeight = windowHeight = 576;
+  windowHorizontalOffset = 0;
+  windowVerticalOffset = 0;
+  SetOsdData();
   Unlock();
 }
 
@@ -781,7 +796,7 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
   return 0;
 }
 
-#define LimitTo32Bit(n) (n & 0x00000000FFFFFFFFL)
+#define LimitTo32Bit(n) ((n) & 0x00000000FFFFFFFFL)
 #define MAXDELTA 40000 // max. reasonable PTS/STC delta in ms
 
 void cDvbSubtitleConverter::Action(void)
@@ -801,17 +816,11 @@ void cDvbSubtitleConverter::Action(void)
            Lock();
            if (cDvbSubtitleBitmaps *sb = bitmaps->First()) {
               int64_t STC = cDevice::PrimaryDevice()->GetSTC();
-              int64_t Delta = 0;
-              if (STC >= 0) {
-                 Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
-                 if (Delta > (int64_t(1) << 31))
-                    Delta -= (int64_t(1) << 32);
-                 else if (Delta < -((int64_t(1) << 31) - 1))
-                    Delta += (int64_t(1) << 32);
-                 }
-              else {
-                 //TODO sync on PTS? are there actually devices that don't deliver an STC?
-                 }
+              int64_t Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
+              if (Delta > (int64_t(1) << 31))
+                 Delta -= (int64_t(1) << 32);
+              else if (Delta < -((int64_t(1) << 31) - 1))
+                 Delta += (int64_t(1) << 32);
               Delta /= 90; // STC and PTS are in 1/90000s
               if (Delta <= MAXDELTA) {
                  if (Delta <= 0) {
@@ -851,9 +860,29 @@ tColor cDvbSubtitleConverter::yuv2rgb(int Y, int Cb, int Cr)
   return (Er << 16) | (Eg << 8) | Eb;
 }
 
+void cDvbSubtitleConverter::SetOsdData(void)
+{
+  int OsdWidth;
+  int OsdHeight;
+  double OsdAspect;
+  cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect);
+  osdDeltaX = osdDeltaY = 0;
+  osdFactor = 1.0;
+  double fw = double(OsdWidth) / displayWidth;
+  double fh = double(OsdHeight) / displayHeight;
+  if (fw >= fh) {
+     osdFactor = fh;
+     osdDeltaX = (OsdWidth - displayWidth * osdFactor) / 2;
+     }
+  else {
+     osdFactor = fw;
+     osdDeltaY = (OsdHeight - displayHeight * osdFactor) / 2;
+     }
+}
+
 bool cDvbSubtitleConverter::AssertOsd(void)
 {
-  return osd || (osd = cOsdProvider::NewOsd(displayHorizontalOffset, displayVerticalOffset + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
+  return osd || (osd = cOsdProvider::NewOsd(int(round(osdFactor * windowHorizontalOffset + osdDeltaX)), int(round(osdFactor * windowVerticalOffset + osdDeltaY)) + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
 }
 
 int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
@@ -1017,16 +1046,17 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             int version = (Data[6] & 0xF0) >> 4;
             if (version != ddsVersionNumber) {
                int displayWindowFlag   = (Data[6] & 0x08) >> 3;
-               displayHorizontalOffset = 0;
-               displayVerticalOffset   = 0;
-               displayWidth            = ((Data[7] << 8) | Data[8]) + 1;
-               displayHeight           = ((Data[9] << 8) | Data[10]) + 1;
+               windowHorizontalOffset = 0;
+               windowVerticalOffset   = 0;
+               displayWidth = windowWidth   = ((Data[7] << 8) | Data[8]) + 1;
+               displayHeight = windowHeight = ((Data[9] << 8) | Data[10]) + 1;
                if (displayWindowFlag) { 
-                  displayHorizontalOffset = (Data[11] << 8) | Data[12];                                 // displayWindowHorizontalPositionMinimum
-                  displayWidth            = ((Data[13] << 8) | Data[14]) - displayHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
-                  displayVerticalOffset   = (Data[15] << 8) | Data[16];                                 // displayWindowVerticalPositionMinimum
-                  displayHeight           = ((Data[17] << 8) | Data[18]) - displayVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
+                  windowHorizontalOffset = (Data[11] << 8) | Data[12];                                // displayWindowHorizontalPositionMinimum
+                  windowWidth            = ((Data[13] << 8) | Data[14]) - windowHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
+                  windowVerticalOffset   = (Data[15] << 8) | Data[16];                                // displayWindowVerticalPositionMinimum
+                  windowHeight           = ((Data[17] << 8) | Data[18]) - windowVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
                   }
+               SetOsdData();
                SetupChanged();
                ddsVersionNumber = version;
                }
@@ -1049,7 +1079,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
 {
   if (!AssertOsd())
      return;
-  tArea *Areas = Page->GetAreas();
+  tArea *Areas = Page->GetAreas(osdFactor);
   int NumAreas = Page->regions.Count();
   int Bpp = 8;
   bool Reduced = false;
@@ -1086,7 +1116,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
             }
          }
      }
-  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas);
+  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactor);
   bitmaps->Add(Bitmaps);
   for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
       int posX = sr->HorizontalAddress();
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index 688866101..6e7176590 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.3 2010/05/13 14:43:44 kls Exp $
+ * $Id: dvbsubtitle.h 2.5 2011/03/12 14:03:42 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -29,11 +29,17 @@ class cDvbSubtitleConverter : public cThread {
   int ddsVersionNumber;
   int displayWidth;
   int displayHeight;
-  int displayHorizontalOffset;
-  int displayVerticalOffset;
+  int windowHorizontalOffset;
+  int windowVerticalOffset;
+  int windowWidth;
+  int windowHeight;
+  int osdDeltaX;
+  int osdDeltaY;
+  double osdFactor;
   cList<cDvbSubtitlePage> *pages;
   cList<cDvbSubtitleBitmaps> *bitmaps;
   tColor yuv2rgb(int Y, int Cb, int Cr);
+  void SetOsdData(void);
   bool AssertOsd(void);
   int ExtractSegment(const uchar *Data, int Length, int64_t Pts);
   void FinishPage(cDvbSubtitlePage *Page);
diff --git a/epg.c b/epg.c
index 18d91fc71..c2d1783da 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.6 2010/02/28 14:24:55 kls Exp $
+ * $Id: epg.c 2.7 2011/02/25 15:16:05 kls Exp $
  */
 
 #include "epg.h"
@@ -56,25 +56,34 @@ cComponents::~cComponents(void)
   free(components);
 }
 
-void cComponents::Realloc(int Index)
+bool cComponents::Realloc(int Index)
 {
   if (Index >= numComponents) {
-     int n = numComponents;
-     numComponents = Index + 1;
-     components = (tComponent *)realloc(components, numComponents * sizeof(tComponent));
-     memset(&components[n], 0, sizeof(tComponent) * (numComponents - n));
+     Index++;
+     if (tComponent *NewBuffer = (tComponent *)realloc(components, Index * sizeof(tComponent))) {
+        int n = numComponents;
+        numComponents = Index;
+        components = NewBuffer;
+        memset(&components[n], 0, sizeof(tComponent) * (numComponents - n));
+        }
+     else {
+        esyslog("ERROR: out of memory");
+        return false;
+        }
      }
+  return true;
 }
 
 void cComponents::SetComponent(int Index, const char *s)
 {
-  Realloc(Index);
-  components[Index].FromString(s);
+  if (Realloc(Index))
+     components[Index].FromString(s);
 }
 
 void cComponents::SetComponent(int Index, uchar Stream, uchar Type, const char *Language, const char *Description)
 {
-  Realloc(Index);
+  if (!Realloc(Index))
+     return;
   tComponent *p = &components[Index];
   p->stream = Stream;
   p->type = Type;
diff --git a/epg.h b/epg.h
index 5555c2e9c..e5f4bdaec 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.4 2010/01/08 15:20:34 kls Exp $
+ * $Id: epg.h 2.5 2011/02/25 14:14:38 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -51,7 +51,7 @@ class cComponents {
 private:
   int numComponents;
   tComponent *components;
-  void Realloc(int Index);
+  bool Realloc(int Index);
 public:
   cComponents(void);
   ~cComponents(void);
diff --git a/font.c b/font.c
index 4ff4017d6..db1bd8937 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.5 2010/09/19 11:49:19 kls Exp $
+ * $Id: font.c 2.7 2011/02/26 12:09:18 kls Exp $
  */
 
 #include "font.h"
@@ -118,6 +118,7 @@ class cFreetypeFont : public cFont {
   virtual int Width(const char *s) const;
   virtual int Height(void) const { return height; }
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const;
+  virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const;
   };
 
 cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
@@ -329,6 +330,53 @@ void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColo
      }
 }
 
+void cFreetypeFont::DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const
+{
+  if (s && height) { // checking height to make sure we actually have a valid font
+#ifdef BIDI
+     cString bs = Bidi(s);
+     s = bs;
+#endif
+     bool AntiAliased = Setup.AntiAlias;
+     uint prevSym = 0;
+     while (*s) {
+           int sl = Utf8CharLen(s);
+           uint sym = Utf8CharGet(s, sl);
+           s += sl;
+           cGlyph *g = Glyph(sym, AntiAliased);
+           if (!g)
+              continue;
+           int kerning = Kerning(g, prevSym);
+           prevSym = sym;
+           uchar *buffer = g->Bitmap();
+           int symWidth = g->Width();
+           if (Width && x + symWidth + g->Left() + kerning - 1 > Width)
+              break; // we don't draw partial characters
+           if (x + symWidth + g->Left() + kerning > 0) {
+              for (int row = 0; row < g->Rows(); row++) {
+                  for (int pitch = 0; pitch < g->Pitch(); pitch++) {
+                      uchar bt = *(buffer + (row * g->Pitch() + pitch));
+                      if (AntiAliased) {
+                         if (bt > 0x00)
+                            Pixmap->DrawPixel(cPoint(x + pitch + g->Left() + kerning, y + row + (height - Bottom() - g->Top())), AlphaBlend(ColorFg, ColorBg, bt));
+                         }
+                      else { //monochrome rendering
+                         for (int col = 0; col < 8 && col + pitch * 8 <= symWidth; col++) {
+                             if (bt & 0x80)
+                                Pixmap->DrawPixel(cPoint(x + col + pitch * 8 + g->Left() + kerning, y + row + (height - Bottom() - g->Top())), ColorFg);
+                             bt <<= 1;
+                             }
+                         }
+                      }
+                  }
+              }
+           x += g->AdvanceX() + kerning;
+           if (x > Pixmap->DrawPort().Width() - 1)
+              break;
+           }
+     }
+}
+
 // --- cDummyFont ------------------------------------------------------------
 
 // A dummy font, in case there are no fonts installed:
@@ -339,6 +387,7 @@ class cDummyFont : public cFont {
   virtual int Width(const char *s) const { return 50; }
   virtual int Height(void) const { return 20; }
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
+  virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {};
   };
 
 // --- cFont -----------------------------------------------------------------
diff --git a/font.h b/font.h
index cb76671a5..dbca88ef3 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.4 2010/09/19 11:48:37 kls Exp $
+ * $Id: font.h 2.5 2011/01/14 16:22:03 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -26,6 +26,7 @@ enum eDvbFont {
   };
 
 class cBitmap;
+class cPixmap;
 typedef uint32_t tColor; // see also osd.h
 typedef uint8_t tIndex;
 
@@ -54,6 +55,9 @@ class cFont {
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
           ///< Draws the given text into the Bitmap at position (x, y) with the given colors.
           ///< The text will not exceed the given Width (if > 0), and will end with a complete character.
+  virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}; // not "pure", so that existing implementations still compile
+          ///< Draws the given text into the Pixmap at position (x, y) with the given colors.
+          ///< The text will not exceed the given Width (if > 0), and will end with a complete character.
   static void SetFont(eDvbFont Font, const char *Name, int CharHeight);
           ///< Sets the given Font to use the font data according to Name (see CreateFont())
           ///< and make its characters CharHeight pixels high.
@@ -81,7 +85,7 @@ class cFont {
           ///< of the actual font file.
           ///< Returns true if any font names were found.
   static cString GetFontFileName(const char *FontName);
-          ///< Retruns the actual font file name for the given FontName.
+          ///< Returns the actual font file name for the given FontName.
 #ifdef BIDI
   static cString Bidi(const char *Ltr);
           ///< Converts any "right-to-left" parts in the "left-to-right" string Ltr
diff --git a/i18n.c b/i18n.c
index d6430340b..636c4b58e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.2 2010/09/19 11:22:39 kls Exp $
+ * $Id: i18n.c 2.3 2011/02/20 15:56:20 kls Exp $
  */
 
 /*
@@ -52,6 +52,7 @@ const char *LanguageCodeList[] = {
   "hun",
   "cat,cln",
   "rus",
+  "srb,srp,scr,scc",
   "hrv",
   "est",
   "dan",
diff --git a/libsi/Makefile b/libsi/Makefile
index 1472a3b6c..37be2f60c 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 2.0 2006/05/26 10:40:19 kls Exp $
+# $Id: Makefile 2.1 2010/11/07 13:31:05 kls Exp $
 
 ### The C++ compiler and options:
 
@@ -11,6 +11,7 @@ AR = ar
 ARFLAGS = ru
 RANLIB = ranlib
 
+include ../Make.global
 -include ../Make.config
 
 ### The directory environment:
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 06b22dc4e..59f636a35 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 2.0 2007/02/03 11:45:58 kls Exp $
+ *   $Id: descriptor.c 2.1 2010/11/01 15:24:31 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -1032,4 +1032,15 @@ void MHP_ApplicationIconsDescriptor::Parse() {
    data.setPointerAndOffset<const descr_application_icons_descriptor_end>(s, offset);
 }
 
+int RegistrationDescriptor::getFormatIdentifier() const {
+   return HILOHILO(s->format_identifier);
+}
+
+void RegistrationDescriptor::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const descr_registration>(s, offset);
+   if (checkSize(getLength()-offset))
+      privateData.assign(data.getData(offset), getLength()-offset);
+}
+
 } //end of namespace
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 7df076e38..4f2e41b6a 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 2.0 2007/02/03 11:45:58 kls Exp $
+ *   $Id: descriptor.h 2.1 2010/11/01 15:24:32 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -660,6 +660,16 @@ class MHP_ApplicationIconsDescriptor : public Descriptor {
    const descr_application_icons_descriptor_end *s;
 };
 
+class RegistrationDescriptor : public Descriptor {
+public:
+   int getFormatIdentifier() const;
+   CharArray privateData;
+protected:
+   virtual void Parse();
+private:
+   const descr_registration *s;
+};
+
 } //end of namespace
 
 #endif //LIBSI_TABLE_H
diff --git a/libsi/headers.h b/libsi/headers.h
index 1e09d6c93..3ec35def3 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 2.0 2007/02/03 11:45:58 kls Exp $
+ *   $Id: headers.h 2.1 2010/11/01 15:24:32 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -2006,6 +2006,18 @@ struct item_premiere_content_transmission_time {
    u_char start_time_s                           :8;
 };
 
+/* 0x05 registration_descriptor */
+
+#define DESCR_REGISTRATION_LEN 6
+struct descr_registration {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char format_identifier_hi_hi                :8;
+   u_char format_identifier_hi_lo                :8;
+   u_char format_identifier_lo_hi                :8;
+   u_char format_identifier_lo_lo                :8;
+};
+
 } //end of namespace
 
 #endif //LIBSI_HEADERS_H
diff --git a/libsi/si.c b/libsi/si.c
index 0fd832d85..399117869 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.2 2010/02/13 10:31:52 kls Exp $
+ *   $Id: si.c 2.3 2010/11/01 15:24:32 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -606,6 +606,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case ExtensionDescriptorTag:
             d=new ExtensionDescriptor();
             break;
+         case RegistrationDescriptorTag:
+            d=new RegistrationDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -614,7 +617,6 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case VideoStreamDescriptorTag:
          case AudioStreamDescriptorTag:
          case HierarchyDescriptorTag:
-         case RegistrationDescriptorTag:
          case DataStreamAlignmentDescriptorTag:
          case TargetBackgroundGridDescriptorTag:
          case VideoWindowDescriptorTag:
diff --git a/libsi/util.h b/libsi/util.h
index 486267234..e9134cd42 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 2.1 2008/05/22 10:49:08 kls Exp $
+ *   $Id: util.h 2.2 2010/11/01 15:24:32 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -19,6 +19,7 @@
 #include <time.h>
 
 #define HILO(x) (x##_hi << 8 | x##_lo)
+#define HILOHILO(x) (x##_hi_hi << 24 | x##_hi_lo << 16 | x##_lo_hi << 8 | x##_lo_lo)
 #define BCD_TIME_TO_SECONDS(x) ((3600 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
                              (60 * ((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))) + \
                              ((10*((x##_s & 0xF0)>>4)) + (x##_s & 0xF)))
diff --git a/lirc.c b/lirc.c
index f157df907..e3b68db98 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 2.0 2006/05/28 08:48:13 kls Exp $
+ * $Id: lirc.c 2.1 2011/03/08 15:35:13 kls Exp $
  */
 
 #include "lirc.h"
@@ -86,7 +86,8 @@ void cLircRemote::Action(void)
                  }
            }
 
-        if (ready && ret > 21) {
+        if (ready && ret > 0) {
+           buf[ret - 1] = 0;
            int count;
            char KeyName[LIRC_KEY_BUF];
            if (sscanf(buf, "%*x %x %29s", &count, KeyName) != 2) { // '29' in '%29s' is LIRC_KEY_BUF-1!
diff --git a/menu.c b/menu.c
index 19cfabb3e..2ba1de8ee 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.24 2010/06/06 09:56:16 kls Exp $
+ * $Id: menu.c 2.28 2011/02/27 12:37:48 kls Exp $
  */
 
 #include "menu.h"
@@ -606,7 +606,7 @@ void cMenuText::Display(void)
 
 eOSState cMenuText::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -1253,7 +1253,7 @@ void cMenuEvent::Display(void)
 
 eOSState cMenuEvent::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -1860,8 +1860,14 @@ eOSState cMenuCommands::Execute(void)
               int l = 0;
               int c;
               while ((c = fgetc(p)) != EOF) {
-                    if (l % 20 == 0)
-                       result = (char *)realloc(result, l + 21);
+                    if (l % 20 == 0) {
+                       if (char *NewBuffer = (char *)realloc(result, l + 21))
+                          result = NewBuffer;
+                       else {
+                          esyslog("ERROR: out of memory");
+                          break;
+                          }
+                       }
                     result[l++] = char(c);
                     }
               if (result)
@@ -2116,7 +2122,7 @@ void cMenuRecording::Display(void)
 
 eOSState cMenuRecording::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -2270,7 +2276,7 @@ void cMenuRecordings::Set(bool Refresh)
   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
       if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
          cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-         if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
+         if (*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0))) {
             Add(Item);
             LastItem = Item;
             free(LastItemText);
@@ -3614,7 +3620,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
   cChannel *NewChannel = NULL;
   if (Key != kNone)
      lastTime.Set();
-  switch (Key) {
+  switch (int(Key)) {
     case k0:
          if (number == 0) {
             // keep the "Toggle channels" function working
@@ -3818,7 +3824,7 @@ void cDisplayVolume::Process(eKeys Key)
 
 eOSState cDisplayVolume::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
     case kVolUp|k_Repeat:
     case kVolUp:
     case kVolDn|k_Repeat:
@@ -3914,7 +3920,7 @@ eOSState cDisplayTracks::ProcessKey(eKeys Key)
 {
   int oldTrack = track;
   int oldAudioChannel = audioChannel;
-  switch (Key) {
+  switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -4031,7 +4037,7 @@ void cDisplaySubtitleTracks::Process(eKeys Key)
 eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
 {
   int oldTrack = track;
-  switch (Key) {
+  switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -4736,6 +4742,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
 {
   if (!Active())
      return osEnd;
+  if (Key == kNone)
+     marks.Update();
   if (visible) {
      if (timeoutShow && time(NULL) > timeoutShow) {
         Hide();
@@ -4754,7 +4762,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
      return osContinue;
      }
   bool DoShowMode = true;
-  switch (Key) {
+  switch (int(Key)) {
     // Positioning:
     case kPlay:
     case kUp:      Play(); break;
@@ -4781,7 +4789,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                    return osEnd;
     default: {
       DoShowMode = false;
-      switch (Key) {
+      switch (int(Key)) {
         // Editing:
         case kMarkToggle:      MarkToggle(); break;
         case kPrev|k_Repeat:
diff --git a/menuitems.c b/menuitems.c
index c5eba6e92..3a5a086b0 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.7 2010/06/06 10:37:08 kls Exp $
+ * $Id: menuitems.c 2.8 2010/12/12 13:41:09 kls Exp $
  */
 
 #include "menuitems.h"
@@ -527,7 +527,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
      Set();
      return osContinue;
      }
-  switch (Key) {
+  switch (int(Key)) {
     case kRed:   // Switch between upper- and lowercase characters
                  if (InEditMode()) {
                     if (!insert || !newchar) {
@@ -733,7 +733,7 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
 {
   int delta = 1;
 
-  switch (Key) {
+  switch (int(Key)) {
     case kLeft|k_Repeat:
     case kLeft:  delta = -1;
     case kRight|k_Repeat:
diff --git a/newplugin b/newplugin
index ffc43d3ba..19c7d7fd9 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.2 2010/02/06 14:50:03 kls Exp $
+# $Id: newplugin 2.6 2011/02/27 10:06:06 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -77,7 +77,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -142,7 +142,7 @@ I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 	msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ \$^
 
 %.po: \$(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q \$\@ \$<
@@ -158,10 +158,10 @@ i18n: \$(I18Nmsgs) \$(I18Npot)
 ### Targets:
 
 libvdr-\$(PLUGIN).so: \$(OBJS)
-	\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
+	\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
 	\@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
 
-dist: clean
+dist: \$(I18Npo) clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
 	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
 	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
diff --git a/osd.c b/osd.c
index 9d4e6a42c..3a5355611 100644
--- a/osd.c
+++ b/osd.c
@@ -4,12 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.10 2010/05/02 13:56:53 kls Exp $
+ * $Id: osd.c 2.17 2011/03/12 15:32:33 kls Exp $
  */
 
 #include "osd.h"
 #include <math.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -17,6 +16,92 @@
 #include "device.h"
 #include "tools.h"
 
+tColor HsvToColor(double H, double S, double V)
+{
+  if (S > 0) {
+     H /= 60;
+     int i = floor(H);
+     double f = H - i;
+     double p = V * (1 - S);
+     double q = V * (1 - S * f);
+     double t = V * (1 - S * (1 - f));
+     switch (i) {
+       case 0:  return RgbToColor(V, t, p);
+       case 1:  return RgbToColor(q, V, p);
+       case 2:  return RgbToColor(p, V, t);
+       case 3:  return RgbToColor(p, q, V);
+       case 4:  return RgbToColor(t, p, V);
+       default: return RgbToColor(V, p, q);
+       }
+     }
+  else { // greyscale
+     uint8_t n = V * 0xFF;
+     return RgbToColor(n, n, n);
+     }
+}
+
+#define USE_ALPHA_LUT
+#ifdef USE_ALPHA_LUT
+// Alpha blending with lookup table (by Reinhard Nissl <rnissl@gmx.de>)
+// A little slower (138 %) on fast machines than the implementation below and faster
+// on slow machines (79 %), but requires some 318KB of RAM for the lookup table.
+static uint16_t AlphaLutFactors[255][256][2];
+static uint8_t AlphaLutAlpha[255][256];
+
+class cInitAlphaLut {
+public:
+  cInitAlphaLut(void)
+  {
+    for (int alphaA = 0; alphaA < 255; alphaA++) {
+        int range = (alphaA == 255 ? 255 : 254);
+        for (int alphaB = 0; alphaB < 256; alphaB++) {
+            int alphaO_x_range = 255 * alphaA + alphaB * (range - alphaA);
+            if (!alphaO_x_range)
+               alphaO_x_range++;
+            int factorA = (256 * 255 * alphaA + alphaO_x_range / 2) / alphaO_x_range;
+            int factorB = (256 * alphaB * (range - alphaA) + alphaO_x_range / 2) / alphaO_x_range;
+            AlphaLutFactors[alphaA][alphaB][0] = factorA;
+            AlphaLutFactors[alphaA][alphaB][1] = factorB;
+            AlphaLutAlpha[alphaA][alphaB] = alphaO_x_range / range;
+            }
+        }
+  }
+  } InitAlphaLut;
+
+tColor AlphaBlend(tColor ColorFg, tColor ColorBg, uint8_t AlphaLayer)
+{
+  tColor Alpha = (ColorFg & 0xFF000000) >> 24;
+  Alpha *= AlphaLayer;
+  Alpha >>= 8;
+  uint16_t *lut = &AlphaLutFactors[Alpha][(ColorBg & 0xFF000000) >> 24][0];
+  return (tColor)((AlphaLutAlpha[Alpha][(ColorBg & 0xFF000000) >> 24] << 24)
+    | (((((ColorFg & 0x00FF00FF) * lut[0] + (ColorBg & 0x00FF00FF) * lut[1])) & 0xFF00FF00)
+    |  ((((ColorFg & 0x0000FF00) * lut[0] + (ColorBg & 0x0000FF00) * lut[1])) & 0x00FF0000)) >> 8);
+}
+#else
+// Alpha blending without lookup table.
+// Also works fast, but doesn't return the theoretically correct result.
+// It's "good enough", though.
+static tColor Multiply(tColor Color, uint8_t Alpha)
+{
+  tColor RB = (Color & 0x00FF00FF) * Alpha;
+  RB = ((RB + ((RB >> 8) & 0x00FF00FF) + 0x00800080) >> 8) & 0x00FF00FF;
+  tColor AG = ((Color >> 8) & 0x00FF00FF) * Alpha;
+  AG = ((AG + ((AG >> 8) & 0x00FF00FF) + 0x00800080)) & 0xFF00FF00;
+  return AG | RB;
+}
+
+tColor AlphaBlend(tColor ColorFg, tColor ColorBg, uint8_t AlphaLayer)
+{
+  tColor Alpha = (ColorFg & 0xFF000000) >> 24;
+  if (AlphaLayer < ALPHA_OPAQUE) {
+     Alpha *= AlphaLayer;
+     Alpha = ((Alpha + ((Alpha >> 8) & 0x000000FF) + 0x00000080) >> 8) & 0x000000FF;
+     }
+  return Multiply(ColorFg, Alpha) + Multiply(ColorBg, 255 - Alpha);
+}
+#endif
+
 // --- cPalette --------------------------------------------------------------
 
 cPalette::cPalette(int Bpp)
@@ -613,8 +698,6 @@ void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quad
 
 void cBitmap::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
-  // TODO This is just a quick and dirty implementation of a slope drawing
-  // machanism. If somebody can come up with a better solution, let's have it!
   if (!Intersects(x1, y1, x2, y2))
      return;
   bool upper    = Type & 0x01;
@@ -724,6 +807,756 @@ void cBitmap::ShrinkBpp(int NewBpp)
      }
 }
 
+cBitmap *cBitmap::Scale(double FactorX, double FactorY)
+{
+  // Fixed point scaling code based on www.inversereality.org/files/bitmapscaling.pdf
+  // by deltener@mindtremors.com
+  cBitmap *b = new cBitmap(int(round(Width() * FactorX)), int(round(Height() * FactorY)), Bpp(), X0(), Y0());
+  b->Replace(*this); // copy palette
+  int RatioX = (Width() << 16) / b->Width();
+  int RatioY = (Height() << 16) / b->Height();
+  tIndex *DestRow = b->bitmap;
+  int SourceY = 0;
+  for (int y = 0; y < b->Height(); y++) {
+      int SourceX = 0;
+      tIndex *SourceRow = bitmap + (SourceY >> 16) * Width();
+      tIndex *Dest = DestRow;
+      for (int x = 0; x < b->Width(); x++) {
+          *Dest++ = SourceRow[SourceX >> 16];
+          SourceX += RatioX;
+          }
+      SourceY += RatioY;
+      DestRow += b->Width();
+      }
+  return b;
+}
+
+// --- cRect -----------------------------------------------------------------
+
+const cRect cRect::Null;
+
+void cRect::Grow(int Dx, int Dy)
+{
+  point.Shift(-Dx, -Dy);
+  size.Grow(Dx, Dy);
+}
+
+bool cRect::Contains(const cPoint &Point) const
+{
+  return Left() <= Point.X() &&
+         Top() <= Point.Y() &&
+         Right() >= Point.X() &&
+         Bottom() >= Point.Y();
+}
+
+bool cRect::Contains(const cRect &Rect) const
+{
+  return Left() <= Rect.Left() &&
+         Top() <= Rect.Top() &&
+         Right() >= Rect.Right() &&
+         Bottom() >= Rect.Bottom();
+}
+
+bool cRect::Intersects(const cRect &Rect) const
+{
+  return !(Left() > Rect.Right() ||
+           Top() > Rect.Bottom() ||
+           Right() < Rect.Left() ||
+           Bottom() < Rect.Top());
+}
+
+cRect cRect::Intersected(const cRect &Rect) const
+{
+  cRect r;
+  if (!IsEmpty() && !Rect.IsEmpty()) {
+     r.SetLeft(max(Left(), Rect.Left()));
+     r.SetTop(max(Top(), Rect.Top()));
+     r.SetRight(min(Right(), Rect.Right()));
+     r.SetBottom(min(Bottom(), Rect.Bottom()));
+     }
+  return r;
+}
+
+void cRect::Combine(const cRect &Rect)
+{
+  if (IsEmpty())
+     *this = Rect;
+  if (Rect.IsEmpty())
+     return;
+  // must set right/bottom *before* top/left!
+  SetRight(max(Right(), Rect.Right()));
+  SetBottom(max(Bottom(), Rect.Bottom()));
+  SetLeft(min(Left(), Rect.Left()));
+  SetTop(min(Top(), Rect.Top()));
+}
+
+void cRect::Combine(const cPoint &Point)
+{
+  if (IsEmpty())
+     Set(Point.X(), Point.Y(), 1, 1);
+  // must set right/bottom *before* top/left!
+  SetRight(max(Right(), Point.X()));
+  SetBottom(max(Bottom(), Point.Y()));
+  SetLeft(min(Left(), Point.X()));
+  SetTop(min(Top(), Point.Y()));
+}
+
+// --- cPixmap ---------------------------------------------------------------
+
+cMutex cPixmap::mutex;
+
+cPixmap::cPixmap(void)
+{
+  layer = -1;
+  alpha = ALPHA_OPAQUE;
+  tile = false;
+}
+
+cPixmap::cPixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)
+{
+  layer = Layer;
+  if (layer >= MAXPIXMAPLAYERS) {
+     layer = MAXPIXMAPLAYERS - 1;
+     esyslog("ERROR: pixmap layer %d limited to %d", Layer, layer);
+     }
+  viewPort = ViewPort;
+  if (!DrawPort.IsEmpty())
+     drawPort = DrawPort;
+  else {
+     drawPort = viewPort;
+     drawPort.SetPoint(0, 0);
+     }
+  alpha = ALPHA_OPAQUE;
+  tile = false;
+}
+
+void cPixmap::MarkViewPortDirty(const cRect &Rect)
+{
+  dirtyViewPort.Combine(Rect.Intersected(viewPort));
+}
+
+void cPixmap::MarkViewPortDirty(const cPoint &Point)
+{
+  if (viewPort.Contains(Point))
+     dirtyViewPort.Combine(Point);
+}
+
+void cPixmap::MarkDrawPortDirty(const cRect &Rect)
+{
+  dirtyDrawPort.Combine(Rect.Intersected(drawPort));
+  if (tile)
+     MarkViewPortDirty(viewPort);
+  else
+     MarkViewPortDirty(Rect.Shifted(viewPort.Point()));
+}
+
+void cPixmap::MarkDrawPortDirty(const cPoint &Point)
+{
+  if (drawPort.Contains(Point)) {
+     dirtyDrawPort.Combine(Point);
+     if (tile)
+        MarkViewPortDirty(viewPort);
+     else
+        MarkViewPortDirty(Point.Shifted(viewPort.Point()));
+     }
+}
+
+void cPixmap::SetClean(void)
+{
+  dirtyViewPort = dirtyDrawPort = cRect();
+}
+
+void cPixmap::SetLayer(int Layer)
+{
+  Lock();
+  if (Layer >= MAXPIXMAPLAYERS) {
+     esyslog("ERROR: pixmap layer %d limited to %d", Layer, MAXPIXMAPLAYERS - 1);
+     Layer = MAXPIXMAPLAYERS - 1;
+     }
+  if (Layer != layer) {
+     if (Layer > 0 || layer > 0)
+        MarkViewPortDirty(viewPort);
+     layer = Layer;
+     }
+  Unlock();
+}
+
+void cPixmap::SetAlpha(int Alpha)
+{
+  Lock();
+  Alpha = min(max(Alpha, ALPHA_TRANSPARENT), ALPHA_OPAQUE);
+  if (Alpha != alpha) {
+     MarkViewPortDirty(viewPort);
+     alpha = Alpha;
+     }
+  Unlock();
+}
+
+void cPixmap::SetTile(bool Tile)
+{
+  Lock();
+  if (Tile != tile) {
+     if (drawPort.Point() != cPoint(0, 0) || drawPort.Width() < viewPort.Width() || drawPort.Height() < viewPort.Height())
+        MarkViewPortDirty(viewPort);
+     tile = Tile;
+     }
+  Unlock();
+}
+
+void cPixmap::SetViewPort(const cRect &Rect)
+{
+  Lock();
+  if (Rect != viewPort) {
+     if (tile)
+        MarkViewPortDirty(viewPort);
+     else
+        MarkViewPortDirty(drawPort.Shifted(viewPort.Point()));
+     viewPort = Rect;
+     if (tile)
+        MarkViewPortDirty(viewPort);
+     else
+        MarkViewPortDirty(drawPort.Shifted(viewPort.Point()));
+     }
+  Unlock();
+}
+
+void cPixmap::SetDrawPortPoint(const cPoint &Point, bool Dirty)
+{
+  Lock();
+  if (Point != drawPort.Point()) {
+     if (Dirty) {
+        if (tile)
+           MarkViewPortDirty(viewPort);
+        else
+           MarkViewPortDirty(drawPort.Shifted(viewPort.Point()));
+        }
+     drawPort.SetPoint(Point);
+     if (Dirty && !tile)
+        MarkViewPortDirty(drawPort.Shifted(viewPort.Point()));
+     }
+  Unlock();
+}
+
+// --- cImage ----------------------------------------------------------------
+
+cImage::cImage(void)
+{
+  data = NULL;
+}
+
+cImage::cImage(const cImage &Image)
+{
+  size = Image.Size();
+  int l = size.Width() * size.Height() * sizeof(tColor);
+  data = MALLOC(tColor, l);
+  memcpy(data, Image.Data(), l);
+}
+
+cImage::cImage(const cSize &Size, const tColor *Data)
+{
+  size = Size;
+  int l = size.Width() * size.Height() * sizeof(tColor);
+  data = MALLOC(tColor, l);
+  if (Data)
+     memcpy(data, Data, l);
+}
+
+cImage::~cImage()
+{
+  free(data);
+}
+
+void cImage::Clear(void)
+{
+  memset(data, 0x00, Width() * Height() * sizeof(tColor));
+}
+
+void cImage::Fill(tColor Color)
+{
+  for (int i = Width() * Height() - 1; i >= 0; i--)
+      data[i] = Color;
+}
+
+// --- cPixmapMemory ---------------------------------------------------------
+
+cPixmapMemory::cPixmapMemory(void)
+{
+  data = NULL;
+  panning = false;
+}
+
+cPixmapMemory::cPixmapMemory(int Layer, const cRect &ViewPort, const cRect &DrawPort)
+:cPixmap(Layer, ViewPort, DrawPort)
+{
+  data = MALLOC(tColor, this->DrawPort().Width() * this->DrawPort().Height());
+}
+
+cPixmapMemory::~cPixmapMemory()
+{
+  free(data);
+}
+
+void cPixmapMemory::Clear(void)
+{
+  Lock();
+  memset(data, 0x00, DrawPort().Width() * DrawPort().Height() * sizeof(tColor));
+  MarkDrawPortDirty(DrawPort());
+  Unlock();
+}
+
+void cPixmapMemory::Fill(tColor Color)
+{
+  Lock();
+  for (int i = DrawPort().Width() * DrawPort().Height() - 1; i >= 0; i--)
+      data[i] = Color;
+  MarkDrawPortDirty(DrawPort());
+  Unlock();
+}
+
+void cPixmap::DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty)
+{
+  if (Pixmap->Tile() && (Pixmap->DrawPort().Point() != cPoint(0, 0) || Pixmap->DrawPort().Size() < Pixmap->ViewPort().Size())) {
+     cPoint t0 = Pixmap->DrawPort().Point().Shifted(Pixmap->ViewPort().Point()); // the origin of the draw port in absolute OSD coordinates
+     // Find the top/leftmost location where the draw port touches the view port:
+     while (t0.X() > Pixmap->ViewPort().Left())
+           t0.Shift(-Pixmap->DrawPort().Width(), 0);
+     while (t0.Y() > Pixmap->ViewPort().Top())
+           t0.Shift(0, -Pixmap->DrawPort().Height());
+     cPoint t = t0;;
+     while (t.Y() <= Pixmap->ViewPort().Bottom()) {
+           while (t.X() <= Pixmap->ViewPort().Right()) {
+                 cRect Source = Pixmap->DrawPort(); // assume the entire pixmap needs to be rendered
+                 Source.Shift(Pixmap->ViewPort().Point()); // Source is now in absolute OSD coordinates
+                 cPoint Delta = Source.Point() - t;
+                 Source.SetPoint(t); // Source is now where the pixmap's data shall be drawn
+                 Source = Source.Intersected(Pixmap->ViewPort()); // Source is now limited to the pixmap's view port
+                 Source = Source.Intersected(Dirty); // Source is now limited to the actual dirty rectangle
+                 if (!Source.IsEmpty()) {
+                    cPoint Dest = Source.Point().Shifted(-ViewPort().Point()); // remember the destination point
+                    Source.Shift(Delta); // Source is now back at the pixmap's draw port location, still in absolute OSD coordinates
+                    Source.Shift(-Pixmap->ViewPort().Point()); // Source is now relative to the pixmap's view port again
+                    Source.Shift(-Pixmap->DrawPort().Point()); // Source is now relative to the pixmap's data
+                    if (Pixmap->Layer() == 0)
+                       Copy(Pixmap, Source, Dest); // this is the "background" pixmap
+                    else
+                       Render(Pixmap, Source, Dest); // all others are alpha blended over the background
+                    }
+                 t.Shift(Pixmap->DrawPort().Width(), 0); // increase one draw port width to the right
+                 }
+           t.SetX(t0.X()); // go back to the leftmost position
+           t.Shift(0, Pixmap->DrawPort().Height()); // increase one draw port height down
+           }
+     }
+  else {
+     cRect Source = Pixmap->DrawPort(); // assume the entire pixmap needs to be rendered
+     Source.Shift(Pixmap->ViewPort().Point()); // Source is now in absolute OSD coordinates
+     Source = Source.Intersected(Pixmap->ViewPort()); // Source is now limited to the pixmap's view port
+     Source = Source.Intersected(Dirty); // Source is now limited to the actual dirty rectangle
+     if (!Source.IsEmpty()) {
+        cPoint Dest = Source.Point().Shifted(-ViewPort().Point()); // remember the destination point
+        Source.Shift(-Pixmap->ViewPort().Point()); // Source is now relative to the pixmap's draw port again
+        Source.Shift(-Pixmap->DrawPort().Point()); // Source is now relative to the pixmap's data
+        if (Pixmap->Layer() == 0)
+           Copy(Pixmap, Source, Dest); // this is the "background" pixmap
+        else
+           Render(Pixmap, Source, Dest); // all others are alpha blended over the background
+        }
+     }
+}
+
+void cPixmapMemory::DrawImage(const cPoint &Point, const cImage &Image)
+{
+  Lock();
+  cRect r = cRect(Point, Image.Size()).Intersected(DrawPort().Size());
+  if (!r.IsEmpty()) {
+     int ws = Image.Size().Width();
+     int wd = DrawPort().Width();
+     int w = r.Width() * sizeof(tColor);
+     const tColor *ps = Image.Data();
+     if (Point.Y() < 0)
+        ps -= Point.Y() * ws;
+     if (Point.X() < 0)
+        ps -= Point.X();
+     tColor *pd = data + wd * r.Top() + r.Left();
+     for (int y = r.Height(); y-- > 0; ) {
+         memcpy(pd, ps, w);
+         ps += ws;
+         pd += wd;
+         }
+     MarkDrawPortDirty(r);
+     }
+  Unlock();
+}
+
+void cPixmapMemory::DrawImage(const cPoint &Point, int ImageHandle)
+{
+  Lock();
+  if (const cImage *Image = cOsdProvider::GetImageData(ImageHandle))
+     DrawImage(Point, *Image);
+  Unlock();
+}
+
+void cPixmapMemory::DrawPixel(const cPoint &Point, tColor Color)
+{
+  Lock();
+  if (DrawPort().Size().Contains(Point)) {
+     int p = Point.Y() * DrawPort().Width() + Point.X();
+     if (Layer() == 0 && !IS_OPAQUE(Color))
+        data[p] = AlphaBlend(Color, data[p]);
+     else
+        data[p] = Color;
+     MarkDrawPortDirty(Point);
+     }
+  Unlock();
+}
+
+void cPixmapMemory::DrawBitmap(const cPoint &Point, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool Overlay)
+{
+  Lock();
+  cRect r = cRect(Point, cSize(Bitmap.Width(), Bitmap.Height())).Intersected(DrawPort().Size());
+  if (!r.IsEmpty()) {
+     bool UseColors = ColorFg || ColorBg;
+     int wd = DrawPort().Width();
+     tColor *pd = data + wd * r.Top() + r.Left();
+     for (int y = r.Top(); y <= r.Bottom(); y++) {
+         tColor *cd = pd;
+         for (int x = r.Left(); x <= r.Right(); x++) {
+             tIndex Index = *Bitmap.Data(x - Point.X(), y - Point.Y());
+             if (Index || !Overlay) {
+                if (UseColors)
+                   *cd = Index ? ColorFg : ColorBg;
+                else
+                   *cd = Bitmap.Color(Index);
+                }
+             cd++;
+             }
+         pd += wd;
+         }
+     MarkDrawPortDirty(r);
+     }
+  Unlock();
+}
+
+void cPixmapMemory::DrawText(const cPoint &Point, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
+{
+  Lock();
+  int x = Point.X();
+  int y = Point.Y();
+  int w = Font->Width(s);
+  int h = Font->Height();
+  int limit = 0;
+  int cw = Width ? Width : w;
+  int ch = Height ? Height : h;
+  cRect r(x, y, cw, ch);
+  if (ColorBg != clrTransparent)
+     DrawRectangle(r, ColorBg);
+  if (Width || Height) {
+     limit = x + cw;
+     if (Width) {
+        if ((Alignment & taLeft) != 0)
+           ;
+        else if ((Alignment & taRight) != 0) {
+           if (w < Width)
+              x += Width - w;
+           }
+        else { // taCentered
+           if (w < Width)
+              x += (Width - w) / 2;
+           }
+        }
+     if (Height) {
+        if ((Alignment & taTop) != 0)
+           ;
+        else if ((Alignment & taBottom) != 0) {
+           if (h < Height)
+              y += Height - h;
+           }
+        else { // taCentered
+           if (h < Height)
+              y += (Height - h) / 2;
+           }
+        }
+     }
+  Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
+  MarkDrawPortDirty(r);
+  Unlock();
+}
+
+void cPixmapMemory::DrawRectangle(const cRect &Rect, tColor Color)
+{
+  Lock();
+  cRect r = Rect.Intersected(DrawPort().Size());
+  if (!r.IsEmpty()) {
+     int wd = DrawPort().Width();
+     int w = r.Width() * sizeof(tColor);
+     tColor *ps = NULL;
+     tColor *pd = data + wd * r.Top() + r.Left();
+     for (int y = r.Height(); y-- > 0; ) {
+         if (ps)
+            memcpy(pd, ps, w); // all other lines are copied fast from the first one
+         else {
+            // explicitly fill the first line:
+            tColor *cd = ps = pd;
+            for (int x = r.Width(); x-- > 0; ) {
+                *cd = Color;
+                cd++;
+                }
+            }
+         pd += wd;
+         }
+     MarkDrawPortDirty(r);
+     }
+  Unlock();
+}
+
+void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
+{
+//TODO use anti-aliasing?
+//TODO fix alignment
+  Lock();
+  // Algorithm based on http://homepage.smc.edu/kennedy_john/BELIPSE.PDF
+  int x1 = Rect.Left();
+  int y1 = Rect.Top();
+  int x2 = Rect.Right();
+  int y2 = Rect.Bottom();
+  int rx = x2 - x1;
+  int ry = y2 - y1;
+  int cx = (x1 + x2) / 2;
+  int cy = (y1 + y2) / 2;
+  switch (abs(Quadrants)) {
+    case 0: rx /= 2; ry /= 2; break;
+    case 1: cx = x1; cy = y2; break;
+    case 2: cx = x2; cy = y2; break;
+    case 3: cx = x2; cy = y1; break;
+    case 4: cx = x1; cy = y1; break;
+    case 5: cx = x1;          ry /= 2; break;
+    case 6:          cy = y2; rx /= 2; break;
+    case 7: cx = x2;          ry /= 2; break;
+    case 8:          cy = y1; rx /= 2; break;
+    default: ;
+    }
+  int TwoASquare = 2 * rx * rx;
+  int TwoBSquare = 2 * ry * ry;
+  int x = rx;
+  int y = 0;
+  int XChange = ry * ry * (1 - 2 * rx);
+  int YChange = rx * rx;
+  int EllipseError = 0;
+  int StoppingX = TwoBSquare * rx;
+  int StoppingY = 0;
+  while (StoppingX >= StoppingY) {
+        switch (Quadrants) {
+          case  5: DrawRectangle(cRect(cx,     cy + y, x + 1, 1), Color); // no break
+          case  1: DrawRectangle(cRect(cx,     cy - y, x + 1, 1), Color); break;
+          case  7: DrawRectangle(cRect(cx - x, cy + y, x + 1, 1), Color); // no break
+          case  2: DrawRectangle(cRect(cx - x, cy - y, x + 1, 1), Color); break;
+          case  3: DrawRectangle(cRect(cx - x, cy + y, x + 1, 1), Color); break;
+          case  4: DrawRectangle(cRect(cx,     cy + y, x + 1, 1), Color); break;
+          case  0:
+          case  6: DrawRectangle(cRect(cx - x, cy - y, 2 * x + 1,       1), Color); if (Quadrants == 6) break;
+          case  8: DrawRectangle(cRect(cx - x, cy + y, 2 * x + 1,       1), Color); break;
+          case -1: DrawRectangle(cRect(cx + x, cy - y, x2 - x + 1,      1), Color); break;
+          case -2: DrawRectangle(cRect(x1,     cy - y, cx - x - x1 + 1, 1), Color); break;
+          case -3: DrawRectangle(cRect(x1,     cy + y, cx - x - x1 + 1, 1), Color); break;
+          case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1,      1), Color); break;
+          default: ;
+          }
+        y++;
+        StoppingY += TwoASquare;
+        EllipseError += YChange;
+        YChange += TwoASquare;
+        if (2 * EllipseError + XChange > 0) {
+           x--;
+           StoppingX -= TwoBSquare;
+           EllipseError += XChange;
+           XChange += TwoBSquare;
+           }
+        }
+  x = 0;
+  y = ry;
+  XChange = ry * ry;
+  YChange = rx * rx * (1 - 2 * ry);
+  EllipseError = 0;
+  StoppingX = 0;
+  StoppingY = TwoASquare * ry;
+  while (StoppingX <= StoppingY) {
+        switch (Quadrants) {
+          case  5: DrawRectangle(cRect(cx,     cy + y, x + 1, 1), Color); // no break
+          case  1: DrawRectangle(cRect(cx,     cy - y, x + 1, 1), Color); break;
+          case  7: DrawRectangle(cRect(cx - x, cy + y, x + 1, 1), Color); // no break
+          case  2: DrawRectangle(cRect(cx - x, cy - y, x + 1, 1), Color); break;
+          case  3: DrawRectangle(cRect(cx - x, cy + y, x + 1, 1), Color); break;
+          case  4: DrawRectangle(cRect(cx,     cy + y, x + 1, 1), Color); break;
+          case  0:
+          case  6: DrawRectangle(cRect(cx - x, cy - y, 2 * x + 1,       1), Color); if (Quadrants == 6) break;
+          case  8: DrawRectangle(cRect(cx - x, cy + y, 2 * x + 1,       1), Color); break;
+          case -1: DrawRectangle(cRect(cx + x, cy - y, x2 - x + 1,      1), Color); break;
+          case -2: DrawRectangle(cRect(x1,     cy - y, cx - x - x1 + 1, 1), Color); break;
+          case -3: DrawRectangle(cRect(x1,     cy + y, cx - x - x1 + 1, 1), Color); break;
+          case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1,      1), Color); break;
+          }
+        x++;
+        StoppingX += TwoBSquare;
+        EllipseError += XChange;
+        XChange += TwoBSquare;
+        if (2 * EllipseError + YChange > 0) {
+           y--;
+           StoppingY -= TwoASquare;
+           EllipseError += YChange;
+           YChange += TwoASquare;
+           }
+        }
+  MarkDrawPortDirty(Rect);
+  Unlock();
+}
+
+void cPixmapMemory::DrawSlope(const cRect &Rect, tColor Color, int Type)
+{
+  //TODO anti-aliasing?
+  //TODO also simplify cBitmap::DrawSlope()
+  Lock();
+  bool upper    = Type & 0x01;
+  bool falling  = Type & 0x02;
+  bool vertical = Type & 0x04;
+  int x1 = Rect.Left();
+  int y1 = Rect.Top();
+  int x2 = Rect.Right();
+  int y2 = Rect.Bottom();
+  int w  = Rect.Width();
+  int h  = Rect.Height();
+  if (vertical) {
+     for (int y = y1; y <= y2; y++) {
+         double c = cos((y - y1) * M_PI / h);
+         if (falling)
+            c = -c;
+         int x = (x1 + x2) / 2 + int(w * c / 2);
+         if (upper && !falling || !upper && falling)
+            DrawRectangle(cRect(x1, y, x - x1 + 1, 1), Color);
+         else
+            DrawRectangle(cRect(x, y, x2 - x + 1, 1), Color);
+         }
+     }
+  else {
+     for (int x = x1; x <= x2; x++) {
+         double c = cos((x - x1) * M_PI / w);
+         if (falling)
+            c = -c;
+         int y = (y1 + y2) / 2 + int(h * c / 2);
+         if (upper)
+            DrawRectangle(cRect(x, y1, 1, y - y1 + 1), Color);
+         else
+            DrawRectangle(cRect(x, y, 1, y2 - y + 1), Color);
+         }
+     }
+  MarkDrawPortDirty(Rect);
+  Unlock();
+}
+
+void cPixmapMemory::Render(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest)
+{
+  Lock();
+  if (Pixmap->Alpha() != ALPHA_TRANSPARENT) {
+     if (const cPixmapMemory *pm = dynamic_cast<const cPixmapMemory *>(Pixmap)) {
+        cRect s = Source.Intersected(Pixmap->DrawPort().Size());
+        if (!s.IsEmpty()) {
+           cPoint v = Dest - Source.Point();
+           cRect d = s.Shifted(v).Intersected(DrawPort().Size());
+           if (!d.IsEmpty()) {
+              s = d.Shifted(-v);
+              int a = pm->Alpha();
+              int ws = pm->DrawPort().Width();
+              int wd = DrawPort().Width();
+              const tColor *ps = pm->data + ws * s.Top() + s.Left();
+              tColor *pd = data + wd * d.Top() + d.Left();
+              for (int y = d.Height(); y-- > 0; ) {
+                  const tColor *cs = ps;
+                  tColor *cd = pd;
+                  for (int x = d.Width(); x-- > 0; ) {
+                      *cd = AlphaBlend(*cs, *cd, a);
+                      cs++;
+                      cd++;
+                      }
+                  ps += ws;
+                  pd += wd;
+                  }
+              MarkDrawPortDirty(d);
+              }
+           }
+        }
+     }
+  Unlock();
+}
+
+void cPixmapMemory::Copy(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest)
+{
+  Lock();
+  if (const cPixmapMemory *pm = dynamic_cast<const cPixmapMemory *>(Pixmap)) {
+     cRect s = Source.Intersected(pm->DrawPort().Size());
+     if (!s.IsEmpty()) {
+        cPoint v = Dest - Source.Point();
+        cRect d = s.Shifted(v).Intersected(DrawPort().Size());
+        if (!d.IsEmpty()) {
+           s = d.Shifted(-v);
+           int ws = pm->DrawPort().Width();
+           int wd = DrawPort().Width();
+           int w = d.Width() * sizeof(tColor);
+           const tColor *ps = pm->data + ws * s.Top() + s.Left();
+           tColor *pd = data + wd * d.Top() + d.Left();
+           for (int y = d.Height(); y-- > 0; ) {
+               memcpy(pd, ps, w);
+               ps += ws;
+               pd += wd;
+               }
+           MarkDrawPortDirty(d);
+           }
+        }
+     }
+  Unlock();
+}
+
+void cPixmapMemory::Scroll(const cPoint &Dest, const cRect &Source)
+{
+  Lock();
+  cRect s;
+  if (&Source == &cRect::Null)
+     s = DrawPort().Shifted(-DrawPort().Point());
+  else
+     s = Source.Intersected(DrawPort().Size());
+  if (!s.IsEmpty()) {
+     cPoint v = Dest - Source.Point();
+     cRect d = s.Shifted(v).Intersected(DrawPort().Size());
+     if (!d.IsEmpty()) {
+        s = d.Shifted(-v);
+        if (d.Point() != s.Point()) {
+           int ws = DrawPort().Width();
+           int wd = ws;
+           int w = d.Width() * sizeof(tColor);
+           const tColor *ps = data + ws * s.Top() + s.Left();
+           tColor *pd = data + wd * d.Top() + d.Left();
+           for (int y = d.Height(); y-- > 0; ) {
+               memmove(pd, ps, w); // source and destination might overlap!
+               ps += ws;
+               pd += wd;
+               }
+           if (panning)
+              SetDrawPortPoint(DrawPort().Point().Shifted(s.Point() - d.Point()), false);
+           else
+              MarkDrawPortDirty(d);
+           }
+        }
+     }
+  Unlock();
+}
+
+void cPixmapMemory::Pan(const cPoint &Dest, const cRect &Source)
+{
+  Lock();
+  panning = true;
+  Scroll(Dest, Source);
+  panning = false;
+  Unlock();
+}
+
 // --- cOsd ------------------------------------------------------------------
 
 static const char *OsdErrorTexts[] = {
@@ -746,8 +1579,11 @@ cVector<cOsd *> cOsd::Osds;
 
 cOsd::cOsd(int Left, int Top, uint Level)
 {
-  savedRegion = NULL;
+  isTrueColor = false;
+  savedBitmap = NULL;
   numBitmaps = 0;
+  savedPixmap = NULL;
+  numPixmaps = 0;
   left = Left;
   top = Top;
   width = height = 0;
@@ -766,7 +1602,10 @@ cOsd::~cOsd()
 {
   for (int i = 0; i < numBitmaps; i++)
       delete bitmaps[i];
-  delete savedRegion;
+  delete savedBitmap;
+  delete savedPixmap;
+  for (int i = 0; i < numPixmaps; i++)
+      delete pixmaps[i];
   for (int i = 0; i < Osds.Size(); i++) {
       if (Osds[i] == this) {
          Osds.Remove(i);
@@ -787,15 +1626,108 @@ void cOsd::SetOsdPosition(int Left, int Top, int Width, int Height)
 
 void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
 {
+  if (isTrueColor)
+     return;
   for (int i = 0; i < numBitmaps; i++)
       bitmaps[i]->SetAntiAliasGranularity(FixedColors, BlendColors);
 }
 
 cBitmap *cOsd::GetBitmap(int Area)
 {
+  if (isTrueColor)
+     Area = 0; // returns the dummy bitmap
   return Area < numBitmaps ? bitmaps[Area] : NULL;
 }
 
+cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)
+{
+  if (isTrueColor) {
+     LOCK_PIXMAPS;
+     cPixmap *Pixmap = new cPixmapMemory(Layer, ViewPort, DrawPort);
+     if (AddPixmap(Pixmap))
+        return Pixmap;
+     delete Pixmap;
+     }
+  return NULL;
+}
+
+void cOsd::DestroyPixmap(cPixmap *Pixmap)
+{
+  if (isTrueColor) {
+     LOCK_PIXMAPS;
+     for (int i = 1; i < numPixmaps; i++) { // begin at 1 - don't let the background pixmap be destroyed!
+         if (pixmaps[i] == Pixmap) {
+            pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort());
+            delete Pixmap;
+            while (i < numPixmaps - 1) {
+                  pixmaps[i] = pixmaps[i + 1];
+                  i++;
+                  }
+            numPixmaps--;
+            return;
+            }
+         }
+     esyslog("ERROR: attempt to destroy an unregistered pixmap");
+     }
+}
+
+cPixmap *cOsd::AddPixmap(cPixmap *Pixmap)
+{
+  LOCK_PIXMAPS;
+  if (numPixmaps < MAXOSDPIXMAPS)
+     return pixmaps[numPixmaps++] = Pixmap;
+  else
+     esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS);
+  return NULL;
+}
+
+cPixmapMemory *cOsd::RenderPixmaps(void)
+{
+  cPixmapMemory *Pixmap = NULL;
+  if (isTrueColor) {
+     LOCK_PIXMAPS;
+     // Collect overlapping dirty rectangles:
+     cRect d;
+     for (int i = 0; i < numPixmaps; i++) {
+         cPixmap *pm = pixmaps[i];
+         if (!pm->DirtyViewPort().IsEmpty()) {
+            if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) {
+               d.Combine(pm->DirtyViewPort());
+               pm->SetClean();
+               }
+            }
+         }
+     if (!d.IsEmpty()) {
+//#define DebugDirty
+#ifdef DebugDirty
+        static cRect OldDirty;
+        cRect NewDirty = d;
+        d.Combine(OldDirty);
+        OldDirty = NewDirty;
+#endif
+        Pixmap = new cPixmapMemory(0, d);
+        Pixmap->Clear();
+        // Render the individual pixmaps into the resulting pixmap:
+        for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) {
+            for (int i = 0; i < numPixmaps; i++) {
+                cPixmap *pm = pixmaps[i];
+                if (pm->Layer() == Layer)
+                   Pixmap->DrawPixmap(pm, d);
+                }
+            }
+#ifdef DebugDirty
+        cPixmapMemory DirtyIndicator(7, NewDirty);
+        static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF };
+        static int DirtyIndicatorIndex = 0;
+        DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]);
+        DirtyIndicatorIndex = 1 - DirtyIndicatorIndex;
+        Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point()));
+#endif
+        }
+     }
+  return Pixmap;
+}
+
 eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
   if (NumAreas > MAXOSDAREAS)
@@ -810,6 +1742,10 @@ eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
              break;
              }
           }
+      if (Areas[i].bpp == 32) {
+         if (NumAreas > 1)
+            return oeTooManyAreas;
+         }
       }
   return Result;
 }
@@ -821,11 +1757,21 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
      while (numBitmaps)
            delete bitmaps[--numBitmaps];
      width = height = 0;
-     for (int i = 0; i < NumAreas; i++) {
-         bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
-         width = max(width, Areas[i].x2 + 1);
-         height = max(height, Areas[i].y2 + 1);
-         }
+     isTrueColor = NumAreas == 1 && Areas[0].bpp == 32;
+     if (isTrueColor) {
+        width = Areas[0].x2 - Areas[0].x1 + 1;
+        height = Areas[0].y2 - Areas[0].y1 + 1;
+        cPixmap *Pixmap = CreatePixmap(0, cRect(Areas[0].x1, Areas[0].y1, width, height));
+        Pixmap->Clear();
+        bitmaps[numBitmaps++] = new cBitmap(10, 10, 8); // dummy bitmap for GetBitmap()
+        }
+     else {
+        for (int i = 0; i < NumAreas; i++) {
+            bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
+            width = max(width, Areas[i].x2 + 1);
+            height = max(height, Areas[i].y2 + 1);
+            }
+        }
      }
   else
      esyslog("ERROR: cOsd::SetAreas returned %d (%s)", Result, Result < oeUnknown ? OsdErrorTexts[Result] : OsdErrorTexts[oeUnknown]);
@@ -834,62 +1780,119 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
 
 void cOsd::SaveRegion(int x1, int y1, int x2, int y2)
 {
-  delete savedRegion;
-  savedRegion = new cBitmap(x2 - x1 + 1, y2 - y1 + 1, 8, x1, y1);
-  for (int i = 0; i < numBitmaps; i++)
-      savedRegion->DrawBitmap(bitmaps[i]->X0(), bitmaps[i]->Y0(), *bitmaps[i]);
+  if (isTrueColor) {
+     delete savedPixmap;
+     cRect r(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+     savedPixmap = new cPixmapMemory(0, r);
+     savedPixmap->Copy(pixmaps[0], r, cPoint(0, 0));
+     }
+  else {
+     delete savedBitmap;
+     savedBitmap = new cBitmap(x2 - x1 + 1, y2 - y1 + 1, 8, x1, y1);
+     for (int i = 0; i < numBitmaps; i++)
+         savedBitmap->DrawBitmap(bitmaps[i]->X0(), bitmaps[i]->Y0(), *bitmaps[i]);
+     }
 }
 
 void cOsd::RestoreRegion(void)
 {
-  if (savedRegion) {
-     DrawBitmap(savedRegion->X0(), savedRegion->Y0(), *savedRegion);
-     delete savedRegion;
-     savedRegion = NULL;
+  if (isTrueColor) {
+     if (savedPixmap) {
+        pixmaps[0]->Copy(savedPixmap, savedPixmap->DrawPort(), savedPixmap->ViewPort().Point());
+        delete savedPixmap;
+        savedPixmap = NULL;
+        }
+     }
+  else {
+     if (savedBitmap) {
+        DrawBitmap(savedBitmap->X0(), savedBitmap->Y0(), *savedBitmap);
+        delete savedBitmap;
+        savedBitmap = NULL;
+        }
      }
 }
 
 eOsdError cOsd::SetPalette(const cPalette &Palette, int Area)
 {
-  if (Area < numBitmaps)
+  if (isTrueColor)
+     return oeOk;
+  if (Area < numBitmaps) {
      bitmaps[Area]->Take(Palette);
+     return oeOk;
+     }
   return oeUnknown;
 }
 
+void cOsd::DrawImage(const cPoint &Point, const cImage &Image)
+{
+  if (isTrueColor)
+     pixmaps[0]->DrawImage(Point, Image);
+}
+
+void cOsd::DrawImage(const cPoint &Point, int ImageHandle)
+{
+  if (isTrueColor)
+     pixmaps[0]->DrawImage(Point, ImageHandle);
+}
+
 void cOsd::DrawPixel(int x, int y, tColor Color)
 {
-  for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawPixel(x, y, Color);
+  if (isTrueColor)
+     pixmaps[0]->DrawPixel(cPoint(x, y), Color);
+  else {
+     for (int i = 0; i < numBitmaps; i++)
+         bitmaps[i]->DrawPixel(x, y, Color);
+     }
 }
 
 void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
 {
-  for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette, Overlay);
+  if (isTrueColor)
+     pixmaps[0]->DrawBitmap(cPoint(x, y), Bitmap, ColorFg, ColorBg, Overlay);
+  else {
+     for (int i = 0; i < numBitmaps; i++)
+         bitmaps[i]->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette, Overlay);
+     }
 }
 
 void cOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
 {
-  for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawText(x, y, s, ColorFg, ColorBg, Font, Width, Height, Alignment);
+  if (isTrueColor)
+     pixmaps[0]->DrawText(cPoint(x, y), s, ColorFg, ColorBg, Font, Width, Height, Alignment);
+  else {
+     for (int i = 0; i < numBitmaps; i++)
+         bitmaps[i]->DrawText(x, y, s, ColorFg, ColorBg, Font, Width, Height, Alignment);
+     }
 }
 
 void cOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
 {
-  for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawRectangle(x1, y1, x2, y2, Color);
+  if (isTrueColor)
+     pixmaps[0]->DrawRectangle(cRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1), Color);
+  else {
+     for (int i = 0; i < numBitmaps; i++)
+         bitmaps[i]->DrawRectangle(x1, y1, x2, y2, Color);
+     }
 }
 
 void cOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
 {
-  for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawEllipse(x1, y1, x2, y2, Color, Quadrants);
+  if (isTrueColor)
+     pixmaps[0]->DrawEllipse(cRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1), Color, Quadrants);
+  else {
+     for (int i = 0; i < numBitmaps; i++)
+         bitmaps[i]->DrawEllipse(x1, y1, x2, y2, Color, Quadrants);
+     }
 }
 
 void cOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
-  for (int i = 0; i < numBitmaps; i++)
-      bitmaps[i]->DrawSlope(x1, y1, x2, y2, Color, Type);
+  if (isTrueColor)
+     pixmaps[0]->DrawSlope(cRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1), Color, Type);
+  else {
+     for (int i = 0; i < numBitmaps; i++)
+         bitmaps[i]->DrawSlope(x1, y1, x2, y2, Color, Type);
+     }
 }
 
 void cOsd::Flush(void)
@@ -902,6 +1905,7 @@ cOsdProvider *cOsdProvider::osdProvider = NULL;
 int cOsdProvider::oldWidth = 0;
 int cOsdProvider::oldHeight = 0;
 double cOsdProvider::oldAspect = 1.0;
+cImage *cOsdProvider::images[MAXOSDIMAGES] = { NULL };
 
 cOsdProvider::cOsdProvider(void)
 {
@@ -958,6 +1962,58 @@ void cOsdProvider::UpdateOsdSize(bool Force)
      }
 }
 
+bool cOsdProvider::SupportsTrueColor(void)
+{
+  if (osdProvider) {
+     return osdProvider->ProvidesTrueColor();
+     }
+  else
+     esyslog("ERROR: no OSD provider available in call to SupportsTrueColor()");
+  return false;
+}
+
+int cOsdProvider::StoreImageData(const cImage &Image)
+{
+  LOCK_PIXMAPS;
+  for (int i = 1; i < MAXOSDIMAGES; i++) {
+      if (!images[i]) {
+         images[i] = new cImage(Image);
+         return i;
+         }
+      }
+  return 0;
+}
+
+void cOsdProvider::DropImageData(int ImageHandle)
+{
+  LOCK_PIXMAPS;
+  if (0 < ImageHandle && ImageHandle < MAXOSDIMAGES) {
+     delete images[ImageHandle];
+     images[ImageHandle] = NULL;
+     }
+}
+
+const cImage *cOsdProvider::GetImageData(int ImageHandle)
+{
+  LOCK_PIXMAPS;
+  if (0 < ImageHandle && ImageHandle < MAXOSDIMAGES)
+     return images[ImageHandle];
+  return NULL;
+}
+
+int cOsdProvider::StoreImage(const cImage &Image)
+{
+  if (osdProvider)
+     return osdProvider->StoreImageData(Image);
+  return -1;
+}
+
+void cOsdProvider::DropImage(int ImageHandle)
+{
+  if (osdProvider)
+     osdProvider->DropImageData(ImageHandle);
+}
+
 void cOsdProvider::Shutdown(void)
 {
   delete osdProvider;
diff --git a/osd.h b/osd.h
index aa8a35ab1..ebd279793 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.5 2010/01/17 13:23:50 kls Exp $
+ * $Id: osd.h 2.11 2011/03/12 16:06:48 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -15,12 +15,16 @@
 #include <stdint.h>
 #include "config.h"
 #include "font.h"
+#include "thread.h"
 #include "tools.h"
 
 #define OSD_LEVEL_DEFAULT     0
 #define OSD_LEVEL_SUBTITLES  10
 
 #define MAXNUMCOLORS 256
+#define ALPHA_TRANSPARENT  0x00
+#define ALPHA_OPAQUE       0xFF
+#define IS_OPAQUE(c)       ((c >> 24) == ALPHA_OPAQUE)
 
 enum {
                    //AARRGGBB
@@ -50,6 +54,28 @@ enum eOsdError { oeOk, // see also OsdErrorTexts in osd.c
 typedef uint32_t tColor; // see also font.h
 typedef uint8_t tIndex;
 
+inline tColor ArgbToColor(uint8_t A, uint8_t R, uint8_t G, uint8_t B)
+{
+  return (tColor(A) << 24) | (tColor(R) << 16) | (tColor(G) << 8) | B;
+}
+
+inline tColor RgbToColor(uint8_t R, uint8_t G, uint8_t B)
+{
+  return (tColor(R) << 16) | (tColor(G) << 8) | B;
+}
+
+inline tColor RgbToColor(double R, double G, double B)
+{
+  return RgbToColor(uint8_t(0xFF * R), uint8_t(0xFF * G), uint8_t(0xFF * B));
+}
+
+tColor HsvToColor(double H, double S, double V);
+   ///< Converts the given Hue (0..360), Saturation (0..1) and Value (0..1)
+   ///< to an RGB tColor value. The alpha value of the result is 0x00, so
+   ///< the caller may need to set it accordingly.
+
+tColor AlphaBlend(tColor ColorFg, tColor ColorBg, uint8_t AlphaLayer = ALPHA_OPAQUE);
+
 class cPalette {
 private:
   tColor color[MAXNUMCOLORS];
@@ -247,6 +273,9 @@ class cBitmap : public cPalette {
        ///< the 2^NewBpp most frequently used colors as defined in the current palette.
        ///< If NewBpp is not smaller than the bitmap's current color depth,
        ///< or if it is not one of 4bpp or 2bpp, nothing happens.
+  cBitmap *Scale(double FactorX, double FactorY);
+       ///< Creates a copy of this bitmap, scaled by the given factors.
+       ///< The caller must delete the returned bitmap once it is no longer used.
   };
 
 struct tArea {
@@ -257,16 +286,433 @@ struct tArea {
   bool Intersects(const tArea &Area) const { return !(x2 < Area.x1 || x1 > Area.x2 || y2 < Area.y1 || y1 > Area.y2); }
   };
 
+class cPoint {
+private:
+  int x;
+  int y;
+public:
+  cPoint(void) { x = y = 0; }
+  cPoint(int X, int Y) { x = X; y = Y; }
+  cPoint(const cPoint &Point) { x = Point.X(); y = Point.Y(); }
+  bool operator==(const cPoint &Point) const { return x == Point.X() && y == Point.Y(); }
+  bool operator!=(const cPoint &Point) const { return !(*this == Point); }
+  cPoint operator-(void) const { return cPoint(-x, -y); }
+  cPoint operator-(const cPoint &Point) const { return cPoint(x - Point.X(), y - Point.Y()); }
+  int X(void) const { return x; }
+  int Y(void) const { return y; }
+  void SetX(int X) { x = X; }
+  void SetY(int Y) { y = Y; }
+  void Set(int X, int Y) { x = X; y = Y; }
+  void Set(const cPoint &Point) { x = Point.X(); y = Point.Y(); }
+  void Shift(int Dx, int Dy) { x += Dx; y += Dy; }
+  void Shift(const cPoint &Dp) { x += Dp.X(); y += Dp.Y(); }
+  cPoint Shifted(int Dx, int Dy) const { cPoint p(*this); p.Shift(Dx, Dy); return p; }
+  cPoint Shifted(const cPoint &Dp) const { cPoint p(*this); p.Shift(Dp); return p; }
+  };
+
+class cSize {
+private:
+  int width;
+  int height;
+public:
+  cSize(void) { width = height = 0; }
+  cSize(int Width, int Height) { width = Width; height = Height; }
+  cSize(const cSize &Size) { width = Size.Width(); height = Size.Height(); }
+  bool operator==(const cSize &Size) const { return width == Size.Width() && height == Size.Height(); }
+  bool operator!=(const cSize &Size) const { return !(*this == Size); }
+  bool operator<(const cSize &Size) const { return width < Size.Width() && height < Size.Height(); }
+  int Width(void) const { return width; }
+  int Height(void) const { return height; }
+  void SetWidth(int Width) { width = Width; }
+  void SetHeight(int Height) { height = Height; }
+  void Set(int Width, int Height) { width = Width; height = Height; }
+  void Set(const cSize &Size) { width = Size.Width(); height = Size.Height(); }
+  bool Contains(const cPoint &Point) const { return 0 <= Point.X() && 0 <= Point.Y() && Point.X() < width && Point.Y() < height; }
+  void Grow(int Dw, int Dh) { width += 2 * Dw; height += 2 * Dh; }
+  cSize Grown(int Dw, int Dh) const { cSize s(*this); s.Grow(Dw, Dh); return s; }
+  };
+
+class cRect {
+private:
+  cPoint point;
+  cSize size;
+public:
+  static const cRect Null;
+  cRect(void): point(0, 0), size(0, 0) {}
+  cRect(int X, int Y, int Width, int Height): point(X, Y), size(Width, Height) {}
+  cRect(const cPoint &Point, const cSize &Size): point(Point), size(Size) {}
+  cRect(const cSize &Size): point(0, 0), size(Size) {}
+  cRect(const cRect &Rect): point(Rect.Point()), size(Rect.Size()) {}
+  bool operator==(const cRect &Rect) const { return point == Rect.Point() && size == Rect.Size(); }
+  bool operator!=(const cRect &Rect) const { return !(*this == Rect); }
+  int X(void) const { return point.X(); }
+  int Y(void) const { return point.Y(); }
+  int Width(void) const { return size.Width(); }
+  int Height(void) const { return size.Height(); }
+  int Left(void) const { return X(); }
+  int Top(void) const { return Y(); }
+  int Right(void) const { return X() + Width() - 1; }
+  int Bottom(void) const { return Y() + Height() - 1; }
+  const cPoint &Point(void) const { return point; }
+  const cSize &Size(void) const { return size; }
+  void Set(int X, int Y, int Width, int Height) { point.Set(X, Y); size.Set(Width, Height); }
+  void Set(cPoint Point, cSize Size) { point.Set(Point); size.Set(Size); }
+  void SetPoint(int X, int Y) { point.Set(X, Y); }
+  void SetPoint(const cPoint &Point) { point.Set(Point); }
+  void SetSize(int Width, int Height) { size.Set(Width, Height); }
+  void SetSize(const cSize &Size) { size.Set(Size); }
+  void SetX(int X) { point.SetX(X); }
+  void SetY(int Y) { point.SetY(Y); }
+  void SetWidth(int Width) { size.SetWidth(Width); }
+  void SetHeight(int Height) { size.SetHeight(Height); }
+  void SetLeft(int Left) { SetWidth(Width() + X() - Left); SetX(Left); }
+  void SetTop(int Top) { SetHeight(Height() + Y() - Top); SetY(Top); }
+  void SetRight(int Right) { SetWidth(Right - X() + 1); }
+  void SetBottom(int Bottom) { SetHeight(Bottom - Y() + 1); }
+  void Shift(int Dx, int Dy) { point.Shift(Dx, Dy); }
+  void Shift(const cPoint &Dp) { point.Shift(Dp); }
+  cRect Shifted(int Dx, int Dy) const { cRect r(*this); r.Shift(Dx, Dy); return r; }
+  cRect Shifted(const cPoint &Dp) const { cRect r(*this); r.Shift(Dp); return r; }
+  void Grow(int Dx, int Dy);
+       ///< Grows the rectangle by the given number of pixels in either direction.
+       ///< A negative value will shrink the rectangle.
+  cRect Grown(int Dw, int Dh) const { cRect r(*this); r.Grow(Dw, Dh); return r; }
+  bool Contains(const cPoint &Point) const;
+       ///< Returns true if this rectangle contains Point.
+  bool Contains(const cRect &Rect) const;
+       ///< Returns true if this rectangle completely contains Rect.
+  bool Intersects(const cRect &Rect) const;
+       ///< Returns true if this rectangle intersects with Rect.
+  cRect Intersected(const cRect &Rect) const;
+       ///< Returns the intersection of this rectangle and the given Rect.
+  void Combine(const cRect &Rect);
+       ///< Combines this rectangle with the given Rect.
+  cRect Combined(const cRect &Rect) const { cRect r(*this); r.Combine(Rect); return r; }
+       ///< Returns the surrounding rectangle that contains this rectangle and the
+       ///< given Rect.
+  void Combine(const cPoint &Point);
+       ///< Combines this rectangle with the given Point.
+  cRect Combined(const cPoint &Point) const { cRect r(*this); r.Combine(Point); return r; }
+       ///< Returns the surrounding rectangle that contains this rectangle and the
+       ///< given Point.
+  bool IsEmpty(void) const { return Width() <= 0 || Height() <= 0; }
+       ///< Returns true if this rectangle is empty.
+  };
+
+class cImage {
+private:
+  cSize size;
+  tColor *data;
+public:
+  cImage(void);
+  cImage(const cImage &Image);
+  cImage(const cSize &Size, const tColor *Data = NULL);
+       ///< Creates an image with the given Size and allocates the necessary memory
+       ///< to copy the pixels pointed to by Data, which is a sequence of
+       ///< (Size.Width() * Size.Height()) tColor values.
+       ///< If Data is NULL, the allocated memory is not initialized.
+       ///< The alpha value of the Image's pixels is taken into account, so it has to be
+       ///< greater than 0 for the image to be visible.
+  virtual ~cImage();
+  const cSize &Size(void) const { return size; }
+  int Width(void) const { return size.Width(); }
+  int Height(void) const { return size.Height(); }
+  const tColor *Data(void) const { return data; }
+  tColor GetPixel(const cPoint &Point) const { return data[size.Width() * Point.Y() + Point.X()]; }
+       ///< Returns the pixel value at the given Point.
+       ///< For performance reasons there is no range check here, so the caller
+       ///< must make sure that the Point is within the images size.
+  void SetPixel(const cPoint &Point, tColor Color) { data[size.Width() * Point.Y() + Point.X()] = Color; }
+       ///< Sets the pixel at the given Point to Color.
+       ///< For performance reasons there is no range check here, so the caller
+       ///< must make sure that the Point is within the images size.
+  void Clear(void);
+       ///< Clears the image data by setting all pixels to be fully transparent.
+  void Fill(tColor Color);
+       ///< Fills the image data with the given Color.
+  };
+
+#define MAXPIXMAPLAYERS    8
+
+class cPixmap {
+  friend class cOsd;
+  friend class cPixmapMutexLock;
+private:
+  static cMutex mutex;
+  int layer;
+  int alpha;
+  bool tile;
+  cRect viewPort;
+  cRect drawPort;
+  cRect dirtyViewPort;
+  cRect dirtyDrawPort;
+protected:
+  virtual ~cPixmap() {}
+  void MarkViewPortDirty(const cRect &Rect);
+       ///< Marks the given rectangle of the view port of this pixmap as dirty.
+       ///< Rect is combined with the existing dirtyViewPort rectangle.
+       ///< The coordinates of Rect are given in absolute OSD values.
+  void MarkViewPortDirty(const cPoint &Point);
+       ///< Marks the given point of the view port of this pixmap as dirty.
+       ///< Point is combined with the existing dirtyViewPort rectangle.
+       ///< The coordinates of Point are given in absolute OSD values.
+  void MarkDrawPortDirty(const cRect &Rect);
+       ///< Marks the given rectangle of the draw port of this pixmap as dirty.
+       ///< Rect is combined with the existing dirtyDrawPort rectangle.
+       ///< The coordinates of Rect are relative to the pixmap's draw port.
+       ///< If Rect extends into the currently visible view port of this pixmap,
+       ///< MarkViewPortDirty() is called with the appropriate value.
+  void MarkDrawPortDirty(const cPoint &Point);
+       ///< Marks the given point of the draw port of this pixmap as dirty.
+       ///< Point is combined with the existing dirtyDrawPort rectangle.
+       ///< The coordinates of Point are relative to the pixmap's draw port.
+       ///< If Point is within the currently visible view port of this pixmap,
+       ///< MarkViewPortDirty() is called with the appropriate value.
+  void SetClean(void);
+       ///< Resets the "dirty" rectangles of this pixmap.
+  virtual void DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty);
+       ///< Draws the Dirty part of the given Pixmap into this pixmap. If the
+       ///< Pixmap's layer is 0, it is copied, otherwise it is rendered into this
+       ///< pixmap. This function is used only to implement the tile handling
+       ///< in the final rendering to the OSD.
+public:
+  cPixmap(void);
+  cPixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
+       ///< Creates a pixmap in the given Layer. When rendering the final OSD, pixmaps
+       ///< are handled in ascending order of their individual layer. This is
+       ///< important if pixmaps overlap each other. The one with the highest layer is
+       ///< rendered last. The actual value of Layer doesn't matter, it is only used
+       ///< for defining the rendering sequence. If Layer is less than zero, this
+       ///< pixmap will not be rendered into the final OSD (it can be activated by a
+       ///< later call to SetLayer()). The value 0 is reserved for the background
+       ///< pixmap and shall not be used otherwise (with the sole exception of
+       ///< temporarily using layer 0 to have a text with transparent background
+       ///< rendered with alpha blending into that pixmap; see also DrawPixel()).
+       ///< If there are several pixmaps with the same value of Layer, their rendering
+       ///< sequence within that layer is undefined.
+       ///< In order to allow devices that can handle only a limited number of layers,
+       ///< the Layer parameter must be less than 8 (MAXPIXMAPLAYERS).
+       ///< ViewPort defines the rectangle in which this pixmap will be rendered on
+       ///< the OSD. If no DrawPort ist given, it defaults to the same size as the
+       ///< ViewPort, with its upper left corner set to (0, 0).
+       ///< All drawing operations will be executed relative to the origin of the
+       ///< DrawPort rectangle, and will be clipped to the size of this rectangle.
+       ///< The DrawPort may have a different size than the ViewPort. If it is smaller
+       ///< than the ViewPort, the rest of the ViewPort is treated as fully transparent
+       ///< (unless this is a tiled pixmap, in which case the DrawPort is repeated
+       ///< horizontally and vertically to fill the entire ViewPort). If the DrawPort
+       ///< is larger than the ViewPort, only that portion of the DrawPort that
+       ///< intersects with the ViewPort will be visible on the OSD.
+       ///< The drawing area of a newly created cPixmap is not initialized and may
+       ///< contain random data.
+  static void Lock(void) { mutex.Lock(); }
+       ///< All public member functions of cPixmap set locks as necessary to make sure
+       ///< they are thread-safe (unless noted otherwise). If several cPixmap member
+       ///< functions need to be called in a row, the caller must surround these calls
+       ///< with proper Lock()/Unlock() calls. See the LOCK_PIXMAPS macro for a
+       ///< convenient way of doing this.
+  static void Unlock(void) { mutex.Unlock(); }
+  int Layer(void) const { return layer; }
+  int Alpha(void) const { return alpha; }
+  bool Tile(void) const { return tile; }
+  const cRect &ViewPort(void) const { return viewPort; }
+       ///< Returns the pixmap's view port, which is relative to the OSD's origin.
+       ///< Since this function returns a reference to a data member, the caller must
+       ///< use Lock()/Unlock() to make sure the data doesn't change while it is used.
+  const cRect &DrawPort(void) const { return drawPort; }
+       ///< Returns the pixmap's draw port, which is relative to the view port.
+       ///< Since this function returns a reference to a data member, the caller must
+       ///< use Lock()/Unlock() to make sure the data doesn't change while it is used.
+  const cRect &DirtyViewPort(void) const { return dirtyViewPort; }
+       ///< Returns the "dirty" rectangle this pixmap causes on the OSD. This is the
+       ///< surrounding rectangle around all pixels that have been modified since the
+       ///< last time this pixmap has been rendered to the OSD. The rectangle is
+       ///< relative to the OSD's origin.
+       ///< Since this function returns a reference to a data member, the caller must
+       ///< use Lock()/Unlock() to make sure the data doesn't change while it is used.
+  const cRect &DirtyDrawPort(void) const { return dirtyDrawPort; }
+       ///< Returns the "dirty" rectangle in the draw port of this this pixmap. This is
+       ///< the surrounding rectangle around all pixels that have been modified since the
+       ///< last time this pixmap has been rendered to the OSD. The rectangle is
+       ///< relative to the draw port's origin.
+       ///< Since this function returns a reference to a data member, the caller must
+       ///< use Lock()/Unlock() to make sure the data doesn't change while it is used.
+  virtual void SetLayer(int Layer);
+       ///< Sets the layer of this pixmap to the given value.
+       ///< If the new layer is greater than zero, the pixmap will be visible.
+       ///< If it is less than zero, it will be invisible.
+       ///< A value of 0 will be silently ignored.
+       ///< If a derived class reimplements this function, it needs to call the base
+       ///< class function.
+  virtual void SetAlpha(int Alpha);
+       ///< Sets the alpha value of this pixmap to the given value.
+       ///< Alpha is limited to the range 0 (fully transparent) to 255 (fully opaque).
+       ///< If a derived class reimplements this function, it needs to call the base
+       ///< class function.
+  virtual void SetTile(bool Tile);
+       ///< Sets the tile property of this pixmap to the given value. If Tile is true,
+       ///< the pixmaps data will be repeated horizontally and vertically if necessary
+       ///< to fill the entire view port.
+       ///< If a derived class reimplements this function, it needs to call the base
+       ///< class function.
+  virtual void SetViewPort(const cRect &Rect);
+       ///< Sets the pixmap's view port to the given Rect.
+       ///< If a derived class reimplements this function, it needs to call the base
+       ///< class function.
+  virtual void SetDrawPortPoint(const cPoint &Point, bool Dirty = true);
+       ///< Sets the pixmap's draw port to the given Point.
+       ///< Only the origin point of the draw port can be modified, its size is fixed.
+       ///< By default, setting a new draw port point results in marking the relevant
+       ///< part of the view port as "drity". If Dirty is set to false, the view port
+       ///< will not be marked as dirty. This is mainly used to implement the Pan()
+       ///< function.
+       ///< If a derived class reimplements this function, it needs to call the base
+       ///< class function.
+  virtual void Clear(void) = 0;
+       ///< Clears the pixmap's draw port by setting all pixels to be fully transparent.
+       ///< A derived class must call Lock()/Unlock().
+  virtual void Fill(tColor Color) = 0;
+       ///< Fills the pixmap's draw port with the given Color.
+       ///< A derived class must call Lock()/Unlock().
+  virtual void DrawImage(const cPoint &Point, const cImage &Image) = 0;
+       ///< Draws the given Image into this pixmap at the given Point.
+  virtual void DrawImage(const cPoint &Point, int ImageHandle) = 0;
+       ///< Draws the image referenced by the given ImageHandle into this pixmap at
+       ///< the given Point. ImageHandle must be a value that has previously been
+       ///< returned by a call to cOsdProvider::StoreImage(). If ImageHandle
+       ///< has an invalid value, nothing happens.
+  virtual void DrawPixel(const cPoint &Point, tColor Color) = 0;
+       ///< Sets the pixel at the given Point to the given Color, which is
+       ///< a full 32 bit ARGB value. If the alpha value of Color is not 0xFF
+       ///< (fully opaque), and this is the background pixmap (layer 0), the pixel is
+       ///< alpha blended with the existing color at the given position in this pixmap.
+  virtual void DrawBitmap(const cPoint &Point, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool Overlay = false) = 0;
+       ///< Sets the pixels in the OSD with the data from the given
+       ///< Bitmap, putting the upper left corner of the Bitmap at Point.
+       ///< If ColorFg or ColorBg is given, the first palette entry of the Bitmap
+       ///< will be mapped to ColorBg and the second palette entry will be mapped to
+       ///< ColorFg (palette indexes are defined so that 0 is the background and
+       ///< 1 is the foreground color).
+       ///< If Overlay is true, any pixel in Bitmap that has color index 0 will
+       ///< not overwrite the corresponding pixel in the target area.
+       ///< This function is mainly for compatibility with skins or plugins that
+       ///< draw bitmaps onto the OSD.
+  virtual void DrawText(const cPoint &Point, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault) = 0;
+       ///< Draws the given string at Point with the given foreground
+       ///< and background color and font. If Width and Height are given, the text
+       ///< will be drawn into a rectangle with the given size and the given
+       ///< Alignment (default is top-left). If ColorBg is clrTransparent, no
+       ///< background pixels will be drawn, which allows drawing "transparent" text.
+  virtual void DrawRectangle(const cRect &Rect, tColor Color) = 0;
+       ///< Draws a filled rectangle with the given Color.
+  virtual void DrawEllipse(const cRect &Rect, tColor Color, int Quadrants = 0) = 0;
+       ///< Draws a filled ellipse with the given Color that fits into the given
+       ///< rectangle. Quadrants controls which parts of the ellipse are actually drawn:
+       ///< 0       draws the entire ellipse
+       ///< 1..4    draws only the first, second, third or fourth quadrant, respectively
+       ///< 5..8    draws the right, top, left or bottom half, respectively
+       ///< -1..-8  draws the inverted part of the given quadrant(s)
+       ///< If Quadrants is not 0, the coordinates are those of the actual area, not
+       ///< the full circle!
+  virtual void DrawSlope(const cRect &Rect, tColor Color, int Type) = 0;
+       ///< Draws a "slope" with the given Color into the given rectangle.
+       ///< Type controls the direction of the slope and which side of it will be drawn:
+       ///< 0: horizontal, rising,  lower
+       ///< 1: horizontal, rising,  upper
+       ///< 2: horizontal, falling, lower
+       ///< 3: horizontal, falling, upper
+       ///< 4: vertical,   rising,  lower
+       ///< 5: vertical,   rising,  upper
+       ///< 6: vertical,   falling, lower
+       ///< 7: vertical,   falling, upper
+  virtual void Render(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest) = 0;
+       ///< Renders the part of the given Pixmap covered by Source into this pixmap at
+       ///< location Dest. The Source rectangle is relative to the given Pixmap's draw port.
+       ///< The Pixmap's alpha value is to be used when rendering.
+  virtual void Copy(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest) = 0;
+       ///< Copies the part of the given Pixmap covered by Source into this pixmap at
+       ///< location Dest. The Source rectangle is relative to the given Pixmap's draw port.
+       ///< The data from Pixmap is copied as is, no alpha handling of any kind takes
+       ///< place.
+  virtual void Scroll(const cPoint &Dest, const cRect &Source = cRect::Null) = 0;
+       ///< Scrolls the data in the pixmap's draw port to the given Dest point.
+       ///< If Source is given, only the data within that rectangle is scrolled.
+       ///< Source and Dest are relative to this pixmap's draw port.
+  virtual void Pan(const cPoint &Dest, const cRect &Source = cRect::Null) = 0;
+       ///< Does the same as Scroll(), but also shifts the draw port accordingly,
+       ///< so that the view port doesn't get dirty if the scrolled rectangle
+       ///< covers the entire view port. This may be of advantage if, e.g.,
+       ///< there is a draw port that holds, say, 11 lines of text, while the
+       ///< view port displays only 10 lines. By Pan()'ing the draw port up one
+       ///< line, an new bottom line can be written into the draw port (without
+       ///< being seen through the view port), and later the draw port can be
+       ///< shifted smoothly, resulting in a smooth scrolling.
+       ///< It is the caller's responsibility to make sure that Source and Dest
+       ///< are given in such a way that the view port will not get dirty. No
+       ///< check is done whether this condition actually holds true.
+  };
+
+class cPixmapMutexLock : public cMutexLock {
+public:
+  cPixmapMutexLock(void): cMutexLock(&cPixmap::mutex) {}
+  };
+
+#define LOCK_PIXMAPS cPixmapMutexLock PixmapMutexLock
+
+// cPixmapMemory is an implementation of cPixmap that uses an array of tColor
+// values to store the pixmap.
+
+class cPixmapMemory : public cPixmap {
+private:
+  tColor *data;
+  bool panning;
+public:
+  cPixmapMemory(void);
+  cPixmapMemory(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
+  virtual ~cPixmapMemory();
+  const uint8_t *Data(void) { return (uint8_t *)data; }
+  virtual void Clear(void);
+  virtual void Fill(tColor Color);
+  virtual void DrawImage(const cPoint &Point, const cImage &Image);
+  virtual void DrawImage(const cPoint &Point, int ImageHandle);
+  virtual void DrawPixel(const cPoint &Point, tColor Color);
+  virtual void DrawBitmap(const cPoint &Point, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool Overlay = false);
+  virtual void DrawText(const cPoint &Point, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
+  virtual void DrawRectangle(const cRect &Rect, tColor Color);
+  virtual void DrawEllipse(const cRect &Rect, tColor Color, int Quadrants = 0);
+  virtual void DrawSlope(const cRect &Rect, tColor Color, int Type);
+  virtual void Render(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest);
+  virtual void Copy(const cPixmap *Pixmap, const cRect &Source, const cPoint &Dest);
+  virtual void Scroll(const cPoint &Dest, const cRect &Source = cRect::Null);
+  virtual void Pan(const cPoint &Dest, const cRect &Source = cRect::Null);
+  };
+
 #define MAXOSDAREAS 16
+#define MAXOSDPIXMAPS 64
+
+/// The cOsd class is the interface to the "On Screen Display".
+/// An actual output device needs to derive from this class and implement
+/// the functionality necessary to display the OSD on the TV screen.
+/// If the actual OSD supports "True Color", it can either let VDR do
+/// all the rendering by calling RenderPixmaps() ("raw mode"), or it can
+/// reimplement all necessary cPixmap functions and do the rendering
+/// itself ("high level mode").
+/// If an OSD provides a "high level mode", it shall also provide a "raw mode"
+/// in order to verify proper operation. The plugin that impements the OSD
+/// shall offer a configuration switch in its setup.
 
 class cOsd {
   friend class cOsdProvider;
 private:
   static int osdLeft, osdTop, osdWidth, osdHeight;
   static cVector<cOsd *> Osds;
-  cBitmap *savedRegion;
+  bool isTrueColor;
+  cBitmap *savedBitmap;
   cBitmap *bitmaps[MAXOSDAREAS];
   int numBitmaps;
+  cPixmapMemory *savedPixmap;
+  cPixmap *pixmaps[MAXOSDPIXMAPS];
+  int numPixmaps;
   int left, top, width, height;
   uint level;
   bool active;
@@ -295,6 +741,32 @@ class cOsd {
   virtual void SetActive(bool On) { active = On; }
        ///< Sets this OSD to be the active one.
        ///< A derived class must call cOsd::SetActive(On).
+  const cPixmap * const *Pixmaps(void) { return pixmaps; }
+       ///< Returns the list of currently active pixmaps in this OSD.
+  int NumPixmaps(void) { return numPixmaps; }
+       ///< Returns the number of currently active pixmaps in this OSD.
+  cPixmap *AddPixmap(cPixmap *Pixmap);
+       ///< Adds the given Pixmap to the list of currently active pixmaps in this OSD.
+       ///< Returns Pixmap if the operation was successful, or NULL if the maximum
+       ///< number of pixmaps has been exceeded.
+       ///< A derived class that implements its own cPixmap class must call AddPixmap()
+       ///< in order to add a newly created pixmap to the OSD's list of pixmaps.
+  cPixmapMemory *RenderPixmaps(void);
+       ///< Renders the dirty part of all pixmaps into a resulting pixmap that
+       ///< shall be displayed on the OSD. The returned pixmap's view port is
+       ///< set to the location of the rectangle on the OSD that needs to be
+       ///< refreshed; its draw port's origin is at (0, 0), and it has the same
+       ///< size as the view port.
+       ///< If there are several non-overlapping dirty rectangles from different pixmaps,
+       ///< they are returned separately in order to avoid re-rendering large parts
+       ///< of the OSD that haven't changed at all. The caller must therefore call
+       ///< RenderPixmaps() repeatedly until it returns NULL, and display the returned
+       ///< parts of the OSD at their appropriate locations. During this entire
+       ///< operation the caller must hold a lock on the cPixmap mutex (for instance
+       ///< by putting a LOCK_PIXMAPS into the scope of the operation).
+       ///< If there are no dirty pixmaps, or if this is not a true color OSD,
+       ///< this function returns NULL.
+       ///< The caller must delete the returned pixmap after use.
 public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
@@ -309,6 +781,9 @@ class cOsd {
        ///< screen.
   static int IsOpen(void) { return Osds.Size() && Osds[0]->level == OSD_LEVEL_DEFAULT; }
        ///< Returns true if there is currently a level 0 OSD open.
+  bool IsTrueColor(void) const { return isTrueColor; }
+       ///< Returns 'true' if this is a true color OSD (providing full 32 bit color
+       ///< depth).
   int Left(void) { return left; }
   int Top(void) { return top; }
   int Width(void) { return width; }
@@ -323,9 +798,33 @@ class cOsd {
        ///< a single color combination, and may not be able to serve all
        ///< requested colors. By default the palette assumes there will be
        ///< 10 fixed colors and 10 color combinations.
+       ///< If this is a true color OSD, this function does nothing.
   cBitmap *GetBitmap(int Area);
        ///< Returns a pointer to the bitmap for the given Area, or NULL if no
        ///< such bitmap exists.
+       ///< If this is a true color OSD, a pointer to a dummy bitmap with 8bpp
+       ///< is returned. This is done so that skins that call this function
+       ///< in order to preset the bitmap's palette won't crash.
+  virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
+       ///< Creates a new true color pixmap on this OSD (see cPixmap for details).
+       ///< The caller must not delete the returned object, it will be deleted when
+       ///< the OSD is deleted. DestroyPixmap() can be called if a pixmap shall be
+       ///< destroyed before the OSD is deleted.
+       ///< If this is not a true color OSD, this function returns NULL.
+  virtual void DestroyPixmap(cPixmap *Pixmap);
+       ///< Destroys the given Pixmap, which has previously been created by a call to
+       ///< CreatePixmap(). When the OSD is deleted, all pixmaps are destroyed
+       ///< automatically. So this function only needs to be used if a pixmap shall
+       ///< be destroyed while the OSD is still being used.
+  virtual void DrawImage(const cPoint &Point, const cImage &Image);
+       ///< Draws the given Image on this OSD at the given Point.
+       ///< If this is not a true color OSD, this function does nothing.
+  virtual void DrawImage(const cPoint &Point, int ImageHandle);
+       ///< Draws the image referenced by the given ImageHandle on this OSD at
+       ///< the given Point. ImageHandle must be a value that has previously been
+       ///< returned by a call to cOsdProvider::StoreImage(). If ImageHandle
+       ///< has an invalid value, nothing happens.
+       ///< If this is not a true color OSD, this function does nothing.
   virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
        ///< Checks whether the OSD can display the given set of sub-areas.
        ///< The return value indicates whether a call to SetAreas() with this
@@ -343,6 +842,9 @@ class cOsd {
        ///< are part of the rectangle that surrounds a given drawing operation
        ///< will be drawn into, with the proper offsets.
        ///< A new call overwrites any previous settings
+       ///< To set up a true color OSD, exactly one area must be requested, with
+       ///< its coordinates set to the full area the OSD shall cover, and the
+       ///< bpp value set to 32.
   virtual void SaveRegion(int x1, int y1, int x2, int y2);
        ///< Saves the region defined by the given coordinates for later restoration
        ///< through RestoreRegion(). Only one saved region can be active at any
@@ -352,6 +854,7 @@ class cOsd {
        ///< If SaveRegion() has not been called before, nothing will happen.
   virtual eOsdError SetPalette(const cPalette &Palette, int Area);
        ///< Sets the Palette for the given Area (the first area is numbered 0).
+       ///< If this is a true color OSD, nothing happens and oeOk is returned.
   virtual void DrawPixel(int x, int y, tColor Color);
        ///< Sets the pixel at the given coordinates to the given Color, which is
        ///< a full 32 bit ARGB value.
@@ -368,6 +871,7 @@ class cOsd {
        ///< area shall have its palette replaced with the one from Bitmap.
        ///< If Overlay is true, any pixel in Bitmap that has color index 0 will
        ///< not overwrite the corresponding pixel in the target area.
+       ///< If this is a true color OSD, ReplacePalette has no meaning.
   virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
        ///< Draws the given string at coordinates (x, y) with the given foreground
        ///< and background color and font. If Width and Height are given, the text
@@ -401,18 +905,51 @@ class cOsd {
        ///< 7: vertical,   falling, upper
   virtual void Flush(void);
        ///< Actually commits all data to the OSD hardware.
+       ///< Flush() should return as soon as possible.
+       ///< For a true color OSD using the default implementation with in memory
+       ///< pixmaps, the Flush() function should basically do something like this:
+       ///<
+       ///<  LOCK_PIXMAPS;
+       ///<  while (cPixmapMemory *pm = RenderPixmaps()) {
+       ///<        int w = pm->ViewPort().Width();
+       ///<        int h = pm->ViewPort().Height();
+       ///<        int d = w * sizeof(tColor);
+       ///<        MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
+       ///<        delete pm;
+       ///<        }
   };
 
+#define MAXOSDIMAGES 64
+
 class cOsdProvider {
+  friend class cPixmapMemory;
 private:
   static cOsdProvider *osdProvider;
   static int oldWidth;
   static int oldHeight;
   static double oldAspect;
+  static cImage *images[MAXOSDIMAGES];
 protected:
   virtual cOsd *CreateOsd(int Left, int Top, uint Level) = 0;
       ///< Returns a pointer to a newly created cOsd object, which will be located
       ///< at the given coordinates.
+  virtual bool ProvidesTrueColor(void) { return false; }
+      ///< Returns true if this OSD provider is able to handle a true color OSD.
+  virtual int StoreImageData(const cImage &Image);
+      ///< Copies the given Image and returns a handle for later reference.
+      ///< A derived class can implement its own image storing mechanism by
+      ///< reimplementing this function as well as DropImageData().
+      ///< The base class implementation simply copies the image data to allow
+      ///< plugins to always use this interface, no matter if the actual device
+      ///< provides support for storing image data or not. The handles returned
+      ///< by the default implementation are positive integers. A derived class
+      ///< might want to use negative integers as handles, so that it can fall
+      ///< back to using the base class image storing mechanism if, e.g.,  it runs
+      ///< out of memory.
+  virtual void DropImageData(int ImageHandle);
+      ///< Drops the image data referenced by ImageHandle.
+  static const cImage *GetImageData(int ImageHandle);
+      ///< Gets the image data referenced by ImageHandle.
 public:
   cOsdProvider(void);
       //XXX maybe parameter to make this one "sticky"??? (frame-buffer etc.)
@@ -427,7 +964,22 @@ class cOsdProvider {
       ///< Inquires the actual size of the video display and adjusts the OSD and
       ///< font sizes accordingly. If Force is true, all settings are recalculated,
       ///< even if the video resolution hasn't changed since the last call to
-      ///< this funtion.
+      ///< this function.
+  static bool SupportsTrueColor(void);
+      ///< Returns true if the current OSD provider is able to handle a true color OSD.
+  static int StoreImage(const cImage &Image);
+      ///< Stores the given Image for later use with DrawImage() on an OSD or
+      ///< pixmap. The returned number is a handle that must be used when
+      ///< referencing this image in a call to DrawImage() or DropImage().
+      ///< The image data is copied, so any later changes to Image will have
+      ///< no effect on the stored image.
+      ///< A derived class may be able to copy frequently used images to some
+      ///< space where they can be retrieved faster than using a cImage in each call.
+      ///< If this is not a true color OSD, or if the image data can't be stored for
+      ///< any reason, this function returns 0 and nothing is stored.
+  static void DropImage(int ImageHandle);
+      ///< Drops the image referenced by the given ImageHandle. If ImageHandle
+      ///< has an invalid value, nothing happens.
   static void Shutdown(void);
       ///< Shuts down the OSD provider facility by deleting the current OSD provider.
   };
diff --git a/osdbase.c b/osdbase.c
index 0cdedb23f..b0df4de32 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.2 2010/01/17 11:36:12 kls Exp $
+ * $Id: osdbase.c 2.3 2010/12/12 13:41:28 kls Exp $
  */
 
 #include "osdbase.h"
@@ -500,7 +500,7 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
         return state;
         }
      }
-  switch (Key) {
+  switch (int(Key)) {
     case k0:      return osUnknown;
     case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
     case kUp|k_Repeat:
diff --git a/pat.c b/pat.c
index 736ddc21f..862bf46f9 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.13 2010/06/13 11:12:12 kls Exp $
+ * $Id: pat.c 2.15 2010/11/07 13:47:16 kls Exp $
  */
 
 #include "pat.h"
@@ -456,29 +456,51 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       }
                       break;
-              case 0x81: // STREAMTYPE_USER_PRIVATE
-                      if (Channel->IsAtsc()) { // ATSC AC-3
-                         char lang[MAXLANGCODE1] = { 0 };
-                         SI::Descriptor *d;
-                         for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
-                             switch (d->getDescriptorTag()) {
-                               case SI::ISO639LanguageDescriptorTag: {
-                                    SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                    strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
-                                    }
-                                    break;
-                               default: ;
-                               }
-                             delete d;
-                             }
-                         if (NumDpids < MAXDPIDS) {
-                            Dpids[NumDpids] = esPid;
-                            Dtypes[NumDpids] = SI::AC3DescriptorTag;
-                            strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
-                            NumDpids++;
+              case 0x80 ... 0xFF: // STREAMTYPE_USER_PRIVATE
+                      {
+                      char lang[MAXLANGCODE1] = { 0 };
+                      bool IsAc3 = false;
+                      SI::Descriptor *d;
+                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                          switch (d->getDescriptorTag()) {
+                            case SI::RegistrationDescriptorTag: {
+                                 SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d;
+                                 // http://www.smpte-ra.org/mpegreg/mpegreg.html
+                                 switch (rd->getFormatIdentifier()) {
+                                   case 0x44434949: // 'DCII' aka. DigiCipher II
+                                        Vpid = esPid;
+                                        Ppid = pmt.getPCRPid();
+                                        Vtype = 0x02; // DCII compression is based upon MPEG-2
+                                        ProcessCaDescriptors = true;
+                                        break;
+                                   case 0x41432D33: // 'AC-3'
+                                        IsAc3 = true;
+                                        break;
+                                   default:
+                                        //printf("Format identifier: 0x08X\n", rd->getFormatIdentifier());
+                                        break;
+                                   }
+                                 }
+                                 break;
+                            case SI::ISO639LanguageDescriptorTag: {
+                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                 }
+                                 break;
+                            default: ;
                             }
+                         delete d;
+                         }
+                      if (IsAc3) {
+                         if (NumDpids < MAXDPIDS) {
+                           Dpids[NumDpids] = esPid;
+                           Dtypes[NumDpids] = SI::AC3DescriptorTag;
+                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                           NumDpids++;
+                           }
                          ProcessCaDescriptors = true;
                          }
+                      }
                       break;
               default: ;//printf("PID: %5d %5d %2d %3d %3d\n", pmt.getServiceId(), stream.getPid(), stream.getStreamType(), pmt.getVersionNumber(), Channel->Number());
               }
diff --git a/po/ar.po b/po/ar.po
index 82da18ab1..c779c990b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-09-12 13:37+0200\n"
+"POT-Creation-Date: 2010-12-24 12:35+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,1249,-1\n"
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-Country: LIBYA\n"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 247113ba7..f5117f0f7 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
-"Language-Team: Catalanian\n"
+"Language-Team: Catalan <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index f6313badd..664d3c247 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,13 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
-"Language-Team: Czech\n"
+"Language-Team: Czech <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatný kanál ***"
diff --git a/po/da_DK.po b/po/da_DK.po
index 40cdebd49..ce6c57fc1 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
-"Language-Team: Danish\n"
+"Language-Team: Danish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
diff --git a/po/de_DE.po b/po/de_DE.po
index 4d4f3df20..d2d1a8646 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
-"Language-Team: German\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
diff --git a/po/el_GR.po b/po/el_GR.po
index 5414ebcd5..c079e9f18 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
-"Language-Team: Greek\n"
+"Language-Team: Greek <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
diff --git a/po/es_ES.po b/po/es_ES.po
index 217f77534..cd0426ac4 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
-"Language-Team: Spanish\n"
+"Language-Team: Spanish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
diff --git a/po/et_EE.po b/po/et_EE.po
index 5010dc4ce..ff459c883 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
-"Language-Team: Estonian\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
@@ -840,7 +841,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Kaustad taimeri men��s"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Teksti sisestamine numbriklahvidega"
 
 msgid "EPG"
 msgstr "EPG"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 477c7dbf1..7df008290 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: Finnish\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 0d4cb7c2f..02bad4e16 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,13 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
-"Language-Team: French\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 96ee695e0..66e95dd27 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,13 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
-"Language-Team: Croatian\n"
+"Language-Team: Croatian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Program ***"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index a17b209c2..e9b5025cd 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
-"Language-Team: Hungarian\n"
+"Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
diff --git a/po/it_IT.po b/po/it_IT.po
index 0ca9025f4..a17e7a3e7 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,13 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 02465e61b..310f29aef 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -5,18 +5,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.12\n"
+"Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2010-06-06 12:52+0200\n"
-"PO-Revision-Date: 2010-02-22 18:05+0200\n"
+"PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
-"Language-Team: Lithuanian\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Klaidingas kanalas ***"
+msgstr "*** Blogi kanalo nustatymai ***"
 
 msgid "Channel not available!"
 msgstr "Kanalas neegzistuoja!"
@@ -837,10 +838,10 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Įrašų katalogai"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Katalogai esantys laikmačių meniu"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Skaičių mygtukai simboliams"
 
 msgid "EPG"
 msgstr "Elektroninis programų gidas (EPG)"
@@ -893,10 +894,10 @@ msgid "names and PIDs"
 msgstr "pavadinimai ir PID'ai"
 
 msgid "add new channels"
-msgstr "pridėti naujų kanalų"
+msgstr "pridėti naujus kanalus"
 
 msgid "add new transponders"
-msgstr "pridėti naujų siųstuvų"
+msgstr "pridėti naujus siųstuvus"
 
 msgid "DVB"
 msgstr "DVB"
@@ -935,7 +936,7 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "Subtitrų pozicionavimo nuokrypis"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Subtitrų priekinio vaizdo permatomumas"
+msgstr "Subtitrų fonto permatomumas"
 
 msgid "Setup.DVB$Subtitle background transparency"
 msgstr "Subtitrų fono permatomumas"
@@ -995,7 +996,7 @@ msgid "pause live video"
 msgstr "pristabdyti 'gyvą' video srautą"
 
 msgid "confirm"
-msgstr ""
+msgstr "patvirtinti"
 
 msgid "yes"
 msgstr "taip"
@@ -1052,16 +1053,16 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Suskaidyti koreguotus failus"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Trinti atidėto grojimo įrašą"
 
 msgid "Replay"
-msgstr "Pakartoti"
+msgstr "Pakartojimai"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Daugiagreitis ręžimas"
+msgstr "Prasukimo ręžimas"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Rodyti atvaizdavimo ręžimą"
+msgstr "Rodyti pakartojimo ręžimą"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
@@ -1172,7 +1173,7 @@ msgid "Pausing live video..."
 msgstr "Sustabdomas 'gyvo' video grojimas..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Trinti atidėto grojimo įrašą?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 20727c73d..8e54f15d9 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "X-Generator: KBabel 1.11.4\n"
 
 msgid "*** Invalid Channel ***"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f570337c4..220ff78e1 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,13 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
-"Language-Team: Dutch\n"
+"Language-Team: Dutch <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 2f40cfe98..7c60d299b 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
-"Language-Team: Norwegian\n"
+"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 9620e1bc7..1d4af936c 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
-"Language-Team:  Polish\n"
+"Language-Team: Polish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 45507a841..ee806ce26 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
-"Language-Team: Portuguese\n"
+"Language-Team: Portuguese <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal inv�lido ***"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index e0a211985..c55239c4d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -2,19 +2,20 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
-# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008, 2010
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008, 2010, 2011
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
-"PO-Revision-Date: 2010-02-11 13:38+0100\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
-"Language-Team: Romanian\n"
+"Language-Team: Romanian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
@@ -840,10 +841,10 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Directoare �nregistr�ri"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Directoare �n meniul de timer-e"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Caractere pe tastele numerice"
 
 msgid "EPG"
 msgstr "EPG"
@@ -998,7 +999,7 @@ msgid "pause live video"
 msgstr "�nregistreaz� emisiunea"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirmare"
 
 msgid "yes"
 msgstr "da"
@@ -1055,7 +1056,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Separare fi�iere montate"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "�terge �nregistrarea pentru vizionare decalat�"
 
 msgid "Replay"
 msgstr "Redare"
@@ -1175,7 +1176,7 @@ msgid "Pausing live video..."
 msgstr "Trec �n pauz� emisiunea transmis�..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "�terg �nregistrarea pentru vizionare decalat�?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 889b98b6c..2115008c3 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
-"Language-Team: Russian\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 129fad3be..d5335c2ef 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,20 +1,20 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006, 2008
-# Ji�� Dobr� <jdobry@centrum.cz>, 2008
+# Milan Hrala <hrala.milan@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2010-06-06 12:52+0200\n"
-"PO-Revision-Date: 2009-09-30 12:50+0100\n"
+"PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
-"Language-Team: Slovak\n"
+"Language-Team: Slovak <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
@@ -71,251 +71,251 @@ msgid "Hierarchy"
 msgstr "Hierarchia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "Starting EPG scan"
 msgstr "Za��na preh�ad�va� EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Dr�ma"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detekt�vka/Triler"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Dobrodru�n�/Western/Vojnov�"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Vedecko fantastick�/Fantastick�/Horor"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Kom�dia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Soap epera/Melodr�ma/Folkl�r"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romantick�"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Skuto�n�/Klasick�/N�bo�ensky/Historick� film/Dr�ma"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Film pre dospel�ch/Dr�ma"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Spr�vy/Aktu�lne udalosti"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Spr�vy/Predpove� po�asia"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Spravodajsk� magaz�n"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokument�rny"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Diskusia/Rozhovor/debata"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "�ou/Z�bavn� hry"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Z�bavn� hra/vedemostn�/s��a�n�"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "variet�"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Telev�zna rel�cia"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "�port"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Zvl�tne udalosti"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "�portov� magaz�n"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Fudbal"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "T�mov� �porty"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletika"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Motorizmus"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Vodn� �porty"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Zimn� �porty"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Jazdeck� �porty"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Bojv� �porty"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Pre deti/program pre ml�de�"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Program pre pred�kolsk� deti"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Z�bavn� program od 6 do 14 rokov"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Z�bavn� program od 10 do 16 rokov"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informa�n�/V�chovn�/�kolsk� program"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Kreslen�/B�bkov�"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Hudba/Balet/Tanec"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "V�na/Klasick� hudba"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "�udov�/Tradi�n� Hudba"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Muzik�l/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Umenie/Kult�ra"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Hereck� umenie"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "V�tvarn� umenie"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "N�bo�enstvo"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Popul�rna kult�ra/Tradi�n� umenie"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literat�ra"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Kino"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Experiment�lny film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Rozhlas/Tla�"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nov� m�dia"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Umenie/Kult�rny magaz�n"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "M�da"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Soci�lny/Politick�/Ekonomick�"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magaz�n/Report�e/"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomika/Soci�lne poradenstvo"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "V�znamn� osobnosti"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Vzdel�vanie/Veda/Fakta"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Pr�roda/Zvierat�/�ivotn� prostredie"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technol�gia/Pr�rodn� vedy"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medic�na/Filozofia/Psychol�gia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Zahrani�n� krajiny/Expedi�cia"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "soci�lne/duchovn� vedy"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "�al�ie vzdel�vanie"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Jazyky"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "v�lny �as"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turistika/Cestovanie"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Remesl�"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motorizmus"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness a zdravie"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Varenie"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reklama/Predaj"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Z�hradk�rstvo"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "P�vodn� jazyk"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "�iernobiely"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Nepublikovan�"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "�iv� vysielanie"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "od %d"
 
 msgid "No title"
 msgstr "Bez n�zvu"
@@ -326,7 +326,7 @@ msgstr "Slovensky"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
-msgstr "sk"
+msgstr "slv"
 
 msgid "Phase 1: Detecting RC code type"
 msgstr "F�za 1: Detekcia typu k�du"
@@ -348,19 +348,19 @@ msgid "Press key for '%s'"
 msgstr "Stla�te kl�vesu pre '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Stla�te 'Hore' pre potvrdenie"
+msgstr "Pre potvrdenie stla�te kl�vesu 'Hore'"
 
 msgid "Press 'Down' to continue"
-msgstr "Stla�te 'Dole' pre pokra�ovanie"
+msgstr "Pokra�ujete stla�en�m kl�vesy 'Dole' "
 
 msgid "(press 'Up' to go back)"
-msgstr "(stla�te 'hore' pre n�vrat)"
+msgstr "(Vr�tite sa stla�en�m kl�vesy 'hore')"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(stla�te 'dole' pre skon�enie)"
+msgstr "(Definovanie tla��tok ukon��te stla�en�m kl�vesy 'dole')"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(stla�te 'Menu' pre presko�enie defin�cie kl�vesy)"
+msgstr "(stla�en�m 'Menu' presko��te defin�ciu kl�vesy)"
 
 msgid "Learning Remote Control Keys"
 msgstr "Ur�enie k�du dia�kov�ho ovl�dania"
@@ -369,7 +369,7 @@ msgid "Phase 3: Saving key codes"
 msgstr "F�za 3: Ulo�enie k�du"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Stla�te 'hore' pre ulo�enie, 'Dole' pre zru�enie"
+msgstr "Stla�en�m 'hore' ulo��te, 'Dole' zru��te"
 
 msgid "Key$Up"
 msgstr "Hore"
@@ -468,7 +468,7 @@ msgid "Key$Timers"
 msgstr "Pl�ny nahr�vania"
 
 msgid "Key$Recordings"
-msgstr "Z�znamy"
+msgstr "Nahr�vky"
 
 msgid "Key$Setup"
 msgstr "Nastavenie"
@@ -588,29 +588,29 @@ msgid "Delete channel?"
 msgstr "Odstr�ni� kan�l?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Upravi� zlo�ku"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nov� zlo�ka"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Pod zlo�ka"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "N�zov zlo�ky u� existuje!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "N�zov zlo�ky nesmie obsahova� '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Vybra�"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Vymaza� zlo�ku a v�etky pod zlo�ky?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Vymaza� zlo�ku?"
 
 msgid "Edit timer"
 msgstr "�prava pl�nu nahr�vania"
@@ -643,13 +643,13 @@ msgid "File"
 msgstr "S�bor"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Zlo�ka"
 
 msgid "First day"
 msgstr "Prv� de�"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Vybra� zlo�ku"
 
 msgid "Timers"
 msgstr "Pl�ny nahr�vania"
@@ -679,10 +679,10 @@ msgid "Button$Switch"
 msgstr "Prepn��"
 
 msgid "What's on now?"
-msgstr "Aktu�lny program"
+msgstr "�o ide?"
 
 msgid "What's on next?"
-msgstr "N�sleduj�ci program"
+msgstr "�o nasleduje?"
 
 msgid "Button$Next"
 msgstr "�alej"
@@ -718,7 +718,7 @@ msgid "CAM not responding!"
 msgstr "CAM neodpoved�!"
 
 msgid "Recording info"
-msgstr "Podrobnosti z�znamu"
+msgstr "Podrobnosti nahr�vky"
 
 msgid "Button$Play"
 msgstr "Prehra�"
@@ -727,7 +727,7 @@ msgid "Button$Rewind"
 msgstr "Na za�iatok"
 
 msgid "Recordings"
-msgstr "Z�znamy"
+msgstr "Nahr�vky"
 
 msgid "Button$Open"
 msgstr "Otvori�"
@@ -736,13 +736,13 @@ msgid "Commands"
 msgstr "Pr�kazy"
 
 msgid "Error while accessing recording!"
-msgstr "Chyba pri pr�stupe k z�znamom!"
+msgstr "Chyba pri pr�stupe k nahr�vkam!"
 
 msgid "Delete recording?"
-msgstr "Zmaza� z�znam?"
+msgstr "Zmaza� nahr�vku?"
 
 msgid "Error while deleting recording!"
-msgstr "Pri vymaz�van� z�znamu pri�lo k chybe!"
+msgstr "Pri vymaz�van� nahr�vky pri�lo k chybe!"
 
 msgid "Recording commands"
 msgstr "Pr�kazy nahr�vania"
@@ -796,7 +796,7 @@ msgid "Setup.OSD$Small font"
 msgstr "Mal� p�smo"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Ur�en� p�smo"
+msgstr "Fixn� p�smo"
 
 msgid "Setup.OSD$Default font size (%)"
 msgstr "Ve�kos� predvolen�ho p�sma (%)"
@@ -805,7 +805,7 @@ msgid "Setup.OSD$Small font size (%)"
 msgstr "Ve�kos� mal�ho p�sma (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Ve�kos� ur�en�ho p�sma (%)"
+msgstr "Ve�kos� fixn�ho p�sma (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Poz�cia inform�ci� o kan�le"
@@ -835,13 +835,13 @@ msgid "Setup.OSD$Menu key closes"
 msgstr "Kl�vesa Menu zaviera"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Zoznam z�znamov"
+msgstr "Zoznam nahr�vok"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Zlo�ky v menu pl�nova�a"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "��seln� tla�idl� pre znaky"
 
 msgid "EPG"
 msgstr "EPG"
@@ -957,7 +957,7 @@ msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Horn� frekvencia LNB (MHz)"
 
 msgid "CAM reset"
-msgstr "Reset CAMu"
+msgstr "Resetnutie CAMu"
 
 msgid "CAM present"
 msgstr "CAM pr�tomn�"
@@ -972,7 +972,7 @@ msgid "Button$Menu"
 msgstr "Menu"
 
 msgid "Button$Reset"
-msgstr "Reset"
+msgstr "Resetn��"
 
 msgid "Opening CAM menu..."
 msgstr "Otv�ra sa menu CAM..."
@@ -990,13 +990,13 @@ msgid "do not pause live video"
 msgstr "nepreru�ova� �iv� vysielanie"
 
 msgid "confirm pause live video"
-msgstr "Potrdi� preru�enie �iv�ho vysielania"
+msgstr "potvrdi� preru�enie �iv�ho vysielania"
 
 msgid "pause live video"
-msgstr "Preru�i� �iv� vysielanie"
+msgstr "preru�i� �iv� vysielanie"
 
 msgid "confirm"
-msgstr ""
+msgstr "overi�"
 
 msgid "yes"
 msgstr "�no"
@@ -1020,7 +1020,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Predvolen� �ivotnos�"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Chovanie kl�vesy pozastavenia"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorita preru�enia"
@@ -1053,7 +1053,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Deli� upravovan� s�bory"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Vymaza� timeshift z�znamy"
 
 msgid "Replay"
 msgstr "Prehr�vanie"
@@ -1095,7 +1095,7 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitos� po spusten�"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Prep�na� z prv�ho na posledn� a opa�ne"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "N�dzov� ukon�enie"
@@ -1113,7 +1113,7 @@ msgid "Restart"
 msgstr "Re�tart"
 
 msgid "Really restart?"
-msgstr "Opravdu re�tartova�?"
+msgstr "Naozaj re�tartova�?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
@@ -1173,14 +1173,14 @@ msgid "Pausing live video..."
 msgstr "Preru�uje sa be�iaci program ..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Vymaza� timeshift z�znamy?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Skok: "
 
 msgid "No editing marks defined!"
-msgstr "Nie s� ur�en� upravovan� zna�ky!"
+msgstr "Nie s� ur�en� zna�ky �prav!"
 
 msgid "Can't start editing process!"
 msgstr "Nem��e za�a� spracovanie �prav!"
@@ -1219,10 +1219,10 @@ msgid "Low disk space!"
 msgstr "Za chv��ku bude pln� disk!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Regenera�n� indexov� s�bor"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Regener�cia indexov�ho s�boru hotov�"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnutie nie je mo�n� - ch�ba vo�ba '-s'!"
@@ -1261,11 +1261,11 @@ msgid "Classic VDR"
 msgstr "Klasick� VDR"
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG konzola"
+msgstr "ST:TNG panely"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "P�S�PSN"
+msgstr "PUS�PSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
@@ -1302,7 +1302,7 @@ msgid "Recording started"
 msgstr "Za�alo nahr�vanie"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "Vypnutie VDR bude odlo�en� - vypnete kl�vesou Power"
+msgstr "Vypnutie VDR bude odlo�en� - platnos� potvrdte kl�vesou Power"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Ktor�ko�vek kl�vesa zru�� vypnutie"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 9f1e80690..90cf05812 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
-"Language-Team: Slovenian\n"
+"Language-Team: Slovenian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
diff --git a/po/sr_SR.po b/po/sr_SR.po
new file mode 100644
index 000000000..0900cbc51
--- /dev/null
+++ b/po/sr_SR.po
@@ -0,0 +1,1351 @@
+# VDR language source file.
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Milan Cvijanovi� <elcom_cvijo@hotmail.com>, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.7.1\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
+"POT-Creation-Date: 2011-02-20 19:02+0100\n"
+"PO-Revision-Date: 2011-01-09 15:57+0100\n"
+"Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
+"Language-Team: Serbian <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian-latin\n"
+
+msgid "*** Invalid Channel ***"
+msgstr "*** Neispravan Kanal ***"
+
+msgid "Channel not available!"
+msgstr "Kanal nije dostupan!"
+
+msgid "Can't start Transfer Mode!"
+msgstr "Nemogu�e zapo�eti Prenos!!"
+
+msgid "off"
+msgstr "isklju�i"
+
+#, fuzzy
+msgid "on"
+msgstr "na"
+
+msgid "auto"
+msgstr "automatski"
+
+msgid "none"
+msgstr "ni�ta"
+
+msgid "Polarization"
+msgstr "Polarizacija"
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "Srate"
+msgstr "Srate"
+
+msgid "Inversion"
+msgstr "Inverzija"
+
+msgid "CoderateH"
+msgstr "CoderateH"
+
+msgid "CoderateL"
+msgstr "CoderateL"
+
+msgid "Modulation"
+msgstr "Modulacija"
+
+msgid "Bandwidth"
+msgstr "Propusnost"
+
+msgid "Transmission"
+msgstr "Prenos"
+
+msgid "Guard"
+msgstr "Za�tita"
+
+msgid "Hierarchy"
+msgstr "Hijerarhija"
+
+msgid "Rolloff"
+msgstr ""
+
+msgid "Starting EPG scan"
+msgstr "Po�injem EPG pretragu"
+
+msgid "Content$Movie/Drama"
+msgstr "Film/Drama"
+
+msgid "Content$Detective/Thriller"
+msgstr "Detektivski/Triler"
+
+msgid "Content$Adventure/Western/War"
+msgstr "Avantura/Vestern/Ratni"
+
+msgid "Content$Science Fiction/Fantasy/Horror"
+msgstr "Nau�no Fantasti�ni/Fantazija/Horor"
+
+msgid "Content$Comedy"
+msgstr "Komedija"
+
+msgid "Content$Soap/Melodrama/Folkloric"
+msgstr "Sapunica/Melodrama/Folklor"
+
+msgid "Content$Romance"
+msgstr "Romansa"
+
+msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
+msgstr "Ozbiljan/Klasi�ni/Religiozan/Istorijski Film/Drama"
+
+msgid "Content$Adult Movie/Drama"
+msgstr "Za odrasle Film/Drama"
+
+msgid "Content$News/Current Affairs"
+msgstr "Vesti/Trenutni poslovi"
+
+msgid "Content$News/Weather Report"
+msgstr "Vesti/Vremenski izvje�taj"
+
+msgid "Content$News Magazine"
+msgstr "Magazin Vesti"
+
+msgid "Content$Documentary"
+msgstr "Dokumentarni"
+
+msgid "Content$Discussion/Inverview/Debate"
+msgstr "Diskusije/Intervjui/Debate"
+
+msgid "Content$Show/Game Show"
+msgstr "Zabavni/Igre Zabavne"
+
+msgid "Content$Game Show/Quiz/Contest"
+msgstr "Igre Zabavne/Kviz/Takmi�enja"
+
+msgid "Content$Variety Show"
+msgstr "Cirkus"
+
+msgid "Content$Talk Show"
+msgstr "Talk �ou"
+
+msgid "Content$Sports"
+msgstr "Sport"
+
+msgid "Content$Special Event"
+msgstr "Specijalne emisije"
+
+msgid "Content$Sport Magazine"
+msgstr "Sportski Magazin"
+
+msgid "Content$Football/Soccer"
+msgstr "Futball/Igra�"
+
+msgid "Content$Tennis/Squash"
+msgstr "Tenis/Skvo�"
+
+msgid "Content$Team Sports"
+msgstr "Timski Sport"
+
+msgid "Content$Athletics"
+msgstr "Atletika"
+
+msgid "Content$Motor Sport"
+msgstr "Moto Sport"
+
+msgid "Content$Water Sport"
+msgstr "Sportovi na vodi"
+
+msgid "Content$Winter Sports"
+msgstr "Zimski Sportovi"
+
+msgid "Content$Equestrian"
+msgstr "Jaha�ki"
+
+msgid "Content$Martial Sports"
+msgstr "Vojni Sportovi"
+
+msgid "Content$Children's/Youth Programme"
+msgstr "De�iji/Program za Mlade"
+
+msgid "Content$Pre-school Children's Programme"
+msgstr "Pred�kolski de�iji program"
+
+msgid "Content$Entertainment Programme for 6 to 14"
+msgstr "Zabavni program za uzrast od 6 do 14"
+
+msgid "Content$Entertainment Programme for 10 to 16"
+msgstr "Zabavni program za uzrast od 10 do 16"
+
+msgid "Content$Informational/Educational/School Programme"
+msgstr "Informativni/Edukacioni/�kolski Program"
+
+msgid "Content$Cartoons/Puppets"
+msgstr "Crti�i/Lutkarski"
+
+msgid "Content$Music/Ballet/Dance"
+msgstr "Muzi�ki/Balet/Ples"
+
+msgid "Content$Rock/Pop"
+msgstr "Rok/Pop"
+
+msgid "Content$Serious/Classical Music"
+msgstr "Ozbiljna/Klasi�na Muzika"
+
+msgid "Content$Folk/Tradional Music"
+msgstr "Narodna/Izvorna Muzika"
+
+msgid "Content$Jazz"
+msgstr "D�ez"
+
+msgid "Content$Musical/Opera"
+msgstr "Mjuzikli/Opera"
+
+msgid "Content$Ballet"
+msgstr "Balet"
+
+msgid "Content$Arts/Culture"
+msgstr "Umetnost/Kultura"
+
+msgid "Content$Performing Arts"
+msgstr ""
+
+msgid "Content$Fine Arts"
+msgstr ""
+
+msgid "Content$Religion"
+msgstr "Religija"
+
+msgid "Content$Popular Culture/Traditional Arts"
+msgstr "Moderna umetnost/Tradicionalna umetnost"
+
+msgid "Content$Literature"
+msgstr "Literarni"
+
+msgid "Content$Film/Cinema"
+msgstr "Film/Kino"
+
+msgid "Content$Experimental Film/Video"
+msgstr ""
+
+msgid "Content$Broadcasting/Press"
+msgstr ""
+
+msgid "Content$New Media"
+msgstr ""
+
+msgid "Content$Arts/Culture Magazine"
+msgstr ""
+
+msgid "Content$Fashion"
+msgstr "Sadr�aj$Moda"
+
+msgid "Content$Social/Political/Economics"
+msgstr "Sadr�aj$Socijalni/Politi�ki/Ekonomski"
+
+msgid "Content$Magazine/Report/Documentary"
+msgstr "Sadr�aj$Magazin/Reporta�a/Dokumentarni"
+
+msgid "Content$Economics/Social Advisory"
+msgstr ""
+
+msgid "Content$Remarkable People"
+msgstr "Neverovatni Ljudi"
+
+msgid "Content$Education/Science/Factual"
+msgstr ""
+
+msgid "Content$Nature/Animals/Environment"
+msgstr ""
+
+msgid "Content$Technology/Natural Sciences"
+msgstr ""
+
+msgid "Content$Medicine/Physiology/Psychology"
+msgstr ""
+
+msgid "Content$Foreign Countries/Expeditions"
+msgstr ""
+
+msgid "Content$Social/Spiritual Sciences"
+msgstr ""
+
+msgid "Content$Further Education"
+msgstr ""
+
+#, fuzzy
+msgid "Content$Languages"
+msgstr "Jezik"
+
+msgid "Content$Leisure/Hobbies"
+msgstr ""
+
+msgid "Content$Tourism/Travel"
+msgstr ""
+
+msgid "Content$Handicraft"
+msgstr ""
+
+msgid "Content$Motoring"
+msgstr ""
+
+msgid "Content$Fitness & Health"
+msgstr ""
+
+msgid "Content$Cooking"
+msgstr ""
+
+msgid "Content$Advertisement/Shopping"
+msgstr ""
+
+msgid "Content$Gardening"
+msgstr ""
+
+msgid "Content$Original Language"
+msgstr ""
+
+msgid "Content$Black & White"
+msgstr "Crno i Belo"
+
+msgid "Content$Unpublished"
+msgstr "Neobjavljeno"
+
+msgid "Content$Live Broadcast"
+msgstr "Prenos U�ivo"
+
+#, c-format
+msgid "ParentalRating$from %d"
+msgstr "Roditeljska ocena$od %d"
+
+msgid "No title"
+msgstr "Nema naslova"
+
+#. TRANSLATORS: The name of the language, as written natively
+msgid "LanguageName$English"
+msgstr "Srpski"
+
+#. TRANSLATORS: The 3-letter code of the language
+msgid "LanguageCode$eng"
+msgstr "scc"
+
+msgid "Phase 1: Detecting RC code type"
+msgstr "Faza 1: detekcija koda daljinskog upravlja�a"
+
+msgid "Press any key on the RC unit"
+msgstr "Pritisnite jedan taster na daljinskom upravlja�u"
+
+msgid "RC code detected!"
+msgstr "Kod daljinskog upravlja�a je prepoznat!"
+
+msgid "Do not press any key..."
+msgstr "Ne pritiskaj nijedan taster..."
+
+msgid "Phase 2: Learning specific key codes"
+msgstr "Faza 2: U�enje posebnih kodova"
+
+#, c-format
+msgid "Press key for '%s'"
+msgstr "Pritisnite taster za '%s'"
+
+msgid "Press 'Up' to confirm"
+msgstr "Pritisni 'Gore' za prihvatanje"
+
+msgid "Press 'Down' to continue"
+msgstr "Pritisni 'Dole' za nastavak"
+
+msgid "(press 'Up' to go back)"
+msgstr "(pritisni 'Gore' za nazad)"
+
+msgid "(press 'Down' to end key definition)"
+msgstr "(pritisni 'Dole' za kraj)"
+
+msgid "(press 'Menu' to skip this key)"
+msgstr "pritisni 'Meni' da presko�ite ovu tipku"
+
+msgid "Learning Remote Control Keys"
+msgstr "U�enje rasporeda tastera daljinskog upravlja�a"
+
+msgid "Phase 3: Saving key codes"
+msgstr "Faza 3: Snimanje kodova tastera"
+
+msgid "Press 'Up' to save, 'Down' to cancel"
+msgstr "'Gore' za snimi, 'Dole' za prekid"
+
+msgid "Key$Up"
+msgstr "Gore"
+
+msgid "Key$Down"
+msgstr "Dole"
+
+msgid "Key$Menu"
+msgstr "Meni"
+
+msgid "Key$Ok"
+msgstr "Ok"
+
+msgid "Key$Back"
+msgstr "Nazad"
+
+msgid "Key$Left"
+msgstr "Levo"
+
+msgid "Key$Right"
+msgstr "Desno"
+
+msgid "Key$Red"
+msgstr "Crveno"
+
+msgid "Key$Green"
+msgstr "Zeleno"
+
+msgid "Key$Yellow"
+msgstr "�uto"
+
+msgid "Key$Blue"
+msgstr "Plavo"
+
+msgid "Key$Info"
+msgstr "Info"
+
+msgid "Key$Play"
+msgstr "Start"
+
+msgid "Key$Pause"
+msgstr "Pauza"
+
+msgid "Key$Stop"
+msgstr "Stop"
+
+msgid "Key$Record"
+msgstr "Snimaj"
+
+msgid "Key$FastFwd"
+msgstr "Napred"
+
+msgid "Key$FastRew"
+msgstr "Nazad"
+
+msgid "Key$Next"
+msgstr "Slede�e"
+
+msgid "Key$Prev"
+msgstr "Prethodno"
+
+msgid "Key$Power"
+msgstr "Power"
+
+msgid "Key$Channel+"
+msgstr "Kanal+"
+
+msgid "Key$Channel-"
+msgstr "Kanal-"
+
+msgid "Key$PrevChannel"
+msgstr "PrethodniKanal"
+
+msgid "Key$Volume+"
+msgstr "Glasnije"
+
+msgid "Key$Volume-"
+msgstr "Ti�e"
+
+msgid "Key$Mute"
+msgstr "Bez tona"
+
+msgid "Key$Audio"
+msgstr "Audio"
+
+msgid "Key$Subtitles"
+msgstr "Titlovi"
+
+msgid "Key$Schedule"
+msgstr "Raspored"
+
+msgid "Key$Channels"
+msgstr "Kanali"
+
+msgid "Key$Timers"
+msgstr "Tajmeri"
+
+msgid "Key$Recordings"
+msgstr "Snimke"
+
+msgid "Key$Setup"
+msgstr "Pode�avanje"
+
+msgid "Key$Commands"
+msgstr "Naredbe"
+
+msgid "Key$User0"
+msgstr "Korisnik0"
+
+msgid "Key$User1"
+msgstr "Korisnik1"
+
+msgid "Key$User2"
+msgstr "Korisnik2"
+
+msgid "Key$User3"
+msgstr "Korisnik3"
+
+msgid "Key$User4"
+msgstr "Korisnik4"
+
+msgid "Key$User5"
+msgstr "Korisnik5"
+
+msgid "Key$User6"
+msgstr "Korisnik6"
+
+msgid "Key$User7"
+msgstr "Korisnik7"
+
+msgid "Key$User8"
+msgstr "Korisnik8"
+
+msgid "Key$User9"
+msgstr "Korisnik9"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "slobodno"
+
+msgid "Free To Air"
+msgstr "Slobodno"
+
+msgid "encrypted"
+msgstr "kriptirano"
+
+msgid "Edit channel"
+msgstr "Ispravke kanala"
+
+msgid "Name"
+msgstr "Naziv"
+
+msgid "Source"
+msgstr "Izvor"
+
+msgid "Frequency"
+msgstr "Frekvencija"
+
+msgid "Vpid"
+msgstr "Vpid"
+
+msgid "Ppid"
+msgstr "Ppid"
+
+msgid "Apid1"
+msgstr "Apid1"
+
+msgid "Apid2"
+msgstr "Apid2"
+
+msgid "Dpid1"
+msgstr "Dpid1"
+
+msgid "Dpid2"
+msgstr "Dpid2"
+
+msgid "Spid1"
+msgstr "Spid1"
+
+msgid "Spid2"
+msgstr "Spid2"
+
+msgid "Tpid"
+msgstr "Tpid"
+
+msgid "CA"
+msgstr "Kodiranje (CA)"
+
+msgid "Sid"
+msgstr "Sid"
+
+msgid "Channel settings are not unique!"
+msgstr "Postavke programa nisu jedinstvene!"
+
+msgid "Channels"
+msgstr "Kanali"
+
+msgid "Button$Edit"
+msgstr "Promeni"
+
+msgid "Button$New"
+msgstr "Novi"
+
+msgid "Button$Delete"
+msgstr "Obri�i"
+
+msgid "Button$Mark"
+msgstr "Ozna�i"
+
+msgid "Channel is being used by a timer!"
+msgstr "Kanal je trenutno zauzet tajmerom!"
+
+msgid "Delete channel?"
+msgstr "Obrisati kanal?"
+
+#, fuzzy
+msgid "Edit folder"
+msgstr "Ure�ivanje tajmera"
+
+msgid "New folder"
+msgstr "Novi direktorij"
+
+msgid "Sub folder"
+msgstr "Pod Direktorij"
+
+msgid "Folder name already exists!"
+msgstr "Ime direktorija ve� postoji"
+
+#, c-format
+msgid "Folder name must not contain '%c'!"
+msgstr "Naziv direktorija ne smije sadr�avati '%c'! "
+
+#, fuzzy
+msgid "Button$Select"
+msgstr "Zabilje�i"
+
+msgid "Delete folder and all sub folders?"
+msgstr "Obri�i direktorij i sve poddirektorije"
+
+#, fuzzy
+msgid "Delete folder?"
+msgstr "Obri�i direktorij?"
+
+msgid "Edit timer"
+msgstr "Ure�ivanje tajmera"
+
+msgid "Active"
+msgstr "Aktivan"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Day"
+msgstr "Dan"
+
+msgid "Start"
+msgstr "Po�etak"
+
+msgid "Stop"
+msgstr "Kraj"
+
+msgid "VPS"
+msgstr "VPS"
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Lifetime"
+msgstr "Trajanje"
+
+msgid "File"
+msgstr "Datoteka"
+
+#, fuzzy
+msgid "Button$Folder"
+msgstr "Taster$Direktorij"
+
+msgid "First day"
+msgstr "Prvi dan"
+
+msgid "Select folder"
+msgstr "Odaberi direktorij"
+
+msgid "Timers"
+msgstr "Tajmeri"
+
+msgid "Button$On/Off"
+msgstr "Taster$uklju�i/isklju�i"
+
+msgid "Button$Info"
+msgstr "Taster$Info"
+
+msgid "Delete timer?"
+msgstr "Obri�i tajmer?"
+
+msgid "Timer still recording - really delete?"
+msgstr "Tajmer jo� snima - zaista obri�i?"
+
+msgid "Event"
+msgstr "Emisija"
+
+msgid "Button$Timer"
+msgstr "Tajmer"
+
+msgid "Button$Record"
+msgstr "Snimi"
+
+msgid "Button$Switch"
+msgstr "Prebaci"
+
+msgid "What's on now?"
+msgstr "Trenutno na programu ?"
+
+msgid "What's on next?"
+msgstr "�ta je slede�e?"
+
+msgid "Button$Next"
+msgstr "Sledi"
+
+msgid "Button$Now"
+msgstr "Trenutno"
+
+msgid "Button$Schedule"
+msgstr "TV Raspored"
+
+msgid "Can't switch channel!"
+msgstr "Nemogu�e promeniti kanal!"
+
+#, c-format
+msgid "Schedule - %s"
+msgstr "TV Raspored - %s"
+
+#, c-format
+msgid "This event - %s"
+msgstr "Ovaj doga�aj - %s"
+
+msgid "This event - all channels"
+msgstr "Ovaj doga�aj - svi kanali"
+
+msgid "All events - all channels"
+msgstr "Svi doga�aji - svi kanali"
+
+#, c-format
+msgid "Please enter %d digits!"
+msgstr "Molim unesi %d brojeve!"
+
+msgid "CAM not responding!"
+msgstr "CAM ne reaguje!"
+
+msgid "Recording info"
+msgstr "Detalji snimanja"
+
+msgid "Button$Play"
+msgstr "Start"
+
+msgid "Button$Rewind"
+msgstr "Po�etak"
+
+#, fuzzy
+msgid "Recordings"
+msgstr "Snimanje"
+
+#, fuzzy
+msgid "Button$Open"
+msgstr "Meni"
+
+#, fuzzy
+msgid "Commands"
+msgstr "Naredbe"
+
+msgid "Error while accessing recording!"
+msgstr "Gre�ka prilikom pristupa snimanju!"
+
+msgid "Delete recording?"
+msgstr "Obri�i snimku?"
+
+msgid "Error while deleting recording!"
+msgstr "Gre�ka prilikom brisanja snimke!"
+
+msgid "Recording commands"
+msgstr "Naredbe snimanja"
+
+msgid "never"
+msgstr "Nikada"
+
+msgid "skin dependent"
+msgstr "Zavisi od skin-a"
+
+msgid "always"
+msgstr "uvek"
+
+msgid "OSD"
+msgstr "OSD"
+
+msgid "Setup.OSD$Language"
+msgstr "Jezik"
+
+msgid "Setup.OSD$Skin"
+msgstr "Izgled"
+
+msgid "Setup.OSD$Theme"
+msgstr "Tema"
+
+#, fuzzy
+msgid "Setup.OSD$Left (%)"
+msgstr "Levo(%)"
+
+#, fuzzy
+msgid "Setup.OSD$Top (%)"
+msgstr "Gore(%)"
+
+#, fuzzy
+msgid "Setup.OSD$Width (%)"
+msgstr "�irina (%)"
+
+#, fuzzy
+msgid "Setup.OSD$Height (%)"
+msgstr "Visina (%)"
+
+msgid "Setup.OSD$Message time (s)"
+msgstr "Du�ina prikaza poruka (s)"
+
+msgid "Setup.OSD$Use small font"
+msgstr "Koristi mala slova"
+
+msgid "Setup.OSD$Anti-alias"
+msgstr "Anti-alias"
+
+msgid "Setup.OSD$Default font"
+msgstr "Zadani font"
+
+msgid "Setup.OSD$Small font"
+msgstr "Mali font"
+
+msgid "Setup.OSD$Fixed font"
+msgstr "Nepromenjiv font"
+
+#, fuzzy
+msgid "Setup.OSD$Default font size (%)"
+msgstr "Veli�ina zadanog fonta (piksel)"
+
+#, fuzzy
+msgid "Setup.OSD$Small font size (%)"
+msgstr "Veli�ina malog fonta (piksel)"
+
+#, fuzzy
+msgid "Setup.OSD$Fixed font size (%)"
+msgstr "Veli�ina nepromenjivog fonta (piksel)"
+
+msgid "Setup.OSD$Channel info position"
+msgstr "Pozicija informacija o programu"
+
+msgid "bottom"
+msgstr "dno"
+
+msgid "top"
+msgstr "vrh"
+
+msgid "Setup.OSD$Channel info time (s)"
+msgstr "Vreme prikaza informacije o kanalu (s)"
+
+msgid "Setup.OSD$Info on channel switch"
+msgstr "Informacije kod promene kanala"
+
+msgid "Setup.OSD$Timeout requested channel info"
+msgstr "Du�ina prikaza informacije o kanalu"
+
+msgid "Setup.OSD$Scroll pages"
+msgstr "Listaj po stranicama"
+
+msgid "Setup.OSD$Scroll wraps"
+msgstr "Sko�i s kraja na po�etak"
+
+msgid "Setup.OSD$Menu key closes"
+msgstr "Taster Meni zatvara"
+
+msgid "Setup.OSD$Recording directories"
+msgstr "Direktorij za snimke"
+
+#, fuzzy
+msgid "Setup.OSD$Folders in timer menu"
+msgstr "Direktoriji u tajmer meni-ju "
+
+#, fuzzy
+msgid "Setup.OSD$Number keys for characters"
+msgstr "Number keys for characters"
+
+msgid "EPG"
+msgstr "EPG (TV Raspored�)"
+
+msgid "Button$Scan"
+msgstr "Pretra�i"
+
+msgid "Setup.EPG$EPG scan timeout (h)"
+msgstr "Vreme do EPG pregleda (h)"
+
+msgid "Setup.EPG$EPG bugfix level"
+msgstr "Nivo ispravaka EPG gre�aka"
+
+msgid "Setup.EPG$EPG linger time (min)"
+msgstr "Vreme EPG zadr�avanja (min)"
+
+msgid "Setup.EPG$Set system time"
+msgstr "Podesi sistemsko vreme"
+
+msgid "Setup.EPG$Use time from transponder"
+msgstr "Koristi vreme sa transpondera"
+
+#. TRANSLATORS: note the plural!
+msgid "Setup.EPG$Preferred languages"
+msgstr "Odaberi jezike"
+
+#. TRANSLATORS: note the singular!
+msgid "Setup.EPG$Preferred language"
+msgstr "Odaberi jezik"
+
+msgid "pan&scan"
+msgstr "pro�iri i ispitaj"
+
+msgid "letterbox"
+msgstr "pravougaonik"
+
+msgid "center cut out"
+msgstr "izre�i sredinu"
+
+#, fuzzy
+msgid "no"
+msgstr "ni�ta"
+
+msgid "names only"
+msgstr "samo imena"
+
+msgid "PIDs only"
+msgstr "Samo PID-ovi"
+
+msgid "names and PIDs"
+msgstr "imena i (PIDs)"
+
+msgid "add new channels"
+msgstr "dodaj nove kanale"
+
+msgid "add new transponders"
+msgstr "dodaj nove transpondere"
+
+msgid "DVB"
+msgstr "DVB"
+
+msgid "Setup.DVB$Primary DVB interface"
+msgstr "Primarni DVB ure�aj"
+
+msgid "Setup.DVB$Video format"
+msgstr "Video format"
+
+msgid "Setup.DVB$Video display format"
+msgstr "Format video prikaza"
+
+msgid "Setup.DVB$Use Dolby Digital"
+msgstr "Koristi Dolby Digital"
+
+msgid "Setup.DVB$Update channels"
+msgstr "A�uriranje kanala"
+
+msgid "Setup.DVB$Audio languages"
+msgstr "Audio jezici"
+
+msgid "Setup.DVB$Audio language"
+msgstr "Audio jezik"
+
+msgid "Setup.DVB$Display subtitles"
+msgstr "Poka�i titlove"
+
+msgid "Setup.DVB$Subtitle languages"
+msgstr "Jezici titla"
+
+msgid "Setup.DVB$Subtitle language"
+msgstr "Jezik titla"
+
+msgid "Setup.DVB$Subtitle offset"
+msgstr "Pomak titla"
+
+msgid "Setup.DVB$Subtitle foreground transparency"
+msgstr "Providnost titla"
+
+msgid "Setup.DVB$Subtitle background transparency"
+msgstr "Providnost pozadine titla"
+
+msgid "LNB"
+msgstr "LNB"
+
+msgid "Setup.LNB$Use DiSEqC"
+msgstr "Koristi DiSEqC"
+
+msgid "Setup.LNB$SLOF (MHz)"
+msgstr "SLOF (MHz)"
+
+msgid "Setup.LNB$Low LNB frequency (MHz)"
+msgstr "Donja LNB frekv. (MHz)"
+
+msgid "Setup.LNB$High LNB frequency (MHz)"
+msgstr "Gornja LNB frekv. (MHz)"
+
+msgid "CAM reset"
+msgstr "Ponovno pokreni CAM"
+
+msgid "CAM present"
+msgstr "CAM prisutan"
+
+msgid "CAM ready"
+msgstr "CAM spreman"
+
+msgid "CAM"
+msgstr "CAM"
+
+msgid "Button$Menu"
+msgstr "Meni"
+
+msgid "Button$Reset"
+msgstr "Ponovno pokreni"
+
+msgid "Opening CAM menu..."
+msgstr "Otvaram CAM meni..."
+
+msgid "Can't open CAM menu!"
+msgstr "Otvaranje CAM menija neuspe�no!"
+
+msgid "CAM is in use - really reset?"
+msgstr "CAM u upotrebi - ponovno pokrenuti?"
+
+msgid "Can't reset CAM!"
+msgstr "Ponovno pokretanje CAM-a neuspe�no!"
+
+#, fuzzy
+msgid "do not pause live video"
+msgstr "Ne zaustavljaj izravan prenos"
+
+#, fuzzy
+msgid "confirm pause live video"
+msgstr "Potvrdi zaustavljanje izravnog prenosa..."
+
+#, fuzzy
+msgid "pause live video"
+msgstr "Zaustavljanje izravnog prenosa..."
+
+msgid "confirm"
+msgstr "potvrdi"
+
+msgid "yes"
+msgstr ""
+
+msgid "Recording"
+msgstr "Snimanje"
+
+msgid "Setup.Recording$Margin at start (min)"
+msgstr "Rezerva na po�etku snimanja (min)"
+
+msgid "Setup.Recording$Margin at stop (min)"
+msgstr "Rezerva na kraju (min)"
+
+msgid "Setup.Recording$Primary limit"
+msgstr "Standardno ograni�enje"
+
+msgid "Setup.Recording$Default priority"
+msgstr "Zadani prioritet"
+
+msgid "Setup.Recording$Default lifetime (d)"
+msgstr "Zadano trajanje (d)"
+
+#, fuzzy
+msgid "Setup.Recording$Pause key handling"
+msgstr "Trajanje pauze (d)"
+
+msgid "Setup.Recording$Pause priority"
+msgstr "Prioritet pauze"
+
+msgid "Setup.Recording$Pause lifetime (d)"
+msgstr "Trajanje pauze (d)"
+
+msgid "Setup.Recording$Use episode name"
+msgstr "Koristi naziv epizode"
+
+msgid "Setup.Recording$Use VPS"
+msgstr "Koristi VPS"
+
+msgid "Setup.Recording$VPS margin (s)"
+msgstr "Vremenska rezerva kod VPS (s)"
+
+msgid "Setup.Recording$Mark instant recording"
+msgstr "Ozna�i trenutno snimanje"
+
+msgid "Setup.Recording$Name instant recording"
+msgstr "Imenuj trenutno snimanje"
+
+msgid "Setup.Recording$Instant rec. time (min)"
+msgstr "Trajanje trenutnog snimanja (min)"
+
+msgid "Setup.Recording$Max. video file size (MB)"
+msgstr "Maks. veli�ina datoteke (MB)"
+
+msgid "Setup.Recording$Split edited files"
+msgstr "Podeli ure�ene datoteke"
+
+msgid "Setup.Recording$Delete timeshift recording"
+msgstr "Bri�i vremenski pomak snimke"
+
+msgid "Replay"
+msgstr "Reprodukcija"
+
+msgid "Setup.Replay$Multi speed mode"
+msgstr "Vi�estruke brzine reprodukcije"
+
+msgid "Setup.Replay$Show replay mode"
+msgstr "Prika�i re�im reprodukcije"
+
+msgid "Setup.Replay$Resume ID"
+msgstr "ID nastavka"
+
+msgid "Miscellaneous"
+msgstr "Razno"
+
+msgid "Setup.Miscellaneous$Min. event timeout (min)"
+msgstr "Min. vreme pauze (min)"
+
+msgid "Setup.Miscellaneous$Min. user inactivity (min)"
+msgstr "Min. vreme neaktivnosti (min)"
+
+msgid "Setup.Miscellaneous$SVDRP timeout (s)"
+msgstr "SVDRP vreme (s)"
+
+msgid "Setup.Miscellaneous$Zap timeout (s)"
+msgstr "Zap isti�e (s)"
+
+msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
+msgstr "Upis kanala isti�e (ms)"
+
+msgid "Setup.Miscellaneous$Initial channel"
+msgstr "Po�etni kanal"
+
+msgid "Setup.Miscellaneous$as before"
+msgstr "kao prethodno"
+
+msgid "Setup.Miscellaneous$Initial volume"
+msgstr "Po�etna ja�ina tona"
+
+#, fuzzy
+msgid "Setup.Miscellaneous$Channels wrap"
+msgstr "Kanal spakovan"
+
+msgid "Setup.Miscellaneous$Emergency exit"
+msgstr "Izlaz u slu�aju nu�de"
+
+msgid "Plugins"
+msgstr "Dodaci"
+
+msgid "This plugin has no setup parameters!"
+msgstr "Ovaj dodatak nema parametara!"
+
+msgid "Setup"
+msgstr "Podesi"
+
+msgid "Restart"
+msgstr "Restart sistema"
+
+msgid "Really restart?"
+msgstr "Ponovo pokretanje ???"
+
+#. TRANSLATORS: note the leading and trailing blanks!
+msgid " Stop recording "
+msgstr " Zaustavi snimanje "
+
+msgid "Schedule"
+msgstr "Raspored Programa"
+
+msgid "VDR"
+msgstr "VDR"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Stop replaying"
+msgstr " Zaustavi reprodukciju"
+
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Pause"
+msgstr "Pauza"
+
+msgid "Button$Stop"
+msgstr "Stop"
+
+msgid "Button$Resume"
+msgstr "Nastavi"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel editing"
+msgstr "Zaustavi ispravke"
+
+msgid "Stop recording?"
+msgstr "Zaustavi snimanje?"
+
+msgid "Cancel editing?"
+msgstr "Otka�i ispravke?"
+
+msgid "No audio available!"
+msgstr "Ton nedostupan"
+
+msgid "No subtitles"
+msgstr "Bez titlova"
+
+msgid "Button$Subtitles"
+msgstr "Titlovi"
+
+msgid "No subtitles available!"
+msgstr "Titlovi nisu dostupni!"
+
+msgid "Not enough disk space to start recording!"
+msgstr "Nedovoljno prostora na disku za snimanje!"
+
+#, fuzzy
+msgid "No free DVB device to record!"
+msgstr "Nema slobodnog DVB ure�aja za snimanje!"
+
+msgid "Pausing live video..."
+msgstr "Zaustavljanje izravnog prenosa..."
+
+#, fuzzy
+msgid "Delete timeshift recording?"
+msgstr "Obrisati snimku vremenskog pomaka?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Jump: "
+msgstr "Sko�i: "
+
+msgid "No editing marks defined!"
+msgstr "Nijedna ta�ka rezanja nije odre�ena!"
+
+msgid "Can't start editing process!"
+msgstr "Ne mogu zapo�eti ure�ivanje!"
+
+msgid "Editing process started"
+msgstr "Ure�ivanje zapo�elo"
+
+msgid "Editing process already active!"
+msgstr "Ure�ivanje je ve� u toku!!"
+
+msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr "abcćdđefghijklmnopqrstuvwxyzžŸ0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+
+msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+
+msgid "Button$ABC/abc"
+msgstr "ABC/abc"
+
+msgid "Button$Overwrite"
+msgstr "Prepi�i"
+
+msgid "Button$Insert"
+msgstr "Ubaci"
+
+msgid "Plugin"
+msgstr "Dodatak"
+
+msgid "Up/Dn for new location - OK to move"
+msgstr "Gore/Dole na novu poziciju - OK za prihvati"
+
+msgid "Channel locked (recording)!"
+msgstr "Kanal zaklju�an (snimanje)!"
+
+msgid "Low disk space!"
+msgstr "Malo prostora na disku!"
+
+msgid "Regenerating index file"
+msgstr "Obnavljanje index datoteke"
+
+msgid "Index file regeneration complete"
+msgstr "Obnavljanje index datoteke zavr�eno"
+
+msgid "Can't shutdown - option '-s' not given!"
+msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
+
+msgid "Editing - shut down anyway?"
+msgstr "Ispravke u toku - u svakom slu�aju isklju�i ?"
+
+msgid "Recording - shut down anyway?"
+msgstr "Snimanje u toku - u svakom slu�aju isklju�i ?"
+
+#, c-format
+msgid "Recording in %ld minutes, shut down anyway?"
+msgstr "Snimanje za %ld minuta - u svakom slu�aju isklju�i?"
+
+msgid "shut down anyway?"
+msgstr "u svakom slu�aju isklju�i?"
+
+#, c-format
+msgid "Plugin %s wakes up in %ld min, continue?"
+msgstr "Dodatak %s budi se u %ld min, nastavi?"
+
+msgid "Editing - restart anyway?"
+msgstr "Ure�ivanje u toku - ponovno pokreni!!!?"
+
+msgid "Recording - restart anyway?"
+msgstr "Snimanje je u toku - ponovno pokreni!!!?"
+
+msgid "restart anyway?"
+msgstr "ponovo pokreni?"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "Ja�ina "
+
+msgid "Classic VDR"
+msgstr "Klasi�ni VDR"
+
+msgid "ST:TNG Panels"
+msgstr "ST:TNG Panele"
+
+#. TRANSLATORS: the first character of each weekday, beginning with monday
+msgid "MTWTFSS"
+msgstr "PUS�PSN"
+
+#. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
+msgid "MonTueWedThuFriSatSun"
+msgstr "PonUtoSre�etPetSubNed"
+
+msgid "Monday"
+msgstr "Ponedeljak"
+
+msgid "Tuesday"
+msgstr "Utorak"
+
+msgid "Wednesday"
+msgstr "Sreda"
+
+msgid "Thursday"
+msgstr "�etvrtak"
+
+msgid "Friday"
+msgstr "Petak"
+
+msgid "Saturday"
+msgstr "Subota"
+
+msgid "Sunday"
+msgstr "Nedelja"
+
+msgid "Upcoming recording!"
+msgstr "Predstoje�e snimanje!"
+
+#, fuzzy
+msgid "Pause live video?"
+msgstr "Zaustavljam izravni prenos..."
+
+msgid "Recording started"
+msgstr "Snimanje zapo�elo"
+
+msgid "VDR will shut down later - press Power to force"
+msgstr "VDR �e se isklju�iti kasnije - pritisni Power-taster za prisilno isklju�enje"
+
+msgid "Press any key to cancel shutdown"
+msgstr "Pritisni taster za prekid isklju�enja"
+
+msgid "Switching primary DVB..."
+msgstr "Prebacivanje primarnog DVB ure�aja..."
+
+msgid "Editing process failed!"
+msgstr "Ure�ivanje neusp�jeno!"
+
+msgid "Editing process finished"
+msgstr "Ure�ivanje zavr�eno"
+
+msgid "Press any key to cancel restart"
+msgstr "Pritisni jedan taster za poni�tenje restart-a"
+
+#, c-format
+msgid "VDR will shut down in %s minutes"
+msgstr "VDR se isklju�uje za %s minuta"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e9d39dd5c..db251ab6f 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,13 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
-"Language-Team: Swedish\n"
+"Language-Team: Swedish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 9acd1c1ef..2f44ecdd2 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
-"Language-Team: Turkish\n"
+"Language-Team: Turkish <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index b62fca729..515174a26 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
-"Language-Team: Ukrainian\n"
+"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bffa3017d..0ea002687 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,13 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2010-10-24 16:26+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
-"Language-Team: Chinese\n"
+"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/receiver.c b/receiver.c
index 58dda78f6..6a9ba045a 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,11 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.3 2010/02/28 14:25:32 kls Exp $
+ * $Id: receiver.c 2.4 2010/12/12 23:16:25 kls Exp $
  */
 
 #include "receiver.h"
-#include <stdarg.h>
 #include <stdio.h>
 #include "tools.h"
 
diff --git a/recorder.c b/recorder.c
index 60631e0a8..f7c3fb03d 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.8 2010/01/29 16:37:22 kls Exp $
+ * $Id: recorder.c 2.9 2010/12/27 11:35:46 kls Exp $
  */
 
 #include "recorder.h"
@@ -24,8 +24,9 @@
 cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority)
 :cReceiver(Channel, Priority)
 ,cThread("recording")
-,recordingInfo(FileName)
 {
+  recordingName = strdup(FileName);
+
   // Make sure the disk is up and running:
 
   SpinUpDisk(FileName);
@@ -69,6 +70,7 @@ cRecorder::~cRecorder()
   delete fileName;
   delete frameDetector;
   delete ringBuffer;
+  free(recordingName);
 }
 
 bool cRecorder::RunningLowOnDiskSpace(void)
@@ -127,10 +129,12 @@ void cRecorder::Action(void)
                  break;
               if (frameDetector->Synced()) {
                  if (!InfoWritten) {
-                    if (recordingInfo.Read()) {
-                       if (frameDetector->FramesPerSecond() > 0 && !DoubleEqual(recordingInfo.FramesPerSecond(), frameDetector->FramesPerSecond())) {
-                          recordingInfo.SetFramesPerSecond(frameDetector->FramesPerSecond());
-                          recordingInfo.Write();
+                    cRecordingInfo RecordingInfo(recordingName);
+                    if (RecordingInfo.Read()) {
+                       if (frameDetector->FramesPerSecond() > 0 && !DoubleEqual(RecordingInfo.FramesPerSecond(), frameDetector->FramesPerSecond())) {
+                          RecordingInfo.SetFramesPerSecond(frameDetector->FramesPerSecond());
+                          RecordingInfo.Write();
+                          Recordings.UpdateByName(recordingName);
                           }
                        }
                     InfoWritten = true;
diff --git a/recorder.h b/recorder.h
index d11d7adfc..05cc42b09 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 2.2 2010/01/29 16:32:32 kls Exp $
+ * $Id: recorder.h 2.3 2010/12/27 11:17:04 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -24,7 +24,7 @@ class cRecorder : public cReceiver, cThread {
   cFileName *fileName;
   cIndexFile *index;
   cUnbufferedFile *recordFile;
-  cRecordingInfo recordingInfo;
+  char *recordingName;
   off_t fileSize;
   time_t lastDiskSpaceCheck;
   bool RunningLowOnDiskSpace(void);
diff --git a/recording.c b/recording.c
index 96dc95f9a..02a6e6123 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.23 2010/03/07 14:06:04 kls Exp $
+ * $Id: recording.c 2.26 2011/02/27 13:35:20 kls Exp $
  */
 
 #include "recording.h"
@@ -57,6 +57,7 @@
 #define DELETEDLIFETIME   300 // seconds after which a deleted recording will be actually removed
 #define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
+#define MARKSUPDATEDELTA   10 // seconds between checks for updating editing marks
 
 #define MAX_SUBTITLE_LENGTH  40
 
@@ -548,13 +549,17 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                      default:
                        if (strchr(InvalidChars, *p) || *p == '.' && (!*(p + 1) || *(p + 1) == FOLDERDELIMCHAR)) { // Windows can't handle '.' at the end of file/directory names
                           int l = p - s;
-                          s = (char *)realloc(s, strlen(s) + 10);
-                          p = s + l;
-                          char buf[4];
-                          sprintf(buf, "#%02X", (unsigned char)*p);
-                          memmove(p + 2, p, strlen(p) + 1);
-                          strncpy(p, buf, 3);
-                          p += 2;
+                          if (char *NewBuffer = (char *)realloc(s, strlen(s) + 10)) {
+                             s = NewBuffer;
+                             p = s + l;
+                             char buf[4];
+                             sprintf(buf, "#%02X", (unsigned char)*p);
+                             memmove(p + 2, p, strlen(p) + 1);
+                             strncpy(p, buf, 3);
+                             p += 2;
+                             }
+                          else
+                             esyslog("ERROR: out of memory");
                           }
                      }
               }
@@ -678,7 +683,7 @@ cRecording::cRecording(const char *FileName)
   const char *p = strrchr(FileName, '/');
 
   name = NULL;
-  info = new cRecordingInfo;
+  info = new cRecordingInfo(fileName);
   if (p) {
      time_t now = time(NULL);
      struct tm tm_r;
@@ -729,9 +734,13 @@ cRecording::cRecording(const char *FileName)
                     if (data[line]) {
                        int len = strlen(s);
                        len += strlen(data[line]) + 1;
-                       data[line] = (char *)realloc(data[line], len + 1);
-                       strcat(data[line], "\n");
-                       strcat(data[line], s);
+                       if (char *NewBuffer = (char *)realloc(data[line], len + 1)) {
+                          data[line] = NewBuffer;
+                          strcat(data[line], "\n");
+                          strcat(data[line], s);
+                          }
+                       else
+                          esyslog("ERROR: out of memory");
                        }
                     else
                        data[line] = strdup(s);
@@ -750,12 +759,16 @@ cRecording::cRecording(const char *FileName)
               // line 1 and line 2 to be the long text:
               int len = strlen(data[1]);
               if (len > 80) {
-                 data[1] = (char *)realloc(data[1], len + 1 + strlen(data[2]) + 1);
-                 strcat(data[1], "\n");
-                 strcat(data[1], data[2]);
-                 free(data[2]);
-                 data[2] = data[1];
-                 data[1] = NULL;
+                 if (char *NewBuffer = (char *)realloc(data[1], len + 1 + strlen(data[2]) + 1)) {
+                    data[1] = NewBuffer;
+                    strcat(data[1], "\n");
+                    strcat(data[1], data[2]);
+                    free(data[2]);
+                    data[2] = data[1];
+                    data[1] = NULL;
+                    }
+                 else
+                    esyslog("ERROR: out of memory");
                  }
               }
            info->SetData(data[0], data[1], data[2]);
@@ -921,6 +934,14 @@ bool cRecording::IsEdited(void) const
   return *s == '%';
 }
 
+void cRecording::ReadInfo(void)
+{
+  info->Read();
+  priority = info->priority;
+  lifetime = info->lifetime;
+  framesPerSecond = info->framesPerSecond;
+}
+
 bool cRecording::WriteInfo(void)
 {
   cString InfoFileName = cString::sprintf("%s%s", fileName, isPesRecording ? INFOFILESUFFIX ".vdr" : INFOFILESUFFIX);
@@ -1172,6 +1193,14 @@ void cRecordings::DelByName(const char *FileName)
      }
 }
 
+void cRecordings::UpdateByName(const char *FileName)
+{
+  LOCK_THREAD;
+  cRecording *recording = GetByName(FileName);
+  if (recording)
+     recording->ReadInfo();
+}
+
 int cRecordings::TotalFileSizeMB(void)
 {
   int size = 0;
@@ -1239,12 +1268,28 @@ bool cMark::Save(FILE *f)
 
 bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool IsPesRecording)
 {
-  cMutexLock MutexLock(&MutexMarkFramesPerSecond);
+  fileName = AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
   framesPerSecond = FramesPerSecond;
-  MarkFramesPerSecond = framesPerSecond;
-  if (cConfig<cMark>::Load(AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX))) {
-     Sort();
-     return true;
+  lastUpdate = 0;
+  lastFileTime = -1; // the first call to Load() must take place!
+  return Update();
+}
+
+bool cMarks::Update(void)
+{
+  time_t t = time(NULL);
+  if (t - lastUpdate > MARKSUPDATEDELTA) {
+     lastUpdate = t;
+     t = LastModifiedTime(fileName);
+     if (t > lastFileTime) {
+        lastFileTime = t;
+        cMutexLock MutexLock(&MutexMarkFramesPerSecond);
+        MarkFramesPerSecond = framesPerSecond;
+        if (cConfig<cMark>::Load(fileName)) {
+           Sort();
+           return true;
+           }
+        }
      }
   return false;
 }
@@ -1604,13 +1649,15 @@ bool cIndexFile::CatchUp(int Index)
                }
             int newLast = int(buf.st_size / sizeof(tIndexTs) - 1);
             if (newLast > last) {
-               if (size <= newLast) {
-                  size *= 2;
-                  if (size <= newLast)
-                     size = newLast + 1;
+               int NewSize = size;
+               if (NewSize <= newLast) {
+                  NewSize *= 2;
+                  if (NewSize <= newLast)
+                     NewSize = newLast + 1;
                   }
-               index = (tIndexTs *)realloc(index, size * sizeof(tIndexTs));
-               if (index) {
+               if (tIndexTs *NewBuffer = (tIndexTs *)realloc(index, NewSize * sizeof(tIndexTs))) {
+                  size = NewSize;
+                  index = NewBuffer;
                   int offset = (last + 1) * sizeof(tIndexTs);
                   int delta = (newLast - last) * sizeof(tIndexTs);
                   if (lseek(f, offset, SEEK_SET) == offset) {
@@ -1629,8 +1676,10 @@ bool cIndexFile::CatchUp(int Index)
                   else
                      LOG_ERROR_STR(fileName);
                   }
-               else
+               else {
                   esyslog("ERROR: can't realloc() index");
+                  break;
+                  }
                }
             }
          else
diff --git a/recording.h b/recording.h
index 939878f2f..93b5a9ccb 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.14 2010/03/07 14:06:15 kls Exp $
+ * $Id: recording.h 2.16 2011/02/27 12:48:21 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -117,6 +117,7 @@ class cRecording : public cListObject {
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
+  void ReadInfo(void);
   bool WriteInfo(void);
   bool Delete(void);
        // Changes the file name so that it will no longer be visible in the "Recordings" menu
@@ -165,6 +166,7 @@ class cRecordings : public cList<cRecording>, public cThread {
   cRecording *GetByName(const char *FileName);
   void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
+  void UpdateByName(const char *FileName);
   int TotalFileSizeMB(void); ///< Only for deleted recordings!
   };
 
@@ -188,9 +190,13 @@ class cMark : public cListObject {
 
 class cMarks : public cConfig<cMark> {
 private:
+  cString fileName;
   double framesPerSecond;
+  time_t lastUpdate;
+  time_t lastFileTime;
 public:
   bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
+  bool Update(void);
   void Sort(void);
   cMark *Add(int Position);
   cMark *Get(int Position);
diff --git a/remote.c b/remote.c
index 82d5f007b..048b98c30 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.1 2009/12/06 12:08:03 kls Exp $
+ * $Id: remote.c 2.2 2010/12/24 15:26:05 kls Exp $
  */
 
 #include "remote.h"
@@ -42,6 +42,7 @@ cRemote::cRemote(const char *Name)
 
 cRemote::~cRemote()
 {
+  Remotes.Del(this, false);
   free(name);
 }
 
diff --git a/remux.c b/remux.c
index 520654448..f7ad86ddc 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.47 2010/06/05 13:32:15 kls Exp $
+ * $Id: remux.c 2.51 2011/02/26 15:51:04 kls Exp $
  */
 
 #include "remux.h"
@@ -225,7 +225,7 @@ int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language
       Target[i++] = *Language++;
       Target[i++] = *Language++;
       Target[i++] = *Language++;
-      Target[i++] = 0x01;     // audio type
+      Target[i++] = 0x00;     // audio type
       Target[Length] += 0x04; // length
       if (*Language == '+')
          Language++;
@@ -666,9 +666,13 @@ void cTsToPes::PutTs(const uchar *Data, int Length)
      return; // skip everything before the first payload start
   Length = TsGetPayload(&Data);
   if (length + Length > size) {
-     size = max(KILOBYTE(2), length + Length);
-     data = (uchar *)realloc(data, size);
-     if (!data) {
+     int NewSize = max(KILOBYTE(2), length + Length);
+     if (uchar *NewData = (uchar *)realloc(data, NewSize)) {
+        data = NewData;
+        size = NewSize;
+        }
+     else {
+        esyslog("ERROR: out of memory");
         Reset();
         return;
         }
@@ -780,9 +784,8 @@ cFrameDetector::cFrameDetector(int Pid, int Type)
   newFrame = independentFrame = false;
   numPtsValues = 0;
   numIFrames = 0;
-  frameDuration = 0;
+  framesPerSecond = 0;
   framesInPayloadUnit = framesPerPayloadUnit = 0;
-  payloadUnitOfFrame = 0;
   scanning = false;
   scanner = EMPTY_SCANNER;
 }
@@ -804,7 +807,6 @@ void cFrameDetector::SetPid(int Pid, int Type)
 void cFrameDetector::Reset(void)
 {
   newFrame = independentFrame = false;
-  payloadUnitOfFrame = 0;
   scanning = false;
   scanner = EMPTY_SCANNER;
 }
@@ -831,8 +833,8 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                     return Processed;
                  if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
                     return Processed; // need more data, in case the frame type is not stored in the first TS packet
-                 if (!frameDuration) {
-                    // frame duration unknown, so collect a sequence of PTS values:
+                 if (!framesPerSecond) {
+                    // frame rate unknown, so collect a sequence of PTS values:
                     if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
                        const uchar *Pes = Data + TsPayloadOffset(Data);
                        if (PesHasPts(Pes)) {
@@ -857,28 +859,22 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        uint32_t Delta = ptsValues[0];
                        // determine frame info:
                        if (isVideo) {
-                          if (Delta % 3600 == 0)
-                             frameDuration = 3600; // PAL, 25 fps, exact timing
-                          else if (abs(Delta % 3600) == 3599 || abs(Delta % 3600) == 1)
-                             frameDuration = 3600; // PAL, 25 fps, timing with jitter
+                          if (abs(Delta - 3600) <= 1)
+                             framesPerSecond = 25.0;
                           else if (Delta % 3003 == 0)
-                             frameDuration = 3003; // NTSC, 29.97 fps
-                          else if (abs(Delta - 1800) <= 1) {
-                             frameDuration = 3600; // PAL, 25 fps
-                             framesPerPayloadUnit = -2;
-                             }
-                          else if (Delta == 1501) {
-                             frameDuration = 3003; // NTSC, 29.97 fps
-                             framesPerPayloadUnit = -2;
-                             }
+                             framesPerSecond = 30.0 / 1.001;
+                          else if (abs(Delta - 1800) <= 1)
+                             framesPerSecond = 50.0;
+                          else if (Delta == 1501)
+                             framesPerSecond = 60.0 / 1.001;
                           else {
-                             frameDuration = 3600; // unknown, assuming 25 fps
-                             dsyslog("unknown frame duration (%d), assuming 25 fps", Delta);
+                             framesPerSecond = 25.0;
+                             dsyslog("unknown frame delta (%d), assuming 25 fps", Delta);
                              }
                           }
                        else // audio
-                          frameDuration = Delta; // PTS of audio frames is always increasing
-                       dbgframes("\nframe duration = %d  FPS = %5.2f  FPPU = %d\n", frameDuration, 90000.0 / frameDuration, framesPerPayloadUnit);
+                          framesPerSecond = 90000.0 / Delta; // PTS of audio frames is always increasing
+                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d\n", Delta, framesPerSecond, framesPerPayloadUnit);
                        }
                     }
                  scanner = EMPTY_SCANNER;
@@ -927,13 +923,6 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                newFrame = true;
                                independentFrame = Data[i + 1] == 0x10;
                                if (synced) {
-                                  if (framesPerPayloadUnit < 0) {
-                                     payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
-                                     if (payloadUnitOfFrame != 0 && independentFrame)
-                                        payloadUnitOfFrame = 0;
-                                     if (payloadUnitOfFrame)
-                                        newFrame = false;
-                                     }
                                   if (framesPerPayloadUnit <= 1)
                                      scanning = false;
                                   }
@@ -964,7 +953,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                 pid = 0; // let's just ignore any further data
                        }
                      }
-                 if (!synced && frameDuration && independentFrame) {
+                 if (!synced && framesPerSecond && independentFrame) {
                     synced = true;
                     dbgframes("*");
                     Reset();
diff --git a/remux.h b/remux.h
index 7b6218780..7140aaf04 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.26 2010/06/05 13:27:55 kls Exp $
+ * $Id: remux.h 2.27 2010/11/01 11:24:20 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -347,12 +347,10 @@ class cFrameDetector {
   int numPtsValues;
   int numIFrames;
   bool isVideo;
-  int frameDuration;
+  double framesPerSecond;
   int framesInPayloadUnit;
   int framesPerPayloadUnit; // Some broadcasters send one frame per payload unit (== 1),
-                            // some put an entire GOP into one payload unit (> 1), and
-                            // some spread a single frame over several payload units (< 0).
-  int payloadUnitOfFrame;
+                            // while others put an entire GOP into one payload unit (> 1).
   bool scanning;
   uint32_t scanner;
 public:
@@ -380,7 +378,7 @@ class cFrameDetector {
       ///< Returns true if a new frame was detected and this is an independent frame
       ///< (i.e. one that can be displayed by itself, without using data from any
       ///< other frames).
-  double FramesPerSecond(void) { return frameDuration ? 90000.0 / frameDuration : 0; }
+  double FramesPerSecond(void) { return framesPerSecond; }
       ///< Returns the number of frames per second, or 0 if this information is not
       ///< available.
   };
diff --git a/skinclassic.c b/skinclassic.c
index 385201074..33332467b 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.4 2010/02/13 13:44:48 kls Exp $
+ * $Id: skinclassic.c 2.5 2010/11/07 15:10:23 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -361,14 +361,6 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
      ts.Set(osd, x1, y, x2 - x1, y3 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
-  for (int i = 0; Event->Contents(i); i++) {
-      const char *s = Event->ContentToString(Event->Contents(i));
-      if (!isempty(s)) {
-         const cFont *font = cFont::GetFont(fontSml);
-         ts.Set(osd, x1, y, x2 - x1, y3 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
-         y += ts.Height();
-         }
-      }
   y += font->Height();
   if (!isempty(Event->Description())) {
      textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Event->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
@@ -405,14 +397,6 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
      ts.Set(osd, x1, y, x2 - x1, y3 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
-  for (int i = 0; Info->GetEvent()->Contents(i); i++) {
-      const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i));
-      if (!isempty(s)) {
-         const cFont *font = cFont::GetFont(fontSml);
-         ts.Set(osd, x1, y, x2 - x1, y3 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
-         y += ts.Height();
-         }
-      }
   y += font->Height();
   if (!isempty(Info->Description())) {
      textScroller.Set(osd, x1, y, x2 - x1, y3 - y, Info->Description(), font, Theme.Color(clrMenuEventDescription), Theme.Color(clrBackground));
diff --git a/skinsttng.c b/skinsttng.c
index b37a2e9d7..9bd1b15c1 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.5 2010/02/13 13:30:59 kls Exp $
+ * $Id: skinsttng.c 2.7 2011/02/20 13:02:49 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -182,12 +182,17 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      int yt = (y0 + y1) / 2;
      int yb = (y6 + y7) / 2;
      osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y7));
-     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } };
-     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 32 } }; // TrueColor
+     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      else {
-        tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
-        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } }; // 256 colors
+        if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        else {
+           tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } }; // 16 colors
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+           }
         }
      osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
      osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
@@ -220,12 +225,17 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
      y0 = 0;
      y1 = lineHeight;
      osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y1));
-     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
-     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 32 } }; // TrueColor
+     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      else {
-        tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
-        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } }; // 256 colors
+        if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        else {
+           tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } }; // 16 colors
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+           }
         }
      osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
      osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
@@ -397,21 +407,26 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
-  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } };
-  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 32 } }; // TrueColor
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
-     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } }; // 256 colors
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      else {
-        tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
-                          { x0, y3, x3 - 1, y4 - 1, 1 },
-                          { x3, y3, x4 - 1, y4 - 1, 2 },
-                          { x4, y3, x7 - 1, y4 - 1, 2 },
-                          { x0, y4, x7 - 1, y7 - 1, 4 }
-                        };
-        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } }; // 16 colors
+        if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        else {
+           tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 }, // 2..16 colors
+                             { x0, y3, x3 - 1, y4 - 1, 1 },
+                             { x3, y3, x4 - 1, y4 - 1, 2 },
+                             { x4, y3, x7 - 1, y4 - 1, 2 },
+                             { x0, y4, x7 - 1, y7 - 1, 4 }
+                           };
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+           }
         }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
@@ -612,14 +627,6 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
      ts.Set(osd, xl, y, x4 - xl, y4 - y, Event->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
-  for (int i = 0; Event->Contents(i); i++) {
-      const char *s = Event->ContentToString(Event->Contents(i));
-      if (!isempty(s)) {
-         const cFont *font = cFont::GetFont(fontSml);
-         ts.Set(osd, xl, y, x4 - xl, y4 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
-         y += ts.Height();
-         }
-      }
   y += font->Height();
   if (!isempty(Event->Description())) {
      int yt = y;
@@ -666,14 +673,6 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
      ts.Set(osd, xl, y, x4 - xl, y4 - y, Info->ShortText(), font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
      y += ts.Height();
      }
-  for (int i = 0; Info->GetEvent()->Contents(i); i++) {
-      const char *s = Info->GetEvent()->ContentToString(Info->GetEvent()->Contents(i));
-      if (!isempty(s)) {
-         const cFont *font = cFont::GetFont(fontSml);
-         ts.Set(osd, xl, y, x4 - xl, y4 - y, s, font, Theme.Color(clrMenuEventShortText), Theme.Color(clrBackground));
-         y += ts.Height();
-         }
-      }
   y += font->Height();
   if (!isempty(Info->Description())) {
      int yt = y;
@@ -770,12 +769,17 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y7);
-  tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } };
-  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 32 } }; // TrueColor
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 8 } }; // 256 colors
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { 0, 0, x7 - 1, y7 - 1, 4 } }; // 16 colors
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, ModeOnly ? clrTransparent : Theme.Color(clrBackground));
   if (!ModeOnly) {
@@ -904,12 +908,17 @@ cSkinSTTNGDisplayVolume::cSkinSTTNGDisplayVolume(void)
   y0 = 0;
   y1 = lineHeight;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1);
-  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
-  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 32 } }; // TrueColor
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } }; // 256 colors
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 4 } }; // 16 colors
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
   osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
@@ -1019,21 +1028,26 @@ cSkinSTTNGDisplayTracks::cSkinSTTNGDisplayTracks(const char *Title, int NumTrack
   int yt = (y0 + y1) / 2;
   int yb = (y6 + y7) / 2;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y7);
-  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } };
-  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 32 } }; // TrueColor
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } };
-     if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+     tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 8 } }; // 256 colors
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
         osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
      else {
-        tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 },
-                          { x0, y3, x3 - 1, y4 - 1, 1 },
-                          { x3, y3, x4 - 1, y4 - 1, 2 },
-                          { x4, y3, x7 - 1, y4 - 1, 2 },
-                          { x0, y4, x7 - 1, y7 - 1, 4 }
-                        };
-        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        tArea Areas[] = { { x0, y0, x7 - 1, y7 - 1, 4 } }; // 16 colors
+        if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        else {
+           tArea Areas[] = { { x0, y0, x7 - 1, y3 - 1, 2 }, // 2..16 colors
+                             { x0, y3, x3 - 1, y4 - 1, 1 },
+                             { x3, y3, x4 - 1, y4 - 1, 2 },
+                             { x4, y3, x7 - 1, y4 - 1, 2 },
+                             { x0, y4, x7 - 1, y7 - 1, 4 }
+                           };
+           osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+           }
         }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y7 - 1, Theme.Color(clrBackground));
@@ -1147,12 +1161,17 @@ cSkinSTTNGDisplayMessage::cSkinSTTNGDisplayMessage(void)
   y0 = 0;
   y1 = lineHeight;
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1);
-  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } };
-  if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+  tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 32 } }; // TrueColor
+  if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
      osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
   else {
-     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 } };
-     osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 8 } }; // 256 colors
+     if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk)
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+     else {
+        tArea Areas[] = { { x0, y0, x7 - 1, y1 - 1, 2 } }; // 4 colors
+        osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
      }
   osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, clrTransparent);
   osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
diff --git a/svdrp.c b/svdrp.c
index cb9a93513..fe3bcc7cf 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.8 2010/01/17 12:23:31 kls Exp $
+ * $Id: svdrp.c 2.9 2011/02/25 14:38:45 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1664,8 +1664,16 @@ bool cSVDRP::Process(void)
                  }
               else {
                  if (numChars >= length - 1) {
-                    length += BUFSIZ;
-                    cmdLine = (char *)realloc(cmdLine, length);
+                    int NewLength = length + BUFSIZ;
+                    if (char *NewBuffer = (char *)realloc(cmdLine, NewLength)) {
+                       length = NewLength;
+                       cmdLine = NewBuffer;
+                       }
+                    else {
+                       esyslog("ERROR: out of memory");
+                       Close();
+                       break;
+                       }
                     }
                  cmdLine[numChars++] = c;
                  cmdLine[numChars] = 0;
diff --git a/themes.c b/themes.c
index 451fb8b2b..034ec0b9b 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 2.0 2008/02/10 16:25:00 kls Exp $
+ * $Id: themes.c 2.1 2011/02/25 14:45:18 kls Exp $
  */
 
 #include "themes.h"
@@ -248,12 +248,30 @@ bool cThemes::Load(const char *SkinName)
                  cString FileName = AddDirectory(themesDirectory, e->d_name);
                  cTheme Theme;
                  if (Theme.Load(*FileName, true)) {
-                    names = (char **)realloc(names, (numThemes + 1) * sizeof(char *));
-                    names[numThemes] = strdup(Theme.Name());
-                    fileNames = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *));
-                    fileNames[numThemes] = strdup(*FileName);
-                    descriptions = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *));
-                    descriptions[numThemes] = strdup(Theme.Description());
+                    if (char **NewBuffer = (char **)realloc(names, (numThemes + 1) * sizeof(char *))) {
+                       names = NewBuffer;
+                       names[numThemes] = strdup(Theme.Name());
+                       }
+                    else {
+                       esyslog("ERROR: out of memory");
+                       break;
+                       }
+                    if (char **NewBuffer = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *))) {
+                       fileNames = NewBuffer;
+                       fileNames[numThemes] = strdup(*FileName);
+                       }
+                    else {
+                       esyslog("ERROR: out of memory");
+                       break;
+                       }
+                    if (char **NewBuffer = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *))) {
+                       descriptions = NewBuffer;
+                       descriptions[numThemes] = strdup(Theme.Description());
+                       }
+                    else {
+                       esyslog("ERROR: out of memory");
+                       break;
+                       }
                     numThemes++;
                     }
                  }
diff --git a/tools.c b/tools.c
index 3ce12ec55..d03595e63 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.8 2010/08/29 15:03:08 kls Exp $
+ * $Id: tools.c 2.12 2011/02/25 14:58:31 kls Exp $
  */
 
 #include "tools.h"
@@ -18,7 +18,6 @@ extern "C" {
 #include <jpeglib.h>
 #undef boolean
 }
-#include <stdarg.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/vfs.h>
@@ -157,8 +156,14 @@ char *strreplace(char *s, const char *s1, const char *s2)
      int l  = strlen(s);
      int l1 = strlen(s1);
      int l2 = strlen(s2);
-     if (l2 > l1)
-        s = (char *)realloc(s, l + l2 - l1 + 1);
+     if (l2 > l1) {
+        if (char *NewBuffer = (char *)realloc(s, l + l2 - l1 + 1))
+           s = NewBuffer;
+        else {
+           esyslog("ERROR: out of memory");
+           return s;
+           }
+        }
      char *sof = s + of;
      if (l2 != l1)
         memmove(sof + l2, sof + l1, l - of - l1 + 1);
@@ -368,7 +373,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                     cString buffer = AddDirectory(FileName, e->d_name);
                     if (FollowSymlinks) {
                        struct stat st2;
-                       if (stat(buffer, &st2) == 0) {
+                       if (lstat(buffer, &st2) == 0) {
                           if (S_ISLNK(st2.st_mode)) {
                              int size = st2.st_size + 1;
                              char *l = MALLOC(char, size);
@@ -377,14 +382,12 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                                 if (errno != EINVAL)
                                    LOG_ERROR_STR(*buffer);
                                 }
-                             else if (n < size) {
+                             else {
                                 l[n] = 0;
                                 dsyslog("removing %s", l);
                                 if (remove(l) < 0)
                                    LOG_ERROR_STR(l);
                                 }
-                             else
-                                esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
                              free(l);
                              }
                           }
@@ -822,8 +825,15 @@ const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
      size_t FromLength = strlen(From);
      char *ToPtr = To;
      if (!ToPtr) {
-        length = max(length, FromLength * 2); // some reserve to avoid later reallocations
-        result = (char *)realloc(result, length);
+        int NewLength = max(length, FromLength * 2); // some reserve to avoid later reallocations
+        if (char *NewBuffer = (char *)realloc(result, NewLength)) {
+           length = NewLength;
+           result = NewBuffer;
+           }
+        else {
+           esyslog("ERROR: out of memory");
+           return From;
+           }
         ToPtr = result;
         ToLength = length;
         }
@@ -839,8 +849,15 @@ const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
                  // The result buffer is too small, so increase it:
                  size_t d = ToPtr - result;
                  size_t r = length / 2;
-                 length += r;
-                 Converted = result = (char *)realloc(result, length);
+                 int NewLength = length + r;
+                 if (char *NewBuffer = (char *)realloc(result, NewLength)) {
+                    length = NewLength;
+                    Converted = result = NewBuffer;
+                    }
+                 else {
+                    esyslog("ERROR: out of memory");
+                    return From;
+                    }
                  ToLength += r;
                  ToPtr = result + d;
                  }
@@ -887,6 +904,13 @@ cString &cString::operator=(const cString &String)
   return *this;
 }
 
+cString &cString::operator=(const char *String)
+{
+  free(s);
+  s = String ? strdup(String) : NULL;
+  return *this;
+}
+
 cString &cString::Truncate(int Index)
 {
   int l = strlen(s);
@@ -1025,15 +1049,22 @@ static boolean JpegCompressEmptyOutputBuffer(j_compress_ptr cinfo)
   tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
   if (jcd) {
      int Used = jcd->size;
-     jcd->size += JPEGCOMPRESSMEM;
-     jcd->mem = (uchar *)realloc(jcd->mem, jcd->size);
+     int NewSize = jcd->size + JPEGCOMPRESSMEM;
+     if (uchar *NewBuffer = (uchar *)realloc(jcd->mem, NewSize)) {
+        jcd->size = NewSize;
+        jcd->mem = NewBuffer;
+        }
+     else {
+        esyslog("ERROR: out of memory");
+        return false;
+        }
      if (jcd->mem) {
         cinfo->dest->next_output_byte = jcd->mem + Used;
         cinfo->dest->free_in_buffer = jcd->size - Used;
-        return TRUE;
+        return true;
         }
      }
-  return FALSE;
+  return false;
 }
 
 static void JpegCompressTermDestination(j_compress_ptr cinfo)
@@ -1042,8 +1073,12 @@ static void JpegCompressTermDestination(j_compress_ptr cinfo)
   if (jcd) {
      int Used = cinfo->dest->next_output_byte - jcd->mem;
      if (Used < jcd->size) {
-        jcd->size = Used;
-        jcd->mem = (uchar *)realloc(jcd->mem, jcd->size);
+        if (uchar *NewBuffer = (uchar *)realloc(jcd->mem, Used)) {
+           jcd->size = Used;
+           jcd->mem = NewBuffer;
+           }
+        else
+           esyslog("ERROR: out of memory");
         }
      }
 }
diff --git a/tools.h b/tools.h
index 95c35ff3b..f17c5642e 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.4 2009/12/23 15:14:39 kls Exp $
+ * $Id: tools.h 2.7 2011/02/25 15:05:58 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -17,6 +17,7 @@
 #include <iconv.h>
 #include <math.h>
 #include <poll.h>
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -171,6 +172,7 @@ class cString {
   operator const char * () const { return s; } // for use in (const char *) context
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
   cString &operator=(const cString &String);
+  cString &operator=(const char *String);
   cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string).
   static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
   static cString sprintf(const char *fmt, va_list &ap);
@@ -432,6 +434,10 @@ template<class T> class cVector {
   {
     if (++Index > allocated) {
        data = (T *)realloc(data, Index * sizeof(T));
+       if (!data) {
+          esyslog("ERROR: out of memory - abort!");
+          abort();
+          }
        for (int i = allocated; i < Index; i++)
            data[i] = T(0);
        allocated = Index;
diff --git a/vdr.5 b/vdr.5
index 68711b597..ce1521566 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.19 2010/05/16 12:15:48 kls Exp $
+.\" $Id: vdr.5 2.21 2010/12/24 15:19:21 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -114,7 +114,7 @@ If no hierarchy is used, set to 0.
 
 \fBGuard interval:\fR The guard interval value (DVB-T only): 4 = 1/4, 8 = 1/8, 16 = 1/16, 32 = 1/32.
 
-\fBInversion:\fR Specifes whether the DVB frontend needs spectral inversion (DVB-T and DVB-C only). This is frontend specific, if in doubt, omit.
+\fBInversion:\fR Specifies whether the DVB frontend needs spectral inversion (DVB-T and DVB-C only). This is frontend specific, if in doubt, omit.
 
 \fBModulation:\fR Specifies the modulation/constellation of the channel as follows:
 .TS
@@ -721,7 +721,7 @@ characters are defined:
 .TS
 tab (|);
 l l.
-\fBF\fR|<frame duration>
+\fBF\fR|<frame rate>
 \fBL\fR|<lifetime>
 \fBP\fR|<priority>
 \fB@\fR|<auxiliary data>
diff --git a/vdr.c b/vdr.c
index 93f586a4a..34560e75b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.19 2010/04/05 10:06:16 kls Exp $
+ * $Id: vdr.c 2.20 2010/12/12 13:42:00 kls Exp $
  */
 
 #include <getopt.h>
@@ -937,7 +937,7 @@ int main(int argc, char *argv[])
            ShutdownHandler.SetUserInactiveTimeout();
            }
         // Keys that must work independent of any interactive mode:
-        switch (key) {
+        switch (int(key)) {
           // Menu control:
           case kMenu: {
                key = kNone; // nobody else needs to see this key
@@ -1185,7 +1185,7 @@ int main(int argc, char *argv[])
               cRemote::PutMacro(key);
               key = kNone;
               }
-           switch (key) {
+           switch (int(key)) {
              // Toggle channels:
              case kChanPrev:
              case k0: {

From 8b9350c091bc5ae8c9bb30b83a1fb567c3a7cb7f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 17 Apr 2011 16:50:00 +0200
Subject: [PATCH 204/307] =?UTF-8?q?Version=201.7.18=20-=20Changed=20-O2=20?=
 =?UTF-8?q?to=20-O3=20in=20Make.config.template=20(reported=20by=20Matti?=
 =?UTF-8?q?=20Lehtim=C3=A4ki).=20-=20Added=20a=20missing=20'default'=20cas?=
 =?UTF-8?q?e=20in=20cPixmapMemory::DrawEllipse().=20-=20Fixed=20some=20dir?=
 =?UTF-8?q?ect=20comparisons=20of=20double=20values.=20-=20Fixed=20detecti?=
 =?UTF-8?q?ng=20frames=20on=20channels=20that=20broadcast=20with=20separat?=
 =?UTF-8?q?e=20"fields"=20instead=20=20=20of=20complete=20frames.=20-=20Ma?=
 =?UTF-8?q?de=20updating=20the=20editing=20marks=20during=20replay=20react?=
 =?UTF-8?q?=20faster=20in=20case=20the=20marks=20=20=20file=20has=20just?=
 =?UTF-8?q?=20been=20written=20(with=20a=20patch=20from=20Udo=20Richter).?=
 =?UTF-8?q?=20-=20Fixed=20horizontal=20scaling=20of=20subtitles=20(reporte?=
 =?UTF-8?q?d=20by=20Reinhard=20Nissl).=20-=20Stripped=20the=20note=20"The?=
 =?UTF-8?q?=20data=20returned=20by=20this=20function=20is=20only=20used=20?=
 =?UTF-8?q?for=20informational=20=20=20purposes=20(if=20any)"=20from=20the?=
 =?UTF-8?q?=20description=20of=20cDevice::GetVideoSize().=20The=20VideoAsp?=
 =?UTF-8?q?ect=20=20=20is=20now=20used=20to=20properly=20scale=20subtitles?=
 =?UTF-8?q?.=20-=20Fixed=20cUnbufferedFile::Seek()=20in=20case=20it=20is?=
 =?UTF-8?q?=20compiled=20without=20USE=5FFADVISE=20(thanks=20=20=20to=20Ju?=
 =?UTF-8?q?ergen=20Lock).=20-=20Fixed=20the=20Language=20header=20of=20the?=
 =?UTF-8?q?=20Serbian=20translation=20file=20(thanks=20to=20Ville=20Skytt?=
 =?UTF-8?q?=C3=A4).=20-=20Added=20anti-aliasing=20when=20upscaling=20bitma?=
 =?UTF-8?q?ps,=20which=20improves=20the=20display=20of=20SD=20subtitles=20?=
 =?UTF-8?q?=20=20when=20replayed=20on=20an=20HD=20OSD=20(thanks=20to=20Rei?=
 =?UTF-8?q?nhard=20Nissl=20for=20his=20help=20in=20debugging).=20-=20Renam?=
 =?UTF-8?q?ed=20cBitmap::Scale()=20to=20Scaled(),=20because=20it=20doesn't?=
 =?UTF-8?q?=20modify=20the=20bitmap=20itself,=20=20=20but=20rather=20retur?=
 =?UTF-8?q?ns=20a=20scaled=20copy.=20-=20Fixed=20the=20description=20of=20?=
 =?UTF-8?q?cReceiver=20in=20PLUGINS.html,=20regarding=20detaching=20a=20re?=
 =?UTF-8?q?ceiver=20=20=20from=20its=20device=20before=20deleting=20it=20(?=
 =?UTF-8?q?reported=20by=20Winfried=20K=C3=B6hler).=20This=20change=20in?=
 =?UTF-8?q?=20=20=20behavior=20was=20introduced=20in=20version=201.5.7.=20?=
 =?UTF-8?q?-=20Fixed=20scaling=20subtitles=20in=20case=20the=20OSD=20size?=
 =?UTF-8?q?=20is=20exactly=20the=20same=20as=20the=20display=20=20=20size?=
 =?UTF-8?q?=20of=20the=20subtitles.=20-=20Added=20a=20missing=20initializa?=
 =?UTF-8?q?tion=20to=20sDvbSpuRect=20(reported=20by=20Sergiu=20Dotenco).?=
 =?UTF-8?q?=20-=20Replaced=20"%lld"=20and=20"%llX"=20print=20format=20spec?=
 =?UTF-8?q?ifiers=20with=20"PRId64"=20and=20"PRIX64"=20to=20=20=20avoid=20?=
 =?UTF-8?q?compiler=20warnings=20with=20gcc=204.5.2=20(thanks=20to=20Sergi?=
 =?UTF-8?q?u=20Dotenco).=20=20=20On=20a=20personal=20note:=20I=20find=20it?=
 =?UTF-8?q?=20a=20step=20in=20the=20totally=20wrong=20direction=20that=20t?=
 =?UTF-8?q?here=20=20=20have=20been=20macros=20introduced=20to=20work=20ar?=
 =?UTF-8?q?ound=20this=20problem=20in=20the=20first=20place.=20There=20=20?=
 =?UTF-8?q?=20should=20have=20been=20"real"=20format=20specifiers=20define?=
 =?UTF-8?q?d=20that=20address=20this.=20These=20macros=20=20=20are=20nothi?=
 =?UTF-8?q?ng=20but=20an=20ugly=20workaround.=20-=20Added=20Cancel(3)=20to?=
 =?UTF-8?q?=20~cTrueColorDemo()=20in=20the=20"osddemo"=20plugin=20(thanks?=
 =?UTF-8?q?=20to=20Reinhard=20Nissl).=20-=20Added=20a=20missing=20font=20d?=
 =?UTF-8?q?eletion=20in=20cTrueColorDemo::Action()=20in=20the=20"osddemo"?=
 =?UTF-8?q?=20plugin=20=20=20(thanks=20to=20Reinhard=20Nissl).=20-=20Fixed?=
 =?UTF-8?q?=20a=20buffer=20overflow=20in=20cFont::Bidi()=20(thanks=20to=20?=
 =?UTF-8?q?Reinhard=20Nissl).=20-=20Added=20HD=20stream=20content=20identi?=
 =?UTF-8?q?fiers=20to=20vdr.5=20(thanks=20to=20Christoph=20Haubrich).=20-?=
 =?UTF-8?q?=20Made=20cRecordingInfo::Read(FILE=20*f)=20private=20to=20avoi?=
 =?UTF-8?q?d=20calls=20to=20it=20from=20outside=20=20=20cRecordingInfo=20o?=
 =?UTF-8?q?r=20cRecording=20(reported=20by=20Mika=20Laitio).=20-=20The=20d?=
 =?UTF-8?q?vbhddevice=20plugin=20is=20now=20part=20of=20the=20VDR=20distri?=
 =?UTF-8?q?bution=20archive=20(thanks=20to=20=20=20Andreas=20Regel).=20-?=
 =?UTF-8?q?=20Removed=20an=20obsolete=20local=20variable=20in=20dvbsdffosd?=
 =?UTF-8?q?.c=20(thanks=20to=20Paul=20Menzel).=20-=20Fixed=20a=20possible?=
 =?UTF-8?q?=20NULL=20pointer=20dereference=20in=20osddemo.c=20(reported=20?=
 =?UTF-8?q?by=20Paul=20Menzel).=20-=20Now=20using=20pkg-config=20to=20get?=
 =?UTF-8?q?=20fribidi,=20freetype=20and=20fontconfig=20cflags=20and=20libs?=
 =?UTF-8?q?=20(thanks=20=20=20to=20Ville=20Skytt=C3=A4).=20-=20The=20Makef?=
 =?UTF-8?q?ile=20now=20also=20installs=20the=20include=20files=20(thanks?=
 =?UTF-8?q?=20to=20Ville=20Skytt=C3=A4).=20-=20Added=20handling=20of=20"AN?=
 =?UTF-8?q?SI/SCTE=2057"=20descriptors=20(thanks=20too=20Rolf=20Ahrenberg)?=
 =?UTF-8?q?.=20-=20Avoiding=20an=20unecessary=20call=20to=20Recordings.Res?=
 =?UTF-8?q?etResume()=20(thanks=20to=20Reinhard=20=20=20Nissl).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTORS                            |   27 +
 HISTORY                                 |   50 +
 Make.config.template                    |    6 +-
 Makefile                                |   19 +-
 PLUGINS.html                            |    5 +-
 PLUGINS/src/dvbhddevice/COPYING         |  340 +++++++
 PLUGINS/src/dvbhddevice/HISTORY         |   16 +
 PLUGINS/src/dvbhddevice/Makefile        |  114 +++
 PLUGINS/src/dvbhddevice/README          |   18 +
 PLUGINS/src/dvbhddevice/bitbuffer.c     |   97 ++
 PLUGINS/src/dvbhddevice/bitbuffer.h     |   31 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   48 +
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |  760 +++++++++++++++
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h |  123 +++
 PLUGINS/src/dvbhddevice/hdffcmd.c       | 1120 +++++++++++++++++++++++
 PLUGINS/src/dvbhddevice/hdffcmd.h       |  102 +++
 PLUGINS/src/dvbhddevice/hdffmsgdef.h    |  304 ++++++
 PLUGINS/src/dvbhddevice/hdffosd.c       |  755 +++++++++++++++
 PLUGINS/src/dvbhddevice/hdffosd.h       |   26 +
 PLUGINS/src/dvbhddevice/setup.c         |  252 +++++
 PLUGINS/src/dvbhddevice/setup.h         |   53 ++
 PLUGINS/src/dvbsddevice/HISTORY         |    4 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |    4 +-
 PLUGINS/src/dvbsddevice/dvbsdffosd.c    |    8 +-
 PLUGINS/src/osddemo/HISTORY             |    9 +
 PLUGINS/src/osddemo/osddemo.c           |   12 +-
 config.h                                |   10 +-
 device.h                                |    9 +-
 dvbspu.h                                |    5 +-
 dvbsubtitle.c                           |   84 +-
 dvbsubtitle.h                           |    5 +-
 font.c                                  |    4 +-
 osd.c                                   |   57 +-
 osd.h                                   |    7 +-
 pat.c                                   |   52 +-
 po/sr_SR.po                             |    2 +-
 recording.c                             |   35 +-
 recording.h                             |    7 +-
 remote.c                                |    6 +-
 remux.c                                 |   44 +-
 remux.h                                 |    7 +-
 runvdr.template                         |    8 +-
 tools.c                                 |    7 +-
 vdr.5                                   |    4 +-
 44 files changed, 4520 insertions(+), 136 deletions(-)
 create mode 100644 PLUGINS/src/dvbhddevice/COPYING
 create mode 100644 PLUGINS/src/dvbhddevice/HISTORY
 create mode 100644 PLUGINS/src/dvbhddevice/Makefile
 create mode 100644 PLUGINS/src/dvbhddevice/README
 create mode 100644 PLUGINS/src/dvbhddevice/bitbuffer.c
 create mode 100644 PLUGINS/src/dvbhddevice/bitbuffer.h
 create mode 100644 PLUGINS/src/dvbhddevice/dvbhddevice.c
 create mode 100644 PLUGINS/src/dvbhddevice/dvbhdffdevice.c
 create mode 100644 PLUGINS/src/dvbhddevice/dvbhdffdevice.h
 create mode 100644 PLUGINS/src/dvbhddevice/hdffcmd.c
 create mode 100644 PLUGINS/src/dvbhddevice/hdffcmd.h
 create mode 100644 PLUGINS/src/dvbhddevice/hdffmsgdef.h
 create mode 100644 PLUGINS/src/dvbhddevice/hdffosd.c
 create mode 100644 PLUGINS/src/dvbhddevice/hdffosd.h
 create mode 100644 PLUGINS/src/dvbhddevice/setup.c
 create mode 100644 PLUGINS/src/dvbhddevice/setup.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 74090c215..f6ba82c72 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1103,6 +1103,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing the array size of Atypes in cPatFilter::Process()
  for adding support for "registration descriptor" to 'libsi' and using it in pat.c
  for adding an include of VDR's 'Make.global' to libsi's Makefile
+ for adding handling of "ANSI/SCTE 57" descriptors
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1264,6 +1265,10 @@ Reinhard Nissl <rnissl@gmx.de>
  for some valuable input during development of the TrueColor OSD, help with
  debugging, and an implementation of the AlphaBlend() function.
  for storing the original display size when handling DVB subtitles
+ for reporting a problem with horizontal scaling of subtitles
+ for fixing a buffer overflow in cFont::Bidi()
+ for avoiding an unecessary call to Recordings.ResetResume()
+ for debugging a problem in handling the bitmap color depth for scaled subtitles
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1392,6 +1397,7 @@ Andreas Regel <andreas.regel@gmx.de>
  for adding some missing 'const' statements to cBitmap
  for making cDevice::AddPid() store the stream type of the given pid
  for adding cFont::FontName() and cFont::Size()
+ for writing the dvbhddevice plugin
 
 Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -1688,6 +1694,8 @@ Udo Richter <udo_richter@gmx.de>
  for reporting missing defines for large files in the 'newplugin' script
  for pointing out that the full timer file name should be displayed if it ends with
  "TITLE" or "EPISODE"
+ for a patch to "Made updating the editing marks during replay react faster in case
+ the marks file has just been written"
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -1886,6 +1894,9 @@ Ville Skytt
  for adding passing package name and version to xgettext
  for making 'dist' target dependent on up to date *.po
  for adding Language and fixing Language-Team header of *.po
+ for fixing the Language header of the Serbian translation file
+ for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
+ for making the Makefile also install the include files
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2205,6 +2216,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for reporting unused 'synced' member in cTsToPes
  for suggesting to add a note to cTsToPes about all TS packets having to belong to
  the same PID
+ for adding HD stream content identifiers to vdr.5
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2522,6 +2534,8 @@ Winfried K
  for fixing wrong value for TableIdBAT in libsi/si.h
  for making several code modifications to avoid compiler warnings
  for improving the description of the transponder parameters in vdr.5
+ for reporting a necessary fix in the description of cReceiver in PLUGINS.html,
+ regarding detaching a receiver from its device before deleting it
 
 Igor M. Liplianin <liplianin@tut.by>
  for a patch that was used to convert VDR to the S2API driver API
@@ -2601,6 +2615,7 @@ Francesco Saverio Schiavarelli <fschiava@libero.it>
 
 Matti Lehtim�ki <matti.lehtimaki@gmail.com>
  for implementing the setup option "Miscellaneous/Channels wrap"
+ for reporting a missing change from -O2 to -O3 in Make.config.template
 
 Stephan Austerm�hle <au@hcsd.de>
  for suggesting to flush the file in cSafeFile::Close()
@@ -2622,6 +2637,8 @@ Paul Menzel <paulepanter@users.sourceforge.net>
  for making include paths not be overwritten in the Makefile
  for adding LDFLAGS to the linker calls in the Makefiles
  for reporting a possible memory leak in the "pictures" plugin
+ for removing an obsolete local variable in dvbsdffosd.c
+ for reporting a possible NULL pointer dereference in osddemo.c
 
 Radek Stastny <dedkus@gmail.com>
  for translating OSD texts to the Czech language
@@ -2670,3 +2687,13 @@ Frank Neumann <frank.neumann@hp.com>
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
  the LIRC receiver code
+
+Juergen Lock <vdr-l@jelal.kn-bremen.de>
+ for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
+
+Sergiu Dotenco <sergiu.dotenco@googlemail.com>
+ for reporting a missing initialization in sDvbSpuRect
+ for replacing "%lld" and "%llX" print format specifiers with "PRId64" and "PRIX64"
+
+Mika Laitio <lamikr@pilppa.org>
+ for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer
diff --git a/HISTORY b/HISTORY
index f73f5cf2e..c4e22fd8a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6556,3 +6556,53 @@ Video Disk Recorder Revision History
   Reinhard Nissl).
 - The original display size of subtitles is now used to scale them properly when
   displaying them on an HD OSD.
+
+2011-04-17: Version 1.7.18
+
+- Changed -O2 to -O3 in Make.config.template (reported by Matti Lehtim�ki).
+- Added a missing 'default' case in cPixmapMemory::DrawEllipse().
+- Fixed some direct comparisons of double values.
+- Fixed detecting frames on channels that broadcast with separate "fields" instead
+  of complete frames.
+- Made updating the editing marks during replay react faster in case the marks
+  file has just been written (with a patch from Udo Richter).
+- Fixed horizontal scaling of subtitles (reported by Reinhard Nissl).
+- Stripped the note "The data returned by this function is only used for informational
+  purposes (if any)" from the description of cDevice::GetVideoSize(). The VideoAspect
+  is now used to properly scale subtitles.
+- Fixed cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE (thanks
+  to Juergen Lock).
+- Fixed the Language header of the Serbian translation file (thanks to Ville Skytt�).
+- Added anti-aliasing when upscaling bitmaps, which improves the display of SD subtitles
+  when replayed on an HD OSD (thanks to Reinhard Nissl for his help in debugging).
+- Renamed cBitmap::Scale() to Scaled(), because it doesn't modify the bitmap itself,
+  but rather returns a scaled copy.
+- Fixed the description of cReceiver in PLUGINS.html, regarding detaching a receiver
+  from its device before deleting it (reported by Winfried K�hler). This change in
+  behavior was introduced in version 1.5.7.
+- Fixed scaling subtitles in case the OSD size is exactly the same as the display
+  size of the subtitles.
+- Added a missing initialization to sDvbSpuRect (reported by Sergiu Dotenco).
+- Replaced "%lld" and "%llX" print format specifiers with "PRId64" and "PRIX64" to
+  avoid compiler warnings with gcc 4.5.2 (thanks to Sergiu Dotenco).
+  On a personal note: I find it a step in the totally wrong direction that there
+  have been macros introduced to work around this problem in the first place. There
+  should have been "real" format specifiers defined that address this. These macros
+  are nothing but an ugly workaround.
+- Added Cancel(3) to ~cTrueColorDemo() in the "osddemo" plugin (thanks to Reinhard Nissl).
+- Added a missing font deletion in cTrueColorDemo::Action() in the "osddemo" plugin
+  (thanks to Reinhard Nissl).
+- Fixed a buffer overflow in cFont::Bidi() (thanks to Reinhard Nissl).
+- Added HD stream content identifiers to vdr.5 (thanks to Christoph Haubrich).
+- Made cRecordingInfo::Read(FILE *f) private to avoid calls to it from outside
+  cRecordingInfo or cRecording (reported by Mika Laitio).
+- The dvbhddevice plugin is now part of the VDR distribution archive (thanks to
+  Andreas Regel).
+- Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
+- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
+- Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks
+  to Ville Skytt�).
+- The Makefile now also installs the include files (thanks to Ville Skytt�).
+- Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg).
+- Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard
+  Nissl).
diff --git a/Make.config.template b/Make.config.template
index 3abb7241c..1fc8227a5 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,15 +6,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.2 2010/02/06 14:50:03 kls Exp $
+# $Id: Make.config.template 2.3 2011/03/13 13:41:12 kls Exp $
 
 ### The C compiler and options:
 
 CC       = gcc
-CFLAGS   = -g -O2 -Wall
+CFLAGS   = -g -O3 -Wall
 
 CXX      = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS = -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ifdef PLUGIN
 CFLAGS   += -fPIC
diff --git a/Makefile b/Makefile
index e84849bfd..931783927 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.14 2011/02/27 09:59:11 kls Exp $
+# $Id: Makefile 2.17 2011/04/17 13:35:53 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -19,9 +19,10 @@ DESTDIR ?=
 PREFIX  ?= /usr/local
 MANDIR   = $(PREFIX)/share/man
 BINDIR   = $(PREFIX)/bin
+INCDIR   = $(PREFIX)/include
 LOCDIR   = ./locale
-LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-INCLUDES ?= $(shell pkg-config --cflags freetype2)
+LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
+INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
@@ -54,9 +55,9 @@ ifdef VDR_USER
 DEFINES += -DVDR_USER=\"$(VDR_USER)\"
 endif
 ifdef BIDI
-INCLUDES += -I/usr/include/fribidi
+INCLUDES += $(shell pkg-config --cflags fribidi)
 DEFINES += -DBIDI
-LIBS += -lfribidi
+LIBS += $(shell pkg-config --libs fribidi)
 endif
 
 LIRC_DEVICE ?= /dev/lircd
@@ -162,7 +163,7 @@ clean-plugins:
 
 # Install the files:
 
-install: install-bin install-conf install-doc install-plugins install-i18n
+install: install-bin install-conf install-doc install-plugins install-i18n install-includes
 
 # VDR binary:
 
@@ -193,6 +194,12 @@ install-plugins: plugins
 	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
 	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
 
+# Includes:
+
+install-includes: include-dir
+	@mkdir -p $(DESTDIR)$(INCDIR)
+	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
+
 # Source documentation:
 
 srcdoc:
diff --git a/PLUGINS.html b/PLUGINS.html
index 05fb7ed0e..3859918d6 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1523,8 +1523,9 @@ <h1>Table Of Contents</h1>
 video stream (this may be different from the primary device in case of <i>Transfer
 Mode</i>).
 <p>
-If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
-and will automatically detach itself from the <tt>cDevice</tt>.
+<div class="modified">
+The <tt>cReceiver</tt> must be detached from its device before it is deleted.
+</div modified>
 
 <hr><h2><a name="Filters">Filters</a></h2>
 
diff --git a/PLUGINS/src/dvbhddevice/COPYING b/PLUGINS/src/dvbhddevice/COPYING
new file mode 100644
index 000000000..f90922eea
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
new file mode 100644
index 000000000..aa788fd11
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -0,0 +1,16 @@
+VDR Plugin 'dvbhddevice' Revision History
+-----------------------------------------
+
+2009-12-29: Version 0.0.1
+
+- Initial revision.
+
+2010-01-04: Version 0.0.2
+
+- Calling the MakePrimaryDevice() function of the base class to allow
+  the cDevice to stop displaying subtitles.
+- Added support for DVB cards with multiple frontends.
+
+2011-04-17: Version 0.0.3
+
+- Added support for TrueColor OSD.
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
new file mode 100644
index 000000000..ea1b9d1ec
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -0,0 +1,114 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.7 2011/04/17 11:40:55 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
+#
+PLUGIN = dvbhddevice
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### The directory environment:
+
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
+
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o bitbuffer.o dvbhdffdevice.o hdffcmd.o hdffosd.o setup.o
+
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+### Dependencies:
+
+MAKEDEP = $(CXX) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
+### Targets:
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+dist: $(I18Npo) clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/PLUGINS/src/dvbhddevice/README b/PLUGINS/src/dvbhddevice/README
new file mode 100644
index 000000000..5697dea77
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/README
@@ -0,0 +1,18 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Andreas Regel <andreas.regel@gmx.de>
+
+Project's homepage:          http://powarman.dyndns.org/hg/dvbhddevice
+
+Latest version available at: http://powarman.dyndns.org/hg/dvbhddevice
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
+
+Description:
+
+The 'dvbhddevice' plugin implements the output device for the
+"Full Featured TechnoTrend S2-6400" DVB cards.
diff --git a/PLUGINS/src/dvbhddevice/bitbuffer.c b/PLUGINS/src/dvbhddevice/bitbuffer.c
new file mode 100644
index 000000000..244b85e19
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/bitbuffer.c
@@ -0,0 +1,97 @@
+/*
+ * bitbuffer.c: TODO(short description)
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: bitbuffer.c 1.1 2009/12/29 14:29:20 kls Exp $
+ */
+
+#include "bitbuffer.h"
+#include <stdlib.h>
+
+cBitBuffer::cBitBuffer(uint32_t MaxLength)
+{
+    mData = NULL;
+    mMaxLength = 0;
+    mBitPos = 0;
+
+    if (MaxLength <= 0x10000)
+    {
+        mData = new uint8_t[MaxLength];
+        if (mData)
+        {
+            mMaxLength = MaxLength * 8;
+        }
+    }
+}
+
+cBitBuffer::~cBitBuffer(void)
+{
+    if (mData)
+        delete[] mData;
+}
+
+uint8_t * cBitBuffer::GetData(void)
+{
+    return mData;
+}
+
+uint32_t cBitBuffer::GetMaxLength(void)
+{
+    return mMaxLength / 8;
+}
+
+uint32_t cBitBuffer::GetBits(int NumBits)
+{
+    return 0;
+}
+
+void cBitBuffer::SetBits(int NumBits, uint32_t Data)
+{
+    uint32_t nextBitPos;
+    uint32_t bytePos;
+    uint32_t bitsInByte;
+    int shift;
+
+    if (NumBits <= 0 || NumBits > 32)
+        return;
+
+    nextBitPos = mBitPos + NumBits;
+
+    if (nextBitPos > mMaxLength)
+        return;
+
+    bytePos = mBitPos / 8;
+    bitsInByte = mBitPos % 8;
+
+    mData[bytePos] &= (uint8_t) (0xFF << (8 - bitsInByte));
+    shift = NumBits - (8 - bitsInByte);
+    if (shift > 0)
+        mData[bytePos] |= (uint8_t) (Data >> shift);
+    else
+        mData[bytePos] |= (uint8_t) (Data << (-shift));
+    NumBits -= 8 - bitsInByte;
+    bytePos++;
+    while (NumBits > 0)
+    {
+        shift = NumBits - 8;
+        if (shift > 0)
+            mData[bytePos] = (uint8_t) (Data >> shift);
+        else
+            mData[bytePos] = (uint8_t) (Data << (-shift));
+        NumBits -= 8;
+        bytePos++;
+    }
+    mBitPos = nextBitPos;
+}
+
+uint32_t cBitBuffer::GetByteLength(void)
+{
+    return (mBitPos + 7) / 8;
+}
+
+void cBitBuffer::SetDataByte(uint32_t Position, uint8_t Data)
+{
+    if (Position < mMaxLength)
+        mData[Position] = Data;
+}
diff --git a/PLUGINS/src/dvbhddevice/bitbuffer.h b/PLUGINS/src/dvbhddevice/bitbuffer.h
new file mode 100644
index 000000000..e7b3650e4
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/bitbuffer.h
@@ -0,0 +1,31 @@
+/*
+ * bitbuffer.h: TODO(short description)
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: bitbuffer.h 1.1 2009/12/29 14:27:03 kls Exp $
+ */
+
+#ifndef _HDFF_BITBUFFER_H_
+#define _HDFF_BITBUFFER_H_
+
+#include <stdint.h>
+
+class cBitBuffer
+{
+private:
+    uint8_t * mData;
+    uint32_t mMaxLength;
+    uint32_t mBitPos;
+public:
+    cBitBuffer(uint32_t MaxLength);
+    ~cBitBuffer(void);
+    uint8_t * GetData(void);
+    uint32_t GetMaxLength(void);
+    uint32_t GetBits(int NumBits);
+    void SetBits(int NumBits, uint32_t Data);
+    uint32_t GetByteLength(void);
+    void SetDataByte(uint32_t Position, uint8_t Data);
+};
+
+#endif
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
new file mode 100644
index 000000000..d63992285
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -0,0 +1,48 @@
+/*
+ * dvbhddevice.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbhddevice.c 1.12 2011/04/17 11:20:22 kls Exp $
+ */
+
+#include <vdr/plugin.h>
+#include "dvbhdffdevice.h"
+#include "setup.h"
+
+static const char *VERSION        = "0.0.3";
+static const char *DESCRIPTION    = "HD Full Featured DVB device";
+
+class cPluginDvbhddevice : public cPlugin {
+private:
+  cDvbHdFfDeviceProbe *probe;
+public:
+  cPluginDvbhddevice(void);
+  virtual ~cPluginDvbhddevice();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginDvbhddevice::cPluginDvbhddevice(void)
+{
+  probe = new cDvbHdFfDeviceProbe;
+}
+
+cPluginDvbhddevice::~cPluginDvbhddevice()
+{
+  delete probe;
+}
+
+cMenuSetupPage *cPluginDvbhddevice::SetupMenu(void)
+{
+  return new cHdffSetupPage(cDvbHdFfDevice::GetHdffCmdHandler());
+}
+
+bool cPluginDvbhddevice::SetupParse(const char *Name, const char *Value)
+{
+  return gHdffSetup.SetupParse(Name, Value);
+}
+
+VDRPLUGINCREATOR(cPluginDvbhddevice); // Don't touch this!
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
new file mode 100644
index 000000000..9263009d6
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -0,0 +1,760 @@
+/*
+ * dvbhdffdevice.c: The DVB HD Full Featured device interface
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbhdffdevice.c 1.29 2011/04/17 11:20:22 kls Exp $
+ */
+
+#include "dvbhdffdevice.h"
+#include <errno.h>
+#include <limits.h>
+#include <libsi/si.h>
+#include <linux/videodev2.h>
+#include <linux/dvb/audio.h>
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/video.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <vdr/eitscan.h>
+#include <vdr/transfer.h>
+#include "hdffosd.h"
+#include "setup.h"
+
+// --- cDvbHdFfDevice ----------------------------------------------------------
+
+int cDvbHdFfDevice::devHdffOffset = -1;
+
+cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
+:cDvbDevice(Adapter, Frontend)
+{
+  spuDecoder = NULL;
+  audioChannel = 0;
+  playMode = pmNone;
+  mHdffCmdIf = NULL;
+
+  // Devices that are only present on cards with decoders:
+
+  fd_osd      = DvbOpen(DEV_DVB_OSD,    adapter, frontend, O_RDWR);
+  fd_video    = DvbOpen(DEV_DVB_VIDEO,  adapter, frontend, O_RDWR | O_NONBLOCK);
+  fd_audio    = DvbOpen(DEV_DVB_AUDIO,  adapter, frontend, O_RDWR | O_NONBLOCK);
+
+  //TODO missing /dev/video offset calculation
+
+  isHdffPrimary = false;
+  if (devHdffOffset < 0) {
+     devHdffOffset = adapter;
+     isHdffPrimary = true;
+     mHdffCmdIf = new HDFF::cHdffCmdIf(fd_osd);
+     mHdffCmdIf->CmdAvSetAudioDelay(gHdffSetup.AudioDelay);
+     mHdffCmdIf->CmdAvSetAudioDownmix((HDFF::eDownmixMode) gHdffSetup.AudioDownmix);
+     mHdffCmdIf->CmdMuxSetVideoOut((HDFF::eVideoOut) gHdffSetup.AnalogueVideo);
+     mHdffCmdIf->CmdHdmiSetVideoMode(gHdffSetup.GetVideoMode());
+     HDFF::tHdmiConfig hdmiConfig;
+     hdmiConfig.TransmitAudio = true;
+     hdmiConfig.ForceDviMode = false;
+     hdmiConfig.CecEnabled = gHdffSetup.CecEnabled;
+     mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
+     if (gHdffSetup.CecEnabled)
+        mHdffCmdIf->CmdHdmiSendCecCommand(HDFF::cecCommandTvOn);
+     mHdffCmdIf->CmdRemoteSetProtocol((HDFF::eRemoteProtocol) gHdffSetup.RemoteProtocol);
+     mHdffCmdIf->CmdRemoteSetAddressFilter(gHdffSetup.RemoteAddress >= 0, gHdffSetup.RemoteAddress);
+     }
+
+  // Video format:
+
+  SetVideoFormat(Setup.VideoFormat);
+}
+
+cDvbHdFfDevice::~cDvbHdFfDevice()
+{
+  delete spuDecoder;
+  if (isHdffPrimary)
+     delete mHdffCmdIf;
+  // We're not explicitly closing any device files here, since this sometimes
+  // caused segfaults. Besides, the program is about to terminate anyway...
+}
+
+void cDvbHdFfDevice::MakePrimaryDevice(bool On)
+{
+  if (On)
+     new cHdffOsdProvider(mHdffCmdIf);
+  cDvbDevice::MakePrimaryDevice(On);
+}
+
+bool cDvbHdFfDevice::HasDecoder(void) const
+{
+  return isHdffPrimary;
+}
+
+cSpuDecoder *cDvbHdFfDevice::GetSpuDecoder(void)
+{
+  if (!spuDecoder && IsPrimaryDevice())
+     spuDecoder = new cDvbSpuDecoder();
+  return spuDecoder;
+}
+
+uchar *cDvbHdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
+{
+  //TODO
+  return NULL;
+}
+
+void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
+{
+  //TODO???
+  cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
+}
+
+void cDvbHdFfDevice::SetVideoFormat(bool VideoFormat16_9)
+{
+  HDFF::tVideoFormat videoFormat;
+  videoFormat.AutomaticEnabled = true;
+  videoFormat.AfdEnabled = true;
+  videoFormat.TvFormat = (HDFF::eTvFormat) gHdffSetup.TvFormat;
+  videoFormat.VideoConversion = (HDFF::eVideoConversion) gHdffSetup.VideoConversion;
+  mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+}
+
+eVideoSystem cDvbHdFfDevice::GetVideoSystem(void)
+{
+  eVideoSystem VideoSystem = vsPAL;
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        if (vs.h == 480 || vs.h == 240)
+           VideoSystem = vsNTSC;
+        }
+     else
+        LOG_ERROR;
+     }
+  return VideoSystem;
+}
+
+void cDvbHdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
+{
+  if (fd_video >= 0) {
+     video_size_t vs;
+     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
+        Width = vs.w;
+        Height = vs.h;
+        switch (vs.aspect_ratio) {
+          default:
+          case VIDEO_FORMAT_4_3:   VideoAspect =  4.0 / 3.0; break;
+          case VIDEO_FORMAT_16_9:  VideoAspect = 16.0 / 9.0; break;
+          case VIDEO_FORMAT_221_1: VideoAspect =       2.21; break;
+          }
+        return;
+        }
+     else
+        LOG_ERROR;
+     }
+  cDevice::GetVideoSize(Width, Height, VideoAspect);
+}
+
+void cDvbHdFfDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
+{
+  gHdffSetup.GetOsdSize(Width, Height, PixelAspect);
+}
+
+/*TODO obsolete?
+bool cDvbHdFfDevice::SetAudioBypass(bool On)
+{
+  if (setTransferModeForDolbyDigital != 1)
+     return false;
+  return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
+}
+TODO*/
+
+bool cDvbHdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
+{
+  if (Handle->pid) {
+     dmx_pes_filter_params pesFilterParams;
+     memset(&pesFilterParams, 0, sizeof(pesFilterParams));
+     if (On) {
+        if (Handle->handle < 0) {
+           Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
+           if (Handle->handle < 0) {
+              LOG_ERROR;
+              return false;
+              }
+           }
+        if (Type == ptPcr)
+           mHdffCmdIf->CmdAvSetPcrPid(0, Handle->pid);
+        else if (Type == ptVideo) {
+           if (Handle->streamType == 0x1B)
+              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF::videoStreamH264);
+           else
+              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF::videoStreamMpeg2);
+           }
+        else if (Type == ptAudio)
+           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF::audioStreamMpeg1);
+        else if (Type == ptDolby)
+           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF::audioStreamAc3);
+        if (!(Type <= ptDolby && Handle->used <= 1)) {
+           pesFilterParams.pid     = Handle->pid;
+           pesFilterParams.input   = DMX_IN_FRONTEND;
+           pesFilterParams.output  = DMX_OUT_TS_TAP;
+           pesFilterParams.pes_type= DMX_PES_OTHER;
+           pesFilterParams.flags   = DMX_IMMEDIATE_START;
+           if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+              LOG_ERROR;
+              return false;
+              }
+           }
+        }
+     else if (!Handle->used) {
+        CHECK(ioctl(Handle->handle, DMX_STOP));
+        if (Type == ptPcr)
+           mHdffCmdIf->CmdAvSetPcrPid(0, 0);
+        else if (Type == ptVideo)
+           mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF::videoStreamMpeg2);
+        else if (Type == ptAudio)
+           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+        else if (Type == ptDolby)
+           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamAc3);
+        //TODO missing setting to 0x1FFF??? see cDvbDevice::SetPid()
+        close(Handle->handle);
+        Handle->handle = -1;
+        }
+     }
+  return true;
+}
+
+void cDvbHdFfDevice::TurnOffLiveMode(bool LiveView)
+{
+  // Turn off live PIDs:
+
+  DetachAll(pidHandles[ptAudio].pid);
+  DetachAll(pidHandles[ptVideo].pid);
+  DetachAll(pidHandles[ptPcr].pid);
+  DetachAll(pidHandles[ptTeletext].pid);
+  DelPid(pidHandles[ptAudio].pid);
+  DelPid(pidHandles[ptVideo].pid);
+  DelPid(pidHandles[ptPcr].pid, ptPcr);
+  DelPid(pidHandles[ptTeletext].pid);
+  DelPid(pidHandles[ptDolby].pid);
+}
+
+bool cDvbHdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
+{
+  int apid = Channel->Apid(0);
+  int vpid = Channel->Vpid();
+  int dpid = Channel->Dpid(0);
+
+  bool DoTune = !IsTunedToTransponder(Channel);
+
+  bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
+  bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
+
+  bool TurnOffLivePIDs = DoTune
+                         || !IsPrimaryDevice()
+                         || LiveView // for a new live view the old PIDs need to be turned off
+                         || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                         ;
+
+  bool StartTransferMode = IsPrimaryDevice() && !DoTune
+                           && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
+                              || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+                              );
+  if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
+     StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
+
+  bool TurnOnLivePIDs = !StartTransferMode && LiveView;
+
+  // Turn off live PIDs if necessary:
+
+  if (TurnOffLivePIDs)
+     TurnOffLiveMode(LiveView);
+
+  // Set the tuner:
+
+  if (!cDvbDevice::SetChannelDevice(Channel, LiveView))
+     return false;
+
+  // If this channel switch was requested by the EITScanner we don't wait for
+  // a lock and don't set any live PIDs (the EITScanner will wait for the lock
+  // by itself before setting any filters):
+
+  if (EITScanner.UsesDevice(this)) //XXX
+     return true;
+
+  // PID settings:
+
+  if (TurnOnLivePIDs) {
+     //SetAudioBypass(false);//TODO obsolete?
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo, Channel->Vtype()) && AddPid(apid, ptAudio))) {
+        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
+        return false;
+        }
+     if (IsPrimaryDevice())
+        AddPid(Channel->Tpid(), ptTeletext);//TODO obsolete?
+     }
+  else if (StartTransferMode)
+     cControl::Launch(new cTransferControl(this, Channel));
+
+  return true;
+}
+
+int cDvbHdFfDevice::GetAudioChannelDevice(void)
+{
+  return audioChannel;
+}
+
+void cDvbHdFfDevice::SetAudioChannelDevice(int AudioChannel)
+{
+  mHdffCmdIf->CmdAvSetAudioChannel(AudioChannel);
+  audioChannel = AudioChannel;
+}
+
+void cDvbHdFfDevice::SetVolumeDevice(int Volume)
+{
+  mHdffCmdIf->CmdMuxSetVolume(Volume * 100 / 255);
+}
+
+void cDvbHdFfDevice::SetDigitalAudioDevice(bool On)
+{
+  // not needed
+}
+
+void cDvbHdFfDevice::SetAudioTrackDevice(eTrackType Type)
+{
+  //printf("SetAudioTrackDevice %d\n", Type);
+  const tTrackId *TrackId = GetTrack(Type);
+  if (TrackId && TrackId->id) {
+     if (IS_AUDIO_TRACK(Type)) {
+        if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
+           DetachAll(pidHandles[ptAudio].pid);
+           if (CamSlot())
+              CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
+           pidHandles[ptAudio].pid = TrackId->id;
+           SetPid(&pidHandles[ptAudio], ptAudio, true);
+           if (CamSlot()) {
+              CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
+              CamSlot()->StartDecrypting();
+              }
+           }
+	}
+     else if (IS_DOLBY_TRACK(Type)) {
+        pidHandles[ptDolby].pid = TrackId->id;
+        SetPid(&pidHandles[ptDolby], ptDolby, true);
+        }
+     }
+}
+
+bool cDvbHdFfDevice::CanReplay(void) const
+{
+  return cDevice::CanReplay();
+}
+
+bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
+{
+  if (PlayMode == pmNone) {
+     mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
+     mHdffCmdIf->CmdAvSetPcrPid(0, 0);
+     mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF::videoStreamMpeg2);
+     mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+
+     ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
+     mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
+     mHdffCmdIf->CmdAvEnableSync(0, true);
+     mHdffCmdIf->CmdAvSetPlayMode(0, true);
+     }
+  else {
+     if (playMode == pmNone)
+        TurnOffLiveMode(true);
+
+     mHdffCmdIf->CmdAvSetPlayMode(1, Transferring());
+     mHdffCmdIf->CmdAvSetStc(0, 100000);
+     mHdffCmdIf->CmdAvEnableSync(0, true);
+     mHdffCmdIf->CmdAvEnableVideoAfterStop(0, true);
+
+     playVideoPid = -1;
+     playAudioPid = -1;
+     audioCounter = 0;
+     videoCounter = 0;
+
+     mHdffCmdIf->CmdAvSetDecoderInput(0, 2);
+     ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
+     }
+  playMode = PlayMode;
+  return true;
+}
+
+int64_t cDvbHdFfDevice::GetSTC(void)
+{
+  if (fd_video >= 0) {
+     uint64_t pts;
+     if (ioctl(fd_video, VIDEO_GET_PTS, &pts) == -1) {
+        esyslog("ERROR: pts %d: %m", CardIndex() + 1);
+        return -1;
+        }
+     return pts;
+     }
+  if (fd_audio >= 0) {
+     uint64_t pts;
+     if (ioctl(fd_audio, AUDIO_GET_PTS, &pts) == -1) {
+        esyslog("ERROR: pts %d: %m", CardIndex() + 1);
+        return -1;
+        }
+     return pts;
+     }
+  return -1;
+}
+
+void cDvbHdFfDevice::TrickSpeed(int Speed)
+{
+  mHdffCmdIf->CmdAvEnableSync(0, false);
+  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+  playAudioPid = -1;
+  if (Speed > 0)
+     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100 / Speed);
+}
+
+void cDvbHdFfDevice::Clear(void)
+{
+  CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+  mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF::videoStreamMpeg1);
+  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+  playVideoPid = -1;
+  playAudioPid = -1;
+  cDevice::Clear();
+}
+
+void cDvbHdFfDevice::Play(void)
+{
+  mHdffCmdIf->CmdAvEnableSync(0, true);
+  mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
+  mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
+  cDevice::Play();
+}
+
+void cDvbHdFfDevice::Freeze(void)
+{
+  mHdffCmdIf->CmdAvSetVideoSpeed(0, 0);
+  mHdffCmdIf->CmdAvSetAudioSpeed(0, 0);
+  cDevice::Freeze();
+}
+
+void cDvbHdFfDevice::Mute(void)
+{
+  //TODO???
+  cDevice::Mute();
+}
+
+static HDFF::eVideoStreamType MapVideoStreamTypes(int Vtype)
+{
+  switch (Vtype) {
+    case 0x01: return HDFF::videoStreamMpeg1;
+    case 0x02: return HDFF::videoStreamMpeg2;
+    case 0x1B: return HDFF::videoStreamH264;
+    default: return HDFF::videoStreamMpeg2; // fallback to MPEG2
+    }
+}
+
+void cDvbHdFfDevice::StillPicture(const uchar *Data, int Length)
+{
+  if (!Data || Length < TS_SIZE)
+     return;
+  if (Data[0] == 0x47) {
+     // TS data
+     cDevice::StillPicture(Data, Length);
+     }
+  else if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
+     // PES data
+     char *buf = MALLOC(char, Length);
+     if (!buf)
+        return;
+     int i = 0;
+     int blen = 0;
+     while (i < Length - 6) {
+           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
+              int len = Data[i + 4] * 256 + Data[i + 5];
+              if ((Data[i + 3] & 0xF0) == 0xE0) { // video packet
+                 // skip PES header
+                 int offs = i + 6;
+                 // skip header extension
+                 if ((Data[i + 6] & 0xC0) == 0x80) {
+                    // MPEG-2 PES header
+                    if (Data[i + 8] >= Length)
+                       break;
+                    offs += 3;
+                    offs += Data[i + 8];
+                    len -= 3;
+                    len -= Data[i + 8];
+                    if (len < 0 || offs + len > Length)
+                       break;
+                    }
+                 else {
+                    // MPEG-1 PES header
+                    while (offs < Length && len > 0 && Data[offs] == 0xFF) {
+                          offs++;
+                          len--;
+                          }
+                    if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
+                       offs += 2;
+                       len -= 2;
+                       }
+                    if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
+                       offs += 5;
+                       len -= 5;
+                       }
+                    else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
+                       offs += 10;
+                       len -= 10;
+                       }
+                    else if (offs < Length && len > 0) {
+                       offs++;
+                       len--;
+                       }
+                    }
+                 if (blen + len > Length) // invalid PES length field
+                    break;
+                 memcpy(&buf[blen], &Data[offs], len);
+                 i = offs + len;
+                 blen += len;
+                 }
+              else if (Data[i + 3] >= 0xBD && Data[i + 3] <= 0xDF) // other PES packets
+                 i += len + 6;
+              else
+                 i++;
+              }
+           else
+              i++;
+           }
+     mHdffCmdIf->CmdAvShowStillImage(0, (uint8_t *)buf, blen, MapVideoStreamTypes(PatPmtParser()->Vtype()));
+     free(buf);
+     }
+  else {
+     // non-PES data
+     mHdffCmdIf->CmdAvShowStillImage(0, Data, Length, MapVideoStreamTypes(PatPmtParser()->Vtype()));
+     }
+}
+
+bool cDvbHdFfDevice::Poll(cPoller &Poller, int TimeoutMs)
+{
+  Poller.Add(fd_video, true);
+  return Poller.Poll(TimeoutMs);
+}
+
+bool cDvbHdFfDevice::Flush(int TimeoutMs)
+{
+  //TODO actually this function should wait until all buffered data has been processed by the card, but how?
+  return true;
+}
+
+void cDvbHdFfDevice::BuildTsPacket(uint8_t * TsBuffer, bool PusiSet, uint16_t Pid, uint8_t Counter, const uint8_t * Data, uint32_t Length)
+{
+    TsBuffer[0] = 0x47;
+    TsBuffer[1] = PusiSet ? 0x40 : 0x00;
+    TsBuffer[1] |= Pid >> 8;
+    TsBuffer[2] = Pid & 0xFF;
+    if (Length >= 184)
+    {
+        TsBuffer[3] = 0x10 | Counter;
+        memcpy(TsBuffer + 4, Data, 184);
+    }
+    else
+    {
+        uint8_t adaptationLength;
+
+        TsBuffer[3] = 0x30 | Counter;
+        adaptationLength = 183 - Length;
+        TsBuffer[4] = adaptationLength;
+        if (adaptationLength > 0)
+        {
+            TsBuffer[5] = 0x00;
+            memset(TsBuffer + 6, 0xFF, adaptationLength - 1);
+        }
+        memcpy(TsBuffer + 5 + adaptationLength, Data, Length);
+    }
+}
+
+uint32_t cDvbHdFfDevice::PesToTs(uint8_t * TsBuffer, uint16_t Pid, uint8_t & Counter, const uint8_t * Data, uint32_t Length)
+{
+    uint32_t tsOffset;
+    uint32_t i;
+
+    tsOffset = 0;
+    i = 0;
+    while (Length > 0)
+    {
+        BuildTsPacket(TsBuffer + tsOffset, i == 0, Pid, Counter, Data + i * 184, Length);
+        if (Length >= 184)
+            Length -= 184;
+        else
+            Length = 0;
+        Counter = (Counter + 1) & 15;
+        tsOffset += 188;
+        i++;
+    }
+    return tsOffset;
+}
+
+int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
+{
+    //TODO: support greater Length
+    uint8_t tsBuffer[188 * 16];
+    uint32_t tsLength;
+    int pid = 100;
+
+    tsLength = PesToTs(tsBuffer, pid, videoCounter, Data, Length);
+
+    if (pid != playVideoPid) {
+        playVideoPid = pid;
+        mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, HDFF::videoStreamMpeg2, true);
+    }
+    if (WriteAllOrNothing(fd_video, tsBuffer, tsLength, 1000, 10) <= 0)
+        Length = 0;
+    return Length;
+}
+
+int cDvbHdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
+{
+    uint8_t streamId;
+    uint8_t tsBuffer[188 * 16];
+    uint32_t tsLength;
+    HDFF::eAudioStreamType streamType = HDFF::audioStreamMpeg1;
+    HDFF::eAVContainerType containerType = HDFF::avContainerPes;
+    int pid;
+
+    streamId = Data[3];
+    if (streamId >= 0xC0 && streamId <= 0xDF)
+    {
+        streamType = HDFF::audioStreamMpeg1;
+    }
+    else if (streamId == 0xBD)
+    {
+        const uint8_t * payload = Data + 9 + Data[8];
+        if ((payload[0] & 0xF8) == 0xA0)
+        {
+            containerType = HDFF::avContainerPesDvd;
+            streamType = HDFF::audioStreamPcm;
+        }
+        else if ((payload[0] & 0xF8) == 0x88)
+        {
+            containerType = HDFF::avContainerPesDvd;
+            streamType = HDFF::audioStreamDts;
+        }
+        else if ((payload[0] & 0xF8) == 0x80)
+        {
+            containerType = HDFF::avContainerPesDvd;
+            streamType = HDFF::audioStreamAc3;
+        }
+        else
+        {
+            streamType = HDFF::audioStreamAc3;
+        }
+    }
+    pid = 200 + (int) streamType;
+    tsLength = PesToTs(tsBuffer, pid, audioCounter, Data, Length);
+
+    if (pid != playAudioPid) {
+        playAudioPid = pid;
+        mHdffCmdIf->CmdAvSetAudioPid(0, playAudioPid, streamType, containerType);
+    }
+    if (WriteAllOrNothing(fd_video, tsBuffer, tsLength, 1000, 10) <= 0)
+        Length = 0;
+    return Length;
+}
+
+int cDvbHdFfDevice::PlayTsVideo(const uchar *Data, int Length)
+{
+  int pid = TsPid(Data);
+  if (pid != playVideoPid) {
+     PatPmtParser();
+     if (pid == PatPmtParser()->Vpid()) {
+        playVideoPid = pid;
+        mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, MapVideoStreamTypes(PatPmtParser()->Vtype()), true);
+        }
+     }
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+}
+
+static HDFF::eAudioStreamType MapAudioStreamTypes(int Atype)
+{
+  switch (Atype) {
+    case 0x03: return HDFF::audioStreamMpeg1;
+    case 0x04: return HDFF::audioStreamMpeg2;
+    case SI::AC3DescriptorTag: return HDFF::audioStreamAc3;
+    case SI::EnhancedAC3DescriptorTag: return HDFF::audioStreamEAc3;
+    case 0x0F: return HDFF::audioStreamAac;
+    case 0x11: return HDFF::audioStreamHeAac;
+    default: return HDFF::audioStreamMaxValue; // there is no HDFF::audioStreamNone
+    }
+}
+
+int cDvbHdFfDevice::PlayTsAudio(const uchar *Data, int Length)
+{
+  int pid = TsPid(Data);
+  if (pid != playAudioPid) {
+     playAudioPid = pid;
+     int AudioStreamType = -1;
+     for (int i = 0; PatPmtParser()->Apid(i); i++) {
+         if (playAudioPid == PatPmtParser()->Apid(i)) {
+            AudioStreamType = PatPmtParser()->Atype(i);
+            break;
+            }
+         }
+     if (AudioStreamType < 0) {
+        for (int i = 0; PatPmtParser()->Dpid(i); i++) {
+            if (playAudioPid == PatPmtParser()->Dpid(i)) {
+               AudioStreamType = PatPmtParser()->Dtype(i);
+               break;
+               }
+            }
+        }
+     mHdffCmdIf->CmdAvSetAudioPid(0, playAudioPid, MapAudioStreamTypes(AudioStreamType));
+     }
+  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+}
+
+HDFF::cHdffCmdIf *cDvbHdFfDevice::GetHdffCmdHandler(void)
+{
+  //TODO why not just keep a pointer?
+  if (devHdffOffset >= 0) {
+     cDvbHdFfDevice *device = (cDvbHdFfDevice *)GetDevice(devHdffOffset);
+     if (device)
+        return device->mHdffCmdIf;
+     }
+  return NULL;
+}
+
+// --- cDvbHdFfDeviceProbe ---------------------------------------------------
+
+bool cDvbHdFfDeviceProbe::Probe(int Adapter, int Frontend)
+{
+  static uint32_t SubsystemIds[] = {
+    0x13C23009, // Technotrend S2-6400 HDFF
+    0x00000000
+    };
+  cString FileName;
+  cReadLine ReadLine;
+  FILE *f = NULL;
+  uint32_t SubsystemId = 0;
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId = strtoul(s, NULL, 0) << 16;
+     fclose(f);
+     }
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId |= strtoul(s, NULL, 0);
+     fclose(f);
+     }
+  for (uint32_t *sid = SubsystemIds; *sid; sid++) {
+      if (*sid == SubsystemId) {
+         FileName = cString::sprintf("/dev/dvb/adapter%d/osd0", Adapter);
+         int fd = open(FileName, O_RDWR);
+         if (fd != -1) { //TODO treat the second path of the S2-6400 as a budget device
+            close(fd);
+            dsyslog("creating cDvbHdFfDevice");
+            new cDvbHdFfDevice(Adapter, Frontend);
+            return true;
+            }
+         }
+      }
+  return false;
+}
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
new file mode 100644
index 000000000..4dcfb6a54
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -0,0 +1,123 @@
+/*
+ * dvbhdffdevice.h: The DVB HD Full Featured device interface
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: dvbhdffdevice.h 1.6 2010/03/13 11:18:13 kls Exp $
+ */
+
+#ifndef __DVBHDFFDEVICE_H
+#define __DVBHDFFDEVICE_H
+
+#include "hdffcmd.h"
+#include "vdr/dvbdevice.h"
+#include "vdr/dvbspu.h"
+
+/// The cDvbHdFfDevice implements a DVB device which can be accessed through the Linux DVB driver API.
+
+class cDvbHdFfDevice : public cDvbDevice {
+private:
+  int fd_osd, fd_audio, fd_video;
+protected:
+  virtual void MakePrimaryDevice(bool On);
+public:
+  static bool Probe(int Adapter, int Frontend);
+  cDvbHdFfDevice(int Adapter, int Frontend);
+  virtual ~cDvbHdFfDevice();
+  virtual bool HasDecoder(void) const;
+
+// SPU facilities
+
+private:
+  cDvbSpuDecoder *spuDecoder;
+public:
+  virtual cSpuDecoder *GetSpuDecoder(void);
+
+// Channel facilities
+
+private:
+  void TurnOffLiveMode(bool LiveView);
+protected:
+  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+
+// PID handle facilities
+
+protected:
+  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
+
+// Image Grab facilities
+
+public:
+  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
+
+// Video format facilities
+
+public:
+  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
+  virtual void SetVideoFormat(bool VideoFormat16_9);
+  virtual eVideoSystem GetVideoSystem(void);
+  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
+  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
+
+// Track facilities
+
+protected:
+  virtual void SetAudioTrackDevice(eTrackType Type);
+
+// Audio facilities
+
+private:
+  int audioChannel;
+protected:
+  virtual int GetAudioChannelDevice(void);
+  virtual void SetAudioChannelDevice(int AudioChannel);
+  virtual void SetVolumeDevice(int Volume);
+  virtual void SetDigitalAudioDevice(bool On);
+
+// Player facilities
+
+private:
+  int playVideoPid;
+  int playAudioPid;
+
+  // Pes2Ts conversion stuff
+  uint8_t videoCounter;
+  uint8_t audioCounter;
+  void BuildTsPacket(uint8_t * TsBuffer, bool PusiSet, uint16_t Pid, uint8_t Counter, const uint8_t * Data, uint32_t Length);
+  uint32_t PesToTs(uint8_t * TsBuffer, uint16_t Pid, uint8_t & Counter, const uint8_t * Data, uint32_t Length);
+
+protected:
+  ePlayMode playMode;
+  virtual bool CanReplay(void) const;
+  virtual bool SetPlayMode(ePlayMode PlayMode);
+  virtual int PlayVideo(const uchar *Data, int Length);
+  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
+  virtual int PlayTsVideo(const uchar *Data, int Length);
+  virtual int PlayTsAudio(const uchar *Data, int Length);
+public:
+  virtual int64_t GetSTC(void);
+  virtual void TrickSpeed(int Speed);
+  virtual void Clear(void);
+  virtual void Play(void);
+  virtual void Freeze(void);
+  virtual void Mute(void);
+  virtual void StillPicture(const uchar *Data, int Length);
+  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
+  virtual bool Flush(int TimeoutMs = 0);
+
+// HDFF specific things
+
+public:
+  static HDFF::cHdffCmdIf *GetHdffCmdHandler(void);
+private:
+  static int devHdffOffset;//TODO
+  bool isHdffPrimary;//TODO implicit!
+  HDFF::cHdffCmdIf *mHdffCmdIf;
+};
+
+class cDvbHdFfDeviceProbe : public cDvbDeviceProbe {
+public:
+  virtual bool Probe(int Adapter, int Frontend);
+  };
+
+#endif //__DVBHDFFDEVICE_H
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
new file mode 100644
index 000000000..ecd26edb8
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -0,0 +1,1120 @@
+/*
+ * hdffcmd.c: TODO(short description)
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: hdffcmd.c 1.19 2011/04/17 11:20:22 kls Exp $
+ */
+
+#include "hdffcmd.h"
+#include <linux/dvb/osd.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <vdr/tools.h>
+
+namespace HDFF
+{
+
+cHdffCmdIf::cHdffCmdIf(int OsdDev)
+{
+    mOsdDev = OsdDev;
+    if (mOsdDev < 0)
+    {
+        //printf("ERROR: invalid OSD device handle (%d)!\n", mOsdDev);
+    }
+}
+
+cHdffCmdIf::~cHdffCmdIf(void)
+{
+}
+
+void cHdffCmdIf::CmdBuildHeader(cBitBuffer & MsgBuf, eMessageType MsgType, eMessageGroup MsgGroup, eMessageId MsgId)
+{
+    MsgBuf.SetBits(16, 0); // length field will be set later
+    MsgBuf.SetBits(6, 0); // reserved
+    MsgBuf.SetBits(2, MsgType);
+    MsgBuf.SetBits(8, MsgGroup);
+    MsgBuf.SetBits(16, MsgId);
+}
+
+uint32_t cHdffCmdIf::CmdSetLength(cBitBuffer & MsgBuf)
+{
+    uint32_t length;
+
+    length = MsgBuf.GetByteLength() - 2;
+    MsgBuf.SetDataByte(0, (uint8_t) (length >> 8));
+    MsgBuf.SetDataByte(1, (uint8_t) length);
+
+    return length + 2;
+}
+
+
+uint32_t cHdffCmdIf::CmdGetFirmwareVersion(char * pString, uint32_t MaxLength)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupGeneric, msgGenGetFirmwareVersion);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        uint8_t textLength = result[9];
+        if (textLength >= MaxLength)
+            textLength = MaxLength - 1;
+        memcpy(pString, &result[10], textLength);
+        pString[textLength] = 0;
+        return (result[6] << 16) | (result[7] << 8) | result[8];
+    }
+    return 0;
+}
+
+uint32_t cHdffCmdIf::CmdGetInterfaceVersion(char * pString, uint32_t MaxLength)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupGeneric, msgGenGetInterfaceVersion);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        uint8_t textLength = result[9];
+        if (textLength >= MaxLength)
+            textLength = MaxLength - 1;
+        memcpy(pString, &result[10], textLength);
+        pString[textLength] = 0;
+        return (result[6] << 16) | (result[7] << 8) | result[8];
+    }
+    return 0;
+}
+
+uint32_t cHdffCmdIf::CmdGetCopyrights(uint8_t Index, char * pString, uint32_t MaxLength)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupGeneric, msgGenGetCopyrights);
+    cmdBuf.SetBits(8, Index);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        uint8_t index = result[6];
+        uint8_t textLen = result[7];
+        if (index == Index && textLen > 0)
+        {
+            if (textLen >= MaxLength)
+            {
+                textLen = MaxLength - 1;
+            }
+            memcpy(pString, result + 8, textLen);
+            pString[textLen] = 0;
+            return textLen;
+        }
+    }
+    return 0;
+}
+
+
+void cHdffCmdIf::CmdAvSetPlayMode(uint8_t PlayMode, bool Realtime)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetPlayMode);
+    cmdBuf.SetBits(1, Realtime ? 1 : 0);
+    cmdBuf.SetBits(7, PlayMode);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, eVideoStreamType StreamType, bool PlaybackMode)
+{
+    //printf("SetVideoPid %d %d\n", VideoPid, StreamType);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoPid);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, StreamType);
+    cmdBuf.SetBits(1, PlaybackMode ? 1 : 0);
+    cmdBuf.SetBits(15, VideoPid);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, eAudioStreamType StreamType, eAVContainerType ContainerType)
+{
+    //printf("SetAudioPid %d %d %d\n", AudioPid, StreamType, ContainerType);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioPid);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, StreamType);
+    cmdBuf.SetBits(2, 0); // reserved
+    cmdBuf.SetBits(1, ContainerType);
+    cmdBuf.SetBits(13, AudioPid);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetPcrPid(uint8_t DecoderIndex, uint16_t PcrPid)
+{
+    //printf("SetPcrPid %d\n", PcrPid);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetPcrPid);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, 0); // reserved
+    cmdBuf.SetBits(16, PcrPid);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetTeletextPid(uint8_t DecoderIndex, uint16_t TeletextPid)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetTeletextPid);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, 0); // reserved
+    cmdBuf.SetBits(16, TeletextPid);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetVideoWindow(uint8_t DecoderIndex, bool Enable, uint16_t X, uint16_t Y, uint16_t Width, uint16_t Height)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoWindow);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(3, 0); // reserved
+    if (Enable)
+        cmdBuf.SetBits(1, 1);
+    else
+        cmdBuf.SetBits(1, 0);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(16, Width);
+    cmdBuf.SetBits(16, Height);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, eVideoStreamType StreamType)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    osd_raw_data_t osd_data;
+
+    memset(&osd_data, 0, sizeof(osd_raw_data_t));
+    osd_data.data_buffer = (void *) pStillImage;
+    osd_data.data_length = Size;
+    ioctl(mOsdDev, OSD_RAW_DATA, &osd_data);
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvShowStillImage);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, StreamType);
+    cmdBuf.SetBits(16, osd_data.data_handle);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetDecoderInput(uint8_t DecoderIndex, uint8_t DemultiplexerIndex)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetDecoderInput);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, DemultiplexerIndex);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetDemultiplexerInput(uint8_t DemultiplexerIndex, uint8_t TsInputIndex)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetDemultiplexerInput);
+    cmdBuf.SetBits(4, DemultiplexerIndex);
+    cmdBuf.SetBits(4, TsInputIndex);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetVideoFormat(uint8_t DecoderIndex, const tVideoFormat * pVideoFormat)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoFormat);
+    cmdBuf.SetBits(4, DecoderIndex);
+    if (pVideoFormat->AutomaticEnabled)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    if (pVideoFormat->AfdEnabled)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    cmdBuf.SetBits(2, pVideoFormat->TvFormat);
+    cmdBuf.SetBits(8, pVideoFormat->VideoConversion);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetVideoOutputMode(uint8_t DecoderIndex, eVideoOutputMode OutputMode)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoOutputMode);
+    cmdBuf.SetBits(8, OutputMode);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetStc(uint8_t DecoderIndex, uint64_t Stc)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetStc);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(3, 0); // reserved
+    cmdBuf.SetBits(1, (uint32_t) (Stc >> 32));
+    cmdBuf.SetBits(32, (uint32_t) Stc);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvFlushBuffer(uint8_t DecoderIndex, bool FlushAudio, bool FlushVideo)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvFlushBuffer);
+    cmdBuf.SetBits(4, DecoderIndex);
+    if (FlushAudio)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    if (FlushVideo)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvEnableSync(uint8_t DecoderIndex, bool EnableSync)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvEnableSync);
+    cmdBuf.SetBits(4, DecoderIndex);
+    if (EnableSync)
+    {
+        cmdBuf.SetBits(1, 1);
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+        cmdBuf.SetBits(1, 0);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetVideoSpeed(uint8_t DecoderIndex, int32_t Speed)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoSpeed);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, 0);
+    cmdBuf.SetBits(32, Speed);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetAudioSpeed(uint8_t DecoderIndex, int32_t Speed)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioSpeed);
+    cmdBuf.SetBits(4, DecoderIndex);
+    cmdBuf.SetBits(4, 0);
+    cmdBuf.SetBits(32, Speed);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvEnableVideoAfterStop(uint8_t DecoderIndex, bool EnableVideoAfterStop)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvEnableVideoAfterStop);
+    cmdBuf.SetBits(4, DecoderIndex);
+    if (EnableVideoAfterStop)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetAudioDelay(int16_t Delay)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioDelay);
+    cmdBuf.SetBits(16, Delay);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetAudioDownmix(eDownmixMode DownmixMode)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioDownmix);
+    cmdBuf.SetBits(8, DownmixMode);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdAvSetAudioChannel(uint8_t AudioChannel)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioChannel);
+    cmdBuf.SetBits(8, AudioChannel);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+
+void cHdffCmdIf::CmdOsdConfigure(const tOsdConfig * pConfig)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdConfigure);
+    if (pConfig->FontAntialiasing)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    if (pConfig->FontKerning)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdReset(void)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdReset);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+uint32_t cHdffCmdIf::CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, eColorType ColorType)
+{
+    //printf("CreateDisplay %d %d %d\n", Width, Height, ColorType);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreateDisplay);
+    cmdBuf.SetBits(16, Width);
+    cmdBuf.SetBits(16, Height);
+    cmdBuf.SetBits(8, ColorType);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
+    }
+    return InvalidHandle;
+}
+
+void cHdffCmdIf::CmdOsdDeleteDisplay(uint32_t hDisplay)
+{
+    //printf("DeleteDisplay\n");
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeleteDisplay);
+    cmdBuf.SetBits(32, hDisplay);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdEnableDisplay(uint32_t hDisplay, bool Enable)
+{
+    //printf("EnableDisplay\n");
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdEnableDisplay);
+    cmdBuf.SetBits(32, hDisplay);
+    if (Enable)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    cmdBuf.SetBits(7, 0); // reserved
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdSetDisplayOutputRectangle(uint32_t hDisplay, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height)
+{
+    //printf("SetOutputRect %d %d %d %d %d\n", hDisplay, X, Y, Width, Height);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetDisplayOutputRectangle);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(16, Width);
+    cmdBuf.SetBits(16, Height);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height)
+{
+    //printf("SetClippingArea %d %d %d %d %d %d\n", hDisplay, Enable, X, Y, Width, Height);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetDisplayClippingArea);
+    cmdBuf.SetBits(32, hDisplay);
+    if (Enable)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    cmdBuf.SetBits(7, 0); // reserved
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(16, Width);
+    cmdBuf.SetBits(16, Height);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdRenderDisplay(uint32_t hDisplay)
+{
+    //printf("Render\n");
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdRenderDisplay);
+    cmdBuf.SetBits(32, hDisplay);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+uint32_t cHdffCmdIf::CmdOsdCreatePalette(eColorType ColorType, eColorFormat ColorFormat,
+                                         uint32_t NumColors, const uint32_t * pColors)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    uint32_t i;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreatePalette);
+    cmdBuf.SetBits(8, ColorType);
+    cmdBuf.SetBits(8, ColorFormat);
+    if (NumColors > 256)
+        NumColors = 256;
+    cmdBuf.SetBits(8, NumColors == 256 ? 0 : NumColors);
+    for (i = 0; i < NumColors; i++)
+    {
+        cmdBuf.SetBits(32, pColors[i]);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
+    }
+    return InvalidHandle;
+}
+
+void cHdffCmdIf::CmdOsdDeletePalette(uint32_t hPalette)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeletePalette);
+    cmdBuf.SetBits(32, hPalette);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdSetDisplayPalette(uint32_t hDisplay, uint32_t hPalette)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetDisplayPalette);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(32, hPalette);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdSetPaletteColors(uint32_t hPalette, eColorFormat ColorFormat,
+                                        uint8_t StartColor, uint32_t NumColors, const uint32_t * pColors)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    uint32_t i;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetPaletteColors);
+    cmdBuf.SetBits(32, hPalette);
+    cmdBuf.SetBits(8, ColorFormat);
+    cmdBuf.SetBits(8, StartColor);
+    if (NumColors > 256)
+        NumColors = 256;
+    cmdBuf.SetBits(8, NumColors == 256 ? 0 : NumColors);
+    for (i = 0; i < NumColors; i++)
+    {
+        cmdBuf.SetBits(32, pColors[i]);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+uint32_t cHdffCmdIf::CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t DataSize)
+{
+    //printf("CreateFontFace %d\n", DataSize);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    osd_raw_data_t osd_data;
+
+    memset(&osd_data, 0, sizeof(osd_raw_data_t));
+    osd_data.data_buffer = pFontData;
+    osd_data.data_length = DataSize;
+    ioctl(mOsdDev, OSD_RAW_DATA, &osd_data);
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreateFontFace);
+    cmdBuf.SetBits(16, osd_data.data_handle);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
+    }
+    return InvalidHandle;
+}
+
+void cHdffCmdIf::CmdOsdDeleteFontFace(uint32_t hFontFace)
+{
+    //printf("DeleteFontFace %08X\n", hFontFace);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeleteFontFace);
+    cmdBuf.SetBits(32, hFontFace);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+uint32_t cHdffCmdIf::CmdOsdCreateFont(uint32_t hFontFace, uint32_t Size)
+{
+    //printf("CreateFont %d\n", Size);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    cBitBuffer resBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    osd_cmd.result_data = resBuf.GetData();
+    osd_cmd.result_len = resBuf.GetMaxLength();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreateFont);
+    cmdBuf.SetBits(32, hFontFace);
+    cmdBuf.SetBits(32, Size);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    if (osd_cmd.result_len > 0)
+    {
+        uint8_t * result = resBuf.GetData();
+        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
+    }
+    return InvalidHandle;
+}
+
+void cHdffCmdIf::CmdOsdDeleteFont(uint32_t hFont)
+{
+    //printf("DeleteFont %08X\n", hFont);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeleteFont);
+    cmdBuf.SetBits(32, hFont);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color)
+{
+    //printf("Rect (%d,%d) %d x %d, %08X\n", X, Y, Width, Height, Color);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawRectangle);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(16, Width);
+    cmdBuf.SetBits(16, Height);
+    cmdBuf.SetBits(32, Color);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
+                                 uint32_t Color, uint32_t Flags)
+{
+    //printf("Ellipse (%d,%d) %d x %d, %08X, %d\n", CX, CY, RadiusX, RadiusY, Color, Flags);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawEllipse);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(16, CX);
+    cmdBuf.SetBits(16, CY);
+    cmdBuf.SetBits(16, RadiusX);
+    cmdBuf.SetBits(16, RadiusY);
+    cmdBuf.SetBits(32, Color);
+    cmdBuf.SetBits(32, Flags);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
+{
+    //printf("Text %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    int i;
+    int length;
+
+    length = 0;
+    while (pText[length])
+    {
+        length++;
+    }
+    if (length > 980)
+        length = 980;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawText);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(32, hFont);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(32, Color);
+    cmdBuf.SetBits(16, length);
+    for (i = 0; i < length; i++)
+    {
+        cmdBuf.SetBits(8, pText[i]);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color)
+{
+    //printf("TextW %08X (%d,%d), %08X\n", hFont, X, Y, Color);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    int i;
+    int length;
+
+    length = 0;
+    while (pText[length])
+    {
+        length++;
+    }
+    if (length > 480)
+        length = 480;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawTextW);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(32, hFont);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(32, Color);
+    cmdBuf.SetBits(16, length);
+    for (i = 0; i < length; i++)
+    {
+        cmdBuf.SetBits(16, pText[i]);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
+                                  int BmpWidth, int BmpHeight, int BmpSize,
+                                  eColorType ColorType, uint32_t hPalette)
+{
+    //printf("Bitmap (%d,%d) %d x %d\n", X, Y, BmpWidth, BmpHeight);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+    osd_raw_data_t osd_data;
+
+    memset(&osd_data, 0, sizeof(osd_raw_data_t));
+    osd_data.data_buffer = pBitmap;
+    osd_data.data_length = BmpSize;
+    ioctl(mOsdDev, OSD_RAW_DATA, &osd_data);
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawBitmap);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(16, BmpWidth);
+    cmdBuf.SetBits(16, BmpHeight);
+    cmdBuf.SetBits(8, ColorType);
+    cmdBuf.SetBits(6, 0); // reserved
+    cmdBuf.SetBits(2, 0); // uncompressed
+    cmdBuf.SetBits(32, hPalette);
+    cmdBuf.SetBits(16, osd_data.data_handle);
+    cmdBuf.SetBits(32, 0);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdSaveRegion(uint32_t hDisplay, int X, int Y, int Width, int Height)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSaveRegion);
+    cmdBuf.SetBits(32, hDisplay);
+    cmdBuf.SetBits(16, X);
+    cmdBuf.SetBits(16, Y);
+    cmdBuf.SetBits(16, Width);
+    cmdBuf.SetBits(16, Height);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdOsdRestoreRegion(uint32_t hDisplay)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdRestoreRegion);
+    cmdBuf.SetBits(32, hDisplay);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdMuxSetVideoOut(eVideoOut VideoOut)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvMux, msgMuxSetVideoOut);
+    cmdBuf.SetBits(4, VideoOut);
+    cmdBuf.SetBits(4, 0); // reserved
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdMuxSetVolume(uint8_t Volume)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvMux, msgMuxSetVolume);
+    cmdBuf.SetBits(8, Volume);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdMuxMuteAudio(bool Mute)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvMux, msgMuxSetAudioMute);
+    cmdBuf.SetBits(1, Mute);
+    cmdBuf.SetBits(7, 0); // reserved
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdHdmiSetVideoMode(eHdmiVideoMode VideoMode)
+{
+    //printf("HdmiSetVideoMode %d\n", VideoMode);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupHdmi, msgHdmiSetVideoMode);
+    cmdBuf.SetBits(8, VideoMode);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdHdmiConfigure(const tHdmiConfig * pConfig)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupHdmi, msgHdmiConfigure);
+    if (pConfig->TransmitAudio)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    if (pConfig->ForceDviMode)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    if (pConfig->CecEnabled)
+    {
+        cmdBuf.SetBits(1, 1);
+    }
+    else
+    {
+        cmdBuf.SetBits(1, 0);
+    }
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdHdmiSendCecCommand(eCecCommand Command)
+{
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupHdmi, msgHdmiSendCecCommand);
+    cmdBuf.SetBits(8, Command);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdRemoteSetProtocol(eRemoteProtocol Protocol)
+{
+    //printf("%s %d\n", __func__, Protocol);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupRemoteControl, msgRemoteSetProtocol);
+    cmdBuf.SetBits(8, Protocol);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+void cHdffCmdIf::CmdRemoteSetAddressFilter(bool Enable, uint32_t Address)
+{
+    //printf("%s %d %d\n", __func__, Enable, Address);
+    cBitBuffer cmdBuf(MAX_CMD_LEN);
+    osd_raw_cmd_t osd_cmd;
+
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdBuf.GetData();
+    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupRemoteControl, msgRemoteSetAddressFilter);
+    cmdBuf.SetBits(1, Enable);
+    cmdBuf.SetBits(7, 0); // reserved
+    cmdBuf.SetBits(32, Address);
+    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
+    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+}
+
+} // end of namespace
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
new file mode 100644
index 000000000..cd641eb55
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.h
@@ -0,0 +1,102 @@
+/*
+ * hdffcmd.h: TODO(short description)
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: hdffcmd.h 1.17 2011/04/17 11:20:22 kls Exp $
+ */
+
+#ifndef _HDFF_CMD_H_
+#define _HDFF_CMD_H_
+
+#include "bitbuffer.h"
+#include "hdffmsgdef.h"
+
+namespace HDFF
+{
+
+class cHdffCmdIf
+{
+private:
+    int mOsdDev;
+
+    void CmdBuildHeader(cBitBuffer & MsgBuf, eMessageType MsgType, eMessageGroup MsgGroup, eMessageId MsgId);
+    uint32_t CmdSetLength(cBitBuffer & MsgBuf);
+
+public:
+    cHdffCmdIf(int OsdDev);
+    ~cHdffCmdIf(void);
+
+    uint32_t CmdGetFirmwareVersion(char * pString, uint32_t MaxLength);
+    uint32_t CmdGetInterfaceVersion(char * pString, uint32_t MaxLength);
+    uint32_t CmdGetCopyrights(uint8_t Index, char * pString, uint32_t MaxLength);
+
+    void CmdAvSetPlayMode(uint8_t PlayMode, bool Realtime);
+    void CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, eVideoStreamType StreamType, bool PlaybackMode = false);
+    void CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, eAudioStreamType StreamType, eAVContainerType ContainerType = avContainerPes);
+    void CmdAvSetPcrPid(uint8_t DecoderIndex, uint16_t PcrPid);
+    void CmdAvSetTeletextPid(uint8_t DecoderIndex, uint16_t TeletextPid);
+    void CmdAvSetVideoWindow(uint8_t DecoderIndex, bool Enable, uint16_t X, uint16_t Y, uint16_t Width, uint16_t Height);
+    void CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, eVideoStreamType StreamType);
+    void CmdAvSetDecoderInput(uint8_t DecoderIndex, uint8_t DemultiplexerIndex);
+    void CmdAvSetDemultiplexerInput(uint8_t DemultiplexerIndex, uint8_t TsInputIndex);
+    void CmdAvSetVideoFormat(uint8_t DecoderIndex, const tVideoFormat * pVideoFormat);
+    void CmdAvSetVideoOutputMode(uint8_t DecoderIndex, eVideoOutputMode OutputMode);
+    void CmdAvSetStc(uint8_t DecoderIndex, uint64_t Stc);
+    void CmdAvFlushBuffer(uint8_t DecoderIndex, bool FlushAudio, bool FlushVideo);
+    void CmdAvEnableSync(uint8_t DecoderIndex, bool EnableSync);
+    void CmdAvSetVideoSpeed(uint8_t DecoderIndex, int32_t Speed);
+    void CmdAvSetAudioSpeed(uint8_t DecoderIndex, int32_t Speed);
+    void CmdAvEnableVideoAfterStop(uint8_t DecoderIndex, bool EnableVideoAfterStop);
+    void CmdAvSetAudioDelay(int16_t Delay);
+    void CmdAvSetAudioDownmix(eDownmixMode DownmixMode);
+    void CmdAvSetAudioChannel(uint8_t AudioChannel);
+
+    void CmdOsdConfigure(const tOsdConfig * pConfig);
+    void CmdOsdReset(void);
+
+    uint32_t CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, eColorType ColorType);
+    void CmdOsdDeleteDisplay(uint32_t hDisplay);
+    void CmdOsdEnableDisplay(uint32_t hDisplay, bool Enable);
+    void CmdOsdSetDisplayOutputRectangle(uint32_t hDisplay, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height);
+    void CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height);
+    void CmdOsdRenderDisplay(uint32_t hDisplay);
+
+    uint32_t CmdOsdCreatePalette(eColorType ColorType, eColorFormat ColorFormat,
+                                 uint32_t NumColors, const uint32_t * pColors);
+    void CmdOsdDeletePalette(uint32_t hPalette);
+    void CmdOsdSetDisplayPalette(uint32_t hDisplay, uint32_t hPalette);
+    void CmdOsdSetPaletteColors(uint32_t hPalette, eColorFormat ColorFormat,
+                                uint8_t StartColor, uint32_t NumColors, const uint32_t * pColors);
+
+    uint32_t CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t DataSize);
+    void CmdOsdDeleteFontFace(uint32_t hFontFace);
+    uint32_t CmdOsdCreateFont(uint32_t hFontFace, uint32_t Size);
+    void CmdOsdDeleteFont(uint32_t hFont);
+
+    void CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color);
+    void CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
+                           uint32_t Color, uint32_t Flags);
+    void CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
+    void CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color);
+    void CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
+                          int BmpWidth, int BmpHeight, int BmpSize,
+                          eColorType ColorType, uint32_t hPalette);
+    void CmdOsdSaveRegion(uint32_t hDisplay, int X, int Y, int Width, int Height);
+    void CmdOsdRestoreRegion(uint32_t hDisplay);
+
+    void CmdMuxSetVideoOut(eVideoOut VideoOut);
+    void CmdMuxSetVolume(uint8_t Volume);
+    void CmdMuxMuteAudio(bool Mute);
+
+    void CmdHdmiSetVideoMode(eHdmiVideoMode VideoMode);
+    void CmdHdmiConfigure(const tHdmiConfig * pConfig);
+    void CmdHdmiSendCecCommand(eCecCommand Command);
+
+    void CmdRemoteSetProtocol(eRemoteProtocol Protocol);
+    void CmdRemoteSetAddressFilter(bool Enable, uint32_t Address);
+};
+
+} // end of namespace
+
+#endif
diff --git a/PLUGINS/src/dvbhddevice/hdffmsgdef.h b/PLUGINS/src/dvbhddevice/hdffmsgdef.h
new file mode 100644
index 000000000..a6c3f4b3e
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/hdffmsgdef.h
@@ -0,0 +1,304 @@
+/*
+ * hdffmsgdef.h: TODO(short description)
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: hdffmsgdef.h 1.12 2011/04/17 11:20:22 kls Exp $
+ */
+
+#ifndef _HDFF_MSGDEF_H_
+#define _HDFF_MSGDEF_H_
+
+#define MAX_CMD_LEN 1536
+
+namespace HDFF
+{
+
+typedef enum _eMessageType
+{
+    msgTypeCommand,
+    msgTypeAnswer,
+    msgTypeResult,
+    msgTypeEvent
+} eMessageType;
+
+typedef enum _eMessageGroup
+{
+    msgGroupGeneric,
+    msgGroupAvDec,
+    msgGroupAvMux,
+    msgGroupFrontend,
+    msgGroupOsd,
+    msgGroupHdmi,
+    msgGroupRemoteControl
+} eMessageGroup;
+
+typedef enum _eMessageId
+{
+    msgGenGetFirmwareVersion = 0,
+    msgGenGetInterfaceVersion,
+    msgGenGetCopyrights,
+
+    msgAvSetAudioPid = 0,
+    msgAvSetVideoPid,
+    msgAvSetPcrPid,
+    msgAvSetTeletextPid,
+    msgAvShowStillImage,
+    msgAvSetVideoWindow,
+    msgAvSetDecoderInput,
+    msgAvSetDemultiplexerInput,
+    msgAvSetVideoFormat,
+    msgAvSetVideoOutputMode,
+    msgAvSetStc,
+    msgAvFlushBuffer,
+    msgAvEnableSync,
+    msgAvSetVideoSpeed,
+    msgAvSetAudioSpeed,
+    msgAvEnableVideoAfterStop,
+    msgAvGetVideoFormatInfo,
+    msgAvSetAudioDelay,
+    msgAvSetAudioDownmix,
+    msgAvSetAudioChannel,
+    msgAvSetPlayMode,
+
+    msgMuxSetVideoOut = 0,
+    msgMuxSetSlowBlank,
+    msgMuxSetFastBlank,
+    msgMuxSetVolume,
+    msgMuxSetAudioMute,
+
+    msgOsdConfigure = 0,
+    msgOsdReset,
+    msgOsdCreateDisplay = 10,
+    msgOsdDeleteDisplay,
+    msgOsdEnableDisplay,
+    msgOsdSetDisplayOutputRectangle,
+    msgOsdSetDisplayClippingArea,
+    msgOsdRenderDisplay,
+    msgOsdSaveRegion,
+    msgOsdRestoreRegion,
+    msgOsdCreatePalette = 30,
+    msgOsdDeletePalette,
+    msgOsdSetDisplayPalette,
+    msgOsdSetPaletteColors,
+    msgOsdCreateFontFace = 50,
+    msgOsdDeleteFontFace,
+    msgOsdCreateFont,
+    msgOsdDeleteFont,
+    msgOsdDrawPixel = 70,
+    msgOsdDrawRectangle,
+    msgOsdDrawCircle,
+    msgOsdDrawEllipse,
+    msgOsdDrawSlope,
+    msgOsdDrawText,
+    msgOsdDrawTextW,
+    msgOsdDrawBitmap,
+
+    msgHdmiEnableOutput = 0,
+    msgHdmiSetVideoMode,
+    msgHdmiConfigure,
+    msgHdmiIsDisplayConnected,
+    msgHdmiGetDisplayInfo,
+    msgHdmiGetVideoMode,
+    msgHdmiSendCecCommand,
+
+    msgRemoteSetProtocol = 0,
+    msgRemoteSetAddressFilter,
+    msgRemoteKeyEvent
+} eMessageId;
+
+
+// AvDec definitions
+
+typedef enum _eAVContainerType
+{
+    avContainerPes,
+    avContainerPesDvd,
+    avContainerMaxValue
+} eAVContainerType;
+
+typedef enum _eAudioStreamType
+{
+    audioStreamMpeg1,
+    audioStreamMpeg2,
+    audioStreamAc3,
+    audioStreamAac,
+    audioStreamHeAac,
+    audioStreamPcm,
+    audioStreamEAc3,
+    audioStreamDts,
+    audioStreamMaxValue
+} eAudioStreamType;
+
+typedef enum _eVideoStreamType
+{
+    videoStreamMpeg1,
+    videoStreamMpeg2,
+    videoStreamH264,
+    videoStreamMpeg4Asp,
+    videoStreamVc1,
+    videoStreamMaxValue
+} eVideoStreamType;
+
+
+typedef enum _eTvFormat
+{
+    tvFormat4by3,
+    tvFormat16by9,
+    tvFormatMaxValue
+} eTvFormat;
+
+typedef enum _eVideoConversion
+{
+    videoConversionAutomatic,
+    videoConversionLetterbox16by9,
+    videoConversionLetterbox14by9,
+    videoConversionPillarbox,
+    videoConversionCentreCutOut,
+    videoConversionAlways16by9,
+    videoConversionMaxValue
+} eVideoConversion;
+
+typedef struct _tVideoFormat
+{
+    bool AutomaticEnabled;
+    bool AfdEnabled;
+    eTvFormat TvFormat;
+    eVideoConversion VideoConversion;
+} tVideoFormat;
+
+typedef enum _eVideoOutputMode
+{
+    videoOutputClone,
+    videoOutputDualView,
+    videoOutputMaxValue
+} eVideoOutputMode;
+
+typedef enum _eDownmixMode
+{
+    downmixOff,
+    downmixAnalog,
+    downmixAlways,
+    downmixAutomatic,
+    downmixHdmi
+} eDownmixMode;
+
+// AvMux definitions
+
+typedef enum _eVideoOut
+{
+    videoOutDisabled,
+    videoOutRgb,
+    videoOutCvbsYuv,
+    videoOutYc,
+    videoOutMaxValue
+} eVideoOut;
+
+typedef enum _eSlowBlank
+{
+    slowBlankOff,
+    slowBlank16by9,
+    slowBlank4by3,
+    slowBlankMaxValue
+} eSlowBlank;
+
+typedef enum _eFastBlank
+{
+    fastBlankCvbs,
+    fastBlankRgb,
+    fastBlankMaxValue
+} eFastBlank;
+
+
+// OSD definitions
+
+#define InvalidHandle           0xFFFFFFFF
+#define ScreenDisplayHandle     0xFFFFFFFE
+
+#define PositionScreenCentered  0xFFFF
+
+#define SizeFullScreen    0xFFFF
+#define SizeSameAsSource  0xFFFE
+
+#define FontFaceTiresias  0x00000000
+
+typedef enum _eColorType
+{
+    colorTypeClut1,
+    colorTypeClut2,
+    colorTypeClut4,
+    colorTypeClut8,
+    colorTypeARGB8888,
+    colorTypeARGB8565,
+    colorTypeARGB4444,
+    colorTypeARGB1555,
+} eColorType;
+
+typedef enum _eColorFormat
+{
+    colorFormatARGB,
+    colorFormatACbYCr,
+} eColorFormat;
+
+typedef enum _eDrawingFlags
+{
+    drawFull,
+    drawHalfTop,
+    drawHalfLeft,
+    drawHalfBottom,
+    drawHalfRight,
+    drawQuarterTopLeft,
+    drawQuarterTopRight,
+    drawQuarterBottomLeft,
+    drawQuarterBottomRight,
+    drawQuarterTopLeftInverted,
+    drawQuarterTopRightInverted,
+    drawQuarterBottomLeftInverted,
+    drawQuarterBottomRightInverted
+} eDrawingFlags;
+
+typedef struct _tOsdConfig
+{
+    bool FontAntialiasing;
+    bool FontKerning;
+} tOsdConfig;
+
+// HDMI definitions
+
+typedef enum _eHdmiVideoMode
+{
+    videoMode576p50 = 18,
+    videoMode720p50 = 19,
+    videoMode1080i50 = 20,
+    videoMode576i50 = 22,
+    videoModeMaxValue
+} eHdmiVideoMode;
+
+typedef enum _eCecCommand
+{
+    cecCommandTvOn,
+    cecCommandTvOff,
+    cecCommandActiveSource,
+    cecCommandInactiveSource
+} eCecCommand;
+
+typedef struct _tHdmiConfig
+{
+    bool TransmitAudio;
+    bool ForceDviMode;
+    bool CecEnabled;
+} tHdmiConfig;
+
+// Remote control definitions
+
+typedef enum _eRemoteProtocol
+{
+    remoteProtocolNone,
+    remoteProtocolRc5,
+    remoteProtocolRc6,
+    remoteProtocolMaxValue
+} eRemoteProtocol;
+
+} // end of namespace
+
+#endif
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
new file mode 100644
index 000000000..254f2af77
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -0,0 +1,755 @@
+/*
+ * hdffosd.c: Implementation of the DVB HD Full Featured On Screen Display
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: hdffosd.c 1.9 2011/04/17 11:20:22 kls Exp $
+ */
+
+#include "hdffosd.h"
+#include <linux/dvb/osd.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include "hdffcmd.h"
+#include "setup.h"
+
+#define MAX_NUM_FONTFACES   8
+#define MAX_NUM_FONTS       8
+#define MAX_BITMAP_SIZE     (1024*1024)
+
+typedef struct _tFontFace
+{
+    cString Name;
+    uint32_t Handle;
+} tFontFace;
+
+typedef struct _tFont
+{
+    uint32_t hFontFace;
+    int Size;
+    uint32_t Handle;
+} tFont;
+
+class cHdffOsd : public cOsd
+{
+private:
+    HDFF::cHdffCmdIf * mHdffCmdIf;
+    int mLeft;
+    int mTop;
+    int mDispWidth;
+    int mDispHeight;
+    bool shown;
+    bool mChanged;
+    bool mBitmapModified;
+    uint32_t mDisplay;
+    tFontFace mFontFaces[MAX_NUM_FONTFACES];
+    tFont mFonts[MAX_NUM_FONTS];
+    uint32_t mBitmapPalette;
+    uint32_t mBitmapColors[256];
+    uint32_t mBitmapNumColors;
+
+protected:
+    virtual void SetActive(bool On);
+public:
+    cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level);
+    virtual ~cHdffOsd();
+    cBitmap *GetBitmap(int Area);
+    virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+    virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
+    virtual void SaveRegion(int x1, int y1, int x2, int y2);
+    virtual void RestoreRegion(void);
+    virtual void DrawPixel(int x, int y, tColor Color);
+    virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false, bool Overlay = false);
+    virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
+    virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
+    virtual void DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants = 0);
+    virtual void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
+    virtual void Flush(void);
+};
+
+cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
+:   cOsd(Left, Top, Level)
+{
+    double pixelAspect;
+    HDFF::tOsdConfig config;
+
+    //printf("cHdffOsd %d, %d, %d\n", Left, Top, Level);
+    mHdffCmdIf = pHdffCmdIf;
+    mLeft = Left;
+    mTop = Top;
+    shown = false;
+    mChanged = false;
+    mBitmapModified = false;
+    mBitmapPalette = InvalidHandle;
+    config.FontKerning = false;
+    config.FontAntialiasing = Setup.AntiAlias ? true : false;
+    mHdffCmdIf->CmdOsdConfigure(&config);
+
+    gHdffSetup.GetOsdSize(mDispWidth, mDispHeight, pixelAspect);
+    mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF::colorTypeARGB8888);
+    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, SizeFullScreen, SizeFullScreen);
+    for (int i = 0; i < MAX_NUM_FONTFACES; i++)
+    {
+        mFontFaces[i].Name = "";
+        mFontFaces[i].Handle = InvalidHandle;
+    }
+    for (int i = 0; i < MAX_NUM_FONTS; i++)
+    {
+        mFonts[i].hFontFace = InvalidHandle;
+        mFonts[i].Size = 0;
+        mFonts[i].Handle = InvalidHandle;
+    }
+}
+
+cHdffOsd::~cHdffOsd()
+{
+    //printf("~cHdffOsd %d %d\n", mLeft, mTop);
+    SetActive(false);
+
+    for (int i = 0; i < MAX_NUM_FONTS; i++)
+    {
+        if (mFonts[i].Handle == InvalidHandle)
+            break;
+        mHdffCmdIf->CmdOsdDeleteFont(mFonts[i].Handle);
+    }
+    for (int i = 0; i < MAX_NUM_FONTFACES; i++)
+    {
+        if (mFontFaces[i].Handle == InvalidHandle)
+            break;
+        mHdffCmdIf->CmdOsdDeleteFontFace(mFontFaces[i].Handle);
+    }
+
+    if (mBitmapPalette != InvalidHandle)
+        mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
+    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
+}
+
+cBitmap * cHdffOsd::GetBitmap(int Area)
+{
+    //printf("GetBitmap %d\n", Area);
+    mChanged = true;
+    mBitmapModified = true;
+    return cOsd::GetBitmap(Area);
+}
+
+eOsdError cHdffOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
+{
+    eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
+    if (Result == oeOk)
+    {
+        for (int i = 0; i < NumAreas; i++)
+        {
+            if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8)
+                return oeBppNotSupported;
+        }
+    }
+    return Result;
+}
+
+eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
+{
+    for (int i = 0; i < NumAreas; i++)
+    {
+        //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
+    }
+    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    return cOsd::SetAreas(Areas, NumAreas);
+}
+
+void cHdffOsd::SetActive(bool On)
+{
+    if (On != Active())
+    {
+        cOsd::SetActive(On);
+        if (On)
+        {
+        }
+        else if (shown)
+        {
+            shown = false;
+        }
+    }
+}
+
+void cHdffOsd::SaveRegion(int x1, int y1, int x2, int y2)
+{
+    mHdffCmdIf->CmdOsdSaveRegion(mDisplay, mLeft + x1, mTop + y1, x2 - x1 + 1, y2 - y1 + 1);
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::RestoreRegion(void)
+{
+    mHdffCmdIf->CmdOsdRestoreRegion(mDisplay);
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::DrawPixel(int x, int y, tColor Color)
+{
+    //printf("DrawPixel\n");
+    mBitmapModified = false;
+}
+
+void cHdffOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
+{
+    //printf("DrawBitmap %d %d %d\n", x, y, Overlay);
+    int i;
+    int numColors;
+    const tColor * colors = Bitmap.Colors(numColors);
+
+    for (i = 0; i < numColors; i++)
+    {
+        mBitmapColors[i] = colors[i];
+        if (ColorFg || ColorBg)
+        {
+            if (i == 0)
+                mBitmapColors[i] = ColorBg;
+            else if (i == 1)
+                mBitmapColors[i] = ColorFg;
+        }
+    }
+    if (mBitmapPalette == InvalidHandle)
+    {
+        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF::colorTypeClut8,
+                HDFF::colorFormatARGB, numColors, mBitmapColors);
+    }
+    else
+    {
+        mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
+                HDFF::colorFormatARGB, 0, numColors, mBitmapColors);
+    }
+    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y,
+        (uint8_t *) Bitmap.Data(0, 0), Bitmap.Width(), Bitmap.Height(),
+        Bitmap.Width() * Bitmap.Height(), HDFF::colorTypeClut8, mBitmapPalette);
+#if 0
+    uint32_t * tmpBitmap = new uint32_t[Bitmap.Width() * Bitmap.Height()];
+    for (int ix = 0; ix < Bitmap.Width(); ix++)
+    {
+        for (int iy = 0; iy < Bitmap.Height(); iy++)
+        {
+            const tIndex * pixel = Bitmap.Data(ix, iy);
+            tColor color = Bitmap.Color(*pixel);
+            if (!Overlay || *pixel != 0)
+            {
+                if (ColorFg || ColorBg)
+                {
+                    if (*pixel == 0)
+                        color = ColorBg;
+                    else if (*pixel == 1)
+                        color = ColorFg;
+                }
+                tmpBitmap[Bitmap.Width() * iy + ix] = color;
+            }
+        }
+    }
+    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y,
+        (uint8_t *) tmpBitmap, Bitmap.Width(), Bitmap.Height(),
+        Bitmap.Width() * Bitmap.Height() * 4, HDFF::colorTypeARGB8888, InvalidHandle);
+    delete[] tmpBitmap;
+#endif
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
+{
+    int w = Font->Width(s);
+    int h = Font->Height();
+    int limit = 0;
+    int cw = Width ? Width : w;
+    int ch = Height ? Height : h;
+    int i;
+    int size = Font->Size();
+    tFontFace * pFontFace;
+    tFont * pFont;
+
+    if (ColorBg != clrTransparent)
+        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, mLeft + x, mTop + y, cw, ch, ColorBg);
+
+    if (s == NULL)
+        return;
+
+    pFontFace = NULL;
+    for (i = 0; i < MAX_NUM_FONTFACES; i++)
+    {
+        if (mFontFaces[i].Handle == InvalidHandle)
+            break;
+
+        if (strcmp(mFontFaces[i].Name, Font->FontName()) == 0)
+        {
+            pFontFace = &mFontFaces[i];
+            break;
+        }
+    }
+    if (pFontFace == NULL)
+    {
+        if (i < MAX_NUM_FONTFACES)
+        {
+            cString fontFileName = Font->FontName();
+            FILE * fp = fopen(fontFileName, "rb");
+            if (fp)
+            {
+                fseek(fp, 0, SEEK_END);
+                long fileSize = ftell(fp);
+                fseek(fp, 0, SEEK_SET);
+                if (fileSize > 0)
+                {
+                    uint8_t * buffer = new uint8_t[fileSize];
+                    if (buffer)
+                    {
+                        if (fread(buffer, fileSize, 1, fp) == 1)
+                        {
+                            mFontFaces[i].Handle = mHdffCmdIf->CmdOsdCreateFontFace(buffer, fileSize);
+                            if (mFontFaces[i].Handle != InvalidHandle)
+                            {
+                                mFontFaces[i].Name = Font->FontName();
+                                pFontFace = &mFontFaces[i];
+                            }
+                        }
+                        delete[] buffer;
+                    }
+                }
+                fclose(fp);
+            }
+        }
+    }
+    if (pFontFace == NULL)
+        return;
+
+    pFont = NULL;
+    for (i = 0; i < MAX_NUM_FONTS; i++)
+    {
+        if (mFonts[i].Handle == InvalidHandle)
+            break;
+
+        if (mFonts[i].hFontFace == pFontFace->Handle
+          && mFonts[i].Size == size)
+        {
+            pFont = &mFonts[i];
+            break;
+        }
+    }
+    if (pFont == NULL)
+    {
+        if (i < MAX_NUM_FONTS)
+        {
+            mFonts[i].Handle = mHdffCmdIf->CmdOsdCreateFont(pFontFace->Handle, size);
+            if (mFonts[i].Handle != InvalidHandle)
+            {
+                mFonts[i].hFontFace = pFontFace->Handle;
+                mFonts[i].Size = size;
+                pFont = &mFonts[i];
+            }
+        }
+    }
+    if (pFont == NULL)
+        return;
+
+    mHdffCmdIf->CmdOsdSetDisplayClippingArea(mDisplay, true, mLeft + x, mTop + y, cw, ch);
+
+    if (Width || Height)
+    {
+        limit = x + cw;// - mLeft;
+        if (Width)
+        {
+            if ((Alignment & taLeft) != 0)
+                ;
+            else if ((Alignment & taRight) != 0)
+            {
+                if (w < Width)
+                    x += Width - w;
+            }
+            else
+            { // taCentered
+                if (w < Width)
+                    x += (Width - w) / 2;
+            }
+        }
+        if (Height)
+        {
+            if ((Alignment & taTop) != 0)
+                ;
+            else if ((Alignment & taBottom) != 0)
+            {
+                if (h < Height)
+                    y += Height - h;
+            }
+            else
+            { // taCentered
+                if (h < Height)
+                    y += (Height - h) / 2;
+            }
+        }
+    }
+    //x -= mLeft;
+    //y -= mTop;
+    {
+        uint16_t tmp[1000];
+        uint16_t len = 0;
+        while (*s && (len < (sizeof(tmp) - 1)))
+        {
+            int sl = Utf8CharLen(s);
+            uint sym = Utf8CharGet(s, sl);
+            s += sl;
+            tmp[len] = sym;
+            len++;
+        }
+        tmp[len] = 0;
+        mHdffCmdIf->CmdOsdDrawTextW(mDisplay, pFont->Handle, x + mLeft, y + mTop + h, tmp, ColorFg);
+    }
+    //mHdffCmdIf->CmdOsdDrawText(mDisplay, pFont->Handle, x + mLeft, y + mTop + h - 7, s, ColorFg);
+    mHdffCmdIf->CmdOsdSetDisplayClippingArea(mDisplay, false, 0, 0, 0, 0);
+    //Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
+{
+    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, mLeft + x1, mTop + y1, x2 - x1 + 1, y2 - y1 + 1, Color);
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
+{
+    uint32_t flags;
+    int cx;
+    int cy;
+    int rx;
+    int ry;
+
+    switch (abs(Quadrants))
+    {
+        case 1:
+            if (Quadrants > 0)
+                flags = HDFF::drawQuarterTopRight;
+            else
+                flags = HDFF::drawQuarterTopRightInverted;
+            cx = x1;
+            cy = y2;
+            rx = x2 - x1;
+            ry = y2 - y1;
+            break;
+        case 2:
+            if (Quadrants > 0)
+                flags = HDFF::drawQuarterTopLeft;
+            else
+                flags = HDFF::drawQuarterTopLeftInverted;
+            cx = x2;
+            cy = y2;
+            rx = x2 - x1;
+            ry = y2 - y1;
+            break;
+        case 3:
+            if (Quadrants > 0)
+                flags = HDFF::drawQuarterBottomLeft;
+            else
+                flags = HDFF::drawQuarterBottomLeftInverted;
+            cx = x2;
+            cy = y1;
+            rx = x2 - x1;
+            ry = y2 - y1;
+            break;
+        case 4:
+            if (Quadrants > 0)
+                flags = HDFF::drawQuarterBottomRight;
+            else
+                flags = HDFF::drawQuarterBottomRightInverted;
+            cx = x1;
+            cy = y1;
+            rx = x2 - x1;
+            ry = y2 - y1;
+            break;
+        case 5:
+            flags = HDFF::drawHalfRight;
+            cx = x1;
+            cy = (y1 + y2) / 2;
+            rx = x2 - x1;
+            ry = (y2 - y1) / 2;
+            break;
+        case 6:
+            flags = HDFF::drawHalfTop;
+            cx = (x1 + x2) / 2;
+            cy = y2;
+            rx = (x2 - x1) / 2;
+            ry = y2 - y1;
+            break;
+        case 7:
+            flags = HDFF::drawHalfLeft;
+            cx = x2;
+            cy = (y1 + y2) / 2;
+            rx = x2 - x1;
+            ry = (y2 - y1) / 2;
+            break;
+        case 8:
+            flags = HDFF::drawHalfBottom;
+            cx = (x1 + x2) / 2;
+            cy = y1;
+            rx = (x2 - x1) / 2;
+            ry = y2 - y1;
+            break;
+        default:
+            flags = HDFF::drawFull;
+            cx = (x1 + x2) / 2;
+            cy = (y1 + y2) / 2;
+            rx = (x2 - x1) / 2;
+            ry = (y2 - y1) / 2;
+            break;
+    }
+    mHdffCmdIf->CmdOsdDrawEllipse(mDisplay, mLeft + cx, mTop + cy, rx, ry, Color, flags);
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
+{
+    //printf("DrawSlope\n");
+    mChanged = true;
+    mBitmapModified = false;
+}
+
+void cHdffOsd::Flush(void)
+{
+    if (!Active())
+        return;
+
+    if (!mChanged)
+        return;
+
+    //printf("Flush\n");
+    if (mBitmapModified)
+    {
+        cBitmap *Bitmap;
+        for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++)
+        {
+            DrawBitmap(0, 0, *Bitmap);
+        }
+    }
+
+    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+
+    mChanged = false;
+    mBitmapModified = false;
+}
+
+
+class cHdffOsdRaw : public cOsd
+{
+private:
+    HDFF::cHdffCmdIf * mHdffCmdIf;
+    int mDispWidth;
+    int mDispHeight;
+    bool shown;
+    uint32_t mDisplay;
+    uint32_t mBitmapPalette;
+    uint32_t mBitmapColors[256];
+    uint32_t mBitmapNumColors;
+
+protected:
+    virtual void SetActive(bool On);
+public:
+    cHdffOsdRaw(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level);
+    virtual ~cHdffOsdRaw();
+    virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+    virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
+    virtual void Flush(void);
+};
+
+cHdffOsdRaw::cHdffOsdRaw(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
+:   cOsd(Left, Top, Level)
+{
+    double pixelAspect;
+
+    //printf("cHdffOsdRaw %d, %d, %d\n", Left, Top, Level);
+    mHdffCmdIf = pHdffCmdIf;
+    shown = false;
+    mBitmapPalette = InvalidHandle;
+
+    gHdffSetup.GetOsdSize(mDispWidth, mDispHeight, pixelAspect);
+    mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF::colorTypeARGB8888);
+    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, SizeFullScreen, SizeFullScreen);
+}
+
+cHdffOsdRaw::~cHdffOsdRaw()
+{
+    //printf("~cHdffOsdRaw %d %d\n", Left(), Top());
+    SetActive(false);
+
+    if (mBitmapPalette != InvalidHandle)
+        mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
+    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
+}
+
+void cHdffOsdRaw::SetActive(bool On)
+{
+    if (On != Active())
+    {
+        cOsd::SetActive(On);
+        if (On)
+        {
+        }
+        else if (shown)
+        {
+            shown = false;
+        }
+    }
+}
+
+eOsdError cHdffOsdRaw::CanHandleAreas(const tArea *Areas, int NumAreas)
+{
+    eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
+    if (Result == oeOk)
+    {
+        for (int i = 0; i < NumAreas; i++)
+        {
+            if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8
+                && (Areas[i].bpp != 32 || !gHdffSetup.TrueColorOsd))
+                return oeBppNotSupported;
+        }
+    }
+    return Result;
+}
+
+eOsdError cHdffOsdRaw::SetAreas(const tArea *Areas, int NumAreas)
+{
+    for (int i = 0; i < NumAreas; i++)
+    {
+        //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
+    }
+    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    return cOsd::SetAreas(Areas, NumAreas);
+}
+
+void cHdffOsdRaw::Flush(void)
+{
+    if (!Active())
+        return;
+    //struct timeval start;
+    //struct timeval end;
+    //struct timezone timeZone;
+    //gettimeofday(&start, &timeZone);
+
+    bool render = false;
+    if (IsTrueColor())
+    {
+        LOCK_PIXMAPS;
+        while (cPixmapMemory *pm = RenderPixmaps())
+        {
+            int w = pm->ViewPort().Width();
+            int h = pm->ViewPort().Height();
+            int d = w * sizeof(tColor);
+            int Chunk = MAX_BITMAP_SIZE / w / sizeof(tColor);
+            if (Chunk > h)
+                Chunk = h;
+            for (int y = 0; y < h; y += Chunk)
+            {
+                 int hc = Chunk;
+                 if (y + hc > h)
+                     hc = h - y;
+                 mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
+                     Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
+                     pm->Data() + y * d, w, hc, hc * d,
+                     HDFF::colorTypeARGB8888, InvalidHandle);
+            }
+            delete pm;
+            render = true;
+        }
+    }
+    else
+    {
+        uint8_t * buffer = new uint8_t[MAX_BITMAP_SIZE];
+        if (!buffer)
+            return;
+        cBitmap * bitmap;
+        for (int i = 0; (bitmap = GetBitmap(i)) != NULL; i++)
+        {
+            int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+            if (!shown || bitmap->Dirty(x1, y1, x2, y2))
+            {
+                if (!shown)
+                {
+                    x2 = bitmap->Width() - 1;
+                    y2 = bitmap->Height() - 1;
+                }
+                // commit colors:
+                int numColors;
+                const tColor * colors = bitmap->Colors(numColors);
+                if (colors)
+                {
+                    for (int c = 0; c < numColors; c++)
+                        mBitmapColors[c] = colors[c];
+                    if (mBitmapPalette == InvalidHandle)
+                    {
+                        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF::colorTypeClut8,
+                            HDFF::colorFormatARGB, numColors, mBitmapColors);
+                    }
+                    else
+                    {
+                        mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
+                            HDFF::colorFormatARGB, 0, numColors, mBitmapColors);
+                    }
+                }
+                // commit modified data:
+                int width = x2 - x1 + 1;
+                int height = y2 - y1 + 1;
+                int chunk = MAX_BITMAP_SIZE / width;
+                if (chunk > height)
+                    chunk = height;
+                for (int y = 0; y < height; y += chunk)
+                {
+                    int hc = chunk;
+                    if (y + hc > height)
+                        hc = height - y;
+                    for (int r = 0; r < hc; r++)
+                        memcpy(buffer + r * width, bitmap->Data(x1, y1 + y + r), width);
+                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
+                        Left() + bitmap->X0() + x1, Top() + bitmap->Y0() + y1 + y,
+                        buffer, width, hc, hc * width,
+                        HDFF::colorTypeClut8, mBitmapPalette);
+                }
+                render = true;
+            }
+            bitmap->Clean();
+        }
+        delete[] buffer;
+    }
+    if (render)
+    {
+        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+        //gettimeofday(&end, &timeZone);
+        //int timeNeeded = end.tv_usec - start.tv_usec;
+        //timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
+        //printf("time = %d\n", timeNeeded);
+    }
+    shown = true;
+}
+
+
+
+
+cHdffOsdProvider::cHdffOsdProvider(HDFF::cHdffCmdIf * HdffCmdIf)
+{
+    mHdffCmdIf = HdffCmdIf;
+}
+
+cOsd *cHdffOsdProvider::CreateOsd(int Left, int Top, uint Level)
+{
+    //printf("CreateOsd %d %d %d\n", Left, Top, Level);
+    if (gHdffSetup.HighLevelOsd)
+        return new cHdffOsd(Left, Top, mHdffCmdIf, Level);
+    else
+        return new cHdffOsdRaw(Left, Top, mHdffCmdIf, Level);
+}
+
+bool cHdffOsdProvider::ProvidesTrueColor(void)
+{
+    return gHdffSetup.TrueColorOsd && !gHdffSetup.HighLevelOsd;
+}
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.h b/PLUGINS/src/dvbhddevice/hdffosd.h
new file mode 100644
index 000000000..533897e3c
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/hdffosd.h
@@ -0,0 +1,26 @@
+/*
+ * hdffosd.h: Implementation of the DVB HD Full Featured On Screen Display
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: hdffosd.h 1.2 2011/01/30 15:27:48 kls Exp $
+ */
+
+#ifndef _HDFF_OSD_H_
+#define _HDFF_OSD_H_
+
+#include <vdr/osd.h>
+
+#include "hdffcmd.h"
+
+class cHdffOsdProvider : public cOsdProvider
+{
+private:
+    HDFF::cHdffCmdIf * mHdffCmdIf;
+public:
+    cHdffOsdProvider(HDFF::cHdffCmdIf * pHdffCmdIf);
+    virtual cOsd *CreateOsd(int Left, int Top, uint Level);
+    virtual bool ProvidesTrueColor(void);
+};
+
+#endif
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
new file mode 100644
index 000000000..3cb69b1b9
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -0,0 +1,252 @@
+/*
+ * setup.c: Setup for the DVB HD Full Featured On Screen Display
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: setup.c 1.11 2011/04/17 11:45:17 kls Exp $
+ */
+
+#include "setup.h"
+#include "hdffcmd.h"
+
+const int kResolutions = 4;
+const int kTvFormats = 2;
+const int kVideoConversions = 6;
+const int kAnalogueVideos = 4;
+const int kAudioDownmixes = 5;
+const int kOsdSizes = 5;
+const int kRemoteProtocols = 3;
+
+const int kResolution1080i = 0;
+const int kResolution720p = 1;
+const int kResolution576p = 2;
+const int kResolution576i = 3;
+
+static const char * ResolutionItems[] =
+{
+    "1080i",
+    "720p",
+    "576p",
+    "576i",
+    NULL
+};
+
+static const char * TvFormatItems[] =
+{
+    "4/3",
+    "16/9",
+    NULL
+};
+
+static const char * VideoConversionItems[] =
+{
+    "Automatic",
+    "Letterbox 16/9",
+    "Letterbox 14/9",
+    "Pillarbox",
+    "CentreCutOut",
+    "Always 16/9",
+    NULL
+};
+
+static const char * AnalogueVideoItems[] =
+{
+    "Disabled",
+    "RGB",
+    "CVBS + YUV",
+    "YC (S-Video)",
+    NULL
+};
+
+static const char * AudioDownmixItems[] =
+{
+    "Disabled",
+    "Analogue only",
+    "Always",
+    "Automatic",
+    "HDMI only",
+    NULL
+};
+
+static const char * OsdSizeItems[] =
+{
+    "Follow resolution",
+    "1920x1080",
+    "1280x720",
+    "1024x576",
+    "720x576",
+    NULL
+};
+
+static const char * RemoteProtocolItems[] =
+{
+    "none",
+    "RC5",
+    "RC6",
+    NULL
+};
+
+cHdffSetup gHdffSetup;
+
+cHdffSetup::cHdffSetup(void)
+{
+    Resolution = kResolution1080i;
+    TvFormat = HDFF::tvFormat16by9;
+    VideoConversion = HDFF::videoConversionPillarbox;
+    AnalogueVideo = HDFF::videoOutCvbsYuv;
+    AudioDelay = 0;
+    AudioDownmix = HDFF::downmixAutomatic;
+    OsdSize = 0;
+    CecEnabled = 1;
+    RemoteProtocol = 1;
+    RemoteAddress = -1;
+    HighLevelOsd = 1;
+    TrueColorOsd = 1;
+}
+
+bool cHdffSetup::SetupParse(const char *Name, const char *Value)
+{
+    if      (strcmp(Name, "Resolution")      == 0) Resolution      = atoi(Value);
+    else if (strcmp(Name, "TvFormat")        == 0) TvFormat        = atoi(Value);
+    else if (strcmp(Name, "VideoConversion") == 0) VideoConversion = atoi(Value);
+    else if (strcmp(Name, "AnalogueVideo")   == 0) AnalogueVideo   = atoi(Value);
+    else if (strcmp(Name, "AudioDelay")      == 0) AudioDelay      = atoi(Value);
+    else if (strcmp(Name, "AudioDownmix")    == 0) AudioDownmix    = atoi(Value);
+    else if (strcmp(Name, "OsdSize")         == 0) OsdSize         = atoi(Value);
+    else if (strcmp(Name, "CecEnabled")      == 0) CecEnabled      = atoi(Value);
+    else if (strcmp(Name, "RemoteProtocol")  == 0) RemoteProtocol  = atoi(Value);
+    else if (strcmp(Name, "RemoteAddress")   == 0) RemoteAddress   = atoi(Value);
+    else if (strcmp(Name, "HighLevelOsd")    == 0) HighLevelOsd    = atoi(Value);
+    else if (strcmp(Name, "TrueColorOsd")    == 0) TrueColorOsd    = atoi(Value);
+    else return false;
+    return true;
+}
+
+void cHdffSetup::GetOsdSize(int &Width, int &Height, double &PixelAspect)
+{
+    if (OsdSize == 0) {
+        if (Resolution == kResolution1080i) {
+            Width = 1920;
+            Height = 1080;
+        }
+        else if (Resolution == kResolution720p) {
+            Width = 1280;
+            Height = 720;
+        }
+        else {
+            Width = 720;
+            Height = 576;
+        }
+        if (TvFormat == HDFF::tvFormat16by9)
+            PixelAspect = 16.0 / 9.0;
+        else
+            PixelAspect = 4.0 / 3.0;
+    }
+    else if (OsdSize == 1) {
+        Width = 1920;
+        Height = 1080;
+        PixelAspect = 16.0 / 9.0;
+    }
+    else if (OsdSize == 2) {
+        Width = 1280;
+        Height = 720;
+        PixelAspect = 16.0 / 9.0;
+    }
+    else if (OsdSize == 3) {
+        Width = 1024;
+        Height = 576;
+        PixelAspect = 16.0 / 9.0;
+    }
+    else {
+        Width = 720;
+        Height = 576;
+        PixelAspect = 4.0 / 3.0;
+    }
+  PixelAspect /= double(Width) / Height;
+}
+
+HDFF::eHdmiVideoMode cHdffSetup::GetVideoMode(void)
+{
+    switch (Resolution)
+    {
+        case kResolution1080i:
+        default:
+            return HDFF::videoMode1080i50;
+        case kResolution720p:
+            return HDFF::videoMode720p50;
+        case kResolution576p:
+            return HDFF::videoMode576p50;
+        case kResolution576i:
+            return HDFF::videoMode576i50;
+    }
+}
+
+cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
+{
+    mHdffCmdIf = pHdffCmdIf;
+    mNewHdffSetup = gHdffSetup;
+
+    Add(new cMenuEditStraItem("Resolution", &mNewHdffSetup.Resolution, kResolutions, ResolutionItems));
+    Add(new cMenuEditStraItem("TV format", &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems));
+    Add(new cMenuEditStraItem("Video Conversion", &mNewHdffSetup.VideoConversion, kVideoConversions, VideoConversionItems));
+    Add(new cMenuEditStraItem("Analogue Video", &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
+    Add(new cMenuEditIntItem("Audio Delay (ms)", &mNewHdffSetup.AudioDelay, 0, 500));
+    Add(new cMenuEditStraItem("Audio Downmix", &mNewHdffSetup.AudioDownmix, kAudioDownmixes, AudioDownmixItems));
+    Add(new cMenuEditStraItem("Osd Size", &mNewHdffSetup.OsdSize, kOsdSizes, OsdSizeItems));
+    Add(new cMenuEditBoolItem("HDMI CEC", &mNewHdffSetup.CecEnabled));
+    Add(new cMenuEditStraItem("Remote Control Protocol", &mNewHdffSetup.RemoteProtocol, kRemoteProtocols, RemoteProtocolItems));
+    Add(new cMenuEditIntItem("Remote Control Address", &mNewHdffSetup.RemoteAddress, -1, 31));
+    Add(new cMenuEditBoolItem("High Level OSD", &mNewHdffSetup.HighLevelOsd));
+    Add(new cMenuEditBoolItem("Allow True Color OSD", &mNewHdffSetup.TrueColorOsd));
+}
+
+cHdffSetupPage::~cHdffSetupPage(void)
+{
+}
+
+void cHdffSetupPage::Store(void)
+{
+    SetupStore("Resolution", mNewHdffSetup.Resolution);
+    SetupStore("TvFormat", mNewHdffSetup.TvFormat);
+    SetupStore("VideoConversion", mNewHdffSetup.VideoConversion);
+    SetupStore("AnalogueVideo", mNewHdffSetup.AnalogueVideo);
+    SetupStore("AudioDelay", mNewHdffSetup.AudioDelay);
+    SetupStore("AudioDownmix", mNewHdffSetup.AudioDownmix);
+    SetupStore("OsdSize", mNewHdffSetup.OsdSize);
+    SetupStore("CecEnabled", mNewHdffSetup.CecEnabled);
+    SetupStore("RemoteProtocol", mNewHdffSetup.RemoteProtocol);
+    SetupStore("RemoteAddress", mNewHdffSetup.RemoteAddress);
+    SetupStore("HighLevelOsd", mNewHdffSetup.HighLevelOsd);
+    SetupStore("TrueColorOsd", mNewHdffSetup.TrueColorOsd);
+
+    if (mHdffCmdIf)
+    {
+        if (mNewHdffSetup.Resolution != gHdffSetup.Resolution)
+        {
+            mHdffCmdIf->CmdHdmiSetVideoMode(mNewHdffSetup.GetVideoMode());
+        }
+        HDFF::tVideoFormat videoFormat;
+        HDFF::tHdmiConfig hdmiConfig;
+
+        videoFormat.AutomaticEnabled = true;
+        videoFormat.AfdEnabled = true;
+        videoFormat.TvFormat = (HDFF::eTvFormat) mNewHdffSetup.TvFormat;
+        videoFormat.VideoConversion = (HDFF::eVideoConversion) mNewHdffSetup.VideoConversion;
+        mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+
+        mHdffCmdIf->CmdAvSetAudioDelay(mNewHdffSetup.AudioDelay);
+        mHdffCmdIf->CmdAvSetAudioDownmix((HDFF::eDownmixMode) mNewHdffSetup.AudioDownmix);
+
+        mHdffCmdIf->CmdMuxSetVideoOut((HDFF::eVideoOut) mNewHdffSetup.AnalogueVideo);
+
+        hdmiConfig.TransmitAudio = true;
+        hdmiConfig.ForceDviMode = false;
+        hdmiConfig.CecEnabled = mNewHdffSetup.CecEnabled;
+        mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
+
+        mHdffCmdIf->CmdRemoteSetProtocol((HDFF::eRemoteProtocol) mNewHdffSetup.RemoteProtocol);
+        mHdffCmdIf->CmdRemoteSetAddressFilter(mNewHdffSetup.RemoteAddress >= 0, mNewHdffSetup.RemoteAddress);
+    }
+
+    gHdffSetup = mNewHdffSetup;
+}
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
new file mode 100644
index 000000000..07c9d1a07
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -0,0 +1,53 @@
+/*
+ * setup.h: Setup for the DVB HD Full Featured On Screen Display
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: setup.h 1.8 2011/04/17 11:20:22 kls Exp $
+ */
+
+#ifndef _HDFF_SETUP_H_
+#define _HDFF_SETUP_H_
+
+#include <vdr/plugin.h>
+#include "hdffcmd.h"
+
+struct cHdffSetup
+{
+    cHdffSetup(void);
+    bool SetupParse(const char * Name, const char * Value);
+    void GetOsdSize(int &Width, int &Height, double &PixelAspect);
+    HDFF::eHdmiVideoMode GetVideoMode(void);
+
+    int Resolution;
+    int TvFormat;
+    int VideoConversion;
+    int AnalogueVideo;
+    int AudioDelay;
+    int AudioDownmix;
+    int OsdSize;
+    int CecEnabled;
+    int RemoteProtocol;
+    int RemoteAddress;
+
+    int HighLevelOsd;
+    int TrueColorOsd;
+};
+
+extern cHdffSetup gHdffSetup;
+
+class cHdffSetupPage : public cMenuSetupPage
+{
+private:
+    HDFF::cHdffCmdIf * mHdffCmdIf;
+    cHdffSetup mNewHdffSetup;
+
+protected:
+    virtual void Store(void);
+
+public:
+    cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf);
+    virtual ~cHdffSetupPage(void);
+};
+
+#endif
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 0d1047b9f..9672f6fc1 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -15,3 +15,7 @@ VDR Plugin 'dvbsddevice' Revision History
 
 - The PCR pid is now recorded for channels where this is different from the
   video PID.
+
+2011-04-17: Version 0.0.4
+
+- Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index cc48b2838..6f042d8b6 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.3 2010/01/30 10:05:42 kls Exp $
+ * $Id: dvbsddevice.c 1.4 2011/04/17 12:55:43 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.c b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
index 4b60ef511..46c65e05a 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffosd.c 2.2 2010/09/19 12:43:45 kls Exp $
+ * $Id: dvbsdffosd.c 2.3 2011/04/17 12:55:09 kls Exp $
  */
 
 #include "dvbsdffosd.h"
@@ -73,8 +73,7 @@ void cDvbSdFfOsd::SetActive(bool On)
            Flush();
         }
      else if (shown) {
-        cBitmap *Bitmap;
-        for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+        for (int i = 0; GetBitmap(i); i++) {
             Cmd(OSD_SetWindow, 0, i + 1);
             Cmd(OSD_Close);
             }
@@ -108,8 +107,7 @@ eOsdError cDvbSdFfOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 eOsdError cDvbSdFfOsd::SetAreas(const tArea *Areas, int NumAreas)
 {
   if (shown) {
-     cBitmap *Bitmap;
-     for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
+     for (int i = 0; GetBitmap(i); i++) {
          Cmd(OSD_SetWindow, 0, i + 1);
          Cmd(OSD_Close);
          }
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 1270fbf67..ac386b0e4 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -25,3 +25,12 @@ VDR Plugin 'osddemo' Revision History
 2011-02-20: Version 0.2.0
 
 - Added support for TrueColor OSD.
+
+2011-03-28: Version 0.2.1
+
+- Added Cancel(3) to ~cTrueColorDemo() (thanks to Reinhard Nissl).
+- Added a missing font deletion in cTrueColorDemo::Action() (thanks to Reinhard Nissl).
+
+2011-04-17: Version 0.2.2
+
+- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 2e6a33bfb..9ad9df7b1 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.3 2011/02/26 12:08:13 kls Exp $
+ * $Id: osddemo.c 2.5 2011/04/17 13:05:13 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.0";
+static const char *VERSION        = "0.2.2";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -103,6 +103,7 @@ cTrueColorDemo::cTrueColorDemo(void)
 
 cTrueColorDemo::~cTrueColorDemo()
 {
+  Cancel(3);
   delete osd;
 }
 
@@ -262,12 +263,13 @@ void cTrueColorDemo::Action(void)
              case 3: {
                        if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
                           NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font);
+                          delete Font;
                           if (NextPixmap) {
                              FadeInPixmap = NextPixmap;
+                             Start = cTimeMs::Now();
+                             StartLine = Line;
+                             Line += NextPixmap->DrawPort().Height();
                              }
-                          Start = cTimeMs::Now();
-                          StartLine = Line;
-                          Line += NextPixmap->DrawPort().Height();
                           }
                        State++;
                      }
diff --git a/config.h b/config.h
index c9aeb5ec9..e4ac2f2ad 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.29 2010/10/24 11:22:35 kls Exp $
+ * $Id: config.h 2.30 2011/03/13 12:02:31 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.17"
-#define VDRVERSNUM   10717  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.18"
+#define VDRVERSNUM   10718  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.17"
-#define APIVERSNUM   10717  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.18"
+#define APIVERSNUM   10718  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.h b/device.h
index 1598af24a..a383dac6f 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.23 2010/10/24 12:11:16 kls Exp $
+ * $Id: device.h 2.24 2011/03/21 17:58:41 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -405,10 +405,9 @@ class cDevice : public cThread {
          ///< (default is PAL).
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
          ///< Returns the With, Height and VideoAspect ratio of the currently
-         ///< displayed video material. The data returned by this function is
-         ///< only used for informational purposes (if any). Width and
-         ///< Height are given in pixel (e.g. 720x576) and VideoAspect is
-         ///< e.g. 1.33333 for a 4:3 broadcast, or 1.77778 for 16:9.
+         ///< displayed video material. Width and Height are given in pixel
+         ///< (e.g. 720x576) and VideoAspect is e.g. 1.33333 for a 4:3 broadcast,
+         ///< or 1.77778 for 16:9.
          ///< The default implementation returns 0 for Width and Height
          ///< and 1.0 for VideoAspect.
   virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
diff --git a/dvbspu.h b/dvbspu.h
index 9e33e4548..863e4464a 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 2.4 2009/12/13 12:07:00 kls Exp $
+ * $Id: dvbspu.h 2.5 2011/03/27 14:50:48 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -32,6 +32,9 @@ typedef struct sDvbSpuRect {
     int x1, y1;
     int x2, y2;
 
+    sDvbSpuRect(void) {
+        x1 = y1 = x2 = y2 = 0;
+    };
     int width() const {
         return x2 - x1 + 1;
     };
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index c1a0a0c27..de1cd1c00 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,10 +7,13 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.11 2011/03/12 15:13:03 kls Exp $
+ * $Id: dvbsubtitle.c 2.17 2011/04/17 14:34:05 kls Exp $
  */
 
+
 #include "dvbsubtitle.h"
+#define __STDC_FORMAT_MACROS // Required for format specifiers
+#include <inttypes.h>
 #include "device.h"
 
 #define PAGE_COMPOSITION_SEGMENT   0x10
@@ -420,7 +423,7 @@ class cDvbSubtitlePage : public cListObject {
   int PageId(void) { return pageId; }
   int Version(void) { return version; }
   int State(void) { return state; }
-  tArea *GetAreas(double Factor);
+  tArea *GetAreas(double FactorX, double FactorY);
   cSubtitleClut *GetClutById(int ClutId, bool New = false);
   cSubtitleObject *GetObjectById(int ObjectId);
   cSubtitleRegion *GetRegionById(int RegionId, bool New = false);
@@ -446,16 +449,16 @@ cDvbSubtitlePage::~cDvbSubtitlePage()
 {
 }
 
-tArea *cDvbSubtitlePage::GetAreas(double Factor)
+tArea *cDvbSubtitlePage::GetAreas(double FactorX, double FactorY)
 {
   if (regions.Count() > 0) {
      tArea *Areas = new tArea[regions.Count()];
      tArea *a = Areas;
      for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
-         a->x1 = int(round(Factor * sr->HorizontalAddress()));
-         a->y1 = int(round(Factor * sr->VerticalAddress()));
-         a->x2 = int(round(Factor * (sr->HorizontalAddress() + sr->Width() - 1)));
-         a->y2 = int(round(Factor * (sr->VerticalAddress() + sr->Height() - 1)));
+         a->x1 = int(round(FactorX * sr->HorizontalAddress()));
+         a->y1 = int(round(FactorY * sr->VerticalAddress()));
+         a->x2 = int(round(FactorX * (sr->HorizontalAddress() + sr->Width() - 1)));
+         a->y2 = int(round(FactorY * (sr->VerticalAddress() + sr->Height() - 1)));
          a->bpp = sr->Bpp();
          while ((a->Width() & 3) != 0)
                a->x2++; // aligns width to a multiple of 4, so 2, 4 and 8 bpp will work
@@ -616,10 +619,11 @@ class cDvbSubtitleBitmaps : public cListObject {
   int timeout;
   tArea *areas;
   int numAreas;
-  double osdFactor;
+  double osdFactorX;
+  double osdFactorY;
   cVector<cBitmap *> bitmaps;
 public:
-  cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactor);
+  cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactorX, double OsdFactorY);
   ~cDvbSubtitleBitmaps();
   int64_t Pts(void) { return pts; }
   int Timeout(void) { return timeout; }
@@ -627,13 +631,14 @@ class cDvbSubtitleBitmaps : public cListObject {
   void Draw(cOsd *Osd);
   };
 
-cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactor)
+cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactorX, double OsdFactorY)
 {
   pts = Pts;
   timeout = Timeout;
   areas = Areas;
   numAreas = NumAreas;
-  osdFactor = OsdFactor;
+  osdFactorX = OsdFactorX;
+  osdFactorY = OsdFactorY;
 }
 
 cDvbSubtitleBitmaps::~cDvbSubtitleBitmaps()
@@ -650,12 +655,27 @@ void cDvbSubtitleBitmaps::AddBitmap(cBitmap *Bitmap)
 
 void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
 {
+  bool Scale = !(DoubleEqual(osdFactorX, 1.0) && DoubleEqual(osdFactorY, 1.0));
+  bool AntiAlias = true;
+  if (Scale && osdFactorX > 1.0 || osdFactorY > 1.0) {
+     // Upscaling requires 8bpp:
+     int Bpp[MAXOSDAREAS];
+     for (int i = 0; i < numAreas; i++) {
+         Bpp[i] = areas[i].bpp;
+         areas[i].bpp = 8;
+         }
+     if (Osd->CanHandleAreas(areas, numAreas) != oeOk) {
+        for (int i = 0; i < numAreas; i++)
+            Bpp[i] = areas[i].bpp = Bpp[i];
+        AntiAlias = false;
+        }
+     }
   if (Osd->SetAreas(areas, numAreas) == oeOk) {
      for (int i = 0; i < bitmaps.Size(); i++) {
          cBitmap *b = bitmaps[i];
-         if (osdFactor != 1.0)
-            b = b->Scale(osdFactor, osdFactor);
-         Osd->DrawBitmap(int(round(b->X0() * osdFactor)), int(round(b->Y0() * osdFactor)), *b);
+         if (Scale)
+            b = b->Scaled(osdFactorX, osdFactorY, AntiAlias);
+         Osd->DrawBitmap(int(round(b->X0() * osdFactorX)), int(round(b->Y0() * osdFactorY)), *b);
          if (b != bitmaps[i])
             delete b;
          }
@@ -733,7 +753,7 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
      if (Length > PayloadOffset + SubstreamHeaderLength) {
         int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : 0;
         if (pts)
-           dbgconverter("Converter PTS: %lld\n", pts);
+           dbgconverter("Converter PTS: %"PRId64"\n", pts);
         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
         int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
         if (ResetSubtitleAssembler)
@@ -769,7 +789,7 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
      if (Length > PayloadOffset) {
         int64_t pts = PesGetPts(Data);
         if (pts)
-           dbgconverter("Converter PTS: %lld\n", pts);
+           dbgconverter("Converter PTS: %"PRId64"\n", pts);
         const uchar *data = Data + PayloadOffset;
         int length = Length - PayloadOffset;
         if (length > 3) {
@@ -828,7 +848,7 @@ void cDvbSubtitleConverter::Action(void)
                     if (AssertOsd()) {
                        sb->Draw(osd);
                        Timeout.Set(sb->Timeout() * 1000);
-                       dbgconverter("PTS: %lld  STC: %lld (%lld) timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
+                       dbgconverter("PTS: %"PRId64"  STC: %"PRId64" (%"PRId64") timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
                        }
                     bitmaps->Del(sb);
                     }
@@ -862,27 +882,27 @@ tColor cDvbSubtitleConverter::yuv2rgb(int Y, int Cb, int Cr)
 
 void cDvbSubtitleConverter::SetOsdData(void)
 {
-  int OsdWidth;
-  int OsdHeight;
+  int OsdWidth, OsdHeight;
   double OsdAspect;
+  int VideoWidth, VideoHeight;
+  double VideoAspect;
   cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect);
-  osdDeltaX = osdDeltaY = 0;
-  osdFactor = 1.0;
-  double fw = double(OsdWidth) / displayWidth;
-  double fh = double(OsdHeight) / displayHeight;
-  if (fw >= fh) {
-     osdFactor = fh;
-     osdDeltaX = (OsdWidth - displayWidth * osdFactor) / 2;
+  cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect);
+  if (OsdWidth == displayWidth && OsdHeight == displayHeight) {
+     osdFactorX = osdFactorY = 1.0;
+     osdDeltaX = osdDeltaY = 0;
      }
   else {
-     osdFactor = fw;
-     osdDeltaY = (OsdHeight - displayHeight * osdFactor) / 2;
+     osdFactorX = VideoAspect * OsdHeight / displayWidth;
+     osdFactorY = double(OsdHeight) / displayHeight;
+     osdDeltaX = (OsdWidth - displayWidth * osdFactorX) / 2;
+     osdDeltaY = (OsdHeight - displayHeight * osdFactorY) / 2;
      }
 }
 
 bool cDvbSubtitleConverter::AssertOsd(void)
 {
-  return osd || (osd = cOsdProvider::NewOsd(int(round(osdFactor * windowHorizontalOffset + osdDeltaX)), int(round(osdFactor * windowVerticalOffset + osdDeltaY)) + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
+  return osd || (osd = cOsdProvider::NewOsd(int(round(osdFactorX * windowHorizontalOffset + osdDeltaX)), int(round(osdFactorY * windowVerticalOffset + osdDeltaY)) + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
 }
 
 int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
@@ -918,7 +938,7 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             page->SetTimeout(Data[6]);
             page->SetState((Data[6 + 1] & 0x0C) >> 2);
             page->regions.Clear();
-            dbgpages("Update page id %d version %d pts %lld timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
+            dbgpages("Update page id %d version %d pts %"PRId64" timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
             for (int i = 6 + 2; i < segmentLength; i += 6) {
                 cSubtitleRegion *region = page->GetRegionById(Data[i], true);
                 region->SetHorizontalAddress((Data[i + 2] << 8) + Data[i + 3]);
@@ -1079,7 +1099,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
 {
   if (!AssertOsd())
      return;
-  tArea *Areas = Page->GetAreas(osdFactor);
+  tArea *Areas = Page->GetAreas(osdFactorX, osdFactorY);
   int NumAreas = Page->regions.Count();
   int Bpp = 8;
   bool Reduced = false;
@@ -1116,7 +1136,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
             }
          }
      }
-  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactor);
+  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
   bitmaps->Add(Bitmaps);
   for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
       int posX = sr->HorizontalAddress();
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index 6e7176590..a9f453e0d 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.5 2011/03/12 14:03:42 kls Exp $
+ * $Id: dvbsubtitle.h 2.6 2011/03/20 13:34:23 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -35,7 +35,8 @@ class cDvbSubtitleConverter : public cThread {
   int windowHeight;
   int osdDeltaX;
   int osdDeltaY;
-  double osdFactor;
+  double osdFactorX;
+  double osdFactorY;
   cList<cDvbSubtitlePage> *pages;
   cList<cDvbSubtitleBitmaps> *bitmaps;
   tColor yuv2rgb(int Y, int Cb, int Cr);
diff --git a/font.c b/font.c
index db1bd8937..16d1013c3 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.7 2011/02/26 12:09:18 kls Exp $
+ * $Id: font.c 2.8 2011/03/28 16:29:51 kls Exp $
  */
 
 #include "font.h"
@@ -520,7 +520,7 @@ cString cFont::Bidi(const char *Ltr)
   bool ok = fribidi_log2vis(Logical, RtlLen, &Base, Visual, NULL, NULL, NULL);
   if (ok) {
      fribidi_remove_bidi_marks(Visual, RtlLen, NULL, NULL, NULL);
-     Rtl = MALLOC(char, RtlLen * 4);
+     Rtl = MALLOC(char, RtlLen * 4 + 1);
      fribidi_unicode_to_charset(fribidiCharset, Visual, RtlLen, Rtl);
      }
   free(Logical);
diff --git a/osd.c b/osd.c
index 3a5355611..d4e095a2e 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.17 2011/03/12 15:32:33 kls Exp $
+ * $Id: osd.c 2.21 2011/04/17 14:25:07 kls Exp $
  */
 
 #include "osd.h"
@@ -503,8 +503,7 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
 {
   x -= x0;
   y -= y0;
-  if (0 <= x && x < width && 0 <= y && y < height)
-     SetIndex(x, y, Index(Color));
+  SetIndex(x, y, Index(Color));
 }
 
 void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
@@ -807,7 +806,7 @@ void cBitmap::ShrinkBpp(int NewBpp)
      }
 }
 
-cBitmap *cBitmap::Scale(double FactorX, double FactorY)
+cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
 {
   // Fixed point scaling code based on www.inversereality.org/files/bitmapscaling.pdf
   // by deltener@mindtremors.com
@@ -815,19 +814,42 @@ cBitmap *cBitmap::Scale(double FactorX, double FactorY)
   b->Replace(*this); // copy palette
   int RatioX = (Width() << 16) / b->Width();
   int RatioY = (Height() << 16) / b->Height();
-  tIndex *DestRow = b->bitmap;
-  int SourceY = 0;
-  for (int y = 0; y < b->Height(); y++) {
-      int SourceX = 0;
-      tIndex *SourceRow = bitmap + (SourceY >> 16) * Width();
-      tIndex *Dest = DestRow;
-      for (int x = 0; x < b->Width(); x++) {
-          *Dest++ = SourceRow[SourceX >> 16];
-          SourceX += RatioX;
-          }
-      SourceY += RatioY;
-      DestRow += b->Width();
-      }
+  if (!AntiAlias || FactorX <= 1.0 && FactorY <= 1.0) {
+     // Downscaling - no anti-aliasing:
+     tIndex *DestRow = b->bitmap;
+     int SourceY = 0;
+     for (int y = 0; y < b->Height(); y++) {
+         int SourceX = 0;
+         tIndex *SourceRow = bitmap + (SourceY >> 16) * Width();
+         tIndex *Dest = DestRow;
+         for (int x = 0; x < b->Width(); x++) {
+             *Dest++ = SourceRow[SourceX >> 16];
+             SourceX += RatioX;
+             }
+         SourceY += RatioY;
+         DestRow += b->Width();
+         }
+     }
+  else {
+     // Upscaling - anti-aliasing:
+     b->SetBpp(8);
+     int SourceY = 0;
+     for (int y = 0; y < b->Height() - 1; y++) {
+         int SourceX = 0;
+         int sy = SourceY >> 16;
+         uint8_t BlendY = 0xFF - ((SourceY >> 8) & 0xFF);
+         for (int x = 0; x < b->Width() - 1; x++) {
+             int sx = SourceX >> 16;
+             uint8_t BlendX = 0xFF - ((SourceX >> 8) & 0xFF);
+             tColor c1 = b->Blend(GetColor(sx, sy),     GetColor(sx + 1, sy),     BlendX);
+             tColor c2 = b->Blend(GetColor(sx, sy + 1), GetColor(sx + 1, sy + 1), BlendX);
+             tColor c3 = b->Blend(c1, c2, BlendY);
+             b->DrawPixel(x + X0(), y + Y0(), c3);
+             SourceX += RatioX;
+             }
+         SourceY += RatioY;
+         }
+     }
   return b;
 }
 
@@ -1394,6 +1416,7 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
           case -2: DrawRectangle(cRect(x1,     cy - y, cx - x - x1 + 1, 1), Color); break;
           case -3: DrawRectangle(cRect(x1,     cy + y, cx - x - x1 + 1, 1), Color); break;
           case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1,      1), Color); break;
+          default: ;
           }
         x++;
         StoppingX += TwoBSquare;
diff --git a/osd.h b/osd.h
index ebd279793..b56853a36 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.11 2011/03/12 16:06:48 kls Exp $
+ * $Id: osd.h 2.13 2011/04/17 14:24:32 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -273,8 +273,11 @@ class cBitmap : public cPalette {
        ///< the 2^NewBpp most frequently used colors as defined in the current palette.
        ///< If NewBpp is not smaller than the bitmap's current color depth,
        ///< or if it is not one of 4bpp or 2bpp, nothing happens.
-  cBitmap *Scale(double FactorX, double FactorY);
+  cBitmap *Scaled(double FactorX, double FactorY, bool AntiAlias = false);
        ///< Creates a copy of this bitmap, scaled by the given factors.
+       ///< If AntiAlias is true and either of the factors is greater than 1.0,
+       ///< anti-aliasing is applied. This will also set the color depth of the
+       ///< returned bitmap to 8bpp.
        ///< The caller must delete the returned bitmap once it is no longer used.
   };
 
diff --git a/pat.c b/pat.c
index 862bf46f9..b7493ec71 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.15 2010/11/07 13:47:16 kls Exp $
+ * $Id: pat.c 2.16 2011/04/17 13:45:25 kls Exp $
  */
 
 #include "pat.h"
@@ -456,7 +456,37 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       }
                       break;
-              case 0x80 ... 0xFF: // STREAMTYPE_USER_PRIVATE
+              case 0x80: // STREAMTYPE_USER_PRIVATE - DigiCipher II VIDEO (ANSI/SCTE 57)
+                      Vpid = esPid;
+                      Ppid = pmt.getPCRPid();
+                      Vtype = 0x02; // compression based upon MPEG-2
+                      ProcessCaDescriptors = true;
+                      break;
+              case 0x81: // STREAMTYPE_USER_PRIVATE - ATSC A/53 AUDIO (ANSI/SCTE 57)
+                      {
+                      char lang[MAXLANGCODE1] = { 0 };
+                      SI::Descriptor *d;
+                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                          switch (d->getDescriptorTag()) {
+                            case SI::ISO639LanguageDescriptorTag: {
+                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                 }
+                                 break;
+                            default: ;
+                            }
+                         delete d;
+                         }
+                      if (NumDpids < MAXDPIDS) {
+                         Dpids[NumDpids] = esPid;
+                         Dtypes[NumDpids] = SI::AC3DescriptorTag;
+                         strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                         NumDpids++;
+                         }
+                      ProcessCaDescriptors = true;
+                      }
+                      break;
+              case 0x82 ... 0xFF: // STREAMTYPE_USER_PRIVATE
                       {
                       char lang[MAXLANGCODE1] = { 0 };
                       bool IsAc3 = false;
@@ -467,17 +497,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                  SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d;
                                  // http://www.smpte-ra.org/mpegreg/mpegreg.html
                                  switch (rd->getFormatIdentifier()) {
-                                   case 0x44434949: // 'DCII' aka. DigiCipher II
-                                        Vpid = esPid;
-                                        Ppid = pmt.getPCRPid();
-                                        Vtype = 0x02; // DCII compression is based upon MPEG-2
-                                        ProcessCaDescriptors = true;
-                                        break;
                                    case 0x41432D33: // 'AC-3'
                                         IsAc3 = true;
                                         break;
                                    default:
-                                        //printf("Format identifier: 0x08X\n", rd->getFormatIdentifier());
+                                        //printf("Format identifier: 0x%08X (pid: %d)\n", rd->getFormatIdentifier(), esPid);
                                         break;
                                    }
                                  }
@@ -493,11 +517,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       if (IsAc3) {
                          if (NumDpids < MAXDPIDS) {
-                           Dpids[NumDpids] = esPid;
-                           Dtypes[NumDpids] = SI::AC3DescriptorTag;
-                           strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
-                           NumDpids++;
-                           }
+                            Dpids[NumDpids] = esPid;
+                            Dtypes[NumDpids] = SI::AC3DescriptorTag;
+                            strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                            NumDpids++;
+                            }
                          ProcessCaDescriptors = true;
                          }
                       }
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 0900cbc51..9a20687a2 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian-latin\n"
+"Language: sr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Kanal ***"
diff --git a/recording.c b/recording.c
index 02a6e6123..d4cf9c347 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.26 2011/02/27 13:35:20 kls Exp $
+ * $Id: recording.c 2.30 2011/04/17 13:53:11 kls Exp $
  */
 
 #include "recording.h"
@@ -12,6 +12,8 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#define __STDC_FORMAT_MACROS // Required for format specifiers
+#include <inttypes.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
@@ -301,9 +303,10 @@ bool cResumeFile::Save(int Index)
 void cResumeFile::Delete(void)
 {
   if (fileName) {
-     if (remove(fileName) < 0 && errno != ENOENT)
+     if (remove(fileName) == 0)
+        Recordings.ResetResume(fileName);
+     else if (errno != ENOENT)
         LOG_ERROR_STR(fileName);
-     Recordings.ResetResume(fileName);
      }
 }
 
@@ -1270,19 +1273,31 @@ bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool Is
 {
   fileName = AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
   framesPerSecond = FramesPerSecond;
-  lastUpdate = 0;
+  nextUpdate = 0;
   lastFileTime = -1; // the first call to Load() must take place!
+  lastChange = 0;
   return Update();
 }
 
 bool cMarks::Update(void)
 {
   time_t t = time(NULL);
-  if (t - lastUpdate > MARKSUPDATEDELTA) {
-     lastUpdate = t;
-     t = LastModifiedTime(fileName);
-     if (t > lastFileTime) {
-        lastFileTime = t;
+  if (t > nextUpdate) {
+     time_t LastModified = LastModifiedTime(fileName);
+     if (LastModified != lastFileTime) // change detected, or first run
+        lastChange = LastModified > 0 ? LastModified : t;
+     int d = t - lastChange;
+     if (d < 60)
+        d = 1; // check frequently if the file has just been modified
+     else if (d < 3600)
+        d = 10; // older files are checked less frequently
+     else
+        d /= 360; // phase out checking for very old files
+     nextUpdate = t + d;
+     if (LastModified != lastFileTime) { // change detected, or first run
+        lastFileTime = LastModified;
+        if (lastFileTime == t)
+           lastFileTime--; // make sure we don't miss updates in the remaining second
         cMutexLock MutexLock(&MutexMarkFramesPerSecond);
         MarkFramesPerSecond = framesPerSecond;
         if (cConfig<cMark>::Load(fileName)) {
@@ -1550,7 +1565,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
               delta = int(buf.st_size % sizeof(tIndexTs));
               if (delta) {
                  delta = sizeof(tIndexTs) - delta;
-                 esyslog("ERROR: invalid file size (%lld) in '%s'", buf.st_size, fileName);
+                 esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, fileName);
                  }
               last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
               if (!Record && last >= 0) {
diff --git a/recording.h b/recording.h
index 93b5a9ccb..8ec7f49e5 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.16 2011/02/27 12:48:21 kls Exp $
+ * $Id: recording.h 2.19 2011/04/17 13:18:04 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -57,6 +57,7 @@ class cRecordingInfo {
   int lifetime;
   char *fileName;
   cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
+  bool Read(FILE *f);
   void SetData(const char *Title, const char *ShortText, const char *Description);
   void SetAux(const char *Aux);
 public:
@@ -72,7 +73,6 @@ class cRecordingInfo {
   const char *Aux(void) const { return aux; }
   double FramesPerSecond(void) const { return framesPerSecond; }
   void SetFramesPerSecond(double FramesPerSecond);
-  bool Read(FILE *f);
   bool Write(FILE *f, const char *Prefix = "") const;
   bool Read(void);
   bool Write(void) const;
@@ -192,8 +192,9 @@ class cMarks : public cConfig<cMark> {
 private:
   cString fileName;
   double framesPerSecond;
-  time_t lastUpdate;
+  time_t nextUpdate;
   time_t lastFileTime;
+  time_t lastChange;
 public:
   bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
   bool Update(void);
diff --git a/remote.c b/remote.c
index 048b98c30..cd3a75851 100644
--- a/remote.c
+++ b/remote.c
@@ -4,11 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.2 2010/12/24 15:26:05 kls Exp $
+ * $Id: remote.c 2.3 2011/03/27 15:03:36 kls Exp $
  */
 
 #include "remote.h"
 #include <fcntl.h>
+#define __STDC_FORMAT_MACROS // Required for format specifiers
+#include <inttypes.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/types.h>
@@ -122,7 +124,7 @@ bool cRemote::PutMacro(eKeys Key)
 bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
 {
   char buffer[32];
-  snprintf(buffer, sizeof(buffer), "%016llX", Code);
+  snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code);
   return Put(buffer, Repeat, Release);
 }
 
diff --git a/remux.c b/remux.c
index f7ad86ddc..f7ef87a95 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.51 2011/02/26 15:51:04 kls Exp $
+ * $Id: remux.c 2.53 2011/03/20 10:21:14 kls Exp $
  */
 
 #include "remux.h"
@@ -783,9 +783,11 @@ cFrameDetector::cFrameDetector(int Pid, int Type)
   synced = false;
   newFrame = independentFrame = false;
   numPtsValues = 0;
+  numFrames = 0;
   numIFrames = 0;
   framesPerSecond = 0;
   framesInPayloadUnit = framesPerPayloadUnit = 0;
+  payloadUnitOfFrame = 0;
   scanning = false;
   scanner = EMPTY_SCANNER;
 }
@@ -807,6 +809,7 @@ void cFrameDetector::SetPid(int Pid, int Type)
 void cFrameDetector::Reset(void)
 {
   newFrame = independentFrame = false;
+  payloadUnitOfFrame = 0;
   scanning = false;
   scanner = EMPTY_SCANNER;
 }
@@ -833,7 +836,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                     return Processed;
                  if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
                     return Processed; // need more data, in case the frame type is not stored in the first TS packet
-                 if (!framesPerSecond) {
+                 if (framesPerSecond <= 0.0) {
                     // frame rate unknown, so collect a sequence of PTS values:
                     if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
                        const uchar *Pes = Data + TsPayloadOffset(Data);
@@ -844,6 +847,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                              dbgframes("#");
                              numPtsValues = 0;
                              numIFrames = 0;
+                             numFrames = 0;
                              }
                           else
                              numPtsValues++;
@@ -863,10 +867,23 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                              framesPerSecond = 25.0;
                           else if (Delta % 3003 == 0)
                              framesPerSecond = 30.0 / 1.001;
-                          else if (abs(Delta - 1800) <= 1)
-                             framesPerSecond = 50.0;
+                          else if (abs(Delta - 1800) <= 1) {
+                             if (numFrames > 50) {
+                                // this is a "best guess": if there are more than 50 frames between two I-frames, we assume each "frame" actually contains a "field", so two "fields" make one "frame"
+                                framesPerSecond = 25.0;
+                                framesPerPayloadUnit = -2;
+                                }
+                             else
+                                framesPerSecond = 50.0;
+                             }
                           else if (Delta == 1501)
-                             framesPerSecond = 60.0 / 1.001;
+                             if (numFrames > 50) {
+                                // this is a "best guess": if there are more than 50 frames between two I-frames, we assume each "frame" actually contains a "field", so two "fields" make one "frame"
+                                framesPerSecond = 30.0 / 1.001;
+                                framesPerPayloadUnit = -2;
+                                }
+                             else
+                                framesPerSecond = 60.0 / 1.001;
                           else {
                              framesPerSecond = 25.0;
                              dsyslog("unknown frame delta (%d), assuming 25 fps", Delta);
@@ -874,7 +891,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                           }
                        else // audio
                           framesPerSecond = 90000.0 / Delta; // PTS of audio frames is always increasing
-                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d\n", Delta, framesPerSecond, framesPerPayloadUnit);
+                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d NF = %d\n", Delta, framesPerSecond, framesPerPayloadUnit, numFrames);
                        }
                     }
                  scanner = EMPTY_SCANNER;
@@ -909,6 +926,8 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                   framesInPayloadUnit++;
                                   if (independentFrame)
                                      numIFrames++;
+                                  if (numIFrames == 1)
+                                     numFrames++;
                                   dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
                                   }
                                if (synced)
@@ -923,6 +942,13 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                newFrame = true;
                                independentFrame = Data[i + 1] == 0x10;
                                if (synced) {
+                                  if (framesPerPayloadUnit < 0) {
+                                     payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
+                                     if (payloadUnitOfFrame != 0 && independentFrame)
+                                        payloadUnitOfFrame = 0;
+                                     if (payloadUnitOfFrame)
+                                        newFrame = false;
+                                     }
                                   if (framesPerPayloadUnit <= 1)
                                      scanning = false;
                                   }
@@ -930,6 +956,8 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                   framesInPayloadUnit++;
                                   if (independentFrame)
                                      numIFrames++;
+                                  if (numIFrames == 1)
+                                     numFrames++;
                                   dbgframes("%02X ", Data[i + 1]);
                                   }
                                if (synced)
@@ -953,9 +981,9 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                 pid = 0; // let's just ignore any further data
                        }
                      }
-                 if (!synced && framesPerSecond && independentFrame) {
+                 if (!synced && framesPerSecond > 0.0 && independentFrame) {
                     synced = true;
-                    dbgframes("*");
+                    dbgframes("*\n");
                     Reset();
                     return Processed + TS_SIZE;
                     }
diff --git a/remux.h b/remux.h
index 7140aaf04..60a9a578f 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.27 2010/11/01 11:24:20 kls Exp $
+ * $Id: remux.h 2.28 2011/03/19 16:52:46 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -345,12 +345,15 @@ class cFrameDetector {
   bool independentFrame;
   uint32_t ptsValues[MaxPtsValues]; // 32 bit is enough - we only need the delta
   int numPtsValues;
+  int numFrames;
   int numIFrames;
   bool isVideo;
   double framesPerSecond;
   int framesInPayloadUnit;
   int framesPerPayloadUnit; // Some broadcasters send one frame per payload unit (== 1),
-                            // while others put an entire GOP into one payload unit (> 1).
+                            // some put an entire GOP into one payload unit (> 1), and
+                            // some spread a single frame over several payload units (< 0).
+  int payloadUnitOfFrame;
   bool scanning;
   uint32_t scanner;
 public:
diff --git a/runvdr.template b/runvdr.template
index ebc2f04d0..2f6fd87b5 100755
--- a/runvdr.template
+++ b/runvdr.template
@@ -20,7 +20,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr.template 2.1 2010/01/17 12:39:27 kls Exp $
+# $Id: runvdr.template 2.2 2011/04/17 12:34:30 kls Exp $
 
 VDRPRG="./vdr"
 
@@ -30,8 +30,12 @@ VDROPTIONS="-w 60"
 VDRPLUGINS=""
 # You will need to select your output device plugin if you want
 # to use VDR to watch video. For instance, for a "Full Featured"
-# DVB card that would be
+# SD DVB card that would be
 # VDRPLUGINS="-P dvbsddevice"
+# For a "Full Featured" HD DVB card you could use
+# VDRPLUGINS="-P dvbhddevice"
+# There are also other output device plugins available, see
+# http://www.vdr-wiki.de/wiki/index.php/Plugins.
 
 VDRCMD="$VDRPRG $VDROPTIONS $VDRPLUGINS $*"
 
diff --git a/tools.c b/tools.c
index d03595e63..ab7fe96c0 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.12 2011/02/25 14:58:31 kls Exp $
+ * $Id: tools.c 2.13 2011/03/20 12:07:18 kls Exp $
  */
 
 #include "tools.h"
@@ -1575,9 +1575,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
      cachedstart = min(cachedstart, curpos);
 #endif
      ssize_t bytesRead = safe_read(fd, Data, Size);
-#ifdef USE_FADVISE
      if (bytesRead > 0) {
         curpos += bytesRead;
+#ifdef USE_FADVISE
         cachedend = max(cachedend, curpos);
 
         // Read ahead:
@@ -1597,8 +1597,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
            }
         else
            ahead = curpos; // jumped -> we really don't want any readahead, otherwise e.g. fast-rewind gets in trouble.
+#endif
         }
-
+#ifdef USE_FADVISE
      if (cachedstart < cachedend) {
         if (curpos - cachedstart > READCHUNK * 2) {
            // current position has moved forward enough, shrink tail window.
diff --git a/vdr.5 b/vdr.5
index ce1521566..6274c1af4 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.21 2010/12/24 15:19:21 kls Exp $
+.\" $Id: vdr.5 2.22 2011/04/03 10:21:36 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -807,7 +807,7 @@ l l.
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
 <genre>        @is a two digit hex code, as defined in  ETSI EN 300 468, table 28 (up to 4 genre codes are supported)
 <parental rating>@is the minimum age of the intended audience
-<stream>       @is the stream content (1 = video, 2 = audio, 3 = subtitles, 4 = AC3)
+<stream>       @is the stream content (1 = MPEG2 video, 2 = MP2 audio, 3 = subtitles, 4 = AC3 audio, 5 = H.264 video, 6 = HEAAC audio)
 <type>         @is the stream type according to ETSI EN 300 468
 <language>     @is the three letter language code (optionally two codes, separated by '+')
 <descr>        @is the description of this stream component

From bd61fee1e9328aec470c319494cccb90e53302c2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 19 Jun 2011 12:41:00 +0200
Subject: [PATCH 205/307] Version 1.7.19 Original announce message: VDR
 developer version 1.7.19 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.19.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.18-1.7.19.diff

MD5 checksums:

1eb04ecdc2b11ab8641ebfaa2cb93f42  vdr-1.7.19.tar.bz2
db16ce7bb51e0db837ed56ef4744a67e  vdr-1.7.18-1.7.19.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

This version introduces functions to determine the "signal strength"
and "signal quality" through cDevice. If you are using a DVB card that
contains an stb0899 frontend chip (like the TT-budget S2-3200) you may
want to apply the patches from

   ftp://ftp.tvdr.de/vdr/Developer/Driver-Patches

to the LinuxDVB driver source in order to receive useful results from
that frontend.
Since apparently the various frontend drivers return different maximum
values in their FE_READ_SIGNAL_STRENGTH and FE_READ_SNR functions (some
deliver a value in the range 0x0000...0xFFFF, while others return values
as "dB/10" or "dBm/10" (the latter with an offset to make the value positive,
since the parameter is unsigned), the functions cDvbTuner::GetSignalStrength()
and cDvbTuner::GetSignalQuality() use the device's "subsystem ID" to
map these values into the range 0...100, which is the normalized return
value of these functions.
Take a look at these two functions and maybe remove the comment characters
from the lines
//#define DEBUG_SIGNALSTRENGTH
//#define DEBUG_SIGNALQUALITY
in dvbdevice.c to get some debug output if your device doesn't return any
directly useful values and may have to be added appropriately to the
'switch (subsystemId)' statement.
The channel display of the 'sttng' skin uses these values to implement
a signal strength/quality display.

From the HISTORY file:
- Fixed cString's operator=(const char *String) in case the given string is the
  same as the existing one (thanks to Dirk Leber).
- Avoiding a gcc 4.6 compiler error in the skincurses plugin (thanks to Tobias Grimm).
- TsGetPayload() now checks if there actually is a payload in the given TS packet
  (reported by Dirk Leber).
- Now sorting the source file names in the call to xgettext, to make sure the results
  are not dependent on the sequence of the files.
  Plugin authors may want to change the line containing the xgettext call in their
  Makefile accordingly by changing "$^" to "`ls $^`".
- The primary device is now only avoided for recording if it is an old SD full
  featured card. This is done through the new function cDevice::AvoidRecording().
- Subtitle PIDs are now also decrypted (thanks to Reinhard Nissl).
- Fixed a possible race condition in cDiseqc::Execute() (reported by Marco Göbenich).
  The return value of cDiseqcs::Get() is now const, so plugin authors may need to
  adjust their code if they use this function.
- The new functions cDevice::SignalStrength() and cDevice::SignalQuality() can be
  used to determine the signal strength and quality of a given device (thanks to
  Rolf Ahrenberg for some input on how to use BER and UNC values to generate a
  "quality" value).
- The 'sttng' skin now displays two colored bars at the bottom of the channel display,
  indicating the strength (upper bar) and quality (lower bar) of the received signal.
  The number to the left of these bars indicates the actual device the current
  channel is being received with.
- Fixed detecting frames in case the Picture Start Code or Access Unit Delimiter
  extends over TS packet boundaries (reported by Johan Andersson).
  In order to fix this, the semantics of cFrameDetector had to be changed a little.
  See cRecorder::Action() and cIndexFileGenerator::Action() on how to use the new
  cFrameDetector::NewPayload() function.
- The frame detector now only starts collecting PTS values after it has seen the
  first I-frame, otherwise it might get MaxPtsValues values and stop analyzing
  even though the incoming data is still garbage (reported by Derek Kelly).
- The info file of a recording is now only overwritten with a new fps value if
  that new value is not the default value (thanks to Derek Kelly for reporting a
  problem with the fps value being overwritten in case a recording was interrupted
  and resumed, and the fps value could not be determined after resuming recording).
- The initial channel is now stored by the channel ID in the setup.conf file, in
  order to avoid problems in case channels are reordered or deleted (reported by
  Lars Bläser).
- Added support for "content identifier descriptor" and "default authority descriptor"
  to 'libsi' (thanks to Dave Pickles).
---
 CONTRIBUTORS                            |  29 ++++
 HISTORY                                 |  43 ++++++
 MANUAL                                  |   4 +-
 Makefile                                |   4 +-
 PLUGINS/src/dvbhddevice/HISTORY         |  31 +++-
 PLUGINS/src/dvbhddevice/Makefile        |   4 +-
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   4 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |  28 +---
 PLUGINS/src/dvbhddevice/hdffcmd.c       |  21 ++-
 PLUGINS/src/dvbhddevice/hdffosd.c       |  26 +++-
 PLUGINS/src/dvbhddevice/po/de_DE.po     |  89 +++++++++++
 PLUGINS/src/dvbhddevice/setup.c         | 165 ++++++++++-----------
 PLUGINS/src/dvbsddevice/Makefile        |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |  24 +--
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |   3 +-
 PLUGINS/src/hello/Makefile              |   4 +-
 PLUGINS/src/hello/po/ca_ES.po           |   4 +-
 PLUGINS/src/hello/po/cs_CZ.po           |   4 +-
 PLUGINS/src/hello/po/da_DK.po           |   4 +-
 PLUGINS/src/hello/po/de_DE.po           |   4 +-
 PLUGINS/src/hello/po/el_GR.po           |   4 +-
 PLUGINS/src/hello/po/es_ES.po           |   4 +-
 PLUGINS/src/hello/po/et_EE.po           |   4 +-
 PLUGINS/src/hello/po/fi_FI.po           |   4 +-
 PLUGINS/src/hello/po/fr_FR.po           |   4 +-
 PLUGINS/src/hello/po/hr_HR.po           |   4 +-
 PLUGINS/src/hello/po/hu_HU.po           |   4 +-
 PLUGINS/src/hello/po/it_IT.po           |   4 +-
 PLUGINS/src/hello/po/lt_LT.po           |   4 +-
 PLUGINS/src/hello/po/nl_NL.po           |   4 +-
 PLUGINS/src/hello/po/nn_NO.po           |   4 +-
 PLUGINS/src/hello/po/pl_PL.po           |   4 +-
 PLUGINS/src/hello/po/pt_PT.po           |   4 +-
 PLUGINS/src/hello/po/ro_RO.po           |   4 +-
 PLUGINS/src/hello/po/ru_RU.po           |   4 +-
 PLUGINS/src/hello/po/sk_SK.po           |   4 +-
 PLUGINS/src/hello/po/sl_SI.po           |   4 +-
 PLUGINS/src/hello/po/sv_SE.po           |   4 +-
 PLUGINS/src/hello/po/tr_TR.po           |   4 +-
 PLUGINS/src/hello/po/zh_CN.po           |   4 +-
 PLUGINS/src/pictures/Makefile           |   4 +-
 PLUGINS/src/pictures/po/de_DE.po        |   4 +-
 PLUGINS/src/pictures/po/fi_FI.po        |   4 +-
 PLUGINS/src/pictures/po/fr_FR.po        |   4 +-
 PLUGINS/src/pictures/po/it_IT.po        |   4 +-
 PLUGINS/src/pictures/po/lt_LT.po        |   4 +-
 PLUGINS/src/pictures/po/ru_RU.po        |   4 +-
 PLUGINS/src/pictures/po/sk_SK.po        |   4 +-
 PLUGINS/src/skincurses/HISTORY          |   4 +
 PLUGINS/src/skincurses/Makefile         |   4 +-
 PLUGINS/src/skincurses/po/de_DE.po      |   4 +-
 PLUGINS/src/skincurses/po/fi_FI.po      |   4 +-
 PLUGINS/src/skincurses/po/it_IT.po      |   4 +-
 PLUGINS/src/skincurses/po/lt_LT.po      |   4 +-
 PLUGINS/src/skincurses/po/ru_RU.po      |   4 +-
 PLUGINS/src/skincurses/po/sk_SK.po      |   4 +-
 PLUGINS/src/skincurses/skincurses.c     |   6 +-
 ci.c                                    |  16 +-
 config.c                                |   7 +-
 config.h                                |  12 +-
 device.c                                |  16 +-
 device.h                                |  15 +-
 diseqc.c                                |  31 ++--
 diseqc.h                                |  16 +-
 dvbdevice.c                             | 189 +++++++++++++++++++++---
 dvbdevice.h                             |   5 +-
 libsi/descriptor.c                      |  29 +++-
 libsi/descriptor.h                      |  27 +++-
 libsi/headers.h                         |  20 ++-
 libsi/si.c                              |  10 +-
 menuitems.c                             |  16 +-
 menuitems.h                             |   5 +-
 osd.c                                   |   5 +-
 po/ar.po                                |   4 +-
 po/ca_ES.po                             |   4 +-
 po/cs_CZ.po                             |   4 +-
 po/da_DK.po                             |   4 +-
 po/de_DE.po                             |   4 +-
 po/el_GR.po                             |   4 +-
 po/es_ES.po                             |   4 +-
 po/et_EE.po                             |   4 +-
 po/fi_FI.po                             |   4 +-
 po/fr_FR.po                             |   4 +-
 po/hr_HR.po                             |   4 +-
 po/hu_HU.po                             |   4 +-
 po/it_IT.po                             |   4 +-
 po/lt_LT.po                             |   4 +-
 po/mk_MK.po                             |   4 +-
 po/nl_NL.po                             |   4 +-
 po/nn_NO.po                             |   4 +-
 po/pl_PL.po                             |   4 +-
 po/pt_PT.po                             |   4 +-
 po/ro_RO.po                             |   4 +-
 po/ru_RU.po                             |   4 +-
 po/sk_SK.po                             |   4 +-
 po/sl_SI.po                             |   4 +-
 po/sr_SR.po                             |   4 +-
 po/sv_SE.po                             |   4 +-
 po/tr_TR.po                             |   4 +-
 po/uk_UA.po                             |   4 +-
 po/zh_CN.po                             |   4 +-
 recorder.c                              |  14 +-
 recording.c                             |  15 +-
 remux.c                                 |  69 ++++++---
 remux.h                                 |  26 ++--
 skinsttng.c                             |  47 +++++-
 tools.c                                 |   4 +-
 vdr.c                                   |  10 +-
 108 files changed, 968 insertions(+), 397 deletions(-)
 create mode 100644 PLUGINS/src/dvbhddevice/po/de_DE.po

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f6ba82c72..b9cc38240 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1028,6 +1028,8 @@ Marc Rovira Vall <tm05462@salleURL.edu>, Ramon Roca <ramon.roca@xcombo.com> and
 Lars Bl�ser <LBlaeser@hofheim.de>
  for reporting a bug in EPG bugfix statistics which made log entries for undefined
  channels
+ for reporting a problem with the initial channel in case channels are reordered or
+ deleted
 
 Niko Tarnanen <niko.tarnanen@hut.fi>
  for translating OSD texts to the Finnish language
@@ -1104,6 +1106,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding support for "registration descriptor" to 'libsi' and using it in pat.c
  for adding an include of VDR's 'Make.global' to libsi's Makefile
  for adding handling of "ANSI/SCTE 57" descriptors
+ for some input on how to use BER and UNC values to generate a "quality" value
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1269,6 +1272,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for fixing a buffer overflow in cFont::Bidi()
  for avoiding an unecessary call to Recordings.ResetResume()
  for debugging a problem in handling the bitmap color depth for scaled subtitles
+ for making subtitle PIDs be decrypted
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -2141,6 +2145,8 @@ Philippe Gramoull
 Andr� Weidemann <Andre.Weidemann@web.de>
  for suggesting to only write Dolby Digital tracks into the 'info.vdr' file of a
  recording if Setup.UseDolbyDigital is true
+ for suggesting that the primary device should only be avoided for recording if
+ it is an old SD full featured card
 
 J�rgen Schilling <juergen_schilling@web.de>
  for reporting that color buttons were displayed in the recording info menu if it
@@ -2257,6 +2263,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for reporting unneeded include files <linux/dvb/dmx.h> and <time.h> in remux.h
  for a patch that added a workaround for the broken linux-dvb driver header files
  for reporting a faulty "frame duration" instead of "frame rate" in vdr.5
+ for avoiding a gcc 4.6 compiler error in the skincurses plugin.
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2567,6 +2574,11 @@ Derek Kelly (user.vdr@gmail.com)
  for reporting a problem where the frame rate was not detected correctly
  for testing the implementation of FE_CAN_TURBO_FEC
  for reporting unjustified log entries about changed channel pids
+ for reporting a problem with the frame detector in case it gets MaxPtsValues values
+ and stops analyzing even though the incoming data is still garbage
+ for reporting a problem with the fps value in the info file of a recording being
+ overwritten in case a recording was interrupted and resumed, and the fps value
+ could not be determined after resuming recording
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2697,3 +2709,20 @@ Sergiu Dotenco <sergiu.dotenco@googlemail.com>
 
 Mika Laitio <lamikr@pilppa.org>
  for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer
+
+Dirk Leber <dirk.leber@reel-multimedia.com>
+ for fixing cString's operator=(const char *String) in case the given string is the
+ same as the existing one
+ for reporting that TsGetPayload() gets called without checking whether there actually
+ is a payload in the given TS packet
+
+Marco G�benich <mg@needful.de>
+ for reporting a problem with executing diseqc commands from different threads
+
+Johan Andersson <jna@jna.pp.se>
+ for reporting a bug in detecting frames in case the Picture Start Code or Access Unit
+ Delimiter extends over TS packet boundaries
+
+Dave Pickles <dave@pickles.me.uk>
+ for adding support for "content identifier descriptor" and "default authority
+ descriptor" to 'libsi'
diff --git a/HISTORY b/HISTORY
index c4e22fd8a..015a10195 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6606,3 +6606,46 @@ Video Disk Recorder Revision History
 - Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg).
 - Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard
   Nissl).
+
+2011-06-19: Version 1.7.19
+
+- Fixed cString's operator=(const char *String) in case the given string is the
+  same as the existing one (thanks to Dirk Leber).
+- Avoiding a gcc 4.6 compiler error in the skincurses plugin (thanks to Tobias Grimm).
+- TsGetPayload() now checks if there actually is a payload in the given TS packet
+  (reported by Dirk Leber).
+- Now sorting the source file names in the call to xgettext, to make sure the results
+  are not dependent on the sequence of the files.
+  Plugin authors may want to change the line containing the xgettext call in their
+  Makefile accordingly by changing "$^" to "`ls $^`".
+- The primary device is now only avoided for recording if it is an old SD full
+  featured card. This is done through the new function cDevice::AvoidRecording().
+- Subtitle PIDs are now also decrypted (thanks to Reinhard Nissl).
+- Fixed a possible race condition in cDiseqc::Execute() (reported by Marco G�benich).
+  The return value of cDiseqcs::Get() is now const, so plugin authors may need to
+  adjust their code if they use this function.
+- The new functions cDevice::SignalStrength() and cDevice::SignalQuality() can be
+  used to determine the signal strength and quality of a given device (thanks to
+  Rolf Ahrenberg for some input on how to use BER and UNC values to generate a
+  "quality" value).
+- The 'sttng' skin now displays two colored bars at the bottom of the channel display,
+  indicating the strength (upper bar) and quality (lower bar) of the received signal.
+  The number to the left of these bars indicates the actual device the current
+  channel is being received with.
+- Fixed detecting frames in case the Picture Start Code or Access Unit Delimiter
+  extends over TS packet boundaries (reported by Johan Andersson).
+  In order to fix this, the semantics of cFrameDetector had to be changed a little.
+  See cRecorder::Action() and cIndexFileGenerator::Action() on how to use the new
+  cFrameDetector::NewPayload() function.
+- The frame detector now only starts collecting PTS values after it has seen the
+  first I-frame, otherwise it might get MaxPtsValues values and stop analyzing
+  even though the incoming data is still garbage (reported by Derek Kelly).
+- The info file of a recording is now only overwritten with a new fps value if
+  that new value is not the default value (thanks to Derek Kelly for reporting a
+  problem with the fps value being overwritten in case a recording was interrupted
+  and resumed, and the fps value could not be determined after resuming recording).
+- The initial channel is now stored by the channel ID in the setup.conf file, in
+  order to avoid problems in case channels are reordered or deleted (reported by
+  Lars Bl�ser).
+- Added support for "content identifier descriptor" and "default authority descriptor"
+  to 'libsi' (thanks to Dave Pickles).
diff --git a/MANUAL b/MANUAL
index 7fae53bbc..352cc10cc 100644
--- a/MANUAL
+++ b/MANUAL
@@ -885,8 +885,8 @@ Version 1.6
                          key. Note that the total maximum is also limited by
                          the "OSD/Channel info time" parameter.
 
-  Initial channel = 0    The number of the channel that shall be tuned to when
-                         VDR starts. Default is 0, which means that it will
+  Initial channel =      The channel ID of the channel that shall be tuned to when
+                         VDR starts. Default is empty, which means that it will
                          tune to the channel that was on before VDR was stopped.
 
   Initial volume = -1    The volume that shall be set when VDR starts. Default
diff --git a/Makefile b/Makefile
index 931783927..18d7eb96f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.17 2011/04/17 13:35:53 kls Exp $
+# $Id: Makefile 2.18 2011/05/21 12:21:40 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -115,7 +115,7 @@ I18Npot   = $(PODIR)/vdr.pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index aa788fd11..280e0ad75 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -13,4 +13,33 @@ VDR Plugin 'dvbhddevice' Revision History
 
 2011-04-17: Version 0.0.3
 
-- Added support for TrueColor OSD.
+- Improved trickmodes
+- No transfer mode needed for dolby digital
+- Clear audio and video PID when Clear() ist called to stop audio decoding when jumping to cutting marks
+- Support still frames in H264 format
+- Remote control setup
+- Added analogue video setting, support volume control.
+- Support setting of audio delay.
+- Support setting of audio channel (Stereo, Left, Right)
+- Support setting of audio downmix mode.
+- Playback of PES data is working now.
+- Fall back to MPEG2 stream type when no PMT is available.
+- Added support for PES PCM playback
+- Support HDMI-CEC. (One-Touch Play)
+- Added low level OSD implementation.
+- Added option to select between high level and low level OSD.
+- high level OSD: Implement SaveRegion and RestoreRegion.
+- Fix not working video playback when PCR PID is different from video PID.
+- Fix not working pause when playing H.264 video
+- Improvements in transfer mode, fix audio dropouts or no audio at all
+- Add implementation of CanHandleAreas method to support VDR 1.7.17
+- in cHdffOsdRaw::Flush fix reusing of loop variable i in subloop that lead to OSD update problems
+- Specify container format when starting audio decoding to support PES-DVD containers
+- Added support for True Color OSD
+- Allow to disable true color OSD support via setup option
+
+2011-04-xx: Version 0.0.4
+- locally define DVB OSD API extensions to support compiling with original DVB headers
+- Return correct pixel aspect ratio in GetOsdSize
+- Adapt Makefile to changes introduced in recent VDR versions
+
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index ea1b9d1ec..91fdfce8c 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2011/04/17 11:40:55 kls Exp $
+# $Id: Makefile 1.8 2011/05/21 12:25:33 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index d63992285..4745c3775 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.12 2011/04/17 11:20:22 kls Exp $
+ * $Id: dvbhddevice.c 1.13 2011/04/24 09:31:21 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include "dvbhdffdevice.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "HD Full Featured DVB device";
 
 class cPluginDvbhddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 9263009d6..714769ebc 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.29 2011/04/17 11:20:22 kls Exp $
+ * $Id: dvbhdffdevice.c 1.32 2011/05/22 15:19:59 kls Exp $
  */
 
 #include "dvbhdffdevice.h"
@@ -110,7 +110,7 @@ void cDvbHdFfDevice::SetVideoFormat(bool VideoFormat16_9)
 {
   HDFF::tVideoFormat videoFormat;
   videoFormat.AutomaticEnabled = true;
-  videoFormat.AfdEnabled = true;
+  videoFormat.AfdEnabled = false;
   videoFormat.TvFormat = (HDFF::eTvFormat) gHdffSetup.TvFormat;
   videoFormat.VideoConversion = (HDFF::eVideoConversion) gHdffSetup.VideoConversion;
   mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
@@ -364,7 +364,7 @@ bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
      if (playMode == pmNone)
         TurnOffLiveMode(true);
 
-     mHdffCmdIf->CmdAvSetPlayMode(1, Transferring());
+     mHdffCmdIf->CmdAvSetPlayMode(1, Transferring() || (cTransferControl::ReceiverDevice() == this));
      mHdffCmdIf->CmdAvSetStc(0, 100000);
      mHdffCmdIf->CmdAvEnableSync(0, true);
      mHdffCmdIf->CmdAvEnableVideoAfterStop(0, true);
@@ -725,28 +725,14 @@ HDFF::cHdffCmdIf *cDvbHdFfDevice::GetHdffCmdHandler(void)
 bool cDvbHdFfDeviceProbe::Probe(int Adapter, int Frontend)
 {
   static uint32_t SubsystemIds[] = {
-    0x13C23009, // Technotrend S2-6400 HDFF
+    0x13C23009, // Technotrend S2-6400 HDFF development samples
+    0x13C2300A, // Technotrend S2-6400 HDFF production version
     0x00000000
     };
-  cString FileName;
-  cReadLine ReadLine;
-  FILE *f = NULL;
-  uint32_t SubsystemId = 0;
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId = strtoul(s, NULL, 0) << 16;
-     fclose(f);
-     }
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId |= strtoul(s, NULL, 0);
-     fclose(f);
-     }
+  uint32_t SubsystemId = GetSubsystemId(Adapter, Frontend);
   for (uint32_t *sid = SubsystemIds; *sid; sid++) {
       if (*sid == SubsystemId) {
-         FileName = cString::sprintf("/dev/dvb/adapter%d/osd0", Adapter);
+         cString FileName = cString::sprintf("/dev/dvb/adapter%d/osd0", Adapter);
          int fd = open(FileName, O_RDWR);
          if (fd != -1) { //TODO treat the second path of the S2-6400 as a budget device
             close(fd);
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index ecd26edb8..82869df1f 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.19 2011/04/17 11:20:22 kls Exp $
+ * $Id: hdffcmd.c 1.20 2011/04/24 09:31:59 kls Exp $
  */
 
 #include "hdffcmd.h"
@@ -13,6 +13,25 @@
 #include <sys/ioctl.h>
 #include <vdr/tools.h>
 
+#if !defined OSD_RAW_CMD
+typedef struct osd_raw_cmd_s {
+    const void *cmd_data;
+    int cmd_len;
+    void *result_data;
+    int result_len;
+} osd_raw_cmd_t;
+
+typedef struct osd_raw_data_s {
+    const void *data_buffer;
+    int data_length;
+    int data_handle;
+} osd_raw_data_t;
+
+#define OSD_RAW_CMD            _IOWR('o', 162, osd_raw_cmd_t)
+#define OSD_RAW_DATA           _IOWR('o', 163, osd_raw_data_t)
+#endif
+
+
 namespace HDFF
 {
 
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 254f2af77..90d689722 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffosd.c 1.9 2011/04/17 11:20:22 kls Exp $
+ * $Id: hdffosd.c 1.10 2011/05/15 14:47:29 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -154,8 +154,12 @@ eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
     }
-    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    if (shown)
+    {
+        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+        shown = false;
+    }
     return cOsd::SetAreas(Areas, NumAreas);
 }
 
@@ -166,9 +170,13 @@ void cHdffOsd::SetActive(bool On)
         cOsd::SetActive(On);
         if (On)
         {
+            if (GetBitmap(0)) // only flush here if there are already bitmaps
+                Flush();
         }
         else if (shown)
         {
+            mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+            mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
             shown = false;
         }
     }
@@ -594,9 +602,13 @@ void cHdffOsdRaw::SetActive(bool On)
         cOsd::SetActive(On);
         if (On)
         {
+            if (GetBitmap(0)) // only flush here if there are already bitmaps
+                Flush();
         }
         else if (shown)
         {
+            mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+            mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
             shown = false;
         }
     }
@@ -623,8 +635,12 @@ eOsdError cHdffOsdRaw::SetAreas(const tArea *Areas, int NumAreas)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
     }
-    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    if (shown)
+    {
+        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+        shown = false;
+    }
     return cOsd::SetAreas(Areas, NumAreas);
 }
 
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
new file mode 100644
index 000000000..907f24370
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -0,0 +1,89 @@
+# VDR plugin language source file
+# Copyright (C) 2011 Andreas Regel
+# This file is distributed under the same license as the dvbhddevice package.
+# Christoph Haubrich, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR \n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2011-05-05 20:34+0200\n"
+"PO-Revision-Date: 2011-04-25 21:44+0200\n"
+"Last-Translator: Christoph Haubrich\n"
+"Language-Team: <see README>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Automatic"
+msgstr "automatisch"
+
+msgid "Letterbox 16/9"
+msgstr "Letterbox 16:9"
+
+msgid "Letterbox 14/9"
+msgstr "Letterbox 14:9"
+
+msgid "Pillarbox"
+msgstr "Pillarbox"
+
+msgid "CentreCutOut"
+msgstr "CentreCutOut"
+
+msgid "Always 16/9"
+msgstr "immer 16:9"
+
+msgid "Disabled"
+msgstr "abgeschaltet"
+
+msgid "Analogue only"
+msgstr "nur Analoge Ausgänge"
+
+msgid "Always"
+msgstr "immer"
+
+msgid "HDMI only"
+msgstr "nur HDMI"
+
+msgid "Follow resolution"
+msgstr "folge Auflösung"
+
+msgid "none"
+msgstr "keins"
+
+msgid "Resolution"
+msgstr "Auflösung"
+
+msgid "TV format"
+msgstr "TV-Format"
+
+msgid "Video Conversion"
+msgstr "Videokonvertierung"
+
+msgid "Analogue Video"
+msgstr "Analoges Video"
+
+msgid "Audio Delay (ms)"
+msgstr "Audio Verzögerung (ms)"
+
+msgid "Audio Downmix"
+msgstr "Audio Downmix"
+
+msgid "OSD Size"
+msgstr "OSD Größe"
+
+msgid "HDMI CEC"
+msgstr "HDMI CEC"
+
+msgid "Remote Control Protocol"
+msgstr "Fernbedienungsprotokoll"
+
+msgid "Remote Control Address"
+msgstr "Fernbedienungsadresse"
+
+msgid "High Level OSD"
+msgstr "High Level OSD"
+
+msgid "Allow True Color OSD"
+msgstr "Erlaube True Color OSD"
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index 3cb69b1b9..30365e0aa 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -3,88 +3,17 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c 1.11 2011/04/17 11:45:17 kls Exp $
+ * $Id: setup.c 1.12 2011/05/15 14:47:45 kls Exp $
  */
 
 #include "setup.h"
 #include "hdffcmd.h"
 
-const int kResolutions = 4;
-const int kTvFormats = 2;
-const int kVideoConversions = 6;
-const int kAnalogueVideos = 4;
-const int kAudioDownmixes = 5;
-const int kOsdSizes = 5;
-const int kRemoteProtocols = 3;
-
 const int kResolution1080i = 0;
 const int kResolution720p = 1;
 const int kResolution576p = 2;
 const int kResolution576i = 3;
 
-static const char * ResolutionItems[] =
-{
-    "1080i",
-    "720p",
-    "576p",
-    "576i",
-    NULL
-};
-
-static const char * TvFormatItems[] =
-{
-    "4/3",
-    "16/9",
-    NULL
-};
-
-static const char * VideoConversionItems[] =
-{
-    "Automatic",
-    "Letterbox 16/9",
-    "Letterbox 14/9",
-    "Pillarbox",
-    "CentreCutOut",
-    "Always 16/9",
-    NULL
-};
-
-static const char * AnalogueVideoItems[] =
-{
-    "Disabled",
-    "RGB",
-    "CVBS + YUV",
-    "YC (S-Video)",
-    NULL
-};
-
-static const char * AudioDownmixItems[] =
-{
-    "Disabled",
-    "Analogue only",
-    "Always",
-    "Automatic",
-    "HDMI only",
-    NULL
-};
-
-static const char * OsdSizeItems[] =
-{
-    "Follow resolution",
-    "1920x1080",
-    "1280x720",
-    "1024x576",
-    "720x576",
-    NULL
-};
-
-static const char * RemoteProtocolItems[] =
-{
-    "none",
-    "RC5",
-    "RC6",
-    NULL
-};
 
 cHdffSetup gHdffSetup;
 
@@ -162,7 +91,7 @@ void cHdffSetup::GetOsdSize(int &Width, int &Height, double &PixelAspect)
         Height = 576;
         PixelAspect = 4.0 / 3.0;
     }
-  PixelAspect /= double(Width) / Height;
+    PixelAspect /= double(Width) / Height;
 }
 
 HDFF::eHdmiVideoMode cHdffSetup::GetVideoMode(void)
@@ -183,21 +112,87 @@ HDFF::eHdmiVideoMode cHdffSetup::GetVideoMode(void)
 
 cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
 {
+    const int kResolutions = 4;
+    const int kTvFormats = 2;
+    const int kVideoConversions = 6;
+    const int kAnalogueVideos = 4;
+    const int kAudioDownmixes = 5;
+    const int kOsdSizes = 5;
+    const int kRemoteProtocols = 3;
+
+    static const char * ResolutionItems[kResolutions] =
+    {
+        "1080i",
+        "720p",
+        "576p",
+        "576i",
+    };
+
+    static const char * TvFormatItems[kTvFormats] =
+    {
+        "4/3",
+        "16/9",
+    };
+
+    static const char * VideoConversionItems[kVideoConversions] =
+    {
+        tr("Automatic"),
+        tr("Letterbox 16/9"),
+        tr("Letterbox 14/9"),
+        tr("Pillarbox"),
+        tr("CentreCutOut"),
+        tr("Always 16/9"),
+    };
+
+
+    static const char * AnalogueVideoItems[kAnalogueVideos] =
+    {
+        tr("Disabled"),
+        "RGB",
+        "CVBS + YUV",
+        "YC (S-Video)",
+    };
+
+    static const char * AudioDownmixItems[kAudioDownmixes] =
+    {
+        tr("Disabled"),
+        tr("Analogue only"),
+        tr("Always"),
+        tr("Automatic"),
+        tr("HDMI only"),
+    };
+
+    static const char * OsdSizeItems[kOsdSizes] =
+    {
+        tr("Follow resolution"),
+        "1920x1080",
+        "1280x720",
+        "1024x576",
+        "720x576",
+    };
+
+    static const char * RemoteProtocolItems[] =
+    {
+        tr("none"),
+        "RC5",
+        "RC6",
+    };
+
     mHdffCmdIf = pHdffCmdIf;
     mNewHdffSetup = gHdffSetup;
 
-    Add(new cMenuEditStraItem("Resolution", &mNewHdffSetup.Resolution, kResolutions, ResolutionItems));
-    Add(new cMenuEditStraItem("TV format", &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems));
-    Add(new cMenuEditStraItem("Video Conversion", &mNewHdffSetup.VideoConversion, kVideoConversions, VideoConversionItems));
-    Add(new cMenuEditStraItem("Analogue Video", &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
-    Add(new cMenuEditIntItem("Audio Delay (ms)", &mNewHdffSetup.AudioDelay, 0, 500));
-    Add(new cMenuEditStraItem("Audio Downmix", &mNewHdffSetup.AudioDownmix, kAudioDownmixes, AudioDownmixItems));
-    Add(new cMenuEditStraItem("Osd Size", &mNewHdffSetup.OsdSize, kOsdSizes, OsdSizeItems));
-    Add(new cMenuEditBoolItem("HDMI CEC", &mNewHdffSetup.CecEnabled));
-    Add(new cMenuEditStraItem("Remote Control Protocol", &mNewHdffSetup.RemoteProtocol, kRemoteProtocols, RemoteProtocolItems));
-    Add(new cMenuEditIntItem("Remote Control Address", &mNewHdffSetup.RemoteAddress, -1, 31));
-    Add(new cMenuEditBoolItem("High Level OSD", &mNewHdffSetup.HighLevelOsd));
-    Add(new cMenuEditBoolItem("Allow True Color OSD", &mNewHdffSetup.TrueColorOsd));
+    Add(new cMenuEditStraItem(tr("Resolution"), &mNewHdffSetup.Resolution, kResolutions, ResolutionItems));
+    Add(new cMenuEditStraItem(tr("TV format"), &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems));
+    Add(new cMenuEditStraItem(tr("Video Conversion"), &mNewHdffSetup.VideoConversion, kVideoConversions, VideoConversionItems));
+    Add(new cMenuEditStraItem(tr("Analogue Video"), &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
+    Add(new cMenuEditIntItem(tr("Audio Delay (ms)"), &mNewHdffSetup.AudioDelay, 0, 500));
+    Add(new cMenuEditStraItem(tr("Audio Downmix"), &mNewHdffSetup.AudioDownmix, kAudioDownmixes, AudioDownmixItems));
+    Add(new cMenuEditStraItem(tr("OSD Size"), &mNewHdffSetup.OsdSize, kOsdSizes, OsdSizeItems));
+    Add(new cMenuEditBoolItem(tr("HDMI CEC"), &mNewHdffSetup.CecEnabled));
+    Add(new cMenuEditStraItem(tr("Remote Control Protocol"), &mNewHdffSetup.RemoteProtocol, kRemoteProtocols, RemoteProtocolItems));
+    Add(new cMenuEditIntItem(tr("Remote Control Address"), &mNewHdffSetup.RemoteAddress, -1, 31));
+    Add(new cMenuEditBoolItem(tr("High Level OSD"), &mNewHdffSetup.HighLevelOsd));
+    Add(new cMenuEditBoolItem(tr("Allow True Color OSD"), &mNewHdffSetup.TrueColorOsd));
 }
 
 cHdffSetupPage::~cHdffSetupPage(void)
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index aa89feb62..55299767f 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.6 2011/02/27 10:04:54 kls Exp $
+# $Id: Makefile 1.7 2011/05/21 12:25:37 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 8671b1ee1..73e55bace 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.27 2010/09/19 12:43:33 kls Exp $
+ * $Id: dvbsdffdevice.c 2.29 2011/05/22 15:22:14 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -90,6 +90,11 @@ bool cDvbSdFfDevice::HasDecoder(void) const
   return true;
 }
 
+bool cDvbSdFfDevice::AvoidRecording(void) const
+{
+  return true;
+}
+
 cSpuDecoder *cDvbSdFfDevice::GetSpuDecoder(void)
 {
   if (!spuDecoder && IsPrimaryDevice())
@@ -772,22 +777,7 @@ bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
     0x13C21002, // Technotrend/Hauppauge WinTV DVB-S rev1.3 SE
     0x00000000
     };
-  cString FileName;
-  cReadLine ReadLine;
-  FILE *f = NULL;
-  uint32_t SubsystemId = 0;
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId = strtoul(s, NULL, 0) << 16;
-     fclose(f);
-     }
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId |= strtoul(s, NULL, 0);
-     fclose(f);
-     }
+  uint32_t SubsystemId = GetSubsystemId(Adapter, Frontend);
   for (uint32_t *sid = SubsystemIds; *sid; sid++) {
       if (*sid == SubsystemId) {
          dsyslog("creating cDvbSdFfDevice");
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index b382bf624..afe4727ed 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 2.11 2010/01/04 11:01:14 kls Exp $
+ * $Id: dvbsdffdevice.h 2.12 2011/05/21 12:56:49 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
@@ -23,6 +23,7 @@ class cDvbSdFfDevice : public cDvbDevice {
   cDvbSdFfDevice(int Adapter, int Frontend);
   virtual ~cDvbSdFfDevice();
   virtual bool HasDecoder(void) const;
+  virtual bool AvoidRecording(void) const;
 
 // SPU facilities
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index e9f06038b..b59d08ae0 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.6 2011/02/27 10:04:58 kls Exp $
+# $Id: Makefile 2.7 2011/05/21 12:25:41 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index f126a54f7..24e09efce 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index f15365253..af184b373 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 
 msgid "A friendly greeting"
 msgstr "P��telsk� pozdrav"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index deef349f9..6c1647ee0 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index f46e6f5ce..1536f1b33 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 msgid "A friendly greeting"
 msgstr "Ein freundlicher Gru�"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index 6ee9a3dff..ce921ee0c 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index e1997a8de..292f65247 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index d762ebc44..3cf2247de 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 1be796c14..a106a8b01 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 
 msgid "A friendly greeting"
 msgstr "Ystävällisin terveisin"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index db7003784..335df7523 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index 6ebf6e81d..c88e8328f 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-03-17 19:52+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
 
 msgid "A friendly greeting"
 msgstr "Prijateljska dobrodo�lica"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index 66dbc30a1..5b9f207d7 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index 7ff552f22..7ef310a86 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 
 msgid "A friendly greeting"
 msgstr "Un saluto cordiale"
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
index d1ddf8173..0ade0bd89 100644
--- a/PLUGINS/src/hello/po/lt_LT.po
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2009-12-08 12:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 
 msgid "A friendly greeting"
 msgstr "Draugiškas labas"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index b749cc39a..4dff540cf 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index b5f508b58..c566f531a 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index dfa80de45..e7aedf2fa 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index 429377cf9..dd0be173e 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index d964223e8..a5eb16a56 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index 59d8ad165..ee94c9290 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 
 msgid "A friendly greeting"
 msgstr "��������� �����������"
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
index f7347fd3f..b8ba7753b 100644
--- a/PLUGINS/src/hello/po/sk_SK.po
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2009-09-30 09:48+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 msgid "A friendly greeting"
 msgstr "Priate�sk� pozdrav"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index 20f001907..bbcf6b977 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index c51e5594b..4b4909fc3 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 
 msgid "A friendly greeting"
 msgstr ""
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index 269dbd990..a8705dacd 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-05-12 22:34:4800\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 
 msgid "A friendly greeting"
 msgstr "Dost�a selam"
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
index beafc4ae8..7793ed29c 100644
--- a/PLUGINS/src/hello/po/zh_CN.po
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2009-01-23 09:48+0800\n"
 "Last-Translator: senin\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 
 msgid "A friendly greeting"
 msgstr "友好的问候"
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index afdcc6165..456207bd4 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.6 2011/02/27 10:05:02 kls Exp $
+# $Id: Makefile 2.7 2011/05/21 12:25:45 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index 6e47101eb..f31fa0769 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 2d589f0be..0a175967a 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 54504312e..c6289d15d 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Patrice Staudt <ipatrice.staudt@laposte.net>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index a3ede6bac..f3858db09 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
index a06341757..9d877acc0 100644
--- a/PLUGINS/src/pictures/po/lt_LT.po
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.10\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2009-12-08 12:41+0100\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>, 2009\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Pictures"
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index dc1ba1230..6d38639e2 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2008-03-14 00:45+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
index a56c0d6c5..340aad1ee 100644
--- a/PLUGINS/src/pictures/po/sk_SK.po
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-15 15:08+0200\n"
 "PO-Revision-Date: 2009-09-30 12:54+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 msgid "Pictures"
 msgstr "Obr�zky"
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 9e3377f3a..90dfbb7df 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -88,3 +88,7 @@ VDR Plugin 'skincurses' Revision History
 2010-02-28: Version 0.1.9
 
 - Added Lithuanian language translations (thanks to Valdemaras Pipiras).
+
+2011-05-15: Version 0.1.10
+
+- Avoiding a gcc 4.6 compiler error (thanks to Tobias Grimm).
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index a7ba1cf3c..a765b654d 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.6 2011/02/27 10:05:05 kls Exp $
+# $Id: Makefile 2.7 2011/05/21 12:25:49 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -83,7 +83,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index 82edffc39..bff2411a8 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-21 14:36+0200\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 msgid "A text only skin"
 msgstr "Eine reine Text-Oberfl�che"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 0cefeefe0..c123a0b10 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-21 14:36+0200\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 
 msgid "A text only skin"
 msgstr "Tekstipohjainen ulkoasu"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index d72077130..5cecb65cc 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-21 14:36+0200\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 
 msgid "A text only skin"
 msgstr "Una interfaccia solo testo"
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index bb09d81da..16d2698c4 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-21 14:36+0200\n"
 "PO-Revision-Date: 2010-02-22 18:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 
 msgid "A text only skin"
 msgstr "Tekstinis apvalkalas"
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index fae8a62d6..b550f29cf 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-21 14:36+0200\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "X-Generator: KBabel 1.11.4\n"
 
 msgid "A text only skin"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index aad3e4409..e362f8e9f 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:43+0200\n"
+"POT-Creation-Date: 2011-05-21 14:36+0200\n"
 "PO-Revision-Date: 2009-09-30 12:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 msgid "A text only skin"
 msgstr "Iba text vzh�adu"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 84076cd4a..11fead5fa 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.5 2011/01/04 08:52:03 kls Exp $
+ * $Id: skincurses.c 2.6 2011/05/15 21:41:47 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.9";
+static const char *VERSION        = "0.1.10";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -26,7 +26,7 @@ class cCursesFont : public cFont {
   virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
   };
 
-static const cCursesFont Font;
+static const cCursesFont Font = cCursesFont(); // w/o the '= cCursesFont()' gcc 4.6 complains - can anybody explain why this is necessary?
 
 // --- cCursesOsd ------------------------------------------------------------
 
diff --git a/ci.c b/ci.c
index 6c7b03107..59d62efe8 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.6 2010/01/02 10:39:50 kls Exp $
+ * $Id: ci.c 2.7 2011/05/21 15:21:33 kls Exp $
  */
 
 #include "ci.h"
@@ -1894,9 +1894,9 @@ void cCamSlot::SetPid(int Pid, bool Active)
 }
 
 // see ISO/IEC 13818-1
-#define STREAM_TYPE_VIDEO  0x02
-#define STREAM_TYPE_AUDIO  0x04
-#define STREAM_TYPE_DOLBY  0x06
+#define STREAM_TYPE_VIDEO    0x02
+#define STREAM_TYPE_AUDIO    0x04
+#define STREAM_TYPE_PRIVATE  0x06
 
 void cCamSlot::AddChannel(const cChannel *Channel)
 {
@@ -1910,7 +1910,9 @@ void cCamSlot::AddChannel(const cChannel *Channel)
      for (const int *Apid = Channel->Apids(); *Apid; Apid++)
          AddPid(Channel->Sid(), *Apid, STREAM_TYPE_AUDIO);
      for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
-         AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_DOLBY);
+         AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_PRIVATE);
+     for (const int *Spid = Channel->Spids(); *Spid; Spid++)
+         AddPid(Channel->Sid(), *Spid, STREAM_TYPE_PRIVATE);
      }
 }
 
@@ -1931,7 +1933,9 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
      for (const int *Apid = Channel->Apids(); *Apid; Apid++)
          CaPmt.AddPid(*Apid, STREAM_TYPE_AUDIO);
      for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
-         CaPmt.AddPid(*Dpid, STREAM_TYPE_DOLBY);
+         CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
+     for (const int *Spid = Channel->Spids(); *Spid; Spid++)
+         CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE); 
      cas->SendPMT(&CaPmt);
      cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
      do {
diff --git a/config.c b/config.c
index 73b11b18c..6767b5c66 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.13 2010/06/06 10:06:43 kls Exp $
+ * $Id: config.c 2.14 2011/06/13 14:41:01 kls Exp $
  */
 
 #include "config.h"
@@ -395,7 +395,7 @@ cSetup::cSetup(void)
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
   CurrentDolby = 0;
-  InitialChannel = 0;
+  // InitialChannel is initialized by constructor
   InitialVolume = -1;
   ChannelsWrap = 0;
   EmergencyExit = 1;
@@ -404,6 +404,7 @@ cSetup::cSetup(void)
 cSetup& cSetup::operator= (const cSetup &s)
 {
   memcpy(&__BeginData__, &s.__BeginData__, (char *)&s.__EndData__ - (char *)&s.__BeginData__);
+  InitialChannel = s.InitialChannel;
   return *this;
 }
 
@@ -586,7 +587,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
   else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
-  else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = atoi(Value);
+  else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = Value;
   else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
   else if (!strcasecmp(Name, "ChannelsWrap"))        ChannelsWrap       = atoi(Value);
   else if (!strcasecmp(Name, "EmergencyExit"))       EmergencyExit      = atoi(Value);
diff --git a/config.h b/config.h
index e4ac2f2ad..f3421f7a8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.30 2011/03/13 12:02:31 kls Exp $
+ * $Id: config.h 2.32 2011/06/13 14:24:40 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.18"
-#define VDRVERSNUM   10718  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.19"
+#define VDRVERSNUM   10719  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.18"
-#define APIVERSNUM   10718  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.19"
+#define APIVERSNUM   10719  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -287,11 +287,11 @@ class cSetup : public cConfig<cSetupLine> {
   int CurrentChannel;
   int CurrentVolume;
   int CurrentDolby;
-  int InitialChannel;
   int InitialVolume;
   int ChannelsWrap;
   int EmergencyExit;
   int __EndData__;
+  cString InitialChannel;
   cSetup(void);
   cSetup& operator= (const cSetup &s);
   bool Load(const char *FileName);
diff --git a/device.c b/device.c
index 60340c06f..075999367 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.38 2011/02/25 15:12:03 kls Exp $
+ * $Id: device.c 2.41 2011/06/02 13:14:16 kls Exp $
  */
 
 #include "device.h"
@@ -286,10 +286,10 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
              imp <<= 1; imp |= ndr;                                                                                  // avoid devices if we need to detach existing receivers
-             imp <<= 1; imp |= device[i]->IsPrimaryDevice();                                                         // avoid the primary device
              imp <<= 1; imp |= NumUsableSlots ? 0 : device[i]->HasCi();                                              // avoid cards with Common Interface for FTA channels
-             imp <<= 1; imp |= device[i]->HasDecoder();                                                              // avoid full featured cards
+             imp <<= 1; imp |= device[i]->AvoidRecording();                                                          // avoid SD full featured cards
              imp <<= 1; imp |= NumUsableSlots ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
+             imp <<= 1; imp |= device[i]->IsPrimaryDevice();                                                         // avoid the primary device
              if (imp < Impact) {
                 // This device has less impact than any previous one, so we take it.
                 Impact = imp;
@@ -618,6 +618,16 @@ int cDevice::NumProvidedSystems(void) const
   return 0;
 }
 
+int cDevice::SignalStrength(void) const
+{
+  return -1;
+}
+
+int cDevice::SignalQuality(void) const
+{
+  return -1;
+}
+
 const cChannel *cDevice::GetCurrentlyTunedTransponder(void) const
 {
   return NULL;
diff --git a/device.h b/device.h
index a383dac6f..d937e5f05 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.24 2011/03/21 17:58:41 kls Exp $
+ * $Id: device.h 2.26 2011/06/02 13:15:31 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -197,6 +197,9 @@ class cDevice : public cThread {
          ///< Returns the number of this device (0 ... numDevices).
   virtual bool HasDecoder(void) const;
          ///< Tells whether this device has an MPEG decoder.
+  virtual bool AvoidRecording(void) const { return false; }
+         ///< Returns true if this device should only be used for recording
+         ///< if no other device is available.
 
 // Device hooks
 
@@ -250,6 +253,16 @@ class cDevice : public cThread {
          ///< actually provide channels must implement this function.
          ///< The result of this function is used when selecting a device, in order
          ///< to avoid devices that provide more than one system.
+  virtual int SignalStrength(void) const;
+         ///< Returns the "strength" of the currently received signal.
+         ///< This is a value in the range 0 (no signal at all) through
+         ///< 100 (best possible signal). A value of -1 indicates that this
+         ///< device has no concept of a "signal strength".
+  virtual int SignalQuality(void) const;
+         ///< Returns the "quality" of the currently received signal.
+         ///< This is a value in the range 0 (worst quality) through
+         ///< 100 (best possible quality). A value of -1 indicates that this
+         ///< device has no concept of a "signal quality".
   virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
          ///< Returns a pointer to the currently tuned transponder.
          ///< This is not one of the channels in the global cChannels list, but rather
diff --git a/diseqc.c b/diseqc.c
index 205444cdd..b65d82c6d 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.2 2010/02/06 15:43:31 kls Exp $
+ * $Id: diseqc.c 2.4 2011/05/22 10:36:12 kls Exp $
  */
 
 #include "diseqc.h"
@@ -59,7 +59,7 @@ bool cDiseqc::Parse(const char *s)
         polarization = char(toupper(polarization));
         if (polarization == 'V' || polarization == 'H' || polarization == 'L' || polarization == 'R') {
            parsing = true;
-           char *CurrentAction = NULL;
+           const char *CurrentAction = NULL;
            while (Execute(&CurrentAction) != daNone)
                  ;
            parsing = false;
@@ -75,7 +75,7 @@ bool cDiseqc::Parse(const char *s)
   return result;
 }
 
-char *cDiseqc::Wait(char *s)
+const char *cDiseqc::Wait(const char *s) const
 {
   char *p = NULL;
   errno = 0;
@@ -89,19 +89,22 @@ char *cDiseqc::Wait(char *s)
   return NULL;
 }
 
-char *cDiseqc::Codes(char *s)
+const char *cDiseqc::Codes(const char *s) const
 {
-  char *e = strchr(s, ']');
+  const char *e = strchr(s, ']');
   if (e) {
-     numCodes = 0;
-     char *t = s;
-     char *p = s;
+     int NumCodes = 0;
+     const char *t = s;
+     char *p;
      while (t < e) {
-           if (numCodes < MaxDiseqcCodes) {
+           if (NumCodes < MaxDiseqcCodes) {
               errno = 0;
               int n = strtol(t, &p, 16);
               if (!errno && p != t && 0 <= n && n <= 255) {
-                 codes[numCodes++] = uchar(n);
+                 if (parsing) {
+                    codes[NumCodes++] = uchar(n);
+                    numCodes = NumCodes;
+                    }
                  t = skipspace(p);
                  }
               else {
@@ -121,7 +124,7 @@ char *cDiseqc::Codes(char *s)
   return NULL;
 }
 
-cDiseqc::eDiseqcActions cDiseqc::Execute(char **CurrentAction)
+cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction) const
 {
   if (!*CurrentAction)
      *CurrentAction = commands;
@@ -146,10 +149,10 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(char **CurrentAction)
 
 cDiseqcs Diseqcs;
 
-cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization)
+const cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization) const
 {
   int Devices = 0;
-  for (cDiseqc *p = First(); p; p = Next(p)) {
+  for (const cDiseqc *p = First(); p; p = Next(p)) {
       if (p->Devices()) {
          Devices = p->Devices();
          continue;
@@ -157,7 +160,7 @@ cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization)
       if (Devices && !(Devices & (1 << Device - 1)))
          continue;
       if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization))
-        return p;
+         return p;
       }
   return NULL;
 }
diff --git a/diseqc.h b/diseqc.h
index 1b9a41d2c..413ed4d99 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 2.1 2010/02/06 15:14:42 kls Exp $
+ * $Id: diseqc.h 2.2 2011/05/22 10:35:38 kls Exp $
  */
 
 #ifndef __DISEQC_H
@@ -33,15 +33,15 @@ class cDiseqc : public cListObject {
   int lof;
   char *commands;
   bool parsing;
-  uchar codes[MaxDiseqcCodes];
-  int numCodes;
-  char *Wait(char *s);
-  char *Codes(char *s);
+  mutable uchar codes[MaxDiseqcCodes];
+  mutable int numCodes;
+  const char *Wait(const char *s) const;
+  const char *Codes(const char *s) const;
 public:
   cDiseqc(void);
   ~cDiseqc();
   bool Parse(const char *s);
-  eDiseqcActions Execute(char **CurrentAction);
+  eDiseqcActions Execute(const char **CurrentAction) const;
       // Parses the DiSEqC commands and returns the appropriate action code
       // with every call. CurrentAction must be the address of a character pointer,
       // which is initialized to NULL. This pointer is used internally while parsing
@@ -55,12 +55,12 @@ class cDiseqc : public cListObject {
   char Polarization(void) const { return polarization; }
   int Lof(void) const { return lof; }
   const char *Commands(void) const { return commands; }
-  uchar *Codes(int &NumCodes) { NumCodes = numCodes; return numCodes ? codes : NULL; }
+  const uchar *Codes(int &NumCodes) const { NumCodes = numCodes; return numCodes ? codes : NULL; }
   };
 
 class cDiseqcs : public cConfig<cDiseqc> {
 public:
-  cDiseqc *Get(int Device, int Source, int Frequency, char Polarization);
+  const cDiseqc *Get(int Device, int Source, int Frequency, char Polarization) const;
   };
 
 extern cDiseqcs Diseqcs;
diff --git a/dvbdevice.c b/dvbdevice.c
index f32b35008..b0750dd40 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.38 2010/05/01 09:47:13 kls Exp $
+ * $Id: dvbdevice.c 2.42 2011/06/11 14:34:24 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -253,12 +253,15 @@ bool cDvbTransponderParameters::Parse(const char *s)
 
 // --- cDvbTuner -------------------------------------------------------------
 
+#define TUNER_POLL_TIMEOUT  10 // ms
+
 class cDvbTuner : public cThread {
 private:
   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
   int device;
   int fd_frontend;
   int adapter, frontend;
+  uint32_t subsystemId;
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
@@ -269,16 +272,20 @@ class cDvbTuner : public cThread {
   cMutex mutex;
   cCondVar locked;
   cCondVar newSet;
-  bool GetFrontendStatus(fe_status_t &Status, int TimeoutMs = 0);
+  void ClearEventQueue(void) const;
+  bool GetFrontendStatus(fe_status_t &Status) const;
   bool SetFrontend(void);
   virtual void Action(void);
 public:
   cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
   virtual ~cDvbTuner();
   const cChannel *GetTransponder(void) const { return &channel; }
+  uint32_t SubsystemId(void) const { return subsystemId; }
   bool IsTunedTo(const cChannel *Channel) const;
   void Set(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
+  int GetSignalStrength(void) const;
+  int GetSignalQuality(void) const;
   };
 
 cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
@@ -288,6 +295,7 @@ cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_
   adapter = Adapter;
   frontend = Frontend;
   frontendType = FrontendType;
+  subsystemId = cDvbDeviceProbe::GetSubsystemId(adapter, frontend);
   tuneTimeout = 0;
   lockTimeout = 0;
   lastTimeoutReport = 0;
@@ -339,16 +347,19 @@ bool cDvbTuner::Locked(int TimeoutMs)
   return tunerStatus >= tsLocked;
 }
 
-bool cDvbTuner::GetFrontendStatus(fe_status_t &Status, int TimeoutMs)
+void cDvbTuner::ClearEventQueue(void) const
 {
-  if (TimeoutMs) {
-     cPoller Poller(fd_frontend);
-     if (Poller.Poll(TimeoutMs)) {
-        dvb_frontend_event Event;
-        while (ioctl(fd_frontend, FE_GET_EVENT, &Event) == 0)
-              ; // just to clear the event queue - we'll read the actual status below
-        }
+  cPoller Poller(fd_frontend);
+  if (Poller.Poll(TUNER_POLL_TIMEOUT)) {
+     dvb_frontend_event Event;
+     while (ioctl(fd_frontend, FE_GET_EVENT, &Event) == 0)
+           ; // just to clear the event queue - we'll read the actual status below
      }
+}
+
+bool cDvbTuner::GetFrontendStatus(fe_status_t &Status) const
+{
+  ClearEventQueue();
   while (1) {
         if (ioctl(fd_frontend, FE_READ_STATUS, &Status) != -1)
            return true;
@@ -358,6 +369,112 @@ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status, int TimeoutMs)
   return false;
 }
 
+//#define DEBUG_SIGNALSTRENGTH
+//#define DEBUG_SIGNALQUALITY
+
+int cDvbTuner::GetSignalStrength(void) const
+{
+  ClearEventQueue();
+  uint16_t Signal;
+  while (1) {
+        if (ioctl(fd_frontend, FE_READ_SIGNAL_STRENGTH, &Signal) != -1)
+           break;
+        if (errno != EINTR)
+           return -1;
+        }
+  uint16_t MaxSignal = 0xFFFF; // Let's assume the default is using the entire range.
+  // Use the subsystemId to identify individual devices in case they need
+  // special treatment to map their Signal value into the range 0...0xFFFF.
+  switch (subsystemId) {
+    case 0x13C21019: MaxSignal = 670; break; // TT-budget S2-3200 (DVB-S/DVB-S2)
+    }
+  int s = int(Signal) * 100 / MaxSignal;
+  if (s > 100)
+     s = 100;
+#ifdef DEBUG_SIGNALSTRENGTH
+  fprintf(stderr, "FE %d/%d: %08X S = %04X %04X %3d%%\n", adapter, frontend, subsystemId, MaxSignal, Signal, s);
+#endif
+  return s;
+}
+
+#define LOCK_THRESHOLD 5 // indicates that all 5 FE_HAS_* flags are set
+
+int cDvbTuner::GetSignalQuality(void) const
+{
+  fe_status_t Status;
+  if (GetFrontendStatus(Status)) {
+     // Actually one would expect these checks to be done from FE_HAS_SIGNAL to FE_HAS_LOCK, but some drivers (like the stb0899) are broken, so FE_HAS_LOCK is the only one that (hopefully) is generally reliable...
+     if ((Status & FE_HAS_LOCK) == 0) {
+        if ((Status & FE_HAS_SIGNAL) == 0)
+           return 0;
+        if ((Status & FE_HAS_CARRIER) == 0)
+           return 1;
+        if ((Status & FE_HAS_VITERBI) == 0)
+           return 2;
+        if ((Status & FE_HAS_SYNC) == 0)
+           return 3;
+        return 4;
+        }
+     bool HasSnr = true;
+     uint16_t Snr;
+     while (1) {
+           if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1)
+              break;
+           if (errno == EOPNOTSUPP) {
+              Snr = 0xFFFF;
+              HasSnr = false;
+              break;
+              }
+           if (errno != EINTR)
+              return -1;
+           }
+     bool HasBer = true;
+     uint32_t Ber;
+     while (1) {
+           if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1)
+              break;
+           if (errno == EOPNOTSUPP) {
+              Ber = 0;
+              HasBer = false;
+              break;
+              }
+           if (errno != EINTR)
+              return -1;
+           }
+     bool HasUnc = true;
+     uint32_t Unc;
+     while (1) {
+           if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1)
+              break;
+           if (errno == EOPNOTSUPP) {
+              Unc = 0;
+              HasUnc = false;
+              break;
+              }
+           if (errno != EINTR)
+              return -1;
+           }
+     uint16_t MaxSnr = 0xFFFF; // Let's assume the default is using the entire range.
+     // Use the subsystemId to identify individual devices in case they need
+     // special treatment to map their Snr value into the range 0...0xFFFF.
+     switch (subsystemId) {
+       case 0x13C21019: MaxSnr = 200; break; // TT-budget S2-3200 (DVB-S/DVB-S2)
+       }
+     int a = int(Snr) * 100 / MaxSnr;
+     int b = 100 - (Unc * 10 + (Ber / 256) * 5);
+     if (b < 0)
+        b = 0;
+     int q = LOCK_THRESHOLD + a * b * (100 - LOCK_THRESHOLD) / 100 / 100;
+     if (q > 100)
+        q = 100;
+#ifdef DEBUG_SIGNALQUALITY
+     fprintf(stderr, "FE %d/%d: %08X Q = %04X %04X %5d %5d %3d%%\n", adapter, frontend, subsystemId, MaxSnr, Snr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
+#endif
+     return q;
+     }
+  return -1;
+}
+
 static unsigned int FrequencyToHz(unsigned int f)
 {
   while (f && f < 1000000)
@@ -392,11 +509,11 @@ bool cDvbTuner::SetFrontend(void)
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
      unsigned int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
-        cDiseqc *diseqc = Diseqcs.Get(device, channel.Source(), channel.Frequency(), dtp.Polarization());
+        const cDiseqc *diseqc = Diseqcs.Get(device, channel.Source(), channel.Frequency(), dtp.Polarization());
         if (diseqc) {
            if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
               cDiseqc::eDiseqcActions da;
-              for (char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
+              for (const char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
                   switch (da) {
                     case cDiseqc::daNone:      break;
                     case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
@@ -407,7 +524,7 @@ bool cDvbTuner::SetFrontend(void)
                     case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
                     case cDiseqc::daCodes: {
                          int n = 0;
-                         uchar *codes = diseqc->Codes(n);
+                         const uchar *codes = diseqc->Codes(n);
                          if (codes) {
                             struct dvb_diseqc_master_cmd cmd;
                             cmd.msg_len = min(n, int(sizeof(cmd.msg)));
@@ -504,9 +621,9 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
      SETCMD(DTV_INVERSION, dtp.Inversion());
      SETCMD(DTV_MODULATION, dtp.Modulation());
-     
+
      tuneTimeout = ATSC_TUNE_TIMEOUT;
-     lockTimeout = ATSC_LOCK_TIMEOUT;     
+     lockTimeout = ATSC_LOCK_TIMEOUT;
      }
   else {
      esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
@@ -527,7 +644,7 @@ void cDvbTuner::Action(void)
   fe_status_t Status = (fe_status_t)0;
   while (Running()) {
         fe_status_t NewStatus;
-        if (GetFrontendStatus(NewStatus, 10))
+        if (GetFrontendStatus(NewStatus))
            Status = NewStatus;
         cMutexLock MutexLock(&mutex);
         switch (tunerStatus) {
@@ -936,7 +1053,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
 
-  if (ProvidesTransponder(Channel)) {
+  if (dvbTuner && ProvidesTransponder(Channel)) {
      result = hasPriority;
      if (Priority >= 0 && Receiving(true)) {
         if (dvbTuner->IsTunedTo(Channel)) {
@@ -969,19 +1086,30 @@ int cDvbDevice::NumProvidedSystems(void) const
   return numProvidedSystems;
 }
 
+int cDvbDevice::SignalStrength(void) const
+{
+  return dvbTuner ? dvbTuner->GetSignalStrength() : -1;
+}
+
+int cDvbDevice::SignalQuality(void) const
+{
+  return dvbTuner ? dvbTuner->GetSignalQuality() : -1;
+}
+
 const cChannel *cDvbDevice::GetCurrentlyTunedTransponder(void) const
 {
-  return dvbTuner->GetTransponder(); 
+  return dvbTuner ? dvbTuner->GetTransponder() : NULL;
 }
 
 bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
 {
-  return dvbTuner->IsTunedTo(Channel);
+  return dvbTuner ? dvbTuner->IsTunedTo(Channel) : false;
 }
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  dvbTuner->Set(Channel);
+  if (dvbTuner)
+     dvbTuner->Set(Channel);
   return true;
 }
 
@@ -1036,3 +1164,24 @@ cDvbDeviceProbe::~cDvbDeviceProbe()
 {
   DvbDeviceProbes.Del(this, false);
 }
+
+uint32_t cDvbDeviceProbe::GetSubsystemId(int Adapter, int Frontend)
+{
+  cString FileName;
+  cReadLine ReadLine;
+  FILE *f = NULL;
+  uint32_t SubsystemId = 0;
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId = strtoul(s, NULL, 0) << 16;
+     fclose(f);
+     }
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId |= strtoul(s, NULL, 0);
+     fclose(f);
+     }
+  return SubsystemId;
+}
diff --git a/dvbdevice.h b/dvbdevice.h
index ff606fd4a..0962548c5 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.14 2010/04/11 10:29:37 kls Exp $
+ * $Id: dvbdevice.h 2.15 2011/06/02 13:20:05 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -141,6 +141,8 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
   virtual int NumProvidedSystems(void) const;
+  virtual int SignalStrength(void) const;
+  virtual int SignalQuality(void) const;
   virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
   virtual bool IsTunedToTransponder(const cChannel *Channel);
 protected:
@@ -196,6 +198,7 @@ class cDvbDeviceProbe : public cListObject {
 public:
   cDvbDeviceProbe(void);
   virtual ~cDvbDeviceProbe();
+  static uint32_t GetSubsystemId(int Adapter, int Frontend);
   virtual bool Probe(int Adapter, int Frontend) = 0;
      ///< Probes for a DVB device at the given Adapter and creates the appropriate
      ///< object derived from cDvbDevice if applicable.
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 59f636a35..06a58c0ae 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 2.1 2010/11/01 15:24:31 kls Exp $
+ *   $Id: descriptor.c 2.2 2011/06/15 21:26:00 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -643,6 +643,33 @@ void ServiceIdentifierDescriptor::Parse() {
    textualServiceIdentifier.setData(data+sizeof(descr_service_identifier), getLength()-sizeof(descr_service_identifier));
 }
 
+void ContentIdentifierDescriptor::Parse() {
+   identifierLoop.setData(data+sizeof(descr_content_identifier), getLength()-sizeof(descr_content_identifier));
+}
+
+void ContentIdentifierDescriptor::Identifier::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const content_identifier_entry>(s, offset);
+   if (s->crid_location == 0) {
+     identifier.setData(data+(offset-1), s->crid_length);
+   }
+   else {
+      identifier.setData(data+(offset-1), 2);
+   }
+}
+
+int ContentIdentifierDescriptor::Identifier::getCridType() const {
+   return s->crid_type;
+}
+
+int ContentIdentifierDescriptor::Identifier::getCridLocation() const {
+   return s->crid_location;
+}
+
+void DefaultAuthorityDescriptor::Parse() {
+   DefaultAuthority.setData(data+sizeof(descr_default_authority), getLength()-sizeof(descr_default_authority));
+}
+
 void MultilingualNameDescriptor::Parse() {
    nameLoop.setData(data+sizeof(descr_multilingual_network_name), getLength()-sizeof(descr_multilingual_network_name));
 }
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 4f2e41b6a..f105f7a0e 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 2.1 2010/11/01 15:24:32 kls Exp $
+ *   $Id: descriptor.h 2.2 2011/06/15 21:26:00 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -361,6 +361,31 @@ class ServiceIdentifierDescriptor : public Descriptor {
    virtual void Parse();
 };
 
+class ContentIdentifierDescriptor : public Descriptor {
+public:
+   class Identifier : public LoopElement {
+   public:
+      String identifier;
+      int getCridType() const;
+      int getCridLocation() const;
+      virtual int getLength() { return sizeof(content_identifier_entry)+identifier.getLength(); }
+   protected:
+      virtual void Parse();
+   private:
+      const content_identifier_entry *s;
+   };
+   StructureLoop<Identifier> identifierLoop;
+protected:
+   virtual void Parse();
+};
+
+class DefaultAuthorityDescriptor : public Descriptor {
+public:
+   String DefaultAuthority; //ID
+protected:
+   virtual void Parse();
+};
+
 //abstract base class
 class MultilingualNameDescriptor : public Descriptor {
 public:
diff --git a/libsi/headers.h b/libsi/headers.h
index 3ec35def3..6867d2c95 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 2.1 2010/11/01 15:24:32 kls Exp $
+ *   $Id: headers.h 2.2 2011/06/15 21:26:00 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -1680,6 +1680,24 @@ struct descr_content_identifier {
    u_char descriptor_length                      :8;
 };
 
+struct content_identifier_entry {
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char crid_type                              :6;
+   u_char crid_location                          :2;
+#else
+   u_char crid_location                          :2;
+   u_char crid_type                              :6;
+#endif
+  union {
+    u_char crid_length                           :8;
+    u_char crid_ref_hi                           :8;
+  };
+  union {
+    u_char crid_byte                             :8;
+    u_char crid_ref_lo                           :8;
+  };
+};
+
 /* 0x77 time_slice_fec_identifier_descriptor (ETSI EN 301 192) */
 
 struct descr_time_slice_fec_identifier {
diff --git a/libsi/si.c b/libsi/si.c
index 399117869..840b3a1f7 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.3 2010/11/01 15:24:32 kls Exp $
+ *   $Id: si.c 2.4 2011/06/15 21:26:00 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -609,6 +609,12 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case RegistrationDescriptorTag:
             d=new RegistrationDescriptor();
             break;
+         case ContentIdentifierDescriptorTag:
+            d=new ContentIdentifierDescriptor();
+            break;
+         case DefaultAuthorityDescriptorTag:
+            d=new DefaultAuthorityDescriptor();
+            break;
 
          //note that it is no problem to implement one
          //of the unimplemented descriptors.
@@ -650,10 +656,8 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case TransportStreamDescriptorTag:
 
          //defined in ETSI EN 300 468 v 1.7.1
-         case DefaultAuthorityDescriptorTag:
          case RelatedContentDescriptorTag:
          case TVAIdDescriptorTag:
-         case ContentIdentifierDescriptorTag:
          case TimeSliceFecIdentifierDescriptorTag:
          case ECMRepetitionRateDescriptorTag:
          case EnhancedAC3DescriptorTag:
diff --git a/menuitems.c b/menuitems.c
index 3a5a086b0..bc04e72c8 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.8 2010/12/12 13:41:09 kls Exp $
+ * $Id: menuitems.c 2.9 2011/06/13 14:48:41 kls Exp $
  */
 
 #include "menuitems.h"
@@ -713,7 +713,19 @@ void cMenuEditStraItem::Set(void)
 cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value, const char *NoneString)
 :cMenuEditIntItem(Name, Value, NoneString ? 0 : 1, Channels.MaxNumber())
 {
+  channelID = NULL;
   noneString = NoneString;
+  dummyValue = 0;
+  Set();
+}
+
+cMenuEditChanItem::cMenuEditChanItem(const char *Name, cString *ChannelID, const char *NoneString)
+:cMenuEditIntItem(Name, &dummyValue, NoneString ? 0 : 1, Channels.MaxNumber())
+{
+  channelID = ChannelID;
+  noneString = NoneString;
+  cChannel *channel = Channels.GetByChannelID(tChannelID::FromString(*ChannelID));
+  dummyValue = channel ? channel->Number() : 0;
   Set();
 }
 
@@ -744,6 +756,8 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
                       *value = channel->Number();
                    else if (delta < 0 && noneString)
                       *value = 0;
+                   if (channelID)
+                      *channelID = channel ? channel->GetChannelID().ToString() : "";
                    Set();
                  }
                  break;
diff --git a/menuitems.h b/menuitems.h
index 6e8f1082f..a6f27438d 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.4 2010/06/06 10:32:38 kls Exp $
+ * $Id: menuitems.h 2.5 2011/06/13 13:46:03 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -133,9 +133,12 @@ class cMenuEditStraItem : public cMenuEditIntItem {
 class cMenuEditChanItem : public cMenuEditIntItem {
 protected:
   const char *noneString;
+  int dummyValue;
+  cString *channelID;
   virtual void Set(void);
 public:
   cMenuEditChanItem(const char *Name, int *Value, const char *NoneString = NULL);
+  cMenuEditChanItem(const char *Name, cString *ChannelID, const char *NoneString = NULL);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/osd.c b/osd.c
index d4e095a2e..49b655aa3 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.21 2011/04/17 14:25:07 kls Exp $
+ * $Id: osd.c 2.22 2011/06/02 12:00:17 kls Exp $
  */
 
 #include "osd.h"
@@ -594,9 +594,10 @@ void cBitmap::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
      x2 = min(x2, width - 1);
      y2 = min(y2, height - 1);
      tIndex c = Index(Color);
-     for (int y = y1; y <= y2; y++)
+     for (int y = y1; y <= y2; y++) {
          for (int x = x1; x <= x2; x++)
              SetIndex(x, y, c);
+         }
      }
 }
 
diff --git a/po/ar.po b/po/ar.po
index c779c990b..3c31613d9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-12-24 12:35+0100\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,1249,-1\n"
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-Country: LIBYA\n"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index f5117f0f7..835f93d37 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 664d3c247..e6ebdfd91 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatný kanál ***"
diff --git a/po/da_DK.po b/po/da_DK.po
index ce6c57fc1..c8379864f 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
diff --git a/po/de_DE.po b/po/de_DE.po
index d2d1a8646..75dc3a652 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
diff --git a/po/el_GR.po b/po/el_GR.po
index c079e9f18..a35fa3b4c 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
diff --git a/po/es_ES.po b/po/es_ES.po
index cd0426ac4..88b693e92 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
diff --git a/po/et_EE.po b/po/et_EE.po
index ff459c883..8c8ad1fc0 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 7df008290..1b06c3f29 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 02bad4e16..68a581c0b 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Cha�ne invalide ! ***"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 66e95dd27..69104b465 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Program ***"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index e9b5025cd..b7cf1a7bf 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** �rv�nytelen csatorna ***"
diff --git a/po/it_IT.po b/po/it_IT.po
index a17e7a3e7..24e541299 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 310f29aef..a8dfcb945 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Blogi kanalo nustatymai ***"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 8e54f15d9..c9d348131 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
 "X-Generator: KBabel 1.11.4\n"
 
 msgid "*** Invalid Channel ***"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 220ff78e1..66febc50e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 7c60d299b..a49ab6b89 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 1d4af936c..e56f3bf93 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ee806ce26..2eae063b4 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal inv�lido ***"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index c55239c4d..cd1a4d081 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2115008c3..57210f0bb 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index d5335c2ef..a8faa761a 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-06-06 12:52+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 90cf05812..2e6667d0d 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 9a20687a2..c57dc2b7d 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-02-20 19:02+0100\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Kanal ***"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index db251ab6f..41b6592cf 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 2f44ecdd2..b0ad00f39 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 515174a26..f316e29a6 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ea002687..11ccd840f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2010-10-24 16:26+0200\n"
+"POT-Creation-Date: 2011-05-21 14:26+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/recorder.c b/recorder.c
index f7c3fb03d..2738c97c0 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.9 2010/12/27 11:35:46 kls Exp $
+ * $Id: recorder.c 2.11 2011/06/12 14:16:45 kls Exp $
  */
 
 #include "recorder.h"
@@ -31,7 +31,7 @@ cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority
 
   SpinUpDisk(FileName);
 
-  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE, true, "Recorder");
+  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE, true, "Recorder");
   ringBuffer->SetTimeouts(0, 100);
 
   int Pid = Channel->Vpid();
@@ -119,6 +119,8 @@ void cRecorder::Action(void)
   time_t t = time(NULL);
   bool InfoWritten = false;
   bool FirstIframeSeen = false;
+  int FileNumber = 0;
+  off_t FrameOffset = -1;
   while (Running()) {
         int r;
         uchar *b = ringBuffer->Get(r);
@@ -131,7 +133,7 @@ void cRecorder::Action(void)
                  if (!InfoWritten) {
                     cRecordingInfo RecordingInfo(recordingName);
                     if (RecordingInfo.Read()) {
-                       if (frameDetector->FramesPerSecond() > 0 && !DoubleEqual(RecordingInfo.FramesPerSecond(), frameDetector->FramesPerSecond())) {
+                       if (frameDetector->FramesPerSecond() > 0 && DoubleEqual(RecordingInfo.FramesPerSecond(), DEFAULTFRAMESPERSECOND) && !DoubleEqual(RecordingInfo.FramesPerSecond(), frameDetector->FramesPerSecond())) {
                           RecordingInfo.SetFramesPerSecond(frameDetector->FramesPerSecond());
                           RecordingInfo.Write();
                           Recordings.UpdateByName(recordingName);
@@ -139,12 +141,16 @@ void cRecorder::Action(void)
                        }
                     InfoWritten = true;
                     }
+                 if (frameDetector->NewPayload()) {
+                    FileNumber = fileName->Number();
+                    FrameOffset = fileSize;
+                    }
                  if (FirstIframeSeen || frameDetector->IndependentFrame()) {
                     FirstIframeSeen = true; // start recording with the first I-frame
                     if (!NextFile())
                        break;
                     if (index && frameDetector->NewFrame())
-                       index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
+                       index->Write(frameDetector->IndependentFrame(), FileNumber, FrameOffset);
                     if (frameDetector->IndependentFrame()) {
                        recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
                        fileSize += TS_SIZE;
diff --git a/recording.c b/recording.c
index d4cf9c347..a8b40f2d3 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.30 2011/04/17 13:53:11 kls Exp $
+ * $Id: recording.c 2.31 2011/06/12 13:04:28 kls Exp $
  */
 
 #include "recording.h"
@@ -1403,11 +1403,12 @@ void cIndexFileGenerator::Action(void)
   bool Rewind = false;
   cFileName FileName(recordingName, false);
   cUnbufferedFile *ReplayFile = FileName.Open();
-  cRingBufferLinear Buffer(IFG_BUFFER_SIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE);
+  cRingBufferLinear Buffer(IFG_BUFFER_SIZE, TS_SIZE);
   cPatPmtParser PatPmtParser;
   cFrameDetector FrameDetector;
   cIndexFile IndexFile(recordingName, true);
   int BufferChunks = KILOBYTE(1); // no need to read a lot at the beginning when parsing PAT/PMT
+  int FileNumber = 0;
   off_t FileSize = 0;
   off_t FrameOffset = -1;
   Skins.QueueMessage(mtInfo, tr("Regenerating index file"));
@@ -1424,12 +1425,18 @@ void cIndexFileGenerator::Action(void)
         if (Data) {
            if (FrameDetector.Synced()) {
               // Step 3 - generate the index:
-              if (TsPid(Data) == PATPID)
+              if (FrameOffset < 0 && TsPid(Data) == PATPID) {
+                 FileNumber = FileName.Number();
                  FrameOffset = FileSize; // the PAT/PMT is at the beginning of an I-frame
+                 }
               int Processed = FrameDetector.Analyze(Data, Length);
               if (Processed > 0) {
+                 if (FrameDetector.NewPayload() && FrameOffset < 0) {
+                    FileNumber = FileName.Number();
+                    FrameOffset = FileSize;
+                    }
                  if (FrameDetector.NewFrame()) {
-                    IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize);
+                    IndexFile.Write(FrameDetector.IndependentFrame(), FileNumber, FrameOffset);
                     FrameOffset = -1;
                     }
                  FileSize += Processed;
diff --git a/remux.c b/remux.c
index f7ef87a95..c3f07fb70 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.53 2011/03/20 10:21:14 kls Exp $
+ * $Id: remux.c 2.57 2011/06/12 14:24:09 kls Exp $
  */
 
 #include "remux.h"
@@ -12,6 +12,7 @@
 #include "libsi/si.h"
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
+#include "recording.h"
 #include "shutdown.h"
 #include "tools.h"
 
@@ -781,7 +782,8 @@ cFrameDetector::cFrameDetector(int Pid, int Type)
 {
   SetPid(Pid, Type);
   synced = false;
-  newFrame = independentFrame = false;
+  newPayload = newFrame = independentFrame = false;
+  frameTypeOffset = -1;
   numPtsValues = 0;
   numFrames = 0;
   numIFrames = 0;
@@ -808,7 +810,8 @@ void cFrameDetector::SetPid(int Pid, int Type)
 
 void cFrameDetector::Reset(void)
 {
-  newFrame = independentFrame = false;
+  newPayload = newFrame = independentFrame = false;
+  frameTypeOffset = -1;
   payloadUnitOfFrame = 0;
   scanning = false;
   scanner = EMPTY_SCANNER;
@@ -816,9 +819,8 @@ void cFrameDetector::Reset(void)
 
 int cFrameDetector::Analyze(const uchar *Data, int Length)
 {
-  int SeenPayloadStart = false;
   int Processed = 0;
-  newFrame = independentFrame = false;
+  newPayload = newFrame = independentFrame = false;
   while (Length >= TS_SIZE) {
         if (Data[0] != TS_SYNC_BYTE) {
            int Skipped = 1;
@@ -831,16 +833,13 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
            int Pid = TsPid(Data);
            if (Pid == pid) {
               if (TsPayloadStart(Data)) {
-                 SeenPayloadStart = true;
                  if (synced && Processed)
-                    return Processed;
-                 if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
-                    return Processed; // need more data, in case the frame type is not stored in the first TS packet
+                    return Processed; // flush everything before this new payload
                  if (framesPerSecond <= 0.0) {
                     // frame rate unknown, so collect a sequence of PTS values:
                     if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
                        const uchar *Pes = Data + TsPayloadOffset(Data);
-                       if (PesHasPts(Pes)) {
+                       if (numIFrames && PesHasPts(Pes)) {
                           ptsValues[numPtsValues] = PesGetPts(Pes);
                           // check for rollover:
                           if (numPtsValues && ptsValues[numPtsValues - 1] > 0xF0000000 && ptsValues[numPtsValues] < 0x10000000) {
@@ -885,8 +884,8 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                              else
                                 framesPerSecond = 60.0 / 1.001;
                           else {
-                             framesPerSecond = 25.0;
-                             dsyslog("unknown frame delta (%d), assuming 25 fps", Delta);
+                             framesPerSecond = DEFAULTFRAMESPERSECOND;
+                             dsyslog("unknown frame delta (%d), assuming %5.2f fps", Delta, DEFAULTFRAMESPERSECOND);
                              }
                           }
                        else // audio
@@ -900,6 +899,10 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
               if (scanning) {
                  int PayloadOffset = TsPayloadOffset(Data);
                  if (TsPayloadStart(Data)) {
+                    if (synced && Processed)
+                       return Processed; // flush everything before this new payload
+                    newPayload = true;
+                    scanner = EMPTY_SCANNER;
                     PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
                     if (!framesPerPayloadUnit)
                        framesPerPayloadUnit = framesInPayloadUnit;
@@ -907,17 +910,30 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        dbgframes("/");
                     }
                  for (int i = PayloadOffset; scanning && i < TS_SIZE; i++) {
-                     scanner <<= 8;
-                     scanner |= Data[i];
+                     if (frameTypeOffset < 0) {
+                        scanner <<= 8;
+                        scanner |= Data[i];
+                        }
+                     else
+                        frameTypeOffset += PayloadOffset;
                      switch (type) {
                        case 0x01: // MPEG 1 video
                        case 0x02: // MPEG 2 video
                             if (scanner == 0x00000100) { // Picture Start Code
+                               if (frameTypeOffset < 0) {
+                                  frameTypeOffset = i + 2;
+                                  if (frameTypeOffset >= TS_SIZE) { // the byte to check is in the next TS packet
+                                     frameTypeOffset -= TS_SIZE;
+                                     if (!synced)
+                                        dbgframes("%d>", frameTypeOffset);
+                                     break;
+                                     }
+                                  }
                                scanner = EMPTY_SCANNER;
-                               if (synced && !SeenPayloadStart && Processed)
-                                  return Processed; // flush everything before this new frame
                                newFrame = true;
-                               independentFrame = ((Data[i + 2] >> 3) & 0x07) == 1; // I-Frame
+                               uchar FrameType = (Data[frameTypeOffset] >> 3) & 0x07;
+                               frameTypeOffset = -1;
+                               independentFrame = FrameType == 1; // I-Frame
                                if (synced) {
                                   if (framesPerPayloadUnit <= 1)
                                      scanning = false;
@@ -928,7 +944,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                      numIFrames++;
                                   if (numIFrames == 1)
                                      numFrames++;
-                                  dbgframes("%d ", (Data[i + 2] >> 3) & 0x07);
+                                  dbgframes("%u ", FrameType);
                                   }
                                if (synced)
                                   return Processed + TS_SIZE; // flag this new frame
@@ -936,11 +952,20 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                             break;
                        case 0x1B: // MPEG 4 video
                             if (scanner == 0x00000109) { // Access Unit Delimiter
+                               if (frameTypeOffset < 0) {
+                                  frameTypeOffset = i + 1;
+                                  if (frameTypeOffset >= TS_SIZE) { // the byte to check is in the next TS packet
+                                     frameTypeOffset -= TS_SIZE;
+                                     if (!synced)
+                                        dbgframes("%d>", frameTypeOffset);
+                                     break;
+                                     }
+                                  }
                                scanner = EMPTY_SCANNER;
-                               if (synced && !SeenPayloadStart && Processed)
-                                  return Processed; // flush everything before this new frame
                                newFrame = true;
-                               independentFrame = Data[i + 1] == 0x10;
+                               uchar FrameType = Data[frameTypeOffset];
+                               frameTypeOffset = -1;
+                               independentFrame = FrameType == 0x10;
                                if (synced) {
                                   if (framesPerPayloadUnit < 0) {
                                      payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
@@ -958,7 +983,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                      numIFrames++;
                                   if (numIFrames == 1)
                                      numFrames++;
-                                  dbgframes("%02X ", Data[i + 1]);
+                                  dbgframes("%02X ", FrameType);
                                   }
                                if (synced)
                                   return Processed + TS_SIZE; // flag this new frame
diff --git a/remux.h b/remux.h
index 60a9a578f..3204bb41a 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.28 2011/03/19 16:52:46 kls Exp $
+ * $Id: remux.h 2.30 2011/06/12 12:49:17 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -84,15 +84,18 @@ inline bool TsIsScrambled(const uchar *p)
 
 inline int TsPayloadOffset(const uchar *p)
 {
-  int o = (p[3] & TS_ADAPT_FIELD_EXISTS) ? p[4] + 5 : 4;
+  int o = TsHasAdaptationField(p) ? p[4] + 5 : 4;
   return o <= TS_SIZE ? o : TS_SIZE;
 }
 
 inline int TsGetPayload(const uchar **p)
 {
-  int o = TsPayloadOffset(*p);
-  *p += o;
-  return TS_SIZE - o;
+  if (TsHasPayload(*p)) {
+     int o = TsPayloadOffset(*p);
+     *p += o;
+     return TS_SIZE - o;
+     }
+  return 0;
 }
 
 inline int TsContinuityCounter(const uchar *p)
@@ -294,7 +297,7 @@ class cTsToPes {
   ~cTsToPes();
   void PutTs(const uchar *Data, int Length);
        ///< Puts the payload data of the single TS packet at Data into the converter.
-       ///< Length is always 188.
+       ///< Length is always TS_SIZE.
        ///< If the given TS packet starts a new PES payload packet, the converter
        ///< will be automatically reset. Any packets before the first one that starts
        ///< a new PES payload packet will be ignored.
@@ -333,16 +336,16 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 // Frame detector:
 
-#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 2
-
 class cFrameDetector {
 private:
   enum { MaxPtsValues = 150 };
   int pid;
   int type;
   bool synced;
+  bool newPayload;
   bool newFrame;
   bool independentFrame;
+  int frameTypeOffset;
   uint32_t ptsValues[MaxPtsValues]; // 32 bit is enough - we only need the delta
   int numPtsValues;
   int numFrames;
@@ -368,12 +371,17 @@ class cFrameDetector {
       ///< the frame detector for actual work.
   int Analyze(const uchar *Data, int Length);
       ///< Analyzes the TS packets pointed to by Data. Length is the number of
-      ///< bytes Data points to, and must be a multiple of 188.
+      ///< bytes Data points to, and must be a multiple of TS_SIZE.
       ///< Returns the number of bytes that have been analyzed.
       ///< If the return value is 0, the data was not sufficient for analyzing and
       ///< Analyze() needs to be called again with more actual data.
   bool Synced(void) { return synced; }
       ///< Returns true if the frame detector has synced on the data stream.
+  bool NewPayload(void) { return newPayload; }
+      ///< Returns true if the data given to the last call to Analyze() started a
+      ///< new payload. The caller should remember the current file offset in
+      ///< order to be able to generate an index entry later, when NewFrame()
+      ///< returns true.
   bool NewFrame(void) { return newFrame; }
       ///< Returns true if the data given to the last call to Analyze() started a
       ///< new frame.
diff --git a/skinsttng.c b/skinsttng.c
index 9bd1b15c1..169488a3d 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.7 2011/02/20 13:02:49 kls Exp $
+ * $Id: skinsttng.c 2.10 2011/06/12 15:20:59 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -92,6 +92,8 @@ THEME_CLR(Theme, clrChannelEpgTitle,        clrCyan);
 THEME_CLR(Theme, clrChannelEpgShortText,    clrYellow);
 THEME_CLR(Theme, clrChannelTimebarSeen,     clrYellow);
 THEME_CLR(Theme, clrChannelTimebarRest,     clrGray50);
+THEME_CLR(Theme, clrChannelSignalValue,     clrGreen);
+THEME_CLR(Theme, clrChannelSignalRest,      clrRed);
 THEME_CLR(Theme, clrMenuFrame,              clrYellow);
 THEME_CLR(Theme, clrMenuTitle,              clrBlack);
 THEME_CLR(Theme, clrMenuDate,               clrBlack);
@@ -134,6 +136,10 @@ class cSkinSTTNGDisplayChannel : public cSkinDisplayChannel {
   const cEvent *present;
   cString lastDate;
   int lastSeen;
+  int lastDeviceNumber;
+  int lastSignalStrength;
+  int lastSignalQuality;
+  time_t lastSignalDisplay;
   tTrackId lastTrackId;
   static cBitmap bmTeletext, bmRadio, bmAudio, bmDolbyDigital, bmEncrypted, bmRecording;
 public:
@@ -156,6 +162,10 @@ cSkinSTTNGDisplayChannel::cSkinSTTNGDisplayChannel(bool WithInfo)
 {
   present = NULL;
   lastSeen = -1;
+  lastDeviceNumber = -1;
+  lastSignalStrength = -1;
+  lastSignalQuality = -1;
+  lastSignalDisplay = 0;
   memset(&lastTrackId, 0, sizeof(lastTrackId));
   const cFont *font = cFont::GetFont(fontOsd);
   withInfo = WithInfo;
@@ -274,6 +284,7 @@ void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
         }
      }
   osd->DrawText(x3 + TextFrame, y0, ChannelString(Channel, Number), Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontOsd), x - x3 - TextFrame);
+  lastSignalDisplay = time(NULL); // don't get slowed down during heavy zapping
 }
 
 void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
@@ -330,8 +341,40 @@ void cSkinSTTNGDisplayChannel::Flush(void)
            osd->DrawText(x3 + TextFrame, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 2 * TextFrame);
            strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
            }
+        if (time(NULL) != lastSignalDisplay) {
+           int DeviceNumber = cDevice::ActualDevice()->DeviceNumber() + 1;
+           int SignalStrength = cDevice::ActualDevice()->SignalStrength();
+           int SignalQuality = cDevice::ActualDevice()->SignalQuality();
+           if (DeviceNumber != lastDeviceNumber || SignalStrength != lastSignalStrength || SignalQuality != lastSignalQuality) {
+              int d = 3;
+              int h = ((y7 - y6 + 1) - 3 * d) / 2;
+              int w = (x4 - x3) / 5;
+              int x = (x3 + x4) / 2 - w / 2;
+              if (SignalStrength >= 0) {
+                 int s = SignalStrength * w / 100;
+                 osd->DrawRectangle(x,     y6 + d, x + s - 1, y6 + d + h - 1, Theme.Color(clrChannelSignalValue));
+                 osd->DrawRectangle(x + s, y6 + d, x + w - 1, y6 + d + h - 1, Theme.Color(clrChannelSignalRest));
+                 }
+              else if (DeviceNumber != lastDeviceNumber)
+                 osd->DrawRectangle(x, y6 + d, x + w - 1, y6 + d + h - 1, Theme.Color(clrChannelFrame));
+              if (SignalQuality >= 0) {
+                 int q = SignalQuality * w / 100;
+                 osd->DrawRectangle(x,     y7 - d - h + 1, x + q - 1, y7 - d, Theme.Color(clrChannelSignalValue));
+                 osd->DrawRectangle(x + q, y7 - d - h + 1, x + w - 1, y7 - d, Theme.Color(clrChannelSignalRest));
+                 }
+              else if (DeviceNumber != lastDeviceNumber)
+                 osd->DrawRectangle(x, y7 - d - h + 1, x + w - 1, y7 - d, Theme.Color(clrChannelFrame));
+              cString dn = cString::sprintf(" %d ", DeviceNumber);
+              const cFont *font = cFont::GetFont(fontSml);
+              int dw = font->Width(dn);
+              osd->DrawText(x - 2 * d - dw, y6, dn, Theme.Color(clrChannelDate), frameColor, font, dw);
+              lastDeviceNumber = DeviceNumber;
+              lastSignalStrength = SignalStrength;
+              lastSignalQuality = SignalQuality;
+              }
+           lastSignalDisplay = time(NULL);
+           }
         }
-
      int seen = 0;
      if (present) {
         time_t t = time(NULL);
diff --git a/tools.c b/tools.c
index ab7fe96c0..6a98bf69b 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.13 2011/03/20 12:07:18 kls Exp $
+ * $Id: tools.c 2.14 2011/04/29 14:51:14 kls Exp $
  */
 
 #include "tools.h"
@@ -906,6 +906,8 @@ cString &cString::operator=(const cString &String)
 
 cString &cString::operator=(const char *String)
 {
+  if (s == String)
+    return *this;
   free(s);
   s = String ? strdup(String) : NULL;
   return *this;
diff --git a/vdr.c b/vdr.c
index 34560e75b..ad86f5a8b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.20 2010/12/12 13:42:00 kls Exp $
+ * $Id: vdr.c 2.21 2011/06/13 14:40:12 kls Exp $
  */
 
 #include <getopt.h>
@@ -704,8 +704,12 @@ int main(int argc, char *argv[])
 
   if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
      dsyslog("not all devices ready after %d seconds", DEVICEREADYTIMEOUT);
-  if (Setup.InitialChannel > 0)
-     Setup.CurrentChannel = Setup.InitialChannel;
+  if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
+     if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
+        Setup.InitialChannel = Channel->GetChannelID().ToString();
+     }
+  if (cChannel *Channel = Channels.GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
+     Setup.CurrentChannel = Channel->Number();
   if (Setup.InitialVolume >= 0)
      Setup.CurrentVolume = Setup.InitialVolume;
   Channels.SwitchTo(Setup.CurrentChannel);

From 7df66b05874339d23c1ce35387a8d55579891a22 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 16 Aug 2011 18:57:00 +0200
Subject: [PATCH 206/307] Version 1.7.20 Original announce message: VDR
 developer version 1.7.20 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.20.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.19-1.7.20.diff

MD5 checksums:

eda2911fff1715ba5b1482b20ad18188  vdr-1.7.20.tar.bz2
a8f5bcaf3294cc9fce87283a618d5ce1  vdr-1.7.19-1.7.20.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

This version contains functions to determine the "signal strength"
and "signal quality" through cDevice. If you are using a DVB card that
contains an stb0899 frontend chip (like the TT-budget S2-3200) you may
want to apply the patches from

   ftp://ftp.tvdr.de/vdr/Developer/Driver-Patches

to the LinuxDVB driver source in order to receive useful results from
that frontend.

From the HISTORY file:
- Added some missing 'const' to tChannelID (reported by Sundararaj Reel).
- The isnumber() function now checks the given pointer for NULL (thanks to Holger
  Dengler).
- Now checking Setup.InitialChannel for NULL before using it (reported by
  Christoph Haubrich).
- cSkins::Message() now blocks calls from background threads (thanks to Michael
  Eiler for reporting a crash in such a scenario).
- Fixed the return value of the svdrpsend.pl script in case of an error (thanks to
  Jonas Diemer).
- Increased MAXCAIDS to 12 (thanks to Jerome Lacarriere).
- Fixed handling DiSEqC codes (thanks to Mark Hawes for reporting the bug, and
  Udo Richter for suggesting the fix).
- Added a mechanism to defer timer handling in case of problems (reported by
  Frank Niederwipper).
- Fixed distortions that happened when splitting recording into several files
  (was a side effect of "Fixed detecting frames in case the Picture Start Code or
  Access Unit Delimiter extends over TS packet boundaries" in version 1.7.19).
  cRecorder::Action() now buffers TS packets in case the frame type is
  not yet known when a new payload starts. This adds no overhead for channels
  that broadcast the frame type within the first TS packet of a payload; it only
  kicks in if that information is not in the first TS packet.
- Fixed handling the channelID in cMenuEditChanItem (thanks to Udo Richter).
- cStringList::Sort() can now be called with a boolean parameter that controls
  case insensitive sorting (suggested by Sundararaj Reel).
- Now scanning new transponders before old ones, to make sure transponder changes
  are recognized (thanks to Reinhard Nissl).
- Implemented static cIndexFile::IndexFileName().
- The length (as number of frames) of a recording's index file can now be determined
  by a call to cIndexFile::GetLength() (suggested by Christoph Haubrich).
- Fixed some crashes in subtitle display (thanks to Rolf Ahrenberg).
- Made DELETENULL() thread safe (reported by Rolf Ahrenberg).
- The pic2mpg script of the 'pictures' plugin now generates HD images (thanks to
  Andre Weidemann for his support in using convert/ffmpeg). The old SD version is
  still available as pic2mpg-sd.
- Added a mutex to protect cOsd::Osds from simultaneous access from different threads
  (reported by Rolf Ahrenberg).
- The cutter now sets the 'broken link' flag for MPEG2 TS recordings (thanks to
  Oliver Endriss).
- Fixed language code entry for Portuguese.
- The new command line options --filesize (suggested by Marco Göbenich) and --split
  can be used together with --edit to set the maximum video file size and turn on
  splitting edited files at the editing marks. These options must be given before
  --edit to have an effect.
- cTimeMs is no longer initialized to the current time if the value given to the
  constructor is negative (avoids the "cTimeMs: using monotonic clock..." log message
  before VDR's starting log message).
---
 CONTRIBUTORS                        |  34 +++++
 HISTORY                             |  51 +++++++-
 MANUAL                              |   2 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po |  93 ++++++++++++++
 PLUGINS/src/pictures/HISTORY        |  10 ++
 PLUGINS/src/pictures/pic2mpg        |  91 ++++---------
 PLUGINS/src/pictures/pic2mpg-sd     | 193 ++++++++++++++++++++++++++++
 channels.h                          |  14 +-
 config.h                            |  10 +-
 diseqc.c                            |   6 +-
 dvbsubtitle.c                       |  20 ++-
 eitscan.c                           |   4 +-
 epg.data                            |   0
 i18n.c                              |   4 +-
 menu.c                              |   5 +-
 menuitems.c                         |   9 +-
 nit.c                               |  17 ++-
 osd.c                               |   6 +-
 osd.h                               |   3 +-
 recorder.c                          |  56 ++++++--
 recording.c                         | 142 ++++++++++----------
 recording.h                         |  22 ++--
 remote.c                            |   4 +-
 remux.c                             |   7 +-
 skins.c                             |   6 +-
 svdrpsend.pl                        |   2 +-
 timers.c                            |  15 ++-
 timers.h                            |   5 +-
 tools.c                             |  24 +++-
 tools.h                             |  25 +++-
 vdr.1                               |  16 ++-
 vdr.c                               |  31 ++++-
 32 files changed, 717 insertions(+), 210 deletions(-)
 create mode 100644 PLUGINS/src/dvbhddevice/po/it_IT.po
 create mode 100755 PLUGINS/src/pictures/pic2mpg-sd
 create mode 100644 epg.data

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b9cc38240..2aa2c21dc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -678,6 +678,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for fixing the way the OSD size is determined on full featured DVB cards
  for his input on calculating the Aspect factor in GetOsdSize()
  for suggesting a better way of handling calls to realloc()
+ for making the cutter set the 'broken link' flag for MPEG2 TS recordings
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1107,6 +1108,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding an include of VDR's 'Make.global' to libsi's Makefile
  for adding handling of "ANSI/SCTE 57" descriptors
  for some input on how to use BER and UNC values to generate a "quality" value
+ for fixing some crashes in subtitle display
+ for reporting that DELETENULL() was not thread safe
+ for reporting a crash in subtitle display, related to cOsd::Osds
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1273,6 +1277,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for avoiding an unecessary call to Recordings.ResetResume()
  for debugging a problem in handling the bitmap color depth for scaled subtitles
  for making subtitle PIDs be decrypted
+ for making cEITScanner process new transponders before old ones, to make sure
+ transponder changes are recognized
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1700,6 +1706,8 @@ Udo Richter <udo_richter@gmx.de>
  "TITLE" or "EPISODE"
  for a patch to "Made updating the editing marks during replay react faster in case
  the marks file has just been written"
+ for suggesting a fix for a bug in handling DiSEqC codes
+ for fixing handling the channelID in cMenuEditChanItem
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2147,6 +2155,7 @@ Andr
  recording if Setup.UseDolbyDigital is true
  for suggesting that the primary device should only be avoided for recording if
  it is an old SD full featured card
+ for his support in using convert/ffmpeg in the pic2mpg script of the 'pictures' plugin
 
 J�rgen Schilling <juergen_schilling@web.de>
  for reporting that color buttons were displayed in the recording info menu if it
@@ -2223,6 +2232,9 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for suggesting to add a note to cTsToPes about all TS packets having to belong to
  the same PID
  for adding HD stream content identifiers to vdr.5
+ for reporting that Setup.InitialChannel was dereferenced without checking for NULL
+ for suggesting to implement a function to determine the length of a recording's
+ index file
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2509,6 +2521,8 @@ Johan Schuring <johan.schuring@vetteblei.nl>
 
 Sundararaj Reel <sundararaj.reel@googlemail.com>
  for reporting a missing reset of maxNumber in cChannels::Renumber()
+ for reporting some missing 'const' in tChannelID
+ for suggesting to add optional case insensitive sorting to cStringList::Sort()
 
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
@@ -2718,6 +2732,7 @@ Dirk Leber <dirk.leber@reel-multimedia.com>
 
 Marco G�benich <mg@needful.de>
  for reporting a problem with executing diseqc commands from different threads
+ for suggesting to implement command line option --filesize
 
 Johan Andersson <jna@jna.pp.se>
  for reporting a bug in detecting frames in case the Picture Start Code or Access Unit
@@ -2726,3 +2741,22 @@ Johan Andersson <jna@jna.pp.se>
 Dave Pickles <dave@pickles.me.uk>
  for adding support for "content identifier descriptor" and "default authority
  descriptor" to 'libsi'
+
+Holger Dengler <holger.dengler@gmx.de>
+ for making the isnumber() function check the given pointer for NULL
+
+Michael Eiler <eiler.mike@gmail.com>
+ - reporting a crash in case cSkins::Message() is called from a background thread
+
+Jonas Diemer <jonasdiemer@googlemail.com>
+ for fixing the return value of the svdrpsend.pl script in case of an error
+
+Jerome Lacarriere <lacarriere.j@gmail.com>
+ for increasing MAXCAIDS to 12
+
+Mark Hawes <MARK.HAWES@au.fujitsu.com>
+ for reporting a bug in handling DiSEqC codes
+
+Frank Niederwipper <f.niederwipper@gmail.com>
+ for reporting a problem in timer handling in case a recording directory can't
+ be created
diff --git a/HISTORY b/HISTORY
index 015a10195..b50068940 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6305,7 +6305,7 @@ Video Disk Recorder Revision History
   parameters, but rather the whole channel is handed down for processing. The old
   constructor of cReceiver is still available, but it is recommended to plugin authors
   that they switch to the new interface as soon as possible.
-  When replaying such a recording, the PCR packets are sent to PlayTsVideo()
+  When replaying such a recording, the PCR packets are sent to PlayTsVideo().
 - The files "commands.conf" and "reccmd.conf" can now contain nested lists of
   commands. See vdr.5 for information about the new file format.
   This obsoletes the CMDSUBMENU patch.
@@ -6649,3 +6649,52 @@ Video Disk Recorder Revision History
   Lars Bl�ser).
 - Added support for "content identifier descriptor" and "default authority descriptor"
   to 'libsi' (thanks to Dave Pickles).
+
+2011-08-15: Version 1.7.20
+
+- Added some missing 'const' to tChannelID (reported by Sundararaj Reel).
+- The isnumber() function now checks the given pointer for NULL (thanks to Holger
+  Dengler).
+- Now checking Setup.InitialChannel for NULL before using it (reported by
+  Christoph Haubrich).
+- cSkins::Message() now blocks calls from background threads (thanks to Michael
+  Eiler for reporting a crash in such a scenario).
+- Fixed the return value of the svdrpsend.pl script in case of an error (thanks to
+  Jonas Diemer).
+- Increased MAXCAIDS to 12 (thanks to Jerome Lacarriere).
+- Fixed handling DiSEqC codes (thanks to Mark Hawes for reporting the bug, and
+  Udo Richter for suggesting the fix).
+- Added a mechanism to defer timer handling in case of problems (reported by
+  Frank Niederwipper).
+- Fixed distortions that happened when splitting recording into several files
+  (was a side effect of "Fixed detecting frames in case the Picture Start Code or
+  Access Unit Delimiter extends over TS packet boundaries" in version 1.7.19).
+  cRecorder::Action() now buffers TS packets in case the frame type is
+  not yet known when a new payload starts. This adds no overhead for channels
+  that broadcast the frame type within the first TS packet of a payload; it only
+  kicks in if that information is not in the first TS packet.
+- Fixed handling the channelID in cMenuEditChanItem (thanks to Udo Richter).
+- cStringList::Sort() can now be called with a boolean parameter that controls
+  case insensitive sorting (suggested by Sundararaj Reel).
+- Now scanning new transponders before old ones, to make sure transponder changes
+  are recognized (thanks to Reinhard Nissl).
+- Implemented static cIndexFile::IndexFileName().
+- The length (as number of frames) of a recording's index file can now be determined
+  by a call to cIndexFile::GetLength() (suggested by Christoph Haubrich).
+- Fixed some crashes in subtitle display (thanks to Rolf Ahrenberg).
+- Made DELETENULL() thread safe (reported by Rolf Ahrenberg).
+- The pic2mpg script of the 'pictures' plugin now generates HD images (thanks to
+  Andre Weidemann for his support in using convert/ffmpeg). The old SD version is
+  still available as pic2mpg-sd.
+- Added a mutex to protect cOsd::Osds from simultaneous access from different threads
+  (reported by Rolf Ahrenberg).
+- The cutter now sets the 'broken link' flag for MPEG2 TS recordings (thanks to
+  Oliver Endriss).
+- Fixed language code entry for Portuguese.
+- The new command line options --filesize (suggested by Marco G�benich) and --split
+  can be used together with --edit to set the maximum video file size and turn on
+  splitting edited files at the editing marks. These options must be given before
+  --edit to have an effect.
+- cTimeMs is no longer initialized to the current time if the value given to the
+  constructor is negative (avoids the "cTimeMs: using monotonic clock..." log message
+  before VDR's starting log message).
diff --git a/MANUAL b/MANUAL
index 352cc10cc..54e166e95 100644
--- a/MANUAL
+++ b/MANUAL
@@ -822,7 +822,7 @@ Version 1.6
 
   Max. video file size = 2000
                          The maximum size of a single recorded video file in MB.
-                         The valid range is 100...2000. Default is 2000, but
+                         The valid range is 100...1048570. Default is 2000, but
                          you may want to use smaller values if you are planning
                          on archiving a recording to CD.
 
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
new file mode 100644
index 000000000..a328312c1
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -0,0 +1,93 @@
+# VDR plugin language source file
+# Copyright (C) 2011 Andreas Regel
+# This file is distributed under the same license as the dvbhddevice package.
+# Christoph Haubrich, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2011-05-05 20:34+0200\n"
+"PO-Revision-Date: 2011-07-10 00:23+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team:  <see README>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Automatic"
+msgstr "Automatica"
+
+msgid "Letterbox 16/9"
+msgstr "Letterbox 16:9"
+
+msgid "Letterbox 14/9"
+msgstr "Letterbox 14:9"
+
+msgid "Pillarbox"
+msgstr "Pillarbox"
+
+msgid "CentreCutOut"
+msgstr "CentreCutOut"
+
+msgid "Always 16/9"
+msgstr "Sempre 16:9"
+
+msgid "Disabled"
+msgstr "Disabilitata"
+
+msgid "Analogue only"
+msgstr "Solo analogica"
+
+msgid "Always"
+msgstr "Sempre"
+
+msgid "HDMI only"
+msgstr "Solo HDMI"
+
+msgid "Follow resolution"
+msgstr "Risoluzione seguente"
+
+msgid "none"
+msgstr "nessuna"
+
+msgid "Resolution"
+msgstr "Risoluzione"
+
+msgid "TV format"
+msgstr "Formato TV"
+
+msgid "Video Conversion"
+msgstr "Conversione video"
+
+msgid "Analogue Video"
+msgstr "Video analogico"
+
+msgid "Audio Delay (ms)"
+msgstr "Ritardo audio (ms)"
+
+msgid "Audio Downmix"
+msgstr "Scala Audio"
+
+msgid "OSD Size"
+msgstr "Dimensione OSD"
+
+msgid "HDMI CEC"
+msgstr "HDMI CEC"
+
+msgid "Remote Control Protocol"
+msgstr "Protocollo controllo remoto"
+
+msgid "Remote Control Address"
+msgstr "Indirizzo controllo remoto"
+
+msgid "High Level OSD"
+msgstr "OSD alto livello"
+
+msgid "Allow True Color OSD"
+msgstr "Permetti OSD True Color"
+
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 332d77c4e..964ab2e96 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -45,3 +45,13 @@ VDR Plugin 'pictures' Revision History
 2011-02-20: Version 0.1.0
 
 - Fixed reallocating memory (reported by Paul Menzel).
+
+2011-07-23:
+
+- Now rotating images according to the EXIF 'Orientation' parameter.
+
+2011-08-14:
+
+- The pic2mpg script now generates HD images (thanks to Andre Weidemann for his
+  support in using convert/ffmpeg). The old SD version is still available as
+  pic2mpg-sd.
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index d31751032..190ec2601 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,62 +7,45 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 2.0 2008/02/29 14:34:22 kls Exp $
-
-## TODO implement HDTV (1920 x 1080)
+# $Id: pic2mpg 2.2 2011/08/14 13:34:15 kls Exp $
 
 use File::Path;
 use File::Spec;
 use Getopt::Std;
-use Image::Size;
+use Image::ExifTool qw(:Public);
 
 $Usage = qq{
 Usage: $0 [options] picture-dir mpeg-dir
        $0 [options] picture-file mpeg-file
 
-Options: -a             Aspect ratio 4:3 (default is 16:9)
-         -f             Force conversion
+Options: -f             Force conversion
          -h             print Help
-         -i             Ignore unknown file types
-         -n             NTSC (default is PAL)
+         -s size        Screen size (WIDTHxHEIGHT, default is 1920x1080)
          -v num         Verbose (0=none, 1=list files, 2=detailed)
-         -x percent     X overscan in percent
-         -y percent     Y overscan in percent
 };
 
-getopts("afhinv:x:y:") || die $Usage;
+getopts("fhs:v:") || die $Usage;
 
 die $Usage if $opt_h;
 
-$Aspect    = $opt_a;
 $Force     = $opt_f;
-$Ignore    = $opt_i;
-$NTSC      = $opt_n;
+$Size      = $opt_s || "1920x1080";
 $Verbose   = $opt_v;
-$OverscanX = $opt_x;
-$OverscanY = $opt_y;
 
 $ListFiles = $Verbose >= 1;
 $Detailed  = $Verbose >= 2;
 
-# Screen size:
-
-$SW = $NTSC ? 720 : 720;
-$SH = $NTSC ? 480 : 576;
-
-$ScreenRatio = $Aspect ? 4 / 3 : 16 / 9;
-
-# Converter programs:
-
-%PNMCONV = (
-  bmp  => "bmptopnm",
-  gif  => "giftopnm",
-  jpeg => "jpegtopnm",
-  jpg  => "jpegtopnm",
-  png  => "pngtopnm",
-  pnm  => "cat",
-  tif  => "tifftopnm",
-  tiff => "tifftopnm",
+# Supported picture types:                                                                                                       
+
+%PICTYPES = (                                                                                                                  
+  bmp  => 1,
+  gif  => 1,
+  jpeg => 1,
+  jpg  => 1,
+  png  => 1,
+  pnm  => 1,
+  tif  => 1,
+  tiff => 1,
   );
 
 # Command options:
@@ -71,13 +54,6 @@ die "$0: missing parameter\n" unless $ARGV[0] && $ARGV[1];
 die "$0: file or directory not found: $ARGV[0]\n" unless -e $ARGV[0];
 die "$0: source and destination must be different\n" if $ARGV[0] eq $ARGV[1];
 
-$verbose1  = $Detailed ? "--verbose" : "";
-$verbose2  = $Detailed ? "-v 2" : "-v 0";
-$system1   = $NTSC ? "" : "--pal";
-$system2   = $NTSC ? "n" : "p";
-$framerate = $NTSC ? "30000:1001" : "25:1";
-$aspect    = $Aspect ? "2" : "3";
-
 # Convert a single file:
 
 if (-f $ARGV[0]) {
@@ -95,7 +71,7 @@ $MPGDIR = File::Spec->rel2abs($ARGV[1]);
 
 chdir($PICDIR) || die "$PICDIR: $!\n";
 
-@Pictures = `find -type f`;
+@Pictures = `find -type f | sort`;
 chomp(@Pictures);
 
 for $pic (@Pictures) {
@@ -145,29 +121,18 @@ sub ConvertFile
 {
   my ($Pict, $Mpeg) = @_;
   (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
-  if (!defined $PNMCONV{$Type}) {
-     return if ($Ignore);
-     die "unknown file type '$Type': '$Pict'\n";
-     }
-  my ($w, $h) = imgsize($Pict);
-  print "image size is $w x $h\n" if ($Detailed);
-  if ($w / $h <= $ScreenRatio) {
-     $w = $h * $ScreenRatio;
-     }
-  else {
-     $h = $w / $ScreenRatio;
-     }
-  my $ScaleW = $SW / $w * (100 - 2 * $OverscanX) / 100;
-  my $ScaleH = $SH / $h * (100 - 2 * $OverscanY) / 100;
+  return if (!defined $PICTYPES{$Type});
+  my $Exif = ImageInfo($Pict);
+  my $Orientation = $$Exif{"Orientation"};
+  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+) /; 
+  my $Rotate = $Degrees ? "-rotate $Degrees" : "";
+  print "orientation = '$Orientation' -> rotation = $Rotate\n" if ($Detailed);
   $Pict = EscapeMeta($Pict);
   $Mpeg = EscapeMeta($Mpeg);
-  print "$Pict -> $Mpeg\n" if $ListFiles;
-  my $Cmd = "$PNMCONV{$Type} $Pict 2> /dev/null |"
-          . "pnmscale $verbose1 --xscale=$ScaleW --yscale=$ScaleH |"
-          . "pnmpad $verbose1 --black --width $SW --height $SH |"
-          . "ppmntsc $verbose1 $system1 |"
-          . "ppmtoy4m $verbose2 -F $framerate -I p -S 420mpeg2 |"
-          . "mpeg2enc $verbose2 -f 3 -b 12500 -a $aspect -q 1 -n $system2 -o $Mpeg";
+  print "$Pict -> $Mpeg $Rotate\n" if $ListFiles;
+  my $Cmd = "convert $Pict -background '#000000' $Rotate -resize $Size -gravity center -extent $Size ppm:- | "
+          . "ffmpeg -f image2pipe -vcodec ppm -i pipe:0 -an -vcodec libx264 -vpre baseline -s $Size -qscale 2 -f mpegts -y $Mpeg "
+          . ($Detailed ? "" : "2>/dev/null");
   !system($Cmd) || die "$Cmd: $!\n";
   $Cmd = "touch -r $Pict $Mpeg";
   !system($Cmd) || die "$Cmd: $!\n";
diff --git a/PLUGINS/src/pictures/pic2mpg-sd b/PLUGINS/src/pictures/pic2mpg-sd
new file mode 100755
index 000000000..6213091ee
--- /dev/null
+++ b/PLUGINS/src/pictures/pic2mpg-sd
@@ -0,0 +1,193 @@
+#!/usr/bin/perl
+
+# pic2mpg: Convert picture files to MPEG still frames
+#
+# Converts either a single picture file or all files in a
+# given directory (recursively) to MPEG still frames.
+#
+# See the README file for copyright information and how to reach the author.
+#
+# $Id: pic2mpg 2.1 2011/07/23 14:23:59 kls Exp $
+
+## TODO implement HDTV (1920 x 1080)
+
+use File::Path;
+use File::Spec;
+use Getopt::Std;
+use Image::ExifTool qw(:Public);
+use Image::Size;
+
+$Usage = qq{
+Usage: $0 [options] picture-dir mpeg-dir
+       $0 [options] picture-file mpeg-file
+
+Options: -a             Aspect ratio 4:3 (default is 16:9)
+         -f             Force conversion
+         -h             print Help
+         -i             Ignore unknown file types
+         -n             NTSC (default is PAL)
+         -v num         Verbose (0=none, 1=list files, 2=detailed)
+         -x percent     X overscan in percent
+         -y percent     Y overscan in percent
+};
+
+getopts("afhinv:x:y:") || die $Usage;
+
+die $Usage if $opt_h;
+
+$Aspect    = $opt_a;
+$Force     = $opt_f;
+$Ignore    = $opt_i;
+$NTSC      = $opt_n;
+$Verbose   = $opt_v;
+$OverscanX = $opt_x;
+$OverscanY = $opt_y;
+
+$ListFiles = $Verbose >= 1;
+$Detailed  = $Verbose >= 2;
+
+# Screen size:
+
+$SW = $NTSC ? 720 : 720;
+$SH = $NTSC ? 480 : 576;
+
+$ScreenRatio = $Aspect ? 4 / 3 : 16 / 9;
+
+# Converter programs:
+
+%PNMCONV = (
+  bmp  => "bmptopnm",
+  gif  => "giftopnm",
+  jpeg => "jpegtopnm",
+  jpg  => "jpegtopnm",
+  png  => "pngtopnm",
+  pnm  => "cat",
+  tif  => "tifftopnm",
+  tiff => "tifftopnm",
+  );
+
+# Command options:
+
+die "$0: missing parameter\n" unless $ARGV[0] && $ARGV[1];
+die "$0: file or directory not found: $ARGV[0]\n" unless -e $ARGV[0];
+die "$0: source and destination must be different\n" if $ARGV[0] eq $ARGV[1];
+
+$verbose1  = $Detailed ? "--verbose" : "";
+$verbose2  = $Detailed ? "-v 2" : "-v 0";
+$system1   = $NTSC ? "" : "--pal";
+$system2   = $NTSC ? "n" : "p";
+$framerate = $NTSC ? "30000:1001" : "25:1";
+$aspect    = $Aspect ? "2" : "3";
+
+# Convert a single file:
+
+if (-f $ARGV[0]) {
+   die "$0: mixed file and directory ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -f $ARGV[1];
+   ConvertFile($ARGV[0], $ARGV[1]);
+   exit;
+   }
+
+die "$0: mixed directory and file ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -d $ARGV[1];
+
+$PICDIR = File::Spec->rel2abs($ARGV[0]);
+$MPGDIR = File::Spec->rel2abs($ARGV[1]);
+
+# Convert pictures to mpegs:
+
+chdir($PICDIR) || die "$PICDIR: $!\n";
+
+@Pictures = `find -type f`;
+chomp(@Pictures);
+
+for $pic (@Pictures) {
+    my $mpg = "$MPGDIR/$pic.mpg";
+    if ($Force || !-e $mpg || -M $mpg > -M $pic) {
+       (my $dir = $mpg) =~ s/\/[^\/]*$//;
+       mkpath($dir);
+       ConvertFile($pic, $mpg);
+       }
+    }
+
+# Remove mpegs without pictures:
+
+chdir($MPGDIR) || die "$MPGDIR: $!\n";
+
+@Mpegs = `find -type f`;
+chomp(@Mpegs);
+
+for $mpg (@Mpegs) {
+    my $pic = "$PICDIR/$mpg";
+    $pic =~ s/\.mpg$//;
+    if (!-e $pic) {
+       print "removing $mpg\n";
+       unlink($mpg);
+       }
+    }
+
+# Remove empty directories:
+
+chdir($MPGDIR) || die "$MPGDIR: $!\n";
+
+for ($i = 0; $i < 10; $i++) { # dirs might become empty when removing empty subdirs
+    @Dirs = `find -type d -empty`;
+    chomp(@Dirs);
+    last unless @Dirs;
+
+    for $dir (@Dirs) {
+        $dir = EscapeMeta($dir);
+        print "removing $dir\n";
+        !system("rm -rf $dir") || die "$dir: $!\n";
+        }
+    }
+
+# Actual file conversion:
+
+sub ConvertFile
+{
+  my ($Pict, $Mpeg) = @_;
+  (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
+  if (!defined $PNMCONV{$Type}) {
+     return if ($Ignore);
+     die "unknown file type '$Type': '$Pict'\n";
+     }
+  my ($w, $h) = imgsize($Pict);
+  print "image size is $w x $h\n" if ($Detailed);
+  my $Exif = ImageInfo($Pict);
+  my $Orientation = $$Exif{"Orientation"};
+  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+) /; 
+  my $Rotate = "-null";
+  $Rotate = "-cw"   if $Degrees eq "90";
+  $Rotate = "-ccw"  if $Degrees eq "270";
+  $Rotate = "-r180" if $Degrees eq "180";
+  print "orientation = '$Orientation' -> rotation = $Rotate\n" if ($Detailed);
+  ($w, $h) = ($h, $w) if ($Degrees eq "90" || $Degrees eq "270");
+  if ($w / $h <= $ScreenRatio) {
+     $w = $h * $ScreenRatio;
+     }
+  else {
+     $h = $w / $ScreenRatio;
+     }
+  my $ScaleW = $SW / $w * (100 - 2 * $OverscanX) / 100;
+  my $ScaleH = $SH / $h * (100 - 2 * $OverscanY) / 100;
+  $Pict = EscapeMeta($Pict);
+  $Mpeg = EscapeMeta($Mpeg);
+  print "$Pict -> $Mpeg $Rotate\n" if $ListFiles;
+  my $Cmd = "$PNMCONV{$Type} $Pict 2> /dev/null |"
+          . "pamflip $verbose1 $Rotate |"
+          . "pnmscale $verbose1 --xscale=$ScaleW --yscale=$ScaleH |"
+          . "pnmpad $verbose1 --black --width $SW --height $SH |"
+          . "ppmntsc $verbose1 $system1 |"
+          . "ppmtoy4m $verbose2 -F $framerate -I p -S 420mpeg2 |"
+          . "mpeg2enc $verbose2 -f 3 -b 12500 -a $aspect -q 1 -n $system2 -o $Mpeg";
+  !system($Cmd) || die "$Cmd: $!\n";
+  $Cmd = "touch -r $Pict $Mpeg";
+  !system($Cmd) || die "$Cmd: $!\n";
+}
+
+sub EscapeMeta
+{
+  my $META = ' !"#$%&\'()*;<>?[\\]`{|}~';
+  my $s = shift;
+  $s =~ s/([$META])/\\$1/g;
+  return $s;
+}
diff --git a/channels.h b/channels.h
index b8672974b..51f9830e4 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.12 2010/06/05 13:12:54 kls Exp $
+ * $Id: channels.h 2.14 2011/08/06 09:56:13 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -34,7 +34,7 @@
 #define MAXAPIDS 32 // audio
 #define MAXDPIDS 16 // dolby (AC3 + DTS)
 #define MAXSPIDS 32 // subtitles
-#define MAXCAIDS  8 // conditional access
+#define MAXCAIDS 12 // conditional access
 
 #define MAXLANGCODE1 4 // a 3 letter language code, zero terminated
 #define MAXLANGCODE2 8 // up to two 3 letter language codes, separated by '+' and zero terminated
@@ -61,11 +61,11 @@ struct tChannelID {
   bool Valid(void) const { return (nid || tid) && sid; } // rid is optional and source may be 0//XXX source may not be 0???
   tChannelID &ClrRid(void) { rid = 0; return *this; }
   tChannelID &ClrPolarization(void);
-  int Source(void) { return source; }
-  int Nid(void) { return nid; }
-  int Tid(void) { return tid; }
-  int Sid(void) { return sid; }
-  int Rid(void) { return rid; }
+  int Source(void)  const { return source; }
+  int Nid(void)  const { return nid; }
+  int Tid(void)  const { return tid; }
+  int Sid(void)  const { return sid; }
+  int Rid(void)  const { return rid; }
   static tChannelID FromString(const char *s);
   cString ToString(void) const;
   static const tChannelID InvalidID;
diff --git a/config.h b/config.h
index f3421f7a8..19f876868 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.32 2011/06/13 14:24:40 kls Exp $
+ * $Id: config.h 2.33 2011/06/21 21:43:01 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.19"
-#define VDRVERSNUM   10719  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.20"
+#define VDRVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.19"
-#define APIVERSNUM   10719  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.20"
+#define APIVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/diseqc.c b/diseqc.c
index b65d82c6d..d44629979 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.4 2011/05/22 10:36:12 kls Exp $
+ * $Id: diseqc.c 2.5 2011/08/06 10:32:18 kls Exp $
  */
 
 #include "diseqc.h"
@@ -95,13 +95,13 @@ const char *cDiseqc::Codes(const char *s) const
   if (e) {
      int NumCodes = 0;
      const char *t = s;
-     char *p;
      while (t < e) {
            if (NumCodes < MaxDiseqcCodes) {
               errno = 0;
+              char *p;
               int n = strtol(t, &p, 16);
               if (!errno && p != t && 0 <= n && n <= 255) {
-                 if (parsing) {
+                 if (!parsing) {
                     codes[NumCodes++] = uchar(n);
                     numCodes = NumCodes;
                     }
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index de1cd1c00..43d072d43 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.17 2011/04/17 14:34:05 kls Exp $
+ * $Id: dvbsubtitle.c 2.18 2011/08/13 13:33:00 kls Exp $
  */
 
 
@@ -826,6 +826,7 @@ void cDvbSubtitleConverter::Action(void)
   while (Running()) {
         int WaitMs = 100;
         if (!frozen) {
+           LOCK_THREAD;
            if (osd) {
               int NewSetupLevel = setupLevel;
               if (Timeout.TimedOut() || LastSetupLevel != NewSetupLevel) {
@@ -833,7 +834,6 @@ void cDvbSubtitleConverter::Action(void)
                  }
               LastSetupLevel = NewSetupLevel;
               }
-           Lock();
            if (cDvbSubtitleBitmaps *sb = bitmaps->First()) {
               int64_t STC = cDevice::PrimaryDevice()->GetSTC();
               int64_t Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
@@ -858,7 +858,6 @@ void cDvbSubtitleConverter::Action(void)
               else
                  bitmaps->Del(sb);
               }
-           Unlock();
            }
         cCondWait::SleepMs(WaitMs);
         }
@@ -902,6 +901,7 @@ void cDvbSubtitleConverter::SetOsdData(void)
 
 bool cDvbSubtitleConverter::AssertOsd(void)
 {
+  LOCK_THREAD;
   return osd || (osd = cOsdProvider::NewOsd(int(round(osdFactorX * windowHorizontalOffset + osdDeltaX)), int(round(osdFactorY * windowVerticalOffset + osdDeltaY)) + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
 }
 
@@ -957,7 +957,11 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             region->SetVersion(regionVersion);
             bool regionFillFlag = (Data[6 + 1] & 0x08) >> 3;
             int regionWidth = (Data[6 + 2] << 8) | Data[6 + 3];
+            if (regionWidth < 1)
+               regionWidth = 1;
             int regionHeight = (Data[6 + 4] << 8) | Data[6 + 5];
+            if (regionHeight < 1)
+               regionHeight = 1;
             region->SetSize(regionWidth, regionHeight);
             region->SetLevel((Data[6 + 6] & 0xE0) >> 5);
             region->SetDepth((Data[6 + 6] & 0x1C) >> 2);
@@ -1103,7 +1107,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
   int NumAreas = Page->regions.Count();
   int Bpp = 8;
   bool Reduced = false;
-  while (osd->CanHandleAreas(Areas, NumAreas) != oeOk) {
+  while (osd && osd->CanHandleAreas(Areas, NumAreas) != oeOk) {
         int HalfBpp = Bpp / 2;
         if (HalfBpp >= 2) {
            for (int i = 0; i < NumAreas; i++) {
@@ -1141,8 +1145,10 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
   for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
       int posX = sr->HorizontalAddress();
       int posY = sr->VerticalAddress();
-      cBitmap *bm = new cBitmap(sr->Width(), sr->Height(), sr->Bpp(), posX, posY);
-      bm->DrawBitmap(posX, posY, *sr);
-      Bitmaps->AddBitmap(bm);
+      if (sr->Width() > 0 && sr->Height() > 0) {
+         cBitmap *bm = new cBitmap(sr->Width(), sr->Height(), sr->Bpp(), posX, posY);
+         bm->DrawBitmap(posX, posY, *sr);
+         Bitmaps->AddBitmap(bm);
+         }
       }
 }
diff --git a/eitscan.c b/eitscan.c
index 2b43e7181..25b7115c0 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.1 2010/02/07 12:12:05 kls Exp $
+ * $Id: eitscan.c 2.2 2011/08/12 14:18:04 kls Exp $
  */
 
 #include "eitscan.h"
@@ -133,12 +133,12 @@ void cEITScanner::Process(void)
         if (Channels.Lock(false, 10)) {
            if (!scanList) {
               scanList = new cScanList;
-              scanList->AddTransponders(&Channels);
               if (transponderList) {
                  scanList->AddTransponders(transponderList);
                  delete transponderList;
                  transponderList = NULL;
                  }
+              scanList->AddTransponders(&Channels);
               }
            bool AnyDeviceSwitched = false;
            for (int i = 0; i < cDevice::NumDevices(); i++) {
diff --git a/epg.data b/epg.data
new file mode 100644
index 000000000..e69de29bb
diff --git a/i18n.c b/i18n.c
index 636c4b58e..bc4aaf608 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.3 2011/02/20 15:56:20 kls Exp $
+ * $Id: i18n.c 2.4 2011/08/15 10:01:45 kls Exp $
  */
 
 /*
@@ -40,7 +40,7 @@ const char *LanguageCodeList[] = {
   "slv,slo",
   "ita",
   "dut,nla,nld",
-  "por",
+  "prt",
   "fra,fre",
   "nor",
   "fin,suo",
diff --git a/menu.c b/menu.c
index 2ba1de8ee..39785146e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.28 2011/02/27 12:37:48 kls Exp $
+ * $Id: menu.c 2.29 2011/08/06 13:13:34 kls Exp $
  */
 
 #include "menu.h"
@@ -38,6 +38,7 @@
 #define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
                             // within which it will go directly into the "Edit timer" menu to allow
                             // further parameter settings
+#define DEFERTIMER       60 // seconds by which a timer is deferred in case of problems
 
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
@@ -4134,6 +4135,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      else
         DELETENULL(recorder);
      }
+  else
+     timer->SetDeferred(DEFERTIMER);
   if (!Timer) {
      Timers.Del(timer);
      Timers.SetModified();
diff --git a/menuitems.c b/menuitems.c
index bc04e72c8..e7797d6e2 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.9 2011/06/13 14:48:41 kls Exp $
+ * $Id: menuitems.c 2.10 2011/08/12 13:19:40 kls Exp $
  */
 
 #include "menuitems.h"
@@ -736,9 +736,14 @@ void cMenuEditChanItem::Set(void)
      cChannel *channel = Channels.GetByNumber(*value);
      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
      SetValue(buf);
+     if (channelID)
+        *channelID = channel->GetChannelID().ToString();
      }
-  else if (noneString)
+  else if (noneString) {
      SetValue(noneString);
+     if (channelID)
+        *channelID = "";
+     }
 }
 
 eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
diff --git a/nit.c b/nit.c
index dfd020761..0603e249b 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.5 2010/02/16 15:37:05 kls Exp $
+ * $Id: nit.c 2.6 2011/08/12 14:27:31 kls Exp $
  */
 
 #include "nit.h"
@@ -150,6 +150,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     }
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
+                    bool forceTransponderUpdate = false;
                     for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
@@ -164,9 +165,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                               }
                            if (ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), Transponder())) // only modify channels if we're actually receiving this transponder
                               Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('S'));
+                           else if (Channel->Srate() != SymbolRate || strcmp(Channel->Parameters(), dtp.ToString('S')))
+                              forceTransponderUpdate = true; // get us receiving this transponder
                            }
                         }
-                    if (!found) {
+                    if (!found || forceTransponderUpdate) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
@@ -202,6 +205,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     }
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
+                    bool forceTransponderUpdate = false;
                     for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
@@ -216,9 +220,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                               }
                            if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder
                               Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('C'));
+                           else if (Channel->Srate() != SymbolRate || strcmp(Channel->Parameters(), dtp.ToString('C')))
+                              forceTransponderUpdate = true; // get us receiving this transponder
                            }
                         }
-                    if (!found) {
+                    if (!found || forceTransponderUpdate) {
                         for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
@@ -261,6 +267,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     }
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
+                    bool forceTransponderUpdate = false;
                     for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
@@ -275,9 +282,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
                               Channel->SetTransponderData(Source, Frequency, 0, dtp.ToString('T'));
+                           else if (strcmp(Channel->Parameters(), dtp.ToString('T')))
+                              forceTransponderUpdate = true; // get us receiving this transponder
                            }
                         }
-                    if (!found) {
+                    if (!found || forceTransponderUpdate) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
diff --git a/osd.c b/osd.c
index 49b655aa3..ab24e1745 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.22 2011/06/02 12:00:17 kls Exp $
+ * $Id: osd.c 2.23 2011/08/15 09:27:39 kls Exp $
  */
 
 #include "osd.h"
@@ -1600,9 +1600,11 @@ int cOsd::osdTop = 0;
 int cOsd::osdWidth = 0;
 int cOsd::osdHeight = 0;
 cVector<cOsd *> cOsd::Osds;
+cMutex cOsd::mutex;
 
 cOsd::cOsd(int Left, int Top, uint Level)
 {
+  cMutexLock MutexLock(&mutex);
   isTrueColor = false;
   savedBitmap = NULL;
   numBitmaps = 0;
@@ -1624,6 +1626,7 @@ cOsd::cOsd(int Left, int Top, uint Level)
 
 cOsd::~cOsd()
 {
+  cMutexLock MutexLock(&mutex);
   for (int i = 0; i < numBitmaps; i++)
       delete bitmaps[i];
   delete savedBitmap;
@@ -1944,6 +1947,7 @@ cOsdProvider::~cOsdProvider()
 
 cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
 {
+  cMutexLock MutexLock(&cOsd::mutex);
   if (Level == OSD_LEVEL_DEFAULT && cOsd::IsOpen())
      esyslog("ERROR: attempt to open OSD while it is already open - using dummy OSD!");
   else if (osdProvider) {
diff --git a/osd.h b/osd.h
index b56853a36..ab10e42be 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.13 2011/04/17 14:24:32 kls Exp $
+ * $Id: osd.h 2.14 2011/08/15 09:22:50 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -709,6 +709,7 @@ class cOsd {
 private:
   static int osdLeft, osdTop, osdWidth, osdHeight;
   static cVector<cOsd *> Osds;
+  static cMutex mutex;
   bool isTrueColor;
   cBitmap *savedBitmap;
   cBitmap *bitmaps[MAXOSDAREAS];
diff --git a/recorder.c b/recorder.c
index 2738c97c0..6080deb08 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.11 2011/06/12 14:16:45 kls Exp $
+ * $Id: recorder.c 2.14 2011/08/13 14:56:36 kls Exp $
  */
 
 #include "recorder.h"
 #include "shutdown.h"
 
-#define RECORDERBUFSIZE  MEGABYTE(5)
+#define RECORDERBUFSIZE  (MEGABYTE(5) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE
 
 // The maximum time we wait before assuming that a recorded video data stream
 // is broken:
@@ -88,7 +88,7 @@ bool cRecorder::RunningLowOnDiskSpace(void)
 
 bool cRecorder::NextFile(void)
 {
-  if (recordFile && frameDetector->IndependentFrame()) { // every file shall start with an independent frame
+  if (recordFile) {
      if (fileSize > MEGABYTE(off_t(Setup.MaxVideoFileSize)) || RunningLowOnDiskSpace()) {
         recordFile = fileName->NextFile();
         fileSize = 0;
@@ -119,8 +119,11 @@ void cRecorder::Action(void)
   time_t t = time(NULL);
   bool InfoWritten = false;
   bool FirstIframeSeen = false;
-  int FileNumber = 0;
-  off_t FrameOffset = -1;
+#define BUFFERSIZE (5 * TS_SIZE)
+  bool Buffering = false;
+  int BufferIndex = 0;
+  int MaxBufferIndex = 0;
+  uchar *Buffer = NULL;
   while (Running()) {
         int r;
         uchar *b = ringBuffer->Get(r);
@@ -141,16 +144,37 @@ void cRecorder::Action(void)
                        }
                     InfoWritten = true;
                     }
-                 if (frameDetector->NewPayload()) {
-                    FileNumber = fileName->Number();
-                    FrameOffset = fileSize;
+                 if (frameDetector->NewPayload()) { // We're at the first TS packet of a new payload...
+                    if (Buffering)
+                       esyslog("ERROR: encountered new payload while buffering - dropping some data!");
+                    if (!frameDetector->NewFrame()) { // ...but the frame type is yet unknown, so we need to buffer packets until we see the frame type
+                       if (!Buffer) {
+                          dsyslog("frame type not in first packet of payload - buffering");
+                          if (!(Buffer = MALLOC(uchar, BUFFERSIZE))) {
+                             esyslog("ERROR: can't allocate frame type buffer");
+                             break;
+                             }
+                          }
+                       BufferIndex = 0;
+                       Buffering = true;
+                       }
                     }
-                 if (FirstIframeSeen || frameDetector->IndependentFrame()) {
+                 else if (frameDetector->NewFrame()) // now we know the frame type, so stop buffering
+                    Buffering = false;
+                 if (Buffering) {
+                    if (BufferIndex + Count <= BUFFERSIZE) {
+                       memcpy(Buffer + BufferIndex, b, Count);
+                       BufferIndex += Count;
+                       }
+                    else
+                       esyslog("ERROR: too many bytes for frame type buffer (%d > %d) - dropped %d bytes", BufferIndex + Count, int(BUFFERSIZE), Count);
+                    }
+                 else if (FirstIframeSeen || frameDetector->IndependentFrame()) {
                     FirstIframeSeen = true; // start recording with the first I-frame
-                    if (!NextFile())
+                    if (frameDetector->IndependentFrame() && !NextFile()) // every file shall start with an independent frame
                        break;
                     if (index && frameDetector->NewFrame())
-                       index->Write(frameDetector->IndependentFrame(), FileNumber, FrameOffset);
+                       index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
                     if (frameDetector->IndependentFrame()) {
                        recordFile->Write(patPmtGenerator.GetPat(), TS_SIZE);
                        fileSize += TS_SIZE;
@@ -160,6 +184,12 @@ void cRecorder::Action(void)
                              fileSize += TS_SIZE;
                              }
                        }
+                    if (BufferIndex) {
+                       recordFile->Write(Buffer, BufferIndex); // if an error occurs here, the next write below will catch and report it
+                       if (BufferIndex > MaxBufferIndex)
+                          MaxBufferIndex = BufferIndex;
+                       BufferIndex = 0;
+                       }
                     if (recordFile->Write(b, Count) < 0) {
                        LOG_ERROR_STR(fileName->Name());
                        break;
@@ -177,4 +207,8 @@ void cRecorder::Action(void)
            t = time(NULL);
            }
         }
+  if (Buffer) {
+     free(Buffer);
+     dsyslog("frame type buffer used %d bytes", MaxBufferIndex);
+     }
 }
diff --git a/recording.c b/recording.c
index a8b40f2d3..4456bddb6 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.31 2011/06/12 13:04:28 kls Exp $
+ * $Id: recording.c 2.33 2011/08/13 12:37:25 kls Exp $
  */
 
 #include "recording.h"
@@ -1540,84 +1540,75 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
 :resumeFile(FileName, IsPesRecording)
 {
   f = -1;
-  fileName = NULL;
   size = 0;
   last = -1;
   index = NULL;
   isPesRecording = IsPesRecording;
   indexFileGenerator = NULL;
   if (FileName) {
-     const char *Suffix = isPesRecording ? INDEXFILESUFFIX ".vdr" : INDEXFILESUFFIX;
-     fileName = MALLOC(char, strlen(FileName) + strlen(Suffix) + 1);
-     if (fileName) {
-        strcpy(fileName, FileName);
-        char *pFileExt = fileName + strlen(fileName);
-        strcpy(pFileExt, Suffix);
-        int delta = 0;
-        if (!Record && access(fileName, R_OK) != 0) {
-           // Index file doesn't exist, so try to regenerate it:
-           if (!isPesRecording) { // sorry, can only do this for TS recordings
-              resumeFile.Delete(); // just in case
-              indexFileGenerator = new cIndexFileGenerator(FileName);
-              // Wait until the index file exists:
-              time_t tmax = time(NULL) + MAXWAITFORINDEXFILE;
-              do {
-                 cCondWait::SleepMs(INDEXFILECHECKINTERVAL); // start with a sleep, to give it a head start
-                 } while (access(fileName, R_OK) != 0 && time(NULL) < tmax);
-              }
+     fileName = IndexFileName(FileName, isPesRecording);
+     int delta = 0;
+     if (!Record && access(fileName, R_OK) != 0) {
+        // Index file doesn't exist, so try to regenerate it:
+        if (!isPesRecording) { // sorry, can only do this for TS recordings
+           resumeFile.Delete(); // just in case
+           indexFileGenerator = new cIndexFileGenerator(FileName);
+           // Wait until the index file exists:
+           time_t tmax = time(NULL) + MAXWAITFORINDEXFILE;
+           do {
+              cCondWait::SleepMs(INDEXFILECHECKINTERVAL); // start with a sleep, to give it a head start
+              } while (access(fileName, R_OK) != 0 && time(NULL) < tmax);
            }
-        if (access(fileName, R_OK) == 0) {
-           struct stat buf;
-           if (stat(fileName, &buf) == 0) {
-              delta = int(buf.st_size % sizeof(tIndexTs));
-              if (delta) {
-                 delta = sizeof(tIndexTs) - delta;
-                 esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, fileName);
-                 }
-              last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
-              if (!Record && last >= 0) {
-                 size = last + 1;
-                 index = MALLOC(tIndexTs, size);
-                 if (index) {
-                    f = open(fileName, O_RDONLY);
-                    if (f >= 0) {
-                       if (safe_read(f, index, size_t(buf.st_size)) != buf.st_size) {
-                          esyslog("ERROR: can't read from file '%s'", fileName);
-                          free(index);
-                          index = NULL;
-                          close(f);
-                          f = -1;
-                          }
-                       // we don't close f here, see CatchUp()!
-                       else if (isPesRecording)
-                          ConvertFromPes(index, size);
+        }
+     if (access(fileName, R_OK) == 0) {
+        struct stat buf;
+        if (stat(fileName, &buf) == 0) {
+           delta = int(buf.st_size % sizeof(tIndexTs));
+           if (delta) {
+              delta = sizeof(tIndexTs) - delta;
+              esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName);
+              }
+           last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
+           if (!Record && last >= 0) {
+              size = last + 1;
+              index = MALLOC(tIndexTs, size);
+              if (index) {
+                 f = open(fileName, O_RDONLY);
+                 if (f >= 0) {
+                    if (safe_read(f, index, size_t(buf.st_size)) != buf.st_size) {
+                       esyslog("ERROR: can't read from file '%s'", *fileName);
+                       free(index);
+                       index = NULL;
+                       close(f);
+                       f = -1;
                        }
-                    else
-                       LOG_ERROR_STR(fileName);
+                    // we don't close f here, see CatchUp()!
+                    else if (isPesRecording)
+                       ConvertFromPes(index, size);
                     }
                  else
-                    esyslog("ERROR: can't allocate %zd bytes for index '%s'", size * sizeof(tIndexTs), fileName);
+                    LOG_ERROR_STR(*fileName);
                  }
+              else
+                 esyslog("ERROR: can't allocate %zd bytes for index '%s'", size * sizeof(tIndexTs), *fileName);
               }
-           else
-              LOG_ERROR;
            }
-        else if (!Record)
-           isyslog("missing index file %s", fileName);
-        if (Record) {
-           if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, DEFFILEMODE)) >= 0) {
-              if (delta) {
-                 esyslog("ERROR: padding index file with %d '0' bytes", delta);
-                 while (delta--)
-                       writechar(f, 0);
-                 }
+        else
+           LOG_ERROR;
+        }
+     else if (!Record)
+        isyslog("missing index file %s", *fileName);
+     if (Record) {
+        if ((f = open(fileName, O_WRONLY | O_CREAT | O_APPEND, DEFFILEMODE)) >= 0) {
+           if (delta) {
+              esyslog("ERROR: padding index file with %d '0' bytes", delta);
+              while (delta--)
+                    writechar(f, 0);
               }
-           else
-              LOG_ERROR_STR(fileName);
            }
+        else
+           LOG_ERROR_STR(*fileName);
         }
-     else
-        esyslog("ERROR: can't copy file name '%s'", FileName);
      }
 }
 
@@ -1625,11 +1616,15 @@ cIndexFile::~cIndexFile()
 {
   if (f >= 0)
      close(f);
-  free(fileName);
   free(index);
   delete indexFileGenerator;
 }
 
+cString cIndexFile::IndexFileName(const char *FileName, bool IsPesRecording)
+{
+  return cString::sprintf("%s%s", FileName, IsPesRecording ? INDEXFILESUFFIX ".vdr" : INDEXFILESUFFIX);
+}
+
 void cIndexFile::ConvertFromPes(tIndexTs *IndexTs, int Count)
 {
   tIndexPes IndexPes;
@@ -1696,7 +1691,7 @@ bool cIndexFile::CatchUp(int Index)
                      last = newLast;
                      }
                   else
-                     LOG_ERROR_STR(fileName);
+                     LOG_ERROR_STR(*fileName);
                   }
                else {
                   esyslog("ERROR: can't realloc() index");
@@ -1705,7 +1700,7 @@ bool cIndexFile::CatchUp(int Index)
                }
             }
          else
-            LOG_ERROR_STR(fileName);
+            LOG_ERROR_STR(*fileName);
          if (Index < last - (i ? 2 * INDEXSAFETYLIMIT : 0) || Index > 10 * INDEXSAFETYLIMIT) // keep off the end in case of "Pause live video"
             break;
          cCondWait::SleepMs(1000);
@@ -1721,7 +1716,7 @@ bool cIndexFile::Write(bool Independent, uint16_t FileNumber, off_t FileOffset)
      if (isPesRecording)
         ConvertToPes(&i, 1);
      if (safe_write(f, &i, sizeof(i)) < 0) {
-        LOG_ERROR_STR(fileName);
+        LOG_ERROR_STR(*fileName);
         close(f);
         f = -1;
         return false;
@@ -1811,8 +1806,8 @@ bool cIndexFile::IsStillRecording()
 
 void cIndexFile::Delete(void)
 {
-  if (fileName) {
-     dsyslog("deleting index file '%s'", fileName);
+  if (*fileName) {
+     dsyslog("deleting index file '%s'", *fileName);
      if (f >= 0) {
         close(f);
         f = -1;
@@ -1821,6 +1816,15 @@ void cIndexFile::Delete(void)
      }
 }
 
+int cIndexFile::GetLength(const char *FileName, bool IsPesRecording)
+{
+  struct stat buf;
+  cString s = IndexFileName(FileName, IsPesRecording);
+  if (*s && stat(s, &buf) == 0)
+     return buf.st_size / (IsPesRecording ? sizeof(tIndexTs) : sizeof(tIndexPes));
+  return -1;
+}
+
 bool GenerateIndex(const char *FileName) 
 {
   if (DirectoryOk(FileName)) {
diff --git a/recording.h b/recording.h
index 8ec7f49e5..578dd4559 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.19 2011/04/17 13:18:04 kls Exp $
+ * $Id: recording.h 2.22 2011/08/13 12:51:23 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -120,15 +120,15 @@ class cRecording : public cListObject {
   void ReadInfo(void);
   bool WriteInfo(void);
   bool Delete(void);
-       // Changes the file name so that it will no longer be visible in the "Recordings" menu
-       // Returns false in case of error
+       ///< Changes the file name so that it will no longer be visible in the "Recordings" menu
+       ///< Returns false in case of error
   bool Remove(void);
-       // Actually removes the file from the disk
-       // Returns false in case of error
+       ///< Actually removes the file from the disk
+       ///< Returns false in case of error
   bool Undelete(void);
-       // Changes the file name so that it will be visible in the "Recordings" menu again and
-       // not processed by cRemoveDeletedRecordingsThread.
-       // Returns false in case of error
+       ///< Changes the file name so that it will be visible in the "Recordings" menu again and
+       ///< not processed by cRemoveDeletedRecordingsThread.
+       ///< Returns false in case of error
   };
 
 class cRecordings : public cList<cRecording>, public cThread {
@@ -236,13 +236,14 @@ class cIndexFileGenerator;
 class cIndexFile {
 private:
   int f;
-  char *fileName;
+  cString fileName;
   int size, last;
   tIndexTs *index;
   bool isPesRecording;
   cResumeFile resumeFile;
   cIndexFileGenerator *indexFileGenerator;
   cMutex mutex;
+  static cString IndexFileName(const char *FileName, bool IsPesRecording);
   void ConvertFromPes(tIndexTs *IndexTs, int Count);
   void ConvertToPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
@@ -259,6 +260,9 @@ class cIndexFile {
   bool StoreResume(int Index) { return resumeFile.Save(Index); }
   bool IsStillRecording(void);
   void Delete(void);
+  static int GetLength(const char *FileName, bool IsPesRecording = false);
+       ///< Calculates the recording length (numer of frames) without actually reading the index file.
+       ///< Returns -1 in case of error.
   };
 
 class cFileName {
diff --git a/remote.c b/remote.c
index cd3a75851..88773a5b0 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.3 2011/03/27 15:03:36 kls Exp $
+ * $Id: remote.c 2.4 2011/08/15 13:41:40 kls Exp $
  */
 
 #include "remote.h"
@@ -26,7 +26,7 @@
 eKeys cRemote::keys[MaxKeys];
 int cRemote::in = 0;
 int cRemote::out = 0;
-cTimeMs cRemote::repeatTimeout;
+cTimeMs cRemote::repeatTimeout(-1);
 cRemote *cRemote::learning = NULL;
 char *cRemote::unknownCode = NULL;
 cMutex cRemote::mutex;
diff --git a/remux.c b/remux.c
index c3f07fb70..f174f6145 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.57 2011/06/12 14:24:09 kls Exp $
+ * $Id: remux.c 2.58 2011/08/15 09:50:14 kls Exp $
  */
 
 #include "remux.h"
@@ -135,8 +135,11 @@ void TsSetTeiOnBrokenPackets(uchar *p, int l)
         if (!Processed[Pid]) {
            if (!TsPayloadStart(p))
               p[1] |= TS_ERROR;
-           else
+           else {
               Processed[Pid] = true;
+              int offs = TsPayloadOffset(p);
+              cRemux::SetBrokenLink(p + offs, TS_SIZE - offs);
+              }
            }
         l -= TS_SIZE;
         p += TS_SIZE;
diff --git a/skins.c b/skins.c
index a0815e268..834287307 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.1 2009/06/06 15:12:31 kls Exp $
+ * $Id: skins.c 2.2 2011/08/06 09:41:57 kls Exp $
  */
 
 #include "skins.h"
@@ -223,6 +223,10 @@ bool cSkins::SetCurrent(const char *Name)
 
 eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
 {
+  if (!cThread::IsMainThread()) {
+     dsyslog("cSkins::Message() called from background thread - ignored! (Use cSkins::QueueMessage() instead)");
+     return kNone;
+     }
   switch (Type) {
     case mtInfo:    isyslog("info: %s", s); break;
     case mtWarning: isyslog("warning: %s", s); break;
diff --git a/svdrpsend.pl b/svdrpsend.pl
index 03d78fea2..caf3b41f4 100755
--- a/svdrpsend.pl
+++ b/svdrpsend.pl
@@ -52,6 +52,6 @@ sub Error
 {
   print STDERR "@_\n";
   close(SOCK);
-  exit 0;
+  exit 1;
 }
 
diff --git a/timers.c b/timers.c
index 246fd8688..54ed1ba89 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.4 2010/01/16 11:18:53 kls Exp $
+ * $Id: timers.c 2.5 2011/08/06 13:13:54 kls Exp $
  */
 
 #include "timers.h"
@@ -29,6 +29,7 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
 {
   startTime = stopTime = 0;
   lastSetEvent = 0;
+  deferred = 0;
   recording = pending = inVpsMargin = false;
   flags = tfNone;
   if (Instant)
@@ -62,6 +63,7 @@ cTimer::cTimer(const cEvent *Event)
 {
   startTime = stopTime = 0;
   lastSetEvent = 0;
+  deferred = 0;
   recording = pending = inVpsMargin = false;
   flags = tfActive;
   if (Event->Vps() && Setup.UseVps)
@@ -118,6 +120,7 @@ cTimer& cTimer::operator= (const cTimer &Timer)
      startTime    = Timer.startTime;
      stopTime     = Timer.stopTime;
      lastSetEvent = 0;
+     deferred = 0;
      recording    = Timer.recording;
      pending      = Timer.pending;
      inVpsMargin  = Timer.inVpsMargin;
@@ -422,6 +425,10 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
         day = 0;
      }
 
+  if (t < deferred)
+     return false;
+  deferred = 0;
+
   if (HasFlags(tfActive)) {
      if (HasFlags(tfVps) && event && event->Vps()) {
         if (Margin || !Directly) {
@@ -589,6 +596,12 @@ void cTimer::SetPriority(int Priority)
   priority = Priority;
 }
 
+void cTimer::SetDeferred(int Seconds)
+{
+  deferred = time(NULL) + Seconds;
+  isyslog("timer %s deferred for %d seconds", *ToDescr(), Seconds);
+}
+
 void cTimer::SetFlags(uint Flags)
 {
   flags |= Flags;
diff --git a/timers.h b/timers.h
index 8f67add62..1d733ee09 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.0 2008/02/16 14:33:23 kls Exp $
+ * $Id: timers.h 2.1 2011/08/06 12:59:32 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -29,6 +29,7 @@ class cTimer : public cListObject {
 private:
   mutable time_t startTime, stopTime;
   time_t lastSetEvent;
+  mutable time_t deferred; ///< Matches(time_t, ...) will return false if the current time is before this value
   bool recording, pending, inVpsMargin;
   uint flags;
   cChannel *channel;
@@ -62,6 +63,7 @@ class cTimer : public cListObject {
   const char *File(void) const { return file; }
   time_t FirstDay(void) const { return weekdays ? day : 0; }
   const char *Aux(void) const { return aux; }
+  time_t Deferred(void) const { return deferred; }
   cString ToText(bool UseChannelID = false) const;
   cString ToDescr(void) const;
   const cEvent *Event(void) const { return event; }
@@ -85,6 +87,7 @@ class cTimer : public cListObject {
   void SetPending(bool Pending);
   void SetInVpsMargin(bool InVpsMargin);
   void SetPriority(int Priority);
+  void SetDeferred(int Seconds);
   void SetFlags(uint Flags);
   void ClrFlags(uint Flags);
   void InvFlags(uint Flags);
diff --git a/tools.c b/tools.c
index 6a98bf69b..c9a3a44e3 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.14 2011/04/29 14:51:14 kls Exp $
+ * $Id: tools.c 2.17 2011/08/15 13:35:23 kls Exp $
  */
 
 #include "tools.h"
@@ -261,7 +261,7 @@ int numdigits(int n)
 
 bool isnumber(const char *s)
 {
-  if (!*s)
+  if (!s || !*s)
      return false;
   do {
      if (!isdigit(*s))
@@ -270,6 +270,21 @@ bool isnumber(const char *s)
   return true;
 }
 
+int64_t StrToNum(const char *s)
+{
+  char *t = NULL;
+  int64_t n = strtoll(s, &t, 10);
+  if (t) {
+     switch (*t) {
+       case 'T': n *= 1024;
+       case 'G': n *= 1024;
+       case 'M': n *= 1024;
+       case 'K': n *= 1024;
+       }
+     }
+  return n;
+}
+
 cString AddDirectory(const char *DirName, const char *FileName)
 {
   return cString::sprintf("%s/%s", DirName && *DirName ? DirName : ".", FileName);
@@ -556,7 +571,10 @@ time_t LastModifiedTime(const char *FileName)
 
 cTimeMs::cTimeMs(int Ms)
 {
-  Set(Ms);
+  if (Ms >= 0)
+     Set(Ms);
+  else
+     begin = 0;
 }
 
 uint64_t cTimeMs::Now(void)
diff --git a/tools.h b/tools.h
index f17c5642e..3d13c191d 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.7 2011/02/25 15:05:58 kls Exp $
+ * $Id: tools.h 2.11 2011/08/15 14:13:42 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -45,7 +45,7 @@ extern int SysLogLevel;
 
 #define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
 
-#define DELETENULL(p) (delete (p), p = NULL)
+template<class T> inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q; } 
 
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 #define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
@@ -205,6 +205,12 @@ bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
 int numdigits(int n);
 bool isnumber(const char *s);
+int64_t StrToNum(const char *s);
+    ///< Converts the given string to a number.
+    ///< The numerical part of the string may be followed by one of the letters
+    ///< K, M, G or T to abbreviate Kilo-, Mega-, Giga- or Terabyte, respectively
+    ///< (based on 1024). Everything after the first non-numeric character is
+    ///< silently ignored, as are any characters other than the ones mentionend here.
 cString itoa(int n);
 cString AddDirectory(const char *DirName, const char *FileName);
 bool EntriesOnSameFileSystem(const char *File1, const char *File2);
@@ -266,6 +272,8 @@ class cTimeMs {
 public:
   cTimeMs(int Ms = 0);
       ///< Creates a timer with ms resolution and an initial timeout of Ms.
+      ///< If Ms is negative the timer is not initialized with the current
+      ///< time.
   static uint64_t Now(void);
   void Set(int Ms = 0);
   bool TimedOut(void);
@@ -506,12 +514,23 @@ inline int CompareStrings(const void *a, const void *b)
   return strcmp(*(const char **)a, *(const char **)b);
 }
 
+inline int CompareStringsIgnoreCase(const void *a, const void *b)
+{
+  return strcasecmp(*(const char **)a, *(const char **)b);
+}
+
 class cStringList : public cVector<char *> {
 public:
   cStringList(int Allocated = 10): cVector<char *>(Allocated) {}
   virtual ~cStringList();
   int Find(const char *s) const;
-  void Sort(void) { cVector<char *>::Sort(CompareStrings); }
+  void Sort(bool IgnoreCase = false)
+  {
+    if (IgnoreCase)
+       cVector<char *>::Sort(CompareStringsIgnoreCase);
+    else
+       cVector<char *>::Sort(CompareStrings);
+  }
   virtual void Clear(void);
   };
 
diff --git a/vdr.1 b/vdr.1
index ea93bddaa..4c0a97853 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.5 2010/04/02 12:22:08 kls Exp $
+.\" $Id: vdr.1 2.6 2011/08/15 12:28:54 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -66,6 +66,15 @@ Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
 .TP
+.BI \-\-filesize= size
+Limit video files to \fIsize\fR bytes (default is 2000M).
+This option is only useful in conjunction with --edit, and must precede that
+option to have an effect.
+\fIsize\fR is an integer number and may be followed by one of the letters K, M, G or T
+to abbreviate Kilo-, Mega-, Giga- or Terabyte, respectively.
+The given value is silently limited to the program's internal minimum and
+maximum values.
+.TP
 .BI \-\-genindex= rec
 Generate the index file for the given recording.
 \fIrec\fR must be the full path name of an existing recording.
@@ -157,6 +166,11 @@ more information.
 Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
 information.
 .TP
+.BI \-\-split
+Split edited files at the editing marks.
+This option is only useful in conjunction with --edit, and must precede that
+option to have an effect.
+.TP
 .BI \-t\  tty ,\ \-\-terminal= tty
 Set the controlling terminal.
 .TP
diff --git a/vdr.c b/vdr.c
index ad86f5a8b..c32e45fda 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.21 2011/06/13 14:40:12 kls Exp $
+ * $Id: vdr.c 2.23 2011/08/15 12:42:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -223,6 +223,7 @@ int main(int argc, char *argv[])
       { "device",   required_argument, NULL, 'D' },
       { "edit",     required_argument, NULL, 'e' | 0x100 },
       { "epgfile",  required_argument, NULL, 'E' },
+      { "filesize", required_argument, NULL, 'f' | 0x100 },
       { "genindex", required_argument, NULL, 'g' | 0x100 },
       { "grab",     required_argument, NULL, 'g' },
       { "help",     no_argument,       NULL, 'h' },
@@ -238,6 +239,7 @@ int main(int argc, char *argv[])
       { "rcu",      optional_argument, NULL, 'r' | 0x100 },
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
+      { "split",    no_argument,       NULL, 's' | 0x100 },
       { "terminal", required_argument, NULL, 't' },
       { "user",     required_argument, NULL, 'u' },
       { "userdump", no_argument,       NULL, 'u' | 0x100 },
@@ -270,6 +272,13 @@ int main(int argc, char *argv[])
                     return CutRecording(optarg) ? 0 : 2;
           case 'E': EpgDataFileName = (*optarg != '-' ? optarg : NULL);
                     break;
+          case 'f' | 0x100:
+                    Setup.MaxVideoFileSize = StrToNum(optarg) / MEGABYTE(1);
+                    if (Setup.MaxVideoFileSize < MINVIDEOFILESIZE)
+                       Setup.MaxVideoFileSize = MINVIDEOFILESIZE;
+                    if (Setup.MaxVideoFileSize > MAXVIDEOFILESIZETS)
+                       Setup.MaxVideoFileSize = MAXVIDEOFILESIZETS;
+                    break;
           case 'g' | 0x100:
                     return GenerateIndex(optarg) ? 0 : 2;
           case 'g': cSVDRP::SetGrabImageDir(*optarg != '-' ? optarg : NULL);
@@ -348,6 +357,9 @@ int main(int argc, char *argv[])
                     break;
           case 's': ShutdownHandler.SetShutdownCommand(optarg);
                     break;
+          case 's' | 0x100:
+                    Setup.SplitEditedFiles = 1;
+                    break;
           case 't': Terminal = optarg;
                     if (access(Terminal, R_OK | W_OK) < 0) {
                        fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
@@ -419,6 +431,8 @@ int main(int argc, char *argv[])
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
+               "            --filesize=SIZE limit video files to SIZE bytes (default is %dM)\n"
+               "                           only useful in conjunction with --edit\n"
                "            --genindex=REC generate index for recording REC and exit\n"
                "  -g DIR,   --grab=DIR     write images from the SVDRP command GRAB into the\n"
                "                           given DIR; DIR must be the full path name of an\n"
@@ -445,6 +459,8 @@ int main(int argc, char *argv[])
                "                           (default: %s)\n"
                "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
+               "            --split        split edited files at the editing marks (only\n"
+               "                           useful in conjunction with --edit)\n"
                "  -t TTY,   --terminal=TTY controlling tty\n"
                "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
                "                           root\n"
@@ -458,6 +474,7 @@ int main(int argc, char *argv[])
                "\n",
                DEFAULTCONFDIR,
                DEFAULTEPGDATAFILENAME,
+               MAXVIDEOFILESIZEDEFAULT,
                DEFAULTPLUGINDIR,
                LIRC_DEVICE,
                LOCDIR,
@@ -704,12 +721,14 @@ int main(int argc, char *argv[])
 
   if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
      dsyslog("not all devices ready after %d seconds", DEVICEREADYTIMEOUT);
-  if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
-     if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
-        Setup.InitialChannel = Channel->GetChannelID().ToString();
+  if (*Setup.InitialChannel) {
+     if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
+        if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
+           Setup.InitialChannel = Channel->GetChannelID().ToString();
+        }
+     if (cChannel *Channel = Channels.GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
+        Setup.CurrentChannel = Channel->Number();
      }
-  if (cChannel *Channel = Channels.GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
-     Setup.CurrentChannel = Channel->Number();
   if (Setup.InitialVolume >= 0)
      Setup.CurrentVolume = Setup.InitialVolume;
   Channels.SwitchTo(Setup.CurrentChannel);

From 0c96d6b62650790dc83ce6621eb664e51f39719b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 4 Sep 2011 15:42:00 +0200
Subject: [PATCH 207/307] Version 1.7.21 Original announce message: VDR
 developer version 1.7.21 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.21.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.20-1.7.21.diff

MD5 checksums:

7300bfd997db1a848bd774fefe4aec80  vdr-1.7.21.tar.bz2
c4e745939f31543dd607b97d58fc86be  vdr-1.7.20-1.7.21.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

This version contains functions to determine the "signal strength"
and "signal quality" through cDevice. If you are using a DVB card that
contains an stb0899 frontend chip (like the TT-budget S2-3200) you may
want to apply the patches from

   ftp://ftp.tvdr.de/vdr/Developer/Driver-Patches

to the LinuxDVB driver source in order to receive useful results from
that frontend.

From the HISTORY file:
- Fixed detecting frames for channels that split frames into several payloads
  (reported by Derek Kelly).
- Now initializing Setup.InitialChannel to an empty string to avoid problems in
  case there is no setup.conf.
- The start time of an edited recording is now set to the time of the first
  editing mark (thanks to Udo Richter).
  This obsoletes the CUTTIME patch.
- Direct access to the members start, priority, lifetime, and deleted of cRecording
  as well as to position and comment of cMark is now deprecated. Plugin authors
  should switch to the new access functions for these members. For now the macro
  __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS is defined in recording.h, which
  exposes these members, so that existing plugins will still compile. Comment out
  this #define to check whether a particular plugin needs to be modified.
  This #define may be removed in a future version.
- The new functions cRecording::NumFrames() and cRecording::LengthInSeconds() return
  the number of frames and length (in seconds) of a recording (suggested by Steffen
  Barszus).
- The subtitle PIDs are now stored in the channels.conf file as an extension to the
  TPID field (thanks to Rolf Ahrenberg).
- The new function cDevice::ProvidesEIT() is used to determine whether a device can
  provide EIT data and will thus be used in cEITScanner::Process() to receive EIT
  data from the channels it can receive (suggested by Rolf Ahrenberg). Note that by
  default it is assumed that a device can't provide EIT data, and only the builtin
  cDvbDevice returns true from this function.
- The Audio and Subtitles options are now available through the Green and Yellow
  keys in the Setup/DVB menu (thanks to Rolf Ahrenberg). This is mainly for remote
  controls that don't have dedicated keys for these functions.
- The SVDRP command HITK now accepts multiple keys (up to 31).
- The Recordings menu now displays the length (in hours:minutes) of each recording
  (thanks to Rolf Ahrenberg). Note that the "new" indicator has been moved from the
  recording time to the length column. This new format is also used by the SVDRP
  command LSTR, so in case you have an application that parses the LSTR output,
  you will need to adjust it to the new format.
- The dvbsddevice plugin now supports the new option --outputonly, which disables
  receiving on SD FF devices and uses the device only for output (thanks to Udo
  Richter).
- Fixed detecting frames on radio channels (reported by Chris Mayo).
- Revoked the changes to cFrameDetector that have been introduced in version 1.7.19.
  Detecting frames in case the Picture Start Code or Access Unit Delimiter
  extends over TS packet boundaries is now done by locally skipping TS packets
  in cFrameDetector.
---
 CONTRIBUTORS                            |  14 ++++
 HISTORY                                 |  44 ++++++++++
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   6 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |  24 +++++-
 PLUGINS/src/dvbhddevice/hdffcmd.c       |   3 +-
 PLUGINS/src/dvbhddevice/hdffmsgdef.h    |  11 ++-
 PLUGINS/src/dvbhddevice/po/de_DE.po     |  25 ++++--
 PLUGINS/src/dvbhddevice/po/fi_FI.po     | 104 ++++++++++++++++++++++++
 PLUGINS/src/dvbhddevice/po/it_IT.po     |  26 ++++--
 PLUGINS/src/dvbhddevice/setup.c         |  40 ++++++---
 PLUGINS/src/dvbhddevice/setup.h         |   3 +-
 PLUGINS/src/dvbsddevice/HISTORY         |   4 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |  30 ++++++-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |  20 ++++-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |  11 ++-
 PLUGINS/src/skincurses/skincurses.c     |   4 +-
 channels.c                              |  48 +++++++++--
 config.c                                |   4 +-
 config.h                                |  10 +--
 cutter.c                                |  14 +++-
 device.c                                |   7 +-
 device.h                                |   6 +-
 dvbdevice.c                             |   7 +-
 dvbdevice.h                             |   3 +-
 eitscan.c                               |   4 +-
 epg.data                                |   0
 menu.c                                  | 102 +++++++++++++----------
 po/ar.po                                |  14 ++--
 po/ca_ES.po                             |  14 ++--
 po/cs_CZ.po                             |  14 ++--
 po/da_DK.po                             |  14 ++--
 po/de_DE.po                             |  14 ++--
 po/el_GR.po                             |  14 ++--
 po/es_ES.po                             |  14 ++--
 po/et_EE.po                             |  14 ++--
 po/fi_FI.po                             |  14 ++--
 po/fr_FR.po                             |  14 ++--
 po/hr_HR.po                             |  14 ++--
 po/hu_HU.po                             |  14 ++--
 po/it_IT.po                             |  14 ++--
 po/lt_LT.po                             |  14 ++--
 po/mk_MK.po                             |  14 ++--
 po/nl_NL.po                             |  14 ++--
 po/nn_NO.po                             |  14 ++--
 po/pl_PL.po                             |  14 ++--
 po/pt_PT.po                             |  14 ++--
 po/ro_RO.po                             |  14 ++--
 po/ru_RU.po                             |  14 ++--
 po/sk_SK.po                             |  14 ++--
 po/sl_SI.po                             |  14 ++--
 po/sr_SR.po                             |  14 ++--
 po/sv_SE.po                             |  14 ++--
 po/tr_TR.po                             |  14 ++--
 po/uk_UA.po                             |  14 ++--
 po/zh_CN.po                             |  14 ++--
 recorder.c                              |  50 ++----------
 recording.c                             |  81 +++++++++++-------
 recording.h                             |  35 +++++++-
 remux.c                                 |  83 ++++++++++---------
 remux.h                                 |  12 +--
 skinclassic.c                           |   4 +-
 skins.c                                 |   8 +-
 skinsttng.c                             |   4 +-
 svdrp.c                                 |  37 ++++++---
 vdr.5                                   |  13 ++-
 65 files changed, 842 insertions(+), 451 deletions(-)
 create mode 100644 PLUGINS/src/dvbhddevice/po/fi_FI.po
 delete mode 100644 epg.data

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2aa2c21dc..be533c18c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -743,6 +743,7 @@ Steffen Barszus <st_barszus@gmx.de>
  for helping to debug a crash when using the --terminal option without having access
  to the given terminal
  for fixing following symbolic links in RemoveFileOrDir()
+ for suggesting to cache the length of a recording's index
 
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
@@ -1111,6 +1112,11 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing some crashes in subtitle display
  for reporting that DELETENULL() was not thread safe
  for reporting a crash in subtitle display, related to cOsd::Osds
+ for a patch that stores the subtitle PIDs in the channels.conf file
+ for suggesting to implement a way for devices to tell whether they can provide EIT data
+ for making the Audio and Subtitles options available through the Green and Yellow
+ keys in the Setup/DVB menu
+ for making the Recordings menu display the length (in hours:minutes) of each recording
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1708,6 +1714,9 @@ Udo Richter <udo_richter@gmx.de>
  the marks file has just been written"
  for suggesting a fix for a bug in handling DiSEqC codes
  for fixing handling the channelID in cMenuEditChanItem
+ for a patch that sets the start time of an edited recording to the time of the first
+ editing mark
+ for adding the option --outputonly to the dvbsddevice plugin
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2593,6 +2602,8 @@ Derek Kelly (user.vdr@gmail.com)
  for reporting a problem with the fps value in the info file of a recording being
  overwritten in case a recording was interrupted and resumed, and the fps value
  could not be determined after resuming recording
+ for reporting a problem with detecting frames for channels that split frames into
+ several payloads
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2760,3 +2771,6 @@ Mark Hawes <MARK.HAWES@au.fujitsu.com>
 Frank Niederwipper <f.niederwipper@gmail.com>
  for reporting a problem in timer handling in case a recording directory can't
  be created
+
+Chris Mayo <aklhfex@gmail.com>
+ for reporting a problem with detecting frames on radio channels
diff --git a/HISTORY b/HISTORY
index b50068940..42473309f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6698,3 +6698,47 @@ Video Disk Recorder Revision History
 - cTimeMs is no longer initialized to the current time if the value given to the
   constructor is negative (avoids the "cTimeMs: using monotonic clock..." log message
   before VDR's starting log message).
+
+2011-09-04: Version 1.7.21
+
+- Fixed detecting frames for channels that split frames into several payloads
+  (reported by Derek Kelly).
+- Now initializing Setup.InitialChannel to an empty string to avoid problems in
+  case there is no setup.conf.
+- The start time of an edited recording is now set to the time of the first
+  editing mark (thanks to Udo Richter).
+  This obsoletes the CUTTIME patch.
+- Direct access to the members start, priority, lifetime, and deleted of cRecording
+  as well as to position and comment of cMark is now deprecated. Plugin authors
+  should switch to the new access functions for these members. For now the macro
+  __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS is defined in recording.h, which
+  exposes these members, so that existing plugins will still compile. Comment out
+  this #define to check whether a particular plugin needs to be modified.
+  This #define may be removed in a future version.
+- The new functions cRecording::NumFrames() and cRecording::LengthInSeconds() return
+  the number of frames and length (in seconds) of a recording (suggested by Steffen
+  Barszus).
+- The subtitle PIDs are now stored in the channels.conf file as an extension to the
+  TPID field (thanks to Rolf Ahrenberg).
+- The new function cDevice::ProvidesEIT() is used to determine whether a device can
+  provide EIT data and will thus be used in cEITScanner::Process() to receive EIT
+  data from the channels it can receive (suggested by Rolf Ahrenberg). Note that by
+  default it is assumed that a device can't provide EIT data, and only the builtin
+  cDvbDevice returns true from this function.
+- The Audio and Subtitles options are now available through the Green and Yellow
+  keys in the Setup/DVB menu (thanks to Rolf Ahrenberg). This is mainly for remote
+  controls that don't have dedicated keys for these functions.
+- The SVDRP command HITK now accepts multiple keys (up to 31).
+- The Recordings menu now displays the length (in hours:minutes) of each recording
+  (thanks to Rolf Ahrenberg). Note that the "new" indicator has been moved from the
+  recording time to the length column. This new format is also used by the SVDRP
+  command LSTR, so in case you have an application that parses the LSTR output,
+  you will need to adjust it to the new format.
+- The dvbsddevice plugin now supports the new option --outputonly, which disables
+  receiving on SD FF devices and uses the device only for output (thanks to Udo
+  Richter).
+- Fixed detecting frames on radio channels (reported by Chris Mayo).
+- Revoked the changes to cFrameDetector that have been introduced in version 1.7.19.
+  Detecting frames in case the Picture Start Code or Access Unit Delimiter
+  extends over TS packet boundaries is now done by locally skipping TS packets
+  in cFrameDetector.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 4745c3775..0ad1698db 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.13 2011/04/24 09:31:21 kls Exp $
+ * $Id: dvbhddevice.c 1.14 2011/08/27 09:31:45 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -11,7 +11,7 @@
 #include "setup.h"
 
 static const char *VERSION        = "0.0.4";
-static const char *DESCRIPTION    = "HD Full Featured DVB device";
+static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 
 class cPluginDvbhddevice : public cPlugin {
 private:
@@ -20,7 +20,7 @@ class cPluginDvbhddevice : public cPlugin {
   cPluginDvbhddevice(void);
   virtual ~cPluginDvbhddevice();
   virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *Description(void) { return tr(DESCRIPTION); }
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 714769ebc..ff3f953b8 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.32 2011/05/22 15:19:59 kls Exp $
+ * $Id: dvbhdffdevice.c 1.33 2011/08/27 09:32:18 kls Exp $
  */
 
 #include "dvbhdffdevice.h"
@@ -54,6 +54,7 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
      hdmiConfig.TransmitAudio = true;
      hdmiConfig.ForceDviMode = false;
      hdmiConfig.CecEnabled = gHdffSetup.CecEnabled;
+     hdmiConfig.VideoModeAdaption = (HDFF::eVideoModeAdaption) gHdffSetup.VideoModeAdaption;
      mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
      if (gHdffSetup.CecEnabled)
         mHdffCmdIf->CmdHdmiSendCecCommand(HDFF::cecCommandTvOn);
@@ -110,7 +111,7 @@ void cDvbHdFfDevice::SetVideoFormat(bool VideoFormat16_9)
 {
   HDFF::tVideoFormat videoFormat;
   videoFormat.AutomaticEnabled = true;
-  videoFormat.AfdEnabled = false;
+  videoFormat.AfdEnabled = true;
   videoFormat.TvFormat = (HDFF::eTvFormat) gHdffSetup.TvFormat;
   videoFormat.VideoConversion = (HDFF::eVideoConversion) gHdffSetup.VideoConversion;
   mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
@@ -729,10 +730,25 @@ bool cDvbHdFfDeviceProbe::Probe(int Adapter, int Frontend)
     0x13C2300A, // Technotrend S2-6400 HDFF production version
     0x00000000
     };
-  uint32_t SubsystemId = GetSubsystemId(Adapter, Frontend);
+  cString FileName;
+  cReadLine ReadLine;
+  FILE *f = NULL;
+  uint32_t SubsystemId = 0;
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId = strtoul(s, NULL, 0) << 16;
+     fclose(f);
+     }
+  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
+  if ((f = fopen(FileName, "r")) != NULL) {
+     if (char *s = ReadLine.Read(f))
+        SubsystemId |= strtoul(s, NULL, 0);
+     fclose(f);
+     }
   for (uint32_t *sid = SubsystemIds; *sid; sid++) {
       if (*sid == SubsystemId) {
-         cString FileName = cString::sprintf("/dev/dvb/adapter%d/osd0", Adapter);
+         FileName = cString::sprintf("/dev/dvb/adapter%d/osd0", Adapter);
          int fd = open(FileName, O_RDWR);
          if (fd != -1) { //TODO treat the second path of the S2-6400 as a budget device
             close(fd);
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index 82869df1f..60ad70e7f 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.20 2011/04/24 09:31:59 kls Exp $
+ * $Id: hdffcmd.c 1.21 2011/08/27 09:34:18 kls Exp $
  */
 
 #include "hdffcmd.h"
@@ -1089,6 +1089,7 @@ void cHdffCmdIf::CmdHdmiConfigure(const tHdmiConfig * pConfig)
     {
         cmdBuf.SetBits(1, 0);
     }
+    cmdBuf.SetBits(3, (uint32_t) pConfig->VideoModeAdaption);
     osd_cmd.cmd_len = CmdSetLength(cmdBuf);
     ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
 }
diff --git a/PLUGINS/src/dvbhddevice/hdffmsgdef.h b/PLUGINS/src/dvbhddevice/hdffmsgdef.h
index a6c3f4b3e..d63e88a56 100644
--- a/PLUGINS/src/dvbhddevice/hdffmsgdef.h
+++ b/PLUGINS/src/dvbhddevice/hdffmsgdef.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffmsgdef.h 1.12 2011/04/17 11:20:22 kls Exp $
+ * $Id: hdffmsgdef.h 1.13 2011/08/27 09:34:43 kls Exp $
  */
 
 #ifndef _HDFF_MSGDEF_H_
@@ -274,6 +274,14 @@ typedef enum _eHdmiVideoMode
     videoModeMaxValue
 } eHdmiVideoMode;
 
+typedef enum _eVideoModeAdaption
+{
+    videoModeAdaptOff,
+    videoModeAdaptFrameRate,
+    videoModeAdaptOnlyForHd,
+    videoModeAdaptAlways
+} eVideoModeAdaption;
+
 typedef enum _eCecCommand
 {
     cecCommandTvOn,
@@ -287,6 +295,7 @@ typedef struct _tHdmiConfig
     bool TransmitAudio;
     bool ForceDviMode;
     bool CecEnabled;
+    eVideoModeAdaption VideoModeAdaption;
 } tHdmiConfig;
 
 // Remote control definitions
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index 907f24370..78ace1bfe 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -7,15 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR \n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-05-05 20:34+0200\n"
+"POT-Creation-Date: 2011-08-21 14:02+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Christoph Haubrich\n"
 "Language-Team: <see README>\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "HD Full Featured DVB device"
+msgstr "HD Full Featured DVB device"
+
+msgid "Off"
+msgstr "aus"
+
+msgid "Frame rate"
+msgstr "passende Framerate"
+
+msgid "HD Only"
+msgstr "nur bei HD"
+
+msgid "Always"
+msgstr "immer"
+
 msgid "Automatic"
 msgstr "automatisch"
 
@@ -40,9 +55,6 @@ msgstr "abgeschaltet"
 msgid "Analogue only"
 msgstr "nur Analoge Ausgänge"
 
-msgid "Always"
-msgstr "immer"
-
 msgid "HDMI only"
 msgstr "nur HDMI"
 
@@ -55,6 +67,9 @@ msgstr "keins"
 msgid "Resolution"
 msgstr "Auflösung"
 
+msgid "Video Mode Adaption"
+msgstr "Auflösungsanpassung"
+
 msgid "TV format"
 msgstr "TV-Format"
 
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
new file mode 100644
index 000000000..db8ef0b75
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -0,0 +1,104 @@
+# VDR plugin language source file
+# Copyright (C) 2011 Andreas Regel
+# This file is distributed under the same license as the dvbhddevice package.
+# Christoph Haubrich, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR \n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2011-08-21 14:02+0200\n"
+"PO-Revision-Date: 2011-04-25 21:44+0200\n"
+"Last-Translator: Rolf Ahrenberg\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "HD Full Featured DVB device"
+msgstr "DVB-laite HD-ulostulolla"
+
+msgid "Off"
+msgstr ""
+
+msgid "Frame rate"
+msgstr ""
+
+msgid "HD Only"
+msgstr ""
+
+msgid "Always"
+msgstr "aina"
+
+msgid "Automatic"
+msgstr "automaattinen"
+
+msgid "Letterbox 16/9"
+msgstr "letterbox 16:9"
+
+msgid "Letterbox 14/9"
+msgstr "letterbox 14:9"
+
+msgid "Pillarbox"
+msgstr "pillarbox"
+
+msgid "CentreCutOut"
+msgstr "center cut out"
+
+msgid "Always 16/9"
+msgstr "aina 16:9"
+
+msgid "Disabled"
+msgstr "ei käytössä"
+
+msgid "Analogue only"
+msgstr "vain analoginen"
+
+msgid "HDMI only"
+msgstr "vain HDMI"
+
+msgid "Follow resolution"
+msgstr "resoluution mukaan"
+
+msgid "none"
+msgstr "ei"
+
+msgid "Resolution"
+msgstr "Kuvaresoluutio"
+
+msgid "Video Mode Adaption"
+msgstr ""
+
+msgid "TV format"
+msgstr "Näytön kuvasuhde"
+
+msgid "Video Conversion"
+msgstr "Näyttömuoto"
+
+msgid "Analogue Video"
+msgstr "Analoginen kuvalähtö"
+
+msgid "Audio Delay (ms)"
+msgstr "Äänen viive (ms)"
+
+msgid "Audio Downmix"
+msgstr "Äänen alasmiksaus"
+
+msgid "OSD Size"
+msgstr "Kuvaruutunäytön koko"
+
+msgid "HDMI CEC"
+msgstr "Käytä HDMI CEC-toimintoa"
+
+msgid "Remote Control Protocol"
+msgstr "Kaukosäätimen protokolla"
+
+msgid "Remote Control Address"
+msgstr "Kaukosäätimen osoite"
+
+msgid "High Level OSD"
+msgstr "Käytä korkean tason kuvaruutunäyttöä"
+
+msgid "Allow True Color OSD"
+msgstr "Salli tosivärit kuvaruutunäytölle"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index a328312c1..bafb2c55e 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-05-05 20:34+0200\n"
+"POT-Creation-Date: 2011-08-21 14:02+0200\n"
 "PO-Revision-Date: 2011-07-10 00:23+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
-"Language: \n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,6 +19,21 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+msgid "HD Full Featured DVB device"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Frame rate"
+msgstr ""
+
+msgid "HD Only"
+msgstr ""
+
+msgid "Always"
+msgstr "Sempre"
+
 msgid "Automatic"
 msgstr "Automatica"
 
@@ -43,9 +58,6 @@ msgstr "Disabilitata"
 msgid "Analogue only"
 msgstr "Solo analogica"
 
-msgid "Always"
-msgstr "Sempre"
-
 msgid "HDMI only"
 msgstr "Solo HDMI"
 
@@ -58,6 +70,9 @@ msgstr "nessuna"
 msgid "Resolution"
 msgstr "Risoluzione"
 
+msgid "Video Mode Adaption"
+msgstr ""
+
 msgid "TV format"
 msgstr "Formato TV"
 
@@ -90,4 +105,3 @@ msgstr "OSD alto livello"
 
 msgid "Allow True Color OSD"
 msgstr "Permetti OSD True Color"
-
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index 30365e0aa..6e41860f8 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c 1.12 2011/05/15 14:47:45 kls Exp $
+ * $Id: setup.c 1.13 2011/08/27 09:35:35 kls Exp $
  */
 
 #include "setup.h"
@@ -20,6 +20,7 @@ cHdffSetup gHdffSetup;
 cHdffSetup::cHdffSetup(void)
 {
     Resolution = kResolution1080i;
+    VideoModeAdaption = HDFF::videoModeAdaptOff;
     TvFormat = HDFF::tvFormat16by9;
     VideoConversion = HDFF::videoConversionPillarbox;
     AnalogueVideo = HDFF::videoOutCvbsYuv;
@@ -35,18 +36,19 @@ cHdffSetup::cHdffSetup(void)
 
 bool cHdffSetup::SetupParse(const char *Name, const char *Value)
 {
-    if      (strcmp(Name, "Resolution")      == 0) Resolution      = atoi(Value);
-    else if (strcmp(Name, "TvFormat")        == 0) TvFormat        = atoi(Value);
-    else if (strcmp(Name, "VideoConversion") == 0) VideoConversion = atoi(Value);
-    else if (strcmp(Name, "AnalogueVideo")   == 0) AnalogueVideo   = atoi(Value);
-    else if (strcmp(Name, "AudioDelay")      == 0) AudioDelay      = atoi(Value);
-    else if (strcmp(Name, "AudioDownmix")    == 0) AudioDownmix    = atoi(Value);
-    else if (strcmp(Name, "OsdSize")         == 0) OsdSize         = atoi(Value);
-    else if (strcmp(Name, "CecEnabled")      == 0) CecEnabled      = atoi(Value);
-    else if (strcmp(Name, "RemoteProtocol")  == 0) RemoteProtocol  = atoi(Value);
-    else if (strcmp(Name, "RemoteAddress")   == 0) RemoteAddress   = atoi(Value);
-    else if (strcmp(Name, "HighLevelOsd")    == 0) HighLevelOsd    = atoi(Value);
-    else if (strcmp(Name, "TrueColorOsd")    == 0) TrueColorOsd    = atoi(Value);
+    if      (strcmp(Name, "Resolution")        == 0) Resolution        = atoi(Value);
+    else if (strcmp(Name, "VideoModeAdaption") == 0) VideoModeAdaption = atoi(Value);
+    else if (strcmp(Name, "TvFormat")          == 0) TvFormat          = atoi(Value);
+    else if (strcmp(Name, "VideoConversion")   == 0) VideoConversion   = atoi(Value);
+    else if (strcmp(Name, "AnalogueVideo")     == 0) AnalogueVideo     = atoi(Value);
+    else if (strcmp(Name, "AudioDelay")        == 0) AudioDelay        = atoi(Value);
+    else if (strcmp(Name, "AudioDownmix")      == 0) AudioDownmix      = atoi(Value);
+    else if (strcmp(Name, "OsdSize")           == 0) OsdSize           = atoi(Value);
+    else if (strcmp(Name, "CecEnabled")        == 0) CecEnabled        = atoi(Value);
+    else if (strcmp(Name, "RemoteProtocol")    == 0) RemoteProtocol    = atoi(Value);
+    else if (strcmp(Name, "RemoteAddress")     == 0) RemoteAddress     = atoi(Value);
+    else if (strcmp(Name, "HighLevelOsd")      == 0) HighLevelOsd      = atoi(Value);
+    else if (strcmp(Name, "TrueColorOsd")      == 0) TrueColorOsd      = atoi(Value);
     else return false;
     return true;
 }
@@ -113,6 +115,7 @@ HDFF::eHdmiVideoMode cHdffSetup::GetVideoMode(void)
 cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
 {
     const int kResolutions = 4;
+    const int kVideoModeAdaptions = 4;
     const int kTvFormats = 2;
     const int kVideoConversions = 6;
     const int kAnalogueVideos = 4;
@@ -128,6 +131,14 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
         "576i",
     };
 
+    static const char * VideoModeAdaptionItems[kVideoModeAdaptions] =
+    {
+        tr("Off"),
+        tr("Frame rate"),
+        tr("HD Only"),
+        tr("Always")
+    };
+
     static const char * TvFormatItems[kTvFormats] =
     {
         "4/3",
@@ -182,6 +193,7 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
     mNewHdffSetup = gHdffSetup;
 
     Add(new cMenuEditStraItem(tr("Resolution"), &mNewHdffSetup.Resolution, kResolutions, ResolutionItems));
+    Add(new cMenuEditStraItem(tr("Video Mode Adaption"), &mNewHdffSetup.VideoModeAdaption, kVideoModeAdaptions, VideoModeAdaptionItems));
     Add(new cMenuEditStraItem(tr("TV format"), &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems));
     Add(new cMenuEditStraItem(tr("Video Conversion"), &mNewHdffSetup.VideoConversion, kVideoConversions, VideoConversionItems));
     Add(new cMenuEditStraItem(tr("Analogue Video"), &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
@@ -202,6 +214,7 @@ cHdffSetupPage::~cHdffSetupPage(void)
 void cHdffSetupPage::Store(void)
 {
     SetupStore("Resolution", mNewHdffSetup.Resolution);
+    SetupStore("VideoModeAdaption", mNewHdffSetup.VideoModeAdaption);
     SetupStore("TvFormat", mNewHdffSetup.TvFormat);
     SetupStore("VideoConversion", mNewHdffSetup.VideoConversion);
     SetupStore("AnalogueVideo", mNewHdffSetup.AnalogueVideo);
@@ -237,6 +250,7 @@ void cHdffSetupPage::Store(void)
         hdmiConfig.TransmitAudio = true;
         hdmiConfig.ForceDviMode = false;
         hdmiConfig.CecEnabled = mNewHdffSetup.CecEnabled;
+        hdmiConfig.VideoModeAdaption = (HDFF::eVideoModeAdaption) mNewHdffSetup.VideoModeAdaption;
         mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
 
         mHdffCmdIf->CmdRemoteSetProtocol((HDFF::eRemoteProtocol) mNewHdffSetup.RemoteProtocol);
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
index 07c9d1a07..c3fe7a632 100644
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.h 1.8 2011/04/17 11:20:22 kls Exp $
+ * $Id: setup.h 1.9 2011/08/27 09:36:02 kls Exp $
  */
 
 #ifndef _HDFF_SETUP_H_
@@ -20,6 +20,7 @@ struct cHdffSetup
     HDFF::eHdmiVideoMode GetVideoMode(void);
 
     int Resolution;
+    int VideoModeAdaption;
     int TvFormat;
     int VideoConversion;
     int AnalogueVideo;
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 9672f6fc1..229e35b0e 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -19,3 +19,7 @@ VDR Plugin 'dvbsddevice' Revision History
 2011-04-17: Version 0.0.4
 
 - Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
+
+2011-08-27: Version 0.0.5
+
+- Added option --outputonly to use the device only for output (thanks to Udo Richter).
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 6f042d8b6..2aa8c77d3 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,13 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.4 2011/04/17 12:55:43 kls Exp $
+ * $Id: dvbsddevice.c 1.5 2011/08/27 11:34:58 kls Exp $
  */
 
+#include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "0.0.5";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
@@ -20,6 +21,8 @@ class cPluginDvbsddevice : public cPlugin {
   virtual ~cPluginDvbsddevice();
   virtual const char *Version(void) { return VERSION; }
   virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
   };
 
 cPluginDvbsddevice::cPluginDvbsddevice(void)
@@ -32,4 +35,27 @@ cPluginDvbsddevice::~cPluginDvbsddevice()
   delete probe;
 }
 
+const char *cPluginDvbsddevice::CommandLineHelp(void)
+{
+  return "  -o        --outputonly   do not receive, just use as output device\n";
+}
+
+bool cPluginDvbsddevice::ProcessArgs(int argc, char *argv[])
+{
+  static struct option long_options[] = {
+       { "outputonly", no_argument, NULL, 'o' },
+       { NULL,         no_argument, NULL,  0  }
+     };
+
+  int c;
+  while ((c = getopt_long(argc, argv, "", long_options, NULL)) != -1) {
+        switch (c) {
+          case 'o': probe->SetOutputOnly(true);
+                    break;
+          default:  return false;
+          }
+        }
+  return true;
+}
+
 VDRPLUGINCREATOR(cPluginDvbsddevice); // Don't touch this!
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 73e55bace..17f842b64 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.29 2011/05/22 15:22:14 kls Exp $
+ * $Id: dvbsdffdevice.c 2.30 2011/08/27 11:33:57 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -23,12 +23,13 @@
 
 int cDvbSdFfDevice::devVideoOffset = -1;
 
-cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend)
+cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly)
 :cDvbDevice(Adapter, Frontend)
 {
   spuDecoder = NULL;
   digitalAudio = false;
   playMode = pmNone;
+  outputOnly = OutputOnly;
 
   // Devices that are only present on cards with decoders:
 
@@ -357,6 +358,14 @@ bool cDvbSdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return true;
 }
 
+bool cDvbSdFfDevice::ProvidesSource(int Source) const
+{
+  if (outputOnly)
+     return false;
+  else
+     return cDvbDevice::ProvidesSource(Source);
+}
+
 void cDvbSdFfDevice::TurnOffLiveMode(bool LiveView)
 {
   if (LiveView) {
@@ -761,6 +770,11 @@ int cDvbSdFfDevice::PlayTsAudio(const uchar *Data, int Length)
 
 // --- cDvbSdFfDeviceProbe ---------------------------------------------------
 
+cDvbSdFfDeviceProbe::cDvbSdFfDeviceProbe(void)
+{
+  outputOnly = false;
+}
+
 bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
 {
   static uint32_t SubsystemIds[] = {
@@ -781,7 +795,7 @@ bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
   for (uint32_t *sid = SubsystemIds; *sid; sid++) {
       if (*sid == SubsystemId) {
          dsyslog("creating cDvbSdFfDevice");
-         new cDvbSdFfDevice(Adapter, Frontend);
+         new cDvbSdFfDevice(Adapter, Frontend, outputOnly);
          return true;
          }
       }
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index afe4727ed..bd74cde67 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 2.12 2011/05/21 12:56:49 kls Exp $
+ * $Id: dvbsdffdevice.h 2.13 2011/08/27 11:32:42 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
@@ -17,10 +17,11 @@
 class cDvbSdFfDevice : public cDvbDevice {
 private:
   int fd_osd, fd_audio, fd_video, fd_stc;
+  bool outputOnly;
 protected:
   virtual void MakePrimaryDevice(bool On);
 public:
-  cDvbSdFfDevice(int Adapter, int Frontend);
+  cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly);
   virtual ~cDvbSdFfDevice();
   virtual bool HasDecoder(void) const;
   virtual bool AvoidRecording(void) const;
@@ -34,6 +35,8 @@ class cDvbSdFfDevice : public cDvbDevice {
 
 // Channel facilities
 
+public:
+  virtual bool ProvidesSource(int Source) const;
 private:
   void TurnOffLiveMode(bool LiveView);
 protected:
@@ -101,7 +104,11 @@ class cDvbSdFfDevice : public cDvbDevice {
   };
 
 class cDvbSdFfDeviceProbe : public cDvbDeviceProbe {
+private:
+  bool outputOnly;
 public:
+  cDvbSdFfDeviceProbe(void);
+  void SetOutputOnly(bool On) { outputOnly = On; }
   virtual bool Probe(int Adapter, int Frontend);
   };
  
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 11fead5fa..74166b339 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.6 2011/05/15 21:41:47 kls Exp $
+ * $Id: skincurses.c 2.7 2011/08/21 11:04:38 kls Exp $
  */
 
 #include <ncurses.h>
@@ -436,7 +436,7 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
   int y = 2;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/channels.c b/channels.c
index c689850b1..b9204f28e 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.17 2010/11/07 12:24:59 kls Exp $
+ * $Id: channels.c 2.19 2011/08/26 12:44:21 kls Exp $
  */
 
 #include "channels.h"
@@ -497,8 +497,8 @@ cString cChannel::ToText(const cChannel *Channel)
      if (Channel->vpid && Channel->vtype)
         q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "=%d", Channel->vtype);
      *q = 0;
-     const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2 + 5) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod@type', +10: paranoia
-     char apidbuf[BufferSize];
+     const int ABufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2 + 5) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod@type', +10: paranoia
+     char apidbuf[ABufferSize];
      q = apidbuf;
      q += IntArrayToString(q, Channel->apids, 10, Channel->alangs, Channel->atypes);
      if (Channel->dpids[0]) {
@@ -506,11 +506,19 @@ cString cChannel::ToText(const cChannel *Channel)
         q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
         }
      *q = 0;
+     const int TBufferSize = MAXSPIDS * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia and tpid
+     char tpidbuf[TBufferSize];
+     q = tpidbuf;
+     q += snprintf(q, sizeof(tpidbuf), "%d", Channel->tpid);
+     if (Channel->spids[0]) {
+        *q++ = ';';
+        q += IntArrayToString(q, Channel->spids, 10, Channel->slangs);
+        }
      char caidbuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
      q = caidbuf;
      q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
-     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->parameters, *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, Channel->tpid, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%s:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->parameters, *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, tpidbuf, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -544,14 +552,17 @@ bool cChannel::Parse(const char *s)
      char *parambuf = NULL;
      char *vpidbuf = NULL;
      char *apidbuf = NULL;
+     char *tpidbuf = NULL;
      char *caidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%a[^:]:%a[^:]:%d :%a[^:]:%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpid, &caidbuf, &sid, &nid, &tid, &rid);
+     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%a[^:]:%a[^:]:%a[^:]:%a[^:]:%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpidbuf, &caidbuf, &sid, &nid, &tid, &rid);
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
            sid = atoi(caidbuf);
            delete caidbuf;
            caidbuf = NULL;
+           if (sscanf(tpidbuf, "%d", &tpid) != 1)
+              return false;
            caids[0] = tpid;
            caids[1] = 0;
            tpid = 0;
@@ -562,6 +573,7 @@ bool cChannel::Parse(const char *s)
         atypes[0] = 0;
         dpids[0] = 0;
         dtypes[0] = 0;
+        spids[0] = 0;
         ok = false;
         if (parambuf && sourcebuf && vpidbuf && apidbuf) {
            parameters = parambuf;
@@ -644,7 +656,30 @@ bool cChannel::Parse(const char *s)
               dpids[NumDpids] = 0;
               dtypes[NumDpids] = 0;
               }
-
+           int NumSpids = 0;
+           if ((p = strchr(tpidbuf, ';')) != NULL) {
+              *p++ = 0;
+              char *q;
+              char *strtok_next;
+              while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
+                    if (NumSpids < MAXSPIDS) {
+                       char *l = strchr(q, '=');
+                       if (l) {
+                          *l++ = 0;
+                          strn0cpy(slangs[NumSpids], l, MAXLANGCODE2);
+                          }
+                       else
+                          *slangs[NumSpids] = 0;
+                       spids[NumSpids++] = strtol(q, NULL, 10);
+                       }
+                    else
+                       esyslog("ERROR: too many SPIDs!"); // no need to set ok to 'false'
+                    p = NULL;
+                    }
+              spids[NumSpids] = 0;
+              }
+           if (sscanf(tpidbuf, "%d", &tpid) != 1)
+              return false;
            if (caidbuf) {
               char *p = caidbuf;
               char *q;
@@ -681,6 +716,7 @@ bool cChannel::Parse(const char *s)
         free(sourcebuf);
         free(vpidbuf);
         free(apidbuf);
+        free(tpidbuf);
         free(caidbuf);
         free(namebuf);
         if (!GetChannelID().Valid()) {
diff --git a/config.c b/config.c
index 6767b5c66..73bb00d60 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.14 2011/06/13 14:41:01 kls Exp $
+ * $Id: config.c 2.15 2011/08/20 09:12:05 kls Exp $
  */
 
 #include "config.h"
@@ -395,7 +395,7 @@ cSetup::cSetup(void)
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
   CurrentDolby = 0;
-  // InitialChannel is initialized by constructor
+  InitialChannel = "";
   InitialVolume = -1;
   ChannelsWrap = 0;
   EmergencyExit = 1;
diff --git a/config.h b/config.h
index 19f876868..c51e3df75 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.33 2011/06/21 21:43:01 kls Exp $
+ * $Id: config.h 2.34 2011/08/20 08:51:47 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.20"
-#define VDRVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.21"
+#define VDRVERSNUM   10721  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.20"
-#define APIVERSNUM   10720  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.21"
+#define APIVERSNUM   10721  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 96739fdd5..778302b8d 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.6 2011/03/06 14:54:33 kls Exp $
+ * $Id: cutter.c 2.8 2011/08/21 11:08:08 kls Exp $
  */
 
 #include "cutter.h"
@@ -75,7 +75,7 @@ void cCuttingThread::Action(void)
      if (!fromFile || !toFile)
         return;
      fromFile->SetReadAhead(MEGABYTE(20));
-     int Index = Mark->position;
+     int Index = Mark->Position();
      Mark = fromMarks.Next(Mark);
      off_t FileSize = 0;
      int CurrentFileNumber = 0;
@@ -163,14 +163,14 @@ void cCuttingThread::Action(void)
 
            // Check editing marks:
 
-           if (Mark && Index >= Mark->position) {
+           if (Mark && Index >= Mark->Position()) {
               Mark = fromMarks.Next(Mark);
               toMarks.Add(LastIFrame);
               if (Mark)
                  toMarks.Add(toIndex->Last() + 1);
               toMarks.Save();
               if (Mark) {
-                 Index = Mark->position;
+                 Index = Mark->Position();
                  Mark = fromMarks.Next(Mark);
                  CurrentFileNumber = 0; // triggers SetOffset before reading next frame
                  cutIn = true;
@@ -208,6 +208,12 @@ bool cCutter::Start(const char *FileName)
      error = false;
      ended = false;
      cRecording Recording(FileName);
+
+     cMarks FromMarks;
+     FromMarks.Load(FileName);
+     if (cMark *First = FromMarks.First())
+        Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60);
+
      const char *evn = Recording.PrefixFileName('%');
      if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
         // XXX this can be removed once RenameVideoFile() follows symlinks (see videodir.c)
diff --git a/device.c b/device.c
index 075999367..ba098d884 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.41 2011/06/02 13:14:16 kls Exp $
+ * $Id: device.c 2.42 2011/08/26 12:56:00 kls Exp $
  */
 
 #include "device.h"
@@ -613,6 +613,11 @@ bool cDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Needs
   return false;
 }
 
+bool cDevice::ProvidesEIT(void) const
+{
+  return false;
+}
+
 int cDevice::NumProvidedSystems(void) const
 {
   return 0;
diff --git a/device.h b/device.h
index d937e5f05..fd587a834 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.26 2011/06/02 13:15:31 kls Exp $
+ * $Id: device.h 2.27 2011/08/26 12:52:29 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -247,6 +247,10 @@ class cDevice : public cThread {
          ///< function itself actually returns true.
          ///< The default implementation always returns false, so a derived cDevice
          ///< class that can provide channels must implement this function.
+  virtual bool ProvidesEIT(void) const;
+         ///< Returns true if this device provides EIT data and thus wants to be tuned
+         ///< to the channels it can receive regularly to update the data.
+         ///< The default implementation returns false.
   virtual int NumProvidedSystems(void) const;
          ///< Returns the number of individual "delivery systems" this device provides.
          ///< The default implementation returns 0, so any derived class that can
diff --git a/dvbdevice.c b/dvbdevice.c
index b0750dd40..a97f27492 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.42 2011/06/11 14:34:24 kls Exp $
+ * $Id: dvbdevice.c 2.43 2011/08/26 12:57:34 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1081,6 +1081,11 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   return result;
 }
 
+bool cDvbDevice::ProvidesEIT(void) const
+{
+  return dvbTuner != NULL;
+}
+
 int cDvbDevice::NumProvidedSystems(void) const
 {
   return numProvidedSystems;
diff --git a/dvbdevice.h b/dvbdevice.h
index 0962548c5..e1842b7d0 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.15 2011/06/02 13:20:05 kls Exp $
+ * $Id: dvbdevice.h 2.16 2011/08/26 12:55:45 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -140,6 +140,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
   virtual int SignalStrength(void) const;
   virtual int SignalQuality(void) const;
diff --git a/eitscan.c b/eitscan.c
index 25b7115c0..9d8ac995c 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.2 2011/08/12 14:18:04 kls Exp $
+ * $Id: eitscan.c 2.4 2011/08/26 16:16:46 kls Exp $
  */
 
 #include "eitscan.h"
@@ -143,7 +143,7 @@ void cEITScanner::Process(void)
            bool AnyDeviceSwitched = false;
            for (int i = 0; i < cDevice::NumDevices(); i++) {
                cDevice *Device = cDevice::GetDevice(i);
-               if (Device) {
+               if (Device && Device->ProvidesEIT()) {
                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
                       const cChannel *Channel = ScanData->GetChannel();
                       if (Channel) {
diff --git a/epg.data b/epg.data
deleted file mode 100644
index e69de29bb..000000000
diff --git a/menu.c b/menu.c
index 39785146e..ef2bb468e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.29 2011/08/06 13:13:34 kls Exp $
+ * $Id: menu.c 2.32 2011/08/27 11:05:33 kls Exp $
  */
 
 #include "menu.h"
@@ -2193,13 +2193,13 @@ void cMenuRecordingItem::IncrementCounter(bool New)
   totalEntries++;
   if (New)
      newEntries++;
-  SetText(cString::sprintf("%d\t%d\t%s", totalEntries, newEntries, name));
+  SetText(cString::sprintf("%d\t\t%d\t%s", totalEntries, newEntries, name));
 }
 
 // --- cMenuRecordings -------------------------------------------------------
 
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
-:cOsdMenu(Base ? Base : tr("Recordings"), 9, 7)
+:cOsdMenu(Base ? Base : tr("Recordings"), 9, 6, 6)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
@@ -2770,6 +2770,7 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   updateChannelsTexts[5] = tr("add new transponders");
 
   SetSection(tr("DVB"));
+  SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL); 
   Setup();
 }
 
@@ -2815,46 +2816,56 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (Key != kNone) {
-     bool DoSetup = data.VideoFormat != newVideoFormat;
-     DoSetup |= data.DisplaySubtitles != newDisplaySubtitles;
-     if (numAudioLanguages != oldnumAudioLanguages) {
-        for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
-            data.AudioLanguages[i] = 0;
-            for (int l = 0; l < I18nLanguages()->Size(); l++) {
-                int k;
-                for (k = 0; k < oldnumAudioLanguages; k++) {
-                    if (data.AudioLanguages[k] == l)
-                       break;
-                    }
-                if (k >= oldnumAudioLanguages) {
-                   data.AudioLanguages[i] = l;
-                   break;
+     switch (Key) {
+       case kGreen:  cRemote::Put(kAudio, true);
+                     state = osEnd;
+                     break;
+       case kYellow: cRemote::Put(kSubtitles, true);
+                     state = osEnd;
+                     break;
+       default: { 
+            bool DoSetup = data.VideoFormat != newVideoFormat;
+            DoSetup |= data.DisplaySubtitles != newDisplaySubtitles;
+            if (numAudioLanguages != oldnumAudioLanguages) {
+               for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
+                   data.AudioLanguages[i] = 0;
+                   for (int l = 0; l < I18nLanguages()->Size(); l++) {
+                       int k;
+                       for (k = 0; k < oldnumAudioLanguages; k++) {
+                           if (data.AudioLanguages[k] == l)
+                              break;
+                           }
+                       if (k >= oldnumAudioLanguages) {
+                          data.AudioLanguages[i] = l;
+                          break;
+                          }
+                       }
                    }
-                }
-            }
-        data.AudioLanguages[numAudioLanguages] = -1;
-        DoSetup = true;
-        }
-     if (numSubtitleLanguages != oldnumSubtitleLanguages) {
-        for (int i = oldnumSubtitleLanguages; i < numSubtitleLanguages; i++) {
-            data.SubtitleLanguages[i] = 0;
-            for (int l = 0; l < I18nLanguages()->Size(); l++) {
-                int k;
-                for (k = 0; k < oldnumSubtitleLanguages; k++) {
-                    if (data.SubtitleLanguages[k] == l)
-                       break;
-                    }
-                if (k >= oldnumSubtitleLanguages) {
-                   data.SubtitleLanguages[i] = l;
-                   break;
+               data.AudioLanguages[numAudioLanguages] = -1;
+               DoSetup = true;
+               }
+            if (numSubtitleLanguages != oldnumSubtitleLanguages) {
+               for (int i = oldnumSubtitleLanguages; i < numSubtitleLanguages; i++) {
+                   data.SubtitleLanguages[i] = 0;
+                   for (int l = 0; l < I18nLanguages()->Size(); l++) {
+                       int k;
+                       for (k = 0; k < oldnumSubtitleLanguages; k++) {
+                           if (data.SubtitleLanguages[k] == l)
+                              break;
+                           }
+                       if (k >= oldnumSubtitleLanguages) {
+                          data.SubtitleLanguages[i] = l;
+                          break;
+                          }
+                       }
                    }
-                }
+               data.SubtitleLanguages[numSubtitleLanguages] = -1;
+               DoSetup = true;
+               }
+            if (DoSetup)
+               Setup();
             }
-        data.SubtitleLanguages[numSubtitleLanguages] = -1;
-        DoSetup = true;
-        }
-     if (DoSetup)
-        Setup();
+       }
      }
   if (state == osBack && Key == kOk) {
      if (::Setup.PrimaryDVB != oldPrimaryDVB)
@@ -4667,7 +4678,7 @@ void cReplayControl::MarkJump(bool Forward)
      if (GetIndex(Current, Total)) {
         cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
         if (m) {
-           Goto(m->position, true);
+           Goto(m->Position(), true);
            displayFrames = true;
            }
         }
@@ -4684,14 +4695,15 @@ void cReplayControl::MarkMove(bool Forward)
         int p = SkipFrames(Forward ? 1 : -1);
         cMark *m2;
         if (Forward) {
-           if ((m2 = marks.Next(m)) != NULL && m2->position <= p)
+           if ((m2 = marks.Next(m)) != NULL && m2->Position() <= p)
               return;
            }
         else {
-           if ((m2 = marks.Prev(m)) != NULL && m2->position >= p)
+           if ((m2 = marks.Prev(m)) != NULL && m2->Position() >= p)
               return;
            }
-        Goto(m->position = p, true);
+        m->SetPosition(p);
+        Goto(m->Position(), true);
         marks.Save();
         }
      }
@@ -4726,7 +4738,7 @@ void cReplayControl::EditTest(void)
         if ((m->Index() & 0x01) != 0)
            m = marks.Next(m);
         if (m) {
-           Goto(m->position - SecondsToFrames(3, FramesPerSecond()));
+           Goto(m->Position() - SecondsToFrames(3, FramesPerSecond()));
            Play();
            }
         }
diff --git a/po/ar.po b/po/ar.po
index 3c31613d9..d3dd29af3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -923,6 +923,12 @@ msgstr "اضافة مصدر قنوات جديد"
 msgid "DVB"
 msgstr "الدى فى بى"
 
+msgid "Button$Audio"
+msgstr "الصوت"
+
+msgid "Button$Subtitles"
+msgstr "الترجمة"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "كرت الستالايت الاولى"
 
@@ -1156,9 +1162,6 @@ msgstr ""
 msgid " Stop replaying"
 msgstr " ايقاف الاعادة"
 
-msgid "Button$Audio"
-msgstr "الصوت"
-
 msgid "Button$Pause"
 msgstr "طمس"
 
@@ -1184,9 +1187,6 @@ msgstr "لا يوجد صوت متاح"
 msgid "No subtitles"
 msgstr "لا توجد ترجمة متاحة"
 
-msgid "Button$Subtitles"
-msgstr "الترجمة"
-
 msgid "No subtitles available!"
 msgstr "لا ترجمة متاحة"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 835f93d37..b104fea3b 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -905,6 +905,12 @@ msgstr "afegir nous transponders"
 msgid "DVB"
 msgstr "Tarja DVB"
 
+msgid "Button$Audio"
+msgstr "�udio"
+
+msgid "Button$Subtitles"
+msgstr "Subt�tols"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Tarja DVB prim�ria"
 
@@ -1132,9 +1138,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Aturar la reproducci�"
 
-msgid "Button$Audio"
-msgstr "�udio"
-
 msgid "Button$Pause"
 msgstr "Pausa"
 
@@ -1160,9 +1163,6 @@ msgstr "No hi ha 
 msgid "No subtitles"
 msgstr "Sense subt�tols"
 
-msgid "Button$Subtitles"
-msgstr "Subt�tols"
-
 msgid "No subtitles available!"
 msgstr "No hi ha subt�tols disponibles!"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index e6ebdfd91..bcafac7d4 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -904,6 +904,12 @@ msgstr "přidat nové transpondéry"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Zvuk"
+
+msgid "Button$Subtitles"
+msgstr "Titulky"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primární DVB zařízení"
 
@@ -1131,9 +1137,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Zastavit přehrávání"
 
-msgid "Button$Audio"
-msgstr "Zvuk"
-
 msgid "Button$Pause"
 msgstr "Přerušit"
 
@@ -1159,9 +1162,6 @@ msgstr "Zvuk není dostupný!"
 msgid "No subtitles"
 msgstr "Bez titulků"
 
-msgid "Button$Subtitles"
-msgstr "Titulky"
-
 msgid "No subtitles available!"
 msgstr "Žádné dostupné titulky!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index c8379864f..81b11eb05 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "tilf. ny transp."
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Undertekster"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhed"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Stop afspilning"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pause"
 
@@ -1157,9 +1160,6 @@ msgstr "Ingen lyd tilg
 msgid "No subtitles"
 msgstr "Ingen undertekster"
 
-msgid "Button$Subtitles"
-msgstr "Undertekster"
-
 msgid "No subtitles available!"
 msgstr "Ingen undertekster tilg�ngelig!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 75dc3a652..6d5b822f4 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "neue Transponder hinzuf
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Untertitel"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�res DVB-Interface"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Wiedergabe beenden"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pause"
 
@@ -1157,9 +1160,6 @@ msgstr "Kein Audio verf
 msgid "No subtitles"
 msgstr "Keine Untertitel"
 
-msgid "Button$Subtitles"
-msgstr "Untertitel"
-
 msgid "No subtitles available!"
 msgstr "Keine Untertitel verf�gbar!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index a35fa3b4c..9756ea784 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "����"
+
+msgid "Button$Subtitles"
+msgstr ""
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "����� DVB �����"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " ����� ������������"
 
-msgid "Button$Audio"
-msgstr "����"
-
 msgid "Button$Pause"
 msgstr "�����"
 
@@ -1157,9 +1160,6 @@ msgstr "
 msgid "No subtitles"
 msgstr ""
 
-msgid "Button$Subtitles"
-msgstr ""
-
 msgid "No subtitles available!"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 88b693e92..193e75eb1 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -903,6 +903,12 @@ msgstr "a
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Subt�tulos"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Interfaz DVB primario"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Parar reproduci�n"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pausa"
 
@@ -1158,9 +1161,6 @@ msgstr "
 msgid "No subtitles"
 msgstr "Sin subt�tulos"
 
-msgid "Button$Subtitles"
-msgstr "Subt�tulos"
-
 msgid "No subtitles available!"
 msgstr "�No hay subt�tulos disponibles!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 8c8ad1fc0..49794dd52 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "uued transponderid"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Subtiitrid"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Esmane DVB seade"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " L�petada taasesitamine"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Paus"
 
@@ -1157,9 +1160,6 @@ msgstr "Audio k
 msgid "No subtitles"
 msgstr "Subtiitrid v�ljas"
 
-msgid "Button$Subtitles"
-msgstr "Subtiitrid"
-
 msgid "No subtitles available!"
 msgstr "Subtiitrid puuduvad"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1b06c3f29..b093e880c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -905,6 +905,12 @@ msgstr "uudet transponderit"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Ääni"
+
+msgid "Button$Subtitles"
+msgstr "Tekstitys"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Ensisijainen DVB-sovitin"
 
@@ -1132,9 +1138,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Lopeta toisto"
 
-msgid "Button$Audio"
-msgstr "Ääni"
-
 msgid "Button$Pause"
 msgstr "Tauko"
 
@@ -1160,9 +1163,6 @@ msgstr "Äänen kieli ei ole valittavissa!"
 msgid "No subtitles"
 msgstr "Ei tekstitystä"
 
-msgid "Button$Subtitles"
-msgstr "Tekstitys"
-
 msgid "No subtitles available!"
 msgstr "Tekstitys ei ole valittavissa!"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 68a581c0b..b5c512041 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -908,6 +908,12 @@ msgstr "ajouter transpondeurs"
 msgid "DVB"
 msgstr "Cartes DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Sous-titres"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Carte DVB primaire"
 
@@ -1135,9 +1141,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Arr�ter la lecture"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pause"
 
@@ -1163,9 +1166,6 @@ msgstr "Pas de son disponible !"
 msgid "No subtitles"
 msgstr "Pas de sous-titres"
 
-msgid "Button$Subtitles"
-msgstr "Sous-titres"
-
 msgid "No subtitles available!"
 msgstr "Pas de sous-titres disponible !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 69104b465..ed519a2f8 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -904,6 +904,12 @@ msgstr "dodaj nove transpondere"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Titlovi"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarni DVB ure�aj"
 
@@ -1131,9 +1137,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pauza"
 
@@ -1159,9 +1162,6 @@ msgstr "Audio nedostupan"
 msgid "No subtitles"
 msgstr "Bez titlova"
 
-msgid "Button$Subtitles"
-msgstr "Titlovi"
-
 msgid "No subtitles available!"
 msgstr "Titlovi nisu dostupni!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b7cf1a7bf..17b905f50 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -905,6 +905,12 @@ msgstr "
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Hang"
+
+msgid "Button$Subtitles"
+msgstr "Feliratok"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Els� DVB interface"
 
@@ -1132,9 +1138,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Lej�tsz�st befejzni"
 
-msgid "Button$Audio"
-msgstr "Hang"
-
 msgid "Button$Pause"
 msgstr "Sz�net"
 
@@ -1160,9 +1163,6 @@ msgstr "Hang nem lehets
 msgid "No subtitles"
 msgstr "Felirat ki"
 
-msgid "Button$Subtitles"
-msgstr "Feliratok"
-
 msgid "No subtitles available!"
 msgstr "A csatorn�n nincs felirat!"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 24e541299..501300edc 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -909,6 +909,12 @@ msgstr "nuovi transponder"
 msgid "DVB"
 msgstr "Scheda DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Sottotitoli"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Scheda DVB primaria"
 
@@ -1136,9 +1142,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Ferma riproduzione"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pausa"
 
@@ -1164,9 +1167,6 @@ msgstr "Nessun audio disponibile!"
 msgid "No subtitles"
 msgstr "Nessun sottotitolo"
 
-msgid "Button$Subtitles"
-msgstr "Sottotitoli"
-
 msgid "No subtitles available!"
 msgstr "Nessun sottotitolo disponibile!"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index a8dfcb945..6cb1faa09 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "pridėti naujus siųstuvus"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Garsas"
+
+msgid "Button$Subtitles"
+msgstr "Subtitrai"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pirminiė DVB įvestis"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Sustabdyti kartojimą"
 
-msgid "Button$Audio"
-msgstr "Garsas"
-
 msgid "Button$Pause"
 msgstr "Pristabdyti"
 
@@ -1157,9 +1160,6 @@ msgstr "Garsas nepateikiamas!"
 msgid "No subtitles"
 msgstr "Nėra subtitrų"
 
-msgid "Button$Subtitles"
-msgstr "Subtitrai"
-
 msgid "No subtitles available!"
 msgstr "Subtitrai nepateikiami!"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index c9d348131..0d22563ff 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -903,6 +903,12 @@ msgstr "додај нови транспондери"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Аудио"
+
+msgid "Button$Subtitles"
+msgstr "Титл"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Примарен DVB уред"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Запри пуштање"
 
-msgid "Button$Audio"
-msgstr "Аудио"
-
 msgid "Button$Pause"
 msgstr "Пауза"
 
@@ -1158,9 +1161,6 @@ msgstr "Аудио недостапно!"
 msgid "No subtitles"
 msgstr "Без титл"
 
-msgid "Button$Subtitles"
-msgstr "Титл"
-
 msgid "No subtitles available!"
 msgstr "Титлови недостапни!"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 66febc50e..ae2b85e00 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -906,6 +906,12 @@ msgstr "nieuwe transponders toevoegen"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Ondertiteling"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Eerste DVB kaart"
 
@@ -1133,9 +1139,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Stop afspelen"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pauze"
 
@@ -1161,9 +1164,6 @@ msgstr "Geen audio beschikbaar!"
 msgid "No subtitles"
 msgstr "Geen ondertiteling"
 
-msgid "Button$Subtitles"
-msgstr "Ondertiteling"
-
 msgid "No subtitles available!"
 msgstr "Geen ondertiteling beschikbaar"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index a49ab6b89..8ec8dfb4e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -903,6 +903,12 @@ msgstr ""
 msgid "DVB"
 msgstr "DVB-enheter"
 
+msgid "Button$Audio"
+msgstr ""
+
+msgid "Button$Subtitles"
+msgstr ""
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Hoved DVB-enhet"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Stopp avspilling"
 
-msgid "Button$Audio"
-msgstr ""
-
 msgid "Button$Pause"
 msgstr ""
 
@@ -1158,9 +1161,6 @@ msgstr "Pas d'audio disponible!"
 msgid "No subtitles"
 msgstr ""
 
-msgid "Button$Subtitles"
-msgstr ""
-
 msgid "No subtitles available!"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index e56f3bf93..a5c1b472d 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -903,6 +903,12 @@ msgstr "dodawaj nowe transpondery"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "D�wi�k"
+
+msgid "Button$Subtitles"
+msgstr "Napisy"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pierwszy interfejs DVB"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Zatrzymaj odtwarzanie"
 
-msgid "Button$Audio"
-msgstr "D�wi�k"
-
 msgid "Button$Pause"
 msgstr "Pauza"
 
@@ -1158,9 +1161,6 @@ msgstr "D
 msgid "No subtitles"
 msgstr "Brak napis�w"
 
-msgid "Button$Subtitles"
-msgstr "Napisy"
-
 msgid "No subtitles available!"
 msgstr "Napisy nie s� dost�pne"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 2eae063b4..c4433123f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -903,6 +903,12 @@ msgstr "adicionar novos transponders"
 msgid "DVB"
 msgstr "Placa DVB"
 
+msgid "Button$Audio"
+msgstr "�udio"
+
+msgid "Button$Subtitles"
+msgstr "Legendas"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Placa DVB prim�ria"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Parar reprodu��o"
 
-msgid "Button$Audio"
-msgstr "�udio"
-
 msgid "Button$Pause"
 msgstr "Pausa"
 
@@ -1158,9 +1161,6 @@ msgstr "
 msgid "No subtitles"
 msgstr "Sem legendas"
 
-msgid "Button$Subtitles"
-msgstr "Legendas"
-
 msgid "No subtitles available!"
 msgstr "Legendas indispon�veis!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index cd1a4d081..f8c5a1e2e 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -905,6 +905,12 @@ msgstr "ad
 msgid "DVB"
 msgstr "Dispozitiv DVB"
 
+msgid "Button$Audio"
+msgstr "Sunet"
+
+msgid "Button$Subtitles"
+msgstr "Subtitrare"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Dispozitiv DVB primar"
 
@@ -1132,9 +1138,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Opre�te redarea"
 
-msgid "Button$Audio"
-msgstr "Sunet"
-
 msgid "Button$Pause"
 msgstr "Pauz�"
 
@@ -1160,9 +1163,6 @@ msgstr "Lipse
 msgid "No subtitles"
 msgstr "Nu afi�eaz� subtirare"
 
-msgid "Button$Subtitles"
-msgstr "Subtitrare"
-
 msgid "No subtitles available!"
 msgstr "Subtitrare indisponibil�!"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 57210f0bb..e683b8b15 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -903,6 +903,12 @@ msgstr "
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "����"
+
+msgid "Button$Subtitles"
+msgstr "��������"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "�������� DVB-����������"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " ���������� ���������������"
 
-msgid "Button$Audio"
-msgstr "����"
-
 msgid "Button$Pause"
 msgstr "�����"
 
@@ -1158,9 +1161,6 @@ msgstr "
 msgid "No subtitles"
 msgstr "��� ���������"
 
-msgid "Button$Subtitles"
-msgstr "��������"
-
 msgid "No subtitles available!"
 msgstr "�������� ����������!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index a8faa761a..46edef586 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "prida
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Zvuk"
+
+msgid "Button$Subtitles"
+msgstr "Titulky"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Hlavn� DVB rozhranie"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Zastavi� prehr�vanie"
 
-msgid "Button$Audio"
-msgstr "Zvuk"
-
 msgid "Button$Pause"
 msgstr "Pozastavi�"
 
@@ -1157,9 +1160,6 @@ msgstr "Zvuk nie je dostupn
 msgid "No subtitles"
 msgstr "Bez titulkov"
 
-msgid "Button$Subtitles"
-msgstr "Titulky"
-
 msgid "No subtitles available!"
 msgstr "�iadne dostupn� titulky!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 2e6667d0d..89c692398 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -903,6 +903,12 @@ msgstr "dodaj nove oddajnike"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Zvok"
+
+msgid "Button$Subtitles"
+msgstr "Podnapisi"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarna naprava"
 
@@ -1130,9 +1136,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Prekini predvajanje"
 
-msgid "Button$Audio"
-msgstr "Zvok"
-
 msgid "Button$Pause"
 msgstr "Pavza"
 
@@ -1158,9 +1161,6 @@ msgstr "Zvok ni dosegljiv!"
 msgid "No subtitles"
 msgstr "Ni podnapisov"
 
-msgid "Button$Subtitles"
-msgstr "Podnapisi"
-
 msgid "No subtitles available!"
 msgstr "Podnapisi niso dosegljivi!"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index c57dc2b7d..45d354bb3 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -921,6 +921,12 @@ msgstr "dodaj nove transpondere"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Titlovi"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarni DVB ure�aj"
 
@@ -1153,9 +1159,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Zaustavi reprodukciju"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Pauza"
 
@@ -1181,9 +1184,6 @@ msgstr "Ton nedostupan"
 msgid "No subtitles"
 msgstr "Bez titlova"
 
-msgid "Button$Subtitles"
-msgstr "Titlovi"
-
 msgid "No subtitles available!"
 msgstr "Titlovi nisu dostupni!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 41b6592cf..150f95eb2 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -905,6 +905,12 @@ msgstr "l
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Ljud"
+
+msgid "Button$Subtitles"
+msgstr "Knapp$Textning"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhet"
 
@@ -1132,9 +1138,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
 
-msgid "Button$Audio"
-msgstr "Ljud"
-
 msgid "Button$Pause"
 msgstr "Pausa"
 
@@ -1160,9 +1163,6 @@ msgstr "Ljud saknas!"
 msgid "No subtitles"
 msgstr "Ingen textning"
 
-msgid "Button$Subtitles"
-msgstr "Knapp$Textning"
-
 msgid "No subtitles available!"
 msgstr "Ingen textning tillg�nglig!"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index b0ad00f39..194943b8d 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "yeni uydu al
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Audio"
+
+msgid "Button$Subtitles"
+msgstr "Altyaz�"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primer DVB aray�z�"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " G�steri�i bitir"
 
-msgid "Button$Audio"
-msgstr "Audio"
-
 msgid "Button$Pause"
 msgstr "Durakla"
 
@@ -1157,9 +1160,6 @@ msgstr "Audio yok!"
 msgid "No subtitles"
 msgstr "Altyaz� yok"
 
-msgid "Button$Subtitles"
-msgstr "Altyaz�"
-
 msgid "No subtitles available!"
 msgstr "Altyaz� bulunamad�"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index f316e29a6..433ec7040 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -902,6 +902,12 @@ msgstr "додати нові транспондери"
 msgid "DVB"
 msgstr "DVB"
 
+msgid "Button$Audio"
+msgstr "Мова аудіо"
+
+msgid "Button$Subtitles"
+msgstr "Субтитри"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Основний DVB-пристрій"
 
@@ -1129,9 +1135,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr " Зупинити програвання"
 
-msgid "Button$Audio"
-msgstr "Мова аудіо"
-
 msgid "Button$Pause"
 msgstr "Пауза"
 
@@ -1157,9 +1160,6 @@ msgstr "Відсутній звук!"
 msgid "No subtitles"
 msgstr "Немає субтитрів"
 
-msgid "Button$Subtitles"
-msgstr "Субтитри"
-
 msgid "No subtitles available!"
 msgstr "Субтитрів немає!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 11ccd840f..c28fe8814 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:26+0200\n"
+"POT-Creation-Date: 2011-08-27 11:54+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -905,6 +905,12 @@ msgstr "添加新转发器"
 msgid "DVB"
 msgstr "卫星卡设置"
 
+msgid "Button$Audio"
+msgstr "声道"
+
+msgid "Button$Subtitles"
+msgstr "字幕"
+
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "使用中卫星卡接口"
 
@@ -1132,9 +1138,6 @@ msgstr "VDR"
 msgid " Stop replaying"
 msgstr "停止回放"
 
-msgid "Button$Audio"
-msgstr "声道"
-
 msgid "Button$Pause"
 msgstr "暂停"
 
@@ -1160,9 +1163,6 @@ msgstr "音频不可用"
 msgid "No subtitles"
 msgstr "没有字幕"
 
-msgid "Button$Subtitles"
-msgstr "字幕"
-
 msgid "No subtitles available!"
 msgstr "字幕不可用"
 
diff --git a/recorder.c b/recorder.c
index 6080deb08..a6cab473b 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.14 2011/08/13 14:56:36 kls Exp $
+ * $Id: recorder.c 2.15 2011/09/04 09:26:44 kls Exp $
  */
 
 #include "recorder.h"
@@ -31,7 +31,7 @@ cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority
 
   SpinUpDisk(FileName);
 
-  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE, true, "Recorder");
+  ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE, true, "Recorder");
   ringBuffer->SetTimeouts(0, 100);
 
   int Pid = Channel->Vpid();
@@ -88,7 +88,7 @@ bool cRecorder::RunningLowOnDiskSpace(void)
 
 bool cRecorder::NextFile(void)
 {
-  if (recordFile) {
+  if (recordFile && frameDetector->IndependentFrame()) { // every file shall start with an independent frame
      if (fileSize > MEGABYTE(off_t(Setup.MaxVideoFileSize)) || RunningLowOnDiskSpace()) {
         recordFile = fileName->NextFile();
         fileSize = 0;
@@ -119,11 +119,6 @@ void cRecorder::Action(void)
   time_t t = time(NULL);
   bool InfoWritten = false;
   bool FirstIframeSeen = false;
-#define BUFFERSIZE (5 * TS_SIZE)
-  bool Buffering = false;
-  int BufferIndex = 0;
-  int MaxBufferIndex = 0;
-  uchar *Buffer = NULL;
   while (Running()) {
         int r;
         uchar *b = ringBuffer->Get(r);
@@ -144,34 +139,9 @@ void cRecorder::Action(void)
                        }
                     InfoWritten = true;
                     }
-                 if (frameDetector->NewPayload()) { // We're at the first TS packet of a new payload...
-                    if (Buffering)
-                       esyslog("ERROR: encountered new payload while buffering - dropping some data!");
-                    if (!frameDetector->NewFrame()) { // ...but the frame type is yet unknown, so we need to buffer packets until we see the frame type
-                       if (!Buffer) {
-                          dsyslog("frame type not in first packet of payload - buffering");
-                          if (!(Buffer = MALLOC(uchar, BUFFERSIZE))) {
-                             esyslog("ERROR: can't allocate frame type buffer");
-                             break;
-                             }
-                          }
-                       BufferIndex = 0;
-                       Buffering = true;
-                       }
-                    }
-                 else if (frameDetector->NewFrame()) // now we know the frame type, so stop buffering
-                    Buffering = false;
-                 if (Buffering) {
-                    if (BufferIndex + Count <= BUFFERSIZE) {
-                       memcpy(Buffer + BufferIndex, b, Count);
-                       BufferIndex += Count;
-                       }
-                    else
-                       esyslog("ERROR: too many bytes for frame type buffer (%d > %d) - dropped %d bytes", BufferIndex + Count, int(BUFFERSIZE), Count);
-                    }
-                 else if (FirstIframeSeen || frameDetector->IndependentFrame()) {
+                 if (FirstIframeSeen || frameDetector->IndependentFrame()) {
                     FirstIframeSeen = true; // start recording with the first I-frame
-                    if (frameDetector->IndependentFrame() && !NextFile()) // every file shall start with an independent frame
+                    if (!NextFile())
                        break;
                     if (index && frameDetector->NewFrame())
                        index->Write(frameDetector->IndependentFrame(), fileName->Number(), fileSize);
@@ -184,12 +154,6 @@ void cRecorder::Action(void)
                              fileSize += TS_SIZE;
                              }
                        }
-                    if (BufferIndex) {
-                       recordFile->Write(Buffer, BufferIndex); // if an error occurs here, the next write below will catch and report it
-                       if (BufferIndex > MaxBufferIndex)
-                          MaxBufferIndex = BufferIndex;
-                       BufferIndex = 0;
-                       }
                     if (recordFile->Write(b, Count) < 0) {
                        LOG_ERROR_STR(fileName->Name());
                        break;
@@ -207,8 +171,4 @@ void cRecorder::Action(void)
            t = time(NULL);
            }
         }
-  if (Buffer) {
-     free(Buffer);
-     dsyslog("frame type buffer used %d bytes", MaxBufferIndex);
-     }
 }
diff --git a/recording.c b/recording.c
index 4456bddb6..bea7eb6b7 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.33 2011/08/13 12:37:25 kls Exp $
+ * $Id: recording.c 2.38 2011/09/04 09:32:25 kls Exp $
  */
 
 #include "recording.h"
@@ -60,6 +60,7 @@
 #define DISKCHECKDELTA    100 // seconds between checks for free disk space
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 #define MARKSUPDATEDELTA   10 // seconds between checks for updating editing marks
+#define MININDEXAGE      3600 // seconds before an index file is considered no longer to be written
 
 #define MAX_SUBTITLE_LENGTH  40
 
@@ -94,7 +95,7 @@ void cRemoveDeletedRecordingsThread::Action(void)
      bool deleted = false;
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      for (cRecording *r = DeletedRecordings.First(); r; ) {
-         if (r->deleted && time(NULL) - r->deleted > DELETEDLIFETIME) {
+         if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
             cRecording *next = DeletedRecordings.Next(r);
             r->Remove();
             DeletedRecordings.Del(r);
@@ -120,7 +121,7 @@ void RemoveDeletedRecordings(void)
      if (!RemoveDeletedRecordingsThread.Active()) {
         cThreadLock DeletedRecordingsLock(&DeletedRecordings);
         for (cRecording *r = DeletedRecordings.First(); r; r = DeletedRecordings.Next(r)) {
-            if (r->deleted && time(NULL) - r->deleted > DELETEDLIFETIME) {
+            if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
                RemoveDeletedRecordingsThread.Start();
                break;
                }
@@ -153,7 +154,7 @@ void AssertFreeDiskSpace(int Priority, bool Force)
            cRecording *r0 = NULL;
            while (r) {
                  if (IsOnVideoDirectoryFileSystem(r->FileName())) { // only remove recordings that will actually increase the free video disk space
-                    if (!r0 || r->start < r0->start)
+                    if (!r0 || r->Start() < r0->Start())
                        r0 = r;
                     }
                  r = DeletedRecordings.Next(r);
@@ -180,11 +181,11 @@ void AssertFreeDiskSpace(int Priority, bool Force)
            cRecording *r0 = NULL;
            while (r) {
                  if (IsOnVideoDirectoryFileSystem(r->FileName())) { // only delete recordings that will actually increase the free video disk space
-                    if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
-                       if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
-                           (r->lifetime > 0 && (time(NULL) - r->start) / SECSINDAY >= r->lifetime)) { // the recording's guaranteed lifetime has expired
+                    if (!r->IsEdited() && r->Lifetime() < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
+                       if ((r->Lifetime() == 0 && Priority > r->Priority()) || // the recording has no guaranteed lifetime and the new recording has higher priority
+                           (r->Lifetime() > 0 && (time(NULL) - r->Start()) / SECSINDAY >= r->Lifetime())) { // the recording's guaranteed lifetime has expired
                           if (r0) {
-                             if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
+                             if (r->Priority() < r0->Priority() || (r->Priority() == r0->Priority() && r->Start() < r0->Start()))
                                 r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
                              }
                           else
@@ -617,6 +618,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   instanceId = InstanceId;
   isPesRecording = false;
   framesPerSecond = DEFAULTFRAMESPERSECOND;
+  numFrames = -1;
   deleted = 0;
   // set up the actual name:
   const char *Title = Event ? Event->Title() : NULL;
@@ -676,6 +678,7 @@ cRecording::cRecording(const char *FileName)
   lifetime = MAXLIFETIME;
   isPesRecording = false;
   framesPerSecond = DEFAULTFRAMESPERSECOND;
+  numFrames = -1;
   deleted = 0;
   titleBuffer = NULL;
   sortBuffer = NULL;
@@ -870,13 +873,16 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
         s++;
      else
         s = name;
-     titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%c%s",
+     titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%d:%02d%c%c%s",
                             t->tm_mday,
                             t->tm_mon + 1,
                             t->tm_year % 100,
                             Delimiter,
                             t->tm_hour,
                             t->tm_min,
+                            Delimiter,
+                            (LengthInSeconds() >= 0) ? LengthInSeconds() / 3600 : 0,
+                            (LengthInSeconds() >= 0) ? LengthInSeconds() / 60 % 60 : 0,
                             New,
                             Delimiter,
                             s));
@@ -958,6 +964,13 @@ bool cRecording::WriteInfo(void)
   return true;
 }
 
+void cRecording::SetStartTime(time_t Start) 
+{
+  start = Start;
+  free(fileName);
+  fileName = NULL;
+}
+
 bool cRecording::Delete(void)
 {
   bool result = true;
@@ -1024,6 +1037,25 @@ void cRecording::ResetResume(void) const
   resume = RESUME_NOT_INITIALIZED;
 }
 
+int cRecording::NumFrames(void) const
+{
+  if (numFrames < 0) {
+     int nf = cIndexFile::GetLength(FileName(), IsPesRecording());
+     if (time(NULL) - LastModifiedTime(FileName()) < MININDEXAGE)
+        return nf; // check again later for ongoing recordings
+     numFrames = nf;
+     }
+  return numFrames;
+}
+
+int cRecording::LengthInSeconds(void) const
+{
+  int nf = NumFrames();
+  if (nf >= 0)
+     return int((nf / FramesPerSecond() + 30) / 60) * 60;
+  return -1;
+}
+
 // --- cRecordings -----------------------------------------------------------
 
 cRecordings Recordings;
@@ -1095,6 +1127,7 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
                  if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
                     cRecording *r = new cRecording(buffer);
                     if (r->Name()) {
+                       r->NumFrames(); // initializes the numFrames member
                        Lock();
                        Add(r);
                        ChangeState();
@@ -1233,23 +1266,21 @@ cMutex MutexMarkFramesPerSecond;
 cMark::cMark(int Position, const char *Comment, double FramesPerSecond)
 {
   position = Position;
-  comment = Comment ? strdup(Comment) : NULL;
+  comment = Comment;
   framesPerSecond = FramesPerSecond;
 }
 
 cMark::~cMark()
 {
-  free(comment);
 }
 
 cString cMark::ToText(void)
 {
-  return cString::sprintf("%s%s%s\n", *IndexToHMSF(position, true, framesPerSecond), comment ? " " : "", comment ? comment : "");
+  return cString::sprintf("%s%s%s\n", *IndexToHMSF(position, true, framesPerSecond), Comment() ? " " : "", Comment() ? Comment() : "");
 }
 
 bool cMark::Parse(const char *s)
 {
-  free(comment);
   comment = NULL;
   framesPerSecond = MarkFramesPerSecond;
   position = HMSFToIndex(s, framesPerSecond);
@@ -1313,7 +1344,7 @@ void cMarks::Sort(void)
 {
   for (cMark *m1 = First(); m1; m1 = Next(m1)) {
       for (cMark *m2 = Next(m1); m2; m2 = Next(m2)) {
-          if (m2->position < m1->position) {
+          if (m2->Position() < m1->Position()) {
              swap(m1->position, m2->position);
              swap(m1->comment, m2->comment);
              }
@@ -1334,7 +1365,7 @@ cMark *cMarks::Add(int Position)
 cMark *cMarks::Get(int Position)
 {
   for (cMark *mi = First(); mi; mi = Next(mi)) {
-      if (mi->position == Position)
+      if (mi->Position() == Position)
          return mi;
       }
   return NULL;
@@ -1343,7 +1374,7 @@ cMark *cMarks::Get(int Position)
 cMark *cMarks::GetPrev(int Position)
 {
   for (cMark *mi = Last(); mi; mi = Prev(mi)) {
-      if (mi->position < Position)
+      if (mi->Position() < Position)
          return mi;
       }
   return NULL;
@@ -1352,7 +1383,7 @@ cMark *cMarks::GetPrev(int Position)
 cMark *cMarks::GetNext(int Position)
 {
   for (cMark *mi = First(); mi; mi = Next(mi)) {
-      if (mi->position > Position)
+      if (mi->Position() > Position)
          return mi;
       }
   return NULL;
@@ -1403,12 +1434,11 @@ void cIndexFileGenerator::Action(void)
   bool Rewind = false;
   cFileName FileName(recordingName, false);
   cUnbufferedFile *ReplayFile = FileName.Open();
-  cRingBufferLinear Buffer(IFG_BUFFER_SIZE, TS_SIZE);
+  cRingBufferLinear Buffer(IFG_BUFFER_SIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE);
   cPatPmtParser PatPmtParser;
   cFrameDetector FrameDetector;
   cIndexFile IndexFile(recordingName, true);
   int BufferChunks = KILOBYTE(1); // no need to read a lot at the beginning when parsing PAT/PMT
-  int FileNumber = 0;
   off_t FileSize = 0;
   off_t FrameOffset = -1;
   Skins.QueueMessage(mtInfo, tr("Regenerating index file"));
@@ -1425,18 +1455,12 @@ void cIndexFileGenerator::Action(void)
         if (Data) {
            if (FrameDetector.Synced()) {
               // Step 3 - generate the index:
-              if (FrameOffset < 0 && TsPid(Data) == PATPID) {
-                 FileNumber = FileName.Number();
+              if (TsPid(Data) == PATPID)
                  FrameOffset = FileSize; // the PAT/PMT is at the beginning of an I-frame
-                 }
               int Processed = FrameDetector.Analyze(Data, Length);
               if (Processed > 0) {
-                 if (FrameDetector.NewPayload() && FrameOffset < 0) {
-                    FileNumber = FileName.Number();
-                    FrameOffset = FileSize;
-                    }
                  if (FrameDetector.NewFrame()) {
-                    IndexFile.Write(FrameDetector.IndependentFrame(), FileNumber, FrameOffset);
+                    IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize);
                     FrameOffset = -1;
                     }
                  FileSize += Processed;
@@ -1509,9 +1533,6 @@ void cIndexFileGenerator::Action(void)
 // The maximum time to wait before giving up while catching up on an index file:
 #define MAXINDEXCATCHUP   8 // seconds
 
-// The minimum age of an index file for considering it no longer to be written:
-#define MININDEXAGE    3600 // seconds
-
 struct tIndexPes {
   uint32_t offset;
   uchar type;
diff --git a/recording.h b/recording.h
index 578dd4559..37979ec60 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.22 2011/08/13 12:51:23 kls Exp $
+ * $Id: recording.h 2.25 2011/08/21 13:10:39 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -22,6 +22,8 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
+#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
+
 extern bool VfatFileSystem;
 extern int InstanceId;
 
@@ -87,6 +89,7 @@ class cRecording : public cListObject {
   mutable char *fileName;
   mutable char *name;
   mutable int fileSizeMB;
+  mutable int numFrames;
   int channel;
   int instanceId;
   bool isPesRecording;
@@ -97,14 +100,21 @@ class cRecording : public cListObject {
   static char *StripEpisodeName(char *s);
   char *SortName(void) const;
   int GetResume(void) const;
+#ifdef __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
 public:
+#endif
   time_t start;
   int priority;
   int lifetime;
   time_t deleted;
+public:
   cRecording(cTimer *Timer, const cEvent *Event);
   cRecording(const char *FileName);
   virtual ~cRecording();
+  time_t Start(void) const { return start; }
+  int Priority(void) const { return priority; }
+  int Lifetime(void) const { return lifetime; }
+  time_t Deleted(void) const { return deleted; }
   virtual int Compare(const cListObject &ListObject) const;
   const char *Name(void) const { return name; }
   const char *FileName(void) const;
@@ -114,11 +124,24 @@ class cRecording : public cListObject {
   int HierarchyLevels(void) const;
   void ResetResume(void) const;
   double FramesPerSecond(void) const { return framesPerSecond; }
+  int NumFrames(void) const;
+       ///< Returns the number of frames in this recording.
+       ///< If the number of frames is unknown, -1 will be returned.
+  int LengthInSeconds(void) const;
+       ///< Returns the length (in seconds) of this recording, or -1 in case of error.
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
   void ReadInfo(void);
   bool WriteInfo(void);
+  void SetStartTime(time_t Start);
+       ///< Sets the start time of this recording to the given value.
+       ///< If a filename has already been set for this recording, it will be
+       ///< deleted and a new one will be generated (using the new start time)
+       ///< at the next call to FileName().
+       ///< Use this function with care - it does not check whether a recording with
+       ///< this new name already exists, and if there is one, results may be
+       ///< unexpected!
   bool Delete(void);
        ///< Changes the file name so that it will no longer be visible in the "Recordings" menu
        ///< Returns false in case of error
@@ -176,13 +199,21 @@ extern cRecordings DeletedRecordings;
 #define DEFAULTFRAMESPERSECOND 25.0
 
 class cMark : public cListObject {
+  friend class cMarks; // for sorting
 private:
   double framesPerSecond;
+#ifdef __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
 public:
+#endif
   int position;
-  char *comment;
+  cString comment;
+public:
   cMark(int Position = 0, const char *Comment = NULL, double FramesPerSecond = DEFAULTFRAMESPERSECOND);
   virtual ~cMark();
+  int Position(void) const { return position; }
+  const char *Comment(void) const { return comment; }
+  void SetPosition(int Position) { position = Position; }
+  void SetComment(const char *Comment) { comment = Comment; }
   cString ToText(void);
   bool Parse(const char *s);
   bool Save(FILE *f);
diff --git a/remux.c b/remux.c
index f174f6145..78ab2940d 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.58 2011/08/15 09:50:14 kls Exp $
+ * $Id: remux.c 2.62 2011/09/04 13:09:06 kls Exp $
  */
 
 #include "remux.h"
@@ -785,8 +785,7 @@ cFrameDetector::cFrameDetector(int Pid, int Type)
 {
   SetPid(Pid, Type);
   synced = false;
-  newPayload = newFrame = independentFrame = false;
-  frameTypeOffset = -1;
+  newFrame = independentFrame = false;
   numPtsValues = 0;
   numFrames = 0;
   numIFrames = 0;
@@ -813,17 +812,36 @@ void cFrameDetector::SetPid(int Pid, int Type)
 
 void cFrameDetector::Reset(void)
 {
-  newPayload = newFrame = independentFrame = false;
-  frameTypeOffset = -1;
+  newFrame = independentFrame = false;
   payloadUnitOfFrame = 0;
   scanning = false;
   scanner = EMPTY_SCANNER;
 }
 
+int cFrameDetector::SkipPackets(const uchar *&Data, int &Length, int &Processed, int &FrameTypeOffset)
+{
+  if (!synced)
+     dbgframes("%d>", FrameTypeOffset);
+  while (Length >= TS_SIZE) {
+        // switch to the next TS packet, but skip those that have a different PID:
+        Data += TS_SIZE;
+        Length -= TS_SIZE;
+        Processed += TS_SIZE;
+        if (TsPid(Data) == pid)
+           break;
+        else if (Length < TS_SIZE)
+           esyslog("ERROR: out of data while skipping TS packets in cFrameDetector");
+        }
+  FrameTypeOffset -= TS_SIZE;
+  FrameTypeOffset += TsPayloadOffset(Data);
+  return FrameTypeOffset;
+}
+
 int cFrameDetector::Analyze(const uchar *Data, int Length)
 {
+  int SeenPayloadStart = false;
   int Processed = 0;
-  newPayload = newFrame = independentFrame = false;
+  newFrame = independentFrame = false;
   while (Length >= TS_SIZE) {
         if (Data[0] != TS_SYNC_BYTE) {
            int Skipped = 1;
@@ -836,11 +854,14 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
            int Pid = TsPid(Data);
            if (Pid == pid) {
               if (TsPayloadStart(Data)) {
+                 SeenPayloadStart = true;
                  if (synced && Processed)
-                    return Processed; // flush everything before this new payload
+                    return Processed;
+                 if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
+                    return Processed; // need more data, in case the frame type is not stored in the first TS packet
                  if (framesPerSecond <= 0.0) {
                     // frame rate unknown, so collect a sequence of PTS values:
-                    if (numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
+                    if (numPtsValues < 2 || numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
                        const uchar *Pes = Data + TsPayloadOffset(Data);
                        if (numIFrames && PesHasPts(Pes)) {
                           ptsValues[numPtsValues] = PesGetPts(Pes);
@@ -902,10 +923,6 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
               if (scanning) {
                  int PayloadOffset = TsPayloadOffset(Data);
                  if (TsPayloadStart(Data)) {
-                    if (synced && Processed)
-                       return Processed; // flush everything before this new payload
-                    newPayload = true;
-                    scanner = EMPTY_SCANNER;
                     PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
                     if (!framesPerPayloadUnit)
                        framesPerPayloadUnit = framesInPayloadUnit;
@@ -913,29 +930,20 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        dbgframes("/");
                     }
                  for (int i = PayloadOffset; scanning && i < TS_SIZE; i++) {
-                     if (frameTypeOffset < 0) {
-                        scanner <<= 8;
-                        scanner |= Data[i];
-                        }
-                     else
-                        frameTypeOffset += PayloadOffset;
+                     scanner <<= 8;
+                     scanner |= Data[i];
                      switch (type) {
                        case 0x01: // MPEG 1 video
                        case 0x02: // MPEG 2 video
                             if (scanner == 0x00000100) { // Picture Start Code
-                               if (frameTypeOffset < 0) {
-                                  frameTypeOffset = i + 2;
-                                  if (frameTypeOffset >= TS_SIZE) { // the byte to check is in the next TS packet
-                                     frameTypeOffset -= TS_SIZE;
-                                     if (!synced)
-                                        dbgframes("%d>", frameTypeOffset);
-                                     break;
-                                     }
-                                  }
                                scanner = EMPTY_SCANNER;
+                               if (synced && !SeenPayloadStart && Processed)
+                                  return Processed; // flush everything before this new frame
+                               int FrameTypeOffset = i + 2;
+                               if (FrameTypeOffset >= TS_SIZE) // the byte to check is in the next TS packet
+                                  i = SkipPackets(Data, Length, Processed, FrameTypeOffset);
                                newFrame = true;
-                               uchar FrameType = (Data[frameTypeOffset] >> 3) & 0x07;
-                               frameTypeOffset = -1;
+                               uchar FrameType = (Data[FrameTypeOffset] >> 3) & 0x07;
                                independentFrame = FrameType == 1; // I-Frame
                                if (synced) {
                                   if (framesPerPayloadUnit <= 1)
@@ -955,19 +963,14 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                             break;
                        case 0x1B: // MPEG 4 video
                             if (scanner == 0x00000109) { // Access Unit Delimiter
-                               if (frameTypeOffset < 0) {
-                                  frameTypeOffset = i + 1;
-                                  if (frameTypeOffset >= TS_SIZE) { // the byte to check is in the next TS packet
-                                     frameTypeOffset -= TS_SIZE;
-                                     if (!synced)
-                                        dbgframes("%d>", frameTypeOffset);
-                                     break;
-                                     }
-                                  }
                                scanner = EMPTY_SCANNER;
+                               if (synced && !SeenPayloadStart && Processed)
+                                  return Processed; // flush everything before this new frame
+                               int FrameTypeOffset = i + 1;
+                               if (FrameTypeOffset >= TS_SIZE) // the byte to check is in the next TS packet
+                                  i = SkipPackets(Data, Length, Processed, FrameTypeOffset);
                                newFrame = true;
-                               uchar FrameType = Data[frameTypeOffset];
-                               frameTypeOffset = -1;
+                               uchar FrameType = Data[FrameTypeOffset];
                                independentFrame = FrameType == 0x10;
                                if (synced) {
                                   if (framesPerPayloadUnit < 0) {
diff --git a/remux.h b/remux.h
index 3204bb41a..b8822796a 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.30 2011/06/12 12:49:17 kls Exp $
+ * $Id: remux.h 2.32 2011/09/04 12:48:26 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -336,16 +336,16 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 // Frame detector:
 
+#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 5
+
 class cFrameDetector {
 private:
   enum { MaxPtsValues = 150 };
   int pid;
   int type;
   bool synced;
-  bool newPayload;
   bool newFrame;
   bool independentFrame;
-  int frameTypeOffset;
   uint32_t ptsValues[MaxPtsValues]; // 32 bit is enough - we only need the delta
   int numPtsValues;
   int numFrames;
@@ -359,6 +359,7 @@ class cFrameDetector {
   int payloadUnitOfFrame;
   bool scanning;
   uint32_t scanner;
+  int SkipPackets(const uchar *&Data, int &Length, int &Processed, int &FrameTypeOffset);
 public:
   cFrameDetector(int Pid = 0, int Type = 0);
       ///< Sets up a frame detector for the given Pid and stream Type.
@@ -377,11 +378,6 @@ class cFrameDetector {
       ///< Analyze() needs to be called again with more actual data.
   bool Synced(void) { return synced; }
       ///< Returns true if the frame detector has synced on the data stream.
-  bool NewPayload(void) { return newPayload; }
-      ///< Returns true if the data given to the last call to Analyze() started a
-      ///< new payload. The caller should remember the current file offset in
-      ///< order to be able to generate an index entry later, when NewFrame()
-      ///< returns true.
   bool NewFrame(void) { return newFrame; }
       ///< Returns true if the data given to the last call to Analyze() started a
       ///< new frame.
diff --git a/skinclassic.c b/skinclassic.c
index 33332467b..49f0bcb5c 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.5 2010/11/07 15:10:23 kls Exp $
+ * $Id: skinclassic.c 2.6 2011/08/21 11:02:06 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -377,7 +377,7 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
   int y = y2;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
   ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/skins.c b/skins.c
index 834287307..427e42243 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.2 2011/08/06 09:41:57 kls Exp $
+ * $Id: skins.c 2.3 2011/08/21 11:21:19 kls Exp $
  */
 
 #include "skins.h"
@@ -136,14 +136,14 @@ cSkinDisplayReplay::cProgressBar::cProgressBar(int Width, int Height, int Curren
      if (Marks) {
         bool Start = true;
         for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
-            int p1 = Pos(m->position);
+            int p1 = Pos(m->Position());
             if (Start) {
                const cMark *m2 = Marks->Next(m);
-               int p2 = Pos(m2 ? m2->position : total);
+               int p2 = Pos(m2 ? m2->Position() : total);
                int h = Height / 3;
                DrawRectangle(p1, h, p2, Height - h, ColorSelected);
                }
-            Mark(p1, Start, m->position == Current, ColorMark, ColorCurrent);
+            Mark(p1, Start, m->Position() == Current, ColorMark, ColorCurrent);
             Start = !Start;
             }
         }
diff --git a/skinsttng.c b/skinsttng.c
index 169488a3d..c9c3031f8 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.10 2011/06/12 15:20:59 kls Exp $
+ * $Id: skinsttng.c 2.11 2011/08/21 11:02:26 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -693,7 +693,7 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
   int y = y3;
   cTextScroller ts;
   char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->start), *TimeString(Recording->start));
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/svdrp.c b/svdrp.c
index fe3bcc7cf..e8e75b390 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.9 2011/02/25 14:38:45 kls Exp $
+ * $Id: svdrp.c 2.10 2011/08/27 10:43:18 kls Exp $
  */
 
 #include "svdrp.h"
@@ -219,9 +219,11 @@ const char *HelpPages[] = {
   "    image format defaults to JPEG.",
   "HELP [ <topic> ]\n"
   "    The HELP command gives help info.",
-  "HITK [ <key> ]\n"
+  "HITK [ <key> ... ]\n"
   "    Hit the given remote control key. Without option a list of all\n"
-  "    valid key names is given.",
+  "    valid key names is given. If more than one key is given, they are\n"
+  "    entered into the remote control queue in the given sequence. There\n"
+  "    can be up to 31 keys.",
   "LSTC [ :groups | <number> | <name> ]\n"
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
@@ -902,13 +904,28 @@ void cSVDRP::CmdHELP(const char *Option)
 void cSVDRP::CmdHITK(const char *Option)
 {
   if (*Option) {
-     eKeys k = cKey::FromString(Option);
-     if (k != kNone) {
-        cRemote::Put(k);
-        Reply(250, "Key \"%s\" accepted", Option);
-        }
-     else
-        Reply(504, "Unknown key: \"%s\"", Option);
+     char buf[strlen(Option) + 1];
+     strcpy(buf, Option);
+     const char *delim = " \t";
+     char *strtok_next;
+     char *p = strtok_r(buf, delim, &strtok_next);
+     int NumKeys = 0;
+     while (p) {
+           eKeys k = cKey::FromString(p);
+           if (k != kNone) {
+              if (!cRemote::Put(k)) {
+                 Reply(451, "Too many keys in \"%s\" (only %d accepted)", Option, NumKeys);
+                 return;
+                 }
+              }
+           else {
+              Reply(504, "Unknown key: \"%s\"", p);
+              return;
+              }
+           NumKeys++;
+           p = strtok_r(NULL, delim, &strtok_next);
+           }
+     Reply(250, "Key%s \"%s\" accepted", NumKeys > 1 ? "s" : "", Option);
      }
   else {
      Reply(-214, "Valid <key> names for the HITK command:");
diff --git a/vdr.5 b/vdr.5
index 6274c1af4..c46a2bf2e 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.22 2011/04/03 10:21:36 kls Exp $
+.\" $Id: vdr.5 2.23 2011/08/21 14:06:50 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -214,6 +214,17 @@ if there is an audio type.
 .TP
 .B TPID
 The teletext PID.
+If this channel also carries DVB subtitles, the DVB subtitling PIDs follow the
+teletext PID, separated by a semicolon, as in
+
+.B ...:201;2001,2002:...
+
+If certain subtitling PIDs broadcast in specific languages, the language
+codes for these can be appended to the individual subtitling PID, separated
+by an '=' sign, as in
+
+.B ...:201;2001=deu,2002=eng:...
+
 .TP
 .B Conditional access
 A hexadecimal integer defining how this channel can be accessed:

From 5a28d999363f8ace192489d4f6b13dfeb6cfc20b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 4 Dec 2011 16:53:00 +0100
Subject: [PATCH 208/307] Version 1.7.22 Original announce message: VDR
 developer version 1.7.22 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.22.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.21-1.7.22.diff

MD5 checksums:

b9c0fe1aac8e653c0d0234bc72c2bb2c  vdr-1.7.22.tar.bz2
868bb332342c9a78beda17cc85e0bb93  vdr-1.7.21-1.7.22.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Fixed scaling subtitles in case the primary device's GetVideoSize() function doesn't
  return actual values (thanks to Luca Olivetti).
- The DiSEqC codes are now copied in the call to cDiseqc::Execute().
- VDR now supports "Satellite Channel Routing" (SCR) according to EN50494 (based on
  the "unicable" patch from Lars Hanisch).
  Since "Unicable" is a registered trademark and stands for only one of many
  implementations of SCR, the following changes have been made compared to the patch,
  which need to be taken into account by people who have set up their system using
  the patch:
  - The 'U' parameter in the diseqc.conf file has been changed to 'S' ("Scr").
  - The configuration file name has been changed from "unicable.conf" to "scr.conf".
- Updated sources.conf (thanks to Arthur Konovalov).
- The SVDRP command LSTC now also accepts channel IDs (thanks to Dominic Evans).
- Fixed handling DVB subtitles and implemented decoding textual DVB subtitles (thanks
  to Rolf Ahrenberg).
- Added cap_net_raw to the capabilities that are not dropped (thanks to Dominic Evans).
- Fixed setting the start time of an edited recording (thanks to Christoph Haubrich).
- Temporarily switching free devices to transponders in order to have their running
  status updated is now done by marking the devices as "occupied" for a certain
  amount of time.
- The new setup options "LNB/Device n connected to sat cable" can be used to define
  which DVB-S devices are connected to the same sat cable and are therefore "bonded".
  This obsoletes the LNBSHARE patch. Users of the LNBSHARE patch will need to newly
  set up their sat devices with the above options.
- Fixed a crash when deleting a recording while cutting it (thanks to Ville Skyttä).
- Fixed several spelling errors (thanks to Ville Skyttä).
- The new SVDRP command UPDR can be used to trigger an update of the list of
  recordings (thanks to Lars Hanisch).
- Added generating a pkg-config file to the Makefile (thanks to Ville Skyttä).
- Removed the '.pl' suffix from all scripts (thanks to Ville Skyttä).
- Changed the default location for the LIRC socket to /var/run/lirc/lircd (thanks
  to Ville Skyttä).
- Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg).
- Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg).
- Fixed a crash with malformed SI data (patch from vdr-portal).
---
 CONTRIBUTORS                                  |  18 +
 HISTORY                                       |  38 +
 INSTALL                                       |  17 +
 MANUAL                                        |   8 +-
 Make.config.template                          |   4 +-
 Makefile                                      |  41 +-
 PLUGINS/src/dvbhddevice/Makefile              |   8 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c       | 114 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h       |   4 +-
 PLUGINS/src/dvbhddevice/hdffcmd.c             | 991 ++----------------
 PLUGINS/src/dvbhddevice/hdffcmd.h             |  39 +-
 PLUGINS/src/dvbhddevice/hdffosd.c             | 138 +--
 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile   |  75 ++
 .../src/dvbhddevice/libhdffcmd/bitbuffer.c    |  79 ++
 .../src/dvbhddevice/libhdffcmd/bitbuffer.h    |  43 +
 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h  |  42 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.c   | 451 ++++++++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.h   | 151 +++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_base.c |  45 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_base.h |  55 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_defs.h | 120 +++
 .../dvbhddevice/libhdffcmd/hdffcmd_generic.c  | 147 +++
 .../dvbhddevice/libhdffcmd/hdffcmd_generic.h  |  36 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c |  82 ++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h |  67 ++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_mux.c  |  81 ++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_mux.h  |  56 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.c  | 637 +++++++++++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.h  | 161 +++
 .../dvbhddevice/libhdffcmd/hdffcmd_remote.c   |  67 ++
 .../dvbhddevice/libhdffcmd/hdffcmd_remote.h   |  39 +
 PLUGINS/src/dvbhddevice/po/fi_FI.po           |   8 +-
 PLUGINS/src/dvbhddevice/setup.c               |  40 +-
 PLUGINS/src/dvbhddevice/setup.h               |   4 +-
 PLUGINS/src/pictures/HISTORY                  |   4 +
 PLUGINS/src/pictures/pic2mpg                  |   4 +-
 ci.h                                          |   4 +-
 config.c                                      |  69 +-
 config.h                                      |  30 +-
 cutter.c                                      |   7 +-
 device.c                                      |  24 +-
 device.h                                      |  35 +-
 diseqc.c                                      | 182 +++-
 diseqc.conf                                   |  13 +
 diseqc.h                                      |  74 +-
 dvbdevice.c                                   | 431 ++++++--
 dvbdevice.h                                   |  38 +-
 dvbsubtitle.c                                 | 673 +++++++-----
 eitscan.c                                     |   4 +-
 epg2html.pl => epg2html                       |   4 +-
 font.h                                        |   4 +-
 i18n-to-gettext.pl => i18n-to-gettext         |   4 +-
 interface.c                                   |   4 +-
 libsi/Makefile                                |   4 +-
 libsi/{gendescr.pl => gendescr}               |   2 +-
 libsi/si.c                                    |   4 +-
 menu.c                                        |  31 +-
 osd.h                                         |   8 +-
 pat.h                                         |   4 +-
 po/ar.po                                      |   9 +-
 po/ca_ES.po                                   |   9 +-
 po/cs_CZ.po                                   |   9 +-
 po/da_DK.po                                   |   9 +-
 po/de_DE.po                                   |   9 +-
 po/el_GR.po                                   |   9 +-
 po/es_ES.po                                   |   9 +-
 po/et_EE.po                                   |   9 +-
 po/fi_FI.po                                   |   9 +-
 po/fr_FR.po                                   |   9 +-
 po/hr_HR.po                                   |   9 +-
 po/hu_HU.po                                   |   9 +-
 po/it_IT.po                                   |   9 +-
 po/lt_LT.po                                   |   9 +-
 po/mk_MK.po                                   |   9 +-
 po/nl_NL.po                                   |   9 +-
 po/nn_NO.po                                   |   9 +-
 po/pl_PL.po                                   |   9 +-
 po/pt_PT.po                                   |   9 +-
 po/ro_RO.po                                   |   9 +-
 po/ru_RU.po                                   |   9 +-
 po/sk_SK.po                                   |   9 +-
 po/sl_SI.po                                   |   9 +-
 po/sr_SR.po                                   |   9 +-
 po/sv_SE.po                                   |   9 +-
 po/tr_TR.po                                   |   9 +-
 po/uk_UA.po                                   |   9 +-
 po/zh_CN.po                                   |   9 +-
 receiver.h                                    |   4 +-
 recording.c                                   |   4 +-
 recording.h                                   |   6 +-
 ringbuffer.h                                  |   4 +-
 scr.conf                                      |  24 +
 skins.h                                       |   4 +-
 sources.conf                                  | 175 ++--
 summary2info.pl => summary2info               |   4 +-
 svdrp.c                                       |  36 +-
 svdrp.h                                       |   3 +-
 tools.c                                       |  45 +-
 tools.h                                       |  30 +-
 vdr.1                                         |   4 +-
 vdr.5                                         |  46 +-
 vdr.c                                         |  21 +-
 102 files changed, 4608 insertions(+), 1621 deletions(-)
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c
 create mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h
 rename epg2html.pl => epg2html (97%)
 rename i18n-to-gettext.pl => i18n-to-gettext (99%)
 rename libsi/{gendescr.pl => gendescr} (97%)
 create mode 100644 scr.conf
 rename summary2info.pl => summary2info (94%)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index be533c18c..c3456a2a8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1117,6 +1117,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making the Audio and Subtitles options available through the Green and Yellow
  keys in the Setup/DVB menu
  for making the Recordings menu display the length (in hours:minutes) of each recording
+ for fixing handling DVB subtitles and implementing decoding textual DVB subtitles
+ for adding file name and line number to LOG_ERROR_STR()
+ for replacing all calls to sleep() with cCondWait::SleepMs()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1632,6 +1635,7 @@ Arthur Konovalov <artlov@gmail.com>
  for reporting problems with CAMs when checking the CAM status too frequently
  for reporting references to old *.vdr file names in MANUAL
  for reporting that the video stream type was set to 2 even if the vpid was 0
+ for updates to 'sources.conf'
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -1868,6 +1872,8 @@ Luca Olivetti <luca@ventoso.org>
  "repeat" keypresses very fast
  for reporting a broken entry 'A111.1W' in sources.conf
  for translating OSD texts to the Spanish and Catalan language
+ for fixing scaling subtitles in case the primary device's GetVideoSize() function
+ doesn't return actual values
 
 Mikko Salo <mikko.salo@ppe.inet.fi>
  for suggesting to make the setup option "DVB/Video display format" available only
@@ -1918,6 +1924,11 @@ Ville Skytt
  for fixing the Language header of the Serbian translation file
  for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
  for making the Makefile also install the include files
+ for fixing a crash when deleting a recording while cutting it
+ for fixing several spelling errors
+ for adding generating a pkg-config file to the Makefile
+ for removing the '.pl' suffix from all scripts (thanks to Ville Skytt�).
+ for changing the default location for the LIRC socket to /var/run/lirc/lircd
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2244,6 +2255,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for reporting that Setup.InitialChannel was dereferenced without checking for NULL
  for suggesting to implement a function to determine the length of a recording's
  index file
+ for fixing setting the start time of an edited recording
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2659,6 +2671,8 @@ Stephan Austerm
 
 Lars Hanisch <dvb@flensrocker.de>
  for suggesting to assign the source character 'V' to "Analog Video"
+ for a patch that was used to implement SCR (Satellite Channel Routing)
+ for implementing the SVDRP command 'UPDR'
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -2774,3 +2788,7 @@ Frank Niederwipper <f.niederwipper@gmail.com>
 
 Chris Mayo <aklhfex@gmail.com>
  for reporting a problem with detecting frames on radio channels
+
+Dominic Evans <oldmanuk@gmail.com>
+ for making the SVDRP command LSTC accepts channel IDs
+ for adding cap_net_raw to the capabilities that are not dropped
diff --git a/HISTORY b/HISTORY
index 42473309f..c74c1a07e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6742,3 +6742,41 @@ Video Disk Recorder Revision History
   Detecting frames in case the Picture Start Code or Access Unit Delimiter
   extends over TS packet boundaries is now done by locally skipping TS packets
   in cFrameDetector.
+
+2011-12-04: Version 1.7.22
+
+- Fixed scaling subtitles in case the primary device's GetVideoSize() function doesn't
+  return actual values (thanks to Luca Olivetti).
+- The DiSEqC codes are now copied in the call to cDiseqc::Execute().
+- VDR now supports "Satellite Channel Routing" (SCR) according to EN50494 (based on
+  the "unicable" patch from Lars Hanisch).
+  Since "Unicable" is a registered trademark and stands for only one of many
+  implementations of SCR, the following changes have been made compared to the patch,
+  which need to be taken into account by people who have set up their system using
+  the patch:
+  - The 'U' parameter in the diseqc.conf file has been changed to 'S' ("Scr").
+  - The configuration file name has been changed from "unicable.conf" to "scr.conf".
+- Updated sources.conf (thanks to Arthur Konovalov).
+- The SVDRP command LSTC now also accepts channel IDs (thanks to Dominic Evans).
+- Fixed handling DVB subtitles and implemented decoding textual DVB subtitles (thanks
+  to Rolf Ahrenberg).
+- Added cap_net_raw to the capabilities that are not dropped (thanks to Dominic Evans).
+- Fixed setting the start time of an edited recording (thanks to Christoph Haubrich).
+- Temporarily switching free devices to transponders in order to have their running
+  status updated is now done by marking the devices as "occupied" for a certain
+  amount of time.
+- The new setup options "LNB/Device n connected to sat cable" can be used to define
+  which DVB-S devices are connected to the same sat cable and are therefore "bonded".
+  This obsoletes the LNBSHARE patch. Users of the LNBSHARE patch will need to newly
+  set up their sat devices with the above options.
+- Fixed a crash when deleting a recording while cutting it (thanks to Ville Skytt�).
+- Fixed several spelling errors (thanks to Ville Skytt�).
+- The new SVDRP command UPDR can be used to trigger an update of the list of
+  recordings (thanks to Lars Hanisch).
+- Added generating a pkg-config file to the Makefile (thanks to Ville Skytt�).
+- Removed the '.pl' suffix from all scripts (thanks to Ville Skytt�).
+- Changed the default location for the LIRC socket to /var/run/lirc/lircd (thanks
+  to Ville Skytt�).
+- Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg).
+- Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg).
+- Fixed a crash with malformed SI data (patch from vdr-portal).
diff --git a/INSTALL b/INSTALL
index e69768a79..96ebebb78 100644
--- a/INSTALL
+++ b/INSTALL
@@ -386,6 +386,23 @@ accessed using DiSEqC, you have to go to the "Setup" menu and set the "DiSEqC"
 parameter to "on". You also need to set up the file 'diseqc.conf' to properly
 access your DiSEqC equipment (see man vdr(5) for details).
 
+A special form of DiSEqC is used to connect several receivers to one signal
+source using only a single cable. This method, known as "Satellite Channel Routing"
+according to EN50494 (aka "Unicable(TM)", "OLT(TM)", "SatCR", "Single Cable
+Distribution", "Channel Stacking System" or "Single Cable Interface") uses
+the file "scr.conf" to specify which SCR channels use which user band frequency.
+
+If DVB-S devices need to be connected to the same satellite cable, but no
+"Satellite Channel Routing" is available, they can be set to be "bonded" in
+the Setup/LNB menu. Bonded devices can only be tuned to the same polarization
+and frequency band, which reduces the number of potentially receivable channels.
+
+Note that it doesn't make sense to use "Satellite Channel Routing" and
+"Device Bonding" at the same time with the same devices. If you use either
+of these methods, it is necessary that your devices are always created in the
+same sequence when the drivers are loaded. You may need to configure some
+proper "udev" rules to make sure this happens.
+
 Running VDR with DVB-C (cable) or DVB-T (terrestrial):
 ------------------------------------------------------
 
diff --git a/MANUAL b/MANUAL
index 54e166e95..3e3adad39 100644
--- a/MANUAL
+++ b/MANUAL
@@ -732,12 +732,18 @@ Version 1.6
 
   LNB:
 
+  Use DiSEqC = no        Generally turns DiSEqC support on or off.
+
   SLOF               = 11700  The switching frequency (in MHz) between low and
                               high LOF
   Low LNB frequency  =  9750  The LNB's low and high local oscillator frequencies
   High LNB frequency = 10600  (in MHz, these have no meaning for DVB-C receivers)
 
-  Use DiSEqC = no        Generally turns DiSEqC support on or off.
+  Device n connected to sat cable = own
+                         Defines whether DVB-S device n has its own satellite cable,
+                         or is "bonded" with another device. All DVB-S devices that
+                         are connected to the same sat cable must be set to the same
+                         number here.
 
   CAM:
 
diff --git a/Make.config.template b/Make.config.template
index 1fc8227a5..0de5bb971 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.3 2011/03/13 13:41:12 kls Exp $
+# $Id: Make.config.template 2.4 2011/12/04 14:41:00 kls Exp $
 
 ### The C compiler and options:
 
@@ -35,7 +35,7 @@ CONFDIR  = $(VIDEODIR)
 
 ### The remote control:
 
-LIRC_DEVICE = /dev/lircd
+LIRC_DEVICE = /var/run/lirc/lircd
 RCU_DEVICE  = /dev/ttyS1
 
 ## Define if you want vdr to not run as root
diff --git a/Makefile b/Makefile
index 18d7eb96f..e6af30ebe 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.18 2011/05/21 12:21:40 kls Exp $
+# $Id: Makefile 2.22 2011/12/04 14:41:00 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -33,6 +33,8 @@ CONFDIR  = $(VIDEODIR)
 DOXYGEN  = /usr/bin/doxygen
 DOXYFILE = Doxyfile
 
+PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
+
 include Make.global
 -include Make.config
 
@@ -60,7 +62,7 @@ DEFINES += -DBIDI
 LIBS += $(shell pkg-config --libs fribidi)
 endif
 
-LIRC_DEVICE ?= /dev/lircd
+LIRC_DEVICE ?= /var/run/lirc/lircd
 RCU_DEVICE  ?= /dev/ttyS1
 
 DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
@@ -77,7 +79,7 @@ DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 
-all: vdr i18n
+all: vdr i18n vdr.pc
 
 # Implicit rules:
 
@@ -103,6 +105,25 @@ vdr: $(OBJS) $(SILIB)
 $(SILIB):
 	$(MAKE) -C $(LSIDIR) all
 
+# pkg-config file:
+
+vdr.pc: Makefile Make.global
+	@echo "bindir=$(BINDIR)" > $@
+	@echo "includedir=$(INCDIR)" >> $@
+	@echo "configdir=$(CONFDIR)" >> $@
+	@echo "videodir=$(VIDEODIR)" >> $@
+	@echo "plugindir=$(PLUGINLIBDIR)" >> $@
+	@echo "localedir=$(LOCDIR)" >> $@
+	@echo "apiversion=$(APIVERSION)" >> $@
+	@echo "cflags=$(CXXFLAGS) $(DEFINES) -I\$${includedir}" >> $@
+	@echo "plugincflags=\$${cflags} -fPIC" >> $@
+	@echo "" >> $@
+	@echo "Name: VDR" >> $@
+	@echo "Description: Video Disk Recorder" >> $@
+	@echo "URL: http://www.tvdr.de/" >> $@
+	@echo "Version: $(VDRVERSION)" >> $@
+	@echo "Cflags: \$${cflags}" >> $@
+
 # Internationalization (I18N):
 
 PODIR     = po
@@ -163,13 +184,13 @@ clean-plugins:
 
 # Install the files:
 
-install: install-bin install-conf install-doc install-plugins install-i18n install-includes
+install: install-bin install-conf install-doc install-plugins install-i18n install-includes install-pc
 
 # VDR binary:
 
 install-bin: vdr
 	@mkdir -p $(DESTDIR)$(BINDIR)
-	@cp --remove-destination vdr svdrpsend.pl $(DESTDIR)$(BINDIR)
+	@cp --remove-destination vdr svdrpsend $(DESTDIR)$(BINDIR)
 
 # Configuration files:
 
@@ -200,6 +221,14 @@ install-includes: include-dir
 	@mkdir -p $(DESTDIR)$(INCDIR)
 	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
 
+# pkg-config file:
+
+install-pc: vdr.pc
+	if [ -n "$(PCDIR)" ] ; then \
+	    mkdir -p $(DESTDIR)$(PCDIR) ; \
+	    cp vdr.pc $(DESTDIR)$(PCDIR) ; \
+	    fi
+
 # Source documentation:
 
 srcdoc:
@@ -212,7 +241,7 @@ srcdoc:
 
 clean:
 	$(MAKE) -C $(LSIDIR) clean
-	-rm -f $(OBJS) $(DEPFILE) vdr core* *~
+	-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~
 	-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
 	-rm -rf include
 	-rm -rf srcdoc
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 91fdfce8c..09ca4ad84 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2011/05/21 12:25:33 kls Exp $
+# $Id: Makefile 1.9 2011/12/04 15:30:21 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -98,8 +98,9 @@ i18n: $(I18Nmsgs) $(I18Npot)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+libvdr-$(PLUGIN).so: $(OBJS) libhdffcmd
+	$(MAKE) -C libhdffcmd all
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: $(I18Npo) clean
@@ -112,3 +113,4 @@ dist: $(I18Npo) clean
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	$(MAKE) -C libhdffcmd clean
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index ff3f953b8..101558dfe 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.33 2011/08/27 09:32:18 kls Exp $
+ * $Id: dvbhdffdevice.c 1.35 2011/12/04 15:30:42 kls Exp $
  */
 
 #include "dvbhdffdevice.h"
@@ -47,18 +47,18 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
      isHdffPrimary = true;
      mHdffCmdIf = new HDFF::cHdffCmdIf(fd_osd);
      mHdffCmdIf->CmdAvSetAudioDelay(gHdffSetup.AudioDelay);
-     mHdffCmdIf->CmdAvSetAudioDownmix((HDFF::eDownmixMode) gHdffSetup.AudioDownmix);
-     mHdffCmdIf->CmdMuxSetVideoOut((HDFF::eVideoOut) gHdffSetup.AnalogueVideo);
+     mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) gHdffSetup.AudioDownmix);
+     mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) gHdffSetup.AnalogueVideo);
      mHdffCmdIf->CmdHdmiSetVideoMode(gHdffSetup.GetVideoMode());
-     HDFF::tHdmiConfig hdmiConfig;
+     HdffHdmiConfig_t hdmiConfig;
      hdmiConfig.TransmitAudio = true;
      hdmiConfig.ForceDviMode = false;
      hdmiConfig.CecEnabled = gHdffSetup.CecEnabled;
-     hdmiConfig.VideoModeAdaption = (HDFF::eVideoModeAdaption) gHdffSetup.VideoModeAdaption;
+     hdmiConfig.VideoModeAdaption = (HdffVideoModeAdaption_t) gHdffSetup.VideoModeAdaption;
      mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
      if (gHdffSetup.CecEnabled)
-        mHdffCmdIf->CmdHdmiSendCecCommand(HDFF::cecCommandTvOn);
-     mHdffCmdIf->CmdRemoteSetProtocol((HDFF::eRemoteProtocol) gHdffSetup.RemoteProtocol);
+        mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
+     mHdffCmdIf->CmdRemoteSetProtocol((HdffRemoteProtocol_t) gHdffSetup.RemoteProtocol);
      mHdffCmdIf->CmdRemoteSetAddressFilter(gHdffSetup.RemoteAddress >= 0, gHdffSetup.RemoteAddress);
      }
 
@@ -109,11 +109,11 @@ void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayForma
 
 void cDvbHdFfDevice::SetVideoFormat(bool VideoFormat16_9)
 {
-  HDFF::tVideoFormat videoFormat;
+  HdffVideoFormat_t videoFormat;
   videoFormat.AutomaticEnabled = true;
   videoFormat.AfdEnabled = true;
-  videoFormat.TvFormat = (HDFF::eTvFormat) gHdffSetup.TvFormat;
-  videoFormat.VideoConversion = (HDFF::eVideoConversion) gHdffSetup.VideoConversion;
+  videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
+  videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
   mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
 }
 
@@ -184,14 +184,14 @@ bool cDvbHdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            mHdffCmdIf->CmdAvSetPcrPid(0, Handle->pid);
         else if (Type == ptVideo) {
            if (Handle->streamType == 0x1B)
-              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF::videoStreamH264);
+              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_H264);
            else
-              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF::videoStreamMpeg2);
+              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_MPEG2);
            }
         else if (Type == ptAudio)
-           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF::audioStreamMpeg1);
+           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG1);
         else if (Type == ptDolby)
-           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF::audioStreamAc3);
+           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_AC3);
         if (!(Type <= ptDolby && Handle->used <= 1)) {
            pesFilterParams.pid     = Handle->pid;
            pesFilterParams.input   = DMX_IN_FRONTEND;
@@ -209,11 +209,11 @@ bool cDvbHdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
         if (Type == ptPcr)
            mHdffCmdIf->CmdAvSetPcrPid(0, 0);
         else if (Type == ptVideo)
-           mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF::videoStreamMpeg2);
+           mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
         else if (Type == ptAudio)
-           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
         else if (Type == ptDolby)
-           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamAc3);
+           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_AC3);
         //TODO missing setting to 0x1FFF??? see cDvbDevice::SetPid()
         close(Handle->handle);
         Handle->handle = -1;
@@ -351,10 +351,13 @@ bool cDvbHdFfDevice::CanReplay(void) const
 bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
 {
   if (PlayMode == pmNone) {
+     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
+     mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
+
      mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
      mHdffCmdIf->CmdAvSetPcrPid(0, 0);
-     mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF::videoStreamMpeg2);
-     mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+     mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
+     mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
 
      ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
      mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
@@ -374,6 +377,8 @@ bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
      playAudioPid = -1;
      audioCounter = 0;
      videoCounter = 0;
+     freezed = false;
+     trickMode = false;
 
      mHdffCmdIf->CmdAvSetDecoderInput(0, 2);
      ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
@@ -405,18 +410,20 @@ int64_t cDvbHdFfDevice::GetSTC(void)
 
 void cDvbHdFfDevice::TrickSpeed(int Speed)
 {
+  freezed = false;
   mHdffCmdIf->CmdAvEnableSync(0, false);
-  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
   playAudioPid = -1;
   if (Speed > 0)
      mHdffCmdIf->CmdAvSetVideoSpeed(0, 100 / Speed);
+  trickMode = true;
 }
 
 void cDvbHdFfDevice::Clear(void)
 {
   CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-  mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF::videoStreamMpeg1);
-  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF::audioStreamMpeg1);
+  mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
+  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
   playVideoPid = -1;
   playAudioPid = -1;
   cDevice::Clear();
@@ -424,6 +431,8 @@ void cDvbHdFfDevice::Clear(void)
 
 void cDvbHdFfDevice::Play(void)
 {
+  freezed = false;
+  trickMode = false;
   mHdffCmdIf->CmdAvEnableSync(0, true);
   mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
   mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
@@ -432,6 +441,7 @@ void cDvbHdFfDevice::Play(void)
 
 void cDvbHdFfDevice::Freeze(void)
 {
+  freezed = true;
   mHdffCmdIf->CmdAvSetVideoSpeed(0, 0);
   mHdffCmdIf->CmdAvSetAudioSpeed(0, 0);
   cDevice::Freeze();
@@ -443,13 +453,13 @@ void cDvbHdFfDevice::Mute(void)
   cDevice::Mute();
 }
 
-static HDFF::eVideoStreamType MapVideoStreamTypes(int Vtype)
+static HdffVideoStreamType_t MapVideoStreamTypes(int Vtype)
 {
   switch (Vtype) {
-    case 0x01: return HDFF::videoStreamMpeg1;
-    case 0x02: return HDFF::videoStreamMpeg2;
-    case 0x1B: return HDFF::videoStreamH264;
-    default: return HDFF::videoStreamMpeg2; // fallback to MPEG2
+    case 0x01: return HDFF_VIDEO_STREAM_MPEG1;
+    case 0x02: return HDFF_VIDEO_STREAM_MPEG2;
+    case 0x1B: return HDFF_VIDEO_STREAM_H264;
+    default: return HDFF_VIDEO_STREAM_MPEG2; // fallback to MPEG2
     }
 }
 
@@ -594,6 +604,8 @@ uint32_t cDvbHdFfDevice::PesToTs(uint8_t * TsBuffer, uint16_t Pid, uint8_t & Cou
 
 int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
 {
+    if (freezed)
+        return -1;
     //TODO: support greater Length
     uint8_t tsBuffer[188 * 16];
     uint32_t tsLength;
@@ -603,7 +615,7 @@ int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
 
     if (pid != playVideoPid) {
         playVideoPid = pid;
-        mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, HDFF::videoStreamMpeg2, true);
+        mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, HDFF_VIDEO_STREAM_MPEG2, true);
     }
     if (WriteAllOrNothing(fd_video, tsBuffer, tsLength, 1000, 10) <= 0)
         Length = 0;
@@ -612,39 +624,43 @@ int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
 
 int cDvbHdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
+    if (freezed)
+        return -1;
+    if (trickMode)
+        return Length;
     uint8_t streamId;
     uint8_t tsBuffer[188 * 16];
     uint32_t tsLength;
-    HDFF::eAudioStreamType streamType = HDFF::audioStreamMpeg1;
-    HDFF::eAVContainerType containerType = HDFF::avContainerPes;
+    HdffAudioStreamType_t streamType = HDFF_AUDIO_STREAM_MPEG1;
+    HdffAvContainerType_t containerType = HDFF_AV_CONTAINER_PES;
     int pid;
 
     streamId = Data[3];
     if (streamId >= 0xC0 && streamId <= 0xDF)
     {
-        streamType = HDFF::audioStreamMpeg1;
+        streamType = HDFF_AUDIO_STREAM_MPEG1;
     }
     else if (streamId == 0xBD)
     {
         const uint8_t * payload = Data + 9 + Data[8];
         if ((payload[0] & 0xF8) == 0xA0)
         {
-            containerType = HDFF::avContainerPesDvd;
-            streamType = HDFF::audioStreamPcm;
+            containerType = HDFF_AV_CONTAINER_PES_DVD;
+            streamType = HDFF_AUDIO_STREAM_PCM;
         }
         else if ((payload[0] & 0xF8) == 0x88)
         {
-            containerType = HDFF::avContainerPesDvd;
-            streamType = HDFF::audioStreamDts;
+            containerType = HDFF_AV_CONTAINER_PES_DVD;
+            streamType = HDFF_AUDIO_STREAM_DTS;
         }
         else if ((payload[0] & 0xF8) == 0x80)
         {
-            containerType = HDFF::avContainerPesDvd;
-            streamType = HDFF::audioStreamAc3;
+            containerType = HDFF_AV_CONTAINER_PES_DVD;
+            streamType = HDFF_AUDIO_STREAM_AC3;
         }
         else
         {
-            streamType = HDFF::audioStreamAc3;
+            streamType = HDFF_AUDIO_STREAM_AC3;
         }
     }
     pid = 200 + (int) streamType;
@@ -661,6 +677,8 @@ int cDvbHdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 
 int cDvbHdFfDevice::PlayTsVideo(const uchar *Data, int Length)
 {
+  if (freezed)
+    return -1;
   int pid = TsPid(Data);
   if (pid != playVideoPid) {
      PatPmtParser();
@@ -672,21 +690,25 @@ int cDvbHdFfDevice::PlayTsVideo(const uchar *Data, int Length)
   return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
-static HDFF::eAudioStreamType MapAudioStreamTypes(int Atype)
+static HdffAudioStreamType_t MapAudioStreamTypes(int Atype)
 {
   switch (Atype) {
-    case 0x03: return HDFF::audioStreamMpeg1;
-    case 0x04: return HDFF::audioStreamMpeg2;
-    case SI::AC3DescriptorTag: return HDFF::audioStreamAc3;
-    case SI::EnhancedAC3DescriptorTag: return HDFF::audioStreamEAc3;
-    case 0x0F: return HDFF::audioStreamAac;
-    case 0x11: return HDFF::audioStreamHeAac;
-    default: return HDFF::audioStreamMaxValue; // there is no HDFF::audioStreamNone
+    case 0x03: return HDFF_AUDIO_STREAM_MPEG1;
+    case 0x04: return HDFF_AUDIO_STREAM_MPEG2;
+    case SI::AC3DescriptorTag: return HDFF_AUDIO_STREAM_AC3;
+    case SI::EnhancedAC3DescriptorTag: return HDFF_AUDIO_STREAM_EAC3;
+    case 0x0F: return HDFF_AUDIO_STREAM_AAC;
+    case 0x11: return HDFF_AUDIO_STREAM_HE_AAC;
+    default: return HDFF_AUDIO_STREAM_MPEG1;
     }
 }
 
 int cDvbHdFfDevice::PlayTsAudio(const uchar *Data, int Length)
 {
+  if (freezed)
+    return -1;
+  if (trickMode)
+    return Length;
   int pid = TsPid(Data);
   if (pid != playAudioPid) {
      playAudioPid = pid;
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 4dcfb6a54..439ec9b72 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.h 1.6 2010/03/13 11:18:13 kls Exp $
+ * $Id: dvbhdffdevice.h 1.7 2011/09/10 10:17:32 kls Exp $
  */
 
 #ifndef __DVBHDFFDEVICE_H
@@ -79,6 +79,8 @@ class cDvbHdFfDevice : public cDvbDevice {
 private:
   int playVideoPid;
   int playAudioPid;
+  bool freezed;
+  bool trickMode;
 
   // Pes2Ts conversion stuff
   uint8_t videoCounter;
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index 60ad70e7f..957f2c740 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,34 +3,15 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.21 2011/08/27 09:34:18 kls Exp $
+ * $Id: hdffcmd.c 1.22 2011/12/04 15:31:03 kls Exp $
  */
 
 #include "hdffcmd.h"
-#include <linux/dvb/osd.h>
+#include "libhdffcmd/hdffcmd.h"
 #include <stdio.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <vdr/tools.h>
 
-#if !defined OSD_RAW_CMD
-typedef struct osd_raw_cmd_s {
-    const void *cmd_data;
-    int cmd_len;
-    void *result_data;
-    int result_len;
-} osd_raw_cmd_t;
-
-typedef struct osd_raw_data_s {
-    const void *data_buffer;
-    int data_length;
-    int data_handle;
-} osd_raw_data_t;
-
-#define OSD_RAW_CMD            _IOWR('o', 162, osd_raw_cmd_t)
-#define OSD_RAW_DATA           _IOWR('o', 163, osd_raw_data_t)
-#endif
-
 
 namespace HDFF
 {
@@ -48,1093 +29,347 @@ cHdffCmdIf::~cHdffCmdIf(void)
 {
 }
 
-void cHdffCmdIf::CmdBuildHeader(cBitBuffer & MsgBuf, eMessageType MsgType, eMessageGroup MsgGroup, eMessageId MsgId)
-{
-    MsgBuf.SetBits(16, 0); // length field will be set later
-    MsgBuf.SetBits(6, 0); // reserved
-    MsgBuf.SetBits(2, MsgType);
-    MsgBuf.SetBits(8, MsgGroup);
-    MsgBuf.SetBits(16, MsgId);
-}
-
-uint32_t cHdffCmdIf::CmdSetLength(cBitBuffer & MsgBuf)
-{
-    uint32_t length;
-
-    length = MsgBuf.GetByteLength() - 2;
-    MsgBuf.SetDataByte(0, (uint8_t) (length >> 8));
-    MsgBuf.SetDataByte(1, (uint8_t) length);
-
-    return length + 2;
-}
-
 
 uint32_t cHdffCmdIf::CmdGetFirmwareVersion(char * pString, uint32_t MaxLength)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupGeneric, msgGenGetFirmwareVersion);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        uint8_t textLength = result[9];
-        if (textLength >= MaxLength)
-            textLength = MaxLength - 1;
-        memcpy(pString, &result[10], textLength);
-        pString[textLength] = 0;
-        return (result[6] << 16) | (result[7] << 8) | result[8];
-    }
+    uint32_t version;
+    int err;
+
+    err = HdffCmdGetFirmwareVersion(mOsdDev, &version, pString, MaxLength);
+    if (err == 0)
+        return version;
     return 0;
 }
 
 uint32_t cHdffCmdIf::CmdGetInterfaceVersion(char * pString, uint32_t MaxLength)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupGeneric, msgGenGetInterfaceVersion);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        uint8_t textLength = result[9];
-        if (textLength >= MaxLength)
-            textLength = MaxLength - 1;
-        memcpy(pString, &result[10], textLength);
-        pString[textLength] = 0;
-        return (result[6] << 16) | (result[7] << 8) | result[8];
-    }
+    uint32_t version;
+    int err;
+
+    err = HdffCmdGetInterfaceVersion(mOsdDev, &version, pString, MaxLength);
+    if (err == 0)
+        return version;
     return 0;
 }
 
 uint32_t cHdffCmdIf::CmdGetCopyrights(uint8_t Index, char * pString, uint32_t MaxLength)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupGeneric, msgGenGetCopyrights);
-    cmdBuf.SetBits(8, Index);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        uint8_t index = result[6];
-        uint8_t textLen = result[7];
-        if (index == Index && textLen > 0)
-        {
-            if (textLen >= MaxLength)
-            {
-                textLen = MaxLength - 1;
-            }
-            memcpy(pString, result + 8, textLen);
-            pString[textLen] = 0;
-            return textLen;
-        }
-    }
+    int err;
+
+    err = HdffCmdGetCopyrights(mOsdDev, Index, pString, MaxLength);
+    if (err == 0)
+        return strlen(pString);
     return 0;
 }
 
 
 void cHdffCmdIf::CmdAvSetPlayMode(uint8_t PlayMode, bool Realtime)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetPlayMode);
-    cmdBuf.SetBits(1, Realtime ? 1 : 0);
-    cmdBuf.SetBits(7, PlayMode);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetPlayMode(mOsdDev, PlayMode, Realtime);
 }
 
-void cHdffCmdIf::CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, eVideoStreamType StreamType, bool PlaybackMode)
+void cHdffCmdIf::CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, HdffVideoStreamType_t StreamType, bool PlaybackMode)
 {
     //printf("SetVideoPid %d %d\n", VideoPid, StreamType);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoPid);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, StreamType);
-    cmdBuf.SetBits(1, PlaybackMode ? 1 : 0);
-    cmdBuf.SetBits(15, VideoPid);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetVideoPid(mOsdDev, DecoderIndex, VideoPid, StreamType);
 }
 
-void cHdffCmdIf::CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, eAudioStreamType StreamType, eAVContainerType ContainerType)
+void cHdffCmdIf::CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, HdffAudioStreamType_t StreamType, HdffAvContainerType_t ContainerType)
 {
     //printf("SetAudioPid %d %d %d\n", AudioPid, StreamType, ContainerType);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioPid);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, StreamType);
-    cmdBuf.SetBits(2, 0); // reserved
-    cmdBuf.SetBits(1, ContainerType);
-    cmdBuf.SetBits(13, AudioPid);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetAudioPid(mOsdDev, DecoderIndex, AudioPid, StreamType,
+                         ContainerType);
 }
 
 void cHdffCmdIf::CmdAvSetPcrPid(uint8_t DecoderIndex, uint16_t PcrPid)
 {
     //printf("SetPcrPid %d\n", PcrPid);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetPcrPid);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, 0); // reserved
-    cmdBuf.SetBits(16, PcrPid);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetPcrPid(mOsdDev, DecoderIndex, PcrPid);
 }
 
 void cHdffCmdIf::CmdAvSetTeletextPid(uint8_t DecoderIndex, uint16_t TeletextPid)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetTeletextPid);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, 0); // reserved
-    cmdBuf.SetBits(16, TeletextPid);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetTeletextPid(mOsdDev, DecoderIndex, TeletextPid);
 }
 
 void cHdffCmdIf::CmdAvSetVideoWindow(uint8_t DecoderIndex, bool Enable, uint16_t X, uint16_t Y, uint16_t Width, uint16_t Height)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoWindow);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(3, 0); // reserved
-    if (Enable)
-        cmdBuf.SetBits(1, 1);
-    else
-        cmdBuf.SetBits(1, 0);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(16, Width);
-    cmdBuf.SetBits(16, Height);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetVideoWindow(mOsdDev, DecoderIndex, Enable, X, Y, Width, Height);
 }
 
-void cHdffCmdIf::CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, eVideoStreamType StreamType)
+void cHdffCmdIf::CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, HdffVideoStreamType_t StreamType)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    osd_raw_data_t osd_data;
-
-    memset(&osd_data, 0, sizeof(osd_raw_data_t));
-    osd_data.data_buffer = (void *) pStillImage;
-    osd_data.data_length = Size;
-    ioctl(mOsdDev, OSD_RAW_DATA, &osd_data);
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvShowStillImage);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, StreamType);
-    cmdBuf.SetBits(16, osd_data.data_handle);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvShowStillImage(mOsdDev, DecoderIndex, pStillImage, Size,
+                            StreamType);
 }
 
 void cHdffCmdIf::CmdAvSetDecoderInput(uint8_t DecoderIndex, uint8_t DemultiplexerIndex)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetDecoderInput);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, DemultiplexerIndex);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetDecoderInput(mOsdDev, DecoderIndex, DemultiplexerIndex);
 }
 
 void cHdffCmdIf::CmdAvSetDemultiplexerInput(uint8_t DemultiplexerIndex, uint8_t TsInputIndex)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetDemultiplexerInput);
-    cmdBuf.SetBits(4, DemultiplexerIndex);
-    cmdBuf.SetBits(4, TsInputIndex);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetDemultiplexerInput(mOsdDev, DemultiplexerIndex, TsInputIndex);
 }
 
-void cHdffCmdIf::CmdAvSetVideoFormat(uint8_t DecoderIndex, const tVideoFormat * pVideoFormat)
+void cHdffCmdIf::CmdAvSetVideoFormat(uint8_t DecoderIndex, const HdffVideoFormat_t * pVideoFormat)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoFormat);
-    cmdBuf.SetBits(4, DecoderIndex);
-    if (pVideoFormat->AutomaticEnabled)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    if (pVideoFormat->AfdEnabled)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    cmdBuf.SetBits(2, pVideoFormat->TvFormat);
-    cmdBuf.SetBits(8, pVideoFormat->VideoConversion);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetVideoFormat(mOsdDev, DecoderIndex, pVideoFormat);
 }
 
-void cHdffCmdIf::CmdAvSetVideoOutputMode(uint8_t DecoderIndex, eVideoOutputMode OutputMode)
+void cHdffCmdIf::CmdAvSetVideoOutputMode(uint8_t DecoderIndex, HdffVideoOutputMode_t OutputMode)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoOutputMode);
-    cmdBuf.SetBits(8, OutputMode);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetVideoOutputMode(mOsdDev, DecoderIndex, OutputMode);
 }
 
 void cHdffCmdIf::CmdAvSetStc(uint8_t DecoderIndex, uint64_t Stc)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetStc);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(3, 0); // reserved
-    cmdBuf.SetBits(1, (uint32_t) (Stc >> 32));
-    cmdBuf.SetBits(32, (uint32_t) Stc);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetStc(mOsdDev, DecoderIndex, Stc);
 }
 
 void cHdffCmdIf::CmdAvFlushBuffer(uint8_t DecoderIndex, bool FlushAudio, bool FlushVideo)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvFlushBuffer);
-    cmdBuf.SetBits(4, DecoderIndex);
-    if (FlushAudio)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    if (FlushVideo)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvFlushBuffer(mOsdDev, DecoderIndex, FlushAudio, FlushVideo);
 }
 
 void cHdffCmdIf::CmdAvEnableSync(uint8_t DecoderIndex, bool EnableSync)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvEnableSync);
-    cmdBuf.SetBits(4, DecoderIndex);
-    if (EnableSync)
-    {
-        cmdBuf.SetBits(1, 1);
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-        cmdBuf.SetBits(1, 0);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvEnableSync(mOsdDev, DecoderIndex, EnableSync, EnableSync);
 }
 
 void cHdffCmdIf::CmdAvSetVideoSpeed(uint8_t DecoderIndex, int32_t Speed)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetVideoSpeed);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, 0);
-    cmdBuf.SetBits(32, Speed);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetVideoSpeed(mOsdDev, DecoderIndex, Speed);
 }
 
 void cHdffCmdIf::CmdAvSetAudioSpeed(uint8_t DecoderIndex, int32_t Speed)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioSpeed);
-    cmdBuf.SetBits(4, DecoderIndex);
-    cmdBuf.SetBits(4, 0);
-    cmdBuf.SetBits(32, Speed);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetAudioSpeed(mOsdDev, DecoderIndex, Speed);
 }
 
 void cHdffCmdIf::CmdAvEnableVideoAfterStop(uint8_t DecoderIndex, bool EnableVideoAfterStop)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvEnableVideoAfterStop);
-    cmdBuf.SetBits(4, DecoderIndex);
-    if (EnableVideoAfterStop)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvEnableVideoAfterStop(mOsdDev, DecoderIndex, EnableVideoAfterStop);
 }
 
 void cHdffCmdIf::CmdAvSetAudioDelay(int16_t Delay)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioDelay);
-    cmdBuf.SetBits(16, Delay);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetAudioDelay(mOsdDev, Delay);
 }
 
-void cHdffCmdIf::CmdAvSetAudioDownmix(eDownmixMode DownmixMode)
+void cHdffCmdIf::CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioDownmix);
-    cmdBuf.SetBits(8, DownmixMode);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetAudioDownmix(mOsdDev, DownmixMode);
 }
 
 void cHdffCmdIf::CmdAvSetAudioChannel(uint8_t AudioChannel)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvDec, msgAvSetAudioChannel);
-    cmdBuf.SetBits(8, AudioChannel);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdAvSetAudioChannel(mOsdDev, AudioChannel);
 }
 
 
-void cHdffCmdIf::CmdOsdConfigure(const tOsdConfig * pConfig)
+void cHdffCmdIf::CmdOsdConfigure(const HdffOsdConfig_t * pConfig)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdConfigure);
-    if (pConfig->FontAntialiasing)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    if (pConfig->FontKerning)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdConfigure(mOsdDev, pConfig);
 }
 
 void cHdffCmdIf::CmdOsdReset(void)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdReset);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdReset(mOsdDev);
 }
 
-uint32_t cHdffCmdIf::CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, eColorType ColorType)
+uint32_t cHdffCmdIf::CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, HdffColorType_t ColorType)
 {
     //printf("CreateDisplay %d %d %d\n", Width, Height, ColorType);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreateDisplay);
-    cmdBuf.SetBits(16, Width);
-    cmdBuf.SetBits(16, Height);
-    cmdBuf.SetBits(8, ColorType);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
-    }
-    return InvalidHandle;
+    uint32_t newDisplay;
+
+    if (HdffCmdOsdCreateDisplay(mOsdDev, Width, Height, ColorType, &newDisplay) == 0)
+        return newDisplay;
+    return HDFF_INVALID_HANDLE;
 }
 
 void cHdffCmdIf::CmdOsdDeleteDisplay(uint32_t hDisplay)
 {
     //printf("DeleteDisplay\n");
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeleteDisplay);
-    cmdBuf.SetBits(32, hDisplay);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDeleteDisplay(mOsdDev, hDisplay);
 }
 
 void cHdffCmdIf::CmdOsdEnableDisplay(uint32_t hDisplay, bool Enable)
 {
     //printf("EnableDisplay\n");
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdEnableDisplay);
-    cmdBuf.SetBits(32, hDisplay);
-    if (Enable)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    cmdBuf.SetBits(7, 0); // reserved
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdEnableDisplay(mOsdDev, hDisplay, Enable);
 }
 
 void cHdffCmdIf::CmdOsdSetDisplayOutputRectangle(uint32_t hDisplay, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height)
 {
     //printf("SetOutputRect %d %d %d %d %d\n", hDisplay, X, Y, Width, Height);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetDisplayOutputRectangle);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(16, Width);
-    cmdBuf.SetBits(16, Height);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdSetDisplayOutputRectangle(mOsdDev, hDisplay, X, Y, Width, Height);
 }
 
 void cHdffCmdIf::CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height)
 {
     //printf("SetClippingArea %d %d %d %d %d %d\n", hDisplay, Enable, X, Y, Width, Height);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetDisplayClippingArea);
-    cmdBuf.SetBits(32, hDisplay);
-    if (Enable)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    cmdBuf.SetBits(7, 0); // reserved
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(16, Width);
-    cmdBuf.SetBits(16, Height);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdSetDisplayClippingArea(mOsdDev, hDisplay, Enable, X, Y, Width, Height);
 }
 
 void cHdffCmdIf::CmdOsdRenderDisplay(uint32_t hDisplay)
 {
     //printf("Render\n");
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdRenderDisplay);
-    cmdBuf.SetBits(32, hDisplay);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdRenderDisplay(mOsdDev, hDisplay);
 }
 
-uint32_t cHdffCmdIf::CmdOsdCreatePalette(eColorType ColorType, eColorFormat ColorFormat,
+uint32_t cHdffCmdIf::CmdOsdCreatePalette(HdffColorType_t ColorType, HdffColorFormat_t ColorFormat,
                                          uint32_t NumColors, const uint32_t * pColors)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    uint32_t i;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreatePalette);
-    cmdBuf.SetBits(8, ColorType);
-    cmdBuf.SetBits(8, ColorFormat);
-    if (NumColors > 256)
-        NumColors = 256;
-    cmdBuf.SetBits(8, NumColors == 256 ? 0 : NumColors);
-    for (i = 0; i < NumColors; i++)
-    {
-        cmdBuf.SetBits(32, pColors[i]);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
-    }
-    return InvalidHandle;
+    uint32_t newPalette;
+    int err;
+
+    err = HdffCmdOsdCreatePalette(mOsdDev, ColorType, ColorFormat, NumColors,
+                                  pColors, &newPalette);
+    if (err == 0)
+        return newPalette;
+    return HDFF_INVALID_HANDLE;
 }
 
 void cHdffCmdIf::CmdOsdDeletePalette(uint32_t hPalette)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeletePalette);
-    cmdBuf.SetBits(32, hPalette);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDeletePalette(mOsdDev, hPalette);
 }
 
 void cHdffCmdIf::CmdOsdSetDisplayPalette(uint32_t hDisplay, uint32_t hPalette)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetDisplayPalette);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(32, hPalette);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdSetDisplayPalette(mOsdDev, hDisplay, hPalette);
 }
 
-void cHdffCmdIf::CmdOsdSetPaletteColors(uint32_t hPalette, eColorFormat ColorFormat,
+void cHdffCmdIf::CmdOsdSetPaletteColors(uint32_t hPalette, HdffColorFormat_t ColorFormat,
                                         uint8_t StartColor, uint32_t NumColors, const uint32_t * pColors)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    uint32_t i;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSetPaletteColors);
-    cmdBuf.SetBits(32, hPalette);
-    cmdBuf.SetBits(8, ColorFormat);
-    cmdBuf.SetBits(8, StartColor);
-    if (NumColors > 256)
-        NumColors = 256;
-    cmdBuf.SetBits(8, NumColors == 256 ? 0 : NumColors);
-    for (i = 0; i < NumColors; i++)
-    {
-        cmdBuf.SetBits(32, pColors[i]);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdSetPaletteColors(mOsdDev, hPalette, ColorFormat, StartColor,
+                               NumColors, pColors);
 }
 
 uint32_t cHdffCmdIf::CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t DataSize)
 {
     //printf("CreateFontFace %d\n", DataSize);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    osd_raw_data_t osd_data;
-
-    memset(&osd_data, 0, sizeof(osd_raw_data_t));
-    osd_data.data_buffer = pFontData;
-    osd_data.data_length = DataSize;
-    ioctl(mOsdDev, OSD_RAW_DATA, &osd_data);
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreateFontFace);
-    cmdBuf.SetBits(16, osd_data.data_handle);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
-    }
-    return InvalidHandle;
+    uint32_t newFontFace;
+    int err;
+
+    err = HdffCmdOsdCreateFontFace(mOsdDev, pFontData, DataSize, &newFontFace);
+    if (err == 0)
+        return newFontFace;
+    return HDFF_INVALID_HANDLE;
 }
 
 void cHdffCmdIf::CmdOsdDeleteFontFace(uint32_t hFontFace)
 {
     //printf("DeleteFontFace %08X\n", hFontFace);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeleteFontFace);
-    cmdBuf.SetBits(32, hFontFace);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDeleteFontFace(mOsdDev, hFontFace);
 }
 
 uint32_t cHdffCmdIf::CmdOsdCreateFont(uint32_t hFontFace, uint32_t Size)
 {
     //printf("CreateFont %d\n", Size);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    cBitBuffer resBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    osd_cmd.result_data = resBuf.GetData();
-    osd_cmd.result_len = resBuf.GetMaxLength();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdCreateFont);
-    cmdBuf.SetBits(32, hFontFace);
-    cmdBuf.SetBits(32, Size);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
-    if (osd_cmd.result_len > 0)
-    {
-        uint8_t * result = resBuf.GetData();
-        return (result[6] << 24) | (result[7] << 16) | (result[8] << 8) | result[9];
-    }
-    return InvalidHandle;
+    uint32_t newFont;
+    int err;
+
+    err = HdffCmdOsdCreateFont(mOsdDev, hFontFace, Size, &newFont);
+    if (err == 0)
+        return newFont;
+    return HDFF_INVALID_HANDLE;
 }
 
 void cHdffCmdIf::CmdOsdDeleteFont(uint32_t hFont)
 {
     //printf("DeleteFont %08X\n", hFont);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDeleteFont);
-    cmdBuf.SetBits(32, hFont);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDeleteFont(mOsdDev, hFont);
 }
 
 void cHdffCmdIf::CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color)
 {
     //printf("Rect (%d,%d) %d x %d, %08X\n", X, Y, Width, Height, Color);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawRectangle);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(16, Width);
-    cmdBuf.SetBits(16, Height);
-    cmdBuf.SetBits(32, Color);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDrawRectangle(mOsdDev, hDisplay, X, Y, Width, Height, Color);
 }
 
 void cHdffCmdIf::CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
                                  uint32_t Color, uint32_t Flags)
 {
     //printf("Ellipse (%d,%d) %d x %d, %08X, %d\n", CX, CY, RadiusX, RadiusY, Color, Flags);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawEllipse);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(16, CX);
-    cmdBuf.SetBits(16, CY);
-    cmdBuf.SetBits(16, RadiusX);
-    cmdBuf.SetBits(16, RadiusY);
-    cmdBuf.SetBits(32, Color);
-    cmdBuf.SetBits(32, Flags);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDrawEllipse(mOsdDev, hDisplay, CX, CY, RadiusX, RadiusY, Color, Flags);
 }
 
 void cHdffCmdIf::CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
 {
     //printf("Text %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    int i;
-    int length;
-
-    length = 0;
-    while (pText[length])
-    {
-        length++;
-    }
-    if (length > 980)
-        length = 980;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawText);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(32, hFont);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(32, Color);
-    cmdBuf.SetBits(16, length);
-    for (i = 0; i < length; i++)
-    {
-        cmdBuf.SetBits(8, pText[i]);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDrawText(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
 }
 
 void cHdffCmdIf::CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color)
 {
     //printf("TextW %08X (%d,%d), %08X\n", hFont, X, Y, Color);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    int i;
-    int length;
-
-    length = 0;
-    while (pText[length])
-    {
-        length++;
-    }
-    if (length > 480)
-        length = 480;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawTextW);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(32, hFont);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(32, Color);
-    cmdBuf.SetBits(16, length);
-    for (i = 0; i < length; i++)
-    {
-        cmdBuf.SetBits(16, pText[i]);
-    }
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDrawWideText(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
 }
 
 void cHdffCmdIf::CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
                                   int BmpWidth, int BmpHeight, int BmpSize,
-                                  eColorType ColorType, uint32_t hPalette)
+                                  HdffColorType_t ColorType, uint32_t hPalette)
 {
     //printf("Bitmap (%d,%d) %d x %d\n", X, Y, BmpWidth, BmpHeight);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-    osd_raw_data_t osd_data;
-
-    memset(&osd_data, 0, sizeof(osd_raw_data_t));
-    osd_data.data_buffer = pBitmap;
-    osd_data.data_length = BmpSize;
-    ioctl(mOsdDev, OSD_RAW_DATA, &osd_data);
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdDrawBitmap);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(16, BmpWidth);
-    cmdBuf.SetBits(16, BmpHeight);
-    cmdBuf.SetBits(8, ColorType);
-    cmdBuf.SetBits(6, 0); // reserved
-    cmdBuf.SetBits(2, 0); // uncompressed
-    cmdBuf.SetBits(32, hPalette);
-    cmdBuf.SetBits(16, osd_data.data_handle);
-    cmdBuf.SetBits(32, 0);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdDrawBitmap(mOsdDev, hDisplay, X, Y, pBitmap, BmpWidth, BmpHeight,
+                         BmpSize, ColorType, hPalette);
 }
 
 void cHdffCmdIf::CmdOsdSaveRegion(uint32_t hDisplay, int X, int Y, int Width, int Height)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdSaveRegion);
-    cmdBuf.SetBits(32, hDisplay);
-    cmdBuf.SetBits(16, X);
-    cmdBuf.SetBits(16, Y);
-    cmdBuf.SetBits(16, Width);
-    cmdBuf.SetBits(16, Height);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdSaveRegion(mOsdDev, hDisplay, X, Y, Width, Height);
 }
 
 void cHdffCmdIf::CmdOsdRestoreRegion(uint32_t hDisplay)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupOsd, msgOsdRestoreRegion);
-    cmdBuf.SetBits(32, hDisplay);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdOsdRestoreRegion(mOsdDev, hDisplay);
 }
 
-void cHdffCmdIf::CmdMuxSetVideoOut(eVideoOut VideoOut)
+void cHdffCmdIf::CmdMuxSetVideoOut(HdffVideoOut_t VideoOut)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvMux, msgMuxSetVideoOut);
-    cmdBuf.SetBits(4, VideoOut);
-    cmdBuf.SetBits(4, 0); // reserved
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdMuxSetVideoOut(mOsdDev, VideoOut);
 }
 
 void cHdffCmdIf::CmdMuxSetVolume(uint8_t Volume)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvMux, msgMuxSetVolume);
-    cmdBuf.SetBits(8, Volume);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdMuxSetVolume(mOsdDev, Volume);
 }
 
 void cHdffCmdIf::CmdMuxMuteAudio(bool Mute)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupAvMux, msgMuxSetAudioMute);
-    cmdBuf.SetBits(1, Mute);
-    cmdBuf.SetBits(7, 0); // reserved
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdMuxMuteAudio(mOsdDev, Mute);
 }
 
-void cHdffCmdIf::CmdHdmiSetVideoMode(eHdmiVideoMode VideoMode)
+void cHdffCmdIf::CmdHdmiSetVideoMode(HdffVideoMode_t VideoMode)
 {
     //printf("HdmiSetVideoMode %d\n", VideoMode);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupHdmi, msgHdmiSetVideoMode);
-    cmdBuf.SetBits(8, VideoMode);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdHdmiSetVideoMode(mOsdDev, VideoMode);
 }
 
-void cHdffCmdIf::CmdHdmiConfigure(const tHdmiConfig * pConfig)
+void cHdffCmdIf::CmdHdmiConfigure(const HdffHdmiConfig_t * pConfig)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupHdmi, msgHdmiConfigure);
-    if (pConfig->TransmitAudio)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    if (pConfig->ForceDviMode)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    if (pConfig->CecEnabled)
-    {
-        cmdBuf.SetBits(1, 1);
-    }
-    else
-    {
-        cmdBuf.SetBits(1, 0);
-    }
-    cmdBuf.SetBits(3, (uint32_t) pConfig->VideoModeAdaption);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdHdmiConfigure(mOsdDev, pConfig);
 }
 
-void cHdffCmdIf::CmdHdmiSendCecCommand(eCecCommand Command)
+void cHdffCmdIf::CmdHdmiSendCecCommand(HdffCecCommand_t Command)
 {
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupHdmi, msgHdmiSendCecCommand);
-    cmdBuf.SetBits(8, Command);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdHdmiSendCecCommand(mOsdDev, Command);
 }
 
-void cHdffCmdIf::CmdRemoteSetProtocol(eRemoteProtocol Protocol)
+void cHdffCmdIf::CmdRemoteSetProtocol(HdffRemoteProtocol_t Protocol)
 {
     //printf("%s %d\n", __func__, Protocol);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupRemoteControl, msgRemoteSetProtocol);
-    cmdBuf.SetBits(8, Protocol);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdRemoteSetProtocol(mOsdDev, Protocol);
 }
 
 void cHdffCmdIf::CmdRemoteSetAddressFilter(bool Enable, uint32_t Address)
 {
     //printf("%s %d %d\n", __func__, Enable, Address);
-    cBitBuffer cmdBuf(MAX_CMD_LEN);
-    osd_raw_cmd_t osd_cmd;
-
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdBuf.GetData();
-    CmdBuildHeader(cmdBuf, msgTypeCommand, msgGroupRemoteControl, msgRemoteSetAddressFilter);
-    cmdBuf.SetBits(1, Enable);
-    cmdBuf.SetBits(7, 0); // reserved
-    cmdBuf.SetBits(32, Address);
-    osd_cmd.cmd_len = CmdSetLength(cmdBuf);
-    ioctl(mOsdDev, OSD_RAW_CMD, &osd_cmd);
+    HdffCmdRemoteSetAddressFilter(mOsdDev, Enable, Address);
 }
 
 } // end of namespace
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
index cd641eb55..142f65fb8 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.h
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.h
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.h 1.17 2011/04/17 11:20:22 kls Exp $
+ * $Id: hdffcmd.h 1.18 2011/12/04 15:31:23 kls Exp $
  */
 
 #ifndef _HDFF_CMD_H_
 #define _HDFF_CMD_H_
 
 #include "bitbuffer.h"
-#include "hdffmsgdef.h"
+#include "libhdffcmd/hdffcmd.h"
 
 namespace HDFF
 {
@@ -20,9 +20,6 @@ class cHdffCmdIf
 private:
     int mOsdDev;
 
-    void CmdBuildHeader(cBitBuffer & MsgBuf, eMessageType MsgType, eMessageGroup MsgGroup, eMessageId MsgId);
-    uint32_t CmdSetLength(cBitBuffer & MsgBuf);
-
 public:
     cHdffCmdIf(int OsdDev);
     ~cHdffCmdIf(void);
@@ -32,16 +29,16 @@ class cHdffCmdIf
     uint32_t CmdGetCopyrights(uint8_t Index, char * pString, uint32_t MaxLength);
 
     void CmdAvSetPlayMode(uint8_t PlayMode, bool Realtime);
-    void CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, eVideoStreamType StreamType, bool PlaybackMode = false);
-    void CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, eAudioStreamType StreamType, eAVContainerType ContainerType = avContainerPes);
+    void CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, HdffVideoStreamType_t StreamType, bool PlaybackMode = false);
+    void CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, HdffAudioStreamType_t StreamType, HdffAvContainerType_t ContainerType = HDFF_AV_CONTAINER_PES);
     void CmdAvSetPcrPid(uint8_t DecoderIndex, uint16_t PcrPid);
     void CmdAvSetTeletextPid(uint8_t DecoderIndex, uint16_t TeletextPid);
     void CmdAvSetVideoWindow(uint8_t DecoderIndex, bool Enable, uint16_t X, uint16_t Y, uint16_t Width, uint16_t Height);
-    void CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, eVideoStreamType StreamType);
+    void CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, HdffVideoStreamType_t StreamType);
     void CmdAvSetDecoderInput(uint8_t DecoderIndex, uint8_t DemultiplexerIndex);
     void CmdAvSetDemultiplexerInput(uint8_t DemultiplexerIndex, uint8_t TsInputIndex);
-    void CmdAvSetVideoFormat(uint8_t DecoderIndex, const tVideoFormat * pVideoFormat);
-    void CmdAvSetVideoOutputMode(uint8_t DecoderIndex, eVideoOutputMode OutputMode);
+    void CmdAvSetVideoFormat(uint8_t DecoderIndex, const HdffVideoFormat_t * pVideoFormat);
+    void CmdAvSetVideoOutputMode(uint8_t DecoderIndex, HdffVideoOutputMode_t OutputMode);
     void CmdAvSetStc(uint8_t DecoderIndex, uint64_t Stc);
     void CmdAvFlushBuffer(uint8_t DecoderIndex, bool FlushAudio, bool FlushVideo);
     void CmdAvEnableSync(uint8_t DecoderIndex, bool EnableSync);
@@ -49,24 +46,24 @@ class cHdffCmdIf
     void CmdAvSetAudioSpeed(uint8_t DecoderIndex, int32_t Speed);
     void CmdAvEnableVideoAfterStop(uint8_t DecoderIndex, bool EnableVideoAfterStop);
     void CmdAvSetAudioDelay(int16_t Delay);
-    void CmdAvSetAudioDownmix(eDownmixMode DownmixMode);
+    void CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode);
     void CmdAvSetAudioChannel(uint8_t AudioChannel);
 
-    void CmdOsdConfigure(const tOsdConfig * pConfig);
+    void CmdOsdConfigure(const HdffOsdConfig_t * pConfig);
     void CmdOsdReset(void);
 
-    uint32_t CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, eColorType ColorType);
+    uint32_t CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, HdffColorType_t ColorType);
     void CmdOsdDeleteDisplay(uint32_t hDisplay);
     void CmdOsdEnableDisplay(uint32_t hDisplay, bool Enable);
     void CmdOsdSetDisplayOutputRectangle(uint32_t hDisplay, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height);
     void CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height);
     void CmdOsdRenderDisplay(uint32_t hDisplay);
 
-    uint32_t CmdOsdCreatePalette(eColorType ColorType, eColorFormat ColorFormat,
+    uint32_t CmdOsdCreatePalette(HdffColorType_t ColorType, HdffColorFormat_t ColorFormat,
                                  uint32_t NumColors, const uint32_t * pColors);
     void CmdOsdDeletePalette(uint32_t hPalette);
     void CmdOsdSetDisplayPalette(uint32_t hDisplay, uint32_t hPalette);
-    void CmdOsdSetPaletteColors(uint32_t hPalette, eColorFormat ColorFormat,
+    void CmdOsdSetPaletteColors(uint32_t hPalette, HdffColorFormat_t ColorFormat,
                                 uint8_t StartColor, uint32_t NumColors, const uint32_t * pColors);
 
     uint32_t CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t DataSize);
@@ -81,19 +78,19 @@ class cHdffCmdIf
     void CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color);
     void CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
                           int BmpWidth, int BmpHeight, int BmpSize,
-                          eColorType ColorType, uint32_t hPalette);
+                          HdffColorType_t ColorType, uint32_t hPalette);
     void CmdOsdSaveRegion(uint32_t hDisplay, int X, int Y, int Width, int Height);
     void CmdOsdRestoreRegion(uint32_t hDisplay);
 
-    void CmdMuxSetVideoOut(eVideoOut VideoOut);
+    void CmdMuxSetVideoOut(HdffVideoOut_t VideoOut);
     void CmdMuxSetVolume(uint8_t Volume);
     void CmdMuxMuteAudio(bool Mute);
 
-    void CmdHdmiSetVideoMode(eHdmiVideoMode VideoMode);
-    void CmdHdmiConfigure(const tHdmiConfig * pConfig);
-    void CmdHdmiSendCecCommand(eCecCommand Command);
+    void CmdHdmiSetVideoMode(HdffVideoMode_t VideoMode);
+    void CmdHdmiConfigure(const HdffHdmiConfig_t * pConfig);
+    void CmdHdmiSendCecCommand(HdffCecCommand_t Command);
 
-    void CmdRemoteSetProtocol(eRemoteProtocol Protocol);
+    void CmdRemoteSetProtocol(HdffRemoteProtocol_t Protocol);
     void CmdRemoteSetAddressFilter(bool Enable, uint32_t Address);
 };
 
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 90d689722..a492275b3 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffosd.c 1.10 2011/05/15 14:47:29 kls Exp $
+ * $Id: hdffosd.c 1.12 2011/12/04 15:31:41 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -71,7 +71,7 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
 :   cOsd(Left, Top, Level)
 {
     double pixelAspect;
-    HDFF::tOsdConfig config;
+    HdffOsdConfig_t config;
 
     //printf("cHdffOsd %d, %d, %d\n", Left, Top, Level);
     mHdffCmdIf = pHdffCmdIf;
@@ -80,24 +80,24 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
     shown = false;
     mChanged = false;
     mBitmapModified = false;
-    mBitmapPalette = InvalidHandle;
+    mBitmapPalette = HDFF_INVALID_HANDLE;
     config.FontKerning = false;
     config.FontAntialiasing = Setup.AntiAlias ? true : false;
     mHdffCmdIf->CmdOsdConfigure(&config);
 
     gHdffSetup.GetOsdSize(mDispWidth, mDispHeight, pixelAspect);
-    mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF::colorTypeARGB8888);
-    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, SizeFullScreen, SizeFullScreen);
+    mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF_COLOR_TYPE_ARGB8888);
+    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, HDFF_SIZE_FULL_SCREEN, HDFF_SIZE_FULL_SCREEN);
     for (int i = 0; i < MAX_NUM_FONTFACES; i++)
     {
         mFontFaces[i].Name = "";
-        mFontFaces[i].Handle = InvalidHandle;
+        mFontFaces[i].Handle = HDFF_INVALID_HANDLE;
     }
     for (int i = 0; i < MAX_NUM_FONTS; i++)
     {
-        mFonts[i].hFontFace = InvalidHandle;
+        mFonts[i].hFontFace = HDFF_INVALID_HANDLE;
         mFonts[i].Size = 0;
-        mFonts[i].Handle = InvalidHandle;
+        mFonts[i].Handle = HDFF_INVALID_HANDLE;
     }
 }
 
@@ -108,18 +108,18 @@ cHdffOsd::~cHdffOsd()
 
     for (int i = 0; i < MAX_NUM_FONTS; i++)
     {
-        if (mFonts[i].Handle == InvalidHandle)
+        if (mFonts[i].Handle == HDFF_INVALID_HANDLE)
             break;
         mHdffCmdIf->CmdOsdDeleteFont(mFonts[i].Handle);
     }
     for (int i = 0; i < MAX_NUM_FONTFACES; i++)
     {
-        if (mFontFaces[i].Handle == InvalidHandle)
+        if (mFontFaces[i].Handle == HDFF_INVALID_HANDLE)
             break;
         mHdffCmdIf->CmdOsdDeleteFontFace(mFontFaces[i].Handle);
     }
 
-    if (mBitmapPalette != InvalidHandle)
+    if (mBitmapPalette != HDFF_INVALID_HANDLE)
         mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
     mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
     mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
@@ -220,19 +220,19 @@ void cHdffOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, t
                 mBitmapColors[i] = ColorFg;
         }
     }
-    if (mBitmapPalette == InvalidHandle)
+    if (mBitmapPalette == HDFF_INVALID_HANDLE)
     {
-        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF::colorTypeClut8,
-                HDFF::colorFormatARGB, numColors, mBitmapColors);
+        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF_COLOR_TYPE_CLUT8,
+                HDFF_COLOR_FORMAT_ARGB, numColors, mBitmapColors);
     }
     else
     {
         mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
-                HDFF::colorFormatARGB, 0, numColors, mBitmapColors);
+                HDFF_COLOR_FORMAT_ARGB, 0, numColors, mBitmapColors);
     }
     mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y,
         (uint8_t *) Bitmap.Data(0, 0), Bitmap.Width(), Bitmap.Height(),
-        Bitmap.Width() * Bitmap.Height(), HDFF::colorTypeClut8, mBitmapPalette);
+        Bitmap.Width() * Bitmap.Height(), HDFF_COLOR_TYPE_CLUT8, mBitmapPalette);
 #if 0
     uint32_t * tmpBitmap = new uint32_t[Bitmap.Width() * Bitmap.Height()];
     for (int ix = 0; ix < Bitmap.Width(); ix++)
@@ -284,7 +284,7 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
     pFontFace = NULL;
     for (i = 0; i < MAX_NUM_FONTFACES; i++)
     {
-        if (mFontFaces[i].Handle == InvalidHandle)
+        if (mFontFaces[i].Handle == HDFF_INVALID_HANDLE)
             break;
 
         if (strcmp(mFontFaces[i].Name, Font->FontName()) == 0)
@@ -312,7 +312,7 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
                         if (fread(buffer, fileSize, 1, fp) == 1)
                         {
                             mFontFaces[i].Handle = mHdffCmdIf->CmdOsdCreateFontFace(buffer, fileSize);
-                            if (mFontFaces[i].Handle != InvalidHandle)
+                            if (mFontFaces[i].Handle != HDFF_INVALID_HANDLE)
                             {
                                 mFontFaces[i].Name = Font->FontName();
                                 pFontFace = &mFontFaces[i];
@@ -331,7 +331,7 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
     pFont = NULL;
     for (i = 0; i < MAX_NUM_FONTS; i++)
     {
-        if (mFonts[i].Handle == InvalidHandle)
+        if (mFonts[i].Handle == HDFF_INVALID_HANDLE)
             break;
 
         if (mFonts[i].hFontFace == pFontFace->Handle
@@ -346,7 +346,7 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
         if (i < MAX_NUM_FONTS)
         {
             mFonts[i].Handle = mHdffCmdIf->CmdOsdCreateFont(pFontFace->Handle, size);
-            if (mFonts[i].Handle != InvalidHandle)
+            if (mFonts[i].Handle != HDFF_INVALID_HANDLE)
             {
                 mFonts[i].hFontFace = pFontFace->Handle;
                 mFonts[i].Size = size;
@@ -435,9 +435,9 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
     {
         case 1:
             if (Quadrants > 0)
-                flags = HDFF::drawQuarterTopRight;
+                flags = HDFF_DRAW_QUARTER_TOP_RIGHT;
             else
-                flags = HDFF::drawQuarterTopRightInverted;
+                flags = HDFF_DRAW_QUARTER_TOP_RIGHT_INVERTED;
             cx = x1;
             cy = y2;
             rx = x2 - x1;
@@ -445,9 +445,9 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
             break;
         case 2:
             if (Quadrants > 0)
-                flags = HDFF::drawQuarterTopLeft;
+                flags = HDFF_DRAW_QUARTER_TOP_LEFT;
             else
-                flags = HDFF::drawQuarterTopLeftInverted;
+                flags = HDFF_DRAW_QUARTER_TOP_LEFT_INVERTED;
             cx = x2;
             cy = y2;
             rx = x2 - x1;
@@ -455,9 +455,9 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
             break;
         case 3:
             if (Quadrants > 0)
-                flags = HDFF::drawQuarterBottomLeft;
+                flags = HDFF_DRAW_QUARTER_BOTTOM_LEFT;
             else
-                flags = HDFF::drawQuarterBottomLeftInverted;
+                flags = HDFF_DRAW_QUARTER_BOTTOM_LEFT_INVERTED;
             cx = x2;
             cy = y1;
             rx = x2 - x1;
@@ -465,44 +465,44 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
             break;
         case 4:
             if (Quadrants > 0)
-                flags = HDFF::drawQuarterBottomRight;
+                flags = HDFF_DRAW_QUARTER_BOTTOM_RIGHT;
             else
-                flags = HDFF::drawQuarterBottomRightInverted;
+                flags = HDFF_DRAW_QUARTER_BOTTOM_RIGHT_INVERTED;
             cx = x1;
             cy = y1;
             rx = x2 - x1;
             ry = y2 - y1;
             break;
         case 5:
-            flags = HDFF::drawHalfRight;
+            flags = HDFF_DRAW_HALF_RIGHT;
             cx = x1;
             cy = (y1 + y2) / 2;
             rx = x2 - x1;
             ry = (y2 - y1) / 2;
             break;
         case 6:
-            flags = HDFF::drawHalfTop;
+            flags = HDFF_DRAW_HALF_TOP;
             cx = (x1 + x2) / 2;
             cy = y2;
             rx = (x2 - x1) / 2;
             ry = y2 - y1;
             break;
         case 7:
-            flags = HDFF::drawHalfLeft;
+            flags = HDFF_DRAW_HALF_LEFT;
             cx = x2;
             cy = (y1 + y2) / 2;
             rx = x2 - x1;
             ry = (y2 - y1) / 2;
             break;
         case 8:
-            flags = HDFF::drawHalfBottom;
+            flags = HDFF_DRAW_HALF_BOTTOM;
             cx = (x1 + x2) / 2;
             cy = y1;
             rx = (x2 - x1) / 2;
             ry = y2 - y1;
             break;
         default:
-            flags = HDFF::drawFull;
+            flags = HDFF_DRAW_FULL;
             cx = (x1 + x2) / 2;
             cy = (y1 + y2) / 2;
             rx = (x2 - x1) / 2;
@@ -552,7 +552,7 @@ class cHdffOsdRaw : public cOsd
     HDFF::cHdffCmdIf * mHdffCmdIf;
     int mDispWidth;
     int mDispHeight;
-    bool shown;
+    bool refresh;
     uint32_t mDisplay;
     uint32_t mBitmapPalette;
     uint32_t mBitmapColors[256];
@@ -575,24 +575,27 @@ cHdffOsdRaw::cHdffOsdRaw(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint
 
     //printf("cHdffOsdRaw %d, %d, %d\n", Left, Top, Level);
     mHdffCmdIf = pHdffCmdIf;
-    shown = false;
-    mBitmapPalette = InvalidHandle;
+    refresh = true;
+    mBitmapPalette = HDFF_INVALID_HANDLE;
+    mDisplay = HDFF_INVALID_HANDLE;
 
     gHdffSetup.GetOsdSize(mDispWidth, mDispHeight, pixelAspect);
-    mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF::colorTypeARGB8888);
-    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, SizeFullScreen, SizeFullScreen);
 }
 
 cHdffOsdRaw::~cHdffOsdRaw()
 {
     //printf("~cHdffOsdRaw %d %d\n", Left(), Top());
-    SetActive(false);
-
-    if (mBitmapPalette != InvalidHandle)
+    if (mDisplay != HDFF_INVALID_HANDLE)
+    {
+        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    }
+    if (mBitmapPalette != HDFF_INVALID_HANDLE)
         mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
-    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-    mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
+    mBitmapPalette = HDFF_INVALID_HANDLE;
+    if (mDisplay != HDFF_INVALID_HANDLE)
+       mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
+    mDisplay = HDFF_INVALID_HANDLE;
 }
 
 void cHdffOsdRaw::SetActive(bool On)
@@ -602,14 +605,29 @@ void cHdffOsdRaw::SetActive(bool On)
         cOsd::SetActive(On);
         if (On)
         {
+            if (mDisplay == HDFF_INVALID_HANDLE)
+            {
+                mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF_COLOR_TYPE_ARGB8888);
+                if (mDisplay != HDFF_INVALID_HANDLE)
+                    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, HDFF_SIZE_FULL_SCREEN, HDFF_SIZE_FULL_SCREEN);
+            }
+            refresh = true;
             if (GetBitmap(0)) // only flush here if there are already bitmaps
                 Flush();
         }
-        else if (shown)
+        else
         {
-            mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-            mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-            shown = false;
+            if (mDisplay != HDFF_INVALID_HANDLE)
+            {
+                mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+                mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+            }
+            if (mBitmapPalette != HDFF_INVALID_HANDLE)
+                mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
+            mBitmapPalette = HDFF_INVALID_HANDLE;
+            if (mDisplay != HDFF_INVALID_HANDLE)
+                mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
+            mDisplay = HDFF_INVALID_HANDLE;
         }
     }
 }
@@ -635,18 +653,18 @@ eOsdError cHdffOsdRaw::SetAreas(const tArea *Areas, int NumAreas)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
     }
-    if (shown)
+    if (mDisplay != HDFF_INVALID_HANDLE)
     {
         mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
         mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-        shown = false;
+        refresh = true;
     }
     return cOsd::SetAreas(Areas, NumAreas);
 }
 
 void cHdffOsdRaw::Flush(void)
 {
-    if (!Active())
+    if (!Active() || (mDisplay == HDFF_INVALID_HANDLE))
         return;
     //struct timeval start;
     //struct timeval end;
@@ -673,7 +691,7 @@ void cHdffOsdRaw::Flush(void)
                  mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
                      Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
                      pm->Data() + y * d, w, hc, hc * d,
-                     HDFF::colorTypeARGB8888, InvalidHandle);
+                     HDFF_COLOR_TYPE_ARGB8888, HDFF_INVALID_HANDLE);
             }
             delete pm;
             render = true;
@@ -688,9 +706,9 @@ void cHdffOsdRaw::Flush(void)
         for (int i = 0; (bitmap = GetBitmap(i)) != NULL; i++)
         {
             int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-            if (!shown || bitmap->Dirty(x1, y1, x2, y2))
+            if (refresh || bitmap->Dirty(x1, y1, x2, y2))
             {
-                if (!shown)
+                if (refresh)
                 {
                     x2 = bitmap->Width() - 1;
                     y2 = bitmap->Height() - 1;
@@ -702,15 +720,15 @@ void cHdffOsdRaw::Flush(void)
                 {
                     for (int c = 0; c < numColors; c++)
                         mBitmapColors[c] = colors[c];
-                    if (mBitmapPalette == InvalidHandle)
+                    if (mBitmapPalette == HDFF_INVALID_HANDLE)
                     {
-                        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF::colorTypeClut8,
-                            HDFF::colorFormatARGB, numColors, mBitmapColors);
+                        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF_COLOR_TYPE_CLUT8,
+                            HDFF_COLOR_FORMAT_ARGB, numColors, mBitmapColors);
                     }
                     else
                     {
                         mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
-                            HDFF::colorFormatARGB, 0, numColors, mBitmapColors);
+                            HDFF_COLOR_FORMAT_ARGB, 0, numColors, mBitmapColors);
                     }
                 }
                 // commit modified data:
@@ -729,7 +747,7 @@ void cHdffOsdRaw::Flush(void)
                     mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
                         Left() + bitmap->X0() + x1, Top() + bitmap->Y0() + y1 + y,
                         buffer, width, hc, hc * width,
-                        HDFF::colorTypeClut8, mBitmapPalette);
+                        HDFF_COLOR_TYPE_CLUT8, mBitmapPalette);
                 }
                 render = true;
             }
@@ -745,7 +763,7 @@ void cHdffOsdRaw::Flush(void)
         //timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
         //printf("time = %d\n", timeNeeded);
     }
-    shown = true;
+    refresh = false;
 }
 
 
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
new file mode 100644
index 000000000..f9c068a1c
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
@@ -0,0 +1,75 @@
+#
+# Makefile for the HDFF firmware command interface library
+#
+
+VERSION = 0.1.0
+
+ifndef $(INSTALL_PATH)
+    INSTALL_PATH=/usr/local
+endif
+
+ifndef $(INSTALL_LIB_PATH)
+    INSTALL_LIB_PATH=$(INSTALL_PATH)/lib
+endif
+
+ifndef $(INSTALL_INCLUDE_PATH)
+    INSTALL_INCLUDE_PATH=$(INSTALL_PATH)/include
+endif
+
+LIB_NAME = libhdffcmd
+
+LIB_OBJS = bitbuffer.o hdffcmd_av.o hdffcmd_base.o hdffcmd_generic.o \
+           hdffcmd_hdmi.o hdffcmd_mux.o hdffcmd_osd.o hdffcmd_remote.o
+
+LIB_HEADERS = hdffcmd.h hdffcmd_av.h hdffcmd_generic.h hdffcmd_hdmi.h \
+              hdffcmd_mux.h hdffcmd_osd.h hdffcmd_remote.h
+
+LIB_STATIC = $(LIB_NAME).a
+LIB_SHARED = $(LIB_NAME)-$(VERSION).so
+
+CC     = gcc
+CFLAGS = -g -O2 -fPIC -Wall
+AR     = ar -r
+
+### Implicit rules:
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = $(CC) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: $(LIB_STATIC) $(LIB_SHARED)
+
+$(LIB_STATIC): $(LIB_OBJS)
+	$(AR) $(LIB_STATIC) $(LIB_OBJS)
+
+$(LIB_SHARED): $(LIB_OBJS)
+	$(CC) -fPIC -shared -o $(LIB_SHARED) $(LIB_OBJS)
+	ln -sf $(LIB_SHARED) $(LIB_NAME).so
+
+clean:
+	rm -f $(LIB_OBJS) $(DEPFILE) $(LIB_STATIC) $(LIB_NAME)*.so
+
+install: $(LIB_SHARED)
+	chown root $(LIB_SHARED)
+	chgrp root $(LIB_SHARED)
+	chmod 0755 $(LIB_SHARED)
+	cp -f $(LIB_SHARED) $(INSTALL_LIB_PATH)/
+	ln -sf $(LIB_SHARED) $(INSTALL_LIB_PATH)/$(LIB_NAME).so
+	mkdir -p  $(INSTALL_INCLUDE_PATH)/libhdffcmd
+	list='$(LIB_HEADERS)'; \
+	for headerfile in $$list; do \
+	  cp -f $$headerfile $(INSTALL_INCLUDE_PATH)/libhdffcmd/ ; \
+	  chown root $(INSTALL_INCLUDE_PATH)/libhdffcmd/$$headerfile ; \
+	  chgrp root $(INSTALL_INCLUDE_PATH)/libhdffcmd/$$headerfile ; \
+	  chmod 0644 $(INSTALL_INCLUDE_PATH)/libhdffcmd/$$headerfile ; \
+	done
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c b/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c
new file mode 100644
index 000000000..b85990d6b
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c
@@ -0,0 +1,79 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <string.h>
+
+#include "bitbuffer.h"
+
+void BitBuffer_Init(BitBuffer_t * BitBuffer,
+                    uint8_t * Data, uint32_t MaxLength)
+{
+    memset(Data, 0, MaxLength);
+    BitBuffer->Data = Data;
+    BitBuffer->MaxLength = MaxLength * 8;
+    BitBuffer->BitPos = 0;
+}
+
+void BitBuffer_SetBits(BitBuffer_t * BitBuffer, int NumBits, uint32_t Data)
+{
+    uint32_t nextBitPos;
+    uint32_t bytePos;
+    uint32_t bitsInByte;
+    int shift;
+
+    if (NumBits <= 0 || NumBits > 32)
+        return;
+
+    nextBitPos = BitBuffer->BitPos + NumBits;
+
+    if (nextBitPos > BitBuffer->MaxLength)
+        return;
+
+    bytePos = BitBuffer->BitPos / 8;
+    bitsInByte = BitBuffer->BitPos % 8;
+
+    BitBuffer->Data[bytePos] &= (uint8_t) (0xFF << (8 - bitsInByte));
+    shift = NumBits - (8 - bitsInByte);
+    if (shift > 0)
+        BitBuffer->Data[bytePos] |= (uint8_t) (Data >> shift);
+    else
+        BitBuffer->Data[bytePos] |= (uint8_t) (Data << (-shift));
+    NumBits -= 8 - bitsInByte;
+    bytePos++;
+    while (NumBits > 0)
+    {
+        shift = NumBits - 8;
+        if (shift > 0)
+            BitBuffer->Data[bytePos] = (uint8_t) (Data >> shift);
+        else
+            BitBuffer->Data[bytePos] = (uint8_t) (Data << (-shift));
+        NumBits -= 8;
+        bytePos++;
+    }
+    BitBuffer->BitPos = nextBitPos;
+}
+
+uint32_t BitBuffer_GetByteLength(BitBuffer_t * BitBuffer)
+{
+    return (BitBuffer->BitPos + 7) / 8;
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h b/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h
new file mode 100644
index 000000000..5bdc23b2b
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h
@@ -0,0 +1,43 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef BITBUFFER_H
+#define BITBUFFER_H
+
+#include <stdint.h>
+
+typedef struct BitBuffer_t
+{
+    uint8_t * Data;
+    uint32_t MaxLength;
+    uint32_t BitPos;
+} BitBuffer_t;
+
+void BitBuffer_Init(BitBuffer_t * BitBuffer,
+                    uint8_t * Data, uint32_t MaxLength);
+
+void BitBuffer_SetBits(BitBuffer_t * BitBuffer, int NumBits, uint32_t Data);
+
+uint32_t BitBuffer_GetByteLength(BitBuffer_t * BitBuffer);
+
+#endif /* BITBUFFER_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h
new file mode 100644
index 000000000..8d0578243
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h
@@ -0,0 +1,42 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_H
+#define HDFFCMD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "hdffcmd_av.h"
+#include "hdffcmd_generic.h"
+#include "hdffcmd_hdmi.h"
+#include "hdffcmd_mux.h"
+#include "hdffcmd_osd.h"
+#include "hdffcmd_remote.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HDFFCMD_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
new file mode 100644
index 000000000..413f3e221
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
@@ -0,0 +1,451 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include "hdffcmd.h"
+#include "hdffcmd_base.h"
+#include "hdffcmd_defs.h"
+
+
+int HdffCmdAvSetPlayMode(int OsdDevice, uint8_t PlayMode, int Realtime)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_PLAY_MODE);
+    BitBuffer_SetBits(&cmdBuf, 1, Realtime ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 7, PlayMode);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetVideoPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
+                         HdffVideoStreamType_t StreamType)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_VIDEO_PID);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, StreamType);
+    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 13, Pid);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetAudioPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
+                         HdffAudioStreamType_t StreamType,
+                         HdffAvContainerType_t ContainerType)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_AUDIO_PID);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, StreamType);
+    BitBuffer_SetBits(&cmdBuf, 2, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 1, ContainerType);
+    BitBuffer_SetBits(&cmdBuf, 13, Pid);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetPcrPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_PCR_PID);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 13, Pid);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetTeletextPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_TELETEXT_PID);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 13, Pid);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetVideoWindow(int OsdDevice, uint8_t DecoderIndex, int Enable,
+                            uint16_t X, uint16_t Y, uint16_t Width,
+                            uint16_t Height)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_VIDEO_WINDOW);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
+    if (Enable)
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    else
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvShowStillImage(int OsdDevice, uint8_t DecoderIndex,
+                            const uint8_t * StillImage, int Size,
+                            HdffVideoStreamType_t StreamType)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    osd_raw_data_t osd_data;
+    int err;
+
+    memset(&osd_data, 0, sizeof(osd_raw_data_t));
+    osd_data.data_buffer = StillImage;
+    osd_data.data_length = Size;
+    err = ioctl(OsdDevice, OSD_RAW_DATA, &osd_data);
+    if (err != 0)
+        return err;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SHOW_STILL_IMAGE);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, StreamType);
+    BitBuffer_SetBits(&cmdBuf, 16, osd_data.data_handle);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetDecoderInput(int OsdDevice, uint8_t DecoderIndex,
+                             uint8_t DemultiplexerIndex)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_DECODER_INPUT);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, DemultiplexerIndex);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetDemultiplexerInput(int OsdDevice, uint8_t DemultiplexerIndex,
+                                   uint8_t TsInputIndex)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_DEMULTIPLEXER_INPUT);
+    BitBuffer_SetBits(&cmdBuf, 4, DemultiplexerIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, TsInputIndex);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetVideoFormat(int OsdDevice, uint8_t DecoderIndex,
+                            const HdffVideoFormat_t * VideoFormat)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_VIDEO_FORMAT);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, VideoFormat->AutomaticEnabled ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 1, VideoFormat->AfdEnabled ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 2, VideoFormat->TvFormat);
+    BitBuffer_SetBits(&cmdBuf, 8, VideoFormat->VideoConversion);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetVideoOutputMode(int OsdDevice, uint8_t DecoderIndex,
+                                HdffVideoOutputMode_t OutputMode)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_VIDEO_OUTPUT_MODE);
+    BitBuffer_SetBits(&cmdBuf, 8, OutputMode);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetStc(int OsdDevice, uint8_t DecoderIndex, uint64_t Stc)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_STC);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 1, (uint32_t) (Stc >> 32));
+    BitBuffer_SetBits(&cmdBuf, 32, (uint32_t) Stc);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvFlushBuffer(int OsdDevice, uint8_t DecoderIndex, int FlushAudio,
+                         int FlushVideo)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_FLUSH_BUFFER);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    if (FlushAudio)
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    }
+    else
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    }
+    if (FlushVideo)
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    }
+    else
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvEnableSync(int OsdDevice, uint8_t DecoderIndex, int SyncAudio,
+                        int SyncVideo)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_ENABLE_SYNC);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, SyncAudio ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 1, SyncVideo ? 1 : 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetVideoSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_VIDEO_SPEED);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, 0);
+    BitBuffer_SetBits(&cmdBuf, 32, Speed);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetAudioSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_AUDIO_SPEED);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 4, 0);
+    BitBuffer_SetBits(&cmdBuf, 32, Speed);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvEnableVideoAfterStop(int OsdDevice, uint8_t DecoderIndex,
+                                  int EnableVideoAfterStop)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_ENABLE_VIDEO_AFTER_STOP);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, EnableVideoAfterStop ? 1 : 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetAudioDelay(int OsdDevice, int16_t Delay)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_AUDIO_DELAY);
+    BitBuffer_SetBits(&cmdBuf, 16, Delay);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetAudioDownmix(int OsdDevice, HdffAudioDownmixMode_t DownmixMode)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_AUDIO_DOWNMIX);
+    BitBuffer_SetBits(&cmdBuf, 8, DownmixMode);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_AUDIO_CHANNEL);
+    BitBuffer_SetBits(&cmdBuf, 8, AudioChannel);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
new file mode 100644
index 000000000..7c2189b77
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
@@ -0,0 +1,151 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_AV_H
+#define HDFFCMD_AV_H
+
+typedef enum HdffAvContainerType_t
+{
+    HDFF_AV_CONTAINER_PES,
+    HDFF_AV_CONTAINER_PES_DVD
+} HdffAvContainerType_t;
+
+typedef enum HdffAudioStreamType_t
+{
+    HDFF_AUDIO_STREAM_INVALID = -1,
+    HDFF_AUDIO_STREAM_MPEG1 = 0,
+    HDFF_AUDIO_STREAM_MPEG2,
+    HDFF_AUDIO_STREAM_AC3,
+    HDFF_AUDIO_STREAM_AAC,
+    HDFF_AUDIO_STREAM_HE_AAC,
+    HDFF_AUDIO_STREAM_PCM,
+    HDFF_AUDIO_STREAM_EAC3,
+    HDFF_AUDIO_STREAM_DTS
+} HdffAudioStreamType_t;
+
+typedef enum HdffVideoStreamType_t
+{
+    HDFF_VIDEO_STREAM_INVALID = -1,
+    HDFF_VIDEO_STREAM_MPEG1 = 0,
+    HDFF_VIDEO_STREAM_MPEG2,
+    HDFF_VIDEO_STREAM_H264,
+    HDFF_VIDEO_STREAM_MPEG4_ASP,
+    HDFF_VIDEO_STREAM_VC1
+} HdffVideoStreamType_t;
+
+typedef enum HdffTvFormat_t
+{
+    HDFF_TV_FORMAT_4_BY_3,
+    HDFF_TV_FORMAT_16_BY_9
+} HdffTvFormat_t;
+
+typedef enum HdffVideoConversion_t
+{
+    HDFF_VIDEO_CONVERSION_AUTOMATIC,
+    HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9,
+    HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9,
+    HDFF_VIDEO_CONVERSION_PILLARBOX,
+    HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT,
+    HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9
+} HdffVideoConversion_t;
+
+typedef struct HdffVideoFormat_t
+{
+    int AutomaticEnabled;
+    int AfdEnabled;
+    HdffTvFormat_t TvFormat;
+    HdffVideoConversion_t VideoConversion;
+} HdffVideoFormat_t;
+
+typedef enum HdffVideoOutputMode_t
+{
+    HDFF_VIDEO_OUTPUT_CLONE,
+    HDFF_VIDEO_OUTPUT_HD_ONLY
+} HdffVideoOutputMode_t;
+
+typedef enum HdffAudioDownmixMode_t
+{
+    HDFF_AUDIO_DOWNMIX_OFF,
+    HDFF_AUDIO_DOWNMIX_ANALOG,
+    HDFF_AUDIO_DOWNMIX_ALWAYS,
+    HDFF_AUDIO_DOWNMIX_AUTOMATIC,
+    HDFF_AUDIO_DOWNMIX_HDMI_ONLY
+} HdffAudioDownmixMode_t;
+
+
+int HdffCmdAvSetPlayMode(int OsdDevice, uint8_t PlayMode, int Realtime);
+
+int HdffCmdAvSetVideoPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
+                         HdffVideoStreamType_t StreamType);
+
+int HdffCmdAvSetAudioPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
+                         HdffAudioStreamType_t StreamType,
+                         HdffAvContainerType_t ContainerType);
+
+int HdffCmdAvSetPcrPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid);
+
+int HdffCmdAvSetTeletextPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid);
+
+int HdffCmdAvSetVideoWindow(int OsdDevice, uint8_t DecoderIndex, int Enable,
+                            uint16_t X, uint16_t Y, uint16_t Width,
+                            uint16_t Height);
+
+int HdffCmdAvShowStillImage(int OsdDevice, uint8_t DecoderIndex,
+                            const uint8_t * StillImage, int Size,
+                            HdffVideoStreamType_t StreamType);
+
+int HdffCmdAvSetDecoderInput(int OsdDevice, uint8_t DecoderIndex,
+                             uint8_t DemultiplexerIndex);
+
+int HdffCmdAvSetDemultiplexerInput(int OsdDevice, uint8_t DemultiplexerIndex,
+                                   uint8_t TsInputIndex);
+
+int HdffCmdAvSetVideoFormat(int OsdDevice, uint8_t DecoderIndex,
+                            const HdffVideoFormat_t * VideoFormat);
+
+int HdffCmdAvSetVideoOutputMode(int OsdDevice, uint8_t DecoderIndex,
+                                HdffVideoOutputMode_t OutputMode);
+
+int HdffCmdAvSetStc(int OsdDevice, uint8_t DecoderIndex, uint64_t Stc);
+
+int HdffCmdAvFlushBuffer(int OsdDevice, uint8_t DecoderIndex, int FlushAudio,
+                         int FlushVideo);
+
+int HdffCmdAvEnableSync(int OsdDevice, uint8_t DecoderIndex, int SyncAudio,
+                        int SyncVideo);
+
+int HdffCmdAvSetVideoSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed);
+
+int HdffCmdAvSetAudioSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed);
+
+int HdffCmdAvEnableVideoAfterStop(int OsdDevice, uint8_t DecoderIndex,
+                                  int EnableVideoAfterStop);
+
+int HdffCmdAvSetAudioDelay(int OsdDevice, int16_t Delay);
+
+int HdffCmdAvSetAudioDownmix(int OsdDevice,
+                             HdffAudioDownmixMode_t DownmixMode);
+
+int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel);
+
+#endif /* HDFFCMD_AV_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c
new file mode 100644
index 000000000..ac1ab7e51
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c
@@ -0,0 +1,45 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include "hdffcmd_base.h"
+
+void HdffCmdBuildHeader(BitBuffer_t * MsgBuf, HdffMessageType_t MsgType,
+                        HdffMessageGroup_t MsgGroup, HdffMessageId_t MsgId)
+{
+    BitBuffer_SetBits(MsgBuf, 16, 0); // length field will be set later
+    BitBuffer_SetBits(MsgBuf, 6, 0); // reserved
+    BitBuffer_SetBits(MsgBuf, 2, MsgType);
+    BitBuffer_SetBits(MsgBuf, 8, MsgGroup);
+    BitBuffer_SetBits(MsgBuf, 16, MsgId);
+}
+
+uint32_t HdffCmdSetLength(BitBuffer_t * MsgBuf)
+{
+    uint32_t length;
+
+    length = BitBuffer_GetByteLength(MsgBuf) - 2;
+    MsgBuf->Data[0] = (uint8_t) (length >> 8);
+    MsgBuf->Data[1] = (uint8_t) length;
+
+    return length + 2;
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h
new file mode 100644
index 000000000..b6856aad9
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h
@@ -0,0 +1,55 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_BASE_H
+#define HDFFCMD_BASE_H
+
+#include <linux/dvb/osd.h>
+
+#if !defined OSD_RAW_CMD
+typedef struct osd_raw_cmd_s {
+    const void *cmd_data;
+    int cmd_len;
+    void *result_data;
+    int result_len;
+} osd_raw_cmd_t;
+
+typedef struct osd_raw_data_s {
+    const void *data_buffer;
+    int data_length;
+    int data_handle;
+} osd_raw_data_t;
+
+#define OSD_RAW_CMD            _IOWR('o', 162, osd_raw_cmd_t)
+#define OSD_RAW_DATA           _IOWR('o', 163, osd_raw_data_t)
+#endif
+
+#include "bitbuffer.h"
+#include "hdffcmd_defs.h"
+
+void HdffCmdBuildHeader(BitBuffer_t * MsgBuf, HdffMessageType_t MsgType,
+                        HdffMessageGroup_t MsgGroup, HdffMessageId_t MsgId);
+
+uint32_t HdffCmdSetLength(BitBuffer_t * MsgBuf);
+
+#endif /* HDFFCMD_BASE_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
new file mode 100644
index 000000000..8b24d7bcc
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
@@ -0,0 +1,120 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_DEFS_H
+#define HDFFCMD_DEFS_H
+
+typedef enum HdffMessageType_t
+{
+    HDFF_MSG_TYPE_COMMAND,
+    HDFF_MSG_TYPE_ANSWER,
+    HDFF_MSG_TYPE_RESULT,
+    HDFF_MSG_TYPE_EVENT
+} HdffMessageType_t;
+
+typedef enum HdffMessageGroup_t
+{
+    HDFF_MSG_GROUP_GENERIC,
+    HDFF_MSG_GROUP_AV_DECODER,
+    HDFF_MSG_GROUP_AV_MUX,
+    HDFF_MSG_GROUP_FRONTEND,
+    HDFF_MSG_GROUP_OSD,
+    HDFF_MSG_GROUP_HDMI,
+    HDFF_MSG_GROUP_REMOTE_CONTROL
+} HdffMessageGroup_t;
+
+typedef enum HdffMessageId_t
+{
+    HDFF_MSG_GEN_GET_FIRMWARE_VERSION = 0,
+    HDFF_MSG_GEN_GET_INTERFACE_VERSION,
+    HDFF_MSG_GEN_GET_COPYRIGHTS,
+
+    HDFF_MSG_AV_SET_AUDIO_PID = 0,
+    HDFF_MSG_AV_SET_VIDEO_PID,
+    HDFF_MSG_AV_SET_PCR_PID,
+    HDFF_MSG_AV_SET_TELETEXT_PID,
+    HDFF_MSG_AV_SHOW_STILL_IMAGE,
+    HDFF_MSG_AV_SET_VIDEO_WINDOW,
+    HDFF_MSG_AV_SET_DECODER_INPUT,
+    HDFF_MSG_AV_SET_DEMULTIPLEXER_INPUT,
+    HDFF_MSG_AV_SET_VIDEO_FORMAT,
+    HDFF_MSG_AV_SET_VIDEO_OUTPUT_MODE,
+    HDFF_MSG_AV_SET_STC,
+    HDFF_MSG_AV_FLUSH_BUFFER,
+    HDFF_MSG_AV_ENABLE_SYNC,
+    HDFF_MSG_AV_SET_VIDEO_SPEED,
+    HDFF_MSG_AV_SET_AUDIO_SPEED,
+    HDFF_MSG_AV_ENABLE_VIDEO_AFTER_STOP,
+    HDFF_MSG_AV_GET_VIDEO_FORMAT_INFO,
+    HDFF_MSG_AV_SET_AUDIO_DELAY,
+    HDFF_MSG_AV_SET_AUDIO_DOWNMIX,
+    HDFF_MSG_AV_SET_AUDIO_CHANNEL,
+    HDFF_MSG_AV_SET_PLAY_MODE,
+
+    HDFF_MSG_MUX_SET_VIDEO_OUT = 0,
+    HDFF_MSG_MUX_SET_SLOW_BLANK,
+    HDFF_MSG_MUX_SET_FAST_BLANK,
+    HDFF_MSG_MUX_SET_VOLUME,
+    HDFF_MSG_MUX_SET_AUDIO_MUTE,
+
+    HDFF_MSG_OSD_CONFIGURE = 0,
+    HDFF_MSG_OSD_RESET,
+    HDFF_MSG_OSD_CREATE_DISPLAY = 10,
+    HDFF_MSG_OSD_DELETE_DISPLAY,
+    HDFF_MSG_OSD_ENABLE_DISPLAY,
+    HDFF_MSG_OSD_SET_DISPLAY_OUTPUT_RECTANGLE,
+    HDFF_MSG_OSD_SET_DISPLAY_CLIPPLING_AREA,
+    HDFF_MSG_OSD_RENDER_DISPLAY,
+    HDFF_MSG_OSD_SAVE_REGION,
+    HDFF_MSG_OSD_RESTORE_REGION,
+    HDFF_MSG_OSD_CREATE_PALETTE = 30,
+    HDFF_MSG_OSD_DELETE_PALETTE,
+    HDFF_MSG_OSD_SET_DISPLAY_PALETTE,
+    HDFF_MSG_OSD_SET_PALETTE_COLORS,
+    HDFF_MSG_OSD_CREATE_FONT_FACE = 50,
+    HDFF_MSG_OSD_DELETE_FONT_FACE,
+    HDFF_MSG_OSD_CREATE_FONT,
+    HDFF_MSG_OSD_DELETE_FONT,
+    HDFF_MSG_OSD_DRAW_PIXEL = 70,
+    HDFF_MSG_OSD_DRAW_RECTANGLE,
+    HDFF_MSG_OSD_DRAW_CIRCLE,
+    HDFF_MSG_OSD_DRAW_ELLIPSE,
+    HDFF_MSG_OSD_DRAW_SLOPE,
+    HDFF_MSG_OSD_DRAW_TEXT,
+    HDFF_MSG_OSD_DRAW_WIDE_TEXT,
+    HDFF_MSG_OSD_DRAW_BITMAP,
+
+    HDFF_MSG_HDMI_ENABLE_OUTPUT = 0,
+    HDFF_MSG_HDMI_SET_VIDEO_MODE,
+    HDFF_MSG_HDMI_CONFIGURE,
+    HDFF_MSG_HDMI_IS_DISPLAY_CONNECTED,
+    HDFF_MSG_HDMI_GET_DISPLAY_INFO,
+    HDFF_MSG_HDMI_GET_VIDEO_MODE,
+    HDFF_MSG_HDMI_SEND_CEC_COMMAND,
+
+    HDFF_MSG_REMOTE_SET_PROTOCOL = 0,
+    HDFF_MSG_REMOTE_SET_ADDRESS_FILTER,
+    HDFF_MSG_REMOTE_KEY_EVENT
+} HdffMessageId_t;
+
+#endif /* HDFFCMD_DEFS_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
new file mode 100644
index 000000000..f72a7d323
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
@@ -0,0 +1,147 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include "hdffcmd.h"
+#include "hdffcmd_base.h"
+#include "hdffcmd_defs.h"
+
+int HdffCmdGetFirmwareVersion(int OsdDevice, uint32_t * Version, char * String,
+                              uint32_t MaxLength)
+{
+    uint8_t cmdData[8];
+    uint8_t resultData[64];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int err;
+
+    *Version = 0;
+    String[0] = 0;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_GENERIC,
+                       HDFF_MSG_GEN_GET_FIRMWARE_VERSION);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            uint8_t textLength = resultData[9];
+            if (textLength >= MaxLength)
+                textLength = MaxLength - 1;
+            memcpy(String, &resultData[10], textLength);
+            String[textLength] = 0;
+            *Version = (resultData[6] << 16)
+                     | (resultData[7] << 8)
+                     | resultData[8];
+        }
+    }
+    return err;
+}
+
+int HdffCmdGetInterfaceVersion(int OsdDevice, uint32_t * Version, char * String,
+                               uint32_t MaxLength)
+{
+    uint8_t cmdData[8];
+    uint8_t resultData[64];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int err;
+
+    *Version = 0;
+    String[0] = 0;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_GENERIC,
+                       HDFF_MSG_GEN_GET_INTERFACE_VERSION);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            uint8_t textLength = resultData[9];
+            if (textLength >= MaxLength)
+                textLength = MaxLength - 1;
+            memcpy(String, &resultData[10], textLength);
+            String[textLength] = 0;
+            *Version = (resultData[6] << 16)
+                     | (resultData[7] << 8)
+                     | resultData[8];
+        }
+    }
+    return err;
+}
+
+int HdffCmdGetCopyrights(int OsdDevice, uint8_t Index, char * String,
+                         uint32_t MaxLength)
+{
+    uint8_t cmdData[8];
+    uint8_t resultData[280];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int err;
+
+    String[0] = 0;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_GENERIC,
+                       HDFF_MSG_GEN_GET_COPYRIGHTS);
+    BitBuffer_SetBits(&cmdBuf, 8, Index);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            uint8_t index = resultData[6];
+            uint8_t textLen = resultData[7];
+            if (index == Index && textLen > 0)
+            {
+                if (textLen >= MaxLength)
+                {
+                    textLen = MaxLength - 1;
+                }
+                memcpy(String, resultData + 8, textLen);
+                String[textLen] = 0;
+            }
+        }
+    }
+    return err;
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h
new file mode 100644
index 000000000..c12b29641
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_GENERIC_H
+#define HDFFCMD_GENERIC_H
+
+int HdffCmdGetFirmwareVersion(int OsdDevice, uint32_t * Version, char * String,
+                              uint32_t MaxLength);
+
+int HdffCmdGetInterfaceVersion(int OsdDevice, uint32_t * Version, char * String,
+                               uint32_t MaxLength);
+
+int HdffCmdGetCopyrights(int OsdDevice, uint8_t Index, char * String,
+                         uint32_t MaxLength);
+
+#endif /* HDFFCMD_GENERIC_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
new file mode 100644
index 000000000..42b82b5fd
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
@@ -0,0 +1,82 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include "hdffcmd.h"
+#include "hdffcmd_base.h"
+#include "hdffcmd_defs.h"
+
+
+int HdffCmdHdmiSetVideoMode(int OsdDevice, HdffVideoMode_t VideoMode)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
+                       HDFF_MSG_HDMI_SET_VIDEO_MODE);
+    BitBuffer_SetBits(&cmdBuf, 8, VideoMode);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
+                       HDFF_MSG_HDMI_CONFIGURE);
+    BitBuffer_SetBits(&cmdBuf, 1, Config->TransmitAudio ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 1, Config->ForceDviMode ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 1, Config->CecEnabled ? 1 : 0);
+    BitBuffer_SetBits(&cmdBuf, 3, Config->VideoModeAdaption);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdHdmiSendCecCommand(int OsdDevice, HdffCecCommand_t Command)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
+                       HDFF_MSG_HDMI_SEND_CEC_COMMAND);
+    BitBuffer_SetBits(&cmdBuf, 8, Command);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
new file mode 100644
index 000000000..16e375f4b
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
@@ -0,0 +1,67 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_HDMI_H
+#define HDFFCMD_HDMI_H
+
+
+typedef enum HdffVideoMode_t
+{
+    HDFF_VIDEO_MODE_576P50 = 18,
+    HDFF_VIDEO_MODE_720P50 = 19,
+    HDFF_VIDEO_MODE_1080I50 = 20,
+    HDFF_VIDEO_MODE_576I50 = 22
+} HdffVideoMode_t;
+
+typedef enum HdffVideoModeAdaption_t
+{
+    HDFF_VIDEO_MODE_ADAPT_OFF,
+    HDFF_VIDEO_MODE_ADAPT_FRAME_RATE,
+    HDFF_VIDEO_MODE_ADAPT_ONLY_FOR_HD,
+    HDFF_VIDEO_MODE_ADAPT_ALWAYS
+} HdffVideoModeAdaption_t;
+
+typedef struct HdffHdmiConfig_t
+{
+    int TransmitAudio;
+    int ForceDviMode;
+    int CecEnabled;
+    HdffVideoModeAdaption_t VideoModeAdaption;
+} HdffHdmiConfig_t;
+
+typedef enum HdffCecCommand_t
+{
+    HDFF_CEC_COMMAND_TV_ON,
+    HDFF_CEC_COMMAND_TV_OFF,
+    HDFF_CEC_COMMAND_TV_ACTIVE_SOURCE,
+    HDFF_CEC_COMMAND_TV_INACTIVE_SOURCE
+} HdffCecCommand_t;
+
+
+int HdffCmdHdmiSetVideoMode(int OsdDevice, HdffVideoMode_t VideoMode);
+
+int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config);
+
+int HdffCmdHdmiSendCecCommand(int OsdDevice, HdffCecCommand_t Command);
+
+#endif /* HDFFCMD_HDMI_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c
new file mode 100644
index 000000000..3698b5656
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c
@@ -0,0 +1,81 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include "hdffcmd.h"
+#include "hdffcmd_base.h"
+#include "hdffcmd_defs.h"
+
+
+int HdffCmdMuxSetVideoOut(int OsdDevice, HdffVideoOut_t VideoOut)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_AV_MUX,
+                       HDFF_MSG_MUX_SET_VIDEO_OUT);
+    BitBuffer_SetBits(&cmdBuf, 4, VideoOut);
+    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdMuxSetVolume(int OsdDevice, uint8_t Volume)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_AV_MUX,
+                       HDFF_MSG_MUX_SET_VOLUME);
+    BitBuffer_SetBits(&cmdBuf, 8, Volume);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdMuxMuteAudio(int OsdDevice, int Mute)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_AV_MUX,
+                       HDFF_MSG_MUX_SET_AUDIO_MUTE);
+    BitBuffer_SetBits(&cmdBuf, 1, Mute);
+    BitBuffer_SetBits(&cmdBuf, 7, 0); // reserved
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h
new file mode 100644
index 000000000..8821d5fb9
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h
@@ -0,0 +1,56 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_MUX_H
+#define HDFFCMD_MUX_H
+
+
+typedef enum HdffVideoOut_t
+{
+    HDFF_VIDEO_OUT_DISABLED,
+    HDFF_VIDEO_OUT_CVBS_RGB,
+    HDFF_VIDEO_OUT_CVBS_YUV,
+    HDFF_VIDEO_OUT_YC
+} HdffVideoOut_t;
+
+typedef enum HdffSlowBlank_t
+{
+    HDFF_SLOW_BLANK_OFF,
+    HDFF_SLOW_BLANK_16_BY_9,
+    HDFF_SLOW_BLANK_4_BY_3
+} HdffSlowBlank_t;
+
+typedef enum HdffFastBlank_t
+{
+    HDFF_FAST_BLANK_CVBS,
+    HDFF_FAST_BLANK_RGB
+} HdffFastBlank_t;
+
+
+int HdffCmdMuxSetVideoOut(int OsdDevice, HdffVideoOut_t VideoOut);
+
+int HdffCmdMuxSetVolume(int OsdDevice, uint8_t Volume);
+
+int HdffCmdMuxMuteAudio(int OsdDevice, int Mute);
+
+#endif /* HDFFCMD_MUX_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
new file mode 100644
index 000000000..a80051ffd
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
@@ -0,0 +1,637 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include "hdffcmd.h"
+#include "hdffcmd_base.h"
+#include "hdffcmd_defs.h"
+
+
+int HdffCmdOsdConfigure(int OsdDevice, const HdffOsdConfig_t * Config)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_CONFIGURE);
+    if (Config->FontAntialiasing)
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    }
+    else
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    }
+    if (Config->FontKerning)
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    }
+    else
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdReset(int OsdDevice)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_RESET);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+
+int HdffCmdOsdCreateDisplay(int OsdDevice, uint16_t Width, uint16_t Height,
+                            HdffColorType_t ColorType, uint32_t * NewDisplay)
+{
+    uint8_t cmdData[16];
+    uint8_t resultData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int err;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_CREATE_DISPLAY);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    BitBuffer_SetBits(&cmdBuf, 8, ColorType);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    *NewDisplay = HDFF_INVALID_HANDLE;
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            *NewDisplay = (resultData[6] << 24)
+                        | (resultData[7] << 16)
+                        | (resultData[8] << 8)
+                        | resultData[9];
+        }
+    }
+    return err;
+}
+
+int HdffCmdOsdDeleteDisplay(int OsdDevice, uint32_t Display)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DELETE_DISPLAY);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdEnableDisplay(int OsdDevice, uint32_t Display, int Enable)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_ENABLE_DISPLAY);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    if (Enable)
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    }
+    else
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdSetDisplayOutputRectangle(int OsdDevice, uint32_t Display,
+                                        uint16_t X, uint16_t Y,
+                                        uint16_t Width, uint16_t Height)
+{
+    uint8_t cmdData[20];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_SET_DISPLAY_OUTPUT_RECTANGLE);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdSetDisplayClippingArea(int OsdDevice, uint32_t Display,
+                                     int Enable, uint16_t X, uint16_t Y,
+                                     uint16_t Width, uint16_t Height)
+{
+    uint8_t cmdData[20];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_SET_DISPLAY_CLIPPLING_AREA);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    if (Enable)
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 1);
+    }
+    else
+    {
+        BitBuffer_SetBits(&cmdBuf, 1, 0);
+    }
+    BitBuffer_SetBits(&cmdBuf, 7, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdRenderDisplay(int OsdDevice, uint32_t Display)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_RENDER_DISPLAY);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdSaveRegion(int OsdDevice, uint32_t Display,
+                         uint16_t X, uint16_t Y,
+                         uint16_t Width, uint16_t Height)
+{
+    uint8_t cmdData[20];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_SAVE_REGION);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdRestoreRegion(int OsdDevice, uint32_t Display)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_RESTORE_REGION);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+
+int HdffCmdOsdCreatePalette(int OsdDevice, HdffColorType_t ColorType,
+                            HdffColorFormat_t ColorFormat,
+                            uint32_t NumColors, const uint32_t * Colors,
+                            uint32_t * NewPalette)
+{
+    uint8_t cmdData[1060];
+    uint8_t resultData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int i;
+    int err;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_CREATE_PALETTE);
+    BitBuffer_SetBits(&cmdBuf, 8, ColorType);
+    BitBuffer_SetBits(&cmdBuf, 8, ColorFormat);
+    if (NumColors > 256)
+        NumColors = 256;
+    BitBuffer_SetBits(&cmdBuf, 8, NumColors == 256 ? 0 : NumColors);
+    for (i = 0; i < NumColors; i++)
+    {
+        BitBuffer_SetBits(&cmdBuf, 32, Colors[i]);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    *NewPalette = HDFF_INVALID_HANDLE;
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            *NewPalette = (resultData[6] << 24)
+                        | (resultData[7] << 16)
+                        | (resultData[8] << 8)
+                        | resultData[9];
+        }
+    }
+    return err;
+}
+
+int HdffCmdOsdDeletePalette(int OsdDevice, uint32_t Palette)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DELETE_PALETTE);
+    BitBuffer_SetBits(&cmdBuf, 32, Palette);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdSetDisplayPalette(int OsdDevice, uint32_t Display,
+                                uint32_t Palette)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_SET_DISPLAY_PALETTE);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 32, Palette);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdSetPaletteColors(int OsdDevice, uint32_t Palette,
+                               HdffColorFormat_t ColorFormat,
+                               uint8_t StartColor, uint32_t NumColors,
+                               const uint32_t * Colors)
+{
+    uint8_t cmdData[1060];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int i;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_SET_PALETTE_COLORS);
+    BitBuffer_SetBits(&cmdBuf, 32, Palette);
+    BitBuffer_SetBits(&cmdBuf, 8, ColorFormat);
+    BitBuffer_SetBits(&cmdBuf, 8, StartColor);
+    if (NumColors > 256)
+        NumColors = 256;
+    BitBuffer_SetBits(&cmdBuf, 8, NumColors == 256 ? 0 : NumColors);
+    for (i = 0; i < NumColors; i++)
+    {
+        BitBuffer_SetBits(&cmdBuf, 32, Colors[i]);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdCreateFontFace(int OsdDevice, const uint8_t * FontData,
+                             uint32_t DataSize, uint32_t * NewFontFace)
+{
+    uint8_t cmdData[16];
+    uint8_t resultData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    osd_raw_data_t osd_data;
+    int err;
+
+    *NewFontFace = HDFF_INVALID_HANDLE;
+
+    memset(&osd_data, 0, sizeof(osd_raw_data_t));
+    osd_data.data_buffer = FontData;
+    osd_data.data_length = DataSize;
+    err = ioctl(OsdDevice, OSD_RAW_DATA, &osd_data);
+    if (err != 0)
+        return err;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_CREATE_FONT_FACE);
+    BitBuffer_SetBits(&cmdBuf, 16, osd_data.data_handle);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            *NewFontFace = (resultData[6] << 24)
+                         | (resultData[7] << 16)
+                         | (resultData[8] << 8)
+                         | resultData[9];
+        }
+    }
+    return err;
+}
+
+int HdffCmdOsdDeleteFontFace(int OsdDevice, uint32_t FontFace)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DELETE_FONT_FACE);
+    BitBuffer_SetBits(&cmdBuf, 32, FontFace);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdCreateFont(int OsdDevice, uint32_t FontFace, uint32_t Size,
+                         uint32_t * NewFont)
+{
+    uint8_t cmdData[16];
+    uint8_t resultData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int err;
+
+    *NewFont = HDFF_INVALID_HANDLE;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    osd_cmd.result_data = resultData;
+    osd_cmd.result_len = sizeof(resultData);
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_CREATE_FONT);
+    BitBuffer_SetBits(&cmdBuf, 32, FontFace);
+    BitBuffer_SetBits(&cmdBuf, 32, Size);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+    if (err == 0)
+    {
+        if (osd_cmd.result_len > 0)
+        {
+            *NewFont = (resultData[6] << 24)
+                     | (resultData[7] << 16)
+                     | (resultData[8] << 8)
+                     | resultData[9];
+        }
+    }
+    return err;
+}
+
+int HdffCmdOsdDeleteFont(int OsdDevice, uint32_t Font)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DELETE_FONT);
+    BitBuffer_SetBits(&cmdBuf, 32, Font);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+
+int HdffCmdOsdDrawRectangle(int OsdDevice, uint32_t Display, uint16_t X,
+                            uint16_t Y, uint16_t Width, uint16_t Height,
+                            uint32_t Color)
+{
+    uint8_t cmdData[24];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_RECTANGLE);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
+                          uint16_t CY, uint16_t RadiusX, uint16_t RadiusY,
+                          uint32_t Color, uint32_t Flags)
+{
+    uint8_t cmdData[28];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_ELLIPSE);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, CX);
+    BitBuffer_SetBits(&cmdBuf, 16, CY);
+    BitBuffer_SetBits(&cmdBuf, 16, RadiusX);
+    BitBuffer_SetBits(&cmdBuf, 16, RadiusY);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    BitBuffer_SetBits(&cmdBuf, 32, Flags);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
+                       uint16_t X, uint16_t Y, const char * Text,
+                       uint32_t Color)
+{
+    uint8_t cmdData[1060];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int i;
+    int length;
+
+    length = 0;
+    while (Text[length])
+    {
+        length++;
+    }
+    if (length > 980)
+        length = 980;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_TEXT);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 32, Font);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    BitBuffer_SetBits(&cmdBuf, 16, length);
+    for (i = 0; i < length; i++)
+    {
+        BitBuffer_SetBits(&cmdBuf, 8, Text[i]);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdDrawWideText(int OsdDevice, uint32_t Display, uint32_t Font,
+                           uint16_t X, uint16_t Y, const uint16_t * Text,
+                           uint32_t Color)
+{
+    uint8_t cmdData[1060];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int i;
+    int length;
+
+    length = 0;
+    while (Text[length])
+    {
+        length++;
+    }
+    if (length > 480)
+        length = 480;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_WIDE_TEXT);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 32, Font);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    BitBuffer_SetBits(&cmdBuf, 16, length);
+    for (i = 0; i < length; i++)
+    {
+        BitBuffer_SetBits(&cmdBuf, 16, Text[i]);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdOsdDrawBitmap(int OsdDevice, uint32_t Display, uint16_t X,
+                         uint16_t Y, const uint8_t * Bitmap, uint16_t BmpWidth,
+                         uint16_t BmpHeight, uint32_t BmpSize,
+                         HdffColorType_t ColorType, uint32_t Palette)
+{
+    uint8_t cmdData[32];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    osd_raw_data_t osd_data;
+    int err;
+
+    memset(&osd_data, 0, sizeof(osd_raw_data_t));
+    osd_data.data_buffer = Bitmap;
+    osd_data.data_length = BmpSize;
+    err = ioctl(OsdDevice, OSD_RAW_DATA, &osd_data);
+    if (err != 0)
+        return err;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_BITMAP);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, BmpWidth);
+    BitBuffer_SetBits(&cmdBuf, 16, BmpHeight);
+    BitBuffer_SetBits(&cmdBuf, 8, ColorType);
+    BitBuffer_SetBits(&cmdBuf, 6, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 2, 0); // uncompressed
+    BitBuffer_SetBits(&cmdBuf, 32, Palette);
+    BitBuffer_SetBits(&cmdBuf, 16, osd_data.data_handle);
+    BitBuffer_SetBits(&cmdBuf, 32, 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
new file mode 100644
index 000000000..5c1355934
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
@@ -0,0 +1,161 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_OSD_H
+#define HDFFCMD_OSD_H
+
+
+#define HDFF_INVALID_HANDLE             0xFFFFFFFF
+#define HDFF_SCREEN_DISPLAY_HANDLE      0xFFFFFFFE
+
+#define HDFF_POSITION_SCREEN_CENTERED   0xFFFF
+
+#define HDFF_SIZE_FULL_SCREEN           0xFFFF
+#define HDFF_SIZE_SAME_AS_SOURCE        0xFFFE
+
+#define HDFF_FONT_FACE_TIRESIAS         0x00000000
+
+
+typedef struct HdffOsdConfig_t
+{
+    int FontAntialiasing;
+    int FontKerning;
+} HdffOsdConfig_t;
+
+typedef enum HdffColorType_t
+{
+    HDFF_COLOR_TYPE_CLUT1,
+    HDFF_COLOR_TYPE_CLUT2,
+    HDFF_COLOR_TYPE_CLUT4,
+    HDFF_COLOR_TYPE_CLUT8,
+    HDFF_COLOR_TYPE_ARGB8888,
+    HDFF_COLOR_TYPE_ARGB8565,
+    HDFF_COLOR_TYPE_ARGB4444,
+    HDFF_COLOR_TYPE_ARGB1555,
+    HDFF_COLOR_TYPE_RGB888,
+    HDFF_COLOR_TYPE_RGB565
+} HdffColorType_t;
+
+typedef enum HdffColorFormat_t
+{
+    HDFF_COLOR_FORMAT_ARGB,
+    HDFF_COLOR_FORMAT_ACBYCR
+} HdffColorFormat_t;
+
+typedef enum HdffDrawingFlags_t
+{
+    HDFF_DRAW_FULL,
+    HDFF_DRAW_HALF_TOP,
+    HDFF_DRAW_HALF_LEFT,
+    HDFF_DRAW_HALF_BOTTOM,
+    HDFF_DRAW_HALF_RIGHT,
+    HDFF_DRAW_QUARTER_TOP_LEFT,
+    HDFF_DRAW_QUARTER_TOP_RIGHT,
+    HDFF_DRAW_QUARTER_BOTTOM_LEFT,
+    HDFF_DRAW_QUARTER_BOTTOM_RIGHT,
+    HDFF_DRAW_QUARTER_TOP_LEFT_INVERTED,
+    HDFF_DRAW_QUARTER_TOP_RIGHT_INVERTED,
+    HDFF_DRAW_QUARTER_BOTTOM_LEFT_INVERTED,
+    HDFF_DRAW_QUARTER_BOTTOM_RIGHT_INVERTED
+} HdffDrawingFlags_t;
+
+
+int HdffCmdOsdConfigure(int OsdDevice, const HdffOsdConfig_t * Config);
+
+int HdffCmdOsdReset(int OsdDevice);
+
+
+int HdffCmdOsdCreateDisplay(int OsdDevice, uint16_t Width, uint16_t Height,
+                            HdffColorType_t ColorType, uint32_t * NewDisplay);
+
+int HdffCmdOsdDeleteDisplay(int OsdDevice, uint32_t Display);
+
+int HdffCmdOsdEnableDisplay(int OsdDevice, uint32_t Display, int Enable);
+
+int HdffCmdOsdSetDisplayOutputRectangle(int OsdDevice, uint32_t Display,
+                                        uint16_t X, uint16_t Y,
+                                        uint16_t Width, uint16_t Height);
+
+int HdffCmdOsdSetDisplayClippingArea(int OsdDevice, uint32_t Display,
+                                     int Enable, uint16_t X, uint16_t Y,
+                                     uint16_t Width, uint16_t Height);
+
+int HdffCmdOsdRenderDisplay(int OsdDevice, uint32_t Display);
+
+int HdffCmdOsdSaveRegion(int OsdDevice, uint32_t Display,
+                         uint16_t X, uint16_t Y,
+                         uint16_t Width, uint16_t Height);
+
+int HdffCmdOsdRestoreRegion(int OsdDevice, uint32_t Display);
+
+
+int HdffCmdOsdCreatePalette(int OsdDevice, HdffColorType_t ColorType,
+                            HdffColorFormat_t ColorFormat,
+                            uint32_t NumColors, const uint32_t * Colors,
+                            uint32_t * NewPalette);
+
+int HdffCmdOsdDeletePalette(int OsdDevice, uint32_t Palette);
+
+int HdffCmdOsdSetDisplayPalette(int OsdDevice, uint32_t Display,
+                                uint32_t Palette);
+
+int HdffCmdOsdSetPaletteColors(int OsdDevice, uint32_t Palette,
+                               HdffColorFormat_t ColorFormat,
+                               uint8_t StartColor, uint32_t NumColors,
+                               const uint32_t * Colors);
+
+
+int HdffCmdOsdCreateFontFace(int OsdDevice, const uint8_t * FontData,
+                             uint32_t DataSize, uint32_t * NewFontFace);
+
+int HdffCmdOsdDeleteFontFace(int OsdDevice, uint32_t FontFace);
+
+int HdffCmdOsdCreateFont(int OsdDevice, uint32_t FontFace, uint32_t Size,
+                         uint32_t * NewFont);
+
+int HdffCmdOsdDeleteFont(int OsdDevice, uint32_t Font);
+
+
+int HdffCmdOsdDrawRectangle(int OsdDevice, uint32_t Display, uint16_t X,
+                            uint16_t Y, uint16_t Width, uint16_t Height,
+                            uint32_t Color);
+
+int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
+                          uint16_t CY, uint16_t RadiusX, uint16_t RadiusY,
+                          uint32_t Color, uint32_t Flags);
+
+int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
+                       uint16_t X, uint16_t Y, const char * Text,
+                       uint32_t Color);
+
+int HdffCmdOsdDrawWideText(int OsdDevice, uint32_t Display, uint32_t Font,
+                           uint16_t X, uint16_t Y, const uint16_t * Text,
+                           uint32_t Color);
+
+int HdffCmdOsdDrawBitmap(int OsdDevice, uint32_t Display, uint16_t X,
+                         uint16_t Y, const uint8_t * Bitmap, uint16_t BmpWidth,
+                         uint16_t BmpHeight, uint32_t BmpSize,
+                         HdffColorType_t ColorType, uint32_t Palette);
+
+
+#endif /* HDFFCMD_OSD_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c
new file mode 100644
index 000000000..d9bbe4564
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c
@@ -0,0 +1,67 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+
+#include "hdffcmd.h"
+#include "hdffcmd_base.h"
+#include "hdffcmd_defs.h"
+
+
+int HdffCmdRemoteSetProtocol(int OsdDevice, HdffRemoteProtocol_t Protocol)
+{
+    uint8_t cmdData[8];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_REMOTE_CONTROL,
+                       HDFF_MSG_REMOTE_SET_PROTOCOL);
+    BitBuffer_SetBits(&cmdBuf, 8, Protocol);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdRemoteSetAddressFilter(int OsdDevice, int Enable, uint32_t Address)
+{
+    uint8_t cmdData[12];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_REMOTE_CONTROL,
+                       HDFF_MSG_REMOTE_SET_ADDRESS_FILTER);
+    BitBuffer_SetBits(&cmdBuf, 1, Enable);
+    BitBuffer_SetBits(&cmdBuf, 7, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 32, Address);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h
new file mode 100644
index 000000000..f2e6b8af1
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h
@@ -0,0 +1,39 @@
+/**********************************************************************
+ *
+ * HDFF firmware command interface library
+ *
+ * Copyright (C) 2011  Andreas Regel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *********************************************************************/
+
+#ifndef HDFFCMD_REMOTE_H
+#define HDFFCMD_REMOTE_H
+
+typedef enum HdffRemoteProtocol_t
+{
+    HDFF_REMOTE_PROTOCOL_NONE,
+    HDFF_REMOTE_PROTOCOL_RC5,
+    HDFF_REMOTE_PROTOCOL_RC6
+} HdffRemoteProtocol_t;
+
+
+int HdffCmdRemoteSetProtocol(int OsdDevice, HdffRemoteProtocol_t Protocol);
+
+int HdffCmdRemoteSetAddressFilter(int OsdDevice, int Enable, uint32_t Address);
+
+#endif /* HDFFCMD_REMOTE_H */
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index db8ef0b75..48abaf575 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -20,13 +20,13 @@ msgid "HD Full Featured DVB device"
 msgstr "DVB-laite HD-ulostulolla"
 
 msgid "Off"
-msgstr ""
+msgstr "ei"
 
 msgid "Frame rate"
-msgstr ""
+msgstr "kuvataajuuden mukaan"
 
 msgid "HD Only"
-msgstr ""
+msgstr "vain HD-resoluutiolla"
 
 msgid "Always"
 msgstr "aina"
@@ -68,7 +68,7 @@ msgid "Resolution"
 msgstr "Kuvaresoluutio"
 
 msgid "Video Mode Adaption"
-msgstr ""
+msgstr "Sovita näyttömoodi"
 
 msgid "TV format"
 msgstr "Näytön kuvasuhde"
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index 6e41860f8..cb476a852 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c 1.13 2011/08/27 09:35:35 kls Exp $
+ * $Id: setup.c 1.14 2011/12/04 15:31:58 kls Exp $
  */
 
 #include "setup.h"
@@ -20,12 +20,12 @@ cHdffSetup gHdffSetup;
 cHdffSetup::cHdffSetup(void)
 {
     Resolution = kResolution1080i;
-    VideoModeAdaption = HDFF::videoModeAdaptOff;
-    TvFormat = HDFF::tvFormat16by9;
-    VideoConversion = HDFF::videoConversionPillarbox;
-    AnalogueVideo = HDFF::videoOutCvbsYuv;
+    VideoModeAdaption = HDFF_VIDEO_MODE_ADAPT_OFF;
+    TvFormat = HDFF_TV_FORMAT_16_BY_9;
+    VideoConversion = HDFF_VIDEO_CONVERSION_PILLARBOX;
+    AnalogueVideo = HDFF_VIDEO_OUT_CVBS_YUV;
     AudioDelay = 0;
-    AudioDownmix = HDFF::downmixAutomatic;
+    AudioDownmix = HDFF_AUDIO_DOWNMIX_AUTOMATIC;
     OsdSize = 0;
     CecEnabled = 1;
     RemoteProtocol = 1;
@@ -68,7 +68,7 @@ void cHdffSetup::GetOsdSize(int &Width, int &Height, double &PixelAspect)
             Width = 720;
             Height = 576;
         }
-        if (TvFormat == HDFF::tvFormat16by9)
+        if (TvFormat == HDFF_TV_FORMAT_16_BY_9)
             PixelAspect = 16.0 / 9.0;
         else
             PixelAspect = 4.0 / 3.0;
@@ -96,19 +96,19 @@ void cHdffSetup::GetOsdSize(int &Width, int &Height, double &PixelAspect)
     PixelAspect /= double(Width) / Height;
 }
 
-HDFF::eHdmiVideoMode cHdffSetup::GetVideoMode(void)
+HdffVideoMode_t cHdffSetup::GetVideoMode(void)
 {
     switch (Resolution)
     {
         case kResolution1080i:
         default:
-            return HDFF::videoMode1080i50;
+            return HDFF_VIDEO_MODE_1080I50;
         case kResolution720p:
-            return HDFF::videoMode720p50;
+            return HDFF_VIDEO_MODE_720P50;
         case kResolution576p:
-            return HDFF::videoMode576p50;
+            return HDFF_VIDEO_MODE_576P50;
         case kResolution576i:
-            return HDFF::videoMode576i50;
+            return HDFF_VIDEO_MODE_576I50;
     }
 }
 
@@ -233,27 +233,27 @@ void cHdffSetupPage::Store(void)
         {
             mHdffCmdIf->CmdHdmiSetVideoMode(mNewHdffSetup.GetVideoMode());
         }
-        HDFF::tVideoFormat videoFormat;
-        HDFF::tHdmiConfig hdmiConfig;
+        HdffVideoFormat_t videoFormat;
+        HdffHdmiConfig_t hdmiConfig;
 
         videoFormat.AutomaticEnabled = true;
         videoFormat.AfdEnabled = true;
-        videoFormat.TvFormat = (HDFF::eTvFormat) mNewHdffSetup.TvFormat;
-        videoFormat.VideoConversion = (HDFF::eVideoConversion) mNewHdffSetup.VideoConversion;
+        videoFormat.TvFormat = (HdffTvFormat_t) mNewHdffSetup.TvFormat;
+        videoFormat.VideoConversion = (HdffVideoConversion_t) mNewHdffSetup.VideoConversion;
         mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
 
         mHdffCmdIf->CmdAvSetAudioDelay(mNewHdffSetup.AudioDelay);
-        mHdffCmdIf->CmdAvSetAudioDownmix((HDFF::eDownmixMode) mNewHdffSetup.AudioDownmix);
+        mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) mNewHdffSetup.AudioDownmix);
 
-        mHdffCmdIf->CmdMuxSetVideoOut((HDFF::eVideoOut) mNewHdffSetup.AnalogueVideo);
+        mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) mNewHdffSetup.AnalogueVideo);
 
         hdmiConfig.TransmitAudio = true;
         hdmiConfig.ForceDviMode = false;
         hdmiConfig.CecEnabled = mNewHdffSetup.CecEnabled;
-        hdmiConfig.VideoModeAdaption = (HDFF::eVideoModeAdaption) mNewHdffSetup.VideoModeAdaption;
+        hdmiConfig.VideoModeAdaption = (HdffVideoModeAdaption_t) mNewHdffSetup.VideoModeAdaption;
         mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
 
-        mHdffCmdIf->CmdRemoteSetProtocol((HDFF::eRemoteProtocol) mNewHdffSetup.RemoteProtocol);
+        mHdffCmdIf->CmdRemoteSetProtocol((HdffRemoteProtocol_t) mNewHdffSetup.RemoteProtocol);
         mHdffCmdIf->CmdRemoteSetAddressFilter(mNewHdffSetup.RemoteAddress >= 0, mNewHdffSetup.RemoteAddress);
     }
 
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
index c3fe7a632..964105e55 100644
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.h 1.9 2011/08/27 09:36:02 kls Exp $
+ * $Id: setup.h 1.10 2011/12/04 15:32:13 kls Exp $
  */
 
 #ifndef _HDFF_SETUP_H_
@@ -17,7 +17,7 @@ struct cHdffSetup
     cHdffSetup(void);
     bool SetupParse(const char * Name, const char * Value);
     void GetOsdSize(int &Width, int &Height, double &PixelAspect);
-    HDFF::eHdmiVideoMode GetVideoMode(void);
+    HdffVideoMode_t GetVideoMode(void);
 
     int Resolution;
     int VideoModeAdaption;
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 964ab2e96..b63a81bf1 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -55,3 +55,7 @@ VDR Plugin 'pictures' Revision History
 - The pic2mpg script now generates HD images (thanks to Andre Weidemann for his
   support in using convert/ffmpeg). The old SD version is still available as
   pic2mpg-sd.
+
+2011-11-02:
+
+- Fixed handling images that are rotated by 180 degrees in pic2mpg.
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 190ec2601..17a879133 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 2.2 2011/08/14 13:34:15 kls Exp $
+# $Id: pic2mpg 2.3 2011/11/02 17:20:37 kls Exp $
 
 use File::Path;
 use File::Spec;
@@ -124,7 +124,7 @@ sub ConvertFile
   return if (!defined $PICTYPES{$Type});
   my $Exif = ImageInfo($Pict);
   my $Orientation = $$Exif{"Orientation"};
-  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+) /; 
+  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+)/; 
   my $Rotate = $Degrees ? "-rotate $Degrees" : "";
   print "orientation = '$Orientation' -> rotation = $Rotate\n" if ($Detailed);
   $Pict = EscapeMeta($Pict);
diff --git a/ci.h b/ci.h
index c31dccff2..71bbdf9f0 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 2.0 2007/01/03 12:49:10 kls Exp $
+ * $Id: ci.h 2.1 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __CI_H
@@ -220,7 +220,7 @@ class cCamSlot : public cListObject {
        ///< CAM is currently not decrypting anything. If there is already a
        ///< channel being decrypted, a call to CanDecrypt() checks whether the
        ///< CAM can also decrypt the given channel. Only CAMs that have replied
-       ///< to the inital QUERY will perform this check at all. CAMs that never
+       ///< to the initial QUERY will perform this check at all. CAMs that never
        ///< replied to the initial QUERY are assumed not to be able to handle
        ///< more than one channel at a time.
   void StartDecrypting(void);
diff --git a/config.c b/config.c
index 73bb00d60..94f684541 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.15 2011/08/20 09:12:05 kls Exp $
+ * $Id: config.c 2.16 2011/12/03 15:21:30 kls Exp $
  */
 
 #include "config.h"
@@ -63,6 +63,69 @@ bool cSVDRPhost::Accepts(in_addr_t Address)
   return (Address & mask) == (addr.s_addr & mask);
 }
 
+// --- cSatCableNumbers ------------------------------------------------------
+
+cSatCableNumbers::cSatCableNumbers(int Size, const char *s)
+{
+  size = Size;
+  array = MALLOC(int, size);
+  memset(array, size * sizeof(int), 0);
+  FromString(s);
+}
+
+cSatCableNumbers::~cSatCableNumbers()
+{
+  free(array);
+}
+
+bool cSatCableNumbers::FromString(const char *s)
+{
+  char *t;
+  int i = 0;
+  const char *p = s;
+  while (p && *p) {
+        int n = strtol(p, &t, 10);
+        if (t != p) {
+           if (i < size)
+              array[i++] = n;
+           else {
+              esyslog("ERROR: too many sat cable numbers in '%s'", s);
+              return false;
+              }
+           }
+        else {
+           esyslog("ERROR: invalid sat cable number in '%s'", s);
+           return false;
+           }
+        p = skipspace(t);
+        }
+  for ( ; i < size; i++)
+      array[i] = 0;
+  return true;
+}
+
+cString cSatCableNumbers::ToString(void)
+{
+  cString s("");
+  for (int i = 0; i < size; i++) {
+      s = cString::sprintf("%s%d ", *s, array[i]);
+      }
+  return s;
+}
+
+int cSatCableNumbers::FirstDeviceIndex(int DeviceIndex) const
+{
+  if (0 <= DeviceIndex && DeviceIndex < size) {
+     if (int CableNr = array[DeviceIndex]) {
+        for (int i = 0; i < size; i++) {
+            if (i < DeviceIndex && array[i] == CableNr)
+               return i;
+            }
+        }
+     }
+  return -1;
+}
+
 // --- cNestedItem -----------------------------------------------------------
 
 cNestedItem::cNestedItem(const char *Text, bool WithSubItems)
@@ -396,6 +459,7 @@ cSetup::cSetup(void)
   CurrentVolume = MAXVOLUME;
   CurrentDolby = 0;
   InitialChannel = "";
+  DeviceBondings = "";
   InitialVolume = -1;
   ChannelsWrap = 0;
   EmergencyExit = 1;
@@ -405,6 +469,7 @@ cSetup& cSetup::operator= (const cSetup &s)
 {
   memcpy(&__BeginData__, &s.__BeginData__, (char *)&s.__EndData__ - (char *)&s.__BeginData__);
   InitialChannel = s.InitialChannel;
+  DeviceBondings = s.DeviceBondings;
   return *this;
 }
 
@@ -589,6 +654,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
   else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = Value;
   else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
+  else if (!strcasecmp(Name, "DeviceBondings"))      DeviceBondings     = Value;
   else if (!strcasecmp(Name, "ChannelsWrap"))        ChannelsWrap       = atoi(Value);
   else if (!strcasecmp(Name, "EmergencyExit"))       EmergencyExit      = atoi(Value);
   else
@@ -685,6 +751,7 @@ bool cSetup::Save(void)
   Store("CurrentDolby",       CurrentDolby);
   Store("InitialChannel",     InitialChannel);
   Store("InitialVolume",      InitialVolume);
+  Store("DeviceBondings",     DeviceBondings);
   Store("ChannelsWrap",       ChannelsWrap);
   Store("EmergencyExit",      EmergencyExit);
 
diff --git a/config.h b/config.h
index c51e3df75..73db58f00 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.34 2011/08/20 08:51:47 kls Exp $
+ * $Id: config.h 2.36 2011/12/03 14:19:52 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.21"
-#define VDRVERSNUM   10721  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.22"
+#define VDRVERSNUM   10722  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.21"
-#define APIVERSNUM   10721  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.22"
+#define APIVERSNUM   10722  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -61,6 +61,25 @@ class cSVDRPhost : public cListObject {
   bool Accepts(in_addr_t Address);
   };
 
+class cSatCableNumbers {
+private:
+  int size;
+  int *array;
+public:
+  cSatCableNumbers(int Size, const char *s = NULL);
+  ~cSatCableNumbers();
+  int Size(void) const { return size; }
+  int *Array(void) { return array; }
+  bool FromString(const char *s);
+  cString ToString(void);
+  int FirstDeviceIndex(int DeviceIndex) const;
+      ///< Returns the first device index (starting at 0) that uses the same
+      ///< sat cable number as the device with the given DeviceIndex.
+      ///< If the given device does not use the same sat cable as any other device,
+      ///< or if the resulting value would be the same as DeviceIndex,
+      ///< or if DeviceIndex is out of range, -1 is returned.
+  };
+
 template<class T> class cConfig : public cList<T> {
 private:
   char *fileName;
@@ -292,6 +311,7 @@ class cSetup : public cConfig<cSetupLine> {
   int EmergencyExit;
   int __EndData__;
   cString InitialChannel;
+  cString DeviceBondings;
   cSetup(void);
   cSetup& operator= (const cSetup &s);
   bool Load(const char *FileName);
diff --git a/cutter.c b/cutter.c
index 778302b8d..f4df7fe9f 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.8 2011/08/21 11:08:08 kls Exp $
+ * $Id: cutter.c 2.10 2011/12/04 12:55:53 kls Exp $
  */
 
 #include "cutter.h"
@@ -100,7 +100,8 @@ void cCuttingThread::Action(void)
            if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &Independent, &Length)) {
               if (FileNumber != CurrentFileNumber) {
                  fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
-                 fromFile->SetReadAhead(MEGABYTE(20));
+                 if (fromFile)
+                    fromFile->SetReadAhead(MEGABYTE(20));
                  CurrentFileNumber = FileNumber;
                  }
               if (fromFile) {
@@ -210,7 +211,7 @@ bool cCutter::Start(const char *FileName)
      cRecording Recording(FileName);
 
      cMarks FromMarks;
-     FromMarks.Load(FileName);
+     FromMarks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
      if (cMark *First = FromMarks.First())
         Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60);
 
diff --git a/device.c b/device.c
index ba098d884..0bab66cdd 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.42 2011/08/26 12:56:00 kls Exp $
+ * $Id: device.c 2.44 2011/10/16 14:36:43 kls Exp $
  */
 
 #include "device.h"
@@ -95,6 +95,8 @@ cDevice::cDevice(void)
   camSlot = NULL;
   startScrambleDetection = 0;
 
+  occupiedTimeout = 0;
+
   player = NULL;
   isPlayingVideo = false;
   ClrAvailableTracks();
@@ -638,14 +640,14 @@ const cChannel *cDevice::GetCurrentlyTunedTransponder(void) const
   return NULL;
 }
 
-bool cDevice::IsTunedToTransponder(const cChannel *Channel)
+bool cDevice::IsTunedToTransponder(const cChannel *Channel) const
 {
   return false;
 }
 
-bool cDevice::MaySwitchTransponder(void)
+bool cDevice::MaySwitchTransponder(const cChannel *Channel) const
 {
-  return !Receiving(true) && !(pidHandles[ptAudio].pid || pidHandles[ptVideo].pid || pidHandles[ptDolby].pid);
+  return time(NULL) > occupiedTimeout && !Receiving(true) && !(pidHandles[ptAudio].pid || pidHandles[ptVideo].pid || pidHandles[ptDolby].pid);
 }
 
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
@@ -786,6 +788,18 @@ void cDevice::ForceTransferMode(void)
      }
 }
 
+int cDevice::Occupied(void) const
+{
+  int Seconds = occupiedTimeout - time(NULL);
+  return Seconds > 0 ? Seconds : 0;
+}
+
+void cDevice::SetOccupied(int Seconds)
+{
+  if (Seconds >= 0)
+     occupiedTimeout = time(NULL) + min(Seconds, MAXOCCUPIEDTIMEOUT);
+}
+
 bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
   return false;
@@ -1474,6 +1488,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 int cDevice::Priority(void) const
 {
   int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
+  cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i])
          priority = max(receiver[i]->priority, priority);
@@ -1488,6 +1503,7 @@ bool cDevice::Ready(void)
 
 bool cDevice::Receiving(bool CheckAny) const
 {
+  cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i] && (CheckAny || receiver[i]->priority >= 0)) // cReceiver with priority < 0 doesn't count
          return true;
diff --git a/device.h b/device.h
index fd587a834..e2ff81263 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.27 2011/08/26 12:52:29 kls Exp $
+ * $Id: device.h 2.30 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -30,6 +30,7 @@
 #define MAXRECEIVERS       16 // the maximum number of receivers per device
 #define MAXVOLUME         255
 #define VOLUMEDELTA         5 // used to increase/decrease the volume
+#define MAXOCCUPIEDTIMEOUT 99 // max. time (in seconds) a device may be occupied
 
 enum eSetChannelResult { scrOk, scrNotAvailable, scrNoTransfer, scrFailed };
 
@@ -220,6 +221,8 @@ class cDevice : public cThread {
 
 // Channel facilities
 
+private:
+  time_t occupiedTimeout;
 protected:
   static int currentChannel;
 public:
@@ -272,12 +275,14 @@ class cDevice : public cThread {
          ///< This is not one of the channels in the global cChannels list, but rather
          ///< a local copy. The result may be NULL if the device is not tuned to any
          ///< transponder.
-  virtual bool IsTunedToTransponder(const cChannel *Channel);
+  virtual bool IsTunedToTransponder(const cChannel *Channel) const;
          ///< Returns true if this device is currently tuned to the given Channel's
          ///< transponder.
-  virtual bool MaySwitchTransponder(void);
-         ///< Returns true if it is ok to switch the transponder on this device,
-         ///< without disturbing any other activities.
+  virtual bool MaySwitchTransponder(const cChannel *Channel) const;
+         ///< Returns true if it is ok to switch to the Channel's transponder on this
+         ///< device, without disturbing any other activities. If an occupied timeout
+         ///< has been set for this device, and that timeout has not yet expired,
+         ///< this function returns false,
   bool SwitchChannel(const cChannel *Channel, bool LiveView);
          ///< Switches the device to the given Channel, initiating transfer mode
          ///< if necessary.
@@ -300,6 +305,16 @@ class cDevice : public cThread {
          ///< channel number while replaying.
   void ForceTransferMode(void);
          ///< Forces the device into transfermode for the current channel.
+  int Occupied(void) const;
+         ///< Returns the number of seconds this device is still occupied for.
+  void SetOccupied(int Seconds);
+         ///< Sets the occupied timeout for this device to the given number of
+         ///< Seconds, This can be used to tune a device to a particular transponder
+         ///< and make sure it will stay there for a certain amount of time, for
+         ///< instance to collect EPG data. This function shall only be called
+         ///< after the device has been successfully tuned to the requested transponder.
+         ///< Seconds will be silently limited to MAXOCCUPIEDTIMEOUT. Values less than
+         ///< 0 will be silently ignored.
   virtual bool HasLock(int TimeoutMs = 0);
          ///< Returns true if the device has a lock on the requested transponder.
          ///< Default is true, a specific device implementation may return false
@@ -457,7 +472,7 @@ class cDevice : public cThread {
        ///< Sets the current subtitle track to the given value.
 public:
   void ClrAvailableTracks(bool DescriptionsOnly = false, bool IdsOnly = false);
-       ///< Clears the list of currently availabe tracks. If DescriptionsOnly
+       ///< Clears the list of currently available tracks. If DescriptionsOnly
        ///< is true, only the track descriptions will be cleared. With IdsOnly
        ///< set to true only the ids will be cleared. IdsOnly is only taken
        ///< into account if DescriptionsOnly is false.
@@ -650,10 +665,10 @@ class cDevice : public cThread {
        ///< Returns true if the device itself or any of the file handles in
        ///< Poller is ready for further action.
        ///< If TimeoutMs is not zero, the device will wait up to the given number
-       ///< of milleseconds before returning in case it can't accept any data.
+       ///< of milliseconds before returning in case it can't accept any data.
   virtual bool Flush(int TimeoutMs = 0);
        ///< Returns true if the device's output buffers are empty, i. e. any
-       ///< data which was bufferd so far has been processed.
+       ///< data which was buffered so far has been processed.
        ///< If TimeoutMs is not zero, the device will wait up to the given
        ///< number of milliseconds before returning in case there is still
        ///< data in the buffers.
@@ -697,7 +712,7 @@ class cDevice : public cThread {
 // Receiver facilities
 
 private:
-  cMutex mutexReceiver;
+  mutable cMutex mutexReceiver;
   cReceiver *receiver[MAXRECEIVERS];
 public:
   int Priority(void) const;
@@ -726,7 +741,7 @@ class cDevice : public cThread {
        ///< Detaches the given receiver from this device.
   void DetachAll(int Pid);
        ///< Detaches all receivers from this device for this pid.
-  void DetachAllReceivers(void);
+  virtual void DetachAllReceivers(void);
        ///< Detaches all receivers from this device.
   };
 
diff --git a/diseqc.c b/diseqc.c
index d44629979..54fb72031 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.5 2011/08/06 10:32:18 kls Exp $
+ * $Id: diseqc.c 2.9 2011/09/17 14:13:31 kls Exp $
  */
 
 #include "diseqc.h"
@@ -12,6 +12,81 @@
 #include "sources.h"
 #include "thread.h"
 
+static bool ParseDeviceNumbers(const char *s, int &Devices)
+{
+  if (*s && s[strlen(s) - 1] == ':') {
+     const char *p = s;
+     while (*p && *p != ':') {
+           char *t = NULL;
+           int d = strtol(p, &t, 10);
+           p = t;
+           if (0 < d && d < 31)
+              Devices |= (1 << d - 1);
+           else {
+              esyslog("ERROR: invalid device number %d in '%s'", d, s);
+              return false;
+              }
+           }
+     }
+  return true;
+}
+
+// --- cScr ------------------------------------------------------------------
+
+cScr::cScr(void)
+{
+  devices = 0;
+  channel = -1;
+  userBand = 0;
+  pin = -1;
+  used = false;
+}
+
+bool cScr::Parse(const char *s)
+{
+  if (!ParseDeviceNumbers(s, devices))
+     return false;
+  if (devices)
+     return true;
+  bool result = false;
+  int fields = sscanf(s, "%d %u %d", &channel, &userBand, &pin);
+  if (fields == 2 || fields == 3) {
+     if (channel >= 0 && channel < 8) {
+        result = true;
+        if (fields == 3 && (pin < 0 || pin > 255)) {
+           esyslog("Error: invalid SCR pin '%d'", pin);
+           result = false;
+           }
+        }
+     else
+        esyslog("Error: invalid SCR channel '%d'", channel);
+     }
+  return result;
+}
+
+// --- cScrs -----------------------------------------------------------------
+
+cScrs Scrs;
+
+cScr *cScrs::GetUnused(int Device)
+{
+  cMutexLock MutexLock(&mutex);
+  int Devices = 0;
+  for (cScr *p = First(); p; p = Next(p)) {
+      if (p->Devices()) {
+         Devices = p->Devices();
+         continue;
+         }
+      if (Devices && !(Devices & (1 << Device - 1)))
+         continue;
+      if (!p->Used()) {
+        p->SetUsed(true);
+        return p;
+        }
+      }
+  return NULL;
+}
+
 // --- cDiseqc ---------------------------------------------------------------
 
 cDiseqc::cDiseqc(void)
@@ -21,9 +96,9 @@ cDiseqc::cDiseqc(void)
   slof = 0;
   polarization = 0;
   lof = 0;
+  scrBank = -1;
   commands = NULL;
   parsing = false;
-  numCodes = 0;
 }
 
 cDiseqc::~cDiseqc()
@@ -33,23 +108,12 @@ cDiseqc::~cDiseqc()
 
 bool cDiseqc::Parse(const char *s)
 {
+  if (!ParseDeviceNumbers(s, devices))
+     return false;
+  if (devices)
+     return true;
   bool result = false;
   char *sourcebuf = NULL;
-  if (*s && s[strlen(s) - 1] == ':') {
-     const char *p = s;
-     while (*p && *p != ':') {
-           char *t = NULL;
-           int d = strtol(p, &t, 10);
-           p = t;
-           if (0 < d && d < 32)
-              devices |= (1 << d - 1);
-           else {
-              esyslog("ERROR: invalid device number %d in '%s'", d, s);
-              return false;
-              }
-           }
-     return true;
-     }
   int fields = sscanf(s, "%a[^ ] %d %c %d %a[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
   if (fields == 4)
      commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument results in an empty string
@@ -60,7 +124,7 @@ bool cDiseqc::Parse(const char *s)
         if (polarization == 'V' || polarization == 'H' || polarization == 'L' || polarization == 'R') {
            parsing = true;
            const char *CurrentAction = NULL;
-           while (Execute(&CurrentAction) != daNone)
+           while (Execute(&CurrentAction, NULL, NULL, NULL, NULL) != daNone)
                  ;
            parsing = false;
            result = !commands || !*CurrentAction;
@@ -75,6 +139,31 @@ bool cDiseqc::Parse(const char *s)
   return result;
 }
 
+uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const
+{
+  uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
+  if (t < 1024 && Scr->Channel() >= 0 && Scr->Channel() < 8) {
+     Codes[3] = t >> 8 | (t == 0 ? 0 : scrBank << 2) | Scr->Channel() << 5;
+     Codes[4] = t;
+     if (t)
+        return (t + 350) * 4 - SatFrequency;
+     }
+  return 0;
+}
+
+int cDiseqc::SetScrPin(const cScr *Scr, uint8_t *Codes) const
+{
+  if (Scr->Pin() >= 0 && Scr->Pin() <= 255) {
+     Codes[2] = 0x5C;
+     Codes[5] = Scr->Pin();
+     return 6;
+     }
+  else {
+     Codes[2] = 0x5A;
+     return 5;
+     }
+}
+
 const char *cDiseqc::Wait(const char *s) const
 {
   char *p = NULL;
@@ -89,7 +178,25 @@ const char *cDiseqc::Wait(const char *s) const
   return NULL;
 }
 
-const char *cDiseqc::Codes(const char *s) const
+const char *cDiseqc::GetScrBank(const char *s) const
+{
+  char *p = NULL;
+  errno = 0;
+  int n = strtol(s, &p, 10);
+  if (!errno && p != s && n >= 0 && n < 8) {
+     if (parsing) {
+        if (scrBank < 0)
+           scrBank = n;
+        else
+           esyslog("ERROR: more than one scr bank in '%s'", s - 1);
+        }
+     return p;
+     }
+  esyslog("ERROR: more than one scr bank in '%s'", s - 1);
+  return NULL;
+}
+
+const char *cDiseqc::GetCodes(const char *s, uchar *Codes, uint8_t *MaxCodes) const
 {
   const char *e = strchr(s, ']');
   if (e) {
@@ -101,9 +208,13 @@ const char *cDiseqc::Codes(const char *s) const
               char *p;
               int n = strtol(t, &p, 16);
               if (!errno && p != t && 0 <= n && n <= 255) {
-                 if (!parsing) {
-                    codes[NumCodes++] = uchar(n);
-                    numCodes = NumCodes;
+                 if (Codes) {
+                    if (NumCodes < *MaxCodes)
+                       Codes[NumCodes++] = uchar(n);
+                    else {
+                       esyslog("ERROR: too many codes in code sequence '%s'", s - 1);
+                       return NULL;
+                       }
                     }
                  t = skipspace(p);
                  }
@@ -117,6 +228,8 @@ const char *cDiseqc::Codes(const char *s) const
               return NULL;
               }
            }
+     if (MaxCodes)
+        *MaxCodes = NumCodes;
      return e + 1;
      }
   else
@@ -124,7 +237,7 @@ const char *cDiseqc::Codes(const char *s) const
   return NULL;
 }
 
-cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction) const
+cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const
 {
   if (!*CurrentAction)
      *CurrentAction = commands;
@@ -138,7 +251,16 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction) const
           case 'A': return daMiniA;
           case 'B': return daMiniB;
           case 'W': *CurrentAction = Wait(*CurrentAction); break;
-          case '[': *CurrentAction = Codes(*CurrentAction); return *CurrentAction ? daCodes : daNone;
+          case 'S': *CurrentAction = GetScrBank(*CurrentAction); break;
+          case '[': *CurrentAction = GetCodes(*CurrentAction, Codes, MaxCodes);
+                    if (*CurrentAction) {
+                       if (Scr && Frequency) {
+                          *Frequency = SetScrFrequency(*Frequency, Scr, Codes);
+                          *MaxCodes = SetScrPin(Scr, Codes);
+                          }
+                       return daCodes;
+                       }
+                    break;
           default: return daNone;
           }
         }
@@ -149,7 +271,7 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction) const
 
 cDiseqcs Diseqcs;
 
-const cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization) const
+const cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization, const cScr **Scr) const
 {
   int Devices = 0;
   for (const cDiseqc *p = First(); p; p = Next(p)) {
@@ -159,8 +281,16 @@ const cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polariz
          }
       if (Devices && !(Devices & (1 << Device - 1)))
          continue;
-      if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization))
+      if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization)) {
+         if (p->IsScr() && Scr && !*Scr) {
+            *Scr = Scrs.GetUnused(Device);
+            if (*Scr)
+               dsyslog("SCR %d assigned to device %d", (*Scr)->Channel(), Device);
+            else
+               esyslog("ERROR: no free SCR entry available for device %d", Device);
+            }
          return p;
+         }
       }
   return NULL;
 }
diff --git a/diseqc.conf b/diseqc.conf
index c9ab3ad3a..2895c43e9 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -18,6 +18,7 @@
 #   V         voltage high (18V)
 #   A         mini A
 #   B         mini B
+#   Sn        Satellite channel routing code sequence for bank n follows
 #   Wnn       wait nn milliseconds (nn may be any positive integer number)
 #   [xx ...]  hex code sequence (max. 6)
 #
@@ -75,3 +76,15 @@ S13.0E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S19.2E  99999 H 10560 t v
 # S19.2E  12110 V 11080 t v
 # S19.2E  99999 V 10720 t v
+#
+# SCR (Satellite Channel Routing):
+#
+# S19.2E  11700 V  9750  t V W10 S0 [E0 10 5A 00 00] W10 v
+# S19.2E  99999 V 10600  t V W10 S1 [E0 10 5A 00 00] W10 v
+# S19.2E  11700 H  9750  t V W10 S2 [E0 10 5A 00 00] W10 v
+# S19.2E  99999 H 10600  t V W10 S3 [E0 10 5A 00 00] W10 v
+#
+# S13.0E  11700 V  9750  t V W10 S4 [E0 10 5A 00 00] W10 v
+# S13.0E  99999 V 10600  t V W10 S5 [E0 10 5A 00 00] W10 v
+# S13.0E  11700 H  9750  t V W10 S6 [E0 10 5A 00 00] W10 v
+# S13.0E  99999 H 10600  t V W10 S7 [E0 10 5A 00 00] W10 v
diff --git a/diseqc.h b/diseqc.h
index 413ed4d99..6e9058c22 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,13 +4,41 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 2.2 2011/05/22 10:35:38 kls Exp $
+ * $Id: diseqc.h 2.5 2011/09/17 13:15:17 kls Exp $
  */
 
 #ifndef __DISEQC_H
 #define __DISEQC_H
 
 #include "config.h"
+#include "thread.h"
+
+class cScr : public cListObject {
+private:
+  int devices;
+  int channel;
+  uint userBand;
+  int pin;
+  bool used;
+public:
+  cScr(void);
+  bool Parse(const char *s);
+  int Devices(void) const { return devices; }
+  int Channel(void) const { return channel; }
+  uint UserBand(void) const { return userBand; }
+  int Pin(void) const { return pin; }
+  bool Used(void) const { return used; }
+  void SetUsed(bool Used) { used = Used; }
+  };
+
+class cScrs : public cConfig<cScr> {
+private:
+  cMutex mutex;
+public:
+  cScr *GetUnused(int Device);
+  };
+
+extern cScrs Scrs;
 
 class cDiseqc : public cListObject {
 public:
@@ -22,6 +50,7 @@ class cDiseqc : public cListObject {
     daVoltage18,
     daMiniA,
     daMiniB,
+    daScr,
     daCodes,
     };
   enum { MaxDiseqcCodes = 6 };
@@ -31,36 +60,53 @@ class cDiseqc : public cListObject {
   int slof;
   char polarization;
   int lof;
+  mutable int scrBank;
   char *commands;
   bool parsing;
-  mutable uchar codes[MaxDiseqcCodes];
-  mutable int numCodes;
+  uint SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const;
+  int SetScrPin(const cScr *Scr, uint8_t *Codes) const;
   const char *Wait(const char *s) const;
-  const char *Codes(const char *s) const;
+  const char *GetScrBank(const char *s) const;
+  const char *GetCodes(const char *s, uchar *Codes = NULL, uint8_t *MaxCodes = NULL) const;
 public:
   cDiseqc(void);
   ~cDiseqc();
   bool Parse(const char *s);
-  eDiseqcActions Execute(const char **CurrentAction) const;
-      // Parses the DiSEqC commands and returns the appropriate action code
-      // with every call. CurrentAction must be the address of a character pointer,
-      // which is initialized to NULL. This pointer is used internally while parsing
-      // the commands and shall not be modified once Execute() has been called with
-      // it. Call Execute() repeatedly (always providing the same CurrentAction pointer)
-      // until it returns daNone. After a successful execution of all commands
-      // *CurrentAction points to the value 0x00.
+  eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const;
+      ///< Parses the DiSEqC commands and returns the appropriate action code
+      ///< with every call. CurrentAction must be the address of a character pointer,
+      ///< which is initialized to NULL. This pointer is used internally while parsing
+      ///< the commands and shall not be modified once Execute() has been called with
+      ///< it. Call Execute() repeatedly (always providing the same CurrentAction pointer)
+      ///< until it returns daNone. After a successful execution of all commands
+      ///< *CurrentAction points to the value 0x00.
+      ///< If the current action consists of sending code bytes to the device, those
+      ///< bytes will be copied into Codes. MaxCodes must be initialized to the maximum
+      ///< number of bytes Codes can handle, and will be set to the actual number of
+      ///< bytes copied to Codes upon return.
+      ///< If this DiSEqC entry requires SCR, the given Scr will be used. This must
+      ///< be a pointer returned from a previous call to cDiseqcs::Get().
+      ///< Frequency must be the frequency the tuner will be tuned to, and will be
+      ///< set to the proper SCR frequency upon return (if SCR is used).
   int Devices(void) const { return devices; }
   int Source(void) const { return source; }
   int Slof(void) const { return slof; }
   char Polarization(void) const { return polarization; }
   int Lof(void) const { return lof; }
+  bool IsScr() const { return scrBank >= 0; }
   const char *Commands(void) const { return commands; }
-  const uchar *Codes(int &NumCodes) const { NumCodes = numCodes; return numCodes ? codes : NULL; }
   };
 
 class cDiseqcs : public cConfig<cDiseqc> {
 public:
-  const cDiseqc *Get(int Device, int Source, int Frequency, char Polarization) const;
+  const cDiseqc *Get(int Device, int Source, int Frequency, char Polarization, const cScr **Scr) const;
+      ///< Selects a DiSEqC entry suitable for the given Device and tuning parameters.
+      ///< If this DiSEqC entry requires SCR and the given *Scr is NULL
+      ///< a free one will be selected from the Scrs and a pointer to that will
+      ///< be returned in Scr. The caller shall memorize that pointer and reuse it in
+      ///< subsequent calls.
+      ///< Scr may be NULL for checking whether there is any DiSEqC entry for the
+      ///< given transponder.
   };
 
 extern cDiseqcs Diseqcs;
diff --git a/dvbdevice.c b/dvbdevice.c
index a97f27492..163fce366 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.43 2011/08/26 12:57:34 kls Exp $
+ * $Id: dvbdevice.c 2.48 2011/12/03 15:24:27 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -32,6 +32,8 @@
 #define ATSC_TUNE_TIMEOUT  9000 //ms
 #define ATSC_LOCK_TIMEOUT  2000 //ms
 
+#define SCR_RANDOM_TIMEOUT  500 // ms (add random value up to this when tuning SCR device to avoid lockups)
+
 // --- DVB Parameter Maps ----------------------------------------------------
 
 const tDvbParameterMap InversionValues[] = {
@@ -257,8 +259,9 @@ bool cDvbTransponderParameters::Parse(const char *s)
 
 class cDvbTuner : public cThread {
 private:
+  static cMutex bondMutex;
   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
-  int device;
+  const cDvbDevice *device;
   int fd_frontend;
   int adapter, frontend;
   uint32_t subsystemId;
@@ -267,28 +270,41 @@ class cDvbTuner : public cThread {
   time_t lastTimeoutReport;
   fe_delivery_system frontendType;
   cChannel channel;
-  const char *diseqcCommands;
+  const cDiseqc *lastDiseqc;
+  const cScr *scr;
   eTunerStatus tunerStatus;
   cMutex mutex;
   cCondVar locked;
   cCondVar newSet;
+  cDvbTuner *bondedTuner;
+  bool bondedMaster;
+  bool bondedMasterFailed;
+  cString GetBondingParams(const cChannel *Channel = NULL) const;
   void ClearEventQueue(void) const;
   bool GetFrontendStatus(fe_status_t &Status) const;
+  void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
+  void ResetToneAndVoltage(void);
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
+  cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
   virtual ~cDvbTuner();
+  bool Bond(cDvbTuner *Tuner);
+  void UnBond(void);
+  bool BondingOk(const cChannel *Channel, bool ConsiderOccupied = false) const;
+  cDvbTuner *GetBondedMaster(void);
   const cChannel *GetTransponder(void) const { return &channel; }
   uint32_t SubsystemId(void) const { return subsystemId; }
   bool IsTunedTo(const cChannel *Channel) const;
-  void Set(const cChannel *Channel);
+  void SetChannel(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
   int GetSignalStrength(void) const;
   int GetSignalQuality(void) const;
   };
 
-cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
+cMutex cDvbTuner::bondMutex;
+
+cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
 {
   device = Device;
   fd_frontend = Fd_Frontend;
@@ -299,10 +315,14 @@ cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_
   tuneTimeout = 0;
   lockTimeout = 0;
   lastTimeoutReport = 0;
-  diseqcCommands = NULL;
+  lastDiseqc = NULL;
+  scr = NULL;
   tunerStatus = tsIdle;
+  bondedTuner = NULL;
+  bondedMaster = false;
+  bondedMasterFailed = false;
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
-     CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
+     ResetToneAndVoltage(); // must explicitly turn on LNB power
   SetDescription("tuner on frontend %d/%d", adapter, frontend);
   Start();
 }
@@ -313,6 +333,116 @@ cDvbTuner::~cDvbTuner()
   newSet.Broadcast();
   locked.Broadcast();
   Cancel(3);
+  UnBond();
+  /* looks like this irritates the SCR switch, so let's leave it out for now
+  if (lastDiseqc && lastDiseqc->IsScr()) {
+     unsigned int Frequency = 0;
+     ExecuteDiseqc(lastDiseqc, &Frequency);
+     }
+  */
+}
+
+bool cDvbTuner::Bond(cDvbTuner *Tuner)
+{
+  cMutexLock MutexLock(&bondMutex);
+  if (!bondedTuner) {
+     if ((frontendType == SYS_DVBS || frontendType == SYS_DVBS2) && (Tuner->frontendType == SYS_DVBS || Tuner->frontendType == SYS_DVBS2)) {
+        ResetToneAndVoltage();
+        bondedMaster = false; // makes sure we don't disturb an existing master
+        bondedTuner = Tuner->bondedTuner ? Tuner->bondedTuner : Tuner;
+        Tuner->bondedTuner = this;
+        dsyslog("tuner %d/%d bonded with tuner %d/%d", adapter, frontend, bondedTuner->adapter, bondedTuner->frontend);
+        return true;
+        }
+     else
+        esyslog("ERROR: can't bond tuner %d/%d with tuner %d/%d (only DVB-S(2) tuners can be bonded)", adapter, frontend, Tuner->adapter, Tuner->frontend);
+     }
+  else
+     esyslog("ERROR: tuner %d/%d already bonded with tuner %d/%d, can't bond with tuner %d/%d", adapter, frontend, bondedTuner->adapter, bondedTuner->frontend, Tuner->adapter, Tuner->frontend);
+  return false;
+}
+
+void cDvbTuner::UnBond(void)
+{
+  cMutexLock MutexLock(&bondMutex);
+  if (cDvbTuner *t = bondedTuner) {
+     dsyslog("tuner %d/%d unbonded from tuner %d/%d", adapter, frontend, bondedTuner->adapter, bondedTuner->frontend);
+     while (t->bondedTuner != this)
+           t = t->bondedTuner;
+     if (t == bondedTuner)
+        t->bondedTuner = NULL;
+     else
+        t->bondedTuner = bondedTuner;
+     bondedMaster = false; // another one will automatically become master whenever necessary
+     bondedTuner = NULL;
+     }
+}
+
+cString cDvbTuner::GetBondingParams(const cChannel *Channel) const
+{
+  if (!Channel)
+     Channel = &channel;
+  cDvbTransponderParameters dtp(Channel->Parameters());
+  if (Setup.DiSEqC) {
+     if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL))
+        return diseqc->Commands();
+     }
+  else {
+     bool ToneOff = Channel->Frequency() < (unsigned int)Setup.LnbSLOF;
+     bool VoltOff = dtp.Polarization() == 'V' || dtp.Polarization() == 'R';
+     return cString::sprintf("%c %c", ToneOff ? 't' : 'T', VoltOff ? 'v' : 'V');
+     }
+  return "";
+}
+
+bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
+{
+  cMutexLock MutexLock(&bondMutex);
+  if (cDvbTuner *t = bondedTuner) {
+     cString BondingParams = GetBondingParams(Channel);
+     do {
+        if (t->device->Receiving() || t->tunerStatus != tsIdle && (t->device == cDevice::ActualDevice() || ConsiderOccupied && t->device->Occupied())) {
+           if (strcmp(BondingParams, t->GetBondingParams()) != 0)
+              return false;
+           }
+        t = t->bondedTuner;
+        } while (t != bondedTuner);
+     }
+  return true;
+}
+
+cDvbTuner *cDvbTuner::GetBondedMaster(void)
+{
+  if (!bondedTuner)
+     return this; // an unbonded tuner is always "master"
+  cMutexLock MutexLock(&bondMutex);
+  if (bondedMaster) {
+     if (!bondedMasterFailed)
+        return this;
+     else
+        bondedMaster = false;
+     }
+  // This tuner is bonded, but it's not the master, so let's see if there is a master at all:
+  if (cDvbTuner *t = bondedTuner) {
+     while (t != this) {
+           if (t->bondedMaster)
+              return t;
+           t = t->bondedTuner;
+           }
+     }
+  // None of the other bonded tuners is master, so make this one the master:
+  cDvbTuner *t = this;
+  if (bondedMasterFailed) {
+     // This one has failed, so switch to the next one:
+     t = bondedTuner;
+     t->bondedMasterFailed = false;
+     cMutexLock MutexLock(&t->mutex);
+     t->channel = channel;
+     t->tunerStatus = tsSet;
+     }
+  t->bondedMaster = true;
+  dsyslog("tuner %d/%d is now bonded master", t->adapter, t->frontend);
+  return t;
 }
 
 bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
@@ -325,14 +455,34 @@ bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
   return strcmp(channel.Parameters(), Channel->Parameters()) == 0;
 }
 
-void cDvbTuner::Set(const cChannel *Channel)
+void cDvbTuner::SetChannel(const cChannel *Channel)
 {
-  cMutexLock MutexLock(&mutex);
-  if (!IsTunedTo(Channel))
-     tunerStatus = tsSet;
-  channel = *Channel;
-  lastTimeoutReport = 0;
-  newSet.Broadcast();
+  if (Channel) {
+     if (bondedTuner) {
+        cMutexLock MutexLock(&bondMutex);
+        cDvbTuner *BondedMaster = GetBondedMaster();
+        if (BondedMaster == this) {
+           if (strcmp(GetBondingParams(Channel), GetBondingParams()) != 0) {
+              // switching to a completely different band, so set all others to idle:
+              for (cDvbTuner *t = bondedTuner; t && t != this; t = t->bondedTuner)
+                  t->SetChannel(NULL);
+              }
+           }
+        else if (!BondedMaster->device->Receiving())
+           BondedMaster->SetChannel(Channel);
+        }
+     cMutexLock MutexLock(&mutex);
+     if (!IsTunedTo(Channel))
+        tunerStatus = tsSet;
+     channel = *Channel;
+     lastTimeoutReport = 0;
+     newSet.Broadcast();
+     }
+  else {
+     cMutexLock MutexLock(&mutex);
+     tunerStatus = tsIdle;
+     ResetToneAndVoltage();
+     }
 }
 
 bool cDvbTuner::Locked(int TimeoutMs)
@@ -482,6 +632,36 @@ static unsigned int FrequencyToHz(unsigned int f)
   return f;
 }
 
+void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
+{
+  struct dvb_diseqc_master_cmd cmd;
+  const char *CurrentAction = NULL;
+  for (;;) {
+      cmd.msg_len = sizeof(cmd.msg);
+      cDiseqc::eDiseqcActions da = Diseqc->Execute(&CurrentAction, cmd.msg, &cmd.msg_len, scr, Frequency);
+      if (da == cDiseqc::daNone)
+         break;
+      switch (da) {
+        case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+        case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+        case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+        case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+        case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+        case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+        case cDiseqc::daCodes:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); break;
+        default: esyslog("ERROR: unknown diseqc command %d", da);
+        }
+      }
+  if (scr)
+     ResetToneAndVoltage(); // makes sure we don't block the bus!
+}
+
+void cDvbTuner::ResetToneAndVoltage(void)
+{
+  CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13));
+  CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
+}
+
 bool cDvbTuner::SetFrontend(void)
 {
 #define MAXFRONTENDCMDS 16
@@ -509,36 +689,18 @@ bool cDvbTuner::SetFrontend(void)
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
      unsigned int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
-        const cDiseqc *diseqc = Diseqcs.Get(device, channel.Source(), channel.Frequency(), dtp.Polarization());
-        if (diseqc) {
-           if (diseqc->Commands() && (!diseqcCommands || strcmp(diseqcCommands, diseqc->Commands()) != 0)) {
-              cDiseqc::eDiseqcActions da;
-              for (const char *CurrentAction = NULL; (da = diseqc->Execute(&CurrentAction)) != cDiseqc::daNone; ) {
-                  switch (da) {
-                    case cDiseqc::daNone:      break;
-                    case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
-                    case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
-                    case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
-                    case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
-                    case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
-                    case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
-                    case cDiseqc::daCodes: {
-                         int n = 0;
-                         const uchar *codes = diseqc->Codes(n);
-                         if (codes) {
-                            struct dvb_diseqc_master_cmd cmd;
-                            cmd.msg_len = min(n, int(sizeof(cmd.msg)));
-                            memcpy(cmd.msg, codes, cmd.msg_len);
-                            CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd));
-                            }
-                         }
-                         break;
-                    default: esyslog("ERROR: unknown diseqc command %d", da);
-                    }
-                  }
-              diseqcCommands = diseqc->Commands();
-              }
+        if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
            frequency -= diseqc->Lof();
+           if (diseqc != lastDiseqc || diseqc->IsScr()) {
+              if (GetBondedMaster() == this) {
+                 ExecuteDiseqc(diseqc, &frequency);
+                 if (frequency == 0)
+                    return false;
+                 }
+              else
+                 ResetToneAndVoltage();
+              lastDiseqc = diseqc;
+              }
            }
         else {
            esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
@@ -555,7 +717,11 @@ bool cDvbTuner::SetFrontend(void)
            frequency -= Setup.LnbFrequHi;
            tone = SEC_TONE_ON;
            }
-        int volt = (dtp.Polarization() == 'v' || dtp.Polarization() == 'V' || dtp.Polarization() == 'r' || dtp.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+        int volt = (dtp.Polarization() == 'V' || dtp.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+        if (GetBondedMaster() != this) {
+           tone = SEC_TONE_OFF;
+           volt = SEC_VOLTAGE_13;
+           }
         CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
         CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
         }
@@ -652,22 +818,25 @@ void cDvbTuner::Action(void)
                break;
           case tsSet:
                tunerStatus = SetFrontend() ? tsTuned : tsIdle;
-               Timer.Set(tuneTimeout);
+               Timer.Set(tuneTimeout + (scr ? rand() % SCR_RANDOM_TIMEOUT : 0));
                continue;
           case tsTuned:
                if (Timer.TimedOut()) {
                   tunerStatus = tsSet;
-                  diseqcCommands = NULL;
+                  lastDiseqc = NULL;
                   if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
                      isyslog("frontend %d/%d timed out while tuning to channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
                      }
+                  cMutexLock MutexLock(&bondMutex);
+                  if (bondedTuner && bondedMaster)
+                     bondedMasterFailed = true; // give an other tuner a chance in case the sat cable was disconnected
                   continue;
                   }
           case tsLocked:
                if (Status & FE_REINIT) {
                   tunerStatus = tsSet;
-                  diseqcCommands = NULL;
+                  lastDiseqc = NULL;
                   isyslog("frontend %d/%d was reinitialized", adapter, frontend);
                   lastTimeoutReport = 0;
                   continue;
@@ -757,6 +926,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
 // --- cDvbDevice ------------------------------------------------------------
 
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
+cMutex cDvbDevice::bondMutex;
 
 const char *DeliverySystems[] = {
   "UNDEFINED",
@@ -786,6 +956,8 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
   dvbTuner = NULL;
   frontendType = SYS_UNDEFINED;
   numProvidedSystems = 0;
+  bondedDevice = NULL;
+  needsDetachBondedReceivers = false;
 
   // Devices that are present on all card types:
 
@@ -835,7 +1007,7 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
         else
            p = (char *)"unknown modulations";
         isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], p, frontendInfo.name);
-        dvbTuner = new cDvbTuner(CardIndex() + 1, fd_frontend, adapter, frontend, frontendType);
+        dvbTuner = new cDvbTuner(this, fd_frontend, adapter, frontend, frontendType);
         }
      }
   else
@@ -849,6 +1021,7 @@ cDvbDevice::~cDvbDevice()
   StopSectionHandler();
   delete dvbTuner;
   delete ciAdapter;
+  UnBond();
   // We're not explicitly closing any device files here, since this sometimes
   // caused segfaults. Besides, the program is about to terminate anyway...
 }
@@ -940,6 +1113,104 @@ bool cDvbDevice::Ready(void)
   return true;
 }
 
+bool cDvbDevice::BondDevices(const char *Bondings)
+{
+  UnBondDevices();
+  if (Bondings) {
+     cSatCableNumbers SatCableNumbers(MAXDEVICES, Bondings);
+     for (int i = 0; i < cDevice::NumDevices(); i++) {
+         int d = SatCableNumbers.FirstDeviceIndex(i);
+         if (d >= 0) {
+            int ErrorDevice = 0;
+            if (cDevice *Device1 = cDevice::GetDevice(i)) {
+               if (cDevice *Device2 = cDevice::GetDevice(d)) {
+                  if (cDvbDevice *DvbDevice1 = dynamic_cast<cDvbDevice *>(Device1)) {
+                     if (cDvbDevice *DvbDevice2 = dynamic_cast<cDvbDevice *>(Device2)) {
+                        if (!DvbDevice2->Bond(DvbDevice1))
+                           return false; // Bond() has already logged the error
+                        }
+                     else
+                        ErrorDevice = d + 1;
+                     }
+                  else
+                     ErrorDevice = i + 1;
+                  if (ErrorDevice) {
+                     esyslog("ERROR: device '%d' in device bondings '%s' is not a cDvbDevice", ErrorDevice, Bondings);
+                     return false;
+                     }
+                  }
+               else
+                  ErrorDevice = d + 1;
+               }
+            else
+               ErrorDevice = i + 1;
+            if (ErrorDevice) {
+               esyslog("ERROR: unknown device '%d' in device bondings '%s'", ErrorDevice, Bondings);
+               return false;
+               }
+            }
+         }
+     }
+  return true;
+}
+
+void cDvbDevice::UnBondDevices(void)
+{
+  for (int i = 0; i < cDevice::NumDevices(); i++) {
+      if (cDvbDevice *d = dynamic_cast<cDvbDevice *>(cDevice::GetDevice(i)))
+         d->UnBond();
+      }
+}
+
+bool cDvbDevice::Bond(cDvbDevice *Device)
+{
+  cMutexLock MutexLock(&bondMutex);
+  if (!bondedDevice) {
+     if (Device != this) {
+        if ((frontendType == SYS_DVBS || frontendType == SYS_DVBS2) && (Device->frontendType == SYS_DVBS || Device->frontendType == SYS_DVBS2)) {
+           if (dvbTuner && Device->dvbTuner && dvbTuner->Bond(Device->dvbTuner)) {
+              bondedDevice = Device->bondedDevice ? Device->bondedDevice : Device;
+              Device->bondedDevice = this;
+              dsyslog("device %d bonded with device %d", CardIndex() + 1, bondedDevice->CardIndex() + 1);
+              return true;
+              }
+           }
+        else
+           esyslog("ERROR: can't bond device %d with device %d (only DVB-S(2) devices can be bonded)", CardIndex() + 1, Device->CardIndex() + 1);
+        }
+     else
+        esyslog("ERROR: can't bond device %d with itself", CardIndex() + 1);
+     }
+  else
+     esyslog("ERROR: device %d already bonded with device %d, can't bond with device %d", CardIndex() + 1, bondedDevice->CardIndex() + 1, Device->CardIndex() + 1);
+  return false;
+}
+
+void cDvbDevice::UnBond(void)
+{
+  cMutexLock MutexLock(&bondMutex);
+  if (cDvbDevice *d = bondedDevice) {
+     if (dvbTuner)
+        dvbTuner->UnBond();
+     dsyslog("device %d unbonded from device %d", CardIndex() + 1, bondedDevice->CardIndex() + 1);
+     while (d->bondedDevice != this)
+           d = d->bondedDevice;
+     if (d == bondedDevice)
+        d->bondedDevice = NULL;
+     else
+        d->bondedDevice = bondedDevice;
+     bondedDevice = NULL;
+     }
+}
+
+bool cDvbDevice::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
+{
+  cMutexLock MutexLock(&bondMutex);
+  if (bondedDevice)
+     return dvbTuner && dvbTuner->BondingOk(Channel, ConsiderOccupied);
+  return true;
+}
+
 bool cDvbDevice::HasCi(void)
 {
   return ciAdapter;
@@ -1042,7 +1313,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
      dtp.Modulation() == PSK_8    && !(frontendInfo.caps & FE_CAN_TURBO_FEC) && dtp.System() == SYS_DVBS) // "turbo fec" is a non standard FEC used by North American broadcasters - this is a best guess to determine this condition
      return false; // requires modulation system which frontend doesn't provide
   if (!cSource::IsSat(Channel->Source()) ||
-     !Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization()))
+     (!Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL)))
      return DeviceHooksProvidesTransponder(Channel);
   return false;
 }
@@ -1052,28 +1323,44 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool result = false;
   bool hasPriority = Priority < 0 || Priority > this->Priority();
   bool needsDetachReceivers = false;
+  needsDetachBondedReceivers = false;
 
   if (dvbTuner && ProvidesTransponder(Channel)) {
      result = hasPriority;
-     if (Priority >= 0 && Receiving(true)) {
-        if (dvbTuner->IsTunedTo(Channel)) {
-           if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
-              if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
-                 if (CamSlot()->CanDecrypt(Channel))
+     if (Priority >= 0) {
+        if (Receiving(true)) {
+           if (dvbTuner->IsTunedTo(Channel)) {
+              if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
+                 if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                    if (CamSlot()->CanDecrypt(Channel))
+                       result = true;
+                    else
+                       needsDetachReceivers = true;
+                    }
+                 else if (!IsPrimaryDevice())
                     result = true;
                  else
-                    needsDetachReceivers = true;
+                    result = Priority >= Setup.PrimaryLimit;
                  }
-              else if (!IsPrimaryDevice())
-                 result = true;
               else
-                 result = Priority >= Setup.PrimaryLimit;
+                 result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
               }
            else
-              result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
+              needsDetachReceivers = true;
+           }
+        if (result) {
+           if (!BondingOk(Channel)) {
+              // This device is bonded, so we need to check the priorities of the others:
+              for (cDvbDevice *d = bondedDevice; d && d != this; d = d->bondedDevice) {
+                  if (d->Priority() >= Priority) {
+                     result = false;
+                     break;
+                     }
+                  }
+              needsDetachBondedReceivers = true;
+              needsDetachReceivers = true;
+              }
            }
-        else
-           needsDetachReceivers = true;
         }
      }
   if (NeedsDetachReceivers)
@@ -1106,15 +1393,20 @@ const cChannel *cDvbDevice::GetCurrentlyTunedTransponder(void) const
   return dvbTuner ? dvbTuner->GetTransponder() : NULL;
 }
 
-bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
+bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel) const
 {
   return dvbTuner ? dvbTuner->IsTunedTo(Channel) : false;
 }
 
+bool cDvbDevice::MaySwitchTransponder(const cChannel *Channel) const
+{
+  return BondingOk(Channel, true) && cDevice::MaySwitchTransponder(Channel);
+}
+
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
   if (dvbTuner)
-     dvbTuner->Set(Channel);
+     dvbTuner->SetChannel(Channel);
   return true;
 }
 
@@ -1156,6 +1448,17 @@ bool cDvbDevice::GetTSPacket(uchar *&Data)
   return false;
 }
 
+void cDvbDevice::DetachAllReceivers(void)
+{
+  cMutexLock MutexLock(&bondMutex);
+  cDvbDevice *d = this;
+  do {
+     d->cDevice::DetachAllReceivers();
+     d = d->bondedDevice;
+     } while (d && d != this && needsDetachBondedReceivers);
+  needsDetachBondedReceivers = false;
+}
+
 // --- cDvbDeviceProbe -------------------------------------------------------
 
 cList<cDvbDeviceProbe> DvbDeviceProbes;
diff --git a/dvbdevice.h b/dvbdevice.h
index e1842b7d0..2072ab201 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.16 2011/08/26 12:55:45 kls Exp $
+ * $Id: dvbdevice.h 2.18 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -122,10 +122,40 @@ class cDvbDevice : public cDevice {
   int numProvidedSystems;
   fe_delivery_system frontendType;
   int fd_dvr, fd_ca;
+  static cMutex bondMutex;
+  cDvbDevice *bondedDevice;
+  mutable bool needsDetachBondedReceivers;
 public:
   cDvbDevice(int Adapter, int Frontend);
   virtual ~cDvbDevice();
   virtual bool Ready(void);
+  static bool BondDevices(const char *Bondings);
+       ///< Bonds the devices as defined in the given Bondings string.
+       ///< A bonding is a sequence of device numbers (starting at 1),
+       ///< separated by '+' characters. Several bondings are separated by
+       ///< commas, as in "1+2,3+4+5".
+       ///< Returns false if an error occurred.
+  static void UnBondDevices(void);
+       ///< Unbonds all devices.
+  bool Bond(cDvbDevice *Device);
+       ///< Bonds this device with the given Device, making both of them use
+       ///< the same satellite cable and LNB. Only DVB-S(2) devices can be
+       ///< bonded. When this function is called, the calling device must
+       ///< not be bonded to any other device. The given Device, however,
+       ///< may already be bonded to an other device. That way several devices
+       ///< can be bonded together.
+       ///< Returns true if the bonding was successful.
+  void UnBond(void);
+       ///< Removes this device from any bonding it might have with other
+       ///< devices. If this device is not bonded with any other device,
+       ///< nothing happens.
+  bool BondingOk(const cChannel *Channel, bool ConsiderOccupied = false) const;
+       ///< Returns true if this device is either not bonded to any other
+       ///< device, or the given Channel is on the same satellite, polarization
+       ///< and band as those the bonded devices are tuned to (if any).
+       ///< If ConsiderOccupied is true, any bonded devices that are currently
+       ///< occupied but not otherwise receiving will cause this function to
+       ///< return false.
 
 // Common Interface facilities:
 
@@ -145,7 +175,8 @@ class cDvbDevice : public cDevice {
   virtual int SignalStrength(void) const;
   virtual int SignalQuality(void) const;
   virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
-  virtual bool IsTunedToTransponder(const cChannel *Channel);
+  virtual bool IsTunedToTransponder(const cChannel *Channel) const;
+  virtual bool MaySwitchTransponder(const cChannel *Channel) const;
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 public:
@@ -172,7 +203,7 @@ class cDvbDevice : public cDevice {
 protected:
   static int setTransferModeForDolbyDigital;
 public:
-  static void SetTransferModeForDolbyDigital(int Mode); // needs to be here for backwards compatibilty
+  static void SetTransferModeForDolbyDigital(int Mode); // needs to be here for backwards compatibility
          ///< Controls how the DVB device handles Transfer Mode when replaying
          ///< Dolby Digital audio.
          ///< 0 = don't set "audio bypass" in driver/firmware, don't force Transfer Mode
@@ -187,6 +218,7 @@ class cDvbDevice : public cDevice {
   virtual bool OpenDvr(void);
   virtual void CloseDvr(void);
   virtual bool GetTSPacket(uchar *&Data);
+  virtual void DetachAllReceivers(void);
   };
 
 // A plugin that implements a DVB device derived from cDvbDevice needs to create
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 43d072d43..272950fa5 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.18 2011/08/13 13:33:00 kls Exp $
+ * $Id: dvbsubtitle.c 2.20 2011/09/18 11:23:15 kls Exp $
  */
 
 
@@ -15,13 +15,18 @@
 #define __STDC_FORMAT_MACROS // Required for format specifiers
 #include <inttypes.h>
 #include "device.h"
+#include "libsi/si.h"
 
-#define PAGE_COMPOSITION_SEGMENT   0x10
-#define REGION_COMPOSITION_SEGMENT 0x11
-#define CLUT_DEFINITION_SEGMENT    0x12
-#define OBJECT_DATA_SEGMENT        0x13
-#define DISPLAY_DEFINITION_SEGMENT 0x14
-#define END_OF_DISPLAY_SET_SEGMENT 0x80
+//#define FINISHPAGE_HACK
+
+#define PAGE_COMPOSITION_SEGMENT    0x10
+#define REGION_COMPOSITION_SEGMENT  0x11
+#define CLUT_DEFINITION_SEGMENT     0x12
+#define OBJECT_DATA_SEGMENT         0x13
+#define DISPLAY_DEFINITION_SEGMENT  0x14
+#define DISPARITY_SIGNALING_SEGMENT 0x15 // DVB BlueBook A156
+#define END_OF_DISPLAY_SET_SEGMENT  0x80
+#define STUFFING_SEGMENT            0xFF
 
 // Set these to 'true' for debug output:
 static bool DebugConverter = false;
@@ -61,8 +66,68 @@ cSubtitleClut::cSubtitleClut(int ClutId)
 ,palette4(4)
 ,palette8(8)
 {
+  int a = 0, r = 0, g = 0, b = 0;
   clutId = ClutId;
   version = -1;
+  // ETSI EN 300 743 10.3: 4-entry CLUT default contents
+  palette2.SetColor(0, ArgbToColor(  0,   0,   0,   0));
+  palette2.SetColor(1, ArgbToColor(255, 255, 255, 255));
+  palette2.SetColor(2, ArgbToColor(255,   0,   0,   0));
+  palette2.SetColor(3, ArgbToColor(255, 127, 127, 127));
+  // ETSI EN 300 743 10.2: 16-entry CLUT default contents
+  palette4.SetColor(0, ArgbToColor(0, 0, 0, 0));
+  for (int i = 1; i < 16; ++i) {
+      if (i < 8) {
+         r = (i & 1) ? 255 : 0;
+         g = (i & 2) ? 255 : 0;
+         b = (i & 4) ? 255 : 0;
+         }
+      else {
+         r = (i & 1) ? 127 : 0;
+         g = (i & 2) ? 127 : 0;
+         b = (i & 4) ? 127 : 0;
+         }
+      palette4.SetColor(i, ArgbToColor(255, r, g, b));
+      }
+  // ETSI EN 300 743 10.1: 256-entry CLUT default contents
+  palette8.SetColor(0, ArgbToColor(0, 0, 0, 0));
+  for (int i = 1; i < 256; ++i) {
+      if (i < 8) {
+         r = (i & 1) ? 255 : 0;
+         g = (i & 2) ? 255 : 0;
+         b = (i & 4) ? 255 : 0;
+         a = 63;
+         }
+      else {
+         switch (i & 0x88) {
+           case 0x00:
+                r = ((i & 1) ? 85 : 0) + ((i & 0x10) ? 170 : 0);
+                g = ((i & 2) ? 85 : 0) + ((i & 0x20) ? 170 : 0);
+                b = ((i & 4) ? 85 : 0) + ((i & 0x40) ? 170 : 0);
+                a = 255;
+                break;
+           case 0x08:
+                r = ((i & 1) ? 85 : 0) + ((i & 0x10) ? 170 : 0);
+                g = ((i & 2) ? 85 : 0) + ((i & 0x20) ? 170 : 0);
+                b = ((i & 4) ? 85 : 0) + ((i & 0x40) ? 170 : 0);
+                a = 127;
+                break;
+           case 0x80:
+                r = 127 + ((i & 1) ? 43 : 0) + ((i & 0x10) ? 85 : 0);
+                g = 127 + ((i & 2) ? 43 : 0) + ((i & 0x20) ? 85 : 0);
+                b = 127 + ((i & 4) ? 43 : 0) + ((i & 0x40) ? 85 : 0);
+                a = 255;
+                break;
+           case 0x88:
+                r = ((i & 1) ? 43 : 0) + ((i & 0x10) ? 85 : 0);
+                g = ((i & 2) ? 43 : 0) + ((i & 0x20) ? 85 : 0);
+                b = ((i & 4) ? 43 : 0) + ((i & 0x40) ? 85 : 0);
+                a = 255;
+                break;
+            }
+         }
+      palette8.SetColor(i, ArgbToColor(a, r, g, b));
+      }
 }
 
 void cSubtitleClut::SetColor(int Bpp, int Index, tColor Color)
@@ -94,29 +159,33 @@ class cSubtitleObject : public cListObject {
   int version;
   int codingMethod;
   bool nonModifyingColorFlag;
-  int nibblePos;
-  uchar backgroundColor;
-  uchar foregroundColor;
+  uchar backgroundPixelCode;
+  uchar foregroundPixelCode;
   int providerFlag;
   int px;
   int py;
   cBitmap *bitmap;
+  char textData[Utf8BufSize(256)]; // number of character codes is an 8-bit field
   void DrawLine(int x, int y, tIndex Index, int Length);
-  uchar Get2Bits(const uchar *Data, int &Index);
-  uchar Get4Bits(const uchar *Data, int &Index);
-  bool Decode2BppCodeString(const uchar *Data, int &Index, int&x, int y);
-  bool Decode4BppCodeString(const uchar *Data, int &Index, int&x, int y);
-  bool Decode8BppCodeString(const uchar *Data, int &Index, int&x, int y);
+  bool Decode2BppCodeString(cBitStream *bs, int&x, int y, const uint8_t *MapTable);
+  bool Decode4BppCodeString(cBitStream *bs, int&x, int y, const uint8_t *MapTable);
+  bool Decode8BppCodeString(cBitStream *bs, int&x, int y);
 public:
   cSubtitleObject(int ObjectId, cBitmap *Bitmap);
   int ObjectId(void) { return objectId; }
   int Version(void) { return version; }
   int CodingMethod(void) { return codingMethod; }
+  uchar BackgroundPixelCode(void) { return backgroundPixelCode; }
+  uchar ForegroundPixelCode(void) { return foregroundPixelCode; }
+  const char *TextData(void) { return &textData[0]; }
+  int X(void) { return px; }
+  int Y(void) { return py; }
   bool NonModifyingColorFlag(void) { return nonModifyingColorFlag; }
+  void DecodeCharacterString(const uchar *Data, int NumberOfCodes);
   void DecodeSubBlock(const uchar *Data, int Length, bool Even);
   void SetVersion(int Version) { version = Version; }
-  void SetBackgroundColor(uchar BackgroundColor) { backgroundColor = BackgroundColor; }
-  void SetForegroundColor(uchar ForegroundColor) { foregroundColor = ForegroundColor; }
+  void SetBackgroundPixelCode(uchar BackgroundPixelCode) { backgroundPixelCode = BackgroundPixelCode; }
+  void SetForegroundPixelCode(uchar ForegroundPixelCode) { foregroundPixelCode = ForegroundPixelCode; }
   void SetNonModifyingColorFlag(bool NonModifyingColorFlag) { nonModifyingColorFlag = NonModifyingColorFlag; }
   void SetCodingMethod(int CodingMethod) { codingMethod = CodingMethod; }
   void SetPosition(int x, int y) { px = x; py = y; }
@@ -129,59 +198,105 @@ cSubtitleObject::cSubtitleObject(int ObjectId, cBitmap *Bitmap)
   version = -1;
   codingMethod = -1;
   nonModifyingColorFlag = false;
-  nibblePos = 0;
-  backgroundColor = 0;
-  foregroundColor = 0;
+  backgroundPixelCode = 0;
+  foregroundPixelCode = 0;
   providerFlag = -1;
   px = py = 0;
   bitmap = Bitmap;
+  memset(textData, 0, sizeof(textData));
+}
+
+void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes)
+{
+  if (NumberOfCodes > 0) {
+     bool singleByte;
+     const uchar *from = &Data[1];
+     int len = NumberOfCodes * 2 - 1;
+     cCharSetConv conv(SI::getCharacterTable(from, len, &singleByte));
+     if (singleByte) {
+        char txt[NumberOfCodes + 1];
+        char *p = txt;
+        for (int i = 2; i < NumberOfCodes; ++i) {
+            char c = Data[i * 2 + 1] & 0xFF;
+            if (c == 0)
+               break;
+            if (' ' <= c && c <= '~' || c == '\n' || 0xA0 <= c)
+               *(p++) = c;
+            else if (c == 0x8A)
+               *(p++) = '\n';
+            }
+        *p = 0;
+        const char *s = conv.Convert(txt);
+        Utf8Strn0Cpy(textData, s, Utf8StrLen(s));
+        }
+     else {
+        // TODO: add proper multibyte support for "UTF-16", "EUC-KR", "GB2312", "GBK", "UTF-8"
+        }
+     }
 }
 
 void cSubtitleObject::DecodeSubBlock(const uchar *Data, int Length, bool Even)
 {
   int x = 0;
   int y = Even ? 0 : 1;
-  for (int index = 0; index < Length; ) {
-      switch (Data[index++]) {
-        case 0x10: {
-             nibblePos = 8;
-             while (Decode2BppCodeString(Data, index, x, y) && index < Length)
-                   ;
-             if (!nibblePos)
-                index++;
-             break;
-             }
-        case 0x11: {
-             nibblePos = 4;
-             while (Decode4BppCodeString(Data, index, x, y) && index < Length)
-                   ;
-             if (!nibblePos)
-                index++;
-             break;
-             }
-        case 0x12:
-             while (Decode8BppCodeString(Data, index, x, y) && index < Length)
-                   ;
-             break;
-        case 0x20: //TODO
-             dbgobjects("sub block 2 to 4 map\n");
-             index += 4;
-             break;
-        case 0x21: //TODO
-             dbgobjects("sub block 2 to 8 map\n");
-             index += 4;
-             break;
-        case 0x22: //TODO
-             dbgobjects("sub block 4 to 8 map\n");
-             index += 16;
-             break;
-        case 0xF0:
-             x = 0;
-             y += 2;
-             break;
-        default: dbgobjects("unknown sub block %s %d\n", __FUNCTION__, __LINE__);
+  uint8_t map2to4[ 4] = { 0x00, 0x07, 0x08, 0x0F };
+  uint8_t map2to8[ 4] = { 0x00, 0x77, 0x88, 0xFF };
+  uint8_t map4to8[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF };
+  const uint8_t *mapTable = NULL;
+  cBitStream bs(Data, Length * 8);
+  while (!bs.IsEOF()) {
+        switch (bs.GetBits(8)) {
+          case 0x10:
+               dbgobjects("2-bit / pixel code string\n");
+               switch (bitmap->Bpp()) {
+                 case 8:  mapTable = map2to8; break;
+                 case 4:  mapTable = map2to4; break;
+                 default: mapTable = NULL;    break;
+                 }
+               while (Decode2BppCodeString(&bs, x, y, mapTable) && !bs.IsEOF())
+                     ;
+               bs.ByteAlign();
+               break;
+          case 0x11:
+               dbgobjects("4-bit / pixel code string\n");
+               switch (bitmap->Bpp()) {
+                 case 8:  mapTable = map4to8; break;
+                 default: mapTable = NULL;    break;
+                 }
+               while (Decode4BppCodeString(&bs, x, y, mapTable) && !bs.IsEOF())
+                     ;
+               bs.ByteAlign();
+               break;
+          case 0x12:
+               dbgobjects("8-bit / pixel code string\n");
+               while (Decode8BppCodeString(&bs, x, y) && !bs.IsEOF())
+                     ;
+               break;
+          case 0x20:
+               dbgobjects("sub block 2 to 4 map\n");
+               map2to4[0] = bs.GetBits(4);
+               map2to4[1] = bs.GetBits(4);
+               map2to4[2] = bs.GetBits(4);
+               map2to4[3] = bs.GetBits(4);
+               break;
+          case 0x21:
+               dbgobjects("sub block 2 to 8 map\n");
+               for (int i = 0; i < 4; ++i)
+                   map2to8[i] = bs.GetBits(8);
+               break;
+          case 0x22:
+               dbgobjects("sub block 4 to 8 map\n");
+               for (int i = 0; i < 16; ++i)
+                   map4to8[i] = bs.GetBits(8);
+               break;
+          case 0xF0:
+               dbgobjects("end of object line\n");
+               x = 0;
+               y += 2;
+               break;
+          default: dbgobjects("unknown sub block %s %d\n", __FUNCTION__, __LINE__);
+          }
         }
-      }
 }
 
 void cSubtitleObject::DrawLine(int x, int y, tIndex Index, int Length)
@@ -194,136 +309,110 @@ void cSubtitleObject::DrawLine(int x, int y, tIndex Index, int Length)
       bitmap->SetIndex(pos, y, Index);
 }
 
-uchar cSubtitleObject::Get2Bits(const uchar *Data, int &Index)
-{
-  uchar result = Data[Index];
-  if (!nibblePos) {
-     Index++;
-     nibblePos = 8;
-     }
-  nibblePos -= 2;
-  return (result >> nibblePos) & 0x03;
-}
-
-uchar cSubtitleObject::Get4Bits(const uchar *Data, int &Index)
-{
-  uchar result = Data[Index];
-  if (!nibblePos) {
-     Index++;
-     nibblePos = 4;
-     }
-  else {
-     result >>= 4;
-     nibblePos -= 4;
-     }
-  return result & 0x0F;
-}
-
-bool cSubtitleObject::Decode2BppCodeString(const uchar *Data, int &Index, int &x, int y)
+bool cSubtitleObject::Decode2BppCodeString(cBitStream *bs, int &x, int y, const uint8_t *MapTable)
 {
   int rl = 0;
   int color = 0;
-  uchar code = Get2Bits(Data, Index);
+  uchar code = bs->GetBits(2);
   if (code) {
      color = code;
      rl = 1;
      }
+  else if (bs->GetBit()) { // switch_1
+     rl = bs->GetBits(3) + 3;
+     color = bs->GetBits(2);
+     }
+  else if (bs->GetBit()) // switch_2
+     rl = 1; //color 0
   else {
-     code = Get2Bits(Data, Index);
-     if (code & 2) { // switch_1
-        rl = ((code & 1) << 2) + Get2Bits(Data, Index) + 3;
-        color = Get2Bits(Data, Index);
-        }
-     else if (code & 1)
-        rl = 1; //color 0
-     else {
-        code = Get2Bits(Data, Index);
-        switch (code & 3) { //switch_3
-          case 0:
-               return false;
-          case 1:
-               rl = 2; //color 0
-               break;
-          case 2:
-               rl = (Get2Bits(Data, Index) << 2) + Get2Bits(Data, Index) + 12;
-               color = Get2Bits(Data, Index);
-               break;
-          case 3:
-               rl = (Get2Bits(Data, Index) << 6) + (Get2Bits(Data, Index) << 4) + (Get2Bits(Data, Index) << 2) + Get2Bits(Data, Index) + 29;
-               color = Get2Bits(Data, Index);
-               break;
-          default: ;
-          }
-        }
+     switch (bs->GetBits(2)) { // switch_3
+       case 0:
+            return false;
+       case 1:
+            rl = 2; //color 0
+            break;
+       case 2:
+            rl = bs->GetBits(4) + 12;
+            color = bs->GetBits(2);
+            break;
+       case 3:
+            rl = bs->GetBits(8) + 29;
+            color = bs->GetBits(2);
+            break;
+       default: ;
+       }
      }
+  if (MapTable)
+     color = MapTable[color];
   DrawLine(x, y, color, rl);
   x += rl;
   return true;
 }
 
-bool cSubtitleObject::Decode4BppCodeString(const uchar *Data, int &Index, int &x, int y)
+bool cSubtitleObject::Decode4BppCodeString(cBitStream *bs, int &x, int y, const uint8_t *MapTable)
 {
   int rl = 0;
   int color = 0;
-  uchar code = Get4Bits(Data, Index);
+  uchar code = bs->GetBits(4);
   if (code) {
      color = code;
      rl = 1;
      }
+  else if (bs->GetBit() == 0) { // switch_1
+     code = bs->GetBits(3);
+     if (code)
+        rl = code + 2; //color 0
+     else
+        return false;
+     }
+  else if (bs->GetBit() == 0) { // switch_2
+     rl = bs->GetBits(2) + 4;
+     color = bs->GetBits(4);
+     }
   else {
-     code = Get4Bits(Data, Index);
-     if (code & 8) { // switch_1
-        if (code & 4) { //switch_2
-           switch (code & 3) { //switch_3
-             case 0: // color 0
-                  rl = 1;
-                  break;
-             case 1: // color 0
-                  rl = 2;
-                  break;
-             case 2:
-                  rl = Get4Bits(Data, Index) + 9;
-                  color = Get4Bits(Data, Index);
-                  break;
-             case 3:
-                  rl = (Get4Bits(Data, Index) << 4) + Get4Bits(Data, Index) + 25;
-                  color = Get4Bits(Data, Index);
-                  break;
-             default: ;
-             }
-           }
-        else {
-           rl = (code & 3) + 4;
-           color = Get4Bits(Data, Index);
-           }
-        }
-     else { // color 0
-        if (!code)
-           return false;
-        rl = code + 2;
-        }
+     switch (bs->GetBits(2)) { // switch_3
+       case 0: // color 0
+            rl = 1;
+            break;
+       case 1: // color 0
+            rl = 2;
+            break;
+       case 2:
+            rl = bs->GetBits(4) + 9;
+            color = bs->GetBits(4);
+            break;
+       case 3:
+            rl = bs->GetBits(8) + 25;
+            color = bs->GetBits(4);
+            break;
+       }
      }
+  if (MapTable)
+     color = MapTable[color];
   DrawLine(x, y, color, rl);
   x += rl;
   return true;
 }
 
-bool cSubtitleObject::Decode8BppCodeString(const uchar *Data, int &Index, int &x, int y)
+bool cSubtitleObject::Decode8BppCodeString(cBitStream *bs, int &x, int y)
 {
   int rl = 0;
   int color = 0;
-  uchar code = Data[Index++];
+  uchar code = bs->GetBits(8);
   if (code) {
      color = code;
      rl = 1;
      }
+  else if (bs->GetBit()) {
+     rl = bs->GetBits(7);
+     color = bs->GetBits(8);
+     }
   else {
-     code = Data[Index++];
-     rl = code & 0x63;
-     if (code & 0x80)
-        color = Data[Index++];
-     else if (!rl)
-        return false; //else color 0
+     code = bs->GetBits(7);
+     if (code)
+        rl = code; // color 0
+     else
+        return false;
      }
   DrawLine(x, y, color, rl);
   x += rl;
@@ -340,6 +429,7 @@ class cSubtitleRegion : public cListObject, public cBitmap {
   int horizontalAddress;
   int verticalAddress;
   int level;
+  int lineHeight;
   cList<cSubtitleObject> objects;
 public:
   cSubtitleRegion(int RegionId);
@@ -358,6 +448,7 @@ class cSubtitleRegion : public cListObject, public cBitmap {
   void SetDepth(int Depth);
   void SetHorizontalAddress(int HorizontalAddress) { horizontalAddress = HorizontalAddress; }
   void SetVerticalAddress(int VerticalAddress) { verticalAddress = VerticalAddress; }
+  void UpdateTextData(cSubtitleClut *Clut);
   };
 
 cSubtitleRegion::cSubtitleRegion(int RegionId)
@@ -369,6 +460,7 @@ cSubtitleRegion::cSubtitleRegion(int RegionId)
   horizontalAddress = 0;
   verticalAddress = 0;
   level = 0;
+  lineHeight = 26; // configurable subtitling font size
 }
 
 void cSubtitleRegion::FillRegion(tIndex Index)
@@ -394,6 +486,22 @@ cSubtitleObject *cSubtitleRegion::GetObjectById(int ObjectId, bool New)
   return result;
 }
 
+void cSubtitleRegion::UpdateTextData(cSubtitleClut *Clut)
+{
+  const cPalette *palette = Clut ? Clut->GetPalette(Depth()) : NULL;
+  for (cSubtitleObject *so = objects.First(); so && palette; so = objects.Next(so)) {
+      if (Utf8StrLen(so->TextData()) > 0) {
+         const cFont *font = cFont::GetFont(fontOsd);
+         cBitmap *tmp = new cBitmap(font->Width(so->TextData()), font->Height(), Depth());
+         double factor = (double)lineHeight / font->Height();
+         tmp->DrawText(0, 0, so->TextData(), palette->Color(so->ForegroundPixelCode()), palette->Color(so->BackgroundPixelCode()), font);
+         tmp = tmp->Scaled(factor, factor, true);
+         DrawBitmap(so->X(), so->Y(), *tmp);
+         DELETENULL(tmp);
+         }
+      }
+}
+
 void cSubtitleRegion::SetLevel(int Level)
 {
   if (Level > 0 && Level < 4)
@@ -887,7 +995,7 @@ void cDvbSubtitleConverter::SetOsdData(void)
   double VideoAspect;
   cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect);
   cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect);
-  if (OsdWidth == displayWidth && OsdHeight == displayHeight) {
+  if (OsdWidth == displayWidth && OsdHeight == displayHeight || VideoWidth == 0) {
      osdFactorX = osdFactorY = 1.0;
      osdDeltaX = osdDeltaY = 0;
      }
@@ -907,12 +1015,15 @@ bool cDvbSubtitleConverter::AssertOsd(void)
 
 int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
 {
-  if (Length > 5 && Data[0] == 0x0F) {
-     int segmentLength = (Data[4] << 8) + Data[5] + 6;
-     if (segmentLength > Length)
+  cBitStream bs(Data, Length * 8);
+  if (Length > 5 && bs.GetBits(8) == 0x0F) { // sync byte
+     int segmentType = bs.GetBits(8);
+     if (segmentType == STUFFING_SEGMENT)
+        return -1;
+     int pageId = bs.GetBits(16);
+     int segmentLength = bs.GetBits(16);
+     if (!bs.SetLength(bs.Index() + segmentLength * 8))
         return -1;
-     int segmentType = Data[1];
-     int pageId = (Data[2] << 8) + Data[3];
      cDvbSubtitlePage *page = NULL;
      LOCK_THREAD;
      for (cDvbSubtitlePage *sp = pages->First(); sp; sp = pages->Next(sp)) {
@@ -931,154 +1042,170 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
      switch (segmentType) {
        case PAGE_COMPOSITION_SEGMENT: {
             dbgsegments("PAGE_COMPOSITION_SEGMENT\n");
-            int pageVersion = (Data[6 + 1] & 0xF0) >> 4;
+            int pageTimeout = bs.GetBits(8);
+            int pageVersion = bs.GetBits(4);
             if (pageVersion == page->Version())
                break; // no update
             page->SetVersion(pageVersion);
-            page->SetTimeout(Data[6]);
-            page->SetState((Data[6 + 1] & 0x0C) >> 2);
+            page->SetTimeout(pageTimeout);
+            page->SetState(bs.GetBits(2));
             page->regions.Clear();
+            bs.SkipBits(2); // reserved
             dbgpages("Update page id %d version %d pts %"PRId64" timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
-            for (int i = 6 + 2; i < segmentLength; i += 6) {
-                cSubtitleRegion *region = page->GetRegionById(Data[i], true);
-                region->SetHorizontalAddress((Data[i + 2] << 8) + Data[i + 3]);
-                region->SetVerticalAddress((Data[i + 4] << 8) + Data[i + 5]);
-                }
+            while (!bs.IsEOF()) {
+                  cSubtitleRegion *region = page->GetRegionById(bs.GetBits(8), true);
+                  bs.SkipBits(8); // reserved
+                  region->SetHorizontalAddress(bs.GetBits(16));
+                  region->SetVerticalAddress(bs.GetBits(16));
+                  }
             break;
             }
        case REGION_COMPOSITION_SEGMENT: {
             dbgsegments("REGION_COMPOSITION_SEGMENT\n");
-            cSubtitleRegion *region = page->GetRegionById(Data[6]);
+            cSubtitleRegion *region = page->GetRegionById(bs.GetBits(8));
             if (!region)
                break;
-            int regionVersion = (Data[6 + 1] & 0xF0) >> 4;
+            int regionVersion = bs.GetBits(4);
             if (regionVersion == region->Version())
                break; // no update
             region->SetVersion(regionVersion);
-            bool regionFillFlag = (Data[6 + 1] & 0x08) >> 3;
-            int regionWidth = (Data[6 + 2] << 8) | Data[6 + 3];
+            bool regionFillFlag = bs.GetBit();
+            bs.SkipBits(3); // reserved
+            int regionWidth = bs.GetBits(16);
             if (regionWidth < 1)
                regionWidth = 1;
-            int regionHeight = (Data[6 + 4] << 8) | Data[6 + 5];
+            int regionHeight = bs.GetBits(16);
             if (regionHeight < 1)
                regionHeight = 1;
             region->SetSize(regionWidth, regionHeight);
-            region->SetLevel((Data[6 + 6] & 0xE0) >> 5);
-            region->SetDepth((Data[6 + 6] & 0x1C) >> 2);
-            region->SetClutId(Data[6 + 7]);
+            region->SetLevel(bs.GetBits(3));
+            region->SetDepth(bs.GetBits(3));
+            bs.SkipBits(2); // reserved
+            region->SetClutId(bs.GetBits(8));
             dbgregions("Region pageId %d id %d version %d fill %d width %d height %d level %d depth %d clutId %d\n", pageId, region->RegionId(), region->Version(), regionFillFlag, regionWidth, regionHeight, region->Level(), region->Depth(), region->ClutId());
+            int region8bitPixelCode = bs.GetBits(8);
+            int region4bitPixelCode = bs.GetBits(4);
+            int region2bitPixelCode = bs.GetBits(2);
+            bs.SkipBits(2); // reserved
             if (regionFillFlag) {
                switch (region->Bpp()) {
-                 case 2: region->FillRegion((Data[6 + 9] & 0x0C) >> 2); break;
-                 case 4: region->FillRegion((Data[6 + 9] & 0xF0) >> 4); break;
-                 case 8: region->FillRegion(Data[6 + 8]); break;
+                 case 2: region->FillRegion(region8bitPixelCode); break;
+                 case 4: region->FillRegion(region4bitPixelCode); break;
+                 case 8: region->FillRegion(region2bitPixelCode); break;
                  default: dbgregions("unknown bpp %d (%s %d)\n", region->Bpp(), __FUNCTION__, __LINE__);
                  }
                }
-            for (int i = 6 + 10; i < segmentLength; i += 6) {
-                cSubtitleObject *object = region->GetObjectById((Data[i] << 8) | Data[i + 1], true);
-                int objectType = (Data[i + 2] & 0xC0) >> 6;
-                object->SetCodingMethod(objectType);
-                object->SetProviderFlag((Data[i + 2] & 0x30) >> 4);
-                int objectHorizontalPosition = ((Data[i + 2] & 0x0F) << 8) | Data[i + 3];
-                int objectVerticalPosition = ((Data[i + 4] & 0x0F) << 8) | Data[i + 5];
-                object->SetPosition(objectHorizontalPosition, objectVerticalPosition);
-                if (objectType == 0x01 || objectType == 0x02) {
-                   object->SetForegroundColor(Data[i + 6]);
-                   object->SetBackgroundColor(Data[i + 7]);
-                   i += 2;
-                   }
-                }
+            while (!bs.IsEOF()) {
+                  cSubtitleObject *object = region->GetObjectById(bs.GetBits(16), true);
+                  int objectType = bs.GetBits(2);
+                  object->SetCodingMethod(objectType);
+                  object->SetProviderFlag(bs.GetBits(2));
+                  int objectHorizontalPosition = bs.GetBits(12);
+                  bs.SkipBits(4); // reserved
+                  int objectVerticalPosition = bs.GetBits(12);
+                  object->SetPosition(objectHorizontalPosition, objectVerticalPosition);
+                  if (objectType == 0x01 || objectType == 0x02) {
+                     object->SetForegroundPixelCode(bs.GetBits(8));
+                     object->SetBackgroundPixelCode(bs.GetBits(8));
+                     }
+                  }
             break;
             }
        case CLUT_DEFINITION_SEGMENT: {
             dbgsegments("CLUT_DEFINITION_SEGMENT\n");
-            cSubtitleClut *clut =  page->GetClutById(Data[6], true);
-            int clutVersion = (Data[6 + 1] & 0xF0) >> 4;
+            cSubtitleClut *clut =  page->GetClutById(bs.GetBits(8), true);
+            int clutVersion = bs.GetBits(4);
             if (clutVersion == clut->Version())
                break; // no update
             clut->SetVersion(clutVersion);
+            bs.SkipBits(4); // reserved
             dbgcluts("Clut pageId %d id %d version %d\n", pageId, clut->ClutId(), clut->Version());
-            for (int i = 6 + 2; i < segmentLength; i += 2) {
-                uchar clutEntryId = Data[i];
-                bool fullRangeFlag = Data[i + 1] & 1;
-                uchar yval;
-                uchar crval;
-                uchar cbval;
-                uchar tval;
-                if (fullRangeFlag) {
-                   yval  = Data[i + 2];
-                   crval = Data[i + 3];
-                   cbval = Data[i + 4];
-                   tval  = Data[i + 5];
-                   }
-                else {
-                   yval   =   Data[i + 2] & 0xFC;
-                   crval  =  (Data[i + 2] & 0x03) << 6;
-                   crval |=  (Data[i + 3] & 0xC0) >> 2;
-                   cbval  =  (Data[i + 3] & 0x3C) << 2;
-                   tval   =  (Data[i + 3] & 0x03) << 6;
-                   }
-                tColor value = 0;
-                if (yval) {
-                   value = yuv2rgb(yval, cbval, crval);
-                   value |= ((10 - (clutEntryId ? Setup.SubtitleFgTransparency : Setup.SubtitleBgTransparency)) * (255 - tval) / 10) << 24;
-                   }
-                int EntryFlags = Data[i + 1];
-                dbgcluts("%2d %d %d %d %08X\n", clutEntryId, (EntryFlags & 0x80) ? 2 : 0, (EntryFlags & 0x40) ? 4 : 0, (EntryFlags & 0x20) ? 8 : 0, value);
-                if ((EntryFlags & 0x80) != 0)
-                   clut->SetColor(2, clutEntryId, value);
-                if ((EntryFlags & 0x40) != 0)
-                   clut->SetColor(4, clutEntryId, value);
-                if ((EntryFlags & 0x20) != 0)
-                   clut->SetColor(8, clutEntryId, value);
-                i += fullRangeFlag ? 4 : 2;
-                }
+            while (!bs.IsEOF()) {
+                  uchar clutEntryId = bs.GetBits(8);
+                  bool entryClut2Flag = bs.GetBit();
+                  bool entryClut4Flag = bs.GetBit();
+                  bool entryClut8Flag = bs.GetBit();
+                  bs.SkipBits(4); // reserved
+                  uchar yval;
+                  uchar crval;
+                  uchar cbval;
+                  uchar tval;
+                  if (bs.GetBit()) { // full_range_flag
+                     yval  = bs.GetBits(8);
+                     crval = bs.GetBits(8);
+                     cbval = bs.GetBits(8);
+                     tval  = bs.GetBits(8);
+                     }
+                  else {
+                     yval  = bs.GetBits(6) << 2;
+                     crval = bs.GetBits(4) << 4;
+                     cbval = bs.GetBits(4) << 4;
+                     tval  = bs.GetBits(2) << 6;
+                     }
+                  tColor value = 0;
+                  if (yval) {
+                     value = yuv2rgb(yval, cbval, crval);
+                     value |= ((10 - (clutEntryId ? Setup.SubtitleFgTransparency : Setup.SubtitleBgTransparency)) * (255 - tval) / 10) << 24;
+                     }
+                  dbgcluts("%2d %d %d %d %08X\n", clutEntryId, entryClut2Flag ? 2 : 0, entryClut4Flag ? 4 : 0, entryClut8Flag ? 8 : 0, value);
+                  if (entryClut2Flag)
+                     clut->SetColor(2, clutEntryId, value);
+                  if (entryClut4Flag)
+                     clut->SetColor(4, clutEntryId, value);
+                  if (entryClut8Flag)
+                     clut->SetColor(8, clutEntryId, value);
+                  }
             dbgcluts("\n");
             page->UpdateRegionPalette(clut);
             break;
             }
        case OBJECT_DATA_SEGMENT: {
             dbgsegments("OBJECT_DATA_SEGMENT\n");
-            cSubtitleObject *object = page->GetObjectById((Data[6] << 8) | Data[6 + 1]);
+            cSubtitleObject *object = page->GetObjectById(bs.GetBits(16));
             if (!object)
                break;
-            int objectVersion = (Data[6 + 2] & 0xF0) >> 4;
+            int objectVersion = bs.GetBits(4);
             if (objectVersion == object->Version())
                break; // no update
             object->SetVersion(objectVersion);
-            int codingMethod = (Data[6 + 2] & 0x0C) >> 2;
-            object->SetNonModifyingColorFlag(Data[6 + 2] & 0x01);
+            int codingMethod = bs.GetBits(2);
+            object->SetNonModifyingColorFlag(bs.GetBit());
+            bs.SkipBit(); // reserved
             dbgobjects("Object pageId %d id %d version %d method %d modify %d\n", pageId, object->ObjectId(), object->Version(), object->CodingMethod(), object->NonModifyingColorFlag());
             if (codingMethod == 0) { // coding of pixels
-               int i = 6 + 3;
-               int topFieldLength = (Data[i] << 8) | Data[i + 1];
-               int bottomFieldLength = (Data[i + 2] << 8) | Data[i + 3];
-               object->DecodeSubBlock(Data + i + 4, topFieldLength, true);
+               int topFieldLength = bs.GetBits(16);
+               int bottomFieldLength = bs.GetBits(16);
+               object->DecodeSubBlock(bs.GetData(), topFieldLength, true);
                if (bottomFieldLength)
-                  object->DecodeSubBlock(Data + i + 4 + topFieldLength, bottomFieldLength, false);
+                  object->DecodeSubBlock(bs.GetData() + topFieldLength, bottomFieldLength, false);
                else
-                  object->DecodeSubBlock(Data + i + 4, topFieldLength, false);
+                  object->DecodeSubBlock(bs.GetData(), topFieldLength, false);
+               bs.WordAlign();
                }
             else if (codingMethod == 1) { // coded as a string of characters
-               //TODO implement textual subtitles
+               int numberOfCodes = bs.GetBits(8);
+               object->DecodeCharacterString(bs.GetData(), numberOfCodes);
                }
+#ifdef FINISHPAGE_HACK
+            FinishPage(page); // flush to OSD right away
+#endif
             break;
             }
        case DISPLAY_DEFINITION_SEGMENT: {
             dbgsegments("DISPLAY_DEFINITION_SEGMENT\n");
-            int version = (Data[6] & 0xF0) >> 4;
+            int version = bs.GetBits(4);
             if (version != ddsVersionNumber) {
-               int displayWindowFlag   = (Data[6] & 0x08) >> 3;
+               bool displayWindowFlag = bs.GetBit();
                windowHorizontalOffset = 0;
                windowVerticalOffset   = 0;
-               displayWidth = windowWidth   = ((Data[7] << 8) | Data[8]) + 1;
-               displayHeight = windowHeight = ((Data[9] << 8) | Data[10]) + 1;
-               if (displayWindowFlag) { 
-                  windowHorizontalOffset = (Data[11] << 8) | Data[12];                                // displayWindowHorizontalPositionMinimum
-                  windowWidth            = ((Data[13] << 8) | Data[14]) - windowHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
-                  windowVerticalOffset   = (Data[15] << 8) | Data[16];                                // displayWindowVerticalPositionMinimum
-                  windowHeight           = ((Data[17] << 8) | Data[18]) - windowVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
+               bs.SkipBits(3); // reserved
+               displayWidth  = windowWidth  = bs.GetBits(16) + 1;
+               displayHeight = windowHeight = bs.GetBits(16) + 1;
+               if (displayWindowFlag) {
+                  windowHorizontalOffset = bs.GetBits(16);                              // displayWindowHorizontalPositionMinimum
+                  windowWidth            = bs.GetBits(16) - windowHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
+                  windowVerticalOffset   = bs.GetBits(16);                              // displayWindowVerticalPositionMinimum
+                  windowHeight           = bs.GetBits(16) - windowVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
                   }
                SetOsdData();
                SetupChanged();
@@ -1086,15 +1213,56 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
                }
             break;
             }
+       case DISPARITY_SIGNALING_SEGMENT: {
+            dbgsegments("DISPARITY_SIGNALING_SEGMENT\n");
+            bs.SkipBits(4); // dss_version_number
+            bool disparity_shift_update_sequence_page_flag = bs.GetBit();
+            bs.SkipBits(3); // reserved
+            bs.SkipBits(8); // page_default_disparity_shift
+            if (disparity_shift_update_sequence_page_flag) {
+               bs.SkipBits(8); // disparity_shift_update_sequence_length
+               bs.SkipBits(24); // interval_duration[23..0]
+               int division_period_count = bs.GetBits(8);
+               for (int i = 0; i < division_period_count; ++i) {
+                   bs.SkipBits(8); // interval_count
+                   bs.SkipBits(8); // disparity_shift_update_integer_part
+                   }
+               }
+            while (!bs.IsEOF()) {
+                  bs.SkipBits(8); // region_id
+                  bool disparity_shift_update_sequence_region_flag = bs.GetBit();
+                  bs.SkipBits(5); // reserved
+                  int number_of_subregions_minus_1 = bs.GetBits(2);
+                  for (int i = 0; i <= number_of_subregions_minus_1; ++i) {
+                      if (number_of_subregions_minus_1 > 0) {
+                         bs.SkipBits(16); // subregion_horizontal_position
+                         bs.SkipBits(16); // subregion_width
+                         }
+                      bs.SkipBits(8); // subregion_disparity_shift_integer_part
+                      bs.SkipBits(4); // subregion_disparity_shift_fractional_part
+                      bs.SkipBits(4); // reserved
+                      if (disparity_shift_update_sequence_region_flag) {
+                         bs.SkipBits(8); // disparity_shift_update_sequence_length
+                         bs.SkipBits(24); // interval_duration[23..0]
+                         int division_period_count = bs.GetBits(8);
+                         for (int i = 0; i < division_period_count; ++i) {
+                             bs.SkipBits(8); // interval_count
+                             bs.SkipBits(8); // disparity_shift_update_integer_part
+                             }
+                         }
+                      }
+                  }
+            break;
+            }
        case END_OF_DISPLAY_SET_SEGMENT: {
             dbgsegments("END_OF_DISPLAY_SET_SEGMENT\n");
             FinishPage(page);
-            }
             break;
+            }
        default:
             dbgsegments("*** unknown segment type: %02X\n", segmentType);
        }
-     return segmentLength;
+     return bs.Length() / 8;
      }
   return -1;
 }
@@ -1143,6 +1311,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
   cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
   bitmaps->Add(Bitmaps);
   for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
+      sr->UpdateTextData(Page->GetClutById(sr->ClutId()));
       int posX = sr->HorizontalAddress();
       int posY = sr->VerticalAddress();
       if (sr->Width() > 0 && sr->Height() > 0) {
diff --git a/eitscan.c b/eitscan.c
index 9d8ac995c..7e48bfef7 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.4 2011/08/26 16:16:46 kls Exp $
+ * $Id: eitscan.c 2.5 2011/09/25 14:58:55 kls Exp $
  */
 
 #include "eitscan.h"
@@ -150,7 +150,7 @@ void cEITScanner::Process(void)
                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
                             if (Device->ProvidesTransponder(Channel)) {
                                if (!Device->Receiving()) {
-                                  bool MaySwitchTransponder = Device->MaySwitchTransponder();
+                                  bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel);
                                   if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
                                      if (!MaySwitchTransponder) {
                                         if (Device == cDevice::ActualDevice() && !currentChannel) {
diff --git a/epg2html.pl b/epg2html
similarity index 97%
rename from epg2html.pl
rename to epg2html
index 9fc41a6a9..8b9e7b1f7 100755
--- a/epg2html.pl
+++ b/epg2html
@@ -7,12 +7,12 @@
 # plus an 'index.htm' file. All output files are written into the current
 # directory.
 #
-# Usage: epg2html.pl < /video/epg.data
+# Usage: epg2html < /video/epg.data
 #
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html.pl 2.0 2006/04/17 12:19:08 kls Exp $
+# $Id: epg2html 2.1 2011/12/04 14:17:35 kls Exp $
 
 @Index = ();
 
diff --git a/font.h b/font.h
index dbca88ef3..8e734ace4 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.5 2011/01/14 16:22:03 kls Exp $
+ * $Id: font.h 2.6 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -51,7 +51,7 @@ class cFont {
   virtual int Height(void) const = 0;
           ///< Returns the height of this font in pixel (all characters have the same height).
   int Height(const char *s) const { return Height(); }
-          ///< Returns the height of this font in pixel (obsolete, just for backwards compatibilty).
+          ///< Returns the height of this font in pixel (obsolete, just for backwards compatibility).
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
           ///< Draws the given text into the Bitmap at position (x, y) with the given colors.
           ///< The text will not exceed the given Width (if > 0), and will end with a complete character.
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext
similarity index 99%
rename from i18n-to-gettext.pl
rename to i18n-to-gettext
index 29d9345d3..6932fd27e 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext
@@ -5,12 +5,12 @@
 # Extracts all texts from the file i18n.c and creates language
 # specific *.po files.
 #
-# Usage: i18n-to-gettext.pl
+# Usage: i18n-to-gettext
 #
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: i18n-to-gettext.pl 2.1 2009/10/18 14:07:49 kls Exp $
+# $Id: i18n-to-gettext 2.2 2011/12/04 14:17:35 kls Exp $
 
 # How to convert an actual plugin:
 #
diff --git a/interface.c b/interface.c
index 64bf9756d..2bfa6c392 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 2.0 2008/02/10 15:49:15 kls Exp $
+ * $Id: interface.c 2.1 2011/12/04 14:52:38 kls Exp $
  */
 
 #include "interface.h"
@@ -79,7 +79,7 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
      DisplayMenu->SetItem(tr("RC code detected!"), 4, false, false);
      DisplayMenu->SetItem(tr("Do not press any key..."), 5, false, false);
      DisplayMenu->Flush();
-     sleep(3);
+     cCondWait::SleepMs(3000);
      DisplayMenu->SetItem("", 4, false, false);
      DisplayMenu->SetItem("", 5, false, false);
 
diff --git a/libsi/Makefile b/libsi/Makefile
index 37be2f60c..b24eb31db 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 2.1 2010/11/07 13:31:05 kls Exp $
+# $Id: Makefile 2.2 2011/12/04 14:18:38 kls Exp $
 
 ### The C++ compiler and options:
 
@@ -52,4 +52,4 @@ clean:
 
 dist:
 	tar cvzf libsi.tar.gz -C .. libsi/util.c libsi/si.c libsi/section.c libsi/descriptor.c \
-   libsi/util.h libsi/si.h libsi/section.h libsi/descriptor.h libsi/headers.h libsi/Makefile libsi/gendescr.pl
+   libsi/util.h libsi/si.h libsi/section.h libsi/descriptor.h libsi/headers.h libsi/Makefile libsi/gendescr
diff --git a/libsi/gendescr.pl b/libsi/gendescr
similarity index 97%
rename from libsi/gendescr.pl
rename to libsi/gendescr
index d28890f6c..8af5c69d5 100755
--- a/libsi/gendescr.pl
+++ b/libsi/gendescr
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: gendescr.pl 2.0 2003/12/13 10:40:53 kls Exp $
+# $Id: gendescr 2.0 2003/12/13 10:40:53 kls Exp $
 
 print "Name (ohne ...Descriptor):";
 $name=<STDIN>;
diff --git a/libsi/si.c b/libsi/si.c
index 840b3a1f7..82123e17f 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.4 2011/06/15 21:26:00 kls Exp $
+ *   $Id: si.c 2.5 2011/12/04 15:06:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -206,6 +206,8 @@ void DescriptorGroup::Add(GroupDescriptor *d) {
          array[i]=0;
    } else if (length != d->getLastDescriptorNumber()+1)
       return; //avoid crash in case of misuse
+   if (length <= d->getDescriptorNumber())
+      return; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
    array[d->getDescriptorNumber()]=d;
 }
 
diff --git a/menu.c b/menu.c
index ef2bb468e..9167f47bc 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.32 2011/08/27 11:05:33 kls Exp $
+ * $Id: menu.c 2.34 2011/12/04 14:52:38 kls Exp $
  */
 
 #include "menu.h"
@@ -2885,6 +2885,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 
 class cMenuSetupLNB : public cMenuSetupBase {
 private:
+  cSatCableNumbers satCableNumbers;
   void Setup(void);
 public:
   cMenuSetupLNB(void);
@@ -2892,7 +2893,9 @@ class cMenuSetupLNB : public cMenuSetupBase {
   };
 
 cMenuSetupLNB::cMenuSetupLNB(void)
+:satCableNumbers(MAXDEVICES)
 {
+  satCableNumbers.FromString(data.DeviceBondings);
   SetSection(tr("LNB"));
   Setup();
 }
@@ -2910,6 +2913,18 @@ void cMenuSetupLNB::Setup(void)
      Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi));
      }
 
+  int NumSatDevices = 0;
+  for (int i = 0; i < cDevice::NumDevices(); i++) {
+      if (cDevice::GetDevice(i)->ProvidesSource(cSource::stSat))
+         NumSatDevices++;
+      }
+  if (NumSatDevices > 1) {
+     for (int i = 0; i < cDevice::NumDevices(); i++) {
+         if (cDevice::GetDevice(i)->ProvidesSource(cSource::stSat))
+            Add(new cMenuEditIntItem(cString::sprintf(tr("Setup.LNB$Device %d connected to sat cable"), i + 1), &satCableNumbers.Array()[i], 0, NumSatDevices, tr("Setup.LNB$own")));
+         }
+     }
+
   SetCurrent(Get(current));
   Display();
 }
@@ -2917,10 +2932,18 @@ void cMenuSetupLNB::Setup(void)
 eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
 {
   int oldDiSEqC = data.DiSEqC;
+  bool DeviceBondingsChanged = false;
+  if (Key == kOk) {
+     cString NewDeviceBondings = satCableNumbers.ToString();
+     DeviceBondingsChanged = strcmp(data.DeviceBondings, NewDeviceBondings) != 0;
+     data.DeviceBondings = NewDeviceBondings;
+     }
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (Key != kNone && data.DiSEqC != oldDiSEqC)
      Setup();
+  else if (DeviceBondingsChanged)
+     cDvbDevice::BondDevices(data.DeviceBondings);
   return state;
 }
 
@@ -4185,7 +4208,7 @@ bool cRecordControl::GetEvent(void)
       }
       if (seconds == 0)
          dsyslog("waiting for EPG info...");
-      sleep(1);
+      cCondWait::SleepMs(1000);
       }
   dsyslog("no EPG info available");
   return false;
@@ -4295,11 +4318,11 @@ bool cRecordControls::PauseLiveVideo(void)
   Skins.Message(mtStatus, tr("Pausing live video..."));
   cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
   if (Start(NULL, true)) {
-     sleep(2); // allow recorded file to fill up enough to start replaying
+     cCondWait::SleepMs(2000); // allow recorded file to fill up enough to start replaying
      cReplayControl *rc = new cReplayControl;
      cControl::Launch(rc);
      cControl::Attach();
-     sleep(1); // allow device to replay some frames, so we have a picture
+     cCondWait::SleepMs(1000); // allow device to replay some frames, so we have a picture
      Skins.Message(mtStatus, NULL);
      rc->ProcessKey(kPause); // pause, allowing replay mode display
      return true;
diff --git a/osd.h b/osd.h
index ab10e42be..f5f8b6563 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.14 2011/08/15 09:22:50 kls Exp $
+ * $Id: osd.h 2.15 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -496,7 +496,7 @@ class cPixmap {
        ///< In order to allow devices that can handle only a limited number of layers,
        ///< the Layer parameter must be less than 8 (MAXPIXMAPLAYERS).
        ///< ViewPort defines the rectangle in which this pixmap will be rendered on
-       ///< the OSD. If no DrawPort ist given, it defaults to the same size as the
+       ///< the OSD. If no DrawPort is given, it defaults to the same size as the
        ///< ViewPort, with its upper left corner set to (0, 0).
        ///< All drawing operations will be executed relative to the origin of the
        ///< DrawPort rectangle, and will be clipped to the size of this rectangle.
@@ -566,7 +566,7 @@ class cPixmap {
        ///< Sets the pixmap's draw port to the given Point.
        ///< Only the origin point of the draw port can be modified, its size is fixed.
        ///< By default, setting a new draw port point results in marking the relevant
-       ///< part of the view port as "drity". If Dirty is set to false, the view port
+       ///< part of the view port as "dirty". If Dirty is set to false, the view port
        ///< will not be marked as dirty. This is mainly used to implement the Pan()
        ///< function.
        ///< If a derived class reimplements this function, it needs to call the base
@@ -701,7 +701,7 @@ class cPixmapMemory : public cPixmap {
 /// reimplement all necessary cPixmap functions and do the rendering
 /// itself ("high level mode").
 /// If an OSD provides a "high level mode", it shall also provide a "raw mode"
-/// in order to verify proper operation. The plugin that impements the OSD
+/// in order to verify proper operation. The plugin that implements the OSD
 /// shall offer a configuration switch in its setup.
 
 class cOsd {
diff --git a/pat.h b/pat.h
index 1aa4afc50..cffb5a283 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 2.1 2009/06/14 11:14:00 kls Exp $
+ * $Id: pat.h 2.2 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -39,7 +39,7 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
          ///< are copied that match one of the given CA system IDs.
          ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
          ///< available), or -1 if BufSize was too small to hold all CA descriptors.
-         ///< The return value in StreamFlag tells whether these CA descriptors are to be used
+         ///< The return value tells whether these CA descriptors are to be used
          ///< for the individual streams.
 
 #endif //__PAT_H
diff --git a/po/ar.po b/po/ar.po
index d3dd29af3..c936078d4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -983,6 +983,13 @@ msgstr "التردد المنخفض للاقط م هرتز"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "التردد المرتفع للاقط م هرتز"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "اعادة تشغيل الكامة"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index b104fea3b..d609cda72 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -965,6 +965,13 @@ msgstr "Freq
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Freq��ncia LNB alta (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index bcafac7d4..eef825717 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -964,6 +964,13 @@ msgstr "Dolní frekvence LNB (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Horní frekvence LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reset CAMu"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 81b11eb05..db6b39870 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "Nedre LNB frekvens (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�vre LNB frekvens (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM nulstil"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 6d5b822f4..4a475d7d4 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "Untere LNB-Frequenz (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Obere LNB-Frequenz (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr "Device %d angeschlossen an Sat-Kabel"
+
+msgid "Setup.LNB$own"
+msgstr "eigenes"
+
 msgid "CAM reset"
 msgstr "CAM zur�ckgesetzt"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 9756ea784..64300f084 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "��� LNB-��������� (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 193e75eb1..288ad6999 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -963,6 +963,13 @@ msgstr "Frecuencia inferior del LNB (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecuencia superior del LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reset CAM"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 49794dd52..c12f31fe2 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "LO LNB sagedus (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "HI LNB sagedus (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM taask�ivitamine"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b093e880c..d0d1225f9 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -965,6 +965,13 @@ msgstr "LNB-alataajuus (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "LNB-ylätaajuus (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM nollaus"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index b5c512041..5f8b4113e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -968,6 +968,13 @@ msgstr "Fr
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Fr�quence haute LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM remis � z�ro"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index ed519a2f8..681cb791c 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -964,6 +964,13 @@ msgstr "Donja LNB frekv. (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Gornja LNB frekv. (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Ponovno pokreni CAM"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 17b905f50..bebf6eff3 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2007-12-01 21:42+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -965,6 +965,13 @@ msgstr "Als
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Fels� LNB-frekvencia (MHZ)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM �jraind�t�s"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 501300edc..6015881fb 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -969,6 +969,13 @@ msgstr "Freq LO LNB (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Freq HI LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reimposta la CAM"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 6cb1faa09..53d242262 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "Žemasis LNB dažnis (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Aukštasis LNB dažnis (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Dekodavimo modulis (CAM) perkrautas"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 0d22563ff..5fa363456 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -963,6 +963,13 @@ msgstr "Долна LNB фрекфенција (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Форна LNB фрекфенција (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Рестартирај CAM"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ae2b85e00..65aaba71a 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -966,6 +966,13 @@ msgstr "Laagste LNB frequentie (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Hoogste LNB frequentie (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM herstarten"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 8ec8dfb4e..a8ea942d0 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -963,6 +963,13 @@ msgstr "LO-frekvens i lavb
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "LO-frekvens i h�yb�ndet (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index a5c1b472d..94ba6921a 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -963,6 +963,13 @@ msgstr "Dolna cz
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "G�rna cz�stotliwo�� LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM zresetowany"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index c4433123f..272ab75ba 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -963,6 +963,13 @@ msgstr "Frequ
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frequ�ncia alta do LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f8c5a1e2e..414ade19b 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -965,6 +965,13 @@ msgstr "Frecvn
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Frecvn�� LNB superioar� (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Resetare CAM"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e683b8b15..a4eaca5bd 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -963,6 +963,13 @@ msgstr "
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "������� ������� ���������� (���)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM ����������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 46edef586..176673f2e 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "Doln
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Horn� frekvencia LNB (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Resetnutie CAMu"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 89c692398..696e953ee 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -963,6 +963,13 @@ msgstr "Spodnja LNB-frek. (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Zgornja LNB-frek. (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reset CAM-a"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 45d354bb3..62c07d388 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -981,6 +981,13 @@ msgstr "Donja LNB frekv. (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Gornja LNB frekv. (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Ponovno pokreni CAM"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 150f95eb2..ae6d72ff8 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -965,6 +965,13 @@ msgstr "Undre LNB frekvens (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�vre LNB frekvens (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM omstart"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 194943b8d..946ab4213 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "Alt LNB frekans
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "�st LNB frekans� (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM s�f�rland�"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 433ec7040..c383af8c5 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -962,6 +962,13 @@ msgstr "Нижня частота конвертера (МГц)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "Верхня частота конвертера (МГц)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Перезавантаження CAM"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c28fe8814..43a5ea564 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-08-27 11:54+0200\n"
+"POT-Creation-Date: 2011-12-03 16:25+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -965,6 +965,13 @@ msgstr "低本振频率 (MHz)"
 msgid "Setup.LNB$High LNB frequency (MHz)"
 msgstr "高本振频率 (MHz)"
 
+#, c-format
+msgid "Setup.LNB$Device %d connected to sat cable"
+msgstr ""
+
+msgid "Setup.LNB$own"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM重置"
 
diff --git a/receiver.h b/receiver.h
index bd98a426f..a5223ab78 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.1 2010/01/30 10:25:19 kls Exp $
+ * $Id: receiver.h 2.2 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -56,7 +56,7 @@ class cReceiver {
   bool AddPid(int Pid);
                ///< Adds the given Pid to the list of PIDs of this receiver.
   bool AddPids(const int *Pids);
-               ///< Adds the given izero terminated list of Pids to the list of PIDs of this
+               ///< Adds the given zero terminated list of Pids to the list of PIDs of this
                ///< receiver.
   bool AddPids(int Pid1, int Pid2, int Pid3 = 0, int Pid4 = 0, int Pid5 = 0, int Pid6 = 0, int Pid7 = 0, int Pid8 = 0, int Pid9 = 0);
                ///< Adds the given Pids to the list of PIDs of this receiver.
diff --git a/recording.c b/recording.c
index bea7eb6b7..6b11fbd33 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.38 2011/09/04 09:32:25 kls Exp $
+ * $Id: recording.c 2.39 2011/12/04 13:51:44 kls Exp $
  */
 
 #include "recording.h"
@@ -1162,7 +1162,7 @@ void cRecordings::TouchUpdate(void)
   bool needsUpdate = NeedsUpdate();
   TouchFile(UpdateFileName());
   if (!needsUpdate)
-     lastUpdate = time(NULL); // make sure we don't tigger ourselves
+     lastUpdate = time(NULL); // make sure we don't trigger ourselves
 }
 
 bool cRecordings::NeedsUpdate(void)
diff --git a/recording.h b/recording.h
index 37979ec60..d3dbd1da8 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.25 2011/08/21 13:10:39 kls Exp $
+ * $Id: recording.h 2.26 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -176,7 +176,7 @@ class cRecordings : public cList<cRecording>, public cThread {
        ///< Triggers an update of the list of recordings, which will run
        ///< as a separate thread if Wait is false. If Wait is true, the
        ///< function returns only after the update has completed.
-       ///< Returns true if Wait is true and there is anyting in the list
+       ///< Returns true if Wait is true and there is anything in the list
        ///< of recordings, false otherwise.
   void TouchUpdate(void);
        ///< Touches the '.update' file in the video directory, so that other
@@ -292,7 +292,7 @@ class cIndexFile {
   bool IsStillRecording(void);
   void Delete(void);
   static int GetLength(const char *FileName, bool IsPesRecording = false);
-       ///< Calculates the recording length (numer of frames) without actually reading the index file.
+       ///< Calculates the recording length (number of frames) without actually reading the index file.
        ///< Returns -1 in case of error.
   };
 
diff --git a/ringbuffer.h b/ringbuffer.h
index 83281b288..d234502da 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 2.2 2009/11/08 11:52:25 kls Exp $
+ * $Id: ringbuffer.h 2.3 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -85,7 +85,7 @@ class cRingBufferLinear : public cRingBuffer {
     ///< \return Returns the number of bytes actually read and stored, or
     ///< an error value from the actual read() call.
   int Read(cUnbufferedFile *File, int Max = 0);
-    ///< Like Read(int FileHandle, int Max), but reads fom a cUnbufferedFile).
+    ///< Like Read(int FileHandle, int Max), but reads from a cUnbufferedFile).
   int Put(const uchar *Data, int Count);
     ///< Puts at most Count bytes of Data into the ring buffer.
     ///< \return Returns the number of bytes actually stored.
diff --git a/scr.conf b/scr.conf
new file mode 100644
index 000000000..61e09f1cd
--- /dev/null
+++ b/scr.conf
@@ -0,0 +1,24 @@
+# SCR (Satellite Channel Routing) configuration for VDR
+#
+# Format:
+#
+# channel frequency [pin]
+#
+# channel:        SCR channel index (0-7)
+# frequency:      frequency of the SCR channel ("user band")
+# pin:            optional pin of the SCR channel (0-255)
+#
+# A line containing space separated integer numbers, terminated with a ':',
+# defines that any following lines apply only to the given list
+# of device numbers.
+#
+# Examples:
+
+# 0 1284
+# 1 1400
+# 2 1516
+# 3 1632
+# 4 1748
+# 5 1864
+# 6 1980
+# 7 2096
diff --git a/skins.h b/skins.h
index 6f41da50e..280a8e23a 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 2.0 2008/02/17 11:30:56 kls Exp $
+ * $Id: skins.h 2.1 2011/12/04 13:38:17 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -148,7 +148,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< Sets the Total number of items in the currently displayed list, and the
        ///< Offset of the first item that is currently displayed (the skin knows how
        ///< many items it can display at once, see MaxItems()). This can be used to
-       ///< display a scollbar.
+       ///< display a scrollbar.
   virtual void SetEvent(const cEvent *Event) = 0;
        ///< Sets the Event that shall be displayed, using the entire central area
        ///< of the menu. The Event's 'description' shall be displayed using a
diff --git a/sources.conf b/sources.conf
index 751d919c0..8c352fd3c 100644
--- a/sources.conf
+++ b/sources.conf
@@ -19,174 +19,165 @@
 
 # Europe
 
-S3E     Telecom 2C
-S4E     Eurobird 4
-S4.8E   Sirius 4
+S3E     Eutelsat 3A & Rascom 1R
+S4E     Eurobird 4A
+S4.8E   Astra 4A
 S7E     Eutelsat W3A
-S9E     Eurobird 9
-S10E    Eutelsat W1
-S13E    Hotbird 6/7A/8
-S16E    Eutelsat W2
-S19.2E  Astra F/G/H/KR/L
-S21.0E  Afristar 1
+S9E     Eurobird 9A
+S10E    Eutelsat W2A
+S13E    Hotbird 6/8/9
+S16E    Eutelsat W2M & Eurobird 16A
+S19.2E  Astra 1H/1KR/1L/1M/2C
 S21.6E  Eutelsat W6
-S23.5E  Astra 1E/3A
+S23.5E  Astra 3A/3B
 S25.5E  Eurobird 2
-S26E    Badr 3/4/6
-S28.2E  Astra 2D/A/B
-S28.5E  Eurobird 1 & Astra 2A/B/C/D
-S30.5E  Arabsat 2B
-S31.5E  Astra 1D/5A
-S33E    Eurobird 3 & Intelsat 802
-S36E    Eutelsat W4 & Sesat
+S26E    Badr 4/5/6
+S28.2E  Astra 2A/2B/2D
+S28.5E  Eurobird 1
+S30.5E  Arabsat 5A
+S31.5E  Astra 1G
+S33E    Eurobird 3 & Intelsat New Dawn
+S36E    Eutelsat W4/W7
 S38E    Paksat 1
 S39E    Hellas Sat 2
 S40E    Express AM1
 S42E    Turksat 2A/3A
 S45E    Intelsat 12
 S49E    Yamal 202
-S53E    Express AM 22
-S55E    Insat 3E 
+S53E    Express AM22
+S55E    Insat 3E
 S56E    Bonum 1
-S57E    NSS 703
+S57E    NSS 12
 S60E    Intelsat 904
 S62E    Intelsat 902
 S64E    Intelsat 906
-S66E    Intelsat 704
+S66E    Intelsat 17
 S68.5E  Intelsat 7/10
 S70.5E  Eutelsat W5
-S72E    Intelsat 4
+S72E    Intelsat 709
 
 # Asia
 
-S74E    Insat 3C/4CR & Edusat
-S75E    ABS 1
-S76.5E  Telstar 10
-S78.5E  Thaicom 2/5
-S80E    Express AM2
-S83E    Insat 2E/3B/4A
-S85.2E  Intelsat 709
-S87.5E  Chinastar 1
-S88E    ST 1
+S74E    Insat 3C/4CR
+S75E    ABS 1A
+S76.5E  Apstar 2R
+S78.5E  Thaicom 5
+S80E    Express AM2/MD1
+S83E    Insat 2E/4A
+S85.2E  Intelsat 15
+S87.5E  Chinasat 5A
+S88E    ST 1/2
 S90E    Yamal 201
-S91.5E  Measat 1
+S91.5E  Measat 3/3A
 S92.2E  Chinasat 9
 S93.5E  Insat 3A/4B
 S95E    NSS 6
-S96.5E  Express AM 33
-S98.5E  Protostar 1
-S100.5E Asiasat 2
+S96.5E  Express AM33
+S100.5E Asiasat 5
 S103E   Express A2
-S105E   Asiastar
 S105.5E Asiasat 3S
-S107.7E Cakrawarta 1
-S108E   Telkom 1 & NSS 11
-S110E   N-Sat 110 & BSAT 1A/2A
-S110.5E Sinosat 1
-S113E   Palapa C2 & Koreasat 2
-S116E   Koreasat 3
+S108.2E Telkom 1 & NSS 11 & SES 7
+S110E   N-Sat 110 & BSAT 2C/3A
+S110.5E Chinasat 10
+S113E   Palapa D & Koreasat 5
+S116E   Koreasat 6
 S118E   Telkom 2
-S120E   Thaicom 1A
 S122.2E Asiasat 4
-S124E   JCSAT 4a
-S125E   Sinosat 3
-S128E   JCSAT 3
-S132E   Vinasat 1 & JCSAT5a
+S124E   JCSAT 4A
+S125E   Chinasat 6A
+S128E   JCSAT RA
+S132E   Vinasat 1 & JCSAT5A
 S134E   Apstar 6
 S138E   Telstar 18
-S140E   Express AM 3
-S144E   Superbird C
-S146E   Agila 2
-S148E   Measat 2
-S150E   JCSAT R
+S140E   Express AM3
+S144E   Superbird C2
+S146E   ABS 5
+S150E   JCSAT 1B
 S152E   Optus D2
 S154E   JCSAT 2A
-S156E   Optus C1
-S158E   Superbird A
+S156E   Optus C1/D3
 S160E   Optus D1
 S162E   Superbird B2
 S164E   Optus B3
 S166E   Intelsat 8
-S169E   Intelsat 2
+S169E   Intelsat 5
 S172E   GE 23
 S180E   Intelsat 701
-S177W   NSS 5
+S177W   NSS 9
 
 # Atlantic
 
-S1W     Thor 3/5 & Intelsat 10-02
-S4W     Amos 1/2/3
+S1W     Thor 5/6 & Intelsat 10-02
+S4W     Amos 2/3
 S5W     Atlantic Bird 3
-S7W     Nilesat 101/102 & Atlantic Bird 4
+S7W     Nilesat 101/102/201 & Atlantic Bird 4A
 S8W     Telecom 2D & Atlantic Bird 2
-S11W    Express A3
+S11W    Express AM44
 S12.5W  Atlantic Bird 1
 S14W    Express A4
 S15W    Telstar 12
 S18W    Intelsat 901
-S20W    Intelsat 603
+S20W    NSS 5
 S22W    NSS 7
 S24.5W  Intelsat 905
 S27.5W  Intelsat 907
-S30W    Hispasat 1C/1D
-S31.5W  Intelsat 801
+S30W    Hispasat 1C/1D/1E
+S31.5W  Intelsat 25
 S34.5W  Intelsat 903
-S37.5W  NSS 10
+S37.5W  NSS 10 & Telstar 11N
 S40.5W  NSS 806
-S43W    Intelsat 3R/11
-S45W    Intelsat 1R
-S50W    Intelsat 705
+S43W    Intelsat 11
+S45W    Intelsat 14
+S50W    Intelsat 1R
 S53W    Intelsat 707
 S55.5W  Intelsat 805
-S58W    Intelsat 9
-S61W    Amazonas
+S58W    Intelsat 9/16
+S61W    Amazonas 1/2
 
 # America
 
-S61.5W  Echostar 3 & Rainbow 1
-S63W    Estrelo de Sul 1
+S61.5W  Echostar 12/15
+S63W    Telstar 14R
 S65W    Star One C1
 S70W    Star One C2
-S72W    Nahuel 1 & AMC 6
-S72.5W  DirecTV 1R & Echostar 6
+S72W    AMC 6
+S72.5W  DirecTV 1R & Nimiq 5
 S74W    Horizons 2
-S77W    Echostar 4 & Galaxy 4R
-S79W    AMC5
-S82W    Nimiq 2
+S77W    Echostar 1/8
+S79W    AMC 2/5
+S82W    Nimiq 4
 S83W    AMC 9
-S84W    Brasilsat B3/4
+S84W    Brasilsat B4
 S85W    AMC 16
 S85.1W  XM 3
-S87W    AMC3
+S87W    AMC 3
 S89W    Galaxy 28
-S91W    Galaxy 11/17 & Nimiq 1
-S92W    Brasilsat B2
-S93W    Galaxy 26
+S91W    Galaxy 17 & Nimiq 1
+S93W    Galaxy 25
 S95W    Galaxy 3C
-S97W    Galaxy 25
+S97W    Galaxy 19
 S99W    Galaxy 16
 S99.2W  Spaceway 2 & DirecTV 11
-S101W   DirecTV 4S/8 & AMC 2/4
-S103W   AMC1
-S105W   AMC15/18
+S101W   DirecTV 4S/8 & SES 1
+S103W   AMC 1
+S105W   AMC 15/18
 S107.3W Anik F1/F1R
-S110W   DirecTV 5 & Echostar 8/10
+S110W   DirecTV 5 & Echostar 10/11
 S111.1W Anik F2
 S113W   SatMex 6
 S116.8W SatMex 5
 S118.8W Anik F3
-S119W   Echostar 7 & DirecTV 7S
-S121W   Echostar 9 & Galaxy 23
+S119W   Echostar 14 & DirecTV 7S
+S121W   Echostar 9/Galaxy 23
 S123W   Galaxy 18
-S125W   Galaxy 14
+S125W   Galaxy 14 & AMC 21
 S127W   Galaxy 13/Horizons 1
-S129W   Ciel 2 & Galaxy 27
+S129W   Ciel 2
 S131W   AMC 11
-S133W   Galaxy15
+S133W   Galaxy 13/15
 S135W   AMC 10
 S137W   AMC 7
 S139W   AMC 8
-S148W   Echostar 1/2
 
 # Cable
 
diff --git a/summary2info.pl b/summary2info
similarity index 94%
rename from summary2info.pl
rename to summary2info
index 697602498..fc633f921 100755
--- a/summary2info.pl
+++ b/summary2info
@@ -5,12 +5,12 @@
 # Converts all 'summary.vdr' files in the video directory to the
 # 'info.vdr' format as used from VDR version 1.3.25 upward.
 #
-# Usage: summary2info.pl /video
+# Usage: summary2info /video
 #
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info.pl 2.0 2006/04/17 12:19:24 kls Exp $
+# $Id: summary2info 2.1 2011/12/04 14:17:35 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
diff --git a/svdrp.c b/svdrp.c
index e8e75b390..b333202b2 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.10 2011/08/27 10:43:18 kls Exp $
+ * $Id: svdrp.c 2.12 2011/12/04 13:58:33 kls Exp $
  */
 
 #include "svdrp.h"
@@ -224,7 +224,7 @@ const char *HelpPages[] = {
   "    valid key names is given. If more than one key is given, they are\n"
   "    entered into the remote control queue in the given sequence. There\n"
   "    can be up to 31 keys.",
-  "LSTC [ :groups | <number> | <name> ]\n"
+  "LSTC [ :groups | <number> | <name> | <id> ]\n"
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
   "    containing the given string as part of their name are listed.\n"
@@ -315,6 +315,9 @@ const char *HelpPages[] = {
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
   "    and stop time does not yet exists, it will be created.",
+  "UPDR\n"
+  "    Initiates a re-read of the recordings directory, which is the SVDRP\n"
+  "    equivalent to 'touch .update'.",
   "VOLU [ <number> | + | - | mute ]\n"
   "    Set the audio volume to the given number (which is limited to the range\n"
   "    0...255). If the special options '+' or '-' are given, the volume will\n"
@@ -948,16 +951,18 @@ void cSVDRP::CmdLSTC(const char *Option)
            Reply(501, "Channel \"%s\" not defined", Option);
         }
      else {
-        cChannel *next = NULL;
-        for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-            if (!channel->GroupSep()) {
-               if (strcasestr(channel->Name(), Option)) {
-                  if (next)
-                     Reply(-250, "%d %s", next->Number(), *next->ToText());
-                  next = channel;
-                  }
-               }
-            }
+        cChannel *next = Channels.GetByChannelID(tChannelID::FromString(Option));
+        if (!next) {
+           for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+              if (!channel->GroupSep()) {
+                 if (strcasestr(channel->Name(), Option)) {
+                    if (next)
+                       Reply(-250, "%d %s", next->Number(), *next->ToText());
+                    next = channel;
+                    }
+                 }
+              }
+           }
         if (next)
            Reply(250, "%d %s", next->Number(), *next->ToText());
         else
@@ -1557,6 +1562,12 @@ void cSVDRP::CmdUPDT(const char *Option)
      Reply(501, "Missing timer settings");
 }
 
+void cSVDRP::CmdUPDR(const char *Option)
+{
+  Recordings.Update(false);
+  Reply(250, "Re-read of recordings directory triggered");
+}
+
 void cSVDRP::CmdVOLU(const char *Option)
 {
   if (*Option) {
@@ -1627,6 +1638,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("REMO"))  CmdREMO(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
   else if (CMD("STAT"))  CmdSTAT(s);
+  else if (CMD("UPDR"))  CmdUPDR(s);
   else if (CMD("UPDT"))  CmdUPDT(s);
   else if (CMD("VOLU"))  CmdVOLU(s);
   else if (CMD("QUIT"))  Close(true);
diff --git a/svdrp.h b/svdrp.h
index 9f726ed94..a4cdee683 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 2.0 2007/04/30 12:28:28 kls Exp $
+ * $Id: svdrp.h 2.1 2011/12/04 13:51:44 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -82,6 +82,7 @@ class cSVDRP {
   void CmdSCAN(const char *Option);
   void CmdSTAT(const char *Option);
   void CmdUPDT(const char *Option);
+  void CmdUPDR(const char *Option);
   void CmdVOLU(const char *Option);
   void Execute(char *Cmd);
 public:
diff --git a/tools.c b/tools.c
index c9a3a44e3..1a1cf3fe8 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.17 2011/08/15 13:35:23 kls Exp $
+ * $Id: tools.c 2.19 2011/12/04 14:52:38 kls Exp $
  */
 
 #include "tools.h"
@@ -1196,6 +1196,47 @@ const char *cBase64Encoder::NextLine(void)
   return NULL;
 }
 
+// --- cBitStream ------------------------------------------------------------
+
+int cBitStream::GetBit(void)
+{
+  if (index >= length)
+     return 1;
+  int r = (data[index >> 3] >> (7 - (index & 7))) & 1;
+  ++index;
+  return r;
+}
+
+uint32_t cBitStream::GetBits(int n)
+{
+  uint32_t r = 0;
+  while (n--)
+        r |= GetBit() << n;
+  return r;
+}
+
+void cBitStream::ByteAlign(void)
+{
+  int n = index % 8;
+  if (n > 0)
+     SkipBits(8 - n);
+}
+
+void cBitStream::WordAlign(void)
+{
+  int n = index % 16;
+  if (n > 0)
+     SkipBits(16 - n);
+}
+
+bool cBitStream::SetLength(int Length)
+{
+  if (Length > length)
+     return false;
+  length = Length;
+  return true;
+}
+
 // --- cReadLine -------------------------------------------------------------
 
 cReadLine::cReadLine(void)
@@ -1748,7 +1789,7 @@ bool cLockFile::Lock(int WaitSeconds)
               break;
               }
            if (WaitSeconds)
-              sleep(1);
+              cCondWait::SleepMs(1000);
            }
         } while (f < 0 && time(NULL) < Timeout);
      }
diff --git a/tools.h b/tools.h
index 3d13c191d..86e8fb069 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.11 2011/08/15 14:13:42 kls Exp $
+ * $Id: tools.h 2.14 2011/12/04 14:48:03 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -36,7 +36,7 @@ extern int SysLogLevel;
 #define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_ERR, a) : void() )
 
 #define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
-#define LOG_ERROR_STR(s)  esyslog("ERROR: %s: %m", s)
+#define LOG_ERROR_STR(s)  esyslog("ERROR (%s,%d): %s: %m", __FILE__, __LINE__, s)
 
 #define SECSINDAY  86400
 
@@ -108,7 +108,7 @@ int Utf8StrLen(const char *s);
     ///< Returns the number of UTF-8 symbols formed by the given string of
     ///< character bytes.
 char *Utf8Strn0Cpy(char *Dest, const char *Src, int n);
-    ///< Copies at most n character bytes from Src to Dst, making sure that the
+    ///< Copies at most n character bytes from Src to Dest, making sure that the
     ///< resulting copy ends with a complete UTF-8 symbol. The copy is guaranteed
     ///< to be zero terminated.
     ///< Returns a pointer to Dest.
@@ -210,7 +210,7 @@ int64_t StrToNum(const char *s);
     ///< The numerical part of the string may be followed by one of the letters
     ///< K, M, G or T to abbreviate Kilo-, Mega-, Giga- or Terabyte, respectively
     ///< (based on 1024). Everything after the first non-numeric character is
-    ///< silently ignored, as are any characters other than the ones mentionend here.
+    ///< silently ignored, as are any characters other than the ones mentioned here.
 cString itoa(int n);
 cString AddDirectory(const char *DirName, const char *FileName);
 bool EntriesOnSameFileSystem(const char *File1, const char *File2);
@@ -266,6 +266,28 @@ class cBase64Encoder {
       ///< is called, or until the object is destroyed.
   };
 
+class cBitStream {
+private:
+  const uint8_t *data;
+  int length; // in bits
+  int index; // in bits
+public:
+  cBitStream(const uint8_t *Data, int Length) : data(Data), length(Length), index(0) {}
+  ~cBitStream() {}
+  int GetBit(void);
+  uint32_t GetBits(int n);
+  void ByteAlign(void);
+  void WordAlign(void);
+  bool SetLength(int Length);
+  void SkipBits(int n) { index += n; }
+  void SkipBit(void) { SkipBits(1); }
+  bool IsEOF(void) const { return index >= length; }
+  void Reset(void) { index = 0; }
+  int Length(void) const { return length; }
+  int Index(void) const { return (IsEOF() ? length : index); }
+  const uint8_t *GetData(void) const { return (IsEOF() ? NULL : data + (index / 8)); }
+  };
+
 class cTimeMs {
 private:
   uint64_t begin;
diff --git a/vdr.1 b/vdr.1
index 4c0a97853..d8322e180 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.6 2011/08/15 12:28:54 kls Exp $
+.\" $Id: vdr.1 2.7 2011/12/04 14:41:00 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -120,7 +120,7 @@ Each of them will apply to the \fB\-P\fR options following it.
 .TP
 .BI \-\-lirc[= path ]
 Use a LIRC remote control device.
-If \fIpath\fR is omitted, vdr uses \fI/dev/lircd\fR.
+If \fIpath\fR is omitted, vdr uses \fI/var/run/lirc/lircd\fR.
 .TP
 .BI \-\-localedir= dir
 Search for locale files in \fIdir\fR (default is ./locale).
diff --git a/vdr.5 b/vdr.5
index c46a2bf2e..7f0696790 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.23 2011/08/21 14:06:50 kls Exp $
+.\" $Id: vdr.5 2.26 2011/09/25 13:51:34 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -450,7 +450,8 @@ Note that there should be a last entry with the value \fB99999\fR for each satel
 which covers the upper frequency range.
 
 The third parameter defines the polarization to which this entry applies. It can
-be either \fBH\fR for horizontal or \fBV\fR for vertical.
+be either \fBH\fR for horizontal, \fBV\fR for vertical, \fBL\fR for circular left
+or \fBR\fR for circular right.
 
 The fourth parameter specifies the "local oscillator frequency" (lof) of the LNB
 to use for the given frequency range. This number will be subtracted from the
@@ -467,6 +468,7 @@ l l.
 \fBV\fR@voltage high (18V)
 \fBA\fR@mini A
 \fBB\fR@mini B
+\fBSn\fR@Satellite channel routing code sequence for bank n follows
 \fBWnn\fR@wait nn milliseconds (nn may be any positive integer number)
 \fB[xx ...]\fR@hex code sequence (max. 6)
 .TE
@@ -484,6 +486,46 @@ to receive the satellites following thereafter. In this case, only the devices
 1, 2 and 4 would be able to receive any satellites following this line and up
 to the next such line, or the end of the file. Devices may be listed more than
 once.
+.SS SATELLITE CHANNEL ROUTING (SCR)
+The file \fIscr.conf\fR contains the channel definitions of the SCR device in use.
+The format is
+
+channel frequency [pin]
+
+where channel is the SCR device's channel index (0-7), frequency is the user band
+frequency of the given channel, and pin is an optional pin number (0-255). The
+actual values are device specific and can be found in the SCR device's manual.
+
+Examples:
+
+0 1284
+.br
+1 1400
+.br
+2 1516
+.br
+3 1632
+.br
+4 1748
+.br
+5 1864
+.br
+6 1980
+.br
+7 2096
+
+By default it is assumed that the SCR configurations apply to all devices, and
+each device will pick one. If you have several SCR sat cables connected to one
+VDR machine, or if you want to explicitly assign the SCR channels to your devices,
+lines of the form
+
+\fB1 2 4:\fR
+
+may be inserted in the \fIscr.conf\fR file, defining the devices that are allowed
+to use the SCR channels thereafter. In this case, only the devices
+1, 2 and 4 would be allowed to use the SCR channels following this line and up
+to the next such line, or the end of the file. If a device is listed more than
+once, only its first appearance counts.
 .SS REMOTE CONTROL KEYS
 The file \fIremote.conf\fR contains the key assignments for all remote control
 units. Each line consists of one key assignment in the following format:
diff --git a/vdr.c b/vdr.c
index c32e45fda..3d79eef4a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.23 2011/08/15 12:42:39 kls Exp $
+ * $Id: vdr.c 2.27 2011/12/03 15:35:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -116,7 +116,7 @@ static bool SetUser(const char *UserName, bool UserDump)//XXX name?
 static bool DropCaps(void)
 {
   // drop all capabilities except selected ones
-  cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time=ep");
+  cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time,cap_net_raw=ep");
   if (!caps) {
      fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
      return false;
@@ -598,6 +598,7 @@ int main(int argc, char *argv[])
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
   Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true);
   Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC);
+  Scrs.Load(AddDirectory(ConfigDirectory, "scr.conf"), true);
   Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true);
   Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
@@ -638,6 +639,7 @@ int main(int argc, char *argv[])
   // DVB interfaces:
 
   cDvbDevice::Initialize();
+  cDvbDevice::BondDevices(Setup.DeviceBondings);
 
   // Initialize plugins:
 
@@ -859,7 +861,6 @@ int main(int argc, char *argv[])
            static time_t LastTimerCheck = 0;
            if (Now - LastTimerCheck > TIMERCHECKDELTA) { // don't do this too often
               InhibitEpgScan = false;
-              static time_t DeviceUsed[MAXDEVICES] = { 0 };
               for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
                   bool InVpsMargin = false;
                   bool NeedsTransponder = false;
@@ -899,19 +900,17 @@ int main(int argc, char *argv[])
                                Device = d;
                                break;
                                }
-                            bool timeout = Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT; // only check other devices if they have been left alone for a while
-                            if (d->MaySwitchTransponder()) {
+                            if (d->MaySwitchTransponder(Timer->Channel())) {
                                DeviceAvailable = true; // avoids using the actual device below
-                               if (timeout)
-                                  Device = d; // only check other devices if they have been left alone for a while
+                               Device = d;
                                }
-                            else if (timeout && !Device && InVpsMargin && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
+                            else if (!d->Occupied() && !Device && InVpsMargin && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
                                Device = d; // use this one only if no other with less impact can be found
                             }
                          }
                      if (!Device && InVpsMargin && !DeviceAvailable) {
                         cDevice *d = cDevice::ActualDevice();
-                        if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && Now - DeviceUsed[d->DeviceNumber()] > TIMERDEVICETIMEOUT)
+                        if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && !d->Occupied())
                            Device = d; // use the actual device as a last resort
                         }
                      // Switch the device to the transponder:
@@ -920,8 +919,8 @@ int main(int argc, char *argv[])
                            if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
                               cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
                            dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
-                           Device->SwitchChannel(Timer->Channel(), false);
-                           DeviceUsed[Device->DeviceNumber()] = Now;
+                           if (Device->SwitchChannel(Timer->Channel(), false))
+                              Device->SetOccupied(TIMERDEVICETIMEOUT);
                            }
                         if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
                            // the previous SwitchChannel() has switched away the current live channel

From 59f0138a7d03fed4fc33e1083928bf5b28e0e4ff Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 15 Jan 2012 16:10:00 +0100
Subject: [PATCH 209/307] Version 1.7.23 Original announce message: VDR
 developer version 1.7.23 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.23.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.22-1.7.23.diff

MD5 checksums:

de136f7be28c4b6f1fa0e2218b4acc11  vdr-1.7.23.tar.bz2
2977b75cd8dacad187d11c10b867d56a  vdr-1.7.22-1.7.23.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Removed the '.pl' suffix from svdrpsend.pl (sorry, I missed that one).
- Fixed bonding more than two devices.
- Fixed handling symbolic links in cRecordings::ScanVideoDir() (reported by
  Sundararaj Reel).
- Fixed a memory leak in cRecordings::ScanVideoDir() in case there are too many
  link levels (reported by Sundararaj Reel).
- Removed redundant memset() in the ctor of cSatCableNumbers (triggered by
  Ville Skyttä pointing out that the argument sequence in the call was wrong).
- Removed a redundant NULL check in cDvbSpuDecoder::setTime() (thanks to Ville Skyttä).
- Added HasSnr to the DEBUG_SIGNALQUALITY output in cDvbTuner::GetSignalQuality()
  (triggered by Ville Skyttä pointing out that the variable HasSnr was unused).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Added support for HbbTV to libsi (thanks to Christoph Haubrich).
- Added support for devices with more than one delivery system per frontend.
  This requires a DVB driver with version 5.5 or higher that can handle the
  DTV_ENUM_DELSYS call. With older drivers it will fall back to one delivery
  system per frontend.
- Updated the Hungarian language texts (thanks to István Füley).
- cDvbTuner::ExecuteDiseqc() now makes sure only one tuner sends SCR commands
  at any given time (reported by Frank Neumann).
- cEvent::FixEpgBugs() now replaces any newline characters in stream component
  descriptions with blanks (thanks to Torsten Lang for reporting a problem with
  EPG data from BSkyB's "MTV MUSIC", S28.2E-2-2010-7012).
- Fixed cDvbSubtitleConverter::SetOsdData() (thanks to Rolf Ahrenberg).
- Fixed cListBase::Move() in case From and To are equal (reported by Sundararaj
  Reel).
- Added support for DVB-T2 to libsi (thanks to Rolf Ahrenberg).
- Added support for handling DVB-T2 transponders.  This requires a DVB driver
  with version 5.3 or higher that can handle the DTV_DVBT2_PLP_ID call (thanks
  to Rolf Ahrenberg).
- Fixed cConfig::Load() for g++ version 4.7.0 (thanks to Ville Skyttä).
- Fixed a possible memory corruption in cTsToPes::GetPes() in case of broken
  TS packets, e.g. when switching channels.
- Fixed the SVDRP command CLRE for a single channel in case there are events
  that have a timer (thanks to Timo Eskola).
- BIDI support now checks at runtime whether the system runs with UTF-8 (suggested
  by Torsten Lang).
- Added member functions Adapter() and Frontend() to cDvbDevice (suggested by
  Rolf Ahrenberg).
- The parameters that are only used by "second generation" delivery systems (DVB-S2
  and DVB-T2) are no longer written into channels.conf for "first generation"
  delivery systems (DVB-S and DVB-T).
- Changed IndexToHMSF() so that it can handle negative Index values.
- Added option -N to the msgmerge call in the Makefile, because fuzzy translation
  mostly resulted in useless strings.
- The new setup option "Replay/Show remaining time" can be used to switch between
  showing the total length or the remaining time of the recording that is currently
  replayed.
- Fixed wrongfully displaying the length of a recording in the title of the replay
  progress display.
- Fixed frozen live view with device bonding in case the bonded master is used for
  live viewing (reported by Uwe Scheffler).
---
 CONTRIBUTORS                 |  28 +++-
 HISTORY                      |  55 +++++++
 MANUAL                       |   4 +
 Makefile                     |   4 +-
 PLUGINS/src/pictures/HISTORY |   4 +
 PLUGINS/src/pictures/pic2mpg |  17 +-
 config.c                     |   6 +-
 config.h                     |  13 +-
 dvbdevice.c                  | 308 +++++++++++++++++++++++------------
 dvbdevice.h                  |  25 ++-
 dvbspu.c                     |   4 +-
 dvbsubtitle.c                |   4 +-
 epg.c                        |  24 ++-
 font.c                       |  40 ++---
 libsi/descriptor.c           |  83 +++++++++-
 libsi/descriptor.h           |  42 ++++-
 libsi/headers.h              |  54 +++++-
 libsi/si.c                   |   5 +-
 libsi/si.h                   |  17 +-
 menu.c                       |  16 +-
 nit.c                        |  46 +++++-
 po/ar.po                     |   8 +-
 po/ca_ES.po                  |   8 +-
 po/cs_CZ.po                  |   8 +-
 po/da_DK.po                  |   8 +-
 po/de_DE.po                  |   8 +-
 po/el_GR.po                  |   8 +-
 po/es_ES.po                  |   8 +-
 po/et_EE.po                  |   8 +-
 po/fi_FI.po                  |  12 +-
 po/fr_FR.po                  |   8 +-
 po/hr_HR.po                  |   8 +-
 po/hu_HU.po                  | 169 ++++++++++---------
 po/it_IT.po                  |   8 +-
 po/lt_LT.po                  |   8 +-
 po/mk_MK.po                  |   8 +-
 po/nl_NL.po                  |   8 +-
 po/nn_NO.po                  |   8 +-
 po/pl_PL.po                  |   8 +-
 po/pt_PT.po                  |   8 +-
 po/ro_RO.po                  |   8 +-
 po/ru_RU.po                  |   8 +-
 po/sk_SK.po                  |   8 +-
 po/sl_SI.po                  |   8 +-
 po/sr_SR.po                  |   8 +-
 po/sv_SE.po                  |   8 +-
 po/tr_TR.po                  |   8 +-
 po/uk_UA.po                  |   8 +-
 po/zh_CN.po                  |   8 +-
 recording.c                  |  43 ++---
 remux.c                      |   6 +-
 svdrp.c                      |   6 +-
 svdrpsend.pl => svdrpsend    |   0
 tools.c                      |   4 +-
 vdr.5                        |  44 +++--
 55 files changed, 963 insertions(+), 328 deletions(-)
 rename svdrpsend.pl => svdrpsend (100%)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c3456a2a8..2a3d8588b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -271,6 +271,7 @@ Uwe Scheffler <linux_dvb@uni.de>
  for his help in keeping 'channels.conf.cable' and 'channels.conf.terr' up to date
  for helping to test new DVB-T handling
  for reporting a bug in switching the video format in the Setup/DVB menu
+ for reporting a problem with frozen live view in conjunction with device bonding
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
@@ -1120,6 +1121,10 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing handling DVB subtitles and implementing decoding textual DVB subtitles
  for adding file name and line number to LOG_ERROR_STR()
  for replacing all calls to sleep() with cCondWait::SleepMs()
+ for fixing cDvbSubtitleConverter::SetOsdData()
+ for adding support for DVB-T2 to libsi
+ for adding support for handling DVB-T2 transponders
+ for suggesting to add member functions Adapter() and Frontend() to cDvbDevice
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1927,8 +1932,13 @@ Ville Skytt
  for fixing a crash when deleting a recording while cutting it
  for fixing several spelling errors
  for adding generating a pkg-config file to the Makefile
- for removing the '.pl' suffix from all scripts (thanks to Ville Skytt�).
+ for removing the '.pl' suffix from all scripts
  for changing the default location for the LIRC socket to /var/run/lirc/lircd
+ for pointing out that the argument sequence in the memset() call in the ctor of
+ cSatCableNumbers was wrong
+ for removing a redundant NULL check in cDvbSpuDecoder::setTime()
+ for pointing out that the variable HasSnr was unused in cDvbTuner::GetSignalQuality()
+ for fixing cConfig::Load() for g++ version 4.7.0
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2256,6 +2266,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for suggesting to implement a function to determine the length of a recording's
  index file
  for fixing setting the start time of an edited recording
+ for adding support for HbbTV to libsi
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2483,6 +2494,8 @@ Timo Eskola <timo@tolleri.net>
  for implementing sending all frames to devices that can handle them in fast forward
  trick speeds
  for implementing the setup option "Recording/Pause key handling"
+ for fixing the SVDRP command CLRE for a single channel in case there are events
+ that have a timer
 
 Elias Luttinen <el@iki.fi>
  for improving the description of where logging goes in the INSTALL file
@@ -2544,6 +2557,10 @@ Sundararaj Reel <sundararaj.reel@googlemail.com>
  for reporting a missing reset of maxNumber in cChannels::Renumber()
  for reporting some missing 'const' in tChannelID
  for suggesting to add optional case insensitive sorting to cStringList::Sort()
+ for reporting a bug in handling symbolic links in cRecordings::ScanVideoDir()
+ for reporting a memory leak in cRecordings::ScanVideoDir() in case there are too
+ many link levels
+ for reporting a bug in cListBase::Move() in case From and To are equal
 
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
@@ -2732,8 +2749,9 @@ Andreas Oberritter <obi@opendreambox.org>
 Milan Cvijanovic <elcom_cvijo@hotmail.com>
  for translating OSD texts to the Serbian language
 
-Frank Neumann <frank.neumann@hp.com>
+Frank Neumann <fnu@yavdr.org>
  for suggesting to reduce the thread and I/O priority cCuttingThread::Action()
+ for reporting a problem with tuning timeouts when using SCR with multiple tuners
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
@@ -2792,3 +2810,9 @@ Chris Mayo <aklhfex@gmail.com>
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
  for adding cap_net_raw to the capabilities that are not dropped
+
+Torsten Lang <info@torstenlang.de>
+ for reporting a problem with newline characters in stream component descriptions
+ of EPG data from BSkyB's "MTV MUSIC"
+ for suggesting to make BIDI support check at runtime whether the system runs with
+ UTF-8
diff --git a/HISTORY b/HISTORY
index c74c1a07e..18fa7071e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6780,3 +6780,58 @@ Video Disk Recorder Revision History
 - Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg).
 - Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg).
 - Fixed a crash with malformed SI data (patch from vdr-portal).
+
+2012-01-15: Version 1.7.23
+
+- Removed the '.pl' suffix from svdrpsend.pl (sorry, I missed that one).
+- Fixed bonding more than two devices.
+- Fixed handling symbolic links in cRecordings::ScanVideoDir() (reported by
+  Sundararaj Reel).
+- Fixed a memory leak in cRecordings::ScanVideoDir() in case there are too many
+  link levels (reported by Sundararaj Reel).
+- Removed redundant memset() in the ctor of cSatCableNumbers (triggered by
+  Ville Skytt� pointing out that the argument sequence in the call was wrong).
+- Removed a redundant NULL check in cDvbSpuDecoder::setTime() (thanks to Ville Skytt�).
+- Added HasSnr to the DEBUG_SIGNALQUALITY output in cDvbTuner::GetSignalQuality()
+  (triggered by Ville Skytt� pointing out that the variable HasSnr was unused).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added support for HbbTV to libsi (thanks to Christoph Haubrich).
+- Added support for devices with more than one delivery system per frontend.
+  This requires a DVB driver with version 5.5 or higher that can handle the
+  DTV_ENUM_DELSYS call. With older drivers it will fall back to one delivery
+  system per frontend.
+- Updated the Hungarian language texts (thanks to Istv�n F�ley).
+- cDvbTuner::ExecuteDiseqc() now makes sure only one tuner sends SCR commands
+  at any given time (reported by Frank Neumann).
+- cEvent::FixEpgBugs() now replaces any newline characters in stream component
+  descriptions with blanks (thanks to Torsten Lang for reporting a problem with
+  EPG data from BSkyB's "MTV MUSIC", S28.2E-2-2010-7012).
+- Fixed cDvbSubtitleConverter::SetOsdData() (thanks to Rolf Ahrenberg).
+- Fixed cListBase::Move() in case From and To are equal (reported by Sundararaj
+  Reel).
+- Added support for DVB-T2 to libsi (thanks to Rolf Ahrenberg).
+- Added support for handling DVB-T2 transponders.  This requires a DVB driver
+  with version 5.3 or higher that can handle the DTV_DVBT2_PLP_ID call (thanks
+  to Rolf Ahrenberg).
+- Fixed cConfig::Load() for g++ version 4.7.0 (thanks to Ville Skytt�).
+- Fixed a possible memory corruption in cTsToPes::GetPes() in case of broken
+  TS packets, e.g. when switching channels.
+- Fixed the SVDRP command CLRE for a single channel in case there are events
+  that have a timer (thanks to Timo Eskola).
+- BIDI support now checks at runtime whether the system runs with UTF-8 (suggested
+  by Torsten Lang).
+- Added member functions Adapter() and Frontend() to cDvbDevice (suggested by
+  Rolf Ahrenberg).
+- The parameters that are only used by "second generation" delivery systems (DVB-S2
+  and DVB-T2) are no longer written into channels.conf for "first generation"
+  delivery systems (DVB-S and DVB-T).
+- Changed IndexToHMSF() so that it can handle negative Index values.
+- Added option -N to the msgmerge call in the Makefile, because fuzzy translation
+  mostly resulted in useless strings.
+- The new setup option "Replay/Show remaining time" can be used to switch between
+  showing the total length or the remaining time of the recording that is currently
+  replayed.
+- Fixed wrongfully displaying the length of a recording in the title of the replay
+  progress display.
+- Fixed frozen live view with device bonding in case the bonded master is used for
+  live viewing (reported by Uwe Scheffler).
diff --git a/MANUAL b/MANUAL
index 3e3adad39..e74314937 100644
--- a/MANUAL
+++ b/MANUAL
@@ -856,6 +856,10 @@ Version 1.6
 
   Show replay mode = no  Turns displaying the current replay mode on or off.
 
+  Show remaining time = no
+                         Defines whether the replay progress display shows the
+                         remaining time or the total length of the recording.
+
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
                          files for each recording. The valid range is 0...99, with
diff --git a/Makefile b/Makefile
index e6af30ebe..57ae2aef0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.22 2011/12/04 14:41:00 kls Exp $
+# $Id: Makefile 2.23 2012/01/14 13:09:10 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -139,7 +139,7 @@ $(I18Npot): $(wildcard *.c)
 	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index b63a81bf1..4f880c60f 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -59,3 +59,7 @@ VDR Plugin 'pictures' Revision History
 2011-11-02:
 
 - Fixed handling images that are rotated by 180 degrees in pic2mpg.
+
+2012-01-08:
+
+- Added option -o to pic2mpg.
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 17a879133..2895ca8cc 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 2.3 2011/11/02 17:20:37 kls Exp $
+# $Id: pic2mpg 2.4 2012/01/08 13:27:17 kls Exp $
 
 use File::Path;
 use File::Spec;
@@ -20,15 +20,17 @@ Usage: $0 [options] picture-dir mpeg-dir
 
 Options: -f             Force conversion
          -h             print Help
+         -o percent     overscan in percent
          -s size        Screen size (WIDTHxHEIGHT, default is 1920x1080)
          -v num         Verbose (0=none, 1=list files, 2=detailed)
 };
 
-getopts("fhs:v:") || die $Usage;
+getopts("fho:s:v:") || die $Usage;
 
 die $Usage if $opt_h;
 
 $Force     = $opt_f;
+$Overscan  = $opt_o || 0;
 $Size      = $opt_s || "1920x1080";
 $Verbose   = $opt_v;
 
@@ -54,6 +56,15 @@ die "$0: missing parameter\n" unless $ARGV[0] && $ARGV[1];
 die "$0: file or directory not found: $ARGV[0]\n" unless -e $ARGV[0];
 die "$0: source and destination must be different\n" if $ARGV[0] eq $ARGV[1];
 
+$Extent = $Size;
+if ($Overscan > 0) {
+   my ($x, $y) = $Size =~ /(.*)x(.*)/;
+   my $r = (100 + $Overscan) / 100;
+   $x = int($x * $r + 0.5);
+   $y = int($y * $r + 0.5);
+   $Extent = "${x}x$y";
+   }
+
 # Convert a single file:
 
 if (-f $ARGV[0]) {
@@ -130,7 +141,7 @@ sub ConvertFile
   $Pict = EscapeMeta($Pict);
   $Mpeg = EscapeMeta($Mpeg);
   print "$Pict -> $Mpeg $Rotate\n" if $ListFiles;
-  my $Cmd = "convert $Pict -background '#000000' $Rotate -resize $Size -gravity center -extent $Size ppm:- | "
+  my $Cmd = "convert $Pict -background '#000000' $Rotate -resize $Size -gravity center -extent $Extent ppm:- | "
           . "ffmpeg -f image2pipe -vcodec ppm -i pipe:0 -an -vcodec libx264 -vpre baseline -s $Size -qscale 2 -f mpegts -y $Mpeg "
           . ($Detailed ? "" : "2>/dev/null");
   !system($Cmd) || die "$Cmd: $!\n";
diff --git a/config.c b/config.c
index 94f684541..9015a531a 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.16 2011/12/03 15:21:30 kls Exp $
+ * $Id: config.c 2.18 2012/01/14 13:04:59 kls Exp $
  */
 
 #include "config.h"
@@ -69,7 +69,6 @@ cSatCableNumbers::cSatCableNumbers(int Size, const char *s)
 {
   size = Size;
   array = MALLOC(int, size);
-  memset(array, size * sizeof(int), 0);
   FromString(s);
 }
 
@@ -454,6 +453,7 @@ cSetup::cSetup(void)
   NextWakeupTime = 0;
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
+  ShowRemainingTime = 0;
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
@@ -648,6 +648,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "NextWakeupTime"))      NextWakeupTime     = atoi(Value);
   else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
   else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
+  else if (!strcasecmp(Name, "ShowRemainingTime"))   ShowRemainingTime  = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
@@ -745,6 +746,7 @@ bool cSetup::Save(void)
   Store("NextWakeupTime",     NextWakeupTime);
   Store("MultiSpeedMode",     MultiSpeedMode);
   Store("ShowReplayMode",     ShowReplayMode);
+  Store("ShowRemainingTime",  ShowRemainingTime);
   Store("ResumeID",           ResumeID);
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
diff --git a/config.h b/config.h
index 73db58f00..d27afd9c0 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.36 2011/12/03 14:19:52 kls Exp $
+ * $Id: config.h 2.39 2012/01/14 13:03:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.22"
-#define VDRVERSNUM   10722  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.23"
+#define VDRVERSNUM   10723  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.22"
-#define APIVERSNUM   10722  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.23"
+#define APIVERSNUM   10723  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -122,7 +122,7 @@ template<class T> class cConfig : public cList<T> {
                 if (!isempty(s)) {
                    T *l = new T;
                    if (l->Parse(s))
-                      Add(l);
+                      this->Add(l);
                    else {
                       esyslog("ERROR: error in %s, line %d", fileName, line);
                       delete l;
@@ -302,6 +302,7 @@ class cSetup : public cConfig<cSetupLine> {
   time_t NextWakeupTime;
   int MultiSpeedMode;
   int ShowReplayMode;
+  int ShowRemainingTime;
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
diff --git a/dvbdevice.c b/dvbdevice.c
index 163fce366..39153970e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.48 2011/12/03 15:24:27 kls Exp $
+ * $Id: dvbdevice.c 2.56 2012/01/15 14:31:47 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -44,9 +44,12 @@ const tDvbParameterMap InversionValues[] = {
   };
 
 const tDvbParameterMap BandwidthValues[] = {
-  {   6, 6000000, "6 MHz" },
-  {   7, 7000000, "7 MHz" },
-  {   8, 8000000, "8 MHz" },
+  {    5,  5000000, "5 MHz" },
+  {    6,  6000000, "6 MHz" },
+  {    7,  7000000, "7 MHz" },
+  {    8,  8000000, "8 MHz" },
+  {   10, 10000000, "10 MHz" },
+  { 1712,  1712000, "1.712 MHz" },
   {  -1, 0, NULL }
   };
 
@@ -75,31 +78,49 @@ const tDvbParameterMap ModulationValues[] = {
   {   2, QPSK,     "QPSK" },
   {   5, PSK_8,    "8PSK" },
   {   6, APSK_16,  "16APSK" },
+  {   7, APSK_32,  "32APSK" },
   {  10, VSB_8,    "VSB8" },
   {  11, VSB_16,   "VSB16" },
-  { 998, QAM_AUTO, "QAMAUTO" },
+  {  12, DQPSK,    "DQPSK" },
+  { 999, QAM_AUTO, trNOOP("auto") },
   {  -1, 0, NULL }
   };
 
-const tDvbParameterMap SystemValues[] = {
-  {   0, SYS_DVBS,  "DVB-S" },
-  {   1, SYS_DVBS2, "DVB-S2" },
+#define DVB_SYSTEM_1 0 // see also nit.c
+#define DVB_SYSTEM_2 1
+
+const tDvbParameterMap SystemValuesSat[] = {
+  {   0, DVB_SYSTEM_1, "DVB-S" },
+  {   1, DVB_SYSTEM_2, "DVB-S2" },
+  {  -1, 0, NULL }
+  };
+
+const tDvbParameterMap SystemValuesTerr[] = {
+  {   0, DVB_SYSTEM_1, "DVB-T" },
+  {   1, DVB_SYSTEM_2, "DVB-T2" },
   {  -1, 0, NULL }
   };
 
 const tDvbParameterMap TransmissionValues[] = {
+  {   1, TRANSMISSION_MODE_1K,   "1K" },
   {   2, TRANSMISSION_MODE_2K,   "2K" },
+  {   4, TRANSMISSION_MODE_4K,   "4K" },
   {   8, TRANSMISSION_MODE_8K,   "8K" },
+  {  16, TRANSMISSION_MODE_16K,  "16K" },
+  {  32, TRANSMISSION_MODE_32K,  "32K" },
   { 999, TRANSMISSION_MODE_AUTO, trNOOP("auto") },
   {  -1, 0, NULL }
   };
 
 const tDvbParameterMap GuardValues[] = {
-  {   4, GUARD_INTERVAL_1_4,  "1/4" },
-  {   8, GUARD_INTERVAL_1_8,  "1/8" },
-  {  16, GUARD_INTERVAL_1_16, "1/16" },
-  {  32, GUARD_INTERVAL_1_32, "1/32" },
-  { 999, GUARD_INTERVAL_AUTO, trNOOP("auto") },
+  {     4, GUARD_INTERVAL_1_4,    "1/4" },
+  {     8, GUARD_INTERVAL_1_8,    "1/8" },
+  {    16, GUARD_INTERVAL_1_16,   "1/16" },
+  {    32, GUARD_INTERVAL_1_32,   "1/32" },
+  {   128, GUARD_INTERVAL_1_128,  "1/128" },
+  { 19128, GUARD_INTERVAL_19_128, "19/128" },
+  { 19256, GUARD_INTERVAL_19_256, "19/256" },
+  {   999, GUARD_INTERVAL_AUTO,   trNOOP("auto") },
   {  -1, 0, NULL }
   };
 
@@ -179,11 +200,12 @@ cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
   coderateH    = FEC_AUTO;
   coderateL    = FEC_AUTO;
   modulation   = QPSK;
-  system       = SYS_DVBS;
+  system       = DVB_SYSTEM_1;
   transmission = TRANSMISSION_MODE_AUTO;
   guard        = GUARD_INTERVAL_AUTO;
   hierarchy    = HIERARCHY_AUTO;
   rollOff      = ROLLOFF_AUTO;
+  plpId        = 0;
   Parse(Parameters);
 }
 
@@ -194,21 +216,22 @@ int cDvbTransponderParameters::PrintParameter(char *p, char Name, int Value) con
 
 cString cDvbTransponderParameters::ToString(char Type) const
 {
-#define ST(s) if (strchr(s, Type))
+#define ST(s) if (strchr(s, Type) && (strchr(s, '0' + system + 1) || strchr(s, '*')))
   char buffer[64];
   char *q = buffer;
   *q = 0;
-  ST("  S ")  q += sprintf(q, "%c", polarization);
-  ST("   T")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
-  ST(" CST")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
-  ST("   T")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
-  ST("   T")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
-  ST("ACST")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
-  ST("ACST")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
-  ST("  S ")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST("  S ")  q += PrintParameter(q, 'S', MapToUser(system, SystemValues));
-  ST("   T")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
-  ST("   T")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
+  ST("  S *")  q += sprintf(q, "%c", polarization);
+  ST("   T*")  q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
+  ST(" CST*")  q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
+  ST("   T*")  q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
+  ST("   T*")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+  ST("ACST*")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+  ST("ACST*")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST("  S 2")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
+  ST("   T2")  q += PrintParameter(q, 'P', plpId);
+  ST("  ST*")  q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter
+  ST("   T*")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+  ST("   T*")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
   return buffer;
 }
 
@@ -219,7 +242,7 @@ const char *cDvbTransponderParameters::ParseParameter(const char *s, int &Value,
      errno = 0;
      int n = strtol(s, &p, 10);
      if (!errno && p != s) {
-        Value = MapToDriver(n, Map);
+        Value = Map ? MapToDriver(n, Map) : n;
         if (Value >= 0)
            return p;
         }
@@ -241,8 +264,9 @@ bool cDvbTransponderParameters::Parse(const char *s)
           case 'L': polarization = *s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
           case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
+          case 'P': s = ParseParameter(s, plpId); break;
           case 'R': polarization = *s++; break;
-          case 'S': s = ParseParameter(s, system, SystemValues); break;
+          case 'S': s = ParseParameter(s, system, SystemValuesSat); break; // we only need the numerical value, so Sat or Terr doesn't matter
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = *s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
@@ -268,10 +292,10 @@ class cDvbTuner : public cThread {
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
-  fe_delivery_system frontendType;
   cChannel channel;
   const cDiseqc *lastDiseqc;
   const cScr *scr;
+  bool lnbPowerTurnedOn;
   eTunerStatus tunerStatus;
   cMutex mutex;
   cCondVar locked;
@@ -279,6 +303,7 @@ class cDvbTuner : public cThread {
   cDvbTuner *bondedTuner;
   bool bondedMaster;
   bool bondedMasterFailed;
+  bool SetFrontendType(const cChannel *Channel);
   cString GetBondingParams(const cChannel *Channel = NULL) const;
   void ClearEventQueue(void) const;
   bool GetFrontendStatus(fe_status_t &Status) const;
@@ -287,7 +312,7 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType);
+  cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend);
   virtual ~cDvbTuner();
   bool Bond(cDvbTuner *Tuner);
   void UnBond(void);
@@ -304,25 +329,23 @@ class cDvbTuner : public cThread {
 
 cMutex cDvbTuner::bondMutex;
 
-cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
+cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
 {
   device = Device;
   fd_frontend = Fd_Frontend;
   adapter = Adapter;
   frontend = Frontend;
-  frontendType = FrontendType;
   subsystemId = cDvbDeviceProbe::GetSubsystemId(adapter, frontend);
   tuneTimeout = 0;
   lockTimeout = 0;
   lastTimeoutReport = 0;
   lastDiseqc = NULL;
   scr = NULL;
+  lnbPowerTurnedOn = false;
   tunerStatus = tsIdle;
   bondedTuner = NULL;
   bondedMaster = false;
   bondedMasterFailed = false;
-  if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
-     ResetToneAndVoltage(); // must explicitly turn on LNB power
   SetDescription("tuner on frontend %d/%d", adapter, frontend);
   Start();
 }
@@ -346,16 +369,12 @@ bool cDvbTuner::Bond(cDvbTuner *Tuner)
 {
   cMutexLock MutexLock(&bondMutex);
   if (!bondedTuner) {
-     if ((frontendType == SYS_DVBS || frontendType == SYS_DVBS2) && (Tuner->frontendType == SYS_DVBS || Tuner->frontendType == SYS_DVBS2)) {
-        ResetToneAndVoltage();
-        bondedMaster = false; // makes sure we don't disturb an existing master
-        bondedTuner = Tuner->bondedTuner ? Tuner->bondedTuner : Tuner;
-        Tuner->bondedTuner = this;
-        dsyslog("tuner %d/%d bonded with tuner %d/%d", adapter, frontend, bondedTuner->adapter, bondedTuner->frontend);
-        return true;
-        }
-     else
-        esyslog("ERROR: can't bond tuner %d/%d with tuner %d/%d (only DVB-S(2) tuners can be bonded)", adapter, frontend, Tuner->adapter, Tuner->frontend);
+     ResetToneAndVoltage();
+     bondedMaster = false; // makes sure we don't disturb an existing master
+     bondedTuner = Tuner->bondedTuner ? Tuner->bondedTuner : Tuner;
+     Tuner->bondedTuner = this;
+     dsyslog("tuner %d/%d bonded with tuner %d/%d", adapter, frontend, bondedTuner->adapter, bondedTuner->frontend);
+     return true;
      }
   else
      esyslog("ERROR: tuner %d/%d already bonded with tuner %d/%d, can't bond with tuner %d/%d", adapter, frontend, bondedTuner->adapter, bondedTuner->frontend, Tuner->adapter, Tuner->frontend);
@@ -468,7 +487,7 @@ void cDvbTuner::SetChannel(const cChannel *Channel)
                   t->SetChannel(NULL);
               }
            }
-        else if (!BondedMaster->device->Receiving())
+        else if (strcmp(GetBondingParams(Channel), BondedMaster->GetBondingParams()) != 0)
            BondedMaster->SetChannel(Channel);
         }
      cMutexLock MutexLock(&mutex);
@@ -618,7 +637,7 @@ int cDvbTuner::GetSignalQuality(void) const
      if (q > 100)
         q = 100;
 #ifdef DEBUG_SIGNALQUALITY
-     fprintf(stderr, "FE %d/%d: %08X Q = %04X %04X %5d %5d %3d%%\n", adapter, frontend, subsystemId, MaxSnr, Snr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
+     fprintf(stderr, "FE %d/%d: %08X Q = %04X %04X %d %5d %5d %3d%%\n", adapter, frontend, subsystemId, MaxSnr, Snr, HasSnr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
 #endif
      return q;
      }
@@ -634,6 +653,13 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
 {
+  if (!lnbPowerTurnedOn) {
+     CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
+     lnbPowerTurnedOn = true;
+     }
+  static cMutex Mutex;
+  if (Diseqc->IsScr())
+     Mutex.Lock(); 
   struct dvb_diseqc_master_cmd cmd;
   const char *CurrentAction = NULL;
   for (;;) {
@@ -654,6 +680,8 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
       }
   if (scr)
      ResetToneAndVoltage(); // makes sure we don't block the bus!
+  if (Diseqc->IsScr())
+     Mutex.Unlock(); 
 }
 
 void cDvbTuner::ResetToneAndVoltage(void)
@@ -662,6 +690,22 @@ void cDvbTuner::ResetToneAndVoltage(void)
   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
 }
 
+static int GetRequiredDeliverySystem(const cChannel *Channel, const cDvbTransponderParameters *Dtp)
+{
+  int ds = SYS_UNDEFINED;
+  if (Channel->IsAtsc())
+     ds = SYS_ATSC;
+  else if (Channel->IsCable())
+     ds = SYS_DVBC_ANNEX_AC;
+  else if (Channel->IsSat())
+     ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBS : SYS_DVBS2;
+  else if (Channel->IsTerr())
+     ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBT : SYS_DVBT2;
+  else
+     esyslog("ERROR: can't determine frontend type for channel %d", Channel->Number());
+  return ds;
+}
+
 bool cDvbTuner::SetFrontend(void)
 {
 #define MAXFRONTENDCMDS 16
@@ -686,6 +730,12 @@ bool cDvbTuner::SetFrontend(void)
 
   cDvbTransponderParameters dtp(channel.Parameters());
 
+  // Determine the required frontend type:
+  int frontendType = GetRequiredDeliverySystem(&channel, &dtp);
+  if (frontendType == SYS_UNDEFINED)
+     return false;
+
+  SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
      unsigned int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
@@ -728,22 +778,15 @@ bool cDvbTuner::SetFrontend(void)
      frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF
 
      // DVB-S/DVB-S2 (common parts)
-     SETCMD(DTV_DELIVERY_SYSTEM, dtp.System());
      SETCMD(DTV_FREQUENCY, frequency * 1000UL);
      SETCMD(DTV_MODULATION, dtp.Modulation());
      SETCMD(DTV_SYMBOL_RATE, channel.Srate() * 1000UL);
      SETCMD(DTV_INNER_FEC, dtp.CoderateH());
      SETCMD(DTV_INVERSION, dtp.Inversion());
-     if (dtp.System() == SYS_DVBS2) {
-        if (frontendType == SYS_DVBS2) {
-           // DVB-S2
-           SETCMD(DTV_PILOT, PILOT_AUTO);
-           SETCMD(DTV_ROLLOFF, dtp.RollOff());
-           }
-        else {
-           esyslog("ERROR: frontend %d/%d doesn't provide DVB-S2", adapter, frontend);
-           return false;
-           }
+     if (frontendType == SYS_DVBS2) {
+        // DVB-S2
+        SETCMD(DTV_PILOT, PILOT_AUTO);
+        SETCMD(DTV_ROLLOFF, dtp.RollOff());
         }
      else {
         // DVB-S
@@ -755,7 +798,6 @@ bool cDvbTuner::SetFrontend(void)
      }
   else if (frontendType == SYS_DVBC_ANNEX_AC || frontendType == SYS_DVBC_ANNEX_B) {
      // DVB-C
-     SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
      SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
      SETCMD(DTV_INVERSION, dtp.Inversion());
      SETCMD(DTV_SYMBOL_RATE, channel.Srate() * 1000UL);
@@ -765,9 +807,8 @@ bool cDvbTuner::SetFrontend(void)
      tuneTimeout = DVBC_TUNE_TIMEOUT;
      lockTimeout = DVBC_LOCK_TIMEOUT;
      }
-  else if (frontendType == SYS_DVBT) {
-     // DVB-T
-     SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
+  else if (frontendType == SYS_DVBT || frontendType == SYS_DVBT2) {
+     // DVB-T/DVB-T2 (common parts)
      SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
      SETCMD(DTV_INVERSION, dtp.Inversion());
      SETCMD(DTV_BANDWIDTH_HZ, dtp.Bandwidth());
@@ -777,13 +818,16 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_TRANSMISSION_MODE, dtp.Transmission());
      SETCMD(DTV_GUARD_INTERVAL, dtp.Guard());
      SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
+     if (frontendType == SYS_DVBT2) {
+        // DVB-T2
+        SETCMD(DTV_DVBT2_PLP_ID, dtp.PlpId());
+        }
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
      lockTimeout = DVBT_LOCK_TIMEOUT;
      }
   else if (frontendType == SYS_ATSC) {
      // ATSC
-     SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
      SETCMD(DTV_FREQUENCY, FrequencyToHz(channel.Frequency()));
      SETCMD(DTV_INVERSION, dtp.Inversion());
      SETCMD(DTV_MODULATION, dtp.Modulation());
@@ -903,11 +947,12 @@ void cDvbSourceParam::GetData(cChannel *Channel)
 cOsdItem *cDvbSourceParam::GetOsdItem(void)
 {
   char type = Source();
+  const tDvbParameterMap *SystemValues = type == 'S' ? SystemValuesSat : SystemValuesTerr;
 #undef ST
 #define ST(s) if (strchr(s, type))
   switch (param++) {
     case  0: ST("  S ")  return new cMenuEditChrItem( tr("Polarization"), &dtp.polarization, "HVLR");             else return GetOsdItem();
-    case  1: ST("  S ")  return new cMenuEditMapItem( tr("System"),       &dtp.system,       SystemValues);       else return GetOsdItem();
+    case  1: ST("  ST")  return new cMenuEditMapItem( tr("System"),       &dtp.system,       SystemValues);       else return GetOsdItem();
     case  2: ST(" CS ")  return new cMenuEditIntItem( tr("Srate"),        &srate);                                else return GetOsdItem();
     case  3: ST("ACST")  return new cMenuEditMapItem( tr("Inversion"),    &dtp.inversion,    InversionValues);    else return GetOsdItem();
     case  4: ST(" CST")  return new cMenuEditMapItem( tr("CoderateH"),    &dtp.coderateH,    CoderateValues);     else return GetOsdItem();
@@ -918,6 +963,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
     case  9: ST("   T")  return new cMenuEditMapItem( tr("Guard"),        &dtp.guard,        GuardValues);        else return GetOsdItem();
     case 10: ST("   T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
     case 11: ST("  S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
+    case 12: ST("   T")  return new cMenuEditIntItem( tr("PlpId"),        &dtp.plpId,        0, 255);             else return GetOsdItem();
     default: return NULL;
     }
   return NULL;
@@ -928,7 +974,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 cMutex cDvbDevice::bondMutex;
 
-const char *DeliverySystems[] = {
+const char *DeliverySystemNames[] = {
   "UNDEFINED",
   "DVB-C",
   "DVB-C",
@@ -945,6 +991,8 @@ const char *DeliverySystems[] = {
   "DMBTH",
   "CMMB",
   "DAB",
+  "DVB-T2",
+  "TURBO",
   NULL
   };
 
@@ -954,8 +1002,8 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
   frontend = Frontend;
   ciAdapter = NULL;
   dvbTuner = NULL;
-  frontendType = SYS_UNDEFINED;
-  numProvidedSystems = 0;
+  numDeliverySystems = 0;
+  numModulations = 0;
   bondedDevice = NULL;
   needsDetachBondedReceivers = false;
 
@@ -976,39 +1024,8 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
   if (fd_frontend >= 0) {
-     if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) >= 0) {
-        switch (frontendInfo.type) {
-          case FE_QPSK: frontendType = (frontendInfo.caps & FE_CAN_2G_MODULATION) ? SYS_DVBS2 : SYS_DVBS; break;
-          case FE_OFDM: frontendType = SYS_DVBT; break;
-          case FE_QAM:  frontendType = SYS_DVBC_ANNEX_AC; break;
-          case FE_ATSC: frontendType = SYS_ATSC; break;
-          default: esyslog("ERROR: unknown frontend type %d on frontend %d/%d", frontendInfo.type, adapter, frontend);
-          }
-        }
-     else
-        LOG_ERROR;
-     if (frontendType != SYS_UNDEFINED) {
-        numProvidedSystems++;
-        if (frontendType == SYS_DVBS2)
-           numProvidedSystems++;
-        char Modulations[64];
-        char *p = Modulations;
-        if (frontendInfo.caps & FE_CAN_QPSK)    { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QPSK, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_QAM_16)  { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_16, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_QAM_32)  { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_32, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_QAM_64)  { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_64, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_QAM_128) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_128, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_QAM_256) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_256, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_8VSB)    { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(VSB_8, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_16VSB)   { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(VSB_16, ModulationValues)); }
-        if (frontendInfo.caps & FE_CAN_TURBO_FEC){numProvidedSystems++; p += sprintf(p, ",%s", "TURBO_FEC"); }
-        if (p != Modulations)
-           p = Modulations + 1; // skips first ','
-        else
-           p = (char *)"unknown modulations";
-        isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], p, frontendInfo.name);
-        dvbTuner = new cDvbTuner(this, fd_frontend, adapter, frontend, frontendType);
-        }
+     if (QueryDeliverySystems(fd_frontend))
+        dvbTuner = new cDvbTuner(this, fd_frontend, adapter, frontend);
      }
   else
      esyslog("ERROR: can't open DVB device %d/%d", adapter, frontend);
@@ -1106,6 +1123,74 @@ bool cDvbDevice::Initialize(void)
   return Found > 0;
 }
 
+bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
+{
+  numDeliverySystems = 0;
+  if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) < 0) {
+     LOG_ERROR;
+     return false;
+     }
+#if DVB_API_VERSION > 5 || DVB_API_VERSION_MINOR >= 5
+  dtv_property Frontend[1];
+  memset(&Frontend, 0, sizeof(Frontend));
+  dtv_properties CmdSeq;
+  memset(&CmdSeq, 0, sizeof(CmdSeq));
+  CmdSeq.props = Frontend;
+  SETCMD(DTV_ENUM_DELSYS, 0);
+  int Result = ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq);
+  if (Result == 0) {
+     for (uint i = 0; i < Frontend[0].u.buffer.len; i++) {
+         if (numDeliverySystems >= MAXDELIVERYSYSTEMS) {
+            esyslog("ERROR: too many delivery systems on frontend %d/%d", adapter, frontend);
+            break;
+            }
+         deliverySystems[numDeliverySystems++] = Frontend[0].u.buffer.data[i];
+         }
+     }
+  else {
+     esyslog("ERROR: can't query delivery systems on frontend %d/%d - falling back to legacy mode", adapter, frontend);
+#else
+     {
+#endif
+     // Legacy mode (DVB-API < 5.5):
+     switch (frontendInfo.type) {
+       case FE_QPSK: deliverySystems[numDeliverySystems++] = SYS_DVBS;
+                     if (frontendInfo.caps & FE_CAN_2G_MODULATION)
+                        deliverySystems[numDeliverySystems++] = SYS_DVBS2;
+                     break;
+       case FE_OFDM: deliverySystems[numDeliverySystems++] = SYS_DVBT;
+                     if (frontendInfo.caps & FE_CAN_2G_MODULATION)
+                        deliverySystems[numDeliverySystems++] = SYS_DVBT2;
+                     break;
+       case FE_QAM:  deliverySystems[numDeliverySystems++] = SYS_DVBC_ANNEX_AC; break;
+       case FE_ATSC: deliverySystems[numDeliverySystems++] = SYS_ATSC; break;
+       default: esyslog("ERROR: unknown frontend type %d on frontend %d/%d", frontendInfo.type, adapter, frontend);
+       }
+     }
+  if (numDeliverySystems > 0) {
+     cString ds("");
+     for (int i = 0; i < numDeliverySystems; i++)
+         ds = cString::sprintf("%s%s%s", *ds, i ? "," : "", DeliverySystemNames[deliverySystems[i]]);
+     cString ms("");
+     if (frontendInfo.caps & FE_CAN_QPSK)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QPSK, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_16)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_16, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_32)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_32, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_64)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_64, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_128)   { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_128, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_256)   { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_256, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_8VSB)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(VSB_8, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_16VSB)     { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(VSB_16, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_TURBO_FEC) { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", "TURBO_FEC"); }
+     if (!**ms)
+        ms = "unknown modulations";
+     isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, *ds, *ms, frontendInfo.name);
+     return true;
+     }
+  else
+     esyslog("ERROR: frontend %d/%d doesn't provide any delivery systems", adapter, frontend);
+  return false;
+}
+
 bool cDvbDevice::Ready(void)
 {
   if (ciAdapter)
@@ -1126,7 +1211,7 @@ bool cDvbDevice::BondDevices(const char *Bondings)
                if (cDevice *Device2 = cDevice::GetDevice(d)) {
                   if (cDvbDevice *DvbDevice1 = dynamic_cast<cDvbDevice *>(Device1)) {
                      if (cDvbDevice *DvbDevice2 = dynamic_cast<cDvbDevice *>(Device2)) {
-                        if (!DvbDevice2->Bond(DvbDevice1))
+                        if (!DvbDevice1->Bond(DvbDevice2))
                            return false; // Bond() has already logged the error
                         }
                      else
@@ -1167,7 +1252,7 @@ bool cDvbDevice::Bond(cDvbDevice *Device)
   cMutexLock MutexLock(&bondMutex);
   if (!bondedDevice) {
      if (Device != this) {
-        if ((frontendType == SYS_DVBS || frontendType == SYS_DVBS2) && (Device->frontendType == SYS_DVBS || Device->frontendType == SYS_DVBS2)) {
+        if ((ProvidesDeliverySystem(SYS_DVBS) || ProvidesDeliverySystem(SYS_DVBS2)) && (Device->ProvidesDeliverySystem(SYS_DVBS) || Device->ProvidesDeliverySystem(SYS_DVBS2))) {
            if (dvbTuner && Device->dvbTuner && dvbTuner->Bond(Device->dvbTuner)) {
               bondedDevice = Device->bondedDevice ? Device->bondedDevice : Device;
               Device->bondedDevice = this;
@@ -1285,14 +1370,23 @@ void cDvbDevice::CloseFilter(int Handle)
   close(Handle);
 }
 
+bool cDvbDevice::ProvidesDeliverySystem(int DeliverySystem) const
+{
+  for (int i = 0; i < numDeliverySystems; i++) {
+      if (deliverySystems[i] == DeliverySystem)
+         return true;
+      }
+  return false;
+}
+
 bool cDvbDevice::ProvidesSource(int Source) const
 {
   int type = Source & cSource::st_Mask;
   return type == cSource::stNone
-      || type == cSource::stAtsc  && (frontendType == SYS_ATSC)
-      || type == cSource::stCable && (frontendType == SYS_DVBC_ANNEX_AC || frontendType == SYS_DVBC_ANNEX_B)
-      || type == cSource::stSat   && (frontendType == SYS_DVBS || frontendType == SYS_DVBS2)
-      || type == cSource::stTerr  && (frontendType == SYS_DVBT);
+      || type == cSource::stAtsc  && ProvidesDeliverySystem(SYS_ATSC)
+      || type == cSource::stCable && (ProvidesDeliverySystem(SYS_DVBC_ANNEX_AC) || ProvidesDeliverySystem(SYS_DVBC_ANNEX_B))
+      || type == cSource::stSat   && (ProvidesDeliverySystem(SYS_DVBS) || ProvidesDeliverySystem(SYS_DVBS2))
+      || type == cSource::stTerr  && (ProvidesDeliverySystem(SYS_DVBT) || ProvidesDeliverySystem(SYS_DVBT2));
 }
 
 bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
@@ -1300,7 +1394,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
   if (!ProvidesSource(Channel->Source()))
      return false; // doesn't provide source
   cDvbTransponderParameters dtp(Channel->Parameters());
-  if (dtp.System() == SYS_DVBS2 && frontendType == SYS_DVBS ||
+  if (!ProvidesDeliverySystem(GetRequiredDeliverySystem(Channel, &dtp)) ||
      dtp.Modulation() == QPSK     && !(frontendInfo.caps & FE_CAN_QPSK) ||
      dtp.Modulation() == QAM_16   && !(frontendInfo.caps & FE_CAN_QAM_16) ||
      dtp.Modulation() == QAM_32   && !(frontendInfo.caps & FE_CAN_QAM_32) ||
@@ -1375,7 +1469,7 @@ bool cDvbDevice::ProvidesEIT(void) const
 
 int cDvbDevice::NumProvidedSystems(void) const
 {
-  return numProvidedSystems;
+  return numDeliverySystems + numModulations;
 }
 
 int cDvbDevice::SignalStrength(void) const
diff --git a/dvbdevice.h b/dvbdevice.h
index 2072ab201..96dfa4218 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,22 +4,22 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.18 2011/12/04 13:38:17 kls Exp $
+ * $Id: dvbdevice.h 2.21 2012/01/13 11:32:45 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
 #define __DVBDEVICE_H
 
-#include <sys/mman.h> // FIXME: workaround for broken linux-dvb header files
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/version.h>
 #include "device.h"
 
-#if DVB_API_VERSION < 5
-#error VDR requires Linux DVB driver API version 5.0 or higher!
+#if DVB_API_VERSION < 5 || (DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR < 3)
+#error VDR requires Linux DVB driver API version 5.3 or higher!
 #endif
 
 #define MAXDVBDEVICES  8
+#define MAXDELIVERYSYSTEMS 8
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -47,7 +47,8 @@ extern const tDvbParameterMap InversionValues[];
 extern const tDvbParameterMap BandwidthValues[];
 extern const tDvbParameterMap CoderateValues[];
 extern const tDvbParameterMap ModulationValues[];
-extern const tDvbParameterMap SystemValues[];
+extern const tDvbParameterMap SystemValuesSat[];
+extern const tDvbParameterMap SystemValuesTerr[];
 extern const tDvbParameterMap TransmissionValues[];
 extern const tDvbParameterMap GuardValues[];
 extern const tDvbParameterMap HierarchyValues[];
@@ -67,8 +68,9 @@ friend class cDvbSourceParam;
   int guard;
   int hierarchy;
   int rollOff;
+  int plpId;
   int PrintParameter(char *p, char Name, int Value) const;
-  const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map);
+  const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map = NULL);
 public:
   cDvbTransponderParameters(const char *Parameters = NULL);
   char Polarization(void) const { return polarization; }
@@ -82,6 +84,7 @@ friend class cDvbSourceParam;
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
   int RollOff(void) const { return rollOff; }
+  int PlpId(void) const { return plpId; }
   void SetPolarization(char Polarization) { polarization = Polarization; }
   void SetInversion(int Inversion) { inversion = Inversion; }
   void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; }
@@ -93,6 +96,7 @@ friend class cDvbSourceParam;
   void SetGuard(int Guard) { guard = Guard; }
   void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; }
   void SetRollOff(int RollOff) { rollOff = RollOff; }
+  void SetPlpId(int PlpId) { plpId = PlpId; }
   cString ToString(char Type) const;
   bool Parse(const char *s);
   };
@@ -119,15 +123,19 @@ class cDvbDevice : public cDevice {
   int adapter, frontend;
 private:
   dvb_frontend_info frontendInfo;
-  int numProvidedSystems;
-  fe_delivery_system frontendType;
+  int deliverySystems[MAXDELIVERYSYSTEMS];
+  int numDeliverySystems;
+  int numModulations;
   int fd_dvr, fd_ca;
   static cMutex bondMutex;
   cDvbDevice *bondedDevice;
   mutable bool needsDetachBondedReceivers;
+  bool QueryDeliverySystems(int fd_frontend);
 public:
   cDvbDevice(int Adapter, int Frontend);
   virtual ~cDvbDevice();
+  int Adapter(void) const { return adapter; }
+  int Frontend(void) const { return frontend; }
   virtual bool Ready(void);
   static bool BondDevices(const char *Bondings);
        ///< Bonds the devices as defined in the given Bondings string.
@@ -167,6 +175,7 @@ class cDvbDevice : public cDevice {
 private:
   cDvbTuner *dvbTuner;
 public:
+  virtual bool ProvidesDeliverySystem(int DeliverySystem) const;
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
diff --git a/dvbspu.c b/dvbspu.c
index 951e2f8c7..25af228ba 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.8 2010/01/17 13:43:27 kls Exp $
+ * $Id: dvbspu.c 2.9 2011/12/10 14:39:19 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -496,7 +496,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
     if (!spu)
         return 0;
 
-    if (spu && !clean)
+    if (!clean)
         Draw();
 
     while (DCSQ_offset != prev_DCSQ_offset) {   /* Display Control Sequences */
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 272950fa5..c29277dd6 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.20 2011/09/18 11:23:15 kls Exp $
+ * $Id: dvbsubtitle.c 2.21 2012/01/11 10:34:07 kls Exp $
  */
 
 
@@ -995,7 +995,7 @@ void cDvbSubtitleConverter::SetOsdData(void)
   double VideoAspect;
   cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect);
   cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect);
-  if (OsdWidth == displayWidth && OsdHeight == displayHeight || VideoWidth == 0) {
+  if (OsdWidth == displayWidth && OsdHeight == displayHeight || DoubleEqual(VideoAspect, 1.0)) {
      osdFactorX = osdFactorY = 1.0;
      osdDeltaX = osdDeltaY = 0;
      }
diff --git a/epg.c b/epg.c
index c2d1783da..dccef326f 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.7 2011/02/25 15:16:05 kls Exp $
+ * $Id: epg.c 2.9 2012/01/12 14:31:46 kls Exp $
  */
 
 #include "epg.h"
@@ -828,10 +828,17 @@ void cEvent::FixEpgBugs(void)
 
 Final:
 
-  // VDR can't usefully handle newline characters in the title and shortText of EPG
+  // VDR can't usefully handle newline characters in the title, shortText or component description of EPG
   // data, so let's always convert them to blanks (independent of the setting of EPGBugfixLevel):
   strreplace(title, '\n', ' ');
   strreplace(shortText, '\n', ' ');
+  if (components) {
+     for (int i = 0; i < components->NumComponents(); i++) {
+         tComponent *p = components->Component(i);
+         if (p->description)
+            strreplace(p->description, '\n', ' ');
+         }
+     }
   /* TODO adapt to UTF-8
   // Same for control characters:
   strreplace(title, '\x86', ' ');
@@ -1022,10 +1029,15 @@ void cSchedule::Cleanup(void)
 
 void cSchedule::Cleanup(time_t Time)
 {
-  cEvent *Event;
-  while ((Event = events.First()) != NULL) {
-        if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) // adding one hour for safety
-           DelEvent(Event);
+  cEvent *Event = events.First();
+  while (Event) {
+        if (Event->HasTimer())
+           Event = (cEvent *)Event->Next();
+        else if (Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
+           cEvent *e = Event;
+           Event = (cEvent *)Event->Next();
+           DelEvent(e);
+           }
         else
            break;
         }
diff --git a/font.c b/font.c
index 16d1013c3..b3913451e 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.8 2011/03/28 16:29:51 kls Exp $
+ * $Id: font.c 2.9 2012/01/13 09:43:22 kls Exp $
  */
 
 #include "font.h"
@@ -508,25 +508,27 @@ cString cFont::GetFontFileName(const char *FontName)
 #ifdef BIDI
 cString cFont::Bidi(const char *Ltr)
 {
-  fribidi_set_mirroring(true);
-  fribidi_set_reorder_nsm(false);
-  FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8;
-  int LtrLen = strlen(Ltr);
-  FriBidiCharType Base = FRIBIDI_TYPE_L;
-  FriBidiChar *Logical = MALLOC(FriBidiChar, LtrLen + 1) ;
-  int RtlLen = fribidi_charset_to_unicode(fribidiCharset, const_cast<char *>(Ltr), LtrLen, Logical);
-  FriBidiChar *Visual = MALLOC(FriBidiChar, LtrLen + 1) ;
-  char *Rtl = NULL;
-  bool ok = fribidi_log2vis(Logical, RtlLen, &Base, Visual, NULL, NULL, NULL);
-  if (ok) {
-     fribidi_remove_bidi_marks(Visual, RtlLen, NULL, NULL, NULL);
-     Rtl = MALLOC(char, RtlLen * 4 + 1);
-     fribidi_unicode_to_charset(fribidiCharset, Visual, RtlLen, Rtl);
+  if (cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8
+     fribidi_set_mirroring(true);
+     fribidi_set_reorder_nsm(false);
+     FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8;
+     int LtrLen = strlen(Ltr);
+     FriBidiCharType Base = FRIBIDI_TYPE_L;
+     FriBidiChar *Logical = MALLOC(FriBidiChar, LtrLen + 1) ;
+     int RtlLen = fribidi_charset_to_unicode(fribidiCharset, const_cast<char *>(Ltr), LtrLen, Logical);
+     FriBidiChar *Visual = MALLOC(FriBidiChar, LtrLen + 1) ;
+     char *Rtl = NULL;
+     bool ok = fribidi_log2vis(Logical, RtlLen, &Base, Visual, NULL, NULL, NULL);
+     if (ok) {
+        fribidi_remove_bidi_marks(Visual, RtlLen, NULL, NULL, NULL);
+        Rtl = MALLOC(char, RtlLen * 4 + 1);
+        fribidi_unicode_to_charset(fribidiCharset, Visual, RtlLen, Rtl);
+        }
+     free(Logical);
+     free(Visual);
+     if (ok)
+        return cString(Rtl, true);
      }
-  free(Logical);
-  free(Visual);
-  if (ok)
-     return cString(Rtl, true);
   return cString(Ltr);
 }
 #endif
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 06a58c0ae..07429b549 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 2.2 2011/06/15 21:26:00 kls Exp $
+ *   $Id: descriptor.c 2.4 2012/01/11 11:35:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -876,6 +876,52 @@ int ExtensionDescriptor::getExtensionDescriptorTag() const {
    return s->descriptor_tag_extension;
 }
 
+void T2DeliverySystemDescriptor::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const descr_t2_delivery_system>(s, offset);
+   extended_data_flag = s->descriptor_length > 0x04;
+}
+
+int T2DeliverySystemDescriptor::getExtendedDataFlag() const {
+  return extended_data_flag;
+}
+
+int T2DeliverySystemDescriptor::getExtensionDescriptorTag() const {
+   return s->descriptor_tag_extension;
+}
+
+int T2DeliverySystemDescriptor::getPlpId() const {
+   return s->plp_id;
+}
+
+int T2DeliverySystemDescriptor::getT2SystemId() const {
+   return HILO(s->t2_system_id);
+}
+
+int T2DeliverySystemDescriptor::getSisoMiso() const {
+   return extended_data_flag ? s->siso_miso : -1;
+}
+
+int T2DeliverySystemDescriptor::getBandwidth() const {
+   return extended_data_flag ? s->bandwidth : -1;
+}
+
+int T2DeliverySystemDescriptor::getGuardInterval() const {
+   return extended_data_flag ? s->guard_interval : -1;
+}
+
+int T2DeliverySystemDescriptor::getTransmissionMode() const {
+   return extended_data_flag ? s->transmission_mode : -1;
+}
+
+int T2DeliverySystemDescriptor::getOtherFrequencyFlag() const {
+   return extended_data_flag ? s->other_frequency_flag : -1;
+}
+
+int T2DeliverySystemDescriptor::getTfsFlag() const {
+   return extended_data_flag ? s->tfs_flag : -1;
+}
+
 int PremiereContentTransmissionDescriptor::getOriginalNetworkId() const {
    return HILO(s->original_network_id);
 }
@@ -1005,8 +1051,14 @@ int MHP_TransportProtocolDescriptor::getComponentTag() const {
    return componentTag;
 }
 
+char *MHP_TransportProtocolDescriptor::getUrlBase(char *buffer, int size) {
+   return UrlBase.getText(buffer, size);
+}
+
 void MHP_TransportProtocolDescriptor::Parse() {
    int offset=0;
+   remote=false;
+   componentTag=-1;
    data.setPointerAndOffset<const descr_transport_protocol>(s, offset);
    if (getProtocolId() == ObjectCarousel) {
       const transport_via_oc *oc;
@@ -1021,12 +1073,24 @@ void MHP_TransportProtocolDescriptor::Parse() {
          data.setPointerAndOffset<const transport_via_oc_end>(rem, offset);
          componentTag=rem->component_tag;
       }
-   } else { //unimplemented
-      remote=false;
-      componentTag=-1;
+   } else if (getProtocolId() == HTTPoverInteractionChannel) {
+      const transport_via_http *http;
+      data.setPointerAndOffset<const transport_via_http>(http, offset);
+      UrlBase.setDataAndOffset(data+offset, http->url_base_length, offset);
+
+      // fill URL Extension,
+      UrlExtensionLoop.setData(data+offset, getLength()-offset);
+   } else {
+      //unimplemented
    }
 }
 
+void MHP_TransportProtocolDescriptor::UrlExtensionEntry::Parse() {
+   const descr_url_extension_entry *s;
+   s=data.getData<const descr_url_extension_entry>();
+   UrlExtension.setData(data, s->url_extension_length);
+}
+
 void MHP_DVBJApplicationDescriptor::Parse() {
    applicationLoop.setData(data+sizeof(descr_dvbj_application), getLength()-sizeof(descr_dvbj_application));
 }
@@ -1059,6 +1123,17 @@ void MHP_ApplicationIconsDescriptor::Parse() {
    data.setPointerAndOffset<const descr_application_icons_descriptor_end>(s, offset);
 }
 
+char *MHP_SimpleApplicationLocationDescriptor::getLocation(char *buffer, int size) {
+   return location.getText(buffer, size);
+}
+
+void MHP_SimpleApplicationLocationDescriptor::Parse() {
+   int offset=0;
+   const descr_simple_application_location_descriptor *loc;
+   data.setPointerAndOffset<const descr_simple_application_location_descriptor>(loc, offset);
+   location.setDataAndOffset(data+offset, loc->descriptor_length, offset);
+}
+
 int RegistrationDescriptor::getFormatIdentifier() const {
    return HILOHILO(s->format_identifier);
 }
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index f105f7a0e..3025876e6 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 2.2 2011/06/15 21:26:00 kls Exp $
+ *   $Id: descriptor.h 2.4 2012/01/11 11:35:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -538,6 +538,25 @@ class ExtensionDescriptor : public Descriptor {
    const descr_extension *s;
 };
 
+class T2DeliverySystemDescriptor : public Descriptor {
+public:
+   int getExtendedDataFlag() const;
+   int getExtensionDescriptorTag() const;
+   int getPlpId() const;
+   int getT2SystemId() const;
+   int getSisoMiso() const;
+   int getBandwidth() const;
+   int getGuardInterval() const;
+   int getTransmissionMode() const;
+   int getOtherFrequencyFlag() const;
+   int getTfsFlag() const;
+protected:
+   virtual void Parse();
+private:
+   const descr_t2_delivery_system *s;
+   int extended_data_flag;
+};
+
 // Private DVB Descriptor  Premiere.de
 // 0xF2  Content Transmission Descriptor
 // http://dvbsnoop.sourceforge.net/examples/example-private-section.html
@@ -639,17 +658,29 @@ class MHP_ApplicationNameDescriptor : public Descriptor {
 
 class MHP_TransportProtocolDescriptor : public Descriptor {
 public:
+   class UrlExtensionEntry : public LoopElement {
+   public:
+      virtual int getLength() { return sizeof(descr_url_extension_entry)+UrlExtension.getLength(); }
+      String UrlExtension;
+   protected:
+      virtual void Parse();
+   };
+
    enum Protocol { ObjectCarousel = 0x01, IPviaDVB = 0x02, HTTPoverInteractionChannel = 0x03 };
    int getProtocolId() const;
    int getProtocolLabel() const;
    bool isRemote() const;
    int getComponentTag() const;
+   char *getUrlBase(char *buffer, int size);
+   StructureLoop<UrlExtensionEntry> UrlExtensionLoop;
+
 protected:
    virtual void Parse();
 private:
    const descr_transport_protocol *s;
    bool remote;
    int componentTag;
+   String UrlBase;
 };
 
 class MHP_DVBJApplicationDescriptor : public Descriptor {
@@ -685,6 +716,15 @@ class MHP_ApplicationIconsDescriptor : public Descriptor {
    const descr_application_icons_descriptor_end *s;
 };
 
+class MHP_SimpleApplicationLocationDescriptor : public Descriptor {
+public:
+   char *getLocation(char *buffer, int size);
+protected:
+   virtual void Parse();
+private:
+   String location;
+};
+
 class RegistrationDescriptor : public Descriptor {
 public:
    int getFormatIdentifier() const;
diff --git a/libsi/headers.h b/libsi/headers.h
index 6867d2c95..daea50e16 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 2.2 2011/06/15 21:26:00 kls Exp $
+ *   $Id: headers.h 2.4 2012/01/11 11:35:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -1839,6 +1839,37 @@ struct descr_extension {
    u_char descriptor_tag_extension               :8;
 };
 
+/* extension 0x04 t2_delivery_system_descriptor */
+
+struct descr_t2_delivery_system {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char descriptor_tag_extension               :8;
+   u_char plp_id                                 :8;
+   u_char t2_system_id_hi                        :8;
+   u_char t2_system_id_lo                        :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char siso_miso                              :2;
+   u_char bandwidth                              :4;
+   u_char reserved                               :2;
+   u_char guard_interval                         :3;
+   u_char transmission_mode                      :3;
+   u_char other_frequency_flag                   :1;
+   u_char tfs_flag                               :1;
+#else
+   u_char reserved                               :2;
+   u_char bandwidth                              :4;
+   u_char siso_miso                              :2;
+   u_char tfs_flag                               :1;
+   u_char other_frequency_flag                   :1;
+   u_char transmission_mode                      :3;
+   u_char guard_interval                         :3;
+#endif
+/* now follow cell_id, frequency_loop_length, centre_frequency,
+   subcell_info_loop_length, cell_id_extension, transposer_frequency
+   fields looping to the end */
+};
+
 /* MHP 0x00 application_descriptor */
 
 #define DESCR_APPLICATION_LEN 3
@@ -1907,6 +1938,11 @@ struct descr_transport_protocol {
    /* protocol_id-specific selector bytes follow */
 };
 
+struct descr_url_extension_entry {
+   u_char url_extension_length                   :8;
+   /* URL extension string */
+};
+
 #define TRANSPORT_VIA_OC_LEN 1
 
 struct transport_via_oc {
@@ -1940,6 +1976,12 @@ struct transport_via_oc_end {
    u_char component_tag                          :8;
 };
 
+#define TRANSPORT_VIA_HTTP_LEN 1
+
+struct transport_via_http {
+   u_char url_base_length                        :8;
+};
+
 /* 0x03 dvb_j_application_descriptor() */
 
 #define DESCR_DVBJ_APPLICATION_LEN 2
@@ -1991,6 +2033,16 @@ struct descr_application_icons_descriptor_end {
    u_char icon_flags_lo                          :8;
 };
 
+/* 0x15 simple application location descrptor */
+
+#define DESCR_SIMPLE_APPLICATION_LOCATION_LEN 3
+
+struct descr_simple_application_location_descriptor {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   /* inital_path_bytes */
+};
+
 // Private DVB Descriptor  Premiere.de
 // 0xF2  Content Transmission Descriptor
 // http://dvbsnoop.sourceforge.net/examples/example-private-section.html
diff --git a/libsi/si.c b/libsi/si.c
index 82123e17f..4db917beb 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.5 2011/12/04 15:06:18 kls Exp $
+ *   $Id: si.c 2.6 2011/12/10 15:47:15 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -690,6 +690,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case MHP_DVBJApplicationLocationDescriptorTag:
             d=new MHP_DVBJApplicationLocationDescriptor();
             break;
+         case MHP_SimpleApplicationLocationDescriptorTag:
+            d=new MHP_SimpleApplicationLocationDescriptor();
+            break;
       // 0x05 - 0x0A is unimplemented this library
          case MHP_ExternalApplicationAuthorisationDescriptorTag:
          case MHP_IPv4RoutingDescriptorTag:
diff --git a/libsi/si.h b/libsi/si.h
index d6a1dc19d..4dccdd80f 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 2.3 2010/02/13 10:31:34 kls Exp $
+ *   $Id: si.h 2.5 2012/01/11 11:35:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -134,6 +134,19 @@ enum DescriptorTag {
                DTSDescriptorTag = 0x7B,
                AACDescriptorTag = 0x7C,
                ExtensionDescriptorTag = 0x7F,
+ // Extension descriptors
+               ImageIconDescriptorTag = 0x00,
+               CpcmDeliverySignallingDescriptor = 0x01,
+               CPDescriptorTag = 0x02,
+               CPIdentifierDescriptorTag = 0x03,
+               T2DeliverySystemDescriptorTag = 0x04,
+               SHDeliverySystemDescriptorTag = 0x05,
+               SupplementaryAudioDescriptorTag = 0x06,
+               NetworkChangeNotifyDescriptorTag = 0x07,
+               MessageDescriptorTag = 0x08,
+               TargetRegionDescriptorTag = 0x09,
+               TargetRegionNameDescriptorTag = 0x0A,
+               ServiceRelocatedDescriptorTag = 0x0B,
 
  // Defined by ETSI TS 102 812 (MHP)
                // They once again start with 0x00 (see page 234, MHP specification)
@@ -153,6 +166,8 @@ enum DescriptorTag {
                MHP_PrefetchDescriptorTag = 0x0C,
                MHP_DelegatedApplicationDescriptorTag = 0x0E,
                MHP_ApplicationStorageDescriptorTag = 0x10,
+               MHP_SimpleApplicationLocationDescriptorTag = 0x15,
+               MHP_SimpleApplicationBoundaryDescriptorTag = 0x17,
   // Premiere private Descriptor Tags
                PremiereContentTransmissionDescriptorTag = 0xF2,
 
diff --git a/menu.c b/menu.c
index 9167f47bc..eb07c81a3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.34 2011/12/04 14:52:38 kls Exp $
+ * $Id: menu.c 2.35 2012/01/14 13:06:03 kls Exp $
  */
 
 #include "menu.h"
@@ -3114,6 +3114,7 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   SetSection(tr("Replay"));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Show remaining time"), &data.ShowRemainingTime));
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
@@ -4568,12 +4569,15 @@ bool cReplayControl::ShowProgress(bool Initial)
            displayReplay->SetTitle(title);
         lastCurrent = lastTotal = -1;
         }
-     if (Total != lastTotal) {
-        displayReplay->SetTotal(IndexToHMSF(Total, false, FramesPerSecond()));
-        if (!Initial)
-           displayReplay->Flush();
-        }
      if (Current != lastCurrent || Total != lastTotal) {
+        if (Setup.ShowRemainingTime || Total != lastTotal) {
+           int Index = Total;
+           if (Setup.ShowRemainingTime)
+              Index = Current - Index;
+           displayReplay->SetTotal(IndexToHMSF(Index, false, FramesPerSecond()));
+           if (!Initial)
+              displayReplay->Flush();
+           }
         displayReplay->SetProgress(Current, Total);
         if (!Initial)
            displayReplay->Flush();
diff --git a/nit.c b/nit.c
index 0603e249b..c18aa8261 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.6 2011/08/12 14:27:31 kls Exp $
+ * $Id: nit.c 2.9 2012/01/12 08:43:52 kls Exp $
  */
 
 #include "nit.h"
@@ -16,6 +16,9 @@
 #include "libsi/descriptor.h"
 #include "tools.h"
 
+#define DVB_SYSTEM_1 0 // see also dvbdevice.c
+#define DVB_SYSTEM_2 1
+
 cNitFilter::cNitFilter(void)
 {
   numNits = 0;
@@ -134,7 +137,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  dtp.SetCoderateH(CodeRates[sd->getFecInner()]);
                  static int Modulations[] = { QAM_AUTO, QPSK, PSK_8, QAM_16 };
                  dtp.SetModulation(Modulations[sd->getModulationType()]);
-                 dtp.SetSystem(sd->getModulationSystem() ? SYS_DVBS2 : SYS_DVBS);
+                 dtp.SetSystem(sd->getModulationSystem() ? DVB_SYSTEM_2 : DVB_SYSTEM_1);
                  static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
                  dtp.SetRollOff(sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
@@ -242,10 +245,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  cDvbTransponderParameters dtp;
                  int Source = cSource::FromData(cSource::stTerr);
                  int Frequency = Frequencies[0] = sd->getFrequency() * 10;
-                 static int Bandwidths[] = { 8000000, 7000000, 6000000, 0, 0, 0, 0, 0 };
+                 static int Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 0, 0, 0, 0 };
                  dtp.SetBandwidth(Bandwidths[sd->getBandwidth()]);
                  static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
                  dtp.SetModulation(Constellations[sd->getConstellation()]);
+                 dtp.SetSystem(DVB_SYSTEM_1);
                  static int Hierarchies[] = { HIERARCHY_NONE, HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO, HIERARCHY_AUTO };
                  dtp.SetHierarchy(Hierarchies[sd->getHierarchy()]);
                  static int CodeRates[] = { FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO };
@@ -253,7 +257,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  dtp.SetCoderateL(CodeRates[sd->getCodeRateLP()]);
                  static int GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4 };
                  dtp.SetGuard(GuardIntervals[sd->getGuardInterval()]);
-                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
+                 static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_4K, TRANSMISSION_MODE_AUTO };
                  dtp.SetTransmission(TransmissionModes[sd->getTransmissionMode()]);
                  if (ThisNIT >= 0) {
                     for (int n = 0; n < NumFrequencies; n++) {
@@ -299,6 +303,40 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     }
                  }
                  break;
+            case SI::ExtensionDescriptorTag: {
+                 SI::ExtensionDescriptor *sd = (SI::ExtensionDescriptor *)d;
+                 switch (sd->getExtensionDescriptorTag()) {
+                   case SI::T2DeliverySystemDescriptorTag: {
+                        if (Setup.UpdateChannels >= 5) {
+                           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                               int Source = cSource::FromData(cSource::stTerr);
+                               if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                                  SI::T2DeliverySystemDescriptor *td = (SI::T2DeliverySystemDescriptor *)d;
+                                  int Frequency = Channel->Frequency();
+                                  int SymbolRate = Channel->Srate();
+                                  //int SystemId = td->getSystemId();
+                                  cDvbTransponderParameters dtp(Channel->Parameters());
+                                  dtp.SetSystem(DVB_SYSTEM_2);
+                                  dtp.SetPlpId(td->getPlpId());
+                                  if (td->getExtendedDataFlag()) {
+                                     static int T2Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 10000000, 1712000, 0, 0 };
+                                     dtp.SetBandwidth(T2Bandwidths[td->getBandwidth()]);
+                                     static int T2GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_128, GUARD_INTERVAL_19_128, GUARD_INTERVAL_19_256, 0 };
+                                     dtp.SetGuard(T2GuardIntervals[td->getGuardInterval()]);
+                                     static int T2TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_4K, TRANSMISSION_MODE_1K, TRANSMISSION_MODE_16K, TRANSMISSION_MODE_32K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
+                                     dtp.SetTransmission(T2TransmissionModes[td->getTransmissionMode()]);
+                                     //TODO add parsing of frequencies
+                                     }
+                                  Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('T'));
+                                  }
+                               }
+                           }
+                        }
+                        break;
+                   default: ;
+                   }
+                 }
+                 break;
             default: ;
             }
           delete d;
diff --git a/po/ar.po b/po/ar.po
index c936078d4..c656ab8c6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -79,6 +79,9 @@ msgstr "الهرمية"
 msgid "Rolloff"
 msgstr "ايقاف"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
 
@@ -1103,6 +1106,9 @@ msgstr "موءقت النوم"
 msgid "Setup.Replay$Show replay mode"
 msgstr "اضهر طور الاعادة"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index d609cda72..c31d5195c 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -76,6 +76,9 @@ msgstr "Jerarquia"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Iniciant exploraci� EPG"
 
@@ -1080,6 +1083,9 @@ msgstr "Mode de multivelocitat"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar mode de reproducci�"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index eef825717..f55f06174 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -75,6 +75,9 @@ msgstr "Hierarchický mód"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Začíná prohledávání EPG"
 
@@ -1079,6 +1082,9 @@ msgstr "Vícerychlostní mód"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Zobrazit režim přehrávání"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index db6b39870..f94bab2af 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Hierarki"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Starter EPG skanning"
 
@@ -1077,6 +1080,9 @@ msgstr "Multi hastighedsmodus"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Vis afspilningsmodus"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 4a475d7d4..0436cc726 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Hierarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr "PlpId"
+
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
 
@@ -1077,6 +1080,9 @@ msgstr "Mehrstufiger Vor-/R
 msgid "Setup.Replay$Show replay mode"
 msgstr "Wiedergabestatus anzeigen"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr "Verbleibende Zeit anzeigen"
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 64300f084..36923f06e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "���� ������ EPG"
 
@@ -1077,6 +1080,9 @@ msgstr "
 msgid "Setup.Replay$Show replay mode"
 msgstr "������� ���������� ������������"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 288ad6999..ef943984d 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "Jerarqu
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
 
@@ -1078,6 +1081,9 @@ msgstr "Modo multi-velocidad"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar modo de reproducci�n"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index c12f31fe2..70129fe02 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Hierarhia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine k�ivitatud"
 
@@ -1077,6 +1080,9 @@ msgstr "Mitmekiiruse moodus"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Korduse moodus"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "J�tkamise ID"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index d0d1225f9..e4336027b 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -76,6 +76,9 @@ msgstr "Hierarkia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr "PLP-tunniste"
+
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan päivitys aloitettu"
 
@@ -967,10 +970,10 @@ msgstr "LNB-ylätaajuus (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "DVB-sovitin %d kytketty SAT-kaapeliin"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "oma"
 
 msgid "CAM reset"
 msgstr "CAM nollaus"
@@ -1080,6 +1083,9 @@ msgstr "Käytä toiston moninopeustilaa"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Näytä toiston tila"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 5f8b4113e..477dffe88 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -79,6 +79,9 @@ msgstr "Hi
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Mise � jour du guide des programmes"
 
@@ -1083,6 +1086,9 @@ msgstr "Mode multi-vitesses"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Affichage mode de lecture"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 681cb791c..0bf055e73 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -75,6 +75,9 @@ msgstr "Hijerarhija"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Po�injem EPG pretragu"
 
@@ -1079,6 +1082,9 @@ msgstr "Vi
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i na�in prikazivanja"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index bebf6eff3..0c56f85e6 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -4,14 +4,14 @@
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
 # Thomas G�nther <tom@toms-cafe.de>, 2007
-# Istv�n F�ley <ifuley@tigercomp.ro>, 2007
+# Istv�n F�ley <ifuley@tigercomp.ro>, 2007, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
-"PO-Revision-Date: 2007-12-01 21:42+0200\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "Language: hu\n"
@@ -32,19 +32,19 @@ msgid "off"
 msgstr "ki"
 
 msgid "on"
-msgstr ""
+msgstr "be"
 
 msgid "auto"
 msgstr "auto"
 
 msgid "none"
-msgstr "semmi"
+msgstr "egyik sem"
 
 msgid "Polarization"
 msgstr "Polariz�ci�"
 
 msgid "System"
-msgstr ""
+msgstr "Rendszer"
 
 msgid "Srate"
 msgstr "Srate"
@@ -74,6 +74,9 @@ msgid "Hierarchy"
 msgstr "Hierarhia"
 
 msgid "Rolloff"
+msgstr "Rolloff"
+
+msgid "PlpId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -318,10 +321,10 @@ msgstr ""
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "%d �ven fel�lieknek"
 
 msgid "No title"
-msgstr "n�v n�lk�l"
+msgstr "c�m n�lk�l"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -420,7 +423,7 @@ msgid "Key$Stop"
 msgstr "Stop"
 
 msgid "Key$Record"
-msgstr "Felvenni"
+msgstr "Felv�tel"
 
 msgid "Key$FastFwd"
 msgstr "El�re p�rgetni"
@@ -471,7 +474,7 @@ msgid "Key$Timers"
 msgstr "Id�z�t�"
 
 msgid "Key$Recordings"
-msgstr "Felvett ad�sok"
+msgstr "Felv�telek"
 
 msgid "Key$Setup"
 msgstr "Be�ll�t�sok"
@@ -591,29 +594,29 @@ msgid "Delete channel?"
 msgstr "Csatorna t�rl�se?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "K�nyvt�r szerkeszt�se"
 
 msgid "New folder"
-msgstr ""
+msgstr "�j k�nyvt�r"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Alk�nyvt�r"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Ez a k�nyvt�rn�v m�r l�tezik!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "A k�nyvt�r neve nem tartalmazhatja: '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Kiv�laszt�s"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Val�ban t�r�ljem a k�nyvt�rat �s az alk�nyvt�rait?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "T�r�ljem a k�nyvt�rat?"
 
 msgid "Edit timer"
 msgstr "Id�z�t� megv�ltoztat�sa"
@@ -631,7 +634,7 @@ msgid "Start"
 msgstr "Kezdet"
 
 msgid "Stop"
-msgstr "V�ge"
+msgstr "V�g"
 
 msgid "VPS"
 msgstr "VPS"
@@ -646,13 +649,13 @@ msgid "File"
 msgstr "File"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "K�nyvt�r"
 
 msgid "First day"
 msgstr "Els� nap"
 
 msgid "Select folder"
-msgstr ""
+msgstr "K�nyvt�r kiv�laszt�sa"
 
 msgid "Timers"
 msgstr "Id�z�t�"
@@ -667,22 +670,22 @@ msgid "Delete timer?"
 msgstr "Id�z�t� t�rl�se?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Felv�tel folyamatban van - m�gis t�r�lni?"
+msgstr "Felv�tel folyamatban van - biztos t�r�ljem?"
 
 msgid "Event"
-msgstr "Ad�s"
+msgstr "Esem�ny"
 
 msgid "Button$Timer"
 msgstr "Id�z�t�"
 
 msgid "Button$Record"
-msgstr "Felvenni"
+msgstr "Felv�tel"
 
 msgid "Button$Switch"
 msgstr "�tkapcsolni"
 
 msgid "What's on now?"
-msgstr "Mi megy most?"
+msgstr "Most ad�sban"
 
 msgid "What's on next?"
 msgstr "Mi k�vetkezik?"
@@ -694,24 +697,24 @@ msgid "Button$Now"
 msgstr "Most"
 
 msgid "Button$Schedule"
-msgstr "Program"
+msgstr "M�sor�js�g"
 
 msgid "Can't switch channel!"
 msgstr "Az ad�t nem lehet elkapcsolni"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Program - %s"
+msgstr "M�sor�js�g - %s"
 
 #, c-format
 msgid "This event - %s"
 msgstr "Ez az ad�s - %s"
 
 msgid "This event - all channels"
-msgstr "Ez az ad�s - �sszes ad�"
+msgstr "Ez az ad�s - �sszes ad�n"
 
 msgid "All events - all channels"
-msgstr "Az �sszes ad�s - az �sszes ad�"
+msgstr "Az �sszes ad�s - az �sszes ad�n"
 
 #, c-format
 msgid "Please enter %d digits!"
@@ -721,7 +724,7 @@ msgid "CAM not responding!"
 msgstr "A CAM nem v�laszol!"
 
 msgid "Recording info"
-msgstr "Felv�tel"
+msgstr "Felv�tel inf�"
 
 msgid "Button$Play"
 msgstr "Lej�tszani"
@@ -730,7 +733,7 @@ msgid "Button$Rewind"
 msgstr "Vissza az elej�re"
 
 msgid "Recordings"
-msgstr "Felvett ad�sok"
+msgstr "Felv�telek"
 
 msgid "Button$Open"
 msgstr "Kinyitni"
@@ -829,7 +832,7 @@ msgid "Setup.OSD$Timeout requested channel info"
 msgstr "A lek�rdezett ad�sinform�ci� bez�r�sa"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Oldalank�nt l�ptetmi"
+msgstr "Oldalank�nt l�ptetni"
 
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Korl�tlan l�ptet�s"
@@ -841,28 +844,28 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Felv�telek list�ja"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "K�nyvt�rv�laszt�s az id�z�t� men�ben"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Sz�mgombok a bet�k�n"
 
 msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "Ad�skeres�s"
+msgstr "EPG keres�s"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Fennmaradt id� az EPG-�j�t�sig (h)"
+msgstr "Fennmaradt id� az EPG-friss�t�sig (�)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG hibaelh�r�t�s"
+msgstr "Hibaelh�r�t�s szintje"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "R�gi EPG adatok megmutat�sa (perc)"
+msgstr "Eltelt EPG adatok kijelz�se (perc)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Az id� be�ll�t�sa"
+msgstr "�ra �ll�t�sa TP id�h�z"
 
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Id�h�z tartoz� Transponder"
@@ -882,7 +885,7 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "center cut out"
+msgstr "k�pk�z�p kiv�g�s"
 
 msgid "no"
 msgstr "nem"
@@ -900,7 +903,7 @@ msgid "add new channels"
 msgstr "�j ad�k hozz�ad�sa"
 
 msgid "add new transponders"
-msgstr "�j transponder hozz�ad�sa"
+msgstr "�j transponderek hozz�ad�sa"
 
 msgid "DVB"
 msgstr "DVB"
@@ -927,10 +930,10 @@ msgid "Setup.DVB$Update channels"
 msgstr "Ad�k aktualiz�l�sa"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Audio nyelvek"
+msgstr "Hangs�v nyelvek"
 
 msgid "Setup.DVB$Audio language"
-msgstr "Audio nyelv"
+msgstr "Hangs�v nyelv"
 
 msgid "Setup.DVB$Display subtitles"
 msgstr "Felirat l�that�"
@@ -960,17 +963,18 @@ msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Als� LNB-frekvencia (MHZ)"
+msgstr "Als� LNB-frekvencia (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Fels� LNB-frekvencia (MHZ)"
+msgstr "Fels� LNB-frekvencia (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
 msgstr ""
 
+#, fuzzy
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "DiSEqC haszn�lata"
 
 msgid "CAM reset"
 msgstr "CAM �jraind�t�s"
@@ -991,7 +995,7 @@ msgid "Button$Reset"
 msgstr "Reset"
 
 msgid "Opening CAM menu..."
-msgstr "A CAM men� nyit�s alatt..."
+msgstr "A CAM men� nyit�sa..."
 
 msgid "Can't open CAM menu!"
 msgstr "A CAM men� nem nyithat�"
@@ -1003,16 +1007,16 @@ msgid "Can't reset CAM!"
 msgstr "A CAM �jraind�t�s nem siker�lt"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "�l�k�p le�ll�t�sa tiltva"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "�l�k�p le�ll�t�sa meger�s�t�ssel"
 
 msgid "pause live video"
-msgstr ""
+msgstr "�l�k�p le�ll�t�sa"
 
 msgid "confirm"
-msgstr ""
+msgstr "meger�s�t�s"
 
 msgid "yes"
 msgstr "igen"
@@ -1021,13 +1025,13 @@ msgid "Recording"
 msgstr "Felv�tel"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Id�eltol�d�s a kezd�sn�l (perc)"
+msgstr "Id�eltol�s a kezd�sn�l (perc)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Id�eltol�d�s a befejez�sn�l (perc)"
+msgstr "Id�eltol�s a befejez�sn�l (perc)"
 
 msgid "Setup.Recording$Primary limit"
-msgstr "Prim�r-hat�r"
+msgstr "Als� priorit�s hat�r"
 
 msgid "Setup.Recording$Default priority"
 msgstr "Alap�rtelmezett priorit�s"
@@ -1036,22 +1040,22 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Alap�rtelmezett �lettartam"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "A sz�net gomb m�k�d�se"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Sz�net priorit�s"
+msgstr "Id�eltol�s priorit�sa"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Sz�net �lettartama"
+msgstr "Id�eltol�s �lettartama"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Epiz�dn�v felhaszn�l�sa"
+msgstr "Epiz�dn�v"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "VPS-t haszn�lni"
+msgstr "VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "Id�eltol�d�s VPS-n�l (s)"
+msgstr "Id�eltol�s VPS-n�l (mp)"
 
 msgid "Setup.Recording$Mark instant recording"
 msgstr "Direktfelv�tel megjel�l�se"
@@ -1060,26 +1064,29 @@ msgid "Setup.Recording$Name instant recording"
 msgstr "Direktfelv�tel megnevez�se"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Felv�tel id�tartama (perc)"
+msgstr "Direktfelv�tel id�tartama (perc)"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Max. video File-terjedelem (MB)"
+msgstr "Max. video file m�ret (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Feldolgozott File-k feloszt�sa"
+msgstr "Feldolgozott file-ok feloszt�sa"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Id�eltol�sos felv�tel t�rl�se"
 
 msgid "Replay"
 msgstr "Lej�tsz�s"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "MultiSpeed funkci�"
+msgstr "T�bsebess�ges funkci�"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Lej�tsz�s felt�ntet�se"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Lej�tsz�s ID"
 
@@ -1087,7 +1094,7 @@ msgid "Miscellaneous"
 msgstr "Egy�b"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Id�zit�sek k�z�tti id�tartam (perc)"
+msgstr "VDR le�ll ha nem k�vetkezik felv�tel (p)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "VDR le�ll haszn�lat n�lk�l (perc)"
@@ -1102,25 +1109,25 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Csatornav�lt�s timeout (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Ad�s a bekapcsol�sn�l"
+msgstr "Csatorna indul�skor"
 
 msgid "Setup.Miscellaneous$as before"
 msgstr "ahogy az el�bb"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "Hanger� a bekapcsol�sn�l"
+msgstr "Hanger� indul�sn�l"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Csatornalista g�rget�se"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr ""
+msgstr "V�szle�ll�t�s"
 
 msgid "Plugins"
 msgstr "Plugins"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ennek a plugin-nak nincs setup-parametere!"
+msgstr "Ennek a plugin-nak nincs setup-param�tere!"
 
 msgid "Setup"
 msgstr "Be�ll�t�sok"
@@ -1136,7 +1143,7 @@ msgid " Stop recording "
 msgstr " Felv�telt befejezni "
 
 msgid "Schedule"
-msgstr "Program"
+msgstr "M�sor�js�g"
 
 msgid "VDR"
 msgstr "VDR"
@@ -1183,14 +1190,14 @@ msgid "Pausing live video..."
 msgstr "Az �l� ad�s meg�ll�tva..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "T�r�ljem az id�eltol�sos felv�telt?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Ugr�s: "
+msgstr "Ugr�s ide: "
 
 msgid "No editing marks defined!"
-msgstr "A v�g�pont nincs kijel�lve"
+msgstr "Nincs v�g�pont kijel�lve"
 
 msgid "Can't start editing process!"
 msgstr "A v�g�s nem ind�that�!"
@@ -1226,13 +1233,13 @@ msgid "Channel locked (recording)!"
 msgstr "Az ad� blokkolva (felv�tel)!"
 
 msgid "Low disk space!"
-msgstr "A merev lemez majdnem tele!"
+msgstr "A merevlemez majdnem tele!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Az index file �jragener�l�sa"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Index file �jragener�l�sa k�sz."
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
@@ -1303,10 +1310,10 @@ msgid "Sunday"
 msgstr "Vas�rnap"
 
 msgid "Upcoming recording!"
-msgstr "Felv�tel r�gt�n kezd�dik!"
+msgstr "Felv�tel r�gt�n indul!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Meg�ll�tsam az �l� k�pet?"
 
 msgid "Recording started"
 msgstr "A felv�tel elind�tva"
@@ -1318,7 +1325,7 @@ msgid "Press any key to cancel shutdown"
 msgstr "Nyomj egy gombot a le�ll�s megszak�t�s�hoz"
 
 msgid "Switching primary DVB..."
-msgstr "Prim�r Interface �tkapcsolva..."
+msgstr "Els�dleges DVB k�rtya v�lt�sa folyamatban..."
 
 msgid "Editing process failed!"
 msgstr "V�g�s sikertelen!"
diff --git a/po/it_IT.po b/po/it_IT.po
index 6015881fb..3f2f5f9de 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -80,6 +80,9 @@ msgstr "Gerarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
 
@@ -1084,6 +1087,9 @@ msgstr "Modalità multispeed"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostra modalità riproduzione"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 53d242262..eaa98d990 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Hierarchija"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
 
@@ -1077,6 +1080,9 @@ msgstr "Prasukimo ręžimas"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Rodyti pakartojimo ręžimą"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 5fa363456..eef92c2e6 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -74,6 +74,9 @@ msgstr "Хиерархија"
 msgid "Rolloff"
 msgstr "Рол-оф"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Започнувам скенирање на EPG"
 
@@ -1078,6 +1081,9 @@ msgstr "Повеќебрзински режим"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Прикажи начин на пуштање"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 65aaba71a..8b0da153e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -77,6 +77,9 @@ msgstr "Hierarchie"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
 
@@ -1081,6 +1084,9 @@ msgstr "Multi-speed mode"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Weergave mode aangeven"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index a8ea942d0..fdb798195 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "Hierarchy"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr ""
 
@@ -1078,6 +1081,9 @@ msgstr "Multispeed modus"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Vis avspillingsmodus"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 94ba6921a..5f02ee8d2 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "Hierarchia"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
 
@@ -1078,6 +1081,9 @@ msgstr "Tryb wielopr
 msgid "Setup.Replay$Show replay mode"
 msgstr "Pokazuj tryb odtwarzania"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 272ab75ba..e56845977 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "Hierarquia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "A iniciar a busca do EPG"
 
@@ -1078,6 +1081,9 @@ msgstr "Modo multi velocidade"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar modo de reprodu��o"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de resumo"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 414ade19b..285622f14 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -76,6 +76,9 @@ msgstr "Ierarhie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Pornesc achizi�ia EPG"
 
@@ -1080,6 +1083,9 @@ msgstr "Mod multi-vitez
 msgid "Setup.Replay$Show replay mode"
 msgstr "Afi�eaz� redarea"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index a4eaca5bd..c14d7f057 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
 
@@ -1078,6 +1081,9 @@ msgstr "
 msgid "Setup.Replay$Show replay mode"
 msgstr "���������� ����� ���������������"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ���������������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 176673f2e..3f0ea60fa 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Hierarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Za��na preh�ad�va� EPG"
 
@@ -1077,6 +1080,9 @@ msgstr "Viac r
 msgid "Setup.Replay$Show replay mode"
 msgstr "Zobrazi� sp�sob prehr�vania"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovenie"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 696e953ee..75d32c70e 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "Hierarhija"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
 
@@ -1078,6 +1081,9 @@ msgstr "Re
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i re�im predvajanja"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 62c07d388..743b1c63d 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -74,6 +74,9 @@ msgstr "Hijerarhija"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Po�injem EPG pretragu"
 
@@ -1100,6 +1103,9 @@ msgstr "Vi
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i re�im reprodukcije"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ae6d72ff8..57151a1c4 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -76,6 +76,9 @@ msgstr "Hierarchy"
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG skanning"
 
@@ -1080,6 +1083,9 @@ msgstr "Multispeed mode"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Visa uppspelningsl�ge"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "�teruppta ID"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 946ab4213..78bde2cd4 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Hiyerar
 msgid "Rolloff"
 msgstr ""
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG tarama ba�l�yor"
 
@@ -1077,6 +1080,9 @@ msgstr "Katl
 msgid "Setup.Replay$Show replay mode"
 msgstr "G�steri� bilgisi"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index c383af8c5..73b1c4ad3 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -73,6 +73,9 @@ msgstr "Ієрархія"
 msgid "Rolloff"
 msgstr "Крен"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
 
@@ -1077,6 +1080,9 @@ msgstr "Багатошвидкісний режим"
 msgid "Setup.Replay$Show replay mode"
 msgstr "Віображати режим перегляду"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 43a5ea564..81b381b1e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-12-03 16:25+0100\n"
+"POT-Creation-Date: 2012-01-14 14:06+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -76,6 +76,9 @@ msgstr "层次"
 msgid "Rolloff"
 msgstr "越零率"
 
+msgid "PlpId"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "开始节目单扫描"
 
@@ -1080,6 +1083,9 @@ msgstr "媒体速度模式"
 msgid "Setup.Replay$Show replay mode"
 msgstr "显示回放模式"
 
+msgid "Setup.Replay$Show remaining time"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
diff --git a/recording.c b/recording.c
index 6b11fbd33..cf35bb7a0 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.39 2011/12/04 13:51:44 kls Exp $
+ * $Id: recording.c 2.43 2012/01/15 11:04:24 kls Exp $
  */
 
 #include "recording.h"
@@ -873,16 +873,23 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
         s++;
      else
         s = name;
-     titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%d:%02d%c%c%s",
+     cString Length("");
+     if (NewIndicator) {
+        int Seconds = max(0, LengthInSeconds());
+        Length = cString::sprintf("%c%d:%02d",
+                   Delimiter,
+                   Seconds / 3600,
+                   Seconds / 60 % 60
+                   );
+        }
+     titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%c%c%s",
                             t->tm_mday,
                             t->tm_mon + 1,
                             t->tm_year % 100,
                             Delimiter,
                             t->tm_hour,
                             t->tm_min,
-                            Delimiter,
-                            (LengthInSeconds() >= 0) ? LengthInSeconds() / 3600 : 0,
-                            (LengthInSeconds() >= 0) ? LengthInSeconds() / 60 % 60 : 0,
+                            *Length,
                             New,
                             Delimiter,
                             s));
@@ -1103,25 +1110,21 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
   struct dirent *e;
   while ((Foreground || Running()) && (e = d.Next()) != NULL) {
         if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-           char *buffer = strdup(AddDirectory(DirName, e->d_name));
+           cString buffer = AddDirectory(DirName, e->d_name);
            struct stat st;
-           if (stat(buffer, &st) == 0) {
+           if (lstat(buffer, &st) == 0) {
               int Link = 0;
               if (S_ISLNK(st.st_mode)) {
                  if (LinkLevel > MAX_LINK_LEVEL) {
-                    isyslog("max link level exceeded - not scanning %s", buffer);
+                    isyslog("max link level exceeded - not scanning %s", *buffer);
                     continue;
                     }
                  Link = 1;
-                 char *old = buffer;
-                 buffer = ReadLink(old);
-                 free(old);
-                 if (!buffer)
+                 buffer = ReadLink(buffer);
+                 if (!*buffer)
                     continue;
-                 if (stat(buffer, &st) != 0) {
-                    free(buffer);
+                 if (stat(buffer, &st) != 0)
                     continue;
-                    }
                  }
               if (S_ISDIR(st.st_mode)) {
                  if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
@@ -1144,7 +1147,6 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
                     ScanVideoDir(buffer, Foreground, LinkLevel + Link);
                  }
               }
-           free(buffer);
            }
         }
 }
@@ -2040,15 +2042,18 @@ cUnbufferedFile *cFileName::NextFile(void)
 
 cString IndexToHMSF(int Index, bool WithFrame, double FramesPerSecond)
 {
-  char buffer[16];
+  const char *Sign = "";
+  if (Index < 0) {
+     Index = -Index;
+     Sign = "-";
+     }
   double Seconds;
   int f = int(modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond + 1);
   int s = int(Seconds);
   int m = s / 60 % 60;
   int h = s / 3600;
   s %= 60;
-  snprintf(buffer, sizeof(buffer), WithFrame ? "%d:%02d:%02d.%02d" : "%d:%02d:%02d", h, m, s, f);
-  return buffer;
+  return cString::sprintf(WithFrame ? "%s%d:%02d:%02d.%02d" : "%s%d:%02d:%02d", Sign, h, m, s, f);
 }
 
 int HMSFToIndex(const char *HMSF, double FramesPerSecond)
diff --git a/remux.c b/remux.c
index 78ab2940d..ff4d49baa 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.62 2011/09/04 13:09:06 kls Exp $
+ * $Id: remux.c 2.63 2012/01/12 12:07:58 kls Exp $
  */
 
 #include "remux.h"
@@ -701,6 +701,10 @@ const uchar *cTsToPes::GetPes(int &Length)
         uchar *p = data + offset - 6;
         if (p != data) {
            p -= 3;
+           if (p < data) {
+              Reset();
+              return NULL;
+              }
            memmove(p, data, 4);
            }
         int l = min(length - offset, MAXPESLENGTH);
diff --git a/svdrp.c b/svdrp.c
index b333202b2..a659cd496 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.12 2011/12/04 13:58:33 kls Exp $
+ * $Id: svdrp.c 2.13 2012/01/12 15:02:46 kls Exp $
  */
 
 #include "svdrp.h"
@@ -583,6 +583,10 @@ void cSVDRP::CmdCLRE(const char *Option)
                   }
                }
            if (Schedule) {
+              for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+                  if (ChannelID == Timer->Channel()->GetChannelID().ClrRid())
+                     Timer->SetEvent(NULL);
+                  }
               Schedule->Cleanup(INT_MAX);
               cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
               Reply(250, "EPG data of channel \"%s\" cleared", Option);
diff --git a/svdrpsend.pl b/svdrpsend
similarity index 100%
rename from svdrpsend.pl
rename to svdrpsend
diff --git a/tools.c b/tools.c
index 1a1cf3fe8..778c46391 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.19 2011/12/04 14:52:38 kls Exp $
+ * $Id: tools.c 2.20 2012/01/11 11:21:43 kls Exp $
  */
 
 #include "tools.h"
@@ -1913,7 +1913,7 @@ void cListBase::Move(int From, int To)
 
 void cListBase::Move(cListObject *From, cListObject *To)
 {
-  if (From && To) {
+  if (From && To && From != To) {
      if (From->Index() < To->Index())
         To = To->Next();
      if (From == objects)
diff --git a/vdr.5 b/vdr.5
index 7f0696790..198c95310 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.26 2011/09/25 13:51:34 kls Exp $
+.\" $Id: vdr.5 2.27 2012/01/11 13:16:57 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -87,32 +87,33 @@ meaning (and allowed values) are
 .TS
 tab (@);
 l l.
-\fBB\fR@Bandwidth (6, 7, 8)
+\fBB\fR@Bandwidth (1712, 5, 6, 7, 8, 10)
 \fBC\fR@Code rate high priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910)
 \fBD\fR@coDe rate low priority (0, 12, 23, 34, 35, 45, 56, 67, 78, 89, 910)
-\fBG\fR@Guard interval (4, 8, 16, 32)
+\fBG\fR@Guard interval (4, 8, 16, 32, 128, 19128, 19256)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
 \fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998)
 \fBO\fR@rollOff (0, 20, 25, 35)
+\fBP\fR@Plp id (0-255)
 \fBR\fR@Right circular polarization
 \fBS\fR@delivery System (0, 1)
-\fBT\fR@Transmission mode (2, 8)
+\fBT\fR@Transmission mode (1, 2, 4, 8, 16, 32)
 \fBV\fR@Vertical polarization
 \fBY\fR@hierarchY (0, 1, 2, 4)
 .TE
 
-\fBBandwidth:\fR The bandwidth of the channel in MHz (DVB-T only).
+\fBBandwidth:\fR The bandwidth of the channel in MHz (1712 in kHz): (DVB-T/DVB-T2 only).
 
-\fBCode rate high priority:\fR Forward Error Correction (FEC) of the high priority stream (DVB-T).
+\fBCode rate high priority:\fR Forward Error Correction (FEC) of the high priority stream (DVB-T/DVB-T2).
 For DVB-S/DVB-S2 this parameter specifies the inner FEC scheme.
 12 = 1/2, 23 = 2/3, 34 = 3/4, ...
 
-\fBCode rate low priority:\fR Forward Error Correction (FEC) of the low priority stream (DVB-T only).
+\fBCode rate low priority:\fR Forward Error Correction (FEC) of the low priority stream (DVB-T/DVB-T2 only).
 If no hierarchy is used, set to 0.
 
-\fBGuard interval:\fR The guard interval value (DVB-T only): 4 = 1/4, 8 = 1/8, 16 = 1/16, 32 = 1/32.
+\fBGuard interval:\fR The guard interval value (DVB-T only): 4 = 1/4, 8 = 1/8, 16 = 1/16, 32 = 1/32, 128 = 1/128, 19128 = 19/128, 19256 = 19/256.
 
 \fBInversion:\fR Specifies whether the DVB frontend needs spectral inversion (DVB-T and DVB-C only). This is frontend specific, if in doubt, omit.
 
@@ -120,26 +121,30 @@ If no hierarchy is used, set to 0.
 .TS
 tab (@);
 l l.
-\fB2\fR@QPSK (DVB-S, DVB-S2, DVB-T)
+\fB2\fR@QPSK (DVB-S, DVB-S2, DVB-T, DVB-T2, ISDB-T)
 \fB5\fR@8PSK (DVB-S2)
 \fB6\fR@16APSK (DVB-S2)
+\fB7\fR@32APSK (DVB-S2)
 \fB10\fR@VSB8 (ATSC aerial)
 \fB11\fR@VSB16 (ATSC aerial)
-\fB16\fR@QAM16 (DVB-T)
-\fB64\fR@QAM64 (DVB-C, DVB-T)
+\fB12\fR@DQPSK (ISDB-T)
+\fB16\fR@QAM16 (DVB-T, DVB-T2, ISDB-T)
+\fB64\fR@QAM64 (DVB-C, DVB-T, DVB-T2, ISDB-T)
 \fB128\fR@QAM128 (DVB-C)
-\fB256\fR@QAM256 (DVB-C)
+\fB256\fR@QAM256 (DVB-C, DVB-T2)
 .TE
 
 \fBRolloff:\fR The Nyquist filter rolloff factor for DVB-S (\fB35\fR) and DVB-S2 (\fB35\fR, 25, 20),
 35 = 0.35, 25 = 0.25, 20 = 0.20, DVB-S/DVB-S2 default value is 0.35
 
-\fBTransmission mode:\fR Number of DVB-T OFDM carriers, 8 = 8k, 2 = 2k. If in doubt, try 8k.
+\fBPLP id:\fR Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-T2 only).
+
+\fBTransmission mode:\fR Number of DVB-T OFDM carriers, 32 = 32k, 16 = 16k, 8 = 8k, 4 = 4k, 2 = 2k, 1 = 1k. If in doubt, try 8k.
 
 \fBHierarchy:\fR If set to 1, this transponder uses two streams, high priority and low priority.
-If in doubt, try 0 (off). (DVB-T only).
+If in doubt, try 0 (off). (DVB-T/DVB-T2 only).
 
-\fBDelivery System:\fR The satellite delivery system (0 = DVB-S, 1 = DVB-S2).
+\fBDelivery System:\fR The delivery system (0 = "first generation" (DVB-S/DVB-T), 1 = "second generation" (DVB-S2/DVB-T2).
 
 \fBPolarization:\fR Satellite antenna polarization.
 H = horizontal, V = vertical, R = circular right, L = circular left.
@@ -152,16 +157,19 @@ The special value \fB999\fR is used for "automatic", which means the driver
 will automatically determine the proper value (if possible).
 
 An example of a parameter field for a DVB-T channel might look like this:
-\fBB8C23D12G8M16T8Y0\fR
+\fBB8C23D12G8M16T8Y0S0\fR
+
+An example of a parameter field for a DVB-T2 channel might look like this:
+\fBB8C23D12G8M16T8Y0P0S1\fR
 
 An example of a parameter field for a DVB-C channel might look like this:
 \fBC0M64\fR
 
 An example of a parameter field for a DVB-S channel might look like this:
-\fBhC56M2O35S0\fR
+\fBHC56M2O35S0\fR
 
 An example of a parameter field for a DVB-S2 channel might look like this:
-\fBhC910M2O35S1\fR
+\fBHC910M2O35S1\fR
 
 Plugins that implement devices that need their own set of parameters may
 store those in the parameters string in arbitrary format (not necessarily

From c2d9577b3dd7557b7a9c702d5c1fd3b1bbe0e5e7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 19 Feb 2012 14:54:00 +0100
Subject: [PATCH 210/307] Version 1.7.24 Original announce message: VDR
 developer version 1.7.24 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.24.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.23-1.7.24.diff

MD5 checksums:

a034c5e399417dfc583483f650d003ee  vdr-1.7.24.tar.bz2
aa1a2b202da92e65945ff39470b26618  vdr-1.7.23-1.7.24.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a high load in case a transponder can't be received.
- Improved the way DVB_API_VERSION is checked.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed asserting there is a live programme if the primary device is bonded with
  a device that starts a recording on a different band.
- Fixed the return type of cMyDeviceHook::DeviceProvidesTransponder() in PLUGINS.html.
- Fixed a crash in a plugin using cDeviceHook when VDR ends (reported by Oliver Endriss).
- Some improvements to the Makefiles (thanks to Christian Ruppert).
- Fixed cRecording::LengthInSeconds(), which wrongfully rounded the result to full
  minutes (thanks to Christoph Haubrich).
- Symbolic links are no longer resolved in cRecordings::ScanVideoDir() (thanks to
  Sundararaj Reel).
- The epg.data file is now read in a separate thread to make the startup process
  faster in case the file is very large (suggested by Helmut Auer).
- Fixed selecting the primary device for receiving the live viewing channel in
  case it is bonded with an other device and has no receiver attached to it.
- Fixed a possible crash when canceling VDR while displaying subtitles, and the
  primary device is no longer available.
- Improved handling subtitles of BBC channels.
- No longer using tabs as delimiter in the EPG bugfix log (they were garbled in the
  log file).
- Added a missing '.' after the month in VPS strings.
- Added some missing 'const' to cDevice (thanks to Joachim Wilke).
- Fixed handling the PrimaryLimit when requesting a device for live viewing
  (reported by Uwe Scheffler).
- Removed superfluous calls to SetVideoFormat() from device constructors. This
  function is called in cDevice::SetPrimaryDevice(), anyway.
- An ongoing editing process is now canceled if either the original or the edited
  version of the recording is deleted from the Recordings menu.
- The SVDRP command DELR now won't delete a recording that is currently being edited.
- Removed code stub for obsolete SVDRP command MOVT.
- The DVB device adapters/frontends are now probed by scanning the /dev/dvb directory
  instead of looping through adapter/frontend numbers. This allows for "holes" in the
  device numbering.
- cReadDir::Next() now skips directory entries "." and "..".
- Fixed a possible deadlock in time shift mode.
- Fixed switching into time shift mode when pausing live video (thanks to Reinhard
  Nissl for helping to debug this one).
---
 CONTRIBUTORS                                  |  22 ++
 HISTORY                                       |  53 ++++
 INSTALL                                       |   2 +-
 Make.config.template                          |  33 +--
 Makefile                                      |  13 +-
 PLUGINS.html                                  |   2 +-
 PLUGINS/src/dvbhddevice/Makefile              |  10 +-
 PLUGINS/src/dvbhddevice/bitbuffer.c           |  97 --------
 PLUGINS/src/dvbhddevice/bitbuffer.h           |  31 ---
 PLUGINS/src/dvbhddevice/dvbhddevice.c         |  37 ++-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c       |  30 ++-
 PLUGINS/src/dvbhddevice/hdffcmd.c             |   4 +-
 PLUGINS/src/dvbhddevice/hdffcmd.h             |   3 +-
 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile   |  25 +-
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.h   |   3 +-
 .../src/dvbhddevice/libhdffcmd/hdffcmd_defs.h |   1 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c |  40 ++-
 .../src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h |   9 +-
 PLUGINS/src/dvbhddevice/menu.c                |  65 +++++
 PLUGINS/src/dvbhddevice/menu.h                |  29 +++
 PLUGINS/src/dvbhddevice/po/de_DE.po           |  45 ++--
 PLUGINS/src/dvbhddevice/po/fi_FI.po           |  43 ++--
 PLUGINS/src/dvbhddevice/po/it_IT.po           |  41 +++-
 PLUGINS/src/dvbhddevice/setup.c               | 227 ++++++++++++++++--
 PLUGINS/src/dvbhddevice/setup.h               |  13 +-
 PLUGINS/src/dvbsddevice/Makefile              |   8 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c       |   6 +-
 PLUGINS/src/hello/Makefile                    |   8 +-
 PLUGINS/src/osddemo/Makefile                  |  10 +-
 PLUGINS/src/pictures/HISTORY                  |   4 +
 PLUGINS/src/pictures/Makefile                 |   8 +-
 PLUGINS/src/pictures/entry.c                  |  14 +-
 PLUGINS/src/pictures/pictures.c               |   4 +-
 PLUGINS/src/servicedemo/Makefile              |  10 +-
 PLUGINS/src/skincurses/Makefile               |   8 +-
 PLUGINS/src/status/Makefile                   |  10 +-
 PLUGINS/src/svdrpdemo/Makefile                |   8 +-
 config.h                                      |  10 +-
 cutter.c                                      |  21 +-
 cutter.h                                      |  11 +-
 device.c                                      |  18 +-
 device.h                                      |  13 +-
 dvbdevice.c                                   |  78 +++---
 dvbdevice.h                                   |   7 +-
 dvbplayer.c                                   |  55 +++--
 dvbplayer.h                                   |   7 +-
 dvbsubtitle.c                                 |   5 +-
 epg.c                                         |  35 +--
 epg.h                                         |   8 +-
 libsi/Makefile                                |   8 +-
 menu.c                                        |  23 +-
 menu.h                                        |   4 +-
 newplugin                                     |   8 +-
 po/ar.po                                      |   5 +-
 po/ca_ES.po                                   |   5 +-
 po/cs_CZ.po                                   |   5 +-
 po/da_DK.po                                   |   5 +-
 po/de_DE.po                                   |   5 +-
 po/el_GR.po                                   |   5 +-
 po/es_ES.po                                   |   5 +-
 po/et_EE.po                                   |   5 +-
 po/fi_FI.po                                   |   7 +-
 po/fr_FR.po                                   |   5 +-
 po/hr_HR.po                                   |   5 +-
 po/hu_HU.po                                   |   5 +-
 po/it_IT.po                                   |  15 +-
 po/lt_LT.po                                   |   5 +-
 po/mk_MK.po                                   |   5 +-
 po/nl_NL.po                                   |   5 +-
 po/nn_NO.po                                   |   5 +-
 po/pl_PL.po                                   |   5 +-
 po/pt_PT.po                                   |   5 +-
 po/ro_RO.po                                   |   5 +-
 po/ru_RU.po                                   |   5 +-
 po/sk_SK.po                                   |   5 +-
 po/sl_SI.po                                   |   5 +-
 po/sr_SR.po                                   |   5 +-
 po/sv_SE.po                                   |   5 +-
 po/tr_TR.po                                   |   5 +-
 po/uk_UA.po                                   |   5 +-
 po/zh_CN.po                                   |   5 +-
 recording.c                                   |  90 +++----
 recording.h                                   |   4 +-
 remote.c                                      |  66 ++---
 svdrp.c                                       |  23 +-
 svdrp.h                                       |   3 +-
 themes.c                                      |  60 +++--
 tools.c                                       | 116 ++++-----
 tools.h                                       |   3 +-
 vdr.c                                         |   6 +-
 90 files changed, 1177 insertions(+), 633 deletions(-)
 delete mode 100644 PLUGINS/src/dvbhddevice/bitbuffer.c
 delete mode 100644 PLUGINS/src/dvbhddevice/bitbuffer.h
 create mode 100644 PLUGINS/src/dvbhddevice/menu.c
 create mode 100644 PLUGINS/src/dvbhddevice/menu.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2a3d8588b..72f4a44a0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -272,6 +272,8 @@ Uwe Scheffler <linux_dvb@uni.de>
  for helping to test new DVB-T handling
  for reporting a bug in switching the video format in the Setup/DVB menu
  for reporting a problem with frozen live view in conjunction with device bonding
+ for reporting a problem in handling the PrimaryLimit when requesting a device for
+ live viewing
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
@@ -604,6 +606,7 @@ Helmut Auer <vdr@helmutauer.de>
  for a patch that was used to implement the command line options --edit and
  --genindex
  for suggesting to disable EPG processing for a while after a CLRE command
+ for suggesting to read the epg.data file in a separate thread
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -680,6 +683,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for his input on calculating the Aspect factor in GetOsdSize()
  for suggesting a better way of handling calls to realloc()
  for making the cutter set the 'broken link' flag for MPEG2 TS recordings
+ for reporting a crash in a plugin using cDeviceHook when VDR ends
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1125,6 +1129,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding support for DVB-T2 to libsi
  for adding support for handling DVB-T2 transponders
  for suggesting to add member functions Adapter() and Frontend() to cDvbDevice
+ for improving handling subtitles of BBC channels
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1293,6 +1298,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for making subtitle PIDs be decrypted
  for making cEITScanner process new transponders before old ones, to make sure
  transponder changes are recognized
+ for helping to debug switching into time shift mode when pausing live video
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1765,6 +1771,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
  for adding a missing 'const' to cRecording::FramesPerSecond()
  for modifying cCharSetConv so that it can be used to convert from "whatever VDR uses"
  to a given code
+ for adding some missing 'const' to cDevice
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -2267,6 +2274,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  index file
  for fixing setting the start time of an edited recording
  for adding support for HbbTV to libsi
+ for fixing cRecording::LengthInSeconds(), which wrongfully rounded the result to full
+ minutes
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2816,3 +2825,16 @@ Torsten Lang <info@torstenlang.de>
  of EPG data from BSkyB's "MTV MUSIC"
  for suggesting to make BIDI support check at runtime whether the system runs with
  UTF-8
+
+Christian Ruppert <idl0r@gentoo.org>
+ for some improvements to the Makefiles
+
+Ralf Schueler <dl4mw@schueler.ws>
+ for backporting "Changed cDvbDevice::GrabImage() to use V4L" from version 1.7.3
+ to 1.6.0-3
+ for backporting "Added some missing 'const' keywords to avoid compilation errors
+ with gcc 4.4" from version 1.7.8 to 1.6.0-3
+ for backporting "Modified cSVDRP::CmdGRAB() to avoid writing into const data"
+ from version 1.7.8 to 1.6.0-3
+ for backporting "Fixed cRecordings::DelByName() to avoid compilation errors with
+ gcc 4.4" from version 1.7.9 to 1.6.0-3
diff --git a/HISTORY b/HISTORY
index 18fa7071e..3ecb8c65c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6835,3 +6835,56 @@ Video Disk Recorder Revision History
   progress display.
 - Fixed frozen live view with device bonding in case the bonded master is used for
   live viewing (reported by Uwe Scheffler).
+
+2012-02-14: Version 1.6.0-3
+
+- Changed cDvbDevice::GrabImage() to use V4L2
+  (backport from version 1.7.3, thanks to Ralf Schueler).
+- Added some missing 'const' keywords to avoid compilation errors with gcc 4.4
+  (backport from version 1.7.8, thanks to Ralf Schueler).
+- Modified cSVDRP::CmdGRAB() to avoid writing into const data
+  (backport from version 1.7.8, thanks to Ralf Schueler).
+- Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4
+  (backport from version 1.7.9, thanks to Ralf Schueler).
+
+2012-02-19: Version 1.7.24
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed a high load in case a transponder can't be received.
+- Improved the way DVB_API_VERSION is checked.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed asserting there is a live programme if the primary device is bonded with
+  a device that starts a recording on a different band.
+- Fixed the return type of cMyDeviceHook::DeviceProvidesTransponder() in PLUGINS.html.
+- Fixed a crash in a plugin using cDeviceHook when VDR ends (reported by Oliver Endriss).
+- Some improvements to the Makefiles (thanks to Christian Ruppert).
+- Fixed cRecording::LengthInSeconds(), which wrongfully rounded the result to full
+  minutes (thanks to Christoph Haubrich).
+- Symbolic links are no longer resolved in cRecordings::ScanVideoDir() (thanks to
+  Sundararaj Reel).
+- The epg.data file is now read in a separate thread to make the startup process
+  faster in case the file is very large (suggested by Helmut Auer).
+- Fixed selecting the primary device for receiving the live viewing channel in
+  case it is bonded with an other device and has no receiver attached to it.
+- Fixed a possible crash when canceling VDR while displaying subtitles, and the
+  primary device is no longer available.
+- Improved handling subtitles of BBC channels.
+- No longer using tabs as delimiter in the EPG bugfix log (they were garbled in the
+  log file).
+- Added a missing '.' after the month in VPS strings.
+- Added some missing 'const' to cDevice (thanks to Joachim Wilke).
+- Fixed handling the PrimaryLimit when requesting a device for live viewing
+  (reported by Uwe Scheffler).
+- Removed superfluous calls to SetVideoFormat() from device constructors. This
+  function is called in cDevice::SetPrimaryDevice(), anyway.
+- An ongoing editing process is now canceled if either the original or the edited
+  version of the recording is deleted from the Recordings menu.
+- The SVDRP command DELR now won't delete a recording that is currently being edited.
+- Removed code stub for obsolete SVDRP command MOVT.
+- The DVB device adapters/frontends are now probed by scanning the /dev/dvb directory
+  instead of looping through adapter/frontend numbers. This allows for "holes" in the
+  device numbering.
+- cReadDir::Next() now skips directory entries "." and "..".
+- Fixed a possible deadlock in time shift mode.
+- Fixed switching into time shift mode when pausing live video (thanks to Reinhard
+  Nissl for helping to debug this one).
diff --git a/INSTALL b/INSTALL
index 96ebebb78..3e7bde857 100644
--- a/INSTALL
+++ b/INSTALL
@@ -304,7 +304,7 @@ multiple slashes).
 Note that the file system need not be 64-bit proof, since the 'vdr'
 program splits video files into chunks of about 2GB. You should use
 a disk with several gigabytes of free space. One GB can store roughly
-half an hour of video data.
+half an hour of SD video data, or 10 minutes of HD video.
 
 If you have more than one disk and don't want to combine them to form
 one large logical volume, you can set up several video directories as
diff --git a/Make.config.template b/Make.config.template
index 0de5bb971..f128c5b34 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,15 +6,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.4 2011/12/04 14:41:00 kls Exp $
+# $Id: Make.config.template 2.5 2012/01/18 12:20:51 kls Exp $
 
 ### The C compiler and options:
 
-CC       = gcc
-CFLAGS   = -g -O3 -Wall
+CC       ?= gcc
+CFLAGS   ?= -g -O3 -Wall
 
-CXX      = g++
-CXXFLAGS = -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXX      ?= g++
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ifdef PLUGIN
 CFLAGS   += -fPIC
@@ -23,23 +23,24 @@ endif
 
 ### The directory environment:
 
-#DVBDIR   = /usr/src/v4l-dvb/linux
-MANDIR   = /usr/local/man
-BINDIR   = /usr/local/bin
+PREFIX   ?= $(DESTDIR)/usr/local
+#DVBDIR   ?= /usr/src/v4l-dvb/linux
+MANDIR   ?= $(PREFIX)/man
+BINDIR   ?= $(PREFIX)/bin
 
-LOCDIR   = ./locale
-PLUGINDIR= ./PLUGINS
-PLUGINLIBDIR= $(PLUGINDIR)/lib
-VIDEODIR = /video
-CONFDIR  = $(VIDEODIR)
+LOCDIR       ?= ./locale
+PLUGINDIR    ?= ./PLUGINS
+PLUGINLIBDIR ?= $(PLUGINDIR)/lib
+VIDEODIR     ?= /video
+CONFDIR      ?= $(VIDEODIR)
 
 ### The remote control:
 
-LIRC_DEVICE = /var/run/lirc/lircd
-RCU_DEVICE  = /dev/ttyS1
+LIRC_DEVICE ?= /var/run/lirc/lircd
+RCU_DEVICE  ?= /dev/ttyS1
 
 ## Define if you want vdr to not run as root
-#VDR_USER = vdr
+#VDR_USER ?= vdr
 
 ### You don't need to touch the following:
 
diff --git a/Makefile b/Makefile
index 57ae2aef0..93a511252 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.23 2012/01/14 13:09:10 kls Exp $
+# $Id: Makefile 2.24 2012/01/18 12:19:37 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -17,10 +17,10 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 LSIDIR   = ./libsi
 DESTDIR ?=
 PREFIX  ?= /usr/local
-MANDIR   = $(PREFIX)/share/man
-BINDIR   = $(PREFIX)/bin
-INCDIR   = $(PREFIX)/include
-LOCDIR   = ./locale
+MANDIR  ?= $(PREFIX)/share/man
+BINDIR  ?= $(PREFIX)/bin
+INCDIR  ?= $(PREFIX)/include
+LOCDIR  ?= ./locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
 INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
 
@@ -30,7 +30,7 @@ PLUGINLIBDIR= $(PLUGINDIR)/lib
 VIDEODIR = /video
 CONFDIR  = $(VIDEODIR)
 
-DOXYGEN  = /usr/bin/doxygen
+DOXYGEN ?= /usr/bin/doxygen
 DOXYFILE = Doxyfile
 
 PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
@@ -246,4 +246,3 @@ clean:
 	-rm -rf include
 	-rm -rf srcdoc
 CLEAN: clean
-
diff --git a/PLUGINS.html b/PLUGINS.html
index 3859918d6..5ab0fd0b5 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1993,7 +1993,7 @@ <h1>Table Of Contents</h1>
 provide the given Channel's transponder, as in
 
 <p><table><tr><td class="code"><pre>
-void cMyDeviceHook::DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const
+bool cMyDeviceHook::DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const
 {
   if (<i>condition where Device can't provide Channel</i>)
      return false;
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 09ca4ad84..46597a035 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2011/12/04 15:30:21 kls Exp $
+# $Id: Makefile 1.12 2012/02/08 15:10:09 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -22,9 +22,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
@@ -51,7 +51,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o bitbuffer.o dvbhdffdevice.o hdffcmd.o hdffosd.o setup.o
+OBJS = $(PLUGIN).o dvbhdffdevice.o hdffcmd.o hdffosd.o menu.o setup.o
 
 ### The main target:
 
diff --git a/PLUGINS/src/dvbhddevice/bitbuffer.c b/PLUGINS/src/dvbhddevice/bitbuffer.c
deleted file mode 100644
index 244b85e19..000000000
--- a/PLUGINS/src/dvbhddevice/bitbuffer.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * bitbuffer.c: TODO(short description)
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: bitbuffer.c 1.1 2009/12/29 14:29:20 kls Exp $
- */
-
-#include "bitbuffer.h"
-#include <stdlib.h>
-
-cBitBuffer::cBitBuffer(uint32_t MaxLength)
-{
-    mData = NULL;
-    mMaxLength = 0;
-    mBitPos = 0;
-
-    if (MaxLength <= 0x10000)
-    {
-        mData = new uint8_t[MaxLength];
-        if (mData)
-        {
-            mMaxLength = MaxLength * 8;
-        }
-    }
-}
-
-cBitBuffer::~cBitBuffer(void)
-{
-    if (mData)
-        delete[] mData;
-}
-
-uint8_t * cBitBuffer::GetData(void)
-{
-    return mData;
-}
-
-uint32_t cBitBuffer::GetMaxLength(void)
-{
-    return mMaxLength / 8;
-}
-
-uint32_t cBitBuffer::GetBits(int NumBits)
-{
-    return 0;
-}
-
-void cBitBuffer::SetBits(int NumBits, uint32_t Data)
-{
-    uint32_t nextBitPos;
-    uint32_t bytePos;
-    uint32_t bitsInByte;
-    int shift;
-
-    if (NumBits <= 0 || NumBits > 32)
-        return;
-
-    nextBitPos = mBitPos + NumBits;
-
-    if (nextBitPos > mMaxLength)
-        return;
-
-    bytePos = mBitPos / 8;
-    bitsInByte = mBitPos % 8;
-
-    mData[bytePos] &= (uint8_t) (0xFF << (8 - bitsInByte));
-    shift = NumBits - (8 - bitsInByte);
-    if (shift > 0)
-        mData[bytePos] |= (uint8_t) (Data >> shift);
-    else
-        mData[bytePos] |= (uint8_t) (Data << (-shift));
-    NumBits -= 8 - bitsInByte;
-    bytePos++;
-    while (NumBits > 0)
-    {
-        shift = NumBits - 8;
-        if (shift > 0)
-            mData[bytePos] = (uint8_t) (Data >> shift);
-        else
-            mData[bytePos] = (uint8_t) (Data << (-shift));
-        NumBits -= 8;
-        bytePos++;
-    }
-    mBitPos = nextBitPos;
-}
-
-uint32_t cBitBuffer::GetByteLength(void)
-{
-    return (mBitPos + 7) / 8;
-}
-
-void cBitBuffer::SetDataByte(uint32_t Position, uint8_t Data)
-{
-    if (Position < mMaxLength)
-        mData[Position] = Data;
-}
diff --git a/PLUGINS/src/dvbhddevice/bitbuffer.h b/PLUGINS/src/dvbhddevice/bitbuffer.h
deleted file mode 100644
index e7b3650e4..000000000
--- a/PLUGINS/src/dvbhddevice/bitbuffer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * bitbuffer.h: TODO(short description)
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: bitbuffer.h 1.1 2009/12/29 14:27:03 kls Exp $
- */
-
-#ifndef _HDFF_BITBUFFER_H_
-#define _HDFF_BITBUFFER_H_
-
-#include <stdint.h>
-
-class cBitBuffer
-{
-private:
-    uint8_t * mData;
-    uint32_t mMaxLength;
-    uint32_t mBitPos;
-public:
-    cBitBuffer(uint32_t MaxLength);
-    ~cBitBuffer(void);
-    uint8_t * GetData(void);
-    uint32_t GetMaxLength(void);
-    uint32_t GetBits(int NumBits);
-    void SetBits(int NumBits, uint32_t Data);
-    uint32_t GetByteLength(void);
-    void SetDataByte(uint32_t Position, uint8_t Data);
-};
-
-#endif
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 0ad1698db..a1e58817c 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,29 +3,37 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.14 2011/08/27 09:31:45 kls Exp $
+ * $Id: dvbhddevice.c 1.16 2012/02/08 15:10:30 kls Exp $
  */
 
 #include <vdr/plugin.h>
+#include <vdr/shutdown.h>
 #include "dvbhdffdevice.h"
+#include "menu.h"
 #include "setup.h"
 
 static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
+static const char *MAINMENUENTRY  = "dvbhddevice";
 
 class cPluginDvbhddevice : public cPlugin {
 private:
   cDvbHdFfDeviceProbe *probe;
+  bool mIsUserInactive;
 public:
   cPluginDvbhddevice(void);
   virtual ~cPluginDvbhddevice();
   virtual const char *Version(void) { return VERSION; }
   virtual const char *Description(void) { return tr(DESCRIPTION); }
+  virtual void MainThreadHook(void);
+  virtual const char *MainMenuEntry(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
 
 cPluginDvbhddevice::cPluginDvbhddevice(void)
+:   mIsUserInactive(true)
 {
   probe = new cDvbHdFfDeviceProbe;
 }
@@ -35,6 +43,33 @@ cPluginDvbhddevice::~cPluginDvbhddevice()
   delete probe;
 }
 
+void cPluginDvbhddevice::MainThreadHook(void)
+{
+    bool isUserInactive = ShutdownHandler.IsUserInactive();
+    if (isUserInactive != mIsUserInactive)
+    {
+        mIsUserInactive = isUserInactive;
+        if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOn)
+        {
+            HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
+            if (!mIsUserInactive)
+            {
+                hdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
+            }
+        }
+    }
+}
+
+const char *cPluginDvbhddevice::MainMenuEntry(void)
+{
+  return gHdffSetup.HideMainMenu ? NULL : MAINMENUENTRY;
+}
+
+cOsdObject *cPluginDvbhddevice::MainMenuAction(void)
+{
+  return new cHdffMenu(cDvbHdFfDevice::GetHdffCmdHandler());
+}
+
 cMenuSetupPage *cPluginDvbhddevice::SetupMenu(void)
 {
   return new cHdffSetupPage(cDvbHdFfDevice::GetHdffCmdHandler());
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 101558dfe..160d9c3cd 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,9 +3,11 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.35 2011/12/04 15:30:42 kls Exp $
+ * $Id: dvbhdffdevice.c 1.39 2012/02/15 13:14:49 kls Exp $
  */
 
+#include <stdint.h>
+
 #include "dvbhdffdevice.h"
 #include <errno.h>
 #include <limits.h>
@@ -50,30 +52,34 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
      mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) gHdffSetup.AudioDownmix);
      mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) gHdffSetup.AnalogueVideo);
      mHdffCmdIf->CmdHdmiSetVideoMode(gHdffSetup.GetVideoMode());
+
      HdffHdmiConfig_t hdmiConfig;
+     memset(&hdmiConfig, 0, sizeof(hdmiConfig));
      hdmiConfig.TransmitAudio = true;
      hdmiConfig.ForceDviMode = false;
      hdmiConfig.CecEnabled = gHdffSetup.CecEnabled;
+     strcpy(hdmiConfig.CecDeviceName, "VDR");
      hdmiConfig.VideoModeAdaption = (HdffVideoModeAdaption_t) gHdffSetup.VideoModeAdaption;
      mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
-     if (gHdffSetup.CecEnabled)
-        mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
+
      mHdffCmdIf->CmdRemoteSetProtocol((HdffRemoteProtocol_t) gHdffSetup.RemoteProtocol);
      mHdffCmdIf->CmdRemoteSetAddressFilter(gHdffSetup.RemoteAddress >= 0, gHdffSetup.RemoteAddress);
      }
-
-  // Video format:
-
-  SetVideoFormat(Setup.VideoFormat);
 }
 
 cDvbHdFfDevice::~cDvbHdFfDevice()
 {
-  delete spuDecoder;
-  if (isHdffPrimary)
-     delete mHdffCmdIf;
-  // We're not explicitly closing any device files here, since this sometimes
-  // caused segfaults. Besides, the program is about to terminate anyway...
+    delete spuDecoder;
+    if (isHdffPrimary)
+    {
+        if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOff)
+        {
+            mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
+        }
+        delete mHdffCmdIf;
+    }
+    // We're not explicitly closing any device files here, since this sometimes
+    // caused segfaults. Besides, the program is about to terminate anyway...
 }
 
 void cDvbHdFfDevice::MakePrimaryDevice(bool On)
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index 957f2c740..cb06b8c67 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,9 +3,11 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.22 2011/12/04 15:31:03 kls Exp $
+ * $Id: hdffcmd.c 1.23 2012/02/06 11:08:48 kls Exp $
  */
 
+#include <stdint.h>
+
 #include "hdffcmd.h"
 #include "libhdffcmd/hdffcmd.h"
 #include <stdio.h>
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
index 142f65fb8..c4f5104c1 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.h
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.h
@@ -3,13 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.h 1.18 2011/12/04 15:31:23 kls Exp $
+ * $Id: hdffcmd.h 1.19 2012/02/06 11:09:27 kls Exp $
  */
 
 #ifndef _HDFF_CMD_H_
 #define _HDFF_CMD_H_
 
-#include "bitbuffer.h"
 #include "libhdffcmd/hdffcmd.h"
 
 namespace HDFF
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
index f9c068a1c..8b25f6671 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
@@ -4,17 +4,9 @@
 
 VERSION = 0.1.0
 
-ifndef $(INSTALL_PATH)
-    INSTALL_PATH=/usr/local
-endif
-
-ifndef $(INSTALL_LIB_PATH)
-    INSTALL_LIB_PATH=$(INSTALL_PATH)/lib
-endif
-
-ifndef $(INSTALL_INCLUDE_PATH)
-    INSTALL_INCLUDE_PATH=$(INSTALL_PATH)/include
-endif
+INSTALL_PATH         ?= /usr/local
+INSTALL_LIB_PATH     ?= $(INSTALL_PATH)/lib
+INSTALL_INCLUDE_PATH ?= $(INSTALL_PATH)/include
 
 LIB_NAME = libhdffcmd
 
@@ -27,9 +19,10 @@ LIB_HEADERS = hdffcmd.h hdffcmd_av.h hdffcmd_generic.h hdffcmd_hdmi.h \
 LIB_STATIC = $(LIB_NAME).a
 LIB_SHARED = $(LIB_NAME)-$(VERSION).so
 
-CC     = gcc
-CFLAGS = -g -O2 -fPIC -Wall
-AR     = ar -r
+CC      ?= gcc
+CFLAGS  ?= -g -O2 -fPIC -Wall
+AR      ?= ar
+ARFLAGS ?= r
 
 ### Implicit rules:
 
@@ -50,10 +43,10 @@ $(DEPFILE): Makefile
 all: $(LIB_STATIC) $(LIB_SHARED)
 
 $(LIB_STATIC): $(LIB_OBJS)
-	$(AR) $(LIB_STATIC) $(LIB_OBJS)
+	$(AR) $(ARFLAGS) $(LIB_STATIC) $(LIB_OBJS)
 
 $(LIB_SHARED): $(LIB_OBJS)
-	$(CC) -fPIC -shared -o $(LIB_SHARED) $(LIB_OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $(LIB_SHARED) $(LIB_OBJS)
 	ln -sf $(LIB_SHARED) $(LIB_NAME).so
 
 clean:
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
index 7c2189b77..0e77c7944 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
@@ -66,7 +66,8 @@ typedef enum HdffVideoConversion_t
     HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9,
     HDFF_VIDEO_CONVERSION_PILLARBOX,
     HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT,
-    HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9
+    HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9,
+    HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9
 } HdffVideoConversion_t;
 
 typedef struct HdffVideoFormat_t
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
index 8b24d7bcc..f68da669f 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
@@ -111,6 +111,7 @@ typedef enum HdffMessageId_t
     HDFF_MSG_HDMI_GET_DISPLAY_INFO,
     HDFF_MSG_HDMI_GET_VIDEO_MODE,
     HDFF_MSG_HDMI_SEND_CEC_COMMAND,
+    HDFF_MSG_HDMI_SEND_RAW_CEC_COMMAND,
 
     HDFF_MSG_REMOTE_SET_PROTOCOL = 0,
     HDFF_MSG_REMOTE_SET_ADDRESS_FILTER,
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
index 42b82b5fd..de315f838 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
@@ -48,9 +48,11 @@ int HdffCmdHdmiSetVideoMode(int OsdDevice, HdffVideoMode_t VideoMode)
 
 int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config)
 {
-    uint8_t cmdData[8];
+    uint8_t cmdData[24];
     BitBuffer_t cmdBuf;
     osd_raw_cmd_t osd_cmd;
+    size_t nameLen;
+    int i;
 
     BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
     memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
@@ -61,6 +63,14 @@ int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config)
     BitBuffer_SetBits(&cmdBuf, 1, Config->ForceDviMode ? 1 : 0);
     BitBuffer_SetBits(&cmdBuf, 1, Config->CecEnabled ? 1 : 0);
     BitBuffer_SetBits(&cmdBuf, 3, Config->VideoModeAdaption);
+    BitBuffer_SetBits(&cmdBuf, 6, 0); // reserved
+    nameLen = strlen(Config->CecDeviceName);
+    if (nameLen > 13)
+        nameLen = 13;
+    BitBuffer_SetBits(&cmdBuf, 4, nameLen);
+    for (i = 0; i < nameLen; i++)
+        BitBuffer_SetBits(&cmdBuf, 8, Config->CecDeviceName[i]);
+
     osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
@@ -80,3 +90,31 @@ int HdffCmdHdmiSendCecCommand(int OsdDevice, HdffCecCommand_t Command)
     osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
+
+int HdffCmdHdmiSendRawCecCommand(int OsdDevice, uint8_t Destination,
+                                 uint8_t Opcode, const uint8_t * Operand,
+                                 uint8_t OperandLength)
+{
+    uint8_t cmdData[24];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int i;
+
+    if (OperandLength > 14)
+        OperandLength = 14;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
+                       HDFF_MSG_HDMI_SEND_RAW_CEC_COMMAND);
+    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 4, Destination);
+    BitBuffer_SetBits(&cmdBuf, 8, Opcode);
+    BitBuffer_SetBits(&cmdBuf, 8, OperandLength);
+    for (i = 0; i < OperandLength; i++)
+        BitBuffer_SetBits(&cmdBuf, 8, Operand[i]);
+
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
index 16e375f4b..fc79bd9b8 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
@@ -47,14 +47,15 @@ typedef struct HdffHdmiConfig_t
     int ForceDviMode;
     int CecEnabled;
     HdffVideoModeAdaption_t VideoModeAdaption;
+    char CecDeviceName[14];
 } HdffHdmiConfig_t;
 
 typedef enum HdffCecCommand_t
 {
     HDFF_CEC_COMMAND_TV_ON,
     HDFF_CEC_COMMAND_TV_OFF,
-    HDFF_CEC_COMMAND_TV_ACTIVE_SOURCE,
-    HDFF_CEC_COMMAND_TV_INACTIVE_SOURCE
+    HDFF_CEC_COMMAND_ACTIVE_SOURCE,
+    HDFF_CEC_COMMAND_INACTIVE_SOURCE
 } HdffCecCommand_t;
 
 
@@ -64,4 +65,8 @@ int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config);
 
 int HdffCmdHdmiSendCecCommand(int OsdDevice, HdffCecCommand_t Command);
 
+int HdffCmdHdmiSendRawCecCommand(int OsdDevice, uint8_t Destination,
+                                 uint8_t Opcode, const uint8_t * Operand,
+                                 uint8_t OperandLength);
+
 #endif /* HDFFCMD_HDMI_H */
diff --git a/PLUGINS/src/dvbhddevice/menu.c b/PLUGINS/src/dvbhddevice/menu.c
new file mode 100644
index 000000000..e8fd867ab
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/menu.c
@@ -0,0 +1,65 @@
+/*
+ * menu.c: The DVB HD Full Featured device main menu
+ *
+ * See the README file for copyright information and how to reach the author.
+ */
+
+#include "menu.h"
+#include "setup.h"
+
+cHdffMenu::cHdffMenu(HDFF::cHdffCmdIf * pHdffCmdIf)
+:   cOsdMenu("dvbhddevice"),
+    mHdffCmdIf(pHdffCmdIf)
+{
+    mVideoConversionItem = new cOsdItem("", osUnknown, false);
+    Add(mVideoConversionItem);
+    SetHelp(tr("Video Conversion"), tr("TV on"));
+    SetVideoConversion();
+}
+
+cHdffMenu::~cHdffMenu()
+{
+}
+
+eOSState cHdffMenu::ProcessKey(eKeys key)
+{
+    eOSState state = cOsdMenu::ProcessKey(key);
+    if (state == osUnknown)
+    {
+        switch (key)
+        {
+            case kRed:
+                gHdffSetup.SetNextVideoConversion();
+                SetVideoConversion();
+                break;
+
+            case kGreen:
+                mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
+                state = osEnd;
+                break;
+
+            case kOk:
+                state = osEnd;
+                break;
+
+            default:
+                break;
+        }
+    }
+    return state;
+}
+
+void cHdffMenu::SetVideoConversion(void)
+{
+    HdffVideoFormat_t videoFormat;
+    videoFormat.AutomaticEnabled = true;
+    videoFormat.AfdEnabled = false;
+    videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
+    videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
+    mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+
+    char str[128];
+    sprintf(str, "%s: %s", tr("Video Conversion"), gHdffSetup.GetVideoConversionString());
+    mVideoConversionItem->SetText(str);
+    Display();
+}
diff --git a/PLUGINS/src/dvbhddevice/menu.h b/PLUGINS/src/dvbhddevice/menu.h
new file mode 100644
index 000000000..18b3d9979
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/menu.h
@@ -0,0 +1,29 @@
+/*
+ * menu.h: The DVB HD Full Featured device main menu
+ *
+ * See the README file for copyright information and how to reach the author.
+ */
+
+#ifndef _HDFF_MENU_H_
+#define _HDFF_MENU_H_
+
+#include <vdr/osd.h>
+#include <vdr/plugin.h>
+
+#include "hdffcmd.h"
+
+class cHdffMenu : public cOsdMenu
+{
+private:
+    HDFF::cHdffCmdIf * mHdffCmdIf;
+
+    cOsdItem * mVideoConversionItem;
+
+    void SetVideoConversion(void);
+public:
+    cHdffMenu(HDFF::cHdffCmdIf * pHdffCmdIf);
+    virtual ~cHdffMenu();
+    virtual eOSState ProcessKey(eKeys Key);
+};
+
+#endif
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index 78ace1bfe..ac58c0c9d 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR \n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-08-21 14:02+0200\n"
+"POT-Creation-Date: 2012-02-07 20:13+0100\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Christoph Haubrich\n"
 "Language-Team: <see README>\n"
@@ -19,17 +19,11 @@ msgstr ""
 msgid "HD Full Featured DVB device"
 msgstr "HD Full Featured DVB device"
 
-msgid "Off"
-msgstr "aus"
-
-msgid "Frame rate"
-msgstr "passende Framerate"
-
-msgid "HD Only"
-msgstr "nur bei HD"
+msgid "Video Conversion"
+msgstr "Bildanpassung"
 
-msgid "Always"
-msgstr "immer"
+msgid "TV on"
+msgstr "TV ein"
 
 msgid "Automatic"
 msgstr "automatisch"
@@ -49,11 +43,26 @@ msgstr "CentreCutOut"
 msgid "Always 16/9"
 msgstr "immer 16:9"
 
+msgid "Zoom 16/9"
+msgstr "Zoome 16:9"
+
+msgid "Off"
+msgstr "aus"
+
+msgid "Frame rate"
+msgstr "passende Framerate"
+
+msgid "HD Only"
+msgstr "nur bei HD"
+
+msgid "Always"
+msgstr "immer"
+
 msgid "Disabled"
 msgstr "abgeschaltet"
 
 msgid "Analogue only"
-msgstr "nur Analoge Ausgänge"
+msgstr "nur analoge Ausgänge"
 
 msgid "HDMI only"
 msgstr "nur HDMI"
@@ -73,9 +82,6 @@ msgstr "Auflösungsanpassung"
 msgid "TV format"
 msgstr "TV-Format"
 
-msgid "Video Conversion"
-msgstr "Videokonvertierung"
-
 msgid "Analogue Video"
 msgstr "Analoges Video"
 
@@ -91,6 +97,12 @@ msgstr "OSD Größe"
 msgid "HDMI CEC"
 msgstr "HDMI CEC"
 
+msgid "CEC: Switch TV on"
+msgstr "CEC: TV einschalten"
+
+msgid "CEC: Switch TV off"
+msgstr "CEC: TV ausschalten"
+
 msgid "Remote Control Protocol"
 msgstr "Fernbedienungsprotokoll"
 
@@ -102,3 +114,6 @@ msgstr "High Level OSD"
 
 msgid "Allow True Color OSD"
 msgstr "Erlaube True Color OSD"
+
+msgid "Hide mainmenu entry"
+msgstr "Hauptmenüeintrag verstecken"
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 48abaf575..c8980ba79 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR \n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-08-21 14:02+0200\n"
+"POT-Creation-Date: 2012-02-07 20:13+0100\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -19,17 +19,11 @@ msgstr ""
 msgid "HD Full Featured DVB device"
 msgstr "DVB-laite HD-ulostulolla"
 
-msgid "Off"
-msgstr "ei"
-
-msgid "Frame rate"
-msgstr "kuvataajuuden mukaan"
-
-msgid "HD Only"
-msgstr "vain HD-resoluutiolla"
+msgid "Video Conversion"
+msgstr "Näyttömuoto"
 
-msgid "Always"
-msgstr "aina"
+msgid "TV on"
+msgstr ""
 
 msgid "Automatic"
 msgstr "automaattinen"
@@ -49,6 +43,21 @@ msgstr "center cut out"
 msgid "Always 16/9"
 msgstr "aina 16:9"
 
+msgid "Zoom 16/9"
+msgstr ""
+
+msgid "Off"
+msgstr "ei"
+
+msgid "Frame rate"
+msgstr "kuvataajuuden mukaan"
+
+msgid "HD Only"
+msgstr "vain HD-resoluutiolla"
+
+msgid "Always"
+msgstr "aina"
+
 msgid "Disabled"
 msgstr "ei käytössä"
 
@@ -73,9 +82,6 @@ msgstr "Sovita näyttömoodi"
 msgid "TV format"
 msgstr "Näytön kuvasuhde"
 
-msgid "Video Conversion"
-msgstr "Näyttömuoto"
-
 msgid "Analogue Video"
 msgstr "Analoginen kuvalähtö"
 
@@ -91,6 +97,12 @@ msgstr "Kuvaruutunäytön koko"
 msgid "HDMI CEC"
 msgstr "Käytä HDMI CEC-toimintoa"
 
+msgid "CEC: Switch TV on"
+msgstr ""
+
+msgid "CEC: Switch TV off"
+msgstr ""
+
 msgid "Remote Control Protocol"
 msgstr "Kaukosäätimen protokolla"
 
@@ -102,3 +114,6 @@ msgstr "Käytä korkean tason kuvaruutunäyttöä"
 
 msgid "Allow True Color OSD"
 msgstr "Salli tosivärit kuvaruutunäytölle"
+
+msgid "Hide mainmenu entry"
+msgstr ""
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index bafb2c55e..def038995 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-08-21 14:02+0200\n"
+"POT-Creation-Date: 2012-02-07 20:13+0100\n"
 "PO-Revision-Date: 2011-07-10 00:23+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
@@ -22,18 +22,12 @@ msgstr ""
 msgid "HD Full Featured DVB device"
 msgstr ""
 
-msgid "Off"
-msgstr ""
-
-msgid "Frame rate"
-msgstr ""
+msgid "Video Conversion"
+msgstr "Conversione video"
 
-msgid "HD Only"
+msgid "TV on"
 msgstr ""
 
-msgid "Always"
-msgstr "Sempre"
-
 msgid "Automatic"
 msgstr "Automatica"
 
@@ -52,6 +46,21 @@ msgstr "CentreCutOut"
 msgid "Always 16/9"
 msgstr "Sempre 16:9"
 
+msgid "Zoom 16/9"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Frame rate"
+msgstr ""
+
+msgid "HD Only"
+msgstr ""
+
+msgid "Always"
+msgstr "Sempre"
+
 msgid "Disabled"
 msgstr "Disabilitata"
 
@@ -76,9 +85,6 @@ msgstr ""
 msgid "TV format"
 msgstr "Formato TV"
 
-msgid "Video Conversion"
-msgstr "Conversione video"
-
 msgid "Analogue Video"
 msgstr "Video analogico"
 
@@ -94,6 +100,12 @@ msgstr "Dimensione OSD"
 msgid "HDMI CEC"
 msgstr "HDMI CEC"
 
+msgid "CEC: Switch TV on"
+msgstr ""
+
+msgid "CEC: Switch TV off"
+msgstr ""
+
 msgid "Remote Control Protocol"
 msgstr "Protocollo controllo remoto"
 
@@ -105,3 +117,6 @@ msgstr "OSD alto livello"
 
 msgid "Allow True Color OSD"
 msgstr "Permetti OSD True Color"
+
+msgid "Hide mainmenu entry"
+msgstr ""
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index cb476a852..b6525a002 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c 1.14 2011/12/04 15:31:58 kls Exp $
+ * $Id: setup.c 1.17 2012/02/08 15:14:01 kls Exp $
  */
 
 #include "setup.h"
@@ -28,10 +28,13 @@ cHdffSetup::cHdffSetup(void)
     AudioDownmix = HDFF_AUDIO_DOWNMIX_AUTOMATIC;
     OsdSize = 0;
     CecEnabled = 1;
+    CecTvOn = 1;
+    CecTvOff = 0;
     RemoteProtocol = 1;
     RemoteAddress = -1;
     HighLevelOsd = 1;
     TrueColorOsd = 1;
+    HideMainMenu = 0;
 }
 
 bool cHdffSetup::SetupParse(const char *Name, const char *Value)
@@ -45,10 +48,13 @@ bool cHdffSetup::SetupParse(const char *Name, const char *Value)
     else if (strcmp(Name, "AudioDownmix")      == 0) AudioDownmix      = atoi(Value);
     else if (strcmp(Name, "OsdSize")           == 0) OsdSize           = atoi(Value);
     else if (strcmp(Name, "CecEnabled")        == 0) CecEnabled        = atoi(Value);
+    else if (strcmp(Name, "CecTvOn")           == 0) CecTvOn           = atoi(Value);
+    else if (strcmp(Name, "CecTvOff")          == 0) CecTvOff          = atoi(Value);
     else if (strcmp(Name, "RemoteProtocol")    == 0) RemoteProtocol    = atoi(Value);
     else if (strcmp(Name, "RemoteAddress")     == 0) RemoteAddress     = atoi(Value);
     else if (strcmp(Name, "HighLevelOsd")      == 0) HighLevelOsd      = atoi(Value);
     else if (strcmp(Name, "TrueColorOsd")      == 0) TrueColorOsd      = atoi(Value);
+    else if (strcmp(Name, "HideMainMenu")      == 0) HideMainMenu      = atoi(Value);
     else return false;
     return true;
 }
@@ -112,12 +118,74 @@ HdffVideoMode_t cHdffSetup::GetVideoMode(void)
     }
 }
 
+void cHdffSetup::SetNextVideoConversion(void)
+{
+    int nextVideoConversion = HDFF_VIDEO_CONVERSION_AUTOMATIC;
+
+    if (TvFormat == HDFF_TV_FORMAT_16_BY_9)
+    {
+        switch (VideoConversion)
+        {
+            case HDFF_VIDEO_CONVERSION_PILLARBOX:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
+                break;
+            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9;
+                break;
+            case HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9;
+                break;
+            case HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_PILLARBOX;
+                break;
+        }
+    }
+    else
+    {
+        switch (VideoConversion)
+        {
+            case HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9;
+                break;
+            case HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
+                break;
+            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
+                nextVideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
+                break;
+        }
+    }
+    VideoConversion = nextVideoConversion;
+}
+
+const char * cHdffSetup::GetVideoConversionString(void)
+{
+    switch (VideoConversion)
+    {
+        case HDFF_VIDEO_CONVERSION_AUTOMATIC:
+        default:
+            return tr("Automatic");
+        case HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9:
+            return tr("Letterbox 16/9");
+        case HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9:
+            return tr("Letterbox 14/9");
+        case HDFF_VIDEO_CONVERSION_PILLARBOX:
+            return tr("Pillarbox");
+        case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
+            return tr("CentreCutOut");
+        case HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9:
+            return tr("Always 16/9");
+        case HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9:
+            return tr("Zoom 16/9");
+    }
+}
+
+
 cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
 {
     const int kResolutions = 4;
     const int kVideoModeAdaptions = 4;
     const int kTvFormats = 2;
-    const int kVideoConversions = 6;
     const int kAnalogueVideos = 4;
     const int kAudioDownmixes = 5;
     const int kOsdSizes = 5;
@@ -145,17 +213,6 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
         "16/9",
     };
 
-    static const char * VideoConversionItems[kVideoConversions] =
-    {
-        tr("Automatic"),
-        tr("Letterbox 16/9"),
-        tr("Letterbox 14/9"),
-        tr("Pillarbox"),
-        tr("CentreCutOut"),
-        tr("Always 16/9"),
-    };
-
-
     static const char * AnalogueVideoItems[kAnalogueVideos] =
     {
         tr("Disabled"),
@@ -194,25 +251,133 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
 
     Add(new cMenuEditStraItem(tr("Resolution"), &mNewHdffSetup.Resolution, kResolutions, ResolutionItems));
     Add(new cMenuEditStraItem(tr("Video Mode Adaption"), &mNewHdffSetup.VideoModeAdaption, kVideoModeAdaptions, VideoModeAdaptionItems));
-    Add(new cMenuEditStraItem(tr("TV format"), &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems));
-    Add(new cMenuEditStraItem(tr("Video Conversion"), &mNewHdffSetup.VideoConversion, kVideoConversions, VideoConversionItems));
+    mTvFormatItem = new cMenuEditStraItem(tr("TV format"), &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems);
+    Add(mTvFormatItem);
     Add(new cMenuEditStraItem(tr("Analogue Video"), &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
     Add(new cMenuEditIntItem(tr("Audio Delay (ms)"), &mNewHdffSetup.AudioDelay, 0, 500));
     Add(new cMenuEditStraItem(tr("Audio Downmix"), &mNewHdffSetup.AudioDownmix, kAudioDownmixes, AudioDownmixItems));
     Add(new cMenuEditStraItem(tr("OSD Size"), &mNewHdffSetup.OsdSize, kOsdSizes, OsdSizeItems));
     Add(new cMenuEditBoolItem(tr("HDMI CEC"), &mNewHdffSetup.CecEnabled));
+    Add(new cMenuEditBoolItem(tr("CEC: Switch TV on"), &mNewHdffSetup.CecTvOn));
+    Add(new cMenuEditBoolItem(tr("CEC: Switch TV off"), &mNewHdffSetup.CecTvOff));
     Add(new cMenuEditStraItem(tr("Remote Control Protocol"), &mNewHdffSetup.RemoteProtocol, kRemoteProtocols, RemoteProtocolItems));
     Add(new cMenuEditIntItem(tr("Remote Control Address"), &mNewHdffSetup.RemoteAddress, -1, 31));
     Add(new cMenuEditBoolItem(tr("High Level OSD"), &mNewHdffSetup.HighLevelOsd));
     Add(new cMenuEditBoolItem(tr("Allow True Color OSD"), &mNewHdffSetup.TrueColorOsd));
+    Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &mNewHdffSetup.HideMainMenu));
+
+    mVideoConversion = 0;
+    if (mNewHdffSetup.TvFormat == HDFF_TV_FORMAT_16_BY_9)
+    {
+        switch (mNewHdffSetup.VideoConversion)
+        {
+            case HDFF_VIDEO_CONVERSION_PILLARBOX:
+                mVideoConversion = 0;
+                break;
+            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
+                mVideoConversion = 1;
+                break;
+            case HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9:
+                mVideoConversion = 2;
+                break;
+            case HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9:
+                mVideoConversion = 3;
+                break;
+        }
+    }
+    else
+    {
+        switch (mNewHdffSetup.VideoConversion)
+        {
+            case HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9:
+                mVideoConversion = 0;
+                break;
+            case HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9:
+                mVideoConversion = 1;
+                break;
+            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
+                mVideoConversion = 2;
+                break;
+        }
+    }
+    BuildVideoConversionItem();
 }
 
 cHdffSetupPage::~cHdffSetupPage(void)
 {
 }
 
+void cHdffSetupPage::BuildVideoConversionItem(void)
+{
+    const int kVideoConversions4by3 = 3;
+    const int kVideoConversions16by9 = 4;
+
+    static const char * VideoConversionItems4by3[kVideoConversions4by3] =
+    {
+        tr("Letterbox 16/9"),
+        tr("Letterbox 14/9"),
+        tr("CentreCutOut")
+    };
+
+    static const char * VideoConversionItems16by9[kVideoConversions16by9] =
+    {
+        tr("Pillarbox"),
+        tr("CentreCutOut"),
+        tr("Always 16/9"),
+        tr("Zoom 16/9")
+    };
+
+    cOsdItem * item;
+
+    cList<cOsdItem>::Del(mTvFormatItem->Next());
+    if (mNewHdffSetup.TvFormat == HDFF_TV_FORMAT_16_BY_9)
+    {
+        item = new cMenuEditStraItem(tr("Video Conversion"), &mVideoConversion,
+                kVideoConversions16by9, VideoConversionItems16by9);
+    }
+    else
+    {
+        item = new cMenuEditStraItem(tr("Video Conversion"), &mVideoConversion,
+                kVideoConversions4by3, VideoConversionItems4by3);
+    }
+    Add(item, false, mTvFormatItem);
+}
+
 void cHdffSetupPage::Store(void)
 {
+    if (mNewHdffSetup.TvFormat == HDFF_TV_FORMAT_16_BY_9)
+    {
+        switch (mVideoConversion)
+        {
+            case 0:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_PILLARBOX;
+                break;
+            case 1:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
+                break;
+            case 2:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9;
+                break;
+            case 3:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9;
+                break;
+        }
+    }
+    else
+    {
+        switch (mVideoConversion)
+        {
+            case 0:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
+                break;
+            case 1:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9;
+                break;
+            case 2:
+                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
+                break;
+        }
+    }
     SetupStore("Resolution", mNewHdffSetup.Resolution);
     SetupStore("VideoModeAdaption", mNewHdffSetup.VideoModeAdaption);
     SetupStore("TvFormat", mNewHdffSetup.TvFormat);
@@ -222,10 +387,13 @@ void cHdffSetupPage::Store(void)
     SetupStore("AudioDownmix", mNewHdffSetup.AudioDownmix);
     SetupStore("OsdSize", mNewHdffSetup.OsdSize);
     SetupStore("CecEnabled", mNewHdffSetup.CecEnabled);
+    SetupStore("CecTvOn", mNewHdffSetup.CecTvOn);
+    SetupStore("CecTvOff", mNewHdffSetup.CecTvOff);
     SetupStore("RemoteProtocol", mNewHdffSetup.RemoteProtocol);
     SetupStore("RemoteAddress", mNewHdffSetup.RemoteAddress);
     SetupStore("HighLevelOsd", mNewHdffSetup.HighLevelOsd);
     SetupStore("TrueColorOsd", mNewHdffSetup.TrueColorOsd);
+    SetupStore("HideMainMenu", mNewHdffSetup.HideMainMenu);
 
     if (mHdffCmdIf)
     {
@@ -237,7 +405,7 @@ void cHdffSetupPage::Store(void)
         HdffHdmiConfig_t hdmiConfig;
 
         videoFormat.AutomaticEnabled = true;
-        videoFormat.AfdEnabled = true;
+        videoFormat.AfdEnabled = false;
         videoFormat.TvFormat = (HdffTvFormat_t) mNewHdffSetup.TvFormat;
         videoFormat.VideoConversion = (HdffVideoConversion_t) mNewHdffSetup.VideoConversion;
         mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
@@ -247,6 +415,7 @@ void cHdffSetupPage::Store(void)
 
         mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) mNewHdffSetup.AnalogueVideo);
 
+        memset(&hdmiConfig, 0, sizeof(hdmiConfig));
         hdmiConfig.TransmitAudio = true;
         hdmiConfig.ForceDviMode = false;
         hdmiConfig.CecEnabled = mNewHdffSetup.CecEnabled;
@@ -259,3 +428,29 @@ void cHdffSetupPage::Store(void)
 
     gHdffSetup = mNewHdffSetup;
 }
+
+eOSState cHdffSetupPage::ProcessKey(eKeys key)
+{
+	eOSState state = cMenuSetupPage::ProcessKey(key);
+
+	if (state == osContinue)
+	{
+		cOsdItem * item;
+		switch (key)
+		{
+			case kLeft:
+			case kRight:
+				item = Get(Current());
+				if (item == mTvFormatItem)
+				{
+				    mVideoConversion = 0;
+					BuildVideoConversionItem();
+					Display();
+				}
+				break;
+			default:
+				break;
+		}
+	}
+	return state;
+}
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
index 964105e55..64033e1c2 100644
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.h 1.10 2011/12/04 15:32:13 kls Exp $
+ * $Id: setup.h 1.12 2012/02/08 15:14:56 kls Exp $
  */
 
 #ifndef _HDFF_SETUP_H_
@@ -18,6 +18,8 @@ struct cHdffSetup
     bool SetupParse(const char * Name, const char * Value);
     void GetOsdSize(int &Width, int &Height, double &PixelAspect);
     HdffVideoMode_t GetVideoMode(void);
+    void SetNextVideoConversion(void);
+    const char * GetVideoConversionString(void);
 
     int Resolution;
     int VideoModeAdaption;
@@ -28,11 +30,15 @@ struct cHdffSetup
     int AudioDownmix;
     int OsdSize;
     int CecEnabled;
+    int CecTvOn;
+    int CecTvOff;
     int RemoteProtocol;
     int RemoteAddress;
 
     int HighLevelOsd;
     int TrueColorOsd;
+
+    int HideMainMenu;
 };
 
 extern cHdffSetup gHdffSetup;
@@ -42,6 +48,10 @@ class cHdffSetupPage : public cMenuSetupPage
 private:
     HDFF::cHdffCmdIf * mHdffCmdIf;
     cHdffSetup mNewHdffSetup;
+    cOsdItem * mTvFormatItem;
+    int mVideoConversion;
+
+    void BuildVideoConversionItem(void);
 
 protected:
     virtual void Store(void);
@@ -49,6 +59,7 @@ class cHdffSetupPage : public cMenuSetupPage
 public:
     cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf);
     virtual ~cHdffSetupPage(void);
+    virtual eOSState ProcessKey(eKeys Key);
 };
 
 #endif
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 55299767f..bf5f7173c 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.7 2011/05/21 12:25:37 kls Exp $
+# $Id: Makefile 1.8 2012/01/18 12:28:43 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -22,9 +22,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 17f842b64..cc6af3394 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.30 2011/08/27 11:33:57 kls Exp $
+ * $Id: dvbsdffdevice.c 2.31 2012/02/15 13:15:05 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -66,10 +66,6 @@ cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly)
         fclose(f);
      }
   devVideoIndex = devVideoOffset >= 0 ? devVideoOffset++ : -1;
-
-  // Video format:
-
-  SetVideoFormat(Setup.VideoFormat);
 }
 
 cDvbSdFfDevice::~cDvbSdFfDevice()
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index b59d08ae0..b1a5af11f 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.7 2011/05/21 12:25:41 kls Exp $
+# $Id: Makefile 2.8 2012/01/18 12:29:09 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -22,9 +22,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index d93d802db..d192b4aed 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.3 2011/02/27 10:05:01 kls Exp $
+# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,9 +20,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
@@ -62,7 +62,7 @@ all: libvdr-$(PLUGIN).so
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 4f880c60f..c85c1a244 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -63,3 +63,7 @@ VDR Plugin 'pictures' Revision History
 2012-01-08:
 
 - Added option -o to pic2mpg.
+
+2012-02-17:
+
+- cReadDir::Next() now skips directory entries "." and "..".
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 456207bd4..112586bcc 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.7 2011/05/21 12:25:45 kls Exp $
+# $Id: Makefile 2.8 2012/01/18 12:30:05 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -22,9 +22,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index 1438481e5..8c124b5d5 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.c 2.0 2008/02/17 13:42:34 kls Exp $
+ * $Id: entry.c 2.1 2012/02/17 14:00:28 kls Exp $
  */
 
 #include "entry.h"
@@ -48,13 +48,11 @@ void cPictureEntry::Load(void) const
      if (d.Ok()) {
         struct dirent *e;
         while ((e = d.Next()) != NULL) {
-              if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-                 struct stat ds;
-                 if (stat(AddDirectory(Directory, e->d_name), &ds) == 0) {
-                    if (!entries)
-                       entries = new cList<cPictureEntry>;
-                    entries->Add(new cPictureEntry(e->d_name, this, S_ISDIR(ds.st_mode)));
-                    }
+              struct stat ds;
+              if (stat(AddDirectory(Directory, e->d_name), &ds) == 0) {
+                 if (!entries)
+                    entries = new cList<cPictureEntry>;
+                 entries->Add(new cPictureEntry(e->d_name, this, S_ISDIR(ds.st_mode)));
                  }
               }
         if (entries)
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 8a890b1ce..77fb4216a 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.3 2011/02/20 16:50:01 kls Exp $
+ * $Id: pictures.c 2.4 2012/02/17 14:00:48 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.0";
+static const char *VERSION       = "0.1.1";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 2c8b17b40..b2713ed7b 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.3 2011/02/27 10:05:04 kls Exp $
+# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -22,9 +22,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
@@ -64,7 +64,7 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index a765b654d..62f5d2575 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.7 2011/05/21 12:25:49 kls Exp $
+# $Id: Makefile 2.8 2012/01/18 12:30:52 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -22,9 +22,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index f166981df..3e9b170de 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.3 2011/02/27 10:05:08 kls Exp $
+# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,9 +20,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
@@ -62,7 +62,7 @@ all: libvdr-$(PLUGIN).so
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 2c84920d8..1f640b86d 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.3 2011/02/27 10:05:10 kls Exp $
+# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,9 +20,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
diff --git a/config.h b/config.h
index d27afd9c0..18d551f35 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.39 2012/01/14 13:03:53 kls Exp $
+ * $Id: config.h 2.40 2012/01/16 09:50:03 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.23"
-#define VDRVERSNUM   10723  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.24"
+#define VDRVERSNUM   10724  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.23"
-#define APIVERSNUM   10723  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.24"
+#define APIVERSNUM   10724  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index f4df7fe9f..320d554c1 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,10 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.10 2011/12/04 12:55:53 kls Exp $
+ * $Id: cutter.c 2.11 2012/02/16 12:08:39 kls Exp $
  */
 
 #include "cutter.h"
+#include "menu.h"
 #include "recording.h"
 #include "remux.h"
 #include "videodir.h"
@@ -197,7 +198,8 @@ void cCuttingThread::Action(void)
 // --- cCutter ---------------------------------------------------------------
 
 cMutex cCutter::mutex;
-char *cCutter::editedVersionName = NULL;
+cString cCutter::originalVersionName;
+cString cCutter::editedVersionName;
 cCuttingThread *cCutter::cuttingThread = NULL;
 bool cCutter::error = false;
 bool cCutter::ended = false;
@@ -208,6 +210,7 @@ bool cCutter::Start(const char *FileName)
   if (!cuttingThread) {
      error = false;
      ended = false;
+     originalVersionName = FileName;
      cRecording Recording(FileName);
 
      cMarks FromMarks;
@@ -229,7 +232,7 @@ bool cCutter::Start(const char *FileName)
            }
         free(s);
         // XXX
-        editedVersionName = strdup(evn);
+        editedVersionName = evn;
         Recording.WriteInfo();
         Recordings.AddByName(editedVersionName, false);
         cuttingThread = new cCuttingThread(FileName, editedVersionName);
@@ -246,27 +249,29 @@ void cCutter::Stop(void)
   const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
   delete cuttingThread;
   cuttingThread = NULL;
-  if ((Interrupted || Error) && editedVersionName) {
+  if ((Interrupted || Error) && *editedVersionName) {
      if (Interrupted)
         isyslog("editing process has been interrupted");
      if (Error)
         esyslog("ERROR: '%s' during editing process", Error);
-     RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed?
+     if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), editedVersionName) == 0)
+        cControl::Shutdown();
+     RemoveVideoFile(editedVersionName);
      Recordings.DelByName(editedVersionName);
      }
 }
 
-bool cCutter::Active(void)
+bool cCutter::Active(const char *FileName)
 {
   cMutexLock MutexLock(&mutex);
   if (cuttingThread) {
      if (cuttingThread->Active())
-        return true;
+        return !FileName || strcmp(FileName, originalVersionName) == 0 || strcmp(FileName, editedVersionName) == 0;
      error = cuttingThread->Error();
      Stop();
      if (!error)
         cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
-     free(editedVersionName);
+     originalVersionName = NULL;
      editedVersionName = NULL;
      ended = true;
      }
diff --git a/cutter.h b/cutter.h
index 59c440082..f48ae3fca 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,27 +4,32 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 2.2 2010/08/29 13:32:33 kls Exp $
+ * $Id: cutter.h 2.3 2012/02/16 12:05:33 kls Exp $
  */
 
 #ifndef __CUTTER_H
 #define __CUTTER_H
 
 #include "thread.h"
+#include "tools.h"
 
 class cCuttingThread;
 
 class cCutter {
 private:
   static cMutex mutex;
-  static char *editedVersionName;
+  static cString originalVersionName;
+  static cString editedVersionName;
   static cCuttingThread *cuttingThread;
   static bool error;
   static bool ended;
 public:
   static bool Start(const char *FileName);
   static void Stop(void);
-  static bool Active(void);
+  static bool Active(const char *FileName = NULL);
+         ///< Returns true if the cutter is currently active.
+         ///< If a FileName is given, true is only returned if either the
+         ///< original or the edited file name is equal to FileName.
   static bool Error(void);
   static bool Ended(void);
   };
diff --git a/device.c b/device.c
index 0bab66cdd..526f867f5 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.44 2011/10/16 14:36:43 kls Exp $
+ * $Id: device.c 2.49 2012/02/15 13:15:19 kls Exp $
  */
 
 #include "device.h"
@@ -41,7 +41,8 @@ cLiveSubtitle::~cLiveSubtitle()
 
 void cLiveSubtitle::Receive(uchar *Data, int Length)
 {
-  cDevice::PrimaryDevice()->PlayTs(Data, Length);
+  if (cDevice::PrimaryDevice())
+     cDevice::PrimaryDevice()->PlayTs(Data, Length);
 }
 
 // --- cDeviceHook -----------------------------------------------------------
@@ -81,8 +82,6 @@ cDevice::cDevice(void)
 
   SetDescription("receiver on device %d", CardIndex() + 1);
 
-  SetVideoFormat(Setup.VideoFormat);
-
   mute = false;
   volume = Setup.CurrentVolume;
 
@@ -270,7 +269,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
           if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
              continue; // CAM slot can't be used with this device
           bool ndr;
-          if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
+          if (device[i]->ProvidesChannel(Channel, (LiveView && device[i]->IsPrimaryDevice()) ? Setup.PrimaryLimit : Priority, &ndr)) { // this device is basicly able to do the job
              if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
                 ndr = true; // using a different CAM slot requires detaching receivers
              // Put together an integer number that reflects the "impact" using
@@ -335,6 +334,7 @@ void cDevice::SetCamSlot(cCamSlot *CamSlot)
 
 void cDevice::Shutdown(void)
 {
+  deviceHooks.Clear();
   primaryDevice = NULL;
   for (int i = 0; i < numDevices; i++) {
       delete device[i];
@@ -531,6 +531,14 @@ bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
   return false;
 }
 
+void cDevice::DelLivePids(void)
+{
+  for (int i = ptAudio; i < ptOther; i++) {
+      if (pidHandles[i].pid)
+         DelPid(pidHandles[i].pid, ePidType(i));
+      }
+}
+
 void cDevice::StartSectionHandler(void)
 {
   if (!sectionHandler) {
diff --git a/device.h b/device.h
index e2ff81263..9a4593452 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.30 2011/12/04 13:38:17 kls Exp $
+ * $Id: device.h 2.33 2012/02/14 14:42:42 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -354,6 +354,9 @@ class cDevice : public cThread {
          ///< Handle->used indicates how many receivers are using this PID.
          ///< Type indicates some special types of PIDs, which the device may
          ///< need to set in a specific way.
+public:
+  void DelLivePids(void);
+         ///< Deletes the live viewing PIDs.
 
 // Section filter facilities
 
@@ -436,14 +439,14 @@ class cDevice : public cThread {
          ///< Returns the video system of the currently displayed material
          ///< (default is PAL).
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
-         ///< Returns the With, Height and VideoAspect ratio of the currently
+         ///< Returns the Width, Height and VideoAspect ratio of the currently
          ///< displayed video material. Width and Height are given in pixel
          ///< (e.g. 720x576) and VideoAspect is e.g. 1.33333 for a 4:3 broadcast,
          ///< or 1.77778 for 16:9.
          ///< The default implementation returns 0 for Width and Height
          ///< and 1.0 for VideoAspect.
   virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
-         ///< Returns the With, Height and PixelAspect ratio the OSD should use
+         ///< Returns the Width, Height and PixelAspect ratio the OSD should use
          ///< to best fit the resolution of the output device. If PixelAspect
          ///< is not 1.0, the OSD may take this as a hint to scale its
          ///< graphics in a way that, e.g., a circle will actually
@@ -495,11 +498,11 @@ class cDevice : public cThread {
        ///< is more than one audio track.
   int NumSubtitleTracks(void) const;
        ///< Returns the number of subtitle tracks that are currently available.
-  eTrackType GetCurrentAudioTrack(void) { return currentAudioTrack; }
+  eTrackType GetCurrentAudioTrack(void) const { return currentAudioTrack; }
   bool SetCurrentAudioTrack(eTrackType Type);
        ///< Sets the current audio track to the given Type.
        ///< \return Returns true if Type is a valid audio track, false otherwise.
-  eTrackType GetCurrentSubtitleTrack(void) { return currentSubtitleTrack; }
+  eTrackType GetCurrentSubtitleTrack(void) const { return currentSubtitleTrack; }
   bool SetCurrentSubtitleTrack(eTrackType Type, bool Manual = false);
        ///< Sets the current subtitle track to the given Type.
        ///< IF Manual is true, no automatic preferred subtitle language selection
diff --git a/dvbdevice.c b/dvbdevice.c
index 39153970e..c2503ed03 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.56 2012/01/15 14:31:47 kls Exp $
+ * $Id: dvbdevice.c 2.62 2012/02/17 12:20:34 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -502,6 +502,8 @@ void cDvbTuner::SetChannel(const cChannel *Channel)
      tunerStatus = tsIdle;
      ResetToneAndVoltage();
      }
+  if (bondedTuner && device->IsPrimaryDevice())
+     cDevice::PrimaryDevice()->DelLivePids(); // 'device' is const, so we must do it this way
 }
 
 bool cDvbTuner::Locked(int TimeoutMs)
@@ -857,6 +859,7 @@ void cDvbTuner::Action(void)
         if (GetFrontendStatus(NewStatus))
            Status = NewStatus;
         cMutexLock MutexLock(&mutex);
+        int WaitTime = 1000;
         switch (tunerStatus) {
           case tsIdle:
                break;
@@ -877,6 +880,7 @@ void cDvbTuner::Action(void)
                      bondedMasterFailed = true; // give an other tuner a chance in case the sat cable was disconnected
                   continue;
                   }
+               WaitTime = 100; // allows for a quick change from tsTuned to tsLocked
           case tsLocked:
                if (Status & FE_REINIT) {
                   tunerStatus = tsSet;
@@ -905,9 +909,7 @@ void cDvbTuner::Action(void)
                break;
           default: esyslog("ERROR: unknown tuner status %d", tunerStatus);
           }
-
-        if (tunerStatus != tsTuned)
-           newSet.TimedWait(mutex, 1000);
+        newSet.TimedWait(mutex, WaitTime);
         }
 }
 
@@ -1006,6 +1008,7 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
   numModulations = 0;
   bondedDevice = NULL;
   needsDetachBondedReceivers = false;
+  tsBuffer = NULL;
 
   // Devices that are present on all card types:
 
@@ -1045,7 +1048,7 @@ cDvbDevice::~cDvbDevice()
 
 cString cDvbDevice::DvbName(const char *Name, int Adapter, int Frontend)
 {
-  return cString::sprintf("%s%d/%s%d", DEV_DVB_ADAPTER, Adapter, Name, Frontend);
+  return cString::sprintf("%s/%s%d/%s%d", DEV_DVB_BASE, DEV_DVB_ADAPTER, Adapter, Name, Frontend);
 }
 
 int cDvbDevice::DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError)
@@ -1093,28 +1096,47 @@ bool cDvbDevice::Initialize(void)
   new cDvbSourceParam('C', "DVB-C");
   new cDvbSourceParam('S', "DVB-S");
   new cDvbSourceParam('T', "DVB-T");
+  cStringList Nodes;
+  cReadDir DvbDir(DEV_DVB_BASE);
+  if (DvbDir.Ok()) {
+     struct dirent *a;
+     while ((a = DvbDir.Next()) != NULL) {
+           if (strstr(a->d_name, DEV_DVB_ADAPTER) == a->d_name) {
+              int Adapter = strtol(a->d_name + strlen(DEV_DVB_ADAPTER), NULL, 10);
+              cReadDir AdapterDir(AddDirectory(DEV_DVB_BASE, a->d_name));
+              if (AdapterDir.Ok()) {
+                 struct dirent *f;
+                 while ((f = AdapterDir.Next()) != NULL) {
+                       if (strstr(f->d_name, DEV_DVB_FRONTEND) == f->d_name) {
+                          int Frontend = strtol(f->d_name + strlen(DEV_DVB_FRONTEND), NULL, 10);
+                          Nodes.Append(strdup(cString::sprintf("%2d %2d", Adapter, Frontend)));
+                          }
+                       }
+                 }
+              }
+           }
+     }
   int Checked = 0;
   int Found = 0;
-  for (int Adapter = 0; ; Adapter++) {
-      for (int Frontend = 0; ; Frontend++) {
-          if (Exists(Adapter, Frontend)) {
-             if (Checked++ < MAXDVBDEVICES) {
-                if (UseDevice(NextCardIndex())) {
-                   if (Probe(Adapter, Frontend))
-                      Found++;
-                   }
-                else
-                   NextCardIndex(1); // skips this one
-                }
-             }
-          else if (Frontend == 0)
-             goto LastAdapter;
-          else
-             goto NextAdapter;
-          }
-      NextAdapter: ;
-      }
-LastAdapter:
+  if (Nodes.Size() > 0) {
+     Nodes.Sort();
+     for (int i = 0; i < Nodes.Size(); i++) {
+         int Adapter;
+         int Frontend;
+         if (2 == sscanf(Nodes[i], "%d %d", &Adapter, &Frontend)) {
+            if (Exists(Adapter, Frontend)) {
+               if (Checked++ < MAXDVBDEVICES) {
+                  if (UseDevice(NextCardIndex())) {
+                     if (Probe(Adapter, Frontend))
+                        Found++;
+                     }
+                  else
+                     NextCardIndex(1); // skips this one
+                  }
+               }
+            }
+         }
+     }
   NextCardIndex(MAXDVBDEVICES - Checked); // skips the rest
   if (Found > 0)
      isyslog("found %d DVB device%s", Found, Found > 1 ? "s" : "");
@@ -1130,7 +1152,7 @@ bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
      LOG_ERROR;
      return false;
      }
-#if DVB_API_VERSION > 5 || DVB_API_VERSION_MINOR >= 5
+#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) >= 0x0505
   dtv_property Frontend[1];
   memset(&Frontend, 0, sizeof(Frontend));
   dtv_properties CmdSeq;
@@ -1440,7 +1462,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                  result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
               }
            else
-              needsDetachReceivers = true;
+              needsDetachReceivers = Receiving(true);
            }
         if (result) {
            if (!BondingOk(Channel)) {
@@ -1452,7 +1474,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                      }
                   }
               needsDetachBondedReceivers = true;
-              needsDetachReceivers = true;
+              needsDetachReceivers = Receiving(true);
               }
            }
         }
diff --git a/dvbdevice.h b/dvbdevice.h
index 96dfa4218..e072bb3f6 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.21 2012/01/13 11:32:45 kls Exp $
+ * $Id: dvbdevice.h 2.23 2012/02/17 11:18:55 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -14,7 +14,7 @@
 #include <linux/dvb/version.h>
 #include "device.h"
 
-#if DVB_API_VERSION < 5 || (DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR < 3)
+#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0503
 #error VDR requires Linux DVB driver API version 5.3 or higher!
 #endif
 
@@ -22,7 +22,8 @@
 #define MAXDELIVERYSYSTEMS 8
 
 #define DEV_VIDEO         "/dev/video"
-#define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
+#define DEV_DVB_BASE      "/dev/dvb"
+#define DEV_DVB_ADAPTER   "adapter"
 #define DEV_DVB_OSD       "osd"
 #define DEV_DVB_FRONTEND  "frontend"
 #define DEV_DVB_DVR       "dvr"
diff --git a/dvbplayer.c b/dvbplayer.c
index 017df6d4d..b0adac407 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.21 2010/03/07 14:24:26 kls Exp $
+ * $Id: dvbplayer.c 2.23 2012/02/19 10:48:02 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -87,6 +87,7 @@ class cNonBlockingFileReader : public cThread {
 private:
   cUnbufferedFile *f;
   uchar *buffer;
+  uchar *result;
   int wanted;
   int length;
   cCondWait newSet;
@@ -100,7 +101,7 @@ class cNonBlockingFileReader : public cThread {
   void Clear(void);
   void Request(cUnbufferedFile *File, int Length);
   int Result(uchar **Buffer);
-  bool Reading(void) { return buffer; }
+  bool Reading(void) { return result; }
   bool WaitForDataMs(int msToWait);
   };
 
@@ -109,6 +110,7 @@ cNonBlockingFileReader::cNonBlockingFileReader(void)
 {
   f = NULL;
   buffer = NULL;
+  result = NULL;
   wanted = length = 0;
   Start();
 }
@@ -118,6 +120,7 @@ cNonBlockingFileReader::~cNonBlockingFileReader()
   newSet.Signal();
   Cancel(3);
   free(buffer);
+  free(result);
 }
 
 void cNonBlockingFileReader::Clear(void)
@@ -126,6 +129,8 @@ void cNonBlockingFileReader::Clear(void)
   f = NULL;
   free(buffer);
   buffer = NULL;
+  free(result);
+  result = NULL;
   wanted = length = 0;
   Unlock();
 }
@@ -137,18 +142,18 @@ void cNonBlockingFileReader::Request(cUnbufferedFile *File, int Length)
   wanted = Length;
   buffer = MALLOC(uchar, wanted);
   f = File;
-  Unlock();
   newSet.Signal();
+  Unlock();
 }
 
 int cNonBlockingFileReader::Result(uchar **Buffer)
 {
   LOCK_THREAD;
-  if (buffer && length == wanted) {
-     *Buffer = buffer;
-     buffer = NULL;
+  if (result && length == wanted) {
+     *Buffer = result;
+     result = NULL;
      return wanted;
-     }
+  }
   errno = EAGAIN;
   return -1;
 }
@@ -172,6 +177,8 @@ void cNonBlockingFileReader::Action(void)
               length = wanted = r; // this will forward the error status to the caller
               }
            if (length == wanted) {
+              result = buffer;
+              buffer = NULL;
               cMutexLock NewDataLock(&newDataMutex);
               newDataCond.Broadcast();
               }
@@ -183,9 +190,9 @@ void cNonBlockingFileReader::Action(void)
 
 bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
 {
-  cMutexLock NewDataLock(&newDataMutex);
-  if (buffer && length == wanted)
+  if (result && length == wanted)
      return true;
+  cMutexLock NewDataLock(&newDataMutex);
   return newDataCond.TimedWait(newDataMutex, msToWait);
 }
 
@@ -209,6 +216,7 @@ class cDvbPlayer : public cPlayer, cThread {
   cUnbufferedFile *replayFile;
   double framesPerSecond;
   bool isPesRecording;
+  bool pauseLive;
   bool eof;
   bool firstPacket;
   ePlayModes playMode;
@@ -228,7 +236,7 @@ class cDvbPlayer : public cPlayer, cThread {
   virtual void Activate(bool On);
   virtual void Action(void);
 public:
-  cDvbPlayer(const char *FileName);
+  cDvbPlayer(const char *FileName, bool PauseLive);
   virtual ~cDvbPlayer();
   bool Active(void) { return cThread::Running(); }
   void Pause(void);
@@ -249,7 +257,7 @@ class cDvbPlayer : public cPlayer, cThread {
 #define SPEED_MULT   12 // the speed multiplier
 int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
 
-cDvbPlayer::cDvbPlayer(const char *FileName)
+cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive)
 :cThread("dvbplayer")
 {
   nonBlockingFileReader = NULL;
@@ -258,6 +266,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
   cRecording Recording(FileName);
   framesPerSecond = Recording.FramesPerSecond();
   isPesRecording = Recording.IsPesRecording();
+  pauseLive = PauseLive;
   eof = false;
   firstPacket = true;
   playMode = pmPlay;
@@ -275,7 +284,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName)
      return;
   ringBuffer = new cRingBufferFrame(PLAYERBUFSIZE);
   // Create the index file:
-  index = new cIndexFile(FileName, false, isPesRecording);
+  index = new cIndexFile(FileName, false, isPesRecording, pauseLive);
   if (!index)
      esyslog("ERROR: can't allocate index");
   else if (!index->Ok()) {
@@ -400,15 +409,17 @@ void cDvbPlayer::Action(void)
   int LastReadIFrame = -1;
   int SwitchToPlayFrame = 0;
 
+  if (pauseLive)
+     Goto(0, true);
   while (Running()) {
         if (WaitingForData)
-           nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
+           nonBlockingFileReader->WaitForDataMs(10); // this keeps the CPU load low, but reacts immediately on new data
         else if (Sleep) {
            cPoller Poller;
            DevicePoll(Poller, 10);
            Sleep = false;
-           if (playMode == pmStill || playMode==pmPause)
-              cCondWait::SleepMs(3);
+           if (playMode == pmStill || playMode == pmPause)
+              cCondWait::SleepMs(10);
            }
         {
           LOCK_THREAD;
@@ -470,7 +481,15 @@ void cDvbPlayer::Action(void)
                    }
                 if (!eof) {
                    uchar *b = NULL;
-                   int r = nonBlockingFileReader->Result(&b);
+                   int Retries = 5;
+                   int r;
+                   while (true) {
+                         r = nonBlockingFileReader->Result(&b);
+                         if (r == -1 && errno == EAGAIN && --Retries)
+                            nonBlockingFileReader->WaitForDataMs(10); 
+                         else 
+                            break;
+                         }
                    if (r > 0) {
                       WaitingForData = false;
                       uint32_t Pts = 0;
@@ -821,8 +840,8 @@ bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
 
 // --- cDvbPlayerControl -----------------------------------------------------
 
-cDvbPlayerControl::cDvbPlayerControl(const char *FileName)
-:cControl(player = new cDvbPlayer(FileName))
+cDvbPlayerControl::cDvbPlayerControl(const char *FileName, bool PauseLive)
+:cControl(player = new cDvbPlayer(FileName, PauseLive))
 {
 }
 
diff --git a/dvbplayer.h b/dvbplayer.h
index 2fb3b7883..e2f2082dd 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 2.0 2002/06/23 10:13:51 kls Exp $
+ * $Id: dvbplayer.h 2.1 2012/02/19 11:40:36 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
@@ -19,8 +19,11 @@ class cDvbPlayerControl : public cControl {
 private:
   cDvbPlayer *player;
 public:
-  cDvbPlayerControl(const char *FileName);
+  cDvbPlayerControl(const char *FileName, bool PauseLive = false);
        // Sets up a player for the given file.
+       // If PauseLive is true, special care is taken to make sure the index
+       // file of the recording is long enough to allow the player to display
+       // the first frame in still picture mode.
   virtual ~cDvbPlayerControl();
   bool Active(void);
   void Stop(void);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index c29277dd6..aa17a7afe 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.21 2012/01/11 10:34:07 kls Exp $
+ * $Id: dvbsubtitle.c 2.22 2012/02/13 09:48:18 kls Exp $
  */
 
 
@@ -620,7 +620,7 @@ void cDvbSubtitlePage::SetState(int State)
     case 0: // normal case - page update
          dbgpages("page update\n");
          break;
-    case 1: // aquisition point - page refresh
+    case 1: // acquisition point - page refresh
          dbgpages("page refresh\n");
          regions.Clear();
          break;
@@ -1049,7 +1049,6 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             page->SetVersion(pageVersion);
             page->SetTimeout(pageTimeout);
             page->SetState(bs.GetBits(2));
-            page->regions.Clear();
             bs.SkipBits(2); // reserved
             dbgpages("Update page id %d version %d pts %"PRId64" timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
             while (!bs.IsEOF()) {
diff --git a/epg.c b/epg.c
index dccef326f..2ff105285 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.9 2012/01/12 14:31:46 kls Exp $
+ * $Id: epg.c 2.11 2012/02/13 14:58:19 kls Exp $
  */
 
 #include "epg.h"
@@ -424,7 +424,7 @@ cString cEvent::GetVpsString(void) const
 {
   char buf[25];
   struct tm tm_r;
-  strftime(buf, sizeof(buf), "%d.%m %R", localtime_r(&vps, &tm_r));
+  strftime(buf, sizeof(buf), "%d.%m. %R", localtime_r(&vps, &tm_r));
   return buf;
 }
 
@@ -587,7 +587,7 @@ void ReportEpgBugFixStats(bool Reset)
      bool GotHits = false;
      char buffer[1024];
      for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) {
-         const char *delim = "\t";
+         const char *delim = " ";
          tEpgBugFixStats *p = &EpgBugFixStats[i];
          if (p->hits) {
             bool PrintedStats = false;
@@ -604,11 +604,11 @@ void ReportEpgBugFixStats(bool Reset)
                       dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEvent::FixEpgBugs()");
                       dsyslog("IN VDR/epg.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!");
                       dsyslog("=====================");
-                      dsyslog("Fix\tHits\tChannels");
+                      dsyslog("Fix Hits Channels");
                       GotHits = true;
                       }
                    if (!PrintedStats) {
-                      q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
+                      q += snprintf(q, sizeof(buffer) - (q - buffer), "%-3d %-4d", i, p->hits);
                       PrintedStats = true;
                       }
                    q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
@@ -1029,15 +1029,10 @@ void cSchedule::Cleanup(void)
 
 void cSchedule::Cleanup(time_t Time)
 {
-  cEvent *Event = events.First();
-  while (Event) {
-        if (Event->HasTimer())
-           Event = (cEvent *)Event->Next();
-        else if (Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety
-           cEvent *e = Event;
-           Event = (cEvent *)Event->Next();
-           DelEvent(e);
-           }
+  cEvent *Event;
+  while ((Event = events.First()) != NULL) {
+        if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) // adding one hour for safety
+           DelEvent(Event);
         else
            break;
         }
@@ -1289,3 +1284,15 @@ const cSchedule *cSchedules::GetSchedule(const cChannel *Channel, bool AddIfMiss
      }
   return Channel->schedule != &DummySchedule? Channel->schedule : NULL;
 }
+
+// --- cEpgDataReader --------------------------------------------------------
+
+cEpgDataReader::cEpgDataReader(void)
+:cThread("epg data reader")
+{
+}
+
+void cEpgDataReader::Action(void)
+{
+  cSchedules::Read();
+}
diff --git a/epg.h b/epg.h
index e5f4bdaec..9d6b605be 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.5 2011/02/25 14:14:38 kls Exp $
+ * $Id: epg.h 2.6 2012/02/11 12:29:55 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -213,6 +213,12 @@ class cSchedules : public cList<cSchedule> {
   const cSchedule *GetSchedule(const cChannel *Channel, bool AddIfMissing = false) const;
   };
 
+class cEpgDataReader : public cThread {
+public:
+  cEpgDataReader(void);
+  virtual void Action(void);
+  };
+
 void ReportEpgBugFixStats(bool Reset = false);
 
 #endif //__EPG_H
diff --git a/libsi/Makefile b/libsi/Makefile
index b24eb31db..9d2d40ddd 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,15 +1,15 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 2.2 2011/12/04 14:18:38 kls Exp $
+# $Id: Makefile 2.3 2012/01/18 12:31:40 kls Exp $
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
 CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
-AR = ar
-ARFLAGS = ru
-RANLIB = ranlib
+AR       ?= ar
+ARFLAGS  ?= ru
+RANLIB   ?= ranlib
 
 include ../Make.global
 -include ../Make.config
diff --git a/menu.c b/menu.c
index eb07c81a3..61dcdfcb5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.35 2012/01/14 13:06:03 kls Exp $
+ * $Id: menu.c 2.37 2012/02/19 11:37:55 kls Exp $
  */
 
 #include "menu.h"
@@ -2383,9 +2383,19 @@ eOSState cMenuRecordings::Delete(void)
            }
         cRecording *recording = GetRecording(ri);
         if (recording) {
+           if (cCutter::Active(ri->FileName())) {
+              if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
+                 cCutter::Stop();
+                 recording = Recordings.GetByName(ri->FileName()); // cCutter::Stop() might have deleted it if it was the edited version
+                 // we continue with the code below even if recording is NULL,
+                 // in order to have the menu updated etc.
+                 }
+              else
+                 return osContinue;
+              }
            if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), ri->FileName()) == 0)
               cControl::Shutdown();
-           if (recording->Delete()) {
+           if (!recording || recording->Delete()) {
               cReplayControl::ClearLastReplayed(ri->FileName());
               Recordings.DelByName(ri->FileName());
               cOsdMenu::Del(Current());
@@ -4319,13 +4329,10 @@ bool cRecordControls::PauseLiveVideo(void)
   Skins.Message(mtStatus, tr("Pausing live video..."));
   cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
   if (Start(NULL, true)) {
-     cCondWait::SleepMs(2000); // allow recorded file to fill up enough to start replaying
-     cReplayControl *rc = new cReplayControl;
+     cReplayControl *rc = new cReplayControl(true);
      cControl::Launch(rc);
      cControl::Attach();
-     cCondWait::SleepMs(1000); // allow device to replay some frames, so we have a picture
      Skins.Message(mtStatus, NULL);
-     rc->ProcessKey(kPause); // pause, allowing replay mode display
      return true;
      }
   Skins.Message(mtStatus, NULL);
@@ -4415,8 +4422,8 @@ cReplayControl *cReplayControl::currentReplayControl = NULL;
 char *cReplayControl::fileName = NULL;
 char *cReplayControl::title = NULL;
 
-cReplayControl::cReplayControl(void)
-:cDvbPlayerControl(fileName)
+cReplayControl::cReplayControl(bool PauseLive)
+:cDvbPlayerControl(fileName, PauseLive)
 {
   currentReplayControl = this;
   displayReplay = NULL;
diff --git a/menu.h b/menu.h
index ec1c175b4..c74d8c253 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.3 2010/03/06 16:15:59 kls Exp $
+ * $Id: menu.h 2.4 2012/02/19 10:51:56 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -276,7 +276,7 @@ class cReplayControl : public cDvbPlayerControl {
   void EditCut(void);
   void EditTest(void);
 public:
-  cReplayControl(void);
+  cReplayControl(bool PauseLive = false);
   virtual ~cReplayControl();
   void Stop(void);
   virtual cOsdObject *GetInfo(void);
diff --git a/newplugin b/newplugin
index 19c7d7fd9..53cbb73e9 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.6 2011/02/27 10:06:06 kls Exp $
+# $Id: newplugin 2.7 2012/01/18 12:32:31 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -81,9 +81,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 ### Make sure that necessary options are included:
 
diff --git a/po/ar.po b/po/ar.po
index c656ab8c6..f8a10163d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -756,6 +756,9 @@ msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
 msgid "Delete recording?"
 msgstr "حذف التسجيل"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "حدث خطاء عند محاولة حذف التسجيل"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c31d5195c..58e570ee9 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -747,6 +747,9 @@ msgstr "Error a l'accedir a la gravaci
 msgid "Delete recording?"
 msgstr "Esborrar gravaci�?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Error a l'esborrar la gravaci�!"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index f55f06174..cdf725ae8 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -746,6 +746,9 @@ msgstr "Chyba při přístupu k nahrávkám!"
 msgid "Delete recording?"
 msgstr "Smazat nahrávku?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Chyba při mazání nahrávky!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index f94bab2af..7fa4cd967 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Fejl ved l
 msgid "Delete recording?"
 msgstr "Slet optagelse?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Fejl ved sletning af optagelse!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 0436cc726..4c369947e 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Fehler beim Ansprechen der Aufzeichnung!"
 msgid "Delete recording?"
 msgstr "Aufzeichnung l�schen?"
 
+msgid "Recording is being edited - really delete?"
+msgstr "Aufzeichnung wird geschnitten - trotzdem l�schen?"
+
 msgid "Error while deleting recording!"
 msgstr "Fehler beim L�schen der Aufzeichnung!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 36923f06e..a4fd80c57 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "
 msgid "Delete recording?"
 msgstr "�������� ��������?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "����� ���� ��� �������� ��� �������!"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index ef943984d..3e4cad019 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -745,6 +745,9 @@ msgstr "
 msgid "Delete recording?"
 msgstr "�Eliminar grabacion?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "�Error al borrar la grabaci�n!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 70129fe02..6d9c088f1 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Salvestuse taasesitus nurjus!"
 msgid "Delete recording?"
 msgstr "Kustutada salvestus?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Salvestuse kustutamine nurjus!"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index e4336027b..740f48fbb 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -747,6 +747,9 @@ msgstr "Tallenteen toistaminen epäonnistui!"
 msgid "Delete recording?"
 msgstr "Poistetaanko tallenne?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Tallenteen poistaminen epäonnistui!"
 
@@ -1084,7 +1087,7 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Näytä toiston tila"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Näytä jäljellä oleva aika"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 477dffe88..32e23f5d6 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -750,6 +750,9 @@ msgstr "Impossible d'acc
 msgid "Delete recording?"
 msgstr "Supprimer l'enregistrement ?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Erreur de suppression de l'enregistrement !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 0bf055e73..f2c2795b8 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -746,6 +746,9 @@ msgstr "Gre
 msgid "Delete recording?"
 msgstr "Obrisati snimku?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Gre�ka pri brisanju snimke!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 0c56f85e6..a457e2668 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -747,6 +747,9 @@ msgstr "Hiba a felv
 msgid "Delete recording?"
 msgstr "Felv�tel t�rl�se?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Hiba a felv�tel t�rl�s�n�l!"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 3f2f5f9de..e7f9f9255 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
-"PO-Revision-Date: 2010-06-13 00:30+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"PO-Revision-Date: 2012-01-15 19:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -81,7 +81,7 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -751,6 +751,9 @@ msgstr "Errore accesso alla registrazione!"
 msgid "Delete recording?"
 msgstr "Eliminare la registrazione?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Errore eliminazione registrazione!"
 
@@ -974,10 +977,10 @@ msgstr "Freq HI LNB (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Periferica %d connessa al cavo sat"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "propria"
 
 msgid "CAM reset"
 msgstr "Reimposta la CAM"
@@ -1088,7 +1091,7 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Mostra modalità riproduzione"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Mostra tempo rimanente"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index eaa98d990..ab7b4063f 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Klaida atidarant įrašą!"
 msgid "Delete recording?"
 msgstr "Ištrinti įrašą?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Klaida trinant įrašą!"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index eef92c2e6..5fbd7b621 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -745,6 +745,9 @@ msgstr "Грешка при пристап до снимката!"
 msgid "Delete recording?"
 msgstr "Избриши снимка?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Грешка при бришење на снимката!"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 8b0da153e..5b9f400a1 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -748,6 +748,9 @@ msgstr "Fout bij lezen opname!"
 msgid "Delete recording?"
 msgstr "Opname verwijderen?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Fout bij verwijderen opname!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index fdb798195..1e5bc9c8c 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -745,6 +745,9 @@ msgstr "Feil under lesing av opptak!"
 msgid "Delete recording?"
 msgstr "Slette opptak?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Feil under sletting av opptak!"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 5f02ee8d2..6b3195ed7 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -745,6 +745,9 @@ msgstr "Bl
 msgid "Delete recording?"
 msgstr "Usun�� nagranie?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Bl�d podczas usuwania nagrania!"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e56845977..f17ab906a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -745,6 +745,9 @@ msgstr "Erro a aceder 
 msgid "Delete recording?"
 msgstr "Eliminar grava��o?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Erro a eliminar grava��o!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 285622f14..7e0046a8b 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -747,6 +747,9 @@ msgstr "Eroare la accesarea 
 msgid "Delete recording?"
 msgstr "�terg �nregistrarea?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Eroare la �tergerea �nregistr�rii!"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c14d7f057..2ead79633 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -745,6 +745,9 @@ msgstr "
 msgid "Delete recording?"
 msgstr "������� ������?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "������ �������� ������!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 3f0ea60fa..e6140e4d8 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Chyba pri pr
 msgid "Delete recording?"
 msgstr "Zmaza� nahr�vku?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Pri vymaz�van� nahr�vky pri�lo k chybe!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 75d32c70e..e0b7e0246 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -745,6 +745,9 @@ msgstr "Napaka pri dostopu do posnetka!"
 msgid "Delete recording?"
 msgstr "Izbri�i posnetek?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Napaka pri brisanju posnetka!"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 743b1c63d..9b58e1e7e 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -753,6 +753,9 @@ msgstr "Gre
 msgid "Delete recording?"
 msgstr "Obri�i snimku?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Gre�ka prilikom brisanja snimke!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 57151a1c4..e79633ea0 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -747,6 +747,9 @@ msgstr "Inspelningen g
 msgid "Delete recording?"
 msgstr "Ta bort inspelningen?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Inspelningen g�r inte att ta bort!"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 78bde2cd4..3a86e7912 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Kay
 msgid "Delete recording?"
 msgstr "Kay�t� sil?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Kay�t silme hatas�!"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 73b1c4ad3..6eebe92c9 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -744,6 +744,9 @@ msgstr "Помилка доступу до запису!"
 msgid "Delete recording?"
 msgstr "Витерти запис?"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "Помилка видалення запису!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 81b381b1e..05c933724 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-01-14 14:06+0100\n"
+"POT-Creation-Date: 2012-02-16 13:18+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -747,6 +747,9 @@ msgstr "存取录像错误！"
 msgid "Delete recording?"
 msgstr "是否删除录像？"
 
+msgid "Recording is being edited - really delete?"
+msgstr ""
+
 msgid "Error while deleting recording!"
 msgstr "删除录像错误！"
 
diff --git a/recording.c b/recording.c
index cf35bb7a0..7617d7345 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.43 2012/01/15 11:04:24 kls Exp $
+ * $Id: recording.c 2.50 2012/02/19 10:44:45 kls Exp $
  */
 
 #include "recording.h"
@@ -875,11 +875,11 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
         s = name;
      cString Length("");
      if (NewIndicator) {
-        int Seconds = max(0, LengthInSeconds());
+        int Minutes = max(0, (LengthInSeconds() + 30) / 60);
         Length = cString::sprintf("%c%d:%02d",
                    Delimiter,
-                   Seconds / 3600,
-                   Seconds / 60 % 60
+                   Minutes / 60,
+                   Minutes % 60
                    );
         }
      titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%c%c%s",
@@ -1059,7 +1059,7 @@ int cRecording::LengthInSeconds(void) const
 {
   int nf = NumFrames();
   if (nf >= 0)
-     return int((nf / FramesPerSecond() + 30) / 60) * 60;
+     return int(nf / FramesPerSecond());
   return -1;
 }
 
@@ -1109,43 +1109,38 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
   cReadDir d(DirName);
   struct dirent *e;
   while ((Foreground || Running()) && (e = d.Next()) != NULL) {
-        if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-           cString buffer = AddDirectory(DirName, e->d_name);
-           struct stat st;
-           if (lstat(buffer, &st) == 0) {
-              int Link = 0;
-              if (S_ISLNK(st.st_mode)) {
-                 if (LinkLevel > MAX_LINK_LEVEL) {
-                    isyslog("max link level exceeded - not scanning %s", *buffer);
-                    continue;
-                    }
-                 Link = 1;
-                 buffer = ReadLink(buffer);
-                 if (!*buffer)
-                    continue;
-                 if (stat(buffer, &st) != 0)
-                    continue;
+        cString buffer = AddDirectory(DirName, e->d_name);
+        struct stat st;
+        if (lstat(buffer, &st) == 0) {
+           int Link = 0;
+           if (S_ISLNK(st.st_mode)) {
+              if (LinkLevel > MAX_LINK_LEVEL) {
+                 isyslog("max link level exceeded - not scanning %s", *buffer);
+                 continue;
                  }
-              if (S_ISDIR(st.st_mode)) {
-                 if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
-                    cRecording *r = new cRecording(buffer);
-                    if (r->Name()) {
-                       r->NumFrames(); // initializes the numFrames member
-                       Lock();
-                       Add(r);
-                       ChangeState();
-                       Unlock();
-                       if (deleted) {
-                          r->fileSizeMB = DirSizeMB(buffer);
-                          r->deleted = time(NULL);
-                          }
+              Link = 1;
+              if (stat(buffer, &st) != 0)
+                 continue;
+              }
+           if (S_ISDIR(st.st_mode)) {
+              if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
+                 cRecording *r = new cRecording(buffer);
+                 if (r->Name()) {
+                    r->NumFrames(); // initializes the numFrames member
+                    Lock();
+                    Add(r);
+                    ChangeState();
+                    Unlock();
+                    if (deleted) {
+                       r->fileSizeMB = DirSizeMB(buffer);
+                       r->deleted = time(NULL);
                        }
-                    else
-                       delete r;
                     }
                  else
-                    ScanVideoDir(buffer, Foreground, LinkLevel + Link);
+                    delete r;
                  }
+              else
+                 ScanVideoDir(buffer, Foreground, LinkLevel + Link);
               }
            }
         }
@@ -1220,12 +1215,14 @@ void cRecordings::DelByName(const char *FileName)
      char *ext = strrchr(recording->fileName, '.');
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
-        recording->fileSizeMB = DirSizeMB(recording->FileName());
-        recording->deleted = time(NULL);
-        DeletedRecordings.Add(recording);
+        if (access(recording->FileName(), F_OK) == 0) {
+           recording->fileSizeMB = DirSizeMB(recording->FileName());
+           recording->deleted = time(NULL);
+           DeletedRecordings.Add(recording);
+           recording = NULL; // to prevent it from being deleted below
+           }
         }
-     else
-        delete recording;
+     delete recording;
      ChangeState();
      TouchUpdate();
      }
@@ -1558,8 +1555,9 @@ struct tIndexTs {
 
 #define MAXWAITFORINDEXFILE     10 // max. time to wait for the regenerated index file (seconds)
 #define INDEXFILECHECKINTERVAL 500 // ms between checks for existence of the regenerated index file
+#define INDEXFILETESTINTERVAL   10 // ms between tests for the size of the index file in case of pausing live video
 
-cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
+cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, bool PauseLive)
 :resumeFile(FileName, IsPesRecording)
 {
   f = -1;
@@ -1570,6 +1568,12 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording)
   indexFileGenerator = NULL;
   if (FileName) {
      fileName = IndexFileName(FileName, isPesRecording);
+     if (!Record && PauseLive) {
+        // Wait until the index file contains at least two frames:
+        time_t tmax = time(NULL) + MAXWAITFORINDEXFILE;
+        while (time(NULL) < tmax && FileSize(fileName) < 2 * sizeof(tIndexTs))
+              cCondWait::SleepMs(INDEXFILETESTINTERVAL);
+        }
      int delta = 0;
      if (!Record && access(fileName, R_OK) != 0) {
         // Index file doesn't exist, so try to regenerate it:
diff --git a/recording.h b/recording.h
index d3dbd1da8..61ec2a64f 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.26 2011/12/04 13:38:17 kls Exp $
+ * $Id: recording.h 2.27 2012/02/19 10:44:53 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -279,7 +279,7 @@ class cIndexFile {
   void ConvertToPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
 public:
-  cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false);
+  cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false, bool PauseLive = false);
   ~cIndexFile();
   bool Ok(void) { return index != NULL; }
   bool Write(bool Independent, uint16_t FileNumber, off_t FileOffset);
diff --git a/remote.c b/remote.c
index 88773a5b0..0b2d66de0 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.4 2011/08/15 13:41:40 kls Exp $
+ * $Id: remote.c 2.5 2012/01/16 16:57:00 kls Exp $
  */
 
 #include "remote.h"
@@ -317,38 +317,38 @@ uint64_t cKbdRemote::ReadKeySequence(void)
   if ((key1 = ReadKey()) >= 0) {
      k = key1;
      if (key1 == 0x1B) {
-         // Start of escape sequence
-         if ((key1 = ReadKey()) >= 0) {
-            k <<= 8;
-            k |= key1 & 0xFF;
-            switch (key1) {
-              case 0x4F: // 3-byte sequence
-                   if ((key1 = ReadKey()) >= 0) {
-                      k <<= 8;
-                      k |= key1 & 0xFF;
-                      }
-                   break;
-              case 0x5B: // 3- or more-byte sequence
-                   if ((key1 = ReadKey()) >= 0) {
-                      k <<= 8;
-                      k |= key1 & 0xFF;
-                      switch (key1) {
-                        case 0x31 ... 0x3F: // more-byte sequence
-                        case 0x5B: // strange, may apparently occur
-                             do {
-                                if ((key1 = ReadKey()) < 0)
-                                   break; // Sequence ends here
-                                k <<= 8;
-                                k |= key1 & 0xFF;
-                                } while (key1 != 0x7E);
-                             break;
-                        default: ;
-                        }
-                      }
-                   break;
-              default: ;
-              }
-            }
+        // Start of escape sequence
+        if ((key1 = ReadKey()) >= 0) {
+           k <<= 8;
+           k |= key1 & 0xFF;
+           switch (key1) {
+             case 0x4F: // 3-byte sequence
+                  if ((key1 = ReadKey()) >= 0) {
+                     k <<= 8;
+                     k |= key1 & 0xFF;
+                     }
+                  break;
+             case 0x5B: // 3- or more-byte sequence
+                  if ((key1 = ReadKey()) >= 0) {
+                     k <<= 8;
+                     k |= key1 & 0xFF;
+                     switch (key1) {
+                       case 0x31 ... 0x3F: // more-byte sequence
+                       case 0x5B: // strange, may apparently occur
+                            do {
+                               if ((key1 = ReadKey()) < 0)
+                                  break; // Sequence ends here
+                               k <<= 8;
+                               k |= key1 & 0xFF;
+                               } while (key1 != 0x7E);
+                            break;
+                       default: ;
+                       }
+                     }
+                  break;
+             default: ;
+             }
+           }
         }
      }
   return k;
diff --git a/svdrp.c b/svdrp.c
index a659cd496..613a019f0 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.13 2012/01/12 15:02:46 kls Exp $
+ * $Id: svdrp.c 2.15 2012/02/16 12:38:19 kls Exp $
  */
 
 #include "svdrp.h"
@@ -256,8 +256,6 @@ const char *HelpPages[] = {
   "    used to easily activate or deactivate a timer.",
   "MOVC <number> <to>\n"
   "    Move a channel to a new position.",
-  "MOVT <number> <to>\n"
-  "    Move a timer to a new position.",
   "NEWC <settings>\n"
   "    Create a new channel. Settings must be in the same format as returned\n"
   "    by the LSTC command.",
@@ -664,12 +662,16 @@ void cSVDRP::CmdDELR(const char *Option)
         if (recording) {
            cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
            if (!rc) {
-              if (recording->Delete()) {
-                 Reply(250, "Recording \"%s\" deleted", Option);
-                 ::Recordings.DelByName(recording->FileName());
+              if (!cCutter::Active(recording->FileName())) {
+                 if (recording->Delete()) {
+                    Reply(250, "Recording \"%s\" deleted", Option);
+                    ::Recordings.DelByName(recording->FileName());
+                    }
+                 else
+                    Reply(554, "Error while deleting recording!");
                  }
               else
-                 Reply(554, "Error while deleting recording!");
+                 Reply(550, "Recording \"%s\" is being edited", Option);
               }
            else
               Reply(550, "Recording \"%s\" is in use by timer %d", Option, rc->Timer()->Index() + 1);
@@ -1283,12 +1285,6 @@ void cSVDRP::CmdMOVC(const char *Option)
      Reply(501, "Missing channel number");
 }
 
-void cSVDRP::CmdMOVT(const char *Option)
-{
-  //TODO combine this with menu action
-  Reply(502, "MOVT not yet implemented");
-}
-
 void cSVDRP::CmdNEWC(const char *Option)
 {
   if (*Option) {
@@ -1632,7 +1628,6 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("MODC"))  CmdMODC(s);
   else if (CMD("MODT"))  CmdMODT(s);
   else if (CMD("MOVC"))  CmdMOVC(s);
-  else if (CMD("MOVT"))  CmdMOVT(s);
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
diff --git a/svdrp.h b/svdrp.h
index a4cdee683..8ba096c8b 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 2.1 2011/12/04 13:51:44 kls Exp $
+ * $Id: svdrp.h 2.2 2012/02/16 12:37:53 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -71,7 +71,6 @@ class cSVDRP {
   void CmdMODC(const char *Option);
   void CmdMODT(const char *Option);
   void CmdMOVC(const char *Option);
-  void CmdMOVT(const char *Option);
   void CmdNEWC(const char *Option);
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
diff --git a/themes.c b/themes.c
index 034ec0b9b..88c7005e5 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 2.1 2011/02/25 14:45:18 kls Exp $
+ * $Id: themes.c 2.2 2012/02/17 13:57:32 kls Exp $
  */
 
 #include "themes.h"
@@ -243,37 +243,35 @@ bool cThemes::Load(const char *SkinName)
      cReadDir d(themesDirectory);
      struct dirent *e;
      while ((e = d.Next()) != NULL) {
-           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-              if (strstr(e->d_name, SkinName) == e->d_name && e->d_name[strlen(SkinName)] == '-') {
-                 cString FileName = AddDirectory(themesDirectory, e->d_name);
-                 cTheme Theme;
-                 if (Theme.Load(*FileName, true)) {
-                    if (char **NewBuffer = (char **)realloc(names, (numThemes + 1) * sizeof(char *))) {
-                       names = NewBuffer;
-                       names[numThemes] = strdup(Theme.Name());
-                       }
-                    else {
-                       esyslog("ERROR: out of memory");
-                       break;
-                       }
-                    if (char **NewBuffer = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *))) {
-                       fileNames = NewBuffer;
-                       fileNames[numThemes] = strdup(*FileName);
-                       }
-                    else {
-                       esyslog("ERROR: out of memory");
-                       break;
-                       }
-                    if (char **NewBuffer = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *))) {
-                       descriptions = NewBuffer;
-                       descriptions[numThemes] = strdup(Theme.Description());
-                       }
-                    else {
-                       esyslog("ERROR: out of memory");
-                       break;
-                       }
-                    numThemes++;
+           if (strstr(e->d_name, SkinName) == e->d_name && e->d_name[strlen(SkinName)] == '-') {
+              cString FileName = AddDirectory(themesDirectory, e->d_name);
+              cTheme Theme;
+              if (Theme.Load(*FileName, true)) {
+                 if (char **NewBuffer = (char **)realloc(names, (numThemes + 1) * sizeof(char *))) {
+                    names = NewBuffer;
+                    names[numThemes] = strdup(Theme.Name());
+                    }
+                 else {
+                    esyslog("ERROR: out of memory");
+                    break;
+                    }
+                 if (char **NewBuffer = (char **)realloc(fileNames, (numThemes + 1) * sizeof(char *))) {
+                    fileNames = NewBuffer;
+                    fileNames[numThemes] = strdup(*FileName);
+                    }
+                 else {
+                    esyslog("ERROR: out of memory");
+                    break;
+                    }
+                 if (char **NewBuffer = (char **)realloc(descriptions, (numThemes + 1) * sizeof(char *))) {
+                    descriptions = NewBuffer;
+                    descriptions[numThemes] = strdup(Theme.Description());
+                    }
+                 else {
+                    esyslog("ERROR: out of memory");
+                    break;
                     }
+                 numThemes++;
                  }
               }
            }
diff --git a/tools.c b/tools.c
index 778c46391..3296b5403 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.20 2012/01/11 11:21:43 kls Exp $
+ * $Id: tools.c 2.22 2012/02/18 15:30:35 kls Exp $
  */
 
 #include "tools.h"
@@ -384,37 +384,35 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
         if (d.Ok()) {
            struct dirent *e;
            while ((e = d.Next()) != NULL) {
-                 if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-                    cString buffer = AddDirectory(FileName, e->d_name);
-                    if (FollowSymlinks) {
-                       struct stat st2;
-                       if (lstat(buffer, &st2) == 0) {
-                          if (S_ISLNK(st2.st_mode)) {
-                             int size = st2.st_size + 1;
-                             char *l = MALLOC(char, size);
-                             int n = readlink(buffer, l, size - 1);
-                             if (n < 0) {
-                                if (errno != EINVAL)
-                                   LOG_ERROR_STR(*buffer);
-                                }
-                             else {
-                                l[n] = 0;
-                                dsyslog("removing %s", l);
-                                if (remove(l) < 0)
-                                   LOG_ERROR_STR(l);
-                                }
-                             free(l);
+                 cString buffer = AddDirectory(FileName, e->d_name);
+                 if (FollowSymlinks) {
+                    struct stat st2;
+                    if (lstat(buffer, &st2) == 0) {
+                       if (S_ISLNK(st2.st_mode)) {
+                          int size = st2.st_size + 1;
+                          char *l = MALLOC(char, size);
+                          int n = readlink(buffer, l, size - 1);
+                          if (n < 0) {
+                             if (errno != EINVAL)
+                                LOG_ERROR_STR(*buffer);
                              }
+                          else {
+                             l[n] = 0;
+                             dsyslog("removing %s", l);
+                             if (remove(l) < 0)
+                                LOG_ERROR_STR(l);
+                             }
+                          free(l);
                           }
-                       else if (errno != ENOENT) {
-                          LOG_ERROR_STR(FileName);
-                          return false;
-                          }
                        }
-                    dsyslog("removing %s", *buffer);
-                    if (remove(buffer) < 0)
-                       LOG_ERROR_STR(*buffer);
+                    else if (errno != ENOENT) {
+                       LOG_ERROR_STR(FileName);
+                       return false;
+                       }
                     }
+                 dsyslog("removing %s", *buffer);
+                 if (remove(buffer) < 0)
+                    LOG_ERROR_STR(*buffer);
                  }
            }
         else {
@@ -442,7 +440,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
      bool empty = true;
      struct dirent *e;
      while ((e = d.Next()) != NULL) {
-           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..") && strcmp(e->d_name, "lost+found")) {
+           if (strcmp(e->d_name, "lost+found")) {
               cString buffer = AddDirectory(DirName, e->d_name);
               struct stat st;
               if (stat(buffer, &st) == 0) {
@@ -480,24 +478,22 @@ int DirSizeMB(const char *DirName)
      int size = 0;
      struct dirent *e;
      while (size >= 0 && (e = d.Next()) != NULL) {
-           if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-              cString buffer = AddDirectory(DirName, e->d_name);
-              struct stat st;
-              if (stat(buffer, &st) == 0) {
-                 if (S_ISDIR(st.st_mode)) {
-                    int n = DirSizeMB(buffer);
-                    if (n >= 0)
-                       size += n;
-                    else
-                       size = -1;
-                    }
+           cString buffer = AddDirectory(DirName, e->d_name);
+           struct stat st;
+           if (stat(buffer, &st) == 0) {
+              if (S_ISDIR(st.st_mode)) {
+                 int n = DirSizeMB(buffer);
+                 if (n >= 0)
+                    size += n;
                  else
-                    size += st.st_size / MEGABYTE(1);
-                 }
-              else {
-                 LOG_ERROR_STR(*buffer);
-                 size = -1;
+                    size = -1;
                  }
+              else
+                 size += st.st_size / MEGABYTE(1);
+              }
+           else {
+              LOG_ERROR_STR(*buffer);
+              size = -1;
               }
            }
      return size;
@@ -567,6 +563,14 @@ time_t LastModifiedTime(const char *FileName)
   return 0;
 }
 
+off_t FileSize(const char *FileName)
+{
+  struct stat fs;
+  if (stat(FileName, &fs) == 0)
+     return fs.st_size;
+  return -1;
+}
+
 // --- cTimeMs ---------------------------------------------------------------
 
 cTimeMs::cTimeMs(int Ms)
@@ -1320,7 +1324,13 @@ cReadDir::~cReadDir()
 
 struct dirent *cReadDir::Next(void)
 {
-  return directory && readdir_r(directory, &u.d, &result) == 0 ? result : NULL;
+  if (directory) {
+     while (readdir_r(directory, &u.d, &result) == 0 && result) {
+           if (strcmp(result->d_name, ".") && strcmp(result->d_name, ".."))
+              return result;
+           }
+     }
+  return NULL;
 }
 
 // --- cStringList -----------------------------------------------------------
@@ -1362,16 +1372,14 @@ bool cFileNameList::Load(const char *Directory, bool DirsOnly)
      struct dirent *e;
      if (d.Ok()) {
         while ((e = d.Next()) != NULL) {
-              if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
-                 if (DirsOnly) {
-                    struct stat ds;
-                    if (stat(AddDirectory(Directory, e->d_name), &ds) == 0) {
-                       if (!S_ISDIR(ds.st_mode))
-                          continue;
-                       }
+              if (DirsOnly) {
+                 struct stat ds;
+                 if (stat(AddDirectory(Directory, e->d_name), &ds) == 0) {
+                    if (!S_ISDIR(ds.st_mode))
+                       continue;
                     }
-                 Append(strdup(e->d_name));
                  }
+              Append(strdup(e->d_name));
               }
         Sort();
         return true;
diff --git a/tools.h b/tools.h
index 86e8fb069..52bf8a7fe 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.14 2011/12/04 14:48:03 kls Exp $
+ * $Id: tools.h 2.15 2012/02/18 15:29:50 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -224,6 +224,7 @@ char *ReadLink(const char *FileName); ///< returns a new string allocated on the
 bool SpinUpDisk(const char *FileName);
 void TouchFile(const char *FileName);
 time_t LastModifiedTime(const char *FileName);
+off_t FileSize(const char *FileName); ///< returns the size of the given file, or -1 in case of an error (e.g. if the file doesn't exist)
 cString WeekDayName(int WeekDay);
 cString WeekDayName(time_t t);
 cString WeekDayNameFull(int WeekDay);
diff --git a/vdr.c b/vdr.c
index 3d79eef4a..417ee19d7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.27 2011/12/03 15:35:09 kls Exp $
+ * $Id: vdr.c 2.29 2012/02/19 11:37:35 kls Exp $
  */
 
 #include <getopt.h>
@@ -569,6 +569,7 @@ int main(int argc, char *argv[])
 
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
+  cEpgDataReader EpgDataReader;
   cOsdObject *Menu = NULL;
   int LastChannel = 0;
   int LastTimerChannel = -1;
@@ -633,7 +634,7 @@ int main(int argc, char *argv[])
         cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
      else
         cSchedules::SetEpgDataFileName(EpgDataFileName);
-     cSchedules::Read();
+     EpgDataReader.Start();
      }
 
   // DVB interfaces:
@@ -1159,7 +1160,6 @@ int main(int argc, char *argv[])
               }
            switch (state) {
              case osPause:  DELETE_MENU;
-                            cControl::Shutdown(); // just in case
                             if (!cRecordControls::PauseLiveVideo())
                                Skins.Message(mtError, tr("No free DVB device to record!"));
                             break;

From 3df1b6d1397379a7ccdde4b559d46baf3f515837 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 3 Mar 2012 13:16:00 +0100
Subject: [PATCH 211/307] Version 1.7.25 Original announce message: VDR
 developer version 1.7.25 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.25.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.24-1.7.25.diff

MD5 checksums:

a3fd482a3dd8027706d4f32a88c6bd13  vdr-1.7.25.tar.bz2
f34adcdc0cdab378431d8946872d6b59  vdr-1.7.24-1.7.25.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- The fps value for channels where it differs from the default is now set correctly
  when pausing live video.
- Increased the average character estimate for calculating tab positions in skins,
  to better suit wide fonts (reported by Rudi Hofer).
- Fixed getting the subsystem ids of DVB devices in case they have been rearranged
  via udev rules.
- Added several cTimer::Set...() functions (suggested by Alexander Rieger).
- Changed the return value of cTimer::SetFile() to 'void'.
- Revoked "Fixed a possible deadlock in time shift mode" because it caused trouble with
  output on vdr-xine and dxr3, and also short glitches when replaying on any output
  device.
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed handling subtitle color palettes on channels where subtitles appear
  "word by word" (thanks to Rolf Ahrenberg).
- Fixed upscaling cBitmaps with anti-aliasing (thanks to Rolf Ahrenberg for reporting
  a problem with color palettes in subtitles).
- Fixed getting the video aspect ratio for scaling subtitles.
- Removed the "PrimaryLimit". Old "full featured" DVB cards can be run with the
  --outputonly option to avoid problems with recording high bandwidth channels.
  Besides, with HDTV becoming ever more popular those cards are pretty much obsolete
  by now (the TT S2-6400 has no problems recording and replaying high bandwidth
  channels simultaneously). And, last but not least, people using software players
  won't notice this change, anyway.
- Since cReceivers can have priorities between -99 and 99, the priority
  for an unused device has been changed from -1 to -100.
- If the first event in a schedule has a table id of 0x00, any incoming EIT data for
  that schedule from the DVB stream will be completely ignored. This way an external
  EPG source can fill the schedules with EPG data that will not be messed up with
  that from the DVB data stream. Note, though, that this means VDR can not do VPS
  controlled recordings with such events!
- Added some typecasts to silence gcc compiler warnings (thanks to Rolf Ahrenberg).
- Fixed handling overlapping timers in case a VPS timer with higher priority needs
  to interrupt a timer with lower priority.
- The code for the RCU remote control unit has been moved into a separate plugin
  named "rcu".
  The REMOTE=RCU option in the 'make' call for VDR is now obsolete.
  The command line option --rcu is now obsolete. Use -Prcu instead. If you have
  used --rcu with a device path, use -P"rcu -d<device>".
- Added support for automatically selecting subtitles when playing old PES
  recordings made with the subtitles plugin (thanks to Anssi Hannula).
- Revised priority handling to allow receivers with a priority that is lower than
  that of live viewing (with suggestions from Frank Schmirler):
  + An idle device (one that is not used for live viewing and has no receiver
    attached to it) now has priority IDLEPRIORITY (-100).
  + An unused CAM slot now has priority IDLEPRIORITY.
  + The default priority of a cReceiver is now MINPRIORITY (-99).
  + A device that is used only for live viewing (no matter whether it's in Transfer
    Mode or real live mode) now has priority TRANSFERPRIORITY (-1).
  + The function cDevice::Receiving() now returns true if there is any receiver
    attached to the device. Its boolean parameter has no meaning any more.
  + The default value for the Priority parameter of the function cDevice::ProvidesChannel()
    has been changed to IDLEPRIORITY.
- Added a Query parameter to cDevice::GetDevice(), so that devices can be queried
  without side effects when zapping.
- Replaced min(max()) calls with the new function constrain().
- Fixed handling OSD color button texts in case a menu item has texts of its own
  (reported by Rolf Ahrenberg). If a plugin creates derived cMenuEditItems that set
  color button texts, these should not set the texts directly by calling
  cSkinDisplay::Current()->SetButtons(), but rather call the new member function
  cMenuEditItem::SetHelp().
- Moved the call to cStatus::MsgChannelSwitch(this, 0) to the beginning of
  cDevice::SetChannel(), so that any receivers that have been attached to the
  device by plugins may be detached before the final call to GetDevice().
  This actually reverts "Only calling cStatus::MsgChannelSwitch() if a channel
  is actually going to be switched or has actually been switched successfully"
  which was made in version 1.1.10, so please report if this has any unwanted
  side effects.
---
 CONTRIBUTORS                                  |  12 +
 HISTORY                                       |  71 +++
 INSTALL                                       |   9 +-
 MANUAL                                        |   9 -
 Make.config.template                          |   3 +-
 Makefile                                      |   7 +-
 PLUGINS.html                                  |   7 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c       |  21 +-
 PLUGINS/src/dvbhddevice/hdffcmd.c             |  10 +-
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.c  |  52 ++-
 PLUGINS/src/pictures/HISTORY                  |   4 +
 PLUGINS/src/pictures/pictures.c               |   6 +-
 PLUGINS/src/rcu/COPYING                       | 340 ++++++++++++++
 PLUGINS/src/rcu/HISTORY                       |   6 +
 PLUGINS/src/rcu/Makefile                      | 114 +++++
 PLUGINS/src/rcu/README                        |  19 +
 PLUGINS/src/rcu/rcu.c                         | 420 ++++++++++++++++++
 ci.c                                          |   4 +-
 ci.h                                          |   4 +-
 config.c                                      |   7 +-
 config.h                                      |  19 +-
 device.c                                      |  38 +-
 device.h                                      |  26 +-
 dvbdevice.c                                   |  68 ++-
 dvbdevice.h                                   |   4 +-
 dvbplayer.c                                   |  41 +-
 dvbsubtitle.c                                 |  38 +-
 eit.c                                         |  10 +-
 epg.h                                         |   4 +-
 font.c                                        |   4 +-
 libsi/section.h                               |  16 +-
 libsi/util.h                                  |  14 +-
 menu.c                                        |   7 +-
 menuitems.c                                   |  28 +-
 menuitems.h                                   |   7 +-
 osd.c                                         |  11 +-
 osdbase.c                                     |  25 +-
 osdbase.h                                     |   4 +-
 pat.c                                         |   4 +-
 po/ar.po                                      |  62 +--
 po/ca_ES.po                                   |   5 +-
 po/cs_CZ.po                                   |   5 +-
 po/da_DK.po                                   |   5 +-
 po/de_DE.po                                   |   5 +-
 po/el_GR.po                                   |   5 +-
 po/es_ES.po                                   |   5 +-
 po/et_EE.po                                   | 277 ++++++------
 po/fi_FI.po                                   |   9 +-
 po/fr_FR.po                                   |   5 +-
 po/hr_HR.po                                   |   5 +-
 po/hu_HU.po                                   |   5 +-
 po/it_IT.po                                   |   5 +-
 po/lt_LT.po                                   |   5 +-
 po/mk_MK.po                                   |   5 +-
 po/nl_NL.po                                   |   5 +-
 po/nn_NO.po                                   |   5 +-
 po/pl_PL.po                                   |   5 +-
 po/pt_PT.po                                   |   5 +-
 po/ro_RO.po                                   |   5 +-
 po/ru_RU.po                                   |   5 +-
 po/sk_SK.po                                   |   5 +-
 po/sl_SI.po                                   |   5 +-
 po/sr_SR.po                                   |   5 +-
 po/sv_SE.po                                   |   5 +-
 po/tr_TR.po                                   |   5 +-
 po/uk_UA.po                                   |   5 +-
 po/zh_CN.po                                   |   5 +-
 receiver.c                                    |   6 +-
 receiver.h                                    |  12 +-
 recording.c                                   |   4 +-
 remux.c                                       |   4 +-
 skins.c                                       |   4 +-
 timers.c                                      |  46 +-
 timers.h                                      |  10 +-
 tools.h                                       |   4 +-
 transfer.c                                    |   4 +-
 vdr.1                                         |   9 +-
 vdr.5                                         |   4 +-
 vdr.c                                         |  15 +-
 79 files changed, 1525 insertions(+), 563 deletions(-)
 create mode 100644 PLUGINS/src/rcu/COPYING
 create mode 100644 PLUGINS/src/rcu/HISTORY
 create mode 100644 PLUGINS/src/rcu/Makefile
 create mode 100644 PLUGINS/src/rcu/README
 create mode 100644 PLUGINS/src/rcu/rcu.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 72f4a44a0..d2ef1f3fe 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -531,6 +531,7 @@ Onno Kreuzinger <ok@solutas.net>
 
 Rudi Hofer (Rudi.Hofer@gmx.de)
  for his help in keeping 'channels.conf' up to date
+ for reporting a problem with overlapping tab positions in skins when using wide fonts
 
 Gregoire Favre <greg@ulima.unil.ch>
  for fixing some function headers to make them compile with gcc 3.x
@@ -1130,6 +1131,12 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding support for handling DVB-T2 transponders
  for suggesting to add member functions Adapter() and Frontend() to cDvbDevice
  for improving handling subtitles of BBC channels
+ for fixing handling subtitle color palettes on channels where subtitles appear
+ "word by word"
+ for reporting a problem with color palettes in subtitles
+ for adding some typecasts to silence gcc compiler warnings
+ for reporting a bug in handling OSD color button texts in case a menu item has
+ texts of its own
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2077,6 +2084,7 @@ Alexander Rieger <Alexander.Rieger@inka.de>
  for making the list of tracks given in cStatus::SetAudioTrack() NULL terminated
  for fixing handling kLeft in the calls to cStatus::MsgOsdTextItem()
  for fixing a possible integer overflow in GetAbsTime()
+ for suggesting to add several cTimer::Set...() functions
 
 Philip Prindeville <philipp_subx@redfish-solutions.com>
  for updates to 'sources.conf'
@@ -2372,6 +2380,8 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for fixing stopping subtitle display when switching the primary device
  for fixing plugin arguments corruption with glibc 2.11 on x86_64
  for setting the audio type of language descriptors to 0x00 in the PAT/PMT generator
+ for adding support for automatically selecting subtitles when playing old PES
+ recordings made with the subtitles plugin
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2397,6 +2407,8 @@ Frank Schmirler <vdr@schmirler.de>
  recordings of the same broadcast made by different instances of VDR
  for fixing EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0
  for fixing the German translation of "Folder name must not contain '%c'!"
+ for suggestions used in revising priority handling to allow receivers with a priority
+ that is lower than that of live viewing
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
diff --git a/HISTORY b/HISTORY
index 3ecb8c65c..9c4e7e39a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6888,3 +6888,74 @@ Video Disk Recorder Revision History
 - Fixed a possible deadlock in time shift mode.
 - Fixed switching into time shift mode when pausing live video (thanks to Reinhard
   Nissl for helping to debug this one).
+
+2012-03-03: Version 1.7.25
+
+- The fps value for channels where it differs from the default is now set correctly
+  when pausing live video.
+- Increased the average character estimate for calculating tab positions in skins,
+  to better suit wide fonts (reported by Rudi Hofer).
+- Fixed getting the subsystem ids of DVB devices in case they have been rearranged
+  via udev rules.
+- Added several cTimer::Set...() functions (suggested by Alexander Rieger).
+- Changed the return value of cTimer::SetFile() to 'void'.
+- Revoked "Fixed a possible deadlock in time shift mode" because it caused trouble with
+  output on vdr-xine and dxr3, and also short glitches when replaying on any output
+  device.
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling subtitle color palettes on channels where subtitles appear
+  "word by word" (thanks to Rolf Ahrenberg).
+- Fixed upscaling cBitmaps with anti-aliasing (thanks to Rolf Ahrenberg for reporting
+  a problem with color palettes in subtitles).
+- Fixed getting the video aspect ratio for scaling subtitles.
+- Removed the "PrimaryLimit". Old "full featured" DVB cards can be run with the
+  --outputonly option to avoid problems with recording high bandwidth channels.
+  Besides, with HDTV becoming ever more popular those cards are pretty much obsolete
+  by now (the TT S2-6400 has no problems recording and replaying high bandwidth
+  channels simultaneously). And, last but not least, people using software players
+  won't notice this change, anyway.
+- Since cReceivers can have priorities between -99 and 99, the priority
+  for an unused device has been changed from -1 to -100.
+- If the first event in a schedule has a table id of 0x00, any incoming EIT data for
+  that schedule from the DVB stream will be completely ignored. This way an external
+  EPG source can fill the schedules with EPG data that will not be messed up with
+  that from the DVB data stream. Note, though, that this means VDR can not do VPS
+  controlled recordings with such events!
+- Added some typecasts to silence gcc compiler warnings (thanks to Rolf Ahrenberg).
+- Fixed handling overlapping timers in case a VPS timer with higher priority needs
+  to interrupt a timer with lower priority.
+- The code for the RCU remote control unit has been moved into a separate plugin
+  named "rcu".
+  The REMOTE=RCU option in the 'make' call for VDR is now obsolete.
+  The command line option --rcu is now obsolete. Use -Prcu instead. If you have
+  used --rcu with a device path, use -P"rcu -d<device>".
+- Added support for automatically selecting subtitles when playing old PES
+  recordings made with the subtitles plugin (thanks to Anssi Hannula).
+- Revised priority handling to allow receivers with a priority that is lower than
+  that of live viewing (with suggestions from Frank Schmirler):
+  + An idle device (one that is not used for live viewing and has no receiver
+    attached to it) now has priority IDLEPRIORITY (-100).
+  + An unused CAM slot now has priority IDLEPRIORITY.
+  + The default priority of a cReceiver is now MINPRIORITY (-99).
+  + A device that is used only for live viewing (no matter whether it's in Transfer
+    Mode or real live mode) now has priority TRANSFERPRIORITY (-1).
+  + The function cDevice::Receiving() now returns true if there is any receiver
+    attached to the device. Its boolean parameter has no meaning any more.
+  + The default value for the Priority parameter of the function cDevice::ProvidesChannel()
+    has been changed to IDLEPRIORITY.
+- Added a Query parameter to cDevice::GetDevice(), so that devices can be queried
+  without side effects when zapping.
+- Replaced min(max()) calls with the new function constrain().
+- Fixed handling OSD color button texts in case a menu item has texts of its own
+  (reported by Rolf Ahrenberg). If a plugin creates derived cMenuEditItems that set
+  color button texts, these should not set the texts directly by calling
+  cSkinDisplay::Current()->SetButtons(), but rather call the new member function
+  cMenuEditItem::SetHelp().
+- Moved the call to cStatus::MsgChannelSwitch(this, 0) to the beginning of
+  cDevice::SetChannel(), so that any receivers that have been attached to the
+  device by plugins may be detached before the final call to GetDevice().
+  This actually reverts "Only calling cStatus::MsgChannelSwitch() if a channel
+  is actually going to be switched or has actually been switched successfully"
+  which was made in version 1.1.10, so please report if this has any unwanted
+  side effects.
diff --git a/INSTALL b/INSTALL
index 3e7bde857..1096a31fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,15 +47,12 @@ If you have an infrared remote control unit you can define the REMOTE macro
 to one of the following values in the 'make' call to make the respective control
 the default:
 
-  REMOTE=RCU    control via the "Remote Control Unit" receiver
-                (see http://www.tvdr.de/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
 
-Alternatively you can use the '--rcu' or '--lirc' options at runtime.
-These options accept an optional path to the remote control device,
-the defaults of which can be set via the RCU_DEVICE and LIRC_DEVICE macros,
-respectively.
+Alternatively you can use the '--lirc' option at runtime.
+This option accepts an optional path to the remote control device,
+the default of which can be set via the LIRC_DEVICE macro.
 
 If your video directory will be on a VFAT partition, you can call VDR with
 the command line option '--vfat'.
diff --git a/MANUAL b/MANUAL
index e74314937..524062873 100644
--- a/MANUAL
+++ b/MANUAL
@@ -763,15 +763,6 @@ Version 1.6
                          These margins are added automatically to timers that
                          are created from the EPG data.
 
-  Primary limit = 0      The minimum priority a timer must have to be allowed to
-                         use the primary DVB interface, or to force another timer
-                         with higher priority to use the primary DVB interface.
-                         This is mainly useful for recordings that should take
-                         place only when there is nothing else to do, but should
-                         never keep the user from viewing stuff on the primary
-                         interface. On systems with only one DVB card, timers
-                         with a priority below PrimaryLimit will never execute.
-
   Default priority = 50  The default Priority and Lifetime values used when
   Default lifetime = 99  creating a new timer event. A Lifetime value of 99
                          means that this recording will never be deleted
diff --git a/Make.config.template b/Make.config.template
index f128c5b34..9b92621a1 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.5 2012/01/18 12:20:51 kls Exp $
+# $Id: Make.config.template 2.6 2012/02/27 10:56:28 kls Exp $
 
 ### The C compiler and options:
 
@@ -37,7 +37,6 @@ CONFDIR      ?= $(VIDEODIR)
 ### The remote control:
 
 LIRC_DEVICE ?= /var/run/lirc/lircd
-RCU_DEVICE  ?= /dev/ttyS1
 
 ## Define if you want vdr to not run as root
 #VDR_USER ?= vdr
diff --git a/Makefile b/Makefile
index 93a511252..a5ff9c5b1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.24 2012/01/18 12:19:37 kls Exp $
+# $Id: Makefile 2.25 2012/02/27 10:54:38 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -42,7 +42,7 @@ SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
-       lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\
+       lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
        skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
@@ -63,9 +63,8 @@ LIBS += $(shell pkg-config --libs fribidi)
 endif
 
 LIRC_DEVICE ?= /var/run/lirc/lircd
-RCU_DEVICE  ?= /dev/ttyS1
 
-DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
+DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
 
 DEFINES += -D_GNU_SOURCE
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 5ab0fd0b5..804d05507 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -555,6 +555,8 @@ <h1>Table Of Contents</h1>
 
 <hr><h2><a name="Logging">Logging</a></h2>
 
+<div class="blurb">Traces in the sand...</div><p>
+
 <p>
 If the plugin should print log messages, you can use <tt>dsyslog()</tt>, <tt>isyslog()</tt> or <tt>esyslog()</tt>.<br>
 <ul>
@@ -1507,7 +1509,10 @@ <h1>Table Of Contents</h1>
 The above example sets up a receiver that wants to receive data from only one
 PID (for example the Teletext PID). In order to not interfere with other recording
 operations, it sets its priority to <tt>-1</tt> (any negative value will allow
-a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time.
+a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time
+<div class="modified">
+in favor of a timer recording or live viewing).
+</div modified>
 <p>
 Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
 a <tt>cDevice</tt>:
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 160d9c3cd..6fd09c313 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.39 2012/02/15 13:14:49 kls Exp $
+ * $Id: dvbhdffdevice.c 1.40 2012/02/28 09:18:56 kls Exp $
  */
 
 #include <stdint.h>
@@ -48,6 +48,25 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
      devHdffOffset = adapter;
      isHdffPrimary = true;
      mHdffCmdIf = new HDFF::cHdffCmdIf(fd_osd);
+
+     /* reset some stuff in case the VDR was killed before and had no chance
+	to clean up. */
+     mHdffCmdIf->CmdOsdReset();
+
+     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
+     mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
+
+     mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
+     mHdffCmdIf->CmdAvSetPcrPid(0, 0);
+     mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
+     mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
+
+     ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
+     mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
+     mHdffCmdIf->CmdAvEnableSync(0, true);
+     mHdffCmdIf->CmdAvSetPlayMode(0, true);
+     /* reset done */
+
      mHdffCmdIf->CmdAvSetAudioDelay(gHdffSetup.AudioDelay);
      mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) gHdffSetup.AudioDownmix);
      mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) gHdffSetup.AnalogueVideo);
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index cb06b8c67..78e8a895c 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.23 2012/02/06 11:08:48 kls Exp $
+ * $Id: hdffcmd.c 1.24 2012/02/28 09:19:09 kls Exp $
  */
 
 #include <stdint.h>
@@ -188,6 +188,7 @@ uint32_t cHdffCmdIf::CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, HdffCo
 
     if (HdffCmdOsdCreateDisplay(mOsdDev, Width, Height, ColorType, &newDisplay) == 0)
         return newDisplay;
+    LOG_ERROR_STR("Error creating display");
     return HDFF_INVALID_HANDLE;
 }
 
@@ -217,7 +218,7 @@ void cHdffCmdIf::CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, ui
 
 void cHdffCmdIf::CmdOsdRenderDisplay(uint32_t hDisplay)
 {
-    //printf("Render\n");
+    //printf("Render %08X\n", hDisplay);
     HdffCmdOsdRenderDisplay(mOsdDev, hDisplay);
 }
 
@@ -231,6 +232,7 @@ uint32_t cHdffCmdIf::CmdOsdCreatePalette(HdffColorType_t ColorType, HdffColorFor
                                   pColors, &newPalette);
     if (err == 0)
         return newPalette;
+    LOG_ERROR_STR("Error creating palette");
     return HDFF_INVALID_HANDLE;
 }
 
@@ -260,6 +262,7 @@ uint32_t cHdffCmdIf::CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t Da
     err = HdffCmdOsdCreateFontFace(mOsdDev, pFontData, DataSize, &newFontFace);
     if (err == 0)
         return newFontFace;
+    LOG_ERROR_STR("Error creating font face");
     return HDFF_INVALID_HANDLE;
 }
 
@@ -278,6 +281,7 @@ uint32_t cHdffCmdIf::CmdOsdCreateFont(uint32_t hFontFace, uint32_t Size)
     err = HdffCmdOsdCreateFont(mOsdDev, hFontFace, Size, &newFont);
     if (err == 0)
         return newFont;
+    LOG_ERROR_STR("Error creating font");
     return HDFF_INVALID_HANDLE;
 }
 
@@ -316,7 +320,7 @@ void cHdffCmdIf::CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t
                                   int BmpWidth, int BmpHeight, int BmpSize,
                                   HdffColorType_t ColorType, uint32_t hPalette)
 {
-    //printf("Bitmap (%d,%d) %d x %d\n", X, Y, BmpWidth, BmpHeight);
+    //printf("Bitmap %08X (%d,%d) %d x %d, %08X\n", hDisplay, X, Y, BmpWidth, BmpHeight, hPalette);
     HdffCmdOsdDrawBitmap(mOsdDev, hDisplay, X, Y, pBitmap, BmpWidth, BmpHeight,
                          BmpSize, ColorType, hPalette);
 }
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
index a80051ffd..dfe27599f 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
@@ -103,10 +103,15 @@ int HdffCmdOsdCreateDisplay(int OsdDevice, uint16_t Width, uint16_t Height,
     {
         if (osd_cmd.result_len > 0)
         {
-            *NewDisplay = (resultData[6] << 24)
-                        | (resultData[7] << 16)
-                        | (resultData[8] << 8)
-                        | resultData[9];
+            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
+            {
+                *NewDisplay = (resultData[6] << 24)
+                            | (resultData[7] << 16)
+                            | (resultData[8] << 8)
+                            | resultData[9];
+            }
+            else
+                err = -1;
         }
     }
     return err;
@@ -295,10 +300,15 @@ int HdffCmdOsdCreatePalette(int OsdDevice, HdffColorType_t ColorType,
     {
         if (osd_cmd.result_len > 0)
         {
-            *NewPalette = (resultData[6] << 24)
-                        | (resultData[7] << 16)
-                        | (resultData[8] << 8)
-                        | resultData[9];
+            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
+            {
+                *NewPalette = (resultData[6] << 24)
+                            | (resultData[7] << 16)
+                            | (resultData[8] << 8)
+                            | resultData[9];
+            }
+            else
+                err = -1;
         }
     }
     return err;
@@ -400,10 +410,15 @@ int HdffCmdOsdCreateFontFace(int OsdDevice, const uint8_t * FontData,
     {
         if (osd_cmd.result_len > 0)
         {
-            *NewFontFace = (resultData[6] << 24)
-                         | (resultData[7] << 16)
-                         | (resultData[8] << 8)
-                         | resultData[9];
+            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
+            {
+                *NewFontFace = (resultData[6] << 24)
+                             | (resultData[7] << 16)
+                             | (resultData[8] << 8)
+                             | resultData[9];
+            }
+            else
+                err = -1;
         }
     }
     return err;
@@ -451,10 +466,15 @@ int HdffCmdOsdCreateFont(int OsdDevice, uint32_t FontFace, uint32_t Size,
     {
         if (osd_cmd.result_len > 0)
         {
-            *NewFont = (resultData[6] << 24)
-                     | (resultData[7] << 16)
-                     | (resultData[8] << 8)
-                     | resultData[9];
+            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
+            {
+                *NewFont = (resultData[6] << 24)
+                         | (resultData[7] << 16)
+                         | (resultData[8] << 8)
+                         | resultData[9];
+            }
+            else
+                err = -1;
         }
     }
     return err;
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index c85c1a244..e0826ee03 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -67,3 +67,7 @@ VDR Plugin 'pictures' Revision History
 2012-02-17:
 
 - cReadDir::Next() now skips directory entries "." and "..".
+
+2012-02-27: Version 0.1.2
+
+- Removed an obsolete command line option.
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 77fb4216a..27febdf43 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.4 2012/02/17 14:00:48 kls Exp $
+ * $Id: pictures.c 2.5 2012/02/27 11:40:15 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.1";
+static const char *VERSION       = "0.1.2";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
@@ -86,7 +86,7 @@ bool cPluginPictures::ProcessArgs(int argc, char *argv[])
      };
 
   int c;
-  while ((c = getopt_long(argc, argv, "d:s:", long_options, NULL)) != -1) {
+  while ((c = getopt_long(argc, argv, "d:", long_options, NULL)) != -1) {
         switch (c) {
           case 'd': strn0cpy(PictureDirectory, optarg, sizeof(PictureDirectory));
                     break;
diff --git a/PLUGINS/src/rcu/COPYING b/PLUGINS/src/rcu/COPYING
new file mode 100644
index 000000000..f90922eea
--- /dev/null
+++ b/PLUGINS/src/rcu/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
new file mode 100644
index 000000000..692f6208e
--- /dev/null
+++ b/PLUGINS/src/rcu/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'rcu' Revision History
+---------------------------------
+
+2012-02-27: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
new file mode 100644
index 000000000..60bcf9042
--- /dev/null
+++ b/PLUGINS/src/rcu/Makefile
@@ -0,0 +1,114 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2012/02/27 10:46:08 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
+#
+PLUGIN = rcu
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### The directory environment:
+
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
+
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
+
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+### Dependencies:
+
+MAKEDEP = $(CXX) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
+### Targets:
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+dist: $(I18Npo) clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/PLUGINS/src/rcu/README b/PLUGINS/src/rcu/README
new file mode 100644
index 000000000..d66729eef
--- /dev/null
+++ b/PLUGINS/src/rcu/README
@@ -0,0 +1,19 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
+
+Project's homepage:          http://www.tvdr.de/remote.htm
+
+Latest version available at: http://www.tvdr.de
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
+
+Description:
+============
+
+The "Remote Control Unit" used to be part of the core VDR source
+code, and has been moved into a separate plugin in version 1.7.25.
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
new file mode 100644
index 000000000..f0abeddee
--- /dev/null
+++ b/PLUGINS/src/rcu/rcu.c
@@ -0,0 +1,420 @@
+/*
+ * rcu.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: rcu.c 1.1 2012/02/27 11:49:51 kls Exp $
+ */
+
+#include <getopt.h>
+#include <netinet/in.h>
+#include <termios.h>
+#include <unistd.h>
+#include <vdr/plugin.h>
+#include <vdr/remote.h>
+#include <vdr/status.h>
+#include <vdr/thread.h>
+#include <vdr/tools.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "Remote Control Unit";
+
+#define REPEATLIMIT      150 // ms
+#define REPEATDELAY      350 // ms
+#define HANDSHAKETIMEOUT  20 // ms
+#define DEFAULTDEVICE    "/dev/ttyS1"
+
+class cRcuRemote : public cRemote, private cThread, private cStatus {
+private:
+  enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  int f;
+  unsigned char dp, code, mode;
+  int number;
+  unsigned int data;
+  bool receivedCommand;
+  bool SendCommand(unsigned char Cmd);
+  int ReceiveByte(int TimeoutMs = 0);
+  bool SendByteHandshake(unsigned char c);
+  bool SendByte(unsigned char c);
+  bool SendData(unsigned int n);
+  void SetCode(unsigned char Code);
+  void SetMode(unsigned char Mode);
+  void SetNumber(int n, bool Hex = false);
+  void SetPoints(unsigned char Dp, bool On);
+  void SetString(const char *s);
+  bool DetectCode(unsigned char *Code);
+  virtual void Action(void);
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
+public:
+  cRcuRemote(const char *DeviceName);
+  virtual ~cRcuRemote();
+  virtual bool Ready(void);
+  virtual bool Initialize(void);
+  };
+
+cRcuRemote::cRcuRemote(const char *DeviceName)
+:cRemote("RCU")
+,cThread("RCU remote control")
+{
+  dp = 0;
+  mode = modeB;
+  code = 0;
+  number = 0;
+  data = 0;
+  receivedCommand = false;
+  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
+     struct termios t;
+     if (tcgetattr(f, &t) == 0) {
+        cfsetspeed(&t, B9600);
+        cfmakeraw(&t);
+        if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
+           SetNumber(8888);
+           const char *Setup = GetSetup();
+           if (Setup) {
+              code = *Setup;
+              SetCode(code);
+              isyslog("connecting to %s remote control using code %c", Name(), code);
+              }
+           Start();
+           return;
+           }
+        }
+     LOG_ERROR_STR(DeviceName);
+     close(f);
+     }
+  else
+     LOG_ERROR_STR(DeviceName);
+  f = -1;
+}
+
+cRcuRemote::~cRcuRemote()
+{
+  Cancel();
+}
+
+bool cRcuRemote::Ready(void)
+{
+  return f >= 0;
+}
+
+bool cRcuRemote::Initialize(void)
+{
+  if (f >= 0) {
+     unsigned char Code = '0';
+     isyslog("trying codes for %s remote control...", Name());
+     for (;;) {
+         if (DetectCode(&Code)) {
+            code = Code;
+            break;
+            }
+         }
+     isyslog("established connection to %s remote control using code %c", Name(), code);
+     char buffer[16];
+     snprintf(buffer, sizeof(buffer), "%c", code);
+     PutSetup(buffer);
+     return true;
+     }
+  return false;
+}
+
+void cRcuRemote::Action(void)
+{
+#pragma pack(1)
+  union {
+    struct {
+      unsigned short address;
+      unsigned int command;
+      } data;
+    unsigned char raw[6];
+    } buffer;
+#pragma pack()
+
+  time_t LastCodeRefresh = 0;
+  cTimeMs FirstTime;
+  unsigned char LastCode = 0, LastMode = 0;
+  uint64_t LastCommand = ~0; // 0x00 might be a valid command
+  unsigned int LastData = 0;
+  bool repeat = false;
+
+  while (Running() && f >= 0) {
+        if (ReceiveByte(REPEATLIMIT) == 'X') {
+           for (int i = 0; i < 6; i++) {
+               int b = ReceiveByte();
+               if (b >= 0) {
+                  buffer.raw[i] = b;
+                  if (i == 5) {
+                     unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
+                     uint64_t       Command = ntohl(buffer.data.command);
+                     if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
+                        // Well, well, if it isn't the "d-box"...
+                        // This remote control sends the above command before and after
+                        // each keypress - let's just drop this:
+                        break;
+                     Command |= uint64_t(Address) << 32;
+                     if (Command != LastCommand) {
+                        LastCommand = Command;
+                        repeat = false;
+                        FirstTime.Set();
+                        }
+                     else {
+                        if (FirstTime.Elapsed() < REPEATDELAY)
+                           break; // repeat function kicks in after a short delay
+                        repeat = true;
+                        }
+                     Put(Command, repeat);
+                     receivedCommand = true;
+                     }
+                  }
+               else
+                  break;
+               }
+           }
+        else if (repeat) { // the last one was a repeat, so let's generate a release
+           Put(LastCommand, false, true);
+           repeat = false;
+           LastCommand = ~0;
+           }
+        else {
+           unsigned int d = data;
+           if (d != LastData) {
+              SendData(d);
+              LastData = d;
+              }
+           unsigned char c = code;
+           if (c != LastCode) {
+              SendCommand(c);
+              LastCode = c;
+              }
+           unsigned char m = mode;
+           if (m != LastMode) {
+              SendCommand(m);
+              LastMode = m;
+              }
+           LastCommand = ~0;
+           }
+        if (!repeat && code && time(NULL) - LastCodeRefresh > 60) {
+           SendCommand(code); // in case the PIC listens to the wrong code
+           LastCodeRefresh = time(NULL);
+           }
+        }
+}
+
+int cRcuRemote::ReceiveByte(int TimeoutMs)
+{
+  // Returns the byte if one was received within a timeout, -1 otherwise
+  if (cFile::FileReady(f, TimeoutMs)) {
+     unsigned char b;
+     if (safe_read(f, &b, 1) == 1)
+        return b;
+     else
+        LOG_ERROR;
+     }
+  return -1;
+}
+
+bool cRcuRemote::SendByteHandshake(unsigned char c)
+{
+  if (f >= 0) {
+     int w = write(f, &c, 1);
+     if (w == 1) {
+        for (int reply = ReceiveByte(HANDSHAKETIMEOUT); reply >= 0;) {
+            if (reply == c)
+               return true;
+            else if (reply == 'X') {
+               // skip any incoming RC code - it will come again
+               for (int i = 6; i--;) {
+                   if (ReceiveByte() < 0)
+                      return false;
+                   }
+               }
+            else
+               return false;
+            }
+        }
+     LOG_ERROR;
+     }
+  return false;
+}
+
+bool cRcuRemote::SendByte(unsigned char c)
+{
+  for (int retry = 5; retry--;) {
+      if (SendByteHandshake(c))
+         return true;
+      }
+  return false;
+}
+
+bool cRcuRemote::SendData(unsigned int n)
+{
+  for (int i = 0; i < 4; i++) {
+      if (!SendByte(n & 0x7F))
+         return false;
+      n >>= 8;
+      }
+  return SendCommand(mode);
+}
+
+void cRcuRemote::SetCode(unsigned char Code)
+{
+  code = Code;
+}
+
+void cRcuRemote::SetMode(unsigned char Mode)
+{
+  mode = Mode;
+}
+
+bool cRcuRemote::SendCommand(unsigned char Cmd)
+{
+  return SendByte(Cmd | 0x80);
+}
+
+void cRcuRemote::SetNumber(int n, bool Hex)
+{
+  number = n;
+  if (!Hex) {
+     char buf[8];
+     sprintf(buf, "%4d", n & 0xFFFF);
+     n = 0;
+     for (char *d = buf; *d; d++) {
+         if (*d == ' ')
+            *d = 0xF;
+         n = (n << 4) | ((*d - '0') & 0x0F);
+         }
+     }
+  unsigned int m = 0;
+  for (int i = 0; i < 4; i++) {
+      m <<= 8;
+      m |= ((i & 0x03) << 5) | (n & 0x0F) | (((dp >> i) & 0x01) << 4);
+      n >>= 4;
+      }
+  data = m;
+}
+
+void cRcuRemote::SetString(const char *s)
+{
+  const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
+  int n = 0;
+
+  for (int i = 0; *s && i < 4; s++, i++) {
+      n <<= 4;
+      for (const char *c = chars; *c; c++) {
+          if (*c == *s) {
+             n |= c - chars;
+             break;
+             }
+          }
+      }
+  SetNumber(n, true);
+}
+
+void cRcuRemote::SetPoints(unsigned char Dp, bool On)
+{
+  if (On)
+     dp |= Dp;
+  else
+     dp &= ~Dp;
+  SetNumber(number);
+}
+
+bool cRcuRemote::DetectCode(unsigned char *Code)
+{
+  // Caller should initialize 'Code' to 0 and call DetectCode()
+  // until it returns true. Whenever DetectCode() returns false
+  // and 'Code' is not 0, the caller can use 'Code' to display
+  // a message like "Trying code '%c'". If false is returned and
+  // 'Code' is 0, all possible codes have been tried and the caller
+  // can either stop calling DetectCode() (and give some error
+  // message), or start all over again.
+  if (*Code < 'A' || *Code > 'D') {
+     *Code = 'A';
+     return false;
+     }
+  if (*Code <= 'D') {
+     SetMode(modeH);
+     char buf[5];
+     sprintf(buf, "C0D%c", *Code);
+     SetString(buf);
+     SetCode(*Code);
+     cCondWait::SleepMs(2 * REPEATDELAY);
+     if (receivedCommand) {
+        SetMode(modeB);
+        SetString("----");
+        return true;
+        }
+     if (*Code < 'D') {
+        (*Code)++;
+        return false;
+        }
+     }
+  *Code = 0;
+  return false;
+}
+
+void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+{
+  if (ChannelNumber && Device->IsPrimaryDevice())
+     SetNumber(cDevice::CurrentChannel());
+}
+
+void cRcuRemote::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
+{
+  SetPoints(1 << Device->DeviceNumber(), Device->Receiving());
+}
+
+class cPluginRcu : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+  const char *device;
+public:
+  cPluginRcu(void);
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Start(void);
+  };
+
+cPluginRcu::cPluginRcu(void)
+{
+  // Initialize any member variables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+  device = DEFAULTDEVICE;
+}
+
+const char *cPluginRcu::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return "  -d DEV,   --device=DEV   set the device to use (default is " DEFAULTDEVICE ")\n";
+}
+
+bool cPluginRcu::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  static struct option long_options[] = {
+       { "dev",      required_argument, NULL, 'd' },
+       { NULL,       no_argument,       NULL,  0  }
+     };
+
+  int c;
+  while ((c = getopt_long(argc, argv, "d:", long_options, NULL)) != -1) {
+        switch (c) {
+          case 'd': device = optarg;
+                    break;
+          default:  return false;
+          }
+        }
+  return true;
+}
+
+bool cPluginRcu::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  new cRcuRemote(device);
+  return true;
+}
+
+VDRPLUGINCREATOR(cPluginRcu); // Don't touch this!
diff --git a/ci.c b/ci.c
index 59d62efe8..0135d07a3 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.7 2011/05/21 15:21:33 kls Exp $
+ * $Id: ci.c 2.8 2012/02/29 10:24:41 kls Exp $
  */
 
 #include "ci.h"
@@ -1841,7 +1841,7 @@ const int *cCamSlot::GetCaSystemIds(void)
 int cCamSlot::Priority(void)
 {
   cDevice *d = Device();
-  return d ? d->Priority() : -1;
+  return d ? d->Priority() : IDLEPRIORITY;
 }
 
 bool cCamSlot::ProvidesCa(const int *CaSystemIds)
diff --git a/ci.h b/ci.h
index 71bbdf9f0..74e027044 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 2.1 2011/12/04 13:38:17 kls Exp $
+ * $Id: ci.h 2.2 2012/02/29 10:24:27 kls Exp $
  */
 
 #ifndef __CI_H
@@ -192,7 +192,7 @@ class cCamSlot : public cListObject {
        ///< Gets a pending enquiry, or NULL if there is no enquiry.
   int Priority(void);
        ///< Returns the priority if the device this slot is currently assigned
-       ///< to, or -1 if it is not assigned to any device.
+       ///< to, or IDLEPRIORITY if it is not assigned to any device.
   bool ProvidesCa(const int *CaSystemIds);
        ///< Returns true if the CAM in this slot provides one of the given
        ///< CaSystemIds. This doesn't necessarily mean that it will be
diff --git a/config.c b/config.c
index 9015a531a..302a45b3d 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.18 2012/01/14 13:04:59 kls Exp $
+ * $Id: config.c 2.20 2012/02/29 10:15:54 kls Exp $
  */
 
 #include "config.h"
@@ -406,9 +406,8 @@ cSetup::cSetup(void)
   SVDRPTimeout = 300;
   ZapTimeout = 3;
   ChannelEntryTimeout = 1000;
-  PrimaryLimit = 0;
   DefaultPriority = 50;
-  DefaultLifetime = 99;
+  DefaultLifetime = MAXLIFETIME;
   PauseKeyHandling = 2;
   PausePriority = 10;
   PauseLifetime = 1;
@@ -601,7 +600,6 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
-  else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
   else if (!strcasecmp(Name, "PauseKeyHandling"))    PauseKeyHandling   = atoi(Value);
@@ -699,7 +697,6 @@ bool cSetup::Save(void)
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("ZapTimeout",         ZapTimeout);
   Store("ChannelEntryTimeout",ChannelEntryTimeout);
-  Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
   Store("PauseKeyHandling",   PauseKeyHandling);
diff --git a/config.h b/config.h
index 18d551f35..771996802 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.40 2012/01/16 09:50:03 kls Exp $
+ * $Id: config.h 2.43 2012/02/29 12:28:01 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.24"
-#define VDRVERSNUM   10724  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.25"
+#define VDRVERSNUM   10725  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.24"
-#define APIVERSNUM   10724  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.25"
+#define APIVERSNUM   10725  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -36,8 +36,12 @@
 // plugins to work with newer versions of the core VDR as long as no
 // VDR header files have changed.
 
-#define MAXPRIORITY 99
-#define MAXLIFETIME 99
+#define MAXPRIORITY       99
+#define MINPRIORITY       (-MAXPRIORITY)
+#define LIVEPRIORITY      0                  // priority used when selecting a device for live viewing
+#define TRANSFERPRIORITY  (LIVEPRIORITY - 1) // priority used for actual local Transfer Mode
+#define IDLEPRIORITY      (MINPRIORITY - 1)  // priority of an idle device
+#define MAXLIFETIME       99
 
 #define MINOSDWIDTH   480
 #define MAXOSDWIDTH  1920
@@ -264,7 +268,6 @@ class cSetup : public cConfig<cSetupLine> {
   int SVDRPTimeout;
   int ZapTimeout;
   int ChannelEntryTimeout;
-  int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
   int PauseKeyHandling;
diff --git a/device.c b/device.c
index 526f867f5..663f91ad8 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.49 2012/02/15 13:15:19 kls Exp $
+ * $Id: device.c 2.55 2012/03/03 11:43:05 kls Exp $
  */
 
 #include "device.h"
@@ -59,9 +59,6 @@ bool cDeviceHook::DeviceProvidesTransponder(const cDevice *Device, const cChanne
 
 // --- cDevice ---------------------------------------------------------------
 
-// The default priority for non-primary devices:
-#define DEFAULTPRIORITY  -1
-
 // The minimum number of unknown PS1 packets to consider this a "pre 1.3.19 private stream":
 #define MIN_PRE_1_3_19_PRIVATESTREAM 10
 
@@ -229,7 +226,7 @@ static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
   return NumProvidedSystems;
 }
 
-cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView)
+cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView, bool Query)
 {
   cDevice *AvoidDevice = avoidDevice;
   avoidDevice = NULL;
@@ -269,7 +266,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
           if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
              continue; // CAM slot can't be used with this device
           bool ndr;
-          if (device[i]->ProvidesChannel(Channel, (LiveView && device[i]->IsPrimaryDevice()) ? Setup.PrimaryLimit : Priority, &ndr)) { // this device is basicly able to do the job
+          if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
              if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
                 ndr = true; // using a different CAM slot requires detaching receivers
              // Put together an integer number that reflects the "impact" using
@@ -284,8 +281,8 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
              imp <<= 4; imp |= GetClippedNumProvidedSystems(4, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
-             imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF);                               // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
-             imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF);              // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+             imp <<= 8; imp |= device[i]->Priority() - IDLEPRIORITY;                                                 // use the device with the lowest priority (- IDLEPRIORITY to assure that values -100..99 can be used)
+             imp <<= 8; imp |= (NumUsableSlots ? SlotPriority[j] : IDLEPRIORITY) - IDLEPRIORITY;                     // use the CAM slot with the lowest priority (- IDLEPRIORITY to assure that values -100..99 can be used)
              imp <<= 1; imp |= ndr;                                                                                  // avoid devices if we need to detach existing receivers
              imp <<= 1; imp |= NumUsableSlots ? 0 : device[i]->HasCi();                                              // avoid cards with Common Interface for FTA channels
              imp <<= 1; imp |= device[i]->AvoidRecording();                                                          // avoid SD full featured cards
@@ -304,7 +301,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
       if (!NumUsableSlots)
          break; // no CAM necessary, so just one loop over the devices
       }
-  if (d) {
+  if (d && !Query) {
      if (NeedsDetachReceivers)
         d->DetachAllReceivers();
      if (s) {
@@ -655,7 +652,7 @@ bool cDevice::IsTunedToTransponder(const cChannel *Channel) const
 
 bool cDevice::MaySwitchTransponder(const cChannel *Channel) const
 {
-  return time(NULL) > occupiedTimeout && !Receiving(true) && !(pidHandles[ptAudio].pid || pidHandles[ptVideo].pid || pidHandles[ptDolby].pid);
+  return time(NULL) > occupiedTimeout && !Receiving() && !(pidHandles[ptAudio].pid || pidHandles[ptVideo].pid || pidHandles[ptDolby].pid);
 }
 
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
@@ -690,7 +687,7 @@ bool cDevice::SwitchChannel(int Direction)
      cChannel *channel;
      while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
            // try only channels which are currently available
-           if (GetDevice(channel, 0, true))
+           if (GetDevice(channel, LIVEPRIORITY, true, true))
               break;
            n = channel->Number() + Direction;
            }
@@ -711,13 +708,15 @@ bool cDevice::SwitchChannel(int Direction)
 
 eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 {
+  cStatus::MsgChannelSwitch(this, 0);
+
   if (LiveView) {
      StopReplay();
      DELETENULL(liveSubtitle);
      DELETENULL(dvbSubtitleConverter);
      }
 
-  cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, 0, LiveView) : this;
+  cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, LIVEPRIORITY, true) : this;
 
   bool NeedsTransferMode = Device != this;
 
@@ -728,7 +727,6 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 
   if (NeedsTransferMode) {
      if (Device && CanReplay()) {
-        cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
         if (Device->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
            cControl::Launch(new cTransferControl(Device, Channel));
         else
@@ -739,7 +737,6 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      }
   else {
      Channels.Lock(false);
-     cStatus::MsgChannelSwitch(this, 0); // only report status if we are actually going to switch the channel
      // Stop section handling:
      if (sectionHandler) {
         sectionHandler->SetStatus(false);
@@ -880,7 +877,7 @@ void cDevice::SetAudioChannel(int AudioChannel)
 void cDevice::SetVolume(int Volume, bool Absolute)
 {
   int OldVolume = volume;
-  volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
+  volume = constrain(Absolute ? Volume : volume + Volume, 0, MAXVOLUME);
   SetVolumeDevice(volume);
   Absolute |= mute;
   cStatus::MsgSetVolume(Absolute ? volume : volume - OldVolume, Absolute);
@@ -1049,7 +1046,8 @@ void cDevice::EnsureSubtitleTrack(void)
      int LanguagePreference = INT_MAX; // higher than the maximum possible value
      for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
          const tTrackId *TrackId = GetTrack(eTrackType(i));
-         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference))
+         if (TrackId && TrackId->id && (I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference) ||
+            (i == ttSubtitleFirst + 8 && !*TrackId->language && LanguagePreference == INT_MAX))) // compatibility mode for old subtitles plugin
             PreferredTrack = eTrackType(i);
          }
      // Make sure we're set to an available subtitle track:
@@ -1495,7 +1493,9 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 
 int cDevice::Priority(void) const
 {
-  int priority = IsPrimaryDevice() ? Setup.PrimaryLimit - 1 : DEFAULTPRIORITY;
+  int priority = IDLEPRIORITY;
+  if (IsPrimaryDevice() && !Replaying() && ActualDevice() == PrimaryDevice())
+     priority = TRANSFERPRIORITY; // we use the same value here, no matter whether it's actual Transfer Mode or real live viewing
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i])
@@ -1509,11 +1509,11 @@ bool cDevice::Ready(void)
   return true;
 }
 
-bool cDevice::Receiving(bool CheckAny) const
+bool cDevice::Receiving(bool Dummy) const
 {
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
-      if (receiver[i] && (CheckAny || receiver[i]->priority >= 0)) // cReceiver with priority < 0 doesn't count
+      if (receiver[i])
          return true;
       }
   return false;
diff --git a/device.h b/device.h
index 9a4593452..23aea9700 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.33 2012/02/14 14:42:42 kls Exp $
+ * $Id: device.h 2.36 2012/03/02 10:23:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -139,7 +139,7 @@ class cDevice : public cThread {
          ///< Gets the device with the given Index.
          ///< \param Index must be in the range 0..numDevices-1.
          ///< \return A pointer to the device, or NULL if the Index was invalid.
-  static cDevice *GetDevice(const cChannel *Channel, int Priority, bool LiveView);
+  static cDevice *GetDevice(const cChannel *Channel, int Priority, bool LiveView, bool Query = false);
          ///< Returns a device that is able to receive the given Channel at the
          ///< given Priority, with the least impact on active recordings and
          ///< live viewing. The LiveView parameter tells whether the device will
@@ -153,6 +153,10 @@ class cDevice : public cThread {
          ///< after detaching any receivers because the channel can't be decrypted,
          ///< this device/CAM combination will be skipped in the next call to
          ///< GetDevice().
+         ///< If Query is true, no actual CAM assignments or receiver detachments will
+         ///< be done, so that this function can be called without any side effects
+         ///< in order to just determine whether a device is available for the given
+         ///< Channel.
          ///< See also ProvidesChannel().
   static void SetAvoidDevice(cDevice *Device) { avoidDevice = Device; }
          ///< Sets the given Device to be temporarily avoided in the next call to
@@ -235,12 +239,11 @@ class cDevice : public cThread {
   virtual bool ProvidesTransponderExclusively(const cChannel *Channel) const;
          ///< Returns true if this is the only device that is able to provide
          ///< the given channel's transponder.
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = IDLEPRIORITY, bool *NeedsDetachReceivers = NULL) const;
          ///< Returns true if this device can provide the given channel.
-         ///< In case the device has cReceivers attached to it or it is the primary
-         ///< device, Priority is used to decide whether the caller's request can
-         ///< be honored.
-         ///< The special Priority value -1 will tell the caller whether this device
+         ///< In case the device has cReceivers attached to it, Priority is used to
+         ///< decide whether the caller's request can be honored.
+         ///< The special Priority value IDLEPRIORITY will tell the caller whether this device
          ///< is principally able to provide the given Channel, regardless of any
          ///< attached cReceivers.
          ///< If NeedsDetachReceivers is given, the resulting value in it will tell the
@@ -719,9 +722,8 @@ class cDevice : public cThread {
   cReceiver *receiver[MAXRECEIVERS];
 public:
   int Priority(void) const;
-      ///< Returns the priority of the current receiving session (0..MAXPRIORITY),
-      ///< or -1 if no receiver is currently active. The primary device will
-      ///< always return at least Setup.PrimaryLimit-1.
+      ///< Returns the priority of the current receiving session (-MAXPRIORITY..MAXPRIORITY),
+      ///< or IDLEPRIORITY if no receiver is currently active.
 protected:
   virtual bool OpenDvr(void);
       ///< Opens the DVR of this device and prepares it to deliver a Transport
@@ -736,8 +738,8 @@ class cDevice : public cThread {
       ///< false in case of a non recoverable error, otherwise it returns true,
       ///< even if Data is NULL.
 public:
-  bool Receiving(bool CheckAny = false) const;
-       ///< Returns true if we are currently receiving.
+  bool Receiving(bool Dummy = false) const;
+       ///< Returns true if we are currently receiving. The parameter has no meaning (for backwards compatibility only).
   bool AttachReceiver(cReceiver *Receiver);
        ///< Attaches the given receiver to this device.
   void Detach(cReceiver *Receiver);
diff --git a/dvbdevice.c b/dvbdevice.c
index c2503ed03..1987223e0 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.62 2012/02/17 12:20:34 kls Exp $
+ * $Id: dvbdevice.c 2.65 2012/02/29 12:23:43 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -420,7 +420,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
   if (cDvbTuner *t = bondedTuner) {
      cString BondingParams = GetBondingParams(Channel);
      do {
-        if (t->device->Receiving() || t->tunerStatus != tsIdle && (t->device == cDevice::ActualDevice() || ConsiderOccupied && t->device->Occupied())) {
+        if (t->device->Receiving() || ConsiderOccupied && t->device->Occupied()) {
            if (strcmp(BondingParams, t->GetBondingParams()) != 0)
               return false;
            }
@@ -1437,14 +1437,14 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) const
 {
   bool result = false;
-  bool hasPriority = Priority < 0 || Priority > this->Priority();
+  bool hasPriority = Priority == IDLEPRIORITY || Priority > this->Priority();
   bool needsDetachReceivers = false;
   needsDetachBondedReceivers = false;
 
   if (dvbTuner && ProvidesTransponder(Channel)) {
      result = hasPriority;
      if (Priority >= 0) {
-        if (Receiving(true)) {
+        if (Receiving()) {
            if (dvbTuner->IsTunedTo(Channel)) {
               if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
                  if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
@@ -1453,16 +1453,14 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                     else
                        needsDetachReceivers = true;
                     }
-                 else if (!IsPrimaryDevice())
-                    result = true;
                  else
-                    result = Priority >= Setup.PrimaryLimit;
+                    result = true;
                  }
               else
-                 result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
+                 result = true;
               }
            else
-              needsDetachReceivers = Receiving(true);
+              needsDetachReceivers = Receiving();
            }
         if (result) {
            if (!BondingOk(Channel)) {
@@ -1474,7 +1472,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                      }
                   }
               needsDetachBondedReceivers = true;
-              needsDetachReceivers = Receiving(true);
+              needsDetachReceivers = Receiving();
               }
            }
         }
@@ -1591,21 +1589,43 @@ cDvbDeviceProbe::~cDvbDeviceProbe()
 
 uint32_t cDvbDeviceProbe::GetSubsystemId(int Adapter, int Frontend)
 {
-  cString FileName;
-  cReadLine ReadLine;
-  FILE *f = NULL;
   uint32_t SubsystemId = 0;
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId = strtoul(s, NULL, 0) << 16;
-     fclose(f);
-     }
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId |= strtoul(s, NULL, 0);
-     fclose(f);
+  cString FileName = cString::sprintf("/dev/dvb/adapter%d/frontend%d", Adapter, Frontend);
+  struct stat st;
+  if (stat(FileName, &st) == 0) {
+     cReadDir d("/sys/class/dvb");
+     if (d.Ok()) {
+        struct dirent *e;
+        while ((e = d.Next()) != NULL) {
+              if (strstr(e->d_name, "frontend")) {
+                 FileName = cString::sprintf("/sys/class/dvb/%s/dev", e->d_name);
+                 if (FILE *f = fopen(FileName, "r")) {
+                    cReadLine ReadLine;
+                    char *s = ReadLine.Read(f);
+                    fclose(f);
+                    unsigned Major;
+                    unsigned Minor;
+                    if (s && 2 == sscanf(s, "%u:%u", &Major, &Minor)) {
+                       if (((Major << 8) | Minor) == st.st_rdev) {
+                          FileName = cString::sprintf("/sys/class/dvb/%s/device/subsystem_vendor", e->d_name);
+                          if ((f = fopen(FileName, "r")) != NULL) {
+                             if (char *s = ReadLine.Read(f))
+                                SubsystemId = strtoul(s, NULL, 0) << 16;
+                             fclose(f);
+                             }
+                          FileName = cString::sprintf("/sys/class/dvb/%s/device/subsystem_device", e->d_name);
+                          if ((f = fopen(FileName, "r")) != NULL) {
+                             if (char *s = ReadLine.Read(f))
+                                SubsystemId |= strtoul(s, NULL, 0);
+                             fclose(f);
+                             }
+                          break;
+                          }
+                       }
+                    }
+                 }
+              }
+        }
      }
   return SubsystemId;
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index e072bb3f6..85b0d9cf9 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.23 2012/02/17 11:18:55 kls Exp $
+ * $Id: dvbdevice.h 2.24 2012/02/29 12:20:51 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -179,7 +179,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesDeliverySystem(int DeliverySystem) const;
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
-  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesChannel(const cChannel *Channel, int Priority = IDLEPRIORITY, bool *NeedsDetachReceivers = NULL) const;
   virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
   virtual int SignalStrength(void) const;
diff --git a/dvbplayer.c b/dvbplayer.c
index b0adac407..4fd0685cf 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.23 2012/02/19 10:48:02 kls Exp $
+ * $Id: dvbplayer.c 2.25 2012/02/21 11:34:04 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -87,7 +87,6 @@ class cNonBlockingFileReader : public cThread {
 private:
   cUnbufferedFile *f;
   uchar *buffer;
-  uchar *result;
   int wanted;
   int length;
   cCondWait newSet;
@@ -101,7 +100,7 @@ class cNonBlockingFileReader : public cThread {
   void Clear(void);
   void Request(cUnbufferedFile *File, int Length);
   int Result(uchar **Buffer);
-  bool Reading(void) { return result; }
+  bool Reading(void) { return buffer; }
   bool WaitForDataMs(int msToWait);
   };
 
@@ -110,7 +109,6 @@ cNonBlockingFileReader::cNonBlockingFileReader(void)
 {
   f = NULL;
   buffer = NULL;
-  result = NULL;
   wanted = length = 0;
   Start();
 }
@@ -120,7 +118,6 @@ cNonBlockingFileReader::~cNonBlockingFileReader()
   newSet.Signal();
   Cancel(3);
   free(buffer);
-  free(result);
 }
 
 void cNonBlockingFileReader::Clear(void)
@@ -129,8 +126,6 @@ void cNonBlockingFileReader::Clear(void)
   f = NULL;
   free(buffer);
   buffer = NULL;
-  free(result);
-  result = NULL;
   wanted = length = 0;
   Unlock();
 }
@@ -142,18 +137,18 @@ void cNonBlockingFileReader::Request(cUnbufferedFile *File, int Length)
   wanted = Length;
   buffer = MALLOC(uchar, wanted);
   f = File;
-  newSet.Signal();
   Unlock();
+  newSet.Signal();
 }
 
 int cNonBlockingFileReader::Result(uchar **Buffer)
 {
   LOCK_THREAD;
-  if (result && length == wanted) {
-     *Buffer = result;
-     result = NULL;
+  if (buffer && length == wanted) {
+     *Buffer = buffer;
+     buffer = NULL;
      return wanted;
-  }
+     }
   errno = EAGAIN;
   return -1;
 }
@@ -177,8 +172,6 @@ void cNonBlockingFileReader::Action(void)
               length = wanted = r; // this will forward the error status to the caller
               }
            if (length == wanted) {
-              result = buffer;
-              buffer = NULL;
               cMutexLock NewDataLock(&newDataMutex);
               newDataCond.Broadcast();
               }
@@ -190,9 +183,9 @@ void cNonBlockingFileReader::Action(void)
 
 bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
 {
-  if (result && length == wanted)
-     return true;
   cMutexLock NewDataLock(&newDataMutex);
+  if (buffer && length == wanted)
+     return true;
   return newDataCond.TimedWait(newDataMutex, msToWait);
 }
 
@@ -291,6 +284,8 @@ cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive)
      delete index;
      index = NULL;
      }
+  else if (PauseLive)
+     framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default
 }
 
 cDvbPlayer::~cDvbPlayer()
@@ -413,13 +408,13 @@ void cDvbPlayer::Action(void)
      Goto(0, true);
   while (Running()) {
         if (WaitingForData)
-           nonBlockingFileReader->WaitForDataMs(10); // this keeps the CPU load low, but reacts immediately on new data
+           nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
         else if (Sleep) {
            cPoller Poller;
            DevicePoll(Poller, 10);
            Sleep = false;
            if (playMode == pmStill || playMode == pmPause)
-              cCondWait::SleepMs(10);
+              cCondWait::SleepMs(3);
            }
         {
           LOCK_THREAD;
@@ -481,15 +476,7 @@ void cDvbPlayer::Action(void)
                    }
                 if (!eof) {
                    uchar *b = NULL;
-                   int Retries = 5;
-                   int r;
-                   while (true) {
-                         r = nonBlockingFileReader->Result(&b);
-                         if (r == -1 && errno == EAGAIN && --Retries)
-                            nonBlockingFileReader->WaitForDataMs(10); 
-                         else 
-                            break;
-                         }
+                   int r = nonBlockingFileReader->Result(&b);
                    if (r > 0) {
                       WaitingForData = false;
                       uint32_t Pts = 0;
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index aa17a7afe..300cd7c50 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schl��ler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.22 2012/02/13 09:48:18 kls Exp $
+ * $Id: dvbsubtitle.c 2.27 2012/03/02 10:47:25 kls Exp $
  */
 
 
@@ -541,7 +541,6 @@ class cDvbSubtitlePage : public cListObject {
   void SetPts(int64_t Pts) { pts = Pts; }
   void SetState(int State);
   void SetTimeout(int Timeout) { timeout = Timeout; }
-  void UpdateRegionPalette(cSubtitleClut *Clut);
   };
 
 cDvbSubtitlePage::cDvbSubtitlePage(int PageId)
@@ -635,14 +634,6 @@ void cDvbSubtitlePage::SetState(int State)
     }
 }
 
-void cDvbSubtitlePage::UpdateRegionPalette(cSubtitleClut *Clut)
-{
-  for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
-      if (sr->ClutId() == Clut->ClutId())
-         sr->Replace(*Clut->GetPalette(sr->Bpp()));
-      }
-}
-
 // --- cDvbSubtitleAssembler -------------------------------------------------
 
 class cDvbSubtitleAssembler {
@@ -806,7 +797,6 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
   displayHeight = windowHeight = 576;
   windowHorizontalOffset = 0;
   windowVerticalOffset = 0;
-  SetOsdData();
   pages = new cList<cDvbSubtitlePage>;
   bitmaps = new cList<cDvbSubtitleBitmaps>;
   Start();
@@ -840,7 +830,6 @@ void cDvbSubtitleConverter::Reset(void)
   displayHeight = windowHeight = 576;
   windowHorizontalOffset = 0;
   windowVerticalOffset = 0;
-  SetOsdData();
   Unlock();
 }
 
@@ -980,9 +969,9 @@ tColor cDvbSubtitleConverter::yuv2rgb(int Y, int Cb, int Cr)
   Epb = (Cb - 128);
   Epr = (Cr - 128);
   /* ITU-R 709 */
-  Er = max(min(((298 * Ey             + 460 * Epr) / 256), 255), 0);
-  Eg = max(min(((298 * Ey -  55 * Epb - 137 * Epr) / 256), 255), 0);
-  Eb = max(min(((298 * Ey + 543 * Epb            ) / 256), 255), 0);
+  Er = constrain((298 * Ey             + 460 * Epr) / 256, 0, 255);
+  Eg = constrain((298 * Ey -  55 * Epb - 137 * Epr) / 256, 0, 255);
+  Eb = constrain((298 * Ey + 543 * Epb            ) / 256, 0, 255);
 
   return (Er << 16) | (Eg << 8) | Eb;
 }
@@ -995,7 +984,7 @@ void cDvbSubtitleConverter::SetOsdData(void)
   double VideoAspect;
   cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect);
   cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect);
-  if (OsdWidth == displayWidth && OsdHeight == displayHeight || DoubleEqual(VideoAspect, 1.0)) {
+  if (OsdWidth == displayWidth && OsdHeight == displayHeight) {
      osdFactorX = osdFactorY = 1.0;
      osdDeltaX = osdDeltaY = 0;
      }
@@ -1010,7 +999,11 @@ void cDvbSubtitleConverter::SetOsdData(void)
 bool cDvbSubtitleConverter::AssertOsd(void)
 {
   LOCK_THREAD;
-  return osd || (osd = cOsdProvider::NewOsd(int(round(osdFactorX * windowHorizontalOffset + osdDeltaX)), int(round(osdFactorY * windowVerticalOffset + osdDeltaY)) + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES));
+  if (!osd) {
+     SetOsdData();
+     osd = cOsdProvider::NewOsd(int(round(osdFactorX * windowHorizontalOffset + osdDeltaX)), int(round(osdFactorY * windowVerticalOffset + osdDeltaY)) + Setup.SubtitleOffset, OSD_LEVEL_SUBTITLES);
+     }
+  return osd != NULL;
 }
 
 int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
@@ -1035,7 +1028,7 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
      if (!page) {
         page = new cDvbSubtitlePage(pageId);
         pages->Add(page);
-        dbgpages("Create SubtitlePage %d  (total pages = %d)\n", pageId, pages->Count());
+        dbgpages("Create SubtitlePage %d (total pages = %d)\n", pageId, pages->Count());
         }
      if (Pts)
         page->SetPts(Pts);
@@ -1112,7 +1105,7 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             }
        case CLUT_DEFINITION_SEGMENT: {
             dbgsegments("CLUT_DEFINITION_SEGMENT\n");
-            cSubtitleClut *clut =  page->GetClutById(bs.GetBits(8), true);
+            cSubtitleClut *clut = page->GetClutById(bs.GetBits(8), true);
             int clutVersion = bs.GetBits(4);
             if (clutVersion == clut->Version())
                break; // no update
@@ -1155,7 +1148,6 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
                      clut->SetColor(8, clutEntryId, value);
                   }
             dbgcluts("\n");
-            page->UpdateRegionPalette(clut);
             break;
             }
        case OBJECT_DATA_SEGMENT: {
@@ -1310,7 +1302,11 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
   cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
   bitmaps->Add(Bitmaps);
   for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
-      sr->UpdateTextData(Page->GetClutById(sr->ClutId()));
+      cSubtitleClut *clut = Page->GetClutById(sr->ClutId());
+      if (!clut)
+         continue;
+      sr->Replace(*clut->GetPalette(sr->Bpp()));
+      sr->UpdateTextData(clut);
       int posX = sr->HorizontalAddress();
       int posY = sr->VerticalAddress();
       if (sr->Width() > 0 && sr->Height() > 0) {
diff --git a/eit.c b/eit.c
index ed16163f5..cc10003d1 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.12 2010/05/14 14:08:35 kls Exp $
+ * $Id: eit.c 2.13 2012/02/25 15:25:51 kls Exp $
  */
 
 #include "eit.h"
@@ -38,6 +38,14 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
      return; // only collect data for known channels
 
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
+  if (pSchedule) {
+     if (cEvent *Event = pSchedule->Events()->First()) {
+        if (Event->TableID() == 0x00)
+           return; // never touch schedules with events from external sources
+        }
+     }
+  else
+     return;
 
   bool Empty = true;
   bool Modified = false;
diff --git a/epg.h b/epg.h
index 9d6b605be..580cbe6b7 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.6 2012/02/11 12:29:55 kls Exp $
+ * $Id: epg.h 2.7 2012/02/26 13:58:26 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -100,7 +100,7 @@ class cEvent : public cListObject {
   const char *ShortText(void) const { return shortText; }
   const char *Description(void) const { return description; }
   const cComponents *Components(void) const { return components; }
-  uchar Contents(int i = 0) const { return (0 <= i && i < MaxEventContents) ? contents[i] : 0; }
+  uchar Contents(int i = 0) const { return (0 <= i && i < MaxEventContents) ? contents[i] : uchar(0); }
   int ParentalRating(void) const { return parentalRating; }
   time_t StartTime(void) const { return startTime; }
   time_t EndTime(void) const { return startTime + duration; }
diff --git a/font.c b/font.c
index b3913451e..706a017c1 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.9 2012/01/13 09:43:22 kls Exp $
+ * $Id: font.c 2.10 2012/03/02 10:47:45 kls Exp $
  */
 
 #include "font.h"
@@ -396,7 +396,7 @@ cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
 void cFont::SetFont(eDvbFont Font, const char *Name, int CharHeight)
 {
-  cFont *f = CreateFont(Name, min(max(CharHeight, MINFONTSIZE), MAXFONTSIZE));
+  cFont *f = CreateFont(Name, constrain(CharHeight, MINFONTSIZE, MAXFONTSIZE));
   if (!f || !f->Height())
      f = new cDummyFont;
   delete fonts[Font];
diff --git a/libsi/section.h b/libsi/section.h
index d8b5244be..5b70a2200 100644
--- a/libsi/section.h
+++ b/libsi/section.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.h 2.0 2006/04/14 10:53:44 kls Exp $
+ *   $Id: section.h 2.1 2012/02/26 13:58:26 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -29,7 +29,7 @@ class PAT : public NumberedSection {
       int getServiceId() const;
       int getPid() const;
       bool isNITPid() const { return getServiceId()==0; }
-      virtual int getLength() { return sizeof(pat_prog); }
+      virtual int getLength() { return int(sizeof(pat_prog)); }
    protected:
       virtual void Parse();
    private:
@@ -61,7 +61,7 @@ class PMT : public NumberedSection {
       int getPid() const;
       int getStreamType() const;
       DescriptorLoop streamDescriptors;
-      virtual int getLength() { return sizeof(pmt_info)+streamDescriptors.getLength(); }
+      virtual int getLength() { return int(sizeof(pmt_info)+streamDescriptors.getLength()); }
    protected:
       virtual void Parse();
    private:
@@ -96,7 +96,7 @@ class NIT : public NumberedSection {
    public:
       int getTransportStreamId() const;
       int getOriginalNetworkId() const;
-      virtual int getLength() { return sizeof(ni_ts)+transportStreamDescriptors.getLength(); }
+      virtual int getLength() { return int(sizeof(ni_ts)+transportStreamDescriptors.getLength()); }
       DescriptorLoop transportStreamDescriptors;
    protected:
       virtual void Parse();
@@ -131,7 +131,7 @@ class SDT : public NumberedSection {
       int getEITpresentFollowingFlag() const;
       RunningStatus getRunningStatus() const;
       int getFreeCaMode() const;
-      virtual int getLength() { return sizeof(sdt_descr)+serviceDescriptors.getLength(); }
+      virtual int getLength() { return int(sizeof(sdt_descr)+serviceDescriptors.getLength()); }
       DescriptorLoop serviceDescriptors;
    protected:
       virtual void Parse();
@@ -168,7 +168,7 @@ class EIT : public NumberedSection {
       int getFreeCaMode() const;
 
       DescriptorLoop eventDescriptors;
-      virtual int getLength() { return sizeof(eit_event)+eventDescriptors.getLength(); }
+      virtual int getLength() { return int(sizeof(eit_event)+eventDescriptors.getLength()); }
    protected:
       virtual void Parse();
    private:
@@ -225,7 +225,7 @@ class RST : public Section {
       int getServiceId() const;
       int getEventId() const;
       RunningStatus getRunningStatus() const;
-      virtual int getLength() { return sizeof(rst_info); }
+      virtual int getLength() { return int(sizeof(rst_info)); }
    protected:
       virtual void Parse();
    private:
@@ -242,7 +242,7 @@ class AIT : public NumberedSection {
    AIT() {}
    class Application : public LoopElement {
    public:
-      virtual int getLength() { return sizeof(ait_app)+applicationDescriptors.getLength(); }
+      virtual int getLength() { return int(sizeof(ait_app)+applicationDescriptors.getLength()); }
       long getOrganisationId() const;
       int getApplicationId() const;
       int getControlCode() const;
diff --git a/libsi/util.h b/libsi/util.h
index e9134cd42..a7f5d602b 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 2.2 2010/11/01 15:24:32 kls Exp $
+ *   $Id: util.h 2.3 2012/02/26 13:58:26 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -54,10 +54,10 @@ class CharArray {
    template <typename T> const T* getData(int offset) const { return (T*)(data_->data+offset+off); }
       //sets p to point to data+offset, increments offset
    template <typename T> void setPointerAndOffset(const T* &p, int &offset) const { p=(T*)getData(offset); offset+=sizeof(T); }
-   unsigned char operator[](const int index) const { return data_->data ? data_->data[off+index] : 0; }
+   unsigned char operator[](const int index) const { return data_->data ? data_->data[off+index] : (unsigned char)0; }
    int getLength() const { return data_->size; }
-   u_int16_t TwoBytes(const int index) const { return data_->data ? data_->TwoBytes(off+index) : 0; }
-   u_int32_t FourBytes(const int index) const { return data_->data ? data_->FourBytes(off+index) : 0; }
+   u_int16_t TwoBytes(const int index) const { return data_->data ? data_->TwoBytes(off+index) : u_int16_t(0); }
+   u_int32_t FourBytes(const int index) const { return data_->data ? data_->FourBytes(off+index) : u_int32_t(0); }
 
    bool isValid() const { return data_->valid; }
    bool checkSize(int offset) { return (data_->valid && (data_->valid=(offset>=0 && off+offset < data_->size))); }
@@ -73,9 +73,9 @@ class CharArray {
       virtual void Delete() = 0;
 
       u_int16_t TwoBytes(const int index) const
-         { return (data[index] << 8) | data[index+1]; }
+         { return u_int16_t((data[index] << 8) | data[index+1]); }
       u_int32_t FourBytes(const int index) const
-         { return (data[index] << 24) | (data[index+1] << 16) | (data[index+2] << 8) | data[index+3]; }
+         { return u_int32_t((data[index] << 24) | (data[index+1] << 16) | (data[index+2] << 8) | data[index+3]); }
       /*#ifdef CHARARRAY_THREADSAFE
       void Lock();
       void Unlock();
@@ -140,7 +140,7 @@ class Parsable {
 namespace DVBTime {
 time_t getTime(unsigned char date_hi, unsigned char date_lo, unsigned char timehr, unsigned char timemi, unsigned char timese);
 time_t getDuration(unsigned char timehr, unsigned char timemi, unsigned char timese);
-inline unsigned char bcdToDec(unsigned char b) { return ((b >> 4) & 0x0F) * 10 + (b & 0x0F); }
+inline unsigned char bcdToDec(unsigned char b) { return (unsigned char)(((b >> 4) & 0x0F) * 10 + (b & 0x0F)); }
 }
 
 //taken and adapted from libdtv, (c) Rolf Hakenes
diff --git a/menu.c b/menu.c
index 61dcdfcb5..7866bc3d2 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.37 2012/02/19 11:37:55 kls Exp $
+ * $Id: menu.c 2.39 2012/03/02 10:33:17 kls Exp $
  */
 
 #include "menu.h"
@@ -3093,7 +3093,6 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   SetSection(tr("Recording"));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"),     &data.MarginStart));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"),      &data.MarginStop));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"),             &data.PrimaryLimit, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),          &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"),      &data.DefaultLifetime, 0, MAXLIFETIME));
   Add(new cMenuEditStraItem(tr("Setup.Recording$Pause key handling"),        &data.PauseKeyHandling, 3, pauseKeyHandlingTexts));
@@ -3654,7 +3653,7 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction
            Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
            if (!Channel && Setup.ChannelsWrap)
               Channel = Direction > 0 ? Channels.First() : Channels.Last();
-           if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true))
+           if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, LIVEPRIORITY, true, true))
               return Channel;
            }
      }
@@ -4294,7 +4293,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
                }
            }
         }
-     else if (!Timer || (Timer->Priority() >= Setup.PrimaryLimit && !Timer->Pending())) {
+     else if (!Timer || !Timer->Pending()) {
         isyslog("no free DVB device to record channel %d!", ch);
         Skins.Message(mtError, tr("No free DVB device to record!"));
         }
diff --git a/menuitems.c b/menuitems.c
index e7797d6e2..dc3ea7158 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.10 2011/08/12 13:19:40 kls Exp $
+ * $Id: menuitems.c 2.11 2012/03/02 15:49:57 kls Exp $
  */
 
 #include "menuitems.h"
@@ -26,6 +26,7 @@ const char *FileNameChars = trNOOP("FileNameChars$ abcdefghijklmnopqrstuvwxyz012
 cMenuEditItem::cMenuEditItem(const char *Name)
 {
   name = strdup(Name ? Name : "???");
+  SetHelp(NULL);
 }
 
 cMenuEditItem::~cMenuEditItem()
@@ -40,6 +41,27 @@ void cMenuEditItem::SetValue(const char *Value)
   cStatus::MsgOsdCurrentItem(buffer);
 }
 
+void cMenuEditItem::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  // strings are NOT copied - must be constants!!!
+  helpRed    = Red;
+  helpGreen  = Green;
+  helpYellow = Yellow;
+  helpBlue   = Blue;
+  helpDisplayed = false;
+}
+
+bool cMenuEditItem::DisplayHelp(void)
+{
+  bool HasHelp = helpRed || helpGreen || helpYellow || helpBlue;
+  if (HasHelp && !helpDisplayed) {
+     cSkinDisplay::Current()->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
+     cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
+     helpDisplayed = true;
+     }
+  return HasHelp;
+}
+
 // --- cMenuEditIntItem ------------------------------------------------------
 
 cMenuEditIntItem::cMenuEditIntItem(const char *Name, int *Value, int Min, int Max, const char *MinString, const char *MaxString)
@@ -382,9 +404,9 @@ void cMenuEditStrItem::LeaveEditMode(bool SaveValue)
 void cMenuEditStrItem::SetHelpKeys(void)
 {
   if (InEditMode())
-     cSkinDisplay::Current()->SetButtons(tr("Button$ABC/abc"), insert ? tr("Button$Overwrite") : tr("Button$Insert"), tr("Button$Delete"));
+     SetHelp(tr("Button$ABC/abc"), insert ? tr("Button$Overwrite") : tr("Button$Insert"), tr("Button$Delete"));
   else
-     cSkinDisplay::Current()->SetButtons(NULL);
+     SetHelp(NULL);
 }
 
 uint *cMenuEditStrItem::IsAllowed(uint c)
diff --git a/menuitems.h b/menuitems.h
index a6f27438d..db31bda40 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.5 2011/06/13 13:46:03 kls Exp $
+ * $Id: menuitems.h 2.6 2012/03/02 15:49:57 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -19,10 +19,15 @@ extern const char *FileNameChars;
 class cMenuEditItem : public cOsdItem {
 private:
   char *name;
+  const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
+  bool helpDisplayed;
+protected:
+  void SetHelp(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
 public:
   cMenuEditItem(const char *Name);
   ~cMenuEditItem();
   void SetValue(const char *Value);
+  bool DisplayHelp(void);
   };
 
 class cMenuEditIntItem : public cMenuEditItem {
diff --git a/osd.c b/osd.c
index ab24e1745..f9a76428d 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.23 2011/08/15 09:27:39 kls Exp $
+ * $Id: osd.c 2.25 2012/03/02 10:48:19 kls Exp $
  */
 
 #include "osd.h"
@@ -812,11 +812,11 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
   // Fixed point scaling code based on www.inversereality.org/files/bitmapscaling.pdf
   // by deltener@mindtremors.com
   cBitmap *b = new cBitmap(int(round(Width() * FactorX)), int(round(Height() * FactorY)), Bpp(), X0(), Y0());
-  b->Replace(*this); // copy palette
   int RatioX = (Width() << 16) / b->Width();
   int RatioY = (Height() << 16) / b->Height();
   if (!AntiAlias || FactorX <= 1.0 && FactorY <= 1.0) {
      // Downscaling - no anti-aliasing:
+     b->Replace(*this); // copy palette
      tIndex *DestRow = b->bitmap;
      int SourceY = 0;
      for (int y = 0; y < b->Height(); y++) {
@@ -834,6 +834,7 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
   else {
      // Upscaling - anti-aliasing:
      b->SetBpp(8);
+     b->Replace(*this); // copy palette (must be done *after* SetBpp()!)
      int SourceY = 0;
      for (int y = 0; y < b->Height() - 1; y++) {
          int SourceX = 0;
@@ -1007,7 +1008,7 @@ void cPixmap::SetLayer(int Layer)
 void cPixmap::SetAlpha(int Alpha)
 {
   Lock();
-  Alpha = min(max(Alpha, ALPHA_TRANSPARENT), ALPHA_OPAQUE);
+  Alpha = constrain(Alpha, ALPHA_TRANSPARENT, ALPHA_OPAQUE);
   if (Alpha != alpha) {
      MarkViewPortDirty(viewPort);
      alpha = Alpha;
@@ -1647,8 +1648,8 @@ void cOsd::SetOsdPosition(int Left, int Top, int Width, int Height)
 {
   osdLeft = Left;
   osdTop = Top;
-  osdWidth = min(max(Width, MINOSDWIDTH), MAXOSDWIDTH);
-  osdHeight = min(max(Height, MINOSDHEIGHT), MAXOSDHEIGHT);
+  osdWidth = constrain(Width, MINOSDWIDTH, MAXOSDWIDTH);
+  osdHeight = constrain(Height, MINOSDHEIGHT, MAXOSDHEIGHT);
 }
 
 void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
diff --git a/osdbase.c b/osdbase.c
index b0df4de32..0a4dc32fd 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.3 2010/12/12 13:41:28 kls Exp $
+ * $Id: osdbase.c 2.4 2012/03/02 15:49:57 kls Exp $
  */
 
 #include "osdbase.h"
 #include <string.h>
 #include "device.h"
 #include "i18n.h"
+#include "menuitems.h"
 #include "remote.h"
 #include "status.h"
 
@@ -85,6 +86,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   current = marked = -1;
   subMenu = NULL;
   helpRed = helpGreen = helpYellow = helpBlue = NULL;
+  helpDisplayed = false;
   status = NULL;
   if (!displayMenuCount++)
      SetDisplayMenu();
@@ -154,6 +156,15 @@ void cOsdMenu::SetTitle(const char *Title)
   title = strdup(Title);
 }
 
+void cOsdMenu::DisplayHelp(bool Force)
+{
+  if (!helpDisplayed || Force) {
+     displayMenu->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
+     cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
+     helpDisplayed = true;
+     }
+}
+
 void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
   // strings are NOT copied - must be constants!!!
@@ -161,8 +172,7 @@ void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, c
   helpGreen  = Green;
   helpYellow = Yellow;
   helpBlue   = Blue;
-  displayMenu->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
-  cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
+  DisplayHelp(true);
 }
 
 void cOsdMenu::Del(int Index)
@@ -205,8 +215,7 @@ void cOsdMenu::Display(void)
   displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
   displayMenu->SetTitle(title);
   cStatus::MsgOsdTitle(title);
-  displayMenu->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
-  cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
+  DisplayHelp(true);
   int count = Count();
   if (count > 0) {
      int ni = 0;
@@ -263,6 +272,12 @@ void cOsdMenu::DisplayCurrent(bool Current)
         cStatus::MsgOsdCurrentItem(item->Text());
      if (!Current)
         item->SetFresh(true); // leaving the current item resets 'fresh'
+     if (cMenuEditItem *MenuEditItem = dynamic_cast<cMenuEditItem *>(item)) {
+        if (!MenuEditItem->DisplayHelp())
+           DisplayHelp();
+        else
+           helpDisplayed = false;
+        }
      }
 }
 
diff --git a/osdbase.h b/osdbase.h
index 91c5ff730..b9d22ae3f 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 2.1 2010/01/16 14:25:31 kls Exp $
+ * $Id: osdbase.h 2.2 2012/03/02 15:49:57 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -92,9 +92,11 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   int first, current, marked;
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
+  bool helpDisplayed;
   char *status;
   int digit;
   bool hasHotkeys;
+  void DisplayHelp(bool Force = false);
 protected:
   void SetDisplayMenu(void);
   cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
diff --git a/pat.c b/pat.c
index b7493ec71..d9b93f6ec 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.16 2011/04/17 13:45:25 kls Exp $
+ * $Id: pat.c 2.17 2012/03/02 10:56:45 kls Exp $
  */
 
 #include "pat.h"
@@ -360,7 +360,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                       break;
               case 3: // STREAMTYPE_11172_AUDIO
               case 4: // STREAMTYPE_13818_AUDIO
-              case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport sytax
+              case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport syntax
               case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
                       {
                       if (NumApids < MAXAPIDS) {
diff --git a/po/ar.po b/po/ar.po
index f8a10163d..f01718d7f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1053,9 +1053,6 @@ msgstr ""
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr ""
 
-msgid "Setup.Recording$Primary limit"
-msgstr "الحدود الابتدائية"
-
 msgid "Setup.Recording$Default priority"
 msgstr "الاولويات الافتراضية"
 
@@ -1367,60 +1364,3 @@ msgstr "اضغط اى زر لالغاء اعادة التشغيل"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "البرنامج سيقوم بالاغلاق بعد%s دقيقة "
-
-#~ msgid "Path"
-#~ msgstr "المسار"
-
-#~ msgid "Timer commands"
-#~ msgstr "اوامر الموءقت"
-
-#~ msgid "Rename recording"
-#~ msgstr "اعادة تسمية التسجيل"
-
-#~ msgid "Date"
-#~ msgstr "التاريخ"
-
-#~ msgid "Length"
-#~ msgstr "الطول"
-
-#~ msgid "Size"
-#~ msgstr "الحجم"
-
-#~ msgid "Delete marks information?"
-#~ msgstr "حذف معلومات العلامة"
-
-#~ msgid "Delete resume information?"
-#~ msgstr "حذف معلومات المواصلة"
-
-#~ msgid "Setup.OSD$Main menu command position"
-#~ msgstr "موضع اوامر القائمة الرئسية"
-
-#~ msgid "Setup.EPG$Show progress bar"
-#~ msgstr "اضهار شريط التقدم"
-
-#~ msgid "Setup.Recording$Max. recording size (GB)"
-#~ msgstr "اقصى حجم للتسجيل م ب"
-
-#~ msgid "Setup.Recording$Hard Link Cutter"
-#~ msgstr "قاطع وصلات الاختصرات"
-
-#~ msgid "Setup.Recording$Show date"
-#~ msgstr "اظهر التاريخ"
-
-#~ msgid "Setup.Recording$Show time"
-#~ msgstr "اظهر تاريخ التعديل"
-
-#~ msgid "Setup.Recording$Show length"
-#~ msgstr "اظهر VPS"
-
-#~ msgid "Rename$Up"
-#~ msgstr "اعلى"
-
-#~ msgid "Rename$Down"
-#~ msgstr "اسفل"
-
-#~ msgid "Rename$Previous"
-#~ msgstr "السابق"
-
-#~ msgid "Rename$Next"
-#~ msgstr "التالى"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 58e570ee9..3e23df961 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1032,9 +1032,6 @@ msgstr "Marge d'inici de gravaci
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marge de fi de gravaci� (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "L�mit primari"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Prioritat per defecte"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index cdf725ae8..b37ea0bad 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1031,9 +1031,6 @@ msgstr "Nahrávat před začátkem (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Nahrávat po konci (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Primární limit"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Výchozí priorita"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 7fa4cd967..84eff6026 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "Margin ved start (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margin ved stop (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Prim�r gr�nse"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Standard prioritet"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 4c369947e..5b185e957 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "Vorlauf zum Timer-Beginn (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Nachlauf am Timer-Ende (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Prim�r-Limit"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Default-Priorit�t"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index a4fd80c57..4c4ff1236 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "��������� ������ ��� ����� (�����)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "�������� ����"
-
 msgid "Setup.Recording$Default priority"
 msgstr "�������������� �������������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 3e4cad019..ffcc1b8bd 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "Comenzar grabaci
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Acabar grabaci�n despu�s (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "L�mite primario"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Prioridad por defecto"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 6d9c088f1..e4a9e19ea 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,26 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-13\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Vigane kanal ***"
 
 msgid "Channel not available!"
-msgstr "Kanal ei ole k�ttesaadav!"
+msgstr "Kanal ei ole kättesaadav!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "�lekandemooduse start nurjus!"
+msgstr "Siirderežiimi start nurjus!"
 
 msgid "off"
-msgstr "v�ljas"
+msgstr "väljas"
 
 msgid "on"
 msgstr "sees"
@@ -41,10 +41,10 @@ msgid "Polarization"
 msgstr "Polarisatsioon"
 
 msgid "System"
-msgstr "S�steem"
+msgstr "Süsteem"
 
 msgid "Srate"
-msgstr "S�mbolikiirus"
+msgstr "Sümbolikiirus"
 
 msgid "Inversion"
 msgstr "Inversioon"
@@ -74,10 +74,10 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PLP-tunnus"
 
 msgid "Starting EPG scan"
-msgstr "EPG skaneerimine k�ivitatud"
+msgstr "EPG skaneerimine käivitatud"
 
 msgid "Content$Movie/Drama"
 msgstr "Film/draama"
@@ -86,28 +86,28 @@ msgid "Content$Detective/Thriller"
 msgstr "Krimi/triller"
 
 msgid "Content$Adventure/Western/War"
-msgstr "Seiklus/western/s�da"
+msgstr "Seiklus/western/sõda"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr "Scifi/fantaasia/�udus"
+msgstr "Scifi/fantaasia/õudus"
 
 msgid "Content$Comedy"
-msgstr "Kom��dia"
+msgstr "Komöödia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr "Sari/Melodraama/p�rimuslik"
+msgstr "Sari/Melodraama/pärimuslik"
 
 msgid "Content$Romance"
 msgstr "Romanss"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "T�sine/klassikaline/religioosne/ajaloofilm/draama"
+msgstr "Tõsine/klassikaline/religioosne/ajaloofilm/draama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr "T�iskasvanutele/draama"
+msgstr "Täiskasvanutele/draama"
 
 msgid "Content$News/Current Affairs"
-msgstr "Uudised/p�evakajaline"
+msgstr "Uudised/päevakajaline"
 
 msgid "Content$News/Weather Report"
 msgstr "Uudised/ilmateade"
@@ -125,7 +125,7 @@ msgid "Content$Show/Game Show"
 msgstr "Meelelahutus"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr "S�um�ng/m�lum�ng/v�istlus"
+msgstr "Sõumäng/mälumäng/võistlus"
 
 msgid "Content$Variety Show"
 msgstr "Varietee"
@@ -137,7 +137,7 @@ msgid "Content$Sports"
 msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr "Eris�ndmus"
+msgstr "Erisündmus"
 
 msgid "Content$Sport Magazine"
 msgstr "Spordiajakiri"
@@ -152,7 +152,7 @@ msgid "Content$Team Sports"
 msgstr "Meeskonnasport"
 
 msgid "Content$Athletics"
-msgstr "Kergej�ustik"
+msgstr "Kergejõustik"
 
 msgid "Content$Motor Sport"
 msgstr "Autosport"
@@ -167,7 +167,7 @@ msgid "Content$Equestrian"
 msgstr "Ratsutamine"
 
 msgid "Content$Martial Sports"
-msgstr "V�itluskunst"
+msgstr "Võitluskunst"
 
 msgid "Content$Children's/Youth Programme"
 msgstr "Laste- ja noortesaade"
@@ -182,7 +182,7 @@ msgid "Content$Entertainment Programme for 10 to 16"
 msgstr "Meelelahutus 10-16 aastastele"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr "�ppe- ja haridussaade"
+msgstr "Õppe- ja haridussaade"
 
 msgid "Content$Cartoons/Puppets"
 msgstr "Joonisfilm/Nukufilm"
@@ -245,16 +245,16 @@ msgid "Content$Fashion"
 msgstr "Mood"
 
 msgid "Content$Social/Political/Economics"
-msgstr "�hiskond/poliitika/majandus"
+msgstr "Ühiskond/poliitika/majandus"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr "Ajakiri/reportaa�/dokumentaal"
+msgstr "Ajakiri/reportaaž/dokumentaal"
 
 msgid "Content$Economics/Social Advisory"
-msgstr "Majandus/majandusn�uanne"
+msgstr "Majandus/majandusnõuanne"
 
 msgid "Content$Remarkable People"
-msgstr "T�helepanuv��rsed isikud"
+msgstr "Tähelepanuväärsed isikud"
 
 msgid "Content$Education/Science/Factual"
 msgstr "Haridus/teadus/faktid"
@@ -266,16 +266,16 @@ msgid "Content$Technology/Natural Sciences"
 msgstr "Tehnoloogia/loodusteadus"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr "Meditsiin/f�sioloogia/ps�hholoogia"
+msgstr "Meditsiin/füsioloogia/psühholoogia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr "V�lisriigid/ekspeditsioon"
+msgstr "Välisriigid/ekspeditsioon"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr "�hiskondlik/Hingeteadus"
+msgstr "Ühiskondlik/Hingeteadus"
 
 msgid "Content$Further Education"
-msgstr "T�iend�pe"
+msgstr "Täiendõpe"
 
 msgid "Content$Languages"
 msgstr "Keeled"
@@ -287,7 +287,7 @@ msgid "Content$Tourism/Travel"
 msgstr "Turism/reisimine"
 
 msgid "Content$Handicraft"
-msgstr "K�sit��"
+msgstr "Käsitöö"
 
 msgid "Content$Motoring"
 msgstr "Autondus"
@@ -314,7 +314,7 @@ msgid "Content$Unpublished"
 msgstr "Avaldamata"
 
 msgid "Content$Live Broadcast"
-msgstr "Otse�lekanne"
+msgstr "Otseülekanne"
 
 #, c-format
 msgid "ParentalRating$from %d"
@@ -332,56 +332,56 @@ msgid "LanguageCode$eng"
 msgstr "est"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Samm 1: Kodeerimiss�steemi tuvastamine"
+msgstr "Samm 1: Kodeerimissüsteemi tuvastamine"
 
 msgid "Press any key on the RC unit"
 msgstr "Vajuta puldil suvalist klahvi"
 
 msgid "RC code detected!"
-msgstr "Kodeerimiss�steem tuvastatud!"
+msgstr "Kodeerimissüsteem tuvastatud!"
 
 msgid "Do not press any key..."
-msgstr "�ra vajuta puldil �htki klahvi..."
+msgstr "Ära vajuta puldil ühtki klahvi..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Samm 2: Klahvide �petamine"
+msgstr "Samm 2: Klahvide õpetamine"
 
 #, c-format
 msgid "Press key for '%s'"
 msgstr "Vajuta klahvile '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Kinnitamiseks vajuta '�les'"
+msgstr "Kinnitamiseks vajuta 'Üles'"
 
 msgid "Press 'Down' to continue"
-msgstr "J�tkamiseks vajuta 'Alla'"
+msgstr "Jätkamiseks vajuta 'Alla'"
 
 msgid "(press 'Up' to go back)"
-msgstr "(tagasiminekuks vajuta '�les')"
+msgstr "(tagasiminekuks vajuta 'Üles')"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(l�petamiseks vajuta 'Alla')"
+msgstr "(lõpetamiseks vajuta 'Alla')"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(selle klahvi vahelej�tmiseks vajuta 'Men��')"
+msgstr "(selle klahvi vahelejätmiseks vajuta 'Menüü')"
 
 msgid "Learning Remote Control Keys"
-msgstr "Kaugjuhtimispuldi �petamine"
+msgstr "Kaugjuhtimispuldi õpetamine"
 
 msgid "Phase 3: Saving key codes"
 msgstr "Samm 3: Klavhikoodide salvestamine"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Salvestamiseks vajuta '�les' ja katkestamiseks 'Alla'"
+msgstr "Salvestamiseks vajuta 'Üles' ja katkestamiseks 'Alla'"
 
 msgid "Key$Up"
-msgstr "�les"
+msgstr "Üles"
 
 msgid "Key$Down"
 msgstr "Alla"
 
 msgid "Key$Menu"
-msgstr "Men��"
+msgstr "Menüü"
 
 msgid "Key$Ok"
 msgstr "Ok"
@@ -429,7 +429,7 @@ msgid "Key$FastRew"
 msgstr "Tagasikerimine"
 
 msgid "Key$Next"
-msgstr "J�rgmine"
+msgstr "Järgmine"
 
 msgid "Key$Prev"
 msgstr "Eelmine"
@@ -453,7 +453,7 @@ msgid "Key$Volume-"
 msgstr "Helitugevus-"
 
 msgid "Key$Mute"
-msgstr "H��letu"
+msgstr "Hääletu"
 
 msgid "Key$Audio"
 msgstr "Audio"
@@ -474,10 +474,10 @@ msgid "Key$Recordings"
 msgstr "Salvestused"
 
 msgid "Key$Setup"
-msgstr "S�tted"
+msgstr "Sätted"
 
 msgid "Key$Commands"
-msgstr "K�sud"
+msgstr "Käsud"
 
 msgid "Key$User0"
 msgstr "Lisaklahv0"
@@ -519,7 +519,7 @@ msgid "Free To Air"
 msgstr "FTA"
 
 msgid "encrypted"
-msgstr "kr�ptitud"
+msgstr "krüptitud"
 
 msgid "Edit channel"
 msgstr "Kanali muutmine"
@@ -582,7 +582,7 @@ msgid "Button$Delete"
 msgstr "Kustutada"
 
 msgid "Button$Mark"
-msgstr "M�rkimine"
+msgstr "Märkimine"
 
 msgid "Channel is being used by a timer!"
 msgstr "Kanal on taimeri kasutuses!"
@@ -604,13 +604,13 @@ msgstr "Sellenimeline kaust juba olemas!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Kausta nimi ei saa sisaldada '%c' s�mbolit!"
+msgstr "Kausta nimi ei saa sisaldada '%c' sümbolit!"
 
 msgid "Button$Select"
 msgstr "Vali"
 
 msgid "Delete folder and all sub folders?"
-msgstr "Kustutada kaust ja k�ik alamkaustad?"
+msgstr "Kustutada kaust ja kõik alamkaustad?"
 
 msgid "Delete folder?"
 msgstr "Kustutada kaust?"
@@ -625,7 +625,7 @@ msgid "Channel"
 msgstr "Kanal"
 
 msgid "Day"
-msgstr "P�ev"
+msgstr "Päev"
 
 msgid "Start"
 msgstr "Start"
@@ -649,7 +649,7 @@ msgid "Button$Folder"
 msgstr "Kaust"
 
 msgid "First day"
-msgstr "Esimene p�ev"
+msgstr "Esimene päev"
 
 msgid "Select folder"
 msgstr "Kausta valik"
@@ -667,7 +667,7 @@ msgid "Delete timer?"
 msgstr "Kustutada taimer?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Salvestus aktiivne - kustutada?"
+msgstr "Salvestus aktiivne - kas kustutada?"
 
 msgid "Event"
 msgstr "Saade"
@@ -685,7 +685,7 @@ msgid "What's on now?"
 msgstr "Hetkel eetris"
 
 msgid "What's on next?"
-msgstr "J�rgmisena eetris"
+msgstr "Järgmisena eetris"
 
 msgid "Button$Next"
 msgstr "Tulekul"
@@ -697,7 +697,7 @@ msgid "Button$Schedule"
 msgstr "Ajakava"
 
 msgid "Can't switch channel!"
-msgstr "Kanali vahetus ei ole v�imalik!"
+msgstr "Kanali vahetus ei ole võimalik!"
 
 #, c-format
 msgid "Schedule - %s"
@@ -708,10 +708,10 @@ msgid "This event - %s"
 msgstr "Sama saade - %s"
 
 msgid "This event - all channels"
-msgstr "Sama saade - k�ik kanalid"
+msgstr "Sama saade - kõik kanalid"
 
 msgid "All events - all channels"
-msgstr "K�ik saated - k�ik kanalid"
+msgstr "Kõik saated - kõik kanalid"
 
 #, c-format
 msgid "Please enter %d digits!"
@@ -736,7 +736,7 @@ msgid "Button$Open"
 msgstr "Avada"
 
 msgid "Commands"
-msgstr "K�sud"
+msgstr "Käsud"
 
 msgid "Error while accessing recording!"
 msgstr "Salvestuse taasesitus nurjus!"
@@ -745,25 +745,25 @@ msgid "Delete recording?"
 msgstr "Kustutada salvestus?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Salvestust on muudetud - kas kustutada?"
 
 msgid "Error while deleting recording!"
 msgstr "Salvestuse kustutamine nurjus!"
 
 msgid "Recording commands"
-msgstr "Salvestuse k�sud"
+msgstr "Salvestuse käsud"
 
 msgid "never"
 msgstr "ei"
 
 msgid "skin dependent"
-msgstr "kestast s�ltuv"
+msgstr "kestast sõltuv"
 
 msgid "always"
 msgstr "alati"
 
 msgid "OSD"
-msgstr "Ekraanimen��"
+msgstr "Ekraanimenüü"
 
 msgid "Setup.OSD$Language"
 msgstr "Keel"
@@ -784,13 +784,13 @@ msgid "Setup.OSD$Width (%)"
 msgstr "Laius (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "K�rgus (%)"
+msgstr "Kõrgus (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Teate kuvamisaeg (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "V�ikese fondi kasutus"
+msgstr "Väikese fondi kasutus"
 
 msgid "Setup.OSD$Anti-alias"
 msgstr "Fondi silumine"
@@ -799,7 +799,7 @@ msgid "Setup.OSD$Default font"
 msgstr "Vaikefont"
 
 msgid "Setup.OSD$Small font"
-msgstr "V�ike font"
+msgstr "Väike font"
 
 msgid "Setup.OSD$Fixed font"
 msgstr "Fikseeritud font"
@@ -808,7 +808,7 @@ msgid "Setup.OSD$Default font size (%)"
 msgstr "Vaikefondi suurus (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "V�ikese fondi suurus (%)"
+msgstr "Väikese fondi suurus (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
 msgstr "Fiks. fondi suurus (%)"
@@ -820,7 +820,7 @@ msgid "bottom"
 msgstr "all"
 
 msgid "top"
-msgstr "�leval"
+msgstr "üleval"
 
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanaliinfo kuvamisaeg (s)"
@@ -832,19 +832,19 @@ msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Kanaliinfo ajapiirang"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Lehek�lje kerimine"
+msgstr "Lehekülje kerimine"
 
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Ridade ringkerimine"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Sulgemine Men�� klahviga"
+msgstr "Sulgemine Menüü klahviga"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Kausta nime salvestamine"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "Kaustad taimeri men��s"
+msgstr "Kaustad taimeri menüüs"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
@@ -865,10 +865,10 @@ msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vana EPG viide (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Kella s�nkroniseerimine"
+msgstr "Kella sünkroniseerimine"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "S�nkroniseerimise transponder"
+msgstr "Sünkroniseerimise transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -918,7 +918,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Esmane DVB seade"
 
 msgid "Setup.DVB$Video format"
-msgstr "TV k�lgsuhe"
+msgstr "TV külgsuhe"
 
 msgid "Setup.DVB$Video display format"
 msgstr "Video kuvamise formaat"
@@ -930,7 +930,7 @@ msgid "Setup.DVB$Update channels"
 msgstr "Kanalite uuendamine"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Audio keeled"
+msgstr "Audio keeli"
 
 msgid "Setup.DVB$Audio language"
 msgstr "Audio keel"
@@ -939,7 +939,7 @@ msgid "Setup.DVB$Display subtitles"
 msgstr "Subtiitrite kuvamine"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "Subtiitrite keeled"
+msgstr "Subtiitrite keeli"
 
 msgid "Setup.DVB$Subtitle language"
 msgstr "Subtiitri keel"
@@ -948,10 +948,10 @@ msgid "Setup.DVB$Subtitle offset"
 msgstr "Subtiitrite nihe"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Subtiitri l�bipaistvus"
+msgstr "Subtiitri läbipaistvus"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Subtiitri tausta l�bipaistvus"
+msgstr "Subtiitri tausta läbipaistvus"
 
 msgid "LNB"
 msgstr "LNB"
@@ -970,40 +970,40 @@ msgstr "HI LNB sagedus (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "DVB seade %d ühendatud SAT-kaabliga"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "oma"
 
 msgid "CAM reset"
-msgstr "CAM taask�ivitamine"
+msgstr "CAM taaskäivitamine"
 
 msgid "CAM present"
 msgstr "CAM esitletud"
 
 msgid "CAM ready"
-msgstr "CAM t��valmis"
+msgstr "CAM töövalmis"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Menu"
-msgstr "Men��"
+msgstr "Menüü"
 
 msgid "Button$Reset"
 msgstr "Reset"
 
 msgid "Opening CAM menu..."
-msgstr "CAM-men�� avamine..."
+msgstr "CAM-menüü avamine..."
 
 msgid "Can't open CAM menu!"
-msgstr "Ei saa avada CAM men��d!"
+msgstr "Ei saa avada CAM menüüd!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM on kasutuses - taask�ivitada?"
+msgstr "CAM on kasutuses - taaskäivitada?"
 
 msgid "Can't reset CAM!"
-msgstr "CAM mooduli taask�ivitus nurjus!"
+msgstr "CAM mooduli taaskäivitus nurjus!"
 
 msgid "do not pause live video"
 msgstr "mitte peatada"
@@ -1027,25 +1027,22 @@ msgid "Setup.Recording$Margin at start (min)"
 msgstr "Salvestamise algusvaru (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Salvestamise l�puvaru (min)"
-
-msgid "Setup.Recording$Primary limit"
-msgstr "Esmane prioriteet"
+msgstr "Salvestamise lõpuvaru (min)"
 
 msgid "Setup.Recording$Default priority"
 msgstr "Vaikimisi prioriteet"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Salvestuse eluiga (p�evi)"
+msgstr "Salvestuse eluiga (päevi)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Pausi klahvi k�sitsemine"
+msgstr "Pausi klahvi käsitsemine"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Pausi prioriteet"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Pausi eluiga (p�evi)"
+msgstr "Pausi eluiga (päevi)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Episoodinime kasutamine"
@@ -1057,7 +1054,7 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS-i algusvaru (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Kiirsalvestuse m�rgistamine"
+msgstr "Kiirsalvestuse märgistamine"
 
 msgid "Setup.Recording$Name instant recording"
 msgstr "Kiirsalvestuse nimi"
@@ -1078,22 +1075,22 @@ msgid "Replay"
 msgstr "Taasesitus"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Mitmekiiruse moodus"
+msgstr "Mitme kiiruse režiim"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Korduse moodus"
+msgstr "Korduse režiimi kuvamine"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Järelejäänud aja kuvamine"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "J�tkamise ID"
+msgstr "Jätkamise ID"
 
 msgid "Miscellaneous"
-msgstr "Muud s�tted"
+msgstr "Muud sätted"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Min. saate taimaut (min)"
+msgstr "Min. aeg saateni (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Min. kasutaja tegevusetus (min)"
@@ -1108,19 +1105,19 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanali sisestamise ajalimiit (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Kanal k�ivitamisel"
+msgstr "Kanal käivitamisel"
 
 msgid "Setup.Miscellaneous$as before"
 msgstr "endine"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "Helitugevus k�ivitamisel"
+msgstr "Helitugevus käivitamisel"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalite ringkerimine"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "H�dav�ljumine"
+msgstr "Hädaväljumine"
 
 msgid "Plugins"
 msgstr "Laiendusmoodulid"
@@ -1129,7 +1126,7 @@ msgid "This plugin has no setup parameters!"
 msgstr "Sellel laienudusmoodulil ei ole seadeid!"
 
 msgid "Setup"
-msgstr "S�tted"
+msgstr "Sätted"
 
 msgid "Restart"
 msgstr "Restart"
@@ -1139,7 +1136,7 @@ msgstr "Restart?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " L�petada salvestamine "
+msgstr " Lõpetada salvestamine "
 
 msgid "Schedule"
 msgstr "Kava"
@@ -1149,7 +1146,7 @@ msgstr "VDR"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " L�petada taasesitamine"
+msgstr " Lõpetada taasesitamine"
 
 msgid "Button$Pause"
 msgstr "Paus"
@@ -1158,23 +1155,23 @@ msgid "Button$Stop"
 msgstr "Stopp"
 
 msgid "Button$Resume"
-msgstr "J�tkata"
+msgstr "Jätkata"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
 msgstr " Katkestada redigeerimine"
 
 msgid "Stop recording?"
-msgstr "L�petada salvestamine?"
+msgstr "Lõpetada salvestamine?"
 
 msgid "Cancel editing?"
-msgstr "T�histada redigeermine?"
+msgstr "Tühistada redigeermine?"
 
 msgid "No audio available!"
-msgstr "Audio k�ttesaamatu!"
+msgstr "Audio kättesaamatu!"
 
 msgid "No subtitles"
-msgstr "Subtiitrid v�ljas"
+msgstr "Subtiitrid väljas"
 
 msgid "No subtitles available!"
 msgstr "Subtiitrid puuduvad"
@@ -1186,14 +1183,14 @@ msgid "No free DVB device to record!"
 msgstr "Puudub vaba DVB seade salvestamiseks!"
 
 msgid "Pausing live video..."
-msgstr "Otse�lekande peatamine..."
+msgstr "Otseülekande peatamine..."
 
 msgid "Delete timeshift recording?"
 msgstr "Kustutada ajanihke salvestus?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "H�pe: "
+msgstr "Hüpe: "
 
 msgid "No editing marks defined!"
 msgstr "Redigeerimise markerid puuduvad!"
@@ -1202,16 +1199,16 @@ msgid "Can't start editing process!"
 msgstr "Redigeerimise start nurjus!"
 
 msgid "Editing process started"
-msgstr "Redigeerimine k�ivitatud"
+msgstr "Redigeerimine käivitatud"
 
 msgid "Editing process already active!"
 msgstr "Redigeerimine juba aktiivne!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrs�z�tuvw����xy0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrsšzžtuvwõäöüxy0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc�2\tdef3\tghi4\tjkl5\tmno��6\tpqrs�7\ttuv�8\twxyz�9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcä2\tdef3\tghi4\tjkl5\tmnoõö6\tpqrsš7\ttuvü8\twxyzž9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -1226,39 +1223,39 @@ msgid "Plugin"
 msgstr "Laiendusmoodul"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "'�les/Alla' uus asukoht - 'OK' kinnitus"
+msgstr "'Üles/Alla' uus asukoht - 'OK' kinnitus"
 
 msgid "Channel locked (recording)!"
 msgstr "Kanal lukus (salvestamine aktiivne)!"
 
 msgid "Low disk space!"
-msgstr "K�vaketas t�is!"
+msgstr "Kõvaketas täis!"
 
 msgid "Regenerating index file"
 msgstr "Indeksfaili regenereerimine"
 
 msgid "Index file regeneration complete"
-msgstr "Indeksfaili regenereerimine l�petatud"
+msgstr "Indeksfaili regenereerimine lõpetatud"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "V�ljal�litamine nurjus - '-s' parameeter puudub!"
+msgstr "Väljalülitamine nurjus - '-s' parameeter puudub!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Redigeerimine aktiive - l�litada v�lja?"
+msgstr "Redigeerimine aktiive - lülitada välja?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Salvestamine aktiivne - l�litada v�lja?"
+msgstr "Salvestamine aktiivne - lülitada välja?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Salvestamine algab %ld minuti p�rast - l�litada v�lja?"
+msgstr "Salvestamine algab %ld minuti pärast - lülitada välja?"
 
 msgid "shut down anyway?"
-msgstr "l�litada v�lja?"
+msgstr "lülitada välja?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Laiendusmoodul %s �rkab %ld minuti p�rast, j�tkata?"
+msgstr "Laiendusmoodul %s ärkab %ld minuti pärast, jätkata?"
 
 msgid "Editing - restart anyway?"
 msgstr "Redigeerimine aktiivne - restart?"
@@ -1288,53 +1285,53 @@ msgid "MonTueWedThuFriSatSun"
 msgstr " E  T  K  N  R  L  P "
 
 msgid "Monday"
-msgstr "Esmasp�ev"
+msgstr "Esmaspäev"
 
 msgid "Tuesday"
-msgstr "Teisip�ev"
+msgstr "Teisipäev"
 
 msgid "Wednesday"
-msgstr "Kolmap�ev"
+msgstr "Kolmapäev"
 
 msgid "Thursday"
-msgstr "Neljap�ev"
+msgstr "Neljapäev"
 
 msgid "Friday"
 msgstr "Reede"
 
 msgid "Saturday"
-msgstr "Laup�ev"
+msgstr "Laupäev"
 
 msgid "Sunday"
-msgstr "P�hap�ev"
+msgstr "Pühapäev"
 
 msgid "Upcoming recording!"
 msgstr "Salvestamine tulekul!"
 
 msgid "Pause live video?"
-msgstr "Peatada otse�lekanne?"
+msgstr "Peatada otseülekanne?"
 
 msgid "Recording started"
-msgstr "Salvestamine k�ivitatud"
+msgstr "Salvestamine käivitatud"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR l�litub v�lja hiljem - vajuta Power kiirendamiseks"
+msgstr "VDR lülitub välja hiljem - vajuta Power kiirendamiseks"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Vajuta suvalist klahvi v�ljal�litamise t�histamiseks"
+msgstr "Vajuta suvalist klahvi väljalülitamise tühistamiseks"
 
 msgid "Switching primary DVB..."
-msgstr "Esmase DVB seadme �mberl�litus..."
+msgstr "Esmase DVB seadme ümberlülitus..."
 
 msgid "Editing process failed!"
 msgstr "Redigeerimine nurjus"
 
 msgid "Editing process finished"
-msgstr "Redigeerimine l�petatud"
+msgstr "Redigeerimine lõpetatud"
 
 msgid "Press any key to cancel restart"
 msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR l�litub v�lja %s minuti p�rast"
+msgstr "VDR lülitub välja %s minuti pärast"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 740f48fbb..365862dfd 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -321,7 +321,7 @@ msgstr "Suoralähetys"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr "K-%d"
+msgstr "%d"
 
 msgid "No title"
 msgstr "Ei esitystä"
@@ -748,7 +748,7 @@ msgid "Delete recording?"
 msgstr "Poistetaanko tallenne?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Tallennetta muokataan - poistetaanko silti?"
 
 msgid "Error while deleting recording!"
 msgstr "Tallenteen poistaminen epäonnistui!"
@@ -1032,9 +1032,6 @@ msgstr "Aloitusmarginaali (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Lopetusmarginaali (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Ensisijaisen sovittimen prioriteettiraja"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Tallenteen oletusprioriteetti"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 32e23f5d6..e8577be65 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1035,9 +1035,6 @@ msgstr "Marge ant
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marge post�rieure (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Limite primaire"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Priorit� par d�faut"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index f2c2795b8..86d93496f 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1031,9 +1031,6 @@ msgstr "Rezerva na po
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Rezerva na kraju (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Standardno ograni�enje"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Zadani prioritet"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index a457e2668..cfd20bd1e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1033,9 +1033,6 @@ msgstr "Id
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Id�eltol�s a befejez�sn�l (perc)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Als� priorit�s hat�r"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Alap�rtelmezett priorit�s"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index e7f9f9255..3cbd2c03e 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2012-01-15 19:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1036,9 +1036,6 @@ msgstr "Margine iniziale (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margine finale (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Limite primario"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Priorità predefinita"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index ab7b4063f..c7e2bb784 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "Įrašo pradžios užlaikymo laikas (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Įrašo pabaigos užlaikymo laikas (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Pagrindinio įvesties įrenginio suderinimo prioritetas"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Numatytas laikmačio prioritetas"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 5fbd7b621..f8ac586bf 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "Резерва на почеток на снимање (мин)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Резерва на крајот на снимање (мин)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Стандардно огранучување"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Зададен приоритет"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 5b9f400a1..d96ff1144 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1033,9 +1033,6 @@ msgstr "Tijd marge begin (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Tijd marge eind (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Eerste grens"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Standaard prioriteit"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 1e5bc9c8c..63643958c 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "Opptaksmargin start (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Opptaksmargin slutt (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Prioritetsgrense HovedDVB"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Normal prioritet (Timer)"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 6b3195ed7..40ef3011f 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "Margines na pocz
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margines na ko�cu (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Podstawowy limit"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Domy�lny priorytet"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f17ab906a..b65937c9f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "Margem de in
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Margem do fim (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Limite prim�rio"
-
 msgid "Setup.Recording$Default priority"
 msgstr "PPrioridade padr�o"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 7e0046a8b..5ee348c90 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1032,9 +1032,6 @@ msgstr "Marj
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marj� la oprire (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Limit� primar�"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Prioritate implicit�"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2ead79633..94e1a17b4 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "������������ ��������� ������ (���)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "���. ��������� ������� ���. ����������"
-
 msgid "Setup.Recording$Default priority"
 msgstr "��������� ������� �� ���������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index e6140e4d8..767789529 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "Nahr
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Nahr�va� po konci (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Hlavn� limit"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Predvolen� priorita"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index e0b7e0246..97b41e382 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1030,9 +1030,6 @@ msgstr "Premik za
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Zamik konca snemanja (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Primarna meja"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Privzeta prioriteta"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 9b58e1e7e..f86250f67 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1051,9 +1051,6 @@ msgstr "Rezerva na po
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Rezerva na kraju (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Standardno ograni�enje"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Zadani prioritet"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e79633ea0..fedf8d8ed 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1032,9 +1032,6 @@ msgstr "Marginal f
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Marginal f�r stopp (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Prim�r gr�ns"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Normal prioritet"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 3a86e7912..8275596ed 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "Ba
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Sonunda tolerans (dak)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Primer limit"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Ola�an priorite"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 6eebe92c9..1e10ad7ee 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1029,9 +1029,6 @@ msgstr "Випередження початку запису (хв)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "Запізнення зупинки запису (хв)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "Мін. пріоритет захоплення осн. пристрою"
-
 msgid "Setup.Recording$Default priority"
 msgstr "Пріоритет таймера по замовчуванню"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 05c933724..6504bafba 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-16 13:18+0100\n"
+"POT-Creation-Date: 2012-02-25 14:32+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1032,9 +1032,6 @@ msgstr "时间正在开始 (min)"
 msgid "Setup.Recording$Margin at stop (min)"
 msgstr "时间正在停止 (min)"
 
-msgid "Setup.Recording$Primary limit"
-msgstr "主要限制"
-
 msgid "Setup.Recording$Default priority"
 msgstr "默认优先"
 
diff --git a/receiver.c b/receiver.c
index 6a9ba045a..372cb2c93 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.4 2010/12/12 23:16:25 kls Exp $
+ * $Id: receiver.c 2.5 2012/02/29 11:49:36 kls Exp $
  */
 
 #include "receiver.h"
@@ -16,7 +16,7 @@ cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pid
 {
   device = NULL;
   channelID = ChannelID;
-  priority = Priority;
+  priority = constrain(Priority, MINPRIORITY, MAXPRIORITY);
   numPids = 0;
   AddPid(Pid);
   AddPids(Pids1);
@@ -28,7 +28,7 @@ cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pid
 cReceiver::cReceiver(const cChannel *Channel, int Priority)
 {
   device = NULL;
-  priority = Priority;
+  priority = constrain(Priority, MINPRIORITY, MAXPRIORITY);
   numPids = 0;
   SetPids(Channel);
 }
diff --git a/receiver.h b/receiver.h
index a5223ab78..ec9d80210 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.2 2011/12/04 13:38:17 kls Exp $
+ * $Id: receiver.h 2.5 2012/03/01 09:50:24 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -43,15 +43,15 @@ class cReceiver {
 #ifdef LEGACY_CRECEIVER
   cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
 #endif
-  cReceiver(const cChannel *Channel = NULL, int Priority = -1);
+  cReceiver(const cChannel *Channel = NULL, int Priority = MINPRIORITY);
                ///< Creates a new receiver for the given Channel with the given Priority.
-               ///< If Channel is not NULL, its pids set by a call to SetPids().
+               ///< If Channel is not NULL, its pids are set by a call to SetPids().
                ///< Otherwise pids can be added to the receiver by separate calls to the AddPid[s]
                ///< functions.
                ///< The total number of PIDs added to a receiver must not exceed MAXRECEIVEPIDS.
-               ///< Priority may be any value in the range -99..99. Negative values indicate
-               ///< that this cReceiver may be detached at any time (without blocking the
-               ///< cDevice it is attached to).
+               ///< Priority may be any value in the range MINPRIORITY...MAXPRIORITY. Negative values indicate
+               ///< that this cReceiver may be detached at any time in favor of a timer recording
+               ///< or live viewing (without blocking the cDevice it is attached to).
   virtual ~cReceiver();
   bool AddPid(int Pid);
                ///< Adds the given Pid to the list of PIDs of this receiver.
diff --git a/recording.c b/recording.c
index 7617d7345..47a9881ae 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.50 2012/02/19 10:44:45 kls Exp $
+ * $Id: recording.c 2.51 2012/02/26 13:58:26 kls Exp $
  */
 
 #include "recording.h"
@@ -1571,7 +1571,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
      if (!Record && PauseLive) {
         // Wait until the index file contains at least two frames:
         time_t tmax = time(NULL) + MAXWAITFORINDEXFILE;
-        while (time(NULL) < tmax && FileSize(fileName) < 2 * sizeof(tIndexTs))
+        while (time(NULL) < tmax && FileSize(fileName) < off_t(2 * sizeof(tIndexTs)))
               cCondWait::SleepMs(INDEXFILETESTINTERVAL);
         }
      int delta = 0;
diff --git a/remux.c b/remux.c
index ff4d49baa..bd06e7cec 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.63 2012/01/12 12:07:58 kls Exp $
+ * $Id: remux.c 2.64 2012/03/02 10:56:49 kls Exp $
  */
 
 #include "remux.h"
@@ -514,7 +514,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       break;
            case 0x03: // STREAMTYPE_11172_AUDIO
            case 0x04: // STREAMTYPE_13818_AUDIO
-           case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport sytax
+           case 0x0F: // ISO/IEC 13818-7 Audio with ADTS transport syntax
            case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
                       {
                       if (NumApids < MAXAPIDS) {
diff --git a/skins.c b/skins.c
index 427e42243..ccf8c0993 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.3 2011/08/21 11:21:19 kls Exp $
+ * $Id: skins.c 2.4 2012/02/20 11:47:15 kls Exp $
  */
 
 #include "skins.h"
@@ -78,7 +78,7 @@ void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
   tabs[3] = Tab3 ? tabs[2] + Tab3 : 0;
   tabs[4] = Tab4 ? tabs[3] + Tab4 : 0;
   tabs[5] = Tab5 ? tabs[4] + Tab5 : 0;
-  int AvgCharWidth = Setup.FontOsdSize * 3 / 5; // just an estimate
+  int AvgCharWidth = Setup.FontOsdSize * 4 / 6; // just an estimate
   for (int i = 1; i < MaxTabs; i++)
       tabs[i] *= AvgCharWidth;
 }
diff --git a/timers.c b/timers.c
index 54ed1ba89..a98801153 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.5 2011/08/06 13:13:54 kls Exp $
+ * $Id: timers.c 2.8 2012/02/27 09:38:41 kls Exp $
  */
 
 #include "timers.h"
@@ -384,13 +384,14 @@ time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
   return mktime(&tm);
 }
 
-char *cTimer::SetFile(const char *File)
+void cTimer::SetFile(const char *File)
 {
   if (!isempty(File))
      Utf8Strn0Cpy(file, File, sizeof(file));
-  return file;
 }
 
+#define EITPRESENTFOLLOWINGRATE 10 // max. seconds between two occurrences of the "EIT present/following table for the actual multiplex" (2s by the standard, using some more for safety)
+
 bool cTimer::Matches(time_t t, bool Directly, int Margin) const
 {
   startTime = stopTime = 0;
@@ -434,8 +435,12 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
         if (Margin || !Directly) {
            startTime = event->StartTime();
            stopTime = event->EndTime();
-           if (!Margin)
-              return event->IsRunning(true);
+           if (!Margin) { // this is an actual check
+              if (event->Schedule()->PresentSeenWithin(EITPRESENTFOLLOWINGRATE)) // VPS control can only work with up-to-date events...
+                 return event->IsRunning(true);
+              else
+                 return startTime <= t && t < stopTime; // ...otherwise we fall back to normal timer handling
+              }
            }
         }
      return startTime <= t + Margin && t < stopTime; // must stop *before* stopTime to allow adjacent timers
@@ -591,11 +596,42 @@ void cTimer::SetInVpsMargin(bool InVpsMargin)
   inVpsMargin = InVpsMargin;
 }
 
+void cTimer::SetDay(time_t Day)
+{
+  day = Day;
+}
+
+void cTimer::SetWeekDays(int WeekDays)
+{
+  weekdays = WeekDays;
+}
+
+void cTimer::SetStart(int Start)
+{
+  start = Start;
+}
+
+void cTimer::SetStop(int Stop)
+{
+  stop = Stop;
+}
+
 void cTimer::SetPriority(int Priority)
 {
   priority = Priority;
 }
 
+void cTimer::SetLifetime(int Lifetime)
+{
+  lifetime = Lifetime;
+}
+
+void cTimer::SetAux(const char *Aux)
+{
+  free(aux);
+  aux = strdup(Aux);
+}
+
 void cTimer::SetDeferred(int Seconds)
 {
   deferred = time(NULL) + Seconds;
diff --git a/timers.h b/timers.h
index 1d733ee09..aa746b17e 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.1 2011/08/06 12:59:32 kls Exp $
+ * $Id: timers.h 2.3 2012/02/20 15:52:57 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -75,7 +75,7 @@ class cTimer : public cListObject {
   bool DayMatches(time_t t) const;
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
-  char *SetFile(const char *File);
+  void SetFile(const char *File);
   bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
   int Matches(const cEvent *Event, int *Overlap = NULL) const;
   bool Expired(void) const;
@@ -86,7 +86,13 @@ class cTimer : public cListObject {
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
   void SetInVpsMargin(bool InVpsMargin);
+  void SetDay(time_t Day);
+  void SetWeekDays(int WeekDays);
+  void SetStart(int Start);
+  void SetStop(int Stop);
   void SetPriority(int Priority);
+  void SetLifetime(int Lifetime);
+  void SetAux(const char *Aux);
   void SetDeferred(int Seconds);
   void SetFlags(uint Flags);
   void ClrFlags(uint Flags);
diff --git a/tools.h b/tools.h
index 52bf8a7fe..499814146 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.15 2012/02/18 15:29:50 kls Exp $
+ * $Id: tools.h 2.16 2012/02/29 10:41:00 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -57,6 +57,8 @@ template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #endif
 
+template<class T> inline T constrain(T v, T l, T h) { return v < l ? l : v > h ? h : v; }
+
 void syslog_with_tid(int priority, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
 
 #define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
diff --git a/transfer.c b/transfer.c
index 096fda34d..2a92a82ba 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.5 2010/01/30 11:10:25 kls Exp $
+ * $Id: transfer.c 2.6 2012/02/29 14:16:23 kls Exp $
  */
 
 #include "transfer.h"
@@ -12,7 +12,7 @@
 // --- cTransfer -------------------------------------------------------------
 
 cTransfer::cTransfer(const cChannel *Channel)
-:cReceiver(Channel)
+:cReceiver(Channel, TRANSFERPRIORITY)
 {
   patPmtGenerator.SetChannel(Channel);
 }
diff --git a/vdr.1 b/vdr.1
index d8322e180..b900b4e6a 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.7 2011/12/04 14:41:00 kls Exp $
+.\" $Id: vdr.1 2.8 2012/02/27 11:01:17 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -33,8 +33,7 @@ to be a "full featured" card, which means it must contain an MPEG decoder
 and provide audio and video signal outputs.
 
 \fBvdr\fR uses the On Screen Display of the DVB card to display its menus.
-It can be controlled by the PC keyboard, a home built "Remote Control Unit"
-(RCU) or the "Linux Infrared Remote Control" (LIRC).
+It can be controlled by the PC keyboard or the "Linux Infrared Remote Control" (LIRC).
 
 Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP),
 which can be accessed on port 6419, for instance by \fBtelnet\fR.
@@ -154,10 +153,6 @@ particular options) you can use
 
 (note the quotes around the asterisk to prevent wildcard expansion).
 .TP
-.BI \-\-rcu[= path ]
-Use a serial port remote control device.
-If \fIpath\fR is omitted, vdr uses \fI/dev/ttyS1\fR.
-.TP
 .BI \-r\  cmd ,\ \-\-record= cmd
 Call \fIcmd\fR before and after a recording. See the file \fIINSTALL\fR for
 more information.
diff --git a/vdr.5 b/vdr.5
index 198c95310..846355026 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.27 2012/01/11 13:16:57 kls Exp $
+.\" $Id: vdr.5 2.28 2012/02/27 11:05:15 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -541,7 +541,7 @@ units. Each line consists of one key assignment in the following format:
 \fBname.key  code\fR
 
 where \fBname\fR is the name of the remote control (for instance KBD for the
-PC keyboard, RCU for the home-built "Remote Control Unit", or LIRC for the
+PC keyboard, or LIRC for the
 "Linux Infrared Remote Control"), \fBkey\fR is the name of the key that is
 defined (like Up, Down, Menu etc.), and \fBcode\fR is a character string that
 this remote control delivers when the given key is pressed.
diff --git a/vdr.c b/vdr.c
index 417ee19d7..f01239aa1 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.29 2012/02/19 11:37:35 kls Exp $
+ * $Id: vdr.c 2.30 2012/02/27 10:59:55 kls Exp $
  */
 
 #include <getopt.h>
@@ -53,7 +53,6 @@
 #include "menu.h"
 #include "osdbase.h"
 #include "plugin.h"
-#include "rcu.h"
 #include "recording.h"
 #include "shutdown.h"
 #include "skinclassic.h"
@@ -201,14 +200,11 @@ int main(int argc, char *argv[])
 
   bool UseKbd = true;
   const char *LircDevice = NULL;
-  const char *RcuDevice = NULL;
 #if !defined(REMOTE_KBD)
   UseKbd = false;
 #endif
 #if defined(REMOTE_LIRC)
   LircDevice = LIRC_DEVICE;
-#elif defined(REMOTE_RCU)
-  RcuDevice = RCU_DEVICE;
 #endif
 #if defined(VDR_USER)
   VdrUser = VDR_USER;
@@ -236,7 +232,6 @@ int main(int argc, char *argv[])
       { "no-kbd",   no_argument,       NULL, 'n' | 0x100 },
       { "plugin",   required_argument, NULL, 'P' },
       { "port",     required_argument, NULL, 'p' },
-      { "rcu",      optional_argument, NULL, 'r' | 0x100 },
       { "record",   required_argument, NULL, 'r' },
       { "shutdown", required_argument, NULL, 's' },
       { "split",    no_argument,       NULL, 's' | 0x100 },
@@ -350,9 +345,6 @@ int main(int argc, char *argv[])
                     break;
           case 'P': PluginManager.AddPlugin(optarg);
                     break;
-          case 'r' | 0x100:
-                    RcuDevice = optarg ? : RCU_DEVICE;
-                    break;
           case 'r': cRecordingUserCommand::SetCommand(optarg);
                     break;
           case 's': ShutdownHandler.SetShutdownCommand(optarg);
@@ -455,8 +447,6 @@ int main(int argc, char *argv[])
                "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                "                           0 turns off SVDRP\n"
                "  -P OPT,   --plugin=OPT   load a plugin defined by the given options\n"
-               "            --rcu[=PATH]   use a remote control device, attached to PATH\n"
-               "                           (default: %s)\n"
                "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "            --split        split edited files at the editing marks (only\n"
@@ -479,7 +469,6 @@ int main(int argc, char *argv[])
                LIRC_DEVICE,
                LOCDIR,
                DEFAULTSVDRPPORT,
-               RCU_DEVICE,
                VideoDirectory,
                DEFAULTWATCHDOG
                );
@@ -707,8 +696,6 @@ int main(int argc, char *argv[])
      }
 
   // Remote Controls:
-  if (RcuDevice)
-     new cRcuRemote(RcuDevice);
   if (LircDevice)
      new cLircRemote(LircDevice);
   if (!DaemonMode && HasStdin && UseKbd)

From 5117f359388e50d2ad46ba53330741c6b1a1e7ae Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 10 Mar 2012 16:18:00 +0100
Subject: [PATCH 212/307] Version 1.7.26 Original announce message: VDR
 developer version 1.7.26 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.26.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.25-1.7.26.diff

MD5 checksums:

eb57398e44935ecb0bfc532bdfead312  vdr-1.7.26.tar.bz2
62e0f39e2c53ec2b5abd3ebb0e00ce3d  vdr-1.7.25-1.7.26.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich).
- Fixed the German translation of "VDR will shut down in %s minutes" (thanks to
  Frank Neumann).
- The replay progress display is now turned on whenever a mark is toggled (not
  only when one is set).
- Toggling a mark now restarts the timeout of the replay progress display.
- Fixed a possible race condition with the SVDRP commands CLRE and PUTE, where
  EPG data from the transponder could be handled even though it shouldn't be
  handled for 10 seconds.
- Added some missing member initializations in cBitmap.
- Improved displaying the play mode in the ST:TNG skin.
- Made the ST:TNG skin the default in case the user selected skin is not available.
- Improved displaying signal strength and quality in the ST:TNG skin's channel
  display.
- Fixed switching devices to the transponders of VPS recordings in case there
  are only bonded devices. The cDevice's "avoid device" mechanism has been replaced
  by using "occupied".
- Fixed selecting devices for the EPG scan in case the primary device is bonded
  with an other one.
- Removed the calls to EITScanner.UsesDevice(this) from dvb[hs]ddevice.c, because
  the code following these calls is only executed if LiveView is true, which is
  never the case when the EITScanner switches to a channel.
- Removed the obsolete function cEITScanner::UsesDevice(). If a plugin has used this
  function to find out whether a call to its cStatus::ChannelSwitch() function was
  due to a live channel switch, it can use that function's new parameter LiveView.
  Any plugins that implement cStatus::ChannelSwitch() need to add the parameter
  'bool LiveView' to that function.
- Fixed parsing channel data in case the audio pid is 0. On channels that only
  broadcast Dolby Digital audio there were sometimes log entries like
  "changing pids of channel ... from ... to ..." with no apparent difference
  between the old and new set of pids.
- Fixed checking pids in case a channel has only Dolby Digital audio.
- The Green button in the "Edit timer" menu can now be used to toggle between single
  shot and repeating timers. This is the same as pressing '0' when the "Day" field
  is selected, but it works at any time (and is more obvious).
- Revoked "If the first event in a schedule has a table id of 0x00, any incoming EIT data for
  that schedule from the DVB stream will be completely ignored".
- Added a new plugin interface for implementing EPG handlers.
  + A plugin can implement an EPG handler by creating an object derived from
    cEpgHandler and implementing the necessary member functions.
  + The special handling of events with table id 0x00 has been dropped.
    For backwards compatibility EPG events with table ids lower than 0x4E will
    be treated as if they had a table id of 0x4E, and the new plugin 'epgtableid0'
    can be used to have them handled like in previous versions.
  + The default table id for a newly created cEvent has been changed to 0xFF,
    which is higher than any normal table id that is broadcast in the EIT data.
  See PLUGINS.html, section "Electronic Program Guide" for more information.
---
 CONTRIBUTORS                            |   2 +
 HISTORY                                 |  50 ++++
 PLUGINS.html                            |  66 +++--
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |   9 +-
 PLUGINS/src/dvbsddevice/HISTORY         |   6 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   9 +-
 PLUGINS/src/epgtableid0/COPYING         | 340 ++++++++++++++++++++++++
 PLUGINS/src/epgtableid0/HISTORY         |   6 +
 PLUGINS/src/epgtableid0/Makefile        | 114 ++++++++
 PLUGINS/src/epgtableid0/README          |  19 ++
 PLUGINS/src/epgtableid0/epgtableid0.c   |  98 +++++++
 PLUGINS/src/rcu/HISTORY                 |   4 +
 PLUGINS/src/rcu/rcu.c                   |  10 +-
 channels.c                              |   8 +-
 config.h                                |  10 +-
 device.c                                |  31 ++-
 device.h                                |  11 +-
 dvbdevice.c                             |   6 +-
 eit.c                                   |  88 +++---
 eitscan.c                               |   5 +-
 eitscan.h                               |   4 +-
 epg.c                                   | 154 ++++++++++-
 epg.h                                   |  67 ++++-
 menu.c                                  |  22 +-
 menu.h                                  |   3 +-
 menuitems.c                             |  33 ++-
 menuitems.h                             |   3 +-
 osd.c                                   |  17 +-
 po/ar.po                                |   8 +-
 po/ca_ES.po                             |   8 +-
 po/cs_CZ.po                             |   8 +-
 po/da_DK.po                             |   8 +-
 po/de_DE.po                             |  10 +-
 po/el_GR.po                             |   8 +-
 po/es_ES.po                             |   8 +-
 po/et_EE.po                             |   8 +-
 po/fi_FI.po                             |   8 +-
 po/fr_FR.po                             |   8 +-
 po/hr_HR.po                             |   8 +-
 po/hu_HU.po                             |   8 +-
 po/it_IT.po                             |   8 +-
 po/lt_LT.po                             |   8 +-
 po/mk_MK.po                             |   8 +-
 po/nl_NL.po                             |   8 +-
 po/nn_NO.po                             |   8 +-
 po/pl_PL.po                             |   8 +-
 po/pt_PT.po                             |   8 +-
 po/ro_RO.po                             |   8 +-
 po/ru_RU.po                             |   8 +-
 po/sk_SK.po                             |   8 +-
 po/sl_SI.po                             |   8 +-
 po/sr_SR.po                             |   8 +-
 po/sv_SE.po                             |   8 +-
 po/tr_TR.po                             |   8 +-
 po/uk_UA.po                             |   8 +-
 po/zh_CN.po                             |   8 +-
 rcu.c                                   | 329 -----------------------
 rcu.h                                   |  46 ----
 skinsttng.c                             |  20 +-
 status.c                                |   6 +-
 status.h                                |   7 +-
 svdrp.c                                 |  11 +-
 vdr.5                                   |   4 +-
 vdr.c                                   |  51 ++--
 65 files changed, 1282 insertions(+), 617 deletions(-)
 create mode 100644 PLUGINS/src/epgtableid0/COPYING
 create mode 100644 PLUGINS/src/epgtableid0/HISTORY
 create mode 100644 PLUGINS/src/epgtableid0/Makefile
 create mode 100644 PLUGINS/src/epgtableid0/README
 create mode 100644 PLUGINS/src/epgtableid0/epgtableid0.c
 delete mode 100644 rcu.c
 delete mode 100644 rcu.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d2ef1f3fe..abc448c8e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2284,6 +2284,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for adding support for HbbTV to libsi
  for fixing cRecording::LengthInSeconds(), which wrongfully rounded the result to full
  minutes
+ for suggesting to check for NULL in cOsd::AddPixmap()
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2773,6 +2774,7 @@ Milan Cvijanovic <elcom_cvijo@hotmail.com>
 Frank Neumann <fnu@yavdr.org>
  for suggesting to reduce the thread and I/O priority cCuttingThread::Action()
  for reporting a problem with tuning timeouts when using SCR with multiple tuners
+ for fixing the German translation of "VDR will shut down in %s minutes"
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
diff --git a/HISTORY b/HISTORY
index 9c4e7e39a..35fa7422e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6959,3 +6959,53 @@ Video Disk Recorder Revision History
   is actually going to be switched or has actually been switched successfully"
   which was made in version 1.1.10, so please report if this has any unwanted
   side effects.
+
+2012-03-10: Version 1.7.26
+
+- Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich).
+- Fixed the German translation of "VDR will shut down in %s minutes" (thanks to
+  Frank Neumann).
+- The replay progress display is now turned on whenever a mark is toggled (not
+  only when one is set).
+- Toggling a mark now restarts the timeout of the replay progress display.
+- Fixed a possible race condition with the SVDRP commands CLRE and PUTE, where
+  EPG data from the transponder could be handled even though it shouldn't be
+  handled for 10 seconds.
+- Added some missing member initializations in cBitmap.
+- Improved displaying the play mode in the ST:TNG skin.
+- Made the ST:TNG skin the default in case the user selected skin is not available.
+- Improved displaying signal strength and quality in the ST:TNG skin's channel
+  display.
+- Fixed switching devices to the transponders of VPS recordings in case there
+  are only bonded devices. The cDevice's "avoid device" mechanism has been replaced
+  by using "occupied".
+- Fixed selecting devices for the EPG scan in case the primary device is bonded
+  with an other one.
+- Removed the calls to EITScanner.UsesDevice(this) from dvb[hs]ddevice.c, because
+  the code following these calls is only executed if LiveView is true, which is
+  never the case when the EITScanner switches to a channel.
+- Removed the obsolete function cEITScanner::UsesDevice(). If a plugin has used this
+  function to find out whether a call to its cStatus::ChannelSwitch() function was
+  due to a live channel switch, it can use that function's new parameter LiveView.
+  Any plugins that implement cStatus::ChannelSwitch() need to add the parameter
+  'bool LiveView' to that function.
+- Fixed parsing channel data in case the audio pid is 0. On channels that only
+  broadcast Dolby Digital audio there were sometimes log entries like
+  "changing pids of channel ... from ... to ..." with no apparent difference
+  between the old and new set of pids.
+- Fixed checking pids in case a channel has only Dolby Digital audio.
+- The Green button in the "Edit timer" menu can now be used to toggle between single
+  shot and repeating timers. This is the same as pressing '0' when the "Day" field
+  is selected, but it works at any time (and is more obvious).
+- Revoked "If the first event in a schedule has a table id of 0x00, any incoming EIT data for
+  that schedule from the DVB stream will be completely ignored".
+- Added a new plugin interface for implementing EPG handlers.
+  + A plugin can implement an EPG handler by creating an object derived from
+    cEpgHandler and implementing the necessary member functions.
+  + The special handling of events with table id 0x00 has been dropped.
+    For backwards compatibility EPG events with table ids lower than 0x4E will
+    be treated as if they had a table id of 0x4E, and the new plugin 'epgtableid0'
+    can be used to have them handled like in previous versions.
+  + The default table id for a newly created cEvent has been changed to 0xFF,
+    which is higher than any normal table id that is broadcast in the EIT data.
+  See PLUGINS.html, section "Electronic Program Guide" for more information.
diff --git a/PLUGINS.html b/PLUGINS.html
index 804d05507..82164bff1 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -21,6 +21,9 @@
 .modified {
     background-color: #FFDDDD;
 }
+modified {
+    background-color: #FFDDDD;
+}
 </style>
 </head>
 <body>
@@ -34,9 +37,9 @@ <h1>The VDR Plugin System</h1>
 <a href="mailto:kls@tvdr.de">kls@tvdr.de</a><br>
 <a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
-<div class="modified">
-Important modifications introduced since version 1.6 are marked like this.
-</div modified>
+<div class="center">
+<modified>Important modifications introduced since version 1.6 are marked like this.</modified>
+</div>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
@@ -99,6 +102,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
 <li><a href="#Conditional Access">Conditional Access</a>
+<li><modified><a href="#Electronic Program Guide">Electronic Program Guide</modified></a>
 </ul>
 </ul>
 
@@ -1221,10 +1225,10 @@ <h1>Table Of Contents</h1>
 
 class cMyStatusMonitor : public cStatus {
 protected:
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber<modified>, bool LiveView</modified>);
   };
 
-void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber<modified>, bool LiveView</modified>)
 {
   if (ChannelNumber)
      dsyslog("channel switched to %d on DVB %d", ChannelNumber, Device-&gt;CardIndex());
@@ -1510,9 +1514,7 @@ <h1>Table Of Contents</h1>
 PID (for example the Teletext PID). In order to not interfere with other recording
 operations, it sets its priority to <tt>-1</tt> (any negative value will allow
 a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time
-<div class="modified">
-in favor of a timer recording or live viewing).
-</div modified>
+<modified>in favor of a timer recording or live viewing</modified>).
 <p>
 Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
 a <tt>cDevice</tt>:
@@ -1528,9 +1530,9 @@ <h1>Table Of Contents</h1>
 video stream (this may be different from the primary device in case of <i>Transfer
 Mode</i>).
 <p>
-<div class="modified">
+<modified>
 The <tt>cReceiver</tt> must be detached from its device before it is deleted.
-</div modified>
+</modified>
 
 <hr><h2><a name="Filters">Filters</a></h2>
 
@@ -1808,9 +1810,7 @@ <h1>Table Of Contents</h1>
 selecting which channel it shall tune to:
 
 <p><table><tr><td class="code"><pre>
-<div class="modified">
-virtual int NumProvidedSystems(void) const;
-</div modified>
+<modified>virtual int NumProvidedSystems(void) const;</modified>
 virtual bool ProvidesSource(int Source) const;
 virtual bool ProvidesTransponder(const cChannel *Channel) const;
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
@@ -1859,9 +1859,7 @@ <h1>Table Of Contents</h1>
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual int64_t GetSTC(void);
-<div class="modified">
-virtual bool IsPlayingVideo(void) const;
-</div modified>
+<modified>virtual bool IsPlayingVideo(void) const;</modified>
 virtual bool HasIBPTrickSpeed(void);
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
@@ -1938,13 +1936,13 @@ <h1>Table Of Contents</h1>
 The OSD provider object is allocated on the heap and shall not be deleted
 (it will be deleted automatically in case a different device sets up an OSD
 provider, or when the program ends).
-
+<p>
 Note that an OSD implementation need not be physically linked to the device
 in any way. All it needs to make sure is that the OSD will be visible to the
 user - whether this goes through OSD facilities of the physical device (like
 a "full featured" DVB card) or through a graphics adapter that overlays its
 output with the video signal, doesn't matter.
-
+<p>
 <div class="modified">
 In order to be able to determine the proper size of the OSD, the device
 should implement the function
@@ -2215,5 +2213,37 @@ <h1>Table Of Contents</h1>
 
 See the description of this function in <tt>ci.h</tt> for details.
 
+<div class="modified">
+<hr><h2><a name="Electronic Program Guide">Electronic Program Guide</a></h2>
+
+<div class="blurb">The grass is always greener on the other side...</div><p>
+
+In case the <i>Electronic Program Guide (EPG)</i> provided by the broadcaster
+isn't sufficient for your taste, you can implement a <tt>cEpgHandler</tt> to
+improve it from external sources. For instance, to replace the description
+of the broadcaster's EPG with one from some external database, you could do:
+
+<p><table><tr><td class="code"><pre>
+#include &lt;vdr/epg.h&gt;
+
+class cMyEpgHandler : public cEpgHandler {
+public:
+  virtual bool SetDescription(cEvent *Event, const char *Description);
+  };
+
+bool cMyEpgHandler::SetDescription(cEvent *Event, const char *Description)
+{
+  Event-&gt;SetDescription(DescriptionFromDatabase(Event));
+  return true;
+}
+</pre></td></tr></table><p>
+
+where <tt>DescriptionFromDatabase()</tt> would derive the description of the
+ given event from some external source. Note that the function returns <tt>true</tt>
+to signal VDR that no other EPG handlers shall be queried after this one.
+<p>
+See <tt>VDR/epg.h</tt> for details.
+</div modified>
+
 </body>
 </html>
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 6fd09c313..ced24f51a 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.40 2012/02/28 09:18:56 kls Exp $
+ * $Id: dvbhdffdevice.c 1.41 2012/03/07 13:52:41 kls Exp $
  */
 
 #include <stdint.h>
@@ -298,13 +298,6 @@ bool cDvbHdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (!cDvbDevice::SetChannelDevice(Channel, LiveView))
      return false;
 
-  // If this channel switch was requested by the EITScanner we don't wait for
-  // a lock and don't set any live PIDs (the EITScanner will wait for the lock
-  // by itself before setting any filters):
-
-  if (EITScanner.UsesDevice(this)) //XXX
-     return true;
-
   // PID settings:
 
   if (TurnOnLivePIDs) {
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 229e35b0e..676dd6fc1 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -23,3 +23,9 @@ VDR Plugin 'dvbsddevice' Revision History
 2011-08-27: Version 0.0.5
 
 - Added option --outputonly to use the device only for output (thanks to Udo Richter).
+
+2012-03-07: Version 0.06
+
+- Removed the call to EITScanner.UsesDevice(this) from dvbsddevice.c, because
+  the code following these calls is only executed if LiveView is true, which is
+  never the case when the EITScanner switches to a channel.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 2aa8c77d3..7f1dde482 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.5 2011/08/27 11:34:58 kls Exp $
+ * $Id: dvbsddevice.c 1.6 2012/03/07 13:58:08 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index cc6af3394..25be281a2 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.31 2012/02/15 13:15:05 kls Exp $
+ * $Id: dvbsdffdevice.c 2.32 2012/03/07 13:52:48 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -421,13 +421,6 @@ bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (!cDvbDevice::SetChannelDevice(Channel, LiveView))
      return false;
 
-  // If this channel switch was requested by the EITScanner we don't wait for
-  // a lock and don't set any live PIDs (the EITScanner will wait for the lock
-  // by itself before setting any filters):
-
-  if (EITScanner.UsesDevice(this)) //XXX
-     return true;
-
   // PID settings:
 
   if (TurnOnLivePIDs) {
diff --git a/PLUGINS/src/epgtableid0/COPYING b/PLUGINS/src/epgtableid0/COPYING
new file mode 100644
index 000000000..f90922eea
--- /dev/null
+++ b/PLUGINS/src/epgtableid0/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
new file mode 100644
index 000000000..7f732add0
--- /dev/null
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'epgtableid0' Revision History
+-----------------------------------------
+
+2012-03-10: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
new file mode 100644
index 000000000..5653e28e4
--- /dev/null
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -0,0 +1,114 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2012/03/10 14:23:58 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
+#
+PLUGIN = epgtableid0
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### The directory environment:
+
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
+
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
+
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+### Dependencies:
+
+MAKEDEP = $(CXX) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Internationalization (I18N):
+
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
+### Targets:
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+dist: $(I18Npo) clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/PLUGINS/src/epgtableid0/README b/PLUGINS/src/epgtableid0/README
new file mode 100644
index 000000000..8c2436dd5
--- /dev/null
+++ b/PLUGINS/src/epgtableid0/README
@@ -0,0 +1,19 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@tvdr.de>
+
+Project's homepage:          http://www.tvdr.de
+
+Latest version available at: http://www.tvdr.de
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
+
+Description:
+
+The special handling of EPG events with table id 0x00 has been dropped
+in VDR version 1.7.26, and replaced by a more felxible "EPG Handler"
+concept. You can use this plugin to get the previous functionality back.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
new file mode 100644
index 000000000..d400b48cc
--- /dev/null
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -0,0 +1,98 @@
+/*
+ * epgtableid0.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: epgtableid0.c 1.1 2012/03/10 15:10:43 kls Exp $
+ */
+
+#include <vdr/epg.h>
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
+
+// --- cTable0Handler --------------------------------------------------------
+
+class cTable0Handler : public cEpgHandler {
+private:
+  bool Ignore(cEvent *Event) { return Event->TableID() == 0x00; }
+public:
+  virtual bool SetEventID(cEvent *Event, tEventID EventID);
+  virtual bool SetStartTime(cEvent *Event, time_t StartTime);
+  virtual bool SetDuration(cEvent *Event, int Duration);
+  virtual bool SetTitle(cEvent *Event, const char *Title);
+  virtual bool SetShortText(cEvent *Event, const char *ShortText);
+  virtual bool SetDescription(cEvent *Event, const char *Description);
+  virtual bool SetContents(cEvent *Event, uchar *Contents);
+  virtual bool SetParentalRating(cEvent *Event, int ParentalRating);
+  virtual bool SetVps(cEvent *Event, time_t Vps);
+  virtual bool FixEpgBugs(cEvent *Event);
+  };
+
+bool cTable0Handler::SetEventID(cEvent *Event, tEventID EventID)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetStartTime(cEvent *Event, time_t StartTime)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetDuration(cEvent *Event, int Duration)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetTitle(cEvent *Event, const char *Title)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetShortText(cEvent *Event, const char *ShortText)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetDescription(cEvent *Event, const char *Description)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetContents(cEvent *Event, uchar *Contents)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetParentalRating(cEvent *Event, int ParentalRating)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::SetVps(cEvent *Event, time_t Vps)
+{
+  return Ignore(Event);
+}
+
+bool cTable0Handler::FixEpgBugs(cEvent *Event)
+{
+  return Ignore(Event);
+}
+
+// --- cPluginEpgtableid0 ----------------------------------------------------
+
+class cPluginEpgtableid0 : public cPlugin {
+public:
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual bool Initialize(void);
+  };
+
+bool cPluginEpgtableid0::Initialize(void)
+{
+  new cTable0Handler;
+  return true;
+}
+
+VDRPLUGINCREATOR(cPluginEpgtableid0); // Don't touch this!
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index 692f6208e..87b9413ea 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'rcu' Revision History
 2012-02-27: Version 0.0.1
 
 - Initial revision.
+
+2012-03-07: Version 0.0.2
+
+- Added new parameter LiveView to ChannelSwitch().
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index f0abeddee..79f461228 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 1.1 2012/02/27 11:49:51 kls Exp $
+ * $Id: rcu.c 1.2 2012/03/07 14:22:44 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
@@ -44,7 +44,7 @@ class cRcuRemote : public cRemote, private cThread, private cStatus {
   void SetString(const char *s);
   bool DetectCode(unsigned char *Code);
   virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
   virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
 public:
   cRcuRemote(const char *DeviceName);
@@ -353,9 +353,9 @@ bool cRcuRemote::DetectCode(unsigned char *Code)
   return false;
 }
 
-void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
 {
-  if (ChannelNumber && Device->IsPrimaryDevice())
+  if (ChannelNumber && LiveView)
      SetNumber(cDevice::CurrentChannel());
 }
 
diff --git a/channels.c b/channels.c
index b9204f28e..04e1e3786 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.19 2011/08/26 12:44:21 kls Exp $
+ * $Id: channels.c 2.20 2012/03/07 16:50:15 kls Exp $
  */
 
 #include "channels.h"
@@ -619,7 +619,8 @@ bool cChannel::Parse(const char *s)
                        }
                     else
                        *alangs[NumApids] = 0;
-                    apids[NumApids++] = strtol(q, NULL, 10);
+                    if ((apids[NumApids] = strtol(q, NULL, 10)) != 0)
+                       NumApids++;
                     }
                  else
                     esyslog("ERROR: too many APIDs!"); // no need to set ok to 'false'
@@ -647,7 +648,8 @@ bool cChannel::Parse(const char *s)
                           }
                        else
                           *dlangs[NumDpids] = 0;
-                       dpids[NumDpids++] = strtol(q, NULL, 10);
+                       if ((dpids[NumDpids] = strtol(q, NULL, 10)) != 0)
+                          NumDpids++;
                        }
                     else
                        esyslog("ERROR: too many DPIDs!"); // no need to set ok to 'false'
diff --git a/config.h b/config.h
index 771996802..af5a76ff8 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.43 2012/02/29 12:28:01 kls Exp $
+ * $Id: config.h 2.44 2012/03/03 13:25:22 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.25"
-#define VDRVERSNUM   10725  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.26"
+#define VDRVERSNUM   10726  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.25"
-#define APIVERSNUM   10725  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.26"
+#define APIVERSNUM   10726  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 663f91ad8..8c527aac7 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.55 2012/03/03 11:43:05 kls Exp $
+ * $Id: device.c 2.57 2012/03/07 14:17:49 kls Exp $
  */
 
 #include "device.h"
@@ -68,7 +68,6 @@ int cDevice::nextCardIndex = 0;
 int cDevice::currentChannel = 1;
 cDevice *cDevice::device[MAXDEVICES] = { NULL };
 cDevice *cDevice::primaryDevice = NULL;
-cDevice *cDevice::avoidDevice = NULL;
 cList<cDeviceHook> cDevice::deviceHooks;
 
 cDevice::cDevice(void)
@@ -228,8 +227,6 @@ static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
 
 cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView, bool Query)
 {
-  cDevice *AvoidDevice = avoidDevice;
-  avoidDevice = NULL;
   // Collect the current priorities of all CAM slots that can decrypt the channel:
   int NumCamSlots = CamSlots.Count();
   int SlotPriority[NumCamSlots];
@@ -259,8 +256,6 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
       if (NumUsableSlots && SlotPriority[j] > MAXPRIORITY)
          continue; // there is no CAM available in this slot
       for (int i = 0; i < numDevices; i++) {
-          if (device[i] == AvoidDevice)
-             continue; // this device shall be temporarily avoided
           if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
              continue; // a specific card was requested, but not this one
           if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
@@ -319,6 +314,26 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
   return d;
 }
 
+cDevice *cDevice::GetDeviceForTransponder(const cChannel *Channel, int Priority)
+{
+  cDevice *Device = NULL;
+  for (int i = 0; i < cDevice::NumDevices(); i++) {
+      if (cDevice *d = cDevice::GetDevice(i)) {
+         if (d->IsTunedToTransponder(Channel))
+            return d; // if any device is tuned to the transponder, we're done
+         if (d->ProvidesTransponder(Channel)) {
+            if (d->MaySwitchTransponder(Channel))
+               Device = d; // this device may switch to the transponder without disturbing any receiver or live view
+            else if (!d->Occupied()) {
+               if (d->Priority() < Priority && (!Device || d->Priority() < Device->Priority()))
+                  Device = d; // use this one only if no other with less impact can be found
+               }
+            }
+         }
+      }
+  return Device;
+}
+
 bool cDevice::HasCi(void)
 {
   return false;
@@ -708,7 +723,7 @@ bool cDevice::SwitchChannel(int Direction)
 
 eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 {
-  cStatus::MsgChannelSwitch(this, 0);
+  cStatus::MsgChannelSwitch(this, 0, LiveView);
 
   if (LiveView) {
      StopReplay();
@@ -778,7 +793,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
            EnsureAudioTrack(true);
         EnsureSubtitleTrack();
         }
-     cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
+     cStatus::MsgChannelSwitch(this, Channel->Number(), LiveView); // only report status if channel switch successfull
      }
 
   return Result;
diff --git a/device.h b/device.h
index 23aea9700..0d9ac3ac0 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.36 2012/03/02 10:23:13 kls Exp $
+ * $Id: device.h 2.37 2012/03/06 12:13:46 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -109,7 +109,6 @@ class cDevice : public cThread {
   static int useDevice;
   static cDevice *device[MAXDEVICES];
   static cDevice *primaryDevice;
-  static cDevice *avoidDevice;
 public:
   static int NumDevices(void) { return numDevices; }
          ///< Returns the total number of devices.
@@ -158,9 +157,11 @@ class cDevice : public cThread {
          ///< in order to just determine whether a device is available for the given
          ///< Channel.
          ///< See also ProvidesChannel().
-  static void SetAvoidDevice(cDevice *Device) { avoidDevice = Device; }
-         ///< Sets the given Device to be temporarily avoided in the next call to
-         ///< GetDevice(const cChannel, int, bool).
+  static cDevice *GetDeviceForTransponder(const cChannel *Channel, int Priority);
+         ///< Returns a device that is not currently "occupied" and can be tuned to
+         ///< the transponder of the given Channel, without disturbing any receiver
+         ///< at priorities higher or equal to Priority.
+         ///< If no such device is currently available, NULL will be returned.
   static void Shutdown(void);
          ///< Closes down all devices.
          ///< Must be called at the end of the program.
diff --git a/dvbdevice.c b/dvbdevice.c
index 1987223e0..4c9268f46 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.65 2012/02/29 12:23:43 kls Exp $
+ * $Id: dvbdevice.c 2.67 2012/03/08 09:49:58 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -420,7 +420,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
   if (cDvbTuner *t = bondedTuner) {
      cString BondingParams = GetBondingParams(Channel);
      do {
-        if (t->device->Receiving() || ConsiderOccupied && t->device->Occupied()) {
+        if (t->device->Priority() > IDLEPRIORITY || ConsiderOccupied && t->device->Occupied()) {
            if (strcmp(BondingParams, t->GetBondingParams()) != 0)
               return false;
            }
@@ -1446,7 +1446,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
      if (Priority >= 0) {
         if (Receiving()) {
            if (dvbTuner->IsTunedTo(Channel)) {
-              if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
+              if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0)) || Channel->Dpid(0) && !HasPid(Channel->Dpid(0))) {
                  if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
                     if (CamSlot()->CanDecrypt(Channel))
                        result = true;
diff --git a/eit.c b/eit.c
index cc10003d1..1b8c84c40 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.13 2012/02/25 15:25:51 kls Exp $
+ * $Id: eit.c 2.15 2012/03/10 14:43:52 kls Exp $
  */
 
 #include "eit.h"
@@ -36,20 +36,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   cChannel *channel = Channels.GetByChannelID(channelID, true);
   if (!channel)
      return; // only collect data for known channels
+  if (EpgHandlers.IgnoreChannel(channel))
+     return;
 
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
-  if (pSchedule) {
-     if (cEvent *Event = pSchedule->Events()->First()) {
-        if (Event->TableID() == 0x00)
-           return; // never touch schedules with events from external sources
-        }
-     }
-  else
-     return;
 
   bool Empty = true;
   bool Modified = false;
-  bool HasExternalData = false;
   time_t SegmentStart = 0;
   time_t SegmentEnd = 0;
   time_t Now = time(NULL);
@@ -61,7 +54,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
-      bool ExternalData = false;
+      if (EpgHandlers.HandleEitEvent(pSchedule, &SiEitEvent, Tid, getVersionNumber()))
+         continue; // an EPG handler has done all of the processing
       time_t StartTime = SiEitEvent.getStartTime();
       int Duration = SiEitEvent.getDuration();
       // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
@@ -80,23 +74,17 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          // If we don't have that event yet, we create a new one.
          // Otherwise we copy the information into the existing event anyway, because the data might have changed.
          pEvent = newEvent = new cEvent(SiEitEvent.getEventId());
-         if (!pEvent)
-            continue;
+         newEvent->SetStartTime(StartTime);
+         newEvent->SetDuration(Duration);
+         pSchedule->AddEvent(newEvent);
          }
       else {
          // We have found an existing event, either through its event ID or its start time.
          pEvent->SetSeen();
-         // If the existing event has a zero table ID it was defined externally and shall
-         // not be overwritten.
-         uchar TableID = pEvent->TableID();
-         if (TableID == 0x00) {
-            if (pEvent->Version() == getVersionNumber())
-               continue;
-            HasExternalData = ExternalData = true;
-            }
+         uchar TableID = max(pEvent->TableID(), uchar(0x4E)); // for backwards compatibility, table ids less than 0x4E are treated as if they were "present"
          // If the new event has a higher table ID, let's skip it.
          // The lower the table ID, the more "current" the information.
-         else if (Tid > TableID)
+         if (Tid > TableID)
             continue;
          // If the new event comes from the same table and has the same version number
          // as the existing one, let's skip it to avoid unnecessary work.
@@ -106,21 +94,20 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
          else if (Tid == TableID && pEvent->Version() == getVersionNumber())
             continue;
+         EpgHandlers.SetEventID(pEvent, SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
+         EpgHandlers.SetStartTime(pEvent, StartTime);
+         EpgHandlers.SetDuration(pEvent, Duration);
          }
-      if (!ExternalData) {
-         pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
+      if (pEvent->TableID() > 0x4E) // for backwards compatibility, table ids less than 0x4E are never overwritten
          pEvent->SetTableID(Tid);
-         pEvent->SetStartTime(StartTime);
-         pEvent->SetDuration(Duration);
-         }
-      if (newEvent)
-         pSchedule->AddEvent(newEvent);
       if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
          if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
             pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
          }
-      if (OnlyRunningStatus)
+      if (OnlyRunningStatus) {
+         pEvent->SetVersion(0xFF); // we have already changed the table id above, so set the version to an invalid value to make sure the next full run will be executed
          continue; // do this before setting the version, so that the full update can be done later
+         }
       pEvent->SetVersion(getVersionNumber());
 
       int LanguagePreferenceShort = -1;
@@ -132,10 +119,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       cLinkChannels *LinkChannels = NULL;
       cComponents *Components = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
-          if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag) {
-             delete d;
-             continue;
-             }
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
                  SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
@@ -172,7 +155,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                         NumContents++;
                         }
                      }
-                 pEvent->SetContents(Contents);
+                 EpgHandlers.SetContents(pEvent, Contents);
                  }
                  break;
             case SI::ParentalRatingDescriptorTag: {
@@ -191,7 +174,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                           case 0x13:          ParentalRating = 16; break;
                           default:            ParentalRating = 0;
                           }
-                        pEvent->SetParentalRating(ParentalRating);
+                        EpgHandlers.SetParentalRating(pEvent, ParentalRating);
                         }
                      }
                  }
@@ -210,7 +193,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  else if (month == 0 && t.tm_mon == 11) // current month is jan, but event is in dec
                     t.tm_year--;
                  time_t vps = mktime(&t);
-                 pEvent->SetVps(vps);
+                 EpgHandlers.SetVps(pEvent, vps);
                  }
                  break;
             case SI::TimeShiftedEventDescriptorTag: {
@@ -221,9 +204,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  rEvent = (cEvent *)rSchedule->GetEvent(tsed->getReferenceEventId());
                  if (!rEvent)
                     break;
-                 pEvent->SetTitle(rEvent->Title());
-                 pEvent->SetShortText(rEvent->ShortText());
-                 pEvent->SetDescription(rEvent->Description());
+                 EpgHandlers.SetTitle(pEvent, rEvent->Title());
+                 EpgHandlers.SetShortText(pEvent, rEvent->ShortText());
+                 EpgHandlers.SetDescription(pEvent, rEvent->Description());
                  }
                  break;
             case SI::LinkageDescriptorTag: {
@@ -281,30 +264,30 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       if (!rEvent) {
          if (ShortEventDescriptor) {
             char buffer[Utf8BufSize(256)];
-            pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
-            pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
+            EpgHandlers.SetTitle(pEvent, ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
+            EpgHandlers.SetShortText(pEvent, ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
-         else if (!HasExternalData) {
-            pEvent->SetTitle(NULL);
-            pEvent->SetShortText(NULL);
+         else {
+            EpgHandlers.SetTitle(pEvent, NULL);
+            EpgHandlers.SetShortText(pEvent, NULL);
             }
          if (ExtendedEventDescriptors) {
             char buffer[Utf8BufSize(ExtendedEventDescriptors->getMaximumTextLength(": ")) + 1];
-            pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
+            EpgHandlers.SetDescription(pEvent, ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
-         else if (!HasExternalData)
-            pEvent->SetDescription(NULL);
+         else
+            EpgHandlers.SetDescription(pEvent, NULL);
          }
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
 
       pEvent->SetComponents(Components);
 
-      if (!HasExternalData)
-         pEvent->FixEpgBugs();
+      EpgHandlers.FixEpgBugs(pEvent);
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
       Modified = true;
+      EpgHandlers.HandleEvent(pEvent);
       }
   if (Tid == 0x4E) {
      if (Empty && getSectionNumber() == 0)
@@ -315,9 +298,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   if (OnlyRunningStatus)
      return;
   if (Modified) {
-     pSchedule->Sort();
-     if (!HasExternalData)
-        pSchedule->DropOutdated(SegmentStart, SegmentEnd, Tid, getVersionNumber());
+     EpgHandlers.SortSchedule(pSchedule);
+     EpgHandlers.DropOutdated(pSchedule, SegmentStart, SegmentEnd, Tid, getVersionNumber());
      Schedules->SetModified(pSchedule);
      }
 }
diff --git a/eitscan.c b/eitscan.c
index 7e48bfef7..0ebaaeefa 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.5 2011/09/25 14:58:55 kls Exp $
+ * $Id: eitscan.c 2.6 2012/03/07 13:54:34 kls Exp $
  */
 
 #include "eitscan.h"
@@ -92,7 +92,6 @@ cEITScanner EITScanner;
 cEITScanner::cEITScanner(void)
 {
   lastScan = lastActivity = time(NULL);
-  currentDevice = NULL;
   currentChannel = 0;
   scanList = NULL;
   transponderList = NULL;
@@ -159,10 +158,8 @@ void cEITScanner::Process(void)
                                            Skins.Message(mtInfo, tr("Starting EPG scan"));
                                            }
                                         }
-                                     currentDevice = Device;//XXX see also dvbdevice.c!!!
                                      //dsyslog("EIT scan: device %d  source  %-8s tp %5d", Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder());
                                      Device->SwitchChannel(Channel, false);
-                                     currentDevice = NULL;
                                      scanList->Del(ScanData);
                                      AnyDeviceSwitched = true;
                                      break;
diff --git a/eitscan.h b/eitscan.h
index fb2d3ff65..2dd24d72e 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 2.0 2005/09/04 10:51:35 kls Exp $
+ * $Id: eitscan.h 2.1 2012/03/07 13:54:16 kls Exp $
  */
 
 #ifndef __EITSCAN_H
@@ -24,7 +24,6 @@ class cEITScanner {
          ScanTimeout = 20
        };
   time_t lastScan, lastActivity;
-  cDevice *currentDevice;
   int currentChannel;
   cScanList *scanList;
   cTransponderList *transponderList;
@@ -32,7 +31,6 @@ class cEITScanner {
   cEITScanner(void);
   ~cEITScanner();
   bool Active(void) { return currentChannel || lastActivity == 0; }
-  bool UsesDevice(const cDevice *Device) { return currentDevice == Device; }
   void AddTransponder(cChannel *Channel);
   void ForceScan(void);
   void Activity(void);
diff --git a/epg.c b/epg.c
index 2ff105285..f5c9b3a3b 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.11 2012/02/13 14:58:19 kls Exp $
+ * $Id: epg.c 2.12 2012/03/10 13:14:27 kls Exp $
  */
 
 #include "epg.h"
@@ -114,7 +114,7 @@ cEvent::cEvent(tEventID EventID)
 {
   schedule = NULL;
   eventID = EventID;
-  tableID = 0;
+  tableID = 0xFF; // actual table ids are 0x4E..0x60
   version = 0xFF; // actual version numbers are 0..31
   runningStatus = SI::RunningStatusUndefined;
   title = NULL;
@@ -1296,3 +1296,153 @@ void cEpgDataReader::Action(void)
 {
   cSchedules::Read();
 }
+
+// --- cEpgHandler -----------------------------------------------------------
+
+cEpgHandler::cEpgHandler(void)
+{
+  EpgHandlers.Add(this);
+}
+
+cEpgHandler::~cEpgHandler()
+{
+  EpgHandlers.Del(this, false);
+}
+
+// --- cEpgHandlers ----------------------------------------------------------
+
+cEpgHandlers EpgHandlers;
+
+bool cEpgHandlers::IgnoreChannel(const cChannel *Channel)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->IgnoreChannel(Channel))
+         return true;
+      }
+  return false;
+}
+
+bool cEpgHandlers::HandleEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->HandleEitEvent(Schedule, EitEvent, TableID, Version))
+         return true;
+      }
+  return false;
+}
+
+void cEpgHandlers::SetEventID(cEvent *Event, tEventID EventID)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetEventID(Event, EventID))
+         return;
+      }
+  Event->SetEventID(EventID);
+}
+
+void cEpgHandlers::SetTitle(cEvent *Event, const char *Title)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetTitle(Event, Title))
+         return;
+      }
+  Event->SetTitle(Title);
+}
+
+void cEpgHandlers::SetShortText(cEvent *Event, const char *ShortText)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetShortText(Event, ShortText))
+         return;
+      }
+  Event->SetShortText(ShortText);
+}
+
+void cEpgHandlers::SetDescription(cEvent *Event, const char *Description)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetDescription(Event, Description))
+         return;
+      }
+  Event->SetDescription(Description);
+}
+
+void cEpgHandlers::SetContents(cEvent *Event, uchar *Contents)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetContents(Event, Contents))
+         return;
+      }
+  Event->SetContents(Contents);
+}
+
+void cEpgHandlers::SetParentalRating(cEvent *Event, int ParentalRating)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetParentalRating(Event, ParentalRating))
+         return;
+      }
+  Event->SetParentalRating(ParentalRating);
+}
+
+void cEpgHandlers::SetStartTime(cEvent *Event, time_t StartTime)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetStartTime(Event, StartTime))
+         return;
+      }
+  Event->SetStartTime(StartTime);
+}
+
+void cEpgHandlers::SetDuration(cEvent *Event, int Duration)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetDuration(Event, Duration))
+         return;
+      }
+  Event->SetDuration(Duration);
+}
+
+void cEpgHandlers::SetVps(cEvent *Event, time_t Vps)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetVps(Event, Vps))
+         return;
+      }
+  Event->SetVps(Vps);
+}
+
+void cEpgHandlers::FixEpgBugs(cEvent *Event)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->FixEpgBugs(Event))
+         return;
+      }
+  Event->FixEpgBugs();
+}
+
+void cEpgHandlers::HandleEvent(cEvent *Event)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->HandleEvent(Event))
+         break;
+      }
+}
+
+void cEpgHandlers::SortSchedule(cSchedule *Schedule)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SortSchedule(Schedule))
+         return;
+      }
+  Schedule->Sort();
+}
+
+void cEpgHandlers::DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->DropOutdated(Schedule, SegmentStart, SegmentEnd, TableID, Version))
+         return;
+      }
+  Schedule->DropOutdated(SegmentStart, SegmentEnd, TableID, Version);
+}
diff --git a/epg.h b/epg.h
index 580cbe6b7..e4cec9b92 100644
--- a/epg.h
+++ b/epg.h
@@ -7,13 +7,14 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.7 2012/02/26 13:58:26 kls Exp $
+ * $Id: epg.h 2.8 2012/03/10 13:50:10 kls Exp $
  */
 
 #ifndef __EPG_H
 #define __EPG_H
 
 #include "channels.h"
+#include "libsi/section.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -221,4 +222,68 @@ class cEpgDataReader : public cThread {
 
 void ReportEpgBugFixStats(bool Reset = false);
 
+class cEpgHandler : public cListObject {
+public:
+  cEpgHandler(void);
+          ///< Constructs a new EPG handler and adds it to the list of EPG handlers.
+          ///< Whenever an event is received from the EIT data stream, the EPG
+          ///< handlers are queried in the order they have been created.
+          ///< As soon as one of the EPG handlers returns true in a member function,
+          ///< none of the remaining handlers will be queried. If none of the EPG
+          ///< handlers returns true in a particular call, the default processing
+          ///< will take place.
+          ///< EPG handlers will be deleted automatically at the end of the program.
+  virtual ~cEpgHandler();
+  virtual bool IgnoreChannel(const cChannel *Channel) { return false; }
+          ///< Before any EIT data for the given Channel is processed, the EPG handlers
+          ///< are asked whether this Channel shall be completely ignored. If any of
+          ///< the EPG handlers returns true in this function, no EIT data at all will
+          ///< be processed for this Channel.
+  virtual bool HandleEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version) { return false; }
+          ///< Before the raw EitEvent for the given Schedule is processed, the
+          ///< EPG handlers are queried to see if any of them would like to do the
+          ///< complete processing by itself. TableID and Version are from the
+          ///< incoming section data.
+  virtual bool SetEventID(cEvent *Event, tEventID EventID) { return false; }
+  virtual bool SetTitle(cEvent *Event, const char *Title) { return false; }
+  virtual bool SetShortText(cEvent *Event, const char *ShortText) { return false; }
+  virtual bool SetDescription(cEvent *Event, const char *Description) { return false; }
+  virtual bool SetContents(cEvent *Event, uchar *Contents) { return false; }
+  virtual bool SetParentalRating(cEvent *Event, int ParentalRating) { return false; }
+  virtual bool SetStartTime(cEvent *Event, time_t StartTime) { return false; }
+  virtual bool SetDuration(cEvent *Event, int Duration) { return false; }
+  virtual bool SetVps(cEvent *Event, time_t Vps) { return false; }
+  virtual bool FixEpgBugs(cEvent *Event) { return false; }
+          ///< Fixes some known problems with EPG data.
+  virtual bool HandleEvent(cEvent *Event) { return false; }
+          ///< After all modifications of the Event have been done, the EPG handler
+          ///< can take a final look at it.
+  virtual bool SortSchedule(cSchedule *Schedule) { return false; }
+          ///< Sorts the Schedule after the complete table has been processed.
+  virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
+          ///< Takes a look at all EPG events between SegmentStart and SegmentEnd and
+          ///< drops outdated events.
+  };
+
+class cEpgHandlers : public cList<cEpgHandler> {
+public:
+  bool IgnoreChannel(const cChannel *Channel);
+  bool HandleEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version);
+  void SetEventID(cEvent *Event, tEventID EventID);
+  void SetTitle(cEvent *Event, const char *Title);
+  void SetShortText(cEvent *Event, const char *ShortText);
+  void SetDescription(cEvent *Event, const char *Description);
+  void SetContents(cEvent *Event, uchar *Contents);
+  void SetParentalRating(cEvent *Event, int ParentalRating);
+  void SetStartTime(cEvent *Event, time_t StartTime);
+  void SetDuration(cEvent *Event, int Duration);
+  void SetVps(cEvent *Event, time_t Vps);
+  void FixEpgBugs(cEvent *Event);
+  void HandleEvent(cEvent *Event);
+  void SortSchedule(cSchedule *Schedule);
+  void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
+  };
+
+extern cEpgHandlers EpgHandlers;
+
 #endif //__EPG_H
diff --git a/menu.c b/menu.c
index 7866bc3d2..260f97022 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.39 2012/03/02 10:33:17 kls Exp $
+ * $Id: menu.c 2.42 2012/03/08 13:32:44 kls Exp $
  */
 
 #include "menu.h"
@@ -903,7 +903,7 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
   file = NULL;
-  firstday = NULL;
+  day = firstday = NULL;
   timer = Timer;
   addIfConfirmed = New;
   if (timer) {
@@ -913,7 +913,7 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
      channel = data.Channel()->Number();
      Add(new cMenuEditBitItem( tr("Active"),       &data.flags, tfActive));
      Add(new cMenuEditChanItem(tr("Channel"),      &channel));
-     Add(new cMenuEditDateItem(tr("Day"),          &data.day, &data.weekdays));
+     Add(day = new cMenuEditDateItem(tr("Day"),    &data.day, &data.weekdays));
      Add(new cMenuEditTimeItem(tr("Start"),        &data.start));
      Add(new cMenuEditTimeItem(tr("Stop"),         &data.stop));
      Add(new cMenuEditBitItem( tr("VPS"),          &data.flags, tfVps));
@@ -935,7 +935,7 @@ cMenuEditTimer::~cMenuEditTimer()
 
 void cMenuEditTimer::SetHelpKeys(void)
 {
-  SetHelp(tr("Button$Folder"));
+  SetHelp(tr("Button$Folder"), data.weekdays ? tr("Button$Once") : tr("Button$Repeating"));
 }
 
 void cMenuEditTimer::SetFirstDayItem(void)
@@ -1001,7 +1001,14 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                      }
                      return osBack;
        case kRed:    return AddSubMenu(new cMenuFolder(tr("Select folder"), &Folders, data.file));
-       case kGreen:
+       case kGreen:  if (day) {
+                        day->ToggleRepeating();
+                        SetCurrent(day);
+                        SetFirstDayItem();
+                        SetHelpKeys();
+                        Display();
+                        }
+                     return osContinue;
        case kYellow:
        case kBlue:   return osContinue;
        default: break;
@@ -4513,6 +4520,8 @@ void cReplayControl::ShowTimed(int Seconds)
      shown = ShowProgress(true);
      timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0;
      }
+  else if (timeoutShow && Seconds > 0)
+     timeoutShow = time(NULL) + Seconds;
 }
 
 void cReplayControl::Show(void)
@@ -4531,6 +4540,7 @@ void cReplayControl::Hide(void)
      lastPlay = lastForward = false;
      lastSpeed = -2; // an invalid value
      timeSearchActive = false;
+     timeoutShow = 0;
      }
 }
 
@@ -4694,12 +4704,12 @@ void cReplayControl::MarkToggle(void)
         marks.Del(m);
      else {
         marks.Add(Current);
-        ShowTimed(2);
         bool Play, Forward;
         int Speed;
         if (GetReplayMode(Play, Forward, Speed) && !Play)
            Goto(Current, true);
         }
+     ShowTimed(2);
      marks.Save();
      }
 }
diff --git a/menu.h b/menu.h
index c74d8c253..bb05b3b34 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.4 2012/02/19 10:51:56 kls Exp $
+ * $Id: menu.h 2.5 2012/03/08 13:11:40 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -76,6 +76,7 @@ class cMenuEditTimer : public cOsdMenu {
   int channel;
   bool addIfConfirmed;
   cMenuEditStrItem *file;
+  cMenuEditDateItem *day;
   cMenuEditDateItem *firstday;
   eOSState SetFolder(void);
   void SetFirstDayItem(void);
diff --git a/menuitems.c b/menuitems.c
index dc3ea7158..6a6d88d61 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.11 2012/03/02 15:49:57 kls Exp $
+ * $Id: menuitems.c 2.12 2012/03/08 13:22:22 kls Exp $
  */
 
 #include "menuitems.h"
@@ -886,6 +886,24 @@ void cMenuEditDateItem::Set(void)
   SetValue(buf);
 }
 
+void cMenuEditDateItem::ToggleRepeating(void)
+{
+  if (weekdays) {
+     if (*weekdays) {
+        *value = cTimer::SetTime(oldvalue ? oldvalue : time(NULL), 0);
+        oldvalue = 0;
+        *weekdays = 0;
+        }
+     else {
+        *weekdays = days[cTimer::GetWDay(*value)];
+        dayindex = FindDayIndex(*weekdays);
+        oldvalue = *value;
+        *value = 0;
+        }
+     Set();
+     }
+}
+
 eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
 {
   eOSState state = cMenuEditItem::ProcessKey(Key);
@@ -937,17 +955,8 @@ eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
      else if (weekdays) {
         if (Key == k0) {
            // Toggle between weekdays and single day:
-           if (*weekdays) {
-              *value = cTimer::SetTime(oldvalue ? oldvalue : now, 0);
-              oldvalue = 0;
-              *weekdays = 0;
-              }
-           else {
-              *weekdays = days[cTimer::GetWDay(*value)];
-              dayindex = FindDayIndex(*weekdays);
-              oldvalue = *value;
-              *value = 0;
-              }
+           ToggleRepeating();
+           return osContinue; // ToggleRepeating) has already called Set()
            }
         else if (k1 <= Key && Key <= k7) {
            // Toggle individual weekdays:
diff --git a/menuitems.h b/menuitems.h
index db31bda40..3f2e4fd43 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.6 2012/03/02 15:49:57 kls Exp $
+ * $Id: menuitems.h 2.7 2012/03/08 12:38:46 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -168,6 +168,7 @@ class cMenuEditDateItem : public cMenuEditItem {
   virtual void Set(void);
 public:
   cMenuEditDateItem(const char *Name, time_t *Value, int *WeekDays = NULL);
+  void ToggleRepeating(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/osd.c b/osd.c
index f9a76428d..49b7dce1c 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.25 2012/03/02 10:48:19 kls Exp $
+ * $Id: osd.c 2.27 2012/03/05 10:28:01 kls Exp $
  */
 
 #include "osd.h"
@@ -254,6 +254,7 @@ cBitmap::cBitmap(int Width, int Height, int Bpp, int X0, int Y0)
   bitmap = NULL;
   x0 = X0;
   y0 = Y0;
+  width = height = 0;
   SetSize(Width, Height);
 }
 
@@ -262,6 +263,7 @@ cBitmap::cBitmap(const char *FileName)
   bitmap = NULL;
   x0 = 0;
   y0 = 0;
+  width = height = 0;
   LoadXpm(FileName);
 }
 
@@ -270,6 +272,7 @@ cBitmap::cBitmap(const char *const Xpm[])
   bitmap = NULL;
   x0 = 0;
   y0 = 0;
+  width = height = 0;
   SetXpm(Xpm);
 }
 
@@ -1701,11 +1704,13 @@ void cOsd::DestroyPixmap(cPixmap *Pixmap)
 
 cPixmap *cOsd::AddPixmap(cPixmap *Pixmap)
 {
-  LOCK_PIXMAPS;
-  if (numPixmaps < MAXOSDPIXMAPS)
-     return pixmaps[numPixmaps++] = Pixmap;
-  else
-     esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS);
+  if (Pixmap) {
+     LOCK_PIXMAPS;
+     if (numPixmaps < MAXOSDPIXMAPS)
+        return pixmaps[numPixmaps++] = Pixmap;
+     else
+        esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS);
+     }
   return NULL;
 }
 
diff --git a/po/ar.po b/po/ar.po
index f01718d7f..4690de6de 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -660,6 +660,12 @@ msgstr "ملف"
 msgid "Button$Folder"
 msgstr "الموءقت"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "اليوم الاول"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3e23df961..ed4612409 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -651,6 +651,12 @@ msgstr "Arxiu"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Primer dia"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index b37ea0bad..b5856da9a 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -650,6 +650,12 @@ msgstr "Soubor"
 msgid "Button$Folder"
 msgstr "Složka"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "První den"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 84eff6026..1d6535eb8 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "Fil"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "F�rste dag"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 5b185e957..30af349c1 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "Datei"
 msgid "Button$Folder"
 msgstr "Verzeichnis"
 
+msgid "Button$Once"
+msgstr "Einmalig"
+
+msgid "Button$Repeating"
+msgstr "Wiederholend"
+
 msgid "First day"
 msgstr "Erster Tag"
 
@@ -1334,4 +1340,4 @@ msgstr "Taste dr
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR wird in %s Minuten ausschalten"
+msgstr "VDR wird in %s Minuten abgeschaltet"
diff --git a/po/el_GR.po b/po/el_GR.po
index 4c4ff1236..10fba4f50 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "����� ����"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index ffcc1b8bd..f7fdf4730 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -649,6 +649,12 @@ msgstr "Fichero"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Primer d�a"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index e4a9e19ea..ba288d79f 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "Fail"
 msgid "Button$Folder"
 msgstr "Kaust"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Esimene päev"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 365862dfd..f8fcaf1f9 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -651,6 +651,12 @@ msgstr "Tiedosto"
 msgid "Button$Folder"
 msgstr "Kansio"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "1. päivä"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e8577be65..1f57d791e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -654,6 +654,12 @@ msgstr "Fichier"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Premier jour"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 86d93496f..4db904879 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -650,6 +650,12 @@ msgstr "Datoteka"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Prvi dan"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index cfd20bd1e..10685165b 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -651,6 +651,12 @@ msgstr "File"
 msgid "Button$Folder"
 msgstr "K�nyvt�r"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Els� nap"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 3cbd2c03e..bbeba537d 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2012-01-15 19:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -655,6 +655,12 @@ msgstr "Nome"
 msgid "Button$Folder"
 msgstr "Cartella"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "1° giorno"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index c7e2bb784..a2abe00e6 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "Failas"
 msgid "Button$Folder"
 msgstr "Katalogas"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Pirma diena"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index f8ac586bf..afb2e6cbe 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -649,6 +649,12 @@ msgstr "Датотека"
 msgid "Button$Folder"
 msgstr "Директориум"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Прв ден"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index d96ff1144..27ebaa7c5 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -652,6 +652,12 @@ msgstr "Bestandnaam"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Eerste dag"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 63643958c..182209e19 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -649,6 +649,12 @@ msgstr "Filnavn"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "F�rste dag"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 40ef3011f..072fae9a7 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -649,6 +649,12 @@ msgstr "Plik"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Pierwszy dzie�"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b65937c9f..9090178d6 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -649,6 +649,12 @@ msgstr "Ficheiro"
 msgid "Button$Folder"
 msgstr "Pasta"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "1� dia"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 5ee348c90..1d5dc6029 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -651,6 +651,12 @@ msgstr "Fi
 msgid "Button$Folder"
 msgstr "Director"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Prima zi"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 94e1a17b4..156b74538 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -649,6 +649,12 @@ msgstr "
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "������ ����"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 767789529..7f9a7f0e0 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "S
 msgid "Button$Folder"
 msgstr "Zlo�ka"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Prv� de�"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 97b41e382..6c87e94c8 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -649,6 +649,12 @@ msgstr "Datoteka"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Prvi dan"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index f86250f67..ee6f4c5d3 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -654,6 +654,12 @@ msgstr "Datoteka"
 msgid "Button$Folder"
 msgstr "Taster$Direktorij"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Prvi dan"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index fedf8d8ed..77a5c7758 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -651,6 +651,12 @@ msgstr "Filnamn"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "F�rsta dag"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 8275596ed..bfc86242f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "K
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "�lk g�n"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 1e10ad7ee..136282351 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -648,6 +648,12 @@ msgstr "Файл"
 msgid "Button$Folder"
 msgstr "Каталог"
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "Перший день"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6504bafba..4ff86cf18 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-02-25 14:32+0100\n"
+"POT-Creation-Date: 2012-03-08 14:37+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -651,6 +651,12 @@ msgstr "文件"
 msgid "Button$Folder"
 msgstr ""
 
+msgid "Button$Once"
+msgstr ""
+
+msgid "Button$Repeating"
+msgstr ""
+
 msgid "First day"
 msgstr "第一天"
 
diff --git a/rcu.c b/rcu.c
deleted file mode 100644
index 2e2031417..000000000
--- a/rcu.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * rcu.c: RCU remote control
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: rcu.c 2.0 2007/08/24 13:15:48 kls Exp $
- */
-
-#include "rcu.h"
-#include <netinet/in.h>
-#include <termios.h>
-#include <unistd.h>
-#include "tools.h"
-
-#define REPEATLIMIT      150 // ms
-#define REPEATDELAY      350 // ms
-#define HANDSHAKETIMEOUT  20 // ms
-
-cRcuRemote::cRcuRemote(const char *DeviceName)
-:cRemote("RCU")
-,cThread("RCU remote control")
-{
-  dp = 0;
-  mode = modeB;
-  code = 0;
-  number = 0;
-  data = 0;
-  receivedCommand = false;
-  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
-     struct termios t;
-     if (tcgetattr(f, &t) == 0) {
-        cfsetspeed(&t, B9600);
-        cfmakeraw(&t);
-        if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
-           SetNumber(8888);
-           const char *Setup = GetSetup();
-           if (Setup) {
-              code = *Setup;
-              SetCode(code);
-              isyslog("connecting to %s remote control using code %c", Name(), code);
-              }
-           Start();
-           return;
-           }
-        }
-     LOG_ERROR_STR(DeviceName);
-     close(f);
-     }
-  else
-     LOG_ERROR_STR(DeviceName);
-  f = -1;
-}
-
-cRcuRemote::~cRcuRemote()
-{
-  Cancel();
-}
-
-bool cRcuRemote::Ready(void)
-{
-  return f >= 0;
-}
-
-bool cRcuRemote::Initialize(void)
-{
-  if (f >= 0) {
-     unsigned char Code = '0';
-     isyslog("trying codes for %s remote control...", Name());
-     for (;;) {
-         if (DetectCode(&Code)) {
-            code = Code;
-            break;
-            }
-         }
-     isyslog("established connection to %s remote control using code %c", Name(), code);
-     char buffer[16];
-     snprintf(buffer, sizeof(buffer), "%c", code);
-     PutSetup(buffer);
-     return true;
-     }
-  return false;
-}
-
-void cRcuRemote::Action(void)
-{
-#pragma pack(1)
-  union {
-    struct {
-      unsigned short address;
-      unsigned int command;
-      } data;
-    unsigned char raw[6];
-    } buffer;
-#pragma pack()
-
-  time_t LastCodeRefresh = 0;
-  cTimeMs FirstTime;
-  unsigned char LastCode = 0, LastMode = 0;
-  uint64_t LastCommand = ~0; // 0x00 might be a valid command
-  unsigned int LastData = 0;
-  bool repeat = false;
-
-  while (Running() && f >= 0) {
-        if (ReceiveByte(REPEATLIMIT) == 'X') {
-           for (int i = 0; i < 6; i++) {
-               int b = ReceiveByte();
-               if (b >= 0) {
-                  buffer.raw[i] = b;
-                  if (i == 5) {
-                     unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
-                     uint64_t       Command = ntohl(buffer.data.command);
-                     if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
-                        // Well, well, if it isn't the "d-box"...
-                        // This remote control sends the above command before and after
-                        // each keypress - let's just drop this:
-                        break;
-                     Command |= uint64_t(Address) << 32;
-                     if (Command != LastCommand) {
-                        LastCommand = Command;
-                        repeat = false;
-                        FirstTime.Set();
-                        }
-                     else {
-                        if (FirstTime.Elapsed() < REPEATDELAY)
-                           break; // repeat function kicks in after a short delay
-                        repeat = true;
-                        }
-                     Put(Command, repeat);
-                     receivedCommand = true;
-                     }
-                  }
-               else
-                  break;
-               }
-           }
-        else if (repeat) { // the last one was a repeat, so let's generate a release
-           Put(LastCommand, false, true);
-           repeat = false;
-           LastCommand = ~0;
-           }
-        else {
-           unsigned int d = data;
-           if (d != LastData) {
-              SendData(d);
-              LastData = d;
-              }
-           unsigned char c = code;
-           if (c != LastCode) {
-              SendCommand(c);
-              LastCode = c;
-              }
-           unsigned char m = mode;
-           if (m != LastMode) {
-              SendCommand(m);
-              LastMode = m;
-              }
-           LastCommand = ~0;
-           }
-        if (!repeat && code && time(NULL) - LastCodeRefresh > 60) {
-           SendCommand(code); // in case the PIC listens to the wrong code
-           LastCodeRefresh = time(NULL);
-           }
-        }
-}
-
-int cRcuRemote::ReceiveByte(int TimeoutMs)
-{
-  // Returns the byte if one was received within a timeout, -1 otherwise
-  if (cFile::FileReady(f, TimeoutMs)) {
-     unsigned char b;
-     if (safe_read(f, &b, 1) == 1)
-        return b;
-     else
-        LOG_ERROR;
-     }
-  return -1;
-}
-
-bool cRcuRemote::SendByteHandshake(unsigned char c)
-{
-  if (f >= 0) {
-     int w = write(f, &c, 1);
-     if (w == 1) {
-        for (int reply = ReceiveByte(HANDSHAKETIMEOUT); reply >= 0;) {
-            if (reply == c)
-               return true;
-            else if (reply == 'X') {
-               // skip any incoming RC code - it will come again
-               for (int i = 6; i--;) {
-                   if (ReceiveByte() < 0)
-                      return false;
-                   }
-               }
-            else
-               return false;
-            }
-        }
-     LOG_ERROR;
-     }
-  return false;
-}
-
-bool cRcuRemote::SendByte(unsigned char c)
-{
-  for (int retry = 5; retry--;) {
-      if (SendByteHandshake(c))
-         return true;
-      }
-  return false;
-}
-
-bool cRcuRemote::SendData(unsigned int n)
-{
-  for (int i = 0; i < 4; i++) {
-      if (!SendByte(n & 0x7F))
-         return false;
-      n >>= 8;
-      }
-  return SendCommand(mode);
-}
-
-void cRcuRemote::SetCode(unsigned char Code)
-{
-  code = Code;
-}
-
-void cRcuRemote::SetMode(unsigned char Mode)
-{
-  mode = Mode;
-}
-
-bool cRcuRemote::SendCommand(unsigned char Cmd)
-{
-  return SendByte(Cmd | 0x80);
-}
-
-void cRcuRemote::SetNumber(int n, bool Hex)
-{
-  number = n;
-  if (!Hex) {
-     char buf[8];
-     sprintf(buf, "%4d", n & 0xFFFF);
-     n = 0;
-     for (char *d = buf; *d; d++) {
-         if (*d == ' ')
-            *d = 0xF;
-         n = (n << 4) | ((*d - '0') & 0x0F);
-         }
-     }
-  unsigned int m = 0;
-  for (int i = 0; i < 4; i++) {
-      m <<= 8;
-      m |= ((i & 0x03) << 5) | (n & 0x0F) | (((dp >> i) & 0x01) << 4);
-      n >>= 4;
-      }
-  data = m;
-}
-
-void cRcuRemote::SetString(const char *s)
-{
-  const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
-  int n = 0;
-
-  for (int i = 0; *s && i < 4; s++, i++) {
-      n <<= 4;
-      for (const char *c = chars; *c; c++) {
-          if (*c == *s) {
-             n |= c - chars;
-             break;
-             }
-          }
-      }
-  SetNumber(n, true);
-}
-
-void cRcuRemote::SetPoints(unsigned char Dp, bool On)
-{
-  if (On)
-     dp |= Dp;
-  else
-     dp &= ~Dp;
-  SetNumber(number);
-}
-
-bool cRcuRemote::DetectCode(unsigned char *Code)
-{
-  // Caller should initialize 'Code' to 0 and call DetectCode()
-  // until it returns true. Whenever DetectCode() returns false
-  // and 'Code' is not 0, the caller can use 'Code' to display
-  // a message like "Trying code '%c'". If false is returned and
-  // 'Code' is 0, all possible codes have been tried and the caller
-  // can either stop calling DetectCode() (and give some error
-  // message), or start all over again.
-  if (*Code < 'A' || *Code > 'D') {
-     *Code = 'A';
-     return false;
-     }
-  if (*Code <= 'D') {
-     SetMode(modeH);
-     char buf[5];
-     sprintf(buf, "C0D%c", *Code);
-     SetString(buf);
-     SetCode(*Code);
-     cCondWait::SleepMs(2 * REPEATDELAY);
-     if (receivedCommand) {
-        SetMode(modeB);
-        SetString("----");
-        return true;
-        }
-     if (*Code < 'D') {
-        (*Code)++;
-        return false;
-        }
-     }
-  *Code = 0;
-  return false;
-}
-
-void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber)
-{
-  if (ChannelNumber && Device->IsPrimaryDevice())
-     SetNumber(cDevice::CurrentChannel());
-}
-
-void cRcuRemote::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
-{
-  SetPoints(1 << Device->DeviceNumber(), Device->Receiving());
-}
diff --git a/rcu.h b/rcu.h
deleted file mode 100644
index a0ca2339a..000000000
--- a/rcu.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * rcu.h: RCU remote control
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: rcu.h 2.0 2007/08/24 13:15:48 kls Exp $
- */
-
-#ifndef __RCU_H
-#define __RCU_H
-
-#include "remote.h"
-#include "status.h"
-#include "thread.h"
-
-class cRcuRemote : public cRemote, private cThread, private cStatus {
-private:
-  enum { modeH = 'h', modeB = 'b', modeS = 's' };
-  int f;
-  unsigned char dp, code, mode;
-  int number;
-  unsigned int data;
-  bool receivedCommand;
-  bool SendCommand(unsigned char Cmd);
-  int ReceiveByte(int TimeoutMs = 0);
-  bool SendByteHandshake(unsigned char c);
-  bool SendByte(unsigned char c);
-  bool SendData(unsigned int n);
-  void SetCode(unsigned char Code);
-  void SetMode(unsigned char Mode);
-  void SetNumber(int n, bool Hex = false);
-  void SetPoints(unsigned char Dp, bool On);
-  void SetString(const char *s);
-  bool DetectCode(unsigned char *Code);
-  virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-  virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
-public:
-  cRcuRemote(const char *DeviceName);
-  virtual ~cRcuRemote();
-  virtual bool Ready(void);
-  virtual bool Initialize(void);
-  };
-
-#endif //__RCU_H
diff --git a/skinsttng.c b/skinsttng.c
index c9c3031f8..97e530895 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.11 2011/08/21 11:02:26 kls Exp $
+ * $Id: skinsttng.c 2.13 2012/03/05 12:01:26 kls Exp $
  */
 
 // Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
@@ -284,7 +284,7 @@ void cSkinSTTNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
         }
      }
   osd->DrawText(x3 + TextFrame, y0, ChannelString(Channel, Number), Theme.Color(clrChannelName), frameColor, cFont::GetFont(fontOsd), x - x3 - TextFrame);
-  lastSignalDisplay = time(NULL); // don't get slowed down during heavy zapping
+  lastSignalDisplay = 0;
 }
 
 void cSkinSTTNGDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
@@ -341,8 +341,8 @@ void cSkinSTTNGDisplayChannel::Flush(void)
            osd->DrawText(x3 + TextFrame, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 2 * TextFrame);
            strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
            }
-        if (time(NULL) != lastSignalDisplay) {
-           int DeviceNumber = cDevice::ActualDevice()->DeviceNumber() + 1;
+        int DeviceNumber = cDevice::ActualDevice()->DeviceNumber() + 1;
+        if (DeviceNumber != lastDeviceNumber || time(NULL) != lastSignalDisplay) {
            int SignalStrength = cDevice::ActualDevice()->SignalStrength();
            int SignalQuality = cDevice::ActualDevice()->SignalQuality();
            if (DeviceNumber != lastDeviceNumber || SignalStrength != lastSignalStrength || SignalQuality != lastSignalQuality) {
@@ -783,9 +783,6 @@ class cSkinSTTNGDisplayReplay : public cSkinDisplayReplay {
   virtual void Flush(void);
   };
 
-#define SymbolWidth 30
-#define SymbolHeight 30
-
 cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
 {
   const cFont *font = cFont::GetFont(fontSml);
@@ -794,7 +791,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   lastCurrentWidth = 0;
   cBitmap bm(play_xpm);
   x0 = 0;
-  x1 = max(SymbolWidth, bm.Width());
+  x1 = max(lineHeight * 2, bm.Width());
   x2 = x1 + Roundness;
   x3 = x2 + Gap;
   x7 = cOsd::OsdWidth();
@@ -805,7 +802,7 @@ cSkinSTTNGDisplayReplay::cSkinSTTNGDisplayReplay(bool ModeOnly)
   y1 = lineHeight;
   y2 = y1 + Roundness;
   y3 = y2 + Gap;
-  y4 = y3 + max(SymbolHeight, bm.Height());
+  y4 = y3 + max(lineHeight, bm.Height());
   y5 = y4 + Gap;
   y6 = y5 + Roundness;
   y7 = y6 + font->Height();
@@ -867,10 +864,7 @@ static const char *const *ReplaySymbols[2][2][5] = {
 
 void cSkinSTTNGDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
 {
-  if (Speed < -1)
-     Speed = -1;
-  if (Speed > 3)
-     Speed = 3;
+  Speed = constrain(Speed, -1, 3);
   cBitmap bm(ReplaySymbols[Play][Forward][Speed + 1]);
   osd->DrawBitmap(x0 + (x1 - x0 - bm.Width()) / 2, y3 + (y4 - y3 - bm.Height()) / 2, bm, Theme.Color(clrReplayMode), frameColor);
 }
diff --git a/status.c b/status.c
index c542a3c56..b0a6aba03 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 2.0 2008/02/16 14:46:31 kls Exp $
+ * $Id: status.c 2.1 2012/03/07 14:17:24 kls Exp $
  */
 
 #include "status.h"
@@ -29,10 +29,10 @@ void cStatus::MsgTimerChange(const cTimer *Timer, eTimerChange Change)
       sm->TimerChange(Timer, Change);
 }
 
-void cStatus::MsgChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cStatus::MsgChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
-      sm->ChannelSwitch(Device, ChannelNumber);
+      sm->ChannelSwitch(Device, ChannelNumber, LiveView);
 }
 
 void cStatus::MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On)
diff --git a/status.h b/status.h
index d05ec18a0..631916572 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 2.0 2008/02/16 15:00:33 kls Exp $
+ * $Id: status.h 2.1 2012/03/07 14:16:57 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -30,10 +30,11 @@ class cStatus : public cListObject {
                // been added or will be deleted, respectively. In case of tcMod,
                // Timer is NULL; this indicates that some timer has been changed.
                // Note that tcAdd and tcDel are always also followed by a tcMod.
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber) {}
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView) {}
                // Indicates a channel switch on the given DVB device.
                // If ChannelNumber is 0, this is before the channel is being switched,
                // otherwise ChannelNumber is the number of the channel that has been switched to.
+               // LiveView tells whether this channel switch is for live viewing.
   virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On) {}
                // The given DVB device has started (On = true) or stopped (On = false) recording Name.
                // Name is the name of the recording, without any directory path. The full file name
@@ -85,7 +86,7 @@ class cStatus : public cListObject {
   virtual ~cStatus();
   // These functions are called whenever the related status information changes:
   static void MsgTimerChange(const cTimer *Timer, eTimerChange Change);
-  static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber);
+  static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
   static void MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On);
   static void MsgReplaying(const cControl *Control, const char *Name, const char *FileName, bool On);
   static void MsgSetVolume(int Volume, bool Absolute);
diff --git a/svdrp.c b/svdrp.c
index 613a019f0..01366ddf3 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.15 2012/02/16 12:38:19 kls Exp $
+ * $Id: svdrp.c 2.16 2012/03/04 12:05:56 kls Exp $
  */
 
 #include "svdrp.h"
@@ -601,9 +601,13 @@ void cSVDRP::CmdCLRE(const char *Option)
         Reply(501, "Undefined channel \"%s\"", Option);
      }
   else {
-     cSchedules::ClearAll();
      cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
-     Reply(250, "EPG data cleared");
+     if (cSchedules::ClearAll()) {
+        Reply(250, "EPG data cleared");
+        cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
+        }
+     else
+        Reply(451, "Error while clearing EPG data");
      }
 }
 
@@ -1600,6 +1604,7 @@ void cSVDRP::Execute(char *Cmd)
         Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
         DELETENULL(PUTEhandler);
         }
+     cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME); // re-trigger the timeout, in case there is very much EPG data
      return;
      }
   // skip leading whitespace:
diff --git a/vdr.5 b/vdr.5
index 846355026..a606dde82 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.28 2012/02/27 11:05:15 kls Exp $
+.\" $Id: vdr.5 2.29 2012/03/10 14:56:01 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -861,7 +861,7 @@ l l.
 <event id>     @is a 32 bit unsigned int, uniquely identifying this event
 <start time>   @is the time (as a time_t integer) in UTC when this event starts
 <duration>     @is the time (in seconds) that this event will take
-<table id>     @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream)
+<table id>     @is a hex number that indicates the table this event is contained in (if this is left empty it will be set to 0x00; and value less than 0x4E it will be treated as if it were 0x4E)
 <version>      @is a hex number that indicates the event's version number inside its table (optional, ignored when reading EPG data)
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
diff --git a/vdr.c b/vdr.c
index f01239aa1..6df53fdd8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.30 2012/02/27 10:59:55 kls Exp $
+ * $Id: vdr.c 2.34 2012/03/09 09:55:15 kls Exp $
  */
 
 #include <getopt.h>
@@ -677,8 +677,8 @@ int main(int argc, char *argv[])
 
   // Default skins:
 
-  new cSkinClassic;
   new cSkinSTTNG;
+  new cSkinClassic;
   Skins.SetCurrent(Setup.OSDSkin);
   cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
   CurrentSkin = Skins.Current();
@@ -761,10 +761,14 @@ int main(int argc, char *argv[])
            static time_t lastTime = 0;
            if ((!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
-              if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
-                 if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
-                     && !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel))) // ...or the one used by the last timer...
+              if (Channel && (Channel->Vpid() || Channel->Apid(0) || Channel->Dpid(0))) {
+                 if (cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(Channel->Number())) // try to switch to the original channel...
                     ;
+                 else if (LastTimerChannel > 0) {
+                    Channel = Channels.GetByNumber(LastTimerChannel);
+                    if (Channel && cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer
+                       ;
+                    }
                  }
               lastTime = Now; // don't do this too often
               LastTimerChannel = -1;
@@ -878,31 +882,12 @@ int main(int argc, char *argv[])
                      }
                   if (NeedsTransponder || InVpsMargin) {
                      // Find a device that provides the required transponder:
-                     cDevice *Device = NULL;
-                     bool DeviceAvailable = false;
-                     for (int i = 0; i < cDevice::NumDevices(); i++) {
-                         cDevice *d = cDevice::GetDevice(i);
-                         if (d && d->ProvidesTransponder(Timer->Channel())) {
-                            if (d->IsTunedToTransponder(Timer->Channel())) {
-                               // if any device is tuned to the transponder, we're done
-                               Device = d;
-                               break;
-                               }
-                            if (d->MaySwitchTransponder(Timer->Channel())) {
-                               DeviceAvailable = true; // avoids using the actual device below
-                               Device = d;
-                               }
-                            else if (!d->Occupied() && !Device && InVpsMargin && !d->Receiving() && d->ProvidesTransponderExclusively(Timer->Channel()))
-                               Device = d; // use this one only if no other with less impact can be found
-                            }
-                         }
-                     if (!Device && InVpsMargin && !DeviceAvailable) {
-                        cDevice *d = cDevice::ActualDevice();
-                        if (!d->Receiving() && d->ProvidesTransponder(Timer->Channel()) && !d->Occupied())
-                           Device = d; // use the actual device as a last resort
-                        }
+                     cDevice *Device = cDevice::GetDeviceForTransponder(Timer->Channel(), MINPRIORITY);
+                     if (!Device && InVpsMargin)
+                        Device = cDevice::GetDeviceForTransponder(Timer->Channel(), LIVEPRIORITY);
                      // Switch the device to the transponder:
                      if (Device) {
+                        bool HadProgramme = cDevice::PrimaryDevice()->HasProgramme();
                         if (!Device->IsTunedToTransponder(Timer->Channel())) {
                            if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
                               cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
@@ -910,13 +895,8 @@ int main(int argc, char *argv[])
                            if (Device->SwitchChannel(Timer->Channel(), false))
                               Device->SetOccupied(TIMERDEVICETIMEOUT);
                            }
-                        if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
-                           // the previous SwitchChannel() has switched away the current live channel
-                           cDevice::SetAvoidDevice(Device);
-                           if (!Channels.SwitchTo(cDevice::CurrentChannel())) // try to switch to the original channel on a different device...
-                              Channels.SwitchTo(Timer->Channel()->Number()); // ...or avoid toggling between old channel and black screen
-                           Skins.Message(mtInfo, tr("Upcoming recording!"));
-                           }
+                        if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme())
+                           Skins.Message(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel
                         }
                      }
                   }
@@ -1320,6 +1300,7 @@ int main(int argc, char *argv[])
      Setup.Save();
      }
   cDevice::Shutdown();
+  EpgHandlers.Clear();
   PluginManager.Shutdown(true);
   cSchedules::Cleanup(true);
   ReportEpgBugFixStats();

From 19b952728eb81dfb773e3157fc54be338064a0dc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 25 Mar 2012 13:45:00 +0200
Subject: [PATCH 213/307] Version 1.7.27 Original announce message: VDR
 developer version 1.7.27 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.27.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.26-1.7.27.diff

MD5 checksums:

bfeaa79a9e55144bca2b69139c45f1bb  vdr-1.7.27.tar.bz2
b23344be51d3e2c2d96cc2dd4e8e564e  vdr-1.7.26-1.7.27.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Changed the Green button in the "Edit timer" menu from "Once" to "Single"
  (suggested by Rolf Ahrenberg).
- Fixed some typos in HISTORY and CONTRIBUTORS (thanks to Ville Skyttä).
- The channel name column in the "What's on now/next" menu now adjusts its width
  to display the full short name of each channel (suggested by Dominic Evans).
- Dropped the meanwhile obsolete script 'i18n-to-gettext'.
- Removed the obsolete function cPlugin::RegisterI18n().
- Removed the obsolete typedef tI18nPhrase.
- Adapted menu column widths of 'skincurses' to the wider HD OSD sizes.
- Deactivated definition of __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS (recording.h)
  and LEGACY_CRECEIVER (receiver.h) to trigger an error for any plugin that still
  uses the respective code. You can reactivate these to quickly make your plugin
  compile again, but beware that these code parts will be removed in one of the next
  versions.
- Made the "overloaded-virtual" warning an error to detect hidden overloaded
  virtual functions (thanks to Anssi Hannula for pointing out -Werror=...).
  Plugin authors may want to change -Woverloaded-virtual to -Werror=overloaded-virtual
  in their Makefiles.
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Improved fast forwarding to the end of a timeshift recording.
- The new function cDevice::DeviceName() returns a string identifying the name of
  the given device.
- When toggling a timer between "Single" and "Repeating", the previous setting is now
  retained in case the user toggles back to the original value.
- When estimating the remaining disk space (in hours), the average data rate of all
  existing recordings is now taken into account. If this value can't be determined,
  the previous value of 25.75 MB/min is taken.
- No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin.
- No longer using GetFont() (which is not thread safe) in cSubtitleRegion::UpdateTextData().
- Fixed a memory leak in cSubtitleRegion::UpdateTextData().
- Moved setting LC_NUMERIC further up to make sure any floating point numbers use a
  decimal point (suggested by Tobias Grimm).
- Added missing channel locking to cEIT.
- Fixed reduced bpp support for DVB subtitles (thanks to Rolf Ahrenberg).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Reverted some improvements to Make.config.template (thanks to Christian Ruppert).
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
  Schmirler).
---
 CONTRIBUTORS                            |  14 +-
 HISTORY                                 |  44 ++-
 Make.config.template                    |  32 +--
 Makefile                                |   4 +-
 PLUGINS/src/dvbhddevice/Makefile        |   4 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po     |   8 +-
 PLUGINS/src/dvbsddevice/Makefile        |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   4 +-
 PLUGINS/src/epgtableid0/Makefile        |   4 +-
 PLUGINS/src/hello/Makefile              |   4 +-
 PLUGINS/src/osddemo/HISTORY             |   4 +
 PLUGINS/src/osddemo/Makefile            |   4 +-
 PLUGINS/src/osddemo/osddemo.c           |  63 ++---
 PLUGINS/src/pictures/Makefile           |   4 +-
 PLUGINS/src/rcu/Makefile                |   4 +-
 PLUGINS/src/servicedemo/Makefile        |   4 +-
 PLUGINS/src/skincurses/HISTORY          |   4 +
 PLUGINS/src/skincurses/Makefile         |   4 +-
 PLUGINS/src/skincurses/skincurses.c     |   8 +-
 PLUGINS/src/status/HISTORY              |   4 +
 PLUGINS/src/status/Makefile             |   4 +-
 PLUGINS/src/status/status.c             |  10 +-
 PLUGINS/src/svdrpdemo/Makefile          |   4 +-
 channels.c                              |  27 +-
 channels.h                              |   6 +-
 config.h                                |  10 +-
 device.c                                |   7 +-
 device.h                                |   5 +-
 dvbdevice.c                             |   9 +-
 dvbdevice.h                             |   3 +-
 dvbplayer.c                             |  22 +-
 dvbsubtitle.c                           |  39 ++-
 dvbsubtitle.h                           |   4 +-
 eit.c                                   |  23 +-
 i18n-to-gettext                         | 347 ------------------------
 i18n.h                                  |   4 +-
 menu.c                                  |  20 +-
 menuitems.c                             |   7 +-
 menuitems.h                             |   3 +-
 newplugin                               |   4 +-
 plugin.c                                |   7 +-
 plugin.h                                |   4 +-
 po/ar.po                                |   2 +-
 po/ca_ES.po                             |   2 +-
 po/cs_CZ.po                             |   2 +-
 po/da_DK.po                             |   2 +-
 po/de_DE.po                             |   2 +-
 po/el_GR.po                             |   2 +-
 po/es_ES.po                             |   2 +-
 po/et_EE.po                             |   8 +-
 po/fi_FI.po                             |   6 +-
 po/fr_FR.po                             |   2 +-
 po/hr_HR.po                             |   2 +-
 po/hu_HU.po                             |   2 +-
 po/it_IT.po                             |  10 +-
 po/lt_LT.po                             |   2 +-
 po/mk_MK.po                             |   2 +-
 po/nl_NL.po                             |   2 +-
 po/nn_NO.po                             |   2 +-
 po/pl_PL.po                             |   2 +-
 po/pt_PT.po                             |   2 +-
 po/ro_RO.po                             |   2 +-
 po/ru_RU.po                             |   2 +-
 po/sk_SK.po                             |   2 +-
 po/sl_SI.po                             |   2 +-
 po/sr_SR.po                             |   2 +-
 po/sv_SE.po                             |   2 +-
 po/tr_TR.po                             |   2 +-
 po/uk_UA.po                             |   2 +-
 po/zh_CN.po                             |   2 +-
 receiver.h                              |   4 +-
 recording.c                             |  55 +++-
 recording.h                             |  14 +-
 skins.c                                 |   5 +-
 skins.h                                 |   4 +-
 skinsttng.c                             |   4 +-
 vdr.c                                   |   4 +-
 77 files changed, 373 insertions(+), 585 deletions(-)
 delete mode 100755 i18n-to-gettext

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index abc448c8e..54bb679cc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1137,6 +1137,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for adding some typecasts to silence gcc compiler warnings
  for reporting a bug in handling OSD color button texts in case a menu item has
  texts of its own
+ for suggesting to change the Green button in the "Edit timer" menu from "Once"
+ to "Single"
+ for fixing reduced bpp support for DVB subtitles
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1320,7 +1323,7 @@ Javier Marcet <lists@marcet.info>
  is a replay session active
 
 Peter Waechtler <pwaechtler@mac.com>
- for adding channels for DVB-T Hannover (Germany) to channels.cont.terr
+ for adding channels for DVB-T Hannover (Germany) to channels.conf.terr
 
 Robert Bartl <robert@bartl.priv.at>
  for reporting a hangup in SVDRP when the client disappears without sending QUIT
@@ -1852,7 +1855,7 @@ Marco Kremer <vdr.hgm.bg@gmx.net>
  through the full featured DVB card
 
 Walter Koch <koch@u32.de>
- for adding channels for DVB-T D�sseldorf and K�ln (Germany) to channels.cont.terr
+ for adding channels for DVB-T D�sseldorf and K�ln (Germany) to channels.conf.terr
  for fixing some missing '-' in the German OSD texts
  for suggesting to display the free disk space also in the title of the "Recordings"
  menu
@@ -1953,6 +1956,7 @@ Ville Skytt
  for removing a redundant NULL check in cDvbSpuDecoder::setTime()
  for pointing out that the variable HasSnr was unused in cDvbTuner::GetSignalQuality()
  for fixing cConfig::Load() for g++ version 4.7.0
+ for fixing some typos in HISTORY and CONTRIBUTORS
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2326,6 +2330,8 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for a patch that added a workaround for the broken linux-dvb driver header files
  for reporting a faulty "frame duration" instead of "frame rate" in vdr.5
  for avoiding a gcc 4.6 compiler error in the skincurses plugin.
+ for suggesting to move setting LC_NUMERIC further up to make sure any floating point
+ numbers use a decimal point
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2383,6 +2389,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for setting the audio type of language descriptors to 0x00 in the PAT/PMT generator
  for adding support for automatically selecting subtitles when playing old PES
  recordings made with the subtitles plugin
+ for pointing out -Werror=...
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2410,6 +2417,7 @@ Frank Schmirler <vdr@schmirler.de>
  for fixing the German translation of "Folder name must not contain '%c'!"
  for suggestions used in revising priority handling to allow receivers with a priority
  that is lower than that of live viewing
+ for fixing handling IDLEPRIORITY in cDvbDevice::ProvidesChannel()
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
@@ -2833,6 +2841,8 @@ Chris Mayo <aklhfex@gmail.com>
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
  for adding cap_net_raw to the capabilities that are not dropped
+ for suggesting to make the channel name column in the "What's on now/next" menu
+ adjust its width to display the full short name of each channel
 
 Torsten Lang <info@torstenlang.de>
  for reporting a problem with newline characters in stream component descriptions
diff --git a/HISTORY b/HISTORY
index 35fa7422e..1a1c8a6aa 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2335,7 +2335,7 @@ Video Disk Recorder Revision History
 - Now explicitly handling exit value 0 and 2 in 'runvdr'.
 - Added a missing 'w' to the allowed characters for Finnish and Swedish (thanks
   to Lauri Tischler and Ragnar Sundblad).
-- Added channels for DVB-T Hannover (Germany) to channels.cont.terr (thanks to
+- Added channels for DVB-T Hannover (Germany) to channels.conf.terr (thanks to
   Peter Waechtler).
 - Fixed a hangup in SVDRP when the client disappears without sending QUIT (thanks
   to Robert Bartl for reporting this one). The problem was introduced in version
@@ -7009,3 +7009,45 @@ Video Disk Recorder Revision History
   + The default table id for a newly created cEvent has been changed to 0xFF,
     which is higher than any normal table id that is broadcast in the EIT data.
   See PLUGINS.html, section "Electronic Program Guide" for more information.
+
+2012-03-25: Version 1.7.27
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Changed the Green button in the "Edit timer" menu from "Once" to "Single"
+  (suggested by Rolf Ahrenberg).
+- Fixed some typos in HISTORY and CONTRIBUTORS (thanks to Ville Skytt�).
+- The channel name column in the "What's on now/next" menu now adjusts its width
+  to display the full short name of each channel (suggested by Dominic Evans).
+- Dropped the meanwhile obsolete script 'i18n-to-gettext'.
+- Removed the obsolete function cPlugin::RegisterI18n().
+- Removed the obsolete typedef tI18nPhrase.
+- Adapted menu column widths of 'skincurses' to the wider HD OSD sizes.
+- Deactivated definition of __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS (recording.h)
+  and LEGACY_CRECEIVER (receiver.h) to trigger an error for any plugin that still
+  uses the respective code. You can reactivate these to quickly make your plugin
+  compile again, but beware that these code parts will be removed in one of the next
+  versions.
+- Made the "overloaded-virtual" warning an error to detect hidden overloaded
+  virtual functions (thanks to Anssi Hannula for pointing out -Werror=...).
+  Plugin authors may want to change -Woverloaded-virtual to -Werror=overloaded-virtual
+  in their Makefiles.
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Improved fast forwarding to the end of a timeshift recording.
+- The new function cDevice::DeviceName() returns a string identifying the name of
+  the given device.
+- When toggling a timer between "Single" and "Repeating", the previous setting is now
+  retained in case the user toggles back to the original value.
+- When estimating the remaining disk space (in hours), the average data rate of all
+  existing recordings is now taken into account. If this value can't be determined,
+  the previous value of 25.75 MB/min is taken.
+- No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin.
+- No longer using GetFont() (which is not thread safe) in cSubtitleRegion::UpdateTextData().
+- Fixed a memory leak in cSubtitleRegion::UpdateTextData().
+- Moved setting LC_NUMERIC further up to make sure any floating point numbers use a
+  decimal point (suggested by Tobias Grimm).
+- Added missing channel locking to cEIT.
+- Fixed reduced bpp support for DVB subtitles (thanks to Rolf Ahrenberg).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Reverted some improvements to Make.config.template (thanks to Christian Ruppert).
+- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
+  Schmirler).
diff --git a/Make.config.template b/Make.config.template
index 9b92621a1..d51e20c72 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,15 +6,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.6 2012/02/27 10:56:28 kls Exp $
+# $Id: Make.config.template 2.8 2012/03/20 11:20:13 kls Exp $
 
 ### The C compiler and options:
 
-CC       ?= gcc
-CFLAGS   ?= -g -O3 -Wall
+CC       = gcc
+CFLAGS   = -g -O3 -Wall
 
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXX      = g++
+CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ifdef PLUGIN
 CFLAGS   += -fPIC
@@ -23,23 +23,23 @@ endif
 
 ### The directory environment:
 
-PREFIX   ?= $(DESTDIR)/usr/local
-#DVBDIR   ?= /usr/src/v4l-dvb/linux
-MANDIR   ?= $(PREFIX)/man
-BINDIR   ?= $(PREFIX)/bin
+PREFIX   = $(DESTDIR)/usr/local
+#DVBDIR   = /usr/src/v4l-dvb/linux
+MANDIR   = $(PREFIX)/man
+BINDIR   = $(PREFIX)/bin
 
-LOCDIR       ?= ./locale
-PLUGINDIR    ?= ./PLUGINS
-PLUGINLIBDIR ?= $(PLUGINDIR)/lib
-VIDEODIR     ?= /video
-CONFDIR      ?= $(VIDEODIR)
+LOCDIR       = ./locale
+PLUGINDIR    = ./PLUGINS
+PLUGINLIBDIR = $(PLUGINDIR)/lib
+VIDEODIR     = /video
+CONFDIR      = $(VIDEODIR)
 
 ### The remote control:
 
-LIRC_DEVICE ?= /var/run/lirc/lircd
+LIRC_DEVICE = /var/run/lirc/lircd
 
 ## Define if you want vdr to not run as root
-#VDR_USER ?= vdr
+#VDR_USER = vdr
 
 ### You don't need to touch the following:
 
diff --git a/Makefile b/Makefile
index a5ff9c5b1..019a0042a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.25 2012/02/27 10:54:38 kls Exp $
+# $Id: Makefile 2.26 2012/03/11 15:33:57 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -12,7 +12,7 @@ CC       ?= gcc
 CFLAGS   ?= -g -O3 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 LSIDIR   = ./libsi
 DESTDIR ?=
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 46597a035..ad5029651 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.12 2012/02/08 15:10:09 kls Exp $
+# $Id: Makefile 1.13 2012/03/11 15:34:00 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index c8980ba79..f8e480b4a 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -44,7 +44,7 @@ msgid "Always 16/9"
 msgstr "aina 16:9"
 
 msgid "Zoom 16/9"
-msgstr ""
+msgstr "zoom 16/9"
 
 msgid "Off"
 msgstr "ei"
@@ -98,10 +98,10 @@ msgid "HDMI CEC"
 msgstr "Käytä HDMI CEC-toimintoa"
 
 msgid "CEC: Switch TV on"
-msgstr ""
+msgstr "CEC: Laita TV päälle"
 
 msgid "CEC: Switch TV off"
-msgstr ""
+msgstr "CEC: Sammuta TV"
 
 msgid "Remote Control Protocol"
 msgstr "Kaukosäätimen protokolla"
@@ -116,4 +116,4 @@ msgid "Allow True Color OSD"
 msgstr "Salli tosivärit kuvaruutunäytölle"
 
 msgid "Hide mainmenu entry"
-msgstr ""
+msgstr "Piilota valinta päävalikosta"
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index bf5f7173c..1e7b5dde4 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2012/01/18 12:28:43 kls Exp $
+# $Id: Makefile 1.9 2012/03/11 15:34:02 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 25be281a2..56018792d 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.32 2012/03/07 13:52:48 kls Exp $
+ * $Id: dvbsdffdevice.c 2.33 2012/03/11 13:32:42 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -431,7 +431,7 @@ bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
         }
      if (IsPrimaryDevice())
         AddPid(Channel->Tpid(), ptTeletext);
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schl��ler <marco@lordzodiac.de> this works
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schluessler <marco@lordzodiac.de> this works
                                                    // to avoid missing audio after replaying a DVD; with 'false' there is an audio disturbance when switching
                                                    // between two channels on the same transponder on DVB-S
      CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 5653e28e4..78bf3e781 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2012/03/10 14:23:58 kls Exp $
+# $Id: Makefile 1.2 2012/03/11 15:34:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index b1a5af11f..cdf63401f 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.8 2012/01/18 12:29:09 kls Exp $
+# $Id: Makefile 2.9 2012/03/11 15:34:06 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index ac386b0e4..5db6bef24 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -34,3 +34,7 @@ VDR Plugin 'osddemo' Revision History
 2011-04-17: Version 0.2.2
 
 - Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).
+
+2012-03-13: Version 0.2.3
+
+- No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin,
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index d192b4aed..68a236b5f 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
+# $Id: Makefile 2.5 2012/03/11 15:34:08 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 9ad9df7b1..d4da3d858 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.5 2011/04/17 13:05:13 kls Exp $
+ * $Id: osddemo.c 2.6 2012/03/13 15:17:33 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.2";
+static const char *VERSION        = "0.2.3";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -85,7 +85,7 @@ class cTrueColorDemo : public cOsdObject, public cThread {
   cPixmap *destroyablePixmap;
   cPixmap *toggleablePixmap;
   virtual void Action(void);
-  cPixmap *CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font = NULL);
+  cPixmap *CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font);
 public:
   cTrueColorDemo(void);
   virtual ~cTrueColorDemo();
@@ -109,8 +109,6 @@ cTrueColorDemo::~cTrueColorDemo()
 
 cPixmap *cTrueColorDemo::CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font)
 {
-  if (!Font)
-     Font = cFont::GetFont(fontOsd);
   const int h = Font->Height(s);
   int w = Font->Width(s);
   cPixmap *Pixmap = osd->CreatePixmap(Layer, cRect((osd->Width() - w) / 2, Line, w, h));
@@ -131,6 +129,9 @@ void cTrueColorDemo::Action(void)
   cPixmap *TilePixmap = NULL;
   cPixmap *ScrollPixmap = NULL;
   cPixmap *AnimPixmap = NULL;
+  cFont *OsdFont = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize);
+  cFont *SmlFont = cFont::CreateFont(Setup.FontSml, Setup.FontSmlSize);
+  cFont *LrgFont = cFont::CreateFont(Setup.FontOsd, osd->Height() / 10);
   int FrameTime = 40; // ms
   int FadeTime = 1000; // ms
   int MoveTime = 4000; // ms
@@ -202,10 +203,9 @@ void cTrueColorDemo::Action(void)
                        cRect r = ScrollPixmap->DrawPort();
                        r.SetPoint(-r.X(), -r.Y());
                        ScrollPixmap->Pan(cPoint(0, 0), r);
-                       const cFont *Font = cFont::GetFont(fontOsd);
                        cString s = cString::sprintf("Line %d", ++ScrollLineNumber);
                        ScrollPixmap->DrawRectangle(cRect(0, ScrollPixmap->ViewPort().Height(), ScrollPixmap->DrawPort().Width(), ScrollPixmap->DrawPort().Height()), clrTransparent);
-                       ScrollPixmap->DrawText(cPoint(0, ScrollPixmap->ViewPort().Height()), s, clrYellow, clrTransparent, Font);
+                       ScrollPixmap->DrawText(cPoint(0, ScrollPixmap->ViewPort().Height()), s, clrYellow, clrTransparent, OsdFont);
                        ScrollStartTime = Now;
                        }
                     else {
@@ -234,18 +234,15 @@ void cTrueColorDemo::Action(void)
         if (!Animated) {
            switch (State) {
              case 0: {
-                       if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
-                          FadeInPixmap = CreateTextPixmap("VDR", Line, 1, clrYellow, clrTransparent, Font);
-                          if (FadeInPixmap)
-                             Line += FadeInPixmap->DrawPort().Height();
-                          delete Font;
-                          Start = cTimeMs::Now();
-                          }
+                       FadeInPixmap = CreateTextPixmap("VDR", Line, 1, clrYellow, clrTransparent, LrgFont);
+                       if (FadeInPixmap)
+                          Line += FadeInPixmap->DrawPort().Height();
+                       Start = cTimeMs::Now();
                        State++;
                      }
                      break;
              case 1: { 
-                       FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent);
+                       FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent, OsdFont);
                        if (FadeInPixmap)
                           Line += FadeInPixmap->DrawPort().Height();
                        Start = cTimeMs::Now();
@@ -253,7 +250,7 @@ void cTrueColorDemo::Action(void)
                      }
                      break;
              case 2: {
-                       FadeInPixmap = CreateTextPixmap("True Color OSD Demo", Line, 1, clrYellow, clrTransparent);
+                       FadeInPixmap = CreateTextPixmap("True Color OSD Demo", Line, 1, clrYellow, clrTransparent, OsdFont);
                        if (FadeInPixmap)
                           Line += FadeInPixmap->DrawPort().Height();
                        Start = cTimeMs::Now();
@@ -261,15 +258,12 @@ void cTrueColorDemo::Action(void)
                      }
                      break;
              case 3: {
-                       if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
-                          NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font);
-                          delete Font;
-                          if (NextPixmap) {
-                             FadeInPixmap = NextPixmap;
-                             Start = cTimeMs::Now();
-                             StartLine = Line;
-                             Line += NextPixmap->DrawPort().Height();
-                             }
+                       NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, LrgFont);
+                       if (NextPixmap) {
+                          FadeInPixmap = NextPixmap;
+                          Start = cTimeMs::Now();
+                          StartLine = Line;
+                          Line += NextPixmap->DrawPort().Height();
                           }
                        State++;
                      }
@@ -301,7 +295,7 @@ void cTrueColorDemo::Action(void)
                      }
                      break;
              case 6: {
-                       TilePixmap = CreateTextPixmap("Tiled Pixmaps", StartLine, 1, clrRed, clrWhite);
+                       TilePixmap = CreateTextPixmap("Tiled Pixmaps", StartLine, 1, clrRed, clrWhite, OsdFont);
                        if (TilePixmap) {
                           TilePixmap->SetViewPort(TilePixmap->ViewPort().Grown(TilePixmap->DrawPort().Width(), TilePixmap->DrawPort().Height()));
                           TilePixmap->SetAlpha(200);
@@ -317,15 +311,14 @@ void cTrueColorDemo::Action(void)
                      }
                      break;
              case 7: {
-                       const cFont *Font = cFont::GetFont(fontOsd);
                        const char *Text = "Scrolling Pixmaps";
-                       int w = Font->Width(Text);
-                       int h = Font->Height();
+                       int w = OsdFont->Width(Text);
+                       int h = OsdFont->Height();
                        if (cPixmap *Pixmap = osd->CreatePixmap(2, cRect((osd->Width() - w) / 2, StartLine, w, 2 * h), cRect(0, 0, w, 3 * h))) {
                           Pixmap->Clear();
-                          Pixmap->DrawText(cPoint(0, 0), Text, clrYellow, clrTransparent, Font);
+                          Pixmap->DrawText(cPoint(0, 0), Text, clrYellow, clrTransparent, OsdFont);
                           cString s = cString::sprintf("Line %d", ++ScrollLineNumber);
-                          Pixmap->DrawText(cPoint(0, Pixmap->ViewPort().Height()), s, clrYellow, clrTransparent, Font);
+                          Pixmap->DrawText(cPoint(0, Pixmap->ViewPort().Height()), s, clrYellow, clrTransparent, OsdFont);
                           ScrollPixmap = Pixmap;
                           ScrollStart.Set(0, 0);
                           ScrollEnd.Set(0, -h);
@@ -335,9 +328,8 @@ void cTrueColorDemo::Action(void)
                      }
                      break;
              case 8: {
-                       const cFont *Font = cFont::GetFont(fontSml);
                        const char *Text = "Animation";
-                       const int Size = Font->Width(Text) + 10;
+                       const int Size = SmlFont->Width(Text) + 10;
                        const int NumDots = 12;
                        const int AnimFrames = NumDots;
                        // Temporarily using pixmap layer 0 to have the text alpha blended:
@@ -359,7 +351,7 @@ void cTrueColorDemo::Action(void)
                                   AnimPixmap->DrawEllipse(cRect(x, y, Diameter, Diameter), ArgbToColor(0xFF, Color, Color, Color));
                                   Color -= Delta;
                                   }
-                              AnimPixmap->DrawText(cPoint(0, Frame * Size), Text, clrBlack, clrTransparent, cFont::GetFont(fontSml), Size, Size, taCenter);
+                              AnimPixmap->DrawText(cPoint(0, Frame * Size), Text, clrBlack, clrTransparent, SmlFont, Size, Size, taCenter);
                               }
                           AnimPixmap->SetLayer(3); // now setting the actual pixmap layer
                           FadeInPixmap = AnimPixmap;
@@ -393,6 +385,9 @@ void cTrueColorDemo::Action(void)
         if (Delta < FrameTime)
            cCondWait::SleepMs(FrameTime - Delta);
         }
+  delete OsdFont;
+  delete SmlFont;
+  delete LrgFont;
 }
 
 void cTrueColorDemo::Show(void)
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 112586bcc..cee95efbc 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.8 2012/01/18 12:30:05 kls Exp $
+# $Id: Makefile 2.9 2012/03/11 15:34:10 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index 60bcf9042..170490aa0 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.1 2012/02/27 10:46:08 kls Exp $
+# $Id: Makefile 1.2 2012/03/11 15:34:12 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index b2713ed7b..941aaff65 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
+# $Id: Makefile 2.5 2012/03/11 15:34:13 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 90dfbb7df..0ba892eaf 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -92,3 +92,7 @@ VDR Plugin 'skincurses' Revision History
 2011-05-15: Version 0.1.10
 
 - Avoiding a gcc 4.6 compiler error (thanks to Tobias Grimm).
+
+2012-03-11: Version 0.1.11
+
+- Adapted menu column widths of 'skincurses' to the wider HD OSD sizes.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 62f5d2575..b43518b69 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.8 2012/01/18 12:30:52 kls Exp $
+# $Id: Makefile 2.9 2012/03/11 15:34:18 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 74166b339..1f120c7c5 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.7 2011/08/21 11:04:38 kls Exp $
+ * $Id: skincurses.c 2.8 2012/03/11 14:42:52 kls Exp $
  */
 
 #include <ncurses.h>
@@ -11,7 +11,7 @@
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
 
-static const char *VERSION        = "0.1.10";
+static const char *VERSION        = "0.1.11";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -375,13 +375,13 @@ void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current,
   for (int i = 0; i < MaxTabs; i++) {
       const char *s = GetTabbedText(Text, i);
       if (s) {
-         int xt = Tab(i) / 12;// Tab() is in "pixel" - see also skins.c!!!
+         int xt = Tab(i) / AvgCharWidth();// Tab() is in "pixel" - see also skins.c!!!
          osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, ScOsdWidth - 2 - xt);
          }
       if (!Tab(i + 1))
          break;
       }
-  SetEditableWidth(ScOsdWidth - 2 - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
+  SetEditableWidth(ScOsdWidth - 2 - Tab(1) / AvgCharWidth()); // Tab() is in "pixel" - see also skins.c!!!
 }
 
 void cSkinCursesDisplayMenu::SetScrollbar(int Total, int Offset)
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index f65206893..01af66a8f 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -44,3 +44,7 @@ VDR Plugin 'status' Revision History
 2008-02-16: Version 0.3.0
 
 - Added new cStatus functions.
+
+2012-03-11: Version 0.3.1
+
+- Added new parameter LiveView to ChannelSwitch() (reported by Udo Richter).
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 3e9b170de..dd46ba697 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
+# $Id: Makefile 2.5 2012/03/11 15:34:20 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 5c1f7dae6..e27fa5d92 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 2.0 2008/02/16 15:41:05 kls Exp $
+ * $Id: status.c 2.1 2012/03/11 14:48:37 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.3.0";
+static const char *VERSION        = "0.3.1";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -18,7 +18,7 @@ static const char *MAINMENUENTRY  = NULL;
 class cStatusTest : public cStatus {
 protected:
   virtual void TimerChange(const cTimer *Timer, eTimerChange Change);
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
   virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
   virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
   virtual void SetVolume(int Volume, bool Absolute);
@@ -41,9 +41,9 @@ void cStatusTest::TimerChange(const cTimer *Timer, eTimerChange Change)
   dsyslog("status: cStatusTest::TimerChange  %s %d", Timer ? *Timer->ToText(true) : "-", Change);
 }
 
-void cStatusTest::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cStatusTest::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
 {
-  dsyslog("status: cStatusTest::ChannelSwitch  %d %d", Device->CardIndex(), ChannelNumber);
+  dsyslog("status: cStatusTest::ChannelSwitch  %d %d %d", Device->CardIndex(), ChannelNumber, LiveView);
 }
 
 void cStatusTest::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 1f640b86d..5109b2970 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.4 2012/01/18 12:17:23 kls Exp $
+# $Id: Makefile 2.5 2012/03/11 15:34:22 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/channels.c b/channels.c
index 04e1e3786..4108b7b49 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.20 2012/03/07 16:50:15 kls Exp $
+ * $Id: channels.c 2.21 2012/03/11 13:29:06 kls Exp $
  */
 
 #include "channels.h"
@@ -760,6 +760,8 @@ cChannels Channels;
 cChannels::cChannels(void)
 {
   maxNumber = 0;
+  maxChannelNameLength = 0;
+  maxShortChannelNameLength = 0;
   modified = CHANNELSMOD_NONE;
 }
 
@@ -937,9 +939,32 @@ bool cChannels::SwitchTo(int Number)
   return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
 }
 
+int cChannels::MaxChannelNameLength(void)
+{
+  if (!maxChannelNameLength) {
+     for (cChannel *channel = First(); channel; channel = Next(channel)) {
+         if (!channel->GroupSep())
+            maxChannelNameLength = max(Utf8StrLen(channel->Name()), maxChannelNameLength);
+         }
+     }
+  return maxChannelNameLength;
+}
+
+int cChannels::MaxShortChannelNameLength(void)
+{
+  if (!maxShortChannelNameLength) {
+     for (cChannel *channel = First(); channel; channel = Next(channel)) {
+         if (!channel->GroupSep())
+            maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName()), maxShortChannelNameLength);
+         }
+     }
+  return maxShortChannelNameLength;
+}
+
 void cChannels::SetModified(bool ByUser)
 {
   modified = ByUser ? CHANNELSMOD_USER : !modified ? CHANNELSMOD_AUTO : modified;
+  maxChannelNameLength = maxShortChannelNameLength = 0;
 }
 
 int cChannels::Modified(void)
diff --git a/channels.h b/channels.h
index 51f9830e4..203a4c94c 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.14 2011/08/06 09:56:13 kls Exp $
+ * $Id: channels.h 2.15 2012/03/11 11:46:39 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -200,6 +200,8 @@ class cChannel : public cListObject {
 class cChannels : public cRwLock, public cConfig<cChannel> {
 private:
   int maxNumber;
+  int maxChannelNameLength;
+  int maxShortChannelNameLength;
   int modified;
   int beingEdited;
   cHash<cChannel> channelsHashSid;
@@ -224,6 +226,8 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
   bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
+  int MaxChannelNameLength(void);
+  int MaxShortChannelNameLength(void);
   void SetModified(bool ByUser = false);
   int Modified(void);
       ///< Returns 0 if no channels have been modified, 1 if an automatic
diff --git a/config.h b/config.h
index af5a76ff8..9d6539797 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.44 2012/03/03 13:25:22 kls Exp $
+ * $Id: config.h 2.45 2012/03/11 10:41:44 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.26"
-#define VDRVERSNUM   10726  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.27"
+#define VDRVERSNUM   10727  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.26"
-#define APIVERSNUM   10726  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.27"
+#define APIVERSNUM   10727  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 8c527aac7..00645cfc8 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.57 2012/03/07 14:17:49 kls Exp $
+ * $Id: device.c 2.58 2012/03/13 09:48:14 kls Exp $
  */
 
 #include "device.h"
@@ -162,6 +162,11 @@ int cDevice::DeviceNumber(void) const
   return -1;
 }
 
+cString cDevice::DeviceName(void) const
+{
+  return "";
+}
+
 void cDevice::MakePrimaryDevice(bool On)
 {
   if (!On) {
diff --git a/device.h b/device.h
index 0d9ac3ac0..987dfd2fa 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.37 2012/03/06 12:13:46 kls Exp $
+ * $Id: device.h 2.38 2012/03/13 10:17:16 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -201,6 +201,9 @@ class cDevice : public cThread {
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
          ///< Returns the number of this device (0 ... numDevices).
+  virtual cString DeviceName(void) const;
+         ///< Returns a string identifying the name of this device.
+         ///< The default implementation returns an empty string.
   virtual bool HasDecoder(void) const;
          ///< Tells whether this device has an MPEG decoder.
   virtual bool AvoidRecording(void) const { return false; }
diff --git a/dvbdevice.c b/dvbdevice.c
index 4c9268f46..65e9a4bc5 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.67 2012/03/08 09:49:58 kls Exp $
+ * $Id: dvbdevice.c 2.69 2012/03/25 10:41:45 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1090,6 +1090,11 @@ bool cDvbDevice::Probe(int Adapter, int Frontend)
   return true;
 }
 
+cString cDvbDevice::DeviceName(void) const
+{
+  return frontendInfo.name;
+}
+
 bool cDvbDevice::Initialize(void)
 {
   new cDvbSourceParam('A', "ATSC");
@@ -1443,7 +1448,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
 
   if (dvbTuner && ProvidesTransponder(Channel)) {
      result = hasPriority;
-     if (Priority >= 0) {
+     if (Priority > IDLEPRIORITY) {
         if (Receiving()) {
            if (dvbTuner->IsTunedTo(Channel)) {
               if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0)) || Channel->Dpid(0) && !HasPid(Channel->Dpid(0))) {
diff --git a/dvbdevice.h b/dvbdevice.h
index 85b0d9cf9..c53a20862 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.24 2012/02/29 12:20:51 kls Exp $
+ * $Id: dvbdevice.h 2.25 2012/03/13 10:11:15 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -138,6 +138,7 @@ class cDvbDevice : public cDevice {
   int Adapter(void) const { return adapter; }
   int Frontend(void) const { return frontend; }
   virtual bool Ready(void);
+  virtual cString DeviceName(void) const;
   static bool BondDevices(const char *Bondings);
        ///< Bonds the devices as defined in the given Bondings string.
        ///< A bonding is a sequence of device numbers (starting at 1),
diff --git a/dvbplayer.c b/dvbplayer.c
index 4fd0685cf..2bf27a36f 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.25 2012/02/21 11:34:04 kls Exp $
+ * $Id: dvbplayer.c 2.26 2012/03/12 14:36:55 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -441,9 +441,9 @@ void cDvbPlayer::Action(void)
                          int NewIndex = readIndex + d;
                          if (NewIndex <= 0 && readIndex > 0)
                             NewIndex = 1; // make sure the very first frame is delivered
-                         NewIndex = index->GetNextIFrame(NewIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, TimeShiftMode);
+                         NewIndex = index->GetNextIFrame(NewIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length);
                          if (NewIndex < 0 && TimeShiftMode && playDir == pdForward)
-                            SwitchToPlayFrame = Index;
+                            SwitchToPlayFrame = readIndex;
                          Index = NewIndex;
                          readIndependent = true;
                          }
@@ -452,7 +452,7 @@ void cDvbPlayer::Action(void)
                          if (!NextFile(FileNumber, FileOffset))
                             continue;
                          }
-                      else
+                      else if (!(TimeShiftMode && playDir == pdForward))
                          eof = true;
                       }
                    else if (index) {
@@ -486,16 +486,16 @@ void cDvbPlayer::Action(void)
                          }
                       readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts); // hands over b to the ringBuffer
                       }
-                   else if (r < 0 && errno == EAGAIN)
-                      WaitingForData = true;
-                   else {
-                      if (r == 0)
-                         eof = true;
-                      else if (r < 0 && FATALERRNO) {
+                   else if (r < 0) {
+                      if (errno == EAGAIN)
+                         WaitingForData = true;
+                      else if (FATALERRNO) {
                          LOG_ERROR;
                          break;
                          }
                       }
+                   else
+                      eof = true;
                    }
                 }
 
@@ -764,7 +764,7 @@ void cDvbPlayer::SkipSeconds(int Seconds)
      if (Index >= 0) {
         Index = max(Index + SecondsToFrames(Seconds, framesPerSecond), 0);
         if (Index > 0)
-           Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL, true);
+           Index = index->GetNextIFrame(Index, false, NULL, NULL, NULL);
         if (Index >= 0)
            readIndex = Index - 1; // Action() will first increment it!
         }
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 300cd7c50..ab755c4b5 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -4,10 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * Original author: Marco Schl��ler <marco@lordzodiac.de>
+ * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.27 2012/03/02 10:47:25 kls Exp $
+ * $Id: dvbsubtitle.c 2.31 2012/03/16 11:56:56 kls Exp $
  */
 
 
@@ -491,13 +491,14 @@ void cSubtitleRegion::UpdateTextData(cSubtitleClut *Clut)
   const cPalette *palette = Clut ? Clut->GetPalette(Depth()) : NULL;
   for (cSubtitleObject *so = objects.First(); so && palette; so = objects.Next(so)) {
       if (Utf8StrLen(so->TextData()) > 0) {
-         const cFont *font = cFont::GetFont(fontOsd);
-         cBitmap *tmp = new cBitmap(font->Width(so->TextData()), font->Height(), Depth());
+         cFont *font = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize);
+         cBitmap tmp(font->Width(so->TextData()), font->Height(), Depth());
          double factor = (double)lineHeight / font->Height();
-         tmp->DrawText(0, 0, so->TextData(), palette->Color(so->ForegroundPixelCode()), palette->Color(so->BackgroundPixelCode()), font);
-         tmp = tmp->Scaled(factor, factor, true);
-         DrawBitmap(so->X(), so->Y(), *tmp);
-         DELETENULL(tmp);
+         tmp.DrawText(0, 0, so->TextData(), palette->Color(so->ForegroundPixelCode()), palette->Color(so->BackgroundPixelCode()), font);
+         cBitmap *scaled = tmp.Scaled(factor, factor, true);
+         DrawBitmap(so->X(), so->Y(), *scaled);
+         delete scaled;
+         delete font;
          }
       }
 }
@@ -1280,9 +1281,16 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
         else
            return; // unable to draw bitmaps
         }
-  if (Reduced) {
-     for (int i = 0; i < NumAreas; i++) {
-         cSubtitleRegion *sr = Page->regions.Get(i);
+  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
+  bitmaps->Add(Bitmaps);
+  for (int i = 0; i < NumAreas; i++) { 
+      cSubtitleRegion *sr = Page->regions.Get(i);
+      cSubtitleClut *clut = Page->GetClutById(sr->ClutId());
+      if (!clut)
+         continue;
+      sr->Replace(*clut->GetPalette(sr->Bpp()));
+      sr->UpdateTextData(clut);
+      if (Reduced) {
          if (sr->Bpp() != Areas[i].bpp) {
             if (sr->Level() <= Areas[i].bpp) {
                //TODO this is untested - didn't have any such subtitle stream
@@ -1298,15 +1306,6 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
                }
             }
          }
-     }
-  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
-  bitmaps->Add(Bitmaps);
-  for (cSubtitleRegion *sr = Page->regions.First(); sr; sr = Page->regions.Next(sr)) {
-      cSubtitleClut *clut = Page->GetClutById(sr->ClutId());
-      if (!clut)
-         continue;
-      sr->Replace(*clut->GetPalette(sr->Bpp()));
-      sr->UpdateTextData(clut);
       int posX = sr->HorizontalAddress();
       int posY = sr->VerticalAddress();
       if (sr->Width() > 0 && sr->Height() > 0) {
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index a9f453e0d..8de9f634f 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -4,9 +4,9 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * Original author: Marco Schl��ler <marco@lordzodiac.de>
+ * Original author: Marco Schluessler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.6 2011/03/20 13:34:23 kls Exp $
+ * $Id: dvbsubtitle.h 2.7 2012/03/11 13:34:12 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
diff --git a/eit.c b/eit.c
index 1b8c84c40..cf64e89fc 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.15 2012/03/10 14:43:52 kls Exp $
+ * $Id: eit.c 2.16 2012/03/14 10:11:15 kls Exp $
  */
 
 #include "eit.h"
@@ -32,12 +32,18 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   if (!CheckCRCAndParse())
      return;
 
+  time_t Now = time(NULL);
+  if (Now < VALID_TIME)
+     return; // we need the current time for handling PDC descriptors
+
+  if (!Channels.Lock(false, 10))
+     return;
   tChannelID channelID(Source, getOriginalNetworkId(), getTransportStreamId(), getServiceId());
   cChannel *channel = Channels.GetByChannelID(channelID, true);
-  if (!channel)
-     return; // only collect data for known channels
-  if (EpgHandlers.IgnoreChannel(channel))
+  if (!channel || EpgHandlers.IgnoreChannel(channel)) {
+     Channels.Unlock();
      return;
+     }
 
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
 
@@ -45,13 +51,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   bool Modified = false;
   time_t SegmentStart = 0;
   time_t SegmentEnd = 0;
-  time_t Now = time(NULL);
   struct tm tm_r;
   struct tm t = *localtime_r(&Now, &tm_r); // this initializes the time zone in 't'
 
-  if (Now < VALID_TIME)
-     return; // we need the current time for handling PDC descriptors
-
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
       if (EpgHandlers.HandleEitEvent(pSchedule, &SiEitEvent, Tid, getVersionNumber()))
@@ -295,13 +297,12 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
         pSchedule->ClrRunningStatus(channel);
      pSchedule->SetPresentSeen();
      }
-  if (OnlyRunningStatus)
-     return;
-  if (Modified) {
+  if (Modified && !OnlyRunningStatus) {
      EpgHandlers.SortSchedule(pSchedule);
      EpgHandlers.DropOutdated(pSchedule, SegmentStart, SegmentEnd, Tid, getVersionNumber());
      Schedules->SetModified(pSchedule);
      }
+  Channels.Unlock();
 }
 
 // --- cTDT ------------------------------------------------------------------
diff --git a/i18n-to-gettext b/i18n-to-gettext
deleted file mode 100755
index 6932fd27e..000000000
--- a/i18n-to-gettext
+++ /dev/null
@@ -1,347 +0,0 @@
-#!/usr/bin/perl -w
-
-# Convert i18n texts to gettext
-#
-# Extracts all texts from the file i18n.c and creates language
-# specific *.po files.
-#
-# Usage: i18n-to-gettext
-#
-# See the main source file 'vdr.c' for copyright information and
-# how to reach the author.
-#
-# $Id: i18n-to-gettext 2.2 2011/12/04 14:17:35 kls Exp $
-
-# How to convert an actual plugin:
-#
-# - If your code contains something like
-#
-#   const char *Text = "Some text";
-#   ...
-#   Function(tr(Text));
-#
-#   you need to enclose the text constant in trNOOP(...), as in
-#
-#   const char *Text = trNOOP("Some text");
-#
-#   The actual usage of the tr() macro remains unchanged.
-#
-# - If you have comments following the texts in your i18n.c file
-#   that should be seen by the translators, move them from the
-#   i18n.c file into the file where the text is actually used,
-#   and mark them with the TRANSLATORS keyword, as in
-#
-#   // TRANSLATORS: note the plural!
-#   Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"), ...
-#
-# - Fill in your email address in the line
-#   $MSGIDBUGS = "" ...
-#   below, so that users can reach you in case there is a problem
-#   with a message id.
-#
-# - Run this Perl script from within your plugin's source directory.
-#   This script will run 'xgettext' to extract all of your texts
-#   into a file named <pluginname>.pot. After that it will extract
-#   your existing i18n texts from the file i18n.c (or wherever you
-#   have defined them) and generate *.po files for all languages
-#   currently known by VDR.
-#
-# - Your Makefile will be automatically adjusted to allow for
-#   building the *.mo files necessary for supporting gettext().
-#   Please check carefully whether the automatic adjustments have
-#   succeeded, though. The modified Makefile will be written to
-#   Makefile.new, so you can call this script any numer of times
-#   in case you need to do some fine tuning of your texts (especially
-#   adding some trNOOP() in case the script reports "missing phrases".
-#   Once you're done converting your plugin source to using gettext,
-#   rename Makefile.new to Makefile.
-#
-# - You may want to remove the old internationalized texts from your
-#   source. Usually this means removing the files i18n.[hc], stripping
-#   i18n.o from the OBJS variable in the Makefile and removing all
-#   '#include "i18n.h"' lines from the rest of your source files.
-#   These steps are not done automatically.
-
-# Check for the existence of a Makefile:
-
-die "Makefile not found!" unless (-f "Makefile");
-
-# Determine the plugin name:
-
-$PLUGIN = `grep '^PLUGIN *=' Makefile | head -1` || die "can't find plugin name!";
-$PLUGIN =~ s/.*= *(.*)\n/$1/;
-die "can't find plugin name!" unless ($PLUGIN);
-
-# Locate the file containing the texts:
-
-$I18NFILE = "";
-for ("i18n.c", "i18n.h", `ls *.c`) { # try i18n.[ch] explicitly first
-    chomp($f = $_);
-    if (-f $f && `grep tI18nPhrase $f`) {
-       $I18NFILE = $f;
-       last;
-       }
-    }
-die "can't find internationalized texts!" unless ($I18NFILE);
-
-# Plugin specific information:
-
-$TITLE = "VDR plugin language source file";
-$COPYRIGHT = "2007 Klaus Schmidinger <kls\@tvdr.de>";
-$PACKAGE = "VDR";
-$VERSION = "1.5.7";
-$MSGIDBUGS = "" || die "enter your email address here"; # escape the '@', as in "user\@domain.tld"
-$LANGUAGETEAM = "<vdr\@linuxtv.org>";
-
-# Gettext environment:
-
-$XGETTEXT = "xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='$MSGIDBUGS'";
-$PODIR = "po";
-$POTFILE = "$PODIR/$PLUGIN.pot";
-
-# Languages as known by VDR 1.5.6:
-
-@LANGS = (
-  "en_US",
-  "de_DE",
-  "sl_SI",
-  "it_IT",
-  "nl_NL",
-  "pt_PT",
-  "fr_FR",
-  "nn_NO",
-  "fi_FI",
-  "pl_PL",
-  "es_ES",
-  "el_GR",
-  "sv_SE",
-  "ro_RO",
-  "hu_HU",
-  "ca_ES",
-  "ru_RU",
-  "hr_HR",
-  "et_EE",
-  "da_DK",
-  "cs_CZ",
-  "tr_TR"
-  );
-
-@CHARSETS = (
-  "ISO-8859-15",
-  "ISO-8859-15",
-  "ISO-8859-2",
-  "ISO-8859-15",
-  "ISO-8859-15",
-  "ISO-8859-1",
-  "ISO-8859-1",
-  "ISO-8859-1",
-  "ISO-8859-15",
-  "ISO-8859-2",
-  "ISO-8859-15",
-  "ISO-8859-7",
-  "ISO-8859-1",
-  "ISO-8859-2",
-  "ISO-8859-2",
-  "ISO-8859-1",
-  "ISO-8859-5",
-  "ISO-8859-2",
-  "ISO-8859-13",
-  "ISO-8859-15",
-  "ISO-8859-2",
-  "ISO-8859-9",
-  );
-
-@TRANSLATORS = (
-  "Klaus Schmidinger <kls\@tvdr.de>, 2000",
-  "Klaus Schmidinger <kls\@tvdr.de>, 2000",
-  "Miha Setina <mihasetina\@softhome.net>, 2000; Matjaz Thaler <matjaz.thaler\@guest.arnes.si>, 2003",
-  "Alberto Carraro <bertocar\@tin.it>, 2001; Antonio Ospite <ospite\@studenti.unina.it>, 2003; Sean Carlos <seanc\@libero.it>, 2005",
-  "Arnold Niessen <niessen\@iae.nl> <arnold.niessen\@philips.com>, 2001; Hans Dingemans <hans.dingemans\@tacticalops.nl>, 2003; Maarten Wisse <Maarten.Wisse\@urz.uni-hd.de>, 2005",
-  "Paulo Lopes <pmml\@netvita.pt>, 2001",
-  "Jean-Claude Repetto <jc\@repetto.org>, 2001; Olivier Jacques <jacquesolivier\@hotmail.com>, 2003; Gregoire Favre <greg\@magma.unil.ch>, 2003; Nicolas Huillard <nhuillard\@e-dition.fr>, 2005",
-  "J�rgen Tvedt <pjtvedt\@online.no>, 2001; Truls Slevigen <truls\@slevigen.no>, 2002",
-  "Hannu Savolainen <hannu\@opensound.com>, 2002; Jaakko Hyv�tti <jaakko\@hyvatti.iki.fi>, 2002; Niko Tarnanen <niko.tarnanen\@hut.fi>, 2003; Rolf Ahrenberg <rahrenbe\@cc.hut.fi>, 2003",
-  "Michael Rakowski <mrak\@gmx.de>, 2002",
-  "Ruben Nunez Francisco <ruben.nunez\@tang-it.com>, 2002",
-  "Dimitrios Dimitrakos <mail\@dimitrios.de>, 2002",
-  "Tomas Prybil <tomas\@prybil.se>, 2002; Jan Ekholm <chakie\@infa.abo.fi>, 2003",
-  "Paul Lacatus <paul\@campina.iiruc.ro>, 2002; Lucian Muresan <lucianm\@users.sourceforge.net>, 2004",
-  "Istvan Koenigsberger <istvnko\@hotmail.com>, 2002; Guido Josten <guido.josten\@t-online.de>, 2002",
-  "Marc Rovira Vall <tm05462\@salleURL.edu>, 2003; Ramon Roca <ramon.roca\@xcombo.com>, 2003; Jordi Vil� <jvila\@tinet.org>, 2003",
-  "Vyacheslav Dikonov <sdiconov\@mail.ru>, 2004",
-  "Drazen Dupor <drazen.dupor\@dupor.com>, 2004; Dino Ravnic <dino.ravnic\@fer.hr>, 2004",
-  "Arthur Konovalov <kasjas\@hot.ee>, 2004",
-  "Mogens Elneff <mogens\@elneff.dk>, 2004",
-  "Vladim�r B�rta <vladimir.barta\@k2atmitec.cz>, 2006",
-  "Oktay Yolge�en <oktay_73\@yahoo.de>, 2007"
-  );
-
-@LASTTRANSLATOR = (
-  "Klaus Schmidinger <kls\@tvdr.de>",
-  "Klaus Schmidinger <kls\@tvdr.de>",
-  "Matjaz Thaler <matjaz.thaler\@guest.arnes.si>",
-  "Sean Carlos <seanc\@libero.it>",
-  "Maarten Wisse <Maarten.Wisse\@urz.uni-hd.de>",
-  "Paulo Lopes <pmml\@netvita.pt>",
-  "Nicolas Huillard <nhuillard\@e-dition.fr>",
-  "Truls Slevigen <truls\@slevigen.no>",
-  "Rolf Ahrenberg <rahrenbe\@cc.hut.fi>",
-  "Michael Rakowski <mrak\@gmx.de>",
-  "Ruben Nunez Francisco <ruben.nunez\@tang-it.com>",
-  "Dimitrios Dimitrakos <mail\@dimitrios.de>",
-  "Tomas Prybil <tomas\@prybil.se>",
-  "Lucian Muresan <lucianm\@users.sourceforge.net>",
-  "Istvan Koenigsberger <istvnko\@hotmail.com>, Guido Josten <guido.josten\@t-online.de>",
-  "Jordi Vil� <jvila\@tinet.org>",
-  "Vyacheslav Dikonov <sdiconov\@mail.ru>",
-  "Drazen Dupor <drazen.dupor\@dupor.com>",
-  "Arthur Konovalov <kasjas\@hot.ee>",
-  "Mogens Elneff <mogens\@elneff.dk>",
-  "Vladim�r B�rta <vladimir.barta\@k2atmitec.cz>",
-  "Oktay Yolge�en <oktay_73\@yahoo.de>"
-  );
-
-# Collect all translated texts:
-
-open(F, $I18NFILE) || die "$I18NFILE: $!\n";
-$InComment = 0;
-while (<F>) {
-      chomp;
-      s/\t/ /g; # get rid of tabs
-      s/  *$//; # get rid of trailing blanks
-      s/^ *\/\/.*//; # remove comment lines
-      s/ *\/\/.*//; # strip trailing comments
-      s/\/\*.*\*\///g; # strip c comments
-      if (/\/\*/) {
-         $InComment = 1;
-         s/\/\*.*$//; # remove start of comment
-         }
-      elsif (/\*\//) {
-         $InComment = 0;
-         s/^.*\*\///; # remove end of comment
-         }
-      elsif ($InComment) {
-         next;
-         }
-      next if (/^ *$/); # skip empty lines
-      next if (/#if/);
-      next if (/#endif/);
-      next unless ($found or $found = /const *tI18nPhrase .*{/); # sync on phrases
-      next if (/const *tI18nPhrase .*{/); # skip sync line
-      last if (/{ *NULL *}/); # stop after last phrase
-      if (/{ *(.*),/) {
-         $Original = $1;
-         $Index = 0;
-         }
-      elsif (/}/) {
-         }
-      else {
-         $Translated = $_;
-         $Translated =~ s/ *(.*),/$1/;
-         $Index++;
-         $Map{$Original}[$Index] = $Translated;
-         }
-      }
-close(F);
-
-# Generate the .pot file:
-
-(mkdir($PODIR) || die "$PODIR: $!\n") unless -d $PODIR;
-
-system("$XGETTEXT -o $POTFILE *.c");
-
-# Generate .po files for all languages:
-
-open(POT, $POTFILE) || die "$POTFILE: $!\n";
-@POT = <POT>;
-close(POT);
-
-for ($Index = 1; $LANGS[$Index]; $Index++) {
-
-    $Authors = "# " . join("\n# ", split(/; */, $TRANSLATORS[$Index])) . "\n";
-
-    $POFILE = "$PODIR/$LANGS[$Index].po";
-    open(PO, ">$POFILE") || die "$POFILE: $!\n";
-    $msgid = "";
-    for (@POT) {
-        next if (/^#, fuzzy$/); # skip the 'fuzzy' keyword
-        $msgid = $1 if (/^msgid (".+")/);
-        $date = $1 if (/POT-Creation-Date: (.*)\\n/);
-        $s = $_;
-        if (!$msgid) {
-           $s =~ s/SOME DESCRIPTIVE TITLE/$TITLE/;
-           $s =~ s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/$COPYRIGHT/;
-           $s =~ s/PACKAGE/$PACKAGE/;
-           $s =~ s/VERSION/$VERSION/;
-           $s = $Authors if (/FIRST AUTHOR/);
-           $s =~ s/YEAR-MO-DA HO:MI\+ZONE/$date/;
-           $s =~ s/FULL NAME <EMAIL\@ADDRESS>/$LASTTRANSLATOR[$Index]/;
-           $s =~ s/LANGUAGE <LL\@li\.org>/$LANGUAGETEAM/;
-           $s =~ s/CHARSET/$CHARSETS[$Index]/;
-           }
-        else {
-           $s =~ s/""/$Map{$msgid}[$Index]/ if ($msgid && /^msgstr ""/ && defined $Map{$msgid}[$Index]);
-           $Used{$msgid} = 1;
-           }
-        print PO $s;
-        }
-    close(PO);
-    }
-
-# Report missing phrases:
-
-for (keys %Map) {
-    push(@Missing, "$_\n") unless $Used{$_};
-    }
-
-if (@Missing) {
-   print "Missing phrases (may need to use trNOOP):\n\n";
-   print sort(@Missing);
-   }
-
-# Adjust the Makefile:
-
-$MAKEI18N = q{### Internationalization (I18N):
-
-PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<} . $MSGIDBUGS . q{>' -o $@ $^
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmsgs)
-
-};
-
-open(OLD, "Makefile") || die "Makefile: $!";
-open(NEW, ">Makefile.new") || die "Makefile.new: $!";
-while (<OLD>) {
-      chomp;
-      if (/Targets:/) {
-         print NEW $MAKEI18N;
-         }
-      elsif (/^all:/) {
-         $_ .= " i18n";
-         }
-      elsif (/^clean:/) {
-         $_ .= "\n\t\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot";
-         }
-      print NEW "$_\n";
-      }
-close(NEW);
-close(OLD);
diff --git a/i18n.h b/i18n.h
index 014d8df22..03deb6f2e 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 2.0 2008/01/19 11:56:19 kls Exp $
+ * $Id: i18n.h 2.1 2012/03/11 14:07:45 kls Exp $
  */
 
 #ifndef __I18N_H
@@ -13,8 +13,6 @@
 #include <stdio.h>
 #include "tools.h"
 
-typedef const char *tI18nPhrase[22]; ///< obsolete - switch to 'gettext'!
-
 #define I18N_DEFAULT_LOCALE "en_US"
 #define I18N_MAX_LOCALE_LEN 16       // for buffers that hold en_US etc.
 #define I18N_MAX_LANGUAGES  256      // for buffers that hold all available languages
diff --git a/menu.c b/menu.c
index 260f97022..ad1cac3c1 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.42 2012/03/08 13:32:44 kls Exp $
+ * $Id: menu.c 2.45 2012/03/13 13:14:38 kls Exp $
  */
 
 #include "menu.h"
@@ -49,6 +49,7 @@
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
+#define CHNAMWIDTH  (Channels.MaxShortChannelNameLength() + 1)
 
 // --- cFreeDiskSpace --------------------------------------------------------
 
@@ -77,7 +78,10 @@ bool cFreeDiskSpace::HasChanged(bool ForceCheck)
      int Percent = VideoDiskSpace(&FreeMB);
      lastDiskSpaceCheck = time(NULL);
      if (ForceCheck || FreeMB != lastFreeMB) {
-        int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+        int MBperMinute = Recordings.MBperMinute();
+        if (MBperMinute <= 0)
+           MBperMinute = MB_PER_MINUTE;
+        int Minutes = int(double(FreeMB) / MBperMinute);
         int Hours = Minutes / 60;
         Minutes %= 60;
         freeDiskSpaceString = cString::sprintf("%s %d%%  -  %2d:%02d %s", tr("Disk"), Percent, Hours, Minutes, tr("free"));
@@ -935,7 +939,7 @@ cMenuEditTimer::~cMenuEditTimer()
 
 void cMenuEditTimer::SetHelpKeys(void)
 {
-  SetHelp(tr("Button$Folder"), data.weekdays ? tr("Button$Once") : tr("Button$Repeating"));
+  SetHelp(tr("Button$Folder"), data.weekdays ? tr("Button$Single") : tr("Button$Repeating"));
 }
 
 void cMenuEditTimer::SetFirstDayItem(void)
@@ -1347,9 +1351,9 @@ bool cMenuScheduleItem::Update(bool Force)
      const char *csn = channel ? channel->ShortName(true) : NULL;
      cString eds = event->GetDateString();
      if (channel && withDate)
-        buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
+        buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 999), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
      else if (channel)
-        buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title());
+        buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 999), csn, *event->GetTimeString(), t, v, r, event->Title());
      else
         buffer = cString::sprintf("%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
      SetText(buffer);
@@ -1383,7 +1387,7 @@ int cMenuWhatsOn::currentChannel = 0;
 const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
-:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6, 4)
+:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, CHNAMWIDTH, 6, 4)
 {
   now = Now;
   helpKeys = -1;
@@ -1607,7 +1611,7 @@ void cMenuSchedule::PrepareScheduleThisThis(const cEvent *Event, const cChannel
 void cMenuSchedule::PrepareScheduleThisAll(const cEvent *Event, const cChannel *Channel)
 {
   Clear();
-  SetCols(CHNUMWIDTH, 7, 7, 6, 4);
+  SetCols(CHNUMWIDTH, CHNAMWIDTH, 7, 6, 4);
   SetTitle(tr("This event - all channels"));
   if (schedules && Event) {
      for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
@@ -1626,7 +1630,7 @@ void cMenuSchedule::PrepareScheduleThisAll(const cEvent *Event, const cChannel *
 void cMenuSchedule::PrepareScheduleAllAll(const cEvent *Event, const cChannel *Channel)
 {
   Clear();
-  SetCols(CHNUMWIDTH, 7, 7, 6, 4);
+  SetCols(CHNUMWIDTH, CHNAMWIDTH, 7, 6, 4);
   SetTitle(tr("All events - all channels"));
   if (schedules) {
      for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
diff --git a/menuitems.c b/menuitems.c
index 6a6d88d61..ba205c0f5 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.12 2012/03/08 13:22:22 kls Exp $
+ * $Id: menuitems.c 2.13 2012/03/13 11:21:57 kls Exp $
  */
 
 #include "menuitems.h"
@@ -855,6 +855,7 @@ cMenuEditDateItem::cMenuEditDateItem(const char *Name, time_t *Value, int *WeekD
   value = Value;
   weekdays = WeekDays;
   oldvalue = 0;
+  oldweekdays = 0;
   dayindex = weekdays ? FindDayIndex(*weekdays) : 0;
   Set();
 }
@@ -892,10 +893,12 @@ void cMenuEditDateItem::ToggleRepeating(void)
      if (*weekdays) {
         *value = cTimer::SetTime(oldvalue ? oldvalue : time(NULL), 0);
         oldvalue = 0;
+        oldweekdays = *weekdays;
         *weekdays = 0;
         }
      else {
-        *weekdays = days[cTimer::GetWDay(*value)];
+        *weekdays = oldweekdays ? oldweekdays : days[cTimer::GetWDay(*value)];
+        oldweekdays = 0;
         dayindex = FindDayIndex(*weekdays);
         oldvalue = *value;
         *value = 0;
diff --git a/menuitems.h b/menuitems.h
index 3f2e4fd43..ffe995708 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.7 2012/03/08 12:38:46 kls Exp $
+ * $Id: menuitems.h 2.8 2012/03/13 11:19:11 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -163,6 +163,7 @@ class cMenuEditDateItem : public cMenuEditItem {
   time_t *value;
   int *weekdays;
   time_t oldvalue;
+  int oldweekdays;
   int dayindex;
   int FindDayIndex(int WeekDays);
   virtual void Set(void);
diff --git a/newplugin b/newplugin
index 53cbb73e9..59a9435ce 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.7 2012/01/18 12:32:31 kls Exp $
+# $Id: newplugin 2.8 2012/03/11 15:34:26 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -77,7 +77,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
diff --git a/plugin.c b/plugin.c
index 97b4436ab..52256ee0f 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 2.2 2010/01/06 11:36:46 kls Exp $
+ * $Id: plugin.c 2.3 2012/03/11 13:56:02 kls Exp $
  */
 
 #include "plugin.h"
@@ -130,11 +130,6 @@ cString cPlugin::SVDRPCommand(const char *Command, const char *Option, int &Repl
   return NULL;
 }
 
-void cPlugin::RegisterI18n(const void *)
-{
-  dsyslog("plugin '%s' called obsolete function RegisterI18n()", Name());
-}
-
 void cPlugin::SetConfigDirectory(const char *Dir)
 {
   free(configDirectory);
diff --git a/plugin.h b/plugin.h
index 4d70f9211..684b822a8 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 2.0 2007/08/04 09:56:26 kls Exp $
+ * $Id: plugin.h 2.1 2012/03/11 13:55:56 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -51,8 +51,6 @@ class cPlugin {
   void SetupStore(const char *Name, const char *Value = NULL);
   void SetupStore(const char *Name, int Value);
 
-  void RegisterI18n(const void *); ///< This function is obsolete and may be removed in future versions of VDR!
-
   virtual bool Service(const char *Id, void *Data = NULL);
   virtual const char **SVDRPHelpPages(void);
   virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
diff --git a/po/ar.po b/po/ar.po
index 4690de6de..1723eabf5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -660,7 +660,7 @@ msgstr "ملف"
 msgid "Button$Folder"
 msgstr "الموءقت"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ed4612409..801a39940 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -651,7 +651,7 @@ msgstr "Arxiu"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index b5856da9a..50697d138 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -650,7 +650,7 @@ msgstr "Soubor"
 msgid "Button$Folder"
 msgstr "Složka"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/da_DK.po b/po/da_DK.po
index 1d6535eb8..0777ee787 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -648,7 +648,7 @@ msgstr "Fil"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/de_DE.po b/po/de_DE.po
index 30af349c1..6bcee52d8 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -648,7 +648,7 @@ msgstr "Datei"
 msgid "Button$Folder"
 msgstr "Verzeichnis"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr "Einmalig"
 
 msgid "Button$Repeating"
diff --git a/po/el_GR.po b/po/el_GR.po
index 10fba4f50..f2bd7ff7d 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -648,7 +648,7 @@ msgstr "
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/es_ES.po b/po/es_ES.po
index f7fdf4730..3260e2444 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -649,7 +649,7 @@ msgstr "Fichero"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/et_EE.po b/po/et_EE.po
index ba288d79f..c808011c8 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -648,14 +648,14 @@ msgstr "Fail"
 msgid "Button$Folder"
 msgstr "Kaust"
 
-msgid "Button$Once"
-msgstr ""
+msgid "Button$Single"
+msgstr "Üks kord"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Korduv"
 
 msgid "First day"
-msgstr "Esimene päev"
+msgstr "1. päev"
 
 msgid "Select folder"
 msgstr "Kausta valik"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f8fcaf1f9..4e9ba735e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -651,11 +651,11 @@ msgstr "Tiedosto"
 msgid "Button$Folder"
 msgstr "Kansio"
 
-msgid "Button$Once"
-msgstr ""
+msgid "Button$Single"
+msgstr "Yksittäinen"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Toistuva"
 
 msgid "First day"
 msgstr "1. päivä"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 1f57d791e..4673b2eaa 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -654,7 +654,7 @@ msgstr "Fichier"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 4db904879..91499ca37 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -650,7 +650,7 @@ msgstr "Datoteka"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 10685165b..595fa6b49 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -651,7 +651,7 @@ msgstr "File"
 msgid "Button$Folder"
 msgstr "K�nyvt�r"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/it_IT.po b/po/it_IT.po
index bbeba537d..54beacaba 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2012-03-08 14:37+0100\n"
-"PO-Revision-Date: 2012-01-15 19:11+0100\n"
+"PO-Revision-Date: 2012-03-19 01:08+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -655,11 +655,11 @@ msgstr "Nome"
 msgid "Button$Folder"
 msgstr "Cartella"
 
-msgid "Button$Once"
-msgstr ""
+msgid "Button$Single"
+msgstr "Una volta"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repliche"
 
 msgid "First day"
 msgstr "1° giorno"
@@ -758,7 +758,7 @@ msgid "Delete recording?"
 msgstr "Eliminare la registrazione?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "La registrazione è stata modificata - sicuro di eliminare?"
 
 msgid "Error while deleting recording!"
 msgstr "Errore eliminazione registrazione!"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index a2abe00e6..50cd11da9 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -648,7 +648,7 @@ msgstr "Failas"
 msgid "Button$Folder"
 msgstr "Katalogas"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index afb2e6cbe..94935c8c0 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -649,7 +649,7 @@ msgstr "Датотека"
 msgid "Button$Folder"
 msgstr "Директориум"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 27ebaa7c5..20ee0cb06 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -652,7 +652,7 @@ msgstr "Bestandnaam"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 182209e19..a51967be1 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -649,7 +649,7 @@ msgstr "Filnavn"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 072fae9a7..5471341ab 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -649,7 +649,7 @@ msgstr "Plik"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9090178d6..360a09579 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -649,7 +649,7 @@ msgstr "Ficheiro"
 msgid "Button$Folder"
 msgstr "Pasta"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 1d5dc6029..7d875d57c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -651,7 +651,7 @@ msgstr "Fi
 msgid "Button$Folder"
 msgstr "Director"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 156b74538..203cb00a9 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -649,7 +649,7 @@ msgstr "
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 7f9a7f0e0..65dc7bd96 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -648,7 +648,7 @@ msgstr "S
 msgid "Button$Folder"
 msgstr "Zlo�ka"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6c87e94c8..b785143ed 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -649,7 +649,7 @@ msgstr "Datoteka"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index ee6f4c5d3..d5f7e9aee 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -654,7 +654,7 @@ msgstr "Datoteka"
 msgid "Button$Folder"
 msgstr "Taster$Direktorij"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 77a5c7758..4e9aba8d4 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -651,7 +651,7 @@ msgstr "Filnamn"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index bfc86242f..c11769b9a 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -648,7 +648,7 @@ msgstr "K
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 136282351..e17528243 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -648,7 +648,7 @@ msgstr "Файл"
 msgid "Button$Folder"
 msgstr "Каталог"
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ff86cf18..b878937e3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -651,7 +651,7 @@ msgstr "文件"
 msgid "Button$Folder"
 msgstr ""
 
-msgid "Button$Once"
+msgid "Button$Single"
 msgstr ""
 
 msgid "Button$Repeating"
diff --git a/receiver.h b/receiver.h
index ec9d80210..efa7be87f 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.5 2012/03/01 09:50:24 kls Exp $
+ * $Id: receiver.h 2.6 2012/03/11 15:25:40 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -14,7 +14,7 @@
 
 #define MAXRECEIVEPIDS  64 // the maximum number of PIDs per receiver
 
-#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
+//#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
 
 class cReceiver {
   friend class cDevice;
diff --git a/recording.c b/recording.c
index 47a9881ae..e1f7ec968 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.51 2012/02/26 13:58:26 kls Exp $
+ * $Id: recording.c 2.53 2012/03/13 13:17:57 kls Exp $
  */
 
 #include "recording.h"
@@ -1063,6 +1063,17 @@ int cRecording::LengthInSeconds(void) const
   return -1;
 }
 
+int cRecording::FileSizeMB(void) const
+{
+  if (fileSizeMB < 0) {
+     int fs = DirSizeMB(FileName());
+     if (time(NULL) - LastModifiedTime(FileName()) < MININDEXAGE)
+        return fs; // check again later for ongoing recordings
+     fileSizeMB = fs;
+     }
+  return fileSizeMB;
+}
+
 // --- cRecordings -----------------------------------------------------------
 
 cRecordings Recordings;
@@ -1127,14 +1138,13 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
                  cRecording *r = new cRecording(buffer);
                  if (r->Name()) {
                     r->NumFrames(); // initializes the numFrames member
+                    r->FileSizeMB(); // initializes the fileSizeMB member
+                    if (deleted)
+                       r->deleted = time(NULL);
                     Lock();
                     Add(r);
                     ChangeState();
                     Unlock();
-                    if (deleted) {
-                       r->fileSizeMB = DirSizeMB(buffer);
-                       r->deleted = time(NULL);
-                       }
                     }
                  else
                     delete r;
@@ -1216,7 +1226,6 @@ void cRecordings::DelByName(const char *FileName)
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
         if (access(recording->FileName(), F_OK) == 0) {
-           recording->fileSizeMB = DirSizeMB(recording->FileName());
            recording->deleted = time(NULL);
            DeletedRecordings.Add(recording);
            recording = NULL; // to prevent it from being deleted below
@@ -1241,12 +1250,33 @@ int cRecordings::TotalFileSizeMB(void)
   int size = 0;
   LOCK_THREAD;
   for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (recording->fileSizeMB > 0 && IsOnVideoDirectoryFileSystem(recording->FileName()))
-         size += recording->fileSizeMB;
+      int FileSizeMB = recording->FileSizeMB();
+      if (FileSizeMB > 0 && IsOnVideoDirectoryFileSystem(recording->FileName()))
+         size += FileSizeMB;
       }
   return size;
 }
 
+double cRecordings::MBperMinute(void)
+{
+  int size = 0;
+  int length = 0;
+  LOCK_THREAD;
+  for (cRecording *recording = First(); recording; recording = Next(recording)) {
+      if (IsOnVideoDirectoryFileSystem(recording->FileName())) {
+         int FileSizeMB = recording->FileSizeMB();
+         if (FileSizeMB > 0) {
+            int LengthInSeconds = recording->LengthInSeconds();
+            if (LengthInSeconds > 0) {
+               size += FileSizeMB;
+               length += LengthInSeconds;
+               }
+            }
+         }
+      }
+  return (size && length) ? double(size) * 60 / length : -1;
+}
+
 void cRecordings::ResetResume(const char *ResumeFileName)
 {
   LOCK_THREAD;
@@ -1526,9 +1556,6 @@ void cIndexFileGenerator::Action(void)
 
 #define INDEXFILESUFFIX     "/index"
 
-// The number of frames to stay off the end in case of time shift:
-#define INDEXSAFETYLIMIT 150 // frames
-
 // The maximum time to wait before giving up while catching up on an index file:
 #define MAXINDEXCATCHUP   8 // seconds
 
@@ -1728,7 +1755,7 @@ bool cIndexFile::CatchUp(int Index)
             }
          else
             LOG_ERROR_STR(*fileName);
-         if (Index < last - (i ? 2 * INDEXSAFETYLIMIT : 0) || Index > 10 * INDEXSAFETYLIMIT) // keep off the end in case of "Pause live video"
+         if (Index < last)
             break;
          cCondWait::SleepMs(1000);
          }
@@ -1775,13 +1802,13 @@ bool cIndexFile::Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *I
   return false;
 }
 
-int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off_t *FileOffset, int *Length, bool StayOffEnd)
+int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off_t *FileOffset, int *Length)
 {
   if (CatchUp()) {
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
-         if (Index >= 0 && Index < last - ((Forward && StayOffEnd) ? INDEXSAFETYLIMIT : 0)) {
+         if (Index >= 0 && Index < last) {
             if (index[Index].independent) {
                uint16_t fn;
                if (!FileNumber)
diff --git a/recording.h b/recording.h
index 61ec2a64f..5f94ee234 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.27 2012/02/19 10:44:53 kls Exp $
+ * $Id: recording.h 2.30 2012/03/13 12:41:05 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -22,7 +22,7 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
-#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
+//#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
 
 extern bool VfatFileSystem;
 extern int InstanceId;
@@ -129,6 +129,9 @@ class cRecording : public cListObject {
        ///< If the number of frames is unknown, -1 will be returned.
   int LengthInSeconds(void) const;
        ///< Returns the length (in seconds) of this recording, or -1 in case of error.
+  int FileSizeMB(void) const;
+       ///< Returns the total file size of this recording (in MB), or -1 if the file
+       ///< size is unknown.
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
@@ -190,7 +193,10 @@ class cRecordings : public cList<cRecording>, public cThread {
   void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
   void UpdateByName(const char *FileName);
-  int TotalFileSizeMB(void); ///< Only for deleted recordings!
+  int TotalFileSizeMB(void);
+  double MBperMinute(void);
+       ///< Returns the average data rate (in MB/min) of all recordings, or -1 if
+       ///< this value is unknown.
   };
 
 extern cRecordings Recordings;
@@ -284,7 +290,7 @@ class cIndexFile {
   bool Ok(void) { return index != NULL; }
   bool Write(bool Independent, uint16_t FileNumber, off_t FileOffset);
   bool Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *Independent = NULL, int *Length = NULL);
-  int GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber = NULL, off_t *FileOffset = NULL, int *Length = NULL, bool StayOffEnd = false);
+  int GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber = NULL, off_t *FileOffset = NULL, int *Length = NULL);
   int Get(uint16_t FileNumber, off_t FileOffset);
   int Last(void) { CatchUp(); return last; }
   int GetResume(void) { return resumeFile.Read(); }
diff --git a/skins.c b/skins.c
index ccf8c0993..b9c55ef4f 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.4 2012/02/20 11:47:15 kls Exp $
+ * $Id: skins.c 2.5 2012/03/11 14:36:11 kls Exp $
  */
 
 #include "skins.h"
@@ -78,9 +78,8 @@ void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
   tabs[3] = Tab3 ? tabs[2] + Tab3 : 0;
   tabs[4] = Tab4 ? tabs[3] + Tab4 : 0;
   tabs[5] = Tab5 ? tabs[4] + Tab5 : 0;
-  int AvgCharWidth = Setup.FontOsdSize * 4 / 6; // just an estimate
   for (int i = 1; i < MaxTabs; i++)
-      tabs[i] *= AvgCharWidth;
+      tabs[i] *= AvgCharWidth();
 }
 
 void cSkinDisplayMenu::Scroll(bool Up, bool Page)
diff --git a/skins.h b/skins.h
index 280a8e23a..19bba5139 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 2.1 2011/12/04 13:38:17 kls Exp $
+ * $Id: skins.h 2.2 2012/03/11 14:38:23 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -28,6 +28,8 @@ class cSkinDisplay {
 public:
   cSkinDisplay(void);
   virtual ~cSkinDisplay();
+  static int AvgCharWidth(void) { return Setup.FontOsdSize * 4 / 6; }
+       ///< Returns the average width of a character in pixel (just a raw estimate).
   int EditableWidth(void) { return editableWidth; }
   void SetEditableWidth(int Width) { editableWidth = Width; }
        ///< If an item is set through a call to cSkinDisplayMenu::SetItem(), this
diff --git a/skinsttng.c b/skinsttng.c
index 97e530895..4c3b6a472 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,10 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.13 2012/03/05 12:01:26 kls Exp $
+ * $Id: skinsttng.c 2.14 2012/03/11 14:06:05 kls Exp $
  */
 
-// Star Trek: The Next Generation� is a registered trademark of Paramount Pictures
+// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
 // registered in the United States Patent and Trademark Office.
 // No infringement intended.
 
diff --git a/vdr.c b/vdr.c
index 6df53fdd8..bafd4efd2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.34 2012/03/09 09:55:15 kls Exp $
+ * $Id: vdr.c 2.35 2012/03/14 09:09:19 kls Exp $
  */
 
 #include <getopt.h>
@@ -173,6 +173,7 @@ int main(int argc, char *argv[])
   // Initiate locale:
 
   setlocale(LC_ALL, "");
+  setlocale(LC_NUMERIC, "C"); // makes sure any floating point numbers written use a decimal point
 
   // Command line options:
 
@@ -550,7 +551,6 @@ int main(int argc, char *argv[])
      isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
      cCharSetConv::SetSystemCharacterTable(CodeSet);
      }
-  setlocale(LC_NUMERIC, "C"); // makes sure any floating point numbers written use a decimal point
 
   // Initialize internationalization:
 

From 5500959f4f73c21cef8910b3815b4ee3fa1327dd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 3 Jun 2012 12:44:00 +0200
Subject: [PATCH 214/307] Version 1.7.28 Original announce message: VDR
 developer version 1.7.28 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.28.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.27-1.7.28.diff

MD5 checksums:

3ccff2dcc42d112e23dd64f2c39f02f1  vdr-1.7.28.tar.bz2
7249ead4aca4b24e53d49d11c67e1613  vdr-1.7.27-1.7.28.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The new default skin "LCARS" displays the signal strengths and qualities of
all devices in its main menu. For devices that have an stb0899 frontend chip
(like the TT-budget S2-3200) retrieving this information from the driver is
rather slow, which results in a sluggish response to user input in the main
menu. To speed this up you may want to apply the patches from

From the HISTORY file:
- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
- Fixed getting the maximum short channel name length in case there are no short names
  at all (reported by Derek Kelly).
- The new function cDevice::DeviceType() returns a string identifying the type of
  the given device.
- Now limiting the number of characters of a channel's (short) name to 16 in the
  schedules menus, to keep that column from getting overly wide in case there is
  a channel with a very long name that has no short name.
- Fixed EPG scan on systems with only a single DVB device that use software output
  (reported by Juergen Lock).
- Skins can now inquire the menu category for which their cSkinDisplayMenu is currently
  being used. This can be done either through a call to cSkinDisplayMenu::MenuCategory()
  or by reimplementing cSkinDisplayMenu::SetMenuCategory(). This information allows a
  skin to use special icons or decorations for the various types of menus in VDR.
- The new setup option "DVB/Standard compliance" can be used to switch between different
  variations of the DVB standard (thanks to Rolf Ahrenberg). Currently there is "DVB"
  (for the original DVB standard) and "ANSI/SCTE", which is used to properly handle
  certain private stream types.
- The disk usage is no longer automatically added to the title of the main and
  "Recordings" menus. This has always been a mekeshift solution and it is now up
  to the individual skin if, where and how it wants to display this information.
  A skin can use the new cVideoDiskUsage class to implement such a display. For
  compatibility, the default skins "Classic VDR", "ST:TNG Panels" and "Text mode"
  (i.e. curses) have been changed to behave like before. Other skins may want to
  display the disk usage in totally different ways.
- A cOsdMenu can now handle skins that display different numbers of items in the
  various menu categories.
- OSD and skin are now reinitialized after a plugin setup page has been confirmed,
  to have them react immediately in case any change to a plugin's setup parameter
  has an effect on the OSD.
- The Timers list is now marked as modified whenever a recording starts or ends.
- Fixed cDevice::StillPicture(), making sure it doesn't call the derived class's
  function if no buffer has been allocated (reported by Marcus Roscher).
- Fixed the SVDRP command UPDR, which didn't update the global recordings list
  (reported by Lars Hanisch).
- cControl::Control() now has an additional boolean parameter, which can be set to
  true to get the current player control even if it is hidden.
- The new functions cControl::GetRecording() and cControl::GetHeader() can be used
  to retrieve information about what the current player is playing.
- Fixed a possible high CPU load when pausing replay (thanks to Reinhard Nissl).
- Fixed character comparisons in cSubtitleObject::DecodeCharacterString() (reported
  by Reinhard Mantey).
- Renamed the function cString::sprintf(const char *fmt, va_list &ap) to vsprintf(),
  because it might inadvertently be called with a 'char *' as the second argument on
  some compilers and cause a crash (reported by Sundararaj Reel).
- Removed the "bondedMasterFailed" mechanism from cDvbTuner, because it caused
  problems with the EPG scan in case a transponder is not receivable in a setup with
  bonded devices (reported by Michael Schneider).
- Making sure setup strings don't contain any newline characters (thanks to Joachim
  Wilke).
- The new member function cSkinDisplayReplay::SetRecording() allows a skin to display
  more information about the currently played recording.
- Fixed a mismatched 'delete' in cSchedules::SetEpgDataFileName() (thanks to Reinhard
  Mantey).
- The DrawText() functions of the OSD now accept the new alignment flag taBorder,
  which triggers keeping a proper distance from the edge that taLeft or taRight
  aligns to.
- Fixed checking for UTF-8 support in cFont::Bidi() (reported by Torsten Lang).
- If a recording has no info file, the 'title' of the recording's info is now set
  to the recording's name.
- cVector::Clear() now reinitializes any previously used members.
- Fixed resetting CAMs (thanks to Marco Skambraks).
- The new function RgbShade() (include osd.h) can be used to generate a brighter or
  darker version of a given color.
- The new class cSortedTimers can be used to quickly get a list of all timers, sorted
  by their start time.
- The new skin "LCARS" is an enhanced version of the "ST:TNG" skin (which is still
  there in its original layout, for those who don't like the LCARS skin, or can't use
  it due to OSD limitations). The LCARS skin utilizes the new "menu category" feature
  to display additional information on the main menu page. It shows upcoming timers
  and the system's devices, as well as which device is recording which timers. The
  upper pane of the main menu displays the programme data in live and replay mode,
  and a progress bar. An indicator on the right side of the device list shows which
  device is currently used for live viewing, and whether it is in transfer mode.
  The individual device displays show the device number, the device type, which CAM
  (if any ) is currently assigned to the device, and the signal strength and quality.
  On the left side of the OSD there is a permanent display of the current date and
  time, the disk usage and the system load.
  "LCARS" is the new default skin of VDR. It requires at least a 4bpp (16 color) full
  screen OSD, but you can still operate it if your OSD can handle only fewer colors
  (in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin).
- Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
  and LEGACY_CRECEIVER.
- Now making sure that the "small font" is never larger than the "osd font".
- Fixed font handling with fontconfig 2.9.0 or newer (thanks to Joerg Bornkessel).
- Extended the interface to the script that gets called for recordings, so that in
  the "edited" case it also provides the name of the original recording (thanks to
  Christian Richter).
- Added DeleteEvent() to the EPG handler interface, so that an EPG handler can trigger
  deleting of an event (thanks to Christian Kaiser).
- Speeded up opening menus on systems with many (several thousands) of recordings, by
  caching the information whether a recording is stored on the video directory file
  system within the cRecording data (based on a patch from Torsten Lang).
---
 CONTRIBUTORS                            |   38 +
 HISTORY                                 |   98 +-
 INSTALL                                 |   17 +-
 MANUAL                                  |    5 +
 Makefile                                |    4 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |  173 +-
 PLUGINS/src/dvbhddevice/hdffosd.c       |  104 +-
 PLUGINS/src/pictures/HISTORY            |    4 +
 PLUGINS/src/pictures/pictures.c         |    4 +-
 PLUGINS/src/pictures/player.c           |    7 +-
 PLUGINS/src/pictures/player.h           |    3 +-
 PLUGINS/src/skincurses/HISTORY          |    5 +
 PLUGINS/src/skincurses/skincurses.c     |   20 +-
 channels.c                              |    4 +-
 ci.c                                    |    3 +-
 config.c                                |   11 +-
 config.h                                |   21 +-
 cutter.c                                |    4 +-
 device.c                                |   13 +-
 device.h                                |    8 +-
 dvbdevice.c                             |   48 +-
 dvbdevice.h                             |    3 +-
 dvbplayer.c                             |    4 +-
 dvbsubtitle.c                           |    4 +-
 eit.c                                   |    7 +-
 eitscan.c                               |    4 +-
 epg.c                                   |   15 +-
 epg.h                                   |    8 +-
 font.c                                  |    9 +-
 menu.c                                  |  156 +-
 menu.h                                  |   12 +-
 menuitems.c                             |    3 +-
 osd.c                                   |   38 +-
 osd.h                                   |   12 +-
 osdbase.c                               |   14 +-
 osdbase.h                               |    6 +-
 pat.c                                   |   68 +-
 player.c                                |   16 +-
 player.h                                |   19 +-
 po/ar.po                                |   38 +-
 po/ca_ES.po                             |   38 +-
 po/cs_CZ.po                             |   38 +-
 po/da_DK.po                             |   38 +-
 po/de_DE.po                             |   38 +-
 po/el_GR.po                             |   38 +-
 po/es_ES.po                             |   38 +-
 po/et_EE.po                             |   38 +-
 po/fi_FI.po                             |   38 +-
 po/fr_FR.po                             |   38 +-
 po/hr_HR.po                             |   38 +-
 po/hu_HU.po                             |   38 +-
 po/it_IT.po                             |   38 +-
 po/lt_LT.po                             |   38 +-
 po/mk_MK.po                             |   38 +-
 po/nl_NL.po                             |   38 +-
 po/nn_NO.po                             |   38 +-
 po/pl_PL.po                             |   38 +-
 po/pt_PT.po                             |   38 +-
 po/ro_RO.po                             |   38 +-
 po/ru_RU.po                             |   38 +-
 po/sk_SK.po                             |   38 +-
 po/sl_SI.po                             |   38 +-
 po/sr_SR.po                             |   38 +-
 po/sv_SE.po                             |   38 +-
 po/tr_TR.po                             |   38 +-
 po/uk_UA.po                             |   38 +-
 po/zh_CN.po                             |   38 +-
 receiver.c                              |   18 +-
 receiver.h                              |    9 +-
 recording.c                             |   37 +-
 recording.h                             |   14 +-
 skinclassic.c                           |   20 +-
 skinlcars.c                             | 2114 +++++++++++++++++++++++
 skinlcars.h                             |   27 +
 skins.c                                 |   13 +-
 skins.h                                 |   20 +-
 skinsttng.c                             |   20 +-
 svdrp.c                                 |   34 +-
 svdrp.h                                 |    4 +-
 thread.c                                |    4 +-
 timers.c                                |   19 +-
 timers.h                                |    7 +-
 tools.c                                 |   13 +-
 tools.h                                 |   22 +-
 vdr.c                                   |    4 +-
 videodir.c                              |   42 +-
 videodir.h                              |   40 +-
 87 files changed, 3812 insertions(+), 725 deletions(-)
 create mode 100644 skinlcars.c
 create mode 100644 skinlcars.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 54bb679cc..baa09ee6a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1140,6 +1140,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for suggesting to change the Green button in the "Edit timer" menu from "Once"
  to "Single"
  for fixing reduced bpp support for DVB subtitles
+ for implementing "DVB Standard compliance" handling
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1309,6 +1310,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for making cEITScanner process new transponders before old ones, to make sure
  transponder changes are recognized
  for helping to debug switching into time shift mode when pausing live video
+ for fixing a possible high CPU load when pausing replay
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1782,6 +1784,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
  for modifying cCharSetConv so that it can be used to convert from "whatever VDR uses"
  to a given code
  for adding some missing 'const' to cDevice
+ for making sure setup strings don't contain any newline characters
 
 Sascha Klek <sklek@gmx.de>
  for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -2591,6 +2594,9 @@ Sundararaj Reel <sundararaj.reel@googlemail.com>
  for reporting a memory leak in cRecordings::ScanVideoDir() in case there are too
  many link levels
  for reporting a bug in cListBase::Move() in case From and To are equal
+ for reporting a problem with the function cString::sprintf(const char *fmt, va_list &ap),
+ that might inadvertently be called with a 'char *' as the second argument on some
+ compilers and cause a crash
 
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
@@ -2663,6 +2669,8 @@ Derek Kelly (user.vdr@gmail.com)
  could not be determined after resuming recording
  for reporting a problem with detecting frames for channels that split frames into
  several payloads
+ for reporting a problem with getting the maximum short channel name length in case there
+ are no short names at all
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2720,6 +2728,7 @@ Lars Hanisch <dvb@flensrocker.de>
  for suggesting to assign the source character 'V' to "Analog Video"
  for a patch that was used to implement SCR (Satellite Channel Routing)
  for implementing the SVDRP command 'UPDR'
+ for reporting that the SVDRP command UPDR didn't update the global recordings list
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -2771,6 +2780,7 @@ Dominik Strasser <dominik@die-strassers.de>
 
 Joerg Bornkessel <hd_brummy@gentoo.org>
  for adding LDFLAGS to the linker calls in the Makefiles
+ for fixing font handling with fontconfig 2.9.0 or newer
 
 Andreas Oberritter <obi@opendreambox.org>
  for suggesting to retrieve the include path to the freetype2 header files
@@ -2790,6 +2800,8 @@ Gerald Dachs <vdr@dachsweb.de>
 
 Juergen Lock <vdr-l@jelal.kn-bremen.de>
  for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
+ for reporting a problem with EPG scan on systems with only a single DVB device that
+ use software output
 
 Sergiu Dotenco <sergiu.dotenco@googlemail.com>
  for reporting a missing initialization in sDvbSpuRect
@@ -2849,6 +2861,9 @@ Torsten Lang <info@torstenlang.de>
  of EPG data from BSkyB's "MTV MUSIC"
  for suggesting to make BIDI support check at runtime whether the system runs with
  UTF-8
+ for reporting a bug in checking for UTF-8 support in cFont::Bidi()
+ for a patch that was used to implement caching the information whether a recording
+ is stored on the video directory file system within the cRecording data
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
@@ -2862,3 +2877,26 @@ Ralf Schueler <dl4mw@schueler.ws>
  from version 1.7.8 to 1.6.0-3
  for backporting "Fixed cRecordings::DelByName() to avoid compilation errors with
  gcc 4.4" from version 1.7.9 to 1.6.0-3
+
+Marcus Roscher <dad401@gmx.de>
+ for reporting a problem with cDevice::StillPicture(), which called the derived class's
+ function even if no buffer has been allocated
+
+Reinhard Mantey <geronimo013@gmx.de>
+ for reporting a problem with character comparisons in
+ cSubtitleObject::DecodeCharacterString()
+ for fixing a mismatched 'delete' in cSchedules::SetEpgDataFileName()
+
+Michael Schneider <vdrportal_midas@gmx.de>
+ for reporting a problem with the EPG scan in case a transponder is not receivable in
+ a setup with bonded devices
+
+Marco Skambraks <marco@ammec.de>
+ for fixing resetting CAMs
+
+Christian Richter <cr@crichter.net>
+ for extending the interface to the script that gets called for recordings, so that in
+ the "edited" case it also provides the name of the original recording
+
+Christian Kaiser <christian.kaiser@teleservice.com>
+ for adding DeleteEvent() to the EPG handler interface
diff --git a/HISTORY b/HISTORY
index 1a1c8a6aa..23412f862 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6603,7 +6603,7 @@ Video Disk Recorder Revision History
 - Now using pkg-config to get fribidi, freetype and fontconfig cflags and libs (thanks
   to Ville Skytt�).
 - The Makefile now also installs the include files (thanks to Ville Skytt�).
-- Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg).
+- Added handling of "ANSI/SCTE 57" descriptors (thanks to Rolf Ahrenberg).
 - Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard
   Nissl).
 
@@ -7051,3 +7051,99 @@ Video Disk Recorder Revision History
 - Reverted some improvements to Make.config.template (thanks to Christian Ruppert).
 - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
   Schmirler).
+
+2012-06-03: Version 1.7.28
+
+- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
+- Fixed getting the maximum short channel name length in case there are no short names
+  at all (reported by Derek Kelly).
+- The new function cDevice::DeviceType() returns a string identifying the type of
+  the given device.
+- Now limiting the number of characters of a channel's (short) name to 16 in the
+  schedules menus, to keep that column from getting overly wide in case there is
+  a channel with a very long name that has no short name.
+- Fixed EPG scan on systems with only a single DVB device that use software output
+  (reported by Juergen Lock).
+- Skins can now inquire the menu category for which their cSkinDisplayMenu is currently
+  being used. This can be done either through a call to cSkinDisplayMenu::MenuCategory()
+  or by reimplementing cSkinDisplayMenu::SetMenuCategory(). This information allows a
+  skin to use special icons or decorations for the various types of menus in VDR.
+- The new setup option "DVB/Standard compliance" can be used to switch between different
+  variations of the DVB standard (thanks to Rolf Ahrenberg). Currently there is "DVB"
+  (for the original DVB standard) and "ANSI/SCTE", which is used to properly handle
+  certain private stream types.
+- The disk usage is no longer automatically added to the title of the main and
+  "Recordings" menus. This has always been a mekeshift solution and it is now up
+  to the individual skin if, where and how it wants to display this information.
+  A skin can use the new cVideoDiskUsage class to implement such a display. For
+  compatibility, the default skins "Classic VDR", "ST:TNG Panels" and "Text mode"
+  (i.e. curses) have been changed to behave like before. Other skins may want to
+  display the disk usage in totally different ways.
+- A cOsdMenu can now handle skins that display different numbers of items in the
+  various menu categories.
+- OSD and skin are now reinitialized after a plugin setup page has been confirmed,
+  to have them react immediately in case any change to a plugin's setup parameter
+  has an effect on the OSD.
+- The Timers list is now marked as modified whenever a recording starts or ends.
+- Fixed cDevice::StillPicture(), making sure it doesn't call the derived class's
+  function if no buffer has been allocated (reported by Marcus Roscher).
+- Fixed the SVDRP command UPDR, which didn't update the global recordings list
+  (reported by Lars Hanisch).
+- cControl::Control() now has an additional boolean parameter, which can be set to
+  true to get the current player control even if it is hidden.
+- The new functions cControl::GetRecording() and cControl::GetHeader() can be used
+  to retrieve information about what the current player is playing.
+- Fixed a possible high CPU load when pausing replay (thanks to Reinhard Nissl).
+- Fixed character comparisons in cSubtitleObject::DecodeCharacterString() (reported
+  by Reinhard Mantey).
+- Renamed the function cString::sprintf(const char *fmt, va_list &ap) to vsprintf(),
+  because it might inadvertently be called with a 'char *' as the second argument on
+  some compilers and cause a crash (reported by Sundararaj Reel).
+- Removed the "bondedMasterFailed" mechanism from cDvbTuner, because it caused
+  problems with the EPG scan in case a transponder is not receivable in a setup with
+  bonded devices (reported by Michael Schneider).
+- Making sure setup strings don't contain any newline characters (thanks to Joachim
+  Wilke).
+- The new member function cSkinDisplayReplay::SetRecording() allows a skin to display
+  more information about the currently played recording.
+- Fixed a mismatched 'delete' in cSchedules::SetEpgDataFileName() (thanks to Reinhard
+  Mantey).
+- The DrawText() functions of the OSD now accept the new alignment flag taBorder,
+  which triggers keeping a proper distance from the edge that taLeft or taRight
+  aligns to.
+- Fixed checking for UTF-8 support in cFont::Bidi() (reported by Torsten Lang).
+- If a recording has no info file, the 'title' of the recording's info is now set
+  to the recording's name.
+- cVector::Clear() now reinitializes any previously used members.
+- Fixed resetting CAMs (thanks to Marco Skambraks).
+- The new function RgbShade() (include osd.h) can be used to generate a brighter or
+  darker version of a given color.
+- The new class cSortedTimers can be used to quickly get a list of all timers, sorted
+  by their start time.
+- The new skin "LCARS" is an enhanced version of the "ST:TNG" skin (which is still
+  there in its original layout, for those who don't like the LCARS skin, or can't use
+  it due to OSD limitations). The LCARS skin utilizes the new "menu category" feature
+  to display additional information on the main menu page. It shows upcoming timers
+  and the system's devices, as well as which device is recording which timers. The
+  upper pane of the main menu displays the programme data in live and replay mode,
+  and a progress bar. An indicator on the right side of the device list shows which
+  device is currently used for live viewing, and whether it is in transfer mode.
+  The individual device displays show the device number, the device type, which CAM
+  (if any ) is currently assigned to the device, and the signal strength and quality.
+  On the left side of the OSD there is a permanent display of the current date and
+  time, the disk usage and the system load.
+  "LCARS" is the new default skin of VDR. It requires at least a 4bpp (16 color) full
+  screen OSD, but you can still operate it if your OSD can handle only fewer colors
+  (in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin).
+- Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
+  and LEGACY_CRECEIVER.
+- Now making sure that the "small font" is never larger than the "osd font".
+- Fixed font handling with fontconfig 2.9.0 or newer (thanks to Joerg Bornkessel).
+- Extended the interface to the script that gets called for recordings, so that in
+  the "edited" case it also provides the name of the original recording (thanks to
+  Christian Richter).
+- Added DeleteEvent() to the EPG handler interface, so that an EPG handler can trigger
+  deleting of an event (thanks to Christian Kaiser).
+- Speeded up opening menus on systems with many (several thousands) of recordings, by
+  caching the information whether a recording is stored on the video directory file
+  system within the cRecording data (based on a patch from Torsten Lang).
diff --git a/INSTALL b/INSTALL
index 1096a31fe..e155f9b4c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -88,6 +88,15 @@ vdr:123:respawn:/usr/local/bin/vdr --terminal=/dev/tty8 -w 60
 
 See the man page vdr(1) for complete information about all command line options.
 
+Standard compliance
+-------------------
+
+Basically VDR works according to the DVB standard, but there are countries/providers
+that use other standards, which in some details deviate from the DVB standard.
+This makes it necessary to handle things differently in some areas, depending on
+which standard is actually used. If this is the case in your area, you may need
+to adjust the option "DVB/Standard compliance" in the Setup menu accordingly.
+
 Locale
 ------
 
@@ -235,8 +244,8 @@ You can use the '-r' option to define a program or script that gets called
 before and after a recording is performed, and after an editing process
 has finished.
 
-The program will be called with two string parameters. The first parameter
-is one of
+The program will be called with two or three (in case of "edited") string
+parameters. The first parameter is one of
 
   before      if this is *before* a recording starts
   after       if this is *after* a recording has finished
@@ -244,7 +253,8 @@ is one of
 
 and the second parameter contains the full name of the recording's
 directory (which may not yet exists at that moment in the "before" case).
-In the "edited" case it will be the name of the edited version.
+In the "edited" case it will be the name of the edited version (second
+parameter) and the name of the source version (third parameter).
 
 Within this program you can do anything you would like to do before and/or
 after a recording or after an editing process. However, the program must return
@@ -265,6 +275,7 @@ case "$1" in
             ;;
      edited)
             echo "Edited recording $2"
+            echo "Source recording $3"
             ;;
      *)
             echo "ERROR: unknown state: $1"
diff --git a/MANUAL b/MANUAL
index 524062873..a33f3bf6d 100644
--- a/MANUAL
+++ b/MANUAL
@@ -674,6 +674,11 @@ Version 1.6
                          from the primary DVB interface, so that the viewer will
                          be disturbed as little as possible.
 
+  Standard Compliance = 0
+                         Defines the standard compliance mode:
+                         0 = DVB
+                         1 = ANSI/SCTE
+                         
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
                          (4:3 or 16:9).
 
diff --git a/Makefile b/Makefile
index 019a0042a..a0458d4fa 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.26 2012/03/11 15:33:57 kls Exp $
+# $Id: Makefile 2.27 2012/04/15 13:21:31 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -44,7 +44,7 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
-       skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
+       skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
 
 ifndef NO_KBD
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index ced24f51a..f8b47bd71 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.41 2012/03/07 13:52:41 kls Exp $
+ * $Id: dvbhdffdevice.c 1.43 2012/05/08 11:40:32 kls Exp $
  */
 
 #include <stdint.h>
@@ -50,7 +50,7 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
      mHdffCmdIf = new HDFF::cHdffCmdIf(fd_osd);
 
      /* reset some stuff in case the VDR was killed before and had no chance
-	to clean up. */
+        to clean up. */
      mHdffCmdIf->CmdOsdReset();
 
      mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
@@ -183,68 +183,72 @@ void cDvbHdFfDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
   gHdffSetup.GetOsdSize(Width, Height, PixelAspect);
 }
 
-/*TODO obsolete?
-bool cDvbHdFfDevice::SetAudioBypass(bool On)
-{
-  if (setTransferModeForDolbyDigital != 1)
-     return false;
-  return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
-}
-TODO*/
-
 bool cDvbHdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 {
-  if (Handle->pid) {
-     dmx_pes_filter_params pesFilterParams;
-     memset(&pesFilterParams, 0, sizeof(pesFilterParams));
-     if (On) {
-        if (Handle->handle < 0) {
-           Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
-           if (Handle->handle < 0) {
-              LOG_ERROR;
-              return false;
-              }
-           }
-        if (Type == ptPcr)
-           mHdffCmdIf->CmdAvSetPcrPid(0, Handle->pid);
-        else if (Type == ptVideo) {
-           if (Handle->streamType == 0x1B)
-              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_H264);
-           else
-              mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_MPEG2);
-           }
-        else if (Type == ptAudio)
-           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG1);
-        else if (Type == ptDolby)
-           mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_AC3);
-        if (!(Type <= ptDolby && Handle->used <= 1)) {
-           pesFilterParams.pid     = Handle->pid;
-           pesFilterParams.input   = DMX_IN_FRONTEND;
-           pesFilterParams.output  = DMX_OUT_TS_TAP;
-           pesFilterParams.pes_type= DMX_PES_OTHER;
-           pesFilterParams.flags   = DMX_IMMEDIATE_START;
-           if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-              LOG_ERROR;
-              return false;
-              }
-           }
+    //printf("SetPid Type %d, On %d, PID %5d, streamtype %d, handle %d, used %d\n", Type, On, Handle->pid, Handle->streamType, Handle->handle, Handle->used);
+    if (Handle->pid) {
+        dmx_pes_filter_params pesFilterParams;
+        memset(&pesFilterParams, 0, sizeof(pesFilterParams));
+        if (On) {
+            if (Handle->handle < 0) {
+                Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
+                if (Handle->handle < 0) {
+                    LOG_ERROR;
+                    return false;
+                }
+            }
+            if (Type == ptPcr)
+                mHdffCmdIf->CmdAvSetPcrPid(0, Handle->pid);
+            else if (Type == ptVideo) {
+                if (Handle->streamType == 0x1B)
+                    mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_H264);
+                else
+                    mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_MPEG2);
+            }
+            else if (Type == ptAudio) {
+                if (Handle->streamType == 0x03)
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG1);
+                else if (Handle->streamType == 0x04)
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG2);
+                else if (Handle->streamType == SI::AC3DescriptorTag)
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_AC3);
+                else if (Handle->streamType == SI::EnhancedAC3DescriptorTag)
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_EAC3);
+                else if (Handle->streamType == 0x0F)
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_AAC);
+                else if (Handle->streamType == 0x11)
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_HE_AAC);
+                else
+                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG1);
+            }
+            if (!(Type <= ptDolby && Handle->used <= 1)) {
+                pesFilterParams.pid     = Handle->pid;
+                pesFilterParams.input   = DMX_IN_FRONTEND;
+                pesFilterParams.output  = DMX_OUT_TS_TAP;
+                pesFilterParams.pes_type= DMX_PES_OTHER;
+                pesFilterParams.flags   = DMX_IMMEDIATE_START;
+                if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+                    LOG_ERROR;
+                    return false;
+                }
+            }
         }
-     else if (!Handle->used) {
-        CHECK(ioctl(Handle->handle, DMX_STOP));
-        if (Type == ptPcr)
-           mHdffCmdIf->CmdAvSetPcrPid(0, 0);
-        else if (Type == ptVideo)
-           mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
-        else if (Type == ptAudio)
-           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
-        else if (Type == ptDolby)
-           mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_AC3);
-        //TODO missing setting to 0x1FFF??? see cDvbDevice::SetPid()
-        close(Handle->handle);
-        Handle->handle = -1;
+        else if (!Handle->used) {
+            CHECK(ioctl(Handle->handle, DMX_STOP));
+            if (Type == ptPcr)
+                mHdffCmdIf->CmdAvSetPcrPid(0, 0);
+            else if (Type == ptVideo)
+                mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
+            else if (Type == ptAudio)
+                mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
+            else if (Type == ptDolby)
+                mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_AC3);
+            //TODO missing setting to 0x1FFF??? see cDvbDevice::SetPid()
+            close(Handle->handle);
+            Handle->handle = -1;
         }
-     }
-  return true;
+    }
+    return true;
 }
 
 void cDvbHdFfDevice::TurnOffLiveMode(bool LiveView)
@@ -286,6 +290,8 @@ bool cDvbHdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
      StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
 
+  //printf("SetChannelDevice Transfer %d, Live %d\n", StartTransferMode, LiveView);
+
   bool TurnOnLivePIDs = !StartTransferMode && LiveView;
 
   // Turn off live PIDs if necessary:
@@ -301,13 +307,10 @@ bool cDvbHdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // PID settings:
 
   if (TurnOnLivePIDs) {
-     //SetAudioBypass(false);//TODO obsolete?
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo, Channel->Vtype()) && AddPid(apid, ptAudio))) {
+     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo, Channel->Vtype()) && AddPid(apid ? apid : dpid, ptAudio, apid ? 0 : Channel->Dtype(0)))) {
         esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
         return false;
         }
-     if (IsPrimaryDevice())
-        AddPid(Channel->Tpid(), ptTeletext);//TODO obsolete?
      }
   else if (StartTransferMode)
      cControl::Launch(new cTransferControl(this, Channel));
@@ -338,27 +341,31 @@ void cDvbHdFfDevice::SetDigitalAudioDevice(bool On)
 
 void cDvbHdFfDevice::SetAudioTrackDevice(eTrackType Type)
 {
-  //printf("SetAudioTrackDevice %d\n", Type);
-  const tTrackId *TrackId = GetTrack(Type);
-  if (TrackId && TrackId->id) {
-     if (IS_AUDIO_TRACK(Type)) {
+    //printf("SetAudioTrackDevice %d\n", Type);
+    const tTrackId *TrackId = GetTrack(Type);
+    if (TrackId && TrackId->id) {
+        int streamType = 0;
+        cChannel * channel = Channels.GetByNumber(CurrentChannel());
+        if (channel) {
+            if (IS_AUDIO_TRACK(Type))
+                streamType = channel->Atype(Type - ttAudioFirst);
+            else if (IS_DOLBY_TRACK(Type))
+                streamType = channel->Dtype(Type - ttDolbyFirst);
+        }
+        //printf("SetAudioTrackDevice new %d %d, current %d\n", TrackId->id, streamType, pidHandles[ptAudio].pid);
         if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
-           DetachAll(pidHandles[ptAudio].pid);
-           if (CamSlot())
-              CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
-           pidHandles[ptAudio].pid = TrackId->id;
-           SetPid(&pidHandles[ptAudio], ptAudio, true);
-           if (CamSlot()) {
-              CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
-              CamSlot()->StartDecrypting();
-              }
-           }
-	}
-     else if (IS_DOLBY_TRACK(Type)) {
-        pidHandles[ptDolby].pid = TrackId->id;
-        SetPid(&pidHandles[ptDolby], ptDolby, true);
+            DetachAll(pidHandles[ptAudio].pid);
+            if (CamSlot())
+                CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
+            pidHandles[ptAudio].pid = TrackId->id;
+            pidHandles[ptAudio].streamType = streamType;
+            SetPid(&pidHandles[ptAudio], ptAudio, true);
+            if (CamSlot()) {
+                CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
+                CamSlot()->StartDecrypting();
+            }
         }
-     }
+    }
 }
 
 bool cDvbHdFfDevice::CanReplay(void) const
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index a492275b3..0b95707a5 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffosd.c 1.12 2011/12/04 15:31:41 kls Exp $
+ * $Id: hdffosd.c 1.15 2012/05/17 13:29:50 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -40,7 +40,6 @@ class cHdffOsd : public cOsd
     int mDispHeight;
     bool shown;
     bool mChanged;
-    bool mBitmapModified;
     uint32_t mDisplay;
     tFontFace mFontFaces[MAX_NUM_FONTFACES];
     tFont mFonts[MAX_NUM_FONTS];
@@ -53,7 +52,6 @@ class cHdffOsd : public cOsd
 public:
     cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level);
     virtual ~cHdffOsd();
-    cBitmap *GetBitmap(int Area);
     virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
     virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
     virtual void SaveRegion(int x1, int y1, int x2, int y2);
@@ -79,9 +77,8 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
     mTop = Top;
     shown = false;
     mChanged = false;
-    mBitmapModified = false;
     mBitmapPalette = HDFF_INVALID_HANDLE;
-    config.FontKerning = false;
+    config.FontKerning = true;
     config.FontAntialiasing = Setup.AntiAlias ? true : false;
     mHdffCmdIf->CmdOsdConfigure(&config);
 
@@ -126,14 +123,6 @@ cHdffOsd::~cHdffOsd()
     mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
 }
 
-cBitmap * cHdffOsd::GetBitmap(int Area)
-{
-    //printf("GetBitmap %d\n", Area);
-    mChanged = true;
-    mBitmapModified = true;
-    return cOsd::GetBitmap(Area);
-}
-
 eOsdError cHdffOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 {
     eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
@@ -150,6 +139,9 @@ eOsdError cHdffOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
 
 eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
 {
+    eOsdError error;
+    cBitmap * bitmap;
+
     for (int i = 0; i < NumAreas; i++)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
@@ -160,7 +152,14 @@ eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
         mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
         shown = false;
     }
-    return cOsd::SetAreas(Areas, NumAreas);
+    error = cOsd::SetAreas(Areas, NumAreas);
+
+    for (int i = 0; (bitmap = GetBitmap(i)) != NULL; i++)
+    {
+        bitmap->Clean();
+    }
+
+    return error;
 }
 
 void cHdffOsd::SetActive(bool On)
@@ -186,25 +185,22 @@ void cHdffOsd::SaveRegion(int x1, int y1, int x2, int y2)
 {
     mHdffCmdIf->CmdOsdSaveRegion(mDisplay, mLeft + x1, mTop + y1, x2 - x1 + 1, y2 - y1 + 1);
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::RestoreRegion(void)
 {
     mHdffCmdIf->CmdOsdRestoreRegion(mDisplay);
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::DrawPixel(int x, int y, tColor Color)
 {
     //printf("DrawPixel\n");
-    mBitmapModified = false;
 }
 
 void cHdffOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
 {
-    //printf("DrawBitmap %d %d %d\n", x, y, Overlay);
+    //printf("DrawBitmap %d %d %d x %d\n", x, y, Bitmap.Width(), Bitmap.Height());
     int i;
     int numColors;
     const tColor * colors = Bitmap.Colors(numColors);
@@ -230,37 +226,21 @@ void cHdffOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, t
         mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
                 HDFF_COLOR_FORMAT_ARGB, 0, numColors, mBitmapColors);
     }
-    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y,
-        (uint8_t *) Bitmap.Data(0, 0), Bitmap.Width(), Bitmap.Height(),
-        Bitmap.Width() * Bitmap.Height(), HDFF_COLOR_TYPE_CLUT8, mBitmapPalette);
-#if 0
-    uint32_t * tmpBitmap = new uint32_t[Bitmap.Width() * Bitmap.Height()];
-    for (int ix = 0; ix < Bitmap.Width(); ix++)
+    int width = Bitmap.Width();
+    int height = Bitmap.Height();
+    int chunk = MAX_BITMAP_SIZE / width;
+    if (chunk > height)
+        chunk = height;
+    for (int yc = 0; yc < height; yc += chunk)
     {
-        for (int iy = 0; iy < Bitmap.Height(); iy++)
-        {
-            const tIndex * pixel = Bitmap.Data(ix, iy);
-            tColor color = Bitmap.Color(*pixel);
-            if (!Overlay || *pixel != 0)
-            {
-                if (ColorFg || ColorBg)
-                {
-                    if (*pixel == 0)
-                        color = ColorBg;
-                    else if (*pixel == 1)
-                        color = ColorFg;
-                }
-                tmpBitmap[Bitmap.Width() * iy + ix] = color;
-            }
-        }
+        int hc = chunk;
+        if (yc + hc > height)
+            hc = height - yc;
+        mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y + yc,
+            (uint8_t *) Bitmap.Data(0, yc), width, hc,
+            width * hc, HDFF_COLOR_TYPE_CLUT8, mBitmapPalette);
     }
-    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y,
-        (uint8_t *) tmpBitmap, Bitmap.Width(), Bitmap.Height(),
-        Bitmap.Width() * Bitmap.Height() * 4, HDFF::colorTypeARGB8888, InvalidHandle);
-    delete[] tmpBitmap;
-#endif
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
@@ -365,11 +345,16 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
         if (Width)
         {
             if ((Alignment & taLeft) != 0)
-                ;
+            {
+                if ((Alignment & taBorder) != 0)
+                    x += max(h / TEXT_ALIGN_BORDER, 1);
+            }
             else if ((Alignment & taRight) != 0)
             {
                 if (w < Width)
                     x += Width - w;
+                if ((Alignment & taBorder) != 0)
+                    x -= max(h / TEXT_ALIGN_BORDER, 1);
             }
             else
             { // taCentered
@@ -413,14 +398,12 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
     mHdffCmdIf->CmdOsdSetDisplayClippingArea(mDisplay, false, 0, 0, 0, 0);
     //Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
 {
     mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, mLeft + x1, mTop + y1, x2 - x1 + 1, y2 - y1 + 1, Color);
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
@@ -511,14 +494,12 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
     }
     mHdffCmdIf->CmdOsdDrawEllipse(mDisplay, mLeft + cx, mTop + cy, rx, ry, Color, flags);
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
     //printf("DrawSlope\n");
     mChanged = true;
-    mBitmapModified = false;
 }
 
 void cHdffOsd::Flush(void)
@@ -526,23 +507,30 @@ void cHdffOsd::Flush(void)
     if (!Active())
         return;
 
-    if (!mChanged)
-        return;
-
     //printf("Flush\n");
-    if (mBitmapModified)
+    cBitmap * Bitmap;
+
+    for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++)
     {
-        cBitmap *Bitmap;
-        for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++)
+        int x1;
+        int y1;
+        int x2;
+        int y2;
+
+        if (Bitmap->Dirty(x1, y1, x2, y2))
         {
+            //printf("dirty %d %d, %d %d\n", x1, y1, x2, y2);
             DrawBitmap(0, 0, *Bitmap);
+            Bitmap->Clean();
         }
     }
 
+    if (!mChanged)
+        return;
+
     mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
 
     mChanged = false;
-    mBitmapModified = false;
 }
 
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index e0826ee03..9426283b9 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -71,3 +71,7 @@ VDR Plugin 'pictures' Revision History
 2012-02-27: Version 0.1.2
 
 - Removed an obsolete command line option.
+
+2012-04-2r8 Version 0.1.3
+
+- Added cPictureControl::GetHeader().
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 27febdf43..77df0d9ac 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.5 2012/02/27 11:40:15 kls Exp $
+ * $Id: pictures.c 2.6 2012/04/28 11:58:42 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.2";
+static const char *VERSION       = "0.1.3";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index 4b289ac9f..6048d4cb1 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 2.1 2011/02/20 17:15:25 kls Exp $
+ * $Id: player.c 2.2 2012/04/28 11:58:15 kls Exp $
  */
 
 #include "player.h"
@@ -204,6 +204,11 @@ void cPictureControl::DisplayCaption(void)
   osd->Flush();
 }
 
+cString cPictureControl::GetHeader(void)
+{
+  return tr("Pictures");
+}
+
 eOSState cPictureControl::ProcessKey(eKeys Key)
 {
   switch (Key) {
diff --git a/PLUGINS/src/pictures/player.h b/PLUGINS/src/pictures/player.h
index 67a274dfb..7a0b401f8 100644
--- a/PLUGINS/src/pictures/player.h
+++ b/PLUGINS/src/pictures/player.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.h 2.0 2008/01/12 16:21:57 kls Exp $
+ * $Id: player.h 2.1 2012/04/28 11:56:01 kls Exp $
  */
 
 #ifndef _PLAYER_H
@@ -39,6 +39,7 @@ class cPictureControl : public cControl {
 public:
   cPictureControl(cPictureEntry *Pictures, const cPictureEntry *PictureEntry, bool SlideShow = false);
   virtual ~cPictureControl();
+  virtual cString GetHeader(void);
   virtual eOSState ProcessKey(eKeys Key);
   static bool Active(void) { return active > 0; }
   static const char *LastDisplayed(void);
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 0ba892eaf..deb011b5c 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -96,3 +96,8 @@ VDR Plugin 'skincurses' Revision History
 2012-03-11: Version 0.1.11
 
 - Adapted menu column widths of 'skincurses' to the wider HD OSD sizes.
+
+2012-04-23: Version 0.1.12
+
+- Now displaying disk usage in the title of the main and "Recordings" menu,
+  which is no longer done by the VDR core.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 1f120c7c5..587d0b971 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,15 +3,16 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.8 2012/03/11 14:42:52 kls Exp $
+ * $Id: skincurses.c 2.9 2012/04/23 08:53:13 kls Exp $
  */
 
 #include <ncurses.h>
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 #include <vdr/skins.h>
+#include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.11";
+static const char *VERSION        = "0.1.12";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -262,6 +263,9 @@ void cSkinCursesDisplayChannel::Flush(void)
 class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
 private:
   cOsd *osd;
+  cString title;
+  int lastDiskUsageState;
+  void DrawTitle(void);
   void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
   void SetTextScrollbar(void);
 public:
@@ -285,6 +289,7 @@ class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
 cSkinCursesDisplayMenu::cSkinCursesDisplayMenu(void)
 {
   osd = new cCursesOsd(0, 0);
+  lastDiskUsageState = -1;
   osd->DrawRectangle(0, 0, ScOsdWidth - 1, ScOsdHeight - 1, clrBackground);
 }
 
@@ -332,9 +337,16 @@ void cSkinCursesDisplayMenu::Clear(void)
   textScroller.Reset();
 }
 
+void cSkinCursesDisplayMenu::DrawTitle(void)
+{
+  bool WithDisk = MenuCategory() == mcMain || MenuCategory() == mcRecording;
+  osd->DrawText(0, 0, WithDisk ? cString::sprintf("%s  -  %s", *title, *cVideoDiskUsage::String()) : title, clrBlack, clrCyan, &Font, ScOsdWidth);
+}
+
 void cSkinCursesDisplayMenu::SetTitle(const char *Title)
 {
-  osd->DrawText(0, 0, Title, clrBlack, clrCyan, &Font, ScOsdWidth);
+  title = Title;
+  DrawTitle();
 }
 
 void cSkinCursesDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
@@ -475,6 +487,8 @@ void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
 
 void cSkinCursesDisplayMenu::Flush(void)
 {
+  if (cVideoDiskUsage::HasChanged(lastDiskUsageState))
+     DrawTitle();
   cString date = DayDateTime();
   osd->DrawText(ScOsdWidth - Utf8StrLen(date) - 2, 0, date, clrBlack, clrCyan, &Font);
   osd->Flush();
diff --git a/channels.c b/channels.c
index 4108b7b49..65e51348f 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.21 2012/03/11 13:29:06 kls Exp $
+ * $Id: channels.c 2.22 2012/04/01 09:27:08 kls Exp $
  */
 
 #include "channels.h"
@@ -955,7 +955,7 @@ int cChannels::MaxShortChannelNameLength(void)
   if (!maxShortChannelNameLength) {
      for (cChannel *channel = First(); channel; channel = Next(channel)) {
          if (!channel->GroupSep())
-            maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName()), maxShortChannelNameLength);
+            maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName(true)), maxShortChannelNameLength);
          }
      }
   return maxShortChannelNameLength;
diff --git a/ci.c b/ci.c
index 0135d07a3..ebed32043 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.8 2012/02/29 10:24:41 kls Exp $
+ * $Id: ci.c 2.9 2012/05/29 11:13:40 kls Exp $
  */
 
 #include "ci.h"
@@ -1715,6 +1715,7 @@ bool cCamSlot::Reset(void)
      if (ciAdapter->Reset(slotIndex)) {
         resetTime = time(NULL);
         dbgprotocol("ok.\n");
+        lastModuleStatus = msReset;
         return true;
         }
      dbgprotocol("failed!\n");
diff --git a/config.c b/config.c
index 302a45b3d..b6c4b42d2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.20 2012/02/29 10:15:54 kls Exp $
+ * $Id: config.c 2.22 2012/05/11 11:06:57 kls Exp $
  */
 
 #include "config.h"
@@ -309,9 +309,9 @@ cSetupLine::cSetupLine(void)
 
 cSetupLine::cSetupLine(const char *Name, const char *Value, const char *Plugin)
 {
-  name = strdup(Name);
-  value = strdup(Value);
-  plugin = Plugin ? strdup(Plugin) : NULL;
+  name = strreplace(strdup(Name), '\n', 0);
+  value = strreplace(strdup(Value), '\n', 0);
+  plugin = Plugin ? strreplace(strdup(Plugin), '\n', 0) : NULL;
 }
 
 cSetupLine::~cSetupLine()
@@ -391,6 +391,7 @@ cSetup::cSetup(void)
   SetSystemTime = 0;
   TimeSource = 0;
   TimeTransponder = 0;
+  StandardCompliance = STANDARD_DVB;
   MarginStart = 2;
   MarginStop = 10;
   AudioLanguages[0] = -1;
@@ -585,6 +586,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
   else if (!strcasecmp(Name, "TimeSource"))          TimeSource         = cSource::FromString(Value);
   else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
+  else if (!strcasecmp(Name, "StandardCompliance"))  StandardCompliance = atoi(Value);
   else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
   else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
   else if (!strcasecmp(Name, "AudioLanguages"))      return ParseLanguages(Value, AudioLanguages);
@@ -682,6 +684,7 @@ bool cSetup::Save(void)
   Store("SetSystemTime",      SetSystemTime);
   Store("TimeSource",         cSource::ToString(TimeSource));
   Store("TimeTransponder",    TimeTransponder);
+  Store("StandardCompliance", StandardCompliance);
   Store("MarginStart",        MarginStart);
   Store("MarginStop",         MarginStop);
   StoreLanguages("AudioLanguages", AudioLanguages);
diff --git a/config.h b/config.h
index 9d6539797..e283d77c6 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.45 2012/03/11 10:41:44 kls Exp $
+ * $Id: config.h 2.47 2012/04/15 10:45:32 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.27"
-#define VDRVERSNUM   10727  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.28"
+#define VDRVERSNUM   10728  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.27"
-#define APIVERSNUM   10727  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.28"
+#define APIVERSNUM   10728  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -52,6 +52,16 @@
 #define MaxSkinName 16
 #define MaxThemeName 16
 
+// Basically VDR works according to the DVB standard, but there are countries/providers
+// that use other standards, which in some details deviate from the DVB standard.
+// This makes it necessary to handle things differently in some areas, depending on
+// which standard is actually used. The following macros are used to distinguish
+// these cases (make sure to adjust cMenuSetupDVB::standardComplianceTexts accordingly
+// when adding a new standard):
+
+#define STANDARD_DVB       0
+#define STANDARD_ANSISCTE  1
+
 typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
 
 class cSVDRPhost : public cListObject {
@@ -255,6 +265,7 @@ class cSetup : public cConfig<cSetupLine> {
   int SetSystemTime;
   int TimeSource;
   int TimeTransponder;
+  int StandardCompliance;
   int MarginStart, MarginStop;
   int AudioLanguages[I18N_MAX_LANGUAGES + 1];
   int DisplaySubtitles;
diff --git a/cutter.c b/cutter.c
index 320d554c1..eb8f82066 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.11 2012/02/16 12:08:39 kls Exp $
+ * $Id: cutter.c 2.12 2012/06/02 13:46:55 kls Exp $
  */
 
 #include "cutter.h"
@@ -270,7 +270,7 @@ bool cCutter::Active(const char *FileName)
      error = cuttingThread->Error();
      Stop();
      if (!error)
-        cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
+        cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName, originalVersionName);
      originalVersionName = NULL;
      editedVersionName = NULL;
      ended = true;
diff --git a/device.c b/device.c
index 00645cfc8..9c382a11f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.58 2012/03/13 09:48:14 kls Exp $
+ * $Id: device.c 2.60 2012/04/26 09:40:36 kls Exp $
  */
 
 #include "device.h"
@@ -162,6 +162,11 @@ int cDevice::DeviceNumber(void) const
   return -1;
 }
 
+cString cDevice::DeviceType(void) const
+{
+  return "";
+}
+
 cString cDevice::DeviceName(void) const
 {
   return "";
@@ -1176,8 +1181,10 @@ void cDevice::StillPicture(const uchar *Data, int Length)
               return;
               }
            }
-     StillPicture(buf, Size);
-     free(buf);
+     if (buf) {
+        StillPicture(buf, Size);
+        free(buf);
+        }
      }
 }
 
diff --git a/device.h b/device.h
index 987dfd2fa..f279fda30 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.38 2012/03/13 10:17:16 kls Exp $
+ * $Id: device.h 2.39 2012/04/04 09:48:21 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -201,6 +201,12 @@ class cDevice : public cThread {
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
          ///< Returns the number of this device (0 ... numDevices).
+  virtual cString DeviceType(void) const;
+         ///< Returns a string identifying the type of this device (like "DVB-S").
+         ///< If this device can receive different delivery systems, the returned
+         ///< string shall be that of the currently used system.
+         ///< The length of the returned string should not exceed 6 characters.
+         ///< The default implementation returns an empty string.
   virtual cString DeviceName(void) const;
          ///< Returns a string identifying the name of this device.
          ///< The default implementation returns an empty string.
diff --git a/dvbdevice.c b/dvbdevice.c
index 65e9a4bc5..55cb91273 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.69 2012/03/25 10:41:45 kls Exp $
+ * $Id: dvbdevice.c 2.71 2012/05/09 08:33:59 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -285,6 +285,7 @@ class cDvbTuner : public cThread {
 private:
   static cMutex bondMutex;
   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
+  int frontendType;
   const cDvbDevice *device;
   int fd_frontend;
   int adapter, frontend;
@@ -302,7 +303,6 @@ class cDvbTuner : public cThread {
   cCondVar newSet;
   cDvbTuner *bondedTuner;
   bool bondedMaster;
-  bool bondedMasterFailed;
   bool SetFrontendType(const cChannel *Channel);
   cString GetBondingParams(const cChannel *Channel = NULL) const;
   void ClearEventQueue(void) const;
@@ -314,6 +314,7 @@ class cDvbTuner : public cThread {
 public:
   cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend);
   virtual ~cDvbTuner();
+  int FrontendType(void) const { return frontendType; }
   bool Bond(cDvbTuner *Tuner);
   void UnBond(void);
   bool BondingOk(const cChannel *Channel, bool ConsiderOccupied = false) const;
@@ -331,6 +332,7 @@ cMutex cDvbTuner::bondMutex;
 
 cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
 {
+  frontendType = SYS_UNDEFINED;
   device = Device;
   fd_frontend = Fd_Frontend;
   adapter = Adapter;
@@ -345,7 +347,6 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int
   tunerStatus = tsIdle;
   bondedTuner = NULL;
   bondedMaster = false;
-  bondedMasterFailed = false;
   SetDescription("tuner on frontend %d/%d", adapter, frontend);
   Start();
 }
@@ -435,12 +436,8 @@ cDvbTuner *cDvbTuner::GetBondedMaster(void)
   if (!bondedTuner)
      return this; // an unbonded tuner is always "master"
   cMutexLock MutexLock(&bondMutex);
-  if (bondedMaster) {
-     if (!bondedMasterFailed)
-        return this;
-     else
-        bondedMaster = false;
-     }
+  if (bondedMaster)
+     return this;
   // This tuner is bonded, but it's not the master, so let's see if there is a master at all:
   if (cDvbTuner *t = bondedTuner) {
      while (t != this) {
@@ -450,18 +447,9 @@ cDvbTuner *cDvbTuner::GetBondedMaster(void)
            }
      }
   // None of the other bonded tuners is master, so make this one the master:
-  cDvbTuner *t = this;
-  if (bondedMasterFailed) {
-     // This one has failed, so switch to the next one:
-     t = bondedTuner;
-     t->bondedMasterFailed = false;
-     cMutexLock MutexLock(&t->mutex);
-     t->channel = channel;
-     t->tunerStatus = tsSet;
-     }
-  t->bondedMaster = true;
-  dsyslog("tuner %d/%d is now bonded master", t->adapter, t->frontend);
-  return t;
+  bondedMaster = true;
+  dsyslog("tuner %d/%d is now bonded master", adapter, frontend);
+  return this;
 }
 
 bool cDvbTuner::IsTunedTo(const cChannel *Channel) const
@@ -733,7 +721,7 @@ bool cDvbTuner::SetFrontend(void)
   cDvbTransponderParameters dtp(channel.Parameters());
 
   // Determine the required frontend type:
-  int frontendType = GetRequiredDeliverySystem(&channel, &dtp);
+  frontendType = GetRequiredDeliverySystem(&channel, &dtp);
   if (frontendType == SYS_UNDEFINED)
      return false;
 
@@ -875,9 +863,6 @@ void cDvbTuner::Action(void)
                      isyslog("frontend %d/%d timed out while tuning to channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
                      }
-                  cMutexLock MutexLock(&bondMutex);
-                  if (bondedTuner && bondedMaster)
-                     bondedMasterFailed = true; // give an other tuner a chance in case the sat cable was disconnected
                   continue;
                   }
                WaitTime = 100; // allows for a quick change from tsTuned to tsLocked
@@ -977,7 +962,7 @@ int cDvbDevice::setTransferModeForDolbyDigital = 1;
 cMutex cDvbDevice::bondMutex;
 
 const char *DeliverySystemNames[] = {
-  "UNDEFINED",
+  "",
   "DVB-C",
   "DVB-C",
   "DVB-T",
@@ -1090,6 +1075,17 @@ bool cDvbDevice::Probe(int Adapter, int Frontend)
   return true;
 }
 
+cString cDvbDevice::DeviceType(void) const
+{
+  if (dvbTuner) {
+     if (dvbTuner->FrontendType() != SYS_UNDEFINED)
+        return DeliverySystemNames[dvbTuner->FrontendType()];
+     if (numDeliverySystems)
+        return DeliverySystemNames[deliverySystems[0]]; // to have some reasonable default
+     }
+  return "";
+}
+
 cString cDvbDevice::DeviceName(void) const
 {
   return frontendInfo.name;
diff --git a/dvbdevice.h b/dvbdevice.h
index c53a20862..7da9c568b 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.25 2012/03/13 10:11:15 kls Exp $
+ * $Id: dvbdevice.h 2.26 2012/03/31 11:13:31 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -138,6 +138,7 @@ class cDvbDevice : public cDevice {
   int Adapter(void) const { return adapter; }
   int Frontend(void) const { return frontend; }
   virtual bool Ready(void);
+  virtual cString DeviceType(void) const;
   virtual cString DeviceName(void) const;
   static bool BondDevices(const char *Bondings);
        ///< Bonds the devices as defined in the given Bondings string.
diff --git a/dvbplayer.c b/dvbplayer.c
index 2bf27a36f..b325c9897 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.26 2012/03/12 14:36:55 kls Exp $
+ * $Id: dvbplayer.c 2.27 2012/05/06 11:02:35 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -408,7 +408,7 @@ void cDvbPlayer::Action(void)
      Goto(0, true);
   while (Running()) {
         if (WaitingForData)
-           nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
+           WaitingForData = !nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data
         else if (Sleep) {
            cPoller Poller;
            DevicePoll(Poller, 10);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index ab755c4b5..995506976 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.31 2012/03/16 11:56:56 kls Exp $
+ * $Id: dvbsubtitle.c 2.32 2012/05/08 08:17:17 kls Exp $
  */
 
 
@@ -217,7 +217,7 @@ void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes
         char txt[NumberOfCodes + 1];
         char *p = txt;
         for (int i = 2; i < NumberOfCodes; ++i) {
-            char c = Data[i * 2 + 1] & 0xFF;
+            uchar c = Data[i * 2 + 1] & 0xFF;
             if (c == 0)
                break;
             if (' ' <= c && c <= '~' || c == '\n' || 0xA0 <= c)
diff --git a/eit.c b/eit.c
index cf64e89fc..3cc097e9a 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.16 2012/03/14 10:11:15 kls Exp $
+ * $Id: eit.c 2.17 2012/06/02 14:05:22 kls Exp $
  */
 
 #include "eit.h"
@@ -290,6 +290,11 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          channel->SetLinkChannels(LinkChannels);
       Modified = true;
       EpgHandlers.HandleEvent(pEvent);
+
+      if (EpgHandlers.DeleteEvent(pEvent)) {
+         pSchedule->DelEvent(pEvent);
+         pEvent = NULL;
+         }
       }
   if (Tid == 0x4E) {
      if (Empty && getSectionNumber() == 0)
diff --git a/eitscan.c b/eitscan.c
index 0ebaaeefa..027bf44c0 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.6 2012/03/07 13:54:34 kls Exp $
+ * $Id: eitscan.c 2.7 2012/04/07 14:39:28 kls Exp $
  */
 
 #include "eitscan.h"
@@ -148,7 +148,7 @@ void cEITScanner::Process(void)
                       if (Channel) {
                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
                             if (Device->ProvidesTransponder(Channel)) {
-                               if (!Device->Receiving()) {
+                               if (Device->Priority() < 0) {
                                   bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel);
                                   if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
                                      if (!MaySwitchTransponder) {
diff --git a/epg.c b/epg.c
index f5c9b3a3b..8e2af1402 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.12 2012/03/10 13:14:27 kls Exp $
+ * $Id: epg.c 2.14 2012/06/02 14:08:12 kls Exp $
  */
 
 #include "epg.h"
@@ -1125,7 +1125,7 @@ cSchedulesLock::~cSchedulesLock()
 // --- cSchedules ------------------------------------------------------------
 
 cSchedules cSchedules::schedules;
-const char *cSchedules::epgDataFileName = NULL;
+char *cSchedules::epgDataFileName = NULL;
 time_t cSchedules::lastCleanup = time(NULL);
 time_t cSchedules::lastDump = time(NULL);
 time_t cSchedules::modified = 0;
@@ -1137,7 +1137,7 @@ const cSchedules *cSchedules::Schedules(cSchedulesLock &SchedulesLock)
 
 void cSchedules::SetEpgDataFileName(const char *FileName)
 {
-  delete epgDataFileName;
+  free(epgDataFileName);
   epgDataFileName = FileName ? strdup(FileName) : NULL;
 }
 
@@ -1429,6 +1429,15 @@ void cEpgHandlers::HandleEvent(cEvent *Event)
       }
 }
 
+bool cEpgHandlers::DeleteEvent(const cEvent *Event)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->DeleteEvent(Event))
+         return true;
+      }
+  return false;
+}
+
 void cEpgHandlers::SortSchedule(cSchedule *Schedule)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
diff --git a/epg.h b/epg.h
index e4cec9b92..fc05c222e 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.8 2012/03/10 13:50:10 kls Exp $
+ * $Id: epg.h 2.10 2012/06/02 14:07:51 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -192,7 +192,7 @@ class cSchedules : public cList<cSchedule> {
 private:
   cRwLock rwlock;
   static cSchedules schedules;
-  static const char *epgDataFileName;
+  static char *epgDataFileName;
   static time_t lastCleanup;
   static time_t lastDump;
   static time_t modified;
@@ -258,6 +258,9 @@ class cEpgHandler : public cListObject {
   virtual bool HandleEvent(cEvent *Event) { return false; }
           ///< After all modifications of the Event have been done, the EPG handler
           ///< can take a final look at it.
+  virtual bool DeleteEvent(const cEvent *Event) { return false; }
+          ///< After the complete processing of the Event is finished, an EPG handler
+          ///< can decide that this Event shall be deleted from its schedule.
   virtual bool SortSchedule(cSchedule *Schedule) { return false; }
           ///< Sorts the Schedule after the complete table has been processed.
   virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
@@ -280,6 +283,7 @@ class cEpgHandlers : public cList<cEpgHandler> {
   void SetVps(cEvent *Event, time_t Vps);
   void FixEpgBugs(cEvent *Event);
   void HandleEvent(cEvent *Event);
+  bool DeleteEvent(const cEvent *Event);
   void SortSchedule(cSchedule *Schedule);
   void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
   };
diff --git a/font.c b/font.c
index 706a017c1..0bcdc9bba 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.10 2012/03/02 10:47:45 kls Exp $
+ * $Id: font.c 2.13 2012/06/02 13:38:28 kls Exp $
  */
 
 #include "font.h"
@@ -412,7 +412,7 @@ const cFont *cFont::GetFont(eDvbFont Font)
   if (!fonts[Font]) {
      switch (Font) {
        case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break;
-       case fontSml: SetFont(Font, Setup.FontSml, Setup.FontSmlSize); break;
+       case fontSml: SetFont(Font, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize)); break;
        case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break;
        default: esyslog("ERROR: unknown Font %d (%s %d)", Font, __FUNCTION__, __LINE__);
        }
@@ -482,7 +482,8 @@ cString cFont::GetFontFileName(const char *FontName)
      FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
      FcConfigSubstitute(NULL, pat, FcMatchPattern);
      FcDefaultSubstitute(pat);
-     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
+     FcResult fresult;
+     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult);
      if (fontset) {
         for (int i = 0; i < fontset->nfont; i++) {
             FcBool scalable;
@@ -508,7 +509,7 @@ cString cFont::GetFontFileName(const char *FontName)
 #ifdef BIDI
 cString cFont::Bidi(const char *Ltr)
 {
-  if (cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8
+  if (!cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8
      fribidi_set_mirroring(true);
      fribidi_set_reorder_nsm(false);
      FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8;
diff --git a/menu.c b/menu.c
index ad1cac3c1..ed07b7e2c 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.45 2012/03/13 13:14:38 kls Exp $
+ * $Id: menu.c 2.54 2012/05/12 13:08:23 kls Exp $
  */
 
 #include "menu.h"
@@ -34,7 +34,6 @@
 
 #define MAXWAIT4EPGINFO   3 // seconds
 #define MODETIMEOUT       3 // seconds
-#define DISKSPACECHEK     5 // seconds between disk space checks
 #define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
                             // within which it will go directly into the "Edit timer" menu to allow
                             // further parameter settings
@@ -47,50 +46,10 @@
 #define CAMRESPONSETIMEOUT  5 // seconds to wait for a response from a CAM
 #define MINFREEDISK       300 // minimum free disk space (in MB) required to start recording
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
+#define MAXCHNAMWIDTH      16 // maximum number of characters of channels' short names shown in schedules menus
 
 #define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
-#define CHNAMWIDTH  (Channels.MaxShortChannelNameLength() + 1)
-
-// --- cFreeDiskSpace --------------------------------------------------------
-
-#define MB_PER_MINUTE 25.75 // this is just an estimate!
-
-class cFreeDiskSpace {
-private:
-  static time_t lastDiskSpaceCheck;
-  static int lastFreeMB;
-  static cString freeDiskSpaceString;
-public:
-  static bool HasChanged(bool ForceCheck = false);
-  static const char *FreeDiskSpaceString(void) { HasChanged(); return freeDiskSpaceString; }
-  };
-
-time_t cFreeDiskSpace::lastDiskSpaceCheck = 0;
-int cFreeDiskSpace::lastFreeMB = 0;
-cString cFreeDiskSpace::freeDiskSpaceString;
-
-cFreeDiskSpace FreeDiskSpace;
-
-bool cFreeDiskSpace::HasChanged(bool ForceCheck)
-{
-  if (ForceCheck || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK) {
-     int FreeMB;
-     int Percent = VideoDiskSpace(&FreeMB);
-     lastDiskSpaceCheck = time(NULL);
-     if (ForceCheck || FreeMB != lastFreeMB) {
-        int MBperMinute = Recordings.MBperMinute();
-        if (MBperMinute <= 0)
-           MBperMinute = MB_PER_MINUTE;
-        int Minutes = int(double(FreeMB) / MBperMinute);
-        int Hours = Minutes / 60;
-        Minutes %= 60;
-        freeDiskSpaceString = cString::sprintf("%s %d%%  -  %2d:%02d %s", tr("Disk"), Percent, Hours, Minutes, tr("free"));
-        lastFreeMB = FreeMB;
-        return true;
-        }
-     }
-  return false;
-}
+#define CHNAMWIDTH  (min(MAXCHNAMWIDTH, Channels.MaxShortChannelNameLength() + 1))
 
 // --- cMenuEditCaItem -------------------------------------------------------
 
@@ -213,6 +172,7 @@ class cMenuEditChannel : public cOsdMenu {
 cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 :cOsdMenu(tr("Edit channel"), 16)
 {
+  SetMenuCategory(mcChannel);
   channel = Channel;
   sourceParam = NULL;
   *name = 0;
@@ -390,6 +350,7 @@ class cMenuChannels : public cOsdMenu {
 cMenuChannels::cMenuChannels(void)
 :cOsdMenu(tr("Channels"), CHNUMWIDTH)
 {
+  SetMenuCategory(mcChannel);
   number = 0;
   Setup();
   Channels.IncBeingEdited();
@@ -585,6 +546,7 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
 cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
 :cOsdMenu(Title)
 {
+  SetMenuCategory(mcText);
   text = NULL;
   font = Font;
   SetText(Text);
@@ -673,6 +635,7 @@ class cMenuEditFolder : public cOsdMenu {
 cMenuEditFolder::cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNestedItem *Folder)
 :cOsdMenu(Folder ? tr("Edit folder") : tr("New folder"), 12)
 {
+  SetMenuCategory(mcFolder);
   list = List;
   folder = Folder;
   if (folder) {
@@ -745,6 +708,7 @@ eOSState cMenuEditFolder::ProcessKey(eKeys Key)
 cMenuFolder::cMenuFolder(const char *Title, cNestedItemList *NestedItemList, const char *Path)
 :cOsdMenu(Title)
 {
+  SetMenuCategory(mcFolder);
   list = nestedItemList = NestedItemList;
   firstFolder = NULL;
   editing = false;
@@ -756,6 +720,7 @@ cMenuFolder::cMenuFolder(const char *Title, cNestedItemList *NestedItemList, con
 cMenuFolder::cMenuFolder(const char *Title, cList<cNestedItem> *List, cNestedItemList *NestedItemList, const char *Dir, const char *Path)
 :cOsdMenu(Title)
 {
+  SetMenuCategory(mcFolder);
   list = List;
   nestedItemList = NestedItemList;
   dir = Dir;
@@ -906,6 +871,7 @@ eOSState cMenuFolder::ProcessKey(eKeys Key)
 cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
+  SetMenuCategory(mcTimer);
   file = NULL;
   day = firstday = NULL;
   timer = Timer;
@@ -1104,6 +1070,7 @@ class cMenuTimers : public cOsdMenu {
 cMenuTimers::cMenuTimers(void)
 :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
 {
+  SetMenuCategory(mcTimer);
   helpKeys = -1;
   for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
       timer->SetEventFromSchedule(); // make sure the event is current
@@ -1242,6 +1209,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
 cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch, bool Buttons)
 :cOsdMenu(tr("Event"))
 {
+  SetMenuCategory(mcEvent);
   event = Event;
   if (event) {
      cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
@@ -1389,6 +1357,7 @@ const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
 :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, CHNAMWIDTH, 6, 4)
 {
+  SetMenuCategory(mcSchedule);
   now = Now;
   helpKeys = -1;
   timerState = 0;
@@ -1553,6 +1522,7 @@ class cMenuSchedule : public cOsdMenu {
 cMenuSchedule::cMenuSchedule(void)
 :cOsdMenu("")
 {
+  SetMenuCategory(mcSchedule);
   now = next = false;
   otherChannel = 0;
   helpKeys = -1;
@@ -1810,6 +1780,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
 cMenuCommands::cMenuCommands(const char *Title, cList<cNestedItem> *Commands, const char *Parameters)
 :cOsdMenu(Title)
 {
+  SetMenuCategory(mcCommand);
   result = NULL;
   SetHasHotkeys();
   commands = Commands;
@@ -1939,6 +1910,7 @@ class cMenuCam : public cOsdMenu {
 cMenuCam::cMenuCam(cCamSlot *CamSlot)
 :cOsdMenu("", 1) // tab necessary for enquiry!
 {
+  SetMenuCategory(mcCam);
   camSlot = CamSlot;
   ciMenu = NULL;
   ciEnquiry = NULL;
@@ -2118,6 +2090,7 @@ class cMenuRecording : public cOsdMenu {
 cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
 :cOsdMenu(tr("Recording info"))
 {
+  SetMenuCategory(mcRecording);
   recording = Recording;
   withButtons = WithButtons;
   if (withButtons)
@@ -2212,13 +2185,13 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 :cOsdMenu(Base ? Base : tr("Recordings"), 9, 6, 6)
 {
+  SetMenuCategory(mcRecording);
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
   Recordings.StateChanged(recordingsState); // just to get the current state
   helpKeys = -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   Set();
-  SetFreeDiskDisplay(true);
   if (Current() < 0)
      SetCurrent(First());
   else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
@@ -2233,16 +2206,6 @@ cMenuRecordings::~cMenuRecordings()
   free(base);
 }
 
-bool cMenuRecordings::SetFreeDiskDisplay(bool Force)
-{
-  if (FreeDiskSpace.HasChanged(Force)) {
-     //XXX -> skin function!!!
-     SetTitle(cString::sprintf("%s  -  %s", base ? base : tr("Recordings"), FreeDiskSpace.FreeDiskSpaceString()));
-     return true;
-     }
-  return false;
-}
-
 void cMenuRecordings::SetHelpKeys(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
@@ -2305,7 +2268,6 @@ void cMenuRecordings::Set(bool Refresh)
          }
       }
   free(LastItemText);
-  Refresh |= SetFreeDiskDisplay(Refresh);
   if (Refresh)
      Display();
 }
@@ -2343,7 +2305,7 @@ eOSState cMenuRecordings::Play(void)
      else {
         cRecording *recording = GetRecording(ri);
         if (recording) {
-           cReplayControl::SetRecording(recording->FileName(), recording->Title());
+           cReplayControl::SetRecording(recording->FileName());
            return osReplay;
            }
         }
@@ -2411,7 +2373,7 @@ eOSState cMenuRecordings::Delete(void)
               Recordings.DelByName(ri->FileName());
               cOsdMenu::Del(Current());
               SetHelpKeys();
-              SetFreeDiskDisplay(true);
+              cVideoDiskUsage::ForceCheck();
               Display();
               if (!Count())
                  return osBack;
@@ -2484,8 +2446,6 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
      Display();
      }
   if (!HasSubMenu()) {
-     if (HadSubMenu)
-        SetFreeDiskDisplay();
      if (Key != kNone)
         SetHelpKeys();
      }
@@ -2767,6 +2727,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
   void Setup(void);
   const char *videoDisplayFormatTexts[3];
   const char *updateChannelsTexts[6];
+  const char *standardComplianceTexts[2];
 public:
   cMenuSetupDVB(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -2789,6 +2750,8 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   updateChannelsTexts[3] = tr("names and PIDs");
   updateChannelsTexts[4] = tr("add new channels");
   updateChannelsTexts[5] = tr("add new transponders");
+  standardComplianceTexts[0] = "DVB";
+  standardComplianceTexts[1] = "ANSI/SCTE";
 
   SetSection(tr("DVB"));
   SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL); 
@@ -2802,6 +2765,7 @@ void cMenuSetupDVB::Setup(void)
   Clear();
 
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
+  Add(new cMenuEditStraItem(tr("Setup.DVB$Standard compliance"),   &data.StandardCompliance, 2, standardComplianceTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
   if (data.VideoFormat == 0)
      Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
@@ -3222,8 +3186,13 @@ eOSState cMenuSetupPlugins::ProcessKey(eKeys Key)
               }
            }
         }
-     else if (state == osContinue)
+     else if (state == osContinue) {
         Store();
+        // Reinitialize OSD and skin, in case any plugin setup change has an influence on these:
+        cOsdProvider::UpdateOsdSize(true);
+        SetDisplayMenu();
+        Display();
+        }
      }
   return state;
 }
@@ -3242,6 +3211,7 @@ class cMenuSetup : public cOsdMenu {
 cMenuSetup::cMenuSetup(void)
 :cOsdMenu("")
 {
+  SetMenuCategory(mcSetup);
   Set();
 }
 
@@ -3326,6 +3296,7 @@ cOsdObject *cMenuMain::pluginOsdObject = NULL;
 cMenuMain::cMenuMain(eOSState State)
 :cOsdMenu("")
 {
+  SetMenuCategory(mcMain);
   replaying = false;
   stopReplayItem = NULL;
   cancelEditingItem = NULL;
@@ -3394,13 +3365,6 @@ bool cMenuMain::Update(bool Force)
 {
   bool result = false;
 
-  // Title with disk usage:
-  if (FreeDiskSpace.HasChanged(Force)) {
-     //XXX -> skin function!!!
-     SetTitle(cString::sprintf("%s  -  %s", tr("VDR"), FreeDiskSpace.FreeDiskSpaceString()));
-     result = true;
-     }
-
   bool NewReplaying = cControl::Control() != NULL;
   if (Force || NewReplaying != replaying) {
      replaying = NewReplaying;
@@ -4130,6 +4094,8 @@ eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
 
 cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
 {
+  // Whatever happens here, the timers will be modified in some way...
+  Timers.SetModified();
   // We're going to manipulate an event here, so we need to prevent
   // others from modifying any EPG data:
   cSchedulesLock SchedulesLock;
@@ -4144,7 +4110,6 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   if (!timer) {
      timer = new cTimer(true, Pause);
      Timers.Add(timer);
-     Timers.SetModified();
      instantId = cString::sprintf(cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
      }
   timer->SetPending(true);
@@ -4166,9 +4131,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         }
      else {
         Timers.Del(timer);
-        Timers.SetModified();
         if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
-           cReplayControl::SetRecording(fileName, Recording.Name());
+           cReplayControl::SetRecording(fileName);
         }
      timer = NULL;
      return;
@@ -4183,7 +4147,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         Recording.WriteInfo();
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
-           cReplayControl::SetRecording(fileName, Recording.Name());
+           cReplayControl::SetRecording(fileName);
         Recordings.AddByName(fileName);
         return;
         }
@@ -4194,7 +4158,6 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
      timer->SetDeferred(DEFERTIMER);
   if (!Timer) {
      Timers.Del(timer);
-     Timers.SetModified();
      timer = NULL;
      }
 }
@@ -4244,6 +4207,7 @@ void cRecordControl::Stop(bool ExecuteUserCommand)
      cStatus::MsgRecording(device, NULL, fileName, false);
      if (ExecuteUserCommand)
         cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
+     Timers.SetModified();
      }
 }
 
@@ -4337,7 +4301,7 @@ void cRecordControls::Stop(const char *InstantId)
 bool cRecordControls::PauseLiveVideo(void)
 {
   Skins.Message(mtStatus, tr("Pausing live video..."));
-  cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
+  cReplayControl::SetRecording(NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
   if (Start(NULL, true)) {
      cReplayControl *rc = new cReplayControl(true);
      cControl::Launch(rc);
@@ -4373,6 +4337,15 @@ cRecordControl *cRecordControls::GetRecordControl(const char *FileName)
   return NULL;
 }
 
+cRecordControl *cRecordControls::GetRecordControl(const cTimer *Timer)
+{
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
+      if (RecordControls[i] && RecordControls[i]->Timer() == Timer)
+         return RecordControls[i];
+      }
+  return NULL;
+}
+
 void cRecordControls::Process(time_t t)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
@@ -4429,8 +4402,7 @@ bool cRecordControls::StateChanged(int &State)
 // --- cReplayControl --------------------------------------------------------
 
 cReplayControl *cReplayControl::currentReplayControl = NULL;
-char *cReplayControl::fileName = NULL;
-char *cReplayControl::title = NULL;
+cString cReplayControl::fileName;
 
 cReplayControl::cReplayControl(bool PauseLive)
 :cDvbPlayerControl(fileName, PauseLive)
@@ -4460,7 +4432,7 @@ cReplayControl::~cReplayControl()
 
 void cReplayControl::Stop(void)
 {
-  if (Setup.DelTimeshiftRec && fileName) {
+  if (Setup.DelTimeshiftRec && *fileName) {
      cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
      if (rc && rc->InstantId()) {
         if (Active()) {
@@ -4473,7 +4445,7 @@ void cReplayControl::Stop(void)
                  Timers.SetModified();
                  }
               cDvbPlayerControl::Stop();
-              cRecording *recording = Recordings.GetByName(fileName);;
+              cRecording *recording = Recordings.GetByName(fileName);
               if (recording) {
                  if (recording->Delete()) {
                     Recordings.DelByName(fileName);
@@ -4490,17 +4462,14 @@ void cReplayControl::Stop(void)
   cDvbPlayerControl::Stop();
 }
 
-void cReplayControl::SetRecording(const char *FileName, const char *Title)
+void cReplayControl::SetRecording(const char *FileName)
 {
-  free(fileName);
-  free(title);
-  fileName = FileName ? strdup(FileName) : NULL;
-  title = Title ? strdup(Title) : NULL;
+  fileName = FileName;
 }
 
 const char *cReplayControl::NowReplaying(void)
 {
-  return currentReplayControl ? fileName : NULL;
+  return currentReplayControl ? *fileName : NULL;
 }
 
 const char *cReplayControl::LastReplayed(void)
@@ -4510,10 +4479,8 @@ const char *cReplayControl::LastReplayed(void)
 
 void cReplayControl::ClearLastReplayed(const char *FileName)
 {
-  if (fileName && FileName && strcmp(fileName, FileName) == 0) {
-     free(fileName);
+  if (*fileName && FileName && strcmp(fileName, FileName) == 0)
      fileName = NULL;
-     }
 }
 
 void cReplayControl::ShowTimed(int Seconds)
@@ -4585,8 +4552,10 @@ bool cReplayControl::ShowProgress(bool Initial)
         visible = true;
         }
      if (Initial) {
-        if (title)
-           displayReplay->SetTitle(title);
+        if (*fileName) {
+           if (cRecording *Recording = Recordings.GetByName(fileName))
+              displayReplay->SetRecording(Recording);
+           }
         lastCurrent = lastTotal = -1;
         }
      if (Current != lastCurrent || Total != lastTotal) {
@@ -4758,7 +4727,7 @@ void cReplayControl::MarkMove(bool Forward)
 
 void cReplayControl::EditCut(void)
 {
-  if (fileName) {
+  if (*fileName) {
      Hide();
      if (!cCutter::Active()) {
         if (!marks.Count())
@@ -4800,6 +4769,13 @@ cOsdObject *cReplayControl::GetInfo(void)
   return NULL;
 }
 
+const cRecording *cReplayControl::GetRecording(void)
+{
+  if (const cRecording *Recording = Recordings.GetByName(LastReplayed()))
+     return Recording;
+  return NULL;
+}
+
 eOSState cReplayControl::ProcessKey(eKeys Key)
 {
   if (!Active())
diff --git a/menu.h b/menu.h
index bb05b3b34..99f88d0b9 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.5 2012/03/08 13:11:40 kls Exp $
+ * $Id: menu.h 2.9 2012/05/12 11:48:04 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -196,7 +196,6 @@ class cMenuRecordings : public cOsdMenu {
   int level;
   int recordingsState;
   int helpKeys;
-  bool SetFreeDiskDisplay(bool Force = false);
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
   bool Open(bool OpenSubMenus = false);
@@ -243,6 +242,9 @@ class cRecordControls {
   static bool PauseLiveVideo(void);
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
+  static cRecordControl *GetRecordControl(const cTimer *Timer);
+         ///< Returns the cRecordControl for the given Timer.
+         ///< If there is no cRecordControl for Timer, NULL is returned.
   static void Process(time_t t);
   static void ChannelDataModified(cChannel *Channel);
   static bool Active(void);
@@ -267,8 +269,7 @@ class cReplayControl : public cDvbPlayerControl {
   void TimeSearch(void);
   void ShowTimed(int Seconds = 0);
   static cReplayControl *currentReplayControl;
-  static char *fileName;
-  static char *title;
+  static cString fileName;
   void ShowMode(void);
   bool ShowProgress(bool Initial);
   void MarkToggle(void);
@@ -281,11 +282,12 @@ class cReplayControl : public cDvbPlayerControl {
   virtual ~cReplayControl();
   void Stop(void);
   virtual cOsdObject *GetInfo(void);
+  virtual const cRecording *GetRecording(void);
   virtual eOSState ProcessKey(eKeys Key);
   virtual void Show(void);
   virtual void Hide(void);
   bool Visible(void) { return visible; }
-  static void SetRecording(const char *FileName, const char *Title);
+  static void SetRecording(const char *FileName);
   static const char *NowReplaying(void);
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
diff --git a/menuitems.c b/menuitems.c
index ba205c0f5..416c2beb0 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.13 2012/03/13 11:21:57 kls Exp $
+ * $Id: menuitems.c 2.14 2012/04/08 11:20:37 kls Exp $
  */
 
 #include "menuitems.h"
@@ -1126,6 +1126,7 @@ eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
 cMenuSetupPage::cMenuSetupPage(void)
 :cOsdMenu("", 33)
 {
+  SetMenuCategory(mcSetup);
   plugin = NULL;
 }
 
diff --git a/osd.c b/osd.c
index 49b7dce1c..37ee310ea 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.27 2012/03/05 10:28:01 kls Exp $
+ * $Id: osd.c 2.31 2012/06/02 13:32:38 kls Exp $
  */
 
 #include "osd.h"
@@ -40,6 +40,16 @@ tColor HsvToColor(double H, double S, double V)
      }
 }
 
+tColor RgbShade(tColor Color, double Factor)
+{
+  double f = fabs(constrain(Factor, -1.0, 1.0));
+  double w = Factor > 0 ? f * 0xFF : 0;
+  return (Color & 0xFF000000) |
+         (min(0xFF, int((1 - f) * ((Color >> 16) & 0xFF) + w + 0.5)) << 16) |
+         (min(0xFF, int((1 - f) * ((Color >>  8) & 0xFF) + w + 0.5)) <<  8) |
+         (min(0xFF, int((1 - f) * ( Color        & 0xFF) + w + 0.5))      );
+}
+
 #define USE_ALPHA_LUT
 #ifdef USE_ALPHA_LUT
 // Alpha blending with lookup table (by Reinhard Nissl <rnissl@gmx.de>)
@@ -553,11 +563,15 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
      if (Width || Height) {
         limit = x + cw - x0;
         if (Width) {
-           if ((Alignment & taLeft) != 0)
-              ;
+           if ((Alignment & taLeft) != 0) {
+              if ((Alignment & taBorder) != 0)
+                 x += max(h / TEXT_ALIGN_BORDER, 1);
+              }
            else if ((Alignment & taRight) != 0) {
               if (w < Width)
                  x += Width - w;
+              if ((Alignment & taBorder) != 0)
+                 x -= max(h / TEXT_ALIGN_BORDER, 1);
               }
            else { // taCentered
               if (w < Width)
@@ -1280,11 +1294,15 @@ void cPixmapMemory::DrawText(const cPoint &Point, const char *s, tColor ColorFg,
   if (Width || Height) {
      limit = x + cw;
      if (Width) {
-        if ((Alignment & taLeft) != 0)
-           ;
+        if ((Alignment & taLeft) != 0) {
+           if ((Alignment & taBorder) != 0)
+              x += max(h / TEXT_ALIGN_BORDER, 1);
+           }
         else if ((Alignment & taRight) != 0) {
            if (w < Width)
               x += Width - w;
+           if ((Alignment & taBorder) != 0)
+              x -= max(h / TEXT_ALIGN_BORDER, 1);
            }
         else { // taCentered
            if (w < Width)
@@ -1382,10 +1400,10 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
           case  0:
           case  6: DrawRectangle(cRect(cx - x, cy - y, 2 * x + 1,       1), Color); if (Quadrants == 6) break;
           case  8: DrawRectangle(cRect(cx - x, cy + y, 2 * x + 1,       1), Color); break;
-          case -1: DrawRectangle(cRect(cx + x, cy - y, x2 - x + 1,      1), Color); break;
+          case -1: DrawRectangle(cRect(cx + x, cy - y, rx - x + 1,      1), Color); break;
           case -2: DrawRectangle(cRect(x1,     cy - y, cx - x - x1 + 1, 1), Color); break;
           case -3: DrawRectangle(cRect(x1,     cy + y, cx - x - x1 + 1, 1), Color); break;
-          case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1,      1), Color); break;
+          case -4: DrawRectangle(cRect(cx + x, cy + y, rx - x + 1,      1), Color); break;
           default: ;
           }
         y++;
@@ -1417,10 +1435,10 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
           case  0:
           case  6: DrawRectangle(cRect(cx - x, cy - y, 2 * x + 1,       1), Color); if (Quadrants == 6) break;
           case  8: DrawRectangle(cRect(cx - x, cy + y, 2 * x + 1,       1), Color); break;
-          case -1: DrawRectangle(cRect(cx + x, cy - y, x2 - x + 1,      1), Color); break;
+          case -1: DrawRectangle(cRect(cx + x, cy - y, rx - x + 1,      1), Color); break;
           case -2: DrawRectangle(cRect(x1,     cy - y, cx - x - x1 + 1, 1), Color); break;
           case -3: DrawRectangle(cRect(x1,     cy + y, cx - x - x1 + 1, 1), Color); break;
-          case -4: DrawRectangle(cRect(cx + x, cy + y, x2 - x + 1,      1), Color); break;
+          case -4: DrawRectangle(cRect(cx + x, cy + y, rx - x + 1,      1), Color); break;
           default: ;
           }
         x++;
@@ -1988,7 +2006,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
      Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP));
      cFont::SetFont(fontOsd, Setup.FontOsd, Setup.FontOsdSize);
      cFont::SetFont(fontFix, Setup.FontFix, Setup.FontFixSize);
-     cFont::SetFont(fontSml, Setup.FontSml, Setup.FontSmlSize);
+     cFont::SetFont(fontSml, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize));
      oldWidth = Width;
      oldHeight = Height;
      oldAspect = Aspect;
diff --git a/osd.h b/osd.h
index f5f8b6563..06c020aa5 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.15 2011/12/04 13:38:17 kls Exp $
+ * $Id: osd.h 2.17 2012/06/02 10:32:38 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -25,6 +25,7 @@
 #define ALPHA_TRANSPARENT  0x00
 #define ALPHA_OPAQUE       0xFF
 #define IS_OPAQUE(c)       ((c >> 24) == ALPHA_OPAQUE)
+#define TEXT_ALIGN_BORDER  10 // fraction of the font height used for sizing border
 
 enum {
                    //AARRGGBB
@@ -69,6 +70,14 @@ inline tColor RgbToColor(double R, double G, double B)
   return RgbToColor(uint8_t(0xFF * R), uint8_t(0xFF * G), uint8_t(0xFF * B));
 }
 
+tColor RgbShade(tColor Color, double Factor);
+   ///< Returns a brighter (Factor > 0) or darker (Factor < 0) version
+   ///< of the given Color.
+   ///< If Factor is 0.0, the return value is the unchanged Color,
+   ///< If Factor is 1.0, white is returned.
+   ///< If Factor is -1.0, black is returned.
+   ///< The alpha value of Color is returned unchanged.
+
 tColor HsvToColor(double H, double S, double V);
    ///< Converts the given Hue (0..360), Saturation (0..1) and Value (0..1)
    ///< to an RGB tColor value. The alpha value of the result is 0x00, so
@@ -151,6 +160,7 @@ enum eTextAlignment { taCenter  = 0x00,
                       taRight   = 0x02,
                       taTop     = 0x04,
                       taBottom  = 0x08,
+                      taBorder  = 0x10, // keeps some distance from the left or right alignment edge
                       taDefault = taTop | taLeft
                     };
 
diff --git a/osdbase.c b/osdbase.c
index 0a4dc32fd..37437308f 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.4 2012/03/02 15:49:57 kls Exp $
+ * $Id: osdbase.c 2.6 2012/04/23 09:41:22 kls Exp $
  */
 
 #include "osdbase.h"
@@ -72,14 +72,15 @@ void cOsdObject::Show(void)
 
 cSkinDisplayMenu *cOsdMenu::displayMenu = NULL;
 int cOsdMenu::displayMenuCount = 0;
-int cOsdMenu::displayMenuItems = 0;//XXX dynamic???
 
 cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
   isMenu = true;
   digit = 0;
   hasHotkeys = false;
+  displayMenuItems = 0;
   title = NULL;
+  menuCategory = mcUnknown;
   SetTitle(Title);
   SetCols(c0, c1, c2, c3, c4);
   first = 0;
@@ -103,6 +104,11 @@ cOsdMenu::~cOsdMenu()
      DELETENULL(displayMenu);
 }
 
+void cOsdMenu::SetMenuCategory(eMenuCategory MenuCategory)
+{
+  menuCategory = MenuCategory;
+}
+
 void cOsdMenu::SetDisplayMenu(void)
 {
   if (displayMenu) {
@@ -110,7 +116,6 @@ void cOsdMenu::SetDisplayMenu(void)
      delete displayMenu;
      }
   displayMenu = Skins.Current()->DisplayMenu();
-  displayMenuItems = displayMenu->MaxItems();
 }
 
 const char *cOsdMenu::hk(const char *s)
@@ -212,6 +217,9 @@ void cOsdMenu::Display(void)
   displayMenu->SetMessage(mtStatus, NULL);
   displayMenu->Clear();
   cStatus::MsgOsdClear();
+  if (menuCategory != displayMenu->MenuCategory())
+     displayMenu->SetMenuCategory(menuCategory);
+  displayMenuItems = displayMenu->MaxItems();
   displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
   displayMenu->SetTitle(title);
   cStatus::MsgOsdTitle(title);
diff --git a/osdbase.h b/osdbase.h
index b9d22ae3f..a2e9914a1 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 2.2 2012/03/02 15:49:57 kls Exp $
+ * $Id: osdbase.h 2.4 2012/04/23 09:40:07 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -86,10 +86,11 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 private:
   static cSkinDisplayMenu *displayMenu;
   static int displayMenuCount;
-  static int displayMenuItems;
+  int displayMenuItems;
   char *title;
   int cols[cSkinDisplayMenu::MaxTabs];
   int first, current, marked;
+  eMenuCategory menuCategory;
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
   bool helpDisplayed;
@@ -128,6 +129,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
   virtual ~cOsdMenu();
   virtual bool NeedsFastResponse(void) { return subMenu ? subMenu->NeedsFastResponse() : cOsdObject::NeedsFastResponse(); }
+  void SetMenuCategory(eMenuCategory MenuCategory);
   int Current(void) const { return current; }
   void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
diff --git a/pat.c b/pat.c
index d9b93f6ec..826e0eab2 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.17 2012/03/02 10:56:45 kls Exp $
+ * $Id: pat.c 2.18 2012/04/15 09:54:53 kls Exp $
  */
 
 #include "pat.h"
@@ -456,37 +456,47 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       }
                       break;
-              case 0x80: // STREAMTYPE_USER_PRIVATE - DigiCipher II VIDEO (ANSI/SCTE 57)
-                      Vpid = esPid;
-                      Ppid = pmt.getPCRPid();
-                      Vtype = 0x02; // compression based upon MPEG-2
-                      ProcessCaDescriptors = true;
-                      break;
-              case 0x81: // STREAMTYPE_USER_PRIVATE - ATSC A/53 AUDIO (ANSI/SCTE 57)
-                      {
-                      char lang[MAXLANGCODE1] = { 0 };
-                      SI::Descriptor *d;
-                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
-                          switch (d->getDescriptorTag()) {
-                            case SI::ISO639LanguageDescriptorTag: {
-                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
-                                 }
-                                 break;
-                            default: ;
+              case 0x80: // STREAMTYPE_USER_PRIVATE
+                      if (Setup.StandardCompliance == STANDARD_ANSISCTE) { // DigiCipher II VIDEO (ANSI/SCTE 57)
+                         Vpid = esPid;
+                         Ppid = pmt.getPCRPid();
+                         Vtype = 0x02; // compression based upon MPEG-2
+                         ProcessCaDescriptors = true;
+                         break;
+                         }
+                      // fall through
+              case 0x81: // STREAMTYPE_USER_PRIVATE
+                      if (Setup.StandardCompliance == STANDARD_ANSISCTE) { // ATSC A/53 AUDIO (ANSI/SCTE 57)
+                         char lang[MAXLANGCODE1] = { 0 };
+                         SI::Descriptor *d;
+                         for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                             switch (d->getDescriptorTag()) {
+                               case SI::ISO639LanguageDescriptorTag: {
+                                    SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                    strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                    }
+                                    break;
+                               default: ;
+                               }
+                            delete d;
                             }
-                         delete d;
+                         if (NumDpids < MAXDPIDS) {
+                            Dpids[NumDpids] = esPid;
+                            Dtypes[NumDpids] = SI::AC3DescriptorTag;
+                            strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
+                            NumDpids++;
+                            }
+                         ProcessCaDescriptors = true;
+                         break;
                          }
-                      if (NumDpids < MAXDPIDS) {
-                         Dpids[NumDpids] = esPid;
-                         Dtypes[NumDpids] = SI::AC3DescriptorTag;
-                         strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
-                         NumDpids++;
+                      // fall through
+              case 0x82: // STREAMTYPE_USER_PRIVATE
+                      if (Setup.StandardCompliance == STANDARD_ANSISCTE) { // STANDARD SUBTITLE (ANSI/SCTE 27)
+                         //TODO
+                         break;
                          }
-                      ProcessCaDescriptors = true;
-                      }
-                      break;
-              case 0x82 ... 0xFF: // STREAMTYPE_USER_PRIVATE
+                      // fall through
+              case 0x83 ... 0xFF: // STREAMTYPE_USER_PRIVATE
                       {
                       char lang[MAXLANGCODE1] = { 0 };
                       bool IsAc3 = false;
diff --git a/player.c b/player.c
index 34905658c..5c95f4e4e 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 2.0 2007/07/20 15:25:24 kls Exp $
+ * $Id: player.c 2.2 2012/04/28 11:52:50 kls Exp $
  */
 
 #include "player.h"
@@ -60,10 +60,20 @@ cOsdObject *cControl::GetInfo(void)
   return NULL;
 }
 
-cControl *cControl::Control(void)
+const cRecording *cControl::GetRecording(void)
+{
+  return NULL;
+}
+
+cString cControl::GetHeader(void)
+{
+  return "";
+}
+
+cControl *cControl::Control(bool Hidden)
 {
   cMutexLock MutexLock(&mutex);
-  return (control && !control->hidden) ? control : NULL;
+  return (control && (!control->hidden || Hidden)) ? control : NULL;
 }
 
 void cControl::Launch(cControl *Control)
diff --git a/player.h b/player.h
index 77d00d5ef..01bc958c8 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 2.4 2009/03/08 12:29:10 kls Exp $
+ * $Id: player.h 2.6 2012/04/28 13:04:17 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -86,13 +86,28 @@ class cControl : public cOsdObject {
   virtual ~cControl();
   virtual void Hide(void) = 0;
   virtual cOsdObject *GetInfo(void);
+         ///< Returns an OSD object that displays information about the currently
+         ///< played programme. If no such information is available, NULL will be
+         ///< returned.
+  virtual const cRecording *GetRecording(void);
+         ///< Returns the cRecording that is currently being replayed, or NULL if
+         ///< this player is not playing a cRecording.
+  virtual cString GetHeader(void);
+         ///< This can be used by players that don't play a cRecording, but rather
+         ///< do something completely different. The resulting string may be used by
+         ///< skins as a last resort, in case they want to display the state of the
+         ///< current player. The return value is expected to be a short, single line
+         ///< string. The default implementation returns an empty string.
   double FramesPerSecond(void) { return player->FramesPerSecond(); }
   bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
   bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
   static void Launch(cControl *Control);
   static void Attach(void);
   static void Shutdown(void);
-  static cControl *Control(void);
+  static cControl *Control(bool Hidden = false);
+         ///< Returns the current replay control (if any) in case it is currently
+         ///< visible. If Hidden is true, the control will be returned even if it is
+         ///< currently hidden.
   };
 
 #endif //__PLAYER_H
diff --git a/po/ar.po b/po/ar.po
index 1723eabf5..414e6b674 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -517,12 +517,6 @@ msgstr "المستخدم 8"
 msgid "Key$User9"
 msgstr "المستخدم 9"
 
-msgid "Disk"
-msgstr "القرص الصلب"
-
-msgid "free"
-msgstr "مساحة حرة"
-
 msgid "Free To Air"
 msgstr "غير مشفر"
 
@@ -944,6 +938,9 @@ msgstr "الترجمة"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "كرت الستالايت الاولى"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "نوع الفيديو  "
 
@@ -1174,9 +1171,6 @@ msgstr " ايقاف التسجيل "
 msgid "Schedule"
 msgstr "جدولة"
 
-msgid "VDR"
-msgstr ""
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ايقاف الاعادة"
@@ -1307,6 +1301,24 @@ msgstr "الصوت "
 msgid "Classic VDR"
 msgstr "VDR تقليدى  "
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG شاشة "
 
@@ -1370,3 +1382,9 @@ msgstr "اضغط اى زر لالغاء اعادة التشغيل"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "البرنامج سيقوم بالاغلاق بعد%s دقيقة "
+
+msgid "Disk"
+msgstr "القرص الصلب"
+
+msgid "free"
+msgstr "مساحة حرة"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 801a39940..cd017b225 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -512,12 +512,6 @@ msgstr "Usuari 8"
 msgid "Key$User9"
 msgstr "Usuari 9"
 
-msgid "Disk"
-msgstr "Disc"
-
-msgid "free"
-msgstr "lliure"
-
 msgid "Free To Air"
 msgstr "No codificat"
 
@@ -926,6 +920,9 @@ msgstr "Subt
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Tarja DVB prim�ria"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Format del v�deo"
 
@@ -1150,9 +1147,6 @@ msgstr " Aturar la gravaci
 msgid "Schedule"
 msgstr "Guia de Programaci�"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Aturar la reproducci�"
@@ -1282,6 +1276,24 @@ msgstr "Volum "
 msgid "Classic VDR"
 msgstr "VDR clasico"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Quadres ST:TNG"
 
@@ -1344,3 +1356,9 @@ msgstr "Prem qualsevol tecla per cancel
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR s'apagar� en %s minuts"
+
+msgid "Disk"
+msgstr "Disc"
+
+msgid "free"
+msgstr "lliure"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 50697d138..2feacbed8 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -511,12 +511,6 @@ msgstr "Uživatel8"
 msgid "Key$User9"
 msgstr "Uživatel9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "volno"
-
 msgid "Free To Air"
 msgstr "volný"
 
@@ -925,6 +919,9 @@ msgstr "Titulky"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primární DVB zařízení"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Formát videa"
 
@@ -1149,9 +1146,6 @@ msgstr " Zastavit nahrávání "
 msgid "Schedule"
 msgstr "Program (EPG)"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zastavit přehrávání"
@@ -1281,6 +1275,24 @@ msgstr "Hlasitost "
 msgid "Classic VDR"
 msgstr "Klasické VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konzola"
 
@@ -1343,3 +1355,9 @@ msgstr "Jakákoliv klávesa zruší restart"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR se vypne za %s minut"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "volno"
diff --git a/po/da_DK.po b/po/da_DK.po
index 0777ee787..b5681b044 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "Bruger8"
 msgid "Key$User9"
 msgstr "Bruger9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "fri"
-
 msgid "Free To Air"
 msgstr "Free To Air"
 
@@ -923,6 +917,9 @@ msgstr "Undertekster"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhed"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
@@ -1147,9 +1144,6 @@ msgstr " Stop optagelse "
 msgid "Schedule"
 msgstr "Programoversigt"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspilning"
@@ -1279,6 +1273,24 @@ msgstr "Lydstyrke "
 msgid "Classic VDR"
 msgstr "Klassisk VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsol"
 
@@ -1341,3 +1353,9 @@ msgstr "Tryk vilk
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR slukker om %s minutter"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "fri"
diff --git a/po/de_DE.po b/po/de_DE.po
index 6bcee52d8..088dbaf6c 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "Benutzer8"
 msgid "Key$User9"
 msgstr "Benutzer9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "frei"
-
 msgid "Free To Air"
 msgstr "frei empfangbar"
 
@@ -923,6 +917,9 @@ msgstr "Untertitel"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�res DVB-Interface"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr "Standardkonformit�t"
+
 msgid "Setup.DVB$Video format"
 msgstr "Videoformat"
 
@@ -1147,9 +1144,6 @@ msgstr " Aufzeichnung beenden "
 msgid "Schedule"
 msgstr "Programm"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Wiedergabe beenden"
@@ -1279,6 +1273,24 @@ msgstr "Lautst
 msgid "Classic VDR"
 msgstr "Klassischer VDR"
 
+msgid "DISK"
+msgstr "PLATTE"
+
+msgid "LOAD"
+msgstr "LAST"
+
+msgid "TIMERS"
+msgstr "TIMER"
+
+msgid "DEVICES"
+msgstr "EMPF�NGER"
+
+msgid "LIVE"
+msgstr "LIVE"
+
+msgid "PLAY"
+msgstr "WIEDERGABE"
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG-Konsolen"
 
@@ -1341,3 +1353,9 @@ msgstr "Taste dr
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR wird in %s Minuten abgeschaltet"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "frei"
diff --git a/po/el_GR.po b/po/el_GR.po
index f2bd7ff7d..bb53086ff 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
-msgid "Disk"
-msgstr "������"
-
-msgid "free"
-msgstr "���������"
-
 msgid "Free To Air"
 msgstr ""
 
@@ -923,6 +917,9 @@ msgstr ""
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "����� DVB �����"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "����� ������"
 
@@ -1147,9 +1144,6 @@ msgstr " 
 msgid "Schedule"
 msgstr "���������"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ����� ������������"
@@ -1279,6 +1273,24 @@ msgstr "
 msgid "Classic VDR"
 msgstr "������� VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "������ ST:TNG"
 
@@ -1341,3 +1353,9 @@ msgstr ""
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
+
+msgid "Disk"
+msgstr "������"
+
+msgid "free"
+msgstr "���������"
diff --git a/po/es_ES.po b/po/es_ES.po
index 3260e2444..93ca6693e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -510,12 +510,6 @@ msgstr "Usuario 8"
 msgid "Key$User9"
 msgstr "Usuario 9"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "libre"
-
 msgid "Free To Air"
 msgstr "en abierto"
 
@@ -924,6 +918,9 @@ msgstr "Subt
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Interfaz DVB primario"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Formato de v�deo"
 
@@ -1148,9 +1145,6 @@ msgstr " Parar grabaci
 msgid "Schedule"
 msgstr "Gu�a de Programaci�n"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reproduci�n"
@@ -1280,6 +1274,24 @@ msgstr "Volumen "
 msgid "Classic VDR"
 msgstr "VDR cl�sico"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Paneles ST:TNG"
 
@@ -1342,3 +1354,9 @@ msgstr "Pulse cualquier tecla para cancelar reinicio"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR se apagar� en %s minutos"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "libre"
diff --git a/po/et_EE.po b/po/et_EE.po
index c808011c8..cfd61f0d1 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "Lisaklahv8"
 msgid "Key$User9"
 msgstr "Lisaklahv9"
 
-msgid "Disk"
-msgstr "Ketas"
-
-msgid "free"
-msgstr "vaba"
-
 msgid "Free To Air"
 msgstr "FTA"
 
@@ -923,6 +917,9 @@ msgstr "Subtiitrid"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Esmane DVB seade"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "TV külgsuhe"
 
@@ -1147,9 +1144,6 @@ msgstr " Lõpetada salvestamine "
 msgid "Schedule"
 msgstr "Kava"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lõpetada taasesitamine"
@@ -1279,6 +1273,24 @@ msgstr "Helitugevus "
 msgid "Classic VDR"
 msgstr "Classic VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panels"
 
@@ -1341,3 +1353,9 @@ msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR lülitub välja %s minuti pärast"
+
+msgid "Disk"
+msgstr "Ketas"
+
+msgid "free"
+msgstr "vaba"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 4e9ba735e..af24f8132 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -512,12 +512,6 @@ msgstr "Lisänäppäin 8"
 msgid "Key$User9"
 msgstr "Lisänäppäin 9"
 
-msgid "Disk"
-msgstr "Levy"
-
-msgid "free"
-msgstr "vapaana"
-
 msgid "Free To Air"
 msgstr "vapaa"
 
@@ -926,6 +920,9 @@ msgstr "Tekstitys"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Ensisijainen DVB-sovitin"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr "Noudatettava standardi"
+
 msgid "Setup.DVB$Video format"
 msgstr "Kuvasuhde"
 
@@ -1150,9 +1147,6 @@ msgstr " Lopeta tallennus "
 msgid "Schedule"
 msgstr "Ohjelmisto"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lopeta toisto"
@@ -1282,6 +1276,24 @@ msgstr "Äänenvoimakkuus "
 msgid "Classic VDR"
 msgstr "Klassinen VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsoli"
 
@@ -1344,3 +1356,9 @@ msgstr "Peru uudelleenkäynnistys painamalla mitä tahansa näppäintä"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR sammuu %s minuutin kuluttua"
+
+msgid "Disk"
+msgstr "Levy"
+
+msgid "free"
+msgstr "vapaana"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 4673b2eaa..44b2fa304 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -515,12 +515,6 @@ msgstr "Utilisateur8"
 msgid "Key$User9"
 msgstr "Utilisateur9"
 
-msgid "Disk"
-msgstr "Disque"
-
-msgid "free"
-msgstr "restant"
-
 msgid "Free To Air"
 msgstr "En clair"
 
@@ -929,6 +923,9 @@ msgstr "Sous-titres"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Carte DVB primaire"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Format vid�o"
 
@@ -1153,9 +1150,6 @@ msgstr " Arr
 msgid "Schedule"
 msgstr "Programmes"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Arr�ter la lecture"
@@ -1285,6 +1279,24 @@ msgstr "Volume "
 msgid "Classic VDR"
 msgstr "VDR classique"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Consoles ST:TNG"
 
@@ -1347,3 +1359,9 @@ msgstr "Appuyer sur une touche pour annuler le red
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR s'arr�tera dans %s minutes"
+
+msgid "Disk"
+msgstr "Disque"
+
+msgid "free"
+msgstr "restant"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 91499ca37..541c64e77 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -511,12 +511,6 @@ msgstr "Korisnik8"
 msgid "Key$User9"
 msgstr "Korisnik9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "slobodno"
-
 msgid "Free To Air"
 msgstr "Slobodno"
 
@@ -925,6 +919,9 @@ msgstr "Titlovi"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarni DVB ure�aj"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
@@ -1149,9 +1146,6 @@ msgstr " Prekini snimanje "
 msgid "Schedule"
 msgstr "Raspored"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
@@ -1281,6 +1275,24 @@ msgstr "Glasno
 msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panele"
 
@@ -1343,3 +1355,9 @@ msgstr "Pritisnite jednu tipku za poni
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR �e se isklju�iti za %s minuta"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "slobodno"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 595fa6b49..c7814ee05 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -512,12 +512,6 @@ msgstr "Felhaszn
 msgid "Key$User9"
 msgstr "Felhaszn�l�9"
 
-msgid "Disk"
-msgstr "Lemez"
-
-msgid "free"
-msgstr "szabad"
-
 msgid "Free To Air"
 msgstr "K�dolatlan"
 
@@ -926,6 +920,9 @@ msgstr "Feliratok"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Els� DVB interface"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video form�tum"
 
@@ -1151,9 +1148,6 @@ msgstr " Felv
 msgid "Schedule"
 msgstr "M�sor�js�g"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lej�tsz�st befejzni"
@@ -1283,6 +1277,24 @@ msgstr "Hanger
 msgid "Classic VDR"
 msgstr "Klasszikus VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzol"
 
@@ -1345,3 +1357,9 @@ msgstr "Nyomj egy gombot az 
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "A VDR le�ll %s perc m�lva"
+
+msgid "Disk"
+msgstr "Lemez"
+
+msgid "free"
+msgstr "szabad"
diff --git a/po/it_IT.po b/po/it_IT.po
index 54beacaba..8027cb2eb 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2012-03-19 01:08+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -516,12 +516,6 @@ msgstr "Utente8"
 msgid "Key$User9"
 msgstr "Utente9"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "disponibili"
-
 msgid "Free To Air"
 msgstr "in chiaro"
 
@@ -930,6 +924,9 @@ msgstr "Sottotitoli"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Scheda DVB primaria"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Formato video"
 
@@ -1154,9 +1151,6 @@ msgstr " Ferma registrazione "
 msgid "Schedule"
 msgstr "Programmi"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Ferma riproduzione"
@@ -1286,6 +1280,24 @@ msgstr "Volume "
 msgid "Classic VDR"
 msgstr "VDR Classico"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Consolle ST:TNG"
 
@@ -1348,3 +1360,9 @@ msgstr "Premi un tasto per annullare il riavvio"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR si spegnerà tra %s minuti"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "disponibili"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 50cd11da9..03d3508f7 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "Vartotojas8"
 msgid "Key$User9"
 msgstr "Vartotojas9"
 
-msgid "Disk"
-msgstr "Diskas"
-
-msgid "free"
-msgstr "laisva"
-
 msgid "Free To Air"
 msgstr "Nekoduotas kanalas"
 
@@ -923,6 +917,9 @@ msgstr "Subtitrai"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pirminiė DVB įvestis"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video formatas"
 
@@ -1147,9 +1144,6 @@ msgstr " Sustabdyti įrašinėjimą "
 msgid "Schedule"
 msgstr "Programa"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Sustabdyti kartojimą"
@@ -1279,6 +1273,24 @@ msgstr "Garsas "
 msgid "Classic VDR"
 msgstr "Klasikinis VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Skydeliai"
 
@@ -1341,3 +1353,9 @@ msgstr "Paspauskit bet kurį mygtuką kad sustabdytumėte perkrovimą"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR išsijungs per %s minutes"
+
+msgid "Disk"
+msgstr "Diskas"
+
+msgid "free"
+msgstr "laisva"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 94935c8c0..e62fac886 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -510,12 +510,6 @@ msgstr "Корисник8"
 msgid "Key$User9"
 msgstr "Корисник9"
 
-msgid "Disk"
-msgstr "Диск"
-
-msgid "free"
-msgstr "слободен"
-
 msgid "Free To Air"
 msgstr "Слободно"
 
@@ -924,6 +918,9 @@ msgstr "Титл"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Примарен DVB уред"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Видео формат"
 
@@ -1148,9 +1145,6 @@ msgstr " Запри снимање "
 msgid "Schedule"
 msgstr "Распоред"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Запри пуштање"
@@ -1280,6 +1274,24 @@ msgstr "Глас"
 msgid "Classic VDR"
 msgstr "Класичен VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Панели"
 
@@ -1342,3 +1354,9 @@ msgstr "Притиснете копче за откажување на рест
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR ќе се исклучи за %s минути"
+
+msgid "Disk"
+msgstr "Диск"
+
+msgid "free"
+msgstr "слободен"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 20ee0cb06..9d1fcde87 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -513,12 +513,6 @@ msgstr "Gebruiker8"
 msgid "Key$User9"
 msgstr "Gebruiker9"
 
-msgid "Disk"
-msgstr "Schijf"
-
-msgid "free"
-msgstr "vrij"
-
 msgid "Free To Air"
 msgstr "Vrij te ontvangen"
 
@@ -927,6 +921,9 @@ msgstr "Ondertiteling"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Eerste DVB kaart"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Videoformaat"
 
@@ -1151,9 +1148,6 @@ msgstr " Stop opnemen "
 msgid "Schedule"
 msgstr "Programmagids"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspelen"
@@ -1283,6 +1277,24 @@ msgstr "Volume "
 msgid "Classic VDR"
 msgstr "VDR Klassiek"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Consoles"
 
@@ -1345,3 +1357,9 @@ msgstr "Druk een willekeurige toets om herstarten af te breken"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR zal na %s minuten uitschakelen"
+
+msgid "Disk"
+msgstr "Schijf"
+
+msgid "free"
+msgstr "vrij"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index a51967be1..44940e075 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -510,12 +510,6 @@ msgstr ""
 msgid "Key$User9"
 msgstr ""
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "ledig"
-
 msgid "Free To Air"
 msgstr ""
 
@@ -924,6 +918,9 @@ msgstr ""
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Hoved DVB-enhet"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "TV-Format"
 
@@ -1148,9 +1145,6 @@ msgstr " Stopp opptak fra "
 msgid "Schedule"
 msgstr "Programmer"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stopp avspilling"
@@ -1280,6 +1274,24 @@ msgstr "Volum "
 msgid "Classic VDR"
 msgstr ""
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr ""
 
@@ -1342,3 +1354,9 @@ msgstr ""
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr ""
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "ledig"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 5471341ab..90a1762e8 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -510,12 +510,6 @@ msgstr "U
 msgid "Key$User9"
 msgstr "U�ytkownik 9"
 
-msgid "Disk"
-msgstr "Dysk"
-
-msgid "free"
-msgstr "wolnego"
-
 msgid "Free To Air"
 msgstr "nieszyfrowany"
 
@@ -924,6 +918,9 @@ msgstr "Napisy"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pierwszy interfejs DVB"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Format obrazu"
 
@@ -1148,9 +1145,6 @@ msgstr " Zatrzymaj nagrywanie "
 msgid "Schedule"
 msgstr "Program"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zatrzymaj odtwarzanie"
@@ -1280,6 +1274,24 @@ msgstr "G
 msgid "Classic VDR"
 msgstr "Klasyczny VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Panel ST:TNG"
 
@@ -1342,3 +1354,9 @@ msgstr "Naci
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR zostanie wy��czony za %s minut"
+
+msgid "Disk"
+msgstr "Dysk"
+
+msgid "free"
+msgstr "wolnego"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 360a09579..c2017619e 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -510,12 +510,6 @@ msgstr "Defini
 msgid "Key$User9"
 msgstr "Defini��o9"
 
-msgid "Disk"
-msgstr "Disco"
-
-msgid "free"
-msgstr "livre"
-
 msgid "Free To Air"
 msgstr "FTA"
 
@@ -924,6 +918,9 @@ msgstr "Legendas"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Placa DVB prim�ria"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Formato de v�deo"
 
@@ -1148,9 +1145,6 @@ msgstr " Parar grava
 msgid "Schedule"
 msgstr "Programa��o"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reprodu��o"
@@ -1280,6 +1274,24 @@ msgstr "Volume "
 msgid "Classic VDR"
 msgstr "VDR Cl�ssico"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Consola ST:TNG"
 
@@ -1342,3 +1354,9 @@ msgstr "Pressione qualquer tecla para cancelar o reinicio"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "O VDR vai desligar daqui a %s minutos"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "free"
+msgstr "livre"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 7d875d57c..64aadc8ea 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -512,12 +512,6 @@ msgstr "Utilizator8"
 msgid "Key$User9"
 msgstr "Utilizator9"
 
-msgid "Disk"
-msgstr "Disc"
-
-msgid "free"
-msgstr "liber"
-
 msgid "Free To Air"
 msgstr "FTA (necriptat)"
 
@@ -926,6 +920,9 @@ msgstr "Subtitrare"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Dispozitiv DVB primar"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Format video"
 
@@ -1150,9 +1147,6 @@ msgstr " Opre
 msgid "Schedule"
 msgstr "Program (EPG)"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Opre�te redarea"
@@ -1282,6 +1276,24 @@ msgstr "Volum "
 msgid "Classic VDR"
 msgstr "VDR clasic"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Cons. ST:TNG"
 
@@ -1344,3 +1356,9 @@ msgstr "Ap
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR se va �nchide �n %s minute"
+
+msgid "Disk"
+msgstr "Disc"
+
+msgid "free"
+msgstr "liber"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 203cb00a9..f3cd5c33b 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -510,12 +510,6 @@ msgstr "
 msgid "Key$User9"
 msgstr "������������9"
 
-msgid "Disk"
-msgstr "����"
-
-msgid "free"
-msgstr "��������"
-
 msgid "Free To Air"
 msgstr "FTA (��������������)"
 
@@ -924,6 +918,9 @@ msgstr "
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "�������� DVB-����������"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "������ �����"
 
@@ -1148,9 +1145,6 @@ msgstr " 
 msgid "Schedule"
 msgstr "�������"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ���������� ���������������"
@@ -1280,6 +1274,24 @@ msgstr "
 msgid "Classic VDR"
 msgstr "������������"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG ������"
 
@@ -1342,3 +1354,9 @@ msgstr "
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR ���������� ����� %s �����"
+
+msgid "Disk"
+msgstr "����"
+
+msgid "free"
+msgstr "��������"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 65dc7bd96..985435d2e 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "U
 msgid "Key$User9"
 msgstr "U��vate�9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "volne"
-
 msgid "Free To Air"
 msgstr "volne ��rite�n�"
 
@@ -923,6 +917,9 @@ msgstr "Titulky"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Hlavn� DVB rozhranie"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Form�t videa"
 
@@ -1147,9 +1144,6 @@ msgstr " Zastavi
 msgid "Schedule"
 msgstr "TV program"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zastavi� prehr�vanie"
@@ -1279,6 +1273,24 @@ msgstr "Hlasitos
 msgid "Classic VDR"
 msgstr "Klasick� VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG panely"
 
@@ -1341,3 +1353,9 @@ msgstr "ktor
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR sa vypne za %s min�t"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "volne"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index b785143ed..8b25fc304 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -510,12 +510,6 @@ msgstr "Uporabnik8"
 msgid "Key$User9"
 msgstr "Uporabnik9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "prosto"
-
 msgid "Free To Air"
 msgstr "nekodiran"
 
@@ -924,6 +918,9 @@ msgstr "Podnapisi"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarna naprava"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
@@ -1148,9 +1145,6 @@ msgstr " Prekini snemanje "
 msgid "Schedule"
 msgstr "Program"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini predvajanje"
@@ -1280,6 +1274,24 @@ msgstr "Glasnost "
 msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konsola"
 
@@ -1342,3 +1354,9 @@ msgstr "Pritisni katerokoli tipko za preklic ponovnega zagona"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR se bo zaustavil v %s minutah"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "prosto"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index d5f7e9aee..39bc9d242 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -511,12 +511,6 @@ msgstr "Korisnik8"
 msgid "Key$User9"
 msgstr "Korisnik9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "slobodno"
-
 msgid "Free To Air"
 msgstr "Slobodno"
 
@@ -942,6 +936,9 @@ msgstr "Titlovi"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarni DVB ure�aj"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
@@ -1171,9 +1168,6 @@ msgstr " Zaustavi snimanje "
 msgid "Schedule"
 msgstr "Raspored Programa"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zaustavi reprodukciju"
@@ -1305,6 +1299,24 @@ msgstr "Ja
 msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panele"
 
@@ -1368,3 +1380,9 @@ msgstr "Pritisni jedan taster za poni
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR se isklju�uje za %s minuta"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "slobodno"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 4e9aba8d4..7987755a2 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -512,12 +512,6 @@ msgstr "Anv
 msgid "Key$User9"
 msgstr "Anv�ndare9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "ledigt"
-
 msgid "Free To Air"
 msgstr "Okodad"
 
@@ -926,6 +920,9 @@ msgstr "Knapp$Textning"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhet"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
 
@@ -1150,9 +1147,6 @@ msgstr " Avsluta inspelning "
 msgid "Schedule"
 msgstr "Program"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
@@ -1282,6 +1276,24 @@ msgstr "Volym "
 msgid "Classic VDR"
 msgstr "Klassisk VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsol"
 
@@ -1344,3 +1356,9 @@ msgstr "Tryck valfri knapp f
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR kommer att st�ngas ned om %s minuter"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "ledigt"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index c11769b9a..163b82315 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "Kullan
 msgid "Key$User9"
 msgstr "Kullan�c�9"
 
-msgid "Disk"
-msgstr "Disk"
-
-msgid "free"
-msgstr "bo�"
-
 msgid "Free To Air"
 msgstr "�ifresiz"
 
@@ -923,6 +917,9 @@ msgstr "Altyaz
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primer DVB aray�z�"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Video format�"
 
@@ -1147,9 +1144,6 @@ msgstr " 
 msgid "Schedule"
 msgstr "Program"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " G�steri�i bitir"
@@ -1279,6 +1273,24 @@ msgstr "Vol
 msgid "Classic VDR"
 msgstr "Klasik VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG paneli"
 
@@ -1341,3 +1353,9 @@ msgstr "Yeniden ba
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR %s dakikada kapanacak"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "free"
+msgstr "bo�"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index e17528243..588cf7a14 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -509,12 +509,6 @@ msgstr "Користувач8"
 msgid "Key$User9"
 msgstr "Користувач8"
 
-msgid "Disk"
-msgstr "Диск"
-
-msgid "free"
-msgstr "вільно"
-
 msgid "Free To Air"
 msgstr "FTA (незакодовано)"
 
@@ -923,6 +917,9 @@ msgstr "Субтитри"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Основний DVB-пристрій"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "Формат відео"
 
@@ -1147,9 +1144,6 @@ msgstr " Зупинити запис "
 msgid "Schedule"
 msgstr "Телегід"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Зупинити програвання"
@@ -1279,6 +1273,24 @@ msgstr "Гучність "
 msgid "Classic VDR"
 msgstr "Класичний VDR"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG панелі"
 
@@ -1341,3 +1353,9 @@ msgstr "Натисніть будь-яку кнопку для відміни п
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR виключиться через %s хвилин"
+
+msgid "Disk"
+msgstr "Диск"
+
+msgid "free"
+msgstr "вільно"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b878937e3..d0879467a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-03-08 14:37+0100\n"
+"POT-Creation-Date: 2012-06-02 15:10+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -512,12 +512,6 @@ msgstr "用户8"
 msgid "Key$User9"
 msgstr "用户9"
 
-msgid "Disk"
-msgstr "硬盘已使用"
-
-msgid "free"
-msgstr "可录像时间"
-
 msgid "Free To Air"
 msgstr "剩余空间"
 
@@ -926,6 +920,9 @@ msgstr "字幕"
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "使用中卫星卡接口"
 
+msgid "Setup.DVB$Standard compliance"
+msgstr ""
+
 msgid "Setup.DVB$Video format"
 msgstr "视频格式"
 
@@ -1150,9 +1147,6 @@ msgstr "是否停止录像?"
 msgid "Schedule"
 msgstr "任务列表"
 
-msgid "VDR"
-msgstr "VDR"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr "停止回放"
@@ -1282,6 +1276,24 @@ msgstr "音量调整"
 msgid "Classic VDR"
 msgstr "经典VDR面板"
 
+msgid "DISK"
+msgstr ""
+
+msgid "LOAD"
+msgstr ""
+
+msgid "TIMERS"
+msgstr ""
+
+msgid "DEVICES"
+msgstr ""
+
+msgid "LIVE"
+msgstr ""
+
+msgid "PLAY"
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG 面板"
 
@@ -1344,3 +1356,9 @@ msgstr "请按任意键重启"
 #, c-format
 msgid "VDR will shut down in %s minutes"
 msgstr "VDR系统将要在%s分钟关闭"
+
+msgid "Disk"
+msgstr "硬盘已使用"
+
+msgid "free"
+msgstr "可录像时间"
diff --git a/receiver.c b/receiver.c
index 372cb2c93..bde60e463 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,27 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.5 2012/02/29 11:49:36 kls Exp $
+ * $Id: receiver.c 2.7 2012/06/02 13:20:38 kls Exp $
  */
 
 #include "receiver.h"
 #include <stdio.h>
 #include "tools.h"
 
-#ifdef LEGACY_CRECEIVER
-cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
-{
-  device = NULL;
-  channelID = ChannelID;
-  priority = constrain(Priority, MINPRIORITY, MAXPRIORITY);
-  numPids = 0;
-  AddPid(Pid);
-  AddPids(Pids1);
-  AddPids(Pids2);
-  AddPids(Pids3);
-}
-#endif
-
 cReceiver::cReceiver(const cChannel *Channel, int Priority)
 {
   device = NULL;
@@ -83,7 +69,7 @@ bool cReceiver::SetPids(const cChannel *Channel)
             AddPids(Channel->Dpids()) &&
             AddPids(Channel->Spids());
      }
-return true;
+  return true;
 }
 
 bool cReceiver::WantsPid(int Pid)
diff --git a/receiver.h b/receiver.h
index efa7be87f..eb2f32a7e 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.6 2012/03/11 15:25:40 kls Exp $
+ * $Id: receiver.h 2.8 2012/06/02 13:20:44 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -14,8 +14,6 @@
 
 #define MAXRECEIVEPIDS  64 // the maximum number of PIDs per receiver
 
-//#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
-
 class cReceiver {
   friend class cDevice;
 private:
@@ -40,9 +38,6 @@ class cReceiver {
                ///< will be delivered only ONCE, so the cReceiver must make sure that
                ///< it will be able to buffer the data if necessary.
 public:
-#ifdef LEGACY_CRECEIVER
-  cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
-#endif
   cReceiver(const cChannel *Channel = NULL, int Priority = MINPRIORITY);
                ///< Creates a new receiver for the given Channel with the given Priority.
                ///< If Channel is not NULL, its pids are set by a call to SetPids().
@@ -62,7 +57,7 @@ class cReceiver {
                ///< Adds the given Pids to the list of PIDs of this receiver.
   bool SetPids(const cChannel *Channel);
                ///< Sets the PIDs of this receiver to those of the given Channel,
-               ///< replacing and previously stored PIDs. If Channel is NULL, all
+               ///< replacing any previously stored PIDs. If Channel is NULL, all
                ///< PIDs will be cleared. Parameters in the Setup may control whether
                ///< certain types of PIDs (like Dolby Digital, for instance) are
                ///< actually set. The Channel's ID is stored and can later be retrieved
diff --git a/recording.c b/recording.c
index e1f7ec968..2a73645c6 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.53 2012/03/13 13:17:57 kls Exp $
+ * $Id: recording.c 2.56 2012/06/03 09:51:27 kls Exp $
  */
 
 #include "recording.h"
@@ -153,7 +153,7 @@ void AssertFreeDiskSpace(int Priority, bool Force)
            cRecording *r = DeletedRecordings.First();
            cRecording *r0 = NULL;
            while (r) {
-                 if (IsOnVideoDirectoryFileSystem(r->FileName())) { // only remove recordings that will actually increase the free video disk space
+                 if (r->IsOnVideoDirectoryFileSystem()) { // only remove recordings that will actually increase the free video disk space
                     if (!r0 || r->Start() < r0->Start())
                        r0 = r;
                     }
@@ -180,7 +180,7 @@ void AssertFreeDiskSpace(int Priority, bool Force)
            cRecording *r = Recordings.First();
            cRecording *r0 = NULL;
            while (r) {
-                 if (IsOnVideoDirectoryFileSystem(r->FileName())) { // only delete recordings that will actually increase the free video disk space
+                 if (r->IsOnVideoDirectoryFileSystem()) { // only delete recordings that will actually increase the free video disk space
                     if (!r->IsEdited() && r->Lifetime() < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
                        if ((r->Lifetime() == 0 && Priority > r->Priority()) || // the recording has no guaranteed lifetime and the new recording has higher priority
                            (r->Lifetime() > 0 && (time(NULL) - r->Start()) / SECSINDAY >= r->Lifetime())) { // the recording's guaranteed lifetime has expired
@@ -617,6 +617,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   channel = Timer->Channel()->Number();
   instanceId = InstanceId;
   isPesRecording = false;
+  isOnVideoDirectoryFileSystem = -1; // unknown
   framesPerSecond = DEFAULTFRAMESPERSECOND;
   numFrames = -1;
   deleted = 0;
@@ -677,6 +678,7 @@ cRecording::cRecording(const char *FileName)
   priority = MAXPRIORITY; // assume maximum in case there is no info file
   lifetime = MAXLIFETIME;
   isPesRecording = false;
+  isOnVideoDirectoryFileSystem = -1; // unknown
   framesPerSecond = DEFAULTFRAMESPERSECOND;
   numFrames = -1;
   deleted = 0;
@@ -723,7 +725,9 @@ cRecording::cRecording(const char *FileName)
            }
         fclose(f);
         }
-     else if (errno != ENOENT)
+     else if (errno == ENOENT)
+        info->ownEvent->SetTitle(name);
+     else
         LOG_ERROR_STR(*InfoFileName);
 #ifdef SUMMARYFALLBACK
      // fall back to the old 'summary.vdr' if there was no 'info.vdr':
@@ -950,6 +954,13 @@ bool cRecording::IsEdited(void) const
   return *s == '%';
 }
 
+bool cRecording::IsOnVideoDirectoryFileSystem(void) const
+{
+  if (isOnVideoDirectoryFileSystem < 0)
+     isOnVideoDirectoryFileSystem = ::IsOnVideoDirectoryFileSystem(FileName());
+  return isOnVideoDirectoryFileSystem;
+}
+
 void cRecording::ReadInfo(void)
 {
   info->Read();
@@ -1251,7 +1262,7 @@ int cRecordings::TotalFileSizeMB(void)
   LOCK_THREAD;
   for (cRecording *recording = First(); recording; recording = Next(recording)) {
       int FileSizeMB = recording->FileSizeMB();
-      if (FileSizeMB > 0 && IsOnVideoDirectoryFileSystem(recording->FileName()))
+      if (FileSizeMB > 0 && recording->IsOnVideoDirectoryFileSystem())
          size += FileSizeMB;
       }
   return size;
@@ -1263,7 +1274,7 @@ double cRecordings::MBperMinute(void)
   int length = 0;
   LOCK_THREAD;
   for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (IsOnVideoDirectoryFileSystem(recording->FileName())) {
+      if (recording->IsOnVideoDirectoryFileSystem()) {
          int FileSizeMB = recording->FileSizeMB();
          if (FileSizeMB > 0) {
             int LengthInSeconds = recording->LengthInSeconds();
@@ -1422,13 +1433,17 @@ cMark *cMarks::GetNext(int Position)
 
 const char *cRecordingUserCommand::command = NULL;
 
-void cRecordingUserCommand::InvokeCommand(const char *State, const char *RecordingFileName)
+void cRecordingUserCommand::InvokeCommand(const char *State, const char *RecordingFileName, const char *SourceFileName)
 {
   if (command) {
-     cString cmd = cString::sprintf("%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\\\"$"));
-     isyslog("executing '%s'", *cmd);
-     SystemExec(cmd);
-     }
+    cString cmd;
+    if (SourceFileName)
+       cmd = cString::sprintf("%s %s \"%s\" \"%s\"", command, State, *strescape(RecordingFileName, "\\\"$"), *strescape(SourceFileName, "\\\"$"));
+    else
+       cmd = cString::sprintf("%s %s \"%s\"", command, State, *strescape(RecordingFileName, "\\\"$"));
+    isyslog("executing '%s'", *cmd);
+    SystemExec(cmd);
+  }
 }
 
 // --- cIndexFileGenerator ---------------------------------------------------
diff --git a/recording.h b/recording.h
index 5f94ee234..56659edc6 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.30 2012/03/13 12:41:05 kls Exp $
+ * $Id: recording.h 2.33 2012/06/03 09:49:09 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -22,8 +22,6 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
-//#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
-
 extern bool VfatFileSystem;
 extern int InstanceId;
 
@@ -93,6 +91,7 @@ class cRecording : public cListObject {
   int channel;
   int instanceId;
   bool isPesRecording;
+  mutable int isOnVideoDirectoryFileSystem; // -1 = unknown, 0 = no, 1 = yes
   double framesPerSecond;
   cRecordingInfo *info;
   cRecording(const cRecording&); // can't copy cRecording
@@ -100,9 +99,6 @@ class cRecording : public cListObject {
   static char *StripEpisodeName(char *s);
   char *SortName(void) const;
   int GetResume(void) const;
-#ifdef __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
-public:
-#endif
   time_t start;
   int priority;
   int lifetime;
@@ -135,6 +131,7 @@ class cRecording : public cListObject {
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
+  bool IsOnVideoDirectoryFileSystem(void) const;
   void ReadInfo(void);
   bool WriteInfo(void);
   void SetStartTime(time_t Start);
@@ -208,9 +205,6 @@ class cMark : public cListObject {
   friend class cMarks; // for sorting
 private:
   double framesPerSecond;
-#ifdef __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
-public:
-#endif
   int position;
   cString comment;
 public:
@@ -251,7 +245,7 @@ class cRecordingUserCommand {
   static const char *command;
 public:
   static void SetCommand(const char *Command) { command = Command; }
-  static void InvokeCommand(const char *State, const char *RecordingFileName);
+  static void InvokeCommand(const char *State, const char *RecordingFileName, const char *SourceFileName = NULL);
   };
 
 // The maximum size of a single frame (up to HDTV 1920x1080):
diff --git a/skinclassic.c b/skinclassic.c
index 49f0bcb5c..64944ded6 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.6 2011/08/21 11:02:06 kls Exp $
+ * $Id: skinclassic.c 2.7 2012/04/23 08:48:03 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -12,6 +12,7 @@
 #include "i18n.h"
 #include "osd.h"
 #include "themes.h"
+#include "videodir.h"
 
 #define ScrollWidth (Setup.FontOsdSize / 4)
 #define TextFrame   (Setup.FontOsdSize / 10)
@@ -170,7 +171,10 @@ class cSkinClassicDisplayMenu : public cSkinDisplayMenu {
   int y0, y1, y2, y3, y4, y5;
   int lineHeight;
   int dateWidth;
+  cString title;
   cString lastDate;
+  int lastDiskUsageState;
+  void DrawTitle(void);
   void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
   void SetTextScrollbar(void);
 public:
@@ -196,6 +200,7 @@ cSkinClassicDisplayMenu::cSkinClassicDisplayMenu(void)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   lineHeight = font->Height();
+  lastDiskUsageState = -1;
   dateWidth = 0;
   x0 = 0;
   x1 = x0 + 2 * TextSpacing;
@@ -270,10 +275,17 @@ void cSkinClassicDisplayMenu::Clear(void)
   osd->DrawRectangle(x0, y1, x3 - 1, y4 - 1, Theme.Color(clrBackground));
 }
 
-void cSkinClassicDisplayMenu::SetTitle(const char *Title)
+void cSkinClassicDisplayMenu::DrawTitle(void)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  osd->DrawText(x0, y0, Title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x3 - x0 - dateWidth);
+  bool WithDisk = MenuCategory() == mcMain || MenuCategory() == mcRecording;
+  osd->DrawText(x0, y0, WithDisk ? cString::sprintf("%s  -  %s", *title, *cVideoDiskUsage::String()) : title, Theme.Color(clrMenuTitleFg), Theme.Color(clrMenuTitleBg), font, x3 - x0 - dateWidth);
+}
+
+void cSkinClassicDisplayMenu::SetTitle(const char *Title)
+{
+  title = Title;
+  DrawTitle();
 }
 
 void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
@@ -422,6 +434,8 @@ const cFont *cSkinClassicDisplayMenu::GetTextAreaFont(bool FixedFont) const
 
 void cSkinClassicDisplayMenu::Flush(void)
 {
+  if (cVideoDiskUsage::HasChanged(lastDiskUsageState))
+     DrawTitle();
   cString date = DayDateTime();
   if (!*lastDate || strcmp(date, lastDate)) {
      const cFont *font = cFont::GetFont(fontOsd);
diff --git a/skinlcars.c b/skinlcars.c
new file mode 100644
index 000000000..a60292371
--- /dev/null
+++ b/skinlcars.c
@@ -0,0 +1,2114 @@
+/*
+ * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skinlcars.c 2.2 2012/06/03 10:17:00 kls Exp $
+ */
+
+// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
+// registered in the United States Patent and Trademark Office, all rights reserved.
+// The LCARS system is based upon the designs of Michael Okuda and his Okudagrams.
+//
+// "LCARS" is short for "Library Computer Access and Retrieval System".
+// Some resources used for writing this skin can be found at
+// http://www.lcars.org.uk
+// http://www.lcarsdeveloper.com
+// http://www.lcarscom.net
+// http://lds-jedi.deviantart.com/art/LCARS-Swept-Tutorial-213936938
+// http://lds-jedi.deviantart.com/art/LCARS-Button-Tutorial-210783437
+// http://zelldenver.deviantart.com/art/LCARS-Color-Standard-179565780
+// http://www.lcars47.com
+// http://www.bracercom.com/tutorial/content/CoherentLCARSInterface/LCARSCoherentInterface.html
+// http://www.bracercom.com/tutorial/content/lcars_manifesto/the_lcars_manifesto.html
+
+#include "skinlcars.h"
+#include "font.h"
+#include "menu.h"
+#include "osd.h"
+#include "themes.h"
+#include "videodir.h"
+
+#include "symbols/arrowdown.xpm"
+#include "symbols/arrowup.xpm"
+#include "symbols/audio.xpm"
+#include "symbols/audioleft.xpm"
+#include "symbols/audioright.xpm"
+#include "symbols/audiostereo.xpm"
+#include "symbols/dolbydigital.xpm"
+#include "symbols/encrypted.xpm"
+#include "symbols/ffwd.xpm"
+#include "symbols/ffwd1.xpm"
+#include "symbols/ffwd2.xpm"
+#include "symbols/ffwd3.xpm"
+#include "symbols/frew.xpm"
+#include "symbols/frew1.xpm"
+#include "symbols/frew2.xpm"
+#include "symbols/frew3.xpm"
+#include "symbols/mute.xpm"
+#include "symbols/pause.xpm"
+#include "symbols/play.xpm"
+#include "symbols/radio.xpm"
+#include "symbols/recording.xpm"
+#include "symbols/sfwd.xpm"
+#include "symbols/sfwd1.xpm"
+#include "symbols/sfwd2.xpm"
+#include "symbols/sfwd3.xpm"
+#include "symbols/srew.xpm"
+#include "symbols/srew1.xpm"
+#include "symbols/srew2.xpm"
+#include "symbols/srew3.xpm"
+#include "symbols/teletext.xpm"
+#include "symbols/volume.xpm"
+
+#define Gap            (Setup.FontOsdSize / 5 & ~1) // must be even
+#define TextFrame      (Setup.FontOsdSize / TEXT_ALIGN_BORDER)
+#define TextSpacing    (2 * TextFrame)
+#define SymbolSpacing  TextSpacing
+#define ShowSeenExtent (Setup.FontOsdSize / 5) // pixels by which the "seen" bar extends out of the frame
+
+#define DISKUSAGEALERTLIMIT 95 // percent of disk usage above which the display goes into alert mode
+#define SIGNALDISPLAYDELTA   2 // seconds between subsequent device signal displays
+
+static cTheme Theme;
+
+// Color domains:
+
+#define CLR_BACKGROUND      0x99000000
+#define CLR_MAIN_FRAME      0xFFF1DF6F
+#define CLR_CHANNEL_FRAME   0xFFFFCC99
+#define CLR_REPLAY_FRAME    0xFFCC6666
+#define CLR_DATE            0xFF99CCFF
+#define CLR_MENU_ITEMS      0xFFFFBC57
+#define CLR_TIMER           0xFF99CCFF
+#define CLR_DEVICE          0xFFF1B1AF
+#define CLR_CHANNEL_NAME    0xFF99CCFF
+#define CLR_EVENT_TITLE     0xFF99CCFF
+#define CLR_EVENT_TIME      0xFFFFCC66
+#define CLR_EVENT_SHORTTEXT 0xFFFFCC66
+#define CLR_TEXT            0xFF99CCFF
+#define CLR_TRACK           0xFFFFCC66
+#define CLR_SEEN            0xFFCC99CC
+#define CLR_ALERT           0xFFFF0000
+#define CLR_EXPOSED         0xFF990000
+#define CLR_WHITE           0xFFFFFFFF
+#define CLR_RED             0xFFB20000
+#define CLR_GREEN           0xFF00B200
+#define CLR_YELLOW          0xFFB2B200
+#define CLR_BLUE            0xFF0000B2
+#define CLR_BLACK           0xFF000000
+
+// General colors:
+
+THEME_CLR(Theme, clrBackground,             CLR_BACKGROUND);
+THEME_CLR(Theme, clrDateFg,                 CLR_BLACK);
+THEME_CLR(Theme, clrDateBg,                 CLR_DATE);
+THEME_CLR(Theme, clrTimerFg,                CLR_BLACK);
+THEME_CLR(Theme, clrTimerBg,                CLR_TIMER);
+THEME_CLR(Theme, clrDeviceFg,               CLR_BLACK);
+THEME_CLR(Theme, clrDeviceBg,               CLR_DEVICE);
+THEME_CLR(Theme, clrSignalValue,            CLR_GREEN);
+THEME_CLR(Theme, clrSignalRest,             CLR_RED);
+THEME_CLR(Theme, clrSeen,                   CLR_SEEN);
+THEME_CLR(Theme, clrTrackName,              CLR_TRACK);
+THEME_CLR(Theme, clrAlertFg,                CLR_WHITE);
+THEME_CLR(Theme, clrAlertBg,                CLR_ALERT);
+THEME_CLR(Theme, clrChannelName,            CLR_CHANNEL_NAME);
+THEME_CLR(Theme, clrEventTitle,             CLR_EVENT_TITLE);
+THEME_CLR(Theme, clrEventTime,              CLR_EVENT_TIME);
+THEME_CLR(Theme, clrEventShortText,         CLR_EVENT_SHORTTEXT);
+THEME_CLR(Theme, clrEventDescription,       CLR_TEXT);
+
+// Buttons:
+
+THEME_CLR(Theme, clrButtonRedFg,            CLR_WHITE);
+THEME_CLR(Theme, clrButtonRedBg,            CLR_RED);
+THEME_CLR(Theme, clrButtonGreenFg,          CLR_BLACK);
+THEME_CLR(Theme, clrButtonGreenBg,          CLR_GREEN);
+THEME_CLR(Theme, clrButtonYellowFg,         CLR_BLACK);
+THEME_CLR(Theme, clrButtonYellowBg,         CLR_YELLOW);
+THEME_CLR(Theme, clrButtonBlueFg,           CLR_WHITE);
+THEME_CLR(Theme, clrButtonBlueBg,           CLR_BLUE);
+
+// Messages:
+
+THEME_CLR(Theme, clrMessageStatusFg,        CLR_WHITE);
+THEME_CLR(Theme, clrMessageStatusBg,        CLR_BLUE);
+THEME_CLR(Theme, clrMessageInfoFg,          CLR_BLACK);
+THEME_CLR(Theme, clrMessageInfoBg,          CLR_GREEN);
+THEME_CLR(Theme, clrMessageWarningFg,       CLR_BLACK);
+THEME_CLR(Theme, clrMessageWarningBg,       CLR_YELLOW);
+THEME_CLR(Theme, clrMessageErrorFg,         CLR_WHITE);
+THEME_CLR(Theme, clrMessageErrorBg,         CLR_RED);
+
+// Volume:
+
+THEME_CLR(Theme, clrVolumeFrame,            CLR_MAIN_FRAME);
+THEME_CLR(Theme, clrVolumeSymbol,           CLR_BLACK);
+THEME_CLR(Theme, clrVolumeBarUpper,         RgbShade(CLR_MAIN_FRAME, -0.2));
+THEME_CLR(Theme, clrVolumeBarLower,         CLR_GREEN);
+
+// Channel display:
+
+THEME_CLR(Theme, clrChannelFrameFg,         CLR_BLACK);
+THEME_CLR(Theme, clrChannelFrameBg,         CLR_CHANNEL_FRAME);
+THEME_CLR(Theme, clrChannelSymbolOn,        CLR_BLACK);
+THEME_CLR(Theme, clrChannelSymbolOff,       RgbShade(CLR_CHANNEL_FRAME, -0.2));
+THEME_CLR(Theme, clrChannelSymbolRecFg,     CLR_WHITE);
+THEME_CLR(Theme, clrChannelSymbolRecBg,     CLR_RED);
+
+// Menu:
+
+THEME_CLR(Theme, clrMenuFrameFg,            CLR_BLACK);
+THEME_CLR(Theme, clrMenuFrameBg,            CLR_MAIN_FRAME);
+THEME_CLR(Theme, clrMenuTitle,              CLR_MAIN_FRAME);
+THEME_CLR(Theme, clrMenuMainBracket,        CLR_MENU_ITEMS);
+THEME_CLR(Theme, clrMenuTimerRecording,     CLR_DEVICE);
+THEME_CLR(Theme, clrMenuDeviceRecording,    CLR_TIMER);
+THEME_CLR(Theme, clrMenuItemCurrentFg,      CLR_BLACK);
+THEME_CLR(Theme, clrMenuItemCurrentBg,      CLR_MENU_ITEMS);
+THEME_CLR(Theme, clrMenuItemSelectable,     CLR_MENU_ITEMS);
+THEME_CLR(Theme, clrMenuItemNonSelectable,  CLR_TEXT);
+THEME_CLR(Theme, clrMenuScrollbarTotal,     CLR_MENU_ITEMS);
+THEME_CLR(Theme, clrMenuScrollbarShown,     CLR_SEEN);
+THEME_CLR(Theme, clrMenuScrollbarArrow,     CLR_BLACK);
+THEME_CLR(Theme, clrMenuText,               CLR_TEXT);
+
+// Replay display:
+
+THEME_CLR(Theme, clrReplayFrameFg,          CLR_BLACK);
+THEME_CLR(Theme, clrReplayFrameBg,          CLR_REPLAY_FRAME);
+THEME_CLR(Theme, clrReplayPosition,         CLR_SEEN);
+THEME_CLR(Theme, clrReplayJumpFg,           CLR_BLACK);
+THEME_CLR(Theme, clrReplayJumpBg,           CLR_SEEN);
+THEME_CLR(Theme, clrReplayProgressSeen,     CLR_SEEN);
+THEME_CLR(Theme, clrReplayProgressRest,     RgbShade(CLR_WHITE, -0.2));
+THEME_CLR(Theme, clrReplayProgressSelected, CLR_EXPOSED);
+THEME_CLR(Theme, clrReplayProgressMark,     CLR_BLACK);
+THEME_CLR(Theme, clrReplayProgressCurrent,  CLR_EXPOSED);
+
+// Track display:
+
+THEME_CLR(Theme, clrTrackFrameFg,           CLR_BLACK);
+THEME_CLR(Theme, clrTrackFrameBg,           CLR_TRACK);
+THEME_CLR(Theme, clrTrackItemFg,            CLR_BLACK);
+THEME_CLR(Theme, clrTrackItemBg,            RgbShade(CLR_TRACK, 0.5));
+THEME_CLR(Theme, clrTrackItemCurrentFg,     CLR_BLACK);
+THEME_CLR(Theme, clrTrackItemCurrentBg,     CLR_TRACK);
+
+// --- Helper functions ------------------------------------------------------
+
+static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1)
+{
+  cOsd *Osd = cOsdProvider::NewOsd(Left, Top);
+  int Bpp[] = { 32, 8, 4, 2, 1 };
+  tArea Area = { x0, y0, x1, y1, 0 };
+  for (unsigned int i = 0; i < sizeof(Bpp) / sizeof(int); i++) {
+      Area.bpp = Bpp[i];
+      if (Osd->CanHandleAreas(&Area, 1) == oeOk) {
+         Osd->SetAreas(&Area, 1);
+         break;
+         }
+      }
+  return Osd;
+}
+
+static cFont *CreateTinyFont(int LineHeight)
+{
+  // Creates a font that is not higher than half of LineHeight.
+  LineHeight /= 2;
+  int Height = LineHeight;
+  for (;;) {
+      cFont *TinyFont = cFont::CreateFont(Setup.FontOsd, Height);
+      if (Height < 2 || TinyFont->Height() <= LineHeight)
+         return TinyFont;
+      delete TinyFont;
+      Height -= 1;
+      }
+}
+
+static bool DrawDeviceData(cOsd *Osd, const cDevice *Device, int x0, int y0, int x1, int y1, int &xs, const cFont *TinyFont, cString &LastDeviceType, cCamSlot *&LastCamSlot, bool Initial)
+{
+  cString DeviceType = Device->DeviceType();
+  cCamSlot *CamSlot = Device->CamSlot();
+  if (Initial || strcmp(DeviceType, LastDeviceType) || CamSlot != LastCamSlot) {
+     const cFont *font = cFont::GetFont(fontOsd);
+     tColor ColorFg = Theme.Color(clrDeviceFg);
+     tColor ColorBg = Theme.Color(clrDeviceBg);
+     Osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, ColorBg);
+     int x = x0;
+     // Device number:
+     cString Nr = itoa(Device->DeviceNumber() + 1);
+     int w = max(font->Width(Nr), y1 - y0);
+     Osd->DrawText(x, y0, Nr, ColorFg, ColorBg, font, w, y1 - y0, taCenter);
+     x += w;
+     // Device type:
+     Osd->DrawText(x, y0, DeviceType, ColorFg, ColorBg, TinyFont);
+     xs = max(xs, x + TinyFont->Width(DeviceType));
+     LastDeviceType = DeviceType;
+     // CAM:
+     if (CamSlot) {
+        cString s = cString::sprintf("CAM %d", CamSlot->SlotNumber());
+        Osd->DrawText(x, y1 - TinyFont->Height(), s, ColorFg, ColorBg, TinyFont);
+        xs = max(xs, x + TinyFont->Width(s));
+        }
+     LastCamSlot = CamSlot;
+     return true;
+     }
+  return false;
+}
+
+static void DrawDeviceSignal(cOsd *Osd, const cDevice *Device, int x0, int y0, int x1, int y1, int &LastSignalStrength, int &LastSignalQuality, bool Initial)
+{
+  int SignalStrength = Device->SignalStrength();
+  int SignalQuality = Device->SignalQuality();
+  int d = max((y1 - y0) / 10, 1);
+  int x00 = x0 + d;
+  int x01 = x1 - d;
+  int h = (y1 - y0 - 3 * d) / 2;
+  int w = x01 - x00;
+  int y00 = y0 + d;
+  int y01 = y00 + h;
+  int y03 = y1 - d;
+  int y02 = y03 - h;
+  if (SignalStrength >= 0 && (Initial || SignalStrength != LastSignalStrength)) {
+     int s = SignalStrength * w / 100;
+     Osd->DrawRectangle(x00, y00, x00 + s - 1, y01 - 1, Theme.Color(clrSignalValue));
+     Osd->DrawRectangle(x00 + s, y00, x01 - 1, y01 - 1, Theme.Color(clrSignalRest));
+     LastSignalStrength = SignalStrength;
+     }
+  if (SignalQuality >= 0 && (Initial || SignalQuality != LastSignalQuality)) {
+     int q = SignalQuality * w / 100;
+     Osd->DrawRectangle(x00, y02, x00 + q - 1, y03 - 1, Theme.Color(clrSignalValue));
+     Osd->DrawRectangle(x00 + q, y02, x01 - 1, y03 - 1, Theme.Color(clrSignalRest));
+     LastSignalQuality = SignalQuality;
+     }
+}
+
+// --- cSkinLCARSDisplayChannel ----------------------------------------------
+
+class cSkinLCARSDisplayChannel : public cSkinDisplayChannel {
+private:
+  cOsd *osd;
+  int xc00, xc01, xc02, xc03, xc04, xc05, xc06, xc07, xc08, xc09, xc10, xc11, xc12, xc13, xc14, xc15;
+  int yc00, yc01, yc02, yc03, yc04, yc05, yc06, yc07, yc08, yc09, yc10, yc11, yc12;
+  int xs; // starting column for signal display
+  bool withInfo;
+  int lineHeight;
+  cFont *tinyFont;
+  cFont *tallFont;
+  tColor frameColor;
+  bool message;
+  const cEvent *present;
+  bool initial;
+  cString lastDate;
+  int lastSeen;
+  int lastDeviceNumber;
+  cString lastDeviceType;
+  cCamSlot *lastCamSlot;
+  int lastSignalStrength;
+  int lastSignalQuality;
+  time_t lastSignalDisplay;
+  tTrackId lastTrackId;
+  static cBitmap bmTeletext, bmRadio, bmAudio, bmDolbyDigital, bmEncrypted, bmRecording;
+  void DrawDate(void);
+  void DrawTrack(void);
+  void DrawSeen(int Current, int Total);
+  void DrawDevice(void);
+  void DrawSignal(void);
+public:
+  cSkinLCARSDisplayChannel(bool WithInfo);
+  virtual ~cSkinLCARSDisplayChannel();
+  virtual void SetChannel(const cChannel *Channel, int Number);
+  virtual void SetEvents(const cEvent *Present, const cEvent *Following);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cBitmap cSkinLCARSDisplayChannel::bmTeletext(teletext_xpm);
+cBitmap cSkinLCARSDisplayChannel::bmRadio(radio_xpm);
+cBitmap cSkinLCARSDisplayChannel::bmAudio(audio_xpm);
+cBitmap cSkinLCARSDisplayChannel::bmDolbyDigital(dolbydigital_xpm);
+cBitmap cSkinLCARSDisplayChannel::bmEncrypted(encrypted_xpm);
+cBitmap cSkinLCARSDisplayChannel::bmRecording(recording_xpm);
+
+cSkinLCARSDisplayChannel::cSkinLCARSDisplayChannel(bool WithInfo)
+{
+  tallFont = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize * 1.8);
+  initial = true;
+  present = NULL;
+  lastSeen = -1;
+  lastDeviceNumber = -1;
+  lastCamSlot = NULL;
+  lastSignalStrength = -1;
+  lastSignalQuality = -1;
+  lastSignalDisplay = 0;
+  memset(&lastTrackId, 0, sizeof(lastTrackId));
+  const cFont *font = cFont::GetFont(fontOsd);
+  withInfo = WithInfo;
+  lineHeight = font->Height();
+  tinyFont = CreateTinyFont(lineHeight);
+  frameColor = Theme.Color(clrChannelFrameBg);
+  message = false;
+  int d = 5 * lineHeight;
+  xc00 = 0;
+  xc01 = xc00 + d / 2;
+  xc02 = xc00 + d;
+  xc03 = xc02 + lineHeight;
+  xc04 = xc02 + d / 4;
+  xc05 = xc02 + d;
+  xc06 = xc05 + Gap;
+  xc15 = cOsd::OsdWidth();
+  xc14 = xc15 - lineHeight;
+  xc13 = xc14 - Gap;
+  xc07 = (xc15 + xc00) / 2;
+  xc08 = xc07 + Gap;
+  xc09 = xc08 + lineHeight;
+  xc10 = xc09 + Gap;
+  xc11 = (xc10 + xc13 + Gap) / 2;
+  xc12 = xc11 + Gap;
+
+  yc00 = 0;
+  yc01 = yc00 + lineHeight;
+  yc02 = yc01 + lineHeight;
+  yc03 = yc02 + Gap;
+  yc04 = yc03 + 2 * lineHeight;
+  yc05 = yc04 + Gap;
+  yc06 = yc05 + 2 * lineHeight;
+
+  yc07 = yc06 + Gap;
+  yc12 = yc07 + 3 * lineHeight + Gap / 2;
+  yc11 = yc12 - lineHeight;
+  yc10 = yc11 - lineHeight;
+  yc09 = yc11 - d / 4;
+  yc08 = yc12 - d / 2;
+
+  xs = 0;
+
+  int y1 = withInfo ? yc12 : yc02;
+  int y0 = cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y1);
+  osd = CreateOsd(cOsd::OsdLeft(), y0, xc00, yc00, xc15 - 1, y1 - 1);
+  osd->DrawRectangle(xc00, yc00, xc15 - 1, y1 - 1, Theme.Color(clrBackground));
+  // Rectangles:
+  osd->DrawRectangle(xc00, yc00, xc02 - 1, yc02 - 1, frameColor);
+  if (withInfo) {
+     osd->DrawRectangle(xc00, yc03, xc02 - 1, yc04 - 1, frameColor);
+     osd->DrawRectangle(xc00, yc05, xc02 - 1, yc06 - 1, frameColor);
+     // Elbow:
+     osd->DrawRectangle(xc00, yc07, xc01 - 1, yc08 - 1, frameColor);
+     osd->DrawRectangle(xc00, yc08, xc01 - 1, yc12 - 1, clrTransparent);
+     osd->DrawEllipse  (xc00, yc08, xc01 - 1, yc12 - 1, frameColor, 3);
+     osd->DrawRectangle(xc01, yc07, xc02 - 1, yc12 - 1, frameColor);
+     osd->DrawEllipse  (xc02, yc09, xc04 - 1, yc11 - 1, frameColor, -3);
+     osd->DrawRectangle(xc02, yc11, xc05 - 1, yc12 - 1, frameColor);
+     // Status area:
+     osd->DrawRectangle(xc06, yc11 + lineHeight / 2, xc07 - 1, yc12 - 1, frameColor);
+     osd->DrawRectangle(xc08, yc11, xc09 - 1, yc12 - 1, frameColor);
+     osd->DrawRectangle(xc10, yc11, xc11 - 1, yc12 - 1, Theme.Color(clrDeviceBg));
+     osd->DrawRectangle(xc12, yc11, xc13 - 1, yc12 - 1, Theme.Color(clrDateBg));
+     osd->DrawRectangle(xc14, yc11, xc14 + lineHeight / 2 - 1, yc12 - 1, frameColor);
+     osd->DrawRectangle(xc14 + lineHeight / 2, yc11 + lineHeight / 2, xc15 - 1, yc12 - 1, clrTransparent);
+     osd->DrawEllipse  (xc14 + lineHeight / 2, yc11, xc15 - 1, yc12 - 1, frameColor, 5);
+     }
+  // Icons:
+  osd->DrawRectangle(xc14, yc00, xc14 + lineHeight / 2 - 1, yc01 - 1, frameColor);
+  osd->DrawRectangle(xc14 + lineHeight / 2, yc00, xc15 - 1, yc00 + lineHeight / 2 - 1, clrTransparent);
+  osd->DrawEllipse  (xc14 + lineHeight / 2, yc00, xc15 - 1, yc01 - 1, frameColor, 5);
+}
+
+cSkinLCARSDisplayChannel::~cSkinLCARSDisplayChannel()
+{
+  delete tallFont;
+  delete tinyFont;
+  delete osd;
+}
+
+void cSkinLCARSDisplayChannel::DrawDate(void)
+{
+  cString s = DayDateTime();
+  if (initial || strcmp(s, lastDate)) {
+     osd->DrawText(xc12, yc11, s, Theme.Color(clrDateFg), Theme.Color(clrDateBg), cFont::GetFont(fontOsd), xc13 - xc12, lineHeight, taRight | taBorder);
+     lastDate = s;
+     }
+}
+
+void cSkinLCARSDisplayChannel::DrawTrack(void)
+{
+  cDevice *Device = cDevice::PrimaryDevice();
+  const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
+  if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
+     osd->DrawText(xc03, yc07, Track ? Track->description : "", Theme.Color(clrTrackName), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xc07 - xc03);
+     strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
+     }
+}
+
+void cSkinLCARSDisplayChannel::DrawSeen(int Current, int Total)
+{
+  int Seen = min(xc07 - xc06, int((xc07 - xc06) * double(Current) / Total));
+  if (initial || Seen != lastSeen) {
+     int y0 = yc11 - ShowSeenExtent;
+     int y1 = yc11 + lineHeight / 2 - Gap / 2;
+     osd->DrawRectangle(xc06, y0, xc06 + Seen - 1, y1 - 1, Theme.Color(clrSeen));
+     osd->DrawRectangle(xc06 + Seen, y0, xc07 - 1, y1 - 1, Theme.Color(clrBackground));
+     lastSeen = Seen;
+     }
+}
+
+void cSkinLCARSDisplayChannel::DrawDevice(void)
+{
+  const cDevice *Device = cDevice::ActualDevice();
+  if (DrawDeviceData(osd, Device, xc10, yc11, xc11, yc12, xs, tinyFont, lastDeviceType, lastCamSlot, Device->DeviceNumber() != lastDeviceNumber)) {
+     lastDeviceNumber = Device->DeviceNumber();
+     // Make sure signal meters are redrawn:
+     lastSignalStrength = -1;
+     lastSignalQuality = -1;
+     lastSignalDisplay = 0;
+     }
+}
+
+void cSkinLCARSDisplayChannel::DrawSignal(void)
+{
+  time_t Now = time(NULL);
+  if (Now != lastSignalDisplay) {
+     DrawDeviceSignal(osd, cDevice::ActualDevice(), xs + lineHeight / 2, yc11, xc11, yc12, lastSignalStrength, lastSignalQuality, initial);
+     lastSignalDisplay = Now;
+     }
+}
+
+void cSkinLCARSDisplayChannel::SetChannel(const cChannel *Channel, int Number)
+{
+  int x = xc13;
+  int xi = x - SymbolSpacing -
+           bmRecording.Width() - SymbolSpacing -
+           bmEncrypted.Width() - SymbolSpacing -
+           bmDolbyDigital.Width() - SymbolSpacing -
+           bmAudio.Width() - SymbolSpacing -
+           max(bmTeletext.Width(), bmRadio.Width()) - SymbolSpacing;
+  osd->DrawRectangle(xi, yc00, xc13 - 1, yc01 - 1, frameColor);
+  if (Channel && !Channel->GroupSep()) {
+     bool rec = cRecordControls::Active();
+     x -= bmRecording.Width() + SymbolSpacing;
+     osd->DrawBitmap(x, yc00 + (yc01 - yc00 - bmRecording.Height()) / 2, bmRecording, Theme.Color(rec ? clrChannelSymbolRecFg : clrChannelSymbolOff), rec ? Theme.Color(clrChannelSymbolRecBg) : frameColor);
+     x -= bmEncrypted.Width() + SymbolSpacing;
+     osd->DrawBitmap(x, yc00 + (yc01 - yc00 - bmEncrypted.Height()) / 2, bmEncrypted, Theme.Color(Channel->Ca() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     x -= bmDolbyDigital.Width() + SymbolSpacing;
+     osd->DrawBitmap(x, yc00 + (yc01 - yc00 - bmDolbyDigital.Height()) / 2, bmDolbyDigital, Theme.Color(Channel->Dpid(0) ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     x -= bmAudio.Width() + SymbolSpacing;
+     osd->DrawBitmap(x, yc00 + (yc01 - yc00 - bmAudio.Height()) / 2, bmAudio, Theme.Color(Channel->Apid(1) ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+     if (Channel->Vpid()) {
+        x -= bmTeletext.Width() + SymbolSpacing;
+        osd->DrawBitmap(x, yc00 + (yc01 - yc00 - bmTeletext.Height()) / 2, bmTeletext, Theme.Color(Channel->Tpid() ? clrChannelSymbolOn : clrChannelSymbolOff), frameColor);
+        }
+     else if (Channel->Apid(0)) {
+        x -= bmRadio.Width() + SymbolSpacing;
+        osd->DrawBitmap(x, yc00 + (yc01 - yc00 - bmRadio.Height()) / 2, bmRadio, Theme.Color(clrChannelSymbolOn), frameColor);
+        }
+     }
+  cString ChNumber("");
+  cString ChName("");
+  if (Channel) {
+     ChName = Channel->Name();
+     if (!Channel->GroupSep())
+        ChNumber = cString::sprintf("%d%s", Channel->Number(), Number ? "-" : "");
+     }
+  else if (Number)
+     ChNumber = cString::sprintf("%d-", Number);
+  else
+     ChName = ChannelString(NULL, NULL);
+  osd->DrawText(xc00, yc00, ChNumber, Theme.Color(clrChannelFrameFg), frameColor, tallFont, xc02 - xc00, yc02 - yc00, taTop | taRight | taBorder);
+  osd->DrawText(xc03, yc00, ChName, Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xi - xc03 - lineHeight, 0, taTop | taLeft);
+  lastSignalDisplay = 0;
+  if (withInfo)
+     DrawDevice();
+}
+
+void cSkinLCARSDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
+{
+  if (!withInfo)
+     return;
+  if (present != Present)
+     lastSeen = -1;
+  present = Present;
+  for (int i = 0; i < 2; i++) {
+      const cEvent *e = !i ? Present : Following;
+      int y = !i ? yc03 : yc05;
+      if (e) {
+         osd->DrawText(xc00, y, e->GetTimeString(), Theme.Color(clrChannelFrameFg), frameColor, cFont::GetFont(fontOsd), xc02 - xc00, 0, taRight | taBorder);
+         osd->DrawText(xc03, y, e->Title(), Theme.Color(clrEventTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xc13 - xc03);
+         osd->DrawText(xc03, y + lineHeight, e->ShortText(), Theme.Color(clrEventShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), xc13 - xc03);
+         }
+      else {
+         osd->DrawRectangle(xc00, y, xc02 - 1, y + lineHeight, frameColor);
+         osd->DrawRectangle(xc02, y, xc13 - 1, y + 2 * lineHeight, Theme.Color(clrBackground));
+         }
+      }
+}
+
+void cSkinLCARSDisplayChannel::SetMessage(eMessageType Type, const char *Text)
+{
+  if (Text) {
+     int y0 = yc11 - ShowSeenExtent;
+     int y1 = yc11;
+     osd->SaveRegion(xc06, y0, xc13 - 1, yc12 - 1);
+     osd->DrawRectangle(xc06, y0, xc07, y1 - 1, Theme.Color(clrBackground)); // clears the "seen" bar
+     osd->DrawText(xc06, yc11, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), xc13 - xc06, yc12 - yc11, taCenter);
+     }
+  else
+     osd->RestoreRegion();
+}
+
+void cSkinLCARSDisplayChannel::Flush(void)
+{
+  if (withInfo) {
+     if (!message) {
+        DrawDate();
+        DrawTrack();
+        DrawDevice();
+        DrawSignal();
+        }
+     int Current = 0;
+     int Total = 0;
+     if (present) {
+        time_t t = time(NULL);
+        if (t > present->StartTime())
+           Current = t - present->StartTime();
+        Total = present->Duration();
+        }
+     DrawSeen(Current, Total);
+     }
+  osd->Flush();
+  initial = false;
+}
+
+// --- cSkinLCARSDisplayMenu -------------------------------------------------
+
+class cSkinLCARSDisplayMenu : public cSkinDisplayMenu {
+private:
+  cOsd *osd;
+  int xa00, xa01, xa02, xa03, xa04, xa05, xa06, xa07, xa08, xa09;
+  int yt00, yt01, yt02, yt03, yt04, yt05, yt06;
+  int yc00, yc01, yc02, yc03, yc04, yc05, yc06, yc07, yc08, yc09, yc10, yc11;
+  int yb00, yb01, yb02, yb03, yb04, yb05, yb06, yb07, yb08, yb09, yb10, yb11, yb12, yb13, yb14, yb15;
+  int xm00, xm01, xm02, xm03, xm04, xm05, xm06, xm07, xm08;
+  int ym00, ym01, ym02, ym03, ym04, ym05, ym06, ym07;
+  int xs00, xs01, xs02, xs03, xs04, xs05, xs06, xs07, xs08, xs09, xs10, xs11, xs12, xs13;
+  int ys00, ys01, ys02, ys03, ys04, ys05;
+  int xi00, xi01, xi02, xi03;
+  int yi00, yi01;
+  int xb00, xb01, xb02, xb03, xb04, xb05, xb06, xb07, xb08, xb09, xb10, xb11, xb12, xb13, xb14, xb15;
+  int xd00, xd01, xd02, xd03, xd04, xd05, xd06, xd07;
+  int yd00, yd01, yd02, yd03, yd04, yd05;
+  int xs; // starting column for signal display
+  int lineHeight;
+  cFont *tinyFont;
+  cFont *tallFont;
+  tColor frameColor;
+  int currentIndex;
+  cVector<int> deviceOffset;
+  cVector<bool> deviceRecording;
+  cString lastDeviceType[MAXDEVICES];
+  cVector<cCamSlot *> lastCamSlot;
+  cVector<int> lastSignalStrength;
+  cVector<int> lastSignalQuality;
+  bool initial;
+  enum eCurrentMode { cmUnknown, cmLive, cmPlay };
+  eCurrentMode lastMode;
+  cString lastDate;
+  int lastDiskUsageState;
+  bool lastDiskAlert;
+  double lastSystemLoad;
+  int lastTimersState;
+  time_t lastSignalDisplay;
+  int lastLiveIndicatorY;
+  bool lastLiveIndicatorTransferring;
+  const cChannel *lastChannel;
+  const cEvent *lastEvent;
+  const cRecording *lastRecording;
+  cString lastHeader;
+  int lastSeen;
+  static cBitmap bmArrowUp, bmArrowDown, bmTransferMode;
+  void DrawMainFrameUpper(tColor Color);
+  void DrawMainFrameLower(void);
+  void DrawMainButton(const char *Text, int x0, int x1, int x2, int x3, int y0, int y1, tColor ColorFg, tColor ColorBg, const cFont *Font);
+  void DrawMenuFrame(void);
+  void DrawMainBracket(void);
+  void DrawStatusElbows(void);
+  void DrawDate(void);
+  void DrawDisk(void);
+  void DrawLoad(void);
+  void DrawFrameDisplay(void);
+  void DrawScrollbar(int Total, int Offset, int Shown, bool CanScrollUp, bool CanScrollDown);
+  void DrawTimer(const cTimer *Timer, int y, bool MultiRec);
+  void DrawTimers(void);
+  void DrawDevice(const cDevice *Device);
+  void DrawDevices(void);
+  void DrawLiveIndicator(void);
+  void DrawSignals(void);
+  void DrawLive(const cChannel *Channel);
+  void DrawPlay(cControl *Control);
+  void DrawInfo(const cEvent *Event, bool WithTime);
+  void DrawSeen(int Current, int Total);
+  void DrawTextScrollbar(void);
+public:
+  cSkinLCARSDisplayMenu(void);
+  virtual ~cSkinLCARSDisplayMenu();
+  virtual void Scroll(bool Up, bool Page);
+  virtual int MaxItems(void);
+  virtual void Clear(void);
+  virtual void SetMenuCategory(eMenuCategory MenuCategory);
+  virtual void SetTitle(const char *Title);
+  virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
+  virtual void SetScrollbar(int Total, int Offset);
+  virtual void SetEvent(const cEvent *Event);
+  virtual void SetRecording(const cRecording *Recording);
+  virtual void SetText(const char *Text, bool FixedFont);
+  virtual int GetTextAreaWidth(void) const;
+  virtual const cFont *GetTextAreaFont(bool FixedFont) const;
+  virtual void Flush(void);
+  };
+
+cBitmap cSkinLCARSDisplayMenu::bmArrowUp(arrowup_xpm);
+cBitmap cSkinLCARSDisplayMenu::bmArrowDown(arrowdown_xpm);
+cBitmap cSkinLCARSDisplayMenu::bmTransferMode(play_xpm);
+
+cSkinLCARSDisplayMenu::cSkinLCARSDisplayMenu(void)
+{
+  tallFont = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize * 1.8);
+  initial = true;
+  lastMode = cmUnknown;
+  lastChannel = NULL;
+  lastEvent = NULL;
+  lastRecording = NULL;
+  lastSeen = -1;
+  lastTimersState = -1;
+  lastSignalDisplay = 0;
+  lastLiveIndicatorY = -1;
+  lastLiveIndicatorTransferring = false;
+  lastDiskUsageState = -1;
+  lastDiskAlert = false;
+  lastSystemLoad = -1;
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  tinyFont = CreateTinyFont(lineHeight);
+  frameColor = Theme.Color(clrMenuFrameBg);
+  currentIndex = -1;
+  // The outer frame:
+  int d = 5 * lineHeight;
+  xa00 = 0;
+  xa01 = xa00 + d / 2;
+  xa02 = xa00 + d;
+  xa03 = xa02 + lineHeight;
+  xa04 = xa02 + d / 4;
+  xa05 = xa02 + d;
+  xa06 = xa05 + Gap;
+  xa09 = cOsd::OsdWidth();
+  xa08 = xa09 - lineHeight;
+  xa07 = xa08 - Gap;
+
+  yt00 = 0;
+  yt01 = yt00 + lineHeight;
+  yt02 = yt01 + lineHeight;
+  yt03 = yt01 + d / 4;
+  yt04 = yt02 + Gap;
+  yt05 = yt00 + d / 2;
+  yt06 = yt04 + 2 * lineHeight;
+
+  yc00 = yt06 + Gap;
+  yc05 = yc00 + 3 * lineHeight + Gap / 2;
+  yc04 = yc05 - lineHeight;
+  yc03 = yc04 - lineHeight;
+  yc02 = yc04 - d / 4;
+  yc01 = yc05 - d / 2;
+
+  yc06 = yc05 + Gap;
+  yc07 = yc06 + lineHeight;
+  yc08 = yc07 + lineHeight;
+  yc09 = yc07 + d / 4;
+  yc10 = yc06 + d / 2;
+  yc11 = yc06 + 3 * lineHeight + Gap / 2;
+
+  yb00 = yc11 + Gap;
+  yb01 = yb00 + 2 * lineHeight;
+  yb02 = yb01 + Gap;
+  yb03 = yb02 + 2 * lineHeight;
+  yb04 = yb03 + Gap;
+  yb05 = yb04 + 2 * lineHeight;
+  yb06 = yb05 + Gap;
+  yb07 = yb06 + 2 * lineHeight;
+  yb08 = yb07 + Gap;
+
+  yb15 = cOsd::OsdHeight();
+  yb14 = yb15 - lineHeight;
+  yb13 = yb14 - lineHeight;
+  yb12 = yb14 - d / 4;
+  yb11 = yb15 - d / 2;
+  yb10 = yb13 - Gap - 2 * lineHeight;
+  yb09 = yb10 - Gap;
+
+  // Compensate for large font size:
+  if (yb09 - yb08 < 2 * lineHeight) {
+     yb08 = yb06;
+     yb06 = 0; // drop empty rectangle
+     }
+  if (yb09 - yb08 < 2 * lineHeight) {
+     yb05 = yb09;
+     yb08 = 0; // drop "LCARS" display
+     }
+  if (yb05 - yb04 < 2 * lineHeight) {
+     yb03 = yb09;
+     yb04 = 0; // drop "LOAD" display
+     }
+  if (yb03 - yb02 < 2 * lineHeight) {
+     yb01 = yb09;
+     yb02 = 0; // drop "DISK" display
+     }
+  // Anything else is just insanely large...
+
+  // The main command menu:
+  xm00 = xa03;
+  xm01 = xa05;
+  xm02 = xa06;
+  xm08 = (xa09 + xa00) / 2;
+  xm07 = xm08 - lineHeight;
+  xm06 = xm07 - lineHeight / 2;
+  xm05 = xm06 - lineHeight / 2;
+  xm04 = xm05 - lineHeight;
+  xm03 = xm04 - Gap;
+  ym00 = yc08;
+  ym01 = ym00 + lineHeight / 2;
+  ym02 = ym01 + lineHeight / 2;
+  ym03 = ym02 + Gap;
+  ym07 = yb15;
+  ym06 = ym07 - lineHeight / 2;
+  ym05 = ym06 - lineHeight / 2;
+  ym04 = ym05 - Gap;
+
+  // The status area:
+  xs00 = xm08 + Gap + lineHeight + Gap;
+  xs13 = xa09;
+  xs12 = xa08;
+  xs11 = xa07;
+  xs05 = (xs00 + xs11 + Gap) / 2;
+  xs04 = xs05 - lineHeight / 2;
+  xs03 = xs04 - lineHeight / 2;
+  xs02 = xs03 - 2 * lineHeight;
+  xs01 = xs02 - Gap;
+  xs06 = xs05 + Gap;
+  xs07 = xs06 + lineHeight / 2;
+  xs08 = xs07 + lineHeight / 2;
+  xs09 = xs08 + 2 * lineHeight;
+  xs10 = xs09 + Gap;
+  ys00 = yc06;
+  ys01 = ys00 + lineHeight;
+  ys02 = ys01 + lineHeight / 2;
+  ys04 = ys01 + lineHeight;
+  ys03 = ys04 - Gap;
+  ys05 = yb15;
+
+  // The color buttons in submenus:
+  xb00 = xa06;
+  xb15 = xa07;
+  int w = (xa08 - xa06) / 4;
+  xb01 = xb00 + lineHeight / 2;
+  xb02 = xb01 + Gap;
+  xb04 = xb00 + w;
+  xb03 = xb04 - Gap;
+  xb05 = xb04 + lineHeight / 2;
+  xb06 = xb05 + Gap;
+  xb08 = xb04 + w;
+  xb07 = xb08 - Gap;
+  xb09 = xb08 + lineHeight / 2;
+  xb10 = xb09 + Gap;
+  xb12 = xb08 + w;
+  xb11 = xb12 - Gap;
+  xb13 = xb12 + lineHeight / 2;
+  xb14 = xb13 + Gap;;
+
+  // The color buttons in the main menu:
+  int r = lineHeight;
+  xd07 = xa09;
+  xd06 = xd07 - r;
+  xd05 = xd06 - 4 * r;
+  xd04 = xd05 - r;
+  xd03 = xd04 - Gap;
+  xd02 = xd03 - r;
+  xd01 = xd02 - 4 * r;
+  xd00 = xd01 - r;
+  yd00 = yt00;
+  yd05 = yc04 - Gap;
+  yd04 = yd05 - 2 * r;
+  yd03 = yd04 - Gap;
+  yd02 = yd03 - 2 * r;
+  yd01 = yd02 - Gap;
+
+  xs = 0;
+
+  osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop(), xa00, yt00, xa09 - 1, yb15 - 1);
+}
+
+cSkinLCARSDisplayMenu::~cSkinLCARSDisplayMenu()
+{
+  delete tallFont;
+  delete tinyFont;
+  delete osd;
+}
+
+void cSkinLCARSDisplayMenu::SetMenuCategory(eMenuCategory MenuCategory)
+{
+  if (initial || MenuCategory != cSkinDisplayMenu::MenuCategory()) {
+     cSkinDisplayMenu::SetMenuCategory(MenuCategory);
+     initial = true;
+     osd->DrawRectangle(xa00, yt00, xa09 - 1, yb15 - 1, Theme.Color(clrBackground));
+     if (MenuCategory == mcMain) {
+        yi00 = ym03;
+        yi01 = ym04;
+        xi00 = xm00;
+        xi01 = xm03;
+        xi02 = xm04;
+        xi03 = xm05;
+        lastTimersState = -1;
+        DrawMainFrameLower();
+        DrawMainBracket();
+        DrawStatusElbows();
+        }
+     else {
+        yi00 = yt02;
+        yi01 = yb13;
+        xi00 = xa03;
+        xi01 = xa07;
+        xi02 = xa08;
+        xi03 = xa09;
+        DrawMenuFrame();
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawMainFrameUpper(tColor Color)
+{
+  // Top left rectangles:
+  osd->DrawRectangle(xa00, yt00, xa02 - 1, yt02 - 1, Color);
+  osd->DrawRectangle(xa00, yt04, xa02 - 1, yt06 - 1, Color);
+  // Upper elbow:
+  osd->DrawRectangle(xa00, yc00, xa01 - 1, yc01 - 1, Color);
+  osd->DrawEllipse  (xa00, yc01, xa01 - 1, yc05 - 1, Color, 3);
+  osd->DrawRectangle(xa01, yc00, xa02 - 1, yc05 - 1, Color);
+  osd->DrawEllipse  (xa02, yc02, xa04 - 1, yc04 - 1, Color, -3);
+  osd->DrawRectangle(xa02, yc04, xa05 - 1, yc05 - 1, Color);
+  // Upper delimiter:
+  osd->DrawRectangle(xa06, yc04 + lineHeight / 2, xm08 - 1, yc05 - 1, Color);
+  osd->DrawRectangle(xm08 + Gap, yc04, xs00 - Gap - 1, yc05 - 1, Color);
+  osd->DrawRectangle(xs00, yc04, xs05 - 1, yc05 - 1, Color);
+  osd->DrawRectangle(xs06, yc04, xa07 - 1, yc05 - 1, Color);
+  osd->DrawRectangle(xa08, yc04, xa09 - 1, yc05 - 1, Color);
+}
+
+void cSkinLCARSDisplayMenu::DrawMainFrameLower(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  // Lower elbow:
+  osd->DrawRectangle(xa00, yc10, xa01 - 1, yc11 - 1, frameColor);
+  osd->DrawEllipse  (xa00, yc06, xa01 - 1, yc10 - 1, frameColor, 2);
+  osd->DrawRectangle(xa01, yc06, xa02 - 1, yc11 - 1, frameColor);
+  osd->DrawEllipse  (xa02, yc07, xa04 - 1, yc09 - 1, frameColor, -2);
+  osd->DrawRectangle(xa02, yc06, xa05 - 1, yc07 - 1, frameColor);
+  // Lower delimiter:
+  osd->DrawRectangle(xa06, yc06, xm08 - 1, yc07 - lineHeight / 2 - 1, frameColor);
+  osd->DrawRectangle(xm08 + Gap, yc06, xs00 - Gap - 1, yc07 - 1, frameColor);
+  osd->DrawRectangle(xa08, yc06, xa09 - 1, yc07 - 1, frameColor);
+  // VDR version:
+  osd->DrawRectangle(xa00, yb10, xa02 - 1, yb15 - 1, frameColor);
+  osd->DrawText(xa00, yb10, "VDR", Theme.Color(clrMenuFrameFg), frameColor, tallFont, xa02 - xa00, yb11 - yb10, taTop | taRight | taBorder);
+  osd->DrawText(xa00, yb15 - lineHeight, VDRVERSION, Theme.Color(clrMenuFrameFg), frameColor, font, xa02 - xa00, lineHeight, taBottom | taRight | taBorder);
+}
+
+void cSkinLCARSDisplayMenu::DrawMainButton(const char *Text, int x0, int x1, int x2, int x3, int y0, int y1, tColor ColorFg, tColor ColorBg, const cFont *Font)
+{
+  int h = y1 - y0;
+  osd->DrawEllipse(x0, y0, x1 - 1, y1 - 1, ColorBg, 7);
+  osd->DrawText(x1 + Gap, y0, Text, ColorFg, ColorBg, Font, x2 - x1 - Gap, h, taBottom | taRight);
+  osd->DrawEllipse(x2, y0, x3 - 1, y1 - 1, ColorBg, 5);
+}
+
+void cSkinLCARSDisplayMenu::DrawMenuFrame(void)
+{
+  // Upper elbow:
+  osd->DrawRectangle(xa00, yt05, xa01 - 1, yt06 - 1, frameColor);
+  osd->DrawRectangle(xa00, yt00, xa01 - 1, yt05 - 1, clrTransparent);
+  osd->DrawEllipse  (xa00, yt00, xa01 - 1, yt05 - 1, frameColor, 2);
+  osd->DrawRectangle(xa01, yt00, xa02 - 1, yt06 - 1, frameColor);
+  osd->DrawEllipse  (xa02, yt01, xa04 - 1, yt03 - 1, frameColor, -2);
+  osd->DrawRectangle(xa02, yt00, xa05 - 1, yt01 - 1, frameColor);
+  osd->DrawRectangle(xa06, yt00, xa07 - 1, yt01 - 1, frameColor);
+  osd->DrawRectangle(xa08, yt00, xa08 + lineHeight / 2 - 1, yt01 - 1, frameColor);
+  osd->DrawRectangle(xa08 + lineHeight / 2, yt00, xa09 - 1, yt00 + lineHeight / 2 - 1, clrTransparent);
+  osd->DrawEllipse  (xa08 + lineHeight / 2, yt00, xa09 - 1, yt01 - 1, frameColor, 5);
+  // Center part:
+  osd->DrawRectangle(xa00, yc00, xa02 - 1, yc11 - 1, frameColor);
+  // Lower elbow:
+  osd->DrawRectangle(xa00, yb10, xa02 - 1, yb11 - 1, frameColor);
+  osd->DrawRectangle(xa00, yb11, xa01 - 1, yb15 - 1, clrTransparent);
+  osd->DrawEllipse  (xa00, yb11, xa01 - 1, yb15 - 1, frameColor, 3);
+  osd->DrawRectangle(xa01, yb11, xa02 - 1, yb15 - 1, frameColor);
+  osd->DrawEllipse  (xa02, yb12, xa04 - 1, yb14 - 1, frameColor, -3);
+  osd->DrawRectangle(xa02, yb14, xa05 - 1, yb15 - 1, frameColor);
+  osd->DrawRectangle(xa08, yb14, xa08 + lineHeight / 2 - 1, yb15 - 1, frameColor);
+  osd->DrawRectangle(xa08 + lineHeight / 2, yb14 + lineHeight / 2, xa09 - 1, yb15 - 1, clrTransparent);
+  osd->DrawEllipse  (xa08 + lineHeight / 2, yb14, xa09 - 1, yb15 - 1, frameColor, 5);
+  osd->DrawText(xa00, yb10, "VDR", Theme.Color(clrMenuFrameFg), frameColor, tallFont, xa02 - xa00, yb11 - yb10, taTop | taRight | taBorder);
+  // Color buttons:
+  osd->DrawRectangle(xb00, yb14, xb01 - 1, yb15 - 1, Theme.Color(clrButtonRedBg));
+  osd->DrawRectangle(xb04, yb14, xb05 - 1, yb15 - 1, Theme.Color(clrButtonGreenBg));
+  osd->DrawRectangle(xb08, yb14, xb09 - 1, yb15 - 1, Theme.Color(clrButtonYellowBg));
+  osd->DrawRectangle(xb12, yb14, xb13 - 1, yb15 - 1, Theme.Color(clrButtonBlueBg));
+}
+
+void cSkinLCARSDisplayMenu::DrawDate(void)
+{
+  cString s = DayDateTime();
+  if (initial || strcmp(s, lastDate)) {
+     const cFont *font = cFont::GetFont(fontOsd);
+     tColor ColorFg = Theme.Color(clrDateFg);
+     tColor ColorBg = Theme.Color(clrDateBg);
+     lastDate = s;
+     const char *t = strrchr(s, ' ');
+     osd->DrawText(xa00, yb01 - lineHeight, t, ColorFg, ColorBg, font, xa02 - xa00, lineHeight, taBottom | taRight | taBorder);
+     s.Truncate(t - s);
+     osd->DrawText(xa00, yb00, s, ColorFg, ColorBg, font, xa02 - xa00, yb01 - yb00 - lineHeight, taTop | taRight | taBorder);
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawDisk(void)
+{
+  if (yb02) {
+     if (cVideoDiskUsage::HasChanged(lastDiskUsageState) || initial) { // must call HasChanged() first, or it shows an outdated value in the 'initial' case!
+        const cFont *font = cFont::GetFont(fontOsd);
+        int DiskUsage = cVideoDiskUsage::UsedPercent();
+        bool DiskAlert = DiskUsage > DISKUSAGEALERTLIMIT;
+        tColor ColorFg = DiskAlert ? Theme.Color(clrAlertFg) : Theme.Color(clrMenuFrameFg);
+        tColor ColorBg = DiskAlert ? Theme.Color(clrAlertBg) : frameColor;
+        if (initial || DiskAlert != lastDiskAlert)
+           osd->DrawText(xa00, yb02, tr("DISK"), ColorFg, ColorBg, tinyFont, xa02 - xa00, yb03 - yb02, taTop | taLeft | taBorder);
+        osd->DrawText(xa01, yb02, itoa(DiskUsage), ColorFg, ColorBg, font, xa02 - xa01, lineHeight, taBottom | taRight | taBorder);
+        osd->DrawText(xa00, yb03 - lineHeight, cString::sprintf("%02d:%02d", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60), ColorFg, ColorBg, font, xa02 - xa00, 0, taBottom | taRight | taBorder);
+        lastDiskAlert = DiskAlert;
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawLoad(void)
+{
+  if (yb04) {
+     tColor ColorFg = Theme.Color(clrMenuFrameFg);
+     tColor ColorBg = frameColor;
+     if (initial)
+        osd->DrawText(xa00, yb04, tr("LOAD"), ColorFg, ColorBg, tinyFont, xa02 - xa00, yb05 - yb04, taTop | taLeft | taBorder);
+     double SystemLoad;
+     if (getloadavg(&SystemLoad, 1) > 0) {
+        if (initial || SystemLoad != lastSystemLoad) {
+           osd->DrawText(xa00, yb05 - lineHeight, cString::sprintf("%.1f", SystemLoad), ColorFg, ColorBg, cFont::GetFont(fontOsd), xa02 - xa00, lineHeight, taBottom | taRight | taBorder);
+           lastSystemLoad = SystemLoad;
+           }
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawMainBracket(void)
+{
+  tColor Color = Theme.Color(clrMenuMainBracket);
+  osd->DrawRectangle(xm00, ym00, xm01 - 1, ym01 - 1, Color);
+  osd->DrawRectangle(xm02, ym00, xm07 - 1, ym01 - 1, Color);
+  osd->DrawEllipse  (xm07, ym00, xm08 - 1, ym02 - 1, Color, 1);
+  osd->DrawEllipse  (xm06, ym01, xm07 - 1, ym02 - 1, Color, -1);
+  osd->DrawRectangle(xm07, ym03, xm08 - 1, ym04 - 1, Color);
+  osd->DrawEllipse  (xm06, ym05, xm07 - 1, ym06 - 1, Color, -4);
+  osd->DrawEllipse  (xm07, ym05, xm08 - 1, ym07 - 1, Color, 4);
+  osd->DrawRectangle(xm02, ym06, xm07 - 1, ym07 - 1, Color);
+  osd->DrawRectangle(xm00, ym06, xm01 - 1, ym07 - 1, Color);
+}
+
+void cSkinLCARSDisplayMenu::DrawStatusElbows(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText     (xs00, ys00, tr("TIMERS"), Theme.Color(clrMenuFrameFg), frameColor, font, xs01 - xs00, lineHeight, taBottom | taLeft | taBorder);
+  osd->DrawRectangle(xs02, ys00, xs03 - 1, ys01 - 1, frameColor);
+  osd->DrawEllipse  (xs03, ys00, xs05 - 1, ys01 - 1, frameColor, 1);
+  osd->DrawEllipse  (xs03, ys01, xs04 - 1, ys02 - 1, frameColor, -1);
+  osd->DrawRectangle(xs04, ys01, xs05 - 1, ys03 - 1, frameColor);
+  osd->DrawRectangle(xs04, ys04, xs05 - 1, ys05 - 1, frameColor);
+  osd->DrawText     (xs10, ys00, tr("DEVICES"), Theme.Color(clrMenuFrameFg), frameColor, font, xs11 - xs10, lineHeight, taBottom | taRight | taBorder);
+  osd->DrawRectangle(xs08, ys00, xs09 - 1, ys01 - 1, frameColor);
+  osd->DrawEllipse  (xs06, ys00, xs08 - 1, ys01 - 1, frameColor, 2);
+  osd->DrawEllipse  (xs07, ys01, xs08 - 1, ys02 - 1, frameColor, -2);
+  osd->DrawRectangle(xs06, ys01, xs07 - 1, ys03 - 1, frameColor);
+  osd->DrawRectangle(xs06, ys04, xs07 - 1, ys05 - 1, frameColor);
+  osd->DrawRectangle(xs12, ys00, xs13 - 1, ys01 - 1, frameColor);
+}
+
+void cSkinLCARSDisplayMenu::DrawFrameDisplay(void)
+{
+  DrawDate();
+  DrawDisk();
+  DrawLoad();
+  if (initial) {
+     if (yb06)
+        osd->DrawRectangle(xa00, yb06, xa02 - 1, yb07 - 1, frameColor);
+     if (yb08) {
+        const cFont *font = cFont::GetFont(fontOsd);
+        osd->DrawRectangle(xa00, yb08, xa02 - 1, yb09 - 1, frameColor);
+        osd->DrawText(xa00, yb09 - lineHeight, "LCARS", Theme.Color(clrMenuFrameFg), frameColor, font, xa02 - xa00, lineHeight, taBottom | taRight | taBorder);
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, bool CanScrollUp, bool CanScrollDown)
+{
+  int x0, x1, tt, tb;
+  tColor ClearColor;
+  if (MenuCategory() == mcMain) {
+     x0 = xm07;
+     x1 = xm08;
+     tt = ym03;
+     tb = ym04;
+     ClearColor = Theme.Color(clrMenuMainBracket);
+     }
+  else {
+     x0 = xa02 + Gap;
+     x1 = x0 + lineHeight / 2;
+     tt = yc00;
+     tb = yc11;
+     ClearColor = Theme.Color(clrBackground);
+     int d = TextFrame;
+     if (CanScrollUp)
+        osd->DrawBitmap(xa02 - bmArrowUp.Width() - d, yc00 + d, bmArrowUp, Theme.Color(clrMenuScrollbarArrow), frameColor);
+     else
+        osd->DrawRectangle(xa02 - bmArrowUp.Width() - d, yc00 + d, xa02 - d - 1, yc00 + d + bmArrowUp.Height() - 1, frameColor);
+     if (CanScrollDown)
+        osd->DrawBitmap(xa02 - bmArrowDown.Width() - d, yc11 - d - bmArrowDown.Height(), bmArrowDown, Theme.Color(clrMenuScrollbarArrow), frameColor);
+     else
+        osd->DrawRectangle(xa02 - bmArrowDown.Width() - d, yc11 - d - bmArrowDown.Height(), xa02 - d - 1, yc11 - d - 1, frameColor);
+     }
+  if (Total > 0 && Total > Shown) {
+     int sw = x1 - x0;
+     int sh = max(int((tb - tt) * double(Shown) / Total + 0.5), sw);
+     int st = min(int(tt + (tb - tt) * double(Offset) / Total + 0.5), tb - sh);
+     int sb = min(st + sh, tb);
+     osd->DrawRectangle(x0, tt, x1 - 1, tb - 1, Theme.Color(clrMenuScrollbarTotal));
+     osd->DrawRectangle(x0, st, x1 - 1, sb - 1, Theme.Color(clrMenuScrollbarShown));
+     }
+  else if (MenuCategory() != mcMain)
+     osd->DrawRectangle(x0, tt, x1 - 1, tb - 1, ClearColor);
+}
+
+void cSkinLCARSDisplayMenu::DrawTimer(const cTimer *Timer, int y, bool MultiRec)
+{
+  // The timer data:
+  bool Alert = !Timer->Recording() && Timer->Pending();
+  tColor ColorFg = Alert ? Theme.Color(clrAlertFg) : Theme.Color(clrTimerFg);
+  tColor ColorBg = Alert ? Theme.Color(clrAlertFg) : Theme.Color(clrTimerBg);
+  osd->DrawRectangle(xs00, y, xs03 - 1, y + lineHeight - 1, ColorBg);
+  cString Date;
+  if (Timer->Recording())
+     Date = cString::sprintf("-%s", *TimeString(Timer->StopTime()));
+  else {
+     time_t Now = time(NULL);
+     cString Today = WeekDayName(Now);
+     cString Time = TimeString(Timer->StartTime());
+     cString Day = WeekDayName(Timer->StartTime());
+     if (Timer->StartTime() > Now + 6 * SECSINDAY)
+        Date = DayDateTime(Timer->StartTime());
+     else if (strcmp(Day, Today) != 0)
+        Date = cString::sprintf("%s %s", *Day, *Time);
+     else
+        Date = Time;
+     }
+  if (Timer->Flags() & tfVps)
+     Date = cString::sprintf("VPS %s", *Date);
+  const cChannel *Channel = Timer->Channel();
+  const cEvent *Event = Timer->Event();
+  int d = max(TextFrame / 2, 1);
+  if (Channel) {
+     osd->DrawText(xs00 + d, y, Channel->Name(), ColorFg, ColorBg, tinyFont, xs03 - xs00 - d);
+     osd->DrawText(xs03 - tinyFont->Width(Date) - d, y, Date, ColorFg, ColorBg, tinyFont);
+     }
+  if (Event)
+     osd->DrawText(xs00 + d, y + lineHeight - tinyFont->Height(), Event->Title(), ColorFg, ColorBg, tinyFont, xs03 - xs00 - 2 * d);
+  // The timer recording indicator:
+  if (Timer->Recording())
+     osd->DrawRectangle(xs03 + Gap, y - (MultiRec ? Gap : 0), xs04 - Gap / 2 - 1, y + lineHeight - 1, Theme.Color(clrMenuTimerRecording));
+}
+
+void cSkinLCARSDisplayMenu::DrawTimers(void)
+{
+  if (Timers.Modified(lastTimersState)) {
+     deviceRecording.Clear();
+     const cFont *font = cFont::GetFont(fontOsd);
+     osd->DrawRectangle(xs00, ys04, xs04 - 1, ys05 - 1, Theme.Color(clrBackground));
+     osd->DrawRectangle(xs07, ys04, xs13 - 1, ys05 - 1, Theme.Color(clrBackground));
+     cSortedTimers SortedTimers;
+     cVector<int> FreeDeviceSlots;
+     int y = ys04;
+     // Timers and recording devices:
+     while (1) {
+           int NumTimers = 0;
+           const cDevice *Device = NULL;
+           for (int i = 0; i < SortedTimers.Size(); i++) {
+               if (y + lineHeight > ys05)
+                  break;
+               if (const cTimer *Timer = SortedTimers[i]) {
+                  if (Timer->Recording()) {
+                     if (cRecordControl *RecordControl = cRecordControls::GetRecordControl(Timer)) {
+                        if (!Device || Device == RecordControl->Device()) {
+                           DrawTimer(Timer, y, NumTimers > 0);
+                           NumTimers++;
+                           if (!Device) {
+                              Device = RecordControl->Device();
+                              deviceOffset[Device->DeviceNumber()] = y;
+                              deviceRecording[Device->DeviceNumber()] = true;
+                              }
+                           else
+                              FreeDeviceSlots.Append(y);
+                           y += lineHeight + Gap;
+                           }
+                        else
+                           continue;
+                        }
+                     SortedTimers[i] = NULL;
+                     }
+                  else if (!Device) {
+                     DrawTimer(Timer, y, false);
+                     FreeDeviceSlots.Append(y);
+                     y += lineHeight + Gap;
+                     SortedTimers[i] = NULL;
+                     }
+                  }
+               }
+           if (!Device)
+              break;
+           }
+     // Devices currently not recording:
+     int Slot = 0;
+     for (int i = 0; i < cDevice::NumDevices(); i++) {
+         if (const cDevice *Device = cDevice::GetDevice(i)) {
+            if (!deviceRecording[Device->DeviceNumber()]) {
+               if (Slot < FreeDeviceSlots.Size()) {
+                  y = FreeDeviceSlots[Slot];
+                  Slot++;
+                  }
+               if (y + lineHeight > ys05)
+                  break;
+               deviceOffset[Device->DeviceNumber()] = y;
+               y += lineHeight + Gap;
+               }
+            }
+         }
+     osd->DrawText(xs02, ys00, itoa(Timers.Count()), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder);
+     osd->DrawText(xs08, ys00, itoa(cDevice::NumDevices()), Theme.Color(clrMenuFrameFg), frameColor, font, xs09 - xs08, ys01 - ys00, taBottom | taRight | taBorder);
+     lastSignalDisplay = 0;
+     initial = true; // forces redrawing of devices
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawDevice(const cDevice *Device)
+{
+  int dn = Device->DeviceNumber();
+  int y = deviceOffset[dn];
+  if (y + lineHeight <= ys05) {
+     if (DrawDeviceData(osd, Device, xs08, y, xs11, y + lineHeight, xs, tinyFont, lastDeviceType[dn], lastCamSlot[dn], initial)) {
+        // Make sure signal meters are redrawn:
+        lastSignalStrength[dn] = -1;
+        lastSignalQuality[dn] = -1;
+        lastSignalDisplay = 0;
+        }
+     // The device recording indicator:
+     if (deviceRecording[dn])
+        osd->DrawRectangle(xs07 + Gap / 2, y, xs08 - Gap - 1, y + lineHeight - 1, Theme.Color(clrMenuDeviceRecording));
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawDevices(void)
+{
+  for (int i = 0; i < cDevice::NumDevices(); i++) {
+      if (const cDevice *Device = cDevice::GetDevice(i))
+         DrawDevice(Device);
+      }
+}
+
+void cSkinLCARSDisplayMenu::DrawLiveIndicator(void)
+{
+  cDevice *Device = cDevice::PrimaryDevice();
+  int y = -1;
+  bool Transferring = Device->Transferring();
+  if (!Device->Replaying() || Transferring)
+     y = deviceOffset[cDevice::ActualDevice()->DeviceNumber()];
+  if (initial || y != lastLiveIndicatorY || Transferring != lastLiveIndicatorTransferring) {
+     if (lastLiveIndicatorY >= 0)
+        osd->DrawRectangle(xs12, lastLiveIndicatorY, xs13 - 1, lastLiveIndicatorY + lineHeight - 1, Theme.Color(clrBackground));
+     if (y >= 0) {
+        osd->DrawRectangle(xs12, y, xs12 + lineHeight / 2 - 1, y + lineHeight - 1, frameColor);
+        osd->DrawEllipse  (xs12 + lineHeight / 2, y, xs13 - 1, y + lineHeight - 1, frameColor, 5);
+        if (Transferring)
+           osd->DrawBitmap((xs12 + xs13 - bmTransferMode.Width()) / 2, y + (lineHeight - bmTransferMode.Height()) / 2, bmTransferMode, Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg));
+        }
+     lastLiveIndicatorY = y;
+     lastLiveIndicatorTransferring = Transferring;
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawSignals(void)
+{
+  time_t Now = time(NULL);
+  if (initial || Now - lastSignalDisplay >= SIGNALDISPLAYDELTA) {
+     for (int i = 0; i < cDevice::NumDevices(); i++) {
+         if (const cDevice *Device = cDevice::GetDevice(i)) {
+            if (int y = deviceOffset[i])
+               DrawDeviceSignal(osd, Device, xs + lineHeight / 2, y, xs11, y + lineHeight, lastSignalStrength[i], lastSignalQuality[i], initial);
+            }
+         }
+     lastSignalDisplay = Now;
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel)
+{
+  if (lastMode != cmLive) {
+     initial = true;
+     lastMode = cmLive;
+     }
+  if (initial) {
+     DrawMainFrameUpper(Theme.Color(clrChannelFrameBg));
+     osd->DrawText(xd00, yd00, tr("LIVE"), Theme.Color(clrChannelFrameBg), Theme.Color(clrBackground), tallFont, xd07 - xd00, yd01 - yd00, taTop | taRight | taBorder);
+     }
+  if (initial || Channel != lastChannel) {
+     osd->DrawText(xa00, yt00, itoa(Channel->Number()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), tallFont, xa02 - xa00, yt02 - yt00, taTop | taRight | taBorder);
+     osd->DrawText(xa03, yt00, Channel->Name(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);
+     lastChannel = Channel;
+     }
+  // The current programme:
+  cSchedulesLock SchedulesLock;
+  if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
+     if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+        const cEvent *Event = Schedule->GetPresentEvent();
+        if (initial || Event != lastEvent) {
+           DrawInfo(Event, true);
+           lastEvent = Event;
+           lastSeen = -1;
+           }
+        int Current = 0;
+        int Total = 0;
+        if (Event) {
+           time_t t = time(NULL);
+           if (t > Event->StartTime())
+              Current = t - Event->StartTime();
+           Total = Event->Duration();
+           }
+        DrawSeen(Current, Total);
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawPlay(cControl *Control)
+{
+  if (lastMode != cmPlay) {
+     initial = true;
+     lastMode = cmPlay;
+     }
+  if (initial) {
+     DrawMainFrameUpper(Theme.Color(clrReplayFrameBg));
+     osd->DrawText(xd00, yd00, tr("PLAY"), Theme.Color(clrReplayFrameBg), Theme.Color(clrBackground), tallFont, xd07 - xd00, yd01 - yd00, taTop | taRight | taBorder);
+     }
+  // The current progress:
+  int Current = 0;
+  int Total = 0;
+  if (Control->GetIndex(Current, Total))
+     DrawSeen(Current, Total);
+  // The current programme:
+  if (const cRecording *Recording = Control->GetRecording()) {
+     if (initial || Recording != lastRecording) {
+        const cFont *font = cFont::GetFont(fontOsd);
+        if (const cRecordingInfo *Info = Recording->Info()) {
+           osd->DrawText(xa03, yt00, Info->ChannelName(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);
+           DrawInfo(Info->GetEvent(), false);
+           }
+        else
+           osd->DrawText(xa03, yt04, Recording->Name(), Theme.Color(clrEventTitle), Theme.Color(clrBackground), font, xd00 - xa03, 0, taTop | taLeft);
+        osd->DrawText(xa00, yt04, ShortDateString(Recording->Start()), Theme.Color(clrReplayFrameFg), Theme.Color(clrReplayFrameBg), font, xa02 - xa00, 0, taTop | taRight | taBorder);
+        osd->DrawText(xa00, yt06 - lineHeight, TimeString(Recording->Start()), Theme.Color(clrReplayFrameFg), Theme.Color(clrReplayFrameBg), font, xa02 - xa00, 0, taBottom | taRight | taBorder);
+        lastRecording = Recording;
+        }
+     }
+  else {
+     cString Header = Control->GetHeader();
+     if (!*lastHeader || strcmp(Header, lastHeader)) {
+        osd->DrawText(xa03, yt00, Header, Theme.Color(clrMenuText), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);
+        lastHeader = Header;
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawInfo(const cEvent *Event, bool WithTime)
+{
+  if (Event) {
+     const cFont *font = cFont::GetFont(fontOsd);
+     int y = yt04;
+     osd->DrawText(xa03, y, Event->Title(), Theme.Color(clrEventTitle), Theme.Color(clrBackground), font, xd00 - xa03 - lineHeight, lineHeight, taBottom | taLeft);
+     y += lineHeight;
+     osd->DrawText(xa03, y, Event->ShortText(), Theme.Color(clrEventShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), xd00 - xa03 - lineHeight, lineHeight, taTop | taLeft);
+     if (WithTime) {
+        osd->DrawText(xa00, yt04, Event->GetTimeString(), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), font, xa02 - xa00, lineHeight, taTop | taRight | taBorder);
+        osd->DrawText(xa00, yt06 - lineHeight, cString::sprintf("-%s", *Event->GetEndTimeString()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), font, xa02 - xa00, lineHeight, taBottom | taRight | taBorder);
+        }
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawSeen(int Current, int Total)
+{
+  int Seen = min(xm08 - xm02, int((xm08 - xm02) * double(Current) / Total));
+  if (initial || Seen != lastSeen) {
+     int y0 = yc04 - ShowSeenExtent;
+     int y1 = yc04 + lineHeight / 2 - Gap / 2;
+     osd->DrawRectangle(xm02, y0, xm02 + Seen - 1, y1 - 1, Theme.Color(clrSeen));
+     osd->DrawRectangle(xm02 + Seen, y0, xm08 - 1, y1 - 1, Theme.Color(clrBackground));
+     lastSeen = Seen;
+     }
+}
+
+void cSkinLCARSDisplayMenu::DrawTextScrollbar(void)
+{
+  if (textScroller.CanScroll())
+     DrawScrollbar(textScroller.Total(), textScroller.Offset(), textScroller.Shown(), textScroller.CanScrollUp(), textScroller.CanScrollDown());
+}
+
+void cSkinLCARSDisplayMenu::Scroll(bool Up, bool Page)
+{
+  cSkinDisplayMenu::Scroll(Up, Page);
+  DrawTextScrollbar();
+}
+
+int cSkinLCARSDisplayMenu::MaxItems(void)
+{
+  if (MenuCategory() == mcMain)
+     return (ym04 - ym03) / lineHeight;
+  else
+     return (yb13 - yt02) / lineHeight;
+}
+
+void cSkinLCARSDisplayMenu::Clear(void)
+{
+  textScroller.Reset();
+  osd->DrawRectangle(xi00, yi00, xi03 - 1, yi01 - 1, Theme.Color(clrBackground));
+}
+
+void cSkinLCARSDisplayMenu::SetTitle(const char *Title)
+{
+  if (MenuCategory() != mcMain) {
+     const cFont *font = cFont::GetFont(fontOsd);
+     int w = font->Width(Title);
+     osd->DrawRectangle(xa06, yt00, xa07 - w - Gap - 1, yt01 - 1, frameColor);
+     osd->DrawText(xa07 - w - Gap, yt00, Title, Theme.Color(clrMenuTitle), Theme.Color(clrBackground), font, w + Gap, yt01 - yt00, taRight);
+     }
+}
+
+void cSkinLCARSDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
+{
+  const cFont *font = cFont::GetFont(fontSml);
+  if (MenuCategory() == mcMain) {
+     DrawMainButton(Red,    xd00, xd01, xd02, xd03, yd02, yd03, Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font);
+     DrawMainButton(Green,  xd04, xd05, xd06, xd07, yd02, yd03, Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font);
+     DrawMainButton(Yellow, xd00, xd01, xd02, xd03, yd04, yd05, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font);
+     DrawMainButton(Blue,   xd04, xd05, xd06, xd07, yd04, yd05, Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font);
+     }
+  else {
+     int h = yb15 - yb14;
+     osd->DrawText(xb02, yb14, Red,    Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font, xb03 - xb02, h, taLeft | taBorder);
+     osd->DrawText(xb06, yb14, Green,  Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font, xb07 - xb06, h, taLeft | taBorder);
+     osd->DrawText(xb10, yb14, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, xb11 - xb10, h, taLeft | taBorder);
+     osd->DrawText(xb14, yb14, Blue,   Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font, xb15 - xb14, h, taLeft | taBorder);
+     }
+}
+
+void cSkinLCARSDisplayMenu::SetMessage(eMessageType Type, const char *Text)
+{
+  if (Text) {
+     osd->SaveRegion(xb00, yb14, xb15 - 1, yb15 - 1);
+     osd->DrawText(xb00, yb14, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), xb15 - xb00, yb15 - yb14, taCenter);
+     }
+  else
+     osd->RestoreRegion();
+}
+
+void cSkinLCARSDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable)
+{
+  int y = yi00 + Index * lineHeight;
+  tColor ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = Theme.Color(clrMenuItemCurrentFg);
+     ColorBg = Theme.Color(clrMenuItemCurrentBg);
+     osd->DrawRectangle(xi00, y, xi01 - 1, y + lineHeight - 1, ColorBg);
+     osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, y + lineHeight - 1, ColorBg);
+     osd->DrawEllipse  (xi02 + lineHeight / 2, y, xi03 - 1, y + lineHeight - 1, ColorBg, 5);
+     currentIndex = Index;
+     }
+  else {
+     ColorFg = Theme.Color(Selectable ? clrMenuItemSelectable : clrMenuItemNonSelectable);
+     ColorBg = Theme.Color(clrBackground);
+     if (currentIndex == Index)
+        osd->DrawRectangle(xi00, y, xi03 - 1, y + lineHeight - 1, Theme.Color(clrBackground));
+     }
+  const cFont *font = cFont::GetFont(fontOsd);
+  for (int i = 0; i < MaxTabs; i++) {
+      const char *s = GetTabbedText(Text, i);
+      if (s) {
+         int xt = xi00 + TextSpacing + Tab(i);
+         osd->DrawText(xt, y, s, ColorFg, ColorBg, font, xi01 - xt);
+         }
+      if (!Tab(i + 1))
+         break;
+      }
+  SetEditableWidth(xi02 - xi00 - TextSpacing - Tab(1));
+}
+
+void cSkinLCARSDisplayMenu::SetScrollbar(int Total, int Offset)
+{
+  DrawScrollbar(Total, Offset, MaxItems(), Offset > 0, Offset + MaxItems() < Total);
+}
+
+void cSkinLCARSDisplayMenu::SetEvent(const cEvent *Event)
+{
+  if (!Event)
+     return;
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xl = xi00;
+  int y = yi00;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
+  ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground));
+  if (Event->Vps() && Event->Vps() != Event->StartTime()) {
+     cString buffer = cString::sprintf(" VPS: %s ", *Event->GetVpsString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(xi01 - w, y, buffer, Theme.Color(clrMenuFrameFg), frameColor, font, w);
+     int yb = y + font->Height();
+     osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (xi02 + lineHeight / 2, y, xi03 - 1, yb - 1, frameColor, 5);
+     }
+  y += ts.Height();
+  if (Event->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Event->GetParentalRatingString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(xi01 - w, y, buffer, Theme.Color(clrMenuFrameFg), frameColor, font, w);
+     int yb = y + font->Height();
+     osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (xi02 + lineHeight / 2, y, xi03 - 1, yb - 1, frameColor, 5);
+     }
+  y += font->Height();
+  ts.Set(osd, xl, y, xi01 - xl, yi01 - y, Event->Title(), font, Theme.Color(clrEventTitle), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (!isempty(Event->ShortText())) {
+     const cFont *font = cFont::GetFont(fontSml);
+     ts.Set(osd, xl, y, xi01 - xl, yi01 - y, Event->ShortText(), font, Theme.Color(clrEventShortText), Theme.Color(clrBackground));
+     y += ts.Height();
+     }
+  y += font->Height();
+  if (!isempty(Event->Description())) {
+     int yt = y;
+     int yb = yi01;
+     textScroller.Set(osd, xl, yt, xi01 - xl, yb - yt, Event->Description(), font, Theme.Color(clrEventDescription), Theme.Color(clrBackground));
+     DrawTextScrollbar();
+     }
+}
+
+void cSkinLCARSDisplayMenu::SetRecording(const cRecording *Recording)
+{
+  if (!Recording)
+     return;
+  const cRecordingInfo *Info = Recording->Info();
+  const cFont *font = cFont::GetFont(fontOsd);
+  int xl = xi00;
+  int y = yi00;
+  cTextScroller ts;
+  char t[32];
+  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (Info->GetEvent()->ParentalRating()) {
+     cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString());
+     const cFont *font = cFont::GetFont(fontSml);
+     int w = font->Width(buffer);
+     osd->DrawText(xi01 - w, y, buffer, Theme.Color(clrMenuFrameFg), frameColor, font, w);
+     int yb = y + font->Height();
+     osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, yb - 1, frameColor);
+     osd->DrawEllipse  (xi02 + lineHeight / 2, y, xi03 - 1, yb - 1, frameColor, 5);
+     }
+  y += font->Height();
+  const char *Title = Info->Title();
+  if (isempty(Title))
+     Title = Recording->Name();
+  ts.Set(osd, xl, y, xi01 - xl, yi01 - y, Title, font, Theme.Color(clrEventTitle), Theme.Color(clrBackground));
+  y += ts.Height();
+  if (!isempty(Info->ShortText())) {
+     const cFont *font = cFont::GetFont(fontSml);
+     ts.Set(osd, xl, y, xi01 - xl, yi01 - y, Info->ShortText(), font, Theme.Color(clrEventShortText), Theme.Color(clrBackground));
+     y += ts.Height();
+     }
+  y += font->Height();
+  if (!isempty(Info->Description())) {
+     int yt = y;
+     int yb = yi01;
+     textScroller.Set(osd, xl, yt, xi01 - xl, yb - yt, Info->Description(), font, Theme.Color(clrEventDescription), Theme.Color(clrBackground));
+     DrawTextScrollbar();
+     }
+}
+
+void cSkinLCARSDisplayMenu::SetText(const char *Text, bool FixedFont)
+{
+  textScroller.Set(osd, xi00, yi00, GetTextAreaWidth(), yi01 - yi00, Text, GetTextAreaFont(FixedFont), Theme.Color(clrMenuText), Theme.Color(clrBackground));
+  DrawTextScrollbar();
+}
+
+int cSkinLCARSDisplayMenu::GetTextAreaWidth(void) const
+{
+  return xi01 - xi00;
+}
+
+const cFont *cSkinLCARSDisplayMenu::GetTextAreaFont(bool FixedFont) const
+{
+  const cFont *font = cFont::GetFont(FixedFont ? fontFix : fontOsd);
+  //XXX -> make a way to let the text define which font to use
+  return font;
+}
+
+void cSkinLCARSDisplayMenu::Flush(void)
+{
+  if (MenuCategory() == mcMain) {
+     cDevice *Device = cDevice::PrimaryDevice();
+     if (!Device->Replaying() || Device->Transferring()) {
+        const cChannel *Channel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
+        DrawLive(Channel);
+        }
+     else if (cControl *Control = cControl::Control(true))
+        DrawPlay(Control);
+     DrawTimers();
+     DrawDevices();
+     DrawLiveIndicator();
+     DrawSignals();
+     }
+  DrawFrameDisplay();
+  osd->Flush();
+  initial = false;
+}
+
+// --- cSkinLCARSDisplayReplay -----------------------------------------------
+
+class cSkinLCARSDisplayReplay : public cSkinDisplayReplay {
+private:
+  cOsd *osd;
+  int xp00, xp01, xp02, xp03, xp04, xp05, xp06, xp07, xp08, xp09, xp10, xp11, xp12, xp13, xp14, xp15;
+  int yp00, yp01, yp02, yp03, yp04, yp05, yp06, yp07, yp08, yp09;
+  bool modeOnly;
+  int lineHeight;
+  tColor frameColor;
+  cString lastDate;
+  tTrackId lastTrackId;
+  void DrawDate(void);
+  void DrawTrack(void);
+public:
+  cSkinLCARSDisplayReplay(bool ModeOnly);
+  virtual ~cSkinLCARSDisplayReplay();
+  virtual void SetRecording(const cRecording *Recording);
+  virtual void SetTitle(const char *Title);
+  virtual void SetMode(bool Play, bool Forward, int Speed);
+  virtual void SetProgress(int Current, int Total);
+  virtual void SetCurrent(const char *Current);
+  virtual void SetTotal(const char *Total);
+  virtual void SetJump(const char *Jump);
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  modeOnly = ModeOnly;
+  lineHeight = font->Height();
+  frameColor = Theme.Color(clrReplayFrameBg);
+  int d = 5 * lineHeight;
+  xp00 = 0;
+  xp01 = xp00 + d / 2;
+  xp02 = xp00 + d;
+  xp03 = xp02 + lineHeight;
+  xp04 = xp02 + d / 4;
+  xp05 = xp02 + d;
+  xp06 = xp05 + Gap;
+  xp15 = cOsd::OsdWidth();
+  xp14 = xp15 - lineHeight;
+  xp13 = xp14 - Gap;
+  xp07 = (xp15 + xp00) / 2;
+  xp08 = xp07 + Gap;
+  xp09 = xp08 + lineHeight;
+  xp10 = xp09 + Gap;
+  xp11 = (xp10 + xp13 + Gap) / 2;
+  xp12 = xp11 + Gap;
+
+  yp00 = 0;
+  yp01 = yp00 + 2 * lineHeight;
+  yp02 = yp01 + Gap;
+  yp03 = yp02 + 2 * lineHeight;
+
+  yp04 = yp03 + Gap;
+  yp09 = yp04 + 3 * lineHeight + Gap / 2;
+  yp08 = yp09 - lineHeight;
+  yp07 = yp08 - lineHeight;
+  yp06 = yp08 - d / 4;
+  yp05 = yp09 - d / 2;
+
+  osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - yp09, xp00, yp00, xp15 - 1, yp09 - 1);
+  osd->DrawRectangle(xp00, yp00, xp15 - 1, yp09 - 1, modeOnly ? clrTransparent : Theme.Color(clrBackground));
+  // Rectangles:
+  if (!modeOnly)
+     osd->DrawRectangle(xp00, yp00, xp02 - 1, yp01 - 1, frameColor);
+  osd->DrawRectangle(xp00, yp02, xp02 - 1, yp03 - 1, frameColor);
+  if (!modeOnly) {
+     // Elbow:
+     osd->DrawRectangle(xp00, yp04, xp01 - 1, yp05 - 1, frameColor);
+     osd->DrawRectangle(xp00, yp05, xp01 - 1, yp09 - 1, clrTransparent);
+     osd->DrawEllipse  (xp00, yp05, xp01 - 1, yp09 - 1, frameColor, 3);
+     osd->DrawRectangle(xp01, yp04, xp02 - 1, yp09 - 1, frameColor);
+     osd->DrawEllipse  (xp02, yp06, xp04 - 1, yp08 - 1, frameColor, -3);
+     osd->DrawRectangle(xp02, yp08, xp05 - 1, yp09 - 1, frameColor);
+     // Status area:
+     osd->DrawRectangle(xp06, yp08, xp07 - 1, yp09 - 1, frameColor);
+     osd->DrawRectangle(xp08, yp08, xp09 - 1, yp09 - 1, frameColor);
+     osd->DrawRectangle(xp10, yp08, xp11 - 1, yp09 - 1, frameColor);
+     osd->DrawRectangle(xp12, yp08, xp13 - 1, yp09 - 1, Theme.Color(clrDateBg));
+     osd->DrawRectangle(xp14, yp08, xp14 + lineHeight / 2 - 1, yp09 - 1, frameColor);
+     osd->DrawRectangle(xp14 + lineHeight / 2, yp08 + lineHeight / 2, xp15 - 1, yp09 - 1, clrTransparent);
+     osd->DrawEllipse  (xp14 + lineHeight / 2, yp08, xp15 - 1, yp09 - 1, frameColor, 5);
+     }
+}
+
+cSkinLCARSDisplayReplay::~cSkinLCARSDisplayReplay()
+{
+  delete osd;
+}
+
+void cSkinLCARSDisplayReplay::DrawDate(void)
+{
+  cString s = DayDateTime();
+  if (!*lastDate || strcmp(s, lastDate)) {
+     osd->DrawText(xp12, yp08, s, Theme.Color(clrDateFg), Theme.Color(clrDateBg), cFont::GetFont(fontOsd), xp13 - xp12, lineHeight, taRight | taBorder);
+     lastDate = s;
+     }
+}
+
+void cSkinLCARSDisplayReplay::DrawTrack(void)
+{
+  cDevice *Device = cDevice::PrimaryDevice();
+  const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
+  if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
+     osd->DrawText(xp03, yp04, Track ? Track->description : "", Theme.Color(clrTrackName), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xp07 - xp03);
+     strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
+     }
+}
+
+void cSkinLCARSDisplayReplay::SetRecording(const cRecording *Recording)
+{
+  const cRecordingInfo *RecordingInfo = Recording->Info();
+  SetTitle(RecordingInfo->Title());
+  osd->DrawText(xp03, yp01 - lineHeight, RecordingInfo->ShortText(), Theme.Color(clrEventShortText), Theme.Color(clrBackground), cFont::GetFont(fontSml), xp13 - xp03);
+  osd->DrawText(xp00, yp00, ShortDateString(Recording->Start()), Theme.Color(clrReplayFrameFg), frameColor, cFont::GetFont(fontOsd), xp02 - xp00, 0, taTop | taRight | taBorder);
+  osd->DrawText(xp00, yp01 - lineHeight, TimeString(Recording->Start()), Theme.Color(clrReplayFrameFg), frameColor, cFont::GetFont(fontOsd), xp02 - xp00, 0, taBottom | taRight | taBorder);
+}
+
+void cSkinLCARSDisplayReplay::SetTitle(const char *Title)
+{
+  osd->DrawText(xp03, yp00, Title, Theme.Color(clrEventTitle), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xp13 - xp03);
+}
+
+static const char *const *ReplaySymbols[2][2][5] = {
+  { { pause_xpm, srew_xpm, srew1_xpm, srew2_xpm, srew3_xpm },
+    { pause_xpm, sfwd_xpm, sfwd1_xpm, sfwd2_xpm, sfwd3_xpm }, },
+  { { play_xpm,  frew_xpm, frew1_xpm, frew2_xpm, frew3_xpm },
+    { play_xpm,  ffwd_xpm, ffwd1_xpm, ffwd2_xpm, ffwd3_xpm } }
+  };
+
+void cSkinLCARSDisplayReplay::SetMode(bool Play, bool Forward, int Speed)
+{
+  Speed = constrain(Speed, -1, 3);
+  cBitmap bm(ReplaySymbols[Play][Forward][Speed + 1]);
+  osd->DrawBitmap(xp01 - bm.Width() / 2, (yp02 + yp03 - bm.Height()) / 2, bm, Theme.Color(clrReplayFrameFg), frameColor);
+}
+
+void cSkinLCARSDisplayReplay::SetProgress(int Current, int Total)
+{
+  cProgressBar pb(xp13 - xp03, lineHeight, Current, Total, marks, Theme.Color(clrReplayProgressSeen), Theme.Color(clrReplayProgressRest), Theme.Color(clrReplayProgressSelected), Theme.Color(clrReplayProgressMark), Theme.Color(clrReplayProgressCurrent));
+  osd->DrawBitmap(xp03, yp02, pb);
+}
+
+void cSkinLCARSDisplayReplay::SetCurrent(const char *Current)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int w = font->Width(Current) + 10;
+  osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taLeft);
+}
+
+void cSkinLCARSDisplayReplay::SetTotal(const char *Total)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int w = font->Width(Total) + 10;
+  osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taRight);
+}
+
+void cSkinLCARSDisplayReplay::SetJump(const char *Jump)
+{
+  osd->DrawText(xp06, yp08, Jump, Theme.Color(clrReplayJumpFg), Jump ? Theme.Color(clrReplayJumpBg) : frameColor, cFont::GetFont(fontOsd), xp07 - xp06, 0, taCenter);
+}
+
+void cSkinLCARSDisplayReplay::SetMessage(eMessageType Type, const char *Text)
+{
+  if (Text) {
+     osd->SaveRegion(xp06, yp08, xp13 - 1, yp09 - 1);
+     osd->DrawText(xp06, yp08, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), xp13 - xp06, 0, taCenter);
+     }
+  else
+     osd->RestoreRegion();
+}
+
+void cSkinLCARSDisplayReplay::Flush(void)
+{
+  if (!modeOnly) {
+     DrawDate();
+     DrawTrack();
+     }
+  osd->Flush();
+}
+
+// --- cSkinLCARSDisplayVolume -----------------------------------------------
+
+class cSkinLCARSDisplayVolume : public cSkinDisplayVolume {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1;
+  tColor frameColor;
+  int mute;
+public:
+  cSkinLCARSDisplayVolume(void);
+  virtual ~cSkinLCARSDisplayVolume();
+  virtual void SetVolume(int Current, int Total, bool Mute);
+  virtual void Flush(void);
+  };
+
+cSkinLCARSDisplayVolume::cSkinLCARSDisplayVolume(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  frameColor = Theme.Color(clrVolumeFrame);
+  mute = -1;
+  x0 = 0;
+  x1 = lineHeight / 2;
+  x2 = lineHeight;
+  x3 = x2 + Gap;
+  x7 = cOsd::OsdWidth();
+  x6 = x7 - lineHeight / 2;
+  x5 = x6 - lineHeight / 2;
+  x4 = x5 - Gap;
+  y0 = 0;
+  y1 = lineHeight;
+  osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1, x0, y0, x7 - 1, y1 - 1);
+  osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+  osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
+  osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+  osd->DrawRectangle(x6, y0, x7 - 1, y1 - 1, clrTransparent);
+  osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+}
+
+cSkinLCARSDisplayVolume::~cSkinLCARSDisplayVolume()
+{
+  delete osd;
+}
+
+void cSkinLCARSDisplayVolume::SetVolume(int Current, int Total, bool Mute)
+{
+  int xl = x3 + TextSpacing;
+  int xr = x4 - TextSpacing;
+  int yt = y0 + TextFrame;
+  int yb = y1 - TextFrame;
+  if (mute != Mute) {
+     osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+     mute = Mute;
+     }
+  cBitmap bm(Mute ? mute_xpm : volume_xpm);
+  osd->DrawBitmap(xl, y0 + (y1 - y0 - bm.Height()) / 2, bm, Theme.Color(clrVolumeSymbol), frameColor);
+  if (!Mute) {
+     xl += bm.Width() + TextSpacing;
+     int w = (y1 - y0) / 3;
+     int d = TextFrame;
+     int n = (xr - xl + d) / (w + d);
+     int x = xr - n * (w + d);
+     tColor Color = Theme.Color(clrVolumeBarLower);
+     for (int i = 0; i < n; i++) {
+         if (Total * i >= Current * n)
+            Color = Theme.Color(clrVolumeBarUpper);
+         osd->DrawRectangle(x, yt, x + w - 1, yb - 1, Color);
+         x += w + d;
+         }
+     }
+}
+
+void cSkinLCARSDisplayVolume::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinLCARSDisplayTracks -----------------------------------------------
+
+class cSkinLCARSDisplayTracks : public cSkinDisplayTracks {
+private:
+  cOsd *osd;
+  int xt00, xt01, xt02, xt03, xt04, xt05, xt06, xt07, xt08, xt09, xt10, xt11, xt12;
+  int yt00, yt01, yt02, yt03, yt04, yt05, yt06, yt07;
+  int lineHeight;
+  tColor frameColor;
+  int currentIndex;
+  static cBitmap bmAudioLeft, bmAudioRight, bmAudioStereo;
+  void SetItem(const char *Text, int Index, bool Current);
+public:
+  cSkinLCARSDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
+  virtual ~cSkinLCARSDisplayTracks();
+  virtual void SetTrack(int Index, const char * const *Tracks);
+  virtual void SetAudioChannel(int AudioChannel);
+  virtual void Flush(void);
+  };
+
+cBitmap cSkinLCARSDisplayTracks::bmAudioLeft(audioleft_xpm);
+cBitmap cSkinLCARSDisplayTracks::bmAudioRight(audioright_xpm);
+cBitmap cSkinLCARSDisplayTracks::bmAudioStereo(audiostereo_xpm);
+
+cSkinLCARSDisplayTracks::cSkinLCARSDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  lineHeight = font->Height();
+  frameColor = Theme.Color(clrTrackFrameBg);
+  currentIndex = -1;
+  xt00 = 0;
+  xt01 = xt00 + lineHeight / 2;
+  xt02 = xt01 + Gap;
+  xt03 = xt00 + 2 * lineHeight;
+  int ItemsWidth = font->Width(Title) + xt03 - xt02;
+  for (int i = 0; i < NumTracks; i++)
+      ItemsWidth = max(ItemsWidth, font->Width(Tracks[i]) + 2 * TextFrame);
+  xt04 = xt02 + ItemsWidth;
+  xt05 = xt04 + Gap;
+  xt06 = xt04 + lineHeight;
+  xt07 = xt05 + lineHeight;
+  xt08 = xt07 + lineHeight;
+  xt09 = xt08 + Gap;
+  xt10 = xt09 + lineHeight / 2;
+  xt11 = xt10 + Gap;
+  xt12 = xt11 + lineHeight;
+  yt00 = 0;
+  yt01 = yt00 + lineHeight;
+  yt02 = yt01 + lineHeight;
+  yt03 = yt02 + Gap;
+  yt04 = yt03 + NumTracks * lineHeight + (NumTracks - 1) * Gap;
+  yt05 = yt04 + Gap;
+  yt06 = yt05 + lineHeight;
+  yt07 = yt06 + lineHeight;
+  while (yt07 > cOsd::OsdHeight()) {
+        yt04 -= lineHeight + Gap;
+        yt05 = yt04 + Gap;
+        yt06 = yt05 + lineHeight;
+        yt07 = yt06 + lineHeight;
+        }
+  osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - yt07, xt00, yt00, xt12 - 1, yt07 - 1);
+  // The upper elbow:
+  osd->DrawRectangle(xt00, yt00, xt12 - 1, yt07 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(xt00, yt00, xt03 - 1, yt02 - 1, clrTransparent);
+  osd->DrawEllipse  (xt00, yt00, xt03 - 1, yt02 - 1, frameColor, 2);
+  osd->DrawRectangle(xt03, yt00, xt04 - 1, yt02 - 1, frameColor);
+  osd->DrawRectangle(xt04, yt00, xt08 - 1, yt01 - 1, frameColor);
+  osd->DrawEllipse  (xt04, yt01, xt06 - 1, yt02 - 1, frameColor, -2);
+  osd->DrawRectangle(xt09, yt00, xt10 - 1, yt01 - 1, frameColor);
+  osd->DrawRectangle(xt11, yt00, xt11 + lineHeight / 2 - 1, yt01 - 1, frameColor);
+  osd->DrawRectangle(xt11 + lineHeight / 2, yt00, xt12 - 1, yt00 + lineHeight / 2 - 1, clrTransparent);
+  osd->DrawEllipse  (xt11 + lineHeight / 2, yt00, xt12 - 1, yt01 - 1, frameColor, 5);
+  osd->DrawText(xt03, yt00, Title, Theme.Color(clrTrackFrameFg), frameColor, font, xt04 - xt03, 0, taTop | taRight);
+  // The items:
+  for (int i = 0; i < NumTracks; i++)
+      SetItem(Tracks[i], i, false);
+  // The lower elbow:
+  osd->DrawRectangle(xt00, yt05, xt03 - 1, yt07 - 1, clrTransparent);
+  osd->DrawEllipse  (xt00, yt05, xt03 - 1, yt07 - 1, frameColor, 3);
+  osd->DrawRectangle(xt03, yt05, xt04 - 1, yt07 - 1, frameColor);
+  osd->DrawRectangle(xt04, yt06, xt08 - 1, yt07 - 1, frameColor);
+  osd->DrawEllipse  (xt04, yt05, xt06 - 1, yt06 - 1, frameColor, -3);
+  osd->DrawRectangle(xt09, yt06, xt10 - 1, yt07 - 1, frameColor);
+  osd->DrawRectangle(xt11, yt06, xt11 + lineHeight / 2 - 1, yt07 - 1, frameColor);
+  osd->DrawRectangle(xt11 + lineHeight / 2, yt06 + lineHeight / 2, xt12 - 1, yt07 - 1, clrTransparent);
+  osd->DrawEllipse  (xt11 + lineHeight / 2, yt06, xt12 - 1, yt07 - 1, frameColor, 5);
+}
+
+cSkinLCARSDisplayTracks::~cSkinLCARSDisplayTracks()
+{
+  delete osd;
+}
+
+void cSkinLCARSDisplayTracks::SetItem(const char *Text, int Index, bool Current)
+{
+  int y0 = yt03 + Index * (lineHeight + Gap);
+  int y1 = y0 + lineHeight;
+  if (y1 > yt04)
+     return;
+  tColor ColorFg, ColorBg;
+  if (Current) {
+     ColorFg = Theme.Color(clrTrackItemCurrentFg);
+     ColorBg = Theme.Color(clrTrackItemCurrentBg);
+     osd->DrawRectangle(xt00, y0, xt01 - 1, y1 - 1, frameColor);
+     osd->DrawRectangle(xt02, y0, xt04 - 1, y1 - 1, ColorBg);
+     osd->DrawRectangle(xt05, y0, xt05 + lineHeight / 2 - 1, y1 - 1, ColorBg);
+     osd->DrawEllipse  (xt05 + lineHeight / 2, y0, xt07 - 1, y1 - 1, ColorBg, 5);
+     currentIndex = Index;
+     }
+  else {
+     ColorFg = Theme.Color(clrTrackItemFg);
+     ColorBg = Theme.Color(clrTrackItemBg);
+     osd->DrawRectangle(xt00, y0, xt01 - 1, y1 - 1, frameColor);
+     osd->DrawRectangle(xt02, y0, xt04 - 1, y1 - 1, ColorBg);
+     if (currentIndex == Index)
+        osd->DrawRectangle(xt05, y0, xt07 - 1, y1 - 1, Theme.Color(clrBackground));
+     }
+  const cFont *font = cFont::GetFont(fontOsd);
+  osd->DrawText(xt02, y0, Text, ColorFg, ColorBg, font, xt04 - xt02, y1 - y0, taTop | taLeft | taBorder);
+}
+
+void cSkinLCARSDisplayTracks::SetTrack(int Index, const char * const *Tracks)
+{
+  if (currentIndex >= 0)
+     SetItem(Tracks[currentIndex], currentIndex, false);
+  SetItem(Tracks[Index], Index, true);
+}
+
+void cSkinLCARSDisplayTracks::SetAudioChannel(int AudioChannel)
+{
+  cBitmap *bm = NULL;
+  switch (AudioChannel) {
+    case 0: bm = &bmAudioStereo; break;
+    case 1: bm = &bmAudioLeft;   break;
+    case 2: bm = &bmAudioRight;  break;
+    default: ;
+    }
+  if (bm)
+     osd->DrawBitmap(xt04 - bm->Width(), (yt06 + yt07 - bm->Height()) / 2, *bm, Theme.Color(clrTrackFrameFg), frameColor);
+  else
+     osd->DrawRectangle(xt03, yt06, xt04 - 1, yt07 - 1, frameColor);
+}
+
+void cSkinLCARSDisplayTracks::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinLCARSDisplayMessage ----------------------------------------------
+
+class cSkinLCARSDisplayMessage : public cSkinDisplayMessage {
+private:
+  cOsd *osd;
+  int x0, x1, x2, x3, x4, x5, x6, x7;
+  int y0, y1;
+public:
+  cSkinLCARSDisplayMessage(void);
+  virtual ~cSkinLCARSDisplayMessage();
+  virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void Flush(void);
+  };
+
+cSkinLCARSDisplayMessage::cSkinLCARSDisplayMessage(void)
+{
+  const cFont *font = cFont::GetFont(fontOsd);
+  int lineHeight = font->Height();
+  x0 = 0;
+  x1 = lineHeight / 2;
+  x2 = lineHeight;
+  x3 = x2 + Gap;
+  x7 = cOsd::OsdWidth();
+  x6 = x7 - lineHeight / 2;
+  x5 = x6 - lineHeight / 2;
+  x4 = x5 - Gap;
+  y0 = 0;
+  y1 = lineHeight;
+  osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1, x0, y0, x7 - 1, y1 - 1);
+}
+
+cSkinLCARSDisplayMessage::~cSkinLCARSDisplayMessage()
+{
+  delete osd;
+}
+
+void cSkinLCARSDisplayMessage::SetMessage(eMessageType Type, const char *Text)
+{
+  tColor ColorFg = Theme.Color(clrMessageStatusFg + 2 * Type);
+  tColor ColorBg = Theme.Color(clrMessageStatusBg + 2 * Type);
+  osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, Theme.Color(clrBackground));
+  osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+  osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, ColorBg, 7);
+  osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, ColorBg);
+  osd->DrawText(x3, y0, Text, ColorFg, ColorBg, cFont::GetFont(fontOsd), x4 - x3, 0, taCenter);
+  osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, ColorBg);
+  osd->DrawRectangle(x6, y0, x7 - 1, y1 - 1, clrTransparent);
+  osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, ColorBg, 5);
+}
+
+void cSkinLCARSDisplayMessage::Flush(void)
+{
+  osd->Flush();
+}
+
+// --- cSkinLCARS ------------------------------------------------------------
+
+cSkinLCARS::cSkinLCARS(void)
+:cSkin("lcars", &::Theme)
+{
+}
+
+const char *cSkinLCARS::Description(void)
+{
+  return "LCARS";
+}
+
+cSkinDisplayChannel *cSkinLCARS::DisplayChannel(bool WithInfo)
+{
+  return new cSkinLCARSDisplayChannel(WithInfo);
+}
+
+cSkinDisplayMenu *cSkinLCARS::DisplayMenu(void)
+{
+  return new cSkinLCARSDisplayMenu;
+}
+
+cSkinDisplayReplay *cSkinLCARS::DisplayReplay(bool ModeOnly)
+{
+  return new cSkinLCARSDisplayReplay(ModeOnly);
+}
+
+cSkinDisplayVolume *cSkinLCARS::DisplayVolume(void)
+{
+  return new cSkinLCARSDisplayVolume;
+}
+
+cSkinDisplayTracks *cSkinLCARS::DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
+{
+  return new cSkinLCARSDisplayTracks(Title, NumTracks, Tracks);
+}
+
+cSkinDisplayMessage *cSkinLCARS::DisplayMessage(void)
+{
+  return new cSkinLCARSDisplayMessage;
+}
diff --git a/skinlcars.h b/skinlcars.h
new file mode 100644
index 000000000..7306d12cd
--- /dev/null
+++ b/skinlcars.h
@@ -0,0 +1,27 @@
+/*
+ * skinlcars.h: A VDR skin with Star Trek's "LCARS" layout
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: skinlcars.h 1.1 2012/04/15 13:17:35 kls Exp $
+ */
+
+#ifndef __SKINLCARS_H
+#define __SKINLCARS_H
+
+#include "skins.h"
+
+class cSkinLCARS : public cSkin {
+public:
+  cSkinLCARS(void);
+  virtual const char *Description(void);
+  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
+  virtual cSkinDisplayMenu *DisplayMenu(void);
+  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
+  virtual cSkinDisplayVolume *DisplayVolume(void);
+  virtual cSkinDisplayTracks *DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
+  virtual cSkinDisplayMessage *DisplayMessage(void);
+  };
+
+#endif //__SKINLCARS_H
diff --git a/skins.c b/skins.c
index b9c55ef4f..5fb85a724 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.5 2012/03/11 14:36:11 kls Exp $
+ * $Id: skins.c 2.10 2012/06/02 11:44:14 kls Exp $
  */
 
 #include "skins.h"
@@ -67,9 +67,15 @@ cSkinDisplay::~cSkinDisplay()
 
 cSkinDisplayMenu::cSkinDisplayMenu(void)
 {
+  menuCategory = mcUndefined;
   SetTabs(0);
 }
 
+void cSkinDisplayMenu::SetMenuCategory(eMenuCategory MenuCategory)
+{
+  menuCategory = MenuCategory;
+}
+
 void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
 {
   tabs[0] = 0;
@@ -166,6 +172,11 @@ cSkinDisplayReplay::cSkinDisplayReplay(void)
   marks = NULL;
 }
 
+void cSkinDisplayReplay::SetRecording(const cRecording *Recording)
+{
+  SetTitle(Recording->Title());
+}
+
 void cSkinDisplayReplay::SetMarks(const cMarks *Marks)
 {
   marks = Marks;
diff --git a/skins.h b/skins.h
index 19bba5139..f71644897 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 2.2 2012/03/11 14:38:23 kls Exp $
+ * $Id: skins.h 2.5 2012/05/12 11:10:30 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -72,6 +72,8 @@ class cSkinDisplayChannel : public cSkinDisplay {
   */
   };
 
+enum eMenuCategory { mcUndefined = -1, mcUnknown = 0, mcMain, mcSchedule, mcChannel, mcTimer, mcRecording, mcPlugin, mcSetup, mcCommand, mcEvent, mcText, mcFolder, mcCam };
+
 class cSkinDisplayMenu : public cSkinDisplay {
        ///< This class implements the general purpose menu display, which is
        ///< used throughout the program to display information and let the
@@ -92,6 +94,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
 public:
   enum { MaxTabs = 6 };
 private:
+  eMenuCategory menuCategory;
   int tabs[MaxTabs];
 protected:
   cTextScroller textScroller;
@@ -104,6 +107,16 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< part can be found, NULL will be returned.
 public:
   cSkinDisplayMenu(void);
+  eMenuCategory MenuCategory(void) const { return menuCategory; }
+       ///< Returns the menu category, set by a previous call to SetMenuCategory().
+  virtual void SetMenuCategory(eMenuCategory MenuCategory);
+       ///< Sets the current menu category. This allows skins to handle known
+       ///< types of menus in different ways, for instance by displaying icons
+       ///< or special decorations.
+       ///< A derived class can reimplement this function to be informed of any
+       ///< changes in the menu category. If it does, it shall call the base class
+       ///< function in order to set the members accordingly for later calls to the
+       ///< MenuCategory() function.
   virtual void SetTabs(int Tab1, int Tab2 = 0, int Tab3 = 0, int Tab4 = 0, int Tab5 = 0);
        ///< Sets the tab columns to the given values, which are the number of
        ///< characters in each column.
@@ -200,6 +213,11 @@ class cSkinDisplayReplay : public cSkinDisplay {
   virtual void SetMarks(const cMarks *Marks);
        ///< Sets the editing marks to Marks, which shall be used to display the
        ///< progress bar through a cProgressBar object.
+  virtual void SetRecording(const cRecording *Recording);
+       ///< Sets the recording that is currently being played.
+       ///< The default implementation calls SetTitle() with the title and short
+       ///< text of the Recording. A derived class can use any information provided
+       ///< by the given Recording and display it.
   virtual void SetTitle(const char *Title) = 0;
        ///< Sets the title of the recording.
   virtual void SetMode(bool Play, bool Forward, int Speed) = 0;
diff --git a/skinsttng.c b/skinsttng.c
index 4c3b6a472..d98553886 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.14 2012/03/11 14:06:05 kls Exp $
+ * $Id: skinsttng.c 2.15 2012/04/23 08:39:11 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
@@ -16,6 +16,7 @@
 #include "osd.h"
 #include "menu.h"
 #include "themes.h"
+#include "videodir.h"
 
 #include "symbols/arrowdown.xpm"
 #include "symbols/arrowup.xpm"
@@ -401,8 +402,11 @@ class cSkinSTTNGDisplayMenu : public cSkinDisplayMenu {
   int lineHeight;
   tColor frameColor;
   int currentIndex;
+  cString title;
   bool message;
   cString lastDate;
+  int lastDiskUsageState;
+  void DrawTitle(void);
   void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
   void SetTextScrollbar(void);
 public:
@@ -429,6 +433,7 @@ cSkinSTTNGDisplayMenu::cSkinSTTNGDisplayMenu(void)
   const cFont *font = cFont::GetFont(fontOsd);
   lineHeight = font->Height();
   frameColor = Theme.Color(clrMenuFrame);
+  lastDiskUsageState = -1;
   currentIndex = -1;
   message = false;
   x0 = 0;
@@ -548,15 +553,22 @@ void cSkinSTTNGDisplayMenu::Clear(void)
   osd->DrawRectangle(x1, y3, x7 - 1, y4 - 1, Theme.Color(clrBackground));
 }
 
-void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
+void cSkinSTTNGDisplayMenu::DrawTitle(void)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   const char *VDR = " VDR";
+  bool WithDisk = MenuCategory() == mcMain || MenuCategory() == mcRecording;
   int w = font->Width(VDR);
-  osd->DrawText(x3 + TextSpacing, y0, Title, Theme.Color(clrMenuTitle), frameColor, font, x4 - w - x3 - TextSpacing);
+  osd->DrawText(x3 + TextSpacing, y0, WithDisk ? cString::sprintf("%s  -  %s", *title, *cVideoDiskUsage::String()) : title, Theme.Color(clrMenuTitle), frameColor, font, x4 - w - x3 - TextSpacing);
   osd->DrawText(x4 - w, y0, VDR, frameColor, clrBlack, font, w, lineHeight);
 }
 
+void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
+{
+  title = Title;
+  DrawTitle();
+}
+
 void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
   cString date = DayDateTime();
@@ -749,6 +761,8 @@ const cFont *cSkinSTTNGDisplayMenu::GetTextAreaFont(bool FixedFont) const
 
 void cSkinSTTNGDisplayMenu::Flush(void)
 {
+  if (cVideoDiskUsage::HasChanged(lastDiskUsageState))
+     DrawTitle();
   if (!message) {
      cString date = DayDateTime();
      if (!*lastDate || strcmp(date, lastDate)) {
diff --git a/svdrp.c b/svdrp.c
index 01366ddf3..f8db84761 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.16 2012/03/04 12:05:56 kls Exp $
+ * $Id: svdrp.c 2.19 2012/05/12 11:55:18 kls Exp $
  */
 
 #include "svdrp.h"
@@ -432,7 +432,7 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
      if (Code != 0) {
         va_list ap;
         va_start(ap, fmt);
-        cString buffer = cString::sprintf(fmt, ap);
+        cString buffer = cString::vsprintf(fmt, ap);
         va_end(ap);
         const char *s = buffer;
         while (s && *s) {
@@ -662,14 +662,14 @@ void cSVDRP::CmdDELR(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
+        cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
            if (!rc) {
               if (!cCutter::Active(recording->FileName())) {
                  if (recording->Delete()) {
                     Reply(250, "Recording \"%s\" deleted", Option);
-                    ::Recordings.DelByName(recording->FileName());
+                    Recordings.DelByName(recording->FileName());
                     }
                  else
                     Reply(554, "Error while deleting recording!");
@@ -681,7 +681,7 @@ void cSVDRP::CmdDELR(const char *Option)
               Reply(550, "Recording \"%s\" is in use by timer %d", Option, rc->Timer()->Index() + 1);
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", Option, Recordings.Count() ? "" : " (use LSTR before deleting)");
+           Reply(550, "Recording \"%s\" not found%s", Option, recordings.Count() ? "" : " (use LSTR before deleting)");
         }
      else
         Reply(501, "Error in recording number \"%s\"", Option);
@@ -723,7 +723,7 @@ void cSVDRP::CmdEDIT(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
+        cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            cMarks Marks;
            if (Marks.Load(recording->FileName(), recording->FramesPerSecond(), recording->IsPesRecording()) && Marks.Count()) {
@@ -740,7 +740,7 @@ void cSVDRP::CmdEDIT(const char *Option)
               Reply(554, "No editing marks defined");
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", Option, Recordings.Count() ? "" : " (use LSTR before editing)");
+           Reply(550, "Recording \"%s\" not found%s", Option, recordings.Count() ? "" : " (use LSTR before editing)");
         }
      else
         Reply(501, "Error in recording number \"%s\"", Option);
@@ -1076,10 +1076,10 @@ void cSVDRP::CmdLSTE(const char *Option)
 
 void cSVDRP::CmdLSTR(const char *Option)
 {
-  bool recordings = Recordings.Update(true);
+  recordings.Update(true);
   if (*Option) {
      if (isnumber(Option)) {
-        cRecording *recording = Recordings.Get(strtol(Option, NULL, 10) - 1);
+        cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            FILE *f = fdopen(file, "w");
            if (f) {
@@ -1097,11 +1097,11 @@ void cSVDRP::CmdLSTR(const char *Option)
      else
         Reply(501, "Error in recording number \"%s\"", Option);
      }
-  else if (recordings) {
-     cRecording *recording = Recordings.First();
+  else if (recordings.Count()) {
+     cRecording *recording = recordings.First();
      while (recording) {
-           Reply(recording == Recordings.Last() ? 250 : -250, "%d %s", recording->Index() + 1, recording->Title(' ', true));
-           recording = Recordings.Next(recording);
+           Reply(recording == recordings.Last() ? 250 : -250, "%d %s", recording->Index() + 1, recording->Title(' ', true));
+           recording = recordings.Next(recording);
            }
      }
   else
@@ -1367,11 +1367,11 @@ void cSVDRP::CmdPLAY(const char *Option)
      char c = *option;
      *option = 0;
      if (isnumber(num)) {
-        cRecording *recording = Recordings.Get(strtol(num, NULL, 10) - 1);
+        cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
         if (recording) {
            if (c)
               option = skipspace(++option);
-           cReplayControl::SetRecording(NULL, NULL);
+           cReplayControl::SetRecording(NULL);
            cControl::Shutdown();
            if (*option) {
               int pos = 0;
@@ -1383,13 +1383,13 @@ void cSVDRP::CmdPLAY(const char *Option)
               else
                  resume.Save(pos);
               }
-           cReplayControl::SetRecording(recording->FileName(), recording->Title());
+           cReplayControl::SetRecording(recording->FileName());
            cControl::Launch(new cReplayControl);
            cControl::Attach();
            Reply(250, "Playing recording \"%s\" [%s]", num, recording->Title());
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", num, Recordings.Count() ? "" : " (use LSTR before playing)");
+           Reply(550, "Recording \"%s\" not found%s", num, recordings.Count() ? "" : " (use LSTR before playing)");
         }
      else
         Reply(501, "Error in recording number \"%s\"", num);
diff --git a/svdrp.h b/svdrp.h
index 8ba096c8b..5ec9bc769 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 2.2 2012/02/16 12:37:53 kls Exp $
+ * $Id: svdrp.h 2.3 2012/04/26 10:30:06 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -43,7 +43,7 @@ class cSVDRP {
 private:
   cSocket socket;
   cFile file;
-  cRecordings Recordings;
+  cRecordings recordings;
   cPUTEhandler *PUTEhandler;
   int numChars;
   int length;
diff --git a/thread.c b/thread.c
index e6a88980e..5bcc9a549 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.3 2009/04/13 13:50:39 kls Exp $
+ * $Id: thread.c 2.4 2012/05/08 11:15:57 kls Exp $
  */
 
 #include "thread.h"
@@ -239,7 +239,7 @@ void cThread::SetDescription(const char *Description, ...)
   if (Description) {
      va_list ap;
      va_start(ap, Description);
-     description = strdup(cString::sprintf(Description, ap));
+     description = strdup(cString::vsprintf(Description, ap));
      va_end(ap);
      }
 }
diff --git a/timers.c b/timers.c
index a98801153..4634c1c25 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.8 2012/02/27 09:38:41 kls Exp $
+ * $Id: timers.c 2.9 2012/04/25 09:02:03 kls Exp $
  */
 
 #include "timers.h"
@@ -142,7 +142,7 @@ cTimer& cTimer::operator= (const cTimer &Timer)
 
 int cTimer::Compare(const cListObject &ListObject) const
 {
-  cTimer *ti = (cTimer *)&ListObject;
+  const cTimer *ti = (const cTimer *)&ListObject;
   time_t t1 = StartTime();
   time_t t2 = ti->StartTime();
   int r = t1 - t2;
@@ -820,3 +820,18 @@ void cTimers::DeleteExpired(void)
         }
   lastDeleteExpired = time(NULL);
 }
+
+// --- cSortedTimers ---------------------------------------------------------
+
+static int CompareTimers(const void *a, const void *b)
+{
+  return (*(const cTimer **)a)->Compare(**(const cTimer **)b);
+}
+
+cSortedTimers::cSortedTimers(void)
+:cVector(Timers.Count())
+{
+  for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
+      Append(Timer);
+  Sort(CompareTimers);
+}
diff --git a/timers.h b/timers.h
index aa746b17e..e2734c6de 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.3 2012/02/20 15:52:57 kls Exp $
+ * $Id: timers.h 2.4 2012/04/15 13:21:31 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -135,4 +135,9 @@ class cTimers : public cConfig<cTimer> {
 
 extern cTimers Timers;
 
+class cSortedTimers : public cVector<const cTimer *> {
+public:
+  cSortedTimers(void);
+  };
+
 #endif //__TIMERS_H
diff --git a/tools.c b/tools.c
index 3296b5403..bc01a5f0d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.22 2012/02/18 15:30:35 kls Exp $
+ * $Id: tools.c 2.24 2012/05/12 13:29:20 kls Exp $
  */
 
 #include "tools.h"
@@ -958,7 +958,7 @@ cString cString::sprintf(const char *fmt, ...)
   return cString(buffer, true);
 }
 
-cString cString::sprintf(const char *fmt, va_list &ap)
+cString cString::vsprintf(const char *fmt, va_list &ap)
 {
   char *buffer;
   if (!fmt || vasprintf(&buffer, fmt, ap) < 0) {
@@ -1042,6 +1042,15 @@ cString DateString(time_t t)
   return buf;
 }
 
+cString ShortDateString(time_t t)
+{
+  char buf[32];
+  struct tm tm_r;
+  tm *tm = localtime_r(&t, &tm_r);
+  strftime(buf, sizeof(buf), "%d.%m.%y", tm);
+  return buf;
+}
+
 cString TimeString(time_t t)
 {
   char buf[25];
diff --git a/tools.h b/tools.h
index 499814146..b73448d36 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.16 2012/02/29 10:41:00 kls Exp $
+ * $Id: tools.h 2.21 2012/05/20 13:58:06 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -177,7 +177,7 @@ class cString {
   cString &operator=(const char *String);
   cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string).
   static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-  static cString sprintf(const char *fmt, va_list &ap);
+  static cString vsprintf(const char *fmt, va_list &ap);
   };
 
 ssize_t safe_read(int filedes, void *buffer, size_t size);
@@ -228,13 +228,26 @@ void TouchFile(const char *FileName);
 time_t LastModifiedTime(const char *FileName);
 off_t FileSize(const char *FileName); ///< returns the size of the given file, or -1 in case of an error (e.g. if the file doesn't exist)
 cString WeekDayName(int WeekDay);
+    ///< Converts the given WeekDay (0=Sunday, 1=Monday, ...) to a three letter
+    ///< day name.
 cString WeekDayName(time_t t);
+    ///< Converts the week day of the given time to a three letter day name.
 cString WeekDayNameFull(int WeekDay);
+    ///< Converts the given WeekDay (0=Sunday, 1=Monday, ...) to a full
+    ///< day name.
 cString WeekDayNameFull(time_t t);
+    ///< Converts the week day of the given time to a full day name.
 cString DayDateTime(time_t t = 0);
+    ///< Converts the given time to a string of the form "www dd.mm. hh:mm".
+    ///< If no time is given, the current time is taken.
 cString TimeToString(time_t t);
+    ///< Converts the given time to a string of the form "www mmm dd hh:mm:ss yyyy".
 cString DateString(time_t t);
+    ///< Converts the given time to a string of the form "www dd.mm.yyyy".
+cString ShortDateString(time_t t);
+    ///< Converts the given time to a string of the form "dd.mm.yy".
 cString TimeString(time_t t);
+    ///< Converts the given time to a string of the form "hh:mm".
 uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality = 100);
     ///< Converts the given Memory to a JPEG image and returns a pointer
     ///< to the resulting image. Mem must point to a data block of exactly
@@ -457,6 +470,7 @@ template<class T> class cList : public cListBase {
   };
 
 template<class T> class cVector {
+  ///< cVector may only be used for *simple* types, like int or pointers - not for class objects that allocate additional memory!
 private:
   mutable int allocated;
   mutable int size;
@@ -515,7 +529,7 @@ template<class T> class cVector {
   virtual void Append(T Data)
   {
     if (size >= allocated)
-       Realloc(allocated * 4 / 2); // increase size by 50%
+       Realloc(allocated * 3 / 2); // increase size by 50%
     data[size++] = Data;
   }
   virtual void Remove(int Index)
@@ -526,6 +540,8 @@ template<class T> class cVector {
   }
   virtual void Clear(void)
   {
+    for (int i = 0; i < size; i++)
+        data[i] = T(0);
     size = 0;
   }
   void Sort(__compar_fn_t Compare)
diff --git a/vdr.c b/vdr.c
index bafd4efd2..3fcb6757d 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.35 2012/03/14 09:09:19 kls Exp $
+ * $Id: vdr.c 2.36 2012/04/26 09:23:41 kls Exp $
  */
 
 #include <getopt.h>
@@ -56,6 +56,7 @@
 #include "recording.h"
 #include "shutdown.h"
 #include "skinclassic.h"
+#include "skinlcars.h"
 #include "skinsttng.h"
 #include "sourceparams.h"
 #include "sources.h"
@@ -677,6 +678,7 @@ int main(int argc, char *argv[])
 
   // Default skins:
 
+  new cSkinLCARS;
   new cSkinSTTNG;
   new cSkinClassic;
   Skins.SetCurrent(Setup.OSDSkin);
diff --git a/videodir.c b/videodir.c
index 7331a85c1..870b4cba1 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 2.0 2008/02/16 13:00:03 kls Exp $
+ * $Id: videodir.c 2.1 2012/04/22 15:03:10 kls Exp $
  */
 
 #include "videodir.h"
@@ -241,3 +241,43 @@ bool IsOnVideoDirectoryFileSystem(const char *FileName)
      } while (Dir.Next());
   return false;
 }
+
+// --- cVideoDiskUsage -------------------------------------------------------
+
+#define DISKSPACECHEK     5 // seconds between disk space checks
+#define MB_PER_MINUTE 25.75 // this is just an estimate!
+
+int cVideoDiskUsage::state = 0;
+time_t cVideoDiskUsage::lastChecked = 0;
+int cVideoDiskUsage::usedPercent = 0;
+int cVideoDiskUsage::freeMB = 0;
+int cVideoDiskUsage::freeMinutes = 0;
+
+bool cVideoDiskUsage::HasChanged(int &State)
+{
+  if (time(NULL) - lastChecked > DISKSPACECHEK) {
+     int FreeMB;
+     int UsedPercent = VideoDiskSpace(&FreeMB);
+     if (FreeMB != freeMB) {
+        usedPercent = UsedPercent;
+        freeMB = FreeMB;
+        int MBperMinute = Recordings.MBperMinute();
+        if (MBperMinute <= 0)
+           MBperMinute = MB_PER_MINUTE;
+        freeMinutes = int(double(FreeMB) / MBperMinute);
+        state++;
+        }
+     lastChecked = time(NULL);
+     }
+  if (State != state) {
+     State = state;
+     return true;
+     }
+  return false;
+}
+
+cString cVideoDiskUsage::String(void)
+{
+  HasChanged(state);
+  return cString::sprintf("%s %d%%  -  %2d:%02d %s", tr("Disk"), usedPercent, freeMinutes / 60, freeMinutes % 60, tr("free"));
+}
diff --git a/videodir.h b/videodir.h
index 5e9aef5ab..0a0587a64 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 2.0 2008/02/16 12:53:11 kls Exp $
+ * $Id: videodir.h 2.1 2012/04/22 15:07:56 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -25,4 +25,42 @@ cString PrefixVideoFileName(const char *FileName, char Prefix);
 void RemoveEmptyVideoDirectories(void);
 bool IsOnVideoDirectoryFileSystem(const char *FileName);
 
+class cVideoDiskUsage {
+private:
+  static int state;
+  static time_t lastChecked;
+  static int usedPercent;
+  static int freeMB;
+  static int freeMinutes;
+public:
+  static bool HasChanged(int &State);
+    ///< Returns true if the usage of the video disk space has changed since the last
+    ///< call to this function with the given State variable. The caller should
+    ///< initialize State to -1, and it will be set to the current internal state
+    ///< value of the video disk usage checker upon return. Future calls with the same
+    ///< State variable can then quickly check for changes.
+  static void ForceCheck(void) { lastChecked = 0; }
+    ///< To avoid unnecessary load, the video disk usage is only actually checked
+    ///< every DISKSPACECHEK seconds. Calling ForceCheck() makes sure that the next call
+    ///< to HasChanged() will check the disk usage immediately. This is useful in case
+    ///< some files have been deleted and the result shall be displayed instantly.
+  static cString String(void);
+    ///< Returns a localized string of the form "Disk nn%  -  hh:mm free".
+    ///< This function is mainly for use in skins that want to retain the display of the
+    ///< free disk space in the menu title, as was the case until VDR version 1.7.27.
+    ///< An implicit call to HasChanged() is done in this function, to make sure the
+    ///< returned value is up to date.
+  static int UsedPercent(void) { return usedPercent; }
+    ///< Returns the used space of the video disk in percent.
+    ///< The caller should call HasChanged() first, to make sure the value is up to date.
+  static int FreeMB(void) { return freeMB; }
+    ///< Returns the amount of free space on the video disk in MB.
+    ///< The caller should call HasChanged() first, to make sure the value is up to date.
+  static int FreeMinutes(void) { return freeMinutes; }
+    ///< Returns the number of minutes that can still be recorded on the video disk.
+    ///< This is an estimate and depends on the data rate of the existing recordings.
+    ///< There is no guarantee that this value will actually be met.
+    ///< The caller should call HasChanged() first, to make sure the value is up to date.
+  };
+
 #endif //__VIDEODIR_H

From 046b506748196e9e2da7472a4ff76ff593e67b76 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 14 Jul 2012 15:28:00 +0200
Subject: [PATCH 215/307] Version 1.7.29 Original announce message: VDR
 developer version 1.7.29 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.29.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.28-1.7.29.diff

MD5 checksums:

a3f0ae42ba456aa1865c9ed065a64d80  vdr-1.7.29.tar.bz2
39db6b495210c293726126fbcba3e631  vdr-1.7.28-1.7.29.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The default skin "LCARS" displays the signal strengths and qualities of
all devices in its main menu. For devices that have an stb0899 frontend chip
(like the TT-budget S2-3200) retrieving this information from the driver is
rather slow, which results in a sluggish response to user input in the main
menu. To speed this up you may want to apply the patches from

   ftp://ftp.tvdr.de/vdr/Developer/Driver-Patches

to the LinuxDVB driver source.

From the HISTORY file:
- Added a missing template specification to the c'tor of cSortedTimers (thanks to Udo
  Richter).
- Fixed the background color of the Transfer Mode indicator bitmap in the LCARS skin.
- The LCARS skin now only displays devices that can actually receive channels, leaving
  out, for instance, pure replay devices (suggested by Reinhard Nissl).
- Now scaling down the Transfer Mode indicator bitmap in the LCARS skin in case it
  doesn't fit with the selected font size (reported by Reinhard Nissl).
- Fixed making LCARS the default skin.
- Adjusted the default values for OSD and font sizes to better fit HDTV.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel() (thanks
  to Rolf Ahrenberg).
- Removed DeleteEvent() from the EPG handler interface (turned out not to be useful)
  and replaced it with HandledExternally() (thanks to Jörg Wendel).
- Added SetComponents() to the EPG handler interface (thanks to Dirk Heiser).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Changed the button colors in the LCARS skin to better fit with the rest of the theme.
- Removed the gap from the main menu buttons in the LCARS skin.
- Fixed some copy&paste errors in PLUGINS.html (thanks to Winfried Köhler).
- The LCARS skin's main menu now only displays timers that are actually activated.
- Within the "Recordings" menu, pressing the '0' key now toggles sorting between
  "by time" and "by name". The selected sort mode is stored separately for each
  folder (provided you have write access to that folder).
  If a folder is newly created by a repeating timer, the sort mode for that
  folder is initially set to "by time".
- Fixed several spelling errors (thanks to Ville Skyttä).
- Fixed handling recording with more than two bonded devices.
- Fixed the type of MBperMinute in cVideoDiskUsage::HasChanged() (thanks to Andreas
  Mair).
- Setting the "broken link" or "TEI" flags when cutting recordings is now suppressed
  if the editing point merges two seamlessly fitting parts of the same stream (thanks
  to Torsten Lang).
- Fixed displaying messages in the LCARS skin.
- Fixed checking for a visible live programme in case a menu or the channel display
  is currently open.
- Changed some of the colors in the LCARS skin (you may need to delete the file
  lcars-default.theme from your themes directory to see these changes).
- The new setup option "Miscellaneous/Show channel names with source" can be used to
  turn on adding the source character to channel names whenever they are displayed
  (suggested by Ludi Kaleni).
---
 CONTRIBUTORS                                  |  23 ++-
 HISTORY                                       |  45 +++++-
 MANUAL                                        |  17 +-
 PLUGINS.html                                  |   4 +-
 PLUGINS/src/dvbhddevice/dvbhddevice.c         |  10 +-
 PLUGINS/src/dvbhddevice/hdffcmd.c             |   8 +-
 PLUGINS/src/dvbhddevice/hdffcmd.h             |   3 +-
 PLUGINS/src/dvbhddevice/hdffosd.c             |  23 ++-
 .../src/dvbhddevice/libhdffcmd/hdffcmd_defs.h |   1 +
 .../dvbhddevice/libhdffcmd/hdffcmd_generic.c  |  42 +++--
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.c  |  39 +++++
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.h  |   5 +
 channels.c                                    |  38 ++++-
 channels.h                                    |   8 +-
 config.c                                      |  21 +--
 config.h                                      |  11 +-
 cutter.c                                      |  32 +++-
 device.c                                      |   8 +-
 dvbplayer.c                                   |   4 +-
 eit.c                                         |  17 +-
 epg.c                                         |  29 ++--
 epg.h                                         |  15 +-
 libsi/headers.h                               |   4 +-
 menu.c                                        |  48 +++++-
 menu.h                                        |   5 +-
 osd.c                                         |   4 +-
 po/ar.po                                      |   5 +-
 po/ca_ES.po                                   |   5 +-
 po/cs_CZ.po                                   |   5 +-
 po/da_DK.po                                   |   5 +-
 po/de_DE.po                                   |   5 +-
 po/el_GR.po                                   |   5 +-
 po/es_ES.po                                   |   5 +-
 po/et_EE.po                                   |   5 +-
 po/fi_FI.po                                   |  17 +-
 po/fr_FR.po                                   |   5 +-
 po/hr_HR.po                                   |   5 +-
 po/hu_HU.po                                   |   5 +-
 po/it_IT.po                                   |  21 +--
 po/lt_LT.po                                   |   5 +-
 po/mk_MK.po                                   |   5 +-
 po/nl_NL.po                                   |   5 +-
 po/nn_NO.po                                   |   5 +-
 po/pl_PL.po                                   |   5 +-
 po/pt_PT.po                                   |   5 +-
 po/ro_RO.po                                   |   5 +-
 po/ru_RU.po                                   |   5 +-
 po/sk_SK.po                                   |   5 +-
 po/sl_SI.po                                   |   5 +-
 po/sr_SR.po                                   |   5 +-
 po/sv_SE.po                                   |   5 +-
 po/tr_TR.po                                   |   5 +-
 po/uk_UA.po                                   |   5 +-
 po/zh_CN.po                                   |   5 +-
 recording.c                                   |  66 ++++++--
 recording.h                                   |  12 +-
 skinlcars.c                                   | 151 ++++++++++++------
 sources.h                                     |   3 +-
 timers.c                                      |   6 +-
 vdr.c                                         |   7 +-
 videodir.c                                    |   4 +-
 61 files changed, 672 insertions(+), 209 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index baa09ee6a..6512bfcbb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -982,7 +982,7 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for reporting a problem with multiple entries of the same subdirectory in the
  "Recordings" menu
 
-Andreas Mair <andreas@vdr-developer.org>
+Andreas Mair <amair.sob@googlemail.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
  is started through a user defined key macro
  for reporting a problem with extremely long summary fields in timers
@@ -995,6 +995,7 @@ Andreas Mair <andreas@vdr-developer.org>
  for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet()
  for fixing initializing the timer's flags in the cTimer copy constructor
  for reporting a crash in case CutRecording() is called from a plugin
+ for fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1141,6 +1142,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  to "Single"
  for fixing reduced bpp support for DVB subtitles
  for implementing "DVB Standard compliance" handling
+ for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1304,13 +1306,17 @@ Reinhard Nissl <rnissl@gmx.de>
  for storing the original display size when handling DVB subtitles
  for reporting a problem with horizontal scaling of subtitles
  for fixing a buffer overflow in cFont::Bidi()
- for avoiding an unecessary call to Recordings.ResetResume()
+ for avoiding an unnecessary call to Recordings.ResetResume()
  for debugging a problem in handling the bitmap color depth for scaled subtitles
  for making subtitle PIDs be decrypted
  for making cEITScanner process new transponders before old ones, to make sure
  transponder changes are recognized
  for helping to debug switching into time shift mode when pausing live video
  for fixing a possible high CPU load when pausing replay
+ for suggesting that the LCARS skin should only displays devices that can actually
+ receive channels
+ for reporting that the Transfer Mode indicator bitmap in the LCARS skin may not
+ fit with small font sizes
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1744,6 +1750,7 @@ Udo Richter <udo_richter@gmx.de>
  for a patch that sets the start time of an edited recording to the time of the first
  editing mark
  for adding the option --outputonly to the dvbsddevice plugin
+ for adding a missing template specification to the c'tor of cSortedTimers
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2151,7 +2158,7 @@ J
 Christian Wieninger <cwieninger@gmx.de>
  for suggesting to add cMenuEditStrItem::InEditMode()
  for his idea of going directly into the "Edit timer" menu for a timer created
- from the "Schedule" menu in case it starts withing the next two minutes
+ from the "Schedule" menu in case it starts within the next two minutes
  for reporting a problem with a format string in recording.c on 64bit systems
  for reporting a problem with the device selection in case of timer conflicts
  for a patch that fixed part of a crash in i18n character set conversion
@@ -2459,6 +2466,7 @@ Ulf Kiener <webmaster@ulf-kiener.de>
 
 J�rg Wendel <vdr-ml@jwendel.de>
  for reporting that cPlugin::Active() was called too often
+ for adding HandledExternally() to the EPG handler interface
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@@ -2564,6 +2572,7 @@ Benjamin Hess <benjamin.h@gmx.ch>
 Winfried Koehler <w_koehl@gmx.de>
  for fixing finding new transponders
  for reporting a compiler warning in calculations involving FramesPerSecond()
+ for fixing some copy&paste errors in PLUGINS.html
 
 Hans-Werner Hilse <hilse@web.de>
  for adding the command line option --userdump to enable core dumps in case VDR
@@ -2864,6 +2873,8 @@ Torsten Lang <info@torstenlang.de>
  for reporting a bug in checking for UTF-8 support in cFont::Bidi()
  for a patch that was used to implement caching the information whether a recording
  is stored on the video directory file system within the cRecording data
+ for suppressing setting the "broken link" or "TEI" flags when cutting recordings
+ if the editing point merges two seamlessly fitting parts of the same stream
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
@@ -2900,3 +2911,9 @@ Christian Richter <cr@crichter.net>
 
 Christian Kaiser <christian.kaiser@teleservice.com>
  for adding DeleteEvent() to the EPG handler interface
+
+Dirk Heiser <dirk-vdr@gmx.de>
+ for adding SetComponents() to the EPG handler interface
+
+Ludi Kaleni <ludi113@hotmail.com>
+ for suggesting to add the source character to channel names whenever they are displayed
diff --git a/HISTORY b/HISTORY
index 23412f862..f7ca2aaa4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6604,7 +6604,7 @@ Video Disk Recorder Revision History
   to Ville Skytt�).
 - The Makefile now also installs the include files (thanks to Ville Skytt�).
 - Added handling of "ANSI/SCTE 57" descriptors (thanks to Rolf Ahrenberg).
-- Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard
+- Avoiding an unnecessary call to Recordings.ResetResume() (thanks to Reinhard
   Nissl).
 
 2011-06-19: Version 1.7.19
@@ -7147,3 +7147,46 @@ Video Disk Recorder Revision History
 - Speeded up opening menus on systems with many (several thousands) of recordings, by
   caching the information whether a recording is stored on the video directory file
   system within the cRecording data (based on a patch from Torsten Lang).
+
+2012-07-14: Version 1.7.29
+
+- Added a missing template specification to the c'tor of cSortedTimers (thanks to Udo
+  Richter).
+- Fixed the background color of the Transfer Mode indicator bitmap in the LCARS skin.
+- The LCARS skin now only displays devices that can actually receive channels, leaving
+  out, for instance, pure replay devices (suggested by Reinhard Nissl).
+- Now scaling down the Transfer Mode indicator bitmap in the LCARS skin in case it
+  doesn't fit with the selected font size (reported by Reinhard Nissl).
+- Fixed making LCARS the default skin.
+- Adjusted the default values for OSD and font sizes to better fit HDTV.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel() (thanks
+  to Rolf Ahrenberg).
+- Removed DeleteEvent() from the EPG handler interface (turned out not to be useful)
+  and replaced it with HandledExternally() (thanks to J�rg Wendel).
+- Added SetComponents() to the EPG handler interface (thanks to Dirk Heiser).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Changed the button colors in the LCARS skin to better fit with the rest of the theme.
+- Removed the gap from the main menu buttons in the LCARS skin.
+- Fixed some copy&paste errors in PLUGINS.html (thanks to Winfried K�hler).
+- The LCARS skin's main menu now only displays timers that are actually activated.
+- Within the "Recordings" menu, pressing the '0' key now toggles sorting between
+  "by time" and "by name". The selected sort mode is stored separately for each
+  folder (provided you have write access to that folder).
+  If a folder is newly created by a repeating timer, the sort mode for that
+  folder is initially set to "by time".
+- Fixed several spelling errors (thanks to Ville Skytt�).
+- Fixed handling recording with more than two bonded devices.
+- Fixed the type of MBperMinute in cVideoDiskUsage::HasChanged() (thanks to Andreas
+  Mair).
+- Setting the "broken link" or "TEI" flags when cutting recordings is now suppressed
+  if the editing point merges two seamlessly fitting parts of the same stream (thanks
+  to Torsten Lang).
+- Fixed displaying messages in the LCARS skin.
+- Fixed checking for a visible live programme in case a menu or the channel display
+  is currently open.
+- Changed some of the colors in the LCARS skin (you may need to delete the file
+  lcars-default.theme from your themes directory to see these changes).
+- The new setup option "Miscellaneous/Show channel names with source" can be used to
+  turn on adding the source character to channel names whenever they are displayed
+  (suggested by Ludi Kaleni).
diff --git a/MANUAL b/MANUAL
index a33f3bf6d..5d3c9a538 100644
--- a/MANUAL
+++ b/MANUAL
@@ -24,7 +24,7 @@ Version 1.6
   Green   -           Audio        New        New        Ins/Ovr       Rewind            Skip -60s        -
   Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s        -
   Blue    -           Stop/Resume  Mark       Info       -             Info              Stop             -
-  0..9    Ch select   -            Sort(2)    Day(3)     Numeric inp.  Exec cmd(1)       Editing          -
+  0..9    Ch select   -            Sort(2)    Day(3)     Numeric inp.  Sort/Exec cmd(1)  Editing          -
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
   are used to enter the data, and the Left key can be used to delete the last
@@ -81,7 +81,7 @@ Version 1.6
   Yellow    Info
   Blue      Timers menu
 
-  (1) See "Processing Recordings" below.
+  (1) See "Sort Recordings" and "Processing Recordings" below.
   (2) In the "Channels" menu the '0' key switches the sort mode through "by number",
       "by name" and "by provider". Other numeric input positions the cursor to
       the channel with the number entered so far. If there is no channel with that
@@ -301,6 +301,14 @@ Version 1.6
   A previously stopped playback session can be resumed by pressing the "Blue"
   key in the "VDR" menu.
 
+* Sort Recordings
+
+  Within the "Recordings" menu, pressing the '0' key toggles sorting between
+  "by time" and "by name". The selected sort mode is stored separately for each
+  folder (provided you have write access to that folder).
+  If a folder is newly created by a repeating timer, the sort mode for that
+  folder is initially set to "by time".
+
 * Processing Recordings
 
   The configuration file 'reccmds.conf' can be used to define system commands
@@ -905,6 +913,11 @@ Version 1.6
                          wrap around the beginning or end of the channel list if
                          this parameter is set to 'yes'.
 
+  Show channel names with source = no
+                         If this option is turned on, channel names will be displayed
+                         with the source appended to them, as in "ZDF (S)", where
+                         'S' stands for "Satellite".
+
   Emergency exit = yes   If, for some reason, a recording fails because the video
                          data stream is broken, or the CAM doesn't decrypt etc.,
                          VDR automatically exits in order to allow the surrounding
diff --git a/PLUGINS.html b/PLUGINS.html
index 82164bff1..a6b29f209 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1687,7 +1687,7 @@ <h1>Table Of Contents</h1>
 that provides the handling objects necessary to do the actual work:
 
 <p><table><tr><td class="code"><pre>
-#include "skins.h"
+#include &lt;vdr/skins.h&gt;
 
 class cMySkin : public cSkin {
 public:
@@ -1697,7 +1697,7 @@ <h1>Table Of Contents</h1>
   virtual cSkinDisplayMenu *DisplayMenu(void);
   virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
   virtual cSkinDisplayVolume *DisplayVolume(void);
-  virtual cSkinDisplayMessage *DisplayTrack(int NumTracks, const char * const *Tracks);
+  virtual cSkinDisplayTracks *DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);
   virtual cSkinDisplayMessage *DisplayMessage(void);
   };
 </pre></td></tr></table><p>
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index a1e58817c..20b676237 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.16 2012/02/08 15:10:30 kls Exp $
+ * $Id: dvbhddevice.c 1.17 2012/06/07 09:33:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -52,7 +52,7 @@ void cPluginDvbhddevice::MainThreadHook(void)
         if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOn)
         {
             HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
-            if (!mIsUserInactive)
+            if (hdffCmdIf && !mIsUserInactive)
             {
                 hdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
             }
@@ -67,12 +67,14 @@ const char *cPluginDvbhddevice::MainMenuEntry(void)
 
 cOsdObject *cPluginDvbhddevice::MainMenuAction(void)
 {
-  return new cHdffMenu(cDvbHdFfDevice::GetHdffCmdHandler());
+  HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
+  return hdffCmdIf ? new cHdffMenu(hdffCmdIf) : NULL;
 }
 
 cMenuSetupPage *cPluginDvbhddevice::SetupMenu(void)
 {
-  return new cHdffSetupPage(cDvbHdFfDevice::GetHdffCmdHandler());
+  HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
+  return hdffCmdIf ? new cHdffSetupPage(hdffCmdIf) : NULL;
 }
 
 bool cPluginDvbhddevice::SetupParse(const char *Name, const char *Value)
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index 78e8a895c..a6a41d968 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.24 2012/02/28 09:19:09 kls Exp $
+ * $Id: hdffcmd.c 1.25 2012/06/16 11:16:38 kls Exp $
  */
 
 #include <stdint.h>
@@ -310,6 +310,12 @@ void cHdffCmdIf::CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y,
     HdffCmdOsdDrawText(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
 }
 
+void cHdffCmdIf::CmdOsdDrawUtf8Text(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
+{
+    //printf("Text(UTF8) %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);
+    HdffCmdOsdDrawUtf8Text(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
+}
+
 void cHdffCmdIf::CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color)
 {
     //printf("TextW %08X (%d,%d), %08X\n", hFont, X, Y, Color);
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
index c4f5104c1..f33fe08fa 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.h
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.h 1.19 2012/02/06 11:09:27 kls Exp $
+ * $Id: hdffcmd.h 1.20 2012/06/16 11:16:52 kls Exp $
  */
 
 #ifndef _HDFF_CMD_H_
@@ -74,6 +74,7 @@ class cHdffCmdIf
     void CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
                            uint32_t Color, uint32_t Flags);
     void CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
+    void CmdOsdDrawUtf8Text(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
     void CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color);
     void CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
                           int BmpWidth, int BmpHeight, int BmpSize,
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 0b95707a5..427a3fb2a 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffosd.c 1.15 2012/05/17 13:29:50 kls Exp $
+ * $Id: hdffosd.c 1.17 2012/06/16 11:17:11 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -47,6 +47,8 @@ class cHdffOsd : public cOsd
     uint32_t mBitmapColors[256];
     uint32_t mBitmapNumColors;
 
+    bool mSupportsUtf8Text;
+
 protected:
     virtual void SetActive(bool On);
 public:
@@ -78,6 +80,12 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
     shown = false;
     mChanged = false;
     mBitmapPalette = HDFF_INVALID_HANDLE;
+
+    mSupportsUtf8Text = false;
+    if (mHdffCmdIf->CmdGetFirmwareVersion(NULL, 0) >= 0x309)
+        mSupportsUtf8Text = true;
+
+    memset(&config, 0, sizeof(config));
     config.FontKerning = true;
     config.FontAntialiasing = Setup.AntiAlias ? true : false;
     mHdffCmdIf->CmdOsdConfigure(&config);
@@ -346,15 +354,19 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
         {
             if ((Alignment & taLeft) != 0)
             {
+#if (APIVERSNUM >= 10728)
                 if ((Alignment & taBorder) != 0)
                     x += max(h / TEXT_ALIGN_BORDER, 1);
+#endif
             }
             else if ((Alignment & taRight) != 0)
             {
                 if (w < Width)
                     x += Width - w;
+#if (APIVERSNUM >= 10728)
                 if ((Alignment & taBorder) != 0)
                     x -= max(h / TEXT_ALIGN_BORDER, 1);
+#endif
             }
             else
             { // taCentered
@@ -378,8 +390,11 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
             }
         }
     }
-    //x -= mLeft;
-    //y -= mTop;
+    if (mSupportsUtf8Text)
+    {
+        mHdffCmdIf->CmdOsdDrawUtf8Text(mDisplay, pFont->Handle, x + mLeft, y + mTop + h, s, ColorFg);
+    }
+    else
     {
         uint16_t tmp[1000];
         uint16_t len = 0;
@@ -394,9 +409,7 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
         tmp[len] = 0;
         mHdffCmdIf->CmdOsdDrawTextW(mDisplay, pFont->Handle, x + mLeft, y + mTop + h, tmp, ColorFg);
     }
-    //mHdffCmdIf->CmdOsdDrawText(mDisplay, pFont->Handle, x + mLeft, y + mTop + h - 7, s, ColorFg);
     mHdffCmdIf->CmdOsdSetDisplayClippingArea(mDisplay, false, 0, 0, 0, 0);
-    //Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
     mChanged = true;
 }
 
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
index f68da669f..322c25633 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
@@ -103,6 +103,7 @@ typedef enum HdffMessageId_t
     HDFF_MSG_OSD_DRAW_TEXT,
     HDFF_MSG_OSD_DRAW_WIDE_TEXT,
     HDFF_MSG_OSD_DRAW_BITMAP,
+    HDFF_MSG_OSD_DRAW_UTF8_TEXT,
 
     HDFF_MSG_HDMI_ENABLE_OUTPUT = 0,
     HDFF_MSG_HDMI_SET_VIDEO_MODE,
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
index f72a7d323..797abe84a 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
@@ -21,6 +21,7 @@
  *
  *********************************************************************/
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/ioctl.h>
@@ -38,8 +39,12 @@ int HdffCmdGetFirmwareVersion(int OsdDevice, uint32_t * Version, char * String,
     osd_raw_cmd_t osd_cmd;
     int err;
 
+    if (Version == NULL)
+        return -EINVAL;
+
     *Version = 0;
-    String[0] = 0;
+    if (String)
+        String[0] = 0;
 
     BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
     memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
@@ -54,11 +59,14 @@ int HdffCmdGetFirmwareVersion(int OsdDevice, uint32_t * Version, char * String,
     {
         if (osd_cmd.result_len > 0)
         {
-            uint8_t textLength = resultData[9];
-            if (textLength >= MaxLength)
-                textLength = MaxLength - 1;
-            memcpy(String, &resultData[10], textLength);
-            String[textLength] = 0;
+            if (String)
+            {
+                uint8_t textLength = resultData[9];
+                if (textLength >= MaxLength)
+                    textLength = MaxLength - 1;
+                memcpy(String, &resultData[10], textLength);
+                String[textLength] = 0;
+            }
             *Version = (resultData[6] << 16)
                      | (resultData[7] << 8)
                      | resultData[8];
@@ -76,8 +84,12 @@ int HdffCmdGetInterfaceVersion(int OsdDevice, uint32_t * Version, char * String,
     osd_raw_cmd_t osd_cmd;
     int err;
 
+    if (Version == NULL)
+        return -EINVAL;
+
     *Version = 0;
-    String[0] = 0;
+    if (String)
+        String[0] = 0;
 
     BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
     memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
@@ -92,11 +104,14 @@ int HdffCmdGetInterfaceVersion(int OsdDevice, uint32_t * Version, char * String,
     {
         if (osd_cmd.result_len > 0)
         {
-            uint8_t textLength = resultData[9];
-            if (textLength >= MaxLength)
-                textLength = MaxLength - 1;
-            memcpy(String, &resultData[10], textLength);
-            String[textLength] = 0;
+            if (String)
+            {
+                uint8_t textLength = resultData[9];
+                if (textLength >= MaxLength)
+                    textLength = MaxLength - 1;
+                memcpy(String, &resultData[10], textLength);
+                String[textLength] = 0;
+            }
             *Version = (resultData[6] << 16)
                      | (resultData[7] << 8)
                      | resultData[8];
@@ -114,6 +129,9 @@ int HdffCmdGetCopyrights(int OsdDevice, uint8_t Index, char * String,
     osd_raw_cmd_t osd_cmd;
     int err;
 
+    if (String == NULL)
+        return -EINVAL;
+
     String[0] = 0;
 
     BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
index dfe27599f..93674155d 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
@@ -57,6 +57,8 @@ int HdffCmdOsdConfigure(int OsdDevice, const HdffOsdConfig_t * Config)
     {
         BitBuffer_SetBits(&cmdBuf, 1, 0);
     }
+    BitBuffer_SetBits(&cmdBuf, 6, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 16, Config->FontDpi);
     osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
@@ -581,6 +583,43 @@ int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
 
+int HdffCmdOsdDrawUtf8Text(int OsdDevice, uint32_t Display, uint32_t Font,
+                           uint16_t X, uint16_t Y, const char * Text,
+                           uint32_t Color)
+{
+    uint8_t cmdData[1060];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+    int i;
+    int length;
+
+    length = 0;
+    while (Text[length])
+    {
+        length++;
+    }
+    if (length > 980)
+        length = 980;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_UTF8_TEXT);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 32, Font);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    BitBuffer_SetBits(&cmdBuf, 16, length);
+    for (i = 0; i < length; i++)
+    {
+        BitBuffer_SetBits(&cmdBuf, 8, Text[i]);
+    }
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
 int HdffCmdOsdDrawWideText(int OsdDevice, uint32_t Display, uint32_t Font,
                            uint16_t X, uint16_t Y, const uint16_t * Text,
                            uint32_t Color)
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
index 5c1355934..48851ef2a 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
@@ -40,6 +40,7 @@ typedef struct HdffOsdConfig_t
 {
     int FontAntialiasing;
     int FontKerning;
+    uint16_t FontDpi;
 } HdffOsdConfig_t;
 
 typedef enum HdffColorType_t
@@ -148,6 +149,10 @@ int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
                        uint16_t X, uint16_t Y, const char * Text,
                        uint32_t Color);
 
+int HdffCmdOsdDrawUtf8Text(int OsdDevice, uint32_t Display, uint32_t Font,
+                           uint16_t X, uint16_t Y, const char * Text,
+                           uint32_t Color);
+
 int HdffCmdOsdDrawWideText(int OsdDevice, uint32_t Display, uint32_t Font,
                            uint16_t X, uint16_t Y, const uint16_t * Text,
                            uint32_t Color);
diff --git a/channels.c b/channels.c
index 65e51348f..4c04608bb 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.22 2012/04/01 09:27:08 kls Exp $
+ * $Id: channels.c 2.24 2012/07/14 12:34:47 kls Exp $
  */
 
 #include "channels.h"
@@ -112,10 +112,34 @@ cChannel& cChannel::operator= (const cChannel &Channel)
   provider = strcpyrealloc(provider, Channel.provider);
   portalName = strcpyrealloc(portalName, Channel.portalName);
   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
+  nameSource = NULL; // these will be recalculated automatically
+  shortNameSource = NULL;
   parameters = Channel.parameters;
   return *this;
 }
 
+const char *cChannel::Name(void) const
+{
+  if (Setup.ShowChannelNamesWithSource && !groupSep) {
+     if (isempty(nameSource))
+        nameSource = cString::sprintf("%s (%c)", name, cSource::ToChar(source));
+     return nameSource;
+     }
+  return name;
+}
+
+const char *cChannel::ShortName(bool OrName) const
+{
+  if (OrName && isempty(shortName))
+     return Name();
+  if (Setup.ShowChannelNamesWithSource && !groupSep) {
+     if (isempty(shortNameSource))
+        shortNameSource = cString::sprintf("%s (%c)", shortName, cSource::ToChar(source));
+     return shortNameSource;
+     }
+  return shortName;
+}
+
 int cChannel::Transponder(int Frequency, char Polarization)
 {
   // some satellites have transponders at the same frequency, just with different polarization:
@@ -193,6 +217,8 @@ bool cChannel::SetTransponderData(int Source, int Frequency, int Srate, const ch
      srate = Srate;
      parameters = Parameters;
      schedule = NULL;
+     nameSource = NULL;
+     shortNameSource = NULL;
      if (Number() && !Quiet) {
         dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
         modification |= CHANNELMOD_TRANSP;
@@ -233,10 +259,14 @@ void cChannel::SetName(const char *Name, const char *ShortName, const char *Prov
            modification |= CHANNELMOD_NAME;
            Channels.SetModified();
            }
-        if (nn)
+        if (nn) {
            name = strcpyrealloc(name, Name);
-        if (ns)
+           nameSource = NULL;
+           }
+        if (ns) {
            shortName = strcpyrealloc(shortName, ShortName);
+           shortNameSource = NULL;
+           }
         if (np)
            provider = strcpyrealloc(provider, Provider);
         }
@@ -721,6 +751,8 @@ bool cChannel::Parse(const char *s)
         free(tpidbuf);
         free(caidbuf);
         free(namebuf);
+        nameSource = NULL;
+        shortNameSource = NULL;
         if (!GetChannelID().Valid()) {
            esyslog("ERROR: channel data results in invalid ID!");
            return false;
diff --git a/channels.h b/channels.h
index 203a4c94c..815cb4795 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.15 2012/03/11 11:46:39 kls Exp $
+ * $Id: channels.h 2.16 2012/06/17 11:21:33 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -123,6 +123,8 @@ class cChannel : public cListObject {
   int number;    // Sequence number assigned on load
   bool groupSep;
   int __EndData__;
+  mutable cString nameSource;
+  mutable cString shortNameSource;
   cString parameters;
   int modification;
   mutable const cSchedule *schedule;
@@ -137,8 +139,8 @@ class cChannel : public cListObject {
   cString ToText(void) const;
   bool Parse(const char *s);
   bool Save(FILE *f);
-  const char *Name(void) const { return name; }
-  const char *ShortName(bool OrName = false) const { return (OrName && isempty(shortName)) ? name : shortName; }
+  const char *Name(void) const;
+  const char *ShortName(bool OrName = false) const;
   const char *Provider(void) const { return provider; }
   const char *PortalName(void) const { return portalName; }
   int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
diff --git a/config.c b/config.c
index b6c4b42d2..56454dfa6 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.22 2012/05/11 11:06:57 kls Exp $
+ * $Id: config.c 2.26 2012/06/17 12:27:07 kls Exp $
  */
 
 #include "config.h"
@@ -373,7 +373,7 @@ cSetup Setup;
 cSetup::cSetup(void)
 {
   strcpy(OSDLanguage, ""); // default is taken from environment
-  strcpy(OSDSkin, "sttng");
+  strcpy(OSDSkin, "lcars");
   strcpy(OSDTheme, "default");
   PrimaryDVB = 1;
   ShowInfoOnChSwitch = 1;
@@ -424,10 +424,10 @@ cSetup::cSetup(void)
   UseDolbyDigital = 1;
   ChannelInfoPos = 0;
   ChannelInfoTime = 5;
-  OSDLeftP = 0.08;
-  OSDTopP = 0.08;
-  OSDWidthP = 0.87;
-  OSDHeightP = 0.84;
+  OSDLeftP = 0.03;
+  OSDTopP = 0.03;
+  OSDWidthP = 0.93;
+  OSDHeightP = 0.93;
   OSDLeft = 54;
   OSDTop = 45;
   OSDWidth = 624;
@@ -439,9 +439,9 @@ cSetup::cSetup(void)
   strcpy(FontOsd, DefaultFontOsd);
   strcpy(FontSml, DefaultFontSml);
   strcpy(FontFix, DefaultFontFix);
-  FontOsdSizeP = 0.038;
-  FontSmlSizeP = 0.035;
-  FontFixSizeP = 0.031;
+  FontOsdSizeP = 0.031;
+  FontSmlSizeP = 0.028;
+  FontFixSizeP = 0.030;
   FontOsdSize = 22;
   FontSmlSize = 18;
   FontFixSize = 20;
@@ -462,6 +462,7 @@ cSetup::cSetup(void)
   DeviceBondings = "";
   InitialVolume = -1;
   ChannelsWrap = 0;
+  ShowChannelNamesWithSource = 0;
   EmergencyExit = 1;
 }
 
@@ -657,6 +658,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
   else if (!strcasecmp(Name, "DeviceBondings"))      DeviceBondings     = Value;
   else if (!strcasecmp(Name, "ChannelsWrap"))        ChannelsWrap       = atoi(Value);
+  else if (!strcasecmp(Name, "ShowChannelNamesWithSource")) ShowChannelNamesWithSource = atoi(Value);
   else if (!strcasecmp(Name, "EmergencyExit"))       EmergencyExit      = atoi(Value);
   else
      return false;
@@ -755,6 +757,7 @@ bool cSetup::Save(void)
   Store("InitialVolume",      InitialVolume);
   Store("DeviceBondings",     DeviceBondings);
   Store("ChannelsWrap",       ChannelsWrap);
+  Store("ShowChannelNamesWithSource", ShowChannelNamesWithSource);
   Store("EmergencyExit",      EmergencyExit);
 
   Sort();
diff --git a/config.h b/config.h
index e283d77c6..acdf77a70 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.47 2012/04/15 10:45:32 kls Exp $
+ * $Id: config.h 2.49 2012/06/17 11:14:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.28"
-#define VDRVERSNUM   10728  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.29"
+#define VDRVERSNUM   10729  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.28"
-#define APIVERSNUM   10728  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.29"
+#define APIVERSNUM   10729  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -323,6 +323,7 @@ class cSetup : public cConfig<cSetupLine> {
   int CurrentDolby;
   int InitialVolume;
   int ChannelsWrap;
+  int ShowChannelNamesWithSource;
   int EmergencyExit;
   int __EndData__;
   cString InitialChannel;
diff --git a/cutter.c b/cutter.c
index eb8f82066..62eae822b 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.12 2012/06/02 13:46:55 kls Exp $
+ * $Id: cutter.c 2.13 2012/06/10 14:33:36 kls Exp $
  */
 
 #include "cutter.h"
@@ -83,7 +83,9 @@ void cCuttingThread::Action(void)
      int LastIFrame = 0;
      toMarks.Add(0);
      toMarks.Save();
-     uchar buffer[MAXFRAMESIZE];
+     uchar buffer[MAXFRAMESIZE], buffer2[MAXFRAMESIZE];
+     int Length2;
+     bool CheckForSeamlessStream = false;
      bool LastMark = false;
      bool cutIn = true;
      while (Running()) {
@@ -142,7 +144,21 @@ void cCuttingThread::Action(void)
                  FileSize = 0;
                  }
               LastIFrame = 0;
-
+              // Compare the current frame with the previously stored one, to see if this is a seamlessly merged recording of the same stream:
+              if (CheckForSeamlessStream) {
+                 if (Length == Length2) {
+                    int diffs = 0;
+                    for (int i = 0; i < Length; i++) {
+                        if (buffer[i] != buffer2[i]) {
+                           if (diffs++ > 10)
+                              break;
+                           }
+                        }
+                    if (diffs < 10) // the continuity counters of the PAT/PMT packets may differ
+                       cutIn = false; // it's apparently a seamless stream, so no need for "broken" handling
+                    }
+                 CheckForSeamlessStream = false;
+                 }
               if (cutIn) {
                  if (isPesRecording)
                     cRemux::SetBrokenLink(buffer, Length);
@@ -172,6 +188,16 @@ void cCuttingThread::Action(void)
                  toMarks.Add(toIndex->Last() + 1);
               toMarks.Save();
               if (Mark) {
+                 // Read the next frame, for later comparison with the first frame at this mark:
+                 if (fromIndex->Get(Index, &FileNumber, &FileOffset, &Independent, &Length2)) {
+                    if (FileNumber != CurrentFileNumber)
+                       fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
+                    if (fromFile) {
+                       int len = ReadFrame(fromFile, buffer2, Length2, sizeof(buffer2));
+                       if (len >= 0 && len == Length2)
+                          CheckForSeamlessStream = true;
+                       }
+                    }
                  Index = Mark->Position();
                  Mark = fromMarks.Next(Mark);
                  CurrentFileNumber = 0; // triggers SetOffset before reading next frame
diff --git a/device.c b/device.c
index 9c382a11f..872b1aa9a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.60 2012/04/26 09:40:36 kls Exp $
+ * $Id: device.c 2.62 2012/06/10 13:13:18 kls Exp $
  */
 
 #include "device.h"
@@ -271,7 +271,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
           if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
              continue; // CAM slot can't be used with this device
           bool ndr;
-          if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job
+          if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basically able to do the job
              if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
                 ndr = true; // using a different CAM slot requires detaching receivers
              // Put together an integer number that reflects the "impact" using
@@ -334,7 +334,7 @@ cDevice *cDevice::GetDeviceForTransponder(const cChannel *Channel, int Priority)
          if (d->ProvidesTransponder(Channel)) {
             if (d->MaySwitchTransponder(Channel))
                Device = d; // this device may switch to the transponder without disturbing any receiver or live view
-            else if (!d->Occupied()) {
+            else if (!d->Occupied() && d->MaySwitchTransponder(Channel)) { // MaySwitchTransponder() implicitly calls Occupied()
                if (d->Priority() < Priority && (!Device || d->Priority() < Device->Priority()))
                   Device = d; // use this one only if no other with less impact can be found
                }
@@ -803,7 +803,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
            EnsureAudioTrack(true);
         EnsureSubtitleTrack();
         }
-     cStatus::MsgChannelSwitch(this, Channel->Number(), LiveView); // only report status if channel switch successfull
+     cStatus::MsgChannelSwitch(this, Channel->Number(), LiveView); // only report status if channel switch successful
      }
 
   return Result;
diff --git a/dvbplayer.c b/dvbplayer.c
index b325c9897..f2cb2d20e 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.27 2012/05/06 11:02:35 kls Exp $
+ * $Id: dvbplayer.c 2.28 2012/06/09 14:37:24 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -513,7 +513,7 @@ void cDvbPlayer::Action(void)
 
           if (dropFrame) {
              if (!eof || (playDir != pdForward && dropFrame->Index() > 0) || (playDir == pdForward && dropFrame->Index() < readIndex)) {
-                ringBuffer->Drop(dropFrame); // the very first and last frame are continously repeated to flush data through the device
+                ringBuffer->Drop(dropFrame); // the very first and last frame are continuously repeated to flush data through the device
                 dropFrame = NULL;
                 }
              }
diff --git a/eit.c b/eit.c
index 3cc097e9a..12e1d2425 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.17 2012/06/02 14:05:22 kls Exp $
+ * $Id: eit.c 2.20 2012/06/04 10:26:10 kls Exp $
  */
 
 #include "eit.h"
@@ -45,6 +45,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
      return;
      }
 
+  bool handledExternally = EpgHandlers.HandledExternally(channel);
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
 
   bool Empty = true;
@@ -70,7 +71,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       cEvent *newEvent = NULL;
       cEvent *rEvent = NULL;
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), StartTime);
-      if (!pEvent) {
+      if (!pEvent || handledExternally) {
          if (OnlyRunningStatus)
             continue;
          // If we don't have that event yet, we create a new one.
@@ -78,7 +79,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          pEvent = newEvent = new cEvent(SiEitEvent.getEventId());
          newEvent->SetStartTime(StartTime);
          newEvent->SetDuration(Duration);
-         pSchedule->AddEvent(newEvent);
+         if (!handledExternally)
+            pSchedule->AddEvent(newEvent);
          }
       else {
          // We have found an existing event, either through its event ID or its start time.
@@ -283,18 +285,15 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;
 
-      pEvent->SetComponents(Components);
+      EpgHandlers.SetComponents(pEvent, Components);
 
       EpgHandlers.FixEpgBugs(pEvent);
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
       Modified = true;
       EpgHandlers.HandleEvent(pEvent);
-
-      if (EpgHandlers.DeleteEvent(pEvent)) {
-         pSchedule->DelEvent(pEvent);
-         pEvent = NULL;
-         }
+      if (handledExternally)
+         delete pEvent;
       }
   if (Tid == 0x4E) {
      if (Empty && getSectionNumber() == 0)
diff --git a/epg.c b/epg.c
index 8e2af1402..d47c4a376 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.14 2012/06/02 14:08:12 kls Exp $
+ * $Id: epg.c 2.17 2012/06/04 10:26:10 kls Exp $
  */
 
 #include "epg.h"
@@ -1331,6 +1331,15 @@ bool cEpgHandlers::HandleEitEvent(cSchedule *Schedule, const SI::EIT::Event *Eit
   return false;
 }
 
+bool cEpgHandlers::HandledExternally(const cChannel *Channel)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->HandledExternally(Channel))
+         return true;
+      }
+  return false;
+}
+
 void cEpgHandlers::SetEventID(cEvent *Event, tEventID EventID)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
@@ -1412,6 +1421,15 @@ void cEpgHandlers::SetVps(cEvent *Event, time_t Vps)
   Event->SetVps(Vps);
 }
 
+void cEpgHandlers::SetComponents(cEvent *Event, cComponents *Components)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->SetComponents(Event, Components))
+         return;
+      }
+  Event->SetComponents(Components);
+}
+
 void cEpgHandlers::FixEpgBugs(cEvent *Event)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
@@ -1429,15 +1447,6 @@ void cEpgHandlers::HandleEvent(cEvent *Event)
       }
 }
 
-bool cEpgHandlers::DeleteEvent(const cEvent *Event)
-{
-  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
-      if (eh->DeleteEvent(Event))
-         return true;
-      }
-  return false;
-}
-
 void cEpgHandlers::SortSchedule(cSchedule *Schedule)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
diff --git a/epg.h b/epg.h
index fc05c222e..98cb77644 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.10 2012/06/02 14:07:51 kls Exp $
+ * $Id: epg.h 2.13 2012/06/04 10:26:10 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -244,6 +244,12 @@ class cEpgHandler : public cListObject {
           ///< EPG handlers are queried to see if any of them would like to do the
           ///< complete processing by itself. TableID and Version are from the
           ///< incoming section data.
+  virtual bool HandledExternally(const cChannel *Channel) { return false; }
+          ///< If any EPG handler returns true in this function, it is assumed that
+          ///< the EPG for the given Channel is handled completely from some external
+          ///< source. Incoming EIT data is processed as usual, but any new EPG event
+          ///< will not be added to the respective schedule. It's up to the EPG
+          ///< handler to take care of this.
   virtual bool SetEventID(cEvent *Event, tEventID EventID) { return false; }
   virtual bool SetTitle(cEvent *Event, const char *Title) { return false; }
   virtual bool SetShortText(cEvent *Event, const char *ShortText) { return false; }
@@ -253,14 +259,12 @@ class cEpgHandler : public cListObject {
   virtual bool SetStartTime(cEvent *Event, time_t StartTime) { return false; }
   virtual bool SetDuration(cEvent *Event, int Duration) { return false; }
   virtual bool SetVps(cEvent *Event, time_t Vps) { return false; }
+  virtual bool SetComponents(cEvent *Event, cComponents *Components) { return false; }
   virtual bool FixEpgBugs(cEvent *Event) { return false; }
           ///< Fixes some known problems with EPG data.
   virtual bool HandleEvent(cEvent *Event) { return false; }
           ///< After all modifications of the Event have been done, the EPG handler
           ///< can take a final look at it.
-  virtual bool DeleteEvent(const cEvent *Event) { return false; }
-          ///< After the complete processing of the Event is finished, an EPG handler
-          ///< can decide that this Event shall be deleted from its schedule.
   virtual bool SortSchedule(cSchedule *Schedule) { return false; }
           ///< Sorts the Schedule after the complete table has been processed.
   virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
@@ -272,6 +276,7 @@ class cEpgHandlers : public cList<cEpgHandler> {
 public:
   bool IgnoreChannel(const cChannel *Channel);
   bool HandleEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version);
+  bool HandledExternally(const cChannel *Channel);
   void SetEventID(cEvent *Event, tEventID EventID);
   void SetTitle(cEvent *Event, const char *Title);
   void SetShortText(cEvent *Event, const char *ShortText);
@@ -281,9 +286,9 @@ class cEpgHandlers : public cList<cEpgHandler> {
   void SetStartTime(cEvent *Event, time_t StartTime);
   void SetDuration(cEvent *Event, int Duration);
   void SetVps(cEvent *Event, time_t Vps);
+  void SetComponents(cEvent *Event, cComponents *Components);
   void FixEpgBugs(cEvent *Event);
   void HandleEvent(cEvent *Event);
-  bool DeleteEvent(const cEvent *Event);
   void SortSchedule(cSchedule *Schedule);
   void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
   };
diff --git a/libsi/headers.h b/libsi/headers.h
index daea50e16..85c83b27c 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 2.4 2012/01/11 11:35:17 kls Exp $
+ *   $Id: headers.h 2.5 2012/06/09 14:37:24 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -2040,7 +2040,7 @@ struct descr_application_icons_descriptor_end {
 struct descr_simple_application_location_descriptor {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   /* inital_path_bytes */
+   /* initial_path_bytes */
 };
 
 // Private DVB Descriptor  Premiere.de
diff --git a/menu.c b/menu.c
index ed07b7e2c..9f4c54e54 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.54 2012/05/12 13:08:23 kls Exp $
+ * $Id: menu.c 2.58 2012/06/17 11:12:25 kls Exp $
  */
 
 #include "menu.h"
@@ -1888,6 +1888,8 @@ eOSState cMenuCommands::ProcessKey(eKeys Key)
 
 // --- cMenuCam --------------------------------------------------------------
 
+static bool CamMenuIsOpen = false;
+
 class cMenuCam : public cOsdMenu {
 private:
   cCamSlot *camSlot;
@@ -1919,6 +1921,7 @@ cMenuCam::cMenuCam(cCamSlot *CamSlot)
   lastCamExchange = time(NULL);
   SetNeedsFastResponse(true);
   QueryCam();
+  CamMenuIsOpen = true;
 }
 
 cMenuCam::~cMenuCam()
@@ -1930,6 +1933,7 @@ cMenuCam::~cMenuCam()
      ciEnquiry->Abort();
   delete ciEnquiry;
   free(input);
+  CamMenuIsOpen = false;
 }
 
 void cMenuCam::GenerateTitle(const char *s)
@@ -2075,6 +2079,11 @@ cOsdObject *CamControl(void)
   return NULL;
 }
 
+bool CamMenuActive(void)
+{
+  return CamMenuIsOpen;
+}
+
 // --- cMenuRecording --------------------------------------------------------
 
 class cMenuRecording : public cOsdMenu {
@@ -2247,6 +2256,7 @@ void cMenuRecordings::Set(bool Refresh)
         }
      }
   Clear();
+  GetRecordingsSortMode(DirectoryName());
   Recordings.Sort();
   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
       if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
@@ -2272,6 +2282,17 @@ void cMenuRecordings::Set(bool Refresh)
      Display();
 }
 
+cString cMenuRecordings::DirectoryName(void)
+{
+  cString d(VideoDirectory);
+  if (base) {
+     char *s = ExchangeChars(strdup(base), true);
+     d = AddDirectory(d, s);
+     free(s);
+     }
+  return d;
+}
+
 cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
 {
   cRecording *recording = Recordings.GetByName(Item->FileName());
@@ -2417,6 +2438,15 @@ eOSState cMenuRecordings::Commands(eKeys Key)
   return osContinue;
 }
 
+eOSState cMenuRecordings::Sort(void)
+{
+  if (HasSubMenu())
+     return osContinue;
+  IncRecordingsSortMode(DirectoryName());
+  Set(true);
+  return osContinue;
+}
+
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
   bool HadSubMenu = HasSubMenu();
@@ -2431,6 +2461,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kYellow: return Delete();
        case kInfo:
        case kBlue:   return Info();
+       case k0:      return Sort();
        case k1...k9: return Commands(Key);
        case kNone:   if (Recordings.StateChanged(recordingsState))
                         Set(true);
@@ -3127,6 +3158,7 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"),              &data.ChannelsWrap));
+  Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Show channel names with source"), &data.ShowChannelNamesWithSource));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"),             &data.EmergencyExit));
 }
 
@@ -4149,6 +4181,20 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
         Recordings.AddByName(fileName);
+        if (Timer && !Timer->IsSingleEvent()) {
+           char *Directory = strdup(fileName);
+           // going up two directory levels to get the series folder
+           if (char *p = strrchr(Directory, '/')) {
+              while (p > Directory && *--p != '/')
+                    ;
+              *p = 0;
+              if (!HasRecordingsSortMode(Directory)) {
+                 dsyslog("setting %s to be sorted by time", Directory);
+                 SetRecordingsSortMode(Directory, rsmTime);
+                 }
+              }
+           free(Directory);
+           }
         return;
         }
      else
diff --git a/menu.h b/menu.h
index 99f88d0b9..ba93c5d21 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.9 2012/05/12 11:48:04 kls Exp $
+ * $Id: menu.h 2.11 2012/06/13 11:23:11 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -187,6 +187,7 @@ class cDisplaySubtitleTracks : public cOsdObject {
   };
 
 cOsdObject *CamControl(void);
+bool CamMenuActive(void);
 
 class cMenuRecordingItem;
 
@@ -203,8 +204,10 @@ class cMenuRecordings : public cOsdMenu {
   eOSState Rewind(void);
   eOSState Delete(void);
   eOSState Info(void);
+  eOSState Sort(void);
   eOSState Commands(eKeys Key = kNone);
 protected:
+  cString DirectoryName(void);
   cRecording *GetRecording(cMenuRecordingItem *Item);
 public:
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
diff --git a/osd.c b/osd.c
index 37ee310ea..d82a27bc4 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.31 2012/06/02 13:32:38 kls Exp $
+ * $Id: osd.c 2.32 2012/06/09 14:37:24 kls Exp $
  */
 
 #include "osd.h"
@@ -130,7 +130,7 @@ void cPalette::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
      antiAliasGranularity = MAXNUMCOLORS - 1;
   else {
      int ColorsForBlending = MAXNUMCOLORS - FixedColors;
-     int ColorsPerBlend = ColorsForBlending / BlendColors + 2; // +2 = the full foreground and background colors, which are amoung the fixed colors
+     int ColorsPerBlend = ColorsForBlending / BlendColors + 2; // +2 = the full foreground and background colors, which are among the fixed colors
      antiAliasGranularity = double(MAXNUMCOLORS - 1) / (ColorsPerBlend - 1);
      }
 }
diff --git a/po/ar.po b/po/ar.po
index 414e6b674..ddfc50a6a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1146,6 +1146,9 @@ msgstr "فعل الصوت"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "كسابق"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "خروج طارىء"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index cd017b225..ce13921cf 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Volum inicial"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sortida d'emerg�ncia"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2feacbed8..96193613c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1121,6 +1121,9 @@ msgstr "Hlasitost po spuštění"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Nouzové ukončení"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index b5681b044..5a463b9e1 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Lydstyrke ved opstart"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "N�dudgang"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 088dbaf6c..20a54765b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Lautst
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Rundum zappen"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr "Kanalnamen mit Quelle anzeigen"
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Notausstieg"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index bb53086ff..d27af7e58 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 93ca6693e..f38ce2f14 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Volumen inicial"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Salida de emergencia"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index cfd61f0d1..b136d37e8 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Helitugevus käivitamisel"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalite ringkerimine"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Hädaväljumine"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index af24f8132..aa76eef35 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Äänenvoimakkuus käynnistettäessä"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanavien rullaus"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Käytä hätäsammutusta"
 
@@ -1277,22 +1280,22 @@ msgid "Classic VDR"
 msgstr "Klassinen VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "LEVY"
 
 msgid "LOAD"
-msgstr ""
+msgstr "KUORMA"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "AJASTIMET"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "LAITTEET"
 
 msgid "LIVE"
-msgstr ""
+msgstr "LIVE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "TOISTO"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsoli"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 44b2fa304..451cf565c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1125,6 +1125,9 @@ msgstr "Volume initial"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Arr�t d'urgence"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 541c64e77..6fddf87a0 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1121,6 +1121,9 @@ msgstr "Po
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izlaz u slu�aju nu�de"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c7814ee05..71047a3bc 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1123,6 +1123,9 @@ msgstr "Hanger
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Csatornalista g�rget�se"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "V�szle�ll�t�s"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 8027cb2eb..03cfbe13a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
-"PO-Revision-Date: 2012-03-19 01:08+0100\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"PO-Revision-Date: 2012-06-06 22:50+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -925,7 +925,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Scheda DVB primaria"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Modalità base"
 
 msgid "Setup.DVB$Video format"
 msgstr "Formato video"
@@ -1126,6 +1126,9 @@ msgstr "Volume iniziale"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Riavvolgimento canali"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Uscita di emergenza"
 
@@ -1281,22 +1284,22 @@ msgid "Classic VDR"
 msgstr "VDR Classico"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISCO"
 
 msgid "LOAD"
-msgstr ""
+msgstr "CARICA"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TIMER"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "SCHEDE"
 
 msgid "LIVE"
-msgstr ""
+msgstr "DAL VIVO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "RIPRODUCI"
 
 msgid "ST:TNG Panels"
 msgstr "Consolle ST:TNG"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 03d3508f7..98b8a687e 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Garsas įjungimo metu"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalų pridengimas"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Avarinis išėjimas"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index e62fac886..a767aca3e 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Почетна јачина на звук"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Премотување канали"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Итен излез"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9d1fcde87..a312fdc03 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1123,6 +1123,9 @@ msgstr "Opstartvolume"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Nooduitgang"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 44940e075..2612be247 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr ""
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 90a1762e8..166b35b2d 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Pocz
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Wyj�cie awaryjne"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index c2017619e..da11c0788 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Volume inicial"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Retroceder canais"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sa�da de emerg�ncia"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 64aadc8ea..3f6d1e156 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Volumul la pornire"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Lista de canale �n bucl�"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Oprire de urgen��"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f3cd5c33b..4ed78010a 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "��������� �����"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 985435d2e..069fd55cd 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Hlasitos
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Prep�na� z prv�ho na posledn� a opa�ne"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "N�dzov� ukon�enie"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 8b25fc304..5bb6b9b1e 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Privzeta glasnost"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izhod v sili"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 39bc9d242..4be71c531 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1143,6 +1143,9 @@ msgstr "Po
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanal spakovan"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izlaz u slu�aju nu�de"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 7987755a2..4e9989330 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Ljudstyrka vid uppstart"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Of�rutsedd avslutning"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 163b82315..d38761a4d 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "A
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Acil c�k��"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 588cf7a14..5ec4a0b56 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Гучність при включенні"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Кінець каналів"
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Аварійний вихід"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d0879467a..0c1e18b40 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "初始化声音"
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "突发事件退出"
 
diff --git a/recording.c b/recording.c
index 2a73645c6..d13225be0 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.56 2012/06/03 09:51:27 kls Exp $
+ * $Id: recording.c 2.57 2012/06/09 13:57:30 kls Exp $
  */
 
 #include "recording.h"
@@ -53,6 +53,8 @@
 #define INFOFILESUFFIX    "/info"
 #define MARKSFILESUFFIX   "/marks"
 
+#define SORTMODEFILE      ".sort"
+
 #define MINDISKSPACE 1024 // MB
 
 #define REMOVECHECKDELTA   60 // seconds between checks for removing deleted files
@@ -610,7 +612,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
 {
   resume = RESUME_NOT_INITIALIZED;
   titleBuffer = NULL;
-  sortBuffer = NULL;
+  sortBufferName = sortBufferTime = NULL;
   fileName = NULL;
   name = NULL;
   fileSizeMB = -1; // unknown
@@ -683,7 +685,7 @@ cRecording::cRecording(const char *FileName)
   numFrames = -1;
   deleted = 0;
   titleBuffer = NULL;
-  sortBuffer = NULL;
+  sortBufferName = sortBufferTime = NULL;
   FileName = fileName = strdup(FileName);
   if (*(fileName + strlen(fileName) - 1) == '/')
      *(fileName + strlen(fileName) - 1) = 0;
@@ -795,7 +797,8 @@ cRecording::cRecording(const char *FileName)
 cRecording::~cRecording()
 {
   free(titleBuffer);
-  free(sortBuffer);
+  free(sortBufferName);
+  free(sortBufferTime);
   free(fileName);
   free(name);
   delete info;
@@ -816,22 +819,27 @@ char *cRecording::StripEpisodeName(char *s)
            }
         t++;
         }
-  if (s1 && s2)
-     memmove(s1 + 1, s2, t - s2 + 1);
+  if (s1 && s2) {
+     s1++;
+     memmove(s1, s2, t - s2 + 1);
+     *s1 = 0xFF; // sorts folders before plain recordings
+     }
   return s;
 }
 
 char *cRecording::SortName(void) const
 {
-  if (!sortBuffer) {
-     char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+  char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
+  if (!*sb) {
+     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory) + 1)
+                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
      strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
-     sortBuffer = MALLOC(char, l);
-     strxfrm(sortBuffer, s, l);
+     *sb = MALLOC(char, l);
+     strxfrm(*sb, s, l);
      free(s);
      }
-  return sortBuffer;
+  return *sb;
 }
 
 int cRecording::GetResume(void) const
@@ -2133,3 +2141,39 @@ int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max)
      LOG_ERROR;
   return r;
 }
+
+// --- Recordings Sort Mode --------------------------------------------------
+
+eRecordingsSortMode RecordingsSortMode = rsmName;
+
+bool HasRecordingsSortMode(const char *Directory)
+{
+  return access(AddDirectory(Directory, SORTMODEFILE), R_OK) == 0;
+}
+
+void GetRecordingsSortMode(const char *Directory)
+{
+  if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) {
+     char buf[8];
+     if (fgets(buf, sizeof(buf), f))
+        RecordingsSortMode = eRecordingsSortMode(constrain(atoi(buf), 0, int(rsmTime)));
+     fclose(f);
+     }
+}
+
+void SetRecordingsSortMode(const char *Directory, eRecordingsSortMode SortMode)
+{
+  if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "w")) {
+     fputs(cString::sprintf("%d\n", SortMode), f);
+     fclose(f);
+     }
+}
+
+void IncRecordingsSortMode(const char *Directory)
+{
+  GetRecordingsSortMode(Directory);
+  RecordingsSortMode = eRecordingsSortMode(int(RecordingsSortMode) + 1);
+  if (RecordingsSortMode > rsmTime)
+     RecordingsSortMode = eRecordingsSortMode(0);
+  SetRecordingsSortMode(Directory, RecordingsSortMode);
+}
diff --git a/recording.h b/recording.h
index 56659edc6..8e7123069 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.33 2012/06/03 09:49:09 kls Exp $
+ * $Id: recording.h 2.34 2012/06/09 13:55:22 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -83,7 +83,8 @@ class cRecording : public cListObject {
 private:
   mutable int resume;
   mutable char *titleBuffer;
-  mutable char *sortBuffer;
+  mutable char *sortBufferName;
+  mutable char *sortBufferTime;
   mutable char *fileName;
   mutable char *name;
   mutable int fileSizeMB;
@@ -333,4 +334,11 @@ char *ExchangeChars(char *s, bool ToFileSystem);
 
 bool GenerateIndex(const char *FileName);
 
+enum eRecordingsSortMode { rsmName, rsmTime };
+extern eRecordingsSortMode RecordingsSortMode;
+bool HasRecordingsSortMode(const char *Directory);
+void GetRecordingsSortMode(const char *Directory);
+void SetRecordingsSortMode(const char *Directory, eRecordingsSortMode SortMode);
+void IncRecordingsSortMode(const char *Directory);
+
 #endif //__RECORDING_H
diff --git a/skinlcars.c b/skinlcars.c
index a60292371..5937efe6a 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.2 2012/06/03 10:17:00 kls Exp $
+ * $Id: skinlcars.c 2.13 2012/06/13 13:27:31 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -76,11 +76,11 @@ static cTheme Theme;
 // Color domains:
 
 #define CLR_BACKGROUND      0x99000000
-#define CLR_MAIN_FRAME      0xFFF1DF6F
-#define CLR_CHANNEL_FRAME   0xFFFFCC99
+#define CLR_MAIN_FRAME      0xFFFF9966
+#define CLR_CHANNEL_FRAME   0xFF8A9EC9
 #define CLR_REPLAY_FRAME    0xFFCC6666
 #define CLR_DATE            0xFF99CCFF
-#define CLR_MENU_ITEMS      0xFFFFBC57
+#define CLR_MENU_ITEMS      0xFF9999FF
 #define CLR_TIMER           0xFF99CCFF
 #define CLR_DEVICE          0xFFF1B1AF
 #define CLR_CHANNEL_NAME    0xFF99CCFF
@@ -93,10 +93,10 @@ static cTheme Theme;
 #define CLR_ALERT           0xFFFF0000
 #define CLR_EXPOSED         0xFF990000
 #define CLR_WHITE           0xFFFFFFFF
-#define CLR_RED             0xFFB20000
-#define CLR_GREEN           0xFF00B200
-#define CLR_YELLOW          0xFFB2B200
-#define CLR_BLUE            0xFF0000B2
+#define CLR_RED             0xFFCC6666
+#define CLR_GREEN           0xFFA0FF99
+#define CLR_YELLOW          0xFFF1DF60
+#define CLR_BLUE            0xFF9A99FF
 #define CLR_BLACK           0xFF000000
 
 // General colors:
@@ -122,24 +122,24 @@ THEME_CLR(Theme, clrEventDescription,       CLR_TEXT);
 
 // Buttons:
 
-THEME_CLR(Theme, clrButtonRedFg,            CLR_WHITE);
+THEME_CLR(Theme, clrButtonRedFg,            CLR_BLACK);
 THEME_CLR(Theme, clrButtonRedBg,            CLR_RED);
 THEME_CLR(Theme, clrButtonGreenFg,          CLR_BLACK);
 THEME_CLR(Theme, clrButtonGreenBg,          CLR_GREEN);
 THEME_CLR(Theme, clrButtonYellowFg,         CLR_BLACK);
 THEME_CLR(Theme, clrButtonYellowBg,         CLR_YELLOW);
-THEME_CLR(Theme, clrButtonBlueFg,           CLR_WHITE);
+THEME_CLR(Theme, clrButtonBlueFg,           CLR_BLACK);
 THEME_CLR(Theme, clrButtonBlueBg,           CLR_BLUE);
 
 // Messages:
 
-THEME_CLR(Theme, clrMessageStatusFg,        CLR_WHITE);
+THEME_CLR(Theme, clrMessageStatusFg,        CLR_BLACK);
 THEME_CLR(Theme, clrMessageStatusBg,        CLR_BLUE);
 THEME_CLR(Theme, clrMessageInfoFg,          CLR_BLACK);
 THEME_CLR(Theme, clrMessageInfoBg,          CLR_GREEN);
 THEME_CLR(Theme, clrMessageWarningFg,       CLR_BLACK);
 THEME_CLR(Theme, clrMessageWarningBg,       CLR_YELLOW);
-THEME_CLR(Theme, clrMessageErrorFg,         CLR_WHITE);
+THEME_CLR(Theme, clrMessageErrorFg,         CLR_BLACK);
 THEME_CLR(Theme, clrMessageErrorBg,         CLR_RED);
 
 // Volume:
@@ -166,11 +166,11 @@ THEME_CLR(Theme, clrMenuTitle,              CLR_MAIN_FRAME);
 THEME_CLR(Theme, clrMenuMainBracket,        CLR_MENU_ITEMS);
 THEME_CLR(Theme, clrMenuTimerRecording,     CLR_DEVICE);
 THEME_CLR(Theme, clrMenuDeviceRecording,    CLR_TIMER);
-THEME_CLR(Theme, clrMenuItemCurrentFg,      CLR_BLACK);
-THEME_CLR(Theme, clrMenuItemCurrentBg,      CLR_MENU_ITEMS);
+THEME_CLR(Theme, clrMenuItemCurrentFg,      CLR_MAIN_FRAME);
+THEME_CLR(Theme, clrMenuItemCurrentBg,      RgbShade(CLR_MENU_ITEMS, -0.5));
 THEME_CLR(Theme, clrMenuItemSelectable,     CLR_MENU_ITEMS);
 THEME_CLR(Theme, clrMenuItemNonSelectable,  CLR_TEXT);
-THEME_CLR(Theme, clrMenuScrollbarTotal,     CLR_MENU_ITEMS);
+THEME_CLR(Theme, clrMenuScrollbarTotal,     RgbShade(CLR_MAIN_FRAME, 0.2));
 THEME_CLR(Theme, clrMenuScrollbarShown,     CLR_SEEN);
 THEME_CLR(Theme, clrMenuScrollbarArrow,     CLR_BLACK);
 THEME_CLR(Theme, clrMenuText,               CLR_TEXT);
@@ -515,7 +515,7 @@ void cSkinLCARSDisplayChannel::SetChannel(const cChannel *Channel, int Number)
   else if (Number)
      ChNumber = cString::sprintf("%d-", Number);
   else
-     ChName = ChannelString(NULL, NULL);
+     ChName = ChannelString(NULL, 0);
   osd->DrawText(xc00, yc00, ChNumber, Theme.Color(clrChannelFrameFg), frameColor, tallFont, xc02 - xc00, yc02 - yc00, taTop | taRight | taBorder);
   osd->DrawText(xc03, yc00, ChName, Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xi - xc03 - lineHeight, 0, taTop | taLeft);
   lastSignalDisplay = 0;
@@ -548,14 +548,30 @@ void cSkinLCARSDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fo
 void cSkinLCARSDisplayChannel::SetMessage(eMessageType Type, const char *Text)
 {
   if (Text) {
-     int y0 = yc11 - ShowSeenExtent;
-     int y1 = yc11;
-     osd->SaveRegion(xc06, y0, xc13 - 1, yc12 - 1);
-     osd->DrawRectangle(xc06, y0, xc07, y1 - 1, Theme.Color(clrBackground)); // clears the "seen" bar
-     osd->DrawText(xc06, yc11, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), xc13 - xc06, yc12 - yc11, taCenter);
+     int x0, x1, y0, y1, y2;
+     if (withInfo) {
+        x0 = xc06;
+        x1 = xc13;
+        y0 = yc11 - ShowSeenExtent;
+        y1 = yc11;
+        y2 = yc12;
+        }
+     else {
+        x0 = xc03;
+        x1 = xc13;
+        y0 = y1 = yc00;
+        y2 = yc02;
+        }
+     osd->SaveRegion(x0, y0, x1 - 1, y2 - 1);
+     if (withInfo)
+        osd->DrawRectangle(xc06, y0, xc07, y1 - 1, Theme.Color(clrBackground)); // clears the "seen" bar
+     osd->DrawText(x0, y1, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), x1 - x0, y2 - y1, taCenter);
+     message = true;
      }
-  else
+  else {
      osd->RestoreRegion();
+     message = false;
+     }
 }
 
 void cSkinLCARSDisplayChannel::Flush(void)
@@ -566,16 +582,16 @@ void cSkinLCARSDisplayChannel::Flush(void)
         DrawTrack();
         DrawDevice();
         DrawSignal();
+        int Current = 0;
+        int Total = 0;
+        if (present) {
+           time_t t = time(NULL);
+           if (t > present->StartTime())
+              Current = t - present->StartTime();
+           Total = present->Duration();
+           }
+        DrawSeen(Current, Total);
         }
-     int Current = 0;
-     int Total = 0;
-     if (present) {
-        time_t t = time(NULL);
-        if (t > present->StartTime())
-           Current = t - present->StartTime();
-        Total = present->Duration();
-        }
-     DrawSeen(Current, Total);
      }
   osd->Flush();
   initial = false;
@@ -928,7 +944,7 @@ void cSkinLCARSDisplayMenu::DrawMainButton(const char *Text, int x0, int x1, int
 {
   int h = y1 - y0;
   osd->DrawEllipse(x0, y0, x1 - 1, y1 - 1, ColorBg, 7);
-  osd->DrawText(x1 + Gap, y0, Text, ColorFg, ColorBg, Font, x2 - x1 - Gap, h, taBottom | taRight);
+  osd->DrawText(x1, y0, Text, ColorFg, ColorBg, Font, x2 - x1, h, taBottom | taRight);
   osd->DrawEllipse(x2, y0, x3 - 1, y1 - 1, ColorBg, 5);
 }
 
@@ -1149,6 +1165,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
      osd->DrawRectangle(xs07, ys04, xs13 - 1, ys05 - 1, Theme.Color(clrBackground));
      cSortedTimers SortedTimers;
      cVector<int> FreeDeviceSlots;
+     int NumDevices = 0;
      int y = ys04;
      // Timers and recording devices:
      while (1) {
@@ -1167,6 +1184,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
                               Device = RecordControl->Device();
                               deviceOffset[Device->DeviceNumber()] = y;
                               deviceRecording[Device->DeviceNumber()] = true;
+                              NumDevices++;
                               }
                            else
                               FreeDeviceSlots.Append(y);
@@ -1177,7 +1195,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
                         }
                      SortedTimers[i] = NULL;
                      }
-                  else if (!Device) {
+                  else if (!Device && Timer->HasFlags(tfActive)) {
                      DrawTimer(Timer, y, false);
                      FreeDeviceSlots.Append(y);
                      y += lineHeight + Gap;
@@ -1192,20 +1210,29 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
      int Slot = 0;
      for (int i = 0; i < cDevice::NumDevices(); i++) {
          if (const cDevice *Device = cDevice::GetDevice(i)) {
-            if (!deviceRecording[Device->DeviceNumber()]) {
-               if (Slot < FreeDeviceSlots.Size()) {
-                  y = FreeDeviceSlots[Slot];
-                  Slot++;
+            if (Device->NumProvidedSystems()) {
+               if (!deviceRecording[Device->DeviceNumber()]) {
+                  if (Slot < FreeDeviceSlots.Size()) {
+                     y = FreeDeviceSlots[Slot];
+                     Slot++;
+                     }
+                  if (y + lineHeight > ys05)
+                     break;
+                  deviceOffset[Device->DeviceNumber()] = y;
+                  y += lineHeight + Gap;
+                  NumDevices++;
                   }
-               if (y + lineHeight > ys05)
-                  break;
-               deviceOffset[Device->DeviceNumber()] = y;
-               y += lineHeight + Gap;
                }
             }
          }
-     osd->DrawText(xs02, ys00, itoa(Timers.Count()), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder);
-     osd->DrawText(xs08, ys00, itoa(cDevice::NumDevices()), Theme.Color(clrMenuFrameFg), frameColor, font, xs09 - xs08, ys01 - ys00, taBottom | taRight | taBorder);
+     // Total number of active timers:
+     int NumTimers = 0;
+     for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+         if (Timer->HasFlags(tfActive))
+            NumTimers++;
+         }
+     osd->DrawText(xs02, ys00, itoa(NumTimers), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder);
+     osd->DrawText(xs08, ys00, itoa(NumDevices), Theme.Color(clrMenuFrameFg), frameColor, font, xs09 - xs08, ys01 - ys00, taBottom | taRight | taBorder);
      lastSignalDisplay = 0;
      initial = true; // forces redrawing of devices
      }
@@ -1231,8 +1258,10 @@ void cSkinLCARSDisplayMenu::DrawDevice(const cDevice *Device)
 void cSkinLCARSDisplayMenu::DrawDevices(void)
 {
   for (int i = 0; i < cDevice::NumDevices(); i++) {
-      if (const cDevice *Device = cDevice::GetDevice(i))
-         DrawDevice(Device);
+      if (const cDevice *Device = cDevice::GetDevice(i)) {
+         if (Device->NumProvidedSystems())
+            DrawDevice(Device);
+         }
       }
 }
 
@@ -1247,10 +1276,24 @@ void cSkinLCARSDisplayMenu::DrawLiveIndicator(void)
      if (lastLiveIndicatorY >= 0)
         osd->DrawRectangle(xs12, lastLiveIndicatorY, xs13 - 1, lastLiveIndicatorY + lineHeight - 1, Theme.Color(clrBackground));
      if (y >= 0) {
-        osd->DrawRectangle(xs12, y, xs12 + lineHeight / 2 - 1, y + lineHeight - 1, frameColor);
-        osd->DrawEllipse  (xs12 + lineHeight / 2, y, xs13 - 1, y + lineHeight - 1, frameColor, 5);
-        if (Transferring)
-           osd->DrawBitmap((xs12 + xs13 - bmTransferMode.Width()) / 2, y + (lineHeight - bmTransferMode.Height()) / 2, bmTransferMode, Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg));
+        tColor ColorBg = Theme.Color(clrChannelFrameBg);
+        osd->DrawRectangle(xs12, y, xs12 + lineHeight / 2 - 1, y + lineHeight - 1, ColorBg);
+        osd->DrawEllipse  (xs12 + lineHeight / 2, y, xs13 - 1, y + lineHeight - 1, ColorBg, 5);
+        if (Transferring) {
+           int w = bmTransferMode.Width();
+           int h = bmTransferMode.Height();
+           int b = w * w + h * h; // the diagonal of the bitmap (squared)
+           int c = lineHeight * lineHeight; // the diameter of the circle (squared)
+           const cBitmap *bm = &bmTransferMode;
+           if (b > c) {
+              // the bitmap doesn't fit, so scale it down:
+              double f = sqrt(double(c) / (2 * b));
+              bm = bmTransferMode.Scaled(f, f);
+              }
+           osd->DrawBitmap((xs12 + xs13 - bm->Width()) / 2, y + (lineHeight - bm->Height()) / 2, *bm, Theme.Color(clrChannelFrameFg), ColorBg);
+           if (bm != &bmTransferMode)
+              delete bm;
+           }
         }
      lastLiveIndicatorY = y;
      lastLiveIndicatorTransferring = Transferring;
@@ -1263,8 +1306,10 @@ void cSkinLCARSDisplayMenu::DrawSignals(void)
   if (initial || Now - lastSignalDisplay >= SIGNALDISPLAYDELTA) {
      for (int i = 0; i < cDevice::NumDevices(); i++) {
          if (const cDevice *Device = cDevice::GetDevice(i)) {
-            if (int y = deviceOffset[i])
-               DrawDeviceSignal(osd, Device, xs + lineHeight / 2, y, xs11, y + lineHeight, lastSignalStrength[i], lastSignalQuality[i], initial);
+            if (Device->NumProvidedSystems()) {
+               if (int y = deviceOffset[i])
+                  DrawDeviceSignal(osd, Device, xs + lineHeight / 2, y, xs11, y + lineHeight, lastSignalStrength[i], lastSignalQuality[i], initial);
+               }
             }
          }
      lastSignalDisplay = Now;
@@ -1772,7 +1817,7 @@ void cSkinLCARSDisplayReplay::SetMessage(eMessageType Type, const char *Text)
 {
   if (Text) {
      osd->SaveRegion(xp06, yp08, xp13 - 1, yp09 - 1);
-     osd->DrawText(xp06, yp08, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), xp13 - xp06, 0, taCenter);
+     osd->DrawText(xp06, yp08, Text, Theme.Color(clrMessageStatusFg + 2 * Type), Theme.Color(clrMessageStatusBg + 2 * Type), cFont::GetFont(fontSml), xp13 - xp06, yp09 - yp08, taCenter);
      }
   else
      osd->RestoreRegion();
@@ -2060,7 +2105,7 @@ void cSkinLCARSDisplayMessage::SetMessage(eMessageType Type, const char *Text)
   osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
   osd->DrawEllipse  (x0, y0, x1 - 1, y1 - 1, ColorBg, 7);
   osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, ColorBg);
-  osd->DrawText(x3, y0, Text, ColorFg, ColorBg, cFont::GetFont(fontOsd), x4 - x3, 0, taCenter);
+  osd->DrawText(x3, y0, Text, ColorFg, ColorBg, cFont::GetFont(fontSml), x4 - x3, y1 - y0, taCenter);
   osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, ColorBg);
   osd->DrawRectangle(x6, y0, x7 - 1, y1 - 1, clrTransparent);
   osd->DrawEllipse  (x6, y0, x7 - 1, y1 - 1, ColorBg, 5);
diff --git a/sources.h b/sources.h
index 6b362e389..516a3edca 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 2.3 2010/03/07 13:53:11 kls Exp $
+ * $Id: sources.h 2.4 2012/06/17 11:19:23 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -33,6 +33,7 @@ class cSource : public cListObject {
   int Code(void) const { return code; }
   const char *Description(void) const { return description; }
   bool Parse(const char *s);
+  static char ToChar(int Code) { return (Code & st_Mask) >> 24; }
   static cString ToString(int Code);
   static int FromString(const char *s);
   static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
diff --git a/timers.c b/timers.c
index 4634c1c25..c4f4f7af1 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.9 2012/04/25 09:02:03 kls Exp $
+ * $Id: timers.c 2.11 2012/06/09 14:37:24 kls Exp $
  */
 
 #include "timers.h"
@@ -280,7 +280,7 @@ bool cTimer::Parse(const char *s)
   free(aux);
   aux = NULL;
   //XXX Apparently sscanf() doesn't work correctly if the last %a argument
-  //XXX results in an empty string (this first occured when the EIT gathering
+  //XXX results in an empty string (this first occurred when the EIT gathering
   //XXX was put into a separate thread - don't know why this happens...
   //XXX As a cure we copy the original string and add a blank.
   //XXX If anybody can shed some light on why sscanf() failes here, I'd love
@@ -829,7 +829,7 @@ static int CompareTimers(const void *a, const void *b)
 }
 
 cSortedTimers::cSortedTimers(void)
-:cVector(Timers.Count())
+:cVector<const cTimer *>(Timers.Count())
 {
   for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
       Append(Timer);
diff --git a/vdr.c b/vdr.c
index 3fcb6757d..c075dbebe 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.36 2012/04/26 09:23:41 kls Exp $
+ * $Id: vdr.c 2.37 2012/06/13 11:28:41 kls Exp $
  */
 
 #include <getopt.h>
@@ -570,7 +570,6 @@ int main(int argc, char *argv[])
   int MaxLatencyTime = 0;
   bool InhibitEpgScan = false;
   bool IsInfoMenu = false;
-  bool CheckHasProgramme = false;
   cSkin *CurrentSkin = NULL;
 
   // Load plugins:
@@ -761,7 +760,7 @@ int main(int argc, char *argv[])
         // Make sure we have a visible programme in case device usage has changed:
         if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
            static time_t lastTime = 0;
-           if ((!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
+           if (!CamMenuActive() && Now - lastTime > MINCHANNELWAIT) { // !CamMenuActive() to avoid interfering with the CAM if a CAM menu is open
               cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
               if (Channel && (Channel->Vpid() || Channel->Apid(0) || Channel->Dpid(0))) {
                  if (cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(Channel->Number())) // try to switch to the original channel...
@@ -774,7 +773,6 @@ int main(int argc, char *argv[])
                  }
               lastTime = Now; // don't do this too often
               LastTimerChannel = -1;
-              CheckHasProgramme = false;
               }
            }
         // Update the OSD size:
@@ -1140,7 +1138,6 @@ int main(int argc, char *argv[])
                             DELETE_MENU;
                             cControl::Shutdown();
                             Menu = new cMenuMain(osRecordings);
-                            CheckHasProgramme = true; // to have live tv after stopping replay with 'Back'
                             break;
              case osReplay: DELETE_MENU;
                             cControl::Shutdown();
diff --git a/videodir.c b/videodir.c
index 870b4cba1..5f94d332d 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 2.1 2012/04/22 15:03:10 kls Exp $
+ * $Id: videodir.c 2.2 2012/06/10 13:45:21 kls Exp $
  */
 
 #include "videodir.h"
@@ -261,7 +261,7 @@ bool cVideoDiskUsage::HasChanged(int &State)
      if (FreeMB != freeMB) {
         usedPercent = UsedPercent;
         freeMB = FreeMB;
-        int MBperMinute = Recordings.MBperMinute();
+        double MBperMinute = Recordings.MBperMinute();
         if (MBperMinute <= 0)
            MBperMinute = MB_PER_MINUTE;
         freeMinutes = int(double(FreeMB) / MBperMinute);

From d34026c18b6cf0eddd7293ad9af57affacb73365 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Mon, 10 Sep 2012 16:05:00 +0200
Subject: [PATCH 216/307] Version 1.7.30 VDR developer version 1.7.30 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.30.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.29-1.7.30.diff

MD5 checksums:

c6d75f2962bc3e22d9313c0ee4fa113a  vdr-1.7.30.tar.bz2
a63098efcc58bc697d6b890097d9c370  vdr-1.7.29-1.7.30.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The default skin "LCARS" displays the signal strengths and qualities of
all devices in its main menu. For devices that have an stb0899 frontend chip
(like the TT-budget S2-3200) retrieving this information from the driver is
rather slow, which results in a sluggish response to user input in the main
menu. To speed this up you may want to apply the patches from

   ftp://ftp.tvdr.de/vdr/Developer/Driver-Patches

to the LinuxDVB driver source.

From the HISTORY file:
- Fixed sorting recordings in the top level video directory.
- Fixed handling control characters in SI data in case of UTF-8 encoded strings
   (thanks to Mehdi Karamnejad for reporting a problem with garbled UTF-8 EPG data
   and helping to debug it).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- When checking whether a video directory is empty, file names that start with a
   dot ('.') are now ignored and will be implicitly removed if the directory contains
   no other files. This fixes the leftover ".sort" files that were introduced in
   version 1.7.29.
- Added IsUpdate() to the EPG handler interface (thanks to Jörg Wendel).
- Fixed detecting transfer mode on full featured DVB cards (thanks to Stefan Huelswitt
   for reporting a problem with updating CA descriptors in such cases).
- Fixed a race condition when zapping in transfer mode (reported by Reinhard Nissl).
   This involves a slight change in the semantics of the cReceiver::Activate() function,
   which is now called with 'false' after the receiver has been detached from the
   device.
- The new function cDevice::ReadFilter() can be used by devices to implement their
   own way of retrieving section filter data (thanks to Deti Fliegl).
- The new function cDevice::HasInternalCam() can be implemented by devices that
   provide encrypted channels in an already decrypted form, without requiring explicit
   handling of a CAM (thanks to Tobias Grimm).
- VDR can now be built according to the FHS ("File system Hierarchy Standard") by
   activating the line
   #USEFHS = 1
   in a copy of the file Make.config.template (thanks to Dennis Bendlin, as well as
   Christopher Reimer and Udo Richter for contributing to the patch).
- By default (without FHS support) the config directory is now set to the value
   given in the -v option if only -v and no -c is given.
- Fixed a long delay at the end when replaying a recording that has stopped recording
   less than an hour ago (typically time shift mode or a freshly edited recording).
- Fixed getting the file size and number of frames of ongoing recordings (only the
   timestamp of the recording's directory was checked, while it should have been that
   of the index file).
- Fixed sluggish response when manipulating editing marks while a cutting thread
   is running (reported by Torsten Lang).
- The new setup options "OSD/Color key [0123]" can be used to adjust the sequence
   of the color buttons displayed in the menus to that of the color keys on your
   remote control (based on a patch from Oliver Schinagl).
   Authors of plugins that implement skins may want to adapt their SetButtons()
   function in order to make use of this new feature. See, for instance, the function
   cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details.
---
 CONTRIBUTORS         |  24 +++++++-
 HISTORY              |  44 ++++++++++++++
 INSTALL              |   9 +++
 MANUAL               |   8 +++
 Make.config.template |  15 ++++-
 Makefile             |  34 +++++++----
 PLUGINS.html         |  73 +++++++++++++++++------
 config.c             |  14 ++++-
 config.h             |  11 ++--
 device.c             |  29 ++++++----
 device.h             |  12 +++-
 eit.c                |   4 +-
 epg.c                |  11 +++-
 epg.h                |   7 ++-
 i18n.c               |  11 ++--
 libsi/si.c           | 134 ++++++++++++++++++++++---------------------
 menu.c               |  24 +++++++-
 menu.h               |   3 +-
 plugin.c             |  39 +++++++++++--
 plugin.h             |  10 +++-
 po/ar.po             |  14 ++++-
 po/ca_ES.po          |  14 ++++-
 po/cs_CZ.po          |  14 ++++-
 po/da_DK.po          |  14 ++++-
 po/de_DE.po          |  14 ++++-
 po/el_GR.po          |  14 ++++-
 po/es_ES.po          |  14 ++++-
 po/et_EE.po          |  14 ++++-
 po/fi_FI.po          |  16 +++++-
 po/fr_FR.po          |  14 ++++-
 po/hr_HR.po          |  14 ++++-
 po/hu_HU.po          |  14 ++++-
 po/it_IT.po          |  14 ++++-
 po/lt_LT.po          |  14 ++++-
 po/mk_MK.po          |  14 ++++-
 po/nl_NL.po          |  14 ++++-
 po/nn_NO.po          |  14 ++++-
 po/pl_PL.po          |  14 ++++-
 po/pt_PT.po          |  14 ++++-
 po/ro_RO.po          |  14 ++++-
 po/ru_RU.po          |  14 ++++-
 po/sk_SK.po          |  14 ++++-
 po/sl_SI.po          |  14 ++++-
 po/sr_SR.po          |  14 ++++-
 po/sv_SE.po          |  14 ++++-
 po/tr_TR.po          |  14 ++++-
 po/uk_UA.po          |  14 ++++-
 po/zh_CN.po          |  14 ++++-
 receiver.h           |   4 +-
 recording.c          |  52 ++++++++++++++---
 recording.h          |   9 ++-
 sections.c           |   4 +-
 skinclassic.c        |  13 +++--
 skinlcars.c          |  30 +++++-----
 skinlcars.h          |   2 +-
 skinsttng.c          |  13 +++--
 tools.c              |  21 ++++++-
 vdr.1                |  10 +++-
 vdr.c                |  48 ++++++++++++----
 videodir.c           |   7 ++-
 videodir.h           |   3 +-
 61 files changed, 912 insertions(+), 214 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6512bfcbb..515c3e13c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -87,6 +87,8 @@ Deti Fliegl <deti@fliegl.de>
  for fixing setting the OSD size in the 'Confirm' interface call
  for fixing handling improper buffer lengths in the EIT parser
  for a patch that was used to implement StopSectionHandler()
+ for adding cDevice::ReadFilter() to allow devices to implement their own way of
+ retrieving section filter data
 
 Dave Chapman <dave@dchapman.com>
  for implementing support for the teletext PID
@@ -139,7 +141,7 @@ Andre Valentin <av2000@topmail.de>
 J�rgen Tvedt <pjtvedt@online.no>
  for translating OSD texts to the Norwegian language
 
-Stefan Huelswitt <huels@iname.com>
+Stefan Huelswitt <s.huelswitt@gmx.de>
  for fixing the repeat function with LIRC
  for making the position of the channel display configurable
  for making the width and height of the OSD configurable
@@ -225,6 +227,8 @@ Stefan Huelswitt <huels@iname.com>
  cStatus::MsgSetVolume() bug to react properly
  for improving the 'i18n' target in the Makefile to avoid unnecessary work
  for a patch that was used to implement the --localedir option
+ for reporting a problem with updating CA descriptors in transfer mode on full
+ featured DVB cards
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -1317,6 +1321,7 @@ Reinhard Nissl <rnissl@gmx.de>
  receive channels
  for reporting that the Transfer Mode indicator bitmap in the LCARS skin may not
  fit with small font sizes
+ for reporting a race condition when zapping in transfer mode
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1751,6 +1756,7 @@ Udo Richter <udo_richter@gmx.de>
  editing mark
  for adding the option --outputonly to the dvbsddevice plugin
  for adding a missing template specification to the c'tor of cSortedTimers
+ for contributing to a patch that implements FHS support
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2342,6 +2348,9 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for avoiding a gcc 4.6 compiler error in the skincurses plugin.
  for suggesting to move setting LC_NUMERIC further up to make sure any floating point
  numbers use a decimal point
+ for implementing cDevice::HasInternalCam(), which can be implemented by devices that
+ provide encrypted channels in an already decrypted form, without requiring explicit
+ handling of a CAM
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2467,6 +2476,7 @@ Ulf Kiener <webmaster@ulf-kiener.de>
 J�rg Wendel <vdr-ml@jwendel.de>
  for reporting that cPlugin::Active() was called too often
  for adding HandledExternally() to the EPG handler interface
+ for adding IsUpdate() to the EPG handler interface
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@@ -2766,6 +2776,7 @@ Luis Fernandes <telping@gmail.com>
 Christopher Reimer <reimer.christopher@freenet.de>
  for reporting a problem with external Dolby Digital processing via the '-a' option
  in live mode and with TS recordings
+ for contributing to a patch that implements FHS support
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -2875,6 +2886,8 @@ Torsten Lang <info@torstenlang.de>
  is stored on the video directory file system within the cRecording data
  for suppressing setting the "broken link" or "TEI" flags when cutting recordings
  if the editing point merges two seamlessly fitting parts of the same stream
+ for reporting a sluggish response when manipulating editing marks while a cutting
+ thread is running
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
@@ -2917,3 +2930,12 @@ Dirk Heiser <dirk-vdr@gmx.de>
 
 Ludi Kaleni <ludi113@hotmail.com>
  for suggesting to add the source character to channel names whenever they are displayed
+
+Mehdi Karamnejad <mehdi_karamnejad@sfu.ca>
+ for reporting a problem with garbled UTF-8 EPG data and helping to debug it
+
+Dennis Bendlin <dennisbendlin@online.de>
+ for a patch that implements FHS support
+
+Oliver Schinagl <oliver@schinagl.nl>
+ for a patch that was used to implement the setup options "OSD/Color key [0123]"
diff --git a/HISTORY b/HISTORY
index f7ca2aaa4..6dfb71766 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7190,3 +7190,47 @@ Video Disk Recorder Revision History
 - The new setup option "Miscellaneous/Show channel names with source" can be used to
   turn on adding the source character to channel names whenever they are displayed
   (suggested by Ludi Kaleni).
+
+2012-09-09: Version 1.7.30
+
+- Fixed sorting recordings in the top level video directory.
+- Fixed handling control characters in SI data in case of UTF-8 encoded strings
+  (thanks to Mehdi Karamnejad for reporting a problem with garbled UTF-8 EPG data
+  and helping to debug it).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- When checking whether a video directory is empty, file names that start with a
+  dot ('.') are now ignored and will be implicitly removed if the directory contains
+  no other files. This fixes the leftover ".sort" files that were introduced in
+  version 1.7.29.
+- Added IsUpdate() to the EPG handler interface (thanks to J�rg Wendel).
+- Fixed detecting transfer mode on full featured DVB cards (thanks to Stefan Huelswitt
+  for reporting a problem with updating CA descriptors in such cases).
+- Fixed a race condition when zapping in transfer mode (reported by Reinhard Nissl).
+  This involves a slight change in the semantics of the cReceiver::Activate() function,
+  which is now called with 'false' *after* the receiver has been detached from the
+  device.
+- The new function cDevice::ReadFilter() can be used by devices to implement their
+  own way of retrieving section filter data (thanks to Deti Fliegl).
+- The new function cDevice::HasInternalCam() can be implemented by devices that
+  provide encrypted channels in an already decrypted form, without requiring explicit
+  handling of a CAM (thanks to Tobias Grimm).
+- VDR can now be built according to the FHS ("File system Hierarchy Standard") by
+  activating the line
+  #USEFHS = 1
+  in a copy of the file Make.config.template (thanks to Dennis Bendlin, as well as
+  Christopher Reimer and Udo Richter for contributing to the patch).
+- By default (without FHS support) the config directory is now set to the value
+  given in the -v option if only -v and no -c is given.
+- Fixed a long delay at the end when replaying a recording that has stopped recording
+  less than an hour ago (typically time shift mode or a freshly edited recording).
+- Fixed getting the file size and number of frames of ongoing recordings (only the
+  timestamp of the recording's directory was checked, while it should have been that
+  of the index file).
+- Fixed sluggish response when manipulating editing marks while a cutting thread
+  is running (reported by Torsten Lang).
+- The new setup options "OSD/Color key [0123]" can be used to adjust the sequence
+  of the color buttons displayed in the menus to that of the color keys on your
+  remote control (based on a patch from Oliver Schinagl).
+  Authors of plugins that implement skins may want to adapt their SetButtons()
+  function in order to make use of this new feature. See, for instance, the function
+  cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details.
diff --git a/INSTALL b/INSTALL
index e155f9b4c..50c941e87 100644
--- a/INSTALL
+++ b/INSTALL
@@ -386,6 +386,15 @@ As a starting point you can copy the 'channels.conf' file that comes with the
 VDR archive into your video directory (or into your config directory,
 respectively, in case you have redirected it with the -c option).
 
+If you prefer to have your system set up according to the FHS
+("File system Hierarchy Standard") and thus have your files spread
+all over the place ;-), you can do this by copying the file Make.config.template
+to Make.config in the VDR source directory, and activating the line
+
+#USEFHS = 1
+
+in that file.
+
 Setting up DiSEqC:
 ------------------
 
diff --git a/MANUAL b/MANUAL
index 5d3c9a538..56a304df3 100644
--- a/MANUAL
+++ b/MANUAL
@@ -601,6 +601,14 @@ Version 1.6
                          characters in a text input field. You may want to set this
                          to "no" if you are using an actual keyboard to control VDR.
 
+  Color key 0 = 0        By default, VDR assumes that the sequence of the color
+  Color key 1 = 1        keys on the remote control is red-green-yellow-blue. If
+  Color key 2 = 2        your remote control has these keys in a different sequence,
+  Color key 3 = 3        you can adjust these parameters to reorder the corresponding
+                         color buttons in the menus accordingly. Note that this does
+                         not change the functionality of the individual keys; it only
+                         changes the sequence in which the color buttons are displayed.
+
   EPG:
 
   EPG scan timeout = 5   The time (in hours) of user inactivity after which the
diff --git a/Make.config.template b/Make.config.template
index d51e20c72..ef463b137 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.8 2012/03/20 11:20:13 kls Exp $
+# $Id: Make.config.template 2.9 2012/09/01 10:31:33 kls Exp $
 
 ### The C compiler and options:
 
@@ -28,11 +28,22 @@ PREFIX   = $(DESTDIR)/usr/local
 MANDIR   = $(PREFIX)/man
 BINDIR   = $(PREFIX)/bin
 
+# By default locale and plugin files are built under the source directory:
 LOCDIR       = ./locale
 PLUGINDIR    = ./PLUGINS
 PLUGINLIBDIR = $(PLUGINDIR)/lib
+# By default VDR requires only one single directory to operate:
 VIDEODIR     = /video
-CONFDIR      = $(VIDEODIR)
+# Activate the following line to build VDR according to the FHS ("File system Hierarchy Standard"):
+#USEFHS = 1
+ifdef USEFHS
+VIDEODIR     = /srv/vdr/video
+CONFDIR      = /var/lib/vdr
+CACHEDIR     = /var/cache/vdr
+RESDIR       = $(PREFIX)/share/vdr
+LOCDIR       = $(PREFIX)/share/locale
+PLUGINLIBDIR = $(PREFIX)/lib/vdr
+endif
 
 ### The remote control:
 
diff --git a/Makefile b/Makefile
index a0458d4fa..ba5a4587b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.27 2012/04/15 13:21:31 kls Exp $
+# $Id: Makefile 2.29 2012/09/07 14:11:37 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -27,8 +27,9 @@ INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= $(PLUGINDIR)/lib
 
-VIDEODIR = /video
-CONFDIR  = $(VIDEODIR)
+# By default VDR requires only one single directory to operate:
+VIDEODIR     = /video
+# See Make.config.template if you want to build VDR according to the FHS ("File system Hierarchy Standard")
 
 DOXYGEN ?= /usr/bin/doxygen
 DOXYFILE = Doxyfile
@@ -70,9 +71,17 @@ DEFINES += -D_GNU_SOURCE
 
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DCONFDIR=\"$(CONFDIR)\"
+DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
+DEFINES += -DRESDIR=\"$(RESDIR)\"
 DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
 DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 
+# Default values for directories:
+
+CONFDIRDEF  = $(firstword $(CONFDIR)  $(VIDEODIR))
+CACHEDIRDEF = $(firstword $(CACHEDIR) $(VIDEODIR))
+RESDIRDEF   = $(firstword $(RESDIR)   $(CONFDIRDEF))
+
 # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
@@ -109,8 +118,10 @@ $(SILIB):
 vdr.pc: Makefile Make.global
 	@echo "bindir=$(BINDIR)" > $@
 	@echo "includedir=$(INCDIR)" >> $@
-	@echo "configdir=$(CONFDIR)" >> $@
+	@echo "configdir=$(CONFDIRDEF)" >> $@
 	@echo "videodir=$(VIDEODIR)" >> $@
+	@echo "cachedir=$(CACHEDIRDEF)" >> $@
+	@echo "resdir=$(RESDIRDEF)" >> $@
 	@echo "plugindir=$(PLUGINLIBDIR)" >> $@
 	@echo "localedir=$(LOCDIR)" >> $@
 	@echo "apiversion=$(APIVERSION)" >> $@
@@ -183,7 +194,7 @@ clean-plugins:
 
 # Install the files:
 
-install: install-bin install-conf install-doc install-plugins install-i18n install-includes install-pc
+install: install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes install-pc
 
 # VDR binary:
 
@@ -193,12 +204,15 @@ install-bin: vdr
 
 # Configuration files:
 
-install-conf:
+install-dirs:
 	@mkdir -p $(DESTDIR)$(VIDEODIR)
-	@if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
-	    mkdir -p $(DESTDIR)$(CONFDIR);\
-	    cp *.conf $(DESTDIR)$(CONFDIR);\
-	    fi
+	@mkdir -p $(DESTDIR)$(CONFDIRDEF)
+	@mkdir -p $(DESTDIR)$(CACHEDIRDEF)
+	@mkdir -p $(DESTDIR)$(RESDIRDEF)
+
+install-conf:
+	@cp *.conf $(DESTDIR)$(CONFDIRDEF)
+
 
 # Documentation:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index a6b29f209..859ca705f 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -82,7 +82,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Wakeup">Wakeup</a>
 <li><a href="#Setup parameters">Setup parameters</a>
 <li><a href="#The Setup menu">The Setup menu</a>
-<li><a href="#Configuration files">Configuration files</a>
+<li><modified><a href="#Additional files">Additional files</modified></a>
 <li><a href="#Internationalization">Internationalization</a>
 <li><a href="#Custom services">Custom services</a>
 <li><a href="#SVDRP commands">SVDRP commands</a>
@@ -885,39 +885,70 @@ <h1>Table Of Contents</h1>
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<hr><h2><a name="Configuration files">Configuration files</a></h2>
+<hr><h2><modified><a name="Additional files">Additional files</a></modified></h2>
 
 <div class="blurb">I want my own stuff!</div><p>
 
-There may be situations where a plugin requires configuration files of its own, maybe
-for data that can't be stored in the simple <a href="#Setup parameters">setup parameters</a>
-of VDR, or maybe because it needs to launch other programs that simply need a separate
-configuration file. While the plugin is free to store such files anywhere it
-sees fit, it might be a good idea to put them in a common place, preferably
-where other configuration data already exists. VDR provides the function
+<modified>
+There may be situations where a plugin requires files of its own. While the plugin is
+free to store such files anywhere it sees fit, it might be a good idea to put them in a common
+place, preferably where such data already exists.
+</modified>
+<p>
+<modified>
+<i>configuration files</i>, maybe for data that can't be stored in the simple
+<a href="#Setup parameters">setup parameters</a> of VDR, or maybe because it needs to
+launch other programs that simply need a separate configuration file.
+</modified>
+<p>
+<modified>
+<i>cache files</i>, to store data so that future requests for that data can be served faster. The data
+that is stored within a cache might be values that have been computed earlier or duplicates of
+original values that are stored elsewhere.
+</modified>
+<p>
+<modified>
+<i>resource files</i>, for providing additional files, like pictures, movie clips or channel logos.
+</modified>
+<p>
+<modified>
+Threfore VDR provides the functions
 
 <p><table><tr><td class="code"><pre>
+<modified>
 const char *ConfigDirectory(const char *PluginName = NULL);
+const char *CacheDirectory(const char *PluginName = NULL);
+const char *ResourceDirectory(const char *PluginName = NULL);
+</modified>
 </pre></td></tr></table><p>
 
-which returns a string containing the directory that VDR uses for its own configuration
-files (defined through the <tt><b>-c</b></tt> option in the call to VDR), extended by
+<modified>
+each of which returns a string containing the directory that VDR uses for its own
+files (defined through the options in the call to VDR), extended by
+</modified>
 <tt>"/plugins"</tt>. So assuming the VDR configuration directory is <tt>/video</tt>
 (the default if no <tt><b>-c</b></tt> or <tt><b>-v</b></tt> option is given),
 a call to <tt>ConfigDirectory()</tt> will return <tt>/video/plugins</tt>. The first
 call to <tt>ConfigDirectory()</tt> will automatically make sure that the <tt>plugins</tt>
 subdirectory will exist. If, for some reason, this cannot be achieved, <tt>NULL</tt>
 will be returned.
+<modified>
+The behavoir of <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt> is similar.
+</modified>
 <p>
 The additional <tt>plugins</tt> directory is used to keep files from plugins apart
 from those of VDR itself, making sure there will be no name clashes. If a plugin
-needs only one extra configuration file, it is suggested that this file be named
-<tt>name.conf</tt>, where <i>name</i> shall be the name of the plugin.
+<modified>
+needs only one extra file, it is suggested that this file be named <tt>name.*</tt>,
+where <i>name</i> shall be the name of the plugin.
+</modified>
 <p>
 If a plugin needs more than one such file, it is suggested that the plugin stores
 these in a subdirectory of its own, named after the plugin. To easily get such a name
-the <tt>ConfigDirectory()</tt> function can be given an additional string that will
-be appended to the returned directory name, as in
+<modified>
+the functions can be given an additional string that will be appended to the returned
+directory name, as in
+</modified>
 
 <p><table><tr><td class="code"><pre>
 const char *MyConfigDir = ConfigDirectory(Name());
@@ -928,13 +959,16 @@ <h1>Table Of Contents</h1>
 (or return <tt>NULL</tt> in case of an error).
 <p>
 <b>
-The returned string is statically allocated and will be overwritten by subsequent
-calls to ConfigDirectory()!
+<modified>
+The returned strings are statically allocated and will be overwritten by subsequent calls!
+</modified>
 </b>
 <p>
-The <tt>ConfigDirectory()</tt> function is a static member function of the <tt>cPlugin</tt>
-class. This allows it to be called even from outside any member function of the derived
-plugin class, by writing
+<modified>
+The <tt>ConfigDirectory()</tt>, <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt>
+functions are static member functions of the <tt>cPlugin</tt> class. This allows them to be
+called even from outside any member function of the derived plugin class, by writing
+</modified>
 
 <p><table><tr><td class="code"><pre>
 const char *MyConfigDir = cPlugin::ConfigDirectory();
@@ -1888,6 +1922,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td class="code"><pre>
 virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
+<modified>virtual int ReadFilter(int Handle, void *Buffer, size_t Length);</modified>
 virtual void CloseFilter(int Handle);
 </pre></td></tr></table><p>
 
diff --git a/config.c b/config.c
index 56454dfa6..3fb4d6dc3 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.26 2012/06/17 12:27:07 kls Exp $
+ * $Id: config.c 2.27 2012/09/09 12:58:23 kls Exp $
  */
 
 #include "config.h"
@@ -418,6 +418,10 @@ cSetup::cSetup(void)
   RecordingDirs = 1;
   FoldersInTimerMenu = 1;
   NumberKeysForChars = 1;
+  ColorKey0 = 0;
+  ColorKey1 = 1;
+  ColorKey2 = 2;
+  ColorKey3 = 3;
   VideoDisplayFormat = 1;
   VideoFormat = 0;
   UpdateChannels = 5;
@@ -614,6 +618,10 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
   else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
+  else if (!strcasecmp(Name, "ColorKey0"))           ColorKey0          = atoi(Value);
+  else if (!strcasecmp(Name, "ColorKey1"))           ColorKey1          = atoi(Value);
+  else if (!strcasecmp(Name, "ColorKey2"))           ColorKey2          = atoi(Value);
+  else if (!strcasecmp(Name, "ColorKey3"))           ColorKey3          = atoi(Value);
   else if (!strcasecmp(Name, "VideoDisplayFormat"))  VideoDisplayFormat = atoi(Value);
   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
   else if (!strcasecmp(Name, "UpdateChannels"))      UpdateChannels     = atoi(Value);
@@ -713,6 +721,10 @@ bool cSetup::Save(void)
   Store("RecordingDirs",      RecordingDirs);
   Store("FoldersInTimerMenu", FoldersInTimerMenu);
   Store("NumberKeysForChars", NumberKeysForChars);
+  Store("ColorKey0",          ColorKey0);
+  Store("ColorKey1",          ColorKey1);
+  Store("ColorKey2",          ColorKey2);
+  Store("ColorKey3",          ColorKey3);
   Store("VideoDisplayFormat", VideoDisplayFormat);
   Store("VideoFormat",        VideoFormat);
   Store("UpdateChannels",     UpdateChannels);
diff --git a/config.h b/config.h
index acdf77a70..a58b75c78 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.49 2012/06/17 11:14:50 kls Exp $
+ * $Id: config.h 2.51 2012/09/09 12:57:33 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.29"
-#define VDRVERSNUM   10729  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.30"
+#define VDRVERSNUM   10730  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.29"
-#define APIVERSNUM   10729  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.30"
+#define APIVERSNUM   10730  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -288,6 +288,7 @@ class cSetup : public cConfig<cSetupLine> {
   int RecordingDirs;
   int FoldersInTimerMenu;
   int NumberKeysForChars;
+  int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
   int VideoDisplayFormat;
   int VideoFormat;
   int UpdateChannels;
diff --git a/device.c b/device.c
index 872b1aa9a..6518e8209 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.62 2012/06/10 13:13:18 kls Exp $
+ * $Id: device.c 2.67 2012/09/02 09:26:36 kls Exp $
  */
 
 #include "device.h"
@@ -241,6 +241,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
   int NumCamSlots = CamSlots.Count();
   int SlotPriority[NumCamSlots];
   int NumUsableSlots = 0;
+  bool InternalCamNeeded = false;
   if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
      for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
          SlotPriority[CamSlot->Index()] = MAXPRIORITY + 1; // assumes it can't be used
@@ -254,7 +255,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
             }
          }
      if (!NumUsableSlots)
-        return NULL; // no CAM is able to decrypt this channel
+        InternalCamNeeded = true; // no CAM is able to decrypt this channel
      }
 
   bool NeedsDetachReceivers = false;
@@ -268,11 +269,14 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
       for (int i = 0; i < numDevices; i++) {
           if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
              continue; // a specific card was requested, but not this one
-          if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true))
+          bool HasInternalCam = device[i]->HasInternalCam();
+          if (InternalCamNeeded && !HasInternalCam)
+             continue; // no CAM is able to decrypt this channel and the device uses vdr handled CAMs
+          if (NumUsableSlots && !HasInternalCam && !CamSlots.Get(j)->Assign(device[i], true))
              continue; // CAM slot can't be used with this device
           bool ndr;
           if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basically able to do the job
-             if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
+             if (NumUsableSlots && !HasInternalCam && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
                 ndr = true; // using a different CAM slot requires detaching receivers
              // Put together an integer number that reflects the "impact" using
              // this device would have on the overall system. Each condition is represented
@@ -287,18 +291,18 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 4; imp |= GetClippedNumProvidedSystems(4, device[i]) - 1;                                       // avoid cards which support multiple delivery systems
              imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice();                                      // avoid the Transfer Mode receiver device
              imp <<= 8; imp |= device[i]->Priority() - IDLEPRIORITY;                                                 // use the device with the lowest priority (- IDLEPRIORITY to assure that values -100..99 can be used)
-             imp <<= 8; imp |= (NumUsableSlots ? SlotPriority[j] : IDLEPRIORITY) - IDLEPRIORITY;                     // use the CAM slot with the lowest priority (- IDLEPRIORITY to assure that values -100..99 can be used)
+             imp <<= 8; imp |= ((NumUsableSlots && !HasInternalCam) ? SlotPriority[j] : IDLEPRIORITY) - IDLEPRIORITY;// use the CAM slot with the lowest priority (- IDLEPRIORITY to assure that values -100..99 can be used)
              imp <<= 1; imp |= ndr;                                                                                  // avoid devices if we need to detach existing receivers
-             imp <<= 1; imp |= NumUsableSlots ? 0 : device[i]->HasCi();                                              // avoid cards with Common Interface for FTA channels
+             imp <<= 1; imp |= (NumUsableSlots || InternalCamNeeded) ? 0 : device[i]->HasCi();                       // avoid cards with Common Interface for FTA channels
              imp <<= 1; imp |= device[i]->AvoidRecording();                                                          // avoid SD full featured cards
-             imp <<= 1; imp |= NumUsableSlots ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
+             imp <<= 1; imp |= (NumUsableSlots && !HasInternalCam) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
              imp <<= 1; imp |= device[i]->IsPrimaryDevice();                                                         // avoid the primary device
              if (imp < Impact) {
                 // This device has less impact than any previous one, so we take it.
                 Impact = imp;
                 d = device[i];
                 NeedsDetachReceivers = ndr;
-                if (NumUsableSlots)
+                if (NumUsableSlots && !HasInternalCam)
                    s = CamSlots.Get(j);
                 }
              }
@@ -593,6 +597,11 @@ int cDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   return -1;
 }
 
+int cDevice::ReadFilter(int Handle, void *Buffer, size_t Length)
+{
+  return safe_read(Handle, Buffer, Length);
+}
+
 void cDevice::CloseFilter(int Handle)
 {
   close(Handle);
@@ -1195,7 +1204,7 @@ bool cDevice::Replaying(void) const
 
 bool cDevice::Transferring(void) const
 {
-  return ActualDevice() != PrimaryDevice();
+  return cTransferControl::ReceiverDevice() != NULL;
 }
 
 bool cDevice::AttachPlayer(cPlayer *Player)
@@ -1666,11 +1675,11 @@ void cDevice::Detach(cReceiver *Receiver)
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i] == Receiver) {
-         Receiver->Activate(false);
          Lock();
          receiver[i] = NULL;
          Receiver->device = NULL;
          Unlock();
+         Receiver->Activate(false);
          for (int n = 0; n < Receiver->numPids; n++)
              DelPid(Receiver->pids[n]);
          }
diff --git a/device.h b/device.h
index f279fda30..1f945218d 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.39 2012/04/04 09:48:21 kls Exp $
+ * $Id: device.h 2.41 2012/08/26 13:25:44 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -393,6 +393,10 @@ class cDevice : public cThread {
        ///< Opens a file handle for the given filter data.
        ///< A derived device that provides section data must
        ///< implement this function.
+  virtual int ReadFilter(int Handle, void *Buffer, size_t Length);
+       ///< Reads data from a handle for the given filter.
+       ///< A derived class need not implement this function, because this
+       ///< is done by the default implementation.
   virtual void CloseFilter(int Handle);
        ///< Closes a file handle that has previously been opened
        ///< by OpenFilter(). If this is as simple as calling close(Handle),
@@ -411,6 +415,12 @@ class cDevice : public cThread {
 public:
   virtual bool HasCi(void);
          ///< Returns true if this device has a Common Interface.
+  virtual bool HasInternalCam(void) { return false; }
+         ///< Returns true if this device handles encrypted channels itself
+         ///< without VDR assistance. This can be e.g. if the device is a
+         ///< client that gets the stream from another VDR instance that has
+         ///< already decrypted the stream. In this case ProvidesChannel()
+         ///< shall check whether the channel can be decrypted.
   void SetCamSlot(cCamSlot *CamSlot);
          ///< Sets the given CamSlot to be used with this device.
   cCamSlot *CamSlot(void) const { return camSlot; }
diff --git a/eit.c b/eit.c
index 12e1d2425..a236b896c 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.20 2012/06/04 10:26:10 kls Exp $
+ * $Id: eit.c 2.21 2012/08/25 11:13:00 kls Exp $
  */
 
 #include "eit.h"
@@ -74,6 +74,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       if (!pEvent || handledExternally) {
          if (OnlyRunningStatus)
             continue;
+         if (handledExternally && !EpgHandlers.IsUpdate(SiEitEvent.getEventId(), StartTime, Tid, getVersionNumber()))
+            continue;
          // If we don't have that event yet, we create a new one.
          // Otherwise we copy the information into the existing event anyway, because the data might have changed.
          pEvent = newEvent = new cEvent(SiEitEvent.getEventId());
diff --git a/epg.c b/epg.c
index d47c4a376..8ebfb6e7a 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.17 2012/06/04 10:26:10 kls Exp $
+ * $Id: epg.c 2.18 2012/08/25 11:10:29 kls Exp $
  */
 
 #include "epg.h"
@@ -1340,6 +1340,15 @@ bool cEpgHandlers::HandledExternally(const cChannel *Channel)
   return false;
 }
 
+bool cEpgHandlers::IsUpdate(tEventID EventID, time_t StartTime, uchar TableID, uchar Version)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->IsUpdate(EventID, StartTime, TableID, Version))
+         return true;
+      }
+  return false;
+}
+
 void cEpgHandlers::SetEventID(cEvent *Event, tEventID EventID)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
diff --git a/epg.h b/epg.h
index 98cb77644..b9a20935b 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.13 2012/06/04 10:26:10 kls Exp $
+ * $Id: epg.h 2.14 2012/08/25 11:15:18 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -250,6 +250,10 @@ class cEpgHandler : public cListObject {
           ///< source. Incoming EIT data is processed as usual, but any new EPG event
           ///< will not be added to the respective schedule. It's up to the EPG
           ///< handler to take care of this.
+  virtual bool IsUpdate(tEventID EventID, time_t StartTime, uchar TableID, uchar Version) { return false; }
+          ///< VDR can't perform the update check (version, tid) for externally handled events,
+          ///< therefore the EPG handlers have to take care of this. Otherwise the parsing of
+          ///< non-updates will waste a lot of resources.
   virtual bool SetEventID(cEvent *Event, tEventID EventID) { return false; }
   virtual bool SetTitle(cEvent *Event, const char *Title) { return false; }
   virtual bool SetShortText(cEvent *Event, const char *ShortText) { return false; }
@@ -277,6 +281,7 @@ class cEpgHandlers : public cList<cEpgHandler> {
   bool IgnoreChannel(const cChannel *Channel);
   bool HandleEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version);
   bool HandledExternally(const cChannel *Channel);
+  bool IsUpdate(tEventID EventID, time_t StartTime, uchar TableID, uchar Version);
   void SetEventID(cEvent *Event, tEventID EventID);
   void SetTitle(cEvent *Event, const char *Title);
   void SetShortText(cEvent *Event, const char *ShortText);
diff --git a/i18n.c b/i18n.c
index bc4aaf608..f010b6bc9 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.4 2011/08/15 10:01:45 kls Exp $
+ * $Id: i18n.c 2.5 2012/09/01 10:53:43 kls Exp $
  */
 
 /*
@@ -63,7 +63,7 @@ const char *LanguageCodeList[] = {
   NULL
   };
 
-static const char *I18nLocaleDir = LOCDIR;
+static cString I18nLocaleDir;
 
 static cStringList LanguageLocales;
 static cStringList LanguageNames;
@@ -102,8 +102,7 @@ static void SetEnvLanguage(const char *Locale)
 
 void I18nInitialize(const char *LocaleDir)
 {
-  if (LocaleDir)
-     I18nLocaleDir = LocaleDir;
+  I18nLocaleDir = LocaleDir;
   LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
   LanguageNames.Append(strdup(SkipContext(LanguageName)));
   LanguageCodes.Append(strdup(LanguageCodeList[0]));
@@ -113,7 +112,7 @@ void I18nInitialize(const char *LocaleDir)
   if (Locales.Size() > 0) {
      char *OldLocale = strdup(setlocale(LC_MESSAGES, NULL));
      for (int i = 0; i < Locales.Size(); i++) {
-         cString FileName = cString::sprintf("%s/%s/LC_MESSAGES/vdr.mo", I18nLocaleDir, Locales[i]);
+         cString FileName = cString::sprintf("%s/%s/LC_MESSAGES/vdr.mo", *I18nLocaleDir, Locales[i]);
          if (access(FileName, F_OK) == 0) { // found a locale with VDR texts
             if (NumLocales < I18N_MAX_LANGUAGES - 1) {
                SetEnvLanguage(Locales[i]);
@@ -142,7 +141,7 @@ void I18nInitialize(const char *LocaleDir)
          }
      SetEnvLanguage(LanguageLocales[CurrentLanguage]);
      free(OldLocale);
-     dsyslog("found %d locales in %s", NumLocales - 1, I18nLocaleDir);
+     dsyslog("found %d locales in %s", NumLocales - 1, *I18nLocaleDir);
      }
   // Prepare any known language codes for which there was no locale:
   for (const char **lc = LanguageCodeList; *lc; lc++) {
diff --git a/libsi/si.c b/libsi/si.c
index 4db917beb..cd889bcd8 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.6 2011/12/10 15:47:15 kls Exp $
+ *   $Id: si.c 2.7 2012/08/21 08:10:00 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -405,6 +405,21 @@ bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t
   return false;
 }
 
+// A similar version is used in VDR/tools.c:
+static int Utf8CharLen(const char *s)
+{
+  if (SystemCharacterTableIsSingleByte)
+     return 1;
+#define MT(s, m, v) ((*(s) & (m)) == (v)) // Mask Test
+  if (MT(s, 0xE0, 0xC0) && MT(s + 1, 0xC0, 0x80))
+     return 2;
+  if (MT(s, 0xF0, 0xE0) && MT(s + 1, 0xC0, 0x80) && MT(s + 2, 0xC0, 0x80))
+     return 3;
+  if (MT(s, 0xF8, 0xF0) && MT(s + 1, 0xC0, 0x80) && MT(s + 2, 0xC0, 0x80) && MT(s + 3, 0xC0, 0x80))
+     return 4;
+  return 1;
+}
+
 // originally from libdtv, Copyright Rolf Hakenes <hakenes@hippomi.de>
 void String::decodeText(char *buffer, int size) {
    const unsigned char *from=data.getData(0);
@@ -413,82 +428,71 @@ void String::decodeText(char *buffer, int size) {
    if (len <= 0) {
       *to = '\0';
       return;
-      }
+   }
    bool singleByte;
    const char *cs = getCharacterTable(from, len, &singleByte);
-   // FIXME Need to make this UTF-8 aware (different control codes).
-   // However, there's yet to be found a broadcaster that actually
-   // uses UTF-8 for the SI data... (kls 2007-06-10)
-   for (int i = 0; i < len; i++) {
-      if (*from == 0)
-         break;
-      if (    ((' ' <= *from) && (*from <= '~'))
-           || (*from == '\n')
-           || (0xA0 <= *from)
-         )
-         *to++ = *from;
-      else if (*from == 0x8A)
-         *to++ = '\n';
-      from++;
-      if (to - buffer >= size - 1)
-         break;
+   if (singleByte && SystemCharacterTableIsSingleByte || !convertCharacterTable((const char *)from, len, to, size, cs)) {
+      if (len >= size)
+         len = size - 1;
+      strncpy(to, (const char *)from, len);
+      to[len] = 0;
    }
-   *to = '\0';
-   if (!singleByte || !SystemCharacterTableIsSingleByte) {
-      char convBuffer[size];
-      if (convertCharacterTable(buffer, strlen(buffer), convBuffer, sizeof(convBuffer), cs))
-         strncpy(buffer, convBuffer, strlen(convBuffer) + 1);
+   else
+      len = strlen(to); // might have changed
+   // Handle control codes:
+   while (len > 0) {
+      int l = Utf8CharLen(to);
+      if (l <= 2) {
+         unsigned char *p = (unsigned char *)to;
+         if (l == 2 && *p == 0xC2) // UTF-8 sequence
+            p++;
+         bool Move = true;
+         switch (*p) {
+           case 0x8A: *to = '\n'; break;
+           case 0xA0: *to = ' ';  break;
+           default:   Move = false;
+         }
+         if (l == 2 && Move) {
+            memmove(p, p + 1, len - 1); // we also copy the terminating 0!
+            l = 1;
+         }
+      }
+      to += l;
+      len -= l;
    }
 }
 
 void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion) {
-   const unsigned char *from=data.getData(0);
+   decodeText(buffer, sizeBuffer);
+   if (!*buffer) {
+      *shortVersion = '\0';
+      return;
+   }
+   // Handle control codes:
    char *to=buffer;
-   char *toShort=shortVersion;
+   int len=strlen(to);
    int IsShortName=0;
-   int len=getLength();
-   if (len <= 0) {
-      *to = '\0';
-      *toShort = '\0';
-      return;
+   while (len > 0) {
+      int l = Utf8CharLen(to);
+      unsigned char *p = (unsigned char *)to;
+      if (l == 2 && *p == 0xC2) // UTF-8 sequence
+         p++;
+      if (*p == 0x86 || *p == 0x87) {
+         IsShortName += (*p == 0x86) ? 1 : -1;
+         memmove(to, to + l, len - l + 1); // we also copy the terminating 0!
+         l = 0;
       }
-   bool singleByte;
-   const char *cs = getCharacterTable(from, len, &singleByte);
-   // FIXME Need to make this UTF-8 aware (different control codes).
-   // However, there's yet to be found a broadcaster that actually
-   // uses UTF-8 for the SI data... (kls 2007-06-10)
-   for (int i = 0; i < len; i++) {
-      if (    ((' ' <= *from) && (*from <= '~'))
-           || (*from == '\n')
-           || (0xA0 <= *from)
-         )
-      {
-         *to++ = *from;
-         if (IsShortName)
-            *toShort++ = *from;
+      if (l && IsShortName) {
+         if (l < sizeShortVersion) {
+            for (int i = 0; i < l; i++)
+                *shortVersion++ = to[i];
+            sizeShortVersion -= l;
+         }
       }
-      else if (*from == 0x8A)
-         *to++ = '\n';
-      else if (*from == 0x86)
-         IsShortName++;
-      else if (*from == 0x87)
-         IsShortName--;
-      else if (*from == 0)
-         break;
-      from++;
-      if (to - buffer >= sizeBuffer - 1 || toShort - shortVersion >= sizeShortVersion - 1)
-         break;
-   }
-   *to = '\0';
-   *toShort = '\0';
-   if (!singleByte || !SystemCharacterTableIsSingleByte) {
-      char convBuffer[sizeBuffer];
-      if (convertCharacterTable(buffer, strlen(buffer), convBuffer, sizeof(convBuffer), cs))
-         strncpy(buffer, convBuffer, strlen(convBuffer) + 1);
-      char convShortVersion[sizeShortVersion];
-      if (convertCharacterTable(shortVersion, strlen(shortVersion), convShortVersion, sizeof(convShortVersion), cs))
-         strncpy(shortVersion, convShortVersion, strlen(convShortVersion) + 1);
+      to += l;
+      len -= l;
    }
+   *shortVersion = '\0';
 }
 
 Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain, bool returnUnimplemetedDescriptor) {
diff --git a/menu.c b/menu.c
index 9f4c54e54..1b9346c30 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.58 2012/06/17 11:12:25 kls Exp $
+ * $Id: menu.c 2.60 2012/09/09 12:23:00 kls Exp $
  */
 
 #include "menu.h"
@@ -2510,6 +2510,7 @@ void cMenuSetupBase::Store(void)
 class cMenuSetupOSD : public cMenuSetupBase {
 private:
   const char *useSmallFontTexts[3];
+  const char *keyColorTexts[4];
   int osdLanguageIndex;
   int numSkins;
   int originalSkinIndex;
@@ -2560,6 +2561,10 @@ void cMenuSetupOSD::Set(void)
   useSmallFontTexts[0] = tr("never");
   useSmallFontTexts[1] = tr("skin dependent");
   useSmallFontTexts[2] = tr("always");
+  keyColorTexts[0] = tr("Key$Red");
+  keyColorTexts[1] = tr("Key$Green");
+  keyColorTexts[2] = tr("Key$Yellow");
+  keyColorTexts[3] = tr("Key$Blue");
   Clear();
   SetSection(tr("OSD"));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Language"),               &osdLanguageIndex, I18nNumLanguagesWithLocale(), &I18nLanguages()->At(0)));
@@ -2589,6 +2594,10 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"),            &data.ColorKey0, 4, keyColorTexts));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"),            &data.ColorKey1, 4, keyColorTexts));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 2"),            &data.ColorKey2, 4, keyColorTexts));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 3"),            &data.ColorKey3, 4, keyColorTexts));
   SetCurrent(Get(current));
   Display();
 }
@@ -4455,6 +4464,7 @@ cReplayControl::cReplayControl(bool PauseLive)
 {
   currentReplayControl = this;
   displayReplay = NULL;
+  marksModified = false;
   visible = modeOnly = shown = displayFrames = false;
   lastCurrent = lastTotal = -1;
   lastPlay = lastForward = false;
@@ -4472,6 +4482,10 @@ cReplayControl::~cReplayControl()
   Hide();
   cStatus::MsgReplaying(this, NULL, fileName, false);
   Stop();
+  if (marksModified) {
+     marks.Save();
+     marksModified = false;
+     }
   if (currentReplayControl == this)
      currentReplayControl = NULL;
 }
@@ -4729,7 +4743,7 @@ void cReplayControl::MarkToggle(void)
            Goto(Current, true);
         }
      ShowTimed(2);
-     marks.Save();
+     marksModified = true;
      }
 }
 
@@ -4766,7 +4780,7 @@ void cReplayControl::MarkMove(bool Forward)
            }
         m->SetPosition(p);
         Goto(m->Position(), true);
-        marks.Save();
+        marksModified = true;
         }
      }
 }
@@ -4775,6 +4789,10 @@ void cReplayControl::EditCut(void)
 {
   if (*fileName) {
      Hide();
+     if (marksModified) {
+        marks.Save();
+        marksModified = false;
+        }
      if (!cCutter::Active()) {
         if (!marks.Count())
            Skins.Message(mtError, tr("No editing marks defined!"));
diff --git a/menu.h b/menu.h
index ba93c5d21..10ffc7abc 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.11 2012/06/13 11:23:11 kls Exp $
+ * $Id: menu.h 2.12 2012/09/07 08:48:34 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -260,6 +260,7 @@ class cReplayControl : public cDvbPlayerControl {
 private:
   cSkinDisplayReplay *displayReplay;
   cMarks marks;
+  bool marksModified;
   bool visible, modeOnly, shown, displayFrames;
   int lastCurrent, lastTotal;
   bool lastPlay, lastForward;
diff --git a/plugin.c b/plugin.c
index 52256ee0f..db16d080e 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 2.3 2012/03/11 13:56:02 kls Exp $
+ * $Id: plugin.c 2.4 2012/09/01 13:10:27 kls Exp $
  */
 
 #include "plugin.h"
@@ -25,7 +25,9 @@
 
 // --- cPlugin ---------------------------------------------------------------
 
-char *cPlugin::configDirectory = NULL;
+cString cPlugin::configDirectory;
+cString cPlugin::cacheDirectory;
+cString cPlugin::resourceDirectory;
 
 cPlugin::cPlugin(void)
 {
@@ -132,8 +134,7 @@ cString cPlugin::SVDRPCommand(const char *Command, const char *Option, int &Repl
 
 void cPlugin::SetConfigDirectory(const char *Dir)
 {
-  free(configDirectory);
-  configDirectory = strdup(Dir);
+  configDirectory = Dir;
 }
 
 const char *cPlugin::ConfigDirectory(const char *PluginName)
@@ -141,7 +142,35 @@ const char *cPlugin::ConfigDirectory(const char *PluginName)
   static cString buffer;
   if (!cThread::IsMainThread())
      esyslog("ERROR: plugin '%s' called cPlugin::ConfigDirectory(), which is not thread safe!", PluginName ? PluginName : "<no name given>");
-  buffer = cString::sprintf("%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+  buffer = cString::sprintf("%s/plugins%s%s", *configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+  return MakeDirs(buffer, true) ? *buffer : NULL;
+}
+
+void cPlugin::SetCacheDirectory(const char *Dir)
+{
+  cacheDirectory = Dir;
+}
+
+const char *cPlugin::CacheDirectory(const char *PluginName)
+{
+  static cString buffer;
+  if (!cThread::IsMainThread())
+     esyslog("ERROR: plugin '%s' called cPlugin::CacheDirectory(), which is not thread safe!", PluginName ? PluginName : "<no name given>");
+  buffer = cString::sprintf("%s/plugins%s%s", *cacheDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
+  return MakeDirs(buffer, true) ? *buffer : NULL;
+}
+
+void cPlugin::SetResourceDirectory(const char *Dir)
+{
+  resourceDirectory = Dir;
+}
+
+const char *cPlugin::ResourceDirectory(const char *PluginName)
+{
+  static cString buffer;
+  if (!cThread::IsMainThread())
+     esyslog("ERROR: plugin '%s' called cPlugin::ResourceDirectory(), which is not thread safe!", PluginName ? PluginName : "<no name given>");
+  buffer = cString::sprintf("%s/plugins%s%s", *resourceDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
   return MakeDirs(buffer, true) ? *buffer : NULL;
 }
 
diff --git a/plugin.h b/plugin.h
index 684b822a8..3502741af 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 2.1 2012/03/11 13:55:56 kls Exp $
+ * $Id: plugin.h 2.2 2012/09/01 13:08:54 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -21,7 +21,9 @@ class cPlugin {
   friend class cDll;
   friend class cPluginManager;
 private:
-  static char *configDirectory;
+  static cString configDirectory;
+  static cString cacheDirectory;
+  static cString resourceDirectory;
   const char *name;
   bool started;
   void SetName(const char *s);
@@ -57,6 +59,10 @@ class cPlugin {
 
   static void SetConfigDirectory(const char *Dir);
   static const char *ConfigDirectory(const char *PluginName = NULL);
+  static void SetCacheDirectory(const char *Dir);
+  static const char *CacheDirectory(const char *PluginName = NULL);
+  static void SetResourceDirectory(const char *Dir);
+  static const char *ResourceDirectory(const char *PluginName = NULL);
   };
 
 class cDll : public cListObject {
diff --git a/po/ar.po b/po/ar.po
index ddfc50a6a..8347285e1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -870,6 +870,18 @@ msgstr "مدة معلومات القناة"
 msgid "Setup.OSD$Number keys for characters"
 msgstr "زر اغلاق القاائمة"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "الدليل الالكتونى للقنوات"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ce13921cf..ce863deb5 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -852,6 +852,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guia de Programes"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 96193613c..96f6b146b 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -851,6 +851,18 @@ msgstr "Složky v menu časovače"
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 5a463b9e1..3615bc742 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 20a54765b..aaa92ea22 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr "Verzeichnisse im Timer-Men
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummerntasten f�r Zeichen"
 
+msgid "Setup.OSD$Color key 0"
+msgstr "Farbtaste 0"
+
+msgid "Setup.OSD$Color key 1"
+msgstr "Farbtaste 1"
+
+msgid "Setup.OSD$Color key 2"
+msgstr "Farbtaste 2"
+
+msgid "Setup.OSD$Color key 3"
+msgstr "Farbtaste 3"
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index d27af7e58..42bd8be24 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "������������ ������ ������������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f38ce2f14..2bda405b7 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -850,6 +850,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Gu�a de Programaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index b136d37e8..ddf9a80f4 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr "Kaustad taimeri menüüs"
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index aa76eef35..11a74adac 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -852,6 +852,18 @@ msgstr "Näytä kansiot ajastinvalikossa"
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Ohjelmaopas"
 
@@ -1123,7 +1135,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanavien rullaus"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Näytä lähde kanavien nimissä"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Käytä hätäsammutusta"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 451cf565c..5d65eaa1f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -855,6 +855,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guide des programmes"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 6fddf87a0..b7b8983aa 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -851,6 +851,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG (elektronski programski vodi�)"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 71047a3bc..58cf9ce2d 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -852,6 +852,18 @@ msgstr "K
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Sz�mgombok a bet�k�n"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 03cfbe13a..59b763f67 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2012-06-06 22:50+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -856,6 +856,18 @@ msgstr "Cartelle nel menu timer"
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guida programmi EPG"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 98b8a687e..d9bf213ff 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr "Katalogai esantys laikmačių meniu"
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Elektroninis programų gidas (EPG)"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index a767aca3e..46d9419c5 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -850,6 +850,18 @@ msgstr "Директориуми во менито за тајмер"
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG (електронски водич на програми)"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index a312fdc03..df75d23db 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -853,6 +853,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 2612be247..f221214da 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -850,6 +850,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Programoversikt"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 166b35b2d..191338988 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -850,6 +850,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index da11c0788..11fdb4c0d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -850,6 +850,18 @@ msgstr "Pastas no menu de grava
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Guia de Programa��o"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 3f6d1e156..40571e552 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -852,6 +852,18 @@ msgstr "Directoare 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Caractere pe tastele numerice"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 4ed78010a..f159d1ef3 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -850,6 +850,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "�������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 069fd55cd..fc75998fa 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr "Zlo
 msgid "Setup.OSD$Number keys for characters"
 msgstr "��seln� tla�idl� pre znaky"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 5bb6b9b1e..95a45dfe9 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -850,6 +850,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Programski vodnik"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 4be71c531..0e6f9cd68 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -867,6 +867,18 @@ msgstr "Direktoriji u tajmer meni-ju "
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Number keys for characters"
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG (TV Raspored�)"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 4e9989330..aa66721cb 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -852,6 +852,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index d38761a4d..e4acde3f5 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "EPG"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 5ec4a0b56..62b5fc646 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -849,6 +849,18 @@ msgstr "Каталоги в меню таймера"
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "Телегід (EPG)"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c1e18b40..2277a940a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-17 13:59+0200\n"
+"POT-Creation-Date: 2012-09-09 15:20+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -852,6 +852,18 @@ msgstr ""
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
+msgid "Setup.OSD$Color key 0"
+msgstr ""
+
+msgid "Setup.OSD$Color key 1"
+msgstr ""
+
+msgid "Setup.OSD$Color key 2"
+msgstr ""
+
+msgid "Setup.OSD$Color key 3"
+msgstr ""
+
 msgid "EPG"
 msgstr "电子节目单设置"
 
diff --git a/receiver.h b/receiver.h
index eb2f32a7e..775dabdf0 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.8 2012/06/02 13:20:44 kls Exp $
+ * $Id: receiver.h 2.9 2012/09/02 09:27:20 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -27,7 +27,7 @@ class cReceiver {
   void Detach(void);
   virtual void Activate(bool On) {}
                ///< This function is called just before the cReceiver gets attached to
-               ///< (On == true) or detached from (On == false) a cDevice. It can be used
+               ///< (On == true) and right after it gets detached from (On == false) a cDevice. It can be used
                ///< to do things like starting/stopping a thread.
                ///< It is guaranteed that Receive() will not be called before Activate(true).
   virtual void Receive(uchar *Data, int Length) = 0;
diff --git a/recording.c b/recording.c
index d13225be0..9c80505ef 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.57 2012/06/09 13:57:30 kls Exp $
+ * $Id: recording.c 2.60 2012/09/06 09:57:31 kls Exp $
  */
 
 #include "recording.h"
@@ -831,8 +831,8 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory) + 1)
-                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory))
+                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)));
      strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      *sb = MALLOC(char, l);
@@ -1067,7 +1067,7 @@ int cRecording::NumFrames(void) const
 {
   if (numFrames < 0) {
      int nf = cIndexFile::GetLength(FileName(), IsPesRecording());
-     if (time(NULL) - LastModifiedTime(FileName()) < MININDEXAGE)
+     if (time(NULL) - LastModifiedTime(cIndexFile::IndexFileName(FileName(), IsPesRecording())) < MININDEXAGE)
         return nf; // check again later for ongoing recordings
      numFrames = nf;
      }
@@ -1086,7 +1086,7 @@ int cRecording::FileSizeMB(void) const
 {
   if (fileSizeMB < 0) {
      int fs = DirSizeMB(FileName());
-     if (time(NULL) - LastModifiedTime(FileName()) < MININDEXAGE)
+     if (time(NULL) - LastModifiedTime(cIndexFile::IndexFileName(FileName(), IsPesRecording())) < MININDEXAGE)
         return fs; // check again later for ongoing recordings
      fileSizeMB = fs;
      }
@@ -1607,6 +1607,9 @@ struct tIndexTs {
 #define INDEXFILECHECKINTERVAL 500 // ms between checks for existence of the regenerated index file
 #define INDEXFILETESTINTERVAL   10 // ms between tests for the size of the index file in case of pausing live video
 
+cMutex cIndexFile::indexListMutex;
+cVector<const cIndexFile *> cIndexFile::indexList;
+
 cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, bool PauseLive)
 :resumeFile(FileName, IsPesRecording)
 {
@@ -1687,10 +1690,13 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
            LOG_ERROR_STR(*fileName);
         }
      }
+  if (Record)
+     AddToIndexList(this);
 }
 
 cIndexFile::~cIndexFile()
 {
+  RemoveFromIndexList(this);
   if (f >= 0)
      close(f);
   free(index);
@@ -1735,8 +1741,7 @@ bool cIndexFile::CatchUp(int Index)
      for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
          struct stat buf;
          if (fstat(f, &buf) == 0) {
-            if (time(NULL) - buf.st_mtime > MININDEXAGE) {
-               // apparently the index file is not being written any more
+            if (!IsInIndexList(this)) {
                close(f);
                f = -1;
                break;
@@ -1902,6 +1907,39 @@ int cIndexFile::GetLength(const char *FileName, bool IsPesRecording)
   return -1;
 }
 
+void cIndexFile::AddToIndexList(const cIndexFile *IndexFile)
+{
+  cMutexLock MutexLock(&indexListMutex);
+  for (int i = 0; i < indexList.Size(); i++) {
+      if (!indexList[i]) {
+         indexList[i] = IndexFile;
+         return;
+         }
+      }
+  indexList.Append(IndexFile);
+}
+
+void cIndexFile::RemoveFromIndexList(const cIndexFile *IndexFile)
+{
+  cMutexLock MutexLock(&indexListMutex);
+  for (int i = 0; i < indexList.Size(); i++) {
+      if (indexList[i] == IndexFile) {
+         indexList[i] = NULL;
+         return;
+         }
+      }
+}
+
+bool cIndexFile::IsInIndexList(const cIndexFile *IndexFile)
+{
+  cMutexLock MutexLock(&indexListMutex);
+  for (int i = 0; i < indexList.Size(); i++) {
+      if (indexList[i] && !strcmp(indexList[i]->fileName, IndexFile->fileName))
+         return true;
+      }
+  return false;
+}
+
 bool GenerateIndex(const char *FileName) 
 {
   if (DirectoryOk(FileName)) {
diff --git a/recording.h b/recording.h
index 8e7123069..84a23b3b8 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.34 2012/06/09 13:55:22 kls Exp $
+ * $Id: recording.h 2.36 2012/09/06 09:59:11 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -275,7 +275,11 @@ class cIndexFile {
   cResumeFile resumeFile;
   cIndexFileGenerator *indexFileGenerator;
   cMutex mutex;
-  static cString IndexFileName(const char *FileName, bool IsPesRecording);
+  static cMutex indexListMutex;
+  static cVector<const cIndexFile *> indexList;
+  static void AddToIndexList(const cIndexFile *IndexFile);
+  static void RemoveFromIndexList(const cIndexFile *IndexFile);
+  static bool IsInIndexList(const cIndexFile *IndexFile);
   void ConvertFromPes(tIndexTs *IndexTs, int Count);
   void ConvertToPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
@@ -295,6 +299,7 @@ class cIndexFile {
   static int GetLength(const char *FileName, bool IsPesRecording = false);
        ///< Calculates the recording length (number of frames) without actually reading the index file.
        ///< Returns -1 in case of error.
+  static cString IndexFileName(const char *FileName, bool IsPesRecording);
   };
 
 class cFileName {
diff --git a/sections.c b/sections.c
index 6b9cbe24d..c9ed0c14c 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 2.0 2007/10/14 12:52:07 kls Exp $
+ * $Id: sections.c 2.1 2012/08/26 12:53:39 kls Exp $
  */
 
 #include "sections.h"
@@ -198,7 +198,7 @@ void cSectionHandler::Action(void)
                   if (fh) {
                      // Read section data:
                      unsigned char buf[4096]; // max. allowed size for any EIT section
-                     int r = safe_read(fh->handle, buf, sizeof(buf));
+                     int r = device->ReadFilter(fh->handle, buf, sizeof(buf));
                      if (!DeviceHasLock)
                         continue; // we do the read anyway, to flush any data that might have come from a different transponder
                      if (r > 3) { // minimum number of bytes necessary to get section length
diff --git a/skinclassic.c b/skinclassic.c
index 64944ded6..9aac095cc 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.7 2012/04/23 08:48:03 kls Exp $
+ * $Id: skinclassic.c 2.8 2012/09/09 11:39:06 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -291,16 +291,19 @@ void cSkinClassicDisplayMenu::SetTitle(const char *Title)
 void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
   const cFont *font = cFont::GetFont(fontOsd);
+  const char *lutText[] = { Red, Green, Yellow, Blue };
+  tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg };
+  tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg };
   int w = x3 - x0;
   int t0 = x0;
   int t1 = x0 + w / 4;
   int t2 = x0 + w / 2;
   int t3 = x3 - w / 4;
   int t4 = x3;
-  osd->DrawText(t0, y4, Red,    Theme.Color(clrButtonRedFg),    Red    ? Theme.Color(clrButtonRedBg)    : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter);
-  osd->DrawText(t1, y4, Green,  Theme.Color(clrButtonGreenFg),  Green  ? Theme.Color(clrButtonGreenBg)  : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter);
-  osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Yellow ? Theme.Color(clrButtonYellowBg) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter);
-  osd->DrawText(t3, y4, Blue,   Theme.Color(clrButtonBlueFg),   Blue   ? Theme.Color(clrButtonBlueBg)   : Theme.Color(clrBackground), font, t4 - t3, 0, taCenter);
+  osd->DrawText(t0, y4, lutText[Setup.ColorKey0], Theme.Color(lutFg[Setup.ColorKey0]), lutText[Setup.ColorKey0] ? Theme.Color(lutBg[Setup.ColorKey0]) : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter);
+  osd->DrawText(t1, y4, lutText[Setup.ColorKey1], Theme.Color(lutFg[Setup.ColorKey1]), lutText[Setup.ColorKey1] ? Theme.Color(lutBg[Setup.ColorKey1]) : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter);
+  osd->DrawText(t2, y4, lutText[Setup.ColorKey2], Theme.Color(lutFg[Setup.ColorKey2]), lutText[Setup.ColorKey2] ? Theme.Color(lutBg[Setup.ColorKey2]) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter);
+  osd->DrawText(t3, y4, lutText[Setup.ColorKey3], Theme.Color(lutFg[Setup.ColorKey3]), lutText[Setup.ColorKey3] ? Theme.Color(lutBg[Setup.ColorKey3]) : Theme.Color(clrBackground), font, t4 - t3, 0, taCenter);
 }
 
 void cSkinClassicDisplayMenu::SetMessage(eMessageType Type, const char *Text)
diff --git a/skinlcars.c b/skinlcars.c
index 5937efe6a..39d037470 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.13 2012/06/13 13:27:31 kls Exp $
+ * $Id: skinlcars.c 2.14 2012/09/09 12:16:50 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -975,10 +975,11 @@ void cSkinLCARSDisplayMenu::DrawMenuFrame(void)
   osd->DrawEllipse  (xa08 + lineHeight / 2, yb14, xa09 - 1, yb15 - 1, frameColor, 5);
   osd->DrawText(xa00, yb10, "VDR", Theme.Color(clrMenuFrameFg), frameColor, tallFont, xa02 - xa00, yb11 - yb10, taTop | taRight | taBorder);
   // Color buttons:
-  osd->DrawRectangle(xb00, yb14, xb01 - 1, yb15 - 1, Theme.Color(clrButtonRedBg));
-  osd->DrawRectangle(xb04, yb14, xb05 - 1, yb15 - 1, Theme.Color(clrButtonGreenBg));
-  osd->DrawRectangle(xb08, yb14, xb09 - 1, yb15 - 1, Theme.Color(clrButtonYellowBg));
-  osd->DrawRectangle(xb12, yb14, xb13 - 1, yb15 - 1, Theme.Color(clrButtonBlueBg));
+  tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg };
+  osd->DrawRectangle(xb00, yb14, xb01 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey0]));
+  osd->DrawRectangle(xb04, yb14, xb05 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey1]));
+  osd->DrawRectangle(xb08, yb14, xb09 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey2]));
+  osd->DrawRectangle(xb12, yb14, xb13 - 1, yb15 - 1, Theme.Color(lutBg[Setup.ColorKey3]));
 }
 
 void cSkinLCARSDisplayMenu::DrawDate(void)
@@ -1458,19 +1459,22 @@ void cSkinLCARSDisplayMenu::SetTitle(const char *Title)
 
 void cSkinLCARSDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
+  const char *lutText[] = { Red, Green, Yellow, Blue };
+  tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg };
+  tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg };
   const cFont *font = cFont::GetFont(fontSml);
   if (MenuCategory() == mcMain) {
-     DrawMainButton(Red,    xd00, xd01, xd02, xd03, yd02, yd03, Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font);
-     DrawMainButton(Green,  xd04, xd05, xd06, xd07, yd02, yd03, Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font);
-     DrawMainButton(Yellow, xd00, xd01, xd02, xd03, yd04, yd05, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font);
-     DrawMainButton(Blue,   xd04, xd05, xd06, xd07, yd04, yd05, Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font);
+     DrawMainButton(lutText[Setup.ColorKey0], xd00, xd01, xd02, xd03, yd02, yd03, Theme.Color(lutFg[Setup.ColorKey0]), Theme.Color(lutBg[Setup.ColorKey0]), font);
+     DrawMainButton(lutText[Setup.ColorKey1], xd04, xd05, xd06, xd07, yd02, yd03, Theme.Color(lutFg[Setup.ColorKey1]), Theme.Color(lutBg[Setup.ColorKey1]), font);
+     DrawMainButton(lutText[Setup.ColorKey2], xd00, xd01, xd02, xd03, yd04, yd05, Theme.Color(lutFg[Setup.ColorKey2]), Theme.Color(lutBg[Setup.ColorKey2]), font);
+     DrawMainButton(lutText[Setup.ColorKey3], xd04, xd05, xd06, xd07, yd04, yd05, Theme.Color(lutFg[Setup.ColorKey3]), Theme.Color(lutBg[Setup.ColorKey3]), font);
      }
   else {
      int h = yb15 - yb14;
-     osd->DrawText(xb02, yb14, Red,    Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font, xb03 - xb02, h, taLeft | taBorder);
-     osd->DrawText(xb06, yb14, Green,  Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font, xb07 - xb06, h, taLeft | taBorder);
-     osd->DrawText(xb10, yb14, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, xb11 - xb10, h, taLeft | taBorder);
-     osd->DrawText(xb14, yb14, Blue,   Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font, xb15 - xb14, h, taLeft | taBorder);
+     osd->DrawText(xb02, yb14, lutText[Setup.ColorKey0], Theme.Color(lutFg[Setup.ColorKey0]), Theme.Color(lutBg[Setup.ColorKey0]), font, xb03 - xb02, h, taLeft | taBorder);
+     osd->DrawText(xb06, yb14, lutText[Setup.ColorKey1], Theme.Color(lutFg[Setup.ColorKey1]), Theme.Color(lutBg[Setup.ColorKey1]), font, xb07 - xb06, h, taLeft | taBorder);
+     osd->DrawText(xb10, yb14, lutText[Setup.ColorKey2], Theme.Color(lutFg[Setup.ColorKey2]), Theme.Color(lutBg[Setup.ColorKey2]), font, xb11 - xb10, h, taLeft | taBorder);
+     osd->DrawText(xb14, yb14, lutText[Setup.ColorKey3], Theme.Color(lutFg[Setup.ColorKey3]), Theme.Color(lutBg[Setup.ColorKey3]), font, xb15 - xb14, h, taLeft | taBorder);
      }
 }
 
diff --git a/skinlcars.h b/skinlcars.h
index 7306d12cd..71117f6f7 100644
--- a/skinlcars.h
+++ b/skinlcars.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.h 1.1 2012/04/15 13:17:35 kls Exp $
+ * $Id: skinlcars.h 2.1 2012/04/15 13:17:35 kls Exp $
  */
 
 #ifndef __SKINLCARS_H
diff --git a/skinsttng.c b/skinsttng.c
index d98553886..94f54083f 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.15 2012/04/23 08:39:11 kls Exp $
+ * $Id: skinsttng.c 2.16 2012/09/09 11:39:06 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
@@ -571,6 +571,9 @@ void cSkinSTTNGDisplayMenu::SetTitle(const char *Title)
 
 void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const char *Yellow, const char *Blue)
 {
+  const char *lutText[] = { Red, Green, Yellow, Blue };
+  tColor lutFg[] = { clrButtonRedFg, clrButtonGreenFg, clrButtonYellowFg, clrButtonBlueFg };
+  tColor lutBg[] = { clrButtonRedBg, clrButtonGreenBg, clrButtonYellowBg, clrButtonBlueBg };
   cString date = DayDateTime();
   const cFont *font = cFont::GetFont(fontSml);
   int d = 2 * Gap;
@@ -585,10 +588,10 @@ void cSkinSTTNGDisplayMenu::SetButtons(const char *Red, const char *Green, const
   osd->DrawRectangle(t1 + d2, y6, t2 - d2, y7 - 1, clrBlack);
   osd->DrawRectangle(t2 + d2, y6, t3 - d2, y7 - 1, clrBlack);
   osd->DrawRectangle(t3 + d2, y6, t4 - d2, y7 - 1, clrBlack);
-  osd->DrawText(t0 + d, y6, Red,    Theme.Color(clrButtonRedFg),    Theme.Color(clrButtonRedBg),    font, t1 - t0 - 2 * d, 0, taCenter);
-  osd->DrawText(t1 + d, y6, Green,  Theme.Color(clrButtonGreenFg),  Theme.Color(clrButtonGreenBg),  font, t2 - t1 - 2 * d, 0, taCenter);
-  osd->DrawText(t2 + d, y6, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, t3 - t2 - 2 * d, 0, taCenter);
-  osd->DrawText(t3 + d, y6, Blue,   Theme.Color(clrButtonBlueFg),   Theme.Color(clrButtonBlueBg),   font, t4 - t3 - 2 * d, 0, taCenter);
+  osd->DrawText(t0 + d, y6, lutText[Setup.ColorKey0], Theme.Color(lutFg[Setup.ColorKey0]), Theme.Color(lutBg[Setup.ColorKey0]), font, t1 - t0 - 2 * d, 0, taCenter);
+  osd->DrawText(t1 + d, y6, lutText[Setup.ColorKey1], Theme.Color(lutFg[Setup.ColorKey1]), Theme.Color(lutBg[Setup.ColorKey1]), font, t2 - t1 - 2 * d, 0, taCenter);
+  osd->DrawText(t2 + d, y6, lutText[Setup.ColorKey2], Theme.Color(lutFg[Setup.ColorKey2]), Theme.Color(lutBg[Setup.ColorKey2]), font, t3 - t2 - 2 * d, 0, taCenter);
+  osd->DrawText(t3 + d, y6, lutText[Setup.ColorKey3], Theme.Color(lutFg[Setup.ColorKey3]), Theme.Color(lutBg[Setup.ColorKey3]), font, t4 - t3 - 2 * d, 0, taCenter);
 }
 
 void cSkinSTTNGDisplayMenu::SetMessage(eMessageType Type, const char *Text)
diff --git a/tools.c b/tools.c
index bc01a5f0d..3d9c513c3 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.24 2012/05/12 13:29:20 kls Exp $
+ * $Id: tools.c 2.25 2012/08/21 10:34:37 kls Exp $
  */
 
 #include "tools.h"
@@ -435,6 +435,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
 
 bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
 {
+  bool HasDotFiles = false;
   cReadDir d(DirName);
   if (d.Ok()) {
      bool empty = true;
@@ -448,6 +449,8 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
                     if (!RemoveEmptyDirectories(buffer, true))
                        empty = false;
                     }
+                 else if (*e->d_name == '.') // "dot files" don't count
+                    HasDotFiles = true;
                  else
                     empty = false;
                  }
@@ -458,6 +461,22 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
               }
            }
      if (RemoveThis && empty) {
+        if (HasDotFiles) {
+           cReadDir d(DirName);
+           if (d.Ok()) {
+              struct dirent *e;
+              while ((e = d.Next()) != NULL) {
+                    if (*e->d_name == '.') { // for safety - should always be true
+                       cString buffer = AddDirectory(DirName, e->d_name);
+                       dsyslog("removing %s", *buffer);
+                       if (remove(buffer) < 0) {
+                          LOG_ERROR_STR(*buffer);
+                          return false;
+                          }
+                       }
+                    }
+              }
+           }
         dsyslog("removing %s", DirName);
         if (remove(DirName) < 0) {
            LOG_ERROR_STR(DirName);
diff --git a/vdr.1 b/vdr.1
index b900b4e6a..d22c4e91f 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.8 2012/02/27 11:01:17 kls Exp $
+.\" $Id: vdr.1 2.9 2012/09/01 13:40:49 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -42,6 +42,10 @@ which can be accessed on port 6419, for instance by \fBtelnet\fR.
 .BI \-a\  cmd ,\ \-\-audio= cmd
 Send Dolby Digital audio to stdin of command \fIcmd\fR.
 .TP
+.BI \-\-cachedir= dir
+save cache files in \fIdir\fR
+(default is to save them in the video directory).
+.TP
 .BI \-c\  dir ,\ \-\-config= dir
 Read config files from directory \fIdir\fR
 (default is to read them from the video directory).
@@ -157,6 +161,10 @@ particular options) you can use
 Call \fIcmd\fR before and after a recording. See the file \fIINSTALL\fR for
 more information.
 .TP
+.BI \-\-resdir= dir
+read resource files from \fIdir\fR
+(default is to read them from the config directory).
+.TP
 .BI \-s\  cmd ,\ \-\-shutdown= cmd
 Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
 information.
diff --git a/vdr.c b/vdr.c
index c075dbebe..f5896caaf 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.37 2012/06/13 11:28:41 kls Exp $
+ * $Id: vdr.c 2.38 2012/09/01 13:30:19 kls Exp $
  */
 
 #include <getopt.h>
@@ -178,10 +178,15 @@ int main(int argc, char *argv[])
 
   // Command line options:
 
+#define dd(a, b) (*a ? a : b)
 #define DEFAULTSVDRPPORT 6419
 #define DEFAULTWATCHDOG     0 // seconds
-#define DEFAULTCONFDIR CONFDIR
+#define DEFAULTVIDEODIR VIDEODIR
+#define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory)
+#define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory)
+#define DEFAULTRESDIR dd(RESDIR, ConfigDirectory)
 #define DEFAULTPLUGINDIR PLUGINDIR
+#define DEFAULTLOCDIR LOCDIR
 #define DEFAULTEPGDATAFILENAME "epg.data"
 
   bool StartedAsRoot = false;
@@ -189,7 +194,11 @@ int main(int argc, char *argv[])
   bool UserDump = false;
   int SVDRPport = DEFAULTSVDRPPORT;
   const char *AudioCommand = NULL;
+  const char *VideoDirectory = DEFAULTVIDEODIR;
   const char *ConfigDirectory = NULL;
+  const char *CacheDirectory = NULL;
+  const char *ResourceDirectory = NULL;
+  const char *LocaleDirectory = DEFAULTLOCDIR;
   const char *EpgDataFileName = DEFAULTEPGDATAFILENAME;
   bool DisplayHelp = false;
   bool DisplayVersion = false;
@@ -198,7 +207,6 @@ int main(int argc, char *argv[])
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
-  const char *LocaleDir = NULL;
 
   bool UseKbd = true;
   const char *LircDevice = NULL;
@@ -216,6 +224,7 @@ int main(int argc, char *argv[])
 
   static struct option long_options[] = {
       { "audio",    required_argument, NULL, 'a' },
+      { "cachedir", required_argument, NULL, 'c' | 0x100 },
       { "config",   required_argument, NULL, 'c' },
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
@@ -235,6 +244,7 @@ int main(int argc, char *argv[])
       { "plugin",   required_argument, NULL, 'P' },
       { "port",     required_argument, NULL, 'p' },
       { "record",   required_argument, NULL, 'r' },
+      { "resdir",   required_argument, NULL, 'r' | 0x100 },
       { "shutdown", required_argument, NULL, 's' },
       { "split",    no_argument,       NULL, 's' | 0x100 },
       { "terminal", required_argument, NULL, 't' },
@@ -252,6 +262,9 @@ int main(int argc, char *argv[])
         switch (c) {
           case 'a': AudioCommand = optarg;
                     break;
+          case 'c' | 0x100:
+                    CacheDirectory = optarg;
+                    break;
           case 'c': ConfigDirectory = optarg;
                     break;
           case 'd': DaemonMode = true; break;
@@ -327,7 +340,7 @@ int main(int argc, char *argv[])
                     break;
           case 'l' | 0x200:
                     if (access(optarg, R_OK | X_OK) == 0)
-                       LocaleDir = optarg;
+                       LocaleDirectory = optarg;
                     else {
                        fprintf(stderr, "vdr: can't access locale directory: %s\n", optarg);
                        return 2;
@@ -349,6 +362,9 @@ int main(int argc, char *argv[])
                     break;
           case 'r': cRecordingUserCommand::SetCommand(optarg);
                     break;
+          case 'r' | 0x100:
+                    ResourceDirectory = optarg;
+                    break;
           case 's': ShutdownHandler.SetShutdownCommand(optarg);
                     break;
           case 's' | 0x100:
@@ -414,6 +430,7 @@ int main(int argc, char *argv[])
      if (DisplayHelp) {
         printf("Usage: vdr [OPTIONS]\n\n"          // for easier orientation, this is column 80|
                "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
+               "            --cachedir=DIR save cache files in DIR (default: %s)\n"
                "  -c DIR,   --config=DIR   read config files from DIR (default: %s)\n"
                "  -d,       --daemon       run in daemon mode\n"
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
@@ -450,6 +467,7 @@ int main(int argc, char *argv[])
                "                           0 turns off SVDRP\n"
                "  -P OPT,   --plugin=OPT   load a plugin defined by the given options\n"
                "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
+               "            --resdir=DIR   read resource files from DIR (default: %s)\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "            --split        split edited files at the editing marks (only\n"
                "                           useful in conjunction with --edit)\n"
@@ -464,14 +482,16 @@ int main(int argc, char *argv[])
                "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                "                           seconds (default: %d); '0' disables the watchdog\n"
                "\n",
+               DEFAULTCACHEDIR,
                DEFAULTCONFDIR,
                DEFAULTEPGDATAFILENAME,
                MAXVIDEOFILESIZEDEFAULT,
                DEFAULTPLUGINDIR,
                LIRC_DEVICE,
-               LOCDIR,
+               DEFAULTLOCDIR,
                DEFAULTSVDRPPORT,
-               VideoDirectory,
+               DEFAULTRESDIR,
+               DEFAULTVIDEODIR,
                DEFAULTWATCHDOG
                );
         }
@@ -555,7 +575,7 @@ int main(int argc, char *argv[])
 
   // Initialize internationalization:
 
-  I18nInitialize(LocaleDir);
+  I18nInitialize(LocaleDirectory);
 
   // Main program loop variables - need to be here to have them initialized before any EXIT():
 
@@ -577,14 +597,22 @@ int main(int argc, char *argv[])
   if (!PluginManager.LoadPlugins(true))
      EXIT(2);
 
-  // Configuration data:
+  // Directories:
 
+  SetVideoDirectory(VideoDirectory);
   if (!ConfigDirectory)
      ConfigDirectory = DEFAULTCONFDIR;
-
   cPlugin::SetConfigDirectory(ConfigDirectory);
+  if (!CacheDirectory)
+     CacheDirectory = DEFAULTCACHEDIR;
+  cPlugin::SetCacheDirectory(CacheDirectory);
+  if (!ResourceDirectory)
+     ResourceDirectory = DEFAULTRESDIR;
+  cPlugin::SetResourceDirectory(ResourceDirectory);
   cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
 
+  // Configuration data:
+
   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
   Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true);
   Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC);
@@ -618,7 +646,7 @@ int main(int argc, char *argv[])
         EpgDataFileName = DEFAULTEPGDATAFILENAME;
         }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
-        EpgDirectory = VideoDirectory;
+        EpgDirectory = CacheDirectory;
      if (EpgDirectory)
         cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
      else
diff --git a/videodir.c b/videodir.c
index 5f94d332d..c64a5c653 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 2.2 2012/06/10 13:45:21 kls Exp $
+ * $Id: videodir.c 2.3 2012/09/01 10:57:44 kls Exp $
  */
 
 #include "videodir.h"
@@ -21,6 +21,11 @@
 
 const char *VideoDirectory = VIDEODIR;
 
+void SetVideoDirectory(const char *Directory)
+{
+  VideoDirectory = strdup(Directory);
+}
+
 class cVideoDirectory {
 private:
   char *name, *stored, *adjusted;
diff --git a/videodir.h b/videodir.h
index 0a0587a64..40d7b0589 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 2.1 2012/04/22 15:07:56 kls Exp $
+ * $Id: videodir.h 2.2 2012/09/01 10:57:07 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -15,6 +15,7 @@
 
 extern const char *VideoDirectory;
 
+void SetVideoDirectory(const char *Directory);
 cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags);
 int CloseVideoFile(cUnbufferedFile *File);
 bool RenameVideoFile(const char *OldName, const char *NewName);

From fa6845328cec89c24a6d491d38072746769766a8 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 30 Sep 2012 15:41:00 +0200
Subject: [PATCH 217/307] Version 1.7.31 VDR developer version 1.7.31 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.31.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.30-1.7.31.diff

MD5 checksums:

a3edd18a352465dd26c97c1990f7bcfd  vdr-1.7.31.tar.bz2
32ff98697d1b383478a6e1932e4afc9c  vdr-1.7.30-1.7.31.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The default skin "LCARS" displays the signal strengths and qualities of
all devices in its main menu. For devices that have an stb0899 frontend chip
(like the TT-budget S2-3200) retrieving this information from the driver is
rather slow, which results in a sluggish response to user input in the main
menu. To speed this up you may want to apply the patches from

   ftp://ftp.tvdr.de/vdr/Developer/Driver-Patches

to the LinuxDVB driver source.

The changes since version 1.7.30:

- If regenerating an index file fails and no data is written to the file, VDR now
   reports this error and removes the empty index file.
- The setup parameter "Recording/Instant rec. time (min)" can now be set to '0',
   which means to record only the currently running event (based on a patch from Matti
   Lehtimäki).
- Decreased the ring buffer put/get trigger sizes from 1/3 to 1/10.
- The script given to VDR with the '-r' option is now also called whenever a
   recording is deleted (thanks to Alexander Wenzel).
- Improved detecting frames in MPEG 4 video (reported by Andrey Pridvorov).
- cPatPmtParser::ParsePmt() now also recognizes stream type 0x81 as "AC3", so that
   recordings that have been converted from the old PES format to TS can be played
   (suggested by Jens Vogel).
- Fixed a leftover frame counter in the LCARS skin's replay display after jumping to
   an editing mark and resuming replay.
- The new class cIoThrottle is used to allow I/O intense threads to temporarily
   suspend their activities in case buffers run full (suggested by Torsten Lang).
   Currently the cutter thread is suspended if the TS or Recorder buffer use more
   than 50% of their capacity. Plugin authors may want to participate in this
   mechanism if they use intense background I/O.
- Increased the size of the TS buffer to 5MB and that of the Recorder buffer to
   20MB to better handle HD recordings (suggested by Torsten Lang).
- Moved cleaning up the EPG data and writing the epg.data file into a separate
   thread to avoid sluggish response to user input on slow systems (based on a patch from
   Sören Moch).
- Fixed sorting folders before recordings in case of UTF-8 (thanks to Sören Moch).
- Reactivated stripping control characters from EPG texts and adapted it to UTF-8.
- Added missing decrementing of 'len' in libsi/si.c's String::decodeText() functions.
- When checking whether a video directory is empty, file names that start with a
   dot ('.') are no longer automatically ignored and implicitly removed if the directory
   contains no other files. Instead, RemoveEmptyDirectories() now has an additional
   parameter that can be given a list of files that shall be ignored when considering
   whether a directory is empty. This allows users to continue to use files such as
   ".keep" to prevent a directory from being deleted when it is empty. Currently the
   only file name that is ignored is ".sort".
---
 CONTRIBUTORS |  27 +++++++++--
 HISTORY      |  43 +++++++++++++++--
 INSTALL      |   8 ++-
 MANUAL       |   5 ++
 config.c     |   4 +-
 config.h     |  11 +++--
 cutter.c     |  18 ++++++-
 device.c     |   3 +-
 dvbdevice.c  |   4 +-
 epg.c        | 134 ++++++++++++++++++++++++++++++++++++++-------------
 epg.h        |   7 ++-
 libsi/si.c   |   4 +-
 menu.c       |   4 +-
 po/ar.po     |   8 ++-
 po/ca_ES.po  |   8 ++-
 po/cs_CZ.po  |   8 ++-
 po/da_DK.po  |   8 ++-
 po/de_DE.po  |   8 ++-
 po/el_GR.po  |   8 ++-
 po/es_ES.po  |   8 ++-
 po/et_EE.po  |   8 ++-
 po/fi_FI.po  |   8 ++-
 po/fr_FR.po  |   8 ++-
 po/hr_HR.po  |   8 ++-
 po/hu_HU.po  |   8 ++-
 po/it_IT.po  |   8 ++-
 po/lt_LT.po  |   8 ++-
 po/mk_MK.po  |   8 ++-
 po/nl_NL.po  |   8 ++-
 po/nn_NO.po  |   8 ++-
 po/pl_PL.po  |   8 ++-
 po/pt_PT.po  |   8 ++-
 po/ro_RO.po  |   8 ++-
 po/ru_RU.po  |   8 ++-
 po/sk_SK.po  |   8 ++-
 po/sl_SI.po  |   8 ++-
 po/sr_SR.po  |   8 ++-
 po/sv_SE.po  |   8 ++-
 po/tr_TR.po  |   8 ++-
 po/uk_UA.po  |   8 ++-
 po/zh_CN.po  |   8 ++-
 recorder.c   |   5 +-
 recording.c  |  33 +++++++++----
 recording.h  |   3 +-
 remux.c      |  41 ++++++++++++++--
 ringbuffer.c |  22 +++++++--
 ringbuffer.h |   4 +-
 skinlcars.c  |   9 ++--
 thread.c     |  44 ++++++++++++++++-
 thread.h     |  25 +++++++++-
 timers.c     |  47 ++++++++++++++----
 tools.c      |  47 ++++++++++--------
 tools.h      |  12 ++++-
 vdr.c        |   9 ++--
 videodir.c   |   6 +--
 videodir.h   |   4 +-
 56 files changed, 657 insertions(+), 150 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 515c3e13c..a275edbbd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2312,6 +2312,8 @@ Pekka Mauno <pekka.mauno@iki.fi>
 
 Alexander Wenzel <hondansx@gmx.de>
  for fixing the shutdown timeout
+ for making the script given to VDR with the '-r' option be also called whenever a
+ recording is deleted
 
 Jan Lenz <email@JanLenz.de>
  for reporting a bug in deleting recordings that have been removed externally when
@@ -2348,9 +2350,6 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for avoiding a gcc 4.6 compiler error in the skincurses plugin.
  for suggesting to move setting LC_NUMERIC further up to make sure any floating point
  numbers use a decimal point
- for implementing cDevice::HasInternalCam(), which can be implemented by devices that
- provide encrypted channels in an already decrypted form, without requiring explicit
- handling of a CAM
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2409,6 +2408,9 @@ Anssi Hannula <anssi.hannula@gmail.com>
  for adding support for automatically selecting subtitles when playing old PES
  recordings made with the subtitles plugin
  for pointing out -Werror=...
+ for implementing cDevice::HasInternalCam(), which can be implemented by devices that
+ provide encrypted channels in an already decrypted form, without requiring explicit
+ handling of a CAM
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
@@ -2739,6 +2741,7 @@ Francesco Saverio Schiavarelli <fschiava@libero.it>
 Matti Lehtim�ki <matti.lehtimaki@gmail.com>
  for implementing the setup option "Miscellaneous/Channels wrap"
  for reporting a missing change from -O2 to -O3 in Make.config.template
+ for a patch that was used to implement instant recording of only the present event
 
 Stephan Austerm�hle <au@hcsd.de>
  for suggesting to flush the file in cSafeFile::Close()
@@ -2888,6 +2891,10 @@ Torsten Lang <info@torstenlang.de>
  if the editing point merges two seamlessly fitting parts of the same stream
  for reporting a sluggish response when manipulating editing marks while a cutting
  thread is running
+ for suggesting to allow I/O intense threads to temporarily suspend their activities
+ in case buffers run full
+ for suggesting to increase the size of the TS buffer to 5MB and that of the Recorder
+ buffer to 20MB to better handle HD recordings
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
@@ -2939,3 +2946,17 @@ Dennis Bendlin <dennisbendlin@online.de>
 
 Oliver Schinagl <oliver@schinagl.nl>
  for a patch that was used to implement the setup options "OSD/Color key [0123]"
+
+Andrey Pridvorov <ua0lnj@bk.ru>
+ for reporting a problem with detecting frames in MPEG 4 video, and pointing towards
+ a better way of doing it
+
+Jens Vogel <jens.vogel@akjv.de>
+ for suggesting to make cPatPmtParser::ParsePmt() also recognize stream type 0x81
+ as "AC3", so that recordings that have been converted from the old PES format to
+ TS can be played
+
+S�ren Moch <smoch@web.de>
+ for a patch that was used to move cleaning up the EPG data and writing the epg.data
+ file into a separate thread to avoid sluggish response to user input on slow systems
+ for fixing sorting folders before recordings in case of UTF-8
diff --git a/HISTORY b/HISTORY
index 6dfb71766..a1cb40c68 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6193,7 +6193,7 @@ Video Disk Recorder Revision History
   (thanks to Andreas Schaefers).
 - Fixed references to old *.vdr file names in MANUAL (reported by Arthur Konovalov).
 - Reverted "Removed limitation to PAL resolution from SPU handling" because it
-  cause nothing but trouble. Besides, the core VDR doesn't use this, anyway.
+  caused nothing but trouble. Besides, the core VDR doesn't use this, anyway.
 - Fixed the default value for "Pause key handling" in the MANUAL (reported by
   Diego Pierotto).
 
@@ -6666,7 +6666,7 @@ Video Disk Recorder Revision History
   Udo Richter for suggesting the fix).
 - Added a mechanism to defer timer handling in case of problems (reported by
   Frank Niederwipper).
-- Fixed distortions that happened when splitting recording into several files
+- Fixed distortions that happened when splitting a recording into several files
   (was a side effect of "Fixed detecting frames in case the Picture Start Code or
   Access Unit Delimiter extends over TS packet boundaries" in version 1.7.19).
   cRecorder::Action() now buffers TS packets in case the frame type is
@@ -7213,7 +7213,7 @@ Video Disk Recorder Revision History
   own way of retrieving section filter data (thanks to Deti Fliegl).
 - The new function cDevice::HasInternalCam() can be implemented by devices that
   provide encrypted channels in an already decrypted form, without requiring explicit
-  handling of a CAM (thanks to Tobias Grimm).
+  handling of a CAM (thanks to Anssi Hannula).
 - VDR can now be built according to the FHS ("File system Hierarchy Standard") by
   activating the line
   #USEFHS = 1
@@ -7234,3 +7234,40 @@ Video Disk Recorder Revision History
   Authors of plugins that implement skins may want to adapt their SetButtons()
   function in order to make use of this new feature. See, for instance, the function
   cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details.
+
+2012-09-30: Version 1.7.31
+
+- If regenerating an index file fails and no data is written to the file, VDR now
+  reports this error and removes the empty index file.
+- The setup parameter "Recording/Instant rec. time (min)" can now be set to '0',
+  which means to record only the currently running event (based on a patch from Matti
+  Lehtim�ki).
+- Decreased the ring buffer put/get trigger sizes from 1/3 to 1/10.
+- The script given to VDR with the '-r' option is now also called whenever a
+  recording is deleted (thanks to Alexander Wenzel).
+- Improved detecting frames in MPEG 4 video (reported by Andrey Pridvorov).
+- cPatPmtParser::ParsePmt() now also recognizes stream type 0x81 as "AC3", so that
+  recordings that have been converted from the old PES format to TS can be played
+  (suggested by Jens Vogel).
+- Fixed a leftover frame counter in the LCARS skin's replay display after jumping to
+  an editing mark and resuming replay.
+- The new class cIoThrottle is used to allow I/O intense threads to temporarily
+  suspend their activities in case buffers run full (suggested by Torsten Lang).
+  Currently the cutter thread is suspended if the TS or Recorder buffer use more
+  than 50% of their capacity. Plugin authors may want to participate in this
+  mechanism if they use intense background I/O.
+- Increased the size of the TS buffer to 5MB and that of the Recorder buffer to
+  20MB to better handle HD recordings (suggested by Torsten Lang).
+- Moved cleaning up the EPG data and writing the epg.data file into a separate
+  thread to avoid sluggish response to user input on slow systems (based on a patch from
+  S�ren Moch).
+- Fixed sorting folders before recordings in case of UTF-8 (thanks to S�ren Moch).
+- Reactivated stripping control characters from EPG texts and adapted it to UTF-8.
+- Added missing decrementing of 'len' in libsi/si.c's String::decodeText() functions.
+- When checking whether a video directory is empty, file names that start with a
+  dot ('.') are no longer automatically ignored and implicitly removed if the directory
+  contains no other files. Instead, RemoveEmptyDirectories() now has an additional
+  parameter that can be given a list of files that shall be ignored when considering
+  whether a directory is empty. This allows users to continue to use files such as
+  ".keep" to prevent a directory from being deleted when it is empty. Currently the
+  only file name that is ignored is ".sort".
diff --git a/INSTALL b/INSTALL
index 50c941e87..07a5079fb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -242,7 +242,7 @@ Executing commands before and after a recording:
 
 You can use the '-r' option to define a program or script that gets called
 before and after a recording is performed, and after an editing process
-has finished.
+has finished or a recording has been deleted.
 
 The program will be called with two or three (in case of "edited") string
 parameters. The first parameter is one of
@@ -250,11 +250,14 @@ parameters. The first parameter is one of
   before      if this is *before* a recording starts
   after       if this is *after* a recording has finished
   edited      if this is after a recording has been *edited*
+  deleted     if this is after a recording has been *deleted*
 
 and the second parameter contains the full name of the recording's
 directory (which may not yet exists at that moment in the "before" case).
 In the "edited" case it will be the name of the edited version (second
 parameter) and the name of the source version (third parameter).
+In the "deleted" case the extension of the directory name is ".del"
+instead of ".rec".
 
 Within this program you can do anything you would like to do before and/or
 after a recording or after an editing process. However, the program must return
@@ -277,6 +280,9 @@ case "$1" in
             echo "Edited recording $2"
             echo "Source recording $3"
             ;;
+     deleted)
+            echo "Deleted recording $2"
+            ;;
      *)
             echo "ERROR: unknown state: $1"
             ;;
diff --git a/MANUAL b/MANUAL
index 56a304df3..fb28462b8 100644
--- a/MANUAL
+++ b/MANUAL
@@ -837,6 +837,11 @@ Version 1.6
                          Default is 180 minutes (3 hours). The stop time of an
                          instant recording can be modified at any time by editing
                          the respective timer in the "Timers" menu.
+                         If this parameter is set to 0 ("present event"), only the
+                         currently running event will be recorded, using the stop
+                         margin and VPS setting as configured.
+                         Note that this parameter is also used when pausing live
+                         video!
 
   Max. video file size = 2000
                          The maximum size of a single recorded video file in MB.
diff --git a/config.c b/config.c
index 3fb4d6dc3..383bb61f7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.27 2012/09/09 12:58:23 kls Exp $
+ * $Id: config.c 2.28 2012/09/15 11:52:03 kls Exp $
  */
 
 #include "config.h"
@@ -383,7 +383,7 @@ cSetup::cSetup(void)
   MenuKeyCloses = 0;
   MarkInstantRecord = 1;
   strcpy(NameInstantRecord, "TITLE EPISODE");
-  InstantRecordTime = 180;
+  InstantRecordTime = DEFINSTRECTIME;
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
diff --git a/config.h b/config.h
index a58b75c78..a07310ee5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.51 2012/09/09 12:57:33 kls Exp $
+ * $Id: config.h 2.53 2012/09/15 11:51:54 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.30"
-#define VDRVERSNUM   10730  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.31"
+#define VDRVERSNUM   10731  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.30"
-#define APIVERSNUM   10730  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.31"
+#define APIVERSNUM   10731  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -42,6 +42,7 @@
 #define TRANSFERPRIORITY  (LIVEPRIORITY - 1) // priority used for actual local Transfer Mode
 #define IDLEPRIORITY      (MINPRIORITY - 1)  // priority of an idle device
 #define MAXLIFETIME       99
+#define DEFINSTRECTIME    180 // default instant recording time (minutes)
 
 #define MINOSDWIDTH   480
 #define MAXOSDWIDTH  1920
diff --git a/cutter.c b/cutter.c
index 62eae822b..bcae2b722 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.13 2012/06/10 14:33:36 kls Exp $
+ * $Id: cutter.c 2.14 2012/09/20 09:12:47 kls Exp $
  */
 
 #include "cutter.h"
@@ -88,12 +88,28 @@ void cCuttingThread::Action(void)
      bool CheckForSeamlessStream = false;
      bool LastMark = false;
      bool cutIn = true;
+     bool suspensionLogged = false;
      while (Running()) {
            uint16_t FileNumber;
            off_t FileOffset;
            int Length;
            bool Independent;
 
+           // Suspend cutting if we have severe throughput problems:
+
+           if (cIoThrottle::Engaged()) {
+              if (!suspensionLogged) {
+                 dsyslog("suspending cutter thread");
+                 suspensionLogged = true;
+                 }
+              cCondWait::SleepMs(100);
+              continue;
+              }
+           else if (suspensionLogged) {
+              dsyslog("resuming cutter thread");
+              suspensionLogged = false;
+              }
+
            // Make sure there is enough disk space:
 
            AssertFreeDiskSpace(-1);
diff --git a/device.c b/device.c
index 6518e8209..aa93a8e5f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.67 2012/09/02 09:26:36 kls Exp $
+ * $Id: device.c 2.68 2012/09/20 09:32:26 kls Exp $
  */
 
 #include "device.h"
@@ -1721,6 +1721,7 @@ cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
   delivered = false;
   ringBuffer = new cRingBufferLinear(Size, TS_SIZE, true, "TS");
   ringBuffer->SetTimeouts(100, 100);
+  ringBuffer->SetIoThrottle();
   Start();
 }
 
diff --git a/dvbdevice.c b/dvbdevice.c
index 55cb91273..9320da6b6 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.71 2012/05/09 08:33:59 kls Exp $
+ * $Id: dvbdevice.c 2.72 2012/09/20 10:07:54 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1540,7 +1540,7 @@ bool cDvbDevice::OpenDvr(void)
   CloseDvr();
   fd_dvr = DvbOpen(DEV_DVB_DVR, adapter, frontend, O_RDONLY | O_NONBLOCK, true);
   if (fd_dvr >= 0)
-     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1);
+     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(5), CardIndex() + 1);
   return fd_dvr >= 0;
 }
 
diff --git a/epg.c b/epg.c
index 8ebfb6e7a..1c1ecdf50 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.18 2012/08/25 11:10:29 kls Exp $
+ * $Id: epg.c 2.21 2012/09/29 14:29:49 kls Exp $
  */
 
 #include "epg.h"
@@ -18,6 +18,7 @@
 #include "timers.h"
 
 #define RUNNINGSTATUSTIMEOUT 30 // seconds before the running status is considered unknown
+#define EPGDATAWRITEDELTA   600 // seconds between writing the epg.data file
 
 // --- tComponent ------------------------------------------------------------
 
@@ -581,9 +582,20 @@ static void EpgBugFixStat(int Number, tChannelID ChannelID)
      }
 }
 
-void ReportEpgBugFixStats(bool Reset)
+void ReportEpgBugFixStats(bool Force)
 {
   if (Setup.EPGBugfixLevel > 0) {
+     static time_t LastReport = 0;
+     time_t now = time(NULL);
+     if (now - LastReport > 3600 || Force) {
+        LastReport = now;
+        struct tm tm_r;
+        struct tm *ptm = localtime_r(&now, &tm_r);
+        if (ptm->tm_hour != 5)
+           return;
+        }
+     else
+        return;
      bool GotHits = false;
      char buffer[1024];
      for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) {
@@ -622,14 +634,33 @@ void ReportEpgBugFixStats(bool Reset)
             if (*buffer)
                dsyslog("%s", buffer);
             }
-         if (Reset)
-            p->hits = p->n = 0;
+         p->hits = p->n = 0;
          }
      if (GotHits)
         dsyslog("=====================");
      }
 }
 
+static void StripControlCharacters(char *s)
+{
+  if (s) {
+     int len = strlen(s);
+     while (len > 0) {
+           int l = Utf8CharLen(s);
+           uchar *p = (uchar *)s;
+           if (l == 2 && *p == 0xC2) // UTF-8 sequence
+              p++;
+           if (*p == 0x86 || *p == 0x87) {
+              memmove(s, p + 1, len - l + 1); // we also copy the terminating 0!
+              len -= l;
+              l = 0;
+              }
+           s += l;
+           len -= l;
+           }
+     }
+}
+
 void cEvent::FixEpgBugs(void)
 {
   if (isempty(title)) {
@@ -839,15 +870,10 @@ void cEvent::FixEpgBugs(void)
             strreplace(p->description, '\n', ' ');
          }
      }
-  /* TODO adapt to UTF-8
   // Same for control characters:
-  strreplace(title, '\x86', ' ');
-  strreplace(title, '\x87', ' ');
-  strreplace(shortText, '\x86', ' ');
-  strreplace(shortText, '\x87', ' ');
-  strreplace(description, '\x86', ' ');
-  strreplace(description, '\x87', ' ');
-  XXX*/
+  StripControlCharacters(title);
+  StripControlCharacters(shortText);
+  StripControlCharacters(description);
 }
 
 // --- cSchedule -------------------------------------------------------------
@@ -1109,6 +1135,47 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
   return false;
 }
 
+// --- cEpgDataWriter ---------------------------------------------------------
+
+class cEpgDataWriter : public cThread {
+private:
+  cMutex mutex;
+protected:
+  virtual void Action(void);
+public:
+  cEpgDataWriter(void);
+  void Perform(void);
+  };
+
+cEpgDataWriter::cEpgDataWriter(void)
+:cThread("epg data writer")
+{
+}
+
+void cEpgDataWriter::Action(void)
+{
+  SetPriority(19);
+  SetIOPriority(7);
+  Perform();
+}
+
+void cEpgDataWriter::Perform(void)
+{
+  cMutexLock MutexLock(&mutex); // to make sure fore- and background calls don't cause parellel dumps!
+  {
+    cSchedulesLock SchedulesLock(true, 1000);
+    cSchedules *s = (cSchedules *)cSchedules::Schedules(SchedulesLock);
+    if (s) {
+       time_t now = time(NULL);
+       for (cSchedule *p = s->First(); p; p = s->Next(p))
+           p->Cleanup(now);
+       }
+  }
+  cSchedules::Dump();
+}
+
+static cEpgDataWriter EpgDataWriter;
+
 // --- cSchedulesLock --------------------------------------------------------
 
 cSchedulesLock::cSchedulesLock(bool WriteLock, int TimeoutMs)
@@ -1126,7 +1193,6 @@ cSchedulesLock::~cSchedulesLock()
 
 cSchedules cSchedules::schedules;
 char *cSchedules::epgDataFileName = NULL;
-time_t cSchedules::lastCleanup = time(NULL);
 time_t cSchedules::lastDump = time(NULL);
 time_t cSchedules::modified = 0;
 
@@ -1152,28 +1218,13 @@ void cSchedules::Cleanup(bool Force)
   if (Force)
      lastDump = 0;
   time_t now = time(NULL);
-  struct tm tm_r;
-  struct tm *ptm = localtime_r(&now, &tm_r);
-  if (now - lastCleanup > 3600) {
-     isyslog("cleaning up schedules data");
-     cSchedulesLock SchedulesLock(true, 1000);
-     cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
-     if (s) {
-        for (cSchedule *p = s->First(); p; p = s->Next(p))
-            p->Cleanup(now);
-        }
-     lastCleanup = now;
-     if (ptm->tm_hour == 5)
-        ReportEpgBugFixStats(true);
-     }
-  if (epgDataFileName && now - lastDump > 600) {
-     cSafeFile f(epgDataFileName);
-     if (f.Open()) {
-        Dump(f);
-        f.Close();
+  if (now - lastDump > EPGDATAWRITEDELTA) {
+     if (epgDataFileName) {
+        if (Force)
+           EpgDataWriter.Perform();
+        else if (!EpgDataWriter.Active())
+           EpgDataWriter.Start();
         }
-     else
-        LOG_ERROR;
      lastDump = now;
      }
 }
@@ -1207,8 +1258,23 @@ bool cSchedules::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t At
   cSchedulesLock SchedulesLock;
   cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
   if (s) {
+     cSafeFile *sf = NULL;
+     if (!f) {
+        sf = new cSafeFile(epgDataFileName);
+        if (sf->Open())
+           f = *sf;
+        else {
+           LOG_ERROR;
+           delete sf;
+           return false;
+           }
+        }
      for (cSchedule *p = s->First(); p; p = s->Next(p))
          p->Dump(f, Prefix, DumpMode, AtTime);
+     if (sf) {
+        sf->Close();
+        delete sf;
+        }
      return true;
      }
   return false;
diff --git a/epg.h b/epg.h
index b9a20935b..3a7df772f 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.14 2012/08/25 11:15:18 kls Exp $
+ * $Id: epg.h 2.15 2012/09/24 12:53:53 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -193,7 +193,6 @@ class cSchedules : public cList<cSchedule> {
   cRwLock rwlock;
   static cSchedules schedules;
   static char *epgDataFileName;
-  static time_t lastCleanup;
   static time_t lastDump;
   static time_t modified;
 public:
@@ -207,7 +206,7 @@ class cSchedules : public cList<cSchedule> {
   static void Cleanup(bool Force = false);
   static void ResetVersions(void);
   static bool ClearAll(void);
-  static bool Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0);
+  static bool Dump(FILE *f = NULL, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0);
   static bool Read(FILE *f = NULL);
   cSchedule *AddSchedule(tChannelID ChannelID);
   const cSchedule *GetSchedule(tChannelID ChannelID) const;
@@ -220,7 +219,7 @@ class cEpgDataReader : public cThread {
   virtual void Action(void);
   };
 
-void ReportEpgBugFixStats(bool Reset = false);
+void ReportEpgBugFixStats(bool Force = false);
 
 class cEpgHandler : public cListObject {
 public:
diff --git a/libsi/si.c b/libsi/si.c
index cd889bcd8..80d34d14a 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.7 2012/08/21 08:10:00 kls Exp $
+ *   $Id: si.c 2.8 2012/09/29 14:44:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -454,6 +454,7 @@ void String::decodeText(char *buffer, int size) {
          }
          if (l == 2 && Move) {
             memmove(p, p + 1, len - 1); // we also copy the terminating 0!
+            len -= 1;
             l = 1;
          }
       }
@@ -480,6 +481,7 @@ void String::decodeText(char *buffer, char *shortVersion, int sizeBuffer, int si
       if (*p == 0x86 || *p == 0x87) {
          IsShortName += (*p == 0x86) ? 1 : -1;
          memmove(to, to + l, len - l + 1); // we also copy the terminating 0!
+         len -= l;
          l = 0;
       }
       if (l && IsShortName) {
diff --git a/menu.c b/menu.c
index 1b9346c30..cdd9d3ac4 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.60 2012/09/09 12:23:00 kls Exp $
+ * $Id: menu.c 2.61 2012/09/15 11:45:28 kls Exp $
  */
 
 #include "menu.h"
@@ -3118,7 +3118,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditIntItem( tr("Setup.Recording$VPS margin (s)"),            &data.VpsMargin, 0));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
   Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord)));
-  Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 0, MAXINSTANTRECTIME, tr("Setup.Recording$present event")));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));
   Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts));
diff --git a/po/ar.po b/po/ar.po
index 8347285e1..14e8126b2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1102,6 +1102,9 @@ msgstr "اسم التسجيل الفورى"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "مدة التسجيل الفورى بالدقيقة"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "اقصى حجم لملف الفيديو ب م ب"
 
@@ -1280,6 +1283,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "لا يمكن قفل الحاسوب الرمز s لم يحدد"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ce863deb5..c67265b1f 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Anomenar gravacions instant
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Temps de gravaci� instant�nia (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Mida m�xima de l'arxiu (MB)"
 
@@ -1255,6 +1258,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci� -s !"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 96f6b146b..55053f95d 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1079,6 +1079,9 @@ msgstr "Pojmenovat okamžité nahrávky"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Délka okamžitého nahrávání (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximální velikost nahrávky (MB)"
 
@@ -1254,6 +1257,9 @@ msgstr "Generování index souboru"
 msgid "Index file regeneration complete"
 msgstr "Generování index souboru dokončeno"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnutí není možné - chybí volba '-s'!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 3615bc742..fac580030 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Navngiv direkte optagelse"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "L�ngde af direkte optagelse (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Max. video filst�rrelse (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke slukke - parameter '-s' ikke angivet!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index aaa92ea22..a321b5016 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Direktaufzeichnung benennen"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Dauer der Direktaufzeichnung (min)"
 
+msgid "Setup.Recording$present event"
+msgstr "laufende Sendung"
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Max. Videodateigr��e (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr "Index-Datei wird regeneriert"
 msgid "Index file regeneration complete"
 msgstr "Regenerierung der Index-Datei abgeschlossen"
 
+msgid "Index file regeneration failed!"
+msgstr "Regenerierung der Index-Datei fehlgeschlagen!"
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ausschalten unm�glich - Option '-s' fehlt!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 42bd8be24..8936408c9 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "�������� ��������� �������� (�����)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "������� ������� ������� (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�������� �� ����� �����������. ��������� � ���������� '-s'!"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 2bda405b7..bc80a1172 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Nombrar grabaciones inmediatas"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Tiempo de grabaci�n inmediata (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Tama�o m�ximo de fichero (MB)"
 
@@ -1253,6 +1256,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�No se puede apagar - falta el par�metro '-s'!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index ddf9a80f4..0dea99920 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Kiirsalvestuse nimi"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Kiirsalvestuse kestus (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maks. failisuurus (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr "Indeksfaili regenereerimine"
 msgid "Index file regeneration complete"
 msgstr "Indeksfaili regenereerimine lõpetatud"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Väljalülitamine nurjus - '-s' parameeter puudub!"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 11a74adac..daad22ae1 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-13 13:15+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Nimeä pikatallenne"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Pikatallennuksen kesto (min)"
 
+msgid "Setup.Recording$present event"
+msgstr "nykyinen tapahtuma"
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Suurin tiedostokoko (Mt)"
 
@@ -1255,6 +1258,9 @@ msgstr "Luodaan indeksitiedosto uudelleen"
 msgid "Index file regeneration complete"
 msgstr "Indeksitiedosto valmistui"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 5d65eaa1f..3ca3c06fa 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1083,6 +1083,9 @@ msgstr "Noms enregistr. imm
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Dur�e enregistr. imm�diat (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Taille maxi des fichiers (Mo)"
 
@@ -1258,6 +1261,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Arr�t impossible - option '-s' absente !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index b7b8983aa..dcb1a2172 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1079,6 +1079,9 @@ msgstr "Imenuj direktno snimanje"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Trajanje direktnog snimanja (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimalna veli�ina datoteke (MB)"
 
@@ -1254,6 +1257,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 58cf9ce2d..c391b67ef 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1081,6 +1081,9 @@ msgstr "Direktfelv
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Direktfelv�tel id�tartama (perc)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Max. video file m�ret (MB)"
 
@@ -1256,6 +1259,9 @@ msgstr "Az index file 
 msgid "Index file regeneration complete"
 msgstr "Index file �jragener�l�sa k�sz."
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 59b763f67..b63d93d8d 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2012-06-06 22:50+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1084,6 +1084,9 @@ msgstr "Nome reg. immediata"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Durata reg. immediata (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dim. massima file video (MB)"
 
@@ -1259,6 +1262,9 @@ msgstr "Rigenerazione file indice"
 msgid "Index file regeneration complete"
 msgstr "Rigenerazione file indice completata"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Impossibile spegnere - parametro '-s' non assegnato!"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index d9bf213ff..95f8e8319 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Rankiniu būdu vykdomų įrašų įvardinimo schama"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Rankiniu būdu vykdomo įrašo laikas (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maks. video failo dydis (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr "Pergeneruojamas index failas"
 msgid "Index file regeneration complete"
 msgstr "Index failo pergeneravimas baigtas"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sistemos negalima išjungti, nes starto metu nebuvo komandinėj eilutėj paduota savybė '-s'!"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 46d9419c5..fd16ec883 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Име на директно снимање"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Траење на директно снимање (мин)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Максимална големина на датотека (MB)"
 
@@ -1253,6 +1256,9 @@ msgstr "Регенерирање на индекс датотека"
 msgid "Index file regeneration complete"
 msgstr "Регенерирањето на индексот заврши"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Невозможно гаснење - недостасува опцијата '-s'!"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index df75d23db..6c3825d9e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1081,6 +1081,9 @@ msgstr "Naam direkt-opname"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Duur van de directe opname (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximale omvang video file (MB)"
 
@@ -1256,6 +1259,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index f221214da..41ce5c308 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Navngi direkteopptak"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr ""
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimal st�rrelse p� videofiler (MB)"
 
@@ -1253,6 +1256,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan ikke sl� av - startet uten parameteret '-s'!"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 191338988..f4c187613 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Nazywaj natychm. nagrywanie"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Czas natychm. nagrywania (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksymalny rozmiar pliku (MB)"
 
@@ -1253,6 +1256,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 11fdb4c0d..5cfc2037f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Nome da grava
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Validade da grava��o instant�nea (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Tamanho m�ximo do ficheiro de v�deo (MB)"
 
@@ -1253,6 +1256,9 @@ msgstr "A regenerar 
 msgid "Index file regeneration complete"
 msgstr "Regenera��o do �ndice do ficheiro completa"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Imposs�vel desligar - falta o par�metro '-s'!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 40571e552..cd638dcd3 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2011-03-10 23:52+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Nume 
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Timpul de �nregistare imediat� (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dimensiune maxim� a fi�ierului video (MB)"
 
@@ -1255,6 +1258,9 @@ msgstr "Generez index"
 msgid "Index file regeneration complete"
 msgstr "Generarea indexului s-a incheiat"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nu pot �nchide - vezi op�iunea '-s'"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f159d1ef3..d8e1e8e1d 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "������������ ������ ������ (���)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "����. ������ ���������� (��)"
 
@@ -1253,6 +1256,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "���������� ���������� - �� ����� �������� '-s'!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index fc75998fa..0de2d0619 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Premenova
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "D�ka okam�it�ho nahr�vania (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maxim�lna ve�kos� nahr�vky (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr "Regenera
 msgid "Index file regeneration complete"
 msgstr "Regener�cia indexov�ho s�boru hotov�"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnutie nie je mo�n� - ch�ba vo�ba '-s'!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 95a45dfe9..955686829 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Ime za direktno snemanje"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "�as direktnega snemanja (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Najve�ja velikost datoteke (MB)"
 
@@ -1253,6 +1256,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 0e6f9cd68..c4149ddaf 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1100,6 +1100,9 @@ msgstr "Imenuj trenutno snimanje"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Trajanje trenutnog snimanja (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maks. veli�ina datoteke (MB)"
 
@@ -1278,6 +1281,9 @@ msgstr "Obnavljanje index datoteke"
 msgid "Index file regeneration complete"
 msgstr "Obnavljanje index datoteke zavr�eno"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index aa66721cb..951dd044c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Namnge direktinspelning"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Direktinspelning l�ngd (min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximal filstorlek f�r inspelning (MB)"
 
@@ -1255,6 +1258,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kan inte avsluta, m�ste anv�nda parameter '-s'"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index e4acde3f5..8b161b3f1 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Derhal 
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Derhal �ekim s�resi (dak)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksimum Video k�t�k b�y�kl�g� (MB)"
 
@@ -1252,6 +1255,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Kapat�lam�yor - '-s' se�ene�i verilmemi�!"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 62b5fc646..45e57ee52 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Схема найменувань ручних записів"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Протяжність ручного запису (хв)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Макс. размір відеофайлу (Мб)"
 
@@ -1252,6 +1255,9 @@ msgstr "Регенерація файлу індексів"
 msgid "Index file regeneration complete"
 msgstr "Регенерацію файлу індексу завершено"
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Виключенння неможливе - не задано параметр '-s'!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2277a940a..4e2b951fb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-09 15:20+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "名字直接记录"
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "直接录像时间(min)"
 
+msgid "Setup.Recording$present event"
+msgstr ""
+
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "最大的视频文件容量 (MB)"
 
@@ -1255,6 +1258,9 @@ msgstr ""
 msgid "Index file regeneration complete"
 msgstr ""
 
+msgid "Index file regeneration failed!"
+msgstr ""
+
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "不能关机 - 操作 '-s' 不允许!"
 
diff --git a/recorder.c b/recorder.c
index a6cab473b..a9cc8c953 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.15 2011/09/04 09:26:44 kls Exp $
+ * $Id: recorder.c 2.17 2012/09/22 11:53:57 kls Exp $
  */
 
 #include "recorder.h"
 #include "shutdown.h"
 
-#define RECORDERBUFSIZE  (MEGABYTE(5) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE
+#define RECORDERBUFSIZE  (MEGABYTE(20) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE
 
 // The maximum time we wait before assuming that a recorded video data stream
 // is broken:
@@ -33,6 +33,7 @@ cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority
 
   ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE, true, "Recorder");
   ringBuffer->SetTimeouts(0, 100);
+  ringBuffer->SetIoThrottle();
 
   int Pid = Channel->Vpid();
   int Type = Channel->Vtype();
diff --git a/recording.c b/recording.c
index 9c80505ef..1eeb82d0c 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.60 2012/09/06 09:57:31 kls Exp $
+ * $Id: recording.c 2.64 2012/09/30 13:05:14 kls Exp $
  */
 
 #include "recording.h"
@@ -107,8 +107,10 @@ void cRemoveDeletedRecordingsThread::Action(void)
             }
          r = DeletedRecordings.Next(r);
          }
-     if (deleted)
-        RemoveEmptyVideoDirectories();
+     if (deleted) {
+        const char *IgnoreFiles[] = { SORTMODEFILE, NULL };
+        RemoveEmptyVideoDirectories(IgnoreFiles);
+        }
      }
 }
 
@@ -820,9 +822,13 @@ char *cRecording::StripEpisodeName(char *s)
         t++;
         }
   if (s1 && s2) {
+     // To have folders sorted before plain recordings, the '/' s1 points to
+     // is replaced by the character 'b'. All other slashes will be replaced
+     // by 'a' in SortName() (see below), which will result in the desired
+     // sequence:
+     *s1 = 'b';
      s1++;
      memmove(s1, s2, t - s2 + 1);
-     *s1 = 0xFF; // sorts folders before plain recordings
      }
   return s;
 }
@@ -1010,8 +1016,10 @@ bool cRecording::Delete(void)
         RemoveVideoFile(NewName);
         }
      isyslog("deleting recording '%s'", FileName());
-     if (access(FileName(), F_OK) == 0)
+     if (access(FileName(), F_OK) == 0) {
         result = RenameVideoFile(FileName(), NewName);
+        cRecordingUserCommand::InvokeCommand(RUC_DELETERECORDING, NewName);
+        }
      else {
         isyslog("recording '%s' vanished", FileName());
         result = true; // well, we were going to delete it, anyway
@@ -1483,6 +1491,7 @@ cIndexFileGenerator::~cIndexFileGenerator()
 void cIndexFileGenerator::Action(void)
 {
   bool IndexFileComplete = false;
+  bool IndexFileWritten = false;
   bool Rewind = false;
   cFileName FileName(recordingName, false);
   cUnbufferedFile *ReplayFile = FileName.Open();
@@ -1514,6 +1523,7 @@ void cIndexFileGenerator::Action(void)
                  if (FrameDetector.NewFrame()) {
                     IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize);
                     FrameOffset = -1;
+                    IndexFileWritten = true;
                     }
                  FileSize += Processed;
                  Buffer.Del(Processed);
@@ -1568,11 +1578,16 @@ void cIndexFileGenerator::Action(void)
            break;
            }
         }
+  if (IndexFileComplete) {
+     if (IndexFileWritten) {
+        Skins.QueueMessage(mtInfo, tr("Index file regeneration complete"));
+        return;
+        }
+     else
+        Skins.QueueMessage(mtError, tr("Index file regeneration failed!"));
+     }
   // Delete the index file if the recording has not been processed entirely:
-  if (IndexFileComplete)
-     Skins.QueueMessage(mtInfo, tr("Index file regeneration complete"));
-  else
-     IndexFile.Delete();
+  IndexFile.Delete();
 }
 
 // --- cIndexFile ------------------------------------------------------------
diff --git a/recording.h b/recording.h
index 84a23b3b8..ac44ad5bd 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.36 2012/09/06 09:59:11 kls Exp $
+ * $Id: recording.h 2.37 2012/09/17 08:53:23 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -240,6 +240,7 @@ class cMarks : public cConfig<cMark> {
 #define RUC_BEFORERECORDING "before"
 #define RUC_AFTERRECORDING  "after"
 #define RUC_EDITEDRECORDING "edited"
+#define RUC_DELETERECORDING "deleted"
 
 class cRecordingUserCommand {
 private:
diff --git a/remux.c b/remux.c
index bd06e7cec..6450da402 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.64 2012/03/02 10:56:49 kls Exp $
+ * $Id: remux.c 2.67 2012/09/19 10:28:42 kls Exp $
  */
 
 #include "remux.h"
@@ -622,6 +622,34 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                          }
                       }
                       break;
+           case 0x81: // STREAMTYPE_USER_PRIVATE
+                      {
+                      dbgpatpmt(" AC3");
+                      char lang[MAXLANGCODE1] = { 0 };
+                      SI::Descriptor *d;
+                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                          switch (d->getDescriptorTag()) {
+                            case SI::ISO639LanguageDescriptorTag: {
+                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                 dbgpatpmt(" '%s'", ld->languageCode);
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                 }
+                                 break;
+                            default: ;
+                            }
+                         delete d;
+                         }
+                      if (NumDpids < MAXDPIDS) {
+                         dpids[NumDpids] = stream.getPid();
+                         dtypes[NumDpids] = SI::AC3DescriptorTag;
+                         strn0cpy(dlangs[NumDpids], lang, sizeof(dlangs[NumDpids]));
+                         if (updatePrimaryDevice && Setup.UseDolbyDigital)
+                            cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, stream.getPid(), lang);
+                         NumDpids++;
+                         dpids[NumDpids]= 0;
+                         }
+                      }
+                      break;
            default: ;
            }
          dbgpatpmt("\n");
@@ -843,7 +871,8 @@ int cFrameDetector::SkipPackets(const uchar *&Data, int &Length, int &Processed,
 
 int cFrameDetector::Analyze(const uchar *Data, int Length)
 {
-  int SeenPayloadStart = false;
+  bool SeenPayloadStart = false;
+  bool SeenAccessUnitDelimiter = false;
   int Processed = 0;
   newFrame = independentFrame = false;
   while (Length >= TS_SIZE) {
@@ -970,12 +999,16 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                                scanner = EMPTY_SCANNER;
                                if (synced && !SeenPayloadStart && Processed)
                                   return Processed; // flush everything before this new frame
+                               SeenAccessUnitDelimiter = true;
+                               }
+                            else if (SeenAccessUnitDelimiter && scanner == 0x00000001) { // NALU start
+                               SeenAccessUnitDelimiter = false;
                                int FrameTypeOffset = i + 1;
                                if (FrameTypeOffset >= TS_SIZE) // the byte to check is in the next TS packet
                                   i = SkipPackets(Data, Length, Processed, FrameTypeOffset);
                                newFrame = true;
-                               uchar FrameType = Data[FrameTypeOffset];
-                               independentFrame = FrameType == 0x10;
+                               uchar FrameType = Data[FrameTypeOffset] & 0x1F;
+                               independentFrame = FrameType == 0x07;
                                if (synced) {
                                   if (framesPerPayloadUnit < 0) {
                                      payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
diff --git a/ringbuffer.c b/ringbuffer.c
index 1bdeaccc6..abe78990c 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 2.3 2009/11/22 11:14:36 kls Exp $
+ * $Id: ringbuffer.c 2.5 2012/09/22 11:26:49 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -20,6 +20,8 @@
 #define OVERFLOWREPORTDELTA 5 // seconds between reports
 #define PERCENTAGEDELTA     10
 #define PERCENTAGETHRESHOLD 70
+#define IOTHROTTLELOW       20
+#define IOTHROTTLEHIGH      50
 
 cRingBuffer::cRingBuffer(int Size, bool Statistics)
 {
@@ -31,10 +33,12 @@ cRingBuffer::cRingBuffer(int Size, bool Statistics)
   putTimeout = getTimeout = 0;
   lastOverflowReport = 0;
   overflowCount = overflowBytes = 0;
+  ioThrottle = NULL;
 }
 
 cRingBuffer::~cRingBuffer()
 {
+  delete ioThrottle;
   if (statistics)
      dsyslog("buffer stats: %d (%d%%) used", maxFill, maxFill * 100 / (size - 1));
 }
@@ -50,6 +54,12 @@ void cRingBuffer::UpdatePercentage(int Fill)
         lastPercent = percent;
         }
      }
+  if (ioThrottle) {
+     if (percent >= IOTHROTTLEHIGH)
+        ioThrottle->Activate();
+     else if (percent < IOTHROTTLELOW)
+        ioThrottle->Release();
+     }
 }
 
 void cRingBuffer::WaitForPut(void)
@@ -66,13 +76,13 @@ void cRingBuffer::WaitForGet(void)
 
 void cRingBuffer::EnablePut(void)
 {
-  if (putTimeout && Free() > Size() / 3)
+  if (putTimeout && Free() > Size() / 10)
      readyForPut.Signal();
 }
 
 void cRingBuffer::EnableGet(void)
 {
-  if (getTimeout && Available() > Size() / 3)
+  if (getTimeout && Available() > Size() / 10)
      readyForGet.Signal();
 }
 
@@ -82,6 +92,12 @@ void cRingBuffer::SetTimeouts(int PutTimeout, int GetTimeout)
   getTimeout = GetTimeout;
 }
 
+void cRingBuffer::SetIoThrottle(void)
+{
+  if (!ioThrottle)
+     ioThrottle = new cIoThrottle;
+}
+
 void cRingBuffer::ReportOverflow(int Bytes)
 {
   overflowCount++;
diff --git a/ringbuffer.h b/ringbuffer.h
index d234502da..5b2eeb1c0 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 2.3 2011/12/04 13:38:17 kls Exp $
+ * $Id: ringbuffer.h 2.4 2012/09/20 09:29:32 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -22,6 +22,7 @@ class cRingBuffer {
   time_t lastOverflowReport;
   int overflowCount;
   int overflowBytes;
+  cIoThrottle *ioThrottle;
 protected:
   tThreadId getThreadTid;
   int maxFill;//XXX
@@ -40,6 +41,7 @@ class cRingBuffer {
   cRingBuffer(int Size, bool Statistics = false);
   virtual ~cRingBuffer();
   void SetTimeouts(int PutTimeout, int GetTimeout);
+  void SetIoThrottle(void);
   void ReportOverflow(int Bytes);
   };
 
diff --git a/skinlcars.c b/skinlcars.c
index 39d037470..b2dab50d7 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.14 2012/09/09 12:16:50 kls Exp $
+ * $Id: skinlcars.c 2.15 2012/09/19 11:05:50 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1661,6 +1661,7 @@ class cSkinLCARSDisplayReplay : public cSkinDisplayReplay {
   bool modeOnly;
   int lineHeight;
   tColor frameColor;
+  int lastCurrentWidth;
   cString lastDate;
   tTrackId lastTrackId;
   void DrawDate(void);
@@ -1685,6 +1686,7 @@ cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly)
   modeOnly = ModeOnly;
   lineHeight = font->Height();
   frameColor = Theme.Color(clrReplayFrameBg);
+  lastCurrentWidth = 0;
   int d = 5 * lineHeight;
   xp00 = 0;
   xp01 = xp00 + d / 2;
@@ -1801,8 +1803,9 @@ void cSkinLCARSDisplayReplay::SetProgress(int Current, int Total)
 void cSkinLCARSDisplayReplay::SetCurrent(const char *Current)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  int w = font->Width(Current) + 10;
-  osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taLeft);
+  int w = font->Width(Current);
+  osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : w, 0, taLeft);
+  lastCurrentWidth = w;
 }
 
 void cSkinLCARSDisplayReplay::SetTotal(const char *Total)
diff --git a/thread.c b/thread.c
index 5bcc9a549..a650fab83 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.4 2012/05/08 11:15:57 kls Exp $
+ * $Id: thread.c 2.5 2012/09/20 09:05:50 kls Exp $
  */
 
 #include "thread.h"
@@ -398,6 +398,48 @@ bool cThreadLock::Lock(cThread *Thread)
   return false;
 }
 
+// --- cIoThrottle -----------------------------------------------------------
+
+cMutex cIoThrottle::mutex;
+int cIoThrottle::count = 0;
+
+cIoThrottle::cIoThrottle(void)
+{
+  active = false;
+}
+
+cIoThrottle::~cIoThrottle()
+{
+  Release();
+}
+
+void cIoThrottle::Activate(void)
+{
+  if (!active) {
+     mutex.Lock();
+     count++;
+     active = true;
+     dsyslog("i/o throttle activated, count = %d (tid=%d)", count, cThread::ThreadId());
+     mutex.Unlock();
+     }
+}
+
+void cIoThrottle::Release(void)
+{
+  if (active) {
+     mutex.Lock();
+     count--;
+     active = false;
+     dsyslog("i/o throttle released, count = %d (tid=%d)", count, cThread::ThreadId());
+     mutex.Unlock();
+     }
+}
+
+bool cIoThrottle::Engaged(void)
+{
+  return count > 0;
+}
+
 // --- cPipe -----------------------------------------------------------------
 
 // cPipe::Open() and cPipe::Close() are based on code originally received from
diff --git a/thread.h b/thread.h
index d4919eb60..f77e81986 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 2.1 2009/04/13 13:50:39 kls Exp $
+ * $Id: thread.h 2.2 2012/09/20 08:46:27 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -157,6 +157,29 @@ class cThreadLock {
 
 #define LOCK_THREAD cThreadLock ThreadLock(this)
 
+class cIoThrottle {
+private:
+  static cMutex mutex;
+  static int count;
+  bool active;
+public:
+  cIoThrottle(void);
+  ~cIoThrottle();
+  void Activate(void);
+       ///< Activates the global I/O throttling mechanism.
+       ///< This function may be called any number of times, but only
+       ///< the first call after an inactive state will have an effect.
+  void Release(void);
+       ///< Releases the global I/O throttling mechanism.
+       ///< This function may be called any number of times, but only
+       ///< the first call after an active state will have an effect.
+  bool Active(void) { return active; }
+       ///< Returns true if this I/O throttling object is currently active.
+  static bool Engaged(void);
+       ///< Returns true if any I/O throttling object is currently active.
+  };
+
+
 // cPipe implements a pipe that closes all unnecessary file descriptors in
 // the child process.
 
diff --git a/timers.c b/timers.c
index c4f4f7af1..7d4c70b1b 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.11 2012/06/09 14:37:24 kls Exp $
+ * $Id: timers.c 2.12 2012/09/15 13:34:03 kls Exp $
  */
 
 #include "timers.h"
@@ -32,6 +32,9 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   deferred = 0;
   recording = pending = inVpsMargin = false;
   flags = tfNone;
+  *file = 0;
+  aux = NULL;
+  event = NULL;
   if (Instant)
      SetFlags(tfActive | tfInstant);
   channel = Channel ? Channel : Channels.GetByNumber(cDevice::CurrentChannel());
@@ -41,15 +44,40 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   day = SetTime(t, 0);
   weekdays = 0;
   start = now->tm_hour * 100 + now->tm_min;
-  stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
-  stop = (stop / 60) * 100 + (stop % 60);
+  stop = 0;
+  if (!Setup.InstantRecordTime && channel) {
+     cSchedulesLock SchedulesLock;
+     if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
+        if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
+           if (const cEvent *Event = Schedule->GetPresentEvent()) {
+              time_t tstart = Event->StartTime();
+              time_t tstop = Event->EndTime();
+              if (Event->Vps() && Setup.UseVps) {
+                 SetFlags(tfVps);
+                 tstart = Event->Vps();
+                 }
+              else {
+                 tstop  += Setup.MarginStop * 60;
+                 tstart -= Setup.MarginStart * 60;
+                 }
+              day = SetTime(tstart, 0);
+              struct tm *time = localtime_r(&tstart, &tm_r);
+              start = time->tm_hour * 100 + time->tm_min;
+              time = localtime_r(&tstop, &tm_r);
+              stop = time->tm_hour * 100 + time->tm_min;
+              SetEvent(Event);
+              }
+           }
+        }
+     }
+  if (!stop) {
+     stop = now->tm_hour * 60 + now->tm_min + (Setup.InstantRecordTime ? Setup.InstantRecordTime : DEFINSTRECTIME);
+     stop = (stop / 60) * 100 + (stop % 60);
+     }
   if (stop >= 2400)
      stop -= 2400;
   priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
   lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
-  *file = 0;
-  aux = NULL;
-  event = NULL;
   if (Instant && channel)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
   if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) {
@@ -66,6 +94,9 @@ cTimer::cTimer(const cEvent *Event)
   deferred = 0;
   recording = pending = inVpsMargin = false;
   flags = tfActive;
+  *file = 0;
+  aux = NULL;
+  event = NULL;
   if (Event->Vps() && Setup.UseVps)
      SetFlags(tfVps);
   channel = Channels.GetByChannelID(Event->ChannelID(), true);
@@ -86,7 +117,6 @@ cTimer::cTimer(const cEvent *Event)
      stop -= 2400;
   priority = Setup.DefaultPriority;
   lifetime = Setup.DefaultLifetime;
-  *file = 0;
   const char *Title = Event->Title();
   if (!isempty(Title))
      Utf8Strn0Cpy(file, Event->Title(), sizeof(file));
@@ -95,8 +125,7 @@ cTimer::cTimer(const cEvent *Event)
      file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
      dsyslog("timer file name truncated to '%s'", file);
      }
-  aux = NULL;
-  event = NULL; // let SetEvent() be called to get a log message
+  SetEvent(Event);
 }
 
 cTimer::cTimer(const cTimer &Timer)
diff --git a/tools.c b/tools.c
index 3d9c513c3..26c325b6e 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.25 2012/08/21 10:34:37 kls Exp $
+ * $Id: tools.c 2.26 2012/09/30 13:04:14 kls Exp $
  */
 
 #include "tools.h"
@@ -285,6 +285,18 @@ int64_t StrToNum(const char *s)
   return n;
 }
 
+bool StrInArray(const char *a[], const char *s)
+{
+  if (a) {
+     while (*a) {
+           if (strcmp(*a, s) == 0)
+              return true;
+           a++;
+           }
+     }
+  return false;
+}
+
 cString AddDirectory(const char *DirName, const char *FileName)
 {
   return cString::sprintf("%s/%s", DirName && *DirName ? DirName : ".", FileName);
@@ -433,9 +445,9 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
   return true;
 }
 
-bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
+bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis, const char *IgnoreFiles[])
 {
-  bool HasDotFiles = false;
+  bool HasIgnoredFiles = false;
   cReadDir d(DirName);
   if (d.Ok()) {
      bool empty = true;
@@ -446,11 +458,11 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
               struct stat st;
               if (stat(buffer, &st) == 0) {
                  if (S_ISDIR(st.st_mode)) {
-                    if (!RemoveEmptyDirectories(buffer, true))
+                    if (!RemoveEmptyDirectories(buffer, true, IgnoreFiles))
                        empty = false;
                     }
-                 else if (*e->d_name == '.') // "dot files" don't count
-                    HasDotFiles = true;
+                 else if (RemoveThis && IgnoreFiles && StrInArray(IgnoreFiles, e->d_name))
+                    HasIgnoredFiles = true;
                  else
                     empty = false;
                  }
@@ -461,21 +473,18 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
               }
            }
      if (RemoveThis && empty) {
-        if (HasDotFiles) {
-           cReadDir d(DirName);
-           if (d.Ok()) {
-              struct dirent *e;
-              while ((e = d.Next()) != NULL) {
-                    if (*e->d_name == '.') { // for safety - should always be true
-                       cString buffer = AddDirectory(DirName, e->d_name);
-                       dsyslog("removing %s", *buffer);
-                       if (remove(buffer) < 0) {
-                          LOG_ERROR_STR(*buffer);
-                          return false;
-                          }
+        if (HasIgnoredFiles) {
+           while (*IgnoreFiles) {
+                 cString buffer = AddDirectory(DirName, *IgnoreFiles);
+                 if (access(buffer, F_OK) == 0) {
+                    dsyslog("removing %s", *buffer);
+                    if (remove(buffer) < 0) {
+                       LOG_ERROR_STR(*buffer);
+                       return false;
                        }
                     }
-              }
+                 IgnoreFiles++;
+                 }
            }
         dsyslog("removing %s", DirName);
         if (remove(DirName) < 0) {
diff --git a/tools.h b/tools.h
index b73448d36..3e546a17e 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.21 2012/05/20 13:58:06 kls Exp $
+ * $Id: tools.h 2.22 2012/09/30 11:02:21 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -213,6 +213,9 @@ int64_t StrToNum(const char *s);
     ///< K, M, G or T to abbreviate Kilo-, Mega-, Giga- or Terabyte, respectively
     ///< (based on 1024). Everything after the first non-numeric character is
     ///< silently ignored, as are any characters other than the ones mentioned here.
+bool StrInArray(const char *a[], const char *s);
+    ///< Returns true if the string s is equal to one of the strings pointed
+    ///< to by the (NULL terminated) array a.
 cString itoa(int n);
 cString AddDirectory(const char *DirName, const char *FileName);
 bool EntriesOnSameFileSystem(const char *File1, const char *File2);
@@ -220,7 +223,12 @@ int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);
 bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks = false);
-bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false);
+bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis = false, const char *IgnoreFiles[] = NULL);
+     ///< Removes all empty directories under the given directory DirName.
+     ///< If RemoveThis is true, DirName will also be removed if it is empty.
+     ///< IgnoreFiles can be set to an array of file names that will be ignored when
+     ///< considering whether a directory is empty. If IgnoreFiles is given, the array
+     ///< must end with a NULL pointer.
 int DirSizeMB(const char *DirName); ///< returns the total size of the files in the given directory, or -1 in case of an error
 char *ReadLink(const char *FileName); ///< returns a new string allocated on the heap, which the caller must delete (or NULL in case of an error)
 bool SpinUpDisk(const char *FileName);
diff --git a/vdr.c b/vdr.c
index f5896caaf..2e097bae8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.38 2012/09/01 13:30:19 kls Exp $
+ * $Id: vdr.c 2.40 2012/09/24 12:43:04 kls Exp $
  */
 
 #include <getopt.h>
@@ -466,7 +466,8 @@ int main(int argc, char *argv[])
                "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
                "                           0 turns off SVDRP\n"
                "  -P OPT,   --plugin=OPT   load a plugin defined by the given options\n"
-               "  -r CMD,   --record=CMD   call CMD before and after a recording\n"
+               "  -r CMD,   --record=CMD   call CMD before and after a recording, and after\n"
+               "                           a recording has been edited or deleted\n"
                "            --resdir=DIR   read resource files from DIR (default: %s)\n"
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "            --split        split edited files at the editing marks (only\n"
@@ -1294,6 +1295,8 @@ int main(int argc, char *argv[])
            PluginManager.Housekeeping();
            }
 
+        ReportEpgBugFixStats();
+
         // Main thread hooks of plugins:
         PluginManager.MainThreadHook();
         }
@@ -1330,7 +1333,7 @@ int main(int argc, char *argv[])
   EpgHandlers.Clear();
   PluginManager.Shutdown(true);
   cSchedules::Cleanup(true);
-  ReportEpgBugFixStats();
+  ReportEpgBugFixStats(true);
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
   if (LastSignal)
diff --git a/videodir.c b/videodir.c
index c64a5c653..d39ab051a 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 2.3 2012/09/01 10:57:44 kls Exp $
+ * $Id: videodir.c 2.4 2012/09/30 12:06:33 kls Exp $
  */
 
 #include "videodir.h"
@@ -229,11 +229,11 @@ cString PrefixVideoFileName(const char *FileName, char Prefix)
   return NULL;
 }
 
-void RemoveEmptyVideoDirectories(void)
+void RemoveEmptyVideoDirectories(const char *IgnoreFiles[])
 {
   cVideoDirectory Dir;
   do {
-     RemoveEmptyDirectories(Dir.Name());
+     RemoveEmptyDirectories(Dir.Name(), false, IgnoreFiles);
      } while (Dir.Next());
 }
 
diff --git a/videodir.h b/videodir.h
index 40d7b0589..a25ac3193 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 2.2 2012/09/01 10:57:07 kls Exp $
+ * $Id: videodir.h 2.3 2012/09/30 11:01:15 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -23,7 +23,7 @@ bool RemoveVideoFile(const char *FileName);
 bool VideoFileSpaceAvailable(int SizeMB);
 int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
 cString PrefixVideoFileName(const char *FileName, char Prefix);
-void RemoveEmptyVideoDirectories(void);
+void RemoveEmptyVideoDirectories(const char *IgnoreFiles[] = NULL);
 bool IsOnVideoDirectoryFileSystem(const char *FileName);
 
 class cVideoDiskUsage {

From beffcabc81cff46d620b1662d03e4da4dbd6b678 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 18 Nov 2012 14:58:00 +0100
Subject: [PATCH 218/307] Version 1.7.32 VDR developer version 1.7.32 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.32.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.31-1.7.32.diff

MD5 checksums:

068ba78fd427694dcc480fe3b2d07148  vdr-1.7.32.tar.bz2
222f1e9b4d4edaa6fe57286409614cc7  vdr-1.7.31-1.7.32.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The main focus of this version is on an improved frame detection code,
and improvements to the cutting process. When cutting a recording, VDR
now removes any "dangling" TS packets from the beginning of an editing
sequence and pulls in any "pending" TS packets at the end of a sequence.
It also fixes all timestamps and continuity counters.
However, while the results look much better now in, for instance, Kaffeine,
the TT S2-6400 still shows some video artifacts at the editing points, and
the Mac video player sometimes totally chokes on edited material.
I did spend a lot of time trying to find out what could still be wrong here,
but couldn't come up with any new ideas. So I think it's now time to invite
others to test this new cutting code, read the source code and try to find
out what's still going wrong here. Maybe (hopefully ;-) it's just some stupid
little error... ;-)

From the HISTORY file:
- Pressing the Play key during normal live viewing mode now opens the Recordings menu
  if there is no "last viewed" recording (thanks to Alexander Wenzel).
  The same behavior has been implemented for the Blue key in the main menu.
- cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action(),
  to suspend removing deleted recordings in case this is necessary to make room for
  new, ongoing recordings (suggested by Udo Richter).
- The cThread constructor now has an additional boolean parameter that can be set to
  true to have this thread run at a lower priority. Plugin authors that use low
  priority threads may want to use this instead of the calls to SetPriority(19) and
  SetIOPriority(7). The priority of a thread ("low" or "high") is now logged when the
  thread starts.
- Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible
  change in DVB API 5.8 (reported by Derek Kelly).
  Removed the meanwhile obsolete definition of FE_CAN_TURBO_FEC.
- Fixed some compiler warnings under gcc version 4.7.1.
- Fixed setting the video format in the dvbhdffdevice (thanks to Torsten Lang).
- Fixed 'make install' to not overwrite existing configuration files (thanks to Peter
  Münster).
- Added including the Make.global and Make.config files to the dvbdhffdevice's
  libhdffcmd/Makefile.
- Added options to build a 32-bit version of VDR on a 64-bit machine to
  Make.config.template.
- Fixed handling VPS timers in case the running status of an event goes to '1' (not
  running) and later goes to '4' (running).
- If a frame position in the 'marks' file of a recording doesn't point to an I-frame,
  it will now be shifted towards the next I-frame, either up or down, whichever is
  closer (suggested by Udo Richter).
- Fixed a possible memory leak in SI::StructureLoop::getNextAsPointer() (reported by
  Sundararaj Reel).
- Fixed handling timers in case an event is modified and "phased out" while the timer
  is recording.
- Improved frame detection by parsing just far enough into the MPEG-4 NAL units to get
  the necessary information about frames and slices.
- The initial syncing of the frame detector is now done immediately after the first
  complete GOP has been seen. This makes recordings and especially pausing live video
  start up to twice as fast as before.
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Fixed handling the very last entry in a recording index.
- The return type of cMarks::Add() has been changed to void, since due to the sorting
  of the list of marks the returned pointer might have pointed to a totally different
  mark. Besides, the return value was never actually used.
- Improved editing TS recordings by
  + stripping dangling TS packets from the beginning of a sequence
  + including pending TS packets at the end of a sequence
  + fixing all timestamps and continuity counters
  + generating editing marks for the edited version in such a way that each cutting
    point is marked by an "end" and "begin" mark with the same offset
  + no longer generating an editing mark at the "end" of the edited recording (this
    was actually generated at the beginning of the last GOP, so that a subsequent
    edit would have cut off the last GOP)
  + no longer generating any editing marks if the edited recording results on just
    one single sequence
  + ignoring pairs of editing marks that are placed at exactly the same position of
    a recording when actually cutting the recording
  + not doing anything if the editing marks in place would result in the edited
    version being the same as the original recording
- Editing marks can now be placed directly on top of each other, in which case they
  simply mark a position, but have no effect on the actual cutting process.
- When positioned at an offset where two (or more) editing marks are placed on top
  of each other, the '4' key moves the first one of them to the left, while the '6'
  key moves the last one of them to the right. The '7' and '9' key handle multiple
  marks at the same place as if it were one single mark.
- Modified editing marks are now written to disk whenever the replay progress display
  gets hidden (thanks to Christoph Haubrich).
---
 CONTRIBUTORS                                  |  13 +
 HISTORY                                       |  67 ++
 INSTALL                                       |   4 +
 MANUAL                                        |  20 +-
 Make.config.template                          |   8 +-
 Makefile                                      |   4 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c       | 169 ++--
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h       |   3 +-
 PLUGINS/src/dvbhddevice/hdffcmd.c             |   7 +-
 PLUGINS/src/dvbhddevice/hdffcmd.h             |   3 +-
 PLUGINS/src/dvbhddevice/hdffmsgdef.h          | 313 -------
 PLUGINS/src/dvbhddevice/hdffosd.c             |   4 +-
 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile   |  12 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.c   |  19 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.h   |   2 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_defs.h |   1 +
 PLUGINS/src/dvbhddevice/po/de_DE.po           |   5 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po           |   5 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po           |   5 +-
 PLUGINS/src/dvbhddevice/setup.c               |   7 +-
 PLUGINS/src/dvbhddevice/setup.h               |   3 +-
 ci.c                                          |   6 +-
 config.h                                      |  10 +-
 cutter.c                                      | 654 ++++++++++----
 device.c                                      |   6 +-
 dvbdevice.c                                   |  22 +-
 epg.c                                         |   6 +-
 libsi/si.h                                    |   6 +-
 menu.c                                        |  28 +-
 po/ar.po                                      |   5 +-
 po/ca_ES.po                                   |   5 +-
 po/cs_CZ.po                                   |   5 +-
 po/da_DK.po                                   |   5 +-
 po/de_DE.po                                   |   5 +-
 po/el_GR.po                                   |   5 +-
 po/es_ES.po                                   |   5 +-
 po/et_EE.po                                   |   5 +-
 po/fi_FI.po                                   |   5 +-
 po/fr_FR.po                                   |   5 +-
 po/hr_HR.po                                   |   5 +-
 po/hu_HU.po                                   |   5 +-
 po/it_IT.po                                   |   5 +-
 po/lt_LT.po                                   |   5 +-
 po/mk_MK.po                                   |   5 +-
 po/nl_NL.po                                   |   5 +-
 po/nn_NO.po                                   |   5 +-
 po/pl_PL.po                                   |   5 +-
 po/pt_PT.po                                   |   5 +-
 po/ro_RO.po                                   | 495 +++++------
 po/ru_RU.po                                   |   5 +-
 po/sk_SK.po                                   |   5 +-
 po/sl_SI.po                                   |   5 +-
 po/sr_SR.po                                   |   5 +-
 po/sv_SE.po                                   |   5 +-
 po/tr_TR.po                                   |   5 +-
 po/uk_UA.po                                   |   5 +-
 po/zh_CN.po                                   |   5 +-
 recording.c                                   | 139 ++-
 recording.h                                   |  26 +-
 remux.c                                       | 812 +++++++++++++-----
 remux.h                                       | 142 ++-
 sections.c                                    |   5 +-
 skinlcars.h                                   |   2 +-
 themes.h                                      |   4 +-
 thread.c                                      |  11 +-
 thread.h                                      |   7 +-
 timers.c                                      |  21 +-
 vdr.5                                         |  10 +-
 vdr.c                                         |   6 +-
 69 files changed, 2091 insertions(+), 1136 deletions(-)
 delete mode 100644 PLUGINS/src/dvbhddevice/hdffmsgdef.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a275edbbd..9e2317ff7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1757,6 +1757,9 @@ Udo Richter <udo_richter@gmx.de>
  for adding the option --outputonly to the dvbsddevice plugin
  for adding a missing template specification to the c'tor of cSortedTimers
  for contributing to a patch that implements FHS support
+ for suggesting to check cIoThrottle::Engaged() in cRemoveDeletedRecordingsThread::Action()
+ for suggesting to shift editing marks that don't point to an I-frame towards the next I-frame
+ when a recording is played
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2305,6 +2308,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for fixing cRecording::LengthInSeconds(), which wrongfully rounded the result to full
  minutes
  for suggesting to check for NULL in cOsd::AddPixmap()
+ for making modified editing marks be written to disk whenever the replay progress
+ display gets hidden
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2314,6 +2319,8 @@ Alexander Wenzel <hondansx@gmx.de>
  for fixing the shutdown timeout
  for making the script given to VDR with the '-r' option be also called whenever a
  recording is deleted
+ for making pressing the Play key during normal live viewing mode open the Recordings
+ menu if there is no "last viewed" recording
 
 Jan Lenz <email@JanLenz.de>
  for reporting a bug in deleting recordings that have been removed externally when
@@ -2618,6 +2625,7 @@ Sundararaj Reel <sundararaj.reel@googlemail.com>
  for reporting a problem with the function cString::sprintf(const char *fmt, va_list &ap),
  that might inadvertently be called with a 'char *' as the second argument on some
  compilers and cause a crash
+ for reporting a possible memory leak in SI::StructureLoop::getNextAsPointer()
 
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
@@ -2692,6 +2700,7 @@ Derek Kelly (user.vdr@gmail.com)
  several payloads
  for reporting a problem with getting the maximum short channel name length in case there
  are no short names at all
+ for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2895,6 +2904,7 @@ Torsten Lang <info@torstenlang.de>
  in case buffers run full
  for suggesting to increase the size of the TS buffer to 5MB and that of the Recorder
  buffer to 20MB to better handle HD recordings
+ for fixing setting the video format in the dvbhdffdevice
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
@@ -2960,3 +2970,6 @@ S
  for a patch that was used to move cleaning up the EPG data and writing the epg.data
  file into a separate thread to avoid sluggish response to user input on slow systems
  for fixing sorting folders before recordings in case of UTF-8
+
+Peter M�nster <pmlists@free.fr>
+ for fixing 'make install' to not overwrite existing configuration files
diff --git a/HISTORY b/HISTORY
index a1cb40c68..ff1681b62 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7271,3 +7271,70 @@ Video Disk Recorder Revision History
   whether a directory is empty. This allows users to continue to use files such as
   ".keep" to prevent a directory from being deleted when it is empty. Currently the
   only file name that is ignored is ".sort".
+
+2012-11-18: Version 1.7.32
+
+- Pressing the Play key during normal live viewing mode now opens the Recordings menu
+  if there is no "last viewed" recording (thanks to Alexander Wenzel).
+  The same behavior has been implemented for the Blue key in the main menu.
+- cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action(),
+  to suspend removing deleted recordings in case this is necessary to make room for
+  new, ongoing recordings (suggested by Udo Richter).
+- The cThread constructor now has an additional boolean parameter that can be set to
+  true to have this thread run at a lower priority. Plugin authors that use low
+  priority threads may want to use this instead of the calls to SetPriority(19) and
+  SetIOPriority(7). The priority of a thread ("low" or "high") is now logged when the
+  thread starts.
+- Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible
+  change in DVB API 5.8 (reported by Derek Kelly).
+  Removed the meanwhile obsolete definition of FE_CAN_TURBO_FEC.
+- Fixed some compiler warnings under gcc version 4.7.1.
+- Fixed setting the video format in the dvbhdffdevice (thanks to Torsten Lang).
+- Fixed 'make install' to not overwrite existing configuration files (thanks to Peter
+  M�nster).
+- Added including the Make.global and Make.config files to the dvbdhffdevice's
+  libhdffcmd/Makefile.
+- Added options to build a 32-bit version of VDR on a 64-bit machine to
+  Make.config.template.
+- Fixed handling VPS timers in case the running status of an event goes to '1' (not
+  running) and later goes to '4' (running).
+- If a frame position in the 'marks' file of a recording doesn't point to an I-frame,
+  it will now be shifted towards the next I-frame, either up or down, whichever is
+  closer (suggested by Udo Richter).
+- Fixed a possible memory leak in SI::StructureLoop::getNextAsPointer() (reported by
+  Sundararaj Reel).
+- Fixed handling timers in case an event is modified and "phased out" while the timer
+  is recording.
+- Improved frame detection by parsing just far enough into the MPEG-4 NAL units to get
+  the necessary information about frames and slices.
+- The initial syncing of the frame detector is now done immediately after the first
+  complete GOP has been seen. This makes recordings and especially pausing live video
+  start up to twice as fast as before.
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Fixed handling the very last entry in a recording index.
+- The return type of cMarks::Add() has been changed to void, since due to the sorting
+  of the list of marks the returned pointer might have pointed to a totally different
+  mark. Besides, the return value was never actually used.
+- Improved editing TS recordings by
+  + stripping dangling TS packets from the beginning of a sequence
+  + including pending TS packets at the end of a sequence
+  + fixing all timestamps and continuity counters
+  + generating editing marks for the edited version in such a way that each cutting
+    point is marked by an "end" and "begin" mark with the same offset
+  + no longer generating an editing mark at the "end" of the edited recording (this
+    was actually generated at the beginning of the last GOP, so that a subsequent
+    edit would have cut off the last GOP)
+  + no longer generating any editing marks if the edited recording results on just
+    one single sequence
+  + ignoring pairs of editing marks that are placed at exactly the same position of
+    a recording when actually cutting the recording
+  + not doing anything if the editing marks in place would result in the edited
+    version being the same as the original recording
+- Editing marks can now be placed directly on top of each other, in which case they
+  simply mark a position, but have no effect on the actual cutting process.
+- When positioned at an offset where two (or more) editing marks are placed on top
+  of each other, the '4' key moves the first one of them to the left, while the '6'
+  key moves the last one of them to the right. The '7' and '9' key handle multiple
+  marks at the same place as if it were one single mark.
+- Modified editing marks are now written to disk whenever the replay progress display
+  gets hidden (thanks to Christoph Haubrich).
diff --git a/INSTALL b/INSTALL
index 07a5079fb..1767451f0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,6 +36,10 @@ and type 'make'. This should produce an executable file
 named 'vdr', which can be run after the DVB driver has been
 installed.
 
+If you want to build a 32-bit version of VDR on a 64-bit machine, you can
+use 'make M32=1' to do so. Note that you also need to have a Make.config file
+(derived from Make.config.template) to make this work.
+
 IMPORTANT: See "Configuration files" below for information on how
 =========  to set up the configuration files at the proper location!
 
diff --git a/MANUAL b/MANUAL
index fb28462b8..272659ccb 100644
--- a/MANUAL
+++ b/MANUAL
@@ -367,13 +367,13 @@ Version 1.6
   - 7, 9    Jump back and forward between editing marks. Replay goes into still
             mode after jumping to a mark.
   - 8       Positions replay at a point 3 seconds before the current or next
-            "start" mark and starts replay.
+            "begin" mark and starts replay.
   - 2       Start the actual cutting process.
 
   Editing marks are represented by black, vertical lines in the progress display.
-  A small black triangle at the top of the mark means that this is a "start"
+  A small black triangle at the top of the mark means that this is a "begin"
   mark, and a triangle at the bottom means that this is an "end" mark.
-  The cutting process will save all video data between "start" and "end" marks
+  The cutting process will save all video data between "begin" and "end" marks
   into a new file (the original recording remains untouched). The new file will
   have the same name as the original recording, preceded with a '%' character
   (imagine the '%' somehow looking like a pair of scissors ;-). Red bars in the
@@ -382,7 +382,7 @@ Version 1.6
 
   The video sequences to be saved by the cutting process are determined by an
   "even/odd" algorithm. This means that every odd numbered editing mark (i.e.
-  1, 3, 5,...) represents a "start" mark, while every even numbered mark (2, 4,
+  1, 3, 5,...) represents a "begin" mark, while every even numbered mark (2, 4,
   6,...) is an "end" mark. Inserting or toggling a mark on or off automatically
   adjusts the sequence to the right side of that mark.
 
@@ -395,11 +395,13 @@ Version 1.6
   version of the recording you can use the '8' key to jump to a point just
   before the next cut and have a look at the resulting sequence.
 
-  Currently editing marks can only be set at I-frames, which typically is
-  every 12th frame. So editing can be done with a resolution of roughly half
-  a second. A "start" mark marks the first frame of a resulting video
-  sequence, and an "end" mark marks the last frame of that sequence.
-
+  Currently editing marks can only be set at I-frames, which typically appear
+  every half of a second to a second.  A "begin" mark marks the first frame of
+  a resulting video sequence, and an "end" mark marks the last frame of that
+  sequence.  Note that the actual frame indicated by the an "end" mark will
+  not be included in the edited version of the recording. That's because every
+  recording (and every sequence of an edited recording) begins with an I-frame
+  and ends right before the next I-frame.
   An edited recording (indicated by the '%' character) will never be deleted
   automatically in case the disk runs full (no matter what "lifetime" it has).
 
diff --git a/Make.config.template b/Make.config.template
index ef463b137..08f9ece8e 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.9 2012/09/01 10:31:33 kls Exp $
+# $Id: Make.config.template 2.10 2012/10/09 10:32:32 kls Exp $
 
 ### The C compiler and options:
 
@@ -21,6 +21,12 @@ CFLAGS   += -fPIC
 CXXFLAGS += -fPIC
 endif
 
+# Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
+ifdef M32
+CFLAGS   += -m32
+CXXFLAGS += -m32
+endif
+
 ### The directory environment:
 
 PREFIX   = $(DESTDIR)/usr/local
diff --git a/Makefile b/Makefile
index ba5a4587b..e165ee880 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.29 2012/09/07 14:11:37 kls Exp $
+# $Id: Makefile 2.30 2012/10/09 08:32:25 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -211,7 +211,7 @@ install-dirs:
 	@mkdir -p $(DESTDIR)$(RESDIRDEF)
 
 install-conf:
-	@cp *.conf $(DESTDIR)$(CONFDIRDEF)
+	@cp -n *.conf $(DESTDIR)$(CONFDIRDEF)
 
 
 # Documentation:
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index f8b47bd71..845fa6b08 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.43 2012/05/08 11:40:32 kls Exp $
+ * $Id: dvbhdffdevice.c 1.46 2012/11/15 09:19:10 kls Exp $
  */
 
 #include <stdint.h>
@@ -69,6 +69,7 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
 
      mHdffCmdIf->CmdAvSetAudioDelay(gHdffSetup.AudioDelay);
      mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) gHdffSetup.AudioDownmix);
+     mHdffCmdIf->CmdAvSetSyncShift(gHdffSetup.AvSyncShift);
      mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) gHdffSetup.AnalogueVideo);
      mHdffCmdIf->CmdHdmiSetVideoMode(gHdffSetup.GetVideoMode());
 
@@ -136,7 +137,7 @@ void cDvbHdFfDevice::SetVideoFormat(bool VideoFormat16_9)
 {
   HdffVideoFormat_t videoFormat;
   videoFormat.AutomaticEnabled = true;
-  videoFormat.AfdEnabled = true;
+  videoFormat.AfdEnabled = false;
   videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
   videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
   mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
@@ -375,62 +376,86 @@ bool cDvbHdFfDevice::CanReplay(void) const
 
 bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
 {
-  if (PlayMode == pmNone) {
-     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
-     mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
-
-     mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
-     mHdffCmdIf->CmdAvSetPcrPid(0, 0);
-     mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
-     mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
+    if (PlayMode == pmNone) {
+        if (fd_video == -1)
+            fd_video = DvbOpen(DEV_DVB_VIDEO,  adapter, frontend, O_RDWR | O_NONBLOCK);
+        if (fd_audio == -1)
+            fd_audio = DvbOpen(DEV_DVB_AUDIO,  adapter, frontend, O_RDWR | O_NONBLOCK);
 
-     ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
-     mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
-     mHdffCmdIf->CmdAvEnableSync(0, true);
-     mHdffCmdIf->CmdAvSetPlayMode(0, true);
-     }
-  else {
-     if (playMode == pmNone)
-        TurnOffLiveMode(true);
+        mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
+        mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
 
-     mHdffCmdIf->CmdAvSetPlayMode(1, Transferring() || (cTransferControl::ReceiverDevice() == this));
-     mHdffCmdIf->CmdAvSetStc(0, 100000);
-     mHdffCmdIf->CmdAvEnableSync(0, true);
-     mHdffCmdIf->CmdAvEnableVideoAfterStop(0, true);
+        mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
+        mHdffCmdIf->CmdAvSetPcrPid(0, 0);
+        mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
+        mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
 
-     playVideoPid = -1;
-     playAudioPid = -1;
-     audioCounter = 0;
-     videoCounter = 0;
-     freezed = false;
-     trickMode = false;
+        ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
+        mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
+        mHdffCmdIf->CmdAvEnableSync(0, true);
+        mHdffCmdIf->CmdAvSetPlayMode(0, true);
+    }
+    else {
+        if (playMode == pmNone)
+            TurnOffLiveMode(true);
 
-     mHdffCmdIf->CmdAvSetDecoderInput(0, 2);
-     ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
-     }
-  playMode = PlayMode;
-  return true;
+        if (PlayMode == pmExtern_THIS_SHOULD_BE_AVOIDED)
+        {
+            close(fd_video);
+            fd_video = -1;
+            close(fd_audio);
+            fd_audio = -1;
+        }
+        else
+        {
+            mHdffCmdIf->CmdAvSetPlayMode(1, Transferring() || (cTransferControl::ReceiverDevice() == this));
+            mHdffCmdIf->CmdAvSetStc(0, 100000);
+            mHdffCmdIf->CmdAvEnableSync(0, false);
+            mHdffCmdIf->CmdAvEnableVideoAfterStop(0, true);
+
+            playVideoPid = -1;
+            playAudioPid = -1;
+            audioCounter = 0;
+            videoCounter = 0;
+            freezed = false;
+            trickMode = false;
+            isPlayingVideo = false;
+
+            mHdffCmdIf->CmdAvSetDecoderInput(0, 2);
+            ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
+	}
+    }
+    playMode = PlayMode;
+    return true;
 }
 
 int64_t cDvbHdFfDevice::GetSTC(void)
 {
-  if (fd_video >= 0) {
-     uint64_t pts;
-     if (ioctl(fd_video, VIDEO_GET_PTS, &pts) == -1) {
-        esyslog("ERROR: pts %d: %m", CardIndex() + 1);
-        return -1;
+    if (isPlayingVideo)
+    {
+        if (fd_video >= 0) {
+            uint64_t pts;
+            if (ioctl(fd_video, VIDEO_GET_PTS, &pts) == -1) {
+                esyslog("ERROR: pts %d: %m", CardIndex() + 1);
+                return -1;
+            }
+            //printf("video PTS %lld\n", pts);
+            return pts;
         }
-     return pts;
-     }
-  if (fd_audio >= 0) {
-     uint64_t pts;
-     if (ioctl(fd_audio, AUDIO_GET_PTS, &pts) == -1) {
-        esyslog("ERROR: pts %d: %m", CardIndex() + 1);
-        return -1;
+    }
+    else
+    {
+        if (fd_audio >= 0) {
+            uint64_t pts;
+            if (ioctl(fd_audio, AUDIO_GET_PTS, &pts) == -1) {
+                esyslog("ERROR: pts %d: %m", CardIndex() + 1);
+                return -1;
+            }
+            //printf("audio PTS %lld\n", pts);
+            return pts;
         }
-     return pts;
-     }
-  return -1;
+    }
+    return -1;
 }
 
 void cDvbHdFfDevice::TrickSpeed(int Speed)
@@ -456,12 +481,13 @@ void cDvbHdFfDevice::Clear(void)
 
 void cDvbHdFfDevice::Play(void)
 {
-  freezed = false;
-  trickMode = false;
-  mHdffCmdIf->CmdAvEnableSync(0, true);
-  mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
-  mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
-  cDevice::Play();
+    freezed = false;
+    trickMode = false;
+    if (isPlayingVideo)
+        mHdffCmdIf->CmdAvEnableSync(0, true);
+    mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
+    mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
+    cDevice::Play();
 }
 
 void cDvbHdFfDevice::Freeze(void)
@@ -631,6 +657,11 @@ int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
 {
     if (freezed)
         return -1;
+    if (!isPlayingVideo)
+    {
+        mHdffCmdIf->CmdAvEnableSync(0, true);
+        isPlayingVideo = true;
+    }
     //TODO: support greater Length
     uint8_t tsBuffer[188 * 16];
     uint32_t tsLength;
@@ -651,8 +682,6 @@ int cDvbHdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 {
     if (freezed)
         return -1;
-    if (trickMode)
-        return Length;
     uint8_t streamId;
     uint8_t tsBuffer[188 * 16];
     uint32_t tsLength;
@@ -702,17 +731,23 @@ int cDvbHdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
 
 int cDvbHdFfDevice::PlayTsVideo(const uchar *Data, int Length)
 {
-  if (freezed)
-    return -1;
-  int pid = TsPid(Data);
-  if (pid != playVideoPid) {
-     PatPmtParser();
-     if (pid == PatPmtParser()->Vpid()) {
-        playVideoPid = pid;
-        mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, MapVideoStreamTypes(PatPmtParser()->Vtype()), true);
+    if (freezed)
+        return -1;
+    if (!isPlayingVideo)
+    {
+        mHdffCmdIf->CmdAvEnableSync(0, true);
+        isPlayingVideo = true;
+    }
+
+    int pid = TsPid(Data);
+    if (pid != playVideoPid) {
+        PatPmtParser();
+        if (pid == PatPmtParser()->Vpid()) {
+            playVideoPid = pid;
+            mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, MapVideoStreamTypes(PatPmtParser()->Vtype()), true);
         }
-     }
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
+    }
+    return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
 static HdffAudioStreamType_t MapAudioStreamTypes(int Atype)
@@ -732,8 +767,6 @@ int cDvbHdFfDevice::PlayTsAudio(const uchar *Data, int Length)
 {
   if (freezed)
     return -1;
-  if (trickMode)
-    return Length;
   int pid = TsPid(Data);
   if (pid != playAudioPid) {
      playAudioPid = pid;
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 439ec9b72..344f3dcad 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.h 1.7 2011/09/10 10:17:32 kls Exp $
+ * $Id: dvbhdffdevice.h 1.8 2012/11/05 08:49:29 kls Exp $
  */
 
 #ifndef __DVBHDFFDEVICE_H
@@ -81,6 +81,7 @@ class cDvbHdFfDevice : public cDvbDevice {
   int playAudioPid;
   bool freezed;
   bool trickMode;
+  bool isPlayingVideo;
 
   // Pes2Ts conversion stuff
   uint8_t videoCounter;
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index a6a41d968..1532cc2e1 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.c 1.25 2012/06/16 11:16:38 kls Exp $
+ * $Id: hdffcmd.c 1.26 2012/11/15 09:19:47 kls Exp $
  */
 
 #include <stdint.h>
@@ -170,6 +170,11 @@ void cHdffCmdIf::CmdAvSetAudioChannel(uint8_t AudioChannel)
     HdffCmdAvSetAudioChannel(mOsdDev, AudioChannel);
 }
 
+void cHdffCmdIf::CmdAvSetSyncShift(int16_t SyncShift)
+{
+    HdffCmdAvSetSyncShift(mOsdDev, SyncShift);
+}
+
 
 void cHdffCmdIf::CmdOsdConfigure(const HdffOsdConfig_t * pConfig)
 {
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
index f33fe08fa..58ed1388f 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.h
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffcmd.h 1.20 2012/06/16 11:16:52 kls Exp $
+ * $Id: hdffcmd.h 1.21 2012/11/15 09:20:05 kls Exp $
  */
 
 #ifndef _HDFF_CMD_H_
@@ -47,6 +47,7 @@ class cHdffCmdIf
     void CmdAvSetAudioDelay(int16_t Delay);
     void CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode);
     void CmdAvSetAudioChannel(uint8_t AudioChannel);
+    void CmdAvSetSyncShift(int16_t SyncShift);
 
     void CmdOsdConfigure(const HdffOsdConfig_t * pConfig);
     void CmdOsdReset(void);
diff --git a/PLUGINS/src/dvbhddevice/hdffmsgdef.h b/PLUGINS/src/dvbhddevice/hdffmsgdef.h
deleted file mode 100644
index d63e88a56..000000000
--- a/PLUGINS/src/dvbhddevice/hdffmsgdef.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * hdffmsgdef.h: TODO(short description)
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffmsgdef.h 1.13 2011/08/27 09:34:43 kls Exp $
- */
-
-#ifndef _HDFF_MSGDEF_H_
-#define _HDFF_MSGDEF_H_
-
-#define MAX_CMD_LEN 1536
-
-namespace HDFF
-{
-
-typedef enum _eMessageType
-{
-    msgTypeCommand,
-    msgTypeAnswer,
-    msgTypeResult,
-    msgTypeEvent
-} eMessageType;
-
-typedef enum _eMessageGroup
-{
-    msgGroupGeneric,
-    msgGroupAvDec,
-    msgGroupAvMux,
-    msgGroupFrontend,
-    msgGroupOsd,
-    msgGroupHdmi,
-    msgGroupRemoteControl
-} eMessageGroup;
-
-typedef enum _eMessageId
-{
-    msgGenGetFirmwareVersion = 0,
-    msgGenGetInterfaceVersion,
-    msgGenGetCopyrights,
-
-    msgAvSetAudioPid = 0,
-    msgAvSetVideoPid,
-    msgAvSetPcrPid,
-    msgAvSetTeletextPid,
-    msgAvShowStillImage,
-    msgAvSetVideoWindow,
-    msgAvSetDecoderInput,
-    msgAvSetDemultiplexerInput,
-    msgAvSetVideoFormat,
-    msgAvSetVideoOutputMode,
-    msgAvSetStc,
-    msgAvFlushBuffer,
-    msgAvEnableSync,
-    msgAvSetVideoSpeed,
-    msgAvSetAudioSpeed,
-    msgAvEnableVideoAfterStop,
-    msgAvGetVideoFormatInfo,
-    msgAvSetAudioDelay,
-    msgAvSetAudioDownmix,
-    msgAvSetAudioChannel,
-    msgAvSetPlayMode,
-
-    msgMuxSetVideoOut = 0,
-    msgMuxSetSlowBlank,
-    msgMuxSetFastBlank,
-    msgMuxSetVolume,
-    msgMuxSetAudioMute,
-
-    msgOsdConfigure = 0,
-    msgOsdReset,
-    msgOsdCreateDisplay = 10,
-    msgOsdDeleteDisplay,
-    msgOsdEnableDisplay,
-    msgOsdSetDisplayOutputRectangle,
-    msgOsdSetDisplayClippingArea,
-    msgOsdRenderDisplay,
-    msgOsdSaveRegion,
-    msgOsdRestoreRegion,
-    msgOsdCreatePalette = 30,
-    msgOsdDeletePalette,
-    msgOsdSetDisplayPalette,
-    msgOsdSetPaletteColors,
-    msgOsdCreateFontFace = 50,
-    msgOsdDeleteFontFace,
-    msgOsdCreateFont,
-    msgOsdDeleteFont,
-    msgOsdDrawPixel = 70,
-    msgOsdDrawRectangle,
-    msgOsdDrawCircle,
-    msgOsdDrawEllipse,
-    msgOsdDrawSlope,
-    msgOsdDrawText,
-    msgOsdDrawTextW,
-    msgOsdDrawBitmap,
-
-    msgHdmiEnableOutput = 0,
-    msgHdmiSetVideoMode,
-    msgHdmiConfigure,
-    msgHdmiIsDisplayConnected,
-    msgHdmiGetDisplayInfo,
-    msgHdmiGetVideoMode,
-    msgHdmiSendCecCommand,
-
-    msgRemoteSetProtocol = 0,
-    msgRemoteSetAddressFilter,
-    msgRemoteKeyEvent
-} eMessageId;
-
-
-// AvDec definitions
-
-typedef enum _eAVContainerType
-{
-    avContainerPes,
-    avContainerPesDvd,
-    avContainerMaxValue
-} eAVContainerType;
-
-typedef enum _eAudioStreamType
-{
-    audioStreamMpeg1,
-    audioStreamMpeg2,
-    audioStreamAc3,
-    audioStreamAac,
-    audioStreamHeAac,
-    audioStreamPcm,
-    audioStreamEAc3,
-    audioStreamDts,
-    audioStreamMaxValue
-} eAudioStreamType;
-
-typedef enum _eVideoStreamType
-{
-    videoStreamMpeg1,
-    videoStreamMpeg2,
-    videoStreamH264,
-    videoStreamMpeg4Asp,
-    videoStreamVc1,
-    videoStreamMaxValue
-} eVideoStreamType;
-
-
-typedef enum _eTvFormat
-{
-    tvFormat4by3,
-    tvFormat16by9,
-    tvFormatMaxValue
-} eTvFormat;
-
-typedef enum _eVideoConversion
-{
-    videoConversionAutomatic,
-    videoConversionLetterbox16by9,
-    videoConversionLetterbox14by9,
-    videoConversionPillarbox,
-    videoConversionCentreCutOut,
-    videoConversionAlways16by9,
-    videoConversionMaxValue
-} eVideoConversion;
-
-typedef struct _tVideoFormat
-{
-    bool AutomaticEnabled;
-    bool AfdEnabled;
-    eTvFormat TvFormat;
-    eVideoConversion VideoConversion;
-} tVideoFormat;
-
-typedef enum _eVideoOutputMode
-{
-    videoOutputClone,
-    videoOutputDualView,
-    videoOutputMaxValue
-} eVideoOutputMode;
-
-typedef enum _eDownmixMode
-{
-    downmixOff,
-    downmixAnalog,
-    downmixAlways,
-    downmixAutomatic,
-    downmixHdmi
-} eDownmixMode;
-
-// AvMux definitions
-
-typedef enum _eVideoOut
-{
-    videoOutDisabled,
-    videoOutRgb,
-    videoOutCvbsYuv,
-    videoOutYc,
-    videoOutMaxValue
-} eVideoOut;
-
-typedef enum _eSlowBlank
-{
-    slowBlankOff,
-    slowBlank16by9,
-    slowBlank4by3,
-    slowBlankMaxValue
-} eSlowBlank;
-
-typedef enum _eFastBlank
-{
-    fastBlankCvbs,
-    fastBlankRgb,
-    fastBlankMaxValue
-} eFastBlank;
-
-
-// OSD definitions
-
-#define InvalidHandle           0xFFFFFFFF
-#define ScreenDisplayHandle     0xFFFFFFFE
-
-#define PositionScreenCentered  0xFFFF
-
-#define SizeFullScreen    0xFFFF
-#define SizeSameAsSource  0xFFFE
-
-#define FontFaceTiresias  0x00000000
-
-typedef enum _eColorType
-{
-    colorTypeClut1,
-    colorTypeClut2,
-    colorTypeClut4,
-    colorTypeClut8,
-    colorTypeARGB8888,
-    colorTypeARGB8565,
-    colorTypeARGB4444,
-    colorTypeARGB1555,
-} eColorType;
-
-typedef enum _eColorFormat
-{
-    colorFormatARGB,
-    colorFormatACbYCr,
-} eColorFormat;
-
-typedef enum _eDrawingFlags
-{
-    drawFull,
-    drawHalfTop,
-    drawHalfLeft,
-    drawHalfBottom,
-    drawHalfRight,
-    drawQuarterTopLeft,
-    drawQuarterTopRight,
-    drawQuarterBottomLeft,
-    drawQuarterBottomRight,
-    drawQuarterTopLeftInverted,
-    drawQuarterTopRightInverted,
-    drawQuarterBottomLeftInverted,
-    drawQuarterBottomRightInverted
-} eDrawingFlags;
-
-typedef struct _tOsdConfig
-{
-    bool FontAntialiasing;
-    bool FontKerning;
-} tOsdConfig;
-
-// HDMI definitions
-
-typedef enum _eHdmiVideoMode
-{
-    videoMode576p50 = 18,
-    videoMode720p50 = 19,
-    videoMode1080i50 = 20,
-    videoMode576i50 = 22,
-    videoModeMaxValue
-} eHdmiVideoMode;
-
-typedef enum _eVideoModeAdaption
-{
-    videoModeAdaptOff,
-    videoModeAdaptFrameRate,
-    videoModeAdaptOnlyForHd,
-    videoModeAdaptAlways
-} eVideoModeAdaption;
-
-typedef enum _eCecCommand
-{
-    cecCommandTvOn,
-    cecCommandTvOff,
-    cecCommandActiveSource,
-    cecCommandInactiveSource
-} eCecCommand;
-
-typedef struct _tHdmiConfig
-{
-    bool TransmitAudio;
-    bool ForceDviMode;
-    bool CecEnabled;
-    eVideoModeAdaption VideoModeAdaption;
-} tHdmiConfig;
-
-// Remote control definitions
-
-typedef enum _eRemoteProtocol
-{
-    remoteProtocolNone,
-    remoteProtocolRc5,
-    remoteProtocolRc6,
-    remoteProtocolMaxValue
-} eRemoteProtocol;
-
-} // end of namespace
-
-#endif
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 427a3fb2a..5d55c957f 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffosd.c 1.17 2012/06/16 11:17:11 kls Exp $
+ * $Id: hdffosd.c 1.18 2012/11/15 09:20:24 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -390,11 +390,13 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
             }
         }
     }
+#if 0
     if (mSupportsUtf8Text)
     {
         mHdffCmdIf->CmdOsdDrawUtf8Text(mDisplay, pFont->Handle, x + mLeft, y + mTop + h, s, ColorFg);
     }
     else
+#endif
     {
         uint16_t tmp[1000];
         uint16_t len = 0;
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
index 8b25f6671..babe79b23 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
@@ -24,6 +24,18 @@ CFLAGS  ?= -g -O2 -fPIC -Wall
 AR      ?= ar
 ARFLAGS ?= r
 
+### The directory environment:
+
+VDRDIR ?= ../../../..
+
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
 ### Implicit rules:
 
 %.o: %.c
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
index 413f3e221..3ae1fd7ed 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
@@ -449,3 +449,22 @@ int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel)
     osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
+
+int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_SET_OPTIONS);
+    BitBuffer_SetBits(&cmdBuf, 1, 1);
+    BitBuffer_SetBits(&cmdBuf, 31, 0); // reserved
+    BitBuffer_SetBits(&cmdBuf, 16, SyncShift);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
index 0e77c7944..bfed59dc7 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
@@ -149,4 +149,6 @@ int HdffCmdAvSetAudioDownmix(int OsdDevice,
 
 int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel);
 
+int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift);
+
 #endif /* HDFFCMD_AV_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
index 322c25633..5ead27086 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
@@ -70,6 +70,7 @@ typedef enum HdffMessageId_t
     HDFF_MSG_AV_SET_AUDIO_DOWNMIX,
     HDFF_MSG_AV_SET_AUDIO_CHANNEL,
     HDFF_MSG_AV_SET_PLAY_MODE,
+    HDFF_MSG_AV_SET_OPTIONS,
 
     HDFF_MSG_MUX_SET_VIDEO_OUT = 0,
     HDFF_MSG_MUX_SET_SLOW_BLANK,
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index ac58c0c9d..b263f08a5 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR \n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-02-07 20:13+0100\n"
+"POT-Creation-Date: 2012-11-13 20:08+0100\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Christoph Haubrich\n"
 "Language-Team: <see README>\n"
@@ -91,6 +91,9 @@ msgstr "Audio Verzögerung (ms)"
 msgid "Audio Downmix"
 msgstr "Audio Downmix"
 
+msgid "A/V Sync Shift (ms)"
+msgstr "A/V-Sync Verschiebung (ms)"
+
 msgid "OSD Size"
 msgstr "OSD Größe"
 
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index f8e480b4a..a971773f4 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR \n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-02-07 20:13+0100\n"
+"POT-Creation-Date: 2012-11-13 20:08+0100\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -91,6 +91,9 @@ msgstr "Äänen viive (ms)"
 msgid "Audio Downmix"
 msgstr "Äänen alasmiksaus"
 
+msgid "A/V Sync Shift (ms)"
+msgstr ""
+
 msgid "OSD Size"
 msgstr "Kuvaruutunäytön koko"
 
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index def038995..56b987a2e 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-02-07 20:13+0100\n"
+"POT-Creation-Date: 2012-11-13 20:08+0100\n"
 "PO-Revision-Date: 2011-07-10 00:23+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
@@ -94,6 +94,9 @@ msgstr "Ritardo audio (ms)"
 msgid "Audio Downmix"
 msgstr "Scala Audio"
 
+msgid "A/V Sync Shift (ms)"
+msgstr ""
+
 msgid "OSD Size"
 msgstr "Dimensione OSD"
 
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index b6525a002..fcc164879 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c 1.17 2012/02/08 15:14:01 kls Exp $
+ * $Id: setup.c 1.18 2012/11/15 09:20:50 kls Exp $
  */
 
 #include "setup.h"
@@ -26,6 +26,7 @@ cHdffSetup::cHdffSetup(void)
     AnalogueVideo = HDFF_VIDEO_OUT_CVBS_YUV;
     AudioDelay = 0;
     AudioDownmix = HDFF_AUDIO_DOWNMIX_AUTOMATIC;
+    AvSyncShift = 0;
     OsdSize = 0;
     CecEnabled = 1;
     CecTvOn = 1;
@@ -46,6 +47,7 @@ bool cHdffSetup::SetupParse(const char *Name, const char *Value)
     else if (strcmp(Name, "AnalogueVideo")     == 0) AnalogueVideo     = atoi(Value);
     else if (strcmp(Name, "AudioDelay")        == 0) AudioDelay        = atoi(Value);
     else if (strcmp(Name, "AudioDownmix")      == 0) AudioDownmix      = atoi(Value);
+    else if (strcmp(Name, "AvSyncShift")       == 0) AvSyncShift       = atoi(Value);
     else if (strcmp(Name, "OsdSize")           == 0) OsdSize           = atoi(Value);
     else if (strcmp(Name, "CecEnabled")        == 0) CecEnabled        = atoi(Value);
     else if (strcmp(Name, "CecTvOn")           == 0) CecTvOn           = atoi(Value);
@@ -256,6 +258,7 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
     Add(new cMenuEditStraItem(tr("Analogue Video"), &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
     Add(new cMenuEditIntItem(tr("Audio Delay (ms)"), &mNewHdffSetup.AudioDelay, 0, 500));
     Add(new cMenuEditStraItem(tr("Audio Downmix"), &mNewHdffSetup.AudioDownmix, kAudioDownmixes, AudioDownmixItems));
+    Add(new cMenuEditIntItem(tr("A/V Sync Shift (ms)"), &mNewHdffSetup.AvSyncShift, -500, 500));
     Add(new cMenuEditStraItem(tr("OSD Size"), &mNewHdffSetup.OsdSize, kOsdSizes, OsdSizeItems));
     Add(new cMenuEditBoolItem(tr("HDMI CEC"), &mNewHdffSetup.CecEnabled));
     Add(new cMenuEditBoolItem(tr("CEC: Switch TV on"), &mNewHdffSetup.CecTvOn));
@@ -385,6 +388,7 @@ void cHdffSetupPage::Store(void)
     SetupStore("AnalogueVideo", mNewHdffSetup.AnalogueVideo);
     SetupStore("AudioDelay", mNewHdffSetup.AudioDelay);
     SetupStore("AudioDownmix", mNewHdffSetup.AudioDownmix);
+    SetupStore("AvSyncShift", mNewHdffSetup.AvSyncShift);
     SetupStore("OsdSize", mNewHdffSetup.OsdSize);
     SetupStore("CecEnabled", mNewHdffSetup.CecEnabled);
     SetupStore("CecTvOn", mNewHdffSetup.CecTvOn);
@@ -412,6 +416,7 @@ void cHdffSetupPage::Store(void)
 
         mHdffCmdIf->CmdAvSetAudioDelay(mNewHdffSetup.AudioDelay);
         mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) mNewHdffSetup.AudioDownmix);
+        mHdffCmdIf->CmdAvSetSyncShift(mNewHdffSetup.AvSyncShift);
 
         mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) mNewHdffSetup.AnalogueVideo);
 
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
index 64033e1c2..011411d84 100644
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.h 1.12 2012/02/08 15:14:56 kls Exp $
+ * $Id: setup.h 1.13 2012/11/15 09:21:07 kls Exp $
  */
 
 #ifndef _HDFF_SETUP_H_
@@ -28,6 +28,7 @@ struct cHdffSetup
     int AnalogueVideo;
     int AudioDelay;
     int AudioDownmix;
+    int AvSyncShift;
     int OsdSize;
     int CecEnabled;
     int CecTvOn;
diff --git a/ci.c b/ci.c
index ebed32043..904697eba 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.9 2012/05/29 11:13:40 kls Exp $
+ * $Id: ci.c 2.10 2012/10/07 11:11:18 kls Exp $
  */
 
 #include "ci.h"
@@ -845,9 +845,9 @@ void cCiDateTime::SendDateTime(void)
      int D = tm_gmt.tm_mday;
      int L = (M == 1 || M == 2) ? 1 : 0;
      int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
-#define DEC2BCD(d) (((d / 10) << 4) + (d % 10))
+#define DEC2BCD(d) uint8_t(((d / 10) << 4) + (d % 10))
      struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; };
-     tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : htons(tm_loc.tm_gmtoff / 60) };
+     tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : short(htons(tm_loc.tm_gmtoff / 60)) };
      bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
      DumpTPDUDataTransfer &= DumpDateTime;
      if (DumpDateTime)
diff --git a/config.h b/config.h
index a07310ee5..03b6cf0d9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.53 2012/09/15 11:51:54 kls Exp $
+ * $Id: config.h 2.54 2012/10/03 09:59:34 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.31"
-#define VDRVERSNUM   10731  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.32"
+#define VDRVERSNUM   10732  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.31"
-#define APIVERSNUM   10731  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.32"
+#define APIVERSNUM   10732  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index bcae2b722..ace1893bc 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.14 2012/09/20 09:12:47 kls Exp $
+ * $Id: cutter.c 2.16 2012/11/18 12:09:00 kls Exp $
  */
 
 #include "cutter.h"
@@ -13,17 +13,261 @@
 #include "remux.h"
 #include "videodir.h"
 
+// --- cPacketBuffer ---------------------------------------------------------
+
+class cPacketBuffer {
+private:
+  uchar *data;
+  int size;
+  int length;
+public:
+  cPacketBuffer(void);
+  ~cPacketBuffer();
+  void Append(uchar *Data, int Length);
+       ///< Appends Length bytes of Data to this packet buffer.
+  void Flush(uchar *Data, int &Length, int MaxLength);
+       ///< Flushes the content of this packet buffer into the given Data, starting
+       ///< at position Length, and clears the buffer afterwards. Length will be
+       ///< incremented accordingly. If Length plus the total length of the stored
+       ///< packets would exceed MaxLength, nothing is copied.
+  };
+
+cPacketBuffer::cPacketBuffer(void)
+{
+  data = NULL;
+  size = length = 0;
+}
+
+cPacketBuffer::~cPacketBuffer()
+{
+  free(data);
+}
+
+void cPacketBuffer::Append(uchar *Data, int Length)
+{
+  if (length + Length >= size) {
+     int NewSize = (length + Length) * 3 / 2;
+     if (uchar *p = (uchar *)realloc(data, NewSize)) {
+        data = p;
+        size = NewSize;
+        }
+     else
+        return; // out of memory
+     }
+  memcpy(data + length, Data, Length);
+  length += Length;
+}
+
+void cPacketBuffer::Flush(uchar *Data, int &Length, int MaxLength)
+{
+  if (Data && length > 0 && Length + length <= MaxLength) {
+     memcpy(Data + Length, data, length);
+     Length += length;
+     }
+  length = 0;
+}
+
+// --- cPacketStorage --------------------------------------------------------
+
+class cPacketStorage {
+private:
+  cPacketBuffer *buffers[MAXPID];
+public:
+  cPacketStorage(void);
+  ~cPacketStorage();
+  void Append(int Pid, uchar *Data, int Length);
+  void Flush(int Pid, uchar *Data, int &Length, int MaxLength);
+  };
+
+cPacketStorage::cPacketStorage(void)
+{
+  for (int i = 0; i < MAXPID; i++)
+      buffers[i] = NULL;
+}
+
+cPacketStorage::~cPacketStorage()
+{
+  for (int i = 0; i < MAXPID; i++)
+      delete buffers[i];
+}
+
+void cPacketStorage::Append(int Pid, uchar *Data, int Length)
+{
+  if (!buffers[Pid])
+     buffers[Pid] = new cPacketBuffer;
+  buffers[Pid]->Append(Data, Length);
+}
+
+void cPacketStorage::Flush(int Pid, uchar *Data, int &Length, int MaxLength)
+{
+  if (buffers[Pid])
+     buffers[Pid]->Flush(Data, Length, MaxLength);
+}
+
+// --- cDanglingPacketStripper -----------------------------------------------
+
+class cDanglingPacketStripper {
+private:
+  bool processed[MAXPID];
+  cPatPmtParser patPmtParser;
+public:
+  cDanglingPacketStripper(void);
+  bool Process(uchar *Data, int Length, int64_t FirstPts);
+       ///< Scans the frame given in Data and hides the payloads of any TS packets
+       ///< that either didn't start within this frame, or have a PTS that is
+       ///< before FirstPts. The TS packets in question are not physically removed
+       ///< from Data in order to keep any frame counts and PCR timestamps intact.
+       ///< Returns true if any dangling packets have been found.
+  };
+
+cDanglingPacketStripper::cDanglingPacketStripper(void)
+{
+  memset(processed, 0x00, sizeof(processed));
+}
+
+bool cDanglingPacketStripper::Process(uchar *Data, int Length, int64_t FirstPts)
+{
+  bool Found = false;
+  while (Length >= TS_SIZE && *Data == TS_SYNC_BYTE) {
+        int Pid = TsPid(Data);
+        if (Pid == PATPID)
+           patPmtParser.ParsePat(Data, TS_SIZE);
+        else if (Pid == patPmtParser.PmtPid())
+           patPmtParser.ParsePmt(Data, TS_SIZE);
+        else {
+           int64_t Pts = TsGetPts(Data, TS_SIZE);
+           if (Pts >= 0)
+              processed[Pid] = PtsDiff(FirstPts, Pts) >= 0; // Pts is at or after FirstPts
+           if (!processed[Pid]) {
+              TsHidePayload(Data);
+              Found = true;
+              }
+           }
+        Length -= TS_SIZE;
+        Data += TS_SIZE;
+        }
+  return Found;
+}
+
+// --- cPtsFixer -------------------------------------------------------------
+
+class cPtsFixer {
+private:
+  int delta; // time between two frames
+  int64_t last; // the last (i.e. highest) video PTS value seen
+  int64_t offset; // offset to add to PTS values
+  bool fixCounters; // controls fixing the TS continuity counters (only from the second CutIn up)
+  uchar counter[MAXPID]; // the TS continuity counter for each PID
+  cPatPmtParser patPmtParser;
+public:
+  cPtsFixer(void);
+  void Setup(double FramesPerSecond);
+  void Fix(uchar *Data, int Length, bool CutIn);
+  };
+
+cPtsFixer::cPtsFixer(void)
+{
+  delta = 0;
+  last = -1;
+  offset = -1;
+  fixCounters = false;
+  memset(counter, 0x00, sizeof(counter));
+}
+
+void cPtsFixer::Setup(double FramesPerSecond)
+{
+  delta = int(round(PTSTICKS / FramesPerSecond));
+}
+
+void cPtsFixer::Fix(uchar *Data, int Length, bool CutIn)
+{
+  if (!patPmtParser.Vpid()) {
+     if (!patPmtParser.ParsePatPmt(Data, Length))
+        return;
+     }
+  // Determine the PTS offset at the beginning of each sequence (except the first one):
+  if (CutIn && last >= 0) {
+     int64_t Pts = TsGetPts(Data, Length);
+     if (Pts >= 0) {
+        // offset is calculated so that Pts + offset results in last + delta:
+        offset = Pts - PtsAdd(last, delta);
+        if (offset <= 0)
+           offset = -offset;
+        else
+           offset = MAX33BIT + 1 - offset;
+        }
+     fixCounters = true;
+     }
+  // Keep track of the highest video PTS:
+  uchar *p = Data;
+  int len = Length;
+  while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
+        int Pid = TsPid(p);
+        if (Pid == patPmtParser.Vpid()) {
+           int64_t Pts = PtsAdd(TsGetPts(p, TS_SIZE), offset); // offset is taken into account here, to make last have the "new" value already!
+           if (Pts >= 0 && (last < 0 || PtsDiff(last, Pts) > 0))
+              last = Pts;
+           }
+        // Adjust the TS continuity counter:
+        if (fixCounters) {
+           counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
+           TsSetContinuityCounter(p, counter[Pid]);
+           }
+        else
+           counter[Pid] = TsGetContinuityCounter(p); // collect initial counters
+        p += TS_SIZE;
+        len -= TS_SIZE;
+        }
+  // Apply the PTS offset:
+  if (offset > 0) {
+     uchar *p = Data;
+     int len = Length;
+     while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
+           // Adjust the various timestamps:
+           int64_t Pts = TsGetPts(p, TS_SIZE);
+           if (Pts >= 0)
+              TsSetPts(p, TS_SIZE, PtsAdd(Pts, offset));
+           int64_t Dts = TsGetDts(p, TS_SIZE);
+           if (Dts >= 0)
+              TsSetDts(p, TS_SIZE, PtsAdd(Dts, offset));
+           int64_t Pcr = TsGetPcr(p);
+           if (Pcr >= 0) {
+              int64_t NewPcr = Pcr + offset * PCRFACTOR;
+              if (NewPcr >= MAX27MHZ)
+                 NewPcr -= MAX27MHZ + 1;
+              TsSetPcr(p, NewPcr);
+              }
+           p += TS_SIZE;
+           len -= TS_SIZE;
+           }
+     }
+}
+
 // --- cCuttingThread --------------------------------------------------------
 
 class cCuttingThread : public cThread {
 private:
   const char *error;
   bool isPesRecording;
+  double framesPerSecond;
   cUnbufferedFile *fromFile, *toFile;
   cFileName *fromFileName, *toFileName;
   cIndexFile *fromIndex, *toIndex;
   cMarks fromMarks, toMarks;
+  int numSequences;
   off_t maxVideoFileSize;
+  off_t fileSize;
+  cPtsFixer ptsFixer;
+  bool suspensionLogged;
+  bool Throttled(void);
+  bool SwitchFile(bool Force = false);
+  bool LoadFrame(int Index, uchar *Buffer, bool &Independent, int &Length);
+  bool FramesAreEqual(int Index1, int Index2);
+  void GetPendingPackets(uchar *Buffer, int &Length, int Index, int64_t LastPts);
+       // Gather all non-video TS packets from Index upward that either belong to
+       // payloads that started before Index, or have a PTS that is before LastPts,
+       // and add them to the end of the given Data.
+  bool ProcessSequence(int LastEndIndex, int BeginIndex, int EndIndex, int NextBeginIndex);
 protected:
   virtual void Action(void);
 public:
@@ -33,7 +277,7 @@ class cCuttingThread : public cThread {
   };
 
 cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
-:cThread("video cutting")
+:cThread("video cutting", true)
 {
   error = NULL;
   fromFile = toFile = NULL;
@@ -41,16 +285,25 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
   fromIndex = toIndex = NULL;
   cRecording Recording(FromFileName);
   isPesRecording = Recording.IsPesRecording();
-  if (fromMarks.Load(FromFileName, Recording.FramesPerSecond(), isPesRecording) && fromMarks.Count()) {
-     fromFileName = new cFileName(FromFileName, false, true, isPesRecording);
-     toFileName = new cFileName(ToFileName, true, true, isPesRecording);
-     fromIndex = new cIndexFile(FromFileName, false, isPesRecording);
-     toIndex = new cIndexFile(ToFileName, true, isPesRecording);
-     toMarks.Load(ToFileName, Recording.FramesPerSecond(), isPesRecording); // doesn't actually load marks, just sets the file name
-     maxVideoFileSize = MEGABYTE(Setup.MaxVideoFileSize);
-     if (isPesRecording && maxVideoFileSize > MEGABYTE(MAXVIDEOFILESIZEPES))
-        maxVideoFileSize = MEGABYTE(MAXVIDEOFILESIZEPES);
-     Start();
+  framesPerSecond = Recording.FramesPerSecond();
+  suspensionLogged = false;
+  fileSize = 0;
+  ptsFixer.Setup(framesPerSecond);
+  if (fromMarks.Load(FromFileName, framesPerSecond, isPesRecording) && fromMarks.Count()) {
+     numSequences = fromMarks.GetNumSequences();
+     if (numSequences > 0) {
+        fromFileName = new cFileName(FromFileName, false, true, isPesRecording);
+        toFileName = new cFileName(ToFileName, true, true, isPesRecording);
+        fromIndex = new cIndexFile(FromFileName, false, isPesRecording);
+        toIndex = new cIndexFile(ToFileName, true, isPesRecording);
+        toMarks.Load(ToFileName, framesPerSecond, isPesRecording); // doesn't actually load marks, just sets the file name
+        maxVideoFileSize = MEGABYTE(Setup.MaxVideoFileSize);
+        if (isPesRecording && maxVideoFileSize > MEGABYTE(MAXVIDEOFILESIZEPES))
+           maxVideoFileSize = MEGABYTE(MAXVIDEOFILESIZEPES);
+        Start();
+        }
+     else
+        esyslog("no editing sequences found for %s", FromFileName);
      }
   else
      esyslog("no editing marks found for %s", FromFileName);
@@ -65,171 +318,236 @@ cCuttingThread::~cCuttingThread()
   delete toIndex;
 }
 
+bool cCuttingThread::Throttled(void)
+{
+  if (cIoThrottle::Engaged()) {
+     if (!suspensionLogged) {
+        dsyslog("suspending cutter thread");
+        suspensionLogged = true;
+        }
+     return true;
+     }
+  else if (suspensionLogged) {
+     dsyslog("resuming cutter thread");
+     suspensionLogged = false;
+     }
+  return false;
+}
+
+bool cCuttingThread::LoadFrame(int Index, uchar *Buffer, bool &Independent, int &Length)
+{
+  uint16_t FileNumber;
+  off_t FileOffset;
+  if (fromIndex->Get(Index, &FileNumber, &FileOffset, &Independent, &Length)) {
+     fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
+     if (fromFile) {
+        fromFile->SetReadAhead(MEGABYTE(20));
+        int len = ReadFrame(fromFile, Buffer,  Length, MAXFRAMESIZE);
+        if (len < 0)
+           error = "ReadFrame";
+        else if (len != Length)
+           Length = len;
+        return error == NULL;
+        }
+     else
+        error = "fromFile";
+     }
+  return false;
+}
+
+bool cCuttingThread::SwitchFile(bool Force)
+{
+  if (fileSize > maxVideoFileSize || Force) {
+     toFile = toFileName->NextFile();
+     if (!toFile) {
+        error = "toFile";
+        return false;
+        }
+     fileSize = 0;
+     }
+  return true;
+}
+
+bool cCuttingThread::FramesAreEqual(int Index1, int Index2)
+{
+  bool Independent;
+  uchar Buffer1[MAXFRAMESIZE];
+  uchar Buffer2[MAXFRAMESIZE];
+  int Length1;
+  int Length2;
+  if (LoadFrame(Index1, Buffer1, Independent, Length1) && LoadFrame(Index2, Buffer2, Independent, Length2)) {
+     if (Length1 == Length2) {
+        int Diffs = 0;
+        for (int i = 0; i < Length1; i++) {
+            if (Buffer1[i] != Buffer2[i]) {
+               if (Diffs++ > 10) // the continuity counters of the PAT/PMT packets may differ
+                  return false;
+               }
+            }
+        return true;
+        }
+     }
+  return false;
+}
+
+void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index, int64_t LastPts)
+{
+  bool Processed[MAXPID] = { false };
+  int NumIndependentFrames = 0;
+  cPatPmtParser PatPmtParser;
+  cPacketStorage PacketStorage;
+  for (; NumIndependentFrames < 2; Index++) {
+      uchar Buffer[MAXFRAMESIZE];
+      bool Independent;
+      int len;
+      if (LoadFrame(Index, Buffer, Independent, len)) {
+         if (Independent)
+            NumIndependentFrames++;
+         uchar *p = Buffer;
+         while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
+               int Pid = TsPid(p);
+               if (Pid == PATPID)
+                  PatPmtParser.ParsePat(p, TS_SIZE);
+               else if (Pid == PatPmtParser.PmtPid())
+                  PatPmtParser.ParsePmt(p, TS_SIZE);
+               else if (!Processed[Pid]) {
+                  int64_t Pts = TsGetPts(p, TS_SIZE);
+                  if (Pts >= 0) {
+                     int64_t d = PtsDiff(LastPts, Pts);
+                     if (d <= 0) // Pts is before or at LastPts
+                        PacketStorage.Flush(Pid, Data, Length, MAXFRAMESIZE);
+                     if (d >= 0) { // Pts is at or after LastPts
+                        NumIndependentFrames = 0; // we search until we find two consecutive I-frames without any more pending packets
+                        Processed[Pid] = true;
+                        }
+                     }
+                  if (!Processed[Pid])
+                     PacketStorage.Append(Pid, p, TS_SIZE);
+                  }
+               len -= TS_SIZE;
+               p += TS_SIZE;
+               }
+         }
+      else
+         break;
+      }
+}
+
+bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIndex, int NextBeginIndex)
+{
+  // Check for seamless connections:
+  bool SeamlessBegin = LastEndIndex >= 0 && FramesAreEqual(LastEndIndex, BeginIndex);
+  bool SeamlessEnd = NextBeginIndex >= 0 && FramesAreEqual(EndIndex, NextBeginIndex);
+  // Process all frames from BeginIndex (included) to EndIndex (excluded):
+  cDanglingPacketStripper DanglingPacketStripper;
+  int NumIndependentFrames = 0;
+  int64_t FirstPts = -1;
+  int64_t LastPts = -1;
+  for (int Index = BeginIndex; Running() && Index < EndIndex; Index++) {
+      uchar Buffer[MAXFRAMESIZE];
+      bool Independent;
+      int Length;
+      if (LoadFrame(Index, Buffer, Independent, Length)) {
+         if (!isPesRecording) {
+            int64_t Pts = TsGetPts(Buffer, Length);
+            if (FirstPts < 0)
+               FirstPts = Pts; // the PTS of the first frame in the sequence
+            else if (LastPts < 0 || PtsDiff(LastPts, Pts) > 0)
+               LastPts = Pts; // the PTS of the frame that is displayed as the very last one of the sequence
+            }
+         // Fixup data at the beginning of the sequence:
+         if (!SeamlessBegin) {
+            if (isPesRecording) {
+               if (Index == BeginIndex)
+                  cRemux::SetBrokenLink(Buffer, Length);
+               }
+            else if (NumIndependentFrames < 2) {
+               if (DanglingPacketStripper.Process(Buffer, Length, FirstPts))
+                  NumIndependentFrames = 0; // we search until we find two consecutive I-frames without any more dangling packets
+               }
+            }
+         // Fixup data at the end of the sequence:
+         if (!SeamlessEnd) {
+            if (Index == EndIndex - 1) {
+               if (!isPesRecording)
+                  GetPendingPackets(Buffer, Length, EndIndex, LastPts + int(round(PTSTICKS / framesPerSecond))); // adding one frame length to fully cover the very last frame
+               }
+            }
+         // Fixup timestamps and continuity counters:
+         if (!isPesRecording) {
+            if (numSequences > 1)
+              ptsFixer.Fix(Buffer, Length, !SeamlessBegin && Index == BeginIndex);
+            }
+         // Every file shall start with an independent frame:
+         if (Independent) {
+            NumIndependentFrames++;
+            if (!SwitchFile())
+               return false;
+            }
+         // Write index:
+         if (!toIndex->Write(Independent, toFileName->Number(), fileSize)) {
+            error = "toIndex";
+            return false;
+            }
+         // Write data:
+         if (toFile->Write(Buffer, Length) < 0) {
+            error = "safe_write";
+            return false;
+            }
+         fileSize += Length;
+         // Generate marks at the editing points in the edited recording:
+         if (numSequences > 0 && Index == BeginIndex) {
+            if (toMarks.Count() > 0)
+               toMarks.Add(toIndex->Last());
+            toMarks.Add(toIndex->Last());
+            toMarks.Save();
+            }
+         }
+      else
+         return false;
+      }
+  return true;
+}
+
 void cCuttingThread::Action(void)
 {
-  cMark *Mark = fromMarks.First();
-  if (Mark) {
-     SetPriority(19);
-     SetIOPriority(7);
+  if (cMark *BeginMark = fromMarks.GetNextBegin()) {
      fromFile = fromFileName->Open();
      toFile = toFileName->Open();
      if (!fromFile || !toFile)
         return;
-     fromFile->SetReadAhead(MEGABYTE(20));
-     int Index = Mark->Position();
-     Mark = fromMarks.Next(Mark);
-     off_t FileSize = 0;
-     int CurrentFileNumber = 0;
-     int LastIFrame = 0;
-     toMarks.Add(0);
-     toMarks.Save();
-     uchar buffer[MAXFRAMESIZE], buffer2[MAXFRAMESIZE];
-     int Length2;
-     bool CheckForSeamlessStream = false;
-     bool LastMark = false;
-     bool cutIn = true;
-     bool suspensionLogged = false;
-     while (Running()) {
-           uint16_t FileNumber;
-           off_t FileOffset;
-           int Length;
-           bool Independent;
-
+     int LastEndIndex = -1;
+     while (BeginMark && Running()) {
            // Suspend cutting if we have severe throughput problems:
-
-           if (cIoThrottle::Engaged()) {
-              if (!suspensionLogged) {
-                 dsyslog("suspending cutter thread");
-                 suspensionLogged = true;
-                 }
+           if (Throttled()) {
               cCondWait::SleepMs(100);
               continue;
               }
-           else if (suspensionLogged) {
-              dsyslog("resuming cutter thread");
-              suspensionLogged = false;
-              }
-
            // Make sure there is enough disk space:
-
            AssertFreeDiskSpace(-1);
-
-           // Read one frame:
-
-           if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &Independent, &Length)) {
-              if (FileNumber != CurrentFileNumber) {
-                 fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
-                 if (fromFile)
-                    fromFile->SetReadAhead(MEGABYTE(20));
-                 CurrentFileNumber = FileNumber;
-                 }
-              if (fromFile) {
-                 int len = ReadFrame(fromFile, buffer,  Length, sizeof(buffer));
-                 if (len < 0) {
-                    error = "ReadFrame";
-                    break;
-                    }
-                 if (len != Length) {
-                    CurrentFileNumber = 0; // this re-syncs in case the frame was larger than the buffer
-                    Length = len;
-                    }
-                 }
-              else {
-                 error = "fromFile";
-                 break;
-                 }
+           // Determine the actual begin and end marks, skipping any marks at the same position:
+           cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
+           // Process the current sequence:
+           int EndIndex = EndMark ? EndMark->Position() : fromIndex->Last() + 1;
+           int NextBeginIndex = -1;
+           if (EndMark) {
+              if (cMark *NextBeginMark = fromMarks.GetNextBegin(EndMark))
+                 NextBeginIndex = NextBeginMark->Position();
               }
-           else {
-              // Error, unless we're past the last cut-in and there's no cut-out
-              if (Mark || LastMark)
-                 error = "index";
+           if (!ProcessSequence(LastEndIndex, BeginMark->Position(), EndIndex, NextBeginIndex))
               break;
-              }
-
-           // Write one frame:
-
-           if (Independent) { // every file shall start with an independent frame
-              if (LastMark) // edited version shall end before next I-frame
-                 break;
-              if (FileSize > maxVideoFileSize) {
-                 toFile = toFileName->NextFile();
-                 if (!toFile) {
-                    error = "toFile 1";
+           if (!EndMark)
+              break; // reached EOF
+           LastEndIndex = EndIndex;
+           // Switch to the next sequence:
+           BeginMark = fromMarks.GetNextBegin(EndMark);
+           if (BeginMark) {
+              // Split edited files:
+              if (Setup.SplitEditedFiles) {
+                 if (!SwitchFile(true))
                     break;
-                    }
-                 FileSize = 0;
-                 }
-              LastIFrame = 0;
-              // Compare the current frame with the previously stored one, to see if this is a seamlessly merged recording of the same stream:
-              if (CheckForSeamlessStream) {
-                 if (Length == Length2) {
-                    int diffs = 0;
-                    for (int i = 0; i < Length; i++) {
-                        if (buffer[i] != buffer2[i]) {
-                           if (diffs++ > 10)
-                              break;
-                           }
-                        }
-                    if (diffs < 10) // the continuity counters of the PAT/PMT packets may differ
-                       cutIn = false; // it's apparently a seamless stream, so no need for "broken" handling
-                    }
-                 CheckForSeamlessStream = false;
-                 }
-              if (cutIn) {
-                 if (isPesRecording)
-                    cRemux::SetBrokenLink(buffer, Length);
-                 else
-                    TsSetTeiOnBrokenPackets(buffer, Length);
-                 cutIn = false;
                  }
               }
-           if (toFile->Write(buffer, Length) < 0) {
-              error = "safe_write";
-              break;
-              }
-           if (!toIndex->Write(Independent, toFileName->Number(), FileSize)) {
-              error = "toIndex";
-              break;
-              }
-           FileSize += Length;
-           if (!LastIFrame)
-              LastIFrame = toIndex->Last();
-
-           // Check editing marks:
-
-           if (Mark && Index >= Mark->Position()) {
-              Mark = fromMarks.Next(Mark);
-              toMarks.Add(LastIFrame);
-              if (Mark)
-                 toMarks.Add(toIndex->Last() + 1);
-              toMarks.Save();
-              if (Mark) {
-                 // Read the next frame, for later comparison with the first frame at this mark:
-                 if (fromIndex->Get(Index, &FileNumber, &FileOffset, &Independent, &Length2)) {
-                    if (FileNumber != CurrentFileNumber)
-                       fromFile = fromFileName->SetOffset(FileNumber, FileOffset);
-                    if (fromFile) {
-                       int len = ReadFrame(fromFile, buffer2, Length2, sizeof(buffer2));
-                       if (len >= 0 && len == Length2)
-                          CheckForSeamlessStream = true;
-                       }
-                    }
-                 Index = Mark->Position();
-                 Mark = fromMarks.Next(Mark);
-                 CurrentFileNumber = 0; // triggers SetOffset before reading next frame
-                 cutIn = true;
-                 if (Setup.SplitEditedFiles) {
-                    toFile = toFileName->NextFile();
-                    if (!toFile) {
-                       error = "toFile 2";
-                       break;
-                       }
-                    FileSize = 0;
-                    }
-                 }
-              else
-                 LastMark = true;
-              }
            }
      Recordings.TouchUpdate();
      }
@@ -257,7 +575,7 @@ bool cCutter::Start(const char *FileName)
 
      cMarks FromMarks;
      FromMarks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
-     if (cMark *First = FromMarks.First())
+     if (cMark *First = FromMarks.GetNextBegin())
         Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60);
 
      const char *evn = Recording.PrefixFileName('%');
@@ -345,13 +663,17 @@ bool CutRecording(const char *FileName)
      if (Recording.Name()) {
         cMarks Marks;
         if (Marks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording()) && Marks.Count()) {
-           if (cCutter::Start(FileName)) {
-              while (cCutter::Active())
-                    cCondWait::SleepMs(CUTTINGCHECKINTERVAL);
-              return true;
+           if (Marks.GetNumSequences()) {
+              if (cCutter::Start(FileName)) {
+                 while (cCutter::Active())
+                       cCondWait::SleepMs(CUTTINGCHECKINTERVAL);
+                 return true;
+                 }
+              else
+                 fprintf(stderr, "can't start editing process\n");
               }
            else
-              fprintf(stderr, "can't start editing process\n");
+              fprintf(stderr, "'%s' has no editing sequences\n", FileName);
            }
         else
            fprintf(stderr, "'%s' has no editing marks\n", FileName);
diff --git a/device.c b/device.c
index aa93a8e5f..766253a1a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.68 2012/09/20 09:32:26 kls Exp $
+ * $Id: device.c 2.69 2012/11/13 09:11:43 kls Exp $
  */
 
 #include "device.h"
@@ -1147,7 +1147,7 @@ void cDevice::StillPicture(const uchar *Data, int Length)
      int Size = 0;
      while (Length >= TS_SIZE) {
            int Pid = TsPid(Data);
-           if (Pid == 0)
+           if (Pid == PATPID)
               patPmtParser.ParsePat(Data, TS_SIZE);
            else if (Pid == patPmtParser.PmtPid())
               patPmtParser.ParsePmt(Data, TS_SIZE);
@@ -1484,7 +1484,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
            if (TsHasPayload(Data)) { // silently ignore TS packets w/o payload
               int PayloadOffset = TsPayloadOffset(Data);
               if (PayloadOffset < TS_SIZE) {
-                 if (Pid == 0)
+                 if (Pid == PATPID)
                     patPmtParser.ParsePat(Data, TS_SIZE);
                  else if (Pid == patPmtParser.PmtPid())
                     patPmtParser.ParsePmt(Data, TS_SIZE);
diff --git a/dvbdevice.c b/dvbdevice.c
index 9320da6b6..d3ade7551 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.72 2012/09/20 10:07:54 kls Exp $
+ * $Id: dvbdevice.c 2.74 2012/10/07 11:11:30 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -21,7 +21,9 @@
 #include "menuitems.h"
 #include "sourceparams.h"
 
-#define FE_CAN_TURBO_FEC  0x8000000 // TODO: remove this once it is defined in the driver
+#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
+#define DTV_STREAM_ID DTV_DVBT2_PLP_ID
+#endif
 
 #define DVBS_TUNE_TIMEOUT  9000 //ms
 #define DVBS_LOCK_TIMEOUT  2000 //ms
@@ -408,7 +410,7 @@ cString cDvbTuner::GetBondingParams(const cChannel *Channel) const
         return diseqc->Commands();
      }
   else {
-     bool ToneOff = Channel->Frequency() < (unsigned int)Setup.LnbSLOF;
+     bool ToneOff = Channel->Frequency() < Setup.LnbSLOF;
      bool VoltOff = dtp.Polarization() == 'V' || dtp.Polarization() == 'R';
      return cString::sprintf("%c %c", ToneOff ? 't' : 'T', VoltOff ? 'v' : 'V');
      }
@@ -574,40 +576,52 @@ int cDvbTuner::GetSignalQuality(void) const
            return 3;
         return 4;
         }
+#ifdef DEBUG_SIGNALQUALITY
      bool HasSnr = true;
+#endif
      uint16_t Snr;
      while (1) {
            if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1)
               break;
            if (errno == EOPNOTSUPP) {
               Snr = 0xFFFF;
+#ifdef DEBUG_SIGNALQUALITY
               HasSnr = false;
+#endif
               break;
               }
            if (errno != EINTR)
               return -1;
            }
+#ifdef DEBUG_SIGNALQUALITY
      bool HasBer = true;
+#endif
      uint32_t Ber;
      while (1) {
            if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1)
               break;
            if (errno == EOPNOTSUPP) {
               Ber = 0;
+#ifdef DEBUG_SIGNALQUALITY
               HasBer = false;
+#endif
               break;
               }
            if (errno != EINTR)
               return -1;
            }
+#ifdef DEBUG_SIGNALQUALITY
      bool HasUnc = true;
+#endif
      uint32_t Unc;
      while (1) {
            if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1)
               break;
            if (errno == EOPNOTSUPP) {
               Unc = 0;
+#ifdef DEBUG_SIGNALQUALITY
               HasUnc = false;
+#endif
               break;
               }
            if (errno != EINTR)
@@ -810,7 +824,7 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
      if (frontendType == SYS_DVBT2) {
         // DVB-T2
-        SETCMD(DTV_DVBT2_PLP_ID, dtp.PlpId());
+        SETCMD(DTV_STREAM_ID, dtp.PlpId());
         }
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
diff --git a/epg.c b/epg.c
index 1c1ecdf50..3da7dc1d0 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.21 2012/09/29 14:29:49 kls Exp $
+ * $Id: epg.c 2.22 2012/10/04 12:21:24 kls Exp $
  */
 
 #include "epg.h"
@@ -1148,14 +1148,12 @@ class cEpgDataWriter : public cThread {
   };
 
 cEpgDataWriter::cEpgDataWriter(void)
-:cThread("epg data writer")
+:cThread("epg data writer", true)
 {
 }
 
 void cEpgDataWriter::Action(void)
 {
-  SetPriority(19);
-  SetIOPriority(7);
   Perform();
 }
 
diff --git a/libsi/si.h b/libsi/si.h
index 4dccdd80f..8e4255e3e 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 2.5 2012/01/11 11:35:17 kls Exp $
+ *   $Id: si.h 2.6 2012/10/15 11:56:06 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -347,8 +347,10 @@ template <class T> class StructureLoop : public Loop {
          T *ret=new T();
          ret->setData(d);
          ret->CheckParse();
-         if (!checkSize(ret->getLength()))
+         if (!checkSize(ret->getLength())) {
+            delete ret;
             return 0;
+         }
          it.i+=ret->getLength();
          return ret;
       }
diff --git a/menu.c b/menu.c
index cdd9d3ac4..b5a0d250a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.61 2012/09/15 11:45:28 kls Exp $
+ * $Id: menu.c 2.65 2012/11/18 13:07:53 kls Exp $
  */
 
 #include "menu.h"
@@ -3418,7 +3418,7 @@ bool cMenuMain::Update(bool Force)
         stopReplayItem = NULL;
         }
      // Color buttons:
-     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : NULL);
+     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
      result = true;
      }
 
@@ -3516,7 +3516,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 state = replaying ? osContinue : osPause;
                              break;
                case kBlue:   if (!HadSubMenu)
-                                state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
+                                state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osRecordings;
                              break;
                default:      break;
                }
@@ -4482,10 +4482,6 @@ cReplayControl::~cReplayControl()
   Hide();
   cStatus::MsgReplaying(this, NULL, fileName, false);
   Stop();
-  if (marksModified) {
-     marks.Save();
-     marksModified = false;
-     }
   if (currentReplayControl == this)
      currentReplayControl = NULL;
 }
@@ -4573,6 +4569,10 @@ void cReplayControl::Hide(void)
      timeSearchActive = false;
      timeoutShow = 0;
      }
+  if (marksModified) {
+     marks.Save();
+     marksModified = false;
+     }
 }
 
 void cReplayControl::ShowMode(void)
@@ -4771,12 +4771,12 @@ void cReplayControl::MarkMove(bool Forward)
         int p = SkipFrames(Forward ? 1 : -1);
         cMark *m2;
         if (Forward) {
-           if ((m2 = marks.Next(m)) != NULL && m2->Position() <= p)
-              return;
+           while ((m2 = marks.Next(m)) != NULL && m2->Position() == m->Position())
+                 m = m2;
            }
         else {
-           if ((m2 = marks.Prev(m)) != NULL && m2->Position() >= p)
-              return;
+           while ((m2 = marks.Prev(m)) != NULL && m2->Position() == m->Position())
+                 m = m2;
            }
         m->SetPosition(p);
         Goto(m->Position(), true);
@@ -4789,13 +4789,11 @@ void cReplayControl::EditCut(void)
 {
   if (*fileName) {
      Hide();
-     if (marksModified) {
-        marks.Save();
-        marksModified = false;
-        }
      if (!cCutter::Active()) {
         if (!marks.Count())
            Skins.Message(mtError, tr("No editing marks defined!"));
+        else if (!marks.GetNumSequences())
+           Skins.Message(mtError, tr("No editing sequences defined!"));
         else if (!cCutter::Start(fileName))
            Skins.Message(mtError, tr("Can't start editing process!"));
         else
diff --git a/po/ar.po b/po/ar.po
index 14e8126b2..c0fb31f40 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1241,6 +1241,9 @@ msgstr "اقفز الى  "
 msgid "No editing marks defined!"
 msgstr "لاتوجد علامات تعديل معرفة"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "لا يمكن البدء فى عملية التعديل"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c67265b1f..f08cd57ba 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1216,6 +1216,9 @@ msgstr "Salta a:"
 msgid "No editing marks defined!"
 msgstr "No hi ha marques d'edici� definides"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "No puc iniciar el proc�s d'edici�!"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 55053f95d..1a621026b 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1215,6 +1215,9 @@ msgstr "Skok: "
 msgid "No editing marks defined!"
 msgstr "Nejsou definovány editační značky!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Nelze začít editační proces!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index fac580030..597539ff8 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Hop: "
 msgid "No editing marks defined!"
 msgstr "Der er ikke sat nogen redigeringsm�rker!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Kan ikke starte redigeringsprocessen!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index a321b5016..c958758cc 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Springen: "
 msgid "No editing marks defined!"
 msgstr "Keine Schnittmarken gesetzt!"
 
+msgid "No editing sequences defined!"
+msgstr "Keine Schnittsequenzen definiert!"
+
 msgid "Can't start editing process!"
 msgstr "Schnitt kann nicht gestartet werden!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 8936408c9..1347812d8 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "
 msgid "No editing marks defined!"
 msgstr "��� ����� ������� ������ ������������"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "�������� ��������� ��� ������������!"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index bc80a1172..8e76063d3 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "Saltar: "
 msgid "No editing marks defined!"
 msgstr "�No se definieron marcas de edici�n!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "�No se puede iniciar el proceso de edici�n!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 0dea99920..12c1f2595 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Hüpe: "
 msgid "No editing marks defined!"
 msgstr "Redigeerimise markerid puuduvad!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Redigeerimise start nurjus!"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index daad22ae1..901328ae8 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1216,6 +1216,9 @@ msgstr "Siirry: "
 msgid "No editing marks defined!"
 msgstr "Muokkausmerkinnät puuttuvat!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Muokkauksen aloitus epäonnistui!"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3ca3c06fa..a0995aebd 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1219,6 +1219,9 @@ msgstr "Acc
 msgid "No editing marks defined!"
 msgstr "Pas de marques d'�dition d�finies !"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Impossible de commencer le montage !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index dcb1a2172..44cfd09f5 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1215,6 +1215,9 @@ msgstr "Sko
 msgid "No editing marks defined!"
 msgstr "Nijedna to�ka rezanja nije odre�ena!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Ne mogu zapo�eti ure�ivanje!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c391b67ef..30ab8ab6f 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1217,6 +1217,9 @@ msgstr "Ugr
 msgid "No editing marks defined!"
 msgstr "Nincs v�g�pont kijel�lve"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "A v�g�s nem ind�that�!"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index b63d93d8d..1258f23f6 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2012-06-06 22:50+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1220,6 +1220,9 @@ msgstr "Vai a: "
 msgid "No editing marks defined!"
 msgstr "Nessun marcatore di modifica definito!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Impossibile avviare il processo di modifica!"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 95f8e8319..b53c76271 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Peršokti: "
 msgid "No editing marks defined!"
 msgstr "Nenustatytos koregavimo žymės!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Negali pradėti koregavimo!"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index fd16ec883..89e8b7399 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2010-03-11 00:54+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "Скокни:"
 msgid "No editing marks defined!"
 msgstr "Нема одредено ознаки за сечење!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Не може да почне уредување!"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 6c3825d9e..5e515c369 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1217,6 +1217,9 @@ msgstr "Springen: "
 msgid "No editing marks defined!"
 msgstr "Geen bewerkingsmarkeringen gedefinieerd!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Kan niet beginnen met bewerken!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 41ce5c308..f36626054 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "Hopp: "
 msgid "No editing marks defined!"
 msgstr ""
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Kan ikke starte redigeringsprosessen!"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f4c187613..fbe8a8608 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "Skok: "
 msgid "No editing marks defined!"
 msgstr "Nie zdefiniowano znacznik�w monta�u!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Nie mo�na uruchomi� procesu edycji!"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 5cfc2037f..d69e0690c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "Saltar: "
 msgid "No editing marks defined!"
 msgstr "Marcas de edi��o n�o foram definidas!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Imposs�vel iniciar processo de edi��o!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index cd638dcd3..03ae8f029 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
-# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008, 2010, 2011
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008, 2010, 2011, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
-"PO-Revision-Date: 2011-03-10 23:52+0100\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"PO-Revision-Date: 2012-11-05 01:28+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -47,7 +47,7 @@ msgid "System"
 msgstr "Sistem"
 
 msgid "Srate"
-msgstr "Rat� simboluri"
+msgstr "Rată simboluri"
 
 msgid "Inversion"
 msgstr "Inversiune"
@@ -59,10 +59,10 @@ msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "Modula�ie"
+msgstr "Modulaţie"
 
 msgid "Bandwidth"
-msgstr "L�rgime de band�"
+msgstr "Lărgime de bandă"
 
 msgid "Transmission"
 msgstr "Transmisie"
@@ -77,52 +77,52 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "Identificator PLP"
 
 msgid "Starting EPG scan"
-msgstr "Pornesc achizi�ia EPG"
+msgstr "Pornesc achiziţia EPG"
 
 msgid "Content$Movie/Drama"
-msgstr "Film/Dram�"
+msgstr "Film/Dramă"
 
 msgid "Content$Detective/Thriller"
-msgstr "Poli�ist/Suspense"
+msgstr "Poliţist/Suspense"
 
 msgid "Content$Adventure/Western/War"
-msgstr "Aventuri/Western/R�zboi"
+msgstr "Aventuri/Western/Război"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr "Science-Fiction/Fantastic/Groaz�"
+msgstr "Science-Fiction/Fantastic/Groază"
 
 msgid "Content$Comedy"
 msgstr "Comedie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr "Telenovel�/Melodram�/Folclor"
+msgstr "Telenovelă/Melodramă/Folclor"
 
 msgid "Content$Romance"
 msgstr "Film romantic"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "Film serios/clasic/religios/istoric/Dram�"
+msgstr "Film serios/clasic/religios/istoric/Dramă"
 
 msgid "Content$Adult Movie/Drama"
-msgstr "Film pentru adul�i/Dram�"
+msgstr "Film pentru adulţi/Dramă"
 
 msgid "Content$News/Current Affairs"
-msgstr "�tiri/Actualit��i"
+msgstr "Ştiri/Actualităţi"
 
 msgid "Content$News/Weather Report"
-msgstr "�tiri/Buletin meteorologic"
+msgstr "Ştiri/Buletin meteorologic"
 
 msgid "Content$News Magazine"
-msgstr "Magazin de �tiri"
+msgstr "Magazin de ştiri"
 
 msgid "Content$Documentary"
 msgstr "Documentar"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr "Discu�ie/Interviu/Dezbatere"
+msgstr "Discuţie/Interviu/Dezbatere"
 
 msgid "Content$Show/Game Show"
 msgstr "Show/Jocuri"
@@ -131,7 +131,7 @@ msgid "Content$Game Show/Quiz/Contest"
 msgstr "Emisiune jocuri/quiz/concurs"
 
 msgid "Content$Variety Show"
-msgstr "Variet��i"
+msgstr "Varietăţi"
 
 msgid "Content$Talk Show"
 msgstr "Talk Show"
@@ -152,7 +152,7 @@ msgid "Content$Tennis/Squash"
 msgstr "Tenis/Squash"
 
 msgid "Content$Team Sports"
-msgstr "Sporturi de echip�"
+msgstr "Sporturi de echipă"
 
 msgid "Content$Athletics"
 msgstr "Atletism"
@@ -164,19 +164,19 @@ msgid "Content$Water Sport"
 msgstr "Sporturi acvatice"
 
 msgid "Content$Winter Sports"
-msgstr "Sporturi de iarn�"
+msgstr "Sporturi de iarnă"
 
 msgid "Content$Equestrian"
-msgstr "Echita�ie"
+msgstr "Echitaţie"
 
 msgid "Content$Martial Sports"
-msgstr "Arte mar�iale"
+msgstr "Arte marţiale"
 
 msgid "Content$Children's/Youth Programme"
 msgstr "Emisiune pentru copii/tineret"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr "Emisiune pentru copii pre�colari"
+msgstr "Emisiune pentru copii preşcolari"
 
 msgid "Content$Entertainment Programme for 6 to 14"
 msgstr "Divertisment pentru copii intre 6 - 16 ani"
@@ -185,34 +185,34 @@ msgid "Content$Entertainment Programme for 10 to 16"
 msgstr "Divertisment pentru copii intre 10 - 16 ani"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr "Informa�ional/Educa�ional/Emisiune �coal�"
+msgstr "Informaţional/Educaţional/Emisiune şcoală"
 
 msgid "Content$Cartoons/Puppets"
-msgstr "Desene animate/Teatru de p�pu�i"
+msgstr "Desene animate/Teatru de păpuşi"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr "Muzic�/Balet/Dans"
+msgstr "Muzică/Balet/Dans"
 
 msgid "Content$Rock/Pop"
 msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr "Muzic� clasic�/serioas�"
+msgstr "Muzică clasică/serioasă"
 
 msgid "Content$Folk/Tradional Music"
-msgstr "Muzic� folk/tradi�ional�"
+msgstr "Muzică folk/tradiţională"
 
 msgid "Content$Jazz"
 msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr "Teatru muzical/Oper�/Operet�"
+msgstr "Teatru muzical/Operă/Operetă"
 
 msgid "Content$Ballet"
 msgstr "Balet"
 
 msgid "Content$Arts/Culture"
-msgstr "Art�/Cultur�"
+msgstr "Artă/Cultură"
 
 msgid "Content$Performing Arts"
 msgstr "Spectacole"
@@ -224,10 +224,10 @@ msgid "Content$Religion"
 msgstr "Religie"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr "Cultur� Pop/Arte tradi�ionale"
+msgstr "Cultură Pop/Arte tradiţionale"
 
 msgid "Content$Literature"
-msgstr "Literatur�"
+msgstr "Literatură"
 
 msgid "Content$Film/Cinema"
 msgstr "Film/Cinema"
@@ -236,16 +236,16 @@ msgid "Content$Experimental Film/Video"
 msgstr "Film experimental/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr "Radiodifuziune/Pres�"
+msgstr "Radiodifuziune/Presă"
 
 msgid "Content$New Media"
 msgstr "Medii noi"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr "Art�/Magazin cultural"
+msgstr "Artă/Magazin cultural"
 
 msgid "Content$Fashion"
-msgstr "Mod�"
+msgstr "Modă"
 
 msgid "Content$Social/Political/Economics"
 msgstr "Social/Politic/Economie"
@@ -254,28 +254,28 @@ msgid "Content$Magazine/Report/Documentary"
 msgstr "Magazin/Reportaj/Documentar"
 
 msgid "Content$Economics/Social Advisory"
-msgstr "Economie/Consiliere social�"
+msgstr "Economie/Consiliere socială"
 
 msgid "Content$Remarkable People"
 msgstr "Oameni remarcabili"
 
 msgid "Content$Education/Science/Factual"
-msgstr "Educa�ie/�tiin��/Practic"
+msgstr "Educaţie/Ştiinţă/Practic"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr "Natur�/Animale/Mediu"
+msgstr "Natură/Animale/Mediu"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr "Tehnologie/�tiin�e naturale"
+msgstr "Tehnologie/Ştiinţe naturale"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr "Medicin�/Fiziologie/Psihologie"
+msgstr "Medicină/Fiziologie/Psihologie"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr "��ri str�ine/Expedi�ii"
+msgstr "Ţări străine/Expediţii"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr "Social/�tiin�e spirituale"
+msgstr "Social/Ştiinţe spirituale"
 
 msgid "Content$Further Education"
 msgstr "Cursuri de aprofundare"
@@ -287,28 +287,28 @@ msgid "Content$Leisure/Hobbies"
 msgstr "Timp liber/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr "Turism/C�l�torie"
+msgstr "Turism/Călătorie"
 
 msgid "Content$Handicraft"
-msgstr "Me�te�ug"
+msgstr "Meşteşug"
 
 msgid "Content$Motoring"
 msgstr "Motoare"
 
 msgid "Content$Fitness & Health"
-msgstr "Mi�care & S�n�tate"
+msgstr "Mişcare & Sănătate"
 
 msgid "Content$Cooking"
-msgstr "G�tit"
+msgstr "Gătit"
 
 msgid "Content$Advertisement/Shopping"
-msgstr "Publicitate/Cump�r�turi"
+msgstr "Publicitate/Cumpărături"
 
 msgid "Content$Gardening"
-msgstr "Gr�din�rit"
+msgstr "Grădinărit"
 
 msgid "Content$Original Language"
-msgstr "Limba original�"
+msgstr "Limba originală"
 
 msgid "Content$Black & White"
 msgstr "Alb-Negru"
@@ -317,65 +317,65 @@ msgid "Content$Unpublished"
 msgstr "Nepublicat"
 
 msgid "Content$Live Broadcast"
-msgstr "Transmisie �n direct"
+msgstr "Transmisie în direct"
 
 #, c-format
 msgid "ParentalRating$from %d"
 msgstr "de la %d ani"
 
 msgid "No title"
-msgstr "F�r� titlu"
+msgstr "Fără titlu"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
-msgstr "Rom�n�"
+msgstr "Română"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
 msgstr "rom"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Faza 1: Detec�ia tipului telecomenzii"
+msgstr "Faza 1: Detecţia tipului telecomenzii"
 
 msgid "Press any key on the RC unit"
-msgstr "Ap�sa�i o tast� pe telecomand�"
+msgstr "Apăsaţi o tastă pe telecomandă"
 
 msgid "RC code detected!"
 msgstr "S-a detectat tipul telecomenzii!"
 
 msgid "Do not press any key..."
-msgstr "Nu ap�sa�i nici o tast�..."
+msgstr "Nu apăsaţi nici o tastă..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Faza 2: �nv��area codurilor anumitor taste"
+msgstr "Faza 2: Învăţarea codurilor anumitor taste"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Ap�sa�i tasta pentru '%s'"
+msgstr "Apăsaţi tasta pentru '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Ap�sa�i 'Sus' pentru confirmare"
+msgstr "Apăsaţi 'Sus' pentru confirmare"
 
 msgid "Press 'Down' to continue"
-msgstr "Ap�sa�i 'Jos' pentru continuare"
+msgstr "Apăsaţi 'Jos' pentru continuare"
 
 msgid "(press 'Up' to go back)"
-msgstr "(Ap�sa�i 'Sus' pentru revenire)"
+msgstr "(Apăsaţi 'Sus' pentru revenire)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(Ap�sa�i 'Jos' pentru terminare)"
+msgstr "(Apăsaţi 'Jos' pentru terminare)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "Ap�sa�i 'Meniu' pentru a s�ri peste aceast� tast�"
+msgstr "Apăsaţi 'Meniu' pentru a sări peste această tastă"
 
 msgid "Learning Remote Control Keys"
-msgstr "�nv��are taste telecomand�"
+msgstr "Învăţare taste telecomandă"
 
 msgid "Phase 3: Saving key codes"
 msgstr "Faza 3: Salvarea codurilor de taste"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Ap�sa�i 'Sus' pentru salvare, 'Jos' pentru anulare"
+msgstr "Apăsaţi 'Sus' pentru salvare, 'Jos' pentru anulare"
 
 msgid "Key$Up"
 msgstr "Sus"
@@ -390,16 +390,16 @@ msgid "Key$Ok"
 msgstr "OK"
 
 msgid "Key$Back"
-msgstr "�napoi"
+msgstr "Înapoi"
 
 msgid "Key$Left"
-msgstr "St�nga"
+msgstr "Stânga"
 
 msgid "Key$Right"
 msgstr "Dreapta"
 
 msgid "Key$Red"
-msgstr "Ro�u"
+msgstr "Roşu"
 
 msgid "Key$Green"
 msgstr "Verde"
@@ -417,28 +417,28 @@ msgid "Key$Play"
 msgstr "Redare"
 
 msgid "Key$Pause"
-msgstr "Pauz�"
+msgstr "Pauză"
 
 msgid "Key$Stop"
 msgstr "Stop"
 
 msgid "Key$Record"
-msgstr "�nregistrare"
+msgstr "Înregistrare"
 
 msgid "Key$FastFwd"
-msgstr "Derulare �nainte"
+msgstr "Derulare înainte"
 
 msgid "Key$FastRew"
-msgstr "Derulare �napoi"
+msgstr "Derulare înapoi"
 
 msgid "Key$Next"
-msgstr "Urm�tor"
+msgstr "Următor"
 
 msgid "Key$Prev"
 msgstr "Anterior"
 
 msgid "Key$Power"
-msgstr "�nchidere"
+msgstr "Închidere"
 
 msgid "Key$Channel+"
 msgstr "Canal+"
@@ -456,7 +456,7 @@ msgid "Key$Volume-"
 msgstr "Volum-"
 
 msgid "Key$Mute"
-msgstr "F�r� sunet"
+msgstr "Fără sunet"
 
 msgid "Key$Audio"
 msgstr "Sunet"
@@ -474,10 +474,10 @@ msgid "Key$Timers"
 msgstr "Timer-e"
 
 msgid "Key$Recordings"
-msgstr "�nregistr�ri"
+msgstr "Înregistrări"
 
 msgid "Key$Setup"
-msgstr "Configura�ie"
+msgstr "Configuraţie"
 
 msgid "Key$Commands"
 msgstr "Comenzi"
@@ -525,10 +525,10 @@ msgid "Name"
 msgstr "Nume"
 
 msgid "Source"
-msgstr "Surs�"
+msgstr "Sursă"
 
 msgid "Frequency"
-msgstr "Frecven��"
+msgstr "Frecvenţă"
 
 msgid "Vpid"
 msgstr "PID Video"
@@ -558,7 +558,7 @@ msgid "Tpid"
 msgstr "PID Teletext"
 
 msgid "CA"
-msgstr "CA (Acces Condi�ional)"
+msgstr "CA (Acces Condiţional)"
 
 msgid "Sid"
 msgstr "Sid"
@@ -570,25 +570,25 @@ msgid "Channels"
 msgstr "Canale"
 
 msgid "Button$Edit"
-msgstr "Modific�"
+msgstr "Modifică"
 
 msgid "Button$New"
 msgstr "Nou"
 
 msgid "Button$Delete"
-msgstr "�terge"
+msgstr "Şterge"
 
 msgid "Button$Mark"
-msgstr "Marcheaz�"
+msgstr "Marchează"
 
 msgid "Channel is being used by a timer!"
 msgstr "Canalul este utilizat de un timer!"
 
 msgid "Delete channel?"
-msgstr "�terg canalul?"
+msgstr "Şterg canalul?"
 
 msgid "Edit folder"
-msgstr "Editeaz� directorul"
+msgstr "Editează directorul"
 
 msgid "New folder"
 msgstr "Director nou"
@@ -597,20 +597,20 @@ msgid "Sub folder"
 msgstr "Sub-director"
 
 msgid "Folder name already exists!"
-msgstr "Un director cu acela�i nume exist�!"
+msgstr "Un director cu acelaşi nume există!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Numele directorului nu poate s� con�in� '%c'!"
+msgstr "Numele directorului nu poate să conţină '%c'!"
 
 msgid "Button$Select"
-msgstr "Selecteaz�"
+msgstr "Selectează"
 
 msgid "Delete folder and all sub folders?"
-msgstr "�terg directorul �i toate sub-directoarele?"
+msgstr "Şterg directorul şi toate sub-directoarele?"
 
 msgid "Delete folder?"
-msgstr "�terg directorul?"
+msgstr "Şterg directorul?"
 
 msgid "Edit timer"
 msgstr "Modificare timer"
@@ -625,10 +625,10 @@ msgid "Day"
 msgstr "Ziua"
 
 msgid "Start"
-msgstr "�nceput"
+msgstr "Început"
 
 msgid "Stop"
-msgstr "Sf�r�it"
+msgstr "Sfârşit"
 
 msgid "VPS"
 msgstr "VPS"
@@ -637,25 +637,25 @@ msgid "Priority"
 msgstr "Prioritate"
 
 msgid "Lifetime"
-msgstr "Timp de p�strare"
+msgstr "Timp de păstrare"
 
 msgid "File"
-msgstr "Fi�ier"
+msgstr "Fişier"
 
 msgid "Button$Folder"
 msgstr "Director"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Odată"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repetitiv"
 
 msgid "First day"
 msgstr "Prima zi"
 
 msgid "Select folder"
-msgstr "Selecteaz� directorul"
+msgstr "Selectează directorul"
 
 msgid "Timers"
 msgstr "Timer-e"
@@ -667,10 +667,10 @@ msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "�terg timer-ul?"
+msgstr "Şterg timer-ul?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Timer-ul tocmai �nregistreaz� - �terg, totu�i?"
+msgstr "Timer-ul tocmai înregistrează - şterg, totuşi?"
 
 msgid "Event"
 msgstr "Emisiune"
@@ -679,19 +679,19 @@ msgid "Button$Timer"
 msgstr "Timer"
 
 msgid "Button$Record"
-msgstr "�nregistr."
+msgstr "Înregistr."
 
 msgid "Button$Switch"
-msgstr "Comut�"
+msgstr "Comută"
 
 msgid "What's on now?"
 msgstr "Ce emisiuni sunt acum?"
 
 msgid "What's on next?"
-msgstr "Ce emisiuni urmeaz�?"
+msgstr "Ce emisiuni urmează?"
 
 msgid "Button$Next"
-msgstr "Urm�tor"
+msgstr "Următor"
 
 msgid "Button$Now"
 msgstr "Acum"
@@ -708,32 +708,32 @@ msgstr "Programul canalului %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "Aceast� emisiune - %s"
+msgstr "Această emisiune - %s"
 
 msgid "This event - all channels"
-msgstr "Aceast� emisiune - toate canalele"
+msgstr "Această emisiune - toate canalele"
 
 msgid "All events - all channels"
 msgstr "Toate emisiunile - toate canalele"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "V� rog introduce�i %d cifre!"
+msgstr "Vă rog introduceţi %d cifre!"
 
 msgid "CAM not responding!"
-msgstr "CAM-ul nu reac�ioneaz�!"
+msgstr "CAM-ul nu reacţionează!"
 
 msgid "Recording info"
-msgstr "Detaliile �nregistr�rii"
+msgstr "Detaliile înregistrării"
 
 msgid "Button$Play"
 msgstr "Redare"
 
 msgid "Button$Rewind"
-msgstr "�napoi"
+msgstr "Înapoi"
 
 msgid "Recordings"
-msgstr "�nregistr�ri"
+msgstr "Înregistrări"
 
 msgid "Button$Open"
 msgstr "Deschide"
@@ -742,28 +742,28 @@ msgid "Commands"
 msgstr "Comenzi"
 
 msgid "Error while accessing recording!"
-msgstr "Eroare la accesarea �nregistr�rii"
+msgstr "Eroare la accesarea înregistrării"
 
 msgid "Delete recording?"
-msgstr "�terg �nregistrarea?"
+msgstr "Şterg înregistrarea?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Montajul înregistrării e în curs de desfășurare - șterg totuși?"
 
 msgid "Error while deleting recording!"
-msgstr "Eroare la �tergerea �nregistr�rii!"
+msgstr "Eroare la ştergerea înregistrării!"
 
 msgid "Recording commands"
-msgstr "Comenzi pentru �nregistr�ri"
+msgstr "Comenzi pentru înregistrări"
 
 msgid "never"
-msgstr "niciodat�"
+msgstr "niciodată"
 
 msgid "skin dependent"
 msgstr "dep. de skin"
 
 msgid "always"
-msgstr "�ntotdeauna"
+msgstr "întotdeauna"
 
 msgid "OSD"
 msgstr "OSD"
@@ -775,22 +775,22 @@ msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
 msgid "Setup.OSD$Theme"
-msgstr "Tem�"
+msgstr "Temă"
 
 msgid "Setup.OSD$Left (%)"
-msgstr "St�nga (%)"
+msgstr "Stânga (%)"
 
 msgid "Setup.OSD$Top (%)"
 msgstr "Sus (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "L��ime OSD (%)"
+msgstr "Lăţime OSD (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "�n�l�ime OSD (%)"
+msgstr "Înălţime OSD (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Timp afi�are mesaje (sec)"
+msgstr "Timp afişare mesaje (sec)"
 
 msgid "Setup.OSD$Use small font"
 msgstr "Utilizare fonturi mici"
@@ -805,19 +805,19 @@ msgid "Setup.OSD$Small font"
 msgstr "Font mic"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Font cu l��ime fix�"
+msgstr "Font cu lăţime fixă"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "M�rimea implicit� a fontului (%)"
+msgstr "Mărimea implicită a fontului (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "M�rimea 'mic�' a fontului (%)"
+msgstr "Mărimea 'mică' a fontului (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "M�rimea 'fix�' a fontului (%)"
+msgstr "Mărimea 'fixă' a fontului (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Pozi�ia informa�iilor despre canal"
+msgstr "Poziţia informaţiilor despre canal"
 
 msgid "bottom"
 msgstr "jos"
@@ -826,61 +826,61 @@ msgid "top"
 msgstr "sus"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Durata afi��rii info-canal (s)"
+msgstr "Durata afişării info-canal (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Informa�ii la comutarea canalului"
+msgstr "Informaţii la comutarea canalului"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Durata afi��rii informa�ii canal"
+msgstr "Durata afişării informaţii canal"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Deruleaz� pagini"
+msgstr "Derulează pagini"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Derulare circular�"
+msgstr "Derulare circulară"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Tasta 'Meniu' �nchide"
+msgstr "Tasta 'Meniu' închide"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Directoare �nregistr�ri"
+msgstr "Directoare înregistrări"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "Directoare �n meniul de timer-e"
+msgstr "Directoare în meniul de timer-e"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Caractere pe tastele numerice"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Primul buton colorat"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Al 2-lea buton colorat"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Al 3-lea buton colorat"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Al 4-lea buton colorat"
 
 msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "C�utare canale"
+msgstr "Căutare canale"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Interval achizi�ie EPG (h)"
+msgstr "Interval achiziţie EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Nivel corec�ie EPG"
+msgstr "Nivel corecţie EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Date EPG expirate cel mult (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Potrive�te ceasul sistem"
+msgstr "Potriveşte ceasul sistem"
 
 msgid "Setup.EPG$Use time from transponder"
 msgstr "Preia ora din transponder"
@@ -891,7 +891,7 @@ msgstr "Limbi preferate"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "Limba preferat�"
+msgstr "Limba preferată"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -915,10 +915,10 @@ msgid "names and PIDs"
 msgstr "nume si PID-uri"
 
 msgid "add new channels"
-msgstr "ad�ugare canale noi"
+msgstr "adăugare canale noi"
 
 msgid "add new transponders"
-msgstr "ad�ugare transpondere noi"
+msgstr "adăugare transpondere noi"
 
 msgid "DVB"
 msgstr "Dispozitiv DVB"
@@ -930,16 +930,16 @@ msgid "Button$Subtitles"
 msgstr "Subtitrare"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "Dispozitiv DVB primar"
+msgstr "Interfață DVB primară"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standard de recepție"
 
 msgid "Setup.DVB$Video format"
 msgstr "Format video"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Formatul red�rii video"
+msgstr "Formatul redării video"
 
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Sunet Dolby Digital"
@@ -954,22 +954,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Limba sunetului"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Afi�eaz� subtitrare"
+msgstr "Afişează subtitrare"
 
 msgid "Setup.DVB$Subtitle languages"
 msgstr "Limbi subtitrare"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "Limb� subtitrare"
+msgstr "Limbă subtitrare"
 
 msgid "Setup.DVB$Subtitle offset"
 msgstr "Offset subtitrare"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Transparen�a prim-planului subtitr�rii"
+msgstr "Transparenţa prim-planului subtitrării"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Transparen�a fundalului subtitr�rii"
+msgstr "Transparenţa fundalului subtitrării"
 
 msgid "LNB"
 msgstr "LNB"
@@ -978,20 +978,20 @@ msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utilizare DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "Frecven�� comutare band�, SLOF (MHz)"
+msgstr "Frecvenţă comutare bandă, SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Frecvn�� LNB inferioar� (Mhz)"
+msgstr "Frecvnţă LNB inferioară (Mhz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Frecvn�� LNB superioar� (MHz)"
+msgstr "Frecvnţă LNB superioară (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Receptorul %d conectat la cablul de satelit"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "propriu"
 
 msgid "CAM reset"
 msgstr "Resetare CAM"
@@ -1000,7 +1000,7 @@ msgid "CAM present"
 msgstr "CAM prezent"
 
 msgid "CAM ready"
-msgstr "CAM preg�tit"
+msgstr "CAM pregătit"
 
 msgid "CAM"
 msgstr "CAM"
@@ -1018,19 +1018,19 @@ msgid "Can't open CAM menu!"
 msgstr "Nu pot deschide meniul CAM"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM-ul este in folosin�� - totu�i resetez?"
+msgstr "CAM-ul este in folosinţă - totuşi resetez?"
 
 msgid "Can't reset CAM!"
 msgstr "Nu pot reseta CAM"
 
 msgid "do not pause live video"
-msgstr "nu �nregistra emisiunea"
+msgstr "nu înregistra emisiunea"
 
 msgid "confirm pause live video"
-msgstr "confirm� �nregistrarea emisiunii"
+msgstr "confirmă înregistrarea emisiunii"
 
 msgid "pause live video"
-msgstr "�nregistreaz� emisiunea"
+msgstr "înregistrează emisiunea"
 
 msgid "confirm"
 msgstr "confirmare"
@@ -1039,70 +1039,70 @@ msgid "yes"
 msgstr "da"
 
 msgid "Recording"
-msgstr "�nregistrare"
+msgstr "Înregistrare"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Marj� la pornire (min)"
+msgstr "Marjă la pornire (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Marj� la oprire (min)"
+msgstr "Marjă la oprire (min)"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Prioritate implicit�"
+msgstr "Prioritate implicită"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Timp de p�strare predefinit (zile)"
+msgstr "Timp de păstrare predefinit (zile)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Func�ia tastei 'pauz�'"
+msgstr "Funcţia tastei 'pauză'"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Prioritate pauz�"
+msgstr "Prioritate pauză"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "P�strarea emisiunilor 'pauzate' (zile)"
+msgstr "Păstrarea emisiunilor 'pauzate' (zile)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Utilizeaz� numele episodului"
+msgstr "Utilizează numele episodului"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "Utilizeaz� VPS"
+msgstr "Utilizează VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "Marj� de timp la utilizare VPS (s)"
+msgstr "Marjă de timp la utilizare VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Marcheaz� �nregistrare imediat�"
+msgstr "Marchează înregistrare imediată"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Nume �nregistrare imediat�"
+msgstr "Nume înregistrare imediată"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Timpul de �nregistare imediat� (min)"
+msgstr "Timpul de înregistare imediată (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "eveniment curent"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Dimensiune maxim� a fi�ierului video (MB)"
+msgstr "Dimensiune maximă a fişierului video (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Separare fi�iere montate"
+msgstr "Separare fişiere montate"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "�terge �nregistrarea pentru vizionare decalat�"
+msgstr "Şterge înregistrarea pentru vizionare decalată"
 
 msgid "Replay"
 msgstr "Redare"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Mod multi-vitez�"
+msgstr "Mod multi-viteză"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Afi�eaz� redarea"
+msgstr "Afişează redarea"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Arată timpul rămas"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
@@ -1111,10 +1111,10 @@ msgid "Miscellaneous"
 msgstr "Diverse"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Durat� minim� emisiuni (min)"
+msgstr "Durată minimă emisiuni (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Durata minim� de inactivitate (min)"
+msgstr "Durata minimă de inactivitate (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Timeout SVDRP (sec)"
@@ -1129,28 +1129,28 @@ msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canalul de pornire"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "ca mai �nainte"
+msgstr "ca mai înainte"
 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "Lista de canale �n bucl�"
+msgstr "Lista de canale în buclă"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Arată numele canalelor cu sursa"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "Oprire de urgen��"
+msgstr "Oprire de urgenţă"
 
 msgid "Plugins"
 msgstr "Plugin-uri"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Acest plugin nu se configureaz�!"
+msgstr "Acest plugin nu se configurează!"
 
 msgid "Setup"
-msgstr "Configura�ie"
+msgstr "Configuraţie"
 
 msgid "Restart"
 msgstr "Repornire"
@@ -1160,17 +1160,17 @@ msgstr "Sigur repornesc?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " Opre�te �nregistrarea "
+msgstr " Opreşte înregistrarea "
 
 msgid "Schedule"
 msgstr "Program (EPG)"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " Opre�te redarea"
+msgstr " Opreşte redarea"
 
 msgid "Button$Pause"
-msgstr "Pauz�"
+msgstr "Pauză"
 
 msgid "Button$Stop"
 msgstr "Stop"
@@ -1180,56 +1180,59 @@ msgstr "Continuare"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Opre�te montajul �nregistr�rii"
+msgstr " Opreşte montajul înregistrării"
 
 msgid "Stop recording?"
-msgstr "Opresc �nregistrarea?"
+msgstr "Opresc înregistrarea?"
 
 msgid "Cancel editing?"
-msgstr "Opresc montajul �nregistr�rii?"
+msgstr "Opresc montajul înregistrării?"
 
 msgid "No audio available!"
-msgstr "Lipse�te sunetul!"
+msgstr "Lipseşte sunetul!"
 
 msgid "No subtitles"
-msgstr "Nu afi�eaz� subtirare"
+msgstr "Nu afişează subtirare"
 
 msgid "No subtitles available!"
-msgstr "Subtitrare indisponibil�!"
+msgstr "Subtitrare indisponibilă!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Insuficient spa�iul pe disc pentru �nregistrare!"
+msgstr "Insuficient spaţiul pe disc pentru înregistrare!"
 
 msgid "No free DVB device to record!"
-msgstr "Nu mai sunt dispozitive DVB disponibile pentru �nregistrare!"
+msgstr "Nu mai sunt receptoare DVB disponibile pentru înregistrare!"
 
 msgid "Pausing live video..."
-msgstr "Trec �n pauz� emisiunea transmis�..."
+msgstr "Trec în pauză emisiunea transmisă..."
 
 msgid "Delete timeshift recording?"
-msgstr "�terg �nregistrarea pentru vizionare decalat�?"
+msgstr "Şterg înregistrarea pentru vizionare decalată?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Salt la: "
 
 msgid "No editing marks defined!"
-msgstr "Nu s-au pus marcaje de montaj pentru aceast� �nregistrare"
+msgstr "Nu s-au pus marcaje de montaj pentru această înregistrare"
+
+msgid "No editing sequences defined!"
+msgstr ""
 
 msgid "Can't start editing process!"
-msgstr "Nu pot porni montajul �nregistr�rii!"
+msgstr "Nu pot porni montajul înregistrării!"
 
 msgid "Editing process started"
-msgstr "Montajul �nregistr�rii a �nceput"
+msgstr "Montajul înregistrării a început"
 
 msgid "Editing process already active!"
-msgstr "Montajul �nregistr�rii este deja activ!"
+msgstr "Montajul înregistrării este deja activ!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a��bcdefghi�jklmnopqrs�t�uvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " aăâbcdefghiîjklmnopqrsştţuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta��bc2\tdef3\tghi�4\tjkl5\tmno6\tpqrs�7\tt�uv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\taăâbc2\tdef3\tghiî4\tjkl5\tmno6\tpqrsş7\ttţuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -1238,19 +1241,19 @@ msgid "Button$Overwrite"
 msgstr "Suprascrie"
 
 msgid "Button$Insert"
-msgstr "Insereaz�"
+msgstr "Inserează"
 
 msgid "Plugin"
-msgstr "Plugin (modul adi�ional)"
+msgstr "Plugin (modul adiţional)"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Sus/Jos pentru noua loca�ie - OK pentru a muta"
+msgstr "Sus/Jos pentru noua locaţie - OK pentru a muta"
 
 msgid "Channel locked (recording)!"
-msgstr "Canal blocat (�nregistrare)!"
+msgstr "Canal blocat (înregistrare)!"
 
 msgid "Low disk space!"
-msgstr "Spa�iul pe disc e foarte sc�zut!"
+msgstr "Spaţiul pe disc e foarte scăzut!"
 
 msgid "Regenerating index file"
 msgstr "Generez index"
@@ -1259,36 +1262,36 @@ msgid "Index file regeneration complete"
 msgstr "Generarea indexului s-a incheiat"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Generarea indexului a eșuat!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Nu pot �nchide - vezi op�iunea '-s'"
+msgstr "Nu pot închide - vezi opţiunea '-s'"
 
 msgid "Editing - shut down anyway?"
-msgstr "Montajul tocmai se efectueaz� - �nchid, totu�i?"
+msgstr "Montajul tocmai se efectuează - închid, totuşi?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Tocmai se �nregistreaz� - �nchid, totu�i?"
+msgstr "Tocmai se înregistrează - închid, totuşi?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "�nregistrez peste %ld minute - �nchid, totu�i?"
+msgstr "Înregistrez peste %ld minute - închid, totuşi?"
 
 msgid "shut down anyway?"
-msgstr "�nchid, totu�i?"
+msgstr "închid, totuşi?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Plugin-ul %s se va trezi +n %ld min, continui?"
 
 msgid "Editing - restart anyway?"
-msgstr "Montajul tocmai se efectueaz� - repornesc, totu�i?"
+msgstr "Montajul tocmai se efectuează - repornesc, totuşi?"
 
 msgid "Recording - restart anyway?"
-msgstr "Tocmai se �nregistreaz� - repornesc, totu�i?"
+msgstr "Tocmai se înregistrează - repornesc, totuşi?"
 
 msgid "restart anyway?"
-msgstr "repornesc, totu�i?"
+msgstr "repornesc, totuşi?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1298,22 +1301,22 @@ msgid "Classic VDR"
 msgstr "VDR clasic"
 
 msgid "DISK"
-msgstr ""
+msgstr "HARD-DISC"
 
 msgid "LOAD"
-msgstr ""
+msgstr "SARCINĂ"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TIMER-E"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "RECEPTOARE"
 
 msgid "LIVE"
-msgstr ""
+msgstr "LIVE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "REDARE"
 
 msgid "ST:TNG Panels"
 msgstr "Cons. ST:TNG"
@@ -1324,13 +1327,13 @@ msgstr "LMMJVSD"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "LunMarMieJoiVinS�mDum"
+msgstr "LunMarMieJoiVinSâmDum"
 
 msgid "Monday"
 msgstr "Luni"
 
 msgid "Tuesday"
-msgstr "Mar�i"
+msgstr "Marţi"
 
 msgid "Wednesday"
 msgstr "Miercuri"
@@ -1342,41 +1345,41 @@ msgid "Friday"
 msgstr "Vineri"
 
 msgid "Saturday"
-msgstr "S�mb�t�"
+msgstr "Sâmbătă"
 
 msgid "Sunday"
-msgstr "Duminic�"
+msgstr "Duminică"
 
 msgid "Upcoming recording!"
-msgstr "Urmeaz� o �nregistrare!"
+msgstr "Urmează o înregistrare!"
 
 msgid "Pause live video?"
-msgstr "�nregistrez emisiunea?"
+msgstr "Înregistrez emisiunea?"
 
 msgid "Recording started"
-msgstr "A �nceput �nregistrarea"
+msgstr "A început înregistrarea"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR se va �nchide mai t�rziu - ap�sa�i 'Power' pentru a for�a"
+msgstr "VDR se va închide mai târziu - apăsaţi 'Power' pentru a forţa"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Apas� orice tast� pentru a anula �nchiderea"
+msgstr "Apasă orice tastă pentru a anula închiderea"
 
 msgid "Switching primary DVB..."
 msgstr "Comut dispozitiv DVB primar..."
 
 msgid "Editing process failed!"
-msgstr "Montajul �nregistr�rii a e�uat"
+msgstr "Montajul înregistrării a eşuat"
 
 msgid "Editing process finished"
-msgstr "Montajul �nregistr�rii s-a terminat"
+msgstr "Montajul înregistrării s-a terminat"
 
 msgid "Press any key to cancel restart"
-msgstr "Ap�sa�i orice tast� pentru a anula repornirea"
+msgstr "Apăsaţi orice tastă pentru a anula repornirea"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR se va �nchide �n %s minute"
+msgstr "VDR se va închide în %s minute"
 
 msgid "Disk"
 msgstr "Disc"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d8e1e8e1d..b58fd9a1c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "
 msgid "No editing marks defined!"
 msgstr "�� ������ ����� ��� �������!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "���������� ������ ������ ������!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 0de2d0619..ab5035e89 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Skok: "
 msgid "No editing marks defined!"
 msgstr "Nie s� ur�en� zna�ky �prav!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Nem��e za�a� spracovanie �prav!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 955686829..9326d8587 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1214,6 +1214,9 @@ msgstr "Sko
 msgid "No editing marks defined!"
 msgstr "Nobena prekinitvena to�ka ni definirana!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Ne morem za�eti urejanja!"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index c4149ddaf..c7b97d574 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1239,6 +1239,9 @@ msgstr "Sko
 msgid "No editing marks defined!"
 msgstr "Nijedna ta�ka rezanja nije odre�ena!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Ne mogu zapo�eti ure�ivanje!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 951dd044c..dc4d6208e 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1216,6 +1216,9 @@ msgstr "Hopp: "
 msgid "No editing marks defined!"
 msgstr "Det finns inga redigeringsm�rken"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Kan inte starta redigering!"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 8b161b3f1..1f6194416 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Atla: "
 msgid "No editing marks defined!"
 msgstr "Kesim i�aretleri belirtilmemi�!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Kesim ba�lat�lam�yor!"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 45e57ee52..72fe84c52 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1213,6 +1213,9 @@ msgstr "Перейти: "
 msgid "No editing marks defined!"
 msgstr "Не задано міток для монтажу!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "Неможливо почати монтаж запису!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4e2b951fb..56b2de0dc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-15 14:04+0200\n"
+"POT-Creation-Date: 2012-11-18 14:31+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1216,6 +1216,9 @@ msgstr "跳过: "
 msgid "No editing marks defined!"
 msgstr "无编辑标记定义!"
 
+msgid "No editing sequences defined!"
+msgstr ""
+
 msgid "Can't start editing process!"
 msgstr "不能开始编辑处理"
 
diff --git a/recording.c b/recording.c
index 1eeb82d0c..497bf2dd9 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.64 2012/09/30 13:05:14 kls Exp $
+ * $Id: recording.c 2.73 2012/11/13 13:46:49 kls Exp $
  */
 
 #include "recording.h"
@@ -83,20 +83,20 @@ class cRemoveDeletedRecordingsThread : public cThread {
   };
 
 cRemoveDeletedRecordingsThread::cRemoveDeletedRecordingsThread(void)
-:cThread("remove deleted recordings")
+:cThread("remove deleted recordings", true)
 {
 }
 
 void cRemoveDeletedRecordingsThread::Action(void)
 {
-  SetPriority(19);
-  SetIOPriority(7);
   // Make sure only one instance of VDR does this:
   cLockFile LockFile(VideoDirectory);
   if (LockFile.Lock()) {
      bool deleted = false;
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      for (cRecording *r = DeletedRecordings.First(); r; ) {
+         if (cIoThrottle::Engaged())
+            return;
          if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
             cRecording *next = DeletedRecordings.Next(r);
             r->Remove();
@@ -1358,8 +1358,10 @@ bool cMark::Save(FILE *f)
 
 bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool IsPesRecording)
 {
+  recordingFileName = RecordingFileName;
   fileName = AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
   framesPerSecond = FramesPerSecond;
+  isPesRecording = IsPesRecording;
   nextUpdate = 0;
   lastFileTime = -1; // the first call to Load() must take place!
   lastChange = 0;
@@ -1388,6 +1390,7 @@ bool cMarks::Update(void)
         cMutexLock MutexLock(&MutexMarkFramesPerSecond);
         MarkFramesPerSecond = framesPerSecond;
         if (cConfig<cMark>::Load(fileName)) {
+           Align();
            Sort();
            return true;
            }
@@ -1396,6 +1399,18 @@ bool cMarks::Update(void)
   return false;
 }
 
+void cMarks::Align(void)
+{
+  cIndexFile IndexFile(recordingFileName, false, isPesRecording);
+  for (cMark *m = First(); m; m = Next(m)) {
+      int p = IndexFile.GetClosestIFrame(m->Position());
+      if (int d = m->Position() - p) {
+         isyslog("aligned editing mark %s to %s (off by %d frame%s)", *IndexToHMSF(m->Position(), true, framesPerSecond), *IndexToHMSF(p, true, framesPerSecond), d, abs(d) > 1 ? "s" : "");
+         m->SetPosition(p);
+         }
+      }
+}
+
 void cMarks::Sort(void)
 {
   for (cMark *m1 = First(); m1; m1 = Next(m1)) {
@@ -1408,14 +1423,10 @@ void cMarks::Sort(void)
       }
 }
 
-cMark *cMarks::Add(int Position)
+void cMarks::Add(int Position)
 {
-  cMark *m = Get(Position);
-  if (!m) {
-     cConfig<cMark>::Add(m = new cMark(Position, NULL, framesPerSecond));
-     Sort();
-     }
-  return m;
+  cConfig<cMark>::Add(new cMark(Position, NULL, framesPerSecond));
+  Sort();
 }
 
 cMark *cMarks::Get(int Position)
@@ -1445,6 +1456,54 @@ cMark *cMarks::GetNext(int Position)
   return NULL;
 }
 
+cMark *cMarks::GetNextBegin(cMark *EndMark)
+{
+  cMark *BeginMark = EndMark ? Next(EndMark) : First();
+  if (BeginMark) {
+     while (cMark *NextMark = Next(BeginMark)) {
+           if (BeginMark->Position() == NextMark->Position()) { // skip Begin/End at the same position
+              if (!(BeginMark = Next(NextMark)))
+                 break;
+              }
+           else
+              break;
+           }
+     }
+  return BeginMark;
+}
+
+cMark *cMarks::GetNextEnd(cMark *BeginMark)
+{
+  if (!BeginMark)
+     return NULL;
+  cMark *EndMark = Next(BeginMark);
+  if (EndMark) {
+     while (cMark *NextMark = Next(EndMark)) {
+           if (EndMark->Position() == NextMark->Position()) { // skip End/Begin at the same position
+              if (!(EndMark = Next(NextMark)))
+                 break;
+              }
+           else
+              break;
+           }
+     }
+  return EndMark;
+}
+
+int cMarks::GetNumSequences(void)
+{
+  int NumSequences = 0;
+  if (cMark *BeginMark = GetNextBegin()) {
+     while (cMark *EndMark = GetNextEnd(BeginMark)) {
+           NumSequences++;
+           BeginMark = GetNextBegin(EndMark);
+           }
+     if (NumSequences == 0 && BeginMark->Position() > 0)
+        NumSequences = 1; // there is only one actual "begin" mark at a non-zero offset, and no actual "end" mark
+     }
+  return NumSequences;
+}
+
 // --- cRecordingUserCommand -------------------------------------------------
 
 const char *cRecordingUserCommand::command = NULL;
@@ -1535,7 +1594,6 @@ void cIndexFileGenerator::Action(void)
               if (Processed > 0) {
                  if (FrameDetector.Synced()) {
                     // Synced FrameDetector, so rewind for actual processing:
-                    FrameDetector.Reset();
                     Rewind = true;
                     }
                  Buffer.Del(Processed);
@@ -1546,7 +1604,7 @@ void cIndexFileGenerator::Action(void)
               uchar *p = Data;
               while (Length >= TS_SIZE) {
                     int Pid = TsPid(p);
-                    if (Pid == 0)
+                    if (Pid == PATPID)
                        PatPmtParser.ParsePat(p, TS_SIZE);
                     else if (Pid == PatPmtParser.PmtPid())
                        PatPmtParser.ParsePmt(p, TS_SIZE);
@@ -1570,6 +1628,7 @@ void cIndexFileGenerator::Action(void)
               ReplayFile = FileName.NextFile();
               FileSize = 0;
               FrameOffset = -1;
+              Buffer.Clear();
               }
            }
         // Recording has been processed:
@@ -1753,7 +1812,7 @@ bool cIndexFile::CatchUp(int Index)
   // returns true unless something really goes wrong, so that 'index' becomes NULL
   if (index && f >= 0) {
      cMutexLock MutexLock(&mutex);
-     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
+     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index > last); i++) {
          struct stat buf;
          if (fstat(f, &buf) == 0) {
             if (!IsInIndexList(this)) {
@@ -1798,7 +1857,7 @@ bool cIndexFile::CatchUp(int Index)
             }
          else
             LOG_ERROR_STR(*fileName);
-         if (Index < last)
+         if (Index <= last)
             break;
          cCondWait::SleepMs(1000);
          }
@@ -1826,18 +1885,22 @@ bool cIndexFile::Write(bool Independent, uint16_t FileNumber, off_t FileOffset)
 bool cIndexFile::Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *Independent, int *Length)
 {
   if (CatchUp(Index)) {
-     if (Index >= 0 && Index < last) {
+     if (Index >= 0 && Index <= last) {
         *FileNumber = index[Index].number;
         *FileOffset = index[Index].offset;
         if (Independent)
            *Independent = index[Index].independent;
         if (Length) {
-           uint16_t fn = index[Index + 1].number;
-           off_t fo = index[Index + 1].offset;
-           if (fn == *FileNumber)
-              *Length = int(fo - *FileOffset);
+           if (Index < last) {
+              uint16_t fn = index[Index + 1].number;
+              off_t fo = index[Index + 1].offset;
+              if (fn == *FileNumber)
+                 *Length = int(fo - *FileOffset);
+              else
+                 *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
+              }
            else
-              *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
+              *Length = -1;
            }
         return true;
         }
@@ -1851,7 +1914,7 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off
      int d = Forward ? 1 : -1;
      for (;;) {
          Index += d;
-         if (Index >= 0 && Index < last) {
+         if (Index >= 0 && Index <= last) {
             if (index[Index].independent) {
                uint16_t fn;
                if (!FileNumber)
@@ -1882,12 +1945,40 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off
   return -1;
 }
 
+int cIndexFile::GetClosestIFrame(int Index)
+{
+  if (last > 0) {
+     Index = constrain(Index, 0, last);
+     if (index[Index].independent)
+        return Index;
+     int il = Index - 1;
+     int ih = Index + 1;
+     for (;;) {
+         if (il >= 0) {
+            if (index[il].independent)
+               return il;
+            il--;
+            }
+         else if (ih > last)
+            break;
+         if (ih <= last) {
+            if (index[ih].independent)
+               return ih;
+            ih++;
+            }
+         else if (il < 0)
+            break;
+         }
+     }
+  return 0;
+}
+
 int cIndexFile::Get(uint16_t FileNumber, off_t FileOffset)
 {
   if (CatchUp()) {
      //TODO implement binary search!
      int i;
-     for (i = 0; i < last; i++) {
+     for (i = 0; i <= last; i++) {
          if (index[i].number > FileNumber || (index[i].number == FileNumber) && off_t(index[i].offset) >= FileOffset)
             break;
          }
@@ -2039,7 +2130,7 @@ bool cFileName::GetLastPatPmtVersions(int &PatVersion, int &PmtVersion)
                   while (read(fd, buf, sizeof(buf)) == sizeof(buf)) {
                         if (buf[0] == TS_SYNC_BYTE) {
                            int Pid = TsPid(buf);
-                           if (Pid == 0)
+                           if (Pid == PATPID)
                               PatPmtParser.ParsePat(buf, sizeof(buf));
                            else if (Pid == PatPmtParser.PmtPid()) {
                               PatPmtParser.ParsePmt(buf, sizeof(buf));
diff --git a/recording.h b/recording.h
index ac44ad5bd..9ae9b1ec4 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.37 2012/09/17 08:53:23 kls Exp $
+ * $Id: recording.h 2.40 2012/11/13 11:43:59 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -222,19 +222,35 @@ class cMark : public cListObject {
 
 class cMarks : public cConfig<cMark> {
 private:
+  cString recordingFileName;
   cString fileName;
   double framesPerSecond;
+  bool isPesRecording;
   time_t nextUpdate;
   time_t lastFileTime;
   time_t lastChange;
 public:
   bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
   bool Update(void);
+  void Align(void);
   void Sort(void);
-  cMark *Add(int Position);
+  void Add(int Position);
   cMark *Get(int Position);
   cMark *GetPrev(int Position);
   cMark *GetNext(int Position);
+  cMark *GetNextBegin(cMark *EndMark = NULL);
+       ///< Returns the next "begin" mark after EndMark, skipping any marks at the
+       ///< same position as EndMark. If EndMark is NULL, the first actual "begin"
+       ///< will be returned (if any).
+  cMark *GetNextEnd(cMark *BeginMark);
+       ///< Returns the next "end" mark after BeginMark, skipping any marks at the
+       ///< same position as BeginMark.
+  int GetNumSequences(void);
+       ///< Returns the actual number of sequences to be cut from the recording.
+       ///< If there is only one actual "begin" mark, and it is positioned at index
+       ///< 0 (the beginning of the recording), and there is no "end" mark, the
+       ///< return value is 0, which means that the result is the same as the original
+       ///< recording.
   };
 
 #define RUC_BEFORERECORDING "before"
@@ -291,8 +307,14 @@ class cIndexFile {
   bool Write(bool Independent, uint16_t FileNumber, off_t FileOffset);
   bool Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *Independent = NULL, int *Length = NULL);
   int GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber = NULL, off_t *FileOffset = NULL, int *Length = NULL);
+  int GetClosestIFrame(int Index);
+       ///< Returns the index of the I-frame that is closest to the given Index (or Index itself,
+       ///< if it already points to an I-frame). Index may be any value, even outside the current
+       ///< range of frame indexes.
+       ///< If there is no actual index data available, 0 is returned.
   int Get(uint16_t FileNumber, off_t FileOffset);
   int Last(void) { CatchUp(); return last; }
+       ///< Returns the index of the last entry in this file, or -1 if the file is empty.
   int GetResume(void) { return resumeFile.Read(); }
   bool StoreResume(int Index) { return resumeFile.Save(Index); }
   bool IsStillRecording(void);
diff --git a/remux.c b/remux.c
index 6450da402..e3b34c669 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.67 2012/09/19 10:28:42 kls Exp $
+ * $Id: remux.c 2.71 2012/11/18 12:18:08 kls Exp $
  */
 
 #include "remux.h"
@@ -23,6 +23,8 @@ static bool DebugFrames = false;
 #define dbgpatpmt(a...) if (DebugPatPmt) fprintf(stderr, a)
 #define dbgframes(a...) if (DebugFrames) fprintf(stderr, a)
 
+#define EMPTY_SCANNER (0xFFFFFFFF)
+
 ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
 {
   if (Count < 7)
@@ -112,6 +114,32 @@ void cRemux::SetBrokenLink(uchar *Data, int Length)
 
 // --- Some TS handling tools ------------------------------------------------
 
+void TsHidePayload(uchar *p)
+{
+  p[1] &= ~TS_PAYLOAD_START;
+  p[3] |=  TS_ADAPT_FIELD_EXISTS;
+  p[3] &= ~TS_PAYLOAD_EXISTS;
+  p[4] = TS_SIZE - 5;
+  p[5] = 0x00;
+  memset(p + 6, 0xFF, TS_SIZE - 6);
+}
+
+void TsSetPcr(uchar *p, int64_t Pcr)
+{
+  if (TsHasAdaptationField(p)) {
+     if (p[4] >= 7 && (p[5] & TS_ADAPT_PCR)) {
+        int64_t b = Pcr / PCRFACTOR;
+        int e = Pcr % PCRFACTOR;
+        p[ 6] =  b >> 25;
+        p[ 7] =  b >> 17;
+        p[ 8] =  b >>  9;
+        p[ 9] =  b >>  1;
+        p[10] = (b <<  7) | (p[10] & 0x7E) | ((e >> 8) & 0x01);
+        p[11] =  e;
+        }
+     }
+}
+
 int64_t TsGetPts(const uchar *p, int l)
 {
   // Find the first packet with a PTS and use it:
@@ -125,27 +153,165 @@ int64_t TsGetPts(const uchar *p, int l)
   return -1;
 }
 
-void TsSetTeiOnBrokenPackets(uchar *p, int l)
+int64_t TsGetDts(const uchar *p, int l)
 {
-  bool Processed[MAXPID] = { false };
-  while (l >= TS_SIZE) {
-        if (*p != TS_SYNC_BYTE)
-           break;
-        int Pid = TsPid(p);
-        if (!Processed[Pid]) {
-           if (!TsPayloadStart(p))
-              p[1] |= TS_ERROR;
-           else {
-              Processed[Pid] = true;
-              int offs = TsPayloadOffset(p);
-              cRemux::SetBrokenLink(p + offs, TS_SIZE - offs);
-              }
+  // Find the first packet with a DTS and use it:
+  while (l > 0) {
+        const uchar *d = p;
+        if (TsPayloadStart(d) && TsGetPayload(&d) && PesHasDts(d))
+           return PesGetDts(d);
+        p += TS_SIZE;
+        l -= TS_SIZE;
+        }
+  return -1;
+}
+
+void TsSetPts(uchar *p, int l, int64_t Pts)
+{
+  // Find the first packet with a PTS and use it:
+  while (l > 0) {
+        const uchar *d = p;
+        if (TsPayloadStart(d) && TsGetPayload(&d) && PesHasPts(d)) {
+           PesSetPts(const_cast<uchar *>(d), Pts);
+           return;
            }
+        p += TS_SIZE;
         l -= TS_SIZE;
+        }
+}
+
+void TsSetDts(uchar *p, int l, int64_t Dts)
+{
+  // Find the first packet with a DTS and use it:
+  while (l > 0) {
+        const uchar *d = p;
+        if (TsPayloadStart(d) && TsGetPayload(&d) && PesHasDts(d)) {
+           PesSetDts(const_cast<uchar *>(d), Dts);
+           return;
+           }
         p += TS_SIZE;
+        l -= TS_SIZE;
         }
 }
 
+// --- Some PES handling tools -----------------------------------------------
+
+void PesSetPts(uchar *p, int64_t Pts)
+{
+  p[ 9] = ((Pts >> 29) & 0x0E) | (p[9] & 0xF1);
+  p[10] =   Pts >> 22;
+  p[11] = ((Pts >> 14) & 0xFE) | 0x01;
+  p[12] =   Pts >>  7;
+  p[13] = ((Pts <<  1) & 0xFE) | 0x01;
+}
+
+void PesSetDts(uchar *p, int64_t Dts)
+{
+  p[14] = ((Dts >> 29) & 0x0E) | (p[14] & 0xF1);
+  p[15] =   Dts >> 22;
+  p[16] = ((Dts >> 14) & 0xFE) | 0x01;
+  p[17] =   Dts >>  7;
+  p[18] = ((Dts <<  1) & 0xFE) | 0x01;
+}
+
+int64_t PtsDiff(int64_t Pts1, int64_t Pts2)
+{
+  int64_t d = Pts2 - Pts1;
+  if (d > MAX33BIT / 2)
+     return d - (MAX33BIT + 1);
+  if (d < -MAX33BIT / 2)
+     return d + (MAX33BIT + 1);
+  return d;
+}
+
+// --- cTsPayload ------------------------------------------------------------
+
+cTsPayload::cTsPayload(void)
+{
+  data = NULL;
+  length = 0;
+  pid = -1;
+  index = 0;
+}
+
+cTsPayload::cTsPayload(uchar *Data, int Length, int Pid)
+{
+  Setup(Data, Length, Pid);
+}
+
+void cTsPayload::Setup(uchar *Data, int Length, int Pid)
+{
+  data = Data;
+  length = Length;
+  pid = Pid >= 0 ? Pid : TsPid(Data);
+  index = 0;
+}
+
+uchar cTsPayload::GetByte(void)
+{
+  if (!Eof()) {
+     if (index % TS_SIZE == 0) { // encountered the next TS header
+        for (;; index += TS_SIZE) {
+            if (data[index] == TS_SYNC_BYTE && index + TS_SIZE <= length) { // to make sure we are at a TS header start and drop incomplete TS packets at the end
+               uchar *p = data + index;
+               if (TsPid(p) == pid) { // only handle TS packets for the initial PID
+                  if (TsHasPayload(p)) {
+                     if (index > 0 && TsPayloadStart(p)) { // checking index to not skip the very first TS packet
+                        length = index; // triggers EOF
+                        return 0x00;
+                        }
+                     index += TsPayloadOffset(p);
+                     break;
+                     }
+                  }
+               }
+            else {
+               length = index; // triggers EOF
+               return 0x00;
+               }
+           }
+        }
+     return data[index++];
+     }
+  return 0x00;
+}
+
+bool cTsPayload::SkipBytes(int Bytes)
+{
+  while (Bytes-- > 0)
+        GetByte();
+  return !Eof();
+}
+
+bool cTsPayload::SkipPesHeader(void)
+{
+  return SkipBytes(PesPayloadOffset(data + TsPayloadOffset(data)));
+}
+
+int cTsPayload::GetLastIndex(void)
+{
+  return index - 1;
+}
+
+void cTsPayload::SetByte(uchar Byte, int Index)
+{
+  if (Index >= 0 && Index < length)
+     data[Index] = Byte;
+}
+
+bool cTsPayload::Find(uint32_t Code)
+{
+  int OldIndex = index;
+  uint32_t Scanner = EMPTY_SCANNER;
+  while (!Eof()) {
+        Scanner = (Scanner << 8) | GetByte();
+        if (Scanner == Code)
+           return true;
+        }
+  index = OldIndex;
+  return false;
+}
+
 // --- cPatPmtGenerator ------------------------------------------------------
 
 cPatPmtGenerator::cPatPmtGenerator(const cChannel *Channel)
@@ -665,6 +831,25 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
   pmtSize = 0;
 }
 
+bool cPatPmtParser::ParsePatPmt(const uchar *Data, int Length)
+{
+  while (Length >= TS_SIZE) {
+        if (*Data != TS_SYNC_BYTE)
+           break; // just for safety
+        int Pid = TsPid(Data);
+        if (Pid == PATPID)
+           ParsePat(Data, TS_SIZE);
+        else if (Pid == PmtPid()) {
+           ParsePmt(Data, TS_SIZE);
+           if (patVersion >= 0 && pmtVersion >= 0)
+              return true;
+           }
+        Data += TS_SIZE;
+        Length -= TS_SIZE;
+        }
+  return false;
+}
+
 bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion) const
 {
   PatVersion = patVersion;
@@ -809,23 +994,365 @@ void PesDump(const char *Name, const u_char *Data, int Length)
   TsDump(Name, Data, Length);
 }
 
-// --- cFrameDetector --------------------------------------------------------
+// --- cFrameParser ----------------------------------------------------------
+
+class cFrameParser {
+protected:
+  bool debug;
+  bool newFrame;
+  bool independentFrame;
+public:
+  cFrameParser(void);
+  virtual ~cFrameParser() {};
+  virtual int Parse(const uchar *Data, int Length, int Pid) = 0;
+       ///< Parses the given Data, which is a sequence of Length bytes of TS packets.
+       ///< The payload in the TS packets with the given Pid is searched for just
+       ///< enough information to determine the beginning and type of the next video
+       ///< frame.
+       ///< Returns the number of bytes parsed. Upon return, the functions NewFrame()
+       ///< and IndependentFrame() can be called to retrieve the required information.
+  void SetDebug(bool Debug) { debug = Debug; }
+  bool NewFrame(void) { return newFrame; }
+  bool IndependentFrame(void) { return independentFrame; }
+  };
+
+cFrameParser::cFrameParser(void)
+{
+  debug = true;
+  newFrame = false;
+  independentFrame = false;
+}
 
-#define EMPTY_SCANNER (0xFFFFFFFF)
+// --- cAudioParser ----------------------------------------------------------
+
+class cAudioParser : public cFrameParser {
+public:
+  cAudioParser(void);
+  virtual int Parse(const uchar *Data, int Length, int Pid);
+  };
+
+cAudioParser::cAudioParser(void)
+{
+}
+
+int cAudioParser::Parse(const uchar *Data, int Length, int Pid)
+{
+  if (TsPayloadStart(Data)) {
+     newFrame = independentFrame = true;
+     if (debug)
+        dbgframes("/");
+     }
+  else
+     newFrame = independentFrame = false;
+  return TS_SIZE;
+}
+
+// --- cMpeg2Parser ----------------------------------------------------------
+
+class cMpeg2Parser : public cFrameParser {
+private:
+  uint32_t scanner;
+  bool seenIndependentFrame;
+public:
+  cMpeg2Parser(void);
+  virtual int Parse(const uchar *Data, int Length, int Pid);
+  };
+
+cMpeg2Parser::cMpeg2Parser(void)
+{
+  scanner = EMPTY_SCANNER;
+  seenIndependentFrame = false;
+}
+
+int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid)
+{
+  newFrame = independentFrame = false;
+  bool SeenPayloadStart = false;
+  cTsPayload tsPayload(const_cast<uchar *>(Data), Length, Pid);
+  if (TsPayloadStart(Data)) {
+     SeenPayloadStart = true;
+     tsPayload.SkipPesHeader();
+     scanner = EMPTY_SCANNER;
+     if (debug && seenIndependentFrame)
+        dbgframes("/");
+     }
+  uint32_t OldScanner = scanner; // need to remember it in case of multiple frames per payload
+  for (;;) {
+      if (!SeenPayloadStart && tsPayload.AtTsStart())
+         OldScanner = scanner;
+      scanner = (scanner << 8) | tsPayload.GetByte();
+      if (scanner == 0x00000100) { // Picture Start Code
+         if (!SeenPayloadStart && tsPayload.GetLastIndex() > TS_SIZE) {
+            scanner = OldScanner;
+            return tsPayload.Used() - TS_SIZE;
+            }
+         newFrame = true;
+         tsPayload.GetByte();
+         uchar FrameType = (tsPayload.GetByte() >> 3) & 0x07;
+         independentFrame = FrameType == 1; // I-Frame
+         if (debug) {
+            seenIndependentFrame |= independentFrame;
+            if (seenIndependentFrame) {
+               static const char FrameTypes[] = "?IPBD???";
+               dbgframes("%c", FrameTypes[FrameType]);
+               }
+            }
+         break;
+         }
+      if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary
+         || (tsPayload.Available() < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE // stop if the available data is below the limit...
+            && (tsPayload.Available() <= 0 || tsPayload.AtTsStart()))) // ...but only if there is no more data at all, or if we are at a TS boundary
+         break;
+      }
+  return tsPayload.Used();
+}
+
+// --- cMpeg4Parser ----------------------------------------------------------
+
+class cMpeg4Parser : public cFrameParser {
+private:
+  enum eNalUnitType {
+    nutCodedSliceNonIdr     = 1,
+    nutCodedSliceIdr        = 5,
+    nutSequenceParameterSet = 7,
+    nutAccessUnitDelimiter  = 9,
+    };
+  cTsPayload tsPayload;
+  uchar byte; // holds the current byte value in case of bitwise access
+  int bit; // the bit index into the current byte (-1 if we're not in bit reading mode)
+  int zeroBytes; // the number of consecutive zero bytes (to detect 0x000003)
+  uint32_t scanner;
+  // Identifiers written in '_' notation as in "ITU-T H.264":
+  bool separate_colour_plane_flag;
+  int log2_max_frame_num;
+  bool frame_mbs_only_flag;
+  //
+  bool gotAccessUnitDelimiter;
+  bool gotSequenceParameterSet;
+  uchar GetByte(bool Raw = false);
+       ///< Gets the next data byte. If Raw is true, no filtering will be done.
+       ///< With Raw set to false, if the byte sequence 0x000003 is encountered,
+       ///< the byte with 0x03 will be skipped.
+  uchar GetBit(void);
+  uint32_t GetBits(int Bits);
+  uint32_t GetGolombUe(void);
+  int32_t GetGolombSe(void);
+  void ParseAccessUnitDelimiter(void);
+  void ParseSequenceParameterSet(void);
+  void ParseSliceHeader(void);
+public:
+  cMpeg4Parser(void);
+       ///< Sets up a new MPEG-4 parser.
+       ///< This class parses only the data absolutely necessary to determine the
+       ///< frame borders and field count of the given H264 material.
+  virtual int Parse(const uchar *Data, int Length, int Pid);
+  };
+
+cMpeg4Parser::cMpeg4Parser(void)
+{
+  byte = 0;
+  bit = -1;
+  zeroBytes = 0;
+  scanner = EMPTY_SCANNER;
+  separate_colour_plane_flag = false;
+  log2_max_frame_num = 0;
+  frame_mbs_only_flag = false;
+  gotAccessUnitDelimiter = false;
+  gotSequenceParameterSet = false;
+}
+
+uchar cMpeg4Parser::GetByte(bool Raw)
+{
+  uchar b = tsPayload.GetByte();
+  if (!Raw) {
+     // If we encounter the byte sequence 0x000003, we need to skip the 0x03:
+     if (b == 0x00)
+        zeroBytes++;
+     else {
+        if (b == 0x03 && zeroBytes >= 2)
+           b = tsPayload.GetByte();
+        zeroBytes = 0;
+        }
+     }
+  else
+     zeroBytes = 0;
+  bit = -1;
+  return b;
+}
+
+uchar cMpeg4Parser::GetBit(void)
+{
+  if (bit < 0) {
+     byte = GetByte();
+     bit = 7;
+     }
+  return (byte & (1 << bit--)) ? 1 : 0;
+}
+
+uint32_t cMpeg4Parser::GetBits(int Bits)
+{
+  uint32_t b = 0;
+  while (Bits--)
+        b |= GetBit() << Bits;
+  return b;
+}
+
+uint32_t cMpeg4Parser::GetGolombUe(void)
+{
+  int z = -1;
+  for (int b = 0; !b; z++)
+      b = GetBit();
+  return (1 << z) - 1 + GetBits(z);
+}
+
+int32_t cMpeg4Parser::GetGolombSe(void)
+{
+  uint32_t v = GetGolombUe();
+  if (v) {
+     if ((v & 0x01) != 0)
+        return (v + 1) / 2; // fails for v == 0xFFFFFFFF, but that will probably never happen
+     else
+        return -int32_t(v / 2);
+     }
+  return v;
+}
+
+int cMpeg4Parser::Parse(const uchar *Data, int Length, int Pid)
+{
+  newFrame = independentFrame = false;
+  tsPayload.Setup(const_cast<uchar *>(Data), Length, Pid);
+  if (TsPayloadStart(Data)) {
+     tsPayload.SkipPesHeader();
+     scanner = EMPTY_SCANNER;
+     if (debug && gotSequenceParameterSet) {
+        dbgframes("/");
+        }
+     }
+  for (;;) {
+      scanner = (scanner << 8) | GetByte(true);
+      if ((scanner & 0xFFFFFF00) == 0x00000100) { // NAL unit start
+         uchar NalUnitType = scanner & 0x1F;
+         switch (NalUnitType) {
+           case nutAccessUnitDelimiter:  ParseAccessUnitDelimiter();
+                                         gotAccessUnitDelimiter = true;
+                                         break;
+           case nutSequenceParameterSet: ParseSequenceParameterSet();
+                                         gotSequenceParameterSet = true;
+                                         break;
+           case nutCodedSliceNonIdr:
+           case nutCodedSliceIdr:        if (gotAccessUnitDelimiter && gotSequenceParameterSet) {
+                                            ParseSliceHeader(); 
+                                            gotAccessUnitDelimiter = false;
+                                            return tsPayload.Used();
+                                            }
+                                         break;
+           default: ;
+           }
+         }
+      if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary
+         || (tsPayload.Available() < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE // stop if the available data is below the limit...
+            && (tsPayload.Available() <= 0 || tsPayload.AtTsStart()))) // ...but only if there is no more data at all, or if we are at a TS boundary
+         break;
+      }
+  return tsPayload.Used();
+}
+
+void cMpeg4Parser::ParseAccessUnitDelimiter(void)
+{
+  if (debug && gotSequenceParameterSet)
+     dbgframes("A");
+  GetByte(); // primary_pic_type
+}
+
+void cMpeg4Parser::ParseSequenceParameterSet(void)
+{
+  uchar profile_idc = GetByte(); // profile_idc
+  GetByte(); // constraint_set[0-5]_flags, reserved_zero_2bits
+  GetByte(); // level_idc
+  GetGolombUe(); // seq_parameter_set_id
+  if (profile_idc == 100 || profile_idc == 110 || profile_idc == 122 || profile_idc == 244 || profile_idc == 44 || profile_idc == 83 || profile_idc == 86 || profile_idc ==118 || profile_idc == 128) {
+     int chroma_format_idc = GetGolombUe(); // chroma_format_idc
+     if (chroma_format_idc == 3)
+        separate_colour_plane_flag = GetBit();
+     GetGolombUe(); // bit_depth_luma_minus8
+     GetGolombUe(); // bit_depth_chroma_minus8
+     GetBit(); // qpprime_y_zero_transform_bypass_flag
+     if (GetBit()) { // seq_scaling_matrix_present_flag
+        for (int i = 0; i < ((chroma_format_idc != 3) ? 8 : 12); i++) {
+            if (GetBit()) { // seq_scaling_list_present_flag
+               int SizeOfScalingList = (i < 6) ? 16 : 64;
+               int LastScale = 8;
+               int NextScale = 8;
+               for (int j = 0; j < SizeOfScalingList; j++) {
+                   if (NextScale)
+                      NextScale = (LastScale + GetGolombSe() + 256) % 256; // delta_scale
+                   if (NextScale)
+                      LastScale = NextScale;
+                   }
+               }
+            }
+        }
+     }
+  log2_max_frame_num = GetGolombUe() + 4; // log2_max_frame_num_minus4
+  int pic_order_cnt_type = GetGolombUe(); // pic_order_cnt_type
+  if (pic_order_cnt_type == 0)
+     GetGolombUe(); // log2_max_pic_order_cnt_lsb_minus4
+  else if (pic_order_cnt_type == 1) {
+     GetBit(); // delta_pic_order_always_zero_flag
+     GetGolombSe(); // offset_for_non_ref_pic
+     GetGolombSe(); // offset_for_top_to_bottom_field
+     for (int i = GetGolombUe(); i--; ) // num_ref_frames_in_pic_order_cnt_cycle
+         GetGolombSe(); // offset_for_ref_frame
+     }
+  GetGolombUe(); // max_num_ref_frames
+  GetBit(); // gaps_in_frame_num_value_allowed_flag
+  GetGolombUe(); // pic_width_in_mbs_minus1
+  GetGolombUe(); // pic_height_in_map_units_minus1
+  frame_mbs_only_flag = GetBit(); // frame_mbs_only_flag
+  if (debug) {
+     if (gotAccessUnitDelimiter && !gotSequenceParameterSet)
+        dbgframes("A"); // just for completeness
+     dbgframes(frame_mbs_only_flag ? "S" : "s");
+     }
+}
+
+void cMpeg4Parser::ParseSliceHeader(void)
+{
+  newFrame = true;
+  GetGolombUe(); // first_mb_in_slice
+  int slice_type = GetGolombUe(); // slice_type, 0 = P, 1 = B, 2 = I, 3 = SP, 4 = SI
+  independentFrame = (slice_type % 5) == 2;
+  if (debug) {
+     static const char SliceTypes[] = "PBIpi";
+     dbgframes("%c", SliceTypes[slice_type % 5]);
+     }
+  if (frame_mbs_only_flag)
+     return; // don't need the rest - a frame is complete
+  GetGolombUe(); // pic_parameter_set_id
+  if (separate_colour_plane_flag)
+     GetBits(2); // colour_plane_id
+  GetBits(log2_max_frame_num); // frame_num
+  if (!frame_mbs_only_flag) {
+     if (GetBit()) // field_pic_flag
+        newFrame = !GetBit(); // bottom_field_flag
+     if (debug)
+        dbgframes(newFrame ? "t" : "b");
+     }
+}
+
+// --- cFrameDetector --------------------------------------------------------
 
 cFrameDetector::cFrameDetector(int Pid, int Type)
 {
+  parser = NULL;
   SetPid(Pid, Type);
   synced = false;
   newFrame = independentFrame = false;
   numPtsValues = 0;
-  numFrames = 0;
   numIFrames = 0;
   framesPerSecond = 0;
   framesInPayloadUnit = framesPerPayloadUnit = 0;
-  payloadUnitOfFrame = 0;
   scanning = false;
-  scanner = EMPTY_SCANNER;
 }
 
 static int CmpUint32(const void *p1, const void *p2)
@@ -840,42 +1367,26 @@ void cFrameDetector::SetPid(int Pid, int Type)
   pid = Pid;
   type = Type;
   isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or 4
-}
-
-void cFrameDetector::Reset(void)
-{
-  newFrame = independentFrame = false;
-  payloadUnitOfFrame = 0;
-  scanning = false;
-  scanner = EMPTY_SCANNER;
-}
-
-int cFrameDetector::SkipPackets(const uchar *&Data, int &Length, int &Processed, int &FrameTypeOffset)
-{
-  if (!synced)
-     dbgframes("%d>", FrameTypeOffset);
-  while (Length >= TS_SIZE) {
-        // switch to the next TS packet, but skip those that have a different PID:
-        Data += TS_SIZE;
-        Length -= TS_SIZE;
-        Processed += TS_SIZE;
-        if (TsPid(Data) == pid)
-           break;
-        else if (Length < TS_SIZE)
-           esyslog("ERROR: out of data while skipping TS packets in cFrameDetector");
-        }
-  FrameTypeOffset -= TS_SIZE;
-  FrameTypeOffset += TsPayloadOffset(Data);
-  return FrameTypeOffset;
+  delete parser;
+  parser = NULL;
+  if (type == 0x01 || type == 0x02)
+     parser = new cMpeg2Parser;
+  else if (type == 0x1B)
+     parser = new cMpeg4Parser;
+  else if (type == 0x04 || type == 0x06) // MPEG audio or AC3 audio
+     parser = new cAudioParser;
+  else if (type != 0)
+     esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
 }
 
 int cFrameDetector::Analyze(const uchar *Data, int Length)
 {
-  bool SeenPayloadStart = false;
-  bool SeenAccessUnitDelimiter = false;
+  if (!parser)
+     return 0;
   int Processed = 0;
   newFrame = independentFrame = false;
-  while (Length >= TS_SIZE) {
+  while (Length >= MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE) { // makes sure we are looking at enough data, in case the frame type is not stored in the first TS packet
+        // Sync on TS packet borders:
         if (Data[0] != TS_SYNC_BYTE) {
            int Skipped = 1;
            while (Skipped < Length && (Data[Skipped] != TS_SYNC_BYTE || Length - Skipped > TS_SIZE && Data[Skipped + TS_SIZE] != TS_SYNC_BYTE))
@@ -883,186 +1394,99 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
            esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
            return Processed + Skipped;
            }
+        // Handle one TS packet:
+        int Handled = TS_SIZE;
         if (TsHasPayload(Data) && !TsIsScrambled(Data)) {
            int Pid = TsPid(Data);
            if (Pid == pid) {
+              if (Processed)
+                 return Processed;
+              if (TsPayloadStart(Data))
+                 scanning = true;
+              if (scanning) {
+                 // Detect the beginning of a new frame:
+                 if (TsPayloadStart(Data)) {
+                    if (!framesPerPayloadUnit)
+                       framesPerPayloadUnit = framesInPayloadUnit;
+                    }
+                 int n = parser->Parse(Data, Length, pid);
+                 if (n > 0) {
+                    if (parser->NewFrame()) {
+                       newFrame = true;
+                       independentFrame = parser->IndependentFrame();
+                       if (synced) {
+                          if (framesPerPayloadUnit <= 1)
+                             scanning = false;
+                          }
+                       else {
+                          framesInPayloadUnit++;
+                          if (independentFrame)
+                             numIFrames++;
+                          }
+                       }
+                    Handled = n;
+                    }
+                 }
               if (TsPayloadStart(Data)) {
-                 SeenPayloadStart = true;
-                 if (synced && Processed)
-                    return Processed;
-                 if (Length < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE)
-                    return Processed; // need more data, in case the frame type is not stored in the first TS packet
+                 // Determine the frame rate from the PTS values in the PES headers:
                  if (framesPerSecond <= 0.0) {
                     // frame rate unknown, so collect a sequence of PTS values:
                     if (numPtsValues < 2 || numPtsValues < MaxPtsValues && numIFrames < 2) { // collect a sequence containing at least two I-frames
-                       const uchar *Pes = Data + TsPayloadOffset(Data);
-                       if (numIFrames && PesHasPts(Pes)) {
-                          ptsValues[numPtsValues] = PesGetPts(Pes);
-                          // check for rollover:
-                          if (numPtsValues && ptsValues[numPtsValues - 1] > 0xF0000000 && ptsValues[numPtsValues] < 0x10000000) {
-                             dbgframes("#");
-                             numPtsValues = 0;
-                             numIFrames = 0;
-                             numFrames = 0;
+                       if (newFrame) { // only take PTS values at the beginning of a frame (in case if fields!)
+                          const uchar *Pes = Data + TsPayloadOffset(Data);
+                          if (numIFrames && PesHasPts(Pes)) {
+                             ptsValues[numPtsValues] = PesGetPts(Pes);
+                             // check for rollover:
+                             if (numPtsValues && ptsValues[numPtsValues - 1] > 0xF0000000 && ptsValues[numPtsValues] < 0x10000000) {
+                                dbgframes("#");
+                                numPtsValues = 0;
+                                numIFrames = 0;
+                                }
+                             else
+                                numPtsValues++;
                              }
-                          else
-                             numPtsValues++;
                           }
                        }
-                    else {
+                    if (numPtsValues >= 2 && numIFrames >= 2) {
                        // find the smallest PTS delta:
                        qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
                        numPtsValues--;
                        for (int i = 0; i < numPtsValues; i++)
                            ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
                        qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
-                       uint32_t Delta = ptsValues[0];
+                       uint32_t Delta = ptsValues[0] / framesPerPayloadUnit;
                        // determine frame info:
                        if (isVideo) {
                           if (abs(Delta - 3600) <= 1)
                              framesPerSecond = 25.0;
                           else if (Delta % 3003 == 0)
                              framesPerSecond = 30.0 / 1.001;
-                          else if (abs(Delta - 1800) <= 1) {
-                             if (numFrames > 50) {
-                                // this is a "best guess": if there are more than 50 frames between two I-frames, we assume each "frame" actually contains a "field", so two "fields" make one "frame"
-                                framesPerSecond = 25.0;
-                                framesPerPayloadUnit = -2;
-                                }
-                             else
-                                framesPerSecond = 50.0;
-                             }
+                          else if (abs(Delta - 1800) <= 1)
+                             framesPerSecond = 50.0;
                           else if (Delta == 1501)
-                             if (numFrames > 50) {
-                                // this is a "best guess": if there are more than 50 frames between two I-frames, we assume each "frame" actually contains a "field", so two "fields" make one "frame"
-                                framesPerSecond = 30.0 / 1.001;
-                                framesPerPayloadUnit = -2;
-                                }
-                             else
-                                framesPerSecond = 60.0 / 1.001;
+                             framesPerSecond = 60.0 / 1.001;
                           else {
                              framesPerSecond = DEFAULTFRAMESPERSECOND;
                              dsyslog("unknown frame delta (%d), assuming %5.2f fps", Delta, DEFAULTFRAMESPERSECOND);
                              }
                           }
                        else // audio
-                          framesPerSecond = 90000.0 / Delta; // PTS of audio frames is always increasing
-                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d NF = %d\n", Delta, framesPerSecond, framesPerPayloadUnit, numFrames);
+                          framesPerSecond = double(PTSTICKS) / Delta; // PTS of audio frames is always increasing
+                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d NF = %d\n", Delta, framesPerSecond, framesPerPayloadUnit, numPtsValues + 1);
+                       synced = true;
+                       parser->SetDebug(false);
                        }
                     }
-                 scanner = EMPTY_SCANNER;
-                 scanning = true;
-                 }
-              if (scanning) {
-                 int PayloadOffset = TsPayloadOffset(Data);
-                 if (TsPayloadStart(Data)) {
-                    PayloadOffset += PesPayloadOffset(Data + PayloadOffset);
-                    if (!framesPerPayloadUnit)
-                       framesPerPayloadUnit = framesInPayloadUnit;
-                    if (DebugFrames && !synced)
-                       dbgframes("/");
-                    }
-                 for (int i = PayloadOffset; scanning && i < TS_SIZE; i++) {
-                     scanner <<= 8;
-                     scanner |= Data[i];
-                     switch (type) {
-                       case 0x01: // MPEG 1 video
-                       case 0x02: // MPEG 2 video
-                            if (scanner == 0x00000100) { // Picture Start Code
-                               scanner = EMPTY_SCANNER;
-                               if (synced && !SeenPayloadStart && Processed)
-                                  return Processed; // flush everything before this new frame
-                               int FrameTypeOffset = i + 2;
-                               if (FrameTypeOffset >= TS_SIZE) // the byte to check is in the next TS packet
-                                  i = SkipPackets(Data, Length, Processed, FrameTypeOffset);
-                               newFrame = true;
-                               uchar FrameType = (Data[FrameTypeOffset] >> 3) & 0x07;
-                               independentFrame = FrameType == 1; // I-Frame
-                               if (synced) {
-                                  if (framesPerPayloadUnit <= 1)
-                                     scanning = false;
-                                  }
-                               else {
-                                  framesInPayloadUnit++;
-                                  if (independentFrame)
-                                     numIFrames++;
-                                  if (numIFrames == 1)
-                                     numFrames++;
-                                  dbgframes("%u ", FrameType);
-                                  }
-                               if (synced)
-                                  return Processed + TS_SIZE; // flag this new frame
-                               }
-                            break;
-                       case 0x1B: // MPEG 4 video
-                            if (scanner == 0x00000109) { // Access Unit Delimiter
-                               scanner = EMPTY_SCANNER;
-                               if (synced && !SeenPayloadStart && Processed)
-                                  return Processed; // flush everything before this new frame
-                               SeenAccessUnitDelimiter = true;
-                               }
-                            else if (SeenAccessUnitDelimiter && scanner == 0x00000001) { // NALU start
-                               SeenAccessUnitDelimiter = false;
-                               int FrameTypeOffset = i + 1;
-                               if (FrameTypeOffset >= TS_SIZE) // the byte to check is in the next TS packet
-                                  i = SkipPackets(Data, Length, Processed, FrameTypeOffset);
-                               newFrame = true;
-                               uchar FrameType = Data[FrameTypeOffset] & 0x1F;
-                               independentFrame = FrameType == 0x07;
-                               if (synced) {
-                                  if (framesPerPayloadUnit < 0) {
-                                     payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
-                                     if (payloadUnitOfFrame != 0 && independentFrame)
-                                        payloadUnitOfFrame = 0;
-                                     if (payloadUnitOfFrame)
-                                        newFrame = false;
-                                     }
-                                  if (framesPerPayloadUnit <= 1)
-                                     scanning = false;
-                                  }
-                               else {
-                                  framesInPayloadUnit++;
-                                  if (independentFrame)
-                                     numIFrames++;
-                                  if (numIFrames == 1)
-                                     numFrames++;
-                                  dbgframes("%02X ", FrameType);
-                                  }
-                               if (synced)
-                                  return Processed + TS_SIZE; // flag this new frame
-                               }
-                            break;
-                       case 0x04: // MPEG audio
-                       case 0x06: // AC3 audio
-                            if (synced && Processed)
-                               return Processed;
-                            newFrame = true;
-                            independentFrame = true;
-                            if (!synced) {
-                               framesInPayloadUnit = 1;
-                               if (TsPayloadStart(Data))
-                                  numIFrames++;
-                               }
-                            scanning = false;
-                            break;
-                       default: esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
-                                pid = 0; // let's just ignore any further data
-                       }
-                     }
-                 if (!synced && framesPerSecond > 0.0 && independentFrame) {
-                    synced = true;
-                    dbgframes("*\n");
-                    Reset();
-                    return Processed + TS_SIZE;
-                    }
                  }
               }
            else if (Pid == PATPID && synced && Processed)
               return Processed; // allow the caller to see any PAT packets
            }
-        Data += TS_SIZE;
-        Length -= TS_SIZE;
-        Processed += TS_SIZE;
+        Data += Handled;
+        Length -= Handled;
+        Processed += Handled;
+        if (newFrame)
+           break;
         }
   return Processed;
 }
diff --git a/remux.h b/remux.h
index b8822796a..dd17e0d9f 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.32 2011/09/04 12:48:26 kls Exp $
+ * $Id: remux.h 2.35 2012/11/18 12:17:23 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -52,6 +52,11 @@ class cRemux {
 #define PATPID 0x0000 // PAT PID (constant 0)
 #define MAXPID 0x2000 // for arrays that use a PID as the index
 
+#define PTSTICKS  90000 // number of PTS ticks per second
+#define PCRFACTOR 300 // conversion from 27MHz PCR extension to 90kHz PCR base
+#define MAX33BIT  0x00000001FFFFFFFFLL // max. possible value with 33 bit
+#define MAX27MHZ  ((MAX33BIT + 1) * PCRFACTOR - 1) // max. possible PCR value
+
 inline bool TsHasPayload(const uchar *p)
 {
   return p[3] & TS_PAYLOAD_EXISTS;
@@ -82,6 +87,16 @@ inline bool TsIsScrambled(const uchar *p)
   return p[3] & TS_SCRAMBLING_CONTROL;
 }
 
+inline uchar TsGetContinuityCounter(const uchar *p)
+{
+  return p[3] & TS_CONT_CNT_MASK;
+}
+
+inline void TsSetContinuityCounter(uchar *p, uchar Counter)
+{
+  p[3] = (p[3] & ~TS_CONT_CNT_MASK) | (Counter & TS_CONT_CNT_MASK);
+}
+
 inline int TsPayloadOffset(const uchar *p)
 {
   int o = TsHasAdaptationField(p) ? p[4] + 5 : 4;
@@ -103,15 +118,31 @@ inline int TsContinuityCounter(const uchar *p)
   return p[3] & TS_CONT_CNT_MASK;
 }
 
-inline int TsGetAdaptationField(const uchar *p)
+inline int64_t TsGetPcr(const uchar *p)
 {
-  return TsHasAdaptationField(p) ? p[5] : 0x00;
+  if (TsHasAdaptationField(p)) {
+     if (p[4] >= 7 && (p[5] & TS_ADAPT_PCR)) {
+        return ((((int64_t)p[ 6]) << 25) |
+                (((int64_t)p[ 7]) << 17) |
+                (((int64_t)p[ 8]) <<  9) |
+                (((int64_t)p[ 9]) <<  1) |
+                (((int64_t)p[10]) >>  7)) * PCRFACTOR +
+               (((((int)p[10]) & 0x01) << 8) |
+                ( ((int)p[11])));
+        }
+     }
+  return -1;
 }
 
+void TsHidePayload(uchar *p);
+void TsSetPcr(uchar *p, int64_t Pcr);
+
 // The following functions all take a pointer to a sequence of complete TS packets.
 
 int64_t TsGetPts(const uchar *p, int l);
-void TsSetTeiOnBrokenPackets(uchar *p, int l);
+int64_t TsGetDts(const uchar *p, int l);
+void TsSetPts(uchar *p, int l, int64_t Pts);
+void TsSetDts(uchar *p, int l, int64_t Dts);
 
 // Some PES handling tools:
 // The following functions that take a pointer to PES data all assume that
@@ -142,6 +173,11 @@ inline bool PesHasPts(const uchar *p)
   return (p[7] & 0x80) && p[8] >= 5;
 }
 
+inline bool PesHasDts(const uchar *p)
+{
+  return (p[7] & 0x40) && p[8] >= 10;
+}
+
 inline int64_t PesGetPts(const uchar *p)
 {
   return ((((int64_t)p[ 9]) & 0x0E) << 29) |
@@ -151,6 +187,88 @@ inline int64_t PesGetPts(const uchar *p)
          ((((int64_t)p[13]) & 0xFE) >>  1);
 }
 
+inline int64_t PesGetDts(const uchar *p)
+{
+  return ((((int64_t)p[14]) & 0x0E) << 29) |
+         (( (int64_t)p[15])         << 22) |
+         ((((int64_t)p[16]) & 0xFE) << 14) |
+         (( (int64_t)p[17])         <<  7) |
+         ((((int64_t)p[18]) & 0xFE) >>  1);
+}
+
+void PesSetPts(uchar *p, int64_t Pts);
+void PesSetDts(uchar *p, int64_t Dts);
+
+// PTS handling:
+
+inline int64_t PtsAdd(int64_t Pts1, int64_t Pts2) { return (Pts1 + Pts2) & MAX33BIT; }
+       ///< Adds the given PTS values, taking into account the 33bit wrap around.
+int64_t PtsDiff(int64_t Pts1, int64_t Pts2);
+       ///< Returns the difference between two PTS values. The result of Pts2 - Pts1
+       ///< is the actual number of 90kHz time ticks that pass from Pts1 to Pts2,
+       ///< properly taking into account the 33bit wrap around. If Pts2 is "before"
+       ///< Pts1, the result is negative.
+
+// A transprent TS payload handler:
+
+class cTsPayload {
+private:
+  uchar *data;
+  int length;
+  int pid;
+  int index; // points to the next byte to process
+public:
+  cTsPayload(void);
+  cTsPayload(uchar *Data, int Length, int Pid = -1);
+       ///< Creates a new TS payload handler and calls Setup() with the given Data.
+  void Setup(uchar *Data, int Length, int Pid = -1);
+       ///< Sets up this TS payload handler with the given Data, which points to a
+       ///< sequence of Length bytes of complete TS packets. Any incomplete TS
+       ///< packet at the end will be ignored.
+       ///< If Pid is given, only TS packets with data for that PID will be processed.
+       ///< Otherwise the PID of the first TS packet defines which payload will be
+       ///< delivered.
+       ///< Any intermediate TS packets with different PIDs will be skipped.
+  bool AtTsStart(void) { return index < length && (index % TS_SIZE) == 0; }
+       ///< Returns true if this payload handler is currently pointing to first byte
+       ///< of a TS packet.
+  bool AtPayloadStart(void) { return AtTsStart() && TsPayloadStart(data + index); }
+       ///< Returns true if this payload handler is currently pointing to the first byte
+       ///< of a TS packet that starts a new payload.
+  int Available(void) { return length - index; }
+       ///< Returns the number of raw bytes (including any TS headers) still available
+       ///< in the TS payload handler.
+  int Used(void) { return (index + TS_SIZE - 1) / TS_SIZE * TS_SIZE; }
+       ///< Returns the number of raw bytes that have already been used (e.g. by calling
+       ///< GetByte()). Any TS packet of which at least a single byte has been delivered
+       ///< is counted with its full size.
+  bool Eof(void) const { return index >= length; }
+       ///< Returns true if all available bytes of the TS payload have been processed.
+  uchar GetByte(void);
+       ///< Gets the next byte of the TS payload, skipping any intermediate TS header data.
+  bool SkipBytes(int Bytes);
+       ///< Skips the given number of bytes in the payload and returns true if there
+       ///< is still data left to read.
+  bool SkipPesHeader(void);
+       ///< Skips all bytes belonging to the PES header of the payload.
+  int GetLastIndex(void);
+       ///< Returns the index into the TS data of the payload byte that has most recently
+       ///< been read. If no byte has been read yet, -1 will be returned.
+  void SetByte(uchar Byte, int Index);
+       ///< Sets the TS data byte at the given Index to the value Byte.
+       ///< Index should be one that has been retrieved by a previous call to GetIndex(),
+       ///< otherwise the behaviour is undefined. The current read index will not be
+       ///< altered by a call to this function.
+  bool Find(uint32_t Code);
+       ///< Searches for the four byte sequence given in Code and returns true if it
+       ///< was found within the payload data. The next call to GetByte() will return the
+       ///< value immediately following the Code. If the code was not found, the read
+       ///< index will remain the same as before this call, so that several calls to
+       ///< Find() can be performed starting at the same index..
+       ///< The special code 0xFFFFFFFF can not be searched, because this value is used
+       ///< to initialize the scanner.
+  };
+
 // PAT/PMT Generator:
 
 #define MAX_SECTION_SIZE 4096 // maximum size of an SI section
@@ -248,6 +366,10 @@ class cPatPmtParser {
        ///< are delivered to the parser through several subsequent calls to
        ///< ParsePmt(). The whole PMT data will be processed once the last packet
        ///< has been received.
+  bool ParsePatPmt(const uchar *Data, int Length);
+       ///< Parses the given Data (which may consist of several TS packets, typically
+       ///< an entire frame) and extracts the PAT and PMT.
+       ///< Returns true if a valid PAT/PMT has been detected.
   bool GetVersions(int &PatVersion, int &PmtVersion) const;
        ///< Returns true if a valid PAT/PMT has been parsed and stores
        ///< the current version numbers in the given variables.
@@ -338,6 +460,8 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 #define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 5
 
+class cFrameParser;
+
 class cFrameDetector {
 private:
   enum { MaxPtsValues = 150 };
@@ -354,12 +478,9 @@ class cFrameDetector {
   double framesPerSecond;
   int framesInPayloadUnit;
   int framesPerPayloadUnit; // Some broadcasters send one frame per payload unit (== 1),
-                            // some put an entire GOP into one payload unit (> 1), and
-                            // some spread a single frame over several payload units (< 0).
-  int payloadUnitOfFrame;
+                            // while others put an entire GOP into one payload unit (> 1).
   bool scanning;
-  uint32_t scanner;
-  int SkipPackets(const uchar *&Data, int &Length, int &Processed, int &FrameTypeOffset);
+  cFrameParser *parser;
 public:
   cFrameDetector(int Pid = 0, int Type = 0);
       ///< Sets up a frame detector for the given Pid and stream Type.
@@ -367,9 +488,6 @@ class cFrameDetector {
       ///< call to SetPid().
   void SetPid(int Pid, int Type);
       ///< Sets the Pid and stream Type to detect frames for.
-  void Reset(void);
-      ///< Resets any counters and flags used while syncing and prepares
-      ///< the frame detector for actual work.
   int Analyze(const uchar *Data, int Length);
       ///< Analyzes the TS packets pointed to by Data. Length is the number of
       ///< bytes Data points to, and must be a multiple of TS_SIZE.
diff --git a/sections.c b/sections.c
index c9ed0c14c..991499bc2 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 2.1 2012/08/26 12:53:39 kls Exp $
+ * $Id: sections.c 2.2 2012/10/04 12:21:59 kls Exp $
  */
 
 #include "sections.h"
@@ -40,7 +40,7 @@ class cSectionHandlerPrivate {
 // --- cSectionHandler -------------------------------------------------------
 
 cSectionHandler::cSectionHandler(cDevice *Device)
-:cThread("section handler")
+:cThread("section handler", true)
 {
   shp = new cSectionHandlerPrivate;
   device = Device;
@@ -164,7 +164,6 @@ void cSectionHandler::SetStatus(bool On)
 
 void cSectionHandler::Action(void)
 {
-  SetPriority(19);
   while (Running()) {
 
         Lock();
diff --git a/skinlcars.h b/skinlcars.h
index 71117f6f7..7306d12cd 100644
--- a/skinlcars.h
+++ b/skinlcars.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.h 2.1 2012/04/15 13:17:35 kls Exp $
+ * $Id: skinlcars.h 1.1 2012/04/15 13:17:35 kls Exp $
  */
 
 #ifndef __SKINLCARS_H
diff --git a/themes.h b/themes.h
index 3563bb089..e51464f86 100644
--- a/themes.h
+++ b/themes.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.h 2.0 2007/08/05 14:10:22 kls Exp $
+ * $Id: themes.h 2.1 2012/10/07 11:11:43 kls Exp $
  */
 
 #ifndef __THEMES_H
@@ -56,7 +56,7 @@ class cTheme {
   };
 
 // A helper macro that simplifies defining theme colors.
-#define THEME_CLR(Theme, Subject, Color) static const int Subject = Theme.AddColor(#Subject, Color)
+#define THEME_CLR(Theme, Subject, Color) static const tColor Subject = Theme.AddColor(#Subject, Color)
 
 class cThemes {
 private:
diff --git a/thread.c b/thread.c
index a650fab83..b80ee70d0 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.5 2012/09/20 09:05:50 kls Exp $
+ * $Id: thread.c 2.6 2012/10/04 12:20:43 kls Exp $
  */
 
 #include "thread.h"
@@ -204,7 +204,7 @@ void cMutex::Unlock(void)
 
 tThreadId cThread::mainThreadId = 0;
 
-cThread::cThread(const char *Description)
+cThread::cThread(const char *Description, bool LowPriority)
 {
   active = running = false;
   childTid = 0;
@@ -212,6 +212,7 @@ cThread::cThread(const char *Description)
   description = NULL;
   if (Description)
      SetDescription("%s", Description);
+  lowPriority = LowPriority;
 }
 
 cThread::~cThread()
@@ -248,12 +249,16 @@ void *cThread::StartThread(cThread *Thread)
 {
   Thread->childThreadId = ThreadId();
   if (Thread->description) {
-     dsyslog("%s thread started (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
+     dsyslog("%s thread started (pid=%d, tid=%d, prio=%s)", Thread->description, getpid(), Thread->childThreadId, Thread->lowPriority ? "low" : "high");
 #ifdef PR_SET_NAME
      if (prctl(PR_SET_NAME, Thread->description, 0, 0, 0) < 0)
         esyslog("%s thread naming failed (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
 #endif
      }
+  if (Thread->lowPriority) {
+     Thread->SetPriority(19);
+     Thread->SetIOPriority(7);
+     }
   Thread->Action();
   if (Thread->description)
      dsyslog("%s thread ended (pid=%d, tid=%d)", Thread->description, getpid(), Thread->childThreadId);
diff --git a/thread.h b/thread.h
index f77e81986..a08d40c93 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 2.2 2012/09/20 08:46:27 kls Exp $
+ * $Id: thread.h 2.3 2012/10/04 12:15:39 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -83,6 +83,7 @@ class cThread {
   tThreadId childThreadId;
   cMutex mutex;
   char *description;
+  bool lowPriority;
   static tThreadId mainThreadId;
   static void *StartThread(cThread *Thread);
 protected:
@@ -106,11 +107,13 @@ class cThread {
        ///< If WaitSeconds is -1, only 'running' is set to false and Cancel()
        ///< returns immediately, without killing the thread.
 public:
-  cThread(const char *Description = NULL);
+  cThread(const char *Description = NULL, bool LowPriority = false);
        ///< Creates a new thread.
        ///< If Description is present, a log file entry will be made when
        ///< the thread starts and stops. The Start() function must be called
        ///< to actually start the thread.
+       ///< LowPriority can be set to true to make this thread run at a lower
+       ///< priority.
   virtual ~cThread();
   void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
   bool Start(void);
diff --git a/timers.c b/timers.c
index 7d4c70b1b..a29cf12f6 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.12 2012/09/15 13:34:03 kls Exp $
+ * $Id: timers.c 2.14 2012/10/16 08:22:39 kls Exp $
  */
 
 #include "timers.h"
@@ -465,10 +465,11 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
            startTime = event->StartTime();
            stopTime = event->EndTime();
            if (!Margin) { // this is an actual check
-              if (event->Schedule()->PresentSeenWithin(EITPRESENTFOLLOWINGRATE)) // VPS control can only work with up-to-date events...
-                 return event->IsRunning(true);
-              else
-                 return startTime <= t && t < stopTime; // ...otherwise we fall back to normal timer handling
+              if (event->Schedule()->PresentSeenWithin(EITPRESENTFOLLOWINGRATE)) { // VPS control can only work with up-to-date events...
+                 if (event->StartTime() > 0) // checks for "phased out" events
+                    return event->IsRunning(true);
+                 }
+              return startTime <= t && t < stopTime; // ...otherwise we fall back to normal timer handling
               }
            }
         }
@@ -549,8 +550,12 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
         lastSetEvent = now;
         const cEvent *Event = NULL;
         if (HasFlags(tfVps) && Schedule->Events()->First()->Vps()) {
-           if (event && Recording())
-              return; // let the recording end first
+           if (event && event->StartTime() > 0) { // checks for "phased out" events
+              if (Recording())
+                 return; // let the recording end first
+              if (now <= event->EndTime() || Matches(0, true))
+                 return; // stay with the old event until the timer has completely expired
+              }
            // VPS timers only match if their start time exactly matches the event's VPS time:
            for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
                if (e->StartTime() && e->RunningStatus() != SI::RunningStatusNotRunning) { // skip outdated events
@@ -562,8 +567,6 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
                      }
                   }
                }
-           if (!Event && event && (now <= event->EndTime() || Matches(0, true)))
-              return; // stay with the old event until the timer has completely expired
            }
         else {
            // Normal timers match the event they have the most overlap with:
diff --git a/vdr.5 b/vdr.5
index a606dde82..4003a5e96 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.29 2012/03/10 14:56:01 kls Exp $
+.\" $Id: vdr.5 2.30 2012/10/15 10:50:23 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -815,13 +815,13 @@ least one blank.
 The lines in this file need not necessarily appear in the correct temporal
 sequence, they will be automatically sorted by time index.
 
+If a frame position doesn't point to an I-frame of the corresponding recording,
+it will be shifted towards the next I-frame (either up or down, whichever is
+closer).
+
 \fBCURRENT RESTRICTIONS:\fR
 
 -\ the comment is currently not used by VDR
-.br
--\ marks must have a frame number, and that frame MUST be an I-frame (this
-means that only marks generated by VDR itself can be used, since they
-will always be guaranteed to mark I-frames).
 .SS EPG DATA
 The file \fIepg.data\fR contains the EPG data in an easily parsable format.
 The first character of each line defines what kind of data this line contains.
diff --git a/vdr.c b/vdr.c
index 2e097bae8..5494cf7dc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.40 2012/09/24 12:43:04 kls Exp $
+ * $Id: vdr.c 2.42 2012/10/13 12:48:56 kls Exp $
  */
 
 #include <getopt.h>
@@ -892,7 +892,7 @@ int main(int argc, char *argv[])
                            Timer->SetInVpsMargin(InVpsMargin);
                            }
                         else if (Timer->Event()) {
-                           InVpsMargin = Timer->Event()->StartTime() <= Now && Timer->Event()->RunningStatus() == SI::RunningStatusUndefined;
+                           InVpsMargin = Timer->Event()->StartTime() <= Now && Now < Timer->Event()->EndTime();
                            NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
                            }
                         else {
@@ -1238,6 +1238,8 @@ int main(int argc, char *argv[])
                      cControl::Shutdown();
                      cControl::Launch(new cReplayControl);
                      }
+                  else
+                     DirectMainFunction(osRecordings); // no last viewed recording, so enter the Recordings menu
                   break;
              default:    break;
              }

From 5109addf9c03d62cc51779a10089b591cd759811 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 8 Dec 2012 12:38:00 +0100
Subject: [PATCH 219/307] Version 1.7.33 VDR developer version 1.7.33 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.32-1.7.33.diff

MD5 checksums:

7c21451360ac7959d0d95e533d34451c  vdr-1.7.33.tar.bz2
c79257198f8569bc02f43dc470ee3076  vdr-1.7.32-1.7.33.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

IMPORTANT:
==========

This version of VDR no longer sets LC_NUMERIC to "C" in order to make
sure any floating point numbers written to configuration files use a
proper decimal point. It rather explicitly converts such numbers using the
new functions atod() and dtoa().
IF YOU USE PLUGINS THAT STORE FLOATING POINT NUMBERS IN THEIR OWN CONFIGURATION
FILES, YOU SHOULD SET
export LC_NUMERIC=C
BEFORE RUNNING VDR, UNTIL THESE PLUGINS HAVE BEEN PROPERLY UPDATED.

From the HISTORY file:
- In order to be able to play TS recordings from other sources, in which there is
  more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed
  to 'bool cPatPmtParser::IsPatPmt(int Pid)'.
- Fixed learning remote control keys with the LCARS skin.
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Fixed getting only non-video packets in cCuttingThread::GetPendingPackets() (reported
  by Sören Moch).
- Changed all occurrences of MPEG4 to H264 (pointed out by Sören Moch).
- Fixed getting the number of editing sequences in case the last sequence has no actual
  end mark.
- The cutter now only increments the TS continuity counter for packets that have a
  payload (pointed out by Sören Moch).
- Fixed adjusting the DTS values in the cutter, to compensate for dropped B-frames
  (pointed out by Sören Moch).
- Fixed a typo in skins.h (thanks to Lars Hanisch).
- Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow
  handling of PCR values (thanks to Sören Moch).
- Fixed calling iconv_close() only with a valid iconv_t value (thanks to Juergen Lock).
- Fixed faulty opening of the Recordings menu when pressing the Play key during normal
  live viewing mode in case there is a "last viewed" recording.
- Fixed some #include statements in plugins to use <vdr/...> instead of "vdr/..."
  (thanks to Lars Hanisch).
- Fixed some spellings in osd.h and svdrp.c (thanks to Ville Skyttä).
- Fixed handling lowercase polarization characters in channel definitions if no DiSEqC
  is used (reported by Mike Hay, actual bug pointed out by Stefan Huelswitt).
- Synchronizing system time to the transponder time is now done using adjtime() in order
  to avoid discontinuities (suggested by Manuel Reimer). If the time difference is more
  than 10 seconds, stime() is still used to do the initial sync.
- The '7' and '9' keys now jump to the very beginning or end, respectively, of the
  recording, even if there is no mark set at that point (following a request from
  Andre Weidemann).
- Now always setting the TDT EIT filter, because otherwise when turning on using the
  transponder time in the Setup menu, it would only be used after the next restart
  of VDR (thanks to Sundararaj Reel).
- The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by
  derived output devices to implement scaling the video to a given size and location
  (based on a suggestion by Lucian Muresan).
- The SVDRP command HITK now discards any keys if the remote control is currently
  turned off (thanks to Alexander Hans).
- The new remote control key "Play/Pause" can be used with remote controls that don't
  have separate keys for "Play" and "Pause", but rather have a single key for both
  functions (thanks to Stefan Hofmann for suggesting to implement support for such
  remote controls).
- The new option "Setup/Replay/Pause on mark set" can be used to activate automatically
  going into Pause mode if an editing mark is set during replay (suggested by Andre
  Weidemann).
- When regenerating the index of a recording, the frame rate stored in the info file
  is now automatically fixed if it differs from the value detected by the frame
  detector.
- Fixed creating the edited version directory if a relative file name is given in
  the call to 'vdr --edit' (the '/video' part was stripped from the given file name
  even if it wasn't there).
- The new option "Setup/Replay/Progress display time" can be used to activate
  automatically displaying the progress display whenever replay of a recording is
  started (suggested by Stefan Blochberger).
- Changed reading and writing of floating point numbers into configuration files to
  make it independent of the decimal point used in the current locale. All calls to
  atof() have been replaced with the new function atod(), which makes sure the string
  representation of a floating point number using a '.' as decimal point will be
  handled correctly, even if the locale in use expects a ',' as the decimal point.
  Plugins that read floating point numbers from their own configuration files will
  also need to use atod() for this, or use a method of their own (this is not necessary
  if values are stored in VDR's setup.conf file, because VDR takes care of this).
  The reason for these changes is that floating point numbers presented to the user
  shall be displayed in the way defined by the current locale (suggested by Stefan
  Blochberger).
  If you use plugins that store floating point values in configuration files of their
  own and have not yet been adapted to this change, you should set
  export LC_NUMERIC=C
  before running VDR. Otherwise your plugin's configuration data may not be read or
  written correctly.
- The new functions SetItemEvent(), SetItemTimer(), SetItemChannel() and
  SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin
  plugins to display these items in a more elaborate way than just a simple line of
  text.
---
 CONTRIBUTORS                            |  44 +++++-
 HISTORY                                 |  84 ++++++++++-
 MANUAL                                  |  14 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h |   6 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |   6 +-
 PLUGINS/src/dvbsddevice/dvbsdffosd.h    |   4 +-
 config.c                                |  26 ++--
 config.h                                |  12 +-
 cutter.c                                |  70 ++++++---
 device.c                                |   6 +-
 device.h                                |  29 +++-
 dvbdevice.c                             |  10 +-
 eit.c                                   |  37 +++--
 interface.c                             |   3 +-
 keys.c                                  |   3 +-
 keys.h                                  |   3 +-
 menu.c                                  | 182 +++++++++++++-----------
 menu.h                                  |   3 +-
 osd.h                                   |   4 +-
 osdbase.c                               |  13 +-
 osdbase.h                               |   3 +-
 pat.c                                   |   4 +-
 po/ar.po                                |  17 ++-
 po/ca_ES.po                             |  17 ++-
 po/cs_CZ.po                             |  17 ++-
 po/da_DK.po                             |  17 ++-
 po/de_DE.po                             |  17 ++-
 po/el_GR.po                             |  17 ++-
 po/es_ES.po                             |  17 ++-
 po/et_EE.po                             |  17 ++-
 po/fi_FI.po                             |  17 ++-
 po/fr_FR.po                             |  17 ++-
 po/hr_HR.po                             |  17 ++-
 po/hu_HU.po                             |  17 ++-
 po/it_IT.po                             |  17 ++-
 po/lt_LT.po                             |  17 ++-
 po/mk_MK.po                             |  63 ++++----
 po/nl_NL.po                             |  17 ++-
 po/nn_NO.po                             |  17 ++-
 po/pl_PL.po                             |  17 ++-
 po/pt_PT.po                             |  17 ++-
 po/ro_RO.po                             |  17 ++-
 po/ru_RU.po                             |  17 ++-
 po/sk_SK.po                             |  17 ++-
 po/sl_SI.po                             |  17 ++-
 po/sr_SR.po                             |  17 ++-
 po/sv_SE.po                             |  17 ++-
 po/tr_TR.po                             |  17 ++-
 po/uk_UA.po                             |  17 ++-
 po/zh_CN.po                             |  17 ++-
 recording.c                             |  28 ++--
 remux.c                                 |  45 +++---
 remux.h                                 |  12 +-
 skins.h                                 |  49 +++++--
 svdrp.c                                 |   8 +-
 timers.c                                |  10 +-
 timers.h                                |   6 +-
 tools.c                                 |  39 ++++-
 tools.h                                 |  10 +-
 vdr.c                                   |   8 +-
 60 files changed, 943 insertions(+), 360 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9e2317ff7..46a4c62b5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -229,6 +229,8 @@ Stefan Huelswitt <s.huelswitt@gmx.de>
  for a patch that was used to implement the --localedir option
  for reporting a problem with updating CA descriptors in transfer mode on full
  featured DVB cards
+ for pointing out a bug in handling lowercase polarization characters in channel
+ definitions if no DiSEqC is used
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -1774,6 +1776,8 @@ Lucian Muresan <lucianm@users.sourceforge.net>
  for reporting duplicate texts in i18n.c
  for suggesting to use 'gettext' for internationalization
  for exporting some libsi functions
+ for suggesting to add functions to cDevice that allow derived output devices to
+ implement scaling the video to a given size and location
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -1976,6 +1980,7 @@ Ville Skytt
  for pointing out that the variable HasSnr was unused in cDvbTuner::GetSignalQuality()
  for fixing cConfig::Load() for g++ version 4.7.0
  for fixing some typos in HISTORY and CONTRIBUTORS
+ for fixing some spellings in osd.h and svdrp.c
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2224,6 +2229,10 @@ Andr
  for suggesting that the primary device should only be avoided for recording if
  it is an old SD full featured card
  for his support in using convert/ffmpeg in the pic2mpg script of the 'pictures' plugin
+ for requesting a way of getting to the very end of an edited recording, since version
+ 1.7.32 no longer generates a mark at that point
+ for suggesting to automatically go into Pause mode if an editing mark is set during
+ replay
 
 J�rgen Schilling <juergen_schilling@web.de>
  for reporting that color buttons were displayed in the recording info menu if it
@@ -2265,6 +2274,8 @@ Alexander Hans <cleditor@arcor.de>
  for reporting that the "'1' for encrypted radio channels" part in the description
  of the VPID in vdr.5 is obsolete
  for a patch that was used to implement storing the channel name in info.vdr
+ for making the SVDRP command HITK discard any keys if the remote control is currently
+ turned off
 
 Daniel Karsubka <dkar@gmx.de>
  for suggesting to write the epg.data file when VDR exits
@@ -2626,6 +2637,9 @@ Sundararaj Reel <sundararaj.reel@googlemail.com>
  that might inadvertently be called with a 'char *' as the second argument on some
  compilers and cause a crash
  for reporting a possible memory leak in SI::StructureLoop::getNextAsPointer()
+ for making the TDT EIT filter always be set, because otherwise when turning on using
+ the transponder time in the Setup menu, it would only be used after the next restart
+ of VDR
 
 Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
@@ -2728,6 +2742,8 @@ Manuel Reimer <Manuel.Reimer@gmx.de>
  contains only the address of the local host
  for a patch that was used as a base for making editing marks be updated every 10
  seconds during replay
+ for suggesting to synchronize system time to the transponder time using adjtime() in
+ order to avoid discontinuities
 
 Rene van den Braken <rene@vandenbraken.name>
  for reporting a bug in writing the PCR pid into the PMT in
@@ -2760,6 +2776,8 @@ Lars Hanisch <dvb@flensrocker.de>
  for a patch that was used to implement SCR (Satellite Channel Routing)
  for implementing the SVDRP command 'UPDR'
  for reporting that the SVDRP command UPDR didn't update the global recordings list
+ for fixing a typo in skins.h
+ for fixing some #include statements in plugins to use <vdr/...> instead of "vdr/..."
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -2834,6 +2852,7 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de>
  for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
  for reporting a problem with EPG scan on systems with only a single DVB device that
  use software output
+ for fixing calling iconv_close() only with a valid iconv_t value
 
 Sergiu Dotenco <sergiu.dotenco@googlemail.com>
  for reporting a missing initialization in sDvbSpuRect
@@ -2958,7 +2977,7 @@ Oliver Schinagl <oliver@schinagl.nl>
  for a patch that was used to implement the setup options "OSD/Color key [0123]"
 
 Andrey Pridvorov <ua0lnj@bk.ru>
- for reporting a problem with detecting frames in MPEG 4 video, and pointing towards
+ for reporting a problem with detecting frames in H.264 video, and pointing towards
  a better way of doing it
 
 Jens Vogel <jens.vogel@akjv.de>
@@ -2970,6 +2989,29 @@ S
  for a patch that was used to move cleaning up the EPG data and writing the epg.data
  file into a separate thread to avoid sluggish response to user input on slow systems
  for fixing sorting folders before recordings in case of UTF-8
+ for reporting that cCuttingThread::GetPendingPackets() should get only non-video
+ packets
+ for pointing out that the name H264 should be used instead of MPEG4
+ for pointing out that the cutter should only increment the TS continuity counter for
+ packets that have a payload
+ for pointing out that when adjusting the DTS values in the cutter, it hase to compensate
+ for dropped B-frames
+ for simplifying calculating the PTS offset in cPtsFixer::Fix() and fixing the overflow
+ handling of PCR values
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
+
+Mike Hay <mike.hay@linenshorts.com>
+ for reporting a problem with handling the case of the polarization character in
+ channel definitions if no DiSEqC is used
+
+Stefan Hofmann <stefan.hofmann@t-online.de>
+ for suggesting to implement support for remote controls that only have a combined
+ "Play/Pause" key instead of separate keys for "Play" and "Pause"
+
+Stefan Blochberger <Stefan.Blochberger@gmx.de>
+ for suggesting to automatically display the progress display whenever replay of a
+ recording is started
+ for suggesting that floating point numbers presented to the user shall be displayed
+ in the way defined by the current locale
diff --git a/HISTORY b/HISTORY
index ff1681b62..51d0681ad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7245,7 +7245,7 @@ Video Disk Recorder Revision History
 - Decreased the ring buffer put/get trigger sizes from 1/3 to 1/10.
 - The script given to VDR with the '-r' option is now also called whenever a
   recording is deleted (thanks to Alexander Wenzel).
-- Improved detecting frames in MPEG 4 video (reported by Andrey Pridvorov).
+- Improved detecting frames in H.264 video (reported by Andrey Pridvorov).
 - cPatPmtParser::ParsePmt() now also recognizes stream type 0x81 as "AC3", so that
   recordings that have been converted from the old PES format to TS can be played
   (suggested by Jens Vogel).
@@ -7305,7 +7305,7 @@ Video Disk Recorder Revision History
   Sundararaj Reel).
 - Fixed handling timers in case an event is modified and "phased out" while the timer
   is recording.
-- Improved frame detection by parsing just far enough into the MPEG-4 NAL units to get
+- Improved frame detection by parsing just far enough into the H.264 NAL units to get
   the necessary information about frames and slices.
 - The initial syncing of the frame detector is now done immediately after the first
   complete GOP has been seen. This makes recordings and especially pausing live video
@@ -7334,7 +7334,85 @@ Video Disk Recorder Revision History
   simply mark a position, but have no effect on the actual cutting process.
 - When positioned at an offset where two (or more) editing marks are placed on top
   of each other, the '4' key moves the first one of them to the left, while the '6'
-  key moves the last one of them to the right. The '7' and '9' key handle multiple
+  key moves the last one of them to the right. The '7' and '9' keys handle multiple
   marks at the same place as if it were one single mark.
 - Modified editing marks are now written to disk whenever the replay progress display
   gets hidden (thanks to Christoph Haubrich).
+
+2012-12-08: Version 1.7.33
+
+- In order to be able to play TS recordings from other sources, in which there is
+  more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed
+  to 'bool cPatPmtParser::IsPatPmt(int Pid)'.
+- Fixed learning remote control keys with the LCARS skin.
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Fixed getting only non-video packets in cCuttingThread::GetPendingPackets() (reported
+  by S�ren Moch).
+- Changed all occurrences of MPEG4 to H264 (pointed out by S�ren Moch).
+- Fixed getting the number of editing sequences in case the last sequence has no actual
+  end mark.
+- The cutter now only increments the TS continuity counter for packets that have a
+  payload (pointed out by S�ren Moch).
+- Fixed adjusting the DTS values in the cutter, to compensate for dropped B-frames
+  (pointed out by S�ren Moch).
+- Fixed a typo in skins.h (thanks to Lars Hanisch).
+- Simplified calculating the PTS offset in cPtsFixer::Fix() and fixed the overflow
+  handling of PCR values (thanks to S�ren Moch).
+- Fixed calling iconv_close() only with a valid iconv_t value (thanks to Juergen Lock).
+- Fixed faulty opening of the Recordings menu when pressing the Play key during normal
+  live viewing mode in case there is a "last viewed" recording.
+- Fixed some #include statements in plugins to use <vdr/...> instead of "vdr/..."
+  (thanks to Lars Hanisch).
+- Fixed some spellings in osd.h and svdrp.c (thanks to Ville Skytt�).
+- Fixed handling lowercase polarization characters in channel definitions if no DiSEqC
+  is used (reported by Mike Hay, actual bug pointed out by Stefan Huelswitt).
+- Synchronizing system time to the transponder time is now done using adjtime() in order
+  to avoid discontinuities (suggested by Manuel Reimer). If the time difference is more
+  than 10 seconds, stime() is still used to do the initial sync.
+- The '7' and '9' keys now jump to the very beginning or end, respectively, of the
+  recording, even if there is no mark set at that point (following a request from
+  Andre Weidemann).
+- Now always setting the TDT EIT filter, because otherwise when turning on using the
+  transponder time in the Setup menu, it would only be used after the next restart
+  of VDR (thanks to Sundararaj Reel).
+- The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by
+  derived output devices to implement scaling the video to a given size and location
+  (based on a suggestion by Lucian Muresan).
+- The SVDRP command HITK now discards any keys if the remote control is currently
+  turned off (thanks to Alexander Hans).
+- The new remote control key "Play/Pause" can be used with remote controls that don't
+  have separate keys for "Play" and "Pause", but rather have a single key for both
+  functions (thanks to Stefan Hofmann for suggesting to implement support for such
+  remote controls).
+- The new option "Setup/Replay/Pause on mark set" can be used to activate automatically
+  going into Pause mode if an editing mark is set during replay (suggested by Andre
+  Weidemann).
+- When regenerating the index of a recording, the frame rate stored in the info file
+  is now automatically fixed if it differs from the value detected by the frame
+  detector.
+- Fixed creating the edited version directory if a relative file name is given in
+  the call to 'vdr --edit' (the '/video' part was stripped from the given file name
+  even if it wasn't there).
+- The new option "Setup/Replay/Progress display time" can be used to activate
+  automatically displaying the progress display whenever replay of a recording is
+  started (suggested by Stefan Blochberger).
+- Changed reading and writing of floating point numbers into configuration files to
+  make it independent of the decimal point used in the current locale. All calls to
+  atof() have been replaced with the new function atod(), which makes sure the string
+  representation of a floating point number using a '.' as decimal point will be
+  handled correctly, even if the locale in use expects a ',' as the decimal point.
+  Plugins that read floating point numbers from their own configuration files will
+  also need to use atod() for this, or use a method of their own (this is not necessary
+  if values are stored in VDR's setup.conf file, because VDR takes care of this).
+  The reason for these changes is that floating point numbers presented to the user
+  shall be displayed in the way defined by the current locale (suggested by Stefan
+  Blochberger).
+  If you use plugins that store floating point values in configuration files of their
+  own and have not yet been adapted to this change, you should set
+  export LC_NUMERIC=C
+  before running VDR. Otherwise your plugin's configuration data may not be read or
+  written correctly.
+- The new functions SetItemEvent(), SetItemTimer(), SetItemChannel() and
+  SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin
+  plugins to display these items in a more elaborate way than just a simple line of
+  text.
diff --git a/MANUAL b/MANUAL
index 272659ccb..2337d1924 100644
--- a/MANUAL
+++ b/MANUAL
@@ -39,6 +39,7 @@ Version 1.6
 
   Info        display information on the currently viewed programme or recording,
               or on the current item in a menu
+  Play/Pause  combined key to resume or pause replay, or pause live video
   Play        resume normal replay
   Pause       pause replay or live video
   Stop        stop replay
@@ -365,7 +366,9 @@ Version 1.6
   - 4, 6    Move an editing mark back and forward. You need to first jump to
             an editing mark for this to work.
   - 7, 9    Jump back and forward between editing marks. Replay goes into still
-            mode after jumping to a mark.
+            mode after jumping to a mark. If the current position is at the
+            first or last mark, or if there are no marks at all, these keys
+            jump to the very beginning or end, respectively, of the recording.
   - 8       Positions replay at a point 3 seconds before the current or next
             "begin" mark and starts replay.
   - 2       Start the actual cutting process.
@@ -879,6 +882,15 @@ Version 1.6
                          Defines whether the replay progress display shows the
                          remaining time or the total length of the recording.
 
+  Progress display time (s) = 0
+                         Defines how long (in seconds) the progress display is shown
+                         when replay of a recording is started. The default value of 0
+                         means that it will not be shown.
+
+  Pause replay when setting mark = no
+                         Defines whether the player automatically goes into Pause
+                         mode when setting an editing mark.
+
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
                          files for each recording. The valid range is 0...99, with
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 344f3dcad..0f18fa3c5 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -3,15 +3,15 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.h 1.8 2012/11/05 08:49:29 kls Exp $
+ * $Id: dvbhdffdevice.h 1.9 2012/12/03 13:43:55 kls Exp $
  */
 
 #ifndef __DVBHDFFDEVICE_H
 #define __DVBHDFFDEVICE_H
 
 #include "hdffcmd.h"
-#include "vdr/dvbdevice.h"
-#include "vdr/dvbspu.h"
+#include <vdr/dvbdevice.h>
+#include <vdr/dvbspu.h>
 
 /// The cDvbHdFfDevice implements a DVB device which can be accessed through the Linux DVB driver API.
 
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index bd74cde67..79b4e3d83 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 2.13 2011/08/27 11:32:42 kls Exp $
+ * $Id: dvbsdffdevice.h 2.14 2012/12/03 13:43:55 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
 #define __DVBSDFFDEVICE_H
 
-#include "vdr/dvbdevice.h"
-#include "vdr/dvbspu.h"
+#include <vdr/dvbdevice.h>
+#include <vdr/dvbspu.h>
 
 /// The cDvbSdFfDevice implements a DVB device which can be accessed through the Linux DVB driver API.
 
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.h b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
index 8a1bc6257..bf1234382 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffosd.h 2.1 2009/12/29 11:52:05 kls Exp $
+ * $Id: dvbsdffosd.h 2.2 2012/12/03 13:43:55 kls Exp $
  */
 
 #ifndef __DVBSDFFODF_H
 #define __DVBSDFFODF_H
 
-#include "vdr/osd.h"
+#include <vdr/osd.h>
 
 class cDvbOsdProvider : public cOsdProvider {
 private:
diff --git a/config.c b/config.c
index 383bb61f7..af0fe3d55 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.28 2012/09/15 11:52:03 kls Exp $
+ * $Id: config.c 2.31 2012/12/06 09:00:23 kls Exp $
  */
 
 #include "config.h"
@@ -458,6 +458,8 @@ cSetup::cSetup(void)
   MultiSpeedMode = 0;
   ShowReplayMode = 0;
   ShowRemainingTime = 0;
+  ProgressDisplayTime = 0;
+  PauseOnMarkSet = 0;
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
@@ -507,7 +509,7 @@ void cSetup::Store(const char *Name, int Value, const char *Plugin)
 
 void cSetup::Store(const char *Name, double &Value, const char *Plugin)
 {
-  Store(Name, cString::sprintf("%f", Value), Plugin);
+  Store(Name, dtoa(Value), Plugin);
 }
 
 bool cSetup::Load(const char *FileName)
@@ -628,24 +630,24 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "UseDolbyDigital"))     UseDolbyDigital    = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoPos"))      ChannelInfoPos     = atoi(Value);
   else if (!strcasecmp(Name, "ChannelInfoTime"))     ChannelInfoTime    = atoi(Value);
-  else if (!strcasecmp(Name, "OSDLeftP"))            OSDLeftP           = atof(Value);
-  else if (!strcasecmp(Name, "OSDTopP"))             OSDTopP            = atof(Value);
-  else if (!strcasecmp(Name, "OSDWidthP"))         { OSDWidthP          = atof(Value); ChkDoublePlausibility(OSDWidthP, 0.87); }
-  else if (!strcasecmp(Name, "OSDHeightP"))        { OSDHeightP         = atof(Value); ChkDoublePlausibility(OSDHeightP, 0.84); }
+  else if (!strcasecmp(Name, "OSDLeftP"))            OSDLeftP           = atod(Value);
+  else if (!strcasecmp(Name, "OSDTopP"))             OSDTopP            = atod(Value);
+  else if (!strcasecmp(Name, "OSDWidthP"))         { OSDWidthP          = atod(Value); ChkDoublePlausibility(OSDWidthP, 0.87); }
+  else if (!strcasecmp(Name, "OSDHeightP"))        { OSDHeightP         = atod(Value); ChkDoublePlausibility(OSDHeightP, 0.84); }
   else if (!strcasecmp(Name, "OSDLeft"))             OSDLeft            = atoi(Value);
   else if (!strcasecmp(Name, "OSDTop"))              OSDTop             = atoi(Value);
   else if (!strcasecmp(Name, "OSDWidth"))          { OSDWidth           = atoi(Value); OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
   else if (!strcasecmp(Name, "OSDHeight"))           OSDHeight          = atoi(Value);
-  else if (!strcasecmp(Name, "OSDAspect"))           OSDAspect          = atof(Value);
+  else if (!strcasecmp(Name, "OSDAspect"))           OSDAspect          = atod(Value);
   else if (!strcasecmp(Name, "OSDMessageTime"))      OSDMessageTime     = atoi(Value);
   else if (!strcasecmp(Name, "UseSmallFont"))        UseSmallFont       = atoi(Value);
   else if (!strcasecmp(Name, "AntiAlias"))           AntiAlias          = atoi(Value);
   else if (!strcasecmp(Name, "FontOsd"))             Utf8Strn0Cpy(FontOsd, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontSml"))             Utf8Strn0Cpy(FontSml, Value, MAXFONTNAME);
   else if (!strcasecmp(Name, "FontFix"))             Utf8Strn0Cpy(FontFix, Value, MAXFONTNAME);
-  else if (!strcasecmp(Name, "FontOsdSizeP"))      { FontOsdSizeP       = atof(Value); ChkDoublePlausibility(FontOsdSizeP, 0.038); }
-  else if (!strcasecmp(Name, "FontSmlSizeP"))      { FontSmlSizeP       = atof(Value); ChkDoublePlausibility(FontSmlSizeP, 0.035); }
-  else if (!strcasecmp(Name, "FontFixSizeP"))      { FontFixSizeP       = atof(Value); ChkDoublePlausibility(FontFixSizeP, 0.031); }
+  else if (!strcasecmp(Name, "FontOsdSizeP"))      { FontOsdSizeP       = atod(Value); ChkDoublePlausibility(FontOsdSizeP, 0.038); }
+  else if (!strcasecmp(Name, "FontSmlSizeP"))      { FontSmlSizeP       = atod(Value); ChkDoublePlausibility(FontSmlSizeP, 0.035); }
+  else if (!strcasecmp(Name, "FontFixSizeP"))      { FontFixSizeP       = atod(Value); ChkDoublePlausibility(FontFixSizeP, 0.031); }
   else if (!strcasecmp(Name, "FontOsdSize"))         FontOsdSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontSmlSize"))         FontSmlSize        = atoi(Value);
   else if (!strcasecmp(Name, "FontFixSize"))         FontFixSize        = atoi(Value);
@@ -658,6 +660,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "MultiSpeedMode"))      MultiSpeedMode     = atoi(Value);
   else if (!strcasecmp(Name, "ShowReplayMode"))      ShowReplayMode     = atoi(Value);
   else if (!strcasecmp(Name, "ShowRemainingTime"))   ShowRemainingTime  = atoi(Value);
+  else if (!strcasecmp(Name, "ProgressDisplayTime")) ProgressDisplayTime= atoi(Value);
+  else if (!strcasecmp(Name, "PauseOnMarkSet"))      PauseOnMarkSet     = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
@@ -761,6 +765,8 @@ bool cSetup::Save(void)
   Store("MultiSpeedMode",     MultiSpeedMode);
   Store("ShowReplayMode",     ShowReplayMode);
   Store("ShowRemainingTime",  ShowRemainingTime);
+  Store("ProgressDisplayTime",ProgressDisplayTime);
+  Store("PauseOnMarkSet",     PauseOnMarkSet);
   Store("ResumeID",           ResumeID);
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
diff --git a/config.h b/config.h
index 03b6cf0d9..5c962fb3d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.54 2012/10/03 09:59:34 kls Exp $
+ * $Id: config.h 2.57 2012/12/05 11:33:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.32"
-#define VDRVERSNUM   10732  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.33"
+#define VDRVERSNUM   10733  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.32"
-#define APIVERSNUM   10732  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.33"
+#define APIVERSNUM   10733  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -319,6 +319,8 @@ class cSetup : public cConfig<cSetupLine> {
   int MultiSpeedMode;
   int ShowReplayMode;
   int ShowRemainingTime;
+  int ProgressDisplayTime;
+  int PauseOnMarkSet;
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
diff --git a/cutter.c b/cutter.c
index ace1893bc..300eef434 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.16 2012/11/18 12:09:00 kls Exp $
+ * $Id: cutter.c 2.21 2012/12/02 14:30:55 kls Exp $
  */
 
 #include "cutter.h"
@@ -132,7 +132,7 @@ bool cDanglingPacketStripper::Process(uchar *Data, int Length, int64_t FirstPts)
         int Pid = TsPid(Data);
         if (Pid == PATPID)
            patPmtParser.ParsePat(Data, TS_SIZE);
-        else if (Pid == patPmtParser.PmtPid())
+        else if (patPmtParser.IsPmtPid(Pid))
            patPmtParser.ParsePmt(Data, TS_SIZE);
         else {
            int64_t Pts = TsGetPts(Data, TS_SIZE);
@@ -154,8 +154,10 @@ bool cDanglingPacketStripper::Process(uchar *Data, int Length, int64_t FirstPts)
 class cPtsFixer {
 private:
   int delta; // time between two frames
-  int64_t last; // the last (i.e. highest) video PTS value seen
-  int64_t offset; // offset to add to PTS values
+  int64_t deltaDts; // the difference between two consecutive DTS values (may differ from 'delta' in case of multiple fields per frame)
+  int64_t lastPts; // the video PTS of the last frame (in display order)
+  int64_t lastDts; // the last video DTS value seen
+  int64_t offset; // offset to add to all timestamps
   bool fixCounters; // controls fixing the TS continuity counters (only from the second CutIn up)
   uchar counter[MAXPID]; // the TS continuity counter for each PID
   cPatPmtParser patPmtParser;
@@ -168,7 +170,9 @@ class cPtsFixer {
 cPtsFixer::cPtsFixer(void)
 {
   delta = 0;
-  last = -1;
+  deltaDts = 0;
+  lastPts = -1;
+  lastDts = -1;
   offset = -1;
   fixCounters = false;
   memset(counter, 0x00, sizeof(counter));
@@ -186,31 +190,44 @@ void cPtsFixer::Fix(uchar *Data, int Length, bool CutIn)
         return;
      }
   // Determine the PTS offset at the beginning of each sequence (except the first one):
-  if (CutIn && last >= 0) {
+  if (CutIn && lastPts >= 0) {
      int64_t Pts = TsGetPts(Data, Length);
-     if (Pts >= 0) {
-        // offset is calculated so that Pts + offset results in last + delta:
-        offset = Pts - PtsAdd(last, delta);
-        if (offset <= 0)
-           offset = -offset;
-        else
-           offset = MAX33BIT + 1 - offset;
-        }
+     if (Pts >= 0)
+        offset = (lastPts + delta - Pts) & MAX33BIT; // offset is calculated so that Pts + offset results in lastPts + delta
      fixCounters = true;
      }
   // Keep track of the highest video PTS:
+  bool GotPts = false;
+  int64_t PrevDts = lastDts;
   uchar *p = Data;
   int len = Length;
   while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
         int Pid = TsPid(p);
         if (Pid == patPmtParser.Vpid()) {
-           int64_t Pts = PtsAdd(TsGetPts(p, TS_SIZE), offset); // offset is taken into account here, to make last have the "new" value already!
-           if (Pts >= 0 && (last < 0 || PtsDiff(last, Pts) > 0))
-              last = Pts;
+           if (!GotPts) { // in case of multiple fields per frame, the offset is calculated only with the first one
+              int64_t Pts = TsGetPts(p, TS_SIZE);
+              if (Pts >= 0) {
+                 if (offset >= 0)
+                    Pts = PtsAdd(Pts, offset); // offset is taken into account here, to make lastPts have the "new" value already!
+                 if (lastPts < 0 || PtsDiff(lastPts, Pts) > 0)
+                    lastPts = Pts;
+                 }
+              GotPts = true;
+              }
+           if (!CutIn) {
+              int64_t Dts = TsGetDts(p, TS_SIZE);
+              if (Dts >= 0) {
+                 if (offset >= 0)
+                    Dts = PtsAdd(Dts, offset); // offset is taken into account here, to make lastDts have the "new" value already!
+                 deltaDts = PtsDiff(PrevDts, Dts);
+                 PrevDts = Dts;
+                 }
+              }
            }
         // Adjust the TS continuity counter:
         if (fixCounters) {
-           counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
+           if (TsHasPayload(p))
+              counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
            TsSetContinuityCounter(p, counter[Pid]);
            }
         else
@@ -228,12 +245,18 @@ void cPtsFixer::Fix(uchar *Data, int Length, bool CutIn)
            if (Pts >= 0)
               TsSetPts(p, TS_SIZE, PtsAdd(Pts, offset));
            int64_t Dts = TsGetDts(p, TS_SIZE);
-           if (Dts >= 0)
-              TsSetDts(p, TS_SIZE, PtsAdd(Dts, offset));
+           if (Dts >= 0) {
+              if (CutIn) {
+                 lastDts = PtsAdd(lastDts, deltaDts);
+                 TsSetDts(p, TS_SIZE, lastDts);
+                 }
+              else
+                 TsSetDts(p, TS_SIZE, PtsAdd(Dts, offset));
+              }
            int64_t Pcr = TsGetPcr(p);
            if (Pcr >= 0) {
               int64_t NewPcr = Pcr + offset * PCRFACTOR;
-              if (NewPcr >= MAX27MHZ)
+              if (NewPcr > MAX27MHZ)
                  NewPcr -= MAX27MHZ + 1;
               TsSetPcr(p, NewPcr);
               }
@@ -241,6 +264,7 @@ void cPtsFixer::Fix(uchar *Data, int Length, bool CutIn)
            len -= TS_SIZE;
            }
      }
+  lastDts = PrevDts;
 }
 
 // --- cCuttingThread --------------------------------------------------------
@@ -408,8 +432,10 @@ void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index, int6
                int Pid = TsPid(p);
                if (Pid == PATPID)
                   PatPmtParser.ParsePat(p, TS_SIZE);
-               else if (Pid == PatPmtParser.PmtPid())
+               else if (PatPmtParser.IsPmtPid(Pid)) {
                   PatPmtParser.ParsePmt(p, TS_SIZE);
+                  Processed[PatPmtParser.Vpid()] = true; // we only want non-video packets
+                  }
                else if (!Processed[Pid]) {
                   int64_t Pts = TsGetPts(p, TS_SIZE);
                   if (Pts >= 0) {
diff --git a/device.c b/device.c
index 766253a1a..2678d688e 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.69 2012/11/13 09:11:43 kls Exp $
+ * $Id: device.c 2.70 2012/11/19 09:59:09 kls Exp $
  */
 
 #include "device.h"
@@ -1149,7 +1149,7 @@ void cDevice::StillPicture(const uchar *Data, int Length)
            int Pid = TsPid(Data);
            if (Pid == PATPID)
               patPmtParser.ParsePat(Data, TS_SIZE);
-           else if (Pid == patPmtParser.PmtPid())
+           else if (patPmtParser.IsPmtPid(Pid))
               patPmtParser.ParsePmt(Data, TS_SIZE);
            else if (Pid == patPmtParser.Vpid()) {
               if (TsPayloadStart(Data)) {
@@ -1486,7 +1486,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
               if (PayloadOffset < TS_SIZE) {
                  if (Pid == PATPID)
                     patPmtParser.ParsePat(Data, TS_SIZE);
-                 else if (Pid == patPmtParser.PmtPid())
+                 else if (patPmtParser.IsPmtPid(Pid))
                     patPmtParser.ParsePmt(Data, TS_SIZE);
                  else if (Pid == patPmtParser.Vpid()) {
                     isPlayingVideo = true;
diff --git a/device.h b/device.h
index 1f945218d..e2847d86a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.41 2012/08/26 13:25:44 kls Exp $
+ * $Id: device.h 2.42 2012/12/04 11:52:58 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -655,6 +655,33 @@ class cDevice : public cThread {
   virtual bool IsPlayingVideo(void) const { return isPlayingVideo; }
        ///< \return Returns true if the currently attached player has delivered
        ///< any video packets.
+  virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter) { return cRect::Null; }
+       ///< Asks the output device whether it can scale the currently shown video in
+       ///< such a way that it fits into the given Rect, while retaining its proper
+       ///< aspect ratio. If the scaled video doesn't exactly fit into Rect, Alignment
+       ///< is used to determine how to align the actual rectangle with the requested
+       ///< one. The actual rectangle can be smaller, larger or the same size as the
+       ///< given Rect, and its location may differ, depending on the capabilities of
+       ///< the output device, which may not be able to display a scaled video at
+       ///< arbitrary sizes and locations. The device shall, however, do its best to
+       ///< match the requested Rect as closely as possible, preferring a size and
+       ///< location that fits completely into the requested Rect if possible.
+       ///< Returns the rectangle that can actually be used when scaling the video.
+       ///< A skin plugin using this function should rearrange its content according
+       ///< to the rectangle returned from calling this function, and should especially
+       ///< be prepared for cases where the returned rectangle is way off the requested
+       ///< Rect, or even Null. In such cases, the skin may want to fall back to
+       ///< working with full screen video.
+       ///< If this device can't scale the video, a Null rectangle is returned (this
+       ///< is also the default implementation).
+  virtual void ScaleVideo(const cRect &Rect = cRect::Null) {}
+       ///< Scales the currently shown video in such a way that it fits into the given
+       ///< Rect. Rect should be one retrieved through a previous call to
+       ///< CanScaleVideo() (otherwise results may be undefined).
+       ///< Even if video output is scaled, the functions GetVideoSize() and
+       ///< GetOsdSize() must still return the same values as if in full screen mode!
+       ///< If this device can't scale the video, nothing happens.
+       ///< To restore full screen video, call this function with a Null rectangle.
   virtual bool HasIBPTrickSpeed(void) { return false; }
        ///< Returns true if this device can handle all frames in 'fast forward'
        ///< trick speeds.
diff --git a/dvbdevice.c b/dvbdevice.c
index d3ade7551..43e8544a3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.74 2012/10/07 11:11:30 kls Exp $
+ * $Id: dvbdevice.c 2.75 2012/12/03 14:07:01 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -261,16 +261,16 @@ bool cDvbTransponderParameters::Parse(const char *s)
           case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
           case 'D': s = ParseParameter(s, coderateL, CoderateValues); break;
           case 'G': s = ParseParameter(s, guard, GuardValues); break;
-          case 'H': polarization = *s++; break;
+          case 'H': polarization = 'H'; s++; break;
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
-          case 'L': polarization = *s++; break;
+          case 'L': polarization = 'L'; s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
           case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
           case 'P': s = ParseParameter(s, plpId); break;
-          case 'R': polarization = *s++; break;
+          case 'R': polarization = 'R'; s++; break;
           case 'S': s = ParseParameter(s, system, SystemValuesSat); break; // we only need the numerical value, so Sat or Terr doesn't matter
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
-          case 'V': polarization = *s++; break;
+          case 'V': polarization = 'V'; s++; break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
           default: esyslog("ERROR: unknown parameter key '%c'", *s);
                    return false;
diff --git a/eit.c b/eit.c
index a236b896c..73c4fa9b8 100644
--- a/eit.c
+++ b/eit.c
@@ -8,10 +8,11 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.21 2012/08/25 11:13:00 kls Exp $
+ * $Id: eit.c 2.23 2012/12/04 11:10:10 kls Exp $
  */
 
 #include "eit.h"
+#include <sys/time.h>
 #include "epg.h"
 #include "i18n.h"
 #include "libsi/section.h"
@@ -313,35 +314,48 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
 
 // --- cTDT ------------------------------------------------------------------
 
+#define MAX_TIME_DIFF   1 // number of seconds the local time may differ from dvb time before making any corrections
+#define MAX_ADJ_DIFF   10 // number of seconds the local time may differ from dvb time to allow smooth adjustment
+#define ADJ_DELTA     300 // number of seconds between calls for smooth time adjustment
+
 class cTDT : public SI::TDT {
 private:
   static cMutex mutex;
-  static int lastDiff;
+  static time_t lastAdj;
 public:
   cTDT(const u_char *Data);
   };
 
 cMutex cTDT::mutex;
-int cTDT::lastDiff = 0;
+time_t cTDT::lastAdj = 0;
 
 cTDT::cTDT(const u_char *Data)
 :SI::TDT(Data, false)
 {
   CheckParse();
 
-  time_t sattim = getTime();
+  time_t dvbtim = getTime();
   time_t loctim = time(NULL);
 
-  int diff = abs(sattim - loctim);
-  if (diff > 2) {
+  int diff = dvbtim - loctim;
+  if (abs(diff) > MAX_TIME_DIFF) {
      mutex.Lock();
-     if (abs(diff - lastDiff) < 3) {
-        if (stime(&sattim) == 0)
-           isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(sattim), sattim);
+     if (abs(diff) > MAX_ADJ_DIFF) {
+        if (stime(&dvbtim) == 0)
+           isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
         else
            esyslog("ERROR while setting system time: %m");
         }
-     lastDiff = diff;
+     else if (time(NULL) - lastAdj > ADJ_DELTA) {
+        lastAdj = time(NULL);
+        timeval delta;
+        delta.tv_sec = diff;
+        delta.tv_usec = 0;
+        if (adjtime(&delta, NULL) == 0)
+           isyslog("system time adjustment initiated from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
+        else
+           esyslog("ERROR while adjusting system time: %m");
+        }
      mutex.Unlock();
      }
 }
@@ -353,8 +367,7 @@ time_t cEitFilter::disableUntil = 0;
 cEitFilter::cEitFilter(void)
 {
   Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X)
-  if (Setup.SetSystemTime && Setup.TimeTransponder)
-     Set(0x14, 0x70);     // TDT
+  Set(0x14, 0x70);        // TDT
 }
 
 void cEitFilter::SetDisableUntil(time_t Time)
diff --git a/interface.c b/interface.c
index 2bfa6c392..82091d991 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 2.1 2011/12/04 14:52:38 kls Exp $
+ * $Id: interface.c 2.2 2012/11/19 12:21:43 kls Exp $
  */
 
 #include "interface.h"
@@ -160,6 +160,7 @@ void cInterface::LearnKeys(void)
       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
       if (!known) {
          cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
+         DisplayMenu->SetMenuCategory(mcUnknown);
          char Headline[256];
          snprintf(Headline, sizeof(Headline), tr("Learning Remote Control Keys"));
          cRemote::Clear();
diff --git a/keys.c b/keys.c
index 3b7c27cc9..2b4198de9 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 2.1 2010/04/05 10:05:58 kls Exp $
+ * $Id: keys.c 2.2 2012/12/04 12:52:52 kls Exp $
  */
 
 #include "keys.h"
@@ -33,6 +33,7 @@ static tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
                     { k8,                    "8"                },
                     { k9,                    "9"                },
                     { kInfo,          trNOOP("Key$Info")        },
+                    { kPlayPause,     trNOOP("Key$Play/Pause")  },
                     { kPlay,          trNOOP("Key$Play")        },
                     { kPause,         trNOOP("Key$Pause")       },
                     { kStop,          trNOOP("Key$Stop")        },
diff --git a/keys.h b/keys.h
index 3cc4371ab..9a79dd61a 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 2.1 2010/04/05 10:06:04 kls Exp $
+ * $Id: keys.h 2.2 2012/12/04 12:51:25 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -27,6 +27,7 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
              kBlue,
              k0, k1, k2, k3, k4, k5, k6, k7, k8, k9,
              kInfo,
+             kPlayPause, // combined Play/Pause key
              kPlay,
              kPause,
              kStop,
diff --git a/menu.c b/menu.c
index b5a0d250a..e2d34ed43 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.65 2012/11/18 13:07:53 kls Exp $
+ * $Id: menu.c 2.71 2012/12/07 13:48:15 kls Exp $
  */
 
 #include "menu.h"
@@ -284,6 +284,7 @@ class cMenuChannelItem : public cOsdItem {
   virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
   cChannel *Channel(void) { return channel; }
+  virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
 cMenuChannelItem::eChannelSortMode cMenuChannelItem::sortMode = csmNumber;
@@ -323,6 +324,12 @@ void cMenuChannelItem::Set(void)
   SetText(buffer);
 }
 
+void cMenuChannelItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+  if (!DisplayMenu->SetItemChannel(channel, Index, Current, Selectable, sortMode == csmProvider))
+     DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
 // --- cMenuChannels ---------------------------------------------------------
 
 #define CHANNELNUMBERTIMEOUT 1000 //ms
@@ -1001,6 +1008,7 @@ class cMenuTimerItem : public cOsdItem {
   virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
   cTimer *Timer(void) { return timer; }
+  virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
 cMenuTimerItem::cMenuTimerItem(cTimer *Timer)
@@ -1049,6 +1057,12 @@ void cMenuTimerItem::Set(void)
                     File));
 }
 
+void cMenuTimerItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+  if (!DisplayMenu->SetItemTimer(timer, Index, Current, Selectable))
+     DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
 // --- cMenuTimers -----------------------------------------------------------
 
 class cMenuTimers : public cOsdMenu {
@@ -1215,7 +1229,7 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch, bool Buttons)
      cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
      if (channel) {
         SetTitle(channel->Name());
-        int TimerMatch = tmNone;
+        eTimerMatch TimerMatch = tmNone;
         Timers.GetMatch(event, &TimerMatch);
         if (Buttons)
            SetHelp(TimerMatch == tmFull ? tr("Button$Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
@@ -1273,13 +1287,14 @@ class cMenuScheduleItem : public cOsdItem {
   const cEvent *event;
   const cChannel *channel;
   bool withDate;
-  int timerMatch;
+  eTimerMatch timerMatch;
   cMenuScheduleItem(const cEvent *Event, cChannel *Channel = NULL, bool WithDate = false);
   static void SetSortMode(eScheduleSortMode SortMode) { sortMode = SortMode; }
   static void IncSortMode(void) { sortMode = eScheduleSortMode((sortMode == ssmAllAll) ? ssmAllThis : sortMode + 1); }
   static eScheduleSortMode SortMode(void) { return sortMode; }
   virtual int Compare(const cListObject &ListObject) const;
   bool Update(bool Force = false);
+  virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
 cMenuScheduleItem::eScheduleSortMode cMenuScheduleItem::sortMode = ssmAllThis;
@@ -1309,7 +1324,7 @@ static const char *TimerMatchChars = " tT";
 bool cMenuScheduleItem::Update(bool Force)
 {
   bool result = false;
-  int OldTimerMatch = timerMatch;
+  eTimerMatch OldTimerMatch = timerMatch;
   Timers.GetMatch(event, &timerMatch);
   if (Force || timerMatch != OldTimerMatch) {
      cString buffer;
@@ -1330,6 +1345,12 @@ bool cMenuScheduleItem::Update(bool Force)
   return result;
 }
 
+void cMenuScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+  if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch))
+     DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
 // --- cMenuWhatsOn ----------------------------------------------------------
 
 class cMenuWhatsOn : public cOsdMenu {
@@ -1430,7 +1451,7 @@ eOSState cMenuWhatsOn::Record(void)
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
      if (item->timerMatch == tmFull) {
-        int tm = tmNone;
+        eTimerMatch tm = tmNone;
         cTimer *timer = Timers.GetMatch(item->event, &tm);
         if (timer)
            return AddSubMenu(new cMenuEditTimer(timer));
@@ -1676,7 +1697,7 @@ eOSState cMenuSchedule::Record(void)
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
      if (item->timerMatch == tmFull) {
-        int tm = tmNone;
+        eTimerMatch tm = tmNone;
         cTimer *timer = Timers.GetMatch(item->event, &tm);
         if (timer)
            return AddSubMenu(new cMenuEditTimer(timer));
@@ -2153,7 +2174,8 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
 
 class cMenuRecordingItem : public cOsdItem {
 private:
-  char *fileName;
+  cRecording *recording;
+  int level;
   char *name;
   int totalEntries, newEntries;
 public:
@@ -2161,13 +2183,15 @@ class cMenuRecordingItem : public cOsdItem {
   ~cMenuRecordingItem();
   void IncrementCounter(bool New);
   const char *Name(void) { return name; }
-  const char *FileName(void) { return fileName; }
+  cRecording *Recording(void) { return recording; }
   bool IsDirectory(void) { return name != NULL; }
+  virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
 cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
 {
-  fileName = strdup(Recording->FileName());
+  recording = Recording;
+  level = Level;
   name = NULL;
   totalEntries = newEntries = 0;
   SetText(Recording->Title('\t', true, Level));
@@ -2177,7 +2201,6 @@ cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
 
 cMenuRecordingItem::~cMenuRecordingItem()
 {
-  free(fileName);
   free(name);
 }
 
@@ -2189,6 +2212,12 @@ void cMenuRecordingItem::IncrementCounter(bool New)
   SetText(cString::sprintf("%d\t\t%d\t%s", totalEntries, newEntries, name));
 }
 
+void cMenuRecordingItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+  if (!DisplayMenu->SetItemRecording(recording, Index, Current, Selectable, level, totalEntries, newEntries))
+     DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
 // --- cMenuRecordings -------------------------------------------------------
 
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
@@ -2224,8 +2253,7 @@ void cMenuRecordings::SetHelpKeys(void)
         NewHelpKeys = 1;
      else {
         NewHelpKeys = 2;
-        cRecording *recording = GetRecording(ri);
-        if (recording && recording->Info()->Title())
+        if (ri->Recording()->Info()->Title())
            NewHelpKeys = 3;
         }
      }
@@ -2248,12 +2276,8 @@ void cMenuRecordings::Set(bool Refresh)
   char *LastItemText = NULL;
   cThreadLock RecordingsLock(&Recordings);
   if (Refresh) {
-     cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-     if (ri) {
-        cRecording *Recording = Recordings.GetByName(ri->FileName());
-        if (Recording)
-           CurrentRecording = Recording->FileName();
-        }
+     if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
+        CurrentRecording = ri->Recording()->FileName();
      }
   Clear();
   GetRecordingsSortMode(DirectoryName());
@@ -2293,14 +2317,6 @@ cString cMenuRecordings::DirectoryName(void)
   return d;
 }
 
-cRecording *cMenuRecordings::GetRecording(cMenuRecordingItem *Item)
-{
-  cRecording *recording = Recordings.GetByName(Item->FileName());
-  if (!recording)
-     Skins.Message(mtError, tr("Error while accessing recording!"));
-  return recording;
-}
-
 bool cMenuRecordings::Open(bool OpenSubMenus)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
@@ -2324,11 +2340,8 @@ eOSState cMenuRecordings::Play(void)
      if (ri->IsDirectory())
         Open();
      else {
-        cRecording *recording = GetRecording(ri);
-        if (recording) {
-           cReplayControl::SetRecording(recording->FileName());
-           return osReplay;
-           }
+        cReplayControl::SetRecording(ri->Recording()->FileName());
+        return osReplay;
         }
      }
   return osContinue;
@@ -2340,13 +2353,10 @@ eOSState cMenuRecordings::Rewind(void)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
-     cRecording *recording = GetRecording(ri);
-     if (recording) {
-        cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
-        cResumeFile ResumeFile(ri->FileName(), recording->IsPesRecording());
-        ResumeFile.Delete();
-        return Play();
-        }
+     cDevice::PrimaryDevice()->StopReplay(); // must do this first to be able to rewind the currently replayed recording
+     cResumeFile ResumeFile(ri->Recording()->FileName(), ri->Recording()->IsPesRecording());
+     ResumeFile.Delete();
+     return Play();
      }
   return osContinue;
 }
@@ -2358,7 +2368,7 @@ eOSState cMenuRecordings::Delete(void)
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
      if (Interface->Confirm(tr("Delete recording?"))) {
-        cRecordControl *rc = cRecordControls::GetRecordControl(ri->FileName());
+        cRecordControl *rc = cRecordControls::GetRecordControl(ri->Recording()->FileName());
         if (rc) {
            if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
               cTimer *timer = rc->Timer();
@@ -2375,33 +2385,32 @@ eOSState cMenuRecordings::Delete(void)
            else
               return osContinue;
            }
-        cRecording *recording = GetRecording(ri);
-        if (recording) {
-           if (cCutter::Active(ri->FileName())) {
-              if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
-                 cCutter::Stop();
-                 recording = Recordings.GetByName(ri->FileName()); // cCutter::Stop() might have deleted it if it was the edited version
-                 // we continue with the code below even if recording is NULL,
-                 // in order to have the menu updated etc.
-                 }
-              else
-                 return osContinue;
-              }
-           if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), ri->FileName()) == 0)
-              cControl::Shutdown();
-           if (!recording || recording->Delete()) {
-              cReplayControl::ClearLastReplayed(ri->FileName());
-              Recordings.DelByName(ri->FileName());
-              cOsdMenu::Del(Current());
-              SetHelpKeys();
-              cVideoDiskUsage::ForceCheck();
-              Display();
-              if (!Count())
-                 return osBack;
+        cRecording *recording = ri->Recording();
+        cString FileName = recording->FileName();
+        if (cCutter::Active(ri->Recording()->FileName())) {
+           if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
+              cCutter::Stop();
+              recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version
+              // we continue with the code below even if recording is NULL,
+              // in order to have the menu updated etc.
               }
            else
-              Skins.Message(mtError, tr("Error while deleting recording!"));
+              return osContinue;
            }
+        if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), FileName) == 0)
+           cControl::Shutdown();
+        if (!recording || recording->Delete()) {
+           cReplayControl::ClearLastReplayed(FileName);
+           Recordings.DelByName(FileName);
+           cOsdMenu::Del(Current());
+           SetHelpKeys();
+           cVideoDiskUsage::ForceCheck();
+           Display();
+           if (!Count())
+              return osBack;
+           }
+        else
+           Skins.Message(mtError, tr("Error while deleting recording!"));
         }
      }
   return osContinue;
@@ -2412,11 +2421,8 @@ eOSState cMenuRecordings::Info(void)
   if (HasSubMenu() || Count() == 0)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri && !ri->IsDirectory()) {
-     cRecording *recording = GetRecording(ri);
-     if (recording && recording->Info()->Title())
-        return AddSubMenu(new cMenuRecording(recording, true));
-     }
+  if (ri && !ri->IsDirectory() && ri->Recording()->Info()->Title())
+     return AddSubMenu(new cMenuRecording(ri->Recording(), true));
   return osContinue;
 }
 
@@ -2426,14 +2432,11 @@ eOSState cMenuRecordings::Commands(eKeys Key)
      return osContinue;
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
-     cRecording *recording = GetRecording(ri);
-     if (recording) {
-        cMenuCommands *menu;
-        eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(recording->FileName(), "\\\"$"))));
-        if (Key != kNone)
-           state = menu->ProcessKey(Key);
-        return state;
-        }
+     cMenuCommands *menu;
+     eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Recording commands"), &RecordingCommands, cString::sprintf("\"%s\"", *strescape(ri->Recording()->FileName(), "\\\"$"))));
+     if (Key != kNone)
+        state = menu->ProcessKey(Key);
+     return state;
      }
   return osContinue;
 }
@@ -2454,6 +2457,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
+       case kPlayPause:
        case kPlay:
        case kOk:     return Play();
        case kRed:    return (helpKeys > 1 && RecordingCommands.Count()) ? Commands() : Play();
@@ -3139,6 +3143,8 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show remaining time"), &data.ShowRemainingTime));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Progress display time (s)"), &data.ProgressDisplayTime, 0, 60));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay when setting mark"), &data.PauseOnMarkSet));
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
@@ -4475,6 +4481,8 @@ cReplayControl::cReplayControl(bool PauseLive)
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
   marks.Load(fileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
   SetTrackDescriptions(false);
+  if (Setup.ProgressDisplayTime)
+     ShowTimed(Setup.ProgressDisplayTime);
 }
 
 cReplayControl::~cReplayControl()
@@ -4685,6 +4693,7 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
          timeSearchActive = false;
          }
          break;
+    case kPlayPause:
     case kPlay:
     case kUp:
     case kPause:
@@ -4739,7 +4748,7 @@ void cReplayControl::MarkToggle(void)
         marks.Add(Current);
         bool Play, Forward;
         int Speed;
-        if (GetReplayMode(Play, Forward, Speed) && !Play)
+        if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play)
            Goto(Current, true);
         }
      ShowTimed(2);
@@ -4749,15 +4758,19 @@ void cReplayControl::MarkToggle(void)
 
 void cReplayControl::MarkJump(bool Forward)
 {
-  if (marks.Count()) {
-     int Current, Total;
-     if (GetIndex(Current, Total)) {
+  int Current, Total;
+  if (GetIndex(Current, Total)) {
+     if (marks.Count()) {
         cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
         if (m) {
            Goto(m->Position(), true);
            displayFrames = true;
+           return;
            }
         }
+     // There are either no marks at all, or we already were at the first or last one,
+     // so jump to the very beginning or end:
+     Goto(Forward ? Total : 0, true);
      }
 }
 
@@ -4861,6 +4874,15 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
      TimeSearchProcess(Key);
      return osContinue;
      }
+  if (Key == kPlayPause) {
+     bool Play, Forward;
+     int Speed;
+     GetReplayMode(Play, Forward, Speed);
+     if (Speed >= 0)
+        Key = Play ? kPlay : kPause;
+     else
+        Key = Play ? kPause : kPlay;
+     }
   bool DoShowMode = true;
   switch (int(Key)) {
     // Positioning:
diff --git a/menu.h b/menu.h
index 10ffc7abc..196c0385a 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.12 2012/09/07 08:48:34 kls Exp $
+ * $Id: menu.h 2.13 2012/12/07 13:44:13 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -208,7 +208,6 @@ class cMenuRecordings : public cOsdMenu {
   eOSState Commands(eKeys Key = kNone);
 protected:
   cString DirectoryName(void);
-  cRecording *GetRecording(cMenuRecordingItem *Item);
 public:
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
   ~cMenuRecordings();
diff --git a/osd.h b/osd.h
index 06c020aa5..0084caa64 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.17 2012/06/02 10:32:38 kls Exp $
+ * $Id: osd.h 2.18 2012/12/03 13:49:02 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -735,7 +735,7 @@ class cOsd {
        ///< Initializes the OSD with the given coordinates.
        ///< By default it is assumed that the full area will be able to display
        ///< full 32 bit graphics (ARGB with eight bit for each color and the alpha
-       ///< value, repectively). However, the actual hardware in use may not be
+       ///< value, respectively). However, the actual hardware in use may not be
        ///< able to display such a high resolution OSD, so there is an option to
        ///< divide the full OSD area into several sub-areas with lower color depths
        ///< and individual palettes. The sub-areas need not necessarily cover the
diff --git a/osdbase.c b/osdbase.c
index 37437308f..fafa9c776 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.6 2012/04/23 09:41:22 kls Exp $
+ * $Id: osdbase.c 2.7 2012/12/07 09:50:47 kls Exp $
  */
 
 #include "osdbase.h"
@@ -55,6 +55,11 @@ void cOsdItem::SetFresh(bool Fresh)
   fresh = Fresh;
 }
 
+void cOsdItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+  DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+}
+
 eOSState cOsdItem::ProcessKey(eKeys Key)
 {
   return Key == kOk ? state : osUnknown;
@@ -246,7 +251,7 @@ void cOsdMenu::Display(void)
      int n = 0;
      for (cOsdItem *item = Get(first); item; item = Next(item)) {
          bool CurrentSelectable = (i == current) && item->Selectable();
-         displayMenu->SetItem(item->Text(), i - first, CurrentSelectable, item->Selectable());
+         item->SetMenuItem(displayMenu, i - first, CurrentSelectable, item->Selectable());
          if (CurrentSelectable)
             cStatus::MsgOsdCurrentItem(item->Text());
          if (++n == displayMenuItems)
@@ -275,7 +280,7 @@ void cOsdMenu::DisplayCurrent(bool Current)
 {
   cOsdItem *item = Get(current);
   if (item) {
-     displayMenu->SetItem(item->Text(), current - first, Current && item->Selectable(), item->Selectable());
+     item->SetMenuItem(displayMenu, current - first, Current && item->Selectable(), item->Selectable());
      if (Current && item->Selectable())
         cStatus::MsgOsdCurrentItem(item->Text());
      if (!Current)
@@ -296,7 +301,7 @@ void cOsdMenu::DisplayItem(cOsdItem *Item)
      int Offset = Index - first;
      if (Offset >= 0 && Offset < first + displayMenuItems) {
         bool Current = Index == current;
-        displayMenu->SetItem(Item->Text(), Offset, Current && Item->Selectable(), Item->Selectable());
+        Item->SetMenuItem(displayMenu, Offset, Current && Item->Selectable(), Item->Selectable());
         if (Current && Item->Selectable())
            cStatus::MsgOsdCurrentItem(Item->Text());
         }
diff --git a/osdbase.h b/osdbase.h
index a2e9914a1..463518415 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 2.4 2012/04/23 09:40:07 kls Exp $
+ * $Id: osdbase.h 2.5 2012/12/07 09:49:35 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -63,6 +63,7 @@ class cOsdItem : public cListObject {
   void SetFresh(bool Fresh);
   const char *Text(void) const { return text; }
   virtual void Set(void) {}
+  virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
diff --git a/pat.c b/pat.c
index 826e0eab2..a7791e2a5 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.18 2012/04/15 09:54:53 kls Exp $
+ * $Id: pat.c 2.19 2012/11/25 14:12:21 kls Exp $
  */
 
 #include "pat.h"
@@ -352,7 +352,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             switch (stream.getStreamType()) {
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
-              case 0x1B: // MPEG4
+              case 0x1B: // H.264
                       Vpid = esPid;
                       Ppid = pmt.getPCRPid();
                       Vtype = stream.getStreamType();
diff --git a/po/ar.po b/po/ar.po
index c0fb31f40..43b1c6594 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -417,6 +417,9 @@ msgstr "ازرق"
 msgid "Key$Info"
 msgstr "معلومات"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "عرض"
 
@@ -750,9 +753,6 @@ msgstr "افتح"
 msgid "Commands"
 msgstr "الاوامر"
 
-msgid "Error while accessing recording!"
-msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
-
 msgid "Delete recording?"
 msgstr "حذف التسجيل"
 
@@ -1127,6 +1127,12 @@ msgstr "اضهر طور الاعادة"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
 
@@ -1412,3 +1418,6 @@ msgstr "القرص الصلب"
 
 msgid "free"
 msgstr "مساحة حرة"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index f08cd57ba..ea4dc9d65 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -413,6 +413,9 @@ msgstr "Blau"
 msgid "Key$Info"
 msgstr "Informaci�"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Reproduir"
 
@@ -741,9 +744,6 @@ msgstr "Obrir"
 msgid "Commands"
 msgstr "Ordres"
 
-msgid "Error while accessing recording!"
-msgstr "Error a l'accedir a la gravaci�!"
-
 msgid "Delete recording?"
 msgstr "Esborrar gravaci�?"
 
@@ -1104,6 +1104,12 @@ msgstr "Mostrar mode de reproducci
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
@@ -1386,3 +1392,6 @@ msgstr "Disc"
 
 msgid "free"
 msgstr "lliure"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Error a l'accedir a la gravaci�!"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 1a621026b..2facfbdd0 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -412,6 +412,9 @@ msgstr "Modrý"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Přehrát"
 
@@ -740,9 +743,6 @@ msgstr "Otevřít"
 msgid "Commands"
 msgstr "Příkazy"
 
-msgid "Error while accessing recording!"
-msgstr "Chyba při přístupu k nahrávkám!"
-
 msgid "Delete recording?"
 msgstr "Smazat nahrávku?"
 
@@ -1103,6 +1103,12 @@ msgstr "Zobrazit režim přehrávání"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
 
@@ -1385,3 +1391,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "volno"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Chyba při přístupu k nahrávkám!"
diff --git a/po/da_DK.po b/po/da_DK.po
index 597539ff8..cbe950ff7 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Bl
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Afspil"
 
@@ -738,9 +741,6 @@ msgstr "
 msgid "Commands"
 msgstr "Kommandoer"
 
-msgid "Error while accessing recording!"
-msgstr "Fejl ved l�sning af optagelse!"
-
 msgid "Delete recording?"
 msgstr "Slet optagelse?"
 
@@ -1101,6 +1101,12 @@ msgstr "Vis afspilningsmodus"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
@@ -1383,3 +1389,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "fri"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Fejl ved l�sning af optagelse!"
diff --git a/po/de_DE.po b/po/de_DE.po
index c958758cc..1177d9370 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Blau"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr "Wiedergabe/Pause"
+
 msgid "Key$Play"
 msgstr "Wiedergabe"
 
@@ -738,9 +741,6 @@ msgstr "
 msgid "Commands"
 msgstr "Befehle"
 
-msgid "Error while accessing recording!"
-msgstr "Fehler beim Ansprechen der Aufzeichnung!"
-
 msgid "Delete recording?"
 msgstr "Aufzeichnung l�schen?"
 
@@ -1101,6 +1101,12 @@ msgstr "Wiedergabestatus anzeigen"
 msgid "Setup.Replay$Show remaining time"
 msgstr "Verbleibende Zeit anzeigen"
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr "Anzeigedauer f�r Fortschrittsanzeige (s)"
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr "Pause beim Setzen einer Schnittmarke"
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
@@ -1383,3 +1389,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "frei"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Fehler beim Ansprechen der Aufzeichnung!"
diff --git a/po/el_GR.po b/po/el_GR.po
index 1347812d8..05f9e71d6 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "
 msgid "Key$Info"
 msgstr "�����������"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "�����������"
 
@@ -738,9 +741,6 @@ msgstr "
 msgid "Commands"
 msgstr "�������"
 
-msgid "Error while accessing recording!"
-msgstr "�������� ���� ���������� ��������!"
-
 msgid "Delete recording?"
 msgstr "�������� ��������?"
 
@@ -1101,6 +1101,12 @@ msgstr "
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
@@ -1383,3 +1389,6 @@ msgstr "
 
 msgid "free"
 msgstr "���������"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "�������� ���� ���������� ��������!"
diff --git a/po/es_ES.po b/po/es_ES.po
index 8e76063d3..9885f84d0 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -411,6 +411,9 @@ msgstr "Azul"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Reproducir"
 
@@ -739,9 +742,6 @@ msgstr "Abrir"
 msgid "Commands"
 msgstr "�rdenes"
 
-msgid "Error while accessing recording!"
-msgstr "�Error al acceder a la grabaci�n!"
-
 msgid "Delete recording?"
 msgstr "�Eliminar grabacion?"
 
@@ -1102,6 +1102,12 @@ msgstr "Mostrar modo de reproducci
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
@@ -1384,3 +1390,6 @@ msgstr "Disco"
 
 msgid "free"
 msgstr "libre"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "�Error al acceder a la grabaci�n!"
diff --git a/po/et_EE.po b/po/et_EE.po
index 12c1f2595..d9b0d77ba 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Sinine"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Start"
 
@@ -738,9 +741,6 @@ msgstr "Avada"
 msgid "Commands"
 msgstr "Käsud"
 
-msgid "Error while accessing recording!"
-msgstr "Salvestuse taasesitus nurjus!"
-
 msgid "Delete recording?"
 msgstr "Kustutada salvestus?"
 
@@ -1101,6 +1101,12 @@ msgstr "Korduse režiimi kuvamine"
 msgid "Setup.Replay$Show remaining time"
 msgstr "Järelejäänud aja kuvamine"
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Jätkamise ID"
 
@@ -1383,3 +1389,6 @@ msgstr "Ketas"
 
 msgid "free"
 msgstr "vaba"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Salvestuse taasesitus nurjus!"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 901328ae8..0dd0d59c5 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -413,6 +413,9 @@ msgstr "Sininen"
 msgid "Key$Info"
 msgstr "Tiedot"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Toista"
 
@@ -741,9 +744,6 @@ msgstr "Avaa"
 msgid "Commands"
 msgstr "Komennot"
 
-msgid "Error while accessing recording!"
-msgstr "Tallenteen toistaminen epäonnistui!"
-
 msgid "Delete recording?"
 msgstr "Poistetaanko tallenne?"
 
@@ -1104,6 +1104,12 @@ msgstr "Näytä toiston tila"
 msgid "Setup.Replay$Show remaining time"
 msgstr "Näytä jäljellä oleva aika"
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
@@ -1386,3 +1392,6 @@ msgstr "Levy"
 
 msgid "free"
 msgstr "vapaana"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Tallenteen toistaminen epäonnistui!"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index a0995aebd..0ded14e55 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -416,6 +416,9 @@ msgstr "Bleu"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Lecture"
 
@@ -744,9 +747,6 @@ msgstr "Ouvrir"
 msgid "Commands"
 msgstr "Commandes"
 
-msgid "Error while accessing recording!"
-msgstr "Impossible d'acc�der � l'enregistrement"
-
 msgid "Delete recording?"
 msgstr "Supprimer l'enregistrement ?"
 
@@ -1107,6 +1107,12 @@ msgstr "Affichage mode de lecture"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
 
@@ -1389,3 +1395,6 @@ msgstr "Disque"
 
 msgid "free"
 msgstr "restant"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Impossible d'acc�der � l'enregistrement"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 44cfd09f5..c7c657113 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -412,6 +412,9 @@ msgstr "Plavo"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Start"
 
@@ -740,9 +743,6 @@ msgstr "Otvori"
 msgid "Commands"
 msgstr "Naredbe"
 
-msgid "Error while accessing recording!"
-msgstr "Gre�ka pri pristupanju snimke!"
-
 msgid "Delete recording?"
 msgstr "Obrisati snimku?"
 
@@ -1103,6 +1103,12 @@ msgstr "Prika
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
@@ -1385,3 +1391,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "slobodno"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Gre�ka pri pristupanju snimke!"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 30ab8ab6f..19aec4385 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -413,6 +413,9 @@ msgstr "K
 msgid "Key$Info"
 msgstr "Inform�ci�"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Lej�tsz�s"
 
@@ -741,9 +744,6 @@ msgstr "Kinyitni"
 msgid "Commands"
 msgstr "Parancsok"
 
-msgid "Error while accessing recording!"
-msgstr "Hiba a felv�tel hozz�f�r�s�n�l"
-
 msgid "Delete recording?"
 msgstr "Felv�tel t�rl�se?"
 
@@ -1105,6 +1105,12 @@ msgstr "Lej
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Lej�tsz�s ID"
 
@@ -1387,3 +1393,6 @@ msgstr "Lemez"
 
 msgid "free"
 msgstr "szabad"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Hiba a felv�tel hozz�f�r�s�n�l"
diff --git a/po/it_IT.po b/po/it_IT.po
index 1258f23f6..6d0bd7c94 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2012-06-06 22:50+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -417,6 +417,9 @@ msgstr "Blu"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Riproduci"
 
@@ -745,9 +748,6 @@ msgstr "Apri"
 msgid "Commands"
 msgstr "Comandi"
 
-msgid "Error while accessing recording!"
-msgstr "Errore accesso alla registrazione!"
-
 msgid "Delete recording?"
 msgstr "Eliminare la registrazione?"
 
@@ -1108,6 +1108,12 @@ msgstr "Mostra modalità riproduzione"
 msgid "Setup.Replay$Show remaining time"
 msgstr "Mostra tempo rimanente"
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
 
@@ -1390,3 +1396,6 @@ msgstr "Disco"
 
 msgid "free"
 msgstr "disponibili"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Errore accesso alla registrazione!"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index b53c76271..d2edb6eca 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Mėlyna"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Grona"
 
@@ -738,9 +741,6 @@ msgstr "Atidaryti"
 msgid "Commands"
 msgstr "Komandos"
 
-msgid "Error while accessing recording!"
-msgstr "Klaida atidarant įrašą!"
-
 msgid "Delete recording?"
 msgstr "Ištrinti įrašą?"
 
@@ -1101,6 +1101,12 @@ msgstr "Rodyti pakartojimo ręžimą"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
 
@@ -1383,3 +1389,6 @@ msgstr "Diskas"
 
 msgid "free"
 msgstr "laisva"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Klaida atidarant įrašą!"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 89e8b7399..8a6dc5859 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
-"PO-Revision-Date: 2010-03-11 00:54+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
 "Language: mk\n"
@@ -75,7 +75,7 @@ msgid "Rolloff"
 msgstr "Рол-оф"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Започнувам скенирање на EPG"
@@ -411,6 +411,9 @@ msgstr "Сино"
 msgid "Key$Info"
 msgstr "Инфо"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Старт"
 
@@ -644,10 +647,10 @@ msgid "Button$Folder"
 msgstr "Директориум"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Единчен"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Периодичен"
 
 msgid "First day"
 msgstr "Прв ден"
@@ -739,14 +742,11 @@ msgstr "Отвори"
 msgid "Commands"
 msgstr "Наредби"
 
-msgid "Error while accessing recording!"
-msgstr "Грешка при пристап до снимката!"
-
 msgid "Delete recording?"
 msgstr "Избриши снимка?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Снимката се уредува - бриши?"
 
 msgid "Error while deleting recording!"
 msgstr "Грешка при бришење на снимката!"
@@ -848,19 +848,19 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Директориуми во менито за тајмер"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Нумерички копчиња за букви"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Копче во боја 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Копче во боја 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Копче во боја 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Копче во боја 3"
 
 msgid "EPG"
 msgstr "EPG (електронски водич на програми)"
@@ -931,7 +931,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Примарен DVB уред"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Согласност со стандард"
 
 msgid "Setup.DVB$Video format"
 msgstr "Видео формат"
@@ -986,10 +986,10 @@ msgstr "Форна LNB фрекфенција (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Уред %d поврзан со сателитски кабел"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "свој"
 
 msgid "CAM reset"
 msgstr "Рестартирај CAM"
@@ -1079,7 +1079,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Траење на директно снимање (мин)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "сегашен настан"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Максимална големина на датотека (MB)"
@@ -1100,6 +1100,12 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Прикажи начин на пуштање"
 
 msgid "Setup.Replay$Show remaining time"
+msgstr "Прикажи преостанато време"
+
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1136,7 +1142,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Премотување канали"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Прикажи имиња на канали со извор"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Итен излез"
@@ -1215,7 +1221,7 @@ msgid "No editing marks defined!"
 msgstr "Нема одредено ознаки за сечење!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Нема одредено секвенци за уредување!"
 
 msgid "Can't start editing process!"
 msgstr "Не може да почне уредување!"
@@ -1260,7 +1266,7 @@ msgid "Index file regeneration complete"
 msgstr "Регенерирањето на индексот заврши"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Регенерирањето на индексот е неуспешен!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Невозможно гаснење - недостасува опцијата '-s'!"
@@ -1299,22 +1305,22 @@ msgid "Classic VDR"
 msgstr "Класичен VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "ДИСК"
 
 msgid "LOAD"
-msgstr ""
+msgstr "ТОВАР"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "ТАЈМЕР"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "УРЕДИ"
 
 msgid "LIVE"
-msgstr ""
+msgstr "ЖИВО"
 
 msgid "PLAY"
-msgstr ""
+msgstr "ПУШТИ"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Панели"
@@ -1384,3 +1390,6 @@ msgstr "Диск"
 
 msgid "free"
 msgstr "слободен"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Грешка при пристап до снимката!"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 5e515c369..958411c00 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -414,6 +414,9 @@ msgstr "Blauw"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Weergeven"
 
@@ -742,9 +745,6 @@ msgstr "Openen"
 msgid "Commands"
 msgstr "Commando's"
 
-msgid "Error while accessing recording!"
-msgstr "Fout bij lezen opname!"
-
 msgid "Delete recording?"
 msgstr "Opname verwijderen?"
 
@@ -1105,6 +1105,12 @@ msgstr "Weergave mode aangeven"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
 
@@ -1387,3 +1393,6 @@ msgstr "Schijf"
 
 msgid "free"
 msgstr "vrij"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Fout bij lezen opname!"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index f36626054..2aa373e0d 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -411,6 +411,9 @@ msgstr "Bl
 msgid "Key$Info"
 msgstr ""
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr ""
 
@@ -739,9 +742,6 @@ msgstr "
 msgid "Commands"
 msgstr "Kommandoer"
 
-msgid "Error while accessing recording!"
-msgstr "Feil under lesing av opptak!"
-
 msgid "Delete recording?"
 msgstr "Slette opptak?"
 
@@ -1102,6 +1102,12 @@ msgstr "Vis avspillingsmodus"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
@@ -1384,3 +1390,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "ledig"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Feil under lesing av opptak!"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index fbe8a8608..0e6f09818 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -411,6 +411,9 @@ msgstr "Niebieski"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Odtw�rz"
 
@@ -739,9 +742,6 @@ msgstr "Otw
 msgid "Commands"
 msgstr "Polecenia"
 
-msgid "Error while accessing recording!"
-msgstr "Bl�d podczas dost�pu do nagrania!"
-
 msgid "Delete recording?"
 msgstr "Usun�� nagranie?"
 
@@ -1102,6 +1102,12 @@ msgstr "Pokazuj tryb odtwarzania"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
@@ -1384,3 +1390,6 @@ msgstr "Dysk"
 
 msgid "free"
 msgstr "wolnego"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Bl�d podczas dost�pu do nagrania!"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d69e0690c..e1327692a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -411,6 +411,9 @@ msgstr "Azul"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Reproduzir"
 
@@ -739,9 +742,6 @@ msgstr "Abrir"
 msgid "Commands"
 msgstr "Comandos"
 
-msgid "Error while accessing recording!"
-msgstr "Erro a aceder �s grava��es!"
-
 msgid "Delete recording?"
 msgstr "Eliminar grava��o?"
 
@@ -1102,6 +1102,12 @@ msgstr "Mostrar modo de reprodu
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de resumo"
 
@@ -1384,3 +1390,6 @@ msgstr "Disco"
 
 msgid "free"
 msgstr "livre"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Erro a aceder �s grava��es!"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 03ae8f029..d5d64210a 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2012-11-05 01:28+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -413,6 +413,9 @@ msgstr "Albastru"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Redare"
 
@@ -741,9 +744,6 @@ msgstr "Deschide"
 msgid "Commands"
 msgstr "Comenzi"
 
-msgid "Error while accessing recording!"
-msgstr "Eroare la accesarea înregistrării"
-
 msgid "Delete recording?"
 msgstr "Şterg înregistrarea?"
 
@@ -1104,6 +1104,12 @@ msgstr "Afişează redarea"
 msgid "Setup.Replay$Show remaining time"
 msgstr "Arată timpul rămas"
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
 
@@ -1386,3 +1392,6 @@ msgstr "Disc"
 
 msgid "free"
 msgstr "liber"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Eroare la accesarea înregistrării"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index b58fd9a1c..892cfe780 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -411,6 +411,9 @@ msgstr "
 msgid "Key$Info"
 msgstr "����"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "���������������"
 
@@ -739,9 +742,6 @@ msgstr "
 msgid "Commands"
 msgstr "�������"
 
-msgid "Error while accessing recording!"
-msgstr "������ ������� � ������!"
-
 msgid "Delete recording?"
 msgstr "������� ������?"
 
@@ -1102,6 +1102,12 @@ msgstr "
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ���������������"
 
@@ -1384,3 +1390,6 @@ msgstr "
 
 msgid "free"
 msgstr "��������"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "������ ������� � ������!"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index ab5035e89..48d882b57 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2011-02-15 16:29+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Modr
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Prehra�"
 
@@ -738,9 +741,6 @@ msgstr "Otvori
 msgid "Commands"
 msgstr "Pr�kazy"
 
-msgid "Error while accessing recording!"
-msgstr "Chyba pri pr�stupe k nahr�vkam!"
-
 msgid "Delete recording?"
 msgstr "Zmaza� nahr�vku?"
 
@@ -1101,6 +1101,12 @@ msgstr "Zobrazi
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovenie"
 
@@ -1383,3 +1389,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "volne"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Chyba pri pr�stupe k nahr�vkam!"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 9326d8587..75514bce5 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -411,6 +411,9 @@ msgstr "Modra"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Predvajaj"
 
@@ -739,9 +742,6 @@ msgstr "Odpri"
 msgid "Commands"
 msgstr "Ukazi"
 
-msgid "Error while accessing recording!"
-msgstr "Napaka pri dostopu do posnetka!"
-
 msgid "Delete recording?"
 msgstr "Izbri�i posnetek?"
 
@@ -1102,6 +1102,12 @@ msgstr "Prika
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
@@ -1384,3 +1390,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "prosto"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Napaka pri dostopu do posnetka!"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index c7b97d574..511964797 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -412,6 +412,9 @@ msgstr "Plavo"
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Start"
 
@@ -747,9 +750,6 @@ msgstr "Meni"
 msgid "Commands"
 msgstr "Naredbe"
 
-msgid "Error while accessing recording!"
-msgstr "Gre�ka prilikom pristupa snimanju!"
-
 msgid "Delete recording?"
 msgstr "Obri�i snimku?"
 
@@ -1124,6 +1124,12 @@ msgstr "Prika
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
@@ -1410,3 +1416,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "slobodno"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Gre�ka prilikom pristupa snimanju!"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index dc4d6208e..067adf553 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -413,6 +413,9 @@ msgstr "Bl
 msgid "Key$Info"
 msgstr "Info"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Spela upp"
 
@@ -741,9 +744,6 @@ msgstr "
 msgid "Commands"
 msgstr "Kommandon"
 
-msgid "Error while accessing recording!"
-msgstr "Inspelningen g�r inte att l�sa!"
-
 msgid "Delete recording?"
 msgstr "Ta bort inspelningen?"
 
@@ -1104,6 +1104,12 @@ msgstr "Visa uppspelningsl
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "�teruppta ID"
 
@@ -1386,3 +1392,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "ledigt"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Inspelningen g�r inte att l�sa!"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 1f6194416..78177e750 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Mavi"
 msgid "Key$Info"
 msgstr "Bilgi"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "G�ster"
 
@@ -738,9 +741,6 @@ msgstr "A
 msgid "Commands"
 msgstr "Komutlar"
 
-msgid "Error while accessing recording!"
-msgstr "Kay�t okuma hatas�!"
-
 msgid "Delete recording?"
 msgstr "Kay�t� sil?"
 
@@ -1101,6 +1101,12 @@ msgstr "G
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
@@ -1383,3 +1389,6 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "bo�"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Kay�t okuma hatas�!"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 72fe84c52..edc5a7c88 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -410,6 +410,9 @@ msgstr "Синя"
 msgid "Key$Info"
 msgstr "Інфо"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "Програвання"
 
@@ -738,9 +741,6 @@ msgstr "Відкрити"
 msgid "Commands"
 msgstr "Команди"
 
-msgid "Error while accessing recording!"
-msgstr "Помилка доступу до запису!"
-
 msgid "Delete recording?"
 msgstr "Витерти запис?"
 
@@ -1101,6 +1101,12 @@ msgstr "Віображати режим перегляду"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
 
@@ -1383,3 +1389,6 @@ msgstr "Диск"
 
 msgid "free"
 msgstr "вільно"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "Помилка доступу до запису!"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 56b2de0dc..73e84fd41 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-11-18 14:31+0100\n"
+"POT-Creation-Date: 2012-12-07 14:59+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -413,6 +413,9 @@ msgstr "蓝"
 msgid "Key$Info"
 msgstr "信息"
 
+msgid "Key$Play/Pause"
+msgstr ""
+
 msgid "Key$Play"
 msgstr "播放"
 
@@ -741,9 +744,6 @@ msgstr "打开"
 msgid "Commands"
 msgstr "常用操作命令"
 
-msgid "Error while accessing recording!"
-msgstr "存取录像错误！"
-
 msgid "Delete recording?"
 msgstr "是否删除录像？"
 
@@ -1104,6 +1104,12 @@ msgstr "显示回放模式"
 msgid "Setup.Replay$Show remaining time"
 msgstr ""
 
+msgid "Setup.Replay$Progress display time (s)"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay when setting mark"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
@@ -1386,3 +1392,6 @@ msgstr "硬盘已使用"
 
 msgid "free"
 msgstr "可录像时间"
+
+#~ msgid "Error while accessing recording!"
+#~ msgstr "存取录像错误！"
diff --git a/recording.c b/recording.c
index 497bf2dd9..87ca8efe5 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.73 2012/11/13 13:46:49 kls Exp $
+ * $Id: recording.c 2.78 2012/12/06 09:35:13 kls Exp $
  */
 
 #include "recording.h"
@@ -455,7 +455,7 @@ bool cRecordingInfo::Read(FILE *f)
                             }
                        }
                        break;
-             case 'F': framesPerSecond = atof(t);
+             case 'F': framesPerSecond = atod(t);
                        break;
              case 'L': lifetime = atoi(t);
                        break;
@@ -482,7 +482,7 @@ bool cRecordingInfo::Write(FILE *f, const char *Prefix) const
   if (channelID.Valid())
      fprintf(f, "%sC %s%s%s\n", Prefix, *channelID.ToString(), channelName ? " " : "", channelName ? channelName : "");
   event->Dump(f, Prefix, true);
-  fprintf(f, "%sF %.10g\n", Prefix, framesPerSecond);
+  fprintf(f, "%sF %s\n", Prefix, *dtoa(framesPerSecond, "%.10g"));
   fprintf(f, "%sP %d\n", Prefix, priority);
   fprintf(f, "%sL %d\n", Prefix, lifetime);
   if (aux)
@@ -691,7 +691,8 @@ cRecording::cRecording(const char *FileName)
   FileName = fileName = strdup(FileName);
   if (*(fileName + strlen(fileName) - 1) == '/')
      *(fileName + strlen(fileName) - 1) = 0;
-  FileName += strlen(VideoDirectory) + 1;
+  if (strstr(FileName, VideoDirectory) == FileName)
+     FileName += strlen(VideoDirectory) + 1;
   const char *p = strrchr(FileName, '/');
 
   name = NULL;
@@ -1498,8 +1499,11 @@ int cMarks::GetNumSequences(void)
            NumSequences++;
            BeginMark = GetNextBegin(EndMark);
            }
-     if (NumSequences == 0 && BeginMark->Position() > 0)
-        NumSequences = 1; // there is only one actual "begin" mark at a non-zero offset, and no actual "end" mark
+     if (BeginMark) {
+        NumSequences++; // the last sequence had no actual "end" mark
+        if (NumSequences == 1 && BeginMark->Position() == 0)
+           NumSequences = 0; // there is only one actual "begin" mark at offset zero, and no actual "end" mark
+        }
      }
   return NumSequences;
 }
@@ -1606,7 +1610,7 @@ void cIndexFileGenerator::Action(void)
                     int Pid = TsPid(p);
                     if (Pid == PATPID)
                        PatPmtParser.ParsePat(p, TS_SIZE);
-                    else if (Pid == PatPmtParser.PmtPid())
+                    else if (PatPmtParser.IsPmtPid(Pid))
                        PatPmtParser.ParsePmt(p, TS_SIZE);
                     Length -= TS_SIZE;
                     p += TS_SIZE;
@@ -1639,6 +1643,14 @@ void cIndexFileGenerator::Action(void)
         }
   if (IndexFileComplete) {
      if (IndexFileWritten) {
+        cRecordingInfo RecordingInfo(recordingName);
+        if (RecordingInfo.Read()) {
+           if (FrameDetector.FramesPerSecond() > 0 && !DoubleEqual(RecordingInfo.FramesPerSecond(), FrameDetector.FramesPerSecond())) {
+              RecordingInfo.SetFramesPerSecond(FrameDetector.FramesPerSecond());
+              RecordingInfo.Write();
+              Recordings.UpdateByName(recordingName);
+              }
+           }
         Skins.QueueMessage(mtInfo, tr("Index file regeneration complete"));
         return;
         }
@@ -2132,7 +2144,7 @@ bool cFileName::GetLastPatPmtVersions(int &PatVersion, int &PmtVersion)
                            int Pid = TsPid(buf);
                            if (Pid == PATPID)
                               PatPmtParser.ParsePat(buf, sizeof(buf));
-                           else if (Pid == PatPmtParser.PmtPid()) {
+                           else if (PatPmtParser.IsPmtPid(Pid)) {
                               PatPmtParser.ParsePmt(buf, sizeof(buf));
                               if (PatPmtParser.GetVersions(PatVersion, PmtVersion)) {
                                  close(fd);
diff --git a/remux.c b/remux.c
index e3b34c669..38ad24687 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.71 2012/11/18 12:18:08 kls Exp $
+ * $Id: remux.c 2.73 2012/11/25 14:16:11 kls Exp $
  */
 
 #include "remux.h"
@@ -574,7 +574,7 @@ void cPatPmtParser::Reset(void)
 {
   pmtSize = 0;
   patVersion = pmtVersion = -1;
-  pmtPid = -1;
+  pmtPids[0] = 0;
   vpid = vtype = 0;
   ppid = 0;
 }
@@ -594,14 +594,17 @@ void cPatPmtParser::ParsePat(const uchar *Data, int Length)
      dbgpatpmt("PAT: TSid = %d, c/n = %d, v = %d, s = %d, ls = %d\n", Pat.getTransportStreamId(), Pat.getCurrentNextIndicator(), Pat.getVersionNumber(), Pat.getSectionNumber(), Pat.getLastSectionNumber());
      if (patVersion == Pat.getVersionNumber())
         return;
+     int NumPmtPids = 0;
      SI::PAT::Association assoc;
      for (SI::Loop::Iterator it; Pat.associationLoop.getNext(assoc, it); ) {
          dbgpatpmt("     isNITPid = %d\n", assoc.isNITPid());
          if (!assoc.isNITPid()) {
-            pmtPid = assoc.getPid();
+            if (NumPmtPids <= MAX_PMT_PIDS)
+               pmtPids[NumPmtPids++] = assoc.getPid();
             dbgpatpmt("     service id = %d, pid = %d\n", assoc.getServiceId(), assoc.getPid());
             }
          }
+     pmtPids[NumPmtPids] = 0;
      patVersion = Pat.getVersionNumber();
      }
   else
@@ -673,7 +676,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
          switch (stream.getStreamType()) {
            case 0x01: // STREAMTYPE_11172_VIDEO
            case 0x02: // STREAMTYPE_13818_VIDEO
-           case 0x1B: // MPEG4
+           case 0x1B: // H.264
                       vpid = stream.getPid();
                       vtype = stream.getStreamType();
                       ppid = Pmt.getPCRPid();
@@ -839,7 +842,7 @@ bool cPatPmtParser::ParsePatPmt(const uchar *Data, int Length)
         int Pid = TsPid(Data);
         if (Pid == PATPID)
            ParsePat(Data, TS_SIZE);
-        else if (Pid == PmtPid()) {
+        else if (IsPmtPid(Pid)) {
            ParsePmt(Data, TS_SIZE);
            if (patVersion >= 0 && pmtVersion >= 0)
               return true;
@@ -1107,9 +1110,9 @@ int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid)
   return tsPayload.Used();
 }
 
-// --- cMpeg4Parser ----------------------------------------------------------
+// --- cH264Parser -----------------------------------------------------------
 
-class cMpeg4Parser : public cFrameParser {
+class cH264Parser : public cFrameParser {
 private:
   enum eNalUnitType {
     nutCodedSliceNonIdr     = 1,
@@ -1141,14 +1144,14 @@ class cMpeg4Parser : public cFrameParser {
   void ParseSequenceParameterSet(void);
   void ParseSliceHeader(void);
 public:
-  cMpeg4Parser(void);
-       ///< Sets up a new MPEG-4 parser.
+  cH264Parser(void);
+       ///< Sets up a new H.264 parser.
        ///< This class parses only the data absolutely necessary to determine the
        ///< frame borders and field count of the given H264 material.
   virtual int Parse(const uchar *Data, int Length, int Pid);
   };
 
-cMpeg4Parser::cMpeg4Parser(void)
+cH264Parser::cH264Parser(void)
 {
   byte = 0;
   bit = -1;
@@ -1161,7 +1164,7 @@ cMpeg4Parser::cMpeg4Parser(void)
   gotSequenceParameterSet = false;
 }
 
-uchar cMpeg4Parser::GetByte(bool Raw)
+uchar cH264Parser::GetByte(bool Raw)
 {
   uchar b = tsPayload.GetByte();
   if (!Raw) {
@@ -1180,7 +1183,7 @@ uchar cMpeg4Parser::GetByte(bool Raw)
   return b;
 }
 
-uchar cMpeg4Parser::GetBit(void)
+uchar cH264Parser::GetBit(void)
 {
   if (bit < 0) {
      byte = GetByte();
@@ -1189,7 +1192,7 @@ uchar cMpeg4Parser::GetBit(void)
   return (byte & (1 << bit--)) ? 1 : 0;
 }
 
-uint32_t cMpeg4Parser::GetBits(int Bits)
+uint32_t cH264Parser::GetBits(int Bits)
 {
   uint32_t b = 0;
   while (Bits--)
@@ -1197,7 +1200,7 @@ uint32_t cMpeg4Parser::GetBits(int Bits)
   return b;
 }
 
-uint32_t cMpeg4Parser::GetGolombUe(void)
+uint32_t cH264Parser::GetGolombUe(void)
 {
   int z = -1;
   for (int b = 0; !b; z++)
@@ -1205,7 +1208,7 @@ uint32_t cMpeg4Parser::GetGolombUe(void)
   return (1 << z) - 1 + GetBits(z);
 }
 
-int32_t cMpeg4Parser::GetGolombSe(void)
+int32_t cH264Parser::GetGolombSe(void)
 {
   uint32_t v = GetGolombUe();
   if (v) {
@@ -1217,7 +1220,7 @@ int32_t cMpeg4Parser::GetGolombSe(void)
   return v;
 }
 
-int cMpeg4Parser::Parse(const uchar *Data, int Length, int Pid)
+int cH264Parser::Parse(const uchar *Data, int Length, int Pid)
 {
   newFrame = independentFrame = false;
   tsPayload.Setup(const_cast<uchar *>(Data), Length, Pid);
@@ -1257,14 +1260,14 @@ int cMpeg4Parser::Parse(const uchar *Data, int Length, int Pid)
   return tsPayload.Used();
 }
 
-void cMpeg4Parser::ParseAccessUnitDelimiter(void)
+void cH264Parser::ParseAccessUnitDelimiter(void)
 {
   if (debug && gotSequenceParameterSet)
      dbgframes("A");
   GetByte(); // primary_pic_type
 }
 
-void cMpeg4Parser::ParseSequenceParameterSet(void)
+void cH264Parser::ParseSequenceParameterSet(void)
 {
   uchar profile_idc = GetByte(); // profile_idc
   GetByte(); // constraint_set[0-5]_flags, reserved_zero_2bits
@@ -1316,7 +1319,7 @@ void cMpeg4Parser::ParseSequenceParameterSet(void)
      }
 }
 
-void cMpeg4Parser::ParseSliceHeader(void)
+void cH264Parser::ParseSliceHeader(void)
 {
   newFrame = true;
   GetGolombUe(); // first_mb_in_slice
@@ -1366,13 +1369,13 @@ void cFrameDetector::SetPid(int Pid, int Type)
 {
   pid = Pid;
   type = Type;
-  isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or 4
+  isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or H.264
   delete parser;
   parser = NULL;
   if (type == 0x01 || type == 0x02)
      parser = new cMpeg2Parser;
   else if (type == 0x1B)
-     parser = new cMpeg4Parser;
+     parser = new cH264Parser;
   else if (type == 0x04 || type == 0x06) // MPEG audio or AC3 audio
      parser = new cAudioParser;
   else if (type != 0)
diff --git a/remux.h b/remux.h
index dd17e0d9f..19f947975 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.35 2012/11/18 12:17:23 kls Exp $
+ * $Id: remux.h 2.36 2012/11/19 10:22:28 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -327,13 +327,15 @@ class cPatPmtGenerator {
 
 // PAT/PMT Parser:
 
+#define MAX_PMT_PIDS 32
+
 class cPatPmtParser {
 private:
   uchar pmt[MAX_SECTION_SIZE];
   int pmtSize;
   int patVersion;
   int pmtVersion;
-  int pmtPid;
+  int pmtPids[MAX_PMT_PIDS + 1]; // list is zero-terminated
   int vpid;
   int ppid;
   int vtype;
@@ -373,9 +375,9 @@ class cPatPmtParser {
   bool GetVersions(int &PatVersion, int &PmtVersion) const;
        ///< Returns true if a valid PAT/PMT has been parsed and stores
        ///< the current version numbers in the given variables.
-  int PmtPid(void) const { return pmtPid; }
-       ///< Returns the PMT pid as defined by the current PAT.
-       ///< If no PAT has been received yet, -1 will be returned.
+  bool IsPmtPid(int Pid) const { for (int i = 0; pmtPids[i]; i++) if (pmtPids[i] == Pid) return true; return false; }
+       ///< Returns true if Pid the one of the PMT pids as defined by the current PAT.
+       ///< If no PAT has been received yet, false will be returned.
   int Vpid(void) const { return vpid; }
        ///< Returns the video pid as defined by the current PMT, or 0 if no video
        ///< pid has been detected, yet.
diff --git a/skins.h b/skins.h
index f71644897..250612685 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 2.5 2012/05/12 11:10:30 kls Exp $
+ * $Id: skins.h 2.7 2012/12/07 17:18:44 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -17,6 +17,7 @@
 #include "recording.h"
 #include "themes.h"
 #include "thread.h"
+#include "timers.h"
 #include "tools.h"
 
 enum eMessageType { mtStatus = 0, mtInfo, mtWarning, mtError }; // will be used to calculate color offsets!
@@ -49,7 +50,7 @@ class cSkinDisplay {
 
 class cSkinDisplayChannel : public cSkinDisplay {
        ///< This class is used to display the current channel, together with
-       ///< the present and following EPG even. How and to what extent this
+       ///< the present and following EPG event. How and to what extent this
        ///< is done is totally up to the derived class.
 public:
   virtual void SetChannel(const cChannel *Channel, int Number) = 0;
@@ -152,13 +153,43 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< this function will be first called for the old current item
        ///< with Current set to false, and then for the new current item
        ///< with Current set to true.
-  /*TODO
-  virtual void SetItem(const cEvent *Event, int Index, bool Current, bool Selectable, bool NowNext???, bool Schedule???);
-  virtual void SetItem(const cTimer *Timer, int Index, bool Current, bool Selectable);
-  virtual void SetItem(const cChannel *Channel, int Index, bool Current, bool Selectable);
-  virtual void SetItem(const cRecording *Recording, int Index, bool Current, bool Selectable);
-  --> false: call SetItem(text)
-  */
+  virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, int TimerMatch) { return false; }
+       ///< Sets the item at the given Index to Event. See SetItem() for more information.
+       ///< If a derived skin class implements this function, it can display an Event item
+       ///< in a more elaborate way than just a simple line of text.
+       ///< If Channel is not NULL, the channel's name and/or number shall be displayed.
+       ///< If WithDate is true, the date of the Event shall be displayed (in addition to the time).
+       ///< TimerMatch tells how much of this event will be recorded by a timer.
+       ///< If the skin displays the Event item in its own way, it shall return true.
+       ///< The default implementation does nothing and returns false, which results in
+       ///< a call to SetItem() with a proper text.
+  virtual bool SetItemTimer(const cTimer *Timer, int Index, bool Current, bool Selectable) { return false; }
+       ///< Sets the item at the given Index to Timer. See SetItem() for more information.
+       ///< If a derived skin class implements this function, it can display a Timer item
+       ///< in a more elaborate way than just a simple line of text.
+       ///< If the skin displays the Timer item in its own way, it shall return true.
+       ///< The default implementation does nothing and returns false, which results in
+       ///< a call to SetItem() with a proper text.
+  virtual bool SetItemChannel(const cChannel *Channel, int Index, bool Current, bool Selectable, bool WithProvider) { return false; }
+       ///< Sets the item at the given Index to Channel. See SetItem() for more information.
+       ///< If a derived skin class implements this function, it can display a Channel item
+       ///< in a more elaborate way than just a simple line of text.
+       ///< If WithProvider ist true, the provider shall be displayed in addition to the
+       ///< channel's name.
+       ///< If the skin displays the Channel item in its own way, it shall return true.
+       ///< The default implementation does nothing and returns false, which results in
+       ///< a call to SetItem() with a proper text.
+  virtual bool SetItemRecording(const cRecording *Recording, int Index, bool Current, bool Selectable, int Level, int Total, int New) { return false; }
+       ///< Sets the item at the given Index to Recording. See SetItem() for more information.
+       ///< If a derived skin class implements this function, it can display a Recording item
+       ///< in a more elaborate way than just a simple line of text.
+       ///< Level is the currently displayed level of the video directory, where 0 is the
+       ///< top level. A value of -1 means that the full path names of the recordings
+       ///< shall be displayed. If Total is greater than 0, this is a directory with the given
+       ///< total number of entries, and New contains the number of new (unwatched) recordings.
+       ///< If the skin displays the Recording item in its own way, it shall return true.
+       ///< The default implementation does nothing and returns false, which results in
+       ///< a call to SetItem() with a proper text.
   virtual void SetScrollbar(int Total, int Offset);
        ///< Sets the Total number of items in the currently displayed list, and the
        ///< Offset of the first item that is currently displayed (the skin knows how
diff --git a/svdrp.c b/svdrp.c
index f8db84761..0313280b4 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.19 2012/05/12 11:55:18 kls Exp $
+ * $Id: svdrp.c 2.21 2012/12/04 12:08:36 kls Exp $
  */
 
 #include "svdrp.h"
@@ -917,6 +917,10 @@ void cSVDRP::CmdHELP(const char *Option)
 void cSVDRP::CmdHITK(const char *Option)
 {
   if (*Option) {
+     if (!cRemote::Enabled()) {
+        Reply(550, "Remote control currently disabled (key \"%s\" discarded)", Option);
+        return;
+        }
      char buf[strlen(Option) + 1];
      strcpy(buf, Option);
      const char *delim = " \t";
@@ -1268,7 +1272,7 @@ void cSVDRP::CmdMOVC(const char *Option)
                        Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
                        }
                     else
-                       Reply(501, "Can't move channel to same postion");
+                       Reply(501, "Can't move channel to same position");
                     }
                  else
                     Reply(501, "Channel \"%d\" not defined", To);
diff --git a/timers.c b/timers.c
index a29cf12f6..ab8e4778e 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.14 2012/10/16 08:22:39 kls Exp $
+ * $Id: timers.c 2.15 2012/12/07 13:14:00 kls Exp $
  */
 
 #include "timers.h"
@@ -480,7 +480,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
 
 #define FULLMATCH 1000
 
-int cTimer::Matches(const cEvent *Event, int *Overlap) const
+eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
 {
   // Overlap is the percentage of the Event's duration that is covered by
   // this timer (based on FULLMATCH for finer granularity than just 100).
@@ -758,12 +758,12 @@ cTimer *cTimers::GetMatch(time_t t)
   return t0;
 }
 
-cTimer *cTimers::GetMatch(const cEvent *Event, int *Match)
+cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match)
 {
   cTimer *t = NULL;
-  int m = tmNone;
+  eTimerMatch m = tmNone;
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      int tm = ti->Matches(Event);
+      eTimerMatch tm = ti->Matches(Event);
       if (tm > m) {
          t = ti;
          m = tm;
diff --git a/timers.h b/timers.h
index e2734c6de..cde8b3bdf 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.4 2012/04/15 13:21:31 kls Exp $
+ * $Id: timers.h 2.5 2012/12/07 13:13:40 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -77,7 +77,7 @@ class cTimer : public cListObject {
   static time_t SetTime(time_t t, int SecondsFromMidnight);
   void SetFile(const char *File);
   bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
-  int Matches(const cEvent *Event, int *Overlap = NULL) const;
+  eTimerMatch Matches(const cEvent *Event, int *Overlap = NULL) const;
   bool Expired(void) const;
   time_t StartTime(void) const;
   time_t StopTime(void) const;
@@ -116,7 +116,7 @@ class cTimers : public cConfig<cTimer> {
   cTimers(void);
   cTimer *GetTimer(cTimer *Timer);
   cTimer *GetMatch(time_t t);
-  cTimer *GetMatch(const cEvent *Event, int *Match = NULL);
+  cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL);
   cTimer *GetNextActiveTimer(void);
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
diff --git a/tools.c b/tools.c
index 26c325b6e..ab46d0255 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.26 2012/09/30 13:04:14 kls Exp $
+ * $Id: tools.c 2.29 2012/12/08 11:16:30 kls Exp $
  */
 
 #include "tools.h"
@@ -18,6 +18,7 @@ extern "C" {
 #include <jpeglib.h>
 #undef boolean
 }
+#include <locale.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/vfs.h>
@@ -302,6 +303,39 @@ cString AddDirectory(const char *DirName, const char *FileName)
   return cString::sprintf("%s/%s", DirName && *DirName ? DirName : ".", FileName);
 }
 
+#define DECIMAL_POINT_C '.'
+
+double atod(const char *s)
+{
+  static lconv *loc = localeconv();
+  if (*loc->decimal_point != DECIMAL_POINT_C) {
+     char buf[strlen(s) + 1];
+     char *p = buf;
+     while (*s) {
+           if (*s == DECIMAL_POINT_C)
+              *p = *loc->decimal_point;
+           else
+              *p = *s;
+           p++;
+           s++;
+           }
+     *p = 0;
+     return atof(buf);
+     }
+  else
+     return atof(s);
+}
+
+cString dtoa(double d, const char *Format)
+{
+  static lconv *loc = localeconv();
+  char buf[16];
+  snprintf(buf, sizeof(buf), Format, d);
+  if (*loc->decimal_point != DECIMAL_POINT_C)
+     strreplace(buf, *loc->decimal_point, DECIMAL_POINT_C);
+  return buf;
+}
+
 cString itoa(int n)
 {
   char buf[16];
@@ -842,7 +876,8 @@ cCharSetConv::cCharSetConv(const char *FromCode, const char *ToCode)
 cCharSetConv::~cCharSetConv()
 {
   free(result);
-  iconv_close(cd);
+  if (cd != (iconv_t)-1)
+     iconv_close(cd);
 }
 
 void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)
diff --git a/tools.h b/tools.h
index 3e546a17e..70c643fca 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.22 2012/09/30 11:02:21 kls Exp $
+ * $Id: tools.h 2.23 2012/12/06 08:59:39 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -216,6 +216,14 @@ int64_t StrToNum(const char *s);
 bool StrInArray(const char *a[], const char *s);
     ///< Returns true if the string s is equal to one of the strings pointed
     ///< to by the (NULL terminated) array a.
+double atod(const char *s);
+    ///< Converts the given string, which is a floating point number using a '.' as
+    ///< the decimal point, to a double value, independent of the currently selected
+    ///< locale.
+cString dtoa(double d, const char *Format = "%f");
+    ///< Converts the given double value to a string, making sure it uses a '.' as
+    ///< the decimal point, independent of the currently selected locale.
+    ///< If Format is given, it will be used instead of the default.
 cString itoa(int n);
 cString AddDirectory(const char *DirName, const char *FileName);
 bool EntriesOnSameFileSystem(const char *File1, const char *File2);
diff --git a/vdr.c b/vdr.c
index 5494cf7dc..88b8956f2 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.42 2012/10/13 12:48:56 kls Exp $
+ * $Id: vdr.c 2.45 2012/12/06 10:29:23 kls Exp $
  */
 
 #include <getopt.h>
@@ -174,7 +174,6 @@ int main(int argc, char *argv[])
   // Initiate locale:
 
   setlocale(LC_ALL, "");
-  setlocale(LC_NUMERIC, "C"); // makes sure any floating point numbers written use a decimal point
 
   // Command line options:
 
@@ -1000,11 +999,11 @@ int main(int argc, char *argv[])
                break;
           // Direct main menu functions:
           #define DirectMainFunction(function)\
-            DELETE_MENU;\
+            { DELETE_MENU;\
             if (cControl::Control())\
                cControl::Control()->Hide();\
             Menu = new cMenuMain(function);\
-            key = kNone; // nobody else needs to see this key
+            key = kNone; } // nobody else needs to see this key
           case kSchedule:   DirectMainFunction(osSchedule); break;
           case kChannels:   DirectMainFunction(osChannels); break;
           case kTimers:     DirectMainFunction(osTimers); break;
@@ -1089,6 +1088,7 @@ int main(int argc, char *argv[])
                key = kNone;
                break;
           // Pausing live video:
+          case kPlayPause:
           case kPause:
                if (!cControl::Control()) {
                   DELETE_MENU;

From 15485a5e06121f644b9eb9cc228ce3c77b22330d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 24 Dec 2012 10:39:00 +0100
Subject: [PATCH 220/307] Version 1.7.34 VDR developer version 1.7.34 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.34.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33-1.7.34.diff

and a helper patch for plugin Makefiles can be found at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33-pluginmakefile.diff

MD5 checksums:

55d9aba62563efe39ee040e987f7023c  vdr-1.7.34.tar.bz2
019ba806b263f7054dbd0da8956ea73b  vdr-1.7.33-1.7.34.diff
6c2b8efe5eead6822f006bc867ccb324  vdr-1.7.33-pluginmakefile.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

IMPORTANT:
==========

This version comes with revised versions of the Makefiles for VDR itself
and all of its standard plugins. As a result of this, existing plugins
will no longer build with this version of VDR, unless their Makefiles are
properly adapted. To do so, please follow the instructions given below.
There is also a generic patch (see below) that might help you update your
plugin's Makefile. If you do want to build this version of VDR with plugins
that don't have their Makefiles adapted yet, you can simply copy the Makefile,
Make.global and Make.config (if applicable) files from a previous version
of VDR into this source and use them. Note, though, that you cannot mix
old and new Makefiles. All Makefiles for VDR and all plugins must be either
old or new!
PLEASE GIVE THE PLUGIN DEVELOPERS SOME TIME TO ADAPT THEIR MAKEFILES
ACCORDINGLY. AFTER ALL, IT'S CHRISTMAS, SO THEY PROBABLY HAVE BETTER
THINGS TO DO THAN SIT AT THEIR COMPUTERS ;-).

From the HISTORY file:
- Changed the type of the TimerMatch parameter in cSkinDisplayMenu::SetItemEvent() from
  'int' to 'eTimerEvent' (reported by Christoph Haubrich).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed cOsd::GetBitmap() to always return NULL if a non-exising area is requested.
- Added several missing "`ls $^`" in the calls to xgettext in plugin Makefiles and the
  "newplugin" script.
- Fixed setting the --package-name and --package-version options in the calls to
  xgettext in several plugin Makefiles.
- Added "-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" to the
  DEFINES in the Makefile (somehow got lost from Make.config.template in version 1.7.13).
- Removed some redundancy in the Makefile/Make.global/Make.config mechanism (suggested
  by Christopher Reimer). The file Make.global is no longer used, and plugin Makefiles
  don't include the file Make.config any more. Instead they now retrieve all necessary
  information through calls to pkg-config.
- The plugin Makefiles now have a separate 'install' target (suggested by Christopher
  Reimer). In order to still allow the normal building of VDR (with all plugins in its
  ./PLUGINS/src subdirectory, the plugin libraries in ./PLUGINS/lib and the i18n files in
  ./locale) the VDR Makefile checks the settings of LIBDIR and LOCDIR when building the
  plugins from within the VDR source directory. If these macros have their default values,
  then the 'install' targets of the plugins' Makefiles are called. Otherwise the 'all'
  targets are called and the plugins are merely built, and will have to be installed by a
  call to 'make install-plugins'. This now also allows a user to copy a plugin source to
  any directory, change into that directory and do 'make' and 'make install' to have the
  plugin installed to wherever the local installation of VDR expects them.
- Plugin Makefiles now use DESTDIR and the 'install' program (thanks to Christopher Reimer).
- Due to the changes to the plugin Makefiles, existing plugins will not build with this
  version of VDR any more. You can either use the new 'newplugin' script to generate a
  dummy plugin directory and use the Makefile from there (adapting it to your particular
  plugin), or apply the patch from
  ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33-pluginmakefile.diff
  to your Makefile to make the necessary changes (see comments in that file for details).
- Added the new menu categories mcChannelEdit, mcTimerEdit, mcScheduleNow, mcScheduleNext,
  mcRecordingInfo, mcPluginSetup, mcSetupOsd, mcSetupEpg, mcSetupDvb, mcSetupLnb,
  mcSetupCam, mcSetupRecord, mcSetupReplay, mcSetupMisc and mcSetupPlugins.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed replay stuttering close to the end of an ongoing recording (reported by Andreas
  Regel).
- Fixed cIndexFile::GetNextIFrame() to properly handle the case where the very last frame
  is an I-frame (which normally shouldn't occur).
- Fixed replaying ongoing recordings from other VDR instances.
---
 CONTRIBUTORS                                |  7 ++
 HISTORY                                     | 47 +++++++++++-
 Make.config.template                        | 18 ++---
 Make.global                                 | 17 -----
 Makefile                                    | 79 ++++++++++++---------
 PLUGINS/src/dvbhddevice/Makefile            | 73 ++++++++++---------
 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile | 18 +----
 PLUGINS/src/dvbhddevice/po/de_DE.po         |  2 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po         |  2 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po         |  2 +-
 PLUGINS/src/dvbsddevice/Makefile            | 77 +++++++-------------
 PLUGINS/src/epgtableid0/Makefile            | 77 +++++++-------------
 PLUGINS/src/hello/Makefile                  | 66 ++++++++---------
 PLUGINS/src/hello/po/ca_ES.po               |  6 +-
 PLUGINS/src/hello/po/cs_CZ.po               |  6 +-
 PLUGINS/src/hello/po/da_DK.po               |  6 +-
 PLUGINS/src/hello/po/de_DE.po               |  6 +-
 PLUGINS/src/hello/po/el_GR.po               |  6 +-
 PLUGINS/src/hello/po/es_ES.po               |  6 +-
 PLUGINS/src/hello/po/et_EE.po               |  6 +-
 PLUGINS/src/hello/po/fi_FI.po               |  6 +-
 PLUGINS/src/hello/po/fr_FR.po               |  6 +-
 PLUGINS/src/hello/po/hr_HR.po               |  6 +-
 PLUGINS/src/hello/po/hu_HU.po               |  6 +-
 PLUGINS/src/hello/po/it_IT.po               |  6 +-
 PLUGINS/src/hello/po/lt_LT.po               |  6 +-
 PLUGINS/src/hello/po/nl_NL.po               |  6 +-
 PLUGINS/src/hello/po/nn_NO.po               |  6 +-
 PLUGINS/src/hello/po/pl_PL.po               |  6 +-
 PLUGINS/src/hello/po/pt_PT.po               |  6 +-
 PLUGINS/src/hello/po/ro_RO.po               |  6 +-
 PLUGINS/src/hello/po/ru_RU.po               |  6 +-
 PLUGINS/src/hello/po/sk_SK.po               |  6 +-
 PLUGINS/src/hello/po/sl_SI.po               |  6 +-
 PLUGINS/src/hello/po/sv_SE.po               |  6 +-
 PLUGINS/src/hello/po/tr_TR.po               |  6 +-
 PLUGINS/src/hello/po/zh_CN.po               |  6 +-
 PLUGINS/src/osddemo/Makefile                | 48 +++++++------
 PLUGINS/src/pictures/Makefile               | 69 +++++++++---------
 PLUGINS/src/pictures/po/de_DE.po            |  6 +-
 PLUGINS/src/pictures/po/fi_FI.po            |  6 +-
 PLUGINS/src/pictures/po/fr_FR.po            |  6 +-
 PLUGINS/src/pictures/po/it_IT.po            |  6 +-
 PLUGINS/src/pictures/po/lt_LT.po            |  6 +-
 PLUGINS/src/pictures/po/ru_RU.po            |  6 +-
 PLUGINS/src/pictures/po/sk_SK.po            |  6 +-
 PLUGINS/src/rcu/Makefile                    | 77 +++++++-------------
 PLUGINS/src/servicedemo/Makefile            | 41 +++++------
 PLUGINS/src/skincurses/Makefile             | 69 +++++++++---------
 PLUGINS/src/skincurses/po/de_DE.po          |  6 +-
 PLUGINS/src/skincurses/po/fi_FI.po          |  6 +-
 PLUGINS/src/skincurses/po/it_IT.po          |  6 +-
 PLUGINS/src/skincurses/po/lt_LT.po          |  6 +-
 PLUGINS/src/skincurses/po/ru_RU.po          |  6 +-
 PLUGINS/src/skincurses/po/sk_SK.po          |  6 +-
 PLUGINS/src/status/Makefile                 | 48 +++++++------
 PLUGINS/src/svdrpdemo/Makefile              | 48 +++++++------
 config.h                                    | 10 +--
 libsi/Makefile                              | 17 +----
 menu.c                                      | 19 +++--
 menuitems.c                                 |  3 +-
 newplugin                                   | 70 +++++++++---------
 osd.c                                       |  6 +-
 po/ar.po                                    |  3 -
 po/ca_ES.po                                 |  3 -
 po/cs_CZ.po                                 |  3 -
 po/da_DK.po                                 |  3 -
 po/de_DE.po                                 |  3 -
 po/el_GR.po                                 |  3 -
 po/es_ES.po                                 |  3 -
 po/et_EE.po                                 | 55 +++++++-------
 po/fi_FI.po                                 |  3 -
 po/fr_FR.po                                 |  3 -
 po/hr_HR.po                                 |  3 -
 po/hu_HU.po                                 |  3 -
 po/it_IT.po                                 | 27 ++++---
 po/lt_LT.po                                 |  3 -
 po/mk_MK.po                                 |  3 -
 po/nl_NL.po                                 |  3 -
 po/nn_NO.po                                 |  3 -
 po/pl_PL.po                                 |  3 -
 po/pt_PT.po                                 |  3 -
 po/ro_RO.po                                 |  3 -
 po/ru_RU.po                                 |  3 -
 po/sk_SK.po                                 |  3 -
 po/sl_SI.po                                 |  3 -
 po/sr_SR.po                                 |  3 -
 po/sv_SE.po                                 |  3 -
 po/tr_TR.po                                 |  3 -
 po/uk_UA.po                                 |  3 -
 po/zh_CN.po                                 |  3 -
 recording.c                                 | 74 +++++--------------
 recording.h                                 |  7 +-
 skins.h                                     | 36 +++++++++-
 94 files changed, 691 insertions(+), 818 deletions(-)
 delete mode 100644 Make.global

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 46a4c62b5..d21f8844e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1453,6 +1453,7 @@ Andreas Regel <andreas.regel@gmx.de>
  for making cDevice::AddPid() store the stream type of the given pid
  for adding cFont::FontName() and cFont::Size()
  for writing the dvbhddevice plugin
+ for reporting replay stuttering close to the end of an ongoing recording
 
 Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
@@ -2321,6 +2322,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for suggesting to check for NULL in cOsd::AddPixmap()
  for making modified editing marks be written to disk whenever the replay progress
  display gets hidden
+ for reporting a wrong type ('int' vs. 'eTimerEvent') in the declaration of
+ cSkinDisplayMenu::SetItemEvent()
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2807,6 +2810,10 @@ Christopher Reimer <reimer.christopher@freenet.de>
  for reporting a problem with external Dolby Digital processing via the '-a' option
  in live mode and with TS recordings
  for contributing to a patch that implements FHS support
+ for suggesting to remove some redundancy in the Makefile/Make.global/Make.config
+ mechanism
+ for suggesting to give the plugin Makefiles a separate 'install' target
+ for making plugin Makefiles use DESTDIR and the 'install' program
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
diff --git a/HISTORY b/HISTORY
index 51d0681ad..5b4513dd7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7342,8 +7342,8 @@ Video Disk Recorder Revision History
 2012-12-08: Version 1.7.33
 
 - In order to be able to play TS recordings from other sources, in which there is
-  more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed
-  to 'bool cPatPmtParser::IsPatPmt(int Pid)'.
+  more than one PMT PID in the PAT, 'int cPatPmtParser::PmtPid(void)' has been changed
+  to 'bool cPatPmtParser::IsPmtPid(int Pid)'.
 - Fixed learning remote control keys with the LCARS skin.
 - Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
 - Fixed getting only non-video packets in cCuttingThread::GetPendingPackets() (reported
@@ -7416,3 +7416,46 @@ Video Disk Recorder Revision History
   SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin
   plugins to display these items in a more elaborate way than just a simple line of
   text.
+
+2012-12-24: Version 1.7.34
+
+- Changed the type of the TimerMatch parameter in cSkinDisplayMenu::SetItemEvent() from
+  'int' to 'eTimerEvent' (reported by Christoph Haubrich).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed cOsd::GetBitmap() to always return NULL if a non-exising area is requested.
+- Added several missing "`ls $^`" in the calls to xgettext in plugin Makefiles and the
+  "newplugin" script.
+- Fixed setting the --package-name and --package-version options in the calls to
+  xgettext in several plugin Makefiles.
+- Added "-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" to the
+  DEFINES in the Makefile (somehow got lost from Make.config.template in version 1.7.13).
+- Removed some redundancy in the Makefile/Make.global/Make.config mechanism (suggested
+  by Christopher Reimer). The file Make.global is no longer used, and plugin Makefiles
+  don't include the file Make.config any more. Instead they now retrieve all necessary
+  information through calls to pkg-config.
+- The plugin Makefiles now have a separate 'install' target (suggested by Christopher
+  Reimer). In order to still allow the normal building of VDR (with all plugins in its
+  ./PLUGINS/src subdirectory, the plugin libraries in ./PLUGINS/lib and the i18n files in
+  ./locale) the VDR Makefile checks the settings of LIBDIR and LOCDIR when building the
+  plugins from within the VDR source directory. If these macros have their default values,
+  then the 'install' targets of the plugins' Makefiles are called. Otherwise the 'all'
+  targets are called and the plugins are merely built, and will have to be installed by a
+  call to 'make install-plugins'. This now also allows a user to copy a plugin source to
+  any directory, change into that directory and do 'make' and 'make install' to have the
+  plugin installed to wherever the local installation of VDR expects them.
+- Plugin Makefiles now use DESTDIR and the 'install' program (thanks to Christopher Reimer).
+- Due to the changes to the plugin Makefiles, existing plugins will not build with this
+  version of VDR any more. You can either use the new 'newplugin' script to generate a
+  dummy plugin directory and use the Makefile from there (adapting it to your particular
+  plugin), or apply the patch from
+  ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33-pluginmakefile.diff
+  to your Makefile to make the necessary changes (see comments in that file for details).
+- Added the new menu categories mcChannelEdit, mcTimerEdit, mcScheduleNow, mcScheduleNext,
+  mcRecordingInfo, mcPluginSetup, mcSetupOsd, mcSetupEpg, mcSetupDvb, mcSetupLnb,
+  mcSetupCam, mcSetupRecord, mcSetupReplay, mcSetupMisc and mcSetupPlugins.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed replay stuttering close to the end of an ongoing recording (reported by Andreas
+  Regel).
+- Fixed cIndexFile::GetNextIFrame() to properly handle the case where the very last frame
+  is an I-frame (which normally shouldn't occur).
+- Fixed replaying ongoing recordings from other VDR instances.
diff --git a/Make.config.template b/Make.config.template
index 08f9ece8e..a2cc6976e 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.10 2012/10/09 10:32:32 kls Exp $
+# $Id: Make.config.template 2.12 2012/12/22 10:54:47 kls Exp $
 
 ### The C compiler and options:
 
@@ -14,12 +14,10 @@ CC       = gcc
 CFLAGS   = -g -O3 -Wall
 
 CXX      = g++
-CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
+CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
 
-ifdef PLUGIN
 CFLAGS   += -fPIC
 CXXFLAGS += -fPIC
-endif
 
 # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
 ifdef M32
@@ -29,15 +27,16 @@ endif
 
 ### The directory environment:
 
-PREFIX   = $(DESTDIR)/usr/local
+PREFIX   = /usr/local
 #DVBDIR   = /usr/src/v4l-dvb/linux
 MANDIR   = $(PREFIX)/man
 BINDIR   = $(PREFIX)/bin
 
 # By default locale and plugin files are built under the source directory:
-LOCDIR       = ./locale
-PLUGINDIR    = ./PLUGINS
-PLUGINLIBDIR = $(PLUGINDIR)/lib
+INCDIR       = $(CWD)/include
+LOCDIR       = $(CWD)/locale
+PLUGINDIR    = $(CWD)/PLUGINS
+LIBDIR       = $(PLUGINDIR)/lib
 # By default VDR requires only one single directory to operate:
 VIDEODIR     = /video
 # Activate the following line to build VDR according to the FHS ("File system Hierarchy Standard"):
@@ -47,8 +46,9 @@ VIDEODIR     = /srv/vdr/video
 CONFDIR      = /var/lib/vdr
 CACHEDIR     = /var/cache/vdr
 RESDIR       = $(PREFIX)/share/vdr
+INCDIR       = $(PREFIX)/include
 LOCDIR       = $(PREFIX)/share/locale
-PLUGINLIBDIR = $(PREFIX)/lib/vdr
+LIBDIR       = $(PREFIX)/lib/vdr
 endif
 
 ### The remote control:
diff --git a/Make.global b/Make.global
deleted file mode 100644
index 3b9272281..000000000
--- a/Make.global
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Strictly necessary Makefile options for the Video Disk Recorder
-#
-# See the main source file 'vdr.c' for copyright information and
-# how to reach the author.
-#
-# $Id: Make.global 1.1 2010/02/06 14:54:12 kls Exp $
-
-# Plugins need to be compiled with position independent code, otherwise linking
-# VDR against it will fail.
-
-ifdef PLUGIN
-CFLAGS   += -fPIC
-CXXFLAGS += -fPIC
-endif
-
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
diff --git a/Makefile b/Makefile
index e165ee880..de48e3761 100644
--- a/Makefile
+++ b/Makefile
@@ -4,28 +4,39 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.30 2012/10/09 08:32:25 kls Exp $
+# $Id: Makefile 2.36 2012/12/23 11:28:13 kls Exp $
 
 .DELETE_ON_ERROR:
 
+# Compiler flags:
+
 CC       ?= gcc
 CFLAGS   ?= -g -O3 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
+CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
+
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+
+CDEFINES  = -D_GNU_SOURCE
+CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
+# Directories:
 
+CWD     := $(shell pwd)
 LSIDIR   = ./libsi
 DESTDIR ?=
 PREFIX  ?= /usr/local
 MANDIR  ?= $(PREFIX)/share/man
 BINDIR  ?= $(PREFIX)/bin
-INCDIR  ?= $(PREFIX)/include
-LOCDIR  ?= ./locale
+INCDIR  ?= $(CWD)/include
+LOCDIR  ?= $(CWD)/locale
 LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
 INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
 
-PLUGINDIR= ./PLUGINS
-PLUGINLIBDIR= $(PLUGINDIR)/lib
+PLUGINDIR= $(CWD)/PLUGINS
+LIBDIR   = $(PLUGINDIR)/lib
 
 # By default VDR requires only one single directory to operate:
 VIDEODIR     = /video
@@ -36,7 +47,6 @@ DOXYFILE = Doxyfile
 
 PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
 
-include Make.global
 -include Make.config
 
 SILIB    = $(LSIDIR)/libsi.a
@@ -48,6 +58,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
        skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
 
+DEFINES += $(CDEFINES)
+
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
 endif
@@ -66,14 +78,11 @@ endif
 LIRC_DEVICE ?= /var/run/lirc/lircd
 
 DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
-
-DEFINES += -D_GNU_SOURCE
-
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DCONFDIR=\"$(CONFDIR)\"
 DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
 DEFINES += -DRESDIR=\"$(RESDIR)\"
-DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
+DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
 DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 
 # Default values for directories:
@@ -87,7 +96,7 @@ RESDIRDEF   = $(firstword $(RESDIR)   $(CONFDIRDEF))
 VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 
-all: vdr i18n vdr.pc
+all: vdr i18n plugins
 
 # Implicit rules:
 
@@ -106,27 +115,27 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(SILIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
 
 # The libsi library:
 
 $(SILIB):
-	$(MAKE) -C $(LSIDIR) all
+	$(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all
 
 # pkg-config file:
 
-vdr.pc: Makefile Make.global
+.PHONY: vdr.pc
+vdr.pc:
 	@echo "bindir=$(BINDIR)" > $@
-	@echo "includedir=$(INCDIR)" >> $@
 	@echo "configdir=$(CONFDIRDEF)" >> $@
 	@echo "videodir=$(VIDEODIR)" >> $@
 	@echo "cachedir=$(CACHEDIRDEF)" >> $@
 	@echo "resdir=$(RESDIRDEF)" >> $@
-	@echo "plugindir=$(PLUGINLIBDIR)" >> $@
-	@echo "localedir=$(LOCDIR)" >> $@
+	@echo "libdir=$(LIBDIR)" >> $@
+	@echo "locdir=$(LOCDIR)" >> $@
 	@echo "apiversion=$(APIVERSION)" >> $@
-	@echo "cflags=$(CXXFLAGS) $(DEFINES) -I\$${includedir}" >> $@
-	@echo "plugincflags=\$${cflags} -fPIC" >> $@
+	@echo "cflags=$(CFLAGS) $(CDEFINES) -I$(INCDIR)" >> $@
+	@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(INCDIR)" >> $@
 	@echo "" >> $@
 	@echo "Name: VDR" >> $@
 	@echo "Description: Video Disk Recorder" >> $@
@@ -157,7 +166,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
 	cp $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs)
+i18n: $(I18Nmsgs) $(I18Npot)
 
 install-i18n:
 	@mkdir -p $(DESTDIR)$(LOCDIR)
@@ -173,23 +182,27 @@ include-dir:
 
 # Plugins:
 
-plugins: include-dir
+plugins: include-dir vdr.pc
 	@failed="";\
 	noapiv="";\
 	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
-	    echo "Plugin $$i:";\
+	    echo "*** Plugin $$i:";\
 	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
 	       echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\
 	       noapiv="$$noapiv $$i";\
 	       continue;\
 	       fi;\
-	    $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\
+            target=all;\
+	    if [ "$(LIBDIR)" == "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" == "$(CWD)/locale" ]; then\
+	       target=install;\
+	       fi;\
+	    $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) $$target || failed="$$failed $$i";\
 	    done;\
 	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
 
 clean-plugins:
-	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
+	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" clean; done
 	@-rm -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION)
 
 # Install the files:
@@ -225,8 +238,9 @@ install-doc:
 # Plugins:
 
 install-plugins: plugins
-	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
-	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
+	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
+	     $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\
+	     done
 
 # Includes:
 
@@ -253,9 +267,10 @@ srcdoc:
 # Housekeeping:
 
 clean:
-	$(MAKE) -C $(LSIDIR) clean
-	-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~
-	-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
-	-rm -rf include
-	-rm -rf srcdoc
+	@$(MAKE) --no-print-directory -C $(LSIDIR) clean
+	@-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~
+	@-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -rf include
+	@-rm -rf srcdoc
 CLEAN: clean
+distclean: clean-plugins clean
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index ad5029651..ef6ef5160 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,53 +1,50 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.13 2012/03/11 15:34:00 kls Exp $
+# $Id: Makefile 1.19 2012/12/23 10:01:00 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = dvbhddevice
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +52,7 @@ OBJS = $(PLUGIN).o dvbhdffdevice.o hdffcmd.o hdffosd.o menu.o setup.o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
@@ -74,34 +71,39 @@ $(DEPFILE): Makefile
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS) libhdffcmd
-	$(MAKE) -C libhdffcmd all
+$(SOFILE): $(OBJS) libhdffcmd
+	@$(MAKE) --no-print-directory -C libhdffcmd all
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -112,5 +114,6 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
-	$(MAKE) -C libhdffcmd clean
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-$(MAKE) --no-print-directory -C libhdffcmd clean
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
index babe79b23..216cdbad8 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
@@ -24,29 +24,17 @@ CFLAGS  ?= -g -O2 -fPIC -Wall
 AR      ?= ar
 ARFLAGS ?= r
 
-### The directory environment:
-
-VDRDIR ?= ../../../..
-
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
-
-### Allow user defined options to overwrite defaults:
-
--include $(VDRDIR)/Make.config
-
 ### Implicit rules:
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CC) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(LIB_OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -62,7 +50,7 @@ $(LIB_SHARED): $(LIB_OBJS)
 	ln -sf $(LIB_SHARED) $(LIB_NAME).so
 
 clean:
-	rm -f $(LIB_OBJS) $(DEPFILE) $(LIB_STATIC) $(LIB_NAME)*.so
+	@-rm -f $(LIB_OBJS) $(DEPFILE) $(LIB_STATIC) $(LIB_NAME)*.so
 
 install: $(LIB_SHARED)
 	chown root $(LIB_SHARED)
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index b263f08a5..f884567da 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR \n"
+"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-11-13 20:08+0100\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index a971773f4..579e8292a 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR \n"
+"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-11-13 20:08+0100\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index 56b987a2e..0718ba725 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR\n"
+"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-11-13 20:08+0100\n"
 "PO-Revision-Date: 2011-07-10 00:23+0100\n"
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 1e7b5dde4..445177443 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,53 +1,49 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.9 2012/03/11 15:34:02 kls Exp $
+# $Id: Makefile 1.15 2012/12/23 10:01:12 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = dvbsddevice
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
+### The compiler options:
 
-include $(VDRDIR)/Make.global
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
-### Allow user defined options to overwrite defaults:
+### The version number of VDR's plugin API:
 
--include $(VDRDIR)/Make.config
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +51,7 @@ OBJS = $(PLUGIN).o dvbsdffdevice.o dvbsdffosd.o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE)
 
 ### Implicit rules:
 
@@ -71,38 +67,17 @@ $(DEPFILE): Makefile
 
 -include $(DEPFILE)
 
-### Internationalization (I18N):
-
-PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
-
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: $(I18Npo) clean
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib
+
+dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
@@ -111,4 +86,4 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 78bf3e781..48b6b6ea9 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,53 +1,49 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2012/03/11 15:34:04 kls Exp $
+# $Id: Makefile 1.8 2012/12/23 10:01:40 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = epgtableid0
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
+### The compiler options:
 
-include $(VDRDIR)/Make.global
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
-### Allow user defined options to overwrite defaults:
+### The version number of VDR's plugin API:
 
--include $(VDRDIR)/Make.config
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +51,7 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE)
 
 ### Implicit rules:
 
@@ -71,38 +67,17 @@ $(DEPFILE): Makefile
 
 -include $(DEPFILE)
 
-### Internationalization (I18N):
-
-PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
-
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: $(I18Npo) clean
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib
+
+dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
@@ -111,4 +86,4 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index cdf63401f..4cfcae831 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,53 +1,50 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.9 2012/03/11 15:34:06 kls Exp $
+# $Id: Makefile 2.15 2012/12/23 10:03:51 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = hello
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +52,7 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
@@ -74,33 +71,38 @@ $(DEPFILE): Makefile
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index 24e09efce..8efe53186 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index af184b373..f4fe8a51d 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim�r B�rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index 6c1647ee0..1fda5d08b 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index 1536f1b33..c3e35f6b4 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index ce921ee0c..03bab929a 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index 292f65247..1b87045ba 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index 3cf2247de..c3d9bda61 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index a106a8b01..b8256b54f 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -8,9 +8,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index 335df7523..aed37e22a 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -8,9 +8,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index c88e8328f..40305de3d 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-03-17 19:52+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index 5b9f207d7..ae344c11b 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index 7ef310a86..e56e49993 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
index 0ade0bd89..773e14a85 100644
--- a/PLUGINS/src/hello/po/lt_LT.po
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.10\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-12-08 12:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 4dff540cf..29b0dadf9 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index c566f531a..0277104c6 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index e7aedf2fa..34d38de3d 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index dd0be173e..fcefd52ee 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index a5eb16a56..248e9c064 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index ee94c9290..18dcd0f00 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
index b8ba7753b..e3875affc 100644
--- a/PLUGINS/src/hello/po/sk_SK.po
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-09-30 09:48+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index bbcf6b977..504586aaa 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index 4b4909fc3..3ccd4240a 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index a8705dacd..3215b1fb6 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-05-12 22:34:4800\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
index 7793ed29c..6d7aa569a 100644
--- a/PLUGINS/src/hello/po/zh_CN.po
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -8,9 +8,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-hello 0.2.5\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-01-23 09:48+0800\n"
 "Last-Translator: senin\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 68a236b5f..3ef4fdc37 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,51 +1,49 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.5 2012/03/11 15:34:08 kls Exp $
+# $Id: Makefile 2.11 2012/12/23 10:04:05 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-#
+
 PLUGIN = osddemo
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -53,14 +51,14 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so
+all: $(SOFILE)
 
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
@@ -71,9 +69,13 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index cee95efbc..516cb8576 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,53 +1,50 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.9 2012/03/11 15:34:10 kls Exp $
+# $Id: Makefile 2.15 2012/12/23 10:04:13 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = pictures
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +52,7 @@ OBJS = $(PLUGIN).o entry.o menu.o player.o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
@@ -74,33 +71,38 @@ $(DEPFILE): Makefile
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -111,4 +113,5 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index f31fa0769..2f7777274 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 0a175967a..3ac5ed7d4 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index c6289d15d..36bca8c50 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
 "Last-Translator: Patrice Staudt <ipatrice.staudt@laposte.net>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index f3858db09..0eddf515f 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
index 9d877acc0..26c244bba 100644
--- a/PLUGINS/src/pictures/po/lt_LT.po
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.10\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2009-12-08 12:41+0100\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>, 2009\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index 6d38639e2..869c91bea 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-03-14 00:45+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
index 340aad1ee..afc69a037 100644
--- a/PLUGINS/src/pictures/po/sk_SK.po
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-15 15:08+0200\n"
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2009-09-30 12:54+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index 170490aa0..d1b162ae2 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -1,53 +1,49 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.2 2012/03/11 15:34:12 kls Exp $
+# $Id: Makefile 1.8 2012/12/23 10:04:15 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = rcu
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
+### The compiler options:
 
-include $(VDRDIR)/Make.global
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
-### Allow user defined options to overwrite defaults:
+### The version number of VDR's plugin API:
 
--include $(VDRDIR)/Make.config
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +51,7 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE)
 
 ### Implicit rules:
 
@@ -71,38 +67,17 @@ $(DEPFILE): Makefile
 
 -include $(DEPFILE)
 
-### Internationalization (I18N):
-
-PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
-
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: $(I18Npo) clean
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib
+
+dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
@@ -111,4 +86,4 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 941aaff65..dfe05a40e 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,13 +1,12 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.5 2012/03/11 15:34:13 kls Exp $
+# $Id: Makefile 2.9 2012/12/23 10:04:16 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-#
-PLUGIN  = servicedemo # dummy name for Make.config
+
 PLUGIN1 = svccli
 PLUGIN2 = svcsvr
 
@@ -15,28 +14,22 @@ PLUGIN2 = svcsvr
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
@@ -45,9 +38,9 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -62,7 +55,7 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
@@ -75,11 +68,13 @@ $(DEPFILE): Makefile
 
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN1).o -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
+	install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
+	install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index b43518b69..63be8bb4a 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,53 +1,50 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.9 2012/03/11 15:34:18 kls Exp $
+# $Id: Makefile 2.15 2012/12/23 10:04:18 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = skincurses
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -55,7 +52,7 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
@@ -74,33 +71,38 @@ $(DEPFILE): Makefile
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -111,4 +113,5 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index bff2411a8..cecf74b58 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:36+0200\n"
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index c123a0b10..e8bb5c20e 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:36+0200\n"
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 5cecb65cc..b7a8e6887 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:36+0200\n"
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index 16d2698c4..3b3e1e10e 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.12\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:36+0200\n"
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2010-02-22 18:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index b550f29cf..fe049953e 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:36+0200\n"
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index e362f8e9f..0426c70b9 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
-"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2011-05-21 14:36+0200\n"
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-09-30 12:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index dd46ba697..fc8ef9ebc 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,51 +1,49 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.5 2012/03/11 15:34:20 kls Exp $
+# $Id: Makefile 2.10 2012/12/23 10:04:43 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-#
+
 PLUGIN = status
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -53,14 +51,14 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so
+all: $(SOFILE)
 
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
@@ -71,9 +69,13 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 5109b2970..84eba02d0 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,51 +1,49 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.5 2012/03/11 15:34:22 kls Exp $
+# $Id: Makefile 2.10 2012/12/23 10:04:47 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-#
+
 PLUGIN = svdrpdemo
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include $(VDRDIR)/Make.global
+### The compiler options:
 
-### Allow user defined options to overwrite defaults:
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -53,14 +51,14 @@ OBJS = $(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so
+all: $(SOFILE)
 
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
@@ -71,9 +69,13 @@ $(DEPFILE): Makefile
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/config.h b/config.h
index 5c962fb3d..3624d9dc3 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.57 2012/12/05 11:33:20 kls Exp $
+ * $Id: config.h 2.58 2012/12/11 09:59:16 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.33"
-#define VDRVERSNUM   10733  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.34"
+#define VDRVERSNUM   10734  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.33"
-#define APIVERSNUM   10733  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.34"
+#define APIVERSNUM   10734  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/libsi/Makefile b/libsi/Makefile
index 9d2d40ddd..dff5ca9cf 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,27 +1,16 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 2.3 2012/01/18 12:31:40 kls Exp $
+# $Id: Makefile 2.4 2012/12/18 13:35:54 kls Exp $
 
-### The C++ compiler and options:
+### The archiver options:
 
-CXX      ?= g++
-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
 AR       ?= ar
 ARFLAGS  ?= ru
 RANLIB   ?= ranlib
 
-include ../Make.global
 -include ../Make.config
 
-### The directory environment:
-
-INCLUDES +=
-
-DEFINES +=
-
-LIBS +=
-
 ### The object files (add further files here):
 
 OBJS = util.o si.o section.o descriptor.o
@@ -31,7 +20,7 @@ OBJS = util.o si.o section.o descriptor.o
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
diff --git a/menu.c b/menu.c
index e2d34ed43..6c278b556 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.71 2012/12/07 13:48:15 kls Exp $
+ * $Id: menu.c 2.72 2012/12/21 11:11:14 kls Exp $
  */
 
 #include "menu.h"
@@ -172,7 +172,7 @@ class cMenuEditChannel : public cOsdMenu {
 cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
 :cOsdMenu(tr("Edit channel"), 16)
 {
-  SetMenuCategory(mcChannel);
+  SetMenuCategory(mcChannelEdit);
   channel = Channel;
   sourceParam = NULL;
   *name = 0;
@@ -878,7 +878,7 @@ eOSState cMenuFolder::ProcessKey(eKeys Key)
 cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
-  SetMenuCategory(mcTimer);
+  SetMenuCategory(mcTimerEdit);
   file = NULL;
   day = firstday = NULL;
   timer = Timer;
@@ -1378,7 +1378,7 @@ const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
 :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, CHNAMWIDTH, 6, 4)
 {
-  SetMenuCategory(mcSchedule);
+  SetMenuCategory(Now ? mcScheduleNow : mcScheduleNext);
   now = Now;
   helpKeys = -1;
   timerState = 0;
@@ -2120,7 +2120,7 @@ class cMenuRecording : public cOsdMenu {
 cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
 :cOsdMenu(tr("Recording info"))
 {
-  SetMenuCategory(mcRecording);
+  SetMenuCategory(mcRecordingInfo);
   recording = Recording;
   withButtons = WithButtons;
   if (withButtons)
@@ -2534,6 +2534,7 @@ class cMenuSetupOSD : public cMenuSetupBase {
 
 cMenuSetupOSD::cMenuSetupOSD(void)
 {
+  SetMenuCategory(mcSetupOsd);
   osdLanguageIndex = I18nCurrentLanguage();
   numSkins = Skins.Count();
   skinIndex = originalSkinIndex = Skins.Current()->Index();
@@ -2683,6 +2684,7 @@ class cMenuSetupEPG : public cMenuSetupBase {
 
 cMenuSetupEPG::cMenuSetupEPG(void)
 {
+  SetMenuCategory(mcSetupEpg);
   for (numLanguages = 0; numLanguages < I18nLanguages()->Size() && data.EPGLanguages[numLanguages] >= 0; numLanguages++)
       ;
   originalNumLanguages = numLanguages;
@@ -2779,6 +2781,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
 
 cMenuSetupDVB::cMenuSetupDVB(void)
 {
+  SetMenuCategory(mcSetupDvb);
   for (numAudioLanguages = 0; numAudioLanguages < I18nLanguages()->Size() && data.AudioLanguages[numAudioLanguages] >= 0; numAudioLanguages++)
       ;
   for (numSubtitleLanguages = 0; numSubtitleLanguages < I18nLanguages()->Size() && data.SubtitleLanguages[numSubtitleLanguages] >= 0; numSubtitleLanguages++)
@@ -2924,6 +2927,7 @@ class cMenuSetupLNB : public cMenuSetupBase {
 cMenuSetupLNB::cMenuSetupLNB(void)
 :satCableNumbers(MAXDEVICES)
 {
+  SetMenuCategory(mcSetupLnb);
   satCableNumbers.FromString(data.DeviceBondings);
   SetSection(tr("LNB"));
   Setup();
@@ -3025,6 +3029,7 @@ class cMenuSetupCAM : public cMenuSetupBase {
 
 cMenuSetupCAM::cMenuSetupCAM(void)
 {
+  SetMenuCategory(mcSetupCam);
   SetSection(tr("CAM"));
   SetCols(15);
   SetHasHotkeys();
@@ -3103,6 +3108,7 @@ class cMenuSetupRecord : public cMenuSetupBase {
 
 cMenuSetupRecord::cMenuSetupRecord(void)
 {
+  SetMenuCategory(mcSetupRecord);
   pauseKeyHandlingTexts[0] = tr("do not pause live video");
   pauseKeyHandlingTexts[1] = tr("confirm pause live video");
   pauseKeyHandlingTexts[2] = tr("pause live video");
@@ -3139,6 +3145,7 @@ class cMenuSetupReplay : public cMenuSetupBase {
 
 cMenuSetupReplay::cMenuSetupReplay(void)
 {
+  SetMenuCategory(mcSetupReplay);
   SetSection(tr("Replay"));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
@@ -3164,6 +3171,7 @@ class cMenuSetupMisc : public cMenuSetupBase {
 
 cMenuSetupMisc::cMenuSetupMisc(void)
 {
+  SetMenuCategory(mcSetupMisc);
   SetSection(tr("Miscellaneous"));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
@@ -3203,6 +3211,7 @@ class cMenuSetupPlugins : public cMenuSetupBase {
 
 cMenuSetupPlugins::cMenuSetupPlugins(void)
 {
+  SetMenuCategory(mcSetupPlugins);
   SetSection(tr("Plugins"));
   SetHasHotkeys();
   for (int i = 0; ; i++) {
diff --git a/menuitems.c b/menuitems.c
index 416c2beb0..63f75898e 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.14 2012/04/08 11:20:37 kls Exp $
+ * $Id: menuitems.c 2.15 2012/12/23 13:44:05 kls Exp $
  */
 
 #include "menuitems.h"
@@ -1152,6 +1152,7 @@ eOSState cMenuSetupPage::ProcessKey(eKeys Key)
 
 void cMenuSetupPage::SetPlugin(cPlugin *Plugin)
 {
+  SetMenuCategory(mcPluginSetup);
   plugin = Plugin;
   SetSection(cString::sprintf("%s '%s'", tr("Plugin"), plugin->Name()));
 }
diff --git a/newplugin b/newplugin
index 59a9435ce..a7bd5fcbf 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.8 2012/03/11 15:34:26 kls Exp $
+# $Id: newplugin 2.14 2012/12/23 10:05:22 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -65,48 +65,45 @@ $MAKEFILE = qq
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = $PLUGIN_NAME
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ print \$\$6 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc))
+LIBDIR = \$(DESTDIR)\$(call PKGCFG,libdir)
+LOCDIR = \$(DESTDIR)\$(call PKGCFG,locdir)
+#
 TMPDIR ?= /tmp
 
-### Make sure that necessary options are included:
-
-include \$(VDRDIR)/Make.global
-
-### Allow user defined options to overwrite defaults:
+### The compiler options:
 
--include \$(VDRDIR)/Make.config
+export CFLAGS   = \$(call PKGCFG,cflags)
+export CXXFLAGS = \$(call PKGCFG,cxxflags)
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+### The version number of VDR's plugin API:
 
-APIVERSION = \$(shell sed -ne '/define APIVERSION/s/^.*"\\(.*\\)".*\$\$/\\1/p' \$(VDRDIR)/config.h)
+APIVERSION = \$(call PKGCFG,apiversion)
 
 ### The name of the distribution archive:
 
 ARCHIVE = \$(PLUGIN)-\$(VERSION)
 PACKAGE = vdr-\$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-\$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I\$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -114,7 +111,7 @@ OBJS = \$(PLUGIN).o
 
 ### The main target:
 
-all: libvdr-\$(PLUGIN).so i18n
+all: \$(SOFILE) i18n
 
 ### Implicit rules:
 
@@ -133,33 +130,38 @@ DEPFILE = .dependencies
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = \$(VDRDIR)/locale
 I18Npo    = \$(wildcard \$(PODIR)/*.po)
-I18Nmsgs  = \$(addprefix \$(LOCALEDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
+I18Nmo    = \$(addsuffix .mo, \$(foreach file, \$(I18Npo), \$(basename \$(file))))
+I18Nmsgs  = \$(addprefix \$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
 I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ \$^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ `ls \$^`
 
 %.po: \$(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q \$\@ \$<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$<
 	\@touch \$\@
 
-\$(I18Nmsgs): \$(LOCALEDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
-	\@mkdir -p \$(dir \$@)
-	cp \$< \$\@
+\$(I18Nmsgs): \$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
+	install -D -m644 \$< \$\@
 
 .PHONY: i18n
-i18n: \$(I18Nmsgs) \$(I18Npot)
+i18n: \$(I18Nmo) \$(I18Npot)
+
+install-i18n: \$(I18Nmsgs)
 
 ### Targets:
 
-libvdr-\$(PLUGIN).so: \$(OBJS)
+\$(SOFILE): \$(OBJS)
 	\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
-	\@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
+
+install-lib: \$(SOFILE)
+	install -D \$^ \$(LIBDIR)/\$^.\$(APIVERSION)
+
+install: install-lib install-i18n
 
 dist: \$(I18Npo) clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
@@ -170,7 +172,8 @@ dist: \$(I18Npo) clean
 	\@echo Distribution package created as \$(PACKAGE).tgz
 
 clean:
-	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~ \$(PODIR)/*.mo \$(PODIR)/*.pot
+	\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot
+	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~
 };
 
 $MAIN = qq
@@ -349,4 +352,3 @@ sub CreateFile
   print FILE $Content;
   close(FILE);
 }
-
diff --git a/osd.c b/osd.c
index d82a27bc4..75f13f4be 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.32 2012/06/09 14:37:24 kls Exp $
+ * $Id: osd.c 2.33 2012/12/15 11:16:41 kls Exp $
  */
 
 #include "osd.h"
@@ -1683,9 +1683,7 @@ void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
 
 cBitmap *cOsd::GetBitmap(int Area)
 {
-  if (isTrueColor)
-     Area = 0; // returns the dummy bitmap
-  return Area < numBitmaps ? bitmaps[Area] : NULL;
+  return Area < numBitmaps ? (isTrueColor ? bitmaps[0] : bitmaps[Area]) : NULL;
 }
 
 cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)
diff --git a/po/ar.po b/po/ar.po
index 43b1c6594..946cc6639 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1418,6 +1418,3 @@ msgstr "القرص الصلب"
 
 msgid "free"
 msgstr "مساحة حرة"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ea4dc9d65..437542fd0 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1392,6 +1392,3 @@ msgstr "Disc"
 
 msgid "free"
 msgstr "lliure"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Error a l'accedir a la gravaci�!"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2facfbdd0..b0d5b7d16 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1391,6 +1391,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "volno"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Chyba při přístupu k nahrávkám!"
diff --git a/po/da_DK.po b/po/da_DK.po
index cbe950ff7..6ca6c86ab 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1389,6 +1389,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "fri"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Fejl ved l�sning af optagelse!"
diff --git a/po/de_DE.po b/po/de_DE.po
index 1177d9370..5476d9c75 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1389,6 +1389,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "frei"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Fehler beim Ansprechen der Aufzeichnung!"
diff --git a/po/el_GR.po b/po/el_GR.po
index 05f9e71d6..bf8933ec7 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1389,6 +1389,3 @@ msgstr "
 
 msgid "free"
 msgstr "���������"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "�������� ���� ���������� ��������!"
diff --git a/po/es_ES.po b/po/es_ES.po
index 9885f84d0..6a6f4e422 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1390,6 +1390,3 @@ msgstr "Disco"
 
 msgid "free"
 msgstr "libre"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "�Error al acceder a la grabaci�n!"
diff --git a/po/et_EE.po b/po/et_EE.po
index d9b0d77ba..1d342366b 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -23,7 +23,7 @@ msgid "Channel not available!"
 msgstr "Kanal ei ole kättesaadav!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Siirderežiimi start nurjus!"
+msgstr "Siirderežiimi start ebaõnnestus!"
 
 msgid "off"
 msgstr "väljas"
@@ -411,7 +411,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Start/Paus"
 
 msgid "Key$Play"
 msgstr "Start"
@@ -748,7 +748,7 @@ msgid "Recording is being edited - really delete?"
 msgstr "Salvestust on muudetud - kas kustutada?"
 
 msgid "Error while deleting recording!"
-msgstr "Salvestuse kustutamine nurjus!"
+msgstr "Salvestuse kustutamine ebaõnnestus!"
 
 msgid "Recording commands"
 msgstr "Salvestuse käsud"
@@ -850,16 +850,16 @@ msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Värviklahv 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Värviklahv 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Värviklahv 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Värviklahv 3"
 
 msgid "EPG"
 msgstr "EPG"
@@ -930,7 +930,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Esmane DVB seade"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standardivastavavus"
 
 msgid "Setup.DVB$Video format"
 msgstr "TV külgsuhe"
@@ -1018,7 +1018,7 @@ msgid "CAM is in use - really reset?"
 msgstr "CAM on kasutuses - taaskäivitada?"
 
 msgid "Can't reset CAM!"
-msgstr "CAM mooduli taaskäivitus nurjus!"
+msgstr "CAM mooduli taaskäivitus ebaõnnestus!"
 
 msgid "do not pause live video"
 msgstr "mitte peatada"
@@ -1078,16 +1078,16 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Kiirsalvestuse kestus (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "hetkesündmus"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maks. failisuurus (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Failide jupitamine"
+msgstr "Redigeeritud failide tükeldamine"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "Kustutada ajanihke salvestus"
+msgstr "Ajanihke salvestuse kustutamine"
 
 msgid "Replay"
 msgstr "Taasesitus"
@@ -1102,10 +1102,10 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Järelejäänud aja kuvamine"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Edenemiseriba kuvamise aeg (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Taasesituse peatamine markeri seadmisel"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Jätkamise ID"
@@ -1141,7 +1141,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalite ringkerimine"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Kanalinimed allikaga"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Hädaväljumine"
@@ -1220,10 +1220,10 @@ msgid "No editing marks defined!"
 msgstr "Redigeerimise markerid puuduvad!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Redigeerimise järjestus puudub!"
 
 msgid "Can't start editing process!"
-msgstr "Redigeerimise start nurjus!"
+msgstr "Redigeerimise start ebaõnnestus!"
 
 msgid "Editing process started"
 msgstr "Redigeerimine käivitatud"
@@ -1265,10 +1265,10 @@ msgid "Index file regeneration complete"
 msgstr "Indeksfaili regenereerimine lõpetatud"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Indeksfaili regenereerimine ebaõnnestus!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Väljalülitamine nurjus - '-s' parameeter puudub!"
+msgstr "Väljalülitamine ebaõnnestus - '-s' parameeter puudub!"
 
 msgid "Editing - shut down anyway?"
 msgstr "Redigeerimine aktiive - lülitada välja?"
@@ -1304,22 +1304,22 @@ msgid "Classic VDR"
 msgstr "Classic VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "KETAS"
 
 msgid "LOAD"
-msgstr ""
+msgstr "KOORMUS"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TAIMERID"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "SEADMED"
 
 msgid "LIVE"
-msgstr ""
+msgstr "LIVE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "ESITUS"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panels"
@@ -1372,7 +1372,7 @@ msgid "Switching primary DVB..."
 msgstr "Esmase DVB seadme ümberlülitus..."
 
 msgid "Editing process failed!"
-msgstr "Redigeerimine nurjus"
+msgstr "Redigeerimine ebaõnnestus!"
 
 msgid "Editing process finished"
 msgstr "Redigeerimine lõpetatud"
@@ -1389,6 +1389,3 @@ msgstr "Ketas"
 
 msgid "free"
 msgstr "vaba"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Salvestuse taasesitus nurjus!"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0dd0d59c5..9a9fa747c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1392,6 +1392,3 @@ msgstr "Levy"
 
 msgid "free"
 msgstr "vapaana"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Tallenteen toistaminen epäonnistui!"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 0ded14e55..55983d404 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1395,6 +1395,3 @@ msgstr "Disque"
 
 msgid "free"
 msgstr "restant"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Impossible d'acc�der � l'enregistrement"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index c7c657113..b7b2d4f49 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -1391,6 +1391,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "slobodno"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Gre�ka pri pristupanju snimke!"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 19aec4385..919d3b2d1 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1393,6 +1393,3 @@ msgstr "Lemez"
 
 msgid "free"
 msgstr "szabad"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Hiba a felv�tel hozz�f�r�s�n�l"
diff --git a/po/it_IT.po b/po/it_IT.po
index 6d0bd7c94..8df7150f4 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2012-12-07 14:59+0100\n"
-"PO-Revision-Date: 2012-06-06 22:50+0100\n"
+"PO-Revision-Date: 2012-12-22 19:00+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -418,7 +418,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Riproduci/Pausa"
 
 msgid "Key$Play"
 msgstr "Riproduci"
@@ -857,16 +857,16 @@ msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Tasto colore 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Tasto colore 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Tasto colore 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Tasto colore 3"
 
 msgid "EPG"
 msgstr "Guida programmi EPG"
@@ -1085,7 +1085,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Durata reg. immediata (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "evento attuale"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dim. massima file video (MB)"
@@ -1109,10 +1109,10 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Mostra tempo rimanente"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Mostra tempo elaborazione (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pausa riproduzione durante impostazione segni"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
@@ -1148,7 +1148,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Riavvolgimento canali"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Mostra nomi canali con la sorgente"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Uscita di emergenza"
@@ -1227,7 +1227,7 @@ msgid "No editing marks defined!"
 msgstr "Nessun marcatore di modifica definito!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nessuna sequenza di modifica definita!"
 
 msgid "Can't start editing process!"
 msgstr "Impossibile avviare il processo di modifica!"
@@ -1272,7 +1272,7 @@ msgid "Index file regeneration complete"
 msgstr "Rigenerazione file indice completata"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Rigenerazione file indice fallita!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Impossibile spegnere - parametro '-s' non assegnato!"
@@ -1396,6 +1396,3 @@ msgstr "Disco"
 
 msgid "free"
 msgstr "disponibili"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Errore accesso alla registrazione!"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index d2edb6eca..931900ffb 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1389,6 +1389,3 @@ msgstr "Diskas"
 
 msgid "free"
 msgstr "laisva"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Klaida atidarant įrašą!"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 8a6dc5859..b7570b66c 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -1390,6 +1390,3 @@ msgstr "Диск"
 
 msgid "free"
 msgstr "слободен"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Грешка при пристап до снимката!"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 958411c00..a7dbadf1a 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1393,6 +1393,3 @@ msgstr "Schijf"
 
 msgid "free"
 msgstr "vrij"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Fout bij lezen opname!"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 2aa373e0d..aeeb0bb41 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1390,6 +1390,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "ledig"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Feil under lesing av opptak!"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0e6f09818..c4e36d78e 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1390,6 +1390,3 @@ msgstr "Dysk"
 
 msgid "free"
 msgstr "wolnego"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Bl�d podczas dost�pu do nagrania!"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e1327692a..44f103598 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1390,6 +1390,3 @@ msgstr "Disco"
 
 msgid "free"
 msgstr "livre"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Erro a aceder �s grava��es!"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index d5d64210a..ffdb44c8b 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -1392,6 +1392,3 @@ msgstr "Disc"
 
 msgid "free"
 msgstr "liber"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Eroare la accesarea înregistrării"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 892cfe780..42bdcc92e 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1390,6 +1390,3 @@ msgstr "
 
 msgid "free"
 msgstr "��������"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "������ ������� � ������!"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 48d882b57..118747a6c 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1389,6 +1389,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "volne"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Chyba pri pr�stupe k nahr�vkam!"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 75514bce5..d3ef84c61 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -1390,6 +1390,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "prosto"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Napaka pri dostopu do posnetka!"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 511964797..0a73f121e 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -1416,6 +1416,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "slobodno"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Gre�ka prilikom pristupa snimanju!"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 067adf553..3c4964681 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1392,6 +1392,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "ledigt"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Inspelningen g�r inte att l�sa!"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 78177e750..8b83d5fbb 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1389,6 +1389,3 @@ msgstr "Disk"
 
 msgid "free"
 msgstr "bo�"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Kay�t okuma hatas�!"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index edc5a7c88..21ef7901b 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1389,6 +1389,3 @@ msgstr "Диск"
 
 msgid "free"
 msgstr "вільно"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "Помилка доступу до запису!"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 73e84fd41..a03396e14 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1392,6 +1392,3 @@ msgstr "硬盘已使用"
 
 msgid "free"
 msgstr "可录像时间"
-
-#~ msgid "Error while accessing recording!"
-#~ msgstr "存取录像错误！"
diff --git a/recording.c b/recording.c
index 87ca8efe5..ca50f4337 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.78 2012/12/06 09:35:13 kls Exp $
+ * $Id: recording.c 2.81 2012/12/23 15:11:28 kls Exp $
  */
 
 #include "recording.h"
@@ -1666,7 +1666,8 @@ void cIndexFileGenerator::Action(void)
 #define INDEXFILESUFFIX     "/index"
 
 // The maximum time to wait before giving up while catching up on an index file:
-#define MAXINDEXCATCHUP   8 // seconds
+#define MAXINDEXCATCHUP    8 // number of retries
+#define INDEXCATCHUPWAIT 100 // milliseconds
 
 struct tIndexPes {
   uint32_t offset;
@@ -1693,9 +1694,6 @@ struct tIndexTs {
 #define INDEXFILECHECKINTERVAL 500 // ms between checks for existence of the regenerated index file
 #define INDEXFILETESTINTERVAL   10 // ms between tests for the size of the index file in case of pausing live video
 
-cMutex cIndexFile::indexListMutex;
-cVector<const cIndexFile *> cIndexFile::indexList;
-
 cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, bool PauseLive)
 :resumeFile(FileName, IsPesRecording)
 {
@@ -1776,13 +1774,10 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
            LOG_ERROR_STR(*fileName);
         }
      }
-  if (Record)
-     AddToIndexList(this);
 }
 
 cIndexFile::~cIndexFile()
 {
-  RemoveFromIndexList(this);
   if (f >= 0)
      close(f);
   free(index);
@@ -1824,14 +1819,11 @@ bool cIndexFile::CatchUp(int Index)
   // returns true unless something really goes wrong, so that 'index' becomes NULL
   if (index && f >= 0) {
      cMutexLock MutexLock(&mutex);
-     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index > last); i++) {
+     // Note that CatchUp() is triggered even if Index is 'last' (and thus valid).
+     // This is done to make absolutely sure we don't miss any data at the very end.
+     for (int i = 0; i <= MAXINDEXCATCHUP && (Index < 0 || Index >= last); i++) {
          struct stat buf;
          if (fstat(f, &buf) == 0) {
-            if (!IsInIndexList(this)) {
-               close(f);
-               f = -1;
-               break;
-               }
             int newLast = int(buf.st_size / sizeof(tIndexTs) - 1);
             if (newLast > last) {
                int NewSize = size;
@@ -1869,9 +1861,9 @@ bool cIndexFile::CatchUp(int Index)
             }
          else
             LOG_ERROR_STR(*fileName);
-         if (Index <= last)
+         if (Index < last)
             break;
-         cCondWait::SleepMs(1000);
+         cCondWait::SleepMs(INDEXCATCHUPWAIT);
          }
      }
   return index != NULL;
@@ -1937,15 +1929,16 @@ int cIndexFile::GetNextIFrame(int Index, bool Forward, uint16_t *FileNumber, off
                *FileNumber = index[Index].number;
                *FileOffset = index[Index].offset;
                if (Length) {
-                  // all recordings end with a non-independent frame, so the following should be safe:
-                  uint16_t fn = index[Index + 1].number;
-                  off_t fo = index[Index + 1].offset;
-                  if (fn == *FileNumber)
-                     *Length = int(fo - *FileOffset);
-                  else {
-                     esyslog("ERROR: 'I' frame at end of file #%d", *FileNumber);
-                     *Length = -1;
+                  if (Index < last) {
+                     uint16_t fn = index[Index + 1].number;
+                     off_t fo = index[Index + 1].offset;
+                     if (fn == *FileNumber)
+                        *Length = int(fo - *FileOffset);
+                     else
+                        *Length = -1; // this means "everything up to EOF" (the buffer's Read function will act accordingly)
                      }
+                  else
+                     *Length = -1;
                   }
                return Index;
                }
@@ -2025,39 +2018,6 @@ int cIndexFile::GetLength(const char *FileName, bool IsPesRecording)
   return -1;
 }
 
-void cIndexFile::AddToIndexList(const cIndexFile *IndexFile)
-{
-  cMutexLock MutexLock(&indexListMutex);
-  for (int i = 0; i < indexList.Size(); i++) {
-      if (!indexList[i]) {
-         indexList[i] = IndexFile;
-         return;
-         }
-      }
-  indexList.Append(IndexFile);
-}
-
-void cIndexFile::RemoveFromIndexList(const cIndexFile *IndexFile)
-{
-  cMutexLock MutexLock(&indexListMutex);
-  for (int i = 0; i < indexList.Size(); i++) {
-      if (indexList[i] == IndexFile) {
-         indexList[i] = NULL;
-         return;
-         }
-      }
-}
-
-bool cIndexFile::IsInIndexList(const cIndexFile *IndexFile)
-{
-  cMutexLock MutexLock(&indexListMutex);
-  for (int i = 0; i < indexList.Size(); i++) {
-      if (indexList[i] && !strcmp(indexList[i]->fileName, IndexFile->fileName))
-         return true;
-      }
-  return false;
-}
-
 bool GenerateIndex(const char *FileName) 
 {
   if (DirectoryOk(FileName)) {
diff --git a/recording.h b/recording.h
index 9ae9b1ec4..f555024cf 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.40 2012/11/13 11:43:59 kls Exp $
+ * $Id: recording.h 2.41 2012/12/23 15:11:53 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -292,11 +292,6 @@ class cIndexFile {
   cResumeFile resumeFile;
   cIndexFileGenerator *indexFileGenerator;
   cMutex mutex;
-  static cMutex indexListMutex;
-  static cVector<const cIndexFile *> indexList;
-  static void AddToIndexList(const cIndexFile *IndexFile);
-  static void RemoveFromIndexList(const cIndexFile *IndexFile);
-  static bool IsInIndexList(const cIndexFile *IndexFile);
   void ConvertFromPes(tIndexTs *IndexTs, int Count);
   void ConvertToPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
diff --git a/skins.h b/skins.h
index 250612685..c9750b824 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 2.7 2012/12/07 17:18:44 kls Exp $
+ * $Id: skins.h 2.9 2012/12/21 11:09:13 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -73,7 +73,37 @@ class cSkinDisplayChannel : public cSkinDisplay {
   */
   };
 
-enum eMenuCategory { mcUndefined = -1, mcUnknown = 0, mcMain, mcSchedule, mcChannel, mcTimer, mcRecording, mcPlugin, mcSetup, mcCommand, mcEvent, mcText, mcFolder, mcCam };
+enum eMenuCategory {
+  mcUndefined = -1,
+  mcUnknown = 0,
+  mcMain,
+  mcSchedule,
+  mcScheduleNow,
+  mcScheduleNext,
+  mcChannel,
+  mcChannelEdit,
+  mcTimer,
+  mcTimerEdit,
+  mcRecording,
+  mcRecordingInfo,
+  mcPlugin,
+  mcPluginSetup,
+  mcSetup,
+  mcSetupOsd,
+  mcSetupEpg,
+  mcSetupDvb,
+  mcSetupLnb,
+  mcSetupCam,
+  mcSetupRecord,
+  mcSetupReplay,
+  mcSetupMisc,
+  mcSetupPlugins,
+  mcCommand,
+  mcEvent,
+  mcText,
+  mcFolder,
+  mcCam
+  };
 
 class cSkinDisplayMenu : public cSkinDisplay {
        ///< This class implements the general purpose menu display, which is
@@ -153,7 +183,7 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< this function will be first called for the old current item
        ///< with Current set to false, and then for the new current item
        ///< with Current set to true.
-  virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, int TimerMatch) { return false; }
+  virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) { return false; }
        ///< Sets the item at the given Index to Event. See SetItem() for more information.
        ///< If a derived skin class implements this function, it can display an Event item
        ///< in a more elaborate way than just a simple line of text.

From 873ab00a77bc947444804e5bd622bd80014978a2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 30 Dec 2012 12:52:00 +0100
Subject: [PATCH 221/307] Version 1.7.35 VDR developer version 1.7.35 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.35.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.34-1.7.35.diff

MD5 checksums:

3b9d0376325370afb464b6c5843591c7  vdr-1.7.35.tar.bz2
4b6fb681359325ad33a466503503e772  vdr-1.7.34-1.7.35.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Changed the type of the TimerMatch parameter in cSkinDisplayMenu::SetItemEvent() from
  'int' to 'eTimerEvent' (reported by Christoph Haubrich).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed cOsd::GetBitmap() to always return NULL if a non-exising area is requested.
- Added several missing "`ls $^`" in the calls to xgettext in plugin Makefiles and the
  "newplugin" script.
- Fixed setting the --package-name and --package-version options in the calls to
  xgettext in several plugin Makefiles.
- Added "-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" to the
  DEFINES in the Makefile (somehow got lost from Make.config.template in version 1.7.13).
- Removed some redundancy in the Makefile/Make.global/Make.config mechanism (suggested
  by Christopher Reimer). The file Make.global is no longer used, and plugin Makefiles
  don't include the file Make.config any more. Instead they now retrieve all necessary
  information through calls to pkg-config.
- The plugin Makefiles now have a separate 'install' target (suggested by Christopher
  Reimer). In order to still allow the normal building of VDR (with all plugins in its
  ./PLUGINS/src subdirectory, the plugin libraries in ./PLUGINS/lib and the i18n files in
  ./locale) the VDR Makefile checks the settings of LIBDIR and LOCDIR when building the
  plugins from within the VDR source directory. If these macros have their default values,
  then the 'install' targets of the plugins' Makefiles are called. Otherwise the 'all'
  targets are called and the plugins are merely built, and will have to be installed by a
  call to 'make install-plugins'. This now also allows a user to copy a plugin source to
  any directory, change into that directory and do 'make' and 'make install' to have the
  plugin installed to wherever the local installation of VDR expects them.
- Plugin Makefiles now use DESTDIR and the 'install' program (thanks to Christopher Reimer).
- Due to the changes to the plugin Makefiles, existing plugins will not build with this
  version of VDR any more. You can either use the new 'newplugin' script to generate a
  dummy plugin directory and use the Makefile from there (adapting it to your particular
  plugin), or apply the patch from
  ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.33-pluginmakefile.diff
  to your Makefile to make the necessary changes (see comments in that file for details).
- Added the new menu categories mcChannelEdit, mcTimerEdit, mcScheduleNow, mcScheduleNext,
  mcRecordingInfo, mcPluginSetup, mcSetupOsd, mcSetupEpg, mcSetupDvb, mcSetupLnb,
  mcSetupCam, mcSetupRecord, mcSetupReplay, mcSetupMisc and mcSetupPlugins.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed replay stuttering close to the end of an ongoing recording (reported by Andreas
  Regel).
- Fixed cIndexFile::GetNextIFrame() to properly handle the case where the very last frame
  is an I-frame (which normally shouldn't occur).
- Fixed replaying ongoing recordings from other VDR instances.
---
 CONTRIBUTORS                            |  10 ++
 HISTORY                                 |  34 ++++
 Make.config.template                    |  14 +-
 Make.global                             |  10 ++
 Makefile                                |  47 +++--
 PLUGINS/src/dvbhddevice/HISTORY         |   4 +
 PLUGINS/src/dvbhddevice/Makefile        |   7 +-
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   4 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c | 217 +++++++++++++++++++++++-
 PLUGINS/src/dvbsddevice/HISTORY         |   6 +-
 PLUGINS/src/dvbsddevice/Makefile        |   7 +-
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |   4 +-
 PLUGINS/src/epgtableid0/HISTORY         |   4 +
 PLUGINS/src/epgtableid0/Makefile        |   7 +-
 PLUGINS/src/epgtableid0/epgtableid0.c   |   4 +-
 PLUGINS/src/hello/HISTORY               |   4 +
 PLUGINS/src/hello/Makefile              |   7 +-
 PLUGINS/src/hello/hello.c               |   4 +-
 PLUGINS/src/osddemo/HISTORY             |   4 +
 PLUGINS/src/osddemo/Makefile            |   7 +-
 PLUGINS/src/osddemo/osddemo.c           |   4 +-
 PLUGINS/src/pictures/HISTORY            |   6 +-
 PLUGINS/src/pictures/Makefile           |   7 +-
 PLUGINS/src/pictures/pictures.c         |   4 +-
 PLUGINS/src/rcu/HISTORY                 |   4 +
 PLUGINS/src/rcu/Makefile                |   7 +-
 PLUGINS/src/rcu/rcu.c                   |   4 +-
 PLUGINS/src/servicedemo/HISTORY         |   4 +
 PLUGINS/src/servicedemo/Makefile        |  11 +-
 PLUGINS/src/servicedemo/svccli.c        |   4 +-
 PLUGINS/src/servicedemo/svcsvr.c        |   4 +-
 PLUGINS/src/skincurses/HISTORY          |   4 +
 PLUGINS/src/skincurses/Makefile         |   7 +-
 PLUGINS/src/skincurses/skincurses.c     |   4 +-
 PLUGINS/src/status/HISTORY              |   4 +
 PLUGINS/src/status/Makefile             |   7 +-
 PLUGINS/src/status/status.c             |   4 +-
 PLUGINS/src/svdrpdemo/HISTORY           |   4 +
 PLUGINS/src/svdrpdemo/Makefile          |   7 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c       |   4 +-
 config.h                                |  10 +-
 dvbdevice.c                             |   3 +-
 newplugin                               |   7 +-
 skinlcars.h                             |   2 +-
 44 files changed, 460 insertions(+), 71 deletions(-)
 create mode 100644 Make.global

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d21f8844e..21489ebab 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -691,6 +691,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for suggesting a better way of handling calls to realloc()
  for making the cutter set the 'broken link' flag for MPEG2 TS recordings
  for reporting a crash in a plugin using cDeviceHook when VDR ends
+ for reporting that "include" needs to be removed from the DVBDIR setting in the VDR
+ Makefile
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1324,6 +1326,8 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting that the Transfer Mode indicator bitmap in the LCARS skin may not
  fit with small font sizes
  for reporting a race condition when zapping in transfer mode
+ for requesting that plugin Makefiles should include a configuration file for compile
+ time parameters
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -1763,6 +1767,7 @@ Udo Richter <udo_richter@gmx.de>
  for suggesting to check cIoThrottle::Engaged() in cRemoveDeletedRecordingsThread::Action()
  for suggesting to shift editing marks that don't point to an I-frame towards the next I-frame
  when a recording is played
+ for requesting to keep using relative paths when building plugins locally
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2814,6 +2819,8 @@ Christopher Reimer <reimer.christopher@freenet.de>
  mechanism
  for suggesting to give the plugin Makefiles a separate 'install' target
  for making plugin Makefiles use DESTDIR and the 'install' program
+ for suggesting to make sure that plugins include the VDR header files from the actual
+ VDR source directory when doing "make plugins"
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -3022,3 +3029,6 @@ Stefan Blochberger <Stefan.Blochberger@gmx.de>
  recording is started
  for suggesting that floating point numbers presented to the user shall be displayed
  in the way defined by the current locale
+
+Cedric Dewijs <cedric.dewijs@telfort.nl>
+ for adding maximum SNR value for PCTV Systems PCTV 73ESE
diff --git a/HISTORY b/HISTORY
index 5b4513dd7..311fb6146 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7459,3 +7459,37 @@ Video Disk Recorder Revision History
 - Fixed cIndexFile::GetNextIFrame() to properly handle the case where the very last frame
   is an I-frame (which normally shouldn't occur).
 - Fixed replaying ongoing recordings from other VDR instances.
+
+2012-12-30: Version 1.7.35
+
+- Making sure that plugins include the VDR header files from the actual VDR source
+  directory when doing "make plugins" (suggested by Christoper Reimer).
+- Increased the version numbers of all plugins to reflect the recent Makefile changes.
+- Removed the lines
+  ifdef DVBDIR
+  INCLUDES += -I$(DVBDIR)/include
+  endif
+  from the file Make.config.template. If set, DVBDIR is now conveyed to plugins via
+  the CFLAGS.
+- Removed some redundancy from Make.config.template.
+- Changed "==" to "=" in the Makefile to make it POSIX style.
+- Added MANDIR to the vdr.pc file, so that plugins that need it can retrieve it via
+  MANDIR = $(DESTDIR)$(call PKGCFG,mandir).
+- Using relative paths again when building plugins locally (by request of Udo Richter).
+- Plugin Makefiles can now include a configuration file for compile time parameters
+  (requested by Reinhard Nissl). The actual name of this file can be defined in
+  Make.config (see "PLGCFG" in Make.config.template), and existing plugin Makefiles
+  that have compile time parameters should add the lines
+  PLGCFG = $(call PKGCFG,plgcfg)
+  -include $(PLGCFG)
+  accordingly (see the "newplugin" script for details).
+- Re-enabled building plugins that still use pre-version-1.7.34 Makefiles.
+  The file Make.global is present again to satisfy the "include" these Makefiles do,
+  but the file itself contains no settings. The VDR Makefile's "plugins" target
+  determines whether a particular plugin uses an old style Makefile and calls it
+  accordingly. Note that this only works when building plugins from within the VDR
+  source tree, using "make plugins" in the VDR source directory.
+- Removed "include" from the DVBDIR setting in the VDR Makefile (reported by Oliver
+  Endriss). You may need to adjust your DVBDIR setting in Make.config, in case you
+  use it.
+- Added maximum SNR value for PCTV Systems PCTV 73ESE (thanks to Cedric Dewijs).
diff --git a/Make.config.template b/Make.config.template
index a2cc6976e..4bf8db573 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.12 2012/12/22 10:54:47 kls Exp $
+# $Id: Make.config.template 2.14 2012/12/28 09:55:22 kls Exp $
 
 ### The C compiler and options:
 
@@ -17,12 +17,10 @@ CXX      = g++
 CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
 
 CFLAGS   += -fPIC
-CXXFLAGS += -fPIC
 
 # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
 ifdef M32
 CFLAGS   += -m32
-CXXFLAGS += -m32
 endif
 
 ### The directory environment:
@@ -32,6 +30,10 @@ PREFIX   = /usr/local
 MANDIR   = $(PREFIX)/man
 BINDIR   = $(PREFIX)/bin
 
+# Use this if you want to have a central place where you configure compile time
+# parameters for plugins:
+#PLGCFG = /etc/vdr/plugins.conf
+
 # By default locale and plugin files are built under the source directory:
 INCDIR       = $(CWD)/include
 LOCDIR       = $(CWD)/locale
@@ -57,9 +59,3 @@ LIRC_DEVICE = /var/run/lirc/lircd
 
 ## Define if you want vdr to not run as root
 #VDR_USER = vdr
-
-### You don't need to touch the following:
-
-ifdef DVBDIR
-INCLUDES += -I$(DVBDIR)/include
-endif
diff --git a/Make.global b/Make.global
new file mode 100644
index 000000000..e25940253
--- /dev/null
+++ b/Make.global
@@ -0,0 +1,10 @@
+#
+# Strictly necessary Makefile options for the Video Disk Recorder
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: Make.global 1.2 2012/12/29 12:03:01 kls Exp $
+
+# This is just a dummy file for plugins that use old style (version 1.7.33
+# or earlier) Makefiles.
diff --git a/Makefile b/Makefile
index de48e3761..f4d23412c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.36 2012/12/23 11:28:13 kls Exp $
+# $Id: Makefile 2.47 2012/12/30 11:18:18 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -17,14 +17,13 @@ CXX      ?= g++
 CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
 
 CFLAGS   += -fPIC
-CXXFLAGS += -fPIC
 
 CDEFINES  = -D_GNU_SOURCE
 CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 
 # Directories:
 
-CWD     := $(shell pwd)
+CWD      = .
 LSIDIR   = ./libsi
 DESTDIR ?=
 PREFIX  ?= /usr/local
@@ -49,6 +48,12 @@ PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --vari
 
 -include Make.config
 
+ifdef DVBDIR
+CFLAGS += -I$(DVBDIR)
+endif
+
+UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,)
+
 SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
@@ -127,15 +132,17 @@ $(SILIB):
 .PHONY: vdr.pc
 vdr.pc:
 	@echo "bindir=$(BINDIR)" > $@
+	@echo "mandir=$(MANDIR)" >> $@
 	@echo "configdir=$(CONFDIRDEF)" >> $@
 	@echo "videodir=$(VIDEODIR)" >> $@
 	@echo "cachedir=$(CACHEDIRDEF)" >> $@
 	@echo "resdir=$(RESDIRDEF)" >> $@
-	@echo "libdir=$(LIBDIR)" >> $@
-	@echo "locdir=$(LOCDIR)" >> $@
+	@echo "libdir=$(UP3)$(LIBDIR)" >> $@
+	@echo "locdir=$(UP3)$(LOCDIR)" >> $@
+	@echo "plgcfg=$(PLGCFG)" >> $@
 	@echo "apiversion=$(APIVERSION)" >> $@
-	@echo "cflags=$(CFLAGS) $(CDEFINES) -I$(INCDIR)" >> $@
-	@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(INCDIR)" >> $@
+	@echo "cflags=$(CFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@
+	@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@
 	@echo "" >> $@
 	@echo "Name: VDR" >> $@
 	@echo "Description: Video Disk Recorder" >> $@
@@ -192,11 +199,27 @@ plugins: include-dir vdr.pc
 	       noapiv="$$noapiv $$i";\
 	       continue;\
 	       fi;\
-            target=all;\
-	    if [ "$(LIBDIR)" == "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" == "$(CWD)/locale" ]; then\
-	       target=install;\
+	    newmakefile=`grep "PKGCFG" "$(PLUGINDIR)/src/$$i/Makefile"`;\
+	    if [ -z "$$newmakefile" ]; then\
+	       echo "********************************************************************";\
+	       echo "* Your plugin \"$$i\" is using an old Makefile!";\
+	       echo "* While this currently still works, it is strongly recommended";\
+	       echo "* that you convert that Makefile to the new style used since";\
+	       echo "* VDR version 1.7.35. Support for old style Makefiles may be dropped";\
+	       echo "* in future versions of VDR.";\
+	       echo "********************************************************************";\
+	       $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" CXXFLAGS="$(CXXFLAGS)" VDRDIR=$(UP3) LIBDIR=../../lib all || failed="$$failed $$i";\
+	    else\
+               target=all;\
+	       if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\
+	          target="install";\
+	          fi;\
+	       includes=;\
+	       if [ "$(INCDIR)" != "$(CWD)/include" ]; then\
+	          includes="INCLUDES=-I$(UP3)/include";\
+	          fi;\
+	       $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3) $$includes $$target || failed="$$failed $$i";\
 	       fi;\
-	    $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) $$target || failed="$$failed $$i";\
 	    done;\
 	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
@@ -239,7 +262,7 @@ install-doc:
 
 install-plugins: plugins
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
-	     $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\
+	     $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3) DESTDIR=$(DESTDIR) install;\
 	     done
 
 # Includes:
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 280e0ad75..2fffbea78 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -39,7 +39,11 @@ VDR Plugin 'dvbhddevice' Revision History
 - Allow to disable true color OSD support via setup option
 
 2011-04-xx: Version 0.0.4
+
 - locally define DVB OSD API extensions to support compiling with original DVB headers
 - Return correct pixel aspect ratio in GetOsdSize
 - Adapt Makefile to changes introduced in recent VDR versions
 
+2012-12-27: Version 0.0.5
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index ef6ef5160..67ff5e0d1 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.19 2012/12/23 10:01:00 kls Exp $
+# $Id: Makefile 1.20 2012/12/28 10:08:50 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -19,6 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
 LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -31,6 +32,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 20b676237..2218e3f6c 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.17 2012/06/07 09:33:18 kls Exp $
+ * $Id: dvbhddevice.c 1.18 2012/12/27 10:30:48 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +12,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "0.0.5";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 845fa6b08..e81d93b9d 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.46 2012/11/15 09:19:10 kls Exp $
+ * $Id: dvbhdffdevice.c 1.47 2012/12/29 13:23:22 kls Exp $
  */
 
 #include <stdint.h>
@@ -23,6 +23,10 @@
 #include "hdffosd.h"
 #include "setup.h"
 
+
+static uchar *YuvToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality);
+
+
 // --- cDvbHdFfDevice ----------------------------------------------------------
 
 int cDvbHdFfDevice::devHdffOffset = -1;
@@ -123,8 +127,112 @@ cSpuDecoder *cDvbHdFfDevice::GetSpuDecoder(void)
 
 uchar *cDvbHdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
 {
-  //TODO
-  return NULL;
+    #define BUFFER_SIZE  (sizeof(struct v4l2_pix_format) + 1920 * 1080 * 2)
+    int fd;
+    uint8_t * buffer;
+    uint8_t * result = NULL;
+
+    fd = DvbOpen(DEV_DVB_VIDEO, adapter, frontend, O_RDONLY);
+    if (fd < 0) {
+        esyslog("GrabImage: failed open DVB video device");
+        return NULL;
+    }
+
+    buffer = (uint8_t *) malloc(BUFFER_SIZE);
+    if (buffer)
+    {
+        int readBytes;
+
+        readBytes = read(fd, buffer, BUFFER_SIZE);
+        if (readBytes < (int) sizeof(struct v4l2_pix_format))
+            esyslog("GrabImage: failed reading from DVB video device");
+        else {
+            struct v4l2_pix_format * pixfmt;
+            int dataSize;
+
+            pixfmt = (struct v4l2_pix_format *) buffer;
+            dsyslog("GrabImage: Read image of size %d x %d",
+                    pixfmt->width, pixfmt->height);
+            dataSize = readBytes - sizeof(struct v4l2_pix_format);
+            if (dataSize < (int) pixfmt->sizeimage)
+                esyslog("GrabImage: image is not complete");
+            else {
+                if (Jpeg) {
+                    uint8_t * temp;
+                    temp = (uint8_t *) malloc(pixfmt->width * 3 * pixfmt->height);
+                    if (temp) {
+                        int numPixels = pixfmt->width * pixfmt->height;
+                        uint8_t * destData = temp;
+                        uint8_t * srcData = buffer + sizeof(struct v4l2_pix_format);
+                        while (numPixels > 0)
+                        {
+                            destData[0] = srcData[1];
+                            destData[1] = srcData[0];
+                            destData[2] = srcData[2];
+                            destData[3] = srcData[3];
+                            destData[4] = srcData[0];
+                            destData[5] = srcData[2];
+                            srcData += 4;
+                            destData += 6;
+                            numPixels -= 2;
+                        }
+                        if (Quality < 0)
+                            Quality = 100;
+                        result = YuvToJpeg(temp, pixfmt->width, pixfmt->height, Size, Quality);
+                        free(temp);
+                    }
+                }
+                else {
+                    // convert to PNM:
+                    char buf[32];
+                    snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n",
+                             pixfmt->width, pixfmt->height);
+                    int l = strlen(buf);
+                    Size = l + pixfmt->width * 3 * pixfmt->height;
+                    result = (uint8_t *) malloc(Size);
+                    if (result)
+                    {
+                        memcpy(result, buf, l);
+                        uint8_t * destData = result + l;
+                        uint8_t * srcData = buffer + sizeof(struct v4l2_pix_format);
+                        int numPixels = pixfmt->width * pixfmt->height;
+                        while (numPixels > 0)
+                        {
+                            int cb = srcData[0] - 128;
+                            int y1 = srcData[1];
+                            int cr = srcData[2] - 128;
+                            int y2 = srcData[3];
+                            int r;
+                            int g;
+                            int b;
+
+                            r = y1 + (int) (1.402f * cr);
+                            g = y1 - (int) (0.344f * cb + 0.714f * cr);
+                            b = y1 + (int) (1.772f * cb);
+                            destData[0] = r > 255 ? 255 : r < 0 ? 0 : r;
+                            destData[1] = g > 255 ? 255 : g < 0 ? 0 : g;
+                            destData[2] = b > 255 ? 255 : b < 0 ? 0 : b;
+                            r = y2 + (int) (1.402f * cr);
+                            g = y2 - (int) (0.344f * cb + 0.714f * cr);
+                            b = y2 + (int) (1.772f * cb);
+                            destData[3] = r > 255 ? 255 : r < 0 ? 0 : r;
+                            destData[4] = g > 255 ? 255 : g < 0 ? 0 : g;
+                            destData[5] = b > 255 ? 255 : b < 0 ? 0 : b;
+
+                            srcData += 4;
+                            destData += 6;
+                            numPixels -= 2;
+                        }
+                    }
+                }
+            }
+        }
+        free(buffer);
+    }
+
+    close(fd);
+
+    return result;
 }
 
 void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
@@ -423,7 +531,7 @@ bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
 
             mHdffCmdIf->CmdAvSetDecoderInput(0, 2);
             ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
-	}
+        }
     }
     playMode = PlayMode;
     return true;
@@ -840,3 +948,104 @@ bool cDvbHdFfDeviceProbe::Probe(int Adapter, int Frontend)
       }
   return false;
 }
+
+
+// --- YuvToJpeg -------------------------------------------------------------
+
+#include <jpeglib.h>
+
+#define JPEGCOMPRESSMEM 4000000
+
+struct tJpegCompressData {
+  int size;
+  uchar *mem;
+  };
+
+static void JpegCompressInitDestination(j_compress_ptr cinfo)
+{
+  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
+  if (jcd) {
+     cinfo->dest->free_in_buffer = jcd->size = JPEGCOMPRESSMEM;
+     cinfo->dest->next_output_byte = jcd->mem = MALLOC(uchar, jcd->size);
+     }
+}
+
+static boolean JpegCompressEmptyOutputBuffer(j_compress_ptr cinfo)
+{
+  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
+  if (jcd) {
+     int Used = jcd->size;
+     int NewSize = jcd->size + JPEGCOMPRESSMEM;
+     if (uchar *NewBuffer = (uchar *)realloc(jcd->mem, NewSize)) {
+        jcd->size = NewSize;
+        jcd->mem = NewBuffer;
+        }
+     else {
+        esyslog("ERROR: out of memory");
+        return false;
+        }
+     if (jcd->mem) {
+        cinfo->dest->next_output_byte = jcd->mem + Used;
+        cinfo->dest->free_in_buffer = jcd->size - Used;
+        return true;
+        }
+     }
+  return false;
+}
+
+static void JpegCompressTermDestination(j_compress_ptr cinfo)
+{
+  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
+  if (jcd) {
+     int Used = cinfo->dest->next_output_byte - jcd->mem;
+     if (Used < jcd->size) {
+        if (uchar *NewBuffer = (uchar *)realloc(jcd->mem, Used)) {
+           jcd->size = Used;
+           jcd->mem = NewBuffer;
+           }
+        else
+           esyslog("ERROR: out of memory");
+        }
+     }
+}
+
+static uchar *YuvToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality)
+{
+  if (Quality < 0)
+     Quality = 0;
+  else if (Quality > 100)
+     Quality = 100;
+
+  jpeg_destination_mgr jdm;
+
+  jdm.init_destination = JpegCompressInitDestination;
+  jdm.empty_output_buffer = JpegCompressEmptyOutputBuffer;
+  jdm.term_destination = JpegCompressTermDestination;
+
+  struct jpeg_compress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  cinfo.err = jpeg_std_error(&jerr);
+  jpeg_create_compress(&cinfo);
+  cinfo.dest = &jdm;
+  tJpegCompressData jcd;
+  cinfo.client_data = &jcd;
+  cinfo.image_width = Width;
+  cinfo.image_height = Height;
+  cinfo.input_components = 3;
+  cinfo.in_color_space = JCS_YCbCr;
+
+  jpeg_set_defaults(&cinfo);
+  jpeg_set_quality(&cinfo, Quality, true);
+  jpeg_start_compress(&cinfo, true);
+
+  int rs = Width * 3;
+  JSAMPROW rp[Height];
+  for (int k = 0; k < Height; k++)
+      rp[k] = &Mem[rs * k];
+  jpeg_write_scanlines(&cinfo, rp, Height);
+  jpeg_finish_compress(&cinfo);
+  jpeg_destroy_compress(&cinfo);
+
+  Size = jcd.size;
+  return jcd.mem;
+}
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 676dd6fc1..e183ab68b 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -24,8 +24,12 @@ VDR Plugin 'dvbsddevice' Revision History
 
 - Added option --outputonly to use the device only for output (thanks to Udo Richter).
 
-2012-03-07: Version 0.06
+2012-03-07: Version 0.0.6
 
 - Removed the call to EITScanner.UsesDevice(this) from dvbsddevice.c, because
   the code following these calls is only executed if LiveView is true, which is
   never the case when the EITScanner switches to a channel.
+
+2012-12-27: Version 0.0.7
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 445177443..a18a57ccf 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.15 2012/12/23 10:01:12 kls Exp $
+# $Id: Makefile 1.18 2012/12/29 10:28:45 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 7f1dde482..9db81eecd 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.6 2012/03/07 13:58:08 kls Exp $
+ * $Id: dvbsddevice.c 1.7 2012/12/27 10:32:23 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.6";
+static const char *VERSION        = "0.0.7";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index 7f732add0..03366bd56 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'epgtableid0' Revision History
 2012-03-10: Version 0.0.1
 
 - Initial revision.
+
+2012-12-27: Version 0.0.2
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 48b6b6ea9..91aae7f33 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2012/12/23 10:01:40 kls Exp $
+# $Id: Makefile 1.11 2012/12/29 10:28:58 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index d400b48cc..b2697c2b3 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 1.1 2012/03/10 15:10:43 kls Exp $
+ * $Id: epgtableid0.c 1.2 2012/12/27 10:32:52 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.1";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 3b30315ab..0bc457671 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -74,3 +74,7 @@ VDR Plugin 'hello' Revision History
 2010-02-28: Version 0.2.5
 
 - Added Lithuanian language translations (thanks to Valdemaras Pipiras).
+
+2012-12-27: Version 0.2.6
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 4cfcae831..b729122b4 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.15 2012/12/23 10:03:51 kls Exp $
+# $Id: Makefile 2.16 2012/12/28 10:09:20 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -19,6 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
 LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -31,6 +32,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index b7d141d73..5ec3b68b2 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.3 2010/02/28 12:49:28 kls Exp $
+ * $Id: hello.c 2.4 2012/12/27 10:35:04 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.5";
+static const char *VERSION        = "0.2.6";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 5db6bef24..7ffad1355 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -38,3 +38,7 @@ VDR Plugin 'osddemo' Revision History
 2012-03-13: Version 0.2.3
 
 - No longer using GetFont() (which is not thread safe) in the 'osddemo' plugin,
+
+2012-12-27: Version 0.2.4
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 3ef4fdc37..2d24485e4 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.11 2012/12/23 10:04:05 kls Exp $
+# $Id: Makefile 2.14 2012/12/29 10:29:04 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index d4da3d858..5184ed8fc 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.6 2012/03/13 15:17:33 kls Exp $
+ * $Id: osddemo.c 2.7 2012/12/27 10:36:21 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.3";
+static const char *VERSION        = "0.2.4";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 9426283b9..161d01d42 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -72,6 +72,10 @@ VDR Plugin 'pictures' Revision History
 
 - Removed an obsolete command line option.
 
-2012-04-2r8 Version 0.1.3
+2012-04-28: Version 0.1.3
 
 - Added cPictureControl::GetHeader().
+
+2012-12-27: Version 0.1.4
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 516cb8576..71377c9ce 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.15 2012/12/23 10:04:13 kls Exp $
+# $Id: Makefile 2.16 2012/12/28 10:09:29 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -19,6 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
 LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -31,6 +32,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 77df0d9ac..25e8be032 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.6 2012/04/28 11:58:42 kls Exp $
+ * $Id: pictures.c 2.7 2012/12/27 10:37:07 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.3";
+static const char *VERSION       = "0.1.4";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index 87b9413ea..4d03e49df 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -8,3 +8,7 @@ VDR Plugin 'rcu' Revision History
 2012-03-07: Version 0.0.2
 
 - Added new parameter LiveView to ChannelSwitch().
+
+2012-12-27: Version 0.0.3
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index d1b162ae2..db0818cc8 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.8 2012/12/23 10:04:15 kls Exp $
+# $Id: Makefile 1.11 2012/12/29 10:29:09 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index 79f461228..dab7bba16 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 1.2 2012/03/07 14:22:44 kls Exp $
+ * $Id: rcu.c 1.3 2012/12/27 10:37:31 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 76d95a5cd..4d368dfe9 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -9,3 +9,7 @@ VDR Plugin 'servicedemo' Revision History
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
+
+2012-12-27: Version 0.1.3
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index dfe05a40e..df4e372b2 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.9 2012/12/23 10:04:16 kls Exp $
+# $Id: Makefile 2.12 2012/12/29 10:29:15 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -19,6 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -31,6 +32,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = svcintf-$(VERSION)
@@ -72,10 +77,12 @@ libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
 
-install: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
+install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 	install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
 	install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION)
 
+install: install-lib
+
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index a426416e1..171b30c0a 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 2.0 2007/08/15 13:18:08 kls Exp $
+ * $Id: svccli.c 2.1 2012/12/27 10:37:57 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.2";
+static const char *VERSION        = "0.1.3";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 1eea1d577..f7b2548b6 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 2.0 2007/08/15 13:18:59 kls Exp $
+ * $Id: svcsvr.c 2.1 2012/12/27 10:38:19 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.2";
+static const char *VERSION        = "0.1.3";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index deb011b5c..c8117a35b 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -101,3 +101,7 @@ VDR Plugin 'skincurses' Revision History
 
 - Now displaying disk usage in the title of the main and "Recordings" menu,
   which is no longer done by the VDR core.
+
+2012-12-27: Version 0.1.13
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 63be8bb4a..6ba4d252a 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.15 2012/12/23 10:04:18 kls Exp $
+# $Id: Makefile 2.16 2012/12/28 10:09:36 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -19,6 +19,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
 LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -31,6 +32,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 587d0b971..5d4ee48a4 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.9 2012/04/23 08:53:13 kls Exp $
+ * $Id: skincurses.c 2.10 2012/12/27 10:38:43 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.12";
+static const char *VERSION        = "0.1.13";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 01af66a8f..80b6fd592 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -48,3 +48,7 @@ VDR Plugin 'status' Revision History
 2012-03-11: Version 0.3.1
 
 - Added new parameter LiveView to ChannelSwitch() (reported by Udo Richter).
+
+2012-12-27: Version 0.3.2
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index fc8ef9ebc..9635a5d0e 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.10 2012/12/23 10:04:43 kls Exp $
+# $Id: Makefile 2.13 2012/12/29 10:29:20 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index e27fa5d92..fdf1104cb 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 2.1 2012/03/11 14:48:37 kls Exp $
+ * $Id: status.c 2.2 2012/12/27 10:39:26 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.3.1";
+static const char *VERSION        = "0.3.2";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index 643346847..1771233bf 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -13,3 +13,7 @@ VDR Plugin 'svdrpdemo' Revision History
 
 - Moved the "all" target in the Makefile before the "Implicit rules",
   so that a plain "make" will compile everything.
+
+2012-12-27: Version 0.0.4
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 84eba02d0..d40e483c4 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.10 2012/12/23 10:04:47 kls Exp $
+# $Id: Makefile 2.13 2012/12/29 10:29:24 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
 
 APIVERSION = $(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index d618e260b..b47b9d4a2 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 2.0 2007/08/15 13:19:57 kls Exp $
+ * $Id: svdrpdemo.c 2.1 2012/12/27 10:39:48 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.h b/config.h
index 3624d9dc3..eced96e9d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.58 2012/12/11 09:59:16 kls Exp $
+ * $Id: config.h 2.59 2012/12/27 09:56:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.34"
-#define VDRVERSNUM   10734  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.35"
+#define VDRVERSNUM   10735  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.34"
-#define APIVERSNUM   10734  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.35"
+#define APIVERSNUM   10735  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbdevice.c b/dvbdevice.c
index 43e8544a3..8c57497b8 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.75 2012/12/03 14:07:01 kls Exp $
+ * $Id: dvbdevice.c 2.76 2012/12/30 11:27:39 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -632,6 +632,7 @@ int cDvbTuner::GetSignalQuality(void) const
      // special treatment to map their Snr value into the range 0...0xFFFF.
      switch (subsystemId) {
        case 0x13C21019: MaxSnr = 200; break; // TT-budget S2-3200 (DVB-S/DVB-S2)
+       case 0x20130245: MaxSnr = 255; break; // PCTV Systems PCTV 73ESE
        }
      int a = int(Snr) * 100 / MaxSnr;
      int b = 100 - (Unc * 10 + (Ber / 256) * 5);
diff --git a/newplugin b/newplugin
index a7bd5fcbf..df6f0bdb3 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.14 2012/12/23 10:05:22 kls Exp $
+# $Id: newplugin 2.15 2012/12/28 09:52:29 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -78,6 +78,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc))
 LIBDIR = \$(DESTDIR)\$(call PKGCFG,libdir)
 LOCDIR = \$(DESTDIR)\$(call PKGCFG,locdir)
+PLGCFG = \$(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -90,6 +91,10 @@ export CXXFLAGS = \$(call PKGCFG,cxxflags)
 
 APIVERSION = \$(call PKGCFG,apiversion)
 
+### Allow user defined options to overwrite defaults:
+
+-include \$(PLGCFG)
+
 ### The name of the distribution archive:
 
 ARCHIVE = \$(PLUGIN)-\$(VERSION)
diff --git a/skinlcars.h b/skinlcars.h
index 7306d12cd..71117f6f7 100644
--- a/skinlcars.h
+++ b/skinlcars.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.h 1.1 2012/04/15 13:17:35 kls Exp $
+ * $Id: skinlcars.h 2.1 2012/04/15 13:17:35 kls Exp $
  */
 
 #ifndef __SKINLCARS_H

From 889f7deeb4d75553f1d8acde2d2ba93775065a59 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 20 Jan 2013 14:52:00 +0100
Subject: [PATCH 222/307] Version 1.7.36 VDR developer version 1.7.36 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.36.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.35-1.7.36.diff

MD5 checksums:

e514f72a2a8c44f39e47b540d6ad325f  vdr-1.7.36.tar.bz2
9312a0d10bcda87d3c3c7e6dfbebcd05  vdr-1.7.35-1.7.36.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Added maximum SNR value for PCTV Systems nanoStick T2 290e (thanks to Antti
  Hartikainen).
- Added a remark indicating that the coordinates of Rect in a call to
  cDevice::CanScaleVideo() are in the range of the width and height returned by
  GetOsdSize() (suggested by Reinhard Nissl).
- Modified the Makefiles (thanks to Christopher Reimer).
  By default VDR is now built according to the FHS ("File system Hierarchy Standard"),
  and a plain "make" in the VDR source directory just builds everything, but doesn't
  copy it to ./PLUGINS/lib and ./locale any more. You can use a Make.config file
  (copied from Make.config.template) and set the parameter LCLBLD=1 to have everything
  built and installed under the VDR source tree (as was the default in previous
  versions). If you already have your own Make.config file, you may want to copy the
  new Make.config.template and adapt it to your needs. If you don't want VDR's data
  files to be spread around your system according to the FHS, you can set the
  parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as
  before.
- Fixed the example for cReceiver in PLUGINS.html.
- Fixed sorting recordings in case two folders have the same name, but one of them
  ends in an additional digit, as in "abc" and "abc2" (reported by Andreas Mair).
- Added "repeat" function when using the keyboard to control VDR (thanks to Reinhard
  Nissl).
- The SVDRP command LSTR now knows the additional parameter "path", which can be
  given to get the actual file name of a recording's directory (suggested by
  Stefan Stolz).
- Fixed multiple occurrences of the same directory in the recordings list in case there
  are directories that only differ in non-alphanumeric characters (reported by Andreas
  Mair).
- Absolute jumps when replaying a recording (via the Red key) are now only performed
  if an actual value has been entered (suggested by Ulf Kiener).
- The last replayed recording is now stored in setup.conf, which allows the blue
  "Resume" key in the main menu to work even after a restart of VDR.
- The SVDRP command NEWT no longer checks whether a timer with the given data already
  exists (suggested by Malte Forkel).
- Implemented scaling of SPU bitmaps (thanks to Johann Friedrichs).
- Improved cutting MPEG-2 video (thanks to Sören Moch).
- Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings
  in case the primary device can't handle the current live signal.
---
 CONTRIBUTORS                          |  21 ++
 HISTORY                               |  40 +++
 INSTALL                               |  29 +-
 Make.config.template                  |  66 ++--
 Makefile                              | 175 +++++-----
 PLUGINS.html                          |   5 +-
 PLUGINS/src/dvbhddevice/HISTORY       |   4 +
 PLUGINS/src/dvbhddevice/Makefile      |  16 +-
 PLUGINS/src/dvbhddevice/dvbhddevice.c |   4 +-
 PLUGINS/src/dvbsddevice/HISTORY       |   4 +
 PLUGINS/src/dvbsddevice/Makefile      |  10 +-
 PLUGINS/src/dvbsddevice/dvbsddevice.c |   4 +-
 PLUGINS/src/epgtableid0/HISTORY       |   4 +
 PLUGINS/src/epgtableid0/Makefile      |  10 +-
 PLUGINS/src/epgtableid0/epgtableid0.c |   4 +-
 PLUGINS/src/hello/HISTORY             |   4 +
 PLUGINS/src/hello/Makefile            |  16 +-
 PLUGINS/src/hello/hello.c             |   4 +-
 PLUGINS/src/osddemo/HISTORY           |   4 +
 PLUGINS/src/osddemo/Makefile          |  10 +-
 PLUGINS/src/osddemo/osddemo.c         |   4 +-
 PLUGINS/src/pictures/HISTORY          |   4 +
 PLUGINS/src/pictures/Makefile         |  16 +-
 PLUGINS/src/pictures/pictures.c       |   4 +-
 PLUGINS/src/rcu/HISTORY               |   4 +
 PLUGINS/src/rcu/Makefile              |  10 +-
 PLUGINS/src/rcu/rcu.c                 |   4 +-
 PLUGINS/src/servicedemo/HISTORY       |   4 +
 PLUGINS/src/servicedemo/Makefile      |  12 +-
 PLUGINS/src/servicedemo/svccli.c      |   4 +-
 PLUGINS/src/servicedemo/svcsvr.c      |   4 +-
 PLUGINS/src/skincurses/HISTORY        |   4 +
 PLUGINS/src/skincurses/Makefile       |  16 +-
 PLUGINS/src/skincurses/skincurses.c   |   4 +-
 PLUGINS/src/status/HISTORY            |   4 +
 PLUGINS/src/status/Makefile           |  10 +-
 PLUGINS/src/status/status.c           |   4 +-
 PLUGINS/src/svdrpdemo/HISTORY         |   4 +
 PLUGINS/src/svdrpdemo/Makefile        |  10 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c     |   4 +-
 config.c                              |   5 +-
 config.h                              |  10 +-
 cutter.c                              | 463 ++++++++++++++------------
 device.h                              |   4 +-
 dvbdevice.c                           |   5 +-
 dvbspu.c                              | 104 ++++--
 dvbspu.h                              |   7 +-
 menu.c                                |  30 +-
 newplugin                             |  16 +-
 recording.c                           |  10 +-
 remote.c                              |  15 +-
 remux.h                               |   4 +-
 svdrp.c                               |  64 ++--
 transfer.c                            |  20 +-
 transfer.h                            |   5 +-
 55 files changed, 816 insertions(+), 510 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 21489ebab..39bc0d38b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1004,6 +1004,10 @@ Andreas Mair <amair.sob@googlemail.com>
  for fixing initializing the timer's flags in the cTimer copy constructor
  for reporting a crash in case CutRecording() is called from a plugin
  for fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
+ for reporting a bug in sorting recordings in case two folders have the same name,
+ but one of them ends in an additional digit, as in "abc" and "abc2"
+ for reporting multiple occurrences of the same directory in the recordings list ini
+ case there are directories that only differ in non-alphanumeric characters
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1328,6 +1332,10 @@ Reinhard Nissl <rnissl@gmx.de>
  for reporting a race condition when zapping in transfer mode
  for requesting that plugin Makefiles should include a configuration file for compile
  time parameters
+ for suggesting to add a remark indicating that the coordinates of Rect in a call to
+ cDevice::CanScaleVideo() are in the range of the width and height returned by
+ GetOsdSize()
+ for adding "repeat" function when using the keyboard to control VDR
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -2440,6 +2448,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
 
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
+ for adding maximum SNR value for PCTV Systems nanoStick T2 290e
 
 Bernd Melcher <bernd@bernd-melcher.de>
  for reporting a problem with the 'servicedemo' plugin having no PLUGIN macro
@@ -2500,6 +2509,8 @@ Ulf Kiener <webmaster@ulf-kiener.de>
  for reporting a problem with audio track descriptions in the DVD plugin after a
  replay has been stopped
  for suggesting to add user defined key kUser0
+ for suggesting to perform absolute jumps when replaying a recording (via the Red key)
+ only if an actual value has been entered
 
 J�rg Wendel <vdr-ml@jwendel.de>
  for reporting that cPlugin::Active() was called too often
@@ -2701,6 +2712,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for some fixes to dvbspu.[hc]
  for fixing a busy loop when moving editing marks
  for making cPalette::ClosestColor() treat fully transparent colors as "equal"
+ for implementing scaling of SPU bitmaps
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -3012,6 +3024,7 @@ S
  for dropped B-frames
  for simplifying calculating the PTS offset in cPtsFixer::Fix() and fixing the overflow
  handling of PCR values
+ for improving cutting MPEG-2 video
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
@@ -3032,3 +3045,11 @@ Stefan Blochberger <Stefan.Blochberger@gmx.de>
 
 Cedric Dewijs <cedric.dewijs@telfort.nl>
  for adding maximum SNR value for PCTV Systems PCTV 73ESE
+
+Stefan Stolz <st.stolz@gmail.com>
+ for suggesting to make the SVDRP command LSTR optionally list the actual file name of
+ a recording's directory
+
+Malte Forkel <malte.forkel@berlin.de>
+ for suggesting to make the SVDRP command NEWT no longer check whether a timer with the
+ given data already exists
diff --git a/HISTORY b/HISTORY
index 311fb6146..11cad93ec 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7493,3 +7493,43 @@ Video Disk Recorder Revision History
   Endriss). You may need to adjust your DVBDIR setting in Make.config, in case you
   use it.
 - Added maximum SNR value for PCTV Systems PCTV 73ESE (thanks to Cedric Dewijs).
+
+2013-01-20: Version 1.7.36
+
+- Added maximum SNR value for PCTV Systems nanoStick T2 290e (thanks to Antti
+  Hartikainen).
+- Added a remark indicating that the coordinates of Rect in a call to
+  cDevice::CanScaleVideo() are in the range of the width and height returned by
+  GetOsdSize() (suggested by Reinhard Nissl).
+- Modified the Makefiles (thanks to Christopher Reimer).
+  By default VDR is now built according to the FHS ("File system Hierarchy Standard"),
+  and a plain "make" in the VDR source directory just builds everything, but doesn't
+  copy it to ./PLUGINS/lib and ./locale any more. You can use a Make.config file
+  (copied from Make.config.template) and set the parameter LCLBLD=1 to have everything
+  built and installed under the VDR source tree (as was the default in previous
+  versions). If you already have your own Make.config file, you may want to copy the
+  new Make.config.template and adapt it to your needs. If you don't want VDR's data
+  files to be spread around your system according to the FHS, you can set the
+  parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as
+  before.
+- Fixed the example for cReceiver in PLUGINS.html.
+- Fixed sorting recordings in case two folders have the same name, but one of them
+  ends in an additional digit, as in "abc" and "abc2" (reported by Andreas Mair).
+- Added "repeat" function when using the keyboard to control VDR (thanks to Reinhard
+  Nissl).
+- The SVDRP command LSTR now knows the additional parameter "path", which can be
+  given to get the actual file name of a recording's directory (suggested by
+  Stefan Stolz).
+- Fixed multiple occurrences of the same directory in the recordings list in case there
+  are directories that only differ in non-alphanumeric characters (reported by Andreas
+  Mair).
+- Absolute jumps when replaying a recording (via the Red key) are now only performed
+  if an actual value has been entered (suggested by Ulf Kiener).
+- The last replayed recording is now stored in setup.conf, which allows the blue
+  "Resume" key in the main menu to work even after a restart of VDR.
+- The SVDRP command NEWT no longer checks whether a timer with the given data already
+  exists (suggested by Malte Forkel).
+- Implemented scaling of SPU bitmaps (thanks to Johann Friedrichs).
+- Improved cutting MPEG-2 video (thanks to S�ren Moch).
+- Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings
+  in case the primary device can't handle the current live signal.
diff --git a/INSTALL b/INSTALL
index 1767451f0..7654c2a97 100644
--- a/INSTALL
+++ b/INSTALL
@@ -311,7 +311,7 @@ This program must be given to VDR with the '-a' option, as in
 The video data directory:
 -------------------------
 
-All recordings are written into directories below "/video". Please
+All recordings are written into directories below "/srv/vdr/video". Please
 make sure this directory exists, and that the user who runs the 'vdr'
 program has read and write access to that directory.
 If you prefer a different location for your video files, you can use
@@ -331,12 +331,12 @@ same basic name and must end with a numeric part, which starts at 0 for
 the main directory and has increasing values for the rest of the
 directories. For example
 
-   /video0
-   /video1
-   /video2
+   /srv/vdr/video0
+   /srv/vdr/video1
+   /srv/vdr/video2
 
 would be a setup with three directories. You can use more than one
-numeric digit, and the directories need not be directly under '/':
+numeric digit:
 
    /mnt/MyVideos/vdr.00
    /mnt/MyVideos/vdr.01
@@ -351,7 +351,7 @@ with the name of the basic directory when running 'vdr':
 
    vdr -v /video0
 
-Note that you should not copy any non-VDR files into the /videoX directories,
+Note that you should not copy any non-VDR files into the video directory,
 since this might cause a lot of unnecessary disk access when VDR cleans up those
 directories and there is a large number of files and/or subdirectories in
 there. If you have a large disk that you want to use for VDR's video data as
@@ -375,9 +375,11 @@ Configuration files:
 
 There are several configuration files that hold information about
 channels, remote control keys, timers etc. By default these files are
-assumed to be located in the video directory, but a different directory
-can be used with the '-c' option. Plugins assume their configuration files
-in a subdirectory called "plugins" of this directory.
+spread around the system according to the FHS ("File system Hierarchy Standard").
+If you prefer to have VDR built to run locally under the VDR source tree,
+you can copy the file Make.config.template to Make.config and set the parameter
+LCLBLD=1. If you also want to have all data files under one single directory,
+set ONEDIR=1 in Make.config.
 
 For starters just copy all *.conf files from the VDR directory into your
 video directory.
@@ -396,15 +398,6 @@ As a starting point you can copy the 'channels.conf' file that comes with the
 VDR archive into your video directory (or into your config directory,
 respectively, in case you have redirected it with the -c option).
 
-If you prefer to have your system set up according to the FHS
-("File system Hierarchy Standard") and thus have your files spread
-all over the place ;-), you can do this by copying the file Make.config.template
-to Make.config in the VDR source directory, and activating the line
-
-#USEFHS = 1
-
-in that file.
-
 Setting up DiSEqC:
 ------------------
 
diff --git a/Make.config.template b/Make.config.template
index 4bf8db573..f37f17f0f 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.14 2012/12/28 09:55:22 kls Exp $
+# $Id: Make.config.template 2.16 2013/01/12 13:50:17 kls Exp $
 
 ### The C compiler and options:
 
@@ -14,48 +14,64 @@ CC       = gcc
 CFLAGS   = -g -O3 -Wall
 
 CXX      = g++
-CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
-
-CFLAGS   += -fPIC
+CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
 ifdef M32
 CFLAGS   += -m32
+CXXFLAGS += -m32
 endif
 
 ### The directory environment:
 
-PREFIX   = /usr/local
-#DVBDIR   = /usr/src/v4l-dvb/linux
-MANDIR   = $(PREFIX)/man
-BINDIR   = $(PREFIX)/bin
+# Default directories (adjust as necessary or desired):
 
-# Use this if you want to have a central place where you configure compile time
-# parameters for plugins:
-#PLGCFG = /etc/vdr/plugins.conf
+#PREFIX    = /usr/local
+#BINDIR    = $(PREFIX)/bin
+#INCDIR    = $(PREFIX)/include
+#LIBDIR    = $(PREFIX)/lib/vdr
+#LOCDIR    = $(PREFIX)/share/locale
+#MANDIR    = $(PREFIX)/share/man
+#PCDIR     = $(PREFIX)/lib/pkgconfig
+#RESDIR    = $(PREFIX)/share/vdr
 
-# By default locale and plugin files are built under the source directory:
-INCDIR       = $(CWD)/include
+#VIDEODIR  = /srv/vdr/video
+#CONFDIR   = /var/lib/vdr
+#CACHEDIR  = /var/cache/vdr
+
+# Overrides for preset/legacy configurations:
+
+# Use 'make LCLBLD=1' to build locale and plugin files under the source directory:
+ifdef LCLBLD
 LOCDIR       = $(CWD)/locale
 PLUGINDIR    = $(CWD)/PLUGINS
+ifndef PLUGIN # don't overwrite for plugins with old makefiles
 LIBDIR       = $(PLUGINDIR)/lib
-# By default VDR requires only one single directory to operate:
+endif
+HDRDIR       = $(CWD)/include
+endif
+
+# Use 'make ONEDIR=1' to have all data in one single directory:
+ifdef ONEDIR
 VIDEODIR     = /video
-# Activate the following line to build VDR according to the FHS ("File system Hierarchy Standard"):
-#USEFHS = 1
-ifdef USEFHS
-VIDEODIR     = /srv/vdr/video
-CONFDIR      = /var/lib/vdr
-CACHEDIR     = /var/cache/vdr
-RESDIR       = $(PREFIX)/share/vdr
-INCDIR       = $(PREFIX)/include
-LOCDIR       = $(PREFIX)/share/locale
-LIBDIR       = $(PREFIX)/lib/vdr
+CACHEDIR     = $(VIDEODIR)
+CONFDIR      = $(VIDEODIR)
+RESDIR       = $(VIDEODIR)
 endif
 
+# Use this if you want to have a central place where you configure compile time
+# parameters for plugins:
+#PLGCFG = $(CONFDIR)/plugins.conf
+
 ### The remote control:
 
 LIRC_DEVICE = /var/run/lirc/lircd
 
-## Define if you want vdr to not run as root
+### Define if you want vdr to not run as root:
 #VDR_USER = vdr
+
+### Fallback for plugins with old makefiles:
+ifdef PLUGIN
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+endif
diff --git a/Makefile b/Makefile
index f4d23412c..2a5a9b2d0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.47 2012/12/30 11:18:18 kls Exp $
+# $Id: Makefile 2.49 2013/01/12 13:45:01 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -14,45 +14,55 @@ CC       ?= gcc
 CFLAGS   ?= -g -O3 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
-
-CFLAGS   += -fPIC
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 CDEFINES  = -D_GNU_SOURCE
 CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 
+LIBS      = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
+INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
+
 # Directories:
 
-CWD      = .
-LSIDIR   = ./libsi
-DESTDIR ?=
-PREFIX  ?= /usr/local
-MANDIR  ?= $(PREFIX)/share/man
-BINDIR  ?= $(PREFIX)/bin
-INCDIR  ?= $(CWD)/include
-LOCDIR  ?= $(CWD)/locale
-LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
-INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
+CWD       ?= $(shell pwd)
+LSIDIR    ?= $(CWD)/libsi
+PLUGINDIR ?= $(CWD)/PLUGINS
 
-PLUGINDIR= $(CWD)/PLUGINS
-LIBDIR   = $(PLUGINDIR)/lib
+DESTDIR   ?=
+VIDEODIR  ?= /srv/vdr/video
+CONFDIR   ?= /var/lib/vdr
+CACHEDIR  ?= /var/cache/vdr
 
-# By default VDR requires only one single directory to operate:
-VIDEODIR     = /video
-# See Make.config.template if you want to build VDR according to the FHS ("File system Hierarchy Standard")
+PREFIX    ?= /usr/local
+BINDIR    ?= $(PREFIX)/bin
+INCDIR    ?= $(PREFIX)/include
+LIBDIR    ?= $(PREFIX)/lib/vdr
+LOCDIR    ?= $(PREFIX)/share/locale
+MANDIR    ?= $(PREFIX)/share/man
+PCDIR     ?= $(PREFIX)/lib/pkgconfig
+RESDIR    ?= $(PREFIX)/share/vdr
 
-DOXYGEN ?= /usr/bin/doxygen
-DOXYFILE = Doxyfile
+# Source documentation
 
-PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
+DOXYGEN  ?= /usr/bin/doxygen
+DOXYFILE  = Doxyfile
+
+# User configuration
 
 -include Make.config
 
+# Mandatory compiler flags:
+
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+
+# Common include files:
+
 ifdef DVBDIR
-CFLAGS += -I$(DVBDIR)
+CINCLUDES += -I$(DVBDIR)
 endif
 
-UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,)
+# Object files
 
 SILIB    = $(LSIDIR)/libsi.a
 
@@ -63,8 +73,12 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
        skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
 
-DEFINES += $(CDEFINES)
+DEFINES  += $(CDEFINES)
+INCLUDES += $(CINCLUDES)
 
+ifdef HDRDIR
+HDRDIR   := -I$(HDRDIR)
+endif
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
 endif
@@ -90,12 +104,6 @@ DEFINES += -DRESDIR=\"$(RESDIR)\"
 DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
 DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 
-# Default values for directories:
-
-CONFDIRDEF  = $(firstword $(CONFDIR)  $(VIDEODIR))
-CACHEDIRDEF = $(firstword $(CACHEDIR) $(VIDEODIR))
-RESDIRDEF   = $(firstword $(RESDIR)   $(CONFDIRDEF))
-
 # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
@@ -106,7 +114,7 @@ all: vdr i18n plugins
 # Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 # Dependencies:
 
@@ -133,16 +141,16 @@ $(SILIB):
 vdr.pc:
 	@echo "bindir=$(BINDIR)" > $@
 	@echo "mandir=$(MANDIR)" >> $@
-	@echo "configdir=$(CONFDIRDEF)" >> $@
+	@echo "configdir=$(CONFDIR)" >> $@
 	@echo "videodir=$(VIDEODIR)" >> $@
-	@echo "cachedir=$(CACHEDIRDEF)" >> $@
-	@echo "resdir=$(RESDIRDEF)" >> $@
-	@echo "libdir=$(UP3)$(LIBDIR)" >> $@
-	@echo "locdir=$(UP3)$(LOCDIR)" >> $@
+	@echo "cachedir=$(CACHEDIR)" >> $@
+	@echo "resdir=$(RESDIR)" >> $@
+	@echo "libdir=$(LIBDIR)" >> $@
+	@echo "locdir=$(LOCDIR)" >> $@
 	@echo "plgcfg=$(PLGCFG)" >> $@
 	@echo "apiversion=$(APIVERSION)" >> $@
-	@echo "cflags=$(CFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@
-	@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@
+	@echo "cflags=$(CFLAGS) $(CDEFINES) $(CINCLUDES) $(HDRDIR)" >> $@
+	@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) $(CINCLUDES) $(HDRDIR)" >> $@
 	@echo "" >> $@
 	@echo "Name: VDR" >> $@
 	@echo "Description: Video Disk Recorder" >> $@
@@ -155,6 +163,7 @@ vdr.pc:
 PODIR     = po
 LOCALEDIR = locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
 I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/vdr.pot
 
@@ -169,15 +178,14 @@ $(I18Npot): $(wildcard *.c)
 	@touch $@
 
 $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmsgs)
 
 install-i18n:
 	@mkdir -p $(DESTDIR)$(LOCDIR)
-	@(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
+	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
 
 # The 'include' directory (for plugins):
 
@@ -192,45 +200,54 @@ include-dir:
 plugins: include-dir vdr.pc
 	@failed="";\
 	noapiv="";\
+	oldmakefile="";\
 	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
-	    echo "*** Plugin $$i:";\
+	    echo; echo "*** Plugin $$i:";\
+	    # No APIVERSION: Skip\
 	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
 	       echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\
 	       noapiv="$$noapiv $$i";\
 	       continue;\
 	       fi;\
-	    newmakefile=`grep "PKGCFG" "$(PLUGINDIR)/src/$$i/Makefile"`;\
-	    if [ -z "$$newmakefile" ]; then\
-	       echo "********************************************************************";\
-	       echo "* Your plugin \"$$i\" is using an old Makefile!";\
-	       echo "* While this currently still works, it is strongly recommended";\
-	       echo "* that you convert that Makefile to the new style used since";\
-	       echo "* VDR version 1.7.35. Support for old style Makefiles may be dropped";\
-	       echo "* in future versions of VDR.";\
-	       echo "********************************************************************";\
-	       $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" CXXFLAGS="$(CXXFLAGS)" VDRDIR=$(UP3) LIBDIR=../../lib all || failed="$$failed $$i";\
-	    else\
-               target=all;\
-	       if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\
-	          target="install";\
-	          fi;\
-	       includes=;\
-	       if [ "$(INCDIR)" != "$(CWD)/include" ]; then\
-	          includes="INCLUDES=-I$(UP3)/include";\
+	    # Old Makefile\
+	    if ! grep -q "PKGCFG" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
+	       echo "WARNING: plugin $$i is using an old Makefile!";\
+	       oldmakefile="$$oldmakefile $$i";\
+	       $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" CFLAGS="$(CFLAGS) $(CDEFINES) $(CINCLUDES)" CXXFLAGS="$(CXXFLAGS) $(CDEFINES) $(CINCLUDES)" LIBDIR="$(PLUGINDIR)/lib" VDRDIR="$(CWD)" all || failed="$$failed $$i";\
+	       continue;\
+	       fi;\
+	    # New Makefile\
+	    INCLUDES="-I$(CWD)/include"\
+	    $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\
+	    if [ -n "$(LCLBLD)" ] ; then\
+	       (cd $(PLUGINDIR)/src/$$i; for l in libvdr-*.so; do install $$l $(LIBDIR)/$$l.$(APIVERSION); done);\
+	       if [ -d $(PLUGINDIR)/src/$$i/po ]; then\
+	          for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\
+	              install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\
+	              done;\
 	          fi;\
-	       $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3) $$includes $$target || failed="$$failed $$i";\
 	       fi;\
 	    done;\
+	# Conclusion\
 	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
+	if [ -n "$$oldmakefile" ] ; then\
+	   echo; echo "*** plugins with old Makefile:$$oldmakefile"; echo;\
+	   echo "**********************************************************************";\
+	   echo "*** While this currently still works, it is strongly recommended";\
+	   echo "*** that you convert old Makefiles to the new style used since";\
+	   echo "*** VDR version 1.7.36. Support for old style Makefiles may be dropped";\
+	   echo "*** in future versions of VDR.";\
+	   echo "**********************************************************************";\
+	   fi;\
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
 
 clean-plugins:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" clean; done
 	@-rm -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION)
 
-# Install the files:
+# Install the files (note that 'install-pc' must be first!):
 
-install: install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes install-pc
+install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
 
 # VDR binary:
 
@@ -242,13 +259,12 @@ install-bin: vdr
 
 install-dirs:
 	@mkdir -p $(DESTDIR)$(VIDEODIR)
-	@mkdir -p $(DESTDIR)$(CONFDIRDEF)
-	@mkdir -p $(DESTDIR)$(CACHEDIRDEF)
-	@mkdir -p $(DESTDIR)$(RESDIRDEF)
+	@mkdir -p $(DESTDIR)$(CONFDIR)
+	@mkdir -p $(DESTDIR)$(CACHEDIR)
+	@mkdir -p $(DESTDIR)$(RESDIR)
 
 install-conf:
-	@cp -n *.conf $(DESTDIR)$(CONFDIRDEF)
-
+	@cp -n *.conf $(DESTDIR)$(CONFDIR)
 
 # Documentation:
 
@@ -261,9 +277,14 @@ install-doc:
 # Plugins:
 
 install-plugins: plugins
-	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
-	     $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3) DESTDIR=$(DESTDIR) install;\
-	     done
+	@-for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
+	      $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\
+	      done
+	@if [ -d $(PLUGINDIR)/lib ] ; then\
+	    for i in `find $(PLUGINDIR)/lib -name 'lib*-*.so.$(APIVERSION)'`; do\
+	        install -D $$i $(DESTDIR)$(LIBDIR);\
+	        done;\
+	    fi
 
 # Includes:
 
@@ -274,10 +295,10 @@ install-includes: include-dir
 # pkg-config file:
 
 install-pc: vdr.pc
-	if [ -n "$(PCDIR)" ] ; then \
-	    mkdir -p $(DESTDIR)$(PCDIR) ; \
-	    cp vdr.pc $(DESTDIR)$(PCDIR) ; \
-	    fi
+	if [ -n "$(PCDIR)" ] ; then\
+	   mkdir -p $(DESTDIR)$(PCDIR) ;\
+	   cp vdr.pc $(DESTDIR)$(PCDIR) ;\
+	   fi
 
 # Source documentation:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 859ca705f..0c7d223ad 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1519,10 +1519,13 @@ <h1>Table Of Contents</h1>
   cMyReceiver(int Pid);
   };
 
+<modified>
 cMyReceiver::cMyReceiver(int Pid)
-:cReceiver(tChannelID(), -1, Pid)
+:cReceiver(NULL, -1)
 {
+  AddPid(Pid);
 }
+</modified>
 
 cMyReceiver::~cMyReceiver()
 {
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 2fffbea78..23320197b 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -47,3 +47,7 @@ VDR Plugin 'dvbhddevice' Revision History
 2012-12-27: Version 0.0.5
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.0.6
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 67ff5e0d1..a24a55ae8 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.20 2012/12/28 10:08:50 kls Exp $
+# $Id: Makefile 1.22 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
-LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -62,14 +62,14 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(DEPFILE): Makefile
 PODIR     = po
 I18Npo    = $(wildcard $(PODIR)/*.po)
 I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
@@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c)
 	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	install -D -m644 $< $@
 
 .PHONY: i18n
@@ -106,7 +106,7 @@ $(SOFILE): $(OBJS) libhdffcmd
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib install-i18n
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 2218e3f6c..faf6c5cb9 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.18 2012/12/27 10:30:48 kls Exp $
+ * $Id: dvbhddevice.c 1.19 2013/01/12 14:11:35 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +12,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index e183ab68b..5cca3ec29 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -33,3 +33,7 @@ VDR Plugin 'dvbsddevice' Revision History
 2012-12-27: Version 0.0.7
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.0.8
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index a18a57ccf..f7e73b2ce 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.18 2012/12/29 10:28:45 kls Exp $
+# $Id: Makefile 1.20 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -61,14 +61,14 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 9db81eecd..7f91d4049 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.7 2012/12/27 10:32:23 kls Exp $
+ * $Id: dvbsddevice.c 1.8 2013/01/12 14:12:07 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.0.8";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index 03366bd56..5712e2418 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -8,3 +8,7 @@ VDR Plugin 'epgtableid0' Revision History
 2012-12-27: Version 0.0.2
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.0.3
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 91aae7f33..6190e62e9 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2012/12/29 10:28:58 kls Exp $
+# $Id: Makefile 1.13 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -61,14 +61,14 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index b2697c2b3..951490936 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 1.2 2012/12/27 10:32:52 kls Exp $
+ * $Id: epgtableid0.c 1.3 2013/01/12 14:12:13 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 0bc457671..cb797184d 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -78,3 +78,7 @@ VDR Plugin 'hello' Revision History
 2012-12-27: Version 0.2.6
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.2.7
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index b729122b4..4bdd5c918 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.16 2012/12/28 10:09:20 kls Exp $
+# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
-LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -62,14 +62,14 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(DEPFILE): Makefile
 PODIR     = po
 I18Npo    = $(wildcard $(PODIR)/*.po)
 I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
@@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c)
 	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	install -D -m644 $< $@
 
 .PHONY: i18n
@@ -105,7 +105,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib install-i18n
 
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 5ec3b68b2..f7777bec4 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.4 2012/12/27 10:35:04 kls Exp $
+ * $Id: hello.c 2.5 2013/01/12 14:12:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.6";
+static const char *VERSION        = "0.2.7";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 7ffad1355..e8afa4b2e 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -42,3 +42,7 @@ VDR Plugin 'osddemo' Revision History
 2012-12-27: Version 0.2.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.2.5
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 2d24485e4..9b7e2c15d 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.14 2012/12/29 10:29:04 kls Exp $
+# $Id: Makefile 2.16 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -61,14 +61,14 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 5184ed8fc..2fbbb0756 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.7 2012/12/27 10:36:21 kls Exp $
+ * $Id: osddemo.c 2.8 2013/01/12 14:12:23 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.4";
+static const char *VERSION        = "0.2.5";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 161d01d42..46ccc7c07 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -79,3 +79,7 @@ VDR Plugin 'pictures' Revision History
 2012-12-27: Version 0.1.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.1.5
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 71377c9ce..3081e27d3 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.16 2012/12/28 10:09:29 kls Exp $
+# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
-LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -62,14 +62,14 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(DEPFILE): Makefile
 PODIR     = po
 I18Npo    = $(wildcard $(PODIR)/*.po)
 I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
@@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c)
 	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	install -D -m644 $< $@
 
 .PHONY: i18n
@@ -105,7 +105,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib install-i18n
 
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 25e8be032..c73e59812 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.7 2012/12/27 10:37:07 kls Exp $
+ * $Id: pictures.c 2.8 2013/01/12 14:12:42 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.4";
+static const char *VERSION       = "0.1.5";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index 4d03e49df..6d2d63e06 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -12,3 +12,7 @@ VDR Plugin 'rcu' Revision History
 2012-12-27: Version 0.0.3
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.0.4
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index db0818cc8..3dbecdd05 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2012/12/29 10:29:09 kls Exp $
+# $Id: Makefile 1.13 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -61,14 +61,14 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index dab7bba16..a1b4538dd 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 1.3 2012/12/27 10:37:31 kls Exp $
+ * $Id: rcu.c 1.4 2013/01/12 14:12:54 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.0.4";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 4d368dfe9..11c9c45c9 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -13,3 +13,7 @@ VDR Plugin 'servicedemo' Revision History
 2012-12-27: Version 0.1.3
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.1.4
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index df4e372b2..e5ba5f535 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.12 2012/12/29 10:29:15 kls Exp $
+# $Id: Makefile 2.14 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -58,14 +58,14 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,8 +78,8 @@ libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
 
 install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
-	install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
-	install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION)
+	install -D libvdr-$(PLUGIN1).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
+	install -D libvdr-$(PLUGIN2).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 171b30c0a..c74155cda 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 2.1 2012/12/27 10:37:57 kls Exp $
+ * $Id: svccli.c 2.2 2013/01/12 14:13:00 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.3";
+static const char *VERSION        = "0.1.4";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index f7b2548b6..ed2afff08 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 2.1 2012/12/27 10:38:19 kls Exp $
+ * $Id: svcsvr.c 2.2 2013/01/12 14:13:05 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.3";
+static const char *VERSION        = "0.1.4";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index c8117a35b..74a36dbe7 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -105,3 +105,7 @@ VDR Plugin 'skincurses' Revision History
 2012-12-27: Version 0.1.13
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.1.14
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 6ba4d252a..fa0ce41e0 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.16 2012/12/28 10:09:36 kls Exp $
+# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
-LOCDIR = $(DESTDIR)$(call PKGCFG,locdir)
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -62,14 +62,14 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(DEPFILE): Makefile
 PODIR     = po
 I18Npo    = $(wildcard $(PODIR)/*.po)
 I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
@@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c)
 	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 	install -D -m644 $< $@
 
 .PHONY: i18n
@@ -105,7 +105,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib install-i18n
 
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 5d4ee48a4..2a9f042d1 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.10 2012/12/27 10:38:43 kls Exp $
+ * $Id: skincurses.c 2.11 2013/01/12 14:13:12 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.13";
+static const char *VERSION        = "0.1.14";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 80b6fd592..4056762ce 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -52,3 +52,7 @@ VDR Plugin 'status' Revision History
 2012-12-27: Version 0.3.2
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.3.3
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 9635a5d0e..8f6e26f6e 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.13 2012/12/29 10:29:20 kls Exp $
+# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -61,14 +61,14 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index fdf1104cb..4f7b05184 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 2.2 2012/12/27 10:39:26 kls Exp $
+ * $Id: status.c 2.3 2013/01/12 14:13:17 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.3.2";
+static const char *VERSION        = "0.3.3";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index 1771233bf..bf69eecf4 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -17,3 +17,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2012-12-27: Version 0.0.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-12: Version 0.0.5
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index d40e483c4..2e391409e 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.13 2012/12/29 10:29:24 kls Exp $
+# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -61,14 +61,14 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -78,7 +78,7 @@ $(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install: install-lib
 
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index b47b9d4a2..1a0032ef3 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 2.1 2012/12/27 10:39:48 kls Exp $
+ * $Id: svdrpdemo.c 2.2 2013/01/12 14:13:28 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "0.0.5";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.c b/config.c
index af0fe3d55..8c7b9d1d6 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.31 2012/12/06 09:00:23 kls Exp $
+ * $Id: config.c 2.32 2013/01/17 14:50:51 kls Exp $
  */
 
 #include "config.h"
@@ -13,6 +13,7 @@
 #include "device.h"
 #include "i18n.h"
 #include "interface.h"
+#include "menu.h"
 #include "plugin.h"
 #include "recording.h"
 
@@ -672,6 +673,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "ChannelsWrap"))        ChannelsWrap       = atoi(Value);
   else if (!strcasecmp(Name, "ShowChannelNamesWithSource")) ShowChannelNamesWithSource = atoi(Value);
   else if (!strcasecmp(Name, "EmergencyExit"))       EmergencyExit      = atoi(Value);
+  else if (!strcasecmp(Name, "LastReplayed"))        cReplayControl::SetRecording(Value);
   else
      return false;
   return true;
@@ -777,6 +779,7 @@ bool cSetup::Save(void)
   Store("ChannelsWrap",       ChannelsWrap);
   Store("ShowChannelNamesWithSource", ShowChannelNamesWithSource);
   Store("EmergencyExit",      EmergencyExit);
+  Store("LastReplayed",       cReplayControl::LastReplayed());
 
   Sort();
 
diff --git a/config.h b/config.h
index eced96e9d..807850fbe 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.59 2012/12/27 09:56:56 kls Exp $
+ * $Id: config.h 2.60 2012/12/30 13:08:41 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.35"
-#define VDRVERSNUM   10735  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.36"
+#define VDRVERSNUM   10736  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.35"
-#define APIVERSNUM   10735  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.36"
+#define APIVERSNUM   10736  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 300eef434..8a6efc54c 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.21 2012/12/02 14:30:55 kls Exp $
+ * $Id: cutter.c 2.22 2013/01/20 12:04:07 kls Exp $
  */
 
 #include "cutter.h"
@@ -104,167 +104,121 @@ void cPacketStorage::Flush(int Pid, uchar *Data, int &Length, int MaxLength)
      buffers[Pid]->Flush(Data, Length, MaxLength);
 }
 
-// --- cDanglingPacketStripper -----------------------------------------------
+// --- cMpeg2Fixer --------------------------------------------------------
 
-class cDanglingPacketStripper {
+class cMpeg2Fixer : private cTsPayload {
 private:
-  bool processed[MAXPID];
-  cPatPmtParser patPmtParser;
+  bool FindHeader(uint32_t Code, const char *Header);
 public:
-  cDanglingPacketStripper(void);
-  bool Process(uchar *Data, int Length, int64_t FirstPts);
-       ///< Scans the frame given in Data and hides the payloads of any TS packets
-       ///< that either didn't start within this frame, or have a PTS that is
-       ///< before FirstPts. The TS packets in question are not physically removed
-       ///< from Data in order to keep any frame counts and PCR timestamps intact.
-       ///< Returns true if any dangling packets have been found.
+  cMpeg2Fixer(uchar *Data, int Length, int Vpid);
+  void SetBrokenLink(void);
+  void SetClosedGop(void);
+  int GetTref(void);
+  void AdjGopTime(int Offset, int FramesPerSecond);
+  void AdjTref(int TrefOffset);
   };
 
-cDanglingPacketStripper::cDanglingPacketStripper(void)
+cMpeg2Fixer::cMpeg2Fixer(uchar *Data, int Length, int Vpid)
 {
-  memset(processed, 0x00, sizeof(processed));
+  // Go to first video packet:
+  for (; Length > 0; Data += TS_SIZE, Length -= TS_SIZE) {
+      if (TsPid(Data) == Vpid) {
+         Setup(Data, Length, Vpid);
+         break;
+         }
+      }
 }
 
-bool cDanglingPacketStripper::Process(uchar *Data, int Length, int64_t FirstPts)
+bool cMpeg2Fixer::FindHeader(uint32_t Code, const char *Header)
 {
-  bool Found = false;
-  while (Length >= TS_SIZE && *Data == TS_SYNC_BYTE) {
-        int Pid = TsPid(Data);
-        if (Pid == PATPID)
-           patPmtParser.ParsePat(Data, TS_SIZE);
-        else if (patPmtParser.IsPmtPid(Pid))
-           patPmtParser.ParsePmt(Data, TS_SIZE);
-        else {
-           int64_t Pts = TsGetPts(Data, TS_SIZE);
-           if (Pts >= 0)
-              processed[Pid] = PtsDiff(FirstPts, Pts) >= 0; // Pts is at or after FirstPts
-           if (!processed[Pid]) {
-              TsHidePayload(Data);
-              Found = true;
-              }
-           }
-        Length -= TS_SIZE;
-        Data += TS_SIZE;
-        }
-  return Found;
+  Reset();
+  if (Find(Code))
+     return true;
+  esyslog("ERROR: %s header not found!", Header);
+  return false;
 }
 
-// --- cPtsFixer -------------------------------------------------------------
-
-class cPtsFixer {
-private:
-  int delta; // time between two frames
-  int64_t deltaDts; // the difference between two consecutive DTS values (may differ from 'delta' in case of multiple fields per frame)
-  int64_t lastPts; // the video PTS of the last frame (in display order)
-  int64_t lastDts; // the last video DTS value seen
-  int64_t offset; // offset to add to all timestamps
-  bool fixCounters; // controls fixing the TS continuity counters (only from the second CutIn up)
-  uchar counter[MAXPID]; // the TS continuity counter for each PID
-  cPatPmtParser patPmtParser;
-public:
-  cPtsFixer(void);
-  void Setup(double FramesPerSecond);
-  void Fix(uchar *Data, int Length, bool CutIn);
-  };
+void cMpeg2Fixer::SetBrokenLink(void)
+{
+  if (!FindHeader(0x000001B8, "GOP"))
+     return;
+  SkipBytes(3);
+  uchar b = GetByte();
+  if (!(b & 0x40)) { // GOP not closed
+     b |= 0x20;
+     SetByte(b, GetLastIndex());
+     }
+}
 
-cPtsFixer::cPtsFixer(void)
+void cMpeg2Fixer::SetClosedGop(void)
 {
-  delta = 0;
-  deltaDts = 0;
-  lastPts = -1;
-  lastDts = -1;
-  offset = -1;
-  fixCounters = false;
-  memset(counter, 0x00, sizeof(counter));
+  if (!FindHeader(0x000001B8, "GOP"))
+     return;
+  SkipBytes(3);
+  uchar b = GetByte();
+  b |= 0x40;
+  SetByte(b, GetLastIndex());
 }
 
-void cPtsFixer::Setup(double FramesPerSecond)
+int cMpeg2Fixer::GetTref(void)
 {
-  delta = int(round(PTSTICKS / FramesPerSecond));
+  if (!FindHeader(0x00000100, "picture"))
+     return 0;
+  int Tref = GetByte() << 2;
+  Tref |= GetByte() >> 6;
+  return Tref;
 }
 
-void cPtsFixer::Fix(uchar *Data, int Length, bool CutIn)
+void cMpeg2Fixer::AdjGopTime(int Offset, int FramesPerSecond)
 {
-  if (!patPmtParser.Vpid()) {
-     if (!patPmtParser.ParsePatPmt(Data, Length))
-        return;
+  if (!FindHeader(0x000001B8, "GOP"))
+     return;
+  uchar Byte1 = GetByte();
+  int Index1 = GetLastIndex();
+  uchar Byte2 =  GetByte();
+  int Index2 = GetLastIndex();
+  uchar Byte3 = GetByte();
+  int Index3 = GetLastIndex();
+  uchar Byte4 =  GetByte();
+  int Index4 = GetLastIndex();
+  uchar Frame = ((Byte3 & 0x1F) << 1) | (Byte4 >> 7);
+  uchar Sec   = ((Byte2 & 0x07) << 3) | (Byte3 >> 5);
+  uchar Min   = ((Byte1 & 0x03) << 4) | (Byte2 >> 4);
+  uchar Hour  = ((Byte1 & 0x7C) >> 2);
+  int GopTime = ((Hour * 60 + Min) * 60 + Sec) * FramesPerSecond + Frame;
+  if (GopTime) { // do not fix when zero
+     GopTime += Offset;
+     if (GopTime < 0)
+        GopTime += 24 * 60 * 60 * FramesPerSecond;
+     Frame = GopTime % FramesPerSecond;
+     GopTime = GopTime / FramesPerSecond;
+     Sec = GopTime % 60;
+     GopTime = GopTime / 60;
+     Min = GopTime % 60;
+     GopTime = GopTime / 60;
+     Hour = GopTime % 24;
+     SetByte((Byte1 & 0x80) | (Hour << 2) | (Min >> 4), Index1);
+     SetByte(((Min & 0x0F) << 4) | 0x08 | (Sec >> 3), Index2);
+     SetByte(((Sec & 0x07) << 3) | (Frame >> 1), Index3);
+     SetByte((Byte4 & 0x7F) | ((Frame & 0x01) << 7), Index4);
      }
-  // Determine the PTS offset at the beginning of each sequence (except the first one):
-  if (CutIn && lastPts >= 0) {
-     int64_t Pts = TsGetPts(Data, Length);
-     if (Pts >= 0)
-        offset = (lastPts + delta - Pts) & MAX33BIT; // offset is calculated so that Pts + offset results in lastPts + delta
-     fixCounters = true;
-     }
-  // Keep track of the highest video PTS:
-  bool GotPts = false;
-  int64_t PrevDts = lastDts;
-  uchar *p = Data;
-  int len = Length;
-  while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
-        int Pid = TsPid(p);
-        if (Pid == patPmtParser.Vpid()) {
-           if (!GotPts) { // in case of multiple fields per frame, the offset is calculated only with the first one
-              int64_t Pts = TsGetPts(p, TS_SIZE);
-              if (Pts >= 0) {
-                 if (offset >= 0)
-                    Pts = PtsAdd(Pts, offset); // offset is taken into account here, to make lastPts have the "new" value already!
-                 if (lastPts < 0 || PtsDiff(lastPts, Pts) > 0)
-                    lastPts = Pts;
-                 }
-              GotPts = true;
-              }
-           if (!CutIn) {
-              int64_t Dts = TsGetDts(p, TS_SIZE);
-              if (Dts >= 0) {
-                 if (offset >= 0)
-                    Dts = PtsAdd(Dts, offset); // offset is taken into account here, to make lastDts have the "new" value already!
-                 deltaDts = PtsDiff(PrevDts, Dts);
-                 PrevDts = Dts;
-                 }
-              }
-           }
-        // Adjust the TS continuity counter:
-        if (fixCounters) {
-           if (TsHasPayload(p))
-              counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
-           TsSetContinuityCounter(p, counter[Pid]);
-           }
-        else
-           counter[Pid] = TsGetContinuityCounter(p); // collect initial counters
-        p += TS_SIZE;
-        len -= TS_SIZE;
-        }
-  // Apply the PTS offset:
-  if (offset > 0) {
-     uchar *p = Data;
-     int len = Length;
-     while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
-           // Adjust the various timestamps:
-           int64_t Pts = TsGetPts(p, TS_SIZE);
-           if (Pts >= 0)
-              TsSetPts(p, TS_SIZE, PtsAdd(Pts, offset));
-           int64_t Dts = TsGetDts(p, TS_SIZE);
-           if (Dts >= 0) {
-              if (CutIn) {
-                 lastDts = PtsAdd(lastDts, deltaDts);
-                 TsSetDts(p, TS_SIZE, lastDts);
-                 }
-              else
-                 TsSetDts(p, TS_SIZE, PtsAdd(Dts, offset));
-              }
-           int64_t Pcr = TsGetPcr(p);
-           if (Pcr >= 0) {
-              int64_t NewPcr = Pcr + offset * PCRFACTOR;
-              if (NewPcr > MAX27MHZ)
-                 NewPcr -= MAX27MHZ + 1;
-              TsSetPcr(p, NewPcr);
-              }
-           p += TS_SIZE;
-           len -= TS_SIZE;
-           }
+}
+
+void cMpeg2Fixer::AdjTref(int TrefOffset)
+{
+  Reset();
+  if (!Find(0x00000100)) {
+     esyslog("ERROR: Picture header not found!");
+     return;
      }
-  lastDts = PrevDts;
+  int Tref = GetByte() << 2;
+  int Index1 = GetLastIndex();
+  uchar Byte2 = GetByte();
+  int Index2 = GetLastIndex();
+  Tref |= Byte2 >> 6;
+  Tref -= TrefOffset;
+  SetByte(Tref >> 2, Index1);
+  SetByte((Tref << 6) | (Byte2 & 0x3F), Index2);
 }
 
 // --- cCuttingThread --------------------------------------------------------
@@ -281,16 +235,27 @@ class cCuttingThread : public cThread {
   int numSequences;
   off_t maxVideoFileSize;
   off_t fileSize;
-  cPtsFixer ptsFixer;
   bool suspensionLogged;
+  int sequence;          // cutting sequence
+  int delta;             // time between two frames (PTS ticks)
+  int64_t lastVidPts;    // the video PTS of the last frame (in display order)
+  bool multiFramePkt;    // multiple frames within one PES packet
+  int64_t firstPts;      // first valid PTS, for dangling packet stripping
+  int64_t offset;        // offset to add to all timestamps
+  int tRefOffset;        // number of stripped frames in GOP
+  uchar counter[MAXPID]; // the TS continuity counter for each PID
+  bool keepPkt[MAXPID];  // flag for each PID to keep packets, for dangling packet stripping
+  int numIFrames;        // number of I-frames without pending packets
+  cPatPmtParser patPmtParser;
   bool Throttled(void);
   bool SwitchFile(bool Force = false);
   bool LoadFrame(int Index, uchar *Buffer, bool &Independent, int &Length);
   bool FramesAreEqual(int Index1, int Index2);
-  void GetPendingPackets(uchar *Buffer, int &Length, int Index, int64_t LastPts);
+  void GetPendingPackets(uchar *Buffer, int &Length, int Index);
        // Gather all non-video TS packets from Index upward that either belong to
-       // payloads that started before Index, or have a PTS that is before LastPts,
+       // payloads that started before Index, or have a PTS that is before lastVidPts,
        // and add them to the end of the given Data.
+  bool FixFrame(uchar *Data, int &Length, bool Independent, int Index, bool CutIn, bool CutOut);
   bool ProcessSequence(int LastEndIndex, int BeginIndex, int EndIndex, int NextBeginIndex);
 protected:
   virtual void Action(void);
@@ -312,7 +277,15 @@ cCuttingThread::cCuttingThread(const char *FromFileName, const char *ToFileName)
   framesPerSecond = Recording.FramesPerSecond();
   suspensionLogged = false;
   fileSize = 0;
-  ptsFixer.Setup(framesPerSecond);
+  sequence = 0;
+  delta = int(round(PTSTICKS / framesPerSecond));
+  lastVidPts = -1;
+  multiFramePkt = false;
+  firstPts = -1;
+  offset = 0;
+  tRefOffset = 0;
+  memset(counter, 0x00, sizeof(counter));
+  numIFrames = 0;
   if (fromMarks.Load(FromFileName, framesPerSecond, isPesRecording) && fromMarks.Count()) {
      numSequences = fromMarks.GetNumSequences();
      if (numSequences > 0) {
@@ -414,104 +387,176 @@ bool cCuttingThread::FramesAreEqual(int Index1, int Index2)
   return false;
 }
 
-void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index, int64_t LastPts)
+void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index)
 {
   bool Processed[MAXPID] = { false };
-  int NumIndependentFrames = 0;
-  cPatPmtParser PatPmtParser;
   cPacketStorage PacketStorage;
-  for (; NumIndependentFrames < 2; Index++) {
+  int64_t LastPts = lastVidPts + delta;// adding one frame length to fully cover the very last frame
+  Processed[patPmtParser.Vpid()] = true; // we only want non-video packets
+  for (int NumIndependentFrames = 0; NumIndependentFrames < 2; Index++) {
       uchar Buffer[MAXFRAMESIZE];
       bool Independent;
       int len;
       if (LoadFrame(Index, Buffer, Independent, len)) {
          if (Independent)
             NumIndependentFrames++;
-         uchar *p = Buffer;
-         while (len >= TS_SIZE && *p == TS_SYNC_BYTE) {
-               int Pid = TsPid(p);
-               if (Pid == PATPID)
-                  PatPmtParser.ParsePat(p, TS_SIZE);
-               else if (PatPmtParser.IsPmtPid(Pid)) {
-                  PatPmtParser.ParsePmt(p, TS_SIZE);
-                  Processed[PatPmtParser.Vpid()] = true; // we only want non-video packets
-                  }
-               else if (!Processed[Pid]) {
-                  int64_t Pts = TsGetPts(p, TS_SIZE);
-                  if (Pts >= 0) {
-                     int64_t d = PtsDiff(LastPts, Pts);
-                     if (d <= 0) // Pts is before or at LastPts
-                        PacketStorage.Flush(Pid, Data, Length, MAXFRAMESIZE);
-                     if (d >= 0) { // Pts is at or after LastPts
-                        NumIndependentFrames = 0; // we search until we find two consecutive I-frames without any more pending packets
-                        Processed[Pid] = true;
-                        }
-                     }
-                  if (!Processed[Pid])
-                     PacketStorage.Append(Pid, p, TS_SIZE);
-                  }
-               len -= TS_SIZE;
-               p += TS_SIZE;
-               }
+         for (uchar *p = Buffer; len >= TS_SIZE && *p == TS_SYNC_BYTE; len -= TS_SIZE, p += TS_SIZE) {
+             int Pid = TsPid(p);
+             if (Pid != PATPID && !patPmtParser.IsPmtPid(Pid) && !Processed[Pid]) {
+                int64_t Pts = TsGetPts(p, TS_SIZE);
+                if (Pts >= 0) {
+                   int64_t d = PtsDiff(LastPts, Pts);
+                   if (d < 0) // Pts is before LastPts
+                      PacketStorage.Flush(Pid, Data, Length, MAXFRAMESIZE);
+                   else { // Pts is at or after LastPts
+                      NumIndependentFrames = 0; // we search until we find two consecutive I-frames without any more pending packets
+                      Processed[Pid] = true;
+                      }
+                   }
+                if (!Processed[Pid])
+                   PacketStorage.Append(Pid, p, TS_SIZE);
+                }
+             }
          }
       else
          break;
       }
 }
 
+bool cCuttingThread::FixFrame(uchar *Data, int &Length, bool Independent, int Index, bool CutIn, bool CutOut)
+{
+  if (!patPmtParser.Vpid()) {
+     if (!patPmtParser.ParsePatPmt(Data, Length))
+        return false;
+     }
+  if (CutIn) {
+     sequence++;
+     memset(keepPkt, false, sizeof(keepPkt));
+     numIFrames = 0;
+     firstPts = TsGetPts(Data, Length);
+     // Determine the PTS offset at the beginning of each sequence (except the first one):
+     if (sequence != 1) {
+        if (firstPts >= 0)
+           offset = (lastVidPts + delta - firstPts) & MAX33BIT;
+        }
+     }
+  if (CutOut)
+     GetPendingPackets(Data, Length, Index + 1);
+  if (Independent) {
+     numIFrames++;
+     tRefOffset = 0;
+     }
+  // Fix MPEG-2:
+  if (patPmtParser.Vtype() == 2) {
+     cMpeg2Fixer Mpeg2fixer(Data, Length, patPmtParser.Vpid());
+     if (CutIn) {
+        if (sequence == 1 || multiFramePkt)
+           Mpeg2fixer.SetBrokenLink();
+        else {
+           Mpeg2fixer.SetClosedGop();
+           tRefOffset = Mpeg2fixer.GetTref();
+           }
+        }
+     if (tRefOffset)
+        Mpeg2fixer.AdjTref(tRefOffset);
+     if (sequence > 1 && Independent)
+        Mpeg2fixer.AdjGopTime((offset - MAX33BIT) / delta, round(framesPerSecond));
+     }
+  bool DeletedFrame = false;
+  bool GotVidPts = false;
+  bool StripVideo = sequence > 1 && tRefOffset;
+  uchar *p;
+  int len;
+  for (p = Data, len = Length; len >= TS_SIZE && *p == TS_SYNC_BYTE; p += TS_SIZE, len -= TS_SIZE) {
+      int Pid = TsPid(p);
+      // Strip dangling packets:
+      if (numIFrames < 2 && Pid != PATPID && !patPmtParser.IsPmtPid(Pid)) {
+         if (Pid != patPmtParser.Vpid() || StripVideo) {
+            int64_t Pts = TsGetPts(p, TS_SIZE);
+            if (Pts >= 0)
+               keepPkt[Pid] = PtsDiff(firstPts, Pts) >= 0; // Pts is at or after FirstPts
+            if (!keepPkt[Pid]) {
+               TsHidePayload(p);
+               numIFrames = 0; // we search until we find two consecutive I-frames without any more dangling packets
+               if (Pid == patPmtParser.Vpid())
+                  DeletedFrame = true;
+               }
+            }
+         }
+      // Adjust the TS continuity counter:
+      if (sequence > 1) {
+         if (TsHasPayload(p))
+            counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
+         TsSetContinuityCounter(p, counter[Pid]);
+         }
+      else
+         counter[Pid] = TsGetContinuityCounter(p); // collect initial counters
+      // Adjust PTS:
+      int64_t Pts = TsGetPts(p, TS_SIZE);
+      if (Pts >= 0) {
+         if (sequence > 1) {
+            Pts = PtsAdd(Pts, offset);
+            TsSetPts(p, TS_SIZE, Pts);
+            }
+         // Keep track of the highest video PTS - in case of multiple fields per frame, take the first one
+         if (!GotVidPts && Pid == patPmtParser.Vpid()) {
+            GotVidPts = true;
+            if (lastVidPts < 0 || PtsDiff(lastVidPts, Pts) > 0)
+               lastVidPts = Pts;
+            }
+         }
+      // Adjust DTS:
+      if (sequence > 1) {
+         int64_t Dts = TsGetDts(p, TS_SIZE);
+         if (Dts >= 0) {
+            Dts = PtsAdd(Dts, offset);
+            if (CutIn)
+               Dts = PtsAdd(Dts, tRefOffset * delta);
+            TsSetDts(p, TS_SIZE, Dts);
+            }
+         int64_t Pcr = TsGetPcr(p);
+         if (Pcr >= 0) {
+            Pcr = Pcr + offset * PCRFACTOR;
+            if (Pcr > MAX27MHZ)
+               Pcr -= MAX27MHZ + 1;
+            TsSetPcr(p, Pcr);
+            }
+         }
+      }
+  if (!DeletedFrame && !GotVidPts) {
+     // Adjust PTS for multiple frames within a single PES packet:
+     lastVidPts = (lastVidPts + delta) & MAX33BIT;
+     multiFramePkt = true;
+     }
+  return DeletedFrame;
+}
+
 bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIndex, int NextBeginIndex)
 {
   // Check for seamless connections:
   bool SeamlessBegin = LastEndIndex >= 0 && FramesAreEqual(LastEndIndex, BeginIndex);
   bool SeamlessEnd = NextBeginIndex >= 0 && FramesAreEqual(EndIndex, NextBeginIndex);
   // Process all frames from BeginIndex (included) to EndIndex (excluded):
-  cDanglingPacketStripper DanglingPacketStripper;
-  int NumIndependentFrames = 0;
-  int64_t FirstPts = -1;
-  int64_t LastPts = -1;
   for (int Index = BeginIndex; Running() && Index < EndIndex; Index++) {
       uchar Buffer[MAXFRAMESIZE];
       bool Independent;
       int Length;
       if (LoadFrame(Index, Buffer, Independent, Length)) {
+         bool CutIn = !SeamlessBegin && Index == BeginIndex;
+         bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
+         bool DeletedFrame = false;
          if (!isPesRecording) {
-            int64_t Pts = TsGetPts(Buffer, Length);
-            if (FirstPts < 0)
-               FirstPts = Pts; // the PTS of the first frame in the sequence
-            else if (LastPts < 0 || PtsDiff(LastPts, Pts) > 0)
-               LastPts = Pts; // the PTS of the frame that is displayed as the very last one of the sequence
-            }
-         // Fixup data at the beginning of the sequence:
-         if (!SeamlessBegin) {
-            if (isPesRecording) {
-               if (Index == BeginIndex)
-                  cRemux::SetBrokenLink(Buffer, Length);
-               }
-            else if (NumIndependentFrames < 2) {
-               if (DanglingPacketStripper.Process(Buffer, Length, FirstPts))
-                  NumIndependentFrames = 0; // we search until we find two consecutive I-frames without any more dangling packets
-               }
-            }
-         // Fixup data at the end of the sequence:
-         if (!SeamlessEnd) {
-            if (Index == EndIndex - 1) {
-               if (!isPesRecording)
-                  GetPendingPackets(Buffer, Length, EndIndex, LastPts + int(round(PTSTICKS / framesPerSecond))); // adding one frame length to fully cover the very last frame
-               }
-            }
-         // Fixup timestamps and continuity counters:
-         if (!isPesRecording) {
-            if (numSequences > 1)
-              ptsFixer.Fix(Buffer, Length, !SeamlessBegin && Index == BeginIndex);
+            DeletedFrame = FixFrame(Buffer, Length, Independent, Index, CutIn, CutOut);
             }
+         else if (CutIn)
+            cRemux::SetBrokenLink(Buffer, Length);
          // Every file shall start with an independent frame:
          if (Independent) {
-            NumIndependentFrames++;
             if (!SwitchFile())
                return false;
             }
          // Write index:
-         if (!toIndex->Write(Independent, toFileName->Number(), fileSize)) {
+         if (!DeletedFrame && !toIndex->Write(Independent, toFileName->Number(), fileSize)) {
             error = "toIndex";
             return false;
             }
diff --git a/device.h b/device.h
index e2847d86a..05b56e91d 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.42 2012/12/04 11:52:58 kls Exp $
+ * $Id: device.h 2.43 2013/01/03 08:53:06 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -672,6 +672,8 @@ class cDevice : public cThread {
        ///< be prepared for cases where the returned rectangle is way off the requested
        ///< Rect, or even Null. In such cases, the skin may want to fall back to
        ///< working with full screen video.
+       ///< The coordinates of Rect are in the range of the width and height returned
+       ///< by GetOsdSize().
        ///< If this device can't scale the video, a Null rectangle is returned (this
        ///< is also the default implementation).
   virtual void ScaleVideo(const cRect &Rect = cRect::Null) {}
diff --git a/dvbdevice.c b/dvbdevice.c
index 8c57497b8..27482e8bc 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.76 2012/12/30 11:27:39 kls Exp $
+ * $Id: dvbdevice.c 2.77 2012/12/30 13:08:41 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -632,7 +632,8 @@ int cDvbTuner::GetSignalQuality(void) const
      // special treatment to map their Snr value into the range 0...0xFFFF.
      switch (subsystemId) {
        case 0x13C21019: MaxSnr = 200; break; // TT-budget S2-3200 (DVB-S/DVB-S2)
-       case 0x20130245: MaxSnr = 255; break; // PCTV Systems PCTV 73ESE
+       case 0x20130245:                      // PCTV Systems PCTV 73ESE
+       case 0x2013024F: MaxSnr = 255; break; // PCTV Systems nanoStick T2 290e
        }
      int a = int(Snr) * 100 / MaxSnr;
      int b = 100 - (Unc * 10 + (Ber / 256) * 5);
diff --git a/dvbspu.c b/dvbspu.c
index 25af228ba..2a311e30e 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.9 2011/12/10 14:39:19 kls Exp $
+ * $Id: dvbspu.c 2.10 2013/01/20 10:36:58 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -54,6 +54,7 @@ void cDvbSpuPalette::setPalette(const uint32_t * pal)
 #define setMin(a, b) if (a > b) a = b
 #define setMax(a, b) if (a < b) a = b
 
+// DVD SPU bitmaps cover max. 720 x 576 - this sizes the SPU bitmap
 #define spuXres   720
 #define spuYres   576
 
@@ -243,6 +244,36 @@ cDvbSpuDecoder::~cDvbSpuDecoder()
     delete osd;
 }
 
+// SPUs must be scaled if screensize is not 720x576
+
+void cDvbSpuDecoder::SetSpuScaling(void)
+{
+    int Width = spuXres;
+    int Height = spuYres;
+    int OsdWidth = 0;
+    int OsdHeight = 0;
+    double VideoAspect;
+    cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, VideoAspect);
+    DEBUG("dvbspu SetSpuScaling OsdSize %d x %d\n", OsdWidth, OsdHeight);
+    if (!OsdWidth) { // guess correct size
+        if (Setup.OSDWidth <= 720 || Setup.OSDHeight <= 576)
+            xscaling = yscaling = 1.0;
+        else if (Setup.OSDWidth <= 1280 || Setup.OSDHeight <= 720) {
+            xscaling = 1280.0 / Width;
+            yscaling = 720.0 / Height;
+        }
+        else {
+            xscaling = 1920.0 / Width;
+            yscaling = 1080.0/ Height;
+        }
+    }
+    else {
+        xscaling = (double)OsdWidth / Width;
+        yscaling = (double)OsdHeight / Height;
+    }
+    DEBUG("dvbspu xscaling = %f yscaling = %f\n", xscaling, yscaling);
+}
+
 void cDvbSpuDecoder::processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow)
 {
     setTime(pts);
@@ -296,6 +327,7 @@ void cDvbSpuDecoder::setHighlight(uint16_t sx, uint16_t sy,
         memcpy(hlpDescr, pld, sizeof(aDvbSpuPalDescr));
         highlight = true;
         clean = false;
+        Draw(); // we have to trigger Draw() here
     }
 }
 
@@ -376,32 +408,52 @@ void cDvbSpuDecoder::Draw(void)
         return;
     }
     sDvbSpuRect bgsize;
+    sDvbSpuRect drawsize;
+    sDvbSpuRect bgdrawsize;
     cBitmap *fg = NULL;
     cBitmap *bg = NULL;
+    cBitmap *tmp = NULL;
+
+    SetSpuScaling(); // always set current scaling, size could have changed
 
-    if (highlight)
-        fg = spubmp->getBitmap(hlpDescr, palette, hlpsize);
+    if (highlight) {
+        tmp = spubmp->getBitmap(hlpDescr, palette, hlpsize);
+        fg = tmp->Scaled(xscaling, yscaling, true);
+        drawsize.x1 = hlpsize.x1 * xscaling;
+        drawsize.y1 = hlpsize.y1 * yscaling;
+        drawsize.x2 = drawsize.x1 + fg->Width();
+        drawsize.y2 = drawsize.y1 + fg->Height();
+    }
 
-    if (spubmp->getMinSize(palDescr, bgsize))
-        bg = spubmp->getBitmap(palDescr, palette, bgsize);
+    if (spubmp->getMinSize(palDescr, bgsize)) {
+        tmp = spubmp->getBitmap(palDescr, palette, bgsize);
+        bg = tmp->Scaled(xscaling, yscaling, true);
+        bgdrawsize.x1 = bgsize.x1 * xscaling;
+        bgdrawsize.y1 = bgsize.y1 * yscaling;
+        bgdrawsize.x2 = bgdrawsize.x1 + bg->Width();
+        bgdrawsize.y2 = bgdrawsize.y1 + bg->Height();
+    }
 
-    if (!fg || !bg || !osd)
+    if (osd) // always rewrite OSD
         Hide();
 
     if (osd == NULL) {
             restricted_osd = false;
             osd = cOsdProvider::NewOsd(0, 0);
 
-            tArea Area = { size.x1, size.y1, size.x2, size.y2, 4};
-            if (osd->CanHandleAreas(&Area, 1) != oeOk)
-                    restricted_osd = true;
+            sDvbSpuRect areaSize = CalcAreaSize(drawsize, fg, bgdrawsize, bg); // combine
+            tArea Area = { areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, 4 };
+            if (osd->CanHandleAreas(&Area, 1) != oeOk) {
+                DEBUG("dvbspu CanHandleAreas (%d,%d)x(%d,%d), 4 failed\n", areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2);
+                restricted_osd = true;
+            }
             else
                 osd->SetAreas(&Area, 1);
     }
     if (restricted_osd) {
             sDvbSpuRect hlsize;
             bool setarea = false;
-            /* reduce fg area (only valid if there is no bg below) */
+            /* reduce fg area */
             if (fg) {
                     spubmp->getMinSize(hlpDescr,hlsize);
                     /* clip to the highligh area */
@@ -409,11 +461,15 @@ void cDvbSpuDecoder::Draw(void)
                     setMax(hlsize.y1, hlpsize.y1);
                     setMin(hlsize.x2, hlpsize.x2);
                     setMin(hlsize.y2, hlpsize.y2);
-                    if (hlsize.x1 > hlsize.x2 || hlsize.y1 > hlsize.y2) {
+                    if (hlsize.x1 > hlsize.x2 || hlsize.y1 > hlsize.y2)
                             hlsize.x1 = hlsize.x2 = hlsize.y1 = hlsize.y2 = 0;
-                    }
+                    /* resize scaled fg */
+                    drawsize.x1=hlsize.x1 * xscaling;
+                    drawsize.y1=hlsize.y1 * yscaling;
+                    drawsize.x2=hlsize.x2 * xscaling;
+                    drawsize.y2=hlsize.y2 * yscaling;
             }
-            sDvbSpuRect areaSize = CalcAreaSize((fg && bg) ? hlpsize : hlsize, fg, bgsize, bg);
+            sDvbSpuRect areaSize = CalcAreaSize(drawsize, fg, bgdrawsize, bg);
 
 #define DIV(a, b) (a/b)?:1
             for (int d = 1; !setarea && d <= 2; d++) {
@@ -431,16 +487,11 @@ void cDvbSpuDecoder::Draw(void)
                     /* second try to split area if there is both area */
                     if (!setarea && fg && bg) {
                             tArea Area_Both [2] = {
-                                    {bgsize.x1, bgsize.y1, bgsize.x2, bgsize.y2, DIV(CalcAreaBpp(0, bg), d)},
-                                    {hlpsize.x1, hlpsize.y1, hlpsize.x2, hlpsize.y2, DIV(CalcAreaBpp(fg, 0), d)}
+                                    { bgdrawsize.x1, bgdrawsize.y1, bgdrawsize.x2, bgdrawsize.y2, DIV(CalcAreaBpp(0, bg), d) },
+                                    { drawsize.x1, drawsize.y1, drawsize.x2, drawsize.y2, DIV(CalcAreaBpp(fg, 0), d) }
                             };
                             if (!Area_Both[0].Intersects(Area_Both[1])) {
-                                    /* there is no intersection. We can reduce hl */
-                                    Area_Both[1].x1 = hlsize.x1;
-                                    Area_Both[1].y1 = hlsize.y1;
-                                    Area_Both[1].x2 = hlsize.x2;
-                                    Area_Both[1].y2 = hlsize.y2;
-
+                                    /* there is no intersection. We can try with split areas */
                                     if ((Area_Both[0].Width() & 7) != 0)
                                             Area_Both[0].x2 += 8 - (Area_Both[0].Width() & 7);
                                     if ((Area_Both[1].Width() & 7) != 0)
@@ -451,18 +502,21 @@ void cDvbSpuDecoder::Draw(void)
                             }
                     }
             }
-            if (!setarea)
-              dsyslog("dvbspu: AreaSize (%d, %d) (%d, %d) Bpp %d", areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2 );
+            if (setarea)
+                DEBUG("dvbspu: reduced AreaSize (%d, %d) (%d, %d) Bpp %d\n", areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2);
+            else
+                dsyslog("dvbspu: reduced AreaSize (%d, %d) (%d, %d) Bpp %d failed", areaSize.x1, areaSize.y1, areaSize.x2, areaSize.y2, (fg && bg) ? 4 : 2);
     }
 
     /* we could draw use DrawPixel on osd */
     if (bg || fg) {
         if (bg)
-           osd->DrawBitmap(bgsize.x1, bgsize.y1, *bg);
+           osd->DrawBitmap(bgdrawsize.x1, bgdrawsize.y1, *bg);
         if (fg)
-           osd->DrawBitmap(hlpsize.x1, hlpsize.y1, *fg);
+           osd->DrawBitmap(drawsize.x1, drawsize.y1, *fg);
         delete fg;
         delete bg;
+        delete tmp;
 
         osd->Flush();
     }
diff --git a/dvbspu.h b/dvbspu.h
index 863e4464a..5c7cc0a47 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,13 +8,14 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 2.5 2011/03/27 14:50:48 kls Exp $
+ * $Id: dvbspu.h 2.6 2013/01/20 10:15:47 kls Exp $
  */
 
 #ifndef __DVBSPU_H
 #define __DVBSPU_H
 
 #include <inttypes.h>
+#include "device.h"
 #include "osd.h"
 #include "spu.h"
 #include "thread.h"
@@ -106,7 +107,8 @@ class cDvbSpuDecoder:public cSpuDecoder {
     enum spFlag { spNONE, spHIDE, spSHOW, spMENU };
     spFlag state;
 
-     cSpuDecoder::eScaleMode scaleMode;
+    cSpuDecoder::eScaleMode scaleMode;
+    double xscaling, yscaling;
 
     //highligh area
     bool highlight;
@@ -133,6 +135,7 @@ class cDvbSpuDecoder:public cSpuDecoder {
         return ((spu[0] << 8) | spu[1]);
     };
 
+    void SetSpuScaling(void);
     sDvbSpuRect CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDvbSpuRect bgsize, cBitmap *bgbmp);
     int CalcAreaBpp(cBitmap *fgbmp, cBitmap *bgbmp);
 
diff --git a/menu.c b/menu.c
index 6c278b556..d7faa872b 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.72 2012/12/21 11:11:14 kls Exp $
+ * $Id: menu.c 2.74 2013/01/17 14:20:08 kls Exp $
  */
 
 #include "menu.h"
@@ -2273,7 +2273,6 @@ void cMenuRecordings::Set(bool Refresh)
 {
   const char *CurrentRecording = cReplayControl::LastReplayed();
   cMenuRecordingItem *LastItem = NULL;
-  char *LastItemText = NULL;
   cThreadLock RecordingsLock(&Recordings);
   if (Refresh) {
      if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
@@ -2285,23 +2284,32 @@ void cMenuRecordings::Set(bool Refresh)
   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
       if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
          cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-         if (*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0))) {
+         cMenuRecordingItem *LastDir = NULL;
+         if (Item->IsDirectory()) {
+            // Sorting may ignore non-alphanumeric characters, so we need to explicitly handle directories in case they only differ in such characters:
+            for (cMenuRecordingItem *p = LastItem; p; p = dynamic_cast<cMenuRecordingItem *>(p->Prev())) {
+                if (p->Name() && strcmp(p->Name(), Item->Name()) == 0) {
+                   LastDir = p;
+                   break;
+                   }
+                }
+            }
+         if (*Item->Text() && !LastDir) {
             Add(Item);
             LastItem = Item;
-            free(LastItemText);
-            LastItemText = strdup(LastItem->Text()); // must use a copy because of the counters!
+            if (Item->IsDirectory())
+               LastDir = Item;
             }
          else
             delete Item;
          if (LastItem) {
             if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
                SetCurrent(LastItem);
-            if (LastItem->IsDirectory())
-               LastItem->IncrementCounter(recording->IsNew());
             }
+         if (LastDir)
+            LastDir->IncrementCounter(recording->IsNew());
          }
       }
-  free(LastItemText);
   if (Refresh)
      Display();
 }
@@ -4708,8 +4716,10 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
     case kPause:
     case kDown:
     case kOk:
-         Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
-         Goto(SecondsToFrames(Seconds, FramesPerSecond()), Key == kDown || Key == kPause || Key == kOk);
+         if (timeSearchPos > 0) {
+            Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
+            Goto(SecondsToFrames(Seconds, FramesPerSecond()), Key == kDown || Key == kPause || Key == kOk);
+            }
          timeSearchActive = false;
          break;
     default:
diff --git a/newplugin b/newplugin
index df6f0bdb3..58cf85c04 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.15 2012/12/28 09:52:29 kls Exp $
+# $Id: newplugin 2.17 2013/01/12 13:46:00 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -76,8 +76,8 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
 PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc))
-LIBDIR = \$(DESTDIR)\$(call PKGCFG,libdir)
-LOCDIR = \$(DESTDIR)\$(call PKGCFG,locdir)
+LIBDIR = \$(call PKGCFG,libdir)
+LOCDIR = \$(call PKGCFG,locdir)
 PLGCFG = \$(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
@@ -121,14 +121,14 @@ all: \$(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) \$<
+	\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) -o \$\@ \$<
 
 ### Dependencies:
 
 MAKEDEP = \$(CXX) -MM -MG
 DEPFILE = .dependencies
 \$(DEPFILE): Makefile
-	\@\$(MAKEDEP) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@
+	\@\$(MAKEDEP) \$(CXXFLAGS) \$(DEFINES) \$(INCLUDES) \$(OBJS:%.o=%.c) > \$\@
 
 -include \$(DEPFILE)
 
@@ -137,7 +137,7 @@ DEPFILE = .dependencies
 PODIR     = po
 I18Npo    = \$(wildcard \$(PODIR)/*.po)
 I18Nmo    = \$(addsuffix .mo, \$(foreach file, \$(I18Npo), \$(basename \$(file))))
-I18Nmsgs  = \$(addprefix \$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
+I18Nmsgs  = \$(addprefix \$(DESTDIR)\$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\$(PLUGIN).mo, \$(notdir \$(foreach file, \$(I18Npo), \$(basename \$(file))))))
 I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 
 %.mo: %.po
@@ -150,7 +150,7 @@ I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 	msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$<
 	\@touch \$\@
 
-\$(I18Nmsgs): \$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
+\$(I18Nmsgs): \$(DESTDIR)\$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
 	install -D -m644 \$< \$\@
 
 .PHONY: i18n
@@ -164,7 +164,7 @@ install-i18n: \$(I18Nmsgs)
 	\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
 
 install-lib: \$(SOFILE)
-	install -D \$^ \$(LIBDIR)/\$^.\$(APIVERSION)
+	install -D \$^ \$(DESTDIR)\$(LIBDIR)/\$^.\$(APIVERSION)
 
 install: install-lib install-i18n
 
diff --git a/recording.c b/recording.c
index ca50f4337..9cd052232 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.81 2012/12/23 15:11:28 kls Exp $
+ * $Id: recording.c 2.83 2013/01/16 14:17:44 kls Exp $
  */
 
 #include "recording.h"
@@ -824,10 +824,10 @@ char *cRecording::StripEpisodeName(char *s)
         }
   if (s1 && s2) {
      // To have folders sorted before plain recordings, the '/' s1 points to
-     // is replaced by the character 'b'. All other slashes will be replaced
-     // by 'a' in SortName() (see below), which will result in the desired
+     // is replaced by the character '1'. All other slashes will be replaced
+     // by '0' in SortName() (see below), which will result in the desired
      // sequence:
-     *s1 = 'b';
+     *s1 = '1';
      s1++;
      memmove(s1, s2, t - s2 + 1);
      }
@@ -840,7 +840,7 @@ char *cRecording::SortName(void) const
   if (!*sb) {
      char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory))
                                               : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)));
-     strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
+     strreplace(s, '/', '0'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      *sb = MALLOC(char, l);
      strxfrm(*sb, s, l);
diff --git a/remote.c b/remote.c
index 0b2d66de0..3f20d026b 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.5 2012/01/16 16:57:00 kls Exp $
+ * $Id: remote.c 2.6 2013/01/13 12:01:52 kls Exp $
  */
 
 #include "remote.h"
@@ -356,14 +356,25 @@ uint64_t cKbdRemote::ReadKeySequence(void)
 
 void cKbdRemote::Action(void)
 {
+  uint64_t LastCommand = 0;
+  bool Repeat = false;
+
   while (Running()) {
         uint64_t Command = ReadKeySequence();
+        if (LastCommand && Command != LastCommand && Repeat) {
+           if (!rawMode)
+              Put(LastCommand, false, true);
+           Repeat = false;
+           }
         if (Command) {
-           if (rawMode || !Put(Command)) {
+           if (Command == LastCommand)
+              Repeat = true;
+           if (rawMode || !Put(Command, Repeat)) {
               int func = MapCodeToFunc(Command);
               if (func)
                  Put(KBDKEY(func));
               }
            }
+        LastCommand = Command;
         }
 }
diff --git a/remux.h b/remux.h
index 19f947975..67eda4c6d 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.36 2012/11/19 10:22:28 kls Exp $
+ * $Id: remux.h 2.37 2013/01/20 11:43:59 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -217,6 +217,8 @@ class cTsPayload {
   int length;
   int pid;
   int index; // points to the next byte to process
+protected:
+  void Reset(void) { index = 0; }
 public:
   cTsPayload(void);
   cTsPayload(uchar *Data, int Length, int Pid = -1);
diff --git a/svdrp.c b/svdrp.c
index 0313280b4..1ab8ee59b 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.21 2012/12/04 12:08:36 kls Exp $
+ * $Id: svdrp.c 2.23 2013/01/17 15:19:02 kls Exp $
  */
 
 #include "svdrp.h"
@@ -236,9 +236,11 @@ const char *HelpPages[] = {
   "    only data for that channel is listed. 'now', 'next', or 'at <time>'\n"
   "    restricts the returned data to present events, following events, or\n"
   "    events at the given time (which must be in time_t form).",
-  "LSTR [ <number> ]\n"
+  "LSTR [ <number> [ path ] ]\n"
   "    List recordings. Without option, all recordings are listed. Otherwise\n"
-  "    the information for the given recording is listed.",
+  "    the information for the given recording is listed. If a recording\n"
+  "    number and the keyword 'path' is given, the actual file name of that\n"
+  "    recording's directory is listed.",
   "LSTT [ <number> ] [ id ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed. If the keyword 'id' is given, the\n"
@@ -261,8 +263,7 @@ const char *HelpPages[] = {
   "    by the LSTC command.",
   "NEWT <settings>\n"
   "    Create a new timer. Settings must be in the same format as returned\n"
-  "    by the LSTT command. It is an error if a timer with the same channel,\n"
-  "    day, start and stop time already exists.",
+  "    by the LSTT command.",
   "NEXT [ abs | rel ]\n"
   "    Show the next timer event. If no option is given, the output will be\n"
   "    in human readable form. With option 'abs' the absolute time of the next\n"
@@ -1080,16 +1081,44 @@ void cSVDRP::CmdLSTE(const char *Option)
 
 void cSVDRP::CmdLSTR(const char *Option)
 {
+  int Number = 0;
+  bool Path = false;
   recordings.Update(true);
   if (*Option) {
-     if (isnumber(Option)) {
+     char buf[strlen(Option) + 1];
+     strcpy(buf, Option);
+     const char *delim = " \t";
+     char *strtok_next;
+     char *p = strtok_r(buf, delim, &strtok_next);
+     while (p) {
+           if (!Number) {
+              if (isnumber(p))
+                 Number = strtol(p, NULL, 10);
+              else {
+                 Reply(501, "Error in recording number \"%s\"", Option);
+                 return;
+                 }
+              }
+           else if (strcasecmp(p, "PATH") == 0)
+              Path = true;
+           else {
+              Reply(501, "Unknown option: \"%s\"", p);
+              return;
+              }
+           p = strtok_r(NULL, delim, &strtok_next);
+           }
+     if (Number) {
         cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            FILE *f = fdopen(file, "w");
            if (f) {
-              recording->Info()->Write(f, "215-");
-              fflush(f);
-              Reply(215, "End of recording information");
+              if (Path)
+                 Reply(250, "%s", recording->FileName());
+              else {
+                 recording->Info()->Write(f, "215-");
+                 fflush(f);
+                 Reply(215, "End of recording information");
+                 }
               // don't 'fclose(f)' here!
               }
            else
@@ -1098,8 +1127,6 @@ void cSVDRP::CmdLSTR(const char *Option)
         else
            Reply(550, "Recording \"%s\" not found", Option);
         }
-     else
-        Reply(501, "Error in recording number \"%s\"", Option);
      }
   else if (recordings.Count()) {
      cRecording *recording = recordings.First();
@@ -1322,16 +1349,11 @@ void cSVDRP::CmdNEWT(const char *Option)
   if (*Option) {
      cTimer *timer = new cTimer;
      if (timer->Parse(Option)) {
-        cTimer *t = Timers.GetTimer(timer);
-        if (!t) {
-           Timers.Add(timer);
-           Timers.SetModified();
-           isyslog("timer %s added", *timer->ToDescr());
-           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
-           return;
-           }
-        else
-           Reply(550, "Timer already defined: %d %s", t->Index() + 1, *t->ToText());
+        Timers.Add(timer);
+        Timers.SetModified();
+        isyslog("timer %s added", *timer->ToDescr());
+        Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
+        return;
         }
      else
         Reply(501, "Error in timer settings");
diff --git a/transfer.c b/transfer.c
index 2a92a82ba..51ba912b9 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.6 2012/02/29 14:16:23 kls Exp $
+ * $Id: transfer.c 2.7 2013/01/20 13:40:30 kls Exp $
  */
 
 #include "transfer.h"
@@ -15,6 +15,7 @@ cTransfer::cTransfer(const cChannel *Channel)
 :cReceiver(Channel, TRANSFERPRIORITY)
 {
   patPmtGenerator.SetChannel(Channel);
+  retriesExceeded = false;
 }
 
 cTransfer::~cTransfer()
@@ -35,6 +36,10 @@ void cTransfer::Activate(bool On)
      cPlayer::Detach();
 }
 
+#define MAXRETRIES     5 // max. number of retries for a single TS packet
+#define RETRYWAIT      5 // time (in ms) between two retries
+#define RETRYPAUSE 10000 // time (in ms) for which to pause retrying once a packet has not been accepted
+
 void cTransfer::Receive(uchar *Data, int Length)
 {
   if (cPlayer::IsAttached()) {
@@ -42,11 +47,18 @@ void cTransfer::Receive(uchar *Data, int Length)
      // buffering here. The TS packets *must* get through here! However, every
      // now and then there may be conditions where the packet just can't be
      // handled when offered the first time, so that's why we try several times:
-     for (int i = 0; i < 100; i++) {
-         if (PlayTs(Data, Length) > 0)
+     for (int i = 0; i < MAXRETRIES; i++) {
+         if (PlayTs(Data, Length) > 0) {
+            if (retriesExceeded && timer.TimedOut())
+               retriesExceeded = false;
+            return;
+            }
+         if (retriesExceeded) // no retries once a packet has not been accepted
             return;
-         cCondWait::SleepMs(10);
+         cCondWait::SleepMs(RETRYWAIT);
          }
+     retriesExceeded = true;
+     timer.Set(RETRYPAUSE); // wait a while before retrying
      esyslog("ERROR: TS packet not accepted in Transfer Mode");
      }
 }
diff --git a/transfer.h b/transfer.h
index 004d5b06c..0c6683708 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 2.2 2010/01/29 16:38:09 kls Exp $
+ * $Id: transfer.h 2.3 2013/01/20 13:12:38 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -13,10 +13,13 @@
 #include "player.h"
 #include "receiver.h"
 #include "remux.h"
+#include "tools.h"
 
 class cTransfer : public cReceiver, public cPlayer {
 private:
   cPatPmtGenerator patPmtGenerator;
+  bool retriesExceeded;
+  cTimeMs timer;
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);

From 14bd32b9486980a99ca552ec4eda6a11ab3a286a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 9 Feb 2013 15:35:00 +0100
Subject: [PATCH 223/307] Version 1.7.37 VDR developer version 1.7.37 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.37.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.36-1.7.37.diff

MD5 checksums:

602dc7e678bcfcf075da36344a337562  vdr-1.7.37.tar.bz2
34e953fcffc112f316cbfc1f53915324  vdr-1.7.36-1.7.37.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Approaching version 2.0.0:
==========================

If all goes well, there should be no more functional or API changes
before the final version 2.0.0. There will just be a few more fixes.

From the HISTORY file:
- Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch).
- Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly).
- The LCARS menu now also works if the OSD has only 1bpp (two colors).
- Fixed possible garbage in the remaining time of the LCARS replay display in case the
  hours change from two to one digit.
- Fixed upscaling bitmaps. The last row and column of the scaled bitmap was not filled,
  which resulted in empty lines between scaled subtitles.
- Fixed a leftover line in case a two line subtitle was followed by a one line
  subtitle on the dvbhddevice in "high level" OSD mode.
- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
- The index file is now closed after initially reading it if it is older than 3600 seconds.
- Improved responsiveness during replay when close to the recording's end.
- Fixed a leftover progress display in the LCARS main menu when replay of a recording
  ends while the menu is open, and the live channel has no EPG information.
- Fixed possible audio chatter when a recording is replayed to its very end.
- Added dependency on 'i18n' to 'install-i18n' in the VDR Makefile (thanks to Tobias
  Grimm).
- Changed several calls to Skins.Message() in vdr.c to Skins.QueueMessage() in order to
  avoid a black screen while such a message is displayed in case the channel will be
  switched (reported by Uwe Scheffler).
- Updated the Slovakian language texts (thanks to Milan Hrala).
- Improved LIRC timing for repeat function.
- When pausing live video, the current audio and subtitle tracks are now retained.
- Added some notes about plugin Makefiles to PLUGINS.html.
- Avoiding an extra key press event if the repeat function kicks in when controlling
  VDR via the PC keyboard.
- The new options "Setup/Miscellaneous/Remote control repeat delay" and
  "Setup/Miscellaneous/Remote control repeat delta" can be used to adjust the
  behavior of the remote control in case a key is held pressed down for a while, so
  that the repeat function kicks in (see MANUAL).
  The builtin LIRC and KBD remote controls already use these parameters. It is
  recommended that plugins that implement an interface to any kind of remote controls
  also use the parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta for the desired
  purpose, and remove any setup options they might have that serve the same purpose.
- cTimer no longer does any special "VFAT" handling to shorten directory names to 40
  characters. When a string is used as a directory name for a recording, the maximum
  length of the directory path, as well as the individual directory names, is now
  limited to the values specified by the new command line option --dirnames (see
  man vdr(1) for details). For backwards compatibility the option --vfat is still
  available and has the same effect as --dirnames=250,40,1.
- The macro MaxFileName is now obsolete and may be removed in future versions. Use
  NAME_MAX directly instead.
- There is no more fixed limit to the maximum number of cPixmap objects an OSD can
  create. However, a particular device may still be unable to create an arbitrary
  number of pixmaps, due to limited resources. So it's always a good idea to use
  as few pixmaps as possible.
- Fixed formatting and removed some superfluous break statements in vdr.c's command
  line option switch.
---
 CONTRIBUTORS                            |   4 +
 HISTORY                                 |  51 +++++++
 INSTALL                                 |   6 +-
 MANUAL                                  |  12 ++
 Make.config.template                    |   3 +-
 Makefile                                |   4 +-
 PLUGINS.html                            |  15 +-
 PLUGINS/src/dvbhddevice/HISTORY         |   4 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |  18 ++-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |   6 +-
 PLUGINS/src/dvbhddevice/hdffosd.c       |  10 +-
 PLUGINS/src/dvbsddevice/HISTORY         |   4 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   9 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |   3 +-
 config.c                                |  10 +-
 config.h                                |  16 ++-
 cutter.c                                |   7 +-
 device.c                                |   9 +-
 device.h                                |   9 +-
 dvbplayer.c                             |   7 +-
 lirc.c                                  |  46 +++---
 menu.c                                  |   6 +-
 menu.cyVkmHd                            |   0
 osd.c                                   |  52 ++++---
 osd.h                                   |  17 +--
 po/ar.po                                |   8 +-
 po/ca_ES.po                             |   8 +-
 po/cs_CZ.po                             |   8 +-
 po/da_DK.po                             |   8 +-
 po/de_DE.po                             |   8 +-
 po/el_GR.po                             |   8 +-
 po/es_ES.po                             |   8 +-
 po/et_EE.po                             |   8 +-
 po/fi_FI.po                             |   8 +-
 po/fr_FR.po                             |   8 +-
 po/hr_HR.po                             |   8 +-
 po/hu_HU.po                             |   8 +-
 po/it_IT.po                             |   8 +-
 po/lt_LT.po                             |   8 +-
 po/mk_MK.po                             |   8 +-
 po/nl_NL.po                             |   8 +-
 po/nn_NO.po                             |   8 +-
 po/pl_PL.po                             |   8 +-
 po/pt_PT.po                             |   8 +-
 po/ro_RO.po                             |   8 +-
 po/ru_RU.po                             |   8 +-
 po/sk_SK.po                             | 182 ++++++++++++------------
 po/sl_SI.po                             |   8 +-
 po/sr_SR.po                             |   8 +-
 po/sv_SE.po                             |   8 +-
 po/tr_TR.po                             |   8 +-
 po/uk_UA.po                             |   8 +-
 po/zh_CN.po                             |   8 +-
 recording.c                             | 151 +++++++++++++++++---
 recording.h                             |   6 +-
 remote.c                                |  61 ++++++--
 remote.h                                |   3 +-
 skinlcars.c                             |  46 ++++--
 timers.c                                |  26 +---
 timers.h                                |   4 +-
 vdr.1                                   |  20 ++-
 vdr.c                                   | 116 ++++++++++-----
 63 files changed, 832 insertions(+), 331 deletions(-)
 create mode 100644 menu.cyVkmHd

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 39bc0d38b..6219f2af0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -280,6 +280,7 @@ Uwe Scheffler <linux_dvb@uni.de>
  for reporting a problem with frozen live view in conjunction with device bonding
  for reporting a problem in handling the PrimaryLimit when requesting a device for
  live viewing
+ for reporting a black screen while a "Recording started" message is displayed
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
@@ -2384,6 +2385,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for avoiding a gcc 4.6 compiler error in the skincurses plugin.
  for suggesting to move setting LC_NUMERIC further up to make sure any floating point
  numbers use a decimal point
+ for adding dependency on 'i18n' to 'install-i18n' in the VDR Makefile
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2735,6 +2737,7 @@ Derek Kelly (user.vdr@gmail.com)
  for reporting a problem with getting the maximum short channel name length in case there
  are no short names at all
  for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8
+ for reporting a missing template for DVBDIR in Make.config.template
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -3025,6 +3028,7 @@ S
  for simplifying calculating the PTS offset in cPtsFixer::Fix() and fixing the overflow
  handling of PCR values
  for improving cutting MPEG-2 video
+ for pointing out that FindHeader() can also be used in cMpeg2Fixer::AdjTref()
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
diff --git a/HISTORY b/HISTORY
index 11cad93ec..43eca18c6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7533,3 +7533,54 @@ Video Disk Recorder Revision History
 - Improved cutting MPEG-2 video (thanks to S�ren Moch).
 - Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings
   in case the primary device can't handle the current live signal.
+
+2013-02-08: Version 1.7.37
+
+- Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by S�ren Moch).
+- Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly).
+- The LCARS menu now also works if the OSD has only 1bpp (two colors).
+- Fixed possible garbage in the remaining time of the LCARS replay display in case the
+  hours change from two to one digit.
+- Fixed upscaling bitmaps. The last row and column of the scaled bitmap was not filled,
+  which resulted in empty lines between scaled subtitles.
+- Fixed a leftover line in case a two line subtitle was followed by a one line
+  subtitle on the dvbhddevice in "high level" OSD mode.
+- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
+- The index file is now closed after initially reading it if it is older than 3600 seconds.
+- Improved responsiveness during replay when close to the recording's end.
+- Fixed a leftover progress display in the LCARS main menu when replay of a recording
+  ends while the menu is open, and the live channel has no EPG information.
+- Fixed possible audio chatter when a recording is replayed to its very end.
+- Added dependency on 'i18n' to 'install-i18n' in the VDR Makefile (thanks to Tobias
+  Grimm).
+- Changed several calls to Skins.Message() in vdr.c to Skins.QueueMessage() in order to
+  avoid a black screen while such a message is displayed in case the channel will be
+  switched (reported by Uwe Scheffler).
+- Updated the Slovakian language texts (thanks to Milan Hrala).
+- Improved LIRC timing for repeat function.
+- When pausing live video, the current audio and subtitle tracks are now retained.
+- Added some notes about plugin Makefiles to PLUGINS.html.
+- Avoiding an extra key press event if the repeat function kicks in when controlling
+  VDR via the PC keyboard.
+- The new options "Setup/Miscellaneous/Remote control repeat delay" and
+  "Setup/Miscellaneous/Remote control repeat delta" can be used to adjust the
+  behavior of the remote control in case a key is held pressed down for a while, so
+  that the repeat function kicks in (see MANUAL).
+  The builtin LIRC and KBD remote controls already use these parameters. It is
+  recommended that plugins that implement an interface to any kind of remote controls 
+  also use the parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta for the desired
+  purpose, and remove any setup options they might have that serve the same purpose.
+- cTimer no longer does any special "VFAT" handling to shorten directory names to 40
+  characters. When a string is used as a directory name for a recording, the maximum
+  length of the directory path, as well as the individual directory names, is now
+  limited to the values specified by the new command line option --dirnames (see
+  man vdr(1) for details). For backwards compatibility the option --vfat is still
+  available and has the same effect as --dirnames=250,40,1.
+- The macro MaxFileName is now obsolete and may be removed in future versions. Use
+  NAME_MAX directly instead.
+- There is no more fixed limit to the maximum number of cPixmap objects an OSD can
+  create. However, a particular device may still be unable to create an arbitrary
+  number of pixmaps, due to limited resources. So it's always a good idea to use
+  as few pixmaps as possible.
+- Fixed formatting and removed some superfluous break statements in vdr.c's command
+  line option switch.
diff --git a/INSTALL b/INSTALL
index 7654c2a97..2cf6be336 100644
--- a/INSTALL
+++ b/INSTALL
@@ -58,8 +58,10 @@ Alternatively you can use the '--lirc' option at runtime.
 This option accepts an optional path to the remote control device,
 the default of which can be set via the LIRC_DEVICE macro.
 
-If your video directory will be on a VFAT partition, you can call VDR with
-the command line option '--vfat'.
+If you want to make your video directory available to other machines that
+have limitations on directory name lengths and/or allowed characters in
+directory names, you can call VDR with the command line option '--dirnames'
+(see man vdr(1) for details).
 
 When running, the 'vdr' program writes status information into the
 system log file, which is usually /var/log/messages (or /var/log/user.log,
diff --git a/MANUAL b/MANUAL
index 2337d1924..72189fa7f 100644
--- a/MANUAL
+++ b/MANUAL
@@ -926,6 +926,18 @@ Version 1.6
                          key. Note that the total maximum is also limited by
                          the "OSD/Channel info time" parameter.
 
+  Remote control repeat delay = 300
+                         The earliest time (in milliseconds) after which the repeat
+                         function of the remote control kicks in if a key is held
+                         pressed down for a while. If the remote control in use
+                         has a repeat delay that is longer than that given in this
+                         parameter, that longer delay will prevail.
+  Remote control repeat delta = 100
+                         The time (in milliseconds) between two subsequent key
+                         presses generated by the remote control's repeat function.
+                         If the remote control in use has a repeat delta that is
+                         longer than that given in this parameter, that longer delay
+                         will prevail.
   Initial channel =      The channel ID of the channel that shall be tuned to when
                          VDR starts. Default is empty, which means that it will
                          tune to the channel that was on before VDR was stopped.
diff --git a/Make.config.template b/Make.config.template
index f37f17f0f..b02d796e8 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.16 2013/01/12 13:50:17 kls Exp $
+# $Id: Make.config.template 2.18 2013/02/08 10:31:38 kls Exp $
 
 ### The C compiler and options:
 
@@ -34,6 +34,7 @@ endif
 #MANDIR    = $(PREFIX)/share/man
 #PCDIR     = $(PREFIX)/lib/pkgconfig
 #RESDIR    = $(PREFIX)/share/vdr
+#DVBDIR    = /usr/src/v4l-dvb/linux/include/uapi
 
 #VIDEODIR  = /srv/vdr/video
 #CONFDIR   = /var/lib/vdr
diff --git a/Makefile b/Makefile
index 2a5a9b2d0..47e954fd0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.49 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 2.50 2013/01/27 14:19:49 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -183,7 +183,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
 .PHONY: i18n
 i18n: $(I18Nmsgs)
 
-install-i18n:
+install-i18n: i18n
 	@mkdir -p $(DESTDIR)$(LOCDIR)
 	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 0c7d223ad..a5713a7f2 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -173,9 +173,15 @@ <h1>Table Of Contents</h1>
 the name of that plugin (in the above example that would be <tt>hello</tt>).
 What's inside the individual source directory of a
 plugin is entirely up to the author of that plugin. The only prerequisites are
-that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt> and
+that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt><modified>, <tt>install</tt></modified> and
 <tt>clean</tt>, and that a call to <tt>make all</tt> actually produces a dynamically
 loadable library file for that plugin (we'll get to the details later).
+<modified>
+The dynamically loadable library file for the plugin shall be located directly under
+the plugin's source directory.
+See the section <a href="#Initializing a new plugin directory">Initializing a new plugin directory</a>
+for how to generate an example Makefile.
+</modified>
 <p>
 The <tt>lib</tt> directory contains the dynamically loadable libraries of all
 available plugins. Note that the names of these files are created by concatenating
@@ -2215,6 +2221,13 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 The other parameters have the same meaning as in the first version of this function.
+<p>
+<modified>
+If your remote control has a repeat function that automatically repeats key events
+if a key is held pressed down for a while, your derived class should use the global
+parameters <tt>Setup.RcRepeatDelay</tt> and <tt>Setup.RcRepeatDelta</tt> to allow
+users to configure the behavior of this function.
+</modified>
 
 <hr><h2><a name="Conditional Access">Conditional Access</a></h2>
 
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 23320197b..ceee7da85 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -51,3 +51,7 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-01-12: Version 0.0.6
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-24: Version 0.0.7
+
+- Fixed cHdffOsd::SetAreas() (didn't clear the OSD).
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index faf6c5cb9..4d755f699 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.19 2013/01/12 14:11:35 kls Exp $
+ * $Id: dvbhddevice.c 1.21 2013/01/29 08:59:36 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +12,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.6";
+static const char *VERSION        = "0.0.7";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
@@ -26,6 +26,7 @@ class cPluginDvbhddevice : public cPlugin {
   virtual const char *Version(void) { return VERSION; }
   virtual const char *Description(void) { return tr(DESCRIPTION); }
   virtual void MainThreadHook(void);
+  virtual void Stop(void);
   virtual const char *MainMenuEntry(void);
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
@@ -60,6 +61,19 @@ void cPluginDvbhddevice::MainThreadHook(void)
     }
 }
 
+void cPluginDvbhddevice::Stop(void)
+{
+    if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOff)
+    {
+        HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
+        if (hdffCmdIf)
+        {
+            hdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
+            isyslog("HDFF_CEC_COMMAND_TV_OFF");
+        }
+    }
+}
+
 const char *cPluginDvbhddevice::MainMenuEntry(void)
 {
   return gHdffSetup.HideMainMenu ? NULL : MAINMENUENTRY;
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index e81d93b9d..f25d0b76e 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.47 2012/12/29 13:23:22 kls Exp $
+ * $Id: dvbhdffdevice.c 1.48 2013/01/29 08:59:36 kls Exp $
  */
 
 #include <stdint.h>
@@ -96,10 +96,6 @@ cDvbHdFfDevice::~cDvbHdFfDevice()
     delete spuDecoder;
     if (isHdffPrimary)
     {
-        if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOff)
-        {
-            mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
-        }
         delete mHdffCmdIf;
     }
     // We're not explicitly closing any device files here, since this sometimes
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 5d55c957f..09d370ede 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hdffosd.c 1.18 2012/11/15 09:20:24 kls Exp $
+ * $Id: hdffosd.c 1.20 2013/01/29 08:59:36 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -38,7 +38,6 @@ class cHdffOsd : public cOsd
     int mTop;
     int mDispWidth;
     int mDispHeight;
-    bool shown;
     bool mChanged;
     uint32_t mDisplay;
     tFontFace mFontFaces[MAX_NUM_FONTFACES];
@@ -77,7 +76,6 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
     mHdffCmdIf = pHdffCmdIf;
     mLeft = Left;
     mTop = Top;
-    shown = false;
     mChanged = false;
     mBitmapPalette = HDFF_INVALID_HANDLE;
 
@@ -154,11 +152,10 @@ eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
     }
-    if (shown)
+    if (mDisplay != HDFF_INVALID_HANDLE)
     {
         mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
         mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-        shown = false;
     }
     error = cOsd::SetAreas(Areas, NumAreas);
 
@@ -180,11 +177,10 @@ void cHdffOsd::SetActive(bool On)
             if (GetBitmap(0)) // only flush here if there are already bitmaps
                 Flush();
         }
-        else if (shown)
+        else if (mDisplay != HDFF_INVALID_HANDLE)
         {
             mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
             mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-            shown = false;
         }
     }
 }
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 5cca3ec29..e1f985486 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -37,3 +37,7 @@ VDR Plugin 'dvbsddevice' Revision History
 2013-01-12: Version 0.0.8
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-01-25: Version 0.0.9
+
+- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 7f91d4049..8ebfe2b65 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.8 2013/01/12 14:12:07 kls Exp $
+ * $Id: dvbsddevice.c 1.9 2013/01/25 10:48:50 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.8";
+static const char *VERSION        = "0.0.9";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 56018792d..f9ff5b327 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.33 2012/03/11 13:32:42 kls Exp $
+ * $Id: dvbsdffdevice.c 2.34 2013/01/25 10:48:29 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -362,6 +362,13 @@ bool cDvbSdFfDevice::ProvidesSource(int Source) const
      return cDvbDevice::ProvidesSource(Source);
 }
 
+int cDvbSdFfDevice::NumProvidedSystems(void) const
+{
+  if (outputOnly)
+     return 0;
+  return cDvbDevice::NumProvidedSystems();
+}
+
 void cDvbSdFfDevice::TurnOffLiveMode(bool LiveView)
 {
   if (LiveView) {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index 79b4e3d83..dc55148f9 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 2.14 2012/12/03 13:43:55 kls Exp $
+ * $Id: dvbsdffdevice.h 2.15 2013/01/25 10:43:14 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
@@ -37,6 +37,7 @@ class cDvbSdFfDevice : public cDvbDevice {
 
 public:
   virtual bool ProvidesSource(int Source) const;
+  virtual int NumProvidedSystems(void) const;
 private:
   void TurnOffLiveMode(bool LiveView);
 protected:
diff --git a/config.c b/config.c
index 8c7b9d1d6..b42289315 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.32 2013/01/17 14:50:51 kls Exp $
+ * $Id: config.c 2.34 2013/02/05 11:16:08 kls Exp $
  */
 
 #include "config.h"
@@ -408,6 +408,8 @@ cSetup::cSetup(void)
   SVDRPTimeout = 300;
   ZapTimeout = 3;
   ChannelEntryTimeout = 1000;
+  RcRepeatDelay = 300;
+  RcRepeatDelta = 100;
   DefaultPriority = 50;
   DefaultLifetime = MAXLIFETIME;
   PauseKeyHandling = 2;
@@ -585,7 +587,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "MenuScrollWrap"))      MenuScrollWrap     = atoi(Value);
   else if (!strcasecmp(Name, "MenuKeyCloses"))       MenuKeyCloses      = atoi(Value);
   else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
-  else if (!strcasecmp(Name, "NameInstantRecord"))   Utf8Strn0Cpy(NameInstantRecord, Value, MaxFileName);
+  else if (!strcasecmp(Name, "NameInstantRecord"))   Utf8Strn0Cpy(NameInstantRecord, Value, sizeof(NameInstantRecord));
   else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
   else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
   else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
@@ -610,6 +612,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
+  else if (!strcasecmp(Name, "RcRepeatDelay"))       RcRepeatDelay      = atoi(Value);
+  else if (!strcasecmp(Name, "RcRepeatDelta"))       RcRepeatDelta      = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
   else if (!strcasecmp(Name, "PauseKeyHandling"))    PauseKeyHandling   = atoi(Value);
@@ -716,6 +720,8 @@ bool cSetup::Save(void)
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("ZapTimeout",         ZapTimeout);
   Store("ChannelEntryTimeout",ChannelEntryTimeout);
+  Store("RcRepeatDelay",      RcRepeatDelay);
+  Store("RcRepeatDelta",      RcRepeatDelta);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
   Store("PauseKeyHandling",   PauseKeyHandling);
diff --git a/config.h b/config.h
index 807850fbe..00b2d68e4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.60 2012/12/30 13:08:41 kls Exp $
+ * $Id: config.h 2.64 2013/02/05 11:19:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.36"
-#define VDRVERSNUM   10736  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.37"
+#define VDRVERSNUM   10737  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.36"
-#define APIVERSNUM   10736  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.37"
+#define APIVERSNUM   10737  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -49,7 +49,7 @@
 #define MINOSDHEIGHT  324
 #define MAXOSDHEIGHT 1200
 
-#define MaxFileName 256
+#define MaxFileName NAME_MAX // obsolete - use NAME_MAX directly instead!
 #define MaxSkinName 16
 #define MaxThemeName 16
 
@@ -257,7 +257,7 @@ class cSetup : public cConfig<cSetupLine> {
   int MenuScrollWrap;
   int MenuKeyCloses;
   int MarkInstantRecord;
-  char NameInstantRecord[MaxFileName];
+  char NameInstantRecord[NAME_MAX];
   int InstantRecordTime;
   int LnbSLOF;
   int LnbFrequLo;
@@ -280,6 +280,8 @@ class cSetup : public cConfig<cSetupLine> {
   int SVDRPTimeout;
   int ZapTimeout;
   int ChannelEntryTimeout;
+  int RcRepeatDelay;
+  int RcRepeatDelta;
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
   int PauseKeyHandling;
diff --git a/cutter.c b/cutter.c
index 8a6efc54c..edb28248a 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.22 2013/01/20 12:04:07 kls Exp $
+ * $Id: cutter.c 2.23 2013/01/23 10:39:27 kls Exp $
  */
 
 #include "cutter.h"
@@ -206,11 +206,8 @@ void cMpeg2Fixer::AdjGopTime(int Offset, int FramesPerSecond)
 
 void cMpeg2Fixer::AdjTref(int TrefOffset)
 {
-  Reset();
-  if (!Find(0x00000100)) {
-     esyslog("ERROR: Picture header not found!");
+  if (!FindHeader(0x00000100, "picture"))
      return;
-     }
   int Tref = GetByte() << 2;
   int Index1 = GetLastIndex();
   uchar Byte2 = GetByte();
diff --git a/device.c b/device.c
index 2678d688e..af416411d 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.70 2012/11/19 09:59:09 kls Exp $
+ * $Id: device.c 2.71 2013/02/01 12:00:09 kls Exp $
  */
 
 #include "device.h"
@@ -98,6 +98,7 @@ cDevice::cDevice(void)
   currentAudioTrack = ttNone;
   currentAudioTrackMissingCount = 0;
   currentSubtitleTrack = ttNone;
+  keepTracks = false;
   liveSubtitle = NULL;
   dvbSubtitleConverter = NULL;
   autoSelectPreferredSubtitleLanguage = true;
@@ -923,6 +924,8 @@ void cDevice::SetVolume(int Volume, bool Absolute)
 
 void cDevice::ClrAvailableTracks(bool DescriptionsOnly, bool IdsOnly)
 {
+  if (keepTracks)
+     return;
   if (DescriptionsOnly) {
      for (int i = ttNone; i < ttMaxTrackTypes; i++)
          *availableTracks[i].description = 0;
@@ -1044,6 +1047,8 @@ bool cDevice::SetCurrentSubtitleTrack(eTrackType Type, bool Manual)
 
 void cDevice::EnsureAudioTrack(bool Force)
 {
+  if (keepTracks)
+     return;
   if (Force || !availableTracks[currentAudioTrack].id) {
      eTrackType PreferredTrack = ttAudioFirst;
      int PreferredAudioChannel = 0;
@@ -1075,6 +1080,8 @@ void cDevice::EnsureAudioTrack(bool Force)
 
 void cDevice::EnsureSubtitleTrack(void)
 {
+  if (keepTracks)
+     return;
   if (Setup.DisplaySubtitles) {
      eTrackType PreferredTrack = ttNone;
      int LanguagePreference = INT_MAX; // higher than the maximum possible value
diff --git a/device.h b/device.h
index 05b56e91d..a62545179 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.43 2013/01/03 08:53:06 kls Exp $
+ * $Id: device.h 2.45 2013/02/01 11:54:08 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -490,6 +490,7 @@ class cDevice : public cThread {
   cMutex mutexCurrentSubtitleTrack;
   int currentAudioTrackMissingCount;
   bool autoSelectPreferredSubtitleLanguage;
+  bool keepTracks;
   int pre_1_3_19_PrivateStream;
 protected:
   virtual void SetAudioTrackDevice(eTrackType Type);
@@ -539,6 +540,10 @@ class cDevice : public cThread {
   void EnsureSubtitleTrack(void);
        ///< Makes sure one of the preferred language subtitle tracks is selected.
        ///< Only has an effect if Setup.DisplaySubtitles is on.
+  void SetKeepTracks(bool KeepTracks) { keepTracks = KeepTracks; }
+       ///< Controls whether the current audio and subtitle track settings shall
+       ///< be kept as they currently are, or if they shall be automatically
+       ///< adjusted. This is used when pausing live video.
 
 // Audio facilities
 
@@ -752,7 +757,7 @@ class cDevice : public cThread {
        ///< Returns -1 in case of error, otherwise the number of actually
        ///< processed bytes is returned.
        ///< PlayTs() shall process the TS packets either as a whole (returning
-       ///< n*TS_SIZE) or not at all, returning 0 or -1 and setting 'errno' accordingly).
+       ///< TS_SIZE) or not at all, returning 0 or -1 and setting 'errno' accordingly).
   bool Replaying(void) const;
        ///< Returns true if we are currently replaying.
   bool Transferring(void) const;
diff --git a/dvbplayer.c b/dvbplayer.c
index f2cb2d20e..241c7ec8e 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.28 2012/06/09 14:37:24 kls Exp $
+ * $Id: dvbplayer.c 2.29 2013/01/27 14:03:16 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -548,10 +548,11 @@ void cDvbPlayer::Action(void)
                 }
              if (p) {
                 int w;
+                bool VideoOnly = (dropFrame || playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward)) && DeviceIsPlayingVideo();
                 if (isPesRecording)
-                   w = PlayPes(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
+                   w = PlayPes(p, pc, VideoOnly);
                 else
-                   w = PlayTs(p, pc, playMode != pmPlay && !(playMode == pmSlow && playDir == pdForward) && DeviceIsPlayingVideo());
+                   w = PlayTs(p, pc, VideoOnly);
                 if (w > 0) {
                    p += w;
                    pc -= w;
diff --git a/lirc.c b/lirc.c
index e3b68db98..42f074066 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,16 +6,13 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 2.1 2011/03/08 15:35:13 kls Exp $
+ * $Id: lirc.c 2.4 2013/02/03 11:23:18 kls Exp $
  */
 
 #include "lirc.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#define REPEATDELAY 350 // ms
-#define REPEATFREQ 100 // ms
-#define REPEATTIMEOUT 500 // ms
 #define RECONNECTDELAY 3000 // ms
 
 cLircRemote::cLircRemote(const char *DeviceName)
@@ -63,8 +60,10 @@ void cLircRemote::Action(void)
 {
   cTimeMs FirstTime;
   cTimeMs LastTime;
+  cTimeMs ThisTime;
   char buf[LIRC_BUFFER_SIZE];
   char LastKeyName[LIRC_KEY_BUF] = "";
+  bool pressed = false;
   bool repeat = false;
   int timeout = -1;
 
@@ -94,34 +93,43 @@ void cLircRemote::Action(void)
               esyslog("ERROR: unparseable lirc command: %s", buf);
               continue;
               }
+           int Delta = ThisTime.Elapsed(); // the time between two subsequent LIRC events
+           ThisTime.Set();
            if (count == 0) {
-              if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < REPEATDELAY)
+              if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay)
                  continue; // skip keys coming in too fast
               if (repeat)
                  Put(LastKeyName, false, true);
               strcpy(LastKeyName, KeyName);
+              pressed = true;
               repeat = false;
               FirstTime.Set();
               timeout = -1;
               }
+           else if (FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay)
+              continue; // repeat function kicks in after a short delay
+           else if (LastTime.Elapsed() < (uint)Setup.RcRepeatDelta)
+              continue; // skip same keys coming in too fast
            else {
-              if (LastTime.Elapsed() < REPEATFREQ)
-                 continue; // repeat function kicks in after a short delay (after last key instead of first key)
-              if (FirstTime.Elapsed() < REPEATDELAY)
-                 continue; // skip keys coming in too fast (for count != 0 as well)
               repeat = true;
-              timeout = REPEATDELAY;
+              timeout = Delta * 10 / 9;
               }
-           LastTime.Set();
-           Put(KeyName, repeat);
+           if (pressed)
+              LastTime.Set();
+              Put(KeyName, repeat);
            }
-        else if (repeat) { // the last one was a repeat, so let's generate a release
-           if (LastTime.Elapsed() >= REPEATTIMEOUT) {
-              Put(LastKeyName, false, true);
-              repeat = false;
-              *LastKeyName = 0;
-              timeout = -1;
-              }
+        else if (pressed && repeat) { // the last one was a repeat, so let's generate a release
+           Put(LastKeyName, false, true);
+           pressed = false;
+           repeat = false;
+           *LastKeyName = 0;
+           timeout = -1;
+           }
+        else {
+           pressed = false;
+           repeat = false;
+           *LastKeyName = 0;
+           timeout = -1;
            }
         }
 }
diff --git a/menu.c b/menu.c
index d7faa872b..ae3898477 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.74 2013/01/17 14:20:08 kls Exp $
+ * $Id: menu.c 2.76 2013/02/02 14:00:39 kls Exp $
  */
 
 #include "menu.h"
@@ -3186,6 +3186,8 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"),            &data.ZapTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Remote control repeat delay (ms)"), &data.RcRepeatDelay, 0));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Remote control repeat delta (ms)"), &data.RcRepeatDelta, 0));
   Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"),              &data.ChannelsWrap));
@@ -4485,6 +4487,7 @@ cString cReplayControl::fileName;
 cReplayControl::cReplayControl(bool PauseLive)
 :cDvbPlayerControl(fileName, PauseLive)
 {
+  cDevice::PrimaryDevice()->SetKeepTracks(PauseLive);
   currentReplayControl = this;
   displayReplay = NULL;
   marksModified = false;
@@ -4504,6 +4507,7 @@ cReplayControl::cReplayControl(bool PauseLive)
 
 cReplayControl::~cReplayControl()
 {
+  cDevice::PrimaryDevice()->SetKeepTracks(false);
   Hide();
   cStatus::MsgReplaying(this, NULL, fileName, false);
   Stop();
diff --git a/menu.cyVkmHd b/menu.cyVkmHd
new file mode 100644
index 000000000..e69de29bb
diff --git a/osd.c b/osd.c
index 75f13f4be..b9fdefd91 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.33 2012/12/15 11:16:41 kls Exp $
+ * $Id: osd.c 2.35 2013/02/08 10:16:47 kls Exp $
  */
 
 #include "osd.h"
@@ -853,12 +853,12 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
      b->SetBpp(8);
      b->Replace(*this); // copy palette (must be done *after* SetBpp()!)
      int SourceY = 0;
-     for (int y = 0; y < b->Height() - 1; y++) {
+     for (int y = 0; y < b->Height(); y++) {
          int SourceX = 0;
-         int sy = SourceY >> 16;
+         int sy = min(SourceY >> 16, Height() - 2);
          uint8_t BlendY = 0xFF - ((SourceY >> 8) & 0xFF);
-         for (int x = 0; x < b->Width() - 1; x++) {
-             int sx = SourceX >> 16;
+         for (int x = 0; x < b->Width(); x++) {
+             int sx = min(SourceX >> 16, Width() - 2);
              uint8_t BlendX = 0xFF - ((SourceX >> 8) & 0xFF);
              tColor c1 = b->Blend(GetColor(sx, sy),     GetColor(sx + 1, sy),     BlendX);
              tColor c2 = b->Blend(GetColor(sx, sy + 1), GetColor(sx + 1, sy + 1), BlendX);
@@ -1631,7 +1631,6 @@ cOsd::cOsd(int Left, int Top, uint Level)
   savedBitmap = NULL;
   numBitmaps = 0;
   savedPixmap = NULL;
-  numPixmaps = 0;
   left = Left;
   top = Top;
   width = height = 0;
@@ -1653,7 +1652,7 @@ cOsd::~cOsd()
       delete bitmaps[i];
   delete savedBitmap;
   delete savedPixmap;
-  for (int i = 0; i < numPixmaps; i++)
+  for (int i = 0; i < pixmaps.Size(); i++)
       delete pixmaps[i];
   for (int i = 0; i < Osds.Size(); i++) {
       if (Osds[i] == this) {
@@ -1702,15 +1701,11 @@ void cOsd::DestroyPixmap(cPixmap *Pixmap)
 {
   if (isTrueColor) {
      LOCK_PIXMAPS;
-     for (int i = 1; i < numPixmaps; i++) { // begin at 1 - don't let the background pixmap be destroyed!
+     for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed!
          if (pixmaps[i] == Pixmap) {
             pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort());
             delete Pixmap;
-            while (i < numPixmaps - 1) {
-                  pixmaps[i] = pixmaps[i + 1];
-                  i++;
-                  }
-            numPixmaps--;
+            pixmaps[i] = NULL;
             return;
             }
          }
@@ -1722,12 +1717,13 @@ cPixmap *cOsd::AddPixmap(cPixmap *Pixmap)
 {
   if (Pixmap) {
      LOCK_PIXMAPS;
-     if (numPixmaps < MAXOSDPIXMAPS)
-        return pixmaps[numPixmaps++] = Pixmap;
-     else
-        esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS);
+     for (int i = 0; i < pixmaps.Size(); i++) {
+         if (!pixmaps[i])
+            return pixmaps[i] = Pixmap;
+         }
+     pixmaps.Append(Pixmap);
      }
-  return NULL;
+  return Pixmap;
 }
 
 cPixmapMemory *cOsd::RenderPixmaps(void)
@@ -1737,12 +1733,13 @@ cPixmapMemory *cOsd::RenderPixmaps(void)
      LOCK_PIXMAPS;
      // Collect overlapping dirty rectangles:
      cRect d;
-     for (int i = 0; i < numPixmaps; i++) {
-         cPixmap *pm = pixmaps[i];
-         if (!pm->DirtyViewPort().IsEmpty()) {
-            if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) {
-               d.Combine(pm->DirtyViewPort());
-               pm->SetClean();
+     for (int i = 0; i < pixmaps.Size(); i++) {
+         if (cPixmap *pm = pixmaps[i]) {
+            if (!pm->DirtyViewPort().IsEmpty()) {
+               if (d.IsEmpty() || d.Intersects(pm->DirtyViewPort())) {
+                  d.Combine(pm->DirtyViewPort());
+                  pm->SetClean();
+                  }
                }
             }
          }
@@ -1758,10 +1755,11 @@ cPixmapMemory *cOsd::RenderPixmaps(void)
         Pixmap->Clear();
         // Render the individual pixmaps into the resulting pixmap:
         for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) {
-            for (int i = 0; i < numPixmaps; i++) {
-                cPixmap *pm = pixmaps[i];
-                if (pm->Layer() == Layer)
+            for (int i = 0; i < pixmaps.Size(); i++) {
+                if (cPixmap *pm = pixmaps[i]) {
+                   if (pm->Layer() == Layer)
                    Pixmap->DrawPixmap(pm, d);
+                   }
                 }
             }
 #ifdef DebugDirty
diff --git a/osd.h b/osd.h
index 0084caa64..7eb8db62c 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.18 2012/12/03 13:49:02 kls Exp $
+ * $Id: osd.h 2.19 2013/02/08 09:47:56 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -701,7 +701,6 @@ class cPixmapMemory : public cPixmap {
   };
 
 #define MAXOSDAREAS 16
-#define MAXOSDPIXMAPS 64
 
 /// The cOsd class is the interface to the "On Screen Display".
 /// An actual output device needs to derive from this class and implement
@@ -725,8 +724,7 @@ class cOsd {
   cBitmap *bitmaps[MAXOSDAREAS];
   int numBitmaps;
   cPixmapMemory *savedPixmap;
-  cPixmap *pixmaps[MAXOSDPIXMAPS];
-  int numPixmaps;
+  cVector<cPixmap *> pixmaps;
   int left, top, width, height;
   uint level;
   bool active;
@@ -755,14 +753,10 @@ class cOsd {
   virtual void SetActive(bool On) { active = On; }
        ///< Sets this OSD to be the active one.
        ///< A derived class must call cOsd::SetActive(On).
-  const cPixmap * const *Pixmaps(void) { return pixmaps; }
-       ///< Returns the list of currently active pixmaps in this OSD.
-  int NumPixmaps(void) { return numPixmaps; }
-       ///< Returns the number of currently active pixmaps in this OSD.
   cPixmap *AddPixmap(cPixmap *Pixmap);
        ///< Adds the given Pixmap to the list of currently active pixmaps in this OSD.
-       ///< Returns Pixmap if the operation was successful, or NULL if the maximum
-       ///< number of pixmaps has been exceeded.
+       ///< Returns Pixmap if the operation was successful, or NULL if for some reason
+       ///< the pixmap could not be added to the list.
        ///< A derived class that implements its own cPixmap class must call AddPixmap()
        ///< in order to add a newly created pixmap to the OSD's list of pixmaps.
   cPixmapMemory *RenderPixmaps(void);
@@ -824,7 +818,8 @@ class cOsd {
        ///< The caller must not delete the returned object, it will be deleted when
        ///< the OSD is deleted. DestroyPixmap() can be called if a pixmap shall be
        ///< destroyed before the OSD is deleted.
-       ///< If this is not a true color OSD, this function returns NULL.
+       ///< If this is not a true color OSD, or if the pixmap could not be created
+       ///< due to limited resources, this function returns NULL.
   virtual void DestroyPixmap(cPixmap *Pixmap);
        ///< Destroys the given Pixmap, which has previously been created by a call to
        ///< CreatePixmap(). When the OSD is deleted, all pixmaps are destroyed
diff --git a/po/ar.po b/po/ar.po
index 946cc6639..a44917d2c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1154,6 +1154,12 @@ msgstr ""
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "مدة انتهاء مدخلات القناة بالدقيقة"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "القناة الاساسية"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 437542fd0..f1a24fcda 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1131,6 +1131,12 @@ msgstr "Temps d'espera Zap (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Temps d'introducci� canal (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index b0d5b7d16..a4f2515d5 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1130,6 +1130,12 @@ msgstr "Časový limit Zap (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Prodleva při volbě kanálu (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanál po spuštění"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 6ca6c86ab..511e03f65 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "Zap timeout (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanal adgang timeout (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal ved opstart"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 5476d9c75..77af04a70 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "Mindestzeit f
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Zeitlimit f�r Kanaleingabe (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr "Fernbedienung Wiederholverz�gerung (ms)"
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr "Fernbedienung Wiederholintervall (ms)"
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal beim Einschalten"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index bf8933ec7..d0c1c7dfe 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 6a6f4e422..9e120e741 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1129,6 +1129,12 @@ msgstr "Considerar canal como visto (sg)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Tiempo introducci�n canal (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 1d342366b..7382a013f 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "Kanalivahetuse ooteaeg (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanali sisestamise ajalimiit (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal käivitamisel"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 9a9fa747c..164a376eb 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1131,6 +1131,12 @@ msgstr "Kanavavalinnan odotusaika (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanavasyötteen odotusaika (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanava käynnistettäessä"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 55983d404..186b6e13f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-02-27 18:14+0100\n"
 "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1134,6 +1134,12 @@ msgstr "Prise en compte cha
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Entr�e cha�ne timeout (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Cha�ne initiale"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index b7b2d4f49..af63cc12f 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1130,6 +1130,12 @@ msgstr "Zap istje
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Upis kanala istje�e (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Po�etni kanal"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 919d3b2d1..a2cc9d0c1 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2012-01-02 11:54+0200\n"
 "Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1132,6 +1132,12 @@ msgstr "Ad
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Csatornav�lt�s timeout (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Csatorna indul�skor"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 8df7150f4..1425dc9cd 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2012-12-22 19:00+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1135,6 +1135,12 @@ msgstr "Scadenza Zapping (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Scadenza voce canale (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canale iniziale"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 931900ffb..f1986eba7 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "Kanalo perjungimo užlaikymas (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Užlaikymas (ms) kanalo įvedimui"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanalas įjungimo metu"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index b7570b66c..b6c2d54f5 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1129,6 +1129,12 @@ msgstr "Зап тајмаут (сек)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Тајмаут за внес на канал (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Почетен канал"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index a7dbadf1a..ab16a2afc 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1132,6 +1132,12 @@ msgstr "Zap timeout (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Tijdsduur kanaalinvoer (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Opstartkanaal"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index aeeb0bb41..664018bbc 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1129,6 +1129,12 @@ msgstr ""
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index c4e36d78e..1580b0bb5 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1129,6 +1129,12 @@ msgstr "Czas oczekiwania na zap (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Min�� czas wej�cia do kana�u"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Pocz�tkowy kana�"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 44f103598..9dec2876d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1129,6 +1129,12 @@ msgstr "Tempo de espera entre mudan
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Tempo de espera ao mudar de canal (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index ffdb44c8b..4087af80d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.12\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2012-11-05 01:28+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1131,6 +1131,12 @@ msgstr "Interval zapping (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Timeout la introducerea canalului (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canalul de pornire"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 42bdcc92e..9bcf571fc 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-12-15 14:37+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1129,6 +1129,12 @@ msgstr "
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "������ ������� ��� ����� ������ (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "����� ��� ���������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 118747a6c..6aea45c27 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,14 +1,14 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Milan Hrala <hrala.milan@gmail.com>, 2011
+# Milan Hrala <hrala.milan@gmail.com>, 2011, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
-"PO-Revision-Date: 2011-02-15 16:29+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"PO-Revision-Date: 2013-01-29 22:39+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
@@ -74,7 +74,7 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Za��na preh�ad�va� EPG"
@@ -329,50 +329,50 @@ msgstr "Slovensky"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
-msgstr "slv"
+msgstr "slk"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "F�za 1: Detekcia typu k�du"
+msgstr "F�za 1: Detekcia typu dia�kov�ho ovl�dania"
 
 msgid "Press any key on the RC unit"
-msgstr "Stla�te �ubovoln� kl�vesu ovl�dania"
+msgstr "Stla�te �ubovoln� tla�idlo ovl�dania"
 
 msgid "RC code detected!"
-msgstr "K�d bol zisten�!"
+msgstr "Bol zosn�man� k�d dia�kov�ho ovl�dania!"
 
 msgid "Do not press any key..."
 msgstr "Nestl��ajte �iadne kl�vesy..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "F�za 2: Ur�enie konkr�tneho k�du kl�ves"
+msgstr "F�za 2: Ur�enie funkcie tla�idiel"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Stla�te kl�vesu pre '%s'"
+msgstr "Stla�te tla�idlo pre funkciu  '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Pre potvrdenie stla�te kl�vesu 'Hore'"
+msgstr "Pre potvrdenie stla�te tla�idlo 'Hore'"
 
 msgid "Press 'Down' to continue"
-msgstr "Pokra�ujete stla�en�m kl�vesy 'Dole' "
+msgstr "Pokra�ujete stla�en�m tla�idla 'Dole' "
 
 msgid "(press 'Up' to go back)"
-msgstr "(Vr�tite sa stla�en�m kl�vesy 'hore')"
+msgstr "(Vr�tite sa stla�en�m tla�idla 'hore')"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(Definovanie tla��tok ukon��te stla�en�m kl�vesy 'dole')"
+msgstr "(Definovanie tla�idiel ukon��te stla�en�m tla�idla 'dole')"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(stla�en�m 'Menu' presko��te defin�ciu kl�vesy)"
+msgstr "(stla�en�m 'Menu' presko��te defin�ciu tla�idla)"
 
 msgid "Learning Remote Control Keys"
-msgstr "Ur�enie k�du dia�kov�ho ovl�dania"
+msgstr "Programovanie dia�kov�ho ovl�dania"
 
 msgid "Phase 3: Saving key codes"
-msgstr "F�za 3: Ulo�enie k�du"
+msgstr "F�za 3: Ulo�enie k�du tla�idiel"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Stla�en�m 'hore' ulo��te, 'Dole' zru��te"
+msgstr "Nastavenie stla�en�m tla�idla 'hore' ulo��te, 'Dole' zru��te"
 
 msgid "Key$Up"
 msgstr "Hore"
@@ -411,13 +411,13 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Prehra�/Pozastavi�"
 
 msgid "Key$Play"
 msgstr "Prehra�"
 
 msgid "Key$Pause"
-msgstr "Preru�i�"
+msgstr "Pozastavi�"
 
 msgid "Key$Stop"
 msgstr "Zastavi�"
@@ -432,10 +432,10 @@ msgid "Key$FastRew"
 msgstr "Preto�i� sp�"
 
 msgid "Key$Next"
-msgstr "�alej"
+msgstr "Nasleduj�ci"
 
 msgid "Key$Prev"
-msgstr "Sp�"
+msgstr "Predch�dzaj�ci"
 
 msgid "Key$Power"
 msgstr "Vyp�na�"
@@ -465,7 +465,7 @@ msgid "Key$Subtitles"
 msgstr "Titulky"
 
 msgid "Key$Schedule"
-msgstr "Program (EPG)"
+msgstr "Telev�zny program"
 
 msgid "Key$Channels"
 msgstr "Kan�ly"
@@ -519,7 +519,7 @@ msgid "encrypted"
 msgstr "k�dovan�"
 
 msgid "Edit channel"
-msgstr "�pravy kan�lu"
+msgstr "Prisp�sobi� kan�l"
 
 msgid "Name"
 msgstr "N�zov"
@@ -564,13 +564,13 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Channel settings are not unique!"
-msgstr "Nastavenia kan�lu nie s� oby�ajn�!"
+msgstr "Nastavenia kan�lu nie s� v�nimo�n�!"
 
 msgid "Channels"
 msgstr "Kan�ly"
 
 msgid "Button$Edit"
-msgstr "�pravy"
+msgstr "Upravi�"
 
 msgid "Button$New"
 msgstr "Nov�"
@@ -616,7 +616,7 @@ msgid "Edit timer"
 msgstr "�prava pl�nu nahr�vania"
 
 msgid "Active"
-msgstr "V �innosti"
+msgstr "Akt�vny"
 
 msgid "Channel"
 msgstr "Kan�l"
@@ -625,10 +625,10 @@ msgid "Day"
 msgstr "De�"
 
 msgid "Start"
-msgstr "Za�iatok"
+msgstr "Za��na"
 
 msgid "Stop"
-msgstr "Koniec"
+msgstr "Kon��"
 
 msgid "VPS"
 msgstr "VPS"
@@ -646,13 +646,13 @@ msgid "Button$Folder"
 msgstr "Zlo�ka"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "bez opakovania"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "s opakovan�m"
 
 msgid "First day"
-msgstr "Prv� de�"
+msgstr "Odo d�a"
 
 msgid "Select folder"
 msgstr "Vybra� zlo�ku"
@@ -685,13 +685,13 @@ msgid "Button$Switch"
 msgstr "Prepn��"
 
 msgid "What's on now?"
-msgstr "�o ide?"
+msgstr "�o ide aktu�lne?"
 
 msgid "What's on next?"
 msgstr "�o nasleduje?"
 
 msgid "Button$Next"
-msgstr "�alej"
+msgstr "Nasleduje"
 
 msgid "Button$Now"
 msgstr "Teraz"
@@ -730,7 +730,7 @@ msgid "Button$Play"
 msgstr "Prehra�"
 
 msgid "Button$Rewind"
-msgstr "Na za�iatok"
+msgstr "Od za�iatku"
 
 msgid "Recordings"
 msgstr "Nahr�vky"
@@ -745,7 +745,7 @@ msgid "Delete recording?"
 msgstr "Zmaza� nahr�vku?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Nahr�vka sa upravuje - Naozaj zmaza�?"
 
 msgid "Error while deleting recording!"
 msgstr "Pri vymaz�van� nahr�vky pri�lo k chybe!"
@@ -835,7 +835,7 @@ msgid "Setup.OSD$Scroll pages"
 msgstr "Rolova� strany"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Z konca na za�iatok"
+msgstr "Rolova� cyklicky"
 
 msgid "Setup.OSD$Menu key closes"
 msgstr "Kl�vesa Menu zaviera"
@@ -847,25 +847,25 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Zlo�ky v menu pl�nova�a"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr "��seln� tla�idl� pre znaky"
+msgstr "P�sa� znaky ��seln�mi tla�idlami"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Farba kl�vesy 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Farba kl�vesy 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Farba kl�vesy 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Farba kl�vesy 3"
 
 msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "Sn�ma�"
+msgstr "Skenova�"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "�asov� limit pre sn�manie EPG (h)"
@@ -880,7 +880,7 @@ msgid "Setup.EPG$Set system time"
 msgstr "Nastavi� syst�mov� �as"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Pou�i� �as z kan�lu"
+msgstr "Pou�i� �as z transpond�ru"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -930,7 +930,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Hlavn� DVB rozhranie"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Kompatibiln� norma"
 
 msgid "Setup.DVB$Video format"
 msgstr "Form�t videa"
@@ -985,10 +985,10 @@ msgstr "Horn
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Zariadenie %d je pripojen� na sat. k�bel"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "vlastn�"
 
 msgid "CAM reset"
 msgstr "Resetnutie CAMu"
@@ -1021,13 +1021,13 @@ msgid "Can't reset CAM!"
 msgstr "CAM modul nejde re�tartova�!"
 
 msgid "do not pause live video"
-msgstr "nepreru�ova� �iv� vysielanie"
+msgstr "nepozastavova� �iv� vysielanie"
 
 msgid "confirm pause live video"
-msgstr "potvrdi� preru�enie �iv�ho vysielania"
+msgstr "potvrdi� pozastavenie �iv�ho vysielania"
 
 msgid "pause live video"
-msgstr "preru�i� �iv� vysielanie"
+msgstr "pozastavi� �iv� vysielanie"
 
 msgid "confirm"
 msgstr "overi�"
@@ -1078,7 +1078,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "D�ka okam�it�ho nahr�vania (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "s��asn� udalos�"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maxim�lna ve�kos� nahr�vky (MB)"
@@ -1099,34 +1099,40 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Zobrazi� sp�sob prehr�vania"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Zobrazi� zost�vaj�ci �as"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "�as zobrazenia ukazovate�a priebehu (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pozastavi� prehr�vanie pri stanoven� zna�ky"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID obnovenie"
+msgstr "ident. ��slo obnovenia prehr�vania"
 
 msgid "Miscellaneous"
 msgstr "R�zne"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Min. pauza medzi udalos�ami (min)"
+msgstr "limit pred nahr�van�m (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "�asov� limit ne�innosti (min)"
+msgstr "vymedzi� u��vate�sk� ne�innos� (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "�asov� limit SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "�asov� limit Zap (s)"
+msgstr "pam�ta� predo�l� kan�l po ... (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "�as pri vo�be kan�la (ms)"
+msgstr "limit pri vo�be kan�la (ms)"
+
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kan�l po spusten�"
@@ -1138,10 +1144,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitos� po spusten�"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "Prep�na� z prv�ho na posledn� a opa�ne"
+msgstr "Kan�ly cyklova� pri prepnut�"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Zobrazi� kan�ly so zdrojom"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "N�dzov� ukon�enie"
@@ -1192,22 +1198,22 @@ msgid "Cancel editing?"
 msgstr "Zru�i� �pravy?"
 
 msgid "No audio available!"
-msgstr "Zvuk nie je dostupn�!"
+msgstr "Zvukov� stopy nie s� dostupn�!"
 
 msgid "No subtitles"
 msgstr "Bez titulkov"
 
 msgid "No subtitles available!"
-msgstr "�iadne dostupn� titulky!"
+msgstr "�iadne titulky nie s� dostupn�!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "M�lo voln�ho miesta na nahr�vanie!"
 
 msgid "No free DVB device to record!"
-msgstr "�iadna DVB karta nie je voln� pre nahr�vanie"
+msgstr "Pre nahr�vanie nie je voln� �iadne DVB zariadenie!"
 
 msgid "Pausing live video..."
-msgstr "Preru�uje sa be�iaci program ..."
+msgstr "Pozastavuje sa �iv� vysielanie ..."
 
 msgid "Delete timeshift recording?"
 msgstr "Vymaza� timeshift z�znamy?"
@@ -1217,19 +1223,19 @@ msgid "Jump: "
 msgstr "Skok: "
 
 msgid "No editing marks defined!"
-msgstr "Nie s� ur�en� zna�ky �prav!"
+msgstr "Neboli vyzna�en� zna�ky pre zostrihanie!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Neboli ur�en� sekvencie �prav!"
 
 msgid "Can't start editing process!"
-msgstr "Nem��e za�a� spracovanie �prav!"
+msgstr "Nem��e za�a� zostrihanie!"
 
 msgid "Editing process started"
-msgstr "Spracovanie �prav za�alo"
+msgstr "Proces strihania sa spustil"
 
 msgid "Editing process already active!"
-msgstr "Spracovanie �prav je v �innosti!"
+msgstr "Proces zostrihania je akt�vny!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " a��bc�d�e�fghi�jkl�mn�o��pqr�s�t�u�vwxy�z�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
@@ -1256,22 +1262,22 @@ msgid "Channel locked (recording)!"
 msgstr "Kan�l je zamknut� (nahr�va sa)!"
 
 msgid "Low disk space!"
-msgstr "Za chv��ku bude pln� disk!"
+msgstr "Nedostatok miesta na disku!"
 
 msgid "Regenerating index file"
-msgstr "Regenera�n� indexov� s�bor"
+msgstr "Obnova indexov�ho s�boru"
 
 msgid "Index file regeneration complete"
-msgstr "Regener�cia indexov�ho s�boru hotov�"
+msgstr "Obnova indexov�ho s�boru hotov�"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Obnova indexov�ho s�boru zlyhala!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnutie nie je mo�n� - ch�ba vo�ba '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Upravujem - aj tak vypn��?"
+msgstr "Zostrih�va sa - aj tak vypn��?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Nahr�va - aj tak vypn��?"
@@ -1281,11 +1287,11 @@ msgid "Recording in %ld minutes, shut down anyway?"
 msgstr "Nahr�vanie za�ne za %ld min�t - aj tak vypn��?"
 
 msgid "shut down anyway?"
-msgstr "Aj tak vypn��?"
+msgstr "Ur�ite vypn��?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Modul %s �tartuje za %ld min., pokra�ova�?"
+msgstr "Modul %s sa prebud� za %ld min., pokra�ova�?"
 
 msgid "Editing - restart anyway?"
 msgstr "Upravuje sa - aj tak re�tartova�?"
@@ -1294,7 +1300,7 @@ msgid "Recording - restart anyway?"
 msgstr "Nahr�va - aj tak re�tartova�?"
 
 msgid "restart anyway?"
-msgstr "Aj tak re�tartova�?"
+msgstr "Ur�ite re�tartova�?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1304,22 +1310,22 @@ msgid "Classic VDR"
 msgstr "Klasick� VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "ZA�A�ENIE"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "PL�NY"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "ZARIADENIA"
 
 msgid "LIVE"
-msgstr ""
+msgstr "NA�IVO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "PREHR�VA SA"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG panely"
@@ -1363,7 +1369,7 @@ msgid "Recording started"
 msgstr "Za�alo nahr�vanie"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "Vypnutie VDR bude odlo�en� - platnos� potvrdte kl�vesou Power"
+msgstr "VDR sa vypne neskor�ie. - Vyn�tenie potvrdte kl�vesou Power"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Ktor�ko�vek kl�vesa zru�� vypnutie"
@@ -1372,10 +1378,10 @@ msgid "Switching primary DVB..."
 msgstr "Prep�na hlavn� DVB..."
 
 msgid "Editing process failed!"
-msgstr "Spracovanie �prav zlyhalo!"
+msgstr "Zostrih�vanie zlyhalo!"
 
 msgid "Editing process finished"
-msgstr "Spracovanie �prav skon�ilo"
+msgstr "Proces zostrih�vania dokon�en�"
 
 msgid "Press any key to cancel restart"
 msgstr "ktor�ko�vek  kl�vesa zru�� re�tart"
@@ -1388,4 +1394,4 @@ msgid "Disk"
 msgstr "Disk"
 
 msgid "free"
-msgstr "volne"
+msgstr "vo�n�"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index d3ef84c61..6c6abb557 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-02-28 19:44+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1129,6 +1129,12 @@ msgstr "
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Timeout za vnos kanala (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Privzeti kanal"
 
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 0a73f121e..b73204449 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1151,6 +1151,12 @@ msgstr "Zap isti
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Upis kanala isti�e (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Po�etni kanal"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 3c4964681..b5df87de3 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-03-12 18:25+0100\n"
 "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1131,6 +1131,12 @@ msgstr "Zap timeout(s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Timeout kanal (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal vid uppstart"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 8b83d5fbb..30e3fbd2b 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "Zaping zaman a
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanal giri� zaman a��m� (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "A��l��daki kanal"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 21ef7901b..4144c7aa2 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-04-25 16:35+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1128,6 +1128,12 @@ msgstr "Затримка переключання каналу (сек)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Затримка часу для впровадження каналу (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Канал при включенні"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a03396e14..3f4a6c6d8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-12-07 14:59+0100\n"
+"POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2009-09-23 23:50+0800\n"
 "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1131,6 +1131,12 @@ msgstr "Zap 超时 (s)"
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "频道进入超时 (ms)"
 
+msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "初始频道"
 
diff --git a/recording.c b/recording.c
index 9cd052232..57248a078 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.83 2013/01/16 14:17:44 kls Exp $
+ * $Id: recording.c 2.86 2013/02/08 09:02:07 kls Exp $
  */
 
 #include "recording.h"
@@ -64,11 +64,11 @@
 #define MARKSUPDATEDELTA   10 // seconds between checks for updating editing marks
 #define MININDEXAGE      3600 // seconds before an index file is considered no longer to be written
 
-#define MAX_SUBTITLE_LENGTH  40
-
 #define MAX_LINK_LEVEL  6
 
-bool VfatFileSystem = false;
+int DirectoryPathMax = PATH_MAX;
+int DirectoryNameMax = NAME_MAX;
+bool DirectoryEncoding = false;
 int InstanceId = 0;
 
 cRecordings DeletedRecordings(true);
@@ -540,22 +540,30 @@ tCharExchange CharExchange[] = {
   { 0, 0 }
   };
 
+const char *InvalidChars = "\"\\/:*?|<>#";
+
+bool NeedsConversion(const char *p)
+{
+  return DirectoryEncoding &&
+         (strchr(InvalidChars, *p) // characters that can't be part of a Windows file/directory name
+          || *p == '.' && (!*(p + 1) || *(p + 1) == FOLDERDELIMCHAR)); // Windows can't handle '.' at the end of file/directory names
+}
+
 char *ExchangeChars(char *s, bool ToFileSystem)
 {
   char *p = s;
   while (*p) {
-        if (VfatFileSystem) {
-           // The VFAT file system can't handle all characters, so we
+        if (DirectoryEncoding) {
+           // Some file systems can't handle all characters, so we
            // have to take extra efforts to encode/decode them:
            if (ToFileSystem) {
-              const char *InvalidChars = "\"\\/:*?|<>#";
               switch (*p) {
                      // characters that can be mapped to other characters:
                      case ' ': *p = '_'; break;
                      case FOLDERDELIMCHAR: *p = '/'; break;
                      // characters that have to be encoded:
                      default:
-                       if (strchr(InvalidChars, *p) || *p == '.' && (!*(p + 1) || *(p + 1) == FOLDERDELIMCHAR)) { // Windows can't handle '.' at the end of file/directory names
+                       if (NeedsConversion(p)) {
                           int l = p - s;
                           if (char *NewBuffer = (char *)realloc(s, strlen(s) + 10)) {
                              s = NewBuffer;
@@ -610,6 +618,107 @@ char *ExchangeChars(char *s, bool ToFileSystem)
   return s;
 }
 
+char *LimitNameLengths(char *s, int PathMax, int NameMax)
+{
+  // Limits the total length of the directory path in 's' to PathMax, and each
+  // individual directory name to NameMax. The lengths of characters that need
+  // conversion when using 's' as a file name are taken into account accordingly.
+  // If a directory name exceeds NameMax, it will be truncated. If the whole
+  // directory path exceeds PathMax, individual directory names will be shortened
+  // (from right to left) until the limit is met, or until the currently handled
+  // directory name consists of only a single character. All operations are performed
+  // directly on the given 's', which may become shorter (but never longer) than
+  // the original value.
+  // Returns a pointer to 's'.
+  int Length = strlen(s);
+  int PathLength = 0;
+  // Collect the resulting lengths of each character:
+  bool NameTooLong = false;
+  int8_t a[Length];
+  int n = 0;
+  int NameLength = 0;
+  for (char *p = s; *p; p++) {
+      if (*p == FOLDERDELIMCHAR) {
+         a[n] = -1; // FOLDERDELIMCHAR is a single character, neg. sign marks it
+         NameTooLong |= NameLength > NameMax;
+         NameLength = 0;
+         PathLength += 1;
+         }
+      else if (NeedsConversion(p)) {
+         a[n] = 3; // "#xx"
+         NameLength += 3;
+         PathLength += 3;
+         }
+      else {
+         int8_t l = Utf8CharLen(p);
+         a[n] = l;
+         NameLength += l;
+         PathLength += l;
+         while (l-- > 1) {
+               a[++n] = 0;
+               p++;
+               }
+         }
+      n++;
+      }
+  NameTooLong |= NameLength > NameMax;
+  // Limit names to NameMax:
+  if (NameTooLong) {
+     while (n > 0) {
+           // Calculate the length of the current name:
+           int NameLength = 0;
+           int i = n;
+           int b = i;
+           while (i-- > 0 && a[i] >= 0) {
+                 NameLength += a[i];
+                 b = i;
+                 }
+           // Shorten the name if necessary:
+           if (NameLength > NameMax) {
+              int l = 0;
+              i = n;
+              while (i-- > 0 && a[i] >= 0) {
+                    l += a[i];
+                    if (NameLength - l <= NameMax) {
+                       memmove(s + i, s + n, Length - n + 1);
+                       memmove(a + i, a + n, Length - n + 1);
+                       Length -= n - i;
+                       PathLength -= l;
+                       break;
+                       }
+                    }
+              }
+           // Switch to the next name:
+           n = b - 1;
+           }
+     }
+  // Limit path to PathMax:
+  n = Length;
+  while (PathLength > PathMax && n > 0) {
+        // Calculate how much to cut off the current name:
+        int i = n;
+        int b = i;
+        int l = 0;
+        while (--i > 0 && a[i - 1] >= 0) {
+              if (a[i] > 0) {
+                 l += a[i];
+                 b = i;
+                 if (PathLength - l <= PathMax)
+                    break;
+                 }
+              }
+        // Shorten the name if necessary:
+        if (l > 0) {
+           memmove(s + b, s + n, Length - n + 1);
+           Length -= n - b;
+           PathLength -= l;
+           }
+        // Switch to the next name:
+        n = i - 1;
+        }
+  return s;
+}
+
 cRecording::cRecording(cTimer *Timer, const cEvent *Event)
 {
   resume = RESUME_NOT_INITIALIZED;
@@ -628,16 +737,10 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   // set up the actual name:
   const char *Title = Event ? Event->Title() : NULL;
   const char *Subtitle = Event ? Event->ShortText() : NULL;
-  char SubtitleBuffer[MAX_SUBTITLE_LENGTH];
   if (isempty(Title))
      Title = Timer->Channel()->Name();
   if (isempty(Subtitle))
      Subtitle = " ";
-  else if (strlen(Subtitle) > MAX_SUBTITLE_LENGTH) {
-     // let's make sure the Subtitle doesn't produce too long a file name:
-     Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
-     Subtitle = SubtitleBuffer;
-     }
   const char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
   const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
@@ -872,9 +975,12 @@ const char *cRecording::FileName(void) const
      const char *fmt = isPesRecording ? NAMEFORMATPES : NAMEFORMATTS;
      int ch = isPesRecording ? priority : channel;
      int ri = isPesRecording ? lifetime : instanceId;
-     name = ExchangeChars(name, true);
-     fileName = strdup(cString::sprintf(fmt, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri));
-     name = ExchangeChars(name, false);
+     char *Name = LimitNameLengths(strdup(name), DirectoryPathMax - strlen(VideoDirectory) - 1 - 42, DirectoryNameMax); // 42 = length of an actual recording directory name (generated with DATAFORMATTS) plus some reserve
+     if (strcmp(Name, name) != 0)
+        dsyslog("recording file name '%s' truncated to '%s'", name, Name);
+     Name = ExchangeChars(Name, true);
+     fileName = strdup(cString::sprintf(fmt, VideoDirectory, Name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri));
+     free(Name);
      }
   return fileName;
 }
@@ -1743,12 +1849,14 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
                        esyslog("ERROR: can't read from file '%s'", *fileName);
                        free(index);
                        index = NULL;
-                       close(f);
-                       f = -1;
                        }
-                    // we don't close f here, see CatchUp()!
                     else if (isPesRecording)
                        ConvertFromPes(index, size);
+                    if (!index || time(NULL) - buf.st_mtime >= MININDEXAGE) {
+                       close(f);
+                       f = -1;
+                       }
+                    // otherwise we don't close f here, see CatchUp()!
                     }
                  else
                     LOG_ERROR_STR(*fileName);
@@ -1863,7 +1971,8 @@ bool cIndexFile::CatchUp(int Index)
             LOG_ERROR_STR(*fileName);
          if (Index < last)
             break;
-         cCondWait::SleepMs(INDEXCATCHUPWAIT);
+         cCondVar CondVar;
+         CondVar.TimedWait(mutex, INDEXCATCHUPWAIT);
          }
      }
   return index != NULL;
diff --git a/recording.h b/recording.h
index f555024cf..037f2046c 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.41 2012/12/23 15:11:53 kls Exp $
+ * $Id: recording.h 2.42 2013/02/07 13:42:17 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -22,7 +22,9 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
-extern bool VfatFileSystem;
+extern int DirectoryPathMax;
+extern int DirectoryNameMax;
+extern bool DirectoryEncoding;
 extern int InstanceId;
 
 void RemoveDeletedRecordings(void);
diff --git a/remote.c b/remote.c
index 3f20d026b..f3d90c966 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.6 2013/01/13 12:01:52 kls Exp $
+ * $Id: remote.c 2.8 2013/02/03 15:44:55 kls Exp $
  */
 
 #include "remote.h"
@@ -295,6 +295,14 @@ int cKbdRemote::MapCodeToFunc(uint64_t Code)
   return kfNone;
 }
 
+void cKbdRemote::PutKey(uint64_t Code, bool Repeat, bool Release)
+{
+  if (rawMode || !Put(Code, Repeat, Release)) {
+     if (int func = MapCodeToFunc(Code))
+        Put(KBDKEY(func), Repeat, Release);
+     }
+}
+
 int cKbdRemote::ReadKey(void)
 {
   cPoller Poller(STDIN_FILENO);
@@ -356,24 +364,55 @@ uint64_t cKbdRemote::ReadKeySequence(void)
 
 void cKbdRemote::Action(void)
 {
+  cTimeMs FirstTime;
+  cTimeMs LastTime;
+  uint64_t FirstCommand = 0;
   uint64_t LastCommand = 0;
+  bool Delayed = false;
   bool Repeat = false;
 
   while (Running()) {
         uint64_t Command = ReadKeySequence();
-        if (LastCommand && Command != LastCommand && Repeat) {
-           if (!rawMode)
-              Put(LastCommand, false, true);
-           Repeat = false;
-           }
         if (Command) {
-           if (Command == LastCommand)
+           if (Command == LastCommand) {
+              // If two keyboard events with the same command come in without an intermediate
+              // timeout, this is a long key press that caused the repeat function to kick in:
+              Delayed = false;
+              FirstCommand = 0;
+              if (FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay)
+                 continue; // repeat function kicks in after a short delay
+              if (LastTime.Elapsed() < (uint)Setup.RcRepeatDelta)
+                 continue; // skip same keys coming in too fast
+              PutKey(Command, true);
               Repeat = true;
-           if (rawMode || !Put(Command, Repeat)) {
-              int func = MapCodeToFunc(Command);
-              if (func)
-                 Put(KBDKEY(func));
+              LastTime.Set();
               }
+           else if (Command == FirstCommand) {
+              // If the same command comes in twice with an intermediate timeout, we
+              // need to delay the second command to see whether it is going to be
+              // a repeat function or a separate key press:
+              Delayed = true;
+              }
+           else {
+              // This is a totally new key press, so we accept it immediately:
+              PutKey(Command);
+              Delayed = false;
+              FirstCommand = Command;
+              FirstTime.Set();
+              }
+           }
+        else if (Repeat) {
+           // Timeout after a repeat function, so we generate a 'release':
+           PutKey(LastCommand, false, true);
+           Repeat = false;
+           }
+        else if (Delayed && FirstCommand) {
+           // Timeout after two normal key presses of the same key, so accept the
+           // delayed key:
+           PutKey(FirstCommand);
+           Delayed = false;
+           FirstCommand = 0;
+           FirstTime.Set();
            }
         LastCommand = Command;
         }
diff --git a/remote.h b/remote.h
index 4478f7fd7..d453b2f44 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 2.0 2008/02/23 14:38:47 kls Exp $
+ * $Id: remote.h 2.1 2013/02/03 14:34:56 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -111,6 +111,7 @@ class cKbdRemote : public cRemote, private cThread {
   int ReadKey(void);
   uint64_t ReadKeySequence(void);
   int MapCodeToFunc(uint64_t Code);
+  void PutKey(uint64_t Code, bool Repeat = false, bool Release = false);
 public:
   cKbdRemote(void);
   virtual ~cKbdRemote();
diff --git a/skinlcars.c b/skinlcars.c
index b2dab50d7..42565b7d9 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.15 2012/09/19 11:05:50 kls Exp $
+ * $Id: skinlcars.c 2.18 2013/01/25 14:54:11 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -199,6 +199,8 @@ THEME_CLR(Theme, clrTrackItemCurrentBg,     CLR_TRACK);
 
 // --- Helper functions ------------------------------------------------------
 
+static bool TwoColors = false;
+
 static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1)
 {
   cOsd *Osd = cOsdProvider::NewOsd(Left, Top);
@@ -208,6 +210,7 @@ static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1)
       Area.bpp = Bpp[i];
       if (Osd->CanHandleAreas(&Area, 1) == oeOk) {
          Osd->SetAreas(&Area, 1);
+         TwoColors = Area.bpp == 1;
          break;
          }
       }
@@ -272,16 +275,25 @@ static void DrawDeviceSignal(cOsd *Osd, const cDevice *Device, int x0, int y0, i
   int y01 = y00 + h;
   int y03 = y1 - d;
   int y02 = y03 - h;
+  tColor ColorSignalValue, ColorSignalRest;
+  if (TwoColors) {
+     ColorSignalValue = Theme.Color(clrBackground);
+     ColorSignalRest = Theme.Color(clrMenuFrameBg);
+     }
+  else {
+     ColorSignalValue = Theme.Color(clrSignalValue);
+     ColorSignalRest = Theme.Color(clrSignalRest);
+     }
   if (SignalStrength >= 0 && (Initial || SignalStrength != LastSignalStrength)) {
      int s = SignalStrength * w / 100;
-     Osd->DrawRectangle(x00, y00, x00 + s - 1, y01 - 1, Theme.Color(clrSignalValue));
-     Osd->DrawRectangle(x00 + s, y00, x01 - 1, y01 - 1, Theme.Color(clrSignalRest));
+     Osd->DrawRectangle(x00, y00, x00 + s - 1, y01 - 1, ColorSignalValue);
+     Osd->DrawRectangle(x00 + s, y00, x01 - 1, y01 - 1, ColorSignalRest);
      LastSignalStrength = SignalStrength;
      }
   if (SignalQuality >= 0 && (Initial || SignalQuality != LastSignalQuality)) {
      int q = SignalQuality * w / 100;
-     Osd->DrawRectangle(x00, y02, x00 + q - 1, y03 - 1, Theme.Color(clrSignalValue));
-     Osd->DrawRectangle(x00 + q, y02, x01 - 1, y03 - 1, Theme.Color(clrSignalRest));
+     Osd->DrawRectangle(x00, y02, x00 + q - 1, y03 - 1, ColorSignalValue);
+     Osd->DrawRectangle(x00 + q, y02, x01 - 1, y03 - 1, ColorSignalRest);
      LastSignalQuality = SignalQuality;
      }
 }
@@ -445,7 +457,7 @@ void cSkinLCARSDisplayChannel::DrawTrack(void)
 
 void cSkinLCARSDisplayChannel::DrawSeen(int Current, int Total)
 {
-  int Seen = min(xc07 - xc06, int((xc07 - xc06) * double(Current) / Total));
+  int Seen = (Total > 0) ? min(xc07 - xc06, int((xc07 - xc06) * double(Current) / Total)) : 0;
   if (initial || Seen != lastSeen) {
      int y0 = yc11 - ShowSeenExtent;
      int y1 = yc11 + lineHeight / 2 - Gap / 2;
@@ -1331,6 +1343,7 @@ void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel)
      osd->DrawText(xa00, yt00, itoa(Channel->Number()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), tallFont, xa02 - xa00, yt02 - yt00, taTop | taRight | taBorder);
      osd->DrawText(xa03, yt00, Channel->Name(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);
      lastChannel = Channel;
+     DrawSeen(0, 0);
      }
   // The current programme:
   cSchedulesLock SchedulesLock;
@@ -1411,7 +1424,7 @@ void cSkinLCARSDisplayMenu::DrawInfo(const cEvent *Event, bool WithTime)
 
 void cSkinLCARSDisplayMenu::DrawSeen(int Current, int Total)
 {
-  int Seen = min(xm08 - xm02, int((xm08 - xm02) * double(Current) / Total));
+  int Seen = (Total > 0) ? min(xm08 - xm02, int((xm08 - xm02) * double(Current) / Total)) : 0;
   if (initial || Seen != lastSeen) {
      int y0 = yc04 - ShowSeenExtent;
      int y1 = yc04 + lineHeight / 2 - Gap / 2;
@@ -1493,8 +1506,14 @@ void cSkinLCARSDisplayMenu::SetItem(const char *Text, int Index, bool Current, b
   int y = yi00 + Index * lineHeight;
   tColor ColorFg, ColorBg;
   if (Current) {
-     ColorFg = Theme.Color(clrMenuItemCurrentFg);
-     ColorBg = Theme.Color(clrMenuItemCurrentBg);
+     if (TwoColors) {
+        ColorFg = Theme.Color(clrBackground);
+        ColorBg = Theme.Color(clrMenuFrameBg);
+        }
+     else {
+        ColorFg = Theme.Color(clrMenuItemCurrentFg);
+        ColorBg = Theme.Color(clrMenuItemCurrentBg);
+        }
      osd->DrawRectangle(xi00, y, xi01 - 1, y + lineHeight - 1, ColorBg);
      osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, y + lineHeight - 1, ColorBg);
      osd->DrawEllipse  (xi02 + lineHeight / 2, y, xi03 - 1, y + lineHeight - 1, ColorBg, 5);
@@ -1662,6 +1681,7 @@ class cSkinLCARSDisplayReplay : public cSkinDisplayReplay {
   int lineHeight;
   tColor frameColor;
   int lastCurrentWidth;
+  int lastTotalWidth;
   cString lastDate;
   tTrackId lastTrackId;
   void DrawDate(void);
@@ -1687,6 +1707,7 @@ cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly)
   lineHeight = font->Height();
   frameColor = Theme.Color(clrReplayFrameBg);
   lastCurrentWidth = 0;
+  lastTotalWidth = 0;
   int d = 5 * lineHeight;
   xp00 = 0;
   xp01 = xp00 + d / 2;
@@ -1804,15 +1825,16 @@ void cSkinLCARSDisplayReplay::SetCurrent(const char *Current)
 {
   const cFont *font = cFont::GetFont(fontOsd);
   int w = font->Width(Current);
-  osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, lastCurrentWidth > w ? lastCurrentWidth : w, 0, taLeft);
+  osd->DrawText(xp03, yp03 - lineHeight, Current, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, max(lastCurrentWidth, w), 0, taLeft);
   lastCurrentWidth = w;
 }
 
 void cSkinLCARSDisplayReplay::SetTotal(const char *Total)
 {
   const cFont *font = cFont::GetFont(fontOsd);
-  int w = font->Width(Total) + 10;
-  osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, w, 0, taRight);
+  int w = font->Width(Total);
+  osd->DrawText(xp13 - w, yp03 - lineHeight, Total, Theme.Color(clrReplayPosition), Theme.Color(clrBackground), font, max(lastTotalWidth, w), 0, taRight);
+  lastTotalWidth = w;
 }
 
 void cSkinLCARSDisplayReplay::SetJump(const char *Jump)
diff --git a/timers.c b/timers.c
index ab8e4778e..16cf8cef3 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.15 2012/12/07 13:14:00 kls Exp $
+ * $Id: timers.c 2.16 2013/02/05 11:13:20 kls Exp $
  */
 
 #include "timers.h"
@@ -17,8 +17,6 @@
 #include "remote.h"
 #include "status.h"
 
-#define VFAT_MAX_FILENAME 40 // same as MAX_SUBTITLE_LENGTH in recording.c
-
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
 // value!
@@ -80,11 +78,6 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
   if (Instant && channel)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
-  if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) {
-     dsyslog("timer file name too long for VFAT file system: '%s'", file);
-     file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
-     dsyslog("timer file name truncated to '%s'", file);
-     }
 }
 
 cTimer::cTimer(const cEvent *Event)
@@ -120,11 +113,6 @@ cTimer::cTimer(const cEvent *Event)
   const char *Title = Event->Title();
   if (!isempty(Title))
      Utf8Strn0Cpy(file, Event->Title(), sizeof(file));
-  if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) {
-     dsyslog("timer file name too long for VFAT file system: '%s'", file);
-     file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
-     dsyslog("timer file name truncated to '%s'", file);
-     }
   SetEvent(Event);
 }
 
@@ -332,18 +320,6 @@ bool cTimer::Parse(const char *s)
         }
      //TODO add more plausibility checks
      result = ParseDay(daybuffer, day, weekdays);
-     if (VfatFileSystem) {
-        char *p = strrchr(filebuffer, FOLDERDELIMCHAR);
-        if (p)
-           p++;
-        else
-           p = filebuffer;
-        if (Utf8StrLen(p) > VFAT_MAX_FILENAME) {
-           dsyslog("timer file name too long for VFAT file system: '%s'", p);
-           p[Utf8SymChars(p, VFAT_MAX_FILENAME)] = 0;
-           dsyslog("timer file name truncated to '%s'", p);
-           }
-        }
      Utf8Strn0Cpy(file, filebuffer, sizeof(file));
      strreplace(file, '|', ':');
      if (isnumber(channelbuffer))
diff --git a/timers.h b/timers.h
index cde8b3bdf..adc550961 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.5 2012/12/07 13:13:40 kls Exp $
+ * $Id: timers.h 2.6 2013/02/05 11:23:24 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -39,7 +39,7 @@ class cTimer : public cListObject {
   int stop;
   int priority;
   int lifetime;
-  mutable char file[MaxFileName];
+  mutable char file[NAME_MAX * 2]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long
   char *aux;
   const cEvent *event;
 public:
diff --git a/vdr.1 b/vdr.1
index d22c4e91f..63915ecb6 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.9 2012/09/01 13:40:49 kls Exp $
+.\" $Id: vdr.1 2.11 2013/02/08 10:50:30 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -43,7 +43,7 @@ which can be accessed on port 6419, for instance by \fBtelnet\fR.
 Send Dolby Digital audio to stdin of command \fIcmd\fR.
 .TP
 .BI \-\-cachedir= dir
-save cache files in \fIdir\fR
+Save cache files in \fIdir\fR
 (default is to save them in the video directory).
 .TP
 .BI \-c\  dir ,\ \-\-config= dir
@@ -57,6 +57,15 @@ Run in daemon mode (implies \-\-no\-kbd).
 Use only the given DVB device (\fInum\fR = 0, 1, 2...).
 There may be several \fB\-D\fR options (by default all DVB devices will be used).
 .TP
+.BI \-\-dirnames= path[,name[,enc]]
+Set the maximum directory path length to \fIpath\fR (default is the maximum value
+allowed on the system). If \fIname\fR is also given, it defines the maximum directory
+name length (default is the maximum value allowed on the system).  The optional
+\fIenc\fR can be 0 or 1, and controls whether special characters in directory names
+are encoded as hex values (default: 0).
+The length of the video directory name and that of the actual recording directory is
+subtracted from \fIpath\fR, to make sure the directory path will never become too long.
+.TP
 .BI \-\-edit= rec
 Edit the given recording.
 \fIrec\fR must be the full path name of an existing recording.
@@ -162,7 +171,7 @@ Call \fIcmd\fR before and after a recording. See the file \fIINSTALL\fR for
 more information.
 .TP
 .BI \-\-resdir= dir
-read resource files from \fIdir\fR
+Read resource files from \fIdir\fR
 (default is to read them from the config directory).
 .TP
 .BI \-s\  cmd ,\ \-\-shutdown= cmd
@@ -185,11 +194,10 @@ vdr can switch to a lesser privileged user id during normal
 operation.
 .TP
 .BI \-\-userdump
-allow coredumps if -u is given (only for debugging).
+Allow coredumps if -u is given (only for debugging).
 .TP
 .BI \-\-vfat
-Encode special characters in recording names to avoid problems
-with VFAT file systems.
+For backwards compatibility (same as \-\-dirnames= 250,40,1.
 .TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
diff --git a/vdr.c b/vdr.c
index 88b8956f2..8bb208b2c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.45 2012/12/06 10:29:23 kls Exp $
+ * $Id: vdr.c 2.48 2013/02/08 10:47:02 kls Exp $
  */
 
 #include <getopt.h>
@@ -227,6 +227,7 @@ int main(int argc, char *argv[])
       { "config",   required_argument, NULL, 'c' },
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
+      { "dirnames", required_argument, NULL, 'd' | 0x100 },
       { "edit",     required_argument, NULL, 'e' | 0x100 },
       { "epgfile",  required_argument, NULL, 'E' },
       { "filesize", required_argument, NULL, 'f' | 0x100 },
@@ -266,7 +267,8 @@ int main(int argc, char *argv[])
                     break;
           case 'c': ConfigDirectory = optarg;
                     break;
-          case 'd': DaemonMode = true; break;
+          case 'd': DaemonMode = true;
+                    break;
           case 'D': if (isnumber(optarg)) {
                        int n = atoi(optarg);
                        if (0 <= n && n < MAXDEVICES) {
@@ -276,6 +278,43 @@ int main(int argc, char *argv[])
                        }
                     fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
                     return 2;
+          case 'd' | 0x100: {
+                    char *s = optarg;
+                    int n = strtol(s, &s, 10);
+                    if (n <= 0 || n >= PATH_MAX) {
+                       fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg);
+                       return 2;
+                       }
+                    DirectoryPathMax = n;
+                    if (!*s)
+                       break;
+                    if (*s++ != ',') {
+                       fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
+                       return 2;
+                       }
+                    n = strtol(s, &s, 10);
+                    if (n <= 0 || n >= NAME_MAX) {
+                       fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg);
+                       return 2;
+                       }
+                    DirectoryNameMax = n;
+                    if (!*s)
+                       break;
+                    if (*s++ != ',') {
+                       fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
+                       return 2;
+                       }
+                    n = strtol(s, &s, 10);
+                    if (n != 0 && n != 1) {
+                       fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg);
+                       return 2;
+                       }
+                    DirectoryEncoding = n;
+                    if (*s) {
+                       fprintf(stderr, "vdr: unexpected data: %s\n", optarg);
+                       return 2;
+                       }
+                    }
                     break;
           case 'e' | 0x100:
                     return CutRecording(optarg) ? 0 : 2;
@@ -302,31 +341,30 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "vdr: invalid instance id: %s\n", optarg);
                     return 2;
           case 'l': {
-                      char *p = strchr(optarg, '.');
-                      if (p)
-                         *p = 0;
-                      if (isnumber(optarg)) {
-                         int l = atoi(optarg);
-                         if (0 <= l && l <= 3) {
-                            SysLogLevel = l;
-                            if (!p)
-                               break;
-                            if (isnumber(p + 1)) {
-                               int l = atoi(p + 1);
-                               if (0 <= l && l <= 7) {
-                                  int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
-                                  SysLogTarget = targets[l];
-                                  break;
-                                  }
-                               }
-                            }
-                         }
+                    char *p = strchr(optarg, '.');
+                    if (p)
+                       *p = 0;
+                    if (isnumber(optarg)) {
+                       int l = atoi(optarg);
+                       if (0 <= l && l <= 3) {
+                          SysLogLevel = l;
+                          if (!p)
+                             break;
+                          if (isnumber(p + 1)) {
+                             int l = atoi(p + 1);
+                             if (0 <= l && l <= 7) {
+                                int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
+                                SysLogTarget = targets[l];
+                                break;
+                                }
+                             }
+                          }
+                       }
                     if (p)
                        *p = '.';
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
                     return 2;
                     }
-                    break;
           case 'L': if (access(optarg, R_OK | X_OK) == 0)
                        PluginManager.SetDirectory(optarg);
                     else {
@@ -384,7 +422,9 @@ int main(int argc, char *argv[])
           case 'V': DisplayVersion = true;
                     break;
           case 'v' | 0x100:
-                    VfatFileSystem = true;
+                    DirectoryPathMax = 250;
+                    DirectoryNameMax = 40;
+                    DirectoryEncoding = true;
                     break;
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
@@ -399,7 +439,6 @@ int main(int argc, char *argv[])
                        }
                     fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg);
                     return 2;
-                    break;
           default:  return 2;
           }
         }
@@ -435,6 +474,13 @@ int main(int argc, char *argv[])
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
                "                           there may be several -D options (default: all DVB\n"
                "                           devices will be used)\n"
+               "            --dirnames=PATH[,NAME[,ENC]]\n"
+               "                           set the maximum directory path length to PATH\n"
+               "                           (default: %d); if NAME is also given, it defines\n"
+               "                           the maximum directory name length (default: %d);\n"
+               "                           the optional ENC can be 0 or 1, and controls whether\n"
+               "                           special characters in directory names are encoded as\n"
+               "                           hex values (default: 0)\n"
                "            --edit=REC     cut recording REC and exit\n"
                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
                "                           '%s' in the video directory)\n"
@@ -477,13 +523,15 @@ int main(int argc, char *argv[])
                "            --userdump     allow coredumps if -u is given (debugging)\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
-               "            --vfat         encode special characters in recording names to\n"
-               "                           avoid problems with VFAT file systems\n"
+               "            --vfat         for backwards compatibility (same as\n"
+               "                           --dirnames=250,40,1\n"
                "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                "                           seconds (default: %d); '0' disables the watchdog\n"
                "\n",
                DEFAULTCACHEDIR,
                DEFAULTCONFDIR,
+               PATH_MAX,
+               NAME_MAX,
                DEFAULTEPGDATAFILENAME,
                MAXVIDEOFILESIZEDEFAULT,
                DEFAULTPLUGINDIR,
@@ -924,7 +972,7 @@ int main(int argc, char *argv[])
                               Device->SetOccupied(TIMERDEVICETIMEOUT);
                            }
                         if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme())
-                           Skins.Message(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel
+                           Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel
                         }
                      }
                   }
@@ -1095,7 +1143,7 @@ int main(int argc, char *argv[])
                   if (Setup.PauseKeyHandling) {
                      if (Setup.PauseKeyHandling > 1 || Interface->Confirm(tr("Pause live video?"))) {
                         if (!cRecordControls::PauseLiveVideo())
-                           Skins.Message(mtError, tr("No free DVB device to record!"));
+                           Skins.QueueMessage(mtError, tr("No free DVB device to record!"));
                         }
                      }
                   key = kNone; // nobody else needs to see this key
@@ -1105,7 +1153,7 @@ int main(int argc, char *argv[])
           case kRecord:
                if (!cControl::Control()) {
                   if (cRecordControls::Start())
-                     Skins.Message(mtInfo, tr("Recording started"));
+                     Skins.QueueMessage(mtInfo, tr("Recording started"));
                   key = kNone; // nobody else needs to see this key
                   }
                break;
@@ -1157,11 +1205,11 @@ int main(int argc, char *argv[])
            switch (state) {
              case osPause:  DELETE_MENU;
                             if (!cRecordControls::PauseLiveVideo())
-                               Skins.Message(mtError, tr("No free DVB device to record!"));
+                               Skins.QueueMessage(mtError, tr("No free DVB device to record!"));
                             break;
              case osRecord: DELETE_MENU;
                             if (cRecordControls::Start())
-                               Skins.Message(mtInfo, tr("Recording started"));
+                               Skins.QueueMessage(mtInfo, tr("Recording started"));
                             break;
              case osRecordings:
                             DELETE_MENU;
@@ -1179,7 +1227,7 @@ int main(int argc, char *argv[])
              case osSwitchDvb:
                             DELETE_MENU;
                             cControl::Shutdown();
-                            Skins.Message(mtInfo, tr("Switching primary DVB..."));
+                            Skins.QueueMessage(mtInfo, tr("Switching primary DVB..."));
                             cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                             break;
              case osPlugin: DELETE_MENU;
@@ -1249,9 +1297,9 @@ int main(int argc, char *argv[])
               EITScanner.Process();
            if (!cCutter::Active() && cCutter::Ended()) {
               if (cCutter::Error())
-                 Skins.Message(mtError, tr("Editing process failed!"));
+                 Skins.QueueMessage(mtError, tr("Editing process failed!"));
               else
-                 Skins.Message(mtInfo, tr("Editing process finished"));
+                 Skins.QueueMessage(mtInfo, tr("Editing process finished"));
               }
            }
 

From 4c59501a6b52816000d6c483fae619ebccfcdc9b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 17 Feb 2013 15:53:00 +0100
Subject: [PATCH 224/307] Version 1.7.38 VDR developer version 1.7.38 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.38.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.37-1.7.38.diff

MD5 checksums:

f4ef0f60ed662f3c983a830da67df9b2  vdr-1.7.38.tar.bz2
e945b0f44e13ed768de726cf6e66317c  vdr-1.7.37-1.7.38.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Approaching version 2.0.0:
==========================

If all goes well, there should be no more functional or API changes
before the final version 2.0.0. There will just be a few more fixes.

From the HISTORY file:
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the French OSD texts (thanks to Marc Perrudin, Bernard Jaulini and Peter
  Münster).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Fixed moving editing marks, so that they don't get overwritten with old values
  through an update of the marks file.
- Removed an invalid line from channels.conf.terr (reported by Lars Hanisch).
- Fixed an unexpected k_Repeat key event after a k_Release in lirc.c.
- Fixed permissions of po/sr_SR.po (reported by Dominic Evans).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed using "Pause" and "Slow motion" near the end of a recording (replay stopped
  a few seconds after the end of the recording file has been reached).
- Fixed selecting the last replayed recording in the Recordings menu in case there
  are folders and plain recordings with names that differ only in non-alphanumeric
  characters (reported by Andre Weidemann).
- Fixed the description of the OSD drawing functions DrawEllipse() (the values -5...-8
  for the Quadrants parameter are not implemented).
- Made cOsd::DestroyPixmap() "NULL proof".
- Now deleting any previously allocated pixmaps in cOsd::SetAreas().
- Added demos of the DrawEllipse() and DrawSlope() function to the 'osddemo'
  plugin (press '1' or '2', respectively).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- The timeout for trying to switch to a valid programme is now reset immediately once
  a programme has been found.
- No longer checking for EOPNOTSUPP in cDvbTuner::GetSignalQuality() to avoid breaking
  this function in case the driver suddenly decides to return a different errno value
  if an operation is not supported.
- Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to
  config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
  information in two places).
- Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
- Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that
  doesn't exist (reported by Mikael Hübsch).
- Fixed displaying pending timers in "alert" mode in the LCARS skin.
- Added missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin (thanks to Ville
  Skyttä).
- Fixed some spellings in PLUGINS.html and Doxyfile (thanks to Ville Skyttä).
- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
  Ville Skyttä).
- Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().
- Fixed determining the priority of the primary device in case it is neither replaying
  nor receiving a live channel (thanks to Matthias Senzel for reporting a problem with
  switching back to live viewing after replay in a setup with device bonding).
- Removed all \return and \param tags from comment lines marked with "///<" for Doxygen.
  There was only a rather small number of these, and I would probably always forget to
  put them in place when writing future comments, so I decided to drop them entirely.
- Added Doxyfile.filter to have special characters escaped that would otherwise be
  dropped by Doxygen (reported by Ville Skyttä).
- Using 'cat' instead of 'cp' to copy the Doxyfile to avoid problems in case Doxyfile
  is write protected.
- Updated the Doxyfile with a newer version of Doxygen.
- Turned off following symlinks in the Doxyfile.
- Removed trailing whitespace.
- Expanded tabs in PLUGINS/src/dvbhddevice/setup.c.
- Some formatting fixes.
---
 CONTRIBUTORS                            |   25 +
 Doxyfile                                | 1797 +++++++++++++++++------
 Doxyfile.filter                         |   34 +
 HISTORY                                 |   62 +-
 MANUAL                                  |    2 +-
 Makefile                                |    6 +-
 PLUGINS.html                            |    8 +-
 PLUGINS/src/dvbhddevice/HISTORY         |    4 +
 PLUGINS/src/dvbhddevice/Makefile        |    4 +-
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |    4 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |    4 +-
 PLUGINS/src/dvbhddevice/setup.c         |   46 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |    4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |    4 +-
 PLUGINS/src/osddemo/HISTORY             |    5 +
 PLUGINS/src/osddemo/README              |    5 +
 PLUGINS/src/osddemo/osddemo.c           |  144 +-
 PLUGINS/src/pictures/pic2mpg            |    8 +-
 PLUGINS/src/pictures/pic2mpg-sd         |    2 +-
 PLUGINS/src/servicedemo/svccli.c        |    4 +-
 PLUGINS/src/servicedemo/svcsvr.c        |    4 +-
 README                                  |    4 +-
 UPDATE-2.0.0                            |  475 ++++++
 channels.conf.terr                      |    1 -
 ci.c                                    |   16 +-
 config.c                                |    4 +-
 config.h                                |   13 +-
 cutter.c                                |    4 +-
 device.c                                |    8 +-
 device.h                                |   52 +-
 dvbdevice.c                             |   20 +-
 dvbdevice.h                             |    6 +-
 dvbplayer.c                             |    4 +-
 dvbsubtitle.c                           |    4 +-
 epg.c                                   |    4 +-
 font.h                                  |    4 +-
 lirc.c                                  |    5 +-
 menu.c                                  |   23 +-
 menu.cyVkmHd                            |    0
 menuitems.c                             |    4 +-
 osd.c                                   |   10 +-
 osd.h                                   |    8 +-
 pat.h                                   |    4 +-
 po/et_EE.po                             |    6 +-
 po/fr_FR.po                             |  606 ++++----
 po/it_IT.po                             |    8 +-
 po/lt_LT.po                             |   62 +-
 po/mk_MK.po                             |   16 +-
 po/ro_RO.po                             |   35 +-
 po/uk_UA.po                             |  109 +-
 recording.c                             |   15 +-
 recording.h                             |    5 +-
 remux.c                                 |    4 +-
 ringbuffer.h                            |    8 +-
 skinlcars.c                             |    4 +-
 svdrp.c                                 |    4 +-
 thread.h                                |    4 +-
 tools.h                                 |    4 +-
 vdr.c                                   |   28 +-
 59 files changed, 2697 insertions(+), 1070 deletions(-)
 create mode 100755 Doxyfile.filter
 create mode 100644 UPDATE-2.0.0
 delete mode 100644 menu.cyVkmHd

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6219f2af0..d401cf1ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1996,6 +1996,11 @@ Ville Skytt
  for fixing cConfig::Load() for g++ version 4.7.0
  for fixing some typos in HISTORY and CONTRIBUTORS
  for fixing some spellings in osd.h and svdrp.c
+ for adding missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin
+ for fixing some spellings in PLUGINS.html and Doxyfile
+ for adding '-p' to the cp command in the install-conf target of the Makefile
+ for reporting that some special characters are dropped by Doxygen and thus need to
+ be escaped
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2248,6 +2253,9 @@ Andr
  1.7.32 no longer generates a mark at that point
  for suggesting to automatically go into Pause mode if an editing mark is set during
  replay
+ for reporting a bug in selecting the last replayed recording in the Recordings menu
+ in case there are folders and plain recordings with names that differ only in
+ non-alphanumeric characters
 
 J�rgen Schilling <juergen_schilling@web.de>
  for reporting that color buttons were displayed in the recording info menu if it
@@ -2801,6 +2809,7 @@ Lars Hanisch <dvb@flensrocker.de>
  for reporting that the SVDRP command UPDR didn't update the global recordings list
  for fixing a typo in skins.h
  for fixing some #include statements in plugins to use <vdr/...> instead of "vdr/..."
+ for reporting an invalid line in channels.conf.terr
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -2935,6 +2944,7 @@ Dominic Evans <oldmanuk@gmail.com>
  for adding cap_net_raw to the capabilities that are not dropped
  for suggesting to make the channel name column in the "What's on now/next" menu
  adjust its width to display the full short name of each channel
+ for reporting wrong permissions of po/sr_SR.po
 
 Torsten Lang <info@torstenlang.de>
  for reporting a problem with newline characters in stream component descriptions
@@ -3032,6 +3042,7 @@ S
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
+ for translating OSD texts to the French language
 
 Mike Hay <mike.hay@linenshorts.com>
  for reporting a problem with handling the case of the polarization character in
@@ -3057,3 +3068,17 @@ Stefan Stolz <st.stolz@gmail.com>
 Malte Forkel <malte.forkel@berlin.de>
  for suggesting to make the SVDRP command NEWT no longer check whether a timer with the
  given data already exists
+
+Marc Perrudin <vdr@ekass.net>
+ for translating OSD texts to the French language
+
+Bernard Jaulin <bernard.jaulin@gmail.com>
+ for translating OSD texts to the French language
+
+Mikael H�bsch <mikael.hubsch@gmail.com>
+ for reporting a crash in cMenuEditChanItem::Set() when entering a channel number that
+ doesn't exist
+
+Matthias Senzel <matthias.senzel@t-online.de>
+ for reporting a problem with switching back to live viewing after replay in a setup
+ with device bonding
diff --git a/Doxyfile b/Doxyfile
index b17231795..aa4cdb497 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,422 +1,853 @@
-# Doxyfile 1.2.13.1
+# Doxyfile 1.8.1
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
-# General configuration options
+# Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = vdr
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
 PROJECT_NUMBER         = <will be set by the Makefile>
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = srcdoc
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, 
-# German, Greek, Hungarian, Italian, Japanese, Korean, Norwegian, Polish, 
-# Portuguese, Romanian, Russian, Slovak, Slovene, Spanish and Swedish.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = NO
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
 
-HIDE_UNDOC_MEMBERS     = NO
+EXTRACT_LOCAL_METHODS  = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these class will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
 
-HIDE_UNDOC_CLASSES     = NO
+EXTRACT_ANON_NSPACES   = NO
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = NO
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
 
-ALWAYS_DETAILED_SEC    = NO
+HIDE_UNDOC_MEMBERS     = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
 
-INLINE_INHERITED_MEMB  = NO
+HIDE_UNDOC_CLASSES     = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
 
-FULL_PATH_NAMES        = NO
+HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
 
-STRIP_FROM_PATH        = 
+HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower case letters. If set to YES upper case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# users are adviced to set this option to NO.
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put list of the files that are included by a file in the documentation 
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments  will behave just like the Qt-style comments (thus requiring an 
-# explict @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# reimplements.
+FORCE_LOCAL_INCLUDES   = NO
 
-INHERIT_DOCS           = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
 
-DISTRIBUTE_GROUP_DOC   = NO
+SORT_BRIEF_DOCS        = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
-TAB_SIZE               = 8
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = YES
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
 
-ALIASES                = 
+GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
+# The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consist of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-##kls
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
 
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
 
-WARN_FORMAT            = 
+WARN_NO_PARAMDOC       = NO
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            =
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
 INPUT                  = .
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.c *.h
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
 
-EXCLUDE                = 
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+EXCLUDE_SYMLINKS       = YES
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = */RCS/* */OLD/*
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
 # to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           = ./Doxyfile.filter
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
 
-INPUT_FILTER           = 
+FILTER_PATTERNS        =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse.
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
-FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_FILES    = YES
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
 
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
 # be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
+# Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          = c
@@ -425,218 +856,524 @@ IGNORE_PREFIX          = c
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = 
+HTML_OUTPUT            =
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# style sheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
 
-# The HTML_STYLESHEET tag can be used to specify a user defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet
+HTML_COLORSTYLE_HUE    = 220
 
-HTML_STYLESHEET        = 
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
+HTML_COLORSTYLE_SAT    = 100
 
-HTML_ALIGN_MEMBERS     = YES
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the Html help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
 
-DISABLE_INDEX          = NO
+GENERATE_QHP           = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
 
-ENUM_VALUES_PER_LINE   = 4
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript and frames is required (for instance Mozilla, Netscape 4.0+, 
-# or Internet explorer 4.0+). Note that for large projects the tree generation 
-# can take a very long time. In such cases it is better to disable this feature. 
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
 
 GENERATE_TREEVIEW      = NO
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 250
 
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
-LATEX_OUTPUT           = 
+LATEX_OUTPUT           =
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimised for Word 97 and may not look very pretty with 
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
-RTF_OUTPUT             = 
+RTF_OUTPUT             =
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assigments. You only have to provide 
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
+# Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
-MAN_OUTPUT             = 
+MAN_OUTPUT             =
 
-# The MAN_EXTENSION tag determines the extension that is added to 
+# The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
-MAN_EXTENSION          = 
+MAN_EXTENSION          =
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
@@ -645,255 +1382,411 @@ MAN_LINKS              = NO
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
 
 GENERATE_XML           = NO
 
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line and do not end with a semicolon. Such function macros are typically 
-# used for boiler-plate code, and will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES tag can be used to specify one or more tagfiles.
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
-# The PERL_PATH should be the absolute path and name of the perl script 
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH              = 
+PERL_PATH              =
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in Html, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yield more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = YES
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = NO
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
 
-TEMPLATE_RELATIONS     = YES
+GROUP_GRAPHS           = YES
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
 
-HIDE_UNDOC_RELATIONS   = YES
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
 
-GRAPHICAL_HIERARCHY    = YES
+CALL_GRAPH             = NO
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
 
-DOT_PATH               = 
+CALLER_GRAPH           = NO
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
 
-DOTFILE_DIRS           = 
+GRAPHICAL_HIERARCHY    = YES
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+DIRECTORY_GRAPH        = YES
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_IMAGE_FORMAT       = png
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
 
-GENERATE_LEGEND        = YES
+INTERACTIVE_SVG        = NO
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermedate dot files that are used to generate 
-# the various graphs.
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_CLEANUP            = YES
+DOT_PATH               =
 
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
 
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
+DOTFILE_DIRS           =
 
-SEARCHENGINE           = NO
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
 
-# The CGI_NAME tag should be the name of the CGI script that 
-# starts the search engine (doxysearch) with the correct parameters. 
-# A script with this name will be generated by doxygen.
+MSCFILE_DIRS           =
 
-CGI_NAME               = 
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-# The CGI_URL tag should be the absolute URL to the directory where the 
-# cgi binaries are located. See the documentation of your http daemon for 
-# details.
+DOT_GRAPH_MAX_NODES    = 50
 
-CGI_URL                = 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
-# The DOC_URL tag should be the absolute URL to the directory where the 
-# documentation is located. If left blank the absolute path to the 
-# documentation, with file:// prepended to it, will be used.
+MAX_DOT_GRAPH_DEPTH    = 0
 
-DOC_URL                = 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
 
-# The DOC_ABSPATH tag should be the absolute path to the directory where the 
-# documentation is located. If left blank the directory on the local machine 
-# will be used.
+DOT_TRANSPARENT        = NO
 
-DOC_ABSPATH            = 
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
 
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
-# is installed.
+DOT_MULTI_TARGETS      = NO
 
-BIN_ABSPATH            = 
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
 
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
-# documentation generated for other projects. This allows doxysearch to search 
-# the documentation for these projects as well.
+GENERATE_LEGEND        = YES
 
-EXT_DOC_PATHS          = 
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
diff --git a/Doxyfile.filter b/Doxyfile.filter
new file mode 100755
index 000000000..7fde95512
--- /dev/null
+++ b/Doxyfile.filter
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+
+# Filter source files for use with Doxygen.
+#
+# Escapes special characters in comments marked with "///<".
+#
+# Usage: Doxyfile.filter filename
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+#
+# $Id: Doxyfile.filter 2.1 2013/02/17 10:54:05 kls Exp $
+
+$TAG = "///<";
+
+while (<>) {
+      $t = $_;
+      $p = index($t, $TAG);
+      if ($p >= 0) {
+         $p += length($TAG);
+         print substr($t, 0, $p);
+         $quote = 0;
+         while (1) {
+               $s = substr($t, $p++, 1);
+               last        if ($s eq "");
+               $quote ^= 1 if ($s eq '"');
+               print "\\"  if (!$quote && $s =~ /[\\\@<>]/);
+               print $s;
+               }
+         }
+      else {
+         print $t;
+         }
+      }
diff --git a/HISTORY b/HISTORY
index 43eca18c6..1e03ecb02 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7567,7 +7567,7 @@ Video Disk Recorder Revision History
   behavior of the remote control in case a key is held pressed down for a while, so
   that the repeat function kicks in (see MANUAL).
   The builtin LIRC and KBD remote controls already use these parameters. It is
-  recommended that plugins that implement an interface to any kind of remote controls 
+  recommended that plugins that implement an interface to any kind of remote controls
   also use the parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta for the desired
   purpose, and remove any setup options they might have that serve the same purpose.
 - cTimer no longer does any special "VFAT" handling to shorten directory names to 40
@@ -7584,3 +7584,63 @@ Video Disk Recorder Revision History
   as few pixmaps as possible.
 - Fixed formatting and removed some superfluous break statements in vdr.c's command
   line option switch.
+
+2013-02-17: Version 1.7.38
+
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the French OSD texts (thanks to Marc Perrudin, Bernard Jaulini and Peter
+  M�nster).
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Fixed moving editing marks, so that they don't get overwritten with old values
+  through an update of the marks file.
+- Removed an invalid line from channels.conf.terr (reported by Lars Hanisch).
+- Fixed an unexpected k_Repeat key event after a k_Release in lirc.c.
+- Fixed permissions of po/sr_SR.po (reported by Dominic Evans).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed using "Pause" and "Slow motion" near the end of a recording (replay stopped
+  a few seconds after the end of the recording file has been reached).
+- Fixed selecting the last replayed recording in the Recordings menu in case there
+  are folders and plain recordings with names that differ only in non-alphanumeric
+  characters (reported by Andre Weidemann).
+- Fixed the description of the OSD drawing functions DrawEllipse() (the values -5...-8
+  for the Quadrants parameter are not implemented).
+- Made cOsd::DestroyPixmap() "NULL proof".
+- Now deleting any previously allocated pixmaps in cOsd::SetAreas().
+- Added demos of the DrawEllipse() and DrawSlope() function to the 'osddemo'
+  plugin (press '1' or '2', respectively).
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- The timeout for trying to switch to a valid programme is now reset immediately once
+  a programme has been found.
+- No longer checking for EOPNOTSUPP in cDvbTuner::GetSignalQuality() to avoid breaking
+  this function in case the driver suddenly decides to return a different errno value
+  if an operation is not supported.
+- Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to
+  config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
+  information in two places).
+- Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
+- Fixed a crash in cMenuEditChanItem::Set() when entering a channel number that
+  doesn't exist (reported by Mikael H�bsch).
+- Fixed displaying pending timers in "alert" mode in the LCARS skin.
+- Added missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin (thanks to Ville
+  Skytt�).
+- Fixed some spellings in PLUGINS.html and Doxyfile (thanks to Ville Skytt�).
+- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
+  Ville Skytt�).
+- Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().
+- Fixed determining the priority of the primary device in case it is neither replaying
+  nor receiving a live channel (thanks to Matthias Senzel for reporting a problem with
+  switching back to live viewing after replay in a setup with device bonding).
+- Removed all \return and \param tags from comment lines marked with "///<" for Doxygen.
+  There was only a rather small number of these, and I would probably always forget to
+  put them in place when writing future comments, so I decided to drop them entirely.
+- Added Doxyfile.filter to have special characters escaped that would otherwise be
+  dropped by Doxygen (reported by Ville Skytt�).
+- Using 'cat' instead of 'cp' to copy the Doxyfile to avoid problems in case Doxyfile
+  is write protected.
+- Updated the Doxyfile with a newer version of Doxygen.
+- Turned off following symlinks in the Doxyfile.
+- Removed trailing whitespace.
+- Expanded tabs in PLUGINS/src/dvbhddevice/setup.c.
+- Some formatting fixes.
diff --git a/MANUAL b/MANUAL
index 72189fa7f..e8321a469 100644
--- a/MANUAL
+++ b/MANUAL
@@ -699,7 +699,7 @@ Version 1.6
                          Defines the standard compliance mode:
                          0 = DVB
                          1 = ANSI/SCTE
-                         
+
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
                          (4:3 or 16:9).
 
diff --git a/Makefile b/Makefile
index 47e954fd0..db597543d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.50 2013/01/27 14:19:49 kls Exp $
+# $Id: Makefile 2.52 2013/02/17 11:08:04 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -264,7 +264,7 @@ install-dirs:
 	@mkdir -p $(DESTDIR)$(RESDIR)
 
 install-conf:
-	@cp -n *.conf $(DESTDIR)$(CONFDIR)
+	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
 
 # Documentation:
 
@@ -303,7 +303,7 @@ install-pc: vdr.pc
 # Source documentation:
 
 srcdoc:
-	@cp $(DOXYFILE) $(DOXYFILE).tmp
+	@cat $(DOXYFILE) > $(DOXYFILE).tmp
 	@echo PROJECT_NUMBER = $(VDRVERSION) >> $(DOXYFILE).tmp
 	$(DOXYGEN) $(DOXYFILE).tmp
 	@rm $(DOXYFILE).tmp
diff --git a/PLUGINS.html b/PLUGINS.html
index a5713a7f2..30beced91 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -575,7 +575,7 @@ <h1>Table Of Contents</h1>
 <li><tt>esyslog()</tt> prints the log message only if the log level of vdr is set to 1 or above.
 </ul>
 The output of this log is the syslog of the system vdr is running on.
-The logmessage can be formatted like <tt>printf()</tt>, as in
+The log message can be formatted like <tt>printf()</tt>, as in
 
 <p><table><tr><td class="code"><pre>
 esyslog("pluginname: error #%d has occurred", ErrorNumber);
@@ -918,7 +918,7 @@ <h1>Table Of Contents</h1>
 </modified>
 <p>
 <modified>
-Threfore VDR provides the functions
+Therefore VDR provides the functions
 
 <p><table><tr><td class="code"><pre>
 <modified>
@@ -939,7 +939,7 @@ <h1>Table Of Contents</h1>
 subdirectory will exist. If, for some reason, this cannot be achieved, <tt>NULL</tt>
 will be returned.
 <modified>
-The behavoir of <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt> is similar.
+The behavior of <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt> is similar.
 </modified>
 <p>
 The additional <tt>plugins</tt> directory is used to keep files from plugins apart
@@ -2025,7 +2025,7 @@ <h1>Table Of Contents</h1>
 VDR has builtin facilities that select which device is able to provide a given
 transponder. However, there may be situations where the setup is so special
 that it requires considerations that exceed the scope of the core VDR code.
-This is where <i>device hooks</i> can be used. 
+This is where <i>device hooks</i> can be used.
 
 <p><table><tr><td class="code"><pre>
 class cMyDeviceHook : public cDeviceHook {
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index ceee7da85..99d23bb9b 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -55,3 +55,7 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-01-24: Version 0.0.7
 
 - Fixed cHdffOsd::SetAreas() (didn't clear the OSD).
+
+2013-02-16: Version 0.0.8
+
+- Added missing $(LDFLAGS) to the Makefile (thanks to Ville Skytt�).
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index a24a55ae8..99d05a6c1 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.22 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 1.23 2013/02/16 10:34:53 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -103,7 +103,7 @@ install-i18n: $(I18Nmsgs)
 
 $(SOFILE): $(OBJS) libhdffcmd
 	@$(MAKE) --no-print-directory -C libhdffcmd all
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 4d755f699..004bb1fcd 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhddevice.c 1.21 2013/01/29 08:59:36 kls Exp $
+ * $Id: dvbhddevice.c 1.22 2013/02/16 10:35:42 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +12,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.0.8";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index f25d0b76e..e91d77ff6 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbhdffdevice.c 1.48 2013/01/29 08:59:36 kls Exp $
+ * $Id: dvbhdffdevice.c 1.49 2013/02/17 14:10:06 kls Exp $
  */
 
 #include <stdint.h>
@@ -27,7 +27,7 @@
 static uchar *YuvToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality);
 
 
-// --- cDvbHdFfDevice ----------------------------------------------------------
+// --- cDvbHdFfDevice --------------------------------------------------------
 
 int cDvbHdFfDevice::devHdffOffset = -1;
 
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index fcc164879..45783a3fc 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: setup.c 1.18 2012/11/15 09:20:50 kls Exp $
+ * $Id: setup.c 1.19 2013/02/17 13:25:17 kls Exp $
  */
 
 #include "setup.h"
@@ -436,26 +436,26 @@ void cHdffSetupPage::Store(void)
 
 eOSState cHdffSetupPage::ProcessKey(eKeys key)
 {
-	eOSState state = cMenuSetupPage::ProcessKey(key);
-
-	if (state == osContinue)
-	{
-		cOsdItem * item;
-		switch (key)
-		{
-			case kLeft:
-			case kRight:
-				item = Get(Current());
-				if (item == mTvFormatItem)
-				{
-				    mVideoConversion = 0;
-					BuildVideoConversionItem();
-					Display();
-				}
-				break;
-			default:
-				break;
-		}
-	}
-	return state;
+        eOSState state = cMenuSetupPage::ProcessKey(key);
+
+        if (state == osContinue)
+        {
+                cOsdItem * item;
+                switch (key)
+                {
+                        case kLeft:
+                        case kRight:
+                                item = Get(Current());
+                                if (item == mTvFormatItem)
+                                {
+                                    mVideoConversion = 0;
+                                        BuildVideoConversionItem();
+                                        Display();
+                                }
+                                break;
+                        default:
+                                break;
+                }
+        }
+        return state;
 }
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index f9ff5b327..4e98cddaa 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.34 2013/01/25 10:48:29 kls Exp $
+ * $Id: dvbsdffdevice.c 2.35 2013/02/17 13:16:18 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -795,5 +795,5 @@ bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
          return true;
          }
       }
-  return false; 
+  return false;
 }
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index dc55148f9..bbf2ec210 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 2.15 2013/01/25 10:43:14 kls Exp $
+ * $Id: dvbsdffdevice.h 2.16 2013/02/17 13:16:29 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
@@ -112,5 +112,5 @@ class cDvbSdFfDeviceProbe : public cDvbDeviceProbe {
   void SetOutputOnly(bool On) { outputOnly = On; }
   virtual bool Probe(int Adapter, int Frontend);
   };
- 
+
 #endif //__DVBSDFFDEVICE_H
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index e8afa4b2e..4f4ace3a6 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -46,3 +46,8 @@ VDR Plugin 'osddemo' Revision History
 2013-01-12: Version 0.2.5
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-02-13: Version 0.3.0
+
+- Added demos of the DrawEllipse() and DrawSlope() function (press '1' or '2',
+  respectively).
diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README
index 90ae29527..bd9aa8bfb 100644
--- a/PLUGINS/src/osddemo/README
+++ b/PLUGINS/src/osddemo/README
@@ -26,4 +26,9 @@ pixmap is displayed, it can be moved around with the Up, Down, Left
 and Right buttons. The Red button turns off the "Tiled Pixmaps"
 display, and the Green button toggles the color display.
 
+In both variants of the demo, pressing the '1' key displays all
+possible ellipses that can be drawn with the DrawEllipse() function,
+while pressing the '2' key shows all possible slopes the DrawSlope()
+function can draw.
+
 Press Ok to close the window.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 2fbbb0756..0d289e89b 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,16 +3,93 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.8 2013/01/12 14:12:23 kls Exp $
+ * $Id: osddemo.c 2.10 2013/02/17 13:16:34 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.5";
+static const char *VERSION        = "0.3.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
+// --- DrawEllipses ----------------------------------------------------------
+
+void DrawEllipse(cOsd *Osd, int x1, int y1, int x2, int y2, int Quadrants)
+{
+  Osd->DrawRectangle(x1 + 2, y1 + 2, x2 - 2, y2 - 2, clrGreen);
+  Osd->DrawEllipse(x1 + 3, y1 + 3, x2 - 3, y2 - 3, clrRed, Quadrants);
+}
+
+void DrawEllipses(cOsd *Osd)
+{
+  int xa = 0;
+  int ya = 0;
+  int xb = Osd->Width() - 1;
+  int yb = Osd->Height() - 1;
+  int x0 = xa;
+  int x5 = xb;
+  int x1 = x0 + (xb - xa) / 5;
+  int x2 = x0 + (xb - xa) * 2 / 5;
+  int x3 = x0 + (xb - xa) * 3 / 5;
+  int x4 = x0 + (xb - xa) * 4 / 5;
+  int y0 = ya;
+  int y4 = yb;
+  int y2 = (y0 + y4) / 2;
+  int y1 = (y0 + y2) / 2;
+  int y3 = (y2 + y4) / 2;
+  Osd->DrawRectangle(xa, ya, xb, yb, clrGray50);
+  DrawEllipse(Osd, x4, y0, x5, y4, 0);
+  DrawEllipse(Osd, x2, y1, x3, y2, 1);
+  DrawEllipse(Osd, x1, y1, x2, y2, 2);
+  DrawEllipse(Osd, x1, y2, x2, y3, 3);
+  DrawEllipse(Osd, x2, y2, x3, y3, 4);
+  DrawEllipse(Osd, x3, y1, x4, y3, 5);
+  DrawEllipse(Osd, x1, y0, x3, y1, 6);
+  DrawEllipse(Osd, x0, y1, x1, y3, 7);
+  DrawEllipse(Osd, x1, y3, x3, y4, 8);
+  DrawEllipse(Osd, x3, y0, x4, y1, -1);
+  DrawEllipse(Osd, x0, y0, x1, y1, -2);
+  DrawEllipse(Osd, x0, y3, x1, y4, -3);
+  DrawEllipse(Osd, x3, y3, x4, y4, -4);
+  Osd->Flush();
+}
+
+// --- DrawSlopes ------------------------------------------------------------
+
+void DrawSlope(cOsd *Osd, int x1, int y1, int x2, int y2, int Type)
+{
+  Osd->DrawRectangle(x1 + 2, y1 + 2, x2 - 2, y2 - 2, clrGreen);
+  Osd->DrawSlope(x1 + 3, y1 + 3, x2 - 3, y2 - 3, clrRed, Type);
+}
+
+void DrawSlopes(cOsd *Osd)
+{
+  int xa = 0;
+  int ya = 0;
+  int xb = Osd->Width() - 1;
+  int yb = Osd->Height() - 1;
+  int x0 = xa;
+  int x4 = xb;
+  int x2 = (x0 + x4) / 2;
+  int x1 = (x0 + x2) / 2;
+  int x3 = (x2 + x4) / 2;
+  int y0 = ya;
+  int y3 = yb;
+  int y2 = (y0 + y3) / 2;
+  int y1 = (y0 + y2) / 2;
+  Osd->DrawRectangle(xa, ya, xb, yb, clrGray50);
+  DrawSlope(Osd, x0, y0, x2, y1, 0);
+  DrawSlope(Osd, x2, y0, x4, y1, 1);
+  DrawSlope(Osd, x0, y1, x2, y2, 2);
+  DrawSlope(Osd, x2, y1, x4, y2, 3);
+  DrawSlope(Osd, x0, y2, x1, y3, 4);
+  DrawSlope(Osd, x1, y2, x2, y3, 5);
+  DrawSlope(Osd, x2, y2, x3, y3, 6);
+  DrawSlope(Osd, x3, y2, x4, y3, 7);
+  Osd->Flush();
+}
+
 // --- cLineGame -------------------------------------------------------------
 
 class cLineGame : public cOsdObject {
@@ -31,7 +108,7 @@ class cLineGame : public cOsdObject {
 cLineGame::cLineGame(void)
 {
   osd = NULL;
-  x = y = 50;
+  x = y = 0;
   color = clrRed;
 }
 
@@ -42,12 +119,23 @@ cLineGame::~cLineGame()
 
 void cLineGame::Show(void)
 {
-  osd = cOsdProvider::NewOsd(100, 50, 50);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop(), 50);
   if (osd) {
-     tArea Area = { 0, 0, 99, 199,  4 };
-     osd->SetAreas(&Area, 1);
-     osd->DrawRectangle(0, 0, 99, 199, clrGray50);
-     osd->Flush();
+     int x1 = cOsd::OsdWidth() - 1;
+     int y1 = cOsd::OsdHeight() - 1;
+     while (x1 > 0 && y1 > 0) {
+           tArea Area = { 0, 0, x1, y1, 4 };
+           if (osd->CanHandleAreas(&Area, 1) == oeOk) {
+              osd->SetAreas(&Area, 1);
+              osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, clrGray50);
+              osd->Flush();
+              x = osd->Width() / 2;
+              y = osd->Height() / 2;
+              break;
+              }
+           x1 = x1 * 9 / 10;
+           y1 = y1 * 9 / 10;
+           }
      }
 }
 
@@ -55,19 +143,24 @@ eOSState cLineGame::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdObject::ProcessKey(Key);
   if (state == osUnknown) {
+     const int d = 4;
      switch (Key & ~k_Repeat) {
-       case kUp:     if (y > 0)   y--; break;
-       case kDown:   if (y < 196) y++; break;
-       case kLeft:   if (x > 0)   x--; break;
-       case kRight:  if (x < 96)  x++; break;
+       case kUp:     y = max(0, y - d); break;
+       case kDown:   y = min(osd->Height() - d, y + d); break;
+       case kLeft:   x = max(0, x - d); break;
+       case kRight:  x = min(osd->Width() - d, x + d); break;
        case kRed:    color = clrRed; break;
        case kGreen:  color = clrGreen; break;
        case kYellow: color = clrYellow; break;
        case kBlue:   color = clrBlue; break;
+       case k1:      DrawEllipses(osd);
+                     return osContinue;
+       case k2:      DrawSlopes(osd);
+                     return osContinue;
        case kOk:     return osEnd;
        default: return state;
        }
-     osd->DrawRectangle(x, y, x + 3, y + 3, color);
+     osd->DrawRectangle(x, y, x + d - 1, y + d - 1, color);
      osd->Flush();
      state = osContinue;
      }
@@ -84,6 +177,7 @@ class cTrueColorDemo : public cOsdObject, public cThread {
   bool clockwise;
   cPixmap *destroyablePixmap;
   cPixmap *toggleablePixmap;
+  bool SetArea(void);
   virtual void Action(void);
   cPixmap *CreateTextPixmap(const char *s, int Line, int Layer, tColor ColorFg, tColor ColorBg, const cFont *Font);
 public:
@@ -241,7 +335,7 @@ void cTrueColorDemo::Action(void)
                        State++;
                      }
                      break;
-             case 1: { 
+             case 1: {
                        FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent, OsdFont);
                        if (FadeInPixmap)
                           Line += FadeInPixmap->DrawPort().Height();
@@ -390,13 +484,21 @@ void cTrueColorDemo::Action(void)
   delete LrgFont;
 }
 
+bool cTrueColorDemo::SetArea(void)
+{
+  if (osd) {
+     tArea Area = { 0, 0, cOsd::OsdWidth() - 1, cOsd::OsdHeight() - 1,  32 };
+     return osd->SetAreas(&Area, 1) == oeOk;
+     }
+  return false;
+}
+
 void cTrueColorDemo::Show(void)
 {
   osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop(), 50);
   if (osd) {
-     tArea Area = { 0, 0, cOsd::OsdWidth() - 1, cOsd::OsdHeight() - 1,  32 };
-     if (osd->SetAreas(&Area, 1) == oeOk) {
-        osd->DrawRectangle(0, 0, osd->Width() -1 , osd->Height() - 1, clrGray50);
+     if (SetArea()) {
+        osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, clrGray50);
         osd->Flush();
         Start();
         }
@@ -423,6 +525,14 @@ eOSState cTrueColorDemo::ProcessKey(eKeys Key)
        case kGreen:  if (toggleablePixmap)
                         toggleablePixmap->SetLayer(-toggleablePixmap->Layer());
                      break;
+       case k1:      Cancel(3);
+                     SetArea();
+                     DrawEllipses(osd);
+                     break;
+       case k2:      Cancel(3);
+                     SetArea();
+                     DrawSlopes(osd);
+                     break;
        case kOk:     return osEnd;
        default: return state;
        }
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 2895ca8cc..2ba8de782 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 2.4 2012/01/08 13:27:17 kls Exp $
+# $Id: pic2mpg 2.5 2013/02/17 13:17:13 kls Exp $
 
 use File::Path;
 use File::Spec;
@@ -37,9 +37,9 @@ $Verbose   = $opt_v;
 $ListFiles = $Verbose >= 1;
 $Detailed  = $Verbose >= 2;
 
-# Supported picture types:                                                                                                       
+# Supported picture types:
 
-%PICTYPES = (                                                                                                                  
+%PICTYPES = (
   bmp  => 1,
   gif  => 1,
   jpeg => 1,
@@ -135,7 +135,7 @@ sub ConvertFile
   return if (!defined $PICTYPES{$Type});
   my $Exif = ImageInfo($Pict);
   my $Orientation = $$Exif{"Orientation"};
-  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+)/; 
+  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+)/;
   my $Rotate = $Degrees ? "-rotate $Degrees" : "";
   print "orientation = '$Orientation' -> rotation = $Rotate\n" if ($Detailed);
   $Pict = EscapeMeta($Pict);
diff --git a/PLUGINS/src/pictures/pic2mpg-sd b/PLUGINS/src/pictures/pic2mpg-sd
index 6213091ee..01312afa3 100755
--- a/PLUGINS/src/pictures/pic2mpg-sd
+++ b/PLUGINS/src/pictures/pic2mpg-sd
@@ -154,7 +154,7 @@ sub ConvertFile
   print "image size is $w x $h\n" if ($Detailed);
   my $Exif = ImageInfo($Pict);
   my $Orientation = $$Exif{"Orientation"};
-  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+) /; 
+  my ($Degrees) = $Orientation =~ /Rotate ([0-9]+) /;
   my $Rotate = "-null";
   $Rotate = "-cw"   if $Degrees eq "90";
   $Rotate = "-ccw"  if $Degrees eq "270";
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index c74155cda..d8b8e1629 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 2.2 2013/01/12 14:13:00 kls Exp $
+ * $Id: svccli.c 2.3 2013/02/17 14:10:26 kls Exp $
  */
 
 #include <stdlib.h>
@@ -32,7 +32,7 @@ struct AddService_v1_0 {
   int sum;
   };
 
-// --- cPluginSvcCli ----------------------------------------------------------
+// --- cPluginSvcCli ---------------------------------------------------------
 
 cOsdObject *cPluginSvcCli::MainMenuAction(void)
 {
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index ed2afff08..55d1bc010 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 2.2 2013/01/12 14:13:05 kls Exp $
+ * $Id: svcsvr.c 2.3 2013/02/17 14:10:38 kls Exp $
  */
 
 #include <stdlib.h>
@@ -29,7 +29,7 @@ struct AddService_v1_0 {
   int sum;
   };
 
-// --- cPluginSvcSvr ----------------------------------------------------------
+// --- cPluginSvcSvr ---------------------------------------------------------
 
 bool cPluginSvcSvr::Service(const char *Id, void *Data)
 {
diff --git a/README b/README
index 9a1efb8f4..116385ec2 100644
--- a/README
+++ b/README
@@ -36,5 +36,5 @@ the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
 
 
-"VDR Video Disk Recorder" is a registered trademark of Klaus Schmidinger. 
-"TVDR TV Done Right" is a registered trademark of Klaus Schmidinger. 
+"VDR Video Disk Recorder" is a registered trademark of Klaus Schmidinger.
+"TVDR TV Done Right" is a registered trademark of Klaus Schmidinger.
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
new file mode 100644
index 000000000..3ed9db0be
--- /dev/null
+++ b/UPDATE-2.0.0
@@ -0,0 +1,475 @@
+This is a summary of the changes in VDR 2.0.0 since the last stable
+version 1.6.0. It only contains things that are of actual importance
+to the user and doesn't mention the many fixes and improvements that
+have been made "behind the scenes".
+
+See the file HISTORY for a detailed list of all changes.
+
+Satellite Channel Routing:
+
+- VDR now supports "Satellite Channel Routing" (SCR) according to EN50494 (based on
+  the "unicable" patch).
+  Since "Unicable" is a registered trademark and stands for only one of many
+  implementations of SCR, the following changes have been made compared to the patch,
+  which need to be taken into account by people who have set up their system using
+  the patch:
+  - The 'U' parameter in the diseqc.conf file has been changed to 'S' ("Scr").
+  - The configuration file name has been changed from "unicable.conf" to "scr.conf".
+
+Device Bonding:
+
+- The new setup options "LNB/Device n connected to sat cable" can be used to define
+  which DVB-S devices are connected to the same sat cable and are therefore "bonded".
+  This obsoletes the LNBSHARE patch. Users of the LNBSHARE patch will need to newly
+  set up their sat devices with the above options.
+
+Subtitles:
+
+- Implemented handling of HD resolution subtitles according to v1.3.1 of
+  ETSI EN 300 743, chapter 7.2.1.
+- Fixed handling DVB subtitles and implemented decoding textual DVB subtitles.
+
+Plugins:
+
+- Added cDevice::NumProvidedSystems() to PLUGINS.html (was missing since it had
+  been implemented).
+- The 'sky' plugin is no longer part of the VDR source.
+- IMPORTANT NOTE TO PLUGIN AUTHORS: a plugin that implements a derived cDevice
+  class that can replay video must now call the MakePrimaryDevice() function of
+  its base class.
+- Implemented cDeviceHook to allow plugins more control over which device can
+  provide which transponder.
+- Plugins can now define new sources. In order to implement this, the following
+  changes were made:
+  + The transponder parameter string is no longer interpreted by cChannel, but rather
+    stored as is and used only by the respective device. That way plugins can use a
+    channel's parameter string to store arbitrary data (see vdr.5).
+  + The new class cSourceParam can be used by plugins to define new sources, and to
+    implement OSD items that will be used in the channel editor for editing the source
+    specific parameters of a channel (see dvbdevice.c for an example of how this is
+    done for the default DVB devices).
+  + Purely numerical values are no longer accepted in the 'source' parameter of a
+    channel.
+  This obsoletes the PLUGINPARAM patch.
+- The dvbhddevice plugin is now part of the VDR distribution archive.
+- The pic2mpg script of the 'pictures' plugin now generates HD images.
+  The old SD version is still available as pic2mpg-sd.
+- The dvbsddevice plugin now supports the new option --outputonly, which disables
+  receiving on SD FF devices and uses the device only for output.
+- The code for the RCU remote control unit has been moved into a separate plugin
+  named "rcu".
+  The REMOTE=RCU option in the 'make' call for VDR is now obsolete.
+  The command line option --rcu is now obsolete. Use -Prcu instead. If you have
+  used --rcu with a device path, use -P"rcu -d<device>".
+- Removed the obsolete function cEITScanner::UsesDevice(). If a plugin has used this
+  function to find out whether a call to its cStatus::ChannelSwitch() function was
+  due to a live channel switch, it can use that function's new parameter LiveView.
+  Any plugins that implement cStatus::ChannelSwitch() need to add the parameter
+  'bool LiveView' to that function.
+- Added a new plugin interface for implementing EPG handlers.
+  + A plugin can implement an EPG handler by creating an object derived from
+    cEpgHandler and implementing the necessary member functions.
+  + The special handling of events with table id 0x00 has been dropped.
+    For backwards compatibility EPG events with table ids lower than 0x4E will
+    be treated as if they had a table id of 0x4E, and the new plugin 'epgtableid0'
+    can be used to have them handled like in previous versions.
+  + The default table id for a newly created cEvent has been changed to 0xFF,
+    which is higher than any normal table id that is broadcast in the EIT data.
+  See PLUGINS.html, section "Electronic Program Guide" for more information.
+- The cThread constructor now has an additional boolean parameter that can be set to
+  true to have this thread run at a lower priority. Plugin authors that use low
+  priority threads may want to use this instead of the calls to SetPriority(19) and
+  SetIOPriority(7). The priority of a thread ("low" or "high") is now logged when the
+  thread starts.
+- The plugin Makefiles now have a separate 'install' target.
+- Plugin Makefiles now use DESTDIR and the 'install' program.
+- Plugin Makefiles can now include a configuration file for compile time parameters.
+- Plugins that implement an interface to any kind of remote controls shall use the
+  new parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta to allow the user to
+  adjust the behavior of the remote control's repeat function. They shall also
+  remove any setup options they might have that serve the same purpose.
+- Added demos of the DrawEllipse() and DrawSlope() function to the 'osddemo'
+  plugin (press '1' or '2', respectively).
+
+Skins:
+
+- The 'sttng' skin now displays two colored bars at the bottom of the channel display,
+  indicating the strength (upper bar) and quality (lower bar) of the received signal.
+  The number to the left of these bars indicates the actual device the current
+  channel is being received with.
+- Skins can now inquire the menu category for which their cSkinDisplayMenu is currently
+  being used. This can be done either through a call to cSkinDisplayMenu::MenuCategory()
+  or by reimplementing cSkinDisplayMenu::SetMenuCategory(). This information allows a
+  skin to use special icons or decorations for the various types of menus in VDR.
+- The new member function cSkinDisplayReplay::SetRecording() allows a skin to display
+  more information about the currently played recording.
+- The new skin "LCARS" is an enhanced version of the "ST:TNG" skin (which is still
+  there in its original layout, for those who don't like the LCARS skin, or can't use
+  it due to OSD limitations). The LCARS skin utilizes the new "menu category" feature
+  to display additional information on the main menu page. It shows upcoming timers
+  and the system's devices, as well as which device is recording which timers. The
+  upper pane of the main menu displays the programme data in live and replay mode,
+  and a progress bar. An indicator on the right side of the device list shows which
+  device is currently used for live viewing, and whether it is in transfer mode.
+  The individual device displays show the device number, the device type, which CAM
+  (if any ) is currently assigned to the device, and the signal strength and quality.
+  On the left side of the OSD there is a permanent display of the current date and
+  time, the disk usage and the system load.
+  "LCARS" is the new default skin of VDR. It requires at least a 4bpp (16 color) full
+  screen OSD, but you can still operate it if your OSD can handle only fewer colors
+  (in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin).
+- The new functions SetItemEvent(), SetItemTimer(), SetItemChannel() and
+  SetItemRecording() of the cSkinDisplayMenu class can be reimplemented by skin
+  plugins to display these items in a more elaborate way than just a simple line of
+  text.
+
+Remote control:
+
+- Changed the default location for the LIRC socket to /var/run/lirc/lircd.
+- The new setup options "OSD/Color key [0123]" can be used to adjust the sequence
+  of the color buttons displayed in the menus to that of the color keys on your
+  remote control.
+  Authors of plugins that implement skins may want to adapt their SetButtons()
+  function in order to make use of this new feature. See, for instance, the function
+  cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details.
+- Added user defined key kUser0.
+- The new remote control key "Play/Pause" can be used with remote controls that don't
+  have separate keys for "Play" and "Pause", but rather have a single key for both
+  functions.
+- The new options "Setup/Miscellaneous/Remote control repeat delay" and
+  "Setup/Miscellaneous/Remote control repeat delta" can be used to adjust the
+  behavior of the remote control in case a key is held pressed down for a while, so
+  that the repeat function kicks in.
+
+Devices:
+
+- Re-implemented handling of DVB-S2, which first appeared in version 1.5.14, but was
+  revoked in version 1.5.15 in favor of making a stable version 1.6.0.
+  Note that the channels.conf file now supports additional parameters, so you may
+  want to make sure you have a backup of this file in case you need to go back to
+  the previous version of VDR!
+- cDvbDevice now uses the FE_CAN_2G_MODULATION flag to determine whether a device
+  can handle DVB-S2.
+- The support for full featured DVB cards of the TT/FuSi design has been moved
+  into the new plugin 'dvbsddevice'. On systems that use such a card as their
+  primary device, this plugin now needs to be loaded when running VDR in order
+  to view live or recorded video. If the plugin is not loaded, the card will
+  be treated like a budget DVB card, and there will be no OSD or viewing
+  capability.
+- Added support for DVB cards with multiple fontends. Note that this only
+  works for DVB cards where each frontend can be used independently of all
+  the others on the same adapter.
+- Added support for ATSC devices. This obsoletes the ATSC patch.
+- The new functions cDevice::SignalStrength() and cDevice::SignalQuality() can be
+  used to determine the signal strength and quality of a given device.
+- The new function cDevice::ProvidesEIT() is used to determine whether a device can
+  provide EIT data and will thus be used in cEITScanner::Process() to receive EIT
+  data from the channels it can receive. Note that by default it is assumed that
+  a device can't provide EIT data, and only the builtin cDvbDevice returns true
+  from this function.
+- Added support for devices with more than one delivery system per frontend.
+  This requires a DVB driver with version 5.5 or higher that can handle the
+  DTV_ENUM_DELSYS call. With older drivers it will fall back to one delivery
+  system per frontend.
+- Added support for handling DVB-T2 transponders.  This requires a DVB driver
+  with version 5.3 or higher that can handle the DTV_DVBT2_PLP_ID call (which has
+  been renamed to DTV_STREAM_ID in DVB API 5.8).
+- The DVB device adapters/frontends are now probed by scanning the /dev/dvb directory
+  instead of looping through adapter/frontend numbers. This allows for "holes" in the
+  device numbering.
+- Removed the "PrimaryLimit". Old "full featured" DVB cards can be run with the
+  --outputonly option to avoid problems with recording high bandwidth channels.
+  Besides, with HDTV becoming ever more popular those cards are pretty much obsolete
+  by now (the TT S2-6400 has no problems recording and replaying high bandwidth
+  channels simultaneously). And, last but not least, people using software players
+  won't notice this change, anyway.
+- The new function cDevice::DeviceName() returns a string identifying the name of
+  the given device.
+- The new function cDevice::DeviceType() returns a string identifying the type of
+  the given device.
+- The new function cDevice::ReadFilter() can be used by devices to implement their
+  own way of retrieving section filter data.
+- The new function cDevice::HasInternalCam() can be implemented by devices that
+  provide encrypted channels in an already decrypted form, without requiring explicit
+  handling of a CAM.
+- The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by
+  derived output devices to implement scaling the video to a given size and location.
+
+DiSEqC:
+
+- Added device definitions to the diseqc.conf file format, so that certain satellite
+  positions can be limited to a given list of devices.
+  This obsoletes the SOURCECAPS patch.
+- Transponders that use "8psk turbo fec" (a non-standard mode used by North American
+  providers) are now identified by assuming that all 8psk transponders on DVB-S use
+  "turbo fec".
+
+EPG:
+
+- The epg.data file is now read in a separate thread to make the startup process
+  faster in case the file is very large.
+- Moved cleaning up the EPG data and writing the epg.data file into a separate
+  thread to avoid sluggish response to user input on slow systems
+
+OSD:
+
+- The OSD and font sizes are now defined in percent of the actual video display
+  size. The maximum OSD size has been raised to 1920x1080, to allow full
+  screen OSD on HD systems.
+- The OSD size is now automatically adjusted to the actual video display
+  (provided the output device implements the GetOsdSize() function).
+- The OSD now has full TrueColor support. There can be several "pixmaps" that can
+  be overlayed with alpha blending. All existing skins should work out of the box
+  with the TrueColor OSD - the only exception being cOsd::GetBitmap(). Since the
+  TrueColor OSD doesn't use bitmaps, this function will return a dummy bitmap, which
+  may not be what the plugin expects. As long as this bitmap is only used for setting
+  the palette, there is no problem. However, any other operations on this bitmap will
+  have no effect. See the description of the cPixmap functions in osd.h for details
+  about the new functionalities.
+  The "ST:TNG Panels" skin has been enhanced to automatically use the TrueColor OSD
+  if available.
+  The "osddemo" plugin has been extended to show some of the possibilities of the
+  TrueColor OSD if it is run on a system that actually provides TrueColor support.
+- The Audio and Subtitles options are now available through the Green and Yellow
+  keys in the Setup/DVB menu. This is mainly for remote controls that don't have
+  dedicated keys for these functions.
+- The Recordings menu now displays the length (in hours:minutes) of each recording
+  Note that the "new" indicator has been moved from the recording time to the length
+  column. This new format is also used by the SVDRP command LSTR, so in case you have
+  an application that parses the LSTR output, you will need to adjust it to the new
+  format.
+- The new setup option "Replay/Show remaining time" can be used to switch between
+  showing the total length or the remaining time of the recording that is currently
+  replayed.
+- The replay progress display is now turned on whenever a mark is toggled (not
+  only when one is set).
+- The Green button in the "Edit timer" menu can now be used to toggle between single
+  shot and repeating timers. This is the same as pressing '0' when the "Day" field
+  is selected, but it works at any time (and is more obvious).
+- When estimating the remaining disk space (in hours), the average data rate of all
+  existing recordings is now taken into account. If this value can't be determined,
+  the previous value of 25.75 MB/min is taken.
+- The disk usage is no longer automatically added to the title of the main and
+  "Recordings" menus. This has always been a mekeshift solution and it is now up
+  to the individual skin if, where and how it wants to display this information.
+  A skin can use the new cVideoDiskUsage class to implement such a display. For
+  compatibility, the default skins "Classic VDR", "ST:TNG Panels" and "Text mode"
+  (i.e. curses) have been changed to behave like before. Other skins may want to
+  display the disk usage in totally different ways.
+- A cOsdMenu can now handle skins that display different numbers of items in the
+  various menu categories.
+- OSD and skin are now reinitialized after a plugin setup page has been confirmed,
+  to have them react immediately in case any change to a plugin's setup parameter
+  has an effect on the OSD.
+- Now making sure that the "small font" is never larger than the "osd font".
+- Within the "Recordings" menu, pressing the '0' key now toggles sorting between
+  "by time" and "by name". The selected sort mode is stored separately for each
+  folder (provided you have write access to that folder).
+  If a folder is newly created by a repeating timer, the sort mode for that
+  folder is initially set to "by time".
+- The new setup option "Miscellaneous/Show channel names with source" can be used to
+  turn on adding the source character to channel names whenever they are displayed.
+- Pressing the Play key during normal live viewing mode now opens the Recordings menu
+  if there is no "last viewed" recording.
+  The same behavior has been implemented for the Blue key in the main menu.
+- The new option "Setup/Replay/Progress display time" can be used to activate
+  automatically displaying the progress display whenever replay of a recording is
+  started.
+
+Time Shifting:
+
+- The new setup option "Recording/Pause key handling" can be used to define
+  what happens if the Pause key on the remote control is pressed during
+  live tv.
+- The new setup option "Recording/Delete timeshift recording" controls whether a timeshift
+  recording is automatically deleted after viewing it.
+  This obsoletes the DELTIMESHIFTREC patch.
+  Note that the meaning of the values for this option is different from the DELTIMESHIFTREC
+  patch: 0 means timeshift recordings are not automatically deleted (the default behavior
+  as in previous versions), while 1 means to ask the user whether the recording shall be
+  deleted.
+- The setup parameter "Recording/Instant rec. time (min)" can now be set to '0',
+  which means to record only the currently running event.
+- When pausing live video, the current audio and subtitle tracks are now retained.
+
+Timers:
+
+- The "Edit timer" menu can now set the folder for the recording from a list of
+  folders stored in "folders.conf".
+- The file name in the "Timers" menu now shows only the base name of the recording
+  without the folder path (if any). Otherwise with long folder paths the actual
+  recording name was not visible at all.
+- The new setup option "Folders in timer menu" controls whether the file names in
+  the timer menu are shown with their full folder path.
+
+Recordings:
+
+- The recording format is now TS (Transport Stream).
+  Existing recordings in PES format can still be replayed and edited, but new
+  recordings are done in TS.
+  All code for recording in PES has been removed.
+  The following changes were made to switch to TS recording format:
+  + Since a TS needs to have a PAT/PMT, which requires the video stream type to
+    be explicitly given, the format of the VPID field in the channels.conf file
+    and the SVDRP commands NEWC/MODC/LSTC has been extended. The video stream type
+    now follows the VPID and optional PPID, separated by an '=' sign.
+  + The index file format has been changed to support file sizes of up to 1TB
+    (previously 2GB), and up to 65535 separate files per recording (previously
+    255).
+  + The recording file names are now of the form 00001.ts (previously 001.vdr).
+  + The frame rate is now detected by looking at two subsequent PTS values.
+    The "frames per second" is stored in the "info" file using the new tag F.
+  + The directory name for a recording has been changed from
+    YYYY-MM-DD-hh[.:]mm.pr.lt.rec (pr=priority, lt=lifetime) to
+    YYYY-MM-DD-hh.mm.ch-ri.rec (ch=channel, ri=resumeId).
+    Priority and Lifetime are now stored in the "info" file with the new
+    tags P and L (if no such file exists, the maximum values are assumed by
+    default, which avoids inadvertently deleting a recording if disk space
+    is low). No longer storing Priority and Lifetime in the directory name
+    avoids starting a new recording if one of these is changed in the timer
+    and the recording is re-started for some reason.
+    Instead of Priority and Lifetime, the directory name now contains the
+    channel number from which the recording was made, and the "instance id"
+    this instance of VDR. This avoids problems if several VDR instances record
+    the same show on different channels, or even on the same channel.
+    The '-' between channel number and resumeId prevents older versions of
+    VDR from "seeing" these recordings, which makes sure they won't even try
+    to replay them, or remove them in case the disk runs full.
+  + The files "index", "info", "marks" and "resume" within a TS recording
+    directory are now created without the ".vdr" extension.
+  + The "resume" file is no longer a binary file, but contains tagged lines
+    to be able to store additional information, like the selected audio or
+    subtitle track.
+  + cDvbPlayer::Goto() no longer appends a "sequence end code" to the data.
+    If the output device needs this, it has to take care of it by itself.
+- The index file for TS recordings is now regenerated on-the-fly if a
+  recording is replayed that has no index. This can also be used to
+  re-create a broken index file by manually deleting the index file and then
+  replaying the recording (at least until the index file has been generated).
+- The new command line options --edit and --genindex can be used to edit a
+  recording or generate its index without actually starting the entire VDR.
+- The new command line options --filesize and --split can be used together with --edit
+  to set the maximum video file size and turn on splitting edited files at the editing
+  marks. These options must be given before --edit to have an effect.
+- The start time of an edited recording is now set to the time of the first
+  editing mark.
+  This obsoletes the CUTTIME patch.
+- An ongoing editing process is now canceled if either the original or the edited
+  version of the recording is deleted from the Recordings menu.
+- If a frame position in the 'marks' file of a recording doesn't point to an I-frame,
+  it will now be shifted towards the next I-frame (either up or down, whichever is
+  closer).
+- Editing marks can now be placed directly on top of each other, in which case they
+  simply mark a position, but have no effect on the actual cutting process.
+- When positioned at an offset where two (or more) editing marks are placed on top
+  of each other, the '4' key moves the first one of them to the left, while the '6'
+  key moves the last one of them to the right. The '7' and '9' key handle multiple
+  marks at the same place as if it were one single mark.
+- The '7' and '9' keys now jump to the very beginning or end, respectively, of the
+  recording, even if there is no mark set at that point.
+- The new option "Setup/Replay/Pause on mark set" can be used to activate automatically
+  going into Pause mode if an editing mark is set during replay.
+- Timers no longer do any special "VFAT" handling to shorten directory names to 40
+  characters. When a string is used as a directory name for a recording, the maximum
+  length of the directory path, as well as the individual directory names, is now
+  limited to the values specified by the new command line option --dirnames (see
+  man vdr(1) for details). For backwards compatibility the option --vfat is still
+  available and has the same effect as --dirnames=250,40,1.
+- Improved cutting videos.
+
+SVDRP:
+
+- The SVDRP signon message now indicates the character encoding in use, as in
+  "220 video SVDRP VideoDiskRecorder 1.7.1; Fri May  2 16:17:10 2008; ISO-8859-1".
+  This may be useful for instance for external tools that provide EPG data, so that
+  they can correctly encode the strings.
+- The SVDRP command PUTE now supports reading the EPG data from a given file.
+- After a CLRE command, no further EPG processing is now done for 10 seconds,
+  so that data sent with subsequent PUTE commands doesn't interfere with data
+  from the broadcasters.
+- If svdrphosts.conf contains only the address of the local host, the SVDRP port
+  is opened only for the local host.
+- The default SVDRP port is now 6419 (registered with ICANN/IANA).
+  Use '-p 2001' to switch back to the old port if necessary.
+- The SVDRP command HITK now accepts multiple keys (up to 31).
+- The SVDRP command LSTC now also accepts channel IDs.
+- The new SVDRP command UPDR can be used to trigger an update of the list of
+  recordings.
+- The SVDRP command DELR now won't delete a recording that is currently being edited.
+- The SVDRP command LSTR now knows the additional parameter "path", which can be
+  given to get the actual file name of a recording's directory.
+- The SVDRP command NEWT no longer checks whether a timer with the given data already
+  exists.
+
+Audio:
+
+- Implemented handling the standard component descriptor for AC3 (stream=4).
+  The previously used "Premiere pseudo standard" (stream=2, type=5) still works, but
+  has apparently been wrongfully used by broadcasters from the beginning.
+- Improved fast-forward/-rewind for audio recordings. The actual data is now sent
+  to the output device, so that it can be replayed and thus cause the proper delay.
+  For pure audio recordings the audio is no longer muted in fast-forward/-rewind
+  mode, so that some orientation regarding the position within the recording is
+  possible.
+- The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital
+  tracks appear in the "Audio" menu. Dolby Digital is always recorded.
+  This obsoletes the DOLBYINREC patch.
+
+Internationalization:
+
+- Added Lithuanian language texts.
+- Added Slovakian language texts.
+- Added Macedonian language texts.
+- Added support for languages that are written right-to-left.
+  See INSTALL for information on how to turn this on.
+- Added Arabian language texts.
+- Added Serbian language texts.
+
+Misc:
+
+- Errors in config files no longer keep VDR from starting.
+- The new command line option -i can be used to set an "instance id", which will
+  be used to distinguish recordings of the same broadcast made by different instances
+  of VDR.
+- Implemented handling the "Parental Rating Descriptor".
+  The 'classic', 'sttng' and 'curses' skins display the parental
+  rating (if given) in their event displays. The epg.data file stores
+  the parental rating using the tag character 'R'.
+  IMPORTANT NOTE: if VDR doesn't display a parental rating, this does not
+  necessarily mean that the given programme is suitable for all audiences!
+- Renamed 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
+  in 'make install'.
+- The new setup option "Miscellaneous/Channels wrap" controls whether the current
+  channel wraps around the beginning or end of the channel list when zapping.
+- The files "commands.conf" and "reccmd.conf" can now contain nested lists of
+  commands. See vdr.5 for information about the new file format.
+  This obsoletes the CMDSUBMENU patch.
+- The new setup option "OSD/Number keys for characters" can be used to control whether
+  the number keys can be used to enter characters in a text input field.
+- While replaying, the editing marks are now updated every 10 seconds.
+- Added generating a pkg-config file to the Makefile.
+- Removed the '.pl' suffix from all scripts.
+- The new setup option "DVB/Standard compliance" can be used to switch between different
+  variations of the DVB standard. Currently there is "DVB" (for the original DVB
+  standard) and "ANSI/SCTE", which is used to properly handle certain private stream
+  types.
+- By default VDR is now built according to the FHS ("File system Hierarchy Standard"),
+  and a plain "make" in the VDR source directory just builds everything, but doesn't
+  copy it to ./PLUGINS/lib and ./locale any more. You can use a Make.config file
+  (copied from Make.config.template) and set the parameter LCLBLD=1 to have everything
+  built and installed under the VDR source tree (as was the default in previous
+  versions). If you already have your own Make.config file, you may want to copy the
+  new Make.config.template and adapt it to your needs. If you don't want VDR's data
+  files to be spread around your system according to the FHS, you can set the
+  parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as
+  before.
+- VDR can now be built according to the FHS ("File system Hierarchy Standard") by
+  activating the line
+  #USEFHS = 1
+  in a copy of the file Make.config.template.
+- The script given to VDR with the '-r' option is now also called whenever a
+  recording is deleted.
+- Synchronizing system time to the transponder time is now done using adjtime() in order
+  to avoid discontinuities. If the time difference is more than 10 seconds, stime() is
+  still used to do the initial sync.
+- Implemented scaling of SPU bitmaps.
diff --git a/channels.conf.terr b/channels.conf.terr
index 5a264fade..9878c14a5 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -9,7 +9,6 @@ BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228:0:0:0
 bid-up.tv (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6273:6274:0:0:14272:0:0:0
 CBBC (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4671:0:0:0
 Cbeebies (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16960:0:0:0
-Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841:2843:0:0:8800:0:0
 Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
 Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
 Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0
diff --git a/ci.c b/ci.c
index 904697eba..9a4a82954 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.10 2012/10/07 11:11:18 kls Exp $
+ * $Id: ci.c 2.12 2013/02/17 13:17:28 kls Exp $
  */
 
 #include "ci.h"
@@ -35,7 +35,7 @@ static bool DumpDateTime = false;
 
 static const uint8_t *GetLength(const uint8_t *Data, int &Length)
 ///< Gets the length field from the beginning of Data.
-///< \return Returns a pointer to the first byte after the length and
+///< Returns a pointer to the first byte after the length and
 ///< stores the length value in Length.
 {
   Length = *Data++;
@@ -50,7 +50,7 @@ static const uint8_t *GetLength(const uint8_t *Data, int &Length)
 
 static uint8_t *SetLength(uint8_t *Data, int Length)
 ///< Sets the length field at the beginning of Data.
-///< \return Returns a pointer to the first byte after the length.
+///< Returns a pointer to the first byte after the length.
 {
   uint8_t *p = Data;
   if (Length < 128)
@@ -70,7 +70,7 @@ static uint8_t *SetLength(uint8_t *Data, int Length)
 
 static char *CopyString(int Length, const uint8_t *Data)
 ///< Copies the string at Data.
-///< \return Returns a pointer to a newly allocated string.
+///< Returns a pointer to a newly allocated string.
 {
   // Some CAMs send funny characters at the beginning of strings.
   // Let's just skip them:
@@ -88,7 +88,7 @@ static char *CopyString(int Length, const uint8_t *Data)
 
 static char *GetString(int &Length, const uint8_t **Data)
 ///< Gets the string at Data.
-///< \return Returns a pointer to a newly allocated string, or NULL in case of error.
+///< Returns a pointer to a newly allocated string, or NULL in case of error.
 ///< Upon return Length and Data represent the remaining data after the string has been skipped.
 {
   if (Length > 0 && Data && *Data) {
@@ -371,7 +371,7 @@ cCiSession::~cCiSession()
 
 int cCiSession::GetTag(int &Length, const uint8_t **Data)
 ///< Gets the tag at Data.
-///< \return Returns the actual tag, or AOT_NONE in case of error.
+///< Returns the actual tag, or AOT_NONE in case of error.
 ///< Upon return Length and Data represent the remaining data after the tag has been skipped.
 {
   if (Length >= 3 && Data && *Data) {
@@ -959,7 +959,7 @@ cCiMMI::~cCiMMI()
 
 char *cCiMMI::GetText(int &Length, const uint8_t **Data)
 ///< Gets the text at Data.
-///< \return Returns a pointer to a newly allocated string, or NULL in case of error.
+///< Returns a pointer to a newly allocated string, or NULL in case of error.
 ///< Upon return Length and Data represent the remaining data after the text has been skipped.
 {
   int Tag = GetTag(Length, Data);
@@ -1936,7 +1936,7 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
      for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
          CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
      for (const int *Spid = Channel->Spids(); *Spid; Spid++)
-         CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE); 
+         CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
      cas->SendPMT(&CaPmt);
      cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
      do {
diff --git a/config.c b/config.c
index b42289315..2c87985a3 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.34 2013/02/05 11:16:08 kls Exp $
+ * $Id: config.c 2.35 2013/02/14 15:14:37 kls Exp $
  */
 
 #include "config.h"
@@ -383,7 +383,7 @@ cSetup::cSetup(void)
   MenuScrollWrap = 0;
   MenuKeyCloses = 0;
   MarkInstantRecord = 1;
-  strcpy(NameInstantRecord, "TITLE EPISODE");
+  strcpy(NameInstantRecord, TIMERMACRO_TITLE " " TIMERMACRO_EPISODE);
   InstantRecordTime = DEFINSTRECTIME;
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
diff --git a/config.h b/config.h
index 00b2d68e4..693e92712 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.64 2013/02/05 11:19:20 kls Exp $
+ * $Id: config.h 2.67 2013/02/14 15:13:59 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.37"
-#define VDRVERSNUM   10737  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.38"
+#define VDRVERSNUM   10738  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.37"
-#define APIVERSNUM   10737  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.38"
+#define APIVERSNUM   10738  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -44,6 +44,9 @@
 #define MAXLIFETIME       99
 #define DEFINSTRECTIME    180 // default instant recording time (minutes)
 
+#define TIMERMACRO_TITLE    "TITLE"
+#define TIMERMACRO_EPISODE  "EPISODE"
+
 #define MINOSDWIDTH   480
 #define MAXOSDWIDTH  1920
 #define MINOSDHEIGHT  324
diff --git a/cutter.c b/cutter.c
index edb28248a..8566c720c 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.23 2013/01/23 10:39:27 kls Exp $
+ * $Id: cutter.c 2.24 2013/02/17 14:11:03 kls Exp $
  */
 
 #include "cutter.h"
@@ -104,7 +104,7 @@ void cPacketStorage::Flush(int Pid, uchar *Data, int &Length, int MaxLength)
      buffers[Pid]->Flush(Data, Length, MaxLength);
 }
 
-// --- cMpeg2Fixer --------------------------------------------------------
+// --- cMpeg2Fixer -----------------------------------------------------------
 
 class cMpeg2Fixer : private cTsPayload {
 private:
diff --git a/device.c b/device.c
index af416411d..ca897b0f4 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.71 2013/02/01 12:00:09 kls Exp $
+ * $Id: device.c 2.73 2013/02/16 14:39:30 kls Exp $
  */
 
 #include "device.h"
@@ -845,12 +845,12 @@ bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   return false;
 }
 
-bool cDevice::HasLock(int TimeoutMs)
+bool cDevice::HasLock(int TimeoutMs) const
 {
   return true;
 }
 
-bool cDevice::HasProgramme(void)
+bool cDevice::HasProgramme(void) const
 {
   return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
 }
@@ -1537,7 +1537,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 int cDevice::Priority(void) const
 {
   int priority = IDLEPRIORITY;
-  if (IsPrimaryDevice() && !Replaying() && ActualDevice() == PrimaryDevice())
+  if (IsPrimaryDevice() && !Replaying() && HasProgramme())
      priority = TRANSFERPRIORITY; // we use the same value here, no matter whether it's actual Transfer Mode or real live viewing
   cMutexLock MutexLock(&mutexReceiver);
   for (int i = 0; i < MAXRECEIVERS; i++) {
diff --git a/device.h b/device.h
index a62545179..fd010d412 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.45 2013/02/01 11:54:08 kls Exp $
+ * $Id: device.h 2.47 2013/02/16 15:20:01 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -116,7 +116,7 @@ class cDevice : public cThread {
          ///< Waits until all devices have become ready, or the given Timeout
          ///< (seconds) has expired. While waiting, the Ready() function of each
          ///< device is called in turn, until they all return true.
-         ///< \return True if all devices have become ready within the given
+         ///< Returns true if all devices have become ready within the given
          ///< timeout.
   static void SetUseDevice(int n);
          ///< Sets the 'useDevice' flag of the given device.
@@ -127,8 +127,8 @@ class cDevice : public cThread {
          ///< this instance of VDR.
   static bool SetPrimaryDevice(int n);
          ///< Sets the primary device to 'n'.
-         ///< \param n must be in the range 1...numDevices.
-         ///< \return true if this was possible.
+         ///< n must be in the range 1...numDevices.
+         ///< Returns true if this was possible.
   static cDevice *PrimaryDevice(void) { return primaryDevice; }
          ///< Returns the primary device.
   static cDevice *ActualDevice(void);
@@ -136,8 +136,8 @@ class cDevice : public cThread {
          ///< primary device otherwise.
   static cDevice *GetDevice(int Index);
          ///< Gets the device with the given Index.
-         ///< \param Index must be in the range 0..numDevices-1.
-         ///< \return A pointer to the device, or NULL if the Index was invalid.
+         ///< Index must be in the range 0..numDevices-1.
+         ///< Returns a pointer to the device, or NULL if the Index was invalid.
   static cDevice *GetDevice(const cChannel *Channel, int Priority, bool LiveView, bool Query = false);
          ///< Returns a device that is able to receive the given Channel at the
          ///< given Priority, with the least impact on active recordings and
@@ -328,13 +328,13 @@ class cDevice : public cThread {
          ///< after the device has been successfully tuned to the requested transponder.
          ///< Seconds will be silently limited to MAXOCCUPIEDTIMEOUT. Values less than
          ///< 0 will be silently ignored.
-  virtual bool HasLock(int TimeoutMs = 0);
+  virtual bool HasLock(int TimeoutMs = 0) const;
          ///< Returns true if the device has a lock on the requested transponder.
          ///< Default is true, a specific device implementation may return false
          ///< to indicate that it is not ready yet.
          ///< If TimeoutMs is not zero, waits for the given number of milliseconds
          ///< before returning false.
-  virtual bool HasProgramme(void);
+  virtual bool HasProgramme(void) const;
          ///< Returns true if the device is currently showing any programme to
          ///< the user, either through replaying or live.
 
@@ -432,19 +432,19 @@ class cDevice : public cThread {
 public:
   virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
          ///< Grabs the currently visible screen image.
-         ///< \param Size The size of the returned data block.
-         ///< \param Jpeg If true will write a JPEG file. Otherwise a PNM file will be written.
-         ///< \param Quality The compression factor for JPEG. 1 will create a very blocky
-         ///<        and small image, 70..80 will yield reasonable quality images while keeping the
-         ///<        image file size around 50 KB for a full frame. The default will create a big
-         ///<        but very high quality image.
-         ///< \param SizeX The number of horizontal pixels in the frame (default is the current screen width).
-         ///< \param SizeY The number of vertical pixels in the frame (default is the current screen height).
-         ///< \return A pointer to the grabbed image data, or NULL in case of an error.
+         ///< Size is the size of the returned data block.
+         ///< If Jpeg is true it will write a JPEG file. Otherwise a PNM file will be written.
+         ///< Quality is the compression factor for JPEG. 1 will create a very blocky
+         ///< and small image, 70..80 will yield reasonable quality images while keeping the
+         ///< image file size around 50 KB for a full frame. The default will create a big
+         ///< but very high quality image.
+         ///< SizeX is the number of horizontal pixels in the frame (default is the current screen width).
+         ///< SizeY is the number of vertical pixels in the frame (default is the current screen height).
+         ///< Returns a pointer to the grabbed image data, or NULL in case of an error.
          ///< The caller takes ownership of the returned memory and must free() it once it isn't needed any more.
   bool GrabImageFile(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
          ///< Calls GrabImage() and stores the resulting image in a file with the given name.
-         ///< \return True if all went well.
+         ///< Returns true if all went well.
          ///< The caller is responsible for making sure that the given file name
          ///< doesn't lead to overwriting any important other file.
 
@@ -509,7 +509,7 @@ class cDevice : public cThread {
        ///< Index tells which track of the given basic type is meant.
        ///< If Id is 0 any existing id will be left untouched and only the
        ///< given Language and Description will be set.
-       ///< \return Returns true if the track was set correctly, false otherwise.
+       ///< Returns true if the track was set correctly, false otherwise.
   const tTrackId *GetTrack(eTrackType Type);
        ///< Returns a pointer to the given track id, or NULL if Type is not
        ///< less than ttMaxTrackTypes.
@@ -525,14 +525,14 @@ class cDevice : public cThread {
   eTrackType GetCurrentAudioTrack(void) const { return currentAudioTrack; }
   bool SetCurrentAudioTrack(eTrackType Type);
        ///< Sets the current audio track to the given Type.
-       ///< \return Returns true if Type is a valid audio track, false otherwise.
+       ///< Returns true if Type is a valid audio track, false otherwise.
   eTrackType GetCurrentSubtitleTrack(void) const { return currentSubtitleTrack; }
   bool SetCurrentSubtitleTrack(eTrackType Type, bool Manual = false);
        ///< Sets the current subtitle track to the given Type.
        ///< IF Manual is true, no automatic preferred subtitle language selection
        ///< will be done for the rest of the current replay session, or until
        ///< the channel is changed.
-       ///< \return Returns true if Type is a valid subtitle track, false otherwise.
+       ///< Returns true if Type is a valid subtitle track, false otherwise.
   void EnsureAudioTrack(bool Force = false);
        ///< Makes sure an audio track is selected that is actually available.
        ///< If Force is true, the language and Dolby Digital settings will
@@ -593,13 +593,13 @@ class cDevice : public cThread {
        ///< Returns true if this device can currently start a replay session.
   virtual bool SetPlayMode(ePlayMode PlayMode);
        ///< Sets the device into the given play mode.
-       ///< \return true if the operation was successful.
+       ///< Returns true if the operation was successful.
   virtual int PlayVideo(const uchar *Data, int Length);
        ///< Plays the given data block as video.
        ///< Data points to exactly one complete PES packet of the given Length.
        ///< PlayVideo() shall process the packet either as a whole (returning
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
-       ///< \return Returns the number of bytes actually taken from Data, or -1
+       ///< Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
   virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
        ///< Plays the given data block as audio.
@@ -607,14 +607,14 @@ class cDevice : public cThread {
        ///< Id indicates the type of audio data this packet holds.
        ///< PlayAudio() shall process the packet either as a whole (returning
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
-       ///< \return Returns the number of bytes actually taken from Data, or -1
+       ///< Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
   virtual int PlaySubtitle(const uchar *Data, int Length);
        ///< Plays the given data block as a subtitle.
        ///< Data points to exactly one complete PES packet of the given Length.
        ///< PlaySubtitle() shall process the packet either as a whole (returning
        ///< Length) or not at all (returning 0 or -1 and setting 'errno' accordingly).
-       ///< \return Returns the number of bytes actually taken from Data, or -1
+       ///< Returns the number of bytes actually taken from Data, or -1
        ///< in case of an error.
   virtual int PlayPesPacket(const uchar *Data, int Length, bool VideoOnly = false);
        ///< Plays the single PES packet in Data with the given Length.
@@ -658,7 +658,7 @@ class cDevice : public cThread {
        ///< Only the lower 32 bit of this value are actually used, since some
        ///< devices can't handle the msb correctly.
   virtual bool IsPlayingVideo(void) const { return isPlayingVideo; }
-       ///< \return Returns true if the currently attached player has delivered
+       ///< Returns true if the currently attached player has delivered
        ///< any video packets.
   virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter) { return cRect::Null; }
        ///< Asks the output device whether it can scale the currently shown video in
diff --git a/dvbdevice.c b/dvbdevice.c
index 27482e8bc..7007ad646 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.77 2012/12/30 13:08:41 kls Exp $
+ * $Id: dvbdevice.c 2.80 2013/02/17 13:17:33 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -583,15 +583,13 @@ int cDvbTuner::GetSignalQuality(void) const
      while (1) {
            if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1)
               break;
-           if (errno == EOPNOTSUPP) {
+           if (errno != EINTR) {
               Snr = 0xFFFF;
 #ifdef DEBUG_SIGNALQUALITY
               HasSnr = false;
 #endif
               break;
               }
-           if (errno != EINTR)
-              return -1;
            }
 #ifdef DEBUG_SIGNALQUALITY
      bool HasBer = true;
@@ -600,15 +598,13 @@ int cDvbTuner::GetSignalQuality(void) const
      while (1) {
            if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1)
               break;
-           if (errno == EOPNOTSUPP) {
+           if (errno != EINTR) {
               Ber = 0;
 #ifdef DEBUG_SIGNALQUALITY
               HasBer = false;
 #endif
               break;
               }
-           if (errno != EINTR)
-              return -1;
            }
 #ifdef DEBUG_SIGNALQUALITY
      bool HasUnc = true;
@@ -617,15 +613,13 @@ int cDvbTuner::GetSignalQuality(void) const
      while (1) {
            if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1)
               break;
-           if (errno == EOPNOTSUPP) {
+           if (errno != EINTR) {
               Unc = 0;
 #ifdef DEBUG_SIGNALQUALITY
               HasUnc = false;
 #endif
               break;
               }
-           if (errno != EINTR)
-              return -1;
            }
      uint16_t MaxSnr = 0xFFFF; // Let's assume the default is using the entire range.
      // Use the subsystemId to identify individual devices in case they need
@@ -665,7 +659,7 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
      }
   static cMutex Mutex;
   if (Diseqc->IsScr())
-     Mutex.Lock(); 
+     Mutex.Lock();
   struct dvb_diseqc_master_cmd cmd;
   const char *CurrentAction = NULL;
   for (;;) {
@@ -687,7 +681,7 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
   if (scr)
      ResetToneAndVoltage(); // makes sure we don't block the bus!
   if (Diseqc->IsScr())
-     Mutex.Unlock(); 
+     Mutex.Unlock();
 }
 
 void cDvbTuner::ResetToneAndVoltage(void)
@@ -1541,7 +1535,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   return true;
 }
 
-bool cDvbDevice::HasLock(int TimeoutMs)
+bool cDvbDevice::HasLock(int TimeoutMs) const
 {
   return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
 }
diff --git a/dvbdevice.h b/dvbdevice.h
index 7da9c568b..3674a615d 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.26 2012/03/31 11:13:31 kls Exp $
+ * $Id: dvbdevice.h 2.28 2013/02/16 15:20:17 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -119,7 +119,7 @@ class cDvbDevice : public cDevice {
   static bool Initialize(void);
          ///< Initializes the DVB devices.
          ///< Must be called before accessing any DVB functions.
-         ///< \return True if any devices are available.
+         ///< Returns true if any devices are available.
 protected:
   int adapter, frontend;
 private:
@@ -192,7 +192,7 @@ class cDvbDevice : public cDevice {
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 public:
-  virtual bool HasLock(int TimeoutMs = 0);
+  virtual bool HasLock(int TimeoutMs = 0) const;
 
 // PID handle facilities
 
diff --git a/dvbplayer.c b/dvbplayer.c
index 241c7ec8e..c9c8fa034 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.29 2013/01/27 14:03:16 kls Exp $
+ * $Id: dvbplayer.c 2.30 2013/02/12 10:50:10 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -576,7 +576,7 @@ void cDvbPlayer::Action(void)
           if (eof || SwitchToPlayFrame) {
              bool SwitchToPlay = false;
              uint32_t Stc = DeviceGetSTC();
-             if (Stc != LastStc)
+             if (Stc != LastStc || playMode == pmPause)
                 StuckAtEof = 0;
              else if (!StuckAtEof)
                 StuckAtEof = time(NULL);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 995506976..3ce1a3e85 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.32 2012/05/08 08:17:17 kls Exp $
+ * $Id: dvbsubtitle.c 2.33 2013/02/17 13:17:38 kls Exp $
  */
 
 
@@ -1283,7 +1283,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
         }
   cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
   bitmaps->Add(Bitmaps);
-  for (int i = 0; i < NumAreas; i++) { 
+  for (int i = 0; i < NumAreas; i++) {
       cSubtitleRegion *sr = Page->regions.Get(i);
       cSubtitleClut *clut = Page->GetClutById(sr->ClutId());
       if (!clut)
diff --git a/epg.c b/epg.c
index 3da7dc1d0..5fb49ae49 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.22 2012/10/04 12:21:24 kls Exp $
+ * $Id: epg.c 2.23 2013/02/17 14:12:07 kls Exp $
  */
 
 #include "epg.h"
@@ -1135,7 +1135,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
   return false;
 }
 
-// --- cEpgDataWriter ---------------------------------------------------------
+// --- cEpgDataWriter --------------------------------------------------------
 
 class cEpgDataWriter : public cThread {
 private:
diff --git a/font.h b/font.h
index 8e734ace4..86bd8b331 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.6 2011/12/04 13:38:17 kls Exp $
+ * $Id: font.h 2.7 2013/02/17 13:17:42 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -43,7 +43,7 @@ class cFont {
           ///< Returns the font name.
   virtual int Size(void) const { return Height(); }
           ///< Returns the original size as requested when the font was created.
-          ///< This may be different than the actual height. 
+          ///< This may be different than the actual height.
   virtual int Width(uint c) const = 0;
           ///< Returns the width of the given character in pixel.
   virtual int Width(const char *s) const = 0;
diff --git a/lirc.c b/lirc.c
index 42f074066..e8d0be155 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 2.4 2013/02/03 11:23:18 kls Exp $
+ * $Id: lirc.c 2.5 2013/02/11 15:25:42 kls Exp $
  */
 
 #include "lirc.h"
@@ -114,9 +114,10 @@ void cLircRemote::Action(void)
               repeat = true;
               timeout = Delta * 10 / 9;
               }
-           if (pressed)
+           if (pressed) {
               LastTime.Set();
               Put(KeyName, repeat);
+              }
            }
         else if (pressed && repeat) { // the last one was a repeat, so let's generate a release
            Put(LastKeyName, false, true);
diff --git a/menu.c b/menu.c
index ae3898477..69fe6d504 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.76 2013/02/02 14:00:39 kls Exp $
+ * $Id: menu.c 2.79 2013/02/17 13:17:49 kls Exp $
  */
 
 #include "menu.h"
@@ -2306,8 +2306,10 @@ void cMenuRecordings::Set(bool Refresh)
             if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
                SetCurrent(LastItem);
             }
-         if (LastDir)
+         if (LastDir) {
             LastDir->IncrementCounter(recording->IsNew());
+            LastItem = LastDir;
+            }
          }
       }
   if (Refresh)
@@ -2809,7 +2811,7 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   standardComplianceTexts[1] = "ANSI/SCTE";
 
   SetSection(tr("DVB"));
-  SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL); 
+  SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL);
   Setup();
 }
 
@@ -2863,7 +2865,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
        case kYellow: cRemote::Put(kSubtitles, true);
                      state = osEnd;
                      break;
-       default: { 
+       default: {
             bool DoSetup = data.VideoFormat != newVideoFormat;
             DoSetup |= data.DisplaySubtitles != newDisplaySubtitles;
             if (numAudioLanguages != oldnumAudioLanguages) {
@@ -4763,9 +4765,8 @@ void cReplayControl::MarkToggle(void)
 {
   int Current, Total;
   if (GetIndex(Current, Total, true)) {
-     cMark *m = marks.Get(Current);
      lastCurrent = -1; // triggers redisplay
-     if (m)
+     if (cMark *m = marks.Get(Current))
         marks.Del(m);
      else {
         marks.Add(Current);
@@ -4784,8 +4785,7 @@ void cReplayControl::MarkJump(bool Forward)
   int Current, Total;
   if (GetIndex(Current, Total)) {
      if (marks.Count()) {
-        cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
-        if (m) {
+        if (cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current)) {
            Goto(m->Position(), true);
            displayFrames = true;
            return;
@@ -4801,8 +4801,7 @@ void cReplayControl::MarkMove(bool Forward)
 {
   int Current, Total;
   if (GetIndex(Current, Total)) {
-     cMark *m = marks.Get(Current);
-     if (m) {
+     if (cMark *m = marks.Get(Current)) {
         displayFrames = true;
         int p = SkipFrames(Forward ? 1 : -1);
         cMark *m2;
@@ -4878,7 +4877,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
 {
   if (!Active())
      return osEnd;
-  if (Key == kNone)
+  if (Key == kNone && !marksModified)
      marks.Update();
   if (visible) {
      if (timeoutShow && time(NULL) > timeoutShow) {
@@ -4962,7 +4961,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    if (Setup.DelTimeshiftRec) { 
+            case kBack:    if (Setup.DelTimeshiftRec) {
                               cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
                               return rc && rc->InstantId() ? osEnd : osRecordings;
                               }
diff --git a/menu.cyVkmHd b/menu.cyVkmHd
deleted file mode 100644
index e69de29bb..000000000
diff --git a/menuitems.c b/menuitems.c
index 63f75898e..f7ec7761e 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.15 2012/12/23 13:44:05 kls Exp $
+ * $Id: menuitems.c 2.16 2013/02/15 14:20:29 kls Exp $
  */
 
 #include "menuitems.h"
@@ -759,7 +759,7 @@ void cMenuEditChanItem::Set(void)
      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
      SetValue(buf);
      if (channelID)
-        *channelID = channel->GetChannelID().ToString();
+        *channelID = channel ? channel->GetChannelID().ToString() : "";
      }
   else if (noneString) {
      SetValue(noneString);
diff --git a/osd.c b/osd.c
index b9fdefd91..cc652b621 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.35 2013/02/08 10:16:47 kls Exp $
+ * $Id: osd.c 2.38 2013/02/14 15:50:19 kls Exp $
  */
 
 #include "osd.h"
@@ -1699,7 +1699,7 @@ cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawP
 
 void cOsd::DestroyPixmap(cPixmap *Pixmap)
 {
-  if (isTrueColor) {
+  if (Pixmap) {
      LOCK_PIXMAPS;
      for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed!
          if (pixmaps[i] == Pixmap) {
@@ -1803,6 +1803,10 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
   if (Result == oeOk) {
      while (numBitmaps)
            delete bitmaps[--numBitmaps];
+     for (int i = 0; i < pixmaps.Size(); i++) {
+         delete pixmaps[i];
+         pixmaps[i] = NULL;
+         }
      width = height = 0;
      isTrueColor = NumAreas == 1 && Areas[0].bpp == 32;
      if (isTrueColor) {
@@ -2053,7 +2057,7 @@ int cOsdProvider::StoreImage(const cImage &Image)
 {
   if (osdProvider)
      return osdProvider->StoreImageData(Image);
-  return -1;
+  return 0;
 }
 
 void cOsdProvider::DropImage(int ImageHandle)
diff --git a/osd.h b/osd.h
index 7eb8db62c..777a652e8 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.19 2013/02/08 09:47:56 kls Exp $
+ * $Id: osd.h 2.20 2013/02/12 13:39:08 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -253,7 +253,7 @@ class cBitmap : public cPalette {
        ///< 0       draws the entire ellipse
        ///< 1..4    draws only the first, second, third or fourth quadrant, respectively
        ///< 5..8    draws the right, top, left or bottom half, respectively
-       ///< -1..-8  draws the inverted part of the given quadrant(s)
+       ///< -1..-4  draws the inverted part of the given quadrant
        ///< If Quadrants is not 0, the coordinates are those of the actual area, not
        ///< the full circle!
   void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
@@ -624,7 +624,7 @@ class cPixmap {
        ///< 0       draws the entire ellipse
        ///< 1..4    draws only the first, second, third or fourth quadrant, respectively
        ///< 5..8    draws the right, top, left or bottom half, respectively
-       ///< -1..-8  draws the inverted part of the given quadrant(s)
+       ///< -1..-4  draws the inverted part of the given quadrant
        ///< If Quadrants is not 0, the coordinates are those of the actual area, not
        ///< the full circle!
   virtual void DrawSlope(const cRect &Rect, tColor Color, int Type) = 0;
@@ -897,7 +897,7 @@ class cOsd {
        ///< 0       draws the entire ellipse
        ///< 1..4    draws only the first, second, third or fourth quadrant, respectively
        ///< 5..8    draws the right, top, left or bottom half, respectively
-       ///< -1..-8  draws the inverted part of the given quadrant(s)
+       ///< -1..-4  draws the inverted part of the given quadrant
        ///< If Quadrants is not 0, the coordinates are those of the actual area, not
        ///< the full circle!
   virtual void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
diff --git a/pat.h b/pat.h
index cffb5a283..08da051fe 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 2.2 2011/12/04 13:38:17 kls Exp $
+ * $Id: pat.h 2.3 2013/02/16 15:20:24 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -37,7 +37,7 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
          ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
          ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
          ///< are copied that match one of the given CA system IDs.
-         ///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
+         ///< Returns the number of bytes copied into Data (0 if no CA descriptors are
          ///< available), or -1 if BufSize was too small to hold all CA descriptors.
          ///< The return value tells whether these CA descriptors are to be used
          ///< for the individual streams.
diff --git a/po/et_EE.po b/po/et_EE.po
index 7382a013f..ffb3c91b2 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,7 +1,7 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Arthur Konovalov <artlov@gmail.com>, 2004-2010
+# Arthur Konovalov <artlov@gmail.com>, 2004-2013
 #
 msgid ""
 msgstr ""
@@ -1129,10 +1129,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanali sisestamise ajalimiit (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Kaugjuhtimispuldi kordamise viide (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Kaugjuhtimispuldi kordamise delta (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal käivitamisel"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 186b6e13f..eaf31b186 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -8,34 +8,38 @@
 # Pierre Briec <pbriec@free.fr>, 2006
 # Bruno Roussel <bruno.roussel@free.fr>, 2007
 # Michael Nival <mnival@club-internet.fr>, 2007
+# Marc Perrudin <vdr@ekass.net>, 2013
+# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
+# Peter Münster <pmlists@free.fr>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2008-02-27 18:14+0100\n"
-"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
+"PO-Revision-Date: 2013-02-15 13:26+0100\n"
+"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.5\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Cha�ne invalide ! ***"
+msgstr "*** Chaîne invalide ! ***"
 
 msgid "Channel not available!"
-msgstr "Cha�ne non disponible !"
+msgstr "Chaîne non disponible !"
 
 msgid "Can't start Transfer Mode!"
 msgstr "Impossible d'utiliser le mode transfert !"
 
 msgid "off"
-msgstr "off"
+msgstr "inactive"
 
 msgid "on"
-msgstr ""
+msgstr "active"
 
 msgid "auto"
 msgstr "auto"
@@ -47,10 +51,10 @@ msgid "Polarization"
 msgstr "Polarisation"
 
 msgid "System"
-msgstr ""
+msgstr "Système"
 
 msgid "Srate"
-msgstr "Fr�q. symbole"
+msgstr "Srate"
 
 msgid "Inversion"
 msgstr "Inversion"
@@ -74,287 +78,287 @@ msgid "Guard"
 msgstr "Intervalle de garde"
 
 msgid "Hierarchy"
-msgstr "Hi�rarchie"
+msgstr "Hiérarchie"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
-msgstr "Mise � jour du guide des programmes"
+msgstr "Mise à jour du guide des programmes"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Drame"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Policier/Suspense"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Aventure/Western/Guerre"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Science Fiction/Fantaisie/Horreur"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Comédie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Soap/Mélodrame/Folklorique"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romance"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Sérieux/Classique/Religieux/Film Historique/Drame"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Film pour adultes/Drame"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Informations/Actualités"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Informations/Météo"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Magazine d'information"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documentaire"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussion/Interview/Débat"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Spectacle/Jeu Télévision"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Jeu Télévisé/Quiz/Concours"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Spectacle de variétés"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Débat télévisé"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sports"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Évènement spécial"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Magazine sportif"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Football/Foot"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Sports d'équipe"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Athlétisme"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Sports mécaniques"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Sports nautiques"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Sports d'hiver"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Équitation"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Sports de combat"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Enfant/Programme jeunesse"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Programme pour enfants de maternelle"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programme de divertissement pour les 6-14 ans"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programme de divertissement pour les 10-16 ans"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informationnel/Éducatif/Programme Scolaire "
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Dessins animés/Marionnettes"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Musique/Ballet/Danse"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Sérieux/Musique Classique"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/Musique Traditionnelle"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Comédie Musicale/Opéra"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arts/Culture"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Performances artistiques"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Beaux Arts"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religion"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Culture Populaire/Arts Traditionnels"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Littérature"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Cinéma"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Film Expérimental/Vidéo"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Télédiffusion/Presse"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nouveau Média"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Arts/Magazine Culturel"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Mode"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Société/Politique/Économie"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazine/Reportage/Documentaire"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Économie/Reportage de Société"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Personnalités"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Éducation/Science/Factuel"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Nature/Animaux/Environnement"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technologie/Sciences Naturelles"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Médecine/Physiologie/Psychologie"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Pays Étrangers/Expéditions"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Société/Sciences Spirituelles"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Formation Continue"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Langages"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Loisir/Passe temps"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Tourisme/Voyage"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Artisanat"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Automobilisme"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Forme & Santé"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cuisine"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Publicité/Téléachat"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Jardinage"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Version originale"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Noir & Blanc"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Inédit"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Direct"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "À partir de %d"
 
 msgid "No title"
 msgstr "Sans titre"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
-msgstr "Fran�ais"
+msgstr "Français"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
 msgstr "fra"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Phase 1: D�tection du type de code"
+msgstr "Phase 1: Détection du type de télécommande"
 
 msgid "Press any key on the RC unit"
-msgstr "Appuyer sur une touche de la t�l�commande"
+msgstr "Appuyer sur une touche de la télécommande"
 
 msgid "RC code detected!"
-msgstr "Code de la t�l�commande d�tect� !"
+msgstr "Codes de la télécommande détectés !"
 
 msgid "Do not press any key..."
-msgstr "N'appuyer sur aucune touche ..."
+msgstr "N'appuyer sur aucune touche..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Phase 2: Apprentissage des codes des touches"
+msgstr "Phase 2: Apprentissage des touches"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Appuyer sur la touche '%s'"
+msgstr "Appuyer sur la touche pour '%s'"
 
 msgid "Press 'Up' to confirm"
 msgstr "Appuyer sur 'Haut' pour confirmer"
@@ -363,19 +367,19 @@ msgid "Press 'Down' to continue"
 msgstr "Appuyer sur 'Bas' pour continuer"
 
 msgid "(press 'Up' to go back)"
-msgstr "(Appuyer sur 'Haut' pour revenir en arri�re)"
+msgstr "(Appuyer sur 'Haut' pour revenir en arrière)"
 
 msgid "(press 'Down' to end key definition)"
 msgstr "(Appuyer sur 'Bas' pour terminer)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "('Menu' pour passer cette touche)"
+msgstr "(Appuyer sur 'Menu' pour passer cette touche)"
 
 msgid "Learning Remote Control Keys"
-msgstr "Apprentissage des codes de t�l�commande"
+msgstr "Apprentissage des touches de la télécommande"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Phase 3: Sauvegarde des codes des touches"
+msgstr "Phase 3: Sauvegarde des touches"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler"
@@ -417,7 +421,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Lecture/Pause"
 
 msgid "Key$Play"
 msgstr "Lecture"
@@ -441,19 +445,19 @@ msgid "Key$Next"
 msgstr "Suivant"
 
 msgid "Key$Prev"
-msgstr "Pr�c�dent"
+msgstr "Précédent"
 
 msgid "Key$Power"
-msgstr "Arr�t"
+msgstr "Arrêt"
 
 msgid "Key$Channel+"
-msgstr "Cha�ne+"
+msgstr "Chaîne+"
 
 msgid "Key$Channel-"
-msgstr "Cha�ne-"
+msgstr "Chaîne-"
 
 msgid "Key$PrevChannel"
-msgstr "Cha�ne pr�c�dente"
+msgstr "Chaîne précédente"
 
 msgid "Key$Volume+"
 msgstr "Volume+"
@@ -462,7 +466,7 @@ msgid "Key$Volume-"
 msgstr "Volume-"
 
 msgid "Key$Mute"
-msgstr "Coupure du son"
+msgstr "Muet"
 
 msgid "Key$Audio"
 msgstr "Audio"
@@ -471,13 +475,13 @@ msgid "Key$Subtitles"
 msgstr "Sous-titres"
 
 msgid "Key$Schedule"
-msgstr "Programmes"
+msgstr "Programme"
 
 msgid "Key$Channels"
-msgstr "Cha�nes"
+msgstr "Chaînes"
 
 msgid "Key$Timers"
-msgstr "Programmation"
+msgstr "Programmations"
 
 msgid "Key$Recordings"
 msgstr "Enregistrements"
@@ -522,10 +526,10 @@ msgid "Free To Air"
 msgstr "En clair"
 
 msgid "encrypted"
-msgstr "Crypt�"
+msgstr "Crypté"
 
 msgid "Edit channel"
-msgstr "Modifier une cha�ne"
+msgstr "Modifier la chaîne"
 
 msgid "Name"
 msgstr "Nom"
@@ -534,46 +538,46 @@ msgid "Source"
 msgstr "Source"
 
 msgid "Frequency"
-msgstr "Fr�quence"
+msgstr "Fréquence"
 
 msgid "Vpid"
-msgstr "PID Vid�o"
+msgstr "Vpid"
 
 msgid "Ppid"
 msgstr "Ppid"
 
 msgid "Apid1"
-msgstr "PID Audio (1)"
+msgstr "Apid1"
 
 msgid "Apid2"
-msgstr "PID Audio (2)"
+msgstr "Apid2"
 
 msgid "Dpid1"
-msgstr "PID AC3 (1)"
+msgstr "Dpid1"
 
 msgid "Dpid2"
-msgstr "PID AC3 (2)"
+msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr "Sous-titre (1)"
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr "Sous-titre (2)"
+msgstr "Spid2"
 
 msgid "Tpid"
-msgstr "PID t�l�texte"
+msgstr "Tpid"
 
 msgid "CA"
-msgstr "Acc�s conditionnel"
+msgstr "CA"
 
 msgid "Sid"
 msgstr "Sid"
 
 msgid "Channel settings are not unique!"
-msgstr "Caract�ristiques des cha�nes non uniques"
+msgstr "Cette chaîne n'est pas unique !"
 
 msgid "Channels"
-msgstr "Cha�nes"
+msgstr "Chaînes"
 
 msgid "Button$Edit"
 msgstr "Modifier"
@@ -588,50 +592,50 @@ msgid "Button$Mark"
 msgstr "Marquer"
 
 msgid "Channel is being used by a timer!"
-msgstr "Cette cha�ne est en cours d'utilisation !"
+msgstr "Une programmation utilise cette chaîne !"
 
 msgid "Delete channel?"
-msgstr "Supprimer la cha�ne ?"
+msgstr "Supprimer la chaîne ?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Modifier le dossier"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nouveau dossier"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Sous dossier"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Ce nom de dossier existe déjà !"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Le nom de dossier ne doit pas contenir '%c' !"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Sélectionner"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Supprimer le dossier et tous les sous dossiers ?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Supprimer le dossier ?"
 
 msgid "Edit timer"
-msgstr "Changer la programmation"
+msgstr "Modifier la programmation"
 
 msgid "Active"
-msgstr "Actif"
+msgstr "Active"
 
 msgid "Channel"
-msgstr "Cha�ne"
+msgstr "Chaîne"
 
 msgid "Day"
 msgstr "Jour"
 
 msgid "Start"
-msgstr "D�but"
+msgstr "Début"
 
 msgid "Stop"
 msgstr "Fin"
@@ -640,31 +644,31 @@ msgid "VPS"
 msgstr "VPS"
 
 msgid "Priority"
-msgstr "Priorit�"
+msgstr "Priorité"
 
 msgid "Lifetime"
-msgstr "Dur�e de vie"
+msgstr "Durée de vie"
 
 msgid "File"
 msgstr "Fichier"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Dossier"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Simple"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Périodique"
 
 msgid "First day"
 msgstr "Premier jour"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Sélectionner le dossier"
 
 msgid "Timers"
-msgstr "Programmation"
+msgstr "Programmations"
 
 msgid "Button$On/Off"
 msgstr "Marche/Arr"
@@ -673,13 +677,13 @@ msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Supprimer la programmation ?"
+msgstr "Supprimer cette programmation ?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Enregistrement en cours - suppression confirm�e ?"
+msgstr "Enregistrement en cours - confirmer la suppression ?"
 
 msgid "Event"
-msgstr "Ev�nement"
+msgstr "Évènement"
 
 msgid "Button$Timer"
 msgstr "Programmation"
@@ -697,7 +701,7 @@ msgid "What's on next?"
 msgstr "Prochains programmes"
 
 msgid "Button$Next"
-msgstr "Apr�s"
+msgstr "Après"
 
 msgid "Button$Now"
 msgstr "Maintenant"
@@ -706,28 +710,28 @@ msgid "Button$Schedule"
 msgstr "Programme"
 
 msgid "Can't switch channel!"
-msgstr "Impossible de changer de cha�ne !"
+msgstr "Impossible de changer de chaîne !"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Programmes - %s"
+msgstr "Programme - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "Cet �v�nement -%s"
+msgstr "Cet événement - %s"
 
 msgid "This event - all channels"
-msgstr "Cet �v�nement - toutes les cha�nes"
+msgstr "Cet événement - toutes les chaînes"
 
 msgid "All events - all channels"
-msgstr "Tous les �v�nements - toutes les cha�nes"
+msgstr "Tous les événements - toutes les chaînes"
 
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Veuillez entrer %d chiffres !"
 
 msgid "CAM not responding!"
-msgstr "Pas de r�ponse du CAM"
+msgstr "Pas de réponse du CAM"
 
 msgid "Recording info"
 msgstr "Infos sur l'enregistrement"
@@ -751,10 +755,10 @@ msgid "Delete recording?"
 msgstr "Supprimer l'enregistrement ?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "L'enregistrement est en cours de modification - confirmer la suppression ?"
 
 msgid "Error while deleting recording!"
-msgstr "Erreur de suppression de l'enregistrement !"
+msgstr "Erreur lors de la suppression de l'enregistrement !"
 
 msgid "Recording commands"
 msgstr "Commandes d'enregistrement"
@@ -763,13 +767,13 @@ msgid "never"
 msgstr "jamais"
 
 msgid "skin dependent"
-msgstr "d�pend du skin"
+msgstr "dépendant du skin"
 
 msgid "always"
 msgstr "toujours"
 
 msgid "OSD"
-msgstr "Affichage des menus"
+msgstr "Affichage à l'écran"
 
 msgid "Setup.OSD$Language"
 msgstr "Langue"
@@ -778,7 +782,7 @@ msgid "Setup.OSD$Skin"
 msgstr "Skin"
 
 msgid "Setup.OSD$Theme"
-msgstr "Th�me"
+msgstr "Thème"
 
 msgid "Setup.OSD$Left (%)"
 msgstr "Gauche (%)"
@@ -793,16 +797,16 @@ msgid "Setup.OSD$Height (%)"
 msgstr "Hauteur (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Dur�e affichage message (s)"
+msgstr "Durée d'affichage des messages (s)"
 
 msgid "Setup.OSD$Use small font"
 msgstr "Utiliser les petites polices"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Anti-cr�nelage"
+msgstr "Anti-crénelage"
 
 msgid "Setup.OSD$Default font"
-msgstr "Police par d�faut"
+msgstr "Police par défaut"
 
 msgid "Setup.OSD$Small font"
 msgstr "Petite police"
@@ -811,16 +815,16 @@ msgid "Setup.OSD$Fixed font"
 msgstr "Police taille fixe"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Taille police par d�faut (%)"
+msgstr "Taille police par défaut (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Taille petite police par d�faut (%)"
+msgstr "Taille petite police (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Taille police fixe par d�faut (%)"
+msgstr "Taille police fixe (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Position infos cha�nes"
+msgstr "Position infos chaîne"
 
 msgid "bottom"
 msgstr "bas"
@@ -829,72 +833,72 @@ msgid "top"
 msgstr "haut"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Dur�e affichage infos cha�nes (s)"
+msgstr "Durée affichage infos chaîne (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Affichage progr. en cours"
+msgstr "Infos lors des changements de chaînes"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Demande d'infos de cha�ne termin�e"
+msgstr "Temps de demande d'infos de chaîne"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "D�filement par pages"
+msgstr "Défilement par pages"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "D�filement rotatif"
+msgstr "Défilement circulaire"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Menu bouton ferm�"
+msgstr "Touche Menu pour fermer"
 
 msgid "Setup.OSD$Recording directories"
 msgstr "Dossiers d'enregistrements"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Dossiers dans le menu programmation"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Touches numériques pour les caractères"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Touche de couleur 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Touche de couleur 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Touche de couleur 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Touche de couleur 3"
 
 msgid "EPG"
 msgstr "Guide des programmes"
 
 msgid "Button$Scan"
-msgstr "Scan"
+msgstr "Scanner"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Inactivit� avant rech. EPG (h)"
+msgstr "Temps d'inactivité avant mise à jour du guide-EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Niveau de correction EPG"
+msgstr "Niveau de correction du guide-EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Montrer l'EPG p�rim� (min)"
+msgstr "Afficher les données du guide-EPG périmées (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Ajuster l'heure du syst�me"
+msgstr "Ajuster l'heure du système"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Utiliser l'heure de la cha�ne"
+msgstr "Utiliser l'heure du transpondeur"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "Langues pr�f�r�es"
+msgstr "Langues préférées"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "Langue pr�f�r�e"
+msgstr "Langue préférée"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -918,13 +922,13 @@ msgid "names and PIDs"
 msgstr "noms et PIDs"
 
 msgid "add new channels"
-msgstr "ajouter cha�nes"
+msgstr "ajouter les nouvelles chaînes"
 
 msgid "add new transponders"
-msgstr "ajouter transpondeurs"
+msgstr "ajouter les nouveaux transpondeurs"
 
 msgid "DVB"
-msgstr "Cartes DVB"
+msgstr "DVB"
 
 msgid "Button$Audio"
 msgstr "Audio"
@@ -936,19 +940,19 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Carte DVB primaire"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Norme utilisée"
 
 msgid "Setup.DVB$Video format"
-msgstr "Format vid�o"
+msgstr "Format vidéo"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Format d'affichage"
+msgstr "Format d'affichage vidéo"
 
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Utiliser le Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Mettre � jour les cha�nes"
+msgstr "Mettre à jour les chaînes"
 
 msgid "Setup.DVB$Audio languages"
 msgstr "Langues audio"
@@ -966,13 +970,13 @@ msgid "Setup.DVB$Subtitle language"
 msgstr "Langue des sous-titres"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Offset des sous-titres"
+msgstr "Décalage des sous-titres"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Transparence de l'avant-plan"
+msgstr "Transparence de l'avant-plan des sous-titres"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Transparence du fond"
+msgstr "Transparence du fond des sous-titres"
 
 msgid "LNB"
 msgstr "LNB"
@@ -981,62 +985,62 @@ msgid "Setup.LNB$Use DiSEqC"
 msgstr "Utiliser le DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "Limite de bandes LNB (MHz)"
+msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Fr�quence basse LNB (MHz)"
+msgstr "Fréquence basse LNB (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Fr�quence haute LNB (MHz)"
+msgstr "Fréquence haute LNB (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Le périphérique %d est connecté au câble satellite"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "Propriétaire"
 
 msgid "CAM reset"
-msgstr "CAM remis � z�ro"
+msgstr "CAM réinitialisé"
 
 msgid "CAM present"
-msgstr "CAM pr�sent"
+msgstr "CAM présent"
 
 msgid "CAM ready"
-msgstr "CAM pr�t"
+msgstr "CAM prêt"
 
 msgid "CAM"
-msgstr "Acc�s conditionnel"
+msgstr "CAM"
 
 msgid "Button$Menu"
 msgstr "Menu"
 
 msgid "Button$Reset"
-msgstr "R�initialisation"
+msgstr "Réinitialisation"
 
 msgid "Opening CAM menu..."
-msgstr "Ouverture du menu CAM"
+msgstr "Ouverture du menu CAM..."
 
 msgid "Can't open CAM menu!"
 msgstr "Impossible d'ouvrir le menu CAM !"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM en cours d'utilisation - Remettre � z�ro ?"
+msgstr "CAM en cours d'utilisation - confirmer réinitialisation ?"
 
 msgid "Can't reset CAM!"
-msgstr "Impossible de r�initialiser le CAM !"
+msgstr "Impossible de réinitialiser le CAM !"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "ne pas mettre en pause le direct"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "confirmer la pause du direct"
 
 msgid "pause live video"
-msgstr ""
+msgstr "mettre en pause le direct"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirmer"
 
 msgid "yes"
 msgstr "oui"
@@ -1045,55 +1049,55 @@ msgid "Recording"
 msgstr "Enregistrement"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Marge ant�rieure (min)"
+msgstr "Marge de début (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Marge post�rieure (min)"
+msgstr "Marge de fin (min)"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Priorit� par d�faut"
+msgstr "Priorité par défaut"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Dur�e de vie par d�faut (j)"
+msgstr "Durée de vie par défaut (j)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Support de la touche Pause"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorit� des pauses"
+msgstr "Priorité de l'enregistrement mis en pause "
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Dur�e de vie des pauses (j)"
+msgstr "Expiration de l'enregistrement mis en pause (j)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Utiliser le nom de l'�pisode"
+msgstr "Utiliser le nom de l'épisode"
 
 msgid "Setup.Recording$Use VPS"
 msgstr "Utiliser le VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "Marge VPS"
+msgstr "Marge VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Marquage enregistr. imm�diats"
+msgstr "Marquage enregistrement immédiat"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Noms enregistr. imm�diats"
+msgstr "Nom enregistrement immédiat"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Dur�e enregistr. imm�diat (min)"
+msgstr "Durée enregistr. immédiat (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "Évènement courant"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Taille maxi des fichiers (Mo)"
+msgstr "Taille maxi des fichiers vidéo (Mo)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "S�parer les s�quences �dit�es"
+msgstr "Scinder les fichiers édités"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Supprimer l'enregistrement timeshift"
 
 msgid "Replay"
 msgstr "Lecture"
@@ -1105,13 +1109,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Affichage mode de lecture"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Montrer le temps restant"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Affichage de la barre de progression (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Arrêter la lecture lors de l'ajout d'un marqueur"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
@@ -1120,28 +1124,28 @@ msgid "Miscellaneous"
 msgstr "Divers"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "MinEventTimeout (min)"
+msgstr "Temps minimal entre événements (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Dur�e minimale d'inact. (min)"
+msgstr "Durée d'inactivité utilisateur minimale (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Temps maxi SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Prise en compte cha�ne (s)"
+msgstr "Prise en compte chaîne (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Entr�e cha�ne timeout (ms)"
+msgstr "Délai de saisie de la chaîne (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Délai de répétition de la télécommande (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Delta de répétition de la télécommande (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Cha�ne initiale"
+msgstr "Chaîne initiale"
 
 msgid "Setup.Miscellaneous$as before"
 msgstr "comme avant"
@@ -1150,45 +1154,45 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Affichage circulaire des chaînes"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Afficher le nom des chaînes avec leur source"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "Arr�t d'urgence"
+msgstr "Arrêt d'urgence"
 
 msgid "Plugins"
-msgstr "Greffons"
+msgstr "Modules"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ce greffon n'a pas de param�tres!"
+msgstr "Ce module n'a pas de paramètres !"
 
 msgid "Setup"
 msgstr "Configuration"
 
 msgid "Restart"
-msgstr "Red�marrer"
+msgstr "Redémarrer"
 
 msgid "Really restart?"
-msgstr "Vraiment red�marrer ?"
+msgstr "Confirmer le redémarrage ?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " Arr�ter l'enregistrement "
+msgstr " Arrêter l'enregistrement "
 
 msgid "Schedule"
-msgstr "Programmes"
+msgstr "Programme"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " Arr�ter la lecture"
+msgstr " Arrêter la lecture"
 
 msgid "Button$Pause"
 msgstr "Pause"
 
 msgid "Button$Stop"
-msgstr "Arr�t"
+msgstr "Arrêt"
 
 msgid "Button$Resume"
 msgstr "Reprendre"
@@ -1198,7 +1202,7 @@ msgid " Cancel editing"
 msgstr " Annuler le montage"
 
 msgid "Stop recording?"
-msgstr "Arr�ter l'enregistrement ?"
+msgstr "Arrêter l'enregistrement ?"
 
 msgid "Cancel editing?"
 msgstr "Annuler les modifications ?"
@@ -1213,100 +1217,100 @@ msgid "No subtitles available!"
 msgstr "Pas de sous-titres disponible !"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Espace disque insuffisant pour d�marrer l'enregistrement !"
+msgstr "Espace disque insuffisant pour démarrer l'enregistrement !"
 
 msgid "No free DVB device to record!"
-msgstr "Pas de carte DVB disponible pour l'enregistrement !"
+msgstr "Pas de périphérique DVB disponible pour l'enregistrement !"
 
 msgid "Pausing live video..."
-msgstr "Pause de l'�mission en direct..."
+msgstr "Pause de l'émission en direct..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Supprimer l'enregistrement timeshift ?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Acc�s direct : "
+msgstr "Accès direct : "
 
 msgid "No editing marks defined!"
-msgstr "Pas de marques d'�dition d�finies !"
+msgstr "Pas de marques d'édition définies !"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Aucune séquence d'édition définie !"
 
 msgid "Can't start editing process!"
-msgstr "Impossible de commencer le montage !"
+msgstr "Impossible de commencer l'édition !"
 
 msgid "Editing process started"
-msgstr "Op�ration de montage lanc�e"
+msgstr "Opération d'édition démarrée"
 
 msgid "Editing process already active!"
-msgstr "Montage d�j� en cours !"
+msgstr "Montage déjà en cours !"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a�bc�de���fghi�jklmno�pqrstu��vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " aàâbcçdeéèêëfghiîïjklmnoôöpqrstuùûüvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc���2\tdef���3\tghi��4\tjkl5\tmno�6\tpqrs7\ttuv�8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcàâç2\tdeféèê3\tghiîï4\tjkl5\tmnoô6\tpqrs7\ttuvù8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr "Ecraser"
+msgstr "Écraser"
 
 msgid "Button$Insert"
-msgstr "Ins�rer"
+msgstr "Insérer"
 
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Module"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Haut/Bas -> nouvelle place - OK -> d�placer"
+msgstr "Haut/Bas -> nouvelle place - OK -> déplacer"
 
 msgid "Channel locked (recording)!"
-msgstr "Cha�ne verrouill�e (enregistrement en cours) !"
+msgstr "Chaîne verrouillée (enregistrement en cours) !"
 
 msgid "Low disk space!"
 msgstr "Disque presque plein !"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Régénération du fichier index"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Régénération du fichier index terminée"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "La régénération du fichier index a échoué !"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Arr�t impossible - option '-s' absente !"
+msgstr "Arrêt impossible - option '-s' absente !"
 
 msgid "Editing - shut down anyway?"
-msgstr "Edition en cours - confirmez l'arr�t ?"
+msgstr "Édition en cours - confirmer l'arrêt ?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Enregistrement en cours - confirmez l'arr�t ?"
+msgstr "Enregistrement en cours - confirmer l'arrêt ?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Enregistrement dans %ld minutes - confirmez l'arr�t"
+msgstr "Enregistrement dans %ld minutes - confirmer l'arrêt ?"
 
 msgid "shut down anyway?"
-msgstr "confirmez l'arr�t"
+msgstr "confirmer l'arrêt ?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Le plugin %s d�marre dans %ld min, continuer ?"
+msgstr "Le plugin %s démarre dans %ld min, continuer ?"
 
 msgid "Editing - restart anyway?"
-msgstr "Edition en cours - red�marrer ?"
+msgstr "Édition en cours - confirmer redémarrage ?"
 
 msgid "Recording - restart anyway?"
-msgstr "Enregistrement en cours - red�marrer ?"
+msgstr "Enregistrement en cours - confirmer redémarrage ?"
 
 msgid "restart anyway?"
-msgstr "red�marrer ?"
+msgstr "confirmer redémarrage ?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1316,22 +1320,22 @@ msgid "Classic VDR"
 msgstr "VDR classique"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISQUE"
 
 msgid "LOAD"
-msgstr ""
+msgstr "CHARGER"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "PROGRAMMATIONS"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "PÉRIPHÉRIQUES"
 
 msgid "LIVE"
-msgstr ""
+msgstr "DIRECT"
 
 msgid "PLAY"
-msgstr ""
+msgstr "LECTURE"
 
 msgid "ST:TNG Panels"
 msgstr "Consoles ST:TNG"
@@ -1369,32 +1373,32 @@ msgid "Upcoming recording!"
 msgstr "L'enregistrement va commencer !"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Arrêter le direct ?"
 
 msgid "Recording started"
-msgstr "L'enregistrement a commenc�"
+msgstr "L'enregistrement a commencé"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR doit s'arr�ter plus tard - Appuyer sur Power pour forcer"
+msgstr "VDR doit s'arrêter plus tard - Appuyer sur Arrêt pour forcer"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Appuyez sur une touche pour annuler l'arr�t"
+msgstr "Appuyer sur une touche pour annuler l'arrêt"
 
 msgid "Switching primary DVB..."
-msgstr "Changement de carte DVB primaire..."
+msgstr "Changement de périphérique DVB primaire..."
 
 msgid "Editing process failed!"
-msgstr "Echec du montage !"
+msgstr "Échec du montage !"
 
 msgid "Editing process finished"
-msgstr "Montage termin�"
+msgstr "Montage terminé"
 
 msgid "Press any key to cancel restart"
-msgstr "Appuyer sur une touche pour annuler le red�marrage"
+msgstr "Appuyer sur une touche pour annuler le redémarrage"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR s'arr�tera dans %s minutes"
+msgstr "VDR s'arrêtera dans %s minutes"
 
 msgid "Disk"
 msgstr "Disque"
diff --git a/po/it_IT.po b/po/it_IT.po
index 1425dc9cd..e6c848b70 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -5,14 +5,14 @@
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
 # Sean Carlos <seanc@libero.it>, 2005
 # Nino Gerbino <ngerb@interfree.it>, 2006
-# Diego Pierotto <vdr-italian@tiscali.it>, 2007, 2008, 2010
+# Diego Pierotto <vdr-italian@tiscali.it>, 2007-2010, 2012, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2012-12-22 19:00+0100\n"
+"PO-Revision-Date: 2013-02-11 23:46+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -1136,10 +1136,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Scadenza voce canale (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Ritardo ripetizione controllo remoto (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Intervallo ripetizione controllo remoto (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canale iniziale"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index f1986eba7..e9f24ca49 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR language source file.
 # Copyright (C) 2009 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.16\n"
+"Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
@@ -26,10 +26,10 @@ msgid "Can't start Transfer Mode!"
 msgstr "Negali pradėti perdavimo"
 
 msgid "off"
-msgstr "įjungti"
+msgstr "išjungti"
 
 msgid "on"
-msgstr "išjungti"
+msgstr "įjungti"
 
 msgid "auto"
 msgstr "auto"
@@ -74,7 +74,7 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
@@ -411,7 +411,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Groti/Pristabdyti"
 
 msgid "Key$Play"
 msgstr "Grona"
@@ -646,10 +646,10 @@ msgid "Button$Folder"
 msgstr "Katalogas"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Vienas"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Kartotinas"
 
 msgid "First day"
 msgstr "Pirma diena"
@@ -745,7 +745,7 @@ msgid "Delete recording?"
 msgstr "Ištrinti įrašą?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Įrašas yra redaguojamas - ar tikrai norite ištrinti?"
 
 msgid "Error while deleting recording!"
 msgstr "Klaida trinant įrašą!"
@@ -850,16 +850,16 @@ msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Spalvotas mygtukas 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Spalvotas mygtukas 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Spalvotas mygtukas 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Spalvotas mygtukas 3"
 
 msgid "EPG"
 msgstr "Elektroninis programų gidas (EPG)"
@@ -930,7 +930,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pirminiė DVB įvestis"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standarto atitikimas"
 
 msgid "Setup.DVB$Video format"
 msgstr "Video formatas"
@@ -985,10 +985,10 @@ msgstr "Aukštasis LNB dažnis (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Įrenginys %d prijungtas prie sat kabelio"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "savas"
 
 msgid "CAM reset"
 msgstr "Dekodavimo modulis (CAM) perkrautas"
@@ -1078,7 +1078,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Rankiniu būdu vykdomo įrašo laikas (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "esamas įvykis"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maks. video failo dydis (MB)"
@@ -1099,13 +1099,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Rodyti pakartojimo ręžimą"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Rodyti kiek liko laiko iki pabaigos"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Progreso rodymo laikas (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pristabdyti pakartojimą kai vyksta žymėjimas"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
@@ -1129,10 +1129,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Užlaikymas (ms) kanalo įvedimui"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Distancinio pulto komandų pakartojimų užlaikymas (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Laiko tarpai tarp distancinio pulto siunčiamų komandų (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanalas įjungimo metu"
@@ -1147,7 +1147,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalų pridengimas"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Kanalo pavadinimuose rodyti šaltinius"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Avarinis išėjimas"
@@ -1226,7 +1226,7 @@ msgid "No editing marks defined!"
 msgstr "Nenustatytos koregavimo žymės!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nenustatyta koregavimo saka!"
 
 msgid "Can't start editing process!"
 msgstr "Negali pradėti koregavimo!"
@@ -1271,7 +1271,7 @@ msgid "Index file regeneration complete"
 msgstr "Index failo pergeneravimas baigtas"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Nepavyko pergeneruoti index failo!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sistemos negalima išjungti, nes starto metu nebuvo komandinėj eilutėj paduota savybė '-s'!"
@@ -1310,22 +1310,22 @@ msgid "Classic VDR"
 msgstr "Klasikinis VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISKAS"
 
 msgid "LOAD"
-msgstr ""
+msgstr "APKROVA"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "LAIKMAČIAI"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "ĮRENGINIAI"
 
 msgid "LIVE"
-msgstr ""
+msgstr "GYVAI"
 
 msgid "PLAY"
-msgstr ""
+msgstr "GROTI"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Skydeliai"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index b6c2d54f5..aed2f83c9 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -1,7 +1,7 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Dimitar Petrovski <dimeptr@gmail.com>, 2009
+# Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013
 #
 msgid ""
 msgstr ""
@@ -412,7 +412,7 @@ msgid "Key$Info"
 msgstr "Инфо"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Старт/Пауза"
 
 msgid "Key$Play"
 msgstr "Старт"
@@ -1103,10 +1103,10 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Прикажи преостанато време"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Време на прикажување на прогрес (сек)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Паузирај репродукција кога се внесува ознака"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
@@ -1130,10 +1130,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Тајмаут за внес на канал (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Оддолжување на повторување на даљинско (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Делта на повторување на даљинско (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Почетен канал"
@@ -1221,7 +1221,7 @@ msgstr "Избриши временски поместена снимка?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Скокни:"
+msgstr "Скокни: "
 
 msgid "No editing marks defined!"
 msgstr "Нема одредено ознаки за сечење!"
@@ -1305,7 +1305,7 @@ msgstr "сеедно рестартирај?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "Глас"
+msgstr "Глас "
 
 msgid "Classic VDR"
 msgstr "Класичен VDR"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 4087af80d..4c257ad8f 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -2,22 +2,21 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
-# Lucian Muresan <lucianm@users.sourceforge.net>, 2004, 2005, 2006, 2008, 2010, 2011, 2012
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004-2006, 2008, 2010-2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.12\n"
+"Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2012-11-05 01:28+0100\n"
-"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
+"PO-Revision-Date: 2013-02-09 23:01+0100\n"
+"Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Romanian\n"
-"X-Poedit-Country: ROMANIA\n"
+"X-Generator: Poedit 1.5.5\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
@@ -414,7 +413,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Redare/Pauză"
 
 msgid "Key$Play"
 msgstr "Redare"
@@ -682,7 +681,7 @@ msgid "Button$Timer"
 msgstr "Timer"
 
 msgid "Button$Record"
-msgstr "Înregistr."
+msgstr "Înregistrează"
 
 msgid "Button$Switch"
 msgstr "Comută"
@@ -733,7 +732,7 @@ msgid "Button$Play"
 msgstr "Redare"
 
 msgid "Button$Rewind"
-msgstr "Înapoi"
+msgstr "De la capăt"
 
 msgid "Recordings"
 msgstr "Înregistrări"
@@ -760,7 +759,7 @@ msgid "never"
 msgstr "niciodată"
 
 msgid "skin dependent"
-msgstr "dep. de skin"
+msgstr "dependent de skin"
 
 msgid "always"
 msgstr "întotdeauna"
@@ -1105,10 +1104,10 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Arată timpul rămas"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Durata afișării indicatorului de progres (s) "
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pauză la punerea marcajului de montaj"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
@@ -1132,10 +1131,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Timeout la introducerea canalului (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Întârzierea repetării semnaluilui telecomenzii (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Diferența repetării semnaluilui telecomenzii (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canalul de pornire"
@@ -1188,7 +1187,7 @@ msgid "Button$Stop"
 msgstr "Stop"
 
 msgid "Button$Resume"
-msgstr "Continuare"
+msgstr "Continuă redarea"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
@@ -1216,7 +1215,7 @@ msgid "No free DVB device to record!"
 msgstr "Nu mai sunt receptoare DVB disponibile pentru înregistrare!"
 
 msgid "Pausing live video..."
-msgstr "Trec în pauză emisiunea transmisă..."
+msgstr "Înregistrez emisiunea transmisă..."
 
 msgid "Delete timeshift recording?"
 msgstr "Şterg înregistrarea pentru vizionare decalată?"
@@ -1229,7 +1228,7 @@ msgid "No editing marks defined!"
 msgstr "Nu s-au pus marcaje de montaj pentru această înregistrare"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nu s-au definit secvențe pentru montaj!"
 
 msgid "Can't start editing process!"
 msgstr "Nu pot porni montajul înregistrării!"
@@ -1256,7 +1255,7 @@ msgid "Button$Insert"
 msgstr "Inserează"
 
 msgid "Plugin"
-msgstr "Plugin (modul adiţional)"
+msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
 msgstr "Sus/Jos pentru noua locaţie - OK pentru a muta"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 4144c7aa2..82b8d2a8d 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,20 +1,21 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007, 2008, 2010
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2010-04-25 16:35+0200\n"
+"PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
@@ -50,10 +51,10 @@ msgid "Inversion"
 msgstr "Інверсія"
 
 msgid "CoderateH"
-msgstr "CoderateH"
+msgstr "Шв.кодуванняH"
 
 msgid "CoderateL"
-msgstr "CoderateL"
+msgstr "Шв.кодуванняL"
 
 msgid "Modulation"
 msgstr "Модуляція"
@@ -74,7 +75,7 @@ msgid "Rolloff"
 msgstr "Крен"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
@@ -128,7 +129,7 @@ msgid "Content$Game Show/Quiz/Contest"
 msgstr "Ігрове шоу/Тести"
 
 msgid "Content$Variety Show"
-msgstr "Вар’єте"
+msgstr "Вар'єте"
 
 msgid "Content$Talk Show"
 msgstr "Ток шоу"
@@ -411,7 +412,7 @@ msgid "Key$Info"
 msgstr "Інфо"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Програвати/Пауза"
 
 msgid "Key$Play"
 msgstr "Програвання"
@@ -456,7 +457,7 @@ msgid "Key$Volume-"
 msgstr "Гучність -"
 
 msgid "Key$Mute"
-msgstr "Виключити звук"
+msgstr "Без звуку"
 
 msgid "Key$Audio"
 msgstr "Мова"
@@ -588,29 +589,29 @@ msgid "Delete channel?"
 msgstr "Видалити канал?"
 
 msgid "Edit folder"
-msgstr "Редагувати каталог"
+msgstr "Редагувати теку"
 
 msgid "New folder"
-msgstr "Новий каталог"
+msgstr "Нова тека"
 
 msgid "Sub folder"
-msgstr "Підкаталог"
+msgstr "Підтека"
 
 msgid "Folder name already exists!"
-msgstr "Назва каталогу вже існує!"
+msgstr "Назва теки вже існує!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Назва каталогу не повинна містити '%c'!"
+msgstr "Назва теки не повинна містити '%c'!"
 
 msgid "Button$Select"
 msgstr "Вибрати"
 
 msgid "Delete folder and all sub folders?"
-msgstr "Видалити каталог і всі підкаталоги?"
+msgstr "Видалити теку і всі підтеки?"
 
 msgid "Delete folder?"
-msgstr "Видалити каталог?"
+msgstr "Видалити теку?"
 
 msgid "Edit timer"
 msgstr "Налаштування таймера"
@@ -643,19 +644,19 @@ msgid "File"
 msgstr "Файл"
 
 msgid "Button$Folder"
-msgstr "Каталог"
+msgstr "Тека"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Одинарне"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Повтор"
 
 msgid "First day"
 msgstr "Перший день"
 
 msgid "Select folder"
-msgstr "Вибрати каталог"
+msgstr "Вибрати теку"
 
 msgid "Timers"
 msgstr "Таймери"
@@ -745,7 +746,7 @@ msgid "Delete recording?"
 msgstr "Витерти запис?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Запис редагується - дійсно вилучити?"
 
 msgid "Error while deleting recording!"
 msgstr "Помилка видалення запису!"
@@ -790,28 +791,28 @@ msgid "Setup.OSD$Message time (s)"
 msgstr "Час показу повідомлень (сек)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "Викор. малий фонт"
+msgstr "Викор. малий шрифт"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Згладжування фонтів"
+msgstr "Згладжування шрифтів"
 
 msgid "Setup.OSD$Default font"
-msgstr "Стандартний фонт"
+msgstr "Стандартний шрифт"
 
 msgid "Setup.OSD$Small font"
-msgstr "Малий фонт"
+msgstr "Малий шрифт"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Фіксований фонт"
+msgstr "Фіксований шрифт"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Розмір типового фонта (%)"
+msgstr "Розмір типового шрифта (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Размір малого фонта (%)"
+msgstr "Розмір малого шрифта (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Размір фіксованого фонта (%)"
+msgstr "Розмір фіксованого шрифта (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Положення інформації про канал"
@@ -841,25 +842,25 @@ msgid "Setup.OSD$Menu key closes"
 msgstr "Кнопку Меню закрити"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Каталоги зберігання записів"
+msgstr "Теки зберігання записів"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "Каталоги в меню таймера"
+msgstr "Теки в меню таймера"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Кількість клавіш для символів"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Кольорова кнопка 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Кольорова кнопка 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Кольорова кнопка 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Кольорова кнопка 3"
 
 msgid "EPG"
 msgstr "Телегід (EPG)"
@@ -930,7 +931,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Основний DVB-пристрій"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Відповідність стандарту"
 
 msgid "Setup.DVB$Video format"
 msgstr "Формат відео"
@@ -985,10 +986,10 @@ msgstr "Верхня частота конвертера (МГц)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Пристрій %d під’єднано до сателітарного кабелю"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "власне"
 
 msgid "CAM reset"
 msgstr "Перезавантаження CAM"
@@ -1009,7 +1010,7 @@ msgid "Button$Reset"
 msgstr "Скинути"
 
 msgid "Opening CAM menu..."
-msgstr "Відкриваю меню CAM-модуля..."
+msgstr "Відкривання меню CAM-модуля..."
 
 msgid "Can't open CAM menu!"
 msgstr "Меню CAM-модуля недоступне!"
@@ -1078,7 +1079,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Протяжність ручного запису (хв)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "теперішня передача"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Макс. размір відеофайлу (Мб)"
@@ -1099,13 +1100,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Віображати режим перегляду"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Показати час що зашився"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Час показу індикатора (с)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Пауза програвання при встановленні мітки"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
@@ -1129,10 +1130,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Затримка часу для впровадження каналу (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Затримка повтору кнопок пульта (мс)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Різниця повторів кнопок пульта (мс)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Канал при включенні"
@@ -1147,7 +1148,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Кінець каналів"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Показати назву каналу з джерелом"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Аварійний вихід"
@@ -1226,7 +1227,7 @@ msgid "No editing marks defined!"
 msgstr "Не задано міток для монтажу!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Не задано послідовності монтажу!"
 
 msgid "Can't start editing process!"
 msgstr "Неможливо почати монтаж запису!"
@@ -1271,7 +1272,7 @@ msgid "Index file regeneration complete"
 msgstr "Регенерацію файлу індексу завершено"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Генерація індексного файлу не вдалася!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Виключенння неможливе - не задано параметр '-s'!"
@@ -1310,22 +1311,22 @@ msgid "Classic VDR"
 msgstr "Класичний VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "ДИСК"
 
 msgid "LOAD"
-msgstr ""
+msgstr "ЗАВАНТАЖЕННЯ"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "ТАЙМЕРИ"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "ПРИСТРОЇ"
 
 msgid "LIVE"
-msgstr ""
+msgstr "ЕФІР"
 
 msgid "PLAY"
-msgstr ""
+msgstr "ПРОГРАВАННЯ"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG панелі"
diff --git a/recording.c b/recording.c
index 57248a078..3359de36b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.86 2013/02/08 09:02:07 kls Exp $
+ * $Id: recording.c 2.88 2013/02/17 13:17:55 kls Exp $
  */
 
 #include "recording.h"
@@ -1103,7 +1103,7 @@ bool cRecording::WriteInfo(void)
   return true;
 }
 
-void cRecording::SetStartTime(time_t Start) 
+void cRecording::SetStartTime(time_t Start)
 {
   start = Start;
   free(fileName);
@@ -1506,6 +1506,15 @@ bool cMarks::Update(void)
   return false;
 }
 
+bool cMarks::Save(void)
+{
+  if (cConfig<cMark>::Save()) {
+     lastFileTime = LastModifiedTime(fileName);
+     return true;
+     }
+  return false;
+}
+
 void cMarks::Align(void)
 {
   cIndexFile IndexFile(recordingFileName, false, isPesRecording);
@@ -2127,7 +2136,7 @@ int cIndexFile::GetLength(const char *FileName, bool IsPesRecording)
   return -1;
 }
 
-bool GenerateIndex(const char *FileName) 
+bool GenerateIndex(const char *FileName)
 {
   if (DirectoryOk(FileName)) {
      cRecording Recording(FileName);
diff --git a/recording.h b/recording.h
index 037f2046c..48d6f6832 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.42 2013/02/07 13:42:17 kls Exp $
+ * $Id: recording.h 2.44 2013/02/14 15:13:14 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -19,8 +19,6 @@
 #include "tools.h"
 
 #define FOLDERDELIMCHAR '~'
-#define TIMERMACRO_TITLE    "TITLE"
-#define TIMERMACRO_EPISODE  "EPISODE"
 
 extern int DirectoryPathMax;
 extern int DirectoryNameMax;
@@ -234,6 +232,7 @@ class cMarks : public cConfig<cMark> {
 public:
   bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
   bool Update(void);
+  bool Save(void);
   void Align(void);
   void Sort(void);
   void Add(int Position);
diff --git a/remux.c b/remux.c
index 38ad24687..9be30788d 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.73 2012/11/25 14:16:11 kls Exp $
+ * $Id: remux.c 2.74 2013/02/17 13:17:58 kls Exp $
  */
 
 #include "remux.h"
@@ -1244,7 +1244,7 @@ int cH264Parser::Parse(const uchar *Data, int Length, int Pid)
                                          break;
            case nutCodedSliceNonIdr:
            case nutCodedSliceIdr:        if (gotAccessUnitDelimiter && gotSequenceParameterSet) {
-                                            ParseSliceHeader(); 
+                                            ParseSliceHeader();
                                             gotAccessUnitDelimiter = false;
                                             return tsPayload.Used();
                                             }
diff --git a/ringbuffer.h b/ringbuffer.h
index 5b2eeb1c0..1fff611c1 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 2.4 2012/09/20 09:29:32 kls Exp $
+ * $Id: ringbuffer.h 2.5 2013/02/16 15:20:37 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -84,17 +84,17 @@ class cRingBufferLinear : public cRingBuffer {
     ///< Reads at most Max bytes from FileHandle and stores them in the
     ///< ring buffer. If Max is 0, reads as many bytes as possible.
     ///< Only one actual read() call is done.
-    ///< \return Returns the number of bytes actually read and stored, or
+    ///< Returns the number of bytes actually read and stored, or
     ///< an error value from the actual read() call.
   int Read(cUnbufferedFile *File, int Max = 0);
     ///< Like Read(int FileHandle, int Max), but reads from a cUnbufferedFile).
   int Put(const uchar *Data, int Count);
     ///< Puts at most Count bytes of Data into the ring buffer.
-    ///< \return Returns the number of bytes actually stored.
+    ///< Returns the number of bytes actually stored.
   uchar *Get(int &Count);
     ///< Gets data from the ring buffer.
     ///< The data will remain in the buffer until a call to Del() deletes it.
-    ///< \return Returns a pointer to the data, and stores the number of bytes
+    ///< Returns a pointer to the data, and stores the number of bytes
     ///< actually available in Count. If the returned pointer is NULL, Count has no meaning.
   void Del(int Count);
     ///< Deletes at most Count bytes from the ring buffer.
diff --git a/skinlcars.c b/skinlcars.c
index 42565b7d9..7079d785e 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.18 2013/01/25 14:54:11 kls Exp $
+ * $Id: skinlcars.c 2.19 2013/02/15 15:08:02 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1136,7 +1136,7 @@ void cSkinLCARSDisplayMenu::DrawTimer(const cTimer *Timer, int y, bool MultiRec)
   // The timer data:
   bool Alert = !Timer->Recording() && Timer->Pending();
   tColor ColorFg = Alert ? Theme.Color(clrAlertFg) : Theme.Color(clrTimerFg);
-  tColor ColorBg = Alert ? Theme.Color(clrAlertFg) : Theme.Color(clrTimerBg);
+  tColor ColorBg = Alert ? Theme.Color(clrAlertBg) : Theme.Color(clrTimerBg);
   osd->DrawRectangle(xs00, y, xs03 - 1, y + lineHeight - 1, ColorBg);
   cString Date;
   if (Timer->Recording())
diff --git a/svdrp.c b/svdrp.c
index 1ab8ee59b..8a50daebd 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.23 2013/01/17 15:19:02 kls Exp $
+ * $Id: svdrp.c 2.24 2013/02/17 13:18:01 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1512,7 +1512,7 @@ void cSVDRP::CmdPUTE(const char *Option)
      else
         Reply(501, "Cannot open file \"%s\"", Option);
      }
-  else {     
+  else {
      delete PUTEhandler;
      PUTEhandler = new cPUTEhandler;
      Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
diff --git a/thread.h b/thread.h
index a08d40c93..d79e15ac3 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 2.3 2012/10/04 12:15:39 kls Exp $
+ * $Id: thread.h 2.4 2013/02/16 15:20:44 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -31,7 +31,7 @@ class cCondWait {
   bool Wait(int TimeoutMs = 0);
        ///< Waits at most TimeoutMs milliseconds for a call to Signal(), or
        ///< forever if TimeoutMs is 0.
-       ///< \return Returns true if Signal() has been called, false it the given
+       ///< Returns true if Signal() has been called, false it the given
        ///< timeout has expired.
   void Signal(void);
        ///< Signals a caller of Wait() that the condition it is waiting for is met.
diff --git a/tools.h b/tools.h
index 70c643fca..d6a778e66 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.23 2012/12/06 08:59:39 kls Exp $
+ * $Id: tools.h 2.24 2013/02/17 13:18:06 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -45,7 +45,7 @@ extern int SysLogLevel;
 
 #define MALLOC(type, size)  (type *)malloc(sizeof(type) * (size))
 
-template<class T> inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q; } 
+template<class T> inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q; }
 
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 #define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
diff --git a/vdr.c b/vdr.c
index 8bb208b2c..62872386b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.48 2013/02/08 10:47:02 kls Exp $
+ * $Id: vdr.c 2.49 2013/02/14 10:49:06 kls Exp $
  */
 
 #include <getopt.h>
@@ -834,22 +834,26 @@ int main(int argc, char *argv[])
         time_t Now = time(NULL);
 
         // Make sure we have a visible programme in case device usage has changed:
-        if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
+        if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder()) {
            static time_t lastTime = 0;
-           if (!CamMenuActive() && Now - lastTime > MINCHANNELWAIT) { // !CamMenuActive() to avoid interfering with the CAM if a CAM menu is open
-              cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
-              if (Channel && (Channel->Vpid() || Channel->Apid(0) || Channel->Dpid(0))) {
-                 if (cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(Channel->Number())) // try to switch to the original channel...
-                    ;
-                 else if (LastTimerChannel > 0) {
-                    Channel = Channels.GetByNumber(LastTimerChannel);
-                    if (Channel && cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer
+           if (!cDevice::PrimaryDevice()->HasProgramme()) {
+              if (!CamMenuActive() && Now - lastTime > MINCHANNELWAIT) { // !CamMenuActive() to avoid interfering with the CAM if a CAM menu is open
+                 cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
+                 if (Channel && (Channel->Vpid() || Channel->Apid(0) || Channel->Dpid(0))) {
+                    if (cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(Channel->Number())) // try to switch to the original channel...
                        ;
+                    else if (LastTimerChannel > 0) {
+                       Channel = Channels.GetByNumber(LastTimerChannel);
+                       if (Channel && cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer
+                          ;
+                       }
                     }
+                 lastTime = Now; // don't do this too often
+                 LastTimerChannel = -1;
                  }
-              lastTime = Now; // don't do this too often
-              LastTimerChannel = -1;
               }
+           else
+              lastTime = 0; // makes sure we immediately try again next time
            }
         // Update the OSD size:
         {

From b8b6cd3e89f32d7a57d79b4049662300fa23fd55 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 3 Mar 2013 14:46:00 +0100
Subject: [PATCH 225/307] Version 1.7.39 VDR developer version 1.7.39 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.39.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.38-1.7.39.diff

MD5 checksums:

3f0681f4aa6bd8deffc8208c40d34d2d  vdr-1.7.39.tar.bz2
1c13a683694c6c3c52444c1689477876  vdr-1.7.38-1.7.39.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Approaching version 2.0.0:
==========================

If all goes well, there will be just one more developer version after
this one, and then it's going to be version 2.0.0.

From the HISTORY file:
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Polish OSD texts (thanks to Marek Nazarko).
- Modified handling user inactivity in the shutdown handler to avoid a problem in case
  the system time is changed after VDR has been started (thanks to Udo Richter, reported
  by Sören Moch).
- Updated the Czech OSD texts (thanks to Ales Jurik).
- Changed the template for PLGCFG to $(CONFDIR)/plugins.mk (thanks to Ville Skyttä).
- Updated the Swedish OSD texts (thanks to Richard Lithvall).
- Now clearing device bondings for devices that don't provide DVB-S in the Setup/LNB
  menu (reported by Juergen Lock).
- Fixed a possible deadlock in handling the tuners of bonded devices (thanks to
  Juergen Lock).
- Improved working around the broken driver values for SNR in case of a "TT-budget
  S2-3200" receiving DVB-S2.
- The demos in the "osddemo" plugin can now also be ended with the "Back" key.
- Fixed flashing OSD in "high level OSD" mode of the TT S2-6400 in case a menu is open
  while subtitles are being displayed.
- Fixed stuttering or asynchronous audio after changing the audio track. This is done
  by doing a "jump" to the current position, which clears all buffers. However, this
  only works with TS recordings. With PES recordings it causes a segfault - haven't
  been able to figure out why.
- Added a manual page for 'svdrpsend' (thanks to Tobias Grimm).
- Fixed immediately disappearing subtitle track menu in "high level OSD" mode of the
  TT S2-6400 when selecting "No subtitles".
- Updated the French OSD texts (thanks to Bernard Jaulin).
- Updated the Dutch OSD texts (thanks to Carel Willemse).
- Removed all "fuzzy" translations from the files ar.po, hu_HU.po and sr_SR.po, because
  more often than not they are just wrong.
- Now calling DeviceClear() in cTransfer::Receive() if the output device blocks, instead
  of not retrying for 10 seconds (reported by Andreas Mair, with help from Oliver Endriss).
- Updated the Spanish OSD texts (thanks to Luca Olivetti).
- Updated the Hungarian language texts (thanks to István Füley).
- Changed the calls to Skins.QueueMessage() in vdr.c that are related to reporting the
  status of the editing process back to Skins.Message() in order to have them appear
  immediately.
- When sorting recordings by name, folders are now always at the top of the list.
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
---
 CONTRIBUTORS                                  |  19 +-
 HISTORY                                       |  42 +-
 INSTALL                                       |   4 +
 MANUAL                                        |   1 -
 Make.config.template                          |   4 +-
 Makefile                                      |   3 +-
 PLUGINS/src/dvbhddevice/HISTORY               |   8 +
 PLUGINS/src/dvbhddevice/Makefile              |   1 -
 PLUGINS/src/dvbhddevice/dvbhddevice.c         |   4 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c       |  32 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h       |   4 +-
 PLUGINS/src/dvbhddevice/hdffcmd.c             |  13 +-
 PLUGINS/src/dvbhddevice/hdffcmd.h             |   4 +-
 PLUGINS/src/dvbhddevice/hdffosd.c             |  14 +-
 PLUGINS/src/dvbhddevice/hdffosd.h             |   2 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.c   |  36 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.h   |   5 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_defs.h |   2 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.c  |  24 +
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.h  |   4 +
 PLUGINS/src/dvbhddevice/po/fi_FI.po           |   4 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po           |  25 +-
 PLUGINS/src/dvbhddevice/setup.c               |  36 +-
 PLUGINS/src/dvbhddevice/setup.h               |   2 -
 PLUGINS/src/osddemo/HISTORY                   |   4 +
 PLUGINS/src/osddemo/osddemo.c                 |   6 +-
 config.h                                      |  10 +-
 dvbdevice.c                                   |  20 +-
 dvbplayer.c                                   |  26 +-
 dvbspu.c                                      |   3 +-
 dvbsubtitle.c                                 |   3 +-
 menu.c                                        |   4 +-
 po/ar.po                                      |  75 +-
 po/cs_CZ.po                                   |  73 +-
 po/es_ES.po                                   | 320 ++++----
 po/fi_FI.po                                   |  22 +-
 po/fr_FR.po                                   |  37 +-
 po/hu_HU.po                                   | 724 +++++++++---------
 po/nl_NL.po                                   | 274 +++----
 po/pl_PL.po                                   | 271 +++----
 po/ru_RU.po                                   | 266 +++----
 po/sr_SR.po                                   |  81 +-
 po/sv_SE.po                                   | 409 +++++-----
 recording.c                                   |  13 +-
 recording.h                                   |   4 +-
 remux.c                                       |  10 +-
 shutdown.c                                    |  15 +-
 shutdown.h                                    |  21 +-
 skinclassic.c                                 |   3 +-
 svdrpsend                                     |   1 -
 svdrpsend.1                                   |  37 +
 thread.c                                      |   3 +-
 transfer.c                                    |  14 +-
 transfer.h                                    |   5 +-
 vdr.1                                         |   4 +-
 vdr.c                                         |   6 +-
 56 files changed, 1620 insertions(+), 1437 deletions(-)
 create mode 100644 svdrpsend.1

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d401cf1ca..92e5895ee 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -694,6 +694,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting a crash in a plugin using cDeviceHook when VDR ends
  for reporting that "include" needs to be removed from the DVBDIR setting in the VDR
  Makefile
+ for helping to debug a problem with reduced number of retries in Transfer Mode on
+ SD-FF cards
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1009,6 +1011,7 @@ Andreas Mair <amair.sob@googlemail.com>
  but one of them ends in an additional digit, as in "abc" and "abc2"
  for reporting multiple occurrences of the same directory in the recordings list ini
  case there are directories that only differ in non-alphanumeric characters
+ for reporting a problem with reduced number of retries in Transfer Mode on SD-FF cards
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1777,6 +1780,8 @@ Udo Richter <udo_richter@gmx.de>
  for suggesting to shift editing marks that don't point to an I-frame towards the next I-frame
  when a recording is played
  for requesting to keep using relative paths when building plugins locally
+ for fixing a problem with detecting user inactivity in case the system time is
+ changed after VDR has been started
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2001,6 +2006,7 @@ Ville Skytt
  for adding '-p' to the cp command in the install-conf target of the Makefile
  for reporting that some special characters are dropped by Doxygen and thus need to
  be escaped
+ for changing the template for PLGCFG to $(CONFDIR)/plugins.mk
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2362,7 +2368,7 @@ Jan Lenz <email@JanLenz.de>
  for reporting a bug in deleting recordings that have been removed externally when
  running out of disk space
 
-Oleg Roitburd <oleg@roitburd.de>
+Oleg Roitburd <oroitburd@gmail.com>
  for translating OSD texts to the Russian language
  for updating 'sources.conf'
 
@@ -2374,6 +2380,7 @@ Jurij Retzlaff <jurij@topofweb.de>
 
 Richard Lithvall <richard@lithvall.se>
  for adding a tolerance for symbol rate values that are off by one
+ for translating OSD texts to the Swedish language
 
 Tobias Grimm <tobias.grimm@e-tobi.net>
  for suggesting to use geteuid() to check whether VDR is running as user 'root'
@@ -2394,6 +2401,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for suggesting to move setting LC_NUMERIC further up to make sure any floating point
  numbers use a decimal point
  for adding dependency on 'i18n' to 'install-i18n' in the VDR Makefile
+ for adding a manual page for 'svdrpsend'
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2891,6 +2899,10 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de>
  for reporting a problem with EPG scan on systems with only a single DVB device that
  use software output
  for fixing calling iconv_close() only with a valid iconv_t value
+ for reporting a problem with device bondings for devices that don't provide DVB-S
+ in case, for instance, there is now a DVB-T device where there used to be a bonded
+ DVB-S device
+ for fixing a possible deadlock in handling the tuners of bonded devices
 
 Sergiu Dotenco <sergiu.dotenco@googlemail.com>
  for reporting a missing initialization in sDvbSpuRect
@@ -3039,6 +3051,8 @@ S
  handling of PCR values
  for improving cutting MPEG-2 video
  for pointing out that FindHeader() can also be used in cMpeg2Fixer::AdjTref()
+ for reporting a problem with detecting user inactivity in case the system time is
+ changed after VDR has been started
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
@@ -3082,3 +3096,6 @@ Mikael H
 Matthias Senzel <matthias.senzel@t-online.de>
  for reporting a problem with switching back to live viewing after replay in a setup
  with device bonding
+
+Marek Nazarko <mnazarko@gmail.com>
+ for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index 1e03ecb02..06daf6f86 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7590,7 +7590,7 @@ Video Disk Recorder Revision History
 - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Updated the Romanian OSD texts (thanks to Lucian Muresan).
-- Updated the French OSD texts (thanks to Marc Perrudin, Bernard Jaulini and Peter
+- Updated the French OSD texts (thanks to Marc Perrudin, Bernard Jaulin and Peter
   M�nster).
 - Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
 - Fixed moving editing marks, so that they don't get overwritten with old values
@@ -7644,3 +7644,43 @@ Video Disk Recorder Revision History
 - Removed trailing whitespace.
 - Expanded tabs in PLUGINS/src/dvbhddevice/setup.c.
 - Some formatting fixes.
+
+2013-03-03: Version 1.7.39
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Polish OSD texts (thanks to Marek Nazarko).
+- Modified handling user inactivity in the shutdown handler to avoid a problem in case
+  the system time is changed after VDR has been started (thanks to Udo Richter, reported
+  by S�ren Moch).
+- Updated the Czech OSD texts (thanks to Ales Jurik).
+- Changed the template for PLGCFG to $(CONFDIR)/plugins.mk (thanks to Ville Skytt�).
+- Updated the Swedish OSD texts (thanks to Richard Lithvall).
+- Now clearing device bondings for devices that don't provide DVB-S in the Setup/LNB
+  menu (reported by Juergen Lock).
+- Fixed a possible deadlock in handling the tuners of bonded devices (thanks to
+  Juergen Lock).
+- Improved working around the broken driver values for SNR in case of a "TT-budget
+  S2-3200" receiving DVB-S2.
+- The demos in the "osddemo" plugin can now also be ended with the "Back" key.
+- Fixed flashing OSD in "high level OSD" mode of the TT S2-6400 in case a menu is open
+  while subtitles are being displayed.
+- Fixed stuttering or asynchronous audio after changing the audio track. This is done
+  by doing a "jump" to the current position, which clears all buffers. However, this
+  only works with TS recordings. With PES recordings it causes a segfault - haven't
+  been able to figure out why.
+- Added a manual page for 'svdrpsend' (thanks to Tobias Grimm).
+- Fixed immediately disappearing subtitle track menu in "high level OSD" mode of the
+  TT S2-6400 when selecting "No subtitles".
+- Updated the French OSD texts (thanks to Bernard Jaulin).
+- Updated the Dutch OSD texts (thanks to Carel Willemse).
+- Removed all "fuzzy" translations from the files ar.po, hu_HU.po and sr_SR.po, because
+  more often than not they are just wrong.
+- Now calling DeviceClear() in cTransfer::Receive() if the output device blocks, instead
+  of not retrying for 10 seconds (reported by Andreas Mair, with help from Oliver Endriss).
+- Updated the Spanish OSD texts (thanks to Luca Olivetti).
+- Updated the Hungarian language texts (thanks to Istv�n F�ley).
+- Changed the calls to Skins.QueueMessage() in vdr.c that are related to reporting the
+  status of the editing process back to Skins.Message() in order to have them appear
+  immediately.
+- When sorting recordings by name, folders are now always at the top of the list.
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
diff --git a/INSTALL b/INSTALL
index 2cf6be336..bc9193a4b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -424,6 +424,10 @@ Note that it doesn't make sense to use "Satellite Channel Routing" and
 of these methods, it is necessary that your devices are always created in the
 same sequence when the drivers are loaded. You may need to configure some
 proper "udev" rules to make sure this happens.
+If you use "Device Bonding" and you add devices to your setup that don't
+provide DVB-S and take up a position in which there used to be a bonded DVB-S
+device, make sure you open, adjust (if necessary) and confirm the Setup/LNB
+menu to have the device bondings set correctly again.
 
 Running VDR with DVB-C (cable) or DVB-T (terrestrial):
 ------------------------------------------------------
diff --git a/MANUAL b/MANUAL
index e8321a469..25261e3fa 100644
--- a/MANUAL
+++ b/MANUAL
@@ -988,4 +988,3 @@ Version 1.6
            DEFINING THESE COMMANDS AND MAKE SURE THEY DON'T HARM YOUR SYSTEM,
            ESPECIALLY IF YOU ARE RUNNING VDR UNDER A HIGH PRIVILEGED USER ID
            (LIKE 'root').
-
diff --git a/Make.config.template b/Make.config.template
index b02d796e8..2bc0a8f1d 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.18 2013/02/08 10:31:38 kls Exp $
+# $Id: Make.config.template 2.19 2013/02/18 10:55:39 kls Exp $
 
 ### The C compiler and options:
 
@@ -62,7 +62,7 @@ endif
 
 # Use this if you want to have a central place where you configure compile time
 # parameters for plugins:
-#PLGCFG = $(CONFDIR)/plugins.conf
+#PLGCFG = $(CONFDIR)/plugins.mk
 
 ### The remote control:
 
diff --git a/Makefile b/Makefile
index db597543d..913173b8f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.52 2013/02/17 11:08:04 kls Exp $
+# $Id: Makefile 2.53 2013/02/24 10:40:23 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -273,6 +273,7 @@ install-doc:
 	@mkdir -p $(DESTDIR)$(MANDIR)/man5
 	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
 	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
+	@gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
 
 # Plugins:
 
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 99d23bb9b..85aaa6c73 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -59,3 +59,11 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-02-16: Version 0.0.8
 
 - Added missing $(LDFLAGS) to the Makefile (thanks to Ville Skytt�).
+
+2013-02-24: Version 0.0.9
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed flashing OSD in "high level OSD" mode in case a menu is open while subtitles
+  are being displayed.
+- Fixed immediately disappearing subtitle track menu when selecting "No subtitles".
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 99d05a6c1..0bfd13601 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.23 2013/02/16 10:34:53 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 004bb1fcd..1a7542047 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -2,8 +2,6 @@
  * dvbhddevice.c: A plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbhddevice.c 1.22 2013/02/16 10:35:42 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.8";
+static const char *VERSION        = "0.0.9";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index e91d77ff6..dd7ace5b5 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -2,8 +2,6 @@
  * dvbhdffdevice.c: The DVB HD Full Featured device interface
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbhdffdevice.c 1.49 2013/02/17 14:10:06 kls Exp $
  */
 
 #include <stdint.h>
@@ -498,6 +496,7 @@ bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
         mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
         mHdffCmdIf->CmdAvEnableSync(0, true);
         mHdffCmdIf->CmdAvSetPlayMode(0, true);
+        mHdffCmdIf->CmdAvMuteAudio(0, false);
     }
     else {
         if (playMode == pmNone)
@@ -562,6 +561,30 @@ int64_t cDvbHdFfDevice::GetSTC(void)
     return -1;
 }
 
+cRect cDvbHdFfDevice::CanScaleVideo(const cRect &Rect, int Alignment)
+{
+    return Rect;
+}
+
+void cDvbHdFfDevice::ScaleVideo(const cRect &Rect)
+{
+    if (Rect == cRect::Null)
+    {
+        mHdffCmdIf->CmdAvSetVideoWindow(0, false, 0, 0, 0, 0);
+    }
+    else
+    {
+        int osdWidth;
+        int osdHeight;
+        double osdPixelAspect;
+
+        GetOsdSize(osdWidth, osdHeight, osdPixelAspect);
+        mHdffCmdIf->CmdAvSetVideoWindow(0, true,
+            Rect.X() * 1000 / osdWidth, Rect.Y() * 1000 / osdHeight,
+            Rect.Width() * 1000 / osdWidth, Rect.Height() * 1000 / osdHeight);
+    }
+}
+
 void cDvbHdFfDevice::TrickSpeed(int Speed)
 {
   freezed = false;
@@ -591,6 +614,7 @@ void cDvbHdFfDevice::Play(void)
         mHdffCmdIf->CmdAvEnableSync(0, true);
     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
     mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
+    mHdffCmdIf->CmdAvMuteAudio(0, false);
     cDevice::Play();
 }
 
@@ -604,8 +628,8 @@ void cDvbHdFfDevice::Freeze(void)
 
 void cDvbHdFfDevice::Mute(void)
 {
-  //TODO???
-  cDevice::Mute();
+    mHdffCmdIf->CmdAvMuteAudio(0, true);
+    cDevice::Mute();
 }
 
 static HdffVideoStreamType_t MapVideoStreamTypes(int Vtype)
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 0f18fa3c5..330f9d390 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -2,8 +2,6 @@
  * dvbhdffdevice.h: The DVB HD Full Featured device interface
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbhdffdevice.h 1.9 2012/12/03 13:43:55 kls Exp $
  */
 
 #ifndef __DVBHDFFDEVICE_H
@@ -99,6 +97,8 @@ class cDvbHdFfDevice : public cDvbDevice {
   virtual int PlayTsAudio(const uchar *Data, int Length);
 public:
   virtual int64_t GetSTC(void);
+  virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter);
+  virtual void ScaleVideo(const cRect &Rect = cRect::Null);
   virtual void TrickSpeed(int Speed);
   virtual void Clear(void);
   virtual void Play(void);
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
index 1532cc2e1..fd2d598aa 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.c
@@ -2,8 +2,6 @@
  * hdffcmd.c: TODO(short description)
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffcmd.c 1.26 2012/11/15 09:19:47 kls Exp $
  */
 
 #include <stdint.h>
@@ -175,6 +173,10 @@ void cHdffCmdIf::CmdAvSetSyncShift(int16_t SyncShift)
     HdffCmdAvSetSyncShift(mOsdDev, SyncShift);
 }
 
+void cHdffCmdIf::CmdAvMuteAudio(uint8_t DecoderIndex, bool Mute)
+{
+    HdffCmdAvMuteAudio(mOsdDev, DecoderIndex, Mute);
+}
 
 void cHdffCmdIf::CmdOsdConfigure(const HdffOsdConfig_t * pConfig)
 {
@@ -309,6 +311,13 @@ void cHdffCmdIf::CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int Radius
     HdffCmdOsdDrawEllipse(mOsdDev, hDisplay, CX, CY, RadiusX, RadiusY, Color, Flags);
 }
 
+void cHdffCmdIf::CmdOsdDrawSlope(uint32_t hDisplay, int X, int Y, int Width, int Height,
+                                 uint32_t Color, uint32_t Type)
+{
+    //printf("Slope (%d,%d) %d x %d, %08X, %X\n", X, Y, Width, Height, Color, Type);
+    HdffCmdOsdDrawSlope(mOsdDev, hDisplay, X, Y, Width, Height, Color, Type);
+}
+
 void cHdffCmdIf::CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
 {
     //printf("Text %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
index 58ed1388f..891bc7e8c 100644
--- a/PLUGINS/src/dvbhddevice/hdffcmd.h
+++ b/PLUGINS/src/dvbhddevice/hdffcmd.h
@@ -2,8 +2,6 @@
  * hdffcmd.h: TODO(short description)
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffcmd.h 1.21 2012/11/15 09:20:05 kls Exp $
  */
 
 #ifndef _HDFF_CMD_H_
@@ -48,6 +46,7 @@ class cHdffCmdIf
     void CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode);
     void CmdAvSetAudioChannel(uint8_t AudioChannel);
     void CmdAvSetSyncShift(int16_t SyncShift);
+    void CmdAvMuteAudio(uint8_t DecoderIndex, bool Mute);
 
     void CmdOsdConfigure(const HdffOsdConfig_t * pConfig);
     void CmdOsdReset(void);
@@ -74,6 +73,7 @@ class cHdffCmdIf
     void CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color);
     void CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
                            uint32_t Color, uint32_t Flags);
+    void CmdOsdDrawSlope(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color, uint32_t Type);
     void CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
     void CmdOsdDrawUtf8Text(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
     void CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color);
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 09d370ede..4a6eaec10 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -2,8 +2,6 @@
  * hdffosd.c: Implementation of the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffosd.c 1.20 2013/01/29 08:59:36 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -107,6 +105,10 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
 cHdffOsd::~cHdffOsd()
 {
     //printf("~cHdffOsd %d %d\n", mLeft, mTop);
+    if (Active()) {
+        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    }
     SetActive(false);
 
     for (int i = 0; i < MAX_NUM_FONTS; i++)
@@ -124,8 +126,6 @@ cHdffOsd::~cHdffOsd()
 
     if (mBitmapPalette != HDFF_INVALID_HANDLE)
         mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
-    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
     mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
 }
 
@@ -152,7 +152,7 @@ eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
     }
-    if (mDisplay != HDFF_INVALID_HANDLE)
+    if (Active() && mDisplay != HDFF_INVALID_HANDLE)
     {
         mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
         mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
@@ -251,7 +251,6 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
 {
     int w = Font->Width(s);
     int h = Font->Height();
-    int limit = 0;
     int cw = Width ? Width : w;
     int ch = Height ? Height : h;
     int i;
@@ -345,7 +344,6 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
 
     if (Width || Height)
     {
-        limit = x + cw;// - mLeft;
         if (Width)
         {
             if ((Alignment & taLeft) != 0)
@@ -510,6 +508,8 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
 void cHdffOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
     //printf("DrawSlope\n");
+    mHdffCmdIf->CmdOsdDrawSlope(mDisplay, mLeft + x1, mTop + y1,
+                                x2 - x1 + 1, y2 - y1 + 1, Color, Type);
     mChanged = true;
 }
 
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.h b/PLUGINS/src/dvbhddevice/hdffosd.h
index 533897e3c..c8eaf4605 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.h
+++ b/PLUGINS/src/dvbhddevice/hdffosd.h
@@ -2,8 +2,6 @@
  * hdffosd.h: Implementation of the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffosd.h 1.2 2011/01/30 15:27:48 kls Exp $
  */
 
 #ifndef _HDFF_OSD_H_
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
index 3ae1fd7ed..ea17ceb4c 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
@@ -468,3 +468,39 @@ int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift)
     osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
+
+int HdffCmdAvMuteAudio(int OsdDevice, uint8_t DecoderIndex, int Mute)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_MUTE_AUDIO);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, Mute ? 1 : 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvMuteVideo(int OsdDevice, uint8_t DecoderIndex, int Mute)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_MUTE_VIDEO);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, Mute ? 1 : 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
index bfed59dc7..36381417f 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
@@ -151,4 +151,9 @@ int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel);
 
 int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift);
 
+int HdffCmdAvMuteAudio(int OsdDevice, uint8_t DecoderIndex, int Mute);
+
+int HdffCmdAvMuteVideo(int OsdDevice, uint8_t DecoderIndex, int Mute);
+
+
 #endif /* HDFFCMD_AV_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
index 5ead27086..cae2097b1 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
@@ -71,6 +71,8 @@ typedef enum HdffMessageId_t
     HDFF_MSG_AV_SET_AUDIO_CHANNEL,
     HDFF_MSG_AV_SET_PLAY_MODE,
     HDFF_MSG_AV_SET_OPTIONS,
+    HDFF_MSG_AV_MUTE_AUDIO,
+    HDFF_MSG_AV_MUTE_VIDEO,
 
     HDFF_MSG_MUX_SET_VIDEO_OUT = 0,
     HDFF_MSG_MUX_SET_SLOW_BLANK,
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
index 93674155d..cf714a87a 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
@@ -546,6 +546,30 @@ int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
 
+int HdffCmdOsdDrawSlope(int OsdDevice, uint32_t Display, uint16_t X,
+                        uint16_t Y, uint16_t Width, uint16_t Height,
+                        uint32_t Color, uint32_t Type)
+{
+    uint8_t cmdData[28];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_SLOPE);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    BitBuffer_SetBits(&cmdBuf, 32, Type);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
 int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
                        uint16_t X, uint16_t Y, const char * Text,
                        uint32_t Color)
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
index 48851ef2a..079b754f2 100644
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
+++ b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
@@ -145,6 +145,10 @@ int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
                           uint16_t CY, uint16_t RadiusX, uint16_t RadiusY,
                           uint32_t Color, uint32_t Flags);
 
+int HdffCmdOsdDrawSlope(int OsdDevice, uint32_t Display, uint16_t X,
+                        uint16_t Y, uint16_t Width, uint16_t Height,
+                        uint32_t Color, uint32_t Type);
+
 int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
                        uint16_t X, uint16_t Y, const char * Text,
                        uint32_t Color);
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 579e8292a..7d32953e1 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -23,7 +23,7 @@ msgid "Video Conversion"
 msgstr "Näyttömuoto"
 
 msgid "TV on"
-msgstr ""
+msgstr "TV päälle"
 
 msgid "Automatic"
 msgstr "automaattinen"
@@ -92,7 +92,7 @@ msgid "Audio Downmix"
 msgstr "Äänen alasmiksaus"
 
 msgid "A/V Sync Shift (ms)"
-msgstr ""
+msgstr "A/V-synkronointi (ms)"
 
 msgid "OSD Size"
 msgstr "Kuvaruutunäytön koko"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index 0718ba725..be712b214 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -2,13 +2,14 @@
 # Copyright (C) 2011 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
 # Christoph Haubrich, 2011
+# Diego Pierotto <vdr-italian@tiscali.it>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-11-13 20:08+0100\n"
-"PO-Revision-Date: 2011-07-10 00:23+0100\n"
+"PO-Revision-Date: 2013-02-18 23:42+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
 "Language: it\n"
@@ -20,13 +21,13 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 msgid "HD Full Featured DVB device"
-msgstr ""
+msgstr "Scheda DVB HD Full Featured"
 
 msgid "Video Conversion"
 msgstr "Conversione video"
 
 msgid "TV on"
-msgstr ""
+msgstr "TV accesa"
 
 msgid "Automatic"
 msgstr "Automatica"
@@ -47,16 +48,16 @@ msgid "Always 16/9"
 msgstr "Sempre 16:9"
 
 msgid "Zoom 16/9"
-msgstr ""
+msgstr "Ingrandimento 16/9"
 
 msgid "Off"
-msgstr ""
+msgstr "Spento"
 
 msgid "Frame rate"
-msgstr ""
+msgstr "Frame rate"
 
 msgid "HD Only"
-msgstr ""
+msgstr "Solo HD"
 
 msgid "Always"
 msgstr "Sempre"
@@ -80,7 +81,7 @@ msgid "Resolution"
 msgstr "Risoluzione"
 
 msgid "Video Mode Adaption"
-msgstr ""
+msgstr "Adattamento modalità video"
 
 msgid "TV format"
 msgstr "Formato TV"
@@ -95,7 +96,7 @@ msgid "Audio Downmix"
 msgstr "Scala Audio"
 
 msgid "A/V Sync Shift (ms)"
-msgstr ""
+msgstr "Alterna sincro A/V (ms)"
 
 msgid "OSD Size"
 msgstr "Dimensione OSD"
@@ -104,10 +105,10 @@ msgid "HDMI CEC"
 msgstr "HDMI CEC"
 
 msgid "CEC: Switch TV on"
-msgstr ""
+msgstr "CEC: Passa a TV accesa"
 
 msgid "CEC: Switch TV off"
-msgstr ""
+msgstr "CEC: Passa a TV spenta"
 
 msgid "Remote Control Protocol"
 msgstr "Protocollo controllo remoto"
@@ -122,4 +123,4 @@ msgid "Allow True Color OSD"
 msgstr "Permetti OSD True Color"
 
 msgid "Hide mainmenu entry"
-msgstr ""
+msgstr "Nascondi voce menu principale"
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index 45783a3fc..b9196880e 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -2,8 +2,6 @@
  * setup.c: Setup for the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: setup.c 1.19 2013/02/17 13:25:17 kls Exp $
  */
 
 #include "setup.h"
@@ -436,26 +434,26 @@ void cHdffSetupPage::Store(void)
 
 eOSState cHdffSetupPage::ProcessKey(eKeys key)
 {
-        eOSState state = cMenuSetupPage::ProcessKey(key);
+    eOSState state = cMenuSetupPage::ProcessKey(key);
 
-        if (state == osContinue)
+    if (state == osContinue)
+    {
+        cOsdItem * item;
+        switch (key)
         {
-                cOsdItem * item;
-                switch (key)
+            case kLeft:
+            case kRight:
+                item = Get(Current());
+                if (item == mTvFormatItem)
                 {
-                        case kLeft:
-                        case kRight:
-                                item = Get(Current());
-                                if (item == mTvFormatItem)
-                                {
-                                    mVideoConversion = 0;
-                                        BuildVideoConversionItem();
-                                        Display();
-                                }
-                                break;
-                        default:
-                                break;
+                    mVideoConversion = 0;
+                    BuildVideoConversionItem();
+                    Display();
                 }
+                break;
+            default:
+                break;
         }
-        return state;
+    }
+    return state;
 }
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
index 011411d84..a41361462 100644
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -2,8 +2,6 @@
  * setup.h: Setup for the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: setup.h 1.13 2012/11/15 09:21:07 kls Exp $
  */
 
 #ifndef _HDFF_SETUP_H_
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 4f4ace3a6..56ccbb8a2 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -51,3 +51,7 @@ VDR Plugin 'osddemo' Revision History
 
 - Added demos of the DrawEllipse() and DrawSlope() function (press '1' or '2',
   respectively).
+
+2013-02-19: Version 0.3.1
+
+- The demos can now also be ended with the "Back" key.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 0d289e89b..7a36f42c4 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.10 2013/02/17 13:16:34 kls Exp $
+ * $Id: osddemo.c 2.11 2013/02/19 12:43:19 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.3.0";
+static const char *VERSION        = "0.3.1";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -157,6 +157,7 @@ eOSState cLineGame::ProcessKey(eKeys Key)
                      return osContinue;
        case k2:      DrawSlopes(osd);
                      return osContinue;
+       case kBack:
        case kOk:     return osEnd;
        default: return state;
        }
@@ -533,6 +534,7 @@ eOSState cTrueColorDemo::ProcessKey(eKeys Key)
                      SetArea();
                      DrawSlopes(osd);
                      break;
+       case kBack:
        case kOk:     return osEnd;
        default: return state;
        }
diff --git a/config.h b/config.h
index 693e92712..a6ab9735f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.67 2013/02/14 15:13:59 kls Exp $
+ * $Id: config.h 2.69 2013/02/18 10:41:43 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.38"
-#define VDRVERSNUM   10738  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.39"
+#define VDRVERSNUM   10739  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.38"
-#define APIVERSNUM   10738  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.39"
+#define APIVERSNUM   10739  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbdevice.c b/dvbdevice.c
index 7007ad646..0a2f51a15 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.80 2013/02/17 13:17:33 kls Exp $
+ * $Id: dvbdevice.c 2.83 2013/02/20 09:12:12 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -307,6 +307,8 @@ class cDvbTuner : public cThread {
   bool bondedMaster;
   bool SetFrontendType(const cChannel *Channel);
   cString GetBondingParams(const cChannel *Channel = NULL) const;
+  cDvbTuner *GetBondedMaster(void);
+  bool IsBondedMaster(void) const { return !bondedTuner || bondedMaster; }
   void ClearEventQueue(void) const;
   bool GetFrontendStatus(fe_status_t &Status) const;
   void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
@@ -320,7 +322,6 @@ class cDvbTuner : public cThread {
   bool Bond(cDvbTuner *Tuner);
   void UnBond(void);
   bool BondingOk(const cChannel *Channel, bool ConsiderOccupied = false) const;
-  cDvbTuner *GetBondedMaster(void);
   const cChannel *GetTransponder(void) const { return &channel; }
   uint32_t SubsystemId(void) const { return subsystemId; }
   bool IsTunedTo(const cChannel *Channel) const;
@@ -621,15 +622,22 @@ int cDvbTuner::GetSignalQuality(void) const
               break;
               }
            }
+     uint16_t MinSnr = 0x0000;
      uint16_t MaxSnr = 0xFFFF; // Let's assume the default is using the entire range.
      // Use the subsystemId to identify individual devices in case they need
      // special treatment to map their Snr value into the range 0...0xFFFF.
      switch (subsystemId) {
-       case 0x13C21019: MaxSnr = 200; break; // TT-budget S2-3200 (DVB-S/DVB-S2)
+       case 0x13C21019: if (frontendType == SYS_DVBS2) { // TT-budget S2-3200 (DVB-S/DVB-S2)
+                           MinSnr = 10;
+                           MaxSnr = 70;
+                           }
+                        else
+                           MaxSnr = 200;
+                        break;
        case 0x20130245:                      // PCTV Systems PCTV 73ESE
        case 0x2013024F: MaxSnr = 255; break; // PCTV Systems nanoStick T2 290e
        }
-     int a = int(Snr) * 100 / MaxSnr;
+     int a = int(constrain(Snr, MinSnr, MaxSnr)) * 100 / (MaxSnr - MinSnr);
      int b = 100 - (Unc * 10 + (Ber / 256) * 5);
      if (b < 0)
         b = 0;
@@ -742,7 +750,7 @@ bool cDvbTuner::SetFrontend(void)
         if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
            frequency -= diseqc->Lof();
            if (diseqc != lastDiseqc || diseqc->IsScr()) {
-              if (GetBondedMaster() == this) {
+              if (IsBondedMaster()) {
                  ExecuteDiseqc(diseqc, &frequency);
                  if (frequency == 0)
                     return false;
@@ -768,7 +776,7 @@ bool cDvbTuner::SetFrontend(void)
            tone = SEC_TONE_ON;
            }
         int volt = (dtp.Polarization() == 'V' || dtp.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
-        if (GetBondedMaster() != this) {
+        if (!IsBondedMaster()) {
            tone = SEC_TONE_OFF;
            volt = SEC_VOLTAGE_13;
            }
diff --git a/dvbplayer.c b/dvbplayer.c
index c9c8fa034..e936ca2cc 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.30 2013/02/12 10:50:10 kls Exp $
+ * $Id: dvbplayer.c 2.32 2013/02/25 12:15:58 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -220,6 +220,7 @@ class cDvbPlayer : public cPlayer, cThread {
   cFrame *readFrame;
   cFrame *playFrame;
   cFrame *dropFrame;
+  bool resyncAfterPause;
   void TrickSpeed(int Increment);
   void Empty(void);
   bool NextFile(uint16_t FileNumber = 0, off_t FileOffset = -1);
@@ -240,6 +241,7 @@ class cDvbPlayer : public cPlayer, cThread {
   void SkipSeconds(int Seconds);
   void Goto(int Position, bool Still = false);
   virtual double FramesPerSecond(void) { return framesPerSecond; }
+  virtual void SetAudioTrack(eTrackType Type, const tTrackId *TrackId);
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
   };
@@ -270,6 +272,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive)
   readFrame = NULL;
   playFrame = NULL;
   dropFrame = NULL;
+  resyncAfterPause = false;
   isyslog("replay %s", FileName);
   fileName = new cFileName(FileName, false, false, isPesRecording);
   replayFile = fileName->Open();
@@ -636,7 +639,13 @@ void cDvbPlayer::Play(void)
      DevicePlay();
      playMode = pmPlay;
      playDir = pdForward;
-    }
+     if (resyncAfterPause) {
+        int Current, Total;
+        if (GetIndex(Current, Total, true))
+           Goto(Current);
+        resyncAfterPause = false;
+        }
+     }
 }
 
 void cDvbPlayer::Forward(void)
@@ -799,6 +808,19 @@ void cDvbPlayer::Goto(int Index, bool Still)
      }
 }
 
+void cDvbPlayer::SetAudioTrack(eTrackType Type, const tTrackId *TrackId)
+{
+  if (isPesRecording)
+     return; // for some unknown reason this doesn't work with PES recordings - causes a segfault
+  if (playMode == pmPlay) {
+     int Current, Total;
+     if (GetIndex(Current, Total, true))
+        Goto(Current);
+     }
+  else if (playMode == pmPause)
+     resyncAfterPause = true;
+}
+
 bool cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
 {
   if (index) {
diff --git a/dvbspu.c b/dvbspu.c
index 2a311e30e..6b3c21625 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.10 2013/01/20 10:36:58 kls Exp $
+ * $Id: dvbspu.c 2.11 2013/02/22 15:25:16 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -399,7 +399,6 @@ int cDvbSpuDecoder::CalcAreaBpp(cBitmap *fgbmp, cBitmap *bgbmp)
     return ret;
 }
 
-
 void cDvbSpuDecoder::Draw(void)
 {
     cMutexLock MutexLock(&mutex);
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 3ce1a3e85..9facc8601 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,10 +7,9 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.33 2013/02/17 13:17:38 kls Exp $
+ * $Id: dvbsubtitle.c 2.34 2013/02/22 15:25:25 kls Exp $
  */
 
-
 #include "dvbsubtitle.h"
 #define __STDC_FORMAT_MACROS // Required for format specifiers
 #include <inttypes.h>
diff --git a/menu.c b/menu.c
index 69fe6d504..4db68ec78 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.79 2013/02/17 13:17:49 kls Exp $
+ * $Id: menu.c 2.80 2013/02/19 09:33:26 kls Exp $
  */
 
 #include "menu.h"
@@ -2965,6 +2965,8 @@ void cMenuSetupLNB::Setup(void)
      for (int i = 0; i < cDevice::NumDevices(); i++) {
          if (cDevice::GetDevice(i)->ProvidesSource(cSource::stSat))
             Add(new cMenuEditIntItem(cString::sprintf(tr("Setup.LNB$Device %d connected to sat cable"), i + 1), &satCableNumbers.Array()[i], 0, NumSatDevices, tr("Setup.LNB$own")));
+         else
+            satCableNumbers.Array()[i] = 0;
          }
      }
 
diff --git a/po/ar.po b/po/ar.po
index a44917d2c..416579310 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -32,9 +32,8 @@ msgstr "تعذر  بدء طور النقل"
 msgid "off"
 msgstr "ايقاف"
 
-#, fuzzy
 msgid "on"
-msgstr "لا يوجد"
+msgstr ""
 
 msgid "auto"
 msgstr "ذاتى"
@@ -75,9 +74,8 @@ msgstr "الدرجة"
 msgid "Hierarchy"
 msgstr "الهرمية"
 
-#, fuzzy
 msgid "Rolloff"
-msgstr "ايقاف"
+msgstr ""
 
 msgid "PlpId"
 msgstr ""
@@ -283,9 +281,8 @@ msgstr ""
 msgid "Content$Further Education"
 msgstr ""
 
-#, fuzzy
 msgid "Content$Languages"
-msgstr "اللغة"
+msgstr ""
 
 msgid "Content$Leisure/Hobbies"
 msgstr ""
@@ -489,9 +486,8 @@ msgstr "الاعدادات"
 msgid "Key$Commands"
 msgstr "اوامر"
 
-#, fuzzy
 msgid "Key$User0"
-msgstr "المستخدم 1"
+msgstr ""
 
 msgid "Key$User1"
 msgstr "المستخدم 1"
@@ -595,9 +591,8 @@ msgstr "القناة مستخدمة من قبل الموءقت"
 msgid "Delete channel?"
 msgstr "حذف القناة"
 
-#, fuzzy
 msgid "Edit folder"
-msgstr "تعديل الموءقت"
+msgstr ""
 
 msgid "New folder"
 msgstr ""
@@ -612,16 +607,14 @@ msgstr ""
 msgid "Folder name must not contain '%c'!"
 msgstr ""
 
-#, fuzzy
 msgid "Button$Select"
-msgstr "حذف"
+msgstr ""
 
 msgid "Delete folder and all sub folders?"
 msgstr ""
 
-#, fuzzy
 msgid "Delete folder?"
-msgstr "الغاء الموءقت"
+msgstr ""
 
 msgid "Edit timer"
 msgstr "تعديل الموءقت"
@@ -653,9 +646,8 @@ msgstr "معدل البقاء"
 msgid "File"
 msgstr "ملف"
 
-#, fuzzy
 msgid "Button$Folder"
-msgstr "الموءقت"
+msgstr ""
 
 msgid "Button$Single"
 msgstr ""
@@ -786,21 +778,17 @@ msgstr " الثوب"
 msgid "Setup.OSD$Theme"
 msgstr " الثيمة"
 
-#, fuzzy
 msgid "Setup.OSD$Left (%)"
-msgstr "يسار"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Top (%)"
-msgstr "الى اعلى"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Width (%)"
-msgstr "العرض"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Height (%)"
-msgstr "ارتفاع"
+msgstr ""
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "مواقيت الرسائل"
@@ -820,17 +808,14 @@ msgstr "الخط صغير"
 msgid "Setup.OSD$Fixed font"
 msgstr "الخط ثابت"
 
-#, fuzzy
 msgid "Setup.OSD$Default font size (%)"
-msgstr "  حجم الخط الافتراضى"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Small font size (%)"
-msgstr "حجم الخط الصغير"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "حجم الخط الثابت"
+msgstr ""
 
 msgid "Setup.OSD$Channel info position"
 msgstr " موضع معلومات القناة"
@@ -862,13 +847,11 @@ msgstr "زر اغلاق القاائمة"
 msgid "Setup.OSD$Recording directories"
 msgstr "مجلد التسجيلات"
 
-#, fuzzy
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "مدة معلومات القناة"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Number keys for characters"
-msgstr "زر اغلاق القاائمة"
+msgstr ""
 
 msgid "Setup.OSD$Color key 0"
 msgstr ""
@@ -1041,17 +1024,14 @@ msgstr "الكامة مستخدمة الان هل تريد اعادة تشغيل
 msgid "Can't reset CAM!"
 msgstr "تعذر اعادة تشغيل الكامة"
 
-#, fuzzy
 msgid "do not pause live video"
-msgstr "تجميد العرض الحى"
+msgstr ""
 
-#, fuzzy
 msgid "confirm pause live video"
-msgstr "تجميد العرض الحى"
+msgstr ""
 
-#, fuzzy
 msgid "pause live video"
-msgstr "تجميد العرض الحى"
+msgstr ""
 
 msgid "confirm"
 msgstr ""
@@ -1074,9 +1054,8 @@ msgstr "الاولويات الافتراضية"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "معدل البقاء باليوم"
 
-#, fuzzy
 msgid "Setup.Recording$Pause key handling"
-msgstr "معدل الايقاف باليوم"
+msgstr ""
 
 msgid "Setup.Recording$Pause priority"
 msgstr "تعطيل الاولويات"
@@ -1111,9 +1090,8 @@ msgstr "اقصى حجم لملف الفيديو ب م ب"
 msgid "Setup.Recording$Split edited files"
 msgstr "اقسم الملف المعدل"
 
-#, fuzzy
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "اسم التسجيل الفورى"
+msgstr ""
 
 msgid "Replay"
 msgstr "اعادة عرض"
@@ -1169,9 +1147,8 @@ msgstr "كسابق"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "فعل الصوت"
 
-#, fuzzy
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "كسابق"
+msgstr ""
 
 msgid "Setup.Miscellaneous$Show channel names with source"
 msgstr ""
@@ -1242,9 +1219,8 @@ msgstr "لا يوجد كرت ستالايت متاح ليتم التسجيل"
 msgid "Pausing live video..."
 msgstr "تجميد العرض الحى"
 
-#, fuzzy
 msgid "Delete timeshift recording?"
-msgstr "حذف التسجيل"
+msgstr ""
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1390,9 +1366,8 @@ msgstr "الاحد"
 msgid "Upcoming recording!"
 msgstr ""
 
-#, fuzzy
 msgid "Pause live video?"
-msgstr "تجميد العرض الحى"
+msgstr ""
 
 msgid "Recording started"
 msgstr "ابتداء التسجيل"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index a4f2515d5..6a833ea8d 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -4,6 +4,7 @@
 # Vladimír Bárta <vladimir.barta@k2atmitec.cz>, 2006, 2008
 # Jiří Dobrý <jdobry@centrum.cz>, 2008
 # Radek Šťastný <dedkus@gmail.com>, 2010
+# Aleš Juřík <ajurik@quick.cz>, 2013
 #
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
-"Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
+"Last-Translator: Aleš Ju�~Yík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -46,16 +47,16 @@ msgid "System"
 msgstr "Systém"
 
 msgid "Srate"
-msgstr ""
+msgstr "Symbolová rychlost"
 
 msgid "Inversion"
-msgstr ""
+msgstr "Inverze"
 
 msgid "CoderateH"
-msgstr ""
+msgstr "CoderateH"
 
 msgid "CoderateL"
-msgstr ""
+msgstr "CoderateL"
 
 msgid "Modulation"
 msgstr "Modulace"
@@ -73,10 +74,10 @@ msgid "Hierarchy"
 msgstr "Hierarchický mód"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "RollOff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Začíná prohledávání EPG"
@@ -413,13 +414,13 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Přehrát/Pozastavit"
 
 msgid "Key$Play"
 msgstr "Přehrát"
 
 msgid "Key$Pause"
-msgstr "Přerušit"
+msgstr "Pozastavit"
 
 msgid "Key$Stop"
 msgstr "Zastavit"
@@ -648,10 +649,10 @@ msgid "Button$Folder"
 msgstr "Složka"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Bez opakování"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "S opakováním"
 
 msgid "First day"
 msgstr "První den"
@@ -747,7 +748,7 @@ msgid "Delete recording?"
 msgstr "Smazat nahrávku?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Nahrávka je editována - opravdu smazat?"
 
 msgid "Error while deleting recording!"
 msgstr "Chyba při mazání nahrávky!"
@@ -849,19 +850,19 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Složky v menu časovače"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Psát písmena pomocí číselných kláves"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Barva klávesy 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Barva klávesy 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Barva klávesy 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Barva klávesy 3"
 
 msgid "EPG"
 msgstr "EPG"
@@ -932,7 +933,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primární DVB zařízení"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Kompatibilní norma"
 
 msgid "Setup.DVB$Video format"
 msgstr "Formát videa"
@@ -987,10 +988,10 @@ msgstr "Horní frekvence LNB (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Zařízení %d připojeno k sat. kabelu"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "vlastní"
 
 msgid "CAM reset"
 msgstr "Reset CAMu"
@@ -1080,7 +1081,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Délka okamžitého nahrávání (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "současná událost"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximální velikost nahrávky (MB)"
@@ -1101,13 +1102,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Zobrazit režim přehrávání"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Zobrazit zbývající čas"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Čas zobrazení ukazatele průběhu (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pozastavit přehrávání při nastavování značky"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
@@ -1131,10 +1132,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Prodleva při volbě kanálu (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Zpoždění pro začátek opakování stisku klávesy (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Perioda opakování stisku klávesy (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanál po spuštění"
@@ -1146,10 +1147,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spuštění"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Přecházet z konce na začátek seznamu kanálů"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Zobrazit kanály se zdrojem"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Nouzové ukončení"
@@ -1228,7 +1229,7 @@ msgid "No editing marks defined!"
 msgstr "Nejsou definovány editační značky!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nejsou definováný žádné editační sekvence!"
 
 msgid "Can't start editing process!"
 msgstr "Nelze začít editační proces!"
@@ -1273,7 +1274,7 @@ msgid "Index file regeneration complete"
 msgstr "Generování index souboru dokončeno"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Generování index souboru skončilo s chybou!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Vypnutí není možné - chybí volba '-s'!"
@@ -1312,22 +1313,22 @@ msgid "Classic VDR"
 msgstr "Klasické VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "VYTÍŽENÍ"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "ČASOVAČE"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "ZAŘÍZENÍ"
 
 msgid "LIVE"
-msgstr ""
+msgstr "ŽIVĚ"
 
 msgid "PLAY"
-msgstr ""
+msgstr "PŘEHRÁVÁNÍ"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konzola"
diff --git a/po/es_ES.po b/po/es_ES.po
index 9e120e741..f5684e4d7 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
-# Luca Olivetti <luca@ventoso.org>, 2008
+# Luca Olivetti <luca@ventoso.org>, 2008, 2013
 #
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
 msgid "Channel not available!"
-msgstr "!Canal no disponible!"
+msgstr "�Canal no disponible!"
 
 msgid "Can't start Transfer Mode!"
 msgstr "�No se puede iniciar el modo de transferencia!"
@@ -30,7 +30,7 @@ msgid "off"
 msgstr "off"
 
 msgid "on"
-msgstr ""
+msgstr "on"
 
 msgid "auto"
 msgstr "auto"
@@ -42,13 +42,13 @@ msgid "Polarization"
 msgstr "Polarizaci�n"
 
 msgid "System"
-msgstr ""
+msgstr "Sistema"
 
 msgid "Srate"
 msgstr "T.s�mbolos"
 
 msgid "Inversion"
-msgstr "Inversion"
+msgstr "Inversi�n"
 
 msgid "CoderateH"
 msgstr "CoderateH"
@@ -72,254 +72,254 @@ msgid "Hierarchy"
 msgstr "Jerarqu�a"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Pel�cula/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detective/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Aventura/Oeste/Guerra"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Ciencia ficci�n/Fantas�a/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Comedia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Telenovela/Melodrama/Folclore"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Rom�ntico"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Serio/Cl�sico/Religioso/Pel�cula hist�rica/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Pel�cula para adultos/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Noticias/Actualidad"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Noticias/Meteo"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Revista de noticias"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documental"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discusi�n/Entrevista/Debate"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Espect�culo/Juegos"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Juegos/Concurso"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Espect�culo de variedades"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Deportes"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Evento especial"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Revista de deportes"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "F�tbol"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Deportes de equipo"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletismo"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Deportes de motor"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Deportes acu�ticos"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Deportes de invierno"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equitaci�n"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Artes marciales"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Ni�os/Programa para jovenes"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Programa para ni�os de preescolar"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programa de entretenimiento de 6 a 14 a�os"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programa de entretenimiento de 10 a 16 a�os"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informativo/Educativo/Programa escolar"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Dibujos/T�teres"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Musica/Ballet/Danza"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Musica cl�sica"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Musica Folk/Tradicional"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Artes/Cultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Artes escenicas"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Bellas artes"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religi�n"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Cultura popular/Artes tradicionales"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Pel�cula/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Pel�cula/V�deo experimental"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Radiodifusi�n/Prensa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nuevos medios de comunicaci�n"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Revista de arte/cultura"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Sociedad/Pol�tica/Econom�a"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Revista/Informe/Documental"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Asesoramiento econ�mico/social"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Personas notables"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Educaci�n/Ciencia/Factual"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Naturaleza/Animales/Medio ambiente"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tecnolog�a/Ciencias naturales"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Fisiolog�a/Psicolog�a"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Pa�ses extranjeros/Expediciones"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Ciencias sociales/espirituales"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Educaci�n superior"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Idiomas"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Ocio/Aficiones"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turismo/Viajes"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Manualidades"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motor"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness y Salud"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cocina"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Publicidad/Compras"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Jardiner�a"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Idioma original"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Blanco y negro"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "No publicado"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Emisi�n en directo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "de %d"
 
 msgid "No title"
 msgstr "Sin t�tulo"
@@ -358,7 +358,7 @@ msgid "Press 'Down' to continue"
 msgstr "Pulse 'Abajo' para continuar"
 
 msgid "(press 'Up' to go back)"
-msgstr "(Pulse 'Arriba' para retornar)"
+msgstr "(Pulse 'Arriba' para volver)"
 
 msgid "(press 'Down' to end key definition)"
 msgstr "(Pulse 'Abajo' para terminar el aprendizaje)"
@@ -388,7 +388,7 @@ msgid "Key$Ok"
 msgstr "Ok"
 
 msgid "Key$Back"
-msgstr "Retornar"
+msgstr "Volver"
 
 msgid "Key$Left"
 msgstr "Izquierda"
@@ -412,7 +412,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Repr./Pausa"
 
 msgid "Key$Play"
 msgstr "Reproducir"
@@ -457,7 +457,7 @@ msgid "Key$Volume-"
 msgstr "Volumen-"
 
 msgid "Key$Mute"
-msgstr "Mudo"
+msgstr "Silencio"
 
 msgid "Key$Audio"
 msgstr "Audio"
@@ -472,7 +472,7 @@ msgid "Key$Channels"
 msgstr "Canales"
 
 msgid "Key$Timers"
-msgstr "Programar grabaciones"
+msgstr "Timers"
 
 msgid "Key$Recordings"
 msgstr "Grabaciones"
@@ -517,7 +517,7 @@ msgid "Free To Air"
 msgstr "en abierto"
 
 msgid "encrypted"
-msgstr "cifrado"
+msgstr "codificado"
 
 msgid "Edit channel"
 msgstr "Modificar canal"
@@ -583,38 +583,38 @@ msgid "Button$Mark"
 msgstr "Marcar"
 
 msgid "Channel is being used by a timer!"
-msgstr "�Hay una grabaci�n programada para este canal!"
+msgstr "�Hay un timer programado para este canal!"
 
 msgid "Delete channel?"
 msgstr "�Eliminar canal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Modificar carpeta"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nueva carpeta"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Sub carpeta"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "�La carpeta ya existe!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "�El nombre de la carpeta no puede contener '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Seleccionar"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "�Borrar carpeta y todas sub carpetas?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "�Borrar carpeta?"
 
 msgid "Edit timer"
-msgstr "Modificar programaci�n"
+msgstr "Modificar timer"
 
 msgid "Active"
 msgstr "Activo"
@@ -626,7 +626,7 @@ msgid "Day"
 msgstr "D�a"
 
 msgid "Start"
-msgstr "Comienzo"
+msgstr "Inicio"
 
 msgid "Stop"
 msgstr "Fin"
@@ -644,22 +644,22 @@ msgid "File"
 msgstr "Fichero"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Carpeta"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Individual"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Peri�dico"
 
 msgid "First day"
 msgstr "Primer d�a"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Seleccionar carpeta"
 
 msgid "Timers"
-msgstr "Programar grabaciones"
+msgstr "Timers"
 
 msgid "Button$On/Off"
 msgstr "On/Off"
@@ -668,16 +668,16 @@ msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "�Eliminar programaci�n?"
+msgstr "�Eliminar timer?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Todav�a est� grabando - �eliminar realmente?"
+msgstr "Timer a�n grabando - �eliminar realmente?"
 
 msgid "Event"
 msgstr "Evento"
 
 msgid "Button$Timer"
-msgstr "Programa"
+msgstr "Timer"
 
 msgid "Button$Record"
 msgstr "Grabar"
@@ -719,7 +719,7 @@ msgstr "Todos los eventos - todos los canales"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "�Escriba %d d�gitos!"
+msgstr "�Introduzca %d d�gitos!"
 
 msgid "CAM not responding!"
 msgstr "�CAM no responde!"
@@ -743,10 +743,10 @@ msgid "Commands"
 msgstr "�rdenes"
 
 msgid "Delete recording?"
-msgstr "�Eliminar grabacion?"
+msgstr "�Eliminar grabaci�n?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "La grabaci�n se est� editando �eliminar igualmente?"
 
 msgid "Error while deleting recording!"
 msgstr "�Error al borrar la grabaci�n!"
@@ -815,7 +815,7 @@ msgid "Setup.OSD$Fixed font size (%)"
 msgstr "Tama�o fuente fija (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Posici�n para informaci�n de canal"
+msgstr "Posici�n de informaci�n de canal"
 
 msgid "bottom"
 msgstr "abajo"
@@ -833,34 +833,34 @@ msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Auto-cerrar al solicitar info de canal"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Deslizar p�ginas enteras"
+msgstr "Saltar p�ginas enteras"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Rotar arriba/abajo al deslizar"
+msgstr "Primera p�gina despu�s de la �ltima"
 
 msgid "Setup.OSD$Menu key closes"
 msgstr "Cerrar al pulsar bot�n de men�"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Mostrar directorios de grabaciones"
+msgstr "Mostrar carpetas de grabaciones"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Carpetas en men� timers"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Teclas num�ricas para caracteres"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Tecla color 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Tecla color 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Tecla color 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Tecla color 3"
 
 msgid "EPG"
 msgstr "Gu�a de Programaci�n"
@@ -898,16 +898,16 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "center cut out"
+msgstr "solo parte central"
 
 msgid "no"
 msgstr "no"
 
 msgid "names only"
-msgstr "s�lo nombres"
+msgstr "solo nombres"
 
 msgid "PIDs only"
-msgstr "s�lo PIDs"
+msgstr "solo PIDs"
 
 msgid "names and PIDs"
 msgstr "nombres y PIDs"
@@ -931,7 +931,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Interfaz DVB primario"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Conformidad a est�ndar"
 
 msgid "Setup.DVB$Video format"
 msgstr "Formato de v�deo"
@@ -986,10 +986,10 @@ msgstr "Frecuencia superior del LNB (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Dispositivo %d conectado a cable sat�lite"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "propio"
 
 msgid "CAM reset"
 msgstr "Reset CAM"
@@ -1022,16 +1022,16 @@ msgid "Can't reset CAM!"
 msgstr "�No se puede reiniciar CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "no pausar emisi�n en directo"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "confirmar pausa de emisi�n en directo"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pausar emisi�n en directo"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirmar"
 
 msgid "yes"
 msgstr "s�"
@@ -1052,7 +1052,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Duraci�n por defecto (d�as)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gesti�n tecla de pausa"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioridad en modo pausa"
@@ -1079,7 +1079,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Tiempo de grabaci�n inmediata (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "evento actual"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Tama�o m�ximo de fichero (MB)"
@@ -1088,7 +1088,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Partir ficheros editados"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Borrar grabaciones timeshift"
 
 msgid "Replay"
 msgstr "Opciones de reproducci�n"
@@ -1100,13 +1100,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar modo de reproducci�n"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Mostrar tiempo restante"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Visualizaci�n tiempo avance (sg)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pausar reproducci�n al establecer marca"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
@@ -1130,10 +1130,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Tiempo introducci�n canal (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Retardo repetici�n mando a distancia (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Delta repetici�n mando a distancia (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
@@ -1145,10 +1145,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumen inicial"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Primer canal despu�s del �ltimo"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Mostrar nombres canales con fuente"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Salida de emergencia"
@@ -1217,17 +1217,17 @@ msgid "Pausing live video..."
 msgstr "Pausa de la emisi�n en directo..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Borrar grabaci�n timeshift"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Saltar: "
 
 msgid "No editing marks defined!"
-msgstr "�No se definieron marcas de edici�n!"
+msgstr "�No se han definido marcas de edici�n!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "�No se han definido secuencias de edici�n!"
 
 msgid "Can't start editing process!"
 msgstr "�No se puede iniciar el proceso de edici�n!"
@@ -1266,13 +1266,13 @@ msgid "Low disk space!"
 msgstr "�Poco espacio en disco!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Regenerando fichero �ndice"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Regeneraci�n fichero �ndice acabada"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "�Ha fallado la regeneraci�n del fichero �ndice!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "�No se puede apagar - falta el par�metro '-s'!"
@@ -1285,7 +1285,7 @@ msgstr "Grabaci
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Grabaci�n dentro de %ld minutos, �apagar realmente?"
+msgstr "Grabaci�n dentro de %ld minutos, �apagar igualmente?"
 
 msgid "shut down anyway?"
 msgstr "�apagar igualmente?"
@@ -1311,22 +1311,22 @@ msgid "Classic VDR"
 msgstr "VDR cl�sico"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISCO"
 
 msgid "LOAD"
-msgstr ""
+msgstr "CARGAR"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TIMERS"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "DISPOSITIVOS"
 
 msgid "LIVE"
-msgstr ""
+msgstr "EN DIRECTO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "REPRODUCIR"
 
 msgid "ST:TNG Panels"
 msgstr "Paneles ST:TNG"
@@ -1364,13 +1364,13 @@ msgid "Upcoming recording!"
 msgstr "�Grabaci�n a punto de empezar!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "�Pausar emisi�n en directo?"
 
 msgid "Recording started"
 msgstr "Iniciando grabaci�n"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR se apagar� m�s tarde - pulse Power para forzar"
+msgstr "VDR se apagar� m�s tarde - pulse Apagar para forzar"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Pulse una tecla para interrumpir apagar"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 164a376eb..dbf3e80ee 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -414,7 +414,7 @@ msgid "Key$Info"
 msgstr "Tiedot"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Toista/Tauko"
 
 msgid "Key$Play"
 msgstr "Toista"
@@ -853,16 +853,16 @@ msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Värinäppäin 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Värinäppäin 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Värinäppäin 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Värinäppäin 3"
 
 msgid "EPG"
 msgstr "Ohjelmaopas"
@@ -1105,10 +1105,10 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Näytä jäljellä oleva aika"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Näytä toiston kontrollit (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pysäytä toisto asetettaessa merkki"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
@@ -1132,10 +1132,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Kanavasyötteen odotusaika (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Kaukosäätimen toistoviive (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Kaukosäätimen toistoväli (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanava käynnistettäessä"
@@ -1229,7 +1229,7 @@ msgid "No editing marks defined!"
 msgstr "Muokkausmerkinnät puuttuvat!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Muokkausosiot puuttuvat!"
 
 msgid "Can't start editing process!"
 msgstr "Muokkauksen aloitus epäonnistui!"
@@ -1274,7 +1274,7 @@ msgid "Index file regeneration complete"
 msgstr "Indeksitiedosto valmistui"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Indeksitiedoston luonti epäonnistui!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index eaf31b186..e12b59846 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,14 +17,13 @@ msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2013-02-15 13:26+0100\n"
+"PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Chaîne invalide ! ***"
@@ -836,10 +835,10 @@ msgid "Setup.OSD$Channel info time (s)"
 msgstr "Durée affichage infos chaîne (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Infos lors des changements de chaînes"
+msgstr "Infos chaîne lors du changement"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Temps de demande d'infos de chaîne"
+msgstr "Compte à rebours infos chaîne"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Défilement par pages"
@@ -854,10 +853,10 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Dossiers d'enregistrements"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "Dossiers dans le menu programmation"
+msgstr "Dossiers dans menu programmation"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr "Touches numériques pour les caractères"
+msgstr "Touches numériques pour caractères"
 
 msgid "Setup.OSD$Color key 0"
 msgstr "Touche de couleur 0"
@@ -878,13 +877,13 @@ msgid "Button$Scan"
 msgstr "Scanner"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Temps d'inactivité avant mise à jour du guide-EPG (h)"
+msgstr "Inactivité avant mise à jour EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Niveau de correction du guide-EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Afficher les données du guide-EPG périmées (min)"
+msgstr "Afficher données EPG périmées (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Ajuster l'heure du système"
@@ -1061,13 +1060,13 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durée de vie par défaut (j)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Support de la touche Pause"
+msgstr "Fonction de la touche Pause"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorité de l'enregistrement mis en pause "
+msgstr "Priorité de l'enregistr. mis en pause "
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Expiration de l'enregistrement mis en pause (j)"
+msgstr "Expiration enregistr. mis en pause (j)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Utiliser le nom de l'épisode"
@@ -1112,10 +1111,10 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Montrer le temps restant"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr "Affichage de la barre de progression (s)"
+msgstr "Afficher la barre de progression (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Arrêter la lecture lors de l'ajout d'un marqueur"
+msgstr "Arrêt lecture si ajout marqueur"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
@@ -1124,10 +1123,10 @@ msgid "Miscellaneous"
 msgstr "Divers"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Temps minimal entre événements (min)"
+msgstr "Temps mini entre événements (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Durée d'inactivité utilisateur minimale (min)"
+msgstr "Inactivité de l'utilisateur (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Temps maxi SVDRP (s)"
@@ -1157,7 +1156,7 @@ msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Affichage circulaire des chaînes"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr "Afficher le nom des chaînes avec leur source"
+msgstr "Afficher chaînes avec leur source"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Arrêt d'urgence"
@@ -1323,13 +1322,13 @@ msgid "DISK"
 msgstr "DISQUE"
 
 msgid "LOAD"
-msgstr "CHARGER"
+msgstr "CHARGE SYSTÈME"
 
 msgid "TIMERS"
-msgstr "PROGRAMMATIONS"
+msgstr "MINUTEUR"
 
 msgid "DEVICES"
-msgstr "PÉRIPHÉRIQUES"
+msgstr "PÉRIPHÉRIQ."
 
 msgid "LIVE"
 msgstr "DIRECT"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index a2cc9d0c1..260668a67 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -3,30 +3,31 @@
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
-# Thomas G�nther <tom@toms-cafe.de>, 2007
-# Istv�n F�ley <ifuley@tigercomp.ro>, 2007, 2012
+# Thomas Günther <tom@toms-cafe.de>, 2007
+# István Füley <ifuley@tigercomp.ro>, 2007, 2012, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2012-01-02 11:54+0200\n"
-"Last-Translator: Istv�n F�ley <ifuley@tigercomp.ro>\n"
+"PO-Revision-Date: 2013-03-01 19:22+0200\n"
+"Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.5\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** �rv�nytelen csatorna ***"
+msgstr "*** Érvénytelen csatorna ***"
 
 msgid "Channel not available!"
-msgstr "Az ad� nem el�rhet�"
+msgstr "Az adó nem elérhető"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Transfer-Mode nem ind�that�!"
+msgstr "Transfer-Mode nem indítható!"
 
 msgid "off"
 msgstr "ki"
@@ -41,7 +42,7 @@ msgid "none"
 msgstr "egyik sem"
 
 msgid "Polarization"
-msgstr "Polariz�ci�"
+msgstr "Polarizáció"
 
 msgid "System"
 msgstr "Rendszer"
@@ -59,13 +60,13 @@ msgid "CoderateL"
 msgstr "CoderateL"
 
 msgid "Modulation"
-msgstr "Modul�ci�"
+msgstr "Moduláció"
 
 msgid "Bandwidth"
-msgstr "S�vsz�less�g"
+msgstr "Sávszélesség"
 
 msgid "Transmission"
-msgstr "�tvitel"
+msgstr "Átvitel"
 
 msgid "Guard"
 msgstr "Guard"
@@ -77,254 +78,254 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PLP azonosító"
 
 msgid "Starting EPG scan"
-msgstr "EPG adatok aktualiz�l�sa"
+msgstr "EPG adatok aktualizálása"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Dráma"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Nyomozó/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Kaland/Western/Háborús"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Sci-fi/Fantasy/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Komédia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Szappanopera/Melodráma/Folklór"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romantikus film"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Komolyzenei/Klasszikus/Vallási/Történelmi film/Dráma"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Felnőtt tartalom/Dráma"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Hírek/Híradó"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Hírek/Időjárás"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Hírmagazin"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokumentumfilm"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Beszélgetés/Interjú/Vita"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Show/Játékshow"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Játék/Kvíz/Verseny"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Varietéműsor"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talkshow"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Különleges program"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Sporthíradó"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Fotball/Labdarúgás"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenisz/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Csapatsportok"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atlétika"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Motorsport"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Vízisportok"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Télisportok"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Biliárd"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Közdősport"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Gyerekprogram/Fiataloknak"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Óvodáskorú gyerekeknek"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Szórakoztató műsor 6-14 éveseknek"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Szórakoztató műsor 10-16 éveseknek"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Információs/Oktató/Iskolai program"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Rajzfilm/Bábszínház"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Zene/Balett/Tánc"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Komolyzene/Klasszikus zene"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Népzene/Hagyományos zene"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balett"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Művészet/Kultúra"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Előadás"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Belle arte"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Vallás"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Népi kultúra/Hagyományos művészet"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Irodalom"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Mozi"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Amatőr film/video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Közvetítés/Sajtó"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Új média"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Művészet/Kultúra magazin"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Divat"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Társadalmi/Politikai/Gazdasági"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazin/Riport/Tényfeltáró"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Gazdaság/Társadalmi tanácsadás"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Érdekes emberek"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Oktatás/Tudomány/Gyakorlati"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Természet/Állatok/Környezet"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technológia/Természettudomány"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Gyógyászat/Pszichológia/Orvostan"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Idegen országok/Expedíciók"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Társadalmi/Lélektudomány"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Továbbképzés"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Nyelvek"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Hobbi"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turizmus/Utazás"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Kézműves"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motor"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness és egészség"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Főzőműsor"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reklám/Vásárlás"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Kertészet"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Eredeti nyelv"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Fekete-fehér"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Korábban nem sugárzott"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Élő közvetítés"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr "%d �ven fel�lieknek"
+msgstr "%d éven felülieknek"
 
 msgid "No title"
-msgstr "c�m n�lk�l"
+msgstr "cím nélkül"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -335,47 +336,47 @@ msgid "LanguageCode$eng"
 msgstr "hun"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Els� l�p�s: t�vir�ny�t� k�dj�nak meghat�roz�sa"
+msgstr "Első lépés: távirányító kódjának meghatározása"
 
 msgid "Press any key on the RC unit"
-msgstr "Nyomjon meg egy gombot a t�vir�ny�t�n"
+msgstr "Nyomjon meg egy gombot a távirányítón"
 
 msgid "RC code detected!"
-msgstr "T�vir�ny�t� k�dja felismerve!"
+msgstr "Távirányító kódja felismerve!"
 
 msgid "Do not press any key..."
 msgstr "Ne nyomjon meg gombot..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "M�sodik l�p�s: az egyes gombok betan�t�sa"
+msgstr "Második lépés: az egyes gombok betanítása"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "'%s' gomb megnyom�sa"
+msgstr "'%s' gomb megnyomása"
 
 msgid "Press 'Up' to confirm"
-msgstr "'Fel' megnyom�sa az elfogad�shoz"
+msgstr "'Fel' megnyomása az elfogadáshoz"
 
 msgid "Press 'Down' to continue"
-msgstr "'Le' megnyom�sa a folytat�shoz"
+msgstr "'Le' megnyomása a folytatáshoz"
 
 msgid "(press 'Up' to go back)"
-msgstr "('Fel' megnyom�sa a visszat�r�shez)"
+msgstr "('Fel' megnyomása a visszatéréshez)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "('Le' megnyom�sa a befejez�shez)"
+msgstr "('Le' megnyomása a befejezéshez)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "A Men� gombot nyomni ennek a gombnak a kihagy�s�hoz"
+msgstr "A Menü gombot nyomni ennek a gombnak a kihagyásához"
 
 msgid "Learning Remote Control Keys"
-msgstr "T�vir�ny�t� betan�t�sa"
+msgstr "Távirányító betanítása"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Harmadik l�p�s: k�d ment�se"
+msgstr "Harmadik lépés: kód mentése"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Fel' ment�s, 'Le' m�gse"
+msgstr "'Fel' mentés, 'Le' mégse"
 
 msgid "Key$Up"
 msgstr "Fel"
@@ -384,7 +385,7 @@ msgid "Key$Down"
 msgstr "Le"
 
 msgid "Key$Menu"
-msgstr "Men�"
+msgstr "Menü"
 
 msgid "Key$Ok"
 msgstr "Ok"
@@ -402,40 +403,40 @@ msgid "Key$Red"
 msgstr "Piros"
 
 msgid "Key$Green"
-msgstr "Z�ld"
+msgstr "Zöld"
 
 msgid "Key$Yellow"
-msgstr "S�rga"
+msgstr "Sárga"
 
 msgid "Key$Blue"
-msgstr "K�k"
+msgstr "Kék"
 
 msgid "Key$Info"
-msgstr "Inform�ci�"
+msgstr "Információ"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Lejátszás/Szünet"
 
 msgid "Key$Play"
-msgstr "Lej�tsz�s"
+msgstr "Lejátszás"
 
 msgid "Key$Pause"
-msgstr "Sz�net"
+msgstr "Szünet"
 
 msgid "Key$Stop"
 msgstr "Stop"
 
 msgid "Key$Record"
-msgstr "Felv�tel"
+msgstr "Felvétel"
 
 msgid "Key$FastFwd"
-msgstr "El�re p�rgetni"
+msgstr "Előre pörgetni"
 
 msgid "Key$FastRew"
-msgstr "Vissza p�rgetni"
+msgstr "Vissza pörgetni"
 
 msgid "Key$Next"
-msgstr "El�re"
+msgstr "Előre"
 
 msgid "Key$Prev"
 msgstr "Vissza"
@@ -450,13 +451,13 @@ msgid "Key$Channel-"
 msgstr "Csatorna-"
 
 msgid "Key$PrevChannel"
-msgstr "Az el�z� ad�s"
+msgstr "Az előző adás"
 
 msgid "Key$Volume+"
-msgstr "Hanger�+"
+msgstr "Hangerő+"
 
 msgid "Key$Volume-"
-msgstr "Hanger�-"
+msgstr "Hangerő-"
 
 msgid "Key$Mute"
 msgstr "Csend"
@@ -471,64 +472,64 @@ msgid "Key$Schedule"
 msgstr "Program"
 
 msgid "Key$Channels"
-msgstr "Csatorn�k"
+msgstr "Csatornák"
 
 msgid "Key$Timers"
-msgstr "Id�z�t�"
+msgstr "Időzítő"
 
 msgid "Key$Recordings"
-msgstr "Felv�telek"
+msgstr "Felvételek"
 
 msgid "Key$Setup"
-msgstr "Be�ll�t�sok"
+msgstr "Beállítások"
 
 msgid "Key$Commands"
 msgstr "Parancsok"
 
 msgid "Key$User0"
-msgstr "Felhaszn�l�0"
+msgstr "Felhasználó0"
 
 msgid "Key$User1"
-msgstr "Felhaszn�l�1"
+msgstr "Felhasználó1"
 
 msgid "Key$User2"
-msgstr "Felhaszn�l�2"
+msgstr "Felhasználó2"
 
 msgid "Key$User3"
-msgstr "Felhaszn�l�3"
+msgstr "Felhasználó3"
 
 msgid "Key$User4"
-msgstr "Felhaszn�l�4"
+msgstr "Felhasználó4"
 
 msgid "Key$User5"
-msgstr "Felhaszn�l�5"
+msgstr "Felhasználó5"
 
 msgid "Key$User6"
-msgstr "Felhaszn�l�6"
+msgstr "Felhasználó6"
 
 msgid "Key$User7"
-msgstr "Felhaszn�l�7"
+msgstr "Felhasználó7"
 
 msgid "Key$User8"
-msgstr "Felhaszn�l�8"
+msgstr "Felhasználó8"
 
 msgid "Key$User9"
-msgstr "Felhaszn�l�9"
+msgstr "Felhasználó9"
 
 msgid "Free To Air"
-msgstr "K�dolatlan"
+msgstr "Kódolatlan"
 
 msgid "encrypted"
-msgstr "K�dolt"
+msgstr "Kódolt"
 
 msgid "Edit channel"
-msgstr "Csatorn�k be�ll�t�sa"
+msgstr "Csatornák beállítása"
 
 msgid "Name"
-msgstr "N�v"
+msgstr "Név"
 
 msgid "Source"
-msgstr "Forr�s"
+msgstr "Forrás"
 
 msgid "Frequency"
 msgstr "Frekvencia"
@@ -567,56 +568,56 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Channel settings are not unique!"
-msgstr "Az ad�be�ll�t�sok nem egy�rtelm�ek"
+msgstr "Az adóbeállítások nem egyértelműek"
 
 msgid "Channels"
-msgstr "Csatorn�k"
+msgstr "Csatornák"
 
 msgid "Button$Edit"
-msgstr "Be�ll�tani"
+msgstr "Beállítani"
 
 msgid "Button$New"
-msgstr "�j"
+msgstr "Új"
 
 msgid "Button$Delete"
-msgstr "T�r�lni"
+msgstr "Törölni"
 
 msgid "Button$Mark"
-msgstr "Megjel�lni"
+msgstr "Megjelölni"
 
 msgid "Channel is being used by a timer!"
-msgstr "Az ad�t az id�z�t� haszn�lja!"
+msgstr "Az adót az időzítő használja!"
 
 msgid "Delete channel?"
-msgstr "Csatorna t�rl�se?"
+msgstr "Csatorna törlése?"
 
 msgid "Edit folder"
-msgstr "K�nyvt�r szerkeszt�se"
+msgstr "Könyvtár szerkesztése"
 
 msgid "New folder"
-msgstr "�j k�nyvt�r"
+msgstr "Új könyvtár"
 
 msgid "Sub folder"
-msgstr "Alk�nyvt�r"
+msgstr "Alkönyvtár"
 
 msgid "Folder name already exists!"
-msgstr "Ez a k�nyvt�rn�v m�r l�tezik!"
+msgstr "Ez a könyvtárnév már létezik!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "A k�nyvt�r neve nem tartalmazhatja: '%c'!"
+msgstr "A könyvtár neve nem tartalmazhatja: '%c'!"
 
 msgid "Button$Select"
-msgstr "Kiv�laszt�s"
+msgstr "Kiválasztás"
 
 msgid "Delete folder and all sub folders?"
-msgstr "Val�ban t�r�ljem a k�nyvt�rat �s az alk�nyvt�rait?"
+msgstr "Valóban töröljem a könyvtárat és az alkönyvtárait?"
 
 msgid "Delete folder?"
-msgstr "T�r�ljem a k�nyvt�rat?"
+msgstr "Töröljem a könyvtárat?"
 
 msgid "Edit timer"
-msgstr "Id�z�t� megv�ltoztat�sa"
+msgstr "Időzítő megváltoztatása"
 
 msgid "Active"
 msgstr "Aktiv"
@@ -631,112 +632,112 @@ msgid "Start"
 msgstr "Kezdet"
 
 msgid "Stop"
-msgstr "V�g"
+msgstr "Vég"
 
 msgid "VPS"
 msgstr "VPS"
 
 msgid "Priority"
-msgstr "Priorit�s"
+msgstr "Prioritás"
 
 msgid "Lifetime"
-msgstr "�lettartam"
+msgstr "Élettartam"
 
 msgid "File"
 msgstr "File"
 
 msgid "Button$Folder"
-msgstr "K�nyvt�r"
+msgstr "Könyvtár"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Egyszeri"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Ismétlődő"
 
 msgid "First day"
-msgstr "Els� nap"
+msgstr "Első nap"
 
 msgid "Select folder"
-msgstr "K�nyvt�r kiv�laszt�sa"
+msgstr "Könyvtár kiválasztása"
 
 msgid "Timers"
-msgstr "Id�z�t�"
+msgstr "Időzítő"
 
 msgid "Button$On/Off"
 msgstr "Be/Ki"
 
 msgid "Button$Info"
-msgstr "Inform�ci�"
+msgstr "Információ"
 
 msgid "Delete timer?"
-msgstr "Id�z�t� t�rl�se?"
+msgstr "Időzítő törlése?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Felv�tel folyamatban van - biztos t�r�ljem?"
+msgstr "Felvétel folyamatban van - biztos töröljem?"
 
 msgid "Event"
-msgstr "Esem�ny"
+msgstr "Esemény"
 
 msgid "Button$Timer"
-msgstr "Id�z�t�"
+msgstr "Időzítő"
 
 msgid "Button$Record"
-msgstr "Felv�tel"
+msgstr "Felvétel"
 
 msgid "Button$Switch"
-msgstr "�tkapcsolni"
+msgstr "Átkapcsolni"
 
 msgid "What's on now?"
-msgstr "Most ad�sban"
+msgstr "Most adásban"
 
 msgid "What's on next?"
-msgstr "Mi k�vetkezik?"
+msgstr "Mi következik?"
 
 msgid "Button$Next"
-msgstr "K�vetkez�"
+msgstr "Következő"
 
 msgid "Button$Now"
 msgstr "Most"
 
 msgid "Button$Schedule"
-msgstr "M�sor�js�g"
+msgstr "Műsorújság"
 
 msgid "Can't switch channel!"
-msgstr "Az ad�t nem lehet elkapcsolni"
+msgstr "Az adót nem lehet elkapcsolni"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "M�sor�js�g - %s"
+msgstr "Műsorújság - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "Ez az ad�s - %s"
+msgstr "Ez az adás - %s"
 
 msgid "This event - all channels"
-msgstr "Ez az ad�s - �sszes ad�n"
+msgstr "Ez az adás - összes adón"
 
 msgid "All events - all channels"
-msgstr "Az �sszes ad�s - az �sszes ad�n"
+msgstr "Az összes adás - az összes adón"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "�ss�n be %d sz�mot!"
+msgstr "Üssön be %d számot!"
 
 msgid "CAM not responding!"
-msgstr "A CAM nem v�laszol!"
+msgstr "A CAM nem válaszol!"
 
 msgid "Recording info"
-msgstr "Felv�tel inf�"
+msgstr "Felvétel infó"
 
 msgid "Button$Play"
-msgstr "Lej�tszani"
+msgstr "Lejátszani"
 
 msgid "Button$Rewind"
-msgstr "Vissza az elej�re"
+msgstr "Vissza az elejére"
 
 msgid "Recordings"
-msgstr "Felv�telek"
+msgstr "Felvételek"
 
 msgid "Button$Open"
 msgstr "Kinyitni"
@@ -745,13 +746,13 @@ msgid "Commands"
 msgstr "Parancsok"
 
 msgid "Delete recording?"
-msgstr "Felv�tel t�rl�se?"
+msgstr "Felvétel törlése?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "A felvétel szerkesztés alatt - biztos törölni?"
 
 msgid "Error while deleting recording!"
-msgstr "Hiba a felv�tel t�rl�s�n�l!"
+msgstr "Hiba a felvétel törlésénél!"
 
 msgid "Recording commands"
 msgstr "Parancsok a felvett filmekhez"
@@ -760,7 +761,7 @@ msgid "never"
 msgstr "soha"
 
 msgid "skin dependent"
-msgstr "Men� n�zet�t�l f�gg�en"
+msgstr "Menü nézetétől függően"
 
 msgid "always"
 msgstr "mindig"
@@ -772,10 +773,10 @@ msgid "Setup.OSD$Language"
 msgstr "Nyelv"
 
 msgid "Setup.OSD$Skin"
-msgstr "Men� n�zet"
+msgstr "Menü nézet"
 
 msgid "Setup.OSD$Theme"
-msgstr "T�ma"
+msgstr "Téma"
 
 msgid "Setup.OSD$Left (%)"
 msgstr "Balra (%)"
@@ -784,40 +785,40 @@ msgid "Setup.OSD$Top (%)"
 msgstr "Fent (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "Sz�less�g (%)"
+msgstr "Szélesség (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "Magass�g (%)"
+msgstr "Magasság (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Inform�ci� felt�ntet�s�nek id�tartama"
+msgstr "Információ feltűntetésének időtartama"
 
 msgid "Setup.OSD$Use small font"
-msgstr "Kisbet�t haszn�lni"
+msgstr "Kisbetűt használni"
 
 msgid "Setup.OSD$Anti-alias"
 msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr "Alap�rtelmezett bet�tipus"
+msgstr "Alapértelmezett betűtipus"
 
 msgid "Setup.OSD$Small font"
-msgstr "Kis bet�tipus"
+msgstr "Kis betűtipus"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "K�t�tt bet�tipus"
+msgstr "Kötött betűtipus"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Alap�rtelmezett bet�tipus m�ret (%)"
+msgstr "Alapértelmezett betűtipus méret (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Kis bet�tipus m�ret (%)"
+msgstr "Kis betűtipus méret (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "K�t�tt bet�tipus m�ret (%)"
+msgstr "Kötött betűtipus méret (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Ad�sinform�ci� pozici�ja"
+msgstr "Adásinformáció poziciója"
 
 msgid "bottom"
 msgstr "lent"
@@ -826,64 +827,64 @@ msgid "top"
 msgstr "Fent"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Ad�sinform�ci� felt�ntet�s�nek id�tartama (s)"
+msgstr "Adásinformáció feltűntetésének időtartama (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Inform�ci� az ad� v�lt�s�n�l"
+msgstr "Információ az adó váltásánál"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "A lek�rdezett ad�sinform�ci� bez�r�sa"
+msgstr "A lekérdezett adásinformáció bezárása"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Oldalank�nt l�ptetni"
+msgstr "Oldalanként léptetni"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Korl�tlan l�ptet�s"
+msgstr "Korlátlan léptetés"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "A men� gomb z�r"
+msgstr "A menü gomb zár"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Felv�telek list�ja"
+msgstr "Felvételek listája"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "K�nyvt�rv�laszt�s az id�z�t� men�ben"
+msgstr "Könyvtárválasztás az időzítő menüben"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr "Sz�mgombok a bet�k�n"
+msgstr "Számgombok a betűkön"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Színes gomb 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Színes gomb 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Színes gomb 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Színes gomb 3"
 
 msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "EPG keres�s"
+msgstr "EPG keresés"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Fennmaradt id� az EPG-friss�t�sig (�)"
+msgstr "Fennmaradt idő az EPG-frissítésig (ó)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Hibaelh�r�t�s szintje"
+msgstr "Hibaelhárítás szintje"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Eltelt EPG adatok kijelz�se (perc)"
+msgstr "Eltelt EPG adatok kijelzése (perc)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "�ra �ll�t�sa TP id�h�z"
+msgstr "Óra állítása TP időhöz"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Id�h�z tartoz� Transponder"
+msgstr "Időhöz tartozó Transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -900,25 +901,25 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "k�pk�z�p kiv�g�s"
+msgstr "képközép kivágás"
 
 msgid "no"
 msgstr "nem"
 
 msgid "names only"
-msgstr "kiz�r�lag nevek"
+msgstr "kizárólag nevek"
 
 msgid "PIDs only"
-msgstr "kiz�r�lag PIDek"
+msgstr "kizárólag PIDek"
 
 msgid "names and PIDs"
-msgstr "nevek �s PIDek"
+msgstr "nevek és PIDek"
 
 msgid "add new channels"
-msgstr "�j ad�k hozz�ad�sa"
+msgstr "új adók hozzáadása"
 
 msgid "add new transponders"
-msgstr "�j transponderek hozz�ad�sa"
+msgstr "új transponderek hozzáadása"
 
 msgid "DVB"
 msgstr "DVB"
@@ -930,31 +931,31 @@ msgid "Button$Subtitles"
 msgstr "Feliratok"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "Els� DVB interface"
+msgstr "Első DVB interface"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Vételi norma"
 
 msgid "Setup.DVB$Video format"
-msgstr "Video form�tum"
+msgstr "Video formátum"
 
 msgid "Setup.DVB$Video display format"
-msgstr "K�perny�form�tum"
+msgstr "Képernyőformátum"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "Dolby-Digital hangot haszn�lni"
+msgstr "Dolby-Digital hangot használni"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Ad�k aktualiz�l�sa"
+msgstr "Adók aktualizálása"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "Hangs�v nyelvek"
+msgstr "Hangsáv nyelvek"
 
 msgid "Setup.DVB$Audio language"
-msgstr "Hangs�v nyelv"
+msgstr "Hangsáv nyelv"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Felirat l�that�"
+msgstr "Felirat látható"
 
 msgid "Setup.DVB$Subtitle languages"
 msgstr "Felirat nyelvek"
@@ -963,295 +964,294 @@ msgid "Setup.DVB$Subtitle language"
 msgstr "Felirat nyelv"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Felirat eltol�sa"
+msgstr "Felirat eltolása"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Felirat transzparenci�ja"
+msgstr "Felirat transzparenciája"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Felirat h�tter�nek transzparenci�ja"
+msgstr "Felirat hátterének transzparenciája"
 
 msgid "LNB"
 msgstr "LNB"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "DiSEqC haszn�lata"
+msgstr "DiSEqC használata"
 
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Als� LNB-frekvencia (MHz)"
+msgstr "Alsó LNB-frekvencia (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Fels� LNB-frekvencia (MHz)"
+msgstr "Felső LNB-frekvencia (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Fejkábel a %d. tunerhez"
 
-#, fuzzy
 msgid "Setup.LNB$own"
-msgstr "DiSEqC haszn�lata"
+msgstr "saját"
 
 msgid "CAM reset"
-msgstr "CAM �jraind�t�s"
+msgstr "CAM újraindítás"
 
 msgid "CAM present"
 msgstr "CAM jelen"
 
 msgid "CAM ready"
-msgstr "CAM m�k�dik"
+msgstr "CAM működik"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Menu"
-msgstr "Men�"
+msgstr "Menü"
 
 msgid "Button$Reset"
 msgstr "Reset"
 
 msgid "Opening CAM menu..."
-msgstr "A CAM men� nyit�sa..."
+msgstr "A CAM menü nyitása..."
 
 msgid "Can't open CAM menu!"
-msgstr "A CAM men� nem nyithat�"
+msgstr "A CAM menü nem nyitható"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM haszn�latban - val�ban �jraind�tjuk?"
+msgstr "CAM használatban - valóban újraindítjuk?"
 
 msgid "Can't reset CAM!"
-msgstr "A CAM �jraind�t�s nem siker�lt"
+msgstr "A CAM újraindítás nem sikerült"
 
 msgid "do not pause live video"
-msgstr "�l�k�p le�ll�t�sa tiltva"
+msgstr "élőkép leállítása tiltva"
 
 msgid "confirm pause live video"
-msgstr "�l�k�p le�ll�t�sa meger�s�t�ssel"
+msgstr "élőkép leállítása megerősítéssel"
 
 msgid "pause live video"
-msgstr "�l�k�p le�ll�t�sa"
+msgstr "élőkép leállítása"
 
 msgid "confirm"
-msgstr "meger�s�t�s"
+msgstr "megerősítés"
 
 msgid "yes"
 msgstr "igen"
 
 msgid "Recording"
-msgstr "Felv�tel"
+msgstr "Felvétel"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Id�eltol�s a kezd�sn�l (perc)"
+msgstr "Időeltolás a kezdésnél (perc)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Id�eltol�s a befejez�sn�l (perc)"
+msgstr "Időeltolás a befejezésnél (perc)"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Alap�rtelmezett priorit�s"
+msgstr "Alapértelmezett prioritás"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Alap�rtelmezett �lettartam"
+msgstr "Alapértelmezett élettartam"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "A sz�net gomb m�k�d�se"
+msgstr "A szünet gomb működése"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Id�eltol�s priorit�sa"
+msgstr "Időeltolás prioritása"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Id�eltol�s �lettartama"
+msgstr "Időeltolás élettartama"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Epiz�dn�v"
+msgstr "Epizódnév"
 
 msgid "Setup.Recording$Use VPS"
 msgstr "VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "Id�eltol�s VPS-n�l (mp)"
+msgstr "Időeltolás VPS-nél (mp)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Direktfelv�tel megjel�l�se"
+msgstr "Direktfelvétel megjelölése"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Direktfelv�tel megnevez�se"
+msgstr "Direktfelvétel megnevezése"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Direktfelv�tel id�tartama (perc)"
+msgstr "Direktfelvétel időtartama (perc)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "Most futó műsor"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Max. video file m�ret (MB)"
+msgstr "Max. video file méret (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Feldolgozott file-ok feloszt�sa"
+msgstr "Feldolgozott file-ok felosztása"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "Id�eltol�sos felv�tel t�rl�se"
+msgstr "Időeltolásos felvétel törlése"
 
 msgid "Replay"
-msgstr "Lej�tsz�s"
+msgstr "Lejátszás"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "T�bsebess�ges funkci�"
+msgstr "Töbsebességes funkció"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Lej�tsz�s felt�ntet�se"
+msgstr "Lejátszás feltüntetése"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Hátralevő idő kijelzése"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Lejátszósáv felüntetésének ideje (mp)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "A visszajátszás megállítása vágópont kijelölésnél"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "Lej�tsz�s ID"
+msgstr "Lejátszás ID"
 
 msgid "Miscellaneous"
-msgstr "Egy�b"
+msgstr "Egyéb"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "VDR le�ll ha nem k�vetkezik felv�tel (p)"
+msgstr "VDR leáll ha nem következik felvétel (p)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "VDR le�ll haszn�lat n�lk�l (perc)"
+msgstr "VDR leáll használat nélkül (perc)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "SVDRP sz�tkapcsol haszn�lat n�lk�l(s)"
+msgstr "SVDRP szétkapcsol használat nélkül(s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Ad�sv�lt�s ideje (s)"
+msgstr "Adásváltás ideje (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Csatornav�lt�s timeout (ms)"
+msgstr "Csatornaváltás timeout (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Távirányító ismétlés késleltetése (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Távirányító ismétlés deltája (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Csatorna indul�skor"
+msgstr "Csatorna induláskor"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "ahogy az el�bb"
+msgstr "ahogy az előbb"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "Hanger� indul�sn�l"
+msgstr "Hangerő indulásnál"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "Csatornalista g�rget�se"
+msgstr "Csatornalista görgetése"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Csatornanevek kijelzése forrással együtt"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "V�szle�ll�t�s"
+msgstr "Vészleállítás"
 
 msgid "Plugins"
 msgstr "Plugins"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ennek a plugin-nak nincs setup-param�tere!"
+msgstr "Ennek a plugin-nak nincs setup-paramétere!"
 
 msgid "Setup"
-msgstr "Be�ll�t�sok"
+msgstr "Beállítások"
 
 msgid "Restart"
-msgstr "�jraind�t�s"
+msgstr "Újraindítás"
 
 msgid "Really restart?"
-msgstr "T�nyleg �jraind�tani?"
+msgstr "Tényleg újraindítani?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " Felv�telt befejezni "
+msgstr " Felvételt befejezni "
 
 msgid "Schedule"
-msgstr "M�sor�js�g"
+msgstr "Műsorújság"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " Lej�tsz�st befejzni"
+msgstr " Lejátszást befejzni"
 
 msgid "Button$Pause"
-msgstr "Sz�net"
+msgstr "Szünet"
 
 msgid "Button$Stop"
 msgstr "Stop"
 
 msgid "Button$Resume"
-msgstr "Tov�bb"
+msgstr "Tovább"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " V�g�st megszak�tani"
+msgstr " Vágást megszakítani"
 
 msgid "Stop recording?"
-msgstr "Felv�tel befejezni?"
+msgstr "Felvétel befejezni?"
 
 msgid "Cancel editing?"
-msgstr "V�g�st befejezni?"
+msgstr "Vágást befejezni?"
 
 msgid "No audio available!"
-msgstr "Hang nem lehets�ges!"
+msgstr "Hang nem lehetséges!"
 
 msgid "No subtitles"
 msgstr "Felirat ki"
 
 msgid "No subtitles available!"
-msgstr "A csatorn�n nincs felirat!"
+msgstr "A csatornán nincs felirat!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Nincs elegend� hely a felv�telre"
+msgstr "Nincs elegendő hely a felvételre"
 
 msgid "No free DVB device to record!"
-msgstr "Nincs szabad DVB k�rtya a felv�telhez!"
+msgstr "Nincs szabad DVB kártya a felvételhez!"
 
 msgid "Pausing live video..."
-msgstr "Az �l� ad�s meg�ll�tva..."
+msgstr "Az élő adás megállítva..."
 
 msgid "Delete timeshift recording?"
-msgstr "T�r�ljem az id�eltol�sos felv�telt?"
+msgstr "Töröljem az időeltolásos felvételt?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Ugr�s ide: "
+msgstr "Ugrás ide: "
 
 msgid "No editing marks defined!"
-msgstr "Nincs v�g�pont kijel�lve"
+msgstr "Nincs vágópont kijelölve"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nincs vágórész kijelölve"
 
 msgid "Can't start editing process!"
-msgstr "A v�g�s nem ind�that�!"
+msgstr "A vágás nem indítható!"
 
 msgid "Editing process started"
-msgstr "V�g�s elind�tva"
+msgstr "Vágás elindítva"
 
 msgid "Editing process already active!"
-msgstr "A v�g�s m�r akt�v!"
+msgstr "A vágás már aktív!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a�bcde�fghi�jklmno���pqrstu���vwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " aábcdeéfghiíjklmnoóöőpqrstuúüűvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\ta�bc2\tde�f3\tghi�4\tjkl5\tmno���6\tpqrs7\ttu���v8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\taábc2\tdeéf3\tghií4\tjkl5\tmnoóöő6\tpqrs7\ttuúüűv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr "�t�rni"
+msgstr "Átírni"
 
 msgid "Button$Insert"
 msgstr "Beilleszteni"
@@ -1260,76 +1260,76 @@ msgid "Plugin"
 msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Fel/Le egy �j opci��rt - azt�n OK"
+msgstr "Fel/Le egy új opcióért - aztán OK"
 
 msgid "Channel locked (recording)!"
-msgstr "Az ad� blokkolva (felv�tel)!"
+msgstr "Az adó blokkolva (felvétel)!"
 
 msgid "Low disk space!"
 msgstr "A merevlemez majdnem tele!"
 
 msgid "Regenerating index file"
-msgstr "Az index file �jragener�l�sa"
+msgstr "Az index file újragenerálása"
 
 msgid "Index file regeneration complete"
-msgstr "Index file �jragener�l�sa k�sz."
+msgstr "Index file újragenerálása kész."
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Index file újragenerálása sikertelen!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "A le�ll�t�s nem lehets�ges - Opci� '-s' hi�nyzik!"
+msgstr "A leállítás nem lehetséges - Opció '-s' hiányzik!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Szerkeszt�s folyamatban - val�ban le�ll�tjuk?"
+msgstr "Szerkesztés folyamatban - valóban leállítjuk?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Felv�tel folyamatban van - m�gis kikapcsolni?"
+msgstr "Felvétel folyamatban van - mégis kikapcsolni?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Felv�tel %ld perc mulva kezd�dik - m�gis kikapcsolni?"
+msgstr "Felvétel %ld perc mulva kezdődik - mégis kikapcsolni?"
 
 msgid "shut down anyway?"
-msgstr "m�gis kikapcsolni?"
+msgstr "mégis kikapcsolni?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "A(z) %s plugin  �breszt %ld perc m�lva, folytatjuk?"
+msgstr "A(z) %s plugin  ébreszt %ld perc múlva, folytatjuk?"
 
 msgid "Editing - restart anyway?"
-msgstr "Szerkeszt�s folyamatban - val�ban �jraind�tjuk?"
+msgstr "Szerkesztés folyamatban - valóban újraindítjuk?"
 
 msgid "Recording - restart anyway?"
-msgstr "Felv�tel folyamatban van - m�gis �jraind�tani?"
+msgstr "Felvétel folyamatban van - mégis újraindítani?"
 
 msgid "restart anyway?"
-msgstr "m�gis �jraind�tani?"
+msgstr "mégis újraindítani?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "Hanger� "
+msgstr "Hangerő "
 
 msgid "Classic VDR"
 msgstr "Klasszikus VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "LEMEZ"
 
 msgid "LOAD"
-msgstr ""
+msgstr "TERHELÉS"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "IDŐZÍTŐK"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "TUNEREK"
 
 msgid "LIVE"
-msgstr ""
+msgstr "ÉLŐ"
 
 msgid "PLAY"
-msgstr ""
+msgstr "LEJÁTSZÁS"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzol"
@@ -1340,10 +1340,10 @@ msgstr "HKSCPSV"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "H�tKedSzeCs�P�nSzoVas"
+msgstr "HétKedSzeCsüPénSzoVas"
 
 msgid "Monday"
-msgstr "H�tf�"
+msgstr "Hétfő"
 
 msgid "Tuesday"
 msgstr "Kedd"
@@ -1352,47 +1352,47 @@ msgid "Wednesday"
 msgstr "Szerda"
 
 msgid "Thursday"
-msgstr "Cs�t�rt�k"
+msgstr "Csütörtök"
 
 msgid "Friday"
-msgstr "P�ntek"
+msgstr "Péntek"
 
 msgid "Saturday"
 msgstr "Szombat"
 
 msgid "Sunday"
-msgstr "Vas�rnap"
+msgstr "Vasárnap"
 
 msgid "Upcoming recording!"
-msgstr "Felv�tel r�gt�n indul!"
+msgstr "Felvétel rögtön indul!"
 
 msgid "Pause live video?"
-msgstr "Meg�ll�tsam az �l� k�pet?"
+msgstr "Megállítsam az élő képet?"
 
 msgid "Recording started"
-msgstr "A felv�tel elind�tva"
+msgstr "A felvétel elindítva"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "A VDR k�s�bb fog le�llni - Kikapcs gombbal k�nyszer�tett le�ll�t�s"
+msgstr "A VDR később fog leállni - Kikapcs gombbal kényszerített leállítás"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Nyomj egy gombot a le�ll�s megszak�t�s�hoz"
+msgstr "Nyomj egy gombot a leállás megszakításához"
 
 msgid "Switching primary DVB..."
-msgstr "Els�dleges DVB k�rtya v�lt�sa folyamatban..."
+msgstr "Elsődleges DVB kártya váltása folyamatban..."
 
 msgid "Editing process failed!"
-msgstr "V�g�s sikertelen!"
+msgstr "Vágás sikertelen!"
 
 msgid "Editing process finished"
-msgstr "V�g�s befejezve"
+msgstr "Vágás befejezve"
 
 msgid "Press any key to cancel restart"
-msgstr "Nyomj egy gombot az �jraind�t�s megszak�t�s�hoz"
+msgstr "Nyomj egy gombot az újraindítás megszakításához"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "A VDR le�ll %s perc m�lva"
+msgstr "A VDR leáll %s perc múlva"
 
 msgid "Disk"
 msgstr "Lemez"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ab16a2afc..c95b22aa8 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -4,16 +4,16 @@
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003, 2005
 # Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
-# Carel Willemse <ca_willemse@planet.nl>, 2008
+# Carel Willemse <carel@nekanali.nl>, 2008, 2013
 # Johan Schuring <johan.schuring@vetteblei.nl>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.38\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
-"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
+"Last-Translator: Carel Willemse <carel@nekanali.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgid "off"
 msgstr "uit"
 
 msgid "on"
-msgstr ""
+msgstr "aan"
 
 msgid "auto"
 msgstr "auto"
@@ -45,7 +45,7 @@ msgid "Polarization"
 msgstr "Polarisatie"
 
 msgid "System"
-msgstr ""
+msgstr "Systeem"
 
 msgid "Srate"
 msgstr "Srate"
@@ -75,254 +75,254 @@ msgid "Hierarchy"
 msgstr "Hierarchie"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detective/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Avontuur/Western/Oorlog"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Science Fiction/Fantasie/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Comedie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Soap/Melodrama/Folklore"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romantisch"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Verdieping/Klassiek/Religieus/Historische film/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Volwassenen/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Nieuws/Laatste nieuws"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Nieuws/Weersverwachting"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Nieuwsbulletin"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documentaire"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussie/Interview/Debat"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Show/Gameshow"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Gameshow/Quiz/Wedstrijd"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Vari�teitenprogramma"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Praatprogramma"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sportprogramma"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Speciale uitzending"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Sportmagazine"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Voetbal/Soccer"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Teamsporten"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Athletiek"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Motorsport"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Watersport"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Wintersport"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equestrian"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Vechtsport"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Kinderprogramma/Jongerenprogramma"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Kleuter TV"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Kinderprogramma voor 6 tot 14 jarigen"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Kinderprogramma voor 10 tot 16 jarigen"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "School TV"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Cartoons/Tekenfilms"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Muziek/Ballet/Dans"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Serieuze muziek/Klassieke muziek"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/Traditionele muziek"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Kunst/Cultuur"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Toneel"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Kleinkunst"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religie"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Populaire cultuur/Traditionele kunst"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatuur"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Bioscoop"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Experimentele film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Nieuwsfeed/Pers"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nieuwe media"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Kunst/Cultureel magazine"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Mode"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Sociaal/Politiek/Economie"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazine/Bericht/Documentaire"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Economie/Sociaal advies"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Bekende mensen"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Onderwijs/Wetenschap/Faculteit"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Natuur/Dierenrijk/Milieu"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technologie/Biologie"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Pharmacie/Physiologie/Psychologie"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Buitenland/Expedities"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Sociale/Spiritualiteit"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Verdiepend onderwijs"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Talen"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Vrije tijd/Hobbies"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Toerisme/Reizen"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Handenarbeid"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motoren"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness & Gezondheid"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Koken"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reclame/Winkelen"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Tuinieren"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Oorspronkelijke taal"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Zwart-wit"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Ongepubliceerd"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Live uitzending"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "from %d"
 
 msgid "No title"
 msgstr "Geen titel"
@@ -415,7 +415,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Weergeven/Pauze"
 
 msgid "Key$Play"
 msgstr "Weergeven"
@@ -469,7 +469,7 @@ msgid "Key$Subtitles"
 msgstr "Ondertiteling"
 
 msgid "Key$Schedule"
-msgstr "ProgrammaGids"
+msgstr "Programmagids"
 
 msgid "Key$Channels"
 msgstr "Kanalen"
@@ -592,29 +592,29 @@ msgid "Delete channel?"
 msgstr "Kanaal verwijderen?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Bewerk map"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nieuwe map"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Submap"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Map bestaat al"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Map mag geen karakter '%c' bevatten!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Kies"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Map en alle submappen verwijderen?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Map verwijderen?"
 
 msgid "Edit timer"
 msgstr "Timer veranderen"
@@ -647,19 +647,19 @@ msgid "File"
 msgstr "Bestandnaam"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Map"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Eenmalig"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Herhalen"
 
 msgid "First day"
 msgstr "Eerste dag"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Kies map"
 
 msgid "Timers"
 msgstr "Timers"
@@ -749,7 +749,7 @@ msgid "Delete recording?"
 msgstr "Opname verwijderen?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Opname wordt bewerkt - werkelijk verwijderen?"
 
 msgid "Error while deleting recording!"
 msgstr "Fout bij verwijderen opname!"
@@ -848,22 +848,22 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Opname mappen"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Mappen in timermenu"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Nummertoetsen voor karakters"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Gekleurde toets 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Gekleurde toets 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Gekleurde toets 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Gekleurde toets 3"
 
 msgid "EPG"
 msgstr "EPG"
@@ -934,7 +934,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Eerste DVB kaart"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standaard functionaliteit"
 
 msgid "Setup.DVB$Video format"
 msgstr "Videoformaat"
@@ -989,10 +989,10 @@ msgstr "Hoogste LNB frequentie (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Apparaat %d verbionden met sat. kabel"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "eigen"
 
 msgid "CAM reset"
 msgstr "CAM herstarten"
@@ -1025,16 +1025,16 @@ msgid "Can't reset CAM!"
 msgstr "Kan CAM niet herstarten!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "live video niet pauzeren"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "bevestig pauzeren live video"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pauzeer live video"
 
 msgid "confirm"
-msgstr ""
+msgstr "bevestig"
 
 msgid "yes"
 msgstr "ja"
@@ -1055,7 +1055,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standaard levensduur (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gedrag pauze toets"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Pauze prioriteit"
@@ -1082,7 +1082,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Duur van de directe opname (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "huidige aflevering"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximale omvang video file (MB)"
@@ -1091,7 +1091,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Bewerkte files opdelen"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Verwijder time-shift opname"
 
 msgid "Replay"
 msgstr "Afspelen"
@@ -1103,13 +1103,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Weergave mode aangeven"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Toon resterende tijd"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Verlopen tijd tijd (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pauzeer wanneer markering wordt geplaatst"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
@@ -1133,10 +1133,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Tijdsduur kanaalinvoer (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Afstandbediening herhalingsvertraging (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Afstandbediening herhalingsinterval (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Opstartkanaal"
@@ -1148,10 +1148,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Opstartvolume"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Doorscrollen kanalenlijst"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Toon kanaalnamen met bron"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Nooduitgang"
@@ -1220,7 +1220,7 @@ msgid "Pausing live video..."
 msgstr "Pauzeren live uitzending..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Verwijder timeshift opname?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1230,7 +1230,7 @@ msgid "No editing marks defined!"
 msgstr "Geen bewerkingsmarkeringen gedefinieerd!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Geen opeenvolgende bewerkingen aanwezig!"
 
 msgid "Can't start editing process!"
 msgstr "Kan niet beginnen met bewerken!"
@@ -1269,13 +1269,13 @@ msgid "Low disk space!"
 msgstr "Hardeschijf bijna vol!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Indexbestand wordt geregenereerd"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Regenaratie indexbestand gereed"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Regeneratie indexbestand mislukt!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!"
@@ -1314,22 +1314,22 @@ msgid "Classic VDR"
 msgstr "VDR Klassiek"
 
 msgid "DISK"
-msgstr ""
+msgstr "SCHIJF"
 
 msgid "LOAD"
-msgstr ""
+msgstr "LAADT"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TIMERS"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "APPARATEN"
 
 msgid "LIVE"
-msgstr ""
+msgstr "LIVE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "AFSPELEN"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Consoles"
@@ -1367,7 +1367,7 @@ msgid "Upcoming recording!"
 msgstr "Opname start binnenkort!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Pauzeer live video?"
 
 msgid "Recording started"
 msgstr "Opname is gestart!"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 1580b0bb5..351e59f74 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
+# Marek Nazarko <mnazarko@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
@@ -10,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
-"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
+"Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +31,7 @@ msgid "off"
 msgstr "wy��cz"
 
 msgid "on"
-msgstr ""
+msgstr "w��cz"
 
 msgid "auto"
 msgstr "auto"
@@ -42,7 +43,7 @@ msgid "Polarization"
 msgstr "Polaryzacja"
 
 msgid "System"
-msgstr ""
+msgstr "System"
 
 msgid "Srate"
 msgstr "Srate"
@@ -72,254 +73,254 @@ msgid "Hierarchy"
 msgstr "Hierarchia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Dramat"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Krymina�/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Przygodowy/Western/Wojenny"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Fantastyczny/Fantasy/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Komedie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Opera mydlana/Melodramat/Folklor"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romans"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Powa�ne/Klasyczne/Religijne/Historyczne/Dramaty"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Filmy dla doros�ych/Dramaty"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Wiadomo�ci/Informacje"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Prognoza pogody"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Magazyny informacyjne"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokumentalne"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Dyskusje/Wywiady/Debaty"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Pokazy gier"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Pokazy gier/Quizy/Konkursy"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Rewie"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talkshow"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Specjalne wydarzenia"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Magazyny sportowe"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Pi�ka no�na"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Sporty zespo�owe"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Lekkoatletyka"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Sporty motorowe"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Sporty wodne"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Sporty zimowe"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Jazda konna"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Sporty walki"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Dzieci�ce"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Przedszkolne"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programy dla dzieci od 6 do 14 lat"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programy dla dzieci od 10 do 16 lat"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Infromacyjne/Edukacyjne/Szkolne"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Kresk�wki/Kukie�kowe"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Muzyka/Balet/Taniec"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Muzyka klasyczna"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/Muzyka tradycyjna"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Sztuka/Kultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Rzemios�o"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Dzie�a sztuki"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religia"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Sztuka ludowa"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Kino"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Filmy eksperymentalne/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Radio/Prasa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nowe media"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Magzyny kulturalne"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Spo�eczne/Polityka/Ekonomia"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Reporta�e/Dokumentalne"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomia"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "S�awni ludzie"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Edukacja/Nauka"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Natura/Zwierz�ta/�rodowisko"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technologia/Nauki przyrodnicze"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medycyna/Fizjologia/Psychologia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Obce kraje/Wyprawy"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Spo�eczne/Duchowe"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Dalsza edukacja"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "J�zyki"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Czas wolny/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turystyka/Podr�e"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "R�kodzie�o"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Automobilizm"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness i zdrowie"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Gotowanie"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reklama/Zakupy"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Ogrody"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Oryginalny j�zyk"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Czarne i bia�e"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Niepublikowane"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Transmisje na �ywo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "od %d"
 
 msgid "No title"
 msgstr "Bez tytu�u"
@@ -412,7 +413,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Odtw�rz/Pauza"
 
 msgid "Key$Play"
 msgstr "Odtw�rz"
@@ -589,29 +590,29 @@ msgid "Delete channel?"
 msgstr "Usun�� kana�?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Edutuj katalog"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nowy katalog"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Podkatalog"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Taka nazwa katalogu juz istnieje"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Folder nie mo�e zawiera� '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Wybierz"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Czy skasowa� katalog i wszystkie podkatalogi?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Czy skasowa� katalog?"
 
 msgid "Edit timer"
 msgstr "Edycja timera"
@@ -644,19 +645,19 @@ msgid "File"
 msgstr "Plik"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Katalog"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Pojedynczy"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Powtarzanie"
 
 msgid "First day"
 msgstr "Pierwszy dzie�"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Wybierz katalog"
 
 msgid "Timers"
 msgstr "Timery"
@@ -746,10 +747,10 @@ msgid "Delete recording?"
 msgstr "Usun�� nagranie?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Nagranie jest edytowane - jeste� pewien �e chcesz je usun��?"
 
 msgid "Error while deleting recording!"
-msgstr "Bl�d podczas usuwania nagrania!"
+msgstr "B��d podczas usuwania nagrania!"
 
 msgid "Recording commands"
 msgstr "Polecenia nagra�"
@@ -845,22 +846,22 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Katalogi nagra�"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Katalogi w menu timera"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Klawisze numeryczne dla liter"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Kolor klawisza 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Kolor klawisza 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Kolor klawisza 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Kolor klawisza 3"
 
 msgid "EPG"
 msgstr "EPG"
@@ -931,7 +932,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pierwszy interfejs DVB"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Zgodno�� ze standardem"
 
 msgid "Setup.DVB$Video format"
 msgstr "Format obrazu"
@@ -986,10 +987,10 @@ msgstr "G
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Urz�dzenie %d pod��czone do kabla satelitarnego"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "W�asny"
 
 msgid "CAM reset"
 msgstr "CAM zresetowany"
@@ -1022,16 +1023,16 @@ msgid "Can't reset CAM!"
 msgstr "Nie mo�na zresetowa� CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "nie wstrzymuj transmisji na �ywo"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "potwierd� wstrzymanie transmisji na �ywo"
 
 msgid "pause live video"
-msgstr ""
+msgstr "wstrzymaj transmisj� na �ywo"
 
 msgid "confirm"
-msgstr ""
+msgstr "potwierd�"
 
 msgid "yes"
 msgstr "tak"
@@ -1052,7 +1053,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Domy�lny czas �ycia (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Obs�uga klawisza pauzy"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorytet pauzy"
@@ -1079,7 +1080,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Czas natychm. nagrywania (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "aktualne zdarzenie"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maksymalny rozmiar pliku (MB)"
@@ -1088,7 +1089,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Dziel edytowane pliki"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Usu� nagranie timeshift"
 
 msgid "Replay"
 msgstr "Odtwarzanie"
@@ -1100,13 +1101,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Pokazuj tryb odtwarzania"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Poka� pozosta�y czas"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Wy�wietl czas odtwarzania (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Wstrzymaj odtwarzanie podczas ustawiania zaznaczania"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
@@ -1130,10 +1131,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Min�� czas wej�cia do kana�u"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Czas op�nienia powtarzania dla pilota (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Delta op�nienia powtarzania dla pilota (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Pocz�tkowy kana�"
@@ -1145,10 +1146,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Zawijanie kana��w"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Poka� nazwy kana��w ze �r�d�em"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Wyj�cie awaryjne"
@@ -1217,7 +1218,7 @@ msgid "Pausing live video..."
 msgstr "Pauzuj� program na �ywo..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Czy usun�� nagranie timeshift?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1227,7 +1228,7 @@ msgid "No editing marks defined!"
 msgstr "Nie zdefiniowano znacznik�w monta�u!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nie zdefiniowano sekwencji edycji!"
 
 msgid "Can't start editing process!"
 msgstr "Nie mo�na uruchomi� procesu edycji!"
@@ -1266,13 +1267,13 @@ msgid "Low disk space!"
 msgstr "Ma�o miejsca na dysku!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Odtwarzanie pliku z indeksem"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Odtwarzanie pliku z indeksem zako�czone"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Odtwarzanie pliku z indeksem nieudane!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
@@ -1311,22 +1312,22 @@ msgid "Classic VDR"
 msgstr "Klasyczny VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DYSK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "OBCI��ENIE"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TIMERY"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "URZ�DZENIA"
 
 msgid "LIVE"
-msgstr ""
+msgstr "NA �YWO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "ODTWARZA"
 
 msgid "ST:TNG Panels"
 msgstr "Panel ST:TNG"
@@ -1364,7 +1365,7 @@ msgid "Upcoming recording!"
 msgstr "Wkr�tce nagranie!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Zatrzyma� transmisj� na �ywo?"
 
 msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 9bcf571fc..3f4f98495 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004, 2005
-# Oleg Roitburd <oleg@roitburd.de>, 2005, 2006, 2007, 2008
+# Oleg Roitburd <oroitburd@gmail.com>, 2005-2008, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2008-12-15 14:37+0100\n"
-"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
+"PO-Revision-Date: 2013-03-03 13:43+0100\n"
+"Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -75,251 +75,251 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "�����/�����"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "��������/�������"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "�����������/�������/�����"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "������� ����������/��������/����"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "�������"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "������� �����/���������/��������"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "���������"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "�����������/��������/�����������/������������ �����/�����"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "����� ��� ��������/�����"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "�������/��������� �������"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "�������/������"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "��������� ������"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "������������"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "���������/��������/������"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "���/������� ���"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "������� ���/���������/������������"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "��������"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "������"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "�����"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "��������� �������"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "����� ������"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "������"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "������/�����"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "���������� ���� ������"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "��������"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "����������"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "������ ���� ������"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "������ ���� ������"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "������ �����"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "������ ���������"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "�������/��������� ���������"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "��������� ��� ������������"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "��������������� ��������� �� 6 �� 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "��������������� ��������� �� 10 �� 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "��������������/���������������/�������� ���������"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "�������������/�����"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "������/�����/�����"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "���/���"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "������������ ������"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "��������/������������ ������"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "����"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "������/�����"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "�����"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "���������/��������"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "�������������"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "������� ���������"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "�������"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "�����������/������������ ��������"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "����������"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "�����/�����"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "����������������� �����/�����"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "������� �������/������"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "����� ��������"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "���������/���������� ������"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "����"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "����������/������������/�������������"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "������/���������/������������"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "���������/��������������"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "���������� ����"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "�����������/�����/�����"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "�������/��������/���������"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "����������/������������ �����"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "��������/����������/����������"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "������/����������"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "����������/������������� �����"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "��������� ������������"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "�����"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "��������� �����/�����"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "������/�����������"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "�������"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "�����"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "������ � ��������"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "���������"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "�������/�������"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "�����������"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "������������ ����"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "����������"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "����������������"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "������ �������"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "�� %d"
 
 msgid "No title"
 msgstr "��� ��������"
@@ -412,7 +412,7 @@ msgid "Key$Info"
 msgstr "����"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "���������������/�����"
 
 msgid "Key$Play"
 msgstr "���������������"
@@ -589,29 +589,29 @@ msgid "Delete channel?"
 msgstr "������� �����?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "�������� ����������"
 
 msgid "New folder"
-msgstr ""
+msgstr "����� ����������"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "�������������"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "���������� ��� ����������!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "��� ���������� �� ������ ��������� '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "�������"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "������� ���������� � ��� �������������?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "������� ����������?"
 
 msgid "Edit timer"
 msgstr "��������� �������"
@@ -644,19 +644,19 @@ msgid "File"
 msgstr "����"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "����������"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "���� ���"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "������"
 
 msgid "First day"
 msgstr "������ ����"
 
 msgid "Select folder"
-msgstr ""
+msgstr "����� ����������"
 
 msgid "Timers"
 msgstr "�������"
@@ -746,7 +746,7 @@ msgid "Delete recording?"
 msgstr "������� ������?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "������ �������� - ������������� �������?"
 
 msgid "Error while deleting recording!"
 msgstr "������ �������� ������!"
@@ -845,22 +845,22 @@ msgid "Setup.OSD$Recording directories"
 msgstr "�������� �������� �������"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "���������� � ���� ������"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "���������� ������ ��� ��������"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "������� ������ 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "������� ������ 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "������� ������ 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "������� ������ 3"
 
 msgid "EPG"
 msgstr "�������"
@@ -931,7 +931,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "�������� DVB-����������"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "����������� ���������"
 
 msgid "Setup.DVB$Video format"
 msgstr "������ �����"
@@ -986,10 +986,10 @@ msgstr "
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "���������� %d ����������� � ���������"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "����"
 
 msgid "CAM reset"
 msgstr "CAM ����������"
@@ -1022,16 +1022,16 @@ msgid "Can't reset CAM!"
 msgstr "������ ����������� CAM-������!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "�� ������������� live video"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "������������� ��������� live video"
 
 msgid "pause live video"
-msgstr ""
+msgstr "��������� live video"
 
 msgid "confirm"
-msgstr ""
+msgstr "�������������"
 
 msgid "yes"
 msgstr "��"
@@ -1052,7 +1052,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "���� �������� ������ �� ��������� (�)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "������� ������ �����"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "��������� ����������� ���������"
@@ -1079,7 +1079,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "������������ ������ ������ (���)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "������� ��������"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "����. ������ ���������� (��)"
@@ -1088,7 +1088,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "������ ����������������� �����"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "�������� ���������� ������"
 
 msgid "Replay"
 msgstr "���������������"
@@ -1100,13 +1100,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "���������� ����� ���������������"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "����� ����������� �������"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "����� ��������� (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "����� ��� ��������� ����������"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ���������������"
@@ -1130,10 +1130,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "������ ������� ��� ����� ������ (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "�������� ������ �� ������ (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "�������� ������ �� ������ (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "����� ��� ���������"
@@ -1145,10 +1145,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��������� ��� ���������"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "��������� �������"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "����� ����� ������ � ���������"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "��������� �����"
@@ -1217,7 +1217,7 @@ msgid "Pausing live video..."
 msgstr "����� ����������� ���������..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "������� ���������� ������?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1227,7 +1227,7 @@ msgid "No editing marks defined!"
 msgstr "�� ������ ����� ��� �������!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "������� �������������� �� ���������!"
 
 msgid "Can't start editing process!"
 msgstr "���������� ������ ������ ������!"
@@ -1266,13 +1266,13 @@ msgid "Low disk space!"
 msgstr "������������ ����� �� �����!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "����������� ���������� �����"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "����������� ���������� ����� ��������"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "������ ����������� ���������� ����� "
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "���������� ���������� - �� ����� �������� '-s'!"
@@ -1311,22 +1311,22 @@ msgid "Classic VDR"
 msgstr "������������"
 
 msgid "DISK"
-msgstr ""
+msgstr "����"
 
 msgid "LOAD"
-msgstr ""
+msgstr "�������������"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "�������"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "����������"
 
 msgid "LIVE"
-msgstr ""
+msgstr "LIVE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "���������������"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG ������"
@@ -1364,7 +1364,7 @@ msgid "Upcoming recording!"
 msgstr "������ ����� ��������"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "���������� live video?"
 
 msgid "Recording started"
 msgstr "������ ������"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index b73204449..1d503cda9 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -28,9 +28,8 @@ msgstr "Nemogu
 msgid "off"
 msgstr "isklju�i"
 
-#, fuzzy
 msgid "on"
-msgstr "na"
+msgstr ""
 
 msgid "auto"
 msgstr "automatski"
@@ -278,9 +277,8 @@ msgstr ""
 msgid "Content$Further Education"
 msgstr ""
 
-#, fuzzy
 msgid "Content$Languages"
-msgstr "Jezik"
+msgstr ""
 
 msgid "Content$Leisure/Hobbies"
 msgstr ""
@@ -589,9 +587,8 @@ msgstr "Kanal je trenutno zauzet tajmerom!"
 msgid "Delete channel?"
 msgstr "Obrisati kanal?"
 
-#, fuzzy
 msgid "Edit folder"
-msgstr "Ure�ivanje tajmera"
+msgstr ""
 
 msgid "New folder"
 msgstr "Novi direktorij"
@@ -606,16 +603,14 @@ msgstr "Ime direktorija ve
 msgid "Folder name must not contain '%c'!"
 msgstr "Naziv direktorija ne smije sadr�avati '%c'! "
 
-#, fuzzy
 msgid "Button$Select"
-msgstr "Zabilje�i"
+msgstr ""
 
 msgid "Delete folder and all sub folders?"
 msgstr "Obri�i direktorij i sve poddirektorije"
 
-#, fuzzy
 msgid "Delete folder?"
-msgstr "Obri�i direktorij?"
+msgstr ""
 
 msgid "Edit timer"
 msgstr "Ure�ivanje tajmera"
@@ -647,9 +642,8 @@ msgstr "Trajanje"
 msgid "File"
 msgstr "Datoteka"
 
-#, fuzzy
 msgid "Button$Folder"
-msgstr "Taster$Direktorij"
+msgstr ""
 
 msgid "Button$Single"
 msgstr ""
@@ -738,17 +732,14 @@ msgstr "Start"
 msgid "Button$Rewind"
 msgstr "Po�etak"
 
-#, fuzzy
 msgid "Recordings"
-msgstr "Snimanje"
+msgstr ""
 
-#, fuzzy
 msgid "Button$Open"
-msgstr "Meni"
+msgstr ""
 
-#, fuzzy
 msgid "Commands"
-msgstr "Naredbe"
+msgstr ""
 
 msgid "Delete recording?"
 msgstr "Obri�i snimku?"
@@ -783,21 +774,17 @@ msgstr "Izgled"
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
-#, fuzzy
 msgid "Setup.OSD$Left (%)"
-msgstr "Levo(%)"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Top (%)"
-msgstr "Gore(%)"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Width (%)"
-msgstr "�irina (%)"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Height (%)"
-msgstr "Visina (%)"
+msgstr ""
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "Du�ina prikaza poruka (s)"
@@ -817,17 +804,14 @@ msgstr "Mali font"
 msgid "Setup.OSD$Fixed font"
 msgstr "Nepromenjiv font"
 
-#, fuzzy
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Veli�ina zadanog fonta (piksel)"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Veli�ina malog fonta (piksel)"
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Veli�ina nepromenjivog fonta (piksel)"
+msgstr ""
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacija o programu"
@@ -859,13 +843,11 @@ msgstr "Taster Meni zatvara"
 msgid "Setup.OSD$Recording directories"
 msgstr "Direktorij za snimke"
 
-#, fuzzy
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "Direktoriji u tajmer meni-ju "
+msgstr ""
 
-#, fuzzy
 msgid "Setup.OSD$Number keys for characters"
-msgstr "Number keys for characters"
+msgstr ""
 
 msgid "Setup.OSD$Color key 0"
 msgstr ""
@@ -917,9 +899,8 @@ msgstr "pravougaonik"
 msgid "center cut out"
 msgstr "izre�i sredinu"
 
-#, fuzzy
 msgid "no"
-msgstr "ni�ta"
+msgstr ""
 
 msgid "names only"
 msgstr "samo imena"
@@ -1039,17 +1020,14 @@ msgstr "CAM u upotrebi - ponovno pokrenuti?"
 msgid "Can't reset CAM!"
 msgstr "Ponovno pokretanje CAM-a neuspe�no!"
 
-#, fuzzy
 msgid "do not pause live video"
-msgstr "Ne zaustavljaj izravan prenos"
+msgstr ""
 
-#, fuzzy
 msgid "confirm pause live video"
-msgstr "Potvrdi zaustavljanje izravnog prenosa..."
+msgstr ""
 
-#, fuzzy
 msgid "pause live video"
-msgstr "Zaustavljanje izravnog prenosa..."
+msgstr ""
 
 msgid "confirm"
 msgstr "potvrdi"
@@ -1072,9 +1050,8 @@ msgstr "Zadani prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Zadano trajanje (d)"
 
-#, fuzzy
 msgid "Setup.Recording$Pause key handling"
-msgstr "Trajanje pauze (d)"
+msgstr ""
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet pauze"
@@ -1166,9 +1143,8 @@ msgstr "kao prethodno"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Po�etna ja�ina tona"
 
-#, fuzzy
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "Kanal spakovan"
+msgstr ""
 
 msgid "Setup.Miscellaneous$Show channel names with source"
 msgstr ""
@@ -1233,16 +1209,14 @@ msgstr "Titlovi nisu dostupni!"
 msgid "Not enough disk space to start recording!"
 msgstr "Nedovoljno prostora na disku za snimanje!"
 
-#, fuzzy
 msgid "No free DVB device to record!"
-msgstr "Nema slobodnog DVB ure�aja za snimanje!"
+msgstr ""
 
 msgid "Pausing live video..."
 msgstr "Zaustavljanje izravnog prenosa..."
 
-#, fuzzy
 msgid "Delete timeshift recording?"
-msgstr "Obrisati snimku vremenskog pomaka?"
+msgstr ""
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1388,9 +1362,8 @@ msgstr "Nedelja"
 msgid "Upcoming recording!"
 msgstr "Predstoje�e snimanje!"
 
-#, fuzzy
 msgid "Pause live video?"
-msgstr "Zaustavljam izravni prenos..."
+msgstr ""
 
 msgid "Recording started"
 msgstr "Snimanje zapo�elo"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index b5df87de3..de03d3d66 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -5,14 +5,15 @@
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 # Tomas Berglund <tomber@telia.com>, 2008
 # Magnus Andersson <svankan@bahnhof.se>, 2008
+# Richard Lithvall <r-vdr@boomer.se>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2008-03-12 18:25+0100\n"
-"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
+"PO-Revision-Date: 2013-02-18 17:04+0100\n"
+"Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +33,7 @@ msgid "off"
 msgstr "av"
 
 msgid "on"
-msgstr ""
+msgstr "p�"
 
 msgid "auto"
 msgstr "automatisk"
@@ -44,7 +45,7 @@ msgid "Polarization"
 msgstr "Polarisation"
 
 msgid "System"
-msgstr ""
+msgstr "System"
 
 msgid "Srate"
 msgstr "Srate"
@@ -74,257 +75,257 @@ msgid "Hierarchy"
 msgstr "Hierarchy"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "PlpId"
-msgstr ""
+msgstr "PlpId"
 
 msgid "Starting EPG scan"
-msgstr "P�b�rjar EPG skanning"
+msgstr "P�b�rjar EPG-avs�kning"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Deckare/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "�ventyr/Western/Krig"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Fiktion/Fantasy/Skr�ck"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Komedi"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "S�pa/Melodram/Folksaga"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romatik"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Seri�s/Klassisk/Relig�s/Historisk/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Vuxen/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Nyheter/Journalistik"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Nyheter/V�derleksrapport"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Nyhetsmagasin"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokument�r"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Diskussion/Intervju/Debatt"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Show/Lekprogram"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Fr�gesport/T�vling"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Varit�"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Pratshow"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Specialevent"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Sportmagasin"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Fotboll"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Lagsport"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Friidrott"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Motorsport"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Vattensport"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Vintersport"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Ridsport"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Kampsport"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Barn/ungdomsprogram"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Barnprogram, f�rskola"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Underh�llning, 6-14 �r"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Underh�llning, 10-16 �r"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informativ/Utbildning/Skola"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Tecknat/Dockteater"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Musik/Balett/Dans"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Klassisk musik"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folkmusik"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musikal/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balett"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Konst/Kultur"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Scenkonst"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Sk�nkonst"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religion"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Popul�rkultur/Folkkonst"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Litteratur"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Bio"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Experimentell film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Etermedia/Press"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nya medier"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Konst/Kulturmagasin"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Mode"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Samh�lle/Politik/Ekonomi"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magasin/Rapport/Dokument�r"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomi/Samh�lle"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Anm�rkningsv�rda personer"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Utbildning/Vetenskap/Fakta"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Natur/Djur/Milj�"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Teknologi/Naturvetenskap"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicin/Fysik/Psykologi"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Fr�mmande l�nder/Expeditioner"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Antroposofi"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Vidareutbildning"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Spr�k"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Fritid/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turism/Resor"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Konsthantverk"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Bilmagasin"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness och h�lsa"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Matlagning"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "TV-shop"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Tr�dg�rd"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Ursprungsspr�k"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Svartvitt"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Saknas"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Direkts�ndning"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "fr�n %d"
 
 msgid "No title"
-msgstr "ingen titel"
+msgstr "Ingen titel"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -335,19 +336,19 @@ msgid "LanguageCode$eng"
 msgstr "sve"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Steg1: identifiering av kod"
+msgstr "Steg1: Identifierar typ av fj�rrkontroll"
 
 msgid "Press any key on the RC unit"
 msgstr "Tryck valfri tangent p� fj�rrkontrollen"
 
 msgid "RC code detected!"
-msgstr "Koden detekterad!"
+msgstr "Fj�rrkontrolltyp identifierad!"
 
 msgid "Do not press any key..."
 msgstr "Tryck inte p� n�gon knapp..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Fas 2: Inl�rning av specifika knapp-koder"
+msgstr "Fas 2: Inl�rning av specifika knappar"
 
 #, c-format
 msgid "Press key for '%s'"
@@ -372,10 +373,10 @@ msgid "Learning Remote Control Keys"
 msgstr "Inl�rning av fj�rrkontrollsknappar"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Fas 3: Spara knappkoder"
+msgstr "Fas 3: Spara knappinst�llningar"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avsluta."
+msgstr "Tryck 'Upp' f�r att spara eller 'Ner' f�r att avbryta."
 
 msgid "Key$Up"
 msgstr "Upp"
@@ -414,7 +415,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Spela upp/Pausa"
 
 msgid "Key$Play"
 msgstr "Spela upp"
@@ -438,10 +439,10 @@ msgid "Key$Next"
 msgstr "N�sta"
 
 msgid "Key$Prev"
-msgstr "Bak�t"
+msgstr "F�reg�ende"
 
 msgid "Key$Power"
-msgstr "P�/Av"
+msgstr "Av/P�"
 
 msgid "Key$Channel+"
 msgstr "Kanal+"
@@ -486,43 +487,43 @@ msgid "Key$Commands"
 msgstr "Kommandon"
 
 msgid "Key$User0"
-msgstr "Anv�ndare0"
+msgstr "Anv�ndardefinierad0"
 
 msgid "Key$User1"
-msgstr "Anv�ndare1"
+msgstr "Anv�ndardefinierad1"
 
 msgid "Key$User2"
-msgstr "Anv�ndare2"
+msgstr "Anv�ndardefinierad2"
 
 msgid "Key$User3"
-msgstr "Anv�ndare3"
+msgstr "Anv�ndardefinierad3"
 
 msgid "Key$User4"
-msgstr "Anv�ndare4"
+msgstr "Anv�ndardefinierad4"
 
 msgid "Key$User5"
-msgstr "Anv�ndare5"
+msgstr "Anv�ndardefinierad5"
 
 msgid "Key$User6"
-msgstr "Anv�ndare6"
+msgstr "Anv�ndardefinierad6"
 
 msgid "Key$User7"
-msgstr "Anv�ndare7"
+msgstr "Anv�ndardefinierad7"
 
 msgid "Key$User8"
-msgstr "Anv�ndare8"
+msgstr "Anv�ndardefinierad8"
 
 msgid "Key$User9"
-msgstr "Anv�ndare9"
+msgstr "Anv�ndardefinierad9"
 
 msgid "Free To Air"
-msgstr "Okodad"
+msgstr "okodad"
 
 msgid "encrypted"
 msgstr "krypterad"
 
 msgid "Edit channel"
-msgstr "�ndra kanal"
+msgstr "Redigera kanal"
 
 msgid "Name"
 msgstr "Namn"
@@ -573,7 +574,7 @@ msgid "Channels"
 msgstr "Kanaler"
 
 msgid "Button$Edit"
-msgstr "�ndra"
+msgstr "Redigera"
 
 msgid "Button$New"
 msgstr "Ny"
@@ -582,7 +583,7 @@ msgid "Button$Delete"
 msgstr "Ta bort"
 
 msgid "Button$Mark"
-msgstr "M�rk"
+msgstr "Markera"
 
 msgid "Channel is being used by a timer!"
 msgstr "Kanalen anv�nds av en timer!"
@@ -591,32 +592,32 @@ msgid "Delete channel?"
 msgstr "Ta bort kanalen?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Redigera mapp"
 
 msgid "New folder"
-msgstr ""
+msgstr "Ny mapp"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Undermapp"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Mappnamnet finns redan!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Mappnamnet f�r inte inneh�lla '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "V�lj"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Radera mapp och alla undermappar?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Radera mapp?"
 
 msgid "Edit timer"
-msgstr "�ndra timer"
+msgstr "Redigera timer"
 
 msgid "Active"
 msgstr "Aktiv"
@@ -646,19 +647,19 @@ msgid "File"
 msgstr "Filnamn"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Mapp"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Enskilld"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repeterande"
 
 msgid "First day"
 msgstr "F�rsta dag"
 
 msgid "Select folder"
-msgstr ""
+msgstr "V�lj mapp"
 
 msgid "Timers"
 msgstr "Timers"
@@ -673,7 +674,7 @@ msgid "Delete timer?"
 msgstr "Ta bort timern?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Timerstyrd inspelning p�g�r - Avbryta �nd�?"
+msgstr "Timerstyrd inspelning p�g�r - radera �nd�?"
 
 msgid "Event"
 msgstr "S�ndning"
@@ -727,7 +728,7 @@ msgid "CAM not responding!"
 msgstr "CAM svarar inte!"
 
 msgid "Recording info"
-msgstr "Inspelning"
+msgstr "Inspelningsinformation"
 
 msgid "Button$Play"
 msgstr "Spela upp"
@@ -748,10 +749,10 @@ msgid "Delete recording?"
 msgstr "Ta bort inspelningen?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Inspelningen redigeras - vill du verkligen radera?"
 
 msgid "Error while deleting recording!"
-msgstr "Inspelningen g�r inte att ta bort!"
+msgstr "Inspelningen gick inte att ta bort!"
 
 msgid "Recording commands"
 msgstr "Inspelningskommandon"
@@ -760,7 +761,7 @@ msgid "never"
 msgstr "aldrig"
 
 msgid "skin dependent"
-msgstr "skin beroende"
+msgstr "skin-beroende"
 
 msgid "always"
 msgstr "alltid"
@@ -826,7 +827,7 @@ msgid "top"
 msgstr "�vre"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Kanal information (s)"
+msgstr "Kanalinformation (s)"
 
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Information vid kanalbyte"
@@ -835,49 +836,49 @@ msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Timeout f�r kanalinformation"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Bl�ddra sidor"
+msgstr "Bl�ddra lista"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Rulla texten"
+msgstr "Cirkul�r lista"
 
 msgid "Setup.OSD$Menu key closes"
 msgstr "Menyknappen st�nger"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Kataloger f�r inspelningar"
+msgstr "Visa mappar i inspelningsmenyn"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Visa mappar i timermenyn"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Anv�nd sifferknappar f�r bokstavsinmatning"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "F�rgknapp 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "F�rgknapp 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "F�rgknapp 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "F�rgknapp 3"
 
 msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "Skanna"
+msgstr "Avs�kning"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "EPG s�kning timeout"
+msgstr "Tidsgr�ns f�r EPG-s�kning (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
 msgstr "Niv� f�r EPG bugfix"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Visa gammal information (min)"
+msgstr "Visa passerad EPG (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "St�ll in systemtid"
@@ -909,7 +910,7 @@ msgid "names only"
 msgstr "bara namn"
 
 msgid "PIDs only"
-msgstr "bara PIDs"
+msgstr "bara PID"
 
 msgid "names and PIDs"
 msgstr "namn och PID"
@@ -927,13 +928,13 @@ msgid "Button$Audio"
 msgstr "Ljud"
 
 msgid "Button$Subtitles"
-msgstr "Knapp$Textning"
+msgstr "Undertexter"
 
 msgid "Setup.DVB$Primary DVB interface"
 msgstr "Prim�r DVB enhet"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standard"
 
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
@@ -954,7 +955,7 @@ msgid "Setup.DVB$Audio language"
 msgstr "Ljudspr�k"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Visa textning"
+msgstr "Visa undertexter"
 
 msgid "Setup.DVB$Subtitle languages"
 msgstr "Textningsspr�k"
@@ -963,7 +964,7 @@ msgid "Setup.DVB$Subtitle language"
 msgstr "Textningsspr�k"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Sidof�rskjutning textremsa"
+msgstr "H�jdf�rskjutning av textremsa"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
 msgstr "Transparent f�rgrund textremsa"
@@ -988,10 +989,10 @@ msgstr "
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Enhet %d ansluten till satellitkabel"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "�gare"
 
 msgid "CAM reset"
 msgstr "CAM omstart"
@@ -1018,22 +1019,22 @@ msgid "Can't open CAM menu!"
 msgstr "Det g�r inte att �ppna CAM menyn!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM upptagen, vill du verkligen starta om?"
+msgstr "CAM upptagen, vill du verkligen �terst�lla?"
 
 msgid "Can't reset CAM!"
 msgstr "Kan inte �terst�lla CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "pausa inte p�g�ende program"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "bekr�fta paus av p�g�ende program"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pausa p�g�ende program"
 
 msgid "confirm"
-msgstr ""
+msgstr "bekr�fta"
 
 msgid "yes"
 msgstr "ja"
@@ -1042,10 +1043,10 @@ msgid "Recording"
 msgstr "Inspelning"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Marginal f�r start (min)"
+msgstr "Marginal f�re start (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Marginal f�r stopp (min)"
+msgstr "Marginal efter stopp (min)"
 
 msgid "Setup.Recording$Default priority"
 msgstr "Normal prioritet"
@@ -1054,7 +1055,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal livstid (dagar)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Hantering av pausknapp"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet f�r direktinspelning"
@@ -1069,7 +1070,7 @@ msgid "Setup.Recording$Use VPS"
 msgstr "Anv�nd VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "VPS marginal (s)"
+msgstr "VPS-marginal (s)"
 
 msgid "Setup.Recording$Mark instant recording"
 msgstr "M�rk direktinspelning"
@@ -1081,7 +1082,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Direktinspelning l�ngd (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "p�g�ende program"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maximal filstorlek f�r inspelning (MB)"
@@ -1090,67 +1091,67 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Dela upp redigerade filer"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Radering av timeshift-inspelning"
 
 msgid "Replay"
 msgstr "Uppspelning"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Multispeed mode"
+msgstr "Flerhastighetsl�ge"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Visa uppspelningsl�ge"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Visa �terst�ende tid"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Tid f�r visning av f�rloppsindikatorn (sek)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pausa uppspelningen vid s�ttande av redigeringsm�rke"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "�teruppta ID"
+msgstr "�terupptagnings-ID"
 
 msgid "Miscellaneous"
 msgstr "Diverse"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Minsta h�ndelse-pause (min)"
+msgstr "Tidsgr�ns f�re timer (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Minsta anv�ndar-inaktivitet (min)"
+msgstr "Tidsgr�ns f�r anv�ndar-inaktivitet (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "SVDRP Timeout (s)"
+msgstr "SVDRP-tidsgr�ns (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Zap timeout(s)"
+msgstr "Zap-tidsgr�ns (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Timeout kanal (ms)"
+msgstr "Tidsgr�ns f�r kanalinmatning (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Fj�rrkontrollrepetition, f�rdr�jning (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Fj�rrkontrollrepetition, delta (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kanal vid uppstart"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "som f�rut"
+msgstr "samma som vid avslut"
 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Cirkul�r kanallista"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Visa kanalnamnen tillsammans med k�llan"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Of�rutsedd avslutning"
@@ -1182,7 +1183,7 @@ msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
 
 msgid "Button$Pause"
-msgstr "Pausa"
+msgstr "Paus"
 
 msgid "Button$Stop"
 msgstr "Stopp"
@@ -1195,7 +1196,7 @@ msgid " Cancel editing"
 msgstr " Avbryt redigering"
 
 msgid "Stop recording?"
-msgstr "Stanna inspelning?"
+msgstr "Stoppa inspelning?"
 
 msgid "Cancel editing?"
 msgstr "Avbryta redigeringen?"
@@ -1204,32 +1205,32 @@ msgid "No audio available!"
 msgstr "Ljud saknas!"
 
 msgid "No subtitles"
-msgstr "Ingen textning"
+msgstr "Ingen undertext"
 
 msgid "No subtitles available!"
-msgstr "Ingen textning tillg�nglig!"
+msgstr "Inga undertexter tillg�ngliga!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Otillr�cklingt diskutrymme f�r inspelning!"
 
 msgid "No free DVB device to record!"
-msgstr "Det finns ingen ledig DVB enhet f�r inspelning!"
+msgstr "Det finns ingen ledig DVB-enhet f�r inspelning!"
 
 msgid "Pausing live video..."
-msgstr "Pausar direktinspelningen"
+msgstr "Pausar p�g�ende program..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Radera timeshift-inspelning?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Hopp: "
+msgstr "Hoppa: "
 
 msgid "No editing marks defined!"
 msgstr "Det finns inga redigeringsm�rken"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Inga redigeringsm�rken markerade!"
 
 msgid "Can't start editing process!"
 msgstr "Kan inte starta redigering!"
@@ -1268,42 +1269,42 @@ msgid "Low disk space!"
 msgstr "L�gt diskutrymme!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "�terskapar indexfil"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Indexfil �terskapad"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "�terskapande av indexfil fallerade!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Kan inte avsluta, m�ste anv�nda parameter '-s'"
+msgstr "Kan inte avsluta, parameter '-s' saknas!"
 
 msgid "Editing - shut down anyway?"
 msgstr "Editering p�g�r, vill du avsluta �nd�?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Inspelning p�g�r, vill du �nd� avbryta?"
+msgstr "Inspelning p�g�r, vill du avsluta �nd�?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Inspelning startar om %ld minuter, vill du avsluta?"
+msgstr "Inspelning startar om %ld minuter, vill du avsluta �nd�?"
 
 msgid "shut down anyway?"
-msgstr "vill du �nd� avbryta?"
+msgstr "vill du avsluta �nd�?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Plugin %s aktiv om %ld min, vill du forts�tta?"
 
 msgid "Editing - restart anyway?"
-msgstr "Editering p�g�r, vill du �nd� starta om?"
+msgstr "Editering p�g�r, vill du starta om �nd�?"
 
 msgid "Recording - restart anyway?"
-msgstr "Inspelning p�g�r, vill du �nd� starta om?"
+msgstr "Inspelning p�g�r, vill du starta om �nd�?"
 
 msgid "restart anyway?"
-msgstr "vill du �nd� starta om?"
+msgstr "vill du starta om �nd�?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1313,25 +1314,25 @@ msgid "Classic VDR"
 msgstr "Klassisk VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "LAST"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TIMERS"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "ENHETER"
 
 msgid "LIVE"
-msgstr ""
+msgstr "LIVE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "SPELA"
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG konsol"
+msgstr "ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -1363,10 +1364,10 @@ msgid "Sunday"
 msgstr "S�ndag"
 
 msgid "Upcoming recording!"
-msgstr "strax inspelning..."
+msgstr "Snart b�rjar inspelning!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Pausa p�g�ende program?"
 
 msgid "Recording started"
 msgstr "Inspelningen har startat"
@@ -1387,11 +1388,11 @@ msgid "Editing process finished"
 msgstr "Redigering avslutad"
 
 msgid "Press any key to cancel restart"
-msgstr "Tryck valfri knapp f�r att �terkalla omstart"
+msgstr "Tryck valfri knapp f�r att avbryta omstart"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR kommer att st�ngas ned om %s minuter"
+msgstr "VDR kommer att st�ngas av om %s minuter"
 
 msgid "Disk"
 msgstr "Disk"
diff --git a/recording.c b/recording.c
index 3359de36b..ede7c1b92 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.88 2013/02/17 13:17:55 kls Exp $
+ * $Id: recording.c 2.89 2013/03/03 10:54:05 kls Exp $
  */
 
 #include "recording.h"
@@ -910,7 +910,7 @@ cRecording::~cRecording()
   delete info;
 }
 
-char *cRecording::StripEpisodeName(char *s)
+char *cRecording::StripEpisodeName(char *s, bool Strip)
 {
   char *t = s, *s1 = NULL, *s2 = NULL;
   while (*t) {
@@ -931,8 +931,10 @@ char *cRecording::StripEpisodeName(char *s)
      // by '0' in SortName() (see below), which will result in the desired
      // sequence:
      *s1 = '1';
-     s1++;
-     memmove(s1, s2, t - s2 + 1);
+     if (Strip) {
+        s1++;
+        memmove(s1, s2, t - s2 + 1);
+        }
      }
   return s;
 }
@@ -941,8 +943,7 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory))
-                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)));
+     char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)), RecordingsSortMode != rsmName);
      strreplace(s, '/', '0'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      *sb = MALLOC(char, l);
diff --git a/recording.h b/recording.h
index 48d6f6832..4807fc9d7 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.44 2013/02/14 15:13:14 kls Exp $
+ * $Id: recording.h 2.45 2013/03/03 10:48:39 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -97,7 +97,7 @@ class cRecording : public cListObject {
   cRecordingInfo *info;
   cRecording(const cRecording&); // can't copy cRecording
   cRecording &operator=(const cRecording &); // can't assign cRecording
-  static char *StripEpisodeName(char *s);
+  static char *StripEpisodeName(char *s, bool Strip);
   char *SortName(void) const;
   int GetResume(void) const;
   time_t start;
diff --git a/remux.c b/remux.c
index 9be30788d..587d7e5c6 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.74 2013/02/17 13:17:58 kls Exp $
+ * $Id: remux.c 2.75 2013/03/03 10:37:58 kls Exp $
  */
 
 #include "remux.h"
@@ -718,7 +718,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                          if (updatePrimaryDevice)
                             cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, NumApids, apids[NumApids], alangs[NumApids]);
                          NumApids++;
-                         apids[NumApids]= 0;
+                         apids[NumApids] = 0;
                          }
                       }
                       break;
@@ -765,7 +765,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                                     if (updatePrimaryDevice)
                                        cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, spids[NumSpids], slangs[NumSpids]);
                                     NumSpids++;
-                                    spids[NumSpids]= 0;
+                                    spids[NumSpids] = 0;
                                     }
                                  break;
                             case SI::ISO639LanguageDescriptorTag: {
@@ -786,7 +786,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                             if (updatePrimaryDevice && Setup.UseDolbyDigital)
                                cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, dpid, lang);
                             NumDpids++;
-                            dpids[NumDpids]= 0;
+                            dpids[NumDpids] = 0;
                             }
                          }
                       }
@@ -815,7 +815,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                          if (updatePrimaryDevice && Setup.UseDolbyDigital)
                             cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, NumDpids, stream.getPid(), lang);
                          NumDpids++;
-                         dpids[NumDpids]= 0;
+                         dpids[NumDpids] = 0;
                          }
                       }
                       break;
diff --git a/shutdown.c b/shutdown.c
index 09d4a1a1f..445ed6f27 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 2.0 2008/02/24 10:29:00 kls Exp $
+ * $Id: shutdown.c 2.1 2013/02/18 10:33:26 kls Exp $
  */
 
 #include "shutdown.h"
@@ -117,7 +117,7 @@ void cShutdownHandler::CheckManualStart(int ManualStart)
   else {
      // Set inactive from now on
      dsyslog("scheduled wakeup time in %ld minutes, assuming automatic start of VDR", Delta / 60);
-     SetUserInactive();
+     SetUserInactiveTimeout(-3, true);
      }
 }
 
@@ -147,9 +147,14 @@ void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force)
      activeTimeout = 0;
      return;
      }
-  if (Seconds < 0)
-     Seconds = Setup.MinUserInactivity * 60;
-  activeTimeout = time(NULL) + Seconds;
+  if (Seconds >= 0)
+     activeTimeout = time(NULL) + Seconds;
+  else if (Seconds == -1)
+     activeTimeout = time(NULL) + Setup.MinUserInactivity * 60;
+  else if (Seconds == -2)
+     activeTimeout = 0;
+  else if (Seconds == -3)
+     activeTimeout = 1;
 }
 
 bool cShutdownHandler::ConfirmShutdown(bool Interactive)
diff --git a/shutdown.h b/shutdown.h
index af0c0464e..bf2a2a424 100644
--- a/shutdown.h
+++ b/shutdown.h
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.h 2.0 2007/02/24 17:23:59 kls Exp $
+ * $Id: shutdown.h 2.1 2013/02/18 10:35:27 kls Exp $
  */
 
 #ifndef __SHUTDOWN_H
@@ -38,7 +38,7 @@ class cCountdown {
 class cShutdownHandler {
 private:
   time_t activeTimeout;
-       ///< Time when VDR will become non-interactive. 0 means never.
+       ///< Time when VDR will become non-interactive. 0 means never, 1 means unknown time ago.
   time_t retry;
        ///< Time for retrying the shutdown.
   char *shutdownCommand;
@@ -73,15 +73,18 @@ class cShutdownHandler {
        ///< Check whether VDR is in interactive mode or non-interactive mode (waiting for shutdown).
        ///< AtTime checks whether VDR will probably be inactive at that time.
   time_t GetUserInactiveTime(void) { return activeTimeout; }
-       ///< Time when user will become non-inactive, or 0 if never.
+       ///< Time when user will become non-inactive, or 0 if never, 1 if a long time ago
   void SetUserInactiveTimeout(int Seconds = -1, bool Force = false);
-       ///< Set the time when VDR will switch into non-interactive mode or power down.
-       ///< -1 means Setup.MinUserInactivity in the future.
-       ///< Otherwise, seconds in the future.
-       ///< If MinUserInactivity = 0 and Force = false, Seconds is ignored and VDR will
-       ///< stay interactive forever.
+       ///< Set the time in the future when VDR will switch into non-interactive mode or power down.
+       ///< Seconds >= 0 means that many seconds in the future.
+       ///< Seconds = -1 means Setup.MinUserInactivity in the future.
+       ///< Seconds = -2 means never.
+       ///< Seconds = -3 means a long, unknown time ago.
+       ///< Setup.MinUserInactivity = 0 will overrule this, unless Force = true is given.
+       ///< If Setup.MinUserInactivity = 0 and Force = false, Seconds is ignored and VDR will
+       ///< stay interactive forever (like Seconds = -2).
   void SetUserInactive(void) { SetUserInactiveTimeout(0, true); }
-       ///< Set VDR manually into non-interactive mode.
+       ///< Set VDR manually into non-interactive mode from now on.
   bool Retry(time_t AtTime = 0) { return retry <= (AtTime ? AtTime : time(NULL)); }
        ///< Check whether its time to re-try the shutdown.
        ///< AtTime checks whether VDR will probably be inactive at that time.
diff --git a/skinclassic.c b/skinclassic.c
index 9aac095cc..bbf36766f 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.8 2012/09/09 11:39:06 kls Exp $
+ * $Id: skinclassic.c 2.9 2013/02/22 15:25:31 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -773,7 +773,6 @@ cSkinDisplayVolume *cSkinClassic::DisplayVolume(void)
   return new cSkinClassicDisplayVolume;
 }
 
-
 cSkinDisplayTracks *cSkinClassic::DisplayTracks(const char *Title, int NumTracks, const char * const *Tracks)
 {
   return new cSkinClassicDisplayTracks(Title, NumTracks, Tracks);
diff --git a/svdrpsend b/svdrpsend
index caf3b41f4..10690edcf 100755
--- a/svdrpsend
+++ b/svdrpsend
@@ -54,4 +54,3 @@ sub Error
   close(SOCK);
   exit 1;
 }
-
diff --git a/svdrpsend.1 b/svdrpsend.1
new file mode 100644
index 000000000..3743739f9
--- /dev/null
+++ b/svdrpsend.1
@@ -0,0 +1,37 @@
+.TH "svdrpsend" "1" "23 Feb 2013" "1.7" "Video Disk Recorder"
+.SH NAME
+.LP
+svdrpsend \- sends commands to VDR
+.SH SYNOPSIS
+.LP
+svdrpsend [\fIoptions\fP] \fIcommand\fP
+.SH DESCRIPTION
+.LP
+This program sends commands to VDR (the Video Disk Recorder) and displays the
+result. A list of available commands can be shown by sending the HELP command.
+.SH OPTIONS
+.LP
+.TP
+\fB\-d\fR \fIhostname\fP
+Accesses the VDR at the specified \fIhostname\fP (default is localhost).
+.TP
+\fB\-p\fR \fIport\fP
+Uses the SVDRP port number \fIport\fP (default is 6419).
+.SH EXAMPLES
+.LP
+To request the available commands from the VDR running on the local host:
+.LP
+svdrpsend HELP
+.SH AUTHORS
+.LP
+Written by Tobias Grimm <tg@e\-tobi.net>
+.PP
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common\-licenses/GPL.
+.SH SEE ALSO
+.LP
+vdr(1), vdr(5)
diff --git a/thread.c b/thread.c
index b80ee70d0..b16fc8110 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.6 2012/10/04 12:20:43 kls Exp $
+ * $Id: thread.c 2.7 2013/02/22 14:52:49 kls Exp $
  */
 
 #include "thread.h"
@@ -598,4 +598,3 @@ int SystemExec(const char *Command, bool Detached)
      _exit(0);
      }
 }
-
diff --git a/transfer.c b/transfer.c
index 51ba912b9..653e93b43 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.7 2013/01/20 13:40:30 kls Exp $
+ * $Id: transfer.c 2.8 2013/03/01 09:50:15 kls Exp $
  */
 
 #include "transfer.h"
@@ -15,7 +15,6 @@ cTransfer::cTransfer(const cChannel *Channel)
 :cReceiver(Channel, TRANSFERPRIORITY)
 {
   patPmtGenerator.SetChannel(Channel);
-  retriesExceeded = false;
 }
 
 cTransfer::~cTransfer()
@@ -38,7 +37,6 @@ void cTransfer::Activate(bool On)
 
 #define MAXRETRIES     5 // max. number of retries for a single TS packet
 #define RETRYWAIT      5 // time (in ms) between two retries
-#define RETRYPAUSE 10000 // time (in ms) for which to pause retrying once a packet has not been accepted
 
 void cTransfer::Receive(uchar *Data, int Length)
 {
@@ -48,17 +46,11 @@ void cTransfer::Receive(uchar *Data, int Length)
      // now and then there may be conditions where the packet just can't be
      // handled when offered the first time, so that's why we try several times:
      for (int i = 0; i < MAXRETRIES; i++) {
-         if (PlayTs(Data, Length) > 0) {
-            if (retriesExceeded && timer.TimedOut())
-               retriesExceeded = false;
-            return;
-            }
-         if (retriesExceeded) // no retries once a packet has not been accepted
+         if (PlayTs(Data, Length) > 0)
             return;
          cCondWait::SleepMs(RETRYWAIT);
          }
-     retriesExceeded = true;
-     timer.Set(RETRYPAUSE); // wait a while before retrying
+     DeviceClear();
      esyslog("ERROR: TS packet not accepted in Transfer Mode");
      }
 }
diff --git a/transfer.h b/transfer.h
index 0c6683708..47a3398e4 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 2.3 2013/01/20 13:12:38 kls Exp $
+ * $Id: transfer.h 2.4 2013/03/01 09:49:46 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -13,13 +13,10 @@
 #include "player.h"
 #include "receiver.h"
 #include "remux.h"
-#include "tools.h"
 
 class cTransfer : public cReceiver, public cPlayer {
 private:
   cPatPmtGenerator patPmtGenerator;
-  bool retriesExceeded;
-  cTimeMs timer;
 protected:
   virtual void Activate(bool On);
   virtual void Receive(uchar *Data, int Length);
diff --git a/vdr.1 b/vdr.1
index 63915ecb6..1046ca77a 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.11 2013/02/08 10:50:30 kls Exp $
+.\" $Id: vdr.1 2.12 2013/02/24 10:41:12 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -275,7 +275,7 @@ also be read at program startup to have the full EPG data available immediately.
 If this file is present in the video directory, its last modification time will
 be used to trigger an update of the list of recordings in the "Recordings" menu.
 .SH SEE ALSO
-.BR vdr (5)
+.BR vdr (5), svdrp(1)
 .SH AUTHOR
 Written by Klaus Schmidinger, with contributions from many others.
 See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
diff --git a/vdr.c b/vdr.c
index 62872386b..f46589f5b 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.49 2013/02/14 10:49:06 kls Exp $
+ * $Id: vdr.c 2.50 2013/03/03 10:25:11 kls Exp $
  */
 
 #include <getopt.h>
@@ -1301,9 +1301,9 @@ int main(int argc, char *argv[])
               EITScanner.Process();
            if (!cCutter::Active() && cCutter::Ended()) {
               if (cCutter::Error())
-                 Skins.QueueMessage(mtError, tr("Editing process failed!"));
+                 Skins.Message(mtError, tr("Editing process failed!"));
               else
-                 Skins.QueueMessage(mtInfo, tr("Editing process finished"));
+                 Skins.Message(mtInfo, tr("Editing process finished"));
               }
            }
 

From bda389f8b061d2cc3f6834c55c33de409313ff60 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 10 Mar 2013 16:04:00 +0100
Subject: [PATCH 226/307] Version 1.7.40 VDR developer version 1.7.40 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.40.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.39-1.7.40.diff

MD5 checksums:

f59a7ac199248a870e157c66a6ffc24d  vdr-1.7.40.tar.bz2
acff088cc27296cb2c5b794ad4b2e0a8  vdr-1.7.39-1.7.40.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Approaching version 2.0.0:
==========================

If there are no more serious bug reports, the final version 2.0.0 of VDR
shall be released on March 31, 2013.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

From the HISTORY file:
- The "Recording info" page of the skins that come with VDR now displays the name of
  the channel (if available) from which this recording was taken.
- Updated the Catalan OSD texts (thanks to Luca Olivetti).
- Updated the Spanish OSD texts (thanks to Luca Olivetti).
- Added a note about the new default sort order of recordings to the release notes of
  version 1.7.29 and the UPDATE-2.0.0 file (pointed out by Wolfgang Rohdewald).
- Fixed a faulty UTF-8 character in cs_CZ.po.
- Added the system's character set to the page header in the epg2html script (pointed
  out by Dimitar Petrovski).
- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
- The new option "Setup/OSD/Always sort folders first" can be used to control whether
  folders will be always at the top of the Recordings menu, or will be interspersed
  with plain recordings when sorted alphabetically.
- Updated the Swedish OSD texts (thanks to Richard Lithvall).
- Updated the Chinese OSD texts (thanks to Nan Feng).
- Updated the Slovak OSD texts (thanks to Milan Hrala).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Updated the Dutch OSD texts (thanks to Cedric Dewijs).
- Updated the Czech OSD texts (thanks to Ales Jurik).
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Updated the French OSD texts (thanks to Dominique Plu).
- Updated the Finnish OSD texts (thanks to Matti Lehtimäki).
- Updated the Arabic OSD texts (thanks to Osama Alrawab).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Renamed the "plp id" to a more general "stream id" and added support for DVB-S2
  "Input Stream Identifier" (ISI) (based on a patch from Rolf Ahrenberg).
  With this VDR now supports "multi streaming" on DVB-S2 and DVB-T2 transponders.
- Fixed a possible deadlock when changing the audio track while replaying a recording.
- Fixed resuming replay of PES recordings (reported by Oliver Endriss).
- Limited the Goto() call in cDvbPlayer::SetAudioTrack() to the main thread, in order
  to avoid a crash when the track is automatically set from the player thread.
- The LCARS skin now calls SetAntiAliasGranularity(20, 16) in order to reserve enough
  fixed colors on 8bpp displays with anti-aliasing.
- Changed the default values for the OSD size back to those before version 1.7.29,
  to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or
  "Classic" skin.
---
 CONTRIBUTORS                        |  21 +-
 HISTORY                             |  53 ++++-
 MANUAL                              |   5 +
 PLUGINS/src/skincurses/HISTORY      |   5 +
 PLUGINS/src/skincurses/skincurses.c |   7 +-
 UPDATE-2.0.0                        |   5 +
 config.c                            |  13 +-
 config.h                            |  11 +-
 device.c                            |   6 +-
 dvbdevice.c                         |  15 +-
 dvbdevice.h                         |   8 +-
 dvbplayer.c                         |  21 +-
 epg2html                            |  24 +-
 menu.c                              |   5 +-
 nit.c                               |  19 +-
 po/ar.po                            | 337 ++++++++++++++--------------
 po/ca_ES.po                         | 279 +++++++++++------------
 po/cs_CZ.po                         |  11 +-
 po/da_DK.po                         |   7 +-
 po/de_DE.po                         |   9 +-
 po/el_GR.po                         |   7 +-
 po/es_ES.po                         |  11 +-
 po/et_EE.po                         |   9 +-
 po/fi_FI.po                         |  14 +-
 po/fr_FR.po                         |  12 +-
 po/hr_HR.po                         |   7 +-
 po/hu_HU.po                         |   9 +-
 po/it_IT.po                         |   9 +-
 po/lt_LT.po                         |   9 +-
 po/mk_MK.po                         |   9 +-
 po/nl_NL.po                         |  12 +-
 po/nn_NO.po                         |   7 +-
 po/pl_PL.po                         |   9 +-
 po/pt_PT.po                         |   7 +-
 po/ro_RO.po                         |   9 +-
 po/ru_RU.po                         |   9 +-
 po/sk_SK.po                         |  47 ++--
 po/sl_SI.po                         | 277 ++++++++++++-----------
 po/sr_SR.po                         |   7 +-
 po/sv_SE.po                         |   9 +-
 po/tr_TR.po                         |   7 +-
 po/uk_UA.po                         |   9 +-
 po/zh_CN.po                         | 280 +++++++++++------------
 recording.c                         |  19 +-
 recording.h                         |   4 +-
 skinclassic.c                       |   5 +-
 skinlcars.c                         |   6 +-
 skinsttng.c                         |   5 +-
 vdr.5                               |   8 +-
 49 files changed, 957 insertions(+), 736 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 92e5895ee..5444ddd58 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -696,6 +696,7 @@ Oliver Endriss <o.endriss@gmx.de>
  Makefile
  for helping to debug a problem with reduced number of retries in Transfer Mode on
  SD-FF cards
+ for reporting a problem with resuming replay of PES recordings
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1059,7 +1060,7 @@ Lars Bl
 Niko Tarnanen <niko.tarnanen@hut.fi>
  for translating OSD texts to the Finnish language
 
-Rolf Ahrenberg <rahrenbe@cc.hut.fi>
+Rolf Ahrenberg <Rolf.Ahrenberg@saunalahti.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
  for making pressing the Power button not stop Transfer Mode or replay immediately
@@ -1159,6 +1160,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for fixing reduced bpp support for DVB subtitles
  for implementing "DVB Standard compliance" handling
  for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel()
+ for a patch that was used to rename the "plp id" to a more general "stream id"
+ and add support for DVB-S2 "Input Stream Identifier" (ISI)
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1919,6 +1922,7 @@ Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for pointing out a possible problem with asprintf() if the return value is not
  checked
  for fixing setting the OSD level in the 'osddemo' example
+ for pointing out a missing statement about the new default sort order of recordings
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
@@ -2693,7 +2697,7 @@ Alexander Gross <Bikalexander@gmail.com>
 Adrian Caval <anrxc@sysphere.org>
  for translating OSD texts to the Croatian language
 
-Nan Feng <nfgx@21cn.com>
+Nan Feng <nfvdr@live.com>
  for translating OSD texts to the Chinese language
 
 Edgar Toernig <froese@gmx.de>
@@ -2789,7 +2793,7 @@ Rene van den Braken <rene@vandenbraken.name>
  cPatPmtGenerator::GeneratePmt()
 
 Milan Hrala <hrala.milan@gmail.com>
- for translating OSD texts to the Slovakian language
+ for translating OSD texts to the Slovak language
 
 Andreas Schaefers <andreas_schaefers@gmx.de>
  for adding the audio id to the call of PlayAudio() in cDevice::PlayTsAudio()
@@ -2825,6 +2829,8 @@ Alex Lasnier <alex@fepg.org>
 
 Dimitar Petrovski <dimeptr@gmail.com>
  for translating OSD texts to the Macedonian language
+ for pointing out a missing character set in the header of HTML pages generated by
+ the epg2html script
 
 Eric Valette <eric.valette@free.fr>
  for adding handling of EnhancedAC3DescriptorTag
@@ -2863,7 +2869,7 @@ Cristiano A. Silva <arquithek@gmail.com>
 
 Osama Alrawab <alrawab@hotmail.com>
  for adding support for languages that are written right-to-left
- for translating OSD texts to the Arabian language
+ for translating OSD texts to the Arabic language
 
 Antti Sepp�l� <a.seppala@gmail.com>
  for suggesting to add cString::operator=(const char *String)
@@ -3074,6 +3080,7 @@ Stefan Blochberger <Stefan.Blochberger@gmx.de>
 
 Cedric Dewijs <cedric.dewijs@telfort.nl>
  for adding maximum SNR value for PCTV Systems PCTV 73ESE
+ for translating OSD texts to the Dutch language
 
 Stefan Stolz <st.stolz@gmail.com>
  for suggesting to make the SVDRP command LSTR optionally list the actual file name of
@@ -3099,3 +3106,9 @@ Matthias Senzel <matthias.senzel@t-online.de>
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
+
+Dominique Plu <dplu@free.fr>
+ for translating OSD texts to the French language
+
+Matti Lehtim�ki <matti.lehtimaki@gmail.com>
+ for translating OSD texts to the Finnish language
diff --git a/HISTORY b/HISTORY
index 06daf6f86..763140e2e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6176,7 +6176,7 @@ Video Disk Recorder Revision History
   is not detectable from the first TS packet of a frame.
 - Fixed writing the PCR pid into the PMT in cPatPmtGenerator::GeneratePmt()
   (reported by Rene van den Braken).
-- Added Slovakian language texts (thanks to Milan Hrala).
+- Added Slovak language texts (thanks to Milan Hrala).
 - Fixed EntriesOnSameFileSystem() to avoid using f_fsid, which may be 0 (thanks
   to Frank Schmirler).
 - Fixed starting a recording at an I-frame.
@@ -6479,7 +6479,7 @@ Video Disk Recorder Revision History
 - Fixed following symbolic links in RemoveFileOrDir().
 - Added support for languages that are written right-to-left (based on a patch
   from Osama Alrawab). See INSTALL for information on how to turn this on.
-- Added Arabian language texts (thanks to Osama Alrawab).
+- Added Arabic language texts (thanks to Osama Alrawab).
 
 2011-03-12: Version 1.7.17
 
@@ -6533,7 +6533,7 @@ Video Disk Recorder Revision History
   TrueColor OSD if it is run on a system that actually provides TrueColor support.
   Thanks to Reinhard Nissl for some valuable input, help with debugging, and an
   implementation of the AlphaBlend() function.
-- Updated the Slovakian language texts (thanks to Milan Hrala).
+- Updated the Slovak language texts (thanks to Milan Hrala).
 - Added Serbian language texts (thanks to Milan Cvijanovic).
 - Fixed reallocating memory in the "pictures" plugin (reported by Paul Menzel, with
   input from Oliver Endriss).
@@ -7175,6 +7175,10 @@ Video Disk Recorder Revision History
   folder (provided you have write access to that folder).
   If a folder is newly created by a repeating timer, the sort mode for that
   folder is initially set to "by time".
+  Note that in previous versions the default sort order of the top level video
+  directory was "by name" and all subdirectories were sorted "by time". Now the
+  default sort order for all directories is "by name", so if you have an existing
+  folder that shall be sorted "by time", press the '0' key once to achieve this.
 - Fixed several spelling errors (thanks to Ville Skytt�).
 - Fixed handling recording with more than two bonded devices.
 - Fixed the type of MBperMinute in cVideoDiskUsage::HasChanged() (thanks to Andreas
@@ -7556,7 +7560,7 @@ Video Disk Recorder Revision History
 - Changed several calls to Skins.Message() in vdr.c to Skins.QueueMessage() in order to
   avoid a black screen while such a message is displayed in case the channel will be
   switched (reported by Uwe Scheffler).
-- Updated the Slovakian language texts (thanks to Milan Hrala).
+- Updated the Slovak language texts (thanks to Milan Hrala).
 - Improved LIRC timing for repeat function.
 - When pausing live video, the current audio and subtitle tracks are now retained.
 - Added some notes about plugin Makefiles to PLUGINS.html.
@@ -7684,3 +7688,44 @@ Video Disk Recorder Revision History
   immediately.
 - When sorting recordings by name, folders are now always at the top of the list.
 - Updated the Russian OSD texts (thanks to Oleg Roitburd).
+
+2013-03-10: Version 1.7.40
+
+- The "Recording info" page of the skins that come with VDR now displays the name of
+  the channel (if available) from which this recording was taken.
+- Updated the Catalan OSD texts (thanks to Luca Olivetti).
+- Updated the Spanish OSD texts (thanks to Luca Olivetti).
+- Added a note about the new default sort order of recordings to the release notes of
+  version 1.7.29 and the UPDATE-2.0.0 file (pointed out by Wolfgang Rohdewald).
+- Fixed a faulty UTF-8 character in cs_CZ.po.
+- Added the system's character set to the page header in the epg2html script (pointed
+  out by Dimitar Petrovski).
+- Updated the Slovenian OSD texts (thanks to Matjaz Thaler).
+- The new option "Setup/OSD/Always sort folders first" can be used to control whether
+  folders will be always at the top of the Recordings menu, or will be interspersed
+  with plain recordings when sorted alphabetically.
+- Updated the Swedish OSD texts (thanks to Richard Lithvall).
+- Updated the Chinese OSD texts (thanks to Nan Feng).
+- Updated the Slovak OSD texts (thanks to Milan Hrala).
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Updated the Dutch OSD texts (thanks to Cedric Dewijs).
+- Updated the Czech OSD texts (thanks to Ales Jurik).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Updated the French OSD texts (thanks to Dominique Plu).
+- Updated the Finnish OSD texts (thanks to Matti Lehtim�ki).
+- Updated the Arabic OSD texts (thanks to Osama Alrawab).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Renamed the "plp id" to a more general "stream id" and added support for DVB-S2
+  "Input Stream Identifier" (ISI) (based on a patch from Rolf Ahrenberg).
+  With this VDR now supports "multi streaming" on DVB-S2 and DVB-T2 transponders.
+- Fixed a possible deadlock when changing the audio track while replaying a recording.
+- Fixed resuming replay of PES recordings (reported by Oliver Endriss).
+- Limited the Goto() call in cDvbPlayer::SetAudioTrack() to the main thread, in order
+  to avoid a crash when the track is automatically set from the player thread.
+- The LCARS skin now calls SetAntiAliasGranularity(20, 16) in order to reserve enough
+  fixed colors on 8bpp displays with anti-aliasing.
+- Changed the default values for the OSD size back to those before version 1.7.29,
+  to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or
+  "Classic" skin.
diff --git a/MANUAL b/MANUAL
index 25261e3fa..e1f79f85a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -601,6 +601,11 @@ Version 1.6
                          Controls whether the full folder path is shown in the
                          "Timers" menu, or just the basic recording name.
 
+  Always sort folders first = yes
+                         In the "Recordings" menu folders are always listed before
+                         plain recordings. Set this option to "no" if you want folders
+                         to be interspersed with recordings when sorted alphabetically.
+
   Number keys for characters = yes
                          Controls whether the number keys can be used to enter
                          characters in a text input field. You may want to set this
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 74a36dbe7..53e70e81e 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -109,3 +109,8 @@ VDR Plugin 'skincurses' Revision History
 2013-01-12: Version 0.1.14
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-03: Version 0.1.15
+
+- The "Recording info" page now displays the name of the channel (if available)
+  from which this recording was taken.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 2a9f042d1..da9d17ae3 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.11 2013/01/12 14:13:12 kls Exp $
+ * $Id: skincurses.c 2.12 2013/03/03 15:33:59 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.14";
+static const char *VERSION        = "0.1.15";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -447,8 +447,7 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
   const cRecordingInfo *Info = Recording->Info();
   int y = 2;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index 3ed9db0be..0632bfbad 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -194,6 +194,7 @@ Devices:
   handling of a CAM.
 - The new functions cDevice::CanScaleVideo() and cDevice::ScaleVideo() can be used by
   derived output devices to implement scaling the video to a given size and location.
+- Added support for DVB-S2 and DVB-T2 transponders that use "multi streaming".
 
 DiSEqC:
 
@@ -267,6 +268,10 @@ OSD:
   folder (provided you have write access to that folder).
   If a folder is newly created by a repeating timer, the sort mode for that
   folder is initially set to "by time".
+  Note that in previous versions the default sort order of the top level video
+  directory was "by name" and all subdirectories were sorted "by time". Now the
+  default sort order for all directories is "by name", so if you have an existing
+  folder that shall be sorted "by time", press the '0' key once to achieve this.
 - The new setup option "Miscellaneous/Show channel names with source" can be used to
   turn on adding the source character to channel names whenever they are displayed.
 - Pressing the Play key during normal live viewing mode now opens the Recordings menu
diff --git a/config.c b/config.c
index 2c87985a3..3dc9fe848 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.35 2013/02/14 15:14:37 kls Exp $
+ * $Id: config.c 2.37 2013/03/10 14:56:51 kls Exp $
  */
 
 #include "config.h"
@@ -420,6 +420,7 @@ cSetup::cSetup(void)
   VpsMargin = 120;
   RecordingDirs = 1;
   FoldersInTimerMenu = 1;
+  AlwaysSortFoldersFirst = 1;
   NumberKeysForChars = 1;
   ColorKey0 = 0;
   ColorKey1 = 1;
@@ -431,10 +432,10 @@ cSetup::cSetup(void)
   UseDolbyDigital = 1;
   ChannelInfoPos = 0;
   ChannelInfoTime = 5;
-  OSDLeftP = 0.03;
-  OSDTopP = 0.03;
-  OSDWidthP = 0.93;
-  OSDHeightP = 0.93;
+  OSDLeftP = 0.08;
+  OSDTopP = 0.08;
+  OSDWidthP = 0.87;
+  OSDHeightP = 0.84;
   OSDLeft = 54;
   OSDTop = 45;
   OSDWidth = 624;
@@ -624,6 +625,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
+  else if (!strcasecmp(Name, "AlwaysSortFoldersFirst")) AlwaysSortFoldersFirst = atoi(Value);
   else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey0"))           ColorKey0          = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey1"))           ColorKey1          = atoi(Value);
@@ -732,6 +734,7 @@ bool cSetup::Save(void)
   Store("VpsMargin",          VpsMargin);
   Store("RecordingDirs",      RecordingDirs);
   Store("FoldersInTimerMenu", FoldersInTimerMenu);
+  Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst);
   Store("NumberKeysForChars", NumberKeysForChars);
   Store("ColorKey0",          ColorKey0);
   Store("ColorKey1",          ColorKey1);
diff --git a/config.h b/config.h
index a6ab9735f..9d88d6c21 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.69 2013/02/18 10:41:43 kls Exp $
+ * $Id: config.h 2.71 2013/03/04 13:58:40 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.39"
-#define VDRVERSNUM   10739  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.40"
+#define VDRVERSNUM   10740  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.39"
-#define APIVERSNUM   10739  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.40"
+#define APIVERSNUM   10740  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -293,6 +293,7 @@ class cSetup : public cConfig<cSetupLine> {
   int VpsMargin;
   int RecordingDirs;
   int FoldersInTimerMenu;
+  int AlwaysSortFoldersFirst;
   int NumberKeysForChars;
   int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
   int VideoDisplayFormat;
diff --git a/device.c b/device.c
index ca897b0f4..ff51a1150 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.73 2013/02/16 14:39:30 kls Exp $
+ * $Id: device.c 2.74 2013/03/07 13:18:35 kls Exp $
  */
 
 #include "device.h"
@@ -1290,7 +1290,6 @@ int cDevice::PlaySubtitle(const uchar *Data, int Length)
 
 int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
 {
-  cMutexLock MutexLock(&mutexCurrentAudioTrack);
   bool FirstLoop = true;
   uchar c = Data[3];
   const uchar *Start = Data;
@@ -1468,7 +1467,7 @@ int cDevice::PlayTsSubtitle(const uchar *Data, int Length)
 int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 {
   int Played = 0;
-  if (Data == NULL) {
+  if (!Data) {
      tsToPesVideo.Reset();
      tsToPesAudio.Reset();
      tsToPesSubtitle.Reset();
@@ -1478,7 +1477,6 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
      return Length;
      }
   else {
-     cMutexLock MutexLock(&mutexCurrentAudioTrack);
      while (Length >= TS_SIZE) {
            if (Data[0] != TS_SYNC_BYTE) {
               int Skipped = 1;
diff --git a/dvbdevice.c b/dvbdevice.c
index 0a2f51a15..cd017a2db 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.83 2013/02/20 09:12:12 kls Exp $
+ * $Id: dvbdevice.c 2.84 2013/03/07 09:42:29 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -23,6 +23,7 @@
 
 #if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
 #define DTV_STREAM_ID DTV_DVBT2_PLP_ID
+#define FE_CAN_MULTISTREAM 0x4000000
 #endif
 
 #define DVBS_TUNE_TIMEOUT  9000 //ms
@@ -207,7 +208,7 @@ cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
   guard        = GUARD_INTERVAL_AUTO;
   hierarchy    = HIERARCHY_AUTO;
   rollOff      = ROLLOFF_AUTO;
-  plpId        = 0;
+  streamId     = 0;
   Parse(Parameters);
 }
 
@@ -230,7 +231,7 @@ cString cDvbTransponderParameters::ToString(char Type) const
   ST("ACST*")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
   ST("ACST*")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
   ST("  S 2")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
-  ST("   T2")  q += PrintParameter(q, 'P', plpId);
+  ST("  ST2")  q += PrintParameter(q, 'P', streamId);
   ST("  ST*")  q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter
   ST("   T*")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
   ST("   T*")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
@@ -266,7 +267,7 @@ bool cDvbTransponderParameters::Parse(const char *s)
           case 'L': polarization = 'L'; s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
           case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
-          case 'P': s = ParseParameter(s, plpId); break;
+          case 'P': s = ParseParameter(s, streamId); break;
           case 'R': polarization = 'R'; s++; break;
           case 'S': s = ParseParameter(s, system, SystemValuesSat); break; // we only need the numerical value, so Sat or Terr doesn't matter
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
@@ -795,6 +796,7 @@ bool cDvbTuner::SetFrontend(void)
         // DVB-S2
         SETCMD(DTV_PILOT, PILOT_AUTO);
         SETCMD(DTV_ROLLOFF, dtp.RollOff());
+        SETCMD(DTV_STREAM_ID, dtp.StreamId());
         }
      else {
         // DVB-S
@@ -828,7 +830,7 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
      if (frontendType == SYS_DVBT2) {
         // DVB-T2
-        SETCMD(DTV_STREAM_ID, dtp.PlpId());
+        SETCMD(DTV_STREAM_ID, dtp.StreamId());
         }
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
@@ -968,7 +970,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
     case  9: ST("   T")  return new cMenuEditMapItem( tr("Guard"),        &dtp.guard,        GuardValues);        else return GetOsdItem();
     case 10: ST("   T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
     case 11: ST("  S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
-    case 12: ST("   T")  return new cMenuEditIntItem( tr("PlpId"),        &dtp.plpId,        0, 255);             else return GetOsdItem();
+    case 12: ST("  ST")  return new cMenuEditIntItem( tr("StreamId"),     &dtp.streamId,     0, 255);             else return GetOsdItem();
     default: return NULL;
     }
   return NULL;
@@ -1436,6 +1438,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
      return false; // doesn't provide source
   cDvbTransponderParameters dtp(Channel->Parameters());
   if (!ProvidesDeliverySystem(GetRequiredDeliverySystem(Channel, &dtp)) ||
+     dtp.StreamId()   != 0        && !(frontendInfo.caps & FE_CAN_MULTISTREAM) ||
      dtp.Modulation() == QPSK     && !(frontendInfo.caps & FE_CAN_QPSK) ||
      dtp.Modulation() == QAM_16   && !(frontendInfo.caps & FE_CAN_QAM_16) ||
      dtp.Modulation() == QAM_32   && !(frontendInfo.caps & FE_CAN_QAM_32) ||
diff --git a/dvbdevice.h b/dvbdevice.h
index 3674a615d..b4d07f584 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.28 2013/02/16 15:20:17 kls Exp $
+ * $Id: dvbdevice.h 2.29 2013/03/07 09:42:29 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -69,7 +69,7 @@ friend class cDvbSourceParam;
   int guard;
   int hierarchy;
   int rollOff;
-  int plpId;
+  int streamId;
   int PrintParameter(char *p, char Name, int Value) const;
   const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map = NULL);
 public:
@@ -85,7 +85,7 @@ friend class cDvbSourceParam;
   int Guard(void) const { return guard; }
   int Hierarchy(void) const { return hierarchy; }
   int RollOff(void) const { return rollOff; }
-  int PlpId(void) const { return plpId; }
+  int StreamId(void) const { return streamId; }
   void SetPolarization(char Polarization) { polarization = Polarization; }
   void SetInversion(int Inversion) { inversion = Inversion; }
   void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; }
@@ -97,7 +97,7 @@ friend class cDvbSourceParam;
   void SetGuard(int Guard) { guard = Guard; }
   void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; }
   void SetRollOff(int RollOff) { rollOff = RollOff; }
-  void SetPlpId(int PlpId) { plpId = PlpId; }
+  void SetStreamId(int StreamId) { streamId = StreamId; }
   cString ToString(char Type) const;
   bool Parse(const char *s);
   };
diff --git a/dvbplayer.c b/dvbplayer.c
index e936ca2cc..dc206a395 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.32 2013/02/25 12:15:58 kls Exp $
+ * $Id: dvbplayer.c 2.35 2013/03/08 13:44:19 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -33,6 +33,7 @@ class cPtsIndex {
 public:
   cPtsIndex(void);
   void Clear(void);
+  bool IsEmpty(void);
   void Put(uint32_t Pts, int Index);
   int FindIndex(uint32_t Pts);
   };
@@ -49,6 +50,12 @@ void cPtsIndex::Clear(void)
   w = r = 0;
 }
 
+bool cPtsIndex::IsEmpty(void)
+{
+  cMutexLock MutexLock(&mutex);
+  return w == r;
+}
+
 void cPtsIndex::Put(uint32_t Pts, int Index)
 {
   cMutexLock MutexLock(&mutex);
@@ -810,12 +817,14 @@ void cDvbPlayer::Goto(int Index, bool Still)
 
 void cDvbPlayer::SetAudioTrack(eTrackType Type, const tTrackId *TrackId)
 {
-  if (isPesRecording)
-     return; // for some unknown reason this doesn't work with PES recordings - causes a segfault
+  if (!cThread::IsMainThread())
+     return; // only do this upon user interaction
   if (playMode == pmPlay) {
-     int Current, Total;
-     if (GetIndex(Current, Total, true))
-        Goto(Current);
+     if (!ptsIndex.IsEmpty()) {
+        int Current, Total;
+        if (GetIndex(Current, Total, true))
+           Goto(Current);
+        }
      }
   else if (playMode == pmPause)
      resyncAfterPause = true;
diff --git a/epg2html b/epg2html
index 8b9e7b1f7..1b1a2516c 100755
--- a/epg2html
+++ b/epg2html
@@ -12,9 +12,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html 2.1 2011/12/04 14:17:35 kls Exp $
+# $Id: epg2html 2.2 2013/03/04 13:02:20 kls Exp $
 
 @Index = ();
+($Charset = $ENV{LANG}) =~ s/^[^.]*\.?(.*)/$1/;
+$Charset = "utf-8" unless $Charset || $ENV{LANG} == 'C';
 
 sub GetDay
 {
@@ -79,10 +81,16 @@ while (<>) {
                       }
                   push(@Schedule, "</table>\n") if (@Schedule);
                   open(PAGE, ">$Page") or die "$Page: $!\n";
-                  print PAGE "<html>\n<head><title>$Channel</title><head>\n<body>\n";
+                  print PAGE "<html>\n";
+                  print PAGE "<head>\n";
+                  print PAGE "<title>$Channel</title>\n";
+                  print PAGE "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=$Charset\">\n";
+                  print PAGE "</head>\n";
+                  print PAGE "<body>\n";
                   print PAGE "<h1>$Channel</h1>\n";
                   print PAGE @Schedule;
-                  print PAGE "</body>\n</html>\n";
+                  print PAGE "</body>\n";
+                  print PAGE "</html>\n";
                   close(PAGE);
                   last;
                   }
@@ -91,7 +99,13 @@ while (<>) {
       }
 
 open(INDEX, ">index.htm") or die "index.htm: $!\n";
-print INDEX "<html>\n<head><title>EPG Index</title><head>\n<body>\n";
+print INDEX "<html>\n";
+print INDEX "<head>\n";
+print INDEX "<title>EPG Index</title>\n";
+print INDEX "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=$Charset\">\n";
+print INDEX "</head>\n";
+print INDEX "<body>\n";
 print INDEX sort { lc($a) cmp lc($b) } @Index;
-print INDEX "</body>\n</html>\n";
+print INDEX "</body>\n";
+print INDEX "</html>\n";
 close(INDEX);
diff --git a/menu.c b/menu.c
index 4db68ec78..773269726 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.80 2013/02/19 09:33:26 kls Exp $
+ * $Id: menu.c 2.81 2013/03/04 14:11:47 kls Exp $
  */
 
 #include "menu.h"
@@ -2608,6 +2608,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"),        &data.MenuKeyCloses));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
+  Add(new cMenuEditBoolItem(tr("Setup.OSD$Always sort folders first"), &data.AlwaysSortFoldersFirst));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"),            &data.ColorKey0, 4, keyColorTexts));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"),            &data.ColorKey1, 4, keyColorTexts));
@@ -2649,6 +2650,8 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         ModifiedAppearance = true;
      if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
         ModifiedAppearance = true;
+     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst)
+        Recordings.ClearSortNames();
      }
 
   int oldSkinIndex = skinIndex;
diff --git a/nit.c b/nit.c
index c18aa8261..89988618d 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.9 2012/01/12 08:43:52 kls Exp $
+ * $Id: nit.c 2.10 2013/03/07 09:42:29 kls Exp $
  */
 
 #include "nit.h"
@@ -185,6 +185,21 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     }
                  }
                  break;
+            case SI::S2SatelliteDeliverySystemDescriptorTag: {
+                 if (Setup.UpdateChannels >= 5) {
+                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                        if (!Channel->GroupSep() && cSource::IsSat(Channel->Source()) && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           SI::S2SatelliteDeliverySystemDescriptor *sd = (SI::S2SatelliteDeliverySystemDescriptor *)d;
+                           cDvbTransponderParameters dtp(Channel->Parameters());
+                           dtp.SetSystem(DVB_SYSTEM_2);
+                           dtp.SetStreamId(sd->getInputStreamIdentifier());
+                           Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), dtp.ToString('S'));
+                           break;
+                           }
+                        }
+                    }
+                 }
+                 break;
             case SI::CableDeliverySystemDescriptorTag: {
                  SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
                  cDvbTransponderParameters dtp;
@@ -317,7 +332,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   //int SystemId = td->getSystemId();
                                   cDvbTransponderParameters dtp(Channel->Parameters());
                                   dtp.SetSystem(DVB_SYSTEM_2);
-                                  dtp.SetPlpId(td->getPlpId());
+                                  dtp.SetStreamId(td->getPlpId());
                                   if (td->getExtendedDataFlag()) {
                                      static int T2Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 10000000, 1712000, 0, 0 };
                                      dtp.SetBandwidth(T2Bandwidths[td->getBandwidth()]);
diff --git a/po/ar.po b/po/ar.po
index 416579310..80d3e7de3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,7 +1,7 @@
 # VDR language source file.
-# Copyright (C) 2008 Osama Alrawab <alrawab@hotmail.com>
+# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Osama Alrawab <alrawab@hotmail.com>, 2008
+# Osama Alrawab <alrawab@hotmail.com>, 2010, 2013
 #
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "********قناة خاطئة***************"
+msgstr "*** قناة خاطئة ***"
 
 msgid "Channel not available!"
 msgstr "القناة غير متاحة"
@@ -33,7 +33,7 @@ msgid "off"
 msgstr "ايقاف"
 
 msgid "on"
-msgstr ""
+msgstr "تشغيل"
 
 msgid "auto"
 msgstr "ذاتى"
@@ -45,7 +45,7 @@ msgid "Polarization"
 msgstr "الاستقطاب"
 
 msgid "System"
-msgstr ""
+msgstr "النظام"
 
 msgid "Srate"
 msgstr "معدل الترميز"
@@ -75,254 +75,254 @@ msgid "Hierarchy"
 msgstr "الهرمية"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Movie/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detective/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Adventure/Western/War"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Science Fiction/Fantasy/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Comedy"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Soap/Melodrama/Folkloric"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romance"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Serious/Classical/Religious/Historical Movie/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Adult Movie/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "News/Current Affairs"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "News/Weather Report"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "News Magazine"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documentary"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussion/Inverview/Debate"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Show/Game Show"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Game Show/Quiz/Contest"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Variety Show"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk Show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Sports"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Special Event"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Sport Magazine"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Football/Soccer"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Squash"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Team Sports"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Athletics"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Motor Sport"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Water Sport"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Winter Sports"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equestrian"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Martial Sports"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Children's/Youth Programme"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Pre-school Children's Programme"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Entertainment Programme for 6 to 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Entertainment Programme for 10 to 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informational/Educational/School Programme"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Cartoons/Puppets"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Music/Ballet/Dance"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Serious/Classical Music"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Folk/Tradional Music"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arts/Culture"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Performing Arts"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Fine Arts"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religion"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Popular Culture/Traditional Arts"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literature"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Film/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Experimental Film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Broadcasting/Press"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "New Media"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Arts/Culture Magazine"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Fashion"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Social/Political/Economics"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazine/Report/Documentary"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Economics/Social Advisory"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Remarkable People"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Education/Science/Factual"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Nature/Animals/Environment"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Technology/Natural Sciences"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicine/Physiology/Psychology"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Foreign Countries/Expeditions"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Social/Spiritual Sciences"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Further Education"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Languages"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Leisure/Hobbies"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Tourism/Travel"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Handicraft"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motoring"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness & Health"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cooking"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Advertisement/Shopping"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Gardening"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Original Language"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Black & White"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Unpublished"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Live Broadcast"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "from %d"
 
 msgid "No title"
 msgstr "لايوجد عنوان"
@@ -415,7 +415,7 @@ msgid "Key$Info"
 msgstr "معلومات"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Play/Pause"
 
 msgid "Key$Play"
 msgstr "عرض"
@@ -487,7 +487,7 @@ msgid "Key$Commands"
 msgstr "اوامر"
 
 msgid "Key$User0"
-msgstr ""
+msgstr "المستخدم 0"
 
 msgid "Key$User1"
 msgstr "المستخدم 1"
@@ -547,25 +547,25 @@ msgid "Apid2"
 msgstr "PID الصوت 2"
 
 msgid "Dpid1"
-msgstr ""
+msgstr "Dpid1"
 
 msgid "Dpid2"
-msgstr ""
+msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
-msgstr ""
+msgstr "Tpid"
 
 msgid "CA"
 msgstr "الكامة"
 
 msgid "Sid"
-msgstr ""
+msgstr "Sid"
 
 msgid "Channel settings are not unique!"
 msgstr "اعدادات القناة غبر موحد"
@@ -592,29 +592,29 @@ msgid "Delete channel?"
 msgstr "حذف القناة"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "تحرير مجلد"
 
 msgid "New folder"
-msgstr ""
+msgstr "مجلد جديد"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "مجلد فرعى"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "المجلد موجود بالفعل"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "'%c'! اسم المجلد لا يجب ان يحتوى على"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "الزر"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "حذف المجلد وكل المجلدات الفرعية"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "حذف مجلد؟"
 
 msgid "Edit timer"
 msgstr "تعديل الموءقت"
@@ -635,7 +635,7 @@ msgid "Stop"
 msgstr "ايقاف"
 
 msgid "VPS"
-msgstr ""
+msgstr "VPS"
 
 msgid "Priority"
 msgstr "الاستقطاب"
@@ -647,19 +647,19 @@ msgid "File"
 msgstr "ملف"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Folder"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Single"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repeating"
 
 msgid "First day"
 msgstr "اليوم الاول"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Select folder"
 
 msgid "Timers"
 msgstr "الموءقت"
@@ -749,7 +749,7 @@ msgid "Delete recording?"
 msgstr "حذف التسجيل"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Recording is being edited - really delete?"
 
 msgid "Error while deleting recording!"
 msgstr "حدث خطاء عند محاولة حذف التسجيل"
@@ -779,16 +779,16 @@ msgid "Setup.OSD$Theme"
 msgstr " الثيمة"
 
 msgid "Setup.OSD$Left (%)"
-msgstr ""
+msgstr "Left (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr ""
+msgstr "Top (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr ""
+msgstr "Width (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr ""
+msgstr "Height (%)"
 
 msgid "Setup.OSD$Message time (s)"
 msgstr "مواقيت الرسائل"
@@ -809,13 +809,13 @@ msgid "Setup.OSD$Fixed font"
 msgstr "الخط ثابت"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr ""
+msgstr "Default font size (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr ""
+msgstr "Small font size (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr ""
+msgstr "Fixed font size (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr " موضع معلومات القناة"
@@ -848,22 +848,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "مجلد التسجيلات"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Folders in timer menu"
+
+msgid "Setup.OSD$Always sort folders first"
+msgstr "قم دائما بسرد المجلدات اولا"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Number keys for characters"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Color key 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Color key 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Color key 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Color key 3"
 
 msgid "EPG"
 msgstr "الدليل الالكتونى للقنوات"
@@ -934,7 +937,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "كرت الستالايت الاولى"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Standard compliance"
 
 msgid "Setup.DVB$Video format"
 msgstr "نوع الفيديو  "
@@ -989,10 +992,10 @@ msgstr "التردد المرتفع للاقط م هرتز"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Device %d connected to sat cable"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "own"
 
 msgid "CAM reset"
 msgstr "اعادة تشغيل الكامة"
@@ -1025,16 +1028,16 @@ msgid "Can't reset CAM!"
 msgstr "تعذر اعادة تشغيل الكامة"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "لا تقم بايقاف الفديو الحى"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "تاكيد ايقاف الفديو الحى"
 
 msgid "pause live video"
-msgstr ""
+msgstr "ايقاف الفديو الحى"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirm"
 
 msgid "yes"
 msgstr "نعم"
@@ -1043,10 +1046,10 @@ msgid "Recording"
 msgstr "تسجيل"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr ""
+msgstr "Margin at start (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr ""
+msgstr "Margin at stop (min)"
 
 msgid "Setup.Recording$Default priority"
 msgstr "الاولويات الافتراضية"
@@ -1055,7 +1058,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "معدل البقاء باليوم"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Pause key handling"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "تعطيل الاولويات"
@@ -1070,7 +1073,7 @@ msgid "Setup.Recording$Use VPS"
 msgstr "استعمل VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr ""
+msgstr "VPS margin (s)"
 
 msgid "Setup.Recording$Mark instant recording"
 msgstr "علم التسجيل الفورى"
@@ -1082,7 +1085,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "مدة التسجيل الفورى بالدقيقة"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "present event"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "اقصى حجم لملف الفيديو ب م ب"
@@ -1091,7 +1094,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "اقسم الملف المعدل"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Delete timeshift recording"
 
 msgid "Replay"
 msgstr "اعادة عرض"
@@ -1103,13 +1106,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "اضهر طور الاعادة"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Show remaining time"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Progress display time (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pause replay when setting mark"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
@@ -1124,19 +1127,19 @@ msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "اقل مدة لعدم تفاعل المستخدم بالدقيقة"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr ""
+msgstr "SVDRP timeout (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr ""
+msgstr "Zap timeout (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "مدة انتهاء مدخلات القناة بالدقيقة"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Remote control repeat delay (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Remote control repeat delta (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "القناة الاساسية"
@@ -1148,10 +1151,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "فعل الصوت"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Channels wrap"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Show channel names with source"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "خروج طارىء"
@@ -1220,7 +1223,7 @@ msgid "Pausing live video..."
 msgstr "تجميد العرض الحى"
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Delete timeshift recording?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1230,7 +1233,7 @@ msgid "No editing marks defined!"
 msgstr "لاتوجد علامات تعديل معرفة"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "No editing sequences defined!"
 
 msgid "Can't start editing process!"
 msgstr "لا يمكن البدء فى عملية التعديل"
@@ -1242,13 +1245,13 @@ msgid "Editing process already active!"
 msgstr "عملية التعديل نشطة بالفعل"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr ""
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr ""
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
-msgstr ""
+msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
 msgstr "اعادة الكتابة"
@@ -1269,13 +1272,13 @@ msgid "Low disk space!"
 msgstr "مساحة القرص غير كافية"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Regenerating index file"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Index file regeneration complete"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Index file regeneration failed!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "لا يمكن قفل الحاسوب الرمز s لم يحدد"
@@ -1295,16 +1298,16 @@ msgstr "الاغلاق على اى حال"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Plugin %s wakes up in %ld min, continue?"
 
 msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Editing - restart anyway?"
 
 msgid "Recording - restart anyway?"
-msgstr ""
+msgstr "Recording - restart anyway?"
 
 msgid "restart anyway?"
-msgstr ""
+msgstr "restart anyway?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1314,33 +1317,33 @@ msgid "Classic VDR"
 msgstr "VDR تقليدى  "
 
 msgid "DISK"
-msgstr ""
+msgstr "قرص"
 
 msgid "LOAD"
-msgstr ""
+msgstr "تجميل"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "مؤقت"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "جهاز"
 
 msgid "LIVE"
-msgstr ""
+msgstr "بث حى"
 
 msgid "PLAY"
-msgstr ""
+msgstr "عرض"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG شاشة "
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr ""
+msgstr "MTWTFSS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr ""
+msgstr "MonTueWedThuFriSatSun"
 
 msgid "Monday"
 msgstr "الاحد"
@@ -1364,10 +1367,10 @@ msgid "Sunday"
 msgstr "الاحد"
 
 msgid "Upcoming recording!"
-msgstr ""
+msgstr "التسجيل القادم"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "ايقاف الفديو الحى"
 
 msgid "Recording started"
 msgstr "ابتداء التسجيل"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index f1a24fcda..22aeb0529 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -4,13 +4,13 @@
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
 # Jordi Vil� <jvila@tinet.org>, 2003
-# Luca Olivetti <luca@ventoso.org>, 2008
+# Luca Olivetti <luca@ventoso.org>, 2008, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -32,7 +32,7 @@ msgid "off"
 msgstr "off"
 
 msgid "on"
-msgstr ""
+msgstr "on"
 
 msgid "auto"
 msgstr "auto"
@@ -44,7 +44,7 @@ msgid "Polarization"
 msgstr "Polaritzaci�"
 
 msgid "System"
-msgstr ""
+msgstr "Sistema"
 
 msgid "Srate"
 msgstr "Srate"
@@ -74,254 +74,254 @@ msgid "Hierarchy"
 msgstr "Jerarquia"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Iniciant exploraci� EPG"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Pel�l�cula/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detectiu/Thriller"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Aventura/Oest/Guerra"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Ci�ncia-ficci�/Fantasia/Horror"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Com�dia"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Telenovel�la/Melodrama/Folklore"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Rom�ntic"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Seri�s/Cl�ssic/Relogi�s/Pel�l�cula hist�rica/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Pel�l�cula per a adults/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Not�cies/Actualitat"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Not�cies/El temps"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Revista de not�cies"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Documental"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Discussi�/Entrevista/Debat"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Espectacle/Jocs"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Jocs/Concurso"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Espectacle de varietats"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Talk show"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "Esports"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Esdeveniment especial"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "Revista d'esports"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Futbol"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tennis/Esquaix"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Esports d'equip"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletisme"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Esports de motor"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Esports aqu�tics"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Esports d'hivern"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Equitaci�"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Arts marcials"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Programa per a nens/joves"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Programa per a nens de preescolar"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Programa d'entreteniment de 6 a 14 anys"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Programa d'entreteniment de 10 a 16 anys"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informatiu/Educatiu/Programa escolar"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Dibuixos/Titelles"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "M�sica/Ballet/Dansa"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rock/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "M�sica cl�ssica/seriosa"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "M�sica folkl�rica/tradicional"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Musical/Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Ballet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Arts/Cultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Arts esc�niques"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Belles arts"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Religi�"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Cultura popular/Arts tradicionals"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Pel�l�cula/Cinema"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Pel�l�cula/V�deo experimental"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Radiodifusi�/Premsa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Nous mitjans de comunicaci�"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Revista d'art/cultura"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Societat/Pol�tica/Economia"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Revista/Informe/Documental"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Assessorament econ�mic/social"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Persones notables"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Educaci�/Ci�ncia/Factual"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Naturalesa/Animals/Medi ambient"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tecnologia/Ci�ncies naturals"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Fisiologia/Psicologia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Pa�sos estrangers/Expedicions"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Ci�ncies socials/espirituals"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Educaci� superior"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Lleng�es"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Oci/Afici�ns"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turisme/Viatges"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Manualitats"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Motor"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitness i salut"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Cuina"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Publicitat/Compres"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Jardineria"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Idioma original"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "Blanc i negre"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "No publicat"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Emissi� en directe"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "de %d"
 
 msgid "No title"
 msgstr "Sense t�tol"
@@ -414,7 +414,7 @@ msgid "Key$Info"
 msgstr "Informaci�"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Repr./Pausa"
 
 msgid "Key$Play"
 msgstr "Reproduir"
@@ -591,29 +591,29 @@ msgid "Delete channel?"
 msgstr "Esborrar el canal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Modificar carpeta"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nova carpeta"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Sub carpeta"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "La carpeta ja existeix!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "El nom de la carpeta no pot contenir '%c'"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Seleccionar"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Esborrar carpetas i totes les sub carpetes?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Esborrar carpeta?"
 
 msgid "Edit timer"
 msgstr "Editar temporitzador"
@@ -646,19 +646,19 @@ msgid "File"
 msgstr "Arxiu"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Carpeta"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Individual"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Repetitiu"
 
 msgid "First day"
 msgstr "Primer dia"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Seleccioni carpeta"
 
 msgid "Timers"
 msgstr "Temporitzadors"
@@ -748,7 +748,7 @@ msgid "Delete recording?"
 msgstr "Esborrar gravaci�?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "S'est� editant la gravaci� - esborrar igualment?"
 
 msgid "Error while deleting recording!"
 msgstr "Error a l'esborrar la gravaci�!"
@@ -847,22 +847,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Gravacions en subcarpetes"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Carpetes en men� temporitzadors"
+
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sempre ordenar primer carpetes"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Tecles num�riques per a car�cters "
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Tecla color 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Tecla color 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Tecla color 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Tecla color 3"
 
 msgid "EPG"
 msgstr "Guia de Programes"
@@ -900,7 +903,7 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "center cut out"
+msgstr "nom�s part central"
 
 msgid "no"
 msgstr "no"
@@ -933,7 +936,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Tarja DVB prim�ria"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Conformitat a est�ndards"
 
 msgid "Setup.DVB$Video format"
 msgstr "Format del v�deo"
@@ -988,10 +991,10 @@ msgstr "Freq
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Dispositiu %d connectat a cable sat�l�lit"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "propi"
 
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
@@ -1024,16 +1027,16 @@ msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "no pausar emissi� en directe"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "confirmar pausar emissi� en directe"
 
 msgid "pause live video"
-msgstr ""
+msgstr "pausar emissi� en directe"
 
 msgid "confirm"
-msgstr ""
+msgstr "confirmar"
 
 msgid "yes"
 msgstr "s�"
@@ -1054,7 +1057,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durada predefinida"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gesti� tecla pausa"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritat de la pausa"
@@ -1081,7 +1084,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Temps de gravaci� instant�nia (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "esdeveniment actual"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Mida m�xima de l'arxiu (MB)"
@@ -1090,7 +1093,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Separar arxius"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Esborrar gravacions timeshift"
 
 msgid "Replay"
 msgstr "Opcions de Reproducci�"
@@ -1102,13 +1105,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Mostrar mode de reproducci�"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Mostrar temps restant"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Visualitzaci� temps avan� (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pausar reproducci� en establir marca"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
@@ -1132,10 +1135,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Temps d'introducci� canal (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Retard repetici� comandament a dist�ncia (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Delta repetici� comandament a dist�ncia (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Canal inicial"
@@ -1147,10 +1150,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volum inicial"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Primer canal despr�s de l'ultim"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Mostrar noms canals amb fonts"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Sortida d'emerg�ncia"
@@ -1219,17 +1222,17 @@ msgid "Pausing live video..."
 msgstr "Pausa d'emissi� en directe..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Esborrar gravaci� timeshift?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "Salta a:"
+msgstr "Salta a: "
 
 msgid "No editing marks defined!"
 msgstr "No hi ha marques d'edici� definides"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "No hi ha seq��ncies d'edici� definides"
 
 msgid "Can't start editing process!"
 msgstr "No puc iniciar el proc�s d'edici�!"
@@ -1268,13 +1271,13 @@ msgid "Low disk space!"
 msgstr "Disc gaireb� ple!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Regenerant fitxer �ndex"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Regeneraci� fitxer �ndex acabada"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Ha fallat la regeneraci� del fitxer �ndex"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "No puc apagar, falta la opci� -s !"
@@ -1313,22 +1316,22 @@ msgid "Classic VDR"
 msgstr "VDR clasico"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISC"
 
 msgid "LOAD"
-msgstr ""
+msgstr "C�RREGA"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TEMPORITZADORS"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "DISPOSITIUS"
 
 msgid "LIVE"
-msgstr ""
+msgstr "EN DIRECTE"
 
 msgid "PLAY"
-msgstr ""
+msgstr "REPRODUIR"
 
 msgid "ST:TNG Panels"
 msgstr "Quadres ST:TNG"
@@ -1366,7 +1369,7 @@ msgid "Upcoming recording!"
 msgstr "Gravaci� a punt d'iniciar!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Pausar emissi� en directe?"
 
 msgid "Recording started"
 msgstr "Gravaci� comen�ada"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 6a833ea8d..818c9c17c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
-"Last-Translator: Aleš Ju�~Yík <ajurik@quick.cz>\n"
+"Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -76,8 +76,8 @@ msgstr "Hierarchický mód"
 msgid "Rolloff"
 msgstr "RollOff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Začíná prohledávání EPG"
@@ -849,6 +849,9 @@ msgstr "Seznam nahrávek"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Složky v menu časovače"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Adresáře řadit vždy na začátek"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Psát písmena pomocí číselných kláves"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 511e03f65..73a212211 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "Hierarki"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "Optagelser i foldere"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 77af04a70..9e879771a 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -73,8 +73,8 @@ msgstr "Hierarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
@@ -846,6 +846,9 @@ msgstr "Aufnahmeverzeichnisse"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Verzeichnisse im Timer-Men�"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Verzeichnisse immer zuerst einsortieren"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummerntasten f�r Zeichen"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index d0c1c7dfe..50fe4601c 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f5684e4d7..2ef8807af 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -74,8 +74,8 @@ msgstr "Jerarqu
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
@@ -847,6 +847,9 @@ msgstr "Mostrar carpetas de grabaciones"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Carpetas en men� timers"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Siempre ordenar primero carpetas"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
@@ -1314,7 +1317,7 @@ msgid "DISK"
 msgstr "DISCO"
 
 msgid "LOAD"
-msgstr "CARGAR"
+msgstr "CARGA"
 
 msgid "TIMERS"
 msgstr "TIMERS"
diff --git a/po/et_EE.po b/po/et_EE.po
index ffb3c91b2..e60cf5aea 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -73,8 +73,8 @@ msgstr "Hierarhia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PLP-tunnus"
+msgid "StreamId"
+msgstr "Stream-tunnus"
 
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine käivitatud"
@@ -846,6 +846,9 @@ msgstr "Kausta nime salvestamine"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Kaustad taimeri menüüs"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sorteerida kaustad alati ette"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index dbf3e80ee..7475eb79e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -4,15 +4,16 @@
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003, 2004, 2005, 2006, 2007, 2008
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003-2008, 2010-2013
+# Matti Lehtimäki <matti.lehtimaki@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -76,8 +77,8 @@ msgstr "Hierarkia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PLP-tunniste"
+msgid "StreamId"
+msgstr "Lähetetunniste"
 
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan päivitys aloitettu"
@@ -849,6 +850,9 @@ msgstr "Näytä tallennehakemistot"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Näytä kansiot ajastinvalikossa"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Näytä kansiot ensin"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e12b59846..57a6927b7 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -11,14 +11,15 @@
 # Marc Perrudin <vdr@ekass.net>, 2013
 # Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
 # Peter Münster <pmlists@free.fr>, 2013
+# Dominique Plu <dplu@free.fr>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
-"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
+"Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -82,8 +83,8 @@ msgstr "Hiérarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Mise à jour du guide des programmes"
@@ -855,6 +856,9 @@ msgstr "Dossiers d'enregistrements"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Dossiers dans menu programmation"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Toujours trier les dossiers en premier"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Touches numériques pour caractères"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index af63cc12f..3a0f73ab9 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -75,7 +75,7 @@ msgstr "Hijerarhija"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -848,6 +848,9 @@ msgstr "Imenik za snimke"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 260668a67..26ed167a7 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -77,8 +77,8 @@ msgstr "Hierarhia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PLP azonosító"
+msgid "StreamId"
+msgstr "Stream azonosító"
 
 msgid "Starting EPG scan"
 msgstr "EPG adatok aktualizálása"
@@ -850,6 +850,9 @@ msgstr "Felvételek listája"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Könyvtárválasztás az időzítő menüben"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Számgombok a betűkön"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index e6c848b70..ebd68f9ba 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-11 23:46+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -80,8 +80,8 @@ msgstr "Gerarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -853,6 +853,9 @@ msgstr "Directory di registrazione"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Cartelle nel menu timer"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Ordina sempre per prima le cartelle"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index e9f24ca49..6337db4b6 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -73,8 +73,8 @@ msgstr "Hierarchija"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
@@ -846,6 +846,9 @@ msgstr "Įrašų katalogai"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogai esantys laikmačių meniu"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index aed2f83c9..39444c74e 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-1.7.14\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -74,8 +74,8 @@ msgstr "Хиерархија"
 msgid "Rolloff"
 msgstr "Рол-оф"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Започнувам скенирање на EPG"
@@ -847,6 +847,9 @@ msgstr "Директориум за снимки"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Директориуми во менито за тајмер"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Секогаш сортирај прво папки"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Нумерички копчиња за букви"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c95b22aa8..1d1bb731c 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -6,14 +6,15 @@
 # Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>, 2005
 # Carel Willemse <carel@nekanali.nl>, 2008, 2013
 # Johan Schuring <johan.schuring@vetteblei.nl>, 2008
+# Cedric Dewijs <cedric.dewijs@telfort.nl>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.38\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
-"Last-Translator: Carel Willemse <carel@nekanali.nl>\n"
+"Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -77,8 +78,8 @@ msgstr "Hierarchie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
@@ -850,6 +851,9 @@ msgstr "Opname mappen"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Mappen in timermenu"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Altijd mappen eerst sorteren"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummertoetsen voor karakters"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 664018bbc..c8491e1ea 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -74,7 +74,7 @@ msgstr "Hierarchy"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -847,6 +847,9 @@ msgstr "Kataloger til opptak"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 351e59f74..35a39c434 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -75,8 +75,8 @@ msgstr "Hierarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
@@ -848,6 +848,9 @@ msgstr "Katalogi nagra
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogi w menu timera"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Klawisze numeryczne dla liter"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9dec2876d..a485e2ba5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.15\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -74,7 +74,7 @@ msgstr "Hierarquia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -847,6 +847,9 @@ msgstr "Pasta de grava
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Pastas no menu de grava��es"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 4c257ad8f..a7b6ce81a 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.37\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -75,8 +75,8 @@ msgstr "Ierarhie"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "Identificator PLP"
+msgid "StreamId"
+msgstr "Identificator Stream"
 
 msgid "Starting EPG scan"
 msgstr "Pornesc achiziţia EPG"
@@ -848,6 +848,9 @@ msgstr "Directoare înregistrări"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Directoare în meniul de timer-e"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sortează întotdeauna directoarele la început"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Caractere pe tastele numerice"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3f4f98495..ea09a3ff8 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-03-03 13:43+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -74,8 +74,8 @@ msgstr "
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
@@ -847,6 +847,9 @@ msgstr "
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "���������� � ���� ������"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "���������� ������ ��� ��������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 6aea45c27..977d7636c 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.7.16\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2013-01-29 22:39+0100\n"
+"PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
@@ -73,11 +73,11 @@ msgstr "Hierarchia"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
-msgstr "Za��na preh�ad�va� EPG"
+msgstr "Sp���a sa sn�manie EPG"
 
 msgid "Content$Movie/Drama"
 msgstr "Film/Dr�ma"
@@ -763,7 +763,7 @@ msgid "always"
 msgstr "v�dy"
 
 msgid "OSD"
-msgstr "OSD"
+msgstr "OSD (Menu na obrazovke)"
 
 msgid "Setup.OSD$Language"
 msgstr "Jazyk"
@@ -841,11 +841,14 @@ msgid "Setup.OSD$Menu key closes"
 msgstr "Kl�vesa Menu zaviera"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Zoznam nahr�vok"
+msgstr "Prev�dzkova� zlo�ky nahr�vky"
 
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Zlo�ky v menu pl�nova�a"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Zlo�ky v�dy najprv usporiada�"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "P�sa� znaky ��seln�mi tla�idlami"
 
@@ -862,16 +865,16 @@ msgid "Setup.OSD$Color key 3"
 msgstr "Farba kl�vesy 3"
 
 msgid "EPG"
-msgstr "EPG"
+msgstr "EPG (Elektronick� programov� sprievodca)"
 
 msgid "Button$Scan"
 msgstr "Skenova�"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "�asov� limit pre sn�manie EPG (h)"
+msgstr "Interval sn�mania EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG �rove� chyb"
+msgstr "�rove� opravy EPG ch�b"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Ukazova� star�ie EPG d�ta (min)"
@@ -918,7 +921,7 @@ msgid "add new transponders"
 msgstr "prida� nov� transpond�ry"
 
 msgid "DVB"
-msgstr "DVB"
+msgstr "DVB (digit�lne telev�zne vysielanie)"
 
 msgid "Button$Audio"
 msgstr "Zvuk"
@@ -969,7 +972,7 @@ msgid "Setup.DVB$Subtitle background transparency"
 msgstr "Prieh�adnos� pozadia titulkov"
 
 msgid "LNB"
-msgstr "LNB"
+msgstr "LNB (n�zko �umov� jednotka)"
 
 msgid "Setup.LNB$Use DiSEqC"
 msgstr "Pou��va� DiSEqC"
@@ -1000,7 +1003,7 @@ msgid "CAM ready"
 msgstr "CAM pripraven�"
 
 msgid "CAM"
-msgstr "CAM"
+msgstr "CAM (modul podmienen�ho pr�stupu)"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1054,10 +1057,10 @@ msgid "Setup.Recording$Pause key handling"
 msgstr "Chovanie kl�vesy pozastavenia"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorita preru�enia"
+msgstr "Priorita pozastavenia"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "�ivotnos� preru�enia (d)"
+msgstr "�ivotnos� pozastavania (d)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Pou��va� n�zov epiz�dy"
@@ -1072,7 +1075,7 @@ msgid "Setup.Recording$Mark instant recording"
 msgstr "Ozna�i� okam�it� nahr�vky"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Premenova� okam�it� nahr�vky"
+msgstr "Pomenova� okam�it� nahr�vky"
 
 msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "D�ka okam�it�ho nahr�vania (min)"
@@ -1102,7 +1105,7 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Zobrazi� zost�vaj�ci �as"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr "�as zobrazenia ukazovate�a priebehu (s)"
+msgstr "Doba zobrazenia ukazovate�a priebehu (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pozastavi� prehr�vanie pri stanoven� zna�ky"
@@ -1114,25 +1117,25 @@ msgid "Miscellaneous"
 msgstr "R�zne"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "limit pred nahr�van�m (min)"
+msgstr "V pohotovosti pred nahr�van�m (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "vymedzi� u��vate�sk� ne�innos� (min)"
+msgstr "Vymedzi� u��vate�sk� ne�innos� (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "�asov� limit SVDRP (s)"
+msgstr "�asov� limit odpovede SVDRP (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "pam�ta� predo�l� kan�l po ... (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "limit pri vo�be kan�la (ms)"
+msgstr "Limit pri ��selnej vo�be kan�la (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Zdr�anie opakovan�ho stla�enia  tla�idla (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Peri�da opakovania stla�en�ho tla�idla (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Kan�l po spusten�"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6c6abb557..86fefbc08 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
-# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008
+# Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2008-02-28 19:44+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
 "Language: sl\n"
@@ -30,7 +30,7 @@ msgid "off"
 msgstr "izklop"
 
 msgid "on"
-msgstr ""
+msgstr "vklop"
 
 msgid "auto"
 msgstr "avtomatsko"
@@ -42,7 +42,7 @@ msgid "Polarization"
 msgstr "Polarizacija"
 
 msgid "System"
-msgstr ""
+msgstr "System"
 
 msgid "Srate"
 msgstr "Srate"
@@ -72,254 +72,254 @@ msgid "Hierarchy"
 msgstr "Hierarhija"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Odpadanje"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "Film/Drama"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "Detektiv/Triler"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "Kavbojka/Vojna"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "Znanstvena fantastika/Grozljivka"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "Komedija"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "Melodrama/Folklora"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "Romantika"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "Resna/Klasi�na/Verska/Zgodovinski film/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "Film za odrasle/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "Novice/Trenutne afere"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "Novice/Vremenska napoved"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "Poro�ila"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "Dokumentarec"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "Diskudija/Interviju/Debata"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "Igra/Igrani �ov"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "Igrani �ov/Igre/Kviz"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "Variete"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "Pogovorna oddaja"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "�port"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "Posebni dogodki"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "�portni magazin"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "Nogomet"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "Tenis"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "Timski �port"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "Atletika"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "Moto dirke"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "Vodni �port"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "Zimski �port"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "Konjeni�tvo"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "Borilne ve��ine"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "Otro�ki/Mladinski program"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "Program za pred�olske otroke"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "Zabavni program za 6 do 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "Zabavni program za 10 do 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "Informativni/Izobra�evalni/�olski program"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "Risanke"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "Glasba/Balet/Ples"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "Rok/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "Resna/Klasi�na Glasba"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "Narodna/Tradicionalna glasba"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "Jazz"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "Opera"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "Balet"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "Kultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Igrana umetnost"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Uglajena umetnost"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "Vera"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "Popularna kultura/Tradicionalna umetnost"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "Literatura"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "Kino"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Eksperimentalni film/Video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Oddajanje/Novinarstvo"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Novi mediji"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Kulturni magazin"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "Sociala/Politika/Ekonomija"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "Magazin/Reporta�e/Dokumentarci"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomika/Socialno svetovanje"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "Izjemni ljudje"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Izobra�evanje/Znanost"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Narava/�ivali/Okolje"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tehnologija/Znanost o naravi"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Psihologija/Psihiatrija"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Tuje de�ele/Potovanja"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Sociala/Spiritualna znanost"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Nadaljne izobra�evanje"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Jeziki"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Hobiji"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Potovanja"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Obrti"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Avtomobilizem"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitnes in zdravje"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Kuhanje"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Ogla�evanje/Nakupovanje"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Vrtnarjenje"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Originalni jeziki"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "�rno in belo"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "Neobjavljeno"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "Oddaja v �ivo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "Star�evskaOcena$od %d"
 
 msgid "No title"
 msgstr "Brez naziva"
@@ -412,7 +412,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Nadaljuj/Pavza"
 
 msgid "Key$Play"
 msgstr "Predvajaj"
@@ -589,29 +589,29 @@ msgid "Delete channel?"
 msgstr "Izbri�i kanal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Uredi direktorij"
 
 msgid "New folder"
-msgstr ""
+msgstr "Nov direktorij"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "Pod direktorij"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "Ime direktorija �e obstaja"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "Direkotrij ne sme vsebobati '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Izberi"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "Izbri�i direktorij in vse pod direktorije"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Izbri�i direkotrij?"
 
 msgid "Edit timer"
 msgstr "Uredi termin"
@@ -644,19 +644,19 @@ msgid "File"
 msgstr "Datoteka"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Direktorij"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Enkraten"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Ponavljajo�e"
 
 msgid "First day"
 msgstr "Prvi dan"
 
 msgid "Select folder"
-msgstr ""
+msgstr "Izberi direkotrij"
 
 msgid "Timers"
 msgstr "Termini"
@@ -746,7 +746,7 @@ msgid "Delete recording?"
 msgstr "Izbri�i posnetek?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Posnetek se ureja - zares izbri�i?"
 
 msgid "Error while deleting recording!"
 msgstr "Napaka pri brisanju posnetka!"
@@ -812,7 +812,7 @@ msgid "Setup.OSD$Small font size (%)"
 msgstr "Majhna velikost pisave (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr ""
+msgstr "Font s fiksno dol�ino (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozicija informacije o kanalu"
@@ -845,22 +845,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "Direktoriji za posnetke"
 
 msgid "Setup.OSD$Folders in timer menu"
+msgstr "Direktoriji v meniju urnika"
+
+msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "�tevilo tipk za znake"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Barvni gumb 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Barvni gumb 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Barvni gumb 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Barvni gumb 3"
 
 msgid "EPG"
 msgstr "Programski vodnik"
@@ -931,7 +934,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarna naprava"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Skladnost s standardom"
 
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
@@ -986,10 +989,10 @@ msgstr "Zgornja LNB-frek. (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Naprava %d priklju�ena na satelitski kabel"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "lastni"
 
 msgid "CAM reset"
 msgstr "Reset CAM-a"
@@ -1022,16 +1025,16 @@ msgid "Can't reset CAM!"
 msgstr "Ne morem resetirati CAM-a!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "ne ustavi videa v �ivo"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "potrdi zaustavitev videa v �ivo"
 
 msgid "pause live video"
-msgstr ""
+msgstr "ustavi video v �ivo"
 
 msgid "confirm"
-msgstr ""
+msgstr "potrdi"
 
 msgid "yes"
 msgstr "da"
@@ -1052,7 +1055,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Privzeti �ivljenski �as (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Gumb za pavzo"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioriteta pavze"
@@ -1079,7 +1082,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "�as direktnega snemanja (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "trenutni dogodek"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Najve�ja velikost datoteke (MB)"
@@ -1088,7 +1091,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Razdeli urejene datoteke"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "Izbri�i snemanje z zamikom"
 
 msgid "Replay"
 msgstr "Predvajanje"
@@ -1100,13 +1103,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i re�im predvajanja"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Prika�i preostali �as"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Progresivni �as prikaza (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pavza predvajanja pri postavitvi zan�ke"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
@@ -1130,10 +1133,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Timeout za vnos kanala (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Ponavljajo�a pavza pri daljinski kontroli (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Ponavljajo�a razlika pri daljinski kontroli (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Privzeti kanal"
@@ -1145,10 +1148,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Menjava kanala"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Prika�i imena kanalov z izvorom"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izhod v sili"
@@ -1217,7 +1220,7 @@ msgid "Pausing live video..."
 msgstr "Ustavljanje predvajanja v �ivo..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Izbri�i posnetek zamaknjenega snemanja"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1227,7 +1230,7 @@ msgid "No editing marks defined!"
 msgstr "Nobena prekinitvena to�ka ni definirana!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Sekvence za editiranje niso definirane"
 
 msgid "Can't start editing process!"
 msgstr "Ne morem za�eti urejanja!"
@@ -1266,13 +1269,13 @@ msgid "Low disk space!"
 msgstr "Premalo prostora na disku!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "Ponovno generiranje indeksne datoteke"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "Ponovno generiranje indeksne datoteke zaklju�eno"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Napaka pri ponovnem generiranju indeksne datoteke"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!"
@@ -1311,22 +1314,22 @@ msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "OBREMENITEV"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "URNIKI"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "NAPRAVE"
 
 msgid "LIVE"
-msgstr ""
+msgstr "V �IVO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "PREDVAJAJ"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konsola"
@@ -1364,7 +1367,7 @@ msgid "Upcoming recording!"
 msgstr "Sledi snemanje!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Zaustavi video v �ivo"
 
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 1d503cda9..d6b5f7af1 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.1\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
 "Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "Hijerarhija"
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "Direktorij za snimke"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index de03d3d66..9b2ce7cca 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -77,8 +77,8 @@ msgstr "Hierarchy"
 msgid "Rolloff"
 msgstr "Rolloff"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG-avs�kning"
@@ -850,6 +850,9 @@ msgstr "Visa mappar i inspelningsmenyn"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Visa mappar i timermenyn"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Sortera alltid mappar f�rst"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Anv�nd sifferknappar f�r bokstavsinmatning"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 30e3fbd2b..b5f57b02a 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -73,7 +73,7 @@ msgstr "Hiyerar
 msgid "Rolloff"
 msgstr ""
 
-msgid "PlpId"
+msgid "StreamId"
 msgstr ""
 
 msgid "Starting EPG scan"
@@ -846,6 +846,9 @@ msgstr "Kay
 msgid "Setup.OSD$Folders in timer menu"
 msgstr ""
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 82b8d2a8d..47534324f 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -74,8 +74,8 @@ msgstr "Ієрархія"
 msgid "Rolloff"
 msgstr "Крен"
 
-msgid "PlpId"
-msgstr "PlpId"
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
@@ -847,6 +847,9 @@ msgstr "Теки зберігання записів"
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Теки в меню таймера"
 
+msgid "Setup.OSD$Always sort folders first"
+msgstr "Завжди сортувати теки першими"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Кількість клавіш для символів"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3f4a6c6d8..efb030068 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,22 @@
 # VDR language source file.
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Nan Feng <nfgx@21cn.com>, 2008
+# Nan Feng <nfvdr@live.com>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 1.7.39\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
-"PO-Revision-Date: 2009-09-23 23:50+0800\n"
-"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
-"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"PO-Revision-Date: 2013-03-04 14:52+0800\n"
+"Last-Translator: NFVDR <nfvdr@live.com>\n"
+"Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.5\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "***无效的频道 ***"
@@ -76,252 +75,252 @@ msgstr "层次"
 msgid "Rolloff"
 msgstr "越零率"
 
-msgid "PlpId"
-msgstr ""
+msgid "StreamId"
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
 msgstr "开始节目单扫描"
 
 msgid "Content$Movie/Drama"
-msgstr ""
+msgstr "电影/剧集"
 
 msgid "Content$Detective/Thriller"
-msgstr ""
+msgstr "侦探/惊悚"
 
 msgid "Content$Adventure/Western/War"
-msgstr ""
+msgstr "冒险/西部/战争"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr ""
+msgstr "科幻/幻想/恐怖"
 
 msgid "Content$Comedy"
-msgstr ""
+msgstr "喜剧"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr ""
+msgstr "香皂/文艺片/民俗"
 
 msgid "Content$Romance"
-msgstr ""
+msgstr "冒险故事"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr ""
+msgstr "严肃的/古典/的历史宗教/电影/剧集"
 
 msgid "Content$Adult Movie/Drama"
-msgstr ""
+msgstr "成人电影/剧集"
 
 msgid "Content$News/Current Affairs"
-msgstr ""
+msgstr "新闻/时事"
 
 msgid "Content$News/Weather Report"
-msgstr ""
+msgstr "新闻/天气报告"
 
 msgid "Content$News Magazine"
-msgstr ""
+msgstr "新闻杂志"
 
 msgid "Content$Documentary"
-msgstr ""
+msgstr "记录片"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr ""
+msgstr "讨论/ Inverview/辩论"
 
 msgid "Content$Show/Game Show"
-msgstr ""
+msgstr "显示/游戏展"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr ""
+msgstr "游戏展/测验/竞赛"
 
 msgid "Content$Variety Show"
-msgstr ""
+msgstr "综艺节目"
 
 msgid "Content$Talk Show"
-msgstr ""
+msgstr "脱口秀"
 
 msgid "Content$Sports"
-msgstr ""
+msgstr "体育"
 
 msgid "Content$Special Event"
-msgstr ""
+msgstr "特别活动"
 
 msgid "Content$Sport Magazine"
-msgstr ""
+msgstr "体育杂志"
 
 msgid "Content$Football/Soccer"
-msgstr ""
+msgstr "足球/橄榄球"
 
 msgid "Content$Tennis/Squash"
-msgstr ""
+msgstr "网球/壁球"
 
 msgid "Content$Team Sports"
-msgstr ""
+msgstr "团队运动"
 
 msgid "Content$Athletics"
-msgstr ""
+msgstr "田径运动"
 
 msgid "Content$Motor Sport"
-msgstr ""
+msgstr "汽车运动"
 
 msgid "Content$Water Sport"
-msgstr ""
+msgstr "水上运动"
 
 msgid "Content$Winter Sports"
-msgstr ""
+msgstr "冬季运动"
 
 msgid "Content$Equestrian"
-msgstr ""
+msgstr "驭手"
 
 msgid "Content$Martial Sports"
-msgstr ""
+msgstr "武术运动"
 
 msgid "Content$Children's/Youth Programme"
-msgstr ""
+msgstr "儿童/青少年计划"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr ""
+msgstr "学前儿童的计划"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr ""
+msgstr "娱乐节目6〜14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr ""
+msgstr "娱乐节目为10至16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr ""
+msgstr "信息/教育/学校计划"
 
 msgid "Content$Cartoons/Puppets"
-msgstr ""
+msgstr "漫画/木偶"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr ""
+msgstr "音乐/芭蕾/舞蹈"
 
 msgid "Content$Rock/Pop"
-msgstr ""
+msgstr "摇滚/流行"
 
 msgid "Content$Serious/Classical Music"
-msgstr ""
+msgstr "严重/古典音乐"
 
 msgid "Content$Folk/Tradional Music"
-msgstr ""
+msgstr "民谣/传统体育专业课程设置的音乐"
 
 msgid "Content$Jazz"
-msgstr ""
+msgstr "爵士乐"
 
 msgid "Content$Musical/Opera"
-msgstr ""
+msgstr "音乐/歌剧"
 
 msgid "Content$Ballet"
-msgstr ""
+msgstr "芭蕾舞"
 
 msgid "Content$Arts/Culture"
-msgstr ""
+msgstr "艺术/文化"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "表演艺术"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "精美艺术"
 
 msgid "Content$Religion"
-msgstr ""
+msgstr "宗教"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr ""
+msgstr "流行文化/传统艺术"
 
 msgid "Content$Literature"
-msgstr ""
+msgstr "文学"
 
 msgid "Content$Film/Cinema"
-msgstr ""
+msgstr "电影/影院"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "实验电影/视频"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "广播/新闻"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "新媒体"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "艺术/文化杂志"
 
 msgid "Content$Fashion"
-msgstr ""
+msgstr "时尚"
 
 msgid "Content$Social/Political/Economics"
-msgstr ""
+msgstr "社会/政治/经济"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr ""
+msgstr "杂志/报告/记录"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "经济/社会咨询"
 
 msgid "Content$Remarkable People"
-msgstr ""
+msgstr "杰出人士"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "教育/科学/事实"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "自然/动物/环境"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "技术/自然科学"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "医学/生理学/心理学"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "外国国家/探险"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "精神科学"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "延续教育"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "语言"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "休闲/爱好"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "旅游/旅行"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "手工艺"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "驾驶"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "健身与健康"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "烹饪"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "广告/购物"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "园林"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "原始语言"
 
 msgid "Content$Black & White"
-msgstr ""
+msgstr "黑与白"
 
 msgid "Content$Unpublished"
-msgstr ""
+msgstr "未出版"
 
 msgid "Content$Live Broadcast"
-msgstr ""
+msgstr "现场直播"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr ""
+msgstr "从 %d"
 
 msgid "No title"
 msgstr "没有标题"
@@ -414,7 +413,7 @@ msgid "Key$Info"
 msgstr "信息"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "播放/暂停"
 
 msgid "Key$Play"
 msgstr "播放"
@@ -591,29 +590,29 @@ msgid "Delete channel?"
 msgstr "是否删除频道？"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "编辑文件夹"
 
 msgid "New folder"
-msgstr ""
+msgstr "新文件夹"
 
 msgid "Sub folder"
-msgstr ""
+msgstr "子文件夹"
 
 msgid "Folder name already exists!"
-msgstr ""
+msgstr "文件夹名称已经存在！"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr ""
+msgstr "文件夹名称不能包含 '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "选择"
 
 msgid "Delete folder and all sub folders?"
-msgstr ""
+msgstr "删除文件夹和所有子文件夹吗？"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "是否删除文件夹?"
 
 msgid "Edit timer"
 msgstr "编辑计时器"
@@ -646,19 +645,19 @@ msgid "File"
 msgstr "文件"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "文件夹"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "单个"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "重复"
 
 msgid "First day"
 msgstr "第一天"
 
 msgid "Select folder"
-msgstr ""
+msgstr "选择文件夹"
 
 msgid "Timers"
 msgstr "录像中列表"
@@ -748,7 +747,7 @@ msgid "Delete recording?"
 msgstr "是否删除录像？"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "记录正在编辑 - 真的要删除？"
 
 msgid "Error while deleting recording!"
 msgstr "删除录像错误！"
@@ -847,22 +846,25 @@ msgid "Setup.OSD$Recording directories"
 msgstr "录像目录"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "定时器菜单中的文件夹"
+
+msgid "Setup.OSD$Always sort folders first"
+msgstr "总是排序文件夹"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "数字键的字符"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "彩色键0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "彩色键1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "彩色键2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "彩色键3"
 
 msgid "EPG"
 msgstr "电子节目单设置"
@@ -897,10 +899,10 @@ msgid "pan&scan"
 msgstr "pan&scan模式"
 
 msgid "letterbox"
-msgstr "letterbox模式"
+msgstr "小盒子模式"
 
 msgid "center cut out"
-msgstr "Center-cut-out模式"
+msgstr "中心剪切模式"
 
 msgid "no"
 msgstr "不"
@@ -933,7 +935,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "使用中卫星卡接口"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "符合标准"
 
 msgid "Setup.DVB$Video format"
 msgstr "视频格式"
@@ -988,10 +990,10 @@ msgstr "高本振频率 (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "设备%d卫星连接线"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "所有"
 
 msgid "CAM reset"
 msgstr "CAM重置"
@@ -1024,16 +1026,16 @@ msgid "Can't reset CAM!"
 msgstr "不能重启CAM"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "取消暂停当前视频"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "确认暂停当前视频"
 
 msgid "pause live video"
-msgstr ""
+msgstr "暂停现在视频"
 
 msgid "confirm"
-msgstr ""
+msgstr "确认"
 
 msgid "yes"
 msgstr "是"
@@ -1081,7 +1083,7 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "直接录像时间(min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "当前事件"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "最大的视频文件容量 (MB)"
@@ -1090,7 +1092,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "分离编辑文件"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr ""
+msgstr "删除时移记录"
 
 msgid "Replay"
 msgstr "回放设置"
@@ -1102,13 +1104,13 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "显示回放模式"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "显示剩余时间"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "处理显示时间(s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "暂停回放时，设置标志"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
@@ -1132,10 +1134,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "频道进入超时 (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "远程控制重复延时（ms）"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "远程控制重复增量（ms）"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "初始频道"
@@ -1147,10 +1149,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "初始化声音"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "频道排序"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "显示频道名称与源"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "突发事件退出"
@@ -1219,7 +1221,7 @@ msgid "Pausing live video..."
 msgstr "暂停当前视频"
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "是否删除时移记录？"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1229,7 +1231,7 @@ msgid "No editing marks defined!"
 msgstr "无编辑标记定义!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "不编辑定义的序列！"
 
 msgid "Can't start editing process!"
 msgstr "不能开始编辑处理"
@@ -1268,13 +1270,13 @@ msgid "Low disk space!"
 msgstr "磁盘空间不足!"
 
 msgid "Regenerating index file"
-msgstr ""
+msgstr "重新生成索引文件"
 
 msgid "Index file regeneration complete"
-msgstr ""
+msgstr "索引文件再生完成"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "索引文件再生失败！"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "不能关机 - 操作 '-s' 不允许!"
@@ -1313,22 +1315,22 @@ msgid "Classic VDR"
 msgstr "经典VDR面板"
 
 msgid "DISK"
-msgstr ""
+msgstr "磁盘"
 
 msgid "LOAD"
-msgstr ""
+msgstr "读取"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "定时器"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "设备"
 
 msgid "LIVE"
-msgstr ""
+msgstr "现场"
 
 msgid "PLAY"
-msgstr ""
+msgstr "播放"
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG 面板"
@@ -1366,7 +1368,7 @@ msgid "Upcoming recording!"
 msgstr "准备录像！"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "是否暂停视频播放？"
 
 msgid "Recording started"
 msgstr "录像开始！"
diff --git a/recording.c b/recording.c
index ede7c1b92..032175dd8 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.89 2013/03/03 10:54:05 kls Exp $
+ * $Id: recording.c 2.90 2013/03/04 14:02:40 kls Exp $
  */
 
 #include "recording.h"
@@ -943,7 +943,9 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)), RecordingsSortMode != rsmName);
+     char *s = strdup(FileName() + strlen(VideoDirectory));
+     if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
+        s = StripEpisodeName(s, RecordingsSortMode != rsmName);
      strreplace(s, '/', '0'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      *sb = MALLOC(char, l);
@@ -953,6 +955,12 @@ char *cRecording::SortName(void) const
   return *sb;
 }
 
+void cRecording::ClearSortName(void)
+{
+  DELETENULL(sortBufferName);
+  DELETENULL(sortBufferTime);
+}
+
 int cRecording::GetResume(void) const
 {
   if (resume == RESUME_NOT_INITIALIZED) {
@@ -1422,6 +1430,13 @@ void cRecordings::ResetResume(const char *ResumeFileName)
   ChangeState();
 }
 
+void cRecordings::ClearSortNames(void)
+{
+  LOCK_THREAD;
+  for (cRecording *recording = First(); recording; recording = Next(recording))
+      recording->ClearSortName();
+}
+
 // --- cMark -----------------------------------------------------------------
 
 double MarkFramesPerSecond = DEFAULTFRAMESPERSECOND;
diff --git a/recording.h b/recording.h
index 4807fc9d7..ff3119da6 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.45 2013/03/03 10:48:39 kls Exp $
+ * $Id: recording.h 2.46 2013/03/04 14:01:23 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -99,6 +99,7 @@ class cRecording : public cListObject {
   cRecording &operator=(const cRecording &); // can't assign cRecording
   static char *StripEpisodeName(char *s, bool Strip);
   char *SortName(void) const;
+  void ClearSortName(void);
   int GetResume(void) const;
   time_t start;
   int priority;
@@ -187,6 +188,7 @@ class cRecordings : public cList<cRecording>, public cThread {
   void ChangeState(void) { state++; }
   bool StateChanged(int &State);
   void ResetResume(const char *ResumeFileName = NULL);
+  void ClearSortNames(void);
   cRecording *GetByName(const char *FileName);
   void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
diff --git a/skinclassic.c b/skinclassic.c
index bbf36766f..b9919d84c 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.9 2013/02/22 15:25:31 kls Exp $
+ * $Id: skinclassic.c 2.10 2013/03/03 15:26:09 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -391,8 +391,7 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording)
   const cFont *font = cFont::GetFont(fontOsd);
   int y = y2;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/skinlcars.c b/skinlcars.c
index 7079d785e..72e8302e4 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.19 2013/02/15 15:08:02 kls Exp $
+ * $Id: skinlcars.c 2.21 2013/03/09 10:43:34 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -210,6 +210,7 @@ static cOsd *CreateOsd(int Left, int Top, int x0, int y0, int x1, int y1)
       Area.bpp = Bpp[i];
       if (Osd->CanHandleAreas(&Area, 1) == oeOk) {
          Osd->SetAreas(&Area, 1);
+         Osd->SetAntiAliasGranularity(20, 16);
          TwoColors = Area.bpp == 1;
          break;
          }
@@ -1599,8 +1600,7 @@ void cSkinLCARSDisplayMenu::SetRecording(const cRecording *Recording)
   int xl = xi00;
   int y = yi00;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/skinsttng.c b/skinsttng.c
index 94f54083f..39a831a86 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.16 2012/09/09 11:39:06 kls Exp $
+ * $Id: skinsttng.c 2.17 2013/03/03 15:29:28 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
@@ -707,8 +707,7 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording)
   int xl = x3 + TextSpacing;
   int y = y3;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()));
+  cString t = cString::sprintf("%s  %s  %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : "");
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   y += ts.Height();
   if (Info->GetEvent()->ParentalRating()) {
diff --git a/vdr.5 b/vdr.5
index 4003a5e96..ca705d4b2 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.30 2012/10/15 10:50:23 kls Exp $
+.\" $Id: vdr.5 2.31 2013/03/07 09:42:29 kls Exp $
 .\"
 .TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
 .SH NAME
@@ -96,7 +96,7 @@ l l.
 \fBL\fR@Left circular polarization
 \fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998)
 \fBO\fR@rollOff (0, 20, 25, 35)
-\fBP\fR@Plp id (0-255)
+\fBP\fR@stream id (0-255)
 \fBR\fR@Right circular polarization
 \fBS\fR@delivery System (0, 1)
 \fBT\fR@Transmission mode (1, 2, 4, 8, 16, 32)
@@ -137,7 +137,9 @@ l l.
 \fBRolloff:\fR The Nyquist filter rolloff factor for DVB-S (\fB35\fR) and DVB-S2 (\fB35\fR, 25, 20),
 35 = 0.35, 25 = 0.25, 20 = 0.20, DVB-S/DVB-S2 default value is 0.35
 
-\fBPLP id:\fR Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-T2 only).
+\fBStream id:\fR Input Stream Identifier (ISI) (\fB0\fR-255) for DVB-S2 multiplex or
+Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-S2/DVB-T2 only,
+with devices that support "multi streaming").
 
 \fBTransmission mode:\fR Number of DVB-T OFDM carriers, 32 = 32k, 16 = 16k, 8 = 8k, 4 = 4k, 2 = 2k, 1 = 1k. If in doubt, try 8k.
 

From d1b0368a151f8d5848ab83657e52ad22992bbe34 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 16 Mar 2013 11:58:00 +0100
Subject: [PATCH 227/307] Version 1.7.41 VDR developer version 1.7.41 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.41.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.40-1.7.41.diff

MD5 checksums:

c7928bff45fa1c0e6dadf2c0a5adf94b  vdr-1.7.41.tar.bz2
d20f62005288f54bb4596e1e091419ac  vdr-1.7.40-1.7.41.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Approaching version 2.0.0:
==========================

If there are no more serious bug reports, the final version 2.0.0 of VDR
shall be released on March 31, 2013.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

The following language files still have the given number of untranslated texts:

da_DK.po: 134
el_GR.po: 197
hr_HR.po: 134
lt_LT.po: 1
nn_NO.po: 262
pt_PT.po: 28
sl_SI.po: 1
sr_SR.po: 80
tr_TR.po: 134

If nobody takes care of these, they will remain untranslated in version 2.0.0.

From the HISTORY file:
- Updated the Hungarian OSD texts (thanks to István Füley).
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
- Updated the Polish OSD texts (thanks to Marek Nazarko).
- Fixed using PATH_MAX and NAME_MAX (+/-1 because the first one includes the
  terminating 0, while the latter doesn't).
- The 'plugins' target of the VDR Makefile now also copies files matching the wildcard
  "lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories
  of the plugin source.
- The parameters PATH and NAME to the --dirnames command line option may now be left
  empty to use the default values if only ENC shall be set (thanks to Helmut Auer for
  some improvements to this change).
- Fixed a possible "Channel not available" if a recording starts on a system with
  bonded devices (thanks to Siegfried Bosch).
- Fixed stopping an ongoing recording on a system with bonded devices, if a timer with
  a higher priority requires a different band.
- Updated the introductory text of the vdr.1 man page.
- Added a note to the INSTALL file regarding multiple disk setup becoming deprecated
  in a future version of VDR.
- When switching to a less privileged user id, VDR now sets the environment variables
  HOME, USER, LOGNAME and SHELL accordingly (thanks to Manuel Reimer).
- Updated the help and man page entry about the location of the epg.data file (thanks
  to Ville Skyttä).
- Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann
  Friedrichs).
---
 CONTRIBUTORS                       | 15 ++++++-
 HISTORY                            | 27 ++++++++++++
 INSTALL                            | 11 +++--
 MANUAL                             |  2 +-
 Makefile                           |  4 +-
 PLUGINS.html                       |  6 +--
 PLUGINS/src/epgtableid0/README     |  2 +-
 PLUGINS/src/hello/README           |  2 +-
 PLUGINS/src/hello/po/ca_ES.po      |  2 +-
 PLUGINS/src/hello/po/cs_CZ.po      |  2 +-
 PLUGINS/src/hello/po/da_DK.po      |  2 +-
 PLUGINS/src/hello/po/de_DE.po      |  6 +--
 PLUGINS/src/hello/po/el_GR.po      |  2 +-
 PLUGINS/src/hello/po/es_ES.po      |  2 +-
 PLUGINS/src/hello/po/et_EE.po      |  2 +-
 PLUGINS/src/hello/po/fi_FI.po      |  2 +-
 PLUGINS/src/hello/po/fr_FR.po      |  2 +-
 PLUGINS/src/hello/po/hr_HR.po      |  2 +-
 PLUGINS/src/hello/po/hu_HU.po      |  2 +-
 PLUGINS/src/hello/po/it_IT.po      |  2 +-
 PLUGINS/src/hello/po/lt_LT.po      |  2 +-
 PLUGINS/src/hello/po/nl_NL.po      |  2 +-
 PLUGINS/src/hello/po/nn_NO.po      |  2 +-
 PLUGINS/src/hello/po/pl_PL.po      |  2 +-
 PLUGINS/src/hello/po/pt_PT.po      |  2 +-
 PLUGINS/src/hello/po/ro_RO.po      |  2 +-
 PLUGINS/src/hello/po/ru_RU.po      |  2 +-
 PLUGINS/src/hello/po/sk_SK.po      |  2 +-
 PLUGINS/src/hello/po/sl_SI.po      |  2 +-
 PLUGINS/src/hello/po/sv_SE.po      |  2 +-
 PLUGINS/src/hello/po/tr_TR.po      |  2 +-
 PLUGINS/src/hello/po/zh_CN.po      |  2 +-
 PLUGINS/src/osddemo/README         |  2 +-
 PLUGINS/src/pictures/README        |  2 +-
 PLUGINS/src/pictures/po/de_DE.po   |  6 +--
 PLUGINS/src/pictures/po/fi_FI.po   |  2 +-
 PLUGINS/src/pictures/po/fr_FR.po   |  2 +-
 PLUGINS/src/pictures/po/it_IT.po   |  2 +-
 PLUGINS/src/pictures/po/lt_LT.po   |  2 +-
 PLUGINS/src/pictures/po/ru_RU.po   |  2 +-
 PLUGINS/src/pictures/po/sk_SK.po   |  4 +-
 PLUGINS/src/skincurses/README      |  2 +-
 PLUGINS/src/skincurses/po/de_DE.po |  6 +--
 PLUGINS/src/skincurses/po/fi_FI.po |  2 +-
 PLUGINS/src/skincurses/po/it_IT.po |  2 +-
 PLUGINS/src/skincurses/po/lt_LT.po |  2 +-
 PLUGINS/src/skincurses/po/ru_RU.po |  2 +-
 PLUGINS/src/skincurses/po/sk_SK.po |  4 +-
 PLUGINS/src/status/README          |  2 +-
 README                             |  5 +--
 README.i18n                        |  2 +-
 UPDATE-2.0.0                       |  4 ++
 config.h                           | 12 +++---
 dvbdevice.c                        |  8 ++--
 po/ar.po                           |  4 +-
 po/ca_ES.po                        |  4 +-
 po/cs_CZ.po                        |  4 +-
 po/da_DK.po                        |  4 +-
 po/de_DE.po                        |  8 ++--
 po/el_GR.po                        |  4 +-
 po/es_ES.po                        |  4 +-
 po/et_EE.po                        |  4 +-
 po/fi_FI.po                        |  4 +-
 po/fr_FR.po                        |  4 +-
 po/hr_HR.po                        |  4 +-
 po/hu_HU.po                        |  6 +--
 po/it_IT.po                        |  4 +-
 po/lt_LT.po                        |  4 +-
 po/mk_MK.po                        |  4 +-
 po/nl_NL.po                        |  4 +-
 po/nn_NO.po                        |  4 +-
 po/pl_PL.po                        |  6 +--
 po/pt_PT.po                        |  4 +-
 po/ro_RO.po                        |  4 +-
 po/ru_RU.po                        |  8 ++--
 po/sk_SK.po                        |  4 +-
 po/sl_SI.po                        |  4 +-
 po/sr_SR.po                        |  4 +-
 po/sv_SE.po                        |  4 +-
 po/tr_TR.po                        |  4 +-
 po/uk_UA.po                        |  4 +-
 po/zh_CN.po                        |  4 +-
 recording.c                        |  4 +-
 sources.conf                       |  2 +-
 svdrpsend.1                        |  2 +-
 timers.c                           |  4 +-
 timers.h                           |  4 +-
 vdr.1                              | 28 ++++++------
 vdr.5                              |  8 ++--
 vdr.c                              | 68 ++++++++++++++++++------------
 90 files changed, 254 insertions(+), 188 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5444ddd58..bd275cd0c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,7 +1,8 @@
 Tons of suggestions, bugreports, patches and other contributions have been
-provided by the people on the 'linux-dvb' and 'vdr' mailing lists
+provided by the people on the 'linux-dvb' and 'vdr' mailing lists, as well
+as 'vdr-portal.de'.
 Special thanks go to the following individuals (if your name is missing here,
-please send an email to kls@tvdr.de):
+please send an email to vdr@tvdr.de):
 
 Carsten Koch <Carsten.Koch@icem.de>
  for adding LIRC support
@@ -615,6 +616,8 @@ Helmut Auer <vdr@helmutauer.de>
  --genindex
  for suggesting to disable EPG processing for a while after a CLRE command
  for suggesting to read the epg.data file in a separate thread
+ for some improvements to allowing the parameters PATH and NAME to the --dirnames
+ command line option to be left empty to use the default values if only ENC shall be set
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -2011,6 +2014,7 @@ Ville Skytt
  for reporting that some special characters are dropped by Doxygen and thus need to
  be escaped
  for changing the template for PLGCFG to $(CONFDIR)/plugins.mk
+ for updating the help and man page entry about the location of the epg.data file
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2735,6 +2739,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for fixing a busy loop when moving editing marks
  for making cPalette::ClosestColor() treat fully transparent colors as "equal"
  for implementing scaling of SPU bitmaps
+ for fixing creating a new VPS timer with the SVDRP command NEWT
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -2787,6 +2792,8 @@ Manuel Reimer <Manuel.Reimer@gmx.de>
  seconds during replay
  for suggesting to synchronize system time to the transponder time using adjtime() in
  order to avoid discontinuities
+ for setting the environment variables HOME, USER, LOGNAME and SHELL accordingly
+ when switching to a less privileged user id
 
 Rene van den Braken <rene@vandenbraken.name>
  for reporting a bug in writing the PCR pid into the PMT in
@@ -3112,3 +3119,7 @@ Dominique Plu <dplu@free.fr>
 
 Matti Lehtim�ki <matti.lehtimaki@gmail.com>
  for translating OSD texts to the Finnish language
+
+Siegfried Bosch <bosch@math.uni-muenster.de>
+ for fixing a possible "Channel not available" if a recording starts on a system with
+ bonded devices
diff --git a/HISTORY b/HISTORY
index 763140e2e..0b9e6a2d1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7729,3 +7729,30 @@ Video Disk Recorder Revision History
 - Changed the default values for the OSD size back to those before version 1.7.29,
   to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or
   "Classic" skin.
+
+2013-03-16: Version 1.7.41
+
+- Updated the Hungarian OSD texts (thanks to Istv�n F�ley).
+- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Updated the Polish OSD texts (thanks to Marek Nazarko).
+- Fixed using PATH_MAX and NAME_MAX (+/-1 because the first one includes the
+  terminating 0, while the latter doesn't).
+- The 'plugins' target of the VDR Makefile now also copies files matching the wildcard
+  "lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories
+  of the plugin source.
+- The parameters PATH and NAME to the --dirnames command line option may now be left
+  empty to use the default values if only ENC shall be set (thanks to Helmut Auer for
+  some improvements to this change).
+- Fixed a possible "Channel not available" if a recording starts on a system with
+  bonded devices (thanks to Siegfried Bosch).
+- Fixed stopping an ongoing recording on a system with bonded devices, if a timer with
+  a higher priority requires a different band.
+- Updated the introductory text of the vdr.1 man page.
+- Added a note to the INSTALL file regarding multiple disk setup becoming deprecated
+  in a future version of VDR.
+- When switching to a less privileged user id, VDR now sets the environment variables
+  HOME, USER, LOGNAME and SHELL accordingly (thanks to Manuel Reimer).
+- Updated the help and man page entry about the location of the epg.data file (thanks
+  to Ville Skytt�).
+- Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann
+  Friedrichs).
diff --git a/INSTALL b/INSTALL
index bc9193a4b..dd0c999e6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 1.7
+Version 2.0
 -----------
 
 Compiling and running the program:
@@ -351,7 +351,12 @@ would set up twelve disks (wow, what a machine that would be!).
 To use such a multi directory setup, you need to add the '-v' option
 with the name of the basic directory when running 'vdr':
 
-   vdr -v /video0
+   vdr -v /srv/vdr/video0
+
+WARNING: Using multiple disks to form one large video directory this way
+is deprecated and will be removed from VDR in a future version! Either
+use one of today's large terabyte disks (preferably with a backup disk
+in a RAID-1 array), or use something like "mhddfs".
 
 Note that you should not copy any non-VDR files into the video directory,
 since this might cause a lot of unnecessary disk access when VDR cleans up those
@@ -359,7 +364,7 @@ directories and there is a large number of files and/or subdirectories in
 there. If you have a large disk that you want to use for VDR's video data as
 well as other stuff, you may want to create a subdirectory for VDR, as in
 
-   /mydisk/video0
+   /mydisk/video
 
 and put your other stuff into, say,
 
diff --git a/MANUAL b/MANUAL
index e1f79f85a..cce2b0a5b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,7 +1,7 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
-Version 1.6
+Version 2.0
 -----------
 
 * Remote Control Keys
diff --git a/Makefile b/Makefile
index 913173b8f..d24d08fd3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.53 2013/02/24 10:40:23 kls Exp $
+# $Id: Makefile 2.54 2013/03/11 15:01:01 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -220,7 +220,7 @@ plugins: include-dir vdr.pc
 	    INCLUDES="-I$(CWD)/include"\
 	    $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\
 	    if [ -n "$(LCLBLD)" ] ; then\
-	       (cd $(PLUGINDIR)/src/$$i; for l in libvdr-*.so; do install $$l $(LIBDIR)/$$l.$(APIVERSION); done);\
+	       (cd $(PLUGINDIR)/src/$$i; for l in `find -name 'libvdr-*.so' -o -name 'lib$$i-*.so'`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\
 	       if [ -d $(PLUGINDIR)/src/$$i/po ]; then\
 	          for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\
 	              install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\
diff --git a/PLUGINS.html b/PLUGINS.html
index 30beced91..d864fe236 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -31,10 +31,10 @@
 <div class="center">
 <h1>The VDR Plugin System</h1>
 
-<b>Version 1.7</b>
+<b>Version 2.0</b>
 <p>
-Copyright &copy; 2009 Klaus Schmidinger<br>
-<a href="mailto:kls@tvdr.de">kls@tvdr.de</a><br>
+Copyright &copy; 2013 Klaus Schmidinger<br>
+<a href="mailto:vdr@tvdr.de">vdr@tvdr.de</a><br>
 <a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
 <div class="center">
diff --git a/PLUGINS/src/epgtableid0/README b/PLUGINS/src/epgtableid0/README
index 8c2436dd5..28b98feab 100644
--- a/PLUGINS/src/epgtableid0/README
+++ b/PLUGINS/src/epgtableid0/README
@@ -1,6 +1,6 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
+Written by:                  Klaus Schmidinger <vdr@tvdr.de>
 
 Project's homepage:          http://www.tvdr.de
 
diff --git a/PLUGINS/src/hello/README b/PLUGINS/src/hello/README
index e3c46a9da..90fec0f0f 100644
--- a/PLUGINS/src/hello/README
+++ b/PLUGINS/src/hello/README
@@ -1,6 +1,6 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
+Written by:                  Klaus Schmidinger <vdr@tvdr.de>
 
 Project's homepage:          http://www.tvdr.de
 
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index 8efe53186..e0088f2bd 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index f4fe8a51d..0029fc3cb 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index 1fda5d08b..69d14097c 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004
 #
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index c3e35f6b4..abed9b04a 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@tvdr.de>, 2000
+# Klaus Schmidinger <vdr@tvdr.de>, 2000
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
+"Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index 03bab929a..e5f8066a9 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
 #
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index 1b87045ba..ce7debae6 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
 #
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index c3d9bda61..1c6c1835d 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <kasjas@hot.ee>, 2004
 #
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index b8256b54f..a571922a7 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index aed37e22a..451ae9052 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index 40305de3d..ba3b22de1 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Adrian Caval <anrxc@sysphere.org>, 2008
 #
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index ae344c11b..bbfddd828 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index e56e49993..7c52d9841 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
index 773e14a85..27262069a 100644
--- a/PLUGINS/src/hello/po/lt_LT.po
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009
 #
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 29b0dadf9..514ea184f 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index 0277104c6..ebaafae3e 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 34d38de3d..1dd270278 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002
 #
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index fcefd52ee..f22657f30 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index 248e9c064..ad2737e37 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index 18dcd0f00..d8fc32354 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
 #
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
index e3875affc..b0c2a893f 100644
--- a/PLUGINS/src/hello/po/sk_SK.po
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index 504586aaa..6e6bcf18a 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index 3ccd4240a..3ba8865a6 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index 3215b1fb6..ec121534c 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007
 #
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
index 6d7aa569a..8baba9063 100644
--- a/PLUGINS/src/hello/po/zh_CN.po
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README
index bd9aa8bfb..094f43f7c 100644
--- a/PLUGINS/src/osddemo/README
+++ b/PLUGINS/src/osddemo/README
@@ -1,6 +1,6 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
+Written by:                  Klaus Schmidinger <vdr@tvdr.de>
 
 Project's homepage:          http://www.tvdr.de
 
diff --git a/PLUGINS/src/pictures/README b/PLUGINS/src/pictures/README
index bc21526be..42440dbfc 100644
--- a/PLUGINS/src/pictures/README
+++ b/PLUGINS/src/pictures/README
@@ -1,6 +1,6 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
+Written by:                  Klaus Schmidinger <vdr@tvdr.de>
 
 Project's homepage:          http://www.tvdr.de
 
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index 2f7777274..f1bde13fa 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@tvdr.de>, 2008
+# Klaus Schmidinger <vdr@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
-"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
+"Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 3ac5ed7d4..7f99e2ccd 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008
 #
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 36bca8c50..4567c6748 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Patrice Staudt <ipatrice.staudt@laposte.net>, 2008
 #
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index 0eddf515f..e54928848 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
index 26c244bba..73d4da2a5 100644
--- a/PLUGINS/src/pictures/po/lt_LT.po
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009
 #
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index 869c91bea..47681619b 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
index afc69a037..2b0cc58fb 100644
--- a/PLUGINS/src/pictures/po/sk_SK.po
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@tvdr.de>, 2008
+# Klaus Schmidinger <vdr@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README
index 20b56541c..2339bd512 100644
--- a/PLUGINS/src/skincurses/README
+++ b/PLUGINS/src/skincurses/README
@@ -1,6 +1,6 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
+Written by:                  Klaus Schmidinger <vdr@tvdr.de>
 
 Project's homepage:          http://www.tvdr.de
 
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index cecf74b58..6d84b1e27 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@tvdr.de>, 2007
+# Klaus Schmidinger <vdr@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
-"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
+"Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index e8bb5c20e..39afbbc81 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
 #
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index b7a8e6887..057e7a637 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index 3b3e1e10e..0f2237f06 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2010
 #
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index fe049953e..93e89612b 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index 0426c70b9..b03d9b488 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@tvdr.de>, 2007
+# Klaus Schmidinger <vdr@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
diff --git a/PLUGINS/src/status/README b/PLUGINS/src/status/README
index b73e6be2a..334c8082c 100644
--- a/PLUGINS/src/status/README
+++ b/PLUGINS/src/status/README
@@ -1,6 +1,6 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Klaus Schmidinger <kls@tvdr.de>
+Written by:                  Klaus Schmidinger <vdr@tvdr.de>
 
 Project's homepage:          http://www.tvdr.de
 
diff --git a/README b/README
index 116385ec2..f88b91725 100644
--- a/README
+++ b/README
@@ -6,9 +6,6 @@ which is based on the DVB driver of the LinuxTV project (http://linuxtv.org).
 For details about the "Video Disk Recorder" project please
 refer to http://www.tvdr.de.
 
-There is also a remote control unit described on those
-Web pages, which can be used within this program.
-
 Please see the INSTALL file for details on how to install
 this program on your computer.
 
@@ -17,7 +14,7 @@ The MANUAL file describes how to operate the VDR.
 The CONTRIBUTORS file lists all the people who have contributed to the
 development of VDR.
 
-The author can be contacted at kls@tvdr.de.
+The author can be contacted at vdr@tvdr.de.
 
 Yet another "set-top box"?
 --------------------------
diff --git a/README.i18n b/README.i18n
index 476d5b632..219b21e34 100644
--- a/README.i18n
+++ b/README.i18n
@@ -52,5 +52,5 @@ How to maintain an existing language file
 
 Once you have created or updated a translation file, please
 send it to the maintainer of the respective plugin (in case
-it belongs to a plugin) or to kls@tvdr.de (for core VDR
+it belongs to a plugin) or to vdr@tvdr.de (for core VDR
 language files).
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index 0632bfbad..c24fcb0d3 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -478,3 +478,7 @@ Misc:
   to avoid discontinuities. If the time difference is more than 10 seconds, stime() is
   still used to do the initial sync.
 - Implemented scaling of SPU bitmaps.
+- WARNING: Using multiple disks to form one large video directory is deprecated and
+  will be removed from VDR in a future version! Either use one of today's large
+  terabyte disks (preferably with a backup disk in a RAID-1 array), or use something
+  like "mhddfs".
diff --git a/config.h b/config.h
index 9d88d6c21..f7b3795f6 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.71 2013/03/04 13:58:40 kls Exp $
+ * $Id: config.h 2.74 2013/03/11 11:07:59 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.40"
-#define VDRVERSNUM   10740  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.41"
+#define VDRVERSNUM   10741  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.40"
-#define APIVERSNUM   10740  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.41"
+#define APIVERSNUM   10741  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -260,7 +260,7 @@ class cSetup : public cConfig<cSetupLine> {
   int MenuScrollWrap;
   int MenuKeyCloses;
   int MarkInstantRecord;
-  char NameInstantRecord[NAME_MAX];
+  char NameInstantRecord[NAME_MAX + 1];
   int InstantRecordTime;
   int LnbSLOF;
   int LnbFrequLo;
diff --git a/dvbdevice.c b/dvbdevice.c
index cd017a2db..1fba1661f 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.84 2013/03/07 09:42:29 kls Exp $
+ * $Id: dvbdevice.c 2.87 2013/03/13 11:23:53 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -426,7 +426,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
      cString BondingParams = GetBondingParams(Channel);
      do {
         if (t->device->Priority() > IDLEPRIORITY || ConsiderOccupied && t->device->Occupied()) {
-           if (strcmp(BondingParams, t->GetBondingParams()) != 0)
+           if (strcmp(BondingParams, t->GetBondedMaster()->GetBondingParams()) != 0)
               return false;
            }
         t = t->bondedTuner;
@@ -1485,6 +1485,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
               needsDetachReceivers = Receiving();
            }
         if (result) {
+           cMutexLock MutexLock(&bondMutex);
            if (!BondingOk(Channel)) {
               // This device is bonded, so we need to check the priorities of the others:
               for (cDvbDevice *d = bondedDevice; d && d != this; d = d->bondedDevice) {
@@ -1492,9 +1493,10 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
                      result = false;
                      break;
                      }
+                  needsDetachReceivers |= d->Receiving();
                   }
               needsDetachBondedReceivers = true;
-              needsDetachReceivers = Receiving();
+              needsDetachReceivers |= Receiving();
               }
            }
         }
diff --git a/po/ar.po b/po/ar.po
index 80d3e7de3..54c3f3c4c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Osama Alrawab <alrawab@hotmail.com>, 2010, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 22aeb0529..89d655680 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 818c9c17c..5409f0894 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladimír Bárta <vladimir.barta@k2atmitec.cz>, 2006, 2008
 # Jiří Dobrý <jdobry@centrum.cz>, 2008
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.14\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
diff --git a/po/da_DK.po b/po/da_DK.po
index 73a212211..4069a7b44 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 9e879771a..0e24ab22b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,15 +1,15 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@tvdr.de>, 2000-2008
+# Klaus Schmidinger <vdr@tvdr.de>, 2000-2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
-"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
+"Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
diff --git a/po/el_GR.po b/po/el_GR.po
index 50fe4601c..b61174e5c 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 2ef8807af..fba8c21d2 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
 # Luca Olivetti <luca@ventoso.org>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
diff --git a/po/et_EE.po b/po/et_EE.po
index e60cf5aea..333f0b0b3 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2004-2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 7475eb79e..375715761 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 57a6927b7..7d0d90cab 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001, 2002, 2008
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003, 2005
@@ -15,7 +15,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.37\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 3a0f73ab9..3925422b5 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Drazen Dupor <drazen.dupor@dupor.com>, 2004, 2005
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 26ed167a7..e4f8594c1 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
@@ -851,7 +851,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Könyvtárválasztás az időzítő menüben"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr ""
+msgstr "Könyvtárakat rendezd előre"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Számgombok a betűkön"
diff --git a/po/it_IT.po b/po/it_IT.po
index ebd68f9ba..281434c93 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alberto Carraro <bertocar@tin.it>, 2001
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-11 23:46+0100\n"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 6337db4b6..19262472b 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2009 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.37\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 39444c74e..b9f56a25f 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR-1.7.14\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 1d1bb731c..8766f3448 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003, 2005
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.38\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index c8491e1ea..4f6668c67 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 35a39c434..c11c65614 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
@@ -849,7 +849,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogi w menu timera"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr ""
+msgstr "Sortuj najpierw katalogi"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Klawisze numeryczne dla liter"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index a485e2ba5..ffd3fecb7 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 # Cris Silva <hudokkow@gmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.15\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index a7b6ce81a..3214a2e9d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004-2006, 2008, 2010-2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.37\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index ea09a3ff8..eecc89e6f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,15 +1,15 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004, 2005
 # Oleg Roitburd <oroitburd@gmail.com>, 2005-2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
-"PO-Revision-Date: 2013-03-03 13:43+0100\n"
+"PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
@@ -848,7 +848,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "���������� � ���� ������"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr ""
+msgstr "���������� ������ � ������ ������� �����������"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "���������� ������ ��� ��������"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 977d7636c..46dc3ae1c 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Milan Hrala <hrala.milan@gmail.com>, 2011, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.16\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 86fefbc08..842157ed0 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index d6b5f7af1..140bd4633 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Milan Cvijanovi� <elcom_cvijo@hotmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.1\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2011-01-09 15:57+0100\n"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 9b2ce7cca..15a49ee74 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index b5f57b02a..54956de1a 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.6.0\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 47534324f..7626d8dbe 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.7\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index efb030068..98e3f98bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Nan Feng <nfvdr@live.com>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.7.39\n"
+"Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-02-03 16:46+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
diff --git a/recording.c b/recording.c
index 032175dd8..f43ce52ee 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.90 2013/03/04 14:02:40 kls Exp $
+ * $Id: recording.c 2.91 2013/03/11 10:34:41 kls Exp $
  */
 
 #include "recording.h"
@@ -66,7 +66,7 @@
 
 #define MAX_LINK_LEVEL  6
 
-int DirectoryPathMax = PATH_MAX;
+int DirectoryPathMax = PATH_MAX - 1;
 int DirectoryNameMax = NAME_MAX;
 bool DirectoryEncoding = false;
 int InstanceId = 0;
diff --git a/sources.conf b/sources.conf
index 8c352fd3c..c7f76d1f5 100644
--- a/sources.conf
+++ b/sources.conf
@@ -12,7 +12,7 @@
 # '/' means same (or very little deviation) orbital position & host.
 # A value in () means this satellite is still in it's test phase.
 #
-# Please contact kls@tvdr.de before assigning a new code
+# Please contact vdr@tvdr.de before assigning a new code
 # to a description, in order to keep them unique.
 
 # Satellites
diff --git a/svdrpsend.1 b/svdrpsend.1
index 3743739f9..a0b3fd9f9 100644
--- a/svdrpsend.1
+++ b/svdrpsend.1
@@ -1,4 +1,4 @@
-.TH "svdrpsend" "1" "23 Feb 2013" "1.7" "Video Disk Recorder"
+.TH "svdrpsend" "1" "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
 .LP
 svdrpsend \- sends commands to VDR
diff --git a/timers.c b/timers.c
index 16cf8cef3..279f55325 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.16 2013/02/05 11:13:20 kls Exp $
+ * $Id: timers.c 2.17 2013/03/16 10:37:10 kls Exp $
  */
 
 #include "timers.h"
@@ -43,7 +43,7 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   weekdays = 0;
   start = now->tm_hour * 100 + now->tm_min;
   stop = 0;
-  if (!Setup.InstantRecordTime && channel) {
+  if (!Setup.InstantRecordTime && channel && (Instant || Pause)) {
      cSchedulesLock SchedulesLock;
      if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
         if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
diff --git a/timers.h b/timers.h
index adc550961..8910c1060 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.6 2013/02/05 11:23:24 kls Exp $
+ * $Id: timers.h 2.7 2013/03/11 10:35:53 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -39,7 +39,7 @@ class cTimer : public cListObject {
   int stop;
   int priority;
   int lifetime;
-  mutable char file[NAME_MAX * 2]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long
+  mutable char file[NAME_MAX * 2 + 1]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long
   char *aux;
   const cEvent *event;
 public:
diff --git a/vdr.1 b/vdr.1
index 1046ca77a..6c37cc0cc 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2008 Klaus Schmidinger
+.\" Copyright (C) 2013 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.12 2013/02/24 10:41:12 kls Exp $
+.\" $Id: vdr.1 2.17 2013/03/15 10:44:54 kls Exp $
 .\"
-.TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
+.TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
 vdr \- the Video Disk Recorder
 .SH SYNOPSIS
@@ -27,13 +27,16 @@ live TV while recording one or more other broadcasts from the same transponder.
 It is also possible to start watching a recorded programme before the live
 broadcast has ended (\fBtime shifting\fR). In order to record from different
 transponders simultaneously two or more DVB cards are necessary.
-By default \fBvdr\fR can support up to four
-DVB cards. The primary DVB card (the one your TV set is connected to) has
-to be a "full featured" card, which means it must contain an MPEG decoder
-and provide audio and video signal outputs.
+By default \fBvdr\fR can support up to eight DVB cards.
+The primary DVB card (the one your TV set is connected to) can either
+be a "full featured" card, which means it contains an MPEG decoder
+and provides audio and video signal outputs, or you can use some third party
+plugin that implements software decoding of the MPEG data and displays it via
+the system's graphics adapter.
 
-\fBvdr\fR uses the On Screen Display of the DVB card to display its menus.
-It can be controlled by the PC keyboard or the "Linux Infrared Remote Control" (LIRC).
+\fBvdr\fR uses an On Screen Display (OSD) to display its menus.
+It can be controlled by the PC keyboard, the "Linux Infrared Remote Control" (LIRC),
+or any other means of remote control, implemented by a third party plugin.
 
 Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP),
 which can be accessed on port 6419, for instance by \fBtelnet\fR.
@@ -57,12 +60,13 @@ Run in daemon mode (implies \-\-no\-kbd).
 Use only the given DVB device (\fInum\fR = 0, 1, 2...).
 There may be several \fB\-D\fR options (by default all DVB devices will be used).
 .TP
-.BI \-\-dirnames= path[,name[,enc]]
+.BI \-\-dirnames= path [, name [, enc ]]
 Set the maximum directory path length to \fIpath\fR (default is the maximum value
 allowed on the system). If \fIname\fR is also given, it defines the maximum directory
 name length (default is the maximum value allowed on the system).  The optional
 \fIenc\fR can be 0 or 1, and controls whether special characters in directory names
 are encoded as hex values (default: 0).
+If \fIpath\fR or \fIname\fR are left empty (as in ",,1" to only set \fIenc\fR), the defaults apply.
 The length of the video directory name and that of the actual recording directory is
 subtracted from \fIpath\fR, to make sure the directory path will never become too long.
 .TP
@@ -73,7 +77,7 @@ The program will return immediately after editing the recording.
 .TP
 .BI \-E\  file ,\ \-\-epgfile= file
 Write the EPG data into the given \fIfile\fR
-(default is \fI/video/epg.data\fR).
+(default is \fIepg.data\fR in the cache directory).
 Use \fB\-E\-\fR to disable this.
 If \fIfile\fR is a directory, the file \fIepg.data\fR
 will be created in that directory.
@@ -282,7 +286,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@tvdr.de>.
 .SH COPYRIGHT
-Copyright \(co 2008 Klaus Schmidinger.
+Copyright \(co 2013 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index ca705d4b2..86b798c37 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2008 Klaus Schmidinger
+.\" Copyright (C) 2013 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.31 2013/03/07 09:42:29 kls Exp $
+.\" $Id: vdr.5 2.33 2013/03/11 13:17:12 kls Exp $
 .\"
-.TH vdr 5 "10 Feb 2008" "1.6" "Video Disk Recorder Files"
+.TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr_files \- the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -891,7 +891,7 @@ Written by Klaus Schmidinger.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@tvdr.de>.
 .SH COPYRIGHT
-Copyright \(co 2008 Klaus Schmidinger.
+Copyright \(co 2013 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index f46589f5b..c63eecaa4 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1,7 +1,7 @@
 /*
  * vdr.c: Video Disk Recorder main program
  *
- * Copyright (C) 2000, 2003, 2006, 2008 Klaus Schmidinger
+ * Copyright (C) 2000, 2003, 2006, 2008, 2013 Klaus Schmidinger
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
- * The author can be reached at kls@tvdr.de
+ * The author can be reached at vdr@tvdr.de
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.50 2013/03/03 10:25:11 kls Exp $
+ * $Id: vdr.c 2.57 2013/03/15 10:44:54 kls Exp $
  */
 
 #include <getopt.h>
@@ -87,7 +87,7 @@
 
 static int LastSignal = 0;
 
-static bool SetUser(const char *UserName, bool UserDump)//XXX name?
+static bool SetUser(const char *UserName, bool UserDump)
 {
   if (UserName) {
      struct passwd *user = getpwnam(UserName);
@@ -109,6 +109,10 @@ static bool SetUser(const char *UserName, bool UserDump)//XXX name?
         }
      if (UserDump && prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0)
         fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
+     setenv("HOME", user->pw_dir, 1);
+     setenv("USER", user->pw_name, 1);
+     setenv("LOGNAME", user->pw_name, 1);
+     setenv("SHELL", user->pw_shell, 1);
      }
   return true;
 }
@@ -280,31 +284,41 @@ int main(int argc, char *argv[])
                     return 2;
           case 'd' | 0x100: {
                     char *s = optarg;
-                    int n = strtol(s, &s, 10);
-                    if (n <= 0 || n >= PATH_MAX) {
-                       fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg);
-                       return 2;
+                    if (*s != ',') {
+                       int n = strtol(s, &s, 10);
+                       if (n <= 0 || n >= PATH_MAX) { // PATH_MAX includes the terminating 0
+                          fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg);
+                          return 2;
+                          }
+                       DirectoryPathMax = n;
+                       if (!*s)
+                          break;
+                       if (*s != ',') {
+                          fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
+                          return 2;
+                          }
                        }
-                    DirectoryPathMax = n;
+                    s++;
                     if (!*s)
                        break;
-                    if (*s++ != ',') {
-                       fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
-                       return 2;
-                       }
-                    n = strtol(s, &s, 10);
-                    if (n <= 0 || n >= NAME_MAX) {
-                       fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg);
-                       return 2;
+                    if (*s != ',') {
+                       int n = strtol(s, &s, 10);
+                       if (n <= 0 || n > NAME_MAX) { // NAME_MAX excludes the terminating 0
+                          fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg);
+                          return 2;
+                          }
+                       DirectoryNameMax = n;
+                       if (!*s)
+                          break;
+                       if (*s != ',') {
+                          fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
+                          return 2;
+                          }
                        }
-                    DirectoryNameMax = n;
+                    s++;
                     if (!*s)
                        break;
-                    if (*s++ != ',') {
-                       fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
-                       return 2;
-                       }
-                    n = strtol(s, &s, 10);
+                    int n = strtol(s, &s, 10);
                     if (n != 0 && n != 1) {
                        fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg);
                        return 2;
@@ -480,10 +494,12 @@ int main(int argc, char *argv[])
                "                           the maximum directory name length (default: %d);\n"
                "                           the optional ENC can be 0 or 1, and controls whether\n"
                "                           special characters in directory names are encoded as\n"
-               "                           hex values (default: 0)\n"
+               "                           hex values (default: 0); if PATH or NAME are left\n"
+               "                           empty (as in \",,1\" to only set ENC), the defaults\n"
+               "                           apply\n"
                "            --edit=REC     cut recording REC and exit\n"
                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"
-               "                           '%s' in the video directory)\n"
+               "                           '%s' in the cache directory)\n"
                "                           '-E-' disables this\n"
                "                           if FILE is a directory, the default EPG file will be\n"
                "                           created in that directory\n"
@@ -530,7 +546,7 @@ int main(int argc, char *argv[])
                "\n",
                DEFAULTCACHEDIR,
                DEFAULTCONFDIR,
-               PATH_MAX,
+               PATH_MAX - 1,
                NAME_MAX,
                DEFAULTEPGDATAFILENAME,
                MAXVIDEOFILESIZEDEFAULT,

From c0f90a3e0c87901e80d180971c69a622a103b62c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 23 Mar 2013 12:16:00 +0100
Subject: [PATCH 228/307] Version 1.7.42 VDR developer version 1.7.42 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.42.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.41-1.7.42.diff

MD5 checksums:

5a9ec132781045061325162fe03c2763  vdr-1.7.42.tar.bz2
011f2838026f849f031c40b2f06d9181  vdr-1.7.41-1.7.42.diff

Approaching version 2.0.0:
==========================

If there are no more serious bug reports, the final version 2.0.0 of VDR
shall be released on March 31, 2013.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

The following language files still have the given number of untranslated texts:

da_DK.po: 134
el_GR.po: 197
hr_HR.po: 134
lt_LT.po: 1
nn_NO.po: 262
pt_PT.po: 28
sl_SI.po: 1
tr_TR.po: 134

If nobody takes care of these, they will remain untranslated in version 2.0.0.

DEADLINE FOR SUBMITTING TRANSLATIONS IS SATURDAY, MARCH 30!

From the HISTORY file:
- Updated the Serbian OSD texts (thanks to Zoran Turalija).
- Added maximum SNR and signal strength value for TechniSat SkyStar HD2 (thanks to
  Zoran Turalija).
- Renamed the language file sr_SR.po to sr_RS.po (pointed out by Zoran Turalija).
- Fixed loading the setup.conf file in case a parameter contains the '#' character
  (thanks to Johann Friedrichs).
- The "Resume" button in the main menu is now only active if the respective recording
  actually exists (reported by Johann Friedrichs).
- The cutter now allocates its buffers on the heap to avoid problems on systems with
  limited stack space (suggested by Juergen Lock).
- Fixed formatting the channel definition example in the vdr(5) man page (thanks to
  Dominic Evans).
- Updated the default channels.conf file.
---
 CONTRIBUTORS                       |  13 +-
 HISTORY                            |  16 +
 PLUGINS/src/hello/po/fi_FI.po      |   4 +-
 PLUGINS/src/pictures/HISTORY       |   2 +-
 PLUGINS/src/pictures/po/fi_FI.po   |   4 +-
 PLUGINS/src/skincurses/po/fi_FI.po |   4 +-
 UPDATE-2.0.0                       |   8 +-
 channels.conf                      | 229 +++++--------
 config.c                           |   4 +-
 config.h                           |   6 +-
 cutter.c                           |  27 +-
 dvbdevice.c                        |  15 +-
 menu.c                             |   4 +-
 po/fi_FI.po                        |   2 +-
 po/{sr_SR.po => sr_RS.po}          | 501 +++++++++++++++--------------
 vdr.5                              |   6 +-
 16 files changed, 420 insertions(+), 425 deletions(-)
 rename po/{sr_SR.po => sr_RS.po} (69%)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bd275cd0c..4da1a5c48 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1063,7 +1063,7 @@ Lars Bl
 Niko Tarnanen <niko.tarnanen@hut.fi>
  for translating OSD texts to the Finnish language
 
-Rolf Ahrenberg <Rolf.Ahrenberg@saunalahti.fi>
+Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
  for making pressing the Power button not stop Transfer Mode or replay immediately
@@ -2740,6 +2740,9 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for making cPalette::ClosestColor() treat fully transparent colors as "equal"
  for implementing scaling of SPU bitmaps
  for fixing creating a new VPS timer with the SVDRP command NEWT
+ for fixing loading the setup.conf file in case a parameter contains the '#' character
+ for reporting that the "Resume" button in the main menu was active even if the
+ respective recording did not exist
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -2916,6 +2919,8 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de>
  in case, for instance, there is now a DVB-T device where there used to be a bonded
  DVB-S device
  for fixing a possible deadlock in handling the tuners of bonded devices
+ for suggesting to allocate the cutter's buffers on the heap to avoid problems on
+ systems with limited stack space
 
 Sergiu Dotenco <sergiu.dotenco@googlemail.com>
  for reporting a missing initialization in sDvbSpuRect
@@ -2970,6 +2975,7 @@ Dominic Evans <oldmanuk@gmail.com>
  for suggesting to make the channel name column in the "What's on now/next" menu
  adjust its width to display the full short name of each channel
  for reporting wrong permissions of po/sr_SR.po
+ for fixing formatting the channel definition example in the vdr(5) man page
 
 Torsten Lang <info@torstenlang.de>
  for reporting a problem with newline characters in stream component descriptions
@@ -3123,3 +3129,8 @@ Matti Lehtim
 Siegfried Bosch <bosch@math.uni-muenster.de>
  for fixing a possible "Channel not available" if a recording starts on a system with
  bonded devices
+
+Zoran Turalija <zoran.turalija@gmail.com>
+ for translating OSD texts to the Serbian language
+ for adding maximum SNR and signal strength value for TechniSat SkyStar HD2
+ for pointing out that the language file sr_SR.po should be renamed to sr_RS.po
diff --git a/HISTORY b/HISTORY
index 0b9e6a2d1..88f06260b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7756,3 +7756,19 @@ Video Disk Recorder Revision History
   to Ville Skytt�).
 - Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann
   Friedrichs).
+
+2013-03-23: Version 1.7.42
+
+- Updated the Serbian OSD texts (thanks to Zoran Turalija).
+- Added maximum SNR and signal strength value for TechniSat SkyStar HD2 (thanks to
+  Zoran Turalija).
+- Renamed the language file sr_SR.po to sr_RS.po (pointed out by Zoran Turalija).
+- Fixed loading the setup.conf file in case a parameter contains the '#' character
+  (thanks to Johann Friedrichs).
+- The "Resume" button in the main menu is now only active if the respective recording
+  actually exists (reported by Johann Friedrichs).
+- The cutter now allocates its buffers on the heap to avoid problems on systems with
+  limited stack space (suggested by Juergen Lock).
+- Fixed formatting the channel definition example in the vdr(5) man page (thanks to
+  Dominic Evans).
+- Updated the default channels.conf file.
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index a571922a7..205a1f018 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -4,7 +4,7 @@
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
+# Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2003
 #
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Last-Translator: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 46ccc7c07..847f8b9aa 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -9,7 +9,7 @@ VDR Plugin 'pictures' Revision History
 
 - Fixed the Play function (when used from a directory in the pictures menu
   it always started with the next directory).
-- Added Finnish texts (thanks to Rolf Ahrenberg <rahrenbe@cc.hut.fi>).
+- Added Finnish texts (thanks to Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>).
 
 2008-01-27: Version 0.0.3
 
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 7f99e2ccd..65b604257 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008
+# Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2008
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Last-Translator: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 39afbbc81..2be31fbff 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
+# Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2007
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Last-Translator: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index c24fcb0d3..6287a7700 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -5,6 +5,10 @@ have been made "behind the scenes".
 
 See the file HISTORY for a detailed list of all changes.
 
+Full support for HDTV:
+
+- VDR now fully supports HDTV.
+
 Satellite Channel Routing:
 
 - VDR now supports "Satellite Channel Routing" (SCR) according to EN50494 (based on
@@ -468,10 +472,6 @@ Misc:
   files to be spread around your system according to the FHS, you can set the
   parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as
   before.
-- VDR can now be built according to the FHS ("File system Hierarchy Standard") by
-  activating the line
-  #USEFHS = 1
-  in a copy of the file Make.config.template.
 - The script given to VDR with the '-r' option is now also called whenever a
   recording is deleted.
 - Synchronizing system time to the transponder time is now done using adjtime() in order
diff --git a/channels.conf b/channels.conf
index e47dd09bd..1e279d440 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,146 +1,85 @@
-RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu;106=deu:105:0:12003:1:1089:0
-SAT.1;ProSiebenSat.1:12544:hC56:S19.2E:22000:255:256=deu;259=deu:32:0:17500:1:1107:0
-ProSieben;ProSiebenSat.1:12544:hC56:S19.2E:22000:511:512=deu;515=deu:33:0:17501:1:1107:0
-RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
-Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu,103=2ch;106=dd:104:0:28106:1:1101:0
-Bayerisches FS;ARD:11836:hC34:S19.2E:27500:201:202=deu,203=2ch:204:0:28107:1:1101:0
-hr-fernsehen;ARD:11836:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
-NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
-SR Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
-WDR Köln;ARD:11836:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-BR-alpha;ARD:11836:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
-SWR Fernsehen BW;ARD:11836:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
-Phoenix;ARD:11836:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
-ZDF;ZDFvision:11953:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
-3sat;ZDFvision:11953:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-KiKa;ZDFvision:11953:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
-arte;ARD:11836:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-ORF1;ORF:562:C34D34M16B8T8G4Y0:T:27500:3210:3211=deu;3213=deu:3215:0:10101:13130:320:0
-ORF2S;ORF:562:C34D34M16B8T8G4Y0:T:27500:3220:3221=deu;3223=deu:3225:0:10107:13130:320:0
-ATV;ORF:562:C34D34M16B8T8G4Y0:T:27500:3240:3241=deu:3245:0:10120:13130:320:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
-ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:630:0:28011:1:1079:0
-CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
-Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
-VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
-kabel eins;ProSiebenSat.1:12544:hC56:S19.2E:22000:767:768=deu:34:0:17502:1:1107:0
-DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:133:5:0
-9Live;ProSiebenSat.1:12544:hC56:S19.2E:22000:1279:1280=deu:36:0:17504:1:1107:0
-DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
-HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
-Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28205:1:1073:0
-Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:579:0:28707:1:1026:0
-Veronica/JETIX;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
-BVN;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
-n-tv;RTL World:12187:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
-Al Jazeera;CANALSATELLITE:11567:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
-TW1;ORF:12662:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
-Eurosport;SES Astra:12226:hC34:S19.2E:27500:101+8190:103=deu:102:0:31200:1:1091:0
-EinsExtra;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
-EinsFestival;ARD:12109:hC34:S19.2E:27500:201:202=deu:204:0:28202:1:1073:0
-EinsPlus;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
-ZDFtheaterkanal;ZDFvision:11953:hC34:S19.2E:27500:1110:1120=deu:630:0:28016:1:1079:0
-ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:630:0:28014:1:1079:0
-MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
-rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
-:Premiere World
-PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1722,1702,1801:8:133:1:0
-PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1722,1831,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1831,1722,1801:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1722,1831,1702,1801:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1831,1722,1702,1801:9:133:2:0
-PREMIERE SERIE,SERIE;PREMIERE:11797:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1831,1801,1722,1702:16:133:2:0
-PREMIERE KRIMI,KRIMI;PREMIERE:11797:hC34:S19.2E:27500:2815:2816=deu:32:1831,1702,1722,1801:23:133:2:0
-PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11719:hC34:S19.2E:27500:1535:1536=deu:32:1722,1831,1702,1801:516:133:3:0
-PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11719:hC34:S19.2E:27500:1023:1024=deu,1025=deu:32:1831,1801,1722,1702:41:133:3:0
-PREMIERE FILMFEST,FILMFEST;PREMIERE:11719:hC34:S19.2E:27500:1279:1280=deu:32:1831,1801,1702,1722:20:133:3:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1831,1702,1722,1801:34:133:17:0
-:Premiere Direkt
-PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
-:PW Erotic
-BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:32:1702,1722,1801:21:133:17:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12031:hC34:S19.2E:27500:1279:1280=deu:0:1722,1801,1702,1810:513:133:4:0
-:Sportsworld
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1831,1722,1801,1702:17:133:3:0
-BIG BROTHER,BROTHER;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu:0:1831,1702,1722,1801:27:133:4:0
-:Beta Digital
-N24;ProSiebenSat.1:12544:hC56:S19.2E:22000:1023:1024=deu:35:0:17503:1:1107:0
-LibertyTV FR;LibertyTV.com:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0
-:-
-APS.TV3;BetaDigital:12148:hC34:S19.2E:27500:495:496=deu:0:0:658:133:7:0
-ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
-Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
-Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
-ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
-FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
-LCP;ABSAT:12285:vC34:S19.2E:27500:167:108:0:0:17027:1:1094:0
-ESCALES;ABSAT:12285:vC34:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
-BEST OF SHOPPING;CSAT:12324:vC34:S19.2E:27500:2047+160:0:0:0:8612:1:1096:0
-ASTRA-Mosaic;SES ASTRA:12551:vC56:S19.2E:22000:175:176=fra:0:0:3988:1:1108:0
-ASTRA-Mosaic 2;SES ASTRA:12551:vC56:S19.2E:22000:179:120=fra:0:0:3987:1:1108:0
-ASTRA-Mosaic 3;SES ASTRA:12551:vC56:S19.2E:22000:182:169=fra:0:0:3986:1:1108:0
-ASTRA-Mosaic 4;SES ASTRA:12551:vC56:S19.2E:22000:185:170=fra:0:0:3985:1:1108:0
-ASTRA-Mosaic 5;SES ASTRA:12551:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0
-Chamber TV;Chambre des DØputØes:12551:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
-RTL Tele Letzebuerg:12551:vC56:S19.2E:22000:168:144=ltz,146=fra:301:0:3994:1:1108:0
-tien;CANALDIGITAAL SATELLIET:12574:hC56:S19.2E:22000:512+8190:84=dut:33:622,100:5010:53:1109:0
-NICK AUSTRIA;MTV Networks:12226:hC34:S19.2E:27500:513+8190:661=deu:577:0:28640:1:1091:0
-Service 3;MTV Networks Europe:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0
-VIVA;MTV Networks Europe:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
-COMEDY CENTRAL;MTV Networks Europe:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
-QVC Deutschland;QVC:12551:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
-TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
-:NTSC
-Venevision;T-Systems/MTI:11200:vC56:S13.0E:27500:922:923=und:0:0:4750:0:13400:0
-EBC.1;T-Systems/MTI:11200:vC56:S13.0E:27500:373:374=eng:0:0:4747:0:13400:0
-:HDTV
-HDFORUM;TF1:11242:vC34:S13.0E:27500:0:36=fra,37=fra:0:0:13809:100:200:0
-LUXE TV HD;Eutelsat:11240:vC34:S13.0E:27500:33:36=fra:0:0:13809:318:200:0
-Euro1080 HD-5;Euro1080:10758:vC78:S23.5E:22000:34:160=eng:0:0:1085:9999:3104:0
-Euro1080;EURO1080:12168:vC56:S19.2E:27500:308:256:0:0:21100:1:1088:0
-SMD HD;SES ASTRA:12699:vC56:S19.2E:22000:133+80:234=eng:0:0:29700:0:0:0
-SMD HD:12699:vC56:S19.2E:22000:133:234=eng:0:0:3231:1:1118:0
-Astra HD:12441:vC34:S19.2E:27500:133+80:134=eng:0:0:29700:0:0:0
-TV HD;CSAT:12581:vC56:S19.2E:22000:165:100=fra;101=fra:0:0:9306:1:1110:0
-C M HD;Telenor:11261:hC78:S1.0W:24500:517:660=eng;661=eng:0:B00:3306:70:33:0
-CANAL+ HD;Telenor:11389:hC78:S1.0W:24500:512:640=eng;641=eng:580:0:3306:70:34:0
-Era 2;Service Provider:11645:hC34:S13.0E:27500:2201:2211=ell,2212=eng:0:0:2200:318:15700:0
-TPS Star:10757:vC34:S13.0E:27500:420:430=fra,431=eng:440:500,100:1204:176:11200:0
-:@201 Sky
-Sky One;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4703:2:2030:0
-Sky Two;BSkyB:12226:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:5104:2:2027:0
-ITV2;BSkyB:10758:vC56:S28.2E:22000:2348:2349=eng,2351=NAR:2353:0:10070:2:2044:0
-SCI FI;BSkyB:12148:hC23:S28.2E:27500:512+8190:640=eng,660=NAR:576:960,961:4905:2:2023:0
-ParaComedy 1;BSkyB:12187:hC23:S28.2E:27500:518+8190:666=eng,686=NAR:582:960,961:5904:2:2025:0
-ParaComedy 1;BSkyB:11526:vC23:S28.2E:27500:2317+2306:2318=eng:2319:960,961:50305:2:2404:0
-ParaComedy 2;BSkyB:11914:hC23:S28.2E:27500:514+8190:642=eng,662=NAR:578:960,961:4504:2:2011:0
-Discovery;BSkyB:11875:hC23:S28.2E:27500:2308:2310=eng,2311=NAR:2309:960,961:6201:2:2009:0
-Sky Comedy;BSkyB:11836:hC23:S28.2E:27500:518+8190:646=eng,686=NAR;666=eng:582:960,961:4303:2:2007:0
-Sky Action;BSkyB:11836:hC23:S28.2E:27500:519+8190:647=eng,687=NAR;667=eng:583:960,961:4302:2:2007:0
-Sky Family;BSkyB:11836:hC23:S28.2E:27500:520+8190:648=eng,688=NAR;668=eng:584:960,961:4403:2:2007:0
-Sky ScFi/Horror;BSkyB:11836:hC23:S28.2E:27500:512+8190:640=eng,680=NAR;660=eng:576:960,961:4304:2:2007:0
-Sky Classics;BSkyB:11836:hC23:S28.2E:27500:513+8190:641=eng,681=NAR;661=eng:577:960,961:4305:2:2007:0
-Sky Indie;BSkyB:11836:hC23:S28.2E:27500:514+8190:642=eng,682=NAR;662=eng:578:960,961:4306:2:2007:0
-Sky Movies 7;BSkyB:12285:vC23:S28.2E:27500:515+8190:643=eng,653=NAR;663=eng:579:960,961:4603:2:2030:0
-Sky Drama;BSkyB:11836:hC23:S28.2E:27500:515+8190:643=eng,683=NAR;663=eng:579:960,961:5502:2:2007:0
-SkyMovies SD1;BSkyB:12285:vC23:S28.2E:27500:518+8190:646=eng,686=NAR;666=eng:2328:960,961:4602:2:2030:0
-SkyMovies SD2;BSkyB:12285:vC23:S28.2E:27500:514+8190:642=eng,682=NAR;662=eng:2331:960,961:4604:2:2030:0
-Sky Premiere;BSkyB:11603:vC23:S28.2E:27500:513+129:641=eng,661=NAR;681=eng:577:960,961:4651:2:2408:0
-Sky Prem+1;BSkyB:11603:vC23:S28.2E:27500:514+130:642=eng,662=NAR;682=eng:578:960,961:4652:2:2408:0
-:@900 Some 'seed' channels
-Chelsea TV;BskyB:11778:vC23:S28.2E:27500:2308+2304:2309=eng:0:960,961:9307:2:2004:0
-WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
-Animal Plnt+1;BSkyB:12070:hC23:S28.2E:27500:514+8190:662=eng,682=NAR:578:960,961:50002:2:2019:0
-S1T;BSkyB:12285:vC23:S28.2E:27500:513+8190:641=eng,661=NAR:577:960,961:4409:2:2030:0
-CNN;BSkyB:12051:vC23:S28.2E:27500:2317:2319=eng:2318:0:7140:2:2018:0
-BBC PARL'MNT;BSkyB:10847:vC56:S28.2E:22000:2327:2328=eng:2331:0:6902:2:2050:0
-MTI;T-Systems/MTI:11200:vC56:S13.0E:27500:4097:4098:0:0:4733:318:13400:0
-WRN Eng AAP;Globecast:12597:vC34:S13.0E:27500:0:2132:0:0:8230:318:9400:0
-DrDish Television;BetaDigital:12246:vC34:S19.2E:27500:2047:2048=deu:0:0:10107:1:1092:0
-! LifeStyle-TV !;T-Systems:12633:hC56:S19.2E:22000:204:304=deu:0:0:12603:1:1113:0
-Challenger Tv;Telespazio:11295:hC34:S13.0E:27500:490:491:0:0:8409:318:500:0
-NDS Enc 3;NDS:11535:vC34:S1.0W:5632:308+8190:256=eng,257=fra:273:0:1:65535:1:0
+RTL Television,RTL;RTL World:12187:HC34M2S0:S19.2E:27500:163=2:104=deu@3;106=deu@106:105;110=deu:0:12003:1:1089:0
+SAT.1;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:255=2:256=deu@3;259=deu@106:32:0:17500:1:1107:0
+ProSieben;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:511=2:512=deu@3;515=deu@106:33:0:17501:1:1107:0
+RTL2;RTL World:12187:HC34M2S0:S19.2E:27500:166=2:128=deu@3:68:0:12020:1:1089:0
+Das Erste HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5101=27:5102=deu@3,5103=mis@3;5106=deu@106:5104;5105=deu:0:10301:1:1019:0
+ZDF HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6110=27:6120=deu@3,6121=mis@3,6123=mul@3;6122=deu@106:6130;6131=deu:0:11110:1:1011:0
+BR S�d HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3;5206=deu@106:5204:0:10325:1:1025:0
+hr-fernsehen;ARD:11836:HC34M2S0:S19.2E:27500:301=2:302=deu@3,303=mis@3:304:0:28108:1:1101:0
+NDR FS MV HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3;5226=deu@106:5224;5225=deu:0:10328:1:1025:0
+SR Fernsehen;ARD:12265:HC34M2S0:S19.2E:27500:1301=2:1302=deu@3,1303=mis@3:1304:0:28486:1:1093:0
+WDR HD K�ln;ARD:12422:HC34M2S0:S19.2E:27500:5501=27:5502=deu@3,5503=mis@3;5506=deu@106:5504:0:28325:1:1201:0
+SWR BW HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3;5126=deu@106:5124;5125=deu:0:10303:1:1019:0
+rbb Berlin;ARD:12109:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28206:1:1073:0
+PHOENIX HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5261=27:5262=deu@3,5263=mul@3:5264:0:10331:1:1025:0
+BR-alpha;ARD:12265:HC34M2S0:S19.2E:27500:1401=2:1402=deu@3,1403=mis@3;1406=deu@106:1404:0:28487:1:1093:0
+3sat HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6510=27:6520=deu@3,6521=mis@3,6523=mul@3;6522=deu@106:6530;6531=deu:0:11150:1:1010:0
+arte HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5111=27:5112=deu@3,5113=fra@3;5116=deu@106:5114;5115=deu,5118=fra:0:10302:1:1019:0
+MDR Sachsen;ARD:12109:HC34M2S0:S19.2E:27500:2901=2:2902=deu@3,2903=mis@3:2904:0:28228:1:1073:0
+ServusTV HD Oesterreich;ServusTV:11303:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@4,3585=eng@4;3586=deu@122,3587=deu@106:3588:0:4913:1:1007:0
+N24;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1023=2:1024=deu@3:35:0:17503:1:1107:0
+Das Erste;ARD:11836:HC34M2S0:S19.2E:27500:101=2:102=deu@3,103=mis@3;106=deu@106:104;105=deu:0:28106:1:1101:0
+Bayerisches FS S�d;ARD:11836:HC34M2S0:S19.2E:27500:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28107:1:1101:0
+NDR FS MV;ARD:12109:HC34M2S0:S19.2E:27500:2601=2:2602=deu@3,2603=mis@3:2604:0:28224:1:1073:0
+WDR K�ln;ARD:11836:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28111:1:1101:0
+SWR Fernsehen BW;ARD:11836:HC34M2S0:S19.2E:27500:801=2:802=deu@3,803=mis@3;806=deu@106:804:0:28113:1:1101:0
+PHOENIX;ARD:10744:HC56M2S0:S19.2E:22000:501=2:502=deu@3,503=mul@3:504:0:28725:1:1051:0
+ZDF;ZDFvision:11953:HC34M2S0:S19.2E:27500:110=2:120=deu@3,121=mis@3,122=mul@3;125=deu@106:130;131=deu:0:28006:1:1079:0
+3sat;ZDFvision:11953:HC34M2S0:S19.2E:27500:210=2:220=deu@3,221=mis@3,222=mul@3;225=deu@106:230;231=deu:0:28007:1:1079:0
+KiKA HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6610=27:6620=deu@3,6621=mis@3;6622=deu@106:6630:0:11160:1:1010:0
+KiKA;ZDFvision:11953:HC34M2S0:S19.2E:27500:310=2:320=deu@3,321=mis@3;325=deu@106:330:0:28008:1:1079:0
+arte;ARD:10744:HC56M2S0:S19.2E:22000:401=2:402=deu@3,403=fra@3:404:0:28724:1:1051:0
+ORF1 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:1920=27:1921=deu@4,1922=eng@4;1923=deu@106:1925:D05,D95,648,1702,1833,9C4,98C:4911:1:1007:0
+ORF1;ORF:12692:HC56M2S0:S19.2E:22000:160=2:161=deu@3;163=deu@106:165:D05,D95,648,1702,1833,9C4,98C:13001:1:1117:0
+ORF2 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:2920=27:2921=deu@4,2922=eng@4;2923=deu@106:2925:D05,D95,648,1702,1833,9C4,98C:4912:1:1007:0
+ORF2;ORF:12692:HC56M2S0:S19.2E:22000:500=2:501=deu@3;503=deu@106:505:D95,D05,648,1702,1833,9C4,98C:13002:1:1117:0
+ZDFinfo HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6710=27:6720=deu@3,6721=mis@3,6723=mul@3;6722=deu@106:6730:0:11170:1:1010:0
+ZDFinfo;ZDFvision:11953:HC34M2S0:S19.2E:27500:610=2:620=deu@3,621=mis@3,622=mul@3;625=deu@106:630:0:28011:1:1079:0
+CNN Int.;CNN:11778:VC34M2S0:S19.2E:27500:165=2:100=eng@3:0:0:28522:1:1068:0
+SUPER RTL;RTL World:12187:HC34M2S0:S19.2E:27500:165=2:120=deu@3:65:0:12040:1:1089:0
+VOX;RTL World:12187:HC34M2S0:S19.2E:27500:167=2:136=deu@3:71;74=deu:0:12060:1:1089:0
+kabel eins;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:767=2:768=deu@3:34:0:17502:1:1107:0
+DAS VIERTE,D VIERTE;BetaDigital:12460:HC34M2S0:S19.2E:27500:2047=2:2048=deu@3:36:0:1793:133:5:0
+BBC FOUR;BSkyB:10802:HC56M2S0:S28.2E:22000:5600=2:5601=eng@3,5602=NAR@3:5603;5604=eng:0:6416:2:2047:0
+BBC HD;BSkyB:10847:vC56M2O0S1:S28.5E:23000:5500=27:5502=NAR@3;5501=eng@106:5503;5504=eng:0:6940:2:2050:0
+BBC One HD;BSkyB:10847:VC23M5O25P0S1:S28.2E:23000:5400=27:5402=NAR@3;5401=eng@106:5403;5404=eng:0:6941:2:2050:0
+SAT.1 Gold;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1279=2:1280=deu@3:36:0:17504:1:1107:0
+SPORT1;BetaDigital:12480:VC34M2S0:S19.2E:27500:1023=2:1024=deu@3:39:0:900:133:33:0
+HSE24,HSE24;BetaDigital:12480:VC34M2S0:S19.2E:27500:1279=2:1280=deu@3:37:0:40:133:33:0
+Bloomberg Europe TV;Arqiva:11597:VC56M2S0:S19.2E:22000:1360=2:1320=eng@4:37:0:10067:1:1026:0
+NRJ 12;CSAT:11817:VC34M2S0:S19.2E:27500:163=2:92=fra@4;93=fra@106:41:1811,1812,500,1863,100:8004:1:1070:0
+rbb Brandenburg;ARD:12109:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28205:1:1073:0
+Sky News Intl;SES ASTRA:12604:HC56M2S0:S19.2E:22000:1290=2:2290=@4:0:0:7290:1:1111:0
+Veronica/DisneyXD;CANALDIGITAAL:12574:HC56M2O0S0:S19.2E:22000:0:0:0:622:5020:53:1109:0
+Test;CANALDIGITAAL:12574:HC56M2O0S0:S19.2E:22000:522+8190=2:97=dut@4:40:100:5025:53:1109:0
+n-tv;RTL World:12187:HC34M2S0:S19.2E:27500:169=2:73=deu@3:80:0:12090:1:1089:0
+Al Jazeera Channel;GlobeCast:11508:VC56M2S0:S19.2E:22000:709=2:729=ara@3:0:0:7009:1:1020:0
+ORF III;ORF:12662:HC56M2S0:S19.2E:22000:1010=2:1011=deu@4:1013:D95,648,D05,9C4,1702,1833,98C:13101:1:1115:0
+Eurosport HD,EurospHD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:1535=27:0;1539=deu@106:32:1833,9C4,9AF,98C:132:133:6:0
+Eurosport Deutschland;SES Astra:12226:HC34M2S0:S19.2E:27500:101=2:103=deu@4:102:0:31200:1:1091:0
+tagesschau24;ARD:10744:HC56M2S0:S19.2E:22000:101=2:102=deu@3:0:0:28721:1:1051:0
+Einsfestival HD;ARD:12422:HC34M2S0:S19.2E:27500:1601=27:1602=deu@3;1606=deu@106:1604:0:28396:1:1201:0
+Einsfestival;ARD:10744:HC56M2S0:S19.2E:22000:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28722:1:1051:0
+EinsPlus;ARD:10744:HC56M2S0:S19.2E:22000:301=2:302=deu@3,303=mis@3;306=deu@106:304:0:28723:1:1051:0
+zdf.kultur HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6410=27:6420=deu@3,6421=mis@3,6423=mul@3;6422=deu@106:6430:0:11140:1:1011:0
+zdf.kultur;ZDFvision:11953:HC34M2S0:S19.2E:27500:1110=2:1120=deu@3,1121=mis@3,1122=mul@3;1125=deu@106:1130:0:28016:1:1079:0
+zdf_neo HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6310=27:6320=deu@3,6321=mis@3,6323=mul@3;6322=deu@106:6330:0:11130:1:1011:0
+zdf_neo;ZDFvision:11953:HC34M2S0:S19.2E:27500:660=2:670=deu@3,671=mis@3,672=mul@3;675=deu@106:680:0:28014:1:1079:0
+SIXX;ProSiebenSat.1:12460:HC34M2S0:S19.2E:27500:767=2:768=deu@3:35:0:776:133:5:0
+:Sky
+Sky Cinema,Cinema;SKY:11797:HC34M2S0:S19.2E:27500:511=2:512=deu@3,513=eng@3;515=deu@106:32:1702,1722,1833,1834,1836,9C4,9C7,9AF,98C,1861:10:133:2:0
+Sky Cinema +1,Cinema1;SKY:11797:HC34M2S0:S19.2E:27500:1791=2:1792=deu@3,1793=eng@3;1795=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:11:133:2:0
+Sky Cinema +24,Cinema24;SKY:11797:HC34M2S0:S19.2E:27500:2303=2:2304=deu@3,2305=eng@3;2307=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:43:133:2:0
+Sky Action,Action;SKY:11797:HC34M2S0:S19.2E:27500:767=2:768=deu@3,769=eng@3;771=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:9:133:2:0
+Sky Comedy,Comedy;SKY:11797:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3,2561=eng@3;2563=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:8:133:2:0
+Sky Atlantic HD,AtlanticHD;SKY:11993:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106,1284=eng@106:32:1833,9C4,9AF,98C:110:133:13:0
+Fox Serie,Fox;SKY:12070:HC34M2S0:S19.2E:27500:1279=2:1280=deu@3,1281=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:16:133:1:0
+History HD,HistHD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106:32:1833,9C4,9AF,98C:113:133:13:0
+Sky Emotion,Emotion;SKY:11797:HC34M2S0:S19.2E:27500:2815=2:2816=deu@3,2817=eng@3;2819=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:20:133:2:0
+Sky Nostalgie,Nostalgie;SKY:11719:HC34M2S0:S19.2E:27500:1535=2:1536=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:516:133:3:0
+Sky Hits,SkyHits;SKY:11719:HC34M2S0:S19.2E:27500:1023=2:1024=deu@3,1025=eng@3;1027=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:41:133:3:0
+Discovery Channel,Discovery;SKY:12031:HC34M2S0:S19.2E:27500:3071=2:3072=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:14:133:4:0
+National Geographic,NatGeo;SKY:12031:HC34M2S0:S19.2E:27500:3327=2:3328=deu@3,3329=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:13:133:4:0
+Disney Channel,Disney;SKY:11758:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:34:133:17:0
+TNT Serie,TNTSerie;SKY:12070:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3,2561=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:50:133:1:0
 :@1000 New channels
diff --git a/config.c b/config.c
index 3dc9fe848..7a153cb14 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.37 2013/03/10 14:56:51 kls Exp $
+ * $Id: config.c 2.38 2013/03/18 08:57:50 kls Exp $
  */
 
 #include "config.h"
@@ -518,7 +518,7 @@ void cSetup::Store(const char *Name, double &Value, const char *Plugin)
 
 bool cSetup::Load(const char *FileName)
 {
-  if (cConfig<cSetupLine>::Load(FileName, true)) {
+  if (cConfig<cSetupLine>::Load(FileName)) {
      bool result = true;
      for (cSetupLine *l = First(); l; l = Next(l)) {
          bool error = false;
diff --git a/config.h b/config.h
index f7b3795f6..b55498ffa 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.74 2013/03/11 11:07:59 kls Exp $
+ * $Id: config.h 2.75 2013/03/16 15:12:14 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.41"
-#define VDRVERSNUM   10741  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.42"
+#define VDRVERSNUM   10742  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/cutter.c b/cutter.c
index 8566c720c..05bb0f9f7 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.24 2013/02/17 14:11:03 kls Exp $
+ * $Id: cutter.c 2.25 2013/03/18 09:40:49 kls Exp $
  */
 
 #include "cutter.h"
@@ -362,11 +362,22 @@ bool cCuttingThread::SwitchFile(bool Force)
   return true;
 }
 
+class cHeapBuffer {
+private:
+  uchar *buffer;
+public:
+  cHeapBuffer(int Size) { buffer = MALLOC(uchar, Size); }
+  ~cHeapBuffer() { free(buffer); }
+  operator uchar * () { return buffer; }
+  };
+
 bool cCuttingThread::FramesAreEqual(int Index1, int Index2)
 {
+  cHeapBuffer Buffer1(MAXFRAMESIZE);
+  cHeapBuffer Buffer2(MAXFRAMESIZE);
+  if (!Buffer1 || !Buffer2)
+     return false;
   bool Independent;
-  uchar Buffer1[MAXFRAMESIZE];
-  uchar Buffer2[MAXFRAMESIZE];
   int Length1;
   int Length2;
   if (LoadFrame(Index1, Buffer1, Independent, Length1) && LoadFrame(Index2, Buffer2, Independent, Length2)) {
@@ -386,12 +397,14 @@ bool cCuttingThread::FramesAreEqual(int Index1, int Index2)
 
 void cCuttingThread::GetPendingPackets(uchar *Data, int &Length, int Index)
 {
+  cHeapBuffer Buffer(MAXFRAMESIZE);
+  if (!Buffer)
+     return;
   bool Processed[MAXPID] = { false };
   cPacketStorage PacketStorage;
   int64_t LastPts = lastVidPts + delta;// adding one frame length to fully cover the very last frame
   Processed[patPmtParser.Vpid()] = true; // we only want non-video packets
   for (int NumIndependentFrames = 0; NumIndependentFrames < 2; Index++) {
-      uchar Buffer[MAXFRAMESIZE];
       bool Independent;
       int len;
       if (LoadFrame(Index, Buffer, Independent, len)) {
@@ -534,8 +547,12 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
   bool SeamlessBegin = LastEndIndex >= 0 && FramesAreEqual(LastEndIndex, BeginIndex);
   bool SeamlessEnd = NextBeginIndex >= 0 && FramesAreEqual(EndIndex, NextBeginIndex);
   // Process all frames from BeginIndex (included) to EndIndex (excluded):
+  cHeapBuffer Buffer(MAXFRAMESIZE);
+  if (!Buffer) {
+     error = "malloc";
+     return false;
+     }
   for (int Index = BeginIndex; Running() && Index < EndIndex; Index++) {
-      uchar Buffer[MAXFRAMESIZE];
       bool Independent;
       int Length;
       if (LoadFrame(Index, Buffer, Independent, Length)) {
diff --git a/dvbdevice.c b/dvbdevice.c
index 1fba1661f..ab6149f22 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.87 2013/03/13 11:23:53 kls Exp $
+ * $Id: dvbdevice.c 2.88 2013/03/16 15:23:35 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -549,7 +549,9 @@ int cDvbTuner::GetSignalStrength(void) const
   // Use the subsystemId to identify individual devices in case they need
   // special treatment to map their Signal value into the range 0...0xFFFF.
   switch (subsystemId) {
-    case 0x13C21019: MaxSignal = 670; break; // TT-budget S2-3200 (DVB-S/DVB-S2)
+    case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2)
+    case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2)
+                     MaxSignal = 670; break;
     }
   int s = int(Signal) * 100 / MaxSignal;
   if (s > 100)
@@ -628,15 +630,18 @@ int cDvbTuner::GetSignalQuality(void) const
      // Use the subsystemId to identify individual devices in case they need
      // special treatment to map their Snr value into the range 0...0xFFFF.
      switch (subsystemId) {
-       case 0x13C21019: if (frontendType == SYS_DVBS2) { // TT-budget S2-3200 (DVB-S/DVB-S2)
+       case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2)
+       case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2)
+                        if (frontendType == SYS_DVBS2) {
                            MinSnr = 10;
                            MaxSnr = 70;
                            }
                         else
                            MaxSnr = 200;
                         break;
-       case 0x20130245:                      // PCTV Systems PCTV 73ESE
-       case 0x2013024F: MaxSnr = 255; break; // PCTV Systems nanoStick T2 290e
+       case 0x20130245: // PCTV Systems PCTV 73ESE
+       case 0x2013024F: // PCTV Systems nanoStick T2 290e
+                        MaxSnr = 255; break;
        }
      int a = int(constrain(Snr, MinSnr, MaxSnr)) * 100 / (MaxSnr - MinSnr);
      int b = 100 - (Unc * 10 + (Ber / 256) * 5);
diff --git a/menu.c b/menu.c
index 773269726..31d25d08b 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.81 2013/03/04 14:11:47 kls Exp $
+ * $Id: menu.c 2.82 2013/03/18 09:11:48 kls Exp $
  */
 
 #include "menu.h"
@@ -4566,6 +4566,8 @@ const char *cReplayControl::NowReplaying(void)
 
 const char *cReplayControl::LastReplayed(void)
 {
+  if (!Recordings.GetByName(fileName))
+     fileName = NULL;
   return fileName;
 }
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 375715761..f44dd72fd 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -4,7 +4,7 @@
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003-2008, 2010-2013
+# Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2003-2008, 2010-2013
 # Matti Lehtimäki <matti.lehtimaki@gmail.com>, 2013
 #
 msgid ""
diff --git a/po/sr_SR.po b/po/sr_RS.po
similarity index 69%
rename from po/sr_SR.po
rename to po/sr_RS.po
index 140bd4633..2968b9131 100644
--- a/po/sr_SR.po
+++ b/po/sr_RS.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Milan Cvijanovi� <elcom_cvijo@hotmail.com>, 2010
+# Zoran Turalija <zoran.turalija@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-03-04 14:46+0100\n"
-"PO-Revision-Date: 2011-01-09 15:57+0100\n"
-"Last-Translator: Milan Cvijanovi� <elcom_cvijo@hotmail.com>\n"
+"PO-Revision-Date: 2013-03-16 15:05+0100\n"
+"Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
@@ -23,13 +24,13 @@ msgid "Channel not available!"
 msgstr "Kanal nije dostupan!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Nemogu�e zapo�eti Prenos!!"
+msgstr "Nemogu�e zapo�eti 'Transfer Mode' re�im!"
 
 msgid "off"
 msgstr "isklju�i"
 
 msgid "on"
-msgstr ""
+msgstr "uklju�i"
 
 msgid "auto"
 msgstr "automatski"
@@ -41,19 +42,19 @@ msgid "Polarization"
 msgstr "Polarizacija"
 
 msgid "System"
-msgstr "Sistem"
+msgstr "Sistem (standard)"
 
 msgid "Srate"
-msgstr "Srate"
+msgstr "Srate (symbol rate)"
 
 msgid "Inversion"
 msgstr "Inverzija"
 
 msgid "CoderateH"
-msgstr "CoderateH"
+msgstr "CoderateH (FEC)"
 
 msgid "CoderateL"
-msgstr "CoderateL"
+msgstr "CoderateL (FEC)"
 
 msgid "Modulation"
 msgstr "Modulacija"
@@ -71,13 +72,13 @@ msgid "Hierarchy"
 msgstr "Hijerarhija"
 
 msgid "Rolloff"
-msgstr ""
+msgstr "Rolloff"
 
 msgid "StreamId"
-msgstr ""
+msgstr "StreamId"
 
 msgid "Starting EPG scan"
-msgstr "Po�injem EPG pretragu"
+msgstr "Po�inje EPG pretra�ivanje"
 
 msgid "Content$Movie/Drama"
 msgstr "Film/Drama"
@@ -89,7 +90,7 @@ msgid "Content$Adventure/Western/War"
 msgstr "Avantura/Vestern/Ratni"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr "Nau�no Fantasti�ni/Fantazija/Horor"
+msgstr "Nau�na fantastika/Fantazija/Horor"
 
 msgid "Content$Comedy"
 msgstr "Komedija"
@@ -101,76 +102,76 @@ msgid "Content$Romance"
 msgstr "Romansa"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "Ozbiljan/Klasi�ni/Religiozan/Istorijski Film/Drama"
+msgstr "Ozbiljan/Klasi�ni/Religiozan/Istorijski/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr "Za odrasle Film/Drama"
+msgstr "Film za odrasle/Drama"
 
 msgid "Content$News/Current Affairs"
-msgstr "Vesti/Trenutni poslovi"
+msgstr "Vesti/Aktuelni doga�aji"
 
 msgid "Content$News/Weather Report"
-msgstr "Vesti/Vremenski izvje�taj"
+msgstr "Vesti/Vremenski izve�taj"
 
 msgid "Content$News Magazine"
-msgstr "Magazin Vesti"
+msgstr "Novosti"
 
 msgid "Content$Documentary"
 msgstr "Dokumentarni"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr "Diskusije/Intervjui/Debate"
+msgstr "Diskusija/Razgovor/Debata"
 
 msgid "Content$Show/Game Show"
-msgstr "Zabavni/Igre Zabavne"
+msgstr "Zabavni/Igre"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr "Igre Zabavne/Kviz/Takmi�enja"
+msgstr "Igre/Kviz/Takmi�enje"
 
 msgid "Content$Variety Show"
-msgstr "Cirkus"
+msgstr "Kola� program"
 
 msgid "Content$Talk Show"
-msgstr "Talk �ou"
+msgstr "Diskusiona emisija"
 
 msgid "Content$Sports"
 msgstr "Sport"
 
 msgid "Content$Special Event"
-msgstr "Specijalne emisije"
+msgstr "Specijalna emisija"
 
 msgid "Content$Sport Magazine"
-msgstr "Sportski Magazin"
+msgstr "Sportski magazin"
 
 msgid "Content$Football/Soccer"
-msgstr "Futball/Igra�"
+msgstr "Fudbal"
 
 msgid "Content$Tennis/Squash"
 msgstr "Tenis/Skvo�"
 
 msgid "Content$Team Sports"
-msgstr "Timski Sport"
+msgstr "Timski sportovi"
 
 msgid "Content$Athletics"
 msgstr "Atletika"
 
 msgid "Content$Motor Sport"
-msgstr "Moto Sport"
+msgstr "Moto-sport"
 
 msgid "Content$Water Sport"
 msgstr "Sportovi na vodi"
 
 msgid "Content$Winter Sports"
-msgstr "Zimski Sportovi"
+msgstr "Zimski sportovi"
 
 msgid "Content$Equestrian"
-msgstr "Jaha�ki"
+msgstr "Konji�ki sport"
 
 msgid "Content$Martial Sports"
-msgstr "Vojni Sportovi"
+msgstr "Borila�ki sportovi"
 
 msgid "Content$Children's/Youth Programme"
-msgstr "De�iji/Program za Mlade"
+msgstr "De�iji program/Program za mlade"
 
 msgid "Content$Pre-school Children's Programme"
 msgstr "Pred�kolski de�iji program"
@@ -182,10 +183,10 @@ msgid "Content$Entertainment Programme for 10 to 16"
 msgstr "Zabavni program za uzrast od 10 do 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr "Informativni/Edukacioni/�kolski Program"
+msgstr "Informativni/Edukativni/�kolski program"
 
 msgid "Content$Cartoons/Puppets"
-msgstr "Crti�i/Lutkarski"
+msgstr "Crtani/Lutkarski"
 
 msgid "Content$Music/Ballet/Dance"
 msgstr "Muzi�ki/Balet/Ples"
@@ -194,16 +195,16 @@ msgid "Content$Rock/Pop"
 msgstr "Rok/Pop"
 
 msgid "Content$Serious/Classical Music"
-msgstr "Ozbiljna/Klasi�na Muzika"
+msgstr "Ozbiljna/Klasi�na muzika"
 
 msgid "Content$Folk/Tradional Music"
-msgstr "Narodna/Izvorna Muzika"
+msgstr "Narodna/Izvorna muzika"
 
 msgid "Content$Jazz"
 msgstr "D�ez"
 
 msgid "Content$Musical/Opera"
-msgstr "Mjuzikli/Opera"
+msgstr "Mjuzikl/Opera"
 
 msgid "Content$Ballet"
 msgstr "Balet"
@@ -212,116 +213,116 @@ msgid "Content$Arts/Culture"
 msgstr "Umetnost/Kultura"
 
 msgid "Content$Performing Arts"
-msgstr ""
+msgstr "Izvo�a�ka umetnost"
 
 msgid "Content$Fine Arts"
-msgstr ""
+msgstr "Likovna umetnost"
 
 msgid "Content$Religion"
 msgstr "Religija"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr "Moderna umetnost/Tradicionalna umetnost"
+msgstr "Pop kultura/Tradicionalna umetnost"
 
 msgid "Content$Literature"
-msgstr "Literarni"
+msgstr "Knji�evnost"
 
 msgid "Content$Film/Cinema"
-msgstr "Film/Kino"
+msgstr "Film/Bioskop"
 
 msgid "Content$Experimental Film/Video"
-msgstr ""
+msgstr "Eksperimentalni film/video"
 
 msgid "Content$Broadcasting/Press"
-msgstr ""
+msgstr "Radiodifuzija/�tampa"
 
 msgid "Content$New Media"
-msgstr ""
+msgstr "Novi mediji"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr ""
+msgstr "Umetni�ki/Kulturni magazin"
 
 msgid "Content$Fashion"
-msgstr "Sadr�aj$Moda"
+msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr "Sadr�aj$Socijalni/Politi�ki/Ekonomski"
+msgstr "Socijalni/Politi�ki/Ekonomski"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr "Sadr�aj$Magazin/Reporta�a/Dokumentarni"
+msgstr "Magazin/Reporta�a/Dokumentarni"
 
 msgid "Content$Economics/Social Advisory"
-msgstr ""
+msgstr "Ekonomija/Socijalno savetovanje"
 
 msgid "Content$Remarkable People"
-msgstr "Neverovatni Ljudi"
+msgstr "Znamenite li�nosti"
 
 msgid "Content$Education/Science/Factual"
-msgstr ""
+msgstr "Obrazovni/Nau�ni/Objektivni"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr ""
+msgstr "Priroda/�ivotinje/Okru�enje"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr ""
+msgstr "Tehnologija/Prirodne nauke"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr ""
+msgstr "Medicina/Fiziologija/Psihologija"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr ""
+msgstr "Strane zemlje/Ekspedicije"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr ""
+msgstr "Socijalne/Duhovne nauke"
 
 msgid "Content$Further Education"
-msgstr ""
+msgstr "Dalje obrazovanje"
 
 msgid "Content$Languages"
-msgstr ""
+msgstr "Jezici"
 
 msgid "Content$Leisure/Hobbies"
-msgstr ""
+msgstr "Razonoda/Hobi"
 
 msgid "Content$Tourism/Travel"
-msgstr ""
+msgstr "Turizam/Putovanja"
 
 msgid "Content$Handicraft"
-msgstr ""
+msgstr "Zanatstvo"
 
 msgid "Content$Motoring"
-msgstr ""
+msgstr "Vo�nja"
 
 msgid "Content$Fitness & Health"
-msgstr ""
+msgstr "Fitnes i zdravlje"
 
 msgid "Content$Cooking"
-msgstr ""
+msgstr "Kuvanje"
 
 msgid "Content$Advertisement/Shopping"
-msgstr ""
+msgstr "Reklama/Kupovina"
 
 msgid "Content$Gardening"
-msgstr ""
+msgstr "Ba�tovanstvo"
 
 msgid "Content$Original Language"
-msgstr ""
+msgstr "Originalni jezik"
 
 msgid "Content$Black & White"
-msgstr "Crno i Belo"
+msgstr "Crno-belo"
 
 msgid "Content$Unpublished"
 msgstr "Neobjavljeno"
 
 msgid "Content$Live Broadcast"
-msgstr "Prenos U�ivo"
+msgstr "Prenos u�ivo"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr "Roditeljska ocena$od %d"
+msgstr "od %d"
 
 msgid "No title"
-msgstr "Nema naslova"
+msgstr "Bez naslova"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -332,47 +333,47 @@ msgid "LanguageCode$eng"
 msgstr "scc"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Faza 1: detekcija koda daljinskog upravlja�a"
+msgstr "Faza 1: detekcija k�da daljinskog upravlja�a"
 
 msgid "Press any key on the RC unit"
-msgstr "Pritisnite jedan taster na daljinskom upravlja�u"
+msgstr "Pritisnite bilo koje dugme na daljinskom upravlja�u"
 
 msgid "RC code detected!"
-msgstr "Kod daljinskog upravlja�a je prepoznat!"
+msgstr "K�d daljinskog upravlja�a je prepoznat!"
 
 msgid "Do not press any key..."
-msgstr "Ne pritiskaj nijedan taster..."
+msgstr "Ne pritiskajte dugmad..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Faza 2: U�enje posebnih kodova"
+msgstr "Faza 2: U�enje posebnih k�dova"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Pritisnite taster za '%s'"
+msgstr "Pritisnite dugme za '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Pritisni 'Gore' za prihvatanje"
+msgstr "Pritisnite 'Gore' da potvrdite"
 
 msgid "Press 'Down' to continue"
-msgstr "Pritisni 'Dole' za nastavak"
+msgstr "Pritisnite 'Dole' da nastavite"
 
 msgid "(press 'Up' to go back)"
-msgstr "(pritisni 'Gore' za nazad)"
+msgstr "(pritisnite 'Gore' za nazad)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(pritisni 'Dole' za kraj)"
+msgstr "(pritisnite 'Dole' za kraj)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "pritisni 'Meni' da presko�ite ovu tipku"
+msgstr "(pritisnite 'Meni' da presko�ite ovo dugme)"
 
 msgid "Learning Remote Control Keys"
-msgstr "U�enje rasporeda tastera daljinskog upravlja�a"
+msgstr "U�enje rasporeda dugmadi daljinskog upravlja�a"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Faza 3: Snimanje kodova tastera"
+msgstr "Faza 3: Snimanje k�dova dugmadi"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Gore' za snimi, 'Dole' za prekid"
+msgstr "Pritisnite 'Gore' da snimite, 'Dole' da odustanete"
 
 msgid "Key$Up"
 msgstr "Gore"
@@ -411,7 +412,7 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr ""
+msgstr "Start/Pauza"
 
 msgid "Key$Play"
 msgstr "Start"
@@ -423,7 +424,7 @@ msgid "Key$Stop"
 msgstr "Stop"
 
 msgid "Key$Record"
-msgstr "Snimaj"
+msgstr "Snimi"
 
 msgid "Key$FastFwd"
 msgstr "Napred"
@@ -438,7 +439,7 @@ msgid "Key$Prev"
 msgstr "Prethodno"
 
 msgid "Key$Power"
-msgstr "Power"
+msgstr "Isklju�i"
 
 msgid "Key$Channel+"
 msgstr "Kanal+"
@@ -474,13 +475,13 @@ msgid "Key$Timers"
 msgstr "Tajmeri"
 
 msgid "Key$Recordings"
-msgstr "Snimke"
+msgstr "Snimci"
 
 msgid "Key$Setup"
 msgstr "Pode�avanje"
 
 msgid "Key$Commands"
-msgstr "Naredbe"
+msgstr "Komande"
 
 msgid "Key$User0"
 msgstr "Korisnik0"
@@ -513,13 +514,13 @@ msgid "Key$User9"
 msgstr "Korisnik9"
 
 msgid "Free To Air"
-msgstr "Slobodno"
+msgstr "FTA (nekodiran)"
 
 msgid "encrypted"
-msgstr "kriptirano"
+msgstr "kodiran"
 
 msgid "Edit channel"
-msgstr "Ispravke kanala"
+msgstr "Izmeni postavke kanala"
 
 msgid "Name"
 msgstr "Naziv"
@@ -531,31 +532,31 @@ msgid "Frequency"
 msgstr "Frekvencija"
 
 msgid "Vpid"
-msgstr "Vpid"
+msgstr "Vpid (video)"
 
 msgid "Ppid"
-msgstr "Ppid"
+msgstr "Ppid (PCR)"
 
 msgid "Apid1"
-msgstr "Apid1"
+msgstr "Apid1 (audio 1)"
 
 msgid "Apid2"
-msgstr "Apid2"
+msgstr "Apid2 (audio 2)"
 
 msgid "Dpid1"
-msgstr "Dpid1"
+msgstr "Dpid1 (AC3 1)"
 
 msgid "Dpid2"
-msgstr "Dpid2"
+msgstr "Dpid2 (AC3 2)"
 
 msgid "Spid1"
-msgstr "Spid1"
+msgstr "Spid1 (titl 1)"
 
 msgid "Spid2"
-msgstr "Spid2"
+msgstr "Spid2 (titl 2)"
 
 msgid "Tpid"
-msgstr "Tpid"
+msgstr "Tpid (teletekst)"
 
 msgid "CA"
 msgstr "Kodiranje (CA)"
@@ -564,13 +565,13 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Channel settings are not unique!"
-msgstr "Postavke programa nisu jedinstvene!"
+msgstr "Postavke kanala nisu jedinstvene!"
 
 msgid "Channels"
 msgstr "Kanali"
 
 msgid "Button$Edit"
-msgstr "Promeni"
+msgstr "Izmeni"
 
 msgid "Button$New"
 msgstr "Novi"
@@ -582,38 +583,38 @@ msgid "Button$Mark"
 msgstr "Ozna�i"
 
 msgid "Channel is being used by a timer!"
-msgstr "Kanal je trenutno zauzet tajmerom!"
+msgstr "Kanal je zauzet tajmerom za snimanje!"
 
 msgid "Delete channel?"
 msgstr "Obrisati kanal?"
 
 msgid "Edit folder"
-msgstr ""
+msgstr "Izmeni direktorijum"
 
 msgid "New folder"
-msgstr "Novi direktorij"
+msgstr "Novi direktorijum"
 
 msgid "Sub folder"
-msgstr "Pod Direktorij"
+msgstr "Poddirektorijum"
 
 msgid "Folder name already exists!"
-msgstr "Ime direktorija ve� postoji"
+msgstr "Naziv direktorijuma ve� postoji!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Naziv direktorija ne smije sadr�avati '%c'! "
+msgstr "Naziv direktorijuma ne sme da sadr�i '%c'!"
 
 msgid "Button$Select"
-msgstr ""
+msgstr "Izaberi"
 
 msgid "Delete folder and all sub folders?"
-msgstr "Obri�i direktorij i sve poddirektorije"
+msgstr "Obri�i direktorijum i sve poddirektorijume?"
 
 msgid "Delete folder?"
-msgstr ""
+msgstr "Izbri�i direktorijum?"
 
 msgid "Edit timer"
-msgstr "Ure�ivanje tajmera"
+msgstr "Izmeni tajmer"
 
 msgid "Active"
 msgstr "Aktivan"
@@ -631,7 +632,7 @@ msgid "Stop"
 msgstr "Kraj"
 
 msgid "VPS"
-msgstr "VPS"
+msgstr "VPS (PDC)"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -643,34 +644,34 @@ msgid "File"
 msgstr "Datoteka"
 
 msgid "Button$Folder"
-msgstr ""
+msgstr "Direktorijum"
 
 msgid "Button$Single"
-msgstr ""
+msgstr "Jedinstven"
 
 msgid "Button$Repeating"
-msgstr ""
+msgstr "Ponavljaju�i"
 
 msgid "First day"
 msgstr "Prvi dan"
 
 msgid "Select folder"
-msgstr "Odaberi direktorij"
+msgstr "Izaberi direktorijum"
 
 msgid "Timers"
 msgstr "Tajmeri"
 
 msgid "Button$On/Off"
-msgstr "Taster$uklju�i/isklju�i"
+msgstr "Uklju�i/Isklju�i"
 
 msgid "Button$Info"
-msgstr "Taster$Info"
+msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Obri�i tajmer?"
+msgstr "Izbrisati tajmer?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Tajmer jo� snima - zaista obri�i?"
+msgstr "Tajmer jo� snima - stvarno izbrisati?"
 
 msgid "Event"
 msgstr "Emisija"
@@ -685,10 +686,10 @@ msgid "Button$Switch"
 msgstr "Prebaci"
 
 msgid "What's on now?"
-msgstr "Trenutno na programu ?"
+msgstr "�ta je trenutno na programu?"
 
 msgid "What's on next?"
-msgstr "�ta je slede�e?"
+msgstr "�ta je slede�e na programu?"
 
 msgid "Button$Next"
 msgstr "Sledi"
@@ -697,14 +698,14 @@ msgid "Button$Now"
 msgstr "Trenutno"
 
 msgid "Button$Schedule"
-msgstr "TV Raspored"
+msgstr "Raspored"
 
 msgid "Can't switch channel!"
 msgstr "Nemogu�e promeniti kanal!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "TV Raspored - %s"
+msgstr "Raspored - %s"
 
 #, c-format
 msgid "This event - %s"
@@ -718,7 +719,7 @@ msgstr "Svi doga
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Molim unesi %d brojeve!"
+msgstr "Molimo unesite %d brojeve!"
 
 msgid "CAM not responding!"
 msgstr "CAM ne reaguje!"
@@ -730,34 +731,34 @@ msgid "Button$Play"
 msgstr "Start"
 
 msgid "Button$Rewind"
-msgstr "Po�etak"
+msgstr "Na po�etak"
 
 msgid "Recordings"
-msgstr ""
+msgstr "Snimci"
 
 msgid "Button$Open"
-msgstr ""
+msgstr "Otvori"
 
 msgid "Commands"
-msgstr ""
+msgstr "Komande"
 
 msgid "Delete recording?"
-msgstr "Obri�i snimku?"
+msgstr "Izbri�i snimak?"
 
 msgid "Recording is being edited - really delete?"
-msgstr ""
+msgstr "Snimak je izmenjen - stvarno izbrisati?"
 
 msgid "Error while deleting recording!"
-msgstr "Gre�ka prilikom brisanja snimke!"
+msgstr "Gre�ka prilikom brisanja snimka!"
 
 msgid "Recording commands"
-msgstr "Naredbe snimanja"
+msgstr "Komande snimanja"
 
 msgid "never"
-msgstr "Nikada"
+msgstr "nikada"
 
 msgid "skin dependent"
-msgstr "Zavisi od skin-a"
+msgstr "zavisi od stila (skin-a)"
 
 msgid "always"
 msgstr "uvek"
@@ -769,52 +770,52 @@ msgid "Setup.OSD$Language"
 msgstr "Jezik"
 
 msgid "Setup.OSD$Skin"
-msgstr "Izgled"
+msgstr "Stil (skin)"
 
 msgid "Setup.OSD$Theme"
 msgstr "Tema"
 
 msgid "Setup.OSD$Left (%)"
-msgstr ""
+msgstr "Levo (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr ""
+msgstr "Gore (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr ""
+msgstr "�irina (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr ""
+msgstr "Visina (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Du�ina prikaza poruka (s)"
+msgstr "Trajanje prikaza poruke (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "Koristi mala slova"
+msgstr "Upotrebi mala slova"
 
 msgid "Setup.OSD$Anti-alias"
 msgstr "Anti-alias"
 
 msgid "Setup.OSD$Default font"
-msgstr "Zadani font"
+msgstr "Podrazumevani font"
 
 msgid "Setup.OSD$Small font"
 msgstr "Mali font"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Nepromenjiv font"
+msgstr "Fiksni font"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr ""
+msgstr "Veli�ina podrazumevanog fonta (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr ""
+msgstr "Veli�ina malog fonta (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr ""
+msgstr "Veli�ina fiksnog fonta (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Pozicija informacija o programu"
+msgstr "Pozicija informacija o kanalu"
 
 msgid "bottom"
 msgstr "dno"
@@ -823,61 +824,61 @@ msgid "top"
 msgstr "vrh"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Vreme prikaza informacije o kanalu (s)"
+msgstr "Trajanje prikaza informacija o kanalu (s)"
 
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Informacije kod promene kanala"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Du�ina prikaza informacije o kanalu"
+msgstr "Zatvori zatra�ene informacije o kanalu"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "Listaj po stranicama"
+msgstr "Skrolovanje stranica (kliza�)"
 
 msgid "Setup.OSD$Scroll wraps"
 msgstr "Sko�i s kraja na po�etak"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "Taster Meni zatvara"
+msgstr "Dugme 'Meni' zatvara"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Direktorij za snimke"
+msgstr "Direktorijum za snimke"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr ""
+msgstr "Direktorijumi u meniju tajmera"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr ""
+msgstr "Uvek sortiraj direktorijume prve"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Pi�ite pomo�u numeri�kih dugmi�a (kao SMS)"
 
 msgid "Setup.OSD$Color key 0"
-msgstr ""
+msgstr "Obojeno dugme 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr ""
+msgstr "Obojeno dugme 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr ""
+msgstr "Obojeno dugme 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr ""
+msgstr "Obojeno dugme 3"
 
 msgid "EPG"
-msgstr "EPG (TV Raspored�)"
+msgstr "EPG (elektronski programski vodi�)"
 
 msgid "Button$Scan"
 msgstr "Pretra�i"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "Vreme do EPG pregleda (h)"
+msgstr "Interval do a�uriranja EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Nivo ispravaka EPG gre�aka"
+msgstr "Nivo EPG korekcije gre�aka"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Vreme EPG zadr�avanja (min)"
+msgstr "Vreme zadr�avanja starih EPG podataka (min)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Podesi sistemsko vreme"
@@ -887,32 +888,32 @@ msgstr "Koristi vreme sa transpondera"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "Odaberi jezike"
+msgstr "�eljeni jezici (EPG)"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "Odaberi jezik"
+msgstr "�eljeni jezik (EPG)"
 
 msgid "pan&scan"
-msgstr "pro�iri i ispitaj"
+msgstr "pan&scan"
 
 msgid "letterbox"
-msgstr "pravougaonik"
+msgstr "letterbox"
 
 msgid "center cut out"
 msgstr "izre�i sredinu"
 
 msgid "no"
-msgstr ""
+msgstr "ne"
 
 msgid "names only"
-msgstr "samo imena"
+msgstr "samo nazivi"
 
 msgid "PIDs only"
-msgstr "Samo PID-ovi"
+msgstr "samo PID-ovi"
 
 msgid "names and PIDs"
-msgstr "imena i (PIDs)"
+msgstr "nazivi i PID-ovi"
 
 msgid "add new channels"
 msgstr "dodaj nove kanale"
@@ -933,7 +934,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Primarni DVB ure�aj"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr ""
+msgstr "Uskla�enost sa standardom"
 
 msgid "Setup.DVB$Video format"
 msgstr "Video format"
@@ -954,7 +955,7 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio jezik"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Poka�i titlove"
+msgstr "Prika�i titlove"
 
 msgid "Setup.DVB$Subtitle languages"
 msgstr "Jezici titla"
@@ -963,7 +964,7 @@ msgid "Setup.DVB$Subtitle language"
 msgstr "Jezik titla"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Pomak titla"
+msgstr "Pomeranje titla"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
 msgstr "Providnost titla"
@@ -978,20 +979,20 @@ msgid "Setup.LNB$Use DiSEqC"
 msgstr "Koristi DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "SLOF (MHz)"
+msgstr "Frekvencija prebacivanja (SLOF) (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Donja LNB frekv. (MHz)"
+msgstr "Donja LNB frekvencija (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "Gornja LNB frekv. (MHz)"
+msgstr "Gornja LNB frekvencija (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr ""
+msgstr "Ure�aj %d je priklju�en na satelitski kabl"
 
 msgid "Setup.LNB$own"
-msgstr ""
+msgstr "sopstven"
 
 msgid "CAM reset"
 msgstr "Ponovno pokreni CAM"
@@ -1018,25 +1019,25 @@ msgid "Can't open CAM menu!"
 msgstr "Otvaranje CAM menija neuspe�no!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM u upotrebi - ponovno pokrenuti?"
+msgstr "CAM u upotrebi - stvarno ponovno pokrenuti?"
 
 msgid "Can't reset CAM!"
 msgstr "Ponovno pokretanje CAM-a neuspe�no!"
 
 msgid "do not pause live video"
-msgstr ""
+msgstr "ne zaustavljaj signal u�ivo"
 
 msgid "confirm pause live video"
-msgstr ""
+msgstr "potvrdi zaustavljanje signala u�ivo"
 
 msgid "pause live video"
-msgstr ""
+msgstr "zaustavi signal u�ivo"
 
 msgid "confirm"
 msgstr "potvrdi"
 
 msgid "yes"
-msgstr ""
+msgstr "da"
 
 msgid "Recording"
 msgstr "Snimanje"
@@ -1045,16 +1046,16 @@ msgid "Setup.Recording$Margin at start (min)"
 msgstr "Rezerva na po�etku snimanja (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Rezerva na kraju (min)"
+msgstr "Rezerva na kraju snimanja (min)"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Zadani prioritet"
+msgstr "Podrazumevani prioritet"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Zadano trajanje (d)"
+msgstr "Podrazumevano trajanje (d)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr ""
+msgstr "Funkcija dugme za pauzu"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Prioritet pauze"
@@ -1081,49 +1082,49 @@ msgid "Setup.Recording$Instant rec. time (min)"
 msgstr "Trajanje trenutnog snimanja (min)"
 
 msgid "Setup.Recording$present event"
-msgstr ""
+msgstr "aktuelni doga�aj"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Maks. veli�ina datoteke (MB)"
+msgstr "Maksimalna veli�ina datoteke (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Podeli ure�ene datoteke"
+msgstr "Podeli izmenjene datoteke"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "Bri�i vremenski pomak snimke"
+msgstr "Izbri�i odlo�eni (timeshift) snimak"
 
 msgid "Replay"
 msgstr "Reprodukcija"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Vi�estruke brzine reprodukcije"
+msgstr "Vi�estruka brzina reprodukcije"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Prika�i re�im reprodukcije"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr ""
+msgstr "Prika�i preostalo vreme"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr ""
+msgstr "Trajanje prikazivanja progresa (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr ""
+msgstr "Pauziraj reprodukciju prilikom obele�avanja"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID nastavka"
+msgstr "ID reprodukcije"
 
 msgid "Miscellaneous"
 msgstr "Razno"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Min. vreme pauze (min)"
+msgstr "Min. vreme izme�u tajmera (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Min. vreme neaktivnosti (min)"
+msgstr "Min. vreme neaktivnosti pre ga�enja VDR-a (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "SVDRP vreme (s)"
+msgstr "Ga�enje SVDRP-a usled neaktivnosti (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap isti�e (s)"
@@ -1132,10 +1133,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Upis kanala isti�e (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr ""
+msgstr "Pauza ponavljanja komande daljinskog (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr ""
+msgstr "Ka�njenje ponavljanja komande daljinskog (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Po�etni kanal"
@@ -1147,10 +1148,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Po�etna ja�ina tona"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr ""
+msgstr "Prelazak sa kraja na po�etak liste kanala"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr ""
+msgstr "Prika�i nazive kanala sa izvorom"
 
 msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Izlaz u slu�aju nu�de"
@@ -1159,7 +1160,7 @@ msgid "Plugins"
 msgstr "Dodaci"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ovaj dodatak nema parametara!"
+msgstr "Ovaj dodatak nema parametare za pode�avanje!"
 
 msgid "Setup"
 msgstr "Podesi"
@@ -1168,14 +1169,14 @@ msgid "Restart"
 msgstr "Restart sistema"
 
 msgid "Really restart?"
-msgstr "Ponovo pokretanje ???"
+msgstr "Stvarno restartovati sistem?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
 msgstr " Zaustavi snimanje "
 
 msgid "Schedule"
-msgstr "Raspored Programa"
+msgstr "Raspored"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
@@ -1192,65 +1193,65 @@ msgstr "Nastavi"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr "Zaustavi ispravke"
+msgstr "Odustani od izmena"
 
 msgid "Stop recording?"
 msgstr "Zaustavi snimanje?"
 
 msgid "Cancel editing?"
-msgstr "Otka�i ispravke?"
+msgstr "Odustani od izmena?"
 
 msgid "No audio available!"
-msgstr "Ton nedostupan"
+msgstr "Ton nedostupan!"
 
 msgid "No subtitles"
 msgstr "Bez titlova"
 
 msgid "No subtitles available!"
-msgstr "Titlovi nisu dostupni!"
+msgstr "Nema titlova!"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Nedovoljno prostora na disku za snimanje!"
 
 msgid "No free DVB device to record!"
-msgstr ""
+msgstr "Nema slobodnog DVB ure�aja za snimanje!"
 
 msgid "Pausing live video..."
-msgstr "Zaustavljanje izravnog prenosa..."
+msgstr "Zaustavljanje signala u�ivo..."
 
 msgid "Delete timeshift recording?"
-msgstr ""
+msgstr "Izbri�i odlo�eni (timeshift) snimak?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Sko�i: "
 
 msgid "No editing marks defined!"
-msgstr "Nijedna ta�ka rezanja nije odre�ena!"
+msgstr "Nijedna ta�ka ozna�avanja nije odre�ena!"
 
 msgid "No editing sequences defined!"
-msgstr ""
+msgstr "Nijedan ozna�eni deo nije odre�en!"
 
 msgid "Can't start editing process!"
-msgstr "Ne mogu zapo�eti ure�ivanje!"
+msgstr "Nije mogu�e zapo�eti ure�ivanje!"
 
 msgid "Editing process started"
 msgstr "Ure�ivanje zapo�elo"
 
 msgid "Editing process already active!"
-msgstr "Ure�ivanje je ve� u toku!!"
+msgstr "Ure�ivanje je ve� u toku!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr "abcćdđefghijklmnopqrstuvwxyzžŸ0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef�3\tghi4\tjkl5\tmno6\tpqrs�7\ttuv8\twxyz�9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr "Prepi�i"
+msgstr "Zameni"
 
 msgid "Button$Insert"
 msgstr "Ubaci"
@@ -1259,7 +1260,7 @@ msgid "Plugin"
 msgstr "Dodatak"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Gore/Dole na novu poziciju - OK za prihvati"
+msgstr "Gore/Dole za novu poziciju - OK za potvrdu"
 
 msgid "Channel locked (recording)!"
 msgstr "Kanal zaklju�an (snimanje)!"
@@ -1274,36 +1275,36 @@ msgid "Index file regeneration complete"
 msgstr "Obnavljanje index datoteke zavr�eno"
 
 msgid "Index file regeneration failed!"
-msgstr ""
+msgstr "Obnavljanje index datoteke neuspe�no!"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ga�enje nemogu�e - nedostaje opcija '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Ispravke u toku - u svakom slu�aju isklju�i ?"
+msgstr "Ure�ivanje u toku - svejedno isklju�i?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Snimanje u toku - u svakom slu�aju isklju�i ?"
+msgstr "Snimanje u toku - svejedno isklju�i?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Snimanje za %ld minuta - u svakom slu�aju isklju�i?"
+msgstr "Snimanje za %ld minuta - svejedno isklju�i?"
 
 msgid "shut down anyway?"
-msgstr "u svakom slu�aju isklju�i?"
+msgstr "svejedno isklju�i?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Dodatak %s budi se u %ld min, nastavi?"
+msgstr "Dodatak %s se budi za %ld min, nastavi?"
 
 msgid "Editing - restart anyway?"
-msgstr "Ure�ivanje u toku - ponovno pokreni!!!?"
+msgstr "Ure�ivanje u toku - svejedno ponovno pokreni?"
 
 msgid "Recording - restart anyway?"
-msgstr "Snimanje je u toku - ponovno pokreni!!!?"
+msgstr "Snimanje u toku - svejedno ponovno pokreni!!!?"
 
 msgid "restart anyway?"
-msgstr "ponovo pokreni?"
+msgstr "svejedno ponovo pokreni?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1313,25 +1314,25 @@ msgid "Classic VDR"
 msgstr "Klasi�ni VDR"
 
 msgid "DISK"
-msgstr ""
+msgstr "DISK"
 
 msgid "LOAD"
-msgstr ""
+msgstr "OPTERE�ENJE"
 
 msgid "TIMERS"
-msgstr ""
+msgstr "TAJMERI"
 
 msgid "DEVICES"
-msgstr ""
+msgstr "URE�AJI"
 
 msgid "LIVE"
-msgstr ""
+msgstr "U�IVO"
 
 msgid "PLAY"
-msgstr ""
+msgstr "REPRODUKCIJA"
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG Panele"
+msgstr "ST:TNG paneli"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -1363,35 +1364,35 @@ msgid "Sunday"
 msgstr "Nedelja"
 
 msgid "Upcoming recording!"
-msgstr "Predstoje�e snimanje!"
+msgstr "Uskoro po�inje snimanje!"
 
 msgid "Pause live video?"
-msgstr ""
+msgstr "Zaustavi signal u�ivo?"
 
 msgid "Recording started"
 msgstr "Snimanje zapo�elo"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR �e se isklju�iti kasnije - pritisni Power-taster za prisilno isklju�enje"
+msgstr "VDR �e se isklju�iti kasnije - pritisnite dugme 'Power' za prisilno isklju�enje"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Pritisni taster za prekid isklju�enja"
+msgstr "Pritisnite bilo koje dugme da otka�ete isklju�enje"
 
 msgid "Switching primary DVB..."
-msgstr "Prebacivanje primarnog DVB ure�aja..."
+msgstr "Promena primarnog DVB ure�aja..."
 
 msgid "Editing process failed!"
-msgstr "Ure�ivanje neusp�jeno!"
+msgstr "Ure�ivanje neuspe�eno!"
 
 msgid "Editing process finished"
 msgstr "Ure�ivanje zavr�eno"
 
 msgid "Press any key to cancel restart"
-msgstr "Pritisni jedan taster za poni�tenje restart-a"
+msgstr "Pritisnite bilo koje dugme da otka�ete ponovno pokretanje"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR se isklju�uje za %s minuta"
+msgstr "VDR �e se isklju�iti za %s minuta"
 
 msgid "Disk"
 msgstr "Disk"
diff --git a/vdr.5 b/vdr.5
index 86b798c37..c6ee6b42f 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.33 2013/03/11 13:17:12 kls Exp $
+.\" $Id: vdr.5 2.34 2013/03/18 12:37:17 kls Exp $
 .\"
 .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -45,7 +45,11 @@ Such a delimiter will not appear in the Channels menu.
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
+.TS
+tab (@);
+l.
 \fBRTL Television,RTL;RTL World:12187:hC34M2O0S0:S19.2E:27500:163=2:104=deu;106=deu:105:0:12003:1:1089:0\fR
+.TE
 
 The line number of a channel definition (not counting group separators,
 and based on a possible previous '@...' parameter)

From 23a677c66eaf5a7525665e11a20dd965577b755b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 31 Mar 2013 11:48:00 +0200
Subject: [PATCH 229/307] Version 2.0.0 VDR version 2.0.0 is now available at

      ftp://ftp.tvdr.de/vdr/vdr-2.0.0.tar.bz2

A 'diff' against the previous developer version is available at

      ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.42-2.0.0.diff

MD5 checksums:

fd7f481b996e03fae3c00e80b6b0d301  vdr-2.0.0.tar.bz2
db1fc075c567bf75c566de6ce3cb4a0b  vdr-1.7.42-2.0.0.diff

A summary of all the major changes since the last stable version 1.6.0 can be found at

      http://www.tvdr.de/changelog.htm

When updating from an earlier version of VDR please make sure you read the INSTALL
and MANUAL files that come with the VDR source before doing so!
Please make sure you have backup copies of all your configuration files,
and verify carefully that your timers will be set to the correct channels
after switching to this new version.

Thanks to the many people who have contributed in the making, testing and
debugging of this new version of VDR.

Please also visit the newly refurbished VDR homepage at

      http://www.tvdr.de

and VDR's new facebook page at

      https://www.facebook.com/VideoDiskRecorder

From the HISTORY file:
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- Fixed the description of the 'M' parameter of channel definitions in vdr.5.
- Updated the French OSD texts (thanks to Dominique Plu).
- Fixed handling overlapping pending timers (reported by Matthias Senzel).
- Bumped all version numbers to 2.0.0.
- Official release.
---
 CONTRIBUTORS                          |  1 +
 HISTORY                               | 10 ++++++++++
 PLUGINS/src/dvbhddevice/HISTORY       |  4 ++++
 PLUGINS/src/dvbhddevice/dvbhddevice.c |  2 +-
 PLUGINS/src/dvbsddevice/HISTORY       |  4 ++++
 PLUGINS/src/dvbsddevice/dvbsddevice.c |  4 ++--
 PLUGINS/src/epgtableid0/HISTORY       |  4 ++++
 PLUGINS/src/epgtableid0/epgtableid0.c |  4 ++--
 PLUGINS/src/hello/HISTORY             |  4 ++++
 PLUGINS/src/hello/hello.c             |  4 ++--
 PLUGINS/src/osddemo/HISTORY           |  4 ++++
 PLUGINS/src/osddemo/osddemo.c         |  4 ++--
 PLUGINS/src/pictures/HISTORY          |  4 ++++
 PLUGINS/src/pictures/pictures.c       |  4 ++--
 PLUGINS/src/rcu/HISTORY               |  4 ++++
 PLUGINS/src/rcu/rcu.c                 |  4 ++--
 PLUGINS/src/servicedemo/HISTORY       |  4 ++++
 PLUGINS/src/servicedemo/svccli.c      |  4 ++--
 PLUGINS/src/servicedemo/svcsvr.c      |  4 ++--
 PLUGINS/src/skincurses/HISTORY        |  4 ++++
 PLUGINS/src/skincurses/skincurses.c   |  4 ++--
 PLUGINS/src/status/HISTORY            |  4 ++++
 PLUGINS/src/status/status.c           |  4 ++--
 PLUGINS/src/svdrpdemo/HISTORY         |  4 ++++
 PLUGINS/src/svdrpdemo/svdrpdemo.c     |  4 ++--
 config.h                              | 10 +++++-----
 po/fr_FR.po                           |  4 ++--
 po/lt_LT.po                           |  2 +-
 timers.c                              |  6 ++++--
 vdr.5                                 |  7 ++++---
 30 files changed, 94 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4da1a5c48..780ad5ffc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3116,6 +3116,7 @@ Mikael H
 Matthias Senzel <matthias.senzel@t-online.de>
  for reporting a problem with switching back to live viewing after replay in a setup
  with device bonding
+ for reporting a problem with handling overlapping pending timers
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index 88f06260b..393c73953 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7772,3 +7772,13 @@ Video Disk Recorder Revision History
 - Fixed formatting the channel definition example in the vdr(5) man page (thanks to
   Dominic Evans).
 - Updated the default channels.conf file.
+
+
+2013-03-31: Version 2.0.0
+
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- Fixed the description of the 'M' parameter of channel definitions in vdr.5.
+- Updated the French OSD texts (thanks to Dominique Plu).
+- Fixed handling overlapping pending timers (reported by Matthias Senzel).
+- Bumped all version numbers to 2.0.0.
+- Official release.
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 85aaa6c73..2184403c4 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -67,3 +67,7 @@ VDR Plugin 'dvbhddevice' Revision History
 - Fixed flashing OSD in "high level OSD" mode in case a menu is open while subtitles
   are being displayed.
 - Fixed immediately disappearing subtitle track menu when selecting "No subtitles".
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 1a7542047..535f901f7 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.9";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index e1f985486..4dd75d2cc 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -41,3 +41,7 @@ VDR Plugin 'dvbsddevice' Revision History
 2013-01-25: Version 0.0.9
 
 - Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 8ebfe2b65..cdc078362 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.9 2013/01/25 10:48:50 kls Exp $
+ * $Id: dvbsddevice.c 1.10 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.9";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index 5712e2418..da97932a7 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -12,3 +12,7 @@ VDR Plugin 'epgtableid0' Revision History
 2013-01-12: Version 0.0.3
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index 951490936..1aef2a7af 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 1.3 2013/01/12 14:12:13 kls Exp $
+ * $Id: epgtableid0.c 1.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index cb797184d..250f36a54 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -82,3 +82,7 @@ VDR Plugin 'hello' Revision History
 2013-01-12: Version 0.2.7
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index f7777bec4..21f938369 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.5 2013/01/12 14:12:18 kls Exp $
+ * $Id: hello.c 2.6 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.7";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 56ccbb8a2..b1411de1a 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -55,3 +55,7 @@ VDR Plugin 'osddemo' Revision History
 2013-02-19: Version 0.3.1
 
 - The demos can now also be ended with the "Back" key.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 7a36f42c4..f88f7766b 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.11 2013/02/19 12:43:19 kls Exp $
+ * $Id: osddemo.c 2.12 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.3.1";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 847f8b9aa..a9995d738 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -83,3 +83,7 @@ VDR Plugin 'pictures' Revision History
 2013-01-12: Version 0.1.5
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index c73e59812..7a46a5f31 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.8 2013/01/12 14:12:42 kls Exp $
+ * $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.5";
+static const char *VERSION       = "2.0.0";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index 6d2d63e06..b9043bbf8 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -16,3 +16,7 @@ VDR Plugin 'rcu' Revision History
 2013-01-12: Version 0.0.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index a1b4538dd..17b538a28 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 1.4 2013/01/12 14:12:54 kls Exp $
+ * $Id: rcu.c 1.5 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 11c9c45c9..b1c748042 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -17,3 +17,7 @@ VDR Plugin 'servicedemo' Revision History
 2013-01-12: Version 0.1.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index d8b8e1629..eb671acc1 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 2.3 2013/02/17 14:10:26 kls Exp $
+ * $Id: svccli.c 2.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.4";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 55d1bc010..252a4a2ca 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 2.3 2013/02/17 14:10:38 kls Exp $
+ * $Id: svcsvr.c 2.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.4";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 53e70e81e..63595076f 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -114,3 +114,7 @@ VDR Plugin 'skincurses' Revision History
 
 - The "Recording info" page now displays the name of the channel (if available)
   from which this recording was taken.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index da9d17ae3..8a4da9657 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.12 2013/03/03 15:33:59 kls Exp $
+ * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.15";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 4056762ce..bbf2c69ba 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -56,3 +56,7 @@ VDR Plugin 'status' Revision History
 2013-01-12: Version 0.3.3
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 4f7b05184..e9e3ae7df 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 2.3 2013/01/12 14:13:17 kls Exp $
+ * $Id: status.c 2.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.3.3";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index bf69eecf4..c6f039592 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -21,3 +21,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2013-01-12: Version 0.0.5
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 1a0032ef3..a1a276635 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 2.2 2013/01/12 14:13:28 kls Exp $
+ * $Id: svdrpdemo.c 2.3 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.h b/config.h
index b55498ffa..6a8e5d36c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.75 2013/03/16 15:12:14 kls Exp $
+ * $Id: config.h 2.76 2013/03/31 09:30:18 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.42"
-#define VDRVERSNUM   10742  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.0.0"
+#define VDRVERSNUM   20000  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.41"
-#define APIVERSNUM   10741  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.0.0"
+#define APIVERSNUM   20000  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 7d0d90cab..6228d7f4d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -839,7 +839,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Infos chaîne lors du changement"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Compte à rebours infos chaîne"
+msgstr "Affichage infos chaîne non permanent"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Défilement par pages"
@@ -1112,7 +1112,7 @@ msgid "Setup.Replay$Show replay mode"
 msgstr "Affichage mode de lecture"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr "Montrer le temps restant"
+msgstr "Afficher le temps restant"
 
 msgid "Setup.Replay$Progress display time (s)"
 msgstr "Afficher la barre de progression (s)"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 19262472b..dba42240c 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -847,7 +847,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogai esantys laikmačių meniu"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr ""
+msgstr "Visada pirmiau rūšiuoti katalogus"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
diff --git a/timers.c b/timers.c
index 279f55325..9a880e104 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.17 2013/03/16 10:37:10 kls Exp $
+ * $Id: timers.c 2.18 2013/03/29 15:37:16 kls Exp $
  */
 
 #include "timers.h"
@@ -720,8 +720,10 @@ cTimer *cTimers::GetMatch(time_t t)
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
       if (!ti->Recording() && ti->Matches(t)) {
          if (ti->Pending()) {
-            if (ti->Index() > LastPending)
+            if (ti->Index() > LastPending) {
                LastPending = ti->Index();
+               return ti;
+               }
             else
                continue;
             }
diff --git a/vdr.5 b/vdr.5
index c6ee6b42f..b54b2945d 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.34 2013/03/18 12:37:17 kls Exp $
+.\" $Id: vdr.5 2.36 2013/03/29 10:25:56 kls Exp $
 .\"
 .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -98,7 +98,7 @@ l l.
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
-\fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998)
+\fBM\fR@Modulation (2, 5, 6, 7, 10, 11, 12, 16, 32, 64, 128, 256, 999)
 \fBO\fR@rollOff (0, 20, 25, 35)
 \fBP\fR@stream id (0-255)
 \fBR\fR@Right circular polarization
@@ -126,13 +126,14 @@ If no hierarchy is used, set to 0.
 tab (@);
 l l.
 \fB2\fR@QPSK (DVB-S, DVB-S2, DVB-T, DVB-T2, ISDB-T)
-\fB5\fR@8PSK (DVB-S2)
+\fB5\fR@8PSK (DVB-S, DVB-S2)
 \fB6\fR@16APSK (DVB-S2)
 \fB7\fR@32APSK (DVB-S2)
 \fB10\fR@VSB8 (ATSC aerial)
 \fB11\fR@VSB16 (ATSC aerial)
 \fB12\fR@DQPSK (ISDB-T)
 \fB16\fR@QAM16 (DVB-T, DVB-T2, ISDB-T)
+\fB32\fR@QAM32
 \fB64\fR@QAM64 (DVB-C, DVB-T, DVB-T2, ISDB-T)
 \fB128\fR@QAM128 (DVB-C)
 \fB256\fR@QAM256 (DVB-C, DVB-T2)

From 8bc7a314cca158ecdd89f07602ba33c493433813 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 13 Apr 2013 13:40:00 +0200
Subject: [PATCH 230/307] Version 2.0.1 VDR version 2.0.1 is now available at

      ftp://ftp.tvdr.de/vdr/vdr-2.0.1.tar.bz2

A 'diff' against the previous developer version is available at

      ftp://ftp.tvdr.de/vdr/Developer/vdr-2.0.0-2.0.1.diff

MD5 checksums:

e1b7a76c57c96300829dccd39eb20e7d  vdr-2.0.1.tar.bz2
fca54c4da4e9d9dd05f917b04a2eecf4  vdr-2.0.0-2.0.1.diff

This version fixes a few minor bugs that came up after the release of
version 2.0.0. It also allows compilation of VDR with older versions of
the DVB API.

From the HISTORY file:
- Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
  one character (reported by Stefan Braun).
- Added definitions for older DVB API versions, back until 5.0 (based on a patch from
  Udo Richter).
- Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is
  used (thanks to Lars Hanisch).
- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
  improve overall performance when an editing process is running (thanks to Jochen
  Dolze).
---
 CONTRIBUTORS                            | 10 ++++
 HISTORY                                 | 14 ++++-
 PLUGINS/src/dvbhddevice/HISTORY         |  4 ++
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |  2 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c | 27 ++++++++--
 config.h                                |  6 +--
 device.c                                |  4 +-
 dvbdevice.c                             | 68 ++++++++++++++++---------
 dvbdevice.h                             | 55 ++++++++++++++++++--
 font.c                                  |  7 ++-
 newplugin                               |  2 +-
 recording.c                             |  4 +-
 thread.c                                |  4 +-
 13 files changed, 161 insertions(+), 46 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 780ad5ffc..83940ded2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2832,6 +2832,8 @@ Lars Hanisch <dvb@flensrocker.de>
  for fixing a typo in skins.h
  for fixing some #include statements in plugins to use <vdr/...> instead of "vdr/..."
  for reporting an invalid line in channels.conf.terr
+ for fixing handling '/' and '~' in recording file names in case DirectoryEncoding is
+ used
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -3135,3 +3137,11 @@ Zoran Turalija <zoran.turalija@gmail.com>
  for translating OSD texts to the Serbian language
  for adding maximum SNR and signal strength value for TechniSat SkyStar HD2
  for pointing out that the language file sr_SR.po should be renamed to sr_RS.po
+
+Stefan Braun <louis.braun@gmx.de>
+ for reporting an endless loop in cTextWrapper::Set() in case the given Width is smaller
+ than one character
+
+Jochen Dolze <vdr@dolze.de>
+ for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order
+ to improve overall performance when an editing process is running
diff --git a/HISTORY b/HISTORY
index 393c73953..d8a6da38b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7773,7 +7773,6 @@ Video Disk Recorder Revision History
   Dominic Evans).
 - Updated the default channels.conf file.
 
-
 2013-03-31: Version 2.0.0
 
 - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
@@ -7782,3 +7781,16 @@ Video Disk Recorder Revision History
 - Fixed handling overlapping pending timers (reported by Matthias Senzel).
 - Bumped all version numbers to 2.0.0.
 - Official release.
+
+2013-04-13: Version 2.0.1
+
+- Fixed initializing cDevice::keepTracks.
+- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
+  one character (reported by Stefan Braun).
+- Added definitions for older DVB API versions, back until 5.0 (based on a patch from
+  Udo Richter).
+- Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is
+  used (thanks to Lars Hanisch).
+- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
+  improve overall performance when an editing process is running (thanks to Jochen
+  Dolze).
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 2184403c4..d21abac5c 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -71,3 +71,7 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2013-04-11: Version 2.0.1
+
+- Fixed aspect ratio and position of scaled video.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 535f901f7..d82b8489d 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.0.1";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index dd7ace5b5..857861e6a 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -574,14 +574,35 @@ void cDvbHdFfDevice::ScaleVideo(const cRect &Rect)
     }
     else
     {
+        //printf("ScaleVideo: Rect = %d %d %d %d\n", Rect.X(), Rect.Y(), Rect.Width(), Rect.Height());
+
         int osdWidth;
         int osdHeight;
         double osdPixelAspect;
 
         GetOsdSize(osdWidth, osdHeight, osdPixelAspect);
-        mHdffCmdIf->CmdAvSetVideoWindow(0, true,
-            Rect.X() * 1000 / osdWidth, Rect.Y() * 1000 / osdHeight,
-            Rect.Width() * 1000 / osdWidth, Rect.Height() * 1000 / osdHeight);
+        //printf("ScaleVideo: OsdSize = %d %d %g\n", osdWidth, osdHeight, osdPixelAspect);
+
+        // Convert the video window coordinates in 1/10 percent of the display
+        // resolution.
+        int x = (Rect.X() * 1000 + osdWidth / 2) / osdWidth;
+        int y = (Rect.Y() * 1000 + osdHeight / 2) / osdHeight;
+        int w = (Rect.Width() * 1000 + osdWidth / 2) / osdWidth;
+        int h = (Rect.Height() * 1000 + osdHeight / 2) / osdHeight;
+        //printf("ScaleVideo: Win1 = %d %d %d %d\n", x, y, w, h);
+
+        // fix aspect ratio, reposition video
+        if (w > h) {
+            x += (w - h) / 2;
+            w = h;
+        }
+        else if (w < h) {
+            y += (h - w) / 2;
+            h = w;
+        }
+
+        //printf("ScaleVideo: Win2 = %d %d %d %d\n", x, y, w, h);
+        mHdffCmdIf->CmdAvSetVideoWindow(0, true, x, y, w, h);
     }
 }
 
diff --git a/config.h b/config.h
index 6a8e5d36c..4150aa73b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.76 2013/03/31 09:30:18 kls Exp $
+ * $Id: config.h 2.76.1.1 2013/04/05 10:41:32 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.0.0"
-#define VDRVERSNUM   20000  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.0.1"
+#define VDRVERSNUM   20001  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/device.c b/device.c
index ff51a1150..e0fe84a48 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.74 2013/03/07 13:18:35 kls Exp $
+ * $Id: device.c 2.74.1.1 2013/04/05 10:47:38 kls Exp $
  */
 
 #include "device.h"
@@ -94,11 +94,11 @@ cDevice::cDevice(void)
 
   player = NULL;
   isPlayingVideo = false;
+  keepTracks = false; // used in ClrAvailableTracks()!
   ClrAvailableTracks();
   currentAudioTrack = ttNone;
   currentAudioTrackMissingCount = 0;
   currentSubtitleTrack = ttNone;
-  keepTracks = false;
   liveSubtitle = NULL;
   dvbSubtitleConverter = NULL;
   autoSelectPreferredSubtitleLanguage = true;
diff --git a/dvbdevice.c b/dvbdevice.c
index ab6149f22..2e1992565 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.88 2013/03/16 15:23:35 kls Exp $
+ * $Id: dvbdevice.c 2.88.1.1 2013/04/09 13:42:26 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -21,10 +21,7 @@
 #include "menuitems.h"
 #include "sourceparams.h"
 
-#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
-#define DTV_STREAM_ID DTV_DVBT2_PLP_ID
-#define FE_CAN_MULTISTREAM 0x4000000
-#endif
+static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in use (will be determined by the first device created)
 
 #define DVBS_TUNE_TIMEOUT  9000 //ms
 #define DVBS_LOCK_TIMEOUT  2000 //ms
@@ -801,7 +798,8 @@ bool cDvbTuner::SetFrontend(void)
         // DVB-S2
         SETCMD(DTV_PILOT, PILOT_AUTO);
         SETCMD(DTV_ROLLOFF, dtp.RollOff());
-        SETCMD(DTV_STREAM_ID, dtp.StreamId());
+        if (DvbApiVersion >= 0x0508)
+           SETCMD(DTV_STREAM_ID, dtp.StreamId());
         }
      else {
         // DVB-S
@@ -835,7 +833,11 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
      if (frontendType == SYS_DVBT2) {
         // DVB-T2
-        SETCMD(DTV_STREAM_ID, dtp.StreamId());
+        if (DvbApiVersion >= 0x0508) {
+           SETCMD(DTV_STREAM_ID, dtp.StreamId());
+           }
+        else if (DvbApiVersion >= 0x0503)
+           SETCMD(DTV_DVBT2_PLP_ID_LEGACY, dtp.StreamId());
         }
 
      tuneTimeout = DVBT_TUNE_TIMEOUT;
@@ -1178,28 +1180,44 @@ bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
      LOG_ERROR;
      return false;
      }
-#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) >= 0x0505
   dtv_property Frontend[1];
-  memset(&Frontend, 0, sizeof(Frontend));
   dtv_properties CmdSeq;
-  memset(&CmdSeq, 0, sizeof(CmdSeq));
-  CmdSeq.props = Frontend;
-  SETCMD(DTV_ENUM_DELSYS, 0);
-  int Result = ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq);
-  if (Result == 0) {
-     for (uint i = 0; i < Frontend[0].u.buffer.len; i++) {
-         if (numDeliverySystems >= MAXDELIVERYSYSTEMS) {
-            esyslog("ERROR: too many delivery systems on frontend %d/%d", adapter, frontend);
-            break;
+  // Determine the version of the running DVB API:
+  if (!DvbApiVersion) {
+     memset(&Frontend, 0, sizeof(Frontend));
+     memset(&CmdSeq, 0, sizeof(CmdSeq));
+     CmdSeq.props = Frontend;
+     SETCMD(DTV_API_VERSION, 0);
+     if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
+        LOG_ERROR;
+        return false;
+        }
+     DvbApiVersion = Frontend[0].u.data;
+     isyslog("DVB API version is 0x%04X (VDR was built with 0x%04X)", DvbApiVersion, DVBAPIVERSION);
+     }
+  // Determine the types of delivery systems this device provides:
+  bool LegacyMode = true;
+  if (DvbApiVersion >= 0x0505) {
+     memset(&Frontend, 0, sizeof(Frontend));
+     memset(&CmdSeq, 0, sizeof(CmdSeq));
+     CmdSeq.props = Frontend;
+     SETCMD(DTV_ENUM_DELSYS, 0);
+     int Result = ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq);
+     if (Result == 0) {
+        for (uint i = 0; i < Frontend[0].u.buffer.len; i++) {
+            if (numDeliverySystems >= MAXDELIVERYSYSTEMS) {
+               esyslog("ERROR: too many delivery systems on frontend %d/%d", adapter, frontend);
+               break;
+               }
+            deliverySystems[numDeliverySystems++] = Frontend[0].u.buffer.data[i];
             }
-         deliverySystems[numDeliverySystems++] = Frontend[0].u.buffer.data[i];
-         }
+        LegacyMode = false;
+        }
+     else {
+        esyslog("ERROR: can't query delivery systems on frontend %d/%d - falling back to legacy mode", adapter, frontend);
+        }
      }
-  else {
-     esyslog("ERROR: can't query delivery systems on frontend %d/%d - falling back to legacy mode", adapter, frontend);
-#else
-     {
-#endif
+  if (LegacyMode) {
      // Legacy mode (DVB-API < 5.5):
      switch (frontendInfo.type) {
        case FE_QPSK: deliverySystems[numDeliverySystems++] = SYS_DVBS;
diff --git a/dvbdevice.h b/dvbdevice.h
index b4d07f584..76b86655d 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.29 2013/03/07 09:42:29 kls Exp $
+ * $Id: dvbdevice.h 2.29.1.1 2013/04/09 13:43:33 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -14,10 +14,59 @@
 #include <linux/dvb/version.h>
 #include "device.h"
 
-#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0503
-#error VDR requires Linux DVB driver API version 5.3 or higher!
+#define DVBAPIVERSION (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR)
+
+#if DVBAPIVERSION < 0x0500
+#error VDR requires Linux DVB driver API version 5.0 or higher!
+#endif
+
+// --- Definitions for older DVB API versions --------------------------------
+
+#if DVBAPIVERSION < 0x0501
+enum {
+  FE_CAN_2G_MODULATION = 0x10000000,
+  };
+enum {
+  TRANSMISSION_MODE_4K = TRANSMISSION_MODE_AUTO + 1,
+  };
+#endif
+
+#if DVBAPIVERSION < 0x0502
+enum {
+  FE_CAN_TURBO_FEC = 0x8000000,
+  };
+#endif
+
+#if DVBAPIVERSION < 0x0503
+enum {
+  TRANSMISSION_MODE_1K = TRANSMISSION_MODE_4K + 1,
+  TRANSMISSION_MODE_16K,
+  TRANSMISSION_MODE_32K,
+  };
+enum {
+  GUARD_INTERVAL_1_128 = GUARD_INTERVAL_AUTO + 1,
+  GUARD_INTERVAL_19_128,
+  GUARD_INTERVAL_19_256,
+  };
+enum {
+  SYS_DVBT2 = SYS_DAB + 1,
+  };
+#endif
+
+#if DVBAPIVERSION < 0x0505
+#define DTV_ENUM_DELSYS  44
 #endif
 
+#if DVBAPIVERSION < 0x0508
+enum {
+  FE_CAN_MULTISTREAM = 0x4000000,
+  };
+#define DTV_STREAM_ID            42
+#define DTV_DVBT2_PLP_ID_LEGACY  43
+#endif
+
+// --- End of definitions for older DVB API versions -------------------------
+
 #define MAXDVBDEVICES  8
 #define MAXDELIVERYSYSTEMS 8
 
diff --git a/font.c b/font.c
index 0bcdc9bba..c6400d4e2 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.13 2012/06/02 13:38:28 kls Exp $
+ * $Id: font.c 2.13.1.1 2013/04/07 14:54:15 kls Exp $
  */
 
 #include "font.h"
@@ -592,7 +592,7 @@ void cTextWrapper::Set(const char *Text, const cFont *Font, int Width)
             p = Blank;
             continue;
             }
-         else {
+         else if (w > 0) { // there has to be at least one character before the newline
             // Here's the ugly part, where we don't have any whitespace to
             // punch in a newline, so we need to make room for it:
             if (Delim)
@@ -608,8 +608,7 @@ void cTextWrapper::Set(const char *Text, const cFont *Font, int Width)
             continue;
             }
          }
-      else
-         w += cw;
+      w += cw;
       if (strchr("-.,:;!?_", *p)) {
          Delim = p;
          Blank = NULL;
diff --git a/newplugin b/newplugin
index 58cf85c04..31d7d593f 100755
--- a/newplugin
+++ b/newplugin
@@ -353,7 +353,7 @@ The next steps you should perform now are:
 sub CreateFile
 {
   my ($Name, $Content) = @_;
-  open(FILE, ">$PLUGINDIR/$Name") || die "$Name:  $!\n";
+  open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V20001 $!\n";
   print FILE $Content;
   close(FILE);
 }
diff --git a/recording.c b/recording.c
index f43ce52ee..b1ca9c5a4 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.91 2013/03/11 10:34:41 kls Exp $
+ * $Id: recording.c 2.91.1.1 2013/04/11 08:20:03 kls Exp $
  */
 
 #include "recording.h"
@@ -561,6 +561,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                      // characters that can be mapped to other characters:
                      case ' ': *p = '_'; break;
                      case FOLDERDELIMCHAR: *p = '/'; break;
+                     case '/': *p = FOLDERDELIMCHAR; break;
                      // characters that have to be encoded:
                      default:
                        if (NeedsConversion(p)) {
@@ -583,6 +584,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
               switch (*p) {
                 // mapped characters:
                 case '_': *p = ' '; break;
+                case FOLDERDELIMCHAR: *p = '/'; break;
                 case '/': *p = FOLDERDELIMCHAR; break;
                 // encoded characters:
                 case '#': {
diff --git a/thread.c b/thread.c
index b16fc8110..80fe588da 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.7 2013/02/22 14:52:49 kls Exp $
+ * $Id: thread.c 2.7.1.1 2013/04/11 08:59:26 kls Exp $
  */
 
 #include "thread.h"
@@ -229,7 +229,7 @@ void cThread::SetPriority(int Priority)
 
 void cThread::SetIOPriority(int Priority)
 {
-  if (syscall(SYS_ioprio_set, 1, 0, (Priority & 0xff) | (2 << 13)) < 0) // best effort class
+  if (syscall(SYS_ioprio_set, 1, 0, (Priority & 0xff) | (3 << 13)) < 0) // idle class
      LOG_ERROR;
 }
 

From 6781c8ba020d31d2c9d616c0279bb40633a8f963 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 20 May 2013 11:29:00 +0200
Subject: [PATCH 231/307] Version 2.0.2 VDR version 2.0.2 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

      ftp://ftp.tvdr.de/vdr/vdr-2.0.2.tar.bz2

A 'diff' against the previous stable version is available at

      ftp://ftp.tvdr.de/vdr/Developer/vdr-2.0.1-2.0.2.diff

MD5 checksums:

5359cae7e14671cc9a3c690d45d8e0a2  vdr-2.0.2.tar.bz2
f4dfc7e6e9170cf56a10b1a2183e84a3  vdr-2.0.1-2.0.2.diff

This version fixes a few minor bugs that came up after the release of
version 2.0.1.

From the HISTORY file:
- Fixed multiple occurrences of the same directory in the recordings list in case there
  are directories that only differ in non-alphanumeric characters (was broken by
  "Fixed selecting the last replayed recording in the Recordings menu in case there
  are folders and plain recordings with names that differ only in non-alphanumeric
  characters" in version 1.7.36).
- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
  Günther).
- Fixed no longer generating any editing marks if the edited recording results in just
  one single sequence.
- Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script.
- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
  by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel
  (reported by Dominique Dumont).
---
 CONTRIBUTORS | 11 ++++++++++-
 HISTORY      | 20 +++++++++++++++++++-
 config.h     |  6 +++---
 cutter.c     |  4 ++--
 diseqc.c     |  4 ++--
 menu.c       | 14 +++++++-------
 newplugin    |  6 +++---
 osd.c        | 10 +++++-----
 skinlcars.c  |  4 +++-
 9 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 83940ded2..72030010e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1013,9 +1013,11 @@ Andreas Mair <amair.sob@googlemail.com>
  for fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
  for reporting a bug in sorting recordings in case two folders have the same name,
  but one of them ends in an additional digit, as in "abc" and "abc2"
- for reporting multiple occurrences of the same directory in the recordings list ini
+ for reporting multiple occurrences of the same directory in the recordings list in
  case there are directories that only differ in non-alphanumeric characters
  for reporting a problem with reduced number of retries in Transfer Mode on SD-FF cards
+ for fixing multiple occurrences of the same directory in the recordings list in case
+ there are directories that only differ in non-alphanumeric characters
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -2100,6 +2102,7 @@ Thomas G
  for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default,
  which results in using tr(FileNameChars)
  for fixing handling "none" color entries in XPM files
+ for fixing displaying the frame number when setting an editing mark
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -2598,6 +2601,8 @@ Halim Sahin <halim.sahin@t-online.de>
  for suggesting to make the "Source" item in the "Edit channel" menu wrap around the
  list of sources
  for reporting a crash when creating a new channel if the channel list is empty
+ for reporting that editing marks were generated even if the edited recording resulted
+ in just one single sequence
 
 Denis Knauf <denis.knauf@gmail.com>
  for reporting a missing '-' at the next to last line of SVDRP help texts
@@ -3141,7 +3146,11 @@ Zoran Turalija <zoran.turalija@gmail.com>
 Stefan Braun <louis.braun@gmx.de>
  for reporting an endless loop in cTextWrapper::Set() in case the given Width is smaller
  than one character
+ for reporting an endless loop in the DrawEllipse() functions for very small ellipses
 
 Jochen Dolze <vdr@dolze.de>
  for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order
  to improve overall performance when an editing process is running
+
+Dominique Dumont <domi.dumont@free.fr>
+ for reporting a crash in the LCARS skin's main menu in case there is no current channel
diff --git a/HISTORY b/HISTORY
index d8a6da38b..b6877ffc3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7328,7 +7328,7 @@ Video Disk Recorder Revision History
   + no longer generating an editing mark at the "end" of the edited recording (this
     was actually generated at the beginning of the last GOP, so that a subsequent
     edit would have cut off the last GOP)
-  + no longer generating any editing marks if the edited recording results on just
+  + no longer generating any editing marks if the edited recording results in just
     one single sequence
   + ignoring pairs of editing marks that are placed at exactly the same position of
     a recording when actually cutting the recording
@@ -7794,3 +7794,21 @@ Video Disk Recorder Revision History
 - Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
   improve overall performance when an editing process is running (thanks to Jochen
   Dolze).
+
+2013-05-19: Version 2.0.2
+
+- Fixed multiple occurrences of the same directory in the recordings list in case there
+  are directories that only differ in non-alphanumeric characters (was broken by
+  "Fixed selecting the last replayed recording in the Recordings menu in case there
+  are folders and plain recordings with names that differ only in non-alphanumeric
+  characters" in version 1.7.36).
+- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
+  G�nther).
+- Fixed no longer generating any editing marks if the edited recording results in just
+  one single sequence.
+- Fixed an error message when parsing SCR values in diseqc.conf.
+- Fixed an unexpected RCS version tag in the newplugin script.
+- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
+  by Stefan Braun).
+- Fixed a crash in the LCARS skin's main menu in case there is no current channel
+  (reported by Dominique Dumont).
diff --git a/config.h b/config.h
index 4150aa73b..d99e2d171 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.76.1.1 2013/04/05 10:41:32 kls Exp $
+ * $Id: config.h 2.76.1.2 2013/04/27 10:18:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.0.1"
-#define VDRVERSNUM   20001  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.0.2"
+#define VDRVERSNUM   20002  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/cutter.c b/cutter.c
index 05bb0f9f7..6e5e662e1 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.25 2013/03/18 09:40:49 kls Exp $
+ * $Id: cutter.c 2.25.1.1 2013/05/02 09:21:18 kls Exp $
  */
 
 #include "cutter.h"
@@ -581,7 +581,7 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
             }
          fileSize += Length;
          // Generate marks at the editing points in the edited recording:
-         if (numSequences > 0 && Index == BeginIndex) {
+         if (numSequences > 1 && Index == BeginIndex) {
             if (toMarks.Count() > 0)
                toMarks.Add(toIndex->Last());
             toMarks.Add(toIndex->Last());
diff --git a/diseqc.c b/diseqc.c
index 54fb72031..97da936c2 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.9 2011/09/17 14:13:31 kls Exp $
+ * $Id: diseqc.c 2.9.1.1 2013/05/02 09:33:12 kls Exp $
  */
 
 #include "diseqc.h"
@@ -192,7 +192,7 @@ const char *cDiseqc::GetScrBank(const char *s) const
         }
      return p;
      }
-  esyslog("ERROR: more than one scr bank in '%s'", s - 1);
+  esyslog("ERROR: invalid value for scr bank in '%s'", s - 1);
   return NULL;
 }
 
diff --git a/menu.c b/menu.c
index 31d25d08b..f43dec5de 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.82 2013/03/18 09:11:48 kls Exp $
+ * $Id: menu.c 2.82.1.2 2013/04/27 10:32:28 kls Exp $
  */
 
 #include "menu.h"
@@ -2302,14 +2302,12 @@ void cMenuRecordings::Set(bool Refresh)
             }
          else
             delete Item;
-         if (LastItem) {
+         if (LastItem || LastDir) {
             if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
-               SetCurrent(LastItem);
+               SetCurrent(LastDir ? LastDir : LastItem);
             }
-         if (LastDir) {
+         if (LastDir)
             LastDir->IncrementCounter(recording->IsNew());
-            LastItem = LastDir;
-            }
          }
       }
   if (Refresh)
@@ -4779,8 +4777,10 @@ void cReplayControl::MarkToggle(void)
         marks.Add(Current);
         bool Play, Forward;
         int Speed;
-        if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play)
+        if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play) {
            Goto(Current, true);
+           displayFrames = true;
+           }
         }
      ShowTimed(2);
      marksModified = true;
diff --git a/newplugin b/newplugin
index 31d7d593f..1e9e91091 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.17 2013/01/12 13:46:00 kls Exp $
+# $Id: newplugin 2.17.1.1 2013/05/02 10:04:06 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -352,8 +352,8 @@ The next steps you should perform now are:
 
 sub CreateFile
 {
-  my ($Name, $Content) = @_;
-  open(FILE, ">$PLUGINDIR/$Name") || die "$Name: V20001 $!\n";
+  my ($FileName, $Content) = @_;
+  open(FILE, ">$PLUGINDIR/$FileName") || die "$FileName: $!\n";
   print FILE $Content;
   close(FILE);
 }
diff --git a/osd.c b/osd.c
index cc652b621..45d4419c8 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.38 2013/02/14 15:50:19 kls Exp $
+ * $Id: osd.c 2.38.1.1 2013/05/18 12:41:48 kls Exp $
  */
 
 #include "osd.h"
@@ -639,8 +639,8 @@ void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quad
     case 8:          cy = y1; rx /= 2; break;
     default: ;
     }
-  int TwoASquare = 2 * rx * rx;
-  int TwoBSquare = 2 * ry * ry;
+  int TwoASquare = max(1, 2 * rx * rx);
+  int TwoBSquare = max(1, 2 * ry * ry);
   int x = rx;
   int y = 0;
   int XChange = ry * ry * (1 - 2 * rx);
@@ -1380,8 +1380,8 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
     case 8:          cy = y1; rx /= 2; break;
     default: ;
     }
-  int TwoASquare = 2 * rx * rx;
-  int TwoBSquare = 2 * ry * ry;
+  int TwoASquare = max(1, 2 * rx * rx);
+  int TwoBSquare = max(1, 2 * ry * ry);
   int x = rx;
   int y = 0;
   int XChange = ry * ry * (1 - 2 * rx);
diff --git a/skinlcars.c b/skinlcars.c
index 72e8302e4..3ed8225a8 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.21 2013/03/09 10:43:34 kls Exp $
+ * $Id: skinlcars.c 2.21.1.1 2013/05/19 12:08:52 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1340,6 +1340,8 @@ void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel)
      DrawMainFrameUpper(Theme.Color(clrChannelFrameBg));
      osd->DrawText(xd00, yd00, tr("LIVE"), Theme.Color(clrChannelFrameBg), Theme.Color(clrBackground), tallFont, xd07 - xd00, yd01 - yd00, taTop | taRight | taBorder);
      }
+  if (!Channel)
+     return;
   if (initial || Channel != lastChannel) {
      osd->DrawText(xa00, yt00, itoa(Channel->Number()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), tallFont, xa02 - xa00, yt02 - yt00, taTop | taRight | taBorder);
      osd->DrawText(xa03, yt00, Channel->Name(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);

From 5076cfb2ed0888dd16baeed1cbaa15cfbcd483c7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 25 Aug 2013 12:35:00 +0200
Subject: [PATCH 232/307] Version 2.1.1 VDR developer version 2.1.1 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.1.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.0.0-2.1.1.diff

MD5 checksums:

b17f9838bb8ddee9620f838fea7a171d  vdr-2.1.1.tar.bz2
8b8ca593885c380cd370e6d19a5b16a1  vdr-2.0.0-2.1.1.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The main focus of this version is on adding basic support for positioners
to control steerable satellite dishes. Manually controlling the dish position
and storing individual positions will follow later.

The fixes contained in this version will be released in a stable version 2.0.3
later, if there are no problems.

From the HISTORY file:
- Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
  one character (reported by Stefan Braun).
- Removed all "modified since version 1.6" markers from PLUGINS.html.
- Added definitions for older DVB API versions, back until 5.0 (based on a patch from
  Udo Richter).
- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
  improve overall performance when an editing process is running (thanks to Jochen
  Dolze).
- Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is
  used (thanks to Lars Hanisch).
- Changed the sign of the satellite position value in cSource to reflect the standard
  of western values being negative. The new member function cSource::Position() can be
  used to retrieve the orbital position of a satellite.
- Fixed multiple occurrences of the same directory in the recordings list in case there
  are directories that only differ in non-alphanumeric characters (was broken by
  "Fixed selecting the last replayed recording in the Recordings menu in case there
  are folders and plain recordings with names that differ only in non-alphanumeric
  characters" in version 1.7.36).
- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
  Günther).
- Fixed no longer generating any editing marks if the edited recording results in just
  one single sequence (reported by Halim Sahin).
- Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script.
- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
  by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel
  (reported by Dominique Dumont).
- Added basic support for positioners to control steerable satellite dishes (based on
  a patch from Seppo Ingalsuo and Ales Jurik).
  + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
  + The new DiSEqC command code 'P' can be used to instruct a positioner to move the
    dish to the required satellite position. When a 'P' code is processed, further
    execution of the remaining DiSEqC sequence (if any) is postponed until the positioner
    has reached the new satellite position.
  + The new special source value of "S360E" can be used in diseqc.conf to indicate that
    an entry using a positioner can move the dish to any requested position within its
    range. Think of it as "full circle".
  + The devices a particular cDiseqc or cScr applies to are now stored directly in each
    cDiseqc or cScr, respectively.
  + A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners").
  + The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to
    show the user a progress display when the dish is being moved. The default implementation
    calls SetMessage() with a string indicating the new position the dish is being moved to.
    The LCARS skin shows a progress bar indicating the movement of the dish.
  + The new parameters "Site latitude", "Site longitude", "Positioner speed", and
    "Positioner swing" in the "Setup/LNB" menu can be used to configure the necessary
    values for a steerable dish.
  + The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable
    dish has reached its target position. Parsing SI data is paused until the target
    position has been reached.
- The LCARS skin now shows the source value of the current channel in its channel display.
- Fixed asserting free disk space in the cutter.
- No longer trying to delete old recordings in AssertFreeDiskSpace() if the given
  Priority is less than 1.
- Fixed handling LIRC events in case repeated events are lost.
- Fixed a possible crash when shutting down VDR while subtitles are being displayed
  (reported by Ville Skyttä).
- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
  a decoder and returns false otherwise. This should improve device allocation on
  systems that are only used as a receiver and don't actually display anything.
- Increased the value of MAXRETRIES to 20 to reduce the probability of disturbances
  in transfer mode.
- All bonded devices (except for the master) now turn off their LNB power completely
  to avoid problems when receiving vertically polarized transponders (suggested by
  Manfred Völkel and Oliver Endriss).
- Reverted the change from version 1.5.7 that made all logging go to LOG_ERR (thanks
  to Christopher Reimer).
- Added Begin/EndSegmentTransfer() to the EPG handler interface (thanks to Jörg Wendel).
- The code for distributing recordings over several video directories is now
  deprecated and disabled by default.
  You can re-enable this feature by removing the comment sign ('//') from the beginning
  of the line
  //#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is ...
  in the file videodir.c. Note, though, that this can only be a temporary workaround.
  This feature will be completely removed in one of the next developer versions.
  Distributing the video directory over several disks was a useful feature in times
  when disks were still relatively small, but it also caused serious problems in case
  one of the disks failed. Nowadays hard disks come in sizes measured in terabytes,
  and tools like "mhddfs" can be used to combine several disks to form one large volume.
  A recommended method for a relatively safe disk setup in a VDR system is to use two
  1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
  fails, you can replace it without data loss.
---
 CONTRIBUTORS                            |  19 ++-
 Doxyfile.filter                         |   2 +-
 HISTORY                                 |  93 ++++++++++-
 INSTALL                                 |  35 +----
 MANUAL                                  |  22 +++
 Make.config.template                    |   2 +-
 Make.global                             |   2 +-
 Makefile                                |   4 +-
 PLUGINS.html                            | 104 ++++++------
 PLUGINS/src/dvbhddevice/HISTORY         |   5 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   2 +-
 PLUGINS/src/dvbhddevice/menu.c          |   7 +-
 PLUGINS/src/dvbhddevice/po/de_DE.po     |   5 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po     |   5 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po     |   5 +-
 PLUGINS/src/dvbsddevice/HISTORY         |   5 +
 PLUGINS/src/dvbsddevice/Makefile        |   2 +-
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |   6 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   2 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |   2 +-
 PLUGINS/src/dvbsddevice/dvbsdffosd.c    |   2 +-
 PLUGINS/src/dvbsddevice/dvbsdffosd.h    |   2 +-
 PLUGINS/src/epgtableid0/Makefile        |   2 +-
 PLUGINS/src/epgtableid0/epgtableid0.c   |   2 +-
 PLUGINS/src/hello/Makefile              |   2 +-
 PLUGINS/src/hello/hello.c               |   2 +-
 PLUGINS/src/osddemo/Makefile            |   2 +-
 PLUGINS/src/osddemo/osddemo.c           |   2 +-
 PLUGINS/src/pictures/HISTORY            |   4 +
 PLUGINS/src/pictures/Makefile           |   2 +-
 PLUGINS/src/pictures/entry.c            |   2 +-
 PLUGINS/src/pictures/entry.h            |   2 +-
 PLUGINS/src/pictures/menu.c             |   2 +-
 PLUGINS/src/pictures/menu.h             |   2 +-
 PLUGINS/src/pictures/pic2mpg            |  10 +-
 PLUGINS/src/pictures/pictures.c         |   2 +-
 PLUGINS/src/pictures/player.c           |   2 +-
 PLUGINS/src/pictures/player.h           |   2 +-
 PLUGINS/src/rcu/Makefile                |   2 +-
 PLUGINS/src/rcu/rcu.c                   |   2 +-
 PLUGINS/src/servicedemo/Makefile        |   2 +-
 PLUGINS/src/servicedemo/svccli.c        |   2 +-
 PLUGINS/src/servicedemo/svcsvr.c        |   2 +-
 PLUGINS/src/skincurses/Makefile         |   2 +-
 PLUGINS/src/skincurses/skincurses.c     |   2 +-
 PLUGINS/src/status/Makefile             |   2 +-
 PLUGINS/src/status/status.c             |   2 +-
 PLUGINS/src/svdrpdemo/Makefile          |   2 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c       |   2 +-
 audio.c                                 |   2 +-
 audio.h                                 |   2 +-
 channels.c                              |   2 +-
 channels.h                              |   2 +-
 ci.c                                    |   2 +-
 ci.h                                    |   2 +-
 config.c                                |  20 ++-
 config.h                                |  16 +-
 cutter.c                                |   6 +-
 cutter.h                                |   2 +-
 device.c                                |  10 +-
 device.h                                |  10 +-
 diseqc.c                                | 200 ++++++++++++++++++++----
 diseqc.conf                             |  14 +-
 diseqc.h                                |  43 ++++-
 dvbci.c                                 |   2 +-
 dvbci.h                                 |   2 +-
 dvbdevice.c                             | 101 +++++++++---
 dvbdevice.h                             |   3 +-
 dvbplayer.c                             |   2 +-
 dvbplayer.h                             |   2 +-
 dvbspu.c                                |   2 +-
 dvbspu.h                                |   2 +-
 dvbsubtitle.c                           |   2 +-
 dvbsubtitle.h                           |   2 +-
 eit.c                                   |   4 +-
 eit.h                                   |   2 +-
 eitscan.c                               |   2 +-
 eitscan.h                               |   2 +-
 epg.c                                   |  18 ++-
 epg.h                                   |  10 +-
 epg2html                                |   2 +-
 filter.c                                |   2 +-
 filter.h                                |   2 +-
 font.c                                  |   2 +-
 font.h                                  |   2 +-
 i18n.c                                  |   2 +-
 i18n.h                                  |   2 +-
 interface.c                             |   2 +-
 interface.h                             |   2 +-
 keys.c                                  |   2 +-
 keys.h                                  |   2 +-
 libsi/Makefile                          |   2 +-
 libsi/descriptor.c                      |   2 +-
 libsi/descriptor.h                      |   2 +-
 libsi/gendescr                          |   2 +-
 libsi/headers.h                         |   2 +-
 libsi/section.c                         |   2 +-
 libsi/section.h                         |   2 +-
 libsi/si.c                              |   2 +-
 libsi/si.h                              |   2 +-
 libsi/util.c                            |   2 +-
 libsi/util.h                            |   2 +-
 lirc.c                                  |   3 +-
 lirc.h                                  |   2 +-
 menu.c                                  |  30 +++-
 menu.h                                  |   3 +-
 menuitems.c                             |  52 +++++-
 menuitems.h                             |  15 +-
 newplugin                               |   2 +-
 nit.c                                   |   2 +-
 nit.h                                   |   2 +-
 osd.c                                   |   2 +-
 osd.h                                   |   2 +-
 osdbase.c                               |   4 +-
 osdbase.h                               |   2 +-
 pat.c                                   |   2 +-
 pat.h                                   |   2 +-
 player.c                                |   2 +-
 player.h                                |   2 +-
 plugin.c                                |   2 +-
 plugin.h                                |   2 +-
 po/ar.po                                |  33 +++-
 po/ca_ES.po                             |  33 +++-
 po/cs_CZ.po                             |  33 +++-
 po/da_DK.po                             |  33 +++-
 po/de_DE.po                             |  33 +++-
 po/el_GR.po                             |  33 +++-
 po/es_ES.po                             |  33 +++-
 po/et_EE.po                             |  33 +++-
 po/fi_FI.po                             |  33 +++-
 po/fr_FR.po                             |  33 +++-
 po/hr_HR.po                             |  33 +++-
 po/hu_HU.po                             |  33 +++-
 po/it_IT.po                             |  33 +++-
 po/lt_LT.po                             |  33 +++-
 po/mk_MK.po                             |  33 +++-
 po/nl_NL.po                             |  33 +++-
 po/nn_NO.po                             |  33 +++-
 po/pl_PL.po                             |  33 +++-
 po/pt_PT.po                             |  33 +++-
 po/ro_RO.po                             |  33 +++-
 po/ru_RU.po                             |  33 +++-
 po/sk_SK.po                             |  33 +++-
 po/sl_SI.po                             |  33 +++-
 po/sr_RS.po                             |  33 +++-
 po/sv_SE.po                             |  33 +++-
 po/tr_TR.po                             |  33 +++-
 po/uk_UA.po                             |  33 +++-
 po/zh_CN.po                             |  33 +++-
 positioner.c                            | 140 +++++++++++++++++
 positioner.h                            | 171 ++++++++++++++++++++
 receiver.c                              |   2 +-
 receiver.h                              |   2 +-
 recorder.c                              |   2 +-
 recorder.h                              |   2 +-
 recording.c                             |  48 +++---
 recording.h                             |   2 +-
 remote.c                                |   2 +-
 remote.h                                |   2 +-
 remux.c                                 |   2 +-
 remux.h                                 |   2 +-
 ringbuffer.c                            |   2 +-
 ringbuffer.h                            |   2 +-
 runvdr.template                         |   2 +-
 sdt.c                                   |   2 +-
 sdt.h                                   |   2 +-
 sections.c                              |   2 +-
 sections.h                              |   2 +-
 shutdown.c                              |   2 +-
 shutdown.h                              |   2 +-
 skinclassic.c                           |   2 +-
 skinclassic.h                           |   2 +-
 skinlcars.c                             |  71 ++++++++-
 skinlcars.h                             |   2 +-
 skins.c                                 |  18 ++-
 skins.h                                 |  17 +-
 skinsttng.c                             |   2 +-
 skinsttng.h                             |   2 +-
 sourceparams.c                          |   2 +-
 sourceparams.h                          |   2 +-
 sources.c                               |  34 ++--
 sources.conf                            |   2 +
 sources.h                               |  17 +-
 spu.c                                   |   2 +-
 spu.h                                   |   2 +-
 status.c                                |   2 +-
 status.h                                |   2 +-
 summary2info                            |   2 +-
 svdrp.c                                 |   2 +-
 svdrp.h                                 |   2 +-
 themes.c                                |   2 +-
 themes.h                                |   2 +-
 thread.c                                |   2 +-
 thread.h                                |   3 +-
 timers.c                                |   2 +-
 timers.h                                |   2 +-
 tools.c                                 |   6 +-
 tools.h                                 |  14 +-
 transfer.c                              |   4 +-
 transfer.h                              |   2 +-
 vdr.1                                   |   2 +-
 vdr.5                                   |   3 +-
 vdr.c                                   |   8 +-
 videodir.c                              |  42 ++++-
 videodir.h                              |   2 +-
 205 files changed, 2277 insertions(+), 390 deletions(-)
 create mode 100644 positioner.c
 create mode 100644 positioner.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 72030010e..f16280697 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -537,7 +537,7 @@ Andreas B
 Onno Kreuzinger <ok@solutas.net>
  for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
 
-Rudi Hofer (Rudi.Hofer@gmx.de)
+Rudi Hofer <Rudi.Hofer@gmx.de>
  for his help in keeping 'channels.conf' up to date
  for reporting a problem with overlapping tab positions in skins when using wide fonts
 
@@ -700,6 +700,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for helping to debug a problem with reduced number of retries in Transfer Mode on
  SD-FF cards
  for reporting a problem with resuming replay of PES recordings
+ for suggesting to make all bonded devices (except for the master) turn off their LNB
+ power completely to avoid problems when receiving vertically polarized transponders
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1790,6 +1792,7 @@ Udo Richter <udo_richter@gmx.de>
  for requesting to keep using relative paths when building plugins locally
  for fixing a problem with detecting user inactivity in case the system time is
  changed after VDR has been started
+ for a patch that was used to add definitions for older DVB API versions, back until 5.0
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
@@ -2017,6 +2020,8 @@ Ville Skytt
  be escaped
  for changing the template for PLGCFG to $(CONFDIR)/plugins.mk
  for updating the help and man page entry about the location of the epg.data file
+ for reporting a possible crash when shutting down VDR while subtitles are being
+ displayed
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2545,6 +2550,7 @@ J
  for reporting that cPlugin::Active() was called too often
  for adding HandledExternally() to the EPG handler interface
  for adding IsUpdate() to the EPG handler interface
+ for adding Begin/EndSegmentTransfer() to the EPG handler interface
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@@ -2695,6 +2701,7 @@ Ales Jurik <ajurik@quick.cz>
  for reporting broken SI data on Czech/Slovak channels after changing the default
  character set to ISO-8859-9
  for adding MPEG 1 handling to remux.c
+ for a patch that was used as a base for implementing support for positioners
 
 Magnus Andersson <svankan@bahnhof.se>
  for translating OSD texts to the Swedish language
@@ -2752,7 +2759,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
 
-Derek Kelly (user.vdr@gmail.com)
+Derek Kelly <user.vdr@gmail.com>
  for fixing handling the 'new' indicator in the recordings menu for TS recordings
  for reporting a problem with HD NTSC broadcasts that split frames over several payload
  units
@@ -2876,6 +2883,7 @@ Christopher Reimer <reimer.christopher@freenet.de>
  for making plugin Makefiles use DESTDIR and the 'install' program
  for suggesting to make sure that plugins include the VDR header files from the actual
  VDR source directory when doing "make plugins"
+ for reverting the change from version 1.5.7 that made all logging go to LOG_ERR
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -3154,3 +3162,10 @@ Jochen Dolze <vdr@dolze.de>
 
 Dominique Dumont <domi.dumont@free.fr>
  for reporting a crash in the LCARS skin's main menu in case there is no current channel
+
+Seppo Ingalsuo <seppo.ingalsuo@iki.fi>
+ for a patch that was used as a base for implementing support for positioners
+
+Manfred V�lkel <mvoelkel@digitaldevices.de>
+ for suggesting to make all bonded devices (except for the master) turn off their LNB
+ power completely to avoid problems when receiving vertically polarized transponders
diff --git a/Doxyfile.filter b/Doxyfile.filter
index 7fde95512..59ba78370 100755
--- a/Doxyfile.filter
+++ b/Doxyfile.filter
@@ -9,7 +9,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Doxyfile.filter 2.1 2013/02/17 10:54:05 kls Exp $
+# $Id: Doxyfile.filter 3.0 2013/02/17 10:54:05 kls Exp $
 
 $TAG = "///<";
 
diff --git a/HISTORY b/HISTORY
index b6877ffc3..47944701e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7144,7 +7144,7 @@ Video Disk Recorder Revision History
   Christian Richter).
 - Added DeleteEvent() to the EPG handler interface, so that an EPG handler can trigger
   deleting of an event (thanks to Christian Kaiser).
-- Speeded up opening menus on systems with many (several thousands) of recordings, by
+- Speeded up opening menus on systems with many (several thousands of) recordings, by
   caching the information whether a recording is stored on the video directory file
   system within the cRecording data (based on a patch from Torsten Lang).
 
@@ -7782,7 +7782,7 @@ Video Disk Recorder Revision History
 - Bumped all version numbers to 2.0.0.
 - Official release.
 
-2013-04-13: Version 2.0.1
+2013-04-11: Version 2.0.1
 
 - Fixed initializing cDevice::keepTracks.
 - Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
@@ -7805,10 +7805,97 @@ Video Disk Recorder Revision History
 - Fixed displaying the frame number when setting an editing mark (thanks to Thomas
   G�nther).
 - Fixed no longer generating any editing marks if the edited recording results in just
-  one single sequence.
+  one single sequence (reported by Halim Sahin).
 - Fixed an error message when parsing SCR values in diseqc.conf.
 - Fixed an unexpected RCS version tag in the newplugin script.
 - Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
   by Stefan Braun).
 - Fixed a crash in the LCARS skin's main menu in case there is no current channel
   (reported by Dominique Dumont).
+
+2013-08-25: Version 2.1.1
+
+- Fixed initializing cDevice::keepTracks.
+- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
+  one character (reported by Stefan Braun).
+- Removed all "modified since version 1.6" markers from PLUGINS.html.
+- Added definitions for older DVB API versions, back until 5.0 (based on a patch from
+  Udo Richter).
+- Changed cThread::SetIOPriority() from "best effort class" to "idle class" in order to
+  improve overall performance when an editing process is running (thanks to Jochen
+  Dolze).
+- Fixed handling '/' and '~' in recording file names in case DirectoryEncoding is
+  used (thanks to Lars Hanisch).
+- Changed the sign of the satellite position value in cSource to reflect the standard
+  of western values being negative. The new member function cSource::Position() can be
+  used to retrieve the orbital position of a satellite.
+- Fixed multiple occurrences of the same directory in the recordings list in case there
+  are directories that only differ in non-alphanumeric characters (was broken by
+  "Fixed selecting the last replayed recording in the Recordings menu in case there
+  are folders and plain recordings with names that differ only in non-alphanumeric
+  characters" in version 1.7.36).
+- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
+  G�nther).
+- Fixed no longer generating any editing marks if the edited recording results in just
+  one single sequence (reported by Halim Sahin).
+- Fixed an error message when parsing SCR values in diseqc.conf.
+- Fixed an unexpected RCS version tag in the newplugin script.
+- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
+  by Stefan Braun).
+- Fixed a crash in the LCARS skin's main menu in case there is no current channel
+  (reported by Dominique Dumont).
+- Added basic support for positioners to control steerable satellite dishes (based on
+  a patch from Seppo Ingalsuo and Ales Jurik).
+  + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
+  + The new DiSEqC command code 'P' can be used to instruct a positioner to move the
+    dish to the required satellite position. When a 'P' code is processed, further
+    execution of the remaining DiSEqC sequence (if any) is postponed until the positioner
+    has reached the new satellite position.
+  + The new special source value of "S360E" can be used in diseqc.conf to indicate that
+    an entry using a positioner can move the dish to any requested position within its
+    range. Think of it as "full circle".
+  + The devices a particular cDiseqc or cScr applies to are now stored directly in each
+    cDiseqc or cScr, respectively.
+  + A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners").
+  + The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to
+    show the user a progress display when the dish is being moved. The default implementation
+    calls SetMessage() with a string indicating the new position the dish is being moved to.
+    The LCARS skin shows a progress bar indicating the movement of the dish.
+  + The new parameters "Site latitude", "Site longitude", "Positioner speed", and
+    "Positioner swing" in the "Setup/LNB" menu can be used to configure the necessary
+    values for a steerable dish.
+  + The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable
+    dish has reached its target position. Parsing SI data is paused until the target
+    position has been reached.
+- The LCARS skin now shows the source value of the current channel in its channel display.
+- Fixed asserting free disk space in the cutter.
+- No longer trying to delete old recordings in AssertFreeDiskSpace() if the given
+  Priority is less than 1.
+- Fixed handling LIRC events in case repeated events are lost.
+- Fixed a possible crash when shutting down VDR while subtitles are being displayed
+  (reported by Ville Skytt�).
+- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
+  a decoder and returns false otherwise. This should improve device allocation on
+  systems that are only used as a receiver and don't actually display anything.
+- Increased the value of MAXRETRIES to 20 to reduce the probability of disturbances
+  in transfer mode.
+- All bonded devices (except for the master) now turn off their LNB power completely
+  to avoid problems when receiving vertically polarized transponders (suggested by
+  Manfred V�lkel and Oliver Endriss).
+- Reverted the change from version 1.5.7 that made all logging go to LOG_ERR (thanks
+  to Christopher Reimer).
+- Added Begin/EndSegmentTransfer() to the EPG handler interface (thanks to J�rg Wendel).
+- The code for distributing recordings over several video directories is now
+  deprecated and disabled by default.
+  You can re-enable this feature by removing the comment sign ('//') from the beginning
+  of the line
+  //#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is ...
+  in the file videodir.c. Note, though, that this can only be a temporary workaround.
+  This feature will be completely removed in one of the next developer versions.
+  Distributing the video directory over several disks was a useful feature in times
+  when disks were still relatively small, but it also caused serious problems in case
+  one of the disks failed. Nowadays hard disks come in sizes measured in terabytes,
+  and tools like "mhddfs" can be used to combine several disks to form one large volume.
+  A recommended method for a relatively safe disk setup in a VDR system is to use two
+  1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
+  fails, you can replace it without data loss.
diff --git a/INSTALL b/INSTALL
index dd0c999e6..f3a831f03 100644
--- a/INSTALL
+++ b/INSTALL
@@ -325,38 +325,9 @@ Note that the file system need not be 64-bit proof, since the 'vdr'
 program splits video files into chunks of about 2GB. You should use
 a disk with several gigabytes of free space. One GB can store roughly
 half an hour of SD video data, or 10 minutes of HD video.
-
-If you have more than one disk and don't want to combine them to form
-one large logical volume, you can set up several video directories as
-mount points for these disks. All of these directories must have the
-same basic name and must end with a numeric part, which starts at 0 for
-the main directory and has increasing values for the rest of the
-directories. For example
-
-   /srv/vdr/video0
-   /srv/vdr/video1
-   /srv/vdr/video2
-
-would be a setup with three directories. You can use more than one
-numeric digit:
-
-   /mnt/MyVideos/vdr.00
-   /mnt/MyVideos/vdr.01
-   /mnt/MyVideos/vdr.02
-   ...
-   /mnt/MyVideos/vdr.11
-
-would set up twelve disks (wow, what a machine that would be!).
-
-To use such a multi directory setup, you need to add the '-v' option
-with the name of the basic directory when running 'vdr':
-
-   vdr -v /srv/vdr/video0
-
-WARNING: Using multiple disks to form one large video directory this way
-is deprecated and will be removed from VDR in a future version! Either
-use one of today's large terabyte disks (preferably with a backup disk
-in a RAID-1 array), or use something like "mhddfs".
+Either use one of today's large terabyte disks (preferably with a backup disk
+in a RAID-1 array), or use something like "mhddfs" to group several disks
+into one large volume.
 
 Note that you should not copy any non-VDR files into the video directory,
 since this might cause a lot of unnecessary disk access when VDR cleans up those
diff --git a/MANUAL b/MANUAL
index cce2b0a5b..e698085d7 100644
--- a/MANUAL
+++ b/MANUAL
@@ -776,6 +776,28 @@ Version 2.0
                          are connected to the same sat cable must be set to the same
                          number here.
 
+  Use dish positioner = no
+                         By default, the 'P' command code in DiSEqC command sequences
+                         is ignored. Set this parameter to 'yes' if you are using a
+                         satellite dish positioner.
+
+  Site latitude (degrees) = 0
+  Site longitude (degrees) = 0
+                         Set these to the latitude and longitude of your dish's
+                         location if you use a satellite dish positioner. Use the
+                         "Green" key to switch between north/south and east/west,
+                         respectively.
+
+  Max. positioner swing (degrees) = 65
+                         Defines the maximum angle by which the positioner can move
+                         the dish away from due south (or north) in either direction.
+                         The valid range is 0...90.
+
+  Positioner speed (degrees/s) = 1.5
+                         Defines the speed at which the positioner moves the dish.
+                         The valid range is 0.1...180. This value is used to calculate
+                         how long it takes the positioner to reach the target position.
+
   CAM:
 
   n CAM Name             Shows the CAM slots that are present in this system, where
diff --git a/Make.config.template b/Make.config.template
index 2bc0a8f1d..9b1c4ddbc 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 2.19 2013/02/18 10:55:39 kls Exp $
+# $Id: Make.config.template 3.0 2013/02/18 10:55:39 kls Exp $
 
 ### The C compiler and options:
 
diff --git a/Make.global b/Make.global
index e25940253..665cc285d 100644
--- a/Make.global
+++ b/Make.global
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.global 1.2 2012/12/29 12:03:01 kls Exp $
+# $Id: Make.global 3.0 2012/12/29 12:03:01 kls Exp $
 
 # This is just a dummy file for plugins that use old style (version 1.7.33
 # or earlier) Makefiles.
diff --git a/Makefile b/Makefile
index d24d08fd3..eccec7f51 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.54 2013/03/11 15:01:01 kls Exp $
+# $Id: Makefile 3.1 2013/04/14 12:18:08 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -68,7 +68,7 @@ SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
-       lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
+       lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o positioner.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
        skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
diff --git a/PLUGINS.html b/PLUGINS.html
index d864fe236..454eae2d9 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -31,14 +31,14 @@
 <div class="center">
 <h1>The VDR Plugin System</h1>
 
-<b>Version 2.0</b>
+<b>Version 2.1</b>
 <p>
 Copyright &copy; 2013 Klaus Schmidinger<br>
 <a href="mailto:vdr@tvdr.de">vdr@tvdr.de</a><br>
 <a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
 <div class="center">
-<modified>Important modifications introduced since version 1.6 are marked like this.</modified>
+<modified>Important modifications introduced since version 2.0 are marked like this.</modified>
 </div>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
@@ -82,7 +82,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Wakeup">Wakeup</a>
 <li><a href="#Setup parameters">Setup parameters</a>
 <li><a href="#The Setup menu">The Setup menu</a>
-<li><modified><a href="#Additional files">Additional files</modified></a>
+<li><a href="#Additional files">Additional files</a>
 <li><a href="#Internationalization">Internationalization</a>
 <li><a href="#Custom services">Custom services</a>
 <li><a href="#SVDRP commands">SVDRP commands</a>
@@ -99,10 +99,11 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
+<li><modified><a href="#Positioners">Positioners</a></modified>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
 <li><a href="#Conditional Access">Conditional Access</a>
-<li><modified><a href="#Electronic Program Guide">Electronic Program Guide</modified></a>
+<li><a href="#Electronic Program Guide">Electronic Program Guide</a>
 </ul>
 </ul>
 
@@ -173,15 +174,13 @@ <h1>Table Of Contents</h1>
 the name of that plugin (in the above example that would be <tt>hello</tt>).
 What's inside the individual source directory of a
 plugin is entirely up to the author of that plugin. The only prerequisites are
-that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt><modified>, <tt>install</tt></modified> and
+that there is a <tt>Makefile</tt> that provides the targets <tt>all</tt>, <tt>install</tt> and
 <tt>clean</tt>, and that a call to <tt>make all</tt> actually produces a dynamically
 loadable library file for that plugin (we'll get to the details later).
-<modified>
 The dynamically loadable library file for the plugin shall be located directly under
 the plugin's source directory.
 See the section <a href="#Initializing a new plugin directory">Initializing a new plugin directory</a>
 for how to generate an example Makefile.
-</modified>
 <p>
 The <tt>lib</tt> directory contains the dynamically loadable libraries of all
 available plugins. Note that the names of these files are created by concatenating
@@ -891,70 +890,51 @@ <h1>Table Of Contents</h1>
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<hr><h2><modified><a name="Additional files">Additional files</a></modified></h2>
+<hr><h2><a name="Additional files">Additional files</a></h2>
 
 <div class="blurb">I want my own stuff!</div><p>
 
-<modified>
 There may be situations where a plugin requires files of its own. While the plugin is
 free to store such files anywhere it sees fit, it might be a good idea to put them in a common
 place, preferably where such data already exists.
-</modified>
 <p>
-<modified>
 <i>configuration files</i>, maybe for data that can't be stored in the simple
 <a href="#Setup parameters">setup parameters</a> of VDR, or maybe because it needs to
 launch other programs that simply need a separate configuration file.
-</modified>
 <p>
-<modified>
 <i>cache files</i>, to store data so that future requests for that data can be served faster. The data
 that is stored within a cache might be values that have been computed earlier or duplicates of
 original values that are stored elsewhere.
-</modified>
 <p>
-<modified>
 <i>resource files</i>, for providing additional files, like pictures, movie clips or channel logos.
-</modified>
 <p>
-<modified>
 Therefore VDR provides the functions
 
 <p><table><tr><td class="code"><pre>
-<modified>
 const char *ConfigDirectory(const char *PluginName = NULL);
 const char *CacheDirectory(const char *PluginName = NULL);
 const char *ResourceDirectory(const char *PluginName = NULL);
-</modified>
 </pre></td></tr></table><p>
 
-<modified>
 each of which returns a string containing the directory that VDR uses for its own
 files (defined through the options in the call to VDR), extended by
-</modified>
 <tt>"/plugins"</tt>. So assuming the VDR configuration directory is <tt>/video</tt>
 (the default if no <tt><b>-c</b></tt> or <tt><b>-v</b></tt> option is given),
 a call to <tt>ConfigDirectory()</tt> will return <tt>/video/plugins</tt>. The first
 call to <tt>ConfigDirectory()</tt> will automatically make sure that the <tt>plugins</tt>
 subdirectory will exist. If, for some reason, this cannot be achieved, <tt>NULL</tt>
 will be returned.
-<modified>
 The behavior of <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt> is similar.
-</modified>
 <p>
 The additional <tt>plugins</tt> directory is used to keep files from plugins apart
 from those of VDR itself, making sure there will be no name clashes. If a plugin
-<modified>
 needs only one extra file, it is suggested that this file be named <tt>name.*</tt>,
 where <i>name</i> shall be the name of the plugin.
-</modified>
 <p>
 If a plugin needs more than one such file, it is suggested that the plugin stores
 these in a subdirectory of its own, named after the plugin. To easily get such a name
-<modified>
 the functions can be given an additional string that will be appended to the returned
 directory name, as in
-</modified>
 
 <p><table><tr><td class="code"><pre>
 const char *MyConfigDir = ConfigDirectory(Name());
@@ -965,16 +945,12 @@ <h1>Table Of Contents</h1>
 (or return <tt>NULL</tt> in case of an error).
 <p>
 <b>
-<modified>
 The returned strings are statically allocated and will be overwritten by subsequent calls!
-</modified>
 </b>
 <p>
-<modified>
 The <tt>ConfigDirectory()</tt>, <tt>CacheDirectory()</tt> and <tt>ResourceDirectory()</tt>
 functions are static member functions of the <tt>cPlugin</tt> class. This allows them to be
 called even from outside any member function of the derived plugin class, by writing
-</modified>
 
 <p><table><tr><td class="code"><pre>
 const char *MyConfigDir = cPlugin::ConfigDirectory();
@@ -1265,10 +1241,10 @@ <h1>Table Of Contents</h1>
 
 class cMyStatusMonitor : public cStatus {
 protected:
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber<modified>, bool LiveView</modified>);
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
   };
 
-void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber<modified>, bool LiveView</modified>)
+void cMyStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
 {
   if (ChannelNumber)
      dsyslog("channel switched to %d on DVB %d", ChannelNumber, Device-&gt;CardIndex());
@@ -1525,13 +1501,11 @@ <h1>Table Of Contents</h1>
   cMyReceiver(int Pid);
   };
 
-<modified>
 cMyReceiver::cMyReceiver(int Pid)
 :cReceiver(NULL, -1)
 {
   AddPid(Pid);
 }
-</modified>
 
 cMyReceiver::~cMyReceiver()
 {
@@ -1557,7 +1531,7 @@ <h1>Table Of Contents</h1>
 PID (for example the Teletext PID). In order to not interfere with other recording
 operations, it sets its priority to <tt>-1</tt> (any negative value will allow
 a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time
-<modified>in favor of a timer recording or live viewing</modified>).
+in favor of a timer recording or live viewing).
 <p>
 Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
 a <tt>cDevice</tt>:
@@ -1573,9 +1547,7 @@ <h1>Table Of Contents</h1>
 video stream (this may be different from the primary device in case of <i>Transfer
 Mode</i>).
 <p>
-<modified>
 The <tt>cReceiver</tt> must be detached from its device before it is deleted.
-</modified>
 
 <hr><h2><a name="Filters">Filters</a></h2>
 
@@ -1853,7 +1825,7 @@ <h1>Table Of Contents</h1>
 selecting which channel it shall tune to:
 
 <p><table><tr><td class="code"><pre>
-<modified>virtual int NumProvidedSystems(void) const;</modified>
+virtual int NumProvidedSystems(void) const;
 virtual bool ProvidesSource(int Source) const;
 virtual bool ProvidesTransponder(const cChannel *Channel) const;
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
@@ -1902,7 +1874,7 @@ <h1>Table Of Contents</h1>
 virtual bool CanReplay(void) const;
 virtual bool SetPlayMode(ePlayMode PlayMode);
 virtual int64_t GetSTC(void);
-<modified>virtual bool IsPlayingVideo(void) const;</modified>
+virtual bool IsPlayingVideo(void) const;
 virtual bool HasIBPTrickSpeed(void);
 virtual void TrickSpeed(int Speed);
 virtual void Clear(void);
@@ -1931,7 +1903,7 @@ <h1>Table Of Contents</h1>
 
 <p><table><tr><td class="code"><pre>
 virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
-<modified>virtual int ReadFilter(int Handle, void *Buffer, size_t Length);</modified>
+virtual int ReadFilter(int Handle, void *Buffer, size_t Length);
 virtual void CloseFilter(int Handle);
 </pre></td></tr></table><p>
 
@@ -1987,7 +1959,6 @@ <h1>Table Of Contents</h1>
 a "full featured" DVB card) or through a graphics adapter that overlays its
 output with the video signal, doesn't matter.
 <p>
-<div class="modified">
 In order to be able to determine the proper size of the OSD, the device
 should implement the function
 
@@ -1996,7 +1967,6 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 By default, an OSD size of 720x480 with an aspect ratio of 1.0 is assumed.
-</div modified>
 
 <p>
 <b>Initializing new devices</b>
@@ -2017,8 +1987,6 @@ <h1>Table Of Contents</h1>
 shut down (delete) all devices when the program terminates. It is therefore
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
-
-<div class="modified">
 <p>
 <b>Device hooks</b>
 <p>
@@ -2056,6 +2024,48 @@ <h1>Table Of Contents</h1>
 </pre></td></tr></table><p>
 
 and shall not delete this object. It will be automatically deleted when the program ends.
+
+<div class="modified">
+<hr><h2><a name="Positioners">Positioners</a></h2>
+
+<div class="blurb">Now you see me - now you don't!</div><p>
+
+If you are using a positioner (also known as "motor" or "rotor") to move your
+satellite dish to receive various satellites, you will be using the 'P' command
+in the <tt>diseqc.conf</tt> file. This command sends the necessary data to the
+positioner to move the dish to the satellite's orbital position. By default VDR
+uses its builtin DiSEqC positioner control. If your positioner requires a different
+method of controlling (like maybe via a serial link), you can derive a class
+from <tt>cPositioner</tt>, as in
+
+<p><table><tr><td class="code"><pre>
+#include &lt;vdr/positioner.h&gt;
+
+class cMyPositioner : public cPositioner {
+private:
+  void SendDiseqc(uint8_t *Codes, int NumCodes);
+public:
+  cMyPositioner(void);
+  virtual void Drive(ePositionerDirection Direction);
+  virtual void Step(ePositionerDirection Direction, uint Steps = 1);
+  virtual void Halt(void);
+  virtual void SetLimit(ePositionerDirection Direction);
+  virtual void DisableLimits(void);
+  virtual void EnableLimits(void);
+  virtual void StorePosition(uint Number);
+  virtual void RecalcPositions(uint Number);
+  virtual void GotoPosition(uint Number, int Longitude);
+  virtual void GotoAngle(int Longitude);
+  };
+</pre></td></tr></table><p>
+
+See the implementation of <tt>cDiseqcPositioner</tt> in <tt>diseqc.c</tt> for details.
+<p>
+You should create your derived positioner object in the
+<a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
+Note that the object has to be created on the heap (using <tt>new</tt>),
+and you shall not delete it at any point (it will be deleted automatically
+when the program ends).
 </div modified>
 
 <hr><h2><a name="Audio">Audio</a></h2>
@@ -2222,12 +2232,10 @@ <h1>Table Of Contents</h1>
 
 The other parameters have the same meaning as in the first version of this function.
 <p>
-<modified>
 If your remote control has a repeat function that automatically repeats key events
 if a key is held pressed down for a while, your derived class should use the global
 parameters <tt>Setup.RcRepeatDelay</tt> and <tt>Setup.RcRepeatDelta</tt> to allow
 users to configure the behavior of this function.
-</modified>
 
 <hr><h2><a name="Conditional Access">Conditional Access</a></h2>
 
@@ -2264,7 +2272,6 @@ <h1>Table Of Contents</h1>
 
 See the description of this function in <tt>ci.h</tt> for details.
 
-<div class="modified">
 <hr><h2><a name="Electronic Program Guide">Electronic Program Guide</a></h2>
 
 <div class="blurb">The grass is always greener on the other side...</div><p>
@@ -2294,7 +2301,6 @@ <h1>Table Of Contents</h1>
 to signal VDR that no other EPG handlers shall be queried after this one.
 <p>
 See <tt>VDR/epg.h</tt> for details.
-</div modified>
 
 </body>
 </html>
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index d21abac5c..d22f14d64 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -75,3 +75,8 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-04-11: Version 2.0.1
 
 - Fixed aspect ratio and position of scaled video.
+
+2013-08-23: Version 2.1.1
+
+- Fixed aspect ratio and position of scaled video.
+- Added yellow button in main menu to send CEC TV-Off command.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index d82b8489d..cfd71bb1d 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.0.1";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/menu.c b/PLUGINS/src/dvbhddevice/menu.c
index e8fd867ab..b7d35cfaa 100644
--- a/PLUGINS/src/dvbhddevice/menu.c
+++ b/PLUGINS/src/dvbhddevice/menu.c
@@ -13,7 +13,7 @@ cHdffMenu::cHdffMenu(HDFF::cHdffCmdIf * pHdffCmdIf)
 {
     mVideoConversionItem = new cOsdItem("", osUnknown, false);
     Add(mVideoConversionItem);
-    SetHelp(tr("Video Conversion"), tr("TV on"));
+    SetHelp(tr("Video Conversion"), tr("TV on"), tr("TV off"));
     SetVideoConversion();
 }
 
@@ -38,6 +38,11 @@ eOSState cHdffMenu::ProcessKey(eKeys key)
                 state = osEnd;
                 break;
 
+            case kYellow:
+                mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
+                state = osEnd;
+                break;
+
             case kOk:
                 state = osEnd;
                 break;
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index f884567da..34b19a7df 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-11-13 20:08+0100\n"
+"POT-Creation-Date: 2013-08-23 12:10+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Christoph Haubrich\n"
 "Language-Team: <see README>\n"
@@ -25,6 +25,9 @@ msgstr "Bildanpassung"
 msgid "TV on"
 msgstr "TV ein"
 
+msgid "TV off"
+msgstr "TV aus"
+
 msgid "Automatic"
 msgstr "automatisch"
 
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 7d32953e1..9bd9a393b 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-11-13 20:08+0100\n"
+"POT-Creation-Date: 2013-08-23 12:10+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -25,6 +25,9 @@ msgstr "Näyttömuoto"
 msgid "TV on"
 msgstr "TV päälle"
 
+msgid "TV off"
+msgstr ""
+
 msgid "Automatic"
 msgstr "automaattinen"
 
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index be712b214..2d895c645 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-11-13 20:08+0100\n"
+"POT-Creation-Date: 2013-08-23 12:10+0200\n"
 "PO-Revision-Date: 2013-02-18 23:42+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
@@ -29,6 +29,9 @@ msgstr "Conversione video"
 msgid "TV on"
 msgstr "TV accesa"
 
+msgid "TV off"
+msgstr ""
+
 msgid "Automatic"
 msgstr "Automatica"
 
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 4dd75d2cc..cb6753ab0 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -45,3 +45,8 @@ VDR Plugin 'dvbsddevice' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2013-08-22: Version 2.0.1
+
+- Fixed handling the -o option (short form of --outputonly; problem reported by
+  Mario Edelmann).
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index f7e73b2ce..5a4635ebc 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.20 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index cdc078362..3f57f23b9 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.10 2013/03/31 09:30:18 kls Exp $
+ * $Id: dvbsddevice.c 3.1 2013/08/22 08:20:18 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.0.1";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
@@ -48,7 +48,7 @@ bool cPluginDvbsddevice::ProcessArgs(int argc, char *argv[])
      };
 
   int c;
-  while ((c = getopt_long(argc, argv, "", long_options, NULL)) != -1) {
+  while ((c = getopt_long(argc, argv, "o", long_options, NULL)) != -1) {
         switch (c) {
           case 'o': probe->SetOutputOnly(true);
                     break;
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 4e98cddaa..02e63068e 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.35 2013/02/17 13:16:18 kls Exp $
+ * $Id: dvbsdffdevice.c 3.0 2013/02/17 13:16:18 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index bbf2ec210..10289e9a0 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 2.16 2013/02/17 13:16:29 kls Exp $
+ * $Id: dvbsdffdevice.h 3.0 2013/02/17 13:16:29 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.c b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
index 46c65e05a..1a8caf899 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffosd.c 2.3 2011/04/17 12:55:09 kls Exp $
+ * $Id: dvbsdffosd.c 3.0 2011/04/17 12:55:09 kls Exp $
  */
 
 #include "dvbsdffosd.h"
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.h b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
index bf1234382..b83220878 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffosd.h 2.2 2012/12/03 13:43:55 kls Exp $
+ * $Id: dvbsdffosd.h 3.0 2012/12/03 13:43:55 kls Exp $
  */
 
 #ifndef __DVBSDFFODF_H
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 6190e62e9..31b7cea46 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.13 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index 1aef2a7af..2715ce73b 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 1.4 2013/03/31 09:30:18 kls Exp $
+ * $Id: epgtableid0.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/epg.h>
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 4bdd5c918..a31268184 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 21f938369..b0b4ff77d 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.6 2013/03/31 09:30:18 kls Exp $
+ * $Id: hello.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 9b7e2c15d..65b2a48cb 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.16 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index f88f7766b..8435a86c3 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.12 2013/03/31 09:30:18 kls Exp $
+ * $Id: osddemo.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/osd.h>
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index a9995d738..4b1db67e8 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -87,3 +87,7 @@ VDR Plugin 'pictures' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2013-07-01:
+
+- Added option -x to pic2mpg.
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 3081e27d3..8810368da 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index 8c124b5d5..ce2a3e2b1 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.c 2.1 2012/02/17 14:00:28 kls Exp $
+ * $Id: entry.c 3.0 2012/02/17 14:00:28 kls Exp $
  */
 
 #include "entry.h"
diff --git a/PLUGINS/src/pictures/entry.h b/PLUGINS/src/pictures/entry.h
index 60b777374..9de4dd3a9 100644
--- a/PLUGINS/src/pictures/entry.h
+++ b/PLUGINS/src/pictures/entry.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.h 2.0 2008/01/06 12:30:50 kls Exp $
+ * $Id: entry.h 3.0 2008/01/06 12:30:50 kls Exp $
  */
 
 #ifndef _ENTRY_H
diff --git a/PLUGINS/src/pictures/menu.c b/PLUGINS/src/pictures/menu.c
index 8c51d5268..567f9e7b4 100644
--- a/PLUGINS/src/pictures/menu.c
+++ b/PLUGINS/src/pictures/menu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: menu.c 2.0 2008/01/13 11:35:18 kls Exp $
+ * $Id: menu.c 3.0 2008/01/13 11:35:18 kls Exp $
  */
 
 #include "menu.h"
diff --git a/PLUGINS/src/pictures/menu.h b/PLUGINS/src/pictures/menu.h
index 9090fd0ad..585b0d579 100644
--- a/PLUGINS/src/pictures/menu.h
+++ b/PLUGINS/src/pictures/menu.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: menu.h 2.0 2008/01/12 11:22:52 kls Exp $
+ * $Id: menu.h 3.0 2008/01/12 11:22:52 kls Exp $
  */
 
 #ifndef _MENU_H
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 2ba8de782..8bb6c2e56 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 2.5 2013/02/17 13:17:13 kls Exp $
+# $Id: pic2mpg 3.1 2013/07/01 08:33:38 kls Exp $
 
 use File::Path;
 use File::Spec;
@@ -23,9 +23,10 @@ Options: -f             Force conversion
          -o percent     overscan in percent
          -s size        Screen size (WIDTHxHEIGHT, default is 1920x1080)
          -v num         Verbose (0=none, 1=list files, 2=detailed)
+         -x dir[,...]   eXclude the given directories
 };
 
-getopts("fho:s:v:") || die $Usage;
+getopts("fho:s:v:x:") || die $Usage;
 
 die $Usage if $opt_h;
 
@@ -33,6 +34,7 @@ $Force     = $opt_f;
 $Overscan  = $opt_o || 0;
 $Size      = $opt_s || "1920x1080";
 $Verbose   = $opt_v;
+@Exclude   = split(',', $opt_x || "");
 
 $ListFiles = $Verbose >= 1;
 $Detailed  = $Verbose >= 2;
@@ -85,7 +87,11 @@ chdir($PICDIR) || die "$PICDIR: $!\n";
 @Pictures = `find -type f | sort`;
 chomp(@Pictures);
 
+PIC:
 for $pic (@Pictures) {
+    for (@Exclude) {
+        next PIC if ($pic =~ /\/$_\//);
+        }
     my $mpg = "$MPGDIR/$pic.mpg";
     if ($Force || !-e $mpg || -M $mpg > -M $pic) {
        (my $dir = $mpg) =~ s/\/[^\/]*$//;
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 7a46a5f31..77c2eb070 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $
+ * $Id: pictures.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index 6048d4cb1..f2e4e5feb 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 2.2 2012/04/28 11:58:15 kls Exp $
+ * $Id: player.c 3.0 2012/04/28 11:58:15 kls Exp $
  */
 
 #include "player.h"
diff --git a/PLUGINS/src/pictures/player.h b/PLUGINS/src/pictures/player.h
index 7a0b401f8..cf18d3555 100644
--- a/PLUGINS/src/pictures/player.h
+++ b/PLUGINS/src/pictures/player.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.h 2.1 2012/04/28 11:56:01 kls Exp $
+ * $Id: player.h 3.0 2012/04/28 11:56:01 kls Exp $
  */
 
 #ifndef _PLAYER_H
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index 3dbecdd05..f56236a37 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.13 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index 17b538a28..d7a83e752 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 1.5 2013/03/31 09:30:18 kls Exp $
+ * $Id: rcu.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index e5ba5f535..ec4adcdb4 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.14 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index eb671acc1..5f0c83c73 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 2.4 2013/03/31 09:30:18 kls Exp $
+ * $Id: svccli.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <stdlib.h>
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 252a4a2ca..12a12725b 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 2.4 2013/03/31 09:30:18 kls Exp $
+ * $Id: svcsvr.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <stdlib.h>
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index fa0ce41e0..d2a4e47e1 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 8a4da9657..4b59df654 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
+ * $Id: skincurses.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <ncurses.h>
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 8f6e26f6e..c719e29a2 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index e9e3ae7df..5c81faae7 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 2.4 2013/03/31 09:30:18 kls Exp $
+ * $Id: status.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 2e391409e..cdae2d16b 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 2.15 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index a1a276635..ac9ae4ca1 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 2.3 2013/03/31 09:30:18 kls Exp $
+ * $Id: svdrpdemo.c 3.0 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
diff --git a/audio.c b/audio.c
index abffa3ab3..ebb98ed56 100644
--- a/audio.c
+++ b/audio.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 2.2 2010/05/16 13:30:11 kls Exp $
+ * $Id: audio.c 3.0 2010/05/16 13:30:11 kls Exp $
  */
 
 #include "audio.h"
diff --git a/audio.h b/audio.h
index f99a84ae0..37d0b5165 100644
--- a/audio.h
+++ b/audio.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.h 2.1 2008/07/06 11:39:21 kls Exp $
+ * $Id: audio.h 3.0 2008/07/06 11:39:21 kls Exp $
  */
 
 #ifndef __AUDIO_H
diff --git a/channels.c b/channels.c
index 4c04608bb..c205f84f7 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 2.24 2012/07/14 12:34:47 kls Exp $
+ * $Id: channels.c 3.0 2012/07/14 12:34:47 kls Exp $
  */
 
 #include "channels.h"
diff --git a/channels.h b/channels.h
index 815cb4795..3f9867b87 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 2.16 2012/06/17 11:21:33 kls Exp $
+ * $Id: channels.h 3.0 2012/06/17 11:21:33 kls Exp $
  */
 
 #ifndef __CHANNELS_H
diff --git a/ci.c b/ci.c
index 9a4a82954..ba0c3443d 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 2.12 2013/02/17 13:17:28 kls Exp $
+ * $Id: ci.c 3.0 2013/02/17 13:17:28 kls Exp $
  */
 
 #include "ci.h"
diff --git a/ci.h b/ci.h
index 74e027044..4fe44c7a9 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 2.2 2012/02/29 10:24:27 kls Exp $
+ * $Id: ci.h 3.0 2012/02/29 10:24:27 kls Exp $
  */
 
 #ifndef __CI_H
diff --git a/config.c b/config.c
index 7a153cb14..591d2ceb5 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 2.38 2013/03/18 08:57:50 kls Exp $
+ * $Id: config.c 3.1 2013/05/23 12:41:06 kls Exp $
  */
 
 #include "config.h"
@@ -389,6 +389,12 @@ cSetup::cSetup(void)
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
   DiSEqC = 0;
+  UsePositioner = 0;
+  SiteLat = 0;
+  SiteLon = 0;
+  PositionerSpeed = 15;
+  PositionerSwing = 65;
+  PositionerLastLon = 0;
   SetSystemTime = 0;
   TimeSource = 0;
   TimeTransponder = 0;
@@ -594,6 +600,12 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
   else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
   else if (!strcasecmp(Name, "DiSEqC"))              DiSEqC             = atoi(Value);
+  else if (!strcasecmp(Name, "UsePositioner"))       UsePositioner      = atoi(Value);
+  else if (!strcasecmp(Name, "SiteLat"))             SiteLat            = atoi(Value);
+  else if (!strcasecmp(Name, "SiteLon"))             SiteLon            = atoi(Value);
+  else if (!strcasecmp(Name, "PositionerSpeed"))     PositionerSpeed    = atoi(Value);
+  else if (!strcasecmp(Name, "PositionerSwing"))     PositionerSwing    = atoi(Value);
+  else if (!strcasecmp(Name, "PositionerLastLon"))   PositionerLastLon  = atoi(Value);
   else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
   else if (!strcasecmp(Name, "TimeSource"))          TimeSource         = cSource::FromString(Value);
   else if (!strcasecmp(Name, "TimeTransponder"))     TimeTransponder    = atoi(Value);
@@ -703,6 +715,12 @@ bool cSetup::Save(void)
   Store("LnbFrequLo",         LnbFrequLo);
   Store("LnbFrequHi",         LnbFrequHi);
   Store("DiSEqC",             DiSEqC);
+  Store("UsePositioner",      UsePositioner);
+  Store("SiteLat",            SiteLat);
+  Store("SiteLon",            SiteLon);
+  Store("PositionerSpeed",    PositionerSpeed);
+  Store("PositionerSwing",    PositionerSwing);
+  Store("PositionerLastLon",  PositionerLastLon);
   Store("SetSystemTime",      SetSystemTime);
   Store("TimeSource",         cSource::ToString(TimeSource));
   Store("TimeTransponder",    TimeTransponder);
diff --git a/config.h b/config.h
index d99e2d171..6d1c0da43 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.76.1.2 2013/04/27 10:18:08 kls Exp $
+ * $Id: config.h 3.2 2013/05/23 12:40:19 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.0.2"
-#define VDRVERSNUM   20002  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.1"
+#define VDRVERSNUM   20101  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.0.0"
-#define APIVERSNUM   20000  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.1"
+#define APIVERSNUM   20101  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -266,6 +266,12 @@ class cSetup : public cConfig<cSetupLine> {
   int LnbFrequLo;
   int LnbFrequHi;
   int DiSEqC;
+  int UsePositioner;
+  int SiteLat;
+  int SiteLon;
+  int PositionerSpeed;
+  int PositionerSwing;
+  int PositionerLastLon;
   int SetSystemTime;
   int TimeSource;
   int TimeTransponder;
diff --git a/cutter.c b/cutter.c
index 6e5e662e1..5d007c484 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.25.1.1 2013/05/02 09:21:18 kls Exp $
+ * $Id: cutter.c 3.2 2013/08/21 13:15:24 kls Exp $
  */
 
 #include "cutter.h"
@@ -556,6 +556,8 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
       bool Independent;
       int Length;
       if (LoadFrame(Index, Buffer, Independent, Length)) {
+         // Make sure there is enough disk space:
+         AssertFreeDiskSpace(-1);
          bool CutIn = !SeamlessBegin && Index == BeginIndex;
          bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
          bool DeletedFrame = false;
@@ -608,8 +610,6 @@ void cCuttingThread::Action(void)
               cCondWait::SleepMs(100);
               continue;
               }
-           // Make sure there is enough disk space:
-           AssertFreeDiskSpace(-1);
            // Determine the actual begin and end marks, skipping any marks at the same position:
            cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
            // Process the current sequence:
diff --git a/cutter.h b/cutter.h
index f48ae3fca..6821fd40d 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 2.3 2012/02/16 12:05:33 kls Exp $
+ * $Id: cutter.h 3.0 2012/02/16 12:05:33 kls Exp $
  */
 
 #ifndef __CUTTER_H
diff --git a/device.c b/device.c
index e0fe84a48..a5afcfcc5 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.74.1.1 2013/04/05 10:47:38 kls Exp $
+ * $Id: device.c 3.3 2013/08/22 10:28:55 kls Exp $
  */
 
 #include "device.h"
@@ -118,6 +118,8 @@ cDevice::~cDevice()
   DetachAllReceivers();
   delete liveSubtitle;
   delete dvbSubtitleConverter;
+  if (this == primaryDevice)
+     primaryDevice = NULL;
 }
 
 bool cDevice::WaitForAllDevicesReady(int Timeout)
@@ -362,7 +364,6 @@ void cDevice::SetCamSlot(cCamSlot *CamSlot)
 void cDevice::Shutdown(void)
 {
   deviceHooks.Clear();
-  primaryDevice = NULL;
   for (int i = 0; i < numDevices; i++) {
       delete device[i];
       device[i] = NULL;
@@ -665,6 +666,11 @@ int cDevice::NumProvidedSystems(void) const
   return 0;
 }
 
+const cPositioner *cDevice::Positioner(void) const
+{
+  return NULL;
+}
+
 int cDevice::SignalStrength(void) const
 {
   return -1;
diff --git a/device.h b/device.h
index fd010d412..d4d50d400 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.47 2013/02/16 15:20:01 kls Exp $
+ * $Id: device.h 3.2 2013/08/22 11:57:34 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -17,6 +17,7 @@
 #include "filter.h"
 #include "nit.h"
 #include "pat.h"
+#include "positioner.h"
 #include "remux.h"
 #include "ringbuffer.h"
 #include "sdt.h"
@@ -196,7 +197,7 @@ class cDevice : public cThread {
          ///< A derived class must call the MakePrimaryDevice() function of its
          ///< base class.
 public:
-  bool IsPrimaryDevice(void) const { return this == primaryDevice; }
+  bool IsPrimaryDevice(void) const { return this == primaryDevice && HasDecoder(); }
   int CardIndex(void) const { return cardIndex; }
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
@@ -273,6 +274,11 @@ class cDevice : public cThread {
          ///< actually provide channels must implement this function.
          ///< The result of this function is used when selecting a device, in order
          ///< to avoid devices that provide more than one system.
+  virtual const cPositioner *Positioner(void) const;
+         ///< Returns a pointer to the positioner (if any) this device has used to
+         ///< move the satellite dish to the requested position (only applies to DVB-S
+         ///< devices). If no positioner is involved, or this is not a DVB-S device,
+         ///< NULL will be returned.
   virtual int SignalStrength(void) const;
          ///< Returns the "strength" of the currently received signal.
          ///< This is a value in the range 0 (no signal at all) through
diff --git a/diseqc.c b/diseqc.c
index 97da936c2..86ee61fef 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,24 +4,37 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 2.9.1.1 2013/05/02 09:33:12 kls Exp $
+ * $Id: diseqc.c 3.2 2013/08/21 09:26:11 kls Exp $
  */
 
 #include "diseqc.h"
 #include <ctype.h>
+#include <linux/dvb/frontend.h>
+#include <sys/ioctl.h>
 #include "sources.h"
 #include "thread.h"
 
-static bool ParseDeviceNumbers(const char *s, int &Devices)
+#define ALL_DEVICES (~0) // all bits set to '1'
+#define MAX_DEVICES 32   // each bit in a 32-bit integer represents one device
+
+static int CurrentDevices = 0;
+
+static bool IsDeviceNumbers(const char *s)
+{
+  return *s && s[strlen(s) - 1] == ':';
+}
+
+static bool ParseDeviceNumbers(const char *s)
 {
-  if (*s && s[strlen(s) - 1] == ':') {
+  if (IsDeviceNumbers(s)) {
+     CurrentDevices = 0;
      const char *p = s;
      while (*p && *p != ':') {
            char *t = NULL;
            int d = strtol(p, &t, 10);
            p = t;
-           if (0 < d && d < 31)
-              Devices |= (1 << d - 1);
+           if (0 < d && d <= MAX_DEVICES)
+              CurrentDevices |= (1 << d - 1);
            else {
               esyslog("ERROR: invalid device number %d in '%s'", d, s);
               return false;
@@ -31,6 +44,107 @@ static bool ParseDeviceNumbers(const char *s, int &Devices)
   return true;
 }
 
+// --- cDiseqcPositioner -----------------------------------------------------
+
+// See http://www.eutelsat.com/files/live/sites/eutelsatv2/files/contributed/satellites/pdf/Diseqc/associated%20docs/positioner_appli_notice.pdf
+
+cDiseqcPositioner::cDiseqcPositioner(void)
+{
+  SetCapabilities(pcCanDrive |
+                  pcCanStep |
+                  pcCanHalt |
+                  pcCanSetLimits |
+                  pcCanDisableLimits |
+                  pcCanEnableLimits |
+                  pcCanStorePosition |
+                  pcCanRecalcPositions |
+                  pcCanGotoPosition |
+                  pcCanGotoAngle
+                  );
+}
+
+void cDiseqcPositioner::SendDiseqc(uint8_t *Codes, int NumCodes)
+{
+  struct dvb_diseqc_master_cmd cmd;
+  NumCodes = min(NumCodes, int(sizeof(cmd.msg) - 2));
+  cmd.msg_len = 0;
+  cmd.msg[cmd.msg_len++] = 0xE0;
+  cmd.msg[cmd.msg_len++] = 0x31;
+  for (int i = 0; i < NumCodes; i++)
+      cmd.msg[cmd.msg_len++] = Codes[i];
+  CHECK(ioctl(Frontend(), FE_DISEQC_SEND_MASTER_CMD, &cmd));
+}
+
+void cDiseqcPositioner::Drive(ePositionerDirection Direction)
+{
+  uint8_t Code[] = { uint8_t(Direction == pdLeft ? 0x68 : 0x69), 0x00 };
+  SendDiseqc(Code, 2);
+}
+
+void cDiseqcPositioner::Step(ePositionerDirection Direction, uint Steps)
+{
+  if (Steps == 0)
+     return;
+  uint8_t Code[] = { uint8_t(Direction == pdLeft ? 0x68 : 0x69), 0xFF };
+  Code[1] -= min(Steps, uint(0x7F)) - 1;
+  SendDiseqc(Code, 2);
+}
+
+void cDiseqcPositioner::Halt(void)
+{
+  uint8_t Code[] = { 0x60 };
+  SendDiseqc(Code, 1);
+}
+
+void cDiseqcPositioner::SetLimit(ePositionerDirection Direction)
+{
+  uint8_t Code[] = { uint8_t(Direction == pdLeft ? 0x66 : 0x67) };
+  SendDiseqc(Code, 1);
+}
+
+void cDiseqcPositioner::DisableLimits(void)
+{
+  uint8_t Code[] = { 0x63 };
+  SendDiseqc(Code, 1);
+}
+
+void cDiseqcPositioner::EnableLimits(void)
+{
+  uint8_t Code[] = { 0x6A, 0x00 };
+  SendDiseqc(Code, 2);
+}
+
+void cDiseqcPositioner::StorePosition(uint Number)
+{
+  uint8_t Code[] = { 0x6A, uint8_t(Number) };
+  SendDiseqc(Code, 2);
+}
+
+void cDiseqcPositioner::RecalcPositions(uint Number)
+{
+  uint8_t Code[] = { 0x6F, uint8_t(Number), 0x00, 0x00 };
+  SendDiseqc(Code, 4);
+}
+
+void cDiseqcPositioner::GotoPosition(uint Number, int Longitude)
+{
+  uint8_t Code[] = { 0x6B, uint8_t(Number) };
+  SendDiseqc(Code, 2);
+  cPositioner::GotoPosition(Number, Longitude);
+}
+
+void cDiseqcPositioner::GotoAngle(int Longitude)
+{
+  uint8_t Code[] = { 0x6E, 0x00, 0x00 };
+  int Angle = CalcHourAngle(Longitude);
+  int a = abs(Angle);
+  Code[1] = a / 10 / 16;
+  Code[2] = a / 10 % 16 * 16 + a % 10 * 16 / 10;
+  Code[1] |= (Angle < 0) ? 0xE0 : 0xD0;
+  SendDiseqc(Code, 3);
+  cPositioner::GotoAngle(Longitude);
+}
+
 // --- cScr ------------------------------------------------------------------
 
 cScr::cScr(void)
@@ -44,10 +158,9 @@ cScr::cScr(void)
 
 bool cScr::Parse(const char *s)
 {
-  if (!ParseDeviceNumbers(s, devices))
-     return false;
-  if (devices)
-     return true;
+  if (IsDeviceNumbers(s))
+     return ParseDeviceNumbers(s);
+  devices = CurrentDevices;
   bool result = false;
   int fields = sscanf(s, "%d %u %d", &channel, &userBand, &pin);
   if (fields == 2 || fields == 3) {
@@ -68,16 +181,17 @@ bool cScr::Parse(const char *s)
 
 cScrs Scrs;
 
+bool cScrs::Load(const char *FileName, bool AllowComments, bool MustExist)
+{
+  CurrentDevices = ALL_DEVICES;
+  return cConfig<cScr>::Load(FileName, AllowComments, MustExist);
+}
+
 cScr *cScrs::GetUnused(int Device)
 {
   cMutexLock MutexLock(&mutex);
-  int Devices = 0;
   for (cScr *p = First(); p; p = Next(p)) {
-      if (p->Devices()) {
-         Devices = p->Devices();
-         continue;
-         }
-      if (Devices && !(Devices & (1 << Device - 1)))
+      if (!IsBitSet(p->Devices(), Device - 1))
          continue;
       if (!p->Used()) {
         p->SetUsed(true);
@@ -96,6 +210,7 @@ cDiseqc::cDiseqc(void)
   slof = 0;
   polarization = 0;
   lof = 0;
+  position = -1;
   scrBank = -1;
   commands = NULL;
   parsing = false;
@@ -108,10 +223,9 @@ cDiseqc::~cDiseqc()
 
 bool cDiseqc::Parse(const char *s)
 {
-  if (!ParseDeviceNumbers(s, devices))
-     return false;
-  if (devices)
-     return true;
+  if (IsDeviceNumbers(s))
+     return ParseDeviceNumbers(s);
+  devices = CurrentDevices;
   bool result = false;
   char *sourcebuf = NULL;
   int fields = sscanf(s, "%a[^ ] %d %c %d %a[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
@@ -178,6 +292,28 @@ const char *cDiseqc::Wait(const char *s) const
   return NULL;
 }
 
+const char *cDiseqc::GetPosition(const char *s) const
+{
+  if (!*s || !isdigit(*s)) {
+     position = 0;
+     return s;
+     }
+  char *p = NULL;
+  errno = 0;
+  int n = strtol(s, &p, 10);
+  if (!errno && p != s && n >= 0 && n < 0xFF) {
+     if (parsing) {
+        if (position < 0)
+           position = n;
+        else
+           esyslog("ERROR: more than one position in '%s'", s - 1);
+        }
+     return p;
+     }
+  esyslog("ERROR: invalid satellite position in '%s'", s - 1);
+  return NULL;
+}
+
 const char *cDiseqc::GetScrBank(const char *s) const
 {
   char *p = NULL;
@@ -250,8 +386,12 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Code
           case 'V': return daVoltage18;
           case 'A': return daMiniA;
           case 'B': return daMiniB;
-          case 'W': *CurrentAction = Wait(*CurrentAction); break;
-          case 'S': *CurrentAction = GetScrBank(*CurrentAction); break;
+          case 'W': *CurrentAction = Wait(*CurrentAction); return daWait;
+          case 'P': *CurrentAction = GetPosition(*CurrentAction);
+                    if (Setup.UsePositioner)
+                       return position ? daPositionN : daPositionA;
+                    break;
+          case 'S': *CurrentAction = GetScrBank(*CurrentAction); return daScr;
           case '[': *CurrentAction = GetCodes(*CurrentAction, Codes, MaxCodes);
                     if (*CurrentAction) {
                        if (Scr && Frequency) {
@@ -261,7 +401,8 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Code
                        return daCodes;
                        }
                     break;
-          default: return daNone;
+          default:  esyslog("ERROR: unknown diseqc code '%c'", *(*CurrentAction - 1));
+                    return daNone;
           }
         }
   return daNone;
@@ -271,17 +412,18 @@ cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Code
 
 cDiseqcs Diseqcs;
 
+bool cDiseqcs::Load(const char *FileName, bool AllowComments, bool MustExist)
+{
+  CurrentDevices = ALL_DEVICES;
+  return cConfig<cDiseqc>::Load(FileName, AllowComments, MustExist);
+}
+
 const cDiseqc *cDiseqcs::Get(int Device, int Source, int Frequency, char Polarization, const cScr **Scr) const
 {
-  int Devices = 0;
   for (const cDiseqc *p = First(); p; p = Next(p)) {
-      if (p->Devices()) {
-         Devices = p->Devices();
-         continue;
-         }
-      if (Devices && !(Devices & (1 << Device - 1)))
+      if (!IsBitSet(p->Devices(), Device - 1))
          continue;
-      if (p->Source() == Source && p->Slof() > Frequency && p->Polarization() == toupper(Polarization)) {
+      if (cSource::Matches(p->Source(), Source) && p->Slof() > Frequency && p->Polarization() == toupper(Polarization)) {
          if (p->IsScr() && Scr && !*Scr) {
             *Scr = Scrs.GetUnused(Device);
             if (*Scr)
diff --git a/diseqc.conf b/diseqc.conf
index 2895c43e9..4ae1cfe32 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -5,6 +5,9 @@
 # satellite slof polarization lof command...
 #
 # satellite:      one of the 'S' codes defined in sources.conf
+#                 the special value 'S360E' means that this entry uses a positioner
+#                 (command 'P') that can move the dish to any requested satellite
+#                 position withing its range
 # slof:           switch frequency of LNB; the first entry with
 #                 an slof greater than the actual transponder
 #                 frequency will be used
@@ -18,7 +21,9 @@
 #   V         voltage high (18V)
 #   A         mini A
 #   B         mini B
-#   Sn        Satellite channel routing code sequence for bank n follows
+#   Pn        use positioner to move dish to satellite position n (or to the
+#             satellite's orbital position, if no position number is given)
+#   Sn        satellite channel routing code sequence for bank n follows
 #   Wnn       wait nn milliseconds (nn may be any positive integer number)
 #   [xx ...]  hex code sequence (max. 6)
 #
@@ -88,3 +93,10 @@ S13.0E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S13.0E  99999 V 10600  t V W10 S5 [E0 10 5A 00 00] W10 v
 # S13.0E  11700 H  9750  t V W10 S6 [E0 10 5A 00 00] W10 v
 # S13.0E  99999 H 10600  t V W10 S7 [E0 10 5A 00 00] W10 v
+#
+# Positioner for steerable dish:
+#
+# S360E  11700 V  9750  t V W20 P W20 t v
+# S360E  99999 V 10600  t V W20 P W20 T v
+# S360E  11700 H  9750  t V W20 P W20 t V
+# S360E  99999 H 10600  t V W20 P W20 T V
diff --git a/diseqc.h b/diseqc.h
index 6e9058c22..eef36a6aa 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,15 +4,33 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 2.5 2011/09/17 13:15:17 kls Exp $
+ * $Id: diseqc.h 3.1 2013/06/12 11:52:17 kls Exp $
  */
 
 #ifndef __DISEQC_H
 #define __DISEQC_H
 
 #include "config.h"
+#include "positioner.h"
 #include "thread.h"
 
+class cDiseqcPositioner : public cPositioner {
+private:
+  void SendDiseqc(uint8_t *Codes, int NumCodes);
+public:
+  cDiseqcPositioner(void);
+  virtual void Drive(ePositionerDirection Direction);
+  virtual void Step(ePositionerDirection Direction, uint Steps = 1);
+  virtual void Halt(void);
+  virtual void SetLimit(ePositionerDirection Direction);
+  virtual void DisableLimits(void);
+  virtual void EnableLimits(void);
+  virtual void StorePosition(uint Number);
+  virtual void RecalcPositions(uint Number);
+  virtual void GotoPosition(uint Number, int Longitude);
+  virtual void GotoAngle(int Longitude);
+  };
+
 class cScr : public cListObject {
 private:
   int devices;
@@ -35,6 +53,7 @@ class cScrs : public cConfig<cScr> {
 private:
   cMutex mutex;
 public:
+  bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
   cScr *GetUnused(int Device);
   };
 
@@ -50,8 +69,11 @@ class cDiseqc : public cListObject {
     daVoltage18,
     daMiniA,
     daMiniB,
+    daPositionN,
+    daPositionA,
     daScr,
     daCodes,
+    daWait,
     };
   enum { MaxDiseqcCodes = 6 };
 private:
@@ -60,12 +82,14 @@ class cDiseqc : public cListObject {
   int slof;
   char polarization;
   int lof;
+  mutable int position;
   mutable int scrBank;
   char *commands;
   bool parsing;
   uint SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const;
   int SetScrPin(const cScr *Scr, uint8_t *Codes) const;
   const char *Wait(const char *s) const;
+  const char *GetPosition(const char *s) const;
   const char *GetScrBank(const char *s) const;
   const char *GetCodes(const char *s, uchar *Codes = NULL, uint8_t *MaxCodes = NULL) const;
 public:
@@ -89,16 +113,31 @@ class cDiseqc : public cListObject {
       ///< Frequency must be the frequency the tuner will be tuned to, and will be
       ///< set to the proper SCR frequency upon return (if SCR is used).
   int Devices(void) const { return devices; }
+      ///< Returns an integer where each bit represents one of the system's devices.
+      ///< If a bit is set, this DiSEqC sequence applies to the corresponding device.
   int Source(void) const { return source; }
+      ///< Returns the satellite source this DiSEqC sequence applies to.
   int Slof(void) const { return slof; }
+      ///< Returns the switch frequency of the LNB this DiSEqC sequence applies to.
   char Polarization(void) const { return polarization; }
+      ///< Returns the signal polarization this DiSEqC sequence applies to.
   int Lof(void) const { return lof; }
-  bool IsScr() const { return scrBank >= 0; }
+      ///< Returns the local oscillator frequency of the LNB this DiSEqC sequence applies to.
+  int Position(void) const { return position; }
+      ///< Indicates which positioning mode to use in order to move the dish to a given
+      ///< satellite position. -1 means "no positioning" (i.e. fixed dish); 0 means the
+      ///< positioner can be moved to any arbitrary satellite position (within its
+      ///< limits); and a positive number means "move the dish to the position stored
+      ///< under the given number".
+  bool IsScr(void) const { return scrBank >= 0; }
+      ///< Returns true if this DiSEqC sequence uses Satellite Channel Routing.
   const char *Commands(void) const { return commands; }
+      ///< Returns a pointer to the actual commands of this DiSEqC sequence.
   };
 
 class cDiseqcs : public cConfig<cDiseqc> {
 public:
+  bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
   const cDiseqc *Get(int Device, int Source, int Frequency, char Polarization, const cScr **Scr) const;
       ///< Selects a DiSEqC entry suitable for the given Device and tuning parameters.
       ///< If this DiSEqC entry requires SCR and the given *Scr is NULL
diff --git a/dvbci.c b/dvbci.c
index 5289bbde4..38668a65d 100644
--- a/dvbci.c
+++ b/dvbci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.c 2.0 2007/01/04 12:49:10 kls Exp $
+ * $Id: dvbci.c 3.0 2007/01/04 12:49:10 kls Exp $
  */
 
 #include "dvbci.h"
diff --git a/dvbci.h b/dvbci.h
index adbe40d39..f74703c3a 100644
--- a/dvbci.h
+++ b/dvbci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.h 2.0 2006/11/26 11:19:42 kls Exp $
+ * $Id: dvbci.h 3.0 2006/11/26 11:19:42 kls Exp $
  */
 
 #ifndef __DVBCI_H
diff --git a/dvbdevice.c b/dvbdevice.c
index 2e1992565..c61fb1721 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.88.1.1 2013/04/09 13:42:26 kls Exp $
+ * $Id: dvbdevice.c 3.3 2013/08/23 09:19:43 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -284,7 +284,7 @@ bool cDvbTransponderParameters::Parse(const char *s)
 class cDvbTuner : public cThread {
 private:
   static cMutex bondMutex;
-  enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
+  enum eTunerStatus { tsIdle, tsSet, tsPositioning, tsTuned, tsLocked };
   int frontendType;
   const cDvbDevice *device;
   int fd_frontend;
@@ -295,6 +295,9 @@ class cDvbTuner : public cThread {
   time_t lastTimeoutReport;
   cChannel channel;
   const cDiseqc *lastDiseqc;
+  int diseqcOffset;
+  int lastSource;
+  cPositioner *positioner;
   const cScr *scr;
   bool lnbPowerTurnedOn;
   eTunerStatus tunerStatus;
@@ -309,6 +312,7 @@ class cDvbTuner : public cThread {
   bool IsBondedMaster(void) const { return !bondedTuner || bondedMaster; }
   void ClearEventQueue(void) const;
   bool GetFrontendStatus(fe_status_t &Status) const;
+  cPositioner *GetPositioner(void);
   void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
   void ResetToneAndVoltage(void);
   bool SetFrontend(void);
@@ -325,6 +329,7 @@ class cDvbTuner : public cThread {
   bool IsTunedTo(const cChannel *Channel) const;
   void SetChannel(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
+  const cPositioner *Positioner(void) const { return positioner; }
   int GetSignalStrength(void) const;
   int GetSignalQuality(void) const;
   };
@@ -343,6 +348,9 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int
   lockTimeout = 0;
   lastTimeoutReport = 0;
   lastDiseqc = NULL;
+  diseqcOffset = 0;
+  lastSource = 0;
+  positioner = NULL;
   scr = NULL;
   lnbPowerTurnedOn = false;
   tunerStatus = tsIdle;
@@ -482,6 +490,7 @@ void cDvbTuner::SetChannel(const cChannel *Channel)
      cMutexLock MutexLock(&mutex);
      if (!IsTunedTo(Channel))
         tunerStatus = tsSet;
+     diseqcOffset = 0;
      channel = *Channel;
      lastTimeoutReport = 0;
      newSet.Broadcast();
@@ -662,6 +671,15 @@ static unsigned int FrequencyToHz(unsigned int f)
   return f;
 }
 
+cPositioner *cDvbTuner::GetPositioner(void)
+{
+  if (!positioner) {
+     positioner = cPositioner::GetPositioner();
+     positioner->SetFrontend(fd_frontend);
+     }
+  return positioner;
+}
+
 void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
 {
   if (!lnbPowerTurnedOn) {
@@ -673,23 +691,47 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
      Mutex.Lock();
   struct dvb_diseqc_master_cmd cmd;
   const char *CurrentAction = NULL;
-  for (;;) {
+  cPositioner *Positioner = NULL;
+  bool Break = false;
+  for (int i = 0; !Break; i++) {
       cmd.msg_len = sizeof(cmd.msg);
       cDiseqc::eDiseqcActions da = Diseqc->Execute(&CurrentAction, cmd.msg, &cmd.msg_len, scr, Frequency);
-      if (da == cDiseqc::daNone)
+      if (da == cDiseqc::daNone) {
+         diseqcOffset = 0;
          break;
+         }
+      bool d = i >= diseqcOffset;
       switch (da) {
-        case cDiseqc::daToneOff:   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
-        case cDiseqc::daToneOn:    CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
-        case cDiseqc::daVoltage13: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
-        case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
-        case cDiseqc::daMiniA:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
-        case cDiseqc::daMiniB:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
-        case cDiseqc::daCodes:     CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); break;
+        case cDiseqc::daToneOff:   if (d) CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF)); break;
+        case cDiseqc::daToneOn:    if (d) CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_ON)); break;
+        case cDiseqc::daVoltage13: if (d) CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); break;
+        case cDiseqc::daVoltage18: if (d) CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
+        case cDiseqc::daMiniA:     if (d) CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
+        case cDiseqc::daMiniB:     if (d) CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
+        case cDiseqc::daCodes:     if (d) CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd)); break;
+        case cDiseqc::daPositionN: if ((Positioner = GetPositioner()) != NULL) {
+                                      if (d) {
+                                         Positioner->GotoPosition(Diseqc->Position(), cSource::Position(channel.Source()));
+                                         Break = Positioner->IsMoving();
+                                         }
+                                      }
+                                   break;
+        case cDiseqc::daPositionA: if ((Positioner = GetPositioner()) != NULL) {
+                                      if (d) {
+                                         Positioner->GotoAngle(cSource::Position(channel.Source()));
+                                         Break = Positioner->IsMoving();
+                                         }
+                                      }
+                                   break;
+        case cDiseqc::daScr:
+        case cDiseqc::daWait:      break;
         default: esyslog("ERROR: unknown diseqc command %d", da);
         }
+      if (Break)
+         diseqcOffset = i + 1;
       }
-  if (scr)
+  positioner = Positioner;
+  if (scr && !Break)
      ResetToneAndVoltage(); // makes sure we don't block the bus!
   if (Diseqc->IsScr())
      Mutex.Unlock();
@@ -697,7 +739,7 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
 
 void cDvbTuner::ResetToneAndVoltage(void)
 {
-  CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13));
+  CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, bondedTuner ? SEC_VOLTAGE_OFF : SEC_VOLTAGE_13));
   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
 }
 
@@ -752,7 +794,7 @@ bool cDvbTuner::SetFrontend(void)
      if (Setup.DiSEqC) {
         if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
            frequency -= diseqc->Lof();
-           if (diseqc != lastDiseqc || diseqc->IsScr()) {
+           if (diseqc != lastDiseqc || diseqc->IsScr() || diseqc->Position() >= 0 && channel.Source() != lastSource) {
               if (IsBondedMaster()) {
                  ExecuteDiseqc(diseqc, &frequency);
                  if (frequency == 0)
@@ -761,6 +803,7 @@ bool cDvbTuner::SetFrontend(void)
               else
                  ResetToneAndVoltage();
               lastDiseqc = diseqc;
+              lastSource = channel.Source();
               }
            }
         else {
@@ -877,15 +920,30 @@ void cDvbTuner::Action(void)
         int WaitTime = 1000;
         switch (tunerStatus) {
           case tsIdle:
-               break;
+               break; // we want the TimedWait() below!
           case tsSet:
-               tunerStatus = SetFrontend() ? tsTuned : tsIdle;
-               Timer.Set(tuneTimeout + (scr ? rand() % SCR_RANDOM_TIMEOUT : 0));
+               tunerStatus = SetFrontend() ? tsPositioning : tsIdle;
                continue;
+          case tsPositioning:
+               if (positioner) {
+                  if (positioner->IsMoving())
+                     break; // we want the TimedWait() below!
+                  else if (diseqcOffset) {
+                     lastDiseqc = NULL;
+                     tunerStatus = tsSet; // have it process the rest of the DiSEqC sequence
+                     continue;
+                     }
+                  }
+               tunerStatus = tsTuned;
+               Timer.Set(tuneTimeout + (scr ? rand() % SCR_RANDOM_TIMEOUT : 0));
+               if (positioner)
+                  continue;
+               // otherwise run directly into tsTuned...
           case tsTuned:
                if (Timer.TimedOut()) {
                   tunerStatus = tsSet;
                   lastDiseqc = NULL;
+                  lastSource = 0;
                   if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
                      isyslog("frontend %d/%d timed out while tuning to channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
@@ -893,10 +951,12 @@ void cDvbTuner::Action(void)
                   continue;
                   }
                WaitTime = 100; // allows for a quick change from tsTuned to tsLocked
+               // run into tsLocked...
           case tsLocked:
                if (Status & FE_REINIT) {
                   tunerStatus = tsSet;
                   lastDiseqc = NULL;
+                  lastSource = 0;
                   isyslog("frontend %d/%d was reinitialized", adapter, frontend);
                   lastTimeoutReport = 0;
                   continue;
@@ -1357,7 +1417,7 @@ void cDvbDevice::UnBond(void)
 bool cDvbDevice::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
 {
   cMutexLock MutexLock(&bondMutex);
-  if (bondedDevice)
+  if (bondedDevice || Positioner())
      return dvbTuner && dvbTuner->BondingOk(Channel, ConsiderOccupied);
   return true;
 }
@@ -1539,6 +1599,11 @@ int cDvbDevice::NumProvidedSystems(void) const
   return numDeliverySystems + numModulations;
 }
 
+const cPositioner *cDvbDevice::Positioner(void) const
+{
+  return dvbTuner ? dvbTuner->Positioner() : NULL;
+}
+
 int cDvbDevice::SignalStrength(void) const
 {
   return dvbTuner ? dvbTuner->GetSignalStrength() : -1;
diff --git a/dvbdevice.h b/dvbdevice.h
index 76b86655d..7a54d8cf9 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.29.1.1 2013/04/09 13:43:33 kls Exp $
+ * $Id: dvbdevice.h 3.2 2013/06/01 11:36:18 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -233,6 +233,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = IDLEPRIORITY, bool *NeedsDetachReceivers = NULL) const;
   virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
+  virtual const cPositioner *Positioner(void) const;
   virtual int SignalStrength(void) const;
   virtual int SignalQuality(void) const;
   virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
diff --git a/dvbplayer.c b/dvbplayer.c
index dc206a395..316ea9404 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 2.35 2013/03/08 13:44:19 kls Exp $
+ * $Id: dvbplayer.c 3.0 2013/03/08 13:44:19 kls Exp $
  */
 
 #include "dvbplayer.h"
diff --git a/dvbplayer.h b/dvbplayer.h
index e2f2082dd..7c75951d7 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 2.1 2012/02/19 11:40:36 kls Exp $
+ * $Id: dvbplayer.h 3.0 2012/02/19 11:40:36 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
diff --git a/dvbspu.c b/dvbspu.c
index 6b3c21625..da18d0a11 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.11 2013/02/22 15:25:16 kls Exp $
+ * $Id: dvbspu.c 3.0 2013/02/22 15:25:16 kls Exp $
  */
 
 #include "dvbspu.h"
diff --git a/dvbspu.h b/dvbspu.h
index 5c7cc0a47..9fa3947bb 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 2.6 2013/01/20 10:15:47 kls Exp $
+ * $Id: dvbspu.h 3.0 2013/01/20 10:15:47 kls Exp $
  */
 
 #ifndef __DVBSPU_H
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 9facc8601..89abc7088 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.34 2013/02/22 15:25:25 kls Exp $
+ * $Id: dvbsubtitle.c 3.0 2013/02/22 15:25:25 kls Exp $
  */
 
 #include "dvbsubtitle.h"
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index 8de9f634f..79b1d060c 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 2.7 2012/03/11 13:34:12 kls Exp $
+ * $Id: dvbsubtitle.h 3.0 2012/03/11 13:34:12 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
diff --git a/eit.c b/eit.c
index 73c4fa9b8..a3cf3413e 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 2.23 2012/12/04 11:10:10 kls Exp $
+ * $Id: eit.c 3.1 2013/08/23 10:52:27 kls Exp $
  */
 
 #include "eit.h"
@@ -46,6 +46,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
      return;
      }
 
+  EpgHandlers.BeginSegmentTransfer(channel, OnlyRunningStatus);
   bool handledExternally = EpgHandlers.HandledExternally(channel);
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
 
@@ -310,6 +311,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
      Schedules->SetModified(pSchedule);
      }
   Channels.Unlock();
+  EpgHandlers.EndSegmentTransfer(Modified, OnlyRunningStatus);
 }
 
 // --- cTDT ------------------------------------------------------------------
diff --git a/eit.h b/eit.h
index b5523728d..ec30253e0 100644
--- a/eit.h
+++ b/eit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eit.h 2.1 2010/01/03 15:28:34 kls Exp $
+ * $Id: eit.h 3.0 2010/01/03 15:28:34 kls Exp $
  */
 
 #ifndef __EIT_H
diff --git a/eitscan.c b/eitscan.c
index 027bf44c0..77f15c649 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 2.7 2012/04/07 14:39:28 kls Exp $
+ * $Id: eitscan.c 3.0 2012/04/07 14:39:28 kls Exp $
  */
 
 #include "eitscan.h"
diff --git a/eitscan.h b/eitscan.h
index 2dd24d72e..25658b6b1 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 2.1 2012/03/07 13:54:16 kls Exp $
+ * $Id: eitscan.h 3.0 2012/03/07 13:54:16 kls Exp $
  */
 
 #ifndef __EITSCAN_H
diff --git a/epg.c b/epg.c
index 5fb49ae49..e16f97806 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 2.23 2013/02/17 14:12:07 kls Exp $
+ * $Id: epg.c 3.1 2013/08/23 10:46:33 kls Exp $
  */
 
 #include "epg.h"
@@ -1537,3 +1537,19 @@ void cEpgHandlers::DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t
       }
   Schedule->DropOutdated(SegmentStart, SegmentEnd, TableID, Version);
 }
+
+void cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->BeginSegmentTransfer(Channel, OnlyRunningStatus))
+         return;
+      }
+}
+
+void cEpgHandlers::EndSegmentTransfer(bool Modified, bool OnlyRunningStatus)
+{
+  for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
+      if (eh->EndSegmentTransfer(Modified, OnlyRunningStatus))
+         return;
+      }
+}
diff --git a/epg.h b/epg.h
index 3a7df772f..65fbcbf9e 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 2.15 2012/09/24 12:53:53 kls Exp $
+ * $Id: epg.h 3.1 2013/08/23 10:50:05 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -273,6 +273,12 @@ class cEpgHandler : public cListObject {
   virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
           ///< Takes a look at all EPG events between SegmentStart and SegmentEnd and
           ///< drops outdated events.
+  virtual bool BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus) { return false; }
+          ///< Called directly after IgnoreChannel() before any other handler method is called.
+          ///< Designed to give handlers the possibility to prepare a database transaction.
+  virtual bool EndSegmentTransfer(bool Modified, bool OnlyRunningStatus) { return false; }
+          ///< Called after the segment data has been processed.
+          ///< At this point handlers should close/commit/rollback any pending database transactions.
   };
 
 class cEpgHandlers : public cList<cEpgHandler> {
@@ -295,6 +301,8 @@ class cEpgHandlers : public cList<cEpgHandler> {
   void HandleEvent(cEvent *Event);
   void SortSchedule(cSchedule *Schedule);
   void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
+  void BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus);
+  void EndSegmentTransfer(bool Modified, bool OnlyRunningStatus);
   };
 
 extern cEpgHandlers EpgHandlers;
diff --git a/epg2html b/epg2html
index 1b1a2516c..34f95215b 100755
--- a/epg2html
+++ b/epg2html
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html 2.2 2013/03/04 13:02:20 kls Exp $
+# $Id: epg2html 3.0 2013/03/04 13:02:20 kls Exp $
 
 @Index = ();
 ($Charset = $ENV{LANG}) =~ s/^[^.]*\.?(.*)/$1/;
diff --git a/filter.c b/filter.c
index 4de678560..72590f79f 100644
--- a/filter.c
+++ b/filter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.c 2.0 2004/01/11 13:31:34 kls Exp $
+ * $Id: filter.c 3.0 2004/01/11 13:31:34 kls Exp $
  */
 
 #include "filter.h"
diff --git a/filter.h b/filter.h
index b85ab07a7..a00ece5e9 100644
--- a/filter.h
+++ b/filter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.h 2.0 2004/01/11 13:31:59 kls Exp $
+ * $Id: filter.h 3.0 2004/01/11 13:31:59 kls Exp $
  */
 
 #ifndef __FILTER_H
diff --git a/font.c b/font.c
index c6400d4e2..dee26c21a 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 2.13.1.1 2013/04/07 14:54:15 kls Exp $
+ * $Id: font.c 3.1 2013/04/07 14:42:13 kls Exp $
  */
 
 #include "font.h"
diff --git a/font.h b/font.h
index 86bd8b331..8174ae92c 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.7 2013/02/17 13:17:42 kls Exp $
+ * $Id: font.h 3.0 2013/02/17 13:17:42 kls Exp $
  */
 
 #ifndef __FONT_H
diff --git a/i18n.c b/i18n.c
index f010b6bc9..f26c96bf7 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.5 2012/09/01 10:53:43 kls Exp $
+ * $Id: i18n.c 3.0 2012/09/01 10:53:43 kls Exp $
  */
 
 /*
diff --git a/i18n.h b/i18n.h
index 03deb6f2e..c3f1fc7d2 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 2.1 2012/03/11 14:07:45 kls Exp $
+ * $Id: i18n.h 3.0 2012/03/11 14:07:45 kls Exp $
  */
 
 #ifndef __I18N_H
diff --git a/interface.c b/interface.c
index 82091d991..992c5e338 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 2.2 2012/11/19 12:21:43 kls Exp $
+ * $Id: interface.c 3.0 2012/11/19 12:21:43 kls Exp $
  */
 
 #include "interface.h"
diff --git a/interface.h b/interface.h
index 9e10f40b2..b9082bd5d 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 2.0 2004/05/01 11:11:13 kls Exp $
+ * $Id: interface.h 3.0 2004/05/01 11:11:13 kls Exp $
  */
 
 #ifndef __INTERFACE_H
diff --git a/keys.c b/keys.c
index 2b4198de9..284858caf 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 2.2 2012/12/04 12:52:52 kls Exp $
+ * $Id: keys.c 3.0 2012/12/04 12:52:52 kls Exp $
  */
 
 #include "keys.h"
diff --git a/keys.h b/keys.h
index 9a79dd61a..4586548c0 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 2.2 2012/12/04 12:51:25 kls Exp $
+ * $Id: keys.h 3.0 2012/12/04 12:51:25 kls Exp $
  */
 
 #ifndef __KEYS_H
diff --git a/libsi/Makefile b/libsi/Makefile
index dff5ca9cf..2219af698 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 2.4 2012/12/18 13:35:54 kls Exp $
+# $Id: Makefile 3.0 2012/12/18 13:35:54 kls Exp $
 
 ### The archiver options:
 
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 07429b549..b680c35bb 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 2.4 2012/01/11 11:35:17 kls Exp $
+ *   $Id: descriptor.c 3.0 2012/01/11 11:35:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 3025876e6..0115c1d50 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 2.4 2012/01/11 11:35:17 kls Exp $
+ *   $Id: descriptor.h 3.0 2012/01/11 11:35:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/gendescr b/libsi/gendescr
index 8af5c69d5..b0628fb64 100755
--- a/libsi/gendescr
+++ b/libsi/gendescr
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: gendescr 2.0 2003/12/13 10:40:53 kls Exp $
+# $Id: gendescr 3.0 2003/12/13 10:40:53 kls Exp $
 
 print "Name (ohne ...Descriptor):";
 $name=<STDIN>;
diff --git a/libsi/headers.h b/libsi/headers.h
index 85c83b27c..a15d92f6b 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 2.5 2012/06/09 14:37:24 kls Exp $
+ *   $Id: headers.h 3.0 2012/06/09 14:37:24 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/section.c b/libsi/section.c
index 8c86f4645..d7a429271 100644
--- a/libsi/section.c
+++ b/libsi/section.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.c 2.0 2006/04/14 10:53:44 kls Exp $
+ *   $Id: section.c 3.0 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/section.h b/libsi/section.h
index 5b70a2200..133fba3a6 100644
--- a/libsi/section.h
+++ b/libsi/section.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.h 2.1 2012/02/26 13:58:26 kls Exp $
+ *   $Id: section.h 3.0 2012/02/26 13:58:26 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/si.c b/libsi/si.c
index 80d34d14a..d7ed1d9c3 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 2.8 2012/09/29 14:44:20 kls Exp $
+ *   $Id: si.c 3.0 2012/09/29 14:44:20 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/si.h b/libsi/si.h
index 8e4255e3e..7155043ba 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 2.6 2012/10/15 11:56:06 kls Exp $
+ *   $Id: si.h 3.0 2012/10/15 11:56:06 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/util.c b/libsi/util.c
index 36a80d083..4da19178d 100644
--- a/libsi/util.c
+++ b/libsi/util.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.c 2.0 2006/02/18 11:17:50 kls Exp $
+ *   $Id: util.c 3.0 2006/02/18 11:17:50 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/util.h b/libsi/util.h
index a7f5d602b..019c4a862 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 2.3 2012/02/26 13:58:26 kls Exp $
+ *   $Id: util.h 3.0 2012/02/26 13:58:26 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/lirc.c b/lirc.c
index e8d0be155..e02f22965 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 2.5 2013/02/11 15:25:42 kls Exp $
+ * $Id: lirc.c 3.1 2013/08/22 09:22:14 kls Exp $
  */
 
 #include "lirc.h"
@@ -111,6 +111,7 @@ void cLircRemote::Action(void)
            else if (LastTime.Elapsed() < (uint)Setup.RcRepeatDelta)
               continue; // skip same keys coming in too fast
            else {
+              pressed = true;
               repeat = true;
               timeout = Delta * 10 / 9;
               }
diff --git a/lirc.h b/lirc.h
index fb6745ffb..070aa3ddd 100644
--- a/lirc.h
+++ b/lirc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 2.0 2006/01/27 16:00:19 kls Exp $
+ * $Id: lirc.h 3.0 2006/01/27 16:00:19 kls Exp $
  */
 
 #ifndef __LIRC_H
diff --git a/menu.c b/menu.c
index f43dec5de..e466ae0f9 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.82.1.2 2013/04/27 10:32:28 kls Exp $
+ * $Id: menu.c 3.3 2013/08/21 10:45:11 kls Exp $
  */
 
 #include "menu.h"
@@ -2971,6 +2971,14 @@ void cMenuSetupLNB::Setup(void)
          }
      }
 
+  Add(new cMenuEditBoolItem(tr("Setup.LNB$Use dish positioner"), &data.UsePositioner));
+  if (data.UsePositioner) {
+     Add(new cMenuEditIntxItem(tr("Setup.LNB$Site latitude (degrees)"), &data.SiteLat, -900, 900, 10, tr("South"), tr("North")));
+     Add(new cMenuEditIntxItem(tr("Setup.LNB$Site longitude (degrees)"), &data.SiteLon, -1800, 1800, 10, tr("West"), tr("East")));
+     Add(new cMenuEditIntxItem(tr("Setup.LNB$Max. positioner swing (degrees)"), &data.PositionerSwing, 0, 900, 10));
+     Add(new cMenuEditIntxItem(tr("Setup.LNB$Positioner speed (degrees/s)"), &data.PositionerSpeed, 1, 1800, 10));
+     }
+
   SetCurrent(Get(current));
   Display();
 }
@@ -2978,6 +2986,7 @@ void cMenuSetupLNB::Setup(void)
 eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
 {
   int oldDiSEqC = data.DiSEqC;
+  int oldUsePositioner = data.UsePositioner;
   bool DeviceBondingsChanged = false;
   if (Key == kOk) {
      cString NewDeviceBondings = satCableNumbers.ToString();
@@ -2986,7 +2995,7 @@ eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
      }
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
-  if (Key != kNone && data.DiSEqC != oldDiSEqC)
+  if (Key != kNone && (data.DiSEqC != oldDiSEqC || data.UsePositioner != oldUsePositioner))
      Setup();
   else if (DeviceBondingsChanged)
      cDvbDevice::BondDevices(data.DeviceBondings);
@@ -3625,6 +3634,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
   number = 0;
   timeout = Switched || Setup.TimeoutRequChInfo;
+  positioner = NULL;
   channel = Channels.GetByNumber(Number);
   lastPresent = lastFollowing = NULL;
   if (channel) {
@@ -3646,6 +3656,7 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   lastTime.Set();
   withInfo = Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
+  positioner = NULL;
   channel = Channels.GetByNumber(cDevice::CurrentChannel());
   ProcessKey(FirstKey);
 }
@@ -3853,7 +3864,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             return osEnd;
             }
     };
-  if (!timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
+  if (positioner || !timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
      if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
         // makes sure a channel switch through the SVDRP CHAN command is displayed
         channel = Channels.GetByNumber(cDevice::CurrentChannel());
@@ -3861,13 +3872,24 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
         lastTime.Set();
         }
      DisplayInfo();
-     displayChannel->Flush();
      if (NewChannel) {
         SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
         Channels.SwitchTo(NewChannel->Number());
         SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
         channel = NewChannel;
         }
+     const cPositioner *Positioner = cDevice::ActualDevice()->Positioner();
+     bool PositionerMoving = Positioner && Positioner->IsMoving();
+     SetNeedsFastResponse(PositionerMoving);
+     if (!PositionerMoving) {
+        if (positioner)
+           lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached
+        Positioner = NULL;
+        }
+     if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner
+        displayChannel->SetPositioner(Positioner);
+     positioner = Positioner;
+     displayChannel->Flush();
      return osContinue;
      }
   return osEnd;
diff --git a/menu.h b/menu.h
index 196c0385a..db17f983a 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 2.13 2012/12/07 13:44:13 kls Exp $
+ * $Id: menu.h 3.1 2013/06/01 13:44:57 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -120,6 +120,7 @@ class cDisplayChannel : public cOsdObject {
   cTimeMs lastTime;
   int number;
   bool timeout;
+  const cPositioner *positioner;
   cChannel *channel;
   const cEvent *lastPresent;
   const cEvent *lastFollowing;
diff --git a/menuitems.c b/menuitems.c
index f7ec7761e..4eea6babe 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 2.16 2013/02/15 14:20:29 kls Exp $
+ * $Id: menuitems.c 3.1 2013/05/24 10:26:01 kls Exp $
  */
 
 #include "menuitems.h"
@@ -51,14 +51,14 @@ void cMenuEditItem::SetHelp(const char *Red, const char *Green, const char *Yell
   helpDisplayed = false;
 }
 
-bool cMenuEditItem::DisplayHelp(void)
+bool cMenuEditItem::DisplayHelp(bool Current)
 {
   bool HasHelp = helpRed || helpGreen || helpYellow || helpBlue;
-  if (HasHelp && !helpDisplayed) {
+  if (HasHelp && !helpDisplayed && Current) {
      cSkinDisplay::Current()->SetButtons(helpRed, helpGreen, helpYellow, helpBlue);
      cStatus::MsgOsdHelpKeys(helpRed, helpGreen, helpYellow, helpBlue);
-     helpDisplayed = true;
      }
+  helpDisplayed = Current;
   return HasHelp;
 }
 
@@ -223,6 +223,50 @@ eOSState cMenuEditNumItem::ProcessKey(eKeys Key)
   return state;
 }
 
+// --- cMenuEditIntxItem -----------------------------------------------------
+
+cMenuEditIntxItem::cMenuEditIntxItem(const char *Name, int *Value, int Min, int Max, int Factor, const char *NegString, const char *PosString)
+:cMenuEditIntItem(Name, Value, Min, Max)
+{
+  factor = ::max(Factor, 1);
+  negString = NegString;
+  posString = PosString;
+  Set();
+}
+
+void cMenuEditIntxItem::SetHelpKeys(void)
+{
+  if (negString && posString)
+     SetHelp(NULL, (*value < 0) ? posString : negString);
+}
+
+void cMenuEditIntxItem::Set(void)
+{
+  const char *s = (*value < 0) ? negString : posString;
+  int v = *value;
+  if (negString && posString)
+     v = abs(v);
+  SetValue(cString::sprintf(s ? "%.*f %s" : "%.*f", factor / 10, double(v) / factor, s));
+  SetHelpKeys();
+}
+
+eOSState cMenuEditIntxItem::ProcessKey(eKeys Key)
+{
+  eOSState state = cMenuEditIntItem::ProcessKey(Key);
+  if (state == osUnknown) {
+     switch (Key) {
+       case kGreen: if (negString && posString) {
+                       *value = -*value;
+                       Set();
+                       state = osContinue;
+                       }
+                    break;
+       default: ;
+       }
+     }
+  return state;
+}
+
 // --- cMenuEditPrcItem ------------------------------------------------------
 
 cMenuEditPrcItem::cMenuEditPrcItem(const char *Name, double *Value, double Min, double Max, int Decimals)
diff --git a/menuitems.h b/menuitems.h
index ffe995708..2a30b4655 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 2.8 2012/03/13 11:19:11 kls Exp $
+ * $Id: menuitems.h 3.1 2013/05/24 10:19:55 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -27,7 +27,7 @@ class cMenuEditItem : public cOsdItem {
   cMenuEditItem(const char *Name);
   ~cMenuEditItem();
   void SetValue(const char *Value);
-  bool DisplayHelp(void);
+  bool DisplayHelp(bool Current);
   };
 
 class cMenuEditIntItem : public cMenuEditItem {
@@ -70,6 +70,17 @@ class cMenuEditNumItem : public cMenuEditItem {
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+class cMenuEditIntxItem : public cMenuEditIntItem {
+private:
+  int factor;
+  const char *negString, *posString;
+  void SetHelpKeys(void);
+  virtual void Set(void);
+public:
+  cMenuEditIntxItem(const char *Name, int *Value, int Min = INT_MIN, int Max = INT_MAX, int Factor = 1, const char *NegString = NULL, const char *PosString = NULL);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
 class cMenuEditPrcItem : public cMenuEditItem {
 protected:
   double *value;
diff --git a/newplugin b/newplugin
index 1e9e91091..150649c5b 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 2.17.1.1 2013/05/02 10:04:06 kls Exp $
+# $Id: newplugin 3.1 2013/05/02 10:06:09 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
diff --git a/nit.c b/nit.c
index 89988618d..e3bf4194d 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 2.10 2013/03/07 09:42:29 kls Exp $
+ * $Id: nit.c 3.0 2013/03/07 09:42:29 kls Exp $
  */
 
 #include "nit.h"
diff --git a/nit.h b/nit.h
index e93f5bf66..700db9a20 100644
--- a/nit.h
+++ b/nit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.h 2.0 2007/06/10 08:50:21 kls Exp $
+ * $Id: nit.h 3.0 2007/06/10 08:50:21 kls Exp $
  */
 
 #ifndef __NIT_H
diff --git a/osd.c b/osd.c
index 45d4419c8..c266092b2 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.38.1.1 2013/05/18 12:41:48 kls Exp $
+ * $Id: osd.c 3.1 2013/05/18 12:33:16 kls Exp $
  */
 
 #include "osd.h"
diff --git a/osd.h b/osd.h
index 777a652e8..600cc7a79 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 2.20 2013/02/12 13:39:08 kls Exp $
+ * $Id: osd.h 3.0 2013/02/12 13:39:08 kls Exp $
  */
 
 #ifndef __OSD_H
diff --git a/osdbase.c b/osdbase.c
index fafa9c776..baadc0e64 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 2.7 2012/12/07 09:50:47 kls Exp $
+ * $Id: osdbase.c 3.1 2013/05/24 10:19:31 kls Exp $
  */
 
 #include "osdbase.h"
@@ -286,7 +286,7 @@ void cOsdMenu::DisplayCurrent(bool Current)
      if (!Current)
         item->SetFresh(true); // leaving the current item resets 'fresh'
      if (cMenuEditItem *MenuEditItem = dynamic_cast<cMenuEditItem *>(item)) {
-        if (!MenuEditItem->DisplayHelp())
+        if (!MenuEditItem->DisplayHelp(Current))
            DisplayHelp();
         else
            helpDisplayed = false;
diff --git a/osdbase.h b/osdbase.h
index 463518415..636766a9b 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 2.5 2012/12/07 09:49:35 kls Exp $
+ * $Id: osdbase.h 3.0 2012/12/07 09:49:35 kls Exp $
  */
 
 #ifndef __OSDBASE_H
diff --git a/pat.c b/pat.c
index a7791e2a5..5ed6bd968 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.19 2012/11/25 14:12:21 kls Exp $
+ * $Id: pat.c 3.0 2012/11/25 14:12:21 kls Exp $
  */
 
 #include "pat.h"
diff --git a/pat.h b/pat.h
index 08da051fe..a93c8756f 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 2.3 2013/02/16 15:20:24 kls Exp $
+ * $Id: pat.h 3.0 2013/02/16 15:20:24 kls Exp $
  */
 
 #ifndef __PAT_H
diff --git a/player.c b/player.c
index 5c95f4e4e..5fc4dbf48 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 2.2 2012/04/28 11:52:50 kls Exp $
+ * $Id: player.c 3.0 2012/04/28 11:52:50 kls Exp $
  */
 
 #include "player.h"
diff --git a/player.h b/player.h
index 01bc958c8..05ba518ba 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 2.6 2012/04/28 13:04:17 kls Exp $
+ * $Id: player.h 3.0 2012/04/28 13:04:17 kls Exp $
  */
 
 #ifndef __PLAYER_H
diff --git a/plugin.c b/plugin.c
index db16d080e..650f9231c 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 2.4 2012/09/01 13:10:27 kls Exp $
+ * $Id: plugin.c 3.0 2012/09/01 13:10:27 kls Exp $
  */
 
 #include "plugin.h"
diff --git a/plugin.h b/plugin.h
index 3502741af..d04274a81 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 2.2 2012/09/01 13:08:54 kls Exp $
+ * $Id: plugin.h 3.0 2012/09/01 13:08:54 kls Exp $
  */
 
 #ifndef __PLUGIN_H
diff --git a/po/ar.po b/po/ar.po
index 54c3f3c4c..1676dcbe2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -997,6 +997,33 @@ msgstr "Device %d connected to sat cable"
 msgid "Setup.LNB$own"
 msgstr "own"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "اعادة تشغيل الكامة"
 
@@ -1334,6 +1361,10 @@ msgstr "بث حى"
 msgid "PLAY"
 msgstr "عرض"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG شاشة "
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 89d655680..0362cd83d 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -996,6 +996,33 @@ msgstr "Dispositiu %d connectat a cable sat
 msgid "Setup.LNB$own"
 msgstr "propi"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
 
@@ -1333,6 +1360,10 @@ msgstr "EN DIRECTE"
 msgid "PLAY"
 msgstr "REPRODUIR"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Quadres ST:TNG"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 5409f0894..2bd4a8e41 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -996,6 +996,33 @@ msgstr "Zařízení %d připojeno k sat. kabelu"
 msgid "Setup.LNB$own"
 msgstr "vlastní"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reset CAMu"
 
@@ -1333,6 +1360,10 @@ msgstr "ŽIVĚ"
 msgid "PLAY"
 msgstr "PŘEHRÁVÁNÍ"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konzola"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 4069a7b44..edd0f5f4b 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr ""
 msgid "Setup.LNB$own"
 msgstr ""
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM nulstil"
 
@@ -1330,6 +1357,10 @@ msgstr ""
 msgid "PLAY"
 msgstr ""
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsol"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 0e24ab22b..4cc8e8445 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr "Device %d angeschlossen an Sat-Kabel"
 msgid "Setup.LNB$own"
 msgstr "eigenes"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr "Antennen-Positionierer benutzen"
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr "Standort L�ngengrad"
+
+msgid "South"
+msgstr "S�d"
+
+msgid "North"
+msgstr "Nord"
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr "Standort Breitengrad"
+
+msgid "West"
+msgstr "West"
+
+msgid "East"
+msgstr "Ost"
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr "Max. Positionier-Winkel (Grad)"
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr "Max. Positionier-Geschwindigkeit (Grad/s)"
+
 msgid "CAM reset"
 msgstr "CAM zur�ckgesetzt"
 
@@ -1330,6 +1357,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "WIEDERGABE"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr "Antenne wird auf %.1f gedreht..."
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG-Konsolen"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index b61174e5c..8df5b7867 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr ""
 msgid "Setup.LNB$own"
 msgstr ""
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr ""
 
@@ -1330,6 +1357,10 @@ msgstr ""
 msgid "PLAY"
 msgstr ""
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "������ ST:TNG"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index fba8c21d2..023871ec1 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr "Dispositivo %d conectado a cable sat
 msgid "Setup.LNB$own"
 msgstr "propio"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reset CAM"
 
@@ -1331,6 +1358,10 @@ msgstr "EN DIRECTO"
 msgid "PLAY"
 msgstr "REPRODUCIR"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Paneles ST:TNG"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 333f0b0b3..8539f17e0 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr "DVB seade %d ühendatud SAT-kaabliga"
 msgid "Setup.LNB$own"
 msgstr "oma"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM taaskäivitamine"
 
@@ -1330,6 +1357,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "ESITUS"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panels"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f44dd72fd..84c50a637 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -997,6 +997,33 @@ msgstr "DVB-sovitin %d kytketty SAT-kaapeliin"
 msgid "Setup.LNB$own"
 msgstr "oma"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM nollaus"
 
@@ -1334,6 +1361,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "TOISTO"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsoli"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 6228d7f4d..a4eda2fb0 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1003,6 +1003,33 @@ msgstr "Le périphérique %d est connecté au câble satellite"
 msgid "Setup.LNB$own"
 msgstr "Propriétaire"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM réinitialisé"
 
@@ -1340,6 +1367,10 @@ msgstr "DIRECT"
 msgid "PLAY"
 msgstr "LECTURE"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Consoles ST:TNG"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 3925422b5..baafe9d5b 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -995,6 +995,33 @@ msgstr ""
 msgid "Setup.LNB$own"
 msgstr ""
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Ponovno pokreni CAM"
 
@@ -1332,6 +1359,10 @@ msgstr ""
 msgid "PLAY"
 msgstr ""
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panele"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index e4f8594c1..b3c17b0c6 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -997,6 +997,33 @@ msgstr "Fejkábel a %d. tunerhez"
 msgid "Setup.LNB$own"
 msgstr "saját"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM újraindítás"
 
@@ -1334,6 +1361,10 @@ msgstr "ÉLŐ"
 msgid "PLAY"
 msgstr "LEJÁTSZÁS"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzol"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 281434c93..e579885f8 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-02-11 23:46+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1000,6 +1000,33 @@ msgstr "Periferica %d connessa al cavo sat"
 msgid "Setup.LNB$own"
 msgstr "propria"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reimposta la CAM"
 
@@ -1337,6 +1364,10 @@ msgstr "DAL VIVO"
 msgid "PLAY"
 msgstr "RIPRODUCI"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Consolle ST:TNG"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index dba42240c..34e273c7b 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr "Įrenginys %d prijungtas prie sat kabelio"
 msgid "Setup.LNB$own"
 msgstr "savas"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Dekodavimo modulis (CAM) perkrautas"
 
@@ -1330,6 +1357,10 @@ msgstr "GYVAI"
 msgid "PLAY"
 msgstr "GROTI"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Skydeliai"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index b9f56a25f..a398b3ca7 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -994,6 +994,33 @@ msgstr "Уред %d поврзан со сателитски кабел"
 msgid "Setup.LNB$own"
 msgstr "свој"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Рестартирај CAM"
 
@@ -1331,6 +1358,10 @@ msgstr "ЖИВО"
 msgid "PLAY"
 msgstr "ПУШТИ"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Панели"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 8766f3448..e9b9a0010 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -998,6 +998,33 @@ msgstr "Apparaat %d verbionden met sat. kabel"
 msgid "Setup.LNB$own"
 msgstr "eigen"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM herstarten"
 
@@ -1335,6 +1362,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "AFSPELEN"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Consoles"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 4f6668c67..a05410faf 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr ""
 msgid "Setup.LNB$own"
 msgstr ""
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr ""
 
@@ -1331,6 +1358,10 @@ msgstr ""
 msgid "PLAY"
 msgstr ""
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index c11c65614..f240894fb 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -995,6 +995,33 @@ msgstr "Urz
 msgid "Setup.LNB$own"
 msgstr "W�asny"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM zresetowany"
 
@@ -1332,6 +1359,10 @@ msgstr "NA 
 msgid "PLAY"
 msgstr "ODTWARZA"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Panel ST:TNG"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ffd3fecb7..7dde8c563 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr ""
 msgid "Setup.LNB$own"
 msgstr ""
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reiniciar CAM"
 
@@ -1331,6 +1358,10 @@ msgstr ""
 msgid "PLAY"
 msgstr ""
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Consola ST:TNG"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 3214a2e9d..f49c4523d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -995,6 +995,33 @@ msgstr "Receptorul %d conectat la cablul de satelit"
 msgid "Setup.LNB$own"
 msgstr "propriu"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Resetare CAM"
 
@@ -1332,6 +1359,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "REDARE"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "Cons. ST:TNG"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index eecc89e6f..785656013 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr "
 msgid "Setup.LNB$own"
 msgstr "����"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM ����������"
 
@@ -1331,6 +1358,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "���������������"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG ������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 46dc3ae1c..6e849b0b9 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr "Zariadenie %d je pripojen
 msgid "Setup.LNB$own"
 msgstr "vlastn�"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Resetnutie CAMu"
 
@@ -1330,6 +1357,10 @@ msgstr "NA
 msgid "PLAY"
 msgstr "PREHR�VA SA"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG panely"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 842157ed0..6e9ca323e 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr "Naprava %d priklju
 msgid "Setup.LNB$own"
 msgstr "lastni"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Reset CAM-a"
 
@@ -1331,6 +1358,10 @@ msgstr "V 
 msgid "PLAY"
 msgstr "PREDVAJAJ"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konsola"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 2968b9131..12586f77b 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr "Ure
 msgid "Setup.LNB$own"
 msgstr "sopstven"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Ponovno pokreni CAM"
 
@@ -1331,6 +1358,10 @@ msgstr "U
 msgid "PLAY"
 msgstr "REPRODUKCIJA"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG paneli"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 15a49ee74..58492c49a 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -997,6 +997,33 @@ msgstr "Enhet %d ansluten till satellitkabel"
 msgid "Setup.LNB$own"
 msgstr "�gare"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM omstart"
 
@@ -1334,6 +1361,10 @@ msgstr "LIVE"
 msgid "PLAY"
 msgstr "SPELA"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 54956de1a..d92018032 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -993,6 +993,33 @@ msgstr ""
 msgid "Setup.LNB$own"
 msgstr ""
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM s�f�rland�"
 
@@ -1330,6 +1357,10 @@ msgstr ""
 msgid "PLAY"
 msgstr ""
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG paneli"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 7626d8dbe..829921d4c 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-03-04 14:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -994,6 +994,33 @@ msgstr "Пристрій %d під’єднано до сателітарног
 msgid "Setup.LNB$own"
 msgstr "власне"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "Перезавантаження CAM"
 
@@ -1331,6 +1358,10 @@ msgstr "ЕФІР"
 msgid "PLAY"
 msgstr "ПРОГРАВАННЯ"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG панелі"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 98e3f98bb..8ba5e4ddf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-02-03 16:46+0100\n"
+"POT-Creation-Date: 2013-06-10 12:16+0200\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -995,6 +995,33 @@ msgstr "设备%d卫星连接线"
 msgid "Setup.LNB$own"
 msgstr "所有"
 
+msgid "Setup.LNB$Use dish positioner"
+msgstr ""
+
+msgid "Setup.LNB$Site latitude (degrees)"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "North"
+msgstr ""
+
+msgid "Setup.LNB$Site longitude (degrees)"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "Setup.LNB$Max. positioner swing (degrees)"
+msgstr ""
+
+msgid "Setup.LNB$Positioner speed (degrees/s)"
+msgstr ""
+
 msgid "CAM reset"
 msgstr "CAM重置"
 
@@ -1332,6 +1359,10 @@ msgstr "现场"
 msgid "PLAY"
 msgstr "播放"
 
+#, c-format
+msgid "Moving dish to %.1f..."
+msgstr ""
+
 msgid "ST:TNG Panels"
 msgstr "ST:TNG 面板"
 
diff --git a/positioner.c b/positioner.c
new file mode 100644
index 000000000..7adcc735b
--- /dev/null
+++ b/positioner.c
@@ -0,0 +1,140 @@
+/*
+ * positioner.c: Steerable dish positioning
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * For an explanation (in German) of the theory behind the calculations see
+ * http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1154305-grundlagen-und-winkelberechnungen-f%C3%BCr-h-h-diseqc-motor-antennenanlagen
+ *
+ * $Id: positioner.c 3.1 2013/08/21 11:02:52 kls Exp $
+ */
+
+#include "positioner.h"
+#include <math.h>
+#include "config.h"
+
+#define SAT_EARTH_RATIO    0.1513 // the Earth's radius, divided by the distance from the Earth's center to the satellite
+#define SAT_VISIBILITY_LAT 810    // the absolute latitude beyond which no satellite can be seen (degrees * 10)
+
+#define RAD(x) ((x) * M_PI / 1800)
+#define DEG(x) ((x) * 1800 / M_PI)
+
+cPositioner *cPositioner::positioner = NULL;
+
+cPositioner::cPositioner(void)
+{
+  capabilities = pcCanNothing;
+  frontend = -1;
+  targetLongitude = lastLongitude = Setup.PositionerLastLon;
+  targetHourAngle = lastHourAngle = CalcHourAngle(lastLongitude);
+  swingTime = 0;
+  delete positioner;
+  positioner = this;
+}
+
+cPositioner::~cPositioner()
+{
+  positioner = NULL;
+}
+
+int cPositioner::NormalizeAngle(int Angle)
+{
+  while (Angle < -1800)
+        Angle += 3600;
+  while (Angle > 1800)
+        Angle -= 3600;
+  return Angle;
+}
+
+int cPositioner::CalcHourAngle(int Longitude)
+{
+  double Delta = RAD(Longitude - Setup.SiteLon);
+  double Lat = RAD(Setup.SiteLat);
+  int Sign = Setup.SiteLat >= 0 ? -1 : 1; // angles to the right are positive, angles to the left are negative
+  return Sign * round(DEG(atan2(sin(Delta), cos(Delta) - cos(Lat) * SAT_EARTH_RATIO)));
+}
+
+int cPositioner::CalcLongitude(int HourAngle)
+{
+  double Lat = RAD(Setup.SiteLat);
+  double Lon = RAD(Setup.SiteLon);
+  double Alpha = RAD(HourAngle);
+  double Delta = Alpha - asin(sin(M_PI - Alpha) * cos(Lat) * SAT_EARTH_RATIO);
+  int Sign = Setup.SiteLat >= 0 ? 1 : -1;
+  return NormalizeAngle(round(DEG(Lon - Sign * Delta)));
+}
+
+int cPositioner::HorizonLongitude(ePositionerDirection Direction)
+{
+  double Delta;
+  if (abs(Setup.SiteLat) < SAT_VISIBILITY_LAT)
+     Delta = acos(SAT_EARTH_RATIO / cos(RAD(Setup.SiteLat)));
+  else
+     Delta = RAD(145);
+  if ((Setup.SiteLat >= 0) != (Direction == pdLeft))
+     Delta = -Delta;
+  return NormalizeAngle(round(DEG(RAD(Setup.SiteLon) + Delta)));
+}
+
+int cPositioner::HardLimitLongitude(ePositionerDirection Direction) const
+{
+  return CalcLongitude(Direction == pdLeft ? -Setup.PositionerSwing : Setup.PositionerSwing);
+}
+
+void cPositioner::StartMovementTimer(int Longitude)
+{
+  if (Setup.PositionerSpeed <= 0)
+     return;
+  cMutexLock MutexLock(&mutex);
+  lastLongitude = CurrentLongitude(); // in case the dish was already in motion
+  targetLongitude = Longitude;
+  lastHourAngle = CalcHourAngle(lastLongitude);
+  targetHourAngle = CalcHourAngle(targetLongitude);
+  swingTime = abs(targetHourAngle - lastHourAngle) * 1000 / Setup.PositionerSpeed; // time (ms) it takes to move the dish from lastHourAngle to targetHourAngle
+  movementStart.Set();
+  Setup.PositionerLastLon = targetLongitude;
+}
+
+void cPositioner::GotoPosition(uint Number, int Longitude)
+{
+  if (Longitude != targetLongitude)
+     dsyslog("moving positioner to position %d, longitude %d", Number, Longitude);
+  StartMovementTimer(Longitude);
+}
+
+void cPositioner::GotoAngle(int Longitude)
+{
+  if (Longitude != targetLongitude)
+     dsyslog("moving positioner to longitude %d", Longitude);
+  StartMovementTimer(Longitude);
+}
+
+int cPositioner::CurrentLongitude(void) const
+{
+  cMutexLock MutexLock(&mutex);
+  if (targetLongitude != lastLongitude) {
+     int Elapsed = movementStart.Elapsed(); // it's important to make this 'int', otherwise the expression below yields funny results
+     if (swingTime <= Elapsed)
+        lastLongitude = targetLongitude;
+     else
+        return CalcLongitude(lastHourAngle + (targetHourAngle - lastHourAngle) * Elapsed / swingTime);
+     }
+  return lastLongitude;
+}
+
+bool cPositioner::IsMoving(void) const
+{
+  cMutexLock MutexLock(&mutex);
+  return CurrentLongitude() != targetLongitude;
+}
+
+cPositioner *cPositioner::GetPositioner(void)
+{
+  return positioner;
+}
+
+void cPositioner::DestroyPositioner(void)
+{
+  delete positioner;
+}
diff --git a/positioner.h b/positioner.h
new file mode 100644
index 000000000..6e019ed64
--- /dev/null
+++ b/positioner.h
@@ -0,0 +1,171 @@
+/*
+ * positioner.h: Steerable dish positioning
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: positioner.h 3.1 2013/06/10 14:27:14 kls Exp $
+ */
+
+#ifndef __POSITIONER_H
+#define __POSITIONER_H
+
+#include "thread.h"
+#include "tools.h"
+
+/// A steerable satellite dish generally points to the south on the northern hemisphere,
+/// and to the north on the southern hemisphere (unless you're located directly on the
+/// equator, in which case the general direction is "up"). Therefore, moving the dish
+/// "east" or "west" means something different on either hemisphere. From the local dish
+/// motor's point of view, it makes more sense to speak of turning the dish "left" or
+/// "right", which is independent of the actual hemisphere the dish is located in.
+/// In the cPositioner class context, when a dish on the northern hemisphere moves "east",
+/// it is considered to be moving "left". Imagine standing behind the dish and looking
+/// towards the satellites, and clearly "east" is "left". On the southern hemisphere
+/// the same move to the "left" would go to the "west". So on the hardware level it is
+/// clear what "left" and "right" means. The user interface may present different labels
+/// to the viewer, depending on the hemisphere the dish is on.
+/// All angles in this context are given in "degrees * 10", which allows for an angular
+/// resolution of 0.1 degrees.
+
+class cPositioner {
+private:
+  mutable cMutex mutex;
+  static cPositioner *positioner;
+  int capabilities;
+  int frontend; // file descriptor of the DVB frontend
+  mutable int lastLongitude; // the longitude the dish has last been moved to
+  int targetLongitude; // the longitude the dish is supposed to be moved to
+  mutable int lastHourAngle; // the hour angle the positioner has last been moved to
+  int targetHourAngle; // the hour angle the positioner is supposed to be moved to
+  int swingTime;
+  cTimeMs movementStart;
+protected:
+  cPositioner(void);
+  virtual ~cPositioner();
+  void SetCapabilities(int Capabilities) { capabilities = Capabilities; }
+      ///< A derived class shall call this function in its constructor to set the
+      ///< capability flags it supports.
+  int Frontend(void) const { return frontend; }
+      ///< Returns the file descriptor of the DVB frontend the positioner is
+      ///< connected to. If the positioner is not connected to any DVB device,
+      ///< -1 will be returned.
+  static int CalcHourAngle(int Longitude);
+      ///< Takes the longitude and latitude of the dish location from the system
+      ///< setup and the given Longitude to calculate the "hour angle" to which to move
+      ///< the dish to in order to point to the satellite at orbital position Longitude.
+      ///< An hour angle of zero means the dish shall point directly towards the
+      ///< celestial equator (which is south on the northern hemisphere, and north on
+      ///< the southern hemisphere). Negative values mean that the dish needs to be
+      ///< moved to the left (as seen from behind the dish), while positive values
+      ///< require a movement to the right.
+  static int CalcLongitude(int HourAngle);
+      ///< Returns the longitude of the satellite position the dish points at when the
+      ///< positioner is moved to the given HourAngle.
+  void StartMovementTimer(int Longitude);
+      ///< Starts a timer that estimates how long it will take to move the dish from
+      ///< the current position to the one given by Longitude. The default implementation
+      ///< of CurrentLongitude() uses this timer.
+public:
+  enum ePositionerCapabilities {
+    pcCanNothing         = 0x0000,
+    pcCanDrive           = 0x0001,
+    pcCanStep            = 0x0002,
+    pcCanHalt            = 0x0004,
+    pcCanSetLimits       = 0x0008,
+    pcCanDisableLimits   = 0x0010,
+    pcCanEnableLimits    = 0x0020,
+    pcCanStorePosition   = 0x0040,
+    pcCanRecalcPositions = 0x0080,
+    pcCanGotoPosition    = 0x0100,
+    pcCanGotoAngle       = 0x0200,
+    };
+  enum ePositionerDirection { pdLeft, pdRight };
+  static int NormalizeAngle(int Angle);
+          ///< Normalizes the given Angle into the range -1800...1800.
+  int Capabilities(void) const { return capabilities; }
+          ///< Returns a flag word defining all the things this positioner is
+          ///< capable of.
+  void SetFrontend(int Frontend) { frontend = Frontend; }
+          ///< This function is called whenever the positioner is connected to
+          ///< a DVB frontend.
+  static int HorizonLongitude(ePositionerDirection Direction);
+          ///< Returns the longitude of the satellite position that is just at the
+          ///< horizon when looking in the given Direction. Note that this function
+          ///< only delivers reasonable values for site latitudes between +/-81 degrees.
+          ///< Beyond these limits (i.e. near the north or south pole) a constant value
+          ///< of +/-14.5 degrees (integer value 145) will be returned.
+  int HardLimitLongitude(ePositionerDirection Direction) const;
+          ///< Returns the longitude of the positioner's hard limit in the given
+          ///< Direction. Note that the value returned here may be larger (or smaller,
+          ///< depending on the Direction) than that returned by HorizonLongitude(),
+          ///< which would mean that it lies below that horizon.
+  int LastLongitude(void) const { return lastLongitude; }
+          ///< Returns the longitude the dish has last been moved to.
+  int TargetLongitude(void) const { return targetLongitude; }
+          ///< Returns the longitude the dish is supposed to be moved to. Once the target
+          ///< longitude has been reached, this is the same as the value returned by
+          ///< CurrentLongitude().
+  virtual cString Error(void) const { return NULL; }
+          ///< Returns a short, single line string indicating an error condition (if
+          ///< the positioner is able to report any errors).
+          ///< NULL means there is no error.
+  virtual void Drive(ePositionerDirection Direction) {}
+          ///< Continuously move the dish to the given Direction until Halt() is
+          ///< called or it hits the soft or hard limit.
+  virtual void Step(ePositionerDirection Direction, uint Steps = 1) {}
+          ///< Move the dish the given number of Steps in the given Direction.
+          ///< The maximum number of steps a particular positioner can do in a single
+          ///< call may be limited.
+          ///< A "step" is the smallest possible movement the positioner can make, which
+          ///< is typically 0.1 degrees.
+  virtual void Halt(void) {}
+          ///< Stop any ongoing motion of the dish.
+  virtual void SetLimit(ePositionerDirection Direction) {}
+          ///< Set the soft limit of the dish movement in the given Direction to the
+          ///< current position.
+  virtual void DisableLimits(void) {}
+          ///< Disables the soft limits for the dish movement.
+  virtual void EnableLimits(void) {}
+          ///< Enables the soft limits for the dish movement.
+  virtual void StorePosition(uint Number) {}
+          ///< Store the current position as a satellite position with the given Number.
+          ///< Number can be in the range 1...255. However, a particular positioner
+          ///< may only have a limited number of satellite positions it can store.
+  virtual void RecalcPositions(uint Number) {}
+          ///< Take the difference betwen the current actual position of the dish and
+          ///< the position stored with teh given Number, and apply the difference to
+          ///< all stored positions.
+  virtual void GotoPosition(uint Number, int Longitude);
+          ///< Move the dish to the satellite position stored under the given Number.
+          ///< Number must be one of the values previously used with StorePosition().
+          ///< The special value 0 shall move the dish to a "reference position",
+          ///< which usually is due south (or north, if you're on the southern hemisphere).
+          ///< Longitude will be used to calculate how long it takes to move the dish
+          ///< from its current position to the given Longitude.
+          ///< A derived class must call the base class function to have the target
+          ///< longitude stored.
+  virtual void GotoAngle(int Longitude);
+          ///< Move the dish to the given angular position. Longitude can be in the range
+          ///< -1800...+1800. A positive sign indicates a position east of Greenwich,
+          ///< while western positions have a negative sign. The absolute value is in
+          ///< "degrees * 10", which allows for a resolution of 1/10 of a degree.
+          ///< A derived class must call the base class function to have the target
+          ///< longitude stored.
+  virtual int CurrentLongitude(void) const;
+          ///< Returns the longitude the dish currently points to. If the dish is in motion,
+          ///< this may be an estimate based on the angular speed of the positioner.
+          ///< The default implementation takes the last and target longitude as well as
+          ///< the rotation speed of the positioner to calculate the estimated current
+          ///< longitude the dish points to.
+  virtual bool IsMoving(void) const;
+          ///< Returns true if the dish is currently moving as a result of a call to
+          ///< GotoPosition() or GotoAngle().
+  static cPositioner *GetPositioner(void);
+          ///< Returns a previously created positioner. If no plugin has created
+          ///< a positioner, there will always be the default DiSEqC positioner.
+  static void DestroyPositioner(void);
+          ///< Destroys a previously created positioner.
+  };
+
+#endif //__POSITIONER_H
diff --git a/receiver.c b/receiver.c
index bde60e463..909c44b8e 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.7 2012/06/02 13:20:38 kls Exp $
+ * $Id: receiver.c 3.0 2012/06/02 13:20:38 kls Exp $
  */
 
 #include "receiver.h"
diff --git a/receiver.h b/receiver.h
index 775dabdf0..59e6d3339 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.9 2012/09/02 09:27:20 kls Exp $
+ * $Id: receiver.h 3.0 2012/09/02 09:27:20 kls Exp $
  */
 
 #ifndef __RECEIVER_H
diff --git a/recorder.c b/recorder.c
index a9cc8c953..047dd197d 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.17 2012/09/22 11:53:57 kls Exp $
+ * $Id: recorder.c 3.0 2012/09/22 11:53:57 kls Exp $
  */
 
 #include "recorder.h"
diff --git a/recorder.h b/recorder.h
index 05cc42b09..250e99f21 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 2.3 2010/12/27 11:17:04 kls Exp $
+ * $Id: recorder.h 3.0 2010/12/27 11:17:04 kls Exp $
  */
 
 #ifndef __RECORDER_H
diff --git a/recording.c b/recording.c
index b1ca9c5a4..eb3b46676 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 2.91.1.1 2013/04/11 08:20:03 kls Exp $
+ * $Id: recording.c 3.2 2013/08/21 13:03:38 kls Exp $
  */
 
 #include "recording.h"
@@ -178,34 +178,38 @@ void AssertFreeDiskSpace(int Priority, bool Force)
               return; // the next call will actually remove it
            }
         // No "deleted" files to remove, so let's see if we can delete a recording:
-        isyslog("...no deleted recording found, trying to delete an old recording...");
-        cThreadLock RecordingsLock(&Recordings);
-        if (Recordings.Count()) {
-           cRecording *r = Recordings.First();
-           cRecording *r0 = NULL;
-           while (r) {
-                 if (r->IsOnVideoDirectoryFileSystem()) { // only delete recordings that will actually increase the free video disk space
-                    if (!r->IsEdited() && r->Lifetime() < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
-                       if ((r->Lifetime() == 0 && Priority > r->Priority()) || // the recording has no guaranteed lifetime and the new recording has higher priority
-                           (r->Lifetime() > 0 && (time(NULL) - r->Start()) / SECSINDAY >= r->Lifetime())) { // the recording's guaranteed lifetime has expired
-                          if (r0) {
-                             if (r->Priority() < r0->Priority() || (r->Priority() == r0->Priority() && r->Start() < r0->Start()))
-                                r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
+        if (Priority > 0) {
+           isyslog("...no deleted recording found, trying to delete an old recording...");
+           cThreadLock RecordingsLock(&Recordings);
+           if (Recordings.Count()) {
+              cRecording *r = Recordings.First();
+              cRecording *r0 = NULL;
+              while (r) {
+                    if (r->IsOnVideoDirectoryFileSystem()) { // only delete recordings that will actually increase the free video disk space
+                       if (!r->IsEdited() && r->Lifetime() < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
+                          if ((r->Lifetime() == 0 && Priority > r->Priority()) || // the recording has no guaranteed lifetime and the new recording has higher priority
+                              (r->Lifetime() > 0 && (time(NULL) - r->Start()) / SECSINDAY >= r->Lifetime())) { // the recording's guaranteed lifetime has expired
+                             if (r0) {
+                                if (r->Priority() < r0->Priority() || (r->Priority() == r0->Priority() && r->Start() < r0->Start()))
+                                   r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)
+                                }
+                             else
+                                r0 = r;
                              }
-                          else
-                             r0 = r;
                           }
                        }
+                    r = Recordings.Next(r);
                     }
-                 r = Recordings.Next(r);
+              if (r0 && r0->Delete()) {
+                 Recordings.Del(r0);
+                 return;
                  }
-           if (r0 && r0->Delete()) {
-              Recordings.Del(r0);
-              return;
               }
+           // Unable to free disk space, but there's nothing we can do about that...
+           isyslog("...no old recording found, giving up");
            }
-        // Unable to free disk space, but there's nothing we can do about that...
-        isyslog("...no old recording found, giving up");
+        else
+           isyslog("...no deleted recording found, priority %d too low to trigger deleting an old recording", Priority);
         Skins.QueueMessage(mtWarning, tr("Low disk space!"), 5, -1);
         }
      LastFreeDiskCheck = time(NULL);
diff --git a/recording.h b/recording.h
index ff3119da6..2b767628b 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.46 2013/03/04 14:01:23 kls Exp $
+ * $Id: recording.h 3.0 2013/03/04 14:01:23 kls Exp $
  */
 
 #ifndef __RECORDING_H
diff --git a/remote.c b/remote.c
index f3d90c966..e886bf34b 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.8 2013/02/03 15:44:55 kls Exp $
+ * $Id: remote.c 3.0 2013/02/03 15:44:55 kls Exp $
  */
 
 #include "remote.h"
diff --git a/remote.h b/remote.h
index d453b2f44..3407c5479 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 2.1 2013/02/03 14:34:56 kls Exp $
+ * $Id: remote.h 3.0 2013/02/03 14:34:56 kls Exp $
  */
 
 #ifndef __REMOTE_H
diff --git a/remux.c b/remux.c
index 587d7e5c6..3c0778984 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 2.75 2013/03/03 10:37:58 kls Exp $
+ * $Id: remux.c 3.0 2013/03/03 10:37:58 kls Exp $
  */
 
 #include "remux.h"
diff --git a/remux.h b/remux.h
index 67eda4c6d..8a4b30683 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.37 2013/01/20 11:43:59 kls Exp $
+ * $Id: remux.h 3.0 2013/01/20 11:43:59 kls Exp $
  */
 
 #ifndef __REMUX_H
diff --git a/ringbuffer.c b/ringbuffer.c
index abe78990c..e2921be24 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 2.5 2012/09/22 11:26:49 kls Exp $
+ * $Id: ringbuffer.c 3.0 2012/09/22 11:26:49 kls Exp $
  */
 
 #include "ringbuffer.h"
diff --git a/ringbuffer.h b/ringbuffer.h
index 1fff611c1..a97574219 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 2.5 2013/02/16 15:20:37 kls Exp $
+ * $Id: ringbuffer.h 3.0 2013/02/16 15:20:37 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
diff --git a/runvdr.template b/runvdr.template
index 2f6fd87b5..63f283091 100755
--- a/runvdr.template
+++ b/runvdr.template
@@ -20,7 +20,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr.template 2.2 2011/04/17 12:34:30 kls Exp $
+# $Id: runvdr.template 3.0 2011/04/17 12:34:30 kls Exp $
 
 VDRPRG="./vdr"
 
diff --git a/sdt.c b/sdt.c
index 5f2502b02..f79187ee1 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 2.5 2010/05/16 14:23:21 kls Exp $
+ * $Id: sdt.c 3.0 2010/05/16 14:23:21 kls Exp $
  */
 
 #include "sdt.h"
diff --git a/sdt.h b/sdt.h
index 2566672a2..6b3f24ff3 100644
--- a/sdt.h
+++ b/sdt.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.h 2.0 2004/01/05 14:30:14 kls Exp $
+ * $Id: sdt.h 3.0 2004/01/05 14:30:14 kls Exp $
  */
 
 #ifndef __SDT_H
diff --git a/sections.c b/sections.c
index 991499bc2..833639a8f 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 2.2 2012/10/04 12:21:59 kls Exp $
+ * $Id: sections.c 3.0 2012/10/04 12:21:59 kls Exp $
  */
 
 #include "sections.h"
diff --git a/sections.h b/sections.h
index 3b00c8b5f..7cb833ce8 100644
--- a/sections.h
+++ b/sections.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.h 2.0 2005/08/13 11:23:55 kls Exp $
+ * $Id: sections.h 3.0 2005/08/13 11:23:55 kls Exp $
  */
 
 #ifndef __SECTIONS_H
diff --git a/shutdown.c b/shutdown.c
index 445ed6f27..0a36a15f7 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 2.1 2013/02/18 10:33:26 kls Exp $
+ * $Id: shutdown.c 3.0 2013/02/18 10:33:26 kls Exp $
  */
 
 #include "shutdown.h"
diff --git a/shutdown.h b/shutdown.h
index bf2a2a424..5e4af29fa 100644
--- a/shutdown.h
+++ b/shutdown.h
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.h 2.1 2013/02/18 10:35:27 kls Exp $
+ * $Id: shutdown.h 3.0 2013/02/18 10:35:27 kls Exp $
  */
 
 #ifndef __SHUTDOWN_H
diff --git a/skinclassic.c b/skinclassic.c
index b9919d84c..fa3843151 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 2.10 2013/03/03 15:26:09 kls Exp $
+ * $Id: skinclassic.c 3.0 2013/03/03 15:26:09 kls Exp $
  */
 
 #include "skinclassic.h"
diff --git a/skinclassic.h b/skinclassic.h
index 60878e4ba..005901b49 100644
--- a/skinclassic.h
+++ b/skinclassic.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.h 2.0 2005/01/02 14:38:56 kls Exp $
+ * $Id: skinclassic.h 3.0 2005/01/02 14:38:56 kls Exp $
  */
 
 #ifndef __SKINCLASSIC_H
diff --git a/skinlcars.c b/skinlcars.c
index 3ed8225a8..23eafa10a 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 2.21.1.1 2013/05/19 12:08:52 kls Exp $
+ * $Id: skinlcars.c 3.3 2013/08/18 13:45:36 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -27,6 +27,7 @@
 #include "font.h"
 #include "menu.h"
 #include "osd.h"
+#include "positioner.h"
 #include "themes.h"
 #include "videodir.h"
 
@@ -299,6 +300,44 @@ static void DrawDeviceSignal(cOsd *Osd, const cDevice *Device, int x0, int y0, i
      }
 }
 
+static void DrawDevicePosition(cOsd *Osd, const cPositioner *Positioner, int x0, int y0, int x1, int y1, int &LastCurrent)
+{
+  int HorizonLeft = Positioner->HorizonLongitude(cPositioner::pdLeft);
+  int HorizonRight = Positioner->HorizonLongitude(cPositioner::pdRight);
+  int HardLimitLeft = cPositioner::NormalizeAngle(HorizonLeft - Positioner->HardLimitLongitude(cPositioner::pdLeft));
+  int HardLimitRight = cPositioner::NormalizeAngle(Positioner->HardLimitLongitude(cPositioner::pdRight) - HorizonRight);
+  int HorizonDelta = cPositioner::NormalizeAngle(HorizonLeft - HorizonRight);
+  int Current = cPositioner::NormalizeAngle(HorizonLeft - Positioner->CurrentLongitude());
+  int Target = cPositioner::NormalizeAngle(HorizonLeft - Positioner->TargetLongitude());
+  int d = (y1 - y0) / 2;
+  int w = x1 - x0 - 2 * d;
+  int l = max(x0 + d, x0 + d + w * HardLimitLeft / HorizonDelta);
+  int r = min(x1 - d, x1 - d - w * HardLimitRight / HorizonDelta) - 1;
+  int c = constrain(x0 + d + w * Current / HorizonDelta, l, r);
+  int t = constrain(x0 + d + w * Target / HorizonDelta, l, r);
+  if (c == LastCurrent)
+     return;
+  if (c > t)
+     swap(c, t);
+  tColor ColorRange, ColorMove;
+  if (TwoColors) {
+     ColorRange = Theme.Color(clrChannelFrameBg);
+     ColorMove = Theme.Color(clrBackground);
+     }
+  else {
+     ColorRange = Theme.Color(clrChannelFrameBg);
+     ColorMove = Theme.Color(clrDeviceBg);
+     }
+  Osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, Theme.Color(clrBackground));
+  Osd->DrawEllipse(l - d, y0, l, y1 - 1, ColorRange, 7);
+  Osd->DrawRectangle(l, y0, r, y1 - 1, ColorRange);
+  Osd->DrawEllipse(r, y0, r + d, y1 - 1, ColorRange, 5);
+  Osd->DrawEllipse(c - d, y0, c, y1 - 1, ColorMove, 7);
+  Osd->DrawRectangle(c, y0, t, y1 - 1, ColorMove);
+  Osd->DrawEllipse(t, y0, t + d, y1 - 1, ColorMove, 5);
+  LastCurrent = c;
+}
+
 // --- cSkinLCARSDisplayChannel ----------------------------------------------
 
 class cSkinLCARSDisplayChannel : public cSkinDisplayChannel {
@@ -317,6 +356,7 @@ class cSkinLCARSDisplayChannel : public cSkinDisplayChannel {
   bool initial;
   cString lastDate;
   int lastSeen;
+  int lastCurrentPosition;
   int lastDeviceNumber;
   cString lastDeviceType;
   cCamSlot *lastCamSlot;
@@ -336,6 +376,7 @@ class cSkinLCARSDisplayChannel : public cSkinDisplayChannel {
   virtual void SetChannel(const cChannel *Channel, int Number);
   virtual void SetEvents(const cEvent *Present, const cEvent *Following);
   virtual void SetMessage(eMessageType Type, const char *Text);
+  virtual void SetPositioner(const cPositioner *Positioner);
   virtual void Flush(void);
   };
 
@@ -352,6 +393,7 @@ cSkinLCARSDisplayChannel::cSkinLCARSDisplayChannel(bool WithInfo)
   initial = true;
   present = NULL;
   lastSeen = -1;
+  lastCurrentPosition = -1;
   lastDeviceNumber = -1;
   lastCamSlot = NULL;
   lastSignalStrength = -1;
@@ -458,6 +500,8 @@ void cSkinLCARSDisplayChannel::DrawTrack(void)
 
 void cSkinLCARSDisplayChannel::DrawSeen(int Current, int Total)
 {
+  if (lastCurrentPosition >= 0)
+     return; // to not interfere with SetPositioner()
   int Seen = (Total > 0) ? min(xc07 - xc06, int((xc07 - xc06) * double(Current) / Total)) : 0;
   if (initial || Seen != lastSeen) {
      int y0 = yc11 - ShowSeenExtent;
@@ -532,8 +576,13 @@ void cSkinLCARSDisplayChannel::SetChannel(const cChannel *Channel, int Number)
   osd->DrawText(xc00, yc00, ChNumber, Theme.Color(clrChannelFrameFg), frameColor, tallFont, xc02 - xc00, yc02 - yc00, taTop | taRight | taBorder);
   osd->DrawText(xc03, yc00, ChName, Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xi - xc03 - lineHeight, 0, taTop | taLeft);
   lastSignalDisplay = 0;
-  if (withInfo)
+  if (withInfo) {
+     if (Channel) {
+        int x = xc00 + (yc10 - yc09); // compensate for the arc
+        osd->DrawText(x, yc07, cSource::ToString(Channel->Source()), Theme.Color(clrChannelFrameFg), frameColor, cFont::GetFont(fontOsd), xc02 - x, yc10 - yc07, taTop | taRight | taBorder);
+        }
      DrawDevice();
+     }
 }
 
 void cSkinLCARSDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following)
@@ -587,6 +636,20 @@ void cSkinLCARSDisplayChannel::SetMessage(eMessageType Type, const char *Text)
      }
 }
 
+void cSkinLCARSDisplayChannel::SetPositioner(const cPositioner *Positioner)
+{
+  if (Positioner) {
+     int y0 = yc11 - ShowSeenExtent;
+     int y1 = yc11 + lineHeight / 2 - Gap / 2;
+     DrawDevicePosition(osd, Positioner, xc06, y0, xc07, y1, lastCurrentPosition);
+     }
+  else {
+     lastCurrentPosition = -1;
+     initial = true; // to have DrawSeen() refresh the progress bar
+     }
+  return;
+}
+
 void cSkinLCARSDisplayChannel::Flush(void)
 {
   if (withInfo) {
@@ -854,7 +917,7 @@ cSkinLCARSDisplayMenu::cSkinLCARSDisplayMenu(void)
   xb12 = xb08 + w;
   xb11 = xb12 - Gap;
   xb13 = xb12 + lineHeight / 2;
-  xb14 = xb13 + Gap;;
+  xb14 = xb13 + Gap;
 
   // The color buttons in the main menu:
   int r = lineHeight;
@@ -1345,6 +1408,8 @@ void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel)
   if (initial || Channel != lastChannel) {
      osd->DrawText(xa00, yt00, itoa(Channel->Number()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), tallFont, xa02 - xa00, yt02 - yt00, taTop | taRight | taBorder);
      osd->DrawText(xa03, yt00, Channel->Name(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);
+     int x = xa00 + (yc03 - yc02); // compensate for the arc
+     osd->DrawText(x, yc00, cSource::ToString(Channel->Source()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), cFont::GetFont(fontOsd), xa02 - x, yc03 - yc00, taTop | taRight | taBorder);
      lastChannel = Channel;
      DrawSeen(0, 0);
      }
diff --git a/skinlcars.h b/skinlcars.h
index 71117f6f7..abab0189e 100644
--- a/skinlcars.h
+++ b/skinlcars.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.h 2.1 2012/04/15 13:17:35 kls Exp $
+ * $Id: skinlcars.h 3.0 2012/04/15 13:17:35 kls Exp $
  */
 
 #ifndef __SKINLCARS_H
diff --git a/skins.c b/skins.c
index 5fb85a724..8d00e8d49 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 2.10 2012/06/02 11:44:14 kls Exp $
+ * $Id: skins.c 3.1 2013/08/18 12:07:22 kls Exp $
  */
 
 #include "skins.h"
@@ -63,6 +63,22 @@ cSkinDisplay::~cSkinDisplay()
   current = NULL;
 }
 
+// --- cSkinDisplayChannel ---------------------------------------------------
+
+cSkinDisplayChannel::cSkinDisplayChannel(void)
+{
+  positioner = NULL;
+}
+
+void cSkinDisplayChannel::SetPositioner(const cPositioner *Positioner)
+{
+  if (positioner && Positioner != positioner)
+     SetMessage(mtInfo, NULL);
+  positioner = Positioner;
+  if (positioner)
+     SetMessage(mtInfo, cString::sprintf(tr("Moving dish to %.1f..."), double(positioner->TargetLongitude()) / 10));
+}
+
 // --- cSkinDisplayMenu ------------------------------------------------------
 
 cSkinDisplayMenu::cSkinDisplayMenu(void)
diff --git a/skins.h b/skins.h
index c9750b824..47a03fc84 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 2.9 2012/12/21 11:09:13 kls Exp $
+ * $Id: skins.h 3.1 2013/08/21 10:29:10 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -14,6 +14,7 @@
 #include "epg.h"
 #include "keys.h"
 #include "osd.h"
+#include "positioner.h"
 #include "recording.h"
 #include "themes.h"
 #include "thread.h"
@@ -52,7 +53,10 @@ class cSkinDisplayChannel : public cSkinDisplay {
        ///< This class is used to display the current channel, together with
        ///< the present and following EPG event. How and to what extent this
        ///< is done is totally up to the derived class.
+private:
+  const cPositioner *positioner;
 public:
+  cSkinDisplayChannel(void);
   virtual void SetChannel(const cChannel *Channel, int Number) = 0;
        ///< Sets the current channel to Channel. If Number is not 0, the
        ///< user is in the process of entering a channel number, which must
@@ -65,6 +69,17 @@ class cSkinDisplayChannel : public cSkinDisplay {
        ///< to determine, e.g., the colors for displaying the Text.
        ///< If Text is NULL, any previously displayed message must be removed, and
        ///< any previous contents overwritten by the message must be restored.
+  virtual void SetPositioner(const cPositioner *Positioner);
+       ///< Sets the Positioner used to move the satellite dish. The skin may use the
+       ///< data provided by Positioner to implement some form of progress display,
+       ///< since moving the dish may take a while. This function will only be called
+       ///< if the device receiving the current live channel actually uses a positioner,
+       ///< and it will be called with NULL once the dish has reached its target
+       ///< position (or the user switches to a channel that doesn't require positioning
+       ///< the dish). While the dish is moving, SetPositioner() is called repeatedly,
+       ///< so the skin has a chance to update the progress display.
+       ///< The default implementation calls SetMessage() with a text that indicates
+       ///< that the dish is being moved to a new position.
   /*TODO
   SetButtons
     Red    = Video options
diff --git a/skinsttng.c b/skinsttng.c
index 39a831a86..6cde7cde7 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 2.17 2013/03/03 15:29:28 kls Exp $
+ * $Id: skinsttng.c 3.0 2013/03/03 15:29:28 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
diff --git a/skinsttng.h b/skinsttng.h
index cef3b910f..f29262d43 100644
--- a/skinsttng.h
+++ b/skinsttng.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.h 2.0 2005/01/02 14:39:29 kls Exp $
+ * $Id: skinsttng.h 3.0 2005/01/02 14:39:29 kls Exp $
  */
 
 #ifndef __SKINSTTNG_H
diff --git a/sourceparams.c b/sourceparams.c
index 043178955..2f7b4e8ae 100644
--- a/sourceparams.c
+++ b/sourceparams.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sourceparams.c 1.2 2010/03/06 11:13:39 kls Exp $
+ * $Id: sourceparams.c 3.0 2010/03/06 11:13:39 kls Exp $
  */
 
 #include "sourceparams.h"
diff --git a/sourceparams.h b/sourceparams.h
index be04b5677..9f98bd07e 100644
--- a/sourceparams.h
+++ b/sourceparams.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sourceparams.h 1.1 2010/02/28 11:58:03 kls Exp $
+ * $Id: sourceparams.h 3.0 2010/02/28 11:58:03 kls Exp $
  */
 
 #ifndef __SOURCEPARAMS_H
diff --git a/sources.c b/sources.c
index 44bf7d070..ffaee98a3 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 2.2 2010/02/28 15:15:39 kls Exp $
+ * $Id: sources.c 3.4 2013/05/23 10:20:28 kls Exp $
  */
 
 #include "sources.h"
@@ -37,17 +37,29 @@ bool cSource::Parse(const char *s)
   return code != stNone && description && *description;
 }
 
+bool cSource::Matches(int Code1, int Code2)
+{
+  if (Code1 == (stSat | st_Any))
+     return IsSat(Code2);
+  return Code1 == Code2;
+}
+
+int cSource::Position(int Code)
+{
+  int n = (Code & st_Pos);
+  if (n > 0x00007FFF)
+     n |= 0xFFFF0000;
+  return n;
+}
+
 cString cSource::ToString(int Code)
 {
   char buffer[16];
   char *q = buffer;
   *q++ = (Code & st_Mask) >> 24;
-  int n = (Code & st_Pos);
-  if (n > 0x00007FFF)
-     n |= 0xFFFF0000;
-  if (n) {
+  if (int n = Position(Code)) {
      q += snprintf(q, sizeof(buffer) - 2, "%u.%u", abs(n) / 10, abs(n) % 10); // can't simply use "%g" here since the silly 'locale' messes up the decimal point
-     *q++ = (n < 0) ? 'E' : 'W';
+     *q++ = (n < 0) ? 'W' : 'E';
      }
   *q = 0;
   return buffer;
@@ -69,8 +81,8 @@ int cSource::FromString(const char *s)
                                      break;
                    case '.':         dot = true;
                                      break;
-                   case 'E':         neg = true; // fall through to 'W'
-                   case 'W':         if (!dot)
+                   case 'W':         neg = true; // fall through to 'E'
+                   case 'E':         if (!dot)
                                         pos *= 10;
                                      break;
                    default: esyslog("ERROR: unknown source character '%c'", *s);
@@ -84,7 +96,7 @@ int cSource::FromString(const char *s)
         return code;
         }
      else
-       esyslog("ERROR: unknown source key '%c'", *s);
+        esyslog("ERROR: unknown source key '%c'", *s);
      }
   return stNone;
 }
@@ -93,9 +105,9 @@ int cSource::FromData(eSourceType SourceType, int Position, bool East)
 {
   int code = SourceType;
   if (SourceType == stSat) {
-     if (East)
+     if (!East)
         Position = -Position;
-     code |= (Position & st_Pos);;
+     code |= (Position & st_Pos);
      }
   return code;
 }
diff --git a/sources.conf b/sources.conf
index c7f76d1f5..09ecdebe3 100644
--- a/sources.conf
+++ b/sources.conf
@@ -179,6 +179,8 @@ S135W   AMC 10
 S137W   AMC 7
 S139W   AMC 8
 
+S360E   Any satellite
+
 # Cable
 
 C       DVB-C
diff --git a/sources.h b/sources.h
index 516a3edca..8c2fdfb86 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 2.4 2012/06/17 11:19:23 kls Exp $
+ * $Id: sources.h 3.2 2013/08/21 10:27:32 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -22,6 +22,7 @@ class cSource : public cListObject {
     stTerr  = ('T' << 24),
     st_Mask = 0xFF000000,
     st_Pos  = 0x0000FFFF,
+    st_Any  = 0x00000E10, // 3600 - special value indicating "any position"
     };
 private:
   int code;
@@ -31,8 +32,22 @@ class cSource : public cListObject {
   cSource(char Source, const char *Description);
   ~cSource();
   int Code(void) const { return code; }
+  int Position(void) { return Position(code); }
+      ///< Returns the orbital position of the satellite in case this is a DVB-S
+      ///< source (zero otherwise). The returned value is in the range -1800...+1800,
+      ///< except for the special value 3600, which indicates "any position". This is
+      ///< used with positioners that can move the dish to any requested satellite
+      ///< within their range.
+      ///< A positive sign indicates a position east of Greenwich, while western
+      ///< positions have a negative sign. The absolute value is in "degrees * 10",
+      ///< which allows for a resolution of 1/10 of a degree.
   const char *Description(void) const { return description; }
   bool Parse(const char *s);
+  static bool Matches(int Code1, int Code2);
+      ///< Returns true if Code2 matches Code1. This is simply a check whether the
+      ///< two codes are equal, except for the special case that Code1 is stSat|st_Any,
+      ///< in which case it matches any Code2 that is stSat.
+  static int Position(int Code);
   static char ToChar(int Code) { return (Code & st_Mask) >> 24; }
   static cString ToString(int Code);
   static int FromString(const char *s);
diff --git a/spu.c b/spu.c
index 9e38eecde..8394abf90 100644
--- a/spu.c
+++ b/spu.c
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.c 2.0 2008/02/10 14:06:48 kls Exp $
+ * $Id: spu.c 3.0 2008/02/10 14:06:48 kls Exp $
  */
 
 #include "spu.h"
diff --git a/spu.h b/spu.h
index 3a8ab3eab..8945b441c 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 2.0 2006/04/17 12:48:55 kls Exp $
+ * $Id: spu.h 3.0 2006/04/17 12:48:55 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
diff --git a/status.c b/status.c
index b0a6aba03..835a0e16c 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 2.1 2012/03/07 14:17:24 kls Exp $
+ * $Id: status.c 3.0 2012/03/07 14:17:24 kls Exp $
  */
 
 #include "status.h"
diff --git a/status.h b/status.h
index 631916572..983ee316e 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 2.1 2012/03/07 14:16:57 kls Exp $
+ * $Id: status.h 3.0 2012/03/07 14:16:57 kls Exp $
  */
 
 #ifndef __STATUS_H
diff --git a/summary2info b/summary2info
index fc633f921..6baf4e7d3 100755
--- a/summary2info
+++ b/summary2info
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info 2.1 2011/12/04 14:17:35 kls Exp $
+# $Id: summary2info 3.0 2011/12/04 14:17:35 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
diff --git a/svdrp.c b/svdrp.c
index 8a50daebd..1cb87e469 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 2.24 2013/02/17 13:18:01 kls Exp $
+ * $Id: svdrp.c 3.0 2013/02/17 13:18:01 kls Exp $
  */
 
 #include "svdrp.h"
diff --git a/svdrp.h b/svdrp.h
index 5ec9bc769..fcba1fb4c 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 2.3 2012/04/26 10:30:06 kls Exp $
+ * $Id: svdrp.h 3.0 2012/04/26 10:30:06 kls Exp $
  */
 
 #ifndef __SVDRP_H
diff --git a/themes.c b/themes.c
index 88c7005e5..ccc21640e 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 2.2 2012/02/17 13:57:32 kls Exp $
+ * $Id: themes.c 3.0 2012/02/17 13:57:32 kls Exp $
  */
 
 #include "themes.h"
diff --git a/themes.h b/themes.h
index e51464f86..1bb9cf138 100644
--- a/themes.h
+++ b/themes.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.h 2.1 2012/10/07 11:11:43 kls Exp $
+ * $Id: themes.h 3.0 2012/10/07 11:11:43 kls Exp $
  */
 
 #ifndef __THEMES_H
diff --git a/thread.c b/thread.c
index 80fe588da..080f4b7cc 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 2.7.1.1 2013/04/11 08:59:26 kls Exp $
+ * $Id: thread.c 3.1 2013/04/10 14:37:37 kls Exp $
  */
 
 #include "thread.h"
diff --git a/thread.h b/thread.h
index d79e15ac3..1d10e689e 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 2.4 2013/02/16 15:20:44 kls Exp $
+ * $Id: thread.h 3.1 2013/04/11 08:47:31 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -182,7 +182,6 @@ class cIoThrottle {
        ///< Returns true if any I/O throttling object is currently active.
   };
 
-
 // cPipe implements a pipe that closes all unnecessary file descriptors in
 // the child process.
 
diff --git a/timers.c b/timers.c
index 9a880e104..4d63e8c1a 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 2.18 2013/03/29 15:37:16 kls Exp $
+ * $Id: timers.c 3.0 2013/03/29 15:37:16 kls Exp $
  */
 
 #include "timers.h"
diff --git a/timers.h b/timers.h
index 8910c1060..4ce1cff1a 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 2.7 2013/03/11 10:35:53 kls Exp $
+ * $Id: timers.h 3.0 2013/03/11 10:35:53 kls Exp $
  */
 
 #ifndef __TIMERS_H
diff --git a/tools.c b/tools.c
index ab46d0255..d88182704 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.29 2012/12/08 11:16:30 kls Exp $
+ * $Id: tools.c 3.1 2013/05/07 08:48:00 kls Exp $
  */
 
 #include "tools.h"
@@ -691,12 +691,12 @@ void cTimeMs::Set(int Ms)
   begin = Now() + Ms;
 }
 
-bool cTimeMs::TimedOut(void)
+bool cTimeMs::TimedOut(void) const
 {
   return Now() >= begin;
 }
 
-uint64_t cTimeMs::Elapsed(void)
+uint64_t cTimeMs::Elapsed(void) const
 {
   return Now() - begin;
 }
diff --git a/tools.h b/tools.h
index d6a778e66..9cfd152be 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.24 2013/02/17 13:18:06 kls Exp $
+ * $Id: tools.h 3.2 2013/08/23 10:32:51 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -31,9 +31,9 @@ typedef unsigned char uchar;
 
 extern int SysLogLevel;
 
-#define esyslog(a...) void( (SysLogLevel > 0) ? syslog_with_tid(LOG_ERR, a) : void() )
-#define isyslog(a...) void( (SysLogLevel > 1) ? syslog_with_tid(LOG_ERR, a) : void() )
-#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_ERR, a) : void() )
+#define esyslog(a...) void( (SysLogLevel > 0) ? syslog_with_tid(LOG_ERR,   a) : void() )
+#define isyslog(a...) void( (SysLogLevel > 1) ? syslog_with_tid(LOG_INFO,  a) : void() )
+#define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_DEBUG, a) : void() )
 
 #define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
 #define LOG_ERROR_STR(s)  esyslog("ERROR (%s,%d): %s: %m", __FILE__, __LINE__, s)
@@ -64,6 +64,8 @@ void syslog_with_tid(int priority, const char *format, ...) __attribute__ ((form
 #define BCDCHARTOINT(x) (10 * ((x & 0xF0) >> 4) + (x & 0xF))
 int BCD2INT(int x);
 
+#define IsBitSet(v, b) ((v) & (1 << (b))) // checks if the bit at index b is set in v, where the least significant bit has index 0
+
 // Unfortunately there are no platform independent macros for unaligned
 // access, so we do it this way:
 
@@ -330,8 +332,8 @@ class cTimeMs {
       ///< time.
   static uint64_t Now(void);
   void Set(int Ms = 0);
-  bool TimedOut(void);
-  uint64_t Elapsed(void);
+  bool TimedOut(void) const;
+  uint64_t Elapsed(void) const;
   };
 
 class cReadLine {
diff --git a/transfer.c b/transfer.c
index 653e93b43..eb07e829a 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 2.8 2013/03/01 09:50:15 kls Exp $
+ * $Id: transfer.c 3.1 2013/08/22 12:33:02 kls Exp $
  */
 
 #include "transfer.h"
@@ -35,7 +35,7 @@ void cTransfer::Activate(bool On)
      cPlayer::Detach();
 }
 
-#define MAXRETRIES     5 // max. number of retries for a single TS packet
+#define MAXRETRIES    20 // max. number of retries for a single TS packet
 #define RETRYWAIT      5 // time (in ms) between two retries
 
 void cTransfer::Receive(uchar *Data, int Length)
diff --git a/transfer.h b/transfer.h
index 47a3398e4..ce74898f4 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 2.4 2013/03/01 09:49:46 kls Exp $
+ * $Id: transfer.h 3.0 2013/03/01 09:49:46 kls Exp $
  */
 
 #ifndef __TRANSFER_H
diff --git a/vdr.1 b/vdr.1
index 6c37cc0cc..52ab43489 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.17 2013/03/15 10:44:54 kls Exp $
+.\" $Id: vdr.1 3.0 2013/03/15 10:44:54 kls Exp $
 .\"
 .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
diff --git a/vdr.5 b/vdr.5
index b54b2945d..4c273a87d 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 2.36 2013/03/29 10:25:56 kls Exp $
+.\" $Id: vdr.5 3.1 2013/08/11 13:50:42 kls Exp $
 .\"
 .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -483,6 +483,7 @@ l l.
 \fBV\fR@voltage high (18V)
 \fBA\fR@mini A
 \fBB\fR@mini B
+\fBPn\fR@use positioner to move dish to satellite position n (or to the satellite's orbital position, if no position number is given)
 \fBSn\fR@Satellite channel routing code sequence for bank n follows
 \fBWnn\fR@wait nn milliseconds (nn may be any positive integer number)
 \fB[xx ...]\fR@hex code sequence (max. 6)
diff --git a/vdr.c b/vdr.c
index c63eecaa4..bf581a6e5 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.57 2013/03/15 10:44:54 kls Exp $
+ * $Id: vdr.c 3.1 2013/06/10 14:28:43 kls Exp $
  */
 
 #include <getopt.h>
@@ -800,6 +800,11 @@ int main(int argc, char *argv[])
   if (AudioCommand)
      new cExternalAudio(AudioCommand);
 
+  // Positioner:
+
+  if (!cPositioner::GetPositioner()) // no plugin has created a positioner
+     new cDiseqcPositioner;
+
   // Channel:
 
   if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
@@ -1400,6 +1405,7 @@ int main(int argc, char *argv[])
      Setup.Save();
      }
   cDevice::Shutdown();
+  cPositioner::DestroyPositioner();
   EpgHandlers.Clear();
   PluginManager.Shutdown(true);
   cSchedules::Cleanup(true);
diff --git a/videodir.c b/videodir.c
index d39ab051a..9ad31b6f6 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 2.4 2012/09/30 12:06:33 kls Exp $
+ * $Id: videodir.c 3.1 2013/08/23 12:28:06 kls Exp $
  */
 
 #include "videodir.h"
@@ -19,6 +19,8 @@
 #include "recording.h"
 #include "tools.h"
 
+//#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is deprecated and will be removed in a future version
+
 const char *VideoDirectory = VIDEODIR;
 
 void SetVideoDirectory(const char *Directory)
@@ -27,43 +29,60 @@ void SetVideoDirectory(const char *Directory)
 }
 
 class cVideoDirectory {
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
 private:
   char *name, *stored, *adjusted;
   int length, number, digits;
+#endif
 public:
   cVideoDirectory(void);
   ~cVideoDirectory();
   int FreeMB(int *UsedMB = NULL);
-  const char *Name(void) { return name ? name : VideoDirectory; }
+  const char *Name(void) { return
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
+                                  name ? name :
+#endif
+                                                VideoDirectory; }
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   const char *Stored(void) { return stored; }
   int Length(void) { return length; }
   bool IsDistributed(void) { return name != NULL; }
   bool Next(void);
   void Store(void);
   const char *Adjust(const char *FileName);
+#endif
   };
 
 cVideoDirectory::cVideoDirectory(void)
 {
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   length = strlen(VideoDirectory);
   name = (VideoDirectory[length - 1] == '0') ? strdup(VideoDirectory) : NULL;
   stored = adjusted = NULL;
   number = -1;
   digits = 0;
+#endif
 }
 
 cVideoDirectory::~cVideoDirectory()
 {
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   free(name);
   free(stored);
   free(adjusted);
+#endif
 }
 
 int cVideoDirectory::FreeMB(int *UsedMB)
 {
-  return FreeDiskSpaceMB(name ? name : VideoDirectory, UsedMB);
+  return FreeDiskSpaceMB(
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
+                         name ? name :
+#endif
+                                       VideoDirectory, UsedMB);
 }
 
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
 bool cVideoDirectory::Next(void)
 {
   if (name) {
@@ -107,6 +126,7 @@ const char *cVideoDirectory::Adjust(const char *FileName)
      }
   return NULL;
 }
+#endif
 
 cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags)
 {
@@ -118,6 +138,7 @@ cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags)
      errno = ENOENT; // must set 'errno' - any ideas for a better value?
      return NULL;
      }
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   // Are we going to create a new file?
   if ((Flags & O_CREAT) != 0) {
      cVideoDirectory Dir;
@@ -143,6 +164,7 @@ cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags)
            }
         }
      }
+#endif
   cUnbufferedFile *File = cUnbufferedFile::Create(ActualFileName, Flags, DEFFILEMODE);
   if (ActualFileName != FileName)
      free((char *)ActualFileName);
@@ -176,6 +198,7 @@ bool RemoveVideoFile(const char *FileName)
 bool VideoFileSpaceAvailable(int SizeMB)
 {
   cVideoDirectory Dir;
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   if (Dir.IsDistributed()) {
      if (Dir.FreeMB() >= SizeMB * 2) // base directory needs additional space
         return true;
@@ -185,6 +208,7 @@ bool VideoFileSpaceAvailable(int SizeMB)
            }
      return false;
      }
+#endif
   return Dir.FreeMB() >= SizeMB;
 }
 
@@ -193,11 +217,15 @@ int VideoDiskSpace(int *FreeMB, int *UsedMB)
   int free = 0, used = 0;
   int deleted = DeletedRecordings.TotalFileSizeMB();
   cVideoDirectory Dir;
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   do {
+#endif
      int u;
      free += Dir.FreeMB(&u);
      used += u;
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
      } while (Dir.Next());
+#endif
   if (deleted > used)
      deleted = used; // let's not get beyond 100%
   free += deleted;
@@ -232,18 +260,26 @@ cString PrefixVideoFileName(const char *FileName, char Prefix)
 void RemoveEmptyVideoDirectories(const char *IgnoreFiles[])
 {
   cVideoDirectory Dir;
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   do {
+#endif
      RemoveEmptyDirectories(Dir.Name(), false, IgnoreFiles);
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
      } while (Dir.Next());
+#endif
 }
 
 bool IsOnVideoDirectoryFileSystem(const char *FileName)
 {
   cVideoDirectory Dir;
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
   do {
+#endif
      if (EntriesOnSameFileSystem(Dir.Name(), FileName))
         return true;
+#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
      } while (Dir.Next());
+#endif
   return false;
 }
 
diff --git a/videodir.h b/videodir.h
index a25ac3193..35c1a5506 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 2.3 2012/09/30 11:01:15 kls Exp $
+ * $Id: videodir.h 3.0 2012/09/30 11:01:15 kls Exp $
  */
 
 #ifndef __VIDEODIR_H

From 277d66bfe1fc71f253895b0484b3d519b8403a8b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 19 Oct 2013 12:32:00 +0200
Subject: [PATCH 233/307] Version 2.1.2 VDR developer version 2.1.2 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.2.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.1-2.1.2.diff

MD5 checksums:

4725e9cb26fea8fa3682dd30f5594a50  vdr-2.1.2.tar.bz2
869d9b298b432a505186328bcf0b53c6  vdr-2.1.1-2.1.2.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed displaying DVB subtitles (thanks to Rolf Ahrenberg for helping to debug and
  understand subtitle page refreshes):
  + Fixed handling DVB subtitle fill region codes for 2 and 8 bpp.
  + Fixed handling pages without an explicit END_OF_DISPLAY_SET_SEGMENT.
    The FINISHPAGE_HACK is no longer necessary.
  + Fixed handling "page refreshes". The data is now parsed and stored closer to the
    DVB standard specs, introducing "object refs" and "region refs".
  + The debug output now goes into an HTML file named dbg-log.htm and shows the actual
    bitmaps (dbg-nnn.jpg) used to display the subtitles. That way it is much easier to
    see what's actually going on.
  + Fixed handling subtitles encoded as a string of characters (the very first
    character was always skipped).
- Fixed wrong initialization of Setup.PositionerSwing (reported by Arthur Konovalov).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed cleaning up old EPG events in case no epg data file is given (reported by
  Dave Pickles).
- Unified the internal sequence of actions when pressing the Blue and the Back key,
  respectively, during replay (reported by Thomas Maass).
- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
  is set to "do not pause live video" (suggested by Ulf Kiener).
- The code for distributing recordings over several video directories has been
  removed. VDR now by default assumes that the video directory is one big disk.
  If you absolutely need to use several separate disks to store recordings, you can
  write a plugin that uses the new cVideoDirectory API to implement the necessary
  functionality (see PLUGINS.html, section "The video directory"). You can copy the
  respective code from previous versions of videodir.c.
  IMPORTANT NOTE: If you write a plugin that implements a distributed video directory,
  =============== be sure to make cVideoDirectory::Rename() follow symbolic links!
                  This functionality was never implemented in VDR and it therefore
                  used a workaround in cutter.c. See the section marked with
                  // XXX this can be removed once RenameVideoFile() follows symlinks
                  in previous versions of cutter.c.
  + CloseVideoFile() is obsolete and has been removed.
  + The functions OpenVideoFile(), RenameVideoFile(), RemoveVideoFile(), VideoFileSpaceAvailable(),
    VideoDiskSpace(), RemoveEmptyVideoDirectories(), IsOnVideoDirectoryFileSystem() and
    PrefixVideoFileName() are now static members of cVideoDirectory and need to be called
    with the proper prefix.
  + The name of the video directory is now available through cVideoDirectory::Name().
- Added renaming and moving recordings and folders, editing a recording's priority and
  lifetime, and queueing cutting jobs (inspired by the "extrecmenu" plugin from Martin
  Prochnow).
  + The "Recording info" menu now has a new Blue button named "Edit", which opens a
    dialog in which several properties of the selected recording can be changed. It can
    be renamed or moved into another folder and its priority and lifetime can be
    modified (inspired by the "extrecmenu" plugin from Martin Prochnow).
    The new blue "Edit" button in the "Recordings" menu opens a dialog in which a folder
    can be renamed or moved. See MANUAL, section "Managing folders".
  + In the "Edit recording" menu the Yellow button ("Delete marks") allows you to delete
    all editing marks of the selected recording.
  + cCutter is no longer a static class. Cutting requests should now be invoked by
    calling RecordingsHandler.Add(ruCut, FileName). See the new cRecordingsHandler
    class in recording.h.
  + Cutting jobs are now placed in a queue (together with any move or copy jobs) and
    are processed one by one.
  + The new SVDRP command RENR can be used to rename a recording (suggested by Rolf
    Ahrenberg).
  + Note that in several places in the source code a "copy" operation is mentioned,
    however there is no user interface for this, yet.
- Changed some variable names in positioner.c to match the names used in the page with
  the explanation on vdr-portal.de.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed writing group separators to channels.conf that contain a comma (reported by
  Eike Edener).
- Now also checking the source (in addition to the transponder) when setting the
  system time from the TDT, which avoids problems in case devices are tuned to the
  same transponder on different sources, and these broadcast different time data
  (reported by Torsten Lang).
- Changed cRecorder::Action() to use cTimeMs instead of time() to avoid problems with
  unjustified "video data stream broken" errors in case the system time is changed
  while a recording is active (reported by Torsten Lang).
- Revised the section on "Learning the remote control keys" in the INSTALL file to
  avoid the impression that there actually is a default remote.conf file, and to
  not use any alphabetic keys for special functions, so that they remain available
  for textual input.
- The function cRecordings::MBperMinute() now only takes into account recordings with
  less than 5 seconds per megabyte, in an attempt to filter out radio recordings
  (thanks to Harald Koenig). The result of this function was way off any realistic
  value in case there are many radio recordings in the video directory.
- Added maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P (thanks
  to Guido Cordaro).
- Fixed an inconsistent behavior between opening the Recordings menu manually via the
  main menu and by pressing the Recordings key. In the latter case it automatically
  opened all sub folders to position the cursor to the last replayed recording, which
  is unexpected at this point (reported by Helmut Auer). You can still navigate to
  the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
  menu.
---
 CONTRIBUTORS                          |   33 +
 HISTORY                               |  112 ++-
 INSTALL                               |   20 +-
 MANUAL                                |   24 +
 PLUGINS.html                          |   39 +-
 PLUGINS/src/dvbhddevice/HISTORY       |    4 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c |    2 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po   |    2 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po   |    4 +-
 channels.c                            |   16 +-
 config.c                              |    4 +-
 config.h                              |   10 +-
 cutter.c                              |  102 +--
 cutter.h                              |   40 +-
 device.h                              |    4 +-
 dvbdevice.c                           |    4 +-
 dvbsubtitle.c                         | 1180 +++++++++++++++----------
 dvbsubtitle.h                         |    4 +-
 eit.c                                 |    4 +-
 epg.c                                 |   19 +-
 menu.c                                |  451 +++++++++-
 menu.h                                |    8 +-
 osd.c                                 |   15 +-
 osd.h                                 |   10 +-
 osdbase.c                             |   10 +-
 osdbase.h                             |    4 +-
 po/ar.po                              |   66 +-
 po/ca_ES.po                           |   66 +-
 po/cs_CZ.po                           |   66 +-
 po/da_DK.po                           |   66 +-
 po/de_DE.po                           |   66 +-
 po/el_GR.po                           |   66 +-
 po/es_ES.po                           |   66 +-
 po/et_EE.po                           |   86 +-
 po/fi_FI.po                           |   86 +-
 po/fr_FR.po                           |   66 +-
 po/hr_HR.po                           |   66 +-
 po/hu_HU.po                           |   66 +-
 po/it_IT.po                           |   88 +-
 po/lt_LT.po                           |   66 +-
 po/mk_MK.po                           |   66 +-
 po/nl_NL.po                           |   66 +-
 po/nn_NO.po                           |   66 +-
 po/pl_PL.po                           |   66 +-
 po/pt_PT.po                           |   66 +-
 po/ro_RO.po                           |   66 +-
 po/ru_RU.po                           |   66 +-
 po/sk_SK.po                           |   66 +-
 po/sl_SI.po                           |   66 +-
 po/sr_RS.po                           |   66 +-
 po/sv_SE.po                           |   66 +-
 po/tr_TR.po                           |   66 +-
 po/uk_UA.po                           |   66 +-
 po/zh_CN.po                           |   66 +-
 positioner.c                          |   12 +-
 recorder.c                            |   12 +-
 recording.c                           |  576 +++++++++++-
 recording.h                           |  129 ++-
 shutdown.c                            |    8 +-
 svdrp.c                               |   96 +-
 svdrp.h                               |    3 +-
 tools.c                               |   71 +-
 tools.h                               |    7 +-
 vdr.c                                 |   19 +-
 videodir.c                            |  272 ++----
 videodir.h                            |   85 +-
 66 files changed, 4321 insertions(+), 1004 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f16280697..3c31e1cc6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -618,6 +618,8 @@ Helmut Auer <vdr@helmutauer.de>
  for suggesting to read the epg.data file in a separate thread
  for some improvements to allowing the parameters PATH and NAME to the --dirnames
  command line option to be left empty to use the default values if only ENC shall be set
+ for reporting an inconsistent behavior between opening the Recordings menu manually
+ via the main menu and by pressing the Recordings key
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1169,6 +1171,8 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for fixing the call to ChannelString() in cSkinLCARSDisplayChannel::SetChannel()
  for a patch that was used to rename the "plp id" to a more general "stream id"
  and add support for DVB-S2 "Input Stream Identifier" (ISI)
+ for helping to debug and understand subtitle page refreshes
+ for a patch that was used to implement the SVDRP command RENR
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1491,6 +1495,8 @@ Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  for fixing handling the '0' key for switching between the last two channels
  for making cPatFilter::Process() check whether the channel exists before setting
  the PMT filter
+ for the Rotor plugin, from which code was used by a patch that was used as a base for
+ implementing support for positioners
 
 St�phane Est�-Gracias <sestegra@free.fr>
  for fixing a typo in libsi/si.h
@@ -1699,6 +1705,7 @@ Arthur Konovalov <artlov@gmail.com>
  for reporting references to old *.vdr file names in MANUAL
  for reporting that the video stream type was set to 2 even if the vpid was 0
  for updates to 'sources.conf'
+ for reporting a wrong initialization of Setup.PositionerSwing
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -2545,6 +2552,8 @@ Ulf Kiener <webmaster@ulf-kiener.de>
  for suggesting to add user defined key kUser0
  for suggesting to perform absolute jumps when replaying a recording (via the Red key)
  only if an actual value has been entered
+ for suggesting to make the Yellow button in the main menu not act as "Pause" if
+ "Pause key handling" is set to "do not pause live video"
 
 J�rg Wendel <vdr-ml@jwendel.de>
  for reporting that cPlugin::Active() was called too often
@@ -2961,6 +2970,7 @@ Johan Andersson <jna@jna.pp.se>
 Dave Pickles <dave@pickles.me.uk>
  for adding support for "content identifier descriptor" and "default authority
  descriptor" to 'libsi'
+ for reporting that old EPG events are not cleaned up in case no epg data file is given
 
 Holger Dengler <holger.dengler@gmx.de>
  for making the isnumber() function check the given pointer for NULL
@@ -3009,6 +3019,11 @@ Torsten Lang <info@torstenlang.de>
  for suggesting to increase the size of the TS buffer to 5MB and that of the Recorder
  buffer to 20MB to better handle HD recordings
  for fixing setting the video format in the dvbhdffdevice
+ for reporting a problem with setting the system time from the TDT in case devices
+ are tuned to the same transponder on different sources, and these broadcast different
+ time data
+ for reporting a problem with unjustified "video data stream broken" errors in case
+ the system time is changed while a recording is active
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
@@ -3169,3 +3184,21 @@ Seppo Ingalsuo <seppo.ingalsuo@iki.fi>
 Manfred V�lkel <mvoelkel@digitaldevices.de>
  for suggesting to make all bonded devices (except for the master) turn off their LNB
  power completely to avoid problems when receiving vertically polarized transponders
+
+Thomas Maass <mase@setho.org>
+ for reporting a difference in the internal sequence of actions when pressing the Blue
+ and the Back key, respectively, during replay
+
+Martin Prochnow <nordlicht@martins-kabuff.de>
+ for writing the "extrecmenu" plugin, which inspired the implementation of editing
+ recording properties
+
+Eike Edener <eike@edener.de>
+ for reporting a bug in writing group separators to channels.conf that contain a comma
+
+Harald Koenig <koenig@tat.physik.uni-tuebingen.de>
+ for making the function cRecordings::MBperMinute() only take into account recordings
+ with less than 5 seconds per megabyte, to filter out radio recordings
+
+Guido Cordaro <guido.cordaro@tiscali.it>
+ for adding maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P
diff --git a/HISTORY b/HISTORY
index 47944701e..2c03dd468 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7845,7 +7845,8 @@ Video Disk Recorder Revision History
 - Fixed a crash in the LCARS skin's main menu in case there is no current channel
   (reported by Dominique Dumont).
 - Added basic support for positioners to control steerable satellite dishes (based on
-  a patch from Seppo Ingalsuo and Ales Jurik).
+  a patch from Seppo Ingalsuo and Ales Jurik, which in turn used code from Thomas
+  Bergwinkl's Rotor plugin).
   + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
   + The new DiSEqC command code 'P' can be used to instruct a positioner to move the
     dish to the required satellite position. When a 'P' code is processed, further
@@ -7899,3 +7900,112 @@ Video Disk Recorder Revision History
   A recommended method for a relatively safe disk setup in a VDR system is to use two
   1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
   fails, you can replace it without data loss.
+
+2013-09-01: Version 2.0.3
+
+- Fixed asserting free disk space in the cutter.
+- No longer trying to delete old recordings in AssertFreeDiskSpace() if the given
+  Priority is less than 1.
+- Fixed handling LIRC events in case repeated events are lost.
+- Fixed a possible crash when shutting down VDR while subtitles are being displayed
+  (reported by Ville Skytt�).
+- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
+  a decoder and returns false otherwise. This should improve device allocation on
+  systems that are only used as a receiver and don't actually display anything.
+- Increased the value of MAXRETRIES to 20 to reduce the probability of disturbances
+  in transfer mode.
+- All bonded devices (except for the master) now turn off their LNB power completely
+  to avoid problems when receiving vertically polarized transponders (suggested by
+  Manfred V�lkel and Oliver Endriss).
+- Fixed cleaning up old EPG events in case no epg data file is given (reported by
+  Dave Pickles).
+
+2013-10-19: Version 2.1.2
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed displaying DVB subtitles (thanks to Rolf Ahrenberg for helping to debug and
+  understand subtitle page refreshes):
+  + Fixed handling DVB subtitle fill region codes for 2 and 8 bpp.
+  + Fixed handling pages without an explicit END_OF_DISPLAY_SET_SEGMENT.
+    The FINISHPAGE_HACK is no longer necessary.
+  + Fixed handling "page refreshes". The data is now parsed and stored closer to the
+    DVB standard specs, introducing "object refs" and "region refs".
+  + The debug output now goes into an HTML file named dbg-log.htm and shows the actual
+    bitmaps (dbg-nnn.jpg) used to display the subtitles. That way it is much easier to
+    see what's actually going on.
+  + Fixed handling subtitles encoded as a string of characters (the very first
+    character was always skipped).
+- Fixed wrong initialization of Setup.PositionerSwing (reported by Arthur Konovalov).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed cleaning up old EPG events in case no epg data file is given (reported by
+  Dave Pickles).
+- Unified the internal sequence of actions when pressing the Blue and the Back key,
+  respectively, during replay (reported by Thomas Maass).
+- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
+  is set to "do not pause live video" (suggested by Ulf Kiener).
+- The code for distributing recordings over several video directories has been
+  removed. VDR now by default assumes that the video directory is one big disk.
+  If you absolutely need to use several separate disks to store recordings, you can
+  write a plugin that uses the new cVideoDirectory API to implement the necessary
+  functionality (see PLUGINS.html, section "The video directory"). You can copy the
+  respective code from previous versions of videodir.c.
+  IMPORTANT NOTE: If you write a plugin that implements a distributed video directory,
+  =============== be sure to make cVideoDirectory::Rename() follow symbolic links!
+                  This functionality was never implemented in VDR and it therefore
+                  used a workaround in cutter.c. See the section marked with
+                  // XXX this can be removed once RenameVideoFile() follows symlinks
+                  in previous versions of cutter.c.
+  + CloseVideoFile() is obsolete and has been removed.
+  + The functions OpenVideoFile(), RenameVideoFile(), RemoveVideoFile(), VideoFileSpaceAvailable(),
+    VideoDiskSpace(), RemoveEmptyVideoDirectories(), IsOnVideoDirectoryFileSystem() and
+    PrefixVideoFileName() are now static members of cVideoDirectory and need to be called
+    with the proper prefix.
+  + The name of the video directory is now available through cVideoDirectory::Name().
+- Added renaming and moving recordings and folders, editing a recording's priority and
+  lifetime, and queueing cutting jobs (inspired by the "extrecmenu" plugin from Martin
+  Prochnow).
+  + The "Recording info" menu now has a new Blue button named "Edit", which opens a
+    dialog in which several properties of the selected recording can be changed. It can
+    be renamed or moved into another folder and its priority and lifetime can be
+    modified (inspired by the "extrecmenu" plugin from Martin Prochnow).
+    The new blue "Edit" button in the "Recordings" menu opens a dialog in which a folder
+    can be renamed or moved. See MANUAL, section "Managing folders".
+  + In the "Edit recording" menu the Yellow button ("Delete marks") allows you to delete
+    all editing marks of the selected recording.
+  + cCutter is no longer a static class. Cutting requests should now be invoked by
+    calling RecordingsHandler.Add(ruCut, FileName). See the new cRecordingsHandler
+    class in recording.h.
+  + Cutting jobs are now placed in a queue (together with any move or copy jobs) and
+    are processed one by one.
+  + The new SVDRP command RENR can be used to rename a recording (suggested by Rolf
+    Ahrenberg).
+  + Note that in several places in the source code a "copy" operation is mentioned,
+    however there is no user interface for this, yet.
+- Changed some variable names in positioner.c to match the names used in the page with
+  the explanation on vdr-portal.de.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed writing group separators to channels.conf that contain a comma (reported by
+  Eike Edener).
+- Now also checking the source (in addition to the transponder) when setting the
+  system time from the TDT, which avoids problems in case devices are tuned to the
+  same transponder on different sources, and these broadcast different time data
+  (reported by Torsten Lang).
+- Changed cRecorder::Action() to use cTimeMs instead of time() to avoid problems with
+  unjustified "video data stream broken" errors in case the system time is changed
+  while a recording is active (reported by Torsten Lang).
+- Revised the section on "Learning the remote control keys" in the INSTALL file to
+  avoid the impression that there actually is a default remote.conf file, and to
+  not use any alphabetic keys for special functions, so that they remain available
+  for textual input.
+- The function cRecordings::MBperMinute() now only takes into account recordings with
+  less than 5 seconds per megabyte, in an attempt to filter out radio recordings
+  (thanks to Harald Koenig). The result of this function was way off any realistic
+  value in case there are many radio recordings in the video directory.
+- Added maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P (thanks
+  to Guido Cordaro).
+- Fixed an inconsistent behavior between opening the Recordings menu manually via the
+  main menu and by pressing the Recordings key. In the latter case it automatically
+  opened all sub folders to position the cursor to the last replayed recording, which
+  is unexpected at this point (reported by Helmut Auer). You can still navigate to
+  the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
+  menu.
diff --git a/INSTALL b/INSTALL
index f3a831f03..384ba4460 100644
--- a/INSTALL
+++ b/INSTALL
@@ -439,19 +439,17 @@ for a detailed description).
 
 The recommended PC key assignments are:
 
-  Up, Down, Left, Right     Crsr keys in numeric block
-  Menu                      'Home' in numeric block
+  Up, Down, Left, Right     Cursor keys
+  Menu                      'Home'
   Ok                        'Enter'
-  Back                      'End' in numeric block
+  Back                      'Backspace'
   Red, Green, Yellow, Blue  'F1'..'F4'
-  0..9                      '0'..'9' in top row
-  Power                     'P'
-  Volume+/-                 '+', '-'
-  Mute                      'm'
-
-If you prefer different key assignments, or if the default doesn't work for
-your keyboard, simply delete the file 'remote.conf' and restart 'vdr' to get
-into learning mode.
+  0..9                      '0'..'9'
+  Volume+/-                 'PgUp', 'PgDn'
+  Mute                      'F10'
+
+If you want to change your key assignments later, simply delete the file
+'remote.conf' and restart 'vdr' to get into learning mode.
 
 Generating source code documentation:
 -------------------------------------
diff --git a/MANUAL b/MANUAL
index e698085d7..5ba444486 100644
--- a/MANUAL
+++ b/MANUAL
@@ -504,6 +504,30 @@ Version 2.0
   folder, or enters a sub folder. Once a folder has been selected, the entire
   path of the timer's file name will be replaced with the selected folder.
 
+  In the "Recordings" menu the folders of existing recordings can be renamed or
+  moved by pressing the "Blue" key ("Edit") while the cursor is positioned on
+  a folder. This will open a menu in which the folder's name and location (the
+  "parent" folder) can be edited. If such an operation will result in moving
+  more than one recording, you will be asked for confirmation.
+  The name, folder, priority and lifetime of an individual recording can be
+  changed by pressing the "Blue" key ("Info") while the cursor is positioned
+  on a recording, and in the resulting Info menu pressing the "Blue" key again
+  to bring up the "Edit recording" menu.
+  In the "Edit recording" menu the Red button ("Folder") allows you to select one
+  of your predefined folders. The Green button has multiple functions, depending
+  on what is currently going on with the recording. It can either stop or cancel
+  a cut, move or copy operation. If the button reads "Stop..." it means that the
+  respective operation is already happening, while "Cancel..." means that the
+  operation is still pending execution. If no operation is currently happening
+  and the recording has editing marks, the Button will read "Cut" and triggers
+  cutting the recording (same as pressing '2' while replaying the recording).
+  The Yellow button ("Delete marks") allows you to delete all editing marks from
+  the selected recording (if there are any and the recording is not currently
+  being cut). To directly edit the folder or name of the recording, position the
+  cursor to the respective line and press the Right key to start editing (press
+  Ok to confirm the edit, or Back to return to the previous value). Once you are
+  finished with editing the recording properties, press Ok to confirm the changes.
+
 * Parameters in the "Setup" menu
 
   Select "Setup" from the "VDR" menu to enter the setup menu. From there you can
diff --git a/PLUGINS.html b/PLUGINS.html
index 454eae2d9..71d840eaf 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -104,6 +104,7 @@ <h1>Table Of Contents</h1>
 <li><a href="#Remote Control">Remote Control</a>
 <li><a href="#Conditional Access">Conditional Access</a>
 <li><a href="#Electronic Program Guide">Electronic Program Guide</a>
+<li><modified><a href="#The video directory">The video directory</a></modified>
 </ul>
 </ul>
 
@@ -2042,8 +2043,6 @@ <h1>Table Of Contents</h1>
 #include &lt;vdr/positioner.h&gt;
 
 class cMyPositioner : public cPositioner {
-private:
-  void SendDiseqc(uint8_t *Codes, int NumCodes);
 public:
   cMyPositioner(void);
   virtual void Drive(ePositionerDirection Direction);
@@ -2302,5 +2301,41 @@ <h1>Table Of Contents</h1>
 <p>
 See <tt>VDR/epg.h</tt> for details.
 
+<div class="modified">
+<hr><h2><a name="The video directory">The video directory</a></h2>
+
+<div class="blurb">Bits and pieces...</div><p>
+
+By default VDR assumes that the video directory consists of one large
+volume, on which it can store its recordings. If you want to distribute your
+recordings over several physical drives, you can derive from <tt>cVideoDirectory</tt>,
+as in
+
+<p><table><tr><td class="code"><pre>
+#include &lt;vdr/videodir.h&gt;
+
+class cMyVideoDirectory : public cVideoDirectory {
+public:
+  cMyVideoDirectory(void);
+  virtual ~cMyVideoDirectory();
+  virtual int FreeMB(int *UsedMB = NULL);
+  virtual bool Register(const char *FileName);
+  virtual bool Rename(const char *OldName, const char *NewName);
+  virtual bool Move(const char *FromName, const char *ToName);
+  virtual bool Remove(const char *Name);
+  virtual void Cleanup(const char *IgnoreFiles[] = NULL);
+  virtual bool Contains(const char *Name);
+  };
+</pre></td></tr></table><p>
+
+See the description in <tt>videodir.h</tt> for details.
+<p>
+You should create your derived video directory object in the
+<a href="#Getting started"><tt>Start()</tt></a> function of your plugin.
+Note that the object has to be created on the heap (using <tt>new</tt>),
+and you shall not delete it at any point (it will be deleted automatically
+when the program ends).
+</div modified>
+
 </body>
 </html>
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index d22f14d64..9db7fd790 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -80,3 +80,7 @@ VDR Plugin 'dvbhddevice' Revision History
 
 - Fixed aspect ratio and position of scaled video.
 - Added yellow button in main menu to send CEC TV-Off command.
+
+2013-08-26: Version 2.1.2
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index cfd71bb1d..cff42d089 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.1.2";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 9bd9a393b..8cb0fdeba 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -26,7 +26,7 @@ msgid "TV on"
 msgstr "TV päälle"
 
 msgid "TV off"
-msgstr ""
+msgstr "TV kiinni"
 
 msgid "Automatic"
 msgstr "automaattinen"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index 2d895c645..02cb4a385 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2013-08-23 12:10+0200\n"
-"PO-Revision-Date: 2013-02-18 23:42+0100\n"
+"PO-Revision-Date: 2013-09-19 00:00+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
 "Language: it\n"
@@ -30,7 +30,7 @@ msgid "TV on"
 msgstr "TV accesa"
 
 msgid "TV off"
-msgstr ""
+msgstr "TV spenta"
 
 msgid "Automatic"
 msgstr "Automatica"
diff --git a/channels.c b/channels.c
index c205f84f7..7cb7e8835 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 3.0 2012/07/14 12:34:47 kls Exp $
+ * $Id: channels.c 3.1 2013/10/11 11:03:26 kls Exp $
  */
 
 #include "channels.h"
@@ -503,12 +503,14 @@ cString cChannel::ToText(const cChannel *Channel)
   char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia
   char *q = FullName;
   q += sprintf(q, "%s", Channel->name);
-  if (!isempty(Channel->shortName))
-     q += sprintf(q, ",%s", Channel->shortName);
-  else if (strchr(Channel->name, ','))
-     q += sprintf(q, ",");
-  if (!isempty(Channel->provider))
-     q += sprintf(q, ";%s", Channel->provider);
+  if (!Channel->groupSep) {
+     if (!isempty(Channel->shortName))
+        q += sprintf(q, ",%s", Channel->shortName);
+     else if (strchr(Channel->name, ','))
+        q += sprintf(q, ",");
+     if (!isempty(Channel->provider))
+        q += sprintf(q, ";%s", Channel->provider);
+     }
   *q = 0;
   strreplace(FullName, ':', '|');
   cString buffer;
diff --git a/config.c b/config.c
index 591d2ceb5..657b61c00 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.1 2013/05/23 12:41:06 kls Exp $
+ * $Id: config.c 3.2 2013/08/31 12:41:28 kls Exp $
  */
 
 #include "config.h"
@@ -393,7 +393,7 @@ cSetup::cSetup(void)
   SiteLat = 0;
   SiteLon = 0;
   PositionerSpeed = 15;
-  PositionerSwing = 65;
+  PositionerSwing = 650;
   PositionerLastLon = 0;
   SetSystemTime = 0;
   TimeSource = 0;
diff --git a/config.h b/config.h
index 6d1c0da43..de3e2aa54 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.2 2013/05/23 12:40:19 kls Exp $
+ * $Id: config.h 3.4 2013/10/19 11:32:15 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.1"
-#define VDRVERSNUM   20101  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.2"
+#define VDRVERSNUM   20102  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.1"
-#define APIVERSNUM   20101  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.2"
+#define APIVERSNUM   20102  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 5d007c484..9aee66b96 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 3.2 2013/08/21 13:15:24 kls Exp $
+ * $Id: cutter.c 3.4 2013/10/02 13:18:02 kls Exp $
  */
 
 #include "cutter.h"
@@ -642,46 +642,47 @@ void cCuttingThread::Action(void)
 
 // --- cCutter ---------------------------------------------------------------
 
-cMutex cCutter::mutex;
-cString cCutter::originalVersionName;
-cString cCutter::editedVersionName;
-cCuttingThread *cCutter::cuttingThread = NULL;
-bool cCutter::error = false;
-bool cCutter::ended = false;
+cCutter::cCutter(const char *FileName)
+{
+  cuttingThread = NULL;
+  error = false;
+  originalVersionName = FileName;
+}
 
-bool cCutter::Start(const char *FileName)
+cCutter::~cCutter()
 {
-  cMutexLock MutexLock(&mutex);
-  if (!cuttingThread) {
-     error = false;
-     ended = false;
-     originalVersionName = FileName;
-     cRecording Recording(FileName);
+  Stop();
+}
 
-     cMarks FromMarks;
-     FromMarks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
-     if (cMark *First = FromMarks.GetNextBegin())
+cString cCutter::EditedFileName(const char *FileName)
+{
+  cRecording Recording(FileName);
+  cMarks Marks;
+  if (Marks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording())) {
+     if (cMark *First = Marks.GetNextBegin())
         Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60);
+     return Recording.PrefixFileName('%');
+     }
+  return NULL;
+}
 
-     const char *evn = Recording.PrefixFileName('%');
-     if (evn && RemoveVideoFile(evn) && MakeDirs(evn, true)) {
-        // XXX this can be removed once RenameVideoFile() follows symlinks (see videodir.c)
-        // remove a possible deleted recording with the same name to avoid symlink mixups:
-        char *s = strdup(evn);
-        char *e = strrchr(s, '.');
-        if (e) {
-           if (strcmp(e, ".rec") == 0) {
-              strcpy(e, ".del");
-              RemoveVideoFile(s);
+bool cCutter::Start(void)
+{
+  if (!cuttingThread) {
+     error = false;
+     if (*originalVersionName) {
+        cRecording Recording(originalVersionName);
+        editedVersionName = EditedFileName(originalVersionName);
+        if (*editedVersionName) {
+           if (strcmp(originalVersionName, editedVersionName) != 0) { // names must be different!
+              if (cVideoDirectory::RemoveVideoFile(editedVersionName) && MakeDirs(editedVersionName, true)) {
+                 Recording.WriteInfo(editedVersionName);
+                 Recordings.AddByName(editedVersionName, false);
+                 cuttingThread = new cCuttingThread(originalVersionName, editedVersionName);
+                 return true;
+                 }
               }
            }
-        free(s);
-        // XXX
-        editedVersionName = evn;
-        Recording.WriteInfo();
-        Recordings.AddByName(editedVersionName, false);
-        cuttingThread = new cCuttingThread(FileName, editedVersionName);
-        return true;
         }
      }
   return false;
@@ -689,7 +690,6 @@ bool cCutter::Start(const char *FileName)
 
 void cCutter::Stop(void)
 {
-  cMutexLock MutexLock(&mutex);
   bool Interrupted = cuttingThread && cuttingThread->Active();
   const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
   delete cuttingThread;
@@ -701,42 +701,27 @@ void cCutter::Stop(void)
         esyslog("ERROR: '%s' during editing process", Error);
      if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), editedVersionName) == 0)
         cControl::Shutdown();
-     RemoveVideoFile(editedVersionName);
+     cVideoDirectory::RemoveVideoFile(editedVersionName);
      Recordings.DelByName(editedVersionName);
      }
 }
 
-bool cCutter::Active(const char *FileName)
+bool cCutter::Active(void)
 {
-  cMutexLock MutexLock(&mutex);
   if (cuttingThread) {
      if (cuttingThread->Active())
-        return !FileName || strcmp(FileName, originalVersionName) == 0 || strcmp(FileName, editedVersionName) == 0;
+        return true;
      error = cuttingThread->Error();
      Stop();
      if (!error)
         cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName, originalVersionName);
-     originalVersionName = NULL;
-     editedVersionName = NULL;
-     ended = true;
      }
   return false;
 }
 
 bool cCutter::Error(void)
 {
-  cMutexLock MutexLock(&mutex);
-  bool result = error;
-  error = false;
-  return result;
-}
-
-bool cCutter::Ended(void)
-{
-  cMutexLock MutexLock(&mutex);
-  bool result = ended;
-  ended = false;
-  return result;
+  return error;
 }
 
 #define CUTTINGCHECKINTERVAL 500 // ms between checks for the active cutting process
@@ -749,10 +734,13 @@ bool CutRecording(const char *FileName)
         cMarks Marks;
         if (Marks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording()) && Marks.Count()) {
            if (Marks.GetNumSequences()) {
-              if (cCutter::Start(FileName)) {
-                 while (cCutter::Active())
+              cCutter Cutter(FileName);
+              if (Cutter.Start()) {
+                 while (Cutter.Active())
                        cCondWait::SleepMs(CUTTINGCHECKINTERVAL);
-                 return true;
+                 if (!Cutter.Error())
+                    return true;
+                 fprintf(stderr, "error while cutting\n");
                  }
               else
                  fprintf(stderr, "can't start editing process\n");
diff --git a/cutter.h b/cutter.h
index 6821fd40d..c67429a15 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 3.0 2012/02/16 12:05:33 kls Exp $
+ * $Id: cutter.h 3.1 2013/10/05 11:34:55 kls Exp $
  */
 
 #ifndef __CUTTER_H
@@ -17,21 +17,31 @@ class cCuttingThread;
 
 class cCutter {
 private:
-  static cMutex mutex;
-  static cString originalVersionName;
-  static cString editedVersionName;
-  static cCuttingThread *cuttingThread;
-  static bool error;
-  static bool ended;
+  cString originalVersionName;
+  cString editedVersionName;
+  cCuttingThread *cuttingThread;
+  bool error;
 public:
-  static bool Start(const char *FileName);
-  static void Stop(void);
-  static bool Active(const char *FileName = NULL);
-         ///< Returns true if the cutter is currently active.
-         ///< If a FileName is given, true is only returned if either the
-         ///< original or the edited file name is equal to FileName.
-  static bool Error(void);
-  static bool Ended(void);
+  cCutter(const char *FileName);
+      ///< Sets up a new cutter for the given FileName, which must be the full path
+      ///< name of an existing recording directory.
+  ~cCutter();
+  static cString EditedFileName(const char *FileName);
+      ///< Returns the full path name of the edited version of the recording with
+      ///< the given FileName. This static function can be used independent of any
+      ///< cCutter object, to determine the file name beforehand.
+      ///< Returns NULL in case of error.
+  bool Start(void);
+      ///< Starts the actual cutting process.
+      ///< Returns true if successful.
+      ///< If Start() is called while the cutting process is already active, nothing
+      ///< happens and false will be returned.
+  void Stop(void);
+      ///< Stops an ongoing cutting process.
+  bool Active(void);
+      ///< Returns true if the cutter is currently active.
+  bool Error(void);
+      ///< Returns true if an error occurred while cutting the recording.
   };
 
 bool CutRecording(const char *FileName);
diff --git a/device.h b/device.h
index d4d50d400..aa3a0eec3 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 3.2 2013/08/22 11:57:34 kls Exp $
+ * $Id: device.h 3.3 2013/10/09 08:25:16 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -201,7 +201,7 @@ class cDevice : public cThread {
   int CardIndex(void) const { return cardIndex; }
          ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
   int DeviceNumber(void) const;
-         ///< Returns the number of this device (0 ... numDevices).
+         ///< Returns the number of this device (0 ... numDevices - 1).
   virtual cString DeviceType(void) const;
          ///< Returns a string identifying the type of this device (like "DVB-S").
          ///< If this device can receive different delivery systems, the returned
diff --git a/dvbdevice.c b/dvbdevice.c
index c61fb1721..3d01a5abf 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 3.3 2013/08/23 09:19:43 kls Exp $
+ * $Id: dvbdevice.c 3.4 2013/10/13 14:41:57 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -558,6 +558,8 @@ int cDvbTuner::GetSignalStrength(void) const
     case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2)
     case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2)
                      MaxSignal = 670; break;
+    case 0x13D02103: // TechniSat SkyStar 2 DVB-S rev 2.3P
+                     MaxSignal = 0x4925; break;
     }
   int s = int(Signal) * 100 / MaxSignal;
   if (s > 100)
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 89abc7088..f07267f13 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -5,9 +5,9 @@
  * how to reach the author.
  *
  * Original author: Marco Schluessler <marco@lordzodiac.de>
- * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
+ * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 3.0 2013/02/22 15:25:25 kls Exp $
+ * $Id: dvbsubtitle.c 3.4 2013/09/07 10:39:46 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -16,8 +16,6 @@
 #include "device.h"
 #include "libsi/si.h"
 
-//#define FINISHPAGE_HACK
-
 #define PAGE_COMPOSITION_SEGMENT    0x10
 #define REGION_COMPOSITION_SEGMENT  0x11
 #define CLUT_DEFINITION_SEGMENT     0x12
@@ -27,36 +25,129 @@
 #define END_OF_DISPLAY_SET_SEGMENT  0x80
 #define STUFFING_SEGMENT            0xFF
 
-// Set these to 'true' for debug output:
-static bool DebugConverter = false;
-static bool DebugSegments = false;
-static bool DebugPages = false;
-static bool DebugRegions = false;
-static bool DebugObjects = false;
-static bool DebugCluts = false;
-
-#define dbgconverter(a...) if (DebugConverter) fprintf(stderr, a)
-#define dbgsegments(a...) if (DebugSegments) fprintf(stderr, a)
-#define dbgpages(a...) if (DebugPages) fprintf(stderr, a)
-#define dbgregions(a...) if (DebugRegions) fprintf(stderr, a)
-#define dbgobjects(a...) if (DebugObjects) fprintf(stderr, a)
-#define dbgcluts(a...) if (DebugCluts) fprintf(stderr, a)
+// Set these to 'true' for debug output, which is written into the file dbg-log.htm
+// in the current working directory. The HTML file shows the actual bitmaps (dbg-nnn.jpg)
+// used to display the subtitles.
+static bool DebugNormal    = false; // shows pages, regions and objects
+static bool DebugVerbose   = false; // shows everything
+static bool DebugDisplay   = DebugVerbose || DebugNormal;
+static bool DebugPages     = DebugVerbose || DebugNormal;
+static bool DebugRegions   = DebugVerbose || DebugNormal;
+static bool DebugObjects   = DebugVerbose || DebugNormal;
+static bool DebugBitmaps   = DebugVerbose || DebugNormal;
+static bool DebugConverter = DebugVerbose;
+static bool DebugSegments  = DebugVerbose;
+static bool DebugPixel     = DebugVerbose;
+static bool DebugCluts     = DebugVerbose;
+static bool DebugOutput    = DebugVerbose;
+
+#define dbgdisplay(a...)   if (DebugDisplay)   SD.WriteHtml(a)
+#define dbgpages(a...)     if (DebugPages)     SD.WriteHtml(a)
+#define dbgregions(a...)   if (DebugRegions)   SD.WriteHtml(a)
+#define dbgobjects(a...)   if (DebugObjects)   SD.WriteHtml(a)
+#define dbgbitmaps(a...)   if (DebugBitmaps)   SD.WriteHtml(a)
+#define dbgconverter(a...) if (DebugConverter) SD.WriteHtml(a)
+#define dbgsegments(a...)  if (DebugSegments)  SD.WriteHtml(a)
+#define dbgpixel(a...)     if (DebugPixel)     SD.WriteHtml(a)
+#define dbgcluts(a...)     if (DebugCluts)     SD.WriteHtml(a)
+#define dbgoutput(a...)    if (DebugOutput)    SD.WriteHtml(a)
+
+#define DBGMAXBITMAPS  100 // debug output will be stopped after this many bitmaps
+#define DBGBITMAPWIDTH 400
+
+// --- cSubtitleDebug --------------------------------------------------------
+
+class cSubtitleDebug {
+private:
+  cMutex mutex;
+  int imgCnt;
+  int64_t firstPts;
+  bool newFile;
+  double factor;
+public:
+  cSubtitleDebug(void) { Reset(); }
+  void Reset(void);
+  bool Active(void) { return imgCnt < DBGMAXBITMAPS; }
+  int64_t FirstPts(void) { return firstPts; }
+  void SetFirstPts(int64_t FirstPts) { if (firstPts < 0) firstPts = FirstPts; }
+  void SetFactor(double Factor) { factor = Factor; }
+  cString WriteJpeg(const cBitmap *Bitmap, int MaxX = 0, int MaxY = 0);
+  void WriteHtml(const char *Format, ...);
+  };
+
+void cSubtitleDebug::Reset(void)
+{
+  imgCnt = 0;
+  firstPts = -1;
+  newFile = true;
+  factor = 1.0;
+}
+
+cString cSubtitleDebug::WriteJpeg(const cBitmap *Bitmap, int MaxX, int MaxY)
+{
+  if (!Active())
+     return NULL;
+  cMutexLock MutexLock(&mutex);
+  cBitmap *Scaled = Bitmap->Scaled(factor, factor, true);
+  int w = MaxX ? int(round(MaxX * factor)) : Scaled->Width();
+  int h = MaxY ? int(round(MaxY * factor)) : Scaled->Height();
+  uchar mem[w * h * 3];
+  for (int x = 0; x < w; x++) {
+      for (int y = 0; y < h; y++) {
+          tColor c = Scaled->GetColor(x, y);
+          int o = (y * w + x) * 3;
+          mem[o++] = (c & 0x00FF0000) >> 16;
+          mem[o++] = (c & 0x0000FF00) >> 8;
+          mem[o]   = (c & 0x000000FF);
+          }
+      }
+  delete Scaled;
+  int Size = 0;
+  uchar *Jpeg = RgbToJpeg(mem, w, h, Size);
+  cString ImgName = cString::sprintf("dbg-%03d.jpg", imgCnt++);
+  int f = open(ImgName, O_WRONLY | O_CREAT, DEFFILEMODE);
+  if (f >= 0) {
+     if (write(f, Jpeg, Size) < 0)
+        LOG_ERROR_STR(*ImgName);
+     close(f);
+     }
+  free(Jpeg);
+  return ImgName;
+}
+
+void cSubtitleDebug::WriteHtml(const char *Format, ...)
+{
+  if (!Active())
+     return;
+  cMutexLock MutexLock(&mutex);
+  if (FILE *f = fopen("dbg-log.htm", newFile ? "w" : "a")) {
+     va_list ap;
+     va_start(ap, Format);
+     vfprintf(f, Format, ap);
+     va_end(ap);
+     fclose(f);
+     newFile = false;
+     }
+}
+
+static cSubtitleDebug SD;
 
 // --- cSubtitleClut ---------------------------------------------------------
 
 class cSubtitleClut : public cListObject {
 private:
   int clutId;
-  int version;
+  int clutVersionNumber;
   cPalette palette2;
   cPalette palette4;
   cPalette palette8;
+  tColor yuv2rgb(int Y, int Cb, int Cr);
+  void SetColor(int Bpp, int Index, tColor Color);
 public:
   cSubtitleClut(int ClutId);
+  void Parse(cBitStream &bs);
   int ClutId(void) { return clutId; }
-  int Version(void) { return version; }
-  void SetVersion(int Version) { version = Version; }
-  void SetColor(int Bpp, int Index, tColor Color);
+  int ClutVersionNumber(void) { return clutVersionNumber; }
   const cPalette *GetPalette(int Bpp);
   };
 
@@ -67,7 +158,7 @@ cSubtitleClut::cSubtitleClut(int ClutId)
 {
   int a = 0, r = 0, g = 0, b = 0;
   clutId = ClutId;
-  version = -1;
+  clutVersionNumber = -1;
   // ETSI EN 300 743 10.3: 4-entry CLUT default contents
   palette2.SetColor(0, ArgbToColor(  0,   0,   0,   0));
   palette2.SetColor(1, ArgbToColor(255, 255, 255, 255));
@@ -129,6 +220,67 @@ cSubtitleClut::cSubtitleClut(int ClutId)
       }
 }
 
+void cSubtitleClut::Parse(cBitStream &bs)
+{
+  int Version = bs.GetBits(4);
+  if (clutVersionNumber == Version)
+     return; // no update
+  clutVersionNumber = Version;
+  bs.SkipBits(4); // reserved
+  dbgcluts("<b>clut</b> id %d version %d<br>\n", clutId, clutVersionNumber);
+  while (!bs.IsEOF()) {
+        uchar clutEntryId = bs.GetBits(8);
+        bool entryClut2Flag = bs.GetBit();
+        bool entryClut4Flag = bs.GetBit();
+        bool entryClut8Flag = bs.GetBit();
+        bs.SkipBits(4); // reserved
+        uchar yval;
+        uchar crval;
+        uchar cbval;
+        uchar tval;
+        if (bs.GetBit()) { // full_range_flag
+           yval  = bs.GetBits(8);
+           crval = bs.GetBits(8);
+           cbval = bs.GetBits(8);
+           tval  = bs.GetBits(8);
+           }
+        else {
+           yval  = bs.GetBits(6) << 2;
+           crval = bs.GetBits(4) << 4;
+           cbval = bs.GetBits(4) << 4;
+           tval  = bs.GetBits(2) << 6;
+           }
+        tColor value = 0;
+        if (yval) {
+           value = yuv2rgb(yval, cbval, crval);
+           value |= ((10 - (clutEntryId ? Setup.SubtitleFgTransparency : Setup.SubtitleBgTransparency)) * (255 - tval) / 10) << 24;
+           }
+        dbgcluts("%2d %d %d %d %08X<br>\n", clutEntryId, entryClut2Flag ? 2 : 0, entryClut4Flag ? 4 : 0, entryClut8Flag ? 8 : 0, value);
+        if (entryClut2Flag)
+           SetColor(2, clutEntryId, value);
+        if (entryClut4Flag)
+           SetColor(4, clutEntryId, value);
+        if (entryClut8Flag)
+           SetColor(8, clutEntryId, value);
+        }
+}
+
+tColor cSubtitleClut::yuv2rgb(int Y, int Cb, int Cr)
+{
+  int Ey, Epb, Epr;
+  int Eg, Eb, Er;
+
+  Ey = (Y - 16);
+  Epb = (Cb - 128);
+  Epr = (Cr - 128);
+  /* ITU-R 709 */
+  Er = constrain((298 * Ey             + 460 * Epr) / 256, 0, 255);
+  Eg = constrain((298 * Ey -  55 * Epb - 137 * Epr) / 256, 0, 255);
+  Eb = constrain((298 * Ey + 543 * Epb            ) / 256, 0, 255);
+
+  return (Er << 16) | (Eg << 8) | Eb;
+}
+
 void cSubtitleClut::SetColor(int Bpp, int Index, tColor Color)
 {
   switch (Bpp) {
@@ -155,86 +307,129 @@ const cPalette *cSubtitleClut::GetPalette(int Bpp)
 class cSubtitleObject : public cListObject {
 private:
   int objectId;
-  int version;
-  int codingMethod;
+  int objectVersionNumber;
+  int objectCodingMethod;
   bool nonModifyingColorFlag;
-  uchar backgroundPixelCode;
-  uchar foregroundPixelCode;
-  int providerFlag;
-  int px;
-  int py;
-  cBitmap *bitmap;
-  char textData[Utf8BufSize(256)]; // number of character codes is an 8-bit field
-  void DrawLine(int x, int y, tIndex Index, int Length);
-  bool Decode2BppCodeString(cBitStream *bs, int&x, int y, const uint8_t *MapTable);
-  bool Decode4BppCodeString(cBitStream *bs, int&x, int y, const uint8_t *MapTable);
-  bool Decode8BppCodeString(cBitStream *bs, int&x, int y);
+  int topLength;
+  int botLength;
+  uchar *topData;
+  uchar *botData;
+  char *txtData;
+  int lineHeight;
+  void DrawLine(cBitmap *Bitmap, int x, int y, tIndex Index, int Length);
+  bool Decode2BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y, const uint8_t *MapTable);
+  bool Decode4BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y, const uint8_t *MapTable);
+  bool Decode8BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y);
+  void DecodeSubBlock(cBitmap *Bitmap, int px, int py, const uchar *Data, int Length, bool Even);
+  void DecodeCharacterString(const uchar *Data, int NumberOfCodes);
 public:
-  cSubtitleObject(int ObjectId, cBitmap *Bitmap);
+  cSubtitleObject(int ObjectId);
+  ~cSubtitleObject();
+  void Parse(cBitStream &bs);
   int ObjectId(void) { return objectId; }
-  int Version(void) { return version; }
-  int CodingMethod(void) { return codingMethod; }
-  uchar BackgroundPixelCode(void) { return backgroundPixelCode; }
-  uchar ForegroundPixelCode(void) { return foregroundPixelCode; }
-  const char *TextData(void) { return &textData[0]; }
-  int X(void) { return px; }
-  int Y(void) { return py; }
+  int ObjectVersionNumber(void) { return objectVersionNumber; }
+  int ObjectCodingMethod(void) { return objectCodingMethod; }
   bool NonModifyingColorFlag(void) { return nonModifyingColorFlag; }
-  void DecodeCharacterString(const uchar *Data, int NumberOfCodes);
-  void DecodeSubBlock(const uchar *Data, int Length, bool Even);
-  void SetVersion(int Version) { version = Version; }
-  void SetBackgroundPixelCode(uchar BackgroundPixelCode) { backgroundPixelCode = BackgroundPixelCode; }
-  void SetForegroundPixelCode(uchar ForegroundPixelCode) { foregroundPixelCode = ForegroundPixelCode; }
-  void SetNonModifyingColorFlag(bool NonModifyingColorFlag) { nonModifyingColorFlag = NonModifyingColorFlag; }
-  void SetCodingMethod(int CodingMethod) { codingMethod = CodingMethod; }
-  void SetPosition(int x, int y) { px = x; py = y; }
-  void SetProviderFlag(int ProviderFlag) { providerFlag = ProviderFlag; }
+  void Render(cBitmap *Bitmap, int px, int py, tIndex IndexFg, tIndex IndexBg);
   };
 
-cSubtitleObject::cSubtitleObject(int ObjectId, cBitmap *Bitmap)
+cSubtitleObject::cSubtitleObject(int ObjectId)
 {
   objectId = ObjectId;
-  version = -1;
-  codingMethod = -1;
+  objectVersionNumber = -1;
+  objectCodingMethod = -1;
   nonModifyingColorFlag = false;
-  backgroundPixelCode = 0;
-  foregroundPixelCode = 0;
-  providerFlag = -1;
-  px = py = 0;
-  bitmap = Bitmap;
-  memset(textData, 0, sizeof(textData));
+  topLength = 0;
+  botLength = 0;
+  topData = NULL;
+  botData = NULL;
+  txtData = NULL;
+  lineHeight = 26; // configurable subtitling font size?
+}
+
+cSubtitleObject::~cSubtitleObject()
+{
+  free(topData);
+  free(botData);
+  free(txtData);
+}
+
+void cSubtitleObject::Parse(cBitStream &bs)
+{
+  int Version = bs.GetBits(4);
+  if (objectVersionNumber == Version)
+     return; // no update
+  objectVersionNumber = Version;
+  objectCodingMethod = bs.GetBits(2);
+  nonModifyingColorFlag = bs.GetBit();
+  bs.SkipBit(); // reserved
+  dbgobjects("<b>object</b> id %d version %d method %d modify %d", objectId, objectVersionNumber, objectCodingMethod, nonModifyingColorFlag); // no "<br>\n" here, DecodeCharacterString() may add data
+  if (objectCodingMethod == 0) { // coding of pixels
+     topLength = bs.GetBits(16);
+     botLength = bs.GetBits(16);
+     free(topData);
+     if ((topData = MALLOC(uchar, topLength)) != NULL)
+        memcpy(topData, bs.GetData(), topLength);
+     else
+        topLength = 0;
+     free(botData);
+     if ((botData = MALLOC(uchar, botLength)) != NULL)
+        memcpy(botData, bs.GetData() + topLength, botLength);
+     else
+        botLength = 0;
+     bs.WordAlign();
+     }
+  else if (objectCodingMethod == 1) { // coded as a string of characters
+     int numberOfCodes = bs.GetBits(8);
+     DecodeCharacterString(bs.GetData(), numberOfCodes);
+     }
+  dbgobjects("<br>\n");
+  if (DebugObjects) {
+     // We can't get the actual clut here, so we use a default one. This may lead to
+     // funny colors, but we just want to get a rough idea of what's in the object, anyway.
+     cSubtitleClut Clut(0);
+     cBitmap b(1920, 1080, 8);
+     b.Replace(*Clut.GetPalette(b.Bpp()));
+     b.Clean();
+     Render(&b, 0, 0, 0, 1);
+     int x1, y1, x2, y2;
+     if (b.Dirty(x1, y1, x2, y2)) {
+        cString ImgName = SD.WriteJpeg(&b, x2, y2);
+        dbgobjects("<img src=\"%s\"><br>\n", *ImgName);
+        }
+     }
 }
 
 void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes)
 {
+  // "ETSI EN 300 743 V1.3.1 (2006-11)", chapter 7.2.5 "Object data segment" specifies
+  // character_code to be a 16-bit index number into the character table identified
+  // in the subtitle_descriptor. However, the "subtitling_descriptor" <sic> according to
+  // "ETSI EN 300 468 V1.13.1 (2012-04)" doesn't contain a "character table identifier".
+  // It only contains a three letter language code, without any specification as to how
+  // this is related to a specific character table.
+  // Apparently the first "code" in textual subtitles contains the character table
+  // identifier, and all codes are 8-bit only. So let's first make Data a string of
+  // 8-bit characters:
   if (NumberOfCodes > 0) {
+     char txt[NumberOfCodes + 1];
+     for (int i = 0; i < NumberOfCodes; i++)
+         txt[i] = Data[i * 2 + 1];
+     txt[NumberOfCodes] = 0;
      bool singleByte;
-     const uchar *from = &Data[1];
-     int len = NumberOfCodes * 2 - 1;
-     cCharSetConv conv(SI::getCharacterTable(from, len, &singleByte));
-     if (singleByte) {
-        char txt[NumberOfCodes + 1];
-        char *p = txt;
-        for (int i = 2; i < NumberOfCodes; ++i) {
-            uchar c = Data[i * 2 + 1] & 0xFF;
-            if (c == 0)
-               break;
-            if (' ' <= c && c <= '~' || c == '\n' || 0xA0 <= c)
-               *(p++) = c;
-            else if (c == 0x8A)
-               *(p++) = '\n';
-            }
-        *p = 0;
-        const char *s = conv.Convert(txt);
-        Utf8Strn0Cpy(textData, s, Utf8StrLen(s));
-        }
-     else {
-        // TODO: add proper multibyte support for "UTF-16", "EUC-KR", "GB2312", "GBK", "UTF-8"
-        }
+     const uchar *from = (uchar *)txt;
+     int len = NumberOfCodes;
+     const char *CharacterTable = SI::getCharacterTable(from, len, &singleByte);
+     dbgobjects(" table %s single %d raw '%s'", CharacterTable, singleByte, from);
+     cCharSetConv conv(CharacterTable, cCharSetConv::SystemCharacterTable());
+     const char *s = conv.Convert((const char *)from);
+     dbgobjects(" conv '%s'", s);
+     free(txtData);
+     txtData = strdup(s);
      }
 }
 
-void cSubtitleObject::DecodeSubBlock(const uchar *Data, int Length, bool Even)
+void cSubtitleObject::DecodeSubBlock(cBitmap *Bitmap, int px, int py, const uchar *Data, int Length, bool Even)
 {
   int x = 0;
   int y = Even ? 0 : 1;
@@ -246,69 +441,65 @@ void cSubtitleObject::DecodeSubBlock(const uchar *Data, int Length, bool Even)
   while (!bs.IsEOF()) {
         switch (bs.GetBits(8)) {
           case 0x10:
-               dbgobjects("2-bit / pixel code string\n");
-               switch (bitmap->Bpp()) {
+               dbgpixel("2-bit / pixel code string<br>\n");
+               switch (Bitmap->Bpp()) {
                  case 8:  mapTable = map2to8; break;
                  case 4:  mapTable = map2to4; break;
                  default: mapTable = NULL;    break;
                  }
-               while (Decode2BppCodeString(&bs, x, y, mapTable) && !bs.IsEOF())
+               while (Decode2BppCodeString(Bitmap, px, py, &bs, x, y, mapTable) && !bs.IsEOF())
                      ;
                bs.ByteAlign();
                break;
           case 0x11:
-               dbgobjects("4-bit / pixel code string\n");
-               switch (bitmap->Bpp()) {
+               dbgpixel("4-bit / pixel code string<br>\n");
+               switch (Bitmap->Bpp()) {
                  case 8:  mapTable = map4to8; break;
                  default: mapTable = NULL;    break;
                  }
-               while (Decode4BppCodeString(&bs, x, y, mapTable) && !bs.IsEOF())
+               while (Decode4BppCodeString(Bitmap, px, py, &bs, x, y, mapTable) && !bs.IsEOF())
                      ;
                bs.ByteAlign();
                break;
           case 0x12:
-               dbgobjects("8-bit / pixel code string\n");
-               while (Decode8BppCodeString(&bs, x, y) && !bs.IsEOF())
+               dbgpixel("8-bit / pixel code string<br>\n");
+               while (Decode8BppCodeString(Bitmap, px, py, &bs, x, y) && !bs.IsEOF())
                      ;
                break;
           case 0x20:
-               dbgobjects("sub block 2 to 4 map\n");
-               map2to4[0] = bs.GetBits(4);
-               map2to4[1] = bs.GetBits(4);
-               map2to4[2] = bs.GetBits(4);
-               map2to4[3] = bs.GetBits(4);
+               dbgpixel("sub block 2 to 4 map<br>\n");
+               for (int i = 0; i < 4; ++i)
+                   map2to4[i] = bs.GetBits(4);
                break;
           case 0x21:
-               dbgobjects("sub block 2 to 8 map\n");
+               dbgpixel("sub block 2 to 8 map<br>\n");
                for (int i = 0; i < 4; ++i)
                    map2to8[i] = bs.GetBits(8);
                break;
           case 0x22:
-               dbgobjects("sub block 4 to 8 map\n");
+               dbgpixel("sub block 4 to 8 map<br>\n");
                for (int i = 0; i < 16; ++i)
                    map4to8[i] = bs.GetBits(8);
                break;
           case 0xF0:
-               dbgobjects("end of object line\n");
+               dbgpixel("end of object line<br>\n");
                x = 0;
                y += 2;
                break;
-          default: dbgobjects("unknown sub block %s %d\n", __FUNCTION__, __LINE__);
+          default: dbgpixel("unknown sub block %s %d<br>\n", __FUNCTION__, __LINE__);
           }
         }
 }
 
-void cSubtitleObject::DrawLine(int x, int y, tIndex Index, int Length)
+void cSubtitleObject::DrawLine(cBitmap *Bitmap, int x, int y, tIndex Index, int Length)
 {
   if (nonModifyingColorFlag && Index == 1)
      return;
-  x += px;
-  y += py;
   for (int pos = x; pos < x + Length; pos++)
-      bitmap->SetIndex(pos, y, Index);
+      Bitmap->SetIndex(pos, y, Index);
 }
 
-bool cSubtitleObject::Decode2BppCodeString(cBitStream *bs, int &x, int y, const uint8_t *MapTable)
+bool cSubtitleObject::Decode2BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int &x, int y, const uint8_t *MapTable)
 {
   int rl = 0;
   int color = 0;
@@ -343,12 +534,12 @@ bool cSubtitleObject::Decode2BppCodeString(cBitStream *bs, int &x, int y, const
      }
   if (MapTable)
      color = MapTable[color];
-  DrawLine(x, y, color, rl);
+  DrawLine(Bitmap, px + x, py + y, color, rl);
   x += rl;
   return true;
 }
 
-bool cSubtitleObject::Decode4BppCodeString(cBitStream *bs, int &x, int y, const uint8_t *MapTable)
+bool cSubtitleObject::Decode4BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int &x, int y, const uint8_t *MapTable)
 {
   int rl = 0;
   int color = 0;
@@ -388,12 +579,12 @@ bool cSubtitleObject::Decode4BppCodeString(cBitStream *bs, int &x, int y, const
      }
   if (MapTable)
      color = MapTable[color];
-  DrawLine(x, y, color, rl);
+  DrawLine(Bitmap, px + x, py + y, color, rl);
   x += rl;
   return true;
 }
 
-bool cSubtitleObject::Decode8BppCodeString(cBitStream *bs, int &x, int y)
+bool cSubtitleObject::Decode8BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int &x, int y)
 {
   int rl = 0;
   int color = 0;
@@ -413,105 +604,203 @@ bool cSubtitleObject::Decode8BppCodeString(cBitStream *bs, int &x, int y)
      else
         return false;
      }
-  DrawLine(x, y, color, rl);
+  DrawLine(Bitmap, px + x, py + y, color, rl);
   x += rl;
   return true;
 }
 
+void cSubtitleObject::Render(cBitmap *Bitmap, int px, int py, tIndex IndexFg, tIndex IndexBg)
+{
+  if (objectCodingMethod == 0) { // coding of pixels
+     DecodeSubBlock(Bitmap, px, py, topData, topLength, true);
+     if (botLength)
+        DecodeSubBlock(Bitmap, px, py, botData, botLength, false);
+     else
+        DecodeSubBlock(Bitmap, px, py, topData, topLength, false);
+     }
+  else if (objectCodingMethod == 1) { // coded as a string of characters
+     if (txtData) {
+        //TODO couldn't we draw the text directly into Bitmap?
+        cFont *font = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize);
+        cBitmap tmp(font->Width(txtData), font->Height(), Bitmap->Bpp());
+        double factor = (double)lineHeight / font->Height();
+        tmp.DrawText(0, 0, txtData, Bitmap->Color(IndexFg), Bitmap->Color(IndexBg), font);
+        cBitmap *scaled = tmp.Scaled(factor, factor, true);
+        Bitmap->DrawBitmap(px, py, *scaled);
+        delete scaled;
+        delete font;
+        }
+     }
+}
+
+// --- cSubtitleObjects ------------------------------------------------------
+
+class cSubtitleObjects : public cList<cSubtitleObject> {
+public:
+  cSubtitleObject *GetObjectById(int ObjectId, bool New = false);
+  };
+
+cSubtitleObject *cSubtitleObjects::GetObjectById(int ObjectId, bool New)
+{
+  for (cSubtitleObject *so = First(); so; so = Next(so)) {
+      if (so->ObjectId() == ObjectId)
+         return so;
+      }
+  if (!New)
+     return NULL;
+  cSubtitleObject *Object = new cSubtitleObject(ObjectId);
+  Add(Object);
+  return Object;
+}
+
+// --- cSubtitleObjectRef ----------------------------------------------------
+
+class cSubtitleObjectRef : public cListObject {
+private:
+  int objectId;
+  int objectType;
+  int objectProviderFlag;
+  int objectHorizontalPosition;
+  int objectVerticalPosition;
+  int foregroundPixelCode;
+  int backgroundPixelCode;
+public:
+  cSubtitleObjectRef(cBitStream &bs);
+  int ObjectId(void) { return objectId; }
+  int ObjectType(void) { return objectType; }
+  int ObjectProviderFlag(void) { return objectProviderFlag; }
+  int ObjectHorizontalPosition(void) { return objectHorizontalPosition; }
+  int ObjectVerticalPosition(void) { return objectVerticalPosition; }
+  int ForegroundPixelCode(void) { return foregroundPixelCode; }
+  int BackgroundPixelCode(void) { return backgroundPixelCode; }
+  };
+
+cSubtitleObjectRef::cSubtitleObjectRef(cBitStream &bs)
+{
+  objectId = bs.GetBits(16);
+  objectType = bs.GetBits(2);
+  objectProviderFlag = bs.GetBits(2);
+  objectHorizontalPosition = bs.GetBits(12);
+  bs.SkipBits(4); // reserved
+  objectVerticalPosition = bs.GetBits(12);
+  if (objectType == 0x01 || objectType == 0x02) {
+     foregroundPixelCode = bs.GetBits(8);
+     backgroundPixelCode = bs.GetBits(8);
+     }
+  else {
+     foregroundPixelCode = 0;
+     backgroundPixelCode = 0;
+     }
+  dbgregions("<b>objectref</b> id %d type %d flag %d x %d y %d fg %d bg %d<br>\n", objectId, objectType, objectProviderFlag, objectHorizontalPosition, objectVerticalPosition, foregroundPixelCode, backgroundPixelCode);
+}
+
 // --- cSubtitleRegion -------------------------------------------------------
 
-class cSubtitleRegion : public cListObject, public cBitmap {
+class cSubtitleRegion : public cListObject {
 private:
   int regionId;
-  int version;
+  int regionVersionNumber;
+  bool regionFillFlag;
+  int regionWidth;
+  int regionHeight;
+  int regionLevelOfCompatibility;
+  int regionDepth;
   int clutId;
-  int horizontalAddress;
-  int verticalAddress;
-  int level;
-  int lineHeight;
-  cList<cSubtitleObject> objects;
+  int region8bitPixelCode;
+  int region4bitPixelCode;
+  int region2bitPixelCode;
+  cList<cSubtitleObjectRef> objectRefs;
 public:
   cSubtitleRegion(int RegionId);
+  void Parse(cBitStream &bs);
   int RegionId(void) { return regionId; }
-  int Version(void) { return version; }
+  int RegionVersionNumber(void) { return regionVersionNumber; }
+  bool RegionFillFlag(void) { return regionFillFlag; }
+  int RegionWidth(void) { return regionWidth; }
+  int RegionHeight(void) { return regionHeight; }
+  int RegionLevelOfCompatibility(void) { return regionLevelOfCompatibility; }
+  int RegionDepth(void) { return regionDepth; }
   int ClutId(void) { return clutId; }
-  int Level(void) { return level; }
-  int Depth(void) { return Bpp(); }
-  void FillRegion(tIndex Index);
-  cSubtitleObject *GetObjectById(int ObjectId, bool New = false);
-  int HorizontalAddress(void) { return horizontalAddress; }
-  int VerticalAddress(void) { return verticalAddress; }
-  void SetVersion(int Version) { version = Version; }
-  void SetClutId(int ClutId) { clutId = ClutId; }
-  void SetLevel(int Level);
-  void SetDepth(int Depth);
-  void SetHorizontalAddress(int HorizontalAddress) { horizontalAddress = HorizontalAddress; }
-  void SetVerticalAddress(int VerticalAddress) { verticalAddress = VerticalAddress; }
-  void UpdateTextData(cSubtitleClut *Clut);
+  void Render(cBitmap *Bitmap, cSubtitleObjects *Objects);
   };
 
 cSubtitleRegion::cSubtitleRegion(int RegionId)
-:cBitmap(1, 1, 4)
 {
   regionId = RegionId;
-  version = -1;
+  regionVersionNumber = -1;
+  regionFillFlag = false;
+  regionWidth = 0;
+  regionHeight = 0;
+  regionLevelOfCompatibility = 0;
+  regionDepth = 0;
   clutId = -1;
-  horizontalAddress = 0;
-  verticalAddress = 0;
-  level = 0;
-  lineHeight = 26; // configurable subtitling font size
+  region8bitPixelCode = 0;
+  region4bitPixelCode = 0;
+  region2bitPixelCode = 0;
 }
 
-void cSubtitleRegion::FillRegion(tIndex Index)
+void cSubtitleRegion::Parse(cBitStream &bs)
 {
-  dbgregions("FillRegion %d\n", Index);
-  for (int y = 0; y < Height(); y++) {
-      for (int x = 0; x < Width(); x++)
-          SetIndex(x, y, Index);
-      }
+  int Version = bs.GetBits(4);
+  if (regionVersionNumber == Version)
+     return; // no update
+  regionVersionNumber = Version;
+  regionFillFlag = bs.GetBit();
+  bs.SkipBits(3); // reserved
+  regionWidth = bs.GetBits(16);
+  regionHeight = bs.GetBits(16);
+  regionLevelOfCompatibility = 1 << bs.GetBits(3); // stored as "number of bits per pixel"
+  regionDepth = 1 << bs.GetBits(3); // stored as "number of bits per pixel"
+  bs.SkipBits(2); // reserved
+  clutId = bs.GetBits(8);
+  region8bitPixelCode = bs.GetBits(8);
+  region4bitPixelCode = bs.GetBits(4);
+  region2bitPixelCode = bs.GetBits(2);
+  bs.SkipBits(2); // reserved
+  dbgregions("<b>region</b> id %d version %d fill %d width %d height %d level %d depth %d clutId %d<br>\n", regionId, regionVersionNumber, regionFillFlag, regionWidth, regionHeight, regionLevelOfCompatibility, regionDepth, clutId);
+  // no objectRefs.Clear() here!
+  while (!bs.IsEOF())
+        objectRefs.Add(new cSubtitleObjectRef(bs));
 }
 
-cSubtitleObject *cSubtitleRegion::GetObjectById(int ObjectId, bool New)
+void cSubtitleRegion::Render(cBitmap *Bitmap, cSubtitleObjects *Objects)
 {
-  cSubtitleObject *result = NULL;
-  for (cSubtitleObject *so = objects.First(); so; so = objects.Next(so)) {
-      if (so->ObjectId() == ObjectId)
-         result = so;
-      }
-  if (!result && New) {
-     result = new cSubtitleObject(ObjectId, this);
-     objects.Add(result);
+  if (regionFillFlag) {
+     switch (Bitmap->Bpp()) {
+       case 2: Bitmap->Fill(region2bitPixelCode); break;
+       case 4: Bitmap->Fill(region4bitPixelCode); break;
+       case 8: Bitmap->Fill(region8bitPixelCode); break;
+       default: dbgregions("unknown bpp %d (%s %d)<br>\n", Bitmap->Bpp(), __FUNCTION__, __LINE__);
+       }
      }
-  return result;
-}
-
-void cSubtitleRegion::UpdateTextData(cSubtitleClut *Clut)
-{
-  const cPalette *palette = Clut ? Clut->GetPalette(Depth()) : NULL;
-  for (cSubtitleObject *so = objects.First(); so && palette; so = objects.Next(so)) {
-      if (Utf8StrLen(so->TextData()) > 0) {
-         cFont *font = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize);
-         cBitmap tmp(font->Width(so->TextData()), font->Height(), Depth());
-         double factor = (double)lineHeight / font->Height();
-         tmp.DrawText(0, 0, so->TextData(), palette->Color(so->ForegroundPixelCode()), palette->Color(so->BackgroundPixelCode()), font);
-         cBitmap *scaled = tmp.Scaled(factor, factor, true);
-         DrawBitmap(so->X(), so->Y(), *scaled);
-         delete scaled;
-         delete font;
+  for (cSubtitleObjectRef *sor = objectRefs.First(); sor; sor = objectRefs.Next(sor)) {
+      if (cSubtitleObject *so = Objects->GetObjectById(sor->ObjectId())) {
+         so->Render(Bitmap, sor->ObjectHorizontalPosition(), sor->ObjectVerticalPosition(), sor->ForegroundPixelCode(), sor->BackgroundPixelCode());
          }
       }
 }
 
-void cSubtitleRegion::SetLevel(int Level)
-{
-  if (Level > 0 && Level < 4)
-     level = 1 << Level;
-}
+// --- cSubtitleRegionRef ----------------------------------------------------
 
-void cSubtitleRegion::SetDepth(int Depth)
+class cSubtitleRegionRef : public cListObject {
+private:
+  int regionId;
+  int regionHorizontalAddress;
+  int regionVerticalAddress;
+public:
+  cSubtitleRegionRef(cBitStream &bs);
+  int RegionId(void) { return regionId; }
+  int RegionHorizontalAddress(void) { return regionHorizontalAddress; }
+  int RegionVerticalAddress(void) { return regionVerticalAddress; }
+  };
+
+cSubtitleRegionRef::cSubtitleRegionRef(cBitStream &bs)
 {
-  if (Depth > 0 && Depth < 4)
-     SetBpp(1 << Depth);
+  regionId = bs.GetBits(8);
+  bs.SkipBits(8); // reserved
+  regionHorizontalAddress = bs.GetBits(16);
+  regionVerticalAddress = bs.GetBits(16);
+  dbgpages("<b>regionref</b> id %d tx %d y %d<br>\n", regionId, regionHorizontalAddress, regionVerticalAddress);
 }
 
 // --- cDvbSubtitlePage ------------------------------------------------------
@@ -519,119 +808,132 @@ void cSubtitleRegion::SetDepth(int Depth)
 class cDvbSubtitlePage : public cListObject {
 private:
   int pageId;
-  int version;
-  int state;
+  int pageTimeout;
+  int pageVersionNumber;
+  int pageState;
   int64_t pts;
-  int timeout;
+  bool pending;
+  cSubtitleObjects objects;
   cList<cSubtitleClut> cluts;
-public:
   cList<cSubtitleRegion> regions;
+  cList<cSubtitleRegionRef> regionRefs;
+public:
   cDvbSubtitlePage(int PageId);
-  virtual ~cDvbSubtitlePage();
+  void Parse(int64_t Pts, cBitStream &bs);
   int PageId(void) { return pageId; }
-  int Version(void) { return version; }
-  int State(void) { return state; }
-  tArea *GetAreas(double FactorX, double FactorY);
+  int PageTimeout(void) { return pageTimeout; }
+  int PageVersionNumber(void) { return pageVersionNumber; }
+  int PageState(void) { return pageState; }
+  int64_t Pts(void) const { return pts; }
+  bool Pending(void) { return pending; }
+  cSubtitleObjects *Objects(void) { return &objects; }
+  tArea *GetAreas(int &NumAreas, double FactorX, double FactorY);
+  cSubtitleObject *GetObjectById(int ObjectId, bool New = false);
   cSubtitleClut *GetClutById(int ClutId, bool New = false);
-  cSubtitleObject *GetObjectById(int ObjectId);
   cSubtitleRegion *GetRegionById(int RegionId, bool New = false);
-  int64_t Pts(void) const { return pts; }
-  int Timeout(void) { return timeout; }
-  void SetVersion(int Version) { version = Version; }
-  void SetPts(int64_t Pts) { pts = Pts; }
-  void SetState(int State);
-  void SetTimeout(int Timeout) { timeout = Timeout; }
+  cSubtitleRegionRef *GetRegionRefByIndex(int RegionRefIndex) { return regionRefs.Get(RegionRefIndex); }
+  void SetPending(bool Pending) { pending = Pending; }
   };
 
 cDvbSubtitlePage::cDvbSubtitlePage(int PageId)
 {
   pageId = PageId;
-  version = -1;
-  state = -1;
-  pts = 0;
-  timeout = 0;
+  pageTimeout = 0;
+  pageVersionNumber = -1;
+  pageState = -1;
+  pts = -1;
+  pending = false;
 }
 
-cDvbSubtitlePage::~cDvbSubtitlePage()
+void cDvbSubtitlePage::Parse(int64_t Pts, cBitStream &bs)
 {
+  if (Pts >= 0)
+     pts = Pts;
+  pageTimeout = bs.GetBits(8);
+  int Version = bs.GetBits(4);
+  if (pageVersionNumber == Version)
+     return; // no update
+  pageVersionNumber = Version;
+  pageState = bs.GetBits(2);
+  switch (pageState) {
+    case 0: // normal case - page update
+         break;
+    case 1: // acquisition point - page refresh
+         regions.Clear();
+         objects.Clear();
+         break;
+    case 2: // mode change - new page
+         regions.Clear();
+         cluts.Clear();
+         objects.Clear();
+         break;
+    case 3: // reserved
+         break;
+    default: dbgpages("unknown page state: %d<br>\n", pageState);
+    }
+  bs.SkipBits(2); // reserved
+  dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+  regionRefs.Clear();
+  while (!bs.IsEOF())
+        regionRefs.Add(new cSubtitleRegionRef(bs));
+  pending = true;
 }
 
-tArea *cDvbSubtitlePage::GetAreas(double FactorX, double FactorY)
+tArea *cDvbSubtitlePage::GetAreas(int &NumAreas, double FactorX, double FactorY)
 {
   if (regions.Count() > 0) {
-     tArea *Areas = new tArea[regions.Count()];
+     NumAreas = regionRefs.Count();
+     tArea *Areas = new tArea[NumAreas];
      tArea *a = Areas;
-     for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
-         a->x1 = int(round(FactorX * sr->HorizontalAddress()));
-         a->y1 = int(round(FactorY * sr->VerticalAddress()));
-         a->x2 = int(round(FactorX * (sr->HorizontalAddress() + sr->Width() - 1)));
-         a->y2 = int(round(FactorY * (sr->VerticalAddress() + sr->Height() - 1)));
-         a->bpp = sr->Bpp();
-         while ((a->Width() & 3) != 0)
-               a->x2++; // aligns width to a multiple of 4, so 2, 4 and 8 bpp will work
+     for (cSubtitleRegionRef *srr = regionRefs.First(); srr; srr = regionRefs.Next(srr)) {
+         if (cSubtitleRegion *sr = GetRegionById(srr->RegionId())) {
+            a->x1 = int(round(FactorX * srr->RegionHorizontalAddress()));
+            a->y1 = int(round(FactorY * srr->RegionVerticalAddress()));
+            a->x2 = int(round(FactorX * (srr->RegionHorizontalAddress() + sr->RegionWidth() - 1)));
+            a->y2 = int(round(FactorY * (srr->RegionVerticalAddress() + sr->RegionHeight() - 1)));
+            a->bpp = sr->RegionDepth();
+            while ((a->Width() & 3) != 0)
+                  a->x2++; // aligns width to a multiple of 4, so 2, 4 and 8 bpp will work
+            }
+         else
+            a->x1 = a->y1 = a->x2 = a->y2 = a->bpp = 0;
          a++;
          }
      return Areas;
      }
+  NumAreas = 0;
   return NULL;
 }
 
 cSubtitleClut *cDvbSubtitlePage::GetClutById(int ClutId, bool New)
 {
-  cSubtitleClut *result = NULL;
   for (cSubtitleClut *sc = cluts.First(); sc; sc = cluts.Next(sc)) {
       if (sc->ClutId() == ClutId)
-         result = sc;
+         return sc;
       }
-  if (!result && New) {
-     result = new cSubtitleClut(ClutId);
-     cluts.Add(result);
-     }
-  return result;
+  if (!New)
+     return NULL;
+  cSubtitleClut *Clut = new cSubtitleClut(ClutId);
+  cluts.Add(Clut);
+  return Clut;
 }
 
 cSubtitleRegion *cDvbSubtitlePage::GetRegionById(int RegionId, bool New)
 {
-  cSubtitleRegion *result = NULL;
   for (cSubtitleRegion *sr = regions.First(); sr; sr = regions.Next(sr)) {
       if (sr->RegionId() == RegionId)
-         result = sr;
+         return sr;
       }
-  if (!result && New) {
-     result = new cSubtitleRegion(RegionId);
-     regions.Add(result);
-     }
-  return result;
+  if (!New)
+     return NULL;
+  cSubtitleRegion *Region = new cSubtitleRegion(RegionId);
+  regions.Add(Region);
+  return Region;
 }
 
-cSubtitleObject *cDvbSubtitlePage::GetObjectById(int ObjectId)
+cSubtitleObject *cDvbSubtitlePage::GetObjectById(int ObjectId, bool New)
 {
-  cSubtitleObject *result = NULL;
-  for (cSubtitleRegion *sr = regions.First(); sr && !result; sr = regions.Next(sr))
-      result = sr->GetObjectById(ObjectId);
-  return result;
-}
-
-void cDvbSubtitlePage::SetState(int State)
-{
-  state = State;
-  switch (state) {
-    case 0: // normal case - page update
-         dbgpages("page update\n");
-         break;
-    case 1: // acquisition point - page refresh
-         dbgpages("page refresh\n");
-         regions.Clear();
-         break;
-    case 2: // mode change - new page
-         dbgpages("new Page\n");
-         regions.Clear();
-         cluts.Clear();
-         break;
-    case 3: // reserved
-         break;
-    default: dbgpages("unknown page state (%s %d)\n", __FUNCTION__, __LINE__);
-    }
+  return objects.GetObjectById(ObjectId, New);
 }
 
 // --- cDvbSubtitleAssembler -------------------------------------------------
@@ -714,6 +1016,7 @@ void cDvbSubtitleAssembler::Put(const uchar *Data, int Length)
 
 class cDvbSubtitleBitmaps : public cListObject {
 private:
+  int state;
   int64_t pts;
   int timeout;
   tArea *areas;
@@ -722,16 +1025,20 @@ class cDvbSubtitleBitmaps : public cListObject {
   double osdFactorY;
   cVector<cBitmap *> bitmaps;
 public:
-  cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactorX, double OsdFactorY);
+  cDvbSubtitleBitmaps(int State, int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactorX, double OsdFactorY);
   ~cDvbSubtitleBitmaps();
+  int State(void) { return state; }
   int64_t Pts(void) { return pts; }
   int Timeout(void) { return timeout; }
   void AddBitmap(cBitmap *Bitmap);
+  bool HasBitmaps(void) { return bitmaps.Size(); }
   void Draw(cOsd *Osd);
+  void DbgDump(int WindowWidth, int WindowHeight);
   };
 
-cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactorX, double OsdFactorY)
+cDvbSubtitleBitmaps::cDvbSubtitleBitmaps(int State, int64_t Pts, int Timeout, tArea *Areas, int NumAreas, double OsdFactorX, double OsdFactorY)
 {
+  state = State;
   pts = Pts;
   timeout = Timeout;
   areas = Areas;
@@ -765,11 +1072,11 @@ void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
          }
      if (Osd->CanHandleAreas(areas, numAreas) != oeOk) {
         for (int i = 0; i < numAreas; i++)
-            Bpp[i] = areas[i].bpp = Bpp[i];
+            areas[i].bpp = Bpp[i];
         AntiAlias = false;
         }
      }
-  if (Osd->SetAreas(areas, numAreas) == oeOk) {
+  if (State() == 0 || Osd->SetAreas(areas, numAreas) == oeOk) {
      for (int i = 0; i < bitmaps.Size(); i++) {
          cBitmap *b = bitmaps[i];
          if (Scale)
@@ -782,6 +1089,37 @@ void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
      }
 }
 
+void cDvbSubtitleBitmaps::DbgDump(int WindowWidth, int WindowHeight)
+{
+  if (!SD.Active())
+     return;
+  SD.SetFirstPts(Pts());
+  double STC = double(cDevice::PrimaryDevice()->GetSTC() - SD.FirstPts()) / 90000;
+  double Start = double(Pts() - SD.FirstPts()) / 90000;
+  double Duration = Timeout();
+  double End = Start + Duration;
+  cBitmap Bitmap(WindowWidth, WindowHeight, 8);
+#define DBGBACKGROUND 0xA0A0A0
+  Bitmap.DrawRectangle(0, 0, WindowWidth - 1, WindowHeight - 1, DBGBACKGROUND);
+  for (int i = 0; i < bitmaps.Size(); i++) {
+      cBitmap *b = bitmaps[i];
+      Bitmap.DrawBitmap(b->X0(), b->Y0(), *b);
+      }
+  cString ImgName = SD.WriteJpeg(&Bitmap);
+#define BORDER //" border=1"
+  SD.WriteHtml("<p>%s<br>", State() == 0 ? "page update" : State() == 1 ? "page refresh" : State() == 2 ? "new page" : "???");
+  SD.WriteHtml("<table" BORDER "><tr><td>");
+  SD.WriteHtml("%.2f", STC);
+  SD.WriteHtml("</td><td>");
+  SD.WriteHtml("<img src=\"%s\">", *ImgName);
+  SD.WriteHtml("</td><td style=\"height:100%%\"><table" BORDER " style=\"height:100%%\">");
+  SD.WriteHtml("<tr><td valign=top><b>%.2f</b></td></tr>", Start);
+  SD.WriteHtml("<tr><td valign=middle>%.2f</td></tr>", Duration);
+  SD.WriteHtml("<tr><td valign=bottom>%.2f</td></tr>", End);
+  SD.WriteHtml("</table></td>");
+  SD.WriteHtml("</tr></table>\n");
+}
+
 // --- cDvbSubtitleConverter -------------------------------------------------
 
 int cDvbSubtitleConverter::setupLevel = 0;
@@ -799,6 +1137,7 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
   windowVerticalOffset = 0;
   pages = new cList<cDvbSubtitlePage>;
   bitmaps = new cList<cDvbSubtitleBitmaps>;
+  SD.Reset();
   Start();
 }
 
@@ -818,7 +1157,7 @@ void cDvbSubtitleConverter::SetupChanged(void)
 
 void cDvbSubtitleConverter::Reset(void)
 {
-  dbgconverter("Converter reset -----------------------\n");
+  dbgconverter("converter reset -----------------------<br>\n");
   dvbSubtitleAssembler->Reset();
   Lock();
   pages->Clear();
@@ -848,9 +1187,9 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
         }
 
      if (Length > PayloadOffset + SubstreamHeaderLength) {
-        int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : 0;
-        if (pts)
-           dbgconverter("Converter PTS: %"PRId64"\n", pts);
+        int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
+        if (pts >= 0)
+           dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
         int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
         if (ResetSubtitleAssembler)
@@ -884,9 +1223,9 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
   if (Data && Length > 8) {
      int PayloadOffset = PesPayloadOffset(Data);
      if (Length > PayloadOffset) {
-        int64_t pts = PesGetPts(Data);
-        if (pts)
-           dbgconverter("Converter PTS: %"PRId64"\n", pts);
+        int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
+        if (pts >= 0)
+           dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
         const uchar *data = Data + PayloadOffset;
         int length = Length - PayloadOffset;
         if (length > 3) {
@@ -914,7 +1253,6 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
 }
 
 #define LimitTo32Bit(n) ((n) & 0x00000000FFFFFFFFL)
-#define MAXDELTA 40000 // max. reasonable PTS/STC delta in ms
 
 void cDvbSubtitleConverter::Action(void)
 {
@@ -927,55 +1265,47 @@ void cDvbSubtitleConverter::Action(void)
            if (osd) {
               int NewSetupLevel = setupLevel;
               if (Timeout.TimedOut() || LastSetupLevel != NewSetupLevel) {
+                 dbgoutput("closing osd<br>\n");
                  DELETENULL(osd);
                  }
               LastSetupLevel = NewSetupLevel;
               }
-           if (cDvbSubtitleBitmaps *sb = bitmaps->First()) {
-              int64_t STC = cDevice::PrimaryDevice()->GetSTC();
-              int64_t Delta = LimitTo32Bit(sb->Pts()) - LimitTo32Bit(STC); // some devices only deliver 32 bits
-              if (Delta > (int64_t(1) << 31))
-                 Delta -= (int64_t(1) << 32);
-              else if (Delta < -((int64_t(1) << 31) - 1))
-                 Delta += (int64_t(1) << 32);
-              Delta /= 90; // STC and PTS are in 1/90000s
-              if (Delta <= MAXDELTA) {
-                 if (Delta <= 0) {
-                    dbgconverter("Got %d bitmaps, showing #%d\n", bitmaps->Count(), sb->Index() + 1);
-                    if (AssertOsd()) {
-                       sb->Draw(osd);
-                       Timeout.Set(sb->Timeout() * 1000);
-                       dbgconverter("PTS: %"PRId64"  STC: %"PRId64" (%"PRId64") timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
-                       }
-                    bitmaps->Del(sb);
-                    }
-                 else if (Delta < WaitMs)
-                    WaitMs = Delta;
-                 }
-              else
-                 bitmaps->Del(sb);
-              }
+           for (cDvbSubtitleBitmaps *sb = bitmaps->First(); sb; sb = bitmaps->Next(sb)) {
+               // Calculate the Delta between the STC (the current timestamp of the video)
+               // and the bitmap's PTS (the timestamp when the bitmap shall be presented).
+               // A negative Delta means that the bitmap will be presented in the future:
+               int64_t STC = cDevice::PrimaryDevice()->GetSTC();
+               int64_t Delta = LimitTo32Bit(STC) - LimitTo32Bit(sb->Pts()); // some devices only deliver 32 bits
+               if (Delta > (int64_t(1) << 31))
+                  Delta -= (int64_t(1) << 32);
+               else if (Delta < -((int64_t(1) << 31) - 1))
+                  Delta += (int64_t(1) << 32);
+               Delta /= 90; // STC and PTS are in 1/90000s
+               if (Delta >= 0) { // found a bitmap that shall be displayed...
+                  if (Delta < sb->Timeout() * 1000) { // ...and has not timed out yet
+                     if (!sb->HasBitmaps()) {
+                        Timeout.Set();
+                        WaitMs = 0;
+                        }
+                     else if (AssertOsd()) {
+                        dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
+                        sb->Draw(osd);
+                        Timeout.Set(sb->Timeout() * 1000);
+                        dbgconverter("PTS: %"PRId64"  STC: %"PRId64" (%"PRId64") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
+                        }
+                     }
+                  else
+                     WaitMs = 0; // bitmap already timed out, so try next one immediately
+                  dbgoutput("deleting bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
+                  bitmaps->Del(sb);
+                  break;
+                  }
+               }
            }
         cCondWait::SleepMs(WaitMs);
         }
 }
 
-tColor cDvbSubtitleConverter::yuv2rgb(int Y, int Cb, int Cr)
-{
-  int Ey, Epb, Epr;
-  int Eg, Eb, Er;
-
-  Ey = (Y - 16);
-  Epb = (Cb - 128);
-  Epr = (Cr - 128);
-  /* ITU-R 709 */
-  Er = constrain((298 * Ey             + 460 * Epr) / 256, 0, 255);
-  Eg = constrain((298 * Ey -  55 * Epb - 137 * Epr) / 256, 0, 255);
-  Eb = constrain((298 * Ey + 543 * Epb            ) / 256, 0, 255);
-
-  return (Er << 16) | (Eg << 8) | Eb;
-}
-
 void cDvbSubtitleConverter::SetOsdData(void)
 {
   int OsdWidth, OsdHeight;
@@ -1006,6 +1336,19 @@ bool cDvbSubtitleConverter::AssertOsd(void)
   return osd != NULL;
 }
 
+cDvbSubtitlePage *cDvbSubtitleConverter::GetPageById(int PageId, bool New)
+{
+  for (cDvbSubtitlePage *sp = pages->First(); sp; sp = pages->Next(sp)) {
+      if (sp->PageId() == PageId)
+         return sp;
+      }
+  if (!New)
+     return NULL;
+  cDvbSubtitlePage *Page = new cDvbSubtitlePage(PageId);
+  pages->Add(Page);
+  return Page;
+}
+
 int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t Pts)
 {
   cBitStream bs(Data, Length * 8);
@@ -1013,177 +1356,42 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
      int segmentType = bs.GetBits(8);
      if (segmentType == STUFFING_SEGMENT)
         return -1;
-     int pageId = bs.GetBits(16);
+     LOCK_THREAD;
+     cDvbSubtitlePage *page = GetPageById(bs.GetBits(16), true);
      int segmentLength = bs.GetBits(16);
      if (!bs.SetLength(bs.Index() + segmentLength * 8))
         return -1;
-     cDvbSubtitlePage *page = NULL;
-     LOCK_THREAD;
-     for (cDvbSubtitlePage *sp = pages->First(); sp; sp = pages->Next(sp)) {
-         if (sp->PageId() == pageId) {
-            page = sp;
-            break;
-            }
-         }
-     if (!page) {
-        page = new cDvbSubtitlePage(pageId);
-        pages->Add(page);
-        dbgpages("Create SubtitlePage %d (total pages = %d)\n", pageId, pages->Count());
-        }
-     if (Pts)
-        page->SetPts(Pts);
      switch (segmentType) {
        case PAGE_COMPOSITION_SEGMENT: {
-            dbgsegments("PAGE_COMPOSITION_SEGMENT\n");
-            int pageTimeout = bs.GetBits(8);
-            int pageVersion = bs.GetBits(4);
-            if (pageVersion == page->Version())
-               break; // no update
-            page->SetVersion(pageVersion);
-            page->SetTimeout(pageTimeout);
-            page->SetState(bs.GetBits(2));
-            bs.SkipBits(2); // reserved
-            dbgpages("Update page id %d version %d pts %"PRId64" timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
-            while (!bs.IsEOF()) {
-                  cSubtitleRegion *region = page->GetRegionById(bs.GetBits(8), true);
-                  bs.SkipBits(8); // reserved
-                  region->SetHorizontalAddress(bs.GetBits(16));
-                  region->SetVerticalAddress(bs.GetBits(16));
-                  }
+            if (page->Pending()) {
+               dbgsegments("END_OF_DISPLAY_SET_SEGMENT (simulated)<br>\n");
+               FinishPage(page);
+               }
+            dbgsegments("PAGE_COMPOSITION_SEGMENT<br>\n");
+            page->Parse(Pts, bs);
+            SD.SetFactor(double(DBGBITMAPWIDTH) / windowWidth);
             break;
             }
        case REGION_COMPOSITION_SEGMENT: {
-            dbgsegments("REGION_COMPOSITION_SEGMENT\n");
-            cSubtitleRegion *region = page->GetRegionById(bs.GetBits(8));
-            if (!region)
-               break;
-            int regionVersion = bs.GetBits(4);
-            if (regionVersion == region->Version())
-               break; // no update
-            region->SetVersion(regionVersion);
-            bool regionFillFlag = bs.GetBit();
-            bs.SkipBits(3); // reserved
-            int regionWidth = bs.GetBits(16);
-            if (regionWidth < 1)
-               regionWidth = 1;
-            int regionHeight = bs.GetBits(16);
-            if (regionHeight < 1)
-               regionHeight = 1;
-            region->SetSize(regionWidth, regionHeight);
-            region->SetLevel(bs.GetBits(3));
-            region->SetDepth(bs.GetBits(3));
-            bs.SkipBits(2); // reserved
-            region->SetClutId(bs.GetBits(8));
-            dbgregions("Region pageId %d id %d version %d fill %d width %d height %d level %d depth %d clutId %d\n", pageId, region->RegionId(), region->Version(), regionFillFlag, regionWidth, regionHeight, region->Level(), region->Depth(), region->ClutId());
-            int region8bitPixelCode = bs.GetBits(8);
-            int region4bitPixelCode = bs.GetBits(4);
-            int region2bitPixelCode = bs.GetBits(2);
-            bs.SkipBits(2); // reserved
-            if (regionFillFlag) {
-               switch (region->Bpp()) {
-                 case 2: region->FillRegion(region8bitPixelCode); break;
-                 case 4: region->FillRegion(region4bitPixelCode); break;
-                 case 8: region->FillRegion(region2bitPixelCode); break;
-                 default: dbgregions("unknown bpp %d (%s %d)\n", region->Bpp(), __FUNCTION__, __LINE__);
-                 }
-               }
-            while (!bs.IsEOF()) {
-                  cSubtitleObject *object = region->GetObjectById(bs.GetBits(16), true);
-                  int objectType = bs.GetBits(2);
-                  object->SetCodingMethod(objectType);
-                  object->SetProviderFlag(bs.GetBits(2));
-                  int objectHorizontalPosition = bs.GetBits(12);
-                  bs.SkipBits(4); // reserved
-                  int objectVerticalPosition = bs.GetBits(12);
-                  object->SetPosition(objectHorizontalPosition, objectVerticalPosition);
-                  if (objectType == 0x01 || objectType == 0x02) {
-                     object->SetForegroundPixelCode(bs.GetBits(8));
-                     object->SetBackgroundPixelCode(bs.GetBits(8));
-                     }
-                  }
+            dbgsegments("REGION_COMPOSITION_SEGMENT<br>\n");
+            cSubtitleRegion *region = page->GetRegionById(bs.GetBits(8), true);
+            region->Parse(bs);
             break;
             }
        case CLUT_DEFINITION_SEGMENT: {
-            dbgsegments("CLUT_DEFINITION_SEGMENT\n");
+            dbgsegments("CLUT_DEFINITION_SEGMENT<br>\n");
             cSubtitleClut *clut = page->GetClutById(bs.GetBits(8), true);
-            int clutVersion = bs.GetBits(4);
-            if (clutVersion == clut->Version())
-               break; // no update
-            clut->SetVersion(clutVersion);
-            bs.SkipBits(4); // reserved
-            dbgcluts("Clut pageId %d id %d version %d\n", pageId, clut->ClutId(), clut->Version());
-            while (!bs.IsEOF()) {
-                  uchar clutEntryId = bs.GetBits(8);
-                  bool entryClut2Flag = bs.GetBit();
-                  bool entryClut4Flag = bs.GetBit();
-                  bool entryClut8Flag = bs.GetBit();
-                  bs.SkipBits(4); // reserved
-                  uchar yval;
-                  uchar crval;
-                  uchar cbval;
-                  uchar tval;
-                  if (bs.GetBit()) { // full_range_flag
-                     yval  = bs.GetBits(8);
-                     crval = bs.GetBits(8);
-                     cbval = bs.GetBits(8);
-                     tval  = bs.GetBits(8);
-                     }
-                  else {
-                     yval  = bs.GetBits(6) << 2;
-                     crval = bs.GetBits(4) << 4;
-                     cbval = bs.GetBits(4) << 4;
-                     tval  = bs.GetBits(2) << 6;
-                     }
-                  tColor value = 0;
-                  if (yval) {
-                     value = yuv2rgb(yval, cbval, crval);
-                     value |= ((10 - (clutEntryId ? Setup.SubtitleFgTransparency : Setup.SubtitleBgTransparency)) * (255 - tval) / 10) << 24;
-                     }
-                  dbgcluts("%2d %d %d %d %08X\n", clutEntryId, entryClut2Flag ? 2 : 0, entryClut4Flag ? 4 : 0, entryClut8Flag ? 8 : 0, value);
-                  if (entryClut2Flag)
-                     clut->SetColor(2, clutEntryId, value);
-                  if (entryClut4Flag)
-                     clut->SetColor(4, clutEntryId, value);
-                  if (entryClut8Flag)
-                     clut->SetColor(8, clutEntryId, value);
-                  }
-            dbgcluts("\n");
+            clut->Parse(bs);
             break;
             }
        case OBJECT_DATA_SEGMENT: {
-            dbgsegments("OBJECT_DATA_SEGMENT\n");
-            cSubtitleObject *object = page->GetObjectById(bs.GetBits(16));
-            if (!object)
-               break;
-            int objectVersion = bs.GetBits(4);
-            if (objectVersion == object->Version())
-               break; // no update
-            object->SetVersion(objectVersion);
-            int codingMethod = bs.GetBits(2);
-            object->SetNonModifyingColorFlag(bs.GetBit());
-            bs.SkipBit(); // reserved
-            dbgobjects("Object pageId %d id %d version %d method %d modify %d\n", pageId, object->ObjectId(), object->Version(), object->CodingMethod(), object->NonModifyingColorFlag());
-            if (codingMethod == 0) { // coding of pixels
-               int topFieldLength = bs.GetBits(16);
-               int bottomFieldLength = bs.GetBits(16);
-               object->DecodeSubBlock(bs.GetData(), topFieldLength, true);
-               if (bottomFieldLength)
-                  object->DecodeSubBlock(bs.GetData() + topFieldLength, bottomFieldLength, false);
-               else
-                  object->DecodeSubBlock(bs.GetData(), topFieldLength, false);
-               bs.WordAlign();
-               }
-            else if (codingMethod == 1) { // coded as a string of characters
-               int numberOfCodes = bs.GetBits(8);
-               object->DecodeCharacterString(bs.GetData(), numberOfCodes);
-               }
-#ifdef FINISHPAGE_HACK
-            FinishPage(page); // flush to OSD right away
-#endif
+            dbgsegments("OBJECT_DATA_SEGMENT<br>\n");
+            cSubtitleObject *object = page->GetObjectById(bs.GetBits(16), true);
+            object->Parse(bs);
             break;
             }
        case DISPLAY_DEFINITION_SEGMENT: {
-            dbgsegments("DISPLAY_DEFINITION_SEGMENT\n");
+            dbgsegments("DISPLAY_DEFINITION_SEGMENT<br>\n");
             int version = bs.GetBits(4);
             if (version != ddsVersionNumber) {
                bool displayWindowFlag = bs.GetBit();
@@ -1199,13 +1407,13 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
                   windowHeight           = bs.GetBits(16) - windowVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
                   }
                SetOsdData();
-               SetupChanged();
                ddsVersionNumber = version;
+               dbgdisplay("<b>display</b> version %d flag %d width %d height %d ofshor %d ofsver %d<br>\n", ddsVersionNumber, displayWindowFlag, windowWidth, windowHeight, windowHorizontalOffset, windowVerticalOffset);
                }
             break;
             }
        case DISPARITY_SIGNALING_SEGMENT: {
-            dbgsegments("DISPARITY_SIGNALING_SEGMENT\n");
+            dbgsegments("DISPARITY_SIGNALING_SEGMENT<br>\n");
             bs.SkipBits(4); // dss_version_number
             bool disparity_shift_update_sequence_page_flag = bs.GetBit();
             bs.SkipBits(3); // reserved
@@ -1246,12 +1454,13 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
             break;
             }
        case END_OF_DISPLAY_SET_SEGMENT: {
-            dbgsegments("END_OF_DISPLAY_SET_SEGMENT\n");
+            dbgsegments("END_OF_DISPLAY_SET_SEGMENT<br>\n");
             FinishPage(page);
+            page->SetPending(false);
             break;
             }
        default:
-            dbgsegments("*** unknown segment type: %02X\n", segmentType);
+            dbgsegments("*** unknown segment type: %02X<br>\n", segmentType);
        }
      return bs.Length() / 8;
      }
@@ -1262,11 +1471,12 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
 {
   if (!AssertOsd())
      return;
-  tArea *Areas = Page->GetAreas(osdFactorX, osdFactorY);
-  int NumAreas = Page->regions.Count();
+  int NumAreas;
+  tArea *Areas = Page->GetAreas(NumAreas, osdFactorX, osdFactorY);
   int Bpp = 8;
   bool Reduced = false;
   while (osd && osd->CanHandleAreas(Areas, NumAreas) != oeOk) {
+        dbgoutput("CanHandleAreas: %d<br>\n", osd->CanHandleAreas(Areas, NumAreas));
         int HalfBpp = Bpp / 2;
         if (HalfBpp >= 2) {
            for (int i = 0; i < NumAreas; i++) {
@@ -1280,37 +1490,35 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
         else
            return; // unable to draw bitmaps
         }
-  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
+  cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->PageState(), Page->Pts(), Page->PageTimeout(), Areas, NumAreas, osdFactorX, osdFactorY);
   bitmaps->Add(Bitmaps);
   for (int i = 0; i < NumAreas; i++) {
-      cSubtitleRegion *sr = Page->regions.Get(i);
-      cSubtitleClut *clut = Page->GetClutById(sr->ClutId());
-      if (!clut)
-         continue;
-      sr->Replace(*clut->GetPalette(sr->Bpp()));
-      sr->UpdateTextData(clut);
-      if (Reduced) {
-         if (sr->Bpp() != Areas[i].bpp) {
-            if (sr->Level() <= Areas[i].bpp) {
-               //TODO this is untested - didn't have any such subtitle stream
-               cSubtitleClut *Clut = Page->GetClutById(sr->ClutId());
-               if (Clut) {
-                  dbgregions("reduce region %d bpp %d level %d area bpp %d\n", sr->RegionId(), sr->Bpp(), sr->Level(), Areas[i].bpp);
-                  sr->ReduceBpp(*Clut->GetPalette(sr->Bpp()));
+      if (cSubtitleRegionRef *srr = Page->GetRegionRefByIndex(i)) {
+         if (cSubtitleRegion *sr = Page->GetRegionById(srr->RegionId())) {
+            if (cSubtitleClut *clut = Page->GetClutById(sr->ClutId())) {
+               cBitmap *bm = new cBitmap(sr->RegionWidth(), sr->RegionHeight(), sr->RegionDepth());
+               bm->Replace(*clut->GetPalette(sr->RegionDepth()));
+               sr->Render(bm, Page->Objects());
+               if (Reduced) {
+                  if (sr->RegionDepth() != Areas[i].bpp) {
+                     if (sr->RegionLevelOfCompatibility() <= Areas[i].bpp) {
+                        //TODO this is untested - didn't have any such subtitle stream
+                        cSubtitleClut *Clut = Page->GetClutById(sr->ClutId());
+                        dbgregions("reduce region %d bpp %d level %d area bpp %d<br>\n", sr->RegionId(), sr->RegionDepth(), sr->RegionLevelOfCompatibility(), Areas[i].bpp);
+                        bm->ReduceBpp(*Clut->GetPalette(sr->RegionDepth()));
+                        }
+                     else {
+                        dbgregions("condense region %d bpp %d level %d area bpp %d<br>\n", sr->RegionId(), sr->RegionDepth(), sr->RegionLevelOfCompatibility(), Areas[i].bpp);
+                        bm->ShrinkBpp(Areas[i].bpp);
+                        }
+                     }
                   }
-               }
-            else {
-               dbgregions("condense region %d bpp %d level %d area bpp %d\n", sr->RegionId(), sr->Bpp(), sr->Level(), Areas[i].bpp);
-               sr->ShrinkBpp(Areas[i].bpp);
+               bm->SetOffset(srr->RegionHorizontalAddress(), srr->RegionVerticalAddress());
+               Bitmaps->AddBitmap(bm);
                }
             }
          }
-      int posX = sr->HorizontalAddress();
-      int posY = sr->VerticalAddress();
-      if (sr->Width() > 0 && sr->Height() > 0) {
-         cBitmap *bm = new cBitmap(sr->Width(), sr->Height(), sr->Bpp(), posX, posY);
-         bm->DrawBitmap(posX, posY, *sr);
-         Bitmaps->AddBitmap(bm);
-         }
       }
+  if (DebugPages)
+     Bitmaps->DbgDump(windowWidth, windowHeight);
 }
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index 79b1d060c..13574337e 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 3.0 2012/03/11 13:34:12 kls Exp $
+ * $Id: dvbsubtitle.h 3.1 2013/09/06 10:53:30 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -39,7 +39,7 @@ class cDvbSubtitleConverter : public cThread {
   double osdFactorY;
   cList<cDvbSubtitlePage> *pages;
   cList<cDvbSubtitleBitmaps> *bitmaps;
-  tColor yuv2rgb(int Y, int Cb, int Cr);
+  cDvbSubtitlePage *GetPageById(int PageId, bool New = false);
   void SetOsdData(void);
   bool AssertOsd(void);
   int ExtractSegment(const uchar *Data, int Length, int64_t Pts);
diff --git a/eit.c b/eit.c
index a3cf3413e..e5fa30142 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 3.1 2013/08/23 10:52:27 kls Exp $
+ * $Id: eit.c 3.2 2013/10/12 11:10:11 kls Exp $
  */
 
 #include "eit.h"
@@ -406,7 +406,7 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
          }
          break;
     case 0x14: {
-         if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
+         if (Setup.SetSystemTime && Setup.TimeSource == Source() && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
             cTDT TDT(Data);
          }
          break;
diff --git a/epg.c b/epg.c
index e16f97806..ee784219f 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 3.1 2013/08/23 10:46:33 kls Exp $
+ * $Id: epg.c 3.2 2013/08/31 13:21:09 kls Exp $
  */
 
 #include "epg.h"
@@ -1140,16 +1140,19 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
 class cEpgDataWriter : public cThread {
 private:
   cMutex mutex;
+  bool dump;
 protected:
   virtual void Action(void);
 public:
   cEpgDataWriter(void);
+  void SetDump(bool Dump) { dump = Dump; }
   void Perform(void);
   };
 
 cEpgDataWriter::cEpgDataWriter(void)
 :cThread("epg data writer", true)
 {
+  dump = false;
 }
 
 void cEpgDataWriter::Action(void)
@@ -1169,7 +1172,8 @@ void cEpgDataWriter::Perform(void)
            p->Cleanup(now);
        }
   }
-  cSchedules::Dump();
+  if (dump)
+     cSchedules::Dump();
 }
 
 static cEpgDataWriter EpgDataWriter;
@@ -1203,6 +1207,7 @@ void cSchedules::SetEpgDataFileName(const char *FileName)
 {
   free(epgDataFileName);
   epgDataFileName = FileName ? strdup(FileName) : NULL;
+  EpgDataWriter.SetDump(epgDataFileName != NULL);
 }
 
 void cSchedules::SetModified(cSchedule *Schedule)
@@ -1217,12 +1222,10 @@ void cSchedules::Cleanup(bool Force)
      lastDump = 0;
   time_t now = time(NULL);
   if (now - lastDump > EPGDATAWRITEDELTA) {
-     if (epgDataFileName) {
-        if (Force)
-           EpgDataWriter.Perform();
-        else if (!EpgDataWriter.Active())
-           EpgDataWriter.Start();
-        }
+     if (Force)
+        EpgDataWriter.Perform();
+     else if (!EpgDataWriter.Active())
+        EpgDataWriter.Start();
      lastDump = now;
      }
 }
diff --git a/menu.c b/menu.c
index e466ae0f9..df78513c3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.3 2013/08/21 10:45:11 kls Exp $
+ * $Id: menu.c 3.10 2013/10/16 09:15:36 kls Exp $
  */
 
 #include "menu.h"
@@ -16,7 +16,6 @@
 #include <string.h>
 #include "channels.h"
 #include "config.h"
-#include "cutter.h"
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
@@ -828,8 +827,7 @@ eOSState cMenuFolder::Edit(void)
 
 eOSState cMenuFolder::SetFolder(void)
 {
-  cMenuEditFolder *mef = (cMenuEditFolder *)SubMenu();
-  if (mef) {
+  if (cMenuEditFolder *mef = dynamic_cast<cMenuEditFolder *>(SubMenu())) {
      Set(mef->GetFolder());
      SetHelpKeys();
      Display();
@@ -843,8 +841,7 @@ cString cMenuFolder::GetFolder(void)
   if (firstFolder) {
      cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
      if (Folder) {
-        cMenuFolder *mf = (cMenuFolder *)SubMenu();
-        if (mf)
+        if (cMenuFolder *mf = dynamic_cast<cMenuFolder *>(SubMenu()))
            return cString::sprintf("%s%c%s", Folder->Folder()->Text(), FOLDERDELIMCHAR, *mf->GetFolder());
         return Folder->Folder()->Text();
         }
@@ -930,8 +927,7 @@ void cMenuEditTimer::SetFirstDayItem(void)
 
 eOSState cMenuEditTimer::SetFolder(void)
 {
-  cMenuFolder *mf = (cMenuFolder *)SubMenu();
-  if (mf) {
+  if (cMenuFolder *mf = dynamic_cast<cMenuFolder *>(SubMenu())) {
      cString Folder = mf->GetFolder();
      char *p = strrchr(data.file, FOLDERDELIMCHAR);
      if (p)
@@ -2105,30 +2101,350 @@ bool CamMenuActive(void)
   return CamMenuIsOpen;
 }
 
+// --- cMenuPathEdit ---------------------------------------------------------
+
+class cMenuPathEdit : public cOsdMenu {
+private:
+  cString path;
+  char folder[PATH_MAX];
+  char name[NAME_MAX];
+  cMenuEditStrItem *folderItem;
+  int pathIsInUse;
+  eOSState SetFolder(void);
+  eOSState Folder(void);
+  eOSState ApplyChanges(void);
+public:
+  cMenuPathEdit(const char *Path);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuPathEdit::cMenuPathEdit(const char *Path)
+:cOsdMenu(tr("Edit path"), 12)
+{
+  SetMenuCategory(mcRecording);
+  path = Path;
+  *folder = 0;
+  *name = 0;
+  const char *s = strrchr(path, FOLDERDELIMCHAR);
+  if (s) {
+     strn0cpy(folder, cString(path, s), sizeof(folder));
+     s++;
+     }
+  else
+     s = path;
+  strn0cpy(name, s, sizeof(name));
+  pathIsInUse = Recordings.PathIsInUse(path);
+  cOsdItem *p;
+  Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
+  p->SetSelectable(!pathIsInUse);
+  Add(p = new cMenuEditStrItem(tr("Name"), name, sizeof(name)));
+  p->SetSelectable(!pathIsInUse);
+  if (pathIsInUse) {
+     Add(new cOsdItem("", osUnknown, false));
+     Add(new cOsdItem(tr("This folder is currently in use - no changes are possible!"), osUnknown, false));
+     }
+  Display();
+  if (!pathIsInUse)
+     SetHelp(tr("Button$Folder"));
+}
+
+eOSState cMenuPathEdit::SetFolder(void)
+{
+  if (cMenuFolder *mf = dynamic_cast<cMenuFolder *>(SubMenu())) {
+     strn0cpy(folder, mf->GetFolder(), sizeof(folder));
+     SetCurrent(folderItem);
+     Display();
+     }
+  return CloseSubMenu();
+}
+
+eOSState cMenuPathEdit::Folder(void)
+{
+  return AddSubMenu(new cMenuFolder(tr("Select folder"), &Folders, path));
+}
+
+eOSState cMenuPathEdit::ApplyChanges(void)
+{
+  if (!*name)
+     *name = ' '; // name must not be empty!
+  cString NewPath = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
+  NewPath.CompactChars(FOLDERDELIMCHAR);
+  if (strcmp(NewPath, path)) {
+     int NumRecordings = Recordings.GetNumRecordingsInPath(path);
+     if (NumRecordings > 1 && !Interface->Confirm(cString::sprintf(tr("Move entire folder containing %d recordings?"), NumRecordings)))
+        return osContinue;
+     if (!Recordings.MoveRecordings(path, NewPath)) {
+        Skins.Message(mtError, tr("Error while moving folder!"));
+        return osContinue;
+        }
+     cMenuRecordings::SetPath(NewPath); // makes sure the Recordings menu will reposition to the new path
+     return osUser1;
+     }
+  return osBack;
+}
+
+eOSState cMenuPathEdit::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdMenu::ProcessKey(Key);
+  if (state == osUnknown) {
+     if (!pathIsInUse) {
+        switch (Key) {
+          case kRed: return Folder();
+          case kOk:  return ApplyChanges();
+          default: break;
+          }
+        }
+     else if (Key == kOk)
+        return osBack;
+     }
+  else if (state == osEnd && HasSubMenu())
+     state = SetFolder();
+  return state;
+}
+
+// --- cMenuRecordingEdit ----------------------------------------------------
+
+class cMenuRecordingEdit : public cOsdMenu {
+private:
+  cRecording *recording;
+  cString originalFileName;
+  int recordingsState;
+  char folder[PATH_MAX];
+  char name[NAME_MAX];
+  int priority;
+  int lifetime;
+  cMenuEditStrItem *folderItem;
+  const char *buttonFolder;
+  const char *buttonAction;
+  const char *buttonDeleteMarks;
+  const char *actionCancel;
+  const char *doCut;
+  int recordingIsInUse;
+  void Set(void);
+  void SetHelpKeys(void);
+  bool RefreshRecording(void);
+  eOSState SetFolder(void);
+  eOSState Folder(void);
+  eOSState Action(void);
+  eOSState DeleteMarks(void);
+  eOSState ApplyChanges(void);
+public:
+  cMenuRecordingEdit(cRecording *Recording);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cMenuRecordingEdit::cMenuRecordingEdit(cRecording *Recording)
+:cOsdMenu(tr("Edit recording"), 12)
+{
+  SetMenuCategory(mcRecording);
+  recording = Recording;
+  originalFileName = recording->FileName();
+  Recordings.StateChanged(recordingsState); // just to get the current state
+  strn0cpy(folder, recording->Folder(), sizeof(folder));
+  strn0cpy(name, recording->BaseName(), sizeof(name));
+  priority = recording->Priority();
+  lifetime = recording->Lifetime();
+  folderItem = NULL;
+  buttonFolder = NULL;
+  buttonAction = NULL;
+  buttonDeleteMarks = NULL;
+  actionCancel = NULL;
+  doCut = NULL;
+  recordingIsInUse = ruNone;
+  Set();
+}
+
+void cMenuRecordingEdit::Set(void)
+{
+  int current = Current();
+  Clear();
+  recordingIsInUse = recording->IsInUse();
+  cOsdItem *p;
+  Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
+  p->SetSelectable(!recordingIsInUse);
+  Add(p = new cMenuEditStrItem(tr("Name"), name, sizeof(name)));
+  p->SetSelectable(!recordingIsInUse);
+  Add(p = new cMenuEditIntItem(tr("Priority"), &priority, 0, MAXPRIORITY));
+  p->SetSelectable(!recordingIsInUse);
+  Add(p = new cMenuEditIntItem(tr("Lifetime"), &lifetime, 0, MAXLIFETIME));
+  p->SetSelectable(!recordingIsInUse);
+  if (recordingIsInUse) {
+     Add(new cOsdItem("", osUnknown, false));
+     Add(new cOsdItem(tr("This recording is currently in use - no changes are possible!"), osUnknown, false));
+     }
+  SetCurrent(Get(current));
+  Display();
+  SetHelpKeys();
+}
+
+void cMenuRecordingEdit::SetHelpKeys(void)
+{
+  buttonFolder = !recordingIsInUse ? tr("Button$Folder") : NULL;
+  buttonAction = NULL;
+  buttonDeleteMarks = NULL;
+  actionCancel = NULL;
+  doCut = NULL;
+  if ((recordingIsInUse & ruCut) != 0)
+     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Cancel cutting") : tr("Button$Stop cutting");
+  else if ((recordingIsInUse & ruMove) != 0)
+     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Cancel moving") : tr("Button$Stop moving");
+  else if ((recordingIsInUse & ruCopy) != 0)
+     buttonAction = actionCancel = ((recordingIsInUse & ruPending) != 0) ? tr("Button$Cancel copying") : tr("Button$Stop copying");
+  else if (recording->HasMarks()) {
+     buttonAction = doCut = tr("Button$Cut");
+     buttonDeleteMarks = tr("Button$Delete marks");
+     }
+  SetHelp(buttonFolder, buttonAction, buttonDeleteMarks);
+}
+
+bool cMenuRecordingEdit::RefreshRecording(void)
+{
+  if (Recordings.StateChanged(recordingsState)) {
+     if ((recording = Recordings.GetByName(originalFileName)) != NULL)
+        Set();
+     else {
+        Skins.Message(mtWarning, tr("Recording vanished!"));
+        return false;
+        }
+     }
+  return true;
+}
+
+eOSState cMenuRecordingEdit::SetFolder(void)
+{
+  if (cMenuFolder *mf = dynamic_cast<cMenuFolder *>(SubMenu())) {
+     strn0cpy(folder, mf->GetFolder(), sizeof(folder));
+     SetCurrent(folderItem);
+     Display();
+     }
+  return CloseSubMenu();
+}
+
+eOSState cMenuRecordingEdit::Folder(void)
+{
+  return AddSubMenu(new cMenuFolder(tr("Select folder"), &Folders, recording->Name()));
+}
+
+eOSState cMenuRecordingEdit::Action(void)
+{
+  if (actionCancel)
+     RecordingsHandler.Del(recording->FileName());
+  else if (doCut) {
+     if (!RecordingsHandler.Add(ruCut, recording->FileName()))
+        Skins.Message(mtError, tr("Error while queueing recording for cutting!"));
+     }
+  recordingIsInUse = recording->IsInUse();
+  RefreshRecording();
+  SetHelpKeys();
+  return osContinue;
+}
+
+eOSState cMenuRecordingEdit::DeleteMarks(void)
+{
+  if (buttonDeleteMarks && Interface->Confirm(tr("Delete editing marks for this recording?"))) {
+     if (recording->DeleteMarks())
+        SetHelpKeys();
+     else
+        Skins.Message(mtError, tr("Error while deleting editing marks!"));
+     }
+  return osContinue;
+}
+
+eOSState cMenuRecordingEdit::ApplyChanges(void)
+{
+  bool Modified = false;
+  if (priority != recording->Priority() || lifetime != recording->Lifetime()) {
+     if (!recording->ChangePriorityLifetime(priority, lifetime)) {
+        Skins.Message(mtError, tr("Error while changing priority/lifetime!"));
+        return osContinue;
+        }
+     Modified = true;
+     }
+  if (!*name)
+     *name = ' '; // name must not be empty!
+  cString NewName = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
+  NewName.CompactChars(FOLDERDELIMCHAR);
+  if (strcmp(NewName, recording->Name())) {
+     if (!recording->ChangeName(NewName)) {
+        Skins.Message(mtError, tr("Error while changing folder/name!"));
+        return osContinue;
+        }
+     Modified = true;
+     }
+  if (Modified) {
+     cMenuRecordings::SetRecording(recording->FileName()); // makes sure the Recordings menu will reposition to the renamed recording
+     return osUser1;
+     }
+  return osBack;
+}
+
+eOSState cMenuRecordingEdit::ProcessKey(eKeys Key)
+{
+  if (!HasSubMenu()) {
+     if (!RefreshRecording())
+        return osBack; // the recording has vanished, so close this menu
+     }
+  eOSState state = cOsdMenu::ProcessKey(Key);
+  if (state == osUnknown) {
+     switch (Key) {
+       case kRed:    return buttonFolder ? Folder() : osContinue;
+       case kGreen:  return buttonAction ? Action() : osContinue;
+       case kYellow: return buttonDeleteMarks ? DeleteMarks() : osContinue;
+       case kOk:     return !recordingIsInUse ? ApplyChanges() : osBack;
+       default: break;
+       }
+     }
+  else if (state == osEnd && HasSubMenu())
+     state = SetFolder();
+  return state;
+}
+
 // --- cMenuRecording --------------------------------------------------------
 
 class cMenuRecording : public cOsdMenu {
 private:
-  const cRecording *recording;
+  cRecording *recording;
+  cString originalFileName;
+  int recordingsState;
   bool withButtons;
+  bool RefreshRecording(void);
 public:
-  cMenuRecording(const cRecording *Recording, bool WithButtons = false);
+  cMenuRecording(cRecording *Recording, bool WithButtons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
 };
 
-cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
+cMenuRecording::cMenuRecording(cRecording *Recording, bool WithButtons)
 :cOsdMenu(tr("Recording info"))
 {
   SetMenuCategory(mcRecordingInfo);
   recording = Recording;
+  originalFileName = recording->FileName();
+  Recordings.StateChanged(recordingsState); // just to get the current state
   withButtons = WithButtons;
   if (withButtons)
-     SetHelp(tr("Button$Play"), tr("Button$Rewind"));
+     SetHelp(tr("Button$Play"), tr("Button$Rewind"), NULL, tr("Button$Edit"));
+}
+
+bool cMenuRecording::RefreshRecording(void)
+{
+  if (Recordings.StateChanged(recordingsState)) {
+     if ((recording = Recordings.GetByName(originalFileName)) != NULL)
+        Display();
+     else {
+        Skins.Message(mtWarning, tr("Recording vanished!"));
+        return false;
+        }
+     }
+  return true;
 }
 
 void cMenuRecording::Display(void)
 {
+  if (HasSubMenu()) {
+     SubMenu()->Display();
+     return;
+     }
   cOsdMenu::Display();
   DisplayMenu()->SetRecording(recording);
   if (recording->Info()->Description())
@@ -2137,6 +2453,14 @@ void cMenuRecording::Display(void)
 
 eOSState cMenuRecording::ProcessKey(eKeys Key)
 {
+  if (HasSubMenu()) {
+     eOSState state = cOsdMenu::ProcessKey(Key);
+     if (state == osUser1)
+        CloseSubMenu();
+     return state;
+     }
+  else if (!RefreshRecording())
+     return osBack; // the recording has vanished, so close this menu
   switch (int(Key)) {
     case kUp|k_Repeat:
     case kUp:
@@ -2164,6 +2488,9 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
                      cRemote::Put(Key, true);
                      // continue with osBack to close the info menu and process the key
        case kOk:     return osBack;
+       case kBlue:   if (withButtons)
+                        return AddSubMenu(new cMenuRecordingEdit(recording));
+                     break;
        default: break;
        }
      }
@@ -2183,6 +2510,7 @@ class cMenuRecordingItem : public cOsdItem {
   ~cMenuRecordingItem();
   void IncrementCounter(bool New);
   const char *Name(void) { return name; }
+  int Level(void) { return level; }
   cRecording *Recording(void) { return recording; }
   bool IsDirectory(void) { return name != NULL; }
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
@@ -2220,6 +2548,9 @@ void cMenuRecordingItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, b
 
 // --- cMenuRecordings -------------------------------------------------------
 
+cString cMenuRecordings::path;
+cString cMenuRecordings::fileName;
+
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 :cOsdMenu(Base ? Base : tr("Recordings"), 9, 6, 6)
 {
@@ -2232,8 +2563,12 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
   Set();
   if (Current() < 0)
      SetCurrent(First());
-  else if (OpenSubMenus && cReplayControl::LastReplayed() && Open(true))
-     return;
+  else if (OpenSubMenus && (cReplayControl::LastReplayed() || *path || *fileName)) {
+     if (!*path || Level < strcountchr(path, FOLDERDELIMCHAR)) {
+        if (Open(true))
+           return;
+        }
+     }
   Display();
   SetHelpKeys();
 }
@@ -2251,18 +2586,14 @@ void cMenuRecordings::SetHelpKeys(void)
   if (ri) {
      if (ri->IsDirectory())
         NewHelpKeys = 1;
-     else {
+     else
         NewHelpKeys = 2;
-        if (ri->Recording()->Info()->Title())
-           NewHelpKeys = 3;
-        }
      }
   if (NewHelpKeys != helpKeys) {
      switch (NewHelpKeys) {
        case 0: SetHelp(NULL); break;
-       case 1: SetHelp(tr("Button$Open")); break;
-       case 2:
-       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), NewHelpKeys == 3 ? tr("Button$Info") : NULL);
+       case 1: SetHelp(tr("Button$Open"), NULL, NULL, tr("Button$Edit")); break;
+       case 2: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), tr("Button$Info"));
        default: ;
        }
      helpKeys = NewHelpKeys;
@@ -2271,7 +2602,7 @@ void cMenuRecordings::SetHelpKeys(void)
 
 void cMenuRecordings::Set(bool Refresh)
 {
-  const char *CurrentRecording = cReplayControl::LastReplayed();
+  const char *CurrentRecording = *fileName ? *fileName : cReplayControl::LastReplayed();
   cMenuRecordingItem *LastItem = NULL;
   cThreadLock RecordingsLock(&Recordings);
   if (Refresh) {
@@ -2303,7 +2634,11 @@ void cMenuRecordings::Set(bool Refresh)
          else
             delete Item;
          if (LastItem || LastDir) {
-            if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
+            if (*path) {
+               if (strcmp(path, recording->Folder()) == 0)
+                  SetCurrent(LastDir ? LastDir : LastItem);
+               }
+            else if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
                SetCurrent(LastDir ? LastDir : LastItem);
             }
          if (LastDir)
@@ -2314,9 +2649,19 @@ void cMenuRecordings::Set(bool Refresh)
      Display();
 }
 
+void cMenuRecordings::SetPath(const char *Path)
+{
+  path = Path;
+}
+
+void cMenuRecordings::SetRecording(const char *FileName)
+{
+  fileName = FileName;
+}
+
 cString cMenuRecordings::DirectoryName(void)
 {
-  cString d(VideoDirectory);
+  cString d(cVideoDirectory::Name());
   if (base) {
      char *s = ExchangeChars(strdup(base), true);
      d = AddDirectory(d, s);
@@ -2328,11 +2673,11 @@ cString cMenuRecordings::DirectoryName(void)
 bool cMenuRecordings::Open(bool OpenSubMenus)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri && ri->IsDirectory()) {
+  if (ri && ri->IsDirectory() && (!*path || strcountchr(path, FOLDERDELIMCHAR) > 0)) {
      const char *t = ri->Name();
      cString buffer;
      if (base) {
-        buffer = cString::sprintf("%s~%s", base, t);
+        buffer = cString::sprintf("%s%c%s", base, FOLDERDELIMCHAR, t);
         t = buffer;
         }
      AddSubMenu(new cMenuRecordings(t, level + 1, OpenSubMenus));
@@ -2395,10 +2740,10 @@ eOSState cMenuRecordings::Delete(void)
            }
         cRecording *recording = ri->Recording();
         cString FileName = recording->FileName();
-        if (cCutter::Active(ri->Recording()->FileName())) {
+        if (RecordingsHandler.GetUsage(FileName)) {
            if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
-              cCutter::Stop();
-              recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version
+              RecordingsHandler.Del(FileName);
+              recording = Recordings.GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version
               // we continue with the code below even if recording is NULL,
               // in order to have the menu updated etc.
               }
@@ -2428,9 +2773,12 @@ eOSState cMenuRecordings::Info(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri && !ri->IsDirectory() && ri->Recording()->Info()->Title())
-     return AddSubMenu(new cMenuRecording(ri->Recording(), true));
+  if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current())) {
+     if (ri->IsDirectory())
+        return AddSubMenu(new cMenuPathEdit(cString(ri->Recording()->Name(), strchrn(ri->Recording()->Name(), FOLDERDELIMCHAR, ri->Level() + 1))));
+     else
+        return AddSubMenu(new cMenuRecording(ri->Recording(), true));
+     }
   return osContinue;
 }
 
@@ -2481,6 +2829,17 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        default: break;
        }
      }
+  else if (state == osUser1) {
+     // a recording or path was renamed, so let's refresh the menu
+     CloseSubMenu(false);
+     if (base)
+        return state; // closes all recording menus except for the top one
+     Set(); // this is the top level menu, so we refresh it...
+     Open(true); // ...and open any necessary submenus to show the new name
+     Display();
+     path = NULL;
+     fileName = NULL;
+     }
   if (Key == kYellow && HadSubMenu && !HasSubMenu()) {
      // the last recording in a subdirectory was deleted, so let's go back up
      cOsdMenu::Del(Current());
@@ -3373,7 +3732,7 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 
 cOsdObject *cMenuMain::pluginOsdObject = NULL;
 
-cMenuMain::cMenuMain(eOSState State)
+cMenuMain::cMenuMain(eOSState State, bool OpenSubMenus)
 :cOsdMenu("")
 {
   SetMenuCategory(mcMain);
@@ -3390,7 +3749,7 @@ cMenuMain::cMenuMain(eOSState State)
     case osSchedule:   AddSubMenu(new cMenuSchedule); break;
     case osChannels:   AddSubMenu(new cMenuChannels); break;
     case osTimers:     AddSubMenu(new cMenuTimers); break;
-    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
+    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break;
     case osSetup:      AddSubMenu(new cMenuSetup); break;
     case osCommands:   AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
     default: break;
@@ -3457,18 +3816,18 @@ bool cMenuMain::Update(bool Force)
         stopReplayItem = NULL;
         }
      // Color buttons:
-     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
+     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying || !Setup.PauseKeyHandling ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
      result = true;
      }
 
   // Editing control:
-  bool CutterActive = cCutter::Active();
-  if (CutterActive && !cancelEditingItem) {
+  bool EditingActive = RecordingsHandler.Active();
+  if (EditingActive && !cancelEditingItem) {
      // TRANSLATORS: note the leading blank!
      Add(cancelEditingItem = new cOsdItem(tr(" Cancel editing"), osCancelEdit));
      result = true;
      }
-  else if (cancelEditingItem && !CutterActive) {
+  else if (cancelEditingItem && !EditingActive) {
      Del(cancelEditingItem->Index());
      cancelEditingItem = NULL;
      result = true;
@@ -3518,7 +3877,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                           }
                        break;
     case osCancelEdit: if (Interface->Confirm(tr("Cancel editing?"))) {
-                          cCutter::Stop();
+                          RecordingsHandler.DelAll();
                           return osEnd;
                           }
                        break;
@@ -3552,7 +3911,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 }
                              break;
                case kYellow: if (!HadSubMenu)
-                                state = replaying ? osContinue : osPause;
+                                state = replaying || !Setup.PauseKeyHandling ? osContinue : osPause;
                              break;
                case kBlue:   if (!HadSubMenu)
                                 state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osRecordings;
@@ -4342,7 +4701,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
      AssertFreeDiskSpace(Timer->Priority(), !Timer->Pending());
      Timer->SetPending(true);
      }
-  VideoDiskSpace(&FreeMB);
+  cVideoDirectory::VideoDiskSpace(&FreeMB);
   if (FreeMB < MINFREEDISK) {
      if (!Timer || time(NULL) - LastNoDiskSpaceMessage > NODISKSPACEDELTA) {
         isyslog("not enough disk space to start recording%s%s", Timer ? " timer " : "", Timer ? *Timer->ToDescr() : "");
@@ -4853,12 +5212,12 @@ void cReplayControl::EditCut(void)
 {
   if (*fileName) {
      Hide();
-     if (!cCutter::Active()) {
+     if (!RecordingsHandler.GetUsage(fileName)) {
         if (!marks.Count())
            Skins.Message(mtError, tr("No editing marks defined!"));
         else if (!marks.GetNumSequences())
            Skins.Message(mtError, tr("No editing sequences defined!"));
-        else if (!cCutter::Start(fileName))
+        else if (!RecordingsHandler.Add(ruCut, fileName))
            Skins.Message(mtError, tr("Can't start editing process!"));
         else
            Skins.Message(mtInfo, tr("Editing process started"));
@@ -4990,10 +5349,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    if (Setup.DelTimeshiftRec) {
-                              cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
-                              return rc && rc->InstantId() ? osEnd : osRecordings;
-                              }
+            case kBack:    Hide();
+                           Stop();
                            return osRecordings;
             default:       return osUnknown;
             }
diff --git a/menu.h b/menu.h
index db17f983a..891557507 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 3.1 2013/06/01 13:44:57 kls Exp $
+ * $Id: menu.h 3.3 2013/10/16 09:14:58 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -107,7 +107,7 @@ class cMenuMain : public cOsdMenu {
   void Set(void);
   bool Update(bool Force = false);
 public:
-  cMenuMain(eOSState State = osUnknown);
+  cMenuMain(eOSState State = osUnknown, bool OpenSubMenus = false);
   virtual eOSState ProcessKey(eKeys Key);
   static cOsdObject *PluginOsdObject(void);
   };
@@ -198,6 +198,8 @@ class cMenuRecordings : public cOsdMenu {
   int level;
   int recordingsState;
   int helpKeys;
+  static cString path;
+  static cString fileName;
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
   bool Open(bool OpenSubMenus = false);
@@ -213,6 +215,8 @@ class cMenuRecordings : public cOsdMenu {
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
   ~cMenuRecordings();
   virtual eOSState ProcessKey(eKeys Key);
+  static void SetPath(const char *Path);
+  static void SetRecording(const char *FileName);
   };
 
 class cRecordControl {
diff --git a/osd.c b/osd.c
index c266092b2..7e527820e 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 3.1 2013/05/18 12:33:16 kls Exp $
+ * $Id: osd.c 3.2 2013/09/03 11:59:17 kls Exp $
  */
 
 #include "osd.h"
@@ -512,6 +512,17 @@ void cBitmap::SetIndex(int x, int y, tIndex Index)
      }
 }
 
+void cBitmap::Fill(tIndex Index)
+{
+  if (bitmap) {
+     memset(bitmap, Index, width * height);
+     dirtyX1 = 0;
+     dirtyY1 = 0;
+     dirtyX2 = width - 1;
+     dirtyY2 = height - 1;
+     }
+}
+
 void cBitmap::DrawPixel(int x, int y, tColor Color)
 {
   x -= x0;
@@ -824,7 +835,7 @@ void cBitmap::ShrinkBpp(int NewBpp)
      }
 }
 
-cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias)
+cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias) const
 {
   // Fixed point scaling code based on www.inversereality.org/files/bitmapscaling.pdf
   // by deltener@mindtremors.com
diff --git a/osd.h b/osd.h
index 600cc7a79..4eaef96d7 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 3.0 2013/02/12 13:39:08 kls Exp $
+ * $Id: osd.h 3.2 2013/09/06 12:13:47 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -192,6 +192,8 @@ class cBitmap : public cPalette {
        ///< contents of the bitmap will be lost. If Width and Height are the same
        ///< as the current values, nothing will happen and the bitmap remains
        ///< unchanged.
+  void SetOffset(int X0, int Y0) { x0 = X0; y0 = Y0; }
+       ///< Sets the offset of this bitmap to the given values.
   bool Contains(int x, int y) const;
        ///< Returns true if this bitmap contains the point (x, y).
   bool Covers(int x1, int y1, int x2, int y2) const;
@@ -221,6 +223,8 @@ class cBitmap : public cPalette {
   void SetIndex(int x, int y, tIndex Index);
        ///< Sets the index at the given coordinates to Index.
        ///< Coordinates are relative to the bitmap's origin.
+  void Fill(tIndex Index);
+       ///< Fills the bitmap data with the given Index.
   void DrawPixel(int x, int y, tColor Color);
        ///< Sets the pixel at the given coordinates to the given Color, which is
        ///< a full 32 bit ARGB value.
@@ -283,7 +287,7 @@ class cBitmap : public cPalette {
        ///< the 2^NewBpp most frequently used colors as defined in the current palette.
        ///< If NewBpp is not smaller than the bitmap's current color depth,
        ///< or if it is not one of 4bpp or 2bpp, nothing happens.
-  cBitmap *Scaled(double FactorX, double FactorY, bool AntiAlias = false);
+  cBitmap *Scaled(double FactorX, double FactorY, bool AntiAlias = false) const;
        ///< Creates a copy of this bitmap, scaled by the given factors.
        ///< If AntiAlias is true and either of the factors is greater than 1.0,
        ///< anti-aliasing is applied. This will also set the color depth of the
@@ -657,7 +661,7 @@ class cPixmap {
        ///< covers the entire view port. This may be of advantage if, e.g.,
        ///< there is a draw port that holds, say, 11 lines of text, while the
        ///< view port displays only 10 lines. By Pan()'ing the draw port up one
-       ///< line, an new bottom line can be written into the draw port (without
+       ///< line, a new bottom line can be written into the draw port (without
        ///< being seen through the view port), and later the draw port can be
        ///< shifted smoothly, resulting in a smooth scrolling.
        ///< It is the caller's responsibility to make sure that Source and Dest
diff --git a/osdbase.c b/osdbase.c
index baadc0e64..b788edb0a 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 3.1 2013/05/24 10:19:31 kls Exp $
+ * $Id: osdbase.c 3.2 2013/09/22 14:01:17 kls Exp $
  */
 
 #include "osdbase.h"
@@ -502,12 +502,14 @@ eOSState cOsdMenu::AddSubMenu(cOsdMenu *SubMenu)
   return osContinue; // convenience return value
 }
 
-eOSState cOsdMenu::CloseSubMenu()
+eOSState cOsdMenu::CloseSubMenu(bool ReDisplay)
 {
   delete subMenu;
   subMenu = NULL;
-  RefreshCurrent();
-  Display();
+  if (ReDisplay) {
+     RefreshCurrent();
+     Display();
+     }
   return osContinue; // convenience return value
 }
 
diff --git a/osdbase.h b/osdbase.h
index 636766a9b..07dce3521 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 3.0 2012/12/07 09:49:35 kls Exp $
+ * $Id: osdbase.h 3.1 2013/09/22 14:00:47 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -119,7 +119,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   void Mark(void);
   eOSState HotKey(eKeys Key);
   eOSState AddSubMenu(cOsdMenu *SubMenu);
-  eOSState CloseSubMenu();
+  eOSState CloseSubMenu(bool ReDisplay = true);
   bool HasSubMenu(void) { return subMenu; }
   cOsdMenu *SubMenu(void) { return subMenu; }
   void SetStatus(const char *s);
diff --git a/po/ar.po b/po/ar.po
index 1676dcbe2..9937682b5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -727,6 +727,70 @@ msgstr "الرجاء ادخال %d رقم!"
 msgid "CAM not responding!"
 msgstr "الكامة لا تستجيب"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "معلومات التسجبل"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 0362cd83d..911ce2308 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -726,6 +726,70 @@ msgstr "Si us plau introdueixi %d digitos"
 msgid "CAM not responding!"
 msgstr "CAM no respon"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Informaci� de la gravaci�"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2bd4a8e41..3e4855b54 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -726,6 +726,70 @@ msgstr "Prosím vložte %d znaků!"
 msgid "CAM not responding!"
 msgstr "CAM neodpovídá!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Detail nahrávky"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index edd0f5f4b..130fc1a32 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr "Indtast venligst %d cifre!"
 msgid "CAM not responding!"
 msgstr "CAM svarer ikke!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Optagelses info"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 4cc8e8445..d31088b30 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr "Bitte geben Sie %d Ziffern ein!"
 msgid "CAM not responding!"
 msgstr "CAM antwortet nicht!"
 
+msgid "Edit path"
+msgstr "Pfad editieren"
+
+msgid "Folder"
+msgstr "Ordner"
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr "Dieser Ordner ist zur Zeit in Verwendung - es sind keine �nderungen m�glich!"
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr "Ganzen Ordner mit %d Aufnahmen verschieben?"
+
+msgid "Error while moving folder!"
+msgstr "Fehler beim Verschieben des Ordners!"
+
+msgid "Edit recording"
+msgstr "Aufnahme editieren"
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr "Diese Aufnahme ist zur Zeit in Verwendung - es sind keine �nderungen m�glich!"
+
+msgid "Button$Cancel cutting"
+msgstr "Schnitt abbrechen"
+
+msgid "Button$Stop cutting"
+msgstr "Schnitt beenden"
+
+msgid "Button$Cancel moving"
+msgstr "Verschieben abbrechen"
+
+msgid "Button$Stop moving"
+msgstr "Verschieben beenden"
+
+msgid "Button$Cancel copying"
+msgstr "Kopieren abbrechen"
+
+msgid "Button$Stop copying"
+msgstr "Kopieren beenden"
+
+msgid "Button$Cut"
+msgstr "Schneiden"
+
+msgid "Button$Delete marks"
+msgstr "Marken l�schen"
+
+msgid "Recording vanished!"
+msgstr "Aufnahme verschwunden!"
+
+msgid "Error while queueing recording for cutting!"
+msgstr "Fehler beim Hinzuf�gen der Aufnahme zur Schnittwarteschlange"
+
+msgid "Delete editing marks for this recording?"
+msgstr "Schnittmarken f�r diese Aufnahme l�schen?"
+
+msgid "Error while deleting editing marks!"
+msgstr "Fehler beim L�schen der Schnittmarken!"
+
+msgid "Error while changing priority/lifetime!"
+msgstr "Fehler beim �ndern der Priorit�t bzw. Lebensdauer!"
+
+msgid "Error while changing folder/name!"
+msgstr "Fehler beim �ndern des Ordners bzw. Namens!"
+
 msgid "Recording info"
 msgstr "Aufzeichnung"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 8df5b7867..f03e2a351 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr ""
 msgid "CAM not responding!"
 msgstr ""
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "����������� E�������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 023871ec1..ec6d781f7 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr "
 msgid "CAM not responding!"
 msgstr "�CAM no responde!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Informaci�n de grabaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 8539f17e0..8b7c91314 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr "Palun sisestada %d numbrit!"
 msgid "CAM not responding!"
 msgstr "CAM ei vasta"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Salvestuse info"
 
@@ -994,31 +1058,31 @@ msgid "Setup.LNB$own"
 msgstr "oma"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Antenni positsioneerija kasutamine"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Asukoha laiuskraad (°)"
 
 msgid "South"
-msgstr ""
+msgstr "lõunasse (S)"
 
 msgid "North"
-msgstr ""
+msgstr "põhja (N)"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Asukoha pikkuskraad (°)"
 
 msgid "West"
-msgstr ""
+msgstr "läände (W)"
 
 msgid "East"
-msgstr ""
+msgstr "itta (E)"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Positsioneerija max pöördeulatus (°)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Positsioneerija kiirus (°/s)"
 
 msgid "CAM reset"
 msgstr "CAM taaskäivitamine"
@@ -1359,7 +1423,7 @@ msgstr "ESITUS"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Antenni pööramine positsioonile %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panels"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 84c50a637..151589d55 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -727,6 +727,70 @@ msgstr "Syötä %d numeroa!"
 msgid "CAM not responding!"
 msgstr "CA-moduuli ei vastaa!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Tallenteen tiedot"
 
@@ -998,31 +1062,31 @@ msgid "Setup.LNB$own"
 msgstr "oma"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Käytä kääntömoottoria lautaselle"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Paikkakunnan leveysaste (°)"
 
 msgid "South"
-msgstr ""
+msgstr "etelään"
 
 msgid "North"
-msgstr ""
+msgstr "pohjoiseen"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Paikkakunnan pituusaste (°)"
 
 msgid "West"
-msgstr ""
+msgstr "länteen"
 
 msgid "East"
-msgstr ""
+msgstr "itään"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Laajin kääntömoottorin pyyhkäisy (°)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Kääntömoottorin nopeus (°/s)"
 
 msgid "CAM reset"
 msgstr "CAM nollaus"
@@ -1363,7 +1427,7 @@ msgstr "TOISTO"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Käännetaan lautasta %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsoli"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index a4eda2fb0..a6e0e9a2c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -733,6 +733,70 @@ msgstr "Veuillez entrer %d chiffres !"
 msgid "CAM not responding!"
 msgstr "Pas de réponse du CAM"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Infos sur l'enregistrement"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index baafe9d5b..23f79a1c9 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -725,6 +725,70 @@ msgstr "Molim unesite %d znamenki!"
 msgid "CAM not responding!"
 msgstr "CAM ne odgovara!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Detalji snimanja"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b3c17b0c6..1b4ac5299 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -727,6 +727,70 @@ msgstr "Üssön be %d számot!"
 msgid "CAM not responding!"
 msgstr "A CAM nem válaszol!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Felvétel infó"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index e579885f8..cc5a5678b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
-"PO-Revision-Date: 2013-02-11 23:46+0100\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"PO-Revision-Date: 2013-09-18 23:57+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -730,6 +730,70 @@ msgstr "Inserisci %d cifre!"
 msgid "CAM not responding!"
 msgstr "La CAM non risponde!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Info registrazione"
 
@@ -1001,31 +1065,31 @@ msgid "Setup.LNB$own"
 msgstr "propria"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Utilizza motore antenna"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Latitudine attuale (gradi)"
 
 msgid "South"
-msgstr ""
+msgstr "Sud"
 
 msgid "North"
-msgstr ""
+msgstr "Nord"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Longitudine attuale (gradi)"
 
 msgid "West"
-msgstr ""
+msgstr "Ovest"
 
 msgid "East"
-msgstr ""
+msgstr "Est"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Rotazione massima motore (gradi)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Velocità motore (gradi/s)"
 
 msgid "CAM reset"
 msgstr "Reimposta la CAM"
@@ -1366,7 +1430,7 @@ msgstr "RIPRODUCI"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Muovi antenna verso %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "Consolle ST:TNG"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 34e273c7b..05eb65cf0 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr "Įveskite %d skaičius!"
 msgid "CAM not responding!"
 msgstr "Dekodavimo modulis (CAM) neveikia!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Informacija apie įrašus"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index a398b3ca7..0bceb1b5e 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -724,6 +724,70 @@ msgstr "Внеси %d цифри!"
 msgid "CAM not responding!"
 msgstr "CAM не одговара!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Детали на снимката"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index e9b9a0010..6b2d12262 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -728,6 +728,70 @@ msgstr "Vul %d cijfers in!"
 msgid "CAM not responding!"
 msgstr "CAM reageert niet!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Opname info"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index a05410faf..b338ba7de 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr ""
 msgid "CAM not responding!"
 msgstr ""
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f240894fb..28ba68ebb 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -725,6 +725,70 @@ msgstr "Prosz
 msgid "CAM not responding!"
 msgstr "CAM nie reaguje!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Informacje o nagraniu"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 7dde8c563..9f04d875a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr "Por favor introduza %d d
 msgid "CAM not responding!"
 msgstr "A CAM n�o responde!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Informa��o da grava��o"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f49c4523d..f250a41c3 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -725,6 +725,70 @@ msgstr "Vă rog introduceţi %d cifre!"
 msgid "CAM not responding!"
 msgstr "CAM-ul nu reacţionează!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Detaliile înregistrării"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 785656013..3b4339fdf 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr "
 msgid "CAM not responding!"
 msgstr "CAM �� ��������"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "���� � ������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 6e849b0b9..bd7fe2bc2 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr "Pros
 msgid "CAM not responding!"
 msgstr "CAM neodpoved�!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Podrobnosti nahr�vky"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6e9ca323e..99f2ec11c 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr "Prosim vnesite %d 
 msgid "CAM not responding!"
 msgstr "CAM se ne odziva!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Podatki o snemanju"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 12586f77b..fe5f3cb49 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr "Molimo unesite %d brojeve!"
 msgid "CAM not responding!"
 msgstr "CAM ne reaguje!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Detalji snimanja"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 58492c49a..05f6a3b79 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -727,6 +727,70 @@ msgstr "Mata in %d siffror!"
 msgid "CAM not responding!"
 msgstr "CAM svarar inte!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Inspelningsinformation"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index d92018032..5c9f44e5f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -723,6 +723,70 @@ msgstr "L
 msgid "CAM not responding!"
 msgstr "CAM yan�t vermiyor!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Kay�t bilgisi"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 829921d4c..a09fcc719 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -724,6 +724,70 @@ msgstr "Введіть %d цифри!"
 msgid "CAM not responding!"
 msgstr "CAM не відповідає!"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "Про запис"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ba5e4ddf..9746e83a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-06-10 12:16+0200\n"
+"POT-Creation-Date: 2013-10-14 11:56+0200\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -725,6 +725,70 @@ msgstr "请输入 %d 数字!"
 msgid "CAM not responding!"
 msgstr "CAM 没有响应！"
 
+msgid "Edit path"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+msgid "This folder is currently in use - no changes are possible!"
+msgstr ""
+
+#, c-format
+msgid "Move entire folder containing %d recordings?"
+msgstr ""
+
+msgid "Error while moving folder!"
+msgstr ""
+
+msgid "Edit recording"
+msgstr ""
+
+msgid "This recording is currently in use - no changes are possible!"
+msgstr ""
+
+msgid "Button$Cancel cutting"
+msgstr ""
+
+msgid "Button$Stop cutting"
+msgstr ""
+
+msgid "Button$Cancel moving"
+msgstr ""
+
+msgid "Button$Stop moving"
+msgstr ""
+
+msgid "Button$Cancel copying"
+msgstr ""
+
+msgid "Button$Stop copying"
+msgstr ""
+
+msgid "Button$Cut"
+msgstr ""
+
+msgid "Button$Delete marks"
+msgstr ""
+
+msgid "Recording vanished!"
+msgstr ""
+
+msgid "Error while queueing recording for cutting!"
+msgstr ""
+
+msgid "Delete editing marks for this recording?"
+msgstr ""
+
+msgid "Error while deleting editing marks!"
+msgstr ""
+
+msgid "Error while changing priority/lifetime!"
+msgstr ""
+
+msgid "Error while changing folder/name!"
+msgstr ""
+
 msgid "Recording info"
 msgstr "录像信息"
 
diff --git a/positioner.c b/positioner.c
index 7adcc735b..8b9d27032 100644
--- a/positioner.c
+++ b/positioner.c
@@ -7,7 +7,7 @@
  * For an explanation (in German) of the theory behind the calculations see
  * http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1154305-grundlagen-und-winkelberechnungen-f%C3%BCr-h-h-diseqc-motor-antennenanlagen
  *
- * $Id: positioner.c 3.1 2013/08/21 11:02:52 kls Exp $
+ * $Id: positioner.c 3.2 2013/10/10 14:14:10 kls Exp $
  */
 
 #include "positioner.h"
@@ -49,20 +49,20 @@ int cPositioner::NormalizeAngle(int Angle)
 
 int cPositioner::CalcHourAngle(int Longitude)
 {
-  double Delta = RAD(Longitude - Setup.SiteLon);
+  double Alpha = RAD(Longitude - Setup.SiteLon);
   double Lat = RAD(Setup.SiteLat);
   int Sign = Setup.SiteLat >= 0 ? -1 : 1; // angles to the right are positive, angles to the left are negative
-  return Sign * round(DEG(atan2(sin(Delta), cos(Delta) - cos(Lat) * SAT_EARTH_RATIO)));
+  return Sign * round(DEG(atan2(sin(Alpha), cos(Alpha) - cos(Lat) * SAT_EARTH_RATIO)));
 }
 
 int cPositioner::CalcLongitude(int HourAngle)
 {
   double Lat = RAD(Setup.SiteLat);
   double Lon = RAD(Setup.SiteLon);
-  double Alpha = RAD(HourAngle);
-  double Delta = Alpha - asin(sin(M_PI - Alpha) * cos(Lat) * SAT_EARTH_RATIO);
+  double Delta = RAD(HourAngle);
+  double Alpha = Delta - asin(sin(M_PI - Delta) * cos(Lat) * SAT_EARTH_RATIO);
   int Sign = Setup.SiteLat >= 0 ? 1 : -1;
-  return NormalizeAngle(round(DEG(Lon - Sign * Delta)));
+  return NormalizeAngle(round(DEG(Lon - Sign * Alpha)));
 }
 
 int cPositioner::HorizonLongitude(ePositionerDirection Direction)
diff --git a/recorder.c b/recorder.c
index 047dd197d..7887a88b0 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 3.0 2012/09/22 11:53:57 kls Exp $
+ * $Id: recorder.c 3.1 2013/10/12 11:49:42 kls Exp $
  */
 
 #include "recorder.h"
@@ -14,7 +14,7 @@
 
 // The maximum time we wait before assuming that a recorded video data stream
 // is broken:
-#define MAXBROKENTIMEOUT 30 // seconds
+#define MAXBROKENTIMEOUT 30000 // milliseconds
 
 #define MINFREEDISKSPACE    (512) // MB
 #define DISKCHECKINTERVAL   100 // seconds
@@ -117,7 +117,7 @@ void cRecorder::Receive(uchar *Data, int Length)
 
 void cRecorder::Action(void)
 {
-  time_t t = time(NULL);
+  cTimeMs t(MAXBROKENTIMEOUT);
   bool InfoWritten = false;
   bool FirstIframeSeen = false;
   while (Running()) {
@@ -160,16 +160,16 @@ void cRecorder::Action(void)
                        break;
                        }
                     fileSize += Count;
-                    t = time(NULL);
+                    t.Set(MAXBROKENTIMEOUT);
                     }
                  }
               ringBuffer->Del(Count);
               }
            }
-        if (time(NULL) - t > MAXBROKENTIMEOUT) {
+        if (t.TimedOut()) {
            esyslog("ERROR: video data stream broken");
            ShutdownHandler.RequestEmergencyExit();
-           t = time(NULL);
+           t.Set(MAXBROKENTIMEOUT);
            }
         }
 }
diff --git a/recording.c b/recording.c
index eb3b46676..e41a89eab 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.2 2013/08/21 13:03:38 kls Exp $
+ * $Id: recording.c 3.7 2013/10/16 10:24:28 kls Exp $
  */
 
 #include "recording.h"
@@ -20,8 +20,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "channels.h"
+#include "cutter.h"
 #include "i18n.h"
 #include "interface.h"
+#include "menu.h"
 #include "remux.h"
 #include "ringbuffer.h"
 #include "skins.h"
@@ -66,6 +68,8 @@
 
 #define MAX_LINK_LEVEL  6
 
+#define LIMIT_SECS_PER_MB_RADIO 5 // radio recordings typically have more than this
+
 int DirectoryPathMax = PATH_MAX - 1;
 int DirectoryNameMax = NAME_MAX;
 bool DirectoryEncoding = false;
@@ -90,7 +94,7 @@ cRemoveDeletedRecordingsThread::cRemoveDeletedRecordingsThread(void)
 void cRemoveDeletedRecordingsThread::Action(void)
 {
   // Make sure only one instance of VDR does this:
-  cLockFile LockFile(VideoDirectory);
+  cLockFile LockFile(cVideoDirectory::Name());
   if (LockFile.Lock()) {
      bool deleted = false;
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
@@ -109,7 +113,7 @@ void cRemoveDeletedRecordingsThread::Action(void)
          }
      if (deleted) {
         const char *IgnoreFiles[] = { SORTMODEFILE, NULL };
-        RemoveEmptyVideoDirectories(IgnoreFiles);
+        cVideoDirectory::RemoveEmptyVideoDirectories(IgnoreFiles);
         }
      }
 }
@@ -145,9 +149,9 @@ void AssertFreeDiskSpace(int Priority, bool Force)
   static time_t LastFreeDiskCheck = 0;
   int Factor = (Priority == -1) ? 10 : 1;
   if (Force || time(NULL) - LastFreeDiskCheck > DISKCHECKDELTA / Factor) {
-     if (!VideoFileSpaceAvailable(MINDISKSPACE)) {
+     if (!cVideoDirectory::VideoFileSpaceAvailable(MINDISKSPACE)) {
         // Make sure only one instance of VDR does this:
-        cLockFile LockFile(VideoDirectory);
+        cLockFile LockFile(cVideoDirectory::Name());
         if (!LockFile.Lock())
            return;
         // Remove the oldest file that has been "deleted":
@@ -422,6 +426,13 @@ void cRecordingInfo::SetFramesPerSecond(double FramesPerSecond)
   framesPerSecond = FramesPerSecond;
 }
 
+void cRecordingInfo::SetFileName(const char *FileName)
+{
+  bool IsPesRecording = fileName && endswith(fileName, ".vdr");
+  free(fileName);
+  fileName = strdup(cString::sprintf("%s%s", FileName, IsPesRecording ? INFOFILESUFFIX ".vdr" : INFOFILESUFFIX));
+}
+
 bool cRecordingInfo::Read(FILE *f)
 {
   if (ownEvent) {
@@ -769,7 +780,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
   else if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
      name = strdup(Timer->File());
   else
-     name = strdup(cString::sprintf("%s~%s", Timer->File(), Subtitle));
+     name = strdup(cString::sprintf("%s%c%s", Timer->File(), FOLDERDELIMCHAR, Subtitle));
   // substitute characters that would cause problems in file names:
   strreplace(name, '\n', ' ');
   start = Timer->StartTime();
@@ -800,8 +811,8 @@ cRecording::cRecording(const char *FileName)
   FileName = fileName = strdup(FileName);
   if (*(fileName + strlen(fileName) - 1) == '/')
      *(fileName + strlen(fileName) - 1) = 0;
-  if (strstr(FileName, VideoDirectory) == FileName)
-     FileName += strlen(VideoDirectory) + 1;
+  if (strstr(FileName, cVideoDirectory::Name()) == FileName)
+     FileName += strlen(cVideoDirectory::Name()) + 1;
   const char *p = strrchr(FileName, '/');
 
   name = NULL;
@@ -949,7 +960,7 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = strdup(FileName() + strlen(VideoDirectory));
+     char *s = strdup(FileName() + strlen(cVideoDirectory::Name()));
      if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
         s = StripEpisodeName(s, RecordingsSortMode != rsmName);
      strreplace(s, '/', '0'); // some locales ignore '/' when sorting
@@ -963,8 +974,9 @@ char *cRecording::SortName(void) const
 
 void cRecording::ClearSortName(void)
 {
-  DELETENULL(sortBufferName);
-  DELETENULL(sortBufferTime);
+  free(sortBufferName);
+  free(sortBufferTime);
+  sortBufferName = sortBufferTime = NULL;
 }
 
 int cRecording::GetResume(void) const
@@ -982,6 +994,28 @@ int cRecording::Compare(const cListObject &ListObject) const
   return strcasecmp(SortName(), r->SortName());
 }
 
+bool cRecording::IsInPath(const char *Path)
+{
+  if (isempty(Path))
+     return true;
+  int l = strlen(Path);
+  return strncmp(Path, name, l) == 0 && (name[l] == FOLDERDELIMCHAR);
+}
+
+cString cRecording::Folder(void) const
+{
+  if (char *s = strrchr(name, FOLDERDELIMCHAR))
+     return cString(name, s);
+  return "";
+}
+
+cString cRecording::BaseName(void) const
+{
+  if (char *s = strrchr(name, FOLDERDELIMCHAR))
+     return cString(s + 1);
+  return name;
+}
+
 const char *cRecording::FileName(void) const
 {
   if (!fileName) {
@@ -990,11 +1024,11 @@ const char *cRecording::FileName(void) const
      const char *fmt = isPesRecording ? NAMEFORMATPES : NAMEFORMATTS;
      int ch = isPesRecording ? priority : channel;
      int ri = isPesRecording ? lifetime : instanceId;
-     char *Name = LimitNameLengths(strdup(name), DirectoryPathMax - strlen(VideoDirectory) - 1 - 42, DirectoryNameMax); // 42 = length of an actual recording directory name (generated with DATAFORMATTS) plus some reserve
+     char *Name = LimitNameLengths(strdup(name), DirectoryPathMax - strlen(cVideoDirectory::Name()) - 1 - 42, DirectoryNameMax); // 42 = length of an actual recording directory name (generated with DATAFORMATTS) plus some reserve
      if (strcmp(Name, name) != 0)
         dsyslog("recording file name '%s' truncated to '%s'", name, Name);
      Name = ExchangeChars(Name, true);
-     fileName = strdup(cString::sprintf(fmt, VideoDirectory, Name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri));
+     fileName = strdup(cString::sprintf(fmt, cVideoDirectory::Name(), Name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, ch, ri));
      free(Name);
      }
   return fileName;
@@ -1063,7 +1097,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons
 
 const char *cRecording::PrefixFileName(char Prefix)
 {
-  cString p = PrefixVideoFileName(FileName(), Prefix);
+  cString p = cVideoDirectory::PrefixVideoFileName(FileName(), Prefix);
   if (*p) {
      free(fileName);
      fileName = strdup(p);
@@ -1093,10 +1127,26 @@ bool cRecording::IsEdited(void) const
 bool cRecording::IsOnVideoDirectoryFileSystem(void) const
 {
   if (isOnVideoDirectoryFileSystem < 0)
-     isOnVideoDirectoryFileSystem = ::IsOnVideoDirectoryFileSystem(FileName());
+     isOnVideoDirectoryFileSystem = cVideoDirectory::IsOnVideoDirectoryFileSystem(FileName());
   return isOnVideoDirectoryFileSystem;
 }
 
+bool cRecording::HasMarks(void)
+{
+  return access(cMarks::MarksFileName(this), F_OK) == 0;
+}
+
+bool cRecording::DeleteMarks(void)
+{
+  if (remove(cMarks::MarksFileName(this)) < 0) {
+     if (errno != ENOENT) {
+        LOG_ERROR_STR(fileName);
+        return false;
+        }
+     }
+  return true;
+}
+
 void cRecording::ReadInfo(void)
 {
   info->Read();
@@ -1105,13 +1155,13 @@ void cRecording::ReadInfo(void)
   framesPerSecond = info->framesPerSecond;
 }
 
-bool cRecording::WriteInfo(void)
+bool cRecording::WriteInfo(const char *OtherFileName)
 {
-  cString InfoFileName = cString::sprintf("%s%s", fileName, isPesRecording ? INFOFILESUFFIX ".vdr" : INFOFILESUFFIX);
-  FILE *f = fopen(InfoFileName, "w");
-  if (f) {
+  cString InfoFileName = cString::sprintf("%s%s", OtherFileName ? OtherFileName : FileName(), isPesRecording ? INFOFILESUFFIX ".vdr" : INFOFILESUFFIX);
+  cSafeFile f(InfoFileName);
+  if (f.Open()) {
      info->Write(f);
-     fclose(f);
+     f.Close();
      }
   else
      LOG_ERROR_STR(*InfoFileName);
@@ -1125,6 +1175,58 @@ void cRecording::SetStartTime(time_t Start)
   fileName = NULL;
 }
 
+bool cRecording::ChangePriorityLifetime(int NewPriority, int NewLifetime)
+{
+  if (NewPriority != Priority() || NewLifetime != Lifetime()) {
+     dsyslog("changing priority/lifetime of '%s' to %d/%d", Name(), NewPriority, NewLifetime);
+     if (IsPesRecording()) {
+        cString OldFileName = FileName();
+        priority = NewPriority;
+        lifetime = NewLifetime;
+        free(fileName);
+        fileName = NULL;
+        cString NewFileName = FileName();
+        if (!cVideoDirectory::RenameVideoFile(OldFileName, NewFileName))
+           return false;
+        info->SetFileName(NewFileName);
+        }
+     else {
+        priority = info->priority = NewPriority;
+        lifetime = info->lifetime = NewLifetime;
+        if (!WriteInfo())
+           return false;
+        }
+     Recordings.ChangeState();
+     Recordings.TouchUpdate();
+     }
+  return true;
+}
+
+bool cRecording::ChangeName(const char *NewName)
+{
+  if (strcmp(NewName, Name())) {
+     dsyslog("changing name of '%s' to '%s'", Name(), NewName);
+     cString OldName = Name();
+     cString OldFileName = FileName();
+     free(fileName);
+     fileName = NULL;
+     free(name);
+     name = strdup(NewName);
+     cString NewFileName = FileName();
+     if (!(MakeDirs(NewFileName, true) && cVideoDirectory::MoveVideoFile(OldFileName, NewFileName))) {
+        free(name);
+        name = strdup(OldName);
+        free(fileName);
+        fileName = strdup(OldFileName);
+        return false;
+        }
+     ClearSortName();
+     Recordings.ChangeState();
+     Recordings.TouchUpdate();
+     }
+  return true;
+}
+
 bool cRecording::Delete(void)
 {
   bool result = true;
@@ -1135,11 +1237,11 @@ bool cRecording::Delete(void)
      if (access(NewName, F_OK) == 0) {
         // the new name already exists, so let's remove that one first:
         isyslog("removing recording '%s'", NewName);
-        RemoveVideoFile(NewName);
+        cVideoDirectory::RemoveVideoFile(NewName);
         }
      isyslog("deleting recording '%s'", FileName());
      if (access(FileName(), F_OK) == 0) {
-        result = RenameVideoFile(FileName(), NewName);
+        result = cVideoDirectory::RenameVideoFile(FileName(), NewName);
         cRecordingUserCommand::InvokeCommand(RUC_DELETERECORDING, NewName);
         }
      else {
@@ -1159,7 +1261,7 @@ bool cRecording::Remove(void)
      return false;
      }
   isyslog("removing recording %s", FileName());
-  return RemoveVideoFile(FileName());
+  return cVideoDirectory::RemoveVideoFile(FileName());
 }
 
 bool cRecording::Undelete(void)
@@ -1177,7 +1279,7 @@ bool cRecording::Undelete(void)
      else {
         isyslog("undeleting recording '%s'", FileName());
         if (access(FileName(), F_OK) == 0)
-           result = RenameVideoFile(FileName(), NewName);
+           result = cVideoDirectory::RenameVideoFile(FileName(), NewName);
         else {
            isyslog("deleted recording '%s' vanished", FileName());
            result = false;
@@ -1188,6 +1290,17 @@ bool cRecording::Undelete(void)
   return result;
 }
 
+int cRecording::IsInUse(void) const
+{
+  int Use = ruNone;
+  if (cRecordControls::GetRecordControl(FileName()))
+     Use |= ruTimer;
+  if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), FileName()) == 0)
+     Use |= ruReplay;
+  Use |= RecordingsHandler.GetUsage(FileName());
+  return Use;
+}
+
 void cRecording::ResetResume(void) const
 {
   resume = RESUME_NOT_INITIALIZED;
@@ -1250,7 +1363,7 @@ void cRecordings::Action(void)
 const char *cRecordings::UpdateFileName(void)
 {
   if (!updateFileName)
-     updateFileName = strdup(AddDirectory(VideoDirectory, ".update"));
+     updateFileName = strdup(AddDirectory(cVideoDirectory::Name(), ".update"));
   return updateFileName;
 }
 
@@ -1261,7 +1374,7 @@ void cRecordings::Refresh(bool Foreground)
   Clear();
   ChangeState();
   Unlock();
-  ScanVideoDir(VideoDirectory, Foreground);
+  ScanVideoDir(cVideoDirectory::Name(), Foreground);
 }
 
 void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel)
@@ -1417,8 +1530,10 @@ double cRecordings::MBperMinute(void)
          if (FileSizeMB > 0) {
             int LengthInSeconds = recording->LengthInSeconds();
             if (LengthInSeconds > 0) {
-               size += FileSizeMB;
-               length += LengthInSeconds;
+               if (LengthInSeconds / FileSizeMB < LIMIT_SECS_PER_MB_RADIO) { // don't count radio recordings
+                  size += FileSizeMB;
+                  length += LengthInSeconds;
+                  }
                }
             }
          }
@@ -1426,6 +1541,46 @@ double cRecordings::MBperMinute(void)
   return (size && length) ? double(size) * 60 / length : -1;
 }
 
+int cRecordings::PathIsInUse(const char *Path)
+{
+  LOCK_THREAD;
+  int Use = ruNone;
+  for (cRecording *recording = First(); recording; recording = Next(recording)) {
+      if (recording->IsInPath(Path))
+         Use |= recording->IsInUse();
+      }
+  return Use;
+}
+
+int cRecordings::GetNumRecordingsInPath(const char *Path)
+{
+  LOCK_THREAD;
+  int n = 0;
+  for (cRecording *recording = First(); recording; recording = Next(recording)) {
+      if (recording->IsInPath(Path))
+         n++;
+      }
+  return n;
+}
+
+bool cRecordings::MoveRecordings(const char *OldPath, const char *NewPath)
+{
+  if (OldPath && NewPath && strcmp(OldPath, NewPath)) {
+     LOCK_THREAD;
+     dsyslog("moving '%s' to '%s'", OldPath, NewPath);
+     for (cRecording *recording = First(); recording; recording = Next(recording)) {
+         if (recording->IsInPath(OldPath)) {
+            const char *p = recording->Name() + strlen(OldPath);
+            cString NewName = cString::sprintf("%s%s", NewPath, p);
+            if (!recording->ChangeName(NewName))
+               return false;
+            ChangeState();
+            }
+         }
+     }
+  return true;
+}
+
 void cRecordings::ResetResume(const char *ResumeFileName)
 {
   LOCK_THREAD;
@@ -1443,6 +1598,361 @@ void cRecordings::ClearSortNames(void)
       recording->ClearSortName();
 }
 
+// --- cDirCopier ------------------------------------------------------------
+
+class cDirCopier : public cThread {
+private:
+  cString dirNameSrc;
+  cString dirNameDst;
+  bool error;
+  bool suspensionLogged;
+  bool Throttled(void);
+  virtual void Action(void);
+public:
+  cDirCopier(const char *DirNameSrc, const char *DirNameDst);
+  virtual ~cDirCopier();
+  void Stop(void);
+  bool Error(void) { return error; }
+  };
+
+cDirCopier::cDirCopier(const char *DirNameSrc, const char *DirNameDst)
+:cThread("file copier", true)
+{
+  dirNameSrc = DirNameSrc;
+  dirNameDst = DirNameDst;
+  error = false;
+  suspensionLogged = false;
+}
+
+cDirCopier::~cDirCopier()
+{
+  Stop();
+}
+
+bool cDirCopier::Throttled(void)
+{
+  if (cIoThrottle::Engaged()) {
+     if (!suspensionLogged) {
+        dsyslog("suspending copy thread");
+        suspensionLogged = true;
+        }
+     return true;
+     }
+  else if (suspensionLogged) {
+     dsyslog("resuming copy thread");
+     suspensionLogged = false;
+     }
+  return false;
+}
+
+void cDirCopier::Action(void)
+{
+  if (DirectoryOk(dirNameDst, true)) {
+     cReadDir d(dirNameSrc);
+     if (d.Ok()) {
+        dsyslog("copying directory '%s' to '%s'", *dirNameSrc, *dirNameDst);
+        dirent *e = NULL;
+        cString FileNameSrc;
+        cString FileNameDst;
+        int From = -1;
+        int To = -1;
+        size_t BufferSize = BUFSIZ;
+        while (Running()) {
+              // Suspend cutting if we have severe throughput problems:
+              if (Throttled()) {
+                 cCondWait::SleepMs(100);
+                 continue;
+                 }
+              // Copy all files in the source directory to the destination directory:
+              if (e) {
+                 // We're currently copying a file:
+                 uchar Buffer[BufferSize];
+                 size_t Read = safe_read(From, Buffer, sizeof(Buffer));
+                 if (Read > 0) {
+                    size_t Written = safe_write(To, Buffer, Read);
+                    if (Written != Read) {
+                       esyslog("ERROR: can't write to destination file '%s': %m", *FileNameDst);
+                       break;
+                       }
+                    }
+                 else if (Read == 0) { // EOF on From
+                    e = NULL; // triggers switch to next entry
+                    if (fsync(To) < 0) {
+                       esyslog("ERROR: can't sync destination file '%s': %m", *FileNameDst);
+                       break;
+                       }
+                    if (close(From) < 0) {
+                       esyslog("ERROR: can't close source file '%s': %m", *FileNameSrc);
+                       break;
+                       }
+                    if (close(To) < 0) {
+                       esyslog("ERROR: can't close destination file '%s': %m", *FileNameDst);
+                       break;
+                       }
+                    // Plausibility check:
+                    off_t FileSizeSrc = FileSize(FileNameSrc);
+                    off_t FileSizeDst = FileSize(FileNameDst);
+                    if (FileSizeSrc != FileSizeDst) {
+                       esyslog("ERROR: file size discrepancy: %lld != %lld", FileSizeSrc, FileSizeDst);
+                       break;
+                       }
+                    }
+                 else {
+                    esyslog("ERROR: can't read from source file '%s': %m", *FileNameSrc);
+                    break;
+                    }
+                 }
+              else if ((e = d.Next()) != NULL) {
+                 // We're switching to the next directory entry:
+                 FileNameSrc = AddDirectory(dirNameSrc, e->d_name);
+                 FileNameDst = AddDirectory(dirNameDst, e->d_name);
+                 struct stat st;
+                 if (stat(FileNameSrc, &st) < 0) {
+                    esyslog("ERROR: can't access source file '%s': %m", *FileNameSrc);
+                    break;
+                    }
+                 if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))) {
+                    esyslog("ERROR: source file '%s' is neither a regular file nor a symbolic link", *FileNameSrc);
+                    break;
+                    }
+                 dsyslog("copying file '%s' to '%s'", *FileNameSrc, *FileNameDst);
+                 BufferSize = max(size_t(st.st_blksize * 10), size_t(BUFSIZ));
+                 if (access(FileNameDst, F_OK) == 0) {
+                    esyslog("ERROR: destination file '%s' already exists", *FileNameDst);
+                    break;
+                    }
+                 if ((From = open(FileNameSrc, O_RDONLY)) < 0) {
+                    esyslog("ERROR: can't open source file '%s': %m", *FileNameSrc);
+                    break;
+                    }
+                 if ((To = open(FileNameDst, O_WRONLY | O_CREAT | O_EXCL, DEFFILEMODE)) < 0) {
+                    esyslog("ERROR: can't open destination file '%s': %m", *FileNameDst);
+                    close(From);
+                    break;
+                    }
+                 }
+              else {
+                 // We're done:
+                 dsyslog("done copying directory '%s' to '%s'", *dirNameSrc, *dirNameDst);
+                 return;
+                 }
+              }
+        close(From); // just to be absolutely sure
+        close(To);
+        esyslog("ERROR: copying directory '%s' to '%s' ended prematurely", *dirNameSrc, *dirNameDst);
+        }
+     else
+        esyslog("ERROR: can't open '%s'", *dirNameSrc);
+     }
+  else
+     esyslog("ERROR: can't access '%s'", *dirNameDst);
+  error = true;
+}
+
+void cDirCopier::Stop(void)
+{
+  Cancel(3);
+  if (error) {
+     cVideoDirectory::RemoveVideoFile(dirNameDst);
+     Recordings.AddByName(dirNameSrc);
+     Recordings.DelByName(dirNameDst);
+     }
+}
+
+// --- cRecordingsHandlerEntry -----------------------------------------------
+
+class cRecordingsHandlerEntry : public cListObject {
+private:
+  int usage;
+  cString fileNameSrc;
+  cString fileNameDst;
+  cCutter *cutter;
+  cDirCopier *copier;
+  void ClearPending(void) { usage &= ~ruPending; }
+public:
+  cRecordingsHandlerEntry(int Usage, const char *FileNameSrc, const char *FileNameDst);
+  ~cRecordingsHandlerEntry();
+  int Usage(const char *FileName = NULL) const;
+  const char *FileNameSrc(void) const { return fileNameSrc; }
+  const char *FileNameDst(void) const { return fileNameDst; }
+  bool Active(bool &Error);
+  };
+
+cRecordingsHandlerEntry::cRecordingsHandlerEntry(int Usage, const char *FileNameSrc, const char *FileNameDst)
+{
+  usage = Usage;
+  fileNameSrc = FileNameSrc;
+  fileNameDst = FileNameDst;
+  cutter = NULL;
+  copier = NULL;
+}
+
+cRecordingsHandlerEntry::~cRecordingsHandlerEntry()
+{
+  delete cutter;
+  delete copier;
+}
+
+int cRecordingsHandlerEntry::Usage(const char *FileName) const
+{
+  int u = usage;
+  if (FileName && *FileName) {
+     if (strcmp(FileName, fileNameSrc) == 0)
+        u |= ruSrc;
+     else if (strcmp(FileName, fileNameDst) == 0)
+        u |= ruDst;
+     }
+  return u;
+}
+
+bool cRecordingsHandlerEntry::Active(bool &Error)
+{
+  bool CopierFinishedOk = false;
+  // First test whether there is an ongoing operation:
+  if (cutter) {
+     if (cutter->Active())
+        return true;
+     Error |= cutter->Error();
+     delete cutter;
+     cutter = NULL;
+     }
+  else if (copier) {
+     if (copier->Active())
+        return true;
+     Error |= copier->Error();
+     CopierFinishedOk = !copier->Error();
+     delete copier;
+     copier = NULL;
+     }
+  // Now check if there is something to start:
+  if ((Usage() & ruPending) != 0) {
+     if ((Usage() & ruCut) != 0) {
+        cutter = new cCutter(FileNameSrc());
+        cutter->Start();
+        }
+     else if ((Usage() & (ruMove | ruCopy)) != 0) {
+        copier = new cDirCopier(FileNameSrc(), FileNameDst());
+        copier->Start();
+        }
+     ClearPending();
+     Recordings.ChangeState();
+     return true;
+     }
+  // Clean up:
+  if (CopierFinishedOk && (Usage() & ruMove) != 0) {
+     cRecording Recording(FileNameSrc());
+     Recording.Delete();
+     }
+  Recordings.ChangeState();
+  Recordings.TouchUpdate();
+  return false;
+}
+
+// --- cRecordingsHandler ----------------------------------------------------
+
+cRecordingsHandler RecordingsHandler;
+
+cRecordingsHandler::cRecordingsHandler(void)
+{
+  finished = true;
+  error = false;
+}
+
+cRecordingsHandler::~cRecordingsHandler()
+{
+}
+
+cRecordingsHandlerEntry *cRecordingsHandler::Get(const char *FileName)
+{
+  if (FileName && *FileName) {
+     for (cRecordingsHandlerEntry *r = operations.First(); r; r = operations.Next(r)) {
+         if (strcmp(FileName, r->FileNameSrc()) == 0 || strcmp(FileName, r->FileNameDst()) == 0)
+            return r;
+         }
+     }
+  return NULL;
+}
+
+bool cRecordingsHandler::Add(int Usage, const char *FileNameSrc, const char *FileNameDst)
+{
+  dsyslog("recordings handler add %d '%s' '%s'", Usage, FileNameSrc, FileNameDst);
+  cMutexLock MutexLock(&mutex);
+  if (Usage == ruCut || Usage == ruMove || Usage == ruCopy) {
+     if (FileNameSrc && *FileNameSrc) {
+        if (Usage == ruCut || FileNameDst && *FileNameDst) {
+           cString fnd;
+           if (Usage == ruCut && !FileNameDst)
+              FileNameDst = fnd = cCutter::EditedFileName(FileNameSrc);
+           if (!Get(FileNameSrc) && !Get(FileNameDst)) {
+              Usage |= ruPending;
+              operations.Add(new cRecordingsHandlerEntry(Usage, FileNameSrc, FileNameDst));
+              finished = false;
+              Active(); // start it right away if possible
+              Recordings.ChangeState();
+              return true;
+              }
+           else
+              esyslog("ERROR: file name already present in recordings handler add %d '%s' '%s'", Usage, FileNameSrc, FileNameDst);
+           }
+        else
+           esyslog("ERROR: missing dst file name in recordings handler add %d '%s' '%s'", Usage, FileNameSrc, FileNameDst);
+        }
+     else
+        esyslog("ERROR: missing src file name in recordings handler add %d '%s' '%s'", Usage, FileNameSrc, FileNameDst);
+     }
+  else
+     esyslog("ERROR: invalid usage in recordings handler add %d '%s' '%s'", Usage, FileNameSrc, FileNameDst);
+  return false;
+}
+
+void cRecordingsHandler::Del(const char *FileName)
+{
+  cMutexLock MutexLock(&mutex);
+  if (cRecordingsHandlerEntry *r = Get(FileName)) {
+     operations.Del(r);
+     Recordings.ChangeState();
+     }
+}
+
+void cRecordingsHandler::DelAll(void)
+{
+  cMutexLock MutexLock(&mutex);
+  operations.Clear();
+  Recordings.ChangeState();
+}
+
+int cRecordingsHandler::GetUsage(const char *FileName)
+{
+  cMutexLock MutexLock(&mutex);
+  if (cRecordingsHandlerEntry *r = Get(FileName))
+     return r->Usage(FileName);
+  return ruNone;
+}
+
+bool cRecordingsHandler::Active(void)
+{
+  cMutexLock MutexLock(&mutex);
+  while (cRecordingsHandlerEntry *r = operations.First()) {
+        if (r->Active(error))
+           return true;
+        else
+           operations.Del(r);
+        }
+  return false;
+}
+
+bool cRecordingsHandler::Finished(bool &Error)
+{
+  cMutexLock MutexLock(&mutex);
+  if (!finished && operations.Count() == 0) {
+     finished = true;
+     Error = error;
+     error = false;
+     return true;
+     }
+  return false;
+}
+
 // --- cMark -----------------------------------------------------------------
 
 double MarkFramesPerSecond = DEFAULTFRAMESPERSECOND;
@@ -1485,6 +1995,11 @@ bool cMark::Save(FILE *f)
 
 // --- cMarks ----------------------------------------------------------------
 
+cString cMarks::MarksFileName(const cRecording *Recording)
+{
+  return AddDirectory(Recording->FileName(), Recording->IsPesRecording() ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
+}
+
 bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool IsPesRecording)
 {
   recordingFileName = RecordingFileName;
@@ -2274,7 +2789,7 @@ cUnbufferedFile *cFileName::Open(void)
      int BlockingFlag = blocking ? 0 : O_NONBLOCK;
      if (record) {
         dsyslog("recording to '%s'", fileName);
-        file = OpenVideoFile(fileName, O_RDWR | O_CREAT | O_LARGEFILE | BlockingFlag);
+        file = cVideoDirectory::OpenVideoFile(fileName, O_RDWR | O_CREAT | O_LARGEFILE | BlockingFlag);
         if (!file)
            LOG_ERROR_STR(fileName);
         }
@@ -2295,8 +2810,9 @@ cUnbufferedFile *cFileName::Open(void)
 void cFileName::Close(void)
 {
   if (file) {
-     if (CloseVideoFile(file) < 0)
+     if (file->Close() < 0)
         LOG_ERROR_STR(fileName);
+     delete file;
      file = NULL;
      }
 }
diff --git a/recording.h b/recording.h
index 2b767628b..3b00c71bc 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 3.0 2013/03/04 14:01:23 kls Exp $
+ * $Id: recording.h 3.1 2013/10/10 12:08:15 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -25,6 +25,21 @@ extern int DirectoryNameMax;
 extern bool DirectoryEncoding;
 extern int InstanceId;
 
+enum eRecordingUsage {
+  ruNone     = 0x0000, // the recording is currently unused
+  ruTimer    = 0x0001, // the recording is currently written to by a timer
+  ruReplay   = 0x0002, // the recording is being replayed
+  // mutually exclusive:
+  ruCut      = 0x0004, // the recording is being cut
+  ruMove     = 0x0008, // the recording is being moved
+  ruCopy     = 0x0010, // the recording is being copied
+  // mutually exclusive:
+  ruSrc      = 0x0020, // the recording is the source of a cut, move or copy process
+  ruDst      = 0x0040, // the recording is the destination of a cut, move or copy process
+  //
+  ruPending  = 0x0080, // the recording is pending a cut, move or copy process
+  };
+
 void RemoveDeletedRecordings(void);
 void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
      ///< The special Priority value -1 means that we shall get rid of any
@@ -73,6 +88,7 @@ class cRecordingInfo {
   const char *Aux(void) const { return aux; }
   double FramesPerSecond(void) const { return framesPerSecond; }
   void SetFramesPerSecond(double FramesPerSecond);
+  void SetFileName(const char *FileName);
   bool Write(FILE *f, const char *Prefix = "") const;
   bool Read(void);
   bool Write(void) const;
@@ -114,8 +130,21 @@ class cRecording : public cListObject {
   int Lifetime(void) const { return lifetime; }
   time_t Deleted(void) const { return deleted; }
   virtual int Compare(const cListObject &ListObject) const;
+  bool IsInPath(const char *Path);
+       ///< Returns true if this recording is stored anywhere under the given Path.
+       ///< If Path is NULL or an empty string, the entire video directory is checked.
+  cString Folder(void) const;
+       ///< Returns the name of the folder this recording is stored in (without the
+       ///< video directory). For use in menus etc.
+  cString BaseName(void) const;
+       ///< Returns the base name of this recording (without the
+       ///< video directory and folder). For use in menus etc.
   const char *Name(void) const { return name; }
+       ///< Returns the full name of the recording (without the video directory.
+       ///< For use in menus etc.
   const char *FileName(void) const;
+       ///< Returns the full path name to the recording directory, including the
+       ///< video directory and the actual '*.rec'. For disk file access use.
   const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
   const cRecordingInfo *Info(void) const { return info; }
   const char *PrefixFileName(char Prefix);
@@ -134,8 +163,17 @@ class cRecording : public cListObject {
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
   bool IsOnVideoDirectoryFileSystem(void) const;
+  bool HasMarks(void);
+       ///< Returns true if this recording has any editing marks.
+  bool DeleteMarks(void);
+       ///< Deletes the editing marks from this recording (if any).
+       ///< Returns true if the operation was successful. If there is no marks file
+       ///< for this recording, it also returns true.
   void ReadInfo(void);
-  bool WriteInfo(void);
+  bool WriteInfo(const char *OtherFileName = NULL);
+       ///< Writes in info file of this recording. If OtherFileName is given, the info
+       ///< file will be written under that recording file name instead of this
+       ///< recording's file name.
   void SetStartTime(time_t Start);
        ///< Sets the start time of this recording to the given value.
        ///< If a filename has already been set for this recording, it will be
@@ -144,6 +182,17 @@ class cRecording : public cListObject {
        ///< Use this function with care - it does not check whether a recording with
        ///< this new name already exists, and if there is one, results may be
        ///< unexpected!
+  bool ChangePriorityLifetime(int NewPriority, int NewLifetime);
+       ///< Changes the priority and lifetime of this recording to the given values.
+       ///< If the new values are the same as the old ones, nothing happens.
+       ///< Returns false in case of error.
+  bool ChangeName(const char *NewName);
+       ///< Changes the name of this recording to the given value. NewName is in the
+       ///< same format as the one returned by Name(), i.e. without the video directory
+       ///< and the actual '*.rec' part, and using FOLDERDELIMCHAR as the directory
+       ///< delimiter.
+       ///< If the new name is the same as the old one, nothing happens.
+       ///< Returns false in case of error.
   bool Delete(void);
        ///< Changes the file name so that it will no longer be visible in the "Recordings" menu
        ///< Returns false in case of error
@@ -154,6 +203,14 @@ class cRecording : public cListObject {
        ///< Changes the file name so that it will be visible in the "Recordings" menu again and
        ///< not processed by cRemoveDeletedRecordingsThread.
        ///< Returns false in case of error
+  int IsInUse(void) const;
+       ///< Checks whether this recording is currently in use and therefore shall not
+       ///< be tampered with. Returns 0 (ruNone) if the recording is not in use.
+       ///< The return value may consist of several or'd eRecordingUsage flags. If the
+       ///< caller is just interested in whether the recording is in use or not, the
+       ///< return value can be used like a boolean value.
+       ///< A recording may be in use for several reasons (like being recorded and replayed,
+       ///< as in time-shift).
   };
 
 class cRecordings : public cList<cRecording>, public cThread {
@@ -197,11 +254,76 @@ class cRecordings : public cList<cRecording>, public cThread {
   double MBperMinute(void);
        ///< Returns the average data rate (in MB/min) of all recordings, or -1 if
        ///< this value is unknown.
+  int PathIsInUse(const char *Path);
+       ///< Checks whether any recording in the given Path is currently in use and therefore
+       ///< the whole Path shall not be tampered with. Returns 0 (ruNone) if no recording
+       ///< is in use.
+       ///< See cRecording::IsInUse() for details about the possible non-zero return values.
+       ///< If several recordings in the Path are currently in use, the return value will
+       ///< be the combination of all individual recordings' flags.
+       ///< If Path is NULL or an empty string, the entire video directory is checked.
+  int GetNumRecordingsInPath(const char *Path);
+       ///< Returns the total number of recordings in the given Path, including all
+       ///< sub-folders of Path.
+       ///< If Path is NULL or an empty string, the entire video directory is checked.
+  bool MoveRecordings(const char *OldPath, const char *NewPath);
+       ///< Moves all recordings in OldPath to NewPath.
+       ///< Returns true if all recordings were successfully moved.
+       ///< As soon as the operation fails for one recording, the whole
+       ///< action is aborted and false will be returned. Any recordings that
+       ///< have been successfully moved thus far will keep their new name.
+       ///< If OldPath and NewPath are on different file systems, the recordings
+       ///< will be moved in a background process and this function returns true
+       ///< if all recordings have been successfully added to the RecordingsHandler.
   };
 
 extern cRecordings Recordings;
 extern cRecordings DeletedRecordings;
 
+class cRecordingsHandlerEntry;
+
+class cRecordingsHandler {
+private:
+  cMutex mutex;
+  cList<cRecordingsHandlerEntry> operations;
+  bool finished;
+  bool error;
+  cRecordingsHandlerEntry *Get(const char *FileName);
+public:
+  cRecordingsHandler(void);
+  ~cRecordingsHandler();
+  bool Add(int Usage, const char *FileNameSrc, const char *FileNameDst = NULL);
+       ///< Adds the given FileNameSrc to the recordings handler for (later)
+       ///< processing. Usage can be either ruCut, ruMove or ruCopy. FileNameDst
+       ///< is only applicable for ruMove and ruCopy.
+       ///< At any given time there can be only one operation for any FileNameSrc
+       ///< or FileNameDst in the list. An attempt to add a file name twice will
+       ///< result in an error.
+       ///< Returns true if the operation was successfully added to the list.
+  void Del(const char *FileName);
+       ///< Deletes the given FileName from the list of operations.
+       ///< If an action is already in progress, it will be terminated.
+       ///< FileName can be either the FileNameSrc or FileNameDst (if applicable)
+       ///< that was given when the operation was added with Add().
+  void DelAll(void);
+       ///< Deletes/terminates all operations.
+  int GetUsage(const char *FileName);
+       ///< Returns the usage type for the given FileName.
+  bool Active(void);
+       ///< Checks whether there is currently any operation running and starts
+       ///> the next one form the list if the previous one has finished.
+       ///< This function must be called regularly to trigger switching to the
+       ///< next operation in the list.
+       ///< Returns true if there are any operations in the list.
+  bool Finished(bool &Error);
+       ///< Returns true if all operations in the list have been finished.
+       ///< If there have been any errors, Errors will be set to true.
+       ///< This function will only return true once if the list of operations
+       ///< has actually become empty since the last call.
+  };
+
+extern cRecordingsHandler RecordingsHandler;
+
 #define DEFAULTFRAMESPERSECOND 25.0
 
 class cMark : public cListObject {
@@ -232,6 +354,9 @@ class cMarks : public cConfig<cMark> {
   time_t lastFileTime;
   time_t lastChange;
 public:
+  static cString MarksFileName(const cRecording *Recording);
+       ///< Returns the marks file name for the given Recording (regardless whether such
+       ///< a file actually exists).
   bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
   bool Update(void);
   bool Save(void);
diff --git a/shutdown.c b/shutdown.c
index 0a36a15f7..97d056e9a 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 3.0 2013/02/18 10:33:26 kls Exp $
+ * $Id: shutdown.c 3.1 2013/10/02 09:02:01 kls Exp $
  */
 
 #include "shutdown.h"
@@ -16,11 +16,11 @@
 #include <sys/wait.h>
 #include "channels.h"
 #include "config.h"
-#include "cutter.h"
 #include "i18n.h"
 #include "interface.h"
 #include "menu.h"
 #include "plugin.h"
+#include "recording.h"
 #include "timers.h"
 #include "tools.h"
 
@@ -167,7 +167,7 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive)
         Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
      return false;
      }
-  if (cCutter::Active()) {
+  if (RecordingsHandler.Active()) {
      if (!Interactive || !Interface->Confirm(tr("Editing - shut down anyway?")))
         return false;
      }
@@ -210,7 +210,7 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive)
 
 bool cShutdownHandler::ConfirmRestart(bool Interactive)
 {
-  if (cCutter::Active()) {
+  if (RecordingsHandler.Active()) {
      if (!Interactive || !Interface->Confirm(tr("Editing - restart anyway?")))
         return false;
      }
diff --git a/svdrp.c b/svdrp.c
index 1cb87e469..7f91479ff 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 3.0 2013/02/17 13:18:01 kls Exp $
+ * $Id: svdrp.c 3.3 2013/10/14 09:49:38 kls Exp $
  */
 
 #include "svdrp.h"
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include "channels.h"
 #include "config.h"
-#include "cutter.h"
 #include "device.h"
 #include "eitscan.h"
 #include "keys.h"
@@ -305,6 +304,11 @@ const char *HelpPages[] = {
   "REMO [ on | off ]\n"
   "    Turns the remote control on or off. Without a parameter, the current\n"
   "    status of the remote control is reported.",
+  "RENR <number> <new name>\n"
+  "    Rename the recording with the given number. Before a recording can be\n"
+  "    renamed, an LSTR command must have been executed in order to retrieve\n"
+  "    the recording numbers. The numbers don't change during subsequent RENR\n"
+  "    commands.n",
   "SCAN\n"
   "    Forces an EPG scan. If this is a single DVB device system, the scan\n"
   "    will be done on the primary device unless it is currently recording.",
@@ -659,27 +663,38 @@ void cSVDRP::CmdDELC(const char *Option)
      Reply(501, "Missing channel number");
 }
 
+static cString RecordingInUseMessage(int Reason, const char *RecordingId, cRecording *Recording)
+{
+  cRecordControl *rc;
+  if ((Reason & ruTimer) != 0 && (rc = cRecordControls::GetRecordControl(Recording->FileName())) != NULL)
+     return cString::sprintf("Recording \"%s\" is in use by timer %d", RecordingId, rc->Timer()->Index() + 1);
+  else if ((Reason & ruReplay) != 0)
+     return cString::sprintf("Recording \"%s\" is being replayed", RecordingId);
+  else if ((Reason & ruCut) != 0)
+     return cString::sprintf("Recording \"%s\" is being edited", RecordingId);
+  else if ((Reason & (ruMove | ruCopy)) != 0)
+     return cString::sprintf("Recording \"%s\" is being copied/moved", RecordingId);
+  else if (Reason)
+     return cString::sprintf("Recording \"%s\" is in use", RecordingId);
+  return NULL;
+}
+
 void cSVDRP::CmdDELR(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
         cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
-           cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
-           if (!rc) {
-              if (!cCutter::Active(recording->FileName())) {
-                 if (recording->Delete()) {
-                    Reply(250, "Recording \"%s\" deleted", Option);
-                    Recordings.DelByName(recording->FileName());
-                    }
-                 else
-                    Reply(554, "Error while deleting recording!");
+           if (int RecordingInUse = recording->IsInUse())
+              Reply(550, RecordingInUseMessage(RecordingInUse, Option, recording));
+           else {
+              if (recording->Delete()) {
+                 Reply(250, "Recording \"%s\" deleted", Option);
+                 Recordings.DelByName(recording->FileName());
                  }
               else
-                 Reply(550, "Recording \"%s\" is being edited", Option);
+                 Reply(554, "Error while deleting recording!");
               }
-           else
-              Reply(550, "Recording \"%s\" is in use by timer %d", Option, rc->Timer()->Index() + 1);
            }
         else
            Reply(550, "Recording \"%s\" not found%s", Option, recordings.Count() ? "" : " (use LSTR before deleting)");
@@ -728,14 +743,10 @@ void cSVDRP::CmdEDIT(const char *Option)
         if (recording) {
            cMarks Marks;
            if (Marks.Load(recording->FileName(), recording->FramesPerSecond(), recording->IsPesRecording()) && Marks.Count()) {
-              if (!cCutter::Active()) {
-                 if (cCutter::Start(recording->FileName()))
-                    Reply(250, "Editing recording \"%s\" [%s]", Option, recording->Title());
-                 else
-                    Reply(554, "Can't start editing process");
-                 }
+              if (RecordingsHandler.Add(ruCut, recording->FileName()))
+                 Reply(250, "Editing recording \"%s\" [%s]", Option, recording->Title());
               else
-                 Reply(554, "Editing process already active");
+                 Reply(554, "Can't start editing process");
               }
            else
               Reply(554, "No editing marks defined");
@@ -1539,6 +1550,46 @@ void cSVDRP::CmdREMO(const char *Option)
      Reply(250, "Remote control is %s", cRemote::Enabled() ? "enabled" : "disabled");
 }
 
+void cSVDRP::CmdRENR(const char *Option)
+{
+  if (*Option) {
+     char *opt = strdup(Option);
+     char *num = skipspace(opt);
+     char *option = num;
+     while (*option && !isspace(*option))
+           option++;
+     char c = *option;
+     *option = 0;
+     if (isnumber(num)) {
+        cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
+        if (recording) {
+           if (int RecordingInUse = recording->IsInUse())
+              Reply(550, RecordingInUseMessage(RecordingInUse, Option, recording));
+           else {
+              if (c)
+                 option = skipspace(++option);
+              if (*option) {
+                 cString oldName = recording->Name();
+                 if ((recording = Recordings.GetByName(recording->FileName())) != NULL && recording->ChangeName(option))
+                    Reply(250, "Recording \"%s\" renamed to \"%s\"", *oldName, recording->Name());
+                 else
+                    Reply(554, "Error while renaming recording \"%s\" to \"%s\"!", *oldName, option);
+                 }
+              else
+                 Reply(501, "Missing new recording name");
+              }
+           }
+        else
+           Reply(550, "Recording \"%s\" not found%s", num, recordings.Count() ? "" : " (use LSTR before renaming)");
+        }
+     else
+        Reply(501, "Error in recording number \"%s\"", num);
+     free(opt);
+     }
+  else
+     Reply(501, "Missing recording number");
+}
+
 void cSVDRP::CmdSCAN(const char *Option)
 {
   EITScanner.ForceScan();
@@ -1550,7 +1601,7 @@ void cSVDRP::CmdSTAT(const char *Option)
   if (*Option) {
      if (strcasecmp(Option, "DISK") == 0) {
         int FreeMB, UsedMB;
-        int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
+        int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
         Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent);
         }
      else
@@ -1666,6 +1717,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("PLUG"))  CmdPLUG(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
   else if (CMD("REMO"))  CmdREMO(s);
+  else if (CMD("RENR"))  CmdRENR(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
   else if (CMD("STAT"))  CmdSTAT(s);
   else if (CMD("UPDR"))  CmdUPDR(s);
diff --git a/svdrp.h b/svdrp.h
index fcba1fb4c..96247e523 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 3.0 2012/04/26 10:30:06 kls Exp $
+ * $Id: svdrp.h 3.1 2013/09/14 13:24:50 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -78,6 +78,7 @@ class cSVDRP {
   void CmdPLUG(const char *Option);
   void CmdPUTE(const char *Option);
   void CmdREMO(const char *Option);
+  void CmdRENR(const char *Option);
   void CmdSCAN(const char *Option);
   void CmdSTAT(const char *Option);
   void CmdUPDT(const char *Option);
diff --git a/tools.c b/tools.c
index d88182704..a2055ec8d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 3.1 2013/05/07 08:48:00 kls Exp $
+ * $Id: tools.c 3.2 2013/09/22 13:19:19 kls Exp $
  */
 
 #include "tools.h"
@@ -173,6 +173,31 @@ char *strreplace(char *s, const char *s1, const char *s2)
   return s;
 }
 
+const char *strchrn(const char *s, char c, size_t n)
+{
+  if (n == 0)
+     return s;
+  if (s) {
+     for ( ; *s; s++) {
+         if (*s == c && --n == 0)
+            return s;
+         }
+     }
+  return NULL;
+}
+
+int strcountchr(const char *s, char c)
+{
+  int n = 0;
+  if (s && c) {
+     for ( ; *s; s++) {
+         if (*s == c)
+            n++;
+         }
+     }
+  return n;
+}
+
 char *stripspace(char *s)
 {
   if (s && *s) {
@@ -202,6 +227,30 @@ char *compactspace(char *s)
   return s;
 }
 
+char *compactchars(char *s, char c)
+{
+  if (s && *s && c) {
+     char *t = s;
+     char *p = s;
+     int n = 0;
+     while (*p) {
+           if (*p != c) {
+              *t++ = *p;
+              n = 0;
+              }
+           else if (t != s && n == 0) {
+              *t++ = *p;
+              n++;
+              }
+           p++;
+           }
+     if (n)
+        t--; // the last character was c
+     *t = 0;
+     }
+  return s;
+}
+
 cString strescape(const char *s, const char *chars)
 {
   char *buffer;
@@ -970,6 +1019,20 @@ cString::cString(const char *S, bool TakePointer)
   s = TakePointer ? (char *)S : S ? strdup(S) : NULL;
 }
 
+cString::cString(const char *S, const char *To)
+{
+  if (!S)
+     s = NULL;
+  else if (!To)
+     s = strdup(S);
+  else {
+     int l = To - S;
+     s = MALLOC(char, l + 1);
+     strncpy(s, S, l);
+     s[l] = 0;
+     }
+}
+
 cString::cString(const cString &String)
 {
   s = String.s ? strdup(String.s) : NULL;
@@ -1008,6 +1071,12 @@ cString &cString::Truncate(int Index)
   return *this;
 }
 
+cString &cString::CompactChars(char c)
+{
+  compactchars(s, c);
+  return *this;
+}
+
 cString cString::sprintf(const char *fmt, ...)
 {
   va_list ap;
diff --git a/tools.h b/tools.h
index 9cfd152be..358f75e31 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 3.2 2013/08/23 10:32:51 kls Exp $
+ * $Id: tools.h 3.3 2013/09/22 13:30:14 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -170,6 +170,7 @@ class cString {
   char *s;
 public:
   cString(const char *S = NULL, bool TakePointer = false);
+  cString(const char *S, const char *To); ///< Copies S up to To (exclusive). To must be a valid pointer into S. If To is NULL, everything is copied.
   cString(const cString &String);
   virtual ~cString();
   operator const void * () const { return s; } // to catch cases where operator*() should be used
@@ -178,6 +179,7 @@ class cString {
   cString &operator=(const cString &String);
   cString &operator=(const char *String);
   cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string).
+  cString &CompactChars(char c); ///< Compact any sequence of characters 'c' to a single character, and strip all of them from the beginning and end of this string.
   static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
   static cString vsprintf(const char *fmt, va_list &ap);
   };
@@ -193,6 +195,8 @@ char *strcpyrealloc(char *dest, const char *src);
 char *strn0cpy(char *dest, const char *src, size_t n);
 char *strreplace(char *s, char c1, char c2);
 char *strreplace(char *s, const char *s1, const char *s2); ///< re-allocates 's' and deletes the original string if necessary!
+const char *strchrn(const char *s, char c, size_t n); ///< returns a pointer to the n'th occurrence (counting from 1) of c in s, or NULL if no such character was found. If n is 0, s is returned.
+int strcountchr(const char *s, char c); ///< returns the number of occurrences of 'c' in 's'.
 inline char *skipspace(const char *s)
 {
   if ((uchar)*s > ' ') // most strings don't have any leading space, so handle this case as fast as possible
@@ -203,6 +207,7 @@ inline char *skipspace(const char *s)
 }
 char *stripspace(char *s);
 char *compactspace(char *s);
+char *compactchars(char *s, char c); ///< removes all occurrences of 'c' from the beginning an end of 's' and replaces sequences of multiple 'c's with a single 'c'.
 cString strescape(const char *s, const char *chars);
 bool startswith(const char *s, const char *p);
 bool endswith(const char *s, const char *p);
diff --git a/vdr.c b/vdr.c
index bf581a6e5..083d838c6 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.1 2013/06/10 14:28:43 kls Exp $
+ * $Id: vdr.c 3.4 2013/10/16 09:33:58 kls Exp $
  */
 
 #include <getopt.h>
@@ -663,7 +663,7 @@ int main(int argc, char *argv[])
 
   // Directories:
 
-  SetVideoDirectory(VideoDirectory);
+  cVideoDirectory::SetName(VideoDirectory);
   if (!ConfigDirectory)
      ConfigDirectory = DEFAULTCONFDIR;
   cPlugin::SetConfigDirectory(ConfigDirectory);
@@ -1239,7 +1239,7 @@ int main(int argc, char *argv[])
              case osRecordings:
                             DELETE_MENU;
                             cControl::Shutdown();
-                            Menu = new cMenuMain(osRecordings);
+                            Menu = new cMenuMain(osRecordings, true);
                             break;
              case osReplay: DELETE_MENU;
                             cControl::Shutdown();
@@ -1320,8 +1320,9 @@ int main(int argc, char *argv[])
         if (!Menu) {
            if (!InhibitEpgScan)
               EITScanner.Process();
-           if (!cCutter::Active() && cCutter::Ended()) {
-              if (cCutter::Error())
+           bool Error = false;
+           if (RecordingsHandler.Finished(Error)) {
+              if (Error)
                  Skins.Message(mtError, tr("Editing process failed!"));
               else
                  Skins.Message(mtInfo, tr("Editing process finished"));
@@ -1341,7 +1342,10 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+        // Keep the recordings handler alive:
+        RecordingsHandler.Active();
+
+        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Handle housekeeping tasks
 
            // Shutdown:
@@ -1390,7 +1394,7 @@ int main(int argc, char *argv[])
 
   PluginManager.StopPlugins();
   cRecordControls::Shutdown();
-  cCutter::Stop();
+  RecordingsHandler.DelAll();
   delete Menu;
   cControl::Shutdown();
   delete Interface;
@@ -1406,6 +1410,7 @@ int main(int argc, char *argv[])
      }
   cDevice::Shutdown();
   cPositioner::DestroyPositioner();
+  cVideoDirectory::Destroy();
   EpgHandlers.Clear();
   PluginManager.Shutdown(true);
   cSchedules::Cleanup(true);
diff --git a/videodir.c b/videodir.c
index 9ad31b6f6..932f8ce39 100644
--- a/videodir.c
+++ b/videodir.c
@@ -1,10 +1,10 @@
 /*
- * videodir.c: Functions to maintain a distributed video directory
+ * videodir.c: Functions to maintain the video directory
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 3.1 2013/08/23 12:28:06 kls Exp $
+ * $Id: videodir.c 3.4 2013/10/11 09:38:07 kls Exp $
  */
 
 #include "videodir.h"
@@ -19,213 +19,129 @@
 #include "recording.h"
 #include "tools.h"
 
-//#define DEPRECATED_DISTRIBUTED_VIDEODIR // Code enclosed with this macro is deprecated and will be removed in a future version
+cString cVideoDirectory::name;
+cVideoDirectory *cVideoDirectory::current = NULL;
 
-const char *VideoDirectory = VIDEODIR;
-
-void SetVideoDirectory(const char *Directory)
+cVideoDirectory::cVideoDirectory(void)
 {
-  VideoDirectory = strdup(Directory);
+  delete current;
+  current = this;
 }
 
-class cVideoDirectory {
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-private:
-  char *name, *stored, *adjusted;
-  int length, number, digits;
-#endif
-public:
-  cVideoDirectory(void);
-  ~cVideoDirectory();
-  int FreeMB(int *UsedMB = NULL);
-  const char *Name(void) { return
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-                                  name ? name :
-#endif
-                                                VideoDirectory; }
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  const char *Stored(void) { return stored; }
-  int Length(void) { return length; }
-  bool IsDistributed(void) { return name != NULL; }
-  bool Next(void);
-  void Store(void);
-  const char *Adjust(const char *FileName);
-#endif
-  };
+cVideoDirectory::~cVideoDirectory()
+{
+  current = NULL;
+}
 
-cVideoDirectory::cVideoDirectory(void)
+cVideoDirectory *cVideoDirectory::Current(void)
 {
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  length = strlen(VideoDirectory);
-  name = (VideoDirectory[length - 1] == '0') ? strdup(VideoDirectory) : NULL;
-  stored = adjusted = NULL;
-  number = -1;
-  digits = 0;
-#endif
+  if (!current)
+     current = new cVideoDirectory;
+  return current;
 }
 
-cVideoDirectory::~cVideoDirectory()
+void cVideoDirectory::Destroy(void)
 {
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  free(name);
-  free(stored);
-  free(adjusted);
-#endif
+  delete current;
 }
 
 int cVideoDirectory::FreeMB(int *UsedMB)
 {
-  return FreeDiskSpaceMB(
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-                         name ? name :
-#endif
-                                       VideoDirectory, UsedMB);
+  return FreeDiskSpaceMB(Name(), UsedMB);
 }
 
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-bool cVideoDirectory::Next(void)
+const char *cVideoDirectory::Name(void)
 {
-  if (name) {
-     if (number < 0) {
-        int l = length;
-        while (l-- > 0 && isdigit(name[l]))
-              ;
-        l++;
-        digits = length - l;
-        int n = atoi(&name[l]);
-        if (n == 0)
-           number = n;
-        else
-           return false; // base video directory must end with zero
-        }
-     if (++number > 0) {
-        char buf[16];
-        if (sprintf(buf, "%0*d", digits, number) == digits) {
-           strcpy(&name[length - digits], buf);
-           return DirectoryOk(name);
-           }
-        }
-     }
-  return false;
+  return name;
 }
 
-void cVideoDirectory::Store(void)
+void cVideoDirectory::SetName(const char *Name)
 {
-  if (name) {
-     free(stored);
-     stored = strdup(name);
-     }
+  name = Name;
 }
 
-const char *cVideoDirectory::Adjust(const char *FileName)
+bool cVideoDirectory::Register(const char *FileName)
 {
-  if (stored) {
-     free(adjusted);
-     adjusted = strdup(FileName);
-     return strncpy(adjusted, stored, length);
+  // Incoming name must be in base video directory:
+  if (strstr(FileName, Name()) != FileName) {
+     esyslog("ERROR: %s not in %s", FileName, Name());
+     errno = ENOENT; // must set 'errno' - any ideas for a better value?
+     return false;
      }
-  return NULL;
+  return true;
 }
-#endif
 
-cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags)
+bool cVideoDirectory::Rename(const char *OldName, const char *NewName)
 {
-  const char *ActualFileName = FileName;
-
-  // Incoming name must be in base video directory:
-  if (strstr(FileName, VideoDirectory) != FileName) {
-     esyslog("ERROR: %s not in %s", FileName, VideoDirectory);
-     errno = ENOENT; // must set 'errno' - any ideas for a better value?
-     return NULL;
+  dsyslog("renaming '%s' to '%s'", OldName, NewName);
+  if (rename(OldName, NewName) == -1) {
+     LOG_ERROR_STR(NewName);
+     return false;
      }
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  // Are we going to create a new file?
-  if ((Flags & O_CREAT) != 0) {
-     cVideoDirectory Dir;
-     if (Dir.IsDistributed()) {
-        // Find the directory with the most free space:
-        int MaxFree = Dir.FreeMB();
-        while (Dir.Next()) {
-              int Free = FreeDiskSpaceMB(Dir.Name());
-              if (Free > MaxFree) {
-                 Dir.Store();
-                 MaxFree = Free;
-                 }
-              }
-        if (Dir.Stored()) {
-           ActualFileName = Dir.Adjust(FileName);
-           if (!MakeDirs(ActualFileName, false))
-              return NULL; // errno has been set by MakeDirs()
-           if (symlink(ActualFileName, FileName) < 0) {
-              LOG_ERROR_STR(FileName);
-              return NULL;
-              }
-           ActualFileName = strdup(ActualFileName); // must survive Dir!
-           }
+  return true;
+}
+
+bool cVideoDirectory::Move(const char *FromName, const char *ToName)
+{
+  dsyslog("moving '%s' to '%s'", FromName, ToName);
+  if (EntriesOnSameFileSystem(FromName, ToName)) {
+     if (rename(FromName, ToName) == -1) {
+        LOG_ERROR_STR(ToName);
+        return false;
         }
      }
-#endif
-  cUnbufferedFile *File = cUnbufferedFile::Create(ActualFileName, Flags, DEFFILEMODE);
-  if (ActualFileName != FileName)
-     free((char *)ActualFileName);
-  return File;
+  else
+     return RecordingsHandler.Add(ruMove, FromName, ToName);
+  return true;
 }
 
-int CloseVideoFile(cUnbufferedFile *File)
+bool cVideoDirectory::Remove(const char *Name)
 {
-  int Result = File->Close();
-  delete File;
-  return Result;
+  return RemoveFileOrDir(Name);
 }
 
-bool RenameVideoFile(const char *OldName, const char *NewName)
+void cVideoDirectory::Cleanup(const char *IgnoreFiles[])
 {
-  // Only the base video directory entry will be renamed, leaving the
-  // possible symlinks untouched. Going through all the symlinks and disks
-  // would be unnecessary work - maybe later...
-  if (rename(OldName, NewName) == -1) {
-     LOG_ERROR_STR(OldName);
-     return false;
-     }
-  return true;
+  RemoveEmptyDirectories(Name(), false, IgnoreFiles);
 }
 
-bool RemoveVideoFile(const char *FileName)
+bool cVideoDirectory::Contains(const char *Name)
 {
-  return RemoveFileOrDir(FileName, true);
+  return EntriesOnSameFileSystem(this->Name(), Name);
 }
 
-bool VideoFileSpaceAvailable(int SizeMB)
+cUnbufferedFile *cVideoDirectory::OpenVideoFile(const char *FileName, int Flags)
 {
-  cVideoDirectory Dir;
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  if (Dir.IsDistributed()) {
-     if (Dir.FreeMB() >= SizeMB * 2) // base directory needs additional space
-        return true;
-     while (Dir.Next()) {
-           if (Dir.FreeMB() >= SizeMB)
-              return true;
-           }
-     return false;
-     }
-#endif
-  return Dir.FreeMB() >= SizeMB;
+  if (Current()->Register(FileName))
+     return cUnbufferedFile::Create(FileName, Flags, DEFFILEMODE);
+  return NULL;
 }
 
-int VideoDiskSpace(int *FreeMB, int *UsedMB)
+bool cVideoDirectory::RenameVideoFile(const char *OldName, const char *NewName)
 {
-  int free = 0, used = 0;
+  return Current()->Rename(OldName, NewName);
+}
+
+bool cVideoDirectory::MoveVideoFile(const char *FromName, const char *ToName)
+{
+  return Current()->Move(FromName, ToName);
+}
+
+bool cVideoDirectory::RemoveVideoFile(const char *FileName)
+{
+  return Current()->Remove(FileName);
+}
+
+bool cVideoDirectory::VideoFileSpaceAvailable(int SizeMB)
+{
+  return Current()->FreeMB() >= SizeMB;
+}
+
+int cVideoDirectory::VideoDiskSpace(int *FreeMB, int *UsedMB)
+{
+  int used = 0;
+  int free = Current()->FreeMB(&used);
   int deleted = DeletedRecordings.TotalFileSizeMB();
-  cVideoDirectory Dir;
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  do {
-#endif
-     int u;
-     free += Dir.FreeMB(&u);
-     used += u;
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-     } while (Dir.Next());
-#endif
   if (deleted > used)
      deleted = used; // let's not get beyond 100%
   free += deleted;
@@ -237,7 +153,7 @@ int VideoDiskSpace(int *FreeMB, int *UsedMB)
   return (free + used) ? used * 100 / (free + used) : 0;
 }
 
-cString PrefixVideoFileName(const char *FileName, char Prefix)
+cString cVideoDirectory::PrefixVideoFileName(const char *FileName, char Prefix)
 {
   char PrefixedName[strlen(FileName) + 2];
 
@@ -257,30 +173,14 @@ cString PrefixVideoFileName(const char *FileName, char Prefix)
   return NULL;
 }
 
-void RemoveEmptyVideoDirectories(const char *IgnoreFiles[])
+void cVideoDirectory::RemoveEmptyVideoDirectories(const char *IgnoreFiles[])
 {
-  cVideoDirectory Dir;
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  do {
-#endif
-     RemoveEmptyDirectories(Dir.Name(), false, IgnoreFiles);
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-     } while (Dir.Next());
-#endif
+  Current()->Cleanup(IgnoreFiles);
 }
 
-bool IsOnVideoDirectoryFileSystem(const char *FileName)
+bool cVideoDirectory::IsOnVideoDirectoryFileSystem(const char *FileName)
 {
-  cVideoDirectory Dir;
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-  do {
-#endif
-     if (EntriesOnSameFileSystem(Dir.Name(), FileName))
-        return true;
-#ifdef DEPRECATED_DISTRIBUTED_VIDEODIR
-     } while (Dir.Next());
-#endif
-  return false;
+  return Current()->Contains(FileName);
 }
 
 // --- cVideoDiskUsage -------------------------------------------------------
@@ -298,7 +198,7 @@ bool cVideoDiskUsage::HasChanged(int &State)
 {
   if (time(NULL) - lastChecked > DISKSPACECHEK) {
      int FreeMB;
-     int UsedPercent = VideoDiskSpace(&FreeMB);
+     int UsedPercent = cVideoDirectory::VideoDiskSpace(&FreeMB);
      if (FreeMB != freeMB) {
         usedPercent = UsedPercent;
         freeMB = FreeMB;
diff --git a/videodir.h b/videodir.h
index 35c1a5506..f520d77ba 100644
--- a/videodir.h
+++ b/videodir.h
@@ -1,10 +1,10 @@
 /*
- * videodir.h: Functions to maintain a distributed video directory
+ * videodir.h: Functions to maintain the video directory
  *
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 3.0 2012/09/30 11:01:15 kls Exp $
+ * $Id: videodir.h 3.2 2013/10/11 09:37:48 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -13,18 +13,75 @@
 #include <stdlib.h>
 #include "tools.h"
 
-extern const char *VideoDirectory;
-
-void SetVideoDirectory(const char *Directory);
-cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags);
-int CloseVideoFile(cUnbufferedFile *File);
-bool RenameVideoFile(const char *OldName, const char *NewName);
-bool RemoveVideoFile(const char *FileName);
-bool VideoFileSpaceAvailable(int SizeMB);
-int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
-cString PrefixVideoFileName(const char *FileName, char Prefix);
-void RemoveEmptyVideoDirectories(const char *IgnoreFiles[] = NULL);
-bool IsOnVideoDirectoryFileSystem(const char *FileName);
+class cVideoDirectory {
+private:
+  static cString name;
+  static cVideoDirectory *current;
+  static cVideoDirectory *Current(void);
+public:
+  cVideoDirectory(void);
+  virtual ~cVideoDirectory();
+  virtual int FreeMB(int *UsedMB = NULL);
+      ///< Returns the total amount (in MB) of free disk space for recording.
+      ///< If UsedMB is given, it returns the amount of disk space in use by
+      ///< existing recordings (or anything else) on that disk.
+  virtual bool Register(const char *FileName);
+      ///< By default VDR assumes that the video directory consists of one large
+      ///< volume, on which it can store its recordings. A derived cVideoDirectory
+      ///< may, for instance, use several separate disks to store recordings.
+      ///< The given FileName is the full path name (including the video directory) of
+      ///< a recording file ('*.ts') that is about to be opened for writing. If the actual
+      ///< file shall be put on an other disk, the derived cVideoDirectory should
+      ///< create a symbolic link from the given FileName to the other location.
+      ///< Returns true if the operation was successful.
+      ///< The default implementation just checks whether the incoming file name really
+      ///< is under the video directory.
+  virtual bool Rename(const char *OldName, const char *NewName);
+      ///< Renames the directory OldName to NewName.
+      ///< OldName and NewName are full path names that begin with the name of the
+      ///< video directory and end with '*.rec' or '*.del'. Only the base name (the
+      ///< rightmost component) of the two names may be different.
+      ///< Returns true if the operation was successful.
+      ///< The default implementation just calls the system's rename() function.
+  virtual bool Move(const char *FromName, const char *ToName);
+      ///< Moves the directory FromName to the location ToName. FromName is the full
+      ///< path name of a recording's '*.rec' directory. ToName has the same '*.rec'
+      ///< part as FromName, but a different directory path above it.
+      ///< Returns true if the operation was successful.
+      ///< The default implementation just calls the system's rename() function.
+  virtual bool Remove(const char *Name);
+      ///< Removes the directory with the given Name and everything it contains.
+      ///< Name is a full path name that begins with the name of the video directory.
+      ///< Returns true if the operation was successful.
+      ///< The default implementation calls RemoveFileOrDir().
+  virtual void Cleanup(const char *IgnoreFiles[] = NULL);
+      ///< Recursively removes all empty directories under the video directory.
+      ///< If IgnoreFiles is given, the file names in this (NULL terminated) array
+      ///< are ignored when checking whether a directory is empty. These are
+      ///< typically "dot files", like e.g. ".sort".
+      ///< The default implementation calls RemoveEmptyDirectories().
+  virtual bool Contains(const char *Name);
+      ///< Checks whether the directory Name is on the same file system as the
+      ///< video directory. Name is the full path name of a recording's '*.rec'
+      ///< directory. This function is usually called when an ongoing recording
+      ///< is about to run out of disk space, and an existing (old) recording needs
+      ///< to be deleted. It shall make sure that deleting this old recording will
+      ///< actually free up space in the video directory, and not on some other
+      ///< device that just happens to be mounted.
+      ///< The default implementation calls EntriesOnSameFileSystem().
+  static const char *Name(void);
+  static void SetName(const char *Name);
+  static void Destroy(void);
+  static cUnbufferedFile *OpenVideoFile(const char *FileName, int Flags);
+  static bool RenameVideoFile(const char *OldName, const char *NewName);
+  static bool MoveVideoFile(const char *FromName, const char *ToName);
+  static bool RemoveVideoFile(const char *FileName);
+  static bool VideoFileSpaceAvailable(int SizeMB);
+  static int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
+  static cString PrefixVideoFileName(const char *FileName, char Prefix);
+  static void RemoveEmptyVideoDirectories(const char *IgnoreFiles[] = NULL);
+  static bool IsOnVideoDirectoryFileSystem(const char *FileName);
+  };
 
 class cVideoDiskUsage {
 private:

From 716c03a47e72a7eebfcf8d0aeef0dcdde801cdf4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 5 Jan 2014 12:42:00 +0100
Subject: [PATCH 234/307] Version 2.1.3 VDR developer version 2.1.3 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.3.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.2-2.1.3.diff

MD5 checksums:

054f80e0045aa6fad118e9285b52f4f2  vdr-2.1.3.tar.bz2
3c5ab05d5c4d0b984b34e84190e80949  vdr-2.1.2-2.1.3.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Originally I intended to release this version only after the new DiSEqC
configuration dialog was finished. But in the meantime quite a few other things
have come up, so I decided to postpone that dialog and first release what has
piled up so far.

From the HISTORY file:
- Changed the return value of cPositioner::HorizonLongitude() to 0 in case the
  latitude of the antenna location is beyond +/-81 degrees.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed some compiler warnings with gcc-4.6.3 (thanks to Rolf Ahrenberg).
- Changed the name of the SVDRP command RENR to MOVR (suggested by Rolf Ahrenberg).
- When cutting a recording it is now checked whether there is already an edited
  version of this recording (with the same name, but starting with '%'), and the
  user is prompted for confirmation to overwrite it (suggested by Rolf Ahrenberg).
- Revoked "Added maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P"
  because it broke things for the "TechniSat AirStar 2" DVB-T card.
- The LIRC remote control now connects to the socket even if it doesn't yet exist when
  VDR is started (thanks to Lars Hanisch).
- Changed the absolute latitude limit for visible satellites to 81.2 degrees.
- Added code for parsing LCN and AVC descriptors to libsi (thanks to Rolf Ahrenberg).
- In the "Select folder" menu pressing Ok now selects the folder, even if this is a
  folder that contains sub folders (marked with "..."). To open such a folder you
  can press the Red key.
- Fixed a possible access to uninitialized data in cEIT::cEIT() (reported by Dominik
  Strasser).
- The new menu category mcRecordingEdit is now used to mark menus that edit recording
  properties (suggested by Stefan Braun).
- Changes in the teletext PID no longer cause retuning (and thus interrupting a
  recording).
- Removed '_' from the FileNameChars and CharMap translations in uk_UA.po.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a missing initialization in the c'tor of cSkinLCARSDisplayChannel (thanks to
  Marko Mäkelä).
- Simplified some conditional expressions in skinlcars.c and skinsttng.c (suggested
  by Marko Mäkelä).
- Fixed uninitialized item area coordinates in cSkinLCARSDisplayMenu (reported by
  Marko Mäkelä).
- Fixed a possible crash if the recordings list is updated externally while the
  Recordings menu is open (reported by Lars Hanisch).
- Added a missing closing ')' in the help and man page entry of the --vfat option
  (reported by Lars Hanisch).
- Fixed setting the name of the video directory to avoid a crash when using --genindex,
  and also to use the correct directory with --edit (the latter reported by Marko
  Mäkelä).
- The Recordings menu can now be called with a cRecordingFilter, which allows the
  caller to have it display only a certain subset of the recordings (thanks to Lars
  Hanisch).
- Added handling UTF-8 'umlaut' characters to cKbdRemote (thanks to Lars Hanisch).
- Made it clear that the Data parameter in cDevice::StillPicture() may point to a
  series of packets, not just a single one (thanks to Thomas Reufer).
- cDevice::TrickSpeed() now has an additional parameter named Forward, which indicates
  the direction in which replay is being done (suggested by Thomas Reufer). This
  information may be necessary for some output devices in order to properly implement
  trick modes. Authors of plugins that implement output devices will need to add this
  parameter to their derived cDevice class, regardless of whether they will make use
  of it or not.
- Added a note to ePlayMode in device.h that VDR itself always uses pmAudioVideo when
  replaying a recording (suggested by Thomas Reufer).
- Fixed some spellings in positioner.h and Doxyfile (thanks to Ville Skyttä).
- Changed '%a' to the POSIX compliant '%m' in all scanf() calls (thanks to Ville
  Skyttä).
- The new function cCamSlot::Decrypt() can be used by derived classes to implement a
  CAM slot that can be freely assigned to any device, without being directly inserted
  into the full TS data stream in hardware. A derived class that implements Decrypt()
  will also need to set the new parameter ReceiveCaPids in the call to the cCamSlot
  base class constructor to true, in order to receive the CA pid TS packets that
  contain data necessary for decrypting.
- Many member functions of cCamSlot have been made virtual to allow for easier
  implementation of derived classes.
- cTSBuffer now provides the number of available bytes in its Get() function.
- cDvbDevice::GetTSPacket() now calls CamSlot()->Decrypt() in order to allow CAM slots
  that can be freely assigned to any device access to the TS data stream.
- Added a check to avoid a possible NULL pointer dereference in cCiSession::SendData()
  (reported by Ville Skyttä).
- Deleted a superfluous assignment in cPipe::Open() (reported by Ville Skyttä).
- The script given to VDR with the '-r' option is now also called after the recording
  process has actually started (thanks to Christian Kaiser).
- Avoiding unnecessary pkg-config warnings in plugin Makefiles (thanks to Ville Skyttä).
  Plugin authors may want to apply the following change to their Makefile:
  -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
  +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
- Eliminated MAXDVBDEVICES (suggested by Oliver Endriss).
- Channels that are no longer contained in the current SDT of a transponder are now
  marked with the keyword OBSOLETE in their name and provider fields. That way you can
  identify obsolete channels when you switch to them, and you can get the complete
  overview of all obsolete channels by sorting the Channels list by provider (by
  pressing the 0 key twice). Automatic deletion of obsolete channels may follow later.
---
 CONTRIBUTORS                            |  36 +++++++-
 Doxyfile                                |   2 +-
 HISTORY                                 | 106 ++++++++++++++++++++++++
 INSTALL                                 |   4 +
 MANUAL                                  |   7 +-
 PLUGINS.html                            |   2 +-
 PLUGINS/src/dvbhddevice/HISTORY         |   5 ++
 PLUGINS/src/dvbhddevice/Makefile        |   2 +-
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   2 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |   2 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h |   2 +-
 PLUGINS/src/dvbsddevice/HISTORY         |   5 ++
 PLUGINS/src/dvbsddevice/Makefile        |   4 +-
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |   4 +-
 PLUGINS/src/epgtableid0/HISTORY         |   4 +
 PLUGINS/src/epgtableid0/Makefile        |   4 +-
 PLUGINS/src/epgtableid0/epgtableid0.c   |   4 +-
 PLUGINS/src/hello/HISTORY               |   4 +
 PLUGINS/src/hello/Makefile              |   4 +-
 PLUGINS/src/hello/hello.c               |   4 +-
 PLUGINS/src/osddemo/HISTORY             |   4 +
 PLUGINS/src/osddemo/Makefile            |   4 +-
 PLUGINS/src/osddemo/osddemo.c           |   4 +-
 PLUGINS/src/pictures/HISTORY            |   4 +
 PLUGINS/src/pictures/Makefile           |   4 +-
 PLUGINS/src/pictures/pictures.c         |   4 +-
 PLUGINS/src/rcu/HISTORY                 |   4 +
 PLUGINS/src/rcu/Makefile                |   4 +-
 PLUGINS/src/rcu/rcu.c                   |   4 +-
 PLUGINS/src/servicedemo/HISTORY         |   4 +
 PLUGINS/src/servicedemo/Makefile        |   4 +-
 PLUGINS/src/servicedemo/svccli.c        |   4 +-
 PLUGINS/src/servicedemo/svcsvr.c        |   4 +-
 PLUGINS/src/skincurses/HISTORY          |   4 +
 PLUGINS/src/skincurses/Makefile         |   4 +-
 PLUGINS/src/skincurses/skincurses.c     |   4 +-
 PLUGINS/src/status/HISTORY              |   4 +
 PLUGINS/src/status/Makefile             |   4 +-
 PLUGINS/src/status/status.c             |   4 +-
 PLUGINS/src/svdrpdemo/HISTORY           |   4 +
 PLUGINS/src/svdrpdemo/Makefile          |   4 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c       |   4 +-
 channels.c                              |  33 ++++++--
 channels.h                              |   7 +-
 ci.c                                    |  45 +++++++++-
 ci.h                                    |  73 +++++++++++-----
 config.h                                |  10 +--
 device.c                                |  18 ++--
 device.h                                |  27 ++++--
 diseqc.c                                |   6 +-
 diseqc.conf                             |   2 +-
 dvbdevice.c                             |  24 ++++--
 dvbdevice.h                             |   3 +-
 dvbplayer.c                             |   4 +-
 eit.c                                   |   6 +-
 epg.c                                   |   4 +-
 libsi/descriptor.c                      |  99 +++++++++++++++++++++-
 libsi/descriptor.h                      |  59 ++++++++++++-
 libsi/headers.h                         |  71 +++++++++++++++-
 libsi/si.c                              |  11 ++-
 libsi/si.h                              |  18 +++-
 lirc.c                                  |  19 ++---
 menu.c                                  |  55 ++++++++----
 menu.h                                  |  15 +++-
 menuitems.c                             |   6 +-
 newplugin                               |   4 +-
 pat.c                                   |  48 ++++++++++-
 pat.h                                   |  16 +++-
 player.h                                |   4 +-
 po/ar.po                                |  12 +--
 po/ca_ES.po                             |  12 +--
 po/cs_CZ.po                             |  12 +--
 po/da_DK.po                             |  12 +--
 po/de_DE.po                             |  12 +--
 po/el_GR.po                             |  12 +--
 po/es_ES.po                             |  12 +--
 po/et_EE.po                             |  12 +--
 po/fi_FI.po                             |  54 ++++++------
 po/fr_FR.po                             |  12 +--
 po/hr_HR.po                             |  12 +--
 po/hu_HU.po                             |  12 +--
 po/it_IT.po                             |  52 ++++++------
 po/lt_LT.po                             |  12 +--
 po/mk_MK.po                             |  12 +--
 po/nl_NL.po                             |  12 +--
 po/nn_NO.po                             |  12 +--
 po/pl_PL.po                             |  12 +--
 po/pt_PT.po                             |  12 +--
 po/ro_RO.po                             |  12 +--
 po/ru_RU.po                             |  12 +--
 po/sk_SK.po                             |  12 +--
 po/sl_SI.po                             |  12 +--
 po/sr_RS.po                             |  12 +--
 po/sv_SE.po                             |  12 +--
 po/tr_TR.po                             |  12 +--
 po/uk_UA.po                             |  16 ++--
 po/zh_CN.po                             |  12 +--
 positioner.c                            |   8 +-
 positioner.h                            |   8 +-
 receiver.c                              |  24 +++++-
 receiver.h                              |   8 +-
 recorder.c                              |   3 +-
 recording.c                             |  78 ++++++++++++-----
 recording.h                             |   9 +-
 remote.c                                |  21 ++++-
 remote.h                                |   3 +-
 sdt.c                                   |   6 +-
 skinlcars.c                             |  16 +++-
 skins.h                                 |   3 +-
 skinsttng.c                             |   4 +-
 sources.c                               |   4 +-
 svdrp.c                                 |  96 ++++++++++-----------
 svdrp.h                                 |   4 +-
 thread.c                                |   3 +-
 timers.c                                |   6 +-
 vdr.1                                   |   4 +-
 vdr.c                                   |   8 +-
 119 files changed, 1242 insertions(+), 486 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3c31e1cc6..4e71fcce3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -704,6 +704,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for reporting a problem with resuming replay of PES recordings
  for suggesting to make all bonded devices (except for the master) turn off their LNB
  power completely to avoid problems when receiving vertically polarized transponders
+ for suggesting to eliminate MAXDVBDEVICES
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1173,6 +1174,10 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  and add support for DVB-S2 "Input Stream Identifier" (ISI)
  for helping to debug and understand subtitle page refreshes
  for a patch that was used to implement the SVDRP command RENR
+ for fixing some compiler warnings with gcc-4.6.3
+ for suggesting to prompt the user for confirmation before overwriting an already
+ existing edited version of a recording
+ for adding code for parsing LCN and AVC descriptors to libsi
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2029,6 +2034,11 @@ Ville Skytt
  for updating the help and man page entry about the location of the epg.data file
  for reporting a possible crash when shutting down VDR while subtitles are being
  displayed
+ for fixing some spellings in positioner.h and Doxyfile
+ for changing '%a' to the POSIX compliant '%m' in all scanf() calls
+ for reporting a possible NULL pointer dereference in cCiSession::SendData()
+ for reporting a superfluous assignment in cPipe::Open()
+ for avoiding unnecessary pkg-config warnings in plugin Makefiles
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2142,6 +2152,10 @@ Marko M
  pressed in string input fields
  for fixing missing ',' in the Italian and Polish OSD texts
  for pointing out that "Menu button closes" should actually be "Menu key closes"
+ for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel
+ for suggesting to simplify some conditional expressions in skinlcars.c and skinsttng.c
+ for reporting some uninitialized item area coordinates in cSkinLCARSDisplayMenu
+ for reporting a problem with the video directory not being set correctly with --edit
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
@@ -2855,6 +2869,14 @@ Lars Hanisch <dvb@flensrocker.de>
  for reporting an invalid line in channels.conf.terr
  for fixing handling '/' and '~' in recording file names in case DirectoryEncoding is
  used
+ for making the LIRC remote control connect to the socket even if it doesn't yet exist
+ when VDR is started
+ for reporting a possible crash if the recordings list is updated externally while the
+ Recordings menu is open
+ for reporting a missing closing ')' in the help entry of the --vfat option
+ for making the Recordings menu able to be called with a cRecordingFilter, which allows
+ the caller to have it display only a certain subset of the recordings
+ for adding handling UTF-8 'umlaut' characters to cKbdRemote
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -2913,6 +2935,7 @@ Henning Heinold <heinold@inf.fu-berlin.de>
 
 Dominik Strasser <dominik@die-strassers.de>
  for making a cRemote be removed from the Remotes list in case its initialization failed
+ for reporting a possible access to uninitialized data in cEIT::cEIT()
 
 Joerg Bornkessel <hd_brummy@gentoo.org>
  for adding LDFLAGS to the linker calls in the Makefiles
@@ -3058,8 +3081,10 @@ Christian Richter <cr@crichter.net>
  for extending the interface to the script that gets called for recordings, so that in
  the "edited" case it also provides the name of the original recording
 
-Christian Kaiser <christian.kaiser@teleservice.com>
+Christian Kaiser <chr-kaiser@arcor.de>
  for adding DeleteEvent() to the EPG handler interface
+ for making the script given to VDR with the '-r' option also be called after the
+ recording process has actually started
 
 Dirk Heiser <dirk-vdr@gmx.de>
  for adding SetComponents() to the EPG handler interface
@@ -3170,6 +3195,8 @@ Stefan Braun <louis.braun@gmx.de>
  for reporting an endless loop in cTextWrapper::Set() in case the given Width is smaller
  than one character
  for reporting an endless loop in the DrawEllipse() functions for very small ellipses
+ for suggesting to add the menu category mcRecordingEdit for marking menus that edit
+ recording properties
 
 Jochen Dolze <vdr@dolze.de>
  for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order
@@ -3202,3 +3229,10 @@ Harald Koenig <koenig@tat.physik.uni-tuebingen.de>
 
 Guido Cordaro <guido.cordaro@tiscali.it>
  for adding maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P
+
+Thomas Reufer <thomas@reufer.ch>
+ for making it clear that the Data parameter in cDevice::StillPicture() may point to a
+ series of packets, not just a single one
+ for suggesting to add an additional parameter named Forward to cDevice::TrickSpeed()
+ for suggesting to add a note to ePlayMode in device.h that VDR itself always uses
+ pmAudioVideo when replaying a recording
diff --git a/Doxyfile b/Doxyfile
index aa4cdb497..98891d713 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1658,7 +1658,7 @@ UML_LOOK               = NO
 # the class node. If there are many fields or methods and many nodes the
 # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
 # threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
+# manageable. Set this to 0 for no limit. Note that the threshold may be
 # exceeded by 50% before the limit is enforced.
 
 UML_LIMIT_NUM_FIELDS   = 10
diff --git a/HISTORY b/HISTORY
index 2c03dd468..787549462 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8009,3 +8009,109 @@ Video Disk Recorder Revision History
   is unexpected at this point (reported by Helmut Auer). You can still navigate to
   the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
   menu.
+
+2013-10-23: Version 2.0.4
+
+- Unified the internal sequence of actions when pressing the Blue and the Back key,
+  respectively, during replay (reported by Thomas Maass).
+- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
+  is set to "do not pause live video" (suggested by Ulf Kiener).
+- Fixed writing group separators to channels.conf that contain a comma (reported by
+  Eike Edener).
+- Now also checking the source (in addition to the transponder) when setting the
+  system time from the TDT, which avoids problems in case devices are tuned to the
+  same transponder on different sources, and these broadcast different time data
+  (reported by Torsten Lang).
+- Changed cRecorder::Action() to use cTimeMs instead of time() to avoid problems with
+  unjustified "video data stream broken" errors in case the system time is changed
+  while a recording is active (reported by Torsten Lang).
+- Fixed an inconsistent behavior between opening the Recordings menu manually via the
+  main menu and by pressing the Recordings key. In the latter case it automatically
+  opened all sub folders to position the cursor to the last replayed recording, which
+  is unexpected at this point (reported by Helmut Auer). You can still navigate to
+  the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
+  menu.
+
+2014-01-05: Version 2.1.3
+
+- Changed the return value of cPositioner::HorizonLongitude() to 0 in case the
+  latitude of the antenna location is beyond +/-81 degrees.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed some compiler warnings with gcc-4.6.3 (thanks to Rolf Ahrenberg).
+- Changed the name of the SVDRP command RENR to MOVR (suggested by Rolf Ahrenberg).
+- When cutting a recording it is now checked whether there is already an edited
+  version of this recording (with the same name, but starting with '%'), and the
+  user is prompted for confirmation to overwrite it (suggested by Rolf Ahrenberg).
+- Revoked "Added maximum signal strength value for TechniSat SkyStar 2 DVB-S rev 2.3P"
+  because it broke things for the "TechniSat AirStar 2" DVB-T card.
+- The LIRC remote control now connects to the socket even if it doesn't yet exist when
+  VDR is started (thanks to Lars Hanisch).
+- Changed the absolute latitude limit for visible satellites to 81.2 degrees.
+- Added code for parsing LCN and AVC descriptors to libsi (thanks to Rolf Ahrenberg).
+- In the "Select folder" menu pressing Ok now selects the folder, even if this is a
+  folder that contains sub folders (marked with "..."). To open such a folder you
+  can press the Red key.
+- Fixed a possible access to uninitialized data in cEIT::cEIT() (reported by Dominik
+  Strasser).
+- The new menu category mcRecordingEdit is now used to mark menus that edit recording
+  properties (suggested by Stefan Braun).
+- Changes in the teletext PID no longer cause retuning (and thus interrupting a
+  recording).
+- Removed '_' from the FileNameChars and CharMap translations in uk_UA.po.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed a missing initialization in the c'tor of cSkinLCARSDisplayChannel (thanks to
+  Marko M�kel�).
+- Simplified some conditional expressions in skinlcars.c and skinsttng.c (suggested
+  by Marko M�kel�).
+- Fixed uninitialized item area coordinates in cSkinLCARSDisplayMenu (reported by
+  Marko M�kel�).
+- Fixed a possible crash if the recordings list is updated externally while the
+  Recordings menu is open (reported by Lars Hanisch).
+- Added a missing closing ')' in the help and man page entry of the --vfat option
+  (reported by Lars Hanisch).
+- Fixed setting the name of the video directory to avoid a crash when using --genindex,
+  and also to use the correct directory with --edit (the latter reported by Marko
+  M�kel�).
+- The Recordings menu can now be called with a cRecordingFilter, which allows the
+  caller to have it display only a certain subset of the recordings (thanks to Lars
+  Hanisch).
+- Added handling UTF-8 'umlaut' characters to cKbdRemote (thanks to Lars Hanisch).
+- Made it clear that the Data parameter in cDevice::StillPicture() may point to a
+  series of packets, not just a single one (thanks to Thomas Reufer).
+- cDevice::TrickSpeed() now has an additional parameter named Forward, which indicates
+  the direction in which replay is being done (suggested by Thomas Reufer). This
+  information may be necessary for some output devices in order to properly implement
+  trick modes. Authors of plugins that implement output devices will need to add this
+  parameter to their derived cDevice class, regardless of whether they will make use
+  of it or not.
+- Added a note to ePlayMode in device.h that VDR itself always uses pmAudioVideo when
+  replaying a recording (suggested by Thomas Reufer).
+- Fixed some spellings in positioner.h and Doxyfile (thanks to Ville Skytt�).
+- Changed '%a' to the POSIX compliant '%m' in all scanf() calls (thanks to Ville
+  Skytt�).
+- The new function cCamSlot::Decrypt() can be used by derived classes to implement a
+  CAM slot that can be freely assigned to any device, without being directly inserted
+  into the full TS data stream in hardware. A derived class that implements Decrypt()
+  will also need to set the new parameter ReceiveCaPids in the call to the cCamSlot
+  base class constructor to true, in order to receive the CA pid TS packets that
+  contain data necessary for decrypting.
+- Many member functions of cCamSlot have been made virtual to allow for easier
+  implementation of derived classes.
+- cTSBuffer now provides the number of available bytes in its Get() function.
+- cDvbDevice::GetTSPacket() now calls CamSlot()->Decrypt() in order to allow CAM slots
+  that can be freely assigned to any device access to the TS data stream.
+- Added a check to avoid a possible NULL pointer dereference in cCiSession::SendData()
+  (reported by Ville Skytt�).
+- Deleted a superfluous assignment in cPipe::Open() (reported by Ville Skytt�).
+- The script given to VDR with the '-r' option is now also called after the recording
+  process has actually started (thanks to Christian Kaiser).
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles (thanks to Ville Skytt�).
+  Plugin authors may want to apply the following change to their Makefile:
+  -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+  +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+- Eliminated MAXDVBDEVICES (suggested by Oliver Endriss).
+- Channels that are no longer contained in the current SDT of a transponder are now
+  marked with the keyword OBSOLETE in their name and provider fields. That way you can
+  identify obsolete channels when you switch to them, and you can get the complete
+  overview of all obsolete channels by sorting the Channels list by provider (by
+  pressing the 0 key twice). Automatic deletion of obsolete channels may follow later.
diff --git a/INSTALL b/INSTALL
index 384ba4460..2dff5e342 100644
--- a/INSTALL
+++ b/INSTALL
@@ -254,6 +254,7 @@ The program will be called with two or three (in case of "edited") string
 parameters. The first parameter is one of
 
   before      if this is *before* a recording starts
+  started     if this is after a recording has *started*
   after       if this is *after* a recording has finished
   edited      if this is after a recording has been *edited*
   deleted     if this is after a recording has been *deleted*
@@ -279,6 +280,9 @@ case "$1" in
      before)
             echo "Before recording $2"
             ;;
+     started)
+            echo "Started recording $2"
+            ;;
      after)
             echo "After recording $2"
             ;;
diff --git a/MANUAL b/MANUAL
index 5ba444486..9f2fef1d0 100644
--- a/MANUAL
+++ b/MANUAL
@@ -500,9 +500,10 @@ Version 2.0
   folder name in the list). The "Yellow" key deletes the current folder (note
   that this will merely delete the folder definition stored in 'folders.conf'
   and has no effect on existing timers or recordings). The "Blue" key can be
-  used to edit an existing folder definition. The "Red" key selects the current
-  folder, or enters a sub folder. Once a folder has been selected, the entire
-  path of the timer's file name will be replaced with the selected folder.
+  used to edit an existing folder definition. The "Red" key opens a folder that
+  contains sub folders, while pressing Ok selects the current folder. Once a
+  folder has been selected, the entire path of the timer's file name will be
+  replaced with the selected folder.
 
   In the "Recordings" menu the folders of existing recordings can be renamed or
   moved by pressing the "Blue" key ("Edit") while the cursor is positioned on
diff --git a/PLUGINS.html b/PLUGINS.html
index 71d840eaf..b912301f8 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1877,7 +1877,7 @@ <h1>Table Of Contents</h1>
 virtual int64_t GetSTC(void);
 virtual bool IsPlayingVideo(void) const;
 virtual bool HasIBPTrickSpeed(void);
-virtual void TrickSpeed(int Speed);
+virtual void TrickSpeed(int Speed<modified>, bool Forward</modified>);
 virtual void Clear(void);
 virtual void Play(void);
 virtual void Freeze(void);
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 9db7fd790..80fbea87d 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -84,3 +84,8 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-08-26: Version 2.1.2
 
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+
+2014-01-01: Version 2.1.3
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+- cDevice::TrickSpeed() now has an additional parameter named Forward.
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 0bfd13601..a994e2e86 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -15,7 +15,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index cff42d089..5e9df2e69 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.2";
+static const char *VERSION        = "2.1.3";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 857861e6a..7e68cd535 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -606,7 +606,7 @@ void cDvbHdFfDevice::ScaleVideo(const cRect &Rect)
     }
 }
 
-void cDvbHdFfDevice::TrickSpeed(int Speed)
+void cDvbHdFfDevice::TrickSpeed(int Speed, bool Forward)
 {
   freezed = false;
   mHdffCmdIf->CmdAvEnableSync(0, false);
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 330f9d390..58362fc5a 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -99,7 +99,7 @@ class cDvbHdFfDevice : public cDvbDevice {
   virtual int64_t GetSTC(void);
   virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter);
   virtual void ScaleVideo(const cRect &Rect = cRect::Null);
-  virtual void TrickSpeed(int Speed);
+  virtual void TrickSpeed(int Speed, bool Forward);
   virtual void Clear(void);
   virtual void Play(void);
   virtual void Freeze(void);
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index cb6753ab0..1dcd561be 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -50,3 +50,8 @@ VDR Plugin 'dvbsddevice' Revision History
 
 - Fixed handling the -o option (short form of --outputonly; problem reported by
   Mario Edelmann).
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+- cDevice::TrickSpeed() now has an additional parameter named Forward.
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 5a4635ebc..a86477418 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 3f57f23b9..39b140d75 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 3.1 2013/08/22 08:20:18 kls Exp $
+ * $Id: dvbsddevice.c 3.2 2014/01/01 13:43:28 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "2.0.1";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index 02e63068e..a735e9206 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 3.0 2013/02/17 13:16:18 kls Exp $
+ * $Id: dvbsdffdevice.c 3.1 2014/01/01 13:39:24 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -593,7 +593,7 @@ int64_t cDvbSdFfDevice::GetSTC(void)
   return -1;
 }
 
-void cDvbSdFfDevice::TrickSpeed(int Speed)
+void cDvbSdFfDevice::TrickSpeed(int Speed, bool Forward)
 {
   if (fd_video >= 0)
      CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index 10289e9a0..fe66d32a0 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 3.0 2013/02/17 13:16:29 kls Exp $
+ * $Id: dvbsdffdevice.h 3.1 2014/01/01 13:39:30 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
@@ -94,7 +94,7 @@ class cDvbSdFfDevice : public cDvbDevice {
   virtual int PlayTsAudio(const uchar *Data, int Length);
 public:
   virtual int64_t GetSTC(void);
-  virtual void TrickSpeed(int Speed);
+  virtual void TrickSpeed(int Speed, bool Forward);
   virtual void Clear(void);
   virtual void Play(void);
   virtual void Freeze(void);
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index da97932a7..9f1eb7b6f 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -16,3 +16,7 @@ VDR Plugin 'epgtableid0' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 31b7cea46..e3c0c7b39 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index 2715ce73b..db668d116 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: epgtableid0.c 3.1 2014/01/05 10:56:10 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 250f36a54..f9d05a83a 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -86,3 +86,7 @@ VDR Plugin 'hello' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index a31268184..455721fc8 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index b0b4ff77d..ecc9170fa 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: hello.c 3.1 2014/01/05 10:56:14 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index b1411de1a..9497f4079 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -59,3 +59,7 @@ VDR Plugin 'osddemo' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 65b2a48cb..30e3de47a 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 8435a86c3..25fbb416d 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: osddemo.c 3.1 2014/01/05 10:56:18 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 4b1db67e8..20c081cb1 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -91,3 +91,7 @@ VDR Plugin 'pictures' Revision History
 2013-07-01:
 
 - Added option -x to pic2mpg.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 8810368da..912e3d975 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 77c2eb070..de50f1eb6 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: pictures.c 3.1 2014/01/05 10:56:20 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "2.0.0";
+static const char *VERSION       = "2.1.1";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index b9043bbf8..1e330eb62 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -20,3 +20,7 @@ VDR Plugin 'rcu' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index f56236a37..25bde4af3 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index d7a83e752..5fb210c06 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: rcu.c 3.1 2014/01/05 10:56:22 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index b1c748042..9565b7d86 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -21,3 +21,7 @@ VDR Plugin 'servicedemo' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index ec4adcdb4..128b9c759 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 5f0c83c73..47581617e 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: svccli.c 3.1 2014/01/05 10:56:24 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 12a12725b..c55f6bd83 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: svcsvr.c 3.1 2014/01/05 10:56:26 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 63595076f..a2cdb60b8 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -118,3 +118,7 @@ VDR Plugin 'skincurses' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index d2a4e47e1..812fe973f 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 4b59df654..db49ea480 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: skincurses.c 3.1 2014/01/05 10:56:27 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index bbf2c69ba..7a8084227 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -60,3 +60,7 @@ VDR Plugin 'status' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index c719e29a2..40a0351e3 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 5c81faae7..cbf0c6e4b 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: status.c 3.1 2014/01/05 10:56:29 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index c6f039592..620747904 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -25,3 +25,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2013-03-31: Version 2.0.0
 
 - Official release.
+
+2014-01-01: Version 2.1.1
+
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index cdae2d16b..9a8235a4a 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.0 2013/01/12 13:45:01 kls Exp $
+# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
 LIBDIR = $(call PKGCFG,libdir)
 PLGCFG = $(call PKGCFG,plgcfg)
 #
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index ac9ae4ca1..34f513e6c 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 3.0 2013/03/31 09:30:18 kls Exp $
+ * $Id: svdrpdemo.c 3.1 2014/01/05 10:56:31 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.0.0";
+static const char *VERSION        = "2.1.1";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/channels.c b/channels.c
index 7cb7e8835..11367c7b6 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 3.1 2013/10/11 11:03:26 kls Exp $
+ * $Id: channels.c 3.4 2014/01/04 15:01:52 kls Exp $
  */
 
 #include "channels.h"
@@ -29,7 +29,7 @@ tChannelID tChannelID::FromString(const char *s)
   int tid;
   int sid;
   int rid = 0;
-  int fields = sscanf(s, "%a[^-]-%d-%d-%d-%d", &sourcebuf, &nid, &tid, &sid, &rid);
+  int fields = sscanf(s, "%m[^-]-%d-%d-%d-%d", &sourcebuf, &nid, &tid, &sid, &rid);
   if (fields == 4 || fields == 5) {
      int source = cSource::FromString(sourcebuf);
      free(sourcebuf);
@@ -64,6 +64,7 @@ cChannel::cChannel(void)
   memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__);
   parameters = "";
   modification = CHANNELMOD_NONE;
+  seen         = 0;
   schedule     = NULL;
   linkChannels = NULL;
   refChannel   = NULL;
@@ -330,8 +331,10 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
 void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
 {
   int mod = CHANNELMOD_NONE;
-  if (vpid != Vpid || ppid != Ppid || vtype != Vtype || tpid != Tpid)
+  if (vpid != Vpid || ppid != Ppid || vtype != Vtype)
      mod |= CHANNELMOD_PIDS;
+  if (tpid != Tpid)
+     mod |= CHANNELMOD_AUX;
   int m = IntArraysDiffer(apids, Apids, alangs, ALangs) | IntArraysDiffer(atypes, Atypes) | IntArraysDiffer(dpids, Dpids, dlangs, DLangs) | IntArraysDiffer(dtypes, Dtypes) | IntArraysDiffer(spids, Spids, slangs, SLangs);
   if (m & STRDIFF)
      mod |= CHANNELMOD_LANGS;
@@ -388,7 +391,8 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, c
      spids[MAXSPIDS] = 0;
      tpid = Tpid;
      modification |= mod;
-     Channels.SetModified();
+     if (Number())
+        Channels.SetModified();
      }
 }
 
@@ -408,6 +412,11 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
      }
 }
 
+void cChannel::SetSeen(void)
+{
+  seen = time(NULL);
+}
+
 void cChannel::SetCaIds(const int *CaIds)
 {
   if (caids[0] && caids[0] <= CA_USER_MAX)
@@ -586,7 +595,7 @@ bool cChannel::Parse(const char *s)
      char *apidbuf = NULL;
      char *tpidbuf = NULL;
      char *caidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%a[^:]:%a[^:]:%a[^:]:%a[^:]:%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpidbuf, &caidbuf, &sid, &nid, &tid, &rid);
+     int fields = sscanf(s, "%m[^:]:%d :%m[^:]:%m[^:] :%d :%m[^:]:%m[^:]:%m[^:]:%m[^:]:%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpidbuf, &apidbuf, &tpidbuf, &caidbuf, &sid, &nid, &tid, &rid);
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
@@ -1016,6 +1025,7 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
      NewChannel->CopyTransponderData(Transponder);
      NewChannel->SetId(Nid, Tid, Sid, Rid);
      NewChannel->SetName(Name, ShortName, Provider);
+     NewChannel->SetSeen();
      Add(NewChannel);
      ReNumber();
      return NewChannel;
@@ -1023,6 +1033,19 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
   return NULL;
 }
 
+#define CHANNELMARKOBSOLETE "OBSOLETE"
+#define CHANNELTIMEOBSOLETE 3600 // seconds to wait before declaring a channel obsolete (in case it has actually been seen before)
+
+void cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
+{
+  for (cChannel *channel = First(); channel; channel = Next(channel)) {
+      if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid) {
+         if (!endswith(channel->Name(), CHANNELMARKOBSOLETE))
+            channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARKOBSOLETE), channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, channel->Provider()));
+         }
+      }
+}
+
 cString ChannelString(const cChannel *Channel, int Number)
 {
   char buffer[256];
diff --git a/channels.h b/channels.h
index 3f9867b87..7ca1e3e5f 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 3.0 2012/06/17 11:21:33 kls Exp $
+ * $Id: channels.h 3.2 2014/01/04 15:01:21 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -22,6 +22,7 @@
 #define CHANNELMOD_NAME     0x01
 #define CHANNELMOD_PIDS     0x02
 #define CHANNELMOD_ID       0x04
+#define CHANNELMOD_AUX      0x08
 #define CHANNELMOD_CA       0x10
 #define CHANNELMOD_TRANSP   0x20
 #define CHANNELMOD_LANGS    0x40
@@ -127,6 +128,7 @@ class cChannel : public cListObject {
   mutable cString shortNameSource;
   cString parameters;
   int modification;
+  time_t seen; // When this channel was last seen in the SDT of its transponder
   mutable const cSchedule *schedule;
   cLinkChannels *linkChannels;
   cChannel *refChannel;
@@ -186,6 +188,7 @@ class cChannel : public cListObject {
   tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
   bool HasTimer(void) const;
   int Modification(int Mask = CHANNELMOD_ALL);
+  time_t Seen(void) { return seen; }
   void CopyTransponderData(const cChannel *Channel);
   bool SetTransponderData(int Source, int Frequency, int Srate, const char *Parameters, bool Quiet = false);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
@@ -197,6 +200,7 @@ class cChannel : public cListObject {
   void SetLinkChannels(cLinkChannels *LinkChannels);
   void SetRefChannel(cChannel *RefChannel);
   void SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds);
+  void SetSeen(void);
   };
 
 class cChannels : public cRwLock, public cConfig<cChannel> {
@@ -236,6 +240,7 @@ class cChannels : public cRwLock, public cConfig<cChannel> {
       ///< modification has been made, and 2 if the user has made a modification.
       ///< Calling this function resets the 'modified' flag to 0.
   cChannel *NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid, int Rid = 0);
+  void MarkObsoleteChannels(int Source, int Nid, int Tid);
   };
 
 extern cChannels Channels;
diff --git a/ci.c b/ci.c
index ba0c3443d..e2881fedb 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.0 2013/02/17 13:17:28 kls Exp $
+ * $Id: ci.c 3.4 2014/01/02 10:31:12 kls Exp $
  */
 
 #include "ci.h"
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include "device.h"
 #include "pat.h"
+#include "receiver.h"
 #include "tools.h"
 
 // Set these to 'true' for debug output:
@@ -102,6 +103,16 @@ static char *GetString(int &Length, const uint8_t **Data)
   return NULL;
 }
 
+// --- cCaPidReceiver --------------------------------------------------------
+
+// A dummy receiver, just used to make the device receive the CA pids.
+
+class cCaPidReceiver : public cReceiver {
+public:
+  virtual ~cCaPidReceiver() { Detach(); }
+  virtual void Receive(uchar *Data, int Length) {}
+  };
+
 // --- cTPDU -----------------------------------------------------------------
 
 #define MAX_TPDU_SIZE  2048
@@ -403,7 +414,8 @@ void cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
   *p++ =  Tag        & 0xFF;
   p = SetLength(p, Length);
   if (p - buffer + Length < int(sizeof(buffer))) {
-     memcpy(p, Data, Length);
+     if (Data)
+        memcpy(p, Data, Length);
      p += Length;
      tc->SendData(p - buffer, buffer);
      }
@@ -569,7 +581,7 @@ bool cCiApplicationInformation::EnterMenu(void)
 #define CPCI_QUERY            0x03
 #define CPCI_NOT_SELECTED     0x04
 
-class cCiCaPmt : public cListObject {
+class cCiCaPmt {
   friend class cCiConditionalAccessSupport;
 private:
   uint8_t cmdId;
@@ -1552,9 +1564,10 @@ cCamSlots CamSlots;
 #define MODULE_CHECK_INTERVAL 500 // ms
 #define MODULE_RESET_TIMEOUT    2 // s
 
-cCamSlot::cCamSlot(cCiAdapter *CiAdapter)
+cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
 {
   ciAdapter = CiAdapter;
+  caPidReceiver = ReceiveCaPids ? new cCaPidReceiver : NULL;
   slotIndex = -1;
   lastModuleStatus = msReset; // avoids initial reset log message
   resetTime = 0;
@@ -1571,6 +1584,7 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter)
 
 cCamSlot::~cCamSlot()
 {
+  delete caPidReceiver;
   CamSlots.Del(this, false);
   DeleteAllConnections();
 }
@@ -1801,6 +1815,10 @@ void cCamSlot::SendCaPmt(uint8_t CmdId)
      const int *CaSystemIds = cas->GetCaSystemIds();
      if (CaSystemIds && *CaSystemIds) {
         if (caProgramList.Count()) {
+           if (caPidReceiver && caPidReceiver->NumPids()) {
+              if (cDevice *d = Device())
+                 d->Detach(caPidReceiver);
+              }
            for (int Loop = 1; Loop <= 2; Loop++) {
                for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
                    if (p->modified || resendPmt) {
@@ -1813,6 +1831,15 @@ void cCamSlot::SendCaPmt(uint8_t CmdId)
                              }
                           }
                       if ((Loop == 1) != Active) { // first remove, then add
+                         if (caPidReceiver) {
+                            int CaPids[MAXRECEIVEPIDS + 1];
+                            if (GetCaPids(source, transponder, p->programNumber, CaSystemIds, MAXRECEIVEPIDS + 1, CaPids) > 0) {
+                               if (Loop == 1)
+                                  caPidReceiver->DelPids(CaPids);
+                               else
+                                  caPidReceiver->AddPids(CaPids);
+                               }
+                            }
                          if (cas->RepliesToQuery())
                             CaPmt.SetListManagement(Active ? CPLM_ADD : CPLM_UPDATE);
                          if (Active || cas->RepliesToQuery())
@@ -1822,6 +1849,10 @@ void cCamSlot::SendCaPmt(uint8_t CmdId)
                       }
                    }
                }
+           if (caPidReceiver && caPidReceiver->NumPids()) {
+              if (cDevice *d = Device())
+                 d->AttachReceiver(caPidReceiver);
+              }
            resendPmt = false;
            }
         else {
@@ -1983,6 +2014,12 @@ bool cCamSlot::IsDecrypting(void)
   return false;
 }
 
+uchar *cCamSlot::Decrypt(uchar *Data, int &Count)
+{
+  Count = TS_SIZE;
+  return Data;
+}
+
 // --- cChannelCamRelation ---------------------------------------------------
 
 #define CAM_CHECKED_TIMEOUT  15 // seconds before a CAM that has been checked for a particular channel will be checked again
diff --git a/ci.h b/ci.h
index 4fe44c7a9..112371219 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 3.0 2012/02/29 10:24:27 kls Exp $
+ * $Id: ci.h 3.3 2014/01/02 10:14:39 kls Exp $
  */
 
 #ifndef __CI_H
@@ -121,6 +121,7 @@ class cTPDU;
 class cCiTransportConnection;
 class cCiSession;
 class cCiCaProgramData;
+class cReceiver;
 
 class cCamSlot : public cListObject {
   friend class cCiAdapter;
@@ -129,6 +130,7 @@ class cCamSlot : public cListObject {
   cMutex mutex;
   cCondVar processed;
   cCiAdapter *ciAdapter;
+  cReceiver *caPidReceiver;
   int slotIndex;
   int slotNumber;
   cCiTransportConnection *tc[MAX_CONNECTIONS_PER_CAM_SLOT + 1];  // connection numbering starts with 1
@@ -147,10 +149,13 @@ class cCamSlot : public cListObject {
   void Write(cTPDU *TPDU);
   cCiSession *GetSessionByResourceId(uint32_t ResourceId);
 public:
-  cCamSlot(cCiAdapter *CiAdapter);
+  cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids = false);
        ///< Creates a new CAM slot for the given CiAdapter.
        ///< The CiAdapter will take care of deleting the CAM slot,
        ///< so the caller must not delete it!
+       ///< If ReceiveCaPids is true, the CAM slot will take care that the CA pids
+       ///< of the selected programmes will be included in the TS data stream that
+       ///< is presented to the Decrypt() function.
   virtual ~cCamSlot();
   bool Assign(cDevice *Device, bool Query = false);
        ///< Assigns this CAM slot to the given Device, if this is possible.
@@ -169,50 +174,50 @@ class cCamSlot : public cListObject {
   int SlotNumber(void) { return slotNumber; }
        ///< Returns the number of this CAM slot within the whole system.
        ///< The first slot has the number 1.
-  bool Reset(void);
+  virtual bool Reset(void);
        ///< Resets the CAM in this slot.
        ///< Returns true if the operation was successful.
-  eModuleStatus ModuleStatus(void);
+  virtual eModuleStatus ModuleStatus(void);
        ///< Returns the status of the CAM in this slot.
-  const char *GetCamName(void);
+  virtual const char *GetCamName(void);
        ///< Returns the name of the CAM in this slot, or NULL if there is
        ///< no ready CAM in this slot.
-  bool Ready(void);
+  virtual bool Ready(void);
        ///< Returns 'true' if the CAM in this slot is ready to decrypt.
-  bool HasMMI(void);
+  virtual bool HasMMI(void);
        ///< Returns 'true' if the CAM in this slot has an active MMI.
-  bool HasUserIO(void);
+  virtual bool HasUserIO(void);
        ///< Returns true if there is a pending user interaction, which shall
        ///< be retrieved via GetMenu() or GetEnquiry().
-  bool EnterMenu(void);
+  virtual bool EnterMenu(void);
        ///< Requests the CAM in this slot to start its menu.
-  cCiMenu *GetMenu(void);
+  virtual cCiMenu *GetMenu(void);
        ///< Gets a pending menu, or NULL if there is no menu.
-  cCiEnquiry *GetEnquiry(void);
+  virtual cCiEnquiry *GetEnquiry(void);
        ///< Gets a pending enquiry, or NULL if there is no enquiry.
   int Priority(void);
        ///< Returns the priority if the device this slot is currently assigned
        ///< to, or IDLEPRIORITY if it is not assigned to any device.
-  bool ProvidesCa(const int *CaSystemIds);
+  virtual bool ProvidesCa(const int *CaSystemIds);
        ///< Returns true if the CAM in this slot provides one of the given
        ///< CaSystemIds. This doesn't necessarily mean that it will be
        ///< possible to actually decrypt such a programme, since CAMs
        ///< usually advertise several CA system ids, while the actual
        ///< decryption is controlled by the smart card inserted into
        ///< the CAM.
-  void AddPid(int ProgramNumber, int Pid, int StreamType);
+  virtual void AddPid(int ProgramNumber, int Pid, int StreamType);
        ///< Adds the given PID information to the list of PIDs. A later call
        ///< to SetPid() will (de)activate one of these entries.
-  void SetPid(int Pid, bool Active);
+  virtual void SetPid(int Pid, bool Active);
        ///< Sets the given Pid (which has previously been added through a
        ///< call to AddPid()) to Active. A later call to StartDecrypting() will
        ///< send the full list of currently active CA_PMT entries to the CAM.
-  void AddChannel(const cChannel *Channel);
+  virtual void AddChannel(const cChannel *Channel);
        ///< Adds all PIDs if the given Channel to the current list of PIDs.
        ///< If the source or transponder of the channel are different than
        ///< what was given in a previous call to AddChannel(), any previously
        ///< added PIDs will be cleared.
-  bool CanDecrypt(const cChannel *Channel);
+  virtual bool CanDecrypt(const cChannel *Channel);
        ///< Returns true if there is a CAM in this slot that is able to decrypt
        ///< the given Channel (or at least claims to be able to do so).
        ///< Since the QUERY/REPLY mechanism for CAMs is pretty unreliable (some
@@ -223,13 +228,43 @@ class cCamSlot : public cListObject {
        ///< to the initial QUERY will perform this check at all. CAMs that never
        ///< replied to the initial QUERY are assumed not to be able to handle
        ///< more than one channel at a time.
-  void StartDecrypting(void);
+  virtual void StartDecrypting(void);
        ///< Triggers sending all currently active CA_PMT entries to the CAM,
        ///< so that it will start decrypting.
-  void StopDecrypting(void);
+  virtual void StopDecrypting(void);
        ///< Clears the list of CA_PMT entries and tells the CAM to stop decrypting.
-  bool IsDecrypting(void);
+  virtual bool IsDecrypting(void);
        ///< Returns true if the CAM in this slot is currently used for decrypting.
+  virtual uchar *Decrypt(uchar *Data, int &Count);
+       ///< If this is a CAM slot that can be freely assigned to any device,
+       ///< but will not be directly inserted into the full TS data stream
+       ///< in hardware, it can implement this function to be given access
+       ///< to the data in the device's TS buffer. Data points to a buffer
+       ///< of Count bytes of TS data. The first byte in Data is guaranteed
+       ///< to be a TS_SYNC_BYTE.
+       ///< There are three possible ways a CAM can handle decryption:
+       ///< 1. If the full TS data is physically routed through the CAM in hardware,
+       ///< there is no need to reimplement this function.
+       ///< The default implementation simply sets Count to TS_SIZE and returns Data.
+       ///< 2. If the CAM works directly on Data and decrypts the TS "in place" it
+       ///< shall decrypt at least the very first TS packet in Data, set Count to
+       ///< TS_SIZE and return Data. It may decrypt as many TS packets in Data as it
+       ///< wants, but it must decrypt at least the very first TS packet. Only this
+       ///< very first TS packet will be further processed after the call to this
+       ///< function. The next call will be done with Data pointing to the TS packet
+       ///< immediately following the previous one.
+       ///< 3. If the CAM needs to copy the data into a buffer of its own, and/or send
+       ///< the data to some file handle for processing and later retrieval, it shall
+       ///< set Count to the number of bytes it has read from Data and return a pointer
+       ///< to the next available decrypted TS packet (which will *not* be in the
+       ///< memory area pointed to by Data, but rather in some buffer that is under
+       ///< the CAM's control). If no decrypted TS packet is currently available, NULL
+       ///< shall be returned. If no data from Data can currently be processed, Count
+       ///< shall be set to 0 and the same Data pointer will be offered in the next
+       ///< call to Decrypt().
+       ///< A derived class that implements this function will also need
+       ///< to set the ReceiveCaPids parameter in the call to the base class
+       ///< constructor to true in order to receive the CA pid data.
   };
 
 class cCamSlots : public cList<cCamSlot> {};
diff --git a/config.h b/config.h
index de3e2aa54..c69eab6e3 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.4 2013/10/19 11:32:15 kls Exp $
+ * $Id: config.h 3.5 2013/10/20 09:32:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.2"
-#define VDRVERSNUM   20102  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.3"
+#define VDRVERSNUM   20103  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.2"
-#define APIVERSNUM   20102  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.3"
+#define APIVERSNUM   20103  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index a5afcfcc5..84caf4e12 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.3 2013/08/22 10:28:55 kls Exp $
+ * $Id: device.c 3.7 2014/01/02 10:31:58 kls Exp $
  */
 
 #include "device.h"
@@ -1121,7 +1121,7 @@ int64_t cDevice::GetSTC(void)
   return -1;
 }
 
-void cDevice::TrickSpeed(int Speed)
+void cDevice::TrickSpeed(int Speed, bool Forward)
 {
 }
 
@@ -1666,7 +1666,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Receiver->device = this;
          receiver[i] = Receiver;
          Unlock();
-         if (camSlot) {
+         if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
             camSlot->StartDecrypting();
             startScrambleDetection = time(NULL);
             }
@@ -1697,7 +1697,7 @@ void cDevice::Detach(cReceiver *Receiver)
       else if (receiver[i])
          receiversLeft = true;
       }
-  if (camSlot)
+  if (camSlot && Receiver->priority > MINPRIORITY) // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
      camSlot->StartDecrypting();
   if (!receiversLeft)
      Cancel(-1);
@@ -1764,7 +1764,7 @@ void cTSBuffer::Action(void)
      }
 }
 
-uchar *cTSBuffer::Get(void)
+uchar *cTSBuffer::Get(int *Available)
 {
   int Count = 0;
   if (delivered) {
@@ -1785,7 +1785,15 @@ uchar *cTSBuffer::Get(void)
         return NULL;
         }
      delivered = true;
+     if (Available)
+        *Available = Count;
      return p;
      }
   return NULL;
 }
+
+void cTSBuffer::Skip(int Count)
+{
+  ringBuffer->Del(Count);
+  delivered = false;
+}
diff --git a/device.h b/device.h
index aa3a0eec3..368d5cfa7 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 3.3 2013/10/09 08:25:16 kls Exp $
+ * $Id: device.h 3.8 2014/01/02 10:47:08 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -35,6 +35,7 @@
 
 enum eSetChannelResult { scrOk, scrNotAvailable, scrNoTransfer, scrFailed };
 
+// Note that VDR itself always uses pmAudioVideo when replaying a recording!
 enum ePlayMode { pmNone,           // audio/video from decoder
                  pmAudioVideo,     // audio/video from player
                  pmAudioOnly,      // audio only from player, video from decoder
@@ -698,10 +699,11 @@ class cDevice : public cThread {
   virtual bool HasIBPTrickSpeed(void) { return false; }
        ///< Returns true if this device can handle all frames in 'fast forward'
        ///< trick speeds.
-  virtual void TrickSpeed(int Speed);
+  virtual void TrickSpeed(int Speed, bool Forward);
        ///< Sets the device into a mode where replay is done slower.
        ///< Every single frame shall then be displayed the given number of
-       ///< times.
+       ///< times. Forward is true if replay is done in the normal (forward)
+       ///< direction, false if it is done reverse.
        ///< The cDvbPlayer uses the following values for the various speeds:
        ///<                   1x   2x   3x
        ///< Fast Forward       6    3    1
@@ -723,7 +725,7 @@ class cDevice : public cThread {
        ///< all registered cAudio objects are notified.
   virtual void StillPicture(const uchar *Data, int Length);
        ///< Displays the given I-frame as a still picture.
-       ///< Data points either to TS (first byte is 0x47) or PES (first byte
+       ///< Data points either to a series of TS (first byte is 0x47) or PES (first byte
        ///< is 0x00) data of the given Length. The default implementation
        ///< converts TS to PES and calls itself again, allowing a derived class
        ///< to display PES if it can't handle TS directly.
@@ -827,8 +829,21 @@ class cTSBuffer : public cThread {
   virtual void Action(void);
 public:
   cTSBuffer(int File, int Size, int CardIndex);
-  ~cTSBuffer();
-  uchar *Get(void);
+  virtual ~cTSBuffer();
+  uchar *Get(int *Available = NULL);
+     ///< Returns a pointer to the first TS packet in the buffer. If Available is given,
+     ///< it will return the total number of consecutive bytes pointed to in the buffer.
+     ///< It is guaranteed that the returned pointer points to a TS_SYNC_BYTE and that
+     ///< there are at least TS_SIZE bytes in the buffer. Otherwise NULL will be
+     ///< returned and the value in Available (if given) is undefined.
+     ///< Each call to Get() returns a pointer to the next TS packet in the buffer.
+  void Skip(int Count);
+     ///< If after a call to Get() more or less than TS_SIZE of the available data
+     ///< has been processed, a call to Skip() with the number of processed bytes
+     ///< will disable the automatic incrementing of the data pointer as described
+     ///< in Get() and skip the given number of bytes instead. Count may be 0 if the
+     ///< caller wants the previous TS packet to be delivered again in the next call
+     ///< to Get().
   };
 
 #endif //__DEVICE_H
diff --git a/diseqc.c b/diseqc.c
index 86ee61fef..2517caf6a 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 3.2 2013/08/21 09:26:11 kls Exp $
+ * $Id: diseqc.c 3.3 2013/12/28 11:33:08 kls Exp $
  */
 
 #include "diseqc.h"
@@ -228,9 +228,9 @@ bool cDiseqc::Parse(const char *s)
   devices = CurrentDevices;
   bool result = false;
   char *sourcebuf = NULL;
-  int fields = sscanf(s, "%a[^ ] %d %c %d %a[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
+  int fields = sscanf(s, "%m[^ ] %d %c %d %m[^\n]", &sourcebuf, &slof, &polarization, &lof, &commands);
   if (fields == 4)
-     commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument results in an empty string
+     commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %m argument results in an empty string
   if (4 <= fields && fields <= 5) {
      source = cSource::FromString(sourcebuf);
      if (Sources.Get(source)) {
diff --git a/diseqc.conf b/diseqc.conf
index 4ae1cfe32..4c48ecc11 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -7,7 +7,7 @@
 # satellite:      one of the 'S' codes defined in sources.conf
 #                 the special value 'S360E' means that this entry uses a positioner
 #                 (command 'P') that can move the dish to any requested satellite
-#                 position withing its range
+#                 position within its range
 # slof:           switch frequency of LNB; the first entry with
 #                 an slof greater than the actual transponder
 #                 frequency will be used
diff --git a/dvbdevice.c b/dvbdevice.c
index 3d01a5abf..62f29dac0 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 3.4 2013/10/13 14:41:57 kls Exp $
+ * $Id: dvbdevice.c 3.8 2014/01/02 10:30:15 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -558,8 +558,6 @@ int cDvbTuner::GetSignalStrength(void) const
     case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2)
     case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2)
                      MaxSignal = 670; break;
-    case 0x13D02103: // TechniSat SkyStar 2 DVB-S rev 2.3P
-                     MaxSignal = 0x4925; break;
     }
   int s = int(Signal) * 100 / MaxSignal;
   if (s > 100)
@@ -1206,8 +1204,8 @@ bool cDvbDevice::Initialize(void)
               }
            }
      }
-  int Checked = 0;
   int Found = 0;
+  int Used = 0;
   if (Nodes.Size() > 0) {
      Nodes.Sort();
      for (int i = 0; i < Nodes.Size(); i++) {
@@ -1215,10 +1213,11 @@ bool cDvbDevice::Initialize(void)
          int Frontend;
          if (2 == sscanf(Nodes[i], "%d %d", &Adapter, &Frontend)) {
             if (Exists(Adapter, Frontend)) {
-               if (Checked++ < MAXDVBDEVICES) {
+               if (Found < MAXDEVICES) {
+                  Found++;
                   if (UseDevice(NextCardIndex())) {
                      if (Probe(Adapter, Frontend))
-                        Found++;
+                        Used++;
                      }
                   else
                      NextCardIndex(1); // skips this one
@@ -1227,9 +1226,11 @@ bool cDvbDevice::Initialize(void)
             }
          }
      }
-  NextCardIndex(MAXDVBDEVICES - Checked); // skips the rest
-  if (Found > 0)
+  if (Found > 0) {
      isyslog("found %d DVB device%s", Found, Found > 1 ? "s" : "");
+     if (Used != Found)
+        isyslog("using only %d DVB device%s", Used, Used > 1 ? "s" : "");
+     }
   else
      isyslog("no DVB device found");
   return Found > 0;
@@ -1670,7 +1671,12 @@ void cDvbDevice::CloseDvr(void)
 bool cDvbDevice::GetTSPacket(uchar *&Data)
 {
   if (tsBuffer) {
-     Data = tsBuffer->Get();
+     int Available;
+     Data = tsBuffer->Get(&Available);
+     if (Data && CamSlot()) {
+        Data = CamSlot()->Decrypt(Data, Available);
+        tsBuffer->Skip(Available);
+        }
      return true;
      }
   return false;
diff --git a/dvbdevice.h b/dvbdevice.h
index 7a54d8cf9..0a76d9dfe 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 3.2 2013/06/01 11:36:18 kls Exp $
+ * $Id: dvbdevice.h 3.3 2014/01/01 14:00:56 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -67,7 +67,6 @@ enum {
 
 // --- End of definitions for older DVB API versions -------------------------
 
-#define MAXDVBDEVICES  8
 #define MAXDELIVERYSYSTEMS 8
 
 #define DEV_VIDEO         "/dev/video"
diff --git a/dvbplayer.c b/dvbplayer.c
index 316ea9404..1858cb98e 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 3.0 2013/03/08 13:44:19 kls Exp $
+ * $Id: dvbplayer.c 3.1 2013/12/25 13:24:07 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -324,7 +324,7 @@ void cDvbPlayer::TrickSpeed(int Increment)
      int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
      if (sp > MAX_VIDEO_SLOWMOTION)
         sp = MAX_VIDEO_SLOWMOTION;
-     DeviceTrickSpeed(sp);
+     DeviceTrickSpeed(sp, playDir == pdForward);
      }
 }
 
diff --git a/eit.c b/eit.c
index e5fa30142..d5ca7dad2 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 3.2 2013/10/12 11:10:11 kls Exp $
+ * $Id: eit.c 3.3 2013/11/03 13:55:00 kls Exp $
  */
 
 #include "eit.h"
@@ -54,8 +54,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   bool Modified = false;
   time_t SegmentStart = 0;
   time_t SegmentEnd = 0;
-  struct tm tm_r;
-  struct tm t = *localtime_r(&Now, &tm_r); // this initializes the time zone in 't'
+  struct tm t = { 0 };
+  localtime_r(&Now, &t); // this initializes the time zone in 't'
 
   SI::EIT::Event SiEitEvent;
   for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
diff --git a/epg.c b/epg.c
index ee784219f..096b68cff 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 3.2 2013/08/31 13:21:09 kls Exp $
+ * $Id: epg.c 3.3 2013/12/28 11:33:08 kls Exp $
  */
 
 #include "epg.h"
@@ -32,7 +32,7 @@ cString tComponent::ToString(void)
 bool tComponent::FromString(const char *s)
 {
   unsigned int Stream, Type;
-  int n = sscanf(s, "%X %02X %7s %a[^\n]", &Stream, &Type, language, &description); // 7 = MAXLANGCODE2 - 1
+  int n = sscanf(s, "%X %02X %7s %m[^\n]", &Stream, &Type, language, &description); // 7 = MAXLANGCODE2 - 1
   if (n != 4 || isempty(description)) {
      free(description);
      description = NULL;
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index b680c35bb..f763d62b6 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 3.0 2012/01/11 11:35:17 kls Exp $
+ *   $Id: descriptor.c 3.1 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -922,6 +922,48 @@ int T2DeliverySystemDescriptor::getTfsFlag() const {
    return extended_data_flag ? s->tfs_flag : -1;
 }
 
+void LogicalChannelDescriptor::Parse() {
+   //this descriptor is only a header and a loop
+   logicalChannelLoop.setData(data+sizeof(descr_logical_channel), getLength()-sizeof(descr_logical_channel));
+}
+
+int LogicalChannelDescriptor::LogicalChannel::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int LogicalChannelDescriptor::LogicalChannel::getVisibleServiceFlag() const {
+   return s->visible_service_flag;
+}
+
+int LogicalChannelDescriptor::LogicalChannel::getLogicalChannelNumber() const {
+   return HILO(s->logical_channel_number);
+}
+
+void LogicalChannelDescriptor::LogicalChannel::Parse() {
+   s=data.getData<const item_logical_channel>();
+}
+
+void HdSimulcastLogicalChannelDescriptor::Parse() {
+   //this descriptor is only a header and a loop
+   hdSimulcastLogicalChannelLoop.setData(data+sizeof(descr_hd_simulcast_logical_channel), getLength()-sizeof(descr_hd_simulcast_logical_channel));
+}
+
+int HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel::getServiceId() const {
+   return HILO(s->service_id);
+}
+
+int HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel::getVisibleServiceFlag() const {
+   return s->visible_service_flag;
+}
+
+int HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel::getLogicalChannelNumber() const {
+   return HILO(s->logical_channel_number);
+}
+
+void HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel::Parse() {
+   s=data.getData<const item_hd_simulcast_logical_channel>();
+}
+
 int PremiereContentTransmissionDescriptor::getOriginalNetworkId() const {
    return HILO(s->original_network_id);
 }
@@ -1145,4 +1187,59 @@ void RegistrationDescriptor::Parse() {
       privateData.assign(data.getData(offset), getLength()-offset);
 }
 
+int AVCDescriptor::getProfileIdc() const {
+   return s->profile_idc;
+}
+
+int AVCDescriptor::getConstraintSet0Flag() const {
+   return s->constraint_set0_flag;
+}
+
+int AVCDescriptor::getConstraintSet1Flag() const {
+   return s->constraint_set1_flag;
+}
+
+int AVCDescriptor::getConstraintSet2Flag() const {
+   return s->constraint_set2_flag;
+}
+
+int AVCDescriptor::getConstraintSet3Flag() const {
+   return s->constraint_set3_flag;
+}
+
+int AVCDescriptor::getConstraintSet4Flag() const {
+   return s->constraint_set4_flag;
+}
+
+int AVCDescriptor::getConstraintSet5Flag() const {
+   return s->constraint_set5_flag;
+}
+
+int AVCDescriptor::getAVCCompatibleFlags() const {
+   return s->avc_compatible_flags;
+}
+
+int AVCDescriptor::getLevelIdc() const {
+   return s->level_idc;
+}
+
+int AVCDescriptor::getAVCStillPresent() const {
+   return s->avc_still_present;
+}
+
+int AVCDescriptor::getAVC24HourPictureFlag() const {
+   return s->avc_24_hour_picture_flag;
+}
+
+int AVCDescriptor::getFramePackingSEINotPresentFlag() const {
+   return s->frame_packing_sei_not_present_flag;
+}
+
+void AVCDescriptor::Parse() {
+   int offset=0;
+   data.setPointerAndOffset<const descr_avc>(s, offset);
+   if (checkSize(getLength()-offset))
+      privateData.assign(data.getData(offset), getLength()-offset);
+}
+
 } //end of namespace
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 0115c1d50..f931871a1 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 3.0 2012/01/11 11:35:17 kls Exp $
+ *   $Id: descriptor.h 3.1 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -557,6 +557,42 @@ class T2DeliverySystemDescriptor : public Descriptor {
    int extended_data_flag;
 };
 
+class LogicalChannelDescriptor : public Descriptor {
+public:
+   class LogicalChannel : public LoopElement {
+   public:
+      int getServiceId() const;
+      int getVisibleServiceFlag() const;
+      int getLogicalChannelNumber() const;
+      virtual int getLength() { return sizeof(item_logical_channel); }
+   protected:
+      virtual void Parse();
+   private:
+      const item_logical_channel *s;
+   };
+   StructureLoop<LogicalChannel> logicalChannelLoop;
+protected:
+   virtual void Parse();
+};
+
+class HdSimulcastLogicalChannelDescriptor : public Descriptor {
+public:
+   class HdSimulcastLogicalChannel : public LoopElement {
+   public:
+      int getServiceId() const;
+      int getVisibleServiceFlag() const;
+      int getLogicalChannelNumber() const;
+      virtual int getLength() { return sizeof(item_hd_simulcast_logical_channel); }
+   protected:
+      virtual void Parse();
+   private:
+      const item_hd_simulcast_logical_channel *s;
+   };
+   StructureLoop<HdSimulcastLogicalChannel> hdSimulcastLogicalChannelLoop;
+protected:
+   virtual void Parse();
+};
+
 // Private DVB Descriptor  Premiere.de
 // 0xF2  Content Transmission Descriptor
 // http://dvbsnoop.sourceforge.net/examples/example-private-section.html
@@ -735,6 +771,27 @@ class RegistrationDescriptor : public Descriptor {
    const descr_registration *s;
 };
 
+class AVCDescriptor : public Descriptor {
+public:
+   int getProfileIdc() const;
+   int getConstraintSet0Flag() const;
+   int getConstraintSet1Flag() const;
+   int getConstraintSet2Flag() const;
+   int getConstraintSet3Flag() const;
+   int getConstraintSet4Flag() const;
+   int getConstraintSet5Flag() const;
+   int getAVCCompatibleFlags() const;
+   int getLevelIdc() const;
+   int getAVCStillPresent() const;
+   int getAVC24HourPictureFlag() const;
+   int getFramePackingSEINotPresentFlag() const;
+   CharArray privateData;
+protected:
+   virtual void Parse();
+private:
+   const descr_avc *s;
+};
+
 } //end of namespace
 
 #endif //LIBSI_TABLE_H
diff --git a/libsi/headers.h b/libsi/headers.h
index a15d92f6b..ff5bb5dae 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 3.0 2012/06/09 14:37:24 kls Exp $
+ *   $Id: headers.h 3.1 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -1870,6 +1870,54 @@ struct descr_t2_delivery_system {
    fields looping to the end */
 };
 
+/* 0x83 logical_channel_descriptor */
+
+#define DESCR_LOGICAL_CHANNEL_LEN 2
+struct descr_logical_channel {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+#define ITEM_LOGICAL_CHANNEL_LEN 4
+struct item_logical_channel {
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char visible_service_flag                   :1;
+   u_char reserved                               :5;
+   u_char logical_channel_number_hi              :2;
+#else
+   u_char logical_channel_number_hi              :2;
+   u_char reserved                               :5;
+   u_char visible_service_flag                   :1;
+#endif
+   u_char logical_channel_number_lo              :8;
+};
+
+/* 0x88 hd_simulcast_logical_channel_descriptor */
+
+#define DESCR_HD_SIMULCAST_LOGICAL_CHANNEL_LEN 2
+struct descr_hd_simulcast_logical_channel {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+};
+
+#define ITEM_HD_SIMULCAST_LOGICAL_CHANNEL_LEN 4
+struct item_hd_simulcast_logical_channel {
+   u_char service_id_hi                          :8;
+   u_char service_id_lo                          :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char visible_service_flag                   :1;
+   u_char reserved                               :5;
+   u_char logical_channel_number_hi              :2;
+#else
+   u_char logical_channel_number_hi              :2;
+   u_char reserved                               :5;
+   u_char visible_service_flag                   :1;
+#endif
+   u_char logical_channel_number_lo              :8;
+};
+
 /* MHP 0x00 application_descriptor */
 
 #define DESCR_APPLICATION_LEN 3
@@ -2088,6 +2136,27 @@ struct descr_registration {
    u_char format_identifier_lo_lo                :8;
 };
 
+/* 0x28 avc_descriptor */
+
+#define DESCR_AVC_LEN 6
+struct descr_avc {
+   u_char descriptor_tag                         :8;
+   u_char descriptor_length                      :8;
+   u_char profile_idc                            :8;
+   u_char constraint_set0_flag                   :1;
+   u_char constraint_set1_flag                   :1;
+   u_char constraint_set2_flag                   :1;
+   u_char constraint_set3_flag                   :1;
+   u_char constraint_set4_flag                   :1;
+   u_char constraint_set5_flag                   :1;
+   u_char avc_compatible_flags                   :2;
+   u_char level_idc                              :8;
+   u_char avc_still_present                      :1;
+   u_char avc_24_hour_picture_flag               :1;
+   u_char frame_packing_sei_not_present_flag     :1;
+   u_char reserved                               :5;
+};
+
 } //end of namespace
 
 #endif //LIBSI_HEADERS_H
diff --git a/libsi/si.c b/libsi/si.c
index d7ed1d9c3..0ef393977 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 3.0 2012/09/29 14:44:20 kls Exp $
+ *   $Id: si.c 3.1 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -508,6 +508,9 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case CarouselIdentifierDescriptorTag:
             d=new CarouselIdentifierDescriptor();
             break;
+         case AVCDescriptorTag:
+            d=new AVCDescriptor();
+            break;
          case NetworkNameDescriptorTag:
             d=new NetworkNameDescriptor();
             break;
@@ -614,6 +617,12 @@ Descriptor *Descriptor::getDescriptor(CharArray da, DescriptorTagDomain domain,
          case ExtensionDescriptorTag:
             d=new ExtensionDescriptor();
             break;
+         case LogicalChannelDescriptorTag:
+            d=new LogicalChannelDescriptor();
+            break;
+         case HdSimulcastLogicalChannelDescriptorTag:
+            d=new HdSimulcastLogicalChannelDescriptor();
+            break;
          case RegistrationDescriptorTag:
             d=new RegistrationDescriptor();
             break;
diff --git a/libsi/si.h b/libsi/si.h
index 7155043ba..80750648f 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 3.0 2012/10/15 11:56:06 kls Exp $
+ *   $Id: si.h 3.1 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -70,6 +70,10 @@ enum DescriptorTag {
   // defined by ISO-13818-6 (DSM-CC)
                CarouselIdentifierDescriptorTag = 0x13,
                // 0x14 - 0x3F  Reserved
+  // defined by ISO/IEC 13818-1 Amendment
+               AVCDescriptorTag = 0x28,
+               SVCExtensionDescriptorTag = 0x30,
+               MVCExtensionDescriptorTag = 0x31,
   // defined by ETSI (EN 300 468)
                NetworkNameDescriptorTag = 0x40,
                ServiceListDescriptorTag = 0x41,
@@ -134,6 +138,12 @@ enum DescriptorTag {
                DTSDescriptorTag = 0x7B,
                AACDescriptorTag = 0x7C,
                ExtensionDescriptorTag = 0x7F,
+ // defined by EICTA/EACEM/DIGITALEUROPE
+               LogicalChannelDescriptorTag = 0x83,
+               PreferredNameListDescriptorTag = 0x84,
+               PreferredNameIdentifierDescriptorTag = 0x85,
+               EacemStreamIdentifierDescriptorTag = 0x86,
+               HdSimulcastLogicalChannelDescriptorTag = 0x88,
  // Extension descriptors
                ImageIconDescriptorTag = 0x00,
                CpcmDeliverySignallingDescriptor = 0x01,
@@ -147,6 +157,12 @@ enum DescriptorTag {
                TargetRegionDescriptorTag = 0x09,
                TargetRegionNameDescriptorTag = 0x0A,
                ServiceRelocatedDescriptorTag = 0x0B,
+ // defined by ETSI (EN 300 468) v 1.12.1
+               XAITPidDescriptorTag = 0x0C,
+               C2DeliverySystemDescriptorTag = 0x0D,
+               // 0x0E - 0x0F Reserved
+               VideoDepthRangeDescriptorTag = 0x10,
+               T2MIDescriptorTag = 0x11,
 
  // Defined by ETSI TS 102 812 (MHP)
                // They once again start with 0x00 (see page 234, MHP specification)
diff --git a/lirc.c b/lirc.c
index e02f22965..2b0c07b18 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 3.1 2013/08/22 09:22:14 kls Exp $
+ * $Id: lirc.c 3.2 2013/10/29 12:32:12 kls Exp $
  */
 
 #include "lirc.h"
@@ -21,11 +21,9 @@ cLircRemote::cLircRemote(const char *DeviceName)
 {
   addr.sun_family = AF_UNIX;
   strcpy(addr.sun_path, DeviceName);
-  if (Connect()) {
-     Start();
-     return;
-     }
-  f = -1;
+  if (!Connect())
+     f = -1;
+  Start();
 }
 
 cLircRemote::~cLircRemote()
@@ -67,14 +65,15 @@ void cLircRemote::Action(void)
   bool repeat = false;
   int timeout = -1;
 
-  while (Running() && f >= 0) {
+  while (Running()) {
 
-        bool ready = cFile::FileReady(f, timeout);
+        bool ready = f >= 0 && cFile::FileReady(f, timeout);
         int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
 
-        if (ready && ret <= 0 ) {
+        if (f < 0 || ready && ret <= 0) {
            esyslog("ERROR: lircd connection broken, trying to reconnect every %.1f seconds", float(RECONNECTDELAY) / 1000);
-           close(f);
+           if (f >= 0)
+              close(f);
            f = -1;
            while (Running() && f < 0) {
                  cCondWait::SleepMs(RECONNECTDELAY);
diff --git a/menu.c b/menu.c
index df78513c3..6c7acfcb4 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.10 2013/10/16 09:15:36 kls Exp $
+ * $Id: menu.c 3.15 2013/12/27 09:00:24 kls Exp $
  */
 
 #include "menu.h"
@@ -16,6 +16,7 @@
 #include <string.h>
 #include "channels.h"
 #include "config.h"
+#include "cutter.h"
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
@@ -718,9 +719,11 @@ cMenuFolder::cMenuFolder(const char *Title, cNestedItemList *NestedItemList, con
   list = nestedItemList = NestedItemList;
   firstFolder = NULL;
   editing = false;
+  helpKeys = -1;
   Set();
-  SetHelpKeys();
   DescendPath(Path);
+  Display();
+  SetHelpKeys();
 }
 
 cMenuFolder::cMenuFolder(const char *Title, cList<cNestedItem> *List, cNestedItemList *NestedItemList, const char *Dir, const char *Path)
@@ -732,14 +735,28 @@ cMenuFolder::cMenuFolder(const char *Title, cList<cNestedItem> *List, cNestedIte
   dir = Dir;
   firstFolder = NULL;
   editing = false;
+  helpKeys = -1;
   Set();
-  SetHelpKeys();
   DescendPath(Path);
+  Display();
+  SetHelpKeys();
 }
 
 void cMenuFolder::SetHelpKeys(void)
 {
-  SetHelp(firstFolder ? tr("Button$Select") : NULL, tr("Button$New"), firstFolder ? tr("Button$Delete") : NULL, firstFolder ? tr("Button$Edit") : NULL);
+  if (HasSubMenu())
+     return;
+  int NewHelpKeys = 0;
+  if (firstFolder) {
+     if (cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current())) {
+        if (Folder->Folder()->SubItems())
+           NewHelpKeys = 1;
+        }
+     }
+  if (NewHelpKeys != helpKeys) {
+     helpKeys = NewHelpKeys;
+     SetHelp(NewHelpKeys > 0 ? tr("Button$Open") : NULL, tr("Button$New"), firstFolder ? tr("Button$Delete") : NULL, firstFolder ? tr("Button$Edit") : NULL);
+     }
 }
 
 void cMenuFolder::Set(const char *CurrentFolder)
@@ -768,7 +785,7 @@ void cMenuFolder::DescendPath(const char *Path)
         for (cMenuFolderItem *Folder = (cMenuFolderItem *)firstFolder; Folder; Folder = (cMenuFolderItem *)Next(Folder)) {
             if (strncmp(Folder->Folder()->Text(), Path, p - Path) == 0) {
                SetCurrent(Folder);
-               if (Folder->Folder()->SubItems())
+               if (Folder->Folder()->SubItems() && strchr(p + 1, FOLDERDELIMCHAR))
                   AddSubMenu(new cMenuFolder(Title(), Folder->Folder()->SubItems(), nestedItemList, !isempty(dir) ? *cString::sprintf("%s%c%s", *dir, FOLDERDELIMCHAR, Folder->Folder()->Text()) : Folder->Folder()->Text(), p + 1));
                break;
                }
@@ -777,12 +794,12 @@ void cMenuFolder::DescendPath(const char *Path)
     }
 }
 
-eOSState cMenuFolder::Select(void)
+eOSState cMenuFolder::Select(bool Open)
 {
   if (firstFolder) {
      cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
      if (Folder) {
-        if (Folder->Folder()->SubItems())
+        if (Open && Folder->Folder()->SubItems())
            return AddSubMenu(new cMenuFolder(Title(), Folder->Folder()->SubItems(), nestedItemList, !isempty(dir) ? *cString::sprintf("%s%c%s", *dir, FOLDERDELIMCHAR, Folder->Folder()->Text()) : Folder->Folder()->Text()));
         else
            return osEnd;
@@ -857,8 +874,8 @@ eOSState cMenuFolder::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:
-       case kRed:    return Select();
+       case kOk:     return Select(false);
+       case kRed:    return Select(true);
        case kGreen:  return New();
        case kYellow: return Delete();
        case kBlue:   return Edit();
@@ -867,6 +884,7 @@ eOSState cMenuFolder::ProcessKey(eKeys Key)
      }
   else if (state == osEnd && HasSubMenu() && editing)
      state = SetFolder();
+  SetHelpKeys();
   return state;
 }
 
@@ -2121,7 +2139,7 @@ class cMenuPathEdit : public cOsdMenu {
 cMenuPathEdit::cMenuPathEdit(const char *Path)
 :cOsdMenu(tr("Edit path"), 12)
 {
-  SetMenuCategory(mcRecording);
+  SetMenuCategory(mcRecordingEdit);
   path = Path;
   *folder = 0;
   *name = 0;
@@ -2236,7 +2254,7 @@ class cMenuRecordingEdit : public cOsdMenu {
 cMenuRecordingEdit::cMenuRecordingEdit(cRecording *Recording)
 :cOsdMenu(tr("Edit recording"), 12)
 {
-  SetMenuCategory(mcRecording);
+  SetMenuCategory(mcRecordingEdit);
   recording = Recording;
   originalFileName = recording->FileName();
   Recordings.StateChanged(recordingsState); // just to get the current state
@@ -2330,8 +2348,10 @@ eOSState cMenuRecordingEdit::Action(void)
   if (actionCancel)
      RecordingsHandler.Del(recording->FileName());
   else if (doCut) {
-     if (!RecordingsHandler.Add(ruCut, recording->FileName()))
-        Skins.Message(mtError, tr("Error while queueing recording for cutting!"));
+     if (access(cCutter::EditedFileName(recording->FileName()), F_OK) != 0 || Interface->Confirm(tr("Edited version already exists - overwrite?"))) {
+        if (!RecordingsHandler.Add(ruCut, recording->FileName()))
+           Skins.Message(mtError, tr("Error while queueing recording for cutting!"));
+        }
      }
   recordingIsInUse = recording->IsInUse();
   RefreshRecording();
@@ -2551,12 +2571,13 @@ void cMenuRecordingItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, b
 cString cMenuRecordings::path;
 cString cMenuRecordings::fileName;
 
-cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
+cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus, const cRecordingFilter *Filter)
 :cOsdMenu(Base ? Base : tr("Recordings"), 9, 6, 6)
 {
   SetMenuCategory(mcRecording);
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
+  filter = Filter;
   Recordings.StateChanged(recordingsState); // just to get the current state
   helpKeys = -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
@@ -2613,7 +2634,7 @@ void cMenuRecordings::Set(bool Refresh)
   GetRecordingsSortMode(DirectoryName());
   Recordings.Sort();
   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
-      if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
+      if ((!filter || filter->Filter(recording)) && (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR))) {
          cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
          cMenuRecordingItem *LastDir = NULL;
          if (Item->IsDirectory()) {
@@ -2680,7 +2701,7 @@ bool cMenuRecordings::Open(bool OpenSubMenus)
         buffer = cString::sprintf("%s%c%s", base, FOLDERDELIMCHAR, t);
         t = buffer;
         }
-     AddSubMenu(new cMenuRecordings(t, level + 1, OpenSubMenus));
+     AddSubMenu(new cMenuRecordings(t, level + 1, OpenSubMenus, filter));
      return true;
      }
   return false;
@@ -5217,6 +5238,8 @@ void cReplayControl::EditCut(void)
            Skins.Message(mtError, tr("No editing marks defined!"));
         else if (!marks.GetNumSequences())
            Skins.Message(mtError, tr("No editing sequences defined!"));
+        else if (access(cCutter::EditedFileName(fileName), F_OK) == 0 && !Interface->Confirm(tr("Edited version already exists - overwrite?")))
+           ;
         else if (!RecordingsHandler.Add(ruCut, fileName))
            Skins.Message(mtError, tr("Can't start editing process!"));
         else
diff --git a/menu.h b/menu.h
index 891557507..24516c364 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 3.3 2013/10/16 09:14:58 kls Exp $
+ * $Id: menu.h 3.5 2013/12/25 12:06:03 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -38,11 +38,12 @@ class cMenuFolder : public cOsdMenu {
   cString dir;
   cOsdItem *firstFolder;
   bool editing;
+  int helpKeys;
   void SetHelpKeys(void);
   void Set(const char *CurrentFolder = NULL);
   void DescendPath(const char *Path);
   eOSState SetFolder(void);
-  eOSState Select(void);
+  eOSState Select(bool Open);
   eOSState New(void);
   eOSState Delete(void);
   eOSState Edit(void);
@@ -190,6 +191,13 @@ class cDisplaySubtitleTracks : public cOsdObject {
 cOsdObject *CamControl(void);
 bool CamMenuActive(void);
 
+class cRecordingFilter {
+public:
+  virtual ~cRecordingFilter(void) {};
+  virtual bool Filter(const cRecording *Recording) const = 0;
+      ///< Returns true if the given Recording shall be displayed in the Recordings menu.
+  };
+
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
@@ -198,6 +206,7 @@ class cMenuRecordings : public cOsdMenu {
   int level;
   int recordingsState;
   int helpKeys;
+  const cRecordingFilter *filter;
   static cString path;
   static cString fileName;
   void SetHelpKeys(void);
@@ -212,7 +221,7 @@ class cMenuRecordings : public cOsdMenu {
 protected:
   cString DirectoryName(void);
 public:
-  cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
+  cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false, const cRecordingFilter *Filter = NULL);
   ~cMenuRecordings();
   virtual eOSState ProcessKey(eKeys Key);
   static void SetPath(const char *Path);
diff --git a/menuitems.c b/menuitems.c
index 4eea6babe..a7f828331 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 3.1 2013/05/24 10:26:01 kls Exp $
+ * $Id: menuitems.c 3.2 2013/11/03 14:48:21 kls Exp $
  */
 
 #include "menuitems.h"
@@ -487,12 +487,12 @@ void cMenuEditStrItem::Set(void)
   if (InEditMode()) {
      // This is an ugly hack to make editing strings work with the 'skincurses' plugin.
      const cFont *font = dynamic_cast<cSkinDisplayMenu *>(cSkinDisplay::Current())->GetTextAreaFont(false);
-     if (!font || font->Width("W") != 1) // all characters have with == 1 in the font used by 'skincurses'
+     if (!font || font->Width("W") != 1) // all characters have width == 1 in the font used by 'skincurses'
         font = cFont::GetFont(fontOsd);
 
      int width = cSkinDisplay::Current()->EditableWidth();
      width -= font->Width("[]");
-     width -= font->Width("<>"); // reserving this anyway make the whole thing simpler
+     width -= font->Width("<>"); // reserving this anyway makes the whole thing simpler
 
      if (pos < offset)
         offset = pos;
diff --git a/newplugin b/newplugin
index 150649c5b..8f7087e95 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 3.1 2013/05/02 10:06:09 kls Exp $
+# $Id: newplugin 3.2 2014/01/01 13:29:54 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -75,7 +75,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc))
+PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell PKG_CONFIG_PATH="\$\$PKG_CONFIG_PATH:../../.." pkg-config --variable=\$(1) vdr))
 LIBDIR = \$(call PKGCFG,libdir)
 LOCDIR = \$(call PKGCFG,locdir)
 PLGCFG = \$(call PKGCFG,plgcfg)
diff --git a/pat.c b/pat.c
index 5ed6bd968..5246e0742 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 3.0 2012/11/25 14:12:21 kls Exp $
+ * $Id: pat.c 3.2 2014/01/04 11:17:24 kls Exp $
  */
 
 #include "pat.h"
@@ -21,6 +21,7 @@
 class cCaDescriptor : public cListObject {
 private:
   int caSystem;
+  int caPid;
   int esPid;
   int length;
   uchar *data;
@@ -29,6 +30,7 @@ class cCaDescriptor : public cListObject {
   virtual ~cCaDescriptor();
   bool operator== (const cCaDescriptor &arg) const;
   int CaSystem(void) { return caSystem; }
+  int CaPid(void) { return caPid; }
   int EsPid(void) { return esPid; }
   int Length(void) const { return length; }
   const uchar *Data(void) const { return data; }
@@ -37,6 +39,7 @@ class cCaDescriptor : public cListObject {
 cCaDescriptor::cCaDescriptor(int CaSystem, int CaPid, int EsPid, int Length, const uchar *Data)
 {
   caSystem = CaSystem;
+  caPid = CaPid;
   esPid = EsPid;
   length = Length + 6;
   data = MALLOC(uchar, length);
@@ -79,6 +82,7 @@ class cCaDescriptors : public cListObject {
   bool Empty(void) { return caDescriptors.Count() == 0; }
   void AddCaDescriptor(SI::CaDescriptor *d, int EsPid);
   int GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
+  int GetCaPids(const int *CaSystemIds, int BufSize, int *Pids);
   const int *CaIds(void) { return caIds; }
   };
 
@@ -163,7 +167,7 @@ int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar
          if (EsPid < 0 || d->EsPid() == EsPid) {
             const int *caids = CaSystemIds;
             do {
-               if (d->CaSystem() == *caids) {
+               if (*caids == 0xFFFF || d->CaSystem() == *caids) {
                   if (length + d->Length() <= BufSize) {
                      memcpy(Data + length, d->Data(), d->Length());
                      length += d->Length();
@@ -179,6 +183,30 @@ int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar
   return -1;
 }
 
+int cCaDescriptors::GetCaPids(const int *CaSystemIds, int BufSize, int *Pids)
+{
+  if (!CaSystemIds || !*CaSystemIds)
+     return 0;
+  if (BufSize > 0 && Pids) {
+     int numPids = 0;
+     for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+         const int *caids = CaSystemIds;
+         do {
+            if (*caids == 0xFFFF || d->CaSystem() == *caids) {
+               if (numPids + 1 < BufSize) {
+                  Pids[numPids++] = d->CaPid();
+                  Pids[numPids] = 0;
+                  }
+               else
+                  return -1;
+               }
+            } while (*++caids);
+         }
+     return numPids;
+     }
+  return -1;
+}
+
 // --- cCaDescriptorHandler --------------------------------------------------
 
 class cCaDescriptorHandler : public cList<cCaDescriptors> {
@@ -190,6 +218,7 @@ class cCaDescriptorHandler : public cList<cCaDescriptors> {
       // 1 if it is an all new descriptor with actual contents,
       // and 2 if an existing descriptor was changed.
   int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
+  int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
   };
 
 int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
@@ -220,6 +249,16 @@ int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int Serv
   return 0;
 }
 
+int cCaDescriptorHandler::GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids)
+{
+  cMutexLock MutexLock(&mutex);
+  for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
+      if (ca->Is(Source, Transponder, ServiceId))
+         return ca->GetCaPids(CaSystemIds, BufSize, Pids);
+      }
+  return 0;
+}
+
 cCaDescriptorHandler CaDescriptorHandler;
 
 int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
@@ -227,6 +266,11 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
   return CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, BufSize, Data, EsPid);
 }
 
+int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids)
+{
+  return CaDescriptorHandler.GetCaPids(Source, Transponder, ServiceId, CaSystemIds, BufSize, Pids);
+}
+
 // --- cPatFilter ------------------------------------------------------------
 
 cPatFilter::cPatFilter(void)
diff --git a/pat.h b/pat.h
index a93c8756f..7f04575eb 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 3.0 2013/02/16 15:20:24 kls Exp $
+ * $Id: pat.h 3.2 2014/01/04 11:16:48 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -36,10 +36,18 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
          ///< Gets all CA descriptors for a given channel.
          ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
          ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
-         ///< are copied that match one of the given CA system IDs.
+         ///< are copied that match one of the given CA system IDs (or all of them, if CaSystemIds
+         ///< is 0xFFFF).
          ///< Returns the number of bytes copied into Data (0 if no CA descriptors are
          ///< available), or -1 if BufSize was too small to hold all CA descriptors.
-         ///< The return value tells whether these CA descriptors are to be used
-         ///< for the individual streams.
+
+int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
+         ///< Gets all CA pids for a given channel.
+         ///< Copies all available CA pids from the CA descriptors for the given Source, Transponder and ServiceId
+         ///< into the provided buffer at Pids (at most BufSize - 1 entries, the list will be zero-terminated).
+         ///< Only the CA pids of those CA descriptors are copied that match one of the given CA system IDs
+         ///< (or all of them, if CaSystemIds is 0xFFFF).
+         ///< Returns the number of pids copied into Pids (0 if no CA descriptors are
+         ///< available), or -1 if BufSize was too small to hold all CA pids.
 
 #endif //__PAT_H
diff --git a/player.h b/player.h
index 05ba518ba..9ec47faab 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 3.0 2012/04/28 13:04:17 kls Exp $
+ * $Id: player.h 3.1 2013/12/25 13:25:02 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -27,7 +27,7 @@ class cPlayer {
   bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
   bool DeviceHasIBPTrickSpeed(void) { return device ? device->HasIBPTrickSpeed() : false; }
   bool DeviceIsPlayingVideo(void) { return device ? device->IsPlayingVideo() : false; }
-  void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
+  void DeviceTrickSpeed(int Speed, bool Forward) { if (device) device->TrickSpeed(Speed, Forward); }
   void DeviceClear(void) { if (device) device->Clear(); }
   void DevicePlay(void) { if (device) device->Play(); }
   void DeviceFreeze(void) { if (device) device->Freeze(); }
diff --git a/po/ar.po b/po/ar.po
index 9937682b5..cedfac3e6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -607,8 +607,8 @@ msgstr "المجلد موجود بالفعل"
 msgid "Folder name must not contain '%c'!"
 msgstr "'%c'! اسم المجلد لا يجب ان يحتوى على"
 
-msgid "Button$Select"
-msgstr "الزر"
+msgid "Button$Open"
+msgstr "افتح"
 
 msgid "Delete folder and all sub folders?"
 msgstr "حذف المجلد وكل المجلدات الفرعية"
@@ -776,6 +776,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -803,9 +806,6 @@ msgstr "اعادة"
 msgid "Recordings"
 msgstr "التسجيلات"
 
-msgid "Button$Open"
-msgstr "افتح"
-
 msgid "Commands"
 msgstr "الاوامر"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 911ce2308..6329714ff 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -606,8 +606,8 @@ msgstr "La carpeta ja existeix!"
 msgid "Folder name must not contain '%c'!"
 msgstr "El nom de la carpeta no pot contenir '%c'"
 
-msgid "Button$Select"
-msgstr "Seleccionar"
+msgid "Button$Open"
+msgstr "Obrir"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Esborrar carpetas i totes les sub carpetes?"
@@ -775,6 +775,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -802,9 +805,6 @@ msgstr "Enrera"
 msgid "Recordings"
 msgstr "Veure programes gravats"
 
-msgid "Button$Open"
-msgstr "Obrir"
-
 msgid "Commands"
 msgstr "Ordres"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 3e4855b54..7f857d5ee 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -606,8 +606,8 @@ msgstr "Složka již existuje!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Jméno složky nesmí obsahovat '%c'!"
 
-msgid "Button$Select"
-msgstr "Vybrat"
+msgid "Button$Open"
+msgstr "Otevřít"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Smazat složku včetně podsložek?"
@@ -775,6 +775,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -802,9 +805,6 @@ msgstr "Na začátek"
 msgid "Recordings"
 msgstr "Nahrávky"
 
-msgid "Button$Open"
-msgstr "Otevřít"
-
 msgid "Commands"
 msgstr "Příkazy"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 130fc1a32..c8734bddc 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr ""
 msgid "Folder name must not contain '%c'!"
 msgstr ""
 
-msgid "Button$Select"
-msgstr ""
+msgid "Button$Open"
+msgstr "�bn"
 
 msgid "Delete folder and all sub folders?"
 msgstr ""
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -799,9 +802,6 @@ msgstr "Forfra"
 msgid "Recordings"
 msgstr "Optagelser"
 
-msgid "Button$Open"
-msgstr "�bn"
-
 msgid "Commands"
 msgstr "Kommandoer"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index d31088b30..136855b3f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr "Verzeichnisname existiert bereits!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Verzeichnisname darf kein '%c' enthalten!"
 
-msgid "Button$Select"
-msgstr "Ausw�hlen"
+msgid "Button$Open"
+msgstr "�ffnen"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Verzeichnis und alle Unterverzeichnisse l�schen?"
@@ -772,6 +772,9 @@ msgstr "Marken l
 msgid "Recording vanished!"
 msgstr "Aufnahme verschwunden!"
 
+msgid "Edited version already exists - overwrite?"
+msgstr "Geschnittene Version existiert bereits - �berschreiben?"
+
 msgid "Error while queueing recording for cutting!"
 msgstr "Fehler beim Hinzuf�gen der Aufnahme zur Schnittwarteschlange"
 
@@ -799,9 +802,6 @@ msgstr "Anfang"
 msgid "Recordings"
 msgstr "Aufzeichnungen"
 
-msgid "Button$Open"
-msgstr "�ffnen"
-
 msgid "Commands"
 msgstr "Befehle"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index f03e2a351..ca0701a85 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr ""
 msgid "Folder name must not contain '%c'!"
 msgstr ""
 
-msgid "Button$Select"
-msgstr ""
+msgid "Button$Open"
+msgstr "�������"
 
 msgid "Delete folder and all sub folders?"
 msgstr ""
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -799,9 +802,6 @@ msgstr "
 msgid "Recordings"
 msgstr "��������"
 
-msgid "Button$Open"
-msgstr "�������"
-
 msgid "Commands"
 msgstr "�������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index ec6d781f7..d27dd6eac 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr "
 msgid "Folder name must not contain '%c'!"
 msgstr "�El nombre de la carpeta no puede contener '%c'!"
 
-msgid "Button$Select"
-msgstr "Seleccionar"
+msgid "Button$Open"
+msgstr "Abrir"
 
 msgid "Delete folder and all sub folders?"
 msgstr "�Borrar carpeta y todas sub carpetas?"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Rebobinar"
 msgid "Recordings"
 msgstr "Grabaciones"
 
-msgid "Button$Open"
-msgstr "Abrir"
-
 msgid "Commands"
 msgstr "�rdenes"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 8b7c91314..d0597f359 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr "Sellenimeline kaust juba olemas!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Kausta nimi ei saa sisaldada '%c' sümbolit!"
 
-msgid "Button$Select"
-msgstr "Vali"
+msgid "Button$Open"
+msgstr "Avada"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Kustutada kaust ja kõik alamkaustad?"
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -799,9 +802,6 @@ msgstr "Algusesse"
 msgid "Recordings"
 msgstr "Salvestused"
 
-msgid "Button$Open"
-msgstr "Avada"
-
 msgid "Commands"
 msgstr "Käsud"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 151589d55..86ce6fec0 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -607,8 +607,8 @@ msgstr "Kansio on jo olemassa!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Kansion nimessä ei saa olla '%c'-merkkiä!"
 
-msgid "Button$Select"
-msgstr "Valitse"
+msgid "Button$Open"
+msgstr "Avaa"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Poistetaanko kansio alikansioineen?"
@@ -728,68 +728,71 @@ msgid "CAM not responding!"
 msgstr "CA-moduuli ei vastaa!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Muokkaa polkua"
 
 msgid "Folder"
-msgstr ""
+msgstr "Kansio"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Kansio on käytössä - muokkaukset eivät mahdollisia!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Siirrä koko kansio sisältäen %d tallennetta?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Kansion siirto epäonnistui!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Muokkaa tallennetta"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Tallenne on käytössä - muokkaus ei mahdollista!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Peru leikkaus"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Lopeta leikkaus"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Peru siirto"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Lopeta siirto"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Peru kopiointi"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Lopeta kopiointi"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Leikkaa"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Poista merkinnät"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Tallenne katosi!"
+
+msgid "Edited version already exists - overwrite?"
+msgstr "Muokattava versio on jo olemassa - ylikirjoitetaanko?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Tallenteen lisääminen leikkausjonoon epäonnistui!"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Poistetaanko muokkausmerkinnät tallenteelta?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Muokkausmerkintöjen poistaminen epäonnistui!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Prioriteetin/elinajan vaihtaminen epäonnistui!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Kansion/nimen vaihtaminen epäonnistui!"
 
 msgid "Recording info"
 msgstr "Tallenteen tiedot"
@@ -803,9 +806,6 @@ msgstr "Alkuun"
 msgid "Recordings"
 msgstr "Tallenteet"
 
-msgid "Button$Open"
-msgstr "Avaa"
-
 msgid "Commands"
 msgstr "Komennot"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index a6e0e9a2c..e1cde724f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -613,8 +613,8 @@ msgstr "Ce nom de dossier existe déjà !"
 msgid "Folder name must not contain '%c'!"
 msgstr "Le nom de dossier ne doit pas contenir '%c' !"
 
-msgid "Button$Select"
-msgstr "Sélectionner"
+msgid "Button$Open"
+msgstr "Ouvrir"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Supprimer le dossier et tous les sous dossiers ?"
@@ -782,6 +782,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -809,9 +812,6 @@ msgstr "Retour"
 msgid "Recordings"
 msgstr "Enregistrements"
 
-msgid "Button$Open"
-msgstr "Ouvrir"
-
 msgid "Commands"
 msgstr "Commandes"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 23f79a1c9..02aac4162 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -605,8 +605,8 @@ msgstr ""
 msgid "Folder name must not contain '%c'!"
 msgstr ""
 
-msgid "Button$Select"
-msgstr ""
+msgid "Button$Open"
+msgstr "Otvori"
 
 msgid "Delete folder and all sub folders?"
 msgstr ""
@@ -774,6 +774,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -801,9 +804,6 @@ msgstr "Na po
 msgid "Recordings"
 msgstr "Snimke"
 
-msgid "Button$Open"
-msgstr "Otvori"
-
 msgid "Commands"
 msgstr "Naredbe"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 1b4ac5299..55a1f7a5d 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -607,8 +607,8 @@ msgstr "Ez a könyvtárnév már létezik!"
 msgid "Folder name must not contain '%c'!"
 msgstr "A könyvtár neve nem tartalmazhatja: '%c'!"
 
-msgid "Button$Select"
-msgstr "Kiválasztás"
+msgid "Button$Open"
+msgstr "Kinyitni"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Valóban töröljem a könyvtárat és az alkönyvtárait?"
@@ -776,6 +776,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -803,9 +806,6 @@ msgstr "Vissza az elejére"
 msgid "Recordings"
 msgstr "Felvételek"
 
-msgid "Button$Open"
-msgstr "Kinyitni"
-
 msgid "Commands"
 msgstr "Parancsok"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index cc5a5678b..373235089 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2013-10-14 11:56+0200\n"
-"PO-Revision-Date: 2013-09-18 23:57+0100\n"
+"PO-Revision-Date: 2013-11-10 23:02+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -610,8 +610,8 @@ msgstr "Nome cartella già esistente!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Il nome cartella non deve contenere '%c'!"
 
-msgid "Button$Select"
-msgstr "Seleziona"
+msgid "Button$Open"
+msgstr "Apri"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Eliminare la cartella e sue sottocartelle?"
@@ -731,68 +731,71 @@ msgid "CAM not responding!"
 msgstr "La CAM non risponde!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Modifica percorso"
 
 msgid "Folder"
-msgstr ""
+msgstr "Cartella"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "La cartella è attualmente in uso - nessuna modifica possibile!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Spostare tutta la cartella contenente %d registrazioni?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Errore durante lo spostamento della cartella!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Modifica registrazione"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "La registrazione è attualmente in uso - nessuna modifica possibile!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Annulla taglio"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Ferma taglio"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Annulla spostamento"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Ferma spostamento"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Annulla copia"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Ferma copia"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Taglia"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Elimina marcatori"
 
 msgid "Recording vanished!"
+msgstr "Registrazione sparita!"
+
+msgid "Edited version already exists - overwrite?"
 msgstr ""
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Errore durante l'accodamento della registrazione per il taglio!"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Eliminare i marcatori di modifica della registrazione?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Errore durante la cancellazione dei marcatori di modifica!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Errore durante la modifica priorità/durata!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Errore durante la modifica cartella/nome!"
 
 msgid "Recording info"
 msgstr "Info registrazione"
@@ -806,9 +809,6 @@ msgstr "Riavvolgi"
 msgid "Recordings"
 msgstr "Registrazioni"
 
-msgid "Button$Open"
-msgstr "Apri"
-
 msgid "Commands"
 msgstr "Comandi"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 05eb65cf0..f702640f7 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr "Toks katalogo vardas jau egzistuoja!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Katalogo pavadinimas turi būti sudarytas iš '%c'!"
 
-msgid "Button$Select"
-msgstr "Pasirinkti"
+msgid "Button$Open"
+msgstr "Atidaryti"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Ištrinti katalogą ir jo visus pakatalogius?"
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -799,9 +802,6 @@ msgstr "Atsukti"
 msgid "Recordings"
 msgstr "Įrašai"
 
-msgid "Button$Open"
-msgstr "Atidaryti"
-
 msgid "Commands"
 msgstr "Komandos"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 0bceb1b5e..f18114007 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -604,8 +604,8 @@ msgstr "Името веќе постои"
 msgid "Folder name must not contain '%c'!"
 msgstr "Името на директориумот не смее да содржи '%c'"
 
-msgid "Button$Select"
-msgstr "Избери"
+msgid "Button$Open"
+msgstr "Отвори"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Избриши директориум со сите поддиректориуми?"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Премотај"
 msgid "Recordings"
 msgstr "Снимки"
 
-msgid "Button$Open"
-msgstr "Отвори"
-
 msgid "Commands"
 msgstr "Наредби"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 6b2d12262..8bc7526f5 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -608,8 +608,8 @@ msgstr "Map bestaat al"
 msgid "Folder name must not contain '%c'!"
 msgstr "Map mag geen karakter '%c' bevatten!"
 
-msgid "Button$Select"
-msgstr "Kies"
+msgid "Button$Open"
+msgstr "Openen"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Map en alle submappen verwijderen?"
@@ -777,6 +777,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -804,9 +807,6 @@ msgstr "Naar begin"
 msgid "Recordings"
 msgstr "Opnames"
 
-msgid "Button$Open"
-msgstr "Openen"
-
 msgid "Commands"
 msgstr "Commando's"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index b338ba7de..d5a05d54c 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr ""
 msgid "Folder name must not contain '%c'!"
 msgstr ""
 
-msgid "Button$Select"
-msgstr ""
+msgid "Button$Open"
+msgstr "�pne"
 
 msgid "Delete folder and all sub folders?"
 msgstr ""
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Spol tilbake"
 msgid "Recordings"
 msgstr "Opptak"
 
-msgid "Button$Open"
-msgstr "�pne"
-
 msgid "Commands"
 msgstr "Kommandoer"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 28ba68ebb..d125ec3be 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -605,8 +605,8 @@ msgstr "Taka nazwa katalogu juz istnieje"
 msgid "Folder name must not contain '%c'!"
 msgstr "Folder nie mo�e zawiera� '%c'!"
 
-msgid "Button$Select"
-msgstr "Wybierz"
+msgid "Button$Open"
+msgstr "Otw�rz"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Czy skasowa� katalog i wszystkie podkatalogi?"
@@ -774,6 +774,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -801,9 +804,6 @@ msgstr "Pocz
 msgid "Recordings"
 msgstr "Nagrania"
 
-msgid "Button$Open"
-msgstr "Otw�rz"
-
 msgid "Commands"
 msgstr "Polecenia"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9f04d875a..dae170f74 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr "Nome da pasta j
 msgid "Folder name must not contain '%c'!"
 msgstr "O nome da pasta n�o pode conter '%c'!"
 
-msgid "Button$Select"
-msgstr "Seleccionar"
+msgid "Button$Open"
+msgstr "Abrir"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Apagar pasta e todas as subpastas?"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Retroceder"
 msgid "Recordings"
 msgstr "Grava��es"
 
-msgid "Button$Open"
-msgstr "Abrir"
-
 msgid "Commands"
 msgstr "Comandos"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f250a41c3..2421a380a 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -605,8 +605,8 @@ msgstr "Un director cu acelaşi nume există!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Numele directorului nu poate să conţină '%c'!"
 
-msgid "Button$Select"
-msgstr "Selectează"
+msgid "Button$Open"
+msgstr "Deschide"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Şterg directorul şi toate sub-directoarele?"
@@ -774,6 +774,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -801,9 +804,6 @@ msgstr "De la capăt"
 msgid "Recordings"
 msgstr "Înregistrări"
 
-msgid "Button$Open"
-msgstr "Deschide"
-
 msgid "Commands"
 msgstr "Comenzi"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3b4339fdf..d8aff45e7 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr "
 msgid "Folder name must not contain '%c'!"
 msgstr "��� ���������� �� ������ ��������� '%c'!"
 
-msgid "Button$Select"
-msgstr "�������"
+msgid "Button$Open"
+msgstr "�������"
 
 msgid "Delete folder and all sub folders?"
 msgstr "������� ���������� � ��� �������������?"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "
 msgid "Recordings"
 msgstr "������"
 
-msgid "Button$Open"
-msgstr "�������"
-
 msgid "Commands"
 msgstr "�������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index bd7fe2bc2..0f867c6d9 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr "N
 msgid "Folder name must not contain '%c'!"
 msgstr "N�zov zlo�ky nesmie obsahova� '%c'!"
 
-msgid "Button$Select"
-msgstr "Vybra�"
+msgid "Button$Open"
+msgstr "Otvori�"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Vymaza� zlo�ku a v�etky pod zlo�ky?"
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -799,9 +802,6 @@ msgstr "Od za
 msgid "Recordings"
 msgstr "Nahr�vky"
 
-msgid "Button$Open"
-msgstr "Otvori�"
-
 msgid "Commands"
 msgstr "Pr�kazy"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 99f2ec11c..c7c4eba34 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr "Ime direktorija 
 msgid "Folder name must not contain '%c'!"
 msgstr "Direkotrij ne sme vsebobati '%c'!"
 
-msgid "Button$Select"
-msgstr "Izberi"
+msgid "Button$Open"
+msgstr "Odpri"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Izbri�i direktorij in vse pod direktorije"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Na za
 msgid "Recordings"
 msgstr "Posnetki"
 
-msgid "Button$Open"
-msgstr "Odpri"
-
 msgid "Commands"
 msgstr "Ukazi"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index fe5f3cb49..c44c40b3c 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr "Naziv direktorijuma ve
 msgid "Folder name must not contain '%c'!"
 msgstr "Naziv direktorijuma ne sme da sadr�i '%c'!"
 
-msgid "Button$Select"
-msgstr "Izaberi"
+msgid "Button$Open"
+msgstr "Otvori"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Obri�i direktorijum i sve poddirektorijume?"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Na po
 msgid "Recordings"
 msgstr "Snimci"
 
-msgid "Button$Open"
-msgstr "Otvori"
-
 msgid "Commands"
 msgstr "Komande"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 05f6a3b79..4bdfee546 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -607,8 +607,8 @@ msgstr "Mappnamnet finns redan!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Mappnamnet f�r inte inneh�lla '%c'!"
 
-msgid "Button$Select"
-msgstr "V�lj"
+msgid "Button$Open"
+msgstr "�ppna"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Radera mapp och alla undermappar?"
@@ -776,6 +776,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -803,9 +806,6 @@ msgstr "
 msgid "Recordings"
 msgstr "Inspelningar"
 
-msgid "Button$Open"
-msgstr "�ppna"
-
 msgid "Commands"
 msgstr "Kommandon"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 5c9f44e5f..795ea9f1e 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -603,8 +603,8 @@ msgstr ""
 msgid "Folder name must not contain '%c'!"
 msgstr ""
 
-msgid "Button$Select"
-msgstr ""
+msgid "Button$Open"
+msgstr "A�"
 
 msgid "Delete folder and all sub folders?"
 msgstr ""
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -799,9 +802,6 @@ msgstr "Baslang
 msgid "Recordings"
 msgstr "Kay�tlar"
 
-msgid "Button$Open"
-msgstr "A�"
-
 msgid "Commands"
 msgstr "Komutlar"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index a09fcc719..ea06c659c 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -604,8 +604,8 @@ msgstr "Назва теки вже існує!"
 msgid "Folder name must not contain '%c'!"
 msgstr "Назва теки не повинна містити '%c'!"
 
-msgid "Button$Select"
-msgstr "Вибрати"
+msgid "Button$Open"
+msgstr "Відкрити"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Видалити теку і всі підтеки?"
@@ -773,6 +773,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -800,9 +803,6 @@ msgstr "Назад"
 msgid "Recordings"
 msgstr "Записи"
 
-msgid "Button$Open"
-msgstr "Відкрити"
-
 msgid "Commands"
 msgstr "Команди"
 
@@ -1333,10 +1333,10 @@ msgid "Editing process already active!"
 msgstr "Процес відеомонтажу вже запущений!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrstuvwxyzабвгдеєёжзиіїйклмнопрстуфхцчшщъыьюя0123456789-.#~,/_@"
+msgstr " abcdefghijklmnopqrstuvwxyzабвгдеєёжзиіїйклмнопрстуфхцчшщъыьюя0123456789-.#~,/@"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.#~,/_@1\tabcабвг2\tdefдеєёжз3\tghiиіїйкл4\tjklмно5\tmnoпрс6\tpqrsтуфх7\ttuvцчшщъ8\twxyzыьэюя9"
+msgstr " 0\t-.#~,/@1\tabcабвг2\tdefдеєёжз3\tghiиіїйкл4\tjklмно5\tmnoпрс6\tpqrsтуфх7\ttuvцчшщъ8\twxyzыьэюя9"
 
 msgid "Button$ABC/abc"
 msgstr "АБВ/абв"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9746e83a6..a50b5bcc0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -605,8 +605,8 @@ msgstr "文件夹名称已经存在！"
 msgid "Folder name must not contain '%c'!"
 msgstr "文件夹名称不能包含 '%c'!"
 
-msgid "Button$Select"
-msgstr "选择"
+msgid "Button$Open"
+msgstr "打开"
 
 msgid "Delete folder and all sub folders?"
 msgstr "删除文件夹和所有子文件夹吗？"
@@ -774,6 +774,9 @@ msgstr ""
 msgid "Recording vanished!"
 msgstr ""
 
+msgid "Edited version already exists - overwrite?"
+msgstr ""
+
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
@@ -801,9 +804,6 @@ msgstr "重放"
 msgid "Recordings"
 msgstr "录像回放列表"
 
-msgid "Button$Open"
-msgstr "打开"
-
 msgid "Commands"
 msgstr "常用操作命令"
 
diff --git a/positioner.c b/positioner.c
index 8b9d27032..c6e0c736c 100644
--- a/positioner.c
+++ b/positioner.c
@@ -7,7 +7,7 @@
  * For an explanation (in German) of the theory behind the calculations see
  * http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1154305-grundlagen-und-winkelberechnungen-f%C3%BCr-h-h-diseqc-motor-antennenanlagen
  *
- * $Id: positioner.c 3.2 2013/10/10 14:14:10 kls Exp $
+ * $Id: positioner.c 3.4 2013/10/30 09:56:34 kls Exp $
  */
 
 #include "positioner.h"
@@ -15,7 +15,7 @@
 #include "config.h"
 
 #define SAT_EARTH_RATIO    0.1513 // the Earth's radius, divided by the distance from the Earth's center to the satellite
-#define SAT_VISIBILITY_LAT 810    // the absolute latitude beyond which no satellite can be seen (degrees * 10)
+#define SAT_VISIBILITY_LAT 812    // the absolute latitude beyond which no satellite can be seen (degrees * 10)
 
 #define RAD(x) ((x) * M_PI / 1800)
 #define DEG(x) ((x) * 1800 / M_PI)
@@ -68,10 +68,10 @@ int cPositioner::CalcLongitude(int HourAngle)
 int cPositioner::HorizonLongitude(ePositionerDirection Direction)
 {
   double Delta;
-  if (abs(Setup.SiteLat) < SAT_VISIBILITY_LAT)
+  if (abs(Setup.SiteLat) <= SAT_VISIBILITY_LAT)
      Delta = acos(SAT_EARTH_RATIO / cos(RAD(Setup.SiteLat)));
   else
-     Delta = RAD(145);
+     Delta = 0;
   if ((Setup.SiteLat >= 0) != (Direction == pdLeft))
      Delta = -Delta;
   return NormalizeAngle(round(DEG(RAD(Setup.SiteLon) + Delta)));
diff --git a/positioner.h b/positioner.h
index 6e019ed64..4fdc3d059 100644
--- a/positioner.h
+++ b/positioner.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: positioner.h 3.1 2013/06/10 14:27:14 kls Exp $
+ * $Id: positioner.h 3.3 2013/12/28 11:15:56 kls Exp $
  */
 
 #ifndef __POSITIONER_H
@@ -94,7 +94,7 @@ class cPositioner {
           ///< horizon when looking in the given Direction. Note that this function
           ///< only delivers reasonable values for site latitudes between +/-81 degrees.
           ///< Beyond these limits (i.e. near the north or south pole) a constant value
-          ///< of +/-14.5 degrees (integer value 145) will be returned.
+          ///< of 0 will be returned.
   int HardLimitLongitude(ePositionerDirection Direction) const;
           ///< Returns the longitude of the positioner's hard limit in the given
           ///< Direction. Note that the value returned here may be larger (or smaller,
@@ -133,8 +133,8 @@ class cPositioner {
           ///< Number can be in the range 1...255. However, a particular positioner
           ///< may only have a limited number of satellite positions it can store.
   virtual void RecalcPositions(uint Number) {}
-          ///< Take the difference betwen the current actual position of the dish and
-          ///< the position stored with teh given Number, and apply the difference to
+          ///< Take the difference between the current actual position of the dish and
+          ///< the position stored with the given Number, and apply the difference to
           ///< all stored positions.
   virtual void GotoPosition(uint Number, int Longitude);
           ///< Move the dish to the satellite position stored under the given Number.
diff --git a/receiver.c b/receiver.c
index 909c44b8e..de5d0aea2 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 3.0 2012/06/02 13:20:38 kls Exp $
+ * $Id: receiver.c 3.1 2014/01/01 12:03:00 kls Exp $
  */
 
 #include "receiver.h"
@@ -72,6 +72,28 @@ bool cReceiver::SetPids(const cChannel *Channel)
   return true;
 }
 
+void cReceiver::DelPid(int Pid)
+{
+  if (Pid) {
+     for (int i = 0; i < numPids; i++) {
+         if (pids[i] == Pid) {
+            for ( ; i < numPids; i++) // we also copy the terminating 0!
+                pids[i] = pids[i + 1];
+            numPids--;
+            return;
+            }
+         }
+     }
+}
+
+void cReceiver::DelPids(const int *Pids)
+{
+  if (Pids) {
+     while (*Pids)
+           DelPid(*Pids++);
+     }
+}
+
 bool cReceiver::WantsPid(int Pid)
 {
   if (Pid) {
diff --git a/receiver.h b/receiver.h
index 59e6d3339..8d6fee66d 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 3.0 2012/09/02 09:27:20 kls Exp $
+ * $Id: receiver.h 3.1 2014/01/01 11:45:09 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -64,7 +64,13 @@ class cReceiver {
                ///< through ChannelID(). The ChannelID is necessary to allow the device
                ///< that will be used for this receiver to detect and store whether the
                ///< channel can be decrypted in case this is an encrypted channel.
+  void DelPid(int Pid);
+               ///< Deletes the given Pid from the list of PIDs of this receiver.
+  void DelPids(const int *Pids);
+               ///< Deletes the given zero terminated list of Pids from the list of PIDs of this
+               ///< receiver.
   tChannelID ChannelID(void) { return channelID; }
+  int NumPids(void) const { return numPids; }
   bool IsAttached(void) { return device != NULL; }
                ///< Returns true if this receiver is (still) attached to a device.
                ///< A receiver may be automatically detached from its device in
diff --git a/recorder.c b/recorder.c
index 7887a88b0..38a4ed1e3 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 3.1 2013/10/12 11:49:42 kls Exp $
+ * $Id: recorder.c 3.2 2014/01/01 12:46:37 kls Exp $
  */
 
 #include "recorder.h"
@@ -139,6 +139,7 @@ void cRecorder::Action(void)
                           }
                        }
                     InfoWritten = true;
+                    cRecordingUserCommand::InvokeCommand(RUC_STARTRECORDING, recordingName);
                     }
                  if (FirstIframeSeen || frameDetector->IndependentFrame()) {
                     FirstIframeSeen = true; // start recording with the first I-frame
diff --git a/recording.c b/recording.c
index e41a89eab..af73563ac 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.7 2013/10/16 10:24:28 kls Exp $
+ * $Id: recording.c 3.11 2013/12/27 11:06:01 kls Exp $
  */
 
 #include "recording.h"
@@ -76,6 +76,7 @@ bool DirectoryEncoding = false;
 int InstanceId = 0;
 
 cRecordings DeletedRecordings(true);
+static cRecordings VanishedRecordings;
 
 // --- cRemoveDeletedRecordingsThread ----------------------------------------
 
@@ -220,6 +221,14 @@ void AssertFreeDiskSpace(int Priority, bool Force)
      }
 }
 
+// --- Clear vanished recordings ---------------------------------------------
+
+void ClearVanishedRecordings(void)
+{
+  cThreadLock RecordingsLock(&Recordings); // yes, it *is* Recordings!
+  VanishedRecordings.Clear();
+}
+
 // --- cResumeFile -----------------------------------------------------------
 
 cResumeFile::cResumeFile(const char *FileName, bool IsPesRecording)
@@ -1346,6 +1355,7 @@ cRecordings::cRecordings(bool Deleted)
 :cThread("video directory scanner")
 {
   deleted = Deleted;
+  initial = true;
   lastUpdate = 0;
   state = 0;
 }
@@ -1370,15 +1380,20 @@ const char *cRecordings::UpdateFileName(void)
 void cRecordings::Refresh(bool Foreground)
 {
   lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
-  Lock();
-  Clear();
-  ChangeState();
-  Unlock();
+  initial = Count() == 0; // no name checking if the list is initially empty
+  if (deleted) {
+     Lock();
+     Clear();
+     ChangeState();
+     Unlock();
+     }
   ScanVideoDir(cVideoDirectory::Name(), Foreground);
 }
 
-void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel)
+bool cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel, int DirLevel)
 {
+  bool DoChangeState = false;
+  // Find any new recordings:
   cReadDir d(DirName);
   struct dirent *e;
   while ((Foreground || Running()) && (e = d.Next()) != NULL) {
@@ -1397,25 +1412,47 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
               }
            if (S_ISDIR(st.st_mode)) {
               if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
-                 cRecording *r = new cRecording(buffer);
-                 if (r->Name()) {
-                    r->NumFrames(); // initializes the numFrames member
-                    r->FileSizeMB(); // initializes the fileSizeMB member
-                    if (deleted)
-                       r->deleted = time(NULL);
-                    Lock();
-                    Add(r);
-                    ChangeState();
-                    Unlock();
+                 if (deleted || initial || !GetByName(buffer)) {
+                    cRecording *r = new cRecording(buffer);
+                    if (r->Name()) {
+                       r->NumFrames(); // initializes the numFrames member
+                       r->FileSizeMB(); // initializes the fileSizeMB member
+                       if (deleted)
+                          r->deleted = time(NULL);
+                       Lock();
+                       Add(r);
+                       if (initial)
+                          ChangeState();
+                       else
+                          DoChangeState = true;
+                       Unlock();
+                       }
+                    else
+                       delete r;
                     }
-                 else
-                    delete r;
                  }
               else
-                 ScanVideoDir(buffer, Foreground, LinkLevel + Link);
+                 DoChangeState |= ScanVideoDir(buffer, Foreground, LinkLevel + Link, DirLevel + 1);
               }
            }
         }
+  // Handle any vanished recordings:
+  if (!deleted && !initial && DirLevel == 0) {
+     for (cRecording *recording = First(); recording; ) {
+         cRecording *r = recording;
+         recording = Next(recording);
+         if (access(r->FileName(), F_OK) != 0) {
+            Lock();
+            Del(r, false);
+            VanishedRecordings.Add(r);
+            DoChangeState = true;
+            Unlock();
+            }
+         }
+     }
+  if (DoChangeState && DirLevel == 0)
+     ChangeState();
+  return DoChangeState;
 }
 
 bool cRecordings::StateChanged(int &State)
@@ -1456,6 +1493,7 @@ bool cRecordings::Update(bool Wait)
 cRecording *cRecordings::GetByName(const char *FileName)
 {
   if (FileName) {
+     LOCK_THREAD;
      for (cRecording *recording = First(); recording; recording = Next(recording)) {
          if (strcmp(recording->FileName(), FileName) == 0)
             return recording;
@@ -1693,7 +1731,7 @@ void cDirCopier::Action(void)
                     off_t FileSizeSrc = FileSize(FileNameSrc);
                     off_t FileSizeDst = FileSize(FileNameDst);
                     if (FileSizeSrc != FileSizeDst) {
-                       esyslog("ERROR: file size discrepancy: %lld != %lld", FileSizeSrc, FileSizeDst);
+                       esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst);
                        break;
                        }
                     }
diff --git a/recording.h b/recording.h
index 3b00c71bc..7d5228ebe 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 3.1 2013/10/10 12:08:15 kls Exp $
+ * $Id: recording.h 3.4 2014/01/01 12:45:18 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -41,6 +41,7 @@ enum eRecordingUsage {
   };
 
 void RemoveDeletedRecordings(void);
+void ClearVanishedRecordings(void);
 void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
      ///< The special Priority value -1 means that we shall get rid of any
      ///< deleted recordings faster than normal (because we're cutting).
@@ -217,11 +218,12 @@ class cRecordings : public cList<cRecording>, public cThread {
 private:
   static char *updateFileName;
   bool deleted;
+  bool initial;
   time_t lastUpdate;
   int state;
   const char *UpdateFileName(void);
   void Refresh(bool Foreground = false);
-  void ScanVideoDir(const char *DirName, bool Foreground = false, int LinkLevel = 0);
+  bool ScanVideoDir(const char *DirName, bool Foreground = false, int LinkLevel = 0, int DirLevel = 0);
 protected:
   void Action(void);
 public:
@@ -277,6 +279,8 @@ class cRecordings : public cList<cRecording>, public cThread {
        ///< if all recordings have been successfully added to the RecordingsHandler.
   };
 
+/// Any access to Recordings that loops through the list of recordings
+/// needs to hold a thread lock on this object!
 extern cRecordings Recordings;
 extern cRecordings DeletedRecordings;
 
@@ -382,6 +386,7 @@ class cMarks : public cConfig<cMark> {
   };
 
 #define RUC_BEFORERECORDING "before"
+#define RUC_STARTRECORDING  "started"
 #define RUC_AFTERRECORDING  "after"
 #define RUC_EDITEDRECORDING "edited"
 #define RUC_DELETERECORDING "deleted"
diff --git a/remote.c b/remote.c
index e886bf34b..f93492431 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 3.0 2013/02/03 15:44:55 kls Exp $
+ * $Id: remote.c 3.1 2013/12/25 12:45:43 kls Exp $
  */
 
 #include "remote.h"
@@ -260,6 +260,7 @@ cKbdRemote::cKbdRemote(void)
      tcsetattr(STDIN_FILENO, TCSANOW, &tm);
      }
   kbdAvailable = true;
+  systemIsUtf8 = !cCharSetConv::SystemCharacterTable() || strcmp(cCharSetConv::SystemCharacterTable(), "UTF-8") == 0;
   Start();
 }
 
@@ -324,7 +325,23 @@ uint64_t cKbdRemote::ReadKeySequence(void)
 
   if ((key1 = ReadKey()) >= 0) {
      k = key1;
-     if (key1 == 0x1B) {
+     if (systemIsUtf8 && (key1 & 0xC0) == 0xC0) {
+        char bytes[4] = { 0 };
+        bytes[0] = key1;
+        int bytescount = 1;
+        if ((key1 & 0xF0) == 0xF0)
+           bytescount = 3;
+        else if ((key1 & 0xE0) == 0xE0)
+           bytescount = 2;
+        for (int i = 0; i < bytescount; i++) {
+            if ((key1 = ReadKey()) >= 0)
+               bytes[i + 1] = key1;
+            }
+        k = Utf8CharGet(bytes);
+        if (k > 0xFF)
+           k = 0;
+        }
+     else if (key1 == 0x1B) {
         // Start of escape sequence
         if ((key1 = ReadKey()) >= 0) {
            k <<= 8;
diff --git a/remote.h b/remote.h
index 3407c5479..415f2e772 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 3.0 2013/02/03 14:34:56 kls Exp $
+ * $Id: remote.h 3.1 2013/12/25 12:32:44 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -106,6 +106,7 @@ class cKbdRemote : public cRemote, private cThread {
 private:
   static bool kbdAvailable;
   static bool rawMode;
+  bool systemIsUtf8;
   struct termios savedTm;
   virtual void Action(void);
   int ReadKey(void);
diff --git a/sdt.c b/sdt.c
index f79187ee1..c6d0ce542 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 3.0 2010/05/16 14:23:21 kls Exp $
+ * $Id: sdt.c 3.1 2014/01/04 15:02:31 kls Exp $
  */
 
 #include "sdt.h"
@@ -43,6 +43,8 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
       cChannel *channel = Channels.GetByChannelID(tChannelID(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
       if (!channel)
          channel = Channels.GetByChannelID(tChannelID(Source(), 0, Transponder(), SiSdtService.getServiceId()));
+      if (channel)
+         channel->SetSeen();
 
       cLinkChannels *LinkChannels = NULL;
       SI::Descriptor *d;
@@ -139,5 +141,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             delete LinkChannels;
          }
       }
+  if (sdt.getSectionNumber() == sdt.getLastSectionNumber())
+     Channels.MarkObsoleteChannels(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
   Channels.Unlock();
 }
diff --git a/skinlcars.c b/skinlcars.c
index 23eafa10a..d652251e3 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 3.3 2013/08/18 13:45:36 kls Exp $
+ * $Id: skinlcars.c 3.6 2013/11/16 13:20:19 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -492,7 +492,7 @@ void cSkinLCARSDisplayChannel::DrawTrack(void)
 {
   cDevice *Device = cDevice::PrimaryDevice();
   const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
-  if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
+  if (Track ? strcmp(lastTrackId.description, Track->description) : *lastTrackId.description) {
      osd->DrawText(xc03, yc07, Track ? Track->description : "", Theme.Color(clrTrackName), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xc07 - xc03);
      strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
      }
@@ -900,6 +900,15 @@ cSkinLCARSDisplayMenu::cSkinLCARSDisplayMenu(void)
   ys03 = ys04 - Gap;
   ys05 = yb15;
 
+  // The item area (just to have them initialized, actual setting will be done in SetMenuCategory():
+
+  xi00 = 0;
+  xi01 = 0;
+  xi02 = 0;
+  xi03 = 1;
+  yi00 = 0;
+  yi01 = 1;
+
   // The color buttons in submenus:
   xb00 = xa06;
   xb15 = xa07;
@@ -1775,6 +1784,7 @@ cSkinLCARSDisplayReplay::cSkinLCARSDisplayReplay(bool ModeOnly)
   frameColor = Theme.Color(clrReplayFrameBg);
   lastCurrentWidth = 0;
   lastTotalWidth = 0;
+  memset(&lastTrackId, 0, sizeof(lastTrackId));
   int d = 5 * lineHeight;
   xp00 = 0;
   xp01 = xp00 + d / 2;
@@ -1848,7 +1858,7 @@ void cSkinLCARSDisplayReplay::DrawTrack(void)
 {
   cDevice *Device = cDevice::PrimaryDevice();
   const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
-  if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
+  if (Track ? strcmp(lastTrackId.description, Track->description) : *lastTrackId.description) {
      osd->DrawText(xp03, yp04, Track ? Track->description : "", Theme.Color(clrTrackName), Theme.Color(clrBackground), cFont::GetFont(fontOsd), xp07 - xp03);
      strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
      }
diff --git a/skins.h b/skins.h
index 47a03fc84..8c01aa95b 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 3.1 2013/08/21 10:29:10 kls Exp $
+ * $Id: skins.h 3.2 2013/11/03 14:07:34 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -101,6 +101,7 @@ enum eMenuCategory {
   mcTimerEdit,
   mcRecording,
   mcRecordingInfo,
+  mcRecordingEdit,
   mcPlugin,
   mcPluginSetup,
   mcSetup,
diff --git a/skinsttng.c b/skinsttng.c
index 6cde7cde7..7e450fda4 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 3.0 2013/03/03 15:29:28 kls Exp $
+ * $Id: skinsttng.c 3.1 2013/11/15 15:33:14 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
@@ -338,7 +338,7 @@ void cSkinSTTNGDisplayChannel::Flush(void)
            }
         cDevice *Device = cDevice::PrimaryDevice();
         const tTrackId *Track = Device->GetTrack(Device->GetCurrentAudioTrack());
-        if (!Track && *lastTrackId.description || Track && strcmp(lastTrackId.description, Track->description)) {
+        if (Track ? strcmp(lastTrackId.description, Track->description) : *lastTrackId.description) {
            osd->DrawText(x3 + TextFrame, y6, Track ? Track->description : "", Theme.Color(clrChannelName), frameColor, font, x4 - x3 - w - 2 * TextFrame);
            strn0cpy(lastTrackId.description, Track ? Track->description : "", sizeof(lastTrackId.description));
            }
diff --git a/sources.c b/sources.c
index ffaee98a3..c2a3dba1f 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 3.4 2013/05/23 10:20:28 kls Exp $
+ * $Id: sources.c 3.5 2013/12/28 11:33:08 kls Exp $
  */
 
 #include "sources.h"
@@ -31,7 +31,7 @@ cSource::~cSource()
 bool cSource::Parse(const char *s)
 {
   char *codeBuf = NULL;
-  if (2 == sscanf(s, "%a[^ ] %a[^\n]", &codeBuf, &description))
+  if (2 == sscanf(s, "%m[^ ] %m[^\n]", &codeBuf, &description))
      code = FromString(codeBuf);
   free(codeBuf);
   return code != stNone && description && *description;
diff --git a/svdrp.c b/svdrp.c
index 7f91479ff..c87803256 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 3.3 2013/10/14 09:49:38 kls Exp $
+ * $Id: svdrp.c 3.5 2013/10/21 07:46:04 kls Exp $
  */
 
 #include "svdrp.h"
@@ -257,6 +257,11 @@ const char *HelpPages[] = {
   "    used to easily activate or deactivate a timer.",
   "MOVC <number> <to>\n"
   "    Move a channel to a new position.",
+  "MOVR <number> <new name>\n"
+  "    Move the recording with the given number. Before a recording can be\n"
+  "    moved, an LSTR command must have been executed in order to retrieve\n"
+  "    the recording numbers. The numbers don't change during subsequent MOVR\n"
+  "    commands.n",
   "NEWC <settings>\n"
   "    Create a new channel. Settings must be in the same format as returned\n"
   "    by the LSTC command.",
@@ -304,11 +309,6 @@ const char *HelpPages[] = {
   "REMO [ on | off ]\n"
   "    Turns the remote control on or off. Without a parameter, the current\n"
   "    status of the remote control is reported.",
-  "RENR <number> <new name>\n"
-  "    Rename the recording with the given number. Before a recording can be\n"
-  "    renamed, an LSTR command must have been executed in order to retrieve\n"
-  "    the recording numbers. The numbers don't change during subsequent RENR\n"
-  "    commands.n",
   "SCAN\n"
   "    Forces an EPG scan. If this is a single DVB device system, the scan\n"
   "    will be done on the primary device unless it is currently recording.",
@@ -686,7 +686,7 @@ void cSVDRP::CmdDELR(const char *Option)
         cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            if (int RecordingInUse = recording->IsInUse())
-              Reply(550, RecordingInUseMessage(RecordingInUse, Option, recording));
+              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, recording));
            else {
               if (recording->Delete()) {
                  Reply(250, "Recording \"%s\" deleted", Option);
@@ -1331,6 +1331,46 @@ void cSVDRP::CmdMOVC(const char *Option)
      Reply(501, "Missing channel number");
 }
 
+void cSVDRP::CmdMOVR(const char *Option)
+{
+  if (*Option) {
+     char *opt = strdup(Option);
+     char *num = skipspace(opt);
+     char *option = num;
+     while (*option && !isspace(*option))
+           option++;
+     char c = *option;
+     *option = 0;
+     if (isnumber(num)) {
+        cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
+        if (recording) {
+           if (int RecordingInUse = recording->IsInUse())
+              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, recording));
+           else {
+              if (c)
+                 option = skipspace(++option);
+              if (*option) {
+                 cString oldName = recording->Name();
+                 if ((recording = Recordings.GetByName(recording->FileName())) != NULL && recording->ChangeName(option))
+                    Reply(250, "Recording \"%s\" moved to \"%s\"", *oldName, recording->Name());
+                 else
+                    Reply(554, "Error while moving recording \"%s\" to \"%s\"!", *oldName, option);
+                 }
+              else
+                 Reply(501, "Missing new recording name");
+              }
+           }
+        else
+           Reply(550, "Recording \"%s\" not found%s", num, recordings.Count() ? "" : " (use LSTR before moving)");
+        }
+     else
+        Reply(501, "Error in recording number \"%s\"", num);
+     free(opt);
+     }
+  else
+     Reply(501, "Missing recording number");
+}
+
 void cSVDRP::CmdNEWC(const char *Option)
 {
   if (*Option) {
@@ -1550,46 +1590,6 @@ void cSVDRP::CmdREMO(const char *Option)
      Reply(250, "Remote control is %s", cRemote::Enabled() ? "enabled" : "disabled");
 }
 
-void cSVDRP::CmdRENR(const char *Option)
-{
-  if (*Option) {
-     char *opt = strdup(Option);
-     char *num = skipspace(opt);
-     char *option = num;
-     while (*option && !isspace(*option))
-           option++;
-     char c = *option;
-     *option = 0;
-     if (isnumber(num)) {
-        cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
-        if (recording) {
-           if (int RecordingInUse = recording->IsInUse())
-              Reply(550, RecordingInUseMessage(RecordingInUse, Option, recording));
-           else {
-              if (c)
-                 option = skipspace(++option);
-              if (*option) {
-                 cString oldName = recording->Name();
-                 if ((recording = Recordings.GetByName(recording->FileName())) != NULL && recording->ChangeName(option))
-                    Reply(250, "Recording \"%s\" renamed to \"%s\"", *oldName, recording->Name());
-                 else
-                    Reply(554, "Error while renaming recording \"%s\" to \"%s\"!", *oldName, option);
-                 }
-              else
-                 Reply(501, "Missing new recording name");
-              }
-           }
-        else
-           Reply(550, "Recording \"%s\" not found%s", num, recordings.Count() ? "" : " (use LSTR before renaming)");
-        }
-     else
-        Reply(501, "Error in recording number \"%s\"", num);
-     free(opt);
-     }
-  else
-     Reply(501, "Missing recording number");
-}
-
 void cSVDRP::CmdSCAN(const char *Option)
 {
   EITScanner.ForceScan();
@@ -1710,6 +1710,7 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("MODC"))  CmdMODC(s);
   else if (CMD("MODT"))  CmdMODT(s);
   else if (CMD("MOVC"))  CmdMOVC(s);
+  else if (CMD("MOVR"))  CmdMOVR(s);
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
@@ -1717,7 +1718,6 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("PLUG"))  CmdPLUG(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
   else if (CMD("REMO"))  CmdREMO(s);
-  else if (CMD("RENR"))  CmdRENR(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
   else if (CMD("STAT"))  CmdSTAT(s);
   else if (CMD("UPDR"))  CmdUPDR(s);
diff --git a/svdrp.h b/svdrp.h
index 96247e523..8ac419afb 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 3.1 2013/09/14 13:24:50 kls Exp $
+ * $Id: svdrp.h 3.2 2013/10/21 07:42:03 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -71,6 +71,7 @@ class cSVDRP {
   void CmdMODC(const char *Option);
   void CmdMODT(const char *Option);
   void CmdMOVC(const char *Option);
+  void CmdMOVR(const char *Option);
   void CmdNEWC(const char *Option);
   void CmdNEWT(const char *Option);
   void CmdNEXT(const char *Option);
@@ -78,7 +79,6 @@ class cSVDRP {
   void CmdPLUG(const char *Option);
   void CmdPUTE(const char *Option);
   void CmdREMO(const char *Option);
-  void CmdRENR(const char *Option);
   void CmdSCAN(const char *Option);
   void CmdSTAT(const char *Option);
   void CmdUPDT(const char *Option);
diff --git a/thread.c b/thread.c
index 080f4b7cc..e5e19c9bc 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 3.1 2013/04/10 14:37:37 kls Exp $
+ * $Id: thread.c 3.2 2013/12/29 15:26:33 kls Exp $
  */
 
 #include "thread.h"
@@ -494,7 +494,6 @@ bool cPipe::Open(const char *Command, const char *Mode)
   else { // child process
      int iofd = STDOUT_FILENO;
      if (strcmp(Mode, "w") == 0) {
-        mode = "r";
         iopipe = 1;
         iofd = STDIN_FILENO;
         }
diff --git a/timers.c b/timers.c
index 4d63e8c1a..3eb80689b 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 3.0 2013/03/29 15:37:16 kls Exp $
+ * $Id: timers.c 3.1 2013/12/28 11:33:08 kls Exp $
  */
 
 #include "timers.h"
@@ -296,7 +296,7 @@ bool cTimer::Parse(const char *s)
   char *filebuffer = NULL;
   free(aux);
   aux = NULL;
-  //XXX Apparently sscanf() doesn't work correctly if the last %a argument
+  //XXX Apparently sscanf() doesn't work correctly if the last %m argument
   //XXX results in an empty string (this first occurred when the EIT gathering
   //XXX was put into a separate thread - don't know why this happens...
   //XXX As a cure we copy the original string and add a blank.
@@ -312,7 +312,7 @@ bool cTimer::Parse(const char *s)
      s = s2;
      }
   bool result = false;
-  if (8 <= sscanf(s, "%u :%a[^:]:%a[^:]:%d :%d :%d :%d :%a[^:\n]:%a[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &aux)) {
+  if (8 <= sscanf(s, "%u :%m[^:]:%m[^:]:%d :%d :%d :%d :%m[^:\n]:%m[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &aux)) {
      ClrFlags(tfRecording);
      if (aux && !*skipspace(aux)) {
         free(aux);
diff --git a/vdr.1 b/vdr.1
index 52ab43489..36765dbd3 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 3.0 2013/03/15 10:44:54 kls Exp $
+.\" $Id: vdr.1 3.1 2013/12/25 11:01:36 kls Exp $
 .\"
 .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
@@ -201,7 +201,7 @@ operation.
 Allow coredumps if -u is given (only for debugging).
 .TP
 .BI \-\-vfat
-For backwards compatibility (same as \-\-dirnames= 250,40,1.
+For backwards compatibility (same as \-\-dirnames= 250,40,1).
 .TP
 .BI \-v\  dir ,\ \-\-video= dir
 Use \fIdir\fR as video directory.
diff --git a/vdr.c b/vdr.c
index 083d838c6..a2ede09f3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.4 2013/10/16 09:33:58 kls Exp $
+ * $Id: vdr.c 3.7 2013/12/25 11:24:26 kls Exp $
  */
 
 #include <getopt.h>
@@ -223,6 +223,7 @@ int main(int argc, char *argv[])
   VdrUser = VDR_USER;
 #endif
 
+  cVideoDirectory::SetName(VideoDirectory);
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
 
   static struct option long_options[] = {
@@ -443,6 +444,7 @@ int main(int argc, char *argv[])
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
+                    cVideoDirectory::SetName(VideoDirectory);
                     break;
           case 'w': if (isnumber(optarg)) {
                        int t = atoi(optarg);
@@ -540,7 +542,7 @@ int main(int argc, char *argv[])
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
                "            --vfat         for backwards compatibility (same as\n"
-               "                           --dirnames=250,40,1\n"
+               "                           --dirnames=250,40,1)\n"
                "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                "                           seconds (default: %d); '0' disables the watchdog\n"
                "\n",
@@ -663,7 +665,6 @@ int main(int argc, char *argv[])
 
   // Directories:
 
-  cVideoDirectory::SetName(VideoDirectory);
   if (!ConfigDirectory)
      ConfigDirectory = DEFAULTCONFDIR;
   cPlugin::SetConfigDirectory(ConfigDirectory);
@@ -1369,6 +1370,7 @@ int main(int argc, char *argv[])
 
            // Disk housekeeping:
            RemoveDeletedRecordings();
+           ClearVanishedRecordings();
            cSchedules::Cleanup();
            // Plugins housekeeping:
            PluginManager.Housekeeping();

From 67e322b0dd0ef5ea78baea43b2d85fcfd3df8dfc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 26 Jan 2014 11:45:00 +0100
Subject: [PATCH 235/307] Version 2.1.4 VDR developer version 2.1.4 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.4.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.3-2.1.4.diff

MD5 checksums:

e1018c13dc257c986e0e30494913b415  vdr-2.1.4.tar.bz2
870f6f03f4697d136c886358c3be4277  vdr-2.1.3-2.1.4.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Updated 'sources.conf' (thanks to Antti Hartikainen).
- cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
  This prevents a crash with the LCARS skin on a system that has no fonts.
- Improved locking for CAM slots and made the pure functions of cCiAdapter have
  default implementations, to fix a possible crash with CI adapters and CAM slots
  that are implemented in a plugin.
- Added logging the supported system ids of a CAM.
- Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 10 in order to be able to record
  channels that need more than 5 TS packets for detecting frame borders (reported by
  Eike Sauer).
- Fixed deleting the source recording after moving it to a different volume (reported
  by Christoph Haubrich).
- Now waiting explicitly until all CAM slots are ready before switching to the
  initial channel when VDR is started. This is necessary in case CI adapters are
  used that are not physically connected to a dedicated device. The respective checks
  in cDvbDevice have been removed to avoid redundancy.
- Fixed detecting frame borders in MPEG-2 streams that have "bottom fields" or varying
  GOP structures (reported by Christian Paulick, with help from Helmut Auer).
- Now unassigning CAMs from their devices when they are no longer used.
- Now making sure the primary device goes into transfer mode for live viewing if the
  CAM wants to receive the TS data.
- Fixed a wrong alignment in cCiDateTime::SendDateTime().
- Since the new cRecordingsHandler that was introduced in version 2.1.2 not only
  handles "cutting", but also "moving" and "copying" recordings, the German word
  "Schnitt" has been replaced with the more generic "Bearbeitung", which covers all
  three variations of "editing" a recording (suggested by Christoph Haubrich).
  Maintainers of translations for other languages may want to change their *.po files
  accordingly.
- The new function cStatus::ChannelChange() can be implemented by plugins to be
  informed about changes to the parameters of a channel that may require a retune.
  This may, for instance, be useful for plugins that implement live streaming, so that
  they can react on changes to a channel's PIDs or CA descriptors (problem reported
  by Mariusz Bialonczyk).
- Fixed a superfluous call to the skin's SetRecording() function after renaming a
  recording (reported by Christoph Haubrich).
---
 CONTRIBUTORS                            |  20 ++++
 HISTORY                                 |  54 ++++++++++
 PLUGINS/src/dvbhddevice/HISTORY         |   4 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |   2 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |  22 +++-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h |   7 ++
 ci.c                                    |  40 ++++---
 ci.h                                    |  39 ++++---
 config.h                                |  10 +-
 device.c                                |  14 ++-
 dvbdevice.c                             |  25 +++--
 dvbdevice.h                             |   3 +-
 font.c                                  |  23 ++--
 font.h                                  |   4 +-
 menu.c                                  |  10 +-
 po/de_DE.po                             |  14 +--
 recording.c                             |  33 +++---
 remux.c                                 |  30 +++++-
 remux.h                                 |   4 +-
 sources.conf                            | 137 ++++++++++++------------
 status.c                                |   8 +-
 status.h                                |   6 +-
 vdr.c                                   |   6 +-
 23 files changed, 344 insertions(+), 171 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4e71fcce3..2fec0012b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -620,6 +620,8 @@ Helmut Auer <vdr@helmutauer.de>
  command line option to be left empty to use the default values if only ENC shall be set
  for reporting an inconsistent behavior between opening the Recordings menu manually
  via the main menu and by pressing the Recordings key
+ for helping to debug a problem with frame detection in MPEG-2 streams that have "bottom fields"
+ or varying GOP structures
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -2389,6 +2391,11 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  display gets hidden
  for reporting a wrong type ('int' vs. 'eTimerEvent') in the declaration of
  cSkinDisplayMenu::SetItemEvent()
+ for reporting that the source recording was not deleted after moving it to a different
+ volume
+ for suggesting to replace "Schnitt" with "Bearbeitung" in the German OSD texts
+ for reporting a superfluous call to the skin's SetRecording() function after renaming
+ a recording
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2504,6 +2511,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
 Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
  for adding maximum SNR value for PCTV Systems nanoStick T2 290e
+ for updating 'sources.conf'
 
 Bernd Melcher <bernd@bernd-melcher.de>
  for reporting a problem with the 'servicedemo' plugin having no PLUGIN macro
@@ -3236,3 +3244,15 @@ Thomas Reufer <thomas@reufer.ch>
  for suggesting to add an additional parameter named Forward to cDevice::TrickSpeed()
  for suggesting to add a note to ePlayMode in device.h that VDR itself always uses
  pmAudioVideo when replaying a recording
+
+Eike Sauer <EikeSauer@t-online.de>
+ for reporting a problem with channels that need more than 5 TS packets for detecting
+ frame borders
+
+Christian Paulick <cpaulick@xeatre.tv>
+ for reporting a problem with frame detection in MPEG-2 streams that have "bottom fields"
+ or varying GOP structures
+
+Mariusz Bialonczyk <manio@skyboo.net>
+ for reporting a problem with live streaming of encrypted channels, when there are no
+ CA descriptors, yet, on initial tuning
diff --git a/HISTORY b/HISTORY
index 787549462..9e7b737c7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8115,3 +8115,57 @@ Video Disk Recorder Revision History
   identify obsolete channels when you switch to them, and you can get the complete
   overview of all obsolete channels by sorting the Channels list by provider (by
   pressing the 0 key twice). Automatic deletion of obsolete channels may follow later.
+
+2014-01-07: Version 2.0.5
+
+- The LIRC remote control now connects to the socket even if it doesn't yet exist when
+  VDR is started (thanks to Lars Hanisch).
+- Fixed a missing initialization in the c'tor of cSkinLCARSDisplayChannel (thanks to
+  Marko M�kel�).
+- Fixed uninitialized item area coordinates in cSkinLCARSDisplayMenu (reported by
+  Marko M�kel�).
+- Fixed a possible crash if the recordings list is updated externally while the
+  Recordings menu is open (reported by Lars Hanisch).
+- Added a missing closing ')' in the help and man page entry of the --vfat option
+  (reported by Lars Hanisch).
+- Fixed setting the name of the video directory to avoid a crash when using --genindex,
+  and also to use the correct directory with --edit (the latter reported by Marko
+  M�kel�).
+
+2014-01-26: Version 2.1.4
+
+- Updated 'sources.conf' (thanks to Antti Hartikainen).
+- cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
+  This prevents a crash with the LCARS skin on a system that has no fonts.
+- Improved locking for CAM slots and made the pure functions of cCiAdapter have
+  default implementations, to fix a possible crash with CI adapters and CAM slots
+  that are implemented in a plugin.
+- Added logging the supported system ids of a CAM.
+- Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 10 in order to be able to record
+  channels that need more than 5 TS packets for detecting frame borders (reported by
+  Eike Sauer).
+- Fixed deleting the source recording after moving it to a different volume (reported
+  by Christoph Haubrich).
+- Now waiting explicitly until all CAM slots are ready before switching to the
+  initial channel when VDR is started. This is necessary in case CI adapters are
+  used that are not physically connected to a dedicated device. The respective checks
+  in cDvbDevice have been removed to avoid redundancy.
+- Fixed detecting frame borders in MPEG-2 streams that have "bottom fields" or varying
+  GOP structures (reported by Christian Paulick, with help from Helmut Auer).
+- Now unassigning CAMs from their devices when they are no longer used.
+- Now making sure the primary device goes into transfer mode for live viewing if the
+  CAM wants to receive the TS data.
+- Fixed a wrong alignment in cCiDateTime::SendDateTime().
+- Since the new cRecordingsHandler that was introduced in version 2.1.2 not only
+  handles "cutting", but also "moving" and "copying" recordings, the German word
+  "Schnitt" has been replaced with the more generic "Bearbeitung", which covers all
+  three variations of "editing" a recording (suggested by Christoph Haubrich).
+  Maintainers of translations for other languages may want to change their *.po files
+  accordingly.
+- The new function cStatus::ChannelChange() can be implemented by plugins to be
+  informed about changes to the parameters of a channel that may require a retune.
+  This may, for instance, be useful for plugins that implement live streaming, so that
+  they can react on changes to a channel's PIDs or CA descriptors (problem reported
+  by Mariusz Bialonczyk).
+- Fixed a superfluous call to the skin's SetRecording() function after renaming a
+  recording (reported by Christoph Haubrich).
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 80fbea87d..626d001ff 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -89,3 +89,7 @@ VDR Plugin 'dvbhddevice' Revision History
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
 - cDevice::TrickSpeed() now has an additional parameter named Forward.
+
+2014-01-17: Version 2.1.4
+
+- Using PCR based clock recovery in transfer mode.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 5e9df2e69..653d7ad47 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.3";
+static const char *VERSION        = "2.1.4";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 7e68cd535..fd1fb0368 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -51,6 +51,12 @@ cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
      isHdffPrimary = true;
      mHdffCmdIf = new HDFF::cHdffCmdIf(fd_osd);
 
+     uint32_t firmwareVersion = mHdffCmdIf->CmdGetFirmwareVersion(NULL, 0);
+     if (firmwareVersion < 0x401)
+        supportsPcrInTransferMode = false;
+     else
+        supportsPcrInTransferMode = true;
+
      /* reset some stuff in case the VDR was killed before and had no chance
         to clean up. */
      mHdffCmdIf->CmdOsdReset();
@@ -511,13 +517,15 @@ bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
         }
         else
         {
-            mHdffCmdIf->CmdAvSetPlayMode(1, Transferring() || (cTransferControl::ReceiverDevice() == this));
+            isTransferMode = Transferring() || (cTransferControl::ReceiverDevice() == this);
+            mHdffCmdIf->CmdAvSetPlayMode(1, isTransferMode);
             mHdffCmdIf->CmdAvSetStc(0, 100000);
             mHdffCmdIf->CmdAvEnableSync(0, false);
             mHdffCmdIf->CmdAvEnableVideoAfterStop(0, true);
 
             playVideoPid = -1;
             playAudioPid = -1;
+            playPcrPid = -1;
             audioCounter = 0;
             videoCounter = 0;
             freezed = false;
@@ -606,7 +614,11 @@ void cDvbHdFfDevice::ScaleVideo(const cRect &Rect)
     }
 }
 
+#if (APIVERSNUM >= 20103)
 void cDvbHdFfDevice::TrickSpeed(int Speed, bool Forward)
+#else
+void cDvbHdFfDevice::TrickSpeed(int Speed)
+#endif
 {
   freezed = false;
   mHdffCmdIf->CmdAvEnableSync(0, false);
@@ -896,6 +908,14 @@ int cDvbHdFfDevice::PlayTsVideo(const uchar *Data, int Length)
             mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, MapVideoStreamTypes(PatPmtParser()->Vtype()), true);
         }
     }
+    if (isTransferMode && supportsPcrInTransferMode) {
+        if (pid != playPcrPid) {
+            if (pid == PatPmtParser()->Ppid()) {
+                playPcrPid = pid;
+                mHdffCmdIf->CmdAvSetPcrPid(0, playPcrPid);
+            }
+        }
+    }
     return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
 }
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 58362fc5a..146958f27 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -77,9 +77,12 @@ class cDvbHdFfDevice : public cDvbDevice {
 private:
   int playVideoPid;
   int playAudioPid;
+  int playPcrPid;
   bool freezed;
   bool trickMode;
   bool isPlayingVideo;
+  bool isTransferMode;
+  bool supportsPcrInTransferMode;
 
   // Pes2Ts conversion stuff
   uint8_t videoCounter;
@@ -99,7 +102,11 @@ class cDvbHdFfDevice : public cDvbDevice {
   virtual int64_t GetSTC(void);
   virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter);
   virtual void ScaleVideo(const cRect &Rect = cRect::Null);
+#if (APIVERSNUM >= 20103)
   virtual void TrickSpeed(int Speed, bool Forward);
+#else
+  virtual void TrickSpeed(int Speed);
+#endif
   virtual void Clear(void);
   virtual void Play(void);
   virtual void Freeze(void);
diff --git a/ci.c b/ci.c
index e2881fedb..b0dc3586d 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.4 2014/01/02 10:31:12 kls Exp $
+ * $Id: ci.c 3.10 2014/01/22 09:46:38 kls Exp $
  */
 
 #include "ci.h"
@@ -719,11 +719,13 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
      switch (Tag) {
        case AOT_CA_INFO: {
             dbgprotocol("Slot %d: <== Ca Info (%d)", Tc()->CamSlot()->SlotNumber(), SessionId());
+            cString Ids;
             numCaSystemIds = 0;
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             while (l > 1) {
                   uint16_t id = ((uint16_t)(*d) << 8) | *(d + 1);
+                  Ids = cString::sprintf("%s %04X", *Ids ? *Ids : "", id);
                   dbgprotocol(" %04X", id);
                   d += 2;
                   l -= 2;
@@ -740,6 +742,7 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                timer.Set(QUERY_WAIT_TIME); // WORKAROUND: Alphacrypt 3.09 doesn't reply to QUERY immediately after reset
                state = 2; // got ca info
                }
+            dsyslog("CAM %d: system ids:%s", Tc()->CamSlot()->SlotNumber(), *Ids ? *Ids : " none");
             }
             break;
        case AOT_CA_PMT_REPLY: {
@@ -858,7 +861,9 @@ void cCiDateTime::SendDateTime(void)
      int L = (M == 1 || M == 2) ? 1 : 0;
      int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
 #define DEC2BCD(d) uint8_t(((d / 10) << 4) + (d % 10))
+#pragma pack(1)
      struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; };
+#pragma pack()
      tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : short(htons(tm_loc.tm_gmtoff / 60)) };
      bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
      DumpTPDUDataTransfer &= DumpDateTime;
@@ -1529,15 +1534,6 @@ void cCiAdapter::AddCamSlot(cCamSlot *CamSlot)
      }
 }
 
-bool cCiAdapter::Ready(void)
-{
-  for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++) {
-      if (camSlots[i] && !camSlots[i]->Ready())
-         return false;
-      }
-  return true;
-}
-
 void cCiAdapter::Action(void)
 {
   cTPDU TPDU;
@@ -1559,8 +1555,6 @@ void cCiAdapter::Action(void)
 
 // --- cCamSlot --------------------------------------------------------------
 
-cCamSlots CamSlots;
-
 #define MODULE_CHECK_INTERVAL 500 // ms
 #define MODULE_RESET_TIMEOUT    2 // s
 
@@ -1584,6 +1578,8 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
 
 cCamSlot::~cCamSlot()
 {
+  if (ciAdapter && ciAdapter->assignedDevice)
+     ciAdapter->assignedDevice->SetCamSlot(NULL);
   delete caPidReceiver;
   CamSlots.Del(this, false);
   DeleteAllConnections();
@@ -2020,6 +2016,26 @@ uchar *cCamSlot::Decrypt(uchar *Data, int &Count)
   return Data;
 }
 
+// --- cCamSlots -------------------------------------------------------------
+
+cCamSlots CamSlots;
+
+bool cCamSlots::WaitForAllCamSlotsReady(int Timeout)
+{
+  for (time_t t0 = time(NULL); time(NULL) - t0 < Timeout; ) {
+      bool ready = true;
+      for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+          if (!CamSlot->Ready()) {
+             ready = false;
+             cCondWait::SleepMs(100);
+             }
+          }
+      if (ready)
+         return true;
+      }
+  return false;
+}
+
 // --- cChannelCamRelation ---------------------------------------------------
 
 #define CAM_CHECKED_TIMEOUT  15 // seconds before a CAM that has been checked for a particular channel will be checked again
diff --git a/ci.h b/ci.h
index 112371219..159552cff 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 3.3 2014/01/02 10:14:39 kls Exp $
+ * $Id: ci.h 3.6 2014/01/20 12:01:01 kls Exp $
  */
 
 #ifndef __CI_H
@@ -88,19 +88,19 @@ class cCiAdapter : public cThread {
        ///< Handles the attached CAM slots in a separate thread.
        ///< The derived class must call the Start() function to
        ///< actually start CAM handling.
-  virtual int Read(uint8_t *Buffer, int MaxLength) = 0;
+  virtual int Read(uint8_t *Buffer, int MaxLength) { return 0; }
        ///< Reads one chunk of data into the given Buffer, up to MaxLength bytes.
        ///< If no data is available immediately, wait for up to CAM_READ_TIMEOUT.
        ///< Returns the number of bytes read (in case of an error it will also
        ///< return 0).
-  virtual void Write(const uint8_t *Buffer, int Length) = 0;
+  virtual void Write(const uint8_t *Buffer, int Length) {}
        ///< Writes Length bytes of the given Buffer.
-  virtual bool Reset(int Slot) = 0;
+  virtual bool Reset(int Slot) { return false; }
        ///< Resets the CAM in the given Slot.
        ///< Returns true if the operation was successful.
-  virtual eModuleStatus ModuleStatus(int Slot) = 0;
+  virtual eModuleStatus ModuleStatus(int Slot) { return msNone; }
        ///< Returns the status of the CAM in the given Slot.
-  virtual bool Assign(cDevice *Device, bool Query = false) = 0;
+  virtual bool Assign(cDevice *Device, bool Query = false) { return false; }
        ///< Assigns this adapter to the given Device, if this is possible.
        ///< If Query is 'true', the adapter only checks whether it can be
        ///< assigned to the Device, but doesn't actually assign itself to it.
@@ -113,8 +113,6 @@ class cCiAdapter : public cThread {
   cCiAdapter(void);
   virtual ~cCiAdapter();
        ///< The derived class must call Cancel(3) in its destructor.
-  virtual bool Ready(void);
-       ///< Returns 'true' if all present CAMs in this adapter are ready.
   };
 
 class cTPDU;
@@ -149,13 +147,13 @@ class cCamSlot : public cListObject {
   void Write(cTPDU *TPDU);
   cCiSession *GetSessionByResourceId(uint32_t ResourceId);
 public:
-  cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids = false);
+  cCamSlot(cCiAdapter *CiAdapter, bool WantsTsData = false);
        ///< Creates a new CAM slot for the given CiAdapter.
        ///< The CiAdapter will take care of deleting the CAM slot,
        ///< so the caller must not delete it!
-       ///< If ReceiveCaPids is true, the CAM slot will take care that the CA pids
-       ///< of the selected programmes will be included in the TS data stream that
-       ///< is presented to the Decrypt() function.
+       ///< If WantsTsData is true, the device this CAM slot is assigned to will
+       ///< call the Decrypt() function of this CAM slot, presenting it the complete
+       ///< TS data stream of the encrypted programme, including the CA pids.
   virtual ~cCamSlot();
   bool Assign(cDevice *Device, bool Query = false);
        ///< Assigns this CAM slot to the given Device, if this is possible.
@@ -168,6 +166,9 @@ class cCamSlot : public cListObject {
        ///< 'true'.
   cDevice *Device(void);
        ///< Returns the device this CAM slot is currently assigned to.
+  bool WantsTsData(void) const { return caPidReceiver != NULL; }
+       ///< Returns true if this CAM slot wants to receive the TS data through
+       ///< its Decrypt() function.
   int SlotIndex(void) { return slotIndex; }
        ///< Returns the index of this CAM slot within its CI adapter.
        ///< The first slot has an index of 0.
@@ -263,11 +264,19 @@ class cCamSlot : public cListObject {
        ///< shall be set to 0 and the same Data pointer will be offered in the next
        ///< call to Decrypt().
        ///< A derived class that implements this function will also need
-       ///< to set the ReceiveCaPids parameter in the call to the base class
-       ///< constructor to true in order to receive the CA pid data.
+       ///< to set the WantsTsData parameter in the call to the base class
+       ///< constructor to true in order to receive the TS data.
   };
 
-class cCamSlots : public cList<cCamSlot> {};
+class cCamSlots : public cList<cCamSlot> {
+public:
+  bool WaitForAllCamSlotsReady(int Timeout = 0);
+       ///< Waits until all CAM slots have become ready, or the given Timeout
+       ///< (seconds) has expired. While waiting, the Ready() function of each
+       ///< CAM slot is called in turn, until they all return true.
+       ///< Returns true if all CAM slots have become ready within the given
+       ///< timeout.
+  };
 
 extern cCamSlots CamSlots;
 
diff --git a/config.h b/config.h
index c69eab6e3..9ada33395 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.5 2013/10/20 09:32:23 kls Exp $
+ * $Id: config.h 3.6 2014/01/07 09:03:29 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.3"
-#define VDRVERSNUM   20103  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.4"
+#define VDRVERSNUM   20104  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.3"
-#define APIVERSNUM   20103  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.4"
+#define APIVERSNUM   20104  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 84caf4e12..9da5e7ff2 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.7 2014/01/02 10:31:58 kls Exp $
+ * $Id: device.c 3.11 2014/01/21 11:12:01 kls Exp $
  */
 
 #include "device.h"
@@ -358,6 +358,7 @@ bool cDevice::HasCi(void)
 
 void cDevice::SetCamSlot(cCamSlot *CamSlot)
 {
+  LOCK_THREAD;
   camSlot = CamSlot;
 }
 
@@ -760,6 +761,9 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, LIVEPRIORITY, true) : this;
 
   bool NeedsTransferMode = Device != this;
+  // If the CAM slot wants the TS data, we need to switch to Transfer Mode:
+  if (!NeedsTransferMode && LiveView && IsPrimaryDevice() && CamSlot() && CamSlot()->WantsTsData())
+     NeedsTransferMode = true;
 
   eSetChannelResult Result = scrOk;
 
@@ -1697,8 +1701,12 @@ void cDevice::Detach(cReceiver *Receiver)
       else if (receiver[i])
          receiversLeft = true;
       }
-  if (camSlot && Receiver->priority > MINPRIORITY) // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
-     camSlot->StartDecrypting();
+  if (camSlot) {
+     if (Receiver->priority > MINPRIORITY) // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
+        camSlot->StartDecrypting();
+     if (!camSlot->IsDecrypting())
+        camSlot->Assign(NULL);
+     }
   if (!receiversLeft)
      Cancel(-1);
 }
diff --git a/dvbdevice.c b/dvbdevice.c
index 62f29dac0..6d1c95626 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 3.8 2014/01/02 10:30:15 kls Exp $
+ * $Id: dvbdevice.c 3.10 2014/01/20 11:46:26 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1320,13 +1320,6 @@ bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
   return false;
 }
 
-bool cDvbDevice::Ready(void)
-{
-  if (ciAdapter)
-     return ciAdapter->Ready();
-  return true;
-}
-
 bool cDvbDevice::BondDevices(const char *Bondings)
 {
   UnBondDevices();
@@ -1671,12 +1664,18 @@ void cDvbDevice::CloseDvr(void)
 bool cDvbDevice::GetTSPacket(uchar *&Data)
 {
   if (tsBuffer) {
-     int Available;
-     Data = tsBuffer->Get(&Available);
-     if (Data && CamSlot()) {
-        Data = CamSlot()->Decrypt(Data, Available);
-        tsBuffer->Skip(Available);
+     if (cCamSlot *cs = CamSlot()) {
+        if (cs->WantsTsData()) {
+           int Available;
+           Data = tsBuffer->Get(&Available);
+           if (Data) {
+              Data = cs->Decrypt(Data, Available);
+              tsBuffer->Skip(Available);
+              }
+           return true;
+           }
         }
+     Data = tsBuffer->Get();
      return true;
      }
   return false;
diff --git a/dvbdevice.h b/dvbdevice.h
index 0a76d9dfe..278edd0c3 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 3.3 2014/01/01 14:00:56 kls Exp $
+ * $Id: dvbdevice.h 3.4 2014/01/16 11:45:35 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -185,7 +185,6 @@ class cDvbDevice : public cDevice {
   virtual ~cDvbDevice();
   int Adapter(void) const { return adapter; }
   int Frontend(void) const { return frontend; }
-  virtual bool Ready(void);
   virtual cString DeviceType(void) const;
   virtual cString DeviceName(void) const;
   static bool BondDevices(const char *Bondings);
diff --git a/font.c b/font.c
index dee26c21a..cd2c494b1 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 3.1 2013/04/07 14:42:13 kls Exp $
+ * $Id: font.c 3.2 2014/01/07 12:19:45 kls Exp $
  */
 
 #include "font.h"
@@ -382,10 +382,13 @@ void cFreetypeFont::DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColo
 // A dummy font, in case there are no fonts installed:
 
 class cDummyFont : public cFont {
+private:
+  int height;
 public:
-  virtual int Width(uint c) const { return 10; }
-  virtual int Width(const char *s) const { return 50; }
-  virtual int Height(void) const { return 20; }
+  cDummyFont(int CharHeight) { height = CharHeight; }
+  virtual int Width(uint c) const { return height; }
+  virtual int Width(const char *s) const { return height; }
+  virtual int Height(void) const { return height; }
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
   virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {};
   };
@@ -396,11 +399,8 @@ cFont *cFont::fonts[eDvbFontSize] = { NULL };
 
 void cFont::SetFont(eDvbFont Font, const char *Name, int CharHeight)
 {
-  cFont *f = CreateFont(Name, constrain(CharHeight, MINFONTSIZE, MAXFONTSIZE));
-  if (!f || !f->Height())
-     f = new cDummyFont;
   delete fonts[Font];
-  fonts[Font] = f;
+  fonts[Font] = CreateFont(Name, constrain(CharHeight, MINFONTSIZE, MAXFONTSIZE));
 }
 
 const cFont *cFont::GetFont(eDvbFont Font)
@@ -423,9 +423,10 @@ const cFont *cFont::GetFont(eDvbFont Font)
 cFont *cFont::CreateFont(const char *Name, int CharHeight, int CharWidth)
 {
   cString fn = GetFontFileName(Name);
-  if (*fn)
-     return new cFreetypeFont(fn, CharHeight, CharWidth);
-  return NULL;
+  cFont *f = *fn ? new cFreetypeFont(fn, CharHeight, CharWidth) : NULL;
+  if (!f || !f->Height())
+     f = new cDummyFont(CharHeight);
+  return f;
 }
 
 bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
diff --git a/font.h b/font.h
index 8174ae92c..cd62b4a9f 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 3.0 2013/02/17 13:17:42 kls Exp $
+ * $Id: font.h 3.1 2014/01/07 12:11:55 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -75,7 +75,7 @@ class cFont {
           ///< default width. Name is of the form "Family:Style", for instance
           ///< "Verdana:Bold Italic" or "Times New Roman". See GetAvailableFontNames()
           ///< for how to get a list of all available font names.
-          ///< If the requested font can't be created, NULL is returned.
+          ///< If the requested font can't be created, a dummy font is returned.
           ///< The caller must delete the font when it is no longer needed.
   static bool GetAvailableFontNames(cStringList *FontNames, bool Monospaced = false);
           ///< Queries the font configuration for a list of available font names,
diff --git a/menu.c b/menu.c
index 6c7acfcb4..1001d29ee 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.15 2013/12/27 09:00:24 kls Exp $
+ * $Id: menu.c 3.16 2014/01/25 12:40:28 kls Exp $
  */
 
 #include "menu.h"
@@ -2473,12 +2473,8 @@ void cMenuRecording::Display(void)
 
 eOSState cMenuRecording::ProcessKey(eKeys Key)
 {
-  if (HasSubMenu()) {
-     eOSState state = cOsdMenu::ProcessKey(Key);
-     if (state == osUser1)
-        CloseSubMenu();
-     return state;
-     }
+  if (HasSubMenu())
+     return cOsdMenu::ProcessKey(Key);
   else if (!RefreshRecording())
      return osBack; // the recording has vanished, so close this menu
   switch (int(Key)) {
diff --git a/po/de_DE.po b/po/de_DE.po
index 136855b3f..7d69ce059 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -809,7 +809,7 @@ msgid "Delete recording?"
 msgstr "Aufzeichnung l�schen?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "Aufzeichnung wird geschnitten - trotzdem l�schen?"
+msgstr "Aufzeichnung wird bearbeitet - trotzdem l�schen?"
 
 msgid "Error while deleting recording!"
 msgstr "Fehler beim L�schen der Aufzeichnung!"
@@ -1283,13 +1283,13 @@ msgstr "Weiter"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Schneiden abbrechen"
+msgstr " Bearbeitung abbrechen"
 
 msgid "Stop recording?"
 msgstr "Aufzeichnung beenden?"
 
 msgid "Cancel editing?"
-msgstr "Schneiden abbrechen?"
+msgstr "Bearbeitung abbrechen?"
 
 msgid "No audio available!"
 msgstr "Kein Audio verf�gbar!"
@@ -1371,7 +1371,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Ausschalten unm�glich - Option '-s' fehlt!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Schnitt l�uft - trotzdem ausschalten?"
+msgstr "Bearbeitung l�uft - trotzdem ausschalten?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Aufnahme l�uft - trotzdem ausschalten?"
@@ -1388,7 +1388,7 @@ msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Plugin %s wacht in %ld Min auf, weiter?"
 
 msgid "Editing - restart anyway?"
-msgstr "Schnitt l�uft - trotzdem neu starten?"
+msgstr "Bearbeitung l�uft - trotzdem neu starten?"
 
 msgid "Recording - restart anyway?"
 msgstr "Aufnahme l�uft - trotzdem neu starten?"
@@ -1476,10 +1476,10 @@ msgid "Switching primary DVB..."
 msgstr "Prim�res Interface wird umgeschaltet..."
 
 msgid "Editing process failed!"
-msgstr "Schnitt gescheitert!"
+msgstr "Bearbeitung gescheitert!"
 
 msgid "Editing process finished"
-msgstr "Schnitt beendet"
+msgstr "Bearbeitung beendet"
 
 msgid "Press any key to cancel restart"
 msgstr "Taste dr�cken, um Neustart abzubrechen"
diff --git a/recording.c b/recording.c
index af73563ac..382a8ea22 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.11 2013/12/27 11:06:01 kls Exp $
+ * $Id: recording.c 3.13 2014/01/18 12:54:56 kls Exp $
  */
 
 #include "recording.h"
@@ -1519,22 +1519,24 @@ void cRecordings::DelByName(const char *FileName)
 {
   LOCK_THREAD;
   cRecording *recording = GetByName(FileName);
-  if (recording) {
-     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+  cRecording *dummy = NULL;
+  if (!recording)
+     recording = dummy = new cRecording(FileName); // allows us to use a FileName that is not in the Recordings list
+  cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+  if (!dummy)
      Del(recording, false);
-     char *ext = strrchr(recording->fileName, '.');
-     if (ext) {
-        strncpy(ext, DELEXT, strlen(ext));
-        if (access(recording->FileName(), F_OK) == 0) {
-           recording->deleted = time(NULL);
-           DeletedRecordings.Add(recording);
-           recording = NULL; // to prevent it from being deleted below
-           }
+  char *ext = strrchr(recording->fileName, '.');
+  if (ext) {
+     strncpy(ext, DELEXT, strlen(ext));
+     if (access(recording->FileName(), F_OK) == 0) {
+        recording->deleted = time(NULL);
+        DeletedRecordings.Add(recording);
+        recording = NULL; // to prevent it from being deleted below
         }
-     delete recording;
-     ChangeState();
-     TouchUpdate();
      }
+  delete recording;
+  ChangeState();
+  TouchUpdate();
 }
 
 void cRecordings::UpdateByName(const char *FileName)
@@ -1879,7 +1881,8 @@ bool cRecordingsHandlerEntry::Active(bool &Error)
   // Clean up:
   if (CopierFinishedOk && (Usage() & ruMove) != 0) {
      cRecording Recording(FileNameSrc());
-     Recording.Delete();
+     if (Recording.Delete())
+        Recordings.DelByName(Recording.FileName());
      }
   Recordings.ChangeState();
   Recordings.TouchUpdate();
diff --git a/remux.c b/remux.c
index 3c0778984..fd726017a 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 3.0 2013/03/03 10:37:58 kls Exp $
+ * $Id: remux.c 3.1 2014/01/18 11:27:30 kls Exp $
  */
 
 #include "remux.h"
@@ -1004,6 +1004,7 @@ class cFrameParser {
   bool debug;
   bool newFrame;
   bool independentFrame;
+  int iFrameTemporalReferenceOffset;
 public:
   cFrameParser(void);
   virtual ~cFrameParser() {};
@@ -1017,6 +1018,7 @@ class cFrameParser {
   void SetDebug(bool Debug) { debug = Debug; }
   bool NewFrame(void) { return newFrame; }
   bool IndependentFrame(void) { return independentFrame; }
+  int IFrameTemporalReferenceOffset(void) { return iFrameTemporalReferenceOffset; }
   };
 
 cFrameParser::cFrameParser(void)
@@ -1024,6 +1026,7 @@ cFrameParser::cFrameParser(void)
   debug = true;
   newFrame = false;
   independentFrame = false;
+  iFrameTemporalReferenceOffset = 0;
 }
 
 // --- cAudioParser ----------------------------------------------------------
@@ -1056,6 +1059,7 @@ class cMpeg2Parser : public cFrameParser {
 private:
   uint32_t scanner;
   bool seenIndependentFrame;
+  int lastIFrameTemporalReference;
 public:
   cMpeg2Parser(void);
   virtual int Parse(const uchar *Data, int Length, int Pid);
@@ -1065,6 +1069,7 @@ cMpeg2Parser::cMpeg2Parser(void)
 {
   scanner = EMPTY_SCANNER;
   seenIndependentFrame = false;
+  lastIFrameTemporalReference = -1; // invalid
 }
 
 int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid)
@@ -1089,10 +1094,25 @@ int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid)
             scanner = OldScanner;
             return tsPayload.Used() - TS_SIZE;
             }
+         uchar b1 = tsPayload.GetByte();
+         uchar b2 = tsPayload.GetByte();
+         int TemporalReference = (b1 << 2 ) + ((b2 & 0xC0) >> 6);
+         uchar FrameType = (b2 >> 3) & 0x07;
+         if (tsPayload.Find(0x000001B5)) { // Extension start code
+            if (((tsPayload.GetByte() & 0xF0) >> 4) == 0x08) { // Picture coding extension
+               tsPayload.GetByte();
+               uchar PictureStructure = tsPayload.GetByte() & 0x03;
+               if (PictureStructure == 0x02) // bottom field
+                  break;
+               }
+            }
          newFrame = true;
-         tsPayload.GetByte();
-         uchar FrameType = (tsPayload.GetByte() >> 3) & 0x07;
          independentFrame = FrameType == 1; // I-Frame
+         if (independentFrame) {
+            if (lastIFrameTemporalReference >= 0)
+               iFrameTemporalReferenceOffset = TemporalReference - lastIFrameTemporalReference;
+            lastIFrameTemporalReference = TemporalReference;
+            }
          if (debug) {
             seenIndependentFrame |= independentFrame;
             if (seenIndependentFrame) {
@@ -1457,7 +1477,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        for (int i = 0; i < numPtsValues; i++)
                            ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
                        qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
-                       uint32_t Delta = ptsValues[0] / framesPerPayloadUnit;
+                       uint32_t Delta = ptsValues[0] / (framesPerPayloadUnit +  parser->IFrameTemporalReferenceOffset());
                        // determine frame info:
                        if (isVideo) {
                           if (abs(Delta - 3600) <= 1)
@@ -1475,7 +1495,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                           }
                        else // audio
                           framesPerSecond = double(PTSTICKS) / Delta; // PTS of audio frames is always increasing
-                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d NF = %d\n", Delta, framesPerSecond, framesPerPayloadUnit, numPtsValues + 1);
+                       dbgframes("\nDelta = %d  FPS = %5.2f  FPPU = %d NF = %d TRO = %d\n", Delta, framesPerSecond, framesPerPayloadUnit, numPtsValues + 1, parser->IFrameTemporalReferenceOffset());
                        synced = true;
                        parser->SetDebug(false);
                        }
diff --git a/remux.h b/remux.h
index 8a4b30683..5dd24ebdd 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 3.0 2013/01/20 11:43:59 kls Exp $
+ * $Id: remux.h 3.1 2014/01/16 10:15:50 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -462,7 +462,7 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 // Frame detector:
 
-#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 5
+#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 10
 
 class cFrameParser;
 
diff --git a/sources.conf b/sources.conf
index 09ecdebe3..1a59c2f8f 100644
--- a/sources.conf
+++ b/sources.conf
@@ -19,57 +19,59 @@
 
 # Europe
 
-S3E     Eutelsat 3A & Rascom 1R
-S4E     Eurobird 4A
-S4.8E   Astra 4A
-S7E     Eutelsat W3A
-S9E     Eurobird 9A
-S10E    Eutelsat W2A
-S13E    Hotbird 6/8/9
-S16E    Eutelsat W2M & Eurobird 16A
-S19.2E  Astra 1H/1KR/1L/1M/2C
-S21.6E  Eutelsat W6
-S23.5E  Astra 3A/3B
-S25.5E  Eurobird 2
+S3E     Eutelsat 3A/3D & Rascom 1R
+S4E     Eutelsat 4B
+S4.8E   Astra 4A & SES 5
+S7E     Eutelsat 7A
+S9E     Eutelsat 9A/Ka-Sat 9A
+S10E    Eutelsat 10A
+S13E    Eutelsat Hot Bird 13B/13C/13D
+S16E    Eutelsat 16A/16B
+S17E    Amos 5
+S19.2E  Astra 1KR/1L/1M/2C
+S21.6E  Eutelsat 21B
+S23.5E  Astra 3B
+S25.5E  Eutelsat 25B
 S26E    Badr 4/5/6
-S28.2E  Astra 2A/2B/2D
-S28.5E  Eurobird 1
+S28.2E  Astra 1N/2A/2F
+S28.5E  Eutelsat 28A
 S30.5E  Arabsat 5A
 S31.5E  Astra 1G
-S33E    Eurobird 3 & Intelsat New Dawn
-S36E    Eutelsat W4/W7
-S38E    Paksat 1
+S33E    Eutelsat 33A & Intelsat 28
+S36E    Eutelsat 36A/36B
+S38E    Paksat 1R
 S39E    Hellas Sat 2
-S40E    Express AM1
 S42E    Turksat 2A/3A
 S45E    Intelsat 12
+S46E    Azerspace-1
+S47.5E  Intelsat 10
 S49E    Yamal 202
+S52.5E  Yahsat 1A
 S53E    Express AM22
-S55E    Insat 3E
-S56E    Bonum 1
+S56E    DirecTV 1R
 S57E    NSS 12
 S60E    Intelsat 904
 S62E    Intelsat 902
 S64E    Intelsat 906
 S66E    Intelsat 17
 S68.5E  Intelsat 7/10
-S70.5E  Eutelsat W5
-S72E    Intelsat 709
+S70.5E  Eutelsat 70B
+S72E    Intelsat 22
 
 # Asia
 
 S74E    Insat 3C/4CR
 S75E    ABS 1A
-S76.5E  Apstar 2R
-S78.5E  Thaicom 5
-S80E    Express AM2/MD1
-S83E    Insat 2E/4A
-S85.2E  Intelsat 15
-S87.5E  Chinasat 5A
-S88E    ST 1/2
-S90E    Yamal 201
+S76.5E  Apstar 7
+S78.5E  Thaicom 5/6A
+S80E    Express AM2
+S83E    Insat 4A
+S85.2E  Intelsat 15 & Horizons 2
+S87.5E  ChinaSat 12
+S88E    ST 2
+S90E    Yamal 201/300K
 S91.5E  Measat 3/3A
-S92.2E  Chinasat 9
+S92.2E  ChinaSat 9
 S93.5E  Insat 3A/4B
 S95E    NSS 6
 S96.5E  Express AM33
@@ -77,21 +79,22 @@ S100.5E Asiasat 5
 S103E   Express A2
 S105.5E Asiasat 3S
 S108.2E Telkom 1 & NSS 11 & SES 7
-S110E   N-Sat 110 & BSAT 2C/3A
-S110.5E Chinasat 10
+S110E   N-Sat 110 & BSAT 3A/3C
+S110.5E ChinaSat 10
 S113E   Palapa D & Koreasat 5
-S116E   Koreasat 6
+S115.5E ChinaSat 6B
+S116E   ABS 7 & Koreasat 6
 S118E   Telkom 2
+S119.5E Thaicom 4
 S122.2E Asiasat 4
-S124E   JCSAT 4A
-S125E   Chinasat 6A
-S128E   JCSAT RA
-S132E   Vinasat 1 & JCSAT5A
+S124E   JCSAT 4B
+S125E   ChinaSat 6A
+S128E   JCSAT 3A
+S132E   Vinasat 1/2 & JCSAT 5A
 S134E   Apstar 6
 S138E   Telstar 18
 S140E   Express AM3
 S144E   Superbird C2
-S146E   ABS 5
 S150E   JCSAT 1B
 S152E   Optus D2
 S154E   JCSAT 2A
@@ -99,73 +102,73 @@ S156E   Optus C1/D3
 S160E   Optus D1
 S162E   Superbird B2
 S164E   Optus B3
-S166E   Intelsat 8
-S169E   Intelsat 5
-S172E   GE 23
-S180E   Intelsat 701
+S166E   Intelsat 19
+S169E   Intelsat 8
+S172E   Eutelsat 172A
+S180E   Intelsat 18
 S177W   NSS 9
 
 # Atlantic
 
 S1W     Thor 5/6 & Intelsat 10-02
 S4W     Amos 2/3
-S5W     Atlantic Bird 3
-S7W     Nilesat 101/102/201 & Atlantic Bird 4A
-S8W     Telecom 2D & Atlantic Bird 2
+S5W     Eutelsat 5 West A
+S7W     Nilesat 101/201 & Eutelsat 7 West A
+S8W     Eutelsat 8 West A/C
 S11W    Express AM44
-S12.5W  Atlantic Bird 1
+S12.5W  Eutelsat 12 West A
 S14W    Express A4
 S15W    Telstar 12
 S18W    Intelsat 901
-S20W    NSS 5
-S22W    NSS 7
+S20W    NSS 7
+S22W    SES 4
 S24.5W  Intelsat 905
 S27.5W  Intelsat 907
-S30W    Hispasat 1C/1D/1E
+S30W    Hispasat 1D/1E
 S31.5W  Intelsat 25
 S34.5W  Intelsat 903
 S37.5W  NSS 10 & Telstar 11N
-S40.5W  NSS 806
+S40.5W  SES 6
 S43W    Intelsat 11
 S45W    Intelsat 14
 S50W    Intelsat 1R
-S53W    Intelsat 707
+S53W    Intelsat 23
 S55.5W  Intelsat 805
-S58W    Intelsat 9/16
-S61W    Amazonas 1/2
+S58W    Intelsat 21
+S61W    Amazonas 2/3
 
 # America
 
-S61.5W  Echostar 12/15
+S61.5W  Echostar 16
 S63W    Telstar 14R
 S65W    Star One C1
+S67W    AMC 4
 S70W    Star One C2
 S72W    AMC 6
-S72.5W  DirecTV 1R & Nimiq 5
-S74W    Horizons 2
-S77W    Echostar 1/8
-S79W    AMC 2/5
+S72.7W  Nimiq 5
+S75W    Star One C3
+S77W    QuetzSat 1
 S82W    Nimiq 4
 S83W    AMC 9
 S84W    Brasilsat B4
 S85W    AMC 16
 S85.1W  XM 3
-S87W    AMC 3
+S87W    SES 2
 S89W    Galaxy 28
-S91W    Galaxy 17 & Nimiq 1
-S93W    Galaxy 25
+S91W    Galaxy 17 & Nimiq 6
+S93.1W  Galaxy 25
 S95W    Galaxy 3C
 S97W    Galaxy 19
-S99W    Galaxy 16
-S99.2W  Spaceway 2 & DirecTV 11
+S99.2W  Galaxy 16
 S101W   DirecTV 4S/8 & SES 1
 S103W   AMC 1
 S105W   AMC 15/18
-S107.3W Anik F1/F1R
+S107.3W Anik F1R/G1
 S110W   DirecTV 5 & Echostar 10/11
 S111.1W Anik F2
 S113W   SatMex 6
-S116.8W SatMex 5
+S114.9W SatMex 5
+S116.8W SatMex 8
 S118.8W Anik F3
 S119W   Echostar 14 & DirecTV 7S
 S121W   Echostar 9/Galaxy 23
@@ -174,7 +177,7 @@ S125W   Galaxy 14 & AMC 21
 S127W   Galaxy 13/Horizons 1
 S129W   Ciel 2
 S131W   AMC 11
-S133W   Galaxy 13/15
+S133W   Galaxy 15
 S135W   AMC 10
 S137W   AMC 7
 S139W   AMC 8
diff --git a/status.c b/status.c
index 835a0e16c..10b8ce8a9 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 3.0 2012/03/07 14:17:24 kls Exp $
+ * $Id: status.c 3.1 2014/01/25 10:47:39 kls Exp $
  */
 
 #include "status.h"
@@ -23,6 +23,12 @@ cStatus::~cStatus()
   statusMonitors.Del(this, false);
 }
 
+void cStatus::MsgChannelChange(const cChannel *Channel)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->ChannelChange(Channel);
+}
+
 void cStatus::MsgTimerChange(const cTimer *Timer, eTimerChange Change)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
diff --git a/status.h b/status.h
index 983ee316e..222280acc 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 3.0 2012/03/07 14:16:57 kls Exp $
+ * $Id: status.h 3.1 2014/01/25 10:47:39 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -24,6 +24,9 @@ class cStatus : public cListObject {
   static cList<cStatus> statusMonitors;
 protected:
   // These functions can be implemented by derived classes to receive status information:
+  virtual void ChannelChange(const cChannel *Channel) {}
+               // Indicates a change in the parameters of the given Channel that may
+               // require a retune.
   virtual void TimerChange(const cTimer *Timer, eTimerChange Change) {}
                // Indicates a change in the timer settings.
                // If Change is tcAdd or tcDel, Timer points to the timer that has
@@ -85,6 +88,7 @@ class cStatus : public cListObject {
   cStatus(void);
   virtual ~cStatus();
   // These functions are called whenever the related status information changes:
+  static void MsgChannelChange(const cChannel *Channel);
   static void MsgTimerChange(const cTimer *Timer, eTimerChange Change);
   static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
   static void MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On);
diff --git a/vdr.c b/vdr.c
index a2ede09f3..c03d7776c 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.7 2013/12/25 11:24:26 kls Exp $
+ * $Id: vdr.c 3.9 2014/01/25 10:47:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -60,6 +60,7 @@
 #include "skinsttng.h"
 #include "sourceparams.h"
 #include "sources.h"
+#include "status.h"
 #include "themes.h"
 #include "timers.h"
 #include "tools.h"
@@ -810,6 +811,8 @@ int main(int argc, char *argv[])
 
   if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
      dsyslog("not all devices ready after %d seconds", DEVICEREADYTIMEOUT);
+  if (!CamSlots.WaitForAllCamSlotsReady(DEVICEREADYTIMEOUT))
+     dsyslog("not all CAM slots ready after %d seconds", DEVICEREADYTIMEOUT);
   if (*Setup.InitialChannel) {
      if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
         if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
@@ -922,6 +925,7 @@ int main(int argc, char *argv[])
                               }
                            }
                         }
+                     cStatus::MsgChannelChange(Channel);
                      }
                   }
               Channels.Unlock();

From 797dc7d1a10af286061ae55959c393e02c285a9b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 23 Feb 2014 14:12:00 +0100
Subject: [PATCH 236/307] Version 2.1.5 VDR developer version 2.1.5 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.5.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.4-2.1.5.diff

MD5 checksums:

ce561eef64c13e24e4817f70a6d9d5b0  vdr-2.1.5.tar.bz2
f433e78d90bc414bd9d858ca6e58e539  vdr-2.1.4-2.1.5.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Now checking whether the primary device actually has a decoder before retuning the
  current channel after a change in its parameters. This fixes broken recordings on
  the primary device on "headless" systems.
- Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 100 and introduced counting the number
  of actual video TS packets in cTsPayload in order to be able to record channels that
  sometimes need even more than 10 TS packets for detecting frame borders (reported by
  Oliver Endriss).
- Fixed sorting recordings by time in the Recordings menu if "Setup/OSD/Recording
  directories" is set to "no".
- Fixed clearing non-editable members in the channel editor (thanks to Rolf Ahrenberg).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Further clarified the semantics of cCamSlot::Decrypt().
- Fixed flickering if subtitles are active while the OSD demo is running.
- Fixed numbering frames. Previously they were numbered starting from 1, while it
  is apparently standard to number them from 0. Any existing recordings with editing
  marks (which will now be off by one) can still be cut with all VDR versions from
  1.7.32, because these will automatically adjust editing marks to I-frames.
  Users of stable releases shouldn't notice any problems.
- Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
- Fixed some compiler warnings with Clang 3.4.1 (reported by Paul Menzel).
- Added LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler warning with
  Clang 3.4.1 (suggested by Tony Houghten).
- Replaced the NULL pointer assignment in ~cReceiver() to force a segfault with
  a call to abort() (suggested by Tony Houghten).
- Fixed learning keyboard remote control codes (thanks to Lars Hanisch).
- Improved PAT/PMT scanning to speed up initial tuning to encrypted channels on
  transponders with many PAT entries (reported by Mariusz Bialonczyk).
- Fixed the replay progress display for very long recordings.
- Fixed detecting broken video data streams when recording.
- Fixed handling frame detection buffer length (reported by Eike Sauer).
---
 CONTRIBUTORS                          |  15 +++
 HISTORY                               |  33 +++++++
 PLUGINS/src/dvbhddevice/dvbhddevice.c |   2 +-
 PLUGINS/src/dvbhddevice/hdffosd.c     |   2 -
 PLUGINS/src/osddemo/HISTORY           |   5 +
 PLUGINS/src/osddemo/osddemo.c         |  10 +-
 PLUGINS/src/pictures/player.c         |   4 +-
 ci.c                                  |   6 +-
 ci.h                                  |  12 ++-
 config.h                              |  10 +-
 device.c                              |   3 +-
 dvbspu.h                              |   3 +-
 dvbsubtitle.c                         |   4 +-
 eit.c                                 |   4 +-
 libsi/descriptor.h                    |   4 +-
 libsi/si.h                            |   5 +-
 menu.c                                |  10 +-
 pat.c                                 | 133 +++++++++++++++-----------
 pat.h                                 |  20 ++--
 po/et_EE.po                           |  62 ++++++------
 receiver.c                            |   6 +-
 recorder.c                            |   4 +-
 recording.c                           |  34 ++++---
 remote.c                              |   4 +-
 remux.c                               |  60 +++++++++---
 remux.h                               |  14 ++-
 sdt.c                                 |   6 +-
 skins.h                               |   4 +-
 vdr.c                                 |   4 +-
 29 files changed, 307 insertions(+), 176 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2fec0012b..5f2087c77 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -707,6 +707,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for suggesting to make all bonded devices (except for the master) turn off their LNB
  power completely to avoid problems when receiving vertically polarized transponders
  for suggesting to eliminate MAXDVBDEVICES
+ for reporting that there are channels that need even more than 10 TS packets in order
+ to detect the frame type
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1180,6 +1182,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for suggesting to prompt the user for confirmation before overwriting an already
  existing edited version of a recording
  for adding code for parsing LCN and AVC descriptors to libsi
+ for fixing clearing non-editable members in the channel editor
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2885,6 +2888,7 @@ Lars Hanisch <dvb@flensrocker.de>
  for making the Recordings menu able to be called with a cRecordingFilter, which allows
  the caller to have it display only a certain subset of the recordings
  for adding handling UTF-8 'umlaut' characters to cKbdRemote
+ for fixing learning keyboard remote control codes
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -2904,6 +2908,7 @@ Paul Menzel <paulepanter@users.sourceforge.net>
  for reporting a possible memory leak in the "pictures" plugin
  for removing an obsolete local variable in dvbsdffosd.c
  for reporting a possible NULL pointer dereference in osddemo.c
+ for reporting some compiler warnings with Clang 3.4.1
 
 Radek Stastny <dedkus@gmail.com>
  for translating OSD texts to the Czech language
@@ -2923,6 +2928,7 @@ Christopher Reimer <reimer.christopher@freenet.de>
  for suggesting to make sure that plugins include the VDR header files from the actual
  VDR source directory when doing "make plugins"
  for reverting the change from version 1.5.7 that made all logging go to LOG_ERR
+ for reporting a possible crash in the OSD demo
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -3248,6 +3254,7 @@ Thomas Reufer <thomas@reufer.ch>
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
  frame borders
+ for reporting a problem in handling the frame detection buffer length
 
 Christian Paulick <cpaulick@xeatre.tv>
  for reporting a problem with frame detection in MPEG-2 streams that have "bottom fields"
@@ -3256,3 +3263,11 @@ Christian Paulick <cpaulick@xeatre.tv>
 Mariusz Bialonczyk <manio@skyboo.net>
  for reporting a problem with live streaming of encrypted channels, when there are no
  CA descriptors, yet, on initial tuning
+ for reporting that acquiring the CA descriptors takes way too long on transponders
+ with many PAT entries, and his help in debugging this
+
+Tony Houghton <h@realh.co.uk>
+ for suggesting to add LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler
+ warning with Clang 3.4.1
+ for suggesting to replace the NULL pointer assignment in ~cReceiver() to force a
+ segfault with a call to abort()
diff --git a/HISTORY b/HISTORY
index 9e7b737c7..09ad53bd4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8169,3 +8169,36 @@ Video Disk Recorder Revision History
   by Mariusz Bialonczyk).
 - Fixed a superfluous call to the skin's SetRecording() function after renaming a
   recording (reported by Christoph Haubrich).
+
+2014-02-23: Version 2.1.5
+
+- Now checking whether the primary device actually has a decoder before retuning the
+  current channel after a change in its parameters. This fixes broken recordings on
+  the primary device on "headless" systems.
+- Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 100 and introduced counting the number
+  of actual video TS packets in cTsPayload in order to be able to record channels that
+  sometimes need even more than 10 TS packets for detecting frame borders (reported by
+  Oliver Endriss).
+- Fixed sorting recordings by time in the Recordings menu if "Setup/OSD/Recording
+  directories" is set to "no".
+- Fixed clearing non-editable members in the channel editor (thanks to Rolf Ahrenberg).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Further clarified the semantics of cCamSlot::Decrypt().
+- Fixed flickering if subtitles are active while the OSD demo is running.
+- Fixed numbering frames. Previously they were numbered starting from 1, while it
+  is apparently standard to number them from 0. Any existing recordings with editing
+  marks (which will now be off by one) can still be cut with all VDR versions from
+  1.7.32, because these will automatically adjust editing marks to I-frames.
+  Users of stable releases shouldn't notice any problems.
+- Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
+- Fixed some compiler warnings with Clang 3.4.1 (reported by Paul Menzel).
+- Added LinkageTypePremiere to libsi/si.h and eit.c to avoid a compiler warning with
+  Clang 3.4.1 (suggested by Tony Houghten).
+- Replaced the NULL pointer assignment in ~cReceiver() to force a segfault with
+  a call to abort() (suggested by Tony Houghten).
+- Fixed learning keyboard remote control codes (thanks to Lars Hanisch).
+- Improved PAT/PMT scanning to speed up initial tuning to encrypted channels on
+  transponders with many PAT entries (reported by Mariusz Bialonczyk).
+- Fixed the replay progress display for very long recordings.
+- Fixed detecting broken video data streams when recording.
+- Fixed handling frame detection buffer length (reported by Eike Sauer).
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 653d7ad47..b00f53a23 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.4";
+static const char *VERSION        = "2.1.5";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 4a6eaec10..5ee2db785 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -42,7 +42,6 @@ class cHdffOsd : public cOsd
     tFont mFonts[MAX_NUM_FONTS];
     uint32_t mBitmapPalette;
     uint32_t mBitmapColors[256];
-    uint32_t mBitmapNumColors;
 
     bool mSupportsUtf8Text;
 
@@ -555,7 +554,6 @@ class cHdffOsdRaw : public cOsd
     uint32_t mDisplay;
     uint32_t mBitmapPalette;
     uint32_t mBitmapColors[256];
-    uint32_t mBitmapNumColors;
 
 protected:
     virtual void SetActive(bool On);
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 9497f4079..4c3bfe64b 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -63,3 +63,8 @@ VDR Plugin 'osddemo' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2014-02-06: Version 2.1.2
+
+- Fixed flickering if subtitles are active while the OSD demo is running.
+- Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 25fbb416d..0a826b77c 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 3.1 2014/01/05 10:56:18 kls Exp $
+ * $Id: osddemo.c 3.3 2014/02/06 11:51:53 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.1.2";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -119,7 +119,7 @@ cLineGame::~cLineGame()
 
 void cLineGame::Show(void)
 {
-  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop(), 50);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
   if (osd) {
      int x1 = cOsd::OsdWidth() - 1;
      int y1 = cOsd::OsdHeight() - 1;
@@ -480,6 +480,8 @@ void cTrueColorDemo::Action(void)
         if (Delta < FrameTime)
            cCondWait::SleepMs(FrameTime - Delta);
         }
+  destroyablePixmap = NULL;
+  toggleablePixmap = NULL;
   delete OsdFont;
   delete SmlFont;
   delete LrgFont;
@@ -496,7 +498,7 @@ bool cTrueColorDemo::SetArea(void)
 
 void cTrueColorDemo::Show(void)
 {
-  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop(), 50);
+  osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop());
   if (osd) {
      if (SetArea()) {
         osd->DrawRectangle(0, 0, osd->Width() - 1, osd->Height() - 1, clrGray50);
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index f2e4e5feb..d2dbd7b85 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 3.0 2012/04/28 11:58:15 kls Exp $
+ * $Id: player.c 3.1 2014/02/08 12:48:12 kls Exp $
  */
 
 #include "player.h"
@@ -211,7 +211,7 @@ cString cPictureControl::GetHeader(void)
 
 eOSState cPictureControl::ProcessKey(eKeys Key)
 {
-  switch (Key) {
+  switch (int(Key)) {
     case kUp:
     case kPlay:   slideShowDelay.Set();
                   slideShow = true;
diff --git a/ci.c b/ci.c
index b0dc3586d..1a171b140 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.10 2014/01/22 09:46:38 kls Exp $
+ * $Id: ci.c 3.11 2014/02/08 12:25:55 kls Exp $
  */
 
 #include "ci.h"
@@ -864,7 +864,7 @@ void cCiDateTime::SendDateTime(void)
 #pragma pack(1)
      struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; };
 #pragma pack()
-     tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : short(htons(tm_loc.tm_gmtoff / 60)) };
+     tTime T = { .mjd = htons(MJD), .h = DEC2BCD(tm_gmt.tm_hour), .m = DEC2BCD(tm_gmt.tm_min), .s = DEC2BCD(tm_gmt.tm_sec), .offset = short(htons(tm_loc.tm_gmtoff / 60)) };
      bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
      DumpTPDUDataTransfer &= DumpDateTime;
      if (DumpDateTime)
@@ -1004,7 +1004,7 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
                  case DCC_SET_MMI_MODE:
                       if (l == 2 && *++d == MM_HIGH_LEVEL) {
                          struct tDisplayReply { uint8_t id; uint8_t mode; };
-                         tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
+                         tDisplayReply dr = { .id = DRI_MMI_MODE_ACK, .mode = MM_HIGH_LEVEL };
                          dbgprotocol("Slot %d: ==> Display Reply (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
                          SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);
                          }
diff --git a/ci.h b/ci.h
index 159552cff..ac029c267 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 3.6 2014/01/20 12:01:01 kls Exp $
+ * $Id: ci.h 3.7 2014/01/31 09:21:21 kls Exp $
  */
 
 #ifndef __CI_H
@@ -250,10 +250,12 @@ class cCamSlot : public cListObject {
        ///< 2. If the CAM works directly on Data and decrypts the TS "in place" it
        ///< shall decrypt at least the very first TS packet in Data, set Count to
        ///< TS_SIZE and return Data. It may decrypt as many TS packets in Data as it
-       ///< wants, but it must decrypt at least the very first TS packet. Only this
-       ///< very first TS packet will be further processed after the call to this
-       ///< function. The next call will be done with Data pointing to the TS packet
-       ///< immediately following the previous one.
+       ///< wants, but it must decrypt at least the very first TS packet (if at all
+       ///< possible - if, for whatever reasons, it can't decrypt the very first
+       ///< packet, it must return it regardless). Only this very first TS packet will
+       ///< be further processed after the call to this function. The next call will
+       ///< be done with Data pointing to the TS packet immediately following the
+       ///< previous one.
        ///< 3. If the CAM needs to copy the data into a buffer of its own, and/or send
        ///< the data to some file handle for processing and later retrieval, it shall
        ///< set Count to the number of bytes it has read from Data and return a pointer
diff --git a/config.h b/config.h
index 9ada33395..1d2a8a97c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.6 2014/01/07 09:03:29 kls Exp $
+ * $Id: config.h 3.7 2014/01/26 12:31:58 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.4"
-#define VDRVERSNUM   20104  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.5"
+#define VDRVERSNUM   20105  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.4"
-#define APIVERSNUM   20104  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.5"
+#define APIVERSNUM   20105  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 9da5e7ff2..901fa2b31 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.11 2014/01/21 11:12:01 kls Exp $
+ * $Id: device.c 3.12 2014/02/18 13:12:39 kls Exp $
  */
 
 #include "device.h"
@@ -794,6 +794,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (SetChannelDevice(Channel, LiveView)) {
         // Start section handling:
         if (sectionHandler) {
+           patFilter->Trigger(Channel->Sid());
            sectionHandler->SetChannel(Channel);
            sectionHandler->SetStatus(true);
            }
diff --git a/dvbspu.h b/dvbspu.h
index 9fa3947bb..dadf7345f 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 3.0 2013/01/20 10:15:47 kls Exp $
+ * $Id: dvbspu.h 3.1 2014/02/08 12:27:34 kls Exp $
  */
 
 #ifndef __DVBSPU_H
@@ -101,7 +101,6 @@ class cDvbSpuDecoder:public cSpuDecoder {
     uint8_t *spu;
     uint32_t spupts;
     bool clean;
-    bool ready;
     bool restricted_osd;
 
     enum spFlag { spNONE, spHIDE, spSHOW, spMENU };
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index f07267f13..88c594c22 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 3.4 2013/09/07 10:39:46 kls Exp $
+ * $Id: dvbsubtitle.c 3.5 2014/02/08 12:29:13 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -34,7 +34,6 @@ static bool DebugDisplay   = DebugVerbose || DebugNormal;
 static bool DebugPages     = DebugVerbose || DebugNormal;
 static bool DebugRegions   = DebugVerbose || DebugNormal;
 static bool DebugObjects   = DebugVerbose || DebugNormal;
-static bool DebugBitmaps   = DebugVerbose || DebugNormal;
 static bool DebugConverter = DebugVerbose;
 static bool DebugSegments  = DebugVerbose;
 static bool DebugPixel     = DebugVerbose;
@@ -45,7 +44,6 @@ static bool DebugOutput    = DebugVerbose;
 #define dbgpages(a...)     if (DebugPages)     SD.WriteHtml(a)
 #define dbgregions(a...)   if (DebugRegions)   SD.WriteHtml(a)
 #define dbgobjects(a...)   if (DebugObjects)   SD.WriteHtml(a)
-#define dbgbitmaps(a...)   if (DebugBitmaps)   SD.WriteHtml(a)
 #define dbgconverter(a...) if (DebugConverter) SD.WriteHtml(a)
 #define dbgsegments(a...)  if (DebugSegments)  SD.WriteHtml(a)
 #define dbgpixel(a...)     if (DebugPixel)     SD.WriteHtml(a)
diff --git a/eit.c b/eit.c
index d5ca7dad2..30c017b5c 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 3.3 2013/11/03 13:55:00 kls Exp $
+ * $Id: eit.c 3.5 2014/02/08 14:20:27 kls Exp $
  */
 
 #include "eit.h"
@@ -220,7 +220,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
             case SI::LinkageDescriptorTag: {
                  SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d;
                  tChannelID linkID(Source, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
-                 if (ld->getLinkageType() == 0xB0) { // Premiere World
+                 if (ld->getLinkageType() == SI::LinkageTypePremiere) { // Premiere World
                     bool hit = StartTime <= Now && Now < StartTime + Duration;
                     if (hit) {
                        char linkName[ld->privateData.getLength() + 1];
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index f931871a1..30c9f6b16 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 3.1 2013/10/30 10:16:18 kls Exp $
+ *   $Id: descriptor.h 3.2 2014/02/08 12:44:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -489,8 +489,6 @@ class ISO639LanguageDescriptor : public Descriptor {
    StructureLoop<Language> languageLoop;
 protected:
    virtual void Parse();
-private:
-   const descr_iso_639_language *s;
 };
 
 class PDCDescriptor : public Descriptor {
diff --git a/libsi/si.h b/libsi/si.h
index 80750648f..1e65111f9 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 3.1 2013/10/30 10:16:18 kls Exp $
+ *   $Id: si.h 3.2 2014/02/08 14:11:32 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -210,7 +210,8 @@ enum LinkageType { LinkageTypeInformationService = 0x01,
                    LinkageTypeRCSMap = 0x07,
                    LinkageTypeMobileHandover = 0x08,
                    LinkageTypeSystemSoftwareUpdateService = 0x09,
-                   LinkageTypeTSContainingSsuBatOrNit = 0x0A
+                   LinkageTypeTSContainingSsuBatOrNit = 0x0A,
+                   LinkageTypePremiere = 0xB0
                  };
 
 enum AudioType { AudioTypeUndefined = 0x00,
diff --git a/menu.c b/menu.c
index 1001d29ee..683a47798 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.16 2014/01/25 12:40:28 kls Exp $
+ * $Id: menu.c 3.19 2014/02/08 12:36:12 kls Exp $
  */
 
 #include "menu.h"
@@ -181,9 +181,13 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
      strn0cpy(name, data.name, sizeof(name));
      if (New) {
         channel = NULL;
+        // clear non-editable members:
         data.nid = 0;
         data.tid = 0;
         data.rid = 0;
+        *data.shortName  = 0;
+        *data.provider   = 0;
+        *data.portalName = 0;
         }
      }
   Setup();
@@ -979,7 +983,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                        if (!*data.file)
                           strcpy(data.file, data.Channel()->ShortName(true));
                        if (timer) {
-                          if (memcmp(timer, &data, sizeof(data)) != 0)
+                          if (memcmp((void *)timer, &data, sizeof(data)) != 0)
                              *timer = data;
                           if (addIfConfirmed)
                              Timers.Add(timer);
@@ -3024,7 +3028,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         ModifiedAppearance = true;
      if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
         ModifiedAppearance = true;
-     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst)
+     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst || data.RecordingDirs != Setup.RecordingDirs)
         Recordings.ClearSortNames();
      }
 
diff --git a/pat.c b/pat.c
index 5246e0742..c325a00cd 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 3.2 2014/01/04 11:17:24 kls Exp $
+ * $Id: pat.c 3.4 2014/02/19 08:57:43 kls Exp $
  */
 
 #include "pat.h"
@@ -12,9 +12,8 @@
 #include "channels.h"
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
-#include "thread.h"
 
-#define PMT_SCAN_TIMEOUT  10 // seconds
+#define PMT_SCAN_TIMEOUT  1000 // ms
 
 // --- cCaDescriptor ---------------------------------------------------------
 
@@ -273,94 +272,115 @@ int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds
 
 // --- cPatFilter ------------------------------------------------------------
 
+//#define DEBUG_PAT_PMT
+#ifdef DEBUG_PAT_PMT
+#define DBGLOG(a...) { cString s = cString::sprintf(a); fprintf(stderr, "%s\n", *s); dsyslog("%s", *s); }
+#else
+#define DBGLOG(a...)
+#endif
+
 cPatFilter::cPatFilter(void)
 {
-  pmtIndex = 0;
-  pmtPid = 0;
-  pmtSid = 0;
-  lastPmtScan = 0;
-  numPmtEntries = 0;
+  Trigger(0);
   Set(0x00, 0x00);  // PAT
 }
 
 void cPatFilter::SetStatus(bool On)
 {
+  cMutexLock MutexLock(&mutex);
+  DBGLOG("PAT filter set status %d", On);
   cFilter::SetStatus(On);
-  pmtIndex = 0;
-  pmtPid = 0;
-  pmtSid = 0;
-  lastPmtScan = 0;
-  numPmtEntries = 0;
+  Trigger();
 }
 
-void cPatFilter::Trigger(void)
+void cPatFilter::Trigger(int Sid)
 {
+  cMutexLock MutexLock(&mutex);
+  patVersion = -1;
+  pmtIndex = -1;
   numPmtEntries = 0;
+  if (Sid >= 0) {
+     sid = Sid;
+     DBGLOG("PAT filter trigger SID %d", Sid);
+     }
 }
 
-bool cPatFilter::PmtVersionChanged(int PmtPid, int Sid, int Version)
+bool cPatFilter::PmtVersionChanged(int PmtPid, int Sid, int Version, bool SetNewVersion)
 {
-  uint64_t v = Version;
-  v <<= 32;
-  uint64_t id = (PmtPid | (Sid << 16)) & 0x00000000FFFFFFFFLL;
+  int Id = MakePmtId(PmtPid, Sid);
   for (int i = 0; i < numPmtEntries; i++) {
-      if ((pmtVersion[i] & 0x00000000FFFFFFFFLL) == id) {
-         bool Changed = (pmtVersion[i] & 0x000000FF00000000LL) != v;
-         if (Changed)
-            pmtVersion[i] = id | v;
-         return Changed;
+      if (pmtId[i] == Id) {
+         if (pmtVersion[i] != Version) {
+            if (SetNewVersion)
+               pmtVersion[i] = Version;
+            else
+               DBGLOG("PMT %d  %2d %5d %2d -> %2d", Transponder(), i, PmtPid, pmtVersion[i], Version);
+            return true;
+            }
+         break;
          }
       }
-  if (numPmtEntries < MAXPMTENTRIES)
-     pmtVersion[numPmtEntries++] = id | v;
-  return true;
+  return false;
+}
+
+void cPatFilter::SwitchToNextPmtPid(void)
+{
+  if (pmtIndex >= 0) {
+     Del(GetPmtPid(pmtIndex), SI::TableIdPMT);
+     pmtIndex = (pmtIndex + 1) % numPmtEntries;
+     Add(GetPmtPid(pmtIndex), SI::TableIdPMT);
+     }
 }
 
 void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
+  cMutexLock MutexLock(&mutex);
   if (Pid == 0x00) {
-     if (Tid == 0x00) {
-        if (pmtPid && time(NULL) - lastPmtScan > PMT_SCAN_TIMEOUT) {
-           Del(pmtPid, 0x02);
-           pmtPid = 0;
-           pmtIndex++;
-           lastPmtScan = time(NULL);
-           }
-        if (!pmtPid) {
-           SI::PAT pat(Data, false);
-           if (!pat.CheckCRCAndParse())
-              return;
+     if (Tid == SI::TableIdPAT) {
+        SI::PAT pat(Data, false);
+        if (!pat.CheckCRCAndParse())
+           return;
+        if (pat.getVersionNumber() != patVersion) {
+           DBGLOG("PAT %d %d -> %d", Transponder(), patVersion, pat.getVersionNumber());
+           if (pmtIndex >= 0) {
+              Del(GetPmtPid(pmtIndex), SI::TableIdPMT);
+              pmtIndex = -1;
+              }
+           numPmtEntries = 0;
            SI::PAT::Association assoc;
-           int Index = 0;
            for (SI::Loop::Iterator it; pat.associationLoop.getNext(assoc, it); ) {
-               if (!assoc.isNITPid()) {
-                  if (Index++ >= pmtIndex && Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId())) {
-                     pmtPid = assoc.getPid();
-                     pmtSid = assoc.getServiceId();
-                     Add(pmtPid, 0x02);
-                     break;
+               if (!assoc.isNITPid() && numPmtEntries < MAXPMTENTRIES) {
+                  DBGLOG("    PMT pid %2d %5d  SID %5d", numPmtEntries, assoc.getPid(), assoc.getServiceId());
+                  pmtId[numPmtEntries] = MakePmtId(assoc.getPid(), assoc.getServiceId());
+                  pmtVersion[numPmtEntries] = -1;
+                  if (sid == assoc.getServiceId()) {
+                     pmtIndex = numPmtEntries;
+                     DBGLOG("sid = %d pmtIndex = %d", sid, pmtIndex);
                      }
+                  numPmtEntries++;
                   }
                }
-           if (!pmtPid)
+           if (numPmtEntries > 0 && pmtIndex < 0)
               pmtIndex = 0;
+           Add(GetPmtPid(pmtIndex), SI::TableIdPMT);
+           patVersion = pat.getVersionNumber();
+           timer.Set(PMT_SCAN_TIMEOUT);
            }
         }
      }
-  else if (Pid == pmtPid && Tid == SI::TableIdPMT && Source() && Transponder()) {
+  else if (Tid == SI::TableIdPMT && Source() && Transponder()) {
+     timer.Set(PMT_SCAN_TIMEOUT);
      SI::PMT pmt(Data, false);
      if (!pmt.CheckCRCAndParse())
         return;
-     if (pmt.getServiceId() != pmtSid)
-        return; // skip broken PMT records
-     if (!PmtVersionChanged(pmtPid, pmt.getTableIdExtension(), pmt.getVersionNumber())) {
-        lastPmtScan = 0; // this triggers the next scan
+     if (!PmtVersionChanged(Pid, pmt.getTableIdExtension(), pmt.getVersionNumber())) {
+        SwitchToNextPmtPid();
         return;
         }
-     if (!Channels.Lock(true, 10)) {
-        numPmtEntries = 0; // to make sure we try again
+     if (!Channels.Lock(true, 10))
         return;
-        }
+     PmtVersionChanged(Pid, pmt.getTableIdExtension(), pmt.getVersionNumber(), true);
+     SwitchToNextPmtPid();
      cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), pmt.getServiceId());
      if (Channel) {
         SI::CaDescriptor *d;
@@ -596,7 +616,12 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
            }
         Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
         }
-     lastPmtScan = 0; // this triggers the next scan
      Channels.Unlock();
      }
+  if (timer.TimedOut()) {
+     if (pmtIndex >= 0)
+        DBGLOG("PMT timeout %d", pmtIndex);
+     SwitchToNextPmtPid();
+     timer.Set(PMT_SCAN_TIMEOUT);
+     }
 }
diff --git a/pat.h b/pat.h
index 7f04575eb..993a9b968 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 3.2 2014/01/04 11:16:48 kls Exp $
+ * $Id: pat.h 3.3 2014/02/18 11:22:34 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -12,24 +12,30 @@
 
 #include <stdint.h>
 #include "filter.h"
+#include "thread.h"
 
 #define MAXPMTENTRIES 64
 
 class cPatFilter : public cFilter {
 private:
-  time_t lastPmtScan;
+  cMutex mutex;
+  cTimeMs timer;
+  int patVersion;
   int pmtIndex;
-  int pmtPid;
-  int pmtSid;
-  uint64_t pmtVersion[MAXPMTENTRIES];
+  int pmtId[MAXPMTENTRIES];
+  int pmtVersion[MAXPMTENTRIES];
   int numPmtEntries;
-  bool PmtVersionChanged(int PmtPid, int Sid, int Version);
+  int sid;
+  int GetPmtPid(int Index) { return pmtId[Index] & 0x0000FFFF; }
+  int MakePmtId(int PmtPid, int Sid) { return PmtPid | (Sid << 16); }
+  bool PmtVersionChanged(int PmtPid, int Sid, int Version, bool SetNewVersion = false);
+  void SwitchToNextPmtPid(void);
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
   cPatFilter(void);
   virtual void SetStatus(bool On);
-  void Trigger(void);
+  void Trigger(int Sid = -1);
   };
 
 int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
diff --git a/po/et_EE.po b/po/et_EE.po
index d0597f359..e48bfa1f4 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -697,14 +697,14 @@ msgid "Button$Now"
 msgstr "Hetkel"
 
 msgid "Button$Schedule"
-msgstr "Ajakava"
+msgstr "Kava"
 
 msgid "Can't switch channel!"
 msgstr "Kanali vahetus ei ole võimalik!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Ajakava - %s"
+msgstr "Kava - %s"
 
 #, c-format
 msgid "This event - %s"
@@ -724,71 +724,71 @@ msgid "CAM not responding!"
 msgstr "CAM ei vasta"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Muuda teed"
 
 msgid "Folder"
-msgstr ""
+msgstr "Kaust"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Kaust on juba kasutusel - muutmine ei ole võimalik!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Teisaldada kaust mis sisaldab %d salvestust?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Kausta teisaldamise viga!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Salvestuse redigeerimine"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Salvestus hetkel kasutusel - muutmine ei ole võimalik!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Lõikamise tühistamine"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Lõikamise peatamine"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Teisaldamise tühistamine"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Teisaldamise peatamine"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Kopeerimise tühistamine"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Kopeerimise peatamine"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Lõika"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Markerite kustutamine"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Salvestus kadunud!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Redigeeritud versioon juba olemas - kirjutada üle?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Salvestuse lõikamiseks lisamine ebaõnnestus!"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Kustutada selle salvestuse markerid?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Markerite kustutamine ebaõnnestus!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Prioriteedi/eluea muutmine ebaõnnestus!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Kausta/nime muutmine ebaõnnestus!"
 
 msgid "Recording info"
 msgstr "Salvestuse info"
@@ -1283,13 +1283,13 @@ msgstr "Jätkata"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Katkestada redigeerimine"
+msgstr " Tühistada töötlemine"
 
 msgid "Stop recording?"
 msgstr "Lõpetada salvestamine?"
 
 msgid "Cancel editing?"
-msgstr "Tühistada redigeermine?"
+msgstr "Tühistada töötlemine?"
 
 msgid "No audio available!"
 msgstr "Audio kättesaamatu!"
@@ -1371,7 +1371,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Väljalülitamine ebaõnnestus - '-s' parameeter puudub!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Redigeerimine aktiive - lülitada välja?"
+msgstr "Töötlemine aktiive - lülitada välja?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Salvestamine aktiivne - lülitada välja?"
@@ -1388,7 +1388,7 @@ msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Laiendusmoodul %s ärkab %ld minuti pärast, jätkata?"
 
 msgid "Editing - restart anyway?"
-msgstr "Redigeerimine aktiivne - restart?"
+msgstr "Töötlemine aktiivne - restart?"
 
 msgid "Recording - restart anyway?"
 msgstr "Salvestamine aktiivne - restart?"
@@ -1423,7 +1423,7 @@ msgstr "ESITUS"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr "Antenni pööramine positsioonile %.1f..."
+msgstr "Liikumine positsioonile %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Panels"
@@ -1476,10 +1476,10 @@ msgid "Switching primary DVB..."
 msgstr "Esmase DVB seadme ümberlülitus..."
 
 msgid "Editing process failed!"
-msgstr "Redigeerimine ebaõnnestus!"
+msgstr "Töötlemine ebaõnnestus!"
 
 msgid "Editing process finished"
-msgstr "Redigeerimine lõpetatud"
+msgstr "Töötlemine lõpetatud"
 
 msgid "Press any key to cancel restart"
 msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
diff --git a/receiver.c b/receiver.c
index de5d0aea2..a38110038 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 3.1 2014/01/01 12:03:00 kls Exp $
+ * $Id: receiver.c 3.2 2014/02/08 15:57:30 kls Exp $
  */
 
 #include "receiver.h"
@@ -22,10 +22,10 @@ cReceiver::cReceiver(const cChannel *Channel, int Priority)
 cReceiver::~cReceiver()
 {
   if (device) {
-     const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
+     const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will abort now!";
      esyslog("%s", msg);
      fprintf(stderr, "%s\n", msg);
-     *(char *)0 = 0; // cause a segfault
+     abort();
      }
 }
 
diff --git a/recorder.c b/recorder.c
index 38a4ed1e3..3d6b80639 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 3.2 2014/01/01 12:46:37 kls Exp $
+ * $Id: recorder.c 3.3 2014/02/21 09:19:52 kls Exp $
  */
 
 #include "recorder.h"
@@ -155,13 +155,13 @@ void cRecorder::Action(void)
                              recordFile->Write(pmt, TS_SIZE);
                              fileSize += TS_SIZE;
                              }
+                       t.Set(MAXBROKENTIMEOUT);
                        }
                     if (recordFile->Write(b, Count) < 0) {
                        LOG_ERROR_STR(fileName->Name());
                        break;
                        }
                     fileSize += Count;
-                    t.Set(MAXBROKENTIMEOUT);
                     }
                  }
               ringBuffer->Del(Count);
diff --git a/recording.c b/recording.c
index 382a8ea22..5da54940b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.13 2014/01/18 12:54:56 kls Exp $
+ * $Id: recording.c 3.16 2014/02/08 11:16:02 kls Exp $
  */
 
 #include "recording.h"
@@ -969,14 +969,22 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = strdup(FileName() + strlen(cVideoDirectory::Name()));
-     if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
-        s = StripEpisodeName(s, RecordingsSortMode != rsmName);
-     strreplace(s, '/', '0'); // some locales ignore '/' when sorting
-     int l = strxfrm(NULL, s, 0) + 1;
-     *sb = MALLOC(char, l);
-     strxfrm(*sb, s, l);
-     free(s);
+     if (RecordingsSortMode == rsmTime && !Setup.RecordingDirs) {
+        char buf[32];
+        struct tm tm_r;
+        strftime(buf, sizeof(buf), "%Y%m%d%H%I", localtime_r(&start, &tm_r));
+        *sb = strdup(buf);
+        }
+     else {
+        char *s = strdup(FileName() + strlen(cVideoDirectory::Name()));
+        if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
+           s = StripEpisodeName(s, RecordingsSortMode != rsmName);
+        strreplace(s, '/', '0'); // some locales ignore '/' when sorting
+        int l = strxfrm(NULL, s, 0) + 1;
+        *sb = MALLOC(char, l);
+        strxfrm(*sb, s, l);
+        free(s);
+        }
      }
   return *sb;
 }
@@ -2915,7 +2923,7 @@ cString IndexToHMSF(int Index, bool WithFrame, double FramesPerSecond)
      Sign = "-";
      }
   double Seconds;
-  int f = int(modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond + 1);
+  int f = int(modf((Index + 0.5) / FramesPerSecond, &Seconds) * FramesPerSecond);
   int s = int(Seconds);
   int m = s / 60 % 60;
   int h = s / 3600;
@@ -2925,12 +2933,12 @@ cString IndexToHMSF(int Index, bool WithFrame, double FramesPerSecond)
 
 int HMSFToIndex(const char *HMSF, double FramesPerSecond)
 {
-  int h, m, s, f = 1;
+  int h, m, s, f = 0;
   int n = sscanf(HMSF, "%d:%d:%d.%d", &h, &m, &s, &f);
   if (n == 1)
-     return h - 1; // plain frame number
+     return h; // plain frame number
   if (n >= 3)
-     return int(round((h * 3600 + m * 60 + s) * FramesPerSecond)) + f - 1;
+     return int(round((h * 3600 + m * 60 + s) * FramesPerSecond)) + f;
   return 0;
 }
 
diff --git a/remote.c b/remote.c
index f93492431..5cb2ccb80 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 3.1 2013/12/25 12:45:43 kls Exp $
+ * $Id: remote.c 3.2 2014/02/15 12:40:39 kls Exp $
  */
 
 #include "remote.h"
@@ -298,7 +298,7 @@ int cKbdRemote::MapCodeToFunc(uint64_t Code)
 
 void cKbdRemote::PutKey(uint64_t Code, bool Repeat, bool Release)
 {
-  if (rawMode || !Put(Code, Repeat, Release)) {
+  if (rawMode || (!Put(Code, Repeat, Release) && !IsLearning())) {
      if (int func = MapCodeToFunc(Code))
         Put(KBDKEY(func), Repeat, Release);
      }
diff --git a/remux.c b/remux.c
index fd726017a..44eec8ced 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 3.1 2014/01/18 11:27:30 kls Exp $
+ * $Id: remux.c 3.3 2014/02/21 11:51:55 kls Exp $
  */
 
 #include "remux.h"
@@ -23,6 +23,10 @@ static bool DebugFrames = false;
 #define dbgpatpmt(a...) if (DebugPatPmt) fprintf(stderr, a)
 #define dbgframes(a...) if (DebugFrames) fprintf(stderr, a)
 
+#define MAX_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION 6
+#define WRN_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION (MAX_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION / 2)
+#define WRN_TS_PACKETS_FOR_FRAME_DETECTOR (MIN_TS_PACKETS_FOR_FRAME_DETECTOR / 2)
+
 #define EMPTY_SCANNER (0xFFFFFFFF)
 
 ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
@@ -231,7 +235,7 @@ cTsPayload::cTsPayload(void)
   data = NULL;
   length = 0;
   pid = -1;
-  index = 0;
+  Reset();
 }
 
 cTsPayload::cTsPayload(uchar *Data, int Length, int Pid)
@@ -239,12 +243,25 @@ cTsPayload::cTsPayload(uchar *Data, int Length, int Pid)
   Setup(Data, Length, Pid);
 }
 
+uchar cTsPayload::SetEof(void)
+{
+  length = index; // triggers EOF
+  return 0x00;
+}
+
+void cTsPayload::Reset(void)
+{
+  index = 0;
+  numPacketsPid = 0;
+  numPacketsOther = 0;
+}
+
 void cTsPayload::Setup(uchar *Data, int Length, int Pid)
 {
   data = Data;
   length = Length;
   pid = Pid >= 0 ? Pid : TsPid(Data);
-  index = 0;
+  Reset();
 }
 
 uchar cTsPayload::GetByte(void)
@@ -255,20 +272,20 @@ uchar cTsPayload::GetByte(void)
             if (data[index] == TS_SYNC_BYTE && index + TS_SIZE <= length) { // to make sure we are at a TS header start and drop incomplete TS packets at the end
                uchar *p = data + index;
                if (TsPid(p) == pid) { // only handle TS packets for the initial PID
+                  if (numPacketsPid++ > MAX_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION)
+                     return SetEof();
                   if (TsHasPayload(p)) {
-                     if (index > 0 && TsPayloadStart(p)) { // checking index to not skip the very first TS packet
-                        length = index; // triggers EOF
-                        return 0x00;
-                        }
+                     if (index > 0 && TsPayloadStart(p)) // checking index to not skip the very first TS packet
+                        return SetEof();
                      index += TsPayloadOffset(p);
                      break;
                      }
                   }
+               else
+                  numPacketsOther++;
                }
-            else {
-               length = index; // triggers EOF
-               return 0x00;
-               }
+            else
+               return SetEof();
            }
         }
      return data[index++];
@@ -302,6 +319,8 @@ void cTsPayload::SetByte(uchar Byte, int Index)
 bool cTsPayload::Find(uint32_t Code)
 {
   int OldIndex = index;
+  int OldNumPacketsPid = numPacketsPid;
+  int OldNumPacketsOther = numPacketsOther;
   uint32_t Scanner = EMPTY_SCANNER;
   while (!Eof()) {
         Scanner = (Scanner << 8) | GetByte();
@@ -309,9 +328,19 @@ bool cTsPayload::Find(uint32_t Code)
            return true;
         }
   index = OldIndex;
+  numPacketsPid = OldNumPacketsPid;
+  numPacketsOther = OldNumPacketsOther;
   return false;
 }
 
+void cTsPayload::Statistics(void) const
+{
+  if (numPacketsPid + numPacketsOther > WRN_TS_PACKETS_FOR_FRAME_DETECTOR)
+     dsyslog("WARNING: required (%d+%d) TS packets to determine frame type", numPacketsOther, numPacketsPid);
+  if (numPacketsPid > WRN_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION)
+     dsyslog("WARNING: required %d video TS packets to determine frame type", numPacketsPid);
+}
+
 // --- cPatPmtGenerator ------------------------------------------------------
 
 cPatPmtGenerator::cPatPmtGenerator(const cChannel *Channel)
@@ -1120,11 +1149,11 @@ int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid)
                dbgframes("%c", FrameTypes[FrameType]);
                }
             }
+         tsPayload.Statistics();
          break;
          }
       if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary
-         || (tsPayload.Available() < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE // stop if the available data is below the limit...
-            && (tsPayload.Available() <= 0 || tsPayload.AtTsStart()))) // ...but only if there is no more data at all, or if we are at a TS boundary
+         || tsPayload.Eof()) // or if we're out of data
          break;
       }
   return tsPayload.Used();
@@ -1266,6 +1295,8 @@ int cH264Parser::Parse(const uchar *Data, int Length, int Pid)
            case nutCodedSliceIdr:        if (gotAccessUnitDelimiter && gotSequenceParameterSet) {
                                             ParseSliceHeader();
                                             gotAccessUnitDelimiter = false;
+                                            if (newFrame)
+                                               tsPayload.Statistics();
                                             return tsPayload.Used();
                                             }
                                          break;
@@ -1273,8 +1304,7 @@ int cH264Parser::Parse(const uchar *Data, int Length, int Pid)
            }
          }
       if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary
-         || (tsPayload.Available() < MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE // stop if the available data is below the limit...
-            && (tsPayload.Available() <= 0 || tsPayload.AtTsStart()))) // ...but only if there is no more data at all, or if we are at a TS boundary
+         || tsPayload.Eof()) // or if we're out of data
          break;
       }
   return tsPayload.Used();
diff --git a/remux.h b/remux.h
index 5dd24ebdd..5574635ca 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 3.1 2014/01/16 10:15:50 kls Exp $
+ * $Id: remux.h 3.3 2014/02/08 12:41:50 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -217,8 +217,11 @@ class cTsPayload {
   int length;
   int pid;
   int index; // points to the next byte to process
+  int numPacketsPid; // the number of TS packets with the given PID (for statistical purposes)
+  int numPacketsOther; // the number of TS packets with other PIDs (for statistical purposes)
+  uchar SetEof(void);
 protected:
-  void Reset(void) { index = 0; }
+  void Reset(void);
 public:
   cTsPayload(void);
   cTsPayload(uchar *Data, int Length, int Pid = -1);
@@ -246,6 +249,10 @@ class cTsPayload {
        ///< is counted with its full size.
   bool Eof(void) const { return index >= length; }
        ///< Returns true if all available bytes of the TS payload have been processed.
+  void Statistics(void) const;
+       ///< May be called after a new frame has been detected, and will log a warning
+       ///< if the number of TS packets required to determine the frame type exceeded
+       ///< some safety limits.
   uchar GetByte(void);
        ///< Gets the next byte of the TS payload, skipping any intermediate TS header data.
   bool SkipBytes(int Bytes);
@@ -462,7 +469,7 @@ void PesDump(const char *Name, const u_char *Data, int Length);
 
 // Frame detector:
 
-#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 10
+#define MIN_TS_PACKETS_FOR_FRAME_DETECTOR 100
 
 class cFrameParser;
 
@@ -476,7 +483,6 @@ class cFrameDetector {
   bool independentFrame;
   uint32_t ptsValues[MaxPtsValues]; // 32 bit is enough - we only need the delta
   int numPtsValues;
-  int numFrames;
   int numIFrames;
   bool isVideo;
   double framesPerSecond;
diff --git a/sdt.c b/sdt.c
index c6d0ce542..44c6c9d9a 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 3.1 2014/01/04 15:02:31 kls Exp $
+ * $Id: sdt.c 3.2 2014/02/18 10:37:50 kls Exp $
  */
 
 #include "sdt.h"
@@ -94,7 +94,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                         else if (*pn && Setup.UpdateChannels >= 4) {
                            channel = Channels.NewChannel(Channel(), pn, ps, pp, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
-                           patFilter->Trigger();
+                           patFilter->Trigger(SiSdtService.getServiceId());
                            }
                         }
                    default: ;
@@ -120,7 +120,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                      cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
                      if (!link && Setup.UpdateChannels >= 4) {
                         link = Channels.NewChannel(Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
-                        patFilter->Trigger();
+                        patFilter->Trigger(Service.getServiceId());
                         }
                      if (link) {
                         if (!LinkChannels)
diff --git a/skins.h b/skins.h
index 8c01aa95b..8b64e62a3 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 3.2 2013/11/03 14:07:34 kls Exp $
+ * $Id: skins.h 3.3 2014/02/17 11:05:29 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -280,7 +280,7 @@ class cSkinDisplayReplay : public cSkinDisplay {
   class cProgressBar : public cBitmap {
   protected:
     int total;
-    int Pos(int p) { return p * Width() / total; }
+    int Pos(int p) { return int(int64_t(p) * Width() / total); }
     void Mark(int x, bool Start, bool Current, tColor ColorMark, tColor ColorCurrent);
   public:
     cProgressBar(int Width, int Height, int Current, int Total, const cMarks *Marks, tColor ColorSeen, tColor ColorRest, tColor ColorSelected, tColor ColorMark, tColor ColorCurrent);
diff --git a/vdr.c b/vdr.c
index c03d7776c..ff4688ee7 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.9 2014/01/25 10:47:39 kls Exp $
+ * $Id: vdr.c 3.10 2014/01/26 12:27:51 kls Exp $
  */
 
 #include <getopt.h>
@@ -917,7 +917,7 @@ int main(int argc, char *argv[])
               for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
                   if (Channel->Modification(CHANNELMOD_RETUNE)) {
                      cRecordControls::ChannelDataModified(Channel);
-                     if (Channel->Number() == cDevice::CurrentChannel()) {
+                     if (Channel->Number() == cDevice::CurrentChannel() && cDevice::PrimaryDevice()->HasDecoder()) {
                         if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) {
                            if (cDevice::ActualDevice()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
                               isyslog("retuning due to modification of channel %d", Channel->Number());

From 3e4e4454fc01b7bd39eef06f7e02961f7edf8305 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 16 Mar 2014 14:07:00 +0100
Subject: [PATCH 237/307] Version 2.1.6 VDR developer version 2.1.6 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.6.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.5-2.1.6.diff

MD5 checksums:

79519dac59166fabc2029b916bd61d00  vdr-2.1.6.tar.bz2
99f2f7094a242462696c0da5e52bb4c3  vdr-2.1.5-2.1.6.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Revoked "Fixed some compiler warnings with Clang 3.4.1" from ci.c, because this
  did not compile with older versions of gcc (thanks to Sören Moch).
- Fixed keeping the current position in the Recordings menu if a recording was
  deleted in a sub folder.
- Fixed handling transfer mode on full featured DVB cards for encrypted channels
  that have no audio pid (reported by Christian Winkler).
- Fixed a possible endless loop in cH264Parser::GetGolombUe(), which caused recordings
  on some HD channels to get stuck and resulted in buffer overflows.
- Fixed handling PAT packets when detecting frames, so that they can be properly
  taken into account when regenerating the index of a recording.
- Fixed adding new source types in case they are already registered (reported by Rolf
  Ahrenberg).
- Removed an unnecessary assignment from cMenuRecordings::~cMenuRecordings().
- The Recordings menu now remembers the last recording the cursor was positioned on,
  independent of the last replayed recording. When a replay ends, however, the cursor
  will initially be positioned to the last replayed recording again when the menu
  is opened.
- Updated the Finnish OSD texts (thanks to Antti Hartikainen).
- Fixed drawing the live indicator in the LCARS skin in case there are no devices.
- When checking for obsolete channels, those with an RID that is not 0 are now
  ignored (suggested by Oliver Endriss).
- The SDT is now only parsed *after* the NIT has been read, and it explicitly uses
  the source value derived from the NIT. This should prevent new channels from being
  created with the wrong source.
- Added a log message in case a receiver is detached from its device because the
  assigned CAM can't decrypt the channel.
- Refactored setup parameter handling for output devices:
  + The function cDevice::GetVideoSystem() has been deprecated and will be removed
    in a future version. In order to check whether a particular plugin needs to be
    modified if this function is removed, you can comment out the line
    #define DEPRECATED_VIDEOSYSTEM
    in device.h.
  + Handling the "video (display) format" (things like 16:9, 4:3, pan&scan, letterbox
    etc) shall now be done by the individual output devices, because the types and
    numbers of parameters are too device specific. The Setup/DVB parameters
    "Video format" and "Video display format" are still there for now and can be used
    by SD devices. HD devices, however, shall not use these parameters (any more),
    but rather implement their own setup menu with the necessary parameters for
    controlling output.
  + The dvbhdffdevice plugin has been modified accordingly.
  + Made it clear that cDevice::SetDigitalAudioDevice() merely tells the output device
    that the current audio track is Dolby Digital. This function was only used by the
    original "full featured" DVB cards - do not use it for new developments!
    If an output device has several ways of replaying audio (like HDMI or analog jack)
    it shall implement the proper options in its plugin's SetupMenu() function.
- Added support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters (thanks to
  Rolf Ahrenberg).
- Now initializing the isOnVideoDirectoryFileSystem member of cRecording when
  scanning the video directory, so that it won't cause a delay when opening the menu
  on a system with a large number of recordings.
- Now resetting the isOnVideoDirectoryFileSystem member of a cRecording to -1 after
  renaming it, so that it will be re-checked upon the next call to
  IsOnVideoDirectoryFileSystem().
- Added support for systemd (thanks to Christopher Reimer). To activate this you
  need to add "SDNOTIFY=1" to the 'make' call.
---
 CONTRIBUTORS                            | 15 ++++++-
 HISTORY                                 | 58 +++++++++++++++++++++++++
 MANUAL                                  |  4 +-
 Makefile                                |  7 ++-
 PLUGINS/src/dvbhddevice/HISTORY         |  5 +++
 PLUGINS/src/dvbhddevice/dvbhddevice.c   |  2 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c | 50 +++++----------------
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h |  4 --
 PLUGINS/src/dvbsddevice/HISTORY         |  4 ++
 PLUGINS/src/dvbsddevice/dvbsddevice.c   |  4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c | 21 ++-------
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h |  3 +-
 channels.c                              |  4 +-
 ci.c                                    |  6 +--
 config.h                                | 10 ++---
 device.c                                | 10 ++---
 device.h                                | 19 ++++++--
 dvbdevice.c                             | 23 +++++++++-
 dvbdevice.h                             | 12 ++++-
 menu.c                                  | 20 +++++++--
 nit.c                                   | 15 ++++---
 nit.h                                   |  6 ++-
 po/ar.po                                | 15 +++++++
 po/ca_ES.po                             | 15 +++++++
 po/cs_CZ.po                             | 15 +++++++
 po/da_DK.po                             | 15 +++++++
 po/de_DE.po                             | 15 +++++++
 po/el_GR.po                             | 15 +++++++
 po/es_ES.po                             | 15 +++++++
 po/et_EE.po                             | 15 +++++++
 po/fi_FI.po                             | 17 +++++++-
 po/fr_FR.po                             | 15 +++++++
 po/hr_HR.po                             | 15 +++++++
 po/hu_HU.po                             | 15 +++++++
 po/it_IT.po                             | 17 +++++++-
 po/lt_LT.po                             | 15 +++++++
 po/mk_MK.po                             | 15 +++++++
 po/nl_NL.po                             | 15 +++++++
 po/nn_NO.po                             | 15 +++++++
 po/pl_PL.po                             | 15 +++++++
 po/pt_PT.po                             | 15 +++++++
 po/ro_RO.po                             | 15 +++++++
 po/ru_RU.po                             | 15 +++++++
 po/sk_SK.po                             | 15 +++++++
 po/sl_SI.po                             | 15 +++++++
 po/sr_RS.po                             | 15 +++++++
 po/sv_SE.po                             | 15 +++++++
 po/tr_TR.po                             | 15 +++++++
 po/uk_UA.po                             | 15 +++++++
 po/zh_CN.po                             | 15 +++++++
 recording.c                             |  4 +-
 remux.c                                 | 14 +++---
 sdt.c                                   | 25 ++++++++---
 sdt.h                                   |  5 ++-
 skinlcars.c                             |  4 +-
 sourceparams.c                          |  6 +--
 sources.c                               | 11 ++++-
 sources.h                               |  3 +-
 vdr.5                                   | 11 ++++-
 vdr.c                                   |  9 +++-
 60 files changed, 689 insertions(+), 129 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5f2087c77..304be837e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -709,6 +709,8 @@ Oliver Endriss <o.endriss@gmx.de>
  for suggesting to eliminate MAXDVBDEVICES
  for reporting that there are channels that need even more than 10 TS packets in order
  to detect the frame type
+ for suggesting to ignore channels with an RID that is not 0 when checking for obsolete
+ channels
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1183,6 +1185,9 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  existing edited version of a recording
  for adding code for parsing LCN and AVC descriptors to libsi
  for fixing clearing non-editable members in the channel editor
+ for reporting a problem with adding new source types in case they are already
+ registered
+ for adding support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2515,6 +2520,7 @@ Antti Hartikainen <ami+vdr@ah.fi>
  for updating 'S13E' in 'sources.conf'
  for adding maximum SNR value for PCTV Systems nanoStick T2 290e
  for updating 'sources.conf'
+ for translating OSD texts to the Finnish language
 
 Bernd Melcher <bernd@bernd-melcher.de>
  for reporting a problem with the 'servicedemo' plugin having no PLUGIN macro
@@ -2917,7 +2923,7 @@ Luis Fernandes <telping@gmail.com>
  for suggesting to add handling MPEG audio type "ISO/IEC 14496-3 Audio with LATM
  transport syntax"
 
-Christopher Reimer <reimer.christopher@freenet.de>
+Christopher Reimer <vdr@creimer.net>
  for reporting a problem with external Dolby Digital processing via the '-a' option
  in live mode and with TS recordings
  for contributing to a patch that implements FHS support
@@ -2929,6 +2935,7 @@ Christopher Reimer <reimer.christopher@freenet.de>
  VDR source directory when doing "make plugins"
  for reverting the change from version 1.5.7 that made all logging go to LOG_ERR
  for reporting a possible crash in the OSD demo
+ for adding support for systemd
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -3141,6 +3148,8 @@ S
  for pointing out that FindHeader() can also be used in cMpeg2Fixer::AdjTref()
  for reporting a problem with detecting user inactivity in case the system time is
  changed after VDR has been started
+ for reporting that the change "Fixed some compiler warnings with Clang 3.4.1" caused
+ ci.c to no longer compile with older versions of gcc
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
@@ -3271,3 +3280,7 @@ Tony Houghton <h@realh.co.uk>
  warning with Clang 3.4.1
  for suggesting to replace the NULL pointer assignment in ~cReceiver() to force a
  segfault with a call to abort()
+
+Christian Winkler <winkler_chr@yahoo.de>
+ for reporting a problem with transfer mode on full featured DVB cards for encrypted
+ channels that have no audio pid
diff --git a/HISTORY b/HISTORY
index 09ad53bd4..c2ebc46d3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8202,3 +8202,61 @@ Video Disk Recorder Revision History
 - Fixed the replay progress display for very long recordings.
 - Fixed detecting broken video data streams when recording.
 - Fixed handling frame detection buffer length (reported by Eike Sauer).
+
+2014-03-16: Version 2.1.6
+
+- Revoked "Fixed some compiler warnings with Clang 3.4.1" from ci.c, because this
+  did not compile with older versions of gcc (thanks to S�ren Moch).
+- Fixed keeping the current position in the Recordings menu if a recording was
+  deleted in a sub folder.
+- Fixed handling transfer mode on full featured DVB cards for encrypted channels
+  that have no audio pid (reported by Christian Winkler).
+- Fixed a possible endless loop in cH264Parser::GetGolombUe(), which caused recordings
+  on some HD channels to get stuck and resulted in buffer overflows.
+- Fixed handling PAT packets when detecting frames, so that they can be properly
+  taken into account when regenerating the index of a recording.
+- Fixed adding new source types in case they are already registered (reported by Rolf
+  Ahrenberg).
+- Removed an unnecessary assignment from cMenuRecordings::~cMenuRecordings().
+- The Recordings menu now remembers the last recording the cursor was positioned on,
+  independent of the last replayed recording. When a replay ends, however, the cursor
+  will initially be positioned to the last replayed recording again when the menu
+  is opened.
+- Updated the Finnish OSD texts (thanks to Antti Hartikainen).
+- Fixed drawing the live indicator in the LCARS skin in case there are no devices.
+- When checking for obsolete channels, those with an RID that is not 0 are now
+  ignored (suggested by Oliver Endriss).
+- The SDT is now only parsed *after* the NIT has been read, and it explicitly uses
+  the source value derived from the NIT. This should prevent new channels from being
+  created with the wrong source.
+- Added a log message in case a receiver is detached from its device because the
+  assigned CAM can't decrypt the channel.
+- Refactored setup parameter handling for output devices:
+  + The function cDevice::GetVideoSystem() has been deprecated and will be removed
+    in a future version. In order to check whether a particular plugin needs to be
+    modified if this function is removed, you can comment out the line
+    #define DEPRECATED_VIDEOSYSTEM
+    in device.h.
+  + Handling the "video (display) format" (things like 16:9, 4:3, pan&scan, letterbox
+    etc) shall now be done by the individual output devices, because the types and
+    numbers of parameters are too device specific. The Setup/DVB parameters
+    "Video format" and "Video display format" are still there for now and can be used
+    by SD devices. HD devices, however, shall not use these parameters (any more),
+    but rather implement their own setup menu with the necessary parameters for
+    controlling output.
+  + The dvbhdffdevice plugin has been modified accordingly.
+  + Made it clear that cDevice::SetDigitalAudioDevice() merely tells the output device
+    that the current audio track is Dolby Digital. This function was only used by the
+    original "full featured" DVB cards - do not use it for new developments!
+    If an output device has several ways of replaying audio (like HDMI or analog jack)
+    it shall implement the proper options in its plugin's SetupMenu() function.
+- Added support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters (thanks to
+  Rolf Ahrenberg).
+- Now initializing the isOnVideoDirectoryFileSystem member of cRecording when
+  scanning the video directory, so that it won't cause a delay when opening the menu
+  on a system with a large number of recordings.
+- Now resetting the isOnVideoDirectoryFileSystem member of a cRecording to -1 after
+  renaming it, so that it will be re-checked upon the next call to
+  IsOnVideoDirectoryFileSystem().
+- Added support for systemd (thanks to Christopher Reimer). To activate this you
+  need to add "SDNOTIFY=1" to the 'make' call.
diff --git a/MANUAL b/MANUAL
index 9f2fef1d0..83f16b9ed 100644
--- a/MANUAL
+++ b/MANUAL
@@ -731,13 +731,13 @@ Version 2.0
                          1 = ANSI/SCTE
 
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
-                         (4:3 or 16:9).
+                         (4:3 or 16:9). Applies only to SD output devices.
 
   Video display format = letterbox
                          The display format to use for playing wide screen video on
                          a 4:3 tv set ("pan & scan", "letterbox" or "center cut out").
                          This option is only available if "Video format" is set to
-                         4:3.
+                         4:3. Applies only to SD output devices.
 
   Use Dolby Digital = yes
                          Controls whether Dolby Digital tracks appear in the "Audio"
diff --git a/Makefile b/Makefile
index eccec7f51..0d3a8fc39 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 3.1 2013/04/14 12:18:08 kls Exp $
+# $Id: Makefile 3.2 2014/03/16 12:47:35 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -93,6 +93,11 @@ INCLUDES += $(shell pkg-config --cflags fribidi)
 DEFINES += -DBIDI
 LIBS += $(shell pkg-config --libs fribidi)
 endif
+ifdef SDNOTIFY
+INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
+DEFINES += -DSDNOTIFY
+LIBS += $(shell pkg-config --libs libsystemd-daemon)
+endif
 
 LIRC_DEVICE ?= /var/run/lirc/lircd
 
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index 626d001ff..b26b0c485 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -93,3 +93,8 @@ VDR Plugin 'dvbhddevice' Revision History
 2014-01-17: Version 2.1.4
 
 - Using PCR based clock recovery in transfer mode.
+
+2014-03-15: Version 2.1.6
+
+- The function cDevice::GetVideoSystem() has been deprecated.
+- Removed old-style video format setting functions.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index b00f53a23..045b0a9da 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.5";
+static const char *VERSION        = "2.1.6";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index fd1fb0368..9c68e1494 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -108,8 +108,16 @@ cDvbHdFfDevice::~cDvbHdFfDevice()
 
 void cDvbHdFfDevice::MakePrimaryDevice(bool On)
 {
-  if (On)
+  if (On) {
      new cHdffOsdProvider(mHdffCmdIf);
+     //TODO the same code is also used in cHdffSetupPage::Store() and cHdffMenu::SetVideoConversion() - combine?
+     HdffVideoFormat_t videoFormat;
+     videoFormat.AutomaticEnabled = true;
+     videoFormat.AfdEnabled = false;
+     videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
+     videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
+     mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+     }
   cDvbDevice::MakePrimaryDevice(On);
 }
 
@@ -235,37 +243,6 @@ uchar *cDvbHdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, i
     return result;
 }
 
-void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
-{
-  //TODO???
-  cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
-}
-
-void cDvbHdFfDevice::SetVideoFormat(bool VideoFormat16_9)
-{
-  HdffVideoFormat_t videoFormat;
-  videoFormat.AutomaticEnabled = true;
-  videoFormat.AfdEnabled = false;
-  videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
-  videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
-  mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
-}
-
-eVideoSystem cDvbHdFfDevice::GetVideoSystem(void)
-{
-  eVideoSystem VideoSystem = vsPAL;
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        if (vs.h == 480 || vs.h == 240)
-           VideoSystem = vsNTSC;
-        }
-     else
-        LOG_ERROR;
-     }
-  return VideoSystem;
-}
-
 void cDvbHdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
 {
   if (fd_video >= 0) {
@@ -383,8 +360,8 @@ bool cDvbHdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   bool DoTune = !IsTunedToTransponder(Channel);
 
-  bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
-  bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
+  bool pidHandlesVideo = vpid && pidHandles[ptVideo].pid == vpid;
+  bool pidHandlesAudio = apid && pidHandles[ptAudio].pid == apid;
 
   bool TurnOffLivePIDs = DoTune
                          || !IsPrimaryDevice()
@@ -443,11 +420,6 @@ void cDvbHdFfDevice::SetVolumeDevice(int Volume)
   mHdffCmdIf->CmdMuxSetVolume(Volume * 100 / 255);
 }
 
-void cDvbHdFfDevice::SetDigitalAudioDevice(bool On)
-{
-  // not needed
-}
-
 void cDvbHdFfDevice::SetAudioTrackDevice(eTrackType Type)
 {
     //printf("SetAudioTrackDevice %d\n", Type);
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index 146958f27..eb3634bda 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -51,9 +51,6 @@ class cDvbHdFfDevice : public cDvbDevice {
 // Video format facilities
 
 public:
-  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
-  virtual void SetVideoFormat(bool VideoFormat16_9);
-  virtual eVideoSystem GetVideoSystem(void);
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
   virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
 
@@ -70,7 +67,6 @@ class cDvbHdFfDevice : public cDvbDevice {
   virtual int GetAudioChannelDevice(void);
   virtual void SetAudioChannelDevice(int AudioChannel);
   virtual void SetVolumeDevice(int Volume);
-  virtual void SetDigitalAudioDevice(bool On);
 
 // Player facilities
 
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 1dcd561be..94e31ddb8 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -55,3 +55,7 @@ VDR Plugin 'dvbsddevice' Revision History
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
 - cDevice::TrickSpeed() now has an additional parameter named Forward.
+
+2014-03-15: Version 2.1.2
+
+- The function cDevice::GetVideoSystem() has been deprecated.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 39b140d75..0d06f17dc 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 3.2 2014/01/01 13:43:28 kls Exp $
+ * $Id: dvbsddevice.c 3.3 2014/03/15 12:28:14 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.1.2";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index a735e9206..5711e04df 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 3.1 2014/01/01 13:39:24 kls Exp $
+ * $Id: dvbsdffdevice.c 3.3 2014/03/15 12:35:21 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -241,21 +241,6 @@ void cDvbSdFfDevice::SetVideoFormat(bool VideoFormat16_9)
   SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
 }
 
-eVideoSystem cDvbSdFfDevice::GetVideoSystem(void)
-{
-  eVideoSystem VideoSystem = vsPAL;
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        if (vs.h == 480 || vs.h == 240)
-           VideoSystem = vsNTSC;
-        }
-     else
-        LOG_ERROR;
-     }
-  return VideoSystem;
-}
-
 void cDvbSdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
 {
   if (fd_video >= 0) {
@@ -400,8 +385,8 @@ bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   bool DoTune = !IsTunedToTransponder(Channel);
 
-  bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
-  bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
+  bool pidHandlesVideo = vpid && pidHandles[ptVideo].pid == vpid;
+  bool pidHandlesAudio = apid && pidHandles[ptAudio].pid == apid;
 
   bool TurnOffLivePIDs = DoTune
                          || !IsPrimaryDevice()
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index fe66d32a0..f7348d0fb 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.h 3.1 2014/01/01 13:39:30 kls Exp $
+ * $Id: dvbsdffdevice.h 3.2 2014/03/15 12:36:35 kls Exp $
  */
 
 #ifndef __DVBSDFFDEVICE_H
@@ -63,7 +63,6 @@ class cDvbSdFfDevice : public cDvbDevice {
 public:
   virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
   virtual void SetVideoFormat(bool VideoFormat16_9);
-  virtual eVideoSystem GetVideoSystem(void);
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
   virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
 
diff --git a/channels.c b/channels.c
index 11367c7b6..b0e24743f 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 3.4 2014/01/04 15:01:52 kls Exp $
+ * $Id: channels.c 3.5 2014/03/10 13:14:02 kls Exp $
  */
 
 #include "channels.h"
@@ -1039,7 +1039,7 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
 void cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid) {
+      if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid && channel->Rid() == 0) {
          if (!endswith(channel->Name(), CHANNELMARKOBSOLETE))
             channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARKOBSOLETE), channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, channel->Provider()));
          }
diff --git a/ci.c b/ci.c
index 1a171b140..6b0805d7a 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.11 2014/02/08 12:25:55 kls Exp $
+ * $Id: ci.c 3.12 2014/02/25 09:59:55 kls Exp $
  */
 
 #include "ci.h"
@@ -864,7 +864,7 @@ void cCiDateTime::SendDateTime(void)
 #pragma pack(1)
      struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; };
 #pragma pack()
-     tTime T = { .mjd = htons(MJD), .h = DEC2BCD(tm_gmt.tm_hour), .m = DEC2BCD(tm_gmt.tm_min), .s = DEC2BCD(tm_gmt.tm_sec), .offset = short(htons(tm_loc.tm_gmtoff / 60)) };
+     tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : short(htons(tm_loc.tm_gmtoff / 60)) };
      bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
      DumpTPDUDataTransfer &= DumpDateTime;
      if (DumpDateTime)
@@ -1004,7 +1004,7 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
                  case DCC_SET_MMI_MODE:
                       if (l == 2 && *++d == MM_HIGH_LEVEL) {
                          struct tDisplayReply { uint8_t id; uint8_t mode; };
-                         tDisplayReply dr = { .id = DRI_MMI_MODE_ACK, .mode = MM_HIGH_LEVEL };
+                         tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
                          dbgprotocol("Slot %d: ==> Display Reply (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
                          SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);
                          }
diff --git a/config.h b/config.h
index 1d2a8a97c..d36543865 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.7 2014/01/26 12:31:58 kls Exp $
+ * $Id: config.h 3.8 2014/02/25 10:00:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.5"
-#define VDRVERSNUM   20105  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.6"
+#define VDRVERSNUM   20106  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.5"
-#define APIVERSNUM   20105  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.6"
+#define APIVERSNUM   20106  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 901fa2b31..43bc0e08d 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.12 2014/02/18 13:12:39 kls Exp $
+ * $Id: device.c 3.15 2014/03/15 13:23:28 kls Exp $
  */
 
 #include "device.h"
@@ -430,11 +430,6 @@ void cDevice::SetVideoFormat(bool VideoFormat16_9)
 {
 }
 
-eVideoSystem cDevice::GetVideoSystem(void)
-{
-  return vsPAL;
-}
-
 void cDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
 {
   Width = 0;
@@ -575,7 +570,7 @@ void cDevice::StartSectionHandler(void)
      AttachFilter(eitFilter = new cEitFilter);
      AttachFilter(patFilter = new cPatFilter);
      AttachFilter(sdtFilter = new cSdtFilter(patFilter));
-     AttachFilter(nitFilter = new cNitFilter);
+     AttachFilter(nitFilter = new cNitFilter(sdtFilter));
      }
 }
 
@@ -1608,6 +1603,7 @@ void cDevice::Action(void)
                  for (int i = 0; i < MAXRECEIVERS; i++) {
                      if (receiver[i] && receiver[i]->WantsPid(Pid)) {
                         if (DetachReceivers) {
+                           dsyslog("detaching receiver - won't decrypt channel %s with CAM %d", *receiver[i]->ChannelID().ToString(), CamSlotNumber);
                            ChannelCamRelations.SetChecked(receiver[i]->ChannelID(), CamSlotNumber);
                            Detach(receiver[i]);
                            }
diff --git a/device.h b/device.h
index 368d5cfa7..549bbe042 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 3.8 2014/01/02 10:47:08 kls Exp $
+ * $Id: device.h 3.9 2014/03/15 14:04:58 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -55,9 +55,12 @@ enum ePlayMode { pmNone,           // audio/video from decoder
                  // KNOWN TO YOUR PLAYER.
                };
 
+#define DEPRECATED_VIDEOSYSTEM
+#ifdef DEPRECATED_VIDEOSYSTEM
 enum eVideoSystem { vsPAL,
                     vsNTSC
                   };
+#endif
 
 enum eVideoDisplayFormat { vdfPanAndScan,
                            vdfLetterBox,
@@ -462,12 +465,19 @@ class cDevice : public cThread {
          ///< Sets the video display format to the given one (only useful
          ///< if this device has an MPEG decoder).
          ///< A derived class must first call the base class function!
+         ///< NOTE: this is only for SD devices. HD devices shall implement their
+         ///< own setup menu with the necessary parameters for controlling output.
   virtual void SetVideoFormat(bool VideoFormat16_9);
          ///< Sets the output video format to either 16:9 or 4:3 (only useful
          ///< if this device has an MPEG decoder).
-  virtual eVideoSystem GetVideoSystem(void);
+         ///< NOTE: this is only for SD devices. HD devices shall implement their
+         ///< own setup menu with the necessary parameters for controlling output.
+#ifdef DEPRECATED_VIDEOSYSTEM
+  virtual eVideoSystem GetVideoSystem(void) { return vsPAL; }
          ///< Returns the video system of the currently displayed material
          ///< (default is PAL).
+         ///< This function is deprecated and will be removed in a future version!
+#endif
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
          ///< Returns the Width, Height and VideoAspect ratio of the currently
          ///< displayed video material. Width and Height are given in pixel
@@ -566,8 +576,9 @@ class cDevice : public cThread {
   virtual void SetVolumeDevice(int Volume);
        ///< Sets the audio volume on this device (Volume = 0...255).
   virtual void SetDigitalAudioDevice(bool On);
-       ///< Tells the actual device that digital audio output shall be switched
-       ///< on or off.
+       ///< Tells the output device that the current audio track is Dolby Digital.
+       ///< Only used by the original "full featured" DVB cards - do not use for new
+       ///< developments!
 public:
   bool IsMute(void) const { return mute; }
   bool ToggleMute(void);
diff --git a/dvbdevice.c b/dvbdevice.c
index 6d1c95626..fb406f1a4 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 3.10 2014/01/20 11:46:26 kls Exp $
+ * $Id: dvbdevice.c 3.11 2014/03/16 10:38:31 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -36,6 +36,13 @@ static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in
 
 // --- DVB Parameter Maps ----------------------------------------------------
 
+const tDvbParameterMap PilotValues[] = {
+  {   0, PILOT_OFF,  trNOOP("off") },
+  {   1, PILOT_ON,   trNOOP("on") },
+  { 999, PILOT_AUTO, trNOOP("auto") },
+  {  -1, 0, NULL }
+  };
+
 const tDvbParameterMap InversionValues[] = {
   {   0, INVERSION_OFF,  trNOOP("off") },
   {   1, INVERSION_ON,   trNOOP("on") },
@@ -206,6 +213,9 @@ cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
   hierarchy    = HIERARCHY_AUTO;
   rollOff      = ROLLOFF_AUTO;
   streamId     = 0;
+  t2systemId   = 0;
+  sisoMiso     = 0;
+  pilot        = PILOT_AUTO;
   Parse(Parameters);
 }
 
@@ -227,10 +237,13 @@ cString cDvbTransponderParameters::ToString(char Type) const
   ST("   T*")  q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
   ST("ACST*")  q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
   ST("ACST*")  q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+  ST("  S 2")  q += PrintParameter(q, 'N', MapToUser(pilot, PilotValues));
   ST("  S 2")  q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
   ST("  ST2")  q += PrintParameter(q, 'P', streamId);
+  ST("   T2")  q += PrintParameter(q, 'Q', t2systemId);
   ST("  ST*")  q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter
   ST("   T*")  q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+  ST("   T2")  q += PrintParameter(q, 'X', sisoMiso);
   ST("   T*")  q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
   return buffer;
 }
@@ -263,12 +276,15 @@ bool cDvbTransponderParameters::Parse(const char *s)
           case 'I': s = ParseParameter(s, inversion, InversionValues); break;
           case 'L': polarization = 'L'; s++; break;
           case 'M': s = ParseParameter(s, modulation, ModulationValues); break;
+          case 'N': s = ParseParameter(s, pilot, PilotValues); break;
           case 'O': s = ParseParameter(s, rollOff, RollOffValues); break;
           case 'P': s = ParseParameter(s, streamId); break;
+          case 'Q': s = ParseParameter(s, t2systemId); break;
           case 'R': polarization = 'R'; s++; break;
           case 'S': s = ParseParameter(s, system, SystemValuesSat); break; // we only need the numerical value, so Sat or Terr doesn't matter
           case 'T': s = ParseParameter(s, transmission, TransmissionValues); break;
           case 'V': polarization = 'V'; s++; break;
+          case 'X': s = ParseParameter(s, sisoMiso); break;
           case 'Y': s = ParseParameter(s, hierarchy, HierarchyValues); break;
           default: esyslog("ERROR: unknown parameter key '%c'", *s);
                    return false;
@@ -839,7 +855,7 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_INVERSION, dtp.Inversion());
      if (frontendType == SYS_DVBS2) {
         // DVB-S2
-        SETCMD(DTV_PILOT, PILOT_AUTO);
+        SETCMD(DTV_PILOT, dtp.Pilot());
         SETCMD(DTV_ROLLOFF, dtp.RollOff());
         if (DvbApiVersion >= 0x0508)
            SETCMD(DTV_STREAM_ID, dtp.StreamId());
@@ -1038,6 +1054,9 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
     case 10: ST("   T")  return new cMenuEditMapItem( tr("Hierarchy"),    &dtp.hierarchy,    HierarchyValues);    else return GetOsdItem();
     case 11: ST("  S ")  return new cMenuEditMapItem( tr("Rolloff"),      &dtp.rollOff,      RollOffValues);      else return GetOsdItem();
     case 12: ST("  ST")  return new cMenuEditIntItem( tr("StreamId"),     &dtp.streamId,     0, 255);             else return GetOsdItem();
+    case 13: ST("  S ")  return new cMenuEditMapItem( tr("Pilot"),        &dtp.pilot,        PilotValues);        else return GetOsdItem();
+    case 14: ST("   T")  return new cMenuEditIntItem( tr("T2SystemId"),   &dtp.t2systemId,   0, 65535);           else return GetOsdItem();
+    case 15: ST("   T")  return new cMenuEditIntItem( tr("SISO/MISO"),    &dtp.sisoMiso,     0, 1);               else return GetOsdItem();
     default: return NULL;
     }
   return NULL;
diff --git a/dvbdevice.h b/dvbdevice.h
index 278edd0c3..0a148ce3b 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 3.4 2014/01/16 11:45:35 kls Exp $
+ * $Id: dvbdevice.h 3.5 2014/03/16 10:38:31 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -92,6 +92,7 @@ int MapToDriver(int Value, const tDvbParameterMap *Map);
 int UserIndex(int Value, const tDvbParameterMap *Map);
 int DriverIndex(int Value, const tDvbParameterMap *Map);
 
+extern const tDvbParameterMap PilotValues[];
 extern const tDvbParameterMap InversionValues[];
 extern const tDvbParameterMap BandwidthValues[];
 extern const tDvbParameterMap CoderateValues[];
@@ -118,6 +119,9 @@ friend class cDvbSourceParam;
   int hierarchy;
   int rollOff;
   int streamId;
+  int t2systemId;
+  int sisoMiso;
+  int pilot;
   int PrintParameter(char *p, char Name, int Value) const;
   const char *ParseParameter(const char *s, int &Value, const tDvbParameterMap *Map = NULL);
 public:
@@ -134,6 +138,9 @@ friend class cDvbSourceParam;
   int Hierarchy(void) const { return hierarchy; }
   int RollOff(void) const { return rollOff; }
   int StreamId(void) const { return streamId; }
+  int T2SystemId(void) const { return t2systemId; }
+  int SisoMiso(void) const { return sisoMiso; }
+  int Pilot(void) const { return pilot; }
   void SetPolarization(char Polarization) { polarization = Polarization; }
   void SetInversion(int Inversion) { inversion = Inversion; }
   void SetBandwidth(int Bandwidth) { bandwidth = Bandwidth; }
@@ -146,6 +153,9 @@ friend class cDvbSourceParam;
   void SetHierarchy(int Hierarchy) { hierarchy = Hierarchy; }
   void SetRollOff(int RollOff) { rollOff = RollOff; }
   void SetStreamId(int StreamId) { streamId = StreamId; }
+  void SetT2SystemId(int T2SystemId) { t2systemId = T2SystemId; }
+  void SetSisoMiso(int SisoMiso) { sisoMiso = SisoMiso; }
+  void SetPilot(int Pilot) { pilot = Pilot; }
   cString ToString(char Type) const;
   bool Parse(const char *s);
   };
diff --git a/menu.c b/menu.c
index 683a47798..59b11d032 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.19 2014/02/08 12:36:12 kls Exp $
+ * $Id: menu.c 3.23 2014/03/16 10:38:31 kls Exp $
  */
 
 #include "menu.h"
@@ -214,9 +214,9 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
   Add(new cMenuEditCaItem(  tr("CA"),           &data.caids[0]));
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 1, 0xFFFF));
-  /* XXX not yet used
   Add(new cMenuEditIntItem( tr("Nid"),          &data.nid, 0));
   Add(new cMenuEditIntItem( tr("Tid"),          &data.tid, 0));
+  /* XXX not yet used
   Add(new cMenuEditIntItem( tr("Rid"),          &data.rid, 0));
   XXX*/
   // Parameters for specific types of sources:
@@ -2533,6 +2533,7 @@ class cMenuRecordingItem : public cOsdItem {
   int Level(void) { return level; }
   cRecording *Recording(void) { return recording; }
   bool IsDirectory(void) { return name != NULL; }
+  void SetRecording(cRecording *Recording) { recording = Recording; }
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
@@ -2596,7 +2597,10 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus,
 
 cMenuRecordings::~cMenuRecordings()
 {
-  helpKeys = -1;
+  if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current())) {
+     if (!ri->IsDirectory())
+        SetRecording(ri->Recording()->FileName());
+     }
   free(base);
 }
 
@@ -2782,6 +2786,7 @@ eOSState cMenuRecordings::Delete(void)
            Display();
            if (!Count())
               return osBack;
+           return osUser2;
            }
         else
            Skins.Message(mtError, tr("Error while deleting recording!"));
@@ -2861,6 +2866,14 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
      path = NULL;
      fileName = NULL;
      }
+  else if (state == osUser2) {
+     // a recording in a sub folder was deleted, so update the current item
+     cOsdMenu *m = HasSubMenu() ? SubMenu() : this;
+     if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current())) {
+        if (cMenuRecordingItem *riSub = (cMenuRecordingItem *)m->Get(m->Current()))
+           ri->SetRecording(riSub->Recording());
+        }
+     }
   if (Key == kYellow && HadSubMenu && !HasSubMenu()) {
      // the last recording in a subdirectory was deleted, so let's go back up
      cOsdMenu::Del(Current());
@@ -4952,6 +4965,7 @@ void cReplayControl::Stop(void)
         }
      }
   cDvbPlayerControl::Stop();
+  cMenuRecordings::SetRecording(NULL); // make sure opening the Recordings menu navigates to the last replayed recording
 }
 
 void cReplayControl::SetRecording(const char *FileName)
diff --git a/nit.c b/nit.c
index e3bf4194d..f3fe9231d 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 3.0 2013/03/07 09:42:29 kls Exp $
+ * $Id: nit.c 3.3 2014/03/16 10:38:31 kls Exp $
  */
 
 #include "nit.h"
@@ -19,8 +19,9 @@
 #define DVB_SYSTEM_1 0 // see also dvbdevice.c
 #define DVB_SYSTEM_2 1
 
-cNitFilter::cNitFilter(void)
+cNitFilter::cNitFilter(cSdtFilter *SdtFilter)
 {
+  sdtFilter = SdtFilter;
   numNits = 0;
   networkId = 0;
   Set(0x10, 0x40);  // NIT
@@ -183,6 +184,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
+                 sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::S2SatelliteDeliverySystemDescriptorTag: {
@@ -243,7 +245,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                         }
                     if (!found || forceTransponderUpdate) {
-                        for (int n = 0; n < NumFrequencies; n++) {
+                       for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
                            Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                            if (Channel->SetTransponderData(Source, Frequencies[n], SymbolRate, dtp.ToString('C')))
@@ -253,6 +255,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
+                 sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::TerrestrialDeliverySystemDescriptorTag: {
@@ -314,8 +317,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            else
                               delete Channel;
                            }
-                        }
+                       }
                     }
+                 sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::ExtensionDescriptorTag: {
@@ -329,11 +333,12 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   SI::T2DeliverySystemDescriptor *td = (SI::T2DeliverySystemDescriptor *)d;
                                   int Frequency = Channel->Frequency();
                                   int SymbolRate = Channel->Srate();
-                                  //int SystemId = td->getSystemId();
                                   cDvbTransponderParameters dtp(Channel->Parameters());
                                   dtp.SetSystem(DVB_SYSTEM_2);
                                   dtp.SetStreamId(td->getPlpId());
+                                  dtp.SetT2SystemId(td->getT2SystemId());
                                   if (td->getExtendedDataFlag()) {
+                                     dtp.SetSisoMiso(td->getSisoMiso());
                                      static int T2Bandwidths[] = { 8000000, 7000000, 6000000, 5000000, 10000000, 1712000, 0, 0 };
                                      dtp.SetBandwidth(T2Bandwidths[td->getBandwidth()]);
                                      static int T2GuardIntervals[] = { GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_128, GUARD_INTERVAL_19_128, GUARD_INTERVAL_19_256, 0 };
diff --git a/nit.h b/nit.h
index 700db9a20..4673f960d 100644
--- a/nit.h
+++ b/nit.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.h 3.0 2007/06/10 08:50:21 kls Exp $
+ * $Id: nit.h 3.1 2014/03/10 14:12:05 kls Exp $
  */
 
 #ifndef __NIT_H
 #define __NIT_H
 
 #include "filter.h"
+#include "sdt.h"
 
 #define MAXNITS 16
 #define MAXNETWORKNAME Utf8BufSize(256)
@@ -26,13 +27,14 @@ class cNitFilter : public cFilter {
     };
 
   cSectionSyncer sectionSyncer;
+  cSdtFilter *sdtFilter;
   cNit nits[MAXNITS];
   u_short networkId;
   int numNits;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
-  cNitFilter(void);
+  cNitFilter(cSdtFilter *SdtFilter);
   virtual void SetStatus(bool On);
   };
 
diff --git a/po/ar.po b/po/ar.po
index cedfac3e6..ef9982beb 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -80,6 +80,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
 
@@ -567,6 +576,12 @@ msgstr "الكامة"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "اعدادات القناة غبر موحد"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 6329714ff..3f2105ff9 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -79,6 +79,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Iniciant exploraci� EPG"
 
@@ -566,6 +575,12 @@ msgstr "Acc
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Propietats del canal duplicades!"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 7f857d5ee..f6ce5727c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -79,6 +79,15 @@ msgstr "RollOff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Začíná prohledávání EPG"
 
@@ -566,6 +575,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastavení kanálu není jedinečné!"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index c8734bddc..7a4ea8f99 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -76,6 +76,15 @@ msgstr ""
 msgid "StreamId"
 msgstr ""
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Starter EPG skanning"
 
@@ -563,6 +572,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalindstillinger er ikke entydige!"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 7d69ce059..731f8f269 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -76,6 +76,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr "Pilot"
+
+msgid "T2SystemId"
+msgstr "T2-Systemkennung"
+
+msgid "SISO/MISO"
+msgstr "SISO/MISO"
+
 msgid "Starting EPG scan"
 msgstr "Aktualisiere EPG-Daten"
 
@@ -563,6 +572,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaleinstellungen sind nicht eindeutig!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index ca0701a85..9c10cfef5 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -76,6 +76,15 @@ msgstr ""
 msgid "StreamId"
 msgstr ""
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "���� ������ EPG"
 
@@ -563,6 +572,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "�� ��������� ��� �������� ����������������!"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index d27dd6eac..fc95313ed 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -77,6 +77,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
 
@@ -564,6 +573,12 @@ msgstr "Acceso condicional (CA)"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index e48bfa1f4..7c7cc1ea6 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -76,6 +76,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "Stream-tunnus"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine käivitatud"
 
@@ -563,6 +572,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 86ce6fec0..002b4c70e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -80,6 +80,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "Lähetetunniste"
 
+msgid "Pilot"
+msgstr "Pilotti"
+
+msgid "T2SystemId"
+msgstr "T2-tunniste"
+
+msgid "SISO/MISO"
+msgstr "SISO/MISO"
+
 msgid "Starting EPG scan"
 msgstr "Ohjelmaoppaan päivitys aloitettu"
 
@@ -567,6 +576,12 @@ msgstr "Salaus (CA)"
 msgid "Sid"
 msgstr "Palvelu-ID"
 
+msgid "Nid"
+msgstr "Verkko-ID"
+
+msgid "Tid"
+msgstr "Lähete-ID"
+
 msgid "Channel settings are not unique!"
 msgstr "Kanava-asetukset eivät ole yksilölliset!"
 
@@ -1427,7 +1442,7 @@ msgstr "TOISTO"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr "Käännetaan lautasta %.1f..."
+msgstr "Käännetään lautasta %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konsoli"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e1cde724f..d216725fc 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -86,6 +86,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Mise à jour du guide des programmes"
 
@@ -573,6 +582,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Cette chaîne n'est pas unique !"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 02aac4162..6419a6788 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -78,6 +78,15 @@ msgstr ""
 msgid "StreamId"
 msgstr ""
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Po�injem EPG pretragu"
 
@@ -565,6 +574,12 @@ msgstr "Kodiranje (CA)"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Postavke programa nisu jedinstvene!"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 55a1f7a5d..d6a13c3df 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -80,6 +80,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "Stream azonosító"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG adatok aktualizálása"
 
@@ -567,6 +576,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Az adóbeállítások nem egyértelműek"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 373235089..107c14261 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-10-14 11:56+0200\n"
+"POT-Creation-Date: 2013-11-03 15:59+0100\n"
 "PO-Revision-Date: 2013-11-10 23:02+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -83,6 +83,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
 
@@ -570,6 +579,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index f702640f7..d7067f8e6 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -76,6 +76,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
 
@@ -563,6 +572,12 @@ msgstr "CA (dekodavimo sistema)"
 msgid "Sid"
 msgstr "Serviso id"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalų nustatymai neunikalūs!"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index f18114007..990a9f10b 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -77,6 +77,15 @@ msgstr "Рол-оф"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Започнувам скенирање на EPG"
 
@@ -564,6 +573,12 @@ msgstr "Кодирање (CA)"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Уредбите на каналот не се уникатни!"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 8bc7526f5..ffc66df45 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -81,6 +81,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
 
@@ -568,6 +577,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index d5a05d54c..c0d32549d 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -77,6 +77,15 @@ msgstr ""
 msgid "StreamId"
 msgstr ""
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr ""
 
@@ -564,6 +573,12 @@ msgstr "Kortleser"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d125ec3be..f67c62160 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -78,6 +78,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
 
@@ -565,6 +574,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index dae170f74..575d3c272 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -77,6 +77,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr ""
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "A iniciar a busca do EPG"
 
@@ -564,6 +573,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Par�metros do canal n�o s�o �nicos!"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 2421a380a..fabbd4ed5 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -78,6 +78,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "Identificator Stream"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Pornesc achiziţia EPG"
 
@@ -565,6 +574,12 @@ msgstr "CA (Acces Condiţional)"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d8aff45e7..ee8ec373b 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -77,6 +77,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "������� EPG-������������"
 
@@ -564,6 +573,12 @@ msgstr "CA (
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "��������� ������ �� ���������!"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 0f867c6d9..97a6930d4 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -76,6 +76,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Sp���a sa sn�manie EPG"
 
@@ -563,6 +572,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastavenia kan�lu nie s� v�nimo�n�!"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index c7c4eba34..c3a899c39 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -77,6 +77,15 @@ msgstr "Odpadanje"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Pri�enjam EPG-scan"
 
@@ -564,6 +573,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Nastavitve kanala niso edinstvene!"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index c44c40b3c..9f2ef6bd0 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -77,6 +77,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Po�inje EPG pretra�ivanje"
 
@@ -564,6 +573,12 @@ msgstr "Kodiranje (CA)"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Postavke kanala nisu jedinstvene!"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 4bdfee546..06a5f20b0 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -80,6 +80,15 @@ msgstr "Rolloff"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG-avs�kning"
 
@@ -567,6 +576,12 @@ msgstr "Kortl
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 795ea9f1e..d79158dcd 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -76,6 +76,15 @@ msgstr ""
 msgid "StreamId"
 msgstr ""
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "EPG tarama ba�l�yor"
 
@@ -563,6 +572,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Kanal ayarlar� belli de��l!"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index ea06c659c..df11b8dbe 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -77,6 +77,15 @@ msgstr "Крен"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "Починаю EPG-сканування"
 
@@ -564,6 +573,12 @@ msgstr "CA (декодер)"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "Настройки каналу не єдині!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a50b5bcc0..648f61d7e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -78,6 +78,15 @@ msgstr "越零率"
 msgid "StreamId"
 msgstr "StreamId"
 
+msgid "Pilot"
+msgstr ""
+
+msgid "T2SystemId"
+msgstr ""
+
+msgid "SISO/MISO"
+msgstr ""
+
 msgid "Starting EPG scan"
 msgstr "开始节目单扫描"
 
@@ -565,6 +574,12 @@ msgstr "CA"
 msgid "Sid"
 msgstr "Sid"
 
+msgid "Nid"
+msgstr ""
+
+msgid "Tid"
+msgstr ""
+
 msgid "Channel settings are not unique!"
 msgstr "频道设置不是唯一的！"
 
diff --git a/recording.c b/recording.c
index 5da54940b..cf3c5f05f 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.16 2014/02/08 11:16:02 kls Exp $
+ * $Id: recording.c 3.18 2014/03/16 11:09:17 kls Exp $
  */
 
 #include "recording.h"
@@ -1237,6 +1237,7 @@ bool cRecording::ChangeName(const char *NewName)
         fileName = strdup(OldFileName);
         return false;
         }
+     isOnVideoDirectoryFileSystem = -1; // it might have been moved to a different file system
      ClearSortName();
      Recordings.ChangeState();
      Recordings.TouchUpdate();
@@ -1425,6 +1426,7 @@ bool cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
                     if (r->Name()) {
                        r->NumFrames(); // initializes the numFrames member
                        r->FileSizeMB(); // initializes the fileSizeMB member
+                       r->IsOnVideoDirectoryFileSystem(); // initializes the isOnVideoDirectoryFileSystem member
                        if (deleted)
                           r->deleted = time(NULL);
                        Lock();
diff --git a/remux.c b/remux.c
index 44eec8ced..87ed469df 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 3.3 2014/02/21 11:51:55 kls Exp $
+ * $Id: remux.c 3.5 2014/03/08 15:05:35 kls Exp $
  */
 
 #include "remux.h"
@@ -272,7 +272,7 @@ uchar cTsPayload::GetByte(void)
             if (data[index] == TS_SYNC_BYTE && index + TS_SIZE <= length) { // to make sure we are at a TS header start and drop incomplete TS packets at the end
                uchar *p = data + index;
                if (TsPid(p) == pid) { // only handle TS packets for the initial PID
-                  if (numPacketsPid++ > MAX_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION)
+                  if (++numPacketsPid > MAX_TS_PACKETS_FOR_VIDEO_FRAME_DETECTION)
                      return SetEof();
                   if (TsHasPayload(p)) {
                      if (index > 0 && TsPayloadStart(p)) // checking index to not skip the very first TS packet
@@ -281,6 +281,8 @@ uchar cTsPayload::GetByte(void)
                      break;
                      }
                   }
+               else if (TsPid(p) == PATPID)
+                  return SetEof(); // caller must see PAT packets in case of index regeneration
                else
                   numPacketsOther++;
                }
@@ -1252,7 +1254,7 @@ uint32_t cH264Parser::GetBits(int Bits)
 uint32_t cH264Parser::GetGolombUe(void)
 {
   int z = -1;
-  for (int b = 0; !b; z++)
+  for (int b = 0; !b && z < 32; z++) // limiting z to no get stuck if GetBit() always returns 0
       b = GetBit();
   return (1 << z) - 1 + GetBits(z);
 }
@@ -1288,8 +1290,10 @@ int cH264Parser::Parse(const uchar *Data, int Length, int Pid)
            case nutAccessUnitDelimiter:  ParseAccessUnitDelimiter();
                                          gotAccessUnitDelimiter = true;
                                          break;
-           case nutSequenceParameterSet: ParseSequenceParameterSet();
-                                         gotSequenceParameterSet = true;
+           case nutSequenceParameterSet: if (gotAccessUnitDelimiter) {
+                                            ParseSequenceParameterSet();
+                                            gotSequenceParameterSet = true;
+                                            }
                                          break;
            case nutCodedSliceNonIdr:
            case nutCodedSliceIdr:        if (gotAccessUnitDelimiter && gotSequenceParameterSet) {
diff --git a/sdt.c b/sdt.c
index 44c6c9d9a..7537cfc1c 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 3.2 2014/02/18 10:37:50 kls Exp $
+ * $Id: sdt.c 3.3 2014/03/10 14:42:20 kls Exp $
  */
 
 #include "sdt.h"
@@ -17,19 +17,30 @@
 
 cSdtFilter::cSdtFilter(cPatFilter *PatFilter)
 {
+  source = cSource::stNone;
   patFilter = PatFilter;
   Set(0x11, 0x42);  // SDT
 }
 
 void cSdtFilter::SetStatus(bool On)
 {
+  cMutexLock MutexLock(&mutex);
   cFilter::SetStatus(On);
   sectionSyncer.Reset();
+  if (!On)
+     source = cSource::stNone;
+}
+
+void cSdtFilter::Trigger(int Source)
+{
+  cMutexLock MutexLock(&mutex);
+  source = Source;
 }
 
 void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
-  if (!(Source() && Transponder()))
+  cMutexLock MutexLock(&mutex);
+  if (!(source && Transponder()))
      return;
   SI::SDT sdt(Data, false);
   if (!sdt.CheckCRCAndParse())
@@ -40,9 +51,9 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      return;
   SI::SDT::Service SiSdtService;
   for (SI::Loop::Iterator it; sdt.serviceLoop.getNext(SiSdtService, it); ) {
-      cChannel *channel = Channels.GetByChannelID(tChannelID(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
+      cChannel *channel = Channels.GetByChannelID(tChannelID(source, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
       if (!channel)
-         channel = Channels.GetByChannelID(tChannelID(Source(), 0, Transponder(), SiSdtService.getServiceId()));
+         channel = Channels.GetByChannelID(tChannelID(source, 0, Transponder(), SiSdtService.getServiceId()));
       if (channel)
          channel->SetSeen();
 
@@ -66,7 +77,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         sd->serviceName.getText(NameBuf, ShortNameBuf, sizeof(NameBuf), sizeof(ShortNameBuf));
                         char *pn = compactspace(NameBuf);
                         char *ps = compactspace(ShortNameBuf);
-                        if (!*ps && cSource::IsCable(Source())) {
+                        if (!*ps && cSource::IsCable(source)) {
                            // Some cable providers don't mark short channel names according to the
                            // standard, but rather go their own way and use "name>short name":
                            char *p = strchr(pn, '>'); // fix for UPC Wien
@@ -117,7 +128,7 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::NVODReferenceDescriptor *nrd = (SI::NVODReferenceDescriptor *)d;
                  SI::NVODReferenceDescriptor::Service Service;
                  for (SI::Loop::Iterator it; nrd->serviceLoop.getNext(Service, it); ) {
-                     cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
+                     cChannel *link = Channels.GetByChannelID(tChannelID(source, Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
                      if (!link && Setup.UpdateChannels >= 4) {
                         link = Channels.NewChannel(Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
                         patFilter->Trigger(Service.getServiceId());
@@ -142,6 +153,6 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
          }
       }
   if (sdt.getSectionNumber() == sdt.getLastSectionNumber())
-     Channels.MarkObsoleteChannels(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
+     Channels.MarkObsoleteChannels(source, sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
   Channels.Unlock();
 }
diff --git a/sdt.h b/sdt.h
index 6b3f24ff3..01653f452 100644
--- a/sdt.h
+++ b/sdt.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.h 3.0 2004/01/05 14:30:14 kls Exp $
+ * $Id: sdt.h 3.1 2014/03/10 14:40:54 kls Exp $
  */
 
 #ifndef __SDT_H
@@ -15,13 +15,16 @@
 
 class cSdtFilter : public cFilter {
 private:
+  cMutex mutex;
   cSectionSyncer sectionSyncer;
+  int source;
   cPatFilter *patFilter;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
   cSdtFilter(cPatFilter *PatFilter);
   virtual void SetStatus(bool On);
+  void Trigger(int Source);
   };
 
 #endif //__SDT_H
diff --git a/skinlcars.c b/skinlcars.c
index d652251e3..e9d1e28f9 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 3.6 2013/11/16 13:20:19 kls Exp $
+ * $Id: skinlcars.c 3.7 2014/03/10 12:04:06 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1361,7 +1361,7 @@ void cSkinLCARSDisplayMenu::DrawLiveIndicator(void)
   if (initial || y != lastLiveIndicatorY || Transferring != lastLiveIndicatorTransferring) {
      if (lastLiveIndicatorY >= 0)
         osd->DrawRectangle(xs12, lastLiveIndicatorY, xs13 - 1, lastLiveIndicatorY + lineHeight - 1, Theme.Color(clrBackground));
-     if (y >= 0) {
+     if (y > 0) {
         tColor ColorBg = Theme.Color(clrChannelFrameBg);
         osd->DrawRectangle(xs12, y, xs12 + lineHeight / 2 - 1, y + lineHeight - 1, ColorBg);
         osd->DrawEllipse  (xs12 + lineHeight / 2, y, xs13 - 1, y + lineHeight - 1, ColorBg, 5);
diff --git a/sourceparams.c b/sourceparams.c
index 2f7b4e8ae..3eec406a6 100644
--- a/sourceparams.c
+++ b/sourceparams.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sourceparams.c 3.0 2010/03/06 11:13:39 kls Exp $
+ * $Id: sourceparams.c 3.1 2014/03/09 12:03:09 kls Exp $
  */
 
 #include "sourceparams.h"
@@ -21,8 +21,8 @@ cSourceParam::cSourceParam(char Source, const char *Description)
         return;
         }
      SourceParams.Add(this);
-     if (!strchr("ACST", Source)) // no, it's not "ATSC" ;-)
-        Sources.Add(new cSource(Source, Description));
+     if (!Sources.ContainsSourceType(source))
+        Sources.Add(new cSource(source, Description));
      dsyslog("registered source parameters for '%c - %s'", source, Description);
      }
   else
diff --git a/sources.c b/sources.c
index c2a3dba1f..f0a343278 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 3.5 2013/12/28 11:33:08 kls Exp $
+ * $Id: sources.c 3.6 2014/03/09 12:05:42 kls Exp $
  */
 
 #include "sources.h"
@@ -124,3 +124,12 @@ cSource *cSources::Get(int Code)
       }
   return NULL;
 }
+
+bool cSources::ContainsSourceType(char SourceType)
+{
+  for (cSource *p = First(); p; p = Next(p)) {
+      if (cSource::ToChar(p->Code()) == SourceType)
+         return true;
+      }
+  return false;
+}
diff --git a/sources.h b/sources.h
index 8c2fdfb86..1cd05b83e 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 3.2 2013/08/21 10:27:32 kls Exp $
+ * $Id: sources.h 3.3 2014/03/09 11:59:49 kls Exp $
  */
 
 #ifndef __SOURCES_H
@@ -62,6 +62,7 @@ class cSource : public cListObject {
 class cSources : public cConfig<cSource> {
 public:
   cSource *Get(int Code);
+  bool ContainsSourceType(char SourceType);
   };
 
 extern cSources Sources;
diff --git a/vdr.5 b/vdr.5
index 4c273a87d..645ce38b1 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 3.1 2013/08/11 13:50:42 kls Exp $
+.\" $Id: vdr.5 3.2 2014/03/16 10:38:31 kls Exp $
 .\"
 .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -99,12 +99,15 @@ l l.
 \fBI\fR@Inversion (0, 1)
 \fBL\fR@Left circular polarization
 \fBM\fR@Modulation (2, 5, 6, 7, 10, 11, 12, 16, 32, 64, 128, 256, 999)
+\fBN\fR@pilot mode (0, 1, 999)
 \fBO\fR@rollOff (0, 20, 25, 35)
 \fBP\fR@stream id (0-255)
+\fBQ\fR@t2 system id (0-65535)
 \fBR\fR@Right circular polarization
 \fBS\fR@delivery System (0, 1)
 \fBT\fR@Transmission mode (1, 2, 4, 8, 16, 32)
 \fBV\fR@Vertical polarization
+\fBX\fR@siso/miso mode (0, 1)
 \fBY\fR@hierarchY (0, 1, 2, 4)
 .TE
 
@@ -139,6 +142,8 @@ l l.
 \fB256\fR@QAM256 (DVB-C, DVB-T2)
 .TE
 
+\fBPilot mode:\fR The pilot mode (0 = "off", 1 = "on", 999 = "auto") for DVB-S2 multiplex (DVB-S2 only).
+
 \fBRolloff:\fR The Nyquist filter rolloff factor for DVB-S (\fB35\fR) and DVB-S2 (\fB35\fR, 25, 20),
 35 = 0.35, 25 = 0.25, 20 = 0.20, DVB-S/DVB-S2 default value is 0.35
 
@@ -146,8 +151,12 @@ l l.
 Physical Layer Pipe (PLP) id (\fB0\fR-255) for DVB-T2 multiplex (DVB-S2/DVB-T2 only,
 with devices that support "multi streaming").
 
+\fBT2 System id:\fR Unique identifier (\fB0\fR-65535) of T2 system within the DVB network (DVB-T2).
+
 \fBTransmission mode:\fR Number of DVB-T OFDM carriers, 32 = 32k, 16 = 16k, 8 = 8k, 4 = 4k, 2 = 2k, 1 = 1k. If in doubt, try 8k.
 
+\fBSISO/MISO mode:\fR Specifies the Single-Input/Multiple-Input Single-Output mode (\fB0\fR = SISO, 1 = MISO) (DVB-T2).
+
 \fBHierarchy:\fR If set to 1, this transponder uses two streams, high priority and low priority.
 If in doubt, try 0 (off). (DVB-T/DVB-T2 only).
 
diff --git a/vdr.c b/vdr.c
index ff4688ee7..835d33df9 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.10 2014/01/26 12:27:51 kls Exp $
+ * $Id: vdr.c 3.11 2014/03/16 12:49:13 kls Exp $
  */
 
 #include <getopt.h>
@@ -34,6 +34,9 @@
 #include <stdlib.h>
 #include <sys/capability.h>
 #include <sys/prctl.h>
+#ifdef SDNOTIFY
+#include <systemd/sd-daemon.h>
+#endif
 #include <termios.h>
 #include <unistd.h>
 #include "audio.h"
@@ -845,6 +848,10 @@ int main(int argc, char *argv[])
      alarm(WatchdogTimeout); // Initial watchdog timer start
      }
 
+#ifdef SDNOTIFY
+  sd_notify(0, "READY=1");
+#endif
+
   // Main program loop:
 
 #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)

From 2db73975424cf3df972c99af7bdee020aee23c8b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 18 Jan 2015 11:38:00 +0100
Subject: [PATCH 238/307] Version 2.1.7 VDR developer version 2.1.7 is now
 available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.7.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.6-2.1.7.diff

MD5 checksums:

1c954bad31ce74cd1cbd7987e62d2a98  vdr-2.1.7.tar.bz2
88a90327a75833b7723942d3bd25f954  vdr-2.1.6-2.1.7.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- No longer logging an error message in DirSizeMB() if the given directory doesn't
  exist. This avoids lots of log entries in case several VDRs use the same video
  directory and one of them has already physically removed a recording directory,
  while the others still have it in their list of deleted recordings.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- A cCamSlot that has WantsTsData set to true in its constructor now also gets
  the CAT and EMM PIDs data.
- Fixed a possible division by zero in frame rate detection.
- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
  to Lars Hanisch). See vdr.1 and vdr.5 for details.
- Fixed a possible crash in the LCARS skin (thanks to Thomas Reufer).
- Updated the dvbhddevice plugin source.
- Fixed a bug in the Makefile when installing plugins with LCLBLD=1 (thanks to
  Stefan Huelswitt).
- The pid of the PMT in which the CA descriptors of a given channel are broadcast
  is now stored together with the CA descriptors and can be retrieved by calling
  GetPmtPid() (this information is only required to receive encrypted channels
  with the OctopusNet receiver via the 'satip' plugin).
- Channels that are not listed in the SDT are now only marked as OBSOLETE if
  "Setup/DVB/Update channels" is set to a value other than "no" or "PIDs only".
- Fixed multiple OBSOLETE marks in channels that are not listed in the SDT in case
  "Setup/Miscellaneous/Show channel names with source" is set to "yes".
- The new function cOsd::DrawScaledBitmap() is now used for drawing subtitles.
  This function can be reimplemented by high level OSDs which may be able to do
  the scaling in hardware or otherwise more efficiently (thanks to Thomas Reufer).
- Fixed detaching receivers from devices in case a CAM needs to receive the TS
  (reported by Dietmar Spingler).
- Fixed resetting the receiver for EMM pids for CAMs that need to receive the TS
  (reported by Dietmar Spingler).
- Fixed (well, actually worked around) a problem with subtitles not being displayed
  because the broadcaster doesn't set the data's version numbers as required by the
  DVB standard (thanks to Rolf Ahrenberg).
- Fixed support for systemd (thanks to Christopher Reimer).
- Added a missing backslash to the help text of the SVDRP command MOVR (thanks to
  Lars Hanisch).
- Added subsystem id support for DVB devices connected via USB (thanks to Jose
  Alberto Reguero).
- Added the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
  to the cVector class (thanks to Stefan Schallenberg).
- Fixed a possible out-of-bounds access in cVector::Remove().
- Added functions to set and retrieve the priority of a cReceiver (suggested by
  Frank Schmirler).
- Added the new parameters "Setup/Miscellaneous/Volume steps" and
  ".../Volume linearize" (thanks to Claus Muus). See the MANUAL for details.
- Fixed jumping to an absolute position via the Red key in case replay was paused
  (reported by Dieter Ferdinand).
- Changed the German weekday names from "MonDieMitDonFreSamSon" to
  "Mo.Di.Mi.Do.Fr.Sa.So." (thanks to Stefan Blochberger).
- Now handling CAT sections that consist of more than one TS packet.
- Added handling for DTS audio tracks to cPatPmtParser::ParsePmt() (thanks to
  Thomas Reufer).
- Added support for PGS subtitles (thanks to Thomas Reufer).
- Use of the function cOsd::GetBitmap() outside of derived classes is now deprecated,
  and it may be made 'protected' in a future version, since it doesn't work with
  TrueColor OSDs. Plugin authors may want to modify their code so that it
  works without this function.
- Modified the descriptions of several threads, so that the important information
  (like device or frontend numbers) is within the first 15 characters of the
  string, because only these are displayed in thread listings. Plugin authors may
  want to do the same.
- Added the channel name to log messages that reference a channel (suggested by
  Dietmar Spingler).
- Modified the CAM API so that it is possible to implement CAMs that can be freely
  assigned to any devices (thanks to Jasmin Jessich).
- Plugins can now implement the function SetMenuSortMode() in their skin objects
  derived from cSkinDisplayMenu, to get informed about the currently used sort
  mode, if applicable (suggested by Martin Schirrmacher).
- Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
  can call to signal a change in the OSD that requires a redraw of the currently
  displayed object (thanks to Thomas Reufer).
- Added a comment to cRecorder::Activate() about the need to call Detach() in the
  destructor (suggested by Eike Sauer).
- Now returning from removing deleted recordings after at most 10 seconds, or if the
  user presses a remote control key, to keep the system from getting unresponsive
  when removing a huge number of files (reported by Dieter Ferdinand).
- Fixed generating the index file of an existing recording in case at the of a TS file
  there is less data in the buffer than needed by the frame detector. In such a case
  it was possible that frames were missed, and there was most likely a distortion
  when replaying that part of a recording. This is mostly a problem for recordings that
  consist of more than one *.ts file. Single file recordings could only lose some
  frames at their very end, which probably doesn't matter. At any rate, if you have
  generated an index file with VDR version 2.0.6, 2.1.5 or 2.1.6, you may want to
  do so again with this version to make sure the index is OK.
- Added the new command line option --updindex, which can be used to update an
  incomplete index of a recording (based on a patch from Helmut Auer).
---
 CONTRIBUTORS                            |  45 ++++
 HISTORY                                 | 134 ++++++++++
 MANUAL                                  |  11 +
 Make.config.template                    |   3 +-
 Makefile                                |  12 +-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |  42 ++-
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h |   1 +
 PLUGINS/src/dvbhddevice/hdffosd.c       |  80 ++++--
 PLUGINS/src/dvbhddevice/menu.c          |   7 +-
 PLUGINS/src/dvbhddevice/po/de_DE.po     |   5 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po     |   5 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po     |   5 +-
 PLUGINS/src/dvbhddevice/setup.c         |  29 ++-
 PLUGINS/src/dvbhddevice/setup.h         |   2 +
 args.c                                  | 129 +++++++++
 args.h                                  |  34 +++
 channels.c                              |  19 +-
 ci.c                                    | 172 ++++++++++--
 ci.h                                    |  14 +-
 config.c                                |   8 +-
 config.h                                |  12 +-
 device.c                                |  22 +-
 device.h                                |   4 +-
 dvbci.c                                 |   4 +-
 dvbdevice.c                             |  30 ++-
 dvbsubtitle.c                           | 332 +++++++++++++++++++++---
 dvbsubtitle.h                           |   3 +-
 interface.c                             |   8 +-
 menu.c                                  |  24 +-
 menu.h                                  |   3 +-
 osd.c                                   |  23 +-
 osd.h                                   |  16 +-
 osdbase.c                               |   9 +-
 osdbase.h                               |   4 +-
 pat.c                                   |  27 +-
 pat.h                                   |   5 +-
 po/ar.po                                |   8 +-
 po/ca_ES.po                             |   8 +-
 po/cs_CZ.po                             |   8 +-
 po/da_DK.po                             |   8 +-
 po/de_DE.po                             |  10 +-
 po/el_GR.po                             |   8 +-
 po/es_ES.po                             |   8 +-
 po/et_EE.po                             |   8 +-
 po/fi_FI.po                             |   8 +-
 po/fr_FR.po                             |   8 +-
 po/hr_HR.po                             |   8 +-
 po/hu_HU.po                             |   8 +-
 po/it_IT.po                             |  22 +-
 po/lt_LT.po                             |   8 +-
 po/mk_MK.po                             |   8 +-
 po/nl_NL.po                             |   8 +-
 po/nn_NO.po                             |   8 +-
 po/pl_PL.po                             |   8 +-
 po/pt_PT.po                             |   8 +-
 po/ro_RO.po                             |   8 +-
 po/ru_RU.po                             |   8 +-
 po/sk_SK.po                             |   8 +-
 po/sl_SI.po                             |   8 +-
 po/sr_RS.po                             |   8 +-
 po/sv_SE.po                             |   8 +-
 po/tr_TR.po                             |   8 +-
 po/uk_UA.po                             |   8 +-
 po/zh_CN.po                             |   8 +-
 receiver.c                              |   9 +-
 receiver.h                              |   5 +-
 recorder.h                              |  10 +-
 recording.c                             |  74 ++++--
 recording.h                             |  10 +-
 remux.c                                 |  46 +++-
 remux.h                                 |   3 +-
 sdt.c                                   |   8 +-
 sections.c                              |   5 +-
 skinlcars.c                             |   6 +-
 skins.h                                 |  14 +-
 svdrp.c                                 |   4 +-
 thread.h                                |  10 +-
 tools.c                                 |   4 +-
 tools.h                                 |  37 ++-
 vdr.1                                   |  22 +-
 vdr.5                                   |  29 ++-
 vdr.c                                   |  40 ++-
 82 files changed, 1614 insertions(+), 245 deletions(-)
 create mode 100644 args.c
 create mode 100644 args.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 304be837e..988a80f4d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -232,6 +232,7 @@ Stefan Huelswitt <s.huelswitt@gmx.de>
  featured DVB cards
  for pointing out a bug in handling lowercase polarization characters in channel
  definitions if no DiSEqC is used
+ for fixing a bug in the Makefile when installing plugins with LCLBLD=1
 
 Ulrich R�der <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
@@ -622,6 +623,7 @@ Helmut Auer <vdr@helmutauer.de>
  via the main menu and by pressing the Recordings key
  for helping to debug a problem with frame detection in MPEG-2 streams that have "bottom fields"
  or varying GOP structures
+ for a patch that was used to implement the command line option --updindex
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1188,6 +1190,8 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for reporting a problem with adding new source types in case they are already
  registered
  for adding support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters
+ for fixing a problem with subtitles not being displayed because the broadcaster
+ doesn't set the data's version numbers as required by the DVB standard
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2546,6 +2550,7 @@ Frank Schmirler <vdr@schmirler.de>
  for suggestions used in revising priority handling to allow receivers with a priority
  that is lower than that of live viewing
  for fixing handling IDLEPRIORITY in cDvbDevice::ProvidesChannel()
+ for suggesting to add functions to set and retrieve the priority of a cReceiver
 
 J�rn Reder <joern@zyn.de>
  for reporting that a recording may unnecessarily block a device with a CAM, while
@@ -2615,6 +2620,7 @@ Jose Alberto Reguero <jareguero@telefonica.net>
  for a patch that fixed part of a crash in i18n character set conversion
  for fixing cDvbPlayer::NextFile() to handle files larger than 2GB
  for implementing full handling of the stream types of Dolby Digital pids
+ for adding subsystem id support for DVB devices connected via USB
 
 Patrice Staudt <staudt@engsystem.net>
  for adding full weekday names to i18n.c for plugins to use
@@ -2895,6 +2901,8 @@ Lars Hanisch <dvb@flensrocker.de>
  the caller to have it display only a certain subset of the recordings
  for adding handling UTF-8 'umlaut' characters to cKbdRemote
  for fixing learning keyboard remote control codes
+ for making VDR read command line options from *.conf files in /etc/vdr/conf.d
+ for adding a missing backslash to the help text of the SVDRP command MOVR
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -3168,6 +3176,7 @@ Stefan Blochberger <Stefan.Blochberger@gmx.de>
  recording is started
  for suggesting that floating point numbers presented to the user shall be displayed
  in the way defined by the current locale
+ for changing the German weekday names from "MonDieMitDonFreSamSon" to "Mo.Di.Mi.Do.Fr.Sa.So."
 
 Cedric Dewijs <cedric.dewijs@telfort.nl>
  for adding maximum SNR value for PCTV Systems PCTV 73ESE
@@ -3259,11 +3268,18 @@ Thomas Reufer <thomas@reufer.ch>
  for suggesting to add an additional parameter named Forward to cDevice::TrickSpeed()
  for suggesting to add a note to ePlayMode in device.h that VDR itself always uses
  pmAudioVideo when replaying a recording
+ for fixing a possible crash in the LCARS skin
+ for implementing cOsd::DrawScaledBitmap()
+ for adding handling for DTS audio tracks to cPatPmtParser::ParsePmt()
+ for adding support for PGS subtitles
+ for adding cOsdProvider::OsdSizeChanged()
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
  frame borders
  for reporting a problem in handling the frame detection buffer length
+ for suggesting to add a comment to cRecorder::Activate() about the need to call
+ Detach() in the destructor
 
 Christian Paulick <cpaulick@xeatre.tv>
  for reporting a problem with frame detection in MPEG-2 streams that have "bottom fields"
@@ -3284,3 +3300,32 @@ Tony Houghton <h@realh.co.uk>
 Christian Winkler <winkler_chr@yahoo.de>
  for reporting a problem with transfer mode on full featured DVB cards for encrypted
  channels that have no audio pid
+
+Dietmar Spingler <d_spingler@gmx.de>
+ for reporting a problem that led to a fix in detaching receivers from devices in case
+ a CAM needs to receive the TS
+ for reporting a problem that led to a fix with EMM pids not being properly reset for
+ CAMs that need to receive the TS
+ for suggesting to add the channel name to log messages that reference a channel
+
+Stefan Schallenberg <infos@nafets.de>
+ for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
+ to the cVector class
+
+Claus Muus <email@clausmuus.de>
+ for adding the new parameters "Setup/Miscellaneous/Volume steps" and
+ ".../Volume linearize"
+
+Dieter Ferdinand <dieter.ferdinand@gmx.de>
+ for reporting a problem with jumping to an absolute position via the Red key in
+ case replay was paused
+ for reporting a problem with the system getting unresponsive when removing a huge
+ number of files in the thread that removes deleted recordings
+
+Jasmin Jessich <jasmin@anw.at>
+ for modifying the CAM API so that it is possible to implement CAMs that can be freely
+ assigned to any devices
+
+Martin Schirrmacher <schirrmie@gmail.com>
+ for suggesting to provide a way for skin plugins to get informed about the currently
+ used sort mode of a menu
diff --git a/HISTORY b/HISTORY
index c2ebc46d3..6d934ebd8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8260,3 +8260,137 @@ Video Disk Recorder Revision History
   IsOnVideoDirectoryFileSystem().
 - Added support for systemd (thanks to Christopher Reimer). To activate this you
   need to add "SDNOTIFY=1" to the 'make' call.
+
+2014-03-22: Version 2.0.6
+
+- Updated 'sources.conf' (thanks to Antti Hartikainen).
+- cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
+  This prevents a crash with the LCARS skin on a system that has no fonts.
+- Fixed detecting frame borders in MPEG-2 streams that have "bottom fields" or varying
+  GOP structures (reported by Christian Paulick, with help from Helmut Auer).
+- Fixed a wrong alignment in cCiDateTime::SendDateTime().
+- Now checking whether the primary device actually has a decoder before retuning the
+  current channel after a change in its parameters. This fixes broken recordings on
+  the primary device on "headless" systems.
+- Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 100 and introduced counting the number
+  of actual video TS packets in cTsPayload in order to be able to record channels that
+  sometimes need even more than 10 TS packets for detecting frame borders (reported by
+  Eike Sauer and Oliver Endriss).
+- Fixed sorting recordings by time in the Recordings menu if "Setup/OSD/Recording
+  directories" is set to "no".
+- Fixed clearing non-editable members in the channel editor (thanks to Rolf Ahrenberg).
+- Fixed flickering if subtitles are active while the OSD demo is running.
+- Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
+- Fixed learning keyboard remote control codes (thanks to Lars Hanisch).
+- Fixed the replay progress display for very long recordings.
+- Improved PAT/PMT scanning to speed up initial tuning to encrypted channels on
+  transponders with many PAT entries (reported by Mariusz Bialonczyk).
+- Fixed detecting broken video data streams when recording.
+- Fixed handling frame detection buffer length (reported by Eike Sauer).
+- Fixed keeping the current position in the Recordings menu if a recording was
+  deleted in a sub folder.
+- Fixed handling transfer mode on full featured DVB cards for encrypted channels
+  that have no audio pid (reported by Christian Winkler).
+- Fixed a possible endless loop in cH264Parser::GetGolombUe(), which caused recordings
+  on some HD channels to get stuck and resulted in buffer overflows.
+- Fixed handling PAT packets when detecting frames, so that they can be properly
+  taken into account when regenerating the index of a recording.
+- Fixed adding new source types in case they are already registered (reported by Rolf
+  Ahrenberg).
+- Fixed drawing the live indicator in the LCARS skin in case there are no devices.
+- The SDT is now only parsed *after* the NIT has been read, and it explicitly uses
+  the source value derived from the NIT. This should prevent new channels from being
+  created with the wrong source.
+- Now initializing the isOnVideoDirectoryFileSystem member of cRecording when
+  scanning the video directory, so that it won't cause a delay when opening the menu
+  on a system with a large number of recordings.
+- The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
+  the functional modification to cFont::CreateFont().
+
+2015-01-18: Version 2.1.7
+
+- No longer logging an error message in DirSizeMB() if the given directory doesn't
+  exist. This avoids lots of log entries in case several VDRs use the same video
+  directory and one of them has already physically removed a recording directory,
+  while the others still have it in their list of deleted recordings.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- A cCamSlot that has WantsTsData set to true in its constructor now also gets
+  the CAT and EMM PIDs data.
+- Fixed a possible division by zero in frame rate detection.
+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
+  to Lars Hanisch). See vdr.1 and vdr.5 for details.
+- Fixed a possible crash in the LCARS skin (thanks to Thomas Reufer).
+- Updated the dvbhddevice plugin source.
+- Fixed a bug in the Makefile when installing plugins with LCLBLD=1 (thanks to
+  Stefan Huelswitt).
+- The pid of the PMT in which the CA descriptors of a given channel are broadcast
+  is now stored together with the CA descriptors and can be retrieved by calling
+  GetPmtPid() (this information is only required to receive encrypted channels
+  with the OctopusNet receiver via the 'satip' plugin).
+- Channels that are not listed in the SDT are now only marked as OBSOLETE if
+  "Setup/DVB/Update channels" is set to a value other than "no" or "PIDs only".
+- Fixed multiple OBSOLETE marks in channels that are not listed in the SDT in case
+  "Setup/Miscellaneous/Show channel names with source" is set to "yes".
+- The new function cOsd::DrawScaledBitmap() is now used for drawing subtitles.
+  This function can be reimplemented by high level OSDs which may be able to do
+  the scaling in hardware or otherwise more efficiently (thanks to Thomas Reufer).
+- Fixed detaching receivers from devices in case a CAM needs to receive the TS
+  (reported by Dietmar Spingler).
+- Fixed resetting the receiver for EMM pids for CAMs that need to receive the TS
+  (reported by Dietmar Spingler).
+- Fixed (well, actually worked around) a problem with subtitles not being displayed
+  because the broadcaster doesn't set the data's version numbers as required by the
+  DVB standard (thanks to Rolf Ahrenberg).
+- Fixed support for systemd (thanks to Christopher Reimer).
+- Added a missing backslash to the help text of the SVDRP command MOVR (thanks to
+  Lars Hanisch).
+- Added subsystem id support for DVB devices connected via USB (thanks to Jose
+  Alberto Reguero).
+- Added the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
+  to the cVector class (thanks to Stefan Schallenberg).
+- Fixed a possible out-of-bounds access in cVector::Remove().
+- Added functions to set and retrieve the priority of a cReceiver (suggested by
+  Frank Schmirler).
+- Added the new parameters "Setup/Miscellaneous/Volume steps" and
+  ".../Volume linearize" (thanks to Claus Muus). See the MANUAL for details.
+- Fixed jumping to an absolute position via the Red key in case replay was paused
+  (reported by Dieter Ferdinand).
+- Changed the German weekday names from "MonDieMitDonFreSamSon" to
+  "Mo.Di.Mi.Do.Fr.Sa.So." (thanks to Stefan Blochberger).
+- Now handling CAT sections that consist of more than one TS packet.
+- Added handling for DTS audio tracks to cPatPmtParser::ParsePmt() (thanks to
+  Thomas Reufer).
+- Added support for PGS subtitles (thanks to Thomas Reufer).
+- Use of the function cOsd::GetBitmap() outside of derived classes is now deprecated,
+  and it may be made 'protected' in a future version, since it doesn't work with
+  TrueColor OSDs. Plugin authors may want to modify their code so that it
+  works without this function.
+- Modified the descriptions of several threads, so that the important information
+  (like device or frontend numbers) is within the first 15 characters of the
+  string, because only these are displayed in thread listings. Plugin authors may
+  want to do the same.
+- Added the channel name to log messages that reference a channel (suggested by
+  Dietmar Spingler).
+- Modified the CAM API so that it is possible to implement CAMs that can be freely
+  assigned to any devices (thanks to Jasmin Jessich).
+- Plugins can now implement the function SetMenuSortMode() in their skin objects
+  derived from cSkinDisplayMenu, to get informed about the currently used sort
+  mode, if applicable (suggested by Martin Schirrmacher).
+- Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
+  can call to signal a change in the OSD that requires a redraw of the currently
+  displayed object (thanks to Thomas Reufer).
+- Added a comment to cRecorder::Activate() about the need to call Detach() in the
+  destructor (suggested by Eike Sauer).
+- Now returning from removing deleted recordings after at most 10 seconds, or if the
+  user presses a remote control key, to keep the system from getting unresponsive
+  when removing a huge number of files (reported by Dieter Ferdinand).
+- Fixed generating the index file of an existing recording in case at the of a TS file
+  there is less data in the buffer than needed by the frame detector. In such a case
+  it was possible that frames were missed, and there was most likely a distortion
+  when replaying that part of a recording. This is mostly a problem for recordings that
+  consist of more than one *.ts file. Single file recordings could only lose some
+  frames at their very end, which probably doesn't matter. At any rate, if you have
+  generated an index file with VDR version 2.0.6, 2.1.5 or 2.1.6, you may want to
+  do so again with this version to make sure the index is OK.
+- Added the new command line option --updindex, which can be used to update an
+  incomplete index of a recording (based on a patch from Helmut Auer).
diff --git a/MANUAL b/MANUAL
index 83f16b9ed..4c7e6c88e 100644
--- a/MANUAL
+++ b/MANUAL
@@ -999,6 +999,17 @@ Version 2.0
                          VDR was stopped will be used. The valid range is from
                          0 (silent) to 255 (loudest).
 
+  Volume steps = 51      The number of steps the volume will use when moving from
+                         the lowest to the highest value. The valid range is from
+                         5 to 255.
+
+  Volume linearize = 0   How to linearize the volume control. The valid range is
+                         from -20 to 20. A value of 0 results in no linearization.
+                         The higher this value is, the more fine grained the control
+                         of the volume is for low sound levels. Lower values do the
+                         same for high sound levels. This allows you to adjust the
+                         more or less linear volume control of your sound card.
+
   Channels wrap = no     During zapping with the "Up" and "Down" keys (or the
                          "Channel+" and "Channel-" keys) the current channel will
                          wrap around the beginning or end of the channel list if
diff --git a/Make.config.template b/Make.config.template
index 9b1c4ddbc..dbb541400 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.0 2013/02/18 10:55:39 kls Exp $
+# $Id: Make.config.template 3.1 2014/04/14 11:43:53 kls Exp $
 
 ### The C compiler and options:
 
@@ -38,6 +38,7 @@ endif
 
 #VIDEODIR  = /srv/vdr/video
 #CONFDIR   = /var/lib/vdr
+#ARGSDIR   = /etc/vdr/conf.d
 #CACHEDIR  = /var/cache/vdr
 
 # Overrides for preset/legacy configurations:
diff --git a/Makefile b/Makefile
index 0d3a8fc39..40a610aed 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 3.2 2014/03/16 12:47:35 kls Exp $
+# $Id: Makefile 3.4 2015/01/01 13:52:07 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -31,6 +31,7 @@ PLUGINDIR ?= $(CWD)/PLUGINS
 DESTDIR   ?=
 VIDEODIR  ?= /srv/vdr/video
 CONFDIR   ?= /var/lib/vdr
+ARGSDIR   ?= /etc/vdr/conf.d
 CACHEDIR  ?= /var/cache/vdr
 
 PREFIX    ?= /usr/local
@@ -66,7 +67,7 @@ endif
 
 SILIB    = $(LSIDIR)/libsi.a
 
-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
+OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
        lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o positioner.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
@@ -104,6 +105,7 @@ LIRC_DEVICE ?= /var/run/lirc/lircd
 DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
 DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
 DEFINES += -DCONFDIR=\"$(CONFDIR)\"
+DEFINES += -DARGSDIR=\"$(ARGSDIR)\"
 DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
 DEFINES += -DRESDIR=\"$(RESDIR)\"
 DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
@@ -146,8 +148,9 @@ $(SILIB):
 vdr.pc:
 	@echo "bindir=$(BINDIR)" > $@
 	@echo "mandir=$(MANDIR)" >> $@
-	@echo "configdir=$(CONFDIR)" >> $@
 	@echo "videodir=$(VIDEODIR)" >> $@
+	@echo "configdir=$(CONFDIR)" >> $@
+	@echo "argsdir=$(ARGSDIR)" >> $@
 	@echo "cachedir=$(CACHEDIR)" >> $@
 	@echo "resdir=$(RESDIR)" >> $@
 	@echo "libdir=$(LIBDIR)" >> $@
@@ -225,7 +228,7 @@ plugins: include-dir vdr.pc
 	    INCLUDES="-I$(CWD)/include"\
 	    $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\
 	    if [ -n "$(LCLBLD)" ] ; then\
-	       (cd $(PLUGINDIR)/src/$$i; for l in `find -name 'libvdr-*.so' -o -name 'lib$$i-*.so'`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\
+	       (cd $(PLUGINDIR)/src/$$i; for l in `find -name "libvdr-*.so" -o -name "lib$$i-*.so"`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\
 	       if [ -d $(PLUGINDIR)/src/$$i/po ]; then\
 	          for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\
 	              install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\
@@ -265,6 +268,7 @@ install-bin: vdr
 install-dirs:
 	@mkdir -p $(DESTDIR)$(VIDEODIR)
 	@mkdir -p $(DESTDIR)$(CONFDIR)
+	@mkdir -p $(DESTDIR)$(ARGSDIR)
 	@mkdir -p $(DESTDIR)$(CACHEDIR)
 	@mkdir -p $(DESTDIR)$(RESDIR)
 
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
index 9c68e1494..8ee80754e 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
@@ -108,17 +108,12 @@ cDvbHdFfDevice::~cDvbHdFfDevice()
 
 void cDvbHdFfDevice::MakePrimaryDevice(bool On)
 {
-  if (On) {
-     new cHdffOsdProvider(mHdffCmdIf);
-     //TODO the same code is also used in cHdffSetupPage::Store() and cHdffMenu::SetVideoConversion() - combine?
-     HdffVideoFormat_t videoFormat;
-     videoFormat.AutomaticEnabled = true;
-     videoFormat.AfdEnabled = false;
-     videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
-     videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
-     mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
-     }
-  cDvbDevice::MakePrimaryDevice(On);
+    if (On) {
+        new cHdffOsdProvider(mHdffCmdIf);
+
+        gHdffSetup.SetVideoFormat(mHdffCmdIf);
+    }
+    cDvbDevice::MakePrimaryDevice(On);
 }
 
 bool cDvbHdFfDevice::HasDecoder(void) const
@@ -243,6 +238,26 @@ uchar *cDvbHdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, i
     return result;
 }
 
+void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
+{
+    if (gHdffSetup.TvFormat == HDFF_TV_FORMAT_4_BY_3)
+    {
+        switch (VideoDisplayFormat)
+        {
+            case vdfPanAndScan:
+            case vdfCenterCutOut:
+                gHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
+                break;
+
+            case vdfLetterBox:
+                gHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
+                break;
+        }
+        gHdffSetup.SetVideoFormat(mHdffCmdIf);
+    }
+    cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
+}
+
 void cDvbHdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
 {
   if (fd_video >= 0) {
@@ -795,6 +810,11 @@ int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
         mHdffCmdIf->CmdAvEnableSync(0, true);
         isPlayingVideo = true;
     }
+
+    // ignore padding PES packets
+    if (Data[3] == 0xBE)
+        return Length;
+
     //TODO: support greater Length
     uint8_t tsBuffer[188 * 16];
     uint32_t tsLength;
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
index eb3634bda..580bf9e4d 100644
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
@@ -51,6 +51,7 @@ class cDvbHdFfDevice : public cDvbDevice {
 // Video format facilities
 
 public:
+  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
   virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
 
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 5ee2db785..47a5ab053 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -663,14 +663,23 @@ void cHdffOsdRaw::Flush(void)
 {
     if (!Active() || (mDisplay == HDFF_INVALID_HANDLE))
         return;
-    //struct timeval start;
-    //struct timeval end;
-    //struct timezone timeZone;
-    //gettimeofday(&start, &timeZone);
+#ifdef MEASURE_OSD_TIME
+    struct timeval start;
+    struct timeval end;
+    struct timezone timeZone;
+    gettimeofday(&start, &timeZone);
+#endif
 
     bool render = false;
     if (IsTrueColor())
     {
+        uint8_t * buffer = 0;
+        if (gHdffSetup.TrueColorFormat != 0)
+        {
+            buffer = new uint8_t[MAX_BITMAP_SIZE];
+            if (!buffer)
+                return;
+        }
         LOCK_PIXMAPS;
         while (cPixmapMemory *pm = RenderPixmaps())
         {
@@ -682,17 +691,56 @@ void cHdffOsdRaw::Flush(void)
                 Chunk = h;
             for (int y = 0; y < h; y += Chunk)
             {
-                 int hc = Chunk;
-                 if (y + hc > h)
-                     hc = h - y;
-                 mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
-                     Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
-                     pm->Data() + y * d, w, hc, hc * d,
-                     HDFF_COLOR_TYPE_ARGB8888, HDFF_INVALID_HANDLE);
+                int hc = Chunk;
+                if (y + hc > h)
+                    hc = h - y;
+                if (gHdffSetup.TrueColorFormat == 0) // ARGB8888 (32 bit)
+                {
+                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
+                        Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
+                        pm->Data() + y * d, w, hc, hc * d,
+                        HDFF_COLOR_TYPE_ARGB8888, HDFF_INVALID_HANDLE);
+                }
+                else if (gHdffSetup.TrueColorFormat == 1) // ARGB8565 (24 bit)
+                {
+                    const tColor * pixmapData = (const tColor *) (pm->Data() + y * d);
+                    uint8_t * bitmapData = buffer;
+                    for (int i = 0; i < hc * w; i++)
+                    {
+                        bitmapData[2] =  (pixmapData[i] & 0xFF000000) >> 24;
+                        bitmapData[1] = ((pixmapData[i] & 0x00F80000) >> 16)
+                                      | ((pixmapData[i] & 0x0000E000) >> 13);
+                        bitmapData[0] = ((pixmapData[i] & 0x00001C00) >> 5)
+                                      | ((pixmapData[i] & 0x000000F8) >> 3);
+                        bitmapData += 3;
+                    }
+                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
+                        Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
+                        buffer, w, hc, hc * w * 3,
+                        HDFF_COLOR_TYPE_ARGB8565, HDFF_INVALID_HANDLE);
+                }
+                else if (gHdffSetup.TrueColorFormat == 2) // ARGB4444 (16 bit)
+                {
+                    const tColor * pixmapData = (const tColor *) (pm->Data() + y * d);
+                    uint16_t * bitmapData = (uint16_t *) buffer;
+                    for (int i = 0; i < hc * w; i++)
+                    {
+                        bitmapData[i] = ((pixmapData[i] & 0xF0000000) >> 16)
+                                      | ((pixmapData[i] & 0x00F00000) >> 12)
+                                      | ((pixmapData[i] & 0x0000F000) >> 8)
+                                      | ((pixmapData[i] & 0x000000F0) >> 4);
+                    }
+                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
+                        Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
+                        buffer, w, hc, hc * w * 2,
+                        HDFF_COLOR_TYPE_ARGB4444, HDFF_INVALID_HANDLE);
+                }
             }
             delete pm;
             render = true;
         }
+        if (buffer)
+            delete[] buffer;
     }
     else
     {
@@ -755,10 +803,12 @@ void cHdffOsdRaw::Flush(void)
     if (render)
     {
         mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-        //gettimeofday(&end, &timeZone);
-        //int timeNeeded = end.tv_usec - start.tv_usec;
-        //timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
-        //printf("time = %d\n", timeNeeded);
+#ifdef MEASURE_OSD_TIME
+        gettimeofday(&end, &timeZone);
+        int timeNeeded = end.tv_usec - start.tv_usec;
+        timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
+        printf("time = %d\n", timeNeeded);
+#endif
     }
     refresh = false;
 }
diff --git a/PLUGINS/src/dvbhddevice/menu.c b/PLUGINS/src/dvbhddevice/menu.c
index b7d35cfaa..fa953fbcd 100644
--- a/PLUGINS/src/dvbhddevice/menu.c
+++ b/PLUGINS/src/dvbhddevice/menu.c
@@ -56,12 +56,7 @@ eOSState cHdffMenu::ProcessKey(eKeys key)
 
 void cHdffMenu::SetVideoConversion(void)
 {
-    HdffVideoFormat_t videoFormat;
-    videoFormat.AutomaticEnabled = true;
-    videoFormat.AfdEnabled = false;
-    videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
-    videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
-    mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+    gHdffSetup.SetVideoFormat(mHdffCmdIf);
 
     char str[128];
     sprintf(str, "%s: %s", tr("Video Conversion"), gHdffSetup.GetVideoConversionString());
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index 34b19a7df..cca422be0 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-23 12:10+0200\n"
+"POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Christoph Haubrich\n"
 "Language-Team: <see README>\n"
@@ -121,5 +121,8 @@ msgstr "High Level OSD"
 msgid "Allow True Color OSD"
 msgstr "Erlaube True Color OSD"
 
+msgid "True Color format"
+msgstr "True Color Format"
+
 msgid "Hide mainmenu entry"
 msgstr "Hauptmenüeintrag verstecken"
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 8cb0fdeba..797aa7011 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-23 12:10+0200\n"
+"POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -121,5 +121,8 @@ msgstr "Käytä korkean tason kuvaruutunäyttöä"
 msgid "Allow True Color OSD"
 msgstr "Salli tosivärit kuvaruutunäytölle"
 
+msgid "True Color format"
+msgstr ""
+
 msgid "Hide mainmenu entry"
 msgstr "Piilota valinta päävalikosta"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index 02cb4a385..cfb4b1b54 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-23 12:10+0200\n"
+"POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2013-09-19 00:00+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
@@ -125,5 +125,8 @@ msgstr "OSD alto livello"
 msgid "Allow True Color OSD"
 msgstr "Permetti OSD True Color"
 
+msgid "True Color format"
+msgstr ""
+
 msgid "Hide mainmenu entry"
 msgstr "Nascondi voce menu principale"
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
index b9196880e..fd16a4807 100644
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ b/PLUGINS/src/dvbhddevice/setup.c
@@ -33,6 +33,7 @@ cHdffSetup::cHdffSetup(void)
     RemoteAddress = -1;
     HighLevelOsd = 1;
     TrueColorOsd = 1;
+    TrueColorFormat = 0;
     HideMainMenu = 0;
 }
 
@@ -54,6 +55,7 @@ bool cHdffSetup::SetupParse(const char *Name, const char *Value)
     else if (strcmp(Name, "RemoteAddress")     == 0) RemoteAddress     = atoi(Value);
     else if (strcmp(Name, "HighLevelOsd")      == 0) HighLevelOsd      = atoi(Value);
     else if (strcmp(Name, "TrueColorOsd")      == 0) TrueColorOsd      = atoi(Value);
+    else if (strcmp(Name, "TrueColorFormat")   == 0) TrueColorFormat   = atoi(Value);
     else if (strcmp(Name, "HideMainMenu")      == 0) HideMainMenu      = atoi(Value);
     else return false;
     return true;
@@ -180,6 +182,16 @@ const char * cHdffSetup::GetVideoConversionString(void)
     }
 }
 
+void cHdffSetup::SetVideoFormat(HDFF::cHdffCmdIf * HdffCmdIf)
+{
+    HdffVideoFormat_t videoFormat;
+
+    videoFormat.AutomaticEnabled = true;
+    videoFormat.AfdEnabled = false;
+    videoFormat.TvFormat = (HdffTvFormat_t) TvFormat;
+    videoFormat.VideoConversion = (HdffVideoConversion_t) VideoConversion;
+    HdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+}
 
 cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
 {
@@ -190,6 +202,7 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
     const int kAudioDownmixes = 5;
     const int kOsdSizes = 5;
     const int kRemoteProtocols = 3;
+    const int kTrueColorFormats = 3;
 
     static const char * ResolutionItems[kResolutions] =
     {
@@ -246,6 +259,13 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
         "RC6",
     };
 
+    static const char * TrueColorFormatItems[kTrueColorFormats] =
+    {
+        "ARGB8888",
+        "ARGB8565",
+        "ARGB4444",
+    };
+
     mHdffCmdIf = pHdffCmdIf;
     mNewHdffSetup = gHdffSetup;
 
@@ -265,6 +285,7 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
     Add(new cMenuEditIntItem(tr("Remote Control Address"), &mNewHdffSetup.RemoteAddress, -1, 31));
     Add(new cMenuEditBoolItem(tr("High Level OSD"), &mNewHdffSetup.HighLevelOsd));
     Add(new cMenuEditBoolItem(tr("Allow True Color OSD"), &mNewHdffSetup.TrueColorOsd));
+    Add(new cMenuEditStraItem(tr("True Color format"), &mNewHdffSetup.TrueColorFormat, kTrueColorFormats, TrueColorFormatItems));
     Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &mNewHdffSetup.HideMainMenu));
 
     mVideoConversion = 0;
@@ -395,6 +416,7 @@ void cHdffSetupPage::Store(void)
     SetupStore("RemoteAddress", mNewHdffSetup.RemoteAddress);
     SetupStore("HighLevelOsd", mNewHdffSetup.HighLevelOsd);
     SetupStore("TrueColorOsd", mNewHdffSetup.TrueColorOsd);
+    SetupStore("TrueColorFormat", mNewHdffSetup.TrueColorFormat);
     SetupStore("HideMainMenu", mNewHdffSetup.HideMainMenu);
 
     if (mHdffCmdIf)
@@ -403,14 +425,9 @@ void cHdffSetupPage::Store(void)
         {
             mHdffCmdIf->CmdHdmiSetVideoMode(mNewHdffSetup.GetVideoMode());
         }
-        HdffVideoFormat_t videoFormat;
         HdffHdmiConfig_t hdmiConfig;
 
-        videoFormat.AutomaticEnabled = true;
-        videoFormat.AfdEnabled = false;
-        videoFormat.TvFormat = (HdffTvFormat_t) mNewHdffSetup.TvFormat;
-        videoFormat.VideoConversion = (HdffVideoConversion_t) mNewHdffSetup.VideoConversion;
-        mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
+        mNewHdffSetup.SetVideoFormat(mHdffCmdIf);
 
         mHdffCmdIf->CmdAvSetAudioDelay(mNewHdffSetup.AudioDelay);
         mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) mNewHdffSetup.AudioDownmix);
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
index a41361462..582ee76c4 100644
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ b/PLUGINS/src/dvbhddevice/setup.h
@@ -18,6 +18,7 @@ struct cHdffSetup
     HdffVideoMode_t GetVideoMode(void);
     void SetNextVideoConversion(void);
     const char * GetVideoConversionString(void);
+    void SetVideoFormat(HDFF::cHdffCmdIf * HdffCmdIf);
 
     int Resolution;
     int VideoModeAdaption;
@@ -36,6 +37,7 @@ struct cHdffSetup
 
     int HighLevelOsd;
     int TrueColorOsd;
+    int TrueColorFormat;
 
     int HideMainMenu;
 };
diff --git a/args.c b/args.c
new file mode 100644
index 000000000..6a3160553
--- /dev/null
+++ b/args.c
@@ -0,0 +1,129 @@
+/*
+ * args.c: Read arguments from files
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
+ *
+ * $Id: args.c 1.1 2014/04/14 12:02:38 kls Exp $
+ */
+
+#include "args.h"
+#include <unistd.h>
+
+cArgs::cArgs(const char *Argv0)
+{
+  argv0 = Argv0;
+  argc = 0;
+  argv = NULL;
+}
+
+cArgs::~cArgs(void)
+{
+  if (argv != NULL)
+     delete [] argv;
+}
+
+bool cArgs::AddArg(const char *s)
+{
+  if (inVdrSection)
+     args.Append(strdup(s));
+  else if (*lastArg == NULL)
+     return false;
+  else
+     lastArg = cString::sprintf("%s %s", *lastArg, s);
+  return true;
+}
+
+bool cArgs::ReadDirectory(const char *Directory)
+{
+  if (argv != NULL)
+     delete [] argv;
+  argc = 0;
+  argv = NULL;
+  args.Clear();
+  lastArg = NULL;
+  inVdrSection = false;
+  cFileNameList files(Directory, false);
+  if (files.Size() == 0)
+     return false;
+  for (int i = 0; i < files.Size(); i++) {
+      const char *fileName = files.At(i);
+      if (startswith(fileName, ".") || !endswith(fileName, ".conf"))
+         continue;
+      cString fullFileName = AddDirectory(Directory, fileName);
+      struct stat fs;
+      if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode))
+         continue;
+      bool ok = true;
+      int line = 0;
+      FILE *f = fopen(*fullFileName, "r");
+      if (f) {
+         char *s;
+         cReadLine ReadLine;
+         while ((s = ReadLine.Read(f)) != NULL) {
+               line++;
+               s = stripspace(skipspace(s));
+               if (!isempty(s) && (s[0] != '#')) {
+                  if (startswith(s, "[") && endswith(s, "]")) {
+                     s[strlen(s) - 1] = 0;
+                     s++;
+                     if (*lastArg) {
+                        args.Append(strdup(*lastArg));
+                        lastArg = NULL;
+                        }
+                     if (strcmp(s, "vdr") == 0)
+                        inVdrSection = true;
+                     else {
+                        inVdrSection = false;
+                        lastArg = cString::sprintf("--plugin=%s", s);
+                        }
+                     }
+                  else {
+                     if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space
+                        char *p = strchr(s, ' ');
+                        if (p == NULL) {
+                           ok = AddArg(s);
+                           if (!ok)
+                              break;
+                           }
+                        else {
+                           *p = 0;
+                           p++;
+                           ok = AddArg(s);
+                           if (!ok)
+                              break;
+                           ok = AddArg(p);
+                           if (!ok)
+                              break;
+                           }
+                        }
+                     else {
+                        ok = AddArg(s);
+                        if (!ok)
+                           break;
+                        }
+                     }
+                  }
+               }
+         fclose(f);
+         }
+       if (!ok) {
+          esyslog("ERROR: args file %s, line %d", *fullFileName, line);
+          return false;
+          }
+      }
+  if (*lastArg) {
+     args.Append(strdup(*lastArg));
+     lastArg = NULL;
+     }
+  argv = new char*[args.Size() + 1];
+  argv[0] = strdup(*argv0);
+  argc = 1;
+  for (int i = 0; i < args.Size(); i++) {
+      argv[argc] = args.At(i);
+      argc++;
+      }
+  return true;
+}
diff --git a/args.h b/args.h
new file mode 100644
index 000000000..2e91afb42
--- /dev/null
+++ b/args.h
@@ -0,0 +1,34 @@
+/*
+ * args.h: Read arguments from files
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
+ *
+ * $Id: args.h 1.1 2014/04/14 11:54:21 kls Exp $
+ */
+
+#ifndef __ARGS_H
+#define __ARGS_H
+
+#include "tools.h"
+
+class cArgs {
+private:
+  cString argv0;
+  cStringList args;
+  cString lastArg;
+  bool inVdrSection;
+  int argc;
+  char **argv;
+  bool AddArg(const char *s);
+public:
+  cArgs(const char *Argv0);
+  ~cArgs(void);
+  bool ReadDirectory(const char *Directory);
+  int GetArgc(void) const { return argc; };
+  char **GetArgv(void) const { return argv; };
+  };
+
+#endif //__ARGS_H
diff --git a/channels.c b/channels.c
index b0e24743f..b91df6dc1 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 3.5 2014/03/10 13:14:02 kls Exp $
+ * $Id: channels.c 3.7 2015/01/14 12:15:03 kls Exp $
  */
 
 #include "channels.h"
@@ -221,7 +221,7 @@ bool cChannel::SetTransponderData(int Source, int Frequency, int Srate, const ch
      nameSource = NULL;
      shortNameSource = NULL;
      if (Number() && !Quiet) {
-        dsyslog("changing transponder data of channel %d from %s to %s", Number(), *OldTransponderData, *TransponderDataToString());
+        dsyslog("changing transponder data of channel %d (%s) from %s to %s", Number(), name, *OldTransponderData, *TransponderDataToString());
         modification |= CHANNELMOD_TRANSP;
         Channels.SetModified();
         }
@@ -233,7 +233,7 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
 {
   if (nid != Nid || tid != Tid || sid != Sid || rid != Rid) {
      if (Number()) {
-        dsyslog("changing id of channel %d from %d-%d-%d-%d to %d-%d-%d-%d", Number(), nid, tid, sid, rid, Nid, Tid, Sid, Rid);
+        dsyslog("changing id of channel %d (%s) from %d-%d-%d-%d to %d-%d-%d-%d", Number(), name, nid, tid, sid, rid, Nid, Tid, Sid, Rid);
         modification |= CHANNELMOD_ID;
         Channels.SetModified();
         Channels.UnhashChannel(this);
@@ -278,7 +278,7 @@ void cChannel::SetPortalName(const char *PortalName)
 {
   if (!isempty(PortalName) && strcmp(portalName, PortalName) != 0) {
      if (Number()) {
-        dsyslog("changing portal name of channel %d from '%s' to '%s'", Number(), portalName, PortalName);
+        dsyslog("changing portal name of channel %d (%s) from '%s' to '%s'", Number(), name, portalName, PortalName);
         modification |= CHANNELMOD_NAME;
         Channels.SetModified();
         }
@@ -368,7 +368,7 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, c
      q += IntArrayToString(q, Spids, 10, SLangs);
      *q = 0;
      if (Number())
-        dsyslog("changing pids of channel %d from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid);
+        dsyslog("changing pids of channel %d (%s) from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), name, vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid);
      vpid = Vpid;
      ppid = Ppid;
      vtype = Vtype;
@@ -427,7 +427,7 @@ void cChannel::SetCaIds(const int *CaIds)
      IntArrayToString(OldCaIdsBuf, caids, 16);
      IntArrayToString(NewCaIdsBuf, CaIds, 16);
      if (Number())
-        dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
+        dsyslog("changing caids of channel %d (%s) from %s to %s", Number(), name, OldCaIdsBuf, NewCaIdsBuf);
      for (int i = 0; i <= MAXCAIDS; i++) { // <= to copy the terminating 0
          caids[i] = CaIds[i];
          if (!CaIds[i])
@@ -444,7 +444,7 @@ void cChannel::SetCaDescriptors(int Level)
      modification |= CHANNELMOD_CA;
      Channels.SetModified();
      if (Number() && Level > 1)
-        dsyslog("changing ca descriptors of channel %d", Number());
+        dsyslog("changing ca descriptors of channel %d (%s)", Number(), name);
      }
 }
 
@@ -470,7 +470,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
      }
   char buffer[((linkChannels ? linkChannels->Count() : 0) + (LinkChannels ? LinkChannels->Count() : 0)) * 6 + 256]; // 6: 5 digit channel number plus blank, 256: other texts (see below) plus reserve
   char *q = buffer;
-  q += sprintf(q, "linking channel %d from", Number());
+  q += sprintf(q, "linking channel %d (%s) from", Number(), name);
   if (linkChannels) {
      for (cLinkChannel *lc = linkChannels->First(); lc; lc = linkChannels->Next(lc)) {
          lc->Channel()->SetRefChannel(NULL);
@@ -1040,8 +1040,11 @@ void cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid && channel->Rid() == 0) {
+         bool OldShowChannelNamesWithSource = Setup.ShowChannelNamesWithSource;
+         Setup.ShowChannelNamesWithSource = false;
          if (!endswith(channel->Name(), CHANNELMARKOBSOLETE))
             channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARKOBSOLETE), channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, channel->Provider()));
+         Setup.ShowChannelNamesWithSource = OldShowChannelNamesWithSource;
          }
       }
 }
diff --git a/ci.c b/ci.c
index 6b0805d7a..1072695c7 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.12 2014/02/25 09:59:55 kls Exp $
+ * $Id: ci.c 3.17 2015/01/15 09:14:57 kls Exp $
  */
 
 #include "ci.h"
@@ -20,6 +20,8 @@
 #include "device.h"
 #include "pat.h"
 #include "receiver.h"
+#include "remux.h"
+#include "libsi/si.h"
 #include "tools.h"
 
 // Set these to 'true' for debug output:
@@ -105,14 +107,135 @@ static char *GetString(int &Length, const uint8_t **Data)
 
 // --- cCaPidReceiver --------------------------------------------------------
 
-// A dummy receiver, just used to make the device receive the CA pids.
+// A receiver that is used to make the device receive the ECM pids, as well as the
+// CAT and the EMM pids.
 
 class cCaPidReceiver : public cReceiver {
+private:
+  int catVersion;
+  cVector<int> emmPids;
+  uchar buffer[2048]; // 11 bit length, max. 2048 byte
+  uchar *bufp;
+  int length;
+  void AddEmmPid(int Pid);
+  void DelEmmPids(void);
+protected:
+  virtual void Activate(bool On);
 public:
+  cCaPidReceiver(void);
   virtual ~cCaPidReceiver() { Detach(); }
-  virtual void Receive(uchar *Data, int Length) {}
+  virtual void Receive(uchar *Data, int Length);
+  bool HasCaPids(void) { return NumPids() - emmPids.Size() - 1 > 0; }
+  void Reset(void) { DelEmmPids(); catVersion = -1; }
   };
 
+cCaPidReceiver::cCaPidReceiver(void)
+{
+  catVersion = -1;
+  bufp = NULL;
+  length = 0;
+  AddPid(CATPID);
+}
+
+void cCaPidReceiver::AddEmmPid(int Pid)
+{
+  for (int i = 0; i < emmPids.Size(); i++) {
+      if (emmPids[i] == Pid)
+         return;
+      }
+  emmPids.Append(Pid);
+  AddPid(Pid);
+}
+
+void cCaPidReceiver::DelEmmPids(void)
+{
+  for (int i = 0; i < emmPids.Size(); i++)
+      DelPid(emmPids[i]);
+  emmPids.Clear();
+}
+
+void cCaPidReceiver::Activate(bool On)
+{
+  catVersion = -1; // can be done independent of 'On'
+}
+
+void cCaPidReceiver::Receive(uchar *Data, int Length)
+{
+  if (TsPid(Data) == CATPID) {
+     uchar *p = NULL;
+     if (TsPayloadStart(Data)) {
+        if (Data[5] == SI::TableIdCAT) {
+           length = (int(Data[6] & 0x03) << 8) | Data[7]; // section length
+           if (length > 5) {
+              int v = (Data[10] & 0x3E) >> 1; // version number
+              if (v != catVersion) {
+                 if (Data[11] == 0 && Data[12] == 0) { // section number, last section number
+                    if (length > TS_SIZE - 8) {
+                       int n = TS_SIZE - 13;
+                       memcpy(buffer, Data + 13, n);
+                       bufp = buffer + n;
+                       length -= n + 5; // 5 = header
+                       }
+                    else {
+                       p = Data + 13; // no need to copy the data
+                       length -= 5; // header
+                       }
+                    }
+                 else
+                    dsyslog("multi table CAT section - unhandled!");
+                 catVersion = v;
+                 }
+              }
+           }
+        }
+     else if (bufp && length > 0) {
+        int n = min(length, TS_SIZE - 4);
+        if (bufp + n - buffer <= int(sizeof(buffer))) {
+           memcpy(bufp, Data + 4, n);
+           bufp += n;
+           length -= n;
+           if (length <= 0) {
+              p = buffer;
+              length = bufp - buffer;
+              }
+           }
+        else {
+           esyslog("ERROR: buffer overflow in cCaPidReceiver::Receive()");
+           bufp = 0;
+           length = 0;
+           }
+        }
+     if (p) {
+        int OldCatVersion = catVersion; // must preserve the current version number
+        cDevice *AttachedDevice = Device();
+        if (AttachedDevice)
+           AttachedDevice->Detach(this);
+        DelEmmPids();
+        for (int i = 0; i < length - 4; i++) { // -4 = checksum
+            if (p[i] == 0x09) {
+               int CaId = int(p[i + 2] << 8) | p[i + 3];
+               int EmmPid = int(((p[i + 4] & 0x1F) << 8)) | p[i + 5];
+               AddEmmPid(EmmPid);
+               switch (CaId >> 8) {
+                 case 0x01: for (int j = i + 7; j < p[i + 1] + 2; j += 4) {
+                                EmmPid = (int(p[j] & 0x0F) << 8) | p[j + 1];
+                                AddEmmPid(EmmPid);
+                                }
+                            break;
+                 }
+               i += p[i + 1] + 2 - 1; // -1 to compensate for the loop increment
+               }
+            }
+        if (AttachedDevice)
+           AttachedDevice->AttachReceiver(this);
+        catVersion = OldCatVersion;
+        p = NULL;
+        bufp = 0;
+        length = 0;
+        }
+     }
+}
+
 // --- cTPDU -----------------------------------------------------------------
 
 #define MAX_TPDU_SIZE  2048
@@ -1508,7 +1631,6 @@ class cCiCaProgramData : public cListObject {
 cCiAdapter::cCiAdapter(void)
 :cThread("CI adapter")
 {
-  assignedDevice = NULL;
   for (int i = 0; i < MAX_CAM_SLOTS_PER_ADAPTER; i++)
       camSlots[i] = NULL;
 }
@@ -1534,6 +1656,17 @@ void cCiAdapter::AddCamSlot(cCamSlot *CamSlot)
      }
 }
 
+cCamSlot *cCiAdapter::ItCamSlot(int &Iter)
+{
+  if (Iter >= 0) {
+     for (; Iter < MAX_CAM_SLOTS_PER_ADAPTER; ) {
+         if (cCamSlot *Found = camSlots[Iter++])
+            return Found;
+         }
+     }
+  return NULL;
+}
+
 void cCiAdapter::Action(void)
 {
   cTPDU TPDU;
@@ -1561,6 +1694,7 @@ void cCiAdapter::Action(void)
 cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
 {
   ciAdapter = CiAdapter;
+  assignedDevice = NULL;
   caPidReceiver = ReceiveCaPids ? new cCaPidReceiver : NULL;
   slotIndex = -1;
   lastModuleStatus = msReset; // avoids initial reset log message
@@ -1578,8 +1712,8 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
 
 cCamSlot::~cCamSlot()
 {
-  if (ciAdapter && ciAdapter->assignedDevice)
-     ciAdapter->assignedDevice->SetCamSlot(NULL);
+  if (assignedDevice)
+     assignedDevice->SetCamSlot(NULL);
   delete caPidReceiver;
   CamSlots.Del(this, false);
   DeleteAllConnections();
@@ -1590,13 +1724,13 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
   cMutexLock MutexLock(&mutex);
   if (ciAdapter) {
      if (ciAdapter->Assign(Device, true)) {
-        if (!Device && ciAdapter->assignedDevice)
-           ciAdapter->assignedDevice->SetCamSlot(NULL);
+        if (!Device && assignedDevice)
+           assignedDevice->SetCamSlot(NULL);
         if (!Query) {
            StopDecrypting();
            source = transponder = 0;
            if (ciAdapter->Assign(Device)) {
-              ciAdapter->assignedDevice = Device;
+              assignedDevice = Device;
               if (Device) {
                  Device->SetCamSlot(this);
                  dsyslog("CAM %d: assigned to device %d", slotNumber, Device->DeviceNumber() + 1);
@@ -1613,17 +1747,6 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
   return false;
 }
 
-cDevice *cCamSlot::Device(void)
-{
-  cMutexLock MutexLock(&mutex);
-  if (ciAdapter) {
-     cDevice *d = ciAdapter->assignedDevice;
-     if (d && d->CamSlot() == this)
-        return d;
-     }
-  return NULL;
-}
-
 void cCamSlot::NewConnection(void)
 {
   cMutexLock MutexLock(&mutex);
@@ -1811,7 +1934,7 @@ void cCamSlot::SendCaPmt(uint8_t CmdId)
      const int *CaSystemIds = cas->GetCaSystemIds();
      if (CaSystemIds && *CaSystemIds) {
         if (caProgramList.Count()) {
-           if (caPidReceiver && caPidReceiver->NumPids()) {
+           if (caPidReceiver && caPidReceiver->HasCaPids()) {
               if (cDevice *d = Device())
                  d->Detach(caPidReceiver);
               }
@@ -1845,7 +1968,7 @@ void cCamSlot::SendCaPmt(uint8_t CmdId)
                       }
                    }
                }
-           if (caPidReceiver && caPidReceiver->NumPids()) {
+           if (caPidReceiver && caPidReceiver->HasCaPids()) {
               if (cDevice *d = Device())
                  d->AttachReceiver(caPidReceiver);
               }
@@ -1854,6 +1977,11 @@ void cCamSlot::SendCaPmt(uint8_t CmdId)
         else {
            cCiCaPmt CaPmt(CmdId, 0, 0, 0, NULL);
            cas->SendPMT(&CaPmt);
+           if (caPidReceiver) {
+              if (cDevice *d = Device())
+                 d->Detach(caPidReceiver);
+              caPidReceiver->Reset();
+              }
            }
         }
      }
diff --git a/ci.h b/ci.h
index ac029c267..8fea34f1b 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 3.7 2014/01/31 09:21:21 kls Exp $
+ * $Id: ci.h 3.9 2015/01/15 09:18:09 kls Exp $
  */
 
 #ifndef __CI_H
@@ -79,11 +79,14 @@ enum eModuleStatus { msNone, msReset, msPresent, msReady };
 class cCiAdapter : public cThread {
   friend class cCamSlot;
 private:
-  cDevice *assignedDevice;
   cCamSlot *camSlots[MAX_CAM_SLOTS_PER_ADAPTER];
   void AddCamSlot(cCamSlot *CamSlot);
        ///< Adds the given CamSlot to this CI adapter.
 protected:
+  cCamSlot *ItCamSlot(int &Iter);
+       ///< Iterates over all added CAM slots of this adapter. Iter has to be
+       ///< initialized to 0 and is required to store the iteration state.
+       ///< Returns NULL if no further CAM slot is found.
   virtual void Action(void);
        ///< Handles the attached CAM slots in a separate thread.
        ///< The derived class must call the Start() function to
@@ -119,7 +122,7 @@ class cTPDU;
 class cCiTransportConnection;
 class cCiSession;
 class cCiCaProgramData;
-class cReceiver;
+class cCaPidReceiver;
 
 class cCamSlot : public cListObject {
   friend class cCiAdapter;
@@ -128,7 +131,8 @@ class cCamSlot : public cListObject {
   cMutex mutex;
   cCondVar processed;
   cCiAdapter *ciAdapter;
-  cReceiver *caPidReceiver;
+  cDevice *assignedDevice;
+  cCaPidReceiver *caPidReceiver;
   int slotIndex;
   int slotNumber;
   cCiTransportConnection *tc[MAX_CONNECTIONS_PER_CAM_SLOT + 1];  // connection numbering starts with 1
@@ -164,7 +168,7 @@ class cCamSlot : public cListObject {
        ///< device it was previously assigned to. The value of Query
        ///< is ignored in that case, and this function always returns
        ///< 'true'.
-  cDevice *Device(void);
+  cDevice *Device(void) { return assignedDevice; }
        ///< Returns the device this CAM slot is currently assigned to.
   bool WantsTsData(void) const { return caPidReceiver != NULL; }
        ///< Returns true if this CAM slot wants to receive the TS data through
diff --git a/config.c b/config.c
index 657b61c00..af791b328 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.2 2013/08/31 12:41:28 kls Exp $
+ * $Id: config.c 3.3 2015/01/12 14:32:17 kls Exp $
  */
 
 #include "config.h"
@@ -473,6 +473,8 @@ cSetup::cSetup(void)
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
+  VolumeSteps = 51;
+  VolumeLinearize = 0;
   CurrentDolby = 0;
   InitialChannel = "";
   DeviceBondings = "";
@@ -686,6 +688,8 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
   else if (!strcasecmp(Name, "CurrentDolby"))        CurrentDolby       = atoi(Value);
   else if (!strcasecmp(Name, "InitialChannel"))      InitialChannel     = Value;
+  else if (!strcasecmp(Name, "VolumeSteps"))         VolumeSteps        = atoi(Value);
+  else if (!strcasecmp(Name, "VolumeLinearize"))     VolumeLinearize    = atoi(Value);
   else if (!strcasecmp(Name, "InitialVolume"))       InitialVolume      = atoi(Value);
   else if (!strcasecmp(Name, "DeviceBondings"))      DeviceBondings     = Value;
   else if (!strcasecmp(Name, "ChannelsWrap"))        ChannelsWrap       = atoi(Value);
@@ -801,6 +805,8 @@ bool cSetup::Save(void)
   Store("CurrentVolume",      CurrentVolume);
   Store("CurrentDolby",       CurrentDolby);
   Store("InitialChannel",     InitialChannel);
+  Store("VolumeSteps",        VolumeSteps);
+  Store("VolumeLinearize",    VolumeLinearize);
   Store("InitialVolume",      InitialVolume);
   Store("DeviceBondings",     DeviceBondings);
   Store("ChannelsWrap",       ChannelsWrap);
diff --git a/config.h b/config.h
index d36543865..c8808edf7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.8 2014/02/25 10:00:23 kls Exp $
+ * $Id: config.h 3.10 2015/01/12 14:32:17 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.6"
-#define VDRVERSNUM   20106  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.7"
+#define VDRVERSNUM   20107  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.6"
-#define APIVERSNUM   20106  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.7"
+#define APIVERSNUM   20107  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -336,6 +336,8 @@ class cSetup : public cConfig<cSetupLine> {
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
+  int VolumeSteps;
+  int VolumeLinearize;
   int CurrentDolby;
   int InitialVolume;
   int ChannelsWrap;
diff --git a/device.c b/device.c
index 43bc0e08d..3d57611da 100644
--- a/device.c
+++ b/device.c
@@ -4,11 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.15 2014/03/15 13:23:28 kls Exp $
+ * $Id: device.c 3.19 2015/01/14 12:02:44 kls Exp $
  */
 
 #include "device.h"
 #include <errno.h>
+#include <math.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include "audio.h"
@@ -76,7 +77,7 @@ cDevice::cDevice(void)
   cardIndex = nextCardIndex++;
   dsyslog("new device number %d", CardIndex() + 1);
 
-  SetDescription("receiver on device %d", CardIndex() + 1);
+  SetDescription("device %d receiver", CardIndex() + 1);
 
   mute = false;
   volume = Setup.CurrentVolume;
@@ -695,7 +696,7 @@ bool cDevice::MaySwitchTransponder(const cChannel *Channel) const
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
 {
   if (LiveView) {
-     isyslog("switching to channel %d", Channel->Number());
+     isyslog("switching to channel %d (%s)", Channel->Number(), Channel->Name());
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
      }
   for (int i = 3; i--;) {
@@ -918,8 +919,10 @@ void cDevice::SetAudioChannel(int AudioChannel)
 void cDevice::SetVolume(int Volume, bool Absolute)
 {
   int OldVolume = volume;
-  volume = constrain(Absolute ? Volume : volume + Volume, 0, MAXVOLUME);
-  SetVolumeDevice(volume);
+  double VolumeDelta = double(MAXVOLUME) / Setup.VolumeSteps;
+  double VolumeLinearize = (Setup.VolumeLinearize >= 0) ? (Setup.VolumeLinearize / 10.0 + 1.0) : (1.0 / ((-Setup.VolumeLinearize / 10.0) + 1.0));
+  volume = constrain(int(floor((Absolute ? Volume : volume + Volume) / VolumeDelta + 0.5) * VolumeDelta), 0, MAXVOLUME);
+  SetVolumeDevice(MAXVOLUME - int(pow(1.0 - pow(double(volume) / MAXVOLUME, VolumeLinearize), 1.0 / VolumeLinearize) * MAXVOLUME));
   Absolute |= mute;
   cStatus::MsgSetVolume(Absolute ? volume : volume - OldVolume, Absolute);
   if (volume > 0) {
@@ -1699,10 +1702,11 @@ void cDevice::Detach(cReceiver *Receiver)
          receiversLeft = true;
       }
   if (camSlot) {
-     if (Receiver->priority > MINPRIORITY) // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
+     if (Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
         camSlot->StartDecrypting();
-     if (!camSlot->IsDecrypting())
-        camSlot->Assign(NULL);
+        if (!camSlot->IsDecrypting())
+           camSlot->Assign(NULL);
+        }
      }
   if (!receiversLeft)
      Cancel(-1);
@@ -1731,7 +1735,7 @@ void cDevice::DetachAllReceivers(void)
 
 cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
 {
-  SetDescription("TS buffer on device %d", CardIndex);
+  SetDescription("device %d TS buffer", CardIndex);
   f = File;
   cardIndex = CardIndex;
   delivered = false;
diff --git a/device.h b/device.h
index 549bbe042..b06d97700 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 3.9 2014/03/15 14:04:58 kls Exp $
+ * $Id: device.h 3.10 2015/01/12 14:39:09 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -30,7 +30,7 @@
 #define MAXPIDHANDLES      64 // the maximum number of different PIDs per device
 #define MAXRECEIVERS       16 // the maximum number of receivers per device
 #define MAXVOLUME         255
-#define VOLUMEDELTA         5 // used to increase/decrease the volume
+#define VOLUMEDELTA       (MAXVOLUME / Setup.VolumeSteps) // used to increase/decrease the volume
 #define MAXOCCUPIEDTIMEOUT 99 // max. time (in seconds) a device may be occupied
 
 enum eSetChannelResult { scrOk, scrNotAvailable, scrNoTransfer, scrFailed };
diff --git a/dvbci.c b/dvbci.c
index 38668a65d..fa65f0f68 100644
--- a/dvbci.c
+++ b/dvbci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.c 3.0 2007/01/04 12:49:10 kls Exp $
+ * $Id: dvbci.c 3.1 2015/01/14 11:13:49 kls Exp $
  */
 
 #include "dvbci.h"
@@ -17,7 +17,7 @@
 cDvbCiAdapter::cDvbCiAdapter(cDevice *Device, int Fd)
 {
   device = Device;
-  SetDescription("CI adapter on device %d", device->DeviceNumber());
+  SetDescription("device %d CI adapter", device->DeviceNumber());
   fd = Fd;
   ca_caps_t Caps;
   if (ioctl(fd, CA_GET_CAP, &Caps) == 0) {
diff --git a/dvbdevice.c b/dvbdevice.c
index fb406f1a4..9321f16da 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 3.11 2014/03/16 10:38:31 kls Exp $
+ * $Id: dvbdevice.c 3.14 2015/01/14 12:09:19 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -372,7 +372,7 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int
   tunerStatus = tsIdle;
   bondedTuner = NULL;
   bondedMaster = false;
-  SetDescription("tuner on frontend %d/%d", adapter, frontend);
+  SetDescription("frontend %d/%d tuner", adapter, frontend);
   Start();
 }
 
@@ -771,7 +771,7 @@ static int GetRequiredDeliverySystem(const cChannel *Channel, const cDvbTranspon
   else if (Channel->IsTerr())
      ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBT : SYS_DVBT2;
   else
-     esyslog("ERROR: can't determine frontend type for channel %d", Channel->Number());
+     esyslog("ERROR: can't determine frontend type for channel %d (%s)", Channel->Number(), Channel->Name());
   return ds;
 }
 
@@ -823,7 +823,7 @@ bool cDvbTuner::SetFrontend(void)
               }
            }
         else {
-           esyslog("ERROR: no DiSEqC parameters found for channel %d", channel.Number());
+           esyslog("ERROR: no DiSEqC parameters found for channel %d (%s)", channel.Number(), channel.Name());
            return false;
            }
         }
@@ -961,7 +961,7 @@ void cDvbTuner::Action(void)
                   lastDiseqc = NULL;
                   lastSource = 0;
                   if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
-                     isyslog("frontend %d/%d timed out while tuning to channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
+                     isyslog("frontend %d/%d timed out while tuning to channel %d (%s), tp %d", adapter, frontend, channel.Number(), channel.Name(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
                      }
                   continue;
@@ -979,7 +979,7 @@ void cDvbTuner::Action(void)
                   }
                else if (Status & FE_HAS_LOCK) {
                   if (LostLock) {
-                     isyslog("frontend %d/%d regained lock on channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
+                     isyslog("frontend %d/%d regained lock on channel %d (%s), tp %d", adapter, frontend, channel.Number(), channel.Name(), channel.Transponder());
                      LostLock = false;
                      }
                   tunerStatus = tsLocked;
@@ -988,7 +988,7 @@ void cDvbTuner::Action(void)
                   }
                else if (tunerStatus == tsLocked) {
                   LostLock = true;
-                  isyslog("frontend %d/%d lost lock on channel %d, tp %d", adapter, frontend, channel.Number(), channel.Transponder());
+                  isyslog("frontend %d/%d lost lock on channel %d (%s), tp %d", adapter, frontend, channel.Number(), channel.Name(), channel.Transponder());
                   tunerStatus = tsTuned;
                   Timer.Set(lockTimeout);
                   lastTimeoutReport = 0;
@@ -1751,12 +1751,28 @@ uint32_t cDvbDeviceProbe::GetSubsystemId(int Adapter, int Frontend)
                                 SubsystemId = strtoul(s, NULL, 0) << 16;
                              fclose(f);
                              }
+                          else {
+                             FileName = cString::sprintf("/sys/class/dvb/%s/device/idVendor", e->d_name);
+                             if ((f = fopen(FileName, "r")) != NULL) {
+                                if (char *s = ReadLine.Read(f))
+                                   SubsystemId = strtoul(s, NULL, 16) << 16;
+                                fclose(f);
+                                }
+                             }
                           FileName = cString::sprintf("/sys/class/dvb/%s/device/subsystem_device", e->d_name);
                           if ((f = fopen(FileName, "r")) != NULL) {
                              if (char *s = ReadLine.Read(f))
                                 SubsystemId |= strtoul(s, NULL, 0);
                              fclose(f);
                              }
+                          else {
+                             FileName = cString::sprintf("/sys/class/dvb/%s/device/idProduct", e->d_name);
+                             if ((f = fopen(FileName, "r")) != NULL) {
+                                if (char *s = ReadLine.Read(f))
+                                   SubsystemId |= strtoul(s, NULL, 16);
+                                fclose(f);
+                                }
+                             }
                           break;
                           }
                        }
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 88c594c22..5df8cdb68 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 3.5 2014/02/08 12:29:13 kls Exp $
+ * $Id: dvbsubtitle.c 3.9 2015/01/14 11:31:09 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -25,6 +25,12 @@
 #define END_OF_DISPLAY_SET_SEGMENT  0x80
 #define STUFFING_SEGMENT            0xFF
 
+#define PGS_PALETTE_SEGMENT         0x14
+#define PGS_OBJECT_SEGMENT          0x15
+#define PGS_PRESENTATION_SEGMENT    0x16
+#define PGS_WINDOW_SEGMENT          0x17
+#define PGS_DISPLAY_SEGMENT         0x80
+
 // Set these to 'true' for debug output, which is written into the file dbg-log.htm
 // in the current working directory. The HTML file shows the actual bitmaps (dbg-nnn.jpg)
 // used to display the subtitles.
@@ -53,6 +59,8 @@ static bool DebugOutput    = DebugVerbose;
 #define DBGMAXBITMAPS  100 // debug output will be stopped after this many bitmaps
 #define DBGBITMAPWIDTH 400
 
+#define FIX_SUBTITLE_VERSION_BROADCASTER_STUPIDITY // some don't properly handle version numbers, which renders them useless because subtitles are not displayed
+
 // --- cSubtitleDebug --------------------------------------------------------
 
 class cSubtitleDebug {
@@ -144,6 +152,7 @@ class cSubtitleClut : public cListObject {
 public:
   cSubtitleClut(int ClutId);
   void Parse(cBitStream &bs);
+  void ParsePgs(cBitStream &bs);
   int ClutId(void) { return clutId; }
   int ClutVersionNumber(void) { return clutVersionNumber; }
   const cPalette *GetPalette(int Bpp);
@@ -221,8 +230,10 @@ cSubtitleClut::cSubtitleClut(int ClutId)
 void cSubtitleClut::Parse(cBitStream &bs)
 {
   int Version = bs.GetBits(4);
+#ifndef FIX_SUBTITLE_VERSION_BROADCASTER_STUPIDITY
   if (clutVersionNumber == Version)
      return; // no update
+#endif
   clutVersionNumber = Version;
   bs.SkipBits(4); // reserved
   dbgcluts("<b>clut</b> id %d version %d<br>\n", clutId, clutVersionNumber);
@@ -263,6 +274,31 @@ void cSubtitleClut::Parse(cBitStream &bs)
         }
 }
 
+void cSubtitleClut::ParsePgs(cBitStream &bs)
+{
+  int Version = bs.GetBits(8);
+  if (clutVersionNumber == Version)
+     return; // no update
+  clutVersionNumber = Version;
+  dbgcluts("<b>clut</b> id %d version %d<br>\n", clutId, clutVersionNumber);
+  for (int i = 0; i < 256; ++i)
+      SetColor(8, i, ArgbToColor(0, 0, 0, 0));
+  while (!bs.IsEOF()) {
+        uchar clutEntryId = bs.GetBits(8);
+        uchar yval  = bs.GetBits(8);
+        uchar crval = bs.GetBits(8);
+        uchar cbval = bs.GetBits(8);
+        uchar tval  = bs.GetBits(8);
+        tColor value = 0;
+        if (yval) {
+           value = yuv2rgb(yval, cbval, crval);
+           value |= ((10 - (clutEntryId ? Setup.SubtitleFgTransparency : Setup.SubtitleBgTransparency)) * tval / 10) << 24;
+           }
+        dbgcluts("%2d %08X<br>\n", clutEntryId, value);
+        SetColor(8, clutEntryId, value);
+        }
+}
+
 tColor cSubtitleClut::yuv2rgb(int Y, int Cb, int Cr)
 {
   int Ey, Epb, Epr;
@@ -310,6 +346,7 @@ class cSubtitleObject : public cListObject {
   bool nonModifyingColorFlag;
   int topLength;
   int botLength;
+  int topIndex;
   uchar *topData;
   uchar *botData;
   char *txtData;
@@ -318,12 +355,14 @@ class cSubtitleObject : public cListObject {
   bool Decode2BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y, const uint8_t *MapTable);
   bool Decode4BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y, const uint8_t *MapTable);
   bool Decode8BppCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y);
+  bool DecodePgsCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int&x, int y);
   void DecodeSubBlock(cBitmap *Bitmap, int px, int py, const uchar *Data, int Length, bool Even);
   void DecodeCharacterString(const uchar *Data, int NumberOfCodes);
 public:
   cSubtitleObject(int ObjectId);
   ~cSubtitleObject();
   void Parse(cBitStream &bs);
+  void ParsePgs(cBitStream &bs);
   int ObjectId(void) { return objectId; }
   int ObjectVersionNumber(void) { return objectVersionNumber; }
   int ObjectCodingMethod(void) { return objectCodingMethod; }
@@ -339,6 +378,7 @@ cSubtitleObject::cSubtitleObject(int ObjectId)
   nonModifyingColorFlag = false;
   topLength = 0;
   botLength = 0;
+  topIndex = 0;
   topData = NULL;
   botData = NULL;
   txtData = NULL;
@@ -355,8 +395,10 @@ cSubtitleObject::~cSubtitleObject()
 void cSubtitleObject::Parse(cBitStream &bs)
 {
   int Version = bs.GetBits(4);
+#ifndef FIX_SUBTITLE_VERSION_BROADCASTER_STUPIDITY
   if (objectVersionNumber == Version)
      return; // no update
+#endif
   objectVersionNumber = Version;
   objectCodingMethod = bs.GetBits(2);
   nonModifyingColorFlag = bs.GetBit();
@@ -398,6 +440,29 @@ void cSubtitleObject::Parse(cBitStream &bs)
      }
 }
 
+void cSubtitleObject::ParsePgs(cBitStream &bs)
+{
+  int Version = bs.GetBits(8);
+  if (objectVersionNumber == Version)
+     return; // no update
+  objectVersionNumber = Version;
+  objectCodingMethod = 0;
+  int sequenceDescriptor = bs.GetBits(8);
+  if (!(sequenceDescriptor & 0x80) && topData != NULL) {
+     memcpy(topData + topIndex, bs.GetData(), (bs.Length() - bs.Index()) / 8);
+     topIndex += (bs.Length() - bs.Index()) / 8;
+     return;
+     }
+  topLength = bs.GetBits(24) - 4 + 1; // exclude width / height, add sub block type
+  bs.SkipBits(32);
+  if ((topData = MALLOC(uchar, topLength)) != NULL) {
+     topData[topIndex++] = 0xFF; // PGS end of line
+     memcpy(topData + 1, bs.GetData(), (bs.Length() - bs.Index()) / 8);
+     topIndex += (bs.Length() - bs.Index()) / 8 + 1;
+     }
+  dbgobjects("<b>object</b> id %d version %d method %d modify %d", objectId, objectVersionNumber, objectCodingMethod, nonModifyingColorFlag);
+}
+
 void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes)
 {
   // "ETSI EN 300 743 V1.3.1 (2006-11)", chapter 7.2.5 "Object data segment" specifies
@@ -484,6 +549,13 @@ void cSubtitleObject::DecodeSubBlock(cBitmap *Bitmap, int px, int py, const ucha
                x = 0;
                y += 2;
                break;
+          case 0xFF:
+               dbgpixel("PGS code string, including EOLs<br>\n");
+               while (DecodePgsCodeString(Bitmap, px, py, &bs, x, y) && !bs.IsEOF()) {
+                     x = 0;
+                     y++;
+                     }
+               break;
           default: dbgpixel("unknown sub block %s %d<br>\n", __FUNCTION__, __LINE__);
           }
         }
@@ -607,6 +679,28 @@ bool cSubtitleObject::Decode8BppCodeString(cBitmap *Bitmap, int px, int py, cBit
   return true;
 }
 
+bool cSubtitleObject::DecodePgsCodeString(cBitmap *Bitmap, int px, int py, cBitStream *bs, int &x, int y)
+{
+  while (!bs->IsEOF()) {
+        int color = bs->GetBits(8);
+        int rl = 1;
+        if (!color) {
+           int flags = bs->GetBits(8);
+           rl = flags & 0x3f;
+           if (flags & 0x40)
+              rl = (rl << 8) + bs->GetBits(8);
+           color = flags & 0x80 ? bs->GetBits(8) : 0;
+           }
+        if (rl > 0) {
+           DrawLine(Bitmap, px + x, py + y, color, rl);
+           x += rl;
+           }
+        else if (!rl)
+           return true;
+        }
+  return false;
+}
+
 void cSubtitleObject::Render(cBitmap *Bitmap, int px, int py, tIndex IndexFg, tIndex IndexBg)
 {
   if (objectCodingMethod == 0) { // coding of pixels
@@ -654,7 +748,7 @@ cSubtitleObject *cSubtitleObjects::GetObjectById(int ObjectId, bool New)
 // --- cSubtitleObjectRef ----------------------------------------------------
 
 class cSubtitleObjectRef : public cListObject {
-private:
+protected:
   int objectId;
   int objectType;
   int objectProviderFlag;
@@ -663,6 +757,7 @@ class cSubtitleObjectRef : public cListObject {
   int foregroundPixelCode;
   int backgroundPixelCode;
 public:
+  cSubtitleObjectRef(void);
   cSubtitleObjectRef(cBitStream &bs);
   int ObjectId(void) { return objectId; }
   int ObjectType(void) { return objectType; }
@@ -673,6 +768,17 @@ class cSubtitleObjectRef : public cListObject {
   int BackgroundPixelCode(void) { return backgroundPixelCode; }
   };
 
+cSubtitleObjectRef::cSubtitleObjectRef(void)
+{
+  objectId = 0;
+  objectType = 0;
+  objectProviderFlag = 0;
+  objectHorizontalPosition = 0;
+  objectVerticalPosition = 0;
+  foregroundPixelCode = 0;
+  backgroundPixelCode = 0;
+}
+
 cSubtitleObjectRef::cSubtitleObjectRef(cBitStream &bs)
 {
   objectId = bs.GetBits(16);
@@ -692,6 +798,38 @@ cSubtitleObjectRef::cSubtitleObjectRef(cBitStream &bs)
   dbgregions("<b>objectref</b> id %d type %d flag %d x %d y %d fg %d bg %d<br>\n", objectId, objectType, objectProviderFlag, objectHorizontalPosition, objectVerticalPosition, foregroundPixelCode, backgroundPixelCode);
 }
 
+// --- cSubtitleObjectRefPgs - PGS variant of cSubtitleObjectRef -------------
+
+class cSubtitleObjectRefPgs : public cSubtitleObjectRef {
+private:
+  int windowId;
+  int compositionFlag;
+  int cropX;
+  int cropY;
+  int cropW;
+  int cropH;
+public:
+  cSubtitleObjectRefPgs(cBitStream &bs);
+};
+
+cSubtitleObjectRefPgs::cSubtitleObjectRefPgs(cBitStream &bs)
+:cSubtitleObjectRef()
+{
+  objectId = bs.GetBits(16);
+  windowId = bs.GetBits(8);
+  compositionFlag = bs.GetBits(8);
+  bs.SkipBits(32); // skip absolute position, object is aligned to region
+  if ((compositionFlag & 0x80) != 0) {
+     cropX = bs.GetBits(16);
+     cropY = bs.GetBits(16);
+     cropW = bs.GetBits(16);
+     cropH = bs.GetBits(16);
+     }
+  else
+     cropX = cropY = cropW = cropH = 0;
+  dbgregions("<b>objectrefPgs</b> id %d flag %d x %d y %d cropX %d cropY %d cropW %d cropH %d<br>\n", objectId, compositionFlag, objectHorizontalPosition, objectVerticalPosition, cropX, cropY, cropW, cropH);
+}
+
 // --- cSubtitleRegion -------------------------------------------------------
 
 class cSubtitleRegion : public cListObject {
@@ -711,6 +849,8 @@ class cSubtitleRegion : public cListObject {
 public:
   cSubtitleRegion(int RegionId);
   void Parse(cBitStream &bs);
+  void ParsePgs(cBitStream &bs);
+  void SetDimensions(int Width, int Height);
   int RegionId(void) { return regionId; }
   int RegionVersionNumber(void) { return regionVersionNumber; }
   bool RegionFillFlag(void) { return regionFillFlag; }
@@ -740,8 +880,10 @@ cSubtitleRegion::cSubtitleRegion(int RegionId)
 void cSubtitleRegion::Parse(cBitStream &bs)
 {
   int Version = bs.GetBits(4);
+#ifndef FIX_SUBTITLE_VERSION_BROADCASTER_STUPIDITY
   if (regionVersionNumber == Version)
      return; // no update
+#endif
   regionVersionNumber = Version;
   regionFillFlag = bs.GetBit();
   bs.SkipBits(3); // reserved
@@ -761,6 +903,24 @@ void cSubtitleRegion::Parse(cBitStream &bs)
         objectRefs.Add(new cSubtitleObjectRef(bs));
 }
 
+void cSubtitleRegion::ParsePgs(cBitStream &bs)
+{
+  regionDepth = 8;
+  bs.SkipBits(8); // skip palette update flag
+  clutId = bs.GetBits(8);
+  dbgregions("<b>region</b> id %d version %d clutId %d<br>\n", regionId, regionVersionNumber, clutId);
+  int objects = bs.GetBits(8);
+  while (objects--)
+        objectRefs.Add(new cSubtitleObjectRefPgs(bs));
+}
+
+void cSubtitleRegion::SetDimensions(int Width, int Height)
+{
+  regionWidth = Width;
+  regionHeight = Height;
+  dbgregions("<b>region</b> id %d width %d height %d<br>\n", regionId, regionWidth, regionHeight);
+}
+
 void cSubtitleRegion::Render(cBitmap *Bitmap, cSubtitleObjects *Objects)
 {
   if (regionFillFlag) {
@@ -786,12 +946,20 @@ class cSubtitleRegionRef : public cListObject {
   int regionHorizontalAddress;
   int regionVerticalAddress;
 public:
+  cSubtitleRegionRef(int id, int x, int y);
   cSubtitleRegionRef(cBitStream &bs);
   int RegionId(void) { return regionId; }
   int RegionHorizontalAddress(void) { return regionHorizontalAddress; }
   int RegionVerticalAddress(void) { return regionVerticalAddress; }
   };
 
+cSubtitleRegionRef::cSubtitleRegionRef(int id, int x, int y)
+{
+  regionId = id;
+  regionHorizontalAddress = x;
+  regionVerticalAddress = y;
+  dbgpages("<b>regionref</b> id %d tx %d y %d<br>\n", regionId, regionHorizontalAddress, regionVerticalAddress);
+}
 cSubtitleRegionRef::cSubtitleRegionRef(cBitStream &bs)
 {
   regionId = bs.GetBits(8);
@@ -818,6 +986,7 @@ class cDvbSubtitlePage : public cListObject {
 public:
   cDvbSubtitlePage(int PageId);
   void Parse(int64_t Pts, cBitStream &bs);
+  void ParsePgs(int64_t Pts, cBitStream &bs);
   int PageId(void) { return pageId; }
   int PageTimeout(void) { return pageTimeout; }
   int PageVersionNumber(void) { return pageVersionNumber; }
@@ -830,6 +999,7 @@ class cDvbSubtitlePage : public cListObject {
   cSubtitleClut *GetClutById(int ClutId, bool New = false);
   cSubtitleRegion *GetRegionById(int RegionId, bool New = false);
   cSubtitleRegionRef *GetRegionRefByIndex(int RegionRefIndex) { return regionRefs.Get(RegionRefIndex); }
+  void AddRegionRef(cSubtitleRegionRef *rf) { regionRefs.Add(rf); }
   void SetPending(bool Pending) { pending = Pending; }
   };
 
@@ -849,8 +1019,10 @@ void cDvbSubtitlePage::Parse(int64_t Pts, cBitStream &bs)
      pts = Pts;
   pageTimeout = bs.GetBits(8);
   int Version = bs.GetBits(4);
+#ifndef FIX_SUBTITLE_VERSION_BROADCASTER_STUPIDITY
   if (pageVersionNumber == Version)
      return; // no update
+#endif
   pageVersionNumber = Version;
   pageState = bs.GetBits(2);
   switch (pageState) {
@@ -877,6 +1049,35 @@ void cDvbSubtitlePage::Parse(int64_t Pts, cBitStream &bs)
   pending = true;
 }
 
+void cDvbSubtitlePage::ParsePgs(int64_t Pts, cBitStream &bs)
+{
+  if (Pts >= 0)
+     pts = Pts;
+  pageTimeout = 60000;
+  int Version = bs.GetBits(16);
+  if (pageVersionNumber == Version)
+     return;
+  pageVersionNumber = Version;
+  pageState = bs.GetBits(2);
+  switch (pageState) {
+    case 0: // normal case - page update
+         regions.Clear();
+         break;
+    case 1: // acquisition point - page refresh
+    case 2: // epoch start - new page
+    case 3: // epoch continue - new page
+         regions.Clear();
+         cluts.Clear();
+         objects.Clear();
+         break;
+    default: dbgpages("unknown page state: %d<br>\n", pageState);
+    }
+  bs.SkipBits(6);
+  dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+  regionRefs.Clear();
+  pending = true;
+}
+
 tArea *cDvbSubtitlePage::GetAreas(int &NumAreas, double FactorX, double FactorY)
 {
   if (regions.Count() > 0) {
@@ -1077,11 +1278,7 @@ void cDvbSubtitleBitmaps::Draw(cOsd *Osd)
   if (State() == 0 || Osd->SetAreas(areas, numAreas) == oeOk) {
      for (int i = 0; i < bitmaps.Size(); i++) {
          cBitmap *b = bitmaps[i];
-         if (Scale)
-            b = b->Scaled(osdFactorX, osdFactorY, AntiAlias);
-         Osd->DrawBitmap(int(round(b->X0() * osdFactorX)), int(round(b->Y0() * osdFactorY)), *b);
-         if (b != bitmaps[i])
-            delete b;
+         Osd->DrawScaledBitmap(int(round(b->X0() * osdFactorX)), int(round(b->Y0() * osdFactorY)), *b, osdFactorX, osdFactorY, AntiAlias);
          }
      Osd->Flush();
      }
@@ -1123,7 +1320,7 @@ void cDvbSubtitleBitmaps::DbgDump(int WindowWidth, int WindowHeight)
 int cDvbSubtitleConverter::setupLevel = 0;
 
 cDvbSubtitleConverter::cDvbSubtitleConverter(void)
-:cThread("subtitleConverter")
+:cThread("subtitle converter")
 {
   dvbSubtitleAssembler = new cDvbSubtitleAssembler;
   osd = NULL;
@@ -1226,22 +1423,24 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
            dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
         const uchar *data = Data + PayloadOffset;
         int length = Length - PayloadOffset;
-        if (length > 3) {
-           if (data[0] == 0x20 && data[1] == 0x00 && data[2] == 0x0F) {
+        if (length > 0) {
+           if (length > 2 && data[0] == 0x20 && data[1] == 0x00 && data[2] == 0x0F) {
               data += 2;
               length -= 2;
               }
            const uchar *b = data;
            while (length > 0) {
-                 if (b[0] == 0x0F) {
-                    int n = ExtractSegment(b, length, pts);
-                    if (n < 0)
-                       break;
-                    b += n;
-                    length -= n;
-                    }
+                 if (b[0] == STUFFING_SEGMENT)
+                    break;
+                 int n;
+                 if (b[0] == 0x0F)
+                    n = ExtractSegment(b, length, pts);
                  else
+                    n = ExtractPgsSegment(b, length, pts);
+                 if (n < 0)
                     break;
+                 b += n;
+                 length -= n;
                  }
            }
         }
@@ -1391,23 +1590,25 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
        case DISPLAY_DEFINITION_SEGMENT: {
             dbgsegments("DISPLAY_DEFINITION_SEGMENT<br>\n");
             int version = bs.GetBits(4);
-            if (version != ddsVersionNumber) {
-               bool displayWindowFlag = bs.GetBit();
-               windowHorizontalOffset = 0;
-               windowVerticalOffset   = 0;
-               bs.SkipBits(3); // reserved
-               displayWidth  = windowWidth  = bs.GetBits(16) + 1;
-               displayHeight = windowHeight = bs.GetBits(16) + 1;
-               if (displayWindowFlag) {
-                  windowHorizontalOffset = bs.GetBits(16);                              // displayWindowHorizontalPositionMinimum
-                  windowWidth            = bs.GetBits(16) - windowHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
-                  windowVerticalOffset   = bs.GetBits(16);                              // displayWindowVerticalPositionMinimum
-                  windowHeight           = bs.GetBits(16) - windowVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
-                  }
-               SetOsdData();
-               ddsVersionNumber = version;
-               dbgdisplay("<b>display</b> version %d flag %d width %d height %d ofshor %d ofsver %d<br>\n", ddsVersionNumber, displayWindowFlag, windowWidth, windowHeight, windowHorizontalOffset, windowVerticalOffset);
+#ifndef FIX_SUBTITLE_VERSION_BROADCASTER_STUPIDITY
+            if (version == ddsVersionNumber)
+               break; // no update
+#endif
+            bool displayWindowFlag = bs.GetBit();
+            windowHorizontalOffset = 0;
+            windowVerticalOffset   = 0;
+            bs.SkipBits(3); // reserved
+            displayWidth  = windowWidth  = bs.GetBits(16) + 1;
+            displayHeight = windowHeight = bs.GetBits(16) + 1;
+            if (displayWindowFlag) {
+               windowHorizontalOffset = bs.GetBits(16);                              // displayWindowHorizontalPositionMinimum
+               windowWidth            = bs.GetBits(16) - windowHorizontalOffset + 1; // displayWindowHorizontalPositionMaximum
+               windowVerticalOffset   = bs.GetBits(16);                              // displayWindowVerticalPositionMinimum
+               windowHeight           = bs.GetBits(16) - windowVerticalOffset + 1;   // displayWindowVerticalPositionMaximum
                }
+            SetOsdData();
+            ddsVersionNumber = version;
+            dbgdisplay("<b>display</b> version %d flag %d width %d height %d ofshor %d ofsver %d<br>\n", ddsVersionNumber, displayWindowFlag, windowWidth, windowHeight, windowHorizontalOffset, windowVerticalOffset);
             break;
             }
        case DISPARITY_SIGNALING_SEGMENT: {
@@ -1465,6 +1666,71 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
   return -1;
 }
 
+int cDvbSubtitleConverter::ExtractPgsSegment(const uchar *Data, int Length, int64_t Pts)
+{
+  cBitStream bs(Data, Length * 8);
+  if (Length >= 3) {
+     int segmentType = bs.GetBits(8);
+     int segmentLength = bs.GetBits(16);
+     if (!bs.SetLength(bs.Index() + segmentLength * 8))
+        return -1;
+     LOCK_THREAD;
+     cDvbSubtitlePage *page = GetPageById(0, true);
+     switch (segmentType) {
+       case PGS_PRESENTATION_SEGMENT: {
+            if (page->Pending()) {
+               dbgsegments("PGS_DISPLAY_SEGMENT (simulated)<br>\n");
+               FinishPage(page);
+               }
+            dbgsegments("PGS_PRESENTATION_SEGMENT<br>\n");
+            displayWidth  = windowWidth  = bs.GetBits(16);
+            displayHeight = windowHeight = bs.GetBits(16);
+            bs.SkipBits(8);
+            page->ParsePgs(Pts, bs);
+            SD.SetFactor(double(DBGBITMAPWIDTH) / windowWidth);
+            cSubtitleRegion *region = page->GetRegionById(0, true);
+            region->ParsePgs(bs);
+            break;
+            }
+       case PGS_WINDOW_SEGMENT: {
+            bs.SkipBits(16);
+            int regionHorizontalAddress = bs.GetBits(16);
+            int regionVerticalAddress   = bs.GetBits(16);
+            int regionWidth  = bs.GetBits(16);
+            int regionHeight = bs.GetBits(16);
+            cSubtitleRegion *region = page->GetRegionById(0, true);
+            region->SetDimensions(regionWidth, regionHeight);
+            page->AddRegionRef(new cSubtitleRegionRef(0, regionHorizontalAddress, regionVerticalAddress));
+            dbgsegments("PGS_WINDOW_SEGMENT<br>\n");
+            break;
+            }
+       case PGS_PALETTE_SEGMENT: {
+            dbgsegments("PGS_PALETTE_SEGMENT<br>\n");
+            cSubtitleClut *clut = page->GetClutById(bs.GetBits(8), true);
+            clut->ParsePgs(bs);
+            break;
+            }
+       case PGS_OBJECT_SEGMENT: {
+            dbgsegments("PGS_OBJECT_SEGMENT<br>\n");
+            cSubtitleObject *object = page->GetObjectById(bs.GetBits(16), true);
+            object->ParsePgs(bs);
+            break;
+            }
+       case PGS_DISPLAY_SEGMENT: {
+            dbgsegments("PGS_DISPLAY_SEGMENT<br>\n");
+            FinishPage(page);
+            page->SetPending(false);
+            break;
+            }
+       default:
+            dbgsegments("*** unknown segment type: %02X<br>\n", segmentType);
+            return -1;
+       }
+     return bs.Length() / 8;
+     }
+  return -1;
+}
+
 void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
 {
   if (!AssertOsd())
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index 13574337e..f178b61c2 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 3.1 2013/09/06 10:53:30 kls Exp $
+ * $Id: dvbsubtitle.h 3.2 2015/01/14 10:01:48 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -43,6 +43,7 @@ class cDvbSubtitleConverter : public cThread {
   void SetOsdData(void);
   bool AssertOsd(void);
   int ExtractSegment(const uchar *Data, int Length, int64_t Pts);
+  int ExtractPgsSegment(const uchar *Data, int Length, int64_t Pts);
   void FinishPage(cDvbSubtitlePage *Page);
 public:
   cDvbSubtitleConverter(void);
diff --git a/interface.c b/interface.c
index 992c5e338..6bf7ffcee 100644
--- a/interface.c
+++ b/interface.c
@@ -4,12 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 3.0 2012/11/19 12:21:43 kls Exp $
+ * $Id: interface.c 3.1 2015/01/11 13:37:47 kls Exp $
  */
 
 #include "interface.h"
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef SDNOTIFY
+#include <systemd/sd-daemon.h>
+#endif
 #include <unistd.h>
 #include "i18n.h"
 #include "status.h"
@@ -159,6 +162,9 @@ void cInterface::LearnKeys(void)
       bool known = Keys.KnowsRemote(Remote->Name());
       dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
       if (!known) {
+#ifdef SDNOTIFY
+         sd_notify(0, "READY=1\nSTATUS=Learning keys...");
+#endif
          cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
          DisplayMenu->SetMenuCategory(mcUnknown);
          char Headline[256];
diff --git a/menu.c b/menu.c
index 59b11d032..a48bfdaf5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.23 2014/03/16 10:38:31 kls Exp $
+ * $Id: menu.c 3.28 2015/01/15 11:14:21 kls Exp $
  */
 
 #include "menu.h"
@@ -387,6 +387,9 @@ void cMenuChannels::Setup(void)
             currentItem = item;
          }
       }
+  SetMenuSortMode(cMenuChannelItem::SortMode() == cMenuChannelItem::csmName ? msmName :
+                  cMenuChannelItem::SortMode() == cMenuChannelItem::csmProvider ? msmProvider :
+                  msmNumber);
   if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
      Sort();
   SetCurrent(currentItem);
@@ -2670,6 +2673,7 @@ void cMenuRecordings::Set(bool Refresh)
             LastDir->IncrementCounter(recording->IsNew());
          }
       }
+  SetMenuSortMode(RecordingsSortMode == rsmName ? msmName : msmTime);
   if (Refresh)
      Display();
 }
@@ -3597,6 +3601,8 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Remote control repeat delta (ms)"), &data.RcRepeatDelta, 0));
   Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"),            &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"),             &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Volume steps"),               &data.VolumeSteps, 5, 255));
+  Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Volume linearize"),           &data.VolumeLinearize, -20, 20));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"),              &data.ChannelsWrap));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Show channel names with source"), &data.ShowChannelNamesWithSource));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"),             &data.EmergencyExit));
@@ -4027,6 +4033,7 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
   number = 0;
   timeout = Switched || Setup.TimeoutRequChInfo;
+  cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
   positioner = NULL;
   channel = Channels.GetByNumber(Number);
   lastPresent = lastFollowing = NULL;
@@ -4112,6 +4119,10 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction
 
 eOSState cDisplayChannel::ProcessKey(eKeys Key)
 {
+  if (cOsdProvider::OsdSizeChanged(osdState)) {
+     delete displayChannel;
+     displayChannel = Skins.Current()->DisplayChannel(withInfo);
+     }
   cChannel *NewChannel = NULL;
   if (Key != kNone)
      lastTime.Set();
@@ -4754,7 +4765,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
      int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority;
      cDevice *device = cDevice::GetDevice(channel, Priority, false);
      if (device) {
-        dsyslog("switching device %d to channel %d", device->DeviceNumber() + 1, channel->Number());
+        dsyslog("switching device %d to channel %d (%s)", device->DeviceNumber() + 1, channel->Number(), channel->Name());
         if (!device->SwitchChannel(channel, false)) {
            ShutdownHandler.RequestEmergencyExit();
            return false;
@@ -4769,7 +4780,7 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
            }
         }
      else if (!Timer || !Timer->Pending()) {
-        isyslog("no free DVB device to record channel %d!", ch);
+        isyslog("no free DVB device to record channel %d (%s)!", ch, channel->Name());
         Skins.Message(mtError, tr("No free DVB device to record!"));
         }
      }
@@ -4864,7 +4875,7 @@ void cRecordControls::ChannelDataModified(cChannel *Channel)
       if (RecordControls[i]) {
          if (RecordControls[i]->Timer() && RecordControls[i]->Timer()->Channel() == Channel) {
             if (RecordControls[i]->Device()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
-               isyslog("stopping recording due to modification of channel %d", Channel->Number());
+               isyslog("stopping recording due to modification of channel %d (%s)", Channel->Number(), Channel->Name());
                RecordControls[i]->Stop();
                // This will restart the recording, maybe even from a different
                // device in case conditional access has changed.
@@ -5145,7 +5156,10 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
     case kOk:
          if (timeSearchPos > 0) {
             Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
-            Goto(SecondsToFrames(Seconds, FramesPerSecond()), Key == kDown || Key == kPause || Key == kOk);
+            bool Still = Key == kDown || Key == kPause || Key == kOk;
+            Goto(SecondsToFrames(Seconds, FramesPerSecond()), Still);
+            if (!Still)
+               Play();
             }
          timeSearchActive = false;
          break;
diff --git a/menu.h b/menu.h
index 24516c364..87670c722 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 3.5 2013/12/25 12:06:03 kls Exp $
+ * $Id: menu.h 3.6 2015/01/15 11:12:57 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -121,6 +121,7 @@ class cDisplayChannel : public cOsdObject {
   cTimeMs lastTime;
   int number;
   bool timeout;
+  int osdState;
   const cPositioner *positioner;
   cChannel *channel;
   const cEvent *lastPresent;
diff --git a/osd.c b/osd.c
index 7e527820e..d31ee8a3a 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 3.2 2013/09/03 11:59:17 kls Exp $
+ * $Id: osd.c 3.4 2015/01/15 11:20:56 kls Exp $
  */
 
 #include "osd.h"
@@ -1917,6 +1917,16 @@ void cOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColo
      }
 }
 
+void cOsd::DrawScaledBitmap(int x, int y, const cBitmap &Bitmap, double FactorX, double FactorY, bool AntiAlias)
+{
+  const cBitmap *b = &Bitmap;
+  if (!DoubleEqual(FactorX, 1.0) || !DoubleEqual(FactorY, 1.0))
+     b = b->Scaled(FactorX, FactorY, AntiAlias);
+  DrawBitmap(x, y, *b);
+  if (b != &Bitmap)
+     delete b;
+}
+
 void cOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
 {
   if (isTrueColor)
@@ -1968,6 +1978,7 @@ int cOsdProvider::oldWidth = 0;
 int cOsdProvider::oldHeight = 0;
 double cOsdProvider::oldAspect = 1.0;
 cImage *cOsdProvider::images[MAXOSDIMAGES] = { NULL };
+int cOsdProvider::osdState = 0;
 
 cOsdProvider::cOsdProvider(void)
 {
@@ -2005,6 +2016,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
   int Width;
   int Height;
   double Aspect;
+  cMutexLock MutexLock(&cOsd::mutex);
   cDevice::PrimaryDevice()->GetOsdSize(Width, Height, Aspect);
   if (Width != oldWidth || Height != oldHeight || !DoubleEqual(Aspect, oldAspect) || Force) {
      Setup.OSDLeft = int(round(Width * Setup.OSDLeftP));
@@ -2022,9 +2034,18 @@ void cOsdProvider::UpdateOsdSize(bool Force)
      oldHeight = Height;
      oldAspect = Aspect;
      dsyslog("OSD size changed to %dx%d @ %g", Width, Height, Aspect);
+     osdState++;
      }
 }
 
+bool cOsdProvider::OsdSizeChanged(int &State)
+{
+  cMutexLock MutexLock(&cOsd::mutex);
+  bool Result = osdState != State;
+  State = osdState;
+  return Result;
+}
+
 bool cOsdProvider::SupportsTrueColor(void)
 {
   if (osdProvider) {
diff --git a/osd.h b/osd.h
index 4eaef96d7..e5864c4fb 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 3.2 2013/09/06 12:13:47 kls Exp $
+ * $Id: osd.h 3.5 2015/01/15 11:23:52 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -817,6 +817,8 @@ class cOsd {
        ///< If this is a true color OSD, a pointer to a dummy bitmap with 8bpp
        ///< is returned. This is done so that skins that call this function
        ///< in order to preset the bitmap's palette won't crash.
+       ///< Use of this function outside of derived classes is deprecated and it
+       ///< may be made 'protected' in a future version.
   virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
        ///< Creates a new true color pixmap on this OSD (see cPixmap for details).
        ///< The caller must not delete the returned object, it will be deleted when
@@ -885,6 +887,11 @@ class cOsd {
        ///< If Overlay is true, any pixel in Bitmap that has color index 0 will
        ///< not overwrite the corresponding pixel in the target area.
        ///< If this is a true color OSD, ReplacePalette has no meaning.
+  virtual void DrawScaledBitmap(int x, int y, const cBitmap &Bitmap, double FactorX, double FactorY, bool AntiAlias = false);
+       ///< Sets the pixels in the OSD with the data from the given Bitmap, putting
+       ///< the upper left corner of the Bitmap at (x, y) and scaled by the given
+       ///< factors. If AntiAlias is true and either of the factors is greater than
+       ///< 1.0, anti-aliasing is applied.
   virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
        ///< Draws the given string at coordinates (x, y) with the given foreground
        ///< and background color and font. If Width and Height are given, the text
@@ -942,6 +949,7 @@ class cOsdProvider {
   static int oldHeight;
   static double oldAspect;
   static cImage *images[MAXOSDIMAGES];
+  static int osdState;
 protected:
   virtual cOsd *CreateOsd(int Left, int Top, uint Level) = 0;
       ///< Returns a pointer to a newly created cOsd object, which will be located
@@ -978,6 +986,12 @@ class cOsdProvider {
       ///< font sizes accordingly. If Force is true, all settings are recalculated,
       ///< even if the video resolution hasn't changed since the last call to
       ///< this function.
+  static bool OsdSizeChanged(int &State);
+      ///< Checks if the OSD size has changed and a currently displayed OSD needs to
+      ///< be redrawn. An internal reference value is incremented on every size change
+      ///< and is compared against State when calling the method.
+      ///< OsdSizeChanged() can be called with an uninitialized State to just get
+      ///< the current value of State.
   static bool SupportsTrueColor(void);
       ///< Returns true if the current OSD provider is able to handle a true color OSD.
   static int StoreImage(const cImage &Image);
diff --git a/osdbase.c b/osdbase.c
index b788edb0a..e03f2d074 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 3.2 2013/09/22 14:01:17 kls Exp $
+ * $Id: osdbase.c 3.3 2015/01/15 10:11:11 kls Exp $
  */
 
 #include "osdbase.h"
@@ -86,6 +86,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   displayMenuItems = 0;
   title = NULL;
   menuCategory = mcUnknown;
+  menuSortMode = msmUnknown;
   SetTitle(Title);
   SetCols(c0, c1, c2, c3, c4);
   first = 0;
@@ -114,6 +115,11 @@ void cOsdMenu::SetMenuCategory(eMenuCategory MenuCategory)
   menuCategory = MenuCategory;
 }
 
+void cOsdMenu::SetMenuSortMode(eMenuSortMode MenuSortMode)
+{
+  menuSortMode = MenuSortMode;
+}
+
 void cOsdMenu::SetDisplayMenu(void)
 {
   if (displayMenu) {
@@ -224,6 +230,7 @@ void cOsdMenu::Display(void)
   cStatus::MsgOsdClear();
   if (menuCategory != displayMenu->MenuCategory())
      displayMenu->SetMenuCategory(menuCategory);
+  displayMenu->SetMenuSortMode(menuSortMode);
   displayMenuItems = displayMenu->MaxItems();
   displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
   displayMenu->SetTitle(title);
diff --git a/osdbase.h b/osdbase.h
index 07dce3521..5b8ae1cc5 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 3.1 2013/09/22 14:00:47 kls Exp $
+ * $Id: osdbase.h 3.2 2015/01/15 10:09:18 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -92,6 +92,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   int cols[cSkinDisplayMenu::MaxTabs];
   int first, current, marked;
   eMenuCategory menuCategory;
+  eMenuSortMode menuSortMode;
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
   bool helpDisplayed;
@@ -131,6 +132,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   virtual ~cOsdMenu();
   virtual bool NeedsFastResponse(void) { return subMenu ? subMenu->NeedsFastResponse() : cOsdObject::NeedsFastResponse(); }
   void SetMenuCategory(eMenuCategory MenuCategory);
+  void SetMenuSortMode(eMenuSortMode MenuSortMode);
   int Current(void) const { return current; }
   void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
diff --git a/pat.c b/pat.c
index c325a00cd..98d306ebe 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 3.4 2014/02/19 08:57:43 kls Exp $
+ * $Id: pat.c 3.5 2015/01/04 13:14:01 kls Exp $
  */
 
 #include "pat.h"
@@ -69,12 +69,13 @@ class cCaDescriptors : public cListObject {
   int source;
   int transponder;
   int serviceId;
+  int pmtPid; // needed for OctopusNet - otherwise irrelevant!
   int numCaIds;
   int caIds[MAXCAIDS + 1];
   cList<cCaDescriptor> caDescriptors;
   void AddCaId(int CaId);
 public:
-  cCaDescriptors(int Source, int Transponder, int ServiceId);
+  cCaDescriptors(int Source, int Transponder, int ServiceId, int PmtPid);
   bool operator== (const cCaDescriptors &arg) const;
   bool Is(int Source, int Transponder, int ServiceId);
   bool Is(cCaDescriptors * CaDescriptors);
@@ -82,14 +83,16 @@ class cCaDescriptors : public cListObject {
   void AddCaDescriptor(SI::CaDescriptor *d, int EsPid);
   int GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
   int GetCaPids(const int *CaSystemIds, int BufSize, int *Pids);
+  const int GetPmtPid(void) { return pmtPid; };
   const int *CaIds(void) { return caIds; }
   };
 
-cCaDescriptors::cCaDescriptors(int Source, int Transponder, int ServiceId)
+cCaDescriptors::cCaDescriptors(int Source, int Transponder, int ServiceId, int PmtPid)
 {
   source = Source;
   transponder = Transponder;
   serviceId = ServiceId;
+  pmtPid = PmtPid;
   numCaIds = 0;
   caIds[0] = 0;
 }
@@ -218,6 +221,7 @@ class cCaDescriptorHandler : public cList<cCaDescriptors> {
       // and 2 if an existing descriptor was changed.
   int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
   int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
+  int GetPmtPid(int Source, int Transponder, int ServiceId);
   };
 
 int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
@@ -258,6 +262,16 @@ int cCaDescriptorHandler::GetCaPids(int Source, int Transponder, int ServiceId,
   return 0;
 }
 
+int cCaDescriptorHandler::GetPmtPid(int Source, int Transponder, int ServiceId)
+{
+  cMutexLock MutexLock(&mutex);
+  for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
+      if (ca->Is(Source, Transponder, ServiceId))
+         return ca->GetPmtPid();
+      }
+  return 0;
+}
+
 cCaDescriptorHandler CaDescriptorHandler;
 
 int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
@@ -270,6 +284,11 @@ int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds
   return CaDescriptorHandler.GetCaPids(Source, Transponder, ServiceId, CaSystemIds, BufSize, Pids);
 }
 
+int GetPmtPid(int Source, int Transponder, int ServiceId)
+{
+  return CaDescriptorHandler.GetPmtPid(Source, Transponder, ServiceId);
+}
+
 // --- cPatFilter ------------------------------------------------------------
 
 //#define DEBUG_PAT_PMT
@@ -384,7 +403,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), pmt.getServiceId());
      if (Channel) {
         SI::CaDescriptor *d;
-        cCaDescriptors *CaDescriptors = new cCaDescriptors(Channel->Source(), Channel->Transponder(), Channel->Sid());
+        cCaDescriptors *CaDescriptors = new cCaDescriptors(Channel->Source(), Channel->Transponder(), Channel->Sid(), Pid);
         // Scan the common loop:
         for (SI::Loop::Iterator it; (d = (SI::CaDescriptor*)pmt.commonDescriptors.getNext(it, SI::CaDescriptorTag)); ) {
             CaDescriptors->AddCaDescriptor(d, 0);
diff --git a/pat.h b/pat.h
index 993a9b968..19e60dcff 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 3.3 2014/02/18 11:22:34 kls Exp $
+ * $Id: pat.h 3.4 2015/01/04 13:17:22 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -56,4 +56,7 @@ int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds
          ///< Returns the number of pids copied into Pids (0 if no CA descriptors are
          ///< available), or -1 if BufSize was too small to hold all CA pids.
 
+int GetPmtPid(int Source, int Transponder, int ServiceId);
+         ///< Gets the Pid of the PMT in which the CA descriptors for this channel are defined.
+
 #endif //__PAT_H
diff --git a/po/ar.po b/po/ar.po
index ef9982beb..827973c1b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1256,6 +1256,12 @@ msgstr "كسابق"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "فعل الصوت"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Channels wrap"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3f2105ff9..207901c23 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1255,6 +1255,12 @@ msgstr "anterior"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volum inicial"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Primer canal despr�s de l'ultim"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index f6ce5727c..d39933d7e 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1255,6 +1255,12 @@ msgstr "jako naposledy"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spuštění"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Přecházet z konce na začátek seznamu kanálů"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 7a4ea8f99..5436690cc 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr "som f
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lydstyrke ved opstart"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 731f8f269..4512b4461 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr "wie vorher"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Lautst�rke beim Einschalten"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr "Anzahl Lautst�rke Schritte"
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr "Lautst�rke Kurve korrigieren"
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Rundum zappen"
 
@@ -1449,7 +1455,7 @@ msgstr "MDMDFSS"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "MonDieMitDonFreSamSon"
+msgstr "Mo.Di.Mi.Do.Fr.Sa.So."
 
 msgid "Monday"
 msgstr "Montag"
diff --git a/po/el_GR.po b/po/el_GR.po
index 9c10cfef5..a6c4c3016 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index fc95313ed..e14251896 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "anterior"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumen inicial"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Primer canal despu�s del �ltimo"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 7c7cc1ea6..75ba6be4b 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr "endine"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus käivitamisel"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalite ringkerimine"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 002b4c70e..2668c44ba 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1256,6 +1256,12 @@ msgstr "edellinen"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Äänenvoimakkuus käynnistettäessä"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanavien rullaus"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index d216725fc..01c9750c4 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1262,6 +1262,12 @@ msgstr "comme avant"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Affichage circulaire des chaînes"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 6419a6788..eea285bd1 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,12 @@ msgstr "kao prethodno"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Po�etna ja�ina zvuka"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index d6a13c3df..f4b3734d0 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1256,6 +1256,12 @@ msgstr "ahogy az előbb"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hangerő indulásnál"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Csatornalista görgetése"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 107c14261..fbec241d3 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
-"PO-Revision-Date: 2013-11-10 23:02+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"PO-Revision-Date: 2014-03-23 00:54+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -84,13 +84,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Inizio scansione EPG"
@@ -580,10 +580,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Parametri canale non univoci!"
@@ -795,7 +795,7 @@ msgid "Recording vanished!"
 msgstr "Registrazione sparita!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Versione modificata già esistente. Sovrascrivere?"
 
 msgid "Error while queueing recording for cutting!"
 msgstr "Errore durante l'accodamento della registrazione per il taglio!"
@@ -1259,6 +1259,12 @@ msgstr "come prima"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Riavvolgimento canali"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index d7067f8e6..10f1ffecd 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr "kaip anksčiau"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Garsas įjungimo metu"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalų pridengimas"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 990a9f10b..556032ccc 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "како претходно"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Почетна јачина на звук"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Премотување канали"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ffc66df45..1f46225c2 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1257,6 +1257,12 @@ msgstr "zoals eerder"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Opstartvolume"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Doorscrollen kanalenlijst"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index c0d32549d..2ee08166a 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr ""
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr ""
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f67c62160..e7c81b7ba 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,12 @@ msgstr "jak ostatnio"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Zawijanie kana��w"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 575d3c272..b58b4838d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "como estava"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume inicial"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Retroceder canais"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index fabbd4ed5..5616348c3 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-02-09 23:01+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,12 @@ msgstr "ca mai înainte"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Lista de canale în buclă"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index ee8ec373b..4a7a29368 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "��������� ��� ���������"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "��������� �������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 97a6930d4..80d340aec 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr "ako naposledy"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitos� po spusten�"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kan�ly cyklova� pri prepnut�"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index c3a899c39..b0b41356d 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "kot prej"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Privzeta glasnost"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Menjava kanala"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 9f2ef6bd0..42423d318 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "kao prethodno"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Po�etna ja�ina tona"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Prelazak sa kraja na po�etak liste kanala"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 06a5f20b0..63ab5dbcc 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1256,6 +1256,12 @@ msgstr "samma som vid avslut"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Cirkul�r kanallista"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index d79158dcd..1ced923d3 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1252,6 +1252,12 @@ msgstr "
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "A��l��daki ses"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index df11b8dbe..3a20b3ed8 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,12 @@ msgstr "як раніше"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Гучність при включенні"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Кінець каналів"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 648f61d7e..0e061a548 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2013-11-03 15:59+0100\n"
+"POT-Creation-Date: 2015-01-12 15:40+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -1254,6 +1254,12 @@ msgstr "之前"
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "初始化声音"
 
+msgid "Setup.Miscellaneous$Volume steps"
+msgstr ""
+
+msgid "Setup.Miscellaneous$Volume linearize"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "频道排序"
 
diff --git a/receiver.c b/receiver.c
index a38110038..d8f51e680 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 3.2 2014/02/08 15:57:30 kls Exp $
+ * $Id: receiver.c 3.3 2015/01/12 14:04:31 kls Exp $
  */
 
 #include "receiver.h"
@@ -14,7 +14,7 @@
 cReceiver::cReceiver(const cChannel *Channel, int Priority)
 {
   device = NULL;
-  priority = constrain(Priority, MINPRIORITY, MAXPRIORITY);
+  SetPriority(Priority);
   numPids = 0;
   SetPids(Channel);
 }
@@ -29,6 +29,11 @@ cReceiver::~cReceiver()
      }
 }
 
+void cReceiver::SetPriority(int Priority)
+{
+  priority = constrain(Priority, MINPRIORITY, MAXPRIORITY);
+}
+
 bool cReceiver::AddPid(int Pid)
 {
   if (Pid) {
diff --git a/receiver.h b/receiver.h
index 8d6fee66d..b35482585 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 3.1 2014/01/01 11:45:09 kls Exp $
+ * $Id: receiver.h 3.3 2015/01/12 14:03:22 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -24,6 +24,7 @@ class cReceiver {
   int numPids;
   bool WantsPid(int Pid);
 protected:
+  cDevice *Device(void) { return device; }
   void Detach(void);
   virtual void Activate(bool On) {}
                ///< This function is called just before the cReceiver gets attached to
@@ -48,6 +49,8 @@ class cReceiver {
                ///< that this cReceiver may be detached at any time in favor of a timer recording
                ///< or live viewing (without blocking the cDevice it is attached to).
   virtual ~cReceiver();
+  int Priority(void) { return priority; }
+  void SetPriority(int Priority);
   bool AddPid(int Pid);
                ///< Adds the given Pid to the list of PIDs of this receiver.
   bool AddPids(const int *Pids);
diff --git a/recorder.h b/recorder.h
index 250e99f21..4e7848a61 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 3.0 2010/12/27 11:17:04 kls Exp $
+ * $Id: recorder.h 3.1 2015/01/15 14:27:02 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -31,12 +31,16 @@ class cRecorder : public cReceiver, cThread {
   bool NextFile(void);
 protected:
   virtual void Activate(bool On);
+       ///< If you override Activate() you need to call Detach() (which is a
+       ///< member of the cReceiver class) from your own destructor in order
+       ///< to properly get a call to Activate(false) when your object is
+       ///< destroyed.
   virtual void Receive(uchar *Data, int Length);
   virtual void Action(void);
 public:
   cRecorder(const char *FileName, const cChannel *Channel, int Priority);
-               // Creates a new recorder for the given Channel and
-               // the given Priority that will record into the file FileName.
+       ///< Creates a new recorder for the given Channel and
+       ///< the given Priority that will record into the file FileName.
   virtual ~cRecorder();
   };
 
diff --git a/recording.c b/recording.c
index cf3c5f05f..e9a6b1698 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.18 2014/03/16 11:09:17 kls Exp $
+ * $Id: recording.c 3.21 2015/01/17 14:52:28 kls Exp $
  */
 
 #include "recording.h"
@@ -65,6 +65,7 @@
 #define REMOVELATENCY      10 // seconds to wait until next check after removing a file
 #define MARKSUPDATEDELTA   10 // seconds between checks for updating editing marks
 #define MININDEXAGE      3600 // seconds before an index file is considered no longer to be written
+#define MAXREMOVETIME      10 // seconds after which to return from removing deleted recordings
 
 #define MAX_LINK_LEVEL  6
 
@@ -97,11 +98,16 @@ void cRemoveDeletedRecordingsThread::Action(void)
   // Make sure only one instance of VDR does this:
   cLockFile LockFile(cVideoDirectory::Name());
   if (LockFile.Lock()) {
+     time_t StartTime = time(NULL);
      bool deleted = false;
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      for (cRecording *r = DeletedRecordings.First(); r; ) {
          if (cIoThrottle::Engaged())
             return;
+         if (time(NULL) - StartTime > MAXREMOVETIME)
+            return; // don't stay here too long
+         if (cRemote::HasKeys())
+            return; // react immediately on user input
          if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
             cRecording *next = DeletedRecordings.Next(r);
             r->Remove();
@@ -2235,17 +2241,19 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 class cIndexFileGenerator : public cThread {
 private:
   cString recordingName;
+  bool update;
 protected:
   virtual void Action(void);
 public:
-  cIndexFileGenerator(const char *RecordingName);
+  cIndexFileGenerator(const char *RecordingName, bool Update = false);
   ~cIndexFileGenerator();
   };
 
-cIndexFileGenerator::cIndexFileGenerator(const char *RecordingName)
+cIndexFileGenerator::cIndexFileGenerator(const char *RecordingName, bool Update)
 :cThread("index file generator")
 ,recordingName(RecordingName)
 {
+  update = Update;
   Start();
 }
 
@@ -2264,15 +2272,34 @@ void cIndexFileGenerator::Action(void)
   cRingBufferLinear Buffer(IFG_BUFFER_SIZE, MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE);
   cPatPmtParser PatPmtParser;
   cFrameDetector FrameDetector;
-  cIndexFile IndexFile(recordingName, true);
+  cIndexFile IndexFile(recordingName, true, false, false, true);
   int BufferChunks = KILOBYTE(1); // no need to read a lot at the beginning when parsing PAT/PMT
   off_t FileSize = 0;
   off_t FrameOffset = -1;
+  uint16_t FileNumber = 1;
+  off_t FileOffset = 0;
+  int Last = -1;
+  if (update) {
+     // Look for current index and position to end of it if present:
+     bool Independent;
+     int Length;
+     Last = IndexFile.Last();
+     if (Last >= 0 && !IndexFile.Get(Last, &FileNumber, &FileOffset, &Independent, &Length))
+        Last = -1; // reset Last if an error occurred
+     if (Last >= 0) {
+        Rewind = true;
+        isyslog("updating index file");
+        }
+     else
+        isyslog("generating index file");
+     }
   Skins.QueueMessage(mtInfo, tr("Regenerating index file"));
+  bool Stuffed = false;
   while (Running()) {
         // Rewind input file:
         if (Rewind) {
-           ReplayFile = FileName.SetOffset(1);
+           ReplayFile = FileName.SetOffset(FileNumber, FileOffset);
+           FileSize = FileOffset;
            Buffer.Clear();
            Rewind = false;
            }
@@ -2287,7 +2314,8 @@ void cIndexFileGenerator::Action(void)
               int Processed = FrameDetector.Analyze(Data, Length);
               if (Processed > 0) {
                  if (FrameDetector.NewFrame()) {
-                    IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize);
+                    if (IndexFileWritten || Last < 0) // check for first frame and do not write if in update mode
+                       IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize);
                     FrameOffset = -1;
                     IndexFileWritten = true;
                     }
@@ -2332,10 +2360,25 @@ void cIndexFileGenerator::Action(void)
         else if (ReplayFile) {
            int Result = Buffer.Read(ReplayFile, BufferChunks);
            if (Result == 0) { // EOF
-              ReplayFile = FileName.NextFile();
-              FileSize = 0;
-              FrameOffset = -1;
-              Buffer.Clear();
+              if (Buffer.Available() > 0 && !Stuffed) {
+                 // So the last call to Buffer.Get() returned NULL, but there is still
+                 // data in the buffer, and we're at the end of the current TS file.
+                 // The remaining data in the buffer is less than what's needed for the
+                 // frame detector to analyze frames, so we need to put some stuffing
+                 // packets into the buffer to flush out the rest of the data (otherwise
+                 // any frames within the remaining data would not be seen here):
+                 uchar StuffingPacket[TS_SIZE] = { TS_SYNC_BYTE, 0xFF };
+                 for (int i = 0; i <= MIN_TS_PACKETS_FOR_FRAME_DETECTOR; i++)
+                     Buffer.Put(StuffingPacket, sizeof(StuffingPacket));
+                 Stuffed = true;
+                 }
+              else {
+                 ReplayFile = FileName.NextFile();
+                 FileSize = 0;
+                 FrameOffset = -1;
+                 Buffer.Clear();
+                 Stuffed = false;
+                 }
               }
            }
         // Recording has been processed:
@@ -2397,7 +2440,7 @@ struct tIndexTs {
 #define INDEXFILECHECKINTERVAL 500 // ms between checks for existence of the regenerated index file
 #define INDEXFILETESTINTERVAL   10 // ms between tests for the size of the index file in case of pausing live video
 
-cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, bool PauseLive)
+cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, bool PauseLive, bool Update)
 :resumeFile(FileName, IsPesRecording)
 {
   f = -1;
@@ -2436,7 +2479,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
               esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName);
               }
            last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
-           if (!Record && last >= 0) {
+           if ((!Record || Update) && last >= 0) {
               size = last + 1;
               index = MALLOC(tIndexTs, size);
               if (index) {
@@ -2724,15 +2767,16 @@ int cIndexFile::GetLength(const char *FileName, bool IsPesRecording)
   return -1;
 }
 
-bool GenerateIndex(const char *FileName)
+bool GenerateIndex(const char *FileName, bool Update)
 {
   if (DirectoryOk(FileName)) {
      cRecording Recording(FileName);
      if (Recording.Name()) {
         if (!Recording.IsPesRecording()) {
            cString IndexFileName = AddDirectory(FileName, INDEXFILESUFFIX);
-           unlink(IndexFileName);
-           cIndexFileGenerator *IndexFileGenerator = new cIndexFileGenerator(FileName);
+           if (!Update)
+              unlink(IndexFileName);
+           cIndexFileGenerator *IndexFileGenerator = new cIndexFileGenerator(FileName, Update);
            while (IndexFileGenerator->Active())
                  cCondWait::SleepMs(INDEXFILECHECKINTERVAL);
            if (access(IndexFileName, R_OK) == 0)
diff --git a/recording.h b/recording.h
index 7d5228ebe..c9e950b34 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 3.4 2014/01/01 12:45:18 kls Exp $
+ * $Id: recording.h 3.5 2015/01/17 14:33:05 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -429,7 +429,7 @@ class cIndexFile {
   void ConvertToPes(tIndexTs *IndexTs, int Count);
   bool CatchUp(int Index = -1);
 public:
-  cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false, bool PauseLive = false);
+  cIndexFile(const char *FileName, bool Record, bool IsPesRecording = false, bool PauseLive = false, bool Update = false);
   ~cIndexFile();
   bool Ok(void) { return index != NULL; }
   bool Write(bool Independent, uint16_t FileNumber, off_t FileOffset);
@@ -488,7 +488,11 @@ char *ExchangeChars(char *s, bool ToFileSystem);
       // be modified and may be reallocated if more space is needed. The return
       // value points to the resulting string, which may be different from s.
 
-bool GenerateIndex(const char *FileName);
+bool GenerateIndex(const char *FileName, bool Update = false);
+       ///< Generates the index of the existing recording with the given FileName.
+       ///< If Update is true, an existing index file will be checked whether it is
+       ///< complete, and will be updated if it isn't. Otherwise an existing index
+       ///< file will be removed before a new one is generated.
 
 enum eRecordingsSortMode { rsmName, rsmTime };
 extern eRecordingsSortMode RecordingsSortMode;
diff --git a/remux.c b/remux.c
index 87ed469df..23e83877a 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 3.5 2014/03/08 15:05:35 kls Exp $
+ * $Id: remux.c 3.9 2015/01/14 09:57:09 kls Exp $
  */
 
 #include "remux.h"
@@ -822,9 +822,12 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                          }
                       }
                       break;
-           case 0x81: // STREAMTYPE_USER_PRIVATE
+           case 0x81: // STREAMTYPE_USER_PRIVATE - AC3 audio for ATSC and BD
+           case 0x82: // STREAMTYPE_USER_PRIVATE - DTS audio for BD
                       {
-                      dbgpatpmt(" AC3");
+                      dbgpatpmt(" %s",
+                          stream.getStreamType() == 0x81 ? "AC3" :
+                          stream.getStreamType() == 0x82 ? "DTS" : "");
                       char lang[MAXLANGCODE1] = { 0 };
                       SI::Descriptor *d;
                       for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
@@ -850,6 +853,36 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                          }
                       }
                       break;
+           case 0x90: // PGS subtitles for BD
+                      {
+                      dbgpatpmt(" subtitling");
+                      char lang[MAXLANGCODE1] = { 0 };
+                      SI::Descriptor *d;
+                      for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
+                          switch (d->getDescriptorTag()) {
+                            case SI::ISO639LanguageDescriptorTag: {
+                                 SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                 dbgpatpmt(" '%s'", ld->languageCode);
+                                 strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                 if (NumSpids < MAXSPIDS) {
+                                    spids[NumSpids] = stream.getPid();
+                                    *slangs[NumSpids] = 0;
+                                    subtitlingTypes[NumSpids] = 0;
+                                    compositionPageIds[NumSpids] = 0;
+                                    ancillaryPageIds[NumSpids] = 0;
+                                    if (updatePrimaryDevice)
+                                       cDevice::PrimaryDevice()->SetAvailableTrack(ttSubtitle, NumSpids, stream.getPid(), lang);
+                                    NumSpids++;
+                                    spids[NumSpids] = 0;
+                                    }
+                                 }
+                                 break;
+                            default: ;
+                            }
+                          delete d;
+                          }
+                      }
+                      break;
            default: ;
            }
          dbgpatpmt("\n");
@@ -1511,7 +1544,12 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        for (int i = 0; i < numPtsValues; i++)
                            ptsValues[i] = ptsValues[i + 1] - ptsValues[i];
                        qsort(ptsValues, numPtsValues, sizeof(uint32_t), CmpUint32);
-                       uint32_t Delta = ptsValues[0] / (framesPerPayloadUnit +  parser->IFrameTemporalReferenceOffset());
+                       int Div = framesPerPayloadUnit;
+                       if (framesPerPayloadUnit > 1)
+                          Div += parser->IFrameTemporalReferenceOffset();
+                       if (Div <= 0)
+                          Div = 1;
+                       uint32_t Delta = ptsValues[0] / Div;
                        // determine frame info:
                        if (isVideo) {
                           if (abs(Delta - 3600) <= 1)
diff --git a/remux.h b/remux.h
index 5574635ca..6bc91ad70 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 3.3 2014/02/08 12:41:50 kls Exp $
+ * $Id: remux.h 3.4 2014/03/22 14:58:24 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -50,6 +50,7 @@ class cRemux {
 #define TS_ADAPT_EXTENSION    0x01
 
 #define PATPID 0x0000 // PAT PID (constant 0)
+#define CATPID 0x0001 // CAT PID (constant 1)
 #define MAXPID 0x2000 // for arrays that use a PID as the index
 
 #define PTSTICKS  90000 // number of PTS ticks per second
diff --git a/sdt.c b/sdt.c
index 7537cfc1c..4e6748d84 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 3.3 2014/03/10 14:42:20 kls Exp $
+ * $Id: sdt.c 3.4 2015/01/04 14:33:35 kls Exp $
  */
 
 #include "sdt.h"
@@ -152,7 +152,9 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             delete LinkChannels;
          }
       }
-  if (sdt.getSectionNumber() == sdt.getLastSectionNumber())
-     Channels.MarkObsoleteChannels(source, sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
+  if (sdt.getSectionNumber() == sdt.getLastSectionNumber()) {
+     if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3)
+        Channels.MarkObsoleteChannels(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
+     }
   Channels.Unlock();
 }
diff --git a/sections.c b/sections.c
index 833639a8f..32d80de97 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 3.0 2012/10/04 12:21:59 kls Exp $
+ * $Id: sections.c 3.1 2015/01/14 11:35:53 kls Exp $
  */
 
 #include "sections.h"
@@ -40,10 +40,11 @@ class cSectionHandlerPrivate {
 // --- cSectionHandler -------------------------------------------------------
 
 cSectionHandler::cSectionHandler(cDevice *Device)
-:cThread("section handler", true)
+:cThread(NULL, true)
 {
   shp = new cSectionHandlerPrivate;
   device = Device;
+  SetDescription("device %d section handler", device->CardIndex() + 1);
   statusCount = 0;
   on = false;
   waitForLock = false;
diff --git a/skinlcars.c b/skinlcars.c
index e9d1e28f9..a722b5214 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 3.7 2014/03/10 12:04:06 kls Exp $
+ * $Id: skinlcars.c 3.8 2014/06/12 08:48:15 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -482,7 +482,7 @@ cSkinLCARSDisplayChannel::~cSkinLCARSDisplayChannel()
 void cSkinLCARSDisplayChannel::DrawDate(void)
 {
   cString s = DayDateTime();
-  if (initial || strcmp(s, lastDate)) {
+  if (initial || !*lastDate || strcmp(s, lastDate)) {
      osd->DrawText(xc12, yc11, s, Theme.Color(clrDateFg), Theme.Color(clrDateBg), cFont::GetFont(fontOsd), xc13 - xc12, lineHeight, taRight | taBorder);
      lastDate = s;
      }
@@ -1070,7 +1070,7 @@ void cSkinLCARSDisplayMenu::DrawMenuFrame(void)
 void cSkinLCARSDisplayMenu::DrawDate(void)
 {
   cString s = DayDateTime();
-  if (initial || strcmp(s, lastDate)) {
+  if (initial || !*lastDate || strcmp(s, lastDate)) {
      const cFont *font = cFont::GetFont(fontOsd);
      tColor ColorFg = Theme.Color(clrDateFg);
      tColor ColorBg = Theme.Color(clrDateBg);
diff --git a/skins.h b/skins.h
index 8b64e62a3..e1d12c055 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 3.3 2014/02/17 11:05:29 kls Exp $
+ * $Id: skins.h 3.4 2015/01/15 10:45:47 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -121,6 +121,14 @@ enum eMenuCategory {
   mcCam
   };
 
+enum eMenuSortMode {
+  msmUnknown = 0,
+  msmNumber,
+  msmName,
+  msmTime,
+  msmProvider
+  };
+
 class cSkinDisplayMenu : public cSkinDisplay {
        ///< This class implements the general purpose menu display, which is
        ///< used throughout the program to display information and let the
@@ -167,6 +175,10 @@ class cSkinDisplayMenu : public cSkinDisplay {
   virtual void SetTabs(int Tab1, int Tab2 = 0, int Tab3 = 0, int Tab4 = 0, int Tab5 = 0);
        ///< Sets the tab columns to the given values, which are the number of
        ///< characters in each column.
+  virtual void SetMenuSortMode(eMenuSortMode MenuSortMode) {}
+       ///< Sets the mode by which the items in this menu are sorted.
+       ///< This is purely informative and may be used by a skin to display the
+       ///< current sort mode by means of some text or symbol.
   virtual void Scroll(bool Up, bool Page);
        ///< If this menu contains a text area that can be scrolled, this function
        ///< will be called to actually scroll the text. Up indicates whether the
diff --git a/svdrp.c b/svdrp.c
index c87803256..2b5edb2c6 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 3.5 2013/10/21 07:46:04 kls Exp $
+ * $Id: svdrp.c 3.6 2015/01/12 11:16:27 kls Exp $
  */
 
 #include "svdrp.h"
@@ -261,7 +261,7 @@ const char *HelpPages[] = {
   "    Move the recording with the given number. Before a recording can be\n"
   "    moved, an LSTR command must have been executed in order to retrieve\n"
   "    the recording numbers. The numbers don't change during subsequent MOVR\n"
-  "    commands.n",
+  "    commands.\n",
   "NEWC <settings>\n"
   "    Create a new channel. Settings must be in the same format as returned\n"
   "    by the LSTC command.",
diff --git a/thread.h b/thread.h
index 1d10e689e..d2d8ee2ae 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 3.1 2013/04/11 08:47:31 kls Exp $
+ * $Id: thread.h 3.2 2015/01/14 11:39:55 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -110,12 +110,16 @@ class cThread {
   cThread(const char *Description = NULL, bool LowPriority = false);
        ///< Creates a new thread.
        ///< If Description is present, a log file entry will be made when
-       ///< the thread starts and stops. The Start() function must be called
-       ///< to actually start the thread.
+       ///< the thread starts and stops (see SetDescription()).
+       ///< The Start() function must be called to actually start the thread.
        ///< LowPriority can be set to true to make this thread run at a lower
        ///< priority.
   virtual ~cThread();
   void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
+       ///< Sets the description of this thread, which will be used when logging
+       ///< starting or stopping of the thread. Make sure any important information
+       ///< is within the first 15 characters of Description, because only these
+       ///< may be displayed in thread listings (like 'htop', for instance).
   bool Start(void);
        ///< Actually starts the thread.
        ///< If the thread is already running, nothing happens.
diff --git a/tools.c b/tools.c
index a2055ec8d..332fce426 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 3.2 2013/09/22 13:19:19 kls Exp $
+ * $Id: tools.c 3.3 2014/03/22 14:22:55 kls Exp $
  */
 
 #include "tools.h"
@@ -609,7 +609,7 @@ int DirSizeMB(const char *DirName)
            }
      return size;
      }
-  else
+  else if (errno != ENOENT)
      LOG_ERROR_STR(DirName);
   return -1;
 }
diff --git a/tools.h b/tools.h
index 358f75e31..920a1d11b 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 3.3 2013/09/22 13:30:14 kls Exp $
+ * $Id: tools.h 3.6 2015/01/14 09:09:06 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -537,6 +537,14 @@ template<class T> class cVector {
   {
     return At(Index);
   }
+  int IndexOf(const T &Data) // returns the index of Data, or -1 if not found
+  {
+    for (int i = 0; i < size; i++) {
+        if (data[i] == Data)
+           return i;
+        }
+    return -1;
+  }
   int Size(void) const { return size; }
   virtual void Insert(T Data, int Before = 0)
   {
@@ -549,18 +557,45 @@ template<class T> class cVector {
     else
        Append(Data);
   }
+  bool InsertUnique(T Data, int Before = 0)
+  {
+    if (IndexOf(Data) < 0) {
+       Insert(Data, Before);
+       return true;
+       }
+    return false;
+  }
   virtual void Append(T Data)
   {
     if (size >= allocated)
        Realloc(allocated * 3 / 2); // increase size by 50%
     data[size++] = Data;
   }
+  bool AppendUnique(T Data)
+  {
+    if (IndexOf(Data) < 0) {
+       Append(Data);
+       return true;
+       }
+    return false;
+  }
   virtual void Remove(int Index)
   {
+    if (Index < 0)
+       return; // prevents out-of-bounds access
     if (Index < size - 1)
        memmove(&data[Index], &data[Index + 1], (size - Index) * sizeof(T));
     size--;
   }
+  bool RemoveElement(const T &Data)
+  {
+    int i = IndexOf(Data);
+    if (i >= 0) {
+       Remove(i);
+       return true;
+       }
+    return false;
+  }
   virtual void Clear(void)
   {
     for (int i = 0; i < size; i++)
diff --git a/vdr.1 b/vdr.1
index 36765dbd3..5727ee5a0 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 3.1 2013/12/25 11:01:36 kls Exp $
+.\" $Id: vdr.1 3.3 2015/01/17 14:46:22 kls Exp $
 .\"
 .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
@@ -178,6 +178,10 @@ more information.
 Read resource files from \fIdir\fR
 (default is to read them from the config directory).
 .TP
+.BI \-\-showargs[= dir ]
+Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR),
+display them to the console and exit.
+.TP
 .BI \-s\  cmd ,\ \-\-shutdown= cmd
 Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
 information.
@@ -197,6 +201,18 @@ be set from the transponder data, but for security reasons
 vdr can switch to a lesser privileged user id during normal
 operation.
 .TP
+.BI \-\-updindex= rec
+Update the index file for the given recording.
+\fIrec\fR must be the full path name of an existing recording.
+The recording must be in TS format.
+If the recording already has an index file, it will be checked
+whether it is complete, and will be updated if it isn't. If
+there is no index file yet, a new one will be generated.
+The program will return immediately after updating the index.
+Note that using this option while another instance of VDR is
+currently replaying the given recording, or if the recording
+has not been finished yet, may lead to unexpected results.
+.TP
 .BI \-\-userdump
 Allow coredumps if -u is given (only for debugging).
 .TP
@@ -213,6 +229,10 @@ Print version information and exit.
 .BI \-w\  sec ,\ \-\-watchdog= sec
 Activate the watchdog timer with a timeout of \fIsec\fR seconds.
 A value of \fB0\fR (default) disables the watchdog.
+.P
+If started without any options, vdr tries to read command line options
+from files named '*.conf' in the directory /etc/vdr/conf.d. Files are
+read in alphabetical order. See vdr(5) for details.
 .SH SIGNALS
 .TP
 .B SIGINT, SIGTERM
diff --git a/vdr.5 b/vdr.5
index 645ce38b1..44e56c493 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 3.2 2014/03/16 10:38:31 kls Exp $
+.\" $Id: vdr.5 3.3 2014/04/14 13:11:49 kls Exp $
 .\"
 .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
 .SH NAME
@@ -899,6 +899,33 @@ Note that the \fBevent id\fR that comes from the DVB data stream is actually
 just 16 bit wide. The internal representation in VDR allows for 32 bit to
 be used, so that external tools can generate EPG data that is guaranteed
 not to collide with the ids of existing data.
+.SS COMMANDLINE OPTIONS
+If started without any options, vdr tries to read any files in the directory
+/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
+These files are read in alphabetical order. The format of these files is
+
+# comment
+.br
+[name]
+.br
+-a
+.br
+-b 123
+.br
+--long
+.br
+--longarg=123
+.br
+
+Any lines that begin with '#' as the first non-whitespace character are considered
+comments and are ignored.
+A command line option file consists of one or more sections, indicated by '[name]',
+where 'name' is either the fixed word 'vdr' (if this section contains options for
+the main VDR program) or the name of the plugin this section applies to.
+Each option must be written on a separate line, including the leading '-' (for
+a short option) or '--' (for a long option). If the option has additional arguments,
+they have to be written on the same line as the option itself, separated from the
+option with a blank (short option) or equal sign (long option).
 .SH SEE ALSO
 .BR vdr (1)
 .SH AUTHOR
diff --git a/vdr.c b/vdr.c
index 835d33df9..336130f83 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.11 2014/03/16 12:49:13 kls Exp $
+ * $Id: vdr.c 3.15 2015/01/17 14:48:09 kls Exp $
  */
 
 #include <getopt.h>
@@ -39,6 +39,7 @@
 #endif
 #include <termios.h>
 #include <unistd.h>
+#include "args.h"
 #include "audio.h"
 #include "channels.h"
 #include "config.h"
@@ -190,6 +191,7 @@ int main(int argc, char *argv[])
 #define DEFAULTWATCHDOG     0 // seconds
 #define DEFAULTVIDEODIR VIDEODIR
 #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory)
+#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d")
 #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory)
 #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory)
 #define DEFAULTPLUGINDIR PLUGINDIR
@@ -227,6 +229,15 @@ int main(int argc, char *argv[])
   VdrUser = VDR_USER;
 #endif
 
+  cArgs *Args = NULL;
+  if (argc == 1) {
+     Args = new cArgs(argv[0]);
+     if (Args->ReadDirectory(DEFAULTARGSDIR)) {
+        argc = Args->GetArgc();
+        argv = Args->GetArgv();
+        }
+     }
+
   cVideoDirectory::SetName(VideoDirectory);
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
 
@@ -254,9 +265,11 @@ int main(int argc, char *argv[])
       { "port",     required_argument, NULL, 'p' },
       { "record",   required_argument, NULL, 'r' },
       { "resdir",   required_argument, NULL, 'r' | 0x100 },
+      { "showargs", optional_argument, NULL, 's' | 0x200 },
       { "shutdown", required_argument, NULL, 's' },
       { "split",    no_argument,       NULL, 's' | 0x100 },
       { "terminal", required_argument, NULL, 't' },
+      { "updindex", required_argument, NULL, 'u' | 0x200 },
       { "user",     required_argument, NULL, 'u' },
       { "userdump", no_argument,       NULL, 'u' | 0x100 },
       { "version",  no_argument,       NULL, 'V' },
@@ -426,6 +439,19 @@ int main(int argc, char *argv[])
           case 's' | 0x100:
                     Setup.SplitEditedFiles = 1;
                     break;
+          case 's' | 0x200: {
+                    const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR;
+                    cArgs Args(argv[0]);
+                    if (!Args.ReadDirectory(ArgsDir)) {
+                       fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir);
+                       return 2;
+                       }
+                    int c = Args.GetArgc();
+                    char **v = Args.GetArgv();
+                    for (int i = 1; i < c; i++)
+                        printf("%s\n", v[i]);
+                    return 0;
+                    }
           case 't': Terminal = optarg;
                     if (access(Terminal, R_OK | W_OK) < 0) {
                        fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
@@ -438,6 +464,8 @@ int main(int argc, char *argv[])
           case 'u' | 0x100:
                     UserDump = true;
                     break;
+          case 'u' | 0x200:
+                    return GenerateIndex(optarg, true) ? 0 : 2;
           case 'V': DisplayVersion = true;
                     break;
           case 'v' | 0x100:
@@ -539,9 +567,12 @@ int main(int argc, char *argv[])
                "  -s CMD,   --shutdown=CMD call CMD to shutdown the computer\n"
                "            --split        split edited files at the editing marks (only\n"
                "                           useful in conjunction with --edit)\n"
+               "            --showargs[=DIR] print the arguments read from DIR and exit\n"
+               "                           (default: %s)\n"
                "  -t TTY,   --terminal=TTY controlling tty\n"
                "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
                "                           root\n"
+               "            --updindex=REC update index for recording REC and exit\n"
                "            --userdump     allow coredumps if -u is given (debugging)\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
                "  -V,       --version      print version information and exit\n"
@@ -561,6 +592,7 @@ int main(int argc, char *argv[])
                DEFAULTLOCDIR,
                DEFAULTSVDRPPORT,
                DEFAULTRESDIR,
+               DEFAULTARGSDIR,
                DEFAULTVIDEODIR,
                DEFAULTWATCHDOG
                );
@@ -849,7 +881,7 @@ int main(int argc, char *argv[])
      }
 
 #ifdef SDNOTIFY
-  sd_notify(0, "READY=1");
+  sd_notify(0, "READY=1\nSTATUS=Ready");
 #endif
 
   // Main program loop:
@@ -927,7 +959,7 @@ int main(int argc, char *argv[])
                      if (Channel->Number() == cDevice::CurrentChannel() && cDevice::PrimaryDevice()->HasDecoder()) {
                         if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) {
                            if (cDevice::ActualDevice()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
-                              isyslog("retuning due to modification of channel %d", Channel->Number());
+                              isyslog("retuning due to modification of channel %d (%s)", Channel->Number(), Channel->Name());
                               Channels.SwitchTo(Channel->Number());
                               }
                            }
@@ -1004,7 +1036,7 @@ int main(int argc, char *argv[])
                         if (!Device->IsTunedToTransponder(Timer->Channel())) {
                            if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
                               cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
-                           dsyslog("switching device %d to channel %d", Device->DeviceNumber() + 1, Timer->Channel()->Number());
+                           dsyslog("switching device %d to channel %d (%s)", Device->DeviceNumber() + 1, Timer->Channel()->Number(), Timer->Channel()->Name());
                            if (Device->SwitchChannel(Timer->Channel(), false))
                               Device->SetOccupied(TIMERDEVICETIMEOUT);
                            }

From 4ee983a29469e5444a72a6cc31d02fad26b62ffd Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 1 Feb 2015 14:55:00 +0100
Subject: [PATCH 239/307] Version 2.1.8 VDR developer version 2.1.8 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.8.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.7-2.1.8.diff

MD5 checksums:

1d2751e87def9b18b448513f24e635e9  vdr-2.1.8.tar.bz2
0487e037278f6f6684a7933674910f05  vdr-2.1.7-2.1.8.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed "warning: invalid suffix on literal" with GCC 4.8 and C++11 (thanks to Joerg
  Bornkessel).
- Fixed the link to "svdrpsend (1)" in the vdr.1 man page (thanks to Chris Mayo).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Added functionality based on the "jumpplay" patch from Torsten Kunkel and Thomas
  Günther:
  + The new option "Setup/Replay/Pause replay when jumping to a mark" can be used to
    turn off pausing replay when jumping to an editing mark with the '9' key.
  + The new option "Setup/Replay/Skip edited parts" can be used to automatically skip
    the edited parts of a recording during replay, without the need to actually cut
    the recording.
  + The new option "Setup/Replay/Pause replay at last mark" can be used to make replay
    go into Pause mode when it has reached the last "end" mark.
  + The '8' key for testing an edited sequence now also jumps to the next *end*
    mark if "Setup/Replay/Skip edited parts" is active. This allows for testing edits
    in recordings that have actually been cut, as well as recordings that have not
    been cut, in case "Skip edited parts" is enabled.
- Added support for "Satellite Channel Routing" (SCR) according to EN50607, also
  known as "JESS" (thanks to Manfred Völkel and Frank Neumann).
- The keys '1' and '3' can now be used in replay mode to position an editing mark
  in "binary" mode (based on a patch from Rolf Ahrenberg, with modifications by Helmut
  Auer). See MANUAL, section "Editing a Recording".
- The Yellow button in the "Setup/CAM" menu can now be used to put the selected
  CAM into a mode where it remains assigned to a device that is tuned to the current
  channel until the smart card it contains is activated and the CAM thus starts to
  descramble (see MANUAL, section "Setup/CAM" for details).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Added ARGSDIR to the ONEDIR section of Make.config.template (suggested by Derek
  Kelly).
- Made cRecording::GetResume() public (suggested by Stefan Braun).
- Fixed setting the read index in cDvbPlayer::Goto() in case Still is false.
- The function cDvbPlayer::Goto() now automatically calls Play() if Still is false.
- Added support for LCN (Logical Channel Numbers), which plugins may use to sort
  channels (thanks to Rolf Ahrenberg).
---
 CONTRIBUTORS         |  11 +++
 HISTORY              |  58 ++++++++++++++++
 INSTALL              |   5 +-
 MANUAL               |  71 +++++++++++++++++--
 Make.config.template |   3 +-
 channels.c           |  11 ++-
 channels.h           |   5 +-
 ci.c                 |  90 +++++++++++++++++++++++-
 ci.h                 |  23 ++++++-
 config.c             |  17 ++++-
 config.h             |  15 ++--
 device.c             |  16 ++---
 diseqc.c             |  58 +++++++++++-----
 diseqc.conf          |  24 ++++++-
 dvbplayer.c          |  90 ++++++++++++++++++++----
 dvbplayer.h          |   4 +-
 dvbsubtitle.c        |  12 ++--
 keys.h               |   4 +-
 menu.c               | 158 ++++++++++++++++++++++++++++++++++++++-----
 menu.h               |  18 ++++-
 nit.c                |  36 +++++++++-
 po/ar.po             |  33 ++++++++-
 po/ca_ES.po          |  33 ++++++++-
 po/cs_CZ.po          |  33 ++++++++-
 po/da_DK.po          |  33 ++++++++-
 po/de_DE.po          |  33 ++++++++-
 po/el_GR.po          |  33 ++++++++-
 po/es_ES.po          |  33 ++++++++-
 po/et_EE.po          |  53 ++++++++++++---
 po/fi_FI.po          |  37 +++++++++-
 po/fr_FR.po          |  33 ++++++++-
 po/hr_HR.po          |  33 ++++++++-
 po/hu_HU.po          |  33 ++++++++-
 po/it_IT.po          |  39 +++++++++--
 po/lt_LT.po          |  33 ++++++++-
 po/mk_MK.po          |  33 ++++++++-
 po/nl_NL.po          |  33 ++++++++-
 po/nn_NO.po          |  33 ++++++++-
 po/pl_PL.po          |  33 ++++++++-
 po/pt_PT.po          |  33 ++++++++-
 po/ro_RO.po          | 145 +++++++++++++++++++++++----------------
 po/ru_RU.po          |  33 ++++++++-
 po/sk_SK.po          |  33 ++++++++-
 po/sl_SI.po          |  33 ++++++++-
 po/sr_RS.po          |  33 ++++++++-
 po/sv_SE.po          |  33 ++++++++-
 po/tr_TR.po          |  33 ++++++++-
 po/uk_UA.po          |  33 ++++++++-
 po/zh_CN.po          |  33 ++++++++-
 recording.c          |  10 +--
 recording.h          |   6 +-
 remote.c             |   4 +-
 scr.conf             |  22 +++---
 vdr.1                |   4 +-
 54 files changed, 1636 insertions(+), 205 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 988a80f4d..64edccc15 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -624,6 +624,7 @@ Helmut Auer <vdr@helmutauer.de>
  for helping to debug a problem with frame detection in MPEG-2 streams that have "bottom fields"
  or varying GOP structures
  for a patch that was used to implement the command line option --updindex
+ for modifying the "binary skip" patch to move editing marks
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
@@ -1192,6 +1193,8 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for adding support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters
  for fixing a problem with subtitles not being displayed because the broadcaster
  doesn't set the data's version numbers as required by the DVB standard
+ for the "binary skip" patch
+ for adding support for LCN (Logical Channel Numbers)
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2139,6 +2142,7 @@ Thomas G
  which results in using tr(FileNameChars)
  for fixing handling "none" color entries in XPM files
  for fixing displaying the frame number when setting an editing mark
+ for the "jumpplay" patch
 
 David Woodhouse <dwmw2@infradead.org>
  for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
@@ -2677,6 +2681,7 @@ Torsten Kunkel <vdrml@tkunkel.de>
  for pointing out that it was not obvious how to initiate internationalization
  support for a plugin
  for suggesting to add a section about "Logging" to PLUGINS.html
+ for the "jumpplay" patch
 
 Michael Nival <mnival@club-internet.fr>
  for translating OSD texts to the French language
@@ -2824,6 +2829,7 @@ Derek Kelly <user.vdr@gmail.com>
  are no short names at all
  for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8
  for reporting a missing template for DVBDIR in Make.config.template
+ for suggesting to add ARGSDIR to the ONEDIR section of Make.config.template
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2969,6 +2975,7 @@ Dominik Strasser <dominik@die-strassers.de>
 Joerg Bornkessel <hd_brummy@gentoo.org>
  for adding LDFLAGS to the linker calls in the Makefiles
  for fixing font handling with fontconfig 2.9.0 or newer
+ for fixing "warning: invalid suffix on literal" with GCC 4.8 and C++11
 
 Andreas Oberritter <obi@opendreambox.org>
  for suggesting to retrieve the include path to the freetype2 header files
@@ -2981,6 +2988,7 @@ Frank Neumann <fnu@yavdr.org>
  for suggesting to reduce the thread and I/O priority cCuttingThread::Action()
  for reporting a problem with tuning timeouts when using SCR with multiple tuners
  for fixing the German translation of "VDR will shut down in %s minutes"
+ for adding support for "Satellite Channel Routing" (SCR) according to EN50607 ("JESS")
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
@@ -3045,6 +3053,7 @@ Frank Niederwipper <f.niederwipper@gmail.com>
 
 Chris Mayo <aklhfex@gmail.com>
  for reporting a problem with detecting frames on radio channels
+ for fixing the link to "svdrpsend (1)" in the vdr.1 man page
 
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
@@ -3229,6 +3238,7 @@ Stefan Braun <louis.braun@gmx.de>
  for reporting an endless loop in the DrawEllipse() functions for very small ellipses
  for suggesting to add the menu category mcRecordingEdit for marking menus that edit
  recording properties
+ for suggesting to make cRecording::GetResume() public
 
 Jochen Dolze <vdr@dolze.de>
  for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order
@@ -3243,6 +3253,7 @@ Seppo Ingalsuo <seppo.ingalsuo@iki.fi>
 Manfred V�lkel <mvoelkel@digitaldevices.de>
  for suggesting to make all bonded devices (except for the master) turn off their LNB
  power completely to avoid problems when receiving vertically polarized transponders
+ for adding support for "Satellite Channel Routing" (SCR) according to EN50607 ("JESS")
 
 Thomas Maass <mase@setho.org>
  for reporting a difference in the internal sequence of actions when pressing the Blue
diff --git a/HISTORY b/HISTORY
index 6d934ebd8..2e8be6787 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8394,3 +8394,61 @@ Video Disk Recorder Revision History
   do so again with this version to make sure the index is OK.
 - Added the new command line option --updindex, which can be used to update an
   incomplete index of a recording (based on a patch from Helmut Auer).
+
+2015-01-20: Version 2.0.7
+
+- Fixed a possible division by zero in frame rate detection.
+- Fixed a bug in the Makefile when installing plugins with LCLBLD=1 (thanks to
+  Stefan Huelswitt).
+- Fixed jumping to an absolute position via the Red key in case replay was paused
+  (reported by Dieter Ferdinand).
+- Now returning from removing deleted recordings after at most 10 seconds, or if the
+  user presses a remote control key, to keep the system from getting unresponsive
+  when removing a huge number of files (reported by Dieter Ferdinand).
+- Fixed generating the index file of an existing recording in case at the of a TS file
+  there is less data in the buffer than needed by the frame detector. In such a case
+  it was possible that frames were missed, and there was most likely a distortion
+  when replaying that part of a recording. This is mostly a problem for recordings that
+  consist of more than one *.ts file. Single file recordings could only lose some
+  frames at their very end, which probably doesn't matter. At any rate, if you have
+  generated an index file with VDR version 2.0.6 you may want to do so again with this
+  version to make sure the index is OK.
+
+2015-02-01: Version 2.1.8
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed "warning: invalid suffix on literal" with GCC 4.8 and C++11 (thanks to Joerg
+  Bornkessel).
+- Fixed the link to "svdrpsend (1)" in the vdr.1 man page (thanks to Chris Mayo).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Added functionality based on the "jumpplay" patch from Torsten Kunkel and Thomas
+  G�nther:
+  + The new option "Setup/Replay/Pause replay when jumping to a mark" can be used to
+    turn off pausing replay when jumping to an editing mark with the '9' key.
+  + The new option "Setup/Replay/Skip edited parts" can be used to automatically skip
+    the edited parts of a recording during replay, without the need to actually cut
+    the recording.
+  + The new option "Setup/Replay/Pause replay at last mark" can be used to make replay
+    go into Pause mode when it has reached the last "end" mark.
+  + The '8' key for testing an edited sequence now also jumps to the next *end*
+    mark if "Setup/Replay/Skip edited parts" is active. This allows for testing edits
+    in recordings that have actually been cut, as well as recordings that have not
+    been cut, in case "Skip edited parts" is enabled.
+- Added support for "Satellite Channel Routing" (SCR) according to EN50607, also
+  known as "JESS" (thanks to Manfred V�lkel and Frank Neumann).
+- The keys '1' and '3' can now be used in replay mode to position an editing mark
+  in "binary" mode (based on a patch from Rolf Ahrenberg, with modifications by Helmut
+  Auer). See MANUAL, section "Editing a Recording".
+- The Yellow button in the "Setup/CAM" menu can now be used to put the selected
+  CAM into a mode where it remains assigned to a device that is tuned to the current
+  channel until the smart card it contains is activated and the CAM thus starts to
+  descramble (see MANUAL, section "Setup/CAM" for details).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Added ARGSDIR to the ONEDIR section of Make.config.template (suggested by Derek
+  Kelly).
+- Made cRecording::GetResume() public (suggested by Stefan Braun).
+- Fixed setting the read index in cDvbPlayer::Goto() in case Still is false.
+- The function cDvbPlayer::Goto() now automatically calls Play() if Still is false.
+- Added support for LCN (Logical Channel Numbers), which plugins may use to sort
+  channels (thanks to Rolf Ahrenberg).
diff --git a/INSTALL b/INSTALL
index 2dff5e342..07581b569 100644
--- a/INSTALL
+++ b/INSTALL
@@ -391,8 +391,9 @@ access your DiSEqC equipment (see man vdr(5) for details).
 A special form of DiSEqC is used to connect several receivers to one signal
 source using only a single cable. This method, known as "Satellite Channel Routing"
 according to EN50494 (aka "Unicable(TM)", "OLT(TM)", "SatCR", "Single Cable
-Distribution", "Channel Stacking System" or "Single Cable Interface") uses
-the file "scr.conf" to specify which SCR channels use which user band frequency.
+Distribution", "Channel Stacking System" or "Single Cable Interface") or
+EN50607 (aka "JESS") uses the file "scr.conf" to specify which SCR channels
+use which user band frequency.
 
 If DVB-S devices need to be connected to the same satellite cable, but no
 "Satellite Channel Routing" is available, they can be set to be "bonded" in
diff --git a/MANUAL b/MANUAL
index 4c7e6c88e..4f783c41e 100644
--- a/MANUAL
+++ b/MANUAL
@@ -363,15 +363,29 @@ Version 2.0
   - 0       Toggles an editing mark. If the mark indicator shows a red triangle,
             the current mark is deleted. Otherwise a new mark is set at the
             current position.
-  - 4, 6    Move an editing mark back and forward. You need to first jump to
-            an editing mark for this to work.
+  - 1, 3    Move an editing mark back and forward in "binary" mode. Pressing
+            either of these keys for the first time moves the mark 120 seconds
+            in the given direction (configurable via "Setup/Replay/Binary skip
+            initial value"). Further presses of the same key keep moving
+            the mark by the same value. Once the other key is pressed, the value
+            is divided by 2 (hence the name "binary") with every further press
+            of either key. Pressing '1' and '3' alternatingly divides the
+            distance all the way down to a single I-frame. That way a particular
+            place in a recording (for instance the beginning or end of a
+            commercial break) can be found very quickly. If none of these two
+            keys is pressed for a while (configurable via "Setup/Replay/Binary
+            skip timeout") the distance falls back to the initial value.
+            If replay is not in Pause mode, or if there is no mark at the
+            current position, the skip is performed without moving any mark.
+  - 4, 6    Move an editing mark back and forward by one I-frame. You need to
+            first jump to an editing mark for this to work.
   - 7, 9    Jump back and forward between editing marks. Replay goes into still
             mode after jumping to a mark. If the current position is at the
             first or last mark, or if there are no marks at all, these keys
             jump to the very beginning or end, respectively, of the recording.
   - 8       Positions replay at a point 3 seconds before the current or next
             "begin" mark and starts replay.
-  - 2       Start the actual cutting process.
+  - 2       Starts the actual cutting process.
 
   Editing marks are represented by black, vertical lines in the progress display.
   A small black triangle at the top of the mark means that this is a "begin"
@@ -831,7 +845,19 @@ Version 2.0
                          if it is in the process of being reset, its current status
                          is displayed.  The "Red" key can be pressed to enter the CAM
                          menu, and the "Green" key triggers a reset of the selected
-                         slot. The "Ok" key also opens the CAM menu.
+                         slot. The "Ok" key also opens the CAM menu. The "Yellow" key
+                         assigns the selected CAM to a device and switches it to the
+                         current channel. The CAM/device combination remains tuned to
+                         the current channel until the smart card in the CAM has been
+                         activated and thus starts to descramble, or until a recording
+                         needs this device. Pressing the "Yellow" key while a CAM is
+                         in activation mode cancels the activation. The activation mode
+                         remains in effect even if you switch to a different channel
+                         (provided there is more than one device in the system) or
+                         watch a recording. To activate your smart card simply switch
+                         to the channel you want to watch, open the "Setup/CAM" menu,
+                         select the CAM that contains the smart card (in case you
+                         have more than one CAM) and press the "Yellow" key.
 
   Recording:
 
@@ -943,6 +969,43 @@ Version 2.0
                          Defines whether the player automatically goes into Pause
                          mode when setting an editing mark.
 
+  Pause replay when jumping to a mark = yes
+                         By default replay is automatically paused whenever you jump
+                         to an editing mark with the '7' or '9' key in order to allow
+                         you to easily adjust those marks. If this option is set to
+                         'no', the '9' key will not pause if you are in Play mode and
+                         the mark you jump to is not within 3 seconds of the end of
+                         the recording.
+
+  Skip edited parts = no Defines whether the edited parts of a recording are
+                         automatically skipped during replay. This includes jumping
+                         to the first mark if replay starts at the beginning of the
+                         recording, and stopping at the last mark.
+                         In order to work, this option must be enabled before starting
+                         replay.
+
+  Pause replay at last mark = no
+                         If enabled, replay of a recording will go into Pause mode
+                         when it has reached the last "end" mark (if any). Note that
+                         the actual position at which the pause occurs may be a couple
+                         of frames before the last "end" mark, depending on how much
+                         data is buffered by your output device.
+                         In order to work, this option must be enabled before starting
+                         replay.
+
+  Binary skip initial value (s) = 120
+                         Defines the number of seconds to jump from the current replay
+                         position in either direction, when pressing the '1' or '3'
+                         key for the first time after the "Binary skip timeout".
+                         The valid range is 10...600.
+
+  Binary skip timeout (s) = 3
+                         Defines the number of seconds after which pressing the
+                         '1' or '3' key falls back to the "Binary skip initial value".
+                         The valid range is 0...10. Setting the timeout to 0 disables
+                         the binary mode and makes '1' and '3' always skip the number
+                         of seconds configured as the initial value.
+
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
                          files for each recording. The valid range is 0...99, with
diff --git a/Make.config.template b/Make.config.template
index dbb541400..88b62863a 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.1 2014/04/14 11:43:53 kls Exp $
+# $Id: Make.config.template 3.2 2015/01/30 15:18:47 kls Exp $
 
 ### The C compiler and options:
 
@@ -58,6 +58,7 @@ ifdef ONEDIR
 VIDEODIR     = /video
 CACHEDIR     = $(VIDEODIR)
 CONFDIR      = $(VIDEODIR)
+ARGSDIR      = $(VIDEODIR)/conf.d
 RESDIR       = $(VIDEODIR)
 endif
 
diff --git a/channels.c b/channels.c
index b91df6dc1..564088f4a 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 3.7 2015/01/14 12:15:03 kls Exp $
+ * $Id: channels.c 3.8 2015/02/01 13:47:05 kls Exp $
  */
 
 #include "channels.h"
@@ -248,6 +248,15 @@ void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
      }
 }
 
+void cChannel::SetLcn(int Lcn)
+{
+  if (lcn != Lcn) {
+     if (Number())
+        dsyslog("changing lcn of channel %d (%s) from %d to %d\n", Number(), name, lcn, Lcn);
+     lcn = Lcn;
+     }
+}
+
 void cChannel::SetName(const char *Name, const char *ShortName, const char *Provider)
 {
   if (!isempty(Name)) {
diff --git a/channels.h b/channels.h
index 7ca1e3e5f..332388212 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 3.2 2014/01/04 15:01:21 kls Exp $
+ * $Id: channels.h 3.3 2015/02/01 13:30:26 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -121,6 +121,7 @@ class cChannel : public cListObject {
   int tid;
   int sid;
   int rid;
+  int lcn;       // Logical channel number assigned by data stream (or -1 if not available)
   int number;    // Sequence number assigned on load
   bool groupSep;
   int __EndData__;
@@ -174,6 +175,7 @@ class cChannel : public cListObject {
   int Tid(void) const { return tid; }
   int Sid(void) const { return sid; }
   int Rid(void) const { return rid; }
+  int Lcn(void) const { return lcn; }
   int Number(void) const { return number; }
   void SetNumber(int Number) { number = Number; }
   bool GroupSep(void) const { return groupSep; }
@@ -192,6 +194,7 @@ class cChannel : public cListObject {
   void CopyTransponderData(const cChannel *Channel);
   bool SetTransponderData(int Source, int Frequency, int Srate, const char *Parameters, bool Quiet = false);
   void SetId(int Nid, int Tid, int Sid, int Rid = 0);
+  void SetLcn(int Lcn);
   void SetName(const char *Name, const char *ShortName, const char *Provider);
   void SetPortalName(const char *PortalName);
   void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
diff --git a/ci.c b/ci.c
index 1072695c7..b1958bdcb 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.17 2015/01/15 09:14:57 kls Exp $
+ * $Id: ci.c 3.18 2015/01/30 12:24:53 kls Exp $
  */
 
 #include "ci.h"
@@ -22,6 +22,7 @@
 #include "receiver.h"
 #include "remux.h"
 #include "libsi/si.h"
+#include "skins.h"
 #include "tools.h"
 
 // Set these to 'true' for debug output:
@@ -236,6 +237,53 @@ void cCaPidReceiver::Receive(uchar *Data, int Length)
      }
 }
 
+// --- cCaActivationReceiver -------------------------------------------------
+
+// A receiver that is used to make the device stay on a given channel and
+// keep the CAM slot assigned.
+
+#define UNSCRAMBLE_TIME     5 // seconds of receiving purely unscrambled data before considering the smart card "activated"
+#define TS_PACKET_FACTOR 1024 // only process every TS_PACKET_FACTORth packet to keep the load down
+
+class cCaActivationReceiver : public cReceiver {
+private:
+  cCamSlot *camSlot;
+  time_t lastScrambledTime;
+  int numTsPackets;
+protected:
+  virtual void Receive(uchar *Data, int Length);
+public:
+  cCaActivationReceiver(const cChannel *Channel, cCamSlot *CamSlot);
+  virtual ~cCaActivationReceiver();
+  };
+
+cCaActivationReceiver::cCaActivationReceiver(const cChannel *Channel, cCamSlot *CamSlot)
+:cReceiver(Channel, MINPRIORITY + 1)
+{
+  camSlot = CamSlot;
+  lastScrambledTime = time(NULL);
+  numTsPackets = 0;
+}
+
+cCaActivationReceiver::~cCaActivationReceiver()
+{
+  Detach();
+}
+
+void cCaActivationReceiver::Receive(uchar *Data, int Length)
+{
+  if (numTsPackets++ % TS_PACKET_FACTOR == 0) {
+     time_t Now = time(NULL);
+     if (TsIsScrambled(Data))
+        lastScrambledTime = Now;
+     else if (Now - lastScrambledTime > UNSCRAMBLE_TIME) {
+        dsyslog("CAM %d: activated!", camSlot->SlotNumber());
+        Skins.QueueMessage(mtInfo, tr("CAM activated!"));
+        Detach();
+        }
+     }
+}
+
 // --- cTPDU -----------------------------------------------------------------
 
 #define MAX_TPDU_SIZE  2048
@@ -1696,6 +1744,7 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
   ciAdapter = CiAdapter;
   assignedDevice = NULL;
   caPidReceiver = ReceiveCaPids ? new cCaPidReceiver : NULL;
+  caActivationReceiver = NULL;
   slotIndex = -1;
   lastModuleStatus = msReset; // avoids initial reset log message
   resetTime = 0;
@@ -1715,6 +1764,7 @@ cCamSlot::~cCamSlot()
   if (assignedDevice)
      assignedDevice->SetCamSlot(NULL);
   delete caPidReceiver;
+  delete caActivationReceiver;
   CamSlots.Del(this, false);
   DeleteAllConnections();
 }
@@ -1735,8 +1785,10 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
                  Device->SetCamSlot(this);
                  dsyslog("CAM %d: assigned to device %d", slotNumber, Device->DeviceNumber() + 1);
                  }
-              else
+              else {
+                 CancelActivation();
                  dsyslog("CAM %d: unassigned", slotNumber);
+                 }
               }
            else
               return false;
@@ -1772,6 +1824,8 @@ void cCamSlot::DeleteAllConnections(void)
 void cCamSlot::Process(cTPDU *TPDU)
 {
   cMutexLock MutexLock(&mutex);
+  if (caActivationReceiver && !caActivationReceiver->IsAttached())
+     CancelActivation();
   if (TPDU) {
      int n = TPDU->Tcid();
      if (1 <= n && n <= MAX_CONNECTIONS_PER_CAM_SLOT) {
@@ -1795,6 +1849,7 @@ void cCamSlot::Process(cTPDU *TPDU)
                dbgprotocol("Slot %d: no module present\n", slotNumber);
                isyslog("CAM %d: no module present", slotNumber);
                DeleteAllConnections();
+               CancelActivation();
                break;
           case msReset:
                dbgprotocol("Slot %d: module reset\n", slotNumber);
@@ -1856,6 +1911,37 @@ bool cCamSlot::Reset(void)
   return false;
 }
 
+bool cCamSlot::CanActivate(void)
+{
+  return ModuleStatus() == msReady;
+}
+
+void cCamSlot::StartActivation(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (!caActivationReceiver) {
+     if (cDevice *d = Device()) {
+        if (cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel())) {
+           caActivationReceiver = new cCaActivationReceiver(Channel, this);
+           d->AttachReceiver(caActivationReceiver);
+           dsyslog("CAM %d: activating on device %d with channel %d (%s)", SlotNumber(), d->DeviceNumber() + 1, Channel->Number(), Channel->Name());
+           }
+        }
+     }
+}
+
+void cCamSlot::CancelActivation(void)
+{
+  cMutexLock MutexLock(&mutex);
+  delete caActivationReceiver;
+  caActivationReceiver = NULL;
+}
+
+bool cCamSlot::IsActivating(void)
+{
+  return caActivationReceiver;
+}
+
 eModuleStatus cCamSlot::ModuleStatus(void)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/ci.h b/ci.h
index 8fea34f1b..5a4dc98d9 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 3.9 2015/01/15 09:18:09 kls Exp $
+ * $Id: ci.h 3.11 2015/01/31 14:36:41 kls Exp $
  */
 
 #ifndef __CI_H
@@ -123,6 +123,7 @@ class cCiTransportConnection;
 class cCiSession;
 class cCiCaProgramData;
 class cCaPidReceiver;
+class cCaActivationReceiver;
 
 class cCamSlot : public cListObject {
   friend class cCiAdapter;
@@ -133,6 +134,7 @@ class cCamSlot : public cListObject {
   cCiAdapter *ciAdapter;
   cDevice *assignedDevice;
   cCaPidReceiver *caPidReceiver;
+  cCaActivationReceiver *caActivationReceiver;
   int slotIndex;
   int slotNumber;
   cCiTransportConnection *tc[MAX_CONNECTIONS_PER_CAM_SLOT + 1];  // connection numbering starts with 1
@@ -182,6 +184,23 @@ class cCamSlot : public cListObject {
   virtual bool Reset(void);
        ///< Resets the CAM in this slot.
        ///< Returns true if the operation was successful.
+  virtual bool CanActivate(void);
+       ///< Returns true if there is a CAM in this slot that can be put into
+       ///< activation mode.
+  virtual void StartActivation(void);
+       ///< Puts the CAM in this slot into a mode where an inserted smart card
+       ///< can be activated. The default action is to make IsActivating() return
+       ///< true, which causes the device this CAM slot is attached to to never
+       ///< automatically detach any receivers with negative priority if the
+       ///< PIDs they want to receive are not decrypted by the CAM.
+       ///< StartActivation() must be called *after* the CAM slot has been assigned
+       ///< to a device. The CAM slot will stay in activation mode until the CAM
+       ///< begins to decrypt, a call to CancelActivation() is made, or the device
+       ///< is needed for a recording.
+  virtual void CancelActivation(void);
+       ///< Cancels a previously started activation (if any).
+  virtual bool IsActivating(void);
+       ///< Returns true if this CAM slot is currently activating a smart card.
   virtual eModuleStatus ModuleStatus(void);
        ///< Returns the status of the CAM in this slot.
   virtual const char *GetCamName(void);
@@ -201,7 +220,7 @@ class cCamSlot : public cListObject {
   virtual cCiEnquiry *GetEnquiry(void);
        ///< Gets a pending enquiry, or NULL if there is no enquiry.
   int Priority(void);
-       ///< Returns the priority if the device this slot is currently assigned
+       ///< Returns the priority of the device this slot is currently assigned
        ///< to, or IDLEPRIORITY if it is not assigned to any device.
   virtual bool ProvidesCa(const int *CaSystemIds);
        ///< Returns true if the CAM in this slot provides one of the given
diff --git a/config.c b/config.c
index af791b328..9e6f301be 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.3 2015/01/12 14:32:17 kls Exp $
+ * $Id: config.c 3.6 2015/01/29 09:01:30 kls Exp $
  */
 
 #include "config.h"
@@ -470,6 +470,11 @@ cSetup::cSetup(void)
   ShowRemainingTime = 0;
   ProgressDisplayTime = 0;
   PauseOnMarkSet = 0;
+  PauseOnMarkJump = 1;
+  SkipEdited = 0;
+  PauseAtLastMark = 0;
+  BinarySkipInitial = 120;
+  BinarySkipTimeout = 3;
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
@@ -683,6 +688,11 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "ShowRemainingTime"))   ShowRemainingTime  = atoi(Value);
   else if (!strcasecmp(Name, "ProgressDisplayTime")) ProgressDisplayTime= atoi(Value);
   else if (!strcasecmp(Name, "PauseOnMarkSet"))      PauseOnMarkSet     = atoi(Value);
+  else if (!strcasecmp(Name, "PauseOnMarkJump"))     PauseOnMarkJump    = atoi(Value);
+  else if (!strcasecmp(Name, "SkipEdited"))          SkipEdited         = atoi(Value);
+  else if (!strcasecmp(Name, "PauseAtLastMark"))     PauseAtLastMark    = atoi(Value);
+  else if (!strcasecmp(Name, "BinarySkipInitial"))   BinarySkipInitial  = atoi(Value);
+  else if (!strcasecmp(Name, "BinarySkipTimeout"))   BinarySkipTimeout  = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
@@ -800,6 +810,11 @@ bool cSetup::Save(void)
   Store("ShowRemainingTime",  ShowRemainingTime);
   Store("ProgressDisplayTime",ProgressDisplayTime);
   Store("PauseOnMarkSet",     PauseOnMarkSet);
+  Store("PauseOnMarkJump",    PauseOnMarkJump);
+  Store("SkipEdited",         SkipEdited);
+  Store("PauseAtLastMark",    PauseAtLastMark);
+  Store("BinarySkipInitial",  BinarySkipInitial);
+  Store("BinarySkipTimeout",  BinarySkipTimeout);
   Store("ResumeID",           ResumeID);
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
diff --git a/config.h b/config.h
index c8808edf7..6eeda2cca 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.10 2015/01/12 14:32:17 kls Exp $
+ * $Id: config.h 3.13 2015/01/27 10:50:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.7"
-#define VDRVERSNUM   20107  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.8"
+#define VDRVERSNUM   20108  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.7"
-#define APIVERSNUM   20107  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.8"
+#define APIVERSNUM   20108  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -333,6 +333,11 @@ class cSetup : public cConfig<cSetupLine> {
   int ShowRemainingTime;
   int ProgressDisplayTime;
   int PauseOnMarkSet;
+  int PauseOnMarkJump;
+  int SkipEdited;
+  int PauseAtLastMark;
+  int BinarySkipInitial;
+  int BinarySkipTimeout;
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
diff --git a/device.c b/device.c
index 3d57611da..14ab07d32 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.19 2015/01/14 12:02:44 kls Exp $
+ * $Id: device.c 3.20 2015/01/30 12:11:30 kls Exp $
  */
 
 #include "device.h"
@@ -756,7 +756,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 
   cDevice *Device = (LiveView && IsPrimaryDevice()) ? GetDevice(Channel, LIVEPRIORITY, true) : this;
 
-  bool NeedsTransferMode = Device != this;
+  bool NeedsTransferMode = LiveView && Device != PrimaryDevice();
   // If the CAM slot wants the TS data, we need to switch to Transfer Mode:
   if (!NeedsTransferMode && LiveView && IsPrimaryDevice() && CamSlot() && CamSlot()->WantsTsData())
      NeedsTransferMode = true;
@@ -767,7 +767,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
   // use the card that actually can receive it and transfer data from there:
 
   if (NeedsTransferMode) {
-     if (Device && CanReplay()) {
+     if (Device && PrimaryDevice()->CanReplay()) {
         if (Device->SetChannel(Channel, false) == scrOk) // calling SetChannel() directly, not SwitchChannel()!
            cControl::Launch(new cTransferControl(Device, Channel));
         else
@@ -1585,13 +1585,13 @@ void cDevice::Action(void)
                  bool DetachReceivers = false;
                  bool DescramblingOk = false;
                  int CamSlotNumber = 0;
+                 cCamSlot *cs = NULL;
                  if (startScrambleDetection) {
-                    cCamSlot *cs = CamSlot();
+                    cs = CamSlot();
                     CamSlotNumber = cs ? cs->SlotNumber() : 0;
                     if (CamSlotNumber) {
-                       bool Scrambled = b[3] & TS_SCRAMBLING_CONTROL;
                        int t = time(NULL) - startScrambleDetection;
-                       if (Scrambled) {
+                       if (TsIsScrambled(b)) {
                           if (t > TS_SCRAMBLING_TIMEOUT)
                              DetachReceivers = true;
                           }
@@ -1605,7 +1605,7 @@ void cDevice::Action(void)
                  Lock();
                  for (int i = 0; i < MAXRECEIVERS; i++) {
                      if (receiver[i] && receiver[i]->WantsPid(Pid)) {
-                        if (DetachReceivers) {
+                        if (DetachReceivers && cs && (!cs->IsActivating() || receiver[i]->Priority() >= LIVEPRIORITY)) {
                            dsyslog("detaching receiver - won't decrypt channel %s with CAM %d", *receiver[i]->ChannelID().ToString(), CamSlotNumber);
                            ChannelCamRelations.SetChecked(receiver[i]->ChannelID(), CamSlotNumber);
                            Detach(receiver[i]);
@@ -1704,7 +1704,7 @@ void cDevice::Detach(cReceiver *Receiver)
   if (camSlot) {
      if (Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
         camSlot->StartDecrypting();
-        if (!camSlot->IsDecrypting())
+        if (!camSlot->IsDecrypting() && !camSlot->IsActivating())
            camSlot->Assign(NULL);
         }
      }
diff --git a/diseqc.c b/diseqc.c
index 2517caf6a..de64257f8 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 3.3 2013/12/28 11:33:08 kls Exp $
+ * $Id: diseqc.c 3.4 2015/01/26 12:02:14 kls Exp $
  */
 
 #include "diseqc.h"
@@ -164,7 +164,7 @@ bool cScr::Parse(const char *s)
   bool result = false;
   int fields = sscanf(s, "%d %u %d", &channel, &userBand, &pin);
   if (fields == 2 || fields == 3) {
-     if (channel >= 0 && channel < 8) {
+     if (channel >= 0 && channel < 32) {
         result = true;
         if (fields == 3 && (pin < 0 || pin > 255)) {
            esyslog("Error: invalid SCR pin '%d'", pin);
@@ -255,26 +255,52 @@ bool cDiseqc::Parse(const char *s)
 
 uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const
 {
-  uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
-  if (t < 1024 && Scr->Channel() >= 0 && Scr->Channel() < 8) {
-     Codes[3] = t >> 8 | (t == 0 ? 0 : scrBank << 2) | Scr->Channel() << 5;
-     Codes[4] = t;
-     if (t)
-        return (t + 350) * 4 - SatFrequency;
+  if ((Codes[0] & 0xF0) == 0x70 ) { // EN50607 aka JESS
+     uint t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
+     if (t < 2048 && Scr->Channel() >= 0 && Scr->Channel() < 32) {
+        Codes[1] = t >> 8 | Scr->Channel() << 3;
+        Codes[2] = t;
+        Codes[3] = (t == 0 ? 0 : scrBank);
+        if (t)
+           return Scr->UserBand();
+        }
+     }
+  else { // EN50494 aka Unicable
+     uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
+     if (t < 1024 && Scr->Channel() >= 0 && Scr->Channel() < 8) {
+        Codes[3] = t >> 8 | (t == 0 ? 0 : scrBank << 2) | Scr->Channel() << 5;
+        Codes[4] = t;
+        if (t)
+           return (t + 350) * 4 - SatFrequency;
+        }
      }
+  esyslog("ERROR: invalid SCR channel number %d or frequency %d", Scr->Channel(),SatFrequency);
   return 0;
 }
 
 int cDiseqc::SetScrPin(const cScr *Scr, uint8_t *Codes) const
 {
-  if (Scr->Pin() >= 0 && Scr->Pin() <= 255) {
-     Codes[2] = 0x5C;
-     Codes[5] = Scr->Pin();
-     return 6;
+  if ((Codes[0] & 0xF0) == 0x70 ) { // EN50607 aka JESS
+     if (Scr->Pin() >= 0 && Scr->Pin() <= 255) {
+        Codes[0] = 0x71;
+        Codes[4] = Scr->Pin();
+        return 5;
+        }
+     else {
+        Codes[0] = 0x70;
+        return 4;
+        }
      }
-  else {
-     Codes[2] = 0x5A;
-     return 5;
+  else { // EN50494 aka Unicable
+     if (Scr->Pin() >= 0 && Scr->Pin() <= 255) {
+        Codes[2] = 0x5C;
+        Codes[5] = Scr->Pin();
+        return 6;
+        }
+     else {
+        Codes[2] = 0x5A;
+        return 5;
+        }
      }
 }
 
@@ -319,7 +345,7 @@ const char *cDiseqc::GetScrBank(const char *s) const
   char *p = NULL;
   errno = 0;
   int n = strtol(s, &p, 10);
-  if (!errno && p != s && n >= 0 && n < 8) {
+  if (!errno && p != s && n >= 0 && n < 256) {
      if (parsing) {
         if (scrBank < 0)
            scrBank = n;
diff --git a/diseqc.conf b/diseqc.conf
index 4c48ecc11..77324b88c 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -82,7 +82,7 @@ S13.0E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S19.2E  12110 V 11080 t v
 # S19.2E  99999 V 10720 t v
 #
-# SCR (Satellite Channel Routing):
+# SCR (Satellite Channel Routing) EN50494:
 #
 # S19.2E  11700 V  9750  t V W10 S0 [E0 10 5A 00 00] W10 v
 # S19.2E  99999 V 10600  t V W10 S1 [E0 10 5A 00 00] W10 v
@@ -94,6 +94,28 @@ S13.0E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
 # S13.0E  11700 H  9750  t V W10 S6 [E0 10 5A 00 00] W10 v
 # S13.0E  99999 H 10600  t V W10 S7 [E0 10 5A 00 00] W10 v
 #
+# SCR (Satellite Channel Routing) EN50607 "JESS":
+#
+# S19.2E  11700 V  9750  t V W10 S0 [70 00 00 00] W10 v
+# S19.2E  99999 V 10600  t V W10 S1 [70 00 00 00] W10 v
+# S19.2E  11700 H  9750  t V W10 S2 [70 00 00 00] W10 v
+# S19.2E  99999 H 10600  t V W10 S3 [70 00 00 00] W10 v
+#
+# S13.0E  11700 V  9750  t V W10 S4 [70 00 00 00] W10 v
+# S13.0E  99999 V 10600  t V W10 S5 [70 00 00 00] W10 v
+# S13.0E  11700 H  9750  t V W10 S6 [70 00 00 00] W10 v
+# S13.0E  99999 H 10600  t V W10 S7 [70 00 00 00] W10 v
+#
+# S23.0E  11700 V  9750  t V W10 S8 [70 00 00 00] W10 v
+# S23.0E  99999 V 10600  t V W10 S9 [70 00 00 00] W10 v
+# S23.0E  11700 H  9750  t V W10 S10 [70 00 00 00] W10 v
+# S23.0E  99999 H 10600  t V W10 S11 [70 00 00 00] W10 v
+#
+# S28.2E  11700 V  9750  t V W10 S12 [70 00 00 00] W10 v
+# S28.2E  99999 V 10600  t V W10 S13 [70 00 00 00] W10 v
+# S28.2E  11700 H  9750  t V W10 S14 [70 00 00 00] W10 v
+# S28.2E  99999 H 10600  t V W10 S15 [70 00 00 00] W10 v
+#
 # Positioner for steerable dish:
 #
 # S360E  11700 V  9750  t V W20 P W20 t v
diff --git a/dvbplayer.c b/dvbplayer.c
index 1858cb98e..0d7b3904e 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 3.1 2013/12/25 13:24:07 kls Exp $
+ * $Id: dvbplayer.c 3.3 2015/02/01 10:45:41 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -211,6 +211,7 @@ class cDvbPlayer : public cPlayer, cThread {
   cNonBlockingFileReader *nonBlockingFileReader;
   cRingBufferFrame *ringBuffer;
   cPtsIndex ptsIndex;
+  cMarks marks;
   cFileName *fileName;
   cIndexFile *index;
   cUnbufferedFile *replayFile;
@@ -296,6 +297,8 @@ cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive)
      }
   else if (PauseLive)
      framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default
+  if (Setup.SkipEdited || Setup.PauseAtLastMark)
+     marks.Load(FileName, framesPerSecond, isPesRecording);
 }
 
 cDvbPlayer::~cDvbPlayer()
@@ -402,8 +405,19 @@ void cDvbPlayer::Action(void)
   int pc = 0;
 
   readIndex = Resume();
-  if (readIndex >= 0)
+  if (readIndex > 0)
      isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
+  else if (Setup.SkipEdited) {
+     if (marks.First() && index) {
+        int Index = marks.First()->Position();
+        uint16_t FileNumber;
+        off_t FileOffset;
+        if (index->Get(Index, &FileNumber, &FileOffset) && NextFile(FileNumber, FileOffset)) {
+           isyslog("starting replay at first mark %d (%s)", Index, *IndexToHMSF(Index, true, framesPerSecond));
+           readIndex = Index;
+           }
+        }
+     }
 
   nonBlockingFileReader = new cNonBlockingFileReader;
   int Length = 0;
@@ -413,6 +427,8 @@ void cDvbPlayer::Action(void)
   uint32_t LastStc = 0;
   int LastReadIFrame = -1;
   int SwitchToPlayFrame = 0;
+  bool CutIn = false;
+  bool AtLastMark = false;
 
   if (pauseLive)
      Goto(0, true);
@@ -431,7 +447,7 @@ void cDvbPlayer::Action(void)
 
           // Read the next frame from the file:
 
-          if (playMode != pmStill && playMode != pmPause) {
+          if (playMode != pmStill && playMode != pmPause && !AtLastMark) {
              if (!readFrame && (replayFile || readIndex >= 0)) {
                 if (!nonBlockingFileReader->Reading()) {
                    if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
@@ -468,8 +484,30 @@ void cDvbPlayer::Action(void)
                    else if (index) {
                       uint16_t FileNumber;
                       off_t FileOffset;
-                      if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
+                      if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset)) {
                          readIndex++;
+                         if (Setup.SkipEdited || Setup.PauseAtLastMark) {
+                            marks.Update();
+                            cMark *m = marks.Get(readIndex);
+                            if (m && (m->Index() & 0x01) != 0) { // we're at an end mark
+                               m = marks.GetNextBegin(m);
+                               int Index = -1;
+                               if (m)
+                                  Index = m->Position(); // skip to next begin mark
+                               else if (Setup.PauseAtLastMark)
+                                  AtLastMark = true; // triggers going into Pause mode
+                               else if (index->IsStillRecording())
+                                  Index = index->GetNextIFrame(index->Last() - int(round(MAXSTUCKATEOF * framesPerSecond)), false); // skip, but stay off end of live-recordings
+                               else
+                                  AtLastMark = true; // triggers stopping replay
+                               if (Setup.SkipEdited && Index > readIndex) {
+                                  isyslog("skipping from %d (%s) to %d (%s)", readIndex - 1, *IndexToHMSF(readIndex - 1, true, framesPerSecond), Index, *IndexToHMSF(Index, true, framesPerSecond));
+                                  readIndex = Index;
+                                  CutIn = true;
+                                  }
+                               }
+                            }
+                         }
                       else
                          eof = true;
                       }
@@ -512,6 +550,11 @@ void cDvbPlayer::Action(void)
              // Store the frame in the buffer:
 
              if (readFrame) {
+                if (CutIn) {
+                   if (isPesRecording)
+                      cRemux::SetBrokenLink(readFrame->Data(), readFrame->Count());
+                   CutIn = false;
+                   }
                 if (ringBuffer->Put(readFrame))
                    readFrame = NULL;
                 else
@@ -578,8 +621,17 @@ void cDvbPlayer::Action(void)
                 p = NULL;
                 }
              }
-          else
+          else {
+             if (AtLastMark) {
+                if (Setup.PauseAtLastMark) {
+                   playMode = pmPause;
+                   AtLastMark = false;
+                   }
+                else
+                   eof = true;
+                }
              Sleep = true;
+             }
 
           // Handle hitting begin/end of recording:
 
@@ -800,18 +852,26 @@ void cDvbPlayer::Goto(int Index, bool Still)
      off_t FileOffset;
      int Length;
      Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
-     if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {
-        uchar b[MAXFRAMESIZE];
-        int r = ReadFrame(replayFile, b, Length, sizeof(b));
-        if (r > 0) {
-           if (playMode == pmPause)
-              DevicePlay();
-           DeviceStillPicture(b, r);
-           ptsIndex.Put(isPesRecording ? PesGetPts(b) : TsGetPts(b, r), Index);
+     if (Index >= 0) {
+        if (Still) {
+           if (NextFile(FileNumber, FileOffset)) {
+              uchar b[MAXFRAMESIZE];
+              int r = ReadFrame(replayFile, b, Length, sizeof(b));
+              if (r > 0) {
+                 if (playMode == pmPause)
+                    DevicePlay();
+                 DeviceStillPicture(b, r);
+                 ptsIndex.Put(isPesRecording ? PesGetPts(b) : TsGetPts(b, r), Index);
+                 }
+              playMode = pmStill;
+              readIndex = Index;
+              }
+           }
+        else {
+           readIndex = Index - 1; // Action() will first increment it!
+           Play();
            }
-        playMode = pmStill;
         }
-     readIndex = Index;
      }
 }
 
diff --git a/dvbplayer.h b/dvbplayer.h
index 7c75951d7..678c9693a 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 3.0 2012/02/19 11:40:36 kls Exp $
+ * $Id: dvbplayer.h 3.1 2015/02/01 11:20:54 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
@@ -56,7 +56,7 @@ class cDvbPlayerControl : public cControl {
        // and >0 if this is multi speed mode.
   void Goto(int Index, bool Still = false);
        // Positions to the given index and displays that frame as a still picture
-       // if Still is true.
+       // if Still is true. If Still is false, Play() will be called.
   };
 
 #endif //__DVBPLAYER_H
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 5df8cdb68..d5ae60b08 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 3.9 2015/01/14 11:31:09 kls Exp $
+ * $Id: dvbsubtitle.c 3.10 2015/01/20 14:53:57 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -1042,7 +1042,7 @@ void cDvbSubtitlePage::Parse(int64_t Pts, cBitStream &bs)
     default: dbgpages("unknown page state: %d<br>\n", pageState);
     }
   bs.SkipBits(2); // reserved
-  dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+  dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
   regionRefs.Clear();
   while (!bs.IsEOF())
         regionRefs.Add(new cSubtitleRegionRef(bs));
@@ -1073,7 +1073,7 @@ void cDvbSubtitlePage::ParsePgs(int64_t Pts, cBitStream &bs)
     default: dbgpages("unknown page state: %d<br>\n", pageState);
     }
   bs.SkipBits(6);
-  dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+  dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
   regionRefs.Clear();
   pending = true;
 }
@@ -1384,7 +1384,7 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
      if (Length > PayloadOffset + SubstreamHeaderLength) {
         int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
         if (pts >= 0)
-           dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
+           dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
         int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
         if (ResetSubtitleAssembler)
@@ -1420,7 +1420,7 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
      if (Length > PayloadOffset) {
         int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
         if (pts >= 0)
-           dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
+           dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
         const uchar *data = Data + PayloadOffset;
         int length = Length - PayloadOffset;
         if (length > 0) {
@@ -1488,7 +1488,7 @@ void cDvbSubtitleConverter::Action(void)
                         dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
                         sb->Draw(osd);
                         Timeout.Set(sb->Timeout() * 1000);
-                        dbgconverter("PTS: %"PRId64"  STC: %"PRId64" (%"PRId64") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
+                        dbgconverter("PTS: %" PRId64 "  STC: %" PRId64 " (%" PRId64 ") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
                         }
                      }
                   else
diff --git a/keys.h b/keys.h
index 4586548c0..5e861a51b 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 3.0 2012/12/04 12:51:25 kls Exp $
+ * $Id: keys.h 3.1 2015/01/27 10:45:18 kls Exp $
  */
 
 #ifndef __KEYS_H
@@ -65,6 +65,8 @@ enum eKeys { // "Up" and "Down" must be the first two keys!
 
 // This is in preparation for having more key codes:
 #define kMarkToggle      k0
+#define kMarkSkipBack    k1
+#define kMarkSkipForward k3
 #define kMarkMoveBack    k4
 #define kMarkMoveForward k6
 #define kMarkJumpBack    k7
diff --git a/menu.c b/menu.c
index a48bfdaf5..16f98c453 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.28 2015/01/15 11:14:21 kls Exp $
+ * $Id: menu.c 3.35 2015/02/01 10:42:11 kls Exp $
  */
 
 #include "menu.h"
@@ -3419,7 +3419,7 @@ cMenuSetupCAMItem::cMenuSetupCAMItem(cCamSlot *CamSlot)
 
 bool cMenuSetupCAMItem::Changed(void)
 {
-  char buffer[32];
+  const char *Activating = "";
   const char *CamName = camSlot->GetCamName();
   if (!CamName) {
      switch (camSlot->ModuleStatus()) {
@@ -3429,7 +3429,10 @@ bool cMenuSetupCAMItem::Changed(void)
        default:        CamName = "-"; break;
        }
      }
-  snprintf(buffer, sizeof(buffer), " %d %s", camSlot->SlotNumber(), CamName);
+  else if (camSlot->IsActivating())
+     // TRANSLATORS: note the leading blank!
+     Activating = tr(" (activating)");
+  cString buffer = cString::sprintf(" %d %s%s", camSlot->SlotNumber(), CamName, Activating);
   if (strcmp(buffer, Text()) != 0) {
      SetText(buffer);
      return true;
@@ -3439,8 +3442,11 @@ bool cMenuSetupCAMItem::Changed(void)
 
 class cMenuSetupCAM : public cMenuSetupBase {
 private:
+  const char *activationHelp;
   eOSState Menu(void);
   eOSState Reset(void);
+  eOSState Activate(void);
+  void SetHelpKeys(void);
 public:
   cMenuSetupCAM(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -3448,13 +3454,33 @@ class cMenuSetupCAM : public cMenuSetupBase {
 
 cMenuSetupCAM::cMenuSetupCAM(void)
 {
+  activationHelp = NULL;
   SetMenuCategory(mcSetupCam);
   SetSection(tr("CAM"));
   SetCols(15);
   SetHasHotkeys();
   for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot))
       Add(new cMenuSetupCAMItem(CamSlot));
-  SetHelp(tr("Button$Menu"), tr("Button$Reset"));
+  SetHelpKeys();
+}
+
+void cMenuSetupCAM::SetHelpKeys(void)
+{
+  if (HasSubMenu())
+     return;
+  cMenuSetupCAMItem *item = (cMenuSetupCAMItem *)Get(Current());
+  const char *NewActivationHelp = "";
+  if (item) {
+     cCamSlot *CamSlot = item->CamSlot();
+     if (CamSlot->IsActivating())
+        NewActivationHelp = tr("Button$Cancel activation");
+     else if (CamSlot->CanActivate())
+        NewActivationHelp = tr("Button$Activate");
+     }
+  if (NewActivationHelp != activationHelp) {
+     activationHelp = NewActivationHelp;
+     SetHelp(tr("Button$Menu"), tr("Button$Reset"), activationHelp);
+     }
 }
 
 eOSState cMenuSetupCAM::Menu(void)
@@ -3484,6 +3510,43 @@ eOSState cMenuSetupCAM::Menu(void)
   return osContinue;
 }
 
+eOSState cMenuSetupCAM::Activate(void)
+{
+  cMenuSetupCAMItem *item = (cMenuSetupCAMItem *)Get(Current());
+  if (item) {
+     cCamSlot *CamSlot = item->CamSlot();
+     if (CamSlot->IsActivating())
+        CamSlot->CancelActivation();
+     else if (CamSlot->CanActivate()) {
+        if (CamSlot->Priority() < LIVEPRIORITY) { // don't interrupt recordings
+           if (cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel())) {
+              for (int i = 0; i < cDevice::NumDevices(); i++) {
+                  if (cDevice *Device = cDevice::GetDevice(i)) {
+                     if (Device->ProvidesChannel(Channel)) {
+                        if (Device->Priority() < LIVEPRIORITY) { // don't interrupt recordings
+                           if (CamSlot->CanActivate()) {
+                              if (CamSlot->Assign(Device, true)) { // query
+                                 cControl::Shutdown(); // must end transfer mode before assigning CAM, otherwise it might be unassigned again
+                                 if (CamSlot->Assign(Device)) {
+                                    if (Device->SwitchChannel(Channel, true)) {
+                                       CamSlot->StartActivation();
+                                       return osContinue;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+                        }
+                     }
+                  }
+              }
+           }
+        Skins.Message(mtError, tr("Can't activate CAM!"));
+        }
+     }
+  return osContinue;
+}
+
 eOSState cMenuSetupCAM::Reset(void)
 {
   cMenuSetupCAMItem *item = (cMenuSetupCAMItem *)Get(Current());
@@ -3505,12 +3568,14 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
        case kOk:
        case kRed:    return Menu();
        case kGreen:  state = Reset(); break;
+       case kYellow: state = Activate(); break;
        default: break;
        }
      for (cMenuSetupCAMItem *ci = (cMenuSetupCAMItem *)First(); ci; ci = (cMenuSetupCAMItem *)ci->Next()) {
          if (ci->Changed())
             DisplayItem(ci);
          }
+     SetHelpKeys();
      }
   return state;
 }
@@ -3571,6 +3636,11 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Show remaining time"), &data.ShowRemainingTime));
   Add(new cMenuEditIntItem( tr("Setup.Replay$Progress display time (s)"), &data.ProgressDisplayTime, 0, 60));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay when setting mark"), &data.PauseOnMarkSet));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay when jumping to a mark"), &data.PauseOnMarkJump));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Skip edited parts"), &data.SkipEdited));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay at last mark"), &data.PauseAtLastMark));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip initial value (s)"), &data.BinarySkipInitial, 10, 600));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip timeout (s)"), &data.BinarySkipTimeout, 0, 10));
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
@@ -4910,6 +4980,39 @@ bool cRecordControls::StateChanged(int &State)
   return Result;
 }
 
+// --- cBinarySkipper --------------------------------------------------------
+
+cBinarySkipper::cBinarySkipper(void)
+{
+  initialValue = NULL;
+  currentValue = 0;
+  framesPerSecond = 0;
+  lastKey = kNone;
+}
+
+void cBinarySkipper::Initialize(int *InitialValue, double FramesPerSecond)
+{
+  initialValue = InitialValue;
+  framesPerSecond = FramesPerSecond;
+  currentValue = 0;
+}
+
+int cBinarySkipper::GetValue(eKeys Key)
+{
+  if (!initialValue)
+     return 0;
+  if (timeout.TimedOut()) {
+     currentValue = int(round(*initialValue * framesPerSecond));
+     lastKey = Key;
+     }
+  else if (Key != lastKey) {
+     currentValue /= 2;
+     lastKey = kNone; // once the direction has changed, every further call halves the value
+     }
+  timeout.Set(Setup.BinarySkipTimeout * 1000);
+  return max(currentValue, 1);
+}
+
 // --- cReplayControl --------------------------------------------------------
 
 cReplayControl *cReplayControl::currentReplayControl = NULL;
@@ -4931,6 +5034,7 @@ cReplayControl::cReplayControl(bool PauseLive)
   cRecording Recording(fileName);
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
   marks.Load(fileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
+  binarySkipper.Initialize(&Setup.BinarySkipInitial, Recording.FramesPerSecond());
   SetTrackDescriptions(false);
   if (Setup.ProgressDisplayTime)
      ShowTimed(Setup.ProgressDisplayTime);
@@ -5158,8 +5262,6 @@ void cReplayControl::TimeSearchProcess(eKeys Key)
             Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds);
             bool Still = Key == kDown || Key == kPause || Key == kOk;
             Goto(SecondsToFrames(Seconds, FramesPerSecond()), Still);
-            if (!Still)
-               Play();
             }
          timeSearchActive = false;
          break;
@@ -5223,6 +5325,14 @@ void cReplayControl::MarkJump(bool Forward)
   if (GetIndex(Current, Total)) {
      if (marks.Count()) {
         if (cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current)) {
+           if (!Setup.PauseOnMarkJump) {
+              bool Playing, Fwd;
+              int Speed;
+              if (GetReplayMode(Playing, Fwd, Speed) && Playing && Forward && m->Position() < Total - SecondsToFrames(3, FramesPerSecond())) {
+                 Goto(m->Position());
+                 return;
+                 }
+              }
            Goto(m->Position(), true);
            displayFrames = true;
            return;
@@ -5234,26 +5344,40 @@ void cReplayControl::MarkJump(bool Forward)
      }
 }
 
-void cReplayControl::MarkMove(bool Forward)
+void cReplayControl::MarkMove(int Frames, bool MarkRequired)
 {
   int Current, Total;
   if (GetIndex(Current, Total)) {
-     if (cMark *m = marks.Get(Current)) {
+     bool Play, Forward;
+     int Speed;
+     GetReplayMode(Play, Forward, Speed);
+     cMark *m = marks.Get(Current);
+     if (!Play && m) {
         displayFrames = true;
-        int p = SkipFrames(Forward ? 1 : -1);
         cMark *m2;
-        if (Forward) {
+        if (Frames > 0) {
+           // Handle marks at the same offset:
            while ((m2 = marks.Next(m)) != NULL && m2->Position() == m->Position())
                  m = m2;
+           // Don't skip the next mark:
+           if ((m2 = marks.Next(m)) != NULL)
+              Frames = min(Frames, m2->Position() - m->Position() - 1);
            }
         else {
+           // Handle marks at the same offset:
            while ((m2 = marks.Prev(m)) != NULL && m2->Position() == m->Position())
                  m = m2;
+           // Don't skip the next mark:
+           if ((m2 = marks.Prev(m)) != NULL)
+              Frames = -min(-Frames, m->Position() - m2->Position() - 1);
            }
+        int p = SkipFrames(Frames);
         m->SetPosition(p);
         Goto(m->Position(), true);
         marksModified = true;
         }
+     else if (!MarkRequired)
+        Goto(SkipFrames(Frames), !Play);
      }
 }
 
@@ -5287,12 +5411,10 @@ void cReplayControl::EditTest(void)
      if (!m)
         m = marks.GetNext(Current);
      if (m) {
-        if ((m->Index() & 0x01) != 0)
+        if ((m->Index() & 0x01) != 0 && !Setup.SkipEdited) // when skipping edited parts we also need to jump to end marks
            m = marks.Next(m);
-        if (m) {
+        if (m)
            Goto(m->Position() - SecondsToFrames(3, FramesPerSecond()));
-           Play();
-           }
         }
      }
 }
@@ -5384,9 +5506,13 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         case kMarkJumpForward|k_Repeat:
         case kMarkJumpForward: MarkJump(true); break;
         case kMarkMoveBack|k_Repeat:
-        case kMarkMoveBack:    MarkMove(false); break;
+        case kMarkMoveBack:    MarkMove(-1, true); break;
         case kMarkMoveForward|k_Repeat:
-        case kMarkMoveForward: MarkMove(true); break;
+        case kMarkMoveForward: MarkMove(+1, true); break;
+        case kMarkSkipBack|k_Repeat:
+        case kMarkSkipBack:    MarkMove(-binarySkipper.GetValue(RAWKEY(Key)), false); break;
+        case kMarkSkipForward|k_Repeat:
+        case kMarkSkipForward: MarkMove(+binarySkipper.GetValue(RAWKEY(Key)), false); break;
         case kEditCut:         EditCut(); break;
         case kEditTest:        EditTest(); break;
         default: {
diff --git a/menu.h b/menu.h
index 87670c722..f602b9664 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 3.6 2015/01/15 11:12:57 kls Exp $
+ * $Id: menu.h 3.7 2015/01/27 11:38:20 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -270,9 +270,23 @@ class cRecordControls {
   static bool StateChanged(int &State);
   };
 
+class cBinarySkipper {
+private:
+  int *initialValue;
+  int currentValue;
+  double framesPerSecond;
+  eKeys lastKey;
+  cTimeMs timeout;
+public:
+  cBinarySkipper(void);
+  void Initialize(int *InitialValue, double FramesPerSecond);
+  int GetValue(eKeys Key);
+  };
+
 class cReplayControl : public cDvbPlayerControl {
 private:
   cSkinDisplayReplay *displayReplay;
+  cBinarySkipper binarySkipper;
   cMarks marks;
   bool marksModified;
   bool visible, modeOnly, shown, displayFrames;
@@ -292,7 +306,7 @@ class cReplayControl : public cDvbPlayerControl {
   bool ShowProgress(bool Initial);
   void MarkToggle(void);
   void MarkJump(bool Forward);
-  void MarkMove(bool Forward);
+  void MarkMove(int Frames, bool MarkRequired);
   void EditCut(void);
   void EditTest(void);
 public:
diff --git a/nit.c b/nit.c
index f3fe9231d..d9ec1f8f1 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 3.3 2014/03/16 10:38:31 kls Exp $
+ * $Id: nit.c 3.4 2015/02/01 13:46:00 kls Exp $
  */
 
 #include "nit.h"
@@ -357,6 +357,40 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    }
                  }
                  break;
+            case SI::LogicalChannelDescriptorTag: {
+                 SI::LogicalChannelDescriptor *lcd = (SI::LogicalChannelDescriptor *)d;
+                 SI::LogicalChannelDescriptor::LogicalChannel LogicalChannel;
+                 for (SI::Loop::Iterator it4; lcd->logicalChannelLoop.getNext(LogicalChannel, it4); ) {
+                     int lcn = LogicalChannel.getLogicalChannelNumber();
+                     int sid = LogicalChannel.getServiceId();
+                     if (LogicalChannel.getVisibleServiceFlag()) {
+                        for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                            if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                               Channel->SetLcn(lcn);
+                               break;
+                               }
+                            }
+                        }
+                     }
+                 }
+                 break;
+            case SI::HdSimulcastLogicalChannelDescriptorTag: {
+                 SI::HdSimulcastLogicalChannelDescriptor *lcd = (SI::HdSimulcastLogicalChannelDescriptor *)d;
+                 SI::HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel HdSimulcastLogicalChannel;
+                 for (SI::Loop::Iterator it4; lcd->hdSimulcastLogicalChannelLoop.getNext(HdSimulcastLogicalChannel, it4); ) {
+                     int lcn = HdSimulcastLogicalChannel.getLogicalChannelNumber();
+                     int sid = HdSimulcastLogicalChannel.getServiceId();
+                     if (HdSimulcastLogicalChannel.getVisibleServiceFlag()) {
+                        for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                            if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                               Channel->SetLcn(lcn);
+                               break;
+                               }
+                            }
+                        }
+                     }
+                 }
+                 break;
             default: ;
             }
           delete d;
diff --git a/po/ar.po b/po/ar.po
index 827973c1b..e26a4305d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -23,6 +23,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** قناة خاطئة ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "القناة غير متاحة"
 
@@ -1112,9 +1115,19 @@ msgstr "الكامة موجودة"
 msgid "CAM ready"
 msgstr "الكامة جاهزة"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "الكامة "
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "القائمة"
 
@@ -1127,6 +1140,9 @@ msgstr "فتح قائمة الكامة"
 msgid "Can't open CAM menu!"
 msgstr "تعذر فتح قائمة الكامة"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "الكامة مستخدمة الان هل تريد اعادة تشغيلها"
 
@@ -1220,6 +1236,21 @@ msgstr "Progress display time (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pause replay when setting mark"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 207901c23..4d910257b 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -22,6 +22,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal incorrecte ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Canal no disponible!"
 
@@ -1111,9 +1114,19 @@ msgstr "CAM present"
 msgid "CAM ready"
 msgstr "CAM preparat"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Men�"
 
@@ -1126,6 +1139,9 @@ msgstr "Obrint menu CAM..."
 msgid "Can't open CAM menu!"
 msgstr "No puc obrir el men� de la CAM!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM en �s - reiniciar?"
 
@@ -1219,6 +1235,21 @@ msgstr "Visualitzaci
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pausar reproducci� en establir marca"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index d39933d7e..78fa4080b 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -22,6 +22,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatný kanál ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanál není dostupný!"
 
@@ -1111,9 +1114,19 @@ msgstr "CAM přítomen"
 msgid "CAM ready"
 msgstr "CAM připraven"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1126,6 +1139,9 @@ msgstr "Otevírá se menu CAM..."
 msgid "Can't open CAM menu!"
 msgstr "Menu CAM není dostupné"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM se používá - opravdu restartovat?"
 
@@ -1219,6 +1235,21 @@ msgstr "Čas zobrazení ukazatele průběhu (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pozastavit přehrávání při nastavování značky"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 5436690cc..c2773f81e 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -19,6 +19,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig kanal! ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanal er ikke tilg�ngelig!"
 
@@ -1108,9 +1111,19 @@ msgstr "CAM til stede"
 msgid "CAM ready"
 msgstr "CAM klar"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1123,6 +1136,9 @@ msgstr "
 msgid "Can't open CAM menu!"
 msgstr "Kan ikke �bne CAM menuen!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM er i brug - virkelig nulstille?"
 
@@ -1216,6 +1232,21 @@ msgstr ""
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 4512b4461..2d0ff569d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -19,6 +19,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Ung�ltiger Kanal ***"
 
+msgid "CAM activated!"
+msgstr "CAM aktiviert!"
+
 msgid "Channel not available!"
 msgstr "Kanal nicht verf�gbar!"
 
@@ -1108,9 +1111,19 @@ msgstr "CAM vorhanden"
 msgid "CAM ready"
 msgstr "CAM bereit"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr " (wird aktiviert)"
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr "Aktivierung abbrechen"
+
+msgid "Button$Activate"
+msgstr "Aktivieren"
+
 msgid "Button$Menu"
 msgstr "Men�"
 
@@ -1123,6 +1136,9 @@ msgstr "CAM-Men
 msgid "Can't open CAM menu!"
 msgstr "CAM-Men� kann nicht ge�ffnet werden!"
 
+msgid "Can't activate CAM!"
+msgstr "CAM kann nicht aktiviert werden!"
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM wird benutzt - wirklich zur�cksetzen?"
 
@@ -1216,6 +1232,21 @@ msgstr "Anzeigedauer f
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pause beim Setzen einer Schnittmarke"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr "Pause beim Sprung auf eine Schnittmarke"
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr "Herausgeschnittene Teile �berspringen"
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr "Pause an der letzten Schnittmarke"
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr "Anfangswert f�r bin�res Springen (s)"
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr "Zeitlimit f�r bin�res Springen (ms)"
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index a6c4c3016..ab60f68ff 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -19,6 +19,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** ����� ������ ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "�� ������ ��� ����� ���������!"
 
@@ -1108,9 +1111,19 @@ msgstr ""
 msgid "CAM ready"
 msgstr ""
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "M����"
 
@@ -1123,6 +1136,9 @@ msgstr ""
 msgid "Can't open CAM menu!"
 msgstr "������� � �������� ��� CAM �����!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr ""
 
@@ -1216,6 +1232,21 @@ msgstr ""
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index e14251896..40d720802 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal no v�lido ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "�Canal no disponible!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM presente"
 msgid "CAM ready"
 msgstr "CAM preparado"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Men�"
 
@@ -1124,6 +1137,9 @@ msgstr "Abriendo el men
 msgid "Can't open CAM menu!"
 msgstr "�No se puede abrir el men� CAM!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM en uso - �reiniciar?"
 
@@ -1217,6 +1233,21 @@ msgstr "Visualizaci
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pausar reproducci�n al establecer marca"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 75ba6be4b..607f73480 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -17,7 +17,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Vigane kanal ***"
+msgstr "*** Kehtetu kanal ***"
+
+msgid "CAM activated!"
+msgstr ""
 
 msgid "Channel not available!"
 msgstr "Kanal ei ole kättesaadav!"
@@ -74,16 +77,16 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "StreamId"
-msgstr "Stream-tunnus"
+msgstr "Vootunnus"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Piloot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2 tunnus"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "EPG skaneerimine käivitatud"
@@ -573,10 +576,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Kanaliseaded ei ole unikaalsed!"
@@ -597,7 +600,7 @@ msgid "Button$Mark"
 msgstr "Märkimine"
 
 msgid "Channel is being used by a timer!"
-msgstr "Kanal on taimeri kasutuses!"
+msgstr "Kanal on taimeris kasutusel!"
 
 msgid "Delete channel?"
 msgstr "Kustutada kanal?"
@@ -1108,9 +1111,19 @@ msgstr "CAM esitletud"
 msgid "CAM ready"
 msgstr "CAM töövalmis"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menüü"
 
@@ -1123,6 +1136,9 @@ msgstr "CAM-menüü avamine..."
 msgid "Can't open CAM menu!"
 msgstr "Ei saa avada CAM menüüd!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM on kasutuses - taaskäivitada?"
 
@@ -1216,6 +1232,21 @@ msgstr "Edenemiseriba kuvamise aeg (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Taasesituse peatamine markeri seadmisel"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Jätkamise ID"
 
@@ -1253,10 +1284,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Helitugevus käivitamisel"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Helitugevuse samm"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Helitugevuse lineariseerimine"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalite ringkerimine"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 2668c44ba..cd59767d9 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -23,6 +23,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Virheellinen kanavavalinta ***"
 
+msgid "CAM activated!"
+msgstr "CA-moduuli aktivoitu!"
+
 msgid "Channel not available!"
 msgstr "Kanava ei ole käytettävissä!"
 
@@ -1112,9 +1115,19 @@ msgstr "CAM havaittu"
 msgid "CAM ready"
 msgstr "CAM valmis"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr " (aktivoidaan)"
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr "Peruuta aktivointi"
+
+msgid "Button$Activate"
+msgstr "Aktivoi"
+
 msgid "Button$Menu"
 msgstr "Valikko"
 
@@ -1127,6 +1140,9 @@ msgstr "Avataan CA-moduulin valikkoa..."
 msgid "Can't open CAM menu!"
 msgstr "CA-moduulin valikko ei saatavilla"
 
+msgid "Can't activate CAM!"
+msgstr "CA-moduulin aktivointi epäonnistui!"
+
 msgid "CAM is in use - really reset?"
 msgstr "CA-moduuli käytössä - nollataanko?"
 
@@ -1220,6 +1236,21 @@ msgstr "Näytä toiston kontrollit (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pysäytä toisto asetettaessa merkki"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr "Pysäytä toisto hypätessä merkkiin"
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr "Ohita muokatut kohdat"
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr "Pysäytä toisto viimeiseen merkkiin"
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr "Binäärihypyn oletuspituus (s)"
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr "Binäärihypyn odotusaika (ms)"
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
@@ -1257,10 +1288,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Äänenvoimakkuus käynnistettäessä"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Äänenvoimakkuuden askellus"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Äänenvoimakkuuden lineaarisuus"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanavien rullaus"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 01c9750c4..65ed4fb72 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -29,6 +29,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Chaîne invalide ! ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Chaîne non disponible !"
 
@@ -1118,9 +1121,19 @@ msgstr "CAM présent"
 msgid "CAM ready"
 msgstr "CAM prêt"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1133,6 +1146,9 @@ msgstr "Ouverture du menu CAM..."
 msgid "Can't open CAM menu!"
 msgstr "Impossible d'ouvrir le menu CAM !"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM en cours d'utilisation - confirmer réinitialisation ?"
 
@@ -1226,6 +1242,21 @@ msgstr "Afficher la barre de progression (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Arrêt lecture si ajout marqueur"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index eea285bd1..b9bd70021 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -21,6 +21,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Program ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Program nije dostupan!"
 
@@ -1110,9 +1113,19 @@ msgstr "CAM prisutan"
 msgid "CAM ready"
 msgstr "CAM spreman"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Izbornik"
 
@@ -1125,6 +1138,9 @@ msgstr "Otvaram CAM izbornik..."
 msgid "Can't open CAM menu!"
 msgstr "Otvaranje CAM izbornika neuspje�no!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM se koristi - ponovno pokrenuti unato�?"
 
@@ -1218,6 +1234,21 @@ msgstr ""
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index f4b3734d0..00dcc247f 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-03-01 19:22+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -23,6 +23,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Érvénytelen csatorna ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Az adó nem elérhető"
 
@@ -1112,9 +1115,19 @@ msgstr "CAM jelen"
 msgid "CAM ready"
 msgstr "CAM működik"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menü"
 
@@ -1127,6 +1140,9 @@ msgstr "A CAM menü nyitása..."
 msgid "Can't open CAM menu!"
 msgstr "A CAM menü nem nyitható"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM használatban - valóban újraindítjuk?"
 
@@ -1220,6 +1236,21 @@ msgstr "Lejátszósáv felüntetésének ideje (mp)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "A visszajátszás megállítása vágópont kijelölésnél"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Lejátszás ID"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index fbec241d3..784564372 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
-"PO-Revision-Date: 2014-03-23 00:54+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"PO-Revision-Date: 2015-01-19 20:19+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -26,6 +26,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Canale non disponibile!"
 
@@ -1115,9 +1118,19 @@ msgstr "La CAM è presente"
 msgid "CAM ready"
 msgstr "La CAM è pronta"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1130,6 +1143,9 @@ msgstr "Apertura menu CAM..."
 msgid "Can't open CAM menu!"
 msgstr "Impossibile aprire il menu CAM!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "La CAM è in uso - vuoi reimpostarla?"
 
@@ -1223,6 +1239,21 @@ msgstr "Mostra tempo elaborazione (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pausa riproduzione durante impostazione segni"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
 
@@ -1260,10 +1291,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume iniziale"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Volume a tacche"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Volume lineare"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Riavvolgimento canali"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 10f1ffecd..e76ef3630 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -19,6 +19,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Blogi kanalo nustatymai ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanalas neegzistuoja!"
 
@@ -1108,9 +1111,19 @@ msgstr "Dekodavimo modulis (CAM) įjungtas"
 msgid "CAM ready"
 msgstr "Dekodavimo modulis (CAM) paruoštas darbui"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "Dekodavimo modulis (CAM)"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Meniu"
 
@@ -1123,6 +1136,9 @@ msgstr "Atidaromas dekodavimo modulio meniu..."
 msgid "Can't open CAM menu!"
 msgstr "Negali atidaryti dekodavimo modulio meniu!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "Dekodavimo modulis šiuo metu naudojamas - tikrai perkrauti?"
 
@@ -1216,6 +1232,21 @@ msgstr "Progreso rodymo laikas (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pristabdyti pakartojimą kai vyksta žymėjimas"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 556032ccc..418381c2e 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Невалиден Канал ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Каналот е недостапен!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM присутен"
 msgid "CAM ready"
 msgstr "CAM спремен"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Мени"
 
@@ -1124,6 +1137,9 @@ msgstr "Отварам CAM мени..."
 msgid "Can't open CAM menu!"
 msgstr "Неуспешно отварање на CAM менито!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM е во употреба - рестартирај?"
 
@@ -1217,6 +1233,21 @@ msgstr "Време на прикажување на прогрес (сек)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Паузирај репродукција кога се внесува ознака"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 1f46225c2..7f9af104e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanaal niet beschikbaar"
 
@@ -1113,9 +1116,19 @@ msgstr "CAM aanwezig"
 msgid "CAM ready"
 msgstr "CAM gereed"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1128,6 +1141,9 @@ msgstr "CAM-menu wordt geopend..."
 msgid "Can't open CAM menu!"
 msgstr "Kan CAM-menu niet openen!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM wordt gebruikt - werkelijk herstarten?"
 
@@ -1221,6 +1237,21 @@ msgstr "Verlopen tijd tijd (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pauzeer wanneer markering wordt geplaatst"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 2ee08166a..6eb63fab5 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Ugyldig Kanal! ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr ""
 
@@ -1109,9 +1112,19 @@ msgstr ""
 msgid "CAM ready"
 msgstr ""
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Meny"
 
@@ -1124,6 +1137,9 @@ msgstr ""
 msgid "Can't open CAM menu!"
 msgstr ""
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr ""
 
@@ -1217,6 +1233,21 @@ msgstr ""
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index e7c81b7ba..18c8662c3 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -21,6 +21,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kana� nie jest dost�pny!"
 
@@ -1110,9 +1113,19 @@ msgstr "CAM obecny"
 msgid "CAM ready"
 msgstr "CAM gotowy"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1125,6 +1138,9 @@ msgstr "Otwieram menu CAM..."
 msgid "Can't open CAM menu!"
 msgstr "Nie mo�na otworzy� menu CAM!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM jest w u�yciu - naprawd� zresetowa�?"
 
@@ -1218,6 +1234,21 @@ msgstr "Wy
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Wstrzymaj odtwarzanie podczas ustawiania zaznaczania"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b58b4838d..b3a891cc3 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal inv�lido ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Canal indispon�vel!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM presente"
 msgid "CAM ready"
 msgstr "CAM pronta"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1124,6 +1137,9 @@ msgstr "A abrir menu da CAM..."
 msgid "Can't open CAM menu!"
 msgstr "Imposs�vel abrir menu da CAM!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM em uso - reiniciar mesmo?"
 
@@ -1217,6 +1233,21 @@ msgstr ""
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de resumo"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 5616348c3..25766cf01 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,19 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
-"PO-Revision-Date: 2013-02-09 23:01+0100\n"
-"Last-Translator: Lucian Muresan <lucianm@users.sorceforge.net>\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"PO-Revision-Date: 2015-01-21 22:34+0100\n"
+"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.6.9\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Canal indisponibil"
 
@@ -79,13 +82,13 @@ msgid "StreamId"
 msgstr "Identificator Stream"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "ID sistem T2"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Pornesc achiziţia EPG"
@@ -575,10 +578,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Parametrii canalului nu sunt univoci!"
@@ -741,71 +744,71 @@ msgid "CAM not responding!"
 msgstr "CAM-ul nu reacţionează!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Editează calea"
 
 msgid "Folder"
-msgstr ""
+msgstr "Director"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Acest director tocmai este accesat - nu sunt posibile modificări!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Mut întregul director conținând %d înregistrări?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Eroare la mutarea directorului!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Editează înregistrarea"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Această înregistrare tocmai este accesată - nu sunt posibile modificări!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Anulează tăierea"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Oprește tăierea"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Anuleaza mutarea"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Oprește mutarea"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Anulează copierea"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Oprește copierea"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Taie"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Șterge marcajele"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Înregistrarea a dispărut!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Deja există o versiune editată - o suprascriu?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Eroare la punerea în coada pentru tăiere!"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Șterg marcajele de editare pentru această înregistrare?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Eroare la ștergerea marcajelor de editare!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Eroare la schimbarea priorității/timpului de păstrare!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Eroare la schimbarea directorului/numelui!"
 
 msgid "Recording info"
 msgstr "Detaliile înregistrării"
@@ -826,7 +829,7 @@ msgid "Delete recording?"
 msgstr "Şterg înregistrarea?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "Montajul înregistrării e în curs de desfășurare - șterg totuși?"
+msgstr "Editarea înregistrării e în curs de desfășurare - șterg totuși?"
 
 msgid "Error while deleting recording!"
 msgstr "Eroare la ştergerea înregistrării!"
@@ -1075,31 +1078,31 @@ msgid "Setup.LNB$own"
 msgstr "propriu"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Folosește actuator de poziționare"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Latitudinea locului (grade)"
 
 msgid "South"
-msgstr ""
+msgstr "Sud"
 
 msgid "North"
-msgstr ""
+msgstr "Nord"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Longitudinea locului (grade)"
 
 msgid "West"
-msgstr ""
+msgstr "Vest"
 
 msgid "East"
-msgstr ""
+msgstr "Est"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Unghi maxim al actuatorului (grade)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Viteza actuatorului (grade/s)"
 
 msgid "CAM reset"
 msgstr "Resetare CAM"
@@ -1110,9 +1113,19 @@ msgstr "CAM prezent"
 msgid "CAM ready"
 msgstr "CAM pregătit"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Meniu"
 
@@ -1125,6 +1138,9 @@ msgstr "Deschid meniul CAM..."
 msgid "Can't open CAM menu!"
 msgstr "Nu pot deschide meniul CAM"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM-ul este in folosinţă - totuşi resetez?"
 
@@ -1195,7 +1211,7 @@ msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Dimensiune maximă a fişierului video (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Separare fişiere montate"
+msgstr "Separare fişiere editate"
 
 msgid "Setup.Recording$Delete timeshift recording"
 msgstr "Şterge înregistrarea pentru vizionare decalată"
@@ -1216,7 +1232,22 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Durata afișării indicatorului de progres (s) "
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Pauză la punerea marcajului de montaj"
+msgstr "Pauză la punerea marcajului de editare"
+
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
@@ -1255,10 +1286,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumul la pornire"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Numărul de pași ai reglajului de volum"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Liniarizează caracteristica de volum"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Lista de canale în buclă"
@@ -1306,13 +1337,13 @@ msgstr "Continuă redarea"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Opreşte montajul înregistrării"
+msgstr " Anulează editarea înregistrării"
 
 msgid "Stop recording?"
 msgstr "Opresc înregistrarea?"
 
 msgid "Cancel editing?"
-msgstr "Opresc montajul înregistrării?"
+msgstr "Anulez editarea înregistrării?"
 
 msgid "No audio available!"
 msgstr "Lipseşte sunetul!"
@@ -1340,19 +1371,19 @@ msgid "Jump: "
 msgstr "Salt la: "
 
 msgid "No editing marks defined!"
-msgstr "Nu s-au pus marcaje de montaj pentru această înregistrare"
+msgstr "Nu s-au pus marcaje de editare pentru această înregistrare"
 
 msgid "No editing sequences defined!"
-msgstr "Nu s-au definit secvențe pentru montaj!"
+msgstr "Nu s-au definit secvențe pentru editare!"
 
 msgid "Can't start editing process!"
-msgstr "Nu pot porni montajul înregistrării!"
+msgstr "Nu pot porni editarea înregistrării!"
 
 msgid "Editing process started"
-msgstr "Montajul înregistrării a început"
+msgstr "Editarea înregistrării a început"
 
 msgid "Editing process already active!"
-msgstr "Montajul înregistrării este deja activ!"
+msgstr "Editarea înregistrării este deja activă!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aăâbcdefghiîjklmnopqrsştţuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
@@ -1394,7 +1425,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nu pot închide - vezi opţiunea '-s'"
 
 msgid "Editing - shut down anyway?"
-msgstr "Montajul tocmai se efectuează - închid, totuşi?"
+msgstr "Editarea tocmai se efectuează - închid, totuşi?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Tocmai se înregistrează - închid, totuşi?"
@@ -1411,7 +1442,7 @@ msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Plugin-ul %s se va trezi +n %ld min, continui?"
 
 msgid "Editing - restart anyway?"
-msgstr "Montajul tocmai se efectuează - repornesc, totuşi?"
+msgstr "Editarea tocmai se efectuează - repornesc, totuşi?"
 
 msgid "Recording - restart anyway?"
 msgstr "Tocmai se înregistrează - repornesc, totuşi?"
@@ -1446,7 +1477,7 @@ msgstr "REDARE"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Rotesc antena la %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "Cons. ST:TNG"
@@ -1499,10 +1530,10 @@ msgid "Switching primary DVB..."
 msgstr "Comut dispozitiv DVB primar..."
 
 msgid "Editing process failed!"
-msgstr "Montajul înregistrării a eşuat"
+msgstr "Editarea înregistrării a eşuat"
 
 msgid "Editing process finished"
-msgstr "Montajul înregistrării s-a terminat"
+msgstr "Editarea înregistrării s-a încheiat"
 
 msgid "Press any key to cancel restart"
 msgstr "Apăsaţi orice tastă pentru a anula repornirea"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 4a7a29368..e0a291aae 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** ������������ ����� ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "����� ����������!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM 
 msgid "CAM ready"
 msgstr "CAM �����"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "�������� ������"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "����"
 
@@ -1124,6 +1137,9 @@ msgstr "
 msgid "Can't open CAM menu!"
 msgstr "���� CAM-������ ����������!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM ������������ - ������������� �����������?"
 
@@ -1217,6 +1233,21 @@ msgstr "
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "����� ��� ��������� ����������"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ���������������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 80d340aec..c8c4225b7 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -19,6 +19,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kan�l nie je dostupn�!"
 
@@ -1108,9 +1111,19 @@ msgstr "CAM pr
 msgid "CAM ready"
 msgstr "CAM pripraven�"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM (modul podmienen�ho pr�stupu)"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Menu"
 
@@ -1123,6 +1136,9 @@ msgstr "Otv
 msgid "Can't open CAM menu!"
 msgstr "Menu CAM nie je dostupn�"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM sa pou��va - naozaj re�tartova�?"
 
@@ -1216,6 +1232,21 @@ msgstr "Doba zobrazenia ukazovate
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pozastavi� prehr�vanie pri stanoven� zna�ky"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ident. ��slo obnovenia prehr�vania"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index b0b41356d..9d58dd539 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Neznan kanal ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanal ni razpolo�ljiv!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM prisoten"
 msgid "CAM ready"
 msgstr "CAM pripravljen"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Meni"
 
@@ -1124,6 +1137,9 @@ msgstr "Odpiram CAM meni..."
 msgid "Can't open CAM menu!"
 msgstr "Ne morem odpreti CAM menija!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM je v uporabi - zares resetiraj?"
 
@@ -1217,6 +1233,21 @@ msgstr "Progresivni 
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pavza predvajanja pri postavitvi zan�ke"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 42423d318..dbe75fded 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Neispravan Kanal ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanal nije dostupan!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM prisutan"
 msgid "CAM ready"
 msgstr "CAM spreman"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Meni"
 
@@ -1124,6 +1137,9 @@ msgstr "Otvaram CAM meni..."
 msgid "Can't open CAM menu!"
 msgstr "Otvaranje CAM menija neuspe�no!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM u upotrebi - stvarno ponovno pokrenuti?"
 
@@ -1217,6 +1233,21 @@ msgstr "Trajanje prikazivanja progresa (s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pauziraj reprodukciju prilikom obele�avanja"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID reprodukcije"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 63ab5dbcc..33add95c2 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -23,6 +23,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanalen �r inte tillg�nglig!"
 
@@ -1112,9 +1115,19 @@ msgstr "CAM n
 msgid "CAM ready"
 msgstr "CAM klar"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Meny"
 
@@ -1127,6 +1140,9 @@ msgstr "
 msgid "Can't open CAM menu!"
 msgstr "Det g�r inte att �ppna CAM menyn!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM upptagen, vill du verkligen �terst�lla?"
 
@@ -1220,6 +1236,21 @@ msgstr "Tid f
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pausa uppspelningen vid s�ttande av redigeringsm�rke"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "�terupptagnings-ID"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 1ced923d3..e6708427c 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -19,6 +19,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Ge�ersiz kanal ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Kanal kullan�lam�yor!"
 
@@ -1108,9 +1111,19 @@ msgstr "CAM mevcut"
 msgid "CAM ready"
 msgstr "CAM haz�r"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Men�"
 
@@ -1123,6 +1136,9 @@ msgstr "CAM men
 msgid "Can't open CAM menu!"
 msgstr "CAM men�s� a��lam�yor!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM kullan�l�yor - ger�ekden s�f�rla?"
 
@@ -1216,6 +1232,21 @@ msgstr ""
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr ""
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 3a20b3ed8..351d94df5 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-02-09 16:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -20,6 +20,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "Канал недоступний!"
 
@@ -1109,9 +1112,19 @@ msgstr "CAM присутній"
 msgid "CAM ready"
 msgstr "CAM готовий"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM (Умовний доступ)"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "Меню"
 
@@ -1124,6 +1137,9 @@ msgstr "Відкривання меню CAM-модуля..."
 msgid "Can't open CAM menu!"
 msgstr "Меню CAM-модуля недоступне!"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM використовується - дійсно перезапустити?"
 
@@ -1217,6 +1233,21 @@ msgstr "Час показу індикатора (с)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Пауза програвання при встановленні мітки"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0e061a548..bf2538173 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-12 15:40+0100\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -21,6 +21,9 @@ msgstr ""
 msgid "*** Invalid Channel ***"
 msgstr "***无效的频道 ***"
 
+msgid "CAM activated!"
+msgstr ""
+
 msgid "Channel not available!"
 msgstr "频道不可用!"
 
@@ -1110,9 +1113,19 @@ msgstr "存在的CAM"
 msgid "CAM ready"
 msgstr "CAM准备"
 
+#. TRANSLATORS: note the leading blank!
+msgid " (activating)"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM设置"
 
+msgid "Button$Cancel activation"
+msgstr ""
+
+msgid "Button$Activate"
+msgstr ""
+
 msgid "Button$Menu"
 msgstr "菜单"
 
@@ -1125,6 +1138,9 @@ msgstr "打开CAM菜单..."
 msgid "Can't open CAM menu!"
 msgstr "不能打开CAM菜单"
 
+msgid "Can't activate CAM!"
+msgstr ""
+
 msgid "CAM is in use - really reset?"
 msgstr "CAM正在使用-是否重启？"
 
@@ -1218,6 +1234,21 @@ msgstr "处理显示时间(s)"
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "暂停回放时，设置标志"
 
+msgid "Setup.Replay$Pause replay when jumping to a mark"
+msgstr ""
+
+msgid "Setup.Replay$Skip edited parts"
+msgstr ""
+
+msgid "Setup.Replay$Pause replay at last mark"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip initial value (s)"
+msgstr ""
+
+msgid "Setup.Replay$Binary skip timeout (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
diff --git a/recording.c b/recording.c
index e9a6b1698..079e0de2e 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.21 2015/01/17 14:52:28 kls Exp $
+ * $Id: recording.c 3.24 2015/01/25 15:39:24 kls Exp $
  */
 
 #include "recording.h"
@@ -1749,7 +1749,7 @@ void cDirCopier::Action(void)
                     off_t FileSizeSrc = FileSize(FileNameSrc);
                     off_t FileSizeDst = FileSize(FileNameDst);
                     if (FileSizeSrc != FileSizeDst) {
-                       esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst);
+                       esyslog("ERROR: file size discrepancy: %" PRId64 " != %" PRId64, FileSizeSrc, FileSizeDst);
                        break;
                        }
                     }
@@ -2072,7 +2072,7 @@ bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool Is
 bool cMarks::Update(void)
 {
   time_t t = time(NULL);
-  if (t > nextUpdate) {
+  if (t > nextUpdate && *fileName) {
      time_t LastModified = LastModifiedTime(fileName);
      if (LastModified != lastFileTime) // change detected, or first run
         lastChange = LastModified > 0 ? LastModified : t;
@@ -2476,7 +2476,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
            delta = int(buf.st_size % sizeof(tIndexTs));
            if (delta) {
               delta = sizeof(tIndexTs) - delta;
-              esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName);
+              esyslog("ERROR: invalid file size (%" PRId64 ") in '%s'", buf.st_size, *fileName);
               }
            last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
            if ((!Record || Update) && last >= 0) {
@@ -2741,7 +2741,7 @@ int cIndexFile::Get(uint16_t FileNumber, off_t FileOffset)
   return -1;
 }
 
-bool cIndexFile::IsStillRecording()
+bool cIndexFile::IsStillRecording(void)
 {
   return f >= 0;
 }
diff --git a/recording.h b/recording.h
index c9e950b34..1079ae1f1 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 3.5 2015/01/17 14:33:05 kls Exp $
+ * $Id: recording.h 3.6 2015/01/31 13:34:44 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -117,7 +117,6 @@ class cRecording : public cListObject {
   static char *StripEpisodeName(char *s, bool Strip);
   char *SortName(void) const;
   void ClearSortName(void);
-  int GetResume(void) const;
   time_t start;
   int priority;
   int lifetime;
@@ -160,6 +159,9 @@ class cRecording : public cListObject {
   int FileSizeMB(void) const;
        ///< Returns the total file size of this recording (in MB), or -1 if the file
        ///< size is unknown.
+  int GetResume(void) const;
+       ///< Returns the index of the frame where replay of this recording shall
+       ///< be resumed, or -1 in case of an error.
   bool IsNew(void) const { return GetResume() <= 0; }
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
diff --git a/remote.c b/remote.c
index 5cb2ccb80..ac10dce74 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 3.2 2014/02/15 12:40:39 kls Exp $
+ * $Id: remote.c 3.3 2015/01/20 14:53:57 kls Exp $
  */
 
 #include "remote.h"
@@ -124,7 +124,7 @@ bool cRemote::PutMacro(eKeys Key)
 bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
 {
   char buffer[32];
-  snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code);
+  snprintf(buffer, sizeof(buffer), "%016" PRIX64, Code);
   return Put(buffer, Repeat, Release);
 }
 
diff --git a/scr.conf b/scr.conf
index 61e09f1cd..84cdcec75 100644
--- a/scr.conf
+++ b/scr.conf
@@ -14,11 +14,17 @@
 #
 # Examples:
 
-# 0 1284
-# 1 1400
-# 2 1516
-# 3 1632
-# 4 1748
-# 5 1864
-# 6 1980
-# 7 2096
+# EN50494 & EN50607 ("JESS")
+# 0 974
+# 1 1076
+# 2 1178
+# 3 1280
+# 4 1382
+# 5 1484
+# 6 1586
+# 7 1688
+# EN50607 ("JESS") only
+# 8 1790
+# 9 1892
+# 10 1994
+# 11 2096
diff --git a/vdr.1 b/vdr.1
index 5727ee5a0..7605bf22d 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 3.3 2015/01/17 14:46:22 kls Exp $
+.\" $Id: vdr.1 3.4 2015/01/20 15:34:29 kls Exp $
 .\"
 .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
@@ -299,7 +299,7 @@ also be read at program startup to have the full EPG data available immediately.
 If this file is present in the video directory, its last modification time will
 be used to trigger an update of the list of recordings in the "Recordings" menu.
 .SH SEE ALSO
-.BR vdr (5), svdrp(1)
+.BR vdr (5), svdrpsend (1)
 .SH AUTHOR
 Written by Klaus Schmidinger, with contributions from many others.
 See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.

From bb4ef3b38022480dc046b63f982e3e9a332d7136 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 8 Feb 2015 15:17:00 +0100
Subject: [PATCH 240/307] Version 2.1.9 VDR developer version 2.1.9 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.9.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.8-2.1.9.diff

MD5 checksums:

59a63596f3fcfe7c81df8e92b4486f78  vdr-2.1.9.tar.bz2
e70d236f79bee5110f763a8109dba3d9  vdr-2.1.8-2.1.9.diff

Approaching version 2.2.0:
==========================

If there are no more serious bug reports, the final version 2.2.0 of VDR
shall be released on February 19, 2015, which marks the 15th anniversary
of VDR.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

The following language files still have the given number of untranslated texts:

ar.po: 51
ca_ES.po: 51
cs_CZ.po: 51
da_DK.po: 184
el_GR.po: 247
es_ES.po: 51
et_EE.po: 4
fi_FI.po: 1
fr_FR.po: 51
hr_HR.po: 184
it_IT.po: 4
lt_LT.po: 4
mk_MK.po: 51
nl_NL.po: 51
nn_NO.po: 312
pl_PL.po: 51
pt_PT.po: 79
ro_RO.po: 1
ru_RU.po: 51
sk_SK.po: 51
sl_SI.po: 52
sr_RS.po: 51
sv_SE.po: 51
tr_TR.po: 184
uk_UA.po: 4
zh_CN.po: 51

If nobody takes care of these, they will remain untranslated in version 2.2.0.

DEADLINE FOR SUBMITTING TRANSLATIONS IS WEDNESDAY, FEBRUARY 18!

From the HISTORY file:
- Fixed a memory leak in case of broken Extended Event Descriptors (thanks to Lars
  Hanisch).
- Fixed the German translation of "Binary skip timeout (s)" (thanks to Matthias
  Senzel).
- Fixed the German translation of "VDR will shut down later - press Power to force".
- Fixed the Finnish translation of "Binary skip timeout (s)" (thanks to Rolf
  Ahrenberg).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- Added SDNOTIFY to Make.config.template (suggested by Christian Richter). Also
  added NO_KBD and BIDI.
- Added code from the "jumpplay" patch that makes the recording still be considered
  unviewed when stopping replay within RESUMEBACKUP seconds of the first mark.
- The new option "Setup/Replay/Alternate behavior for adaptive skipping" can be used
  to make adaptive skipping only halve the skip distance when the direction changes.
  That way you can reach the desired point in a recording even if you make one too
  many skips in a certain direction (see MANUAL for details).
- Fixed cCamSlot::Assign(), so that it actually ignores the value of Query if Device
  is NULL (as described in the header file).
- Added a missing VDRDIR="$(CWD)" to the clean-plugins target of the Makefile, to
  avoid error messages regarding the missing vdr.pc file.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Hungarian OSD texts (thanks to István Füley).
- Fixed switching channels in the Schedule menu after going through various Now and
  Schedule menus for different channels (reported by Matthias Senzel).
- Fixed setting the Blue button in the Schedule/Now/Next menus, so that it only shows
  "Switch" if the selected event is on a different channel.
- Added "NORDIG" to the list of "DVB/Standard compliance" options and using it to
  restrict the LCN (Logical Channel Numbers) parsing to networks that actually use
  this non-standard feature (thanks to Rolf Ahrenberg).
- In the "Edit recording" menu the '0' key can now be used on the "Name:" field to
  remove the name of the recording and replace it with the last element of the
  recording's folder path name (suggested by Christoph Haubrich). See MANUAL, section
  "Managing folders" for details.
- Updated the Italian OSD texts (thanks to Nino Gerbino).
- The "Select folder" menu now adds the folder names of all existing recordings to
  any names that have been predefined in "folders.conf" (suggested by Sören Moch).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed the German translations of "latitude" and "longitude" (they were swapped).
- Updated the Hungarian OSD texts (thanks to Mario Fenneis).
- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
- Changed the German translations if the texts related to "binary skipping" (based
  on a suggestion by Thomas Reufer).
- Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
  two separate positions (thanks to Arthur Konovalov).
- Fixed cMarks::GetNextBegin() and cMarks::GetNextEnd() (thanks to Stefan Herdler).
  The behavior of these two functions is now exacly as described in the header file.
  Editing marks that are placed at exactly the same offset in a recording are now
  preserved in the cutting process.
- Changed the naming of "binary skip mode" to "adaptive skip mode" (suggested by
  Rolf Ahrenberg and Derek Kelly).
- cDvbPlayer and cReplayControl now use the same list of editing marks. This avoids
  inconsistent behavior with the "Skip edited parts" or "Pause replay at last mark"
  functions when the editing marks are manipulated during replay.
- Fixed setting an empty recording name or folder to a blank in the "Edit recording"
  menu (reported by Christoph Haubrich).
- Added a confirmation before renaming a recording to its folder name (suggested
  by Christoph Haubrich).
- Modified EntriesOnSameFileSystem(), so that it returns 'true' if either of the given
  files doesn't exist (to avoid any actions that might be triggered if files are on
  different file system), and changed handling the 'error' variable in cDirCopier, so
  that it is initialized to 'true' and will only be set to 'false' if the entire
  copy process has been successful (problem reported by Christoph Haubrich).
- Added the UPDATE-2.2.0 file.
---
 CONTRIBUTORS                        |  25 ++
 HISTORY                             |  73 +++++-
 MANUAL                              |  66 +++--
 Make.config.template                |  12 +-
 Makefile                            |   4 +-
 PLUGINS/src/dvbhddevice/po/et_EE.po | 128 +++++++++
 PLUGINS/src/dvbhddevice/po/fi_FI.po |   2 +-
 PLUGINS/src/dvbhddevice/po/uk_UA.po | 129 +++++++++
 PLUGINS/src/hello/po/et_EE.po       |  18 +-
 PLUGINS/src/pictures/po/et_EE.po    |  33 +++
 PLUGINS/src/skincurses/HISTORY      |   4 +
 PLUGINS/src/skincurses/po/de_DE.po  |   5 +-
 PLUGINS/src/skincurses/po/et_EE.po  |  30 +++
 PLUGINS/src/skincurses/po/fi_FI.po  |   3 +-
 PLUGINS/src/skincurses/po/it_IT.po  |   3 +-
 PLUGINS/src/skincurses/po/lt_LT.po  |   3 +-
 PLUGINS/src/skincurses/po/ru_RU.po  |   5 +-
 PLUGINS/src/skincurses/po/sk_SK.po  |   5 +-
 PLUGINS/src/skincurses/skincurses.c |   5 +-
 UPDATE-2.2.0                        | 388 ++++++++++++++++++++++++++++
 ci.c                                |   4 +-
 config.c                            |  17 +-
 config.h                            |  16 +-
 dvbplayer.c                         |  44 +++-
 dvbplayer.h                         |   4 +-
 eit.c                               |   6 +-
 libsi/si.c                          |   9 +-
 libsi/si.h                          |   4 +-
 menu.c                              | 176 ++++++++++---
 menu.h                              |   8 +-
 nit.c                               |  60 ++---
 po/ar.po                            |  12 +-
 po/ca_ES.po                         |  12 +-
 po/cs_CZ.po                         |  12 +-
 po/da_DK.po                         |  12 +-
 po/de_DE.po                         |  24 +-
 po/el_GR.po                         |  12 +-
 po/es_ES.po                         |  12 +-
 po/et_EE.po                         |  34 ++-
 po/fi_FI.po                         |  16 +-
 po/fr_FR.po                         |  12 +-
 po/hr_HR.po                         |  12 +-
 po/hu_HU.po                         | 258 +++++++++---------
 po/it_IT.po                         |  41 +--
 po/lt_LT.po                         | 106 ++++----
 po/mk_MK.po                         |  12 +-
 po/nl_NL.po                         |  12 +-
 po/nn_NO.po                         |  12 +-
 po/pl_PL.po                         |  12 +-
 po/pt_PT.po                         |  12 +-
 po/ro_RO.po                         |  36 +--
 po/ru_RU.po                         |  12 +-
 po/sk_SK.po                         |  12 +-
 po/sl_SI.po                         |  12 +-
 po/sr_RS.po                         |  12 +-
 po/sv_SE.po                         |  12 +-
 po/tr_TR.po                         |  12 +-
 po/uk_UA.po                         | 132 +++++-----
 po/zh_CN.po                         |  12 +-
 recording.c                         |  17 +-
 recording.h                         |   9 +-
 runvdr.template                     |  10 +-
 sources.conf                        |   3 +-
 tools.c                             |   4 +-
 tools.h                             |   5 +-
 65 files changed, 1688 insertions(+), 536 deletions(-)
 create mode 100644 PLUGINS/src/dvbhddevice/po/et_EE.po
 create mode 100644 PLUGINS/src/dvbhddevice/po/uk_UA.po
 create mode 100644 PLUGINS/src/pictures/po/et_EE.po
 create mode 100644 PLUGINS/src/skincurses/po/et_EE.po
 create mode 100644 UPDATE-2.2.0

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 64edccc15..49fbcee4c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1195,6 +1195,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  doesn't set the data's version numbers as required by the DVB standard
  for the "binary skip" patch
  for adding support for LCN (Logical Channel Numbers)
+ for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1728,6 +1729,8 @@ Arthur Konovalov <artlov@gmail.com>
  for reporting that the video stream type was set to 2 even if the vpid was 0
  for updates to 'sources.conf'
  for reporting a wrong initialization of Setup.PositionerSwing
+ for updating sources.conf to reflect the fact that Astra 4A and SES5 are actually in
+ two separate positions
 
 Milos Kapoun <m.kapoun@cra.cz>
  for suggesting to skip code table info in SI data
@@ -2412,6 +2415,12 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for suggesting to replace "Schnitt" with "Bearbeitung" in the German OSD texts
  for reporting a superfluous call to the skin's SetRecording() function after renaming
  a recording
+ for suggesting to add a function to remove the name of a recording and replace it
+ with the last element of the recording's folder path name
+ for reporting a bug in setting an empty recording name or folder to a blank in the
+ "Edit recording" menu
+ for suggesting to add a confirmation before renaming a recording to its folder name
+ for reporting a problem with data loss in case renaming a recording fails
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2830,6 +2839,7 @@ Derek Kelly <user.vdr@gmail.com>
  for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8
  for reporting a missing template for DVBDIR in Make.config.template
  for suggesting to add ARGSDIR to the ONEDIR section of Make.config.template
+ for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2909,6 +2919,7 @@ Lars Hanisch <dvb@flensrocker.de>
  for fixing learning keyboard remote control codes
  for making VDR read command line options from *.conf files in /etc/vdr/conf.d
  for adding a missing backslash to the help text of the SVDRP command MOVR
+ for fixing a memory leak in case of broken Extended Event Descriptors
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -3118,6 +3129,7 @@ Marco Skambraks <marco@ammec.de>
 Christian Richter <cr@crichter.net>
  for extending the interface to the script that gets called for recordings, so that in
  the "edited" case it also provides the name of the original recording
+ for suggesting to add SDNOTIFY to Make.config.template
 
 Christian Kaiser <chr-kaiser@arcor.de>
  for adding DeleteEvent() to the EPG handler interface
@@ -3167,6 +3179,8 @@ S
  changed after VDR has been started
  for reporting that the change "Fixed some compiler warnings with Clang 3.4.1" caused
  ci.c to no longer compile with older versions of gcc
+ for suggesting to make the "Select folder" menu add the folder names of all existing
+ recordings to any names that have been predefined in "folders.conf"
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
@@ -3213,6 +3227,9 @@ Matthias Senzel <matthias.senzel@t-online.de>
  for reporting a problem with switching back to live viewing after replay in a setup
  with device bonding
  for reporting a problem with handling overlapping pending timers
+ for fixing the German translation of "Binary skip timeout (s)"
+ for reporting a bug in switching channels in the Schedule menu after going through
+ various Now and Schedule menus for different channels
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
@@ -3284,6 +3301,8 @@ Thomas Reufer <thomas@reufer.ch>
  for adding handling for DTS audio tracks to cPatPmtParser::ParsePmt()
  for adding support for PGS subtitles
  for adding cOsdProvider::OsdSizeChanged()
+ for suggesting to change the German translations if the texts related to "binary
+ skipping"
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
@@ -3340,3 +3359,9 @@ Jasmin Jessich <jasmin@anw.at>
 Martin Schirrmacher <schirrmie@gmail.com>
  for suggesting to provide a way for skin plugins to get informed about the currently
  used sort mode of a menu
+
+Mario Fenneis <admin@mediastreambox.at>
+ for translating OSD texts to the Hungarian language
+
+Stefan Herdler <herdler@gmx.de>
+ for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
diff --git a/HISTORY b/HISTORY
index 2e8be6787..ed9f24c80 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8384,7 +8384,7 @@ Video Disk Recorder Revision History
 - Now returning from removing deleted recordings after at most 10 seconds, or if the
   user presses a remote control key, to keep the system from getting unresponsive
   when removing a huge number of files (reported by Dieter Ferdinand).
-- Fixed generating the index file of an existing recording in case at the of a TS file
+- Fixed generating the index file of an existing recording in case at the end of a TS file
   there is less data in the buffer than needed by the frame detector. In such a case
   it was possible that frames were missed, and there was most likely a distortion
   when replaying that part of a recording. This is mostly a problem for recordings that
@@ -8405,7 +8405,7 @@ Video Disk Recorder Revision History
 - Now returning from removing deleted recordings after at most 10 seconds, or if the
   user presses a remote control key, to keep the system from getting unresponsive
   when removing a huge number of files (reported by Dieter Ferdinand).
-- Fixed generating the index file of an existing recording in case at the of a TS file
+- Fixed generating the index file of an existing recording in case at the end of a TS file
   there is less data in the buffer than needed by the frame detector. In such a case
   it was possible that frames were missed, and there was most likely a distortion
   when replaying that part of a recording. This is mostly a problem for recordings that
@@ -8452,3 +8452,72 @@ Video Disk Recorder Revision History
 - The function cDvbPlayer::Goto() now automatically calls Play() if Still is false.
 - Added support for LCN (Logical Channel Numbers), which plugins may use to sort
   channels (thanks to Rolf Ahrenberg).
+
+2015-02-08: Version 2.1.9
+
+- Fixed a memory leak in case of broken Extended Event Descriptors (thanks to Lars
+  Hanisch).
+- Fixed the German translation of "Binary skip timeout (s)" (thanks to Matthias
+  Senzel).
+- Fixed the German translation of "VDR will shut down later - press Power to force".
+- Fixed the Finnish translation of "Binary skip timeout (s)" (thanks to Rolf
+  Ahrenberg).
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- Added SDNOTIFY to Make.config.template (suggested by Christian Richter). Also
+  added NO_KBD and BIDI.
+- Added code from the "jumpplay" patch that makes the recording still be considered
+  unviewed when stopping replay within RESUMEBACKUP seconds of the first mark.
+- The new option "Setup/Replay/Alternate behavior for adaptive skipping" can be used
+  to make adaptive skipping only halve the skip distance when the direction changes.
+  That way you can reach the desired point in a recording even if you make one too
+  many skips in a certain direction (see MANUAL for details).
+- Fixed cCamSlot::Assign(), so that it actually ignores the value of Query if Device
+  is NULL (as described in the header file).
+- Added a missing VDRDIR="$(CWD)" to the clean-plugins target of the Makefile, to
+  avoid error messages regarding the missing vdr.pc file.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the Hungarian OSD texts (thanks to Istv�n F�ley).
+- Fixed switching channels in the Schedule menu after going through various Now and
+  Schedule menus for different channels (reported by Matthias Senzel).
+- Fixed setting the Blue button in the Schedule/Now/Next menus, so that it only shows
+  "Switch" if the selected event is on a different channel.
+- Added "NORDIG" to the list of "DVB/Standard compliance" options and using it to
+  restrict the LCN (Logical Channel Numbers) parsing to networks that actually use
+  this non-standard feature (thanks to Rolf Ahrenberg).
+- In the "Edit recording" menu the '0' key can now be used on the "Name:" field to
+  remove the name of the recording and replace it with the last element of the
+  recording's folder path name (suggested by Christoph Haubrich). See MANUAL, section
+  "Managing folders" for details.
+- Updated the Italian OSD texts (thanks to Nino Gerbino).
+- The "Select folder" menu now adds the folder names of all existing recordings to
+  any names that have been predefined in "folders.conf" (suggested by S�ren Moch).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed the German translations of "latitude" and "longitude" (they were swapped).
+- Updated the Hungarian OSD texts (thanks to Mario Fenneis).
+- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
+- Changed the German translations if the texts related to "binary skipping" (based
+  on a suggestion by Thomas Reufer).
+- Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
+  two separate positions (thanks to Arthur Konovalov).
+- Fixed cMarks::GetNextBegin() and cMarks::GetNextEnd() (thanks to Stefan Herdler).
+  The behavior of these two functions is now exacly as described in the header file.
+  Editing marks that are placed at exactly the same offset in a recording are now
+  preserved in the cutting process.
+- Changed the naming of "binary skip mode" to "adaptive skip mode" (suggested by
+  Rolf Ahrenberg and Derek Kelly).
+- cDvbPlayer and cReplayControl now use the same list of editing marks. This avoids
+  inconsistent behavior with the "Skip edited parts" or "Pause replay at last mark"
+  functions when the editing marks are manipulated during replay.
+- Fixed setting an empty recording name or folder to a blank in the "Edit recording"
+  menu (reported by Christoph Haubrich).
+- Added a confirmation before renaming a recording to its folder name (suggested
+  by Christoph Haubrich).
+- Modified EntriesOnSameFileSystem(), so that it returns 'true' if either of the given
+  files doesn't exist (to avoid any actions that might be triggered if files are on
+  different file system), and changed handling the 'error' variable in cDirCopier, so
+  that it is initialized to 'true' and will only be set to 'false' if the entire
+  copy process has been successful (problem reported by Christoph Haubrich).
+- Added the UPDATE-2.2.0 file.
diff --git a/MANUAL b/MANUAL
index 4f783c41e..b0b7fa59d 100644
--- a/MANUAL
+++ b/MANUAL
@@ -363,18 +363,19 @@ Version 2.0
   - 0       Toggles an editing mark. If the mark indicator shows a red triangle,
             the current mark is deleted. Otherwise a new mark is set at the
             current position.
-  - 1, 3    Move an editing mark back and forward in "binary" mode. Pressing
+  - 1, 3    Move an editing mark back and forward in "adaptive" mode. Pressing
             either of these keys for the first time moves the mark 120 seconds
-            in the given direction (configurable via "Setup/Replay/Binary skip
-            initial value"). Further presses of the same key keep moving
-            the mark by the same value. Once the other key is pressed, the value
-            is divided by 2 (hence the name "binary") with every further press
-            of either key. Pressing '1' and '3' alternatingly divides the
-            distance all the way down to a single I-frame. That way a particular
-            place in a recording (for instance the beginning or end of a
-            commercial break) can be found very quickly. If none of these two
-            keys is pressed for a while (configurable via "Setup/Replay/Binary
-            skip timeout") the distance falls back to the initial value.
+            in the given direction (configurable via "Setup/Replay/Initial
+            duration for adaptive skipping"). Further presses of the same key
+            keep moving the mark by the same value. Once the other key is
+            pressed, the value is divided by 2 (hence the name "adaptive") with
+            every further press of either key. Pressing '1' and '3'
+            alternatingly divides the distance all the way down to a single
+            I-frame. That way a particular place in a recording (for instance
+            the beginning or end of a commercial break) can be found very
+            quickly. If none of these two keys is pressed for a while
+            (configurable via "Setup/Replay/Reset timeout for adaptive
+            skipping") the distance falls back to the initial value.
             If replay is not in Pause mode, or if there is no mark at the
             current position, the skip is performed without moving any mark.
   - 4, 6    Move an editing mark back and forward by one I-frame. You need to
@@ -540,8 +541,16 @@ Version 2.0
   the selected recording (if there are any and the recording is not currently
   being cut). To directly edit the folder or name of the recording, position the
   cursor to the respective line and press the Right key to start editing (press
-  Ok to confirm the edit, or Back to return to the previous value). Once you are
-  finished with editing the recording properties, press Ok to confirm the changes.
+  Ok to confirm the edit, or Back to return to the previous value). If you want
+  to remove the name of the recording and make the folder name the actual
+  recording's name, you can position the cursor to the "Name:" field and press
+  the '0' key. This will take the last element of the recording's folder path
+  and make it the actual name of the recording. You can do this in turn until
+  the recording is moved all the way up to the root of the video directory.
+  Note that, in case you inadvertently pressed the '0' key, you can leave the
+  "Edit recording" menu with the "Back" key and any changes you have made so far
+  will not be applied. Once you are finished with editing the recording
+  properties, press Ok to confirm the changes.
 
 * Parameters in the "Setup" menu
 
@@ -743,6 +752,7 @@ Version 2.0
                          Defines the standard compliance mode:
                          0 = DVB
                          1 = ANSI/SCTE
+                         2 = NORDIG
 
   Video format = 4:3     The video format (or aspect ratio) of the tv set in use
                          (4:3 or 16:9). Applies only to SD output devices.
@@ -981,8 +991,6 @@ Version 2.0
                          automatically skipped during replay. This includes jumping
                          to the first mark if replay starts at the beginning of the
                          recording, and stopping at the last mark.
-                         In order to work, this option must be enabled before starting
-                         replay.
 
   Pause replay at last mark = no
                          If enabled, replay of a recording will go into Pause mode
@@ -990,21 +998,33 @@ Version 2.0
                          the actual position at which the pause occurs may be a couple
                          of frames before the last "end" mark, depending on how much
                          data is buffered by your output device.
-                         In order to work, this option must be enabled before starting
-                         replay.
 
-  Binary skip initial value (s) = 120
+  Initial duration for adaptive skipping (s) = 120
                          Defines the number of seconds to jump from the current replay
                          position in either direction, when pressing the '1' or '3'
-                         key for the first time after the "Binary skip timeout".
+                         key for the first time after the "Reset timeout for adaptive
+                         skipping".
                          The valid range is 10...600.
 
-  Binary skip timeout (s) = 3
+  Reset timeout for adaptive skipping (s) = 3
                          Defines the number of seconds after which pressing the
-                         '1' or '3' key falls back to the "Binary skip initial value".
+                         '1' or '3' key falls back to the "Initial duration for adaptive
+                         skipping".
                          The valid range is 0...10. Setting the timeout to 0 disables
-                         the binary mode and makes '1' and '3' always skip the number
-                         of seconds configured as the initial value.
+                         the adaptive mode and makes '1' and '3' always skip the number
+                         of seconds configured as the initial duration.
+
+  Alternate behavior for adaptive skipping = no
+                         When skipping in adaptive mode with the '1' and '3' keys, the
+                         distance of the skip is halved with every key press after the
+                         first change of direction. While this allows for locating a
+                         particular position in a recording very fast, once you make
+                         one step too many in the current direction you have no chance
+                         of ever reaching the desired point any more. You will have to
+                         wait for the timeout to occur and start adaptive skipping anew.
+                         If this option is set to 'yes', the skip distance will only be
+                         halved if the direction actually changes. That way, even if
+                         you missed the target point, you can still back up to it.
 
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
diff --git a/Make.config.template b/Make.config.template
index 88b62863a..523926bdf 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.2 2015/01/30 15:18:47 kls Exp $
+# $Id: Make.config.template 3.3 2015/02/02 09:07:07 kls Exp $
 
 ### The C compiler and options:
 
@@ -67,12 +67,20 @@ endif
 #PLGCFG = $(CONFDIR)/plugins.mk
 
 ### The remote control:
-
 LIRC_DEVICE = /var/run/lirc/lircd
 
+### Define if you don't want keyboard remote control:
+#NO_KBD = 1
+
 ### Define if you want vdr to not run as root:
 #VDR_USER = vdr
 
+### Define if you want to compile in 'bidi' support:
+#BIDI = 1
+
+### Define if you want 'systemd' notification:
+#SDNOTIFY = 1
+
 ### Fallback for plugins with old makefiles:
 ifdef PLUGIN
 CFLAGS   += -fPIC
diff --git a/Makefile b/Makefile
index 40a610aed..a69fb4eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 3.4 2015/01/01 13:52:07 kls Exp $
+# $Id: Makefile 3.5 2015/02/02 14:47:24 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -250,7 +250,7 @@ plugins: include-dir vdr.pc
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
 
 clean-plugins:
-	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" clean; done
+	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" clean; done
 	@-rm -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION)
 
 # Install the files (note that 'install-pc' must be first!):
diff --git a/PLUGINS/src/dvbhddevice/po/et_EE.po b/PLUGINS/src/dvbhddevice/po/et_EE.po
new file mode 100644
index 000000000..e60d72583
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/po/et_EE.po
@@ -0,0 +1,128 @@
+# VDR plugin language source file
+# Copyright (C) 2011 Andreas Regel
+# This file is distributed under the same license as the dvbhddevice package.
+# Arthur Konovalov, 2015
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2014-09-21 14:01+0200\n"
+"PO-Revision-Date: 2011-04-25 21:44+0200\n"
+"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "HD Full Featured DVB device"
+msgstr "Täisfunktsionaalne HD DVB seade"
+
+msgid "Video Conversion"
+msgstr "Video konverteerimine"
+
+msgid "TV on"
+msgstr "TV sisse"
+
+msgid "TV off"
+msgstr "TV välja"
+
+msgid "Automatic"
+msgstr "automaatne"
+
+msgid "Letterbox 16/9"
+msgstr "letterbox 16:9"
+
+msgid "Letterbox 14/9"
+msgstr "letterbox 14:9"
+
+msgid "Pillarbox"
+msgstr "pillarbox"
+
+msgid "CentreCutOut"
+msgstr "center cut out"
+
+msgid "Always 16/9"
+msgstr "alati 16:9"
+
+msgid "Zoom 16/9"
+msgstr "suum 16/9"
+
+msgid "Off"
+msgstr "väljas"
+
+msgid "Frame rate"
+msgstr "kaadrisagedus"
+
+msgid "HD Only"
+msgstr "ainult HD-resolutsioon"
+
+msgid "Always"
+msgstr "alati"
+
+msgid "Disabled"
+msgstr "keelatud"
+
+msgid "Analogue only"
+msgstr "ainult analoog"
+
+msgid "HDMI only"
+msgstr "ainult HDMI"
+
+msgid "Follow resolution"
+msgstr "vastavalt resolutsioonile"
+
+msgid "none"
+msgstr "ei"
+
+msgid "Resolution"
+msgstr "Resolutsioon"
+
+msgid "Video Mode Adaption"
+msgstr "Videorežiimi sobitus"
+
+msgid "TV format"
+msgstr "TV külgsuhe"
+
+msgid "Analogue Video"
+msgstr "Analoogvideo"
+
+msgid "Audio Delay (ms)"
+msgstr "Heli viide (ms)"
+
+msgid "Audio Downmix"
+msgstr "Heli downmix"
+
+msgid "A/V Sync Shift (ms)"
+msgstr "A/V-sünkro nihe (ms)"
+
+msgid "OSD Size"
+msgstr "Ekraanimenüü suurus"
+
+msgid "HDMI CEC"
+msgstr "HDMI CEC"
+
+msgid "CEC: Switch TV on"
+msgstr "CEC: TV sisselülitus"
+
+msgid "CEC: Switch TV off"
+msgstr "CEC: TV väljalülitus"
+
+msgid "Remote Control Protocol"
+msgstr "Kaugjuhtimispuldi protokoll"
+
+msgid "Remote Control Address"
+msgstr "Kaugjuhtimispuldi aadress"
+
+msgid "High Level OSD"
+msgstr "Kõrgema taseme ekraanimenüü"
+
+msgid "Allow True Color OSD"
+msgstr "True Color ekraanimenüü"
+
+msgid "True Color format"
+msgstr "True Color formaat"
+
+msgid "Hide mainmenu entry"
+msgstr "Peita peamenüü valikus"
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 797aa7011..18d9ff9a5 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -122,7 +122,7 @@ msgid "Allow True Color OSD"
 msgstr "Salli tosivärit kuvaruutunäytölle"
 
 msgid "True Color format"
-msgstr ""
+msgstr "Näytä tosivärit muodossa"
 
 msgid "Hide mainmenu entry"
 msgstr "Piilota valinta päävalikosta"
diff --git a/PLUGINS/src/dvbhddevice/po/uk_UA.po b/PLUGINS/src/dvbhddevice/po/uk_UA.po
new file mode 100644
index 000000000..8021c9e60
--- /dev/null
+++ b/PLUGINS/src/dvbhddevice/po/uk_UA.po
@@ -0,0 +1,129 @@
+# VDR language source file.
+# Copyright (C) 2011 Andreas Regel
+# This file is distributed under the same license as the dvbhddevice package.
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2015
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-03 13:28+0100\n"
+"PO-Revision-Date: 2015-02-01 23:31+0100\n"
+"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
+"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
+
+msgid "HD Full Featured DVB device"
+msgstr "HD Full Featured DVB device"
+
+msgid "Video Conversion"
+msgstr "Конвертація відео"
+
+msgid "TV on"
+msgstr "Вкл ТБ"
+
+msgid "TV off"
+msgstr "Викл ТБ"
+
+msgid "Automatic"
+msgstr "Автоматично"
+
+msgid "Letterbox 16/9"
+msgstr "Конверт 16:9"
+
+msgid "Letterbox 14/9"
+msgstr "Конверт 14:9"
+
+msgid "Pillarbox"
+msgstr "Pillarbox"
+
+msgid "CentreCutOut"
+msgstr "Вірізання від центру"
+
+msgid "Always 16/9"
+msgstr "Завжди 16:9"
+
+msgid "Zoom 16/9"
+msgstr "Допасувати до 16:9"
+
+msgid "Off"
+msgstr "Викл"
+
+msgid "Frame rate"
+msgstr "Частота кадрів"
+
+msgid "HD Only"
+msgstr "Тільки HD"
+
+msgid "Always"
+msgstr "Завжди"
+
+msgid "Disabled"
+msgstr "Відключено"
+
+msgid "Analogue only"
+msgstr "Тільки аналоговий"
+
+msgid "HDMI only"
+msgstr "Тільки HDMI"
+
+msgid "Follow resolution"
+msgstr "Відносно розд. здатн."
+
+msgid "none"
+msgstr "немає"
+
+msgid "Resolution"
+msgstr "Розд. здатність"
+
+msgid "Video Mode Adaption"
+msgstr "Адаптація відео режиму"
+
+msgid "TV format"
+msgstr "Формат ТБ"
+
+msgid "Analogue Video"
+msgstr "Аналогове відео"
+
+msgid "Audio Delay (ms)"
+msgstr "Затримка аудіо (мс)"
+
+msgid "Audio Downmix"
+msgstr "Міксування аудіо"
+
+msgid "A/V Sync Shift (ms)"
+msgstr "А/В зсув синхронізації (мс)"
+
+msgid "OSD Size"
+msgstr "Розмір OSD"
+
+msgid "HDMI CEC"
+msgstr "HDMI CEC"
+
+msgid "CEC: Switch TV on"
+msgstr "CEC: включити ТБ"
+
+msgid "CEC: Switch TV off"
+msgstr "CEC: виключити ТБ"
+
+msgid "Remote Control Protocol"
+msgstr "Протокол пульта"
+
+msgid "Remote Control Address"
+msgstr "Адрес пульта"
+
+msgid "High Level OSD"
+msgstr "High Level OSD"
+
+msgid "Allow True Color OSD"
+msgstr "Включити True Color OSD"
+
+msgid "True Color format"
+msgstr "Формат True Color"
+
+msgid "Hide mainmenu entry"
+msgstr "Приховати в головному меню"
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index 1c6c1835d..9a8167e49 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -1,7 +1,7 @@
 # VDR plugin language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Arthur Konovalov <kasjas@hot.ee>, 2004
+# Arthur Konovalov <artlov@gmail.com>, 2004, 2015
 #
 msgid ""
 msgstr ""
@@ -9,27 +9,27 @@ msgstr ""
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
+"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-13\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr ""
+msgstr "Sõbralik tervitus"
 
 msgid "Hello"
-msgstr ""
+msgstr "Tere"
 
 msgid "Greeting time (s)"
-msgstr ""
+msgstr "Tervituse kestus (s)"
 
 msgid "Use alternate greeting"
-msgstr ""
+msgstr "Vahelduv tervitus"
 
 msgid "Howdy folks!"
-msgstr ""
+msgstr "Kuidas käsi käib?"
 
 msgid "Hello world!"
-msgstr ""
+msgstr "Tere, maailm!"
diff --git a/PLUGINS/src/pictures/po/et_EE.po b/PLUGINS/src/pictures/po/et_EE.po
new file mode 100644
index 000000000..0bd6c121e
--- /dev/null
+++ b/PLUGINS/src/pictures/po/et_EE.po
@@ -0,0 +1,33 @@
+# VDR plugin language source file.
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Arthur Konovalov <artlov@gmail.com>, 2015
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2012-12-18 12:57+0100\n"
+"PO-Revision-Date: 2008-01-12 17:41+0100\n"
+"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Pictures"
+msgstr "Pildid"
+
+msgid "A simple picture viewer"
+msgstr "Lihtne pildivaatur"
+
+msgid "Picture directory"
+msgstr "Pildikaust"
+
+msgid "Slide show delay (s)"
+msgstr "Slaidiseanssi viide (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Pildikaust on määramata!"
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index a2cdb60b8..4da038b64 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -122,3 +122,7 @@ VDR Plugin 'skincurses' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-08: Version 2.1.2
+
+- Added a missing trailing blank in some translations.
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index 6d84b1e27..b0e017ad1 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skincurses 0.1.12\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-12-18 14:04+0100\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -22,8 +22,9 @@ msgstr "Eine reine Text-Oberfl
 msgid "Key$Mute"
 msgstr "Stumm"
 
+#. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "Lautst�rke"
+msgstr "Lautst�rke "
 
 msgid "Text mode"
 msgstr "Text-Modus"
diff --git a/PLUGINS/src/skincurses/po/et_EE.po b/PLUGINS/src/skincurses/po/et_EE.po
new file mode 100644
index 000000000..eaba8b8fc
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/et_EE.po
@@ -0,0 +1,30 @@
+# VDR plugin language source file.
+# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Arthur Konovalov <artlov@gmail.com>, 2015
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
+"PO-Revision-Date: 2007-08-14 20:48+0300\n"
+"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A text only skin"
+msgstr "Tekstipõhine kest"
+
+msgid "Key$Mute"
+msgstr "Hääletu"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "Helitugevus "
+
+msgid "Text mode"
+msgstr "Tekst"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 2be31fbff..0a44f8928 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skincurses 0.1.12\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-12-18 14:04+0100\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
 "Last-Translator: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -22,6 +22,7 @@ msgstr "Tekstipohjainen ulkoasu"
 msgid "Key$Mute"
 msgstr "Mykistys"
 
+#. TRANSLATORS: note the trailing blank!
 msgid "Volume "
 msgstr "Äänenvoimakkuus "
 
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 057e7a637..26dff2548 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skincurses 0.1.12\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-12-18 14:04+0100\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -22,6 +22,7 @@ msgstr "Una interfaccia solo testo"
 msgid "Key$Mute"
 msgstr "Muto"
 
+#. TRANSLATORS: note the trailing blank!
 msgid "Volume "
 msgstr "Volume "
 
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index 0f2237f06..5a4649c2c 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skincurses 0.1.12\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-12-18 14:04+0100\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2010-02-22 18:18+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -22,6 +22,7 @@ msgstr "Tekstinis apvalkalas"
 msgid "Key$Mute"
 msgstr "Išjungti garsą"
 
+#. TRANSLATORS: note the trailing blank!
 msgid "Volume "
 msgstr "Garsas "
 
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index 93e89612b..834d62418 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skincurses 0.1.12\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-12-18 14:04+0100\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
 "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -23,8 +23,9 @@ msgstr "
 msgid "Key$Mute"
 msgstr "����. ���������"
 
+#. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "���������"
+msgstr "��������� "
 
 msgid "Text mode"
 msgstr "����� ������"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index b03d9b488..ef7e68337 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skincurses 0.1.12\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2012-12-18 14:04+0100\n"
+"POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2009-09-30 12:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -22,8 +22,9 @@ msgstr "Iba text vzh
 msgid "Key$Mute"
 msgstr "Stlmi� zvuk"
 
+#. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "Hlasitos�"
+msgstr "Hlasitos� "
 
 msgid "Text mode"
 msgstr "Textov� re�im"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index db49ea480..d1e9770a9 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 3.1 2014/01/05 10:56:27 kls Exp $
+ * $Id: skincurses.c 3.2 2015/02/08 10:19:00 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.1.2";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -614,6 +614,7 @@ void cSkinCursesDisplayVolume::SetVolume(int Current, int Total, bool Mute)
      osd->DrawText(0, 0, tr("Key$Mute"), clrGreen, clrBackground, &Font);
      }
   else {
+     // TRANSLATORS: note the trailing blank!
      const char *Prompt = tr("Volume ");
      int l = Utf8StrLen(Prompt);
      int p = (ScOsdWidth - l) * Current / Total;
diff --git a/UPDATE-2.2.0 b/UPDATE-2.2.0
new file mode 100644
index 000000000..fe516bdbe
--- /dev/null
+++ b/UPDATE-2.2.0
@@ -0,0 +1,388 @@
+This is a summary of the changes in VDR 2.2.0 since the last stable
+version 2.0.0. It only contains things that are of actual importance
+to the user and doesn't mention the many fixes and improvements that
+have been made "behind the scenes".
+
+See the file HISTORY for a detailed list of all changes.
+
+Support for steerable satellite dishes:
+
+- Added basic support for positioners to control steerable satellite dishes.
+  + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
+  + The new DiSEqC command code 'P' can be used to instruct a positioner to move the
+    dish to the required satellite position. When a 'P' code is processed, further
+    execution of the remaining DiSEqC sequence (if any) is postponed until the positioner
+    has reached the new satellite position.
+  + The new special source value of "S360E" can be used in diseqc.conf to indicate that
+    an entry using a positioner can move the dish to any requested position within its
+    range. Think of it as "full circle".
+  + The devices a particular cDiseqc or cScr applies to are now stored directly in each
+    cDiseqc or cScr, respectively.
+  + A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners").
+  + The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to
+    show the user a progress display when the dish is being moved. The default implementation
+    calls SetMessage() with a string indicating the new position the dish is being moved to.
+    The LCARS skin shows a progress bar indicating the movement of the dish.
+  + The new parameters "Site latitude", "Site longitude", "Positioner speed", and
+    "Positioner swing" in the "Setup/LNB" menu can be used to configure the necessary
+    values for a steerable dish.
+  + The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable
+    dish has reached its target position. Parsing SI data is paused until the target
+    position has been reached.
+- Changed the sign of the satellite position value in cSource to reflect the standard
+  of western values being negative. The new member function cSource::Position() can be
+  used to retrieve the orbital position of a satellite.
+
+Conditional Access:
+
+- The new function cCamSlot::Decrypt() can be used by derived classes to implement a
+  CAM slot that can be freely assigned to any device, without being directly inserted
+  into the full TS data stream in hardware. A derived class that implements Decrypt()
+  will also need to set the new parameter WantsTsData in the call to the cCamSlot
+  base class constructor to true, in order to receive all the TS packets that
+  contain data necessary for decrypting.
+- Many member functions of cCamSlot have been made virtual to allow for easier
+  implementation of derived classes.
+- cDvbDevice::GetTSPacket() now calls CamSlot()->Decrypt() in order to allow CAM slots
+  that can be freely assigned to any device access to the TS data stream.
+- Improved locking for CAM slots and made the pure functions of cCiAdapter have
+  default implementations, to fix a possible crash with CI adapters and CAM slots
+  that are implemented in a plugin.
+- Added logging the supported system ids of a CAM.
+- Now waiting explicitly until all CAM slots are ready before switching to the
+  initial channel when VDR is started. This is necessary in case CI adapters are
+  used that are not physically connected to a dedicated device. The respective checks
+  in cDvbDevice have been removed to avoid redundancy.
+- Now unassigning CAMs from their devices when they are no longer used.
+- Now making sure the primary device goes into transfer mode for live viewing if the
+  CAM wants to receive the TS data.
+- Added a log message in case a receiver is detached from its device because the
+  assigned CAM can't decrypt the channel.
+- The pid of the PMT in which the CA descriptors of a given channel are broadcast
+  is now stored together with the CA descriptors and can be retrieved by calling
+  GetPmtPid() (this information is only required to receive encrypted channels
+  with the OctopusNet receiver via the 'satip' plugin).
+- Modified the CAM API so that it is possible to implement CAMs that can be freely
+  assigned to any devices.
+- The Yellow button in the "Setup/CAM" menu can now be used to put the selected
+  CAM into a mode where it remains assigned to a device that is tuned to the current
+  channel until the smart card it contains is activated and the CAM thus starts to
+  descramble (see MANUAL, section "Setup/CAM" for details).
+- Fixed cCamSlot::Assign(), so that it actually ignores the value of Query if Device
+  is NULL (as described in the header file).
+
+Satellite Channel Routing:
+
+- Added support for "Satellite Channel Routing" (SCR) according to EN50607, also
+  known as "JESS".
+
+Subtitles:
+
+- Improved displaying DVB subtitles.
+- The debug output now goes into an HTML file named dbg-log.htm and shows the actual
+  bitmaps (dbg-nnn.jpg) used to display the subtitles. That way it is much easier to
+  see what's actually going on.
+- The new function cOsd::DrawScaledBitmap() is now used for drawing subtitles.
+  This function can be reimplemented by high level OSDs which may be able to do
+  the scaling in hardware or otherwise more efficiently.
+- Fixed (well, actually worked around) a problem with subtitles not being displayed
+  because the broadcaster doesn't set the data's version numbers as required by the
+  DVB standard.
+- Added support for PGS subtitles.
+
+Plugins:
+
+- A plugin can implement a custom positioner control (see PLUGINS.html, section "Positioners").
+- The new menu category mcRecordingEdit is now used to mark menus that edit recording
+  properties.
+- The Recordings menu can now be called with a cRecordingFilter, which allows the
+  caller to have it display only a certain subset of the recordings.
+- cDevice::TrickSpeed() now has an additional parameter named Forward, which indicates
+  the direction in which replay is being done. This information may be necessary for
+  some output devices in order to properly implement trick modes. Authors of plugins
+  that implement output devices will need to add this parameter to their derived cDevice
+  class, regardless of whether they will make use of it or not.
+- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+  Plugin authors may want to apply the following change to their Makefile:
+  -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+  +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+- The new function cStatus::ChannelChange() can be implemented by plugins to be
+  informed about changes to the parameters of a channel that may require a retune.
+  This may, for instance, be useful for plugins that implement live streaming, so that
+  they can react on changes to a channel's PIDs or CA descriptors.
+- The new function cOsd::DrawScaledBitmap() is now used for drawing subtitles.
+  This function can be reimplemented by high level OSDs which may be able to do
+  the scaling in hardware or otherwise more efficiently.
+- Use of the function cOsd::GetBitmap() outside of derived classes is now deprecated,
+  and it may be made 'protected' in a future version, since it doesn't work with
+  TrueColor OSDs. Plugin authors may want to modify their code so that it
+  works without this function.
+- Modified the descriptions of several threads, so that the important information
+  (like device or frontend numbers) is within the first 15 characters of the
+  string, because only these are displayed in thread listings. Plugin authors may
+  want to do the same.
+- Plugins can now implement the function SetMenuSortMode() in their skin objects
+  derived from cSkinDisplayMenu, to get informed about the currently used sort
+  mode, if applicable.
+- Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
+  can call to signal a change in the OSD that requires a redraw of the currently
+  displayed object.
+
+Skins:
+
+- The new function cSkinDisplayChannel::SetPositioner() can be implemented by skins to
+  show the user a progress display when the dish is being moved. The default implementation
+  calls SetMessage() with a string indicating the new position the dish is being moved to.
+  The LCARS skin shows a progress bar indicating the movement of the dish.
+- The LCARS skin now shows the source value of the current channel in its channel display.
+- Plugins can now implement the function SetMenuSortMode() in their skin objects
+  derived from cSkinDisplayMenu, to get informed about the currently used sort
+  mode, if applicable.
+
+Remote control:
+
+- Revised the section on "Learning the remote control keys" in the INSTALL file to
+  avoid the impression that there actually is a default remote.conf file, and to
+  not use any alphabetic keys for special functions, so that they remain available
+  for textual input.
+- The LIRC remote control now connects to the socket even if it doesn't yet exist when
+  VDR is started.
+- Added handling UTF-8 'umlaut' characters to cKbdRemote.
+
+Devices:
+
+- The cDvbTuner now has a new status tsPositioning, in which it waits until a steerable
+  dish has reached its target position. Parsing SI data is paused until the target
+  position has been reached.
+- cDevice::IsPrimaryDevice() now also checks whether the primary device actually has
+  a decoder and returns false otherwise. This should improve device allocation on
+  systems that are only used as a receiver and don't actually display anything.
+- All bonded devices (except for the master) now turn off their LNB power completely
+  to avoid problems when receiving vertically polarized transponders.
+- cDevice::TrickSpeed() now has an additional parameter named Forward, which indicates
+  the direction in which replay is being done. This information may be necessary for
+  some output devices in order to properly implement trick modes. Authors of plugins
+  that implement output devices will need to add this parameter to their derived cDevice
+  class, regardless of whether they will make use of it or not.
+- Now checking whether the primary device actually has a decoder before retuning the
+  current channel after a change in its parameters. This fixes broken recordings on
+  the primary device on "headless" systems.
+- Refactored setup parameter handling for output devices:
+  + The function cDevice::GetVideoSystem() has been deprecated and will be removed
+    in a future version. In order to check whether a particular plugin needs to be
+    modified if this function is removed, you can comment out the line
+    #define DEPRECATED_VIDEOSYSTEM
+    in device.h.
+  + Handling the "video (display) format" (things like 16:9, 4:3, pan&scan, letterbox
+    etc) shall now be done by the individual output devices, because the types and
+    numbers of parameters are too device specific. The Setup/DVB parameters
+    "Video format" and "Video display format" are still there for now and can be used
+    by SD devices. HD devices, however, shall not use these parameters (any more),
+    but rather implement their own setup menu with the necessary parameters for
+    controlling output.
+  + The dvbhdffdevice plugin has been modified accordingly.
+  + Made it clear that cDevice::SetDigitalAudioDevice() merely tells the output device
+    that the current audio track is Dolby Digital. This function was only used by the
+    original "full featured" DVB cards - do not use it for new developments!
+    If an output device has several ways of replaying audio (like HDMI or analog jack)
+    it shall implement the proper options in its plugin's SetupMenu() function.
+- Added support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters.
+- Added subsystem id support for DVB devices connected via USB.
+
+DiSEqC:
+
+- The new DiSEqC command code 'P' can be used to instruct a positioner to move the
+  dish to the required satellite position. When a 'P' code is processed, further
+  execution of the remaining DiSEqC sequence (if any) is postponed until the positioner
+  has reached the new satellite position.
+
+EPG:
+
+- Added Begin/EndSegmentTransfer() to the EPG handler interface.
+
+OSD:
+
+- In the "Select folder" menu pressing Ok now selects the folder, even if this is a
+  folder that contains sub folders (marked with "..."). To open such a folder you
+  can press the Red key.
+- The Recordings menu now remembers the last recording the cursor was positioned on,
+  independent of the last replayed recording. When a replay ends, however, the cursor
+  will initially be positioned to the last replayed recording again when the menu
+  is opened.
+- Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
+  can call to signal a change in the OSD that requires a redraw of the currently
+  displayed object.
+- The "Select folder" menu now adds the folder names of all existing recordings to
+  any names that have been predefined in "folders.conf".
+- Fixed an inconsistent behavior between opening the Recordings menu manually via the
+  main menu and by pressing the Recordings key. In the latter case it automatically
+  opened all sub folders to position the cursor to the last replayed recording, which
+  is unexpected at this point. You can still navigate to
+  the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
+  menu.
+
+Channels:
+
+- Channels that are no longer contained in the current SDT of a transponder are now
+  marked with the keyword OBSOLETE in their name and provider fields. That way you can
+  identify obsolete channels when you switch to them, and you can get the complete
+  overview of all obsolete channels by sorting the Channels list by provider (by
+  pressing the 0 key twice). Automatic deletion of obsolete channels may follow later.
+- Added support for LCN (Logical Channel Numbers), which plugins may use to sort
+  channels.
+- Added "NORDIG" to the list of "DVB/Standard compliance" options and using it to
+  restrict the LCN (Logical Channel Numbers) parsing to networks that actually use
+  this non-standard feature.
+
+Recordings:
+
+- The code for distributing recordings over several video directories has been
+  removed. VDR now by default assumes that the video directory is one big disk.
+  Distributing the video directory over several disks was a useful feature in times
+  when disks were still relatively small, but it also caused serious problems in case
+  one of the disks failed. Nowadays hard disks come in sizes measured in terabytes,
+  and tools like "mhddfs" can be used to combine several disks to form one large volume.
+  A recommended method for a relatively safe disk setup in a VDR system is to use two
+  1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
+  fails, you can replace it without data loss.
+- If you absolutely need to use several separate disks to store recordings, you can
+  write a plugin that uses the new cVideoDirectory API to implement the necessary
+  functionality (see PLUGINS.html, section "The video directory"). You can copy the
+  respective code from previous versions of videodir.c.
+  IMPORTANT NOTE: If you write a plugin that implements a distributed video directory,
+  =============== be sure to make cVideoDirectory::Rename() follow symbolic links!
+                  This functionality was never implemented in VDR and it therefore
+                  used a workaround in cutter.c. See the section marked with
+                  // XXX this can be removed once RenameVideoFile() follows symlinks
+                  in previous versions of cutter.c.
+  + CloseVideoFile() is obsolete and has been removed.
+  + The functions OpenVideoFile(), RenameVideoFile(), RemoveVideoFile(), VideoFileSpaceAvailable(),
+    VideoDiskSpace(), RemoveEmptyVideoDirectories(), IsOnVideoDirectoryFileSystem() and
+    PrefixVideoFileName() are now static members of cVideoDirectory and need to be called
+    with the proper prefix.
+  + The name of the video directory is now available through cVideoDirectory::Name().
+- Added renaming and moving recordings and folders, editing a recording's priority and
+  lifetime, and queueing cutting jobs.
+  + The "Recording info" menu now has a new Blue button named "Edit", which opens a
+    dialog in which several properties of the selected recording can be changed. It can
+    be renamed or moved into another folder and its priority and lifetime can be
+    modified.
+    The new blue "Edit" button in the "Recordings" menu opens a dialog in which a folder
+    can be renamed or moved. See MANUAL, section "Managing folders".
+  + In the "Edit recording" menu the Yellow button ("Delete marks") allows you to delete
+    all editing marks of the selected recording.
+  + cCutter is no longer a static class. Cutting requests should now be invoked by
+    calling RecordingsHandler.Add(ruCut, FileName). See the new cRecordingsHandler
+    class in recording.h.
+  + Cutting jobs are now placed in a queue (together with any move or copy jobs) and
+    are processed one by one.
+  + The new SVDRP command MOVR can be used to rename a recording
+  + Note that in several places in the source code a "copy" operation is mentioned,
+    however there is no user interface for this, yet.
+- The function cRecordings::MBperMinute() now only takes into account recordings with
+  less than 5 seconds per megabyte, in an attempt to filter out radio recordings
+  The result of this function was way off any realistic
+  value in case there are many radio recordings in the video directory.
+- When cutting a recording it is now checked whether there is already an edited
+  version of this recording (with the same name, but starting with '%'), and the
+  user is prompted for confirmation to overwrite it.
+- Fixed numbering frames. Previously they were numbered starting from 1, while it
+  is apparently standard to number them from 0. Any existing recordings with editing
+  marks (which will now be off by one) can still be cut with all VDR versions from
+  1.7.32, because these will automatically adjust editing marks to I-frames.
+  Users of stable releases shouldn't notice any problems.
+- Now returning from removing deleted recordings after at most 10 seconds, or if the
+  user presses a remote control key, to keep the system from getting unresponsive
+  when removing a huge number of files.
+- Fixed generating the index file of an existing recording in case at the end of a TS file
+  there is less data in the buffer than needed by the frame detector. In such a case
+  it was possible that frames were missed, and there was most likely a distortion
+  when replaying that part of a recording. This is mostly a problem for recordings that
+  consist of more than one *.ts file. Single file recordings could only lose some
+  frames at their very end, which probably doesn't matter. At any rate, if you have
+  generated an index file with VDR version 2.0.6, 2.1.5 or 2.1.6, you may want to
+  do so again with this version to make sure the index is OK.
+- Added the new command line option --updindex, which can be used to update an
+  incomplete index of a recording.
+- In the "Edit recording" menu the '0' key can now be used on the "Name:" field to
+  remove the name of the recording and replace it with the last element of the
+  recording's folder path name. See MANUAL, section "Managing folders" for details.
+
+Replay:
+
+- The new option "Setup/Replay/Pause replay when jumping to a mark" can be used to
+  turn off pausing replay when jumping to an editing mark with the '9' key.
+- The new option "Setup/Replay/Skip edited parts" can be used to automatically skip
+  the edited parts of a recording during replay, without the need to actually cut
+  the recording.
+- The new option "Setup/Replay/Pause replay at last mark" can be used to make replay
+  go into Pause mode when it has reached the last "end" mark.
+- The '8' key for testing an edited sequence now also jumps to the next *end*
+  mark if "Setup/Replay/Skip edited parts" is active. This allows for testing edits
+  in recordings that have actually been cut, as well as recordings that have not
+  been cut, in case "Skip edited parts" is enabled.
+- A recording is now still considered unviewed when stopping replay within 10 seconds
+  of the first mark.
+- The keys '1' and '3' can now be used in replay mode to position an editing mark
+  in "adaptive" mode. See MANUAL, section "Editing a Recording".
+- The new option "Setup/Replay/Alternate behavior for adaptive skipping" can be used
+  to make adaptive skipping only halve the skip distance when the direction changes.
+  That way you can reach the desired point in a recording even if you make one too
+  many skips in a certain direction (see MANUAL for details).
+
+SVDRP:
+
+- The new SVDRP command MOVR can be used to rename a recording
+
+Audio:
+
+- Added the new parameters "Setup/Miscellaneous/Volume steps" and
+  ".../Volume linearize". See the MANUAL for details.
+- Added handling for DTS audio tracks to cPatPmtParser::ParsePmt().
+
+Misc:
+
+- Reverted the change from version 1.5.7 that made all logging go to LOG_ERR.
+- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
+  is set to "do not pause live video".
+- Added code for parsing LCN and AVC descriptors to libsi.
+- Changes in the teletext PID no longer cause retuning (and thus interrupting a
+  recording).
+- Made it clear that the Data parameter in cDevice::StillPicture() may point to a
+  series of packets, not just a single one.
+- Changed '%a' to the POSIX compliant '%m' in all scanf() calls.
+- cTSBuffer now provides the number of available bytes in its Get() function.
+- The script given to VDR with the '-r' option is now also called after the recording
+  process has actually started.
+- Updated 'sources.conf'.
+- Increased MIN_TS_PACKETS_FOR_FRAME_DETECTOR to 100 and introduced counting the number
+  of actual video TS packets in cTsPayload in order to be able to record channels that
+  sometimes need many TS packets for detecting frame borders.
+- Improved PAT/PMT scanning to speed up initial tuning to encrypted channels on
+  transponders with many PAT entries.
+- The SDT is now only parsed *after* the NIT has been read, and it explicitly uses
+  the source value derived from the NIT. This should prevent new channels from being
+  created with the wrong source.
+- Added support for systemd. To activate this you need to add "SDNOTIFY=1" to the
+  'make' call.
+- No longer logging an error message in DirSizeMB() if the given directory doesn't
+  exist. This avoids lots of log entries in case several VDRs use the same video
+  directory and one of them has already physically removed a recording directory,
+  while the others still have it in their list of deleted recordings.
+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d.
+  See vdr.1 and vdr.5 for details.
+- Added the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
+  to the cVector class.
+- Added functions to set and retrieve the priority of a cReceiver.
+- Changed the German weekday names from "MonDieMitDonFreSamSon" to
+  "Mo.Di.Mi.Do.Fr.Sa.So.".
+- Added the channel name to log messages that reference a channel.
+- Added ARGSDIR to the ONEDIR section of Make.config.template.
+- Added SDNOTIFY, NO_KBD and BIDI to Make.config.template.
+- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
+- Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
+  two separate positions.
+- Fixed cMarks::GetNextBegin() and cMarks::GetNextEnd(). The behavior of these two
+  functions is now exacly as described in the header file. Editing marks that are
+  placed at exactly the same offset in a recording are now preserved in the cutting
+  process.
diff --git a/ci.c b/ci.c
index b1958bdcb..ffc7ff712 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.18 2015/01/30 12:24:53 kls Exp $
+ * $Id: ci.c 3.19 2015/02/02 13:57:39 kls Exp $
  */
 
 #include "ci.h"
@@ -1776,7 +1776,7 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
      if (ciAdapter->Assign(Device, true)) {
         if (!Device && assignedDevice)
            assignedDevice->SetCamSlot(NULL);
-        if (!Query) {
+        if (!Query || !Device) {
            StopDecrypting();
            source = transponder = 0;
            if (ciAdapter->Assign(Device)) {
diff --git a/config.c b/config.c
index 9e6f301be..37f905880 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.6 2015/01/29 09:01:30 kls Exp $
+ * $Id: config.c 3.8 2015/02/06 10:10:22 kls Exp $
  */
 
 #include "config.h"
@@ -473,8 +473,9 @@ cSetup::cSetup(void)
   PauseOnMarkJump = 1;
   SkipEdited = 0;
   PauseAtLastMark = 0;
-  BinarySkipInitial = 120;
-  BinarySkipTimeout = 3;
+  AdaptiveSkipInitial = 120;
+  AdaptiveSkipTimeout = 3;
+  AdaptiveSkipAlternate = 0;
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
@@ -691,8 +692,9 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "PauseOnMarkJump"))     PauseOnMarkJump    = atoi(Value);
   else if (!strcasecmp(Name, "SkipEdited"))          SkipEdited         = atoi(Value);
   else if (!strcasecmp(Name, "PauseAtLastMark"))     PauseAtLastMark    = atoi(Value);
-  else if (!strcasecmp(Name, "BinarySkipInitial"))   BinarySkipInitial  = atoi(Value);
-  else if (!strcasecmp(Name, "BinarySkipTimeout"))   BinarySkipTimeout  = atoi(Value);
+  else if (!strcasecmp(Name, "AdaptiveSkipInitial")) AdaptiveSkipInitial= atoi(Value);
+  else if (!strcasecmp(Name, "AdaptiveSkipTimeout")) AdaptiveSkipTimeout= atoi(Value);
+  else if (!strcasecmp(Name, "AdaptiveSkipAlternate")) AdaptiveSkipAlternate = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
@@ -813,8 +815,9 @@ bool cSetup::Save(void)
   Store("PauseOnMarkJump",    PauseOnMarkJump);
   Store("SkipEdited",         SkipEdited);
   Store("PauseAtLastMark",    PauseAtLastMark);
-  Store("BinarySkipInitial",  BinarySkipInitial);
-  Store("BinarySkipTimeout",  BinarySkipTimeout);
+  Store("AdaptiveSkipInitial",AdaptiveSkipInitial);
+  Store("AdaptiveSkipTimeout",AdaptiveSkipTimeout);
+  Store("AdaptiveSkipAlternate", AdaptiveSkipAlternate);
   Store("ResumeID",           ResumeID);
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
diff --git a/config.h b/config.h
index 6eeda2cca..5a81fd028 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.13 2015/01/27 10:50:11 kls Exp $
+ * $Id: config.h 3.17 2015/02/06 09:53:50 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.8"
-#define VDRVERSNUM   20108  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.9"
+#define VDRVERSNUM   20109  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.8"
-#define APIVERSNUM   20108  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.9"
+#define APIVERSNUM   20109  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -65,6 +65,7 @@
 
 #define STANDARD_DVB       0
 #define STANDARD_ANSISCTE  1
+#define STANDARD_NORDIG    2
 
 typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
 
@@ -336,8 +337,9 @@ class cSetup : public cConfig<cSetupLine> {
   int PauseOnMarkJump;
   int SkipEdited;
   int PauseAtLastMark;
-  int BinarySkipInitial;
-  int BinarySkipTimeout;
+  int AdaptiveSkipInitial;
+  int AdaptiveSkipTimeout;
+  int AdaptiveSkipAlternate;
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
diff --git a/dvbplayer.c b/dvbplayer.c
index 0d7b3904e..94882e29a 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 3.3 2015/02/01 10:45:41 kls Exp $
+ * $Id: dvbplayer.c 3.5 2015/02/06 15:08:51 kls Exp $
  */
 
 #include "dvbplayer.h"
 #include <math.h>
 #include <stdlib.h>
-#include "recording.h"
 #include "remux.h"
 #include "ringbuffer.h"
 #include "thread.h"
@@ -211,7 +210,7 @@ class cDvbPlayer : public cPlayer, cThread {
   cNonBlockingFileReader *nonBlockingFileReader;
   cRingBufferFrame *ringBuffer;
   cPtsIndex ptsIndex;
-  cMarks marks;
+  cMarks *marks;
   cFileName *fileName;
   cIndexFile *index;
   cUnbufferedFile *replayFile;
@@ -240,6 +239,7 @@ class cDvbPlayer : public cPlayer, cThread {
 public:
   cDvbPlayer(const char *FileName, bool PauseLive);
   virtual ~cDvbPlayer();
+  void SetMarks(cMarks *Marks);
   bool Active(void) { return cThread::Running(); }
   void Pause(void);
   void Play(void);
@@ -265,6 +265,7 @@ cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive)
 {
   nonBlockingFileReader = NULL;
   ringBuffer = NULL;
+  marks = NULL;
   index = NULL;
   cRecording Recording(FileName);
   framesPerSecond = Recording.FramesPerSecond();
@@ -297,8 +298,6 @@ cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive)
      }
   else if (PauseLive)
      framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default
-  if (Setup.SkipEdited || Setup.PauseAtLastMark)
-     marks.Load(FileName, framesPerSecond, isPesRecording);
 }
 
 cDvbPlayer::~cDvbPlayer()
@@ -309,6 +308,12 @@ cDvbPlayer::~cDvbPlayer()
   delete index;
   delete fileName;
   delete ringBuffer;
+  // don't delete marks here, we don't own them!
+}
+
+void cDvbPlayer::SetMarks(cMarks *Marks)
+{
+  marks = Marks;
 }
 
 void cDvbPlayer::TrickSpeed(int Increment)
@@ -377,6 +382,12 @@ bool cDvbPlayer::Save(void)
   if (index) {
      int Index = ptsIndex.FindIndex(DeviceGetSTC());
      if (Index >= 0) {
+        if (Setup.SkipEdited && marks) {
+           marks->Lock();
+           if (marks->First() && abs(Index - marks->First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
+              Index = 0; // when stopping within RESUMEBACKUP seconds of the first mark the recording shall still be considered unviewed
+           marks->Unlock();
+           }
         Index -= int(round(RESUMEBACKUP * framesPerSecond));
         if (Index > 0)
            Index = index->GetNextIFrame(Index, false);
@@ -407,9 +418,10 @@ void cDvbPlayer::Action(void)
   readIndex = Resume();
   if (readIndex > 0)
      isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
-  else if (Setup.SkipEdited) {
-     if (marks.First() && index) {
-        int Index = marks.First()->Position();
+  else if (Setup.SkipEdited && marks) {
+     marks->Lock();
+     if (marks->First() && index) {
+        int Index = marks->First()->Position();
         uint16_t FileNumber;
         off_t FileOffset;
         if (index->Get(Index, &FileNumber, &FileOffset) && NextFile(FileNumber, FileOffset)) {
@@ -417,6 +429,7 @@ void cDvbPlayer::Action(void)
            readIndex = Index;
            }
         }
+     marks->Unlock();
      }
 
   nonBlockingFileReader = new cNonBlockingFileReader;
@@ -486,11 +499,11 @@ void cDvbPlayer::Action(void)
                       off_t FileOffset;
                       if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset)) {
                          readIndex++;
-                         if (Setup.SkipEdited || Setup.PauseAtLastMark) {
-                            marks.Update();
-                            cMark *m = marks.Get(readIndex);
+                         if ((Setup.SkipEdited || Setup.PauseAtLastMark) && marks) {
+                            marks->Lock();
+                            cMark *m = marks->Get(readIndex);
                             if (m && (m->Index() & 0x01) != 0) { // we're at an end mark
-                               m = marks.GetNextBegin(m);
+                               m = marks->GetNextBegin(m);
                                int Index = -1;
                                if (m)
                                   Index = m->Position(); // skip to next begin mark
@@ -506,6 +519,7 @@ void cDvbPlayer::Action(void)
                                   CutIn = true;
                                   }
                                }
+                            marks->Unlock();
                             }
                          }
                       else
@@ -929,6 +943,12 @@ cDvbPlayerControl::~cDvbPlayerControl()
   Stop();
 }
 
+void cDvbPlayerControl::SetMarks(cMarks *Marks)
+{
+  if (player)
+     player->SetMarks(Marks);
+}
+
 bool cDvbPlayerControl::Active(void)
 {
   return player && player->Active();
diff --git a/dvbplayer.h b/dvbplayer.h
index 678c9693a..7094454d6 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,13 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 3.1 2015/02/01 11:20:54 kls Exp $
+ * $Id: dvbplayer.h 3.2 2015/02/06 12:27:39 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
 #define __DVBPLAYER_H
 
 #include "player.h"
+#include "recording.h"
 #include "thread.h"
 
 class cDvbPlayer;
@@ -25,6 +26,7 @@ class cDvbPlayerControl : public cControl {
        // file of the recording is long enough to allow the player to display
        // the first frame in still picture mode.
   virtual ~cDvbPlayerControl();
+  void SetMarks(cMarks *Marks);
   bool Active(void);
   void Stop(void);
        // Stops the current replay session (if any).
diff --git a/eit.c b/eit.c
index 30c017b5c..1f960bb2b 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 3.5 2014/02/08 14:20:27 kls Exp $
+ * $Id: eit.c 3.6 2015/02/01 14:55:27 kls Exp $
  */
 
 #include "eit.h"
@@ -136,8 +136,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                     UseExtendedEventDescriptor = true;
                     }
                  if (UseExtendedEventDescriptor) {
-                    ExtendedEventDescriptors->Add(eed);
-                    d = NULL; // so that it is not deleted
+                    if (ExtendedEventDescriptors->Add(eed))
+                       d = NULL; // so that it is not deleted
                     }
                  if (eed->getDescriptorNumber() == eed->getLastDescriptorNumber())
                     UseExtendedEventDescriptor = false;
diff --git a/libsi/si.c b/libsi/si.c
index 0ef393977..3d5169f66 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 3.1 2013/10/30 10:16:18 kls Exp $
+ *   $Id: si.c 3.2 2015/02/01 14:55:27 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -198,17 +198,18 @@ void DescriptorGroup::Delete() {
       }
 }
 
-void DescriptorGroup::Add(GroupDescriptor *d) {
+bool DescriptorGroup::Add(GroupDescriptor *d) {
    if (!array) {
       length=d->getLastDescriptorNumber()+1;
       array=new GroupDescriptor*[length]; //numbering is zero-based
       for (int i=0;i<length;i++)
          array[i]=0;
    } else if (length != d->getLastDescriptorNumber()+1)
-      return; //avoid crash in case of misuse
+      return false; //avoid crash in case of misuse
    if (length <= d->getDescriptorNumber())
-      return; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
+      return false; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
    array[d->getDescriptorNumber()]=d;
+   return true;
 }
 
 bool DescriptorGroup::isComplete() {
diff --git a/libsi/si.h b/libsi/si.h
index 1e65111f9..7c6f0e3ee 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 3.2 2014/02/08 14:11:32 kls Exp $
+ *   $Id: si.h 3.3 2015/02/01 14:55:27 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -483,7 +483,7 @@ class DescriptorGroup {
 public:
    DescriptorGroup(bool deleteOnDesctruction=true);
    ~DescriptorGroup();
-   void Add(GroupDescriptor *d);
+   bool Add(GroupDescriptor *d);
    void Delete();
    int getLength() { return length; }
    GroupDescriptor **getDescriptors() { return array; }
diff --git a/menu.c b/menu.c
index 16f98c453..6906cc65a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.35 2015/02/01 10:42:11 kls Exp $
+ * $Id: menu.c 3.46 2015/02/07 15:56:26 kls Exp $
  */
 
 #include "menu.h"
@@ -766,8 +766,48 @@ void cMenuFolder::SetHelpKeys(void)
      }
 }
 
+#define FOLDERDELIMCHARSUBST 0x01
+static void AddRecordingFolders(cList<cNestedItem> *List, char *Path)
+{
+  if (Path) {
+     char *p = strchr(Path, FOLDERDELIMCHARSUBST);
+     if (p)
+        *p++ = 0;
+     cNestedItem *Folder;
+     for (Folder = List->First(); Folder; Folder = List->Next(Folder)) {
+         if (strcmp(Path, Folder->Text()) == 0)
+            break;
+         }
+     if (!Folder)
+        List->Add(Folder = new cNestedItem(Path));
+     if (p) {
+        Folder->SetSubItems(true);
+        AddRecordingFolders(Folder->SubItems(), p);
+        }
+     }
+  else {
+     cThreadLock RecordingsLock(&Recordings);
+     cStringList Dirs;
+     for (cRecording *Recording = Recordings.First(); Recording; Recording = Recordings.Next(Recording)) {
+         cString Folder = Recording->Folder();
+         strreplace((char *)*Folder, FOLDERDELIMCHAR, FOLDERDELIMCHARSUBST); // makes sure parent folders come before subfolders
+         if (Dirs.Find(Folder) < 0)
+            Dirs.Append(strdup(Folder));
+         }
+     Dirs.Sort();
+     for (int i = 0; i < Dirs.Size(); i++) {
+         char *s = Dirs[i];
+         if (*s)
+            AddRecordingFolders(&Folders, s);
+         }
+     }
+}
+
 void cMenuFolder::Set(const char *CurrentFolder)
 {
+  static int RecordingsState = -1;
+  if (list == &Folders && Recordings.StateChanged(RecordingsState))
+     AddRecordingFolders(&Folders, NULL);
   firstFolder = NULL;
   Clear();
   if (!isempty(dir)) {
@@ -1377,6 +1417,7 @@ void cMenuScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bo
 class cMenuWhatsOn : public cOsdMenu {
 private:
   bool now;
+  bool canSwitch;
   int helpKeys;
   int timerState;
   eOSState Record(void);
@@ -1401,7 +1442,8 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 {
   SetMenuCategory(Now ? mcScheduleNow : mcScheduleNext);
   now = Now;
-  helpKeys = -1;
+  canSwitch = false;
+  helpKeys = 0;
   timerState = 0;
   Timers.Modified(timerState);
   for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
@@ -1434,16 +1476,27 @@ bool cMenuWhatsOn::Update(void)
 void cMenuWhatsOn::SetHelpKeys(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
+  canSwitch = false;
   int NewHelpKeys = 0;
   if (item) {
      if (item->timerMatch == tmFull)
-        NewHelpKeys = 2;
+        NewHelpKeys |= 0x02; // "Timer"
      else
-        NewHelpKeys = 1;
+        NewHelpKeys |= 0x01; // "Record"
+     if (now)
+        NewHelpKeys |= 0x04; // "Next"
+     else
+        NewHelpKeys |= 0x08; // "Now"
+     if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
+        if (Channel->Number() != cDevice::CurrentChannel()) {
+           NewHelpKeys |= 0x10; // "Switch"
+           canSwitch = true;
+           }
+        }
      }
   if (NewHelpKeys != helpKeys) {
      const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
-     SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
+     SetHelp(Red[NewHelpKeys & 0x03], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), canSwitch ? tr("Button$Switch") : NULL);
      helpKeys = NewHelpKeys;
      }
 }
@@ -1519,10 +1572,12 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                           }
                      }
                      break;
-       case kBlue:   return Switch();
+       case kBlue:   if (canSwitch)
+                        return Switch();
+                     break;
        case kInfo:
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true, true));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
                      break;
        default:      break;
        }
@@ -1543,7 +1598,7 @@ class cMenuSchedule : public cOsdMenu {
   cSchedulesLock schedulesLock;
   const cSchedules *schedules;
   bool now, next;
-  int otherChannel;
+  bool canSwitch;
   int helpKeys;
   int timerState;
   eOSState Number(void);
@@ -1566,8 +1621,8 @@ cMenuSchedule::cMenuSchedule(void)
 {
   SetMenuCategory(mcSchedule);
   now = next = false;
-  otherChannel = 0;
-  helpKeys = -1;
+  canSwitch = false;
+  helpKeys = 0;
   timerState = 0;
   Timers.Modified(timerState);
   cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
@@ -1673,16 +1728,23 @@ bool cMenuSchedule::Update(void)
 void cMenuSchedule::SetHelpKeys(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
+  canSwitch = false;
   int NewHelpKeys = 0;
   if (item) {
      if (item->timerMatch == tmFull)
-        NewHelpKeys = 2;
+        NewHelpKeys |= 0x02; // "Timer"
      else
-        NewHelpKeys = 1;
+        NewHelpKeys |= 0x01; // "Record"
+     if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
+        if (Channel->Number() != cDevice::CurrentChannel()) {
+           NewHelpKeys |= 0x10; // "Switch"
+           canSwitch = true;
+           }
+        }
      }
   if (NewHelpKeys != helpKeys) {
      const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
-     SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
+     SetHelp(Red[NewHelpKeys & 0x03], tr("Button$Now"), tr("Button$Next"), canSwitch ? tr("Button$Switch") : NULL);
      helpKeys = NewHelpKeys;
      }
 }
@@ -1748,9 +1810,12 @@ eOSState cMenuSchedule::Record(void)
 
 eOSState cMenuSchedule::Switch(void)
 {
-  if (otherChannel) {
-     if (Channels.SwitchTo(otherChannel))
-        return osEnd;
+  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
+  if (item) {
+     if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
+        if (Channels.SwitchTo(Channel->Number()))
+           return osEnd;
+        }
      }
   Skins.Message(mtError, tr("Can't switch channel!"));
   return osContinue;
@@ -1784,12 +1849,12 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        case kYellow: if (schedules)
                         return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
                      break;
-       case kBlue:   if (Count() && otherChannel)
+       case kBlue:   if (canSwitch)
                         return Switch();
                      break;
        case kInfo:
        case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel, true));
+                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
                      break;
        default:      break;
        }
@@ -1802,10 +1867,6 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
         if (channel) {
            cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
            PrepareScheduleAllThis(NULL, channel);
-           if (channel->Number() != cDevice::CurrentChannel()) {
-              otherChannel = channel->Number();
-              SetHelp(Count() ? tr("Button$Record") : NULL, tr("Button$Now"), tr("Button$Next"), tr("Button$Switch"));
-              }
            Display();
            }
         }
@@ -2190,8 +2251,10 @@ eOSState cMenuPathEdit::Folder(void)
 
 eOSState cMenuPathEdit::ApplyChanges(void)
 {
-  if (!*name)
+  if (!*name) {
      *name = ' '; // name must not be empty!
+     name[1] = 0;
+     }
   cString NewPath = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
   NewPath.CompactChars(FOLDERDELIMCHAR);
   if (strcmp(NewPath, path)) {
@@ -2239,6 +2302,7 @@ class cMenuRecordingEdit : public cOsdMenu {
   int priority;
   int lifetime;
   cMenuEditStrItem *folderItem;
+  cMenuEditStrItem *nameItem;
   const char *buttonFolder;
   const char *buttonAction;
   const char *buttonDeleteMarks;
@@ -2251,6 +2315,7 @@ class cMenuRecordingEdit : public cOsdMenu {
   eOSState SetFolder(void);
   eOSState Folder(void);
   eOSState Action(void);
+  eOSState RemoveName(void);
   eOSState DeleteMarks(void);
   eOSState ApplyChanges(void);
 public:
@@ -2270,6 +2335,7 @@ cMenuRecordingEdit::cMenuRecordingEdit(cRecording *Recording)
   priority = recording->Priority();
   lifetime = recording->Lifetime();
   folderItem = NULL;
+  nameItem = NULL;
   buttonFolder = NULL;
   buttonAction = NULL;
   buttonDeleteMarks = NULL;
@@ -2287,7 +2353,7 @@ void cMenuRecordingEdit::Set(void)
   cOsdItem *p;
   Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
   p->SetSelectable(!recordingIsInUse);
-  Add(p = new cMenuEditStrItem(tr("Name"), name, sizeof(name)));
+  Add(p = nameItem = new cMenuEditStrItem(tr("Name"), name, sizeof(name)));
   p->SetSelectable(!recordingIsInUse);
   Add(p = new cMenuEditIntItem(tr("Priority"), &priority, 0, MAXPRIORITY));
   p->SetSelectable(!recordingIsInUse);
@@ -2366,6 +2432,24 @@ eOSState cMenuRecordingEdit::Action(void)
   return osContinue;
 }
 
+eOSState cMenuRecordingEdit::RemoveName(void)
+{
+  if (Get(Current()) == nameItem) {
+     if (Interface->Confirm(tr("Rename recording to folder name?"))) {
+        char *s = strrchr(folder, FOLDERDELIMCHAR);
+        if (s)
+           *s++ = 0;
+        else
+           s = folder;
+        strn0cpy(name, s, sizeof(name));
+        if (s == folder)
+           *s = 0;
+        Set();
+        }
+     }
+  return osContinue;
+}
+
 eOSState cMenuRecordingEdit::DeleteMarks(void)
 {
   if (buttonDeleteMarks && Interface->Confirm(tr("Delete editing marks for this recording?"))) {
@@ -2387,8 +2471,10 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
         }
      Modified = true;
      }
-  if (!*name)
+  if (!*name) {
      *name = ' '; // name must not be empty!
+     name[1] = 0;
+     }
   cString NewName = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
   NewName.CompactChars(FOLDERDELIMCHAR);
   if (strcmp(NewName, recording->Name())) {
@@ -2414,6 +2500,7 @@ eOSState cMenuRecordingEdit::ProcessKey(eKeys Key)
   eOSState state = cOsdMenu::ProcessKey(Key);
   if (state == osUnknown) {
      switch (Key) {
+       case k0:      return RemoveName();
        case kRed:    return buttonFolder ? Folder() : osContinue;
        case kGreen:  return buttonAction ? Action() : osContinue;
        case kYellow: return buttonDeleteMarks ? DeleteMarks() : osContinue;
@@ -3181,7 +3268,7 @@ class cMenuSetupDVB : public cMenuSetupBase {
   void Setup(void);
   const char *videoDisplayFormatTexts[3];
   const char *updateChannelsTexts[6];
-  const char *standardComplianceTexts[2];
+  const char *standardComplianceTexts[3];
 public:
   cMenuSetupDVB(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -3207,6 +3294,7 @@ cMenuSetupDVB::cMenuSetupDVB(void)
   updateChannelsTexts[5] = tr("add new transponders");
   standardComplianceTexts[0] = "DVB";
   standardComplianceTexts[1] = "ANSI/SCTE";
+  standardComplianceTexts[2] = "NORDIG";
 
   SetSection(tr("DVB"));
   SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL);
@@ -3220,7 +3308,7 @@ void cMenuSetupDVB::Setup(void)
   Clear();
 
   Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
-  Add(new cMenuEditStraItem(tr("Setup.DVB$Standard compliance"),   &data.StandardCompliance, 2, standardComplianceTexts));
+  Add(new cMenuEditStraItem(tr("Setup.DVB$Standard compliance"),   &data.StandardCompliance, 3, standardComplianceTexts));
   Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"),          &data.VideoFormat, "4:3", "16:9"));
   if (data.VideoFormat == 0)
      Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
@@ -3639,8 +3727,9 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay when jumping to a mark"), &data.PauseOnMarkJump));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Skip edited parts"), &data.SkipEdited));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay at last mark"), &data.PauseAtLastMark));
-  Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip initial value (s)"), &data.BinarySkipInitial, 10, 600));
-  Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip timeout (s)"), &data.BinarySkipTimeout, 0, 10));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Initial duration for adaptive skipping (s)"), &data.AdaptiveSkipInitial, 10, 600));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Reset timeout for adaptive skipping (s)"), &data.AdaptiveSkipTimeout, 0, 10));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Alternate behavior for adaptive skipping"), &data.AdaptiveSkipAlternate));
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
@@ -4980,9 +5069,9 @@ bool cRecordControls::StateChanged(int &State)
   return Result;
 }
 
-// --- cBinarySkipper --------------------------------------------------------
+// --- cAdaptiveSkipper ------------------------------------------------------
 
-cBinarySkipper::cBinarySkipper(void)
+cAdaptiveSkipper::cAdaptiveSkipper(void)
 {
   initialValue = NULL;
   currentValue = 0;
@@ -4990,14 +5079,14 @@ cBinarySkipper::cBinarySkipper(void)
   lastKey = kNone;
 }
 
-void cBinarySkipper::Initialize(int *InitialValue, double FramesPerSecond)
+void cAdaptiveSkipper::Initialize(int *InitialValue, double FramesPerSecond)
 {
   initialValue = InitialValue;
   framesPerSecond = FramesPerSecond;
   currentValue = 0;
 }
 
-int cBinarySkipper::GetValue(eKeys Key)
+int cAdaptiveSkipper::GetValue(eKeys Key)
 {
   if (!initialValue)
      return 0;
@@ -5007,9 +5096,12 @@ int cBinarySkipper::GetValue(eKeys Key)
      }
   else if (Key != lastKey) {
      currentValue /= 2;
-     lastKey = kNone; // once the direction has changed, every further call halves the value
+     if (Setup.AdaptiveSkipAlternate)
+        lastKey = Key; // only halve the value when the direction is changed
+     else
+        lastKey = kNone; // once the direction has changed, every further call halves the value
      }
-  timeout.Set(Setup.BinarySkipTimeout * 1000);
+  timeout.Set(Setup.AdaptiveSkipTimeout * 1000);
   return max(currentValue, 1);
 }
 
@@ -5034,7 +5126,8 @@ cReplayControl::cReplayControl(bool PauseLive)
   cRecording Recording(fileName);
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
   marks.Load(fileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
-  binarySkipper.Initialize(&Setup.BinarySkipInitial, Recording.FramesPerSecond());
+  SetMarks(&marks);
+  adaptiveSkipper.Initialize(&Setup.AdaptiveSkipInitial, Recording.FramesPerSecond());
   SetTrackDescriptions(false);
   if (Setup.ProgressDisplayTime)
      ShowTimed(Setup.ProgressDisplayTime);
@@ -5303,10 +5396,15 @@ void cReplayControl::MarkToggle(void)
   int Current, Total;
   if (GetIndex(Current, Total, true)) {
      lastCurrent = -1; // triggers redisplay
-     if (cMark *m = marks.Get(Current))
+     if (cMark *m = marks.Get(Current)) {
+        marks.Lock();
         marks.Del(m);
+        marks.Unlock();
+        }
      else {
+        marks.Lock();
         marks.Add(Current);
+        marks.Unlock();
         bool Play, Forward;
         int Speed;
         if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play) {
@@ -5510,9 +5608,9 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         case kMarkMoveForward|k_Repeat:
         case kMarkMoveForward: MarkMove(+1, true); break;
         case kMarkSkipBack|k_Repeat:
-        case kMarkSkipBack:    MarkMove(-binarySkipper.GetValue(RAWKEY(Key)), false); break;
+        case kMarkSkipBack:    MarkMove(-adaptiveSkipper.GetValue(RAWKEY(Key)), false); break;
         case kMarkSkipForward|k_Repeat:
-        case kMarkSkipForward: MarkMove(+binarySkipper.GetValue(RAWKEY(Key)), false); break;
+        case kMarkSkipForward: MarkMove(+adaptiveSkipper.GetValue(RAWKEY(Key)), false); break;
         case kEditCut:         EditCut(); break;
         case kEditTest:        EditTest(); break;
         default: {
diff --git a/menu.h b/menu.h
index f602b9664..fad27afaa 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 3.7 2015/01/27 11:38:20 kls Exp $
+ * $Id: menu.h 3.8 2015/02/06 09:47:30 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -270,7 +270,7 @@ class cRecordControls {
   static bool StateChanged(int &State);
   };
 
-class cBinarySkipper {
+class cAdaptiveSkipper {
 private:
   int *initialValue;
   int currentValue;
@@ -278,7 +278,7 @@ class cBinarySkipper {
   eKeys lastKey;
   cTimeMs timeout;
 public:
-  cBinarySkipper(void);
+  cAdaptiveSkipper(void);
   void Initialize(int *InitialValue, double FramesPerSecond);
   int GetValue(eKeys Key);
   };
@@ -286,7 +286,7 @@ class cBinarySkipper {
 class cReplayControl : public cDvbPlayerControl {
 private:
   cSkinDisplayReplay *displayReplay;
-  cBinarySkipper binarySkipper;
+  cAdaptiveSkipper adaptiveSkipper;
   cMarks marks;
   bool marksModified;
   bool visible, modeOnly, shown, displayFrames;
diff --git a/nit.c b/nit.c
index d9ec1f8f1..13183755c 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 3.4 2015/02/01 13:46:00 kls Exp $
+ * $Id: nit.c 3.5 2015/02/04 09:13:54 kls Exp $
  */
 
 #include "nit.h"
@@ -357,39 +357,41 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                    }
                  }
                  break;
-            case SI::LogicalChannelDescriptorTag: {
-                 SI::LogicalChannelDescriptor *lcd = (SI::LogicalChannelDescriptor *)d;
-                 SI::LogicalChannelDescriptor::LogicalChannel LogicalChannel;
-                 for (SI::Loop::Iterator it4; lcd->logicalChannelLoop.getNext(LogicalChannel, it4); ) {
-                     int lcn = LogicalChannel.getLogicalChannelNumber();
-                     int sid = LogicalChannel.getServiceId();
-                     if (LogicalChannel.getVisibleServiceFlag()) {
-                        for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                            if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                               Channel->SetLcn(lcn);
-                               break;
+            case SI::LogicalChannelDescriptorTag:
+                 if (Setup.StandardCompliance == STANDARD_NORDIG) {
+                    SI::LogicalChannelDescriptor *lcd = (SI::LogicalChannelDescriptor *)d;
+                    SI::LogicalChannelDescriptor::LogicalChannel LogicalChannel;
+                    for (SI::Loop::Iterator it4; lcd->logicalChannelLoop.getNext(LogicalChannel, it4); ) {
+                        int lcn = LogicalChannel.getLogicalChannelNumber();
+                        int sid = LogicalChannel.getServiceId();
+                        if (LogicalChannel.getVisibleServiceFlag()) {
+                           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                               if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                                  Channel->SetLcn(lcn);
+                                  break;
+                                  }
                                }
-                            }
+                           }
                         }
-                     }
-                 }
+                    }
                  break;
-            case SI::HdSimulcastLogicalChannelDescriptorTag: {
-                 SI::HdSimulcastLogicalChannelDescriptor *lcd = (SI::HdSimulcastLogicalChannelDescriptor *)d;
-                 SI::HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel HdSimulcastLogicalChannel;
-                 for (SI::Loop::Iterator it4; lcd->hdSimulcastLogicalChannelLoop.getNext(HdSimulcastLogicalChannel, it4); ) {
-                     int lcn = HdSimulcastLogicalChannel.getLogicalChannelNumber();
-                     int sid = HdSimulcastLogicalChannel.getServiceId();
-                     if (HdSimulcastLogicalChannel.getVisibleServiceFlag()) {
-                        for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                            if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                               Channel->SetLcn(lcn);
-                               break;
+            case SI::HdSimulcastLogicalChannelDescriptorTag:
+                 if (Setup.StandardCompliance == STANDARD_NORDIG) {
+                    SI::HdSimulcastLogicalChannelDescriptor *lcd = (SI::HdSimulcastLogicalChannelDescriptor *)d;
+                    SI::HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel HdSimulcastLogicalChannel;
+                    for (SI::Loop::Iterator it4; lcd->hdSimulcastLogicalChannelLoop.getNext(HdSimulcastLogicalChannel, it4); ) {
+                        int lcn = HdSimulcastLogicalChannel.getLogicalChannelNumber();
+                        int sid = HdSimulcastLogicalChannel.getServiceId();
+                        if (HdSimulcastLogicalChannel.getVisibleServiceFlag()) {
+                           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                               if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                                  Channel->SetLcn(lcn);
+                                  break;
+                                  }
                                }
-                            }
+                           }
                         }
-                     }
-                 }
+                    }
                  break;
             default: ;
             }
diff --git a/po/ar.po b/po/ar.po
index e26a4305d..fa142f3d6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -800,6 +800,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1245,10 +1248,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 4d910257b..3802c001b 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -799,6 +799,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1244,10 +1247,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 78fa4080b..31ff8fc9c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -799,6 +799,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1244,10 +1247,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/da_DK.po b/po/da_DK.po
index c2773f81e..2471f2281 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -796,6 +796,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1241,10 +1244,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/de_DE.po b/po/de_DE.po
index 2d0ff569d..46cf5c496 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,13 +1,13 @@
 # VDR language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <vdr@tvdr.de>, 2000-2008
+# Klaus Schmidinger <vdr@tvdr.de>, 2000-2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2010-01-16 16:46+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -796,6 +796,9 @@ msgstr "Geschnittene Version existiert bereits - 
 msgid "Error while queueing recording for cutting!"
 msgstr "Fehler beim Hinzuf�gen der Aufnahme zur Schnittwarteschlange"
 
+msgid "Rename recording to folder name?"
+msgstr "Aufnahme in Ordnername umbenennen?"
+
 msgid "Delete editing marks for this recording?"
 msgstr "Schnittmarken f�r diese Aufnahme l�schen?"
 
@@ -1079,7 +1082,7 @@ msgid "Setup.LNB$Use dish positioner"
 msgstr "Antennen-Positionierer benutzen"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr "Standort L�ngengrad"
+msgstr "Standort Breitengrad"
 
 msgid "South"
 msgstr "S�d"
@@ -1088,7 +1091,7 @@ msgid "North"
 msgstr "Nord"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr "Standort Breitengrad"
+msgstr "Standort L�ngengrad"
 
 msgid "West"
 msgstr "West"
@@ -1241,11 +1244,14 @@ msgstr "Herausgeschnittene Teile 
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Pause an der letzten Schnittmarke"
 
-msgid "Setup.Replay$Binary skip initial value (s)"
-msgstr "Anfangswert f�r bin�res Springen (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr "Anfangswert beim Halbieren der Sprungweite (s)"
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
+msgstr "Zeitlimit beim Halbieren der Sprungweite (s)"
 
-msgid "Setup.Replay$Binary skip timeout (s)"
-msgstr "Zeitlimit f�r bin�res Springen (ms)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Sprungweite nur bei Richtungswechsel halbieren"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
@@ -1519,7 +1525,7 @@ msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR schaltet sp�ter aus - Power zum erzwingen"
+msgstr "VDR schaltet sp�ter aus - Power zum Erzwingen"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Taste dr�cken, um Ausschalten abzubrechen"
diff --git a/po/el_GR.po b/po/el_GR.po
index ab60f68ff..560135e97 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -796,6 +796,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1241,10 +1244,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/es_ES.po b/po/es_ES.po
index 40d720802..b88eb56f0 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/et_EE.po b/po/et_EE.po
index 607f73480..f5ad778d6 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -20,7 +20,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Kehtetu kanal ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM aktiveeritud!"
 
 msgid "Channel not available!"
 msgstr "Kanal ei ole kättesaadav!"
@@ -796,6 +796,9 @@ msgstr "Redigeeritud versioon juba olemas - kirjutada üle?"
 msgid "Error while queueing recording for cutting!"
 msgstr "Salvestuse lõikamiseks lisamine ebaõnnestus!"
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr "Kustutada selle salvestuse markerid?"
 
@@ -1113,16 +1116,16 @@ msgstr "CAM töövalmis"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktiveerimine)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Aktiveerimise tühistamine"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Aktiveeri"
 
 msgid "Button$Menu"
 msgstr "Menüü"
@@ -1137,7 +1140,7 @@ msgid "Can't open CAM menu!"
 msgstr "Ei saa avada CAM menüüd!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Ei saa CAM'i aktiveerida!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM on kasutuses - taaskäivitada?"
@@ -1230,21 +1233,24 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Edenemiseriba kuvamise aeg (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Taasesituse peatamine markeri seadmisel"
+msgstr "Paus markeri seadmisel"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Paus markerile siirdamisel"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Redigeeritud osade vahelejätmine"
 
 msgid "Setup.Replay$Pause replay at last mark"
+msgstr "Paus viimasel markeril"
+
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1287,7 +1293,7 @@ msgid "Setup.Miscellaneous$Volume steps"
 msgstr "Helitugevuse samm"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr "Helitugevuse lineariseerimine"
+msgstr "Helitugevuse lineaarsus"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalite ringkerimine"
@@ -1322,7 +1328,7 @@ msgstr "Kava"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " Lõpetada taasesitamine"
+msgstr " Lõpetada taasesitus"
 
 msgid "Button$Pause"
 msgstr "Paus"
@@ -1331,7 +1337,7 @@ msgid "Button$Stop"
 msgstr "Stopp"
 
 msgid "Button$Resume"
-msgstr "Jätkata"
+msgstr "Jätkamine"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index cd59767d9..f7f81c53f 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -800,6 +800,9 @@ msgstr "Muokattava versio on jo olemassa - ylikirjoitetaanko?"
 msgid "Error while queueing recording for cutting!"
 msgstr "Tallenteen lisääminen leikkausjonoon epäonnistui!"
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr "Poistetaanko muokkausmerkinnät tallenteelta?"
 
@@ -1245,11 +1248,14 @@ msgstr "Ohita muokatut kohdat"
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Pysäytä toisto viimeiseen merkkiin"
 
-msgid "Setup.Replay$Binary skip initial value (s)"
-msgstr "Binäärihypyn oletuspituus (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr "Mukautuvan hypyn oletuskesto (s)"
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
+msgstr "Mukautuvan hypyn nollausviive (s)"
 
-msgid "Setup.Replay$Binary skip timeout (s)"
-msgstr "Binäärihypyn odotusaika (ms)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Käytä vaihtoehtoista mukautuvaa hyppyä"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 65ed4fb72..f529a9c46 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-02-24 12:56+0100\n"
 "Last-Translator: Dominique Plu <dplu@free.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -806,6 +806,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1251,10 +1254,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index b9bd70021..d648da610 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -798,6 +798,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1243,10 +1246,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 00dcc247f..9267ec21e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -4,30 +4,31 @@
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
 # Thomas Günther <tom@toms-cafe.de>, 2007
-# István Füley <ifuley@tigercomp.ro>, 2007, 2012, 2013
+# István Füley <ifuley@tigercomp.ro>, 2007, 2012, 2013, 2015
+# Mario Fenneis <admin@mediastreambox.at>, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-01-30 13:14+0100\n"
-"PO-Revision-Date: 2013-03-01 19:22+0200\n"
+"PO-Revision-Date: 2015-02-03 11:35+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.6.11\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Érvénytelen csatorna ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM aktiválva!"
 
 msgid "Channel not available!"
-msgstr "Az adó nem elérhető"
+msgstr "A csatorna nem elérhető!"
 
 msgid "Can't start Transfer Mode!"
 msgstr "Transfer-Mode nem indítható!"
@@ -69,7 +70,7 @@ msgid "Bandwidth"
 msgstr "Sávszélesség"
 
 msgid "Transmission"
-msgstr "Átvitel"
+msgstr "Transmission"
 
 msgid "Guard"
 msgstr "Guard"
@@ -84,22 +85,22 @@ msgid "StreamId"
 msgstr "Stream azonosító"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2 rendszer azonosító"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
-msgstr "EPG adatok aktualizálása"
+msgstr "EPG adatok frissítése"
 
 msgid "Content$Movie/Drama"
 msgstr "Film/Dráma"
 
 msgid "Content$Detective/Thriller"
-msgstr "Nyomozó/Thriller"
+msgstr "Nyomozó/Krimi"
 
 msgid "Content$Adventure/Western/War"
 msgstr "Kaland/Western/Háborús"
@@ -117,7 +118,7 @@ msgid "Content$Romance"
 msgstr "Romantikus film"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "Komolyzenei/Klasszikus/Vallási/Történelmi film/Dráma"
+msgstr "Komoly/Klasszikus/Vallási/Történelmi film/Dráma"
 
 msgid "Content$Adult Movie/Drama"
 msgstr "Felnőtt tartalom/Dráma"
@@ -159,7 +160,7 @@ msgid "Content$Sport Magazine"
 msgstr "Sporthíradó"
 
 msgid "Content$Football/Soccer"
-msgstr "Fotball/Labdarúgás"
+msgstr "Futball/Labdarúgás"
 
 msgid "Content$Tennis/Squash"
 msgstr "Tenisz/Squash"
@@ -180,13 +181,13 @@ msgid "Content$Winter Sports"
 msgstr "Télisportok"
 
 msgid "Content$Equestrian"
-msgstr "Biliárd"
+msgstr "Lovassport"
 
 msgid "Content$Martial Sports"
 msgstr "Közdősport"
 
 msgid "Content$Children's/Youth Programme"
-msgstr "Gyerekprogram/Fiataloknak"
+msgstr "Gyerek/Ifjúsági"
 
 msgid "Content$Pre-school Children's Programme"
 msgstr "Óvodáskorú gyerekeknek"
@@ -228,10 +229,10 @@ msgid "Content$Arts/Culture"
 msgstr "Művészet/Kultúra"
 
 msgid "Content$Performing Arts"
-msgstr "Előadás"
+msgstr "Előadóművészet"
 
 msgid "Content$Fine Arts"
-msgstr "Belle arte"
+msgstr "Képzőművészet"
 
 msgid "Content$Religion"
 msgstr "Vallás"
@@ -246,7 +247,7 @@ msgid "Content$Film/Cinema"
 msgstr "Film/Mozi"
 
 msgid "Content$Experimental Film/Video"
-msgstr "Amatőr film/video"
+msgstr "Avantgárd/Videó"
 
 msgid "Content$Broadcasting/Press"
 msgstr "Közvetítés/Sajtó"
@@ -279,16 +280,16 @@ msgid "Content$Nature/Animals/Environment"
 msgstr "Természet/Állatok/Környezet"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr "Technológia/Természettudomány"
+msgstr "Technika/Természettudomány"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr "Gyógyászat/Pszichológia/Orvostan"
+msgstr "Gyógyászat/Fiziológia/Pszichológia"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr "Idegen országok/Expedíciók"
+msgstr "Külföld/Expedíciók"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr "Társadalmi/Lélektudomány"
+msgstr "Társadalmi/Lélektudományok"
 
 msgid "Content$Further Education"
 msgstr "Továbbképzés"
@@ -297,7 +298,7 @@ msgid "Content$Languages"
 msgstr "Nyelvek"
 
 msgid "Content$Leisure/Hobbies"
-msgstr "Hobbi"
+msgstr "Szabadidő/Hobbi"
 
 msgid "Content$Tourism/Travel"
 msgstr "Turizmus/Utazás"
@@ -306,7 +307,7 @@ msgid "Content$Handicraft"
 msgstr "Kézműves"
 
 msgid "Content$Motoring"
-msgstr "Motor"
+msgstr "Autók, Motorok"
 
 msgid "Content$Fitness & Health"
 msgstr "Fitness és egészség"
@@ -379,7 +380,7 @@ msgid "(press 'Down' to end key definition)"
 msgstr "('Le' megnyomása a befejezéshez)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "A Menü gombot nyomni ennek a gombnak a kihagyásához"
+msgstr "('Menü' megnyomása ennek a gombnak a kihagyásához)"
 
 msgid "Learning Remote Control Keys"
 msgstr "Távirányító betanítása"
@@ -463,7 +464,7 @@ msgid "Key$Channel-"
 msgstr "Csatorna-"
 
 msgid "Key$PrevChannel"
-msgstr "Az előző adás"
+msgstr "Az előző csatorna"
 
 msgid "Key$Volume+"
 msgstr "Hangerő+"
@@ -472,7 +473,7 @@ msgid "Key$Volume-"
 msgstr "Hangerő-"
 
 msgid "Key$Mute"
-msgstr "Csend"
+msgstr "Néma üzemmód"
 
 msgid "Key$Audio"
 msgstr "Hang"
@@ -535,7 +536,7 @@ msgid "encrypted"
 msgstr "Kódolt"
 
 msgid "Edit channel"
-msgstr "Csatornák beállítása"
+msgstr "Csatorna szerkesztése"
 
 msgid "Name"
 msgstr "Név"
@@ -580,13 +581,13 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
-msgstr "Az adóbeállítások nem egyértelműek"
+msgstr "A csatornabeállítások nem egyértelműek!"
 
 msgid "Channels"
 msgstr "Csatornák"
@@ -601,10 +602,10 @@ msgid "Button$Delete"
 msgstr "Törölni"
 
 msgid "Button$Mark"
-msgstr "Megjelölni"
+msgstr "Kijelölni"
 
 msgid "Channel is being used by a timer!"
-msgstr "Az adót az időzítő használja!"
+msgstr "A csatornát az időzítő használja!"
 
 msgid "Delete channel?"
 msgstr "Csatorna törlése?"
@@ -623,7 +624,7 @@ msgstr "Ez a könyvtárnév már létezik!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "A könyvtár neve nem tartalmazhatja: '%c'!"
+msgstr "A könyvtár neve nem tartalmazhat '%c'!"
 
 msgid "Button$Open"
 msgstr "Kinyitni"
@@ -635,10 +636,10 @@ msgid "Delete folder?"
 msgstr "Töröljem a könyvtárat?"
 
 msgid "Edit timer"
-msgstr "Időzítő megváltoztatása"
+msgstr "Időzítő szerkesztése"
 
 msgid "Active"
-msgstr "Aktiv"
+msgstr "Aktív"
 
 msgid "Channel"
 msgstr "Csatorna"
@@ -662,7 +663,7 @@ msgid "Lifetime"
 msgstr "Élettartam"
 
 msgid "File"
-msgstr "File"
+msgstr "Fájl"
 
 msgid "Button$Folder"
 msgstr "Könyvtár"
@@ -695,7 +696,7 @@ msgid "Timer still recording - really delete?"
 msgstr "Felvétel folyamatban van - biztos töröljem?"
 
 msgid "Event"
-msgstr "Esemény"
+msgstr "Adás"
 
 msgid "Button$Timer"
 msgstr "Időzítő"
@@ -707,10 +708,10 @@ msgid "Button$Switch"
 msgstr "Átkapcsolni"
 
 msgid "What's on now?"
-msgstr "Most adásban"
+msgstr "Most adásban?"
 
 msgid "What's on next?"
-msgstr "Mi következik?"
+msgstr "Következik?"
 
 msgid "Button$Next"
 msgstr "Következő"
@@ -722,7 +723,7 @@ msgid "Button$Schedule"
 msgstr "Műsorújság"
 
 msgid "Can't switch channel!"
-msgstr "Az adót nem lehet elkapcsolni"
+msgstr "A csatornát nem lehet elkapcsolni!"
 
 #, c-format
 msgid "Schedule - %s"
@@ -733,10 +734,10 @@ msgid "This event - %s"
 msgstr "Ez az adás - %s"
 
 msgid "This event - all channels"
-msgstr "Ez az adás - összes adón"
+msgstr "Ez az adás - összes csatornák"
 
 msgid "All events - all channels"
-msgstr "Az összes adás - az összes adón"
+msgstr "Az összes adás - összes csatornák"
 
 #, c-format
 msgid "Please enter %d digits!"
@@ -746,77 +747,77 @@ msgid "CAM not responding!"
 msgstr "A CAM nem válaszol!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Elérés szerkesztése"
 
 msgid "Folder"
-msgstr ""
+msgstr "Könyvtár"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Ez a könyvtár használatban van - szerkesztés nem lehetséges!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "A teljes könytár %d felvételt tartalmaz, áthelyezzem?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Hiba a könyvtár áthelyezése közben!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Felvétel szerkesztése"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "A felvétel használatban van - szerkesztés nem lehetséges!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Vágás mégse"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Vágás leállítása"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Áthelyezés mégse"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Áthelyezés leállítása"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Másolás mégse"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Másolása leállítása"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Vágás"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Vágópontok törlése"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "A felvétel eltűnt!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "A szerkesztett változat már létezik - felülírjam?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Hiba a felvétel vágásra előkészítése közben!"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Töröljem a felvétel vágópontjait?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Hiba a vágópontok törlése közben!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Hiba a prioritás/élettartam változtatása közben!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Hiba a könyvtár/név változtatása közben!"
 
 msgid "Recording info"
 msgstr "Felvétel infó"
 
 msgid "Button$Play"
-msgstr "Lejátszani"
+msgstr "Lejátszás"
 
 msgid "Button$Rewind"
 msgstr "Vissza az elejére"
@@ -831,13 +832,13 @@ msgid "Delete recording?"
 msgstr "Felvétel törlése?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "A felvétel szerkesztés alatt - biztos törölni?"
+msgstr "A felvétel szerkesztés alatt - biztos töröljem?"
 
 msgid "Error while deleting recording!"
 msgstr "Hiba a felvétel törlésénél!"
 
 msgid "Recording commands"
-msgstr "Parancsok a felvett filmekhez"
+msgstr "Parancsok a felvételekhez"
 
 msgid "never"
 msgstr "soha"
@@ -873,7 +874,7 @@ msgid "Setup.OSD$Height (%)"
 msgstr "Magasság (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Információ feltűntetésének időtartama"
+msgstr "Információ feltüntetésének időtartama (mp)"
 
 msgid "Setup.OSD$Use small font"
 msgstr "Kisbetűt használni"
@@ -909,10 +910,10 @@ msgid "top"
 msgstr "Fent"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Adásinformáció feltűntetésének időtartama (s)"
+msgstr "Adásinformáció feltűntetésének időtartama (mp)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Információ az adó váltásánál"
+msgstr "Információ a csatorna váltásánál"
 
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "A lekérdezett adásinformáció bezárása"
@@ -936,7 +937,7 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Könyvtárakat rendezd előre"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr "Számgombok a betűkön"
+msgstr "Betűk a számgombokon"
 
 msgid "Setup.OSD$Color key 0"
 msgstr "Színes gomb 0"
@@ -963,7 +964,7 @@ msgid "Setup.EPG$EPG bugfix level"
 msgstr "Hibaelhárítás szintje"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "Eltelt EPG adatok kijelzése (perc)"
+msgstr "Eltelt EPG adatok kijelzése (p)"
 
 msgid "Setup.EPG$Set system time"
 msgstr "Óra állítása TP időhöz"
@@ -986,7 +987,7 @@ msgid "letterbox"
 msgstr "letterbox"
 
 msgid "center cut out"
-msgstr "képközép kivágás"
+msgstr "teljeskitöltés"
 
 msgid "no"
 msgstr "nem"
@@ -1001,7 +1002,7 @@ msgid "names and PIDs"
 msgstr "nevek és PIDek"
 
 msgid "add new channels"
-msgstr "új adók hozzáadása"
+msgstr "új csatornák hozzáadása"
 
 msgid "add new transponders"
 msgstr "új transponderek hozzáadása"
@@ -1016,22 +1017,22 @@ msgid "Button$Subtitles"
 msgstr "Feliratok"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "Első DVB interface"
+msgstr "Elsődleges DVB eszköz"
 
 msgid "Setup.DVB$Standard compliance"
 msgstr "Vételi norma"
 
 msgid "Setup.DVB$Video format"
-msgstr "Video formátum"
+msgstr "Videó formátum"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Képernyőformátum"
+msgstr "Megjelenítő formátum"
 
 msgid "Setup.DVB$Use Dolby Digital"
 msgstr "Dolby-Digital hangot használni"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Adók aktualizálása"
+msgstr "Csatornák frissítése"
 
 msgid "Setup.DVB$Audio languages"
 msgstr "Hangsáv nyelvek"
@@ -1074,37 +1075,37 @@ msgstr "Felső LNB-frekvencia (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr "Fejkábel a %d. tunerhez"
+msgstr "Fejkábel a %d. tunerhez csatlakoztatva"
 
 msgid "Setup.LNB$own"
 msgstr "saját"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Forgató használata"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Szélesség (fok)"
 
 msgid "South"
-msgstr ""
+msgstr "Dél"
 
 msgid "North"
-msgstr ""
+msgstr "Észak"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Hosszúság (fok)"
 
 msgid "West"
-msgstr ""
+msgstr "Nyugat"
 
 msgid "East"
-msgstr ""
+msgstr "Kelet"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Forgató maximális intervalluma (fok)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Forgató sebessége (fok/mp)"
 
 msgid "CAM reset"
 msgstr "CAM újraindítás"
@@ -1117,16 +1118,16 @@ msgstr "CAM működik"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktiválás)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Aktiválás mégse"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Aktiválás"
 
 msgid "Button$Menu"
 msgstr "Menü"
@@ -1141,7 +1142,7 @@ msgid "Can't open CAM menu!"
 msgstr "A CAM menü nem nyitható"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "CAM aktiválás sikertelen!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM használatban - valóban újraindítjuk?"
@@ -1168,16 +1169,16 @@ msgid "Recording"
 msgstr "Felvétel"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Időeltolás a kezdésnél (perc)"
+msgstr "Időeltolás a kezdésnél (p)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Időeltolás a befejezésnél (perc)"
+msgstr "Időeltolás a befejezésnél (p)"
 
 msgid "Setup.Recording$Default priority"
 msgstr "Alapértelmezett prioritás"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Alapértelmezett élettartam"
+msgstr "Alapértelmezett élettartam (n)"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "A szünet gomb működése"
@@ -1186,7 +1187,7 @@ msgid "Setup.Recording$Pause priority"
 msgstr "Időeltolás prioritása"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Időeltolás élettartama"
+msgstr "Időeltolás élettartama (n)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Epizódnév"
@@ -1198,22 +1199,22 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "Időeltolás VPS-nél (mp)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Direktfelvétel megjelölése"
+msgstr "Egygombos felvétel megjelölése"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Direktfelvétel megnevezése"
+msgstr "Egygombos felvétel megnevezése"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Direktfelvétel időtartama (perc)"
+msgstr "Egygombos felvétel időtartama (p)"
 
 msgid "Setup.Recording$present event"
 msgstr "Most futó műsor"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Max. video file méret (MB)"
+msgstr "Max. videó fájl méret (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Feldolgozott file-ok felosztása"
+msgstr "Feldolgozott fájlok felosztása"
 
 msgid "Setup.Recording$Delete timeshift recording"
 msgstr "Időeltolásos felvétel törlése"
@@ -1237,22 +1238,25 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "A visszajátszás megállítása vágópont kijelölésnél"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Szünet a lejátszásban, mikor egy vágópontra ugrik"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Vágott részek kihagyása"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Utolsó vágópontnál szünet a lejátszásban"
 
-msgid "Setup.Replay$Binary skip initial value (s)"
-msgstr ""
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr "Felezett ugrás kezdeti értéke (mp)"
 
-msgid "Setup.Replay$Binary skip timeout (s)"
-msgstr ""
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
+msgstr "Felezett ugrás időkorláta (mp)"
+
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Felezett ugrás csak irányváltoztatásnál"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "Lejátszás ID"
+msgstr "Lejátszás azonosító"
 
 msgid "Miscellaneous"
 msgstr "Egyéb"
@@ -1261,22 +1265,22 @@ msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "VDR leáll ha nem következik felvétel (p)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "VDR leáll használat nélkül (perc)"
+msgstr "VDR leáll használat nélkül (p)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "SVDRP szétkapcsol használat nélkül(s)"
+msgstr "SVDRP szétkapcsol használat nélkül(mp)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Adásváltás ideje (s)"
+msgstr "Adásváltás ideje (mp)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Csatornaváltás timeout (ms)"
+msgstr "Csatornaváltás timeout (emp)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr "Távirányító ismétlés késleltetése (ms)"
+msgstr "Távirányító ismétlés késleltetése (emp)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr "Távirányító ismétlés deltája (ms)"
+msgstr "Távirányító ismétlés deltája (emp)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Csatorna induláskor"
@@ -1288,10 +1292,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hangerő indulásnál"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Hangerőállítás léptéke"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Hangerő linearizálása"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Csatornalista görgetése"
@@ -1303,7 +1307,7 @@ msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Vészleállítás"
 
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Pluginok"
 
 msgid "This plugin has no setup parameters!"
 msgstr "Ennek a plugin-nak nincs setup-paramétere!"
@@ -1342,13 +1346,13 @@ msgid " Cancel editing"
 msgstr " Vágást megszakítani"
 
 msgid "Stop recording?"
-msgstr "Felvétel befejezni?"
+msgstr "Felvételt befejezni?"
 
 msgid "Cancel editing?"
 msgstr "Vágást befejezni?"
 
 msgid "No audio available!"
-msgstr "Hang nem lehetséges!"
+msgstr "Hang nem elérhetö!"
 
 msgid "No subtitles"
 msgstr "Felirat ki"
@@ -1360,7 +1364,7 @@ msgid "Not enough disk space to start recording!"
 msgstr "Nincs elegendő hely a felvételre"
 
 msgid "No free DVB device to record!"
-msgstr "Nincs szabad DVB kártya a felvételhez!"
+msgstr "Nincs szabad DVB eszköz a felvételhez!"
 
 msgid "Pausing live video..."
 msgstr "Az élő adás megállítva..."
@@ -1406,10 +1410,10 @@ msgid "Plugin"
 msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Fel/Le egy új opcióért - aztán OK"
+msgstr "Fel/Le egy új pozícióért - aztán OK"
 
 msgid "Channel locked (recording)!"
-msgstr "Az adó blokkolva (felvétel)!"
+msgstr "A csatorna blokkolva (felvétel)!"
 
 msgid "Low disk space!"
 msgstr "A merevlemez majdnem tele!"
@@ -1434,7 +1438,7 @@ msgstr "Felvétel folyamatban van - mégis kikapcsolni?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Felvétel %ld perc mulva kezdődik - mégis kikapcsolni?"
+msgstr "Felvétel %ld perc múlva kezdődik - mégis kikapcsolni?"
 
 msgid "shut down anyway?"
 msgstr "mégis kikapcsolni?"
@@ -1479,7 +1483,7 @@ msgstr "LEJÁTSZÁS"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Antenna forgatása  %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzol"
@@ -1529,7 +1533,7 @@ msgid "Press any key to cancel shutdown"
 msgstr "Nyomj egy gombot a leállás megszakításához"
 
 msgid "Switching primary DVB..."
-msgstr "Elsődleges DVB kártya váltása folyamatban..."
+msgstr "Elsődleges DVB eszköz váltása folyamatban..."
 
 msgid "Editing process failed!"
 msgstr "Vágás sikertelen!"
diff --git a/po/it_IT.po b/po/it_IT.po
index 784564372..0c3a83492 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -4,30 +4,29 @@
 # Alberto Carraro <bertocar@tin.it>, 2001
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
 # Sean Carlos <seanc@libero.it>, 2005
-# Nino Gerbino <ngerb@interfree.it>, 2006
-# Diego Pierotto <vdr-italian@tiscali.it>, 2007-2010, 2012, 2013
+# Nino Gerbino <ngerb@interfree.it>, 2006, 2015
+# Diego Pierotto <vdr-italian@tiscali.it>, 2007-2010, 2012, 2013, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
-"PO-Revision-Date: 2015-01-19 20:19+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"PO-Revision-Date: 2015-02-05 00:09+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Canale NON valido ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM attivata!"
 
 msgid "Channel not available!"
 msgstr "Canale non disponibile!"
@@ -803,6 +802,9 @@ msgstr "Versione modificata già esistente. Sovrascrivere?"
 msgid "Error while queueing recording for cutting!"
 msgstr "Errore durante l'accodamento della registrazione per il taglio!"
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr "Eliminare i marcatori di modifica della registrazione?"
 
@@ -1120,16 +1122,16 @@ msgstr "La CAM è pronta"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr "(attivazione)"
 
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Annulla attivazione"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Attiva"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1144,7 +1146,7 @@ msgid "Can't open CAM menu!"
 msgstr "Impossibile aprire il menu CAM!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Impossibile attivare CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "La CAM è in uso - vuoi reimpostarla?"
@@ -1237,21 +1239,24 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Mostra tempo elaborazione (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Pausa riproduzione durante impostazione segni"
+msgstr "Pausa riproduzione durante impostazione marcatori"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pausa riproduzione se si passa ad un marcatore"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Salta parti modificate"
 
 msgid "Setup.Replay$Pause replay at last mark"
+msgstr "Pausa riproduzione all'ultimo marcatore"
+
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index e76ef3630..4526d4cc9 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,13 +1,13 @@
 # VDR language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2010-10-30 11:55+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -20,7 +20,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Blogi kanalo nustatymai ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "Dekodavimo modulis aktyvuotas!"
 
 msgid "Channel not available!"
 msgstr "Kanalas neegzistuoja!"
@@ -80,13 +80,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilotas"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2 Sistemos ID"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Pradedamas EPG skanavimas"
@@ -573,13 +573,13 @@ msgid "CA"
 msgstr "CA (dekodavimo sistema)"
 
 msgid "Sid"
-msgstr "Serviso id"
+msgstr "Serviso id (Sid)"
 
 msgid "Nid"
-msgstr ""
+msgstr "Tinklo id (Nid)"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Kanalų nustatymai neunikalūs!"
@@ -742,71 +742,74 @@ msgid "CAM not responding!"
 msgstr "Dekodavimo modulis (CAM) neveikia!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Koreguoti kelią"
 
 msgid "Folder"
-msgstr ""
+msgstr "Katalogas"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Šis katalogas šiuo metu naudojamas, tad šiuo metu negalimi jokie pakeitimai!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Perkelti šį katalogą kurio viduje yra %d įrašų?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Klaida perkeliant katalogą!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Koreguoti įrašus"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Šis įrašas šiuo metu naudojamas, tad šiuo metu negalimi jokie pakeitimai!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Button$Atšaukti karpymą"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Button$Sustabdyti karpymą"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Button$Atšaukti perkėlimą"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Button$Sustabdyti perkėlimą"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Button$Atšaukti kopijavimą"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Button$Sustabdyti kopijavimą"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Button$Iškirpti"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Button$Ištrinti žymes"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Įrašai išvalyti!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Tokia koreguota versija jau yra, vistiek perašyti?"
 
 msgid "Error while queueing recording for cutting!"
+msgstr "Klaida sustatant įrašus į karpymo eilę!"
+
+msgid "Rename recording to folder name?"
 msgstr ""
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Ar tikrai ištrinti šio įrašo koregavimo žymes?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Klaida trinant koregavimo žymes!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Klaida keičiant prioritetą/galiojimo laiką!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Klaida keičiant katalogą/pavadinimą!"
 
 msgid "Recording info"
 msgstr "Informacija apie įrašus"
@@ -1076,31 +1079,31 @@ msgid "Setup.LNB$own"
 msgstr "savas"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Setup.LNB$Naudoti pozicionierių"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Setup.LNB$Vitovės platuma (laipsniais)"
 
 msgid "South"
-msgstr ""
+msgstr "Pietūs"
 
 msgid "North"
-msgstr ""
+msgstr "Šiaurė"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Setup.LNB$Vietovės ilgima (laipsniais)"
 
 msgid "West"
-msgstr ""
+msgstr "Vakarai"
 
 msgid "East"
-msgstr ""
+msgstr "Rytai"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Maksimalus pozicionieriaus pasukimas (laipsniais)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Pozicionieriaus kreitis (laipsniais/s)"
 
 msgid "CAM reset"
 msgstr "Dekodavimo modulis (CAM) perkrautas"
@@ -1113,16 +1116,16 @@ msgstr "Dekodavimo modulis (CAM) paruoštas darbui"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktyvuojama)"
 
 msgid "CAM"
 msgstr "Dekodavimo modulis (CAM)"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Button$Atšaukti aktyvaciją"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Button$Aktyvuoti"
 
 msgid "Button$Menu"
 msgstr "Meniu"
@@ -1137,7 +1140,7 @@ msgid "Can't open CAM menu!"
 msgstr "Negali atidaryti dekodavimo modulio meniu!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Negali aktyvuoti dekodavimo modulio!"
 
 msgid "CAM is in use - really reset?"
 msgstr "Dekodavimo modulis šiuo metu naudojamas - tikrai perkrauti?"
@@ -1233,18 +1236,21 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pristabdyti pakartojimą kai vyksta žymėjimas"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Setup.Replay$Pristabdyti pakartojim1 kol pereinama prie žymės"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Setup.Replay$Praleisti koreguotas dalis"
 
 msgid "Setup.Replay$Pause replay at last mark"
+msgstr "Setup.Replay$Pristabdyti pakartojimą pasiekus paskutinę žymę"
+
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1284,10 +1290,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Garsas įjungimo metu"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Setup.Miscellaneous$Garso reguliavimo žingsniai"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Setup.Miscellaneous$Garso lygiavimas"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalų pridengimas"
@@ -1475,7 +1481,7 @@ msgstr "GROTI"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Lėkštė sukama į %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Skydeliai"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 418381c2e..388f3e9fc 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2012-11-19 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 7f9af104e..c5c5287ee 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-02-26 17:20+0100\n"
 "Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -801,6 +801,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1246,10 +1249,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 6eb63fab5..18c2a4c99 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 18c8662c3..6077f7aaa 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -798,6 +798,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1243,10 +1246,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b3a891cc3..d3b22980d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 25766cf01..d6d3c422c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
-# Lucian Muresan <lucianm@users.sourceforge.net>, 2004-2006, 2008, 2010-2013
+# Lucian Muresan <lucianm@users.sourceforge.net>, 2004-2006, 2008, 2010-2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
-"PO-Revision-Date: 2015-01-21 22:34+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"PO-Revision-Date: 2015-02-06 23:15+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
 "Language: ro\n"
@@ -22,7 +22,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Canal invalid ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM activat!"
 
 msgid "Channel not available!"
 msgstr "Canal indisponibil"
@@ -798,6 +798,9 @@ msgstr "Deja există o versiune editată - o suprascriu?"
 msgid "Error while queueing recording for cutting!"
 msgstr "Eroare la punerea în coada pentru tăiere!"
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr "Șterg marcajele de editare pentru această înregistrare?"
 
@@ -1115,16 +1118,16 @@ msgstr "CAM pregătit"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (activez)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Anulează activarea"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Activează"
 
 msgid "Button$Menu"
 msgstr "Meniu"
@@ -1139,7 +1142,7 @@ msgid "Can't open CAM menu!"
 msgstr "Nu pot deschide meniul CAM"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Nu pot activa CAM-ul!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM-ul este in folosinţă - totuşi resetez?"
@@ -1235,19 +1238,22 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pauză la punerea marcajului de editare"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pauză după săritura la marcaj"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Săritură peste părțile editate"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Pauză la ultimul marcaj"
 
-msgid "Setup.Replay$Binary skip initial value (s)"
-msgstr ""
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr "Durata inițială (s) pentru săritul adaptiv al marcajelor"
 
-msgid "Setup.Replay$Binary skip timeout (s)"
-msgstr ""
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
+msgstr "Timeout (s) de resetare pentru săritul adaptiv al marcajelor"
+
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Strategie alternativă pentru săritul adaptiv al marcajelor"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e0a291aae..4a9c4734f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index c8c4225b7..8154704c0 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -796,6 +796,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1241,10 +1244,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 9d58dd539..dc6579fb9 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/sr_RS.po b/po/sr_RS.po
index dbe75fded..8a141aaaa 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -797,6 +797,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1242,10 +1245,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 33add95c2..b7c830cfa 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -800,6 +800,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1245,10 +1248,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index e6708427c..f43e75bc9 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -796,6 +796,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1241,10 +1244,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 351d94df5..d7399a1b1 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
-"PO-Revision-Date: 2013-02-09 16:00+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"PO-Revision-Date: 2015-02-01 23:31+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.3\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM активовано!"
 
 msgid "Channel not available!"
 msgstr "Канал недоступний!"
@@ -78,19 +78,19 @@ msgid "Rolloff"
 msgstr "Крен"
 
 msgid "StreamId"
-msgstr "StreamId"
+msgstr "Id потоку"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Пілот"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
-msgstr "Починаю EPG-сканування"
+msgstr "Початок сканування EPG"
 
 msgid "Content$Movie/Drama"
 msgstr "Фільм/Драма"
@@ -249,7 +249,7 @@ msgid "Content$Broadcasting/Press"
 msgstr "Трансляція/Преса"
 
 msgid "Content$New Media"
-msgstr "Нові медія"
+msgstr "Нові медіа"
 
 msgid "Content$Arts/Culture Magazine"
 msgstr "Мистецтво/Культурний журнал"
@@ -424,7 +424,7 @@ msgid "Key$Info"
 msgstr "Інфо"
 
 msgid "Key$Play/Pause"
-msgstr "Програвати/Пауза"
+msgstr "Програвання/Пауза"
 
 msgid "Key$Play"
 msgstr "Програвання"
@@ -577,10 +577,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Настройки каналу не єдині!"
@@ -604,7 +604,7 @@ msgid "Channel is being used by a timer!"
 msgstr "Канал зайнятий таймером!"
 
 msgid "Delete channel?"
-msgstr "Видалити канал?"
+msgstr "Вилучити канал?"
 
 msgid "Edit folder"
 msgstr "Редагувати теку"
@@ -719,7 +719,7 @@ msgid "Button$Schedule"
 msgstr "Програма"
 
 msgid "Can't switch channel!"
-msgstr "Неможливо переключити канал!"
+msgstr "Неможливо перемкнути канал!"
 
 #, c-format
 msgid "Schedule - %s"
@@ -743,71 +743,74 @@ msgid "CAM not responding!"
 msgstr "CAM не відповідає!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Редагувати шлях"
 
 msgid "Folder"
-msgstr ""
+msgstr "Тека"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Ця тека зараз використовується - не дозволено жодних змін!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Перемістити цілу теку, що містить %d записів?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Помилка перенесення теки!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Редагувати запис"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Цей запис зараз використовується - не дозволено жодних змін!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Відмінити обрізання"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Зупинити обрізання"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Відмінити перенесення"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Зупинити перенесення"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Відмінити копіювання"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Зупинити копіювання"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Обрізання"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Вилучити мітки"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Запис зник!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Вже існує редагована версія - перезаписати?"
 
 msgid "Error while queueing recording for cutting!"
+msgstr "Помилка перешуковування запису для обрізання!"
+
+msgid "Rename recording to folder name?"
 msgstr ""
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Вилучити мітки редагування для цього запису?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Помилка вилучення міток редагування!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Помилка при зміні пріоритету/тривалості!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Помилка при зміні теки/назви!"
 
 msgid "Recording info"
 msgstr "Про запис"
@@ -831,7 +834,7 @@ msgid "Recording is being edited - really delete?"
 msgstr "Запис редагується - дійсно вилучити?"
 
 msgid "Error while deleting recording!"
-msgstr "Помилка видалення запису!"
+msgstr "Помилка вилучення запису!"
 
 msgid "Recording commands"
 msgstr "Команди запису"
@@ -840,7 +843,7 @@ msgid "never"
 msgstr "ніколи"
 
 msgid "skin dependent"
-msgstr "згідно з стилем"
+msgstr "згідно зі стилем"
 
 msgid "always"
 msgstr "завжди"
@@ -1077,31 +1080,31 @@ msgid "Setup.LNB$own"
 msgstr "власне"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Використання позиціонеру тарілки"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Широта (градуси)"
 
 msgid "South"
-msgstr ""
+msgstr "Південь"
 
 msgid "North"
-msgstr ""
+msgstr "Північ"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Довгота (градуси)"
 
 msgid "West"
-msgstr ""
+msgstr "Захід"
 
 msgid "East"
-msgstr ""
+msgstr "Схід"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Макс. кут позиціонера (градуси)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Швидкість позиціонера (градуси/с)"
 
 msgid "CAM reset"
 msgstr "Перезавантаження CAM"
@@ -1114,16 +1117,16 @@ msgstr "CAM готовий"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (активування)"
 
 msgid "CAM"
 msgstr "CAM (Умовний доступ)"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Відмінити активацію"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Активувати"
 
 msgid "Button$Menu"
 msgstr "Меню"
@@ -1138,7 +1141,7 @@ msgid "Can't open CAM menu!"
 msgstr "Меню CAM-модуля недоступне!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Не можу активувати CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM використовується - дійсно перезапустити?"
@@ -1222,10 +1225,10 @@ msgid "Setup.Replay$Multi speed mode"
 msgstr "Багатошвидкісний режим"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "Віображати режим перегляду"
+msgstr "Показати режим перегляду"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr "Показати час що зашився"
+msgstr "Показати час що залишився"
 
 msgid "Setup.Replay$Progress display time (s)"
 msgstr "Час показу індикатора (с)"
@@ -1234,18 +1237,21 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Пауза програвання при встановленні мітки"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Призупинити програвання при перескакуванні до мітки"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Пропустити редаговані частини"
 
 msgid "Setup.Replay$Pause replay at last mark"
+msgstr "Призупинити програвання на останній мітці"
+
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1261,13 +1267,13 @@ msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Мін. час очікування вводу (хв)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "Затримкка обриву з'єднання SVDRP (сек)"
+msgstr "Затримка обриву з'єднання SVDRP (сек)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Затримка переключання каналу (сек)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Затримка часу для впровадження каналу (ms)"
+msgstr "Затримка часу для впровадження каналу (мс)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
 msgstr "Затримка повтору кнопок пульта (мс)"
@@ -1285,10 +1291,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Гучність при включенні"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Кроки гучності"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Лінеаризована гучність"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Кінець каналів"
@@ -1363,7 +1369,7 @@ msgid "Pausing live video..."
 msgstr "Режим відкладеного перегляду..."
 
 msgid "Delete timeshift recording?"
-msgstr "Видалити запис з часовим зсувом?"
+msgstr "Вилучити запис з часовим зсувом?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1476,7 +1482,7 @@ msgstr "ПРОГРАВАННЯ"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Повертання тарілки до %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG панелі"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bf2538173..8ba313a13 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-07 17:08+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -798,6 +798,9 @@ msgstr ""
 msgid "Error while queueing recording for cutting!"
 msgstr ""
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr ""
 
@@ -1243,10 +1246,13 @@ msgstr ""
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip initial value (s)"
+msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
+msgstr ""
+
+msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr ""
 
-msgid "Setup.Replay$Binary skip timeout (s)"
+msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/recording.c b/recording.c
index 079e0de2e..24e979315 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.24 2015/01/25 15:39:24 kls Exp $
+ * $Id: recording.c 3.27 2015/02/07 15:28:02 kls Exp $
  */
 
 #include "recording.h"
@@ -1676,7 +1676,7 @@ cDirCopier::cDirCopier(const char *DirNameSrc, const char *DirNameDst)
 {
   dirNameSrc = DirNameSrc;
   dirNameDst = DirNameDst;
-  error = false;
+  error = true; // prepare for the worst!
   suspensionLogged = false;
 }
 
@@ -1790,6 +1790,7 @@ void cDirCopier::Action(void)
               else {
                  // We're done:
                  dsyslog("done copying directory '%s' to '%s'", *dirNameSrc, *dirNameDst);
+                 error = false;
                  return;
                  }
               }
@@ -1802,7 +1803,6 @@ void cDirCopier::Action(void)
      }
   else
      esyslog("ERROR: can't access '%s'", *dirNameDst);
-  error = true;
 }
 
 void cDirCopier::Stop(void)
@@ -2059,6 +2059,7 @@ cString cMarks::MarksFileName(const cRecording *Recording)
 
 bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool IsPesRecording)
 {
+  cMutexLock MutexLock(this);
   recordingFileName = RecordingFileName;
   fileName = AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
   framesPerSecond = FramesPerSecond;
@@ -2071,6 +2072,7 @@ bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool Is
 
 bool cMarks::Update(void)
 {
+  cMutexLock MutexLock(this);
   time_t t = time(NULL);
   if (t > nextUpdate && *fileName) {
      time_t LastModified = LastModifiedTime(fileName);
@@ -2102,6 +2104,7 @@ bool cMarks::Update(void)
 
 bool cMarks::Save(void)
 {
+  cMutexLock MutexLock(this);
   if (cConfig<cMark>::Save()) {
      lastFileTime = LastModifiedTime(fileName);
      return true;
@@ -2111,6 +2114,7 @@ bool cMarks::Save(void)
 
 void cMarks::Align(void)
 {
+  cMutexLock MutexLock(this);
   cIndexFile IndexFile(recordingFileName, false, isPesRecording);
   for (cMark *m = First(); m; m = Next(m)) {
       int p = IndexFile.GetClosestIFrame(m->Position());
@@ -2123,6 +2127,7 @@ void cMarks::Align(void)
 
 void cMarks::Sort(void)
 {
+  cMutexLock MutexLock(this);
   for (cMark *m1 = First(); m1; m1 = Next(m1)) {
       for (cMark *m2 = Next(m1); m2; m2 = Next(m2)) {
           if (m2->Position() < m1->Position()) {
@@ -2135,6 +2140,7 @@ void cMarks::Sort(void)
 
 void cMarks::Add(int Position)
 {
+  cMutexLock MutexLock(this);
   cConfig<cMark>::Add(new cMark(Position, NULL, framesPerSecond));
   Sort();
 }
@@ -2169,7 +2175,7 @@ cMark *cMarks::GetNext(int Position)
 cMark *cMarks::GetNextBegin(cMark *EndMark)
 {
   cMark *BeginMark = EndMark ? Next(EndMark) : First();
-  if (BeginMark) {
+  if (BeginMark && EndMark && BeginMark->Position() == EndMark->Position()) {
      while (cMark *NextMark = Next(BeginMark)) {
            if (BeginMark->Position() == NextMark->Position()) { // skip Begin/End at the same position
               if (!(BeginMark = Next(NextMark)))
@@ -2187,7 +2193,7 @@ cMark *cMarks::GetNextEnd(cMark *BeginMark)
   if (!BeginMark)
      return NULL;
   cMark *EndMark = Next(BeginMark);
-  if (EndMark) {
+  if (EndMark && BeginMark && BeginMark->Position() == EndMark->Position()) {
      while (cMark *NextMark = Next(EndMark)) {
            if (EndMark->Position() == NextMark->Position()) { // skip End/Begin at the same position
               if (!(EndMark = Next(NextMark)))
@@ -2202,6 +2208,7 @@ cMark *cMarks::GetNextEnd(cMark *BeginMark)
 
 int cMarks::GetNumSequences(void)
 {
+  cMutexLock MutexLock(this);
   int NumSequences = 0;
   if (cMark *BeginMark = GetNextBegin()) {
      while (cMark *EndMark = GetNextEnd(BeginMark)) {
diff --git a/recording.h b/recording.h
index 1079ae1f1..876e0b25e 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 3.6 2015/01/31 13:34:44 kls Exp $
+ * $Id: recording.h 3.8 2015/02/07 14:29:14 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -350,7 +350,7 @@ class cMark : public cListObject {
   bool Save(FILE *f);
   };
 
-class cMarks : public cConfig<cMark> {
+class cMarks : public cConfig<cMark>, public cMutex {
 private:
   cString recordingFileName;
   cString fileName;
@@ -369,6 +369,11 @@ class cMarks : public cConfig<cMark> {
   void Align(void);
   void Sort(void);
   void Add(int Position);
+       ///< If this cMarks object is used by multiple threads, the caller must Lock()
+       ///< it before calling Add() and Unlock() it afterwards. The same applies to
+       ///< calls to Del(), or any of the functions that return a "cMark *", in case
+       ///< an other thread might modifiy the list while the returned pointer is
+       ///< considered valid.
   cMark *Get(int Position);
   cMark *GetPrev(int Position);
   cMark *GetNext(int Position);
diff --git a/runvdr.template b/runvdr.template
index 63f283091..745db042a 100755
--- a/runvdr.template
+++ b/runvdr.template
@@ -20,7 +20,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr.template 3.0 2011/04/17 12:34:30 kls Exp $
+# $Id: runvdr.template 3.1 2015/02/05 10:28:53 kls Exp $
 
 VDRPRG="./vdr"
 
@@ -43,19 +43,21 @@ KILL="/usr/bin/killall -q -TERM"
 
 # Detect whether the DVB driver is already loaded
 # and return 0 if it *is* loaded, 1 if not:
-function DriverLoaded()
+DriverLoaded()
 {
   return 1
 }
 
 # Load all DVB driver modules needed for your hardware:
-function LoadDriver()
+LoadDriver()
 {
+  return 0
 }
 
 # Unload all DVB driver modules loaded in LoadDriver():
-function UnloadDriver()
+UnloadDriver()
 {
+  return 0
 }
 
 # Load driver if it hasn't been loaded already:
diff --git a/sources.conf b/sources.conf
index 1a59c2f8f..795ce7622 100644
--- a/sources.conf
+++ b/sources.conf
@@ -21,7 +21,8 @@
 
 S3E     Eutelsat 3A/3D & Rascom 1R
 S4E     Eutelsat 4B
-S4.8E   Astra 4A & SES 5
+S4.8E   Astra 4A
+S5E     SES 5
 S7E     Eutelsat 7A
 S9E     Eutelsat 9A/Ka-Sat 9A
 S10E    Eutelsat 10A
diff --git a/tools.c b/tools.c
index 332fce426..a83965ae8 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 3.3 2014/03/22 14:22:55 kls Exp $
+ * $Id: tools.c 3.4 2015/02/07 15:09:17 kls Exp $
  */
 
 #include "tools.h"
@@ -404,7 +404,7 @@ bool EntriesOnSameFileSystem(const char *File1, const char *File2)
      }
   else
      LOG_ERROR_STR(File1);
-  return false;
+  return true; // we only return false if both files actually exist and are in different file systems!
 }
 
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB)
diff --git a/tools.h b/tools.h
index 920a1d11b..f068174d0 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 3.6 2015/01/14 09:09:06 kls Exp $
+ * $Id: tools.h 3.7 2015/02/07 15:12:26 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -234,6 +234,9 @@ cString dtoa(double d, const char *Format = "%f");
 cString itoa(int n);
 cString AddDirectory(const char *DirName, const char *FileName);
 bool EntriesOnSameFileSystem(const char *File1, const char *File2);
+    ///< Checks whether the given files are on the same file system. If either of the
+    ///< files doesn't exist, this function returns *true* to avoid any actions that might be
+    ///< triggered if files are on different file system.
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);
 bool MakeDirs(const char *FileName, bool IsDirectory = false);

From f82cdfed409493ddac9316756afbf2dd504445c6 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Wed, 11 Feb 2015 12:15:00 +0100
Subject: [PATCH 241/307] Version 2.1.10 VDR developer version 2.1.10 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.10.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.9-2.1.10.diff

MD5 checksums:

889f053463e2720f1ad6517cc19e82f6  vdr-2.1.10.tar.bz2
c126fb89a79db55867ae9d9a869569aa  vdr-2.1.9-2.1.10.diff

Approaching version 2.2.0:
==========================

I have decided to release one more developer version because there were
complaints about missing functionality from the "jumpingseconds" and
"binary skip" patches regarding the Green/Yellow and Prev/Next keys, and
I didn't want to cause another "patch frenzy" in this newly refurbished
area of VDR. The other (more important) reason for this additional
developer release was the change in the return value of cOsd::RenderPixmaps(),
which is very important for plugins that implement their own version of
cPixmap, e.g. for use with fast graphics hardware.

If there are no more serious bug reports, the final version 2.2.0 of VDR
shall be released on February 19, 2015, which marks the 15th anniversary
of VDR.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

The following language files still have the given number of untranslated texts:

ar.po: 54
ca_ES.po: 54
cs_CZ.po: 54
da_DK.po: 187
el_GR.po: 250
es_ES.po: 54
et_EE.po: 3
fi_FI.po: 3
hr_HR.po: 187
hu_HU.po: 4
it_IT.po: 3
lt_LT.po: 3
mk_MK.po: 3
nn_NO.po: 315
pl_PL.po: 54
pt_PT.po: 82
ro_RO.po: 3
ru_RU.po: 54
sk_SK.po: 54
sl_SI.po: 55
sr_RS.po: 54
sv_SE.po: 54
tr_TR.po: 187
uk_UA.po: 3
zh_CN.po: 54

If nobody takes care of these, they will remain untranslated in version 2.2.0.

DEADLINE FOR SUBMITTING TRANSLATIONS IS WEDNESDAY, FEBRUARY 18!

From the HISTORY file:
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Added "#REMOTE=LIRC" to Make.config.template (suggested by Martin Dauskardt).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Increased the width of the left text column in the Setup menus to avoid cutting
  off German texts.
- Added an empty target to the Makefile to make sure the sub-make for libsi is always
  called (thanks to Sören Moch).
- Updated the Italian OSD texts (thanks to Diego Pierotto and Nino Gerbino).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- The new options "Setup/Replay/Skip distance with Green/Yellow keys" and
  "Setup/Replay/Skip distance with Green/Yellow keys in repeat" can be used to
  configure the number of seconds to skip when pressing these keys once or pressing
  and holding them (based on a patch from Matthias Senzel, originally from Tobias
  Faust).
- The new option "Setup/Replay/Use Prev/Next keys for adaptive skipping" can be used
  to change the behavior of these keys during replay. They normally jump between
  editing marks, but with this option set to 'yes' they will do adaptive skipping.
- The new command line option --chartab can be used to set the default character
  table to use for strings in the DVB data stream that don't begin with a proper
  character table indicator (suggested by Christopher Reimer). The old mechanism
  of using the environment variable VDR_CHARSET_OVERRIDE still works, but is now
  deprecated and may be removed in a future version. The value given in the --chartab
  option takes precedence over that in VDR_CHARSET_OVERRIDE.
- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
  (suggested by Thomas Reufer). This is necessary to allow plugins with derived
  cPixmap implementations to use this function. Plugins that use this function
  with cPixmapMemory now need to add a dynamic cast to the call, as in

    cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));

  They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
  the resulting pixmap after use.
  The dvbhddevice plugin has been modified accordingly.
- A cPixmap with a negative layer no longer marks any portion of the OSD's view port
  as "dirty" when drawing on it. This may improve performance when drawing on a
  hidden pixmap, because it avoids unnecessary refreshes of the OSD.
- Added a missing initialization of "panning" to the constructor of cPixmapMemory.
- Updated the Dutch OSD texts (thanks to Erik Oomen).
- Updated the French OSD texts (thanks to Régis Bossut).
- Fixed the German translation of "Zap timeout".
---
 CONTRIBUTORS                          |  19 +++-
 HISTORY                               |  49 ++++++++-
 INSTALL                               |   2 +-
 MANUAL                                |  17 +++
 Make.config.template                  |   5 +-
 Makefile                              |   7 +-
 PLUGINS/src/dvbhddevice/HISTORY       |   4 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c |   2 +-
 PLUGINS/src/dvbhddevice/hdffosd.c     |   4 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po   |   7 +-
 UPDATE-2.2.0                          |  33 +++++-
 config.c                              |  11 +-
 config.h                              |  13 ++-
 libsi/Makefile                        |   3 +-
 libsi/si.c                            |  15 ++-
 libsi/si.h                            |   5 +-
 menu.c                                |  23 +++-
 menuitems.c                           |   4 +-
 osd.c                                 |  62 ++++++-----
 osd.h                                 |  14 ++-
 po/ar.po                              |  11 +-
 po/ca_ES.po                           |  11 +-
 po/cs_CZ.po                           |  11 +-
 po/da_DK.po                           |  11 +-
 po/de_DE.po                           |  15 ++-
 po/el_GR.po                           |  11 +-
 po/es_ES.po                           |  11 +-
 po/et_EE.po                           |  45 ++++----
 po/fi_FI.po                           |  13 ++-
 po/fr_FR.po                           | 148 ++++++++++++++------------
 po/hr_HR.po                           |  11 +-
 po/hu_HU.po                           |  14 ++-
 po/it_IT.po                           |  35 +++---
 po/lt_LT.po                           |  19 +++-
 po/mk_MK.po                           | 115 +++++++++++---------
 po/nl_NL.po                           | 120 +++++++++++----------
 po/nn_NO.po                           |  11 +-
 po/pl_PL.po                           |  11 +-
 po/pt_PT.po                           |  11 +-
 po/ro_RO.po                           |  15 ++-
 po/ru_RU.po                           |  11 +-
 po/sk_SK.po                           |  11 +-
 po/sl_SI.po                           |  11 +-
 po/sr_RS.po                           |  11 +-
 po/sv_SE.po                           |  11 +-
 po/tr_TR.po                           |  11 +-
 po/uk_UA.po                           |  21 ++--
 po/zh_CN.po                           |  11 +-
 vdr.1                                 |   7 +-
 vdr.c                                 |  25 ++++-
 50 files changed, 767 insertions(+), 311 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 49fbcee4c..1a29554d7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -787,9 +787,10 @@ Peter Seyringer <e9425234@student.tuwien.ac.at>
 Stefan Schluenss <dxr3_osd@schluenss.de>
  for reporting a bug where PID handles were not closed correctly
 
-R�gis Bossut <rbossut@auchan.com>
+R�gis Bossut <famille.bossut@wanadoo.fr>
  for pointing out that with some providers the channels can only be distinguished
  through the RID
+ for translating OSD texts to the French language
 
 Andreas Kool <akool@akool.de>
  for his help in keeping 'channels.conf.cable' up to date
@@ -1703,6 +1704,7 @@ Martin Dauskardt <md001@gmx.de>
  cDevice::TrickSpeed()
  for renaming 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
  in 'make install'
+ for suggesting to add "#REMOTE=LIRC" to Make.config.template
 
 Maynard Cedric <maynard.cedric@wanadoo.fr>
  for reporting a problem in handling the color button texts in cMenuEditStrItem
@@ -2961,6 +2963,7 @@ Christopher Reimer <vdr@creimer.net>
  for reverting the change from version 1.5.7 that made all logging go to LOG_ERR
  for reporting a possible crash in the OSD demo
  for adding support for systemd
+ for suggesting to replace VDR_CHARSET_OVERRIDE with a command line option
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -3181,6 +3184,8 @@ S
  ci.c to no longer compile with older versions of gcc
  for suggesting to make the "Select folder" menu add the folder names of all existing
  recordings to any names that have been predefined in "folders.conf"
+ for adding an empty target to the Makefile to make sure the sub-make for libsi is
+ always called
 
 Peter M�nster <pmlists@free.fr>
  for fixing 'make install' to not overwrite existing configuration files
@@ -3230,6 +3235,7 @@ Matthias Senzel <matthias.senzel@t-online.de>
  for fixing the German translation of "Binary skip timeout (s)"
  for reporting a bug in switching channels in the Schedule menu after going through
  various Now and Schedule menus for different channels
+ for the "jumpingseconds" patch
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
@@ -3303,6 +3309,8 @@ Thomas Reufer <thomas@reufer.ch>
  for adding cOsdProvider::OsdSizeChanged()
  for suggesting to change the German translations if the texts related to "binary
  skipping"
+ for suggesting to change the return value of cOsd::RenderPixmaps() from cPixmapMemory
+ to cPixmap
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
@@ -3363,5 +3371,14 @@ Martin Schirrmacher <schirrmie@gmail.com>
 Mario Fenneis <admin@mediastreambox.at>
  for translating OSD texts to the Hungarian language
 
+Clemens Brauers <vdr@admin-cb.de>
+ for modifying runvdr.template to improve compatibility with the "bash" and "dash" shells
+
 Stefan Herdler <herdler@gmx.de>
  for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
+
+Tobias Faust <tobias.faust@gmx.de>
+ for the original "jumpingseconds" patch
+
+Erik Oomen <oomen.e@gmail.com>
+ for translating OSD texts to the Dutch language
diff --git a/HISTORY b/HISTORY
index ed9f24c80..62406e8a6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8497,7 +8497,8 @@ Video Disk Recorder Revision History
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Fixed the German translations of "latitude" and "longitude" (they were swapped).
 - Updated the Hungarian OSD texts (thanks to Mario Fenneis).
-- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
+- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells
+  (thanks to Clemens Brauers).
 - Changed the German translations if the texts related to "binary skipping" (based
   on a suggestion by Thomas Reufer).
 - Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
@@ -8521,3 +8522,49 @@ Video Disk Recorder Revision History
   that it is initialized to 'true' and will only be set to 'false' if the entire
   copy process has been successful (problem reported by Christoph Haubrich).
 - Added the UPDATE-2.2.0 file.
+
+2015-02-11: Version 2.1.10
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Added "#REMOTE=LIRC" to Make.config.template (suggested by Martin Dauskardt).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Increased the width of the left text column in the Setup menus to avoid cutting
+  off German texts.
+- Added an empty target to the Makefile to make sure the sub-make for libsi is always
+  called (thanks to S�ren Moch).
+- Updated the Italian OSD texts (thanks to Diego Pierotto and Nino Gerbino).
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- The new options "Setup/Replay/Skip distance with Green/Yellow keys" and
+  "Setup/Replay/Skip distance with Green/Yellow keys in repeat" can be used to
+  configure the number of seconds to skip when pressing these keys once or pressing
+  and holding them (based on a patch from Matthias Senzel, originally from Tobias
+  Faust).
+- The new option "Setup/Replay/Use Prev/Next keys for adaptive skipping" can be used
+  to change the behavior of these keys during replay. They normally jump between
+  editing marks, but with this option set to 'yes' they will do adaptive skipping.
+- The new command line option --chartab can be used to set the default character
+  table to use for strings in the DVB data stream that don't begin with a proper
+  character table indicator (suggested by Christopher Reimer). The old mechanism
+  of using the environment variable VDR_CHARSET_OVERRIDE still works, but is now
+  deprecated and may be removed in a future version. The value given in the --chartab
+  option takes precedence over that in VDR_CHARSET_OVERRIDE.
+- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
+  (suggested by Thomas Reufer). This is necessary to allow plugins with derived
+  cPixmap implementations to use this function. Plugins that use this function
+  with cPixmapMemory now need to add a dynamic cast to the call, as in
+
+    cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));
+
+  They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
+  the resulting pixmap after use.
+  The dvbhddevice plugin has been modified accordingly.
+- A cPixmap with a negative layer no longer marks any portion of the OSD's view port
+  as "dirty" when drawing on it. This may improve performance when drawing on a
+  hidden pixmap, because it avoids unnecessary refreshes of the OSD.
+- Added a missing initialization of "panning" to the constructor of cPixmapMemory.
+- Updated the Dutch OSD texts (thanks to Erik Oomen).
+- Updated the French OSD texts (thanks to R�gis Bossut).
+- Fixed the German translation of "Zap timeout".
diff --git a/INSTALL b/INSTALL
index 07581b569..8dcef756e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -141,7 +141,7 @@ According to "ETSI EN 300 468" the default character set fo SI data is
 ISO6937. But unfortunately some broadcasters actually use ISO-8859-9 or
 other encodings, but fail to correctly announce that.
 Users who want to set the default character set to something different can
-do this by setting the environment variable VDR_CHARSET_OVERRIDE to something
+do this by using the command line option --chartab with something
 like ISO-8859-9.
 
 Start script with automatic restart in case of hangups:
diff --git a/MANUAL b/MANUAL
index b0b7fa59d..a04a63f4b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1026,6 +1026,23 @@ Version 2.0
                          halved if the direction actually changes. That way, even if
                          you missed the target point, you can still back up to it.
 
+  Use Prev/Next keys for adaptive skipping = no
+                         Normally the Prev/Next keys jump between editing marks (or
+                         the beginning/end of the recording). You can set this option
+                         to 'yes' if you want to use these keys for adaptive skipping
+                         instead.
+
+  Skip distance with Green/Yellow keys (s) = 60
+                         Defines the number of seconds to skip in either direction
+                         when pressing the "Green" or "Yellow" key, respectively.
+                         The valid range is 5...600.
+
+  Skip distance with Green/Yellow keys in repeat (s) = 60
+                         Defines the number of seconds to skip in either direction
+                         when pressing and holding the "Green" or "Yellow" key,
+                         respectively.
+                         The valid range is 5...600.
+
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
                          files for each recording. The valid range is 0...99, with
diff --git a/Make.config.template b/Make.config.template
index 523926bdf..8768f3b95 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.3 2015/02/02 09:07:07 kls Exp $
+# $Id: Make.config.template 3.4 2015/02/09 09:58:45 kls Exp $
 
 ### The C compiler and options:
 
@@ -69,6 +69,9 @@ endif
 ### The remote control:
 LIRC_DEVICE = /var/run/lirc/lircd
 
+### Define if you always want to use LIRC, independent of the --lirc option:
+#REMOTE=LIRC
+
 ### Define if you don't want keyboard remote control:
 #NO_KBD = 1
 
diff --git a/Makefile b/Makefile
index a69fb4eb8..97220364d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 3.5 2015/02/02 14:47:24 kls Exp $
+# $Id: Makefile 3.6 2015/02/09 12:28:24 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -139,8 +139,9 @@ vdr: $(OBJS) $(SILIB)
 
 # The libsi library:
 
-$(SILIB):
-	$(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all
+$(SILIB): make-libsi
+	@$(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all
+make-libsi: # empty rule makes sure the sub-make for libsi is always called
 
 # pkg-config file:
 
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index b26b0c485..cd7f5da36 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -98,3 +98,7 @@ VDR Plugin 'dvbhddevice' Revision History
 
 - The function cDevice::GetVideoSystem() has been deprecated.
 - Removed old-style video format setting functions.
+
+2015-02-11: Version 2.1.7
+
+- Adapted to the new return value of cOsd::RenderPixmaps().
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 045b0a9da..1e5da44f6 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.6";
+static const char *VERSION        = "2.1.7";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
index 47a5ab053..3ce28bfa2 100644
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ b/PLUGINS/src/dvbhddevice/hdffosd.c
@@ -681,7 +681,7 @@ void cHdffOsdRaw::Flush(void)
                 return;
         }
         LOCK_PIXMAPS;
-        while (cPixmapMemory *pm = RenderPixmaps())
+        while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()))
         {
             int w = pm->ViewPort().Width();
             int h = pm->ViewPort().Height();
@@ -736,7 +736,7 @@ void cHdffOsdRaw::Flush(void)
                         HDFF_COLOR_TYPE_ARGB4444, HDFF_INVALID_HANDLE);
                 }
             }
-            delete pm;
+            DestroyPixmap(pm);
             render = true;
         }
         if (buffer)
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index cfb4b1b54..a636d939f 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -9,16 +9,15 @@ msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-09-21 14:01+0200\n"
-"PO-Revision-Date: 2013-09-19 00:00+0100\n"
+"PO-Revision-Date: 2015-02-08 19:48+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "HD Full Featured DVB device"
 msgstr "Scheda DVB HD Full Featured"
@@ -126,7 +125,7 @@ msgid "Allow True Color OSD"
 msgstr "Permetti OSD True Color"
 
 msgid "True Color format"
-msgstr ""
+msgstr "Formato True Color"
 
 msgid "Hide mainmenu entry"
 msgstr "Nascondi voce menu principale"
diff --git a/UPDATE-2.2.0 b/UPDATE-2.2.0
index fe516bdbe..566da1f58 100644
--- a/UPDATE-2.2.0
+++ b/UPDATE-2.2.0
@@ -127,6 +127,15 @@ Plugins:
 - Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
   can call to signal a change in the OSD that requires a redraw of the currently
   displayed object.
+- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
+  This is necessary to allow plugins with derived cPixmap implementations to use this
+  function. Plugins that use this function with cPixmapMemory now need to add
+  a dynamic cast to the call, as in
+
+    cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));
+
+  They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
+  the resulting pixmap after use.
 
 Skins:
 
@@ -220,6 +229,15 @@ OSD:
   is unexpected at this point. You can still navigate to
   the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
   menu.
+- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
+  This is necessary to allow plugins with derived cPixmap implementations to use this
+  function. Plugins that use this function with cPixmapMemory now need to add
+  a dynamic cast to the call, as in
+
+    cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));
+
+  They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
+  the resulting pixmap after use.
 
 Channels:
 
@@ -329,6 +347,13 @@ Replay:
   to make adaptive skipping only halve the skip distance when the direction changes.
   That way you can reach the desired point in a recording even if you make one too
   many skips in a certain direction (see MANUAL for details).
+- The new options "Setup/Replay/Skip distance with Green/Yellow keys" and
+  "Setup/Replay/Skip distance with Green/Yellow keys in repeat" can be used to
+  configure the number of seconds to skip when pressing these keys once or pressing
+  and holding them.
+- The new option "Setup/Replay/Use Prev/Next keys for adaptive skipping" can be used
+  to change the behavior of these keys during replay. They normally jump between
+  editing marks, but with this option set to 'yes' they will do adaptive skipping.
 
 SVDRP:
 
@@ -378,7 +403,7 @@ Misc:
   "Mo.Di.Mi.Do.Fr.Sa.So.".
 - Added the channel name to log messages that reference a channel.
 - Added ARGSDIR to the ONEDIR section of Make.config.template.
-- Added SDNOTIFY, NO_KBD and BIDI to Make.config.template.
+- Added SDNOTIFY, NO_KBD, BIDI and REMOTE to Make.config.template.
 - Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
 - Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
   two separate positions.
@@ -386,3 +411,9 @@ Misc:
   functions is now exacly as described in the header file. Editing marks that are
   placed at exactly the same offset in a recording are now preserved in the cutting
   process.
+- The new command line option --chartab can be used to set the default character
+  table to use for strings in the DVB data stream that don't begin with a proper
+  character table indicator. The old mechanism of using the environment variable
+  VDR_CHARSET_OVERRIDE still works, but is now deprecated and may be removed in a
+  future version. The value given in the --chartab option takes precedence over
+  that in VDR_CHARSET_OVERRIDE.
diff --git a/config.c b/config.c
index 37f905880..9c6b71e56 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.8 2015/02/06 10:10:22 kls Exp $
+ * $Id: config.c 3.10 2015/02/10 12:24:13 kls Exp $
  */
 
 #include "config.h"
@@ -476,6 +476,9 @@ cSetup::cSetup(void)
   AdaptiveSkipInitial = 120;
   AdaptiveSkipTimeout = 3;
   AdaptiveSkipAlternate = 0;
+  AdaptiveSkipPrevNext = 0;
+  SkipSeconds = 60;
+  SkipSecondsRepeat = 60;
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
@@ -695,6 +698,9 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "AdaptiveSkipInitial")) AdaptiveSkipInitial= atoi(Value);
   else if (!strcasecmp(Name, "AdaptiveSkipTimeout")) AdaptiveSkipTimeout= atoi(Value);
   else if (!strcasecmp(Name, "AdaptiveSkipAlternate")) AdaptiveSkipAlternate = atoi(Value);
+  else if (!strcasecmp(Name, "AdaptiveSkipPrevNext")) AdaptiveSkipPrevNext = atoi(Value);
+  else if (!strcasecmp(Name, "SkipSeconds"))         SkipSeconds        = atoi(Value);
+  else if (!strcasecmp(Name, "SkipSecondsRepeat"))   SkipSecondsRepeat  = atoi(Value);
   else if (!strcasecmp(Name, "ResumeID"))            ResumeID           = atoi(Value);
   else if (!strcasecmp(Name, "CurrentChannel"))      CurrentChannel     = atoi(Value);
   else if (!strcasecmp(Name, "CurrentVolume"))       CurrentVolume      = atoi(Value);
@@ -818,6 +824,9 @@ bool cSetup::Save(void)
   Store("AdaptiveSkipInitial",AdaptiveSkipInitial);
   Store("AdaptiveSkipTimeout",AdaptiveSkipTimeout);
   Store("AdaptiveSkipAlternate", AdaptiveSkipAlternate);
+  Store("AdaptiveSkipPrevNext", AdaptiveSkipPrevNext);
+  Store("SkipSeconds",        SkipSeconds);
+  Store("SkipSecondsRepeat",  SkipSecondsRepeat);
   Store("ResumeID",           ResumeID);
   Store("CurrentChannel",     CurrentChannel);
   Store("CurrentVolume",      CurrentVolume);
diff --git a/config.h b/config.h
index 5a81fd028..7220d9621 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.17 2015/02/06 09:53:50 kls Exp $
+ * $Id: config.h 3.20 2015/02/10 14:29:27 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.9"
-#define VDRVERSNUM   20109  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.1.10"
+#define VDRVERSNUM   20110  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.9"
-#define APIVERSNUM   20109  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.1.10"
+#define APIVERSNUM   20110  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -340,6 +340,9 @@ class cSetup : public cConfig<cSetupLine> {
   int AdaptiveSkipInitial;
   int AdaptiveSkipTimeout;
   int AdaptiveSkipAlternate;
+  int AdaptiveSkipPrevNext;
+  int SkipSeconds;
+  int SkipSecondsRepeat;
   int ResumeID;
   int CurrentChannel;
   int CurrentVolume;
diff --git a/libsi/Makefile b/libsi/Makefile
index 2219af698..2221673cf 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 3.0 2012/12/18 13:35:54 kls Exp $
+# $Id: Makefile 3.1 2015/02/11 10:24:54 kls Exp $
 
 ### The archiver options:
 
@@ -32,6 +32,7 @@ $(DEPFILE): Makefile
 ### Targets:
 
 all: libsi.a
+	@:
 
 libsi.a : $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
diff --git a/libsi/si.c b/libsi/si.c
index 3d5169f66..e51770ab7 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 3.2 2015/02/01 14:55:27 kls Exp $
+ *   $Id: si.c 3.3 2015/02/10 13:42:41 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -319,6 +319,14 @@ bool systemCharacterTableIsSingleByte(void)
   return SystemCharacterTableIsSingleByte;
 }
 
+static char *OverrideCharacterTable = NULL;
+
+void SetOverrideCharacterTable(const char *CharacterTable)
+{
+  free(OverrideCharacterTable);
+  OverrideCharacterTable = CharacterTable ? strdup(CharacterTable) : NULL;
+}
+
 bool SetSystemCharacterTable(const char *CharacterTable) {
    if (CharacterTable) {
       for (unsigned int i = 0; i < NumEntries(CharacterTables1); i++) {
@@ -348,9 +356,8 @@ const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *i
    // Workaround for broadcaster stupidity: according to
    // "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some
    // broadcasters actually use ISO-8859-9, but fail to correctly announce that.
-   static const char *CharsetOverride = getenv("VDR_CHARSET_OVERRIDE");
-   if (CharsetOverride)
-      cs = CharsetOverride;
+   if (OverrideCharacterTable)
+      cs = OverrideCharacterTable;
    if (isSingleByte)
       *isSingleByte = false;
    if (length <= 0)
diff --git a/libsi/si.h b/libsi/si.h
index 7c6f0e3ee..e70de6851 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 3.3 2015/02/01 14:55:27 kls Exp $
+ *   $Id: si.h 3.4 2015/02/10 13:54:28 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -522,6 +522,9 @@ class String : public VariableLengthPart {
    void decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
 };
 
+// Set the character table to use for strings that do not begin with a character
+// table indicator. Call with NULL to turn this off.
+void SetOverrideCharacterTable(const char *CharacterTable);
 // Call this function to set the system character table. CharacterTable is a string
 // like "iso8859-15" or "utf-8" (case insensitive).
 // Returns true if the character table was recognized.
diff --git a/menu.c b/menu.c
index 6906cc65a..ae61c64d5 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.46 2015/02/07 15:56:26 kls Exp $
+ * $Id: menu.c 3.48 2015/02/10 12:37:06 kls Exp $
  */
 
 #include "menu.h"
@@ -3730,6 +3730,9 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   Add(new cMenuEditIntItem( tr("Setup.Replay$Initial duration for adaptive skipping (s)"), &data.AdaptiveSkipInitial, 10, 600));
   Add(new cMenuEditIntItem( tr("Setup.Replay$Reset timeout for adaptive skipping (s)"), &data.AdaptiveSkipTimeout, 0, 10));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Alternate behavior for adaptive skipping"), &data.AdaptiveSkipAlternate));
+  Add(new cMenuEditBoolItem(tr("Setup.Replay$Use Prev/Next keys for adaptive skipping"), &data.AdaptiveSkipPrevNext));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Skip distance with Green/Yellow keys (s)"), &data.SkipSeconds, 5, 600));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"), &data.SkipSecondsRepeat, 5, 600));
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
@@ -5583,9 +5586,11 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
     case kRight:   Forward(); break;
     case kRed:     TimeSearch(); break;
     case kGreen|k_Repeat:
-    case kGreen:   SkipSeconds(-60); break;
+                   SkipSeconds(-Setup.SkipSecondsRepeat); break;
+    case kGreen:   SkipSeconds(-Setup.SkipSeconds); break;
     case kYellow|k_Repeat:
-    case kYellow:  SkipSeconds( 60); break;
+                   SkipSeconds(Setup.SkipSecondsRepeat); break;
+    case kYellow:  SkipSeconds(Setup.SkipSeconds); break;
     case kStop:
     case kBlue:    Hide();
                    Stop();
@@ -5596,11 +5601,19 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
         // Editing:
         case kMarkToggle:      MarkToggle(); break;
         case kPrev|k_Repeat:
-        case kPrev:
+        case kPrev:            if (Setup.AdaptiveSkipPrevNext) {
+                                  MarkMove(-adaptiveSkipper.GetValue(RAWKEY(Key)), false);
+                                  break;
+                                  }
+                               // fall through...
         case kMarkJumpBack|k_Repeat:
         case kMarkJumpBack:    MarkJump(false); break;
         case kNext|k_Repeat:
-        case kNext:
+        case kNext:            if (Setup.AdaptiveSkipPrevNext) {
+                                  MarkMove(+adaptiveSkipper.GetValue(RAWKEY(Key)), false);
+                                  break;
+                                  }
+                               // fall through...
         case kMarkJumpForward|k_Repeat:
         case kMarkJumpForward: MarkJump(true); break;
         case kMarkMoveBack|k_Repeat:
diff --git a/menuitems.c b/menuitems.c
index a7f828331..d0a068d57 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 3.2 2013/11/03 14:48:21 kls Exp $
+ * $Id: menuitems.c 3.3 2015/02/09 11:53:10 kls Exp $
  */
 
 #include "menuitems.h"
@@ -1168,7 +1168,7 @@ eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
 // --- cMenuSetupPage --------------------------------------------------------
 
 cMenuSetupPage::cMenuSetupPage(void)
-:cOsdMenu("", 33)
+:cOsdMenu("", 36)
 {
   SetMenuCategory(mcSetup);
   plugin = NULL;
diff --git a/osd.c b/osd.c
index d31ee8a3a..a475488e1 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 3.4 2015/01/15 11:20:56 kls Exp $
+ * $Id: osd.c 3.5 2015/02/11 09:48:02 kls Exp $
  */
 
 #include "osd.h"
@@ -984,12 +984,13 @@ cPixmap::cPixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)
 
 void cPixmap::MarkViewPortDirty(const cRect &Rect)
 {
-  dirtyViewPort.Combine(Rect.Intersected(viewPort));
+  if (layer >= 0)
+     dirtyViewPort.Combine(Rect.Intersected(viewPort));
 }
 
 void cPixmap::MarkViewPortDirty(const cPoint &Point)
 {
-  if (viewPort.Contains(Point))
+  if (layer >= 0 && viewPort.Contains(Point))
      dirtyViewPort.Combine(Point);
 }
 
@@ -1025,11 +1026,18 @@ void cPixmap::SetLayer(int Layer)
      esyslog("ERROR: pixmap layer %d limited to %d", Layer, MAXPIXMAPLAYERS - 1);
      Layer = MAXPIXMAPLAYERS - 1;
      }
-  if (Layer != layer) {
-     if (Layer > 0 || layer > 0)
-        MarkViewPortDirty(viewPort);
+  // The sequence here is important, because the view port is only marked as dirty
+  // if the layer is >= 0:
+  if (layer >= 0) {
+     MarkViewPortDirty(viewPort); // the pixmap is visible and may or may not become invisible
+     layer = Layer;
+     }
+  else if (Layer >= 0) {
      layer = Layer;
+     MarkViewPortDirty(viewPort); // the pixmap was invisible and has become visible
      }
+  else
+     layer = Layer; // the pixmap was invisible and remains so
   Unlock();
 }
 
@@ -1141,6 +1149,7 @@ cPixmapMemory::cPixmapMemory(int Layer, const cRect &ViewPort, const cRect &Draw
 :cPixmap(Layer, ViewPort, DrawPort)
 {
   data = MALLOC(tColor, this->DrawPort().Width() * this->DrawPort().Height());
+  panning = false;
 }
 
 cPixmapMemory::~cPixmapMemory()
@@ -1714,7 +1723,8 @@ void cOsd::DestroyPixmap(cPixmap *Pixmap)
      LOCK_PIXMAPS;
      for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed!
          if (pixmaps[i] == Pixmap) {
-            pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort());
+            if (Pixmap->Layer() >= 0)
+               pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort());
             delete Pixmap;
             pixmaps[i] = NULL;
             return;
@@ -1737,9 +1747,9 @@ cPixmap *cOsd::AddPixmap(cPixmap *Pixmap)
   return Pixmap;
 }
 
-cPixmapMemory *cOsd::RenderPixmaps(void)
+cPixmap *cOsd::RenderPixmaps(void)
 {
-  cPixmapMemory *Pixmap = NULL;
+  cPixmap *Pixmap = NULL;
   if (isTrueColor) {
      LOCK_PIXMAPS;
      // Collect overlapping dirty rectangles:
@@ -1762,25 +1772,27 @@ cPixmapMemory *cOsd::RenderPixmaps(void)
         d.Combine(OldDirty);
         OldDirty = NewDirty;
 #endif
-        Pixmap = new cPixmapMemory(0, d);
-        Pixmap->Clear();
-        // Render the individual pixmaps into the resulting pixmap:
-        for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) {
-            for (int i = 0; i < pixmaps.Size(); i++) {
-                if (cPixmap *pm = pixmaps[i]) {
-                   if (pm->Layer() == Layer)
-                   Pixmap->DrawPixmap(pm, d);
+        Pixmap = CreatePixmap(-1, d);
+        if (Pixmap) {
+           Pixmap->Clear();
+           // Render the individual pixmaps into the resulting pixmap:
+           for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) {
+               for (int i = 0; i < pixmaps.Size(); i++) {
+                   if (cPixmap *pm = pixmaps[i]) {
+                      if (pm->Layer() == Layer)
+                         Pixmap->DrawPixmap(pm, d);
+                      }
                    }
-                }
-            }
+               }
 #ifdef DebugDirty
-        cPixmapMemory DirtyIndicator(7, NewDirty);
-        static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF };
-        static int DirtyIndicatorIndex = 0;
-        DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]);
-        DirtyIndicatorIndex = 1 - DirtyIndicatorIndex;
-        Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point()));
+           cPixmapMemory DirtyIndicator(7, NewDirty);
+           static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF };
+           static int DirtyIndicatorIndex = 0;
+           DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]);
+           DirtyIndicatorIndex = 1 - DirtyIndicatorIndex;
+           Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point()));
 #endif
+           }
         }
      }
   return Pixmap;
diff --git a/osd.h b/osd.h
index e5864c4fb..9ef32ac78 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 3.5 2015/01/15 11:23:52 kls Exp $
+ * $Id: osd.h 3.6 2015/02/11 09:48:02 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -763,12 +763,13 @@ class cOsd {
        ///< the pixmap could not be added to the list.
        ///< A derived class that implements its own cPixmap class must call AddPixmap()
        ///< in order to add a newly created pixmap to the OSD's list of pixmaps.
-  cPixmapMemory *RenderPixmaps(void);
+  cPixmap *RenderPixmaps(void);
        ///< Renders the dirty part of all pixmaps into a resulting pixmap that
        ///< shall be displayed on the OSD. The returned pixmap's view port is
        ///< set to the location of the rectangle on the OSD that needs to be
        ///< refreshed; its draw port's origin is at (0, 0), and it has the same
        ///< size as the view port.
+       ///< Only pixmaps with a non-negative layer value are rendered.
        ///< If there are several non-overlapping dirty rectangles from different pixmaps,
        ///< they are returned separately in order to avoid re-rendering large parts
        ///< of the OSD that haven't changed at all. The caller must therefore call
@@ -778,7 +779,7 @@ class cOsd {
        ///< by putting a LOCK_PIXMAPS into the scope of the operation).
        ///< If there are no dirty pixmaps, or if this is not a true color OSD,
        ///< this function returns NULL.
-       ///< The caller must delete the returned pixmap after use.
+       ///< The caller must call DestroyPixmap() for the returned pixmap after use.
 public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
@@ -930,13 +931,16 @@ class cOsd {
        ///< pixmaps, the Flush() function should basically do something like this:
        ///<
        ///<  LOCK_PIXMAPS;
-       ///<  while (cPixmapMemory *pm = RenderPixmaps()) {
+       ///<  while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps())) {
        ///<        int w = pm->ViewPort().Width();
        ///<        int h = pm->ViewPort().Height();
        ///<        int d = w * sizeof(tColor);
        ///<        MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
-       ///<        delete pm;
+       ///<        DestroyPixmap(pm);
        ///<        }
+       ///<
+       ///< If a plugin uses a derived cPixmap implementation, it needs to use that
+       ///< type instead of cPixmapMemory.
   };
 
 #define MAXOSDIMAGES 64
diff --git a/po/ar.po b/po/ar.po
index fa142f3d6..bc8504159 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1257,6 +1257,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3802c001b..5be0a2e53 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1256,6 +1256,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 31ff8fc9c..ff153dab0 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1256,6 +1256,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 2471f2281..382704e87 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 46cf5c496..fb7a0af00 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2010-01-16 16:46+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"PO-Revision-Date: 2015-02-10 13:45+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
@@ -1253,6 +1253,15 @@ msgstr "Zeitlimit beim Halbieren der Sprungweite (s)"
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Sprungweite nur bei Richtungswechsel halbieren"
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr "Zur�ck/Vorw�rts-Tasten halbieren Sprungweite"
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr "Sprungweite mit Taste Gr�n/Gelb (s)"
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr "Sprungweite mit Taste Gr�n/Gelb bei Wiederh. (s)"
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
@@ -1269,7 +1278,7 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP trennen bei Inaktivit�t (s)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Mindestzeit f�r Kanalhistorie (s)"
+msgstr "Mindestzeit f�r vorherigen Kanal (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Zeitlimit f�r Kanaleingabe (ms)"
diff --git a/po/el_GR.po b/po/el_GR.po
index 560135e97..6e3552e6d 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index b88eb56f0..e6b488a0e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index f5ad778d6..5caeb5072 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,13 +1,13 @@
 # VDR language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Arthur Konovalov <artlov@gmail.com>, 2004-2013
+# Arthur Konovalov <artlov@gmail.com>, 2004-2013, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -483,7 +483,7 @@ msgid "Key$Channels"
 msgstr "Kanalid"
 
 msgid "Key$Timers"
-msgstr "Taimer"
+msgstr "Taimerid"
 
 msgid "Key$Recordings"
 msgstr "Salvestused"
@@ -676,7 +676,7 @@ msgid "Select folder"
 msgstr "Kausta valik"
 
 msgid "Timers"
-msgstr "Taimer"
+msgstr "Taimerid"
 
 msgid "Button$On/Off"
 msgstr "On/Off"
@@ -700,7 +700,7 @@ msgid "Button$Record"
 msgstr "Salvestada"
 
 msgid "Button$Switch"
-msgstr "Valida"
+msgstr "Vali"
 
 msgid "What's on now?"
 msgstr "Hetkel eetris"
@@ -794,10 +794,10 @@ msgid "Edited version already exists - overwrite?"
 msgstr "Redigeeritud versioon juba olemas - kirjutada üle?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr "Salvestuse lõikamiseks lisamine ebaõnnestus!"
+msgstr "Salvestuse lisamine lõikamiseks ebaõnnestus!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Nimetada salvestuse nimi kaustaks?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Kustutada selle salvestuse markerid?"
@@ -839,7 +839,7 @@ msgid "Recording commands"
 msgstr "Salvestuse käsud"
 
 msgid "never"
-msgstr "ei"
+msgstr "ealeski"
 
 msgid "skin dependent"
 msgstr "kestast sõltuv"
@@ -878,7 +878,7 @@ msgid "Setup.OSD$Use small font"
 msgstr "Väikese fondi kasutus"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Fondi silumine"
+msgstr "Fondi sakitõrje"
 
 msgid "Setup.OSD$Default font"
 msgstr "Vaikefont"
@@ -1018,7 +1018,7 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Esmane DVB seade"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr "Standardivastavavus"
+msgstr "Standardivastavus"
 
 msgid "Setup.DVB$Video format"
 msgstr "TV külgsuhe"
@@ -1100,7 +1100,7 @@ msgid "East"
 msgstr "itta (E)"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr "Positsioneerija max pöördeulatus (°)"
+msgstr "Positsioneerija pöördeulatus (°)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
 msgstr "Positsioneerija kiirus (°/s)"
@@ -1179,7 +1179,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Salvestuse eluiga (päevi)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Pausi klahvi käsitsemine"
+msgstr "Pausi klahvi käsitlemine"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Pausi prioriteet"
@@ -1221,7 +1221,7 @@ msgid "Replay"
 msgstr "Taasesitus"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Mitme kiiruse režiim"
+msgstr "Mitmikkiiruse režiim"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Korduse režiimi kuvamine"
@@ -1245,12 +1245,21 @@ msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Paus viimasel markeril"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Adaptiivse hüppe kestuse algväärtus (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Adaptiivse hüppe lähtestamise viide (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Adaptiivse hüppe vaheldumine käitumine"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1365,10 +1374,10 @@ msgid "No free DVB device to record!"
 msgstr "Puudub vaba DVB seade salvestamiseks!"
 
 msgid "Pausing live video..."
-msgstr "Otseülekande peatamine..."
+msgstr "Otseedastuse peatamine..."
 
 msgid "Delete timeshift recording?"
-msgstr "Kustutada ajanihke salvestus?"
+msgstr "Kustutada ajanihke salvestust?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
@@ -1378,7 +1387,7 @@ msgid "No editing marks defined!"
 msgstr "Redigeerimise markerid puuduvad!"
 
 msgid "No editing sequences defined!"
-msgstr "Redigeerimise järjestus puudub!"
+msgstr "Redigeerimise järjestus määramata!"
 
 msgid "Can't start editing process!"
 msgstr "Redigeerimise start ebaõnnestus!"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f7f81c53f..7cf860aab 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -801,7 +801,7 @@ msgid "Error while queueing recording for cutting!"
 msgstr "Tallenteen lisääminen leikkausjonoon epäonnistui!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Nimeä tallenne kansion mukaan?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Poistetaanko muokkausmerkinnät tallenteelta?"
@@ -1257,6 +1257,15 @@ msgstr "Mukautuvan hypyn nollausviive (s)"
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Käytä vaihtoehtoista mukautuvaa hyppyä"
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index f529a9c46..a5a34add9 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -12,14 +12,15 @@
 # Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
 # Peter Münster <pmlists@free.fr>, 2013
 # Dominique Plu <dplu@free.fr>, 2013
+# Régis Bossut <famille.bossut@wanadoo.fr>, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2013-02-24 12:56+0100\n"
-"Last-Translator: Dominique Plu <dplu@free.fr>\n"
+"POT-Creation-Date: 2015-02-11 11:02+0100\n"
+"PO-Revision-Date: 2015-02-10 17:16+0100\n"
+"Last-Translator: Régis Bossut <famille.bossut@wanadoo.fr>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +31,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Chaîne invalide ! ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM activée !"
 
 msgid "Channel not available!"
 msgstr "Chaîne non disponible !"
@@ -90,13 +91,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilote"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "ID système T2"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Mise à jour du guide des programmes"
@@ -340,7 +341,7 @@ msgstr "Direct"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr "À partir de %d"
+msgstr "à partir de %d ans"
 
 msgid "No title"
 msgstr "Sans titre"
@@ -354,7 +355,7 @@ msgid "LanguageCode$eng"
 msgstr "fra"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Phase 1: Détection du type de télécommande"
+msgstr "Phase 1 : Détection du type de télécommande"
 
 msgid "Press any key on the RC unit"
 msgstr "Appuyer sur une touche de la télécommande"
@@ -366,7 +367,7 @@ msgid "Do not press any key..."
 msgstr "N'appuyer sur aucune touche..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Phase 2: Apprentissage des touches"
+msgstr "Phase 2 : Apprentissage des touches"
 
 #, c-format
 msgid "Press key for '%s'"
@@ -391,7 +392,7 @@ msgid "Learning Remote Control Keys"
 msgstr "Apprentissage des touches de la télécommande"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Phase 3: Sauvegarde des touches"
+msgstr "Phase 3 : Sauvegarde des touches"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler"
@@ -538,7 +539,7 @@ msgid "Free To Air"
 msgstr "En clair"
 
 msgid "encrypted"
-msgstr "Crypté"
+msgstr "crypté"
 
 msgid "Edit channel"
 msgstr "Modifier la chaîne"
@@ -586,13 +587,13 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
-msgstr "Cette chaîne n'est pas unique !"
+msgstr "Les paramètres de cette chaîne ne sont pas uniques !"
 
 msgid "Channels"
 msgstr "Chaînes"
@@ -622,7 +623,7 @@ msgid "New folder"
 msgstr "Nouveau dossier"
 
 msgid "Sub folder"
-msgstr "Sous dossier"
+msgstr "Sous-dossier"
 
 msgid "Folder name already exists!"
 msgstr "Ce nom de dossier existe déjà !"
@@ -635,7 +636,7 @@ msgid "Button$Open"
 msgstr "Ouvrir"
 
 msgid "Delete folder and all sub folders?"
-msgstr "Supprimer le dossier et tous les sous dossiers ?"
+msgstr "Supprimer le dossier et tous les sous-dossiers ?"
 
 msgid "Delete folder?"
 msgstr "Supprimer le dossier ?"
@@ -689,7 +690,7 @@ msgid "Timers"
 msgstr "Programmations"
 
 msgid "Button$On/Off"
-msgstr "Marche/Arr"
+msgstr "Marche/Arrêt"
 
 msgid "Button$Info"
 msgstr "Info"
@@ -736,13 +737,13 @@ msgstr "Programme - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "Cet événement - %s"
+msgstr "Cet évènement - %s"
 
 msgid "This event - all channels"
-msgstr "Cet événement - toutes les chaînes"
+msgstr "Cet évènement - toutes les chaînes"
 
 msgid "All events - all channels"
-msgstr "Tous les événements - toutes les chaînes"
+msgstr "Tous les évènements - toutes les chaînes"
 
 #, c-format
 msgid "Please enter %d digits!"
@@ -752,74 +753,74 @@ msgid "CAM not responding!"
 msgstr "Pas de réponse du CAM"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Éditer le chemin"
 
 msgid "Folder"
-msgstr ""
+msgstr "Dossier"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Ce dossier est en cours d'utilisation - pas de modification possible !"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Déplacer tout le dossier contenant %d enregistrements ?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Erreur lors du déplacement du dossier !"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Éditer l'enregistrement"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Cet enregistrement est en cours d'utilisation - pas de modification possible !"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Annuler la coupe"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Arrêter la coupe"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Annuler le déplacement"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Arrêter le déplacement"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Annuler la copie"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Arrêter la copie"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Couper"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Supprimer les marqueurs"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Enregistrement disparu !"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "La version éditée existe déjà - écraser ?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Erreur lors de la mise en file d'attente pour la coupe !"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Modifier le nom du dossier des enregistrements ?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Supprimer les marqueurs d'édition de cet enregistrement ?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Erreur pendant la suppression des marqueurs d'édition !"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Erreur pendant le changement de priorité et/ou durée de vie !"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Erreur pendant le changement de dossier et/ou nom !"
 
 msgid "Recording info"
 msgstr "Infos sur l'enregistrement"
@@ -1089,31 +1090,31 @@ msgid "Setup.LNB$own"
 msgstr "Propriétaire"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Utiliser le positionneur de parabole"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Latitude du site (°)"
 
 msgid "South"
-msgstr ""
+msgstr "Sud"
 
 msgid "North"
-msgstr ""
+msgstr "Nord"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Longitude du site (°)"
 
 msgid "West"
-msgstr ""
+msgstr "Ouest"
 
 msgid "East"
-msgstr ""
+msgstr "Est"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Course max. du positionneur (°)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Vitesse du positionneur (°/s)"
 
 msgid "CAM reset"
 msgstr "CAM réinitialisé"
@@ -1126,16 +1127,16 @@ msgstr "CAM prêt"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (activation en cours)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Annuler l'activation"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Activer"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1150,7 +1151,7 @@ msgid "Can't open CAM menu!"
 msgstr "Impossible d'ouvrir le menu CAM !"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Impossible d'activer le CAM !"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM en cours d'utilisation - confirmer réinitialisation ?"
@@ -1243,25 +1244,34 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Afficher la barre de progression (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Arrêt lecture si ajout marqueur"
+msgstr "Arrêt lecture pendant ajout marqueur"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Arrêt lecture après saut vers un marqueur"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Sauter les parties éditées"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Arrêt lecture au dernier marqueur"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Durée initiale pour le saut adaptatif (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Timeout du reset pour le saut adaptatif (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Réduire le saut adaptatif uniquement si changement de sens"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr "Utiliser les touches Préc./Suiv. pour le saut adaptatif"
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr "Distance de saut pour les touches Verte/Jaune (s)"
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr "Distance de saut pour les touches Verte/Jaune en répétition (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de reprise"
@@ -1270,7 +1280,7 @@ msgid "Miscellaneous"
 msgstr "Divers"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Temps mini entre événements (min)"
+msgstr "Temps mini entre évènements (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Inactivité de l'utilisateur (min)"
@@ -1300,10 +1310,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volume initial"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Pas du changement de volume"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Correction de la courbe"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Affichage circulaire des chaînes"
@@ -1385,7 +1395,7 @@ msgid "Jump: "
 msgstr "Accès direct : "
 
 msgid "No editing marks defined!"
-msgstr "Pas de marques d'édition définies !"
+msgstr "Pas de marqueurs d'édition définis !"
 
 msgid "No editing sequences defined!"
 msgstr "Aucune séquence d'édition définie !"
@@ -1491,7 +1501,7 @@ msgstr "LECTURE"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Orientation de la parabole vers %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "Consoles ST:TNG"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index d648da610..1eb9e2be6 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1255,6 +1255,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 9267ec21e..0ddceec7e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2015-02-03 11:35+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -801,6 +801,9 @@ msgstr "A szerkesztett változat már létezik - felülírjam?"
 msgid "Error while queueing recording for cutting!"
 msgstr "Hiba a felvétel vágásra előkészítése közben!"
 
+msgid "Rename recording to folder name?"
+msgstr ""
+
 msgid "Delete editing marks for this recording?"
 msgstr "Töröljem a felvétel vágópontjait?"
 
@@ -1255,6 +1258,15 @@ msgstr "Felezett ugrás időkorláta (mp)"
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Felezett ugrás csak irányváltoztatásnál"
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Lejátszás azonosító"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 0c3a83492..c2c50db74 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2015-02-05 00:09+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"PO-Revision-Date: 2015-02-09 20:26+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -32,7 +32,7 @@ msgid "Channel not available!"
 msgstr "Canale non disponibile!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Impossibile avviare mod. trasferimento!"
+msgstr "Impossibile avviare modalità trasferimento!"
 
 msgid "off"
 msgstr "off"
@@ -803,7 +803,7 @@ msgid "Error while queueing recording for cutting!"
 msgstr "Errore durante l'accodamento della registrazione per il taglio!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Rinominare registrazione come nome cartella?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Eliminare i marcatori di modifica della registrazione?"
@@ -1155,7 +1155,7 @@ msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
 
 msgid "do not pause live video"
-msgstr "non pausare video dal vivo"
+msgstr "non mettere in pausa il video dal vivo"
 
 msgid "confirm pause live video"
 msgstr "conferma pausa video dal vivo"
@@ -1203,13 +1203,13 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margine VPS (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Segna reg. immediata"
+msgstr "Segna registrazione immediata"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Nome reg. immediata"
+msgstr "Nome registrazione immediata"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Durata reg. immediata (min)"
+msgstr "Durata registrazione immediata (min)"
 
 msgid "Setup.Recording$present event"
 msgstr "evento attuale"
@@ -1251,12 +1251,21 @@ msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Pausa riproduzione all'ultimo marcatore"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Durata iniziale per spostamenti adattivi (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Reimposta scadenza per spostamenti adattivi (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Comportamento alternativo per spostamenti adattivi"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1471,10 +1480,10 @@ msgid "DISK"
 msgstr "DISCO"
 
 msgid "LOAD"
-msgstr "CARICA"
+msgstr "USO"
 
 msgid "TIMERS"
-msgstr "TIMER"
+msgstr "TIMERS"
 
 msgid "DEVICES"
 msgstr "SCHEDE"
@@ -1487,7 +1496,7 @@ msgstr "RIPRODUCI"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr "Muovi antenna verso %.1f..."
+msgstr "Spostamento antenna verso %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "Consolle ST:TNG"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 4526d4cc9..af5a5f35f 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2010-10-30 11:55+0200\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"PO-Revision-Date: 2015-02-09 17:08+0100\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
@@ -797,7 +797,7 @@ msgid "Error while queueing recording for cutting!"
 msgstr "Klaida sustatant įrašus į karpymo eilę!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Priskirti įrašui katalogo pavadinimą?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Ar tikrai ištrinti šio įrašo koregavimo žymes?"
@@ -1245,12 +1245,21 @@ msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Setup.Replay$Pristabdyti pakartojimą pasiekus paskutinę žymę"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Setup.Replay$Adaptyvaus peršokimo trukmė (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Setup.Replay$Adaptyvaus peršokimo perkrovimo užlaikymas(s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Setup.Replay$Adaptyvaus peršokimo galima elgsena"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 388f3e9fc..dd740f274 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -1,14 +1,14 @@
 # VDR language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013
+# Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2012-11-19 15:18+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"PO-Revision-Date: 2015-02-08 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
 "Language: mk\n"
@@ -21,7 +21,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Невалиден Канал ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM активиран!"
 
 msgid "Channel not available!"
 msgstr "Каналот е недостапен!"
@@ -81,13 +81,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Пилот"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "Т2СистемИд"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "СИСО/МИСО"
 
 msgid "Starting EPG scan"
 msgstr "Започнувам скенирање на EPG"
@@ -577,10 +577,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Уредбите на каналот не се уникатни!"
@@ -743,74 +743,74 @@ msgid "CAM not responding!"
 msgstr "CAM не одговара!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Уреди патека"
 
 msgid "Folder"
-msgstr ""
+msgstr "Папка"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Оваа папка е моментално во употреба - промени не се возможни!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Помести цела папка со %d снимки?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Грешка при поместување папка!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Уреди снимка"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Оваа снимка е моментално во употреба - промени не се возможни!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Откажи сечење"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Запри сечење"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Откажи преместување"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Запри преместување"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Откажи копирање"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Запри копирање"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Сечи"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Избриши ознаки"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Снимката исчезна!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Уредена верзија веќе постои - пребриши?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Грешка при редење на снимка за сечење!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Преименувај ја снимката како името на папката?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Бриши ознаки за уредување за оваа снимка?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Грешка при бришење на ознака за уредување!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Грешка при промена на приоритет/траење!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Грешка при промена на папка/име!"
 
 msgid "Recording info"
 msgstr "Детали на снимката"
@@ -1080,31 +1080,31 @@ msgid "Setup.LNB$own"
 msgstr "свој"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Користи позиционер за чинија"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Латидута на локацијата (степени)"
 
 msgid "South"
-msgstr ""
+msgstr "Југ"
 
 msgid "North"
-msgstr ""
+msgstr "Север"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Лонгитуда на локацијата (степени)"
 
 msgid "West"
-msgstr ""
+msgstr "Запад"
 
 msgid "East"
-msgstr ""
+msgstr "Исток"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Максимален од на позиционерот (степени)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Брзина на позиционерот (степени/сек)"
 
 msgid "CAM reset"
 msgstr "Рестартирај CAM"
@@ -1117,16 +1117,16 @@ msgstr "CAM спремен"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (активирање)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Откажи активација"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Активирај"
 
 msgid "Button$Menu"
 msgstr "Мени"
@@ -1141,7 +1141,7 @@ msgid "Can't open CAM menu!"
 msgstr "Неуспешно отварање на CAM менито!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Неуспешно активирање на CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM е во употреба - рестартирај?"
@@ -1237,21 +1237,30 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Паузирај репродукција кога се внесува ознака"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Паузирај репродукција кога се скока до ознака"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Прескокни ги уредуваните делови"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Паузирај репродукција на последанта ознака"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Почетно траење на адаптабилно скокање (сек)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Време на ресетирање за адаптабилно скокање (сек)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Алтернативно однесување за адаптабилно скокање"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
@@ -1291,10 +1300,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Почетна јачина на звук"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Чекори на јачина на звук"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Линеаризациај на јачина на звук"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Премотување канали"
@@ -1482,7 +1491,7 @@ msgstr "ПУШТИ"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Движење на чинијата кон %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Панели"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c5c5287ee..c8d081181 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -7,14 +7,15 @@
 # Carel Willemse <carel@nekanali.nl>, 2008, 2013
 # Johan Schuring <johan.schuring@vetteblei.nl>, 2008
 # Cedric Dewijs <cedric.dewijs@telfort.nl>, 2013
+# Erik Oomen <oomen.e@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2008-02-26 17:20+0100\n"
-"Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n"
+"POT-Creation-Date: 2015-02-11 10:51+0100\n"
+"PO-Revision-Date: 2015-02-10 19:43+0100\n"
+"Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +26,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Ongeldig kanaal ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM geactiveerd!"
 
 msgid "Channel not available!"
 msgstr "Kanaal niet beschikbaar"
@@ -85,13 +86,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Piloot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Bezig met starten EPG scan"
@@ -581,10 +582,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Kanaalinstellingen zijn niet uniek!"
@@ -747,74 +748,74 @@ msgid "CAM not responding!"
 msgstr "CAM reageert niet!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Pad bewerken"
 
 msgid "Folder"
-msgstr ""
+msgstr "Map"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Deze map is momenteel in gebruik - geen wijzigingen zijn mogelijk!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Verplaats hele map met %d -opnames?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Fout tijdens het verplaatsen van de map!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Opname bewerken"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Deze opname is momenteel in gebruik - geen wijzigingen zijn mogelijk!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Knippen afbreken"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Knippen stoppen"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Verplaatsen afbreken"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Stoppen met verplaatsen"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Kopi�ren afbreken"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Stop kopi�ren"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Knip"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Verwijder markeringen"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Opname verdwenen!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Bewerkte versie bestaat al - overschrijven?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Kan opname voor knippen niet in wachtrij plaatsen!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Opname hernoemen naar mapnaam?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Verwijder bewerkings markeringen voor deze opnamen?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Fout bij het verwijderen van alle bewerkings markeringen!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Fout tijdens het wijzigen prioriteit / duur!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Fout tijdens het wijzigen map / naam!"
 
 msgid "Recording info"
 msgstr "Opname info"
@@ -919,7 +920,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanaal info tonen"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Tijdsduur opgevraagde kanaalinfo."
+msgstr "Timout opgevraagde kanaalinfo"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Scrollen per pagina"
@@ -1084,31 +1085,31 @@ msgid "Setup.LNB$own"
 msgstr "eigen"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Gebruik schotel positioner"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Plaats breedtegraad (graden)"
 
 msgid "South"
-msgstr ""
+msgstr "Zuiden"
 
 msgid "North"
-msgstr ""
+msgstr "Noorden"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Plaats lengtegraad (graden)"
 
 msgid "West"
-msgstr ""
+msgstr "Westen"
 
 msgid "East"
-msgstr ""
+msgstr "Oosten"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Max. positioner swing (graden)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Positioner snelheid (graden / s)"
 
 msgid "CAM reset"
 msgstr "CAM herstarten"
@@ -1121,16 +1122,16 @@ msgstr "CAM gereed"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (Activeren)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Anuleer activering"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Activeer"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1145,7 +1146,7 @@ msgid "Can't open CAM menu!"
 msgstr "Kan CAM-menu niet openen!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Kan CAM niet te activeren!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM wordt gebruikt - werkelijk herstarten?"
@@ -1241,22 +1242,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pauzeer wanneer markering wordt geplaatst"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pauzeer bij het springen naar een markering"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Sla bewerkte onderdelen over"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Pauzeer bij laatste markering"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Initi�le duur bij adaptief overslaan"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Reset Time-out voor adaptief overslaan"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Alternatief gedrag voor adaptief overslaan"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr "Gebruik Vorige/Volgende toetsen voor adaptief overslaan"
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr "Spoel sprong met groene en gele toetsen (s)"
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr "Spoel sprong met groene en gele toesten in repeteerstand (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
@@ -1295,10 +1305,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Opstartvolume"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Volume stappen"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Volume lineariseren"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Doorscrollen kanalenlijst"
@@ -1486,7 +1496,7 @@ msgstr "AFSPELEN"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Schotel verplaatsen naar% .1f ..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Consoles"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 18c2a4c99..219bbb6d8 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 6077f7aaa..931fd6d79 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-03-09 12:59+0100\n"
 "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1255,6 +1255,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d3b22980d..9390217f7 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de resumo"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index d6d3c422c..1d1460c5c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2015-02-06 23:15+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"PO-Revision-Date: 2015-02-09 00:23+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
 "Language: ro\n"
@@ -799,7 +799,7 @@ msgid "Error while queueing recording for cutting!"
 msgstr "Eroare la punerea în coada pentru tăiere!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Redenumesc înregistrarea ca pe director?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Șterg marcajele de editare pentru această înregistrare?"
@@ -1255,6 +1255,15 @@ msgstr "Timeout (s) de resetare pentru săritul adaptiv al marcajelor"
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Strategie alternativă pentru săritul adaptiv al marcajelor"
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 4a9c4734f..9ac95d3ff 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ���������������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 8154704c0..01e83ad2a 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-04 21:24+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ident. ��slo obnovenia prehr�vania"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index dc6579fb9..33c3c4656 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 8a141aaaa..fb834f126 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1254,6 +1254,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "ID reprodukcije"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index b7c830cfa..e2efbe0f7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-02-18 17:04+0100\n"
 "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1257,6 +1257,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "�terupptagnings-ID"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index f43e75bc9..f832ec80c 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1253,6 +1253,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index d7399a1b1..7875fac15 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,14 +1,14 @@
 # VDR language source file.
 # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013, 2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
-"PO-Revision-Date: 2015-02-01 23:31+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"PO-Revision-Date: 2015-02-08 16:03+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
 "Language: uk\n"
@@ -798,7 +798,7 @@ msgid "Error while queueing recording for cutting!"
 msgstr "Помилка перешуковування запису для обрізання!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Назвати запис назвою теки?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Вилучити мітки редагування для цього запису?"
@@ -1246,12 +1246,21 @@ msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Призупинити програвання на останній мітці"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Початкова тривалість для адаптивного пропуску (ів)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Скинути тайм-аут для адаптивного пропуску (ів)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
+msgstr "Альтернативна поведінка для адаптивного пропуску (ів)"
+
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
 msgstr ""
 
 msgid "Setup.Replay$Resume ID"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ba313a13..77c15ee64 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.0.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-07 17:08+0100\n"
+"POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -1255,6 +1255,15 @@ msgstr ""
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr ""
 
+msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
+msgstr ""
+
+msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
+msgstr ""
+
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
diff --git a/vdr.1 b/vdr.1
index 7605bf22d..84f28b16a 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 3.4 2015/01/20 15:34:29 kls Exp $
+.\" $Id: vdr.1 3.5 2015/02/10 13:59:11 kls Exp $
 .\"
 .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
 .SH NAME
@@ -49,6 +49,11 @@ Send Dolby Digital audio to stdin of command \fIcmd\fR.
 Save cache files in \fIdir\fR
 (default is to save them in the video directory).
 .TP
+.BI \-\-chartab= character_table
+Set the character table to use for strings in the DVB data stream that don't begin
+with a character table indicator, but don't use the standard default character table
+(for instance ISO-8859-9).
+.TP
 .BI \-c\  dir ,\ \-\-config= dir
 Read config files from directory \fIdir\fR
 (default is to read them from the video directory).
diff --git a/vdr.c b/vdr.c
index 336130f83..71a72f2e9 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.15 2015/01/17 14:48:09 kls Exp $
+ * $Id: vdr.c 3.16 2015/02/10 14:13:12 kls Exp $
  */
 
 #include <getopt.h>
@@ -216,6 +216,12 @@ int main(int argc, char *argv[])
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
+  const char *OverrideCharacterTable = NULL;
+#define DEPRECATED_VDR_CHARSET_OVERRIDE
+#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE
+  OverrideCharacterTable = getenv("VDR_CHARSET_OVERRIDE");
+  const char *DeprecatedVdrCharsetOverride = OverrideCharacterTable;
+#endif
 
   bool UseKbd = true;
   const char *LircDevice = NULL;
@@ -244,6 +250,7 @@ int main(int argc, char *argv[])
   static struct option long_options[] = {
       { "audio",    required_argument, NULL, 'a' },
       { "cachedir", required_argument, NULL, 'c' | 0x100 },
+      { "chartab",  required_argument, NULL, 'c' | 0x200 },
       { "config",   required_argument, NULL, 'c' },
       { "daemon",   no_argument,       NULL, 'd' },
       { "device",   required_argument, NULL, 'D' },
@@ -287,6 +294,9 @@ int main(int argc, char *argv[])
           case 'c' | 0x100:
                     CacheDirectory = optarg;
                     break;
+          case 'c' | 0x200:
+                    OverrideCharacterTable = optarg;
+                    break;
           case 'c': ConfigDirectory = optarg;
                     break;
           case 'd': DaemonMode = true;
@@ -517,6 +527,11 @@ int main(int argc, char *argv[])
         printf("Usage: vdr [OPTIONS]\n\n"          // for easier orientation, this is column 80|
                "  -a CMD,   --audio=CMD    send Dolby Digital audio to stdin of command CMD\n"
                "            --cachedir=DIR save cache files in DIR (default: %s)\n"
+               "            --chartab=CHARACTER_TABLE\n"
+               "                           set the character table to use for strings in the\n"
+               "                           DVB data stream that don't begin with a character\n"
+               "                           table indicator, but don't use the standard default\n"
+               "                           character table (for instance ISO-8859-9)\n"
                "  -c DIR,   --config=DIR   read config files from DIR (default: %s)\n"
                "  -d,       --daemon       run in daemon mode\n"
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
@@ -674,6 +689,14 @@ int main(int argc, char *argv[])
      isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
      cCharSetConv::SetSystemCharacterTable(CodeSet);
      }
+#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE
+  if (DeprecatedVdrCharsetOverride)
+     isyslog("use of environment variable VDR_CHARSET_OVERRIDE (%s) is deprecated!", DeprecatedVdrCharsetOverride);
+#endif
+  if (OverrideCharacterTable) {
+     isyslog("override character table is '%s'", OverrideCharacterTable);
+     SI::SetOverrideCharacterTable(OverrideCharacterTable);
+     }
 
   // Initialize internationalization:
 

From 9ab55b409054d94216f4c0e77fafaf13c4d18531 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Thu, 19 Feb 2015 11:38:00 +0100
Subject: [PATCH 242/307] Version 2.2.0 VDR version 2.2.0 is now available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/vdr-2.2.0.tar.bz2

A 'diff' against the previous developer version is available at

       ftp://ftp.tvdr.de/vdr/vdr-2.1.10-2.2.0.diff

MD5 checksums:

8853f64c0fc3d41ffd3b4bfc6f0a14b7  vdr-2.2.0.tar.bz2
2d75806f90a4f1c8b3e30d7568891dc6  vdr-2.1.10-2.2.0.diff

A summary of all the major changes since the last stable version 2.0.0 can be found at

      http://www.tvdr.de/changelog.htm

When updating from an earlier version of VDR please make sure you read the INSTALL
and MANUAL files that come with the VDR source _before_ doing so!
Please make sure you have backup copies of all your configuration files,
and verify carefully that your timers will be set to the correct channels
after switching to this new version.

Thanks to the many people who have contributed in the making, testing and
debugging of this new version of VDR, and also to all users who have been
enjoying VDR over the past 15 years!

Please also visit the VDR homepage at

      http://www.tvdr.de

and VDR's facebook page at

      https://www.facebook.com/VideoDiskRecorder

Have fun!

Klaus

From the HISTORY file:
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Italian OSD texts (thanks to Diego Pierotto and Nino Gerbino).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Swedish OSD texts (thanks to Magnus Sirwiö).
- Updated the Hungarian OSD texts (thanks to István Füley and Albert Danis).
- Modified the German translations of the OSD texts regarding "adaptive skipping".
- Fixed pausing replay at the last editing mark (reported by Stefan Herdler).
- Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak).
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Fixed using the default sort mode in a video directory without a ".sort" file
  (reported by Stefan Herdler).
- Improved the German translations of "EPG bugfix level"", "StreamId" and "T2SystemId"
  (thanks to Albert Danis).
- Updated the Czech OSD texts (thanks to Ales Jurik).
- Updated the Slovak OSD texts (thanks to Milan Hrala).
- Updated sources.conf to reflect the fact that Thor 5/6 and Intelsat 10-02 are
  actually in two separate positions.
- Updated the French OSD texts (thanks to Régis Bossut).
- Updated the Spanish OSD texts (thanks to Gabriel Bonich).
- Fixed leading/trailing/multiple blanks in the translation files.
- Bumped all version numbers to 2.2.0.
- Official release.
---
 CONTRIBUTORS                          |  24 ++-
 HISTORY                               |  35 ++++-
 INSTALL                               |   2 +-
 MANUAL                                |   2 +-
 PLUGINS.html                          |   4 +-
 PLUGINS/src/dvbhddevice/HISTORY       |   4 +
 PLUGINS/src/dvbhddevice/dvbhddevice.c |   2 +-
 PLUGINS/src/dvbhddevice/po/de_DE.po   |   6 +-
 PLUGINS/src/dvbhddevice/po/et_EE.po   |   6 +-
 PLUGINS/src/dvbhddevice/po/fi_FI.po   |   6 +-
 PLUGINS/src/dvbhddevice/po/it_IT.po   |   6 +-
 PLUGINS/src/dvbhddevice/po/uk_UA.po   |   6 +-
 PLUGINS/src/dvbsddevice/HISTORY       |   4 +
 PLUGINS/src/dvbsddevice/dvbsddevice.c |   4 +-
 PLUGINS/src/epgtableid0/HISTORY       |   4 +
 PLUGINS/src/epgtableid0/epgtableid0.c |   4 +-
 PLUGINS/src/hello/HISTORY             |   4 +
 PLUGINS/src/hello/hello.c             |   4 +-
 PLUGINS/src/hello/po/ca_ES.po         |   4 +-
 PLUGINS/src/hello/po/cs_CZ.po         |   4 +-
 PLUGINS/src/hello/po/da_DK.po         |   4 +-
 PLUGINS/src/hello/po/de_DE.po         |   4 +-
 PLUGINS/src/hello/po/el_GR.po         |   4 +-
 PLUGINS/src/hello/po/es_ES.po         |   4 +-
 PLUGINS/src/hello/po/et_EE.po         |   4 +-
 PLUGINS/src/hello/po/fi_FI.po         |   4 +-
 PLUGINS/src/hello/po/fr_FR.po         |   4 +-
 PLUGINS/src/hello/po/hr_HR.po         |   4 +-
 PLUGINS/src/hello/po/hu_HU.po         |   4 +-
 PLUGINS/src/hello/po/it_IT.po         |   4 +-
 PLUGINS/src/hello/po/lt_LT.po         |   4 +-
 PLUGINS/src/hello/po/nl_NL.po         |   4 +-
 PLUGINS/src/hello/po/nn_NO.po         |   4 +-
 PLUGINS/src/hello/po/pl_PL.po         |   4 +-
 PLUGINS/src/hello/po/pt_PT.po         |   4 +-
 PLUGINS/src/hello/po/ro_RO.po         |   4 +-
 PLUGINS/src/hello/po/ru_RU.po         |   4 +-
 PLUGINS/src/hello/po/sk_SK.po         |   4 +-
 PLUGINS/src/hello/po/sl_SI.po         |   4 +-
 PLUGINS/src/hello/po/sv_SE.po         |   4 +-
 PLUGINS/src/hello/po/tr_TR.po         |   4 +-
 PLUGINS/src/hello/po/zh_CN.po         |   6 +-
 PLUGINS/src/osddemo/HISTORY           |   4 +
 PLUGINS/src/osddemo/osddemo.c         |   4 +-
 PLUGINS/src/pictures/HISTORY          |   4 +
 PLUGINS/src/pictures/pictures.c       |   4 +-
 PLUGINS/src/pictures/po/de_DE.po      |   4 +-
 PLUGINS/src/pictures/po/et_EE.po      |   4 +-
 PLUGINS/src/pictures/po/fi_FI.po      |   4 +-
 PLUGINS/src/pictures/po/fr_FR.po      |   4 +-
 PLUGINS/src/pictures/po/it_IT.po      |   4 +-
 PLUGINS/src/pictures/po/lt_LT.po      |   4 +-
 PLUGINS/src/pictures/po/ru_RU.po      |   6 +-
 PLUGINS/src/pictures/po/sk_SK.po      |   4 +-
 PLUGINS/src/rcu/HISTORY               |   4 +
 PLUGINS/src/rcu/rcu.c                 |   4 +-
 PLUGINS/src/servicedemo/HISTORY       |   4 +
 PLUGINS/src/servicedemo/svccli.c      |   4 +-
 PLUGINS/src/servicedemo/svcsvr.c      |   4 +-
 PLUGINS/src/skincurses/HISTORY        |   4 +
 PLUGINS/src/skincurses/po/de_DE.po    |   4 +-
 PLUGINS/src/skincurses/po/et_EE.po    |   4 +-
 PLUGINS/src/skincurses/po/fi_FI.po    |   4 +-
 PLUGINS/src/skincurses/po/it_IT.po    |   4 +-
 PLUGINS/src/skincurses/po/lt_LT.po    |   4 +-
 PLUGINS/src/skincurses/po/ru_RU.po    |   4 +-
 PLUGINS/src/skincurses/po/sk_SK.po    |   4 +-
 PLUGINS/src/skincurses/skincurses.c   |   4 +-
 PLUGINS/src/status/HISTORY            |   4 +
 PLUGINS/src/status/status.c           |   4 +-
 PLUGINS/src/svdrpdemo/HISTORY         |   4 +
 PLUGINS/src/svdrpdemo/svdrpdemo.c     |   4 +-
 config.h                              |  10 +-
 dvbplayer.c                           |   6 +-
 po/ar.po                              |  40 ++---
 po/ca_ES.po                           |   8 +-
 po/cs_CZ.po                           | 116 +++++++-------
 po/da_DK.po                           |   4 +-
 po/de_DE.po                           |  19 +--
 po/el_GR.po                           |   4 +-
 po/es_ES.po                           | 124 +++++++--------
 po/et_EE.po                           |  18 +--
 po/fi_FI.po                           |  12 +-
 po/fr_FR.po                           |  66 ++++----
 po/hr_HR.po                           |   8 +-
 po/hu_HU.po                           | 212 +++++++++++++-------------
 po/it_IT.po                           |  14 +-
 po/lt_LT.po                           |  60 ++++----
 po/mk_MK.po                           |  16 +-
 po/nl_NL.po                           |   4 +-
 po/nn_NO.po                           |   4 +-
 po/pl_PL.po                           | 123 +++++++--------
 po/pt_PT.po                           |   6 +-
 po/ro_RO.po                           |  14 +-
 po/ru_RU.po                           |   6 +-
 po/sk_SK.po                           | 175 ++++++++++-----------
 po/sl_SI.po                           |   4 +-
 po/sr_RS.po                           |   6 +-
 po/sv_SE.po                           | 127 +++++++--------
 po/tr_TR.po                           |   6 +-
 po/uk_UA.po                           |  14 +-
 po/zh_CN.po                           |  24 +--
 positioner.c                          |   3 +-
 recording.c                           |   3 +-
 sources.conf                          |   3 +-
 svdrpsend.1                           |   2 +-
 vdr.1                                 |   4 +-
 vdr.5                                 |   4 +-
 108 files changed, 856 insertions(+), 760 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1a29554d7..6c52abf00 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3368,17 +3368,35 @@ Martin Schirrmacher <schirrmie@gmail.com>
  for suggesting to provide a way for skin plugins to get informed about the currently
  used sort mode of a menu
 
-Mario Fenneis <admin@mediastreambox.at>
- for translating OSD texts to the Hungarian language
-
 Clemens Brauers <vdr@admin-cb.de>
  for modifying runvdr.template to improve compatibility with the "bash" and "dash" shells
 
 Stefan Herdler <herdler@gmx.de>
  for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
+ for reporting that pausing replay at the last editing mark actually paused one I-frame
+ too early
+ for reporting a bug in using the default sort mode in a video directory without a
+ ".sort" file
 
 Tobias Faust <tobias.faust@gmx.de>
  for the original "jumpingseconds" patch
 
 Erik Oomen <oomen.e@gmail.com>
  for translating OSD texts to the Dutch language
+
+Magnus Sirwi� <sirwio@hotmail.com>
+ for translating OSD texts to the Swedish language
+
+Albert Danis <a.danis@gmx.de>
+ for developing and improving several formulas used in controlling positioners
+ for translating OSD texts to the Hungarian language
+ for fixing the German translation of "Zap timeout"
+ for unifying the German translations of "StreamId" and "T2SystemId"
+ for improving the German translations of "EPG bugfix level"", "StreamId" and
+ "T2SystemId"
+
+Tomasz Maciej Nowak <tmn505@gmail.com>
+ for translating OSD texts to the Polish language
+
+Gabriel Bonich <gbonich@gmail.com>
+ for translating OSD texts to the Spanish language
diff --git a/HISTORY b/HISTORY
index 62406e8a6..20e14735f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7846,7 +7846,7 @@ Video Disk Recorder Revision History
   (reported by Dominique Dumont).
 - Added basic support for positioners to control steerable satellite dishes (based on
   a patch from Seppo Ingalsuo and Ales Jurik, which in turn used code from Thomas
-  Bergwinkl's Rotor plugin).
+  Bergwinkl's Rotor plugin; with lots of help from Albert Danis).
   + Supports GotoN (aka "DiSEqC 1.2") and GotoX (aka "USALS").
   + The new DiSEqC command code 'P' can be used to instruct a positioner to move the
     dish to the required satellite position. When a 'P' code is processed, further
@@ -7982,7 +7982,7 @@ Video Disk Recorder Revision History
   + Note that in several places in the source code a "copy" operation is mentioned,
     however there is no user interface for this, yet.
 - Changed some variable names in positioner.c to match the names used in the page with
-  the explanation on vdr-portal.de.
+  the explanation on vdr-portal.de (suggested by Albert Danis).
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Fixed writing group separators to channels.conf that contain a comma (reported by
   Eike Edener).
@@ -8496,7 +8496,6 @@ Video Disk Recorder Revision History
   any names that have been predefined in "folders.conf" (suggested by S�ren Moch).
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Fixed the German translations of "latitude" and "longitude" (they were swapped).
-- Updated the Hungarian OSD texts (thanks to Mario Fenneis).
 - Modified runvdr.template to improve compatibility with the "bash" and "dash" shells
   (thanks to Clemens Brauers).
 - Changed the German translations if the texts related to "binary skipping" (based
@@ -8567,4 +8566,32 @@ Video Disk Recorder Revision History
 - Added a missing initialization of "panning" to the constructor of cPixmapMemory.
 - Updated the Dutch OSD texts (thanks to Erik Oomen).
 - Updated the French OSD texts (thanks to R�gis Bossut).
-- Fixed the German translation of "Zap timeout".
+- Fixed the German translation of "Zap timeout" (thanks to Albert Danis).
+
+2015-02-19: Version 2.2.0
+
+- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Updated the Romanian OSD texts (thanks to Lucian Muresan).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Updated the Italian OSD texts (thanks to Diego Pierotto and Nino Gerbino).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Swedish OSD texts (thanks to Magnus Sirwi�).
+- Updated the Hungarian OSD texts (thanks to Istv�n F�ley and Albert Danis).
+- Modified the German translations of the OSD texts regarding "adaptive skipping".
+- Fixed pausing replay at the last editing mark (reported by Stefan Herdler).
+- Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak).
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Fixed using the default sort mode in a video directory without a ".sort" file
+  (reported by Stefan Herdler).
+- Improved the German translations of "EPG bugfix level"", "StreamId" and "T2SystemId"
+  (thanks to Albert Danis).
+- Updated the Czech OSD texts (thanks to Ales Jurik).
+- Updated the Slovak OSD texts (thanks to Milan Hrala).
+- Updated sources.conf to reflect the fact that Thor 5/6 and Intelsat 10-02 are
+  actually in two separate positions.
+- Updated the French OSD texts (thanks to R�gis Bossut).
+- Updated the Spanish OSD texts (thanks to Gabriel Bonich).
+- Fixed leading/trailing/multiple blanks in the translation files.
+- Bumped all version numbers to 2.2.0.
+- Official release.
diff --git a/INSTALL b/INSTALL
index 8dcef756e..864cfb1ca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 2.0
+Version 2.2
 -----------
 
 Compiling and running the program:
diff --git a/MANUAL b/MANUAL
index a04a63f4b..3c4003ed4 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,7 +1,7 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
-Version 2.0
+Version 2.2
 -----------
 
 * Remote Control Keys
diff --git a/PLUGINS.html b/PLUGINS.html
index b912301f8..6f47f2f55 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -31,9 +31,9 @@
 <div class="center">
 <h1>The VDR Plugin System</h1>
 
-<b>Version 2.1</b>
+<b>Version 2.2</b>
 <p>
-Copyright &copy; 2013 Klaus Schmidinger<br>
+Copyright &copy; 2015 Klaus Schmidinger<br>
 <a href="mailto:vdr@tvdr.de">vdr@tvdr.de</a><br>
 <a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
index cd7f5da36..532b5e916 100644
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ b/PLUGINS/src/dvbhddevice/HISTORY
@@ -102,3 +102,7 @@ VDR Plugin 'dvbhddevice' Revision History
 2015-02-11: Version 2.1.7
 
 - Adapted to the new return value of cOsd::RenderPixmaps().
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
index 1e5da44f6..3ee74475d 100644
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "2.1.7";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
index cca422be0..2bee15e0b 100644
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ b/PLUGINS/src/dvbhddevice/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file
-# Copyright (C) 2011 Andreas Regel
+# Copyright (C) 2015 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
-# Christoph Haubrich, 2011
+# Christoph Haubrich <christoph1.haubrich@arcor.de>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
diff --git a/PLUGINS/src/dvbhddevice/po/et_EE.po b/PLUGINS/src/dvbhddevice/po/et_EE.po
index e60d72583..b483cfec9 100644
--- a/PLUGINS/src/dvbhddevice/po/et_EE.po
+++ b/PLUGINS/src/dvbhddevice/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file
-# Copyright (C) 2011 Andreas Regel
+# Copyright (C) 2015 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
-# Arthur Konovalov, 2015
+# Arthur Konovalov <artlov@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
index 18d9ff9a5..c97827f19 100644
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ b/PLUGINS/src/dvbhddevice/po/fi_FI.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file
-# Copyright (C) 2011 Andreas Regel
+# Copyright (C) 2015 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
-# Christoph Haubrich, 2011
+# Christoph Haubrich <christoph1.haubrich@arcor.de>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2011-04-25 21:44+0200\n"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
index a636d939f..16752a81c 100644
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ b/PLUGINS/src/dvbhddevice/po/it_IT.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file
-# Copyright (C) 2011 Andreas Regel
+# Copyright (C) 2015 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
-# Christoph Haubrich, 2011
+# Christoph Haubrich <christoph1.haubrich@arcor.de>, 2011
 # Diego Pierotto <vdr-italian@tiscali.it>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-09-21 14:01+0200\n"
 "PO-Revision-Date: 2015-02-08 19:48+0100\n"
diff --git a/PLUGINS/src/dvbhddevice/po/uk_UA.po b/PLUGINS/src/dvbhddevice/po/uk_UA.po
index 8021c9e60..7d4381958 100644
--- a/PLUGINS/src/dvbhddevice/po/uk_UA.po
+++ b/PLUGINS/src/dvbhddevice/po/uk_UA.po
@@ -1,11 +1,11 @@
-# VDR language source file.
-# Copyright (C) 2011 Andreas Regel
+# VDR plugin language source file.
+# Copyright (C) 2015 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
 # Yarema Aka Knedlyk <yupadmin@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
+"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-03 13:28+0100\n"
 "PO-Revision-Date: 2015-02-01 23:31+0100\n"
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index 94e31ddb8..68e3e6dd1 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -59,3 +59,7 @@ VDR Plugin 'dvbsddevice' Revision History
 2014-03-15: Version 2.1.2
 
 - The function cDevice::GetVideoSystem() has been deprecated.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 0d06f17dc..81c15e2bc 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 3.3 2014/03/15 12:28:14 kls Exp $
+ * $Id: dvbsddevice.c 3.4 2015/02/17 13:11:55 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "2.1.2";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index 9f1eb7b6f..ed15392e2 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -20,3 +20,7 @@ VDR Plugin 'epgtableid0' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index db668d116..01bdc83de 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 3.1 2014/01/05 10:56:10 kls Exp $
+ * $Id: epgtableid0.c 3.2 2015/02/17 13:12:18 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index f9d05a83a..a2a8de326 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -90,3 +90,7 @@ VDR Plugin 'hello' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index ecc9170fa..0bd511cb8 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 3.1 2014/01/05 10:56:14 kls Exp $
+ * $Id: hello.c 3.2 2015/02/17 13:12:26 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index e0088f2bd..9da8d0f2b 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index 0029fc3cb..d26023ac2 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index 69d14097c..62997e9b4 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index abed9b04a..657ff1daa 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2000
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index e5f8066a9..ab715cd3a 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index ce7debae6..8ac0575e0 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index 9a8167e49..d440c9684 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2004, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 205a1f018..8172242aa 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index 451ae9052..6e87788a1 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index ba3b22de1..f06da860a 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Adrian Caval <anrxc@sysphere.org>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-03-17 19:52+0100\n"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index bbfddd828..781714eff 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index 7c52d9841..d9139d430 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
index 27262069a..a95eb6a5d 100644
--- a/PLUGINS/src/hello/po/lt_LT.po
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-12-08 12:18+0200\n"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 514ea184f..3853fc393 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index ebaafae3e..d35b088e0 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 1dd270278..c00efdc23 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index f22657f30..f553d6e56 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index ad2737e37..c32157e49 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index d8fc32354..24ece731c 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
index b0c2a893f..d3ae33338 100644
--- a/PLUGINS/src/hello/po/sk_SK.po
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-09-30 09:48+0100\n"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index 6e6bcf18a..7db6c5f81 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index 3ba8865a6..4b550ac29 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index ec121534c..09492f319 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-05-12 22:34:4800\n"
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
index 8baba9063..3ed53c2fd 100644
--- a/PLUGINS/src/hello/po/zh_CN.po
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
 # Jordi Vilà <jvila@tinet.org>, 2003
-# Nan Feng VDR <nfgx@21cn.com>, 2009.2
+# Nan Feng VDR <nfgx@21cn.com>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 0.2.5\n"
+"Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-01-23 09:48+0800\n"
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 4c3bfe64b..40495b1c5 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -68,3 +68,7 @@ VDR Plugin 'osddemo' Revision History
 
 - Fixed flickering if subtitles are active while the OSD demo is running.
 - Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 0a826b77c..6273f4609 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 3.3 2014/02/06 11:51:53 kls Exp $
+ * $Id: osddemo.c 3.4 2015/02/17 13:12:36 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.2";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 20c081cb1..06e7415a1 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -95,3 +95,7 @@ VDR Plugin 'pictures' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index de50f1eb6..46a08716b 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 3.1 2014/01/05 10:56:20 kls Exp $
+ * $Id: pictures.c 3.2 2015/02/17 13:12:50 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "2.1.1";
+static const char *VERSION       = "2.2.0";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index f1bde13fa..92e22af97 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/et_EE.po b/PLUGINS/src/pictures/po/et_EE.po
index 0bd6c121e..45b12b1d3 100644
--- a/PLUGINS/src/pictures/po/et_EE.po
+++ b/PLUGINS/src/pictures/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 65b604257..248ece2d7 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 4567c6748..3b887560b 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Patrice Staudt <ipatrice.staudt@laposte.net>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index e54928848..a49659e93 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
index 73d4da2a5..7a9f7781a 100644
--- a/PLUGINS/src/pictures/po/lt_LT.po
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2009-12-08 12:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index 47681619b..9f6b8df48 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-03-14 00:45+0100\n"
@@ -28,7 +28,7 @@ msgid "Picture directory"
 msgstr "������� �����������"
 
 msgid "Slide show delay (s)"
-msgstr "��������  �����-��� (���)"
+msgstr "�������� �����-��� (���)"
 
 msgid "No picture directory has been defined!"
 msgstr "�� ��������� ������� �����������!"
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
index 2b0cc58fb..77db92acc 100644
--- a/PLUGINS/src/pictures/po/sk_SK.po
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 0.1.3\n"
+"Project-Id-Version: vdr-pictures 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2009-09-30 12:54+0100\n"
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index 1e330eb62..8fabe0987 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -24,3 +24,7 @@ VDR Plugin 'rcu' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index 5fb210c06..9e833b190 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 3.1 2014/01/05 10:56:22 kls Exp $
+ * $Id: rcu.c 3.2 2015/02/17 13:13:00 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 9565b7d86..30ad5fef2 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -25,3 +25,7 @@ VDR Plugin 'servicedemo' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 47581617e..9a4244038 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 3.1 2014/01/05 10:56:24 kls Exp $
+ * $Id: svccli.c 3.2 2015/02/17 13:13:05 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index c55f6bd83..5c48b49a9 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 3.1 2014/01/05 10:56:26 kls Exp $
+ * $Id: svcsvr.c 3.2 2015/02/17 13:13:09 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 4da038b64..f24e67667 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -126,3 +126,7 @@ VDR Plugin 'skincurses' Revision History
 2015-02-08: Version 2.1.2
 
 - Added a missing trailing blank in some translations.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index b0e017ad1..3b8ec2644 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
diff --git a/PLUGINS/src/skincurses/po/et_EE.po b/PLUGINS/src/skincurses/po/et_EE.po
index eaba8b8fc..d226a290c 100644
--- a/PLUGINS/src/skincurses/po/et_EE.po
+++ b/PLUGINS/src/skincurses/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 0a44f8928..057320ddb 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 26dff2548..050b59b37 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index 5a4649c2c..cba22e761 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2010-02-22 18:18+0200\n"
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index 834d62418..a26ccc481 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index ef7e68337..d9087630d 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 0.1.12\n"
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2009-09-30 12:52+0100\n"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index d1e9770a9..2d92a574d 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 3.2 2015/02/08 10:19:00 kls Exp $
+ * $Id: skincurses.c 3.3 2015/02/17 13:13:17 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "2.1.2";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 7a8084227..87a71b007 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -64,3 +64,7 @@ VDR Plugin 'status' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index cbf0c6e4b..a5575cceb 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 3.1 2014/01/05 10:56:29 kls Exp $
+ * $Id: status.c 3.2 2015/02/17 13:13:21 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index 620747904..6c9994a99 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -29,3 +29,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2014-01-01: Version 2.1.1
 
 - Avoiding unnecessary pkg-config warnings in plugin Makefiles.
+
+2015-02-19: Version 2.2.0
+
+- Official release.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 34f513e6c..9114854ba 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 3.1 2014/01/05 10:56:31 kls Exp $
+ * $Id: svdrpdemo.c 3.2 2015/02/17 13:13:29 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.1.1";
+static const char *VERSION        = "2.2.0";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.h b/config.h
index 7220d9621..d1bae0442 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.20 2015/02/10 14:29:27 kls Exp $
+ * $Id: config.h 3.21 2015/02/13 15:39:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.1.10"
-#define VDRVERSNUM   20110  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.2.0"
+#define VDRVERSNUM   20200  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.1.10"
-#define APIVERSNUM   20110  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.2.0"
+#define APIVERSNUM   20200  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbplayer.c b/dvbplayer.c
index 94882e29a..aae0507cd 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 3.5 2015/02/06 15:08:51 kls Exp $
+ * $Id: dvbplayer.c 3.6 2015/02/13 15:12:57 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -460,9 +460,9 @@ void cDvbPlayer::Action(void)
 
           // Read the next frame from the file:
 
-          if (playMode != pmStill && playMode != pmPause && !AtLastMark) {
+          if (playMode != pmStill && playMode != pmPause) {
              if (!readFrame && (replayFile || readIndex >= 0)) {
-                if (!nonBlockingFileReader->Reading()) {
+                if (!nonBlockingFileReader->Reading() && !AtLastMark) {
                    if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
                       uint16_t FileNumber;
                       off_t FileOffset;
diff --git a/po/ar.po b/po/ar.po
index bc8504159..d26ccd9e2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Osama Alrawab <alrawab@hotmail.com>, 2010, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
@@ -30,7 +30,7 @@ msgid "Channel not available!"
 msgstr "القناة غير متاحة"
 
 msgid "Can't start Transfer Mode!"
-msgstr "تعذر  بدء طور النقل"
+msgstr "تعذر بدء طور النقل"
 
 msgid "off"
 msgstr "ايقاف"
@@ -93,7 +93,7 @@ msgid "SISO/MISO"
 msgstr ""
 
 msgid "Starting EPG scan"
-msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى "
+msgstr "EPG ا لبدء بالبحث على دليل القنوات الالكترونى"
 
 msgid "Content$Movie/Drama"
 msgstr "Movie/Drama"
@@ -348,7 +348,7 @@ msgid "LanguageCode$eng"
 msgstr "ara"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "التحقق من مفاتيح  وحدة التحكم"
+msgstr "التحقق من مفاتيح وحدة التحكم"
 
 msgid "Press any key on the RC unit"
 msgstr "الرجاء الضغط على اى زر فى وحدة التحكم"
@@ -514,10 +514,10 @@ msgid "Key$User4"
 msgstr "المستخدم 4"
 
 msgid "Key$User5"
-msgstr "المستخدم 5 "
+msgstr "المستخدم 5"
 
 msgid "Key$User6"
-msgstr "المستخدم 6 "
+msgstr "المستخدم 6"
 
 msgid "Key$User7"
 msgstr "المستخدم 7"
@@ -730,7 +730,7 @@ msgstr "%sجدولة"
 
 #, c-format
 msgid "This event - %s"
-msgstr " %sهذا الحدث"
+msgstr "%sهذا الحدث"
 
 msgid "This event - all channels"
 msgstr "هذا الحدث لكل القنوات"
@@ -858,10 +858,10 @@ msgid "Setup.OSD$Language"
 msgstr "اللغة"
 
 msgid "Setup.OSD$Skin"
-msgstr " الثوب"
+msgstr "الثوب"
 
 msgid "Setup.OSD$Theme"
-msgstr " الثيمة"
+msgstr "الثيمة"
 
 msgid "Setup.OSD$Left (%)"
 msgstr "Left (%)"
@@ -903,7 +903,7 @@ msgid "Setup.OSD$Fixed font size (%)"
 msgstr "Fixed font size (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr " موضع معلومات القناة"
+msgstr "موضع معلومات القناة"
 
 msgid "bottom"
 msgstr "اسفل"
@@ -963,7 +963,7 @@ msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "اﻻنتهاء من البحث على الدليل الالكترونى للقنوات"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr " معدل اصلاح اخطاء الدليل الالكترونى"
+msgstr "معدل اصلاح اخطاء الدليل الالكترونى"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "اقل مدة للدليل الالكترونى"
@@ -1025,7 +1025,7 @@ msgid "Setup.DVB$Standard compliance"
 msgstr "Standard compliance"
 
 msgid "Setup.DVB$Video format"
-msgstr "نوع الفيديو  "
+msgstr "نوع الفيديو"
 
 msgid "Setup.DVB$Video display format"
 msgstr "نوع عرض الفديو"
@@ -1064,7 +1064,7 @@ msgid "LNB"
 msgstr "الاقط"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr " DiSEqC استعمل"
+msgstr "DiSEqC استعمل"
 
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "التذبذب المحلى للاقط م هرتز"
@@ -1123,7 +1123,7 @@ msgid " (activating)"
 msgstr ""
 
 msgid "CAM"
-msgstr "الكامة "
+msgstr "الكامة"
 
 msgid "Button$Cancel activation"
 msgstr ""
@@ -1385,7 +1385,7 @@ msgstr "Delete timeshift recording?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "اقفز الى  "
+msgstr "اقفز الى "
 
 msgid "No editing marks defined!"
 msgstr "لاتوجد علامات تعديل معرفة"
@@ -1472,7 +1472,7 @@ msgid "Volume "
 msgstr "الصوت "
 
 msgid "Classic VDR"
-msgstr "VDR تقليدى  "
+msgstr "VDR تقليدى"
 
 msgid "DISK"
 msgstr "قرص"
@@ -1497,7 +1497,7 @@ msgid "Moving dish to %.1f..."
 msgstr ""
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG شاشة "
+msgstr "ST:TNG شاشة"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
@@ -1538,7 +1538,7 @@ msgid "Recording started"
 msgstr "ابتداء التسجيل"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "البرنامج سيقوم بالاغلاق لاحقا اضغط زر  القفل لاتمام  عملية الاغلاق"
+msgstr "البرنامج سيقوم بالاغلاق لاحقا اضغط زر القفل لاتمام عملية الاغلاق"
 
 msgid "Press any key to cancel shutdown"
 msgstr "اضغط اى زر لالغاء اقفال البرنامج"
@@ -1557,7 +1557,7 @@ msgstr "اضغط اى زر لالغاء اعادة التشغيل"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "البرنامج سيقوم بالاغلاق بعد%s دقيقة "
+msgstr "البرنامج سيقوم بالاغلاق بعد%s دقيقة"
 
 msgid "Disk"
 msgstr "القرص الصلب"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 5be0a2e53..8ea7bd3df 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
@@ -938,7 +938,7 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Sempre ordenar primer carpetes"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr "Tecles num�riques per a car�cters "
+msgstr "Tecles num�riques per a car�cters"
 
 msgid "Setup.OSD$Color key 0"
 msgstr "Tecla color 0"
@@ -1353,7 +1353,7 @@ msgstr "Continuar"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Cancel�lar l'edici� "
+msgstr " Cancel�lar l'edici�"
 
 msgid "Stop recording?"
 msgstr "Aturar la gravaci�?"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index ff153dab0..6c5ac1b93 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,14 +1,14 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladimír Bárta <vladimir.barta@k2atmitec.cz>, 2006, 2008
 # Jiří Dobrý <jdobry@centrum.cz>, 2008
 # Radek Šťastný <dedkus@gmail.com>, 2010
-# Aleš Juřík <ajurik@quick.cz>, 2013
+# Aleš Juřík <ajurik@quick.cz>, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
@@ -23,7 +23,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Neplatný kanál ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM aktivován"
 
 msgid "Channel not available!"
 msgstr "Kanál není dostupný!"
@@ -35,7 +35,7 @@ msgid "off"
 msgstr "vyp."
 
 msgid "on"
-msgstr "zap. "
+msgstr "zap."
 
 msgid "auto"
 msgstr "auto"
@@ -83,13 +83,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "Systémový identifikátor T2"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "Mód SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Začíná prohledávání EPG"
@@ -579,10 +579,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Nastavení kanálu není jedinečné!"
@@ -745,74 +745,74 @@ msgid "CAM not responding!"
 msgstr "CAM neodpovídá!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Editace cesty"
 
 msgid "Folder"
-msgstr ""
+msgstr "Složka"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Tato složka je používána - změny nejsou možné!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Přesunout vloženou složku obsahující %d nahrávek?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Chyba při přesunu složky!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Editace nahrávky"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Tato nahrávka je nyní používána - změny nejsou možné!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Zrušení střihu"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Zastavení střihu"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Zrušení přesunu"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Zastavení přesunu"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Zrušení kopírování"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Zastavené kopírování"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Střih"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Výmaz značek"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Nahrávka zmizela!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Editovaná verze již existuje - přepsat?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Chyba při vložení nahrávky do fronty pro střih"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Přejmenovat nahrávku jménem složky?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Samzat editační značky této nahrávky?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Chyba při mazání editačních značek!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Chyba při změně priority/životnosti!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Chyba při změně složky/jména!"
 
 msgid "Recording info"
 msgstr "Detail nahrávky"
@@ -1082,31 +1082,31 @@ msgid "Setup.LNB$own"
 msgstr "vlastní"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Použít anténní pozicionér?"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Zeměpisná šířka místa (stupně)"
 
 msgid "South"
-msgstr ""
+msgstr "Jih"
 
 msgid "North"
-msgstr ""
+msgstr "Sever"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Zeměpisná délka místa (stupně)"
 
 msgid "West"
-msgstr ""
+msgstr "Západ"
 
 msgid "East"
-msgstr ""
+msgstr "Východ"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Max. otočení pozicionéru (stupně)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Rychlost pozicionéru (stupně/vteřinu)"
 
 msgid "CAM reset"
 msgstr "Reset CAMu"
@@ -1119,16 +1119,16 @@ msgstr "CAM připraven"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktivuji)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Zrušení aktivace"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Aktivace"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1143,7 +1143,7 @@ msgid "Can't open CAM menu!"
 msgstr "Menu CAM není dostupné"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Nemohu aktivovat CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM se používá - opravdu restartovat?"
@@ -1239,31 +1239,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pozastavit přehrávání při nastavování značky"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pozastavit přehrávání při skoku na značku"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Přeskočit editavané části"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Pozastavit přehrávání na poslední značce"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Trvání úvodního času pro adaptivní přeskakování (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Doba pro vynulování adaptivního přeskakování (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Změň chování adaptivního přeskakování"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Použití tlačítek Zpšt/Dále pro adaptivní přeskakování"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Velikost skoku za použití tlačítek Zelená/Žlutá (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Velikost skoku za použití tlačítek Zelená/Žlutá při opakování (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
@@ -1302,10 +1302,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitost po spuštění"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Krok hlasitosti"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Linearizace hlasitosti"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Přecházet z konce na začátek seznamu kanálů"
@@ -1493,7 +1493,7 @@ msgstr "PŘEHRÁVÁNÍ"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Otáčení antény na %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG konzola"
diff --git a/po/da_DK.po b/po/da_DK.po
index 382704e87..d0fbbf804 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index fb7a0af00..762c6fa3b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,11 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2000-2015
+# Albert Danis <a.danis@gmx.de>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2015-02-10 13:45+0100\n"
@@ -77,13 +78,13 @@ msgid "Rolloff"
 msgstr "Rolloff"
 
 msgid "StreamId"
-msgstr "StreamId"
+msgstr "Stream-ID"
 
 msgid "Pilot"
 msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr "T2-Systemkennung"
+msgstr "T2-System-ID"
 
 msgid "SISO/MISO"
 msgstr "SISO/MISO"
@@ -959,7 +960,7 @@ msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Zeit bis zur EPG-Aktualisierung (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG-Fehlerbereinigung"
+msgstr "EPG-Fehlerbereinigungsstufe"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Alte EPG-Daten anzeigen (min)"
@@ -1245,16 +1246,16 @@ msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Pause an der letzten Schnittmarke"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr "Anfangswert beim Halbieren der Sprungweite (s)"
+msgstr "Anfangswert beim adaptiven Springen (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr "Zeitlimit beim Halbieren der Sprungweite (s)"
+msgstr "Zeitlimit beim adaptiven Springen (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr "Sprungweite nur bei Richtungswechsel halbieren"
+msgstr "Alternatives Verhalten beim adapt. Springen"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr "Zur�ck/Vorw�rts-Tasten halbieren Sprungweite"
+msgstr "Adaptives Springen mit Zur�ck/Vorw�rts-Tasten"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
 msgstr "Sprungweite mit Taste Gr�n/Gelb (s)"
diff --git a/po/el_GR.po b/po/el_GR.po
index 6e3552e6d..a131cd7c8 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index e6b488a0e..b2827b5db 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,16 +1,16 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
 # Luca Olivetti <luca@ventoso.org>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2008-03-02 19:02+0100\n"
-"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
+"PO-Revision-Date: 2015-02-19 23:00+0100\n"
+"Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Canal no v�lido ***"
+msgstr "*** Canal no valido ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM activada!"
 
 msgid "Channel not available!"
 msgstr "�Canal no disponible!"
@@ -81,13 +81,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Piloto"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Iniciando la exploraci�n de EPG"
@@ -577,10 +577,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "!Propiedades de canal duplicadas!"
@@ -707,7 +707,7 @@ msgid "What's on now?"
 msgstr "�Qu� hay ahora?"
 
 msgid "What's on next?"
-msgstr "�Qu� hay despu�s?"
+msgstr "�Quiz� hay despu�s?"
 
 msgid "Button$Next"
 msgstr "Despu�s"
@@ -743,74 +743,74 @@ msgid "CAM not responding!"
 msgstr "�CAM no responde!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Editar path"
 
 msgid "Folder"
-msgstr ""
+msgstr "Carpeta"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Esta carpeta esta en uso - no se pueden hacer cambios!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Mueve la carpeta entera y su contenido %d grabaciones"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Error al mover la carpeta!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Editar grabaci�n"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Esta grabaci�n esta en uso - no se pueden hacer cambios!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Cancelar corte"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Stop corte"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Cancelar mover"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Stop mover"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Cancelar copiar"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Stop copiar"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Cortar"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Eliminar marcas"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Grabaci�n desaparecida"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Se est� editando una versi�n - sobreescribir?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Error mientras la grabaci�n est� en cola!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Renombrar la grabaci�n a la carpeta nombre?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Eliminar las marcas de edic�n para esta grabaci�n?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Error mientras se borra las marcas de edici�n!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Error mientras cambias prioridades/directo!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Error mientras cambias carpeta/nombre"
 
 msgid "Recording info"
 msgstr "Informaci�n de grabaci�n"
@@ -825,7 +825,7 @@ msgid "Recordings"
 msgstr "Grabaciones"
 
 msgid "Commands"
-msgstr "�rdenes"
+msgstr "�rdenes"
 
 msgid "Delete recording?"
 msgstr "�Eliminar grabaci�n?"
@@ -1080,31 +1080,31 @@ msgid "Setup.LNB$own"
 msgstr "propio"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Usar el posicionador"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Latitud (grados)"
 
 msgid "South"
-msgstr ""
+msgstr "Sud"
 
 msgid "North"
-msgstr ""
+msgstr "Norte"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Longitud (grados)"
 
 msgid "West"
-msgstr ""
+msgstr "Oeste"
 
 msgid "East"
-msgstr ""
+msgstr "Este"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Max. oscilaci�n del posicionador ( grados)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Velocidad Posicionador (grados)"
 
 msgid "CAM reset"
 msgstr "Reset CAM"
@@ -1117,19 +1117,19 @@ msgstr "CAM preparado"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (activando)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Cancelar activaci�n"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Activado"
 
 msgid "Button$Menu"
-msgstr "Men�"
+msgstr "Menu"
 
 msgid "Button$Reset"
 msgstr "Reiniciar"
@@ -1141,7 +1141,7 @@ msgid "Can't open CAM menu!"
 msgstr "�No se puede abrir el men� CAM!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "No puedes activar CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM en uso - �reiniciar?"
@@ -1237,31 +1237,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pausar reproducci�n al establecer marca"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pausa de reproducci�n al saltar a una marca"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Saltar partes editadas"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Repetici�n Pausa en �ltima marca"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Duraci�n inicial para saltar adaptativo ( s )"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Cambiar el tiempo de espera para saltar adaptativo (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Comportamiento alternativo para saltar adaptativo"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Use teclas Prev/Next para saltar de adaptaci�n"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Saltar distancia con teclas verde/amarillo (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Saltar distancia con teclas verde/amarillo en la repetici�n (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
@@ -1300,10 +1300,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Volumen inicial"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Volumen saltos"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Volumen lineal"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Primer canal despu�s del �ltimo"
@@ -1491,7 +1491,7 @@ msgstr "REPRODUCIR"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Mover a %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "Paneles ST:TNG"
diff --git a/po/et_EE.po b/po/et_EE.po
index 5caeb5072..8bf931a4d 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2004-2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
@@ -848,7 +848,7 @@ msgid "always"
 msgstr "alati"
 
 msgid "OSD"
-msgstr "Ekraanimenüü"
+msgstr "Ekraanikuva"
 
 msgid "Setup.OSD$Language"
 msgstr "Keel"
@@ -1245,25 +1245,25 @@ msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Paus viimasel markeril"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr "Adaptiivse hüppe kestuse algväärtus (s)"
+msgstr "Adaptiivse hüppe pikkuse algväärtus (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr "Adaptiivse hüppe lähtestamise viide (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr "Adaptiivse hüppe vaheldumine käitumine"
+msgstr "Adaptiivse hüppe vaheldumise omadus"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Adaptiivne hüpe klahvidega Eelmine/Järgmine"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Klahvide Roheline/Kollane hüpe (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Klahvide Roheline/Kollane korduv hüpe (s)"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "Jätkamise ID"
+msgstr "Taasesituse tunnus"
 
 msgid "Miscellaneous"
 msgstr "Muud sätted"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 7cf860aab..05d4b0f9d 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,15 +1,15 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2003-2008, 2010-2013
+# Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2003-2008, 2010-2013, 2015
 # Matti Lehtimäki <matti.lehtimaki@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
@@ -1258,13 +1258,13 @@ msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Käytä vaihtoehtoista mukautuvaa hyppyä"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Käytä Ed./Seur. mukautuvaan hyppyyn"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Hypyn kesto värinäppäimillä (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Toistohypyn kesto värinäppäimillä (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index a5a34add9..06bb12559 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001, 2002, 2008
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003, 2005
@@ -9,18 +9,18 @@
 # Bruno Roussel <bruno.roussel@free.fr>, 2007
 # Michael Nival <mnival@club-internet.fr>, 2007
 # Marc Perrudin <vdr@ekass.net>, 2013
-# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
+# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013, 2015
 # Peter Münster <pmlists@free.fr>, 2013
 # Dominique Plu <dplu@free.fr>, 2013
 # Régis Bossut <famille.bossut@wanadoo.fr>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-11 11:02+0100\n"
-"PO-Revision-Date: 2015-02-10 17:16+0100\n"
-"Last-Translator: Régis Bossut <famille.bossut@wanadoo.fr>\n"
+"PO-Revision-Date: 2015-02-18 20:16+0100\n"
+"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Chaîne invalide ! ***"
 
 msgid "CAM activated!"
-msgstr "CAM activée !"
+msgstr "CAM activé !"
 
 msgid "Channel not available!"
 msgstr "Chaîne non disponible !"
@@ -94,7 +94,7 @@ msgid "Pilot"
 msgstr "Pilote"
 
 msgid "T2SystemId"
-msgstr "ID système T2"
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
 msgstr "SISO/MISO"
@@ -118,7 +118,7 @@ msgid "Content$Comedy"
 msgstr "Comédie"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr "Soap/Mélodrame/Folklorique"
+msgstr "Feuilleton/Mélodrame/Folklorique"
 
 msgid "Content$Romance"
 msgstr "Romance"
@@ -205,7 +205,7 @@ msgid "Content$Entertainment Programme for 10 to 16"
 msgstr "Programme de divertissement pour les 10-16 ans"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr "Informationnel/Éducatif/Programme Scolaire "
+msgstr "Informationnel/Éducatif/Programme Scolaire"
 
 msgid "Content$Cartoons/Puppets"
 msgstr "Dessins animés/Marionnettes"
@@ -341,7 +341,7 @@ msgstr "Direct"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr "à partir de %d ans"
+msgstr "%d ans et plus"
 
 msgid "No title"
 msgstr "Sans titre"
@@ -799,7 +799,7 @@ msgid "Button$Delete marks"
 msgstr "Supprimer les marqueurs"
 
 msgid "Recording vanished!"
-msgstr "Enregistrement disparu !"
+msgstr "L'enregistrement a disparu !"
 
 msgid "Edited version already exists - overwrite?"
 msgstr "La version éditée existe déjà - écraser ?"
@@ -811,16 +811,16 @@ msgid "Rename recording to folder name?"
 msgstr "Modifier le nom du dossier des enregistrements ?"
 
 msgid "Delete editing marks for this recording?"
-msgstr "Supprimer les marqueurs d'édition de cet enregistrement ?"
+msgstr "Supprimer les marqueurs de montage pour cet enregistrement ?"
 
 msgid "Error while deleting editing marks!"
-msgstr "Erreur pendant la suppression des marqueurs d'édition !"
+msgstr "Erreur pendant la suppression des marqueurs du montage !"
 
 msgid "Error while changing priority/lifetime!"
-msgstr "Erreur pendant le changement de priorité et/ou durée de vie !"
+msgstr "Erreur pendant le changement de priorité/durée de vie !"
 
 msgid "Error while changing folder/name!"
-msgstr "Erreur pendant le changement de dossier et/ou nom !"
+msgstr "Erreur pendant le changement de dossier/nom !"
 
 msgid "Recording info"
 msgstr "Infos sur l'enregistrement"
@@ -925,7 +925,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Infos chaîne lors du changement"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Affichage infos chaîne non permanent"
+msgstr "Infos chaîne non permanentes"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Défilement par pages"
@@ -1093,7 +1093,7 @@ msgid "Setup.LNB$Use dish positioner"
 msgstr "Utiliser le positionneur de parabole"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr "Latitude du site (°)"
+msgstr "Latitude du site (degrés)"
 
 msgid "South"
 msgstr "Sud"
@@ -1102,7 +1102,7 @@ msgid "North"
 msgstr "Nord"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr "Longitude du site (°)"
+msgstr "Longitude du site (degrés)"
 
 msgid "West"
 msgstr "Ouest"
@@ -1111,10 +1111,10 @@ msgid "East"
 msgstr "Est"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr "Course max. du positionneur (°)"
+msgstr "Course max. du positionneur (degrés)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr "Vitesse du positionneur (°/s)"
+msgstr "Vitesse du positionneur (degrés/s)"
 
 msgid "CAM reset"
 msgstr "CAM réinitialisé"
@@ -1193,7 +1193,7 @@ msgid "Setup.Recording$Pause key handling"
 msgstr "Fonction de la touche Pause"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "Priorité de l'enregistr. mis en pause "
+msgstr "Priorité de l'enregistr. mis en pause"
 
 msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Expiration enregistr. mis en pause (j)"
@@ -1226,7 +1226,7 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Scinder les fichiers édités"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "Supprimer l'enregistrement timeshift"
+msgstr "Supprimer l'enregistrement du timeshift"
 
 msgid "Replay"
 msgstr "Lecture"
@@ -1244,37 +1244,37 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Afficher la barre de progression (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Arrêt lecture pendant ajout marqueur"
+msgstr "Paude de la lecture pendant l'ajout du marqueur"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr "Arrêt lecture après saut vers un marqueur"
+msgstr "Pause lecture pendant le saut vers un marqueur"
 
 msgid "Setup.Replay$Skip edited parts"
 msgstr "Sauter les parties éditées"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr "Arrêt lecture au dernier marqueur"
+msgstr "Pause lecture au dernier marqueur"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr "Durée initiale pour le saut adaptatif (s)"
+msgstr "Durée initiale du saut adaptatif (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr "Timeout du reset pour le saut adaptatif (s)"
+msgstr "Annule la temporisation du saut adaptatif (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr "Réduire le saut adaptatif uniquement si changement de sens"
+msgstr "Réduire le saut adaptatif lors d'un changement de sens"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
 msgstr "Utiliser les touches Préc./Suiv. pour le saut adaptatif"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr "Distance de saut pour les touches Verte/Jaune (s)"
+msgstr "Durée du saut pour les touches Verte/Jaune (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr "Distance de saut pour les touches Verte/Jaune en répétition (s)"
+msgstr "Durée du saut pour les touches Verte/Jaune en répétition (s)"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID de reprise"
+msgstr "ID résumé"
 
 msgid "Miscellaneous"
 msgstr "Divers"
@@ -1295,10 +1295,10 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Délai de saisie de la chaîne (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr "Délai de répétition de la télécommande (ms)"
+msgstr "Délai répétition de la télécommande (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr "Delta de répétition de la télécommande (ms)"
+msgstr "Delta répétition de la télécommande (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Chaîne initiale"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 1eb9e2be6..0424a4464 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Drazen Dupor <drazen.dupor@dupor.com>, 2004, 2005
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
@@ -1401,10 +1401,10 @@ msgid "Editing process already active!"
 msgstr "Ure�ivanje je ve� u tijeku!!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr "abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abc��d�efghijklmnopqrs�tuvwxyz�0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 0ddceec7e..c34bc0e33 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,18 +1,18 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
 # Thomas Günther <tom@toms-cafe.de>, 2007
 # István Füley <ifuley@tigercomp.ro>, 2007, 2012, 2013, 2015
-# Mario Fenneis <admin@mediastreambox.at>, 2015
+# Albert Danis <a.danis@gmx.de>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2015-02-03 11:35+0200\n"
+"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"PO-Revision-Date: 2015-02-13 09:36+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "Language: hu\n"
@@ -28,7 +28,7 @@ msgid "CAM activated!"
 msgstr "CAM aktiválva!"
 
 msgid "Channel not available!"
-msgstr "A csatorna nem elérhető!"
+msgstr "Csatorna nem elérhető!"
 
 msgid "Can't start Transfer Mode!"
 msgstr "Transfer-Mode nem indítható!"
@@ -55,7 +55,7 @@ msgid "Srate"
 msgstr "Srate"
 
 msgid "Inversion"
-msgstr "Inversion"
+msgstr "Inverzió"
 
 msgid "CoderateH"
 msgstr "CoderateH"
@@ -70,13 +70,13 @@ msgid "Bandwidth"
 msgstr "Sávszélesség"
 
 msgid "Transmission"
-msgstr "Transmission"
+msgstr "Átvitel"
 
 msgid "Guard"
 msgstr "Guard"
 
 msgid "Hierarchy"
-msgstr "Hierarhia"
+msgstr "Hierarchia"
 
 msgid "Rolloff"
 msgstr "Rolloff"
@@ -100,7 +100,7 @@ msgid "Content$Movie/Drama"
 msgstr "Film/Dráma"
 
 msgid "Content$Detective/Thriller"
-msgstr "Nyomozó/Krimi"
+msgstr "Bűnügy/Krimi"
 
 msgid "Content$Adventure/Western/War"
 msgstr "Kaland/Western/Háborús"
@@ -118,7 +118,7 @@ msgid "Content$Romance"
 msgstr "Romantikus film"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "Komoly/Klasszikus/Vallási/Történelmi film/Dráma"
+msgstr "Komoly film/Klasszikus/Vallási/Történelmi film/Dráma"
 
 msgid "Content$Adult Movie/Drama"
 msgstr "Felnőtt tartalom/Dráma"
@@ -142,7 +142,7 @@ msgid "Content$Show/Game Show"
 msgstr "Show/Játékshow"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr "Játék/Kvíz/Verseny"
+msgstr "Játék/Kvíz/Vetélkedő"
 
 msgid "Content$Variety Show"
 msgstr "Varietéműsor"
@@ -160,7 +160,7 @@ msgid "Content$Sport Magazine"
 msgstr "Sporthíradó"
 
 msgid "Content$Football/Soccer"
-msgstr "Futball/Labdarúgás"
+msgstr "Amerikai futball/Labdarúgás"
 
 msgid "Content$Tennis/Squash"
 msgstr "Tenisz/Squash"
@@ -184,7 +184,7 @@ msgid "Content$Equestrian"
 msgstr "Lovassport"
 
 msgid "Content$Martial Sports"
-msgstr "Közdősport"
+msgstr "Küzdősport"
 
 msgid "Content$Children's/Youth Programme"
 msgstr "Gyerek/Ifjúsági"
@@ -250,7 +250,7 @@ msgid "Content$Experimental Film/Video"
 msgstr "Avantgárd/Videó"
 
 msgid "Content$Broadcasting/Press"
-msgstr "Közvetítés/Sajtó"
+msgstr "Hírfolyam/Sajtó"
 
 msgid "Content$New Media"
 msgstr "Új média"
@@ -313,7 +313,7 @@ msgid "Content$Fitness & Health"
 msgstr "Fitness és egészség"
 
 msgid "Content$Cooking"
-msgstr "Főzőműsor"
+msgstr "Konyha"
 
 msgid "Content$Advertisement/Shopping"
 msgstr "Reklám/Vásárlás"
@@ -338,7 +338,7 @@ msgid "ParentalRating$from %d"
 msgstr "%d éven felülieknek"
 
 msgid "No title"
-msgstr "cím nélkül"
+msgstr "Cím nélkül"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -386,10 +386,10 @@ msgid "Learning Remote Control Keys"
 msgstr "Távirányító betanítása"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Harmadik lépés: kód mentése"
+msgstr "Harmadik lépés: gomb kódok mentése"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "'Fel' mentés, 'Le' mégse"
+msgstr "'Fel' mentés, 'Le' megszakítás"
 
 msgid "Key$Up"
 msgstr "Fel"
@@ -464,7 +464,7 @@ msgid "Key$Channel-"
 msgstr "Csatorna-"
 
 msgid "Key$PrevChannel"
-msgstr "Az előző csatorna"
+msgstr "Előző csatorna"
 
 msgid "Key$Volume+"
 msgstr "Hangerő+"
@@ -587,25 +587,25 @@ msgid "Tid"
 msgstr "Tid"
 
 msgid "Channel settings are not unique!"
-msgstr "A csatornabeállítások nem egyértelműek!"
+msgstr "Csatornabeállítások nem egyértelműek!"
 
 msgid "Channels"
 msgstr "Csatornák"
 
 msgid "Button$Edit"
-msgstr "Beállítani"
+msgstr "Szerkesztés"
 
 msgid "Button$New"
 msgstr "Új"
 
 msgid "Button$Delete"
-msgstr "Törölni"
+msgstr "Törlés"
 
 msgid "Button$Mark"
-msgstr "Kijelölni"
+msgstr "Kijelölés"
 
 msgid "Channel is being used by a timer!"
-msgstr "A csatornát az időzítő használja!"
+msgstr "Csatornát az időzítő használja!"
 
 msgid "Delete channel?"
 msgstr "Csatorna törlése?"
@@ -624,7 +624,7 @@ msgstr "Ez a könyvtárnév már létezik!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "A könyvtár neve nem tartalmazhat '%c'!"
+msgstr "Könyvtár neve nem tartalmazhat '%c'!"
 
 msgid "Button$Open"
 msgstr "Kinyitni"
@@ -705,13 +705,13 @@ msgid "Button$Record"
 msgstr "Felvétel"
 
 msgid "Button$Switch"
-msgstr "Átkapcsolni"
+msgstr "Átváltás"
 
 msgid "What's on now?"
-msgstr "Most adásban?"
+msgstr "Adásban"
 
 msgid "What's on next?"
-msgstr "Következik?"
+msgstr "Következik"
 
 msgid "Button$Next"
 msgstr "Következő"
@@ -723,7 +723,7 @@ msgid "Button$Schedule"
 msgstr "Műsorújság"
 
 msgid "Can't switch channel!"
-msgstr "A csatornát nem lehet elkapcsolni!"
+msgstr "Csatornaváltás nem lehetséges!"
 
 #, c-format
 msgid "Schedule - %s"
@@ -734,17 +734,17 @@ msgid "This event - %s"
 msgstr "Ez az adás - %s"
 
 msgid "This event - all channels"
-msgstr "Ez az adás - összes csatornák"
+msgstr "Ez az adás - összes csatornán"
 
 msgid "All events - all channels"
-msgstr "Az összes adás - összes csatornák"
+msgstr "Összes adás - összes csatornán"
 
 #, c-format
 msgid "Please enter %d digits!"
 msgstr "Üssön be %d számot!"
 
 msgid "CAM not responding!"
-msgstr "A CAM nem válaszol!"
+msgstr "CAM nem válaszol!"
 
 msgid "Edit path"
 msgstr "Elérés szerkesztése"
@@ -753,7 +753,7 @@ msgid "Folder"
 msgstr "Könyvtár"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr "Ez a könyvtár használatban van - szerkesztés nem lehetséges!"
+msgstr "Ez a könyvtár használatban van - módosítás nem lehetséges!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
@@ -766,22 +766,22 @@ msgid "Edit recording"
 msgstr "Felvétel szerkesztése"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr "A felvétel használatban van - szerkesztés nem lehetséges!"
+msgstr "Ez a felvétel használatban van - módosítás nem lehetséges!"
 
 msgid "Button$Cancel cutting"
-msgstr "Vágás mégse"
+msgstr "Vágás megszakítása"
 
 msgid "Button$Stop cutting"
 msgstr "Vágás leállítása"
 
 msgid "Button$Cancel moving"
-msgstr "Áthelyezés mégse"
+msgstr "Áthelyezés megszakítása"
 
 msgid "Button$Stop moving"
 msgstr "Áthelyezés leállítása"
 
 msgid "Button$Cancel copying"
-msgstr "Másolás mégse"
+msgstr "Másolás megszakítása"
 
 msgid "Button$Stop copying"
 msgstr "Másolása leállítása"
@@ -793,7 +793,7 @@ msgid "Button$Delete marks"
 msgstr "Vágópontok törlése"
 
 msgid "Recording vanished!"
-msgstr "A felvétel eltűnt!"
+msgstr "Ez a felvétel eltűnt!"
 
 msgid "Edited version already exists - overwrite?"
 msgstr "A szerkesztett változat már létezik - felülírjam?"
@@ -802,7 +802,7 @@ msgid "Error while queueing recording for cutting!"
 msgstr "Hiba a felvétel vágásra előkészítése közben!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Felvétel átnevezése a könyvtár nevére?"
 
 msgid "Delete editing marks for this recording?"
 msgstr "Töröljem a felvétel vágópontjait?"
@@ -835,10 +835,10 @@ msgid "Delete recording?"
 msgstr "Felvétel törlése?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "A felvétel szerkesztés alatt - biztos töröljem?"
+msgstr "Ez a felvétel szerkesztés alatt áll - biztos töröljem?"
 
 msgid "Error while deleting recording!"
-msgstr "Hiba a felvétel törlésénél!"
+msgstr "Hiba a felvétel törlése közben!"
 
 msgid "Recording commands"
 msgstr "Parancsok a felvételekhez"
@@ -904,7 +904,7 @@ msgid "Setup.OSD$Fixed font size (%)"
 msgstr "Kötött betűtipus méret (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "Adásinformáció poziciója"
+msgstr "Csatorna információ pozíciója"
 
 msgid "bottom"
 msgstr "lent"
@@ -913,13 +913,13 @@ msgid "top"
 msgstr "Fent"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "Adásinformáció feltűntetésének időtartama (mp)"
+msgstr "Csatorna infó időtartama (mp)"
 
 msgid "Setup.OSD$Info on channel switch"
 msgstr "Információ a csatorna váltásánál"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "A lekérdezett adásinformáció bezárása"
+msgstr "Lekérdezett adásinformáció bezárása"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Oldalanként léptetni"
@@ -928,10 +928,10 @@ msgid "Setup.OSD$Scroll wraps"
 msgstr "Korlátlan léptetés"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "A menü gomb zár"
+msgstr "Menü gomb zár"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Felvételek listája"
+msgstr "Felvételek könyvtárai"
 
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Könyvtárválasztás az időzítő menüben"
@@ -999,10 +999,10 @@ msgid "names only"
 msgstr "kizárólag nevek"
 
 msgid "PIDs only"
-msgstr "kizárólag PIDek"
+msgstr "kizárólag PID-ek"
 
 msgid "names and PIDs"
-msgstr "nevek és PIDek"
+msgstr "nevek és PID-ek"
 
 msgid "add new channels"
 msgstr "új csatornák hozzáadása"
@@ -1087,7 +1087,7 @@ msgid "Setup.LNB$Use dish positioner"
 msgstr "Forgató használata"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr "Szélesség (fok)"
+msgstr "Telepítés szélességi foka"
 
 msgid "South"
 msgstr "Dél"
@@ -1096,7 +1096,7 @@ msgid "North"
 msgstr "Észak"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr "Hosszúság (fok)"
+msgstr "Telepítés hosszúsági foka"
 
 msgid "West"
 msgstr "Nyugat"
@@ -1105,10 +1105,10 @@ msgid "East"
 msgstr "Kelet"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr "Forgató maximális intervalluma (fok)"
+msgstr "Forgató oldalszöge max. (fok)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr "Forgató sebessége (fok/mp)"
+msgstr "Forgató sebessége max. (fok/mp)"
 
 msgid "CAM reset"
 msgstr "CAM újraindítás"
@@ -1127,7 +1127,7 @@ msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr "Aktiválás mégse"
+msgstr "Aktiválás megszakítása"
 
 msgid "Button$Activate"
 msgstr "Aktiválás"
@@ -1136,22 +1136,22 @@ msgid "Button$Menu"
 msgstr "Menü"
 
 msgid "Button$Reset"
-msgstr "Reset"
+msgstr "Újraindítás"
 
 msgid "Opening CAM menu..."
-msgstr "A CAM menü nyitása..."
+msgstr "CAM menü nyitása..."
 
 msgid "Can't open CAM menu!"
-msgstr "A CAM menü nem nyitható"
+msgstr "CAM menü nem nyitható!"
 
 msgid "Can't activate CAM!"
 msgstr "CAM aktiválás sikertelen!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM használatban - valóban újraindítjuk?"
+msgstr "CAM használatban - valóban újraindítani?"
 
 msgid "Can't reset CAM!"
-msgstr "A CAM újraindítás nem sikerült"
+msgstr "CAM újraindítása nem sikerült!"
 
 msgid "do not pause live video"
 msgstr "élőkép leállítása tiltva"
@@ -1184,7 +1184,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Alapértelmezett élettartam (n)"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "A szünet gomb működése"
+msgstr "Szünet gomb működése"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Időeltolás prioritása"
@@ -1193,16 +1193,16 @@ msgid "Setup.Recording$Pause lifetime (d)"
 msgstr "Időeltolás élettartama (n)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "Epizódnév"
+msgstr "Epizódnevet használni"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "VPS"
+msgstr "VPS-t használni"
 
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Időeltolás VPS-nél (mp)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Egygombos felvétel megjelölése"
+msgstr "Egygombos felvétel kijelölése"
 
 msgid "Setup.Recording$Name instant recording"
 msgstr "Egygombos felvétel megnevezése"
@@ -1214,10 +1214,10 @@ msgid "Setup.Recording$present event"
 msgstr "Most futó műsor"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "Max. videó fájl méret (MB)"
+msgstr "Max. videó fájlméret (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Feldolgozott fájlok felosztása"
+msgstr "Szerkesztett fájlok felosztása"
 
 msgid "Setup.Recording$Delete timeshift recording"
 msgstr "Időeltolásos felvétel törlése"
@@ -1238,10 +1238,10 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Lejátszósáv felüntetésének ideje (mp)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "A visszajátszás megállítása vágópont kijelölésnél"
+msgstr "Lejátszás megállítása vágópont kijelölésnél"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr "Szünet a lejátszásban, mikor egy vágópontra ugrik"
+msgstr "Szünet a lejátszásban, ha vágópontra ugrik"
 
 msgid "Setup.Replay$Skip edited parts"
 msgstr "Vágott részek kihagyása"
@@ -1253,19 +1253,19 @@ msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
 msgstr "Felezett ugrás kezdeti értéke (mp)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr "Felezett ugrás időkorláta (mp)"
+msgstr "Felezett ugrás időkorlátja (mp)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Felezett ugrás csak irányváltoztatásnál"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Vissza/Előre gombok haszn. a felezett ugráshoz"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Ugrástáv a Zöld/Sárga gombokkal (mp)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Ismételt ugrástáv a Zöld/Sárga gombokkal (mp)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Lejátszás azonosító"
@@ -1283,22 +1283,22 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP szétkapcsol használat nélkül(mp)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Adásváltás ideje (mp)"
+msgstr "Előző csatorna időkorlátja (mp)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Csatornaváltás timeout (emp)"
+msgstr "Csatorna beírás időkorlátja (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr "Távirányító ismétlés késleltetése (emp)"
+msgstr "Távirányító ismétlés késleltetése (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr "Távirányító ismétlés deltája (emp)"
+msgstr "Távirányító ismétlés intervalluma (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
 msgstr "Csatorna induláskor"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "ahogy az előbb"
+msgstr "Mint legutóbb"
 
 msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hangerő indulásnál"
@@ -1322,7 +1322,7 @@ msgid "Plugins"
 msgstr "Pluginok"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ennek a plugin-nak nincs setup-paramétere!"
+msgstr "Ennek a plugin-nak nincs paramétere!"
 
 msgid "Setup"
 msgstr "Beállítások"
@@ -1361,7 +1361,7 @@ msgid "Stop recording?"
 msgstr "Felvételt befejezni?"
 
 msgid "Cancel editing?"
-msgstr "Vágást befejezni?"
+msgstr "Vágást megszakítani?"
 
 msgid "No audio available!"
 msgstr "Hang nem elérhetö!"
@@ -1370,16 +1370,16 @@ msgid "No subtitles"
 msgstr "Felirat ki"
 
 msgid "No subtitles available!"
-msgstr "A csatornán nincs felirat!"
+msgstr "Ezen a csatornán nincs felirat!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Nincs elegendő hely a felvételre"
+msgstr "Nincs elegendő hely a felvételre!"
 
 msgid "No free DVB device to record!"
 msgstr "Nincs szabad DVB eszköz a felvételhez!"
 
 msgid "Pausing live video..."
-msgstr "Az élő adás megállítva..."
+msgstr "Élő adás megállítva..."
 
 msgid "Delete timeshift recording?"
 msgstr "Töröljem az időeltolásos felvételt?"
@@ -1389,19 +1389,19 @@ msgid "Jump: "
 msgstr "Ugrás ide: "
 
 msgid "No editing marks defined!"
-msgstr "Nincs vágópont kijelölve"
+msgstr "Nincs vágópont kijelölve!"
 
 msgid "No editing sequences defined!"
-msgstr "Nincs vágórész kijelölve"
+msgstr "Nincs vágórész kijelölve!"
 
 msgid "Can't start editing process!"
-msgstr "A vágás nem indítható!"
+msgstr "Vágás nem indítható!"
 
 msgid "Editing process started"
 msgstr "Vágás elindítva"
 
 msgid "Editing process already active!"
-msgstr "A vágás már aktív!"
+msgstr "Vágás már aktív!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aábcdeéfghiíjklmnoóöőpqrstuúüűvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
@@ -1413,10 +1413,10 @@ msgid "Button$ABC/abc"
 msgstr "ABC/abc"
 
 msgid "Button$Overwrite"
-msgstr "Átírni"
+msgstr "Felülírás"
 
 msgid "Button$Insert"
-msgstr "Beilleszteni"
+msgstr "Beillesztés"
 
 msgid "Plugin"
 msgstr "Plugin"
@@ -1425,45 +1425,45 @@ msgid "Up/Dn for new location - OK to move"
 msgstr "Fel/Le egy új pozícióért - aztán OK"
 
 msgid "Channel locked (recording)!"
-msgstr "A csatorna blokkolva (felvétel)!"
+msgstr "Csatorna blokkolva (felvétel)!"
 
 msgid "Low disk space!"
-msgstr "A merevlemez majdnem tele!"
+msgstr "Adattároló majdnem tele!"
 
 msgid "Regenerating index file"
-msgstr "Az index file újragenerálása"
+msgstr "Index fájl újragenerálása"
 
 msgid "Index file regeneration complete"
-msgstr "Index file újragenerálása kész."
+msgstr "Index fájl újragenerálása kész"
 
 msgid "Index file regeneration failed!"
-msgstr "Index file újragenerálása sikertelen!"
+msgstr "Index fájl újragenerálása sikertelen!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "A leállítás nem lehetséges - Opció '-s' hiányzik!"
+msgstr "Leállítás nem lehetséges: '-s' opció nincs megadva!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Szerkesztés folyamatban - valóban leállítjuk?"
+msgstr "Szerkesztés folyamatban - mégis leállítani?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Felvétel folyamatban van - mégis kikapcsolni?"
+msgstr "Felvétel folyamatban - mégis leállítani?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Felvétel %ld perc múlva kezdődik - mégis kikapcsolni?"
+msgstr "Felvétel %ld perc múlva kezdődik - mégis leállítani?"
 
 msgid "shut down anyway?"
-msgstr "mégis kikapcsolni?"
+msgstr "mégis leállítani?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "A(z) %s plugin  ébreszt %ld perc múlva, folytatjuk?"
+msgstr "A(z) %s plugin ébreszt %ld perc múlva, folytatni?"
 
 msgid "Editing - restart anyway?"
-msgstr "Szerkesztés folyamatban - valóban újraindítjuk?"
+msgstr "Szerkesztés folyamatban - mégis újraindítani?"
 
 msgid "Recording - restart anyway?"
-msgstr "Felvétel folyamatban van - mégis újraindítani?"
+msgstr "Felvétel folyamatban - mégis újraindítani?"
 
 msgid "restart anyway?"
 msgstr "mégis újraindítani?"
@@ -1476,7 +1476,7 @@ msgid "Classic VDR"
 msgstr "Klasszikus VDR"
 
 msgid "DISK"
-msgstr "LEMEZ"
+msgstr "ADATTÁROLÓ"
 
 msgid "LOAD"
 msgstr "TERHELÉS"
@@ -1495,7 +1495,7 @@ msgstr "LEJÁTSZÁS"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr "Antenna forgatása  %.1f..."
+msgstr "Antenna forgatása %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG Konzol"
@@ -1536,10 +1536,10 @@ msgid "Pause live video?"
 msgstr "Megállítsam az élő képet?"
 
 msgid "Recording started"
-msgstr "A felvétel elindítva"
+msgstr "Felvétel elindítva"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "A VDR később fog leállni - Kikapcs gombbal kényszerített leállítás"
+msgstr "VDR később fog leállni - Kikapcs gombbal kényszerített leállítás"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Nyomj egy gombot a leállás megszakításához"
@@ -1558,10 +1558,10 @@ msgstr "Nyomj egy gombot az újraindítás megszakításához"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "A VDR leáll %s perc múlva"
+msgstr "VDR leáll %s perc múlva"
 
 msgid "Disk"
-msgstr "Lemez"
+msgstr "Adattároló"
 
 msgid "free"
 msgstr "szabad"
diff --git a/po/it_IT.po b/po/it_IT.po
index c2c50db74..79946ffd5 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alberto Carraro <bertocar@tin.it>, 2001
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2015-02-09 20:26+0100\n"
+"PO-Revision-Date: 2015-02-12 19:31+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -1122,7 +1122,7 @@ msgstr "La CAM è pronta"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr "(attivazione)"
+msgstr " (attivazione)"
 
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
@@ -1260,13 +1260,13 @@ msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Comportamento alternativo per spostamenti adattivi"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Usa tasti Avanti/Indietro per spostamenti adattivi"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Durata spostamento con tasti Verde/Giallo (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Durata spostamento con tasti Verde/Giallo in sequenza (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index af5a5f35f..a77dfcc78 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,14 +1,14 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013, 2015.
+# Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2015-02-09 17:08+0100\n"
+"PO-Revision-Date: 2015-02-11 14:02+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
@@ -764,28 +764,28 @@ msgid "This recording is currently in use - no changes are possible!"
 msgstr "Šis įrašas šiuo metu naudojamas, tad šiuo metu negalimi jokie pakeitimai!"
 
 msgid "Button$Cancel cutting"
-msgstr "Button$Atšaukti karpymą"
+msgstr "Atšaukti karpymą"
 
 msgid "Button$Stop cutting"
-msgstr "Button$Sustabdyti karpymą"
+msgstr "Sustabdyti karpymą"
 
 msgid "Button$Cancel moving"
-msgstr "Button$Atšaukti perkėlimą"
+msgstr "Atšaukti perkėlimą"
 
 msgid "Button$Stop moving"
-msgstr "Button$Sustabdyti perkėlimą"
+msgstr "Sustabdyti perkėlimą"
 
 msgid "Button$Cancel copying"
-msgstr "Button$Atšaukti kopijavimą"
+msgstr "Atšaukti kopijavimą"
 
 msgid "Button$Stop copying"
-msgstr "Button$Sustabdyti kopijavimą"
+msgstr "Sustabdyti kopijavimą"
 
 msgid "Button$Cut"
-msgstr "Button$Iškirpti"
+msgstr "Iškirpti"
 
 msgid "Button$Delete marks"
-msgstr "Button$Ištrinti žymes"
+msgstr "Ištrinti žymes"
 
 msgid "Recording vanished!"
 msgstr "Įrašai išvalyti!"
@@ -890,7 +890,7 @@ msgid "Setup.OSD$Fixed font"
 msgstr "Nustatyto dydžio šriftas"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Numatyto šrifto dydis  (%)"
+msgstr "Numatyto šrifto dydis (%)"
 
 msgid "Setup.OSD$Small font size (%)"
 msgstr "Mažo šrifto dydis (%)"
@@ -1079,10 +1079,10 @@ msgid "Setup.LNB$own"
 msgstr "savas"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr "Setup.LNB$Naudoti pozicionierių"
+msgstr "Naudoti pozicionierių"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr "Setup.LNB$Vitovės platuma (laipsniais)"
+msgstr "Vitovės platuma (laipsniais)"
 
 msgid "South"
 msgstr "Pietūs"
@@ -1091,7 +1091,7 @@ msgid "North"
 msgstr "Šiaurė"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr "Setup.LNB$Vietovės ilgima (laipsniais)"
+msgstr "Vietovės ilgima (laipsniais)"
 
 msgid "West"
 msgstr "Vakarai"
@@ -1122,10 +1122,10 @@ msgid "CAM"
 msgstr "Dekodavimo modulis (CAM)"
 
 msgid "Button$Cancel activation"
-msgstr "Button$Atšaukti aktyvaciją"
+msgstr "Atšaukti aktyvaciją"
 
 msgid "Button$Activate"
-msgstr "Button$Aktyvuoti"
+msgstr "Aktyvuoti"
 
 msgid "Button$Menu"
 msgstr "Meniu"
@@ -1236,31 +1236,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pristabdyti pakartojimą kai vyksta žymėjimas"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr "Setup.Replay$Pristabdyti pakartojim1 kol pereinama prie žymės"
+msgstr "Pristabdyti pakartojim1 kol pereinama prie žymės"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr "Setup.Replay$Praleisti koreguotas dalis"
+msgstr "Praleisti koreguotas dalis"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr "Setup.Replay$Pristabdyti pakartojimą pasiekus paskutinę žymę"
+msgstr "Pristabdyti pakartojimą pasiekus paskutinę žymę"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr "Setup.Replay$Adaptyvaus peršokimo trukmė (s)"
+msgstr "Adaptyvaus peršokimo trukmė (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr "Setup.Replay$Adaptyvaus peršokimo perkrovimo užlaikymas(s)"
+msgstr "Adaptyvaus peršokimo perkrovimo užlaikymas(s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr "Setup.Replay$Adaptyvaus peršokimo galima elgsena"
+msgstr "Adaptyvaus peršokimo galima elgsena"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Adaptyviam peršokimui naudoti Atgal/Pirmyn mygtukus"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Praleisti atkarpą (s) su Žaliu/Geltonu mygtukais"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Praleisti atkarpą pakartojime (s) su Žaliu/Geltonu mygtukais"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
@@ -1299,10 +1299,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Garsas įjungimo metu"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr "Setup.Miscellaneous$Garso reguliavimo žingsniai"
+msgstr "Garso reguliavimo žingsniai"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr "Setup.Miscellaneous$Garso lygiavimas"
+msgstr "Garso lygiavimas"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kanalų pridengimas"
@@ -1368,7 +1368,7 @@ msgid "No subtitles available!"
 msgstr "Subtitrai nepateikiami!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "Nepakanka vietos diske,  kad būtų galima įrašinėti!"
+msgstr "Nepakanka vietos diske, kad būtų galima įrašinėti!"
 
 msgid "No free DVB device to record!"
 msgstr "Nėra laisvų DVB įrenginių, kad būtų galima įrašinėti!"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index dd740f274..3e4e7e4ac 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2015-02-08 15:18+0100\n"
@@ -345,7 +345,7 @@ msgid "LanguageCode$eng"
 msgstr "mkd"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "Фаза 1: Детекција на типот на далечински управувач "
+msgstr "Фаза 1: Детекција на типот на далечински управувач"
 
 msgid "Press any key on the RC unit"
 msgstr "Притиснете копче на далечинскиот управувач"
@@ -1255,13 +1255,13 @@ msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Алтернативно однесување за адаптабилно скокање"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Користи копчиња Претходно/Следно за адаптабилно скокање"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Дистанца на скокање со Зелено/Жолто копче (сек)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Дистанца на скокање со Зелено/Жолто копче при повторување (сек)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
@@ -1400,10 +1400,10 @@ msgid "Editing process already active!"
 msgstr "Уредувањето е веќе во тек!!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr "абвгдѓежзѕијклљмнњопрстќуфхцчџш0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " абвгдѓежзѕијклљмнњопрстќуфхцчџш0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcабвг2\tdefдѓеж3\tghiзѕиј4\tjklклљм5\tmnoнњоп6\tpqrsрстќ7\ttuvуфхц8\twxyzчџш9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcабвг2\tdefдѓеж3\tghiзѕиј4\tjklклљм5\tmnoнњоп6\tpqrsрстќ7\ttuvуфхц8\twxyzчџш9"
 
 msgid "Button$ABC/abc"
 msgstr "АБВ/абв"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c8d081181..ab3fabd25 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003, 2005
@@ -11,7 +11,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-11 10:51+0100\n"
 "PO-Revision-Date: 2015-02-10 19:43+0100\n"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 219bbb6d8..ba20fc6ee 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 931fd6d79..becb8cb20 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,17 +1,18 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
 # Marek Nazarko <mnazarko@gmail.com>, 2013
+# Tomasz Maciej Nowak <tmn505@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2008-03-09 12:59+0100\n"
-"Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
+"PO-Revision-Date: 2015-02-12 00:59+0100\n"
+"Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Niepoprawny kana� ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM aktywowany!"
 
 msgid "Channel not available!"
 msgstr "Kana� nie jest dost�pny!"
@@ -82,13 +83,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Rozpoczynam skanowanie EPG"
@@ -578,10 +579,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Ustawienia kana�u nie s� unikalne!"
@@ -744,74 +745,74 @@ msgid "CAM not responding!"
 msgstr "CAM nie reaguje!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Edytuj �cie�k�"
 
 msgid "Folder"
-msgstr ""
+msgstr "Katalog"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Ten katalog jest w u�yciu - zmiany nie s� mo�liwe!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Przenie�� ca�y katalog zawiraj�cy %d nagra�?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "B��d podczas przenoszenia katalogu!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Edytuj nagranie"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "To nagranie jest w u�yciu - zmiany nie s� mo�liwe!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Anuluj przycinanie"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Zatrzymaj przycinanie"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Anuluj przenoszenie"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Zatrzymaj przenoszenie"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Anuluj kopiowanie"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Zatrzymaj kopiowanie"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Wytnij"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Usu� zaznaczone"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Nagranie znikn�o!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Edytowana wersja ju� istnieje - nadpisa�?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "B��d podczas zakolejkowania nagrania do przycinania!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Zmieni� nazw� nagrania na nazw� katalogu?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Usun�� zaznaczenia z edycji dla tego nagrania?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "B��d podczas usuwania zaznacze� edycji!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "B��d podczas zmiany priorytetu/czasu �ycia!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "B��d podczas zmiany katalogu/nazwy!"
 
 msgid "Recording info"
 msgstr "Informacje o nagraniu"
@@ -883,7 +884,7 @@ msgid "Setup.OSD$Anti-alias"
 msgstr "Wyg�adzanie"
 
 msgid "Setup.OSD$Default font"
-msgstr "Standardowa  czcionka"
+msgstr "Standardowa czcionka"
 
 msgid "Setup.OSD$Small font"
 msgstr "Ma�a czcionka"
@@ -1081,31 +1082,31 @@ msgid "Setup.LNB$own"
 msgstr "W�asny"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "U�ywaj obrotnicy"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Szeroko�� geograficzna stopnie"
 
 msgid "South"
-msgstr ""
+msgstr "Po�udnie"
 
 msgid "North"
-msgstr ""
+msgstr "P�noc"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "D�ugo�� geograficzna (stopnie)"
 
 msgid "West"
-msgstr ""
+msgstr "Zach�d"
 
 msgid "East"
-msgstr ""
+msgstr "Wsch�d"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Max. obr�t pozycjonera (stopnie)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Pr�dko�� pozycjonera (stopnie/s)"
 
 msgid "CAM reset"
 msgstr "CAM zresetowany"
@@ -1118,16 +1119,16 @@ msgstr "CAM gotowy"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktywuj�)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Anuluj aktywacj�"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Aktywuj"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1142,7 +1143,7 @@ msgid "Can't open CAM menu!"
 msgstr "Nie mo�na otworzy� menu CAM!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Nie mo�na aktywowa� CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM jest w u�yciu - naprawd� zresetowa�?"
@@ -1238,31 +1239,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Wstrzymaj odtwarzanie podczas ustawiania zaznaczania"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Wstrzymaj odtwarzanie przy przeskoku do zaznaczenia"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Przeskocz edytowan� cz��"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Wstrzymaj odtwarzanie przy ostatnim zaznaczeniu"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Pocz�tkowy czas trwania dla przeskoku adaptacyjnego (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Czas oczekiwania na wyzerowanie dla przeskoku adaptacyjnego (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Zmie� zachowanie dla przeskoku adaptacyjnego"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "U�yj klawiszy Poprzedni/Nast�pny dla przeskoku adaptacyjnego"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Pomi� dystans klawiszami Zielony/��ty (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Pomi� dystans klawiszami Zielony/��ty w powt�rce (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
@@ -1301,10 +1302,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Pocz�tkowa g�o�no��"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Przeskok g�o�no�ci"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Linearyzacja g�o�no�ci"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Zawijanie kana��w"
@@ -1440,7 +1441,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Monta� w trakcie  - Wy��czy� mimo to?"
+msgstr "Monta� w trakcie - Wy��czy� mimo to?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Trwa nagrywanie - wy��czy� mimo to?"
@@ -1457,7 +1458,7 @@ msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Wtyczka %s obudzi si� za %ld min, kontynuowa�?"
 
 msgid "Editing - restart anyway?"
-msgstr "Monta� w trakcie  - Zrestartowa� mimo to?"
+msgstr "Monta� w trakcie - Zrestartowa� mimo to?"
 
 msgid "Recording - restart anyway?"
 msgstr "Trwa nagrywanie - zrestartowa� mimo to?"
@@ -1492,7 +1493,7 @@ msgstr "ODTWARZA"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Obracam talerz do %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "Panel ST:TNG"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9390217f7..9a0f79241 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 # Cris Silva <hudokkow@gmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
@@ -1535,7 +1535,7 @@ msgid "Recording started"
 msgstr "Grava��o iniciada"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "O VDR vai desligar mais tarde  - pressione On/Off para for�ar"
+msgstr "O VDR vai desligar mais tarde - pressione On/Off para for�ar"
 
 msgid "Press any key to cancel shutdown"
 msgstr "Pressione qualquer tecla para cancelar o encerramento"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 1d1460c5c..c88dd0a83 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -1,15 +1,15 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004-2006, 2008, 2010-2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2015-02-09 00:23+0100\n"
+"PO-Revision-Date: 2015-02-11 22:26+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
 "Language: ro\n"
@@ -1232,7 +1232,7 @@ msgid "Setup.Replay$Show remaining time"
 msgstr "Arată timpul rămas"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr "Durata afișării indicatorului de progres (s) "
+msgstr "Durata afișării indicatorului de progres (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pauză la punerea marcajului de editare"
@@ -1256,13 +1256,13 @@ msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Strategie alternativă pentru săritul adaptiv al marcajelor"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Folosește tastele Anterior/Următor pentru săritul adaptiv"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Durata sărită cu tastele Verde/Galben (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Durata sărită cu tastele Verde/Galben la repetiție (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 9ac95d3ff..3e5057d7f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004, 2005
 # Oleg Roitburd <oroitburd@gmail.com>, 2005-2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
@@ -1433,7 +1433,7 @@ msgid "Index file regeneration complete"
 msgstr "����������� ���������� ����� ��������"
 
 msgid "Index file regeneration failed!"
-msgstr "������ ����������� ���������� ����� "
+msgstr "������ ����������� ���������� �����"
 
 msgid "Can't shutdown - option '-s' not given!"
 msgstr "���������� ���������� - �� ����� �������� '-s'!"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 01e83ad2a..cfc9bdee9 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,26 +1,27 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Milan Hrala <hrala.milan@gmail.com>, 2011, 2013
+# Milan Hrala <hrala.milan@gmail.com>, 2011, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2013-03-04 21:24+0100\n"
+"PO-Revision-Date: 2015-02-17 18:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Neplatn� kan�l ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM Aktivovan�!"
 
 msgid "Channel not available!"
 msgstr "Kan�l nie je dostupn�!"
@@ -47,16 +48,16 @@ msgid "System"
 msgstr "syst�m"
 
 msgid "Srate"
-msgstr "Srate"
+msgstr "Symbolov� r�chlos�"
 
 msgid "Inversion"
-msgstr "Inversion"
+msgstr "Inverzia"
 
 msgid "CoderateH"
-msgstr "CoderateH"
+msgstr "Konvolu�n�K�d-vysok� prijorita"
 
 msgid "CoderateL"
-msgstr "CoderateL"
+msgstr "Konvolu�n�K�d-n�zka prijorita"
 
 msgid "Modulation"
 msgstr "Modul�cia"
@@ -65,10 +66,10 @@ msgid "Bandwidth"
 msgstr "��rka p�sma"
 
 msgid "Transmission"
-msgstr "Prenos"
+msgstr "Vysielac� m�d"
 
 msgid "Guard"
-msgstr "Ochrana"
+msgstr "Ochrann� interval"
 
 msgid "Hierarchy"
 msgstr "Hierarchia"
@@ -80,13 +81,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilot"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "Sp���a sa sn�manie EPG"
@@ -344,7 +345,7 @@ msgid "LanguageCode$eng"
 msgstr "slk"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "F�za 1: Detekcia typu dia�kov�ho ovl�dania"
+msgstr "Krok 1: Detekcia typu dia�kov�ho ovl�dania"
 
 msgid "Press any key on the RC unit"
 msgstr "Stla�te �ubovoln� tla�idlo ovl�dania"
@@ -356,23 +357,23 @@ msgid "Do not press any key..."
 msgstr "Nestl��ajte �iadne kl�vesy..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "F�za 2: Ur�enie funkcie tla�idiel"
+msgstr "Krok 2: Ur�enie funkcie tla�idiel"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Stla�te tla�idlo pre funkciu  '%s'"
+msgstr "Stla�te tla�idlo pre funkciu '%s'"
 
 msgid "Press 'Up' to confirm"
 msgstr "Pre potvrdenie stla�te tla�idlo 'Hore'"
 
 msgid "Press 'Down' to continue"
-msgstr "Pokra�ujete stla�en�m tla�idla 'Dole' "
+msgstr "Pokra�ujete stla�en�m tla�idla 'Dole'"
 
 msgid "(press 'Up' to go back)"
 msgstr "(Vr�tite sa stla�en�m tla�idla 'hore')"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(Definovanie tla�idiel ukon��te stla�en�m tla�idla 'dole')"
+msgstr "(Stla�en�m tla�idla 'dole' ukon��te definovanie tla�idiel)"
 
 msgid "(press 'Menu' to skip this key)"
 msgstr "(stla�en�m 'Menu' presko��te defin�ciu tla�idla)"
@@ -381,7 +382,7 @@ msgid "Learning Remote Control Keys"
 msgstr "Programovanie dia�kov�ho ovl�dania"
 
 msgid "Phase 3: Saving key codes"
-msgstr "F�za 3: Ulo�enie k�du tla�idiel"
+msgstr "Krok 3: Ulo�enie k�du tla�idiel"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
 msgstr "Nastavenie stla�en�m tla�idla 'hore' ulo��te, 'Dole' zru��te"
@@ -543,31 +544,31 @@ msgid "Frequency"
 msgstr "Frekvencia"
 
 msgid "Vpid"
-msgstr "Vpid"
+msgstr "Video pid"
 
 msgid "Ppid"
-msgstr "Ppid"
+msgstr "PCR pid"
 
 msgid "Apid1"
-msgstr "Apid1"
+msgstr "Audio pid1"
 
 msgid "Apid2"
-msgstr "Apid2"
+msgstr "Audio pid2"
 
 msgid "Dpid1"
-msgstr "Dpid1"
+msgstr "Dolby pid1"
 
 msgid "Dpid2"
-msgstr "Dpid2"
+msgstr "Dolby pid2"
 
 msgid "Spid1"
-msgstr "Spid1"
+msgstr "Spid1 (titulky)"
 
 msgid "Spid2"
-msgstr "Spid2"
+msgstr "Spid2 (titulky)"
 
 msgid "Tpid"
-msgstr "Tpid"
+msgstr "Teletext pid"
 
 msgid "CA"
 msgstr "CA"
@@ -576,13 +577,13 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Network id"
 
 msgid "Tid"
-msgstr ""
+msgstr "Transponder id"
 
 msgid "Channel settings are not unique!"
-msgstr "Nastavenia kan�lu nie s� v�nimo�n�!"
+msgstr "Parametre kan�lu s� duplicitn�!"
 
 msgid "Channels"
 msgstr "Kan�ly"
@@ -600,7 +601,7 @@ msgid "Button$Mark"
 msgstr "Ozna�i�"
 
 msgid "Channel is being used by a timer!"
-msgstr "Pl�n nahr�vania pr�ve pou��va kan�l!"
+msgstr "U� je napl�novan� nahr�vanie pre tento kan�l!"
 
 msgid "Delete channel?"
 msgstr "Odstr�ni� kan�l?"
@@ -742,74 +743,74 @@ msgid "CAM not responding!"
 msgstr "CAM neodpoved�!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Upravi� umiestnenie"
 
 msgid "Folder"
-msgstr ""
+msgstr "Prie�inok"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Tento prie�inok sa pr�ve pou��va - �iadne zmeny nie s� mo�n�!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Presun�� cel� prie�inok obsahuj�ci %d nahr�vky?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Chyba pri presune prie�inku!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Upravi� nahr�vku"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "T�to nahr�vka sa v s��asnej dobe pou��va - �iadne zmeny nie s� mo�n�!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Zru�i� strih"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Zastavi� strih"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Zru�i� presun"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Zastavi� presun"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Zru�i� kop�rovanie"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Zastavi� kop�rovanie"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Vystrihn��"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Vymaza� zna�ky"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Z�znam sa stratil!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Upraven� verzia u� existuje - prep�sa�?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Chyba v porad� pri zostrihu nahr�vky!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Premenova� meno prie�inku nahr�vky?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Odstr�ni� strihov� zna�ky tejto nahr�vky?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Chyba pri mazan� zna�iek!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Chyba pri zmene priority/�ivotnos�i!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Chyba pri zmene prie�inka/n�zvu!"
 
 msgid "Recording info"
 msgstr "Podrobnosti nahr�vky"
@@ -887,7 +888,7 @@ msgid "Setup.OSD$Small font"
 msgstr "Mal� p�smo"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Fixn� p�smo"
+msgstr "P�smo s kon�tantnou ��rkou"
 
 msgid "Setup.OSD$Default font size (%)"
 msgstr "Ve�kos� predvolen�ho p�sma (%)"
@@ -896,7 +897,7 @@ msgid "Setup.OSD$Small font size (%)"
 msgstr "Ve�kos� mal�ho p�sma (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Ve�kos� fixn�ho p�sma (%)"
+msgstr "Ve�kos� p�sma kon�tantnej ��rky (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Poz�cia inform�ci� o kan�le"
@@ -1079,31 +1080,31 @@ msgid "Setup.LNB$own"
 msgstr "vlastn�"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Pou�i� polohovanie paraboly"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Zemepisn� ��rka (stup�ov)"
 
 msgid "South"
-msgstr ""
+msgstr "Ju�ne"
 
 msgid "North"
-msgstr ""
+msgstr "Severne"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Zemepisn� d�ka (stup�ov)"
 
 msgid "West"
-msgstr ""
+msgstr "Z�padne"
 
 msgid "East"
-msgstr ""
+msgstr "V�chodne"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Max. rozsah polohovania (stup�ov)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "R�chlos� polohovania (stup�ov/s)"
 
 msgid "CAM reset"
 msgstr "Resetnutie CAMu"
@@ -1116,16 +1117,16 @@ msgstr "CAM pripraven
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktivovan�)"
 
 msgid "CAM"
 msgstr "CAM (modul podmienen�ho pr�stupu)"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Zru�i� aktiv�ciu"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Aktivova�"
 
 msgid "Button$Menu"
 msgstr "Menu"
@@ -1140,7 +1141,7 @@ msgid "Can't open CAM menu!"
 msgstr "Menu CAM nie je dostupn�"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "CAM nie je mo�n� aktivova�!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM sa pou��va - naozaj re�tartova�?"
@@ -1236,31 +1237,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Pozastavi� prehr�vanie pri stanoven� zna�ky"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pozastavi� prehr�vanie pri skoku na zna�ku"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Presko�i� upraven� �asti"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Pozastavi� prehr�vanie na poslednej zna�ke"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Po�iato�n� doba pre adapt�vny skok (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Obnovi� �asov� limit pre adapt�vne preskakovanie (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Alternat�vne spr�vanie pre adapt�vne preskakovanie"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Pou�i� tla�idl� Predo�l�/Nasleduj�ci pre adapt�vne preskakovanie"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Presko�i� �sek so zelen�m/�lt�m tla�idlom (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Opakovan� presko�enie �seku so Zelen�m/�lt�m tla�idlom (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ident. ��slo obnovenia prehr�vania"
@@ -1284,7 +1285,7 @@ msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
 msgstr "Limit pri ��selnej vo�be kan�la (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr "Zdr�anie opakovan�ho stla�enia  tla�idla (ms)"
+msgstr "Zdr�anie opakovan�ho stla�enia tla�idla (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
 msgstr "Peri�da opakovania stla�en�ho tla�idla (ms)"
@@ -1299,10 +1300,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Hlasitos� po spusten�"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Krok zmeny hlasitosti"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Zarovna� zmenu hlasitosti"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Kan�ly cyklova� pri prepnut�"
@@ -1330,7 +1331,7 @@ msgstr "Naozaj re
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " Zastavi� nahr�vanie"
+msgstr " Zastavi� nahr�vanie "
 
 msgid "Schedule"
 msgstr "TV program"
@@ -1465,7 +1466,7 @@ msgstr "Ur
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "Hlasitos�"
+msgstr "Hlasitos� "
 
 msgid "Classic VDR"
 msgstr "Klasick� VDR"
@@ -1490,7 +1491,7 @@ msgstr "PREHR
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Pohyb paraboly na %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG panely"
@@ -1549,7 +1550,7 @@ msgid "Editing process finished"
 msgstr "Proces zostrih�vania dokon�en�"
 
 msgid "Press any key to cancel restart"
-msgstr "ktor�ko�vek  kl�vesa zru�� re�tart"
+msgstr "ktor�ko�vek kl�vesa zru�� re�tart"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 33c3c4656..d12ccb212 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
diff --git a/po/sr_RS.po b/po/sr_RS.po
index fb834f126..646607f71 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Milan Cvijanovi� <elcom_cvijo@hotmail.com>, 2010
 # Zoran Turalija <zoran.turalija@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
@@ -1351,7 +1351,7 @@ msgstr "Nastavi"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr "Odustani od izmena"
+msgstr " Odustani od izmena"
 
 msgid "Stop recording?"
 msgstr "Zaustavi snimanje?"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e2efbe0f7..c164fa1df 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,19 +1,20 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 # Tomas Berglund <tomber@telia.com>, 2008
 # Magnus Andersson <svankan@bahnhof.se>, 2008
 # Richard Lithvall <r-vdr@boomer.se>, 2013
+# Magnus Sirvi� <sirwio@hotmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2013-02-18 17:04+0100\n"
-"Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
+"PO-Revision-Date: 2015-02-12 21:58+0100\n"
+"Last-Translator: Magnus Sirvi� <sirwio@hotmail.com>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +25,7 @@ msgid "*** Invalid Channel ***"
 msgstr "*** Felaktig kanal ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "CAM aktiverad!"
 
 msgid "Channel not available!"
 msgstr "Kanalen �r inte tillg�nglig!"
@@ -75,7 +76,7 @@ msgid "Guard"
 msgstr "Guard"
 
 msgid "Hierarchy"
-msgstr "Hierarchy"
+msgstr "Hierarki"
 
 msgid "Rolloff"
 msgstr "Rolloff"
@@ -84,13 +85,13 @@ msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Pilotavsnitt"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
 msgstr "P�b�rjar EPG-avs�kning"
@@ -120,7 +121,7 @@ msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
 msgstr "Seri�s/Klassisk/Relig�s/Historisk/Drama"
 
 msgid "Content$Adult Movie/Drama"
-msgstr "Vuxen/Drama"
+msgstr "Vuxenfilm/Drama"
 
 msgid "Content$News/Current Affairs"
 msgstr "Nyheter/Journalistik"
@@ -580,10 +581,10 @@ msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
 msgstr "Kanalinst�llningarna �r ej unika!"
@@ -746,74 +747,74 @@ msgid "CAM not responding!"
 msgstr "CAM svarar inte!"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Redigera s�kv�g"
 
 msgid "Folder"
-msgstr ""
+msgstr "Mapp"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Den h�r mappen anv�nds just nu - inga f�r�ndringar �r m�jliga!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Flytta hela mappen inneh�llandes %d inspelningar?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Ett fel upstod n�r mappen skulle flyttas!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Redigera inspelning"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Den h�r inspelningen anv�nds just nu - inga f�r�ndringar �r m�jliga!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Avbryta klippning"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Avsluta klippning"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Avbryta flytt"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Avsluta flytt"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Avbryta kopiering"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Avsluta kopiering"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Redigera"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Ta bort redigeringsm�rke"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Inspelningen f�rsvann!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "En redigerad version finns redan - skall den ers�ttas?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Ett fel upstod n�r inspelningen k�ades f�r klippning!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Byta namn p� inspelning till mappnamnet?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Ta bort redigeringsm�rken f�r den h�r inspelningen?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Ett fel uppstod n�r redigeringsm�rken skulle tas bort!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Ett fel upstod n�r prioritet/livstid skulle �ndras!"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Ett fel uppstod n�r mapp/namn skulle �ndras!"
 
 msgid "Recording info"
 msgstr "Inspelningsinformation"
@@ -1080,34 +1081,34 @@ msgid "Setup.LNB$Device %d connected to sat cable"
 msgstr "Enhet %d ansluten till satellitkabel"
 
 msgid "Setup.LNB$own"
-msgstr "�gare"
+msgstr "egen"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Anv�nda parabolstyrning"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Latitude (grader)"
 
 msgid "South"
-msgstr ""
+msgstr "S�der"
 
 msgid "North"
-msgstr ""
+msgstr "Norr"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Longitud (grader)"
 
 msgid "West"
-msgstr ""
+msgstr "V�ster"
 
 msgid "East"
-msgstr ""
+msgstr "�ster"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Maximal positonerings sv�ngning (grader)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Positoneringshastighet (grader/s)"
 
 msgid "CAM reset"
 msgstr "CAM omstart"
@@ -1120,16 +1121,16 @@ msgstr "CAM klar"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (aktiverar)"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Avbryta aktivering"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Aktivera"
 
 msgid "Button$Menu"
 msgstr "Meny"
@@ -1144,7 +1145,7 @@ msgid "Can't open CAM menu!"
 msgstr "Det g�r inte att �ppna CAM menyn!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "Kan inte aktivera CAM!"
 
 msgid "CAM is in use - really reset?"
 msgstr "CAM upptagen, vill du verkligen �terst�lla?"
@@ -1237,34 +1238,34 @@ msgid "Setup.Replay$Progress display time (s)"
 msgstr "Tid f�r visning av f�rloppsindikatorn (sek)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "Pausa uppspelningen vid s�ttande av redigeringsm�rke"
+msgstr "Pausa uppspelning vid s�ttande av redigeringsm�rke"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Pausa uppspelning vid hopp till redigeringsm�rke"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Hoppa �ver redigerade delar"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Pausa uppspelning p� sista redigeringsm�rket"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Initialt v�rde p� intelligent hopp i inspelning (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Tidsgr�ns vid intelligenta hopp i inspellning (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Alternativt beteende p� intelligenta hopp i inspelning"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Anv�nda F�reg�ende/N�sta knappar f�r intelligenta hopp i inspelning"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Tid f�r hopp med Gr�n/Gul knapp (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Tid f�r hopp med Gr�n/Gul knapp vid �teruppspelning (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "�terupptagnings-ID"
@@ -1303,10 +1304,10 @@ msgid "Setup.Miscellaneous$Initial volume"
 msgstr "Ljudstyrka vid uppstart"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Volymsteg"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Volymlinj�risering"
 
 msgid "Setup.Miscellaneous$Channels wrap"
 msgstr "Cirkul�r kanallista"
@@ -1406,7 +1407,7 @@ msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%
 msgstr " abcdefghijklmnopqrstuvwxyz���0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc��2\tdef3\tghi4\tjkl5\tmno�6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -1494,7 +1495,7 @@ msgstr "SPELA"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Flyttar parabol till %.1f..."
 
 msgid "ST:TNG Panels"
 msgstr "ST:TNG"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index f832ec80c..46a6a088b 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
@@ -1275,7 +1275,7 @@ msgid "Setup.Miscellaneous$Min. user inactivity (min)"
 msgstr "Minimum kullan�c� hareketsizli�i (dak)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "SVDRP zaman a��m� (sn) "
+msgstr "SVDRP zaman a��m� (sn)"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zaping zaman a��m� (sn)"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 7875fac15..9d7328bcd 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,21 +1,21 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
-"PO-Revision-Date: 2015-02-08 16:03+0100\n"
+"PO-Revision-Date: 2015-02-13 18:14+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.7.4\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
@@ -1255,13 +1255,13 @@ msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Альтернативна поведінка для адаптивного пропуску (ів)"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Викор кнопки Попер./Наст. для адаптивного пропуску"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Інтервал пропуску з Зеленою/Жовтою кнопкою (ми)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Інтервал пропуску з Зеленою/Жовтою кнопкою в повторенні (ях)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 77c15ee64..0dfbd6c23 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Nan Feng <nfvdr@live.com>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.0.0\n"
+"Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-02-10 13:40+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
@@ -355,7 +355,7 @@ msgid "RC code detected!"
 msgstr "发现RC代码!"
 
 msgid "Do not press any key..."
-msgstr "不要按下任何键... "
+msgstr "不要按下任何键..."
 
 msgid "Phase 2: Learning specific key codes"
 msgstr "阶段 2: 学习特殊的按键代码"
@@ -690,7 +690,7 @@ msgid "Delete timer?"
 msgstr "是否删除时间？"
 
 msgid "Timer still recording - really delete?"
-msgstr "录像中-是否的删除？ "
+msgstr "录像中-是否的删除？"
 
 msgid "Event"
 msgstr "事件"
@@ -974,7 +974,7 @@ msgstr "转发器使用时间"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "首选语种 "
+msgstr "首选语种"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
@@ -1325,21 +1325,21 @@ msgid "Setup"
 msgstr "VDR系统设置"
 
 msgid "Restart"
-msgstr " 重启VDR系统"
+msgstr "重启VDR系统"
 
 msgid "Really restart?"
 msgstr "是否重启？"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr "是否停止录像?"
+msgstr " 是否停止录像? "
 
 msgid "Schedule"
 msgstr "任务列表"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr "停止回放"
+msgstr " 停止回放"
 
 msgid "Button$Pause"
 msgstr "暂停"
@@ -1352,7 +1352,7 @@ msgstr "重置"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr "取消编辑"
+msgstr " 取消编辑"
 
 msgid "Stop recording?"
 msgstr "停止录像"
@@ -1401,10 +1401,10 @@ msgid "Editing process already active!"
 msgstr "编辑处理已经激活"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr "abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr "0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -1467,7 +1467,7 @@ msgstr "现在重启?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "音量调整"
+msgstr "音量调整 "
 
 msgid "Classic VDR"
 msgstr "经典VDR面板"
diff --git a/positioner.c b/positioner.c
index c6e0c736c..22bad1b8f 100644
--- a/positioner.c
+++ b/positioner.c
@@ -6,8 +6,9 @@
  *
  * For an explanation (in German) of the theory behind the calculations see
  * http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1154305-grundlagen-und-winkelberechnungen-f%C3%BCr-h-h-diseqc-motor-antennenanlagen
+ * by Albert Danis.
  *
- * $Id: positioner.c 3.4 2013/10/30 09:56:34 kls Exp $
+ * $Id: positioner.c 3.5 2015/02/14 11:54:31 kls Exp $
  */
 
 #include "positioner.h"
diff --git a/recording.c b/recording.c
index 24e979315..0a0841405 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.27 2015/02/07 15:28:02 kls Exp $
+ * $Id: recording.c 3.28 2015/02/16 07:49:14 kls Exp $
  */
 
 #include "recording.h"
@@ -3027,6 +3027,7 @@ bool HasRecordingsSortMode(const char *Directory)
 
 void GetRecordingsSortMode(const char *Directory)
 {
+  RecordingsSortMode = rsmName;
   if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) {
      char buf[8];
      if (fgets(buf, sizeof(buf), f))
diff --git a/sources.conf b/sources.conf
index 795ce7622..ad4131c0a 100644
--- a/sources.conf
+++ b/sources.conf
@@ -111,7 +111,8 @@ S177W   NSS 9
 
 # Atlantic
 
-S1W     Thor 5/6 & Intelsat 10-02
+S0.8W   Intelsat 10-02
+S1W     Thor 5/6
 S4W     Amos 2/3
 S5W     Eutelsat 5 West A
 S7W     Nilesat 101/201 & Eutelsat 7 West A
diff --git a/svdrpsend.1 b/svdrpsend.1
index a0b3fd9f9..74d535be4 100644
--- a/svdrpsend.1
+++ b/svdrpsend.1
@@ -1,4 +1,4 @@
-.TH "svdrpsend" "1" "31 Mar 2013" "2.0" "Video Disk Recorder"
+.TH "svdrpsend" "1" "19 Feb 2015" "2.2" "Video Disk Recorder"
 .SH NAME
 .LP
 svdrpsend \- sends commands to VDR
diff --git a/vdr.1 b/vdr.1
index 84f28b16a..845cfa335 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 3.5 2015/02/10 13:59:11 kls Exp $
+.\" $Id: vdr.1 3.6 2015/02/17 13:43:24 kls Exp $
 .\"
-.TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
+.TH vdr 1 "19 Feb 2015" "2.2" "Video Disk Recorder"
 .SH NAME
 vdr \- the Video Disk Recorder
 .SH SYNOPSIS
diff --git a/vdr.5 b/vdr.5
index 44e56c493..fa233d726 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 3.3 2014/04/14 13:11:49 kls Exp $
+.\" $Id: vdr.5 3.4 2015/02/17 13:43:53 kls Exp $
 .\"
-.TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files"
+.TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
 .SH NAME
 vdr_files \- the Video Disk Recorder Files
 .SH DESCRIPTION

From a26aae3ce8d58e1c9b451d87ce4d1e8a7bca4690 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 14 Sep 2015 16:24:00 +0200
Subject: [PATCH 243/307] Version 2.3.1 VDR developer version 2.3.1 is now
 available at
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.1.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.2.0-2.3.1.diff

MD5 checksums:

391c2ed60e2f7d24563fe3ed5854bc4f  vdr-2.3.1.tar.bz2
983fd4bad7d19cd98301d54173107129  vdr-2.2.0-2.3.1.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

*** PLEASE BE VERY CAREFUL WHEN USING THIS DEVELOPER VERSION, ESPECIALLY
*** IF YOU ENABLE THE NEW SVDRP PEERING! KEEP BACKUPS OF ALL YOUR TIMERS
*** AND OBSERVE VERY CLOSELY WHETHER EVERYTHING WORKS AS EXPECTED. THIS
*** VERSION INTRODUCES SOME MAJOR CHANGES IN HANDLING GLOBAL LISTS AND
*** LOCKING, SO ANYTHING CAN HAPPEN! YOU HAVE BEEN WARNED!

The main focus of this developer version is on the new locking mechanism
for global lists, and the ability to handle remote timers.
Any plugins that access the global lists of timers, channels, schedules
or recordings, will need to be adjusted (see below for details). Please
do initial tests with plain vanilla VDR and just the output plugin you
need.

Known bugs/problems:

- After deleting the last recording in a sub folder, the cursor may not
   be positioned correctly.
- Instant recordings and pausing live video don't (yet) use the default
   SVDRP host for recording.

From the HISTORY file:
 - The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
  a cPixmap may have on the current OSD. The 'osddemo' example has been modified
  accordingly. Plugin authors may want to use this function in case they use pixmaps
  that are larger than the full OSD size. The default implementation sets this limit
  to 2048x2048 pixel.
- The Setup/CAM menu now displays which device an individual CAM is currently
  assigned to (suggested by Frank Neumann).
- Added detection of 24fps (thanks to Thomas Reufer).
- Added a note about the VDR User Counter and VDR's facebook page to the README file.
- The dvbhddevice plugin is no longer part of the VDR source archive.
  You can get the latest version of this plugin from the author's repository at
  https://bitbucket.org/powARman/dvbhddevice.
- The dvbsddevice and rcu plugins are no longer part of the VDR source archive.
  You can get the latest versions of these plugins from ftp://ftp.tvdr.de/vdr/Plugins.
- Added a section about Output Devices to the INSTALL file.
- Fixed setting the source value of newly created channels, in case the NIT is
  received from a different, but very close satellite position (reported by Daniel
  Ribeiro). The code for handling different NITs has been removed from nit.c, because
  according to the DVB standard table id 0x40 carries only the NIT of the actual
  network.
- Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort
  (suggested by Thomas Reufer).
- Improved syncing on sections when parsing the NIT and SDT.
- Fixed scaling subtitles (their areas could sometimes extend outside the actual OSD).
- Reduced the priority of the "video directory scanner" thread (suggested by Thomas
  Reufer) and checking cIoThrottle::Engaged() when it is running.
- The script that gets called for recordings is now also called right before a
  recording is edited, with the first parameter being "editing" (suggested by
  Dieter Ferdinand).
- The new setup option "OSD/Default sort mode for recordings" can be used to define
  how recordings shall be sorted by default (either by time or by name, with "by time"
  being the default). If a particular sort mode has been selected for a folder by
  pressing '0', the default no longer applies to that folder. Repeating timers no
  longer write a ".sort" file into a recordings folder to have the recordings sorted
  by time.
- The command line option -D now accepts the value '-' (as in -D-), which prevents
  VDR from using any DVB devices (suggested by Dietmar Spingler).
- The -V and -h options now list the plugins in alphabetical order (suggested by
  Dietmar Spingler).
- Fixed a compiler warning in font.c.
- Commented out the line
  #define DEPRECATED_VIDEOSYSTEM
  in device.h. If a plugin doesn't compile with this version of VDR, you can uncomment
  this line as a quick workaround. In the long run the plugin will need to be adapted.
- The function cOsd::GetBitmap() is now 'protected'. If a plugin doesn't compile with
  this version of VDR, you can uncomment the line
  //#define DEPRECATED_GETBITMAP
  in osd.h as a quick workaround. In the long run the plugin will need to be adapted.
- The -u option now also accepts a numerical user id (suggested by Derek Kelly).
- The SVDRP port now accepts multiple concurrent connections. You can now keep an
  SVDRP connection open as long as you wish, without preventing others from
  connecting. Note, though, that SVDRP connections still get closed automatically
  if there has been no activity for 300 seconds (configurable via
  "Setup/Miscellaneous/SVDRP timeout (s)").
- The SVDRP log messages have been unified and now always contain the IP and port
  number of the remote host.
- SVDRP connections are now handled in a separate "SVDRP server handler" thread,
  which makes them more responsive. Note that there is only one thread that handles
  all concurrent SVDRP connections. That way each SVDRP command is guaranteed to be
  processed separately, without interfering with any other SVDRP commands that might
  be issued at the same time. Plugins that implement SVDRP commands may need to take
  care of proper locking if the commands access global data.
- VDR now sends out a broadcast to port 6419/udp, which was assigned to 'svdrp-disc'
  by the IANA. VDRs listening on that port will automatically initiate an SVDRP
  connection to the broadcasting VDR, and in turn send out a broadcast to make
  other VDRs connect to them. That way all VDRs within the local network will
  have permanent "peer-to-peer" SVDRP connections between each other. The
  configuration in the svdrphosts.conf file is taken into account when considering
  whether or not to respond to an SVDRP discover broadcast.
- The new SVDRP command PING is used by automatically established peer-to-peer
  connections to keep them alive.
- The new function GetSVDRPServerNames() can be used to get a list of all VDRs
  this VDR is connected to via SVDRP.
- The new function ExecSVDRPCommand() can be used to execute an SVDRP command on
  one of the servers this VDR is connected to, and retrieve the result.
  The helper functions SVDRPCode() and SVDRPValue() can be used to easily access
  the codes and values returned by ExecSVDRPCommand().
- The cTimer class now has a new member named 'remote', which holds the name of the
  remote server this timer will record on. If this is NULL, it is a local timer.
- Timers from other VDRs that are connected to this VDR via SVDRP are now
  automatically fetched and stored in the global Timers list. In order for this
  to work, all of the channels used by timers on the remote VDR must also be
  defined on the local VDR (however, not necessarily in the same sequence).
  Automatic channel syncing will be implemented later.
- The main menu of the LCARS skin now displays a small rectangle on the left side
  of a timer if this is a remote timer. The color of that rectangle changes if
  the timer is currently recording on the remote VDR.
- Accessing the global Timers list now has to be protected by proper locking,
  because SVDRP commands are now executed in a separate thread.
  The introduction of this locking mechanism required the following changes:
  + The new classes cStateLock and cStateKey are used to implement locking
    with quick detection of state changes.
  + cConfig::cConfig() now has a parameter that indicates whether this list
    requires locking.
  + The global lists of Timers, Channels, Schedules and Recordings are no longer
    static variables. They are now pointers that need to be retrieved through
    a call to cTimers::GetTimersRead/Write(), cChannels::GetChannelsRead/Write(),
    cSchedules::GetSchedulesRead/Write() and cRecordings::GetRecordingsRead/Write(),
    respectively.
  + References from/to link channels are now removed in cChannels::Del() rather
    than cChannel::~cChannel(), to make sure the caller holds a proper lock.
  + cChannel::HasTimer() has been removed. This information is now retrieved
    via cSchedule::HasTimer().
  + Several member functions of cChannel, cTimer, cMarks and cRecording have
    been made 'const', and some of them are now available as both 'const' and
    'non-const' versions.
  + The cChannel::Set...() functions are now 'bool' and return true if they have
    actually changed any of the channels's members.
  + cChannels::SetModified() has been renamed to cChannels::SetModifiedByUser().
  + cChannels::Modified() has been renamed to cChannels::ModifiedByUser(), and
    now has a 'State' parameter that allows the caller to see whether a channel
    has been modified since the last call to this function with the same State
    variable.
  + The macros CHANNELSMOD_NONE/_AUTO/_USER have been removed.
  + cMarks now requires locking via cStateKey.
  + cSortedTimers now requires a pointer to the list of timers.
  + cEvent::HasTimer() no longer scans the list of timers to check whether an event
    is referenced by a timer, but rather keeps score of how many timers reference
    it. This was necessary in order to avoid having to lock the list of timers from
    within a cEvent.
  + The new class cListGarbageCollector is used to temporary store any objects deleted
    from cLists that require locking. This allows pointers to such objects to be
    dereferenced even if the objects are no longer part of the list.
  + cListBase::Contains() can be used to check whether a particular object is still
    contained in that list.
  + Outdated events are no longer "phased out", but rather deleted right away and thus
    taken care of by the new "garbage collector" of the list.
  + Deleted cRecording objects are no longer kept in a list of "vanished" recordings,
    but are rather taken care of by the new "garbage collector" of the list.
  + cSchedules::ClearAll() has been removed. The functionality is now implemented
    directly in cSVDRPServer::CmdCLRE().
  + tEventID has been changed to u_int16_t in order to make room for the new member
    numTimers in cEvent.
  + cSchedule now has a member Modified(), which can be used with a State variable
    to quickly determine whether this schedule has been modified since the last call
    to this function with the same State variable.
  + cSchedulesLock has been removed. Locking the list of schedules is now done via
    the cList's new locking mechanism.
  + The 'OnlyRunningStatus' parameters in cEpgHandler::BeginSegmentTransfer() and
    cEpgHandler::EndSegmentTransfer() are now obsolete. They are still present in
    the interface for backward compatibility, but may be removed in a future version.
    Their value is always 'false'.
  + The constant tcMod is no longer used in cStatus::TimerChange(). The definition is
    still there for backward compatibility.
  Plugins that access the global lists of Timers, Channels, Recordings or Schedules
  will need to be adapted as follows:
  + Instead of directly accessing the global variables Timers, Channels or Recordings,
    they need to set up a cStateKey variable and call the proper getter function,
    as in
      cStateKey StateKey;
      if (const cTimers *Timers = cTimers::GetTimersRead(StateKey)) {
         // access the timers
         StateKey.Remove();
         }
    and
      cStateKey StateKey;
      if (cTimers *Timers = cTimers::GetTimersWrite(StateKey)) {
         // access the timers
         StateKey.Remove();
         }
    See timers.h, thread.h and tools.h for details on this new locking mechanism.
  + There are convenience macros for easily accessing these lists without having
    to explicitly set up a cStateKey and calling its Remove() function. These macros
    have the form LOCK_*_READ/WRITE (with '*' being TIMERS, CHANNELS, SCHEDULES or
    RECORDINGS). Simply put such a macro before the point where you need to access
    the respective list, and there will be a pointer named Timers, Channels, Schedules
    or Recordings, respectively, which is valid until the end of the current block.
  + If a plugin needs to access several of the global lists in parallel, locking must
    always be done in the sequence Timers, Channels, Recordings, Schedules. This is
    necessary to make sure that different threads that need to lock several lists at
    the same time don't end up in a deadlock.
  + Some pointer variables may need to be made 'const'. The compiler will tell you
    about these.
- cSectionSyncer has been improved to better handle missed sections.
- Added a missing initialization of 'seen' in cChannel's copy constructor.
- Background modifications of channels, timers and events are now displayed immediately
  in the corresponding menus.
- cEIT now checks the version of the tables before doing any processing, which saves
  a lot of locking and processing.
- If a timer is newly created with the Red button in the Schedule menu, and the timer
  is presented to the user in the "Edit timer" menu because it will start immediately,
  it now *must* be confirmed with "Ok" to set the timer. Otherwise the timer will not
  be created.
- Recordings and deleted recordings are now scanned in a single thread.
- The new SVDRP command POLL is used by automatically established peer-to-peer
  connections to trigger fetching remote timers.
- You can now set DumpSVDRPDataTransfer in svdrp.c to true to have all SVDRP
  communication printed to the console for debugging.
- Added a missing 'const' to cReceiver::Receive(), to protect the given Data from
  being modified.
- The SVDRP commands that deal with timers (DELT, LSTT, MODT, NEWT, NEXT and UPDT)
  as well as any log messages that refer to timers, now use a unique id for each
  timer, which remains valid as long as this instance of VDR is running. This means
  that timers are no longer continuously numbered from 1 to N in LSTT. There may be
  gaps in the sequence, in case timers have been deleted.
- The Timers menu now displays the name of the remote VDR in front of the timer's
  file name, if this is a remote timer.
- The new options "Setup/Miscellaneous/SVDRP peering", ".../SVDRP host name" and
  ".../SVDRP default host" can be used to configure automatic peering between VDRs
  in the same network. Peering is disabled by default and can be enabled by setting
  "SVDRP peering" to "yes".
- The function cTimer::ToText() no longer returns a newline character at the end of
  the string. The newline is now added by the caller as necessary. This was changed
  because cTimer::ToText() is now also needed in a context where the terminating
  newline can't be used. Consequently, cChannel::ToText() and cMark::ToText() have
  been modified accordingly.
- All timer related response strings from SVDRP commands now use the channel ID
  instead of channel numbers.
- The "Edit timer" menu now has a new parameter "Record on", which can be used to
  select the VDR on which this timer shall record. Timers can be freely moved
  between connected VDRs by simply selecting the desired machine in this field.
- The SVDRP command DELT no longer checks whether the timer that shall be deleted
  is currently recording.
- The character 0x0D is now stripped from EPG texts (reported by Janne Pänkälä).
- The EPG scanner no longer moves the dish if there is a positioner.
- The 'newplugin' script now creates the 'po' subdirectory for translations (thanks
  to Thomas Reufer).
- Skins can now implement cSkinDisplayMenu::MenuOrientation() to display horizontal
  menus (thanks to Stefan Braun).
- Fixed a possible stack overflow in cListBase::Sort() (thanks to Oliver Endriss).
- Changed the description of the --chartab option in the INSTALL file to refer to
  "DVB SI table strings" instead of "EPG data".
- The width and height of the OSD are now limited to the actual maximum dimensions
  of the output device, taking into account the top and left offset.
- The new setup option "Recording/Record key handling" can be used to define
  what happens if the Record key on the remote control is pressed during
  live tv (suggested by Dietmar Spingler).
- Empty adaptation field TS packets are now skipped when recording (thanks to
  Christopher Reimer, based on the "AFFcleaner" by Stefan Pöschel).
---
 CONTRIBUTORS                                  |   28 +
 Doxyfile.filter                               |    2 +-
 HISTORY                                       |  232 +++
 INSTALL                                       |   37 +-
 MANUAL                                        |   29 +-
 Make.config.template                          |    2 +-
 Make.global                                   |    2 +-
 Makefile                                      |    2 +-
 PLUGINS.html                                  |   18 +-
 PLUGINS/src/dvbhddevice/COPYING               |  340 ----
 PLUGINS/src/dvbhddevice/HISTORY               |  108 --
 PLUGINS/src/dvbhddevice/Makefile              |  123 --
 PLUGINS/src/dvbhddevice/README                |   18 -
 PLUGINS/src/dvbhddevice/dvbhddevice.c         |   97 -
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c       | 1104 -----------
 PLUGINS/src/dvbhddevice/dvbhdffdevice.h       |  130 --
 PLUGINS/src/dvbhddevice/hdffcmd.c             |  401 ----
 PLUGINS/src/dvbhddevice/hdffcmd.h             |  100 -
 PLUGINS/src/dvbhddevice/hdffosd.c             |  836 --------
 PLUGINS/src/dvbhddevice/hdffosd.h             |   24 -
 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile   |   68 -
 .../src/dvbhddevice/libhdffcmd/bitbuffer.c    |   79 -
 .../src/dvbhddevice/libhdffcmd/bitbuffer.h    |   43 -
 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h  |   42 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.c   |  506 -----
 .../src/dvbhddevice/libhdffcmd/hdffcmd_av.h   |  159 --
 .../src/dvbhddevice/libhdffcmd/hdffcmd_base.c |   45 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_base.h |   55 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_defs.h |  125 --
 .../dvbhddevice/libhdffcmd/hdffcmd_generic.c  |  165 --
 .../dvbhddevice/libhdffcmd/hdffcmd_generic.h  |   36 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c |  120 --
 .../src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h |   72 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_mux.c  |   81 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_mux.h  |   56 -
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.c  |  720 -------
 .../src/dvbhddevice/libhdffcmd/hdffcmd_osd.h  |  170 --
 .../dvbhddevice/libhdffcmd/hdffcmd_remote.c   |   67 -
 .../dvbhddevice/libhdffcmd/hdffcmd_remote.h   |   39 -
 PLUGINS/src/dvbhddevice/menu.c                |   65 -
 PLUGINS/src/dvbhddevice/menu.h                |   29 -
 PLUGINS/src/dvbhddevice/po/de_DE.po           |  128 --
 PLUGINS/src/dvbhddevice/po/et_EE.po           |  128 --
 PLUGINS/src/dvbhddevice/po/fi_FI.po           |  128 --
 PLUGINS/src/dvbhddevice/po/it_IT.po           |  131 --
 PLUGINS/src/dvbhddevice/po/uk_UA.po           |  129 --
 PLUGINS/src/dvbhddevice/setup.c               |  476 -----
 PLUGINS/src/dvbhddevice/setup.h               |   66 -
 PLUGINS/src/dvbsddevice/COPYING               |  340 ----
 PLUGINS/src/dvbsddevice/HISTORY               |   65 -
 PLUGINS/src/dvbsddevice/Makefile              |   94 -
 PLUGINS/src/dvbsddevice/README                |   20 -
 PLUGINS/src/dvbsddevice/dvbsddevice.c         |   61 -
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c       |  784 --------
 PLUGINS/src/dvbsddevice/dvbsdffdevice.h       |  115 --
 PLUGINS/src/dvbsddevice/dvbsdffosd.c          |  211 ---
 PLUGINS/src/dvbsddevice/dvbsdffosd.h          |   22 -
 PLUGINS/src/epgtableid0/Makefile              |    2 +-
 PLUGINS/src/epgtableid0/epgtableid0.c         |    2 +-
 PLUGINS/src/hello/Makefile                    |    2 +-
 PLUGINS/src/hello/hello.c                     |    2 +-
 PLUGINS/src/osddemo/HISTORY                   |    7 +
 PLUGINS/src/osddemo/Makefile                  |    2 +-
 PLUGINS/src/osddemo/osddemo.c                 |   70 +-
 PLUGINS/src/pictures/HISTORY                  |    4 +
 PLUGINS/src/pictures/Makefile                 |    2 +-
 PLUGINS/src/pictures/entry.c                  |    2 +-
 PLUGINS/src/pictures/entry.h                  |    2 +-
 PLUGINS/src/pictures/menu.c                   |    4 +-
 PLUGINS/src/pictures/menu.h                   |    2 +-
 PLUGINS/src/pictures/pic2mpg                  |    2 +-
 PLUGINS/src/pictures/pictures.c               |    4 +-
 PLUGINS/src/pictures/player.c                 |    2 +-
 PLUGINS/src/pictures/player.h                 |    2 +-
 PLUGINS/src/rcu/COPYING                       |  340 ----
 PLUGINS/src/rcu/HISTORY                       |   30 -
 PLUGINS/src/rcu/Makefile                      |   94 -
 PLUGINS/src/rcu/README                        |   19 -
 PLUGINS/src/rcu/rcu.c                         |  420 ----
 PLUGINS/src/servicedemo/Makefile              |    2 +-
 PLUGINS/src/servicedemo/svccli.c              |    2 +-
 PLUGINS/src/servicedemo/svcsvr.c              |    2 +-
 PLUGINS/src/skincurses/Makefile               |    2 +-
 PLUGINS/src/skincurses/skincurses.c           |    2 +-
 PLUGINS/src/status/Makefile                   |    2 +-
 PLUGINS/src/status/status.c                   |    2 +-
 PLUGINS/src/svdrpdemo/Makefile                |    2 +-
 PLUGINS/src/svdrpdemo/svdrpdemo.c             |    2 +-
 README                                        |    4 +
 args.c                                        |    2 +-
 args.h                                        |    2 +-
 audio.c                                       |    2 +-
 audio.h                                       |    2 +-
 channels.c                                    |  351 ++--
 channels.h                                    |  114 +-
 ci.c                                          |   17 +-
 ci.h                                          |    2 +-
 config.c                                      |   17 +-
 config.h                                      |   21 +-
 cutter.c                                      |   10 +-
 cutter.h                                      |    2 +-
 device.c                                      |   28 +-
 device.h                                      |    4 +-
 diseqc.c                                      |    2 +-
 diseqc.h                                      |    2 +-
 dvbci.c                                       |    2 +-
 dvbci.h                                       |    2 +-
 dvbdevice.c                                   |    7 +-
 dvbdevice.h                                   |    3 +-
 dvbplayer.c                                   |   27 +-
 dvbplayer.h                                   |    4 +-
 dvbspu.c                                      |    2 +-
 dvbspu.h                                      |    2 +-
 dvbsubtitle.c                                 |    5 +-
 dvbsubtitle.h                                 |    4 +-
 eit.c                                         |  119 +-
 eit.h                                         |   10 +-
 eitscan.c                                     |   22 +-
 eitscan.h                                     |    2 +-
 epg.c                                         |  270 ++-
 epg.h                                         |   72 +-
 epg2html                                      |    2 +-
 filter.c                                      |   32 +-
 filter.h                                      |   11 +-
 font.c                                        |    4 +-
 font.h                                        |    2 +-
 i18n.c                                        |    2 +-
 i18n.h                                        |    2 +-
 interface.c                                   |   12 +-
 interface.h                                   |    7 +-
 keys.c                                        |    2 +-
 keys.h                                        |    2 +-
 libsi/Makefile                                |    2 +-
 libsi/descriptor.c                            |    2 +-
 libsi/descriptor.h                            |    2 +-
 libsi/gendescr                                |    2 +-
 libsi/headers.h                               |    2 +-
 libsi/section.c                               |    2 +-
 libsi/section.h                               |    2 +-
 libsi/si.c                                    |    2 +-
 libsi/si.h                                    |    2 +-
 libsi/util.c                                  |    2 +-
 libsi/util.h                                  |    2 +-
 lirc.c                                        |    2 +-
 lirc.h                                        |    2 +-
 menu.c                                        | 1491 +++++++++------
 menu.h                                        |   24 +-
 menuitems.c                                   |   66 +-
 menuitems.h                                   |   14 +-
 newplugin                                     |    3 +-
 nit.c                                         |  170 +-
 nit.h                                         |   16 +-
 osd.c                                         |   17 +-
 osd.h                                         |   33 +-
 osdbase.c                                     |   12 +-
 osdbase.h                                     |    3 +-
 pat.c                                         |   23 +-
 pat.h                                         |    2 +-
 player.c                                      |    2 +-
 player.h                                      |    2 +-
 plugin.c                                      |   36 +-
 plugin.h                                      |    2 +-
 po/ar.po                                      |   47 +-
 po/ca_ES.po                                   |   47 +-
 po/cs_CZ.po                                   |   47 +-
 po/da_DK.po                                   |   47 +-
 po/de_DE.po                                   |   47 +-
 po/el_GR.po                                   |   47 +-
 po/es_ES.po                                   |   47 +-
 po/et_EE.po                                   |   47 +-
 po/fi_FI.po                                   |   47 +-
 po/fr_FR.po                                   |   47 +-
 po/hr_HR.po                                   |   47 +-
 po/hu_HU.po                                   |   47 +-
 po/it_IT.po                                   |   47 +-
 po/lt_LT.po                                   |   47 +-
 po/mk_MK.po                                   |   47 +-
 po/nl_NL.po                                   |   47 +-
 po/nn_NO.po                                   |   47 +-
 po/pl_PL.po                                   |   47 +-
 po/pt_PT.po                                   |   47 +-
 po/ro_RO.po                                   |   47 +-
 po/ru_RU.po                                   |   47 +-
 po/sk_SK.po                                   |   47 +-
 po/sl_SI.po                                   |   47 +-
 po/sr_RS.po                                   |   47 +-
 po/sv_SE.po                                   |   47 +-
 po/tr_TR.po                                   |   47 +-
 po/uk_UA.po                                   |   47 +-
 po/zh_CN.po                                   |   47 +-
 positioner.c                                  |    2 +-
 positioner.h                                  |    2 +-
 receiver.c                                    |    2 +-
 receiver.h                                    |    4 +-
 recorder.c                                    |   29 +-
 recorder.h                                    |    4 +-
 recording.c                                   |  467 +++--
 recording.h                                   |  116 +-
 remote.c                                      |    2 +-
 remote.h                                      |    2 +-
 remux.c                                       |    6 +-
 remux.h                                       |    2 +-
 ringbuffer.c                                  |    2 +-
 ringbuffer.h                                  |    2 +-
 runvdr.template                               |    2 +-
 sdt.c                                         |   61 +-
 sdt.h                                         |    2 +-
 sections.c                                    |    2 +-
 sections.h                                    |    2 +-
 shutdown.c                                    |   29 +-
 shutdown.h                                    |    2 +-
 skinclassic.c                                 |    2 +-
 skinclassic.h                                 |    2 +-
 skinlcars.c                                   |   67 +-
 skinlcars.h                                   |    2 +-
 skins.c                                       |    2 +-
 skins.h                                       |   11 +-
 skinsttng.c                                   |    2 +-
 skinsttng.h                                   |    2 +-
 sourceparams.c                                |    4 +-
 sourceparams.h                                |    4 +-
 sources.c                                     |    2 +-
 sources.h                                     |    2 +-
 spu.c                                         |    2 +-
 spu.h                                         |    2 +-
 status.c                                      |    2 +-
 status.h                                      |    9 +-
 summary2info                                  |    2 +-
 svdrp.c                                       | 1683 ++++++++++++-----
 svdrp.h                                       |  114 +-
 themes.c                                      |    2 +-
 themes.h                                      |    2 +-
 thread.c                                      |  138 +-
 thread.h                                      |   90 +-
 timers.c                                      |  358 ++--
 timers.h                                      |  127 +-
 tools.c                                       |  155 +-
 tools.h                                       |  151 +-
 transfer.c                                    |    4 +-
 transfer.h                                    |    4 +-
 vdr.1                                         |    6 +-
 vdr.5                                         |    2 +-
 vdr.c                                         |  344 ++--
 videodir.c                                    |   17 +-
 videodir.h                                    |    3 +-
 245 files changed, 6334 insertions(+), 12505 deletions(-)
 delete mode 100644 PLUGINS/src/dvbhddevice/COPYING
 delete mode 100644 PLUGINS/src/dvbhddevice/HISTORY
 delete mode 100644 PLUGINS/src/dvbhddevice/Makefile
 delete mode 100644 PLUGINS/src/dvbhddevice/README
 delete mode 100644 PLUGINS/src/dvbhddevice/dvbhddevice.c
 delete mode 100644 PLUGINS/src/dvbhddevice/dvbhdffdevice.c
 delete mode 100644 PLUGINS/src/dvbhddevice/dvbhdffdevice.h
 delete mode 100644 PLUGINS/src/dvbhddevice/hdffcmd.c
 delete mode 100644 PLUGINS/src/dvbhddevice/hdffcmd.h
 delete mode 100644 PLUGINS/src/dvbhddevice/hdffosd.c
 delete mode 100644 PLUGINS/src/dvbhddevice/hdffosd.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c
 delete mode 100644 PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h
 delete mode 100644 PLUGINS/src/dvbhddevice/menu.c
 delete mode 100644 PLUGINS/src/dvbhddevice/menu.h
 delete mode 100644 PLUGINS/src/dvbhddevice/po/de_DE.po
 delete mode 100644 PLUGINS/src/dvbhddevice/po/et_EE.po
 delete mode 100644 PLUGINS/src/dvbhddevice/po/fi_FI.po
 delete mode 100644 PLUGINS/src/dvbhddevice/po/it_IT.po
 delete mode 100644 PLUGINS/src/dvbhddevice/po/uk_UA.po
 delete mode 100644 PLUGINS/src/dvbhddevice/setup.c
 delete mode 100644 PLUGINS/src/dvbhddevice/setup.h
 delete mode 100644 PLUGINS/src/dvbsddevice/COPYING
 delete mode 100644 PLUGINS/src/dvbsddevice/HISTORY
 delete mode 100644 PLUGINS/src/dvbsddevice/Makefile
 delete mode 100644 PLUGINS/src/dvbsddevice/README
 delete mode 100644 PLUGINS/src/dvbsddevice/dvbsddevice.c
 delete mode 100644 PLUGINS/src/dvbsddevice/dvbsdffdevice.c
 delete mode 100644 PLUGINS/src/dvbsddevice/dvbsdffdevice.h
 delete mode 100644 PLUGINS/src/dvbsddevice/dvbsdffosd.c
 delete mode 100644 PLUGINS/src/dvbsddevice/dvbsdffosd.h
 delete mode 100644 PLUGINS/src/rcu/COPYING
 delete mode 100644 PLUGINS/src/rcu/HISTORY
 delete mode 100644 PLUGINS/src/rcu/Makefile
 delete mode 100644 PLUGINS/src/rcu/README
 delete mode 100644 PLUGINS/src/rcu/rcu.c

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6c52abf00..7f7a2d374 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -714,6 +714,7 @@ Oliver Endriss <o.endriss@gmx.de>
  to detect the frame type
  for suggesting to ignore channels with an RID that is not 0 when checking for obsolete
  channels
+ for fixing a possible stack overflow in cListBase::Sort()
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -2842,6 +2843,7 @@ Derek Kelly <user.vdr@gmail.com>
  for reporting a missing template for DVBDIR in Make.config.template
  for suggesting to add ARGSDIR to the ONEDIR section of Make.config.template
  for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
+ for suggesting to make the -u option also accept a numerical user id
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -2964,6 +2966,7 @@ Christopher Reimer <vdr@creimer.net>
  for reporting a possible crash in the OSD demo
  for adding support for systemd
  for suggesting to replace VDR_CHARSET_OVERRIDE with a command line option
+ for making the recorder skip empty adaptation field TS packets
 
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
@@ -3003,6 +3006,8 @@ Frank Neumann <fnu@yavdr.org>
  for reporting a problem with tuning timeouts when using SCR with multiple tuners
  for fixing the German translation of "VDR will shut down in %s minutes"
  for adding support for "Satellite Channel Routing" (SCR) according to EN50607 ("JESS")
+ for suggesting to make the Setup/CAM menu display which device an individual CAM
+ is currently assigned to
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
@@ -3262,6 +3267,7 @@ Stefan Braun <louis.braun@gmx.de>
  for suggesting to add the menu category mcRecordingEdit for marking menus that edit
  recording properties
  for suggesting to make cRecording::GetResume() public
+ for implementing the possibility for skins to display horizontal menus
 
 Jochen Dolze <vdr@dolze.de>
  for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order
@@ -3311,6 +3317,11 @@ Thomas Reufer <thomas@reufer.ch>
  skipping"
  for suggesting to change the return value of cOsd::RenderPixmaps() from cPixmapMemory
  to cPixmap
+ for adding detection of 24fps
+ for suggesting to add some comment to cPixmap about the relation between OSD,
+ ViewPort and DrawPort
+ for suggesting to reduce the priority of the "video directory scanner" thread
+ for making the 'newplugin' script create the 'po' subdirectory for translations
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
@@ -3345,6 +3356,9 @@ Dietmar Spingler <d_spingler@gmx.de>
  for reporting a problem that led to a fix with EMM pids not being properly reset for
  CAMs that need to receive the TS
  for suggesting to add the channel name to log messages that reference a channel
+ for suggesting to provide a way of using no DVB devices at all
+ for suggesting that the -V and -h options should list the plugins in alphabetical order
+ for suggesting to implement the setup option "Recording/Record key handling"
 
 Stefan Schallenberg <infos@nafets.de>
  for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
@@ -3359,6 +3373,8 @@ Dieter Ferdinand <dieter.ferdinand@gmx.de>
  case replay was paused
  for reporting a problem with the system getting unresponsive when removing a huge
  number of files in the thread that removes deleted recordings
+ for suggesting to call the script that gets called for recordings also right before a
+ recording is edited
 
 Jasmin Jessich <jasmin@anw.at>
  for modifying the CAM API so that it is possible to implement CAMs that can be freely
@@ -3400,3 +3416,15 @@ Tomasz Maciej Nowak <tmn505@gmail.com>
 
 Gabriel Bonich <gbonich@gmail.com>
  for translating OSD texts to the Spanish language
+
+Daniel Ribeiro <drwyrm@gmail.com>
+ for reporting a problem with setting the source value of newly created channels, in
+ case the NIT is received from a different, but very close satellite position, and
+ for helping to debug this
+
+Janne P�nk�l� <epankala@gmail.com>
+ for reporting that some broadcasters use the character 0x0D in EPG texts
+
+Stefan P�schel <basic.master@gmx.de>
+ for coding the AFFcleaner, parts of which were used to make the recorder skip empty
+ adaptation field TS packets
diff --git a/Doxyfile.filter b/Doxyfile.filter
index 59ba78370..9948730d7 100755
--- a/Doxyfile.filter
+++ b/Doxyfile.filter
@@ -9,7 +9,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Doxyfile.filter 3.0 2013/02/17 10:54:05 kls Exp $
+# $Id: Doxyfile.filter 4.0 2013/02/17 10:54:05 kls Exp $
 
 $TAG = "///<";
 
diff --git a/HISTORY b/HISTORY
index 20e14735f..7e8fd5c68 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8595,3 +8595,235 @@ Video Disk Recorder Revision History
 - Fixed leading/trailing/multiple blanks in the translation files.
 - Bumped all version numbers to 2.2.0.
 - Official release.
+
+2015-09-14: Version 2.3.1
+
+- The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
+  a cPixmap may have on the current OSD. The 'osddemo' example has been modified
+  accordingly. Plugin authors may want to use this function in case they use pixmaps
+  that are larger than the full OSD size. The default implementation sets this limit
+  to 2048x2048 pixel.
+- The Setup/CAM menu now displays which device an individual CAM is currently
+  assigned to (suggested by Frank Neumann).
+- Added detection of 24fps (thanks to Thomas Reufer).
+- Added a note about the VDR User Counter and VDR's facebook page to the README file.
+- The dvbhddevice plugin is no longer part of the VDR source archive.
+  You can get the latest version of this plugin from the author's repository at
+  https://bitbucket.org/powARman/dvbhddevice.
+- The dvbsddevice and rcu plugins are no longer part of the VDR source archive.
+  You can get the latest versions of these plugins from ftp://ftp.tvdr.de/vdr/Plugins.
+- Added a section about Output Devices to the INSTALL file.
+- Fixed setting the source value of newly created channels, in case the NIT is
+  received from a different, but very close satellite position (reported by Daniel
+  Ribeiro). The code for handling different NITs has been removed from nit.c, because
+  according to the DVB standard table id 0x40 carries only the NIT of the actual
+  network.
+- Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort
+  (suggested by Thomas Reufer).
+- Improved syncing on sections when parsing the NIT and SDT.
+- Fixed scaling subtitles (their areas could sometimes extend outside the actual OSD).
+- Reduced the priority of the "video directory scanner" thread (suggested by Thomas
+  Reufer) and checking cIoThrottle::Engaged() when it is running.
+- The script that gets called for recordings is now also called right before a
+  recording is edited, with the first parameter being "editing" (suggested by
+  Dieter Ferdinand).
+- The new setup option "OSD/Default sort mode for recordings" can be used to define
+  how recordings shall be sorted by default (either by time or by name, with "by time"
+  being the default). If a particular sort mode has been selected for a folder by
+  pressing '0', the default no longer applies to that folder. Repeating timers no
+  longer write a ".sort" file into a recordings folder to have the recordings sorted
+  by time.
+- The command line option -D now accepts the value '-' (as in -D-), which prevents
+  VDR from using any DVB devices (suggested by Dietmar Spingler).
+- The -V and -h options now list the plugins in alphabetical order (suggested by
+  Dietmar Spingler).
+- Fixed a compiler warning in font.c.
+- Commented out the line
+  #define DEPRECATED_VIDEOSYSTEM
+  in device.h. If a plugin doesn't compile with this version of VDR, you can uncomment
+  this line as a quick workaround. In the long run the plugin will need to be adapted.
+- The function cOsd::GetBitmap() is now 'protected'. If a plugin doesn't compile with
+  this version of VDR, you can uncomment the line
+  //#define DEPRECATED_GETBITMAP
+  in osd.h as a quick workaround. In the long run the plugin will need to be adapted.
+- The -u option now also accepts a numerical user id (suggested by Derek Kelly).
+- The SVDRP port now accepts multiple concurrent connections. You can now keep an
+  SVDRP connection open as long as you wish, without preventing others from
+  connecting. Note, though, that SVDRP connections still get closed automatically
+  if there has been no activity for 300 seconds (configurable via
+  "Setup/Miscellaneous/SVDRP timeout (s)").
+- The SVDRP log messages have been unified and now always contain the IP and port
+  number of the remote host.
+- SVDRP connections are now handled in a separate "SVDRP server handler" thread,
+  which makes them more responsive. Note that there is only one thread that handles
+  all concurrent SVDRP connections. That way each SVDRP command is guaranteed to be
+  processed separately, without interfering with any other SVDRP commands that might
+  be issued at the same time. Plugins that implement SVDRP commands may need to take
+  care of proper locking if the commands access global data.
+- VDR now sends out a broadcast to port 6419/udp, which was assigned to 'svdrp-disc'
+  by the IANA. VDRs listening on that port will automatically initiate an SVDRP
+  connection to the broadcasting VDR, and in turn send out a broadcast to make
+  other VDRs connect to them. That way all VDRs within the local network will
+  have permanent "peer-to-peer" SVDRP connections between each other. The
+  configuration in the svdrphosts.conf file is taken into account when considering
+  whether or not to respond to an SVDRP discover broadcast.
+- The new SVDRP command PING is used by automatically established peer-to-peer
+  connections to keep them alive.
+- The new function GetSVDRPServerNames() can be used to get a list of all VDRs
+  this VDR is connected to via SVDRP.
+- The new function ExecSVDRPCommand() can be used to execute an SVDRP command on
+  one of the servers this VDR is connected to, and retrieve the result.
+  The helper functions SVDRPCode() and SVDRPValue() can be used to easily access
+  the codes and values returned by ExecSVDRPCommand().
+- The cTimer class now has a new member named 'remote', which holds the name of the
+  remote server this timer will record on. If this is NULL, it is a local timer.
+- Timers from other VDRs that are connected to this VDR via SVDRP are now
+  automatically fetched and stored in the global Timers list. In order for this
+  to work, all of the channels used by timers on the remote VDR must also be
+  defined on the local VDR (however, not necessarily in the same sequence).
+  Automatic channel syncing will be implemented later.
+- The main menu of the LCARS skin now displays a small rectangle on the left side
+  of a timer if this is a remote timer. The color of that rectangle changes if
+  the timer is currently recording on the remote VDR.
+- Accessing the global Timers list now has to be protected by proper locking,
+  because SVDRP commands are now executed in a separate thread.
+  The introduction of this locking mechanism required the following changes:
+  + The new classes cStateLock and cStateKey are used to implement locking
+    with quick detection of state changes.
+  + cConfig::cConfig() now has a parameter that indicates whether this list
+    requires locking.
+  + The global lists of Timers, Channels, Schedules and Recordings are no longer
+    static variables. They are now pointers that need to be retrieved through
+    a call to cTimers::GetTimersRead/Write(), cChannels::GetChannelsRead/Write(),
+    cSchedules::GetSchedulesRead/Write() and cRecordings::GetRecordingsRead/Write(),
+    respectively.
+  + References from/to link channels are now removed in cChannels::Del() rather
+    than cChannel::~cChannel(), to make sure the caller holds a proper lock.
+  + cChannel::HasTimer() has been removed. This information is now retrieved
+    via cSchedule::HasTimer().
+  + Several member functions of cChannel, cTimer, cMarks and cRecording have
+    been made 'const', and some of them are now available as both 'const' and
+    'non-const' versions.
+  + The cChannel::Set...() functions are now 'bool' and return true if they have
+    actually changed any of the channels's members.
+  + cChannels::SetModified() has been renamed to cChannels::SetModifiedByUser().
+  + cChannels::Modified() has been renamed to cChannels::ModifiedByUser(), and
+    now has a 'State' parameter that allows the caller to see whether a channel
+    has been modified since the last call to this function with the same State
+    variable.
+  + The macros CHANNELSMOD_NONE/_AUTO/_USER have been removed.
+  + cMarks now requires locking via cStateKey.
+  + cSortedTimers now requires a pointer to the list of timers.
+  + cEvent::HasTimer() no longer scans the list of timers to check whether an event
+    is referenced by a timer, but rather keeps score of how many timers reference
+    it. This was necessary in order to avoid having to lock the list of timers from
+    within a cEvent.
+  + The new class cListGarbageCollector is used to temporary store any objects deleted
+    from cLists that require locking. This allows pointers to such objects to be
+    dereferenced even if the objects are no longer part of the list.
+  + cListBase::Contains() can be used to check whether a particular object is still
+    contained in that list.
+  + Outdated events are no longer "phased out", but rather deleted right away and thus
+    taken care of by the new "garbage collector" of the list.
+  + Deleted cRecording objects are no longer kept in a list of "vanished" recordings,
+    but are rather taken care of by the new "garbage collector" of the list.
+  + cSchedules::ClearAll() has been removed. The functionality is now implemented
+    directly in cSVDRPServer::CmdCLRE().
+  + tEventID has been changed to u_int16_t in order to make room for the new member
+    numTimers in cEvent.
+  + cSchedule now has a member Modified(), which can be used with a State variable
+    to quickly determine whether this schedule has been modified since the last call
+    to this function with the same State variable.
+  + cSchedulesLock has been removed. Locking the list of schedules is now done via
+    the cList's new locking mechanism.
+  + The 'OnlyRunningStatus' parameters in cEpgHandler::BeginSegmentTransfer() and
+    cEpgHandler::EndSegmentTransfer() are now obsolete. They are still present in
+    the interface for backward compatibility, but may be removed in a future version.
+    Their value is always 'false'.
+  + The constant tcMod is no longer used in cStatus::TimerChange(). The definition is
+    still there for backward compatibility.
+  Plugins that access the global lists of Timers, Channels, Recordings or Schedules
+  will need to be adapted as follows:
+  + Instead of directly accessing the global variables Timers, Channels or Recordings,
+    they need to set up a cStateKey variable and call the proper getter function,
+    as in
+      cStateKey StateKey;
+      if (const cTimers *Timers = cTimers::GetTimersRead(StateKey)) {
+         // access the timers
+         StateKey.Remove();
+         }
+    and
+      cStateKey StateKey;
+      if (cTimers *Timers = cTimers::GetTimersWrite(StateKey)) {
+         // access the timers
+         StateKey.Remove();
+         }
+    See timers.h, thread.h and tools.h for details on this new locking mechanism.
+  + There are convenience macros for easily accessing these lists without having
+    to explicitly set up a cStateKey and calling its Remove() function. These macros
+    have the form LOCK_*_READ/WRITE (with '*' being TIMERS, CHANNELS, SCHEDULES or
+    RECORDINGS). Simply put such a macro before the point where you need to access
+    the respective list, and there will be a pointer named Timers, Channels, Schedules
+    or Recordings, respectively, which is valid until the end of the current block.
+  + If a plugin needs to access several of the global lists in parallel, locking must
+    always be done in the sequence Timers, Channels, Recordings, Schedules. This is
+    necessary to make sure that different threads that need to lock several lists at
+    the same time don't end up in a deadlock.
+  + Some pointer variables may need to be made 'const'. The compiler will tell you
+    about these.
+- cSectionSyncer has been improved to better handle missed sections.
+- Added a missing initialization of 'seen' in cChannel's copy constructor.
+- Background modifications of channels, timers and events are now displayed immediately
+  in the corresponding menus.
+- cEIT now checks the version of the tables before doing any processing, which saves
+  a lot of locking and processing.
+- If a timer is newly created with the Red button in the Schedule menu, and the timer
+  is presented to the user in the "Edit timer" menu because it will start immediately,
+  it now *must* be confirmed with "Ok" to set the timer. Otherwise the timer will not
+  be created.
+- Recordings and deleted recordings are now scanned in a single thread.
+- The new SVDRP command POLL is used by automatically established peer-to-peer
+  connections to trigger fetching remote timers.
+- You can now set DumpSVDRPDataTransfer in svdrp.c to true to have all SVDRP
+  communication printed to the console for debugging.
+- Added a missing 'const' to cReceiver::Receive(), to protect the given Data from
+  being modified.
+- The SVDRP commands that deal with timers (DELT, LSTT, MODT, NEWT, NEXT and UPDT)
+  as well as any log messages that refer to timers, now use a unique id for each
+  timer, which remains valid as long as this instance of VDR is running. This means
+  that timers are no longer continuously numbered from 1 to N in LSTT. There may be
+  gaps in the sequence, in case timers have been deleted.
+- The Timers menu now displays the name of the remote VDR in front of the timer's
+  file name, if this is a remote timer.
+- The new options "Setup/Miscellaneous/SVDRP peering", ".../SVDRP host name" and
+  ".../SVDRP default host" can be used to configure automatic peering between VDRs
+  in the same network. Peering is disabled by default and can be enabled by setting
+  "SVDRP peering" to "yes".
+- The function cTimer::ToText() no longer returns a newline character at the end of
+  the string. The newline is now added by the caller as necessary. This was changed
+  because cTimer::ToText() is now also needed in a context where the terminating
+  newline can't be used. Consequently, cChannel::ToText() and cMark::ToText() have
+  been modified accordingly.
+- All timer related response strings from SVDRP commands now use the channel ID
+  instead of channel numbers.
+- The "Edit timer" menu now has a new parameter "Record on", which can be used to
+  select the VDR on which this timer shall record. Timers can be freely moved
+  between connected VDRs by simply selecting the desired machine in this field.
+- The SVDRP command DELT no longer checks whether the timer that shall be deleted
+  is currently recording.
+- The character 0x0D is now stripped from EPG texts (reported by Janne P�nk�l�).
+- The EPG scanner no longer moves the dish if there is a positioner.
+- The 'newplugin' script now creates the 'po' subdirectory for translations (thanks
+  to Thomas Reufer).
+- Skins can now implement cSkinDisplayMenu::MenuOrientation() to display horizontal
+  menus (thanks to Stefan Braun).
+- Fixed a possible stack overflow in cListBase::Sort() (thanks to Oliver Endriss).
+- Changed the description of the --chartab option in the INSTALL file to refer to
+  "DVB SI table strings" instead of "EPG data".
+- The width and height of the OSD are now limited to the actual maximum dimensions
+  of the output device, taking into account the top and left offset.
+- The new setup option "Recording/Record key handling" can be used to define
+  what happens if the Record key on the remote control is pressed during
+  live tv (suggested by Dietmar Spingler).
+- Empty adaptation field TS packets are now skipped when recording (thanks to
+  Christopher Reimer, based on the "AFFcleaner" by Stefan P�schel).
diff --git a/INSTALL b/INSTALL
index 864cfb1ca..f2218d121 100644
--- a/INSTALL
+++ b/INSTALL
@@ -94,6 +94,24 @@ vdr:123:respawn:/usr/local/bin/vdr --terminal=/dev/tty8 -w 60
 
 See the man page vdr(1) for complete information about all command line options.
 
+Output devices
+--------------
+
+VDR by itself doesn't produce any audio or video output. In order to watch
+live tv or recordings, you will need to use a plugin that supports the actual
+hardware in your system, for instance:
+
+Plugin:           Device:
+
+dvbsddevice       Full-Featured SD DVB cards (Fujitsu-Siemens Design)
+                  (comes with the VDR source)
+dvbhddevice       Full-featured HD DVB cards (Technotrend TT S2-6400)
+                  https://bitbucket.org/powARman/dvbhddevice
+rpihddevice       Raspberry Pi
+                  http://projects.vdr-developer.org/git/vdr-plugin-rpihddevice.git
+
+See http://linuxtv.org/vdrwiki/index.php/Output_devices for more.
+
 Standard compliance
 -------------------
 
@@ -134,10 +152,10 @@ displayed correctly. Since BiDi support adds some runtime overhead by requiring
 additional memory allocation and copying, this feature is not compiled in
 by default, so that users that have no need for this don't get any overhead.
 
-Workaround for providers not encoding their EPG data correctly
---------------------------------------------------------------
+Workaround for providers not encoding their DVB SI table strings correctly
+--------------------------------------------------------------------------
 
-According to "ETSI EN 300 468" the default character set fo SI data is
+According to "ETSI EN 300 468" the default character set for SI data is
 ISO6937. But unfortunately some broadcasters actually use ISO-8859-9 or
 other encodings, but fail to correctly announce that.
 Users who want to set the default character set to something different can
@@ -250,19 +268,20 @@ You can use the '-r' option to define a program or script that gets called
 before and after a recording is performed, and after an editing process
 has finished or a recording has been deleted.
 
-The program will be called with two or three (in case of "edited") string
-parameters. The first parameter is one of
+The program will be called with two or three (in case of "editing" and "edited")
+string parameters. The first parameter is one of
 
   before      if this is *before* a recording starts
   started     if this is after a recording has *started*
   after       if this is *after* a recording has finished
+  editing     if this is before *editing* a recording
   edited      if this is after a recording has been *edited*
   deleted     if this is after a recording has been *deleted*
 
 and the second parameter contains the full name of the recording's
 directory (which may not yet exists at that moment in the "before" case).
-In the "edited" case it will be the name of the edited version (second
-parameter) and the name of the source version (third parameter).
+In the "editing" and "edited" case it will be the name of the edited version
+(second parameter) and the name of the source version (third parameter).
 In the "deleted" case the extension of the directory name is ".del"
 instead of ".rec".
 
@@ -286,6 +305,10 @@ case "$1" in
      after)
             echo "After recording $2"
             ;;
+     editing)
+            echo "Editing recording $2"
+            echo "Source recording $3"
+            ;;
      edited)
             echo "Edited recording $2"
             echo "Source recording $3"
diff --git a/MANUAL b/MANUAL
index 3c4003ed4..971df4027 100644
--- a/MANUAL
+++ b/MANUAL
@@ -498,6 +498,9 @@ Version 2.2
              the name of the recording.
   First day: The date of the first day when this timer shall start recording
              (only available for repeating timers).
+  Record on: The name of the remote VDR this timer shall record on (only available
+             if there are any remote VDRs connected to this VDR). If this field
+             is empty, the timer will record on the local VDR.
 
   A timer can also be programmed by pressing the "Red" key on the "Schedule",
   "Now", "Next" or "Event" menus.
@@ -654,6 +657,11 @@ Version 2.2
                          plain recordings. Set this option to "no" if you want folders
                          to be interspersed with recordings when sorted alphabetically.
 
+  Default sort mode for recordings = by time
+                         Controls whether recordings are sorted by time or by name.
+                         If a particular sort mode has been selected for a folder by
+                         pressing '0', the default no longer applies to that folder.
+
   Number keys for characters = yes
                          Controls whether the number keys can be used to enter
                          characters in a text input field. You may want to set this
@@ -882,8 +890,13 @@ Version 2.2
                          means that this recording will never be deleted
                          automatically.
 
-  Pause priority = 10    The Priority and Lifetime values used when pausing live
-  Pause lifetime = 1     video.
+  Record key handling = 2
+                         Defines what happens if the Record key on the remote control
+                         is pressed during live tv.
+                         0 = no instant recording
+                         1 = confirm instant recording
+                         2 = record instantly
+                         The default is 2.
 
   Pause key handling = 2 Defines what happens if the Pause key on the remote control
                          is pressed during live tv.
@@ -892,6 +905,9 @@ Version 2.2
                          2 = pause live video
                          The default is 2.
 
+  Pause priority = 10    The Priority and Lifetime values used when pausing live
+  Pause lifetime = 1     video.
+
   Use episode name = yes Repeating timers use the EPG's 'Episode name' information
                          to create recording file names in a hierarchical structure
                          (for instance to gather all episodes of a series in a
@@ -1066,6 +1082,15 @@ Version 2.2
                          connection after which the connection is automatically
                          closed. Default is 300, a value of 0 means no timeout.
 
+  SVDRP peering = no     Activates automatic connections between VDRs in the same
+                         network.
+
+  SVDRP host name        The name of this VDR, which is used when connecting VDRs
+                         via SVDRP. By default, the machine's host name is used.
+
+  SVDRP default host     The name of the VDR to be used by default when creating a
+                         new timer.
+
   Zap timeout = 3        The time (in seconds) until a channel counts as "previous"
                          for switching with '0'
 
diff --git a/Make.config.template b/Make.config.template
index 8768f3b95..4b4317d62 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.4 2015/02/09 09:58:45 kls Exp $
+# $Id: Make.config.template 4.0 2015/02/09 09:58:45 kls Exp $
 
 ### The C compiler and options:
 
diff --git a/Make.global b/Make.global
index 665cc285d..73e5b49e1 100644
--- a/Make.global
+++ b/Make.global
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.global 3.0 2012/12/29 12:03:01 kls Exp $
+# $Id: Make.global 4.0 2012/12/29 12:03:01 kls Exp $
 
 # This is just a dummy file for plugins that use old style (version 1.7.33
 # or earlier) Makefiles.
diff --git a/Makefile b/Makefile
index 97220364d..b90cbd241 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 3.6 2015/02/09 12:28:24 kls Exp $
+# $Id: Makefile 4.0 2015/02/09 12:28:24 kls Exp $
 
 .DELETE_ON_ERROR:
 
diff --git a/PLUGINS.html b/PLUGINS.html
index 6f47f2f55..dd7a154fd 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -38,7 +38,7 @@ <h1>The VDR Plugin System</h1>
 <a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
 <div class="center">
-<modified>Important modifications introduced since version 2.0 are marked like this.</modified>
+<modified>Important modifications introduced since version 2.2 are marked like this.</modified>
 </div>
 <p>
 VDR provides an easy to use plugin interface that allows additional functionality
@@ -99,12 +99,12 @@ <h1>Table Of Contents</h1>
 <li><a href="#Skins">Skins</a>
 <li><a href="#Themes">Themes</a>
 <li><a href="#Devices">Devices</a>
-<li><modified><a href="#Positioners">Positioners</a></modified>
+<li><a href="#Positioners">Positioners</a>
 <li><a href="#Audio">Audio</a>
 <li><a href="#Remote Control">Remote Control</a>
 <li><a href="#Conditional Access">Conditional Access</a>
 <li><a href="#Electronic Program Guide">Electronic Program Guide</a>
-<li><modified><a href="#The video directory">The video directory</a></modified>
+<li><a href="#The video directory">The video directory</a>
 </ul>
 </ul>
 
@@ -1161,6 +1161,12 @@ <h1>Table Of Contents</h1>
 ('<tt>\n</tt>'). Each of these lines will be preceded with the <tt>ReplyCode</tt>
 when presenting them to the caller, and the continuation character ('<tt>-</tt>')
 will be set for all but the last one.
+<p>
+<modified>
+<b>The SVDRP functions are called from the separate "SVDRP server handler" thread.
+Therefore the plugin needs to take care of proper locking if it accesses any
+global data.</b>
+</modified>
 
 <hr><h2><a name="Loading plugins into VDR">Loading plugins into VDR</a></h2>
 
@@ -1877,7 +1883,7 @@ <h1>Table Of Contents</h1>
 virtual int64_t GetSTC(void);
 virtual bool IsPlayingVideo(void) const;
 virtual bool HasIBPTrickSpeed(void);
-virtual void TrickSpeed(int Speed<modified>, bool Forward</modified>);
+virtual void TrickSpeed(int Speed, bool Forward);
 virtual void Clear(void);
 virtual void Play(void);
 virtual void Freeze(void);
@@ -2026,7 +2032,6 @@ <h1>Table Of Contents</h1>
 
 and shall not delete this object. It will be automatically deleted when the program ends.
 
-<div class="modified">
 <hr><h2><a name="Positioners">Positioners</a></h2>
 
 <div class="blurb">Now you see me - now you don't!</div><p>
@@ -2065,7 +2070,6 @@ <h1>Table Of Contents</h1>
 Note that the object has to be created on the heap (using <tt>new</tt>),
 and you shall not delete it at any point (it will be deleted automatically
 when the program ends).
-</div modified>
 
 <hr><h2><a name="Audio">Audio</a></h2>
 
@@ -2301,7 +2305,6 @@ <h1>Table Of Contents</h1>
 <p>
 See <tt>VDR/epg.h</tt> for details.
 
-<div class="modified">
 <hr><h2><a name="The video directory">The video directory</a></h2>
 
 <div class="blurb">Bits and pieces...</div><p>
@@ -2335,7 +2338,6 @@ <h1>Table Of Contents</h1>
 Note that the object has to be created on the heap (using <tt>new</tt>),
 and you shall not delete it at any point (it will be deleted automatically
 when the program ends).
-</div modified>
 
 </body>
 </html>
diff --git a/PLUGINS/src/dvbhddevice/COPYING b/PLUGINS/src/dvbhddevice/COPYING
deleted file mode 100644
index f90922eea..000000000
--- a/PLUGINS/src/dvbhddevice/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY
deleted file mode 100644
index 532b5e916..000000000
--- a/PLUGINS/src/dvbhddevice/HISTORY
+++ /dev/null
@@ -1,108 +0,0 @@
-VDR Plugin 'dvbhddevice' Revision History
------------------------------------------
-
-2009-12-29: Version 0.0.1
-
-- Initial revision.
-
-2010-01-04: Version 0.0.2
-
-- Calling the MakePrimaryDevice() function of the base class to allow
-  the cDevice to stop displaying subtitles.
-- Added support for DVB cards with multiple frontends.
-
-2011-04-17: Version 0.0.3
-
-- Improved trickmodes
-- No transfer mode needed for dolby digital
-- Clear audio and video PID when Clear() ist called to stop audio decoding when jumping to cutting marks
-- Support still frames in H264 format
-- Remote control setup
-- Added analogue video setting, support volume control.
-- Support setting of audio delay.
-- Support setting of audio channel (Stereo, Left, Right)
-- Support setting of audio downmix mode.
-- Playback of PES data is working now.
-- Fall back to MPEG2 stream type when no PMT is available.
-- Added support for PES PCM playback
-- Support HDMI-CEC. (One-Touch Play)
-- Added low level OSD implementation.
-- Added option to select between high level and low level OSD.
-- high level OSD: Implement SaveRegion and RestoreRegion.
-- Fix not working video playback when PCR PID is different from video PID.
-- Fix not working pause when playing H.264 video
-- Improvements in transfer mode, fix audio dropouts or no audio at all
-- Add implementation of CanHandleAreas method to support VDR 1.7.17
-- in cHdffOsdRaw::Flush fix reusing of loop variable i in subloop that lead to OSD update problems
-- Specify container format when starting audio decoding to support PES-DVD containers
-- Added support for True Color OSD
-- Allow to disable true color OSD support via setup option
-
-2011-04-xx: Version 0.0.4
-
-- locally define DVB OSD API extensions to support compiling with original DVB headers
-- Return correct pixel aspect ratio in GetOsdSize
-- Adapt Makefile to changes introduced in recent VDR versions
-
-2012-12-27: Version 0.0.5
-
-- Adapted Makefile to changes introduced in recent VDR versions.
-
-2013-01-12: Version 0.0.6
-
-- Adapted Makefile to changes introduced in recent VDR versions.
-
-2013-01-24: Version 0.0.7
-
-- Fixed cHdffOsd::SetAreas() (didn't clear the OSD).
-
-2013-02-16: Version 0.0.8
-
-- Added missing $(LDFLAGS) to the Makefile (thanks to Ville Skytt�).
-
-2013-02-24: Version 0.0.9
-
-- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
-- Updated the Italian OSD texts (thanks to Diego Pierotto).
-- Fixed flashing OSD in "high level OSD" mode in case a menu is open while subtitles
-  are being displayed.
-- Fixed immediately disappearing subtitle track menu when selecting "No subtitles".
-
-2013-03-31: Version 2.0.0
-
-- Official release.
-
-2013-04-11: Version 2.0.1
-
-- Fixed aspect ratio and position of scaled video.
-
-2013-08-23: Version 2.1.1
-
-- Fixed aspect ratio and position of scaled video.
-- Added yellow button in main menu to send CEC TV-Off command.
-
-2013-08-26: Version 2.1.2
-
-- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
-
-2014-01-01: Version 2.1.3
-
-- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
-- cDevice::TrickSpeed() now has an additional parameter named Forward.
-
-2014-01-17: Version 2.1.4
-
-- Using PCR based clock recovery in transfer mode.
-
-2014-03-15: Version 2.1.6
-
-- The function cDevice::GetVideoSystem() has been deprecated.
-- Removed old-style video format setting functions.
-
-2015-02-11: Version 2.1.7
-
-- Adapted to the new return value of cOsd::RenderPixmaps().
-
-2015-02-19: Version 2.2.0
-
-- Official release.
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
deleted file mode 100644
index a994e2e86..000000000
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-
-PLUGIN = dvbhddevice
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The directory environment:
-
-# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
-LIBDIR = $(call PKGCFG,libdir)
-LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
-#
-TMPDIR ?= /tmp
-
-### The compiler options:
-
-export CFLAGS   = $(call PKGCFG,cflags)
-export CXXFLAGS = $(call PKGCFG,cxxflags)
-
-### The version number of VDR's plugin API:
-
-APIVERSION = $(call PKGCFG,apiversion)
-
-### Allow user defined options to overwrite defaults:
-
--include $(PLGCFG)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
-
-### Includes and Defines (add further entries here):
-
-INCLUDES +=
-
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o dvbhdffdevice.o hdffcmd.o hdffosd.o menu.o setup.o
-
-### The main target:
-
-all: $(SOFILE) i18n
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Internationalization (I18N):
-
-PODIR     = po
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	install -D -m644 $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmo) $(I18Npot)
-
-install-i18n: $(I18Nmsgs)
-
-### Targets:
-
-$(SOFILE): $(OBJS) libhdffcmd
-	@$(MAKE) --no-print-directory -C libhdffcmd all
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@
-
-install-lib: $(SOFILE)
-	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-
-install: install-lib install-i18n
-
-dist: $(I18Npo) clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
-	@-$(MAKE) --no-print-directory -C libhdffcmd clean
diff --git a/PLUGINS/src/dvbhddevice/README b/PLUGINS/src/dvbhddevice/README
deleted file mode 100644
index 5697dea77..000000000
--- a/PLUGINS/src/dvbhddevice/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by:                  Andreas Regel <andreas.regel@gmx.de>
-
-Project's homepage:          http://powarman.dyndns.org/hg/dvbhddevice
-
-Latest version available at: http://powarman.dyndns.org/hg/dvbhddevice
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-See the file COPYING for more information.
-
-Description:
-
-The 'dvbhddevice' plugin implements the output device for the
-"Full Featured TechnoTrend S2-6400" DVB cards.
diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c
deleted file mode 100644
index 3ee74475d..000000000
--- a/PLUGINS/src/dvbhddevice/dvbhddevice.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * dvbhddevice.c: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#include <vdr/plugin.h>
-#include <vdr/shutdown.h>
-#include "dvbhdffdevice.h"
-#include "menu.h"
-#include "setup.h"
-
-static const char *VERSION        = "2.2.0";
-static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
-static const char *MAINMENUENTRY  = "dvbhddevice";
-
-class cPluginDvbhddevice : public cPlugin {
-private:
-  cDvbHdFfDeviceProbe *probe;
-  bool mIsUserInactive;
-public:
-  cPluginDvbhddevice(void);
-  virtual ~cPluginDvbhddevice();
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return tr(DESCRIPTION); }
-  virtual void MainThreadHook(void);
-  virtual void Stop(void);
-  virtual const char *MainMenuEntry(void);
-  virtual cOsdObject *MainMenuAction(void);
-  virtual cMenuSetupPage *SetupMenu(void);
-  virtual bool SetupParse(const char *Name, const char *Value);
-  };
-
-cPluginDvbhddevice::cPluginDvbhddevice(void)
-:   mIsUserInactive(true)
-{
-  probe = new cDvbHdFfDeviceProbe;
-}
-
-cPluginDvbhddevice::~cPluginDvbhddevice()
-{
-  delete probe;
-}
-
-void cPluginDvbhddevice::MainThreadHook(void)
-{
-    bool isUserInactive = ShutdownHandler.IsUserInactive();
-    if (isUserInactive != mIsUserInactive)
-    {
-        mIsUserInactive = isUserInactive;
-        if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOn)
-        {
-            HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
-            if (hdffCmdIf && !mIsUserInactive)
-            {
-                hdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
-            }
-        }
-    }
-}
-
-void cPluginDvbhddevice::Stop(void)
-{
-    if (gHdffSetup.CecEnabled && gHdffSetup.CecTvOff)
-    {
-        HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
-        if (hdffCmdIf)
-        {
-            hdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
-            isyslog("HDFF_CEC_COMMAND_TV_OFF");
-        }
-    }
-}
-
-const char *cPluginDvbhddevice::MainMenuEntry(void)
-{
-  return gHdffSetup.HideMainMenu ? NULL : MAINMENUENTRY;
-}
-
-cOsdObject *cPluginDvbhddevice::MainMenuAction(void)
-{
-  HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
-  return hdffCmdIf ? new cHdffMenu(hdffCmdIf) : NULL;
-}
-
-cMenuSetupPage *cPluginDvbhddevice::SetupMenu(void)
-{
-  HDFF::cHdffCmdIf * hdffCmdIf = cDvbHdFfDevice::GetHdffCmdHandler();
-  return hdffCmdIf ? new cHdffSetupPage(hdffCmdIf) : NULL;
-}
-
-bool cPluginDvbhddevice::SetupParse(const char *Name, const char *Value)
-{
-  return gHdffSetup.SetupParse(Name, Value);
-}
-
-VDRPLUGINCREATOR(cPluginDvbhddevice); // Don't touch this!
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c b/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
deleted file mode 100644
index 8ee80754e..000000000
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.c
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*
- * dvbhdffdevice.c: The DVB HD Full Featured device interface
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#include <stdint.h>
-
-#include "dvbhdffdevice.h"
-#include <errno.h>
-#include <limits.h>
-#include <libsi/si.h>
-#include <linux/videodev2.h>
-#include <linux/dvb/audio.h>
-#include <linux/dvb/dmx.h>
-#include <linux/dvb/video.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <vdr/eitscan.h>
-#include <vdr/transfer.h>
-#include "hdffosd.h"
-#include "setup.h"
-
-
-static uchar *YuvToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality);
-
-
-// --- cDvbHdFfDevice --------------------------------------------------------
-
-int cDvbHdFfDevice::devHdffOffset = -1;
-
-cDvbHdFfDevice::cDvbHdFfDevice(int Adapter, int Frontend)
-:cDvbDevice(Adapter, Frontend)
-{
-  spuDecoder = NULL;
-  audioChannel = 0;
-  playMode = pmNone;
-  mHdffCmdIf = NULL;
-
-  // Devices that are only present on cards with decoders:
-
-  fd_osd      = DvbOpen(DEV_DVB_OSD,    adapter, frontend, O_RDWR);
-  fd_video    = DvbOpen(DEV_DVB_VIDEO,  adapter, frontend, O_RDWR | O_NONBLOCK);
-  fd_audio    = DvbOpen(DEV_DVB_AUDIO,  adapter, frontend, O_RDWR | O_NONBLOCK);
-
-  //TODO missing /dev/video offset calculation
-
-  isHdffPrimary = false;
-  if (devHdffOffset < 0) {
-     devHdffOffset = adapter;
-     isHdffPrimary = true;
-     mHdffCmdIf = new HDFF::cHdffCmdIf(fd_osd);
-
-     uint32_t firmwareVersion = mHdffCmdIf->CmdGetFirmwareVersion(NULL, 0);
-     if (firmwareVersion < 0x401)
-        supportsPcrInTransferMode = false;
-     else
-        supportsPcrInTransferMode = true;
-
-     /* reset some stuff in case the VDR was killed before and had no chance
-        to clean up. */
-     mHdffCmdIf->CmdOsdReset();
-
-     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
-     mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
-
-     mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
-     mHdffCmdIf->CmdAvSetPcrPid(0, 0);
-     mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
-     mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
-
-     ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
-     mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
-     mHdffCmdIf->CmdAvEnableSync(0, true);
-     mHdffCmdIf->CmdAvSetPlayMode(0, true);
-     /* reset done */
-
-     mHdffCmdIf->CmdAvSetAudioDelay(gHdffSetup.AudioDelay);
-     mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) gHdffSetup.AudioDownmix);
-     mHdffCmdIf->CmdAvSetSyncShift(gHdffSetup.AvSyncShift);
-     mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) gHdffSetup.AnalogueVideo);
-     mHdffCmdIf->CmdHdmiSetVideoMode(gHdffSetup.GetVideoMode());
-
-     HdffHdmiConfig_t hdmiConfig;
-     memset(&hdmiConfig, 0, sizeof(hdmiConfig));
-     hdmiConfig.TransmitAudio = true;
-     hdmiConfig.ForceDviMode = false;
-     hdmiConfig.CecEnabled = gHdffSetup.CecEnabled;
-     strcpy(hdmiConfig.CecDeviceName, "VDR");
-     hdmiConfig.VideoModeAdaption = (HdffVideoModeAdaption_t) gHdffSetup.VideoModeAdaption;
-     mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
-
-     mHdffCmdIf->CmdRemoteSetProtocol((HdffRemoteProtocol_t) gHdffSetup.RemoteProtocol);
-     mHdffCmdIf->CmdRemoteSetAddressFilter(gHdffSetup.RemoteAddress >= 0, gHdffSetup.RemoteAddress);
-     }
-}
-
-cDvbHdFfDevice::~cDvbHdFfDevice()
-{
-    delete spuDecoder;
-    if (isHdffPrimary)
-    {
-        delete mHdffCmdIf;
-    }
-    // We're not explicitly closing any device files here, since this sometimes
-    // caused segfaults. Besides, the program is about to terminate anyway...
-}
-
-void cDvbHdFfDevice::MakePrimaryDevice(bool On)
-{
-    if (On) {
-        new cHdffOsdProvider(mHdffCmdIf);
-
-        gHdffSetup.SetVideoFormat(mHdffCmdIf);
-    }
-    cDvbDevice::MakePrimaryDevice(On);
-}
-
-bool cDvbHdFfDevice::HasDecoder(void) const
-{
-  return isHdffPrimary;
-}
-
-cSpuDecoder *cDvbHdFfDevice::GetSpuDecoder(void)
-{
-  if (!spuDecoder && IsPrimaryDevice())
-     spuDecoder = new cDvbSpuDecoder();
-  return spuDecoder;
-}
-
-uchar *cDvbHdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
-{
-    #define BUFFER_SIZE  (sizeof(struct v4l2_pix_format) + 1920 * 1080 * 2)
-    int fd;
-    uint8_t * buffer;
-    uint8_t * result = NULL;
-
-    fd = DvbOpen(DEV_DVB_VIDEO, adapter, frontend, O_RDONLY);
-    if (fd < 0) {
-        esyslog("GrabImage: failed open DVB video device");
-        return NULL;
-    }
-
-    buffer = (uint8_t *) malloc(BUFFER_SIZE);
-    if (buffer)
-    {
-        int readBytes;
-
-        readBytes = read(fd, buffer, BUFFER_SIZE);
-        if (readBytes < (int) sizeof(struct v4l2_pix_format))
-            esyslog("GrabImage: failed reading from DVB video device");
-        else {
-            struct v4l2_pix_format * pixfmt;
-            int dataSize;
-
-            pixfmt = (struct v4l2_pix_format *) buffer;
-            dsyslog("GrabImage: Read image of size %d x %d",
-                    pixfmt->width, pixfmt->height);
-            dataSize = readBytes - sizeof(struct v4l2_pix_format);
-            if (dataSize < (int) pixfmt->sizeimage)
-                esyslog("GrabImage: image is not complete");
-            else {
-                if (Jpeg) {
-                    uint8_t * temp;
-                    temp = (uint8_t *) malloc(pixfmt->width * 3 * pixfmt->height);
-                    if (temp) {
-                        int numPixels = pixfmt->width * pixfmt->height;
-                        uint8_t * destData = temp;
-                        uint8_t * srcData = buffer + sizeof(struct v4l2_pix_format);
-                        while (numPixels > 0)
-                        {
-                            destData[0] = srcData[1];
-                            destData[1] = srcData[0];
-                            destData[2] = srcData[2];
-                            destData[3] = srcData[3];
-                            destData[4] = srcData[0];
-                            destData[5] = srcData[2];
-                            srcData += 4;
-                            destData += 6;
-                            numPixels -= 2;
-                        }
-                        if (Quality < 0)
-                            Quality = 100;
-                        result = YuvToJpeg(temp, pixfmt->width, pixfmt->height, Size, Quality);
-                        free(temp);
-                    }
-                }
-                else {
-                    // convert to PNM:
-                    char buf[32];
-                    snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n",
-                             pixfmt->width, pixfmt->height);
-                    int l = strlen(buf);
-                    Size = l + pixfmt->width * 3 * pixfmt->height;
-                    result = (uint8_t *) malloc(Size);
-                    if (result)
-                    {
-                        memcpy(result, buf, l);
-                        uint8_t * destData = result + l;
-                        uint8_t * srcData = buffer + sizeof(struct v4l2_pix_format);
-                        int numPixels = pixfmt->width * pixfmt->height;
-                        while (numPixels > 0)
-                        {
-                            int cb = srcData[0] - 128;
-                            int y1 = srcData[1];
-                            int cr = srcData[2] - 128;
-                            int y2 = srcData[3];
-                            int r;
-                            int g;
-                            int b;
-
-                            r = y1 + (int) (1.402f * cr);
-                            g = y1 - (int) (0.344f * cb + 0.714f * cr);
-                            b = y1 + (int) (1.772f * cb);
-                            destData[0] = r > 255 ? 255 : r < 0 ? 0 : r;
-                            destData[1] = g > 255 ? 255 : g < 0 ? 0 : g;
-                            destData[2] = b > 255 ? 255 : b < 0 ? 0 : b;
-                            r = y2 + (int) (1.402f * cr);
-                            g = y2 - (int) (0.344f * cb + 0.714f * cr);
-                            b = y2 + (int) (1.772f * cb);
-                            destData[3] = r > 255 ? 255 : r < 0 ? 0 : r;
-                            destData[4] = g > 255 ? 255 : g < 0 ? 0 : g;
-                            destData[5] = b > 255 ? 255 : b < 0 ? 0 : b;
-
-                            srcData += 4;
-                            destData += 6;
-                            numPixels -= 2;
-                        }
-                    }
-                }
-            }
-        }
-        free(buffer);
-    }
-
-    close(fd);
-
-    return result;
-}
-
-void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
-{
-    if (gHdffSetup.TvFormat == HDFF_TV_FORMAT_4_BY_3)
-    {
-        switch (VideoDisplayFormat)
-        {
-            case vdfPanAndScan:
-            case vdfCenterCutOut:
-                gHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
-                break;
-
-            case vdfLetterBox:
-                gHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
-                break;
-        }
-        gHdffSetup.SetVideoFormat(mHdffCmdIf);
-    }
-    cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
-}
-
-void cDvbHdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
-{
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        Width = vs.w;
-        Height = vs.h;
-        switch (vs.aspect_ratio) {
-          default:
-          case VIDEO_FORMAT_4_3:   VideoAspect =  4.0 / 3.0; break;
-          case VIDEO_FORMAT_16_9:  VideoAspect = 16.0 / 9.0; break;
-          case VIDEO_FORMAT_221_1: VideoAspect =       2.21; break;
-          }
-        return;
-        }
-     else
-        LOG_ERROR;
-     }
-  cDevice::GetVideoSize(Width, Height, VideoAspect);
-}
-
-void cDvbHdFfDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
-{
-  gHdffSetup.GetOsdSize(Width, Height, PixelAspect);
-}
-
-bool cDvbHdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
-{
-    //printf("SetPid Type %d, On %d, PID %5d, streamtype %d, handle %d, used %d\n", Type, On, Handle->pid, Handle->streamType, Handle->handle, Handle->used);
-    if (Handle->pid) {
-        dmx_pes_filter_params pesFilterParams;
-        memset(&pesFilterParams, 0, sizeof(pesFilterParams));
-        if (On) {
-            if (Handle->handle < 0) {
-                Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
-                if (Handle->handle < 0) {
-                    LOG_ERROR;
-                    return false;
-                }
-            }
-            if (Type == ptPcr)
-                mHdffCmdIf->CmdAvSetPcrPid(0, Handle->pid);
-            else if (Type == ptVideo) {
-                if (Handle->streamType == 0x1B)
-                    mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_H264);
-                else
-                    mHdffCmdIf->CmdAvSetVideoPid(0, Handle->pid, HDFF_VIDEO_STREAM_MPEG2);
-            }
-            else if (Type == ptAudio) {
-                if (Handle->streamType == 0x03)
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG1);
-                else if (Handle->streamType == 0x04)
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG2);
-                else if (Handle->streamType == SI::AC3DescriptorTag)
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_AC3);
-                else if (Handle->streamType == SI::EnhancedAC3DescriptorTag)
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_EAC3);
-                else if (Handle->streamType == 0x0F)
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_AAC);
-                else if (Handle->streamType == 0x11)
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_HE_AAC);
-                else
-                    mHdffCmdIf->CmdAvSetAudioPid(0, Handle->pid, HDFF_AUDIO_STREAM_MPEG1);
-            }
-            if (!(Type <= ptDolby && Handle->used <= 1)) {
-                pesFilterParams.pid     = Handle->pid;
-                pesFilterParams.input   = DMX_IN_FRONTEND;
-                pesFilterParams.output  = DMX_OUT_TS_TAP;
-                pesFilterParams.pes_type= DMX_PES_OTHER;
-                pesFilterParams.flags   = DMX_IMMEDIATE_START;
-                if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-                    LOG_ERROR;
-                    return false;
-                }
-            }
-        }
-        else if (!Handle->used) {
-            CHECK(ioctl(Handle->handle, DMX_STOP));
-            if (Type == ptPcr)
-                mHdffCmdIf->CmdAvSetPcrPid(0, 0);
-            else if (Type == ptVideo)
-                mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
-            else if (Type == ptAudio)
-                mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
-            else if (Type == ptDolby)
-                mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_AC3);
-            //TODO missing setting to 0x1FFF??? see cDvbDevice::SetPid()
-            close(Handle->handle);
-            Handle->handle = -1;
-        }
-    }
-    return true;
-}
-
-void cDvbHdFfDevice::TurnOffLiveMode(bool LiveView)
-{
-  // Turn off live PIDs:
-
-  DetachAll(pidHandles[ptAudio].pid);
-  DetachAll(pidHandles[ptVideo].pid);
-  DetachAll(pidHandles[ptPcr].pid);
-  DetachAll(pidHandles[ptTeletext].pid);
-  DelPid(pidHandles[ptAudio].pid);
-  DelPid(pidHandles[ptVideo].pid);
-  DelPid(pidHandles[ptPcr].pid, ptPcr);
-  DelPid(pidHandles[ptTeletext].pid);
-  DelPid(pidHandles[ptDolby].pid);
-}
-
-bool cDvbHdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
-{
-  int apid = Channel->Apid(0);
-  int vpid = Channel->Vpid();
-  int dpid = Channel->Dpid(0);
-
-  bool DoTune = !IsTunedToTransponder(Channel);
-
-  bool pidHandlesVideo = vpid && pidHandles[ptVideo].pid == vpid;
-  bool pidHandlesAudio = apid && pidHandles[ptAudio].pid == apid;
-
-  bool TurnOffLivePIDs = DoTune
-                         || !IsPrimaryDevice()
-                         || LiveView // for a new live view the old PIDs need to be turned off
-                         || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                         ;
-
-  bool StartTransferMode = IsPrimaryDevice() && !DoTune
-                           && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
-                              || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                              );
-  if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
-     StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
-
-  //printf("SetChannelDevice Transfer %d, Live %d\n", StartTransferMode, LiveView);
-
-  bool TurnOnLivePIDs = !StartTransferMode && LiveView;
-
-  // Turn off live PIDs if necessary:
-
-  if (TurnOffLivePIDs)
-     TurnOffLiveMode(LiveView);
-
-  // Set the tuner:
-
-  if (!cDvbDevice::SetChannelDevice(Channel, LiveView))
-     return false;
-
-  // PID settings:
-
-  if (TurnOnLivePIDs) {
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo, Channel->Vtype()) && AddPid(apid ? apid : dpid, ptAudio, apid ? 0 : Channel->Dtype(0)))) {
-        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
-        return false;
-        }
-     }
-  else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel));
-
-  return true;
-}
-
-int cDvbHdFfDevice::GetAudioChannelDevice(void)
-{
-  return audioChannel;
-}
-
-void cDvbHdFfDevice::SetAudioChannelDevice(int AudioChannel)
-{
-  mHdffCmdIf->CmdAvSetAudioChannel(AudioChannel);
-  audioChannel = AudioChannel;
-}
-
-void cDvbHdFfDevice::SetVolumeDevice(int Volume)
-{
-  mHdffCmdIf->CmdMuxSetVolume(Volume * 100 / 255);
-}
-
-void cDvbHdFfDevice::SetAudioTrackDevice(eTrackType Type)
-{
-    //printf("SetAudioTrackDevice %d\n", Type);
-    const tTrackId *TrackId = GetTrack(Type);
-    if (TrackId && TrackId->id) {
-        int streamType = 0;
-        cChannel * channel = Channels.GetByNumber(CurrentChannel());
-        if (channel) {
-            if (IS_AUDIO_TRACK(Type))
-                streamType = channel->Atype(Type - ttAudioFirst);
-            else if (IS_DOLBY_TRACK(Type))
-                streamType = channel->Dtype(Type - ttDolbyFirst);
-        }
-        //printf("SetAudioTrackDevice new %d %d, current %d\n", TrackId->id, streamType, pidHandles[ptAudio].pid);
-        if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
-            DetachAll(pidHandles[ptAudio].pid);
-            if (CamSlot())
-                CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
-            pidHandles[ptAudio].pid = TrackId->id;
-            pidHandles[ptAudio].streamType = streamType;
-            SetPid(&pidHandles[ptAudio], ptAudio, true);
-            if (CamSlot()) {
-                CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
-                CamSlot()->StartDecrypting();
-            }
-        }
-    }
-}
-
-bool cDvbHdFfDevice::CanReplay(void) const
-{
-  return cDevice::CanReplay();
-}
-
-bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
-{
-    if (PlayMode == pmNone) {
-        if (fd_video == -1)
-            fd_video = DvbOpen(DEV_DVB_VIDEO,  adapter, frontend, O_RDWR | O_NONBLOCK);
-        if (fd_audio == -1)
-            fd_audio = DvbOpen(DEV_DVB_AUDIO,  adapter, frontend, O_RDWR | O_NONBLOCK);
-
-        mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
-        mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
-
-        mHdffCmdIf->CmdAvEnableVideoAfterStop(0, false);
-        mHdffCmdIf->CmdAvSetPcrPid(0, 0);
-        mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
-        mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
-
-        ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
-        mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
-        mHdffCmdIf->CmdAvEnableSync(0, true);
-        mHdffCmdIf->CmdAvSetPlayMode(0, true);
-        mHdffCmdIf->CmdAvMuteAudio(0, false);
-    }
-    else {
-        if (playMode == pmNone)
-            TurnOffLiveMode(true);
-
-        if (PlayMode == pmExtern_THIS_SHOULD_BE_AVOIDED)
-        {
-            close(fd_video);
-            fd_video = -1;
-            close(fd_audio);
-            fd_audio = -1;
-        }
-        else
-        {
-            isTransferMode = Transferring() || (cTransferControl::ReceiverDevice() == this);
-            mHdffCmdIf->CmdAvSetPlayMode(1, isTransferMode);
-            mHdffCmdIf->CmdAvSetStc(0, 100000);
-            mHdffCmdIf->CmdAvEnableSync(0, false);
-            mHdffCmdIf->CmdAvEnableVideoAfterStop(0, true);
-
-            playVideoPid = -1;
-            playAudioPid = -1;
-            playPcrPid = -1;
-            audioCounter = 0;
-            videoCounter = 0;
-            freezed = false;
-            trickMode = false;
-            isPlayingVideo = false;
-
-            mHdffCmdIf->CmdAvSetDecoderInput(0, 2);
-            ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
-        }
-    }
-    playMode = PlayMode;
-    return true;
-}
-
-int64_t cDvbHdFfDevice::GetSTC(void)
-{
-    if (isPlayingVideo)
-    {
-        if (fd_video >= 0) {
-            uint64_t pts;
-            if (ioctl(fd_video, VIDEO_GET_PTS, &pts) == -1) {
-                esyslog("ERROR: pts %d: %m", CardIndex() + 1);
-                return -1;
-            }
-            //printf("video PTS %lld\n", pts);
-            return pts;
-        }
-    }
-    else
-    {
-        if (fd_audio >= 0) {
-            uint64_t pts;
-            if (ioctl(fd_audio, AUDIO_GET_PTS, &pts) == -1) {
-                esyslog("ERROR: pts %d: %m", CardIndex() + 1);
-                return -1;
-            }
-            //printf("audio PTS %lld\n", pts);
-            return pts;
-        }
-    }
-    return -1;
-}
-
-cRect cDvbHdFfDevice::CanScaleVideo(const cRect &Rect, int Alignment)
-{
-    return Rect;
-}
-
-void cDvbHdFfDevice::ScaleVideo(const cRect &Rect)
-{
-    if (Rect == cRect::Null)
-    {
-        mHdffCmdIf->CmdAvSetVideoWindow(0, false, 0, 0, 0, 0);
-    }
-    else
-    {
-        //printf("ScaleVideo: Rect = %d %d %d %d\n", Rect.X(), Rect.Y(), Rect.Width(), Rect.Height());
-
-        int osdWidth;
-        int osdHeight;
-        double osdPixelAspect;
-
-        GetOsdSize(osdWidth, osdHeight, osdPixelAspect);
-        //printf("ScaleVideo: OsdSize = %d %d %g\n", osdWidth, osdHeight, osdPixelAspect);
-
-        // Convert the video window coordinates in 1/10 percent of the display
-        // resolution.
-        int x = (Rect.X() * 1000 + osdWidth / 2) / osdWidth;
-        int y = (Rect.Y() * 1000 + osdHeight / 2) / osdHeight;
-        int w = (Rect.Width() * 1000 + osdWidth / 2) / osdWidth;
-        int h = (Rect.Height() * 1000 + osdHeight / 2) / osdHeight;
-        //printf("ScaleVideo: Win1 = %d %d %d %d\n", x, y, w, h);
-
-        // fix aspect ratio, reposition video
-        if (w > h) {
-            x += (w - h) / 2;
-            w = h;
-        }
-        else if (w < h) {
-            y += (h - w) / 2;
-            h = w;
-        }
-
-        //printf("ScaleVideo: Win2 = %d %d %d %d\n", x, y, w, h);
-        mHdffCmdIf->CmdAvSetVideoWindow(0, true, x, y, w, h);
-    }
-}
-
-#if (APIVERSNUM >= 20103)
-void cDvbHdFfDevice::TrickSpeed(int Speed, bool Forward)
-#else
-void cDvbHdFfDevice::TrickSpeed(int Speed)
-#endif
-{
-  freezed = false;
-  mHdffCmdIf->CmdAvEnableSync(0, false);
-  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
-  playAudioPid = -1;
-  if (Speed > 0)
-     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100 / Speed);
-  trickMode = true;
-}
-
-void cDvbHdFfDevice::Clear(void)
-{
-  CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-  mHdffCmdIf->CmdAvSetVideoPid(0, 0, HDFF_VIDEO_STREAM_MPEG1);
-  mHdffCmdIf->CmdAvSetAudioPid(0, 0, HDFF_AUDIO_STREAM_MPEG1);
-  playVideoPid = -1;
-  playAudioPid = -1;
-  cDevice::Clear();
-}
-
-void cDvbHdFfDevice::Play(void)
-{
-    freezed = false;
-    trickMode = false;
-    if (isPlayingVideo)
-        mHdffCmdIf->CmdAvEnableSync(0, true);
-    mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
-    mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
-    mHdffCmdIf->CmdAvMuteAudio(0, false);
-    cDevice::Play();
-}
-
-void cDvbHdFfDevice::Freeze(void)
-{
-  freezed = true;
-  mHdffCmdIf->CmdAvSetVideoSpeed(0, 0);
-  mHdffCmdIf->CmdAvSetAudioSpeed(0, 0);
-  cDevice::Freeze();
-}
-
-void cDvbHdFfDevice::Mute(void)
-{
-    mHdffCmdIf->CmdAvMuteAudio(0, true);
-    cDevice::Mute();
-}
-
-static HdffVideoStreamType_t MapVideoStreamTypes(int Vtype)
-{
-  switch (Vtype) {
-    case 0x01: return HDFF_VIDEO_STREAM_MPEG1;
-    case 0x02: return HDFF_VIDEO_STREAM_MPEG2;
-    case 0x1B: return HDFF_VIDEO_STREAM_H264;
-    default: return HDFF_VIDEO_STREAM_MPEG2; // fallback to MPEG2
-    }
-}
-
-void cDvbHdFfDevice::StillPicture(const uchar *Data, int Length)
-{
-  if (!Data || Length < TS_SIZE)
-     return;
-  if (Data[0] == 0x47) {
-     // TS data
-     cDevice::StillPicture(Data, Length);
-     }
-  else if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
-     // PES data
-     char *buf = MALLOC(char, Length);
-     if (!buf)
-        return;
-     int i = 0;
-     int blen = 0;
-     while (i < Length - 6) {
-           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
-              int len = Data[i + 4] * 256 + Data[i + 5];
-              if ((Data[i + 3] & 0xF0) == 0xE0) { // video packet
-                 // skip PES header
-                 int offs = i + 6;
-                 // skip header extension
-                 if ((Data[i + 6] & 0xC0) == 0x80) {
-                    // MPEG-2 PES header
-                    if (Data[i + 8] >= Length)
-                       break;
-                    offs += 3;
-                    offs += Data[i + 8];
-                    len -= 3;
-                    len -= Data[i + 8];
-                    if (len < 0 || offs + len > Length)
-                       break;
-                    }
-                 else {
-                    // MPEG-1 PES header
-                    while (offs < Length && len > 0 && Data[offs] == 0xFF) {
-                          offs++;
-                          len--;
-                          }
-                    if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
-                       offs += 2;
-                       len -= 2;
-                       }
-                    if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
-                       offs += 5;
-                       len -= 5;
-                       }
-                    else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
-                       offs += 10;
-                       len -= 10;
-                       }
-                    else if (offs < Length && len > 0) {
-                       offs++;
-                       len--;
-                       }
-                    }
-                 if (blen + len > Length) // invalid PES length field
-                    break;
-                 memcpy(&buf[blen], &Data[offs], len);
-                 i = offs + len;
-                 blen += len;
-                 }
-              else if (Data[i + 3] >= 0xBD && Data[i + 3] <= 0xDF) // other PES packets
-                 i += len + 6;
-              else
-                 i++;
-              }
-           else
-              i++;
-           }
-     mHdffCmdIf->CmdAvShowStillImage(0, (uint8_t *)buf, blen, MapVideoStreamTypes(PatPmtParser()->Vtype()));
-     free(buf);
-     }
-  else {
-     // non-PES data
-     mHdffCmdIf->CmdAvShowStillImage(0, Data, Length, MapVideoStreamTypes(PatPmtParser()->Vtype()));
-     }
-}
-
-bool cDvbHdFfDevice::Poll(cPoller &Poller, int TimeoutMs)
-{
-  Poller.Add(fd_video, true);
-  return Poller.Poll(TimeoutMs);
-}
-
-bool cDvbHdFfDevice::Flush(int TimeoutMs)
-{
-  //TODO actually this function should wait until all buffered data has been processed by the card, but how?
-  return true;
-}
-
-void cDvbHdFfDevice::BuildTsPacket(uint8_t * TsBuffer, bool PusiSet, uint16_t Pid, uint8_t Counter, const uint8_t * Data, uint32_t Length)
-{
-    TsBuffer[0] = 0x47;
-    TsBuffer[1] = PusiSet ? 0x40 : 0x00;
-    TsBuffer[1] |= Pid >> 8;
-    TsBuffer[2] = Pid & 0xFF;
-    if (Length >= 184)
-    {
-        TsBuffer[3] = 0x10 | Counter;
-        memcpy(TsBuffer + 4, Data, 184);
-    }
-    else
-    {
-        uint8_t adaptationLength;
-
-        TsBuffer[3] = 0x30 | Counter;
-        adaptationLength = 183 - Length;
-        TsBuffer[4] = adaptationLength;
-        if (adaptationLength > 0)
-        {
-            TsBuffer[5] = 0x00;
-            memset(TsBuffer + 6, 0xFF, adaptationLength - 1);
-        }
-        memcpy(TsBuffer + 5 + adaptationLength, Data, Length);
-    }
-}
-
-uint32_t cDvbHdFfDevice::PesToTs(uint8_t * TsBuffer, uint16_t Pid, uint8_t & Counter, const uint8_t * Data, uint32_t Length)
-{
-    uint32_t tsOffset;
-    uint32_t i;
-
-    tsOffset = 0;
-    i = 0;
-    while (Length > 0)
-    {
-        BuildTsPacket(TsBuffer + tsOffset, i == 0, Pid, Counter, Data + i * 184, Length);
-        if (Length >= 184)
-            Length -= 184;
-        else
-            Length = 0;
-        Counter = (Counter + 1) & 15;
-        tsOffset += 188;
-        i++;
-    }
-    return tsOffset;
-}
-
-int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
-{
-    if (freezed)
-        return -1;
-    if (!isPlayingVideo)
-    {
-        mHdffCmdIf->CmdAvEnableSync(0, true);
-        isPlayingVideo = true;
-    }
-
-    // ignore padding PES packets
-    if (Data[3] == 0xBE)
-        return Length;
-
-    //TODO: support greater Length
-    uint8_t tsBuffer[188 * 16];
-    uint32_t tsLength;
-    int pid = 100;
-
-    tsLength = PesToTs(tsBuffer, pid, videoCounter, Data, Length);
-
-    if (pid != playVideoPid) {
-        playVideoPid = pid;
-        mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, HDFF_VIDEO_STREAM_MPEG2, true);
-    }
-    if (WriteAllOrNothing(fd_video, tsBuffer, tsLength, 1000, 10) <= 0)
-        Length = 0;
-    return Length;
-}
-
-int cDvbHdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
-{
-    if (freezed)
-        return -1;
-    uint8_t streamId;
-    uint8_t tsBuffer[188 * 16];
-    uint32_t tsLength;
-    HdffAudioStreamType_t streamType = HDFF_AUDIO_STREAM_MPEG1;
-    HdffAvContainerType_t containerType = HDFF_AV_CONTAINER_PES;
-    int pid;
-
-    streamId = Data[3];
-    if (streamId >= 0xC0 && streamId <= 0xDF)
-    {
-        streamType = HDFF_AUDIO_STREAM_MPEG1;
-    }
-    else if (streamId == 0xBD)
-    {
-        const uint8_t * payload = Data + 9 + Data[8];
-        if ((payload[0] & 0xF8) == 0xA0)
-        {
-            containerType = HDFF_AV_CONTAINER_PES_DVD;
-            streamType = HDFF_AUDIO_STREAM_PCM;
-        }
-        else if ((payload[0] & 0xF8) == 0x88)
-        {
-            containerType = HDFF_AV_CONTAINER_PES_DVD;
-            streamType = HDFF_AUDIO_STREAM_DTS;
-        }
-        else if ((payload[0] & 0xF8) == 0x80)
-        {
-            containerType = HDFF_AV_CONTAINER_PES_DVD;
-            streamType = HDFF_AUDIO_STREAM_AC3;
-        }
-        else
-        {
-            streamType = HDFF_AUDIO_STREAM_AC3;
-        }
-    }
-    pid = 200 + (int) streamType;
-    tsLength = PesToTs(tsBuffer, pid, audioCounter, Data, Length);
-
-    if (pid != playAudioPid) {
-        playAudioPid = pid;
-        mHdffCmdIf->CmdAvSetAudioPid(0, playAudioPid, streamType, containerType);
-    }
-    if (WriteAllOrNothing(fd_video, tsBuffer, tsLength, 1000, 10) <= 0)
-        Length = 0;
-    return Length;
-}
-
-int cDvbHdFfDevice::PlayTsVideo(const uchar *Data, int Length)
-{
-    if (freezed)
-        return -1;
-    if (!isPlayingVideo)
-    {
-        mHdffCmdIf->CmdAvEnableSync(0, true);
-        isPlayingVideo = true;
-    }
-
-    int pid = TsPid(Data);
-    if (pid != playVideoPid) {
-        PatPmtParser();
-        if (pid == PatPmtParser()->Vpid()) {
-            playVideoPid = pid;
-            mHdffCmdIf->CmdAvSetVideoPid(0, playVideoPid, MapVideoStreamTypes(PatPmtParser()->Vtype()), true);
-        }
-    }
-    if (isTransferMode && supportsPcrInTransferMode) {
-        if (pid != playPcrPid) {
-            if (pid == PatPmtParser()->Ppid()) {
-                playPcrPid = pid;
-                mHdffCmdIf->CmdAvSetPcrPid(0, playPcrPid);
-            }
-        }
-    }
-    return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-}
-
-static HdffAudioStreamType_t MapAudioStreamTypes(int Atype)
-{
-  switch (Atype) {
-    case 0x03: return HDFF_AUDIO_STREAM_MPEG1;
-    case 0x04: return HDFF_AUDIO_STREAM_MPEG2;
-    case SI::AC3DescriptorTag: return HDFF_AUDIO_STREAM_AC3;
-    case SI::EnhancedAC3DescriptorTag: return HDFF_AUDIO_STREAM_EAC3;
-    case 0x0F: return HDFF_AUDIO_STREAM_AAC;
-    case 0x11: return HDFF_AUDIO_STREAM_HE_AAC;
-    default: return HDFF_AUDIO_STREAM_MPEG1;
-    }
-}
-
-int cDvbHdFfDevice::PlayTsAudio(const uchar *Data, int Length)
-{
-  if (freezed)
-    return -1;
-  int pid = TsPid(Data);
-  if (pid != playAudioPid) {
-     playAudioPid = pid;
-     int AudioStreamType = -1;
-     for (int i = 0; PatPmtParser()->Apid(i); i++) {
-         if (playAudioPid == PatPmtParser()->Apid(i)) {
-            AudioStreamType = PatPmtParser()->Atype(i);
-            break;
-            }
-         }
-     if (AudioStreamType < 0) {
-        for (int i = 0; PatPmtParser()->Dpid(i); i++) {
-            if (playAudioPid == PatPmtParser()->Dpid(i)) {
-               AudioStreamType = PatPmtParser()->Dtype(i);
-               break;
-               }
-            }
-        }
-     mHdffCmdIf->CmdAvSetAudioPid(0, playAudioPid, MapAudioStreamTypes(AudioStreamType));
-     }
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-}
-
-HDFF::cHdffCmdIf *cDvbHdFfDevice::GetHdffCmdHandler(void)
-{
-  //TODO why not just keep a pointer?
-  if (devHdffOffset >= 0) {
-     cDvbHdFfDevice *device = (cDvbHdFfDevice *)GetDevice(devHdffOffset);
-     if (device)
-        return device->mHdffCmdIf;
-     }
-  return NULL;
-}
-
-// --- cDvbHdFfDeviceProbe ---------------------------------------------------
-
-bool cDvbHdFfDeviceProbe::Probe(int Adapter, int Frontend)
-{
-  static uint32_t SubsystemIds[] = {
-    0x13C23009, // Technotrend S2-6400 HDFF development samples
-    0x13C2300A, // Technotrend S2-6400 HDFF production version
-    0x00000000
-    };
-  cString FileName;
-  cReadLine ReadLine;
-  FILE *f = NULL;
-  uint32_t SubsystemId = 0;
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_vendor", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId = strtoul(s, NULL, 0) << 16;
-     fclose(f);
-     }
-  FileName = cString::sprintf("/sys/class/dvb/dvb%d.frontend%d/device/subsystem_device", Adapter, Frontend);
-  if ((f = fopen(FileName, "r")) != NULL) {
-     if (char *s = ReadLine.Read(f))
-        SubsystemId |= strtoul(s, NULL, 0);
-     fclose(f);
-     }
-  for (uint32_t *sid = SubsystemIds; *sid; sid++) {
-      if (*sid == SubsystemId) {
-         FileName = cString::sprintf("/dev/dvb/adapter%d/osd0", Adapter);
-         int fd = open(FileName, O_RDWR);
-         if (fd != -1) { //TODO treat the second path of the S2-6400 as a budget device
-            close(fd);
-            dsyslog("creating cDvbHdFfDevice");
-            new cDvbHdFfDevice(Adapter, Frontend);
-            return true;
-            }
-         }
-      }
-  return false;
-}
-
-
-// --- YuvToJpeg -------------------------------------------------------------
-
-#include <jpeglib.h>
-
-#define JPEGCOMPRESSMEM 4000000
-
-struct tJpegCompressData {
-  int size;
-  uchar *mem;
-  };
-
-static void JpegCompressInitDestination(j_compress_ptr cinfo)
-{
-  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
-  if (jcd) {
-     cinfo->dest->free_in_buffer = jcd->size = JPEGCOMPRESSMEM;
-     cinfo->dest->next_output_byte = jcd->mem = MALLOC(uchar, jcd->size);
-     }
-}
-
-static boolean JpegCompressEmptyOutputBuffer(j_compress_ptr cinfo)
-{
-  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
-  if (jcd) {
-     int Used = jcd->size;
-     int NewSize = jcd->size + JPEGCOMPRESSMEM;
-     if (uchar *NewBuffer = (uchar *)realloc(jcd->mem, NewSize)) {
-        jcd->size = NewSize;
-        jcd->mem = NewBuffer;
-        }
-     else {
-        esyslog("ERROR: out of memory");
-        return false;
-        }
-     if (jcd->mem) {
-        cinfo->dest->next_output_byte = jcd->mem + Used;
-        cinfo->dest->free_in_buffer = jcd->size - Used;
-        return true;
-        }
-     }
-  return false;
-}
-
-static void JpegCompressTermDestination(j_compress_ptr cinfo)
-{
-  tJpegCompressData *jcd = (tJpegCompressData *)cinfo->client_data;
-  if (jcd) {
-     int Used = cinfo->dest->next_output_byte - jcd->mem;
-     if (Used < jcd->size) {
-        if (uchar *NewBuffer = (uchar *)realloc(jcd->mem, Used)) {
-           jcd->size = Used;
-           jcd->mem = NewBuffer;
-           }
-        else
-           esyslog("ERROR: out of memory");
-        }
-     }
-}
-
-static uchar *YuvToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality)
-{
-  if (Quality < 0)
-     Quality = 0;
-  else if (Quality > 100)
-     Quality = 100;
-
-  jpeg_destination_mgr jdm;
-
-  jdm.init_destination = JpegCompressInitDestination;
-  jdm.empty_output_buffer = JpegCompressEmptyOutputBuffer;
-  jdm.term_destination = JpegCompressTermDestination;
-
-  struct jpeg_compress_struct cinfo;
-  struct jpeg_error_mgr jerr;
-  cinfo.err = jpeg_std_error(&jerr);
-  jpeg_create_compress(&cinfo);
-  cinfo.dest = &jdm;
-  tJpegCompressData jcd;
-  cinfo.client_data = &jcd;
-  cinfo.image_width = Width;
-  cinfo.image_height = Height;
-  cinfo.input_components = 3;
-  cinfo.in_color_space = JCS_YCbCr;
-
-  jpeg_set_defaults(&cinfo);
-  jpeg_set_quality(&cinfo, Quality, true);
-  jpeg_start_compress(&cinfo, true);
-
-  int rs = Width * 3;
-  JSAMPROW rp[Height];
-  for (int k = 0; k < Height; k++)
-      rp[k] = &Mem[rs * k];
-  jpeg_write_scanlines(&cinfo, rp, Height);
-  jpeg_finish_compress(&cinfo);
-  jpeg_destroy_compress(&cinfo);
-
-  Size = jcd.size;
-  return jcd.mem;
-}
diff --git a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h b/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
deleted file mode 100644
index 580bf9e4d..000000000
--- a/PLUGINS/src/dvbhddevice/dvbhdffdevice.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * dvbhdffdevice.h: The DVB HD Full Featured device interface
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#ifndef __DVBHDFFDEVICE_H
-#define __DVBHDFFDEVICE_H
-
-#include "hdffcmd.h"
-#include <vdr/dvbdevice.h>
-#include <vdr/dvbspu.h>
-
-/// The cDvbHdFfDevice implements a DVB device which can be accessed through the Linux DVB driver API.
-
-class cDvbHdFfDevice : public cDvbDevice {
-private:
-  int fd_osd, fd_audio, fd_video;
-protected:
-  virtual void MakePrimaryDevice(bool On);
-public:
-  static bool Probe(int Adapter, int Frontend);
-  cDvbHdFfDevice(int Adapter, int Frontend);
-  virtual ~cDvbHdFfDevice();
-  virtual bool HasDecoder(void) const;
-
-// SPU facilities
-
-private:
-  cDvbSpuDecoder *spuDecoder;
-public:
-  virtual cSpuDecoder *GetSpuDecoder(void);
-
-// Channel facilities
-
-private:
-  void TurnOffLiveMode(bool LiveView);
-protected:
-  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
-
-// PID handle facilities
-
-protected:
-  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
-
-// Image Grab facilities
-
-public:
-  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-
-// Video format facilities
-
-public:
-  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
-  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
-  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
-
-// Track facilities
-
-protected:
-  virtual void SetAudioTrackDevice(eTrackType Type);
-
-// Audio facilities
-
-private:
-  int audioChannel;
-protected:
-  virtual int GetAudioChannelDevice(void);
-  virtual void SetAudioChannelDevice(int AudioChannel);
-  virtual void SetVolumeDevice(int Volume);
-
-// Player facilities
-
-private:
-  int playVideoPid;
-  int playAudioPid;
-  int playPcrPid;
-  bool freezed;
-  bool trickMode;
-  bool isPlayingVideo;
-  bool isTransferMode;
-  bool supportsPcrInTransferMode;
-
-  // Pes2Ts conversion stuff
-  uint8_t videoCounter;
-  uint8_t audioCounter;
-  void BuildTsPacket(uint8_t * TsBuffer, bool PusiSet, uint16_t Pid, uint8_t Counter, const uint8_t * Data, uint32_t Length);
-  uint32_t PesToTs(uint8_t * TsBuffer, uint16_t Pid, uint8_t & Counter, const uint8_t * Data, uint32_t Length);
-
-protected:
-  ePlayMode playMode;
-  virtual bool CanReplay(void) const;
-  virtual bool SetPlayMode(ePlayMode PlayMode);
-  virtual int PlayVideo(const uchar *Data, int Length);
-  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
-  virtual int PlayTsVideo(const uchar *Data, int Length);
-  virtual int PlayTsAudio(const uchar *Data, int Length);
-public:
-  virtual int64_t GetSTC(void);
-  virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter);
-  virtual void ScaleVideo(const cRect &Rect = cRect::Null);
-#if (APIVERSNUM >= 20103)
-  virtual void TrickSpeed(int Speed, bool Forward);
-#else
-  virtual void TrickSpeed(int Speed);
-#endif
-  virtual void Clear(void);
-  virtual void Play(void);
-  virtual void Freeze(void);
-  virtual void Mute(void);
-  virtual void StillPicture(const uchar *Data, int Length);
-  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
-  virtual bool Flush(int TimeoutMs = 0);
-
-// HDFF specific things
-
-public:
-  static HDFF::cHdffCmdIf *GetHdffCmdHandler(void);
-private:
-  static int devHdffOffset;//TODO
-  bool isHdffPrimary;//TODO implicit!
-  HDFF::cHdffCmdIf *mHdffCmdIf;
-};
-
-class cDvbHdFfDeviceProbe : public cDvbDeviceProbe {
-public:
-  virtual bool Probe(int Adapter, int Frontend);
-  };
-
-#endif //__DVBHDFFDEVICE_H
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.c b/PLUGINS/src/dvbhddevice/hdffcmd.c
deleted file mode 100644
index fd2d598aa..000000000
--- a/PLUGINS/src/dvbhddevice/hdffcmd.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * hdffcmd.c: TODO(short description)
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#include <stdint.h>
-
-#include "hdffcmd.h"
-#include "libhdffcmd/hdffcmd.h"
-#include <stdio.h>
-#include <string.h>
-#include <vdr/tools.h>
-
-
-namespace HDFF
-{
-
-cHdffCmdIf::cHdffCmdIf(int OsdDev)
-{
-    mOsdDev = OsdDev;
-    if (mOsdDev < 0)
-    {
-        //printf("ERROR: invalid OSD device handle (%d)!\n", mOsdDev);
-    }
-}
-
-cHdffCmdIf::~cHdffCmdIf(void)
-{
-}
-
-
-uint32_t cHdffCmdIf::CmdGetFirmwareVersion(char * pString, uint32_t MaxLength)
-{
-    uint32_t version;
-    int err;
-
-    err = HdffCmdGetFirmwareVersion(mOsdDev, &version, pString, MaxLength);
-    if (err == 0)
-        return version;
-    return 0;
-}
-
-uint32_t cHdffCmdIf::CmdGetInterfaceVersion(char * pString, uint32_t MaxLength)
-{
-    uint32_t version;
-    int err;
-
-    err = HdffCmdGetInterfaceVersion(mOsdDev, &version, pString, MaxLength);
-    if (err == 0)
-        return version;
-    return 0;
-}
-
-uint32_t cHdffCmdIf::CmdGetCopyrights(uint8_t Index, char * pString, uint32_t MaxLength)
-{
-    int err;
-
-    err = HdffCmdGetCopyrights(mOsdDev, Index, pString, MaxLength);
-    if (err == 0)
-        return strlen(pString);
-    return 0;
-}
-
-
-void cHdffCmdIf::CmdAvSetPlayMode(uint8_t PlayMode, bool Realtime)
-{
-    HdffCmdAvSetPlayMode(mOsdDev, PlayMode, Realtime);
-}
-
-void cHdffCmdIf::CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, HdffVideoStreamType_t StreamType, bool PlaybackMode)
-{
-    //printf("SetVideoPid %d %d\n", VideoPid, StreamType);
-    HdffCmdAvSetVideoPid(mOsdDev, DecoderIndex, VideoPid, StreamType);
-}
-
-void cHdffCmdIf::CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, HdffAudioStreamType_t StreamType, HdffAvContainerType_t ContainerType)
-{
-    //printf("SetAudioPid %d %d %d\n", AudioPid, StreamType, ContainerType);
-    HdffCmdAvSetAudioPid(mOsdDev, DecoderIndex, AudioPid, StreamType,
-                         ContainerType);
-}
-
-void cHdffCmdIf::CmdAvSetPcrPid(uint8_t DecoderIndex, uint16_t PcrPid)
-{
-    //printf("SetPcrPid %d\n", PcrPid);
-    HdffCmdAvSetPcrPid(mOsdDev, DecoderIndex, PcrPid);
-}
-
-void cHdffCmdIf::CmdAvSetTeletextPid(uint8_t DecoderIndex, uint16_t TeletextPid)
-{
-    HdffCmdAvSetTeletextPid(mOsdDev, DecoderIndex, TeletextPid);
-}
-
-void cHdffCmdIf::CmdAvSetVideoWindow(uint8_t DecoderIndex, bool Enable, uint16_t X, uint16_t Y, uint16_t Width, uint16_t Height)
-{
-    HdffCmdAvSetVideoWindow(mOsdDev, DecoderIndex, Enable, X, Y, Width, Height);
-}
-
-void cHdffCmdIf::CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, HdffVideoStreamType_t StreamType)
-{
-    HdffCmdAvShowStillImage(mOsdDev, DecoderIndex, pStillImage, Size,
-                            StreamType);
-}
-
-void cHdffCmdIf::CmdAvSetDecoderInput(uint8_t DecoderIndex, uint8_t DemultiplexerIndex)
-{
-    HdffCmdAvSetDecoderInput(mOsdDev, DecoderIndex, DemultiplexerIndex);
-}
-
-void cHdffCmdIf::CmdAvSetDemultiplexerInput(uint8_t DemultiplexerIndex, uint8_t TsInputIndex)
-{
-    HdffCmdAvSetDemultiplexerInput(mOsdDev, DemultiplexerIndex, TsInputIndex);
-}
-
-void cHdffCmdIf::CmdAvSetVideoFormat(uint8_t DecoderIndex, const HdffVideoFormat_t * pVideoFormat)
-{
-    HdffCmdAvSetVideoFormat(mOsdDev, DecoderIndex, pVideoFormat);
-}
-
-void cHdffCmdIf::CmdAvSetVideoOutputMode(uint8_t DecoderIndex, HdffVideoOutputMode_t OutputMode)
-{
-    HdffCmdAvSetVideoOutputMode(mOsdDev, DecoderIndex, OutputMode);
-}
-
-void cHdffCmdIf::CmdAvSetStc(uint8_t DecoderIndex, uint64_t Stc)
-{
-    HdffCmdAvSetStc(mOsdDev, DecoderIndex, Stc);
-}
-
-void cHdffCmdIf::CmdAvFlushBuffer(uint8_t DecoderIndex, bool FlushAudio, bool FlushVideo)
-{
-    HdffCmdAvFlushBuffer(mOsdDev, DecoderIndex, FlushAudio, FlushVideo);
-}
-
-void cHdffCmdIf::CmdAvEnableSync(uint8_t DecoderIndex, bool EnableSync)
-{
-    HdffCmdAvEnableSync(mOsdDev, DecoderIndex, EnableSync, EnableSync);
-}
-
-void cHdffCmdIf::CmdAvSetVideoSpeed(uint8_t DecoderIndex, int32_t Speed)
-{
-    HdffCmdAvSetVideoSpeed(mOsdDev, DecoderIndex, Speed);
-}
-
-void cHdffCmdIf::CmdAvSetAudioSpeed(uint8_t DecoderIndex, int32_t Speed)
-{
-    HdffCmdAvSetAudioSpeed(mOsdDev, DecoderIndex, Speed);
-}
-
-void cHdffCmdIf::CmdAvEnableVideoAfterStop(uint8_t DecoderIndex, bool EnableVideoAfterStop)
-{
-    HdffCmdAvEnableVideoAfterStop(mOsdDev, DecoderIndex, EnableVideoAfterStop);
-}
-
-void cHdffCmdIf::CmdAvSetAudioDelay(int16_t Delay)
-{
-    HdffCmdAvSetAudioDelay(mOsdDev, Delay);
-}
-
-void cHdffCmdIf::CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode)
-{
-    HdffCmdAvSetAudioDownmix(mOsdDev, DownmixMode);
-}
-
-void cHdffCmdIf::CmdAvSetAudioChannel(uint8_t AudioChannel)
-{
-    HdffCmdAvSetAudioChannel(mOsdDev, AudioChannel);
-}
-
-void cHdffCmdIf::CmdAvSetSyncShift(int16_t SyncShift)
-{
-    HdffCmdAvSetSyncShift(mOsdDev, SyncShift);
-}
-
-void cHdffCmdIf::CmdAvMuteAudio(uint8_t DecoderIndex, bool Mute)
-{
-    HdffCmdAvMuteAudio(mOsdDev, DecoderIndex, Mute);
-}
-
-void cHdffCmdIf::CmdOsdConfigure(const HdffOsdConfig_t * pConfig)
-{
-    HdffCmdOsdConfigure(mOsdDev, pConfig);
-}
-
-void cHdffCmdIf::CmdOsdReset(void)
-{
-    HdffCmdOsdReset(mOsdDev);
-}
-
-uint32_t cHdffCmdIf::CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, HdffColorType_t ColorType)
-{
-    //printf("CreateDisplay %d %d %d\n", Width, Height, ColorType);
-    uint32_t newDisplay;
-
-    if (HdffCmdOsdCreateDisplay(mOsdDev, Width, Height, ColorType, &newDisplay) == 0)
-        return newDisplay;
-    LOG_ERROR_STR("Error creating display");
-    return HDFF_INVALID_HANDLE;
-}
-
-void cHdffCmdIf::CmdOsdDeleteDisplay(uint32_t hDisplay)
-{
-    //printf("DeleteDisplay\n");
-    HdffCmdOsdDeleteDisplay(mOsdDev, hDisplay);
-}
-
-void cHdffCmdIf::CmdOsdEnableDisplay(uint32_t hDisplay, bool Enable)
-{
-    //printf("EnableDisplay\n");
-    HdffCmdOsdEnableDisplay(mOsdDev, hDisplay, Enable);
-}
-
-void cHdffCmdIf::CmdOsdSetDisplayOutputRectangle(uint32_t hDisplay, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height)
-{
-    //printf("SetOutputRect %d %d %d %d %d\n", hDisplay, X, Y, Width, Height);
-    HdffCmdOsdSetDisplayOutputRectangle(mOsdDev, hDisplay, X, Y, Width, Height);
-}
-
-void cHdffCmdIf::CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height)
-{
-    //printf("SetClippingArea %d %d %d %d %d %d\n", hDisplay, Enable, X, Y, Width, Height);
-    HdffCmdOsdSetDisplayClippingArea(mOsdDev, hDisplay, Enable, X, Y, Width, Height);
-}
-
-void cHdffCmdIf::CmdOsdRenderDisplay(uint32_t hDisplay)
-{
-    //printf("Render %08X\n", hDisplay);
-    HdffCmdOsdRenderDisplay(mOsdDev, hDisplay);
-}
-
-uint32_t cHdffCmdIf::CmdOsdCreatePalette(HdffColorType_t ColorType, HdffColorFormat_t ColorFormat,
-                                         uint32_t NumColors, const uint32_t * pColors)
-{
-    uint32_t newPalette;
-    int err;
-
-    err = HdffCmdOsdCreatePalette(mOsdDev, ColorType, ColorFormat, NumColors,
-                                  pColors, &newPalette);
-    if (err == 0)
-        return newPalette;
-    LOG_ERROR_STR("Error creating palette");
-    return HDFF_INVALID_HANDLE;
-}
-
-void cHdffCmdIf::CmdOsdDeletePalette(uint32_t hPalette)
-{
-    HdffCmdOsdDeletePalette(mOsdDev, hPalette);
-}
-
-void cHdffCmdIf::CmdOsdSetDisplayPalette(uint32_t hDisplay, uint32_t hPalette)
-{
-    HdffCmdOsdSetDisplayPalette(mOsdDev, hDisplay, hPalette);
-}
-
-void cHdffCmdIf::CmdOsdSetPaletteColors(uint32_t hPalette, HdffColorFormat_t ColorFormat,
-                                        uint8_t StartColor, uint32_t NumColors, const uint32_t * pColors)
-{
-    HdffCmdOsdSetPaletteColors(mOsdDev, hPalette, ColorFormat, StartColor,
-                               NumColors, pColors);
-}
-
-uint32_t cHdffCmdIf::CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t DataSize)
-{
-    //printf("CreateFontFace %d\n", DataSize);
-    uint32_t newFontFace;
-    int err;
-
-    err = HdffCmdOsdCreateFontFace(mOsdDev, pFontData, DataSize, &newFontFace);
-    if (err == 0)
-        return newFontFace;
-    LOG_ERROR_STR("Error creating font face");
-    return HDFF_INVALID_HANDLE;
-}
-
-void cHdffCmdIf::CmdOsdDeleteFontFace(uint32_t hFontFace)
-{
-    //printf("DeleteFontFace %08X\n", hFontFace);
-    HdffCmdOsdDeleteFontFace(mOsdDev, hFontFace);
-}
-
-uint32_t cHdffCmdIf::CmdOsdCreateFont(uint32_t hFontFace, uint32_t Size)
-{
-    //printf("CreateFont %d\n", Size);
-    uint32_t newFont;
-    int err;
-
-    err = HdffCmdOsdCreateFont(mOsdDev, hFontFace, Size, &newFont);
-    if (err == 0)
-        return newFont;
-    LOG_ERROR_STR("Error creating font");
-    return HDFF_INVALID_HANDLE;
-}
-
-void cHdffCmdIf::CmdOsdDeleteFont(uint32_t hFont)
-{
-    //printf("DeleteFont %08X\n", hFont);
-    HdffCmdOsdDeleteFont(mOsdDev, hFont);
-}
-
-void cHdffCmdIf::CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color)
-{
-    //printf("Rect (%d,%d) %d x %d, %08X\n", X, Y, Width, Height, Color);
-    HdffCmdOsdDrawRectangle(mOsdDev, hDisplay, X, Y, Width, Height, Color);
-}
-
-void cHdffCmdIf::CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
-                                 uint32_t Color, uint32_t Flags)
-{
-    //printf("Ellipse (%d,%d) %d x %d, %08X, %d\n", CX, CY, RadiusX, RadiusY, Color, Flags);
-    HdffCmdOsdDrawEllipse(mOsdDev, hDisplay, CX, CY, RadiusX, RadiusY, Color, Flags);
-}
-
-void cHdffCmdIf::CmdOsdDrawSlope(uint32_t hDisplay, int X, int Y, int Width, int Height,
-                                 uint32_t Color, uint32_t Type)
-{
-    //printf("Slope (%d,%d) %d x %d, %08X, %X\n", X, Y, Width, Height, Color, Type);
-    HdffCmdOsdDrawSlope(mOsdDev, hDisplay, X, Y, Width, Height, Color, Type);
-}
-
-void cHdffCmdIf::CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
-{
-    //printf("Text %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);
-    HdffCmdOsdDrawText(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
-}
-
-void cHdffCmdIf::CmdOsdDrawUtf8Text(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
-{
-    //printf("Text(UTF8) %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);
-    HdffCmdOsdDrawUtf8Text(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
-}
-
-void cHdffCmdIf::CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color)
-{
-    //printf("TextW %08X (%d,%d), %08X\n", hFont, X, Y, Color);
-    HdffCmdOsdDrawWideText(mOsdDev, hDisplay, hFont, X, Y, pText, Color);
-}
-
-void cHdffCmdIf::CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
-                                  int BmpWidth, int BmpHeight, int BmpSize,
-                                  HdffColorType_t ColorType, uint32_t hPalette)
-{
-    //printf("Bitmap %08X (%d,%d) %d x %d, %08X\n", hDisplay, X, Y, BmpWidth, BmpHeight, hPalette);
-    HdffCmdOsdDrawBitmap(mOsdDev, hDisplay, X, Y, pBitmap, BmpWidth, BmpHeight,
-                         BmpSize, ColorType, hPalette);
-}
-
-void cHdffCmdIf::CmdOsdSaveRegion(uint32_t hDisplay, int X, int Y, int Width, int Height)
-{
-    HdffCmdOsdSaveRegion(mOsdDev, hDisplay, X, Y, Width, Height);
-}
-
-void cHdffCmdIf::CmdOsdRestoreRegion(uint32_t hDisplay)
-{
-    HdffCmdOsdRestoreRegion(mOsdDev, hDisplay);
-}
-
-void cHdffCmdIf::CmdMuxSetVideoOut(HdffVideoOut_t VideoOut)
-{
-    HdffCmdMuxSetVideoOut(mOsdDev, VideoOut);
-}
-
-void cHdffCmdIf::CmdMuxSetVolume(uint8_t Volume)
-{
-    HdffCmdMuxSetVolume(mOsdDev, Volume);
-}
-
-void cHdffCmdIf::CmdMuxMuteAudio(bool Mute)
-{
-    HdffCmdMuxMuteAudio(mOsdDev, Mute);
-}
-
-void cHdffCmdIf::CmdHdmiSetVideoMode(HdffVideoMode_t VideoMode)
-{
-    //printf("HdmiSetVideoMode %d\n", VideoMode);
-    HdffCmdHdmiSetVideoMode(mOsdDev, VideoMode);
-}
-
-void cHdffCmdIf::CmdHdmiConfigure(const HdffHdmiConfig_t * pConfig)
-{
-    HdffCmdHdmiConfigure(mOsdDev, pConfig);
-}
-
-void cHdffCmdIf::CmdHdmiSendCecCommand(HdffCecCommand_t Command)
-{
-    HdffCmdHdmiSendCecCommand(mOsdDev, Command);
-}
-
-void cHdffCmdIf::CmdRemoteSetProtocol(HdffRemoteProtocol_t Protocol)
-{
-    //printf("%s %d\n", __func__, Protocol);
-    HdffCmdRemoteSetProtocol(mOsdDev, Protocol);
-}
-
-void cHdffCmdIf::CmdRemoteSetAddressFilter(bool Enable, uint32_t Address)
-{
-    //printf("%s %d %d\n", __func__, Enable, Address);
-    HdffCmdRemoteSetAddressFilter(mOsdDev, Enable, Address);
-}
-
-} // end of namespace
diff --git a/PLUGINS/src/dvbhddevice/hdffcmd.h b/PLUGINS/src/dvbhddevice/hdffcmd.h
deleted file mode 100644
index 891bc7e8c..000000000
--- a/PLUGINS/src/dvbhddevice/hdffcmd.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * hdffcmd.h: TODO(short description)
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#ifndef _HDFF_CMD_H_
-#define _HDFF_CMD_H_
-
-#include "libhdffcmd/hdffcmd.h"
-
-namespace HDFF
-{
-
-class cHdffCmdIf
-{
-private:
-    int mOsdDev;
-
-public:
-    cHdffCmdIf(int OsdDev);
-    ~cHdffCmdIf(void);
-
-    uint32_t CmdGetFirmwareVersion(char * pString, uint32_t MaxLength);
-    uint32_t CmdGetInterfaceVersion(char * pString, uint32_t MaxLength);
-    uint32_t CmdGetCopyrights(uint8_t Index, char * pString, uint32_t MaxLength);
-
-    void CmdAvSetPlayMode(uint8_t PlayMode, bool Realtime);
-    void CmdAvSetVideoPid(uint8_t DecoderIndex, uint16_t VideoPid, HdffVideoStreamType_t StreamType, bool PlaybackMode = false);
-    void CmdAvSetAudioPid(uint8_t DecoderIndex, uint16_t AudioPid, HdffAudioStreamType_t StreamType, HdffAvContainerType_t ContainerType = HDFF_AV_CONTAINER_PES);
-    void CmdAvSetPcrPid(uint8_t DecoderIndex, uint16_t PcrPid);
-    void CmdAvSetTeletextPid(uint8_t DecoderIndex, uint16_t TeletextPid);
-    void CmdAvSetVideoWindow(uint8_t DecoderIndex, bool Enable, uint16_t X, uint16_t Y, uint16_t Width, uint16_t Height);
-    void CmdAvShowStillImage(uint8_t DecoderIndex, const uint8_t * pStillImage, int Size, HdffVideoStreamType_t StreamType);
-    void CmdAvSetDecoderInput(uint8_t DecoderIndex, uint8_t DemultiplexerIndex);
-    void CmdAvSetDemultiplexerInput(uint8_t DemultiplexerIndex, uint8_t TsInputIndex);
-    void CmdAvSetVideoFormat(uint8_t DecoderIndex, const HdffVideoFormat_t * pVideoFormat);
-    void CmdAvSetVideoOutputMode(uint8_t DecoderIndex, HdffVideoOutputMode_t OutputMode);
-    void CmdAvSetStc(uint8_t DecoderIndex, uint64_t Stc);
-    void CmdAvFlushBuffer(uint8_t DecoderIndex, bool FlushAudio, bool FlushVideo);
-    void CmdAvEnableSync(uint8_t DecoderIndex, bool EnableSync);
-    void CmdAvSetVideoSpeed(uint8_t DecoderIndex, int32_t Speed);
-    void CmdAvSetAudioSpeed(uint8_t DecoderIndex, int32_t Speed);
-    void CmdAvEnableVideoAfterStop(uint8_t DecoderIndex, bool EnableVideoAfterStop);
-    void CmdAvSetAudioDelay(int16_t Delay);
-    void CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode);
-    void CmdAvSetAudioChannel(uint8_t AudioChannel);
-    void CmdAvSetSyncShift(int16_t SyncShift);
-    void CmdAvMuteAudio(uint8_t DecoderIndex, bool Mute);
-
-    void CmdOsdConfigure(const HdffOsdConfig_t * pConfig);
-    void CmdOsdReset(void);
-
-    uint32_t CmdOsdCreateDisplay(uint32_t Width, uint32_t Height, HdffColorType_t ColorType);
-    void CmdOsdDeleteDisplay(uint32_t hDisplay);
-    void CmdOsdEnableDisplay(uint32_t hDisplay, bool Enable);
-    void CmdOsdSetDisplayOutputRectangle(uint32_t hDisplay, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height);
-    void CmdOsdSetDisplayClippingArea(uint32_t hDisplay, bool Enable, uint32_t X, uint32_t Y, uint32_t Width, uint32_t Height);
-    void CmdOsdRenderDisplay(uint32_t hDisplay);
-
-    uint32_t CmdOsdCreatePalette(HdffColorType_t ColorType, HdffColorFormat_t ColorFormat,
-                                 uint32_t NumColors, const uint32_t * pColors);
-    void CmdOsdDeletePalette(uint32_t hPalette);
-    void CmdOsdSetDisplayPalette(uint32_t hDisplay, uint32_t hPalette);
-    void CmdOsdSetPaletteColors(uint32_t hPalette, HdffColorFormat_t ColorFormat,
-                                uint8_t StartColor, uint32_t NumColors, const uint32_t * pColors);
-
-    uint32_t CmdOsdCreateFontFace(const uint8_t * pFontData, uint32_t DataSize);
-    void CmdOsdDeleteFontFace(uint32_t hFontFace);
-    uint32_t CmdOsdCreateFont(uint32_t hFontFace, uint32_t Size);
-    void CmdOsdDeleteFont(uint32_t hFont);
-
-    void CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color);
-    void CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
-                           uint32_t Color, uint32_t Flags);
-    void CmdOsdDrawSlope(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color, uint32_t Type);
-    void CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
-    void CmdOsdDrawUtf8Text(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
-    void CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color);
-    void CmdOsdDrawBitmap(uint32_t hDisplay, int X, int Y, const uint8_t * pBitmap,
-                          int BmpWidth, int BmpHeight, int BmpSize,
-                          HdffColorType_t ColorType, uint32_t hPalette);
-    void CmdOsdSaveRegion(uint32_t hDisplay, int X, int Y, int Width, int Height);
-    void CmdOsdRestoreRegion(uint32_t hDisplay);
-
-    void CmdMuxSetVideoOut(HdffVideoOut_t VideoOut);
-    void CmdMuxSetVolume(uint8_t Volume);
-    void CmdMuxMuteAudio(bool Mute);
-
-    void CmdHdmiSetVideoMode(HdffVideoMode_t VideoMode);
-    void CmdHdmiConfigure(const HdffHdmiConfig_t * pConfig);
-    void CmdHdmiSendCecCommand(HdffCecCommand_t Command);
-
-    void CmdRemoteSetProtocol(HdffRemoteProtocol_t Protocol);
-    void CmdRemoteSetAddressFilter(bool Enable, uint32_t Address);
-};
-
-} // end of namespace
-
-#endif
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.c b/PLUGINS/src/dvbhddevice/hdffosd.c
deleted file mode 100644
index 3ce28bfa2..000000000
--- a/PLUGINS/src/dvbhddevice/hdffosd.c
+++ /dev/null
@@ -1,836 +0,0 @@
-/*
- * hdffosd.c: Implementation of the DVB HD Full Featured On Screen Display
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#include "hdffosd.h"
-#include <linux/dvb/osd.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include "hdffcmd.h"
-#include "setup.h"
-
-#define MAX_NUM_FONTFACES   8
-#define MAX_NUM_FONTS       8
-#define MAX_BITMAP_SIZE     (1024*1024)
-
-typedef struct _tFontFace
-{
-    cString Name;
-    uint32_t Handle;
-} tFontFace;
-
-typedef struct _tFont
-{
-    uint32_t hFontFace;
-    int Size;
-    uint32_t Handle;
-} tFont;
-
-class cHdffOsd : public cOsd
-{
-private:
-    HDFF::cHdffCmdIf * mHdffCmdIf;
-    int mLeft;
-    int mTop;
-    int mDispWidth;
-    int mDispHeight;
-    bool mChanged;
-    uint32_t mDisplay;
-    tFontFace mFontFaces[MAX_NUM_FONTFACES];
-    tFont mFonts[MAX_NUM_FONTS];
-    uint32_t mBitmapPalette;
-    uint32_t mBitmapColors[256];
-
-    bool mSupportsUtf8Text;
-
-protected:
-    virtual void SetActive(bool On);
-public:
-    cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level);
-    virtual ~cHdffOsd();
-    virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-    virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
-    virtual void SaveRegion(int x1, int y1, int x2, int y2);
-    virtual void RestoreRegion(void);
-    virtual void DrawPixel(int x, int y, tColor Color);
-    virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false, bool Overlay = false);
-    virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
-    virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
-    virtual void DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants = 0);
-    virtual void DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type);
-    virtual void Flush(void);
-};
-
-cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
-:   cOsd(Left, Top, Level)
-{
-    double pixelAspect;
-    HdffOsdConfig_t config;
-
-    //printf("cHdffOsd %d, %d, %d\n", Left, Top, Level);
-    mHdffCmdIf = pHdffCmdIf;
-    mLeft = Left;
-    mTop = Top;
-    mChanged = false;
-    mBitmapPalette = HDFF_INVALID_HANDLE;
-
-    mSupportsUtf8Text = false;
-    if (mHdffCmdIf->CmdGetFirmwareVersion(NULL, 0) >= 0x309)
-        mSupportsUtf8Text = true;
-
-    memset(&config, 0, sizeof(config));
-    config.FontKerning = true;
-    config.FontAntialiasing = Setup.AntiAlias ? true : false;
-    mHdffCmdIf->CmdOsdConfigure(&config);
-
-    gHdffSetup.GetOsdSize(mDispWidth, mDispHeight, pixelAspect);
-    mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF_COLOR_TYPE_ARGB8888);
-    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, HDFF_SIZE_FULL_SCREEN, HDFF_SIZE_FULL_SCREEN);
-    for (int i = 0; i < MAX_NUM_FONTFACES; i++)
-    {
-        mFontFaces[i].Name = "";
-        mFontFaces[i].Handle = HDFF_INVALID_HANDLE;
-    }
-    for (int i = 0; i < MAX_NUM_FONTS; i++)
-    {
-        mFonts[i].hFontFace = HDFF_INVALID_HANDLE;
-        mFonts[i].Size = 0;
-        mFonts[i].Handle = HDFF_INVALID_HANDLE;
-    }
-}
-
-cHdffOsd::~cHdffOsd()
-{
-    //printf("~cHdffOsd %d %d\n", mLeft, mTop);
-    if (Active()) {
-        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-    }
-    SetActive(false);
-
-    for (int i = 0; i < MAX_NUM_FONTS; i++)
-    {
-        if (mFonts[i].Handle == HDFF_INVALID_HANDLE)
-            break;
-        mHdffCmdIf->CmdOsdDeleteFont(mFonts[i].Handle);
-    }
-    for (int i = 0; i < MAX_NUM_FONTFACES; i++)
-    {
-        if (mFontFaces[i].Handle == HDFF_INVALID_HANDLE)
-            break;
-        mHdffCmdIf->CmdOsdDeleteFontFace(mFontFaces[i].Handle);
-    }
-
-    if (mBitmapPalette != HDFF_INVALID_HANDLE)
-        mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
-    mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
-}
-
-eOsdError cHdffOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
-{
-    eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
-    if (Result == oeOk)
-    {
-        for (int i = 0; i < NumAreas; i++)
-        {
-            if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8)
-                return oeBppNotSupported;
-        }
-    }
-    return Result;
-}
-
-eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
-{
-    eOsdError error;
-    cBitmap * bitmap;
-
-    for (int i = 0; i < NumAreas; i++)
-    {
-        //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
-    }
-    if (Active() && mDisplay != HDFF_INVALID_HANDLE)
-    {
-        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-    }
-    error = cOsd::SetAreas(Areas, NumAreas);
-
-    for (int i = 0; (bitmap = GetBitmap(i)) != NULL; i++)
-    {
-        bitmap->Clean();
-    }
-
-    return error;
-}
-
-void cHdffOsd::SetActive(bool On)
-{
-    if (On != Active())
-    {
-        cOsd::SetActive(On);
-        if (On)
-        {
-            if (GetBitmap(0)) // only flush here if there are already bitmaps
-                Flush();
-        }
-        else if (mDisplay != HDFF_INVALID_HANDLE)
-        {
-            mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-            mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-        }
-    }
-}
-
-void cHdffOsd::SaveRegion(int x1, int y1, int x2, int y2)
-{
-    mHdffCmdIf->CmdOsdSaveRegion(mDisplay, mLeft + x1, mTop + y1, x2 - x1 + 1, y2 - y1 + 1);
-    mChanged = true;
-}
-
-void cHdffOsd::RestoreRegion(void)
-{
-    mHdffCmdIf->CmdOsdRestoreRegion(mDisplay);
-    mChanged = true;
-}
-
-void cHdffOsd::DrawPixel(int x, int y, tColor Color)
-{
-    //printf("DrawPixel\n");
-}
-
-void cHdffOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg, bool ReplacePalette, bool Overlay)
-{
-    //printf("DrawBitmap %d %d %d x %d\n", x, y, Bitmap.Width(), Bitmap.Height());
-    int i;
-    int numColors;
-    const tColor * colors = Bitmap.Colors(numColors);
-
-    for (i = 0; i < numColors; i++)
-    {
-        mBitmapColors[i] = colors[i];
-        if (ColorFg || ColorBg)
-        {
-            if (i == 0)
-                mBitmapColors[i] = ColorBg;
-            else if (i == 1)
-                mBitmapColors[i] = ColorFg;
-        }
-    }
-    if (mBitmapPalette == HDFF_INVALID_HANDLE)
-    {
-        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF_COLOR_TYPE_CLUT8,
-                HDFF_COLOR_FORMAT_ARGB, numColors, mBitmapColors);
-    }
-    else
-    {
-        mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
-                HDFF_COLOR_FORMAT_ARGB, 0, numColors, mBitmapColors);
-    }
-    int width = Bitmap.Width();
-    int height = Bitmap.Height();
-    int chunk = MAX_BITMAP_SIZE / width;
-    if (chunk > height)
-        chunk = height;
-    for (int yc = 0; yc < height; yc += chunk)
-    {
-        int hc = chunk;
-        if (yc + hc > height)
-            hc = height - yc;
-        mHdffCmdIf->CmdOsdDrawBitmap(mDisplay, mLeft + x, mTop + y + yc,
-            (uint8_t *) Bitmap.Data(0, yc), width, hc,
-            width * hc, HDFF_COLOR_TYPE_CLUT8, mBitmapPalette);
-    }
-    mChanged = true;
-}
-
-void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width, int Height, int Alignment)
-{
-    int w = Font->Width(s);
-    int h = Font->Height();
-    int cw = Width ? Width : w;
-    int ch = Height ? Height : h;
-    int i;
-    int size = Font->Size();
-    tFontFace * pFontFace;
-    tFont * pFont;
-
-    if (ColorBg != clrTransparent)
-        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, mLeft + x, mTop + y, cw, ch, ColorBg);
-
-    if (s == NULL)
-        return;
-
-    pFontFace = NULL;
-    for (i = 0; i < MAX_NUM_FONTFACES; i++)
-    {
-        if (mFontFaces[i].Handle == HDFF_INVALID_HANDLE)
-            break;
-
-        if (strcmp(mFontFaces[i].Name, Font->FontName()) == 0)
-        {
-            pFontFace = &mFontFaces[i];
-            break;
-        }
-    }
-    if (pFontFace == NULL)
-    {
-        if (i < MAX_NUM_FONTFACES)
-        {
-            cString fontFileName = Font->FontName();
-            FILE * fp = fopen(fontFileName, "rb");
-            if (fp)
-            {
-                fseek(fp, 0, SEEK_END);
-                long fileSize = ftell(fp);
-                fseek(fp, 0, SEEK_SET);
-                if (fileSize > 0)
-                {
-                    uint8_t * buffer = new uint8_t[fileSize];
-                    if (buffer)
-                    {
-                        if (fread(buffer, fileSize, 1, fp) == 1)
-                        {
-                            mFontFaces[i].Handle = mHdffCmdIf->CmdOsdCreateFontFace(buffer, fileSize);
-                            if (mFontFaces[i].Handle != HDFF_INVALID_HANDLE)
-                            {
-                                mFontFaces[i].Name = Font->FontName();
-                                pFontFace = &mFontFaces[i];
-                            }
-                        }
-                        delete[] buffer;
-                    }
-                }
-                fclose(fp);
-            }
-        }
-    }
-    if (pFontFace == NULL)
-        return;
-
-    pFont = NULL;
-    for (i = 0; i < MAX_NUM_FONTS; i++)
-    {
-        if (mFonts[i].Handle == HDFF_INVALID_HANDLE)
-            break;
-
-        if (mFonts[i].hFontFace == pFontFace->Handle
-          && mFonts[i].Size == size)
-        {
-            pFont = &mFonts[i];
-            break;
-        }
-    }
-    if (pFont == NULL)
-    {
-        if (i < MAX_NUM_FONTS)
-        {
-            mFonts[i].Handle = mHdffCmdIf->CmdOsdCreateFont(pFontFace->Handle, size);
-            if (mFonts[i].Handle != HDFF_INVALID_HANDLE)
-            {
-                mFonts[i].hFontFace = pFontFace->Handle;
-                mFonts[i].Size = size;
-                pFont = &mFonts[i];
-            }
-        }
-    }
-    if (pFont == NULL)
-        return;
-
-    mHdffCmdIf->CmdOsdSetDisplayClippingArea(mDisplay, true, mLeft + x, mTop + y, cw, ch);
-
-    if (Width || Height)
-    {
-        if (Width)
-        {
-            if ((Alignment & taLeft) != 0)
-            {
-#if (APIVERSNUM >= 10728)
-                if ((Alignment & taBorder) != 0)
-                    x += max(h / TEXT_ALIGN_BORDER, 1);
-#endif
-            }
-            else if ((Alignment & taRight) != 0)
-            {
-                if (w < Width)
-                    x += Width - w;
-#if (APIVERSNUM >= 10728)
-                if ((Alignment & taBorder) != 0)
-                    x -= max(h / TEXT_ALIGN_BORDER, 1);
-#endif
-            }
-            else
-            { // taCentered
-                if (w < Width)
-                    x += (Width - w) / 2;
-            }
-        }
-        if (Height)
-        {
-            if ((Alignment & taTop) != 0)
-                ;
-            else if ((Alignment & taBottom) != 0)
-            {
-                if (h < Height)
-                    y += Height - h;
-            }
-            else
-            { // taCentered
-                if (h < Height)
-                    y += (Height - h) / 2;
-            }
-        }
-    }
-#if 0
-    if (mSupportsUtf8Text)
-    {
-        mHdffCmdIf->CmdOsdDrawUtf8Text(mDisplay, pFont->Handle, x + mLeft, y + mTop + h, s, ColorFg);
-    }
-    else
-#endif
-    {
-        uint16_t tmp[1000];
-        uint16_t len = 0;
-        while (*s && (len < (sizeof(tmp) - 1)))
-        {
-            int sl = Utf8CharLen(s);
-            uint sym = Utf8CharGet(s, sl);
-            s += sl;
-            tmp[len] = sym;
-            len++;
-        }
-        tmp[len] = 0;
-        mHdffCmdIf->CmdOsdDrawTextW(mDisplay, pFont->Handle, x + mLeft, y + mTop + h, tmp, ColorFg);
-    }
-    mHdffCmdIf->CmdOsdSetDisplayClippingArea(mDisplay, false, 0, 0, 0, 0);
-    mChanged = true;
-}
-
-void cHdffOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
-{
-    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, mLeft + x1, mTop + y1, x2 - x1 + 1, y2 - y1 + 1, Color);
-    mChanged = true;
-}
-
-void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
-{
-    uint32_t flags;
-    int cx;
-    int cy;
-    int rx;
-    int ry;
-
-    switch (abs(Quadrants))
-    {
-        case 1:
-            if (Quadrants > 0)
-                flags = HDFF_DRAW_QUARTER_TOP_RIGHT;
-            else
-                flags = HDFF_DRAW_QUARTER_TOP_RIGHT_INVERTED;
-            cx = x1;
-            cy = y2;
-            rx = x2 - x1;
-            ry = y2 - y1;
-            break;
-        case 2:
-            if (Quadrants > 0)
-                flags = HDFF_DRAW_QUARTER_TOP_LEFT;
-            else
-                flags = HDFF_DRAW_QUARTER_TOP_LEFT_INVERTED;
-            cx = x2;
-            cy = y2;
-            rx = x2 - x1;
-            ry = y2 - y1;
-            break;
-        case 3:
-            if (Quadrants > 0)
-                flags = HDFF_DRAW_QUARTER_BOTTOM_LEFT;
-            else
-                flags = HDFF_DRAW_QUARTER_BOTTOM_LEFT_INVERTED;
-            cx = x2;
-            cy = y1;
-            rx = x2 - x1;
-            ry = y2 - y1;
-            break;
-        case 4:
-            if (Quadrants > 0)
-                flags = HDFF_DRAW_QUARTER_BOTTOM_RIGHT;
-            else
-                flags = HDFF_DRAW_QUARTER_BOTTOM_RIGHT_INVERTED;
-            cx = x1;
-            cy = y1;
-            rx = x2 - x1;
-            ry = y2 - y1;
-            break;
-        case 5:
-            flags = HDFF_DRAW_HALF_RIGHT;
-            cx = x1;
-            cy = (y1 + y2) / 2;
-            rx = x2 - x1;
-            ry = (y2 - y1) / 2;
-            break;
-        case 6:
-            flags = HDFF_DRAW_HALF_TOP;
-            cx = (x1 + x2) / 2;
-            cy = y2;
-            rx = (x2 - x1) / 2;
-            ry = y2 - y1;
-            break;
-        case 7:
-            flags = HDFF_DRAW_HALF_LEFT;
-            cx = x2;
-            cy = (y1 + y2) / 2;
-            rx = x2 - x1;
-            ry = (y2 - y1) / 2;
-            break;
-        case 8:
-            flags = HDFF_DRAW_HALF_BOTTOM;
-            cx = (x1 + x2) / 2;
-            cy = y1;
-            rx = (x2 - x1) / 2;
-            ry = y2 - y1;
-            break;
-        default:
-            flags = HDFF_DRAW_FULL;
-            cx = (x1 + x2) / 2;
-            cy = (y1 + y2) / 2;
-            rx = (x2 - x1) / 2;
-            ry = (y2 - y1) / 2;
-            break;
-    }
-    mHdffCmdIf->CmdOsdDrawEllipse(mDisplay, mLeft + cx, mTop + cy, rx, ry, Color, flags);
-    mChanged = true;
-}
-
-void cHdffOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
-{
-    //printf("DrawSlope\n");
-    mHdffCmdIf->CmdOsdDrawSlope(mDisplay, mLeft + x1, mTop + y1,
-                                x2 - x1 + 1, y2 - y1 + 1, Color, Type);
-    mChanged = true;
-}
-
-void cHdffOsd::Flush(void)
-{
-    if (!Active())
-        return;
-
-    //printf("Flush\n");
-    cBitmap * Bitmap;
-
-    for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++)
-    {
-        int x1;
-        int y1;
-        int x2;
-        int y2;
-
-        if (Bitmap->Dirty(x1, y1, x2, y2))
-        {
-            //printf("dirty %d %d, %d %d\n", x1, y1, x2, y2);
-            DrawBitmap(0, 0, *Bitmap);
-            Bitmap->Clean();
-        }
-    }
-
-    if (!mChanged)
-        return;
-
-    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-
-    mChanged = false;
-}
-
-
-class cHdffOsdRaw : public cOsd
-{
-private:
-    HDFF::cHdffCmdIf * mHdffCmdIf;
-    int mDispWidth;
-    int mDispHeight;
-    bool refresh;
-    uint32_t mDisplay;
-    uint32_t mBitmapPalette;
-    uint32_t mBitmapColors[256];
-
-protected:
-    virtual void SetActive(bool On);
-public:
-    cHdffOsdRaw(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level);
-    virtual ~cHdffOsdRaw();
-    virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-    virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
-    virtual void Flush(void);
-};
-
-cHdffOsdRaw::cHdffOsdRaw(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
-:   cOsd(Left, Top, Level)
-{
-    double pixelAspect;
-
-    //printf("cHdffOsdRaw %d, %d, %d\n", Left, Top, Level);
-    mHdffCmdIf = pHdffCmdIf;
-    refresh = true;
-    mBitmapPalette = HDFF_INVALID_HANDLE;
-    mDisplay = HDFF_INVALID_HANDLE;
-
-    gHdffSetup.GetOsdSize(mDispWidth, mDispHeight, pixelAspect);
-}
-
-cHdffOsdRaw::~cHdffOsdRaw()
-{
-    //printf("~cHdffOsdRaw %d %d\n", Left(), Top());
-    if (mDisplay != HDFF_INVALID_HANDLE)
-    {
-        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-    }
-    if (mBitmapPalette != HDFF_INVALID_HANDLE)
-        mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
-    mBitmapPalette = HDFF_INVALID_HANDLE;
-    if (mDisplay != HDFF_INVALID_HANDLE)
-       mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
-    mDisplay = HDFF_INVALID_HANDLE;
-}
-
-void cHdffOsdRaw::SetActive(bool On)
-{
-    if (On != Active())
-    {
-        cOsd::SetActive(On);
-        if (On)
-        {
-            if (mDisplay == HDFF_INVALID_HANDLE)
-            {
-                mDisplay = mHdffCmdIf->CmdOsdCreateDisplay(mDispWidth, mDispHeight, HDFF_COLOR_TYPE_ARGB8888);
-                if (mDisplay != HDFF_INVALID_HANDLE)
-                    mHdffCmdIf->CmdOsdSetDisplayOutputRectangle(mDisplay, 0, 0, HDFF_SIZE_FULL_SCREEN, HDFF_SIZE_FULL_SCREEN);
-            }
-            refresh = true;
-            if (GetBitmap(0)) // only flush here if there are already bitmaps
-                Flush();
-        }
-        else
-        {
-            if (mDisplay != HDFF_INVALID_HANDLE)
-            {
-                mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-                mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-            }
-            if (mBitmapPalette != HDFF_INVALID_HANDLE)
-                mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
-            mBitmapPalette = HDFF_INVALID_HANDLE;
-            if (mDisplay != HDFF_INVALID_HANDLE)
-                mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
-            mDisplay = HDFF_INVALID_HANDLE;
-        }
-    }
-}
-
-eOsdError cHdffOsdRaw::CanHandleAreas(const tArea *Areas, int NumAreas)
-{
-    eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
-    if (Result == oeOk)
-    {
-        for (int i = 0; i < NumAreas; i++)
-        {
-            if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8
-                && (Areas[i].bpp != 32 || !gHdffSetup.TrueColorOsd))
-                return oeBppNotSupported;
-        }
-    }
-    return Result;
-}
-
-eOsdError cHdffOsdRaw::SetAreas(const tArea *Areas, int NumAreas)
-{
-    for (int i = 0; i < NumAreas; i++)
-    {
-        //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
-    }
-    if (mDisplay != HDFF_INVALID_HANDLE)
-    {
-        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-        refresh = true;
-    }
-    return cOsd::SetAreas(Areas, NumAreas);
-}
-
-void cHdffOsdRaw::Flush(void)
-{
-    if (!Active() || (mDisplay == HDFF_INVALID_HANDLE))
-        return;
-#ifdef MEASURE_OSD_TIME
-    struct timeval start;
-    struct timeval end;
-    struct timezone timeZone;
-    gettimeofday(&start, &timeZone);
-#endif
-
-    bool render = false;
-    if (IsTrueColor())
-    {
-        uint8_t * buffer = 0;
-        if (gHdffSetup.TrueColorFormat != 0)
-        {
-            buffer = new uint8_t[MAX_BITMAP_SIZE];
-            if (!buffer)
-                return;
-        }
-        LOCK_PIXMAPS;
-        while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()))
-        {
-            int w = pm->ViewPort().Width();
-            int h = pm->ViewPort().Height();
-            int d = w * sizeof(tColor);
-            int Chunk = MAX_BITMAP_SIZE / w / sizeof(tColor);
-            if (Chunk > h)
-                Chunk = h;
-            for (int y = 0; y < h; y += Chunk)
-            {
-                int hc = Chunk;
-                if (y + hc > h)
-                    hc = h - y;
-                if (gHdffSetup.TrueColorFormat == 0) // ARGB8888 (32 bit)
-                {
-                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
-                        Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
-                        pm->Data() + y * d, w, hc, hc * d,
-                        HDFF_COLOR_TYPE_ARGB8888, HDFF_INVALID_HANDLE);
-                }
-                else if (gHdffSetup.TrueColorFormat == 1) // ARGB8565 (24 bit)
-                {
-                    const tColor * pixmapData = (const tColor *) (pm->Data() + y * d);
-                    uint8_t * bitmapData = buffer;
-                    for (int i = 0; i < hc * w; i++)
-                    {
-                        bitmapData[2] =  (pixmapData[i] & 0xFF000000) >> 24;
-                        bitmapData[1] = ((pixmapData[i] & 0x00F80000) >> 16)
-                                      | ((pixmapData[i] & 0x0000E000) >> 13);
-                        bitmapData[0] = ((pixmapData[i] & 0x00001C00) >> 5)
-                                      | ((pixmapData[i] & 0x000000F8) >> 3);
-                        bitmapData += 3;
-                    }
-                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
-                        Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
-                        buffer, w, hc, hc * w * 3,
-                        HDFF_COLOR_TYPE_ARGB8565, HDFF_INVALID_HANDLE);
-                }
-                else if (gHdffSetup.TrueColorFormat == 2) // ARGB4444 (16 bit)
-                {
-                    const tColor * pixmapData = (const tColor *) (pm->Data() + y * d);
-                    uint16_t * bitmapData = (uint16_t *) buffer;
-                    for (int i = 0; i < hc * w; i++)
-                    {
-                        bitmapData[i] = ((pixmapData[i] & 0xF0000000) >> 16)
-                                      | ((pixmapData[i] & 0x00F00000) >> 12)
-                                      | ((pixmapData[i] & 0x0000F000) >> 8)
-                                      | ((pixmapData[i] & 0x000000F0) >> 4);
-                    }
-                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
-                        Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
-                        buffer, w, hc, hc * w * 2,
-                        HDFF_COLOR_TYPE_ARGB4444, HDFF_INVALID_HANDLE);
-                }
-            }
-            DestroyPixmap(pm);
-            render = true;
-        }
-        if (buffer)
-            delete[] buffer;
-    }
-    else
-    {
-        uint8_t * buffer = new uint8_t[MAX_BITMAP_SIZE];
-        if (!buffer)
-            return;
-        cBitmap * bitmap;
-        for (int i = 0; (bitmap = GetBitmap(i)) != NULL; i++)
-        {
-            int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-            if (refresh || bitmap->Dirty(x1, y1, x2, y2))
-            {
-                if (refresh)
-                {
-                    x2 = bitmap->Width() - 1;
-                    y2 = bitmap->Height() - 1;
-                }
-                // commit colors:
-                int numColors;
-                const tColor * colors = bitmap->Colors(numColors);
-                if (colors)
-                {
-                    for (int c = 0; c < numColors; c++)
-                        mBitmapColors[c] = colors[c];
-                    if (mBitmapPalette == HDFF_INVALID_HANDLE)
-                    {
-                        mBitmapPalette = mHdffCmdIf->CmdOsdCreatePalette(HDFF_COLOR_TYPE_CLUT8,
-                            HDFF_COLOR_FORMAT_ARGB, numColors, mBitmapColors);
-                    }
-                    else
-                    {
-                        mHdffCmdIf->CmdOsdSetPaletteColors(mBitmapPalette,
-                            HDFF_COLOR_FORMAT_ARGB, 0, numColors, mBitmapColors);
-                    }
-                }
-                // commit modified data:
-                int width = x2 - x1 + 1;
-                int height = y2 - y1 + 1;
-                int chunk = MAX_BITMAP_SIZE / width;
-                if (chunk > height)
-                    chunk = height;
-                for (int y = 0; y < height; y += chunk)
-                {
-                    int hc = chunk;
-                    if (y + hc > height)
-                        hc = height - y;
-                    for (int r = 0; r < hc; r++)
-                        memcpy(buffer + r * width, bitmap->Data(x1, y1 + y + r), width);
-                    mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
-                        Left() + bitmap->X0() + x1, Top() + bitmap->Y0() + y1 + y,
-                        buffer, width, hc, hc * width,
-                        HDFF_COLOR_TYPE_CLUT8, mBitmapPalette);
-                }
-                render = true;
-            }
-            bitmap->Clean();
-        }
-        delete[] buffer;
-    }
-    if (render)
-    {
-        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
-#ifdef MEASURE_OSD_TIME
-        gettimeofday(&end, &timeZone);
-        int timeNeeded = end.tv_usec - start.tv_usec;
-        timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
-        printf("time = %d\n", timeNeeded);
-#endif
-    }
-    refresh = false;
-}
-
-
-
-
-cHdffOsdProvider::cHdffOsdProvider(HDFF::cHdffCmdIf * HdffCmdIf)
-{
-    mHdffCmdIf = HdffCmdIf;
-}
-
-cOsd *cHdffOsdProvider::CreateOsd(int Left, int Top, uint Level)
-{
-    //printf("CreateOsd %d %d %d\n", Left, Top, Level);
-    if (gHdffSetup.HighLevelOsd)
-        return new cHdffOsd(Left, Top, mHdffCmdIf, Level);
-    else
-        return new cHdffOsdRaw(Left, Top, mHdffCmdIf, Level);
-}
-
-bool cHdffOsdProvider::ProvidesTrueColor(void)
-{
-    return gHdffSetup.TrueColorOsd && !gHdffSetup.HighLevelOsd;
-}
diff --git a/PLUGINS/src/dvbhddevice/hdffosd.h b/PLUGINS/src/dvbhddevice/hdffosd.h
deleted file mode 100644
index c8eaf4605..000000000
--- a/PLUGINS/src/dvbhddevice/hdffosd.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * hdffosd.h: Implementation of the DVB HD Full Featured On Screen Display
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#ifndef _HDFF_OSD_H_
-#define _HDFF_OSD_H_
-
-#include <vdr/osd.h>
-
-#include "hdffcmd.h"
-
-class cHdffOsdProvider : public cOsdProvider
-{
-private:
-    HDFF::cHdffCmdIf * mHdffCmdIf;
-public:
-    cHdffOsdProvider(HDFF::cHdffCmdIf * pHdffCmdIf);
-    virtual cOsd *CreateOsd(int Left, int Top, uint Level);
-    virtual bool ProvidesTrueColor(void);
-};
-
-#endif
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile b/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
deleted file mode 100644
index 216cdbad8..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Makefile for the HDFF firmware command interface library
-#
-
-VERSION = 0.1.0
-
-INSTALL_PATH         ?= /usr/local
-INSTALL_LIB_PATH     ?= $(INSTALL_PATH)/lib
-INSTALL_INCLUDE_PATH ?= $(INSTALL_PATH)/include
-
-LIB_NAME = libhdffcmd
-
-LIB_OBJS = bitbuffer.o hdffcmd_av.o hdffcmd_base.o hdffcmd_generic.o \
-           hdffcmd_hdmi.o hdffcmd_mux.o hdffcmd_osd.o hdffcmd_remote.o
-
-LIB_HEADERS = hdffcmd.h hdffcmd_av.h hdffcmd_generic.h hdffcmd_hdmi.h \
-              hdffcmd_mux.h hdffcmd_osd.h hdffcmd_remote.h
-
-LIB_STATIC = $(LIB_NAME).a
-LIB_SHARED = $(LIB_NAME)-$(VERSION).so
-
-CC      ?= gcc
-CFLAGS  ?= -g -O2 -fPIC -Wall
-AR      ?= ar
-ARFLAGS ?= r
-
-### Implicit rules:
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $<
-
-### Dependencies:
-
-MAKEDEP = $(CC) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(LIB_OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Targets:
-
-all: $(LIB_STATIC) $(LIB_SHARED)
-
-$(LIB_STATIC): $(LIB_OBJS)
-	$(AR) $(ARFLAGS) $(LIB_STATIC) $(LIB_OBJS)
-
-$(LIB_SHARED): $(LIB_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $(LIB_SHARED) $(LIB_OBJS)
-	ln -sf $(LIB_SHARED) $(LIB_NAME).so
-
-clean:
-	@-rm -f $(LIB_OBJS) $(DEPFILE) $(LIB_STATIC) $(LIB_NAME)*.so
-
-install: $(LIB_SHARED)
-	chown root $(LIB_SHARED)
-	chgrp root $(LIB_SHARED)
-	chmod 0755 $(LIB_SHARED)
-	cp -f $(LIB_SHARED) $(INSTALL_LIB_PATH)/
-	ln -sf $(LIB_SHARED) $(INSTALL_LIB_PATH)/$(LIB_NAME).so
-	mkdir -p  $(INSTALL_INCLUDE_PATH)/libhdffcmd
-	list='$(LIB_HEADERS)'; \
-	for headerfile in $$list; do \
-	  cp -f $$headerfile $(INSTALL_INCLUDE_PATH)/libhdffcmd/ ; \
-	  chown root $(INSTALL_INCLUDE_PATH)/libhdffcmd/$$headerfile ; \
-	  chgrp root $(INSTALL_INCLUDE_PATH)/libhdffcmd/$$headerfile ; \
-	  chmod 0644 $(INSTALL_INCLUDE_PATH)/libhdffcmd/$$headerfile ; \
-	done
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c b/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c
deleted file mode 100644
index b85990d6b..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <string.h>
-
-#include "bitbuffer.h"
-
-void BitBuffer_Init(BitBuffer_t * BitBuffer,
-                    uint8_t * Data, uint32_t MaxLength)
-{
-    memset(Data, 0, MaxLength);
-    BitBuffer->Data = Data;
-    BitBuffer->MaxLength = MaxLength * 8;
-    BitBuffer->BitPos = 0;
-}
-
-void BitBuffer_SetBits(BitBuffer_t * BitBuffer, int NumBits, uint32_t Data)
-{
-    uint32_t nextBitPos;
-    uint32_t bytePos;
-    uint32_t bitsInByte;
-    int shift;
-
-    if (NumBits <= 0 || NumBits > 32)
-        return;
-
-    nextBitPos = BitBuffer->BitPos + NumBits;
-
-    if (nextBitPos > BitBuffer->MaxLength)
-        return;
-
-    bytePos = BitBuffer->BitPos / 8;
-    bitsInByte = BitBuffer->BitPos % 8;
-
-    BitBuffer->Data[bytePos] &= (uint8_t) (0xFF << (8 - bitsInByte));
-    shift = NumBits - (8 - bitsInByte);
-    if (shift > 0)
-        BitBuffer->Data[bytePos] |= (uint8_t) (Data >> shift);
-    else
-        BitBuffer->Data[bytePos] |= (uint8_t) (Data << (-shift));
-    NumBits -= 8 - bitsInByte;
-    bytePos++;
-    while (NumBits > 0)
-    {
-        shift = NumBits - 8;
-        if (shift > 0)
-            BitBuffer->Data[bytePos] = (uint8_t) (Data >> shift);
-        else
-            BitBuffer->Data[bytePos] = (uint8_t) (Data << (-shift));
-        NumBits -= 8;
-        bytePos++;
-    }
-    BitBuffer->BitPos = nextBitPos;
-}
-
-uint32_t BitBuffer_GetByteLength(BitBuffer_t * BitBuffer)
-{
-    return (BitBuffer->BitPos + 7) / 8;
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h b/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h
deleted file mode 100644
index 5bdc23b2b..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef BITBUFFER_H
-#define BITBUFFER_H
-
-#include <stdint.h>
-
-typedef struct BitBuffer_t
-{
-    uint8_t * Data;
-    uint32_t MaxLength;
-    uint32_t BitPos;
-} BitBuffer_t;
-
-void BitBuffer_Init(BitBuffer_t * BitBuffer,
-                    uint8_t * Data, uint32_t MaxLength);
-
-void BitBuffer_SetBits(BitBuffer_t * BitBuffer, int NumBits, uint32_t Data);
-
-uint32_t BitBuffer_GetByteLength(BitBuffer_t * BitBuffer);
-
-#endif /* BITBUFFER_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h
deleted file mode 100644
index 8d0578243..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_H
-#define HDFFCMD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "hdffcmd_av.h"
-#include "hdffcmd_generic.h"
-#include "hdffcmd_hdmi.h"
-#include "hdffcmd_mux.h"
-#include "hdffcmd_osd.h"
-#include "hdffcmd_remote.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HDFFCMD_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
deleted file mode 100644
index ea17ceb4c..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hdffcmd.h"
-#include "hdffcmd_base.h"
-#include "hdffcmd_defs.h"
-
-
-int HdffCmdAvSetPlayMode(int OsdDevice, uint8_t PlayMode, int Realtime)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_PLAY_MODE);
-    BitBuffer_SetBits(&cmdBuf, 1, Realtime ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 7, PlayMode);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetVideoPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
-                         HdffVideoStreamType_t StreamType)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_VIDEO_PID);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, StreamType);
-    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 13, Pid);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetAudioPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
-                         HdffAudioStreamType_t StreamType,
-                         HdffAvContainerType_t ContainerType)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_AUDIO_PID);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, StreamType);
-    BitBuffer_SetBits(&cmdBuf, 2, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 1, ContainerType);
-    BitBuffer_SetBits(&cmdBuf, 13, Pid);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetPcrPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_PCR_PID);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 13, Pid);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetTeletextPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_TELETEXT_PID);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 13, Pid);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetVideoWindow(int OsdDevice, uint8_t DecoderIndex, int Enable,
-                            uint16_t X, uint16_t Y, uint16_t Width,
-                            uint16_t Height)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_VIDEO_WINDOW);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
-    if (Enable)
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    else
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvShowStillImage(int OsdDevice, uint8_t DecoderIndex,
-                            const uint8_t * StillImage, int Size,
-                            HdffVideoStreamType_t StreamType)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    osd_raw_data_t osd_data;
-    int err;
-
-    memset(&osd_data, 0, sizeof(osd_raw_data_t));
-    osd_data.data_buffer = StillImage;
-    osd_data.data_length = Size;
-    err = ioctl(OsdDevice, OSD_RAW_DATA, &osd_data);
-    if (err != 0)
-        return err;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SHOW_STILL_IMAGE);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, StreamType);
-    BitBuffer_SetBits(&cmdBuf, 16, osd_data.data_handle);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetDecoderInput(int OsdDevice, uint8_t DecoderIndex,
-                             uint8_t DemultiplexerIndex)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_DECODER_INPUT);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, DemultiplexerIndex);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetDemultiplexerInput(int OsdDevice, uint8_t DemultiplexerIndex,
-                                   uint8_t TsInputIndex)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_DEMULTIPLEXER_INPUT);
-    BitBuffer_SetBits(&cmdBuf, 4, DemultiplexerIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, TsInputIndex);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetVideoFormat(int OsdDevice, uint8_t DecoderIndex,
-                            const HdffVideoFormat_t * VideoFormat)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_VIDEO_FORMAT);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 1, VideoFormat->AutomaticEnabled ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 1, VideoFormat->AfdEnabled ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 2, VideoFormat->TvFormat);
-    BitBuffer_SetBits(&cmdBuf, 8, VideoFormat->VideoConversion);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetVideoOutputMode(int OsdDevice, uint8_t DecoderIndex,
-                                HdffVideoOutputMode_t OutputMode)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_VIDEO_OUTPUT_MODE);
-    BitBuffer_SetBits(&cmdBuf, 8, OutputMode);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetStc(int OsdDevice, uint8_t DecoderIndex, uint64_t Stc)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_STC);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 3, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 1, (uint32_t) (Stc >> 32));
-    BitBuffer_SetBits(&cmdBuf, 32, (uint32_t) Stc);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvFlushBuffer(int OsdDevice, uint8_t DecoderIndex, int FlushAudio,
-                         int FlushVideo)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_FLUSH_BUFFER);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    if (FlushAudio)
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    }
-    else
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    }
-    if (FlushVideo)
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    }
-    else
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvEnableSync(int OsdDevice, uint8_t DecoderIndex, int SyncAudio,
-                        int SyncVideo)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_ENABLE_SYNC);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 1, SyncAudio ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 1, SyncVideo ? 1 : 0);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetVideoSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_VIDEO_SPEED);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, 0);
-    BitBuffer_SetBits(&cmdBuf, 32, Speed);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetAudioSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_AUDIO_SPEED);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 4, 0);
-    BitBuffer_SetBits(&cmdBuf, 32, Speed);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvEnableVideoAfterStop(int OsdDevice, uint8_t DecoderIndex,
-                                  int EnableVideoAfterStop)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_ENABLE_VIDEO_AFTER_STOP);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 1, EnableVideoAfterStop ? 1 : 0);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetAudioDelay(int OsdDevice, int16_t Delay)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_AUDIO_DELAY);
-    BitBuffer_SetBits(&cmdBuf, 16, Delay);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetAudioDownmix(int OsdDevice, HdffAudioDownmixMode_t DownmixMode)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_AUDIO_DOWNMIX);
-    BitBuffer_SetBits(&cmdBuf, 8, DownmixMode);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_AUDIO_CHANNEL);
-    BitBuffer_SetBits(&cmdBuf, 8, AudioChannel);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_SET_OPTIONS);
-    BitBuffer_SetBits(&cmdBuf, 1, 1);
-    BitBuffer_SetBits(&cmdBuf, 31, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 16, SyncShift);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvMuteAudio(int OsdDevice, uint8_t DecoderIndex, int Mute)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_MUTE_AUDIO);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 1, Mute ? 1 : 0);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdAvMuteVideo(int OsdDevice, uint8_t DecoderIndex, int Mute)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_AV_DECODER,
-                       HDFF_MSG_AV_MUTE_VIDEO);
-    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
-    BitBuffer_SetBits(&cmdBuf, 1, Mute ? 1 : 0);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
deleted file mode 100644
index 36381417f..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_AV_H
-#define HDFFCMD_AV_H
-
-typedef enum HdffAvContainerType_t
-{
-    HDFF_AV_CONTAINER_PES,
-    HDFF_AV_CONTAINER_PES_DVD
-} HdffAvContainerType_t;
-
-typedef enum HdffAudioStreamType_t
-{
-    HDFF_AUDIO_STREAM_INVALID = -1,
-    HDFF_AUDIO_STREAM_MPEG1 = 0,
-    HDFF_AUDIO_STREAM_MPEG2,
-    HDFF_AUDIO_STREAM_AC3,
-    HDFF_AUDIO_STREAM_AAC,
-    HDFF_AUDIO_STREAM_HE_AAC,
-    HDFF_AUDIO_STREAM_PCM,
-    HDFF_AUDIO_STREAM_EAC3,
-    HDFF_AUDIO_STREAM_DTS
-} HdffAudioStreamType_t;
-
-typedef enum HdffVideoStreamType_t
-{
-    HDFF_VIDEO_STREAM_INVALID = -1,
-    HDFF_VIDEO_STREAM_MPEG1 = 0,
-    HDFF_VIDEO_STREAM_MPEG2,
-    HDFF_VIDEO_STREAM_H264,
-    HDFF_VIDEO_STREAM_MPEG4_ASP,
-    HDFF_VIDEO_STREAM_VC1
-} HdffVideoStreamType_t;
-
-typedef enum HdffTvFormat_t
-{
-    HDFF_TV_FORMAT_4_BY_3,
-    HDFF_TV_FORMAT_16_BY_9
-} HdffTvFormat_t;
-
-typedef enum HdffVideoConversion_t
-{
-    HDFF_VIDEO_CONVERSION_AUTOMATIC,
-    HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9,
-    HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9,
-    HDFF_VIDEO_CONVERSION_PILLARBOX,
-    HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT,
-    HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9,
-    HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9
-} HdffVideoConversion_t;
-
-typedef struct HdffVideoFormat_t
-{
-    int AutomaticEnabled;
-    int AfdEnabled;
-    HdffTvFormat_t TvFormat;
-    HdffVideoConversion_t VideoConversion;
-} HdffVideoFormat_t;
-
-typedef enum HdffVideoOutputMode_t
-{
-    HDFF_VIDEO_OUTPUT_CLONE,
-    HDFF_VIDEO_OUTPUT_HD_ONLY
-} HdffVideoOutputMode_t;
-
-typedef enum HdffAudioDownmixMode_t
-{
-    HDFF_AUDIO_DOWNMIX_OFF,
-    HDFF_AUDIO_DOWNMIX_ANALOG,
-    HDFF_AUDIO_DOWNMIX_ALWAYS,
-    HDFF_AUDIO_DOWNMIX_AUTOMATIC,
-    HDFF_AUDIO_DOWNMIX_HDMI_ONLY
-} HdffAudioDownmixMode_t;
-
-
-int HdffCmdAvSetPlayMode(int OsdDevice, uint8_t PlayMode, int Realtime);
-
-int HdffCmdAvSetVideoPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
-                         HdffVideoStreamType_t StreamType);
-
-int HdffCmdAvSetAudioPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid,
-                         HdffAudioStreamType_t StreamType,
-                         HdffAvContainerType_t ContainerType);
-
-int HdffCmdAvSetPcrPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid);
-
-int HdffCmdAvSetTeletextPid(int OsdDevice, uint8_t DecoderIndex, uint16_t Pid);
-
-int HdffCmdAvSetVideoWindow(int OsdDevice, uint8_t DecoderIndex, int Enable,
-                            uint16_t X, uint16_t Y, uint16_t Width,
-                            uint16_t Height);
-
-int HdffCmdAvShowStillImage(int OsdDevice, uint8_t DecoderIndex,
-                            const uint8_t * StillImage, int Size,
-                            HdffVideoStreamType_t StreamType);
-
-int HdffCmdAvSetDecoderInput(int OsdDevice, uint8_t DecoderIndex,
-                             uint8_t DemultiplexerIndex);
-
-int HdffCmdAvSetDemultiplexerInput(int OsdDevice, uint8_t DemultiplexerIndex,
-                                   uint8_t TsInputIndex);
-
-int HdffCmdAvSetVideoFormat(int OsdDevice, uint8_t DecoderIndex,
-                            const HdffVideoFormat_t * VideoFormat);
-
-int HdffCmdAvSetVideoOutputMode(int OsdDevice, uint8_t DecoderIndex,
-                                HdffVideoOutputMode_t OutputMode);
-
-int HdffCmdAvSetStc(int OsdDevice, uint8_t DecoderIndex, uint64_t Stc);
-
-int HdffCmdAvFlushBuffer(int OsdDevice, uint8_t DecoderIndex, int FlushAudio,
-                         int FlushVideo);
-
-int HdffCmdAvEnableSync(int OsdDevice, uint8_t DecoderIndex, int SyncAudio,
-                        int SyncVideo);
-
-int HdffCmdAvSetVideoSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed);
-
-int HdffCmdAvSetAudioSpeed(int OsdDevice, uint8_t DecoderIndex, int32_t Speed);
-
-int HdffCmdAvEnableVideoAfterStop(int OsdDevice, uint8_t DecoderIndex,
-                                  int EnableVideoAfterStop);
-
-int HdffCmdAvSetAudioDelay(int OsdDevice, int16_t Delay);
-
-int HdffCmdAvSetAudioDownmix(int OsdDevice,
-                             HdffAudioDownmixMode_t DownmixMode);
-
-int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel);
-
-int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift);
-
-int HdffCmdAvMuteAudio(int OsdDevice, uint8_t DecoderIndex, int Mute);
-
-int HdffCmdAvMuteVideo(int OsdDevice, uint8_t DecoderIndex, int Mute);
-
-
-#endif /* HDFFCMD_AV_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c
deleted file mode 100644
index ac1ab7e51..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include "hdffcmd_base.h"
-
-void HdffCmdBuildHeader(BitBuffer_t * MsgBuf, HdffMessageType_t MsgType,
-                        HdffMessageGroup_t MsgGroup, HdffMessageId_t MsgId)
-{
-    BitBuffer_SetBits(MsgBuf, 16, 0); // length field will be set later
-    BitBuffer_SetBits(MsgBuf, 6, 0); // reserved
-    BitBuffer_SetBits(MsgBuf, 2, MsgType);
-    BitBuffer_SetBits(MsgBuf, 8, MsgGroup);
-    BitBuffer_SetBits(MsgBuf, 16, MsgId);
-}
-
-uint32_t HdffCmdSetLength(BitBuffer_t * MsgBuf)
-{
-    uint32_t length;
-
-    length = BitBuffer_GetByteLength(MsgBuf) - 2;
-    MsgBuf->Data[0] = (uint8_t) (length >> 8);
-    MsgBuf->Data[1] = (uint8_t) length;
-
-    return length + 2;
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h
deleted file mode 100644
index b6856aad9..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_BASE_H
-#define HDFFCMD_BASE_H
-
-#include <linux/dvb/osd.h>
-
-#if !defined OSD_RAW_CMD
-typedef struct osd_raw_cmd_s {
-    const void *cmd_data;
-    int cmd_len;
-    void *result_data;
-    int result_len;
-} osd_raw_cmd_t;
-
-typedef struct osd_raw_data_s {
-    const void *data_buffer;
-    int data_length;
-    int data_handle;
-} osd_raw_data_t;
-
-#define OSD_RAW_CMD            _IOWR('o', 162, osd_raw_cmd_t)
-#define OSD_RAW_DATA           _IOWR('o', 163, osd_raw_data_t)
-#endif
-
-#include "bitbuffer.h"
-#include "hdffcmd_defs.h"
-
-void HdffCmdBuildHeader(BitBuffer_t * MsgBuf, HdffMessageType_t MsgType,
-                        HdffMessageGroup_t MsgGroup, HdffMessageId_t MsgId);
-
-uint32_t HdffCmdSetLength(BitBuffer_t * MsgBuf);
-
-#endif /* HDFFCMD_BASE_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
deleted file mode 100644
index cae2097b1..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_DEFS_H
-#define HDFFCMD_DEFS_H
-
-typedef enum HdffMessageType_t
-{
-    HDFF_MSG_TYPE_COMMAND,
-    HDFF_MSG_TYPE_ANSWER,
-    HDFF_MSG_TYPE_RESULT,
-    HDFF_MSG_TYPE_EVENT
-} HdffMessageType_t;
-
-typedef enum HdffMessageGroup_t
-{
-    HDFF_MSG_GROUP_GENERIC,
-    HDFF_MSG_GROUP_AV_DECODER,
-    HDFF_MSG_GROUP_AV_MUX,
-    HDFF_MSG_GROUP_FRONTEND,
-    HDFF_MSG_GROUP_OSD,
-    HDFF_MSG_GROUP_HDMI,
-    HDFF_MSG_GROUP_REMOTE_CONTROL
-} HdffMessageGroup_t;
-
-typedef enum HdffMessageId_t
-{
-    HDFF_MSG_GEN_GET_FIRMWARE_VERSION = 0,
-    HDFF_MSG_GEN_GET_INTERFACE_VERSION,
-    HDFF_MSG_GEN_GET_COPYRIGHTS,
-
-    HDFF_MSG_AV_SET_AUDIO_PID = 0,
-    HDFF_MSG_AV_SET_VIDEO_PID,
-    HDFF_MSG_AV_SET_PCR_PID,
-    HDFF_MSG_AV_SET_TELETEXT_PID,
-    HDFF_MSG_AV_SHOW_STILL_IMAGE,
-    HDFF_MSG_AV_SET_VIDEO_WINDOW,
-    HDFF_MSG_AV_SET_DECODER_INPUT,
-    HDFF_MSG_AV_SET_DEMULTIPLEXER_INPUT,
-    HDFF_MSG_AV_SET_VIDEO_FORMAT,
-    HDFF_MSG_AV_SET_VIDEO_OUTPUT_MODE,
-    HDFF_MSG_AV_SET_STC,
-    HDFF_MSG_AV_FLUSH_BUFFER,
-    HDFF_MSG_AV_ENABLE_SYNC,
-    HDFF_MSG_AV_SET_VIDEO_SPEED,
-    HDFF_MSG_AV_SET_AUDIO_SPEED,
-    HDFF_MSG_AV_ENABLE_VIDEO_AFTER_STOP,
-    HDFF_MSG_AV_GET_VIDEO_FORMAT_INFO,
-    HDFF_MSG_AV_SET_AUDIO_DELAY,
-    HDFF_MSG_AV_SET_AUDIO_DOWNMIX,
-    HDFF_MSG_AV_SET_AUDIO_CHANNEL,
-    HDFF_MSG_AV_SET_PLAY_MODE,
-    HDFF_MSG_AV_SET_OPTIONS,
-    HDFF_MSG_AV_MUTE_AUDIO,
-    HDFF_MSG_AV_MUTE_VIDEO,
-
-    HDFF_MSG_MUX_SET_VIDEO_OUT = 0,
-    HDFF_MSG_MUX_SET_SLOW_BLANK,
-    HDFF_MSG_MUX_SET_FAST_BLANK,
-    HDFF_MSG_MUX_SET_VOLUME,
-    HDFF_MSG_MUX_SET_AUDIO_MUTE,
-
-    HDFF_MSG_OSD_CONFIGURE = 0,
-    HDFF_MSG_OSD_RESET,
-    HDFF_MSG_OSD_CREATE_DISPLAY = 10,
-    HDFF_MSG_OSD_DELETE_DISPLAY,
-    HDFF_MSG_OSD_ENABLE_DISPLAY,
-    HDFF_MSG_OSD_SET_DISPLAY_OUTPUT_RECTANGLE,
-    HDFF_MSG_OSD_SET_DISPLAY_CLIPPLING_AREA,
-    HDFF_MSG_OSD_RENDER_DISPLAY,
-    HDFF_MSG_OSD_SAVE_REGION,
-    HDFF_MSG_OSD_RESTORE_REGION,
-    HDFF_MSG_OSD_CREATE_PALETTE = 30,
-    HDFF_MSG_OSD_DELETE_PALETTE,
-    HDFF_MSG_OSD_SET_DISPLAY_PALETTE,
-    HDFF_MSG_OSD_SET_PALETTE_COLORS,
-    HDFF_MSG_OSD_CREATE_FONT_FACE = 50,
-    HDFF_MSG_OSD_DELETE_FONT_FACE,
-    HDFF_MSG_OSD_CREATE_FONT,
-    HDFF_MSG_OSD_DELETE_FONT,
-    HDFF_MSG_OSD_DRAW_PIXEL = 70,
-    HDFF_MSG_OSD_DRAW_RECTANGLE,
-    HDFF_MSG_OSD_DRAW_CIRCLE,
-    HDFF_MSG_OSD_DRAW_ELLIPSE,
-    HDFF_MSG_OSD_DRAW_SLOPE,
-    HDFF_MSG_OSD_DRAW_TEXT,
-    HDFF_MSG_OSD_DRAW_WIDE_TEXT,
-    HDFF_MSG_OSD_DRAW_BITMAP,
-    HDFF_MSG_OSD_DRAW_UTF8_TEXT,
-
-    HDFF_MSG_HDMI_ENABLE_OUTPUT = 0,
-    HDFF_MSG_HDMI_SET_VIDEO_MODE,
-    HDFF_MSG_HDMI_CONFIGURE,
-    HDFF_MSG_HDMI_IS_DISPLAY_CONNECTED,
-    HDFF_MSG_HDMI_GET_DISPLAY_INFO,
-    HDFF_MSG_HDMI_GET_VIDEO_MODE,
-    HDFF_MSG_HDMI_SEND_CEC_COMMAND,
-    HDFF_MSG_HDMI_SEND_RAW_CEC_COMMAND,
-
-    HDFF_MSG_REMOTE_SET_PROTOCOL = 0,
-    HDFF_MSG_REMOTE_SET_ADDRESS_FILTER,
-    HDFF_MSG_REMOTE_KEY_EVENT
-} HdffMessageId_t;
-
-#endif /* HDFFCMD_DEFS_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
deleted file mode 100644
index 797abe84a..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <errno.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hdffcmd.h"
-#include "hdffcmd_base.h"
-#include "hdffcmd_defs.h"
-
-int HdffCmdGetFirmwareVersion(int OsdDevice, uint32_t * Version, char * String,
-                              uint32_t MaxLength)
-{
-    uint8_t cmdData[8];
-    uint8_t resultData[64];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int err;
-
-    if (Version == NULL)
-        return -EINVAL;
-
-    *Version = 0;
-    if (String)
-        String[0] = 0;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_GENERIC,
-                       HDFF_MSG_GEN_GET_FIRMWARE_VERSION);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            if (String)
-            {
-                uint8_t textLength = resultData[9];
-                if (textLength >= MaxLength)
-                    textLength = MaxLength - 1;
-                memcpy(String, &resultData[10], textLength);
-                String[textLength] = 0;
-            }
-            *Version = (resultData[6] << 16)
-                     | (resultData[7] << 8)
-                     | resultData[8];
-        }
-    }
-    return err;
-}
-
-int HdffCmdGetInterfaceVersion(int OsdDevice, uint32_t * Version, char * String,
-                               uint32_t MaxLength)
-{
-    uint8_t cmdData[8];
-    uint8_t resultData[64];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int err;
-
-    if (Version == NULL)
-        return -EINVAL;
-
-    *Version = 0;
-    if (String)
-        String[0] = 0;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_GENERIC,
-                       HDFF_MSG_GEN_GET_INTERFACE_VERSION);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            if (String)
-            {
-                uint8_t textLength = resultData[9];
-                if (textLength >= MaxLength)
-                    textLength = MaxLength - 1;
-                memcpy(String, &resultData[10], textLength);
-                String[textLength] = 0;
-            }
-            *Version = (resultData[6] << 16)
-                     | (resultData[7] << 8)
-                     | resultData[8];
-        }
-    }
-    return err;
-}
-
-int HdffCmdGetCopyrights(int OsdDevice, uint8_t Index, char * String,
-                         uint32_t MaxLength)
-{
-    uint8_t cmdData[8];
-    uint8_t resultData[280];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int err;
-
-    if (String == NULL)
-        return -EINVAL;
-
-    String[0] = 0;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_GENERIC,
-                       HDFF_MSG_GEN_GET_COPYRIGHTS);
-    BitBuffer_SetBits(&cmdBuf, 8, Index);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            uint8_t index = resultData[6];
-            uint8_t textLen = resultData[7];
-            if (index == Index && textLen > 0)
-            {
-                if (textLen >= MaxLength)
-                {
-                    textLen = MaxLength - 1;
-                }
-                memcpy(String, resultData + 8, textLen);
-                String[textLen] = 0;
-            }
-        }
-    }
-    return err;
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h
deleted file mode 100644
index c12b29641..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_generic.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_GENERIC_H
-#define HDFFCMD_GENERIC_H
-
-int HdffCmdGetFirmwareVersion(int OsdDevice, uint32_t * Version, char * String,
-                              uint32_t MaxLength);
-
-int HdffCmdGetInterfaceVersion(int OsdDevice, uint32_t * Version, char * String,
-                               uint32_t MaxLength);
-
-int HdffCmdGetCopyrights(int OsdDevice, uint8_t Index, char * String,
-                         uint32_t MaxLength);
-
-#endif /* HDFFCMD_GENERIC_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
deleted file mode 100644
index de315f838..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hdffcmd.h"
-#include "hdffcmd_base.h"
-#include "hdffcmd_defs.h"
-
-
-int HdffCmdHdmiSetVideoMode(int OsdDevice, HdffVideoMode_t VideoMode)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
-                       HDFF_MSG_HDMI_SET_VIDEO_MODE);
-    BitBuffer_SetBits(&cmdBuf, 8, VideoMode);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config)
-{
-    uint8_t cmdData[24];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    size_t nameLen;
-    int i;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
-                       HDFF_MSG_HDMI_CONFIGURE);
-    BitBuffer_SetBits(&cmdBuf, 1, Config->TransmitAudio ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 1, Config->ForceDviMode ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 1, Config->CecEnabled ? 1 : 0);
-    BitBuffer_SetBits(&cmdBuf, 3, Config->VideoModeAdaption);
-    BitBuffer_SetBits(&cmdBuf, 6, 0); // reserved
-    nameLen = strlen(Config->CecDeviceName);
-    if (nameLen > 13)
-        nameLen = 13;
-    BitBuffer_SetBits(&cmdBuf, 4, nameLen);
-    for (i = 0; i < nameLen; i++)
-        BitBuffer_SetBits(&cmdBuf, 8, Config->CecDeviceName[i]);
-
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdHdmiSendCecCommand(int OsdDevice, HdffCecCommand_t Command)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
-                       HDFF_MSG_HDMI_SEND_CEC_COMMAND);
-    BitBuffer_SetBits(&cmdBuf, 8, Command);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdHdmiSendRawCecCommand(int OsdDevice, uint8_t Destination,
-                                 uint8_t Opcode, const uint8_t * Operand,
-                                 uint8_t OperandLength)
-{
-    uint8_t cmdData[24];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int i;
-
-    if (OperandLength > 14)
-        OperandLength = 14;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_HDMI,
-                       HDFF_MSG_HDMI_SEND_RAW_CEC_COMMAND);
-    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 4, Destination);
-    BitBuffer_SetBits(&cmdBuf, 8, Opcode);
-    BitBuffer_SetBits(&cmdBuf, 8, OperandLength);
-    for (i = 0; i < OperandLength; i++)
-        BitBuffer_SetBits(&cmdBuf, 8, Operand[i]);
-
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
deleted file mode 100644
index fc79bd9b8..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_HDMI_H
-#define HDFFCMD_HDMI_H
-
-
-typedef enum HdffVideoMode_t
-{
-    HDFF_VIDEO_MODE_576P50 = 18,
-    HDFF_VIDEO_MODE_720P50 = 19,
-    HDFF_VIDEO_MODE_1080I50 = 20,
-    HDFF_VIDEO_MODE_576I50 = 22
-} HdffVideoMode_t;
-
-typedef enum HdffVideoModeAdaption_t
-{
-    HDFF_VIDEO_MODE_ADAPT_OFF,
-    HDFF_VIDEO_MODE_ADAPT_FRAME_RATE,
-    HDFF_VIDEO_MODE_ADAPT_ONLY_FOR_HD,
-    HDFF_VIDEO_MODE_ADAPT_ALWAYS
-} HdffVideoModeAdaption_t;
-
-typedef struct HdffHdmiConfig_t
-{
-    int TransmitAudio;
-    int ForceDviMode;
-    int CecEnabled;
-    HdffVideoModeAdaption_t VideoModeAdaption;
-    char CecDeviceName[14];
-} HdffHdmiConfig_t;
-
-typedef enum HdffCecCommand_t
-{
-    HDFF_CEC_COMMAND_TV_ON,
-    HDFF_CEC_COMMAND_TV_OFF,
-    HDFF_CEC_COMMAND_ACTIVE_SOURCE,
-    HDFF_CEC_COMMAND_INACTIVE_SOURCE
-} HdffCecCommand_t;
-
-
-int HdffCmdHdmiSetVideoMode(int OsdDevice, HdffVideoMode_t VideoMode);
-
-int HdffCmdHdmiConfigure(int OsdDevice, const HdffHdmiConfig_t * Config);
-
-int HdffCmdHdmiSendCecCommand(int OsdDevice, HdffCecCommand_t Command);
-
-int HdffCmdHdmiSendRawCecCommand(int OsdDevice, uint8_t Destination,
-                                 uint8_t Opcode, const uint8_t * Operand,
-                                 uint8_t OperandLength);
-
-#endif /* HDFFCMD_HDMI_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c
deleted file mode 100644
index 3698b5656..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hdffcmd.h"
-#include "hdffcmd_base.h"
-#include "hdffcmd_defs.h"
-
-
-int HdffCmdMuxSetVideoOut(int OsdDevice, HdffVideoOut_t VideoOut)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_AV_MUX,
-                       HDFF_MSG_MUX_SET_VIDEO_OUT);
-    BitBuffer_SetBits(&cmdBuf, 4, VideoOut);
-    BitBuffer_SetBits(&cmdBuf, 4, 0); // reserved
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdMuxSetVolume(int OsdDevice, uint8_t Volume)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_AV_MUX,
-                       HDFF_MSG_MUX_SET_VOLUME);
-    BitBuffer_SetBits(&cmdBuf, 8, Volume);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdMuxMuteAudio(int OsdDevice, int Mute)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_AV_MUX,
-                       HDFF_MSG_MUX_SET_AUDIO_MUTE);
-    BitBuffer_SetBits(&cmdBuf, 1, Mute);
-    BitBuffer_SetBits(&cmdBuf, 7, 0); // reserved
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h
deleted file mode 100644
index 8821d5fb9..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_MUX_H
-#define HDFFCMD_MUX_H
-
-
-typedef enum HdffVideoOut_t
-{
-    HDFF_VIDEO_OUT_DISABLED,
-    HDFF_VIDEO_OUT_CVBS_RGB,
-    HDFF_VIDEO_OUT_CVBS_YUV,
-    HDFF_VIDEO_OUT_YC
-} HdffVideoOut_t;
-
-typedef enum HdffSlowBlank_t
-{
-    HDFF_SLOW_BLANK_OFF,
-    HDFF_SLOW_BLANK_16_BY_9,
-    HDFF_SLOW_BLANK_4_BY_3
-} HdffSlowBlank_t;
-
-typedef enum HdffFastBlank_t
-{
-    HDFF_FAST_BLANK_CVBS,
-    HDFF_FAST_BLANK_RGB
-} HdffFastBlank_t;
-
-
-int HdffCmdMuxSetVideoOut(int OsdDevice, HdffVideoOut_t VideoOut);
-
-int HdffCmdMuxSetVolume(int OsdDevice, uint8_t Volume);
-
-int HdffCmdMuxMuteAudio(int OsdDevice, int Mute);
-
-#endif /* HDFFCMD_MUX_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
deleted file mode 100644
index cf714a87a..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c
+++ /dev/null
@@ -1,720 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hdffcmd.h"
-#include "hdffcmd_base.h"
-#include "hdffcmd_defs.h"
-
-
-int HdffCmdOsdConfigure(int OsdDevice, const HdffOsdConfig_t * Config)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_CONFIGURE);
-    if (Config->FontAntialiasing)
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    }
-    else
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    }
-    if (Config->FontKerning)
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    }
-    else
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    }
-    BitBuffer_SetBits(&cmdBuf, 6, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 16, Config->FontDpi);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdReset(int OsdDevice)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_RESET);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-
-int HdffCmdOsdCreateDisplay(int OsdDevice, uint16_t Width, uint16_t Height,
-                            HdffColorType_t ColorType, uint32_t * NewDisplay)
-{
-    uint8_t cmdData[16];
-    uint8_t resultData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int err;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_CREATE_DISPLAY);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    BitBuffer_SetBits(&cmdBuf, 8, ColorType);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    *NewDisplay = HDFF_INVALID_HANDLE;
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
-            {
-                *NewDisplay = (resultData[6] << 24)
-                            | (resultData[7] << 16)
-                            | (resultData[8] << 8)
-                            | resultData[9];
-            }
-            else
-                err = -1;
-        }
-    }
-    return err;
-}
-
-int HdffCmdOsdDeleteDisplay(int OsdDevice, uint32_t Display)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DELETE_DISPLAY);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdEnableDisplay(int OsdDevice, uint32_t Display, int Enable)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_ENABLE_DISPLAY);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    if (Enable)
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    }
-    else
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdSetDisplayOutputRectangle(int OsdDevice, uint32_t Display,
-                                        uint16_t X, uint16_t Y,
-                                        uint16_t Width, uint16_t Height)
-{
-    uint8_t cmdData[20];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_SET_DISPLAY_OUTPUT_RECTANGLE);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdSetDisplayClippingArea(int OsdDevice, uint32_t Display,
-                                     int Enable, uint16_t X, uint16_t Y,
-                                     uint16_t Width, uint16_t Height)
-{
-    uint8_t cmdData[20];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_SET_DISPLAY_CLIPPLING_AREA);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    if (Enable)
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 1);
-    }
-    else
-    {
-        BitBuffer_SetBits(&cmdBuf, 1, 0);
-    }
-    BitBuffer_SetBits(&cmdBuf, 7, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdRenderDisplay(int OsdDevice, uint32_t Display)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_RENDER_DISPLAY);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdSaveRegion(int OsdDevice, uint32_t Display,
-                         uint16_t X, uint16_t Y,
-                         uint16_t Width, uint16_t Height)
-{
-    uint8_t cmdData[20];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_SAVE_REGION);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdRestoreRegion(int OsdDevice, uint32_t Display)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_RESTORE_REGION);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-
-int HdffCmdOsdCreatePalette(int OsdDevice, HdffColorType_t ColorType,
-                            HdffColorFormat_t ColorFormat,
-                            uint32_t NumColors, const uint32_t * Colors,
-                            uint32_t * NewPalette)
-{
-    uint8_t cmdData[1060];
-    uint8_t resultData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int i;
-    int err;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_CREATE_PALETTE);
-    BitBuffer_SetBits(&cmdBuf, 8, ColorType);
-    BitBuffer_SetBits(&cmdBuf, 8, ColorFormat);
-    if (NumColors > 256)
-        NumColors = 256;
-    BitBuffer_SetBits(&cmdBuf, 8, NumColors == 256 ? 0 : NumColors);
-    for (i = 0; i < NumColors; i++)
-    {
-        BitBuffer_SetBits(&cmdBuf, 32, Colors[i]);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    *NewPalette = HDFF_INVALID_HANDLE;
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
-            {
-                *NewPalette = (resultData[6] << 24)
-                            | (resultData[7] << 16)
-                            | (resultData[8] << 8)
-                            | resultData[9];
-            }
-            else
-                err = -1;
-        }
-    }
-    return err;
-}
-
-int HdffCmdOsdDeletePalette(int OsdDevice, uint32_t Palette)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DELETE_PALETTE);
-    BitBuffer_SetBits(&cmdBuf, 32, Palette);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdSetDisplayPalette(int OsdDevice, uint32_t Display,
-                                uint32_t Palette)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_SET_DISPLAY_PALETTE);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 32, Palette);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdSetPaletteColors(int OsdDevice, uint32_t Palette,
-                               HdffColorFormat_t ColorFormat,
-                               uint8_t StartColor, uint32_t NumColors,
-                               const uint32_t * Colors)
-{
-    uint8_t cmdData[1060];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int i;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_SET_PALETTE_COLORS);
-    BitBuffer_SetBits(&cmdBuf, 32, Palette);
-    BitBuffer_SetBits(&cmdBuf, 8, ColorFormat);
-    BitBuffer_SetBits(&cmdBuf, 8, StartColor);
-    if (NumColors > 256)
-        NumColors = 256;
-    BitBuffer_SetBits(&cmdBuf, 8, NumColors == 256 ? 0 : NumColors);
-    for (i = 0; i < NumColors; i++)
-    {
-        BitBuffer_SetBits(&cmdBuf, 32, Colors[i]);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdCreateFontFace(int OsdDevice, const uint8_t * FontData,
-                             uint32_t DataSize, uint32_t * NewFontFace)
-{
-    uint8_t cmdData[16];
-    uint8_t resultData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    osd_raw_data_t osd_data;
-    int err;
-
-    *NewFontFace = HDFF_INVALID_HANDLE;
-
-    memset(&osd_data, 0, sizeof(osd_raw_data_t));
-    osd_data.data_buffer = FontData;
-    osd_data.data_length = DataSize;
-    err = ioctl(OsdDevice, OSD_RAW_DATA, &osd_data);
-    if (err != 0)
-        return err;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_CREATE_FONT_FACE);
-    BitBuffer_SetBits(&cmdBuf, 16, osd_data.data_handle);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
-            {
-                *NewFontFace = (resultData[6] << 24)
-                             | (resultData[7] << 16)
-                             | (resultData[8] << 8)
-                             | resultData[9];
-            }
-            else
-                err = -1;
-        }
-    }
-    return err;
-}
-
-int HdffCmdOsdDeleteFontFace(int OsdDevice, uint32_t FontFace)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DELETE_FONT_FACE);
-    BitBuffer_SetBits(&cmdBuf, 32, FontFace);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdCreateFont(int OsdDevice, uint32_t FontFace, uint32_t Size,
-                         uint32_t * NewFont)
-{
-    uint8_t cmdData[16];
-    uint8_t resultData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int err;
-
-    *NewFont = HDFF_INVALID_HANDLE;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    osd_cmd.result_data = resultData;
-    osd_cmd.result_len = sizeof(resultData);
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_CREATE_FONT);
-    BitBuffer_SetBits(&cmdBuf, 32, FontFace);
-    BitBuffer_SetBits(&cmdBuf, 32, Size);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    err = ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-    if (err == 0)
-    {
-        if (osd_cmd.result_len > 0)
-        {
-            if (resultData[2] == HDFF_MSG_TYPE_ANSWER)
-            {
-                *NewFont = (resultData[6] << 24)
-                         | (resultData[7] << 16)
-                         | (resultData[8] << 8)
-                         | resultData[9];
-            }
-            else
-                err = -1;
-        }
-    }
-    return err;
-}
-
-int HdffCmdOsdDeleteFont(int OsdDevice, uint32_t Font)
-{
-    uint8_t cmdData[16];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DELETE_FONT);
-    BitBuffer_SetBits(&cmdBuf, 32, Font);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-
-int HdffCmdOsdDrawRectangle(int OsdDevice, uint32_t Display, uint16_t X,
-                            uint16_t Y, uint16_t Width, uint16_t Height,
-                            uint32_t Color)
-{
-    uint8_t cmdData[24];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_RECTANGLE);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    BitBuffer_SetBits(&cmdBuf, 32, Color);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
-                          uint16_t CY, uint16_t RadiusX, uint16_t RadiusY,
-                          uint32_t Color, uint32_t Flags)
-{
-    uint8_t cmdData[28];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_ELLIPSE);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 16, CX);
-    BitBuffer_SetBits(&cmdBuf, 16, CY);
-    BitBuffer_SetBits(&cmdBuf, 16, RadiusX);
-    BitBuffer_SetBits(&cmdBuf, 16, RadiusY);
-    BitBuffer_SetBits(&cmdBuf, 32, Color);
-    BitBuffer_SetBits(&cmdBuf, 32, Flags);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdDrawSlope(int OsdDevice, uint32_t Display, uint16_t X,
-                        uint16_t Y, uint16_t Width, uint16_t Height,
-                        uint32_t Color, uint32_t Type)
-{
-    uint8_t cmdData[28];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_SLOPE);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, Width);
-    BitBuffer_SetBits(&cmdBuf, 16, Height);
-    BitBuffer_SetBits(&cmdBuf, 32, Color);
-    BitBuffer_SetBits(&cmdBuf, 32, Type);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
-                       uint16_t X, uint16_t Y, const char * Text,
-                       uint32_t Color)
-{
-    uint8_t cmdData[1060];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int i;
-    int length;
-
-    length = 0;
-    while (Text[length])
-    {
-        length++;
-    }
-    if (length > 980)
-        length = 980;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_TEXT);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 32, Font);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 32, Color);
-    BitBuffer_SetBits(&cmdBuf, 16, length);
-    for (i = 0; i < length; i++)
-    {
-        BitBuffer_SetBits(&cmdBuf, 8, Text[i]);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdDrawUtf8Text(int OsdDevice, uint32_t Display, uint32_t Font,
-                           uint16_t X, uint16_t Y, const char * Text,
-                           uint32_t Color)
-{
-    uint8_t cmdData[1060];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int i;
-    int length;
-
-    length = 0;
-    while (Text[length])
-    {
-        length++;
-    }
-    if (length > 980)
-        length = 980;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_UTF8_TEXT);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 32, Font);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 32, Color);
-    BitBuffer_SetBits(&cmdBuf, 16, length);
-    for (i = 0; i < length; i++)
-    {
-        BitBuffer_SetBits(&cmdBuf, 8, Text[i]);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdDrawWideText(int OsdDevice, uint32_t Display, uint32_t Font,
-                           uint16_t X, uint16_t Y, const uint16_t * Text,
-                           uint32_t Color)
-{
-    uint8_t cmdData[1060];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    int i;
-    int length;
-
-    length = 0;
-    while (Text[length])
-    {
-        length++;
-    }
-    if (length > 480)
-        length = 480;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_WIDE_TEXT);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 32, Font);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 32, Color);
-    BitBuffer_SetBits(&cmdBuf, 16, length);
-    for (i = 0; i < length; i++)
-    {
-        BitBuffer_SetBits(&cmdBuf, 16, Text[i]);
-    }
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdOsdDrawBitmap(int OsdDevice, uint32_t Display, uint16_t X,
-                         uint16_t Y, const uint8_t * Bitmap, uint16_t BmpWidth,
-                         uint16_t BmpHeight, uint32_t BmpSize,
-                         HdffColorType_t ColorType, uint32_t Palette)
-{
-    uint8_t cmdData[32];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-    osd_raw_data_t osd_data;
-    int err;
-
-    memset(&osd_data, 0, sizeof(osd_raw_data_t));
-    osd_data.data_buffer = Bitmap;
-    osd_data.data_length = BmpSize;
-    err = ioctl(OsdDevice, OSD_RAW_DATA, &osd_data);
-    if (err != 0)
-        return err;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
-                       HDFF_MSG_OSD_DRAW_BITMAP);
-    BitBuffer_SetBits(&cmdBuf, 32, Display);
-    BitBuffer_SetBits(&cmdBuf, 16, X);
-    BitBuffer_SetBits(&cmdBuf, 16, Y);
-    BitBuffer_SetBits(&cmdBuf, 16, BmpWidth);
-    BitBuffer_SetBits(&cmdBuf, 16, BmpHeight);
-    BitBuffer_SetBits(&cmdBuf, 8, ColorType);
-    BitBuffer_SetBits(&cmdBuf, 6, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 2, 0); // uncompressed
-    BitBuffer_SetBits(&cmdBuf, 32, Palette);
-    BitBuffer_SetBits(&cmdBuf, 16, osd_data.data_handle);
-    BitBuffer_SetBits(&cmdBuf, 32, 0);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
deleted file mode 100644
index 079b754f2..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_OSD_H
-#define HDFFCMD_OSD_H
-
-
-#define HDFF_INVALID_HANDLE             0xFFFFFFFF
-#define HDFF_SCREEN_DISPLAY_HANDLE      0xFFFFFFFE
-
-#define HDFF_POSITION_SCREEN_CENTERED   0xFFFF
-
-#define HDFF_SIZE_FULL_SCREEN           0xFFFF
-#define HDFF_SIZE_SAME_AS_SOURCE        0xFFFE
-
-#define HDFF_FONT_FACE_TIRESIAS         0x00000000
-
-
-typedef struct HdffOsdConfig_t
-{
-    int FontAntialiasing;
-    int FontKerning;
-    uint16_t FontDpi;
-} HdffOsdConfig_t;
-
-typedef enum HdffColorType_t
-{
-    HDFF_COLOR_TYPE_CLUT1,
-    HDFF_COLOR_TYPE_CLUT2,
-    HDFF_COLOR_TYPE_CLUT4,
-    HDFF_COLOR_TYPE_CLUT8,
-    HDFF_COLOR_TYPE_ARGB8888,
-    HDFF_COLOR_TYPE_ARGB8565,
-    HDFF_COLOR_TYPE_ARGB4444,
-    HDFF_COLOR_TYPE_ARGB1555,
-    HDFF_COLOR_TYPE_RGB888,
-    HDFF_COLOR_TYPE_RGB565
-} HdffColorType_t;
-
-typedef enum HdffColorFormat_t
-{
-    HDFF_COLOR_FORMAT_ARGB,
-    HDFF_COLOR_FORMAT_ACBYCR
-} HdffColorFormat_t;
-
-typedef enum HdffDrawingFlags_t
-{
-    HDFF_DRAW_FULL,
-    HDFF_DRAW_HALF_TOP,
-    HDFF_DRAW_HALF_LEFT,
-    HDFF_DRAW_HALF_BOTTOM,
-    HDFF_DRAW_HALF_RIGHT,
-    HDFF_DRAW_QUARTER_TOP_LEFT,
-    HDFF_DRAW_QUARTER_TOP_RIGHT,
-    HDFF_DRAW_QUARTER_BOTTOM_LEFT,
-    HDFF_DRAW_QUARTER_BOTTOM_RIGHT,
-    HDFF_DRAW_QUARTER_TOP_LEFT_INVERTED,
-    HDFF_DRAW_QUARTER_TOP_RIGHT_INVERTED,
-    HDFF_DRAW_QUARTER_BOTTOM_LEFT_INVERTED,
-    HDFF_DRAW_QUARTER_BOTTOM_RIGHT_INVERTED
-} HdffDrawingFlags_t;
-
-
-int HdffCmdOsdConfigure(int OsdDevice, const HdffOsdConfig_t * Config);
-
-int HdffCmdOsdReset(int OsdDevice);
-
-
-int HdffCmdOsdCreateDisplay(int OsdDevice, uint16_t Width, uint16_t Height,
-                            HdffColorType_t ColorType, uint32_t * NewDisplay);
-
-int HdffCmdOsdDeleteDisplay(int OsdDevice, uint32_t Display);
-
-int HdffCmdOsdEnableDisplay(int OsdDevice, uint32_t Display, int Enable);
-
-int HdffCmdOsdSetDisplayOutputRectangle(int OsdDevice, uint32_t Display,
-                                        uint16_t X, uint16_t Y,
-                                        uint16_t Width, uint16_t Height);
-
-int HdffCmdOsdSetDisplayClippingArea(int OsdDevice, uint32_t Display,
-                                     int Enable, uint16_t X, uint16_t Y,
-                                     uint16_t Width, uint16_t Height);
-
-int HdffCmdOsdRenderDisplay(int OsdDevice, uint32_t Display);
-
-int HdffCmdOsdSaveRegion(int OsdDevice, uint32_t Display,
-                         uint16_t X, uint16_t Y,
-                         uint16_t Width, uint16_t Height);
-
-int HdffCmdOsdRestoreRegion(int OsdDevice, uint32_t Display);
-
-
-int HdffCmdOsdCreatePalette(int OsdDevice, HdffColorType_t ColorType,
-                            HdffColorFormat_t ColorFormat,
-                            uint32_t NumColors, const uint32_t * Colors,
-                            uint32_t * NewPalette);
-
-int HdffCmdOsdDeletePalette(int OsdDevice, uint32_t Palette);
-
-int HdffCmdOsdSetDisplayPalette(int OsdDevice, uint32_t Display,
-                                uint32_t Palette);
-
-int HdffCmdOsdSetPaletteColors(int OsdDevice, uint32_t Palette,
-                               HdffColorFormat_t ColorFormat,
-                               uint8_t StartColor, uint32_t NumColors,
-                               const uint32_t * Colors);
-
-
-int HdffCmdOsdCreateFontFace(int OsdDevice, const uint8_t * FontData,
-                             uint32_t DataSize, uint32_t * NewFontFace);
-
-int HdffCmdOsdDeleteFontFace(int OsdDevice, uint32_t FontFace);
-
-int HdffCmdOsdCreateFont(int OsdDevice, uint32_t FontFace, uint32_t Size,
-                         uint32_t * NewFont);
-
-int HdffCmdOsdDeleteFont(int OsdDevice, uint32_t Font);
-
-
-int HdffCmdOsdDrawRectangle(int OsdDevice, uint32_t Display, uint16_t X,
-                            uint16_t Y, uint16_t Width, uint16_t Height,
-                            uint32_t Color);
-
-int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
-                          uint16_t CY, uint16_t RadiusX, uint16_t RadiusY,
-                          uint32_t Color, uint32_t Flags);
-
-int HdffCmdOsdDrawSlope(int OsdDevice, uint32_t Display, uint16_t X,
-                        uint16_t Y, uint16_t Width, uint16_t Height,
-                        uint32_t Color, uint32_t Type);
-
-int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
-                       uint16_t X, uint16_t Y, const char * Text,
-                       uint32_t Color);
-
-int HdffCmdOsdDrawUtf8Text(int OsdDevice, uint32_t Display, uint32_t Font,
-                           uint16_t X, uint16_t Y, const char * Text,
-                           uint32_t Color);
-
-int HdffCmdOsdDrawWideText(int OsdDevice, uint32_t Display, uint32_t Font,
-                           uint16_t X, uint16_t Y, const uint16_t * Text,
-                           uint32_t Color);
-
-int HdffCmdOsdDrawBitmap(int OsdDevice, uint32_t Display, uint16_t X,
-                         uint16_t Y, const uint8_t * Bitmap, uint16_t BmpWidth,
-                         uint16_t BmpHeight, uint32_t BmpSize,
-                         HdffColorType_t ColorType, uint32_t Palette);
-
-
-#endif /* HDFFCMD_OSD_H */
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c
deleted file mode 100644
index d9bbe4564..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hdffcmd.h"
-#include "hdffcmd_base.h"
-#include "hdffcmd_defs.h"
-
-
-int HdffCmdRemoteSetProtocol(int OsdDevice, HdffRemoteProtocol_t Protocol)
-{
-    uint8_t cmdData[8];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_REMOTE_CONTROL,
-                       HDFF_MSG_REMOTE_SET_PROTOCOL);
-    BitBuffer_SetBits(&cmdBuf, 8, Protocol);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
-
-int HdffCmdRemoteSetAddressFilter(int OsdDevice, int Enable, uint32_t Address)
-{
-    uint8_t cmdData[12];
-    BitBuffer_t cmdBuf;
-    osd_raw_cmd_t osd_cmd;
-
-    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
-    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
-    osd_cmd.cmd_data = cmdData;
-    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
-                       HDFF_MSG_GROUP_REMOTE_CONTROL,
-                       HDFF_MSG_REMOTE_SET_ADDRESS_FILTER);
-    BitBuffer_SetBits(&cmdBuf, 1, Enable);
-    BitBuffer_SetBits(&cmdBuf, 7, 0); // reserved
-    BitBuffer_SetBits(&cmdBuf, 32, Address);
-    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
-    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
-}
diff --git a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h b/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h
deleted file mode 100644
index f2e6b8af1..000000000
--- a/PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_remote.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************
- *
- * HDFF firmware command interface library
- *
- * Copyright (C) 2011  Andreas Regel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *********************************************************************/
-
-#ifndef HDFFCMD_REMOTE_H
-#define HDFFCMD_REMOTE_H
-
-typedef enum HdffRemoteProtocol_t
-{
-    HDFF_REMOTE_PROTOCOL_NONE,
-    HDFF_REMOTE_PROTOCOL_RC5,
-    HDFF_REMOTE_PROTOCOL_RC6
-} HdffRemoteProtocol_t;
-
-
-int HdffCmdRemoteSetProtocol(int OsdDevice, HdffRemoteProtocol_t Protocol);
-
-int HdffCmdRemoteSetAddressFilter(int OsdDevice, int Enable, uint32_t Address);
-
-#endif /* HDFFCMD_REMOTE_H */
diff --git a/PLUGINS/src/dvbhddevice/menu.c b/PLUGINS/src/dvbhddevice/menu.c
deleted file mode 100644
index fa953fbcd..000000000
--- a/PLUGINS/src/dvbhddevice/menu.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * menu.c: The DVB HD Full Featured device main menu
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#include "menu.h"
-#include "setup.h"
-
-cHdffMenu::cHdffMenu(HDFF::cHdffCmdIf * pHdffCmdIf)
-:   cOsdMenu("dvbhddevice"),
-    mHdffCmdIf(pHdffCmdIf)
-{
-    mVideoConversionItem = new cOsdItem("", osUnknown, false);
-    Add(mVideoConversionItem);
-    SetHelp(tr("Video Conversion"), tr("TV on"), tr("TV off"));
-    SetVideoConversion();
-}
-
-cHdffMenu::~cHdffMenu()
-{
-}
-
-eOSState cHdffMenu::ProcessKey(eKeys key)
-{
-    eOSState state = cOsdMenu::ProcessKey(key);
-    if (state == osUnknown)
-    {
-        switch (key)
-        {
-            case kRed:
-                gHdffSetup.SetNextVideoConversion();
-                SetVideoConversion();
-                break;
-
-            case kGreen:
-                mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_ON);
-                state = osEnd;
-                break;
-
-            case kYellow:
-                mHdffCmdIf->CmdHdmiSendCecCommand(HDFF_CEC_COMMAND_TV_OFF);
-                state = osEnd;
-                break;
-
-            case kOk:
-                state = osEnd;
-                break;
-
-            default:
-                break;
-        }
-    }
-    return state;
-}
-
-void cHdffMenu::SetVideoConversion(void)
-{
-    gHdffSetup.SetVideoFormat(mHdffCmdIf);
-
-    char str[128];
-    sprintf(str, "%s: %s", tr("Video Conversion"), gHdffSetup.GetVideoConversionString());
-    mVideoConversionItem->SetText(str);
-    Display();
-}
diff --git a/PLUGINS/src/dvbhddevice/menu.h b/PLUGINS/src/dvbhddevice/menu.h
deleted file mode 100644
index 18b3d9979..000000000
--- a/PLUGINS/src/dvbhddevice/menu.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * menu.h: The DVB HD Full Featured device main menu
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#ifndef _HDFF_MENU_H_
-#define _HDFF_MENU_H_
-
-#include <vdr/osd.h>
-#include <vdr/plugin.h>
-
-#include "hdffcmd.h"
-
-class cHdffMenu : public cOsdMenu
-{
-private:
-    HDFF::cHdffCmdIf * mHdffCmdIf;
-
-    cOsdItem * mVideoConversionItem;
-
-    void SetVideoConversion(void);
-public:
-    cHdffMenu(HDFF::cHdffCmdIf * pHdffCmdIf);
-    virtual ~cHdffMenu();
-    virtual eOSState ProcessKey(eKeys Key);
-};
-
-#endif
diff --git a/PLUGINS/src/dvbhddevice/po/de_DE.po b/PLUGINS/src/dvbhddevice/po/de_DE.po
deleted file mode 100644
index 2bee15e0b..000000000
--- a/PLUGINS/src/dvbhddevice/po/de_DE.po
+++ /dev/null
@@ -1,128 +0,0 @@
-# VDR plugin language source file
-# Copyright (C) 2015 Andreas Regel
-# This file is distributed under the same license as the dvbhddevice package.
-# Christoph Haubrich <christoph1.haubrich@arcor.de>, 2011
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-09-21 14:01+0200\n"
-"PO-Revision-Date: 2011-04-25 21:44+0200\n"
-"Last-Translator: Christoph Haubrich\n"
-"Language-Team: <see README>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "HD Full Featured DVB device"
-msgstr "HD Full Featured DVB device"
-
-msgid "Video Conversion"
-msgstr "Bildanpassung"
-
-msgid "TV on"
-msgstr "TV ein"
-
-msgid "TV off"
-msgstr "TV aus"
-
-msgid "Automatic"
-msgstr "automatisch"
-
-msgid "Letterbox 16/9"
-msgstr "Letterbox 16:9"
-
-msgid "Letterbox 14/9"
-msgstr "Letterbox 14:9"
-
-msgid "Pillarbox"
-msgstr "Pillarbox"
-
-msgid "CentreCutOut"
-msgstr "CentreCutOut"
-
-msgid "Always 16/9"
-msgstr "immer 16:9"
-
-msgid "Zoom 16/9"
-msgstr "Zoome 16:9"
-
-msgid "Off"
-msgstr "aus"
-
-msgid "Frame rate"
-msgstr "passende Framerate"
-
-msgid "HD Only"
-msgstr "nur bei HD"
-
-msgid "Always"
-msgstr "immer"
-
-msgid "Disabled"
-msgstr "abgeschaltet"
-
-msgid "Analogue only"
-msgstr "nur analoge Ausgänge"
-
-msgid "HDMI only"
-msgstr "nur HDMI"
-
-msgid "Follow resolution"
-msgstr "folge Auflösung"
-
-msgid "none"
-msgstr "keins"
-
-msgid "Resolution"
-msgstr "Auflösung"
-
-msgid "Video Mode Adaption"
-msgstr "Auflösungsanpassung"
-
-msgid "TV format"
-msgstr "TV-Format"
-
-msgid "Analogue Video"
-msgstr "Analoges Video"
-
-msgid "Audio Delay (ms)"
-msgstr "Audio Verzögerung (ms)"
-
-msgid "Audio Downmix"
-msgstr "Audio Downmix"
-
-msgid "A/V Sync Shift (ms)"
-msgstr "A/V-Sync Verschiebung (ms)"
-
-msgid "OSD Size"
-msgstr "OSD Größe"
-
-msgid "HDMI CEC"
-msgstr "HDMI CEC"
-
-msgid "CEC: Switch TV on"
-msgstr "CEC: TV einschalten"
-
-msgid "CEC: Switch TV off"
-msgstr "CEC: TV ausschalten"
-
-msgid "Remote Control Protocol"
-msgstr "Fernbedienungsprotokoll"
-
-msgid "Remote Control Address"
-msgstr "Fernbedienungsadresse"
-
-msgid "High Level OSD"
-msgstr "High Level OSD"
-
-msgid "Allow True Color OSD"
-msgstr "Erlaube True Color OSD"
-
-msgid "True Color format"
-msgstr "True Color Format"
-
-msgid "Hide mainmenu entry"
-msgstr "Hauptmenüeintrag verstecken"
diff --git a/PLUGINS/src/dvbhddevice/po/et_EE.po b/PLUGINS/src/dvbhddevice/po/et_EE.po
deleted file mode 100644
index b483cfec9..000000000
--- a/PLUGINS/src/dvbhddevice/po/et_EE.po
+++ /dev/null
@@ -1,128 +0,0 @@
-# VDR plugin language source file
-# Copyright (C) 2015 Andreas Regel
-# This file is distributed under the same license as the dvbhddevice package.
-# Arthur Konovalov <artlov@gmail.com>, 2015
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-09-21 14:01+0200\n"
-"PO-Revision-Date: 2011-04-25 21:44+0200\n"
-"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
-"Language-Team: Estonian <vdr@linuxtv.org>\n"
-"Language: et\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "HD Full Featured DVB device"
-msgstr "Täisfunktsionaalne HD DVB seade"
-
-msgid "Video Conversion"
-msgstr "Video konverteerimine"
-
-msgid "TV on"
-msgstr "TV sisse"
-
-msgid "TV off"
-msgstr "TV välja"
-
-msgid "Automatic"
-msgstr "automaatne"
-
-msgid "Letterbox 16/9"
-msgstr "letterbox 16:9"
-
-msgid "Letterbox 14/9"
-msgstr "letterbox 14:9"
-
-msgid "Pillarbox"
-msgstr "pillarbox"
-
-msgid "CentreCutOut"
-msgstr "center cut out"
-
-msgid "Always 16/9"
-msgstr "alati 16:9"
-
-msgid "Zoom 16/9"
-msgstr "suum 16/9"
-
-msgid "Off"
-msgstr "väljas"
-
-msgid "Frame rate"
-msgstr "kaadrisagedus"
-
-msgid "HD Only"
-msgstr "ainult HD-resolutsioon"
-
-msgid "Always"
-msgstr "alati"
-
-msgid "Disabled"
-msgstr "keelatud"
-
-msgid "Analogue only"
-msgstr "ainult analoog"
-
-msgid "HDMI only"
-msgstr "ainult HDMI"
-
-msgid "Follow resolution"
-msgstr "vastavalt resolutsioonile"
-
-msgid "none"
-msgstr "ei"
-
-msgid "Resolution"
-msgstr "Resolutsioon"
-
-msgid "Video Mode Adaption"
-msgstr "Videorežiimi sobitus"
-
-msgid "TV format"
-msgstr "TV külgsuhe"
-
-msgid "Analogue Video"
-msgstr "Analoogvideo"
-
-msgid "Audio Delay (ms)"
-msgstr "Heli viide (ms)"
-
-msgid "Audio Downmix"
-msgstr "Heli downmix"
-
-msgid "A/V Sync Shift (ms)"
-msgstr "A/V-sünkro nihe (ms)"
-
-msgid "OSD Size"
-msgstr "Ekraanimenüü suurus"
-
-msgid "HDMI CEC"
-msgstr "HDMI CEC"
-
-msgid "CEC: Switch TV on"
-msgstr "CEC: TV sisselülitus"
-
-msgid "CEC: Switch TV off"
-msgstr "CEC: TV väljalülitus"
-
-msgid "Remote Control Protocol"
-msgstr "Kaugjuhtimispuldi protokoll"
-
-msgid "Remote Control Address"
-msgstr "Kaugjuhtimispuldi aadress"
-
-msgid "High Level OSD"
-msgstr "Kõrgema taseme ekraanimenüü"
-
-msgid "Allow True Color OSD"
-msgstr "True Color ekraanimenüü"
-
-msgid "True Color format"
-msgstr "True Color formaat"
-
-msgid "Hide mainmenu entry"
-msgstr "Peita peamenüü valikus"
diff --git a/PLUGINS/src/dvbhddevice/po/fi_FI.po b/PLUGINS/src/dvbhddevice/po/fi_FI.po
deleted file mode 100644
index c97827f19..000000000
--- a/PLUGINS/src/dvbhddevice/po/fi_FI.po
+++ /dev/null
@@ -1,128 +0,0 @@
-# VDR plugin language source file
-# Copyright (C) 2015 Andreas Regel
-# This file is distributed under the same license as the dvbhddevice package.
-# Christoph Haubrich <christoph1.haubrich@arcor.de>, 2011
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-09-21 14:01+0200\n"
-"PO-Revision-Date: 2011-04-25 21:44+0200\n"
-"Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: Finnish <vdr@linuxtv.org>\n"
-"Language: fi\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "HD Full Featured DVB device"
-msgstr "DVB-laite HD-ulostulolla"
-
-msgid "Video Conversion"
-msgstr "Näyttömuoto"
-
-msgid "TV on"
-msgstr "TV päälle"
-
-msgid "TV off"
-msgstr "TV kiinni"
-
-msgid "Automatic"
-msgstr "automaattinen"
-
-msgid "Letterbox 16/9"
-msgstr "letterbox 16:9"
-
-msgid "Letterbox 14/9"
-msgstr "letterbox 14:9"
-
-msgid "Pillarbox"
-msgstr "pillarbox"
-
-msgid "CentreCutOut"
-msgstr "center cut out"
-
-msgid "Always 16/9"
-msgstr "aina 16:9"
-
-msgid "Zoom 16/9"
-msgstr "zoom 16/9"
-
-msgid "Off"
-msgstr "ei"
-
-msgid "Frame rate"
-msgstr "kuvataajuuden mukaan"
-
-msgid "HD Only"
-msgstr "vain HD-resoluutiolla"
-
-msgid "Always"
-msgstr "aina"
-
-msgid "Disabled"
-msgstr "ei käytössä"
-
-msgid "Analogue only"
-msgstr "vain analoginen"
-
-msgid "HDMI only"
-msgstr "vain HDMI"
-
-msgid "Follow resolution"
-msgstr "resoluution mukaan"
-
-msgid "none"
-msgstr "ei"
-
-msgid "Resolution"
-msgstr "Kuvaresoluutio"
-
-msgid "Video Mode Adaption"
-msgstr "Sovita näyttömoodi"
-
-msgid "TV format"
-msgstr "Näytön kuvasuhde"
-
-msgid "Analogue Video"
-msgstr "Analoginen kuvalähtö"
-
-msgid "Audio Delay (ms)"
-msgstr "Äänen viive (ms)"
-
-msgid "Audio Downmix"
-msgstr "Äänen alasmiksaus"
-
-msgid "A/V Sync Shift (ms)"
-msgstr "A/V-synkronointi (ms)"
-
-msgid "OSD Size"
-msgstr "Kuvaruutunäytön koko"
-
-msgid "HDMI CEC"
-msgstr "Käytä HDMI CEC-toimintoa"
-
-msgid "CEC: Switch TV on"
-msgstr "CEC: Laita TV päälle"
-
-msgid "CEC: Switch TV off"
-msgstr "CEC: Sammuta TV"
-
-msgid "Remote Control Protocol"
-msgstr "Kaukosäätimen protokolla"
-
-msgid "Remote Control Address"
-msgstr "Kaukosäätimen osoite"
-
-msgid "High Level OSD"
-msgstr "Käytä korkean tason kuvaruutunäyttöä"
-
-msgid "Allow True Color OSD"
-msgstr "Salli tosivärit kuvaruutunäytölle"
-
-msgid "True Color format"
-msgstr "Näytä tosivärit muodossa"
-
-msgid "Hide mainmenu entry"
-msgstr "Piilota valinta päävalikosta"
diff --git a/PLUGINS/src/dvbhddevice/po/it_IT.po b/PLUGINS/src/dvbhddevice/po/it_IT.po
deleted file mode 100644
index 16752a81c..000000000
--- a/PLUGINS/src/dvbhddevice/po/it_IT.po
+++ /dev/null
@@ -1,131 +0,0 @@
-# VDR plugin language source file
-# Copyright (C) 2015 Andreas Regel
-# This file is distributed under the same license as the dvbhddevice package.
-# Christoph Haubrich <christoph1.haubrich@arcor.de>, 2011
-# Diego Pierotto <vdr-italian@tiscali.it>, 2013
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-09-21 14:01+0200\n"
-"PO-Revision-Date: 2015-02-08 19:48+0100\n"
-"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  <see README>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
-
-msgid "HD Full Featured DVB device"
-msgstr "Scheda DVB HD Full Featured"
-
-msgid "Video Conversion"
-msgstr "Conversione video"
-
-msgid "TV on"
-msgstr "TV accesa"
-
-msgid "TV off"
-msgstr "TV spenta"
-
-msgid "Automatic"
-msgstr "Automatica"
-
-msgid "Letterbox 16/9"
-msgstr "Letterbox 16:9"
-
-msgid "Letterbox 14/9"
-msgstr "Letterbox 14:9"
-
-msgid "Pillarbox"
-msgstr "Pillarbox"
-
-msgid "CentreCutOut"
-msgstr "CentreCutOut"
-
-msgid "Always 16/9"
-msgstr "Sempre 16:9"
-
-msgid "Zoom 16/9"
-msgstr "Ingrandimento 16/9"
-
-msgid "Off"
-msgstr "Spento"
-
-msgid "Frame rate"
-msgstr "Frame rate"
-
-msgid "HD Only"
-msgstr "Solo HD"
-
-msgid "Always"
-msgstr "Sempre"
-
-msgid "Disabled"
-msgstr "Disabilitata"
-
-msgid "Analogue only"
-msgstr "Solo analogica"
-
-msgid "HDMI only"
-msgstr "Solo HDMI"
-
-msgid "Follow resolution"
-msgstr "Risoluzione seguente"
-
-msgid "none"
-msgstr "nessuna"
-
-msgid "Resolution"
-msgstr "Risoluzione"
-
-msgid "Video Mode Adaption"
-msgstr "Adattamento modalità video"
-
-msgid "TV format"
-msgstr "Formato TV"
-
-msgid "Analogue Video"
-msgstr "Video analogico"
-
-msgid "Audio Delay (ms)"
-msgstr "Ritardo audio (ms)"
-
-msgid "Audio Downmix"
-msgstr "Scala Audio"
-
-msgid "A/V Sync Shift (ms)"
-msgstr "Alterna sincro A/V (ms)"
-
-msgid "OSD Size"
-msgstr "Dimensione OSD"
-
-msgid "HDMI CEC"
-msgstr "HDMI CEC"
-
-msgid "CEC: Switch TV on"
-msgstr "CEC: Passa a TV accesa"
-
-msgid "CEC: Switch TV off"
-msgstr "CEC: Passa a TV spenta"
-
-msgid "Remote Control Protocol"
-msgstr "Protocollo controllo remoto"
-
-msgid "Remote Control Address"
-msgstr "Indirizzo controllo remoto"
-
-msgid "High Level OSD"
-msgstr "OSD alto livello"
-
-msgid "Allow True Color OSD"
-msgstr "Permetti OSD True Color"
-
-msgid "True Color format"
-msgstr "Formato True Color"
-
-msgid "Hide mainmenu entry"
-msgstr "Nascondi voce menu principale"
diff --git a/PLUGINS/src/dvbhddevice/po/uk_UA.po b/PLUGINS/src/dvbhddevice/po/uk_UA.po
deleted file mode 100644
index 7d4381958..000000000
--- a/PLUGINS/src/dvbhddevice/po/uk_UA.po
+++ /dev/null
@@ -1,129 +0,0 @@
-# VDR plugin language source file.
-# Copyright (C) 2015 Andreas Regel
-# This file is distributed under the same license as the dvbhddevice package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2015
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-dvbhddevice 2.2.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2015-02-03 13:28+0100\n"
-"PO-Revision-Date: 2015-02-01 23:31+0100\n"
-"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
-"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.3\n"
-
-msgid "HD Full Featured DVB device"
-msgstr "HD Full Featured DVB device"
-
-msgid "Video Conversion"
-msgstr "Конвертація відео"
-
-msgid "TV on"
-msgstr "Вкл ТБ"
-
-msgid "TV off"
-msgstr "Викл ТБ"
-
-msgid "Automatic"
-msgstr "Автоматично"
-
-msgid "Letterbox 16/9"
-msgstr "Конверт 16:9"
-
-msgid "Letterbox 14/9"
-msgstr "Конверт 14:9"
-
-msgid "Pillarbox"
-msgstr "Pillarbox"
-
-msgid "CentreCutOut"
-msgstr "Вірізання від центру"
-
-msgid "Always 16/9"
-msgstr "Завжди 16:9"
-
-msgid "Zoom 16/9"
-msgstr "Допасувати до 16:9"
-
-msgid "Off"
-msgstr "Викл"
-
-msgid "Frame rate"
-msgstr "Частота кадрів"
-
-msgid "HD Only"
-msgstr "Тільки HD"
-
-msgid "Always"
-msgstr "Завжди"
-
-msgid "Disabled"
-msgstr "Відключено"
-
-msgid "Analogue only"
-msgstr "Тільки аналоговий"
-
-msgid "HDMI only"
-msgstr "Тільки HDMI"
-
-msgid "Follow resolution"
-msgstr "Відносно розд. здатн."
-
-msgid "none"
-msgstr "немає"
-
-msgid "Resolution"
-msgstr "Розд. здатність"
-
-msgid "Video Mode Adaption"
-msgstr "Адаптація відео режиму"
-
-msgid "TV format"
-msgstr "Формат ТБ"
-
-msgid "Analogue Video"
-msgstr "Аналогове відео"
-
-msgid "Audio Delay (ms)"
-msgstr "Затримка аудіо (мс)"
-
-msgid "Audio Downmix"
-msgstr "Міксування аудіо"
-
-msgid "A/V Sync Shift (ms)"
-msgstr "А/В зсув синхронізації (мс)"
-
-msgid "OSD Size"
-msgstr "Розмір OSD"
-
-msgid "HDMI CEC"
-msgstr "HDMI CEC"
-
-msgid "CEC: Switch TV on"
-msgstr "CEC: включити ТБ"
-
-msgid "CEC: Switch TV off"
-msgstr "CEC: виключити ТБ"
-
-msgid "Remote Control Protocol"
-msgstr "Протокол пульта"
-
-msgid "Remote Control Address"
-msgstr "Адрес пульта"
-
-msgid "High Level OSD"
-msgstr "High Level OSD"
-
-msgid "Allow True Color OSD"
-msgstr "Включити True Color OSD"
-
-msgid "True Color format"
-msgstr "Формат True Color"
-
-msgid "Hide mainmenu entry"
-msgstr "Приховати в головному меню"
diff --git a/PLUGINS/src/dvbhddevice/setup.c b/PLUGINS/src/dvbhddevice/setup.c
deleted file mode 100644
index fd16a4807..000000000
--- a/PLUGINS/src/dvbhddevice/setup.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * setup.c: Setup for the DVB HD Full Featured On Screen Display
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#include "setup.h"
-#include "hdffcmd.h"
-
-const int kResolution1080i = 0;
-const int kResolution720p = 1;
-const int kResolution576p = 2;
-const int kResolution576i = 3;
-
-
-cHdffSetup gHdffSetup;
-
-cHdffSetup::cHdffSetup(void)
-{
-    Resolution = kResolution1080i;
-    VideoModeAdaption = HDFF_VIDEO_MODE_ADAPT_OFF;
-    TvFormat = HDFF_TV_FORMAT_16_BY_9;
-    VideoConversion = HDFF_VIDEO_CONVERSION_PILLARBOX;
-    AnalogueVideo = HDFF_VIDEO_OUT_CVBS_YUV;
-    AudioDelay = 0;
-    AudioDownmix = HDFF_AUDIO_DOWNMIX_AUTOMATIC;
-    AvSyncShift = 0;
-    OsdSize = 0;
-    CecEnabled = 1;
-    CecTvOn = 1;
-    CecTvOff = 0;
-    RemoteProtocol = 1;
-    RemoteAddress = -1;
-    HighLevelOsd = 1;
-    TrueColorOsd = 1;
-    TrueColorFormat = 0;
-    HideMainMenu = 0;
-}
-
-bool cHdffSetup::SetupParse(const char *Name, const char *Value)
-{
-    if      (strcmp(Name, "Resolution")        == 0) Resolution        = atoi(Value);
-    else if (strcmp(Name, "VideoModeAdaption") == 0) VideoModeAdaption = atoi(Value);
-    else if (strcmp(Name, "TvFormat")          == 0) TvFormat          = atoi(Value);
-    else if (strcmp(Name, "VideoConversion")   == 0) VideoConversion   = atoi(Value);
-    else if (strcmp(Name, "AnalogueVideo")     == 0) AnalogueVideo     = atoi(Value);
-    else if (strcmp(Name, "AudioDelay")        == 0) AudioDelay        = atoi(Value);
-    else if (strcmp(Name, "AudioDownmix")      == 0) AudioDownmix      = atoi(Value);
-    else if (strcmp(Name, "AvSyncShift")       == 0) AvSyncShift       = atoi(Value);
-    else if (strcmp(Name, "OsdSize")           == 0) OsdSize           = atoi(Value);
-    else if (strcmp(Name, "CecEnabled")        == 0) CecEnabled        = atoi(Value);
-    else if (strcmp(Name, "CecTvOn")           == 0) CecTvOn           = atoi(Value);
-    else if (strcmp(Name, "CecTvOff")          == 0) CecTvOff          = atoi(Value);
-    else if (strcmp(Name, "RemoteProtocol")    == 0) RemoteProtocol    = atoi(Value);
-    else if (strcmp(Name, "RemoteAddress")     == 0) RemoteAddress     = atoi(Value);
-    else if (strcmp(Name, "HighLevelOsd")      == 0) HighLevelOsd      = atoi(Value);
-    else if (strcmp(Name, "TrueColorOsd")      == 0) TrueColorOsd      = atoi(Value);
-    else if (strcmp(Name, "TrueColorFormat")   == 0) TrueColorFormat   = atoi(Value);
-    else if (strcmp(Name, "HideMainMenu")      == 0) HideMainMenu      = atoi(Value);
-    else return false;
-    return true;
-}
-
-void cHdffSetup::GetOsdSize(int &Width, int &Height, double &PixelAspect)
-{
-    if (OsdSize == 0) {
-        if (Resolution == kResolution1080i) {
-            Width = 1920;
-            Height = 1080;
-        }
-        else if (Resolution == kResolution720p) {
-            Width = 1280;
-            Height = 720;
-        }
-        else {
-            Width = 720;
-            Height = 576;
-        }
-        if (TvFormat == HDFF_TV_FORMAT_16_BY_9)
-            PixelAspect = 16.0 / 9.0;
-        else
-            PixelAspect = 4.0 / 3.0;
-    }
-    else if (OsdSize == 1) {
-        Width = 1920;
-        Height = 1080;
-        PixelAspect = 16.0 / 9.0;
-    }
-    else if (OsdSize == 2) {
-        Width = 1280;
-        Height = 720;
-        PixelAspect = 16.0 / 9.0;
-    }
-    else if (OsdSize == 3) {
-        Width = 1024;
-        Height = 576;
-        PixelAspect = 16.0 / 9.0;
-    }
-    else {
-        Width = 720;
-        Height = 576;
-        PixelAspect = 4.0 / 3.0;
-    }
-    PixelAspect /= double(Width) / Height;
-}
-
-HdffVideoMode_t cHdffSetup::GetVideoMode(void)
-{
-    switch (Resolution)
-    {
-        case kResolution1080i:
-        default:
-            return HDFF_VIDEO_MODE_1080I50;
-        case kResolution720p:
-            return HDFF_VIDEO_MODE_720P50;
-        case kResolution576p:
-            return HDFF_VIDEO_MODE_576P50;
-        case kResolution576i:
-            return HDFF_VIDEO_MODE_576I50;
-    }
-}
-
-void cHdffSetup::SetNextVideoConversion(void)
-{
-    int nextVideoConversion = HDFF_VIDEO_CONVERSION_AUTOMATIC;
-
-    if (TvFormat == HDFF_TV_FORMAT_16_BY_9)
-    {
-        switch (VideoConversion)
-        {
-            case HDFF_VIDEO_CONVERSION_PILLARBOX:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
-                break;
-            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9;
-                break;
-            case HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9;
-                break;
-            case HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_PILLARBOX;
-                break;
-        }
-    }
-    else
-    {
-        switch (VideoConversion)
-        {
-            case HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9;
-                break;
-            case HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
-                break;
-            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
-                nextVideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
-                break;
-        }
-    }
-    VideoConversion = nextVideoConversion;
-}
-
-const char * cHdffSetup::GetVideoConversionString(void)
-{
-    switch (VideoConversion)
-    {
-        case HDFF_VIDEO_CONVERSION_AUTOMATIC:
-        default:
-            return tr("Automatic");
-        case HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9:
-            return tr("Letterbox 16/9");
-        case HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9:
-            return tr("Letterbox 14/9");
-        case HDFF_VIDEO_CONVERSION_PILLARBOX:
-            return tr("Pillarbox");
-        case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
-            return tr("CentreCutOut");
-        case HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9:
-            return tr("Always 16/9");
-        case HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9:
-            return tr("Zoom 16/9");
-    }
-}
-
-void cHdffSetup::SetVideoFormat(HDFF::cHdffCmdIf * HdffCmdIf)
-{
-    HdffVideoFormat_t videoFormat;
-
-    videoFormat.AutomaticEnabled = true;
-    videoFormat.AfdEnabled = false;
-    videoFormat.TvFormat = (HdffTvFormat_t) TvFormat;
-    videoFormat.VideoConversion = (HdffVideoConversion_t) VideoConversion;
-    HdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
-}
-
-cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
-{
-    const int kResolutions = 4;
-    const int kVideoModeAdaptions = 4;
-    const int kTvFormats = 2;
-    const int kAnalogueVideos = 4;
-    const int kAudioDownmixes = 5;
-    const int kOsdSizes = 5;
-    const int kRemoteProtocols = 3;
-    const int kTrueColorFormats = 3;
-
-    static const char * ResolutionItems[kResolutions] =
-    {
-        "1080i",
-        "720p",
-        "576p",
-        "576i",
-    };
-
-    static const char * VideoModeAdaptionItems[kVideoModeAdaptions] =
-    {
-        tr("Off"),
-        tr("Frame rate"),
-        tr("HD Only"),
-        tr("Always")
-    };
-
-    static const char * TvFormatItems[kTvFormats] =
-    {
-        "4/3",
-        "16/9",
-    };
-
-    static const char * AnalogueVideoItems[kAnalogueVideos] =
-    {
-        tr("Disabled"),
-        "RGB",
-        "CVBS + YUV",
-        "YC (S-Video)",
-    };
-
-    static const char * AudioDownmixItems[kAudioDownmixes] =
-    {
-        tr("Disabled"),
-        tr("Analogue only"),
-        tr("Always"),
-        tr("Automatic"),
-        tr("HDMI only"),
-    };
-
-    static const char * OsdSizeItems[kOsdSizes] =
-    {
-        tr("Follow resolution"),
-        "1920x1080",
-        "1280x720",
-        "1024x576",
-        "720x576",
-    };
-
-    static const char * RemoteProtocolItems[] =
-    {
-        tr("none"),
-        "RC5",
-        "RC6",
-    };
-
-    static const char * TrueColorFormatItems[kTrueColorFormats] =
-    {
-        "ARGB8888",
-        "ARGB8565",
-        "ARGB4444",
-    };
-
-    mHdffCmdIf = pHdffCmdIf;
-    mNewHdffSetup = gHdffSetup;
-
-    Add(new cMenuEditStraItem(tr("Resolution"), &mNewHdffSetup.Resolution, kResolutions, ResolutionItems));
-    Add(new cMenuEditStraItem(tr("Video Mode Adaption"), &mNewHdffSetup.VideoModeAdaption, kVideoModeAdaptions, VideoModeAdaptionItems));
-    mTvFormatItem = new cMenuEditStraItem(tr("TV format"), &mNewHdffSetup.TvFormat, kTvFormats, TvFormatItems);
-    Add(mTvFormatItem);
-    Add(new cMenuEditStraItem(tr("Analogue Video"), &mNewHdffSetup.AnalogueVideo, kAnalogueVideos, AnalogueVideoItems));
-    Add(new cMenuEditIntItem(tr("Audio Delay (ms)"), &mNewHdffSetup.AudioDelay, 0, 500));
-    Add(new cMenuEditStraItem(tr("Audio Downmix"), &mNewHdffSetup.AudioDownmix, kAudioDownmixes, AudioDownmixItems));
-    Add(new cMenuEditIntItem(tr("A/V Sync Shift (ms)"), &mNewHdffSetup.AvSyncShift, -500, 500));
-    Add(new cMenuEditStraItem(tr("OSD Size"), &mNewHdffSetup.OsdSize, kOsdSizes, OsdSizeItems));
-    Add(new cMenuEditBoolItem(tr("HDMI CEC"), &mNewHdffSetup.CecEnabled));
-    Add(new cMenuEditBoolItem(tr("CEC: Switch TV on"), &mNewHdffSetup.CecTvOn));
-    Add(new cMenuEditBoolItem(tr("CEC: Switch TV off"), &mNewHdffSetup.CecTvOff));
-    Add(new cMenuEditStraItem(tr("Remote Control Protocol"), &mNewHdffSetup.RemoteProtocol, kRemoteProtocols, RemoteProtocolItems));
-    Add(new cMenuEditIntItem(tr("Remote Control Address"), &mNewHdffSetup.RemoteAddress, -1, 31));
-    Add(new cMenuEditBoolItem(tr("High Level OSD"), &mNewHdffSetup.HighLevelOsd));
-    Add(new cMenuEditBoolItem(tr("Allow True Color OSD"), &mNewHdffSetup.TrueColorOsd));
-    Add(new cMenuEditStraItem(tr("True Color format"), &mNewHdffSetup.TrueColorFormat, kTrueColorFormats, TrueColorFormatItems));
-    Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &mNewHdffSetup.HideMainMenu));
-
-    mVideoConversion = 0;
-    if (mNewHdffSetup.TvFormat == HDFF_TV_FORMAT_16_BY_9)
-    {
-        switch (mNewHdffSetup.VideoConversion)
-        {
-            case HDFF_VIDEO_CONVERSION_PILLARBOX:
-                mVideoConversion = 0;
-                break;
-            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
-                mVideoConversion = 1;
-                break;
-            case HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9:
-                mVideoConversion = 2;
-                break;
-            case HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9:
-                mVideoConversion = 3;
-                break;
-        }
-    }
-    else
-    {
-        switch (mNewHdffSetup.VideoConversion)
-        {
-            case HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9:
-                mVideoConversion = 0;
-                break;
-            case HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9:
-                mVideoConversion = 1;
-                break;
-            case HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT:
-                mVideoConversion = 2;
-                break;
-        }
-    }
-    BuildVideoConversionItem();
-}
-
-cHdffSetupPage::~cHdffSetupPage(void)
-{
-}
-
-void cHdffSetupPage::BuildVideoConversionItem(void)
-{
-    const int kVideoConversions4by3 = 3;
-    const int kVideoConversions16by9 = 4;
-
-    static const char * VideoConversionItems4by3[kVideoConversions4by3] =
-    {
-        tr("Letterbox 16/9"),
-        tr("Letterbox 14/9"),
-        tr("CentreCutOut")
-    };
-
-    static const char * VideoConversionItems16by9[kVideoConversions16by9] =
-    {
-        tr("Pillarbox"),
-        tr("CentreCutOut"),
-        tr("Always 16/9"),
-        tr("Zoom 16/9")
-    };
-
-    cOsdItem * item;
-
-    cList<cOsdItem>::Del(mTvFormatItem->Next());
-    if (mNewHdffSetup.TvFormat == HDFF_TV_FORMAT_16_BY_9)
-    {
-        item = new cMenuEditStraItem(tr("Video Conversion"), &mVideoConversion,
-                kVideoConversions16by9, VideoConversionItems16by9);
-    }
-    else
-    {
-        item = new cMenuEditStraItem(tr("Video Conversion"), &mVideoConversion,
-                kVideoConversions4by3, VideoConversionItems4by3);
-    }
-    Add(item, false, mTvFormatItem);
-}
-
-void cHdffSetupPage::Store(void)
-{
-    if (mNewHdffSetup.TvFormat == HDFF_TV_FORMAT_16_BY_9)
-    {
-        switch (mVideoConversion)
-        {
-            case 0:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_PILLARBOX;
-                break;
-            case 1:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
-                break;
-            case 2:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_ALWAYS_16_BY_9;
-                break;
-            case 3:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_ZOOM_16_BY_9;
-                break;
-        }
-    }
-    else
-    {
-        switch (mVideoConversion)
-        {
-            case 0:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
-                break;
-            case 1:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_14_BY_9;
-                break;
-            case 2:
-                mNewHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
-                break;
-        }
-    }
-    SetupStore("Resolution", mNewHdffSetup.Resolution);
-    SetupStore("VideoModeAdaption", mNewHdffSetup.VideoModeAdaption);
-    SetupStore("TvFormat", mNewHdffSetup.TvFormat);
-    SetupStore("VideoConversion", mNewHdffSetup.VideoConversion);
-    SetupStore("AnalogueVideo", mNewHdffSetup.AnalogueVideo);
-    SetupStore("AudioDelay", mNewHdffSetup.AudioDelay);
-    SetupStore("AudioDownmix", mNewHdffSetup.AudioDownmix);
-    SetupStore("AvSyncShift", mNewHdffSetup.AvSyncShift);
-    SetupStore("OsdSize", mNewHdffSetup.OsdSize);
-    SetupStore("CecEnabled", mNewHdffSetup.CecEnabled);
-    SetupStore("CecTvOn", mNewHdffSetup.CecTvOn);
-    SetupStore("CecTvOff", mNewHdffSetup.CecTvOff);
-    SetupStore("RemoteProtocol", mNewHdffSetup.RemoteProtocol);
-    SetupStore("RemoteAddress", mNewHdffSetup.RemoteAddress);
-    SetupStore("HighLevelOsd", mNewHdffSetup.HighLevelOsd);
-    SetupStore("TrueColorOsd", mNewHdffSetup.TrueColorOsd);
-    SetupStore("TrueColorFormat", mNewHdffSetup.TrueColorFormat);
-    SetupStore("HideMainMenu", mNewHdffSetup.HideMainMenu);
-
-    if (mHdffCmdIf)
-    {
-        if (mNewHdffSetup.Resolution != gHdffSetup.Resolution)
-        {
-            mHdffCmdIf->CmdHdmiSetVideoMode(mNewHdffSetup.GetVideoMode());
-        }
-        HdffHdmiConfig_t hdmiConfig;
-
-        mNewHdffSetup.SetVideoFormat(mHdffCmdIf);
-
-        mHdffCmdIf->CmdAvSetAudioDelay(mNewHdffSetup.AudioDelay);
-        mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) mNewHdffSetup.AudioDownmix);
-        mHdffCmdIf->CmdAvSetSyncShift(mNewHdffSetup.AvSyncShift);
-
-        mHdffCmdIf->CmdMuxSetVideoOut((HdffVideoOut_t) mNewHdffSetup.AnalogueVideo);
-
-        memset(&hdmiConfig, 0, sizeof(hdmiConfig));
-        hdmiConfig.TransmitAudio = true;
-        hdmiConfig.ForceDviMode = false;
-        hdmiConfig.CecEnabled = mNewHdffSetup.CecEnabled;
-        hdmiConfig.VideoModeAdaption = (HdffVideoModeAdaption_t) mNewHdffSetup.VideoModeAdaption;
-        mHdffCmdIf->CmdHdmiConfigure(&hdmiConfig);
-
-        mHdffCmdIf->CmdRemoteSetProtocol((HdffRemoteProtocol_t) mNewHdffSetup.RemoteProtocol);
-        mHdffCmdIf->CmdRemoteSetAddressFilter(mNewHdffSetup.RemoteAddress >= 0, mNewHdffSetup.RemoteAddress);
-    }
-
-    gHdffSetup = mNewHdffSetup;
-}
-
-eOSState cHdffSetupPage::ProcessKey(eKeys key)
-{
-    eOSState state = cMenuSetupPage::ProcessKey(key);
-
-    if (state == osContinue)
-    {
-        cOsdItem * item;
-        switch (key)
-        {
-            case kLeft:
-            case kRight:
-                item = Get(Current());
-                if (item == mTvFormatItem)
-                {
-                    mVideoConversion = 0;
-                    BuildVideoConversionItem();
-                    Display();
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    return state;
-}
diff --git a/PLUGINS/src/dvbhddevice/setup.h b/PLUGINS/src/dvbhddevice/setup.h
deleted file mode 100644
index 582ee76c4..000000000
--- a/PLUGINS/src/dvbhddevice/setup.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * setup.h: Setup for the DVB HD Full Featured On Screen Display
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#ifndef _HDFF_SETUP_H_
-#define _HDFF_SETUP_H_
-
-#include <vdr/plugin.h>
-#include "hdffcmd.h"
-
-struct cHdffSetup
-{
-    cHdffSetup(void);
-    bool SetupParse(const char * Name, const char * Value);
-    void GetOsdSize(int &Width, int &Height, double &PixelAspect);
-    HdffVideoMode_t GetVideoMode(void);
-    void SetNextVideoConversion(void);
-    const char * GetVideoConversionString(void);
-    void SetVideoFormat(HDFF::cHdffCmdIf * HdffCmdIf);
-
-    int Resolution;
-    int VideoModeAdaption;
-    int TvFormat;
-    int VideoConversion;
-    int AnalogueVideo;
-    int AudioDelay;
-    int AudioDownmix;
-    int AvSyncShift;
-    int OsdSize;
-    int CecEnabled;
-    int CecTvOn;
-    int CecTvOff;
-    int RemoteProtocol;
-    int RemoteAddress;
-
-    int HighLevelOsd;
-    int TrueColorOsd;
-    int TrueColorFormat;
-
-    int HideMainMenu;
-};
-
-extern cHdffSetup gHdffSetup;
-
-class cHdffSetupPage : public cMenuSetupPage
-{
-private:
-    HDFF::cHdffCmdIf * mHdffCmdIf;
-    cHdffSetup mNewHdffSetup;
-    cOsdItem * mTvFormatItem;
-    int mVideoConversion;
-
-    void BuildVideoConversionItem(void);
-
-protected:
-    virtual void Store(void);
-
-public:
-    cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf);
-    virtual ~cHdffSetupPage(void);
-    virtual eOSState ProcessKey(eKeys Key);
-};
-
-#endif
diff --git a/PLUGINS/src/dvbsddevice/COPYING b/PLUGINS/src/dvbsddevice/COPYING
deleted file mode 100644
index f90922eea..000000000
--- a/PLUGINS/src/dvbsddevice/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
deleted file mode 100644
index 68e3e6dd1..000000000
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ /dev/null
@@ -1,65 +0,0 @@
-VDR Plugin 'dvbsddevice' Revision History
------------------------------------------
-
-2009-12-28: Version 0.0.1
-
-- Initial revision.
-
-2010-01-04: Version 0.0.2
-
-- Calling the MakePrimaryDevice() function of the base class to allow
-  the cDevice to stop displaying subtitles.
-- Added support for DVB cards with multiple fontends.
-
-2010-01-30: Version 0.0.3
-
-- The PCR pid is now recorded for channels where this is different from the
-  video PID.
-
-2011-04-17: Version 0.0.4
-
-- Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
-
-2011-08-27: Version 0.0.5
-
-- Added option --outputonly to use the device only for output (thanks to Udo Richter).
-
-2012-03-07: Version 0.0.6
-
-- Removed the call to EITScanner.UsesDevice(this) from dvbsddevice.c, because
-  the code following these calls is only executed if LiveView is true, which is
-  never the case when the EITScanner switches to a channel.
-
-2012-12-27: Version 0.0.7
-
-- Adapted Makefile to changes introduced in recent VDR versions.
-
-2013-01-12: Version 0.0.8
-
-- Adapted Makefile to changes introduced in recent VDR versions.
-
-2013-01-25: Version 0.0.9
-
-- Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
-
-2013-03-31: Version 2.0.0
-
-- Official release.
-
-2013-08-22: Version 2.0.1
-
-- Fixed handling the -o option (short form of --outputonly; problem reported by
-  Mario Edelmann).
-
-2014-01-01: Version 2.1.1
-
-- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
-- cDevice::TrickSpeed() now has an additional parameter named Forward.
-
-2014-03-15: Version 2.1.2
-
-- The function cDevice::GetVideoSystem() has been deprecated.
-
-2015-02-19: Version 2.2.0
-
-- Official release.
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
deleted file mode 100644
index a86477418..000000000
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-
-PLUGIN = dvbsddevice
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The directory environment:
-
-# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
-LIBDIR = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
-#
-TMPDIR ?= /tmp
-
-### The compiler options:
-
-export CFLAGS   = $(call PKGCFG,cflags)
-export CXXFLAGS = $(call PKGCFG,cxxflags)
-
-### The version number of VDR's plugin API:
-
-APIVERSION = $(call PKGCFG,apiversion)
-
-### Allow user defined options to overwrite defaults:
-
--include $(PLGCFG)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
-
-### Includes and Defines (add further entries here):
-
-INCLUDES +=
-
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o dvbsdffdevice.o dvbsdffosd.o
-
-### The main target:
-
-all: $(SOFILE)
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Targets:
-
-$(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-
-install-lib: $(SOFILE)
-	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-
-install: install-lib
-
-dist: clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/dvbsddevice/README b/PLUGINS/src/dvbsddevice/README
deleted file mode 100644
index 9b1280fee..000000000
--- a/PLUGINS/src/dvbsddevice/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by:                  Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
-
-Project's homepage:          http://www.tvdr.de
-
-Latest version available at: ftp://ftp.tvdr.de/vdr
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-See the file COPYING for more information.
-
-Description:
-
-The 'dvbsddevice' plugin implements the output device for the
-"Full Featured" DVB cards based on the TechnoTrend/Fujitsu-Siemens
-design. This code was originally part of the core VDR source, and
-was moved into this plugin in VDR version 1.7.11.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
deleted file mode 100644
index 81c15e2bc..000000000
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dvbsddevice.c: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbsddevice.c 3.4 2015/02/17 13:11:55 kls Exp $
- */
-
-#include <getopt.h>
-#include <vdr/plugin.h>
-#include "dvbsdffdevice.h"
-
-static const char *VERSION        = "2.2.0";
-static const char *DESCRIPTION    = "SD Full Featured DVB device";
-
-class cPluginDvbsddevice : public cPlugin {
-private:
-  cDvbSdFfDeviceProbe *probe;
-public:
-  cPluginDvbsddevice(void);
-  virtual ~cPluginDvbsddevice();
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
-  virtual const char *CommandLineHelp(void);
-  virtual bool ProcessArgs(int argc, char *argv[]);
-  };
-
-cPluginDvbsddevice::cPluginDvbsddevice(void)
-{
-  probe = new cDvbSdFfDeviceProbe;
-}
-
-cPluginDvbsddevice::~cPluginDvbsddevice()
-{
-  delete probe;
-}
-
-const char *cPluginDvbsddevice::CommandLineHelp(void)
-{
-  return "  -o        --outputonly   do not receive, just use as output device\n";
-}
-
-bool cPluginDvbsddevice::ProcessArgs(int argc, char *argv[])
-{
-  static struct option long_options[] = {
-       { "outputonly", no_argument, NULL, 'o' },
-       { NULL,         no_argument, NULL,  0  }
-     };
-
-  int c;
-  while ((c = getopt_long(argc, argv, "o", long_options, NULL)) != -1) {
-        switch (c) {
-          case 'o': probe->SetOutputOnly(true);
-                    break;
-          default:  return false;
-          }
-        }
-  return true;
-}
-
-VDRPLUGINCREATOR(cPluginDvbsddevice); // Don't touch this!
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
deleted file mode 100644
index 5711e04df..000000000
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- * dvbsdffdevice.h: The DVB SD Full Featured device interface
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbsdffdevice.c 3.3 2014/03/15 12:35:21 kls Exp $
- */
-
-#include "dvbsdffdevice.h"
-#include <errno.h>
-#include <limits.h>
-#include <linux/videodev2.h>
-#include <linux/dvb/audio.h>
-#include <linux/dvb/dmx.h>
-#include <linux/dvb/video.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <vdr/eitscan.h>
-#include <vdr/transfer.h>
-#include "dvbsdffosd.h"
-
-// --- cDvbSdFfDevice --------------------------------------------------------
-
-int cDvbSdFfDevice::devVideoOffset = -1;
-
-cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly)
-:cDvbDevice(Adapter, Frontend)
-{
-  spuDecoder = NULL;
-  digitalAudio = false;
-  playMode = pmNone;
-  outputOnly = OutputOnly;
-
-  // Devices that are only present on cards with decoders:
-
-  fd_osd      = DvbOpen(DEV_DVB_OSD,    adapter, frontend, O_RDWR);
-  fd_video    = DvbOpen(DEV_DVB_VIDEO,  adapter, frontend, O_RDWR | O_NONBLOCK);
-  fd_audio    = DvbOpen(DEV_DVB_AUDIO,  adapter, frontend, O_RDWR | O_NONBLOCK);
-  fd_stc      = DvbOpen(DEV_DVB_DEMUX,  adapter, frontend, O_RDWR);
-
-  // The offset of the /dev/video devices:
-
-  if (devVideoOffset < 0) { // the first one checks this
-     FILE *f = NULL;
-     char buffer[PATH_MAX];
-     for (int ofs = 0; ofs < 100; ofs++) {
-         snprintf(buffer, sizeof(buffer), "/proc/video/dev/video%d", ofs);
-         if ((f = fopen(buffer, "r")) != NULL) {
-            if (fgets(buffer, sizeof(buffer), f)) {
-               if (strstr(buffer, "DVB Board")) { // found the _first_ DVB card
-                  devVideoOffset = ofs;
-                  dsyslog("video device offset is %d", devVideoOffset);
-                  break;
-                  }
-               }
-            else
-               break;
-            fclose(f);
-            }
-         else
-            break;
-         }
-     if (devVideoOffset < 0)
-        devVideoOffset = 0;
-     if (f)
-        fclose(f);
-     }
-  devVideoIndex = devVideoOffset >= 0 ? devVideoOffset++ : -1;
-}
-
-cDvbSdFfDevice::~cDvbSdFfDevice()
-{
-  delete spuDecoder;
-  // We're not explicitly closing any device files here, since this sometimes
-  // caused segfaults. Besides, the program is about to terminate anyway...
-}
-
-void cDvbSdFfDevice::MakePrimaryDevice(bool On)
-{
-  if (On)
-     new cDvbOsdProvider(fd_osd);
-  cDvbDevice::MakePrimaryDevice(On);
-}
-
-bool cDvbSdFfDevice::HasDecoder(void) const
-{
-  return true;
-}
-
-bool cDvbSdFfDevice::AvoidRecording(void) const
-{
-  return true;
-}
-
-cSpuDecoder *cDvbSdFfDevice::GetSpuDecoder(void)
-{
-  if (!spuDecoder && IsPrimaryDevice())
-     spuDecoder = new cDvbSpuDecoder();
-  return spuDecoder;
-}
-
-uchar *cDvbSdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
-{
-  if (devVideoIndex < 0)
-     return NULL;
-  char buffer[PATH_MAX];
-  snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, devVideoIndex);
-  int videoDev = open(buffer, O_RDWR);
-  if (videoDev >= 0) {
-     uchar *result = NULL;
-     // set up the size and RGB
-     v4l2_format fmt;
-     memset(&fmt, 0, sizeof(fmt));
-     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-     fmt.fmt.pix.width = SizeX;
-     fmt.fmt.pix.height = SizeY;
-     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
-     fmt.fmt.pix.field = V4L2_FIELD_ANY;
-     if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) {
-        v4l2_requestbuffers reqBuf;
-        memset(&reqBuf, 0, sizeof(reqBuf));
-        reqBuf.count = 2;
-        reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        reqBuf.memory = V4L2_MEMORY_MMAP;
-        if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) {
-           v4l2_buffer mbuf;
-           memset(&mbuf, 0, sizeof(mbuf));
-           mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-           mbuf.memory = V4L2_MEMORY_MMAP;
-           if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) {
-              int msize = mbuf.length;
-              unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-              if (mem && mem != (unsigned char *)-1) {
-                 v4l2_buffer buf;
-                 memset(&buf, 0, sizeof(buf));
-                 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                 buf.memory = V4L2_MEMORY_MMAP;
-                 buf.index = 0;
-                 if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) {
-                    v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                    if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) {
-                       memset(&buf, 0, sizeof(buf));
-                       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                       buf.memory = V4L2_MEMORY_MMAP;
-                       buf.index = 0;
-                       if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) {
-                          if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) {
-                             // make RGB out of BGR:
-                             int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height;
-                             unsigned char *mem1 = mem;
-                             for (int i = 0; i < memsize; i++) {
-                                 unsigned char tmp = mem1[2];
-                                 mem1[2] = mem1[0];
-                                 mem1[0] = tmp;
-                                 mem1 += 3;
-                                 }
-
-                             if (Quality < 0)
-                                Quality = 100;
-
-                             dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height);
-                             if (Jpeg) {
-                                // convert to JPEG:
-                                result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality);
-                                if (!result)
-                                   esyslog("ERROR: failed to convert image to JPEG");
-                                }
-                             else {
-                                // convert to PNM:
-                                char buf[32];
-                                snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
-                                int l = strlen(buf);
-                                int bytes = memsize * 3;
-                                Size = l + bytes;
-                                result = MALLOC(uchar, Size);
-                                if (result) {
-                                   memcpy(result, buf, l);
-                                   memcpy(result + l, mem, bytes);
-                                   }
-                                else
-                                   esyslog("ERROR: failed to convert image to PNM");
-                                }
-                             }
-                          else
-                             esyslog("ERROR: video device VIDIOC_STREAMOFF failed");
-                          }
-                       else
-                          esyslog("ERROR: video device VIDIOC_DQBUF failed");
-                       }
-                    else
-                       esyslog("ERROR: video device VIDIOC_STREAMON failed");
-                    }
-                 else
-                    esyslog("ERROR: video device VIDIOC_QBUF failed");
-                 munmap(mem, msize);
-                 }
-              else
-                 esyslog("ERROR: failed to memmap video device");
-              }
-           else
-              esyslog("ERROR: video device VIDIOC_QUERYBUF failed");
-           }
-        else
-           esyslog("ERROR: video device VIDIOC_REQBUFS failed");
-        }
-     else
-        esyslog("ERROR: video device VIDIOC_S_FMT failed");
-     close(videoDev);
-     return result;
-     }
-  else
-     LOG_ERROR_STR(buffer);
-  return NULL;
-}
-
-void cDvbSdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
-{
-  cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
-  if (Setup.VideoFormat) {
-     CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
-     }
-  else {
-     switch (VideoDisplayFormat) {
-       case vdfPanAndScan:
-            CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_PAN_SCAN));
-            break;
-       case vdfLetterBox:
-            CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX));
-            break;
-       case vdfCenterCutOut:
-            CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT));
-            break;
-       default: esyslog("ERROR: unknown video display format %d", VideoDisplayFormat);
-       }
-     }
-}
-
-void cDvbSdFfDevice::SetVideoFormat(bool VideoFormat16_9)
-{
-  CHECK(ioctl(fd_video, VIDEO_SET_FORMAT, VideoFormat16_9 ? VIDEO_FORMAT_16_9 : VIDEO_FORMAT_4_3));
-  SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
-}
-
-void cDvbSdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
-{
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        Width = vs.w;
-        Height = vs.h;
-        switch (vs.aspect_ratio) {
-          default:
-          case VIDEO_FORMAT_4_3:   VideoAspect =  4.0 / 3.0; break;
-          case VIDEO_FORMAT_16_9:  VideoAspect = 16.0 / 9.0; break;
-          case VIDEO_FORMAT_221_1: VideoAspect =       2.21; break;
-          }
-        return;
-        }
-     else
-        LOG_ERROR;
-     }
-  cDevice::GetVideoSize(Width, Height, VideoAspect);
-}
-
-void cDvbSdFfDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
-{
-  if (fd_video >= 0) {
-     video_size_t vs;
-     if (ioctl(fd_video, VIDEO_GET_SIZE, &vs) == 0) {
-        Width = 720;
-        if (vs.h != 480 && vs.h != 240)
-           Height = 576; // PAL
-        else
-           Height = 480; // NTSC
-        switch (Setup.VideoFormat ? vs.aspect_ratio : VIDEO_FORMAT_4_3) {
-          default:
-          case VIDEO_FORMAT_4_3:   PixelAspect =  4.0 / 3.0; break;
-          case VIDEO_FORMAT_221_1: // FF DVB cards only distinguish between 4:3 and 16:9
-          case VIDEO_FORMAT_16_9:  PixelAspect = 16.0 / 9.0; break;
-          }
-        PixelAspect /= double(Width) / Height;
-        return;
-        }
-     else
-        LOG_ERROR;
-     }
-  cDevice::GetOsdSize(Width, Height, PixelAspect);
-}
-
-bool cDvbSdFfDevice::SetAudioBypass(bool On)
-{
-  if (setTransferModeForDolbyDigital != 1)
-     return false;
-  return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0;
-}
-
-//                                   ptAudio        ptVideo        ptPcr        ptTeletext        ptDolby        ptOther
-static dmx_pes_type_t PesTypes[] = { DMX_PES_AUDIO, DMX_PES_VIDEO, DMX_PES_PCR, DMX_PES_TELETEXT, DMX_PES_OTHER, DMX_PES_OTHER };
-
-bool cDvbSdFfDevice::SetPid(cPidHandle *Handle, int Type, bool On)
-{
-  if (Handle->pid) {
-     dmx_pes_filter_params pesFilterParams;
-     memset(&pesFilterParams, 0, sizeof(pesFilterParams));
-     if (On) {
-        if (Handle->handle < 0) {
-           Handle->handle = DvbOpen(DEV_DVB_DEMUX, adapter, frontend, O_RDWR | O_NONBLOCK, true);
-           if (Handle->handle < 0) {
-              LOG_ERROR;
-              return false;
-              }
-           }
-        pesFilterParams.pid     = Handle->pid;
-        pesFilterParams.input   = DMX_IN_FRONTEND;
-        pesFilterParams.output  = (Type <= ptTeletext && Handle->used <= 1) ? DMX_OUT_DECODER : DMX_OUT_TS_TAP;
-        pesFilterParams.pes_type= PesTypes[Type < ptOther ? Type : ptOther];
-        pesFilterParams.flags   = DMX_IMMEDIATE_START;
-        if (ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-           LOG_ERROR;
-           return false;
-           }
-        }
-     else if (!Handle->used) {
-        CHECK(ioctl(Handle->handle, DMX_STOP));
-        if (Type <= ptTeletext) {
-           pesFilterParams.pid     = 0x1FFF;
-           pesFilterParams.input   = DMX_IN_FRONTEND;
-           pesFilterParams.output  = DMX_OUT_DECODER;
-           pesFilterParams.pes_type= PesTypes[Type];
-           pesFilterParams.flags   = DMX_IMMEDIATE_START;
-           CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
-           if (PesTypes[Type] == DMX_PES_VIDEO) // let's only do this once
-              SetPlayMode(pmNone); // necessary to switch a PID from DMX_PES_VIDEO/AUDIO to DMX_PES_OTHER
-           }
-        close(Handle->handle);
-        Handle->handle = -1;
-        }
-     }
-  return true;
-}
-
-bool cDvbSdFfDevice::ProvidesSource(int Source) const
-{
-  if (outputOnly)
-     return false;
-  else
-     return cDvbDevice::ProvidesSource(Source);
-}
-
-int cDvbSdFfDevice::NumProvidedSystems(void) const
-{
-  if (outputOnly)
-     return 0;
-  return cDvbDevice::NumProvidedSystems();
-}
-
-void cDvbSdFfDevice::TurnOffLiveMode(bool LiveView)
-{
-  if (LiveView) {
-     // Avoid noise while switching:
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-     }
-
-  // Turn off live PIDs:
-
-  DetachAll(pidHandles[ptAudio].pid);
-  DetachAll(pidHandles[ptVideo].pid);
-  DetachAll(pidHandles[ptPcr].pid);
-  DetachAll(pidHandles[ptTeletext].pid);
-  DelPid(pidHandles[ptAudio].pid);
-  DelPid(pidHandles[ptVideo].pid);
-  DelPid(pidHandles[ptPcr].pid, ptPcr);
-  DelPid(pidHandles[ptTeletext].pid);
-  DelPid(pidHandles[ptDolby].pid);
-}
-
-bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
-{
-  int apid = Channel->Apid(0);
-  int vpid = Channel->Vpid();
-  int dpid = Channel->Dpid(0);
-
-  bool DoTune = !IsTunedToTransponder(Channel);
-
-  bool pidHandlesVideo = vpid && pidHandles[ptVideo].pid == vpid;
-  bool pidHandlesAudio = apid && pidHandles[ptAudio].pid == apid;
-
-  bool TurnOffLivePIDs = DoTune
-                         || !IsPrimaryDevice()
-                         || LiveView // for a new live view the old PIDs need to be turned off
-                         || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                         ;
-
-  bool StartTransferMode = IsPrimaryDevice() && !DoTune
-                           && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
-                              || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                              );
-  if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
-     StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
-
-  bool TurnOnLivePIDs = !StartTransferMode && LiveView;
-
-  // Turn off live PIDs if necessary:
-
-  if (TurnOffLivePIDs)
-     TurnOffLiveMode(LiveView);
-
-  // Set the tuner:
-
-  if (!cDvbDevice::SetChannelDevice(Channel, LiveView))
-     return false;
-
-  // PID settings:
-
-  if (TurnOnLivePIDs) {
-     SetAudioBypass(false);
-     if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo) && AddPid(apid, ptAudio))) {
-        esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
-        return false;
-        }
-     if (IsPrimaryDevice())
-        AddPid(Channel->Tpid(), ptTeletext);
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schluessler <marco@lordzodiac.de> this works
-                                                   // to avoid missing audio after replaying a DVD; with 'false' there is an audio disturbance when switching
-                                                   // between two channels on the same transponder on DVB-S
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-     }
-  else if (StartTransferMode)
-     cControl::Launch(new cTransferControl(this, Channel));
-
-  return true;
-}
-
-int cDvbSdFfDevice::GetAudioChannelDevice(void)
-{
-  audio_status_t as;
-  CHECK(ioctl(fd_audio, AUDIO_GET_STATUS, &as));
-  return as.channel_select;
-}
-
-void cDvbSdFfDevice::SetAudioChannelDevice(int AudioChannel)
-{
-  CHECK(ioctl(fd_audio, AUDIO_CHANNEL_SELECT, AudioChannel));
-}
-
-void cDvbSdFfDevice::SetVolumeDevice(int Volume)
-{
-  if (digitalAudio)
-     Volume = 0;
-  audio_mixer_t am;
-  // conversion for linear volume response:
-  am.volume_left = am.volume_right = 2 * Volume - Volume * Volume / 255;
-  CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
-}
-
-void cDvbSdFfDevice::SetDigitalAudioDevice(bool On)
-{
-  if (digitalAudio != On) {
-     if (digitalAudio)
-        cCondWait::SleepMs(1000); // Wait until any leftover digital data has been flushed
-     digitalAudio = On;
-     SetVolumeDevice(On || IsMute() ? 0 : CurrentVolume());
-     }
-}
-
-void cDvbSdFfDevice::SetAudioTrackDevice(eTrackType Type)
-{
-  const tTrackId *TrackId = GetTrack(Type);
-  if (TrackId && TrackId->id) {
-     SetAudioBypass(false);
-     if (IS_AUDIO_TRACK(Type) || (IS_DOLBY_TRACK(Type) && SetAudioBypass(true))) {
-        if (pidHandles[ptAudio].pid && pidHandles[ptAudio].pid != TrackId->id) {
-           DetachAll(pidHandles[ptAudio].pid);
-           if (CamSlot())
-              CamSlot()->SetPid(pidHandles[ptAudio].pid, false);
-           pidHandles[ptAudio].pid = TrackId->id;
-           SetPid(&pidHandles[ptAudio], ptAudio, true);
-           if (CamSlot()) {
-              CamSlot()->SetPid(pidHandles[ptAudio].pid, true);
-              CamSlot()->StartDecrypting();
-              }
-           }
-        }
-     else if (IS_DOLBY_TRACK(Type)) {
-        if (setTransferModeForDolbyDigital == 0)
-           return;
-        // Currently this works only in Transfer Mode
-        ForceTransferMode();
-        }
-     }
-}
-
-bool cDvbSdFfDevice::CanReplay(void) const
-{
-  return cDevice::CanReplay();
-}
-
-bool cDvbSdFfDevice::SetPlayMode(ePlayMode PlayMode)
-{
-  if (PlayMode != pmExtern_THIS_SHOULD_BE_AVOIDED && fd_video < 0 && fd_audio < 0) {
-     // reopen the devices
-     fd_video = DvbOpen(DEV_DVB_VIDEO, adapter, frontend, O_RDWR | O_NONBLOCK);
-     fd_audio = DvbOpen(DEV_DVB_AUDIO, adapter, frontend, O_RDWR | O_NONBLOCK);
-     SetVideoFormat(Setup.VideoFormat);
-     }
-
-  switch (PlayMode) {
-    case pmNone:
-         // special handling to return from PCM replay:
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_video, VIDEO_PLAY));
-
-         CHECK(ioctl(fd_video, VIDEO_STOP, true));
-         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-         CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
-         break;
-    case pmAudioVideo:
-    case pmAudioOnlyBlack:
-         if (playMode == pmNone)
-            TurnOffLiveMode(true);
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
-         CHECK(ioctl(fd_audio, AUDIO_PLAY));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_video, VIDEO_PLAY));
-         break;
-    case pmAudioOnly:
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_audio, AUDIO_STOP, true));
-         CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-         CHECK(ioctl(fd_audio, AUDIO_PLAY));
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, false));
-         break;
-    case pmVideoOnly:
-         CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-         CHECK(ioctl(fd_video, VIDEO_STOP, true));
-         CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX));
-         CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-         CHECK(ioctl(fd_audio, AUDIO_PLAY));
-         CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-         CHECK(ioctl(fd_video, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY));
-         CHECK(ioctl(fd_video, VIDEO_PLAY));
-         break;
-    case pmExtern_THIS_SHOULD_BE_AVOIDED:
-         close(fd_video);
-         close(fd_audio);
-         fd_video = fd_audio = -1;
-         break;
-    default: esyslog("ERROR: unknown playmode %d", PlayMode);
-    }
-  playMode = PlayMode;
-  return true;
-}
-
-int64_t cDvbSdFfDevice::GetSTC(void)
-{
-  if (fd_stc >= 0) {
-     struct dmx_stc stc;
-     stc.num = 0;
-     if (ioctl(fd_stc, DMX_GET_STC, &stc) == -1) {
-        esyslog("ERROR: stc %d: %m", CardIndex() + 1);
-        return -1;
-        }
-     return stc.stc / stc.base;
-     }
-  return -1;
-}
-
-void cDvbSdFfDevice::TrickSpeed(int Speed, bool Forward)
-{
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_SLOWMOTION, Speed));
-}
-
-void cDvbSdFfDevice::Clear(void)
-{
-  if (fd_video >= 0)
-     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
-  if (fd_audio >= 0)
-     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-  cDevice::Clear();
-}
-
-void cDvbSdFfDevice::Play(void)
-{
-  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
-     if (fd_audio >= 0)
-        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
-     }
-  else {
-     if (fd_audio >= 0) {
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
-        CHECK(ioctl(fd_audio, AUDIO_CONTINUE));
-        }
-     if (fd_video >= 0)
-        CHECK(ioctl(fd_video, VIDEO_CONTINUE));
-     }
-  cDevice::Play();
-}
-
-void cDvbSdFfDevice::Freeze(void)
-{
-  if (playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) {
-     if (fd_audio >= 0)
-        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
-     }
-  else {
-     if (fd_audio >= 0) {
-        CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-        CHECK(ioctl(fd_audio, AUDIO_PAUSE));
-        }
-     if (fd_video >= 0)
-        CHECK(ioctl(fd_video, VIDEO_FREEZE));
-     }
-  cDevice::Freeze();
-}
-
-void cDvbSdFfDevice::Mute(void)
-{
-  if (fd_audio >= 0) {
-     CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, false));
-     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-     }
-  cDevice::Mute();
-}
-
-void cDvbSdFfDevice::StillPicture(const uchar *Data, int Length)
-{
-  if (!Data || Length < TS_SIZE)
-     return;
-  if (Data[0] == 0x47) {
-     // TS data
-     cDevice::StillPicture(Data, Length);
-     }
-  else if (Data[0] == 0x00 && Data[1] == 0x00 && Data[2] == 0x01 && (Data[3] & 0xF0) == 0xE0) {
-     // PES data
-     char *buf = MALLOC(char, Length);
-     if (!buf)
-        return;
-     int i = 0;
-     int blen = 0;
-     while (i < Length - 6) {
-           if (Data[i] == 0x00 && Data[i + 1] == 0x00 && Data[i + 2] == 0x01) {
-              int len = Data[i + 4] * 256 + Data[i + 5];
-              if ((Data[i + 3] & 0xF0) == 0xE0) { // video packet
-                 // skip PES header
-                 int offs = i + 6;
-                 // skip header extension
-                 if ((Data[i + 6] & 0xC0) == 0x80) {
-                    // MPEG-2 PES header
-                    if (Data[i + 8] >= Length)
-                       break;
-                    offs += 3;
-                    offs += Data[i + 8];
-                    len -= 3;
-                    len -= Data[i + 8];
-                    if (len < 0 || offs + len > Length)
-                       break;
-                    }
-                 else {
-                    // MPEG-1 PES header
-                    while (offs < Length && len > 0 && Data[offs] == 0xFF) {
-                          offs++;
-                          len--;
-                          }
-                    if (offs <= Length - 2 && len >= 2 && (Data[offs] & 0xC0) == 0x40) {
-                       offs += 2;
-                       len -= 2;
-                       }
-                    if (offs <= Length - 5 && len >= 5 && (Data[offs] & 0xF0) == 0x20) {
-                       offs += 5;
-                       len -= 5;
-                       }
-                    else if (offs <= Length - 10 && len >= 10 && (Data[offs] & 0xF0) == 0x30) {
-                       offs += 10;
-                       len -= 10;
-                       }
-                    else if (offs < Length && len > 0) {
-                       offs++;
-                       len--;
-                       }
-                    }
-                 if (blen + len > Length) // invalid PES length field
-                    break;
-                 memcpy(&buf[blen], &Data[offs], len);
-                 i = offs + len;
-                 blen += len;
-                 }
-              else if (Data[i + 3] >= 0xBD && Data[i + 3] <= 0xDF) // other PES packets
-                 i += len + 6;
-              else
-                 i++;
-              }
-           else
-              i++;
-           }
-     video_still_picture sp = { buf, blen };
-     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
-     free(buf);
-     }
-  else {
-     // non-PES data
-     video_still_picture sp = { (char *)Data, Length };
-     CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
-     }
-}
-
-bool cDvbSdFfDevice::Poll(cPoller &Poller, int TimeoutMs)
-{
-  Poller.Add((playMode == pmAudioOnly || playMode == pmAudioOnlyBlack) ? fd_audio : fd_video, true);
-  return Poller.Poll(TimeoutMs);
-}
-
-bool cDvbSdFfDevice::Flush(int TimeoutMs)
-{
-  //TODO actually this function should wait until all buffered data has been processed by the card, but how?
-  return true;
-}
-
-int cDvbSdFfDevice::PlayVideo(const uchar *Data, int Length)
-{
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-}
-
-int cDvbSdFfDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
-{
-  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
-}
-
-int cDvbSdFfDevice::PlayTsVideo(const uchar *Data, int Length)
-{
-  return WriteAllOrNothing(fd_video, Data, Length, 1000, 10);
-}
-
-int cDvbSdFfDevice::PlayTsAudio(const uchar *Data, int Length)
-{
-  return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10);
-}
-
-// --- cDvbSdFfDeviceProbe ---------------------------------------------------
-
-cDvbSdFfDeviceProbe::cDvbSdFfDeviceProbe(void)
-{
-  outputOnly = false;
-}
-
-bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
-{
-  static uint32_t SubsystemIds[] = {
-    0x110A0000, // Fujitsu Siemens DVB-C
-    0x13C20000, // Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C
-    0x13C20001, // Technotrend/Hauppauge WinTV DVB-T rev1.X
-    0x13C20002, // Technotrend/Hauppauge WinTV DVB-C rev2.X
-    0x13C20003, // Technotrend/Hauppauge WinTV Nexus-S rev2.X
-    0x13C20004, // Galaxis DVB-S rev1.3
-    0x13C20006, // Fujitsu Siemens DVB-S rev1.6
-    0x13C20008, // Technotrend/Hauppauge DVB-T
-    0x13C2000A, // Technotrend/Hauppauge WinTV Nexus-CA rev1.X
-    0x13C2000E, // Technotrend/Hauppauge WinTV Nexus-S rev2.3
-    0x13C21002, // Technotrend/Hauppauge WinTV DVB-S rev1.3 SE
-    0x00000000
-    };
-  uint32_t SubsystemId = GetSubsystemId(Adapter, Frontend);
-  for (uint32_t *sid = SubsystemIds; *sid; sid++) {
-      if (*sid == SubsystemId) {
-         dsyslog("creating cDvbSdFfDevice");
-         new cDvbSdFfDevice(Adapter, Frontend, outputOnly);
-         return true;
-         }
-      }
-  return false;
-}
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
deleted file mode 100644
index f7348d0fb..000000000
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * dvbsdffdevice.h: The DVB SD Full Featured device interface
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbsdffdevice.h 3.2 2014/03/15 12:36:35 kls Exp $
- */
-
-#ifndef __DVBSDFFDEVICE_H
-#define __DVBSDFFDEVICE_H
-
-#include <vdr/dvbdevice.h>
-#include <vdr/dvbspu.h>
-
-/// The cDvbSdFfDevice implements a DVB device which can be accessed through the Linux DVB driver API.
-
-class cDvbSdFfDevice : public cDvbDevice {
-private:
-  int fd_osd, fd_audio, fd_video, fd_stc;
-  bool outputOnly;
-protected:
-  virtual void MakePrimaryDevice(bool On);
-public:
-  cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly);
-  virtual ~cDvbSdFfDevice();
-  virtual bool HasDecoder(void) const;
-  virtual bool AvoidRecording(void) const;
-
-// SPU facilities
-
-private:
-  cDvbSpuDecoder *spuDecoder;
-public:
-  virtual cSpuDecoder *GetSpuDecoder(void);
-
-// Channel facilities
-
-public:
-  virtual bool ProvidesSource(int Source) const;
-  virtual int NumProvidedSystems(void) const;
-private:
-  void TurnOffLiveMode(bool LiveView);
-protected:
-  virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
-
-// PID handle facilities
-
-private:
-  bool SetAudioBypass(bool On);
-protected:
-  virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
-
-// Image Grab facilities
-
-private:
-  static int devVideoOffset;
-  int devVideoIndex;
-public:
-  virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-
-// Video format facilities
-
-public:
-  virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
-  virtual void SetVideoFormat(bool VideoFormat16_9);
-  virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
-  virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);
-
-// Track facilities
-
-protected:
-  virtual void SetAudioTrackDevice(eTrackType Type);
-
-// Audio facilities
-
-private:
-  bool digitalAudio;
-protected:
-  virtual int GetAudioChannelDevice(void);
-  virtual void SetAudioChannelDevice(int AudioChannel);
-  virtual void SetVolumeDevice(int Volume);
-  virtual void SetDigitalAudioDevice(bool On);
-
-// Player facilities
-
-protected:
-  ePlayMode playMode;
-  virtual bool CanReplay(void) const;
-  virtual bool SetPlayMode(ePlayMode PlayMode);
-  virtual int PlayVideo(const uchar *Data, int Length);
-  virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
-  virtual int PlayTsVideo(const uchar *Data, int Length);
-  virtual int PlayTsAudio(const uchar *Data, int Length);
-public:
-  virtual int64_t GetSTC(void);
-  virtual void TrickSpeed(int Speed, bool Forward);
-  virtual void Clear(void);
-  virtual void Play(void);
-  virtual void Freeze(void);
-  virtual void Mute(void);
-  virtual void StillPicture(const uchar *Data, int Length);
-  virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
-  virtual bool Flush(int TimeoutMs = 0);
-  };
-
-class cDvbSdFfDeviceProbe : public cDvbDeviceProbe {
-private:
-  bool outputOnly;
-public:
-  cDvbSdFfDeviceProbe(void);
-  void SetOutputOnly(bool On) { outputOnly = On; }
-  virtual bool Probe(int Adapter, int Frontend);
-  };
-
-#endif //__DVBSDFFDEVICE_H
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.c b/PLUGINS/src/dvbsddevice/dvbsdffosd.c
deleted file mode 100644
index 1a8caf899..000000000
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * dvbsdffosd.c: Implementation of the DVB SD Full Featured On Screen Display
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbsdffosd.c 3.0 2011/04/17 12:55:09 kls Exp $
- */
-
-#include "dvbsdffosd.h"
-#include <linux/dvb/osd.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/unistd.h>
-#include <vdr/tools.h>
-
-// --- cDvbSdFfOsd -----------------------------------------------------------
-
-#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
-#define MAXOSDMEMORY  92000 // number of bytes available to the OSD (for unmodified DVB cards)
-
-class cDvbSdFfOsd : public cOsd {
-private:
-  int osdDev;
-  int osdMem;
-  bool shown;
-  void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
-protected:
-  virtual void SetActive(bool On);
-public:
-  cDvbSdFfOsd(int Left, int Top, int OsdDev, uint Level);
-  virtual ~cDvbSdFfOsd();
-  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-  virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
-  virtual void Flush(void);
-  };
-
-cDvbSdFfOsd::cDvbSdFfOsd(int Left, int Top, int OsdDev, uint Level)
-:cOsd(Left, Top, Level)
-{
-  osdDev = OsdDev;
-  shown = false;
-  if (osdDev < 0)
-     esyslog("ERROR: invalid OSD device handle (%d)!", osdDev);
-  else {
-     osdMem = MAXOSDMEMORY;
-#ifdef OSD_CAP_MEMSIZE
-     // modified DVB cards may have more OSD memory:
-     osd_cap_t cap;
-     cap.cmd = OSD_CAP_MEMSIZE;
-     if (ioctl(osdDev, OSD_GET_CAPABILITY, &cap) == 0)
-        osdMem = cap.val;
-#endif
-     }
-}
-
-cDvbSdFfOsd::~cDvbSdFfOsd()
-{
-  SetActive(false);
-}
-
-void cDvbSdFfOsd::SetActive(bool On)
-{
-  if (On != Active()) {
-     cOsd::SetActive(On);
-     if (On) {
-        // must clear all windows here to avoid flashing effects - doesn't work if done
-        // in Flush() only for the windows that are actually used...
-        for (int i = 0; i < MAXNUMWINDOWS; i++) {
-            Cmd(OSD_SetWindow, 0, i + 1);
-            Cmd(OSD_Clear);
-            }
-        if (GetBitmap(0)) // only flush here if there are already bitmaps
-           Flush();
-        }
-     else if (shown) {
-        for (int i = 0; GetBitmap(i); i++) {
-            Cmd(OSD_SetWindow, 0, i + 1);
-            Cmd(OSD_Close);
-            }
-        shown = false;
-        }
-     }
-}
-
-eOsdError cDvbSdFfOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
-{
-  eOsdError Result = cOsd::CanHandleAreas(Areas, NumAreas);
-  if (Result == oeOk) {
-     if (NumAreas > MAXNUMWINDOWS)
-        return oeTooManyAreas;
-     int TotalMemory = 0;
-     for (int i = 0; i < NumAreas; i++) {
-         if (Areas[i].bpp != 1 && Areas[i].bpp != 2 && Areas[i].bpp != 4 && Areas[i].bpp != 8)
-            return oeBppNotSupported;
-         if ((Areas[i].Width() & (8 / Areas[i].bpp - 1)) != 0)
-            return oeWrongAlignment;
-         if (Areas[i].Width() < 1 || Areas[i].Height() < 1 || Areas[i].Width() > 720 || Areas[i].Height() > 576)
-            return oeWrongAreaSize;
-         TotalMemory += Areas[i].Width() * Areas[i].Height() / (8 / Areas[i].bpp);
-         }
-     if (TotalMemory > osdMem)
-        return oeOutOfMemory;
-     }
-  return Result;
-}
-
-eOsdError cDvbSdFfOsd::SetAreas(const tArea *Areas, int NumAreas)
-{
-  if (shown) {
-     for (int i = 0; GetBitmap(i); i++) {
-         Cmd(OSD_SetWindow, 0, i + 1);
-         Cmd(OSD_Close);
-         }
-     shown = false;
-     }
-  return cOsd::SetAreas(Areas, NumAreas);
-}
-
-void cDvbSdFfOsd::Cmd(OSD_Command cmd, int color, int x0, int y0, int x1, int y1, const void *data)
-{
-  if (osdDev >= 0) {
-     osd_cmd_t dc;
-     dc.cmd   = cmd;
-     dc.color = color;
-     dc.x0    = x0;
-     dc.y0    = y0;
-     dc.x1    = x1;
-     dc.y1    = y1;
-     dc.data  = (void *)data;
-     ioctl(osdDev, OSD_SEND_CMD, &dc);
-     }
-}
-
-void cDvbSdFfOsd::Flush(void)
-{
-  if (!Active())
-     return;
-  cBitmap *Bitmap;
-  for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
-      Cmd(OSD_SetWindow, 0, i + 1);
-      if (!shown)
-         Cmd(OSD_Open, Bitmap->Bpp(), Left() + Bitmap->X0(), Top() + Bitmap->Y0(), Left() + Bitmap->X0() + Bitmap->Width() - 1, Top() + Bitmap->Y0() + Bitmap->Height() - 1, (void *)1); // initially hidden!
-      int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-      if (!shown || Bitmap->Dirty(x1, y1, x2, y2)) {
-         if (!shown) {
-            x1 = y1 = 0;
-            x2 = Bitmap->Width() - 1;
-            y2 = Bitmap->Height() - 1;
-            }
-         //TODO Workaround: apparently the bitmap sent to the driver always has to be a multiple
-         //TODO of 8 bits wide, and (dx * dy) also has to be a multiple of 8.
-         //TODO Fix driver (should be able to handle any size bitmaps!)
-         while ((x1 > 0 || x2 < Bitmap->Width() - 1) && ((x2 - x1) & 7) != 7) {
-               if (x2 < Bitmap->Width() - 1)
-                  x2++;
-               else if (x1 > 0)
-                  x1--;
-               }
-         //TODO "... / 2" <==> Bpp???
-         while ((y1 > 0 || y2 < Bitmap->Height() - 1) && (((x2 - x1 + 1) * (y2 - y1 + 1) / 2) & 7) != 0) {
-               if (y2 < Bitmap->Height() - 1)
-                  y2++;
-               else if (y1 > 0)
-                  y1--;
-               }
-         while ((x1 > 0 || x2 < Bitmap->Width() - 1) && (((x2 - x1 + 1) * (y2 - y1 + 1) / 2) & 7) != 0) {
-               if (x2 < Bitmap->Width() - 1)
-                  x2++;
-               else if (x1 > 0)
-                  x1--;
-               }
-         // commit colors:
-         int NumColors;
-         const tColor *Colors = Bitmap->Colors(NumColors);
-         if (Colors) {
-            //TODO this should be fixed in the driver!
-            tColor colors[NumColors];
-            for (int i = 0; i < NumColors; i++) {
-                // convert AARRGGBB to AABBGGRR (the driver expects the colors the wrong way):
-                colors[i] = (Colors[i] & 0xFF000000) | ((Colors[i] & 0x0000FF) << 16) | (Colors[i] & 0x00FF00) | ((Colors[i] & 0xFF0000) >> 16);
-                }
-            Colors = colors;
-            //TODO end of stuff that should be fixed in the driver
-            Cmd(OSD_SetPalette, 0, NumColors - 1, 0, 0, 0, Colors);
-            }
-         // commit modified data:
-         Cmd(OSD_SetBlock, Bitmap->Width(), x1, y1, x2, y2, Bitmap->Data(x1, y1));
-         }
-      Bitmap->Clean();
-      }
-  if (!shown) {
-     // Showing the windows in a separate loop to avoid seeing them come up one after another
-     for (int i = 0; (Bitmap = GetBitmap(i)) != NULL; i++) {
-         Cmd(OSD_SetWindow, 0, i + 1);
-         Cmd(OSD_MoveWindow, 0, Left() + Bitmap->X0(), Top() + Bitmap->Y0());
-         }
-     shown = true;
-     }
-}
-
-// --- cDvbOsdProvider -------------------------------------------------------
-
-cDvbOsdProvider::cDvbOsdProvider(int OsdDev)
-{
-  osdDev = OsdDev;
-}
-
-cOsd *cDvbOsdProvider::CreateOsd(int Left, int Top, uint Level)
-{
-  return new cDvbSdFfOsd(Left, Top, osdDev, Level);
-}
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffosd.h b/PLUGINS/src/dvbsddevice/dvbsdffosd.h
deleted file mode 100644
index b83220878..000000000
--- a/PLUGINS/src/dvbsddevice/dvbsdffosd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * dvbsdffosd.h: Implementation of the DVB SD Full Featured On Screen Display
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbsdffosd.h 3.0 2012/12/03 13:43:55 kls Exp $
- */
-
-#ifndef __DVBSDFFODF_H
-#define __DVBSDFFODF_H
-
-#include <vdr/osd.h>
-
-class cDvbOsdProvider : public cOsdProvider {
-private:
-  int osdDev;
-public:
-  cDvbOsdProvider(int OsdDev);
-  virtual cOsd *CreateOsd(int Left, int Top, uint Level);
-  };
-
-#endif //__DVBSDFFODF_H
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index e3c0c7b39..161fefe4d 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index 01bdc83de..79960ae96 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 3.2 2015/02/17 13:12:18 kls Exp $
+ * $Id: epgtableid0.c 4.0 2015/02/17 13:12:18 kls Exp $
  */
 
 #include <vdr/epg.h>
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 455721fc8..186eae4a6 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 0bd511cb8..2d686cd88 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 3.2 2015/02/17 13:12:26 kls Exp $
+ * $Id: hello.c 4.0 2015/02/17 13:12:26 kls Exp $
  */
 
 #include <getopt.h>
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 40495b1c5..099ca7589 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -72,3 +72,10 @@ VDR Plugin 'osddemo' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2015-03-08: Version 2.3.1
+
+- Now using cOsd::MaxPixmapSize().
+- Fixed a vertical black line in the "TiledPixmaps" area on the rpihddevice OSD with
+  1280x800 pixel (thanks to Thomas Reufer).
+- Added a demo case for storing images (thanks to Thomas Reufer).
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 30e3de47a..980de2aee 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 6273f4609..89fd69542 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 3.4 2015/02/17 13:12:36 kls Exp $
+ * $Id: osddemo.c 4.3 2015/04/12 09:35:21 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.3.1";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -90,6 +90,52 @@ void DrawSlopes(cOsd *Osd)
   Osd->Flush();
 }
 
+// --- DrawImages ------------------------------------------------------------
+
+struct tOsdImageRef {
+  int image;
+  cSize size;
+  };
+
+#define NUMOSDIMAGES 16
+#define NUMOSDIMAGEVARIANTS 8
+
+void DrawImages(cOsd *Osd)
+{
+  // Create images:
+  cImage *images[NUMOSDIMAGEVARIANTS];
+  for (int i = 0; i < NUMOSDIMAGEVARIANTS; i++) {
+      images[i] = new cImage(cSize(
+        i == 0 || i == 1 ? Osd->MaxPixmapSize().Width() + 1 : rand() % Osd->Width(),
+        i == 0 || i == 2 ? Osd->MaxPixmapSize().Height() + 1 : rand() % Osd->Height()));
+      for (int x = 0; x < images[i]->Width(); x++) {
+          for (int y = 0; y < images[i]->Height(); y++) {
+              images[i]->SetPixel(cPoint(x, y),
+                (!x || !y || x == images[i]->Width() - 1 || y == images[i]->Height() - 1) ? clrWhite :
+                (x > images[i]->Width() / 2 ?
+                  (y > images[i]->Height() / 2 ? clrBlue : clrGreen) :
+                  (y > images[i]->Height() / 2 ? clrRed : clrYellow)));
+              }
+          }
+      }
+  // Store images:
+  tOsdImageRef osdImages[NUMOSDIMAGES];
+  for (int i = 0; i < NUMOSDIMAGES; i++) {
+      osdImages[i].image = cOsdProvider::StoreImage(*images[i % NUMOSDIMAGEVARIANTS]);
+      osdImages[i].size.Set(images[i % NUMOSDIMAGEVARIANTS]->Size());
+      }
+  // Delete images:
+  for (int i = 0; i < NUMOSDIMAGEVARIANTS; i++)
+      delete images[i];
+  // Draw images:
+  for (int i = 0; i < NUMOSDIMAGES; i++)
+      Osd->DrawImage(cPoint(rand() % (Osd->Width() + osdImages[i].size.Width()), rand() % (Osd->Height() + osdImages[i].size.Height())).Shifted(-osdImages[i].size.Width(), -osdImages[i].size.Height()), osdImages[i].image);
+  // Drop image references:
+  for (int i = 0; i < NUMOSDIMAGES; i++)
+      cOsdProvider::DropImage(osdImages[i].image);
+  Osd->Flush();
+}
+
 // --- cLineGame -------------------------------------------------------------
 
 class cLineGame : public cOsdObject {
@@ -210,7 +256,7 @@ cPixmap *cTrueColorDemo::CreateTextPixmap(const char *s, int Line, int Layer, tC
   if (Pixmap) {
      Pixmap->Clear();
      Pixmap->SetAlpha(0);
-     Pixmap->DrawText(cPoint(0, 0), s, ColorFg, ColorBg, Font);
+     Pixmap->DrawText(cPoint(0, 0), s, ColorFg, ColorBg, Font, w);
      }
   return Pixmap;
 }
@@ -427,16 +473,20 @@ void cTrueColorDemo::Action(void)
                        const int Size = SmlFont->Width(Text) + 10;
                        const int NumDots = 12;
                        const int AnimFrames = NumDots;
+                       int Rows = min(osd->MaxPixmapSize().Height() / Size, AnimFrames);
+                       int Cols = (AnimFrames + Rows - 1) / Rows;
                        // Temporarily using pixmap layer 0 to have the text alpha blended:
-                       AnimPixmap = osd->CreatePixmap(0, cRect((osd->Width() - Size) / 2, StartLine, Size, Size), cRect(0, 0, Size, Size * AnimFrames));
+                       AnimPixmap = osd->CreatePixmap(0, cRect((osd->Width() - Size) / 2, StartLine, Size, Size), cRect(0, 0, Size * Cols, Size * Rows));
                        if (AnimPixmap) {
                           AnimPixmap->SetAlpha(0);
                           AnimPixmap->Clear();
                           const int Diameter = Size / 5;
-                          int xc = Size / 2 - Diameter / 2;
                           for (int Frame = 0; Frame < AnimFrames; Frame++) {
-                              AnimPixmap->DrawEllipse(cRect(0, Frame * Size, Size, Size), 0xDDFFFFFF);
-                              int yc = Frame * Size + Size / 2 - Diameter / 2;
+                              int x0 = Frame / Rows * Size;
+                              int y0 = Frame % Rows * Size;
+                              AnimPixmap->DrawEllipse(cRect(x0, y0, Size, Size), 0xDDFFFFFF);
+                              int xc = x0 + Size / 2 - Diameter / 2;
+                              int yc = y0 + Size / 2 - Diameter / 2;
                               int Color = 0xFF;
                               int Delta = Color / NumDots / 3;
                               for (int a = 0; a < NumDots; a++) {
@@ -446,7 +496,7 @@ void cTrueColorDemo::Action(void)
                                   AnimPixmap->DrawEllipse(cRect(x, y, Diameter, Diameter), ArgbToColor(0xFF, Color, Color, Color));
                                   Color -= Delta;
                                   }
-                              AnimPixmap->DrawText(cPoint(0, Frame * Size), Text, clrBlack, clrTransparent, SmlFont, Size, Size, taCenter);
+                              AnimPixmap->DrawText(cPoint(x0, y0), Text, clrBlack, clrTransparent, SmlFont, Size, Size, taCenter);
                               }
                           AnimPixmap->SetLayer(3); // now setting the actual pixmap layer
                           FadeInPixmap = AnimPixmap;
@@ -536,6 +586,10 @@ eOSState cTrueColorDemo::ProcessKey(eKeys Key)
                      SetArea();
                      DrawSlopes(osd);
                      break;
+       case k3:      Cancel(3);
+                     SetArea();
+                     DrawImages(osd);
+                     break;
        case kBack:
        case kOk:     return osEnd;
        default: return state;
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 06e7415a1..b9e476e27 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -99,3 +99,7 @@ VDR Plugin 'pictures' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2015-07.23: Version 2.3.1
+
+- Added a missing 'const'.
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 912e3d975..e749e981e 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index ce2a3e2b1..734064170 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.c 3.0 2012/02/17 14:00:28 kls Exp $
+ * $Id: entry.c 4.0 2012/02/17 14:00:28 kls Exp $
  */
 
 #include "entry.h"
diff --git a/PLUGINS/src/pictures/entry.h b/PLUGINS/src/pictures/entry.h
index 9de4dd3a9..667173ed6 100644
--- a/PLUGINS/src/pictures/entry.h
+++ b/PLUGINS/src/pictures/entry.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: entry.h 3.0 2008/01/06 12:30:50 kls Exp $
+ * $Id: entry.h 4.0 2008/01/06 12:30:50 kls Exp $
  */
 
 #ifndef _ENTRY_H
diff --git a/PLUGINS/src/pictures/menu.c b/PLUGINS/src/pictures/menu.c
index 567f9e7b4..2599526e9 100644
--- a/PLUGINS/src/pictures/menu.c
+++ b/PLUGINS/src/pictures/menu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: menu.c 3.0 2008/01/13 11:35:18 kls Exp $
+ * $Id: menu.c 4.1 2015/07/23 10:13:56 kls Exp $
  */
 
 #include "menu.h"
@@ -85,7 +85,7 @@ eOSState cPictureMenu::SelectItem(const char *Path, bool SlideShow)
   if (Item) {
      const cList<cPictureEntry> *l = pictureEntry->Entries();
      if (l) {
-        cPictureEntry *pe = l->Get(Current());
+        const cPictureEntry *pe = l->Get(Current());
         if (pe) {
            if (SlideShow) {
               cControl::Launch(new cPictureControl(pictures, pe, true));
diff --git a/PLUGINS/src/pictures/menu.h b/PLUGINS/src/pictures/menu.h
index 585b0d579..a9a3fa619 100644
--- a/PLUGINS/src/pictures/menu.h
+++ b/PLUGINS/src/pictures/menu.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: menu.h 3.0 2008/01/12 11:22:52 kls Exp $
+ * $Id: menu.h 4.0 2008/01/12 11:22:52 kls Exp $
  */
 
 #ifndef _MENU_H
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 8bb6c2e56..27d0264a3 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 3.1 2013/07/01 08:33:38 kls Exp $
+# $Id: pic2mpg 4.0 2013/07/01 08:33:38 kls Exp $
 
 use File::Path;
 use File::Spec;
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 46a08716b..509514eab 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 3.2 2015/02/17 13:12:50 kls Exp $
+ * $Id: pictures.c 4.1 2015/07/23 10:14:22 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "2.2.0";
+static const char *VERSION       = "2.3.1";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index d2dbd7b85..82fd6995e 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.c 3.1 2014/02/08 12:48:12 kls Exp $
+ * $Id: player.c 4.0 2014/02/08 12:48:12 kls Exp $
  */
 
 #include "player.h"
diff --git a/PLUGINS/src/pictures/player.h b/PLUGINS/src/pictures/player.h
index cf18d3555..6c6b9171d 100644
--- a/PLUGINS/src/pictures/player.h
+++ b/PLUGINS/src/pictures/player.h
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: player.h 3.0 2012/04/28 11:56:01 kls Exp $
+ * $Id: player.h 4.0 2012/04/28 11:56:01 kls Exp $
  */
 
 #ifndef _PLAYER_H
diff --git a/PLUGINS/src/rcu/COPYING b/PLUGINS/src/rcu/COPYING
deleted file mode 100644
index f90922eea..000000000
--- a/PLUGINS/src/rcu/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
deleted file mode 100644
index 8fabe0987..000000000
--- a/PLUGINS/src/rcu/HISTORY
+++ /dev/null
@@ -1,30 +0,0 @@
-VDR Plugin 'rcu' Revision History
----------------------------------
-
-2012-02-27: Version 0.0.1
-
-- Initial revision.
-
-2012-03-07: Version 0.0.2
-
-- Added new parameter LiveView to ChannelSwitch().
-
-2012-12-27: Version 0.0.3
-
-- Adapted Makefile to changes introduced in recent VDR versions.
-
-2013-01-12: Version 0.0.4
-
-- Adapted Makefile to changes introduced in recent VDR versions.
-
-2013-03-31: Version 2.0.0
-
-- Official release.
-
-2014-01-01: Version 2.1.1
-
-- Avoiding unnecessary pkg-config warnings in plugin Makefiles.
-
-2015-02-19: Version 2.2.0
-
-- Official release.
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
deleted file mode 100644
index 25bde4af3..000000000
--- a/PLUGINS/src/rcu/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-
-PLUGIN = rcu
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The directory environment:
-
-# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
-LIBDIR = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
-#
-TMPDIR ?= /tmp
-
-### The compiler options:
-
-export CFLAGS   = $(call PKGCFG,cflags)
-export CXXFLAGS = $(call PKGCFG,cxxflags)
-
-### The version number of VDR's plugin API:
-
-APIVERSION = $(call PKGCFG,apiversion)
-
-### Allow user defined options to overwrite defaults:
-
--include $(PLGCFG)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
-
-### Includes and Defines (add further entries here):
-
-INCLUDES +=
-
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o
-
-### The main target:
-
-all: $(SOFILE)
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Targets:
-
-$(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-
-install-lib: $(SOFILE)
-	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-
-install: install-lib
-
-dist: clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/rcu/README b/PLUGINS/src/rcu/README
deleted file mode 100644
index d66729eef..000000000
--- a/PLUGINS/src/rcu/README
+++ /dev/null
@@ -1,19 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by:                  Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
-
-Project's homepage:          http://www.tvdr.de/remote.htm
-
-Latest version available at: http://www.tvdr.de
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-See the file COPYING for more information.
-
-Description:
-============
-
-The "Remote Control Unit" used to be part of the core VDR source
-code, and has been moved into a separate plugin in version 1.7.25.
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
deleted file mode 100644
index 9e833b190..000000000
--- a/PLUGINS/src/rcu/rcu.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * rcu.c: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: rcu.c 3.2 2015/02/17 13:13:00 kls Exp $
- */
-
-#include <getopt.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <unistd.h>
-#include <vdr/plugin.h>
-#include <vdr/remote.h>
-#include <vdr/status.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-
-static const char *VERSION        = "2.2.0";
-static const char *DESCRIPTION    = "Remote Control Unit";
-
-#define REPEATLIMIT      150 // ms
-#define REPEATDELAY      350 // ms
-#define HANDSHAKETIMEOUT  20 // ms
-#define DEFAULTDEVICE    "/dev/ttyS1"
-
-class cRcuRemote : public cRemote, private cThread, private cStatus {
-private:
-  enum { modeH = 'h', modeB = 'b', modeS = 's' };
-  int f;
-  unsigned char dp, code, mode;
-  int number;
-  unsigned int data;
-  bool receivedCommand;
-  bool SendCommand(unsigned char Cmd);
-  int ReceiveByte(int TimeoutMs = 0);
-  bool SendByteHandshake(unsigned char c);
-  bool SendByte(unsigned char c);
-  bool SendData(unsigned int n);
-  void SetCode(unsigned char Code);
-  void SetMode(unsigned char Mode);
-  void SetNumber(int n, bool Hex = false);
-  void SetPoints(unsigned char Dp, bool On);
-  void SetString(const char *s);
-  bool DetectCode(unsigned char *Code);
-  virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
-  virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
-public:
-  cRcuRemote(const char *DeviceName);
-  virtual ~cRcuRemote();
-  virtual bool Ready(void);
-  virtual bool Initialize(void);
-  };
-
-cRcuRemote::cRcuRemote(const char *DeviceName)
-:cRemote("RCU")
-,cThread("RCU remote control")
-{
-  dp = 0;
-  mode = modeB;
-  code = 0;
-  number = 0;
-  data = 0;
-  receivedCommand = false;
-  if ((f = open(DeviceName, O_RDWR | O_NONBLOCK)) >= 0) {
-     struct termios t;
-     if (tcgetattr(f, &t) == 0) {
-        cfsetspeed(&t, B9600);
-        cfmakeraw(&t);
-        if (tcsetattr(f, TCSAFLUSH, &t) == 0) {
-           SetNumber(8888);
-           const char *Setup = GetSetup();
-           if (Setup) {
-              code = *Setup;
-              SetCode(code);
-              isyslog("connecting to %s remote control using code %c", Name(), code);
-              }
-           Start();
-           return;
-           }
-        }
-     LOG_ERROR_STR(DeviceName);
-     close(f);
-     }
-  else
-     LOG_ERROR_STR(DeviceName);
-  f = -1;
-}
-
-cRcuRemote::~cRcuRemote()
-{
-  Cancel();
-}
-
-bool cRcuRemote::Ready(void)
-{
-  return f >= 0;
-}
-
-bool cRcuRemote::Initialize(void)
-{
-  if (f >= 0) {
-     unsigned char Code = '0';
-     isyslog("trying codes for %s remote control...", Name());
-     for (;;) {
-         if (DetectCode(&Code)) {
-            code = Code;
-            break;
-            }
-         }
-     isyslog("established connection to %s remote control using code %c", Name(), code);
-     char buffer[16];
-     snprintf(buffer, sizeof(buffer), "%c", code);
-     PutSetup(buffer);
-     return true;
-     }
-  return false;
-}
-
-void cRcuRemote::Action(void)
-{
-#pragma pack(1)
-  union {
-    struct {
-      unsigned short address;
-      unsigned int command;
-      } data;
-    unsigned char raw[6];
-    } buffer;
-#pragma pack()
-
-  time_t LastCodeRefresh = 0;
-  cTimeMs FirstTime;
-  unsigned char LastCode = 0, LastMode = 0;
-  uint64_t LastCommand = ~0; // 0x00 might be a valid command
-  unsigned int LastData = 0;
-  bool repeat = false;
-
-  while (Running() && f >= 0) {
-        if (ReceiveByte(REPEATLIMIT) == 'X') {
-           for (int i = 0; i < 6; i++) {
-               int b = ReceiveByte();
-               if (b >= 0) {
-                  buffer.raw[i] = b;
-                  if (i == 5) {
-                     unsigned short Address = ntohs(buffer.data.address); // the PIC sends bytes in "network order"
-                     uint64_t       Command = ntohl(buffer.data.command);
-                     if (code == 'B' && Address == 0x0000 && Command == 0x00004000)
-                        // Well, well, if it isn't the "d-box"...
-                        // This remote control sends the above command before and after
-                        // each keypress - let's just drop this:
-                        break;
-                     Command |= uint64_t(Address) << 32;
-                     if (Command != LastCommand) {
-                        LastCommand = Command;
-                        repeat = false;
-                        FirstTime.Set();
-                        }
-                     else {
-                        if (FirstTime.Elapsed() < REPEATDELAY)
-                           break; // repeat function kicks in after a short delay
-                        repeat = true;
-                        }
-                     Put(Command, repeat);
-                     receivedCommand = true;
-                     }
-                  }
-               else
-                  break;
-               }
-           }
-        else if (repeat) { // the last one was a repeat, so let's generate a release
-           Put(LastCommand, false, true);
-           repeat = false;
-           LastCommand = ~0;
-           }
-        else {
-           unsigned int d = data;
-           if (d != LastData) {
-              SendData(d);
-              LastData = d;
-              }
-           unsigned char c = code;
-           if (c != LastCode) {
-              SendCommand(c);
-              LastCode = c;
-              }
-           unsigned char m = mode;
-           if (m != LastMode) {
-              SendCommand(m);
-              LastMode = m;
-              }
-           LastCommand = ~0;
-           }
-        if (!repeat && code && time(NULL) - LastCodeRefresh > 60) {
-           SendCommand(code); // in case the PIC listens to the wrong code
-           LastCodeRefresh = time(NULL);
-           }
-        }
-}
-
-int cRcuRemote::ReceiveByte(int TimeoutMs)
-{
-  // Returns the byte if one was received within a timeout, -1 otherwise
-  if (cFile::FileReady(f, TimeoutMs)) {
-     unsigned char b;
-     if (safe_read(f, &b, 1) == 1)
-        return b;
-     else
-        LOG_ERROR;
-     }
-  return -1;
-}
-
-bool cRcuRemote::SendByteHandshake(unsigned char c)
-{
-  if (f >= 0) {
-     int w = write(f, &c, 1);
-     if (w == 1) {
-        for (int reply = ReceiveByte(HANDSHAKETIMEOUT); reply >= 0;) {
-            if (reply == c)
-               return true;
-            else if (reply == 'X') {
-               // skip any incoming RC code - it will come again
-               for (int i = 6; i--;) {
-                   if (ReceiveByte() < 0)
-                      return false;
-                   }
-               }
-            else
-               return false;
-            }
-        }
-     LOG_ERROR;
-     }
-  return false;
-}
-
-bool cRcuRemote::SendByte(unsigned char c)
-{
-  for (int retry = 5; retry--;) {
-      if (SendByteHandshake(c))
-         return true;
-      }
-  return false;
-}
-
-bool cRcuRemote::SendData(unsigned int n)
-{
-  for (int i = 0; i < 4; i++) {
-      if (!SendByte(n & 0x7F))
-         return false;
-      n >>= 8;
-      }
-  return SendCommand(mode);
-}
-
-void cRcuRemote::SetCode(unsigned char Code)
-{
-  code = Code;
-}
-
-void cRcuRemote::SetMode(unsigned char Mode)
-{
-  mode = Mode;
-}
-
-bool cRcuRemote::SendCommand(unsigned char Cmd)
-{
-  return SendByte(Cmd | 0x80);
-}
-
-void cRcuRemote::SetNumber(int n, bool Hex)
-{
-  number = n;
-  if (!Hex) {
-     char buf[8];
-     sprintf(buf, "%4d", n & 0xFFFF);
-     n = 0;
-     for (char *d = buf; *d; d++) {
-         if (*d == ' ')
-            *d = 0xF;
-         n = (n << 4) | ((*d - '0') & 0x0F);
-         }
-     }
-  unsigned int m = 0;
-  for (int i = 0; i < 4; i++) {
-      m <<= 8;
-      m |= ((i & 0x03) << 5) | (n & 0x0F) | (((dp >> i) & 0x01) << 4);
-      n >>= 4;
-      }
-  data = m;
-}
-
-void cRcuRemote::SetString(const char *s)
-{
-  const char *chars = mode == modeH ? "0123456789ABCDEF" : "0123456789-EHLP ";
-  int n = 0;
-
-  for (int i = 0; *s && i < 4; s++, i++) {
-      n <<= 4;
-      for (const char *c = chars; *c; c++) {
-          if (*c == *s) {
-             n |= c - chars;
-             break;
-             }
-          }
-      }
-  SetNumber(n, true);
-}
-
-void cRcuRemote::SetPoints(unsigned char Dp, bool On)
-{
-  if (On)
-     dp |= Dp;
-  else
-     dp &= ~Dp;
-  SetNumber(number);
-}
-
-bool cRcuRemote::DetectCode(unsigned char *Code)
-{
-  // Caller should initialize 'Code' to 0 and call DetectCode()
-  // until it returns true. Whenever DetectCode() returns false
-  // and 'Code' is not 0, the caller can use 'Code' to display
-  // a message like "Trying code '%c'". If false is returned and
-  // 'Code' is 0, all possible codes have been tried and the caller
-  // can either stop calling DetectCode() (and give some error
-  // message), or start all over again.
-  if (*Code < 'A' || *Code > 'D') {
-     *Code = 'A';
-     return false;
-     }
-  if (*Code <= 'D') {
-     SetMode(modeH);
-     char buf[5];
-     sprintf(buf, "C0D%c", *Code);
-     SetString(buf);
-     SetCode(*Code);
-     cCondWait::SleepMs(2 * REPEATDELAY);
-     if (receivedCommand) {
-        SetMode(modeB);
-        SetString("----");
-        return true;
-        }
-     if (*Code < 'D') {
-        (*Code)++;
-        return false;
-        }
-     }
-  *Code = 0;
-  return false;
-}
-
-void cRcuRemote::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
-{
-  if (ChannelNumber && LiveView)
-     SetNumber(cDevice::CurrentChannel());
-}
-
-void cRcuRemote::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
-{
-  SetPoints(1 << Device->DeviceNumber(), Device->Receiving());
-}
-
-class cPluginRcu : public cPlugin {
-private:
-  // Add any member variables or functions you may need here.
-  const char *device;
-public:
-  cPluginRcu(void);
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
-  virtual const char *CommandLineHelp(void);
-  virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual bool Start(void);
-  };
-
-cPluginRcu::cPluginRcu(void)
-{
-  // Initialize any member variables here.
-  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
-  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
-  device = DEFAULTDEVICE;
-}
-
-const char *cPluginRcu::CommandLineHelp(void)
-{
-  // Return a string that describes all known command line options.
-  return "  -d DEV,   --device=DEV   set the device to use (default is " DEFAULTDEVICE ")\n";
-}
-
-bool cPluginRcu::ProcessArgs(int argc, char *argv[])
-{
-  // Implement command line argument processing here if applicable.
-  static struct option long_options[] = {
-       { "dev",      required_argument, NULL, 'd' },
-       { NULL,       no_argument,       NULL,  0  }
-     };
-
-  int c;
-  while ((c = getopt_long(argc, argv, "d:", long_options, NULL)) != -1) {
-        switch (c) {
-          case 'd': device = optarg;
-                    break;
-          default:  return false;
-          }
-        }
-  return true;
-}
-
-bool cPluginRcu::Start(void)
-{
-  // Start any background activities the plugin shall perform.
-  new cRcuRemote(device);
-  return true;
-}
-
-VDRPLUGINCREATOR(cPluginRcu); // Don't touch this!
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 128b9c759..c021fad03 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 9a4244038..201cf26a0 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 3.2 2015/02/17 13:13:05 kls Exp $
+ * $Id: svccli.c 4.0 2015/02/17 13:13:05 kls Exp $
  */
 
 #include <stdlib.h>
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 5c48b49a9..3876d4659 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 3.2 2015/02/17 13:13:09 kls Exp $
+ * $Id: svcsvr.c 4.0 2015/02/17 13:13:09 kls Exp $
  */
 
 #include <stdlib.h>
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 812fe973f..27dafe44b 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 2d92a574d..358035e0b 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 3.3 2015/02/17 13:13:17 kls Exp $
+ * $Id: skincurses.c 4.0 2015/02/17 13:13:17 kls Exp $
  */
 
 #include <ncurses.h>
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 40a0351e3..6c997d724 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index a5575cceb..ec50b4563 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 3.2 2015/02/17 13:13:21 kls Exp $
+ * $Id: status.c 4.0 2015/02/17 13:13:21 kls Exp $
  */
 
 #include <vdr/plugin.h>
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 9a8235a4a..91fad09a6 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 9114854ba..bde855975 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 3.2 2015/02/17 13:13:29 kls Exp $
+ * $Id: svdrpdemo.c 4.0 2015/02/17 13:13:29 kls Exp $
  */
 
 #include <vdr/plugin.h>
diff --git a/README b/README
index f88b91725..25e4dd315 100644
--- a/README
+++ b/README
@@ -32,6 +32,10 @@ of commercial set-top boxes usually are a lot more fancy than
 the ones in this system, but here we have the full source code
 and can modify the menus in whatever way desired.
 
+If you actually use VDR, please add yourself to the "VDR User Counter"
+at http://www.tvdr.de/counter.htm. You can also like VDR on facebook
+at https://www.facebook.com/VideoDiskRecorder.
+
 
 "VDR Video Disk Recorder" is a registered trademark of Klaus Schmidinger.
 "TVDR TV Done Right" is a registered trademark of Klaus Schmidinger.
diff --git a/args.c b/args.c
index 6a3160553..5926f6ca2 100644
--- a/args.c
+++ b/args.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Lars Hanisch <dvb@flensrocker.de>.
  *
- * $Id: args.c 1.1 2014/04/14 12:02:38 kls Exp $
+ * $Id: args.c 4.0 2014/04/14 12:02:38 kls Exp $
  */
 
 #include "args.h"
diff --git a/args.h b/args.h
index 2e91afb42..79593c595 100644
--- a/args.h
+++ b/args.h
@@ -6,7 +6,7 @@
  *
  * Original version written by Lars Hanisch <dvb@flensrocker.de>.
  *
- * $Id: args.h 1.1 2014/04/14 11:54:21 kls Exp $
+ * $Id: args.h 4.0 2014/04/14 11:54:21 kls Exp $
  */
 
 #ifndef __ARGS_H
diff --git a/audio.c b/audio.c
index ebb98ed56..afd249414 100644
--- a/audio.c
+++ b/audio.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.c 3.0 2010/05/16 13:30:11 kls Exp $
+ * $Id: audio.c 4.0 2010/05/16 13:30:11 kls Exp $
  */
 
 #include "audio.h"
diff --git a/audio.h b/audio.h
index 37d0b5165..a484bfea3 100644
--- a/audio.h
+++ b/audio.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: audio.h 3.0 2008/07/06 11:39:21 kls Exp $
+ * $Id: audio.h 4.0 2008/07/06 11:39:21 kls Exp $
  */
 
 #ifndef __AUDIO_H
diff --git a/channels.c b/channels.c
index 564088f4a..24fec5be2 100644
--- a/channels.c
+++ b/channels.c
@@ -4,15 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 3.8 2015/02/01 13:47:05 kls Exp $
+ * $Id: channels.c 4.3 2015/09/09 10:21:22 kls Exp $
  */
 
 #include "channels.h"
 #include <ctype.h>
 #include "device.h"
-#include "epg.h"
 #include "libsi/si.h"
-#include "timers.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -79,27 +77,13 @@ cChannel::cChannel(const cChannel &Channel)
   schedule     = NULL;
   linkChannels = NULL;
   refChannel   = NULL;
+  seen         = 0;
   *this = Channel;
 }
 
 cChannel::~cChannel()
 {
-  delete linkChannels;
-  linkChannels = NULL; // more than one channel can link to this one, so we need the following loop
-  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-      if (Channel->linkChannels) {
-         for (cLinkChannel *lc = Channel->linkChannels->First(); lc; lc = Channel->linkChannels->Next(lc)) {
-             if (lc->Channel() == this) {
-                Channel->linkChannels->Del(lc);
-                break;
-                }
-             }
-         if (Channel->linkChannels->Count() == 0) {
-            delete Channel->linkChannels;
-            Channel->linkChannels = NULL;
-            }
-         }
-      }
+  delete linkChannels; // any links from other channels pointing to this one have been deleted in cChannels::Del()
   free(name);
   free(shortName);
   free(provider);
@@ -167,16 +151,7 @@ int cChannel::Transponder(void) const
   return tf;
 }
 
-bool cChannel::HasTimer(void) const
-{
-  for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
-      if (Timer->Channel() == this)
-         return true;
-      }
-  return false;
-}
-
-int cChannel::Modification(int Mask)
+int cChannel::Modification(int Mask) const
 {
   int Result = modification & Mask;
   modification = CHANNELMOD_NONE;
@@ -223,41 +198,57 @@ bool cChannel::SetTransponderData(int Source, int Frequency, int Srate, const ch
      if (Number() && !Quiet) {
         dsyslog("changing transponder data of channel %d (%s) from %s to %s", Number(), name, *OldTransponderData, *TransponderDataToString());
         modification |= CHANNELMOD_TRANSP;
-        Channels.SetModified();
         }
+     return true;
      }
-  return true;
+  return false;
 }
 
-void cChannel::SetId(int Nid, int Tid, int Sid, int Rid)
+bool cChannel::SetSource(int Source)
 {
-  if (nid != Nid || tid != Tid || sid != Sid || rid != Rid) {
+  if (source != Source) {
      if (Number()) {
+        dsyslog("changing source of channel %d (%s) from %s to %s", Number(), name, *cSource::ToString(source), *cSource::ToString(Source));
+        modification |= CHANNELMOD_TRANSP;
+        }
+     source = Source;
+     return true;
+     }
+  return false;
+}
+
+bool cChannel::SetId(cChannels *Channels, int Nid, int Tid, int Sid, int Rid)
+{
+  if (nid != Nid || tid != Tid || sid != Sid || rid != Rid) {
+     if (Channels && Number()) {
         dsyslog("changing id of channel %d (%s) from %d-%d-%d-%d to %d-%d-%d-%d", Number(), name, nid, tid, sid, rid, Nid, Tid, Sid, Rid);
         modification |= CHANNELMOD_ID;
-        Channels.SetModified();
-        Channels.UnhashChannel(this);
+        Channels->UnhashChannel(this);
         }
      nid = Nid;
      tid = Tid;
      sid = Sid;
      rid = Rid;
-     if (Number())
-        Channels.HashChannel(this);
+     if (Channels)
+        Channels->HashChannel(this);
      schedule = NULL;
+     return true;
      }
+  return false;
 }
 
-void cChannel::SetLcn(int Lcn)
+bool cChannel::SetLcn(int Lcn)
 {
   if (lcn != Lcn) {
      if (Number())
         dsyslog("changing lcn of channel %d (%s) from %d to %d\n", Number(), name, lcn, Lcn);
      lcn = Lcn;
+     return true;
      }
+  return false;
 }
 
-void cChannel::SetName(const char *Name, const char *ShortName, const char *Provider)
+bool cChannel::SetName(const char *Name, const char *ShortName, const char *Provider)
 {
   if (!isempty(Name)) {
      bool nn = strcmp(name, Name) != 0;
@@ -267,7 +258,6 @@ void cChannel::SetName(const char *Name, const char *ShortName, const char *Prov
         if (Number()) {
            dsyslog("changing name of channel %d from '%s,%s;%s' to '%s,%s;%s'", Number(), name, shortName, provider, Name, ShortName, Provider);
            modification |= CHANNELMOD_NAME;
-           Channels.SetModified();
            }
         if (nn) {
            name = strcpyrealloc(name, Name);
@@ -279,20 +269,23 @@ void cChannel::SetName(const char *Name, const char *ShortName, const char *Prov
            }
         if (np)
            provider = strcpyrealloc(provider, Provider);
+        return true;
         }
      }
+  return false;
 }
 
-void cChannel::SetPortalName(const char *PortalName)
+bool cChannel::SetPortalName(const char *PortalName)
 {
   if (!isempty(PortalName) && strcmp(portalName, PortalName) != 0) {
      if (Number()) {
         dsyslog("changing portal name of channel %d (%s) from '%s' to '%s'", Number(), name, portalName, PortalName);
         modification |= CHANNELMOD_NAME;
-        Channels.SetModified();
         }
      portalName = strcpyrealloc(portalName, PortalName);
+     return true;
      }
+  return false;
 }
 
 #define STRDIFF 0x01
@@ -337,7 +330,7 @@ static int IntArrayToString(char *s, const int *a, int Base = 10, const char n[]
   return q - s;
 }
 
-void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
+bool cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid)
 {
   int mod = CHANNELMOD_NONE;
   if (vpid != Vpid || ppid != Ppid || vtype != Vtype)
@@ -400,25 +393,33 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, c
      spids[MAXSPIDS] = 0;
      tpid = Tpid;
      modification |= mod;
-     if (Number())
-        Channels.SetModified();
+     return true;
      }
+  return false;
 }
 
-void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds)
+bool cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds)
 {
+  bool Modified = false;
   if (SubtitlingTypes) {
-     for (int i = 0; i < MAXSPIDS; i++)
+     for (int i = 0; i < MAXSPIDS; i++) {
+         Modified = subtitlingTypes[i] != SubtitlingTypes[i];
          subtitlingTypes[i] = SubtitlingTypes[i];
+         }
      }
   if (CompositionPageIds) {
-     for (int i = 0; i < MAXSPIDS; i++)
+     for (int i = 0; i < MAXSPIDS; i++) {
+         Modified = compositionPageIds[i] != CompositionPageIds[i];
          compositionPageIds[i] = CompositionPageIds[i];
+         }
      }
   if (AncillaryPageIds) {
-     for (int i = 0; i < MAXSPIDS; i++)
+     for (int i = 0; i < MAXSPIDS; i++) {
+         Modified = ancillaryPageIds[i] != AncillaryPageIds[i];
          ancillaryPageIds[i] = AncillaryPageIds[i];
+         }
      }
+  return Modified;
 }
 
 void cChannel::SetSeen(void)
@@ -426,10 +427,26 @@ void cChannel::SetSeen(void)
   seen = time(NULL);
 }
 
-void cChannel::SetCaIds(const int *CaIds)
+void cChannel::DelLinkChannel(cChannel *LinkChannel)
+{
+  if (linkChannels) {
+     for (cLinkChannel *lc = linkChannels->First(); lc; lc = linkChannels->Next(lc)) {
+         if (lc->Channel() == LinkChannel) {
+            linkChannels->Del(lc);
+            break;
+            }
+         }
+     if (linkChannels->Count() == 0) {
+        delete linkChannels;
+        linkChannels = NULL;
+        }
+     }
+}
+
+bool cChannel::SetCaIds(const int *CaIds)
 {
   if (caids[0] && caids[0] <= CA_USER_MAX)
-     return; // special values will not be overwritten
+     return false; // special values will not be overwritten
   if (IntArraysDiffer(caids, CaIds)) {
      char OldCaIdsBuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
      char NewCaIdsBuf[MAXCAIDS * 5 + 10];
@@ -443,24 +460,26 @@ void cChannel::SetCaIds(const int *CaIds)
             break;
          }
      modification |= CHANNELMOD_CA;
-     Channels.SetModified();
+     return true;
      }
+  return false;
 }
 
-void cChannel::SetCaDescriptors(int Level)
+bool cChannel::SetCaDescriptors(int Level)
 {
   if (Level > 0) {
      modification |= CHANNELMOD_CA;
-     Channels.SetModified();
      if (Number() && Level > 1)
         dsyslog("changing ca descriptors of channel %d (%s)", Number(), name);
+     return true;
      }
+  return false;
 }
 
-void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
+bool cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
 {
   if (!linkChannels && !LinkChannels)
-     return;
+     return false;
   if (linkChannels && LinkChannels) {
      cLinkChannel *lca = linkChannels->First();
      cLinkChannel *lcb = LinkChannels->First();
@@ -474,7 +493,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
            }
      if (!lca && !lcb) {
         delete LinkChannels;
-        return; // linkage has not changed
+        return false; // linkage has not changed
         }
      }
   char buffer[((linkChannels ? linkChannels->Count() : 0) + (LinkChannels ? LinkChannels->Count() : 0)) * 6 + 256]; // 6: 5 digit channel number plus blank, 256: other texts (see below) plus reserve
@@ -502,6 +521,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
      q += sprintf(q, " none");
   if (Number())
      dsyslog("%s", buffer);
+  return true;
 }
 
 void cChannel::SetRefChannel(cChannel *RefChannel)
@@ -534,9 +554,9 @@ cString cChannel::ToText(const cChannel *Channel)
   cString buffer;
   if (Channel->groupSep) {
      if (Channel->number)
-        buffer = cString::sprintf(":@%d %s\n", Channel->number, FullName);
+        buffer = cString::sprintf(":@%d %s", Channel->number, FullName);
      else
-        buffer = cString::sprintf(":%s\n", FullName);
+        buffer = cString::sprintf(":%s", FullName);
      }
   else {
      char vpidbuf[32];
@@ -568,7 +588,7 @@ cString cChannel::ToText(const cChannel *Channel)
      q = caidbuf;
      q += IntArrayToString(q, Channel->caids, 16);
      *q = 0;
-     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%s:%s:%d:%d:%d:%d\n", FullName, Channel->frequency, *Channel->parameters, *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, tpidbuf, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
+     buffer = cString::sprintf("%s:%d:%s:%s:%d:%s:%s:%s:%s:%d:%d:%d:%d", FullName, Channel->frequency, *Channel->parameters, *cSource::ToString(Channel->source), Channel->srate, vpidbuf, apidbuf, tpidbuf, caidbuf, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -786,7 +806,7 @@ bool cChannel::Parse(const char *s)
 
 bool cChannel::Save(FILE *f)
 {
-  return fprintf(f, "%s", *ToText()) > 0;
+  return fprintf(f, "%s\n", *ToText()) > 0;
 }
 
 // --- cChannelSorter --------------------------------------------------------
@@ -807,40 +827,52 @@ class cChannelSorter : public cListObject {
 
 // --- cChannels -------------------------------------------------------------
 
-cChannels Channels;
+cChannels cChannels::channels;
+int cChannels::maxNumber = 0;
+int cChannels::maxChannelNameLength = 0;
+int cChannels::maxShortChannelNameLength = 0;
 
 cChannels::cChannels(void)
+:cConfig<cChannel>("Channels")
 {
-  maxNumber = 0;
-  maxChannelNameLength = 0;
-  maxShortChannelNameLength = 0;
-  modified = CHANNELSMOD_NONE;
+  modifiedByUser = 0;
+}
+
+const cChannels *cChannels::GetChannelsRead(cStateKey &StateKey, int TimeoutMs)
+{
+  return channels.Lock(StateKey, false, TimeoutMs) ? &channels : NULL;
+}
+
+cChannels *cChannels::GetChannelsWrite(cStateKey &StateKey, int TimeoutMs)
+{
+  return channels.Lock(StateKey, true, TimeoutMs) ? &channels : NULL;
 }
 
 void cChannels::DeleteDuplicateChannels(void)
 {
   cList<cChannelSorter> ChannelSorter;
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep())
-         ChannelSorter.Add(new cChannelSorter(channel));
+  for (cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
+      if (!Channel->GroupSep())
+         ChannelSorter.Add(new cChannelSorter(Channel));
       }
   ChannelSorter.Sort();
   cChannelSorter *cs = ChannelSorter.First();
   while (cs) {
-        cChannelSorter *next = ChannelSorter.Next(cs);
-        if (next && cs->channelID == next->channelID) {
-           dsyslog("deleting duplicate channel %s", *next->channel->ToText());
-           Del(next->channel);
+        cChannelSorter *Next = ChannelSorter.Next(cs);
+        if (Next && cs->channelID == Next->channelID) {
+           dsyslog("deleting duplicate channel %s", *Next->channel->ToText());
+           Del(Next->channel);
            }
-        cs = next;
+        cs = Next;
         }
 }
 
 bool cChannels::Load(const char *FileName, bool AllowComments, bool MustExist)
 {
-  if (cConfig<cChannel>::Load(FileName, AllowComments, MustExist)) {
-     DeleteDuplicateChannels();
-     ReNumber();
+  LOCK_CHANNELS_WRITE;
+  if (channels.cConfig<cChannel>::Load(FileName, AllowComments, MustExist)) {
+     channels.DeleteDuplicateChannels();
+     channels.ReNumber();
      return true;
      }
   return false;
@@ -856,36 +888,36 @@ void cChannels::UnhashChannel(cChannel *Channel)
   channelsHashSid.Del(Channel, Channel->Sid());
 }
 
-int cChannels::GetNextGroup(int Idx)
+int cChannels::GetNextGroup(int Idx) const
 {
-  cChannel *channel = Get(++Idx);
-  while (channel && !(channel->GroupSep() && *channel->Name()))
-        channel = Get(++Idx);
-  return channel ? Idx : -1;
+  const cChannel *Channel = Get(++Idx);
+  while (Channel && !(Channel->GroupSep() && *Channel->Name()))
+        Channel = Get(++Idx);
+  return Channel ? Idx : -1;
 }
 
-int cChannels::GetPrevGroup(int Idx)
+int cChannels::GetPrevGroup(int Idx) const
 {
-  cChannel *channel = Get(--Idx);
-  while (channel && !(channel->GroupSep() && *channel->Name()))
-        channel = Get(--Idx);
-  return channel ? Idx : -1;
+  const cChannel *Channel = Get(--Idx);
+  while (Channel && !(Channel->GroupSep() && *Channel->Name()))
+        Channel = Get(--Idx);
+  return Channel ? Idx : -1;
 }
 
-int cChannels::GetNextNormal(int Idx)
+int cChannels::GetNextNormal(int Idx) const
 {
-  cChannel *channel = Get(++Idx);
-  while (channel && channel->GroupSep())
-        channel = Get(++Idx);
-  return channel ? Idx : -1;
+  const cChannel *Channel = Get(++Idx);
+  while (Channel && Channel->GroupSep())
+        Channel = Get(++Idx);
+  return Channel ? Idx : -1;
 }
 
-int cChannels::GetPrevNormal(int Idx)
+int cChannels::GetPrevNormal(int Idx) const
 {
-  cChannel *channel = Get(--Idx);
-  while (channel && channel->GroupSep())
-        channel = Get(--Idx);
-  return channel ? Idx : -1;
+  const cChannel *Channel = Get(--Idx);
+  while (Channel && Channel->GroupSep())
+        Channel = Get(--Idx);
+  return Channel ? Idx : -1;
 }
 
 void cChannels::ReNumber(void)
@@ -893,110 +925,120 @@ void cChannels::ReNumber(void)
   channelsHashSid.Clear();
   maxNumber = 0;
   int Number = 1;
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (channel->GroupSep()) {
-         if (channel->Number() > Number)
-            Number = channel->Number();
+  for (cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
+      if (Channel->GroupSep()) {
+         if (Channel->Number() > Number)
+            Number = Channel->Number();
          }
       else {
-         HashChannel(channel);
+         HashChannel(Channel);
          maxNumber = Number;
-         channel->SetNumber(Number++);
+         Channel->SetNumber(Number++);
          }
       }
 }
 
-cChannel *cChannels::GetByNumber(int Number, int SkipGap)
+void cChannels::Del(cChannel *Channel)
 {
-  cChannel *previous = NULL;
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep()) {
-         if (channel->Number() == Number)
-            return channel;
-         else if (SkipGap && channel->Number() > Number)
-            return SkipGap > 0 ? channel : previous;
-         previous = channel;
+  UnhashChannel(Channel);
+  for (cChannel *ch = First(); ch; ch = Next(ch))
+      ch->DelLinkChannel(Channel);
+  cList<cChannel>::Del(Channel);
+}
+
+const cChannel *cChannels::GetByNumber(int Number, int SkipGap) const
+{
+  const cChannel *Previous = NULL;
+  for (const cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
+      if (!Channel->GroupSep()) {
+         if (Channel->Number() == Number)
+            return Channel;
+         else if (SkipGap && Channel->Number() > Number)
+            return SkipGap > 0 ? Channel : Previous;
+         Previous = Channel;
          }
       }
   return NULL;
 }
 
-cChannel *cChannels::GetByServiceID(int Source, int Transponder, unsigned short ServiceID)
+const cChannel *cChannels::GetByServiceID(int Source, int Transponder, unsigned short ServiceID) const
 {
   cList<cHashObject> *list = channelsHashSid.GetList(ServiceID);
   if (list) {
      for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
-         cChannel *channel = (cChannel *)hobj->Object();
-         if (channel->Sid() == ServiceID && channel->Source() == Source && ISTRANSPONDER(channel->Transponder(), Transponder))
-            return channel;
+         cChannel *Channel = (cChannel *)hobj->Object();
+         if (Channel->Sid() == ServiceID && Channel->Source() == Source && ISTRANSPONDER(Channel->Transponder(), Transponder))
+            return Channel;
          }
      }
   return NULL;
 }
 
-cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid, bool TryWithoutPolarization)
+const cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid, bool TryWithoutPolarization) const
 {
   int sid = ChannelID.Sid();
   cList<cHashObject> *list = channelsHashSid.GetList(sid);
   if (list) {
      for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
-         cChannel *channel = (cChannel *)hobj->Object();
-         if (channel->Sid() == sid && channel->GetChannelID() == ChannelID)
-            return channel;
+         cChannel *Channel = (cChannel *)hobj->Object();
+         if (Channel->Sid() == sid && Channel->GetChannelID() == ChannelID)
+            return Channel;
          }
      if (TryWithoutRid) {
         ChannelID.ClrRid();
         for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
-            cChannel *channel = (cChannel *)hobj->Object();
-            if (channel->Sid() == sid && channel->GetChannelID().ClrRid() == ChannelID)
-               return channel;
+            cChannel *Channel = (cChannel *)hobj->Object();
+            if (Channel->Sid() == sid && Channel->GetChannelID().ClrRid() == ChannelID)
+               return Channel;
             }
         }
      if (TryWithoutPolarization) {
         ChannelID.ClrPolarization();
         for (cHashObject *hobj = list->First(); hobj; hobj = list->Next(hobj)) {
-            cChannel *channel = (cChannel *)hobj->Object();
-            if (channel->Sid() == sid && channel->GetChannelID().ClrPolarization() == ChannelID)
-               return channel;
+            cChannel *Channel = (cChannel *)hobj->Object();
+            if (Channel->Sid() == sid && Channel->GetChannelID().ClrPolarization() == ChannelID)
+               return Channel;
             }
         }
      }
   return NULL;
 }
-cChannel *cChannels::GetByTransponderID(tChannelID ChannelID)
+
+const cChannel *cChannels::GetByTransponderID(tChannelID ChannelID) const
 {
   int source = ChannelID.Source();
   int nid = ChannelID.Nid();
   int tid = ChannelID.Tid();
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (channel->Tid() == tid && channel->Nid() == nid && channel->Source() == source)
-         return channel;
+  for (const cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
+      if (Channel->Tid() == tid && Channel->Nid() == nid && Channel->Source() == source)
+         return Channel;
       }
   return NULL;
 }
 
-bool cChannels::HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel)
+bool cChannels::HasUniqueChannelID(const cChannel *NewChannel, const cChannel *OldChannel) const
 {
   tChannelID NewChannelID = NewChannel->GetChannelID();
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (!channel->GroupSep() && channel != OldChannel && channel->GetChannelID() == NewChannelID)
+  for (const cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
+      if (!Channel->GroupSep() && Channel != OldChannel && Channel->GetChannelID() == NewChannelID)
          return false;
       }
   return true;
 }
 
-bool cChannels::SwitchTo(int Number)
+bool cChannels::SwitchTo(int Number) const
 {
-  cChannel *channel = GetByNumber(Number);
-  return channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true);
+  const cChannel *Channel = GetByNumber(Number);
+  return Channel && cDevice::PrimaryDevice()->SwitchChannel(Channel, true);
 }
 
 int cChannels::MaxChannelNameLength(void)
 {
   if (!maxChannelNameLength) {
-     for (cChannel *channel = First(); channel; channel = Next(channel)) {
-         if (!channel->GroupSep())
-            maxChannelNameLength = max(Utf8StrLen(channel->Name()), maxChannelNameLength);
+     LOCK_CHANNELS_READ;
+     for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
+         if (!Channel->GroupSep())
+            maxChannelNameLength = max(Utf8StrLen(Channel->Name()), maxChannelNameLength);
          }
      }
   return maxChannelNameLength;
@@ -1005,24 +1047,25 @@ int cChannels::MaxChannelNameLength(void)
 int cChannels::MaxShortChannelNameLength(void)
 {
   if (!maxShortChannelNameLength) {
-     for (cChannel *channel = First(); channel; channel = Next(channel)) {
-         if (!channel->GroupSep())
-            maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName(true)), maxShortChannelNameLength);
+     LOCK_CHANNELS_READ;
+     for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
+         if (!Channel->GroupSep())
+            maxShortChannelNameLength = max(Utf8StrLen(Channel->ShortName(true)), maxShortChannelNameLength);
          }
      }
   return maxShortChannelNameLength;
 }
 
-void cChannels::SetModified(bool ByUser)
+void cChannels::SetModifiedByUser(void)
 {
-  modified = ByUser ? CHANNELSMOD_USER : !modified ? CHANNELSMOD_AUTO : modified;
+  modifiedByUser++;
   maxChannelNameLength = maxShortChannelNameLength = 0;
 }
 
-int cChannels::Modified(void)
+bool cChannels::ModifiedByUser(int &State) const
 {
-  int Result = modified;
-  modified = CHANNELSMOD_NONE;
+  int Result = State != modifiedByUser;
+  State = modifiedByUser;
   return Result;
 }
 
@@ -1032,7 +1075,7 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
      dsyslog("creating new channel '%s,%s;%s' on %s transponder %d with id %d-%d-%d-%d", Name, ShortName, Provider, *cSource::ToString(Transponder->Source()), Transponder->Transponder(), Nid, Tid, Sid, Rid);
      cChannel *NewChannel = new cChannel;
      NewChannel->CopyTransponderData(Transponder);
-     NewChannel->SetId(Nid, Tid, Sid, Rid);
+     NewChannel->SetId(this, Nid, Tid, Sid, Rid);
      NewChannel->SetName(Name, ShortName, Provider);
      NewChannel->SetSeen();
      Add(NewChannel);
@@ -1045,17 +1088,19 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
 #define CHANNELMARKOBSOLETE "OBSOLETE"
 #define CHANNELTIMEOBSOLETE 3600 // seconds to wait before declaring a channel obsolete (in case it has actually been seen before)
 
-void cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
+bool cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
 {
-  for (cChannel *channel = First(); channel; channel = Next(channel)) {
-      if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid && channel->Rid() == 0) {
+  bool ChannelsModified = false;
+  for (cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
+      if (time(NULL) - Channel->Seen() > CHANNELTIMEOBSOLETE && Channel->Source() == Source && Channel->Nid() == Nid && Channel->Tid() == Tid && Channel->Rid() == 0) {
          bool OldShowChannelNamesWithSource = Setup.ShowChannelNamesWithSource;
          Setup.ShowChannelNamesWithSource = false;
-         if (!endswith(channel->Name(), CHANNELMARKOBSOLETE))
-            channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARKOBSOLETE), channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, channel->Provider()));
+         if (!endswith(Channel->Name(), CHANNELMARKOBSOLETE))
+            ChannelsModified |= Channel->SetName(cString::sprintf("%s %s", Channel->Name(), CHANNELMARKOBSOLETE), Channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, Channel->Provider()));
          Setup.ShowChannelNamesWithSource = OldShowChannelNamesWithSource;
          }
       }
+  return ChannelsModified;
 }
 
 cString ChannelString(const cChannel *Channel, int Number)
diff --git a/channels.h b/channels.h
index 332388212..478b3d640 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 3.3 2015/02/01 13:30:26 kls Exp $
+ * $Id: channels.h 4.2 2015/08/17 09:39:48 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -28,10 +28,6 @@
 #define CHANNELMOD_LANGS    0x40
 #define CHANNELMOD_RETUNE   (CHANNELMOD_PIDS | CHANNELMOD_CA | CHANNELMOD_TRANSP)
 
-#define CHANNELSMOD_NONE    0
-#define CHANNELSMOD_AUTO    1
-#define CHANNELSMOD_USER    2
-
 #define MAXAPIDS 32 // audio
 #define MAXDPIDS 16 // dolby (AC3 + DTS)
 #define MAXSPIDS 32 // subtitles
@@ -86,6 +82,7 @@ class cLinkChannels : public cList<cLinkChannel> {
   };
 
 class cSchedule;
+class cChannels;
 
 class cChannel : public cListObject {
   friend class cSchedules;
@@ -128,7 +125,7 @@ class cChannel : public cListObject {
   mutable cString nameSource;
   mutable cString shortNameSource;
   cString parameters;
-  int modification;
+  mutable int modification;
   time_t seen; // When this channel was last seen in the SDT of its transponder
   mutable const cSchedule *schedule;
   cLinkChannels *linkChannels;
@@ -188,65 +185,84 @@ class cChannel : public cListObject {
   bool IsTerr(void) const { return cSource::IsTerr(source); }
   bool IsSourceType(char Source) const { return cSource::IsType(source, Source); }
   tChannelID GetChannelID(void) const { return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); }
-  bool HasTimer(void) const;
-  int Modification(int Mask = CHANNELMOD_ALL);
-  time_t Seen(void) { return seen; }
+  int Modification(int Mask = CHANNELMOD_ALL) const;
+  time_t Seen(void) const { return seen; }
   void CopyTransponderData(const cChannel *Channel);
   bool SetTransponderData(int Source, int Frequency, int Srate, const char *Parameters, bool Quiet = false);
-  void SetId(int Nid, int Tid, int Sid, int Rid = 0);
-  void SetLcn(int Lcn);
-  void SetName(const char *Name, const char *ShortName, const char *Provider);
-  void SetPortalName(const char *PortalName);
-  void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
-  void SetCaIds(const int *CaIds); // list must be zero-terminated
-  void SetCaDescriptors(int Level);
-  void SetLinkChannels(cLinkChannels *LinkChannels);
+  bool SetSource(int Source);
+  bool SetId(cChannels *Channels, int Nid, int Tid, int Sid, int Rid = 0);
+  bool SetLcn(int Lcn);
+  bool SetName(const char *Name, const char *ShortName, const char *Provider);
+  bool SetPortalName(const char *PortalName);
+  bool SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+  bool SetCaIds(const int *CaIds); // list must be zero-terminated
+  bool SetCaDescriptors(int Level);
+  bool SetLinkChannels(cLinkChannels *LinkChannels);
   void SetRefChannel(cChannel *RefChannel);
-  void SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds);
+  bool SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *CompositionPageIds, uint16_t *AncillaryPageIds);
   void SetSeen(void);
+  void DelLinkChannel(cChannel *LinkChannel);
   };
 
-class cChannels : public cRwLock, public cConfig<cChannel> {
+class cChannels : public cConfig<cChannel> {
 private:
-  int maxNumber;
-  int maxChannelNameLength;
-  int maxShortChannelNameLength;
-  int modified;
-  int beingEdited;
+  static cChannels channels;
+  static int maxNumber;
+  static int maxChannelNameLength;
+  static int maxShortChannelNameLength;
+  int modifiedByUser;
   cHash<cChannel> channelsHashSid;
   void DeleteDuplicateChannels(void);
 public:
   cChannels(void);
-  bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
+  static const cChannels *GetChannelsRead(cStateKey &StateKey, int TimeoutMs = 0);
+      ///< Gets the list of channels for read access.
+      ///< See cTimers::GetTimersRead() for details.
+  static cChannels *GetChannelsWrite(cStateKey &StateKey, int TimeoutMs = 0);
+      ///< Gets the list of channels for write access.
+      ///< See cTimers::GetTimersWrite() for details.
+  static bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false);
   void HashChannel(cChannel *Channel);
   void UnhashChannel(cChannel *Channel);
-  int GetNextGroup(int Idx);   // Get next channel group
-  int GetPrevGroup(int Idx);   // Get previous channel group
-  int GetNextNormal(int Idx);  // Get next normal channel (not group)
-  int GetPrevNormal(int Idx);  // Get previous normal channel (not group)
-  void ReNumber(void);         // Recalculate 'number' based on channel type
-  cChannel *GetByNumber(int Number, int SkipGap = 0);
-  cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID);
-  cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false, bool TryWithoutPolarization = false);
-  cChannel *GetByTransponderID(tChannelID ChannelID);
-  int BeingEdited(void) { return beingEdited; }
-  void IncBeingEdited(void) { beingEdited++; }
-  void DecBeingEdited(void) { beingEdited--; }
-  bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
-  bool SwitchTo(int Number);
-  int MaxNumber(void) { return maxNumber; }
-  int MaxChannelNameLength(void);
-  int MaxShortChannelNameLength(void);
-  void SetModified(bool ByUser = false);
-  int Modified(void);
-      ///< Returns 0 if no channels have been modified, 1 if an automatic
-      ///< modification has been made, and 2 if the user has made a modification.
-      ///< Calling this function resets the 'modified' flag to 0.
+  int GetNextGroup(int Idx) const;   ///< Get next channel group
+  int GetPrevGroup(int Idx) const;   ///< Get previous channel group
+  int GetNextNormal(int Idx) const;  ///< Get next normal channel (not group)
+  int GetPrevNormal(int Idx) const;  ///< Get previous normal channel (not group)
+  void ReNumber(void);               ///< Recalculate 'number' based on channel type
+  void Del(cChannel *Channel);       ///< Delete the given Channel from the list
+  const cChannel *GetByNumber(int Number, int SkipGap = 0) const;
+  cChannel *GetByNumber(int Number, int SkipGap = 0) { return const_cast<cChannel *>(static_cast<const cChannels *>(this)->GetByNumber(Number, SkipGap)); }
+  const cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID) const;
+  cChannel *GetByServiceID(int Source, int Transponder, unsigned short ServiceID) { return const_cast<cChannel *>(static_cast<const cChannels *>(this)->GetByServiceID(Source, Transponder, ServiceID)); }
+  const cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false, bool TryWithoutPolarization = false) const;
+  cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false, bool TryWithoutPolarization = false) { return const_cast<cChannel *>(static_cast<const cChannels *>(this)->GetByChannelID(ChannelID, TryWithoutRid, TryWithoutPolarization)); }
+  const cChannel *GetByTransponderID(tChannelID ChannelID) const;
+  cChannel *GetByTransponderID(tChannelID ChannelID) { return const_cast<cChannel *>(static_cast<const cChannels *>(this)->GetByTransponderID(ChannelID)); }
+  bool HasUniqueChannelID(const cChannel *NewChannel, const cChannel *OldChannel = NULL) const;
+  bool SwitchTo(int Number) const;
+  static int MaxNumber(void) { return maxNumber; }
+  static int MaxChannelNameLength(void);
+  static int MaxShortChannelNameLength(void);
+  void SetModifiedByUser(void);
+  bool ModifiedByUser(int &State) const;
+      ///< Returns true if the channels have been modified by the user since the last call
+      ///< to this function with the same State variable. State must be initialized with 0
+      ///< and will be set to the current value of the list's internal state variable upon
+      ///< return from this function.
   cChannel *NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid, int Rid = 0);
-  void MarkObsoleteChannels(int Source, int Nid, int Tid);
+  bool MarkObsoleteChannels(int Source, int Nid, int Tid);
   };
 
-extern cChannels Channels;
+// Provide lock controlled access to the list:
+
+DEF_LIST_LOCK(Channels);
+
+// These macros provide a convenient way of locking the global channels list
+// and making sure the lock is released as soon as the current scope is left
+// (note that these macros wait forever to obtain the lock!):
+
+#define LOCK_CHANNELS_READ  USE_LIST_LOCK_READ(Channels)
+#define LOCK_CHANNELS_WRITE USE_LIST_LOCK_WRITE(Channels)
 
 cString ChannelString(const cChannel *Channel, int Number);
 
diff --git a/ci.c b/ci.c
index ffc7ff712..f86f668e4 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.19 2015/02/02 13:57:39 kls Exp $
+ * $Id: ci.c 4.2 2015/09/05 11:45:19 kls Exp $
  */
 
 #include "ci.h"
@@ -125,8 +125,8 @@ class cCaPidReceiver : public cReceiver {
 public:
   cCaPidReceiver(void);
   virtual ~cCaPidReceiver() { Detach(); }
-  virtual void Receive(uchar *Data, int Length);
-  bool HasCaPids(void) { return NumPids() - emmPids.Size() - 1 > 0; }
+  virtual void Receive(const uchar *Data, int Length);
+  bool HasCaPids(void) const { return NumPids() - emmPids.Size() - 1 > 0; }
   void Reset(void) { DelEmmPids(); catVersion = -1; }
   };
 
@@ -160,10 +160,10 @@ void cCaPidReceiver::Activate(bool On)
   catVersion = -1; // can be done independent of 'On'
 }
 
-void cCaPidReceiver::Receive(uchar *Data, int Length)
+void cCaPidReceiver::Receive(const uchar *Data, int Length)
 {
   if (TsPid(Data) == CATPID) {
-     uchar *p = NULL;
+     const uchar *p = NULL;
      if (TsPayloadStart(Data)) {
         if (Data[5] == SI::TableIdCAT) {
            length = (int(Data[6] & 0x03) << 8) | Data[7]; // section length
@@ -251,7 +251,7 @@ class cCaActivationReceiver : public cReceiver {
   time_t lastScrambledTime;
   int numTsPackets;
 protected:
-  virtual void Receive(uchar *Data, int Length);
+  virtual void Receive(const uchar *Data, int Length);
 public:
   cCaActivationReceiver(const cChannel *Channel, cCamSlot *CamSlot);
   virtual ~cCaActivationReceiver();
@@ -270,7 +270,7 @@ cCaActivationReceiver::~cCaActivationReceiver()
   Detach();
 }
 
-void cCaActivationReceiver::Receive(uchar *Data, int Length)
+void cCaActivationReceiver::Receive(const uchar *Data, int Length)
 {
   if (numTsPackets++ % TS_PACKET_FACTOR == 0) {
      time_t Now = time(NULL);
@@ -1921,7 +1921,8 @@ void cCamSlot::StartActivation(void)
   cMutexLock MutexLock(&mutex);
   if (!caActivationReceiver) {
      if (cDevice *d = Device()) {
-        if (cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel())) {
+        LOCK_CHANNELS_READ;
+        if (const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel())) {
            caActivationReceiver = new cCaActivationReceiver(Channel, this);
            d->AttachReceiver(caActivationReceiver);
            dsyslog("CAM %d: activating on device %d with channel %d (%s)", SlotNumber(), d->DeviceNumber() + 1, Channel->Number(), Channel->Name());
diff --git a/ci.h b/ci.h
index 5a4dc98d9..a4200152b 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 3.11 2015/01/31 14:36:41 kls Exp $
+ * $Id: ci.h 4.0 2015/01/31 14:36:41 kls Exp $
  */
 
 #ifndef __CI_H
diff --git a/config.c b/config.c
index 9c6b71e56..e5f5463c6 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.10 2015/02/10 12:24:13 kls Exp $
+ * $Id: config.c 4.4 2015/09/13 11:09:44 kls Exp $
  */
 
 #include "config.h"
@@ -412,12 +412,16 @@ cSetup::cSetup(void)
   EPGBugfixLevel = 3;
   EPGLinger = 0;
   SVDRPTimeout = 300;
+  SVDRPPeering = 0;
+  strn0cpy(SVDRPHostName, GetHostName(), sizeof(SVDRPHostName));
+  strcpy(SVDRPDefaultHost, "");
   ZapTimeout = 3;
   ChannelEntryTimeout = 1000;
   RcRepeatDelay = 300;
   RcRepeatDelta = 100;
   DefaultPriority = 50;
   DefaultLifetime = MAXLIFETIME;
+  RecordKeyHandling = 2;
   PauseKeyHandling = 2;
   PausePriority = 10;
   PauseLifetime = 1;
@@ -427,6 +431,7 @@ cSetup::cSetup(void)
   RecordingDirs = 1;
   FoldersInTimerMenu = 1;
   AlwaysSortFoldersFirst = 1;
+  DefaultSortModeRec = rsmTime;
   NumberKeysForChars = 1;
   ColorKey0 = 0;
   ColorKey1 = 1;
@@ -634,12 +639,16 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGBugfixLevel"))      EPGBugfixLevel     = atoi(Value);
   else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
+  else if (!strcasecmp(Name, "SVDRPPeering"))        SVDRPPeering       = atoi(Value);
+  else if (!strcasecmp(Name, "SVDRPHostName"))       strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName));
+  else if (!strcasecmp(Name, "SVDRPdefaultHost"))    strn0cpy(SVDRPDefaultHost, Value, sizeof(SVDRPDefaultHost));
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
   else if (!strcasecmp(Name, "RcRepeatDelay"))       RcRepeatDelay      = atoi(Value);
   else if (!strcasecmp(Name, "RcRepeatDelta"))       RcRepeatDelta      = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
+  else if (!strcasecmp(Name, "RecordKeyHandling"))   RecordKeyHandling  = atoi(Value);
   else if (!strcasecmp(Name, "PauseKeyHandling"))    PauseKeyHandling   = atoi(Value);
   else if (!strcasecmp(Name, "PausePriority"))       PausePriority      = atoi(Value);
   else if (!strcasecmp(Name, "PauseLifetime"))       PauseLifetime      = atoi(Value);
@@ -649,6 +658,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
   else if (!strcasecmp(Name, "AlwaysSortFoldersFirst")) AlwaysSortFoldersFirst = atoi(Value);
+  else if (!strcasecmp(Name, "DefaultSortModeRec"))  DefaultSortModeRec = atoi(Value);
   else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey0"))           ColorKey0          = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey1"))           ColorKey1          = atoi(Value);
@@ -760,12 +770,16 @@ bool cSetup::Save(void)
   Store("EPGBugfixLevel",     EPGBugfixLevel);
   Store("EPGLinger",          EPGLinger);
   Store("SVDRPTimeout",       SVDRPTimeout);
+  Store("SVDRPPeering",       SVDRPPeering);
+  Store("SVDRPHostName",      SVDRPHostName);
+  Store("SVDRPDefaultHost",   SVDRPDefaultHost);
   Store("ZapTimeout",         ZapTimeout);
   Store("ChannelEntryTimeout",ChannelEntryTimeout);
   Store("RcRepeatDelay",      RcRepeatDelay);
   Store("RcRepeatDelta",      RcRepeatDelta);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
+  Store("RecordKeyHandling",  RecordKeyHandling);
   Store("PauseKeyHandling",   PauseKeyHandling);
   Store("PausePriority",      PausePriority);
   Store("PauseLifetime",      PauseLifetime);
@@ -775,6 +789,7 @@ bool cSetup::Save(void)
   Store("RecordingDirs",      RecordingDirs);
   Store("FoldersInTimerMenu", FoldersInTimerMenu);
   Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst);
+  Store("DefaultSortModeRec", DefaultSortModeRec);
   Store("NumberKeysForChars", NumberKeysForChars);
   Store("ColorKey0",          ColorKey0);
   Store("ColorKey1",          ColorKey1);
diff --git a/config.h b/config.h
index d1bae0442..e5565da35 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 3.21 2015/02/13 15:39:08 kls Exp $
+ * $Id: config.h 4.5 2015/09/11 08:07:34 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.2.0"
-#define VDRVERSNUM   20200  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.1"
+#define VDRVERSNUM   20301  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.2.0"
-#define APIVERSNUM   20200  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.1"
+#define APIVERSNUM   20301  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -110,7 +110,7 @@ template<class T> class cConfig : public cList<T> {
     cList<T>::Clear();
   }
 public:
-  cConfig(void) { fileName = NULL; }
+  cConfig(const char *NeedsLocking = NULL): cList<T>(NeedsLocking) { fileName = NULL; }
   virtual ~cConfig() { free(fileName); }
   const char *FileName(void) { return fileName; }
   bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
@@ -160,7 +160,7 @@ template<class T> class cConfig : public cList<T> {
        fprintf(stderr, "vdr: error while reading '%s'\n", fileName);
     return result;
   }
-  bool Save(void)
+  bool Save(void) const
   {
     bool result = true;
     T *l = (T *)this->First();
@@ -288,19 +288,24 @@ class cSetup : public cConfig<cSetupLine> {
   int EPGBugfixLevel;
   int EPGLinger;
   int SVDRPTimeout;
+  int SVDRPPeering;
+  char SVDRPHostName[HOST_NAME_MAX];
+  char SVDRPDefaultHost[HOST_NAME_MAX];
   int ZapTimeout;
   int ChannelEntryTimeout;
   int RcRepeatDelay;
   int RcRepeatDelta;
   int DefaultPriority, DefaultLifetime;
-  int PausePriority, PauseLifetime;
+  int RecordKeyHandling;
   int PauseKeyHandling;
+  int PausePriority, PauseLifetime;
   int UseSubtitle;
   int UseVps;
   int VpsMargin;
   int RecordingDirs;
   int FoldersInTimerMenu;
   int AlwaysSortFoldersFirst;
+  int DefaultSortModeRec;
   int NumberKeysForChars;
   int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
   int VideoDisplayFormat;
diff --git a/cutter.c b/cutter.c
index 9aee66b96..587fddf08 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 3.4 2013/10/02 13:18:02 kls Exp $
+ * $Id: cutter.c 4.2 2015/08/09 12:24:28 kls Exp $
  */
 
 #include "cutter.h"
@@ -634,7 +634,6 @@ void cCuttingThread::Action(void)
                  }
               }
            }
-     Recordings.TouchUpdate();
      }
   else
      esyslog("no editing marks found!");
@@ -675,9 +674,11 @@ bool cCutter::Start(void)
         editedVersionName = EditedFileName(originalVersionName);
         if (*editedVersionName) {
            if (strcmp(originalVersionName, editedVersionName) != 0) { // names must be different!
+              cRecordingUserCommand::InvokeCommand(RUC_EDITINGRECORDING, editedVersionName, originalVersionName);
               if (cVideoDirectory::RemoveVideoFile(editedVersionName) && MakeDirs(editedVersionName, true)) {
                  Recording.WriteInfo(editedVersionName);
-                 Recordings.AddByName(editedVersionName, false);
+                 LOCK_RECORDINGS_WRITE;
+                 Recordings->AddByName(editedVersionName, false);
                  cuttingThread = new cCuttingThread(originalVersionName, editedVersionName);
                  return true;
                  }
@@ -702,7 +703,8 @@ void cCutter::Stop(void)
      if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), editedVersionName) == 0)
         cControl::Shutdown();
      cVideoDirectory::RemoveVideoFile(editedVersionName);
-     Recordings.DelByName(editedVersionName);
+     LOCK_RECORDINGS_WRITE;
+     Recordings->DelByName(editedVersionName);
      }
 }
 
diff --git a/cutter.h b/cutter.h
index c67429a15..fdc94fca3 100644
--- a/cutter.h
+++ b/cutter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 3.1 2013/10/05 11:34:55 kls Exp $
+ * $Id: cutter.h 4.0 2013/10/05 11:34:55 kls Exp $
  */
 
 #ifndef __CUTTER_H
diff --git a/device.c b/device.c
index 14ab07d32..174281f4a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 3.20 2015/01/30 12:11:30 kls Exp $
+ * $Id: device.c 4.2 2015/09/05 11:42:17 kls Exp $
  */
 
 #include "device.h"
@@ -24,7 +24,7 @@
 
 class cLiveSubtitle : public cReceiver {
 protected:
-  virtual void Receive(uchar *Data, int Length);
+  virtual void Receive(const uchar *Data, int Length);
 public:
   cLiveSubtitle(int SPid);
   virtual ~cLiveSubtitle();
@@ -40,7 +40,7 @@ cLiveSubtitle::~cLiveSubtitle()
   cReceiver::Detach();
 }
 
-void cLiveSubtitle::Receive(uchar *Data, int Length)
+void cLiveSubtitle::Receive(const uchar *Data, int Length)
 {
   if (cDevice::PrimaryDevice())
      cDevice::PrimaryDevice()->PlayTs(Data, Length);
@@ -722,20 +722,21 @@ bool cDevice::SwitchChannel(int Direction)
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
      int n = CurrentChannel() + Direction;
      int first = n;
-     cChannel *channel;
-     while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
+     LOCK_CHANNELS_READ;
+     const cChannel *Channel;
+     while ((Channel = Channels->GetByNumber(n, Direction)) != NULL) {
            // try only channels which are currently available
-           if (GetDevice(channel, LIVEPRIORITY, true, true))
+           if (GetDevice(Channel, LIVEPRIORITY, true, true))
               break;
-           n = channel->Number() + Direction;
+           n = Channel->Number() + Direction;
            }
-     if (channel) {
+     if (Channel) {
         int d = n - first;
         if (abs(d) == 1)
            dsyslog("skipped channel %d", first);
         else if (d)
            dsyslog("skipped channels %d..%d", first, n - sgn(d));
-        if (PrimaryDevice()->SwitchChannel(channel, true))
+        if (PrimaryDevice()->SwitchChannel(Channel, true))
            result = true;
         }
      else if (n != first)
@@ -777,7 +778,6 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         Result = scrNotAvailable;
      }
   else {
-     Channels.Lock(false);
      // Stop section handling:
      if (sectionHandler) {
         sectionHandler->SetStatus(false);
@@ -790,7 +790,8 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
      if (SetChannelDevice(Channel, LiveView)) {
         // Start section handling:
         if (sectionHandler) {
-           patFilter->Trigger(Channel->Sid());
+           if (patFilter)
+              patFilter->Trigger(Channel->Sid());
            sectionHandler->SetChannel(Channel);
            sectionHandler->SetStatus(true);
            }
@@ -800,7 +801,6 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         }
      else
         Result = scrFailed;
-     Channels.Unlock();
      }
 
   if (Result == scrOk) {
@@ -829,8 +829,8 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 void cDevice::ForceTransferMode(void)
 {
   if (!cTransferControl::ReceiverDevice()) {
-     cChannel *Channel = Channels.GetByNumber(CurrentChannel());
-     if (Channel)
+     LOCK_CHANNELS_READ;
+     if (const cChannel *Channel = Channels->GetByNumber(CurrentChannel()))
         SetChannelDevice(Channel, false); // this implicitly starts Transfer Mode
      }
 }
diff --git a/device.h b/device.h
index b06d97700..31ee3038a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 3.10 2015/01/12 14:39:09 kls Exp $
+ * $Id: device.h 4.1 2015/04/19 12:12:43 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -55,7 +55,7 @@ enum ePlayMode { pmNone,           // audio/video from decoder
                  // KNOWN TO YOUR PLAYER.
                };
 
-#define DEPRECATED_VIDEOSYSTEM
+//#define DEPRECATED_VIDEOSYSTEM
 #ifdef DEPRECATED_VIDEOSYSTEM
 enum eVideoSystem { vsPAL,
                     vsNTSC
diff --git a/diseqc.c b/diseqc.c
index de64257f8..b2f8e35ca 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 3.4 2015/01/26 12:02:14 kls Exp $
+ * $Id: diseqc.c 4.0 2015/01/26 12:02:14 kls Exp $
  */
 
 #include "diseqc.h"
diff --git a/diseqc.h b/diseqc.h
index eef36a6aa..2c349d14d 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 3.1 2013/06/12 11:52:17 kls Exp $
+ * $Id: diseqc.h 4.0 2013/06/12 11:52:17 kls Exp $
  */
 
 #ifndef __DISEQC_H
diff --git a/dvbci.c b/dvbci.c
index fa65f0f68..afe3b312d 100644
--- a/dvbci.c
+++ b/dvbci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.c 3.1 2015/01/14 11:13:49 kls Exp $
+ * $Id: dvbci.c 4.0 2015/01/14 11:13:49 kls Exp $
  */
 
 #include "dvbci.h"
diff --git a/dvbci.h b/dvbci.h
index f74703c3a..4e6d24bec 100644
--- a/dvbci.h
+++ b/dvbci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbci.h 3.0 2006/11/26 11:19:42 kls Exp $
+ * $Id: dvbci.h 4.0 2006/11/26 11:19:42 kls Exp $
  */
 
 #ifndef __DVBCI_H
diff --git a/dvbdevice.c b/dvbdevice.c
index 9321f16da..63af52e7d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 3.14 2015/01/14 12:09:19 kls Exp $
+ * $Id: dvbdevice.c 4.2 2015/04/18 16:19:28 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1064,6 +1064,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
 
 // --- cDvbDevice ------------------------------------------------------------
 
+bool cDvbDevice::useDvbDevices = true;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 cMutex cDvbDevice::bondMutex;
 
@@ -1234,7 +1235,7 @@ bool cDvbDevice::Initialize(void)
             if (Exists(Adapter, Frontend)) {
                if (Found < MAXDEVICES) {
                   Found++;
-                  if (UseDevice(NextCardIndex())) {
+                  if (useDvbDevices && UseDevice(NextCardIndex())) {
                      if (Probe(Adapter, Frontend))
                         Used++;
                      }
@@ -1248,7 +1249,7 @@ bool cDvbDevice::Initialize(void)
   if (Found > 0) {
      isyslog("found %d DVB device%s", Found, Found > 1 ? "s" : "");
      if (Used != Found)
-        isyslog("using only %d DVB device%s", Used, Used > 1 ? "s" : "");
+        isyslog("using only %d DVB device%s", Used, Used != 1 ? "s" : "");
      }
   else
      isyslog("no DVB device found");
diff --git a/dvbdevice.h b/dvbdevice.h
index 0a148ce3b..5ae4952f8 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 3.5 2014/03/16 10:38:31 kls Exp $
+ * $Id: dvbdevice.h 4.1 2015/04/18 13:57:27 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -174,6 +174,7 @@ class cDvbDevice : public cDevice {
   static bool Probe(int Adapter, int Frontend);
          ///< Probes for existing DVB devices.
 public:
+  static bool useDvbDevices;
   static bool Initialize(void);
          ///< Initializes the DVB devices.
          ///< Must be called before accessing any DVB functions.
diff --git a/dvbplayer.c b/dvbplayer.c
index aae0507cd..ca4007e3b 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 3.6 2015/02/13 15:12:57 kls Exp $
+ * $Id: dvbplayer.c 4.1 2015/08/06 13:09:19 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -210,7 +210,7 @@ class cDvbPlayer : public cPlayer, cThread {
   cNonBlockingFileReader *nonBlockingFileReader;
   cRingBufferFrame *ringBuffer;
   cPtsIndex ptsIndex;
-  cMarks *marks;
+  const cMarks *marks;
   cFileName *fileName;
   cIndexFile *index;
   cUnbufferedFile *replayFile;
@@ -239,7 +239,7 @@ class cDvbPlayer : public cPlayer, cThread {
 public:
   cDvbPlayer(const char *FileName, bool PauseLive);
   virtual ~cDvbPlayer();
-  void SetMarks(cMarks *Marks);
+  void SetMarks(const cMarks *Marks);
   bool Active(void) { return cThread::Running(); }
   void Pause(void);
   void Play(void);
@@ -311,7 +311,7 @@ cDvbPlayer::~cDvbPlayer()
   // don't delete marks here, we don't own them!
 }
 
-void cDvbPlayer::SetMarks(cMarks *Marks)
+void cDvbPlayer::SetMarks(const cMarks *Marks)
 {
   marks = Marks;
 }
@@ -383,10 +383,11 @@ bool cDvbPlayer::Save(void)
      int Index = ptsIndex.FindIndex(DeviceGetSTC());
      if (Index >= 0) {
         if (Setup.SkipEdited && marks) {
-           marks->Lock();
+           cStateKey StateKey;
+           marks->Lock(StateKey);
            if (marks->First() && abs(Index - marks->First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
               Index = 0; // when stopping within RESUMEBACKUP seconds of the first mark the recording shall still be considered unviewed
-           marks->Unlock();
+           StateKey.Remove();
            }
         Index -= int(round(RESUMEBACKUP * framesPerSecond));
         if (Index > 0)
@@ -419,7 +420,8 @@ void cDvbPlayer::Action(void)
   if (readIndex > 0)
      isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
   else if (Setup.SkipEdited && marks) {
-     marks->Lock();
+     cStateKey StateKey;
+     marks->Lock(StateKey);
      if (marks->First() && index) {
         int Index = marks->First()->Position();
         uint16_t FileNumber;
@@ -429,7 +431,7 @@ void cDvbPlayer::Action(void)
            readIndex = Index;
            }
         }
-     marks->Unlock();
+     StateKey.Remove();
      }
 
   nonBlockingFileReader = new cNonBlockingFileReader;
@@ -500,8 +502,9 @@ void cDvbPlayer::Action(void)
                       if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset)) {
                          readIndex++;
                          if ((Setup.SkipEdited || Setup.PauseAtLastMark) && marks) {
-                            marks->Lock();
-                            cMark *m = marks->Get(readIndex);
+                            cStateKey StateKey;
+                            marks->Lock(StateKey);
+                            const cMark *m = marks->Get(readIndex);
                             if (m && (m->Index() & 0x01) != 0) { // we're at an end mark
                                m = marks->GetNextBegin(m);
                                int Index = -1;
@@ -519,7 +522,7 @@ void cDvbPlayer::Action(void)
                                   CutIn = true;
                                   }
                                }
-                            marks->Unlock();
+                            StateKey.Remove();
                             }
                          }
                       else
@@ -943,7 +946,7 @@ cDvbPlayerControl::~cDvbPlayerControl()
   Stop();
 }
 
-void cDvbPlayerControl::SetMarks(cMarks *Marks)
+void cDvbPlayerControl::SetMarks(const cMarks *Marks)
 {
   if (player)
      player->SetMarks(Marks);
diff --git a/dvbplayer.h b/dvbplayer.h
index 7094454d6..ef6f1fce7 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 3.2 2015/02/06 12:27:39 kls Exp $
+ * $Id: dvbplayer.h 4.1 2015/08/02 13:01:44 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
@@ -26,7 +26,7 @@ class cDvbPlayerControl : public cControl {
        // file of the recording is long enough to allow the player to display
        // the first frame in still picture mode.
   virtual ~cDvbPlayerControl();
-  void SetMarks(cMarks *Marks);
+  void SetMarks(const cMarks *Marks);
   bool Active(void);
   void Stop(void);
        // Stops the current replay session (if any).
diff --git a/dvbspu.c b/dvbspu.c
index da18d0a11..90454a53f 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 3.0 2013/02/22 15:25:16 kls Exp $
+ * $Id: dvbspu.c 4.0 2013/02/22 15:25:16 kls Exp $
  */
 
 #include "dvbspu.h"
diff --git a/dvbspu.h b/dvbspu.h
index dadf7345f..69b085838 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.h 3.1 2014/02/08 12:27:34 kls Exp $
+ * $Id: dvbspu.h 4.0 2014/02/08 12:27:34 kls Exp $
  */
 
 #ifndef __DVBSPU_H
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index d5ae60b08..fff3f8b82 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 3.10 2015/01/20 14:53:57 kls Exp $
+ * $Id: dvbsubtitle.c 4.1 2015/03/25 12:37:08 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -1516,8 +1516,7 @@ void cDvbSubtitleConverter::SetOsdData(void)
      osdDeltaX = osdDeltaY = 0;
      }
   else {
-     osdFactorX = VideoAspect * OsdHeight / displayWidth;
-     osdFactorY = double(OsdHeight) / displayHeight;
+     osdFactorX = osdFactorY = min(double(OsdWidth) / displayWidth, double(OsdHeight) / displayHeight);
      osdDeltaX = (OsdWidth - displayWidth * osdFactorX) / 2;
      osdDeltaY = (OsdHeight - displayHeight * osdFactorY) / 2;
      }
diff --git a/dvbsubtitle.h b/dvbsubtitle.h
index f178b61c2..4d3260158 100644
--- a/dvbsubtitle.h
+++ b/dvbsubtitle.h
@@ -6,7 +6,7 @@
  *
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  *
- * $Id: dvbsubtitle.h 3.2 2015/01/14 10:01:48 kls Exp $
+ * $Id: dvbsubtitle.h 4.1 2015/04/28 09:25:57 kls Exp $
  */
 
 #ifndef __DVBSUBTITLE_H
@@ -48,7 +48,7 @@ class cDvbSubtitleConverter : public cThread {
 public:
   cDvbSubtitleConverter(void);
   virtual ~cDvbSubtitleConverter();
-  void Action(void);
+  virtual void Action(void);
   void Reset(void);
   void Freeze(bool Status) { frozen = Status; }
   int ConvertFragments(const uchar *Data, int Length); // for legacy PES recordings
diff --git a/eit.c b/eit.c
index 1f960bb2b..b5c671d26 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 3.6 2015/02/01 14:55:27 kls Exp $
+ * $Id: eit.c 4.1 2015/08/23 10:43:36 kls Exp $
  */
 
 #include "eit.h"
@@ -24,31 +24,53 @@
 
 class cEIT : public SI::EIT {
 public:
-  cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus = false);
+  cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const u_char *Data);
   };
 
-cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus)
+cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const u_char *Data)
 :SI::EIT(Data, false)
 {
   if (!CheckCRCAndParse())
      return;
+  int HashId = Tid * getServiceId();
+  cSectionSyncerEntry *SectionSyncerEntry = SectionSyncerHash.Get(HashId);
+  if (!SectionSyncerEntry) {
+     SectionSyncerEntry = new cSectionSyncerEntry;
+     SectionSyncerHash.Add(SectionSyncerEntry, HashId);
+     }
+  bool Process = SectionSyncerEntry->Sync(getVersionNumber(), getSectionNumber(), getLastSectionNumber());
+  if (Tid != 0x4E && !Process) // we need to set the 'seen' tag to watch the running status of the present/following event
+     return;
 
   time_t Now = time(NULL);
   if (Now < VALID_TIME)
      return; // we need the current time for handling PDC descriptors
 
-  if (!Channels.Lock(false, 10))
+  cStateKey ChannelsStateKey;
+  cChannels *Channels = cChannels::GetChannelsWrite(ChannelsStateKey, 10);
+  if (!Channels) {
+     SectionSyncerEntry->Repeat(); // let's not miss any section of the EIT
      return;
+     }
   tChannelID channelID(Source, getOriginalNetworkId(), getTransportStreamId(), getServiceId());
-  cChannel *channel = Channels.GetByChannelID(channelID, true);
-  if (!channel || EpgHandlers.IgnoreChannel(channel)) {
-     Channels.Unlock();
+  cChannel *Channel = Channels->GetByChannelID(channelID, true);
+  if (!Channel || EpgHandlers.IgnoreChannel(Channel)) {
+     ChannelsStateKey.Remove(false);
      return;
      }
 
-  EpgHandlers.BeginSegmentTransfer(channel, OnlyRunningStatus);
-  bool handledExternally = EpgHandlers.HandledExternally(channel);
-  cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
+  cStateKey SchedulesStateKey;
+  cSchedules *Schedules = cSchedules::GetSchedulesWrite(SchedulesStateKey, 10);
+  if (!Schedules) {
+     SectionSyncerEntry->Repeat(); // let's not miss any section of the EIT
+     ChannelsStateKey.Remove(false);
+     return;
+     }
+
+  bool ChannelsModified = false;
+  EpgHandlers.BeginSegmentTransfer(Channel);
+  bool handledExternally = EpgHandlers.HandledExternally(Channel);
+  cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(Channel, true);
 
   bool Empty = true;
   bool Modified = false;
@@ -74,8 +96,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
       cEvent *rEvent = NULL;
       cEvent *pEvent = (cEvent *)pSchedule->GetEvent(SiEitEvent.getEventId(), StartTime);
       if (!pEvent || handledExternally) {
-         if (OnlyRunningStatus)
-            continue;
          if (handledExternally && !EpgHandlers.IsUpdate(SiEitEvent.getEventId(), StartTime, Tid, getVersionNumber()))
             continue;
          // If we don't have that event yet, we create a new one.
@@ -94,14 +114,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          // The lower the table ID, the more "current" the information.
          if (Tid > TableID)
             continue;
-         // If the new event comes from the same table and has the same version number
-         // as the existing one, let's skip it to avoid unnecessary work.
-         // Unfortunately some stations (like, e.g. "Premiere") broadcast their EPG data on several transponders (like
-         // the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on
-         // each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned
-         // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
-         else if (Tid == TableID && pEvent->Version() == getVersionNumber())
-            continue;
          EpgHandlers.SetEventID(pEvent, SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
          EpgHandlers.SetStartTime(pEvent, StartTime);
          EpgHandlers.SetDuration(pEvent, Duration);
@@ -110,11 +122,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
          pEvent->SetTableID(Tid);
       if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
          if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
-            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
-         }
-      if (OnlyRunningStatus) {
-         pEvent->SetVersion(0xFF); // we have already changed the table id above, so set the version to an invalid value to make sure the next full run will be executed
-         continue; // do this before setting the version, so that the full update can be done later
+            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), Channel);
+         if (!Process)
+            continue;
          }
       pEvent->SetVersion(getVersionNumber());
 
@@ -206,7 +216,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                  break;
             case SI::TimeShiftedEventDescriptorTag: {
                  SI::TimeShiftedEventDescriptor *tsed = (SI::TimeShiftedEventDescriptor *)d;
-                 cSchedule *rSchedule = (cSchedule *)Schedules->GetSchedule(tChannelID(Source, channel->Nid(), channel->Tid(), tsed->getReferenceServiceId()));
+                 cSchedule *rSchedule = (cSchedule *)Schedules->GetSchedule(tChannelID(Source, Channel->Nid(), Channel->Tid(), tsed->getReferenceServiceId()));
                  if (!rSchedule)
                     break;
                  rEvent = (cEvent *)rSchedule->GetEvent(tsed->getReferenceEventId());
@@ -226,18 +236,18 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                        char linkName[ld->privateData.getLength() + 1];
                        strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
                        // TODO is there a standard way to determine the character set of this string?
-                       cChannel *link = Channels.GetByChannelID(linkID);
-                       if (link != channel) { // only link to other channels, not the same one
-                          //fprintf(stderr, "Linkage %s %4d %4d %5d %5d %5d %5d  %02X  '%s'\n", hit ? "*" : "", channel->Number(), link ? link->Number() : -1, SiEitEvent.getEventId(), ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId(), ld->getLinkageType(), linkName);//XXX
+                       cChannel *link = Channels->GetByChannelID(linkID);
+                       if (link != Channel) { // only link to other channels, not the same one
                           if (link) {
                              if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3)
-                                link->SetName(linkName, "", "");
+                                ChannelsModified |= link->SetName(linkName, "", "");
                              }
                           else if (Setup.UpdateChannels >= 4) {
-                             cChannel *transponder = channel;
-                             if (channel->Tid() != ld->getTransportStreamId())
-                                transponder = Channels.GetByTransponderID(linkID);
-                             link = Channels.NewChannel(transponder, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                             cChannel *Transponder = Channel;
+                             if (Channel->Tid() != ld->getTransportStreamId())
+                                Transponder = Channels->GetByTransponderID(linkID);
+                             link = Channels->NewChannel(Transponder, linkName, "", "", ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                             ChannelsModified = true;
                              //XXX patFilter->Trigger();
                              }
                           if (link) {
@@ -247,7 +257,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
                              }
                           }
                        else
-                          channel->SetPortalName(linkName);
+                          ChannelsModified |= Channel->SetPortalName(linkName);
                        }
                     }
                  }
@@ -293,7 +303,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
 
       EpgHandlers.FixEpgBugs(pEvent);
       if (LinkChannels)
-         channel->SetLinkChannels(LinkChannels);
+         ChannelsModified |= Channel->SetLinkChannels(LinkChannels);
       Modified = true;
       EpgHandlers.HandleEvent(pEvent);
       if (handledExternally)
@@ -302,16 +312,17 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
   if (Tid == 0x4E) {
      if (Empty && getSectionNumber() == 0)
         // ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
-        pSchedule->ClrRunningStatus(channel);
+        pSchedule->ClrRunningStatus(Channel);
      pSchedule->SetPresentSeen();
      }
-  if (Modified && !OnlyRunningStatus) {
+  if (Modified) {
      EpgHandlers.SortSchedule(pSchedule);
      EpgHandlers.DropOutdated(pSchedule, SegmentStart, SegmentEnd, Tid, getVersionNumber());
-     Schedules->SetModified(pSchedule);
+     pSchedule->SetModified();
      }
-  Channels.Unlock();
-  EpgHandlers.EndSegmentTransfer(Modified, OnlyRunningStatus);
+  SchedulesStateKey.Remove(Modified);
+  ChannelsStateKey.Remove(ChannelsModified);
+  EpgHandlers.EndSegmentTransfer(Modified);
 }
 
 // --- cTDT ------------------------------------------------------------------
@@ -372,6 +383,13 @@ cEitFilter::cEitFilter(void)
   Set(0x14, 0x70);        // TDT
 }
 
+void cEitFilter::SetStatus(bool On)
+{
+  cMutexLock MutexLock(&mutex);
+  cFilter::SetStatus(On);
+  sectionSyncerHash.Clear();
+}
+
 void cEitFilter::SetDisableUntil(time_t Time)
 {
   disableUntil = Time;
@@ -379,6 +397,7 @@ void cEitFilter::SetDisableUntil(time_t Time)
 
 void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
 {
+  cMutexLock MutexLock(&mutex);
   if (disableUntil) {
      if (time(NULL) > disableUntil)
         disableUntil = 0;
@@ -387,22 +406,8 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      }
   switch (Pid) {
     case 0x12: {
-         if (Tid >= 0x4E && Tid <= 0x6F) {
-            cSchedulesLock SchedulesLock(true, 10);
-            cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
-            if (Schedules)
-               cEIT EIT(Schedules, Source(), Tid, Data);
-            else {
-               // If we don't get a write lock, let's at least get a read lock, so
-               // that we can set the running status and 'seen' timestamp (well, actually
-               // with a read lock we shouldn't be doing that, but it's only integers that
-               // get changed, so it should be ok)
-               cSchedulesLock SchedulesLock;
-               cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
-               if (Schedules)
-                  cEIT EIT(Schedules, Source(), Tid, Data, true);
-               }
-            }
+         if (Tid >= 0x4E && Tid <= 0x6F)
+            cEIT EIT(sectionSyncerHash, Source(), Tid, Data);
          }
          break;
     case 0x14: {
diff --git a/eit.h b/eit.h
index ec30253e0..51af6433c 100644
--- a/eit.h
+++ b/eit.h
@@ -4,21 +4,29 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eit.h 3.0 2010/01/03 15:28:34 kls Exp $
+ * $Id: eit.h 4.1 2015/07/25 11:03:53 kls Exp $
  */
 
 #ifndef __EIT_H
 #define __EIT_H
 
 #include "filter.h"
+#include "tools.h"
+
+class cSectionSyncerEntry : public cListObject, public cSectionSyncer {};
+
+class cSectionSyncerHash : public cHash<cSectionSyncerEntry> {};
 
 class cEitFilter : public cFilter {
 private:
+  cMutex mutex;
+  cSectionSyncerHash sectionSyncerHash;
   static time_t disableUntil;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
   cEitFilter(void);
+  virtual void SetStatus(bool On);
   static void SetDisableUntil(time_t Time);
   };
 
diff --git a/eitscan.c b/eitscan.c
index 77f15c649..41ac25e2e 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 3.0 2012/04/07 14:39:28 kls Exp $
+ * $Id: eitscan.c 4.2 2015/09/10 11:05:03 kls Exp $
  */
 
 #include "eitscan.h"
@@ -45,13 +45,13 @@ int cScanData::Compare(const cListObject &ListObject) const
 
 class cScanList : public cList<cScanData> {
 public:
-  void AddTransponders(cList<cChannel> *Channels);
+  void AddTransponders(const cList<cChannel> *Channels);
   void AddTransponder(const cChannel *Channel);
   };
 
-void cScanList::AddTransponders(cList<cChannel> *Channels)
+void cScanList::AddTransponders(const cList<cChannel> *Channels)
 {
-  for (cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch))
+  for (const cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch))
       AddTransponder(ch);
   Sort();
 }
@@ -118,7 +118,8 @@ void cEITScanner::ForceScan(void)
 void cEITScanner::Activity(void)
 {
   if (currentChannel) {
-     Channels.SwitchTo(currentChannel);
+     LOCK_CHANNELS_READ;
+     Channels->SwitchTo(currentChannel);
      currentChannel = 0;
      }
   lastActivity = time(NULL);
@@ -129,7 +130,8 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout || !lastActivity) { // !lastActivity means a scan was forced
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
-        if (Channels.Lock(false, 10)) {
+        cStateKey StateKey;
+        if (const cChannels *Channels = cChannels::GetChannelsRead(StateKey, 10)) {
            if (!scanList) {
               scanList = new cScanList;
               if (transponderList) {
@@ -137,7 +139,7 @@ void cEITScanner::Process(void)
                  delete transponderList;
                  transponderList = NULL;
                  }
-              scanList->AddTransponders(&Channels);
+              scanList->AddTransponders(Channels);
               }
            bool AnyDeviceSwitched = false;
            for (int i = 0; i < cDevice::NumDevices(); i++) {
@@ -149,6 +151,10 @@ void cEITScanner::Process(void)
                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
                             if (Device->ProvidesTransponder(Channel)) {
                                if (Device->Priority() < 0) {
+                                  if (const cPositioner *Positioner = Device->Positioner()) {
+                                     if (Positioner->LastLongitude() != cSource::Position(Channel->Source()))
+                                        continue;
+                                     }
                                   bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel);
                                   if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
                                      if (!MaySwitchTransponder) {
@@ -177,7 +183,7 @@ void cEITScanner::Process(void)
               if (lastActivity == 0) // this was a triggered scan
                  Activity();
               }
-           Channels.Unlock();
+           StateKey.Remove();
            }
         lastScan = time(NULL);
         }
diff --git a/eitscan.h b/eitscan.h
index 25658b6b1..02d98222c 100644
--- a/eitscan.h
+++ b/eitscan.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.h 3.0 2012/03/07 13:54:16 kls Exp $
+ * $Id: eitscan.h 4.0 2012/03/07 13:54:16 kls Exp $
  */
 
 #ifndef __EITSCAN_H
diff --git a/epg.c b/epg.c
index 096b68cff..4297350eb 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 3.3 2013/12/28 11:33:08 kls Exp $
+ * $Id: epg.c 4.2 2015/09/10 10:58:19 kls Exp $
  */
 
 #include "epg.h"
@@ -15,7 +15,6 @@
 #include <limits.h>
 #include <time.h>
 #include "libsi/si.h"
-#include "timers.h"
 
 #define RUNNINGSTATUSTIMEOUT 30 // seconds before the running status is considered unknown
 #define EPGDATAWRITEDELTA   600 // seconds between writing the epg.data file
@@ -111,9 +110,12 @@ tComponent *cComponents::GetComponent(int Index, uchar Stream, uchar Type)
 
 // --- cEvent ----------------------------------------------------------------
 
+cMutex cEvent::numTimersMutex;
+
 cEvent::cEvent(tEventID EventID)
 {
   schedule = NULL;
+  numTimers = 0;
   eventID = EventID;
   tableID = 0xFF; // actual table ids are 0x4E..0x60
   version = 0xFF; // actual version numbers are 0..31
@@ -170,9 +172,9 @@ void cEvent::SetVersion(uchar Version)
   version = Version;
 }
 
-void cEvent::SetRunningStatus(int RunningStatus, cChannel *Channel)
+void cEvent::SetRunningStatus(int RunningStatus, const cChannel *Channel)
 {
-  if (Channel && runningStatus != RunningStatus && (RunningStatus > SI::RunningStatusNotRunning || runningStatus > SI::RunningStatusUndefined) && Channel->HasTimer())
+  if (Channel && runningStatus != RunningStatus && (RunningStatus > SI::RunningStatusNotRunning || runningStatus > SI::RunningStatusUndefined) && schedule && schedule->HasTimer())
      isyslog("channel %d (%s) event %s status %d", Channel->Number(), Channel->Name(), *ToDescr(), RunningStatus);
   runningStatus = RunningStatus;
 }
@@ -243,13 +245,22 @@ cString cEvent::ToDescr(void) const
   return cString::sprintf("%s %s-%s %s'%s'", *GetDateString(), *GetTimeString(), *GetEndTimeString(), vpsbuf, Title());
 }
 
-bool cEvent::HasTimer(void) const
+void cEvent::IncNumTimers(void) const
 {
-  for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
-      if (t->Event() == this)
-         return true;
-      }
-  return false;
+  numTimersMutex.Lock();
+  numTimers++;
+  if (schedule)
+     schedule->IncNumTimers();
+  numTimersMutex.Unlock();
+}
+
+void cEvent::DecNumTimers(void) const
+{
+  numTimersMutex.Lock();
+  numTimers--;
+  if (schedule)
+     schedule->DecNumTimers();
+  numTimersMutex.Unlock();
 }
 
 bool cEvent::IsRunning(bool OrAboutToStart) const
@@ -605,9 +616,9 @@ void ReportEpgBugFixStats(bool Force)
             bool PrintedStats = false;
             char *q = buffer;
             *buffer = 0;
+            LOCK_CHANNELS_READ;
             for (int c = 0; c < p->n; c++) {
-                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c], true);
-                if (channel) {
+                if (const cChannel *Channel = Channels->GetByChannelID(p->channelIDs[c], true)) {
                    if (!GotHits) {
                       dsyslog("=====================");
                       dsyslog("EPG bugfix statistics");
@@ -623,7 +634,7 @@ void ReportEpgBugFixStats(bool Force)
                       q += snprintf(q, sizeof(buffer) - (q - buffer), "%-3d %-4d", i, p->hits);
                       PrintedStats = true;
                       }
-                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
+                   q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, Channel->Name());
                    delim = ", ";
                    if (q - buffer > 80) {
                       q += snprintf(q, sizeof(buffer) - (q - buffer), "%s...", delim);
@@ -650,7 +661,7 @@ static void StripControlCharacters(char *s)
            uchar *p = (uchar *)s;
            if (l == 2 && *p == 0xC2) // UTF-8 sequence
               p++;
-           if (*p == 0x86 || *p == 0x87) {
+           if (*p == 0x86 || *p == 0x87 || *p == 0x0D) {
               memmove(s, p + 1, len - l + 1); // we also copy the terminating 0!
               len -= l;
               l = 0;
@@ -878,14 +889,32 @@ void cEvent::FixEpgBugs(void)
 
 // --- cSchedule -------------------------------------------------------------
 
+cMutex cSchedule::numTimersMutex;
+
 cSchedule::cSchedule(tChannelID ChannelID)
 {
   channelID = ChannelID;
+  events.SetUseGarbageCollector();
+  numTimers = 0;
   hasRunning = false;
   modified = 0;
   presentSeen = 0;
 }
 
+void cSchedule::IncNumTimers(void) const
+{
+  numTimersMutex.Lock();
+  numTimers++;
+  numTimersMutex.Unlock();
+}
+
+void cSchedule::DecNumTimers(void) const
+{
+  numTimersMutex.Lock();
+  numTimers--;
+  numTimersMutex.Unlock();
+}
+
 cEvent *cSchedule::AddEvent(cEvent *Event)
 {
   events.Add(Event);
@@ -897,8 +926,6 @@ cEvent *cSchedule::AddEvent(cEvent *Event)
 void cSchedule::DelEvent(cEvent *Event)
 {
   if (Event->schedule == this) {
-     if (hasRunning && Event->IsRunning())
-        ClrRunningStatus();
      UnhashEvent(Event);
      events.Del(Event);
      }
@@ -922,7 +949,7 @@ const cEvent *cSchedule::GetPresentEvent(void) const
 {
   const cEvent *pe = NULL;
   time_t now = time(NULL);
-  for (cEvent *p = events.First(); p; p = events.Next(p)) {
+  for (const cEvent *p = events.First(); p; p = events.Next(p)) {
       if (p->StartTime() <= now)
          pe = p;
       else if (p->StartTime() > now + 3600)
@@ -962,7 +989,7 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
 {
   const cEvent *pe = NULL;
   time_t delta = INT_MAX;
-  for (cEvent *p = events.First(); p; p = events.Next(p)) {
+  for (const cEvent *p = events.First(); p; p = events.Next(p)) {
       time_t dt = Time - p->StartTime();
       if (dt >= 0 && dt < delta && p->EndTime() >= Time) {
          delta = dt;
@@ -972,7 +999,7 @@ const cEvent *cSchedule::GetEventAround(time_t Time) const
   return pe;
 }
 
-void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel)
+void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, const cChannel *Channel)
 {
   hasRunning = false;
   for (cEvent *p = events.First(); p; p = events.Next(p)) {
@@ -987,6 +1014,7 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Cha
       if (p->RunningStatus() >= SI::RunningStatusPausing)
          hasRunning = true;
       }
+  SetPresentSeen();
 }
 
 void cSchedule::ClrRunningStatus(cChannel *Channel)
@@ -1019,32 +1047,29 @@ void cSchedule::Sort(void)
          p->SetRunningStatus(SI::RunningStatusNotRunning);
          }
      }
+  SetModified();
 }
 
 void cSchedule::DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version)
 {
   if (SegmentStart > 0 && SegmentEnd > 0) {
-     for (cEvent *p = events.First(); p; p = events.Next(p)) {
-         if (p->EndTime() > SegmentStart) {
-            if (p->StartTime() < SegmentEnd) {
-               // The event overlaps with the given time segment.
-               if (p->TableID() > TableID || p->TableID() == TableID && p->Version() != Version) {
-                  // The segment overwrites all events from tables with higher ids, and
-                  // within the same table id all events must have the same version.
-                  // We can't delete the event right here because a timer might have
-                  // a pointer to it, so let's set its id and start time to 0 to have it
-                  // "phased out":
-                  if (hasRunning && p->IsRunning())
-                     ClrRunningStatus();
-                  UnhashEvent(p);
-                  p->eventID = 0;
-                  p->startTime = 0;
-                  }
-               }
-            else
-               break;
-            }
-         }
+     cEvent *p = events.First();
+     while (p) {
+           cEvent *n = events.Next(p);
+           if (p->EndTime() > SegmentStart) {
+              if (p->StartTime() < SegmentEnd) {
+                 // The event overlaps with the given time segment.
+                 if (p->TableID() > TableID || p->TableID() == TableID && p->Version() != Version) {
+                    // The segment overwrites all events from tables with higher ids, and
+                    // within the same table id all events must have the same version.
+                    DelEvent(p);
+                    }
+                 }
+              else
+                 break;
+              }
+           p = n;
+           }
      }
 }
 
@@ -1066,9 +1091,9 @@ void cSchedule::Cleanup(time_t Time)
 
 void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime) const
 {
-  cChannel *channel = Channels.GetByChannelID(channelID, true);
-  if (channel) {
-     fprintf(f, "%sC %s %s\n", Prefix, *channel->GetChannelID().ToString(), channel->Name());
+  LOCK_CHANNELS_READ;
+  if (const cChannel *Channel = Channels->GetByChannelID(channelID, true)) {
+     fprintf(f, "%sC %s %s\n", Prefix, *Channel->GetChannelID().ToString(), Channel->Name());
      const cEvent *p;
      switch (DumpMode) {
        case dmAll: {
@@ -1111,12 +1136,10 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
               if (*s) {
                  tChannelID channelID = tChannelID::FromString(s);
                  if (channelID.Valid()) {
-                    cSchedule *p = Schedules->AddSchedule(channelID);
-                    if (p) {
+                    if (cSchedule *p = Schedules->AddSchedule(channelID)) {
                        if (!cEvent::Read(f, p))
                           return false;
                        p->Sort();
-                       Schedules->SetModified(p);
                        }
                     }
                  else {
@@ -1164,12 +1187,12 @@ void cEpgDataWriter::Perform(void)
 {
   cMutexLock MutexLock(&mutex); // to make sure fore- and background calls don't cause parellel dumps!
   {
-    cSchedulesLock SchedulesLock(true, 1000);
-    cSchedules *s = (cSchedules *)cSchedules::Schedules(SchedulesLock);
-    if (s) {
+    cStateKey StateKey;
+    if (cSchedules *Schedules = cSchedules::GetSchedulesWrite(StateKey, 1000)) {
        time_t now = time(NULL);
-       for (cSchedule *p = s->First(); p; p = s->Next(p))
+       for (cSchedule *p = Schedules->First(); p; p = Schedules->Next(p))
            p->Cleanup(now);
+       StateKey.Remove();
        }
   }
   if (dump)
@@ -1178,29 +1201,25 @@ void cEpgDataWriter::Perform(void)
 
 static cEpgDataWriter EpgDataWriter;
 
-// --- cSchedulesLock --------------------------------------------------------
+// --- cSchedules ------------------------------------------------------------
 
-cSchedulesLock::cSchedulesLock(bool WriteLock, int TimeoutMs)
+cSchedules cSchedules::schedules;
+char *cSchedules::epgDataFileName = NULL;
+time_t cSchedules::lastDump = time(NULL);
+
+cSchedules::cSchedules(void)
+:cList<cSchedule>("Schedules")
 {
-  locked = cSchedules::schedules.rwlock.Lock(WriteLock, TimeoutMs);
 }
 
-cSchedulesLock::~cSchedulesLock()
+const cSchedules *cSchedules::GetSchedulesRead(cStateKey &StateKey, int TimeoutMs)
 {
-  if (locked)
-     cSchedules::schedules.rwlock.Unlock();
+  return schedules.Lock(StateKey, false, TimeoutMs) ? &schedules : NULL;
 }
 
-// --- cSchedules ------------------------------------------------------------
-
-cSchedules cSchedules::schedules;
-char *cSchedules::epgDataFileName = NULL;
-time_t cSchedules::lastDump = time(NULL);
-time_t cSchedules::modified = 0;
-
-const cSchedules *cSchedules::Schedules(cSchedulesLock &SchedulesLock)
+cSchedules *cSchedules::GetSchedulesWrite(cStateKey &StateKey, int TimeoutMs)
 {
-  return SchedulesLock.Locked() ? &schedules : NULL;
+  return schedules.Lock(StateKey, true, TimeoutMs) ? &schedules : NULL;
 }
 
 void cSchedules::SetEpgDataFileName(const char *FileName)
@@ -1210,12 +1229,6 @@ void cSchedules::SetEpgDataFileName(const char *FileName)
   EpgDataWriter.SetDump(epgDataFileName != NULL);
 }
 
-void cSchedules::SetModified(cSchedule *Schedule)
-{
-  Schedule->SetModified();
-  modified = time(NULL);
-}
-
 void cSchedules::Cleanup(bool Force)
 {
   if (Force)
@@ -1232,83 +1245,59 @@ void cSchedules::Cleanup(bool Force)
 
 void cSchedules::ResetVersions(void)
 {
-  cSchedulesLock SchedulesLock(true);
-  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
-  if (s) {
-     for (cSchedule *Schedule = s->First(); Schedule; Schedule = s->Next(Schedule))
-         Schedule->ResetVersions();
-     }
-}
-
-bool cSchedules::ClearAll(void)
-{
-  cSchedulesLock SchedulesLock(true, 1000);
-  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
-  if (s) {
-     for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
-         Timer->SetEvent(NULL);
-     for (cSchedule *Schedule = s->First(); Schedule; Schedule = s->Next(Schedule))
-         Schedule->Cleanup(INT_MAX);
-     return true;
-     }
-  return false;
+  LOCK_SCHEDULES_WRITE;
+  for (cSchedule *Schedule = Schedules->First(); Schedule; Schedule = Schedules->Next(Schedule))
+      Schedule->ResetVersions();
 }
 
 bool cSchedules::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime)
 {
-  cSchedulesLock SchedulesLock;
-  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
-  if (s) {
-     cSafeFile *sf = NULL;
-     if (!f) {
-        sf = new cSafeFile(epgDataFileName);
-        if (sf->Open())
-           f = *sf;
-        else {
-           LOG_ERROR;
-           delete sf;
-           return false;
-           }
-        }
-     for (cSchedule *p = s->First(); p; p = s->Next(p))
-         p->Dump(f, Prefix, DumpMode, AtTime);
-     if (sf) {
-        sf->Close();
+  cSafeFile *sf = NULL;
+  if (!f) {
+     sf = new cSafeFile(epgDataFileName);
+     if (sf->Open())
+        f = *sf;
+     else {
+        LOG_ERROR;
         delete sf;
+        return false;
         }
-     return true;
      }
-  return false;
+  LOCK_SCHEDULES_READ;
+  for (const cSchedule *p = Schedules->First(); p; p = Schedules->Next(p))
+      p->Dump(f, Prefix, DumpMode, AtTime);
+  if (sf) {
+     sf->Close();
+     delete sf;
+     }
+  return true;
 }
 
 bool cSchedules::Read(FILE *f)
 {
-  cSchedulesLock SchedulesLock(true, 1000);
-  cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
-  if (s) {
-     bool OwnFile = f == NULL;
-     if (OwnFile) {
-        if (epgDataFileName && access(epgDataFileName, R_OK) == 0) {
-           dsyslog("reading EPG data from %s", epgDataFileName);
-           if ((f = fopen(epgDataFileName, "r")) == NULL) {
-              LOG_ERROR;
-              return false;
-              }
-           }
-        else
+  bool OwnFile = f == NULL;
+  if (OwnFile) {
+     if (epgDataFileName && access(epgDataFileName, R_OK) == 0) {
+        dsyslog("reading EPG data from %s", epgDataFileName);
+        if ((f = fopen(epgDataFileName, "r")) == NULL) {
+           LOG_ERROR;
            return false;
+           }
         }
-     bool result = cSchedule::Read(f, s);
-     if (OwnFile)
-        fclose(f);
-     if (result) {
-        // Initialize the channels' schedule pointers, so that the first WhatsOn menu will come up faster:
-        for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel))
-            s->GetSchedule(Channel);
-        }
-     return result;
+     else
+        return false;
      }
-  return false;
+  LOCK_CHANNELS_WRITE;
+  LOCK_SCHEDULES_WRITE;
+  bool result = cSchedule::Read(f, Schedules);
+  if (OwnFile)
+     fclose(f);
+  if (result) {
+     // Initialize the channels' schedule pointers, so that the first WhatsOn menu will come up faster:
+     for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel))
+         Schedules->GetSchedule(Channel);
+     }
+  return result;
 }
 
 cSchedule *cSchedules::AddSchedule(tChannelID ChannelID)
@@ -1318,9 +1307,6 @@ cSchedule *cSchedules::AddSchedule(tChannelID ChannelID)
   if (!p) {
      p = new cSchedule(ChannelID);
      Add(p);
-     cChannel *channel = Channels.GetByChannelID(ChannelID);
-     if (channel)
-        channel->schedule = p;
      }
   return p;
 }
@@ -1328,7 +1314,7 @@ cSchedule *cSchedules::AddSchedule(tChannelID ChannelID)
 const cSchedule *cSchedules::GetSchedule(tChannelID ChannelID) const
 {
   ChannelID.ClrRid();
-  for (cSchedule *p = First(); p; p = Next(p)) {
+  for (const cSchedule *p = First(); p; p = Next(p)) {
       if (p->ChannelID() == ChannelID)
          return p;
       }
@@ -1541,18 +1527,18 @@ void cEpgHandlers::DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t
   Schedule->DropOutdated(SegmentStart, SegmentEnd, TableID, Version);
 }
 
-void cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus)
+void cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
-      if (eh->BeginSegmentTransfer(Channel, OnlyRunningStatus))
+      if (eh->BeginSegmentTransfer(Channel, false))
          return;
       }
 }
 
-void cEpgHandlers::EndSegmentTransfer(bool Modified, bool OnlyRunningStatus)
+void cEpgHandlers::EndSegmentTransfer(bool Modified)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
-      if (eh->EndSegmentTransfer(Modified, OnlyRunningStatus))
+      if (eh->EndSegmentTransfer(Modified, false))
          return;
       }
 }
diff --git a/epg.h b/epg.h
index 65fbcbf9e..b6f7d68eb 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 3.1 2013/08/23 10:50:05 kls Exp $
+ * $Id: epg.h 4.1 2015/08/09 11:25:04 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -66,13 +66,15 @@ class cComponents {
 
 class cSchedule;
 
-typedef u_int32_t tEventID;
+typedef u_int16_t tEventID;
 
 class cEvent : public cListObject {
   friend class cSchedule;
 private:
+  static cMutex numTimersMutex; // Protects numTimers, because it might be accessed from parallel read locks
   // The sequence of these parameters is optimized for minimal memory waste!
   cSchedule *schedule;     // The Schedule this event belongs to
+  mutable u_int16_t numTimers;// The number of timers that use this event
   tEventID eventID;        // Event ID of this event
   uchar tableID;           // Table ID this event came from
   uchar version;           // Version number of section this event came from
@@ -109,7 +111,9 @@ class cEvent : public cListObject {
   time_t Vps(void) const { return vps; }
   time_t Seen(void) const { return seen; }
   bool SeenWithin(int Seconds) const { return time(NULL) - seen < Seconds; }
-  bool HasTimer(void) const;
+  void IncNumTimers(void) const;
+  void DecNumTimers(void) const;
+  bool HasTimer(void) const { return numTimers > 0; }
   bool IsRunning(bool OrAboutToStart = false) const;
   static const char *ContentToString(uchar Content);
   cString GetParentalRatingString(void) const;
@@ -120,7 +124,7 @@ class cEvent : public cListObject {
   void SetEventID(tEventID EventID);
   void SetTableID(uchar TableID);
   void SetVersion(uchar Version);
-  void SetRunningStatus(int RunningStatus, cChannel *Channel = NULL);
+  void SetRunningStatus(int RunningStatus, const cChannel *Channel = NULL);
   void SetTitle(const char *Title);
   void SetShortText(const char *ShortText);
   void SetDescription(const char *Description);
@@ -142,28 +146,33 @@ class cSchedules;
 
 class cSchedule : public cListObject  {
 private:
+  static cMutex numTimersMutex; // Protects numTimers, because it might be accessed from parallel read locks
   tChannelID channelID;
   cList<cEvent> events;
   cHash<cEvent> eventsHashID;
   cHash<cEvent> eventsHashStartTime;
+  mutable u_int16_t numTimers;// The number of timers that use this schedule
   bool hasRunning;
-  time_t modified;
+  int modified;
   time_t presentSeen;
 public:
   cSchedule(tChannelID ChannelID);
   tChannelID ChannelID(void) const { return channelID; }
-  time_t Modified(void) const { return modified; }
+  bool Modified(int &State) const { bool Result = State != modified; State = modified; return Result; }
   time_t PresentSeen(void) const { return presentSeen; }
   bool PresentSeenWithin(int Seconds) const { return time(NULL) - presentSeen < Seconds; }
-  void SetModified(void) { modified = time(NULL); }
+  void SetModified(void) { modified++; }
   void SetPresentSeen(void) { presentSeen = time(NULL); }
-  void SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel = NULL);
+  void SetRunningStatus(cEvent *Event, int RunningStatus, const cChannel *Channel = NULL);
   void ClrRunningStatus(cChannel *Channel = NULL);
   void ResetVersions(void);
   void Sort(void);
   void DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
   void Cleanup(time_t Time);
   void Cleanup(void);
+  void IncNumTimers(void) const;
+  void DecNumTimers(void) const;
+  bool HasTimer(void) const { return numTimers > 0; }
   cEvent *AddEvent(cEvent *Event);
   void DelEvent(cEvent *Event);
   void HashEvent(cEvent *Event);
@@ -177,35 +186,23 @@ class cSchedule : public cListObject  {
   static bool Read(FILE *f, cSchedules *Schedules);
   };
 
-class cSchedulesLock {
-private:
-  bool locked;
-public:
-  cSchedulesLock(bool WriteLock = false, int TimeoutMs = 0);
-  ~cSchedulesLock();
-  bool Locked(void) { return locked; }
-  };
-
 class cSchedules : public cList<cSchedule> {
   friend class cSchedule;
-  friend class cSchedulesLock;
 private:
-  cRwLock rwlock;
   static cSchedules schedules;
   static char *epgDataFileName;
   static time_t lastDump;
-  static time_t modified;
 public:
+  cSchedules(void);
+  static const cSchedules *GetSchedulesRead(cStateKey &StateKey, int TimeoutMs = 0);
+      ///< Gets the list of schedules for read access.
+      ///< See cTimers::GetTimersRead() for details.
+  static cSchedules *GetSchedulesWrite(cStateKey &StateKey, int TimeoutMs = 0);
+      ///< Gets the list of schedules for write access.
+      ///< See cTimers::GetTimersWrite() for details.
   static void SetEpgDataFileName(const char *FileName);
-  static const cSchedules *Schedules(cSchedulesLock &SchedulesLock);
-         ///< Caller must provide a cSchedulesLock which has to survive the entire
-         ///< time the returned cSchedules is accessed. Once the cSchedules is no
-         ///< longer used, the cSchedulesLock must be destroyed.
-  static time_t Modified(void) { return modified; }
-  static void SetModified(cSchedule *Schedule);
   static void Cleanup(bool Force = false);
   static void ResetVersions(void);
-  static bool ClearAll(void);
   static bool Dump(FILE *f = NULL, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0);
   static bool Read(FILE *f = NULL);
   cSchedule *AddSchedule(tChannelID ChannelID);
@@ -213,6 +210,17 @@ class cSchedules : public cList<cSchedule> {
   const cSchedule *GetSchedule(const cChannel *Channel, bool AddIfMissing = false) const;
   };
 
+// Provide lock controlled access to the list:
+
+DEF_LIST_LOCK(Schedules);
+
+// These macros provide a convenient way of locking the global schedules list
+// and making sure the lock is released as soon as the current scope is left
+// (note that these macros wait forever to obtain the lock!):
+
+#define LOCK_SCHEDULES_READ  USE_LIST_LOCK_READ(Schedules);
+#define LOCK_SCHEDULES_WRITE USE_LIST_LOCK_WRITE(Schedules);
+
 class cEpgDataReader : public cThread {
 public:
   cEpgDataReader(void);
@@ -273,12 +281,14 @@ class cEpgHandler : public cListObject {
   virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
           ///< Takes a look at all EPG events between SegmentStart and SegmentEnd and
           ///< drops outdated events.
-  virtual bool BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus) { return false; }
+  virtual bool BeginSegmentTransfer(const cChannel *Channel, bool Dummy) { return false; } // TODO remove obsolete Dummy
           ///< Called directly after IgnoreChannel() before any other handler method is called.
           ///< Designed to give handlers the possibility to prepare a database transaction.
-  virtual bool EndSegmentTransfer(bool Modified, bool OnlyRunningStatus) { return false; }
+          ///< Dummy is for backward compatibility and may be removed in a future version.
+  virtual bool EndSegmentTransfer(bool Modified, bool Dummy) { return false; } // TODO remove obsolete Dummy
           ///< Called after the segment data has been processed.
           ///< At this point handlers should close/commit/rollback any pending database transactions.
+          ///< Dummy is for backward compatibility and may be removed in a future version.
   };
 
 class cEpgHandlers : public cList<cEpgHandler> {
@@ -301,8 +311,8 @@ class cEpgHandlers : public cList<cEpgHandler> {
   void HandleEvent(cEvent *Event);
   void SortSchedule(cSchedule *Schedule);
   void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
-  void BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus);
-  void EndSegmentTransfer(bool Modified, bool OnlyRunningStatus);
+  void BeginSegmentTransfer(const cChannel *Channel);
+  void EndSegmentTransfer(bool Modified);
   };
 
 extern cEpgHandlers EpgHandlers;
diff --git a/epg2html b/epg2html
index 34f95215b..efc1e6f6a 100755
--- a/epg2html
+++ b/epg2html
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: epg2html 3.0 2013/03/04 13:02:20 kls Exp $
+# $Id: epg2html 4.0 2013/03/04 13:02:20 kls Exp $
 
 @Index = ();
 ($Charset = $ENV{LANG}) =~ s/^[^.]*\.?(.*)/$1/;
diff --git a/filter.c b/filter.c
index 72590f79f..aa91c1f19 100644
--- a/filter.c
+++ b/filter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.c 3.0 2004/01/11 13:31:34 kls Exp $
+ * $Id: filter.c 4.2 2015/07/25 10:59:57 kls Exp $
  */
 
 #include "filter.h"
@@ -19,22 +19,38 @@ cSectionSyncer::cSectionSyncer(void)
 
 void cSectionSyncer::Reset(void)
 {
-  lastVersion = 0xFF;
+  currentVersion = -1;
+  currentSection = -1;
   synced = false;
+  complete = false;
+  memset(sections, 0x00, sizeof(sections));
+}
+
+void cSectionSyncer::Repeat(void)
+{
+  SetSectionFlag(currentSection, false);
+  synced = false;
+  complete = false;
 }
 
 bool cSectionSyncer::Sync(uchar Version, int Number, int LastNumber)
 {
-  if (Version == lastVersion)
-     return false;
+  if (Version != currentVersion) {
+     Reset();
+     currentVersion = Version;
+     }
   if (!synced) {
      if (Number != 0)
-        return false; // sync on first section
-     synced = true;
+        return false;
+     else
+        synced = true;
      }
+  currentSection = Number;
+  bool Result = !GetSectionFlag(Number);
+  SetSectionFlag(Number, true);
   if (Number == LastNumber)
-     lastVersion = Version;
-  return synced;
+     complete = true;
+  return Result;
 }
 
 // --- cFilterData -----------------------------------------------------------
diff --git a/filter.h b/filter.h
index a00ece5e9..7cc3ec321 100644
--- a/filter.h
+++ b/filter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.h 3.0 2004/01/11 13:31:59 kls Exp $
+ * $Id: filter.h 4.2 2015/07/25 10:03:44 kls Exp $
  */
 
 #ifndef __FILTER_H
@@ -15,11 +15,18 @@
 
 class cSectionSyncer {
 private:
-  int lastVersion;
+  int currentVersion;
+  int currentSection;
   bool synced;
+  bool complete;
+  uchar sections[32]; // holds 32 * 8 = 256 bits, as flags for the sections
+  void SetSectionFlag(uchar Section, bool On) { if (On) sections[Section / 8] |= (1 << (Section % 8)); else sections[Section / 8] &= ~(1 << (Section % 8)); }
+  bool GetSectionFlag(uchar Section) { return sections[Section / 8] & (1 << (Section % 8)); }
 public:
   cSectionSyncer(void);
   void Reset(void);
+  void Repeat(void);
+  bool Complete(void) { return complete; }
   bool Sync(uchar Version, int Number, int LastNumber);
   };
 
diff --git a/font.c b/font.c
index cd2c494b1..29256e052 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 3.2 2014/01/07 12:19:45 kls Exp $
+ * $Id: font.c 4.1 2015/04/19 11:13:45 kls Exp $
  */
 
 #include "font.h"
@@ -140,7 +140,7 @@ cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
                if (!error) {
                   error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
                   if (!error) {
-                     if (face->glyph->bitmap.rows-face->glyph->bitmap_top > bottom)
+                     if (int(face->glyph->bitmap.rows-face->glyph->bitmap_top) > bottom)
                         bottom = face->glyph->bitmap.rows-face->glyph->bitmap_top;
                      }
                   else
diff --git a/font.h b/font.h
index cd62b4a9f..3932f602e 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 3.1 2014/01/07 12:11:55 kls Exp $
+ * $Id: font.h 4.0 2014/01/07 12:11:55 kls Exp $
  */
 
 #ifndef __FONT_H
diff --git a/i18n.c b/i18n.c
index f26c96bf7..d205ba4cd 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 3.0 2012/09/01 10:53:43 kls Exp $
+ * $Id: i18n.c 4.0 2012/09/01 10:53:43 kls Exp $
  */
 
 /*
diff --git a/i18n.h b/i18n.h
index c3f1fc7d2..f8ad9dea0 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.h 3.0 2012/03/11 14:07:45 kls Exp $
+ * $Id: i18n.h 4.0 2012/03/11 14:07:45 kls Exp $
  */
 
 #ifndef __I18N_H
diff --git a/interface.c b/interface.c
index 6bf7ffcee..dcb766ca4 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 3.1 2015/01/11 13:37:47 kls Exp $
+ * $Id: interface.c 4.1 2015/04/28 11:16:06 kls Exp $
  */
 
 #include "interface.h"
@@ -19,27 +19,19 @@
 
 cInterface *Interface = NULL;
 
-cInterface::cInterface(int SVDRPport)
+cInterface::cInterface(void)
 {
   interrupted = false;
-  SVDRP = NULL;
-  if (SVDRPport)
-     SVDRP = new cSVDRP(SVDRPport);
 }
 
 cInterface::~cInterface()
 {
-  delete SVDRP;
 }
 
 eKeys cInterface::GetKey(bool Wait)
 {
   if (!cRemote::HasKeys())
      Skins.Flush();
-  if (SVDRP) {
-     if (SVDRP->Process())
-        Wait = false;
-     }
   if (!cRemote::IsLearning())
      return cRemote::Get(Wait ? 1000 : 10);
   else
diff --git a/interface.h b/interface.h
index b9082bd5d..4131cf3a2 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.h 3.0 2004/05/01 11:11:13 kls Exp $
+ * $Id: interface.h 4.1 2015/04/28 11:15:11 kls Exp $
  */
 
 #ifndef __INTERFACE_H
@@ -13,17 +13,14 @@
 #include "config.h"
 #include "remote.h"
 #include "skins.h"
-#include "svdrp.h"
 
 class cInterface {
 private:
   bool interrupted;
-  cSVDRP *SVDRP;
   bool QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu);
 public:
-  cInterface(int SVDRPport = 0);
+  cInterface(void);
   ~cInterface();
-  bool HasSVDRPConnection(void) { return SVDRP && SVDRP->HasConnection(); }
   void Interrupt(void) { interrupted = true; }
   eKeys GetKey(bool Wait = true);
   eKeys Wait(int Seconds = 0, bool KeepChar = false);
diff --git a/keys.c b/keys.c
index 284858caf..4bf15429a 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 3.0 2012/12/04 12:52:52 kls Exp $
+ * $Id: keys.c 4.0 2012/12/04 12:52:52 kls Exp $
  */
 
 #include "keys.h"
diff --git a/keys.h b/keys.h
index 5e861a51b..59e6c676d 100644
--- a/keys.h
+++ b/keys.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.h 3.1 2015/01/27 10:45:18 kls Exp $
+ * $Id: keys.h 4.0 2015/01/27 10:45:18 kls Exp $
  */
 
 #ifndef __KEYS_H
diff --git a/libsi/Makefile b/libsi/Makefile
index 2221673cf..4c7630c3f 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 3.1 2015/02/11 10:24:54 kls Exp $
+# $Id: Makefile 4.0 2015/02/11 10:24:54 kls Exp $
 
 ### The archiver options:
 
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index f763d62b6..5c7fd0311 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 3.1 2013/10/30 10:16:18 kls Exp $
+ *   $Id: descriptor.c 4.0 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 30c9f6b16..22d13db81 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 3.2 2014/02/08 12:44:17 kls Exp $
+ *   $Id: descriptor.h 4.0 2014/02/08 12:44:17 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/gendescr b/libsi/gendescr
index b0628fb64..5b3cb6c75 100755
--- a/libsi/gendescr
+++ b/libsi/gendescr
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: gendescr 3.0 2003/12/13 10:40:53 kls Exp $
+# $Id: gendescr 4.0 2003/12/13 10:40:53 kls Exp $
 
 print "Name (ohne ...Descriptor):";
 $name=<STDIN>;
diff --git a/libsi/headers.h b/libsi/headers.h
index ff5bb5dae..ae13d137a 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -10,7 +10,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: headers.h 3.1 2013/10/30 10:16:18 kls Exp $
+ *   $Id: headers.h 4.0 2013/10/30 10:16:18 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/section.c b/libsi/section.c
index d7a429271..93bcc0613 100644
--- a/libsi/section.c
+++ b/libsi/section.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.c 3.0 2006/04/14 10:53:44 kls Exp $
+ *   $Id: section.c 4.0 2006/04/14 10:53:44 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/section.h b/libsi/section.h
index 133fba3a6..4f1833ba8 100644
--- a/libsi/section.h
+++ b/libsi/section.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: section.h 3.0 2012/02/26 13:58:26 kls Exp $
+ *   $Id: section.h 4.0 2012/02/26 13:58:26 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/si.c b/libsi/si.c
index e51770ab7..4413d8573 100644
--- a/libsi/si.c
+++ b/libsi/si.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.c 3.3 2015/02/10 13:42:41 kls Exp $
+ *   $Id: si.c 4.0 2015/02/10 13:42:41 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/si.h b/libsi/si.h
index e70de6851..96885b6fb 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 3.4 2015/02/10 13:54:28 kls Exp $
+ *   $Id: si.h 4.0 2015/02/10 13:54:28 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/util.c b/libsi/util.c
index 4da19178d..8b996f92c 100644
--- a/libsi/util.c
+++ b/libsi/util.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.c 3.0 2006/02/18 11:17:50 kls Exp $
+ *   $Id: util.c 4.0 2006/02/18 11:17:50 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/util.h b/libsi/util.h
index 019c4a862..1125acd8e 100644
--- a/libsi/util.h
+++ b/libsi/util.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: util.h 3.0 2012/02/26 13:58:26 kls Exp $
+ *   $Id: util.h 4.0 2012/02/26 13:58:26 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/lirc.c b/lirc.c
index 2b0c07b18..526cd6d2f 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 3.2 2013/10/29 12:32:12 kls Exp $
+ * $Id: lirc.c 4.0 2013/10/29 12:32:12 kls Exp $
  */
 
 #include "lirc.h"
diff --git a/lirc.h b/lirc.h
index 070aa3ddd..8d5f71cd4 100644
--- a/lirc.h
+++ b/lirc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 3.0 2006/01/27 16:00:19 kls Exp $
+ * $Id: lirc.h 4.0 2006/01/27 16:00:19 kls Exp $
  */
 
 #ifndef __LIRC_H
diff --git a/menu.c b/menu.c
index ae61c64d5..569900ce3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.48 2015/02/10 12:37:06 kls Exp $
+ * $Id: menu.c 4.12 2015/09/14 13:22:49 kls Exp $
  */
 
 #include "menu.h"
@@ -27,6 +27,7 @@
 #include "sourceparams.h"
 #include "sources.h"
 #include "status.h"
+#include "svdrp.h"
 #include "themes.h"
 #include "timers.h"
 #include "transfer.h"
@@ -48,8 +49,8 @@
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
 #define MAXCHNAMWIDTH      16 // maximum number of characters of channels' short names shown in schedules menus
 
-#define CHNUMWIDTH  (numdigits(Channels.MaxNumber()) + 1)
-#define CHNAMWIDTH  (min(MAXCHNAMWIDTH, Channels.MaxShortChannelNameLength() + 1))
+#define CHNUMWIDTH  (numdigits(cChannels::MaxNumber()) + 1)
+#define CHNAMWIDTH  (min(MAXCHNAMWIDTH, cChannels::MaxShortChannelNameLength() + 1))
 
 // --- cMenuEditCaItem -------------------------------------------------------
 
@@ -159,20 +160,23 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key)
 
 class cMenuEditChannel : public cOsdMenu {
 private:
+  cStateKey *channelsStateKey;
   cChannel *channel;
   cChannel data;
   cSourceParam *sourceParam;
   char name[256];
   void Setup(void);
 public:
-  cMenuEditChannel(cChannel *Channel, bool New = false);
+  cMenuEditChannel(cStateKey *ChannelsStateKey, cChannel *Channel, bool New = false);
+  cChannel *Channel(void) { return channel; }
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
+cMenuEditChannel::cMenuEditChannel(cStateKey *ChannelsStateKey, cChannel *Channel, bool New)
 :cOsdMenu(tr("Edit channel"), 16)
 {
   SetMenuCategory(mcChannelEdit);
+  channelsStateKey = ChannelsStateKey;
   channel = Channel;
   sourceParam = NULL;
   *name = 0;
@@ -239,32 +243,37 @@ eOSState cMenuEditChannel::ProcessKey(eKeys Key)
 
   if (state == osUnknown) {
      if (Key == kOk) {
+        cChannels *Channels =cChannels::GetChannelsWrite(*channelsStateKey);
+        bool Modified = false;
         if (sourceParam)
            sourceParam->GetData(&data);
-        if (Channels.HasUniqueChannelID(&data, channel)) {
+        if (Channels->HasUniqueChannelID(&data, channel)) {
            data.name = strcpyrealloc(data.name, name);
            if (channel) {
               *channel = data;
-              isyslog("edited channel %d %s", channel->Number(), *data.ToText());
+              isyslog("edited channel %d %s", channel->Number(), *channel->ToText());
               state = osBack;
               }
            else {
               channel = new cChannel;
               *channel = data;
-              Channels.Add(channel);
-              Channels.ReNumber();
-              isyslog("added channel %d %s", channel->Number(), *data.ToText());
+              Channels->Add(channel);
+              Channels->ReNumber();
+              isyslog("added channel %d %s", channel->Number(), *channel->ToText());
               state = osUser1;
               }
-           Channels.SetModified(true);
+           Channels->SetModifiedByUser();
+           Modified = true;
            }
         else {
            Skins.Message(mtError, tr("Channel settings are not unique!"));
            state = osContinue;
            }
+        channelsStateKey->Remove(Modified);
         }
      }
   if (Key != kNone && (data.source & cSource::st_Mask) != (oldSource & cSource::st_Mask)) {
+     LOCK_CHANNELS_WRITE;
      if (sourceParam)
         sourceParam->GetData(&data);
      Setup();
@@ -279,21 +288,21 @@ class cMenuChannelItem : public cOsdItem {
   enum eChannelSortMode { csmNumber, csmName, csmProvider };
 private:
   static eChannelSortMode sortMode;
-  cChannel *channel;
+  const cChannel *channel;
 public:
-  cMenuChannelItem(cChannel *Channel);
+  cMenuChannelItem(const cChannel *Channel);
   static void SetSortMode(eChannelSortMode SortMode) { sortMode = SortMode; }
   static void IncSortMode(void) { sortMode = eChannelSortMode((sortMode == csmProvider) ? csmNumber : sortMode + 1); }
   static eChannelSortMode SortMode(void) { return sortMode; }
   virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
-  cChannel *Channel(void) { return channel; }
+  const cChannel *Channel(void) { return channel; }
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
 cMenuChannelItem::eChannelSortMode cMenuChannelItem::sortMode = csmNumber;
 
-cMenuChannelItem::cMenuChannelItem(cChannel *Channel)
+cMenuChannelItem::cMenuChannelItem(const cChannel *Channel)
 {
   channel = Channel;
   if (channel->GroupSep())
@@ -340,11 +349,12 @@ void cMenuChannelItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, boo
 
 class cMenuChannels : public cOsdMenu {
 private:
+  cStateKey channelsStateKey;
   int number;
   cTimeMs numberTimer;
-  void Setup(void);
+  void Set(bool Force = false);
   cChannel *GetChannel(int Index);
-  void Propagate(void);
+  void Propagate(cChannels *Channels);
 protected:
   eOSState Number(eKeys Key);
   eOSState Switch(void);
@@ -363,38 +373,41 @@ cMenuChannels::cMenuChannels(void)
 {
   SetMenuCategory(mcChannel);
   number = 0;
-  Setup();
-  Channels.IncBeingEdited();
+  Set();
 }
 
 cMenuChannels::~cMenuChannels()
 {
-  Channels.DecBeingEdited();
 }
 
-void cMenuChannels::Setup(void)
+void cMenuChannels::Set(bool Force)
 {
-  cChannel *currentChannel = GetChannel(Current());
-  if (!currentChannel)
-     currentChannel = Channels.GetByNumber(cDevice::CurrentChannel());
-  cMenuChannelItem *currentItem = NULL;
-  Clear();
-  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-      if (!channel->GroupSep() || cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber && *channel->Name()) {
-         cMenuChannelItem *item = new cMenuChannelItem(channel);
-         Add(item);
-         if (channel == currentChannel)
-            currentItem = item;
+  if (Force)
+     channelsStateKey.Reset();
+  if (const cChannels *Channels = cChannels::GetChannelsRead(channelsStateKey)) {
+     const cChannel *CurrentChannel = GetChannel(Current());
+     if (!CurrentChannel)
+        CurrentChannel = Channels->GetByNumber(cDevice::CurrentChannel());
+     cMenuChannelItem *CurrentItem = NULL;
+     Clear();
+     for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
+         if (!Channel->GroupSep() || cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber && *Channel->Name()) {
+            cMenuChannelItem *Item = new cMenuChannelItem(Channel);
+            Add(Item);
+            if (Channel == CurrentChannel)
+               CurrentItem = Item;
+            }
          }
-      }
-  SetMenuSortMode(cMenuChannelItem::SortMode() == cMenuChannelItem::csmName ? msmName :
-                  cMenuChannelItem::SortMode() == cMenuChannelItem::csmProvider ? msmProvider :
-                  msmNumber);
-  if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
-     Sort();
-  SetCurrent(currentItem);
-  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), tr("Button$Mark"));
-  Display();
+     SetMenuSortMode(cMenuChannelItem::SortMode() == cMenuChannelItem::csmName ? msmName :
+                     cMenuChannelItem::SortMode() == cMenuChannelItem::csmProvider ? msmProvider :
+                     msmNumber);
+     if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
+        Sort();
+     SetCurrent(CurrentItem);
+     SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), tr("Button$Mark"));
+     Display();
+     channelsStateKey.Remove();
+     }
 }
 
 cChannel *cMenuChannels::GetChannel(int Index)
@@ -403,13 +416,13 @@ cChannel *cMenuChannels::GetChannel(int Index)
   return p ? (cChannel *)p->Channel() : NULL;
 }
 
-void cMenuChannels::Propagate(void)
+void cMenuChannels::Propagate(cChannels *Channels)
 {
-  Channels.ReNumber();
+  Channels->ReNumber();
   for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next())
       ci->Set();
   Display();
-  Channels.SetModified(true);
+  Channels->SetModifiedByUser();
 }
 
 eOSState cMenuChannels::Number(eKeys Key)
@@ -420,9 +433,10 @@ eOSState cMenuChannels::Number(eKeys Key)
      number = 0;
   if (!number && Key == k0) {
      cMenuChannelItem::IncSortMode();
-     Setup();
+     Set(true);
      }
   else {
+     LOCK_CHANNELS_READ;
      number = number * 10 + Key - k0;
      for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next()) {
          if (!ci->Channel()->GroupSep() && ci->Channel()->Number() == number) {
@@ -440,6 +454,7 @@ eOSState cMenuChannels::Switch(void)
 {
   if (HasSubMenu())
      return osContinue;
+  LOCK_CHANNELS_READ;
   cChannel *ch = GetChannel(Current());
   if (ch)
      return cDevice::PrimaryDevice()->SwitchChannel(ch, true) ? osEnd : osContinue;
@@ -450,9 +465,10 @@ eOSState cMenuChannels::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
+  LOCK_CHANNELS_READ;
   cChannel *ch = GetChannel(Current());
   if (ch)
-     return AddSubMenu(new cMenuEditChannel(ch));
+     return AddSubMenu(new cMenuEditChannel(&channelsStateKey, ch));
   return osContinue;
 }
 
@@ -460,79 +476,97 @@ eOSState cMenuChannels::New(void)
 {
   if (HasSubMenu())
      return osContinue;
-  return AddSubMenu(new cMenuEditChannel(GetChannel(Current()), true));
+  LOCK_CHANNELS_READ;
+  return AddSubMenu(new cMenuEditChannel(&channelsStateKey, GetChannel(Current()), true));
 }
 
 eOSState cMenuChannels::Delete(void)
 {
   if (!HasSubMenu() && Count() > 0) {
-     int CurrentChannelNr = cDevice::CurrentChannel();
-     cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
+     LOCK_TIMERS_READ; // must lock timers before channels!
+     cChannels *Channels = cChannels::GetChannelsWrite(channelsStateKey);
      int Index = Current();
-     cChannel *channel = GetChannel(Current());
-     int DeletedChannel = channel->Number();
+     cChannel *Channel = GetChannel(Current());
+     if (!Channels->Contains(Channel)) {
+        channelsStateKey.Remove(false);
+        channelsStateKey.Reset(); // makes sure the menu is refreshed
+        return osContinue;
+        }
+     bool Deleted = false;
+     int CurrentChannelNr = cDevice::CurrentChannel();
+     cChannel *CurrentChannel = Channels->GetByNumber(CurrentChannelNr);
+     int DeletedChannel = Channel->Number();
      // Check if there is a timer using this channel:
-     if (channel->HasTimer()) {
+     if (Timers->UsesChannel(Channel)) {
         Skins.Message(mtError, tr("Channel is being used by a timer!"));
         return osContinue;
         }
      if (Interface->Confirm(tr("Delete channel?"))) {
-        if (CurrentChannel && channel == CurrentChannel) {
-           int n = Channels.GetNextNormal(CurrentChannel->Index());
+        if (CurrentChannel && Channel == CurrentChannel) {
+           int n = Channels->GetNextNormal(CurrentChannel->Index());
            if (n < 0)
-              n = Channels.GetPrevNormal(CurrentChannel->Index());
-           CurrentChannel = Channels.Get(n);
+              n = Channels->GetPrevNormal(CurrentChannel->Index());
+           CurrentChannel = Channels->Get(n);
            CurrentChannelNr = 0; // triggers channel switch below
            }
-        Channels.Del(channel);
+        Channels->Del(Channel);
         cOsdMenu::Del(Index);
-        Propagate();
-        Channels.SetModified(true);
+        Propagate(Channels);
+        Channels->SetModifiedByUser();
         isyslog("channel %d deleted", DeletedChannel);
+        Deleted = true;
         if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
            if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
-              Channels.SwitchTo(CurrentChannel->Number());
+              Channels->SwitchTo(CurrentChannel->Number());
            else
               cDevice::SetCurrentChannel(CurrentChannel);
            }
         }
+     channelsStateKey.Remove(Deleted);
      }
   return osContinue;
 }
 
 void cMenuChannels::Move(int From, int To)
 {
-  int CurrentChannelNr = cDevice::CurrentChannel();
-  cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
-  cChannel *FromChannel = GetChannel(From);
-  cChannel *ToChannel = GetChannel(To);
-  if (FromChannel && ToChannel) {
-     int FromNumber = FromChannel->Number();
-     int ToNumber = ToChannel->Number();
-     Channels.Move(FromChannel, ToChannel);
-     cOsdMenu::Move(From, To);
-     Propagate();
-     Channels.SetModified(true);
-     isyslog("channel %d moved to %d", FromNumber, ToNumber);
-     if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
-        if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
-           Channels.SwitchTo(CurrentChannel->Number());
-        else
-           cDevice::SetCurrentChannel(CurrentChannel);
+  if (cChannels *Channels = cChannels::GetChannelsWrite(channelsStateKey)) {
+     int CurrentChannelNr = cDevice::CurrentChannel();
+     cChannel *CurrentChannel = Channels->GetByNumber(CurrentChannelNr);
+     cChannel *FromChannel = GetChannel(From);
+     cChannel *ToChannel = GetChannel(To);
+     if (FromChannel && ToChannel) {
+        int FromNumber = FromChannel->Number();
+        int ToNumber = ToChannel->Number();
+        Channels->Move(FromChannel, ToChannel);
+        cOsdMenu::Move(From, To);
+        Propagate(Channels);
+        Channels->SetModifiedByUser();
+        isyslog("channel %d moved to %d", FromNumber, ToNumber);
+        if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+           if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+              Channels->SwitchTo(CurrentChannel->Number());
+           else
+              cDevice::SetCurrentChannel(CurrentChannel);
+           }
         }
+     channelsStateKey.Remove();
      }
 }
 
 eOSState cMenuChannels::ProcessKey(eKeys Key)
 {
+  if (!HasSubMenu())
+     Set(); // react on any changes to the channels list
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   switch (state) {
     case osUser1: {
-         cChannel *channel = Channels.Last();
-         if (channel) {
-            Add(new cMenuChannelItem(channel), true);
-            return CloseSubMenu();
+         if (cMenuEditChannel *MenuEditChannel = dynamic_cast<cMenuEditChannel *>(SubMenu())) {
+            if (cChannel *Channel = MenuEditChannel->Channel()) {
+               LOCK_CHANNELS_READ;
+               Add(new cMenuChannelItem(Channel), true);
+               return CloseSubMenu();
+               }
             }
          }
          break;
@@ -767,7 +801,7 @@ void cMenuFolder::SetHelpKeys(void)
 }
 
 #define FOLDERDELIMCHARSUBST 0x01
-static void AddRecordingFolders(cList<cNestedItem> *List, char *Path)
+static void AddRecordingFolders(const cRecordings *Recordings, cList<cNestedItem> *List, char *Path)
 {
   if (Path) {
      char *p = strchr(Path, FOLDERDELIMCHARSUBST);
@@ -782,13 +816,12 @@ static void AddRecordingFolders(cList<cNestedItem> *List, char *Path)
         List->Add(Folder = new cNestedItem(Path));
      if (p) {
         Folder->SetSubItems(true);
-        AddRecordingFolders(Folder->SubItems(), p);
+        AddRecordingFolders(Recordings, Folder->SubItems(), p);
         }
      }
   else {
-     cThreadLock RecordingsLock(&Recordings);
      cStringList Dirs;
-     for (cRecording *Recording = Recordings.First(); Recording; Recording = Recordings.Next(Recording)) {
+     for (const cRecording *Recording = Recordings->First(); Recording; Recording = Recordings->Next(Recording)) {
          cString Folder = Recording->Folder();
          strreplace((char *)*Folder, FOLDERDELIMCHAR, FOLDERDELIMCHARSUBST); // makes sure parent folders come before subfolders
          if (Dirs.Find(Folder) < 0)
@@ -796,18 +829,21 @@ static void AddRecordingFolders(cList<cNestedItem> *List, char *Path)
          }
      Dirs.Sort();
      for (int i = 0; i < Dirs.Size(); i++) {
-         char *s = Dirs[i];
-         if (*s)
-            AddRecordingFolders(&Folders, s);
+         if (char *s = Dirs[i])
+            AddRecordingFolders(Recordings, &Folders, s);
          }
      }
 }
 
 void cMenuFolder::Set(const char *CurrentFolder)
 {
-  static int RecordingsState = -1;
-  if (list == &Folders && Recordings.StateChanged(RecordingsState))
-     AddRecordingFolders(&Folders, NULL);
+  static cStateKey RecordingsStateKey;
+  if (list == &Folders) {
+     if (const cRecordings *Recordings = cRecordings::GetRecordingsRead(RecordingsStateKey)) {
+        AddRecordingFolders(Recordings, &Folders, NULL);
+        RecordingsStateKey.Remove();
+        }
+     }
   firstFolder = NULL;
   Clear();
   if (!isempty(dir)) {
@@ -937,10 +973,13 @@ eOSState cMenuFolder::ProcessKey(eKeys Key)
 
 // --- cMenuEditTimer --------------------------------------------------------
 
+const cTimer *cMenuEditTimer::addedTimer = NULL;
+
 cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
 :cOsdMenu(tr("Edit timer"), 12)
 {
   SetMenuCategory(mcTimerEdit);
+  addedTimer = NULL;
   file = NULL;
   day = firstday = NULL;
   timer = Timer;
@@ -960,16 +999,30 @@ cMenuEditTimer::cMenuEditTimer(cTimer *Timer, bool New)
      Add(new cMenuEditIntItem( tr("Lifetime"),     &data.lifetime, 0, MAXLIFETIME));
      Add(file = new cMenuEditStrItem( tr("File"),   data.file, sizeof(data.file)));
      SetFirstDayItem();
+     if (data.remote)
+        strn0cpy(remote, data.remote, sizeof(remote));
+     else
+        *remote = 0;
+     if (GetSVDRPServerNames(&svdrpServerNames)) {
+        svdrpServerNames.Sort(true);
+        svdrpServerNames.Insert(strdup(""));
+        Add(new cMenuEditStrlItem(tr("Record on"), remote, sizeof(remote), &svdrpServerNames));
+        }
      }
   SetHelpKeys();
-  Timers.IncBeingEdited();
 }
 
 cMenuEditTimer::~cMenuEditTimer()
 {
   if (timer && addIfConfirmed)
      delete timer; // apparently it wasn't confirmed
-  Timers.DecBeingEdited();
+}
+
+const cTimer *cMenuEditTimer::AddedTimer(void)
+{
+  const cTimer *Timer = addedTimer;
+  addedTimer = NULL;
+  return Timer;
 }
 
 void cMenuEditTimer::SetHelpKeys(void)
@@ -1009,34 +1062,107 @@ eOSState cMenuEditTimer::SetFolder(void)
   return CloseSubMenu();
 }
 
+static bool RemoteTimerError(const cTimer *Timer)
+{
+  Skins.Message(mtError, cString::sprintf("%s %d@%s!", tr("Error while accessing remote timer"), Timer->Id(), Timer->Remote()));
+  return false; // convenience return code
+}
+
+static bool HandleRemoteModifications(cTimer *NewTimer, cTimer *OldTimer = NULL)
+{
+  cStringList Response;
+  if (!OldTimer || OldTimer->Local() || !OldTimer->Id()) {
+     if (NewTimer->Local()) { // timer stays local, nothing to do
+        if (OldTimer && OldTimer->Id())
+           isyslog("modified timer %s", *NewTimer->ToDescr());
+        else
+           isyslog("added timer %s", *NewTimer->ToDescr());
+        }
+     else { // timer is new, or moved from local to remote
+        if (!ExecSVDRPCommand(NewTimer->Remote(), cString::sprintf("NEWT %s", *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+           return RemoteTimerError(NewTimer);
+        int RemoteId = atoi(SVDRPValue(Response[0]));
+        if (RemoteId <= 0)
+           return RemoteTimerError(NewTimer);
+        NewTimer->SetId(RemoteId);
+        if (OldTimer && OldTimer->Id()) {
+           if (OldTimer->Recording())
+              cRecordControls::Stop(OldTimer);
+           isyslog("moved timer %d to %s", OldTimer->Id(), *NewTimer->ToDescr());
+           }
+        else
+           isyslog("added timer %s", *NewTimer->ToDescr());
+        }
+     }
+  else if (NewTimer->Local()) { // timer is moved from remote to local
+     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(OldTimer);
+     NewTimer->SetId(cTimers::NewTimerId());
+     NewTimer->ClrFlags(tfRecording); // in case it was recording on the remote machine
+     isyslog("moved timer %d@%s to %s", OldTimer->Id(), OldTimer->Remote(), *NewTimer->ToDescr());
+     }
+  else if (strcmp(OldTimer->Remote(), NewTimer->Remote()) == 0) { // timer stays remote on same machine
+     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("MODT %d %s", OldTimer->Id(), *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(NewTimer);
+     isyslog("modified timer %s", *NewTimer->ToDescr());
+     }
+  else { // timer is moved from one remote machine to an other
+     if (!ExecSVDRPCommand(NewTimer->Remote(), cString::sprintf("NEWT %s", *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(NewTimer);
+     int RemoteId = atoi(SVDRPValue(Response[0]));
+     if (RemoteId <= 0)
+        return RemoteTimerError(NewTimer);
+     NewTimer->SetId(RemoteId);
+     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(OldTimer);
+     isyslog("moved timer %d@%s to %s", OldTimer->Id(), OldTimer->Remote(), *NewTimer->ToDescr());
+     }
+  return true;
+}
+
 eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
      switch (Key) {
-       case kOk:     {
-                       cChannel *ch = Channels.GetByNumber(channel);
-                       if (ch)
-                          data.channel = ch;
-                       else {
-                          Skins.Message(mtError, tr("*** Invalid Channel ***"));
-                          break;
-                          }
-                       if (!*data.file)
-                          strcpy(data.file, data.Channel()->ShortName(true));
-                       if (timer) {
-                          if (memcmp((void *)timer, &data, sizeof(data)) != 0)
-                             *timer = data;
-                          if (addIfConfirmed)
-                             Timers.Add(timer);
-                          timer->SetEventFromSchedule();
-                          timer->Matches();
-                          Timers.SetModified();
-                          isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
-                          addIfConfirmed = false;
-                          }
-                     }
+       case kOk:     if (timer) {
+                        LOCK_TIMERS_WRITE;
+                        if (!addIfConfirmed && !Timers->Contains(timer)) {
+                           Skins.Message(mtWarning, tr("Timer has been deleted!"));
+                           break;
+                           }
+                        LOCK_CHANNELS_READ;
+                        if (const cChannel *Channel = Channels->GetByNumber(channel))
+                           data.channel = Channel;
+                        else {
+                           Skins.Message(mtError, tr("*** Invalid Channel ***"));
+                           break;
+                           }
+                        if (!*data.file)
+                           strcpy(data.file, data.Channel()->ShortName(true));
+                        data.SetRemote(*remote ? remote : NULL);
+                        if (addIfConfirmed) {
+                           *timer = data;
+                           Timers->Add(timer);
+                           addedTimer = timer;
+                           if (!HandleRemoteModifications(timer)) {
+                              // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
+                              Timers->Del(timer);
+                              addedTimer = NULL;
+                              return osContinue;
+                              }
+                           }
+                        else {
+                           if (!HandleRemoteModifications(&data, timer))
+                              return osContinue;
+                           *timer = data;
+                           }
+                        LOCK_SCHEDULES_READ;
+                        timer->SetEventFromSchedule(Schedules);
+                        timer->Matches();
+                        addIfConfirmed = false;
+                        }
                      return osBack;
        case kRed:    return AddSubMenu(new cMenuFolder(tr("Select folder"), &Folders, data.file));
        case kGreen:  if (day) {
@@ -1063,16 +1189,16 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
 
 class cMenuTimerItem : public cOsdItem {
 private:
-  cTimer *timer;
+  const cTimer *timer;
 public:
-  cMenuTimerItem(cTimer *Timer);
+  cMenuTimerItem(const cTimer *Timer);
   virtual int Compare(const cListObject &ListObject) const;
   virtual void Set(void);
-  cTimer *Timer(void) { return timer; }
+  const cTimer *Timer(void) { return timer; }
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
-cMenuTimerItem::cMenuTimerItem(cTimer *Timer)
+cMenuTimerItem::cMenuTimerItem(const cTimer *Timer)
 {
   timer = Timer;
   Set();
@@ -1105,7 +1231,7 @@ void cMenuTimerItem::Set(void)
      File++;
   else
      File = timer->File();
-  SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s",
+  SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s%s",
                     !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>',
                     timer->Channel()->Number(),
                     *name,
@@ -1115,6 +1241,7 @@ void cMenuTimerItem::Set(void)
                     timer->Start() % 100,
                     timer->Stop() / 100,
                     timer->Stop() % 100,
+                    timer->Remote() ? *cString::sprintf("@%s: ", timer->Remote()) : "",
                     File));
 }
 
@@ -1128,13 +1255,15 @@ void cMenuTimerItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool
 
 class cMenuTimers : public cOsdMenu {
 private:
+  cStateKey timersStateKey;
   int helpKeys;
+  void Set(void);
   eOSState Edit(void);
   eOSState New(void);
   eOSState Delete(void);
   eOSState OnOff(void);
   eOSState Info(void);
-  cTimer *CurrentTimer(void);
+  cTimer *GetTimer(void);
   void SetHelpKeys(void);
 public:
   cMenuTimers(void);
@@ -1147,33 +1276,45 @@ cMenuTimers::cMenuTimers(void)
 {
   SetMenuCategory(mcTimer);
   helpKeys = -1;
-  for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
-      timer->SetEventFromSchedule(); // make sure the event is current
-      Add(new cMenuTimerItem(timer));
-      }
-  Sort();
-  SetCurrent(First());
-  SetHelpKeys();
-  Timers.IncBeingEdited();
+  cMenuEditTimer::AddedTimer(); // to clear any leftovers
+  Set();
 }
 
 cMenuTimers::~cMenuTimers()
 {
-  Timers.DecBeingEdited();
 }
 
-cTimer *cMenuTimers::CurrentTimer(void)
+void cMenuTimers::Set(void)
+{
+  if (const cTimers *Timers = cTimers::GetTimersRead(timersStateKey)) {
+     const cTimer *CurrentTimer = GetTimer();
+     cMenuTimerItem *CurrentItem = NULL;
+     Clear();
+     for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
+         cMenuTimerItem *Item = new cMenuTimerItem(Timer);
+         Add(Item);
+         if (CurrentTimer && Timer->Id() == CurrentTimer->Id() && (!Timer->Remote() && !CurrentTimer->Remote() || Timer->Remote() && CurrentTimer->Remote() && strcmp(Timer->Remote(), CurrentTimer->Remote()) == 0))
+            CurrentItem = Item;
+         }
+     Sort();
+     SetCurrent(CurrentItem ? CurrentItem : First());
+     SetHelpKeys();
+     Display();
+     timersStateKey.Remove();
+     }
+}
+
+cTimer *cMenuTimers::GetTimer(void)
 {
   cMenuTimerItem *item = (cMenuTimerItem *)Get(Current());
-  return item ? item->Timer() : NULL;
+  return item ? (cTimer *)item->Timer() : NULL;
 }
 
 void cMenuTimers::SetHelpKeys(void)
 {
   int NewHelpKeys = 0;
-  cTimer *timer = CurrentTimer();
-  if (timer) {
-     if (timer->Event())
+  if (const cTimer *Timer = GetTimer()) {
+     if (Timer->Event())
         NewHelpKeys = 2;
      else
         NewHelpKeys = 1;
@@ -1188,18 +1329,25 @@ eOSState cMenuTimers::OnOff(void)
 {
   if (HasSubMenu())
      return osContinue;
-  cTimer *timer = CurrentTimer();
-  if (timer) {
-     timer->OnOff();
-     timer->SetEventFromSchedule();
+  cTimers::GetTimersWrite(timersStateKey);
+  cTimer *Timer = GetTimer();
+  if (Timer) {
+     Timer->OnOff();
+     if (Timer->Remote()) {
+        cStringList Response;
+        if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("MODT %d %s", Timer->Id(), *Timer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+           RemoteTimerError(Timer);
+        }
+     LOCK_SCHEDULES_READ;
+     Timer->SetEventFromSchedule(Schedules);
      RefreshCurrent();
      DisplayCurrent(true);
-     if (timer->FirstDay())
-        isyslog("timer %s first day set to %s", *timer->ToDescr(), *timer->PrintFirstDay());
+     if (Timer->FirstDay())
+        isyslog("set first day of timer %s to %s", *Timer->ToDescr(), *Timer->PrintFirstDay());
      else
-        isyslog("timer %s %sactivated", *timer->ToDescr(), timer->HasFlags(tfActive) ? "" : "de");
-     Timers.SetModified();
+        isyslog("%sactivated timer %s", Timer->HasFlags(tfActive) ? "" : "de", *Timer->ToDescr());
      }
+  timersStateKey.Remove(Timer != NULL);
   return osContinue;
 }
 
@@ -1207,38 +1355,50 @@ eOSState cMenuTimers::Edit(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  isyslog("editing timer %s", *CurrentTimer()->ToDescr());
-  return AddSubMenu(new cMenuEditTimer(CurrentTimer()));
+  return AddSubMenu(new cMenuEditTimer(GetTimer()));
 }
 
 eOSState cMenuTimers::New(void)
 {
   if (HasSubMenu())
      return osContinue;
-  return AddSubMenu(new cMenuEditTimer(new cTimer, true));
+  cTimer *Timer = new cTimer;
+  if (*Setup.SVDRPDefaultHost)
+     Timer->SetRemote(Setup.SVDRPDefaultHost);
+  return AddSubMenu(new cMenuEditTimer(Timer, true));
 }
 
 eOSState cMenuTimers::Delete(void)
 {
+  cTimers *Timers = cTimers::GetTimersWrite(timersStateKey);
   // Check if this timer is active:
-  cTimer *ti = CurrentTimer();
-  if (ti) {
+  cTimer *Timer = GetTimer();
+  if (Timer) {
      if (Interface->Confirm(tr("Delete timer?"))) {
-        if (ti->Recording()) {
+        if (Timer->Recording()) {
            if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
-              ti->Skip();
-              cRecordControls::Process(time(NULL));
+              if (!Timer->Remote()) {
+                 Timer->Skip();
+                 cRecordControls::Process(Timers, time(NULL));
+                 }
               }
            else
-              return osContinue;
+              Timer = NULL;
+           }
+        if (Timer) {
+           if (Timer->Remote()) {
+              cStringList Response;
+              if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("DELT %d", Timer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
+                 RemoteTimerError(Timer);
+              }
+           Timers->Del(Timer);
+           cOsdMenu::Del(Current());
+           Display();
+           isyslog("deleted timer %s", *Timer->ToDescr());
            }
-        isyslog("deleting timer %s", *ti->ToDescr());
-        Timers.Del(ti);
-        cOsdMenu::Del(Current());
-        Timers.SetModified();
-        Display();
         }
      }
+  timersStateKey.Remove(Timer != NULL);
   return osContinue;
 }
 
@@ -1246,17 +1406,19 @@ eOSState cMenuTimers::Info(void)
 {
   if (HasSubMenu() || Count() == 0)
      return osContinue;
-  cTimer *ti = CurrentTimer();
-  if (ti && ti->Event())
-     return AddSubMenu(new cMenuEvent(ti->Event()));
+  LOCK_TIMERS_READ;
+  LOCK_CHANNELS_READ;
+  cTimer *Timer = GetTimer();
+  if (Timer && Timer->Event())
+     return AddSubMenu(new cMenuEvent(Timers, Channels, Timer->Event()));
   return osContinue;
 }
 
 eOSState cMenuTimers::ProcessKey(eKeys Key)
 {
-  int TimerNumber = HasSubMenu() ? Count() : -1;
+  if (!HasSubMenu())
+     Set();
   eOSState state = cOsdMenu::ProcessKey(Key);
-
   if (state == osUnknown) {
      switch (Key) {
        case kOk:     return Edit();
@@ -1269,9 +1431,10 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        default: break;
        }
      }
-  if (TimerNumber >= 0 && !HasSubMenu() && Timers.Get(TimerNumber)) {
-     // a newly created timer was confirmed with Ok
-     Add(new cMenuTimerItem(Timers.Get(TimerNumber)), true);
+  if (const cTimer *Timer = cMenuEditTimer::AddedTimer()) {
+     // a newly created timer was confirmed with Ok and the proper item needs to be added:
+     LOCK_TIMERS_READ;
+     Add(new cMenuTimerItem(Timer), true);
      Display();
      }
   if (Key != kNone)
@@ -1281,19 +1444,19 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
 
 // --- cMenuEvent ------------------------------------------------------------
 
-cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch, bool Buttons)
+cMenuEvent::cMenuEvent(const cTimers *Timers, const cChannels *Channels, const cEvent *Event, bool CanSwitch, bool Buttons)
 :cOsdMenu(tr("Event"))
 {
   SetMenuCategory(mcEvent);
   event = Event;
   if (event) {
-     cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true);
-     if (channel) {
-        SetTitle(channel->Name());
-        eTimerMatch TimerMatch = tmNone;
-        Timers.GetMatch(event, &TimerMatch);
-        if (Buttons)
+     if (const cChannel *Channel = Channels->GetByChannelID(event->ChannelID(), true)) {
+        SetTitle(Channel->Name());
+        if (Buttons) {
+           eTimerMatch TimerMatch = tmNone;
+           Timers->GetMatch(event, &TimerMatch);
            SetHelp(TimerMatch == tmFull ? tr("Button$Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
+           }
         }
      }
 }
@@ -1349,24 +1512,24 @@ class cMenuScheduleItem : public cOsdItem {
   const cChannel *channel;
   bool withDate;
   eTimerMatch timerMatch;
-  cMenuScheduleItem(const cEvent *Event, cChannel *Channel = NULL, bool WithDate = false);
+  cMenuScheduleItem(const cTimers *Timers, const cEvent *Event, const cChannel *Channel = NULL, bool WithDate = false);
   static void SetSortMode(eScheduleSortMode SortMode) { sortMode = SortMode; }
   static void IncSortMode(void) { sortMode = eScheduleSortMode((sortMode == ssmAllAll) ? ssmAllThis : sortMode + 1); }
   static eScheduleSortMode SortMode(void) { return sortMode; }
   virtual int Compare(const cListObject &ListObject) const;
-  bool Update(bool Force = false);
+  bool Update(const cTimers *Timers, bool Force = false);
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
 cMenuScheduleItem::eScheduleSortMode cMenuScheduleItem::sortMode = ssmAllThis;
 
-cMenuScheduleItem::cMenuScheduleItem(const cEvent *Event, cChannel *Channel, bool WithDate)
+cMenuScheduleItem::cMenuScheduleItem(const cTimers *Timers, const cEvent *Event, const cChannel *Channel, bool WithDate)
 {
   event = Event;
   channel = Channel;
   withDate = WithDate;
   timerMatch = tmNone;
-  Update(true);
+  Update(Timers, true);
 }
 
 int cMenuScheduleItem::Compare(const cListObject &ListObject) const
@@ -1382,11 +1545,10 @@ int cMenuScheduleItem::Compare(const cListObject &ListObject) const
 
 static const char *TimerMatchChars = " tT";
 
-bool cMenuScheduleItem::Update(bool Force)
+bool cMenuScheduleItem::Update(const cTimers *Timers, bool Force)
 {
-  bool result = false;
   eTimerMatch OldTimerMatch = timerMatch;
-  Timers.GetMatch(event, &timerMatch);
+  Timers->GetMatch(event, &timerMatch);
   if (Force || timerMatch != OldTimerMatch) {
      cString buffer;
      char t = TimerMatchChars[timerMatch];
@@ -1401,9 +1563,9 @@ bool cMenuScheduleItem::Update(bool Force)
      else
         buffer = cString::sprintf("%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
      SetText(buffer);
-     result = true;
+     return true;
      }
-  return result;
+  return false;
 }
 
 void cMenuScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
@@ -1419,7 +1581,7 @@ class cMenuWhatsOn : public cOsdMenu {
   bool now;
   bool canSwitch;
   int helpKeys;
-  int timerState;
+  cStateKey timersStateKey;
   eOSState Record(void);
   eOSState Switch(void);
   static int currentChannel;
@@ -1427,7 +1589,7 @@ class cMenuWhatsOn : public cOsdMenu {
   bool Update(void);
   void SetHelpKeys(void);
 public:
-  cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr);
+  cMenuWhatsOn(const cTimers *Timers, const cChannels *Channels, const cSchedules *Schedules, bool Now, int CurrentChannelNr);
   static int CurrentChannel(void) { return currentChannel; }
   static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; }
   static const cEvent *ScheduleEvent(void);
@@ -1437,22 +1599,18 @@ class cMenuWhatsOn : public cOsdMenu {
 int cMenuWhatsOn::currentChannel = 0;
 const cEvent *cMenuWhatsOn::scheduleEvent = NULL;
 
-cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
+cMenuWhatsOn::cMenuWhatsOn(const cTimers *Timers, const cChannels *Channels, const cSchedules *Schedules, bool Now, int CurrentChannelNr)
 :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, CHNAMWIDTH, 6, 4)
 {
   SetMenuCategory(Now ? mcScheduleNow : mcScheduleNext);
   now = Now;
   canSwitch = false;
   helpKeys = 0;
-  timerState = 0;
-  Timers.Modified(timerState);
-  for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+  for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
       if (!Channel->GroupSep()) {
-         const cSchedule *Schedule = Schedules->GetSchedule(Channel);
-         if (Schedule) {
-            const cEvent *Event = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
-            if (Event)
-               Add(new cMenuScheduleItem(Event, Channel), Channel->Number() == CurrentChannelNr);
+         if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+            if (const cEvent *Event = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent())
+               Add(new cMenuScheduleItem(Timers, Event, Channel), Channel->Number() == CurrentChannelNr);
             }
          }
       }
@@ -1464,11 +1622,12 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 bool cMenuWhatsOn::Update(void)
 {
   bool result = false;
-  if (Timers.Modified(timerState)) {
+  if (const cTimers *Timers = cTimers::GetTimersRead(timersStateKey)) {
      for (cOsdItem *item = First(); item; item = Next(item)) {
-         if (((cMenuScheduleItem *)item)->Update())
+         if (((cMenuScheduleItem *)item)->Update(Timers))
             result = true;
          }
+     timersStateKey.Remove();
      }
   return result;
 }
@@ -1487,7 +1646,8 @@ void cMenuWhatsOn::SetHelpKeys(void)
         NewHelpKeys |= 0x04; // "Next"
      else
         NewHelpKeys |= 0x08; // "Now"
-     if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
+     LOCK_CHANNELS_READ;
+     if (const cChannel *Channel = Channels->GetByChannelID(item->event->ChannelID(), true)) {
         if (Channel->Number() != cDevice::CurrentChannel()) {
            NewHelpKeys |= 0x10; // "Switch"
            canSwitch = true;
@@ -1512,8 +1672,13 @@ eOSState cMenuWhatsOn::Switch(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
-     cChannel *channel = Channels.GetByChannelID(item->event->ChannelID(), true);
-     if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
+     LOCK_CHANNELS_READ;
+     const cChannel *Channel = Channels->GetByChannelID(item->event->ChannelID(), true);
+     if (Channel) {
+        if (!cDevice::PrimaryDevice()->SwitchChannel(Channel, true))
+           Channel = NULL;
+        }
+     if (Channel)
         return osEnd;
      }
   Skins.Message(mtError, tr("Can't switch channel!"));
@@ -1522,33 +1687,38 @@ eOSState cMenuWhatsOn::Switch(void)
 
 eOSState cMenuWhatsOn::Record(void)
 {
-  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
-  if (item) {
-     if (item->timerMatch == tmFull) {
-        eTimerMatch tm = tmNone;
-        cTimer *timer = Timers.GetMatch(item->event, &tm);
-        if (timer)
-           return AddSubMenu(new cMenuEditTimer(timer));
-        }
-     cTimer *timer = new cTimer(item->event);
-     cTimer *t = Timers.GetTimer(timer);
-     if (t) {
-        delete timer;
-        timer = t;
-        return AddSubMenu(new cMenuEditTimer(timer));
-        }
-     else {
-        Timers.Add(timer);
-        Timers.SetModified();
-        isyslog("timer %s added (active)", *timer->ToDescr());
-        if (timer->Matches(0, false, NEWTIMERLIMIT))
-           return AddSubMenu(new cMenuEditTimer(timer));
-        if (HasSubMenu())
-           CloseSubMenu();
-        if (Update())
-           Display();
-        SetHelpKeys();
-        }
+  if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
+     {
+       LOCK_TIMERS_WRITE;
+       LOCK_SCHEDULES_READ;
+       Timers->SetExplicitModify();
+       if (item->timerMatch == tmFull) {
+          if (cTimer *Timer = Timers->GetMatch(item->event))
+             return AddSubMenu(new cMenuEditTimer(Timer));
+          }
+       cTimer *Timer = new cTimer(item->event);
+       if (*Setup.SVDRPDefaultHost)
+          Timer->SetRemote(Setup.SVDRPDefaultHost);
+       if (cTimer *t = Timers->GetTimer(Timer)) {
+          delete Timer;
+          Timer = t;
+          return AddSubMenu(new cMenuEditTimer(Timer));
+          }
+       if (Timer->Matches(0, false, NEWTIMERLIMIT))
+          return AddSubMenu(new cMenuEditTimer(Timer, true));
+       Timers->Add(Timer);
+       Timers->SetModified();
+       if (!HandleRemoteModifications(Timer)) {
+          // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
+          Timers->Del(Timer);
+          delete Timer;
+          }
+     }
+     if (HasSubMenu())
+        CloseSubMenu();
+     if (Update())
+        Display();
+     SetHelpKeys();
      }
   return osContinue;
 }
@@ -1576,8 +1746,11 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                         return Switch();
                      break;
        case kInfo:
-       case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
+       case kOk:     if (Count()) {
+                        LOCK_TIMERS_READ;
+                        LOCK_CHANNELS_READ;
+                        return AddSubMenu(new cMenuEvent(Timers, Channels, ((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
+                        }
                      break;
        default:      break;
        }
@@ -1595,19 +1768,20 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
 
 class cMenuSchedule : public cOsdMenu {
 private:
-  cSchedulesLock schedulesLock;
-  const cSchedules *schedules;
+  cStateKey timersStateKey;
+  cStateKey schedulesStateKey;
+  int scheduleState;
   bool now, next;
   bool canSwitch;
   int helpKeys;
-  int timerState;
+  void Set(const cChannel *Channel = NULL, bool Force = false);
   eOSState Number(void);
   eOSState Record(void);
   eOSState Switch(void);
-  void PrepareScheduleAllThis(const cEvent *Event, const cChannel *Channel);
-  void PrepareScheduleThisThis(const cEvent *Event, const cChannel *Channel);
-  void PrepareScheduleThisAll(const cEvent *Event, const cChannel *Channel);
-  void PrepareScheduleAllAll(const cEvent *Event, const cChannel *Channel);
+  bool PrepareScheduleAllThis(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel);
+  bool PrepareScheduleThisThis(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel);
+  bool PrepareScheduleThisAll(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel);
+  bool PrepareScheduleAllAll(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel);
   bool Update(void);
   void SetHelpKeys(void);
 public:
@@ -1620,19 +1794,13 @@ cMenuSchedule::cMenuSchedule(void)
 :cOsdMenu("")
 {
   SetMenuCategory(mcSchedule);
+  scheduleState = -1;
   now = next = false;
   canSwitch = false;
   helpKeys = 0;
-  timerState = 0;
-  Timers.Modified(timerState);
   cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
-  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-  if (channel) {
-     cMenuWhatsOn::SetCurrentChannel(channel->Number());
-     schedules = cSchedules::Schedules(schedulesLock);
-     PrepareScheduleAllThis(NULL, channel);
-     SetHelpKeys();
-     }
+  cMenuWhatsOn::SetCurrentChannel(cDevice::CurrentChannel());
+  Set(NULL, true);
 }
 
 cMenuSchedule::~cMenuSchedule()
@@ -1640,87 +1808,131 @@ cMenuSchedule::~cMenuSchedule()
   cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared
 }
 
-void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel *Channel)
+void cMenuSchedule::Set(const cChannel *Channel, bool Force)
 {
-  Clear();
-  SetCols(7, 6, 4);
-  SetTitle(cString::sprintf(tr("Schedule - %s"), Channel->Name()));
-  if (schedules && Channel) {
-     const cSchedule *Schedule = schedules->GetSchedule(Channel);
-     if (Schedule) {
+  if (Force) {
+     schedulesStateKey.Reset();
+     scheduleState = -1;
+     }
+  LOCK_TIMERS_READ;
+  LOCK_CHANNELS_READ;
+  if (const cSchedules *Schedules = cSchedules::GetSchedulesRead(schedulesStateKey)) {
+     cMenuScheduleItem *CurrentItem = (cMenuScheduleItem *)Get(Current());
+     const cEvent *Event = NULL;
+     if (!Channel) {
+        if (CurrentItem) {
+           Event = CurrentItem->event;
+           Channel = Channels->GetByChannelID(Event->ChannelID(), true);
+           }
+        else
+           Channel = Channels->GetByNumber(cDevice::CurrentChannel());
+        }
+     bool Refresh = false;
+     switch (cMenuScheduleItem::SortMode()) {
+       case cMenuScheduleItem::ssmAllThis:  Refresh = PrepareScheduleAllThis(Timers, Schedules, Event, Channel); break;
+       case cMenuScheduleItem::ssmThisThis: Refresh = PrepareScheduleThisThis(Timers, Schedules, Event, Channel); break;
+       case cMenuScheduleItem::ssmThisAll:  Refresh = Force && PrepareScheduleThisAll(Timers, Schedules, Event, Channel); break;
+       case cMenuScheduleItem::ssmAllAll:   Refresh = Force && PrepareScheduleAllAll(Timers, Schedules, Event, Channel); break;
+       default: esyslog("ERROR: unknown SortMode %d (%s %d)", cMenuScheduleItem::SortMode(), __FUNCTION__, __LINE__);
+       }
+     if (Refresh) {
+        CurrentItem = (cMenuScheduleItem *)Get(Current());
+        Sort();
+        SetCurrent(CurrentItem);
+        SetHelpKeys();
+        Display();
+        }
+     schedulesStateKey.Remove();
+     }
+}
+
+bool cMenuSchedule::PrepareScheduleAllThis(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel)
+{
+  if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+     if (Schedule->Modified(scheduleState)) {
+        Clear();
+        SetCols(7, 6, 4);
+        SetTitle(cString::sprintf(tr("Schedule - %s"), Channel->Name()));
         const cEvent *PresentEvent = Event ? Event : Schedule->GetPresentEvent();
         time_t now = time(NULL) - Setup.EPGLinger * 60;
         for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
             if (ev->EndTime() > now || ev == PresentEvent)
-               Add(new cMenuScheduleItem(ev), ev == PresentEvent);
+               Add(new cMenuScheduleItem(Timers, ev), ev == PresentEvent);
             }
+        return true;
         }
      }
+  return false;
 }
 
-void cMenuSchedule::PrepareScheduleThisThis(const cEvent *Event, const cChannel *Channel)
+bool cMenuSchedule::PrepareScheduleThisThis(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel)
 {
-  Clear();
-  SetCols(7, 6, 4);
-  SetTitle(cString::sprintf(tr("This event - %s"), Channel->Name()));
-  if (schedules && Channel && Event) {
-     const cSchedule *Schedule = schedules->GetSchedule(Channel);
-     if (Schedule) {
-        time_t now = time(NULL) - Setup.EPGLinger * 60;
-        for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
-            if ((ev->EndTime() > now || ev == Event) && !strcmp(ev->Title(), Event->Title()))
-               Add(new cMenuScheduleItem(ev), ev == Event);
-            }
+  if (Event) {
+     if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+        if (Schedule->Modified(scheduleState)) {
+           Clear();
+           SetCols(7, 6, 4);
+           SetTitle(cString::sprintf(tr("This event - %s"), Channel->Name()));
+           time_t now = time(NULL) - Setup.EPGLinger * 60;
+           for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
+               if ((ev->EndTime() > now || ev == Event) && !strcmp(ev->Title(), Event->Title()))
+                  Add(new cMenuScheduleItem(Timers, ev), ev == Event);
+               }
+           return true;
+           }
         }
      }
+  return false;
 }
 
-void cMenuSchedule::PrepareScheduleThisAll(const cEvent *Event, const cChannel *Channel)
+bool cMenuSchedule::PrepareScheduleThisAll(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel)
 {
   Clear();
   SetCols(CHNUMWIDTH, CHNAMWIDTH, 7, 6, 4);
   SetTitle(tr("This event - all channels"));
-  if (schedules && Event) {
-     for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
-         const cSchedule *Schedule = schedules->GetSchedule(ch);
-         if (Schedule) {
+  if (Event) {
+     LOCK_CHANNELS_READ;
+     for (const cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch)) {
+         if (const cSchedule *Schedule = Schedules->GetSchedule(ch)) {
             time_t now = time(NULL) - Setup.EPGLinger * 60;
             for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
                 if ((ev->EndTime() > now || ev == Event) && !strcmp(ev->Title(), Event->Title()))
-                   Add(new cMenuScheduleItem(ev, ch, true), ev == Event && ch == Channel);
+                   Add(new cMenuScheduleItem(Timers, ev, ch, true), ev == Event && ch == Channel);
                 }
             }
          }
      }
+  return true;
 }
 
-void cMenuSchedule::PrepareScheduleAllAll(const cEvent *Event, const cChannel *Channel)
+bool cMenuSchedule::PrepareScheduleAllAll(const cTimers *Timers, const cSchedules *Schedules, const cEvent *Event, const cChannel *Channel)
 {
   Clear();
   SetCols(CHNUMWIDTH, CHNAMWIDTH, 7, 6, 4);
   SetTitle(tr("All events - all channels"));
-  if (schedules) {
-     for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
-         const cSchedule *Schedule = schedules->GetSchedule(ch);
-         if (Schedule) {
-            time_t now = time(NULL) - Setup.EPGLinger * 60;
-            for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
-                if (ev->EndTime() > now || ev == Event)
-                   Add(new cMenuScheduleItem(ev, ch, true), ev == Event && ch == Channel);
-                }
-            }
+  LOCK_CHANNELS_READ;
+  cStateKey StateKey;
+  for (const cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch)) {
+      if (const cSchedule *Schedule = Schedules->GetSchedule(ch)) {
+         time_t now = time(NULL) - Setup.EPGLinger * 60;
+         for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) {
+             if (ev->EndTime() > now || ev == Event)
+                Add(new cMenuScheduleItem(Timers, ev, ch, true), ev == Event && ch == Channel);
+             }
          }
-     }
+      }
+  return true;
 }
 
 bool cMenuSchedule::Update(void)
 {
   bool result = false;
-  if (Timers.Modified(timerState)) {
+  if (const cTimers *Timers = cTimers::GetTimersRead(timersStateKey)) {
      for (cOsdItem *item = First(); item; item = Next(item)) {
-         if (((cMenuScheduleItem *)item)->Update())
+         if (((cMenuScheduleItem *)item)->Update(Timers))
             result = true;
          }
+     timersStateKey.Remove();
      }
   return result;
 }
@@ -1735,7 +1947,8 @@ void cMenuSchedule::SetHelpKeys(void)
         NewHelpKeys |= 0x02; // "Timer"
      else
         NewHelpKeys |= 0x01; // "Record"
-     if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
+     LOCK_CHANNELS_READ;
+     if (const cChannel *Channel = Channels->GetByChannelID(item->event->ChannelID(), true)) {
         if (Channel->Number() != cDevice::CurrentChannel()) {
            NewHelpKeys |= 0x10; // "Switch"
            canSwitch = true;
@@ -1752,58 +1965,44 @@ void cMenuSchedule::SetHelpKeys(void)
 eOSState cMenuSchedule::Number(void)
 {
   cMenuScheduleItem::IncSortMode();
-  cMenuScheduleItem *CurrentItem = (cMenuScheduleItem *)Get(Current());
-  const cChannel *Channel = NULL;
-  const cEvent *Event = NULL;
-  if (CurrentItem) {
-     Event = CurrentItem->event;
-     Channel = Channels.GetByChannelID(Event->ChannelID(), true);
-     }
-  else
-     Channel = Channels.GetByNumber(cDevice::CurrentChannel());
-  switch (cMenuScheduleItem::SortMode()) {
-    case cMenuScheduleItem::ssmAllThis:  PrepareScheduleAllThis(Event, Channel); break;
-    case cMenuScheduleItem::ssmThisThis: PrepareScheduleThisThis(Event, Channel); break;
-    case cMenuScheduleItem::ssmThisAll:  PrepareScheduleThisAll(Event, Channel); break;
-    case cMenuScheduleItem::ssmAllAll:   PrepareScheduleAllAll(Event, Channel); break;
-    default: esyslog("ERROR: unknown SortMode %d (%s %d)", cMenuScheduleItem::SortMode(), __FUNCTION__, __LINE__);
-    }
-  CurrentItem = (cMenuScheduleItem *)Get(Current());
-  Sort();
-  SetCurrent(CurrentItem);
-  Display();
+  Set(NULL, true);
   return osContinue;
 }
 
 eOSState cMenuSchedule::Record(void)
 {
-  cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
-  if (item) {
-     if (item->timerMatch == tmFull) {
-        eTimerMatch tm = tmNone;
-        cTimer *timer = Timers.GetMatch(item->event, &tm);
-        if (timer)
-           return AddSubMenu(new cMenuEditTimer(timer));
-        }
-     cTimer *timer = new cTimer(item->event);
-     cTimer *t = Timers.GetTimer(timer);
-     if (t) {
-        delete timer;
-        timer = t;
-        return AddSubMenu(new cMenuEditTimer(timer));
-        }
-     else {
-        Timers.Add(timer);
-        Timers.SetModified();
-        isyslog("timer %s added (active)", *timer->ToDescr());
-        if (timer->Matches(0, false, NEWTIMERLIMIT))
-           return AddSubMenu(new cMenuEditTimer(timer));
-        if (HasSubMenu())
-           CloseSubMenu();
-        if (Update())
-           Display();
-        SetHelpKeys();
-        }
+  if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
+     {
+       LOCK_TIMERS_WRITE;
+       LOCK_SCHEDULES_READ;
+       Timers->SetExplicitModify();
+       if (item->timerMatch == tmFull) {
+          if (cTimer *Timer = Timers->GetMatch(item->event))
+             return AddSubMenu(new cMenuEditTimer(Timer));
+          }
+       cTimer *Timer = new cTimer(item->event);
+       if (*Setup.SVDRPDefaultHost)
+          Timer->SetRemote(Setup.SVDRPDefaultHost);
+       if (cTimer *t = Timers->GetTimer(Timer)) {
+          delete Timer;
+          Timer = t;
+          return AddSubMenu(new cMenuEditTimer(Timer));
+          }
+       if (Timer->Matches(0, false, NEWTIMERLIMIT))
+          return AddSubMenu(new cMenuEditTimer(Timer, true));
+       Timers->Add(Timer);
+       Timers->SetModified();
+       if (!HandleRemoteModifications(Timer)) {
+          // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
+          Timers->Del(Timer);
+          delete Timer;
+          }
+     }
+     if (HasSubMenu())
+        CloseSubMenu();
+     if (Update())
+        Display();
+     SetHelpKeys();
      }
   return osContinue;
 }
@@ -1812,10 +2011,14 @@ eOSState cMenuSchedule::Switch(void)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   if (item) {
-     if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
-        if (Channels.SwitchTo(Channel->Number()))
-           return osEnd;
+     LOCK_CHANNELS_READ;
+     const cChannel *Channel = NULL;
+     if (Channel = Channels->GetByChannelID(item->event->ChannelID(), true)) {
+        if (!Channels->SwitchTo(Channel->Number()))
+           Channel = NULL;
         }
+     if (Channel)
+        return osEnd;
      }
   Skins.Message(mtError, tr("Can't switch channel!"));
   return osContinue;
@@ -1823,6 +2026,8 @@ eOSState cMenuSchedule::Switch(void)
 
 eOSState cMenuSchedule::ProcessKey(eKeys Key)
 {
+  if (!HasSubMenu())
+     Set(); // react on any changes to the schedules list
   bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
@@ -1831,43 +2036,50 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        case k0:      return Number();
        case kRecord:
        case kRed:    return Record();
-       case kGreen:  if (schedules) {
-                        if (!now && !next) {
-                           int ChannelNr = 0;
-                           if (Count()) {
-                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->event->ChannelID(), true);
-                              if (channel)
-                                 ChannelNr = channel->Number();
-                              }
-                           now = true;
-                           return AddSubMenu(new cMenuWhatsOn(schedules, true, ChannelNr));
-                           }
-                        now = !now;
-                        next = !next;
-                        return AddSubMenu(new cMenuWhatsOn(schedules, now, cMenuWhatsOn::CurrentChannel()));
-                        }
-       case kYellow: if (schedules)
-                        return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
-                     break;
+       case kGreen:  {
+                       LOCK_TIMERS_READ;
+                       LOCK_CHANNELS_READ;
+                       LOCK_SCHEDULES_READ;
+                       if (!now && !next) {
+                          int ChannelNr = 0;
+                          if (Count()) {
+                             if (const cChannel *Channel = Channels->GetByChannelID(((cMenuScheduleItem *)Get(Current()))->event->ChannelID(), true))
+                                ChannelNr = Channel->Number();
+                             }
+                          now = true;
+                          return AddSubMenu(new cMenuWhatsOn(Timers, Channels, Schedules, now, ChannelNr));
+                          }
+                       now = !now;
+                       next = !next;
+                       return AddSubMenu(new cMenuWhatsOn(Timers, Channels, Schedules, now, cMenuWhatsOn::CurrentChannel()));
+                     }
+       case kYellow: {
+                       LOCK_TIMERS_READ;
+                       LOCK_CHANNELS_READ;
+                       LOCK_SCHEDULES_READ;
+                       return AddSubMenu(new cMenuWhatsOn(Timers, Channels, Schedules, false, cMenuWhatsOn::CurrentChannel()));
+                     }
        case kBlue:   if (canSwitch)
                         return Switch();
                      break;
        case kInfo:
-       case kOk:     if (Count())
-                        return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
+       case kOk:     if (Count()) {
+                        LOCK_TIMERS_READ;
+                        LOCK_CHANNELS_READ;
+                        LOCK_SCHEDULES_READ;
+                        return AddSubMenu(new cMenuEvent(Timers, Channels, ((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
+                        }
                      break;
        default:      break;
        }
      }
   else if (!HasSubMenu()) {
      now = next = false;
-     const cEvent *ei = cMenuWhatsOn::ScheduleEvent();
-     if (ei) {
-        cChannel *channel = Channels.GetByChannelID(ei->ChannelID(), true);
-        if (channel) {
+     if (const cEvent *ei = cMenuWhatsOn::ScheduleEvent()) {
+        LOCK_CHANNELS_READ;
+        if (const cChannel *Channel = Channels->GetByChannelID(ei->ChannelID(), true)) {
            cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
-           PrepareScheduleAllThis(NULL, channel);
-           Display();
+           Set(Channel, true);
            }
         }
      else if (HadSubMenu && Update())
@@ -2219,7 +2431,10 @@ cMenuPathEdit::cMenuPathEdit(const char *Path)
   else
      s = path;
   strn0cpy(name, s, sizeof(name));
-  pathIsInUse = Recordings.PathIsInUse(path);
+  {
+    LOCK_RECORDINGS_READ;
+    pathIsInUse = Recordings->PathIsInUse(path);
+  }
   cOsdItem *p;
   Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
   p->SetSelectable(!pathIsInUse);
@@ -2258,14 +2473,17 @@ eOSState cMenuPathEdit::ApplyChanges(void)
   cString NewPath = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
   NewPath.CompactChars(FOLDERDELIMCHAR);
   if (strcmp(NewPath, path)) {
-     int NumRecordings = Recordings.GetNumRecordingsInPath(path);
+     LOCK_RECORDINGS_WRITE;
+     Recordings->SetExplicitModify();
+     int NumRecordings = Recordings->GetNumRecordingsInPath(path);
      if (NumRecordings > 1 && !Interface->Confirm(cString::sprintf(tr("Move entire folder containing %d recordings?"), NumRecordings)))
         return osContinue;
-     if (!Recordings.MoveRecordings(path, NewPath)) {
+     if (!Recordings->MoveRecordings(path, NewPath)) {
         Skins.Message(mtError, tr("Error while moving folder!"));
         return osContinue;
         }
      cMenuRecordings::SetPath(NewPath); // makes sure the Recordings menu will reposition to the new path
+     Recordings->SetModified();
      return osUser1;
      }
   return osBack;
@@ -2294,9 +2512,9 @@ eOSState cMenuPathEdit::ProcessKey(eKeys Key)
 
 class cMenuRecordingEdit : public cOsdMenu {
 private:
-  cRecording *recording;
+  const cRecording *recording;
   cString originalFileName;
-  int recordingsState;
+  cStateKey recordingsStateKey;
   char folder[PATH_MAX];
   char name[NAME_MAX];
   int priority;
@@ -2319,17 +2537,16 @@ class cMenuRecordingEdit : public cOsdMenu {
   eOSState DeleteMarks(void);
   eOSState ApplyChanges(void);
 public:
-  cMenuRecordingEdit(cRecording *Recording);
+  cMenuRecordingEdit(const cRecording *Recording);
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-cMenuRecordingEdit::cMenuRecordingEdit(cRecording *Recording)
+cMenuRecordingEdit::cMenuRecordingEdit(const cRecording *Recording)
 :cOsdMenu(tr("Edit recording"), 12)
 {
   SetMenuCategory(mcRecordingEdit);
   recording = Recording;
   originalFileName = recording->FileName();
-  Recordings.StateChanged(recordingsState); // just to get the current state
   strn0cpy(folder, recording->Folder(), sizeof(folder));
   strn0cpy(name, recording->BaseName(), sizeof(name));
   priority = recording->Priority();
@@ -2390,13 +2607,15 @@ void cMenuRecordingEdit::SetHelpKeys(void)
 
 bool cMenuRecordingEdit::RefreshRecording(void)
 {
-  if (Recordings.StateChanged(recordingsState)) {
-     if ((recording = Recordings.GetByName(originalFileName)) != NULL)
+  if (const cRecordings *Recordings = cRecordings::GetRecordingsRead(recordingsStateKey)) {
+     if ((recording = Recordings->GetByName(originalFileName)) != NULL)
         Set();
      else {
+        recordingsStateKey.Remove();
         Skins.Message(mtWarning, tr("Recording vanished!"));
         return false;
         }
+     recordingsStateKey.Remove();
      }
   return true;
 }
@@ -2453,7 +2672,7 @@ eOSState cMenuRecordingEdit::RemoveName(void)
 eOSState cMenuRecordingEdit::DeleteMarks(void)
 {
   if (buttonDeleteMarks && Interface->Confirm(tr("Delete editing marks for this recording?"))) {
-     if (recording->DeleteMarks())
+     if (cMarks::DeleteMarksFile(recording))
         SetHelpKeys();
      else
         Skins.Message(mtError, tr("Error while deleting editing marks!"));
@@ -2463,10 +2682,18 @@ eOSState cMenuRecordingEdit::DeleteMarks(void)
 
 eOSState cMenuRecordingEdit::ApplyChanges(void)
 {
+  cStateKey StateKey;
+  cRecordings *Recordings = cRecordings::GetRecordingsWrite(StateKey);
+  cRecording *Recording = Recordings->GetByName(recording->FileName());
+  if (!Recording) {
+     Skins.Message(mtWarning, tr("Recording vanished!"));
+     return osBack;
+     }
   bool Modified = false;
   if (priority != recording->Priority() || lifetime != recording->Lifetime()) {
-     if (!recording->ChangePriorityLifetime(priority, lifetime)) {
+     if (!Recording->ChangePriorityLifetime(priority, lifetime)) {
         Skins.Message(mtError, tr("Error while changing priority/lifetime!"));
+        StateKey.Remove(Modified);
         return osContinue;
         }
      Modified = true;
@@ -2477,17 +2704,21 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
      }
   cString NewName = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
   NewName.CompactChars(FOLDERDELIMCHAR);
-  if (strcmp(NewName, recording->Name())) {
-     if (!recording->ChangeName(NewName)) {
+  if (strcmp(NewName, Recording->Name())) {
+     if (!Recording->ChangeName(NewName)) {
         Skins.Message(mtError, tr("Error while changing folder/name!"));
+        StateKey.Remove(Modified);
         return osContinue;
         }
      Modified = true;
      }
   if (Modified) {
-     cMenuRecordings::SetRecording(recording->FileName()); // makes sure the Recordings menu will reposition to the renamed recording
+     cMenuRecordings::SetRecording(Recording->FileName()); // makes sure the Recordings menu will reposition to the renamed recording
+     Recordings->TouchUpdate();
+     StateKey.Remove(Modified);
      return osUser1;
      }
+  StateKey.Remove(Modified);
   return osBack;
 }
 
@@ -2517,24 +2748,23 @@ eOSState cMenuRecordingEdit::ProcessKey(eKeys Key)
 
 class cMenuRecording : public cOsdMenu {
 private:
-  cRecording *recording;
+  const cRecording *recording;
   cString originalFileName;
-  int recordingsState;
+  cStateKey recordingsStateKey;
   bool withButtons;
   bool RefreshRecording(void);
 public:
-  cMenuRecording(cRecording *Recording, bool WithButtons = false);
+  cMenuRecording(const cRecording *Recording, bool WithButtons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
 };
 
-cMenuRecording::cMenuRecording(cRecording *Recording, bool WithButtons)
+cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
 :cOsdMenu(tr("Recording info"))
 {
   SetMenuCategory(mcRecordingInfo);
   recording = Recording;
   originalFileName = recording->FileName();
-  Recordings.StateChanged(recordingsState); // just to get the current state
   withButtons = WithButtons;
   if (withButtons)
      SetHelp(tr("Button$Play"), tr("Button$Rewind"), NULL, tr("Button$Edit"));
@@ -2542,13 +2772,15 @@ cMenuRecording::cMenuRecording(cRecording *Recording, bool WithButtons)
 
 bool cMenuRecording::RefreshRecording(void)
 {
-  if (Recordings.StateChanged(recordingsState)) {
-     if ((recording = Recordings.GetByName(originalFileName)) != NULL)
+  if (const cRecordings *Recordings = cRecordings::GetRecordingsRead(recordingsStateKey)) {
+     if ((recording = Recordings->GetByName(originalFileName)) != NULL)
         Display();
      else {
+        recordingsStateKey.Remove();
         Skins.Message(mtWarning, tr("Recording vanished!"));
         return false;
         }
+     recordingsStateKey.Remove();
      }
   return true;
 }
@@ -2611,23 +2843,23 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
 
 class cMenuRecordingItem : public cOsdItem {
 private:
-  cRecording *recording;
+  const cRecording *recording;
   int level;
   char *name;
   int totalEntries, newEntries;
 public:
-  cMenuRecordingItem(cRecording *Recording, int Level);
+  cMenuRecordingItem(const cRecording *Recording, int Level);
   ~cMenuRecordingItem();
   void IncrementCounter(bool New);
   const char *Name(void) { return name; }
   int Level(void) { return level; }
-  cRecording *Recording(void) { return recording; }
+  const cRecording *Recording(void) { return recording; }
   bool IsDirectory(void) { return name != NULL; }
-  void SetRecording(cRecording *Recording) { recording = Recording; }
+  void SetRecording(const cRecording *Recording) { recording = Recording; }
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
 
-cMenuRecordingItem::cMenuRecordingItem(cRecording *Recording, int Level)
+cMenuRecordingItem::cMenuRecordingItem(const cRecording *Recording, int Level)
 {
   recording = Recording;
   level = Level;
@@ -2669,7 +2901,6 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus,
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
   filter = Filter;
-  Recordings.StateChanged(recordingsState); // just to get the current state
   helpKeys = -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   Set();
@@ -2717,50 +2948,54 @@ void cMenuRecordings::SetHelpKeys(void)
 
 void cMenuRecordings::Set(bool Refresh)
 {
-  const char *CurrentRecording = *fileName ? *fileName : cReplayControl::LastReplayed();
-  cMenuRecordingItem *LastItem = NULL;
-  cThreadLock RecordingsLock(&Recordings);
-  if (Refresh) {
-     if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
-        CurrentRecording = ri->Recording()->FileName();
-     }
-  Clear();
-  GetRecordingsSortMode(DirectoryName());
-  Recordings.Sort();
-  for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
-      if ((!filter || filter->Filter(recording)) && (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR))) {
-         cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-         cMenuRecordingItem *LastDir = NULL;
-         if (Item->IsDirectory()) {
-            // Sorting may ignore non-alphanumeric characters, so we need to explicitly handle directories in case they only differ in such characters:
-            for (cMenuRecordingItem *p = LastItem; p; p = dynamic_cast<cMenuRecordingItem *>(p->Prev())) {
-                if (p->Name() && strcmp(p->Name(), Item->Name()) == 0) {
-                   LastDir = p;
-                   break;
+  if (cRecordings::GetRecordingsRead(recordingsStateKey)) {
+     recordingsStateKey.Remove();
+     const char *CurrentRecording = *fileName ? *fileName : cReplayControl::LastReplayed();
+     cRecordings *Recordings = cRecordings::GetRecordingsWrite(recordingsStateKey); // write access is necessary for sorting!
+     cMenuRecordingItem *LastItem = NULL;
+     if (Refresh) {
+        if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
+           CurrentRecording = ri->Recording()->FileName();
+        }
+     Clear();
+     GetRecordingsSortMode(DirectoryName());
+     Recordings->Sort();
+     for (const cRecording *Recording = Recordings->First(); Recording; Recording = Recordings->Next(Recording)) {
+         if ((!filter || filter->Filter(Recording)) && (!base || (strstr(Recording->Name(), base) == Recording->Name() && Recording->Name()[strlen(base)] == FOLDERDELIMCHAR))) {
+            cMenuRecordingItem *Item = new cMenuRecordingItem(Recording, level);
+            cMenuRecordingItem *LastDir = NULL;
+            if (Item->IsDirectory()) {
+               // Sorting may ignore non-alphanumeric characters, so we need to explicitly handle directories in case they only differ in such characters:
+               for (cMenuRecordingItem *p = LastItem; p; p = dynamic_cast<cMenuRecordingItem *>(p->Prev())) {
+                   if (p->Name() && strcmp(p->Name(), Item->Name()) == 0) {
+                      LastDir = p;
+                      break;
+                      }
                    }
-                }
-            }
-         if (*Item->Text() && !LastDir) {
-            Add(Item);
-            LastItem = Item;
-            if (Item->IsDirectory())
-               LastDir = Item;
-            }
-         else
-            delete Item;
-         if (LastItem || LastDir) {
-            if (*path) {
-               if (strcmp(path, recording->Folder()) == 0)
+               }
+            if (*Item->Text() && !LastDir) {
+               Add(Item);
+               LastItem = Item;
+               if (Item->IsDirectory())
+                  LastDir = Item;
+               }
+            else
+               delete Item;
+            if (LastItem || LastDir) {
+               if (*path) {
+                  if (strcmp(path, Recording->Folder()) == 0)
+                     SetCurrent(LastDir ? LastDir : LastItem);
+                  }
+               else if (CurrentRecording && strcmp(CurrentRecording, Recording->FileName()) == 0)
                   SetCurrent(LastDir ? LastDir : LastItem);
                }
-            else if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
-               SetCurrent(LastDir ? LastDir : LastItem);
+            if (LastDir)
+               LastDir->IncrementCounter(Recording->IsNew());
             }
-         if (LastDir)
-            LastDir->IncrementCounter(recording->IsNew());
          }
-      }
-  SetMenuSortMode(RecordingsSortMode == rsmName ? msmName : msmTime);
+     SetMenuSortMode(RecordingsSortMode == rsmName ? msmName : msmTime);
+     recordingsStateKey.Remove(false); // sorting doesn't count as a real modification
+     }
   if (Refresh)
      Display();
 }
@@ -2837,50 +3072,60 @@ eOSState cMenuRecordings::Delete(void)
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
   if (ri && !ri->IsDirectory()) {
      if (Interface->Confirm(tr("Delete recording?"))) {
-        cRecordControl *rc = cRecordControls::GetRecordControl(ri->Recording()->FileName());
-        if (rc) {
+        if (cRecordControl *rc = cRecordControls::GetRecordControl(ri->Recording()->FileName())) {
            if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
-              cTimer *timer = rc->Timer();
-              if (timer) {
-                 timer->Skip();
-                 cRecordControls::Process(time(NULL));
-                 if (timer->IsSingleEvent()) {
-                    isyslog("deleting timer %s", *timer->ToDescr());
-                    Timers.Del(timer);
+              if (cTimer *Timer = rc->Timer()) {
+                 LOCK_TIMERS_WRITE;
+                 Timer->Skip();
+                 cRecordControls::Process(Timers, time(NULL));
+                 if (Timer->IsSingleEvent()) {
+                    Timers->Del(Timer);
+                    isyslog("deleted timer %s", *Timer->ToDescr());
                     }
-                 Timers.SetModified();
                  }
               }
            else
               return osContinue;
            }
-        cRecording *recording = ri->Recording();
-        cString FileName = recording->FileName();
+        cRecordings *Recordings = cRecordings::GetRecordingsWrite(recordingsStateKey);
+        Recordings->SetExplicitModify();
+        cRecording *Recording = Recordings->GetByName(ri->Recording()->FileName());
+        if (!Recording) {
+           Skins.Message(mtWarning, tr("Recording vanished!"));
+           recordingsStateKey.Remove();
+           return osContinue;
+           }
+        cString FileName = Recording->FileName();
         if (RecordingsHandler.GetUsage(FileName)) {
            if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
               RecordingsHandler.Del(FileName);
-              recording = Recordings.GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version
-              // we continue with the code below even if recording is NULL,
+              Recording = Recordings->GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version
+              // we continue with the code below even if Recording is NULL,
               // in order to have the menu updated etc.
               }
-           else
+           else {
+              recordingsStateKey.Remove();
               return osContinue;
+              }
            }
         if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), FileName) == 0)
            cControl::Shutdown();
-        if (!recording || recording->Delete()) {
+        if (!Recording || Recording->Delete()) {
            cReplayControl::ClearLastReplayed(FileName);
-           Recordings.DelByName(FileName);
+           Recordings->DelByName(FileName);
            cOsdMenu::Del(Current());
            SetHelpKeys();
            cVideoDiskUsage::ForceCheck();
            Display();
+           Recordings->SetModified();
+           recordingsStateKey.Remove();
            if (!Count())
               return osBack;
            return osUser2;
            }
         else
            Skins.Message(mtError, tr("Error while deleting recording!"));
+        recordingsStateKey.Remove();
         }
      }
   return osContinue;
@@ -2919,12 +3164,15 @@ eOSState cMenuRecordings::Sort(void)
   if (HasSubMenu())
      return osContinue;
   IncRecordingsSortMode(DirectoryName());
+  recordingsStateKey.Reset();
   Set(true);
   return osContinue;
 }
 
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
+  if (!HasSubMenu())
+     Set(); // react on any changes to the recordings list
   bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
@@ -2940,9 +3188,6 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        case kBlue:   return Info();
        case k0:      return Sort();
        case k1...k9: return Commands(Key);
-       case kNone:   if (Recordings.StateChanged(recordingsState))
-                        Set(true);
-                     break;
        default: break;
        }
      }
@@ -3006,6 +3251,7 @@ void cMenuSetupBase::Store(void)
 class cMenuSetupOSD : public cMenuSetupBase {
 private:
   const char *useSmallFontTexts[3];
+  const char *recSortModeTexts[2];
   const char *keyColorTexts[4];
   int osdLanguageIndex;
   int numSkins;
@@ -3058,6 +3304,8 @@ void cMenuSetupOSD::Set(void)
   useSmallFontTexts[0] = tr("never");
   useSmallFontTexts[1] = tr("skin dependent");
   useSmallFontTexts[2] = tr("always");
+  recSortModeTexts[0] = tr("by name");
+  recSortModeTexts[1] = tr("by time");
   keyColorTexts[0] = tr("Key$Red");
   keyColorTexts[1] = tr("Key$Green");
   keyColorTexts[2] = tr("Key$Yellow");
@@ -3091,6 +3339,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Always sort folders first"), &data.AlwaysSortFoldersFirst));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Default sort mode for recordings"), &data.DefaultSortModeRec, 2, recSortModeTexts));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"),            &data.ColorKey0, 4, keyColorTexts));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"),            &data.ColorKey1, 4, keyColorTexts));
@@ -3132,8 +3381,10 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         ModifiedAppearance = true;
      if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
         ModifiedAppearance = true;
-     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst || data.RecordingDirs != Setup.RecordingDirs)
-        Recordings.ClearSortNames();
+     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst || data.RecordingDirs != Setup.RecordingDirs) {
+        LOCK_RECORDINGS_WRITE;
+        Recordings->ClearSortNames();
+        }
      }
 
   int oldSkinIndex = skinIndex;
@@ -3507,6 +3758,7 @@ cMenuSetupCAMItem::cMenuSetupCAMItem(cCamSlot *CamSlot)
 
 bool cMenuSetupCAMItem::Changed(void)
 {
+  cString AssignedDevice("");
   const char *Activating = "";
   const char *CamName = camSlot->GetCamName();
   if (!CamName) {
@@ -3520,7 +3772,9 @@ bool cMenuSetupCAMItem::Changed(void)
   else if (camSlot->IsActivating())
      // TRANSLATORS: note the leading blank!
      Activating = tr(" (activating)");
-  cString buffer = cString::sprintf(" %d %s%s", camSlot->SlotNumber(), CamName, Activating);
+  if (cDevice *Device = camSlot->Device())
+     AssignedDevice = cString::sprintf(" %s %d", tr("@ device"), Device->CardIndex() + 1);
+  cString buffer = cString::sprintf(" %d %s%s%s", camSlot->SlotNumber(), CamName, *AssignedDevice, Activating);
   if (strcmp(buffer, Text()) != 0) {
      SetText(buffer);
      return true;
@@ -3607,7 +3861,8 @@ eOSState cMenuSetupCAM::Activate(void)
         CamSlot->CancelActivation();
      else if (CamSlot->CanActivate()) {
         if (CamSlot->Priority() < LIVEPRIORITY) { // don't interrupt recordings
-           if (cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel())) {
+           LOCK_CHANNELS_READ;
+           if (const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel())) {
               for (int i = 0; i < cDevice::NumDevices(); i++) {
                   if (cDevice *Device = cDevice::GetDevice(i)) {
                      if (Device->ProvidesChannel(Channel)) {
@@ -3672,6 +3927,7 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
 
 class cMenuSetupRecord : public cMenuSetupBase {
 private:
+  const char *recordKeyHandlingTexts[3];
   const char *pauseKeyHandlingTexts[3];
   const char *delTimeshiftRecTexts[3];
 public:
@@ -3681,6 +3937,9 @@ class cMenuSetupRecord : public cMenuSetupBase {
 cMenuSetupRecord::cMenuSetupRecord(void)
 {
   SetMenuCategory(mcSetupRecord);
+  recordKeyHandlingTexts[0] = tr("no instant recording");
+  recordKeyHandlingTexts[1] = tr("confirm instant recording");
+  recordKeyHandlingTexts[2] = tr("record instantly");
   pauseKeyHandlingTexts[0] = tr("do not pause live video");
   pauseKeyHandlingTexts[1] = tr("confirm pause live video");
   pauseKeyHandlingTexts[2] = tr("pause live video");
@@ -3692,6 +3951,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"),      &data.MarginStop));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"),          &data.DefaultPriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"),      &data.DefaultLifetime, 0, MAXLIFETIME));
+  Add(new cMenuEditStraItem(tr("Setup.Recording$Record key handling"),       &data.RecordKeyHandling, 3, recordKeyHandlingTexts));
   Add(new cMenuEditStraItem(tr("Setup.Recording$Pause key handling"),        &data.PauseKeyHandling, 3, pauseKeyHandlingTexts));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Pause priority"),            &data.PausePriority, 0, MAXPRIORITY));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Pause lifetime (d)"),        &data.PauseLifetime, 0, MAXLIFETIME));
@@ -3738,25 +3998,47 @@ cMenuSetupReplay::cMenuSetupReplay(void)
 
 void cMenuSetupReplay::Store(void)
 {
-  if (Setup.ResumeID != data.ResumeID)
-     Recordings.ResetResume();
+  if (Setup.ResumeID != data.ResumeID) {
+     LOCK_RECORDINGS_WRITE;
+     Recordings->ResetResume();
+     }
   cMenuSetupBase::Store();
 }
 
 // --- cMenuSetupMisc --------------------------------------------------------
 
 class cMenuSetupMisc : public cMenuSetupBase {
+private:
+  cStringList svdrpServerNames;
+  void Set(void);
 public:
   cMenuSetupMisc(void);
+  virtual eOSState ProcessKey(eKeys Key);
   };
 
 cMenuSetupMisc::cMenuSetupMisc(void)
 {
   SetMenuCategory(mcSetupMisc);
   SetSection(tr("Miscellaneous"));
+  Set();
+}
+
+void cMenuSetupMisc::Set(void)
+{
+  int current = Current();
+  Clear();
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
+  Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$SVDRP peering"),              &data.SVDRPPeering));
+  if (data.SVDRPPeering) {
+     Add(new cMenuEditStrItem( tr("Setup.Miscellaneous$SVDRP host name"), data.SVDRPHostName, sizeof(data.SVDRPHostName)));
+     if (GetSVDRPServerNames(&svdrpServerNames)) {
+        svdrpServerNames.Sort(true);
+        svdrpServerNames.Insert(strdup(""));
+        Add(new cMenuEditStrlItem(tr("Setup.Miscellaneous$SVDRP default host"), data.SVDRPDefaultHost, sizeof(data.SVDRPDefaultHost), &svdrpServerNames));
+        }
+     }
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"),            &data.ZapTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Remote control repeat delay (ms)"), &data.RcRepeatDelay, 0));
@@ -3768,6 +4050,33 @@ cMenuSetupMisc::cMenuSetupMisc(void)
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"),              &data.ChannelsWrap));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Show channel names with source"), &data.ShowChannelNamesWithSource));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"),             &data.EmergencyExit));
+  SetCurrent(Get(current));
+  Display();
+}
+
+eOSState cMenuSetupMisc::ProcessKey(eKeys Key)
+{
+  bool OldSVDRPPeering = data.SVDRPPeering;
+  bool ModifiedSVDRPSettings = false;
+  if (Key == kOk)
+     ModifiedSVDRPSettings = data.SVDRPPeering != Setup.SVDRPPeering | strcmp(data.SVDRPHostName, Setup.SVDRPHostName);
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+  if (data.SVDRPPeering != OldSVDRPPeering)
+     Set();
+  if (ModifiedSVDRPSettings) {
+     StopSVDRPClientHandler();
+     StopSVDRPServerHandler();
+     StartSVDRPServerHandler();
+     if (data.SVDRPPeering)
+        StartSVDRPClientHandler();
+     else {
+        LOCK_TIMERS_WRITE;
+        Timers->SetExplicitModify();
+        if (Timers->DelRemoteTimers())
+           Timers->SetModified();
+        }
+     }
+  return state;
 }
 
 // --- cMenuSetupPluginItem --------------------------------------------------
@@ -4018,7 +4327,7 @@ bool cMenuMain::Update(bool Force)
         stopReplayItem = NULL;
         }
      // Color buttons:
-     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying || !Setup.PauseKeyHandling ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
+     SetHelp(!replaying && Setup.RecordKeyHandling ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying || !Setup.PauseKeyHandling ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
      result = true;
      }
 
@@ -4071,8 +4380,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     case osSetup:      return AddSubMenu(new cMenuSetup);
     case osCommands:   return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands));
     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
-                          cOsdItem *item = Get(Current());
-                          if (item) {
+                          if (cOsdItem *item = Get(Current())) {
                              cRecordControls::Stop(item->Text() + strlen(tr(STOP_RECORDING)));
                              return osEnd;
                              }
@@ -4105,7 +4413,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
     default: switch (Key) {
                case kRecord:
                case kRed:    if (!HadSubMenu)
-                                state = replaying ? osContinue : osRecord;
+                                state = replaying || !Setup.RecordKeyHandling ? osContinue : osRecord;
                              break;
                case kGreen:  if (!HadSubMenu) {
                                 cRemote::Put(kAudio, true);
@@ -4139,25 +4447,20 @@ static void SetTrackDescriptions(int LiveChannel)
 {
   cDevice::PrimaryDevice()->ClrAvailableTracks(true);
   const cComponents *Components = NULL;
-  cSchedulesLock SchedulesLock;
   if (LiveChannel) {
-     cChannel *Channel = Channels.GetByNumber(LiveChannel);
-     if (Channel) {
-        const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-        if (Schedules) {
-           const cSchedule *Schedule = Schedules->GetSchedule(Channel);
-           if (Schedule) {
-              const cEvent *Present = Schedule->GetPresentEvent();
-              if (Present)
-                 Components = Present->Components();
-              }
+     LOCK_CHANNELS_READ;
+     if (const cChannel *Channel = Channels->GetByNumber(LiveChannel)) {
+        LOCK_SCHEDULES_READ;
+        if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+           const cEvent *Present = Schedule->GetPresentEvent();
+           if (Present)
+              Components = Present->Components();
            }
         }
      }
   else if (cReplayControl::NowReplaying()) {
-     cThreadLock RecordingsLock(&Recordings);
-     cRecording *Recording = Recordings.GetByName(cReplayControl::NowReplaying());
-     if (Recording)
+     LOCK_RECORDINGS_READ;
+     if (const cRecording *Recording = Recordings->GetByName(cReplayControl::NowReplaying()))
         Components = Recording->Info()->Components();
      }
   if (Components) {
@@ -4197,7 +4500,9 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   timeout = Switched || Setup.TimeoutRequChInfo;
   cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
   positioner = NULL;
-  channel = Channels.GetByNumber(Number);
+  channel = NULL;
+  LOCK_CHANNELS_READ;
+  channel = Channels->GetByNumber(Number);
   lastPresent = lastFollowing = NULL;
   if (channel) {
      DisplayChannel();
@@ -4219,7 +4524,9 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   withInfo = Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
   positioner = NULL;
-  channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  channel = NULL;
+  LOCK_CHANNELS_READ;
+  channel = Channels->GetByNumber(cDevice::CurrentChannel());
   ProcessKey(FirstKey);
 }
 
@@ -4240,20 +4547,16 @@ void cDisplayChannel::DisplayChannel(void)
 void cDisplayChannel::DisplayInfo(void)
 {
   if (withInfo && channel) {
-     cSchedulesLock SchedulesLock;
-     const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-     if (Schedules) {
-        const cSchedule *Schedule = Schedules->GetSchedule(channel);
-        if (Schedule) {
-           const cEvent *Present = Schedule->GetPresentEvent();
-           const cEvent *Following = Schedule->GetFollowingEvent();
-           if (Present != lastPresent || Following != lastFollowing) {
-              SetTrackDescriptions(channel->Number());
-              displayChannel->SetEvents(Present, Following);
-              cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
-              lastPresent = Present;
-              lastFollowing = Following;
-              }
+     LOCK_SCHEDULES_READ;
+     if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
+        const cEvent *Present = Schedule->GetPresentEvent();
+        const cEvent *Following = Schedule->GetFollowingEvent();
+        if (Present != lastPresent || Following != lastFollowing) {
+           SetTrackDescriptions(channel->Number());
+           displayChannel->SetEvents(Present, Following);
+           cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
+           lastPresent = Present;
+           lastFollowing = Following;
            }
         }
      }
@@ -4265,13 +4568,14 @@ void cDisplayChannel::Refresh(void)
   displayChannel->SetEvents(NULL, NULL);
 }
 
-cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction)
+const cChannel *cDisplayChannel::NextAvailableChannel(const cChannel *Channel, int Direction)
 {
   if (Direction) {
+     LOCK_CHANNELS_READ;
      while (Channel) {
-           Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
+           Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel);
            if (!Channel && Setup.ChannelsWrap)
-              Channel = Direction > 0 ? Channels.First() : Channels.Last();
+              Channel = Direction > 0 ? Channels->First() : Channels->Last();
            if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, LIVEPRIORITY, true, true))
               return Channel;
            }
@@ -4285,7 +4589,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
      delete displayChannel;
      displayChannel = Skins.Current()->DisplayChannel(withInfo);
      }
-  cChannel *NewChannel = NULL;
+  const cChannel *NewChannel = NULL;
   if (Key != kNone)
      lastTime.Set();
   switch (int(Key)) {
@@ -4298,18 +4602,19 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case k1 ... k9:
          group = -1;
          if (number >= 0) {
-            if (number > Channels.MaxNumber())
+            if (number > cChannels::MaxNumber())
                number = Key - k0;
             else
                number = number * 10 + Key - k0;
-            channel = Channels.GetByNumber(number);
+            LOCK_CHANNELS_READ
+            channel = Channels->GetByNumber(number);
             Refresh();
             withInfo = false;
             // Lets see if there can be any useful further input:
             int n = channel ? number * 10 : 0;
             int m = 10;
-            cChannel *ch = channel;
-            while (ch && (ch = Channels.Next(ch)) != NULL) {
+            const cChannel *ch = channel;
+            while (ch && (ch = Channels->Next(ch)) != NULL) {
                   if (!ch->GroupSep()) {
                      if (n <= ch->Number() && ch->Number() < n + m) {
                         n = 0;
@@ -4337,23 +4642,23 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kNext|k_Repeat:
     case kNext:
     case kPrev|k_Repeat:
-    case kPrev:
+    case kPrev: {
          withInfo = false;
          number = 0;
+         LOCK_CHANNELS_READ;
          if (group < 0) {
-            cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-            if (channel)
-               group = channel->Index();
+            if (const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel()))
+               group = Channel->Index();
             }
          if (group >= 0) {
             int SaveGroup = group;
             if (NORMALKEY(Key) == kRight || NORMALKEY(Key) == kNext)
-               group = Channels.GetNextGroup(group) ;
+               group = Channels->GetNextGroup(group) ;
             else
-               group = Channels.GetPrevGroup(group < 1 ? 1 : group);
+               group = Channels->GetPrevGroup(group < 1 ? 1 : group);
             if (group < 0)
                group = SaveGroup;
-            channel = Channels.Get(group);
+            channel = Channels->Get(group);
             if (channel) {
                Refresh();
                if (!channel->GroupSep())
@@ -4361,6 +4666,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                }
             }
          break;
+         }
     case kUp|k_Repeat:
     case kUp:
     case kDown|k_Repeat:
@@ -4370,9 +4676,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     case kChanDn|k_Repeat:
     case kChanDn: {
          eKeys k = NORMALKEY(Key);
-         cChannel *ch = NextAvailableChannel(channel, (k == kUp || k == kChanUp) ? 1 : -1);
-         if (ch)
-            channel = ch;
+         if (const cChannel *Channel = NextAvailableChannel(channel, (k == kUp || k == kChanUp) ? 1 : -1))
+            channel = Channel;
          else if (channel && channel->Number() != cDevice::CurrentChannel())
             Key = k; // immediately switches channel when hitting the beginning/end of the channel list with k_Repeat
          }
@@ -4392,7 +4697,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
          break;
     case kNone:
          if (number && Setup.ChannelEntryTimeout && int(lastTime.Elapsed()) > Setup.ChannelEntryTimeout) {
-            channel = Channels.GetByNumber(number);
+            LOCK_CHANNELS_READ;
+            channel = Channels->GetByNumber(number);
             if (channel)
                NewChannel = channel;
             withInfo = true;
@@ -4404,9 +4710,10 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
     //TODO
     //XXX case kGreen:  return osEventNow;
     //XXX case kYellow: return osEventNext;
-    case kOk:
+    case kOk: {
+         LOCK_CHANNELS_READ;
          if (group >= 0) {
-            channel = Channels.Get(Channels.GetNextNormal(group));
+            channel = Channels->Get(Channels->GetNextNormal(group));
             if (channel)
                NewChannel = channel;
             withInfo = true;
@@ -4414,15 +4721,17 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             Refresh();
             }
          else if (number > 0) {
-            channel = Channels.GetByNumber(number);
+            channel = Channels->GetByNumber(number);
             if (channel)
                NewChannel = channel;
             withInfo = true;
             number = 0;
             Refresh();
             }
-         else
+         else {
             return osEnd;
+            }
+         }
          break;
     default:
          if ((Key & (k_Repeat | k_Release)) == 0) {
@@ -4431,16 +4740,17 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             }
     };
   if (positioner || !timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
+     LOCK_CHANNELS_READ;
      if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
         // makes sure a channel switch through the SVDRP CHAN command is displayed
-        channel = Channels.GetByNumber(cDevice::CurrentChannel());
+        channel = Channels->GetByNumber(cDevice::CurrentChannel());
         Refresh();
         lastTime.Set();
         }
      DisplayInfo();
      if (NewChannel) {
         SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
-        Channels.SwitchTo(NewChannel->Number());
+        Channels->SwitchTo(NewChannel->Number());
         SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
         channel = NewChannel;
         }
@@ -4751,14 +5061,13 @@ eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
 
 // --- cRecordControl --------------------------------------------------------
 
-cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
+cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause)
 {
   // Whatever happens here, the timers will be modified in some way...
-  Timers.SetModified();
-  // We're going to manipulate an event here, so we need to prevent
+  Timers->SetModified();
+  // We're going to work with an event here, so we need to prevent
   // others from modifying any EPG data:
-  cSchedulesLock SchedulesLock;
-  cSchedules::Schedules(SchedulesLock);
+  LOCK_SCHEDULES_READ;
 
   event = NULL;
   fileName = NULL;
@@ -4768,7 +5077,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   timer = Timer;
   if (!timer) {
      timer = new cTimer(true, Pause);
-     Timers.Add(timer);
+     Timers->Add(timer);
      instantId = cString::sprintf(cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
      }
   timer->SetPending(true);
@@ -4789,7 +5098,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         timer->OnOff();
         }
      else {
-        Timers.Del(timer);
+        Timers->Del(timer);
         if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
         }
@@ -4807,21 +5116,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
-        Recordings.AddByName(fileName);
-        if (Timer && !Timer->IsSingleEvent()) {
-           char *Directory = strdup(fileName);
-           // going up two directory levels to get the series folder
-           if (char *p = strrchr(Directory, '/')) {
-              while (p > Directory && *--p != '/')
-                    ;
-              *p = 0;
-              if (!HasRecordingsSortMode(Directory)) {
-                 dsyslog("setting %s to be sorted by time", Directory);
-                 SetRecordingsSortMode(Directory, rsmTime);
-                 }
-              }
-           free(Directory);
-           }
+        LOCK_RECORDINGS_WRITE;
+        Recordings->AddByName(fileName);
         return;
         }
      else
@@ -4830,7 +5126,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
   else
      timer->SetDeferred(DEFERTIMER);
   if (!Timer) {
-     Timers.Del(timer);
+     Timers->Del(timer);
      timer = NULL;
      }
 }
@@ -4845,21 +5141,17 @@ cRecordControl::~cRecordControl()
 
 bool cRecordControl::GetEvent(void)
 {
-  const cChannel *channel = timer->Channel();
+  const cChannel *Channel = timer->Channel();
   time_t Time = timer->HasFlags(tfInstant) ? timer->StartTime() + INSTANT_REC_EPG_LOOKAHEAD : timer->StartTime() + (timer->StopTime() - timer->StartTime()) / 2;
   for (int seconds = 0; seconds <= MAXWAIT4EPGINFO; seconds++) {
       {
-        cSchedulesLock SchedulesLock;
-        const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-        if (Schedules) {
-           const cSchedule *Schedule = Schedules->GetSchedule(channel);
-           if (Schedule) {
-              event = Schedule->GetEventAround(Time);
-              if (event) {
-                 if (seconds > 0)
-                    dsyslog("got EPG info after %d seconds", seconds);
-                 return true;
-                 }
+        LOCK_SCHEDULES_READ;
+        if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+           event = Schedule->GetEventAround(Time);
+           if (event) {
+              if (seconds > 0)
+                 dsyslog("got EPG info after %d seconds", seconds);
+              return true;
               }
            }
       }
@@ -4880,7 +5172,6 @@ void cRecordControl::Stop(bool ExecuteUserCommand)
      cStatus::MsgRecording(device, NULL, fileName, false);
      if (ExecuteUserCommand)
         cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
-     Timers.SetModified();
      }
 }
 
@@ -4900,7 +5191,7 @@ bool cRecordControl::Process(time_t t)
 cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL };
 int cRecordControls::state = 0;
 
-bool cRecordControls::Start(cTimer *Timer, bool Pause)
+bool cRecordControls::Start(cTimers *Timers, cTimer *Timer, bool Pause)
 {
   static time_t LastNoDiskSpaceMessage = 0;
   int FreeMB = 0;
@@ -4920,29 +5211,28 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
   LastNoDiskSpaceMessage = 0;
 
   ChangeState();
+  LOCK_CHANNELS_READ;
   int ch = Timer ? Timer->Channel()->Number() : cDevice::CurrentChannel();
-  cChannel *channel = Channels.GetByNumber(ch);
-
-  if (channel) {
+  if (const cChannel *Channel = Channels->GetByNumber(ch)) {
      int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority;
-     cDevice *device = cDevice::GetDevice(channel, Priority, false);
+     cDevice *device = cDevice::GetDevice(Channel, Priority, false);
      if (device) {
-        dsyslog("switching device %d to channel %d (%s)", device->DeviceNumber() + 1, channel->Number(), channel->Name());
-        if (!device->SwitchChannel(channel, false)) {
+        dsyslog("switching device %d to channel %d (%s)", device->DeviceNumber() + 1, Channel->Number(), Channel->Name());
+        if (!device->SwitchChannel(Channel, false)) {
            ShutdownHandler.RequestEmergencyExit();
            return false;
            }
         if (!Timer || Timer->Matches()) {
            for (int i = 0; i < MAXRECORDCONTROLS; i++) {
                if (!RecordControls[i]) {
-                  RecordControls[i] = new cRecordControl(device, Timer, Pause);
+                  RecordControls[i] = new cRecordControl(device, Timers, Timer, Pause);
                   return RecordControls[i]->Process(time(NULL));
                   }
                }
            }
         }
      else if (!Timer || !Timer->Pending()) {
-        isyslog("no free DVB device to record channel %d (%s)!", ch, channel->Name());
+        isyslog("no free DVB device to record channel %d (%s)!", ch, Channel->Name());
         Skins.Message(mtError, tr("No free DVB device to record!"));
         }
      }
@@ -4951,19 +5241,25 @@ bool cRecordControls::Start(cTimer *Timer, bool Pause)
   return false;
 }
 
+bool cRecordControls::Start(bool Pause)
+{
+  LOCK_TIMERS_WRITE;
+  return Start(Timers, NULL, Pause);
+}
+
 void cRecordControls::Stop(const char *InstantId)
 {
+  LOCK_TIMERS_WRITE;
   ChangeState();
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          const char *id = RecordControls[i]->InstantId();
          if (id && strcmp(id, InstantId) == 0) {
-            cTimer *timer = RecordControls[i]->Timer();
+            cTimer *Timer = RecordControls[i]->Timer();
             RecordControls[i]->Stop();
-            if (timer) {
-               isyslog("deleting timer %s", *timer->ToDescr());
-               Timers.Del(timer);
-               Timers.SetModified();
+            if (Timer) {
+               Timers->Del(Timer);
+               isyslog("deleted timer %s", *Timer->ToDescr());
                }
             break;
             }
@@ -4971,11 +5267,24 @@ void cRecordControls::Stop(const char *InstantId)
       }
 }
 
+void cRecordControls::Stop(cTimer *Timer)
+{
+  for (int i = 0; i < MAXRECORDCONTROLS; i++) {
+      if (RecordControls[i]) {
+         if (RecordControls[i]->Timer() == Timer) {
+            DELETENULL(RecordControls[i]);
+            ChangeState();
+            break;
+            }
+         }
+      }
+}
+
 bool cRecordControls::PauseLiveVideo(void)
 {
   Skins.Message(mtStatus, tr("Pausing live video..."));
   cReplayControl::SetRecording(NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
-  if (Start(NULL, true)) {
+  if (Start(true)) {
      cReplayControl *rc = new cReplayControl(true);
      cControl::Launch(rc);
      cControl::Attach();
@@ -5019,19 +5328,22 @@ cRecordControl *cRecordControls::GetRecordControl(const cTimer *Timer)
   return NULL;
 }
 
-void cRecordControls::Process(time_t t)
+bool cRecordControls::Process(cTimers *Timers, time_t t)
 {
+  bool Result = false;
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
          if (!RecordControls[i]->Process(t)) {
             DELETENULL(RecordControls[i]);
             ChangeState();
+            Result = true;
             }
          }
       }
+  return Result;
 }
 
-void cRecordControls::ChannelDataModified(cChannel *Channel)
+void cRecordControls::ChannelDataModified(const cChannel *Channel)
 {
   for (int i = 0; i < MAXRECORDCONTROLS; i++) {
       if (RecordControls[i]) {
@@ -5153,19 +5465,25 @@ void cReplayControl::Stop(void)
      if (rc && rc->InstantId()) {
         if (Active()) {
            if (Setup.DelTimeshiftRec == 2 || Interface->Confirm(tr("Delete timeshift recording?"))) {
-              cTimer *timer = rc->Timer();
-              rc->Stop(false); // don't execute user command
-              if (timer) {
-                 isyslog("deleting timer %s", *timer->ToDescr());
-                 Timers.Del(timer);
-                 Timers.SetModified();
-                 }
+              {
+                LOCK_TIMERS_WRITE;
+                Timers->SetExplicitModify();
+                cTimer *Timer = rc->Timer();
+                rc->Stop(false); // don't execute user command
+                if (Timer) {
+                   Timers->Del(Timer);
+                   Timers->SetModified();
+                   isyslog("deleted timer %s", *Timer->ToDescr());
+                   }
+              }
               cDvbPlayerControl::Stop();
-              cRecording *recording = Recordings.GetByName(fileName);
-              if (recording) {
-                 if (recording->Delete()) {
-                    Recordings.DelByName(fileName);
+              LOCK_RECORDINGS_WRITE;
+              Recordings->SetExplicitModify();
+              if (cRecording *Recording = Recordings->GetByName(fileName)) {
+                 if (Recording->Delete()) {
+                    Recordings->DelByName(fileName);
                     ClearLastReplayed(fileName);
+                    Recordings->SetModified();
                     }
                  else
                     Skins.Message(mtError, tr("Error while deleting recording!"));
@@ -5191,7 +5509,8 @@ const char *cReplayControl::NowReplaying(void)
 
 const char *cReplayControl::LastReplayed(void)
 {
-  if (!Recordings.GetByName(fileName))
+  LOCK_RECORDINGS_READ;
+  if (!Recordings->GetByName(fileName))
      fileName = NULL;
   return fileName;
 }
@@ -5276,7 +5595,8 @@ bool cReplayControl::ShowProgress(bool Initial)
         }
      if (Initial) {
         if (*fileName) {
-           if (cRecording *Recording = Recordings.GetByName(fileName))
+           LOCK_RECORDINGS_READ;
+           if (const cRecording *Recording = Recordings->GetByName(fileName))
               displayReplay->SetRecording(Recording);
            }
         lastCurrent = lastTotal = -1;
@@ -5399,15 +5719,12 @@ void cReplayControl::MarkToggle(void)
   int Current, Total;
   if (GetIndex(Current, Total, true)) {
      lastCurrent = -1; // triggers redisplay
-     if (cMark *m = marks.Get(Current)) {
-        marks.Lock();
+     cStateKey StateKey;
+     marks.Lock(StateKey);
+     if (cMark *m = marks.Get(Current))
         marks.Del(m);
-        marks.Unlock();
-        }
      else {
-        marks.Lock();
         marks.Add(Current);
-        marks.Unlock();
         bool Play, Forward;
         int Speed;
         if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play) {
@@ -5415,6 +5732,7 @@ void cReplayControl::MarkToggle(void)
            displayFrames = true;
            }
         }
+     StateKey.Remove();
      ShowTimed(2);
      marksModified = true;
      }
@@ -5522,15 +5840,16 @@ void cReplayControl::EditTest(void)
 
 cOsdObject *cReplayControl::GetInfo(void)
 {
-  cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
-  if (Recording)
+  LOCK_RECORDINGS_READ;
+  if (const cRecording *Recording = Recordings->GetByName(cReplayControl::LastReplayed()))
      return new cMenuRecording(Recording, false);
   return NULL;
 }
 
 const cRecording *cReplayControl::GetRecording(void)
 {
-  if (const cRecording *Recording = Recordings.GetByName(LastReplayed()))
+  LOCK_RECORDINGS_READ;
+  if (const cRecording *Recording = Recordings->GetByName(LastReplayed()))
      return Recording;
   return NULL;
 }
diff --git a/menu.h b/menu.h
index fad27afaa..3f2878b32 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 3.8 2015/02/06 09:47:30 kls Exp $
+ * $Id: menu.h 4.4 2015/09/13 14:17:56 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -72,10 +72,13 @@ class cMenuCommands : public cOsdMenu {
 
 class cMenuEditTimer : public cOsdMenu {
 private:
+  static const cTimer *addedTimer;
   cTimer *timer;
   cTimer data;
   int channel;
   bool addIfConfirmed;
+  cStringList svdrpServerNames;
+  char remote[HOST_NAME_MAX];
   cMenuEditStrItem *file;
   cMenuEditDateItem *day;
   cMenuEditDateItem *firstday;
@@ -86,13 +89,14 @@ class cMenuEditTimer : public cOsdMenu {
   cMenuEditTimer(cTimer *Timer, bool New = false);
   virtual ~cMenuEditTimer();
   virtual eOSState ProcessKey(eKeys Key);
+  static const cTimer *AddedTimer(void);
   };
 
 class cMenuEvent : public cOsdMenu {
 private:
   const cEvent *event;
 public:
-  cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
+  cMenuEvent(const cTimers *Timers, const cChannels *Channels, const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
   };
@@ -123,14 +127,14 @@ class cDisplayChannel : public cOsdObject {
   bool timeout;
   int osdState;
   const cPositioner *positioner;
-  cChannel *channel;
+  const cChannel *channel;
   const cEvent *lastPresent;
   const cEvent *lastFollowing;
   static cDisplayChannel *currentDisplayChannel;
   void DisplayChannel(void);
   void DisplayInfo(void);
   void Refresh(void);
-  cChannel *NextAvailableChannel(cChannel *Channel, int Direction);
+  const cChannel *NextAvailableChannel(const cChannel *Channel, int Direction);
 public:
   cDisplayChannel(int Number, bool Switched);
   cDisplayChannel(eKeys FirstKey);
@@ -205,7 +209,7 @@ class cMenuRecordings : public cOsdMenu {
 private:
   char *base;
   int level;
-  int recordingsState;
+  cStateKey recordingsStateKey;
   int helpKeys;
   const cRecordingFilter *filter;
   static cString path;
@@ -239,7 +243,7 @@ class cRecordControl {
   char *fileName;
   bool GetEvent(void);
 public:
-  cRecordControl(cDevice *Device, cTimer *Timer = NULL, bool Pause = false);
+  cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer = NULL, bool Pause = false);
   virtual ~cRecordControl();
   bool Process(time_t t);
   cDevice *Device(void) { return device; }
@@ -254,16 +258,18 @@ class cRecordControls {
   static cRecordControl *RecordControls[];
   static int state;
 public:
-  static bool Start(cTimer *Timer = NULL, bool Pause = false);
+  static bool Start(cTimers *Timers, cTimer *Timer, bool Pause = false);
+  static bool Start(bool Pause = false);
   static void Stop(const char *InstantId);
+  static void Stop(cTimer *Timer);
   static bool PauseLiveVideo(void);
   static const char *GetInstantId(const char *LastInstantId);
   static cRecordControl *GetRecordControl(const char *FileName);
   static cRecordControl *GetRecordControl(const cTimer *Timer);
          ///< Returns the cRecordControl for the given Timer.
          ///< If there is no cRecordControl for Timer, NULL is returned.
-  static void Process(time_t t);
-  static void ChannelDataModified(cChannel *Channel);
+  static bool Process(cTimers *Timers, time_t t);
+  static void ChannelDataModified(const cChannel *Channel);
   static bool Active(void);
   static void Shutdown(void);
   static void ChangeState(void) { state++; }
diff --git a/menuitems.c b/menuitems.c
index d0a068d57..659c1a580 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 3.3 2015/02/09 11:53:10 kls Exp $
+ * $Id: menuitems.c 4.2 2015/09/08 10:25:23 kls Exp $
  */
 
 #include "menuitems.h"
@@ -774,10 +774,30 @@ void cMenuEditStraItem::Set(void)
   SetValue(strings[*value]);
 }
 
+// --- cMenuEditStrlItem -----------------------------------------------------
+
+cMenuEditStrlItem::cMenuEditStrlItem(const char *Name, char *Value, int Length, const cStringList *Strings)
+:cMenuEditIntItem(Name, &index, 0, Strings->Size() - 1)
+{
+  strings = Strings;
+  value = Value;
+  length = Length;
+  index = strings->Find(value);
+  if (index < 0)
+     index = 0;
+  Set();
+}
+
+void cMenuEditStrlItem::Set(void)
+{
+  strn0cpy(value, strings->At(index), length);
+  SetValue(value);
+}
+
 // --- cMenuEditChanItem -----------------------------------------------------
 
 cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value, const char *NoneString)
-:cMenuEditIntItem(Name, Value, NoneString ? 0 : 1, Channels.MaxNumber())
+:cMenuEditIntItem(Name, Value, NoneString ? 0 : 1, cChannels::MaxNumber())
 {
   channelID = NULL;
   noneString = NoneString;
@@ -786,12 +806,13 @@ cMenuEditChanItem::cMenuEditChanItem(const char *Name, int *Value, const char *N
 }
 
 cMenuEditChanItem::cMenuEditChanItem(const char *Name, cString *ChannelID, const char *NoneString)
-:cMenuEditIntItem(Name, &dummyValue, NoneString ? 0 : 1, Channels.MaxNumber())
+:cMenuEditIntItem(Name, &dummyValue, NoneString ? 0 : 1, cChannels::MaxNumber())
 {
   channelID = ChannelID;
   noneString = NoneString;
-  cChannel *channel = Channels.GetByChannelID(tChannelID::FromString(*ChannelID));
-  dummyValue = channel ? channel->Number() : 0;
+  LOCK_CHANNELS_READ;
+  const cChannel *Channel = Channels->GetByChannelID(tChannelID::FromString(*ChannelID));
+  dummyValue = Channel ? Channel->Number() : 0;
   Set();
 }
 
@@ -799,11 +820,12 @@ void cMenuEditChanItem::Set(void)
 {
   if (*value > 0) {
      char buf[255];
-     cChannel *channel = Channels.GetByNumber(*value);
-     snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
+     LOCK_CHANNELS_READ;
+     const cChannel *Channel = Channels->GetByNumber(*value);
+     snprintf(buf, sizeof(buf), "%d %s", *value, Channel ? Channel->Name() : "");
      SetValue(buf);
      if (channelID)
-        *channelID = channel ? channel->GetChannelID().ToString() : "";
+        *channelID = Channel ? Channel->GetChannelID().ToString() : "";
      }
   else if (noneString) {
      SetValue(noneString);
@@ -822,13 +844,14 @@ eOSState cMenuEditChanItem::ProcessKey(eKeys Key)
     case kRight|k_Repeat:
     case kRight:
                  {
-                   cChannel *channel = Channels.GetByNumber(*value + delta, delta);
-                   if (channel)
-                      *value = channel->Number();
+                   LOCK_CHANNELS_READ
+                   const cChannel *Channel = Channels->GetByNumber(*value + delta, delta);
+                   if (Channel)
+                      *value = Channel->Number();
                    else if (delta < 0 && noneString)
                       *value = 0;
                    if (channelID)
-                      *channelID = channel ? channel->GetChannelID().ToString() : "";
+                      *channelID = Channel ? Channel->GetChannelID().ToString() : "";
                    Set();
                  }
                  break;
@@ -845,13 +868,14 @@ cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value, int *Source)
   number = 0;
   source = Source;
   transponder = Value;
-  cChannel *channel = Channels.First();
-  while (channel) {
-        if (!channel->GroupSep() && *source == channel->Source() && ISTRANSPONDER(channel->Transponder(), *Value)) {
-           number = channel->Number();
+  LOCK_CHANNELS_READ;
+  const cChannel *Channel = Channels->First();
+  while (Channel) {
+        if (!Channel->GroupSep() && *source == Channel->Source() && ISTRANSPONDER(Channel->Transponder(), *Value)) {
+           number = Channel->Number();
            break;
            }
-        channel = (cChannel *)channel->Next();
+        Channel = Channels->Next(Channel);
         }
   Set();
 }
@@ -859,10 +883,10 @@ cMenuEditTranItem::cMenuEditTranItem(const char *Name, int *Value, int *Source)
 eOSState cMenuEditTranItem::ProcessKey(eKeys Key)
 {
   eOSState state = cMenuEditChanItem::ProcessKey(Key);
-  cChannel *channel = Channels.GetByNumber(number);
-  if (channel) {
-     *source = channel->Source();
-     *transponder = channel->Transponder();
+  LOCK_CHANNELS_READ
+  if (const cChannel *Channel = Channels->GetByNumber(number)) {
+     *source = Channel->Source();
+     *transponder = Channel->Transponder();
      }
   else {
      *source = 0;
diff --git a/menuitems.h b/menuitems.h
index 2a30b4655..44f6fec5c 100644
--- a/menuitems.h
+++ b/menuitems.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.h 3.1 2013/05/24 10:19:55 kls Exp $
+ * $Id: menuitems.h 4.1 2015/09/06 10:38:37 kls Exp $
  */
 
 #ifndef __MENUITEMS_H
@@ -146,6 +146,18 @@ class cMenuEditStraItem : public cMenuEditIntItem {
   cMenuEditStraItem(const char *Name, int *Value, int NumStrings, const char * const *Strings);
   };
 
+class cMenuEditStrlItem : public cMenuEditIntItem {
+private:
+  const cStringList *strings;
+  int index;
+  char *value;
+  int length;
+protected:
+  virtual void Set(void);
+public:
+  cMenuEditStrlItem(const char *Name, char *Value, int Length, const cStringList *Strings);
+  };
+
 class cMenuEditChanItem : public cMenuEditIntItem {
 protected:
   const char *noneString;
diff --git a/newplugin b/newplugin
index 8f7087e95..d8e9243c4 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 3.2 2014/01/01 13:29:54 kls Exp $
+# $Id: newplugin 4.1 2015/09/10 11:11:14 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -330,6 +330,7 @@ $PLUGINDIR = "$PLUGINS_SRC/$PLUGIN_NAME";
 die "The directory $PLUGINS_SRC doesn't exist!\n" unless (-d "$PLUGINS_SRC");
 die "A plugin named '$PLUGIN_NAME' already exists in $PLUGINS_SRC!\n" if (-e "$PLUGINDIR");
 mkdir("$PLUGINDIR") || die "$!";
+mkdir("$PLUGINDIR/po") || die "$!";
 
 CreateFile("README", $README);
 CreateFile("HISTORY", $HISTORY);
diff --git a/nit.c b/nit.c
index 13183755c..864fdac28 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 3.5 2015/02/04 09:13:54 kls Exp $
+ * $Id: nit.c 4.3 2015/07/26 09:24:36 kls Exp $
  */
 
 #include "nit.h"
@@ -19,19 +19,22 @@
 #define DVB_SYSTEM_1 0 // see also dvbdevice.c
 #define DVB_SYSTEM_2 1
 
+#define MAXNETWORKNAME Utf8BufSize(256)
+
+// Set to 'true' for debug output:
+static bool DebugNit = false;
+
+#define dbgnit(a...) if (DebugNit) fprintf(stderr, a)
+
 cNitFilter::cNitFilter(cSdtFilter *SdtFilter)
 {
   sdtFilter = SdtFilter;
-  numNits = 0;
-  networkId = 0;
-  Set(0x10, 0x40);  // NIT
+  Set(0x10, SI::TableIdNIT);
 }
 
 void cNitFilter::SetStatus(bool On)
 {
   cFilter::SetStatus(On);
-  numNits = 0;
-  networkId = 0;
   sectionSyncer.Reset();
 }
 
@@ -40,63 +43,31 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
   SI::NIT nit(Data, false);
   if (!nit.CheckCRCAndParse())
      return;
-  // Some broadcasters send more than one NIT, with no apparent way of telling which
-  // one is the right one to use. This is an attempt to find the NIT that contains
-  // the transponder it was transmitted on and use only that one:
-  int ThisNIT = -1;
-  if (!networkId) {
-     for (int i = 0; i < numNits; i++) {
-         if (nits[i].networkId == nit.getNetworkId()) {
-            if (nit.getSectionNumber() == 0) {
-               // all NITs have passed by
-               for (int j = 0; j < numNits; j++) {
-                   if (nits[j].hasTransponder) {
-                      networkId = nits[j].networkId;
-                      //printf("taking NIT with network ID %d\n", networkId);
-                      //XXX what if more than one NIT contains this transponder???
-                      break;
-                      }
-                   }
-               if (!networkId) {
-                  //printf("none of the NITs contains transponder %d\n", Transponder());
-                  return;
-                  }
-               }
-            else {
-               ThisNIT = i;
-               break;
-               }
-            }
-         }
-     if (!networkId && ThisNIT < 0 && numNits < MAXNITS) {
-        if (nit.getSectionNumber() == 0) {
-           *nits[numNits].name = 0;
-           SI::Descriptor *d;
-           for (SI::Loop::Iterator it; (d = nit.commonDescriptors.getNext(it)); ) {
-               switch (d->getDescriptorTag()) {
-                 case SI::NetworkNameDescriptorTag: {
-                      SI::NetworkNameDescriptor *nnd = (SI::NetworkNameDescriptor *)d;
-                      nnd->name.getText(nits[numNits].name, MAXNETWORKNAME);
-                      }
-                      break;
-                 default: ;
-                 }
-               delete d;
-               }
-           nits[numNits].networkId = nit.getNetworkId();
-           nits[numNits].hasTransponder = false;
-           //printf("NIT[%d] %5d '%s'\n", numNits, nits[numNits].networkId, nits[numNits].name);
-           ThisNIT = numNits;
-           numNits++;
+  if (!sectionSyncer.Sync(nit.getVersionNumber(), nit.getSectionNumber(), nit.getLastSectionNumber()))
+     return;
+  if (DebugNit) {
+     char NetworkName[MAXNETWORKNAME] = "";
+     SI::Descriptor *d;
+     for (SI::Loop::Iterator it; (d = nit.commonDescriptors.getNext(it)); ) {
+         switch (d->getDescriptorTag()) {
+           case SI::NetworkNameDescriptorTag: {
+                SI::NetworkNameDescriptor *nnd = (SI::NetworkNameDescriptor *)d;
+                nnd->name.getText(NetworkName, MAXNETWORKNAME);
+                }
+                break;
+           default: ;
            }
-        }
+         delete d;
+         }
+     dbgnit("NIT: %02X %2d %2d %2d %s %d %d '%s'\n", Tid, nit.getVersionNumber(), nit.getSectionNumber(), nit.getLastSectionNumber(), *cSource::ToString(Source()), nit.getNetworkId(), Transponder(), NetworkName);
      }
-  else if (networkId != nit.getNetworkId())
-     return; // ignore all other NITs
-  else if (!sectionSyncer.Sync(nit.getVersionNumber(), nit.getSectionNumber(), nit.getLastSectionNumber()))
-     return;
-  if (!Channels.Lock(true, 10))
+  cStateKey StateKey;
+  cChannels *Channels = cChannels::GetChannelsWrite(StateKey, 10);
+  if (!Channels) {
+     sectionSyncer.Repeat(); // let's not miss any section of the NIT
      return;
+     }
+  bool ChannelsModified = false;
   SI::NIT::TransportStream ts;
   for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
       SI::Descriptor *d;
@@ -118,6 +89,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                   default: ;
                   }
                 Frequencies[n++] = f;
+                dbgnit("    Frequencies[%d] = %d\n", n - 1, f);
                 }
             }
          else
@@ -142,20 +114,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
                  dtp.SetRollOff(sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
-                 if (ThisNIT >= 0) {
-                    for (int n = 0; n < NumFrequencies; n++) {
-                        if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], dtp.Polarization()), Transponder())) {
-                           nits[ThisNIT].hasTransponder = true;
-                           //printf("has transponder %d\n", Transponder());
-                           break;
-                           }
-                        }
-                    break;
-                    }
+                 dbgnit("    %s %d %c %d %d\n", *cSource::ToString(Source), Frequency, Polarizations[sd->getPolarization()], SymbolRate, cChannel::Transponder(Frequency, Polarizations[sd->getPolarization()]));
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;
-                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                    for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
                            found = true;
@@ -168,7 +131,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('S'));
+                              ChannelsModified |= Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('S'));
                            else if (Channel->Srate() != SymbolRate || strcmp(Channel->Parameters(), dtp.ToString('S')))
                               forceTransponderUpdate = true; // get us receiving this transponder
                            }
@@ -176,7 +139,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     if (!found || forceTransponderUpdate) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
-                           Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                           Channel->SetId(NULL, ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                            if (Channel->SetTransponderData(Source, Frequencies[n], SymbolRate, dtp.ToString('S')))
                               EITScanner.AddTransponder(Channel);
                            else
@@ -184,18 +147,19 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
-                 sdtFilter->Trigger(Source);
+                 if (ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), Transponder()))
+                    sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::S2SatelliteDeliverySystemDescriptorTag: {
                  if (Setup.UpdateChannels >= 5) {
-                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                    for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && cSource::IsSat(Channel->Source()) && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            SI::S2SatelliteDeliverySystemDescriptor *sd = (SI::S2SatelliteDeliverySystemDescriptor *)d;
                            cDvbTransponderParameters dtp(Channel->Parameters());
                            dtp.SetSystem(DVB_SYSTEM_2);
                            dtp.SetStreamId(sd->getInputStreamIdentifier());
-                           Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), dtp.ToString('S'));
+                           ChannelsModified |= Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), dtp.ToString('S'));
                            break;
                            }
                         }
@@ -213,20 +177,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
                  dtp.SetModulation(Modulations[min(sd->getModulation(), 6)]);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
-                 if (ThisNIT >= 0) {
-                    for (int n = 0; n < NumFrequencies; n++) {
-                        if (ISTRANSPONDER(Frequencies[n] / 1000, Transponder())) {
-                           nits[ThisNIT].hasTransponder = true;
-                           //printf("has transponder %d\n", Transponder());
-                           break;
-                           }
-                        }
-                    break;
-                    }
+                 dbgnit("    %s %d %d %d %d\n", *cSource::ToString(Source), Frequency, CodeRates[sd->getFecInner()], Modulations[min(sd->getModulation(), 6)], SymbolRate);
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;
-                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                    for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
                            found = true;
@@ -239,7 +194,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('C'));
+                              ChannelsModified |= Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('C'));
                            else if (Channel->Srate() != SymbolRate || strcmp(Channel->Parameters(), dtp.ToString('C')))
                               forceTransponderUpdate = true; // get us receiving this transponder
                            }
@@ -247,7 +202,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     if (!found || forceTransponderUpdate) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
-                           Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                           Channel->SetId(NULL, ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                            if (Channel->SetTransponderData(Source, Frequencies[n], SymbolRate, dtp.ToString('C')))
                               EITScanner.AddTransponder(Channel);
                            else
@@ -255,7 +210,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
-                 sdtFilter->Trigger(Source);
+                 if (ISTRANSPONDER(Frequency / 1000, Transponder()))
+                    sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::TerrestrialDeliverySystemDescriptorTag: {
@@ -277,20 +233,11 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  dtp.SetGuard(GuardIntervals[sd->getGuardInterval()]);
                  static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_4K, TRANSMISSION_MODE_AUTO };
                  dtp.SetTransmission(TransmissionModes[sd->getTransmissionMode()]);
-                 if (ThisNIT >= 0) {
-                    for (int n = 0; n < NumFrequencies; n++) {
-                        if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
-                           nits[ThisNIT].hasTransponder = true;
-                           //printf("has transponder %d\n", Transponder());
-                           break;
-                           }
-                        }
-                    break;
-                    }
+                 dbgnit("    %s %d %d %d %d %d %d %d %d\n", *cSource::ToString(Source), Frequency, Bandwidths[sd->getBandwidth()], Constellations[sd->getConstellation()], Hierarchies[sd->getHierarchy()], CodeRates[sd->getCodeRateHP()], CodeRates[sd->getCodeRateLP()], GuardIntervals[sd->getGuardInterval()], TransmissionModes[sd->getTransmissionMode()]);
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;
-                    for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                    for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
                            found = true;
@@ -303,7 +250,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                   }
                               }
                            if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
-                              Channel->SetTransponderData(Source, Frequency, 0, dtp.ToString('T'));
+                              ChannelsModified |= Channel->SetTransponderData(Source, Frequency, 0, dtp.ToString('T'));
                            else if (strcmp(Channel->Parameters(), dtp.ToString('T')))
                               forceTransponderUpdate = true; // get us receiving this transponder
                            }
@@ -311,7 +258,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     if (!found || forceTransponderUpdate) {
                        for (int n = 0; n < NumFrequencies; n++) {
                            cChannel *Channel = new cChannel;
-                           Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+                           Channel->SetId(NULL, ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
                            if (Channel->SetTransponderData(Source, Frequencies[n], 0, dtp.ToString('T')))
                               EITScanner.AddTransponder(Channel);
                            else
@@ -319,7 +266,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
-                 sdtFilter->Trigger(Source);
+                 if (ISTRANSPONDER(Frequency / 1000000, Transponder()))
+                    sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::ExtensionDescriptorTag: {
@@ -327,7 +275,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  switch (sd->getExtensionDescriptorTag()) {
                    case SI::T2DeliverySystemDescriptorTag: {
                         if (Setup.UpdateChannels >= 5) {
-                           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                           for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                                int Source = cSource::FromData(cSource::stTerr);
                                if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                                   SI::T2DeliverySystemDescriptor *td = (SI::T2DeliverySystemDescriptor *)d;
@@ -347,7 +295,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                      dtp.SetTransmission(T2TransmissionModes[td->getTransmissionMode()]);
                                      //TODO add parsing of frequencies
                                      }
-                                  Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('T'));
+                                  ChannelsModified |= Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('T'));
                                   }
                                }
                            }
@@ -365,9 +313,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         int lcn = LogicalChannel.getLogicalChannelNumber();
                         int sid = LogicalChannel.getServiceId();
                         if (LogicalChannel.getVisibleServiceFlag()) {
-                           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                           for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                                if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                                  Channel->SetLcn(lcn);
+                                  ChannelsModified |= Channel->SetLcn(lcn);
                                   break;
                                   }
                                }
@@ -383,9 +331,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         int lcn = HdSimulcastLogicalChannel.getLogicalChannelNumber();
                         int sid = HdSimulcastLogicalChannel.getServiceId();
                         if (HdSimulcastLogicalChannel.getVisibleServiceFlag()) {
-                           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+                           for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                                if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
-                                  Channel->SetLcn(lcn);
+                                  ChannelsModified |= Channel->SetLcn(lcn);
                                   break;
                                   }
                                }
@@ -398,5 +346,5 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
           delete d;
           }
       }
-  Channels.Unlock();
+  StateKey.Remove(ChannelsModified);
 }
diff --git a/nit.h b/nit.h
index 4673f960d..52676c0d1 100644
--- a/nit.h
+++ b/nit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.h 3.1 2014/03/10 14:12:05 kls Exp $
+ * $Id: nit.h 4.1 2015/03/16 12:41:38 kls Exp $
  */
 
 #ifndef __NIT_H
@@ -13,24 +13,10 @@
 #include "filter.h"
 #include "sdt.h"
 
-#define MAXNITS 16
-#define MAXNETWORKNAME Utf8BufSize(256)
-
 class cNitFilter : public cFilter {
 private:
-
-  class cNit {
-  public:
-    u_short networkId;
-    char name[MAXNETWORKNAME];
-    bool hasTransponder;
-    };
-
   cSectionSyncer sectionSyncer;
   cSdtFilter *sdtFilter;
-  cNit nits[MAXNITS];
-  u_short networkId;
-  int numNits;
 protected:
   virtual void Process(u_short Pid, u_char Tid, const u_char *Data, int Length);
 public:
diff --git a/osd.c b/osd.c
index a475488e1..524700ae1 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 3.5 2015/02/11 09:48:02 kls Exp $
+ * $Id: osd.c 4.3 2015/09/10 14:12:06 kls Exp $
  */
 
 #include "osd.h"
@@ -1641,6 +1641,7 @@ int cOsd::osdLeft = 0;
 int cOsd::osdTop = 0;
 int cOsd::osdWidth = 0;
 int cOsd::osdHeight = 0;
+cSize cOsd::maxPixmapSize(2048, 2048);
 cVector<cOsd *> cOsd::Osds;
 cMutex cOsd::mutex;
 
@@ -1705,6 +1706,11 @@ cBitmap *cOsd::GetBitmap(int Area)
   return Area < numBitmaps ? (isTrueColor ? bitmaps[0] : bitmaps[Area]) : NULL;
 }
 
+const cSize &cOsd::MaxPixmapSize(void) const
+{
+  return maxPixmapSize;
+}
+
 cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)
 {
   if (isTrueColor) {
@@ -1836,7 +1842,10 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
         width = Areas[0].x2 - Areas[0].x1 + 1;
         height = Areas[0].y2 - Areas[0].y1 + 1;
         cPixmap *Pixmap = CreatePixmap(0, cRect(Areas[0].x1, Areas[0].y1, width, height));
-        Pixmap->Clear();
+        if (Pixmap)
+           Pixmap->Clear();
+        else
+           Result = oeOutOfMemory;
         bitmaps[numBitmaps++] = new cBitmap(10, 10, 8); // dummy bitmap for GetBitmap()
         }
      else {
@@ -2033,8 +2042,8 @@ void cOsdProvider::UpdateOsdSize(bool Force)
   if (Width != oldWidth || Height != oldHeight || !DoubleEqual(Aspect, oldAspect) || Force) {
      Setup.OSDLeft = int(round(Width * Setup.OSDLeftP));
      Setup.OSDTop = int(round(Height * Setup.OSDTopP));
-     Setup.OSDWidth = int(round(Width * Setup.OSDWidthP)) & ~0x07; // OSD width must be a multiple of 8
-     Setup.OSDHeight = int(round(Height * Setup.OSDHeightP));
+     Setup.OSDWidth = min(Width - Setup.OSDLeft, int(round(Width * Setup.OSDWidthP))) & ~0x07; // OSD width must be a multiple of 8
+     Setup.OSDHeight = min(Height - Setup.OSDTop, int(round(Height * Setup.OSDHeightP)));
      Setup.OSDAspect = Aspect;
      Setup.FontOsdSize = int(round(Height * Setup.FontOsdSizeP));
      Setup.FontFixSize = int(round(Height * Setup.FontFixSizeP));
diff --git a/osd.h b/osd.h
index 9ef32ac78..61b318d1c 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 3.6 2015/02/11 09:48:02 kls Exp $
+ * $Id: osd.h 4.4 2015/04/19 12:18:25 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -510,8 +510,10 @@ class cPixmap {
        ///< In order to allow devices that can handle only a limited number of layers,
        ///< the Layer parameter must be less than 8 (MAXPIXMAPLAYERS).
        ///< ViewPort defines the rectangle in which this pixmap will be rendered on
-       ///< the OSD. If no DrawPort is given, it defaults to the same size as the
-       ///< ViewPort, with its upper left corner set to (0, 0).
+       ///< the OSD. The coordinate (0, 0) corresponds to the upper left corner of the
+       ///< OSD. If no DrawPort is given, it defaults to the same size as the
+       ///< ViewPort, with its upper left corner set to (0, 0). The DrawPort's origin
+       ///< is relative to the ViewPort's origin.
        ///< All drawing operations will be executed relative to the origin of the
        ///< DrawPort rectangle, and will be clipped to the size of this rectangle.
        ///< The DrawPort may have a different size than the ViewPort. If it is smaller
@@ -522,6 +524,8 @@ class cPixmap {
        ///< intersects with the ViewPort will be visible on the OSD.
        ///< The drawing area of a newly created cPixmap is not initialized and may
        ///< contain random data.
+       ///< See cOsd::MaxPixmapSize() for information on the maximum size of pixmaps
+       ///< supported by the system.
   static void Lock(void) { mutex.Lock(); }
        ///< All public member functions of cPixmap set locks as necessary to make sure
        ///< they are thread-safe (unless noted otherwise). If several cPixmap member
@@ -722,6 +726,7 @@ class cOsd {
 private:
   static int osdLeft, osdTop, osdWidth, osdHeight;
   static cVector<cOsd *> Osds;
+  static cSize maxPixmapSize;
   static cMutex mutex;
   bool isTrueColor;
   cBitmap *savedBitmap;
@@ -780,6 +785,18 @@ class cOsd {
        ///< If there are no dirty pixmaps, or if this is not a true color OSD,
        ///< this function returns NULL.
        ///< The caller must call DestroyPixmap() for the returned pixmap after use.
+//#define DEPRECATED_GETBITMAP
+#ifdef DEPRECATED_GETBITMAP
+public:
+#endif
+  cBitmap *GetBitmap(int Area);
+       ///< Returns a pointer to the bitmap for the given Area, or NULL if no
+       ///< such bitmap exists.
+       ///< If this is a true color OSD, a pointer to a dummy bitmap with 8bpp
+       ///< is returned. This is done so that skins that call this function
+       ///< in order to preset the bitmap's palette won't crash.
+       ///< Use of this function outside of derived classes is deprecated and it
+       ///< may be made 'protected' in a future version.
 public:
   virtual ~cOsd();
        ///< Shuts down the OSD.
@@ -812,14 +829,8 @@ class cOsd {
        ///< requested colors. By default the palette assumes there will be
        ///< 10 fixed colors and 10 color combinations.
        ///< If this is a true color OSD, this function does nothing.
-  cBitmap *GetBitmap(int Area);
-       ///< Returns a pointer to the bitmap for the given Area, or NULL if no
-       ///< such bitmap exists.
-       ///< If this is a true color OSD, a pointer to a dummy bitmap with 8bpp
-       ///< is returned. This is done so that skins that call this function
-       ///< in order to preset the bitmap's palette won't crash.
-       ///< Use of this function outside of derived classes is deprecated and it
-       ///< may be made 'protected' in a future version.
+  virtual const cSize &MaxPixmapSize(void) const;
+       ///< Returns the maximum possible size of a pixmap this OSD can create.
   virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
        ///< Creates a new true color pixmap on this OSD (see cPixmap for details).
        ///< The caller must not delete the returned object, it will be deleted when
diff --git a/osdbase.c b/osdbase.c
index e03f2d074..52ab240e4 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 3.3 2015/01/15 10:11:11 kls Exp $
+ * $Id: osdbase.c 4.1 2015/09/10 11:23:07 kls Exp $
  */
 
 #include "osdbase.h"
@@ -87,6 +87,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   title = NULL;
   menuCategory = mcUnknown;
   menuSortMode = msmUnknown;
+  menuOrientation = moVertical;
   SetTitle(Title);
   SetCols(c0, c1, c2, c3, c4);
   first = 0;
@@ -231,6 +232,7 @@ void cOsdMenu::Display(void)
   if (menuCategory != displayMenu->MenuCategory())
      displayMenu->SetMenuCategory(menuCategory);
   displayMenu->SetMenuSortMode(menuSortMode);
+  menuOrientation = displayMenu->MenuOrientation();
   displayMenuItems = displayMenu->MaxItems();
   displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
   displayMenu->SetTitle(title);
@@ -541,13 +543,13 @@ eOSState cOsdMenu::ProcessKey(eKeys Key)
     case k0:      return osUnknown;
     case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
     case kUp|k_Repeat:
-    case kUp:   CursorUp();   break;
+    case kUp:     if (menuOrientation == moHorizontal) PageUp();     else CursorUp(); break;
     case kDown|k_Repeat:
-    case kDown: CursorDown(); break;
+    case kDown:   if (menuOrientation == moHorizontal) PageDown();   else CursorDown(); break;
     case kLeft|k_Repeat:
-    case kLeft: PageUp(); break;
+    case kLeft:   if (menuOrientation == moHorizontal) CursorUp();   else PageUp(); break;
     case kRight|k_Repeat:
-    case kRight: PageDown(); break;
+    case kRight:  if (menuOrientation == moHorizontal) CursorDown(); else PageDown(); break;
     case kBack: return osBack;
     case kOk:   if (marked >= 0) {
                    SetStatus(NULL);
diff --git a/osdbase.h b/osdbase.h
index 5b8ae1cc5..5e807e769 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 3.2 2015/01/15 10:09:18 kls Exp $
+ * $Id: osdbase.h 4.1 2015/09/10 11:17:52 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -93,6 +93,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   int first, current, marked;
   eMenuCategory menuCategory;
   eMenuSortMode menuSortMode;
+  eMenuOrientation menuOrientation;
   cOsdMenu *subMenu;
   const char *helpRed, *helpGreen, *helpYellow, *helpBlue;
   bool helpDisplayed;
diff --git a/pat.c b/pat.c
index 98d306ebe..beb5609a1 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 3.5 2015/01/04 13:14:01 kls Exp $
+ * $Id: pat.c 4.1 2015/08/17 08:46:55 kls Exp $
  */
 
 #include "pat.h"
@@ -99,8 +99,8 @@ cCaDescriptors::cCaDescriptors(int Source, int Transponder, int ServiceId, int P
 
 bool cCaDescriptors::operator== (const cCaDescriptors &arg) const
 {
-  cCaDescriptor *ca1 = caDescriptors.First();
-  cCaDescriptor *ca2 = arg.caDescriptors.First();
+  const cCaDescriptor *ca1 = caDescriptors.First();
+  const cCaDescriptor *ca2 = arg.caDescriptors.First();
   while (ca1 && ca2) {
         if (!(*ca1 == *ca2))
            return false;
@@ -396,11 +396,14 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         SwitchToNextPmtPid();
         return;
         }
-     if (!Channels.Lock(true, 10))
+     cStateKey StateKey;
+     cChannels *Channels = cChannels::GetChannelsWrite(StateKey, 10);
+     if (!Channels)
         return;
+     bool ChannelsModified = false;
      PmtVersionChanged(Pid, pmt.getTableIdExtension(), pmt.getVersionNumber(), true);
      SwitchToNextPmtPid();
-     cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), pmt.getServiceId());
+     cChannel *Channel = Channels->GetByServiceID(Source(), Transponder(), pmt.getServiceId());
      if (Channel) {
         SI::CaDescriptor *d;
         cCaDescriptors *CaDescriptors = new cCaDescriptors(Channel->Source(), Channel->Transponder(), Channel->Sid(), Pid);
@@ -629,13 +632,13 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                }
             }
         if (Setup.UpdateChannels >= 2) {
-           Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
-           Channel->SetCaIds(CaDescriptors->CaIds());
-           Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
+           ChannelsModified |= Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+           ChannelsModified |= Channel->SetCaIds(CaDescriptors->CaIds());
+           ChannelsModified |= Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
            }
-        Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
+        ChannelsModified |= Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
         }
-     Channels.Unlock();
+     StateKey.Remove(ChannelsModified);
      }
   if (timer.TimedOut()) {
      if (pmtIndex >= 0)
diff --git a/pat.h b/pat.h
index 19e60dcff..557d599c6 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 3.4 2015/01/04 13:17:22 kls Exp $
+ * $Id: pat.h 4.0 2015/01/04 13:17:22 kls Exp $
  */
 
 #ifndef __PAT_H
diff --git a/player.c b/player.c
index 5fc4dbf48..e10b3d013 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.c 3.0 2012/04/28 11:52:50 kls Exp $
+ * $Id: player.c 4.0 2012/04/28 11:52:50 kls Exp $
  */
 
 #include "player.h"
diff --git a/player.h b/player.h
index 9ec47faab..d9ed964ac 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 3.1 2013/12/25 13:25:02 kls Exp $
+ * $Id: player.h 4.0 2013/12/25 13:25:02 kls Exp $
  */
 
 #ifndef __PLAYER_H
diff --git a/plugin.c b/plugin.c
index 650f9231c..223d709d2 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 3.0 2012/09/01 13:10:27 kls Exp $
+ * $Id: plugin.c 4.1 2015/04/18 14:51:20 kls Exp $
  */
 
 #include "plugin.h"
@@ -318,23 +318,23 @@ void cPluginManager::SetDirectory(const char *Directory)
 void cPluginManager::AddPlugin(const char *Args)
 {
   if (strcmp(Args, "*") == 0) {
-     cReadDir d(directory);
-     struct dirent *e;
-     while ((e = d.Next()) != NULL) {
-           if (strstr(e->d_name, LIBVDR_PREFIX) == e->d_name) {
-              char *p = strstr(e->d_name, SO_INDICATOR);
-              if (p) {
-                 *p = 0;
-                 p += strlen(SO_INDICATOR);
-                 if (strcmp(p, APIVERSION) == 0) {
-                    char *name = e->d_name + strlen(LIBVDR_PREFIX);
-                    if (strcmp(name, "*") != 0) { // let's not get into a loop!
-                       AddPlugin(e->d_name + strlen(LIBVDR_PREFIX));
-                       }
-                    }
-                 }
-              }
-           }
+     cFileNameList Files(directory);
+     for (int i = 0; i < Files.Size(); i++) {
+         char *FileName = Files.At(i);
+         if (strstr(FileName, LIBVDR_PREFIX) == FileName) {
+            char *p = strstr(FileName, SO_INDICATOR);
+            if (p) {
+               *p = 0;
+               p += strlen(SO_INDICATOR);
+               if (strcmp(p, APIVERSION) == 0) {
+                  char *name = FileName + strlen(LIBVDR_PREFIX);
+                  if (strcmp(name, "*") != 0) { // let's not get into a loop!
+                     AddPlugin(FileName + strlen(LIBVDR_PREFIX));
+                     }
+                  }
+               }
+            }
+         }
      return;
      }
   char *s = strdup(skipspace(Args));
diff --git a/plugin.h b/plugin.h
index d04274a81..fde78b55d 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 3.0 2012/09/01 13:08:54 kls Exp $
+ * $Id: plugin.h 4.0 2012/09/01 13:08:54 kls Exp $
  */
 
 #ifndef __PLUGIN_H
diff --git a/po/ar.po b/po/ar.po
index d26ccd9e2..b8221b4f5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -664,6 +664,9 @@ msgstr "معدل البقاء"
 msgid "File"
 msgstr "ملف"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Folder"
 
@@ -676,6 +679,12 @@ msgstr "Repeating"
 msgid "First day"
 msgstr "اليوم الاول"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Select folder"
 
@@ -851,6 +860,12 @@ msgstr "متوقف على نوع الثوب"
 msgid "always"
 msgstr "دائما"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "عرص على الشاشة"
 
@@ -938,6 +953,9 @@ msgstr "Folders in timer menu"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "قم دائما بسرد المجلدات اولا"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Number keys for characters"
 
@@ -1122,6 +1140,9 @@ msgstr "الكامة جاهزة"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "الكامة"
 
@@ -1152,6 +1173,15 @@ msgstr "الكامة مستخدمة الان هل تريد اعادة تشغيل
 msgid "Can't reset CAM!"
 msgstr "تعذر اعادة تشغيل الكامة"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "لا تقم بايقاف الفديو الحى"
 
@@ -1182,6 +1212,9 @@ msgstr "الاولويات الافتراضية"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "معدل البقاء باليوم"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Pause key handling"
 
@@ -1281,6 +1314,15 @@ msgstr "اقل مدة لعدم تفاعل المستخدم بالدقيقة"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP timeout (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
@@ -1534,6 +1576,9 @@ msgstr "التسجيل القادم"
 msgid "Pause live video?"
 msgstr "ايقاف الفديو الحى"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "ابتداء التسجيل"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8ea7bd3df..e251db255 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -663,6 +663,9 @@ msgstr "Durada"
 msgid "File"
 msgstr "Arxiu"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Carpeta"
 
@@ -675,6 +678,12 @@ msgstr "Repetitiu"
 msgid "First day"
 msgstr "Primer dia"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Seleccioni carpeta"
 
@@ -850,6 +859,12 @@ msgstr "dep
 msgid "always"
 msgstr "sempre"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "Informaci� en pantalla"
 
@@ -937,6 +952,9 @@ msgstr "Carpetes en men
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Sempre ordenar primer carpetes"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tecles num�riques per a car�cters"
 
@@ -1121,6 +1139,9 @@ msgstr "CAM preparat"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1151,6 +1172,15 @@ msgstr "CAM en 
 msgid "Can't reset CAM!"
 msgstr "No puc reiniciar la CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "no pausar emissi� en directe"
 
@@ -1181,6 +1211,9 @@ msgstr "Prioritat per defecte"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durada predefinida"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Gesti� tecla pausa"
 
@@ -1280,6 +1313,15 @@ msgstr "Temps m
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Temps d'espera Zap (s)"
 
@@ -1533,6 +1575,9 @@ msgstr "Gravaci
 msgid "Pause live video?"
 msgstr "Pausar emissi� en directe?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Gravaci� comen�ada"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 6c5ac1b93..541ee3534 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -663,6 +663,9 @@ msgstr "Životnost"
 msgid "File"
 msgstr "Soubor"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Složka"
 
@@ -675,6 +678,12 @@ msgstr "S opakováním"
 msgid "First day"
 msgstr "První den"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Vybrat složku"
 
@@ -850,6 +859,12 @@ msgstr "podle vzhledu"
 msgid "always"
 msgstr "vždy"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -937,6 +952,9 @@ msgstr "Složky v menu časovače"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Adresáře řadit vždy na začátek"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Psát písmena pomocí číselných kláves"
 
@@ -1121,6 +1139,9 @@ msgstr "CAM připraven"
 msgid " (activating)"
 msgstr " (aktivuji)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1151,6 +1172,15 @@ msgstr "CAM se používá - opravdu restartovat?"
 msgid "Can't reset CAM!"
 msgstr "CAM modul nelze restartovat!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "nepřerusovat běžící program"
 
@@ -1181,6 +1211,9 @@ msgstr "Výchozí priorita"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Výchozí životnost"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Chování klávesy Přerušení"
 
@@ -1280,6 +1313,15 @@ msgstr "Časový limit neaktivnosti (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Časový limit SVDRP (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Časový limit Zap (s)"
 
@@ -1533,6 +1575,9 @@ msgstr "Brzo začne nahrávání!"
 msgid "Pause live video?"
 msgstr "Přerušit běžící program?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Začalo nahrávání"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index d0fbbf804..0861ad761 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -660,6 +660,9 @@ msgstr "Levetid"
 msgid "File"
 msgstr "Fil"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr ""
 
@@ -672,6 +675,12 @@ msgstr ""
 msgid "First day"
 msgstr "F�rste dag"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr ""
 
@@ -847,6 +856,12 @@ msgstr "skin afh
 msgid "always"
 msgstr "altid"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -934,6 +949,9 @@ msgstr ""
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1118,6 +1136,9 @@ msgstr "CAM klar"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1148,6 +1169,15 @@ msgstr "CAM er i brug - virkelig nulstille?"
 msgid "Can't reset CAM!"
 msgstr "Kan ikke nulstille CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr ""
 
@@ -1178,6 +1208,9 @@ msgstr "Standard prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standard levetid (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr ""
 
@@ -1277,6 +1310,15 @@ msgstr "Min. bruger inaktivitet (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP timeout (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
@@ -1530,6 +1572,9 @@ msgstr "Optagelse starter snart!"
 msgid "Pause live video?"
 msgstr ""
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Optagelse startet"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 762c6fa3b..773be4257 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-10 13:45+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Lebensdauer"
 msgid "File"
 msgstr "Datei"
 
+msgid "Record on"
+msgstr "Aufnehmen auf"
+
 msgid "Button$Folder"
 msgstr "Verzeichnis"
 
@@ -673,6 +676,12 @@ msgstr "Wiederholend"
 msgid "First day"
 msgstr "Erster Tag"
 
+msgid "Error while accessing remote timer"
+msgstr "Fehler beim Ansprechen des fernen Timers"
+
+msgid "Timer has been deleted!"
+msgstr "Timer wurde gel�scht!"
+
 msgid "Select folder"
 msgstr "Verzeichnis w�hlen"
 
@@ -848,6 +857,12 @@ msgstr "je nach Oberfl
 msgid "always"
 msgstr "immer"
 
+msgid "by name"
+msgstr "nach Namen"
+
+msgid "by time"
+msgstr "nach Zeit"
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -935,6 +950,9 @@ msgstr "Verzeichnisse im Timer-Men
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Verzeichnisse immer zuerst einsortieren"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr "Standard Sortierreihenfolge f�r Aufnahmen"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummerntasten f�r Zeichen"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM bereit"
 msgid " (activating)"
 msgstr " (wird aktiviert)"
 
+msgid "@ device"
+msgstr "@ Empf�nger"
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM wird benutzt - wirklich zur
 msgid "Can't reset CAM!"
 msgstr "Zur�cksetzen des CAM fehlgeschlagen!"
 
+msgid "no instant recording"
+msgstr "keine Sofortaufnahme"
+
+msgid "confirm instant recording"
+msgstr "Sofortaufnahme best�tigen"
+
+msgid "record instantly"
+msgstr "sofort aufnehmen"
+
 msgid "do not pause live video"
 msgstr "Live-Signal nicht anhalten"
 
@@ -1179,6 +1209,9 @@ msgstr "Default-Priorit
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Default-Lebensdauer (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr "Funktion der Aufnehmen-Taste"
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Funktion der Pause-Taste"
 
@@ -1278,6 +1311,15 @@ msgstr "VDR ausschalten bei Inaktivit
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP trennen bei Inaktivit�t (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr "SVDRP Verbindung"
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr "SVDRP Maschinenname"
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr "SVDRP Standardmaschine"
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Mindestzeit f�r vorherigen Kanal (s)"
 
@@ -1531,6 +1573,9 @@ msgstr "Aufnahme beginnt in K
 msgid "Pause live video?"
 msgstr "Live-Signal anhalten?"
 
+msgid "Start recording?"
+msgstr "Aufnahme starten?"
+
 msgid "Recording started"
 msgstr "Aufzeichnung gestartet"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index a131cd7c8..1660877cc 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -660,6 +660,9 @@ msgstr "
 msgid "File"
 msgstr "������"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr ""
 
@@ -672,6 +675,12 @@ msgstr ""
 msgid "First day"
 msgstr "����� ����"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr ""
 
@@ -847,6 +856,12 @@ msgstr "
 msgid "always"
 msgstr "�����"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -934,6 +949,9 @@ msgstr ""
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1118,6 +1136,9 @@ msgstr ""
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1148,6 +1169,15 @@ msgstr ""
 msgid "Can't reset CAM!"
 msgstr "������� � ��������� ��� CAM"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr ""
 
@@ -1178,6 +1208,9 @@ msgstr "
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "�������������� �������� ��������� (������)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr ""
 
@@ -1277,6 +1310,15 @@ msgstr "
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP ������� (�)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "������� ������� (�)"
 
@@ -1530,6 +1572,9 @@ msgstr ""
 msgid "Pause live video?"
 msgstr ""
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index b2827b5db..3a763f1b8 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-19 23:00+0100\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Duraci
 msgid "File"
 msgstr "Fichero"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Carpeta"
 
@@ -673,6 +676,12 @@ msgstr "Peri
 msgid "First day"
 msgstr "Primer d�a"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
@@ -848,6 +857,12 @@ msgstr "seg
 msgid "always"
 msgstr "siempre"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "Men�s en pantalla"
 
@@ -935,6 +950,9 @@ msgstr "Carpetas en men
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Siempre ordenar primero carpetas"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM preparado"
 msgid " (activating)"
 msgstr " (activando)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM en uso - 
 msgid "Can't reset CAM!"
 msgstr "�No se puede reiniciar CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "no pausar emisi�n en directo"
 
@@ -1179,6 +1209,9 @@ msgstr "Prioridad por defecto"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Duraci�n por defecto (d�as)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Gesti�n tecla de pausa"
 
@@ -1278,6 +1311,15 @@ msgstr "Tiempo m
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Tiempo de espera de SVDRP (sg)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Considerar canal como visto (sg)"
 
@@ -1531,6 +1573,9 @@ msgstr "
 msgid "Pause live video?"
 msgstr "�Pausar emisi�n en directo?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Iniciando grabaci�n"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 8bf931a4d..2f6e0de05 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -660,6 +660,9 @@ msgstr "Eluiga"
 msgid "File"
 msgstr "Fail"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Kaust"
 
@@ -672,6 +675,12 @@ msgstr "Korduv"
 msgid "First day"
 msgstr "1. päev"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Kausta valik"
 
@@ -847,6 +856,12 @@ msgstr "kestast sõltuv"
 msgid "always"
 msgstr "alati"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "Ekraanikuva"
 
@@ -934,6 +949,9 @@ msgstr "Kaustad taimeri menüüs"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Sorteerida kaustad alati ette"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
 
@@ -1118,6 +1136,9 @@ msgstr "CAM töövalmis"
 msgid " (activating)"
 msgstr " (aktiveerimine)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1148,6 +1169,15 @@ msgstr "CAM on kasutuses - taaskäivitada?"
 msgid "Can't reset CAM!"
 msgstr "CAM mooduli taaskäivitus ebaõnnestus!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "mitte peatada"
 
@@ -1178,6 +1208,9 @@ msgstr "Vaikimisi prioriteet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Salvestuse eluiga (päevi)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Pausi klahvi käsitlemine"
 
@@ -1277,6 +1310,15 @@ msgstr "Min. kasutaja tegevusetus (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP ooteaeg (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanalivahetuse ooteaeg (s)"
 
@@ -1530,6 +1572,9 @@ msgstr "Salvestamine tulekul!"
 msgid "Pause live video?"
 msgstr "Peatada otseülekanne?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Salvestamine käivitatud"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 05d4b0f9d..769981f3f 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -664,6 +664,9 @@ msgstr "Elinikä"
 msgid "File"
 msgstr "Tiedosto"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Kansio"
 
@@ -676,6 +679,12 @@ msgstr "Toistuva"
 msgid "First day"
 msgstr "1. päivä"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Valitse kansio"
 
@@ -851,6 +860,12 @@ msgstr "ulkoasun mukaan"
 msgid "always"
 msgstr "aina"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "Kuvaruutunäyttö"
 
@@ -938,6 +953,9 @@ msgstr "Näytä kansiot ajastinvalikossa"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Näytä kansiot ensin"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
@@ -1122,6 +1140,9 @@ msgstr "CAM valmis"
 msgid " (activating)"
 msgstr " (aktivoidaan)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1152,6 +1173,15 @@ msgstr "CA-moduuli käytössä - nollataanko?"
 msgid "Can't reset CAM!"
 msgstr "CA-moduulin nollaus epäonnistui!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "älä pysäytä lähetystä"
 
@@ -1182,6 +1212,9 @@ msgstr "Tallenteen oletusprioriteetti"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Tallenteen oletuselinikä (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Taukonäppäimen toiminta"
 
@@ -1281,6 +1314,15 @@ msgstr "Käyttäjätoiminnon odotusaika (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP-komennon odotusaika (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanavavalinnan odotusaika (s)"
 
@@ -1534,6 +1576,9 @@ msgstr "Tallennus on alkamassa!"
 msgid "Pause live video?"
 msgstr "Pysäytetäänkö lähetys?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 06bb12559..5e4348d27 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-11 11:02+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-18 20:16+0100\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -671,6 +671,9 @@ msgstr "Durée de vie"
 msgid "File"
 msgstr "Fichier"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Dossier"
 
@@ -683,6 +686,12 @@ msgstr "Périodique"
 msgid "First day"
 msgstr "Premier jour"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Sélectionner le dossier"
 
@@ -858,6 +867,12 @@ msgstr "dépendant du skin"
 msgid "always"
 msgstr "toujours"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "Affichage à l'écran"
 
@@ -945,6 +960,9 @@ msgstr "Dossiers dans menu programmation"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Toujours trier les dossiers en premier"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Touches numériques pour caractères"
 
@@ -1129,6 +1147,9 @@ msgstr "CAM prêt"
 msgid " (activating)"
 msgstr " (activation en cours)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1159,6 +1180,15 @@ msgstr "CAM en cours d'utilisation - confirmer réinitialisation ?"
 msgid "Can't reset CAM!"
 msgstr "Impossible de réinitialiser le CAM !"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "ne pas mettre en pause le direct"
 
@@ -1189,6 +1219,9 @@ msgstr "Priorité par défaut"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durée de vie par défaut (j)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Fonction de la touche Pause"
 
@@ -1288,6 +1321,15 @@ msgstr "Inactivité de l'utilisateur (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Temps maxi SVDRP (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Prise en compte chaîne (s)"
 
@@ -1541,6 +1583,9 @@ msgstr "L'enregistrement va commencer !"
 msgid "Pause live video?"
 msgstr "Arrêter le direct ?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "L'enregistrement a commencé"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 0424a4464..38d6fff80 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -662,6 +662,9 @@ msgstr "Trajanje"
 msgid "File"
 msgstr "Datoteka"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr ""
 
@@ -674,6 +677,12 @@ msgstr ""
 msgid "First day"
 msgstr "Prvi dan"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr ""
 
@@ -849,6 +858,12 @@ msgstr "ovisno o povr
 msgid "always"
 msgstr "uvijek"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -936,6 +951,9 @@ msgstr ""
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1120,6 +1138,9 @@ msgstr "CAM spreman"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1150,6 +1171,15 @@ msgstr "CAM se koristi - ponovno pokrenuti unato
 msgid "Can't reset CAM!"
 msgstr "Ponovno pokretanje CAM-a neuspje�no!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr ""
 
@@ -1180,6 +1210,9 @@ msgstr "Zadani prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Zadano trajanje (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr ""
 
@@ -1279,6 +1312,15 @@ msgstr "Minimalno vrijeme neaktivnosti (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP vrijeme neaktivnosti"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap istje�e (s)"
 
@@ -1532,6 +1574,9 @@ msgstr "Obnovljena snimka!"
 msgid "Pause live video?"
 msgstr ""
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Snimanje zapo�elo"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c34bc0e33..5af4a8c70 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-01-30 13:14+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-13 09:36+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -665,6 +665,9 @@ msgstr "Élettartam"
 msgid "File"
 msgstr "Fájl"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Könyvtár"
 
@@ -677,6 +680,12 @@ msgstr "Ismétlődő"
 msgid "First day"
 msgstr "Első nap"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Könyvtár kiválasztása"
 
@@ -852,6 +861,12 @@ msgstr "Menü nézetétől függően"
 msgid "always"
 msgstr "mindig"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -939,6 +954,9 @@ msgstr "Könyvtárválasztás az időzítő menüben"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Könyvtárakat rendezd előre"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Betűk a számgombokon"
 
@@ -1123,6 +1141,9 @@ msgstr "CAM működik"
 msgid " (activating)"
 msgstr " (aktiválás)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1153,6 +1174,15 @@ msgstr "CAM használatban - valóban újraindítani?"
 msgid "Can't reset CAM!"
 msgstr "CAM újraindítása nem sikerült!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "élőkép leállítása tiltva"
 
@@ -1183,6 +1213,9 @@ msgstr "Alapértelmezett prioritás"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Alapértelmezett élettartam (n)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Szünet gomb működése"
 
@@ -1282,6 +1315,15 @@ msgstr "VDR leáll használat nélkül (p)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP szétkapcsol használat nélkül(mp)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Előző csatorna időkorlátja (mp)"
 
@@ -1535,6 +1577,9 @@ msgstr "Felvétel rögtön indul!"
 msgid "Pause live video?"
 msgstr "Megállítsam az élő képet?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Felvétel elindítva"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 79946ffd5..d54a4a397 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-12 19:31+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -666,6 +666,9 @@ msgstr "Scadenza"
 msgid "File"
 msgstr "Nome"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Cartella"
 
@@ -678,6 +681,12 @@ msgstr "Repliche"
 msgid "First day"
 msgstr "1° giorno"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Seleziona cartella"
 
@@ -853,6 +862,12 @@ msgstr "in base allo stile interfaccia"
 msgid "always"
 msgstr "sempre"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -940,6 +955,9 @@ msgstr "Cartelle nel menu timer"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Ordina sempre per prima le cartelle"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
 
@@ -1124,6 +1142,9 @@ msgstr "La CAM è pronta"
 msgid " (activating)"
 msgstr " (attivazione)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
 
@@ -1154,6 +1175,15 @@ msgstr "La CAM è in uso - vuoi reimpostarla?"
 msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "non mettere in pausa il video dal vivo"
 
@@ -1184,6 +1214,9 @@ msgstr "Priorità predefinita"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Scadenza predefinita (gg)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Gestione tasto Pausa"
 
@@ -1283,6 +1316,15 @@ msgstr "Periodo min. inattività (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Scadenza SVDRP (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Scadenza Zapping (s)"
 
@@ -1536,6 +1578,9 @@ msgstr "Registrazione imminente!"
 msgid "Pause live video?"
 msgstr "Pausare video dal vivo?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Registrazione avviata"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index a77dfcc78..b19538b0d 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-11 14:02+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -660,6 +660,9 @@ msgstr "Galiojimas"
 msgid "File"
 msgstr "Failas"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Katalogas"
 
@@ -672,6 +675,12 @@ msgstr "Kartotinas"
 msgid "First day"
 msgstr "Pirma diena"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Pasirinkite katalogą"
 
@@ -847,6 +856,12 @@ msgstr "priklauso nuo stiliaus"
 msgid "always"
 msgstr "visada"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD (ekrano užsklanda)"
 
@@ -934,6 +949,9 @@ msgstr "Katalogai esantys laikmačių meniu"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Visada pirmiau rūšiuoti katalogus"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
 
@@ -1118,6 +1136,9 @@ msgstr "Dekodavimo modulis (CAM) paruoštas darbui"
 msgid " (activating)"
 msgstr " (aktyvuojama)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "Dekodavimo modulis (CAM)"
 
@@ -1148,6 +1169,15 @@ msgstr "Dekodavimo modulis šiuo metu naudojamas - tikrai perkrauti?"
 msgid "Can't reset CAM!"
 msgstr "Negali perkrauti dekodavimo modulio!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "nepristabdyti 'gyvo' video srauto"
 
@@ -1178,6 +1208,9 @@ msgstr "Numatytas laikmačio prioritetas"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Numatytasis įrašo saugojimo laikas (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Pauzės mygtuko interpretavimas"
 
@@ -1277,6 +1310,15 @@ msgstr "Min. įvesties laukimo laikas (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP užlaikymas (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanalo perjungimo užlaikymas (s)"
 
@@ -1530,6 +1572,9 @@ msgstr "Tuoj įsijungs įrašinėjimas!"
 msgid "Pause live video?"
 msgstr "Sustabdyti 'gyvą' video srautą?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Įrašymas prasidėjo"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 3e4e7e4ac..6e81944ba 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-08 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -661,6 +661,9 @@ msgstr "Траење"
 msgid "File"
 msgstr "Датотека"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Директориум"
 
@@ -673,6 +676,12 @@ msgstr "Периодичен"
 msgid "First day"
 msgstr "Прв ден"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Избери директориум"
 
@@ -848,6 +857,12 @@ msgstr "зависно од фасада"
 msgid "always"
 msgstr "секогаш"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -935,6 +950,9 @@ msgstr "Директориуми во менито за тајмер"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Секогаш сортирај прво папки"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Нумерички копчиња за букви"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM спремен"
 msgid " (activating)"
 msgstr " (активирање)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM е во употреба - рестартирај?"
 msgid "Can't reset CAM!"
 msgstr "Неуспешно рестартирање на CAM-от!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "не паузирај пренос во живо"
 
@@ -1179,6 +1209,9 @@ msgstr "Зададен приоритет"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Стандардно веметраење (денови)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Подесување на копчето пауза"
 
@@ -1278,6 +1311,15 @@ msgstr "Минимум неактивност на корисникот (мин)
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP тајмаут (сек)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Зап тајмаут (сек)"
 
@@ -1531,6 +1573,9 @@ msgstr "Претстои снимање!"
 msgid "Pause live video?"
 msgstr "Паузирај пренос во живо?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Снимањето почна"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ab3fabd25..6621e393a 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-11 10:51+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-10 19:43+0100\n"
 "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -666,6 +666,9 @@ msgstr "Bewaarduur"
 msgid "File"
 msgstr "Bestandnaam"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Map"
 
@@ -678,6 +681,12 @@ msgstr "Herhalen"
 msgid "First day"
 msgstr "Eerste dag"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Kies map"
 
@@ -853,6 +862,12 @@ msgstr "skin afhankelijk"
 msgid "always"
 msgstr "altijd"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -940,6 +955,9 @@ msgstr "Mappen in timermenu"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Altijd mappen eerst sorteren"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummertoetsen voor karakters"
 
@@ -1124,6 +1142,9 @@ msgstr "CAM gereed"
 msgid " (activating)"
 msgstr " (Activeren)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1154,6 +1175,15 @@ msgstr "CAM wordt gebruikt - werkelijk herstarten?"
 msgid "Can't reset CAM!"
 msgstr "Kan CAM niet herstarten!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "live video niet pauzeren"
 
@@ -1184,6 +1214,9 @@ msgstr "Standaard prioriteit"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Standaard levensduur (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Gedrag pauze toets"
 
@@ -1283,6 +1316,15 @@ msgstr "Minimum gebruikers inactiviteit (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP Timeout (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap timeout (s)"
 
@@ -1536,6 +1578,9 @@ msgstr "Opname start binnenkort!"
 msgid "Pause live video?"
 msgstr "Pauzeer live video?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Opname is gestart!"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index ba20fc6ee..d90bedb84 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Levetid"
 msgid "File"
 msgstr "Filnavn"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr ""
 
@@ -673,6 +676,12 @@ msgstr ""
 msgid "First day"
 msgstr "F�rste dag"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr ""
 
@@ -848,6 +857,12 @@ msgstr ""
 msgid "always"
 msgstr ""
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -935,6 +950,9 @@ msgstr ""
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1119,6 +1137,9 @@ msgstr ""
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr ""
 msgid "Can't reset CAM!"
 msgstr ""
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr ""
 
@@ -1179,6 +1209,9 @@ msgstr "Normal prioritet (Timer)"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal levetid timer (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr ""
 
@@ -1278,6 +1311,15 @@ msgstr "Minimumstid med inaktivitet (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Ubrukt SVDRP-levetid (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr ""
 
@@ -1531,6 +1573,9 @@ msgstr ""
 msgid "Pause live video?"
 msgstr ""
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index becb8cb20..7b4ab888f 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-12 00:59+0100\n"
 "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -663,6 +663,9 @@ msgstr "Czas 
 msgid "File"
 msgstr "Plik"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Katalog"
 
@@ -675,6 +678,12 @@ msgstr "Powtarzanie"
 msgid "First day"
 msgstr "Pierwszy dzie�"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
@@ -850,6 +859,12 @@ msgstr "zal. od sk
 msgid "always"
 msgstr "zawsze"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -937,6 +952,9 @@ msgstr "Katalogi w menu timera"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Sortuj najpierw katalogi"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Klawisze numeryczne dla liter"
 
@@ -1121,6 +1139,9 @@ msgstr "CAM gotowy"
 msgid " (activating)"
 msgstr " (aktywuj�)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1151,6 +1172,15 @@ msgstr "CAM jest w u
 msgid "Can't reset CAM!"
 msgstr "Nie mo�na zresetowa� CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "nie wstrzymuj transmisji na �ywo"
 
@@ -1181,6 +1211,9 @@ msgstr "Domy
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Domy�lny czas �ycia (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Obs�uga klawisza pauzy"
 
@@ -1280,6 +1313,15 @@ msgstr "Minimalny czas nieaktywno
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Czas oczekiwania na SVDRP (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Czas oczekiwania na zap (s)"
 
@@ -1533,6 +1575,9 @@ msgstr "Wkr
 msgid "Pause live video?"
 msgstr "Zatrzyma� transmisj� na �ywo?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Rozpocz�to nagrywanie"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9a0f79241..ecf726022 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Validade"
 msgid "File"
 msgstr "Ficheiro"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Pasta"
 
@@ -673,6 +676,12 @@ msgstr ""
 msgid "First day"
 msgstr "1� dia"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Seleccione a pasta"
 
@@ -848,6 +857,12 @@ msgstr "dependente do tema"
 msgid "always"
 msgstr "sempre"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -935,6 +950,9 @@ msgstr "Pastas no menu de grava
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM pronta"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM em uso - reiniciar mesmo?"
 msgid "Can't reset CAM!"
 msgstr "Imposs�vel reiniciar a CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "n�o pausar emiss�o"
 
@@ -1179,6 +1209,9 @@ msgstr "PPrioridade padr
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Validade padr�o (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Comportamento da tecla Pausa"
 
@@ -1278,6 +1311,15 @@ msgstr "Tempo m
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Tempo de espera SVDRP (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Tempo de espera entre mudan�a de canais (s)"
 
@@ -1531,6 +1573,9 @@ msgstr "Grava
 msgid "Pause live video?"
 msgstr "Pausar emiss�o?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Grava��o iniciada"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index c88dd0a83..157acf3c0 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-11 22:26+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -662,6 +662,9 @@ msgstr "Timp de păstrare"
 msgid "File"
 msgstr "Fişier"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Director"
 
@@ -674,6 +677,12 @@ msgstr "Repetitiv"
 msgid "First day"
 msgstr "Prima zi"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Selectează directorul"
 
@@ -849,6 +858,12 @@ msgstr "dependent de skin"
 msgid "always"
 msgstr "întotdeauna"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -936,6 +951,9 @@ msgstr "Directoare în meniul de timer-e"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Sortează întotdeauna directoarele la început"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Caractere pe tastele numerice"
 
@@ -1120,6 +1138,9 @@ msgstr "CAM pregătit"
 msgid " (activating)"
 msgstr " (activez)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1150,6 +1171,15 @@ msgstr "CAM-ul este in folosinţă - totuşi resetez?"
 msgid "Can't reset CAM!"
 msgstr "Nu pot reseta CAM"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "nu înregistra emisiunea"
 
@@ -1180,6 +1210,9 @@ msgstr "Prioritate implicită"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Timp de păstrare predefinit (zile)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Funcţia tastei 'pauză'"
 
@@ -1279,6 +1312,15 @@ msgstr "Durata minimă de inactivitate (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Timeout SVDRP (sec)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Interval zapping (s)"
 
@@ -1532,6 +1574,9 @@ msgstr "Urmează o înregistrare!"
 msgid "Pause live video?"
 msgstr "Înregistrez emisiunea?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "A început înregistrarea"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3e5057d7f..eea8b8def 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2013-03-10 17:13+0100\n"
 "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "
 msgid "File"
 msgstr "����"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "����������"
 
@@ -673,6 +676,12 @@ msgstr "
 msgid "First day"
 msgstr "������ ����"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "����� ����������"
 
@@ -848,6 +857,12 @@ msgstr "
 msgid "always"
 msgstr "������"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "����"
 
@@ -935,6 +950,9 @@ msgstr "
 msgid "Setup.OSD$Always sort folders first"
 msgstr "���������� ������ � ������ ������� �����������"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "���������� ������ ��� ��������"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM 
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "�������� ������"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM 
 msgid "Can't reset CAM!"
 msgstr "������ ����������� CAM-������!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "�� ������������� live video"
 
@@ -1179,6 +1209,9 @@ msgstr "
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "���� �������� ������ �� ��������� (�)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "������� ������ �����"
 
@@ -1278,6 +1311,15 @@ msgstr "
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "�������� ������ ����. SVDRP (���)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�������� ������������ ������ (���)"
 
@@ -1531,6 +1573,9 @@ msgstr "
 msgid "Pause live video?"
 msgstr "���������� live video?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "������ ������"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index cfc9bdee9..fcee4824d 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-17 18:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "
 msgid "File"
 msgstr "S�bor"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Zlo�ka"
 
@@ -673,6 +676,12 @@ msgstr "s opakovan
 msgid "First day"
 msgstr "Odo d�a"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Vybra� zlo�ku"
 
@@ -848,6 +857,12 @@ msgstr "pod
 msgid "always"
 msgstr "v�dy"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD (Menu na obrazovke)"
 
@@ -935,6 +950,9 @@ msgstr "Zlo
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Zlo�ky v�dy najprv usporiada�"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "P�sa� znaky ��seln�mi tla�idlami"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM pripraven
 msgid " (activating)"
 msgstr " (aktivovan�)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM (modul podmienen�ho pr�stupu)"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM sa pou
 msgid "Can't reset CAM!"
 msgstr "CAM modul nejde re�tartova�!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "nepozastavova� �iv� vysielanie"
 
@@ -1179,6 +1209,9 @@ msgstr "Predvolen
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Predvolen� �ivotnos�"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Chovanie kl�vesy pozastavenia"
 
@@ -1278,6 +1311,15 @@ msgstr "Vymedzi
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "�asov� limit odpovede SVDRP (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "pam�ta� predo�l� kan�l po ... (s)"
 
@@ -1531,6 +1573,9 @@ msgstr "Onedlho za
 msgid "Pause live video?"
 msgstr "Preru�i� �iv� vysielanie?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Za�alo nahr�vanie"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index d12ccb212..048ce54e2 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Veljavnost"
 msgid "File"
 msgstr "Datoteka"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Direktorij"
 
@@ -673,6 +676,12 @@ msgstr "Ponavljajo
 msgid "First day"
 msgstr "Prvi dan"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Izberi direkotrij"
 
@@ -848,6 +857,12 @@ msgstr "odvisno od preobleke"
 msgid "always"
 msgstr "vedno"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -935,6 +950,9 @@ msgstr "Direktoriji v meniju urnika"
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "�tevilo tipk za znake"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM pripravljen"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM je v uporabi - zares resetiraj?"
 msgid "Can't reset CAM!"
 msgstr "Ne morem resetirati CAM-a!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "ne ustavi videa v �ivo"
 
@@ -1179,6 +1209,9 @@ msgstr "Privzeta prioriteta"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Privzeti �ivljenski �as (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Gumb za pavzo"
 
@@ -1278,6 +1311,15 @@ msgstr "Najmanj
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP �as neaktivnosti (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "�as ugla�evanja (s)"
 
@@ -1531,6 +1573,9 @@ msgstr "Sledi snemanje!"
 msgid "Pause live video?"
 msgstr "Zaustavi video v �ivo"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Snemanje se je pri�elo"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 646607f71..c12e296a3 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Trajanje"
 msgid "File"
 msgstr "Datoteka"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Direktorijum"
 
@@ -673,6 +676,12 @@ msgstr "Ponavljaju
 msgid "First day"
 msgstr "Prvi dan"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Izaberi direktorijum"
 
@@ -848,6 +857,12 @@ msgstr "zavisi od stila (skin-a)"
 msgid "always"
 msgstr "uvek"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -935,6 +950,9 @@ msgstr "Direktorijumi u meniju tajmera"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Uvek sortiraj direktorijume prve"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Pi�ite pomo�u numeri�kih dugmi�a (kao SMS)"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM spreman"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM u upotrebi - stvarno ponovno pokrenuti?"
 msgid "Can't reset CAM!"
 msgstr "Ponovno pokretanje CAM-a neuspe�no!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "ne zaustavljaj signal u�ivo"
 
@@ -1179,6 +1209,9 @@ msgstr "Podrazumevani prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Podrazumevano trajanje (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Funkcija dugme za pauzu"
 
@@ -1278,6 +1311,15 @@ msgstr "Min. vreme neaktivnosti pre ga
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Ga�enje SVDRP-a usled neaktivnosti (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap isti�e (s)"
 
@@ -1531,6 +1573,9 @@ msgstr "Uskoro po
 msgid "Pause live video?"
 msgstr "Zaustavi signal u�ivo?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Snimanje zapo�elo"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index c164fa1df..79723c872 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-12 21:58+0100\n"
 "Last-Translator: Magnus Sirvi� <sirwio@hotmail.com>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -665,6 +665,9 @@ msgstr "Livstid"
 msgid "File"
 msgstr "Filnamn"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Mapp"
 
@@ -677,6 +680,12 @@ msgstr "Repeterande"
 msgid "First day"
 msgstr "F�rsta dag"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "V�lj mapp"
 
@@ -852,6 +861,12 @@ msgstr "skin-beroende"
 msgid "always"
 msgstr "alltid"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -939,6 +954,9 @@ msgstr "Visa mappar i timermenyn"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Sortera alltid mappar f�rst"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Anv�nd sifferknappar f�r bokstavsinmatning"
 
@@ -1123,6 +1141,9 @@ msgstr "CAM klar"
 msgid " (activating)"
 msgstr " (aktiverar)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1153,6 +1174,15 @@ msgstr "CAM upptagen, vill du verkligen 
 msgid "Can't reset CAM!"
 msgstr "Kan inte �terst�lla CAM!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "pausa inte p�g�ende program"
 
@@ -1183,6 +1213,9 @@ msgstr "Normal prioritet"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Normal livstid (dagar)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Hantering av pausknapp"
 
@@ -1282,6 +1315,15 @@ msgstr "Tidsgr
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP-tidsgr�ns (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap-tidsgr�ns (s)"
 
@@ -1535,6 +1577,9 @@ msgstr "Snart b
 msgid "Pause live video?"
 msgstr "Pausa p�g�ende program?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Inspelningen har startat"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 46a6a088b..1d3993324 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -660,6 +660,9 @@ msgstr "
 msgid "File"
 msgstr "K�t�k"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr ""
 
@@ -672,6 +675,12 @@ msgstr ""
 msgid "First day"
 msgstr "�lk g�n"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr ""
 
@@ -847,6 +856,12 @@ msgstr "y
 msgid "always"
 msgstr "hep"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -934,6 +949,9 @@ msgstr ""
 msgid "Setup.OSD$Always sort folders first"
 msgstr ""
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1118,6 +1136,9 @@ msgstr "CAM haz
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM"
 
@@ -1148,6 +1169,15 @@ msgstr "CAM kullan
 msgid "Can't reset CAM!"
 msgstr "CAM s�f�rlanamad�!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr ""
 
@@ -1178,6 +1208,9 @@ msgstr "Ola
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Ola�an �ekim �mr� (g�n)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr ""
 
@@ -1277,6 +1310,15 @@ msgstr "Minimum kullan
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP zaman a��m� (sn)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zaping zaman a��m� (sn)"
 
@@ -1530,6 +1572,9 @@ msgstr "
 msgid "Pause live video?"
 msgstr ""
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Kay�t ba�land�"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 9d7328bcd..8bff8e250 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2015-02-13 18:14+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -661,6 +661,9 @@ msgstr "Строк зберігання"
 msgid "File"
 msgstr "Файл"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "Тека"
 
@@ -673,6 +676,12 @@ msgstr "Повтор"
 msgid "First day"
 msgstr "Перший день"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "Вибрати теку"
 
@@ -848,6 +857,12 @@ msgstr "згідно зі стилем"
 msgid "always"
 msgstr "завжди"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "Меню"
 
@@ -935,6 +950,9 @@ msgstr "Теки в меню таймера"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "Завжди сортувати теки першими"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Кількість клавіш для символів"
 
@@ -1119,6 +1137,9 @@ msgstr "CAM готовий"
 msgid " (activating)"
 msgstr " (активування)"
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM (Умовний доступ)"
 
@@ -1149,6 +1170,15 @@ msgstr "CAM використовується - дійсно перезапуст
 msgid "Can't reset CAM!"
 msgstr "Помилка перезапуску CAM-модуля!"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "не призупиняти перегляд"
 
@@ -1179,6 +1209,9 @@ msgstr "Пріоритет таймера по замовчуванню"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Строк зберігання запису по замовчуванню (дні)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "Обробка клавіші відкладеного перегляду"
 
@@ -1278,6 +1311,15 @@ msgstr "Мін. час очікування вводу (хв)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Затримка обриву з'єднання SVDRP (сек)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Затримка переключання каналу (сек)"
 
@@ -1531,6 +1573,9 @@ msgstr "Запис скоро почнеться!"
 msgid "Pause live video?"
 msgstr "Призупинити перегляд?"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "Запис почався"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0dfbd6c23..09aea4b6f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-02-10 13:40+0100\n"
+"POT-Creation-Date: 2015-09-11 10:38+0200\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -662,6 +662,9 @@ msgstr "终生"
 msgid "File"
 msgstr "文件"
 
+msgid "Record on"
+msgstr ""
+
 msgid "Button$Folder"
 msgstr "文件夹"
 
@@ -674,6 +677,12 @@ msgstr "重复"
 msgid "First day"
 msgstr "第一天"
 
+msgid "Error while accessing remote timer"
+msgstr ""
+
+msgid "Timer has been deleted!"
+msgstr ""
+
 msgid "Select folder"
 msgstr "选择文件夹"
 
@@ -849,6 +858,12 @@ msgstr "皮肤选择"
 msgid "always"
 msgstr "总是"
 
+msgid "by name"
+msgstr ""
+
+msgid "by time"
+msgstr ""
+
 msgid "OSD"
 msgstr "系统菜单设置"
 
@@ -936,6 +951,9 @@ msgstr "定时器菜单中的文件夹"
 msgid "Setup.OSD$Always sort folders first"
 msgstr "总是排序文件夹"
 
+msgid "Setup.OSD$Default sort mode for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "数字键的字符"
 
@@ -1120,6 +1138,9 @@ msgstr "CAM准备"
 msgid " (activating)"
 msgstr ""
 
+msgid "@ device"
+msgstr ""
+
 msgid "CAM"
 msgstr "CAM设置"
 
@@ -1150,6 +1171,15 @@ msgstr "CAM正在使用-是否重启？"
 msgid "Can't reset CAM!"
 msgstr "不能重启CAM"
 
+msgid "no instant recording"
+msgstr ""
+
+msgid "confirm instant recording"
+msgstr ""
+
+msgid "record instantly"
+msgstr ""
+
 msgid "do not pause live video"
 msgstr "取消暂停当前视频"
 
@@ -1180,6 +1210,9 @@ msgstr "默认优先"
 msgid "Setup.Recording$Default lifetime (d)"
 msgstr "默认终身 (d)"
 
+msgid "Setup.Recording$Record key handling"
+msgstr ""
+
 msgid "Setup.Recording$Pause key handling"
 msgstr "暂停关键的处理"
 
@@ -1279,6 +1312,15 @@ msgstr "Min. 使用者静止 (min)"
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP 超时 (s)"
 
+msgid "Setup.Miscellaneous$SVDRP peering"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP host name"
+msgstr ""
+
+msgid "Setup.Miscellaneous$SVDRP default host"
+msgstr ""
+
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Zap 超时 (s)"
 
@@ -1532,6 +1574,9 @@ msgstr "准备录像！"
 msgid "Pause live video?"
 msgstr "是否暂停视频播放？"
 
+msgid "Start recording?"
+msgstr ""
+
 msgid "Recording started"
 msgstr "录像开始！"
 
diff --git a/positioner.c b/positioner.c
index 22bad1b8f..fdb07bb54 100644
--- a/positioner.c
+++ b/positioner.c
@@ -8,7 +8,7 @@
  * http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1154305-grundlagen-und-winkelberechnungen-f%C3%BCr-h-h-diseqc-motor-antennenanlagen
  * by Albert Danis.
  *
- * $Id: positioner.c 3.5 2015/02/14 11:54:31 kls Exp $
+ * $Id: positioner.c 4.0 2015/02/14 11:54:31 kls Exp $
  */
 
 #include "positioner.h"
diff --git a/positioner.h b/positioner.h
index 4fdc3d059..29c15245e 100644
--- a/positioner.h
+++ b/positioner.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: positioner.h 3.3 2013/12/28 11:15:56 kls Exp $
+ * $Id: positioner.h 4.0 2013/12/28 11:15:56 kls Exp $
  */
 
 #ifndef __POSITIONER_H
diff --git a/receiver.c b/receiver.c
index d8f51e680..9375d4f47 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 3.3 2015/01/12 14:04:31 kls Exp $
+ * $Id: receiver.c 4.0 2015/01/12 14:04:31 kls Exp $
  */
 
 #include "receiver.h"
diff --git a/receiver.h b/receiver.h
index b35482585..09da8cda0 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 3.3 2015/01/12 14:03:22 kls Exp $
+ * $Id: receiver.h 4.1 2015/09/05 11:42:47 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -31,7 +31,7 @@ class cReceiver {
                ///< (On == true) and right after it gets detached from (On == false) a cDevice. It can be used
                ///< to do things like starting/stopping a thread.
                ///< It is guaranteed that Receive() will not be called before Activate(true).
-  virtual void Receive(uchar *Data, int Length) = 0;
+  virtual void Receive(const uchar *Data, int Length) = 0;
                ///< This function is called from the cDevice we are attached to, and
                ///< delivers one TS packet from the set of PIDs the cReceiver has requested.
                ///< The data packet must be accepted immediately, and the call must return
diff --git a/recorder.c b/recorder.c
index 3d6b80639..896ec9394 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 3.3 2014/02/21 09:19:52 kls Exp $
+ * $Id: recorder.c 4.4 2015/09/12 14:56:15 kls Exp $
  */
 
 #include "recorder.h"
@@ -106,9 +106,31 @@ void cRecorder::Activate(bool On)
      Cancel(3);
 }
 
-void cRecorder::Receive(uchar *Data, int Length)
+void cRecorder::Receive(const uchar *Data, int Length)
 {
   if (Running()) {
+     static const uchar aff[TS_SIZE - 4] = { 0xB7, 0x00,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+       0xFF, 0xFF}; // Length is always TS_SIZE!
+     if ((Data[3] & 0b00110000) == 0b00100000 && !memcmp(Data + 4, aff, sizeof(aff)))
+        return; // Adaptation Field Filler found, skipping
      int p = ringBuffer->Put(Data, Length);
      if (p != Length && Running())
         ringBuffer->ReportOverflow(Length - p);
@@ -135,7 +157,8 @@ void cRecorder::Action(void)
                        if (frameDetector->FramesPerSecond() > 0 && DoubleEqual(RecordingInfo.FramesPerSecond(), DEFAULTFRAMESPERSECOND) && !DoubleEqual(RecordingInfo.FramesPerSecond(), frameDetector->FramesPerSecond())) {
                           RecordingInfo.SetFramesPerSecond(frameDetector->FramesPerSecond());
                           RecordingInfo.Write();
-                          Recordings.UpdateByName(recordingName);
+                          LOCK_RECORDINGS_WRITE;
+                          Recordings->UpdateByName(recordingName);
                           }
                        }
                     InfoWritten = true;
diff --git a/recorder.h b/recorder.h
index 4e7848a61..2fc7ef180 100644
--- a/recorder.h
+++ b/recorder.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.h 3.1 2015/01/15 14:27:02 kls Exp $
+ * $Id: recorder.h 4.1 2015/09/05 11:46:23 kls Exp $
  */
 
 #ifndef __RECORDER_H
@@ -35,7 +35,7 @@ class cRecorder : public cReceiver, cThread {
        ///< member of the cReceiver class) from your own destructor in order
        ///< to properly get a call to Activate(false) when your object is
        ///< destroyed.
-  virtual void Receive(uchar *Data, int Length);
+  virtual void Receive(const uchar *Data, int Length);
   virtual void Action(void);
 public:
   cRecorder(const char *FileName, const cChannel *Channel, int Priority);
diff --git a/recording.c b/recording.c
index 0a0841405..a847c7d10 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 3.28 2015/02/16 07:49:14 kls Exp $
+ * $Id: recording.c 4.4 2015/09/09 10:21:58 kls Exp $
  */
 
 #include "recording.h"
@@ -76,9 +76,6 @@ int DirectoryNameMax = NAME_MAX;
 bool DirectoryEncoding = false;
 int InstanceId = 0;
 
-cRecordings DeletedRecordings(true);
-static cRecordings VanishedRecordings;
-
 // --- cRemoveDeletedRecordingsThread ----------------------------------------
 
 class cRemoveDeletedRecordingsThread : public cThread {
@@ -100,8 +97,8 @@ void cRemoveDeletedRecordingsThread::Action(void)
   if (LockFile.Lock()) {
      time_t StartTime = time(NULL);
      bool deleted = false;
-     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
-     for (cRecording *r = DeletedRecordings.First(); r; ) {
+     LOCK_DELETEDRECORDINGS_WRITE;
+     for (cRecording *r = DeletedRecordings->First(); r; ) {
          if (cIoThrottle::Engaged())
             return;
          if (time(NULL) - StartTime > MAXREMOVETIME)
@@ -109,14 +106,14 @@ void cRemoveDeletedRecordingsThread::Action(void)
          if (cRemote::HasKeys())
             return; // react immediately on user input
          if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
-            cRecording *next = DeletedRecordings.Next(r);
+            cRecording *next = DeletedRecordings->Next(r);
             r->Remove();
-            DeletedRecordings.Del(r);
+            DeletedRecordings->Del(r);
             r = next;
             deleted = true;
             continue;
             }
-         r = DeletedRecordings.Next(r);
+         r = DeletedRecordings->Next(r);
          }
      if (deleted) {
         const char *IgnoreFiles[] = { SORTMODEFILE, NULL };
@@ -134,8 +131,8 @@ void RemoveDeletedRecordings(void)
   static time_t LastRemoveCheck = 0;
   if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
      if (!RemoveDeletedRecordingsThread.Active()) {
-        cThreadLock DeletedRecordingsLock(&DeletedRecordings);
-        for (cRecording *r = DeletedRecordings.First(); r; r = DeletedRecordings.Next(r)) {
+        LOCK_DELETEDRECORDINGS_READ;
+        for (const cRecording *r = DeletedRecordings->First(); r; r = DeletedRecordings->Next(r)) {
             if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
                RemoveDeletedRecordingsThread.Start();
                break;
@@ -163,37 +160,43 @@ void AssertFreeDiskSpace(int Priority, bool Force)
            return;
         // Remove the oldest file that has been "deleted":
         isyslog("low disk space while recording, trying to remove a deleted recording...");
-        cThreadLock DeletedRecordingsLock(&DeletedRecordings);
-        if (DeletedRecordings.Count()) {
-           cRecording *r = DeletedRecordings.First();
-           cRecording *r0 = NULL;
-           while (r) {
-                 if (r->IsOnVideoDirectoryFileSystem()) { // only remove recordings that will actually increase the free video disk space
-                    if (!r0 || r->Start() < r0->Start())
-                       r0 = r;
-                    }
-                 r = DeletedRecordings.Next(r);
-                 }
-           if (r0) {
-              if (r0->Remove())
-                 LastFreeDiskCheck += REMOVELATENCY / Factor;
-              DeletedRecordings.Del(r0);
-              return;
-              }
-           }
-        else {
+        int NumDeletedRecordings = 0;
+        {
+          LOCK_DELETEDRECORDINGS_WRITE;
+          NumDeletedRecordings = DeletedRecordings->Count();
+          if (NumDeletedRecordings) {
+             cRecording *r = DeletedRecordings->First();
+             cRecording *r0 = NULL;
+             while (r) {
+                   if (r->IsOnVideoDirectoryFileSystem()) { // only remove recordings that will actually increase the free video disk space
+                      if (!r0 || r->Start() < r0->Start())
+                         r0 = r;
+                      }
+                   r = DeletedRecordings->Next(r);
+                   }
+             if (r0) {
+                if (r0->Remove())
+                   LastFreeDiskCheck += REMOVELATENCY / Factor;
+                DeletedRecordings->Del(r0);
+                return;
+                }
+             }
+        }
+        if (NumDeletedRecordings == 0) {
            // DeletedRecordings was empty, so to be absolutely sure there are no
            // deleted recordings we need to double check:
-           DeletedRecordings.Update(true);
-           if (DeletedRecordings.Count())
+           cRecordings::Update(true);
+           LOCK_DELETEDRECORDINGS_READ;
+           if (DeletedRecordings->Count())
               return; // the next call will actually remove it
            }
         // No "deleted" files to remove, so let's see if we can delete a recording:
         if (Priority > 0) {
            isyslog("...no deleted recording found, trying to delete an old recording...");
-           cThreadLock RecordingsLock(&Recordings);
-           if (Recordings.Count()) {
-              cRecording *r = Recordings.First();
+           LOCK_RECORDINGS_WRITE;
+           Recordings->SetExplicitModify();
+           if (Recordings->Count()) {
+              cRecording *r = Recordings->First();
               cRecording *r0 = NULL;
               while (r) {
                     if (r->IsOnVideoDirectoryFileSystem()) { // only delete recordings that will actually increase the free video disk space
@@ -209,10 +212,11 @@ void AssertFreeDiskSpace(int Priority, bool Force)
                              }
                           }
                        }
-                    r = Recordings.Next(r);
+                    r = Recordings->Next(r);
                     }
               if (r0 && r0->Delete()) {
-                 Recordings.Del(r0);
+                 Recordings->Del(r0);
+                 Recordings->SetModified();
                  return;
                  }
               }
@@ -227,14 +231,6 @@ void AssertFreeDiskSpace(int Priority, bool Force)
      }
 }
 
-// --- Clear vanished recordings ---------------------------------------------
-
-void ClearVanishedRecordings(void)
-{
-  cThreadLock RecordingsLock(&Recordings); // yes, it *is* Recordings!
-  VanishedRecordings.Clear();
-}
-
 // --- cResumeFile -----------------------------------------------------------
 
 cResumeFile::cResumeFile(const char *FileName, bool IsPesRecording)
@@ -309,7 +305,8 @@ bool cResumeFile::Save(int Index)
            if (safe_write(f, &Index, sizeof(Index)) < 0)
               LOG_ERROR_STR(fileName);
            close(f);
-           Recordings.ResetResume(fileName);
+           LOCK_RECORDINGS_WRITE;
+           Recordings->ResetResume(fileName);
            return true;
            }
         }
@@ -318,7 +315,8 @@ bool cResumeFile::Save(int Index)
         if (f) {
            fprintf(f, "I %d\n", Index);
            fclose(f);
-           Recordings.ResetResume(fileName);
+           LOCK_RECORDINGS_WRITE;
+           Recordings->ResetResume(fileName);
            }
         else
            LOG_ERROR_STR(fileName);
@@ -331,8 +329,10 @@ bool cResumeFile::Save(int Index)
 void cResumeFile::Delete(void)
 {
   if (fileName) {
-     if (remove(fileName) == 0)
-        Recordings.ResetResume(fileName);
+     if (remove(fileName) == 0) {
+        LOCK_RECORDINGS_WRITE;
+        Recordings->ResetResume(fileName);
+        }
      else if (errno != ENOENT)
         LOG_ERROR_STR(fileName);
      }
@@ -787,10 +787,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
            else
               break;
            }
-     if (Timer->IsSingleEvent()) {
+     if (Timer->IsSingleEvent())
         Timer->SetFile(name); // this was an instant recording, so let's set the actual data
-        Timers.SetModified();
-        }
      }
   else if (Timer->IsSingleEvent() || !Setup.UseSubtitle)
      name = strdup(Timer->File());
@@ -1017,7 +1015,7 @@ int cRecording::Compare(const cListObject &ListObject) const
   return strcasecmp(SortName(), r->SortName());
 }
 
-bool cRecording::IsInPath(const char *Path)
+bool cRecording::IsInPath(const char *Path) const
 {
   if (isempty(Path))
      return true;
@@ -1154,20 +1152,14 @@ bool cRecording::IsOnVideoDirectoryFileSystem(void) const
   return isOnVideoDirectoryFileSystem;
 }
 
-bool cRecording::HasMarks(void)
+bool cRecording::HasMarks(void) const
 {
   return access(cMarks::MarksFileName(this), F_OK) == 0;
 }
 
 bool cRecording::DeleteMarks(void)
 {
-  if (remove(cMarks::MarksFileName(this)) < 0) {
-     if (errno != ENOENT) {
-        LOG_ERROR_STR(fileName);
-        return false;
-        }
-     }
-  return true;
+  return cMarks::DeleteMarksFile(this);
 }
 
 void cRecording::ReadInfo(void)
@@ -1219,8 +1211,6 @@ bool cRecording::ChangePriorityLifetime(int NewPriority, int NewLifetime)
         if (!WriteInfo())
            return false;
         }
-     Recordings.ChangeState();
-     Recordings.TouchUpdate();
      }
   return true;
 }
@@ -1245,8 +1235,6 @@ bool cRecording::ChangeName(const char *NewName)
         }
      isOnVideoDirectoryFileSystem = -1; // it might have been moved to a different file system
      ClearSortName();
-     Recordings.ChangeState();
-     Recordings.TouchUpdate();
      }
   return true;
 }
@@ -1360,58 +1348,54 @@ int cRecording::FileSizeMB(void) const
   return fileSizeMB;
 }
 
-// --- cRecordings -----------------------------------------------------------
-
-cRecordings Recordings;
+// --- cVideoDirectoryScannerThread ------------------------------------------
 
-char *cRecordings::updateFileName = NULL;
+class cVideoDirectoryScannerThread : public cThread {
+private:
+  cRecordings *recordings;
+  cRecordings *deletedRecordings;
+  bool initial;
+  void ScanVideoDir(const char *DirName, int LinkLevel = 0, int DirLevel = 0);
+protected:
+  virtual void Action(void);
+public:
+  cVideoDirectoryScannerThread(cRecordings *Recordings, cRecordings *DeletedRecordings);
+  ~cVideoDirectoryScannerThread();
+  };
 
-cRecordings::cRecordings(bool Deleted)
-:cThread("video directory scanner")
+cVideoDirectoryScannerThread::cVideoDirectoryScannerThread(cRecordings *Recordings, cRecordings *DeletedRecordings)
+:cThread("video directory scanner", true)
 {
-  deleted = Deleted;
+  recordings = Recordings;
+  deletedRecordings = DeletedRecordings;
   initial = true;
-  lastUpdate = 0;
-  state = 0;
 }
 
-cRecordings::~cRecordings()
+cVideoDirectoryScannerThread::~cVideoDirectoryScannerThread()
 {
   Cancel(3);
 }
 
-void cRecordings::Action(void)
-{
-  Refresh();
-}
-
-const char *cRecordings::UpdateFileName(void)
-{
-  if (!updateFileName)
-     updateFileName = strdup(AddDirectory(cVideoDirectory::Name(), ".update"));
-  return updateFileName;
-}
-
-void cRecordings::Refresh(bool Foreground)
+void cVideoDirectoryScannerThread::Action(void)
 {
-  lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
-  initial = Count() == 0; // no name checking if the list is initially empty
-  if (deleted) {
-     Lock();
-     Clear();
-     ChangeState();
-     Unlock();
-     }
-  ScanVideoDir(cVideoDirectory::Name(), Foreground);
+  cStateKey StateKey;
+  recordings->Lock(StateKey);
+  initial = recordings->Count() == 0; // no name checking if the list is initially empty
+  StateKey.Remove();
+  deletedRecordings->Lock(StateKey, true);
+  deletedRecordings->Clear();
+  StateKey.Remove();
+  ScanVideoDir(cVideoDirectory::Name());
 }
 
-bool cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel, int DirLevel)
+void cVideoDirectoryScannerThread::ScanVideoDir(const char *DirName, int LinkLevel, int DirLevel)
 {
-  bool DoChangeState = false;
   // Find any new recordings:
   cReadDir d(DirName);
   struct dirent *e;
-  while ((Foreground || Running()) && (e = d.Next()) != NULL) {
+  while (Running() && (e = d.Next()) != NULL) {
+        if (cIoThrottle::Engaged())
+           cCondWait::SleepMs(100);
         cString buffer = AddDirectory(DirName, e->d_name);
         struct stat st;
         if (lstat(buffer, &st) == 0) {
@@ -1426,57 +1410,73 @@ bool cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev
                  continue;
               }
            if (S_ISDIR(st.st_mode)) {
-              if (endswith(buffer, deleted ? DELEXT : RECEXT)) {
-                 if (deleted || initial || !GetByName(buffer)) {
+              cRecordings *Recordings = NULL;
+              if (endswith(buffer, RECEXT))
+                 Recordings = recordings;
+              else if (endswith(buffer, DELEXT))
+                 Recordings = deletedRecordings;
+              if (Recordings) {
+                 cStateKey StateKey;
+                 Recordings->Lock(StateKey, true);
+                 if (Recordings == deletedRecordings || initial || !Recordings->GetByName(buffer)) {
                     cRecording *r = new cRecording(buffer);
                     if (r->Name()) {
                        r->NumFrames(); // initializes the numFrames member
                        r->FileSizeMB(); // initializes the fileSizeMB member
                        r->IsOnVideoDirectoryFileSystem(); // initializes the isOnVideoDirectoryFileSystem member
-                       if (deleted)
-                          r->deleted = time(NULL);
-                       Lock();
-                       Add(r);
-                       if (initial)
-                          ChangeState();
-                       else
-                          DoChangeState = true;
-                       Unlock();
+                       if (Recordings == deletedRecordings)
+                          r->SetDeleted();
+                       Recordings->Add(r);
                        }
                     else
                        delete r;
                     }
+                 StateKey.Remove();
                  }
               else
-                 DoChangeState |= ScanVideoDir(buffer, Foreground, LinkLevel + Link, DirLevel + 1);
+                 ScanVideoDir(buffer, LinkLevel + Link, DirLevel + 1);
               }
            }
         }
   // Handle any vanished recordings:
-  if (!deleted && !initial && DirLevel == 0) {
-     for (cRecording *recording = First(); recording; ) {
-         cRecording *r = recording;
-         recording = Next(recording);
-         if (access(r->FileName(), F_OK) != 0) {
-            Lock();
-            Del(r, false);
-            VanishedRecordings.Add(r);
-            DoChangeState = true;
-            Unlock();
-            }
+  if (!initial && DirLevel == 0) {
+     cStateKey StateKey;
+     recordings->Lock(StateKey, true);
+     for (cRecording *Recording = recordings->First(); Recording; ) {
+         cRecording *r = Recording;
+         Recording = recordings->Next(Recording);
+         if (access(r->FileName(), F_OK) != 0)
+            recordings->Del(r);
          }
+     StateKey.Remove();
      }
-  if (DoChangeState && DirLevel == 0)
-     ChangeState();
-  return DoChangeState;
 }
 
-bool cRecordings::StateChanged(int &State)
+// --- cRecordings -----------------------------------------------------------
+
+cRecordings cRecordings::recordings;
+cRecordings cRecordings::deletedRecordings(true);
+char *cRecordings::updateFileName = NULL;
+cVideoDirectoryScannerThread *cRecordings::videoDirectoryScannerThread = NULL;
+time_t cRecordings::lastUpdate = 0;
+
+cRecordings::cRecordings(bool Deleted)
+:cList<cRecording>(Deleted ? "DelRecs" : "Recordings")
 {
-  int NewState = state;
-  bool Result = State != NewState;
-  State = state;
-  return Result;
+}
+
+cRecordings::~cRecordings()
+{
+  // The first one to be destructed deletes it:
+  delete videoDirectoryScannerThread;
+  videoDirectoryScannerThread = NULL;
+}
+
+const char *cRecordings::UpdateFileName(void)
+{
+  if (!updateFileName)
+     updateFileName = strdup(AddDirectory(cVideoDirectory::Name(), ".update"));
+  return updateFileName;
 }
 
 void cRecordings::TouchUpdate(void)
@@ -1495,24 +1495,24 @@ bool cRecordings::NeedsUpdate(void)
   return lastUpdate < lastModified;
 }
 
-bool cRecordings::Update(bool Wait)
+void cRecordings::Update(bool Wait)
 {
+  if (!videoDirectoryScannerThread)
+     videoDirectoryScannerThread = new cVideoDirectoryScannerThread(&recordings, &deletedRecordings);
+  lastUpdate = time(NULL); // doing this first to make sure we don't miss anything
+  videoDirectoryScannerThread->Start();
   if (Wait) {
-     Refresh(true);
-     return Count() > 0;
+     while (videoDirectoryScannerThread->Active())
+           cCondWait::SleepMs(100);
      }
-  else
-     Start();
-  return false;
 }
 
-cRecording *cRecordings::GetByName(const char *FileName)
+const cRecording *cRecordings::GetByName(const char *FileName) const
 {
   if (FileName) {
-     LOCK_THREAD;
-     for (cRecording *recording = First(); recording; recording = Next(recording)) {
-         if (strcmp(recording->FileName(), FileName) == 0)
-            return recording;
+     for (const cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+         if (strcmp(Recording->FileName(), FileName) == 0)
+            return Recording;
          }
      }
   return NULL;
@@ -1520,12 +1520,8 @@ cRecording *cRecordings::GetByName(const char *FileName)
 
 void cRecordings::AddByName(const char *FileName, bool TriggerUpdate)
 {
-  LOCK_THREAD;
-  cRecording *recording = GetByName(FileName);
-  if (!recording) {
-     recording = new cRecording(FileName);
-     Add(recording);
-     ChangeState();
+  if (!GetByName(FileName)) {
+     Add(new cRecording(FileName));
      if (TriggerUpdate)
         TouchUpdate();
      }
@@ -1533,58 +1529,52 @@ void cRecordings::AddByName(const char *FileName, bool TriggerUpdate)
 
 void cRecordings::DelByName(const char *FileName)
 {
-  LOCK_THREAD;
-  cRecording *recording = GetByName(FileName);
+  cRecording *Recording = GetByName(FileName);
   cRecording *dummy = NULL;
-  if (!recording)
-     recording = dummy = new cRecording(FileName); // allows us to use a FileName that is not in the Recordings list
-  cThreadLock DeletedRecordingsLock(&DeletedRecordings);
+  if (!Recording)
+     Recording = dummy = new cRecording(FileName); // allows us to use a FileName that is not in the Recordings list
+  LOCK_DELETEDRECORDINGS_WRITE;
   if (!dummy)
-     Del(recording, false);
-  char *ext = strrchr(recording->fileName, '.');
+     Del(Recording, false);
+  char *ext = strrchr(Recording->fileName, '.');
   if (ext) {
      strncpy(ext, DELEXT, strlen(ext));
-     if (access(recording->FileName(), F_OK) == 0) {
-        recording->deleted = time(NULL);
-        DeletedRecordings.Add(recording);
-        recording = NULL; // to prevent it from being deleted below
+     if (access(Recording->FileName(), F_OK) == 0) {
+        Recording->SetDeleted();
+        DeletedRecordings->Add(Recording);
+        Recording = NULL; // to prevent it from being deleted below
         }
      }
-  delete recording;
-  ChangeState();
+  delete Recording;
   TouchUpdate();
 }
 
 void cRecordings::UpdateByName(const char *FileName)
 {
-  LOCK_THREAD;
-  cRecording *recording = GetByName(FileName);
-  if (recording)
-     recording->ReadInfo();
+  if (cRecording *Recording = GetByName(FileName))
+     Recording->ReadInfo();
 }
 
-int cRecordings::TotalFileSizeMB(void)
+int cRecordings::TotalFileSizeMB(void) const
 {
   int size = 0;
-  LOCK_THREAD;
-  for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      int FileSizeMB = recording->FileSizeMB();
-      if (FileSizeMB > 0 && recording->IsOnVideoDirectoryFileSystem())
+  for (const cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+      int FileSizeMB = Recording->FileSizeMB();
+      if (FileSizeMB > 0 && Recording->IsOnVideoDirectoryFileSystem())
          size += FileSizeMB;
       }
   return size;
 }
 
-double cRecordings::MBperMinute(void)
+double cRecordings::MBperMinute(void) const
 {
   int size = 0;
   int length = 0;
-  LOCK_THREAD;
-  for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (recording->IsOnVideoDirectoryFileSystem()) {
-         int FileSizeMB = recording->FileSizeMB();
+  for (const cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+      if (Recording->IsOnVideoDirectoryFileSystem()) {
+         int FileSizeMB = Recording->FileSizeMB();
          if (FileSizeMB > 0) {
-            int LengthInSeconds = recording->LengthInSeconds();
+            int LengthInSeconds = Recording->LengthInSeconds();
             if (LengthInSeconds > 0) {
                if (LengthInSeconds / FileSizeMB < LIMIT_SECS_PER_MB_RADIO) { // don't count radio recordings
                   size += FileSizeMB;
@@ -1597,23 +1587,21 @@ double cRecordings::MBperMinute(void)
   return (size && length) ? double(size) * 60 / length : -1;
 }
 
-int cRecordings::PathIsInUse(const char *Path)
+int cRecordings::PathIsInUse(const char *Path) const
 {
-  LOCK_THREAD;
   int Use = ruNone;
-  for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (recording->IsInPath(Path))
-         Use |= recording->IsInUse();
+  for (const cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+      if (Recording->IsInPath(Path))
+         Use |= Recording->IsInUse();
       }
   return Use;
 }
 
-int cRecordings::GetNumRecordingsInPath(const char *Path)
+int cRecordings::GetNumRecordingsInPath(const char *Path) const
 {
-  LOCK_THREAD;
   int n = 0;
-  for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (recording->IsInPath(Path))
+  for (const cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+      if (Recording->IsInPath(Path))
          n++;
       }
   return n;
@@ -1622,36 +1610,35 @@ int cRecordings::GetNumRecordingsInPath(const char *Path)
 bool cRecordings::MoveRecordings(const char *OldPath, const char *NewPath)
 {
   if (OldPath && NewPath && strcmp(OldPath, NewPath)) {
-     LOCK_THREAD;
      dsyslog("moving '%s' to '%s'", OldPath, NewPath);
-     for (cRecording *recording = First(); recording; recording = Next(recording)) {
-         if (recording->IsInPath(OldPath)) {
-            const char *p = recording->Name() + strlen(OldPath);
+     bool Moved = false;
+     for (cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+         if (Recording->IsInPath(OldPath)) {
+            const char *p = Recording->Name() + strlen(OldPath);
             cString NewName = cString::sprintf("%s%s", NewPath, p);
-            if (!recording->ChangeName(NewName))
+            if (!Recording->ChangeName(NewName))
                return false;
-            ChangeState();
+            Moved = true;
             }
          }
+     if (Moved)
+        TouchUpdate();
      }
   return true;
 }
 
 void cRecordings::ResetResume(const char *ResumeFileName)
 {
-  LOCK_THREAD;
-  for (cRecording *recording = First(); recording; recording = Next(recording)) {
-      if (!ResumeFileName || strncmp(ResumeFileName, recording->FileName(), strlen(recording->FileName())) == 0)
-         recording->ResetResume();
+  for (cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+      if (!ResumeFileName || strncmp(ResumeFileName, Recording->FileName(), strlen(Recording->FileName())) == 0)
+         Recording->ResetResume();
       }
-  ChangeState();
 }
 
 void cRecordings::ClearSortNames(void)
 {
-  LOCK_THREAD;
-  for (cRecording *recording = First(); recording; recording = Next(recording))
-      recording->ClearSortName();
+  for (cRecording *Recording = First(); Recording; Recording = Next(Recording))
+      Recording->ClearSortName();
 }
 
 // --- cDirCopier ------------------------------------------------------------
@@ -1810,8 +1797,9 @@ void cDirCopier::Stop(void)
   Cancel(3);
   if (error) {
      cVideoDirectory::RemoveVideoFile(dirNameDst);
-     Recordings.AddByName(dirNameSrc);
-     Recordings.DelByName(dirNameDst);
+     LOCK_RECORDINGS_WRITE;
+     Recordings->AddByName(dirNameSrc);
+     Recordings->DelByName(dirNameDst);
      }
 }
 
@@ -1891,17 +1879,19 @@ bool cRecordingsHandlerEntry::Active(bool &Error)
         copier->Start();
         }
      ClearPending();
-     Recordings.ChangeState();
+     LOCK_RECORDINGS_WRITE; // to trigger a state change
      return true;
      }
   // Clean up:
   if (CopierFinishedOk && (Usage() & ruMove) != 0) {
      cRecording Recording(FileNameSrc());
-     if (Recording.Delete())
-        Recordings.DelByName(Recording.FileName());
+     if (Recording.Delete()) {
+        LOCK_RECORDINGS_WRITE;
+        Recordings->DelByName(Recording.FileName());
+        }
      }
-  Recordings.ChangeState();
-  Recordings.TouchUpdate();
+  LOCK_RECORDINGS_WRITE; // to trigger a state change
+  Recordings->TouchUpdate();
   return false;
 }
 
@@ -1945,7 +1935,7 @@ bool cRecordingsHandler::Add(int Usage, const char *FileNameSrc, const char *Fil
               operations.Add(new cRecordingsHandlerEntry(Usage, FileNameSrc, FileNameDst));
               finished = false;
               Active(); // start it right away if possible
-              Recordings.ChangeState();
+              LOCK_RECORDINGS_WRITE; // to trigger a state change
               return true;
               }
            else
@@ -1967,7 +1957,7 @@ void cRecordingsHandler::Del(const char *FileName)
   cMutexLock MutexLock(&mutex);
   if (cRecordingsHandlerEntry *r = Get(FileName)) {
      operations.Del(r);
-     Recordings.ChangeState();
+     LOCK_RECORDINGS_WRITE; // to trigger a state change
      }
 }
 
@@ -1975,7 +1965,7 @@ void cRecordingsHandler::DelAll(void)
 {
   cMutexLock MutexLock(&mutex);
   operations.Clear();
-  Recordings.ChangeState();
+  LOCK_RECORDINGS_WRITE; // to trigger a state change
 }
 
 int cRecordingsHandler::GetUsage(const char *FileName)
@@ -2028,7 +2018,7 @@ cMark::~cMark()
 
 cString cMark::ToText(void)
 {
-  return cString::sprintf("%s%s%s\n", *IndexToHMSF(position, true, framesPerSecond), Comment() ? " " : "", Comment() ? Comment() : "");
+  return cString::sprintf("%s%s%s", *IndexToHMSF(position, true, framesPerSecond), Comment() ? " " : "", Comment() ? Comment() : "");
 }
 
 bool cMark::Parse(const char *s)
@@ -2047,7 +2037,7 @@ bool cMark::Parse(const char *s)
 
 bool cMark::Save(FILE *f)
 {
-  return fprintf(f, "%s", *ToText()) > 0;
+  return fprintf(f, "%s\n", *ToText()) > 0;
 }
 
 // --- cMarks ----------------------------------------------------------------
@@ -2057,9 +2047,19 @@ cString cMarks::MarksFileName(const cRecording *Recording)
   return AddDirectory(Recording->FileName(), Recording->IsPesRecording() ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
 }
 
+bool cMarks::DeleteMarksFile(const cRecording *Recording)
+{
+  if (remove(cMarks::MarksFileName(Recording)) < 0) {
+     if (errno != ENOENT) {
+        LOG_ERROR_STR(Recording->FileName());
+        return false;
+        }
+     }
+  return true;
+}
+
 bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool IsPesRecording)
 {
-  cMutexLock MutexLock(this);
   recordingFileName = RecordingFileName;
   fileName = AddDirectory(RecordingFileName, IsPesRecording ? MARKSFILESUFFIX ".vdr" : MARKSFILESUFFIX);
   framesPerSecond = FramesPerSecond;
@@ -2072,7 +2072,6 @@ bool cMarks::Load(const char *RecordingFileName, double FramesPerSecond, bool Is
 
 bool cMarks::Update(void)
 {
-  cMutexLock MutexLock(this);
   time_t t = time(NULL);
   if (t > nextUpdate && *fileName) {
      time_t LastModified = LastModifiedTime(fileName);
@@ -2104,7 +2103,6 @@ bool cMarks::Update(void)
 
 bool cMarks::Save(void)
 {
-  cMutexLock MutexLock(this);
   if (cConfig<cMark>::Save()) {
      lastFileTime = LastModifiedTime(fileName);
      return true;
@@ -2114,7 +2112,6 @@ bool cMarks::Save(void)
 
 void cMarks::Align(void)
 {
-  cMutexLock MutexLock(this);
   cIndexFile IndexFile(recordingFileName, false, isPesRecording);
   for (cMark *m = First(); m; m = Next(m)) {
       int p = IndexFile.GetClosestIFrame(m->Position());
@@ -2127,7 +2124,6 @@ void cMarks::Align(void)
 
 void cMarks::Sort(void)
 {
-  cMutexLock MutexLock(this);
   for (cMark *m1 = First(); m1; m1 = Next(m1)) {
       for (cMark *m2 = Next(m1); m2; m2 = Next(m2)) {
           if (m2->Position() < m1->Position()) {
@@ -2140,43 +2136,42 @@ void cMarks::Sort(void)
 
 void cMarks::Add(int Position)
 {
-  cMutexLock MutexLock(this);
   cConfig<cMark>::Add(new cMark(Position, NULL, framesPerSecond));
   Sort();
 }
 
-cMark *cMarks::Get(int Position)
+const cMark *cMarks::Get(int Position) const
 {
-  for (cMark *mi = First(); mi; mi = Next(mi)) {
+  for (const cMark *mi = First(); mi; mi = Next(mi)) {
       if (mi->Position() == Position)
          return mi;
       }
   return NULL;
 }
 
-cMark *cMarks::GetPrev(int Position)
+const cMark *cMarks::GetPrev(int Position) const
 {
-  for (cMark *mi = Last(); mi; mi = Prev(mi)) {
+  for (const cMark *mi = Last(); mi; mi = Prev(mi)) {
       if (mi->Position() < Position)
          return mi;
       }
   return NULL;
 }
 
-cMark *cMarks::GetNext(int Position)
+const cMark *cMarks::GetNext(int Position) const
 {
-  for (cMark *mi = First(); mi; mi = Next(mi)) {
+  for (const cMark *mi = First(); mi; mi = Next(mi)) {
       if (mi->Position() > Position)
          return mi;
       }
   return NULL;
 }
 
-cMark *cMarks::GetNextBegin(cMark *EndMark)
+const cMark *cMarks::GetNextBegin(const cMark *EndMark) const
 {
-  cMark *BeginMark = EndMark ? Next(EndMark) : First();
+  const cMark *BeginMark = EndMark ? Next(EndMark) : First();
   if (BeginMark && EndMark && BeginMark->Position() == EndMark->Position()) {
-     while (cMark *NextMark = Next(BeginMark)) {
+     while (const cMark *NextMark = Next(BeginMark)) {
            if (BeginMark->Position() == NextMark->Position()) { // skip Begin/End at the same position
               if (!(BeginMark = Next(NextMark)))
                  break;
@@ -2188,13 +2183,13 @@ cMark *cMarks::GetNextBegin(cMark *EndMark)
   return BeginMark;
 }
 
-cMark *cMarks::GetNextEnd(cMark *BeginMark)
+const cMark *cMarks::GetNextEnd(const cMark *BeginMark) const
 {
   if (!BeginMark)
      return NULL;
-  cMark *EndMark = Next(BeginMark);
+  const cMark *EndMark = Next(BeginMark);
   if (EndMark && BeginMark && BeginMark->Position() == EndMark->Position()) {
-     while (cMark *NextMark = Next(EndMark)) {
+     while (const cMark *NextMark = Next(EndMark)) {
            if (EndMark->Position() == NextMark->Position()) { // skip End/Begin at the same position
               if (!(EndMark = Next(NextMark)))
                  break;
@@ -2206,12 +2201,11 @@ cMark *cMarks::GetNextEnd(cMark *BeginMark)
   return EndMark;
 }
 
-int cMarks::GetNumSequences(void)
+int cMarks::GetNumSequences(void) const
 {
-  cMutexLock MutexLock(this);
   int NumSequences = 0;
-  if (cMark *BeginMark = GetNextBegin()) {
-     while (cMark *EndMark = GetNextEnd(BeginMark)) {
+  if (const cMark *BeginMark = GetNextBegin()) {
+     while (const cMark *EndMark = GetNextEnd(BeginMark)) {
            NumSequences++;
            BeginMark = GetNextBegin(EndMark);
            }
@@ -2401,7 +2395,8 @@ void cIndexFileGenerator::Action(void)
            if (FrameDetector.FramesPerSecond() > 0 && !DoubleEqual(RecordingInfo.FramesPerSecond(), FrameDetector.FramesPerSecond())) {
               RecordingInfo.SetFramesPerSecond(FrameDetector.FramesPerSecond());
               RecordingInfo.Write();
-              Recordings.UpdateByName(recordingName);
+              LOCK_RECORDINGS_WRITE;
+              Recordings->UpdateByName(recordingName);
               }
            }
         Skins.QueueMessage(mtInfo, tr("Index file regeneration complete"));
@@ -3018,7 +3013,7 @@ int ReadFrame(cUnbufferedFile *f, uchar *b, int Length, int Max)
 
 // --- Recordings Sort Mode --------------------------------------------------
 
-eRecordingsSortMode RecordingsSortMode = rsmName;
+eRecordingsSortMode RecordingsSortMode = rsmTime;
 
 bool HasRecordingsSortMode(const char *Directory)
 {
@@ -3027,7 +3022,7 @@ bool HasRecordingsSortMode(const char *Directory)
 
 void GetRecordingsSortMode(const char *Directory)
 {
-  RecordingsSortMode = rsmName;
+  RecordingsSortMode = eRecordingsSortMode(constrain(Setup.DefaultSortModeRec, 0, int(rsmTime)));
   if (FILE *f = fopen(AddDirectory(Directory, SORTMODEFILE), "r")) {
      char buf[8];
      if (fgets(buf, sizeof(buf), f))
diff --git a/recording.h b/recording.h
index 876e0b25e..cebd2ee09 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 3.8 2015/02/07 14:29:14 kls Exp $
+ * $Id: recording.h 4.3 2015/08/29 14:12:14 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -41,7 +41,6 @@ enum eRecordingUsage {
   };
 
 void RemoveDeletedRecordings(void);
-void ClearVanishedRecordings(void);
 void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
      ///< The special Priority value -1 means that we shall get rid of any
      ///< deleted recordings faster than normal (because we're cutting).
@@ -129,8 +128,9 @@ class cRecording : public cListObject {
   int Priority(void) const { return priority; }
   int Lifetime(void) const { return lifetime; }
   time_t Deleted(void) const { return deleted; }
+  void SetDeleted(void) { deleted = time(NULL); }
   virtual int Compare(const cListObject &ListObject) const;
-  bool IsInPath(const char *Path);
+  bool IsInPath(const char *Path) const;
        ///< Returns true if this recording is stored anywhere under the given Path.
        ///< If Path is NULL or an empty string, the entire video directory is checked.
   cString Folder(void) const;
@@ -140,7 +140,7 @@ class cRecording : public cListObject {
        ///< Returns the base name of this recording (without the
        ///< video directory and folder). For use in menus etc.
   const char *Name(void) const { return name; }
-       ///< Returns the full name of the recording (without the video directory.
+       ///< Returns the full name of the recording (without the video directory).
        ///< For use in menus etc.
   const char *FileName(void) const;
        ///< Returns the full path name to the recording directory, including the
@@ -166,7 +166,7 @@ class cRecording : public cListObject {
   bool IsEdited(void) const;
   bool IsPesRecording(void) const { return isPesRecording; }
   bool IsOnVideoDirectoryFileSystem(void) const;
-  bool HasMarks(void);
+  bool HasMarks(void) const;
        ///< Returns true if this recording has any editing marks.
   bool DeleteMarks(void);
        ///< Deletes the editing marks from this recording (if any).
@@ -216,49 +216,54 @@ class cRecording : public cListObject {
        ///< as in time-shift).
   };
 
-class cRecordings : public cList<cRecording>, public cThread {
+class cVideoDirectoryScannerThread;
+
+class cRecordings : public cList<cRecording> {
 private:
+  static cRecordings recordings;
+  static cRecordings deletedRecordings;
   static char *updateFileName;
-  bool deleted;
-  bool initial;
-  time_t lastUpdate;
-  int state;
-  const char *UpdateFileName(void);
-  void Refresh(bool Foreground = false);
-  bool ScanVideoDir(const char *DirName, bool Foreground = false, int LinkLevel = 0, int DirLevel = 0);
-protected:
-  void Action(void);
+  static time_t lastUpdate;
+  static cVideoDirectoryScannerThread *videoDirectoryScannerThread;
+  static const char *UpdateFileName(void);
 public:
   cRecordings(bool Deleted = false);
   virtual ~cRecordings();
-  bool Load(void) { return Update(true); }
-       ///< Loads the current list of recordings and returns true if there
-       ///< is anything in it (for compatibility with older plugins - use
-       ///< Update(true) instead).
-  bool Update(bool Wait = false);
+  static const cRecordings *GetRecordingsRead(cStateKey &StateKey, int TimeoutMs = 0) { return recordings.Lock(StateKey, false, TimeoutMs) ? &recordings : NULL; }
+       ///< Gets the list of recordings for read access.
+       ///< See cTimers::GetTimersRead() for details.
+  static cRecordings *GetRecordingsWrite(cStateKey &StateKey, int TimeoutMs = 0) { return recordings.Lock(StateKey, true, TimeoutMs) ? &recordings : NULL; }
+       ///< Gets the list of recordings for write access.
+       ///< See cTimers::GetTimersWrite() for details.
+  static const cRecordings *GetDeletedRecordingsRead(cStateKey &StateKey, int TimeoutMs = 0) { return deletedRecordings.Lock(StateKey, false, TimeoutMs) ? &deletedRecordings : NULL; }
+       ///< Gets the list of deleted recordings for read access.
+       ///< See cTimers::GetTimersRead() for details.
+  static cRecordings *GetDeletedRecordingsWrite(cStateKey &StateKey, int TimeoutMs = 0) { return deletedRecordings.Lock(StateKey, true, TimeoutMs) ? &deletedRecordings : NULL; }
+       ///< Gets the list of deleted recordings for write access.
+       ///< See cTimers::GetTimersWrite() for details.
+  static void Update(bool Wait = false);
        ///< Triggers an update of the list of recordings, which will run
        ///< as a separate thread if Wait is false. If Wait is true, the
        ///< function returns only after the update has completed.
-       ///< Returns true if Wait is true and there is anything in the list
-       ///< of recordings, false otherwise.
-  void TouchUpdate(void);
+  static void TouchUpdate(void);
        ///< Touches the '.update' file in the video directory, so that other
        ///< instances of VDR that access the same video directory can be triggered
        ///< to update their recordings list.
-  bool NeedsUpdate(void);
-  void ChangeState(void) { state++; }
-  bool StateChanged(int &State);
+       ///< This function is 'const', because it doesn't actually modify the list
+       ///< of recordings.
+  static bool NeedsUpdate(void);
   void ResetResume(const char *ResumeFileName = NULL);
   void ClearSortNames(void);
-  cRecording *GetByName(const char *FileName);
+  const cRecording *GetByName(const char *FileName) const;
+  cRecording *GetByName(const char *FileName) { return const_cast<cRecording *>(static_cast<const cRecordings *>(this)->GetByName(FileName)); }
   void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
   void UpdateByName(const char *FileName);
-  int TotalFileSizeMB(void);
-  double MBperMinute(void);
+  int TotalFileSizeMB(void) const;
+  double MBperMinute(void) const;
        ///< Returns the average data rate (in MB/min) of all recordings, or -1 if
        ///< this value is unknown.
-  int PathIsInUse(const char *Path);
+  int PathIsInUse(const char *Path) const;
        ///< Checks whether any recording in the given Path is currently in use and therefore
        ///< the whole Path shall not be tampered with. Returns 0 (ruNone) if no recording
        ///< is in use.
@@ -266,7 +271,7 @@ class cRecordings : public cList<cRecording>, public cThread {
        ///< If several recordings in the Path are currently in use, the return value will
        ///< be the combination of all individual recordings' flags.
        ///< If Path is NULL or an empty string, the entire video directory is checked.
-  int GetNumRecordingsInPath(const char *Path);
+  int GetNumRecordingsInPath(const char *Path) const;
        ///< Returns the total number of recordings in the given Path, including all
        ///< sub-folders of Path.
        ///< If Path is NULL or an empty string, the entire video directory is checked.
@@ -281,10 +286,19 @@ class cRecordings : public cList<cRecording>, public cThread {
        ///< if all recordings have been successfully added to the RecordingsHandler.
   };
 
-/// Any access to Recordings that loops through the list of recordings
-/// needs to hold a thread lock on this object!
-extern cRecordings Recordings;
-extern cRecordings DeletedRecordings;
+// Provide lock controlled access to the list:
+
+DEF_LIST_LOCK(Recordings);
+DEF_LIST_LOCK2(Recordings, DeletedRecordings);
+
+// These macros provide a convenient way of locking the global recordings list
+// and making sure the lock is released as soon as the current scope is left
+// (note that these macros wait forever to obtain the lock!):
+
+#define LOCK_RECORDINGS_READ  USE_LIST_LOCK_READ(Recordings)
+#define LOCK_RECORDINGS_WRITE USE_LIST_LOCK_WRITE(Recordings)
+#define LOCK_DELETEDRECORDINGS_READ  USE_LIST_LOCK_READ2(Recordings, DeletedRecordings)
+#define LOCK_DELETEDRECORDINGS_WRITE USE_LIST_LOCK_WRITE2(Recordings, DeletedRecordings)
 
 class cRecordingsHandlerEntry;
 
@@ -350,7 +364,7 @@ class cMark : public cListObject {
   bool Save(FILE *f);
   };
 
-class cMarks : public cConfig<cMark>, public cMutex {
+class cMarks : public cConfig<cMark> {
 private:
   cString recordingFileName;
   cString fileName;
@@ -360,9 +374,11 @@ class cMarks : public cConfig<cMark>, public cMutex {
   time_t lastFileTime;
   time_t lastChange;
 public:
+  cMarks(void): cConfig<cMark>("Marks") {};
   static cString MarksFileName(const cRecording *Recording);
        ///< Returns the marks file name for the given Recording (regardless whether such
        ///< a file actually exists).
+  static bool DeleteMarksFile(const cRecording *Recording);
   bool Load(const char *RecordingFileName, double FramesPerSecond = DEFAULTFRAMESPERSECOND, bool IsPesRecording = false);
   bool Update(void);
   bool Save(void);
@@ -374,29 +390,35 @@ class cMarks : public cConfig<cMark>, public cMutex {
        ///< calls to Del(), or any of the functions that return a "cMark *", in case
        ///< an other thread might modifiy the list while the returned pointer is
        ///< considered valid.
-  cMark *Get(int Position);
-  cMark *GetPrev(int Position);
-  cMark *GetNext(int Position);
-  cMark *GetNextBegin(cMark *EndMark = NULL);
+  const cMark *Get(int Position) const;
+  const cMark *GetPrev(int Position) const;
+  const cMark *GetNext(int Position) const;
+  const cMark *GetNextBegin(const cMark *EndMark = NULL) const;
        ///< Returns the next "begin" mark after EndMark, skipping any marks at the
        ///< same position as EndMark. If EndMark is NULL, the first actual "begin"
        ///< will be returned (if any).
-  cMark *GetNextEnd(cMark *BeginMark);
+  const cMark *GetNextEnd(const cMark *BeginMark) const;
        ///< Returns the next "end" mark after BeginMark, skipping any marks at the
        ///< same position as BeginMark.
-  int GetNumSequences(void);
+  int GetNumSequences(void) const;
        ///< Returns the actual number of sequences to be cut from the recording.
        ///< If there is only one actual "begin" mark, and it is positioned at index
        ///< 0 (the beginning of the recording), and there is no "end" mark, the
        ///< return value is 0, which means that the result is the same as the original
        ///< recording.
+  cMark *Get(int Position) { return const_cast<cMark *>(static_cast<const cMarks *>(this)->Get(Position)); }
+  cMark *GetPrev(int Position) { return const_cast<cMark *>(static_cast<const cMarks *>(this)->GetPrev(Position)); }
+  cMark *GetNext(int Position) { return const_cast<cMark *>(static_cast<const cMarks *>(this)->GetNext(Position)); }
+  cMark *GetNextBegin(const cMark *EndMark = NULL) { return const_cast<cMark *>(static_cast<const cMarks *>(this)->GetNextBegin(EndMark)); }
+  cMark *GetNextEnd(const cMark *BeginMark) { return const_cast<cMark *>(static_cast<const cMarks *>(this)->GetNextEnd(BeginMark)); }
   };
 
-#define RUC_BEFORERECORDING "before"
-#define RUC_STARTRECORDING  "started"
-#define RUC_AFTERRECORDING  "after"
-#define RUC_EDITEDRECORDING "edited"
-#define RUC_DELETERECORDING "deleted"
+#define RUC_BEFORERECORDING  "before"
+#define RUC_STARTRECORDING   "started"
+#define RUC_AFTERRECORDING   "after"
+#define RUC_EDITINGRECORDING "editing"
+#define RUC_EDITEDRECORDING  "edited"
+#define RUC_DELETERECORDING  "deleted"
 
 class cRecordingUserCommand {
 private:
diff --git a/remote.c b/remote.c
index ac10dce74..85b671884 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 3.3 2015/01/20 14:53:57 kls Exp $
+ * $Id: remote.c 4.0 2015/01/20 14:53:57 kls Exp $
  */
 
 #include "remote.h"
diff --git a/remote.h b/remote.h
index 415f2e772..5ad898c93 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 3.1 2013/12/25 12:32:44 kls Exp $
+ * $Id: remote.h 4.0 2013/12/25 12:32:44 kls Exp $
  */
 
 #ifndef __REMOTE_H
diff --git a/remux.c b/remux.c
index 23e83877a..6c07efcb3 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 3.9 2015/01/14 09:57:09 kls Exp $
+ * $Id: remux.c 4.1 2015/03/11 09:49:38 kls Exp $
  */
 
 #include "remux.h"
@@ -1552,7 +1552,9 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                        uint32_t Delta = ptsValues[0] / Div;
                        // determine frame info:
                        if (isVideo) {
-                          if (abs(Delta - 3600) <= 1)
+                          if (Delta == 3753)
+                             framesPerSecond = 24.0 / 1.001;
+                          else if (abs(Delta - 3600) <= 1)
                              framesPerSecond = 25.0;
                           else if (Delta % 3003 == 0)
                              framesPerSecond = 30.0 / 1.001;
diff --git a/remux.h b/remux.h
index 6bc91ad70..bd0d14591 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 3.4 2014/03/22 14:58:24 kls Exp $
+ * $Id: remux.h 4.0 2014/03/22 14:58:24 kls Exp $
  */
 
 #ifndef __REMUX_H
diff --git a/ringbuffer.c b/ringbuffer.c
index e2921be24..05e2cf66e 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 3.0 2012/09/22 11:26:49 kls Exp $
+ * $Id: ringbuffer.c 4.0 2012/09/22 11:26:49 kls Exp $
  */
 
 #include "ringbuffer.h"
diff --git a/ringbuffer.h b/ringbuffer.h
index a97574219..70f22c690 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 3.0 2013/02/16 15:20:37 kls Exp $
+ * $Id: ringbuffer.h 4.0 2013/02/16 15:20:37 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
diff --git a/runvdr.template b/runvdr.template
index 745db042a..9597be65e 100755
--- a/runvdr.template
+++ b/runvdr.template
@@ -20,7 +20,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr.template 3.1 2015/02/05 10:28:53 kls Exp $
+# $Id: runvdr.template 4.0 2015/02/05 10:28:53 kls Exp $
 
 VDRPRG="./vdr"
 
diff --git a/sdt.c b/sdt.c
index 4e6748d84..05cd931be 100644
--- a/sdt.c
+++ b/sdt.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.c 3.4 2015/01/04 14:33:35 kls Exp $
+ * $Id: sdt.c 4.5 2015/08/02 11:33:23 kls Exp $
  */
 
 #include "sdt.h"
@@ -13,6 +13,11 @@
 #include "libsi/section.h"
 #include "libsi/descriptor.h"
 
+// Set to 'true' for debug output:
+static bool DebugSdt = false;
+
+#define dbgsdt(a...) if (DebugSdt) fprintf(stderr, a)
+
 // --- cSdtFilter ------------------------------------------------------------
 
 cSdtFilter::cSdtFilter(cPatFilter *PatFilter)
@@ -47,15 +52,21 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      return;
   if (!sectionSyncer.Sync(sdt.getVersionNumber(), sdt.getSectionNumber(), sdt.getLastSectionNumber()))
      return;
-  if (!Channels.Lock(true, 10))
+  cStateKey StateKey;
+  cChannels *Channels = cChannels::GetChannelsWrite(StateKey, 10);
+  if (!Channels) {
+     sectionSyncer.Repeat(); // let's not miss any section of the SDT
      return;
+     }
+  dbgsdt("SDT: %2d %2d %2d %s %d\n", sdt.getVersionNumber(), sdt.getSectionNumber(), sdt.getLastSectionNumber(), *cSource::ToString(source), Transponder());
+  bool ChannelsModified = false;
   SI::SDT::Service SiSdtService;
   for (SI::Loop::Iterator it; sdt.serviceLoop.getNext(SiSdtService, it); ) {
-      cChannel *channel = Channels.GetByChannelID(tChannelID(source, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
-      if (!channel)
-         channel = Channels.GetByChannelID(tChannelID(source, 0, Transponder(), SiSdtService.getServiceId()));
-      if (channel)
-         channel->SetSeen();
+      cChannel *Channel = Channels->GetByChannelID(tChannelID(source, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
+      if (!Channel)
+         Channel = Channels->GetByChannelID(tChannelID(source, 0, Transponder(), SiSdtService.getServiceId()));
+      if (Channel)
+         Channel->SetSeen();
 
       cLinkChannels *LinkChannels = NULL;
       SI::Descriptor *d;
@@ -93,18 +104,21 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                             }
                         sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
                         char *pp = compactspace(ProviderNameBuf);
-                        if (channel) {
-                           channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
+                        if (Channel) {
+                           ChannelsModified |= Channel->SetId(Channels, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
                            if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3)
-                              channel->SetName(pn, ps, pp);
+                              ChannelsModified |= Channel->SetName(pn, ps, pp);
                            // Using SiSdtService.getFreeCaMode() is no good, because some
                            // tv stations set this flag even for non-encrypted channels :-(
                            // The special value 0xFFFF was supposed to mean "unknown encryption"
                            // and would have been overwritten with real CA values later:
-                           // channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
+                           // Channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
                            }
                         else if (*pn && Setup.UpdateChannels >= 4) {
-                           channel = Channels.NewChannel(Channel(), pn, ps, pp, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
+                           dbgsdt("    %5d %5d %5d %s/%s %d %s\n", sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId(), *cSource::ToString(this->Channel()->Source()), *cSource::ToString(source), this->Channel()->Transponder(), pn);
+                           Channel = Channels->NewChannel(this->Channel(), pn, ps, pp, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
+                           Channel->SetSource(source); // in case this comes from a satellite with a slightly different position
+                           ChannelsModified = true;
                            patFilter->Trigger(SiSdtService.getServiceId());
                            }
                         }
@@ -117,9 +131,9 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
             /*
             case SI::CaIdentifierDescriptorTag: {
                  SI::CaIdentifierDescriptor *cid = (SI::CaIdentifierDescriptor *)d;
-                 if (channel) {
+                 if (Channel) {
                     for (SI::Loop::Iterator it; cid->identifiers.hasNext(it); )
-                        channel->SetCa(cid->identifiers.getNext(it));
+                        Channel->SetCa(Channels, cid->identifiers.getNext(it));
                     }
                  }
                  break;
@@ -128,15 +142,17 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  SI::NVODReferenceDescriptor *nrd = (SI::NVODReferenceDescriptor *)d;
                  SI::NVODReferenceDescriptor::Service Service;
                  for (SI::Loop::Iterator it; nrd->serviceLoop.getNext(Service, it); ) {
-                     cChannel *link = Channels.GetByChannelID(tChannelID(source, Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
+                     cChannel *link = Channels->GetByChannelID(tChannelID(source, Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
                      if (!link && Setup.UpdateChannels >= 4) {
-                        link = Channels.NewChannel(Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
+                        link = Channels->NewChannel(this->Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
                         patFilter->Trigger(Service.getServiceId());
+                        ChannelsModified = true;
                         }
                      if (link) {
                         if (!LinkChannels)
                            LinkChannels = new cLinkChannels;
                         LinkChannels->Add(new cLinkChannel(link));
+                        ChannelsModified = true;
                         }
                      }
                  }
@@ -146,15 +162,18 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
           delete d;
           }
       if (LinkChannels) {
-         if (channel)
-            channel->SetLinkChannels(LinkChannels);
+         if (Channel)
+            ChannelsModified |= Channel->SetLinkChannels(LinkChannels);
          else
             delete LinkChannels;
          }
       }
   if (sdt.getSectionNumber() == sdt.getLastSectionNumber()) {
-     if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3)
-        Channels.MarkObsoleteChannels(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
+     if (Setup.UpdateChannels == 1 || Setup.UpdateChannels >= 3) {
+        ChannelsModified |= Channels->MarkObsoleteChannels(source, sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
+        if (source != Source())
+           ChannelsModified |= Channels->MarkObsoleteChannels(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId());
+        }
      }
-  Channels.Unlock();
+  StateKey.Remove(ChannelsModified);
 }
diff --git a/sdt.h b/sdt.h
index 01653f452..c46c9b73d 100644
--- a/sdt.h
+++ b/sdt.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sdt.h 3.1 2014/03/10 14:40:54 kls Exp $
+ * $Id: sdt.h 4.0 2014/03/10 14:40:54 kls Exp $
  */
 
 #ifndef __SDT_H
diff --git a/sections.c b/sections.c
index 32d80de97..55447bf18 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 3.1 2015/01/14 11:35:53 kls Exp $
+ * $Id: sections.c 4.0 2015/01/14 11:35:53 kls Exp $
  */
 
 #include "sections.h"
diff --git a/sections.h b/sections.h
index 7cb833ce8..de0a38813 100644
--- a/sections.h
+++ b/sections.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.h 3.0 2005/08/13 11:23:55 kls Exp $
+ * $Id: sections.h 4.0 2005/08/13 11:23:55 kls Exp $
  */
 
 #ifndef __SECTIONS_H
diff --git a/shutdown.c b/shutdown.c
index 97d056e9a..7b8ff8045 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 3.1 2013/10/02 09:02:01 kls Exp $
+ * $Id: shutdown.c 4.1 2015/07/18 11:29:26 kls Exp $
  */
 
 #include "shutdown.h"
@@ -172,9 +172,10 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive)
         return false;
      }
 
-  cTimer *timer = Timers.GetNextActiveTimer();
-  time_t Next = timer ? timer->StartTime() : 0;
-  time_t Delta = timer ? Next - time(NULL) : 0;
+  LOCK_TIMERS_READ;
+  const cTimer *Timer = Timers->GetNextActiveTimer();
+  time_t Next = Timer ? Timer->StartTime() : 0;
+  time_t Delta = Timer ? Next - time(NULL) : 0;
 
   if (cRecordControls::Active() || (Next && Delta <= 0)) {
      // VPS recordings in timer end margin may cause Delta <= 0
@@ -215,9 +216,10 @@ bool cShutdownHandler::ConfirmRestart(bool Interactive)
         return false;
      }
 
-  cTimer *timer = Timers.GetNextActiveTimer();
-  time_t Next  = timer ? timer->StartTime() : 0;
-  time_t Delta = timer ? Next - time(NULL) : 0;
+  LOCK_TIMERS_READ;
+  const cTimer *Timer = Timers->GetNextActiveTimer();
+  time_t Next = Timer ? Timer->StartTime() : 0;
+  time_t Delta = Timer ? Next - time(NULL) : 0;
 
   if (cRecordControls::Active() || (Next && Delta <= 0)) {
      // VPS recordings in timer end margin may cause Delta <= 0
@@ -233,15 +235,16 @@ bool cShutdownHandler::ConfirmRestart(bool Interactive)
 
 bool cShutdownHandler::DoShutdown(bool Force)
 {
+  LOCK_TIMERS_READ;
   time_t Now = time(NULL);
-  cTimer *timer = Timers.GetNextActiveTimer();
+  const cTimer *Timer = Timers->GetNextActiveTimer();
   cPlugin *Plugin = cPluginManager::GetNextWakeupPlugin();
 
-  time_t Next = timer ? timer->StartTime() : 0;
+  time_t Next = Timer ? Timer->StartTime() : 0;
   time_t NextPlugin = Plugin ? Plugin->WakeupTime() : 0;
   if (NextPlugin && (!Next || Next > NextPlugin)) {
      Next = NextPlugin;
-     timer = NULL;
+     Timer = NULL;
      }
   time_t Delta = Next ? Next - Now : 0;
 
@@ -250,13 +253,13 @@ bool cShutdownHandler::DoShutdown(bool Force)
         return false;
      Delta = Setup.MinEventTimeout * 60;
      Next = Now + Delta;
-     timer = NULL;
+     Timer = NULL;
      dsyslog("reboot at %s", *TimeToString(Next));
      }
 
-  if (Next && timer) {
+  if (Next && Timer) {
      dsyslog("next timer event at %s", *TimeToString(Next));
-     CallShutdownCommand(Next, timer->Channel()->Number(), timer->File(), Force);
+     CallShutdownCommand(Next, Timer->Channel()->Number(), Timer->File(), Force);
      }
   else if (Next && Plugin) {
      CallShutdownCommand(Next, 0, Plugin->Name(), Force);
diff --git a/shutdown.h b/shutdown.h
index 5e4af29fa..7bf886acc 100644
--- a/shutdown.h
+++ b/shutdown.h
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.h 3.0 2013/02/18 10:35:27 kls Exp $
+ * $Id: shutdown.h 4.0 2013/02/18 10:35:27 kls Exp $
  */
 
 #ifndef __SHUTDOWN_H
diff --git a/skinclassic.c b/skinclassic.c
index fa3843151..b6d183b19 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 3.0 2013/03/03 15:26:09 kls Exp $
+ * $Id: skinclassic.c 4.0 2013/03/03 15:26:09 kls Exp $
  */
 
 #include "skinclassic.h"
diff --git a/skinclassic.h b/skinclassic.h
index 005901b49..57e96f8a2 100644
--- a/skinclassic.h
+++ b/skinclassic.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.h 3.0 2005/01/02 14:38:56 kls Exp $
+ * $Id: skinclassic.h 4.0 2005/01/02 14:38:56 kls Exp $
  */
 
 #ifndef __SKINCLASSIC_H
diff --git a/skinlcars.c b/skinlcars.c
index a722b5214..d84a753f6 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 3.8 2014/06/12 08:48:15 kls Exp $
+ * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -710,7 +710,7 @@ class cSkinLCARSDisplayMenu : public cSkinDisplayMenu {
   int lastDiskUsageState;
   bool lastDiskAlert;
   double lastSystemLoad;
-  int lastTimersState;
+  cStateKey timersStateKey;
   time_t lastSignalDisplay;
   int lastLiveIndicatorY;
   bool lastLiveIndicatorTransferring;
@@ -775,7 +775,6 @@ cSkinLCARSDisplayMenu::cSkinLCARSDisplayMenu(void)
   lastEvent = NULL;
   lastRecording = NULL;
   lastSeen = -1;
-  lastTimersState = -1;
   lastSignalDisplay = 0;
   lastLiveIndicatorY = -1;
   lastLiveIndicatorTransferring = false;
@@ -970,7 +969,7 @@ void cSkinLCARSDisplayMenu::SetMenuCategory(eMenuCategory MenuCategory)
         xi01 = xm03;
         xi02 = xm04;
         xi03 = xm05;
-        lastTimersState = -1;
+        timersStateKey.Reset();
         DrawMainFrameLower();
         DrawMainBracket();
         DrawStatusElbows();
@@ -1237,19 +1236,22 @@ void cSkinLCARSDisplayMenu::DrawTimer(const cTimer *Timer, int y, bool MultiRec)
      }
   if (Event)
      osd->DrawText(xs00 + d, y + lineHeight - tinyFont->Height(), Event->Title(), ColorFg, ColorBg, tinyFont, xs03 - xs00 - 2 * d);
+  // The remote timer indicator:
+  if (Timer->Remote())
+     osd->DrawRectangle(xs00 - (lineHeight - Gap) / 2, y, xs00 - Gap - 1, y + lineHeight - 1, Timer->Recording() ? Theme.Color(clrMenuTimerRecording) : ColorBg);
   // The timer recording indicator:
-  if (Timer->Recording())
+  else if (Timer->Recording())
      osd->DrawRectangle(xs03 + Gap, y - (MultiRec ? Gap : 0), xs04 - Gap / 2 - 1, y + lineHeight - 1, Theme.Color(clrMenuTimerRecording));
 }
 
 void cSkinLCARSDisplayMenu::DrawTimers(void)
 {
-  if (Timers.Modified(lastTimersState)) {
+  if (const cTimers *Timers = cTimers::GetTimersRead(timersStateKey)) {
      deviceRecording.Clear();
      const cFont *font = cFont::GetFont(fontOsd);
-     osd->DrawRectangle(xs00, ys04, xs04 - 1, ys05 - 1, Theme.Color(clrBackground));
+     osd->DrawRectangle(xs00 - (lineHeight - Gap) / 2, ys04, xs04 - 1, ys05 - 1, Theme.Color(clrBackground));
      osd->DrawRectangle(xs07, ys04, xs13 - 1, ys05 - 1, Theme.Color(clrBackground));
-     cSortedTimers SortedTimers;
+     cSortedTimers SortedTimers(Timers);
      cVector<int> FreeDeviceSlots;
      int NumDevices = 0;
      int y = ys04;
@@ -1262,7 +1264,14 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
                   break;
                if (const cTimer *Timer = SortedTimers[i]) {
                   if (Timer->Recording()) {
-                     if (cRecordControl *RecordControl = cRecordControls::GetRecordControl(Timer)) {
+                     if (Timer->Remote()) {
+                        if (!Device && Timer->HasFlags(tfActive)) {
+                           DrawTimer(Timer, y, false);
+                           FreeDeviceSlots.Append(y);
+                           y += lineHeight + Gap;
+                           }
+                        }
+                     else if (cRecordControl *RecordControl = cRecordControls::GetRecordControl(Timer)) {
                         if (!Device || Device == RecordControl->Device()) {
                            DrawTimer(Timer, y, NumTimers > 0);
                            NumTimers++;
@@ -1313,7 +1322,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
          }
      // Total number of active timers:
      int NumTimers = 0;
-     for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
+     for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
          if (Timer->HasFlags(tfActive))
             NumTimers++;
          }
@@ -1321,6 +1330,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
      osd->DrawText(xs08, ys00, itoa(NumDevices), Theme.Color(clrMenuFrameFg), frameColor, font, xs09 - xs08, ys01 - ys00, taBottom | taRight | taBorder);
      lastSignalDisplay = 0;
      initial = true; // forces redrawing of devices
+     timersStateKey.Remove();
      }
 }
 
@@ -1423,25 +1433,23 @@ void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel)
      DrawSeen(0, 0);
      }
   // The current programme:
-  cSchedulesLock SchedulesLock;
-  if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
-     if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
-        const cEvent *Event = Schedule->GetPresentEvent();
-        if (initial || Event != lastEvent) {
-           DrawInfo(Event, true);
-           lastEvent = Event;
-           lastSeen = -1;
-           }
-        int Current = 0;
-        int Total = 0;
-        if (Event) {
-           time_t t = time(NULL);
-           if (t > Event->StartTime())
-              Current = t - Event->StartTime();
-           Total = Event->Duration();
-           }
-        DrawSeen(Current, Total);
+  LOCK_SCHEDULES_READ;
+  if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
+     const cEvent *Event = Schedule->GetPresentEvent();
+     if (initial || Event != lastEvent) {
+        DrawInfo(Event, true);
+        lastEvent = Event;
+        lastSeen = -1;
+        }
+     int Current = 0;
+     int Total = 0;
+     if (Event) {
+        time_t t = time(NULL);
+        if (t > Event->StartTime())
+           Current = t - Event->StartTime();
+        Total = Event->Duration();
         }
+     DrawSeen(Current, Total);
      }
 }
 
@@ -1731,7 +1739,8 @@ void cSkinLCARSDisplayMenu::Flush(void)
   if (MenuCategory() == mcMain) {
      cDevice *Device = cDevice::PrimaryDevice();
      if (!Device->Replaying() || Device->Transferring()) {
-        const cChannel *Channel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
+        LOCK_CHANNELS_READ;
+        const cChannel *Channel = Channels->GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
         DrawLive(Channel);
         }
      else if (cControl *Control = cControl::Control(true))
diff --git a/skinlcars.h b/skinlcars.h
index abab0189e..9c9cdfb97 100644
--- a/skinlcars.h
+++ b/skinlcars.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.h 3.0 2012/04/15 13:17:35 kls Exp $
+ * $Id: skinlcars.h 4.0 2012/04/15 13:17:35 kls Exp $
  */
 
 #ifndef __SKINLCARS_H
diff --git a/skins.c b/skins.c
index 8d00e8d49..3aee8140c 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 3.1 2013/08/18 12:07:22 kls Exp $
+ * $Id: skins.c 4.0 2013/08/18 12:07:22 kls Exp $
  */
 
 #include "skins.h"
diff --git a/skins.h b/skins.h
index e1d12c055..2286087b9 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 3.4 2015/01/15 10:45:47 kls Exp $
+ * $Id: skins.h 4.1 2015/09/10 11:19:48 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -129,6 +129,11 @@ enum eMenuSortMode {
   msmProvider
   };
 
+enum eMenuOrientation {
+  moVertical = 0,
+  moHorizontal
+  };
+
 class cSkinDisplayMenu : public cSkinDisplay {
        ///< This class implements the general purpose menu display, which is
        ///< used throughout the program to display information and let the
@@ -179,6 +184,10 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< Sets the mode by which the items in this menu are sorted.
        ///< This is purely informative and may be used by a skin to display the
        ///< current sort mode by means of some text or symbol.
+  virtual eMenuOrientation MenuOrientation(void) { return moVertical; }
+       ///< Asks the skin for the orientation of the displayed menu.
+       ///< If menu orientation is set to horizontal, the keys left/right
+       ///< and up/down are just toggled.
   virtual void Scroll(bool Up, bool Page);
        ///< If this menu contains a text area that can be scrolled, this function
        ///< will be called to actually scroll the text. Up indicates whether the
diff --git a/skinsttng.c b/skinsttng.c
index 7e450fda4..f10f1204d 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 3.1 2013/11/15 15:33:14 kls Exp $
+ * $Id: skinsttng.c 4.0 2013/11/15 15:33:14 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
diff --git a/skinsttng.h b/skinsttng.h
index f29262d43..7b55db62d 100644
--- a/skinsttng.h
+++ b/skinsttng.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.h 3.0 2005/01/02 14:39:29 kls Exp $
+ * $Id: skinsttng.h 4.0 2005/01/02 14:39:29 kls Exp $
  */
 
 #ifndef __SKINSTTNG_H
diff --git a/sourceparams.c b/sourceparams.c
index 3eec406a6..6e92bbef3 100644
--- a/sourceparams.c
+++ b/sourceparams.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sourceparams.c 3.1 2014/03/09 12:03:09 kls Exp $
+ * $Id: sourceparams.c 4.1 2015/08/02 11:56:39 kls Exp $
  */
 
 #include "sourceparams.h"
@@ -33,7 +33,7 @@ cSourceParam::cSourceParam(char Source, const char *Description)
 
 cSourceParams SourceParams;
 
-cSourceParam *cSourceParams::Get(char Source) const
+cSourceParam *cSourceParams::Get(char Source)
 {
   for (cSourceParam *sp = First(); sp; sp = Next(sp)) {
       if (sp->Source() == Source)
diff --git a/sourceparams.h b/sourceparams.h
index 9f98bd07e..1e0a6abcc 100644
--- a/sourceparams.h
+++ b/sourceparams.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sourceparams.h 3.0 2010/02/28 11:58:03 kls Exp $
+ * $Id: sourceparams.h 4.1 2015/08/02 11:56:25 kls Exp $
  */
 
 #ifndef __SOURCEPARAMS_H
@@ -45,7 +45,7 @@ class cSourceParam : public cListObject {
 
 class cSourceParams : public cList<cSourceParam> {
 public:
-  cSourceParam *Get(char Source) const;
+  cSourceParam *Get(char Source);
   };
 
 extern cSourceParams SourceParams;
diff --git a/sources.c b/sources.c
index f0a343278..aad682f92 100644
--- a/sources.c
+++ b/sources.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.c 3.6 2014/03/09 12:05:42 kls Exp $
+ * $Id: sources.c 4.0 2014/03/09 12:05:42 kls Exp $
  */
 
 #include "sources.h"
diff --git a/sources.h b/sources.h
index 1cd05b83e..e3e7faf0c 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sources.h 3.3 2014/03/09 11:59:49 kls Exp $
+ * $Id: sources.h 4.0 2014/03/09 11:59:49 kls Exp $
  */
 
 #ifndef __SOURCES_H
diff --git a/spu.c b/spu.c
index 8394abf90..199d85ee6 100644
--- a/spu.c
+++ b/spu.c
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.c 3.0 2008/02/10 14:06:48 kls Exp $
+ * $Id: spu.c 4.0 2008/02/10 14:06:48 kls Exp $
  */
 
 #include "spu.h"
diff --git a/spu.h b/spu.h
index 8945b441c..3c2ba993a 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
  * This code is distributed under the terms and conditions of the
  * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
  *
- * $Id: spu.h 3.0 2006/04/17 12:48:55 kls Exp $
+ * $Id: spu.h 4.0 2006/04/17 12:48:55 kls Exp $
  */
 
 #ifndef __SPU_VDR_H
diff --git a/status.c b/status.c
index 10b8ce8a9..846c10c3b 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 3.1 2014/01/25 10:47:39 kls Exp $
+ * $Id: status.c 4.0 2014/01/25 10:47:39 kls Exp $
  */
 
 #include "status.h"
diff --git a/status.h b/status.h
index 222280acc..6d1b9df57 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 3.1 2014/01/25 10:47:39 kls Exp $
+ * $Id: status.h 4.1 2015/08/02 10:34:44 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -15,7 +15,7 @@
 #include "player.h"
 #include "tools.h"
 
-enum eTimerChange { tcMod, tcAdd, tcDel };
+enum eTimerChange { tcMod, tcAdd, tcDel }; // tcMod is obsolete and no longer used!
 
 class cTimer;
 
@@ -29,10 +29,7 @@ class cStatus : public cListObject {
                // require a retune.
   virtual void TimerChange(const cTimer *Timer, eTimerChange Change) {}
                // Indicates a change in the timer settings.
-               // If Change is tcAdd or tcDel, Timer points to the timer that has
-               // been added or will be deleted, respectively. In case of tcMod,
-               // Timer is NULL; this indicates that some timer has been changed.
-               // Note that tcAdd and tcDel are always also followed by a tcMod.
+               // Timer points to the timer that has been added or will be deleted, respectively.
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView) {}
                // Indicates a channel switch on the given DVB device.
                // If ChannelNumber is 0, this is before the channel is being switched,
diff --git a/summary2info b/summary2info
index 6baf4e7d3..511079b0d 100755
--- a/summary2info
+++ b/summary2info
@@ -10,7 +10,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: summary2info 3.0 2011/12/04 14:17:35 kls Exp $
+# $Id: summary2info 4.0 2011/12/04 14:17:35 kls Exp $
 
 $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
 
diff --git a/svdrp.c b/svdrp.c
index 2b5edb2c6..1a24d296a 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 3.6 2015/01/12 11:16:27 kls Exp $
+ * $Id: svdrp.c 4.9 2015/09/14 13:23:06 kls Exp $
  */
 
 #include "svdrp.h"
@@ -18,6 +18,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <ifaddrs.h>
 #include <netinet/in.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -33,19 +34,90 @@
 #include "keys.h"
 #include "menu.h"
 #include "plugin.h"
+#include "recording.h"
 #include "remote.h"
 #include "skins.h"
+#include "thread.h"
 #include "timers.h"
-#include "tools.h"
 #include "videodir.h"
 
+static bool DumpSVDRPDataTransfer = false;
+
+#define dbgsvdrp(a...) if (DumpSVDRPDataTransfer) fprintf(stderr, a)
+
+static int SVDRPTcpPort = 0;
+static int SVDRPUdpPort = 0;
+
+// --- cIpAddress ------------------------------------------------------------
+
+class cIpAddress {
+private:
+  cString address;
+  int port;
+  cString connection;
+public:
+  cIpAddress(void);
+  cIpAddress(const char *Address, int Port);
+  const char *Address(void) const { return address; }
+  int Port(void) const { return port; }
+  void Set(const char *Address, int Port);
+  void Set(const sockaddr *SockAddr);
+  const char *Connection(void) const { return connection; }
+  };
+
+cIpAddress::cIpAddress(void)
+{
+  Set(INADDR_ANY, 0);
+}
+
+cIpAddress::cIpAddress(const char *Address, int Port)
+{
+  Set(Address, Port);
+}
+
+void cIpAddress::Set(const char *Address, int Port)
+{
+  address = Address;
+  port = Port;
+  connection = cString::sprintf("%s:%d", *address, port);
+}
+
+void cIpAddress::Set(const sockaddr *SockAddr)
+{
+  const sockaddr_in *Addr = (sockaddr_in *)SockAddr;
+  Set(inet_ntoa(Addr->sin_addr), ntohs(Addr->sin_port));
+}
+
 // --- cSocket ---------------------------------------------------------------
 
-cSocket::cSocket(int Port, int Queue)
+#define MAXUDPBUF 1024
+
+class cSocket {
+private:
+  int port;
+  bool tcp;
+  int sock;
+  cIpAddress lastIpAddress;
+  bool IsOwnInterface(sockaddr_in *Addr);
+public:
+  cSocket(int Port, bool Tcp);
+  ~cSocket();
+  bool Listen(void);
+  bool Connect(const char *Address);
+  void Close(void);
+  int Port(void) const { return port; }
+  int Socket(void) const { return sock; }
+  static bool SendDgram(const char *Dgram, int Port, const char *Address = NULL);
+  int Accept(void);
+  cString Discover(void);
+  const cIpAddress *LastIpAddress(void) const { return &lastIpAddress; }
+  };
+
+cSocket::cSocket(int Port, bool Tcp)
 {
   port = Port;
+  tcp = Tcp;
   sock = -1;
-  queue = Queue;
 }
 
 cSocket::~cSocket()
@@ -53,6 +125,30 @@ cSocket::~cSocket()
   Close();
 }
 
+bool cSocket::IsOwnInterface(sockaddr_in *Addr)
+{
+  ifaddrs *ifaddr;
+  if (getifaddrs(&ifaddr) >= 0) {
+     bool Own = false;
+     for (ifaddrs *ifa = ifaddr; ifa; ifa = ifa->ifa_next) {
+         if (ifa->ifa_addr) {
+            if (ifa->ifa_addr->sa_family == AF_INET) {
+               sockaddr_in *addr = (sockaddr_in *)ifa->ifa_addr;
+               if (addr->sin_addr.s_addr == Addr->sin_addr.s_addr) {
+                  Own = true;
+                  break;
+                  }
+               }
+            }
+         }
+     freeifaddrs(ifaddr);
+     return Own;
+     }
+  else
+     LOG_ERROR;
+  return false;
+}
+
 void cSocket::Close(void)
 {
   if (sock >= 0) {
@@ -61,75 +157,508 @@ void cSocket::Close(void)
      }
 }
 
-bool cSocket::Open(void)
+bool cSocket::Listen(void)
 {
   if (sock < 0) {
      // create socket:
-     sock = socket(PF_INET, SOCK_STREAM, 0);
+     sock = tcp ? socket(PF_INET, SOCK_STREAM, IPPROTO_IP) : socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
      if (sock < 0) {
         LOG_ERROR;
-        port = 0;
         return false;
         }
      // allow it to always reuse the same port:
      int ReUseAddr = 1;
      setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &ReUseAddr, sizeof(ReUseAddr));
-     //
-     struct sockaddr_in name;
-     name.sin_family = AF_INET;
-     name.sin_port = htons(port);
-     name.sin_addr.s_addr = SVDRPhosts.LocalhostOnly() ? htonl(INADDR_LOOPBACK) : htonl(INADDR_ANY);
-     if (bind(sock, (struct sockaddr *)&name, sizeof(name)) < 0) {
+     // configure port and ip:
+     sockaddr_in Addr;
+     memset(&Addr, 0, sizeof(Addr));
+     Addr.sin_family = AF_INET;
+     Addr.sin_port = htons(port);
+     Addr.sin_addr.s_addr = SVDRPhosts.LocalhostOnly() ? htonl(INADDR_LOOPBACK) : htonl(INADDR_ANY);
+     if (bind(sock, (sockaddr *)&Addr, sizeof(Addr)) < 0) {
         LOG_ERROR;
         Close();
         return false;
         }
      // make it non-blocking:
-     int oldflags = fcntl(sock, F_GETFL, 0);
-     if (oldflags < 0) {
+     int Flags = fcntl(sock, F_GETFL, 0);
+     if (Flags < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     Flags |= O_NONBLOCK;
+     if (fcntl(sock, F_SETFL, Flags) < 0) {
         LOG_ERROR;
         return false;
         }
-     oldflags |= O_NONBLOCK;
-     if (fcntl(sock, F_SETFL, oldflags) < 0) {
+     if (tcp) {
+        // listen to the socket:
+        if (listen(sock, 1) < 0) {
+           LOG_ERROR;
+           return false;
+           }
+        }
+     isyslog("SVDRP listening on port %d/%s", port, tcp ? "tcp" : "udp");
+     }
+  return true;
+}
+
+bool cSocket::Connect(const char *Address)
+{
+  if (sock < 0 && tcp) {
+     // create socket:
+     sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP);
+     if (sock < 0) {
         LOG_ERROR;
         return false;
         }
-     // listen to the socket:
-     if (listen(sock, queue) < 0) {
+     // configure port and ip:
+     sockaddr_in Addr;
+     memset(&Addr, 0, sizeof(Addr));
+     Addr.sin_family = AF_INET;
+     Addr.sin_port = htons(port);
+     Addr.sin_addr.s_addr = inet_addr(Address);
+     if (connect(sock, (sockaddr *)&Addr, sizeof(Addr)) < 0) {
         LOG_ERROR;
+        Close();
         return false;
         }
+     // make it non-blocking:
+     int Flags = fcntl(sock, F_GETFL, 0);
+     if (Flags < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     Flags |= O_NONBLOCK;
+     if (fcntl(sock, F_SETFL, Flags) < 0) {
+        LOG_ERROR;
+        return false;
+        }
+     isyslog("SVDRP > %s:%d server connection established", Address, port);
+     return true;
      }
-  return true;
+  return false;
+}
+
+bool cSocket::SendDgram(const char *Dgram, int Port, const char *Address)
+{
+  // Create a socket:
+  int Socket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+  if (Socket < 0) {
+     LOG_ERROR;
+     return false;
+     }
+  if (!Address) {
+     // Enable broadcast:
+     int One = 1;
+     if (setsockopt(Socket, SOL_SOCKET, SO_BROADCAST, &One, sizeof(One)) < 0) {
+        LOG_ERROR;
+        close(Socket);
+        return false;
+        }
+     }
+  // Configure port and ip:
+  sockaddr_in Addr;
+  memset(&Addr, 0, sizeof(Addr));
+  Addr.sin_family = AF_INET;
+  Addr.sin_addr.s_addr = Address ? inet_addr(Address) : htonl(INADDR_BROADCAST);
+  Addr.sin_port = htons(Port);
+  // Send datagram:
+  dsyslog("SVDRP > %s:%d send dgram '%s'", inet_ntoa(Addr.sin_addr), Port, Dgram);
+  int Length = strlen(Dgram);
+  int Sent = sendto(Socket, Dgram, Length, 0, (sockaddr *)&Addr, sizeof(Addr));
+  if (Sent < 0)
+     LOG_ERROR;
+  close(Socket);
+  return Sent == Length;
 }
 
 int cSocket::Accept(void)
 {
-  if (Open()) {
-     struct sockaddr_in clientname;
-     uint size = sizeof(clientname);
-     int newsock = accept(sock, (struct sockaddr *)&clientname, &size);
-     if (newsock > 0) {
-        bool accepted = SVDRPhosts.Acceptable(clientname.sin_addr.s_addr);
-        if (!accepted) {
+  if (sock >= 0 && tcp) {
+     sockaddr_in Addr;
+     uint Size = sizeof(Addr);
+     int NewSock = accept(sock, (sockaddr *)&Addr, &Size);
+     if (NewSock >= 0) {
+        bool Accepted = SVDRPhosts.Acceptable(Addr.sin_addr.s_addr);
+        if (!Accepted) {
            const char *s = "Access denied!\n";
-           if (write(newsock, s, strlen(s)) < 0)
+           if (write(NewSock, s, strlen(s)) < 0)
               LOG_ERROR;
-           close(newsock);
-           newsock = -1;
+           close(NewSock);
+           NewSock = -1;
            }
-        isyslog("connect from %s, port %hu - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
+        lastIpAddress.Set((sockaddr *)&Addr);
+        isyslog("SVDRP < %s client connection %s", lastIpAddress.Connection(), Accepted ? "accepted" : "DENIED");
         }
-     else if (errno != EINTR && errno != EAGAIN)
+     else if (FATALERRNO)
         LOG_ERROR;
-     return newsock;
+     return NewSock;
      }
   return -1;
 }
 
+cString cSocket::Discover(void)
+{
+  if (sock >= 0 && !tcp) {
+     char buf[MAXUDPBUF];
+     sockaddr_in Addr;
+     uint Size = sizeof(Addr);
+     int NumBytes = recvfrom(sock, buf, sizeof(buf), 0, (sockaddr *)&Addr, &Size);
+     if (NumBytes >= 0) {
+        buf[NumBytes] = 0;
+        if (!IsOwnInterface(&Addr)) {
+           lastIpAddress.Set((sockaddr *)&Addr);
+           if (!SVDRPhosts.Acceptable(Addr.sin_addr.s_addr)) {
+              dsyslog("SVDRP < %s discovery ignored (%s)", lastIpAddress.Connection(), buf);
+              return NULL;
+              }
+           if (!startswith(buf, "SVDRP:discover")) {
+              dsyslog("SVDRP < %s discovery unrecognized (%s)", lastIpAddress.Connection(), buf);
+              return NULL;
+              }
+           isyslog("SVDRP < %s discovery received (%s)", lastIpAddress.Connection(), buf);
+           return buf;
+           }
+        }
+     else if (FATALERRNO)
+        LOG_ERROR;
+     }
+  return NULL;
+}
+
+// --- cSVDRPClient ----------------------------------------------------------
+
+class cSVDRPClient {
+private:
+  cIpAddress ipAddress;
+  cSocket socket;
+  cString serverName;
+  int timeout;
+  cTimeMs pingTime;
+  cFile file;
+  int fetchFlags;
+  void Close(void);
+public:
+  cSVDRPClient(const char *Address, int Port, const char *ServerName, int Timeout);
+  ~cSVDRPClient();
+  const char *ServerName(void) const { return serverName; }
+  const char *Connection(void) const { return ipAddress.Connection(); }
+  bool HasAddress(const char *Address, int Port) const;
+  bool Send(const char *Command);
+  bool Process(cStringList *Response = NULL);
+  bool Execute(const char *Command, cStringList *Response = NULL);
+  void SetFetchFlag(eSvdrpFetchFlags Flag);
+  bool HasFetchFlag(eSvdrpFetchFlags Flag);
+  };
+
+static cPoller SVDRPClientPoller;
+
+cSVDRPClient::cSVDRPClient(const char *Address, int Port, const char *ServerName, int Timeout)
+:ipAddress(Address, Port)
+,socket(Port, true)
+{
+  serverName = ServerName;
+  timeout = Timeout * 1000 * 9 / 10; // ping after 90% of timeout
+  pingTime.Set(timeout);
+  fetchFlags = sffTimers;
+  if (socket.Connect(Address)) {
+     if (file.Open(socket.Socket())) {
+        SVDRPClientPoller.Add(file, false);
+        dsyslog("SVDRP > %s client created for '%s'", ipAddress.Connection(), *serverName);
+        return;
+        }
+     }
+  esyslog("SVDRP > %s ERROR: failed to create client for '%s'", ipAddress.Connection(), *serverName);
+}
+
+cSVDRPClient::~cSVDRPClient()
+{
+  Close();
+  dsyslog("SVDRP > %s client destroyed for '%s'", ipAddress.Connection(), *serverName);
+}
+
+void cSVDRPClient::Close(void)
+{
+  if (file.IsOpen()) {
+     SVDRPClientPoller.Del(file, false);
+     file.Close();
+     socket.Close();
+     }
+}
+
+bool cSVDRPClient::HasAddress(const char *Address, int Port) const
+{
+  return strcmp(ipAddress.Address(), Address) == 0 && ipAddress.Port() == Port;
+}
+
+bool cSVDRPClient::Send(const char *Command)
+{
+  pingTime.Set(timeout);
+  dbgsvdrp("> %s: %s\n", *serverName, Command);
+  if (safe_write(file, Command, strlen(Command) + 1) < 0) {
+     LOG_ERROR;
+     return false;
+     }
+  return true;
+}
+
+bool cSVDRPClient::Process(cStringList *Response)
+{
+  if (file.IsOpen()) {
+     char input[BUFSIZ];
+     int numChars = 0;
+#define SVDRPResonseTimeout 5000 // ms
+     cTimeMs Timeout(SVDRPResonseTimeout);
+     for (;;) {
+         if (file.Ready(false)) {
+            unsigned char c;
+            int r = safe_read(file, &c, 1);
+            if (r > 0) {
+               if (c == '\n' || c == 0x00) {
+                  // strip trailing whitespace:
+                  while (numChars > 0 && strchr(" \t\r\n", input[numChars - 1]))
+                        input[--numChars] = 0;
+                  // make sure the string is terminated:
+                  input[numChars] = 0;
+                  dbgsvdrp("< %s: %s\n", *serverName, input);
+                  if (Response) {
+                     Response->Append(strdup(input));
+                     if (numChars >= 4 && input[3] != '-') // no more lines will follow
+                        break;
+                     }
+                  else {
+                     switch (atoi(input)) {
+                       case 220: if (numChars > 4) {
+                                    char *n = input + 4;
+                                    if (char *t = strchr(n, ' ')) {
+                                       *t = 0;
+                                       if (strcmp(n, serverName) != 0) {
+                                          serverName = n;
+                                          dsyslog("SVDRP < %s remote server name is '%s'", ipAddress.Connection(), *serverName);
+                                          }
+                                       }
+                                    }
+                                 break;
+                       case 221: dsyslog("SVDRP < %s remote server closed connection to '%s'", ipAddress.Connection(), *serverName);
+                                 Close();
+                                 break;
+                       }
+                     }
+                  numChars = 0;
+                  }
+               else {
+                  if (numChars >= int(sizeof(input))) {
+                     esyslog("SVDRP < %s ERROR: out of memory", ipAddress.Connection());
+                     Close();
+                     break;
+                     }
+                  input[numChars++] = c;
+                  input[numChars] = 0;
+                  }
+               Timeout.Set(SVDRPResonseTimeout);
+               }
+            else if (r <= 0) {
+               isyslog("SVDRP < %s lost connection to remote server '%s'", ipAddress.Connection(), *serverName);
+               Close();
+               }
+            }
+         else if (!Response)
+            break;
+         else if (Timeout.TimedOut()) {
+            esyslog("SVDRP < %s timeout while waiting for response from '%s'", ipAddress.Connection(), *serverName);
+            return false;
+            }
+         }
+     if (pingTime.TimedOut())
+        Execute("PING");
+     }
+  return file.IsOpen();
+}
+
+bool cSVDRPClient::Execute(const char *Command, cStringList *Response)
+{
+  if (Response)
+     Response->Clear();
+  return Send(Command) && Process(Response);
+}
+
+void cSVDRPClient::SetFetchFlag(eSvdrpFetchFlags Flags)
+{
+  fetchFlags |= Flags;
+}
+
+bool cSVDRPClient::HasFetchFlag(eSvdrpFetchFlags Flag)
+{
+  bool Result = (fetchFlags & Flag);
+  fetchFlags &= ~Flag;
+  return Result;
+}
+
+// --- cSVDRPClientHandler ---------------------------------------------------
+
+class cSVDRPClientHandler : public cThread {
+private:
+  cMutex mutex;
+  int tcpPort;
+  cSocket udpSocket;
+  cVector<cSVDRPClient *> clientConnections;
+  void HandleClientConnection(void);
+  void ProcessConnections(void);
+  cSVDRPClient *GetClientForServer(const char *ServerName);
+protected:
+  virtual void Action(void);
+public:
+  cSVDRPClientHandler(int TcpPort, int UdpPort);
+  virtual ~cSVDRPClientHandler();
+  void SendDiscover(const char *Address = NULL);
+  bool Execute(const char *ServerName, const char *Command, cStringList *Response = NULL);
+  bool GetServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlags = sffNone);
+  bool TriggerFetchingTimers(const char *ServerName);
+  };
+
+static cSVDRPClientHandler *SVDRPClientHandler = NULL;
+
+cSVDRPClientHandler::cSVDRPClientHandler(int TcpPort, int UdpPort)
+:cThread("SVDRP client handler", true)
+,udpSocket(UdpPort, false)
+{
+  tcpPort = TcpPort;
+}
+
+cSVDRPClientHandler::~cSVDRPClientHandler()
+{
+  Cancel(3);
+  for (int i = 0; i < clientConnections.Size(); i++)
+      delete clientConnections[i];
+}
+
+cSVDRPClient *cSVDRPClientHandler::GetClientForServer(const char *ServerName)
+{
+  for (int i = 0; i < clientConnections.Size(); i++) {
+      if (strcmp(clientConnections[i]->ServerName(), ServerName) == 0)
+         return clientConnections[i];
+      }
+  return NULL;
+}
+
+void cSVDRPClientHandler::SendDiscover(const char *Address)
+{
+  cMutexLock MutexLock(&mutex);
+  cString Dgram = cString::sprintf("SVDRP:discover name:%s port:%d vdrversion:%d apiversion:%d timeout:%d", Setup.SVDRPHostName, tcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout);
+  udpSocket.SendDgram(Dgram, udpSocket.Port(), Address);
+}
+
+void cSVDRPClientHandler::ProcessConnections(void)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int i = 0; i < clientConnections.Size(); i++) {
+      if (!clientConnections[i]->Process()) {
+         delete clientConnections[i];
+         clientConnections.Remove(i);
+         i--;
+         }
+      }
+}
+
+void cSVDRPClientHandler::HandleClientConnection(void)
+{
+  cString NewDiscover = udpSocket.Discover();
+  if (*NewDiscover) {
+     cString p = strgetval(NewDiscover, "port", ':');
+     if (*p) {
+        int Port = atoi(p);
+        for (int i = 0; i < clientConnections.Size(); i++) {
+            if (clientConnections[i]->HasAddress(udpSocket.LastIpAddress()->Address(), Port)) {
+               dsyslog("SVDRP < %s connection to '%s' confirmed", clientConnections[i]->Connection(), clientConnections[i]->ServerName());
+               return;
+               }
+            }
+        cString ServerName = strgetval(NewDiscover, "name", ':');
+        if (*ServerName) {
+           cString t = strgetval(NewDiscover, "timeout", ':');
+           if (*t) {
+              int Timeout = atoi(t);
+              if (Timeout > 10) { // don't let it get too small
+                 const char *Address = udpSocket.LastIpAddress()->Address();
+                 clientConnections.Append(new cSVDRPClient(Address, Port, ServerName, Timeout));
+                 SendDiscover(Address);
+                 }
+              else
+                 esyslog("SVDRP < %s ERROR: invalid timeout (%d)", udpSocket.LastIpAddress()->Connection(), Timeout);
+              }
+           else
+              esyslog("SVDRP < %s ERROR: missing timeout", udpSocket.LastIpAddress()->Connection());
+           }
+        else
+           esyslog("SVDRP < %s ERROR: missing server name", udpSocket.LastIpAddress()->Connection());
+        }
+     else
+        esyslog("SVDRP < %s ERROR: missing port number", udpSocket.LastIpAddress()->Connection());
+     }
+}
+
+void cSVDRPClientHandler::Action(void)
+{
+  if (udpSocket.Listen()) {
+     SVDRPClientPoller.Add(udpSocket.Socket(), false);
+     SendDiscover();
+     while (Running()) {
+           SVDRPClientPoller.Poll(1000);
+           cMutexLock MutexLock(&mutex);
+           HandleClientConnection();
+           ProcessConnections();
+           }
+     SVDRPClientPoller.Del(udpSocket.Socket(), false);
+     udpSocket.Close();
+     }
+}
+
+bool cSVDRPClientHandler::Execute(const char *ServerName, const char *Command, cStringList *Response)
+{
+  cMutexLock MutexLock(&mutex);
+  if (cSVDRPClient *Client = GetClientForServer(ServerName))
+     return Client->Execute(Command, Response);
+  return false;
+}
+
+bool cSVDRPClientHandler::GetServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlag)
+{
+  cMutexLock MutexLock(&mutex);
+  ServerNames->Clear();
+  for (int i = 0; i < clientConnections.Size(); i++) {
+      cSVDRPClient *Client = clientConnections[i];
+      if (FetchFlag == sffNone || Client->HasFetchFlag(FetchFlag))
+         ServerNames->Append(strdup(Client->ServerName()));
+      }
+  return ServerNames->Size() > 0;
+}
+
+bool cSVDRPClientHandler::TriggerFetchingTimers(const char *ServerName)
+{
+  cMutexLock MutexLock(&mutex);
+  if (cSVDRPClient *Client = GetClientForServer(ServerName)) {
+     Client->SetFetchFlag(sffTimers);
+     return true;
+     }
+  return false;
+}
+
 // --- cPUTEhandler ----------------------------------------------------------
 
+class cPUTEhandler {
+private:
+  FILE *f;
+  int status;
+  const char *message;
+public:
+  cPUTEhandler(void);
+  ~cPUTEhandler();
+  bool Process(const char *s);
+  int Status(void) { return status; }
+  const char *Message(void) { return message; }
+  };
+
 cPUTEhandler::cPUTEhandler(void)
 {
   if ((f = tmpfile()) != NULL) {
@@ -175,7 +704,7 @@ bool cPUTEhandler::Process(const char *s)
   return false;
 }
 
-// --- cSVDRP ----------------------------------------------------------------
+// --- cSVDRPServer ----------------------------------------------------------
 
 #define MAXHELPTOPIC 10
 #define EITDISABLETIME 10 // seconds until EIT processing is enabled again after a CLRE command
@@ -244,7 +773,8 @@ const char *HelpPages[] = {
   "    List timers. Without option, all timers are listed. Otherwise\n"
   "    only the given timer is listed. If the keyword 'id' is given, the\n"
   "    channels will be listed with their unique channel ids instead of\n"
-  "    their numbers.",
+  "    their numbers. This command lists only the timers that are defined\n"
+  "    locally on this VDR, not any remote timers from other VDRs.",
   "MESG <message>\n"
   "    Displays the given message on the OSD. The message will be queued\n"
   "    and displayed whenever this is suitable.\n",
@@ -278,6 +808,10 @@ const char *HelpPages[] = {
   "    zero, this means that the timer is currently recording and has started\n"
   "    at the given time. The first value in the resulting line is the number\n"
   "    of the timer.",
+  "PING\n"
+  "    Used by peer-to-peer connections between VDRs to keep the connection\n"
+  "    from timing out. May be used at any time and simply returns a line of\n"
+  "    the form '<hostname> is alive'.",
   "PLAY <number> [ begin | <position> ]\n"
   "    Play the recording with the given number. Before a recording can be\n"
   "    played, an LSTR command must have been executed in order to retrieve\n"
@@ -298,6 +832,10 @@ const char *HelpPages[] = {
   "    If 'help' is followed by a command, the detailed help for that command is\n"
   "    given. The keyword 'main' initiates a call to the main menu function of the\n"
   "    given plugin.\n",
+  "POLL timers\n"
+  "    Used by peer-to-peer connections between VDRs to inform other machines\n"
+  "    about changes to timers. The receiving VDR shall use LSTT to query the\n"
+  "    remote machine's timers and update its list of timers accordingly.\n",
   "PUTE [ file ]\n"
   "    Put data into the EPG list. The data entered has to strictly follow the\n"
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
@@ -317,7 +855,7 @@ const char *HelpPages[] = {
   "UPDT <settings>\n"
   "    Updates a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. If a timer with the same channel, day, start\n"
-  "    and stop time does not yet exists, it will be created.",
+  "    and stop time does not yet exist, it will be created.",
   "UPDR\n"
   "    Initiates a re-read of the recordings directory, which is the SVDRP\n"
   "    equivalent to 'touch .update'.",
@@ -385,41 +923,103 @@ const char *GetHelpPage(const char *Cmd, const char **p)
   return NULL;
 }
 
-char *cSVDRP::grabImageDir = NULL;
+static cString grabImageDir;
+
+class cSVDRPServer {
+private:
+  int socket;
+  cString connection;
+  cFile file;
+  cPUTEhandler *PUTEhandler;
+  int numChars;
+  int length;
+  char *cmdLine;
+  time_t lastActivity;
+  void Close(bool SendReply = false, bool Timeout = false);
+  bool Send(const char *s, int length = -1);
+  void Reply(int Code, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
+  void PrintHelpTopics(const char **hp);
+  void CmdCHAN(const char *Option);
+  void CmdCLRE(const char *Option);
+  void CmdDELC(const char *Option);
+  void CmdDELR(const char *Option);
+  void CmdDELT(const char *Option);
+  void CmdEDIT(const char *Option);
+  void CmdGRAB(const char *Option);
+  void CmdHELP(const char *Option);
+  void CmdHITK(const char *Option);
+  void CmdLSTC(const char *Option);
+  void CmdLSTE(const char *Option);
+  void CmdLSTR(const char *Option);
+  void CmdLSTT(const char *Option);
+  void CmdMESG(const char *Option);
+  void CmdMODC(const char *Option);
+  void CmdMODT(const char *Option);
+  void CmdMOVC(const char *Option);
+  void CmdMOVR(const char *Option);
+  void CmdNEWC(const char *Option);
+  void CmdNEWT(const char *Option);
+  void CmdNEXT(const char *Option);
+  void CmdPING(const char *Option);
+  void CmdPLAY(const char *Option);
+  void CmdPLUG(const char *Option);
+  void CmdPOLL(const char *Option);
+  void CmdPUTE(const char *Option);
+  void CmdREMO(const char *Option);
+  void CmdSCAN(const char *Option);
+  void CmdSTAT(const char *Option);
+  void CmdUPDT(const char *Option);
+  void CmdUPDR(const char *Option);
+  void CmdVOLU(const char *Option);
+  void Execute(char *Cmd);
+public:
+  cSVDRPServer(int Socket, const char *Connection);
+  ~cSVDRPServer();
+  bool HasConnection(void) { return file.IsOpen(); }
+  bool Process(void);
+  };
+
+static cPoller SVDRPServerPoller;
 
-cSVDRP::cSVDRP(int Port)
-:socket(Port)
+cSVDRPServer::cSVDRPServer(int Socket, const char *Connection)
 {
+  socket = Socket;
+  connection = Connection;
   PUTEhandler = NULL;
   numChars = 0;
   length = BUFSIZ;
   cmdLine = MALLOC(char, length);
-  lastActivity = 0;
-  isyslog("SVDRP listening on port %d", Port);
+  lastActivity = time(NULL);
+  if (file.Open(socket)) {
+     time_t now = time(NULL);
+     Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", Setup.SVDRPHostName, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8");
+     SVDRPServerPoller.Add(file, false);
+     }
+  dsyslog("SVDRP < %s server created", *connection);
 }
 
-cSVDRP::~cSVDRP()
+cSVDRPServer::~cSVDRPServer()
 {
   Close(true);
   free(cmdLine);
+  dsyslog("SVDRP < %s server destroyed", *connection);
 }
 
-void cSVDRP::Close(bool SendReply, bool Timeout)
+void cSVDRPServer::Close(bool SendReply, bool Timeout)
 {
   if (file.IsOpen()) {
      if (SendReply) {
-        //TODO how can we get the *full* hostname?
-        char buffer[BUFSIZ];
-        gethostname(buffer, sizeof(buffer));
-        Reply(221, "%s closing connection%s", buffer, Timeout ? " (timeout)" : "");
+        Reply(221, "%s closing connection%s", Setup.SVDRPHostName, Timeout ? " (timeout)" : "");
         }
-     isyslog("closing SVDRP connection"); //TODO store IP#???
+     isyslog("SVDRP < %s connection closed", *connection);
+     SVDRPServerPoller.Del(file, false);
      file.Close();
      DELETENULL(PUTEhandler);
      }
+  close(socket);
 }
 
-bool cSVDRP::Send(const char *s, int length)
+bool cSVDRPServer::Send(const char *s, int length)
 {
   if (length < 0)
      length = strlen(s);
@@ -431,7 +1031,7 @@ bool cSVDRP::Send(const char *s, int length)
   return true;
 }
 
-void cSVDRP::Reply(int Code, const char *fmt, ...)
+void cSVDRPServer::Reply(int Code, const char *fmt, ...)
 {
   if (file.IsOpen()) {
      if (Code != 0) {
@@ -454,12 +1054,12 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
         }
      else {
         Reply(451, "Zero return code - looks like a programming error!");
-        esyslog("SVDRP: zero return code!");
+        esyslog("SVDRP < %s zero return code!", *connection);
         }
      }
 }
 
-void cSVDRP::PrintHelpTopics(const char **hp)
+void cSVDRPServer::PrintHelpTopics(const char **hp)
 {
   int NumPages = 0;
   if (hp) {
@@ -485,14 +1085,15 @@ void cSVDRP::PrintHelpTopics(const char **hp)
       }
 }
 
-void cSVDRP::CmdCHAN(const char *Option)
+void cSVDRPServer::CmdCHAN(const char *Option)
 {
+  LOCK_CHANNELS_READ;
   if (*Option) {
      int n = -1;
      int d = 0;
      if (isnumber(Option)) {
         int o = strtol(Option, NULL, 10);
-        if (o >= 1 && o <= Channels.MaxNumber())
+        if (o >= 1 && o <= cChannels::MaxNumber())
            n = o;
         }
      else if (strcmp(Option, "-") == 0) {
@@ -504,35 +1105,31 @@ void cSVDRP::CmdCHAN(const char *Option)
         }
      else if (strcmp(Option, "+") == 0) {
         n = cDevice::CurrentChannel();
-        if (n < Channels.MaxNumber()) {
+        if (n < cChannels::MaxNumber()) {
            n++;
            d = 1;
            }
         }
+     else if (const cChannel *Channel = Channels->GetByChannelID(tChannelID::FromString(Option)))
+        n = Channel->Number();
      else {
-        cChannel *channel = Channels.GetByChannelID(tChannelID::FromString(Option));
-        if (channel)
-           n = channel->Number();
-        else {
-           for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-               if (!channel->GroupSep()) {
-                  if (strcasecmp(channel->Name(), Option) == 0) {
-                     n = channel->Number();
-                     break;
-                     }
+        for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
+            if (!Channel->GroupSep()) {
+               if (strcasecmp(Channel->Name(), Option) == 0) {
+                  n = Channel->Number();
+                  break;
                   }
                }
-           }
+            }
         }
      if (n < 0) {
         Reply(501, "Undefined channel \"%s\"", Option);
         return;
         }
      if (!d) {
-        cChannel *channel = Channels.GetByNumber(n);
-        if (channel) {
-           if (!cDevice::PrimaryDevice()->SwitchChannel(channel, true)) {
-              Reply(554, "Error switching to channel \"%d\"", channel->Number());
+        if (const cChannel *Channel = Channels->GetByNumber(n)) {
+           if (!cDevice::PrimaryDevice()->SwitchChannel(Channel, true)) {
+              Reply(554, "Error switching to channel \"%d\"", Channel->Number());
               return;
               }
            }
@@ -544,26 +1141,27 @@ void cSVDRP::CmdCHAN(const char *Option)
      else
         cDevice::SwitchChannel(d);
      }
-  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-  if (channel)
-     Reply(250, "%d %s", channel->Number(), channel->Name());
+  if (const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel()))
+     Reply(250, "%d %s", Channel->Number(), Channel->Name());
   else
      Reply(550, "Unable to find channel \"%d\"", cDevice::CurrentChannel());
 }
 
-void cSVDRP::CmdCLRE(const char *Option)
+void cSVDRPServer::CmdCLRE(const char *Option)
 {
   if (*Option) {
+     LOCK_TIMERS_WRITE;
+     LOCK_CHANNELS_READ;
      tChannelID ChannelID = tChannelID::InvalidID;
      if (isnumber(Option)) {
         int o = strtol(Option, NULL, 10);
-        if (o >= 1 && o <= Channels.MaxNumber())
-           ChannelID = Channels.GetByNumber(o)->GetChannelID();
+        if (o >= 1 && o <= cChannels::MaxNumber())
+           ChannelID = Channels->GetByNumber(o)->GetChannelID();
         }
      else {
         ChannelID = tChannelID::FromString(Option);
         if (ChannelID == tChannelID::InvalidID) {
-           for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+           for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                if (!Channel->GroupSep()) {
                   if (strcasecmp(Channel->Name(), Option) == 0) {
                      ChannelID = Channel->GetChannelID();
@@ -574,87 +1172,80 @@ void cSVDRP::CmdCLRE(const char *Option)
            }
         }
      if (!(ChannelID == tChannelID::InvalidID)) {
-        cSchedulesLock SchedulesLock(true, 1000);
-        cSchedules *s = (cSchedules *)cSchedules::Schedules(SchedulesLock);
-        if (s) {
-           cSchedule *Schedule = NULL;
-           ChannelID.ClrRid();
-           for (cSchedule *p = s->First(); p; p = s->Next(p)) {
-               if (p->ChannelID() == ChannelID) {
-                  Schedule = p;
-                  break;
-                  }
+        LOCK_SCHEDULES_WRITE;
+        cSchedule *Schedule = NULL;
+        ChannelID.ClrRid();
+        for (cSchedule *p = Schedules->First(); p; p = Schedules->Next(p)) {
+            if (p->ChannelID() == ChannelID) {
+               Schedule = p;
+               break;
                }
-           if (Schedule) {
-              for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
-                  if (ChannelID == Timer->Channel()->GetChannelID().ClrRid())
-                     Timer->SetEvent(NULL);
-                  }
-              Schedule->Cleanup(INT_MAX);
-              cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
-              Reply(250, "EPG data of channel \"%s\" cleared", Option);
-              }
-           else {
-              Reply(550, "No EPG data found for channel \"%s\"", Option);
-              return;
-              }
+            }
+        if (Schedule) {
+           for (cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
+               if (ChannelID == Timer->Channel()->GetChannelID().ClrRid())
+                  Timer->SetEvent(NULL);
+               }
+           Schedule->Cleanup(INT_MAX);
+           cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
+           Reply(250, "EPG data of channel \"%s\" cleared", Option);
+           }
+        else {
+           Reply(550, "No EPG data found for channel \"%s\"", Option);
+           return;
            }
-        else
-           Reply(451, "Can't get EPG data");
         }
      else
         Reply(501, "Undefined channel \"%s\"", Option);
      }
   else {
+     LOCK_TIMERS_WRITE;
+     LOCK_SCHEDULES_WRITE;
+     for (cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer))
+         Timer->SetEvent(NULL); // processing all timers here (local *and* remote)
+     for (cSchedule *Schedule = Schedules->First(); Schedule; Schedule = Schedules->Next(Schedule))
+         Schedule->Cleanup(INT_MAX);
      cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
-     if (cSchedules::ClearAll()) {
-        Reply(250, "EPG data cleared");
-        cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
-        }
-     else
-        Reply(451, "Error while clearing EPG data");
+     Reply(250, "EPG data cleared");
      }
 }
 
-void cSVDRP::CmdDELC(const char *Option)
+void cSVDRPServer::CmdDELC(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        if (!Channels.BeingEdited()) {
-           cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
-           if (channel) {
-              for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
-                  if (timer->Channel() == channel) {
-                     Reply(550, "Channel \"%s\" is in use by timer %d", Option, timer->Index() + 1);
-                     return;
-                     }
-                  }
-              int CurrentChannelNr = cDevice::CurrentChannel();
-              cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
-              if (CurrentChannel && channel == CurrentChannel) {
-                 int n = Channels.GetNextNormal(CurrentChannel->Index());
-                 if (n < 0)
-                    n = Channels.GetPrevNormal(CurrentChannel->Index());
-                 CurrentChannel = Channels.Get(n);
-                 CurrentChannelNr = 0; // triggers channel switch below
-                 }
-              Channels.Del(channel);
-              Channels.ReNumber();
-              Channels.SetModified(true);
-              isyslog("channel %s deleted", Option);
-              if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
-                 if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
-                    Channels.SwitchTo(CurrentChannel->Number());
-                 else
-                    cDevice::SetCurrentChannel(CurrentChannel);
-                 }
-              Reply(250, "Channel \"%s\" deleted", Option);
+        LOCK_TIMERS_READ;
+        LOCK_CHANNELS_WRITE;
+        Channels->SetExplicitModify();
+        if (cChannel *Channel = Channels->GetByNumber(strtol(Option, NULL, 10))) {
+           if (const cTimer *Timer = Timers->UsesChannel(Channel)) {
+              Reply(550, "Channel \"%s\" is in use by timer %s", Option, *Timer->ToDescr());
+              return;
               }
-           else
-              Reply(501, "Channel \"%s\" not defined", Option);
+           int CurrentChannelNr = cDevice::CurrentChannel();
+           cChannel *CurrentChannel = Channels->GetByNumber(CurrentChannelNr);
+           if (CurrentChannel && Channel == CurrentChannel) {
+              int n = Channels->GetNextNormal(CurrentChannel->Index());
+              if (n < 0)
+                 n = Channels->GetPrevNormal(CurrentChannel->Index());
+              CurrentChannel = Channels->Get(n);
+              CurrentChannelNr = 0; // triggers channel switch below
+              }
+           Channels->Del(Channel);
+           Channels->ReNumber();
+           Channels->SetModifiedByUser();
+           Channels->SetModified();
+           isyslog("SVDRP < %s channel %s deleted", *connection, Option);
+           if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+              if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+                 Channels->SwitchTo(CurrentChannel->Number());
+              else
+                 cDevice::SetCurrentChannel(CurrentChannel);
+              }
+           Reply(250, "Channel \"%s\" deleted", Option);
            }
         else
-           Reply(550, "Channels are being edited - try again later");
+           Reply(501, "Channel \"%s\" not defined", Option);
         }
      else
         Reply(501, "Error in channel number \"%s\"", Option);
@@ -667,7 +1258,7 @@ static cString RecordingInUseMessage(int Reason, const char *RecordingId, cRecor
 {
   cRecordControl *rc;
   if ((Reason & ruTimer) != 0 && (rc = cRecordControls::GetRecordControl(Recording->FileName())) != NULL)
-     return cString::sprintf("Recording \"%s\" is in use by timer %d", RecordingId, rc->Timer()->Index() + 1);
+     return cString::sprintf("Recording \"%s\" is in use by timer %d", RecordingId, rc->Timer()->Id());
   else if ((Reason & ruReplay) != 0)
      return cString::sprintf("Recording \"%s\" is being replayed", RecordingId);
   else if ((Reason & ruCut) != 0)
@@ -679,25 +1270,27 @@ static cString RecordingInUseMessage(int Reason, const char *RecordingId, cRecor
   return NULL;
 }
 
-void cSVDRP::CmdDELR(const char *Option)
+void cSVDRPServer::CmdDELR(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
-        if (recording) {
-           if (int RecordingInUse = recording->IsInUse())
-              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, recording));
+        LOCK_RECORDINGS_WRITE;
+        Recordings->SetExplicitModify();
+        if (cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) {
+           if (int RecordingInUse = Recording->IsInUse())
+              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, Recording));
            else {
-              if (recording->Delete()) {
+              if (Recording->Delete()) {
+                 Recordings->DelByName(Recording->FileName());
+                 Recordings->SetModified();
                  Reply(250, "Recording \"%s\" deleted", Option);
-                 Recordings.DelByName(recording->FileName());
                  }
               else
                  Reply(554, "Error while deleting recording!");
               }
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", Option, recordings.Count() ? "" : " (use LSTR before deleting)");
+           Reply(550, "Recording \"%s\" not found", Option);
         }
      else
         Reply(501, "Error in recording number \"%s\"", Option);
@@ -706,27 +1299,22 @@ void cSVDRP::CmdDELR(const char *Option)
      Reply(501, "Missing recording number");
 }
 
-void cSVDRP::CmdDELT(const char *Option)
+void cSVDRPServer::CmdDELT(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        if (!Timers.BeingEdited()) {
-           cTimer *timer = Timers.Get(strtol(Option, NULL, 10) - 1);
-           if (timer) {
-              if (!timer->Recording()) {
-                 isyslog("deleting timer %s", *timer->ToDescr());
-                 Timers.Del(timer);
-                 Timers.SetModified();
-                 Reply(250, "Timer \"%s\" deleted", Option);
-                 }
-              else
-                 Reply(550, "Timer \"%s\" is recording", Option);
-              }
-           else
-              Reply(501, "Timer \"%s\" not defined", Option);
+        LOCK_TIMERS_WRITE;
+        Timers->SetExplicitModify();
+        if (cTimer *Timer = Timers->GetById(strtol(Option, NULL, 10))) {
+           if (Timer->Recording())
+              Timer->Skip();
+           Timers->Del(Timer);
+           Timers->SetModified();
+           isyslog("SVDRP < %s deleted timer %s", *connection, *Timer->ToDescr());
+           Reply(250, "Timer \"%s\" deleted", Option);
            }
         else
-           Reply(550, "Timers are being edited - try again later");
+           Reply(501, "Timer \"%s\" not defined", Option);
         }
      else
         Reply(501, "Error in timer number \"%s\"", Option);
@@ -735,16 +1323,16 @@ void cSVDRP::CmdDELT(const char *Option)
      Reply(501, "Missing timer number");
 }
 
-void cSVDRP::CmdEDIT(const char *Option)
+void cSVDRPServer::CmdEDIT(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option)) {
-        cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
-        if (recording) {
+        LOCK_RECORDINGS_READ;
+        if (const cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) {
            cMarks Marks;
-           if (Marks.Load(recording->FileName(), recording->FramesPerSecond(), recording->IsPesRecording()) && Marks.Count()) {
-              if (RecordingsHandler.Add(ruCut, recording->FileName()))
-                 Reply(250, "Editing recording \"%s\" [%s]", Option, recording->Title());
+           if (Marks.Load(Recording->FileName(), Recording->FramesPerSecond(), Recording->IsPesRecording()) && Marks.Count()) {
+              if (RecordingsHandler.Add(ruCut, Recording->FileName()))
+                 Reply(250, "Editing recording \"%s\" [%s]", Option, Recording->Title());
               else
                  Reply(554, "Can't start editing process");
               }
@@ -752,7 +1340,7 @@ void cSVDRP::CmdEDIT(const char *Option)
               Reply(554, "No editing marks defined");
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", Option, recordings.Count() ? "" : " (use LSTR before editing)");
+           Reply(550, "Recording \"%s\" not found", Option);
         }
      else
         Reply(501, "Error in recording number \"%s\"", Option);
@@ -761,7 +1349,7 @@ void cSVDRP::CmdEDIT(const char *Option)
      Reply(501, "Missing recording number");
 }
 
-void cSVDRP::CmdGRAB(const char *Option)
+void cSVDRPServer::CmdGRAB(const char *Option)
 {
   const char *FileName = NULL;
   bool Jpeg = true;
@@ -831,7 +1419,7 @@ void cSVDRP::CmdGRAB(const char *Option)
      // canonicalize the file name:
      char RealFileName[PATH_MAX];
      if (FileName) {
-        if (grabImageDir) {
+        if (*grabImageDir) {
            cString s(FileName);
            FileName = s;
            const char *slash = strrchr(FileName, '/');
@@ -868,7 +1456,7 @@ void cSVDRP::CmdGRAB(const char *Option)
            int fd = open(FileName, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, DEFFILEMODE);
            if (fd >= 0) {
               if (safe_write(fd, Image, ImageSize) == ImageSize) {
-                 dsyslog("grabbed image to %s", FileName);
+                 dsyslog("SVDRP < %s grabbed image to %s", *connection, FileName);
                  Reply(250, "Grabbed image %s", Option);
                  }
               else {
@@ -898,7 +1486,7 @@ void cSVDRP::CmdGRAB(const char *Option)
      Reply(501, "Missing filename");
 }
 
-void cSVDRP::CmdHELP(const char *Option)
+void cSVDRPServer::CmdHELP(const char *Option)
 {
   if (*Option) {
      const char *hp = GetHelpPage(Option, HelpPages);
@@ -926,7 +1514,7 @@ void cSVDRP::CmdHELP(const char *Option)
   Reply(214, "End of HELP info");
 }
 
-void cSVDRP::CmdHITK(const char *Option)
+void cSVDRPServer::CmdHITK(const char *Option)
 {
   if (*Option) {
      if (!cRemote::Enabled()) {
@@ -965,136 +1553,132 @@ void cSVDRP::CmdHITK(const char *Option)
      }
 }
 
-void cSVDRP::CmdLSTC(const char *Option)
+void cSVDRPServer::CmdLSTC(const char *Option)
 {
+  LOCK_CHANNELS_READ;
   bool WithGroupSeps = strcasecmp(Option, ":groups") == 0;
   if (*Option && !WithGroupSeps) {
      if (isnumber(Option)) {
-        cChannel *channel = Channels.GetByNumber(strtol(Option, NULL, 10));
-        if (channel)
-           Reply(250, "%d %s", channel->Number(), *channel->ToText());
+        if (const cChannel *Channel = Channels->GetByNumber(strtol(Option, NULL, 10)))
+           Reply(250, "%d %s", Channel->Number(), *Channel->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
      else {
-        cChannel *next = Channels.GetByChannelID(tChannelID::FromString(Option));
-        if (!next) {
-           for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-              if (!channel->GroupSep()) {
-                 if (strcasestr(channel->Name(), Option)) {
-                    if (next)
-                       Reply(-250, "%d %s", next->Number(), *next->ToText());
-                    next = channel;
+        const cChannel *Next = Channels->GetByChannelID(tChannelID::FromString(Option));
+        if (!Next) {
+           for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
+              if (!Channel->GroupSep()) {
+                 if (strcasestr(Channel->Name(), Option)) {
+                    if (Next)
+                       Reply(-250, "%d %s", Next->Number(), *Next->ToText());
+                    Next = Channel;
                     }
                  }
               }
            }
-        if (next)
-           Reply(250, "%d %s", next->Number(), *next->ToText());
+        if (Next)
+           Reply(250, "%d %s", Next->Number(), *Next->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
      }
-  else if (Channels.MaxNumber() >= 1) {
-     for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
+  else if (cChannels::MaxNumber() >= 1) {
+     for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
          if (WithGroupSeps)
-            Reply(channel->Next() ? -250: 250, "%d %s", channel->GroupSep() ? 0 : channel->Number(), *channel->ToText());
-         else if (!channel->GroupSep())
-            Reply(channel->Number() < Channels.MaxNumber() ? -250 : 250, "%d %s", channel->Number(), *channel->ToText());
+            Reply(Channel->Next() ? -250: 250, "%d %s", Channel->GroupSep() ? 0 : Channel->Number(), *Channel->ToText());
+         else if (!Channel->GroupSep())
+            Reply(Channel->Number() < cChannels::MaxNumber() ? -250 : 250, "%d %s", Channel->Number(), *Channel->ToText());
          }
      }
   else
      Reply(550, "No channels defined");
 }
 
-void cSVDRP::CmdLSTE(const char *Option)
-{
-  cSchedulesLock SchedulesLock;
-  const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-  if (Schedules) {
-     const cSchedule* Schedule = NULL;
-     eDumpMode DumpMode = dmAll;
-     time_t AtTime = 0;
-     if (*Option) {
-        char buf[strlen(Option) + 1];
-        strcpy(buf, Option);
-        const char *delim = " \t";
-        char *strtok_next;
-        char *p = strtok_r(buf, delim, &strtok_next);
-        while (p && DumpMode == dmAll) {
-              if (strcasecmp(p, "NOW") == 0)
-                 DumpMode = dmPresent;
-              else if (strcasecmp(p, "NEXT") == 0)
-                 DumpMode = dmFollowing;
-              else if (strcasecmp(p, "AT") == 0) {
-                 DumpMode = dmAtTime;
-                 if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
-                    if (isnumber(p))
-                       AtTime = strtol(p, NULL, 10);
-                    else {
-                       Reply(501, "Invalid time");
-                       return;
-                       }
-                    }
+void cSVDRPServer::CmdLSTE(const char *Option)
+{
+  LOCK_SCHEDULES_READ;
+  const cSchedule* Schedule = NULL;
+  eDumpMode DumpMode = dmAll;
+  time_t AtTime = 0;
+  if (*Option) {
+     char buf[strlen(Option) + 1];
+     strcpy(buf, Option);
+     const char *delim = " \t";
+     char *strtok_next;
+     char *p = strtok_r(buf, delim, &strtok_next);
+     while (p && DumpMode == dmAll) {
+           if (strcasecmp(p, "NOW") == 0)
+              DumpMode = dmPresent;
+           else if (strcasecmp(p, "NEXT") == 0)
+              DumpMode = dmFollowing;
+           else if (strcasecmp(p, "AT") == 0) {
+              DumpMode = dmAtTime;
+              if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
+                 if (isnumber(p))
+                    AtTime = strtol(p, NULL, 10);
                  else {
-                    Reply(501, "Missing time");
+                    Reply(501, "Invalid time");
                     return;
                     }
                  }
-              else if (!Schedule) {
-                 cChannel* Channel = NULL;
-                 if (isnumber(p))
-                    Channel = Channels.GetByNumber(strtol(Option, NULL, 10));
-                 else
-                    Channel = Channels.GetByChannelID(tChannelID::FromString(Option));
-                 if (Channel) {
-                    Schedule = Schedules->GetSchedule(Channel);
-                    if (!Schedule) {
-                       Reply(550, "No schedule found");
-                       return;
-                       }
-                    }
-                 else {
-                    Reply(550, "Channel \"%s\" not defined", p);
+              else {
+                 Reply(501, "Missing time");
+                 return;
+                 }
+              }
+           else if (!Schedule) {
+              LOCK_CHANNELS_READ;
+              const cChannel* Channel = NULL;
+              if (isnumber(p))
+                 Channel = Channels->GetByNumber(strtol(Option, NULL, 10));
+              else
+                 Channel = Channels->GetByChannelID(tChannelID::FromString(Option));
+              if (Channel) {
+                 Schedule = Schedules->GetSchedule(Channel);
+                 if (!Schedule) {
+                    Reply(550, "No schedule found");
                     return;
                     }
                  }
               else {
-                 Reply(501, "Unknown option: \"%s\"", p);
+                 Reply(550, "Channel \"%s\" not defined", p);
                  return;
                  }
-              p = strtok_r(NULL, delim, &strtok_next);
               }
-        }
-     int fd = dup(file);
-     if (fd) {
-        FILE *f = fdopen(fd, "w");
-        if (f) {
-           if (Schedule)
-              Schedule->Dump(f, "215-", DumpMode, AtTime);
-           else
-              Schedules->Dump(f, "215-", DumpMode, AtTime);
-           fflush(f);
-           Reply(215, "End of EPG data");
-           fclose(f);
-           }
-        else {
-           Reply(451, "Can't open file connection");
-           close(fd);
+           else {
+              Reply(501, "Unknown option: \"%s\"", p);
+              return;
+              }
+           p = strtok_r(NULL, delim, &strtok_next);
            }
+     }
+  int fd = dup(file);
+  if (fd) {
+     FILE *f = fdopen(fd, "w");
+     if (f) {
+        if (Schedule)
+           Schedule->Dump(f, "215-", DumpMode, AtTime);
+        else
+           Schedules->Dump(f, "215-", DumpMode, AtTime);
+        fflush(f);
+        Reply(215, "End of EPG data");
+        fclose(f);
+        }
+     else {
+        Reply(451, "Can't open file connection");
+        close(fd);
         }
-     else
-        Reply(451, "Can't dup stream descriptor");
      }
   else
-     Reply(451, "Can't get EPG data");
+     Reply(451, "Can't dup stream descriptor");
 }
 
-void cSVDRP::CmdLSTR(const char *Option)
+void cSVDRPServer::CmdLSTR(const char *Option)
 {
   int Number = 0;
   bool Path = false;
-  recordings.Update(true);
+  LOCK_RECORDINGS_READ;
   if (*Option) {
      char buf[strlen(Option) + 1];
      strcpy(buf, Option);
@@ -1119,14 +1703,13 @@ void cSVDRP::CmdLSTR(const char *Option)
            p = strtok_r(NULL, delim, &strtok_next);
            }
      if (Number) {
-        cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
-        if (recording) {
+        if (const cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) {
            FILE *f = fdopen(file, "w");
            if (f) {
               if (Path)
-                 Reply(250, "%s", recording->FileName());
+                 Reply(250, "%s", Recording->FileName());
               else {
-                 recording->Info()->Write(f, "215-");
+                 Recording->Info()->Write(f, "215-");
                  fflush(f);
                  Reply(215, "End of recording information");
                  }
@@ -1139,21 +1722,21 @@ void cSVDRP::CmdLSTR(const char *Option)
            Reply(550, "Recording \"%s\" not found", Option);
         }
      }
-  else if (recordings.Count()) {
-     cRecording *recording = recordings.First();
-     while (recording) {
-           Reply(recording == recordings.Last() ? 250 : -250, "%d %s", recording->Index() + 1, recording->Title(' ', true));
-           recording = recordings.Next(recording);
+  else if (Recordings->Count()) {
+     const cRecording *Recording = Recordings->First();
+     while (Recording) {
+           Reply(Recording == Recordings->Last() ? 250 : -250, "%d %s", Recording->Index() + 1, Recording->Title(' ', true));
+           Recording = Recordings->Next(Recording);
            }
      }
   else
      Reply(550, "No recordings available");
 }
 
-void cSVDRP::CmdLSTT(const char *Option)
+void cSVDRPServer::CmdLSTT(const char *Option)
 {
-  int Number = 0;
-  bool Id = false;
+  int Id = 0;
+  bool UseChannelId = false;
   if (*Option) {
      char buf[strlen(Option) + 1];
      strcpy(buf, Option);
@@ -1162,9 +1745,9 @@ void cSVDRP::CmdLSTT(const char *Option)
      char *p = strtok_r(buf, delim, &strtok_next);
      while (p) {
            if (isnumber(p))
-              Number = strtol(p, NULL, 10);
+              Id = strtol(p, NULL, 10);
            else if (strcasecmp(p, "ID") == 0)
-              Id = true;
+              UseChannelId = true;
            else {
               Reply(501, "Unknown option: \"%s\"", p);
               return;
@@ -1172,30 +1755,44 @@ void cSVDRP::CmdLSTT(const char *Option)
            p = strtok_r(NULL, delim, &strtok_next);
            }
      }
-  if (Number) {
-     cTimer *timer = Timers.Get(Number - 1);
-     if (timer)
-        Reply(250, "%d %s", timer->Index() + 1, *timer->ToText(Id));
-     else
-        Reply(501, "Timer \"%s\" not defined", Option);
-     }
-  else if (Timers.Count()) {
-     for (int i = 0; i < Timers.Count(); i++) {
-         cTimer *timer = Timers.Get(i);
-        if (timer)
-           Reply(i < Timers.Count() - 1 ? -250 : 250, "%d %s", timer->Index() + 1, *timer->ToText(Id));
-        else
-           Reply(501, "Timer \"%d\" not found", i + 1);
+  LOCK_TIMERS_READ;
+  if (Id) {
+     for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
+         if (!Timer->Remote()) {
+            if (Timer->Id() == Id) {
+               Reply(250, "%d %s", Timer->Id(), *Timer->ToText(UseChannelId));
+               return;
+               }
+            }
          }
+     Reply(501, "Timer \"%s\" not defined", Option);
+     return;
      }
-  else
-     Reply(550, "No timers defined");
+  else {
+     const cTimer *LastLocalTimer = Timers->Last();
+     while (LastLocalTimer) {
+           if (LastLocalTimer->Remote())
+              LastLocalTimer = Timers->Prev(LastLocalTimer);
+           else
+              break;
+           }
+     if (LastLocalTimer) {
+        for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
+            if (!Timer->Remote())
+               Reply(Timer != LastLocalTimer ? -250 : 250, "%d %s", Timer->Id(), *Timer->ToText(UseChannelId));
+            if (Timer == LastLocalTimer)
+               break;
+            }
+        return;
+        }
+     }
+  Reply(550, "No timers defined");
 }
 
-void cSVDRP::CmdMESG(const char *Option)
+void cSVDRPServer::CmdMESG(const char *Option)
 {
   if (*Option) {
-     isyslog("SVDRP message: '%s'", Option);
+     isyslog("SVDRP < %s message '%s'", *connection, Option);
      Skins.QueueMessage(mtInfo, Option);
      Reply(250, "Message queued");
      }
@@ -1203,36 +1800,34 @@ void cSVDRP::CmdMESG(const char *Option)
      Reply(501, "Missing message");
 }
 
-void cSVDRP::CmdMODC(const char *Option)
+void cSVDRPServer::CmdMODC(const char *Option)
 {
   if (*Option) {
      char *tail;
      int n = strtol(Option, &tail, 10);
      if (tail && tail != Option) {
         tail = skipspace(tail);
-        if (!Channels.BeingEdited()) {
-           cChannel *channel = Channels.GetByNumber(n);
-           if (channel) {
-              cChannel ch;
-              if (ch.Parse(tail)) {
-                 if (Channels.HasUniqueChannelID(&ch, channel)) {
-                    *channel = ch;
-                    Channels.ReNumber();
-                    Channels.SetModified(true);
-                    isyslog("modifed channel %d %s", channel->Number(), *channel->ToText());
-                    Reply(250, "%d %s", channel->Number(), *channel->ToText());
-                    }
-                 else
-                    Reply(501, "Channel settings are not unique");
+        LOCK_CHANNELS_WRITE;
+        Channels->SetExplicitModify();
+        if (cChannel *Channel = Channels->GetByNumber(n)) {
+           cChannel ch;
+           if (ch.Parse(tail)) {
+              if (Channels->HasUniqueChannelID(&ch, Channel)) {
+                 *Channel = ch;
+                 Channels->ReNumber();
+                 Channels->SetModifiedByUser();
+                 Channels->SetModified();
+                 isyslog("SVDRP < %s modifed channel %d %s", *connection, Channel->Number(), *Channel->ToText());
+                 Reply(250, "%d %s", Channel->Number(), *Channel->ToText());
                  }
               else
-                 Reply(501, "Error in channel settings");
+                 Reply(501, "Channel settings are not unique");
               }
            else
-              Reply(501, "Channel \"%d\" not defined", n);
+              Reply(501, "Error in channel settings");
            }
         else
-           Reply(550, "Channels are being edited - try again later");
+           Reply(501, "Channel \"%d\" not defined", n);
         }
      else
         Reply(501, "Error in channel number");
@@ -1241,35 +1836,32 @@ void cSVDRP::CmdMODC(const char *Option)
      Reply(501, "Missing channel settings");
 }
 
-void cSVDRP::CmdMODT(const char *Option)
+void cSVDRPServer::CmdMODT(const char *Option)
 {
   if (*Option) {
      char *tail;
-     int n = strtol(Option, &tail, 10);
+     int Id = strtol(Option, &tail, 10);
      if (tail && tail != Option) {
         tail = skipspace(tail);
-        if (!Timers.BeingEdited()) {
-           cTimer *timer = Timers.Get(n - 1);
-           if (timer) {
-              cTimer t = *timer;
-              if (strcasecmp(tail, "ON") == 0)
-                 t.SetFlags(tfActive);
-              else if (strcasecmp(tail, "OFF") == 0)
-                 t.ClrFlags(tfActive);
-              else if (!t.Parse(tail)) {
-                 Reply(501, "Error in timer settings");
-                 return;
-                 }
-              *timer = t;
-              Timers.SetModified();
-              isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
-              Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
+        LOCK_TIMERS_WRITE;
+        Timers->SetExplicitModify();
+        if (cTimer *Timer = Timers->GetById(Id)) {
+           cTimer t = *Timer;
+           if (strcasecmp(tail, "ON") == 0)
+              t.SetFlags(tfActive);
+           else if (strcasecmp(tail, "OFF") == 0)
+              t.ClrFlags(tfActive);
+           else if (!t.Parse(tail)) {
+              Reply(501, "Error in timer settings");
+              return;
               }
-           else
-              Reply(501, "Timer \"%d\" not defined", n);
+           *Timer = t;
+           Timers->SetModified();
+           isyslog("SVDRP < %s modified timer %s (%s)", *connection, *Timer->ToDescr(), Timer->HasFlags(tfActive) ? "active" : "inactive");
+           Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
            }
         else
-           Reply(550, "Timers are being edited - try again later");
+           Reply(501, "Timer \"%d\" not defined", Id);
         }
      else
         Reply(501, "Error in timer number");
@@ -1278,60 +1870,60 @@ void cSVDRP::CmdMODT(const char *Option)
      Reply(501, "Missing timer settings");
 }
 
-void cSVDRP::CmdMOVC(const char *Option)
+void cSVDRPServer::CmdMOVC(const char *Option)
 {
   if (*Option) {
-     if (!Channels.BeingEdited() && !Timers.BeingEdited()) {
-        char *tail;
-        int From = strtol(Option, &tail, 10);
+     char *tail;
+     int From = strtol(Option, &tail, 10);
+     if (tail && tail != Option) {
+        tail = skipspace(tail);
         if (tail && tail != Option) {
-           tail = skipspace(tail);
-           if (tail && tail != Option) {
-              int To = strtol(tail, NULL, 10);
-              int CurrentChannelNr = cDevice::CurrentChannel();
-              cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr);
-              cChannel *FromChannel = Channels.GetByNumber(From);
-              if (FromChannel) {
-                 cChannel *ToChannel = Channels.GetByNumber(To);
-                 if (ToChannel) {
-                    int FromNumber = FromChannel->Number();
-                    int ToNumber = ToChannel->Number();
-                    if (FromNumber != ToNumber) {
-                       Channels.Move(FromChannel, ToChannel);
-                       Channels.ReNumber();
-                       Channels.SetModified(true);
-                       if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
-                          if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
-                             Channels.SwitchTo(CurrentChannel->Number());
-                          else
-                             cDevice::SetCurrentChannel(CurrentChannel);
-                          }
-                       isyslog("channel %d moved to %d", FromNumber, ToNumber);
-                       Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
+           LOCK_TIMERS_READ; // necessary to keep timers and channels in sync!
+           LOCK_CHANNELS_WRITE;
+           Channels->SetExplicitModify();
+           int To = strtol(tail, NULL, 10);
+           int CurrentChannelNr = cDevice::CurrentChannel();
+           const cChannel *CurrentChannel = Channels->GetByNumber(CurrentChannelNr);
+           cChannel *FromChannel = Channels->GetByNumber(From);
+           if (FromChannel) {
+              cChannel *ToChannel = Channels->GetByNumber(To);
+              if (ToChannel) {
+                 int FromNumber = FromChannel->Number();
+                 int ToNumber = ToChannel->Number();
+                 if (FromNumber != ToNumber) {
+                    Channels->Move(FromChannel, ToChannel);
+                    Channels->ReNumber();
+                    Channels->SetModifiedByUser();
+                    Channels->SetModified();
+                    if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
+                       if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
+                          Channels->SwitchTo(CurrentChannel->Number());
+                       else
+                          cDevice::SetCurrentChannel(CurrentChannel);
                        }
-                    else
-                       Reply(501, "Can't move channel to same position");
+                    isyslog("SVDRP < %s channel %d moved to %d", *connection, FromNumber, ToNumber);
+                    Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
                     }
                  else
-                    Reply(501, "Channel \"%d\" not defined", To);
+                    Reply(501, "Can't move channel to same position");
                  }
               else
-                 Reply(501, "Channel \"%d\" not defined", From);
+                 Reply(501, "Channel \"%d\" not defined", To);
               }
            else
-              Reply(501, "Error in channel number");
+              Reply(501, "Channel \"%d\" not defined", From);
            }
         else
            Reply(501, "Error in channel number");
         }
      else
-        Reply(550, "Channels or timers are being edited - try again later");
+        Reply(501, "Error in channel number");
      }
   else
      Reply(501, "Missing channel number");
 }
 
-void cSVDRP::CmdMOVR(const char *Option)
+void cSVDRPServer::CmdMOVR(const char *Option)
 {
   if (*Option) {
      char *opt = strdup(Option);
@@ -1342,17 +1934,21 @@ void cSVDRP::CmdMOVR(const char *Option)
      char c = *option;
      *option = 0;
      if (isnumber(num)) {
-        cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
-        if (recording) {
-           if (int RecordingInUse = recording->IsInUse())
-              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, recording));
+        LOCK_RECORDINGS_WRITE;
+        Recordings->SetExplicitModify();
+        if (cRecording *Recording = Recordings->Get(strtol(num, NULL, 10) - 1)) {
+           if (int RecordingInUse = Recording->IsInUse())
+              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, Recording));
            else {
               if (c)
                  option = skipspace(++option);
               if (*option) {
-                 cString oldName = recording->Name();
-                 if ((recording = Recordings.GetByName(recording->FileName())) != NULL && recording->ChangeName(option))
-                    Reply(250, "Recording \"%s\" moved to \"%s\"", *oldName, recording->Name());
+                 cString oldName = Recording->Name();
+                 if ((Recording = Recordings->GetByName(Recording->FileName())) != NULL && Recording->ChangeName(option)) {
+                    Recordings->SetModified();
+                    Recordings->TouchUpdate();
+                    Reply(250, "Recording \"%s\" moved to \"%s\"", *oldName, Recording->Name());
+                    }
                  else
                     Reply(554, "Error while moving recording \"%s\" to \"%s\"!", *oldName, option);
                  }
@@ -1361,7 +1957,7 @@ void cSVDRP::CmdMOVR(const char *Option)
               }
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", num, recordings.Count() ? "" : " (use LSTR before moving)");
+           Reply(550, "Recording \"%s\" not found", num);
         }
      else
         Reply(501, "Error in recording number \"%s\"", num);
@@ -1371,18 +1967,21 @@ void cSVDRP::CmdMOVR(const char *Option)
      Reply(501, "Missing recording number");
 }
 
-void cSVDRP::CmdNEWC(const char *Option)
+void cSVDRPServer::CmdNEWC(const char *Option)
 {
   if (*Option) {
      cChannel ch;
      if (ch.Parse(Option)) {
-        if (Channels.HasUniqueChannelID(&ch)) {
+        LOCK_CHANNELS_WRITE;
+        Channels->SetExplicitModify();
+        if (Channels->HasUniqueChannelID(&ch)) {
            cChannel *channel = new cChannel;
            *channel = ch;
-           Channels.Add(channel);
-           Channels.ReNumber();
-           Channels.SetModified(true);
-           isyslog("new channel %d %s", channel->Number(), *channel->ToText());
+           Channels->Add(channel);
+           Channels->ReNumber();
+           Channels->SetModifiedByUser();
+           Channels->SetModified();
+           isyslog("SVDRP < %s new channel %d %s", *connection, channel->Number(), *channel->ToText());
            Reply(250, "%d %s", channel->Number(), *channel->ToText());
            }
         else
@@ -1395,37 +1994,38 @@ void cSVDRP::CmdNEWC(const char *Option)
      Reply(501, "Missing channel settings");
 }
 
-void cSVDRP::CmdNEWT(const char *Option)
+void cSVDRPServer::CmdNEWT(const char *Option)
 {
   if (*Option) {
-     cTimer *timer = new cTimer;
-     if (timer->Parse(Option)) {
-        Timers.Add(timer);
-        Timers.SetModified();
-        isyslog("timer %s added", *timer->ToDescr());
-        Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
+     cTimer *Timer = new cTimer;
+     if (Timer->Parse(Option)) {
+        LOCK_TIMERS_WRITE;
+        Timer->ClrFlags(tfRecording);
+        Timers->Add(Timer);
+        isyslog("SVDRP < %s added timer %s", *connection, *Timer->ToDescr());
+        Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
         return;
         }
      else
         Reply(501, "Error in timer settings");
-     delete timer;
+     delete Timer;
      }
   else
      Reply(501, "Missing timer settings");
 }
 
-void cSVDRP::CmdNEXT(const char *Option)
+void cSVDRPServer::CmdNEXT(const char *Option)
 {
-  cTimer *t = Timers.GetNextActiveTimer();
-  if (t) {
+  LOCK_TIMERS_READ;
+  if (const cTimer *t = Timers->GetNextActiveTimer()) {
      time_t Start = t->StartTime();
-     int Number = t->Index() + 1;
+     int Id = t->Id();
      if (!*Option)
-        Reply(250, "%d %s", Number, *TimeToString(Start));
+        Reply(250, "%d %s", Id, *TimeToString(Start));
      else if (strcasecmp(Option, "ABS") == 0)
-        Reply(250, "%d %ld", Number, Start);
+        Reply(250, "%d %ld", Id, Start);
      else if (strcasecmp(Option, "REL") == 0)
-        Reply(250, "%d %ld", Number, Start - time(NULL));
+        Reply(250, "%d %ld", Id, Start - time(NULL));
      else
         Reply(501, "Unknown option: \"%s\"", Option);
      }
@@ -1433,7 +2033,12 @@ void cSVDRP::CmdNEXT(const char *Option)
      Reply(550, "No active timers");
 }
 
-void cSVDRP::CmdPLAY(const char *Option)
+void cSVDRPServer::CmdPING(const char *Option)
+{
+  Reply(250, "%s is alive", Setup.SVDRPHostName);
+}
+
+void cSVDRPServer::CmdPLAY(const char *Option)
 {
   if (*Option) {
      char *opt = strdup(Option);
@@ -1444,8 +2049,8 @@ void cSVDRP::CmdPLAY(const char *Option)
      char c = *option;
      *option = 0;
      if (isnumber(num)) {
-        cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
-        if (recording) {
+        LOCK_RECORDINGS_READ;
+        if (const cRecording *Recording = Recordings->Get(strtol(num, NULL, 10) - 1)) {
            if (c)
               option = skipspace(++option);
            cReplayControl::SetRecording(NULL);
@@ -1453,20 +2058,20 @@ void cSVDRP::CmdPLAY(const char *Option)
            if (*option) {
               int pos = 0;
               if (strcasecmp(option, "BEGIN") != 0)
-                 pos = HMSFToIndex(option, recording->FramesPerSecond());
-              cResumeFile resume(recording->FileName(), recording->IsPesRecording());
+                 pos = HMSFToIndex(option, Recording->FramesPerSecond());
+              cResumeFile Resume(Recording->FileName(), Recording->IsPesRecording());
               if (pos <= 0)
-                 resume.Delete();
+                 Resume.Delete();
               else
-                 resume.Save(pos);
+                 Resume.Save(pos);
               }
-           cReplayControl::SetRecording(recording->FileName());
+           cReplayControl::SetRecording(Recording->FileName());
            cControl::Launch(new cReplayControl);
            cControl::Attach();
-           Reply(250, "Playing recording \"%s\" [%s]", num, recording->Title());
+           Reply(250, "Playing recording \"%s\" [%s]", num, Recording->Title());
            }
         else
-           Reply(550, "Recording \"%s\" not found%s", num, recordings.Count() ? "" : " (use LSTR before playing)");
+           Reply(550, "Recording \"%s\" not found", num);
         }
      else
         Reply(501, "Error in recording number \"%s\"", num);
@@ -1476,7 +2081,7 @@ void cSVDRP::CmdPLAY(const char *Option)
      Reply(501, "Missing recording number");
 }
 
-void cSVDRP::CmdPLUG(const char *Option)
+void cSVDRPServer::CmdPLUG(const char *Option)
 {
   if (*Option) {
      char *opt = strdup(Option);
@@ -1547,7 +2152,37 @@ void cSVDRP::CmdPLUG(const char *Option)
      }
 }
 
-void cSVDRP::CmdPUTE(const char *Option)
+void cSVDRPServer::CmdPOLL(const char *Option)
+{
+  if (*Option) {
+     char buf[strlen(Option) + 1];
+     char *p = strcpy(buf, Option);
+     const char *delim = " \t";
+     char *strtok_next;
+     char *RemoteName = strtok_r(p, delim, &strtok_next);
+     char *ListName = strtok_r(NULL, delim, &strtok_next);
+     if (SVDRPClientHandler) {
+        if (ListName) {
+           if (strcasecmp(ListName, "timers") == 0) {
+              if (SVDRPClientHandler->TriggerFetchingTimers(RemoteName))
+                 Reply(250, "OK");
+              else
+                 Reply(501, "No connection to \"%s\"", RemoteName);
+              }
+           else
+              Reply(501, "Unknown list name: \"%s\"", ListName);
+           }
+        else
+           Reply(501, "Missing list name");
+        }
+     else
+        Reply(501, "No SVDRP client connections");
+     }
+  else
+     Reply(501, "Missing parameters");
+}
+
+void cSVDRPServer::CmdPUTE(const char *Option)
 {
   if (*Option) {
      FILE *f = fopen(Option, "r");
@@ -1572,7 +2207,7 @@ void cSVDRP::CmdPUTE(const char *Option)
      }
 }
 
-void cSVDRP::CmdREMO(const char *Option)
+void cSVDRPServer::CmdREMO(const char *Option)
 {
   if (*Option) {
      if (!strcasecmp(Option, "ON")) {
@@ -1590,13 +2225,13 @@ void cSVDRP::CmdREMO(const char *Option)
      Reply(250, "Remote control is %s", cRemote::Enabled() ? "enabled" : "disabled");
 }
 
-void cSVDRP::CmdSCAN(const char *Option)
+void cSVDRPServer::CmdSCAN(const char *Option)
 {
   EITScanner.ForceScan();
   Reply(250, "EPG scan triggered");
 }
 
-void cSVDRP::CmdSTAT(const char *Option)
+void cSVDRPServer::CmdSTAT(const char *Option)
 {
   if (*Option) {
      if (strcasecmp(Option, "DISK") == 0) {
@@ -1611,45 +2246,41 @@ void cSVDRP::CmdSTAT(const char *Option)
      Reply(501, "No option given");
 }
 
-void cSVDRP::CmdUPDT(const char *Option)
+void cSVDRPServer::CmdUPDT(const char *Option)
 {
   if (*Option) {
-     cTimer *timer = new cTimer;
-     if (timer->Parse(Option)) {
-        if (!Timers.BeingEdited()) {
-           cTimer *t = Timers.GetTimer(timer);
-           if (t) {
-              t->Parse(Option);
-              delete timer;
-              timer = t;
-              isyslog("timer %s updated", *timer->ToDescr());
-              }
-           else {
-              Timers.Add(timer);
-              isyslog("timer %s added", *timer->ToDescr());
-              }
-           Timers.SetModified();
-           Reply(250, "%d %s", timer->Index() + 1, *timer->ToText());
-           return;
+     cTimer *Timer = new cTimer;
+     if (Timer->Parse(Option)) {
+        LOCK_TIMERS_WRITE;
+        if (cTimer *t = Timers->GetTimer(Timer)) {
+           t->Parse(Option);
+           delete Timer;
+           Timer = t;
+           isyslog("SVDRP < %s updated timer %s", *connection, *Timer->ToDescr());
            }
-        else
-           Reply(550, "Timers are being edited - try again later");
+        else {
+           Timers->Add(Timer);
+           isyslog("SVDRP < %s added timer %s", *connection, *Timer->ToDescr());
+           }
+        Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
+        return;
         }
      else
         Reply(501, "Error in timer settings");
-     delete timer;
+     delete Timer;
      }
   else
      Reply(501, "Missing timer settings");
 }
 
-void cSVDRP::CmdUPDR(const char *Option)
+void cSVDRPServer::CmdUPDR(const char *Option)
 {
-  Recordings.Update(false);
+  LOCK_RECORDINGS_WRITE;
+  Recordings->Update(false);
   Reply(250, "Re-read of recordings directory triggered");
 }
 
-void cSVDRP::CmdVOLU(const char *Option)
+void cSVDRPServer::CmdVOLU(const char *Option)
 {
   if (*Option) {
      if (isnumber(Option))
@@ -1673,7 +2304,7 @@ void cSVDRP::CmdVOLU(const char *Option)
 
 #define CMD(c) (strcasecmp(Cmd, c) == 0)
 
-void cSVDRP::Execute(char *Cmd)
+void cSVDRPServer::Execute(char *Cmd)
 {
   // handle PUTE data:
   if (PUTEhandler) {
@@ -1714,8 +2345,10 @@ void cSVDRP::Execute(char *Cmd)
   else if (CMD("NEWC"))  CmdNEWC(s);
   else if (CMD("NEWT"))  CmdNEWT(s);
   else if (CMD("NEXT"))  CmdNEXT(s);
+  else if (CMD("PING"))  CmdPING(s);
   else if (CMD("PLAY"))  CmdPLAY(s);
   else if (CMD("PLUG"))  CmdPLUG(s);
+  else if (CMD("POLL"))  CmdPOLL(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
   else if (CMD("REMO"))  CmdREMO(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
@@ -1727,21 +2360,9 @@ void cSVDRP::Execute(char *Cmd)
   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
 }
 
-bool cSVDRP::Process(void)
+bool cSVDRPServer::Process(void)
 {
-  bool NewConnection = !file.IsOpen();
-  bool SendGreeting = NewConnection;
-
-  if (file.IsOpen() || file.Open(socket.Accept())) {
-     if (SendGreeting) {
-        //TODO how can we get the *full* hostname?
-        char buffer[BUFSIZ];
-        gethostname(buffer, sizeof(buffer));
-        time_t now = time(NULL);
-        Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", buffer, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8");
-        }
-     if (NewConnection)
-        lastActivity = time(NULL);
+  if (file.IsOpen()) {
      while (file.Ready(false)) {
            unsigned char c;
            int r = safe_read(file, &c, 1);
@@ -1781,7 +2402,7 @@ bool cSVDRP::Process(void)
                        cmdLine = NewBuffer;
                        }
                     else {
-                       esyslog("ERROR: out of memory");
+                       esyslog("SVDRP < %s ERROR: out of memory", *connection);
                        Close();
                        break;
                        }
@@ -1792,23 +2413,161 @@ bool cSVDRP::Process(void)
               lastActivity = time(NULL);
               }
            else if (r <= 0) {
-              isyslog("lost connection to SVDRP client");
+              isyslog("SVDRP < %s lost connection to client", *connection);
               Close();
               }
            }
      if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
-        isyslog("timeout on SVDRP connection");
+        isyslog("SVDRP < %s timeout on connection", *connection);
         Close(true, true);
         }
-     return true;
      }
-  return false;
+  return file.IsOpen();
+}
+
+void SetSVDRPPorts(int TcpPort, int UdpPort)
+{
+  SVDRPTcpPort = TcpPort;
+  SVDRPUdpPort = UdpPort;
 }
 
-void cSVDRP::SetGrabImageDir(const char *GrabImageDir)
+void SetSVDRPGrabImageDir(const char *GrabImageDir)
 {
-  free(grabImageDir);
-  grabImageDir = GrabImageDir ? strdup(GrabImageDir) : NULL;
+  grabImageDir = GrabImageDir;
 }
 
-//TODO more than one connection???
+// --- cSVDRPServerHandler ---------------------------------------------------
+
+class cSVDRPServerHandler : public cThread {
+private:
+  cMutex mutex;
+  bool ready;
+  cSocket tcpSocket;
+  cVector<cSVDRPServer *> serverConnections;
+  void HandleServerConnection(void);
+  void ProcessConnections(void);
+protected:
+  virtual void Action(void);
+public:
+  cSVDRPServerHandler(int TcpPort);
+  virtual ~cSVDRPServerHandler();
+  void WaitUntilReady(void);
+  };
+
+static cSVDRPServerHandler *SVDRPServerHandler = NULL;
+
+cSVDRPServerHandler::cSVDRPServerHandler(int TcpPort)
+:cThread("SVDRP server handler", true)
+,tcpSocket(TcpPort, true)
+{
+  ready = false;
+}
+
+cSVDRPServerHandler::~cSVDRPServerHandler()
+{
+  Cancel(3);
+  for (int i = 0; i < serverConnections.Size(); i++)
+      delete serverConnections[i];
+}
+
+void cSVDRPServerHandler::WaitUntilReady(void)
+{
+  cTimeMs Timeout(3000);
+  while (!ready && !Timeout.TimedOut())
+        cCondWait::SleepMs(10);
+}
+
+void cSVDRPServerHandler::ProcessConnections(void)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int i = 0; i < serverConnections.Size(); i++) {
+      if (!serverConnections[i]->Process()) {
+         delete serverConnections[i];
+         serverConnections.Remove(i);
+         i--;
+         }
+      }
+}
+
+void cSVDRPServerHandler::HandleServerConnection(void)
+{
+  int NewSocket = tcpSocket.Accept();
+  if (NewSocket >= 0)
+     serverConnections.Append(new cSVDRPServer(NewSocket, tcpSocket.LastIpAddress()->Connection()));
+}
+
+void cSVDRPServerHandler::Action(void)
+{
+  if (tcpSocket.Listen()) {
+     SVDRPServerPoller.Add(tcpSocket.Socket(), false);
+     ready = true;
+     while (Running()) {
+           SVDRPServerPoller.Poll(1000);
+           cMutexLock MutexLock(&mutex);
+           HandleServerConnection();
+           ProcessConnections();
+           }
+     SVDRPServerPoller.Del(tcpSocket.Socket(), false);
+     tcpSocket.Close();
+     }
+}
+
+// --- SVDRP Handler ---------------------------------------------------------
+
+static cMutex SVDRPHandlerMutex;
+
+void StartSVDRPServerHandler(void)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  if (SVDRPTcpPort && !SVDRPServerHandler) {
+     SVDRPServerHandler = new cSVDRPServerHandler(SVDRPTcpPort);
+     SVDRPServerHandler->Start();
+     SVDRPServerHandler->WaitUntilReady();
+     }
+}
+
+void StartSVDRPClientHandler(void)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  if (SVDRPTcpPort && SVDRPUdpPort && !SVDRPClientHandler) {
+     SVDRPClientHandler = new cSVDRPClientHandler(SVDRPTcpPort, SVDRPUdpPort);
+     SVDRPClientHandler->Start();
+     }
+}
+
+void StopSVDRPServerHandler(void)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  delete SVDRPServerHandler;
+  SVDRPServerHandler = NULL;
+}
+
+void StopSVDRPClientHandler(void)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  delete SVDRPClientHandler;
+  SVDRPClientHandler = NULL;
+}
+
+void SendSVDRPDiscover(const char *Address)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  if (SVDRPClientHandler)
+     SVDRPClientHandler->SendDiscover(Address);
+}
+
+bool GetSVDRPServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlag)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  if (SVDRPClientHandler)
+     return SVDRPClientHandler->GetServerNames(ServerNames, FetchFlag);
+  return false;
+}
+
+bool ExecSVDRPCommand(const char *ServerName, const char *Command, cStringList *Response)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  if (SVDRPClientHandler)
+     return SVDRPClientHandler->Execute(ServerName, Command, Response);
+  return false;
+}
diff --git a/svdrp.h b/svdrp.h
index 8ac419afb..ba33fc27a 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,93 +4,49 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 3.2 2013/10/21 07:42:03 kls Exp $
+ * $Id: svdrp.h 4.5 2015/09/09 09:44:12 kls Exp $
  */
 
 #ifndef __SVDRP_H
 #define __SVDRP_H
 
-#include "recording.h"
 #include "tools.h"
 
-class cSocket {
-private:
-  int port;
-  int sock;
-  int queue;
-  void Close(void);
-public:
-  cSocket(int Port, int Queue = 1);
-  ~cSocket();
-  bool Open(void);
-  int Accept(void);
+enum eSvdrpFetchFlags {
+  sffNone   = 0b0000,
+  sffTimers = 0b0001,
   };
 
-class cPUTEhandler {
-private:
-  FILE *f;
-  int status;
-  const char *message;
-public:
-  cPUTEhandler(void);
-  ~cPUTEhandler();
-  bool Process(const char *s);
-  int Status(void) { return status; }
-  const char *Message(void) { return message; }
-  };
-
-class cSVDRP {
-private:
-  cSocket socket;
-  cFile file;
-  cRecordings recordings;
-  cPUTEhandler *PUTEhandler;
-  int numChars;
-  int length;
-  char *cmdLine;
-  time_t lastActivity;
-  static char *grabImageDir;
-  void Close(bool SendReply = false, bool Timeout = false);
-  bool Send(const char *s, int length = -1);
-  void Reply(int Code, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
-  void PrintHelpTopics(const char **hp);
-  void CmdCHAN(const char *Option);
-  void CmdCLRE(const char *Option);
-  void CmdDELC(const char *Option);
-  void CmdDELR(const char *Option);
-  void CmdDELT(const char *Option);
-  void CmdEDIT(const char *Option);
-  void CmdGRAB(const char *Option);
-  void CmdHELP(const char *Option);
-  void CmdHITK(const char *Option);
-  void CmdLSTC(const char *Option);
-  void CmdLSTE(const char *Option);
-  void CmdLSTR(const char *Option);
-  void CmdLSTT(const char *Option);
-  void CmdMESG(const char *Option);
-  void CmdMODC(const char *Option);
-  void CmdMODT(const char *Option);
-  void CmdMOVC(const char *Option);
-  void CmdMOVR(const char *Option);
-  void CmdNEWC(const char *Option);
-  void CmdNEWT(const char *Option);
-  void CmdNEXT(const char *Option);
-  void CmdPLAY(const char *Option);
-  void CmdPLUG(const char *Option);
-  void CmdPUTE(const char *Option);
-  void CmdREMO(const char *Option);
-  void CmdSCAN(const char *Option);
-  void CmdSTAT(const char *Option);
-  void CmdUPDT(const char *Option);
-  void CmdUPDR(const char *Option);
-  void CmdVOLU(const char *Option);
-  void Execute(char *Cmd);
-public:
-  cSVDRP(int Port);
-  ~cSVDRP();
-  bool HasConnection(void) { return file.IsOpen(); }
-  bool Process(void);
-  static void SetGrabImageDir(const char *GrabImageDir);
-  };
+void SetSVDRPPorts(int TcpPort, int UdpPort);
+void SetSVDRPGrabImageDir(const char *GrabImageDir);
+void StartSVDRPServerHandler(void);
+void StartSVDRPClientHandler(void);
+void StopSVDRPServerHandler(void);
+void StopSVDRPClientHandler(void);
+void SendSVDRPDiscover(const char *Address = NULL);
+bool GetSVDRPServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlag = sffNone);
+     ///< Gets a list of all available VDRs this VDR is connected to via SVDRP,
+     ///< and stores it in the given ServerNames list. The list is cleared
+     ///< before getting the server names.
+     ///< If FetchFlag is given, only the server names for which the local
+     ///< client has this flag set will be returned, and the client's flag
+     ///< will be cleared.
+     ///< Returns true if the resulting list is not empty.
+bool ExecSVDRPCommand(const char *ServerName, const char *Command, cStringList *Response = NULL);
+     ///< Sends the given SVDRP Command string to the remote VDR identified
+     ///< by ServerName and collects all of the response strings in Response.
+     ///< If no Response parameter is given, the response from command execution
+     ///< is ignored.
+     ///< Returns true if the data exchange was successful. Whether or
+     ///< not the actual SVDRP command was successful depends on the
+     ///< resulting strings from the remote VDR, which can be accessed
+     ///< through Response. If Response is given, it will be cleared before
+     ///< the command is actually executed.
+inline int SVDRPCode(const char *s) { return s ? atoi(s) : 0; }
+     ///< Returns the value of the three digit reply code of the given
+     ///< SVDRP response string.
+inline const char *SVDRPValue(const char *s) { return s && s[0] && s[1] && s[2] && s[3] ? s + 4 : NULL; }
+     ///< Returns the actual value of the given SVDRP response string, skipping
+     ///< the three digit reply code and possible continuation line indicator.
 
 #endif //__SVDRP_H
diff --git a/themes.c b/themes.c
index ccc21640e..76a0ff819 100644
--- a/themes.c
+++ b/themes.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.c 3.0 2012/02/17 13:57:32 kls Exp $
+ * $Id: themes.c 4.0 2012/02/17 13:57:32 kls Exp $
  */
 
 #include "themes.h"
diff --git a/themes.h b/themes.h
index 1bb9cf138..44bb0a342 100644
--- a/themes.h
+++ b/themes.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: themes.h 3.0 2012/10/07 11:11:43 kls Exp $
+ * $Id: themes.h 4.0 2012/10/07 11:11:43 kls Exp $
  */
 
 #ifndef __THEMES_H
diff --git a/thread.c b/thread.c
index e5e19c9bc..993d16ddd 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 3.2 2013/12/29 15:26:33 kls Exp $
+ * $Id: thread.c 4.1 2015/08/29 14:43:03 kls Exp $
  */
 
 #include "thread.h"
@@ -21,6 +21,16 @@
 #include <unistd.h>
 #include "tools.h"
 
+#define ABORT { dsyslog("ABORT!"); abort(); } // use debugger to trace back the problem
+
+//#define DEBUG_LOCKING // uncomment this line to activate debug output for locking
+
+#ifdef DEBUG_LOCKING
+#define dbglocking(a...) fprintf(stderr, a)
+#else
+#define dbglocking(a...)
+#endif
+
 static bool GetAbsTime(struct timespec *Abstime, int MillisecondsFromNow)
 {
   struct timeval now;
@@ -403,6 +413,132 @@ bool cThreadLock::Lock(cThread *Thread)
   return false;
 }
 
+// --- cStateLock ------------------------------------------------------------
+
+cStateLock::cStateLock(const char *Name)
+:rwLock(true)
+{
+  name = Name;
+  threadId = 0;
+  state = 0;
+  explicitModify = false;
+}
+
+bool cStateLock::Lock(cStateKey &StateKey, bool Write, int TimeoutMs)
+{
+  dbglocking("%5d %-10s %10p   lock state = %d/%d write = %d timeout = %d\n", cThread::ThreadId(), name, &StateKey, state, StateKey.state, Write, TimeoutMs);
+  StateKey.timedOut = false;
+  if (StateKey.stateLock) {
+     esyslog("ERROR: StateKey already in use in call to cStateLock::Lock() (tid=%d, lock=%s)", StateKey.stateLock->threadId, name);
+     ABORT;
+     return false;
+     }
+  if (rwLock.Lock(Write, TimeoutMs)) {
+     StateKey.stateLock = this;
+     if (Write) {
+        dbglocking("%5d %-10s %10p   locked write\n", cThread::ThreadId(), name, &StateKey);
+        threadId = cThread::ThreadId();
+        StateKey.write = true;
+        return true;
+        }
+     else if (state != StateKey.state) {
+        dbglocking("%5d %-10s %10p   locked read\n", cThread::ThreadId(), name, &StateKey);
+        return true;
+        }
+     else {
+        dbglocking("%5d %-10s %10p   state unchanged\n", cThread::ThreadId(), name, &StateKey);
+        StateKey.stateLock = NULL;
+        rwLock.Unlock();
+        }
+     }
+  else if (TimeoutMs) {
+     dbglocking("%5d %-10s %10p   timeout\n", cThread::ThreadId(), name, &StateKey);
+     StateKey.timedOut = true;
+     }
+  return false;
+}
+
+void cStateLock::Unlock(cStateKey &StateKey, bool IncState)
+{
+  dbglocking("%5d %-10s %10p unlock state = %d/%d inc = %d\n", cThread::ThreadId(), name, &StateKey, state, StateKey.state, IncState);
+  if (StateKey.stateLock != this) {
+     esyslog("ERROR: cStateLock::Unlock() called with an unused key (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  if (StateKey.write && threadId != cThread::ThreadId()) {
+     esyslog("ERROR: cStateLock::Unlock() called without holding a lock (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  if (StateKey.write && IncState && !explicitModify)
+     state++;
+  StateKey.state = state;
+  StateKey.write = false;
+  threadId = 0;
+  explicitModify = false;
+  rwLock.Unlock();
+}
+
+void cStateLock::IncState(void)
+{
+  if (threadId != cThread::ThreadId()) {
+     esyslog("ERROR: cStateLock::IncState() called without holding a lock (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     }
+  else
+     state++;
+}
+
+// --- cStateKey -------------------------------------------------------------
+
+cStateKey::cStateKey(bool IgnoreFirst)
+{
+  stateLock = NULL;
+  write = false;
+  state = 0;
+  if (!IgnoreFirst)
+     Reset();
+}
+
+cStateKey::~cStateKey()
+{
+  if (stateLock) {
+     esyslog("ERROR: cStateKey::~cStateKey() called without releasing the lock first (tid=%d, lock=%s, key=%p)", stateLock->threadId, stateLock->name, this);
+     ABORT;
+     }
+}
+
+void cStateKey::Reset(void)
+{
+  state = -1; // lock and key are initialized differently, to make the first check return true
+}
+
+void cStateKey::Remove(bool IncState)
+{
+  if (stateLock) {
+     stateLock->Unlock(*this, IncState);
+     stateLock = NULL;
+     }
+  else {
+     esyslog("ERROR: cStateKey::Remove() called without holding a lock (key=%p)", this);
+     ABORT;
+     }
+}
+
+bool cStateKey::StateChanged(void)
+{
+  if (!stateLock) {
+     esyslog("ERROR: cStateKey::StateChanged() called without holding a lock (tid=%d, key=%p)", cThread::ThreadId(), this);
+     ABORT;
+     }
+  else if (write)
+     return state != stateLock->state;
+  else
+     return true;
+  return false;
+}
+
 // --- cIoThrottle -----------------------------------------------------------
 
 cMutex cIoThrottle::mutex;
diff --git a/thread.h b/thread.h
index d2d8ee2ae..b5a07c793 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 3.2 2015/01/14 11:39:55 kls Exp $
+ * $Id: thread.h 4.1 2015/08/17 13:06:24 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -164,6 +164,94 @@ class cThreadLock {
 
 #define LOCK_THREAD cThreadLock ThreadLock(this)
 
+class cStateKey;
+
+class cStateLock {
+  friend class cStateKey;
+private:
+  const char *name;
+  tThreadId threadId;
+  cRwLock rwLock;
+  int state;
+  bool explicitModify;
+  void Unlock(cStateKey &StateKey, bool IncState = true);
+       ///< Releases a lock that has been obtained by a previous call to Lock()
+       ///< with the given StateKey. If this was a write-lock, and IncState is true,
+       ///< the state of the lock will be incremented. In any case, the (new) state
+       ///< of the lock will be copied to the StateKey's state.
+public:
+  cStateLock(const char *Name = NULL);
+  bool Lock(cStateKey &StateKey, bool Write = false, int TimeoutMs = 0);
+       ///< Tries to get a lock and returns true if successful.
+       ///< If TimoutMs is not 0, it waits for the given number of milliseconds
+       ///< and returns false if no lock has been obtained within that time.
+       ///< Otherwise it waits indefinitely for the lock. The given StateKey
+       ///< will store which lock it has been used with, and will use that
+       ///< information when its Remove() function is called.
+       ///< There are two possible locks, one only for read access, and one
+       ///< for reading and writing:
+       ///<
+       ///< If Write is false (i.e. a read-lock is requested), the lock's state
+       ///< is compared to the given StateKey's state, and true is returned if
+       ///< they differ.
+       ///< If true is returned, the read-lock is still in place and the
+       ///< protected data structures can be safely accessed (in read-only mode!).
+       ///< Once the necessary operations have been performed, the lock must
+       ///< be released by a call to the StateKey's Remove() function.
+       ///< If false is returned, the state has not changed since the last check,
+       ///< and the read-lock has been released. In that case the protected
+       ///< data structures have not changed since the last call, so no action
+       ///< is required. Note that if TimeoutMs is used with read-locks, Lock()
+       ///< might return false even if the states of lock and key differ, just
+       ///< because it was unable to obtain the lock within the given time.
+       ///< You can call cStateKey::TimedOut() to detect this.
+       ///<
+       ///< If Write is true (i.e. a write-lock is requested), the states of the
+       ///< lock and the given StateKey don't matter, it will always try to obtain
+       ///< a write lock.
+  void SetExplicitModify(void) { explicitModify = true; }
+       ///< If you have obtained a write lock on this lock, and you don't want its
+       ///< state to be automatically incremented when the lock is released, a call to
+       ///< this function will disable this, and you can explicitly call IncState()
+       ///< to increment the state.
+  void IncState(void);
+       ///< Increments the state of this lock.
+  };
+
+class cStateKey {
+  friend class cStateLock;
+private:
+  cStateLock *stateLock;
+  bool write;
+  int state;
+  bool timedOut;
+public:
+  cStateKey(bool IgnoreFirst = false);
+       ///< Sets up a new state key. If IgnoreFirst is true, the first use
+       ///< of this key with a lock will not return true if the lock's state
+       ///< hasn't explicitly changed.
+  ~cStateKey();
+  void Reset(void);
+       ///< Resets the state of this key, so that the next call to a lock's
+       ///< Lock() function with this key will return true, even if the
+       ///< lock's state hasn't changed.
+  void Remove(bool IncState = true);
+       ///< Removes this key from the lock it was previously used with.
+       ///< If this key was used to obtain a write lock, the state of the lock will
+       ///< be incremented and copied to this key. You can set IncState to false
+       ///< to prevent this.
+  bool StateChanged(void);
+       ///< Returns true if this key is used for obtaining a write lock, and the
+       ///< lock's state differs from that of the key. When used with a read lock,
+       ///< it always returns true, because otherwise the lock wouldn't have been
+       ///< obtained in the first place.
+  bool InLock(void) { return stateLock; }
+       ///< Returns true if this key is currently in a lock.
+  bool TimedOut(void) const { return timedOut; }
+       ///< Returns true if the last lock attempt this key was used with failed due
+       ///< to a timeout.
+  };
+
 class cIoThrottle {
 private:
   static cMutex mutex;
diff --git a/timers.c b/timers.c
index 3eb80689b..771f66b20 100644
--- a/timers.c
+++ b/timers.c
@@ -4,18 +4,18 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 3.1 2013/12/28 11:33:08 kls Exp $
+ * $Id: timers.c 4.5 2015/09/13 13:10:24 kls Exp $
  */
 
 #include "timers.h"
 #include <ctype.h>
-#include "channels.h"
 #include "device.h"
 #include "i18n.h"
 #include "libsi/si.h"
 #include "recording.h"
 #include "remote.h"
 #include "status.h"
+#include "svdrp.h"
 
 // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
 // format characters in order to allow any number of blanks after a numeric
@@ -23,19 +23,22 @@
 
 // --- cTimer ----------------------------------------------------------------
 
-cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
+cTimer::cTimer(bool Instant, bool Pause, const cChannel *Channel)
 {
+  id = 0;
   startTime = stopTime = 0;
-  lastSetEvent = 0;
+  scheduleState = -1;
   deferred = 0;
-  recording = pending = inVpsMargin = false;
+  pending = inVpsMargin = false;
   flags = tfNone;
   *file = 0;
   aux = NULL;
+  remote = NULL;
   event = NULL;
   if (Instant)
      SetFlags(tfActive | tfInstant);
-  channel = Channel ? Channel : Channels.GetByNumber(cDevice::CurrentChannel());
+  LOCK_CHANNELS_READ;
+  channel = Channel ? Channel : Channels->GetByNumber(cDevice::CurrentChannel());
   time_t t = time(NULL);
   struct tm tm_r;
   struct tm *now = localtime_r(&t, &tm_r);
@@ -44,27 +47,25 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
   start = now->tm_hour * 100 + now->tm_min;
   stop = 0;
   if (!Setup.InstantRecordTime && channel && (Instant || Pause)) {
-     cSchedulesLock SchedulesLock;
-     if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
-        if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
-           if (const cEvent *Event = Schedule->GetPresentEvent()) {
-              time_t tstart = Event->StartTime();
-              time_t tstop = Event->EndTime();
-              if (Event->Vps() && Setup.UseVps) {
-                 SetFlags(tfVps);
-                 tstart = Event->Vps();
-                 }
-              else {
-                 tstop  += Setup.MarginStop * 60;
-                 tstart -= Setup.MarginStart * 60;
-                 }
-              day = SetTime(tstart, 0);
-              struct tm *time = localtime_r(&tstart, &tm_r);
-              start = time->tm_hour * 100 + time->tm_min;
-              time = localtime_r(&tstop, &tm_r);
-              stop = time->tm_hour * 100 + time->tm_min;
-              SetEvent(Event);
+     LOCK_SCHEDULES_READ;
+     if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
+        if (const cEvent *Event = Schedule->GetPresentEvent()) {
+           time_t tstart = Event->StartTime();
+           time_t tstop = Event->EndTime();
+           if (Event->Vps() && Setup.UseVps) {
+              SetFlags(tfVps);
+              tstart = Event->Vps();
               }
+           else {
+              tstop  += Setup.MarginStop * 60;
+              tstart -= Setup.MarginStart * 60;
+              }
+           day = SetTime(tstart, 0);
+           struct tm *time = localtime_r(&tstart, &tm_r);
+           start = time->tm_hour * 100 + time->tm_min;
+           time = localtime_r(&tstop, &tm_r);
+           stop = time->tm_hour * 100 + time->tm_min;
+           SetEvent(Event);
            }
         }
      }
@@ -82,17 +83,20 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
 
 cTimer::cTimer(const cEvent *Event)
 {
+  id = 0;
   startTime = stopTime = 0;
-  lastSetEvent = 0;
+  scheduleState = -1;
   deferred = 0;
-  recording = pending = inVpsMargin = false;
+  pending = inVpsMargin = false;
   flags = tfActive;
   *file = 0;
   aux = NULL;
+  remote = NULL;
   event = NULL;
   if (Event->Vps() && Setup.UseVps)
      SetFlags(tfVps);
-  channel = Channels.GetByChannelID(Event->ChannelID(), true);
+  LOCK_CHANNELS_READ;
+  channel = Channels->GetByChannelID(Event->ChannelID(), true);
   time_t tstart = (flags & tfVps) ? Event->Vps() : Event->StartTime();
   time_t tstop = tstart + Event->Duration();
   if (!(HasFlags(tfVps))) {
@@ -120,6 +124,7 @@ cTimer::cTimer(const cTimer &Timer)
 {
   channel = NULL;
   aux = NULL;
+  remote = NULL;
   event = NULL;
   flags = tfNone;
   *this = Timer;
@@ -127,21 +132,23 @@ cTimer::cTimer(const cTimer &Timer)
 
 cTimer::~cTimer()
 {
+  if (event)
+     event->DecNumTimers();
   free(aux);
+  free(remote);
 }
 
 cTimer& cTimer::operator= (const cTimer &Timer)
 {
   if (&Timer != this) {
-     uint OldFlags = flags & tfRecording;
+     id           = Timer.id;
      startTime    = Timer.startTime;
      stopTime     = Timer.stopTime;
-     lastSetEvent = 0;
-     deferred = 0;
-     recording    = Timer.recording;
+     scheduleState = -1;
+     deferred     = 0;
      pending      = Timer.pending;
      inVpsMargin  = Timer.inVpsMargin;
-     flags        = Timer.flags | OldFlags;
+     flags        = Timer.flags;
      channel      = Timer.channel;
      day          = Timer.day;
      weekdays     = Timer.weekdays;
@@ -152,7 +159,13 @@ cTimer& cTimer::operator= (const cTimer &Timer)
      strncpy(file, Timer.file, sizeof(file));
      free(aux);
      aux = Timer.aux ? strdup(Timer.aux) : NULL;
-     event = NULL;
+     free(remote);
+     remote = Timer.remote ? strdup(Timer.remote) : NULL;
+     if (event)
+        event->DecNumTimers();
+     event = Timer.event;
+     if (event)
+        event->IncNumTimers();
      }
   return *this;
 }
@@ -171,14 +184,14 @@ int cTimer::Compare(const cListObject &ListObject) const
 cString cTimer::ToText(bool UseChannelID) const
 {
   strreplace(file, ':', '|');
-  cString buffer = cString::sprintf("%u:%s:%s:%04d:%04d:%d:%d:%s:%s\n", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays, true), start, stop, priority, lifetime, file, aux ? aux : "");
+  cString buffer = cString::sprintf("%u:%s:%s:%04d:%04d:%d:%d:%s:%s", flags, UseChannelID ? *Channel()->GetChannelID().ToString() : *itoa(Channel()->Number()), *PrintDay(day, weekdays, true), start, stop, priority, lifetime, file, aux ? aux : "");
   strreplace(file, '|', ':');
   return buffer;
 }
 
 cString cTimer::ToDescr(void) const
 {
-  return cString::sprintf("%d (%d %04d-%04d %s'%s')", Index() + 1, Channel()->Number(), start, stop, HasFlags(tfVps) ? "VPS " : "", file);
+  return cString::sprintf("%d%s%s (%d %04d-%04d %s'%s')", Id(), remote ? "@" : "", remote ? remote : "", Channel()->Number(), start, stop, HasFlags(tfVps) ? "VPS " : "", file);
 }
 
 int cTimer::TimeToInt(int t)
@@ -313,7 +326,6 @@ bool cTimer::Parse(const char *s)
      }
   bool result = false;
   if (8 <= sscanf(s, "%u :%m[^:]:%m[^:]:%d :%d :%d :%d :%m[^:\n]:%m[^\n]", &flags, &channelbuffer, &daybuffer, &start, &stop, &priority, &lifetime, &filebuffer, &aux)) {
-     ClrFlags(tfRecording);
      if (aux && !*skipspace(aux)) {
         free(aux);
         aux = NULL;
@@ -322,10 +334,11 @@ bool cTimer::Parse(const char *s)
      result = ParseDay(daybuffer, day, weekdays);
      Utf8Strn0Cpy(file, filebuffer, sizeof(file));
      strreplace(file, '|', ':');
+     LOCK_CHANNELS_READ;
      if (isnumber(channelbuffer))
-        channel = Channels.GetByNumber(atoi(channelbuffer));
+        channel = Channels->GetByNumber(atoi(channelbuffer));
      else
-        channel = Channels.GetByChannelID(tChannelID::FromString(channelbuffer), true, true);
+        channel = Channels->GetByChannelID(tChannelID::FromString(channelbuffer), true, true);
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;
@@ -340,7 +353,9 @@ bool cTimer::Parse(const char *s)
 
 bool cTimer::Save(FILE *f)
 {
-  return fprintf(f, "%s", *ToText(true)) > 0;
+  if (!Remote())
+     return fprintf(f, "%s\n", *ToText(true)) > 0;
+  return true;
 }
 
 bool cTimer::IsSingleEvent(void) const
@@ -441,10 +456,8 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
            startTime = event->StartTime();
            stopTime = event->EndTime();
            if (!Margin) { // this is an actual check
-              if (event->Schedule()->PresentSeenWithin(EITPRESENTFOLLOWINGRATE)) { // VPS control can only work with up-to-date events...
-                 if (event->StartTime() > 0) // checks for "phased out" events
-                    return event->IsRunning(true);
-                 }
+              if (event->Schedule()->PresentSeenWithin(EITPRESENTFOLLOWINGRATE)) // VPS control can only work with up-to-date events...
+                 return event->IsRunning(true);
               return startTime <= t && t < stopTime; // ...otherwise we fall back to normal timer handling
               }
            }
@@ -511,27 +524,18 @@ time_t cTimer::StopTime(void) const
 #define EPGLIMITBEFORE   (1 * 3600) // Time in seconds before a timer's start time and
 #define EPGLIMITAFTER    (1 * 3600) // after its stop time within which EPG events will be taken into consideration.
 
-void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
+void cTimer::SetId(int Id)
+{
+  id = Id;
+}
+
+bool cTimer::SetEventFromSchedule(const cSchedules *Schedules)
 {
-  cSchedulesLock SchedulesLock;
-  if (!Schedules) {
-     lastSetEvent = 0; // forces setting the event, even if the schedule hasn't been modified
-     if (!(Schedules = cSchedules::Schedules(SchedulesLock)))
-        return;
-     }
   const cSchedule *Schedule = Schedules->GetSchedule(Channel());
   if (Schedule && Schedule->Events()->First()) {
-     time_t now = time(NULL);
-     if (!lastSetEvent || Schedule->Modified() >= lastSetEvent) {
-        lastSetEvent = now;
+     if (Schedule->Modified(scheduleState)) {
         const cEvent *Event = NULL;
         if (HasFlags(tfVps) && Schedule->Events()->First()->Vps()) {
-           if (event && event->StartTime() > 0) { // checks for "phased out" events
-              if (Recording())
-                 return; // let the recording end first
-              if (now <= event->EndTime() || Matches(0, true))
-                 return; // stay with the old event until the timer has completely expired
-              }
            // VPS timers only match if their start time exactly matches the event's VPS time:
            for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
                if (e->StartTime() && e->RunningStatus() != SI::RunningStatusNotRunning) { // skip outdated events
@@ -566,30 +570,39 @@ void cTimer::SetEventFromSchedule(const cSchedules *Schedules)
                   }
                }
            }
-        SetEvent(Event);
+        return SetEvent(Event);
         }
      }
+  return false;
 }
 
-void cTimer::SetEvent(const cEvent *Event)
+bool cTimer::SetEvent(const cEvent *Event)
 {
-  if (event != Event) { //XXX TODO check event data, too???
-     if (Event)
+  if (event != Event) {
+     if (event)
+        event->DecNumTimers();
+     if (Event) {
         isyslog("timer %s set to event %s", *ToDescr(), *Event->ToDescr());
-     else
+        Event->IncNumTimers();
+        Event->Schedule()->Modified(scheduleState); // to get the current state
+        }
+     else {
         isyslog("timer %s set to no event", *ToDescr());
+        scheduleState = -1;
+        }
      event = Event;
+     return true;
      }
+  return false;
 }
 
 void cTimer::SetRecording(bool Recording)
 {
-  recording = Recording;
-  if (recording)
+  if (Recording)
      SetFlags(tfRecording);
   else
      ClrFlags(tfRecording);
-  isyslog("timer %s %s", *ToDescr(), recording ? "start" : "stop");
+  isyslog("timer %s %s", *ToDescr(), Recording ? "start" : "stop");
 }
 
 void cTimer::SetPending(bool Pending)
@@ -637,7 +650,13 @@ void cTimer::SetLifetime(int Lifetime)
 void cTimer::SetAux(const char *Aux)
 {
   free(aux);
-  aux = strdup(Aux);
+  aux = Aux ? strdup(Aux) : NULL;
+}
+
+void cTimer::SetRemote(const char *Remote)
+{
+  free(remote);
+  remote = Remote ? strdup(Remote) : NULL;
 }
 
 void cTimer::SetDeferred(int Seconds)
@@ -691,20 +710,49 @@ void cTimer::OnOff(void)
 
 // --- cTimers ---------------------------------------------------------------
 
-cTimers Timers;
+cTimers cTimers::timers;
+int cTimers::lastTimerId = 0;
 
 cTimers::cTimers(void)
+:cConfig<cTimer>("Timers")
 {
-  state = 0;
-  beingEdited = 0;;
-  lastSetEvents = 0;
   lastDeleteExpired = 0;
 }
 
+bool cTimers::Load(const char *FileName)
+{
+  LOCK_TIMERS_WRITE;
+  Timers->SetExplicitModify();
+  if (timers.cConfig<cTimer>::Load(FileName)) {
+     for (cTimer *ti = timers.First(); ti; ti = timers.Next(ti)) {
+         ti->SetId(NewTimerId());
+         ti->ClrFlags(tfRecording);
+         Timers->SetModified();
+         }
+     return true;
+     }
+  return false;
+}
+
+int cTimers::NewTimerId(void)
+{
+  return ++lastTimerId; // no need for locking, the caller must have a lock on the global Timers list
+}
+
+const cTimer *cTimers::GetById(int Id) const
+{
+  for (const cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (!ti->Remote() && ti->Id() == Id)
+         return ti;
+      }
+  return NULL;
+}
+
 cTimer *cTimers::GetTimer(cTimer *Timer)
 {
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if (ti->Channel() == Timer->Channel() &&
+      if (!ti->Remote() &&
+          ti->Channel() == Timer->Channel() &&
           (ti->WeekDays() && ti->WeekDays() == Timer->WeekDays() || !ti->WeekDays() && ti->Day() == Timer->Day()) &&
           ti->Start() == Timer->Start() &&
           ti->Stop() == Timer->Stop())
@@ -713,12 +761,12 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
   return NULL;
 }
 
-cTimer *cTimers::GetMatch(time_t t)
+const cTimer *cTimers::GetMatch(time_t t) const
 {
   static int LastPending = -1;
-  cTimer *t0 = NULL;
-  for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if (!ti->Recording() && ti->Matches(t)) {
+  const cTimer *t0 = NULL;
+  for (const cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (!ti->Remote() && !ti->Recording() && ti->Matches(t)) {
          if (ti->Pending()) {
             if (ti->Index() > LastPending) {
                LastPending = ti->Index();
@@ -736,11 +784,11 @@ cTimer *cTimers::GetMatch(time_t t)
   return t0;
 }
 
-cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match)
+const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const
 {
-  cTimer *t = NULL;
+  const cTimer *t = NULL;
   eTimerMatch m = tmNone;
-  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+  for (const cTimer *ti = First(); ti; ti = Next(ti)) {
       eTimerMatch tm = ti->Matches(Event);
       if (tm > m) {
          t = ti;
@@ -754,25 +802,33 @@ cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match)
   return t;
 }
 
-cTimer *cTimers::GetNextActiveTimer(void)
+const cTimer *cTimers::GetNextActiveTimer(void) const
 {
-  cTimer *t0 = NULL;
-  for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      ti->Matches();
-      if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
-         t0 = ti;
+  const cTimer *t0 = NULL;
+  for (const cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (!ti->Remote()) {
+         ti->Matches();
+         if ((ti->HasFlags(tfActive)) && (!t0 || ti->StopTime() > time(NULL) && ti->Compare(*t0) < 0))
+            t0 = ti;
+         }
       }
   return t0;
 }
 
-void cTimers::SetModified(void)
+const cTimers *cTimers::GetTimersRead(cStateKey &StateKey, int TimeoutMs)
+{
+  return timers.Lock(StateKey, false, TimeoutMs) ? &timers : NULL;
+}
+
+cTimers *cTimers::GetTimersWrite(cStateKey &StateKey, int TimeoutMs)
 {
-  cStatus::MsgTimerChange(NULL, tcMod);
-  state++;
+  return timers.Lock(StateKey, true, TimeoutMs) ? &timers : NULL;
 }
 
 void cTimers::Add(cTimer *Timer, cTimer *After)
 {
+  if (!Timer->Remote())
+     Timer->SetId(NewTimerId());
   cConfig<cTimer>::Add(Timer, After);
   cStatus::MsgTimerChange(Timer, tcAdd);
 }
@@ -789,46 +845,114 @@ void cTimers::Del(cTimer *Timer, bool DeleteObject)
   cConfig<cTimer>::Del(Timer, DeleteObject);
 }
 
-bool cTimers::Modified(int &State)
+const cTimer *cTimers::UsesChannel(const cChannel *Channel) const
 {
-  bool Result = state != State;
-  State = state;
-  return Result;
+  for (const cTimer *Timer = First(); Timer; Timer = Next(Timer)) {
+      if (Timer->Channel() == Channel)
+         return Timer;
+      }
+  return NULL;
 }
 
-void cTimers::SetEvents(void)
+bool cTimers::SetEvents(const cSchedules *Schedules)
 {
-  if (time(NULL) - lastSetEvents < 5)
-     return;
-  cSchedulesLock SchedulesLock(false, 100);
-  const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-  if (Schedules) {
-     if (!lastSetEvents || Schedules->Modified() >= lastSetEvents) {
-        for (cTimer *ti = First(); ti; ti = Next(ti)) {
-            if (cRemote::HasKeys())
-               return; // react immediately on user input
-            ti->SetEventFromSchedule(Schedules);
-            }
-        }
-     }
-  lastSetEvents = time(NULL);
+  bool TimersModified = false;
+  for (cTimer *ti = First(); ti; ti = Next(ti))
+      TimersModified |= ti->SetEventFromSchedule(Schedules);
+  return TimersModified;
 }
 
-void cTimers::DeleteExpired(void)
+bool cTimers::DeleteExpired(void)
 {
   if (time(NULL) - lastDeleteExpired < 30)
-     return;
+     return false;
+  bool TimersModified = false;
   cTimer *ti = First();
   while (ti) {
         cTimer *next = Next(ti);
-        if (ti->Expired()) {
+        if (!ti->Remote() && ti->Expired()) {
            isyslog("deleting timer %s", *ti->ToDescr());
            Del(ti);
-           SetModified();
+           TimersModified = true;
            }
         ti = next;
         }
   lastDeleteExpired = time(NULL);
+  return TimersModified;
+}
+
+bool cTimers::GetRemoteTimers(const char *ServerName)
+{
+  bool Result = false;
+  if (ServerName) {
+     Result = DelRemoteTimers(ServerName);
+     cStringList Response;
+     if (ExecSVDRPCommand(ServerName, "LSTT ID", &Response)) {
+        for (int i = 0; i < Response.Size(); i++) {
+            const char *s = Response[i];
+            int Code = SVDRPCode(s);
+            if (Code == 250) {
+               if (const char *v = SVDRPValue(s)) {
+                  int Id = atoi(v);
+                  while (*v && *v != ' ')
+                        v++; // skip id
+                  cTimer *Timer = new cTimer;
+                  if (Timer->Parse(v)) {
+                     Timer->SetRemote(ServerName);
+                     Timer->SetId(Id);
+                     Add(Timer);
+                     Result = true;
+                     }
+                  else {
+                     esyslog("ERROR: %s: error in timer settings: %s", ServerName, v);
+                     delete Timer;
+                     }
+                  }
+               }
+            else if (Code != 550)
+               esyslog("ERROR: %s: %s", ServerName, s);
+            }
+        return Result;
+        }
+     }
+  else {
+     cStringList ServerNames;
+     if (GetSVDRPServerNames(&ServerNames, sffTimers)) {
+        for (int i = 0; i < ServerNames.Size(); i++)
+            Result |= GetRemoteTimers(ServerNames[i]);
+        }
+     }
+  return Result;
+}
+
+bool cTimers::DelRemoteTimers(const char *ServerName)
+{
+  bool Deleted = false;
+  cTimer *Timer = First();
+  while (Timer) {
+        cTimer *t = Next(Timer);
+        if (Timer->Remote() && (!ServerName || strcmp(Timer->Remote(), ServerName) == 0)) {
+           Del(Timer);
+           Deleted = true;
+           }
+        Timer = t;
+        }
+  return Deleted;
+}
+
+void cTimers::TriggerRemoteTimerPoll(const char *ServerName)
+{
+  if (ServerName) {
+     if (!ExecSVDRPCommand(ServerName, cString::sprintf("POLL %s TIMERS", Setup.SVDRPHostName)))
+        esyslog("ERROR: can't send 'POLL %s TIMERS' to '%s'", Setup.SVDRPHostName, ServerName);
+     }
+  else {
+     cStringList ServerNames;
+     if (GetSVDRPServerNames(&ServerNames)) {
+        for (int i = 0; i < ServerNames.Size(); i++)
+            TriggerRemoteTimerPoll(ServerNames[i]);
+        }
+     }
 }
 
 // --- cSortedTimers ---------------------------------------------------------
@@ -838,10 +962,10 @@ static int CompareTimers(const void *a, const void *b)
   return (*(const cTimer **)a)->Compare(**(const cTimer **)b);
 }
 
-cSortedTimers::cSortedTimers(void)
-:cVector<const cTimer *>(Timers.Count())
+cSortedTimers::cSortedTimers(const cTimers *Timers)
+:cVector<const cTimer *>(Timers->Count())
 {
-  for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
+  for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer))
       Append(Timer);
   Sort(CompareTimers);
 }
diff --git a/timers.h b/timers.h
index 4ce1cff1a..4222c1043 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 3.0 2013/03/11 10:35:53 kls Exp $
+ * $Id: timers.h 4.3 2015/09/09 10:40:24 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -27,12 +27,13 @@ enum eTimerMatch { tmNone, tmPartial, tmFull };
 class cTimer : public cListObject {
   friend class cMenuEditTimer;
 private:
+  int id;
   mutable time_t startTime, stopTime;
-  time_t lastSetEvent;
+  int scheduleState;
   mutable time_t deferred; ///< Matches(time_t, ...) will return false if the current time is before this value
-  bool recording, pending, inVpsMargin;
+  bool pending, inVpsMargin;
   uint flags;
-  cChannel *channel;
+  const cChannel *channel;
   mutable time_t day; ///< midnight of the day this timer shall hit, or of the first day it shall hit in case of a repeating timer
   int weekdays;       ///< bitmask, lowest bits: SSFTWTM  (the 'M' is the LSB)
   int start;
@@ -41,15 +42,17 @@ class cTimer : public cListObject {
   int lifetime;
   mutable char file[NAME_MAX * 2 + 1]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long
   char *aux;
+  char *remote;
   const cEvent *event;
 public:
-  cTimer(bool Instant = false, bool Pause = false, cChannel *Channel = NULL);
+  cTimer(bool Instant = false, bool Pause = false, const cChannel *Channel = NULL);
   cTimer(const cEvent *Event);
   cTimer(const cTimer &Timer);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
   virtual int Compare(const cListObject &ListObject) const;
-  bool Recording(void) const { return recording; }
+  int Id(void) const { return id; }
+  bool Recording(void) const { return HasFlags(tfRecording); }
   bool Pending(void) const { return pending; }
   bool InVpsMargin(void) const { return inVpsMargin; }
   uint Flags(void) const { return flags; }
@@ -63,6 +66,8 @@ class cTimer : public cListObject {
   const char *File(void) const { return file; }
   time_t FirstDay(void) const { return weekdays ? day : 0; }
   const char *Aux(void) const { return aux; }
+  const char *Remote(void) const { return remote; }
+  bool Local(void) const { return !remote; } // convenience
   time_t Deferred(void) const { return deferred; }
   cString ToText(bool UseChannelID = false) const;
   cString ToDescr(void) const;
@@ -81,8 +86,9 @@ class cTimer : public cListObject {
   bool Expired(void) const;
   time_t StartTime(void) const;
   time_t StopTime(void) const;
-  void SetEventFromSchedule(const cSchedules *Schedules = NULL);
-  void SetEvent(const cEvent *Event);
+  void SetId(int Id);
+  bool SetEventFromSchedule(const cSchedules *Schedules);
+  bool SetEvent(const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
   void SetInVpsMargin(bool InVpsMargin);
@@ -93,6 +99,7 @@ class cTimer : public cListObject {
   void SetPriority(int Priority);
   void SetLifetime(int Lifetime);
   void SetAux(const char *Aux);
+  void SetRemote(const char *Remote);
   void SetDeferred(int Seconds);
   void SetFlags(uint Flags);
   void ClrFlags(uint Flags);
@@ -108,36 +115,104 @@ class cTimer : public cListObject {
 
 class cTimers : public cConfig<cTimer> {
 private:
-  int state;
-  int beingEdited;
-  time_t lastSetEvents;
+  static cTimers timers;
+  static int lastTimerId;
   time_t lastDeleteExpired;
 public:
   cTimers(void);
+  static const cTimers *GetTimersRead(cStateKey &StateKey, int TimeoutMs = 0);
+      ///< Gets the list of timers for read access. If TimeoutMs is given,
+      ///< it will wait that long to get a write lock before giving up.
+      ///< Otherwise it will wait indefinitely. If no read lock can be
+      ///< obtained within the given timeout, NULL will be returned.
+      ///< The list is locked and a pointer to it is returned if the state
+      ///< of the list is different than the state of the given StateKey.
+      ///< If both states are equal, the list of timers has not been modified
+      ///< since the last call with the same StateKey, and NULL will be
+      ///< returned (and the list is not locked). After the returned list of
+      ///< timers is no longer needed, the StateKey's Remove() function must
+      ///< be called to release the list. The time between calling
+      ///< cTimers::GetTimersRead() and StateKey.Remove() should be as short
+      ///< as possible. After calling StateKey.Remove() the list returned from
+      ///< this call must not be accessed any more. If you need to access the
+      ///< timers again later, a new call to GetTimersRead() must be made.
+      ///< A typical code sequence would look like this:
+      ///< cStateKey StateKey;
+      ///< if (const cTimers *Timers = cTimers::GetTimersRead(StateKey)) {
+      ///<    // access the timers
+      ///<    StateKey.Remove();
+      ///<    }
+  static cTimers *GetTimersWrite(cStateKey &StateKey, int TimeoutMs = 0);
+      ///< Gets the list of timers for write access. If TimeoutMs is given,
+      ///< it will wait that long to get a write lock before giving up.
+      ///< Otherwise it will wait indefinitely. If no write lock can be
+      ///< obtained within the given timeout, NULL will be returned.
+      ///< If a write lock can be obtained, the list of timers will be
+      ///< returned, regardless of the state values of the timers or the
+      ///< given StateKey. After the returned list of timers is no longer
+      ///< needed, the StateKey's Remove() function must be called to release
+      ///< the list. The time between calling cTimers::GetTimersWrite() and
+      ///< StateKey.Remove() should be as short as possible. After calling
+      ///< StateKey.Remove() the list returned from this call must not be
+      ///< accessed any more. If you need to access the timers again later,
+      ///< a new call to GetTimersWrite() must be made. The call
+      ///< to StateKey.Remove() will increment the state of the list of
+      ///< timers and will copy the new state value to the StateKey. You can
+      ///< suppress this by using 'false' as the parameter to the call, in
+      ///< which case the state values are left untouched.
+      ///< A typical code sequence would look like this:
+      ///< cStateKey StateKey;
+      ///< if (cTimers *Timers = cTimers::GetTimersWrite(StateKey)) {
+      ///<    // access the timers
+      ///<    StateKey.Remove();
+      ///<    }
+  static bool Load(const char *FileName);
+  static int NewTimerId(void);
+  const cTimer *GetById(int Id) const;
+  cTimer *GetById(int Id) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetById(Id)); };
   cTimer *GetTimer(cTimer *Timer);
-  cTimer *GetMatch(time_t t);
-  cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL);
-  cTimer *GetNextActiveTimer(void);
-  int BeingEdited(void) { return beingEdited; }
-  void IncBeingEdited(void) { beingEdited++; }
-  void DecBeingEdited(void) { if (!--beingEdited) lastSetEvents = 0; }
-  void SetModified(void);
-  bool Modified(int &State);
-      ///< Returns true if any of the timers have been modified, which
-      ///< is detected by State being different than the internal state.
-      ///< Upon return the internal state will be stored in State.
-  void SetEvents(void);
-  void DeleteExpired(void);
+  const cTimer *GetMatch(time_t t) const;
+  cTimer *GetMatch(time_t t) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(t)); };
+  const cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) const;
+  cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(Event, Match)); }
+  const cTimer *GetNextActiveTimer(void) const;
+  const cTimer *UsesChannel(const cChannel *Channel) const;
+  bool SetEvents(const cSchedules *Schedules);
+  bool DeleteExpired(void);
   void Add(cTimer *Timer, cTimer *After = NULL);
   void Ins(cTimer *Timer, cTimer *Before = NULL);
   void Del(cTimer *Timer, bool DeleteObject = true);
+  bool GetRemoteTimers(const char *ServerName = NULL);
+      ///< Gets the timers from the given remote machine and adds them to this
+      ///< list. If no ServerName is given, all timers from all known remote
+      ///< machines will be fetched. This function calls DelRemoteTimers() with
+      ///< the given ServerName first.
+      ///< Returns true if any remote timers have been added or deleted
+  bool DelRemoteTimers(const char *ServerName = NULL);
+      ///< Deletes all timers of the given remote machine from this list (leaves
+      ///< them untouched on the remote machine). If no ServerName is given, the
+      ///< timers of all remote machines will be deleted from the list.
+      ///< Returns true if any remote timers have been deleted.
+  void TriggerRemoteTimerPoll(const char *ServerName = NULL);
+      ///< Sends an SVDRP POLL command to the given remote machine.
+      ///< If no ServerName is given, the POLL command will be sent to all
+      ///< known remote machines.
   };
 
-extern cTimers Timers;
+// Provide lock controlled access to the list:
+
+DEF_LIST_LOCK(Timers);
+
+// These macros provide a convenient way of locking the global timers list
+// and making sure the lock is released as soon as the current scope is left
+// (note that these macros wait forever to obtain the lock!):
+
+#define LOCK_TIMERS_READ  USE_LIST_LOCK_READ(Timers)
+#define LOCK_TIMERS_WRITE USE_LIST_LOCK_WRITE(Timers)
 
 class cSortedTimers : public cVector<const cTimer *> {
 public:
-  cSortedTimers(void);
+  cSortedTimers(const cTimers *Timers);
   };
 
 #endif //__TIMERS_H
diff --git a/tools.c b/tools.c
index a83965ae8..adfff1c32 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 3.4 2015/02/07 15:09:17 kls Exp $
+ * $Id: tools.c 4.4 2015/09/10 13:17:55 kls Exp $
  */
 
 #include "tools.h"
@@ -274,6 +274,28 @@ cString strescape(const char *s, const char *chars)
   return cString(s, t != NULL);
 }
 
+cString strgetval(const char *s, const char *name, char d)
+{
+  if (s && name) {
+     int l = strlen(name);
+     const char *t = s;
+     while (const char *p = strstr(t, name)) {
+           t = skipspace(p + l);
+           if (p == s || *(p - 1) <= ' ') {
+              if (*t == d) {
+                 t = skipspace(t + 1);
+                 const char *v = t;
+                 while (*t > ' ')
+                       t++;
+                 return cString(v, t);
+                 break;
+                 }
+              }
+           }
+     }
+  return NULL;
+}
+
 bool startswith(const char *s, const char *p)
 {
   while (*p) {
@@ -1061,6 +1083,17 @@ cString &cString::operator=(const char *String)
   return *this;
 }
 
+cString &cString::Append(const char *String)
+{
+  int l1 = strlen(s);
+  int l2 = strlen(String);
+  char *p = (char *)realloc(s, l1 + l2 + 1);
+  if (p != s)
+     strcpy(p, s);
+  strcpy(p + l1, String);
+  return *this;
+}
+
 cString &cString::Truncate(int Index)
 {
   int l = strlen(s);
@@ -1289,6 +1322,20 @@ uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality)
   return jcd.mem;
 }
 
+// --- GetHostName -----------------------------------------------------------
+
+const char *GetHostName(void)
+{
+  static char buffer[HOST_NAME_MAX] = "";
+  if (!*buffer) {
+     if (gethostname(buffer, sizeof(buffer)) < 0) {
+        LOG_ERROR;
+        strcpy(buffer, "vdr");
+        }
+     }
+  return buffer;
+}
+
 // --- cBase64Encoder --------------------------------------------------------
 
 const char *cBase64Encoder::b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -1440,6 +1487,19 @@ bool cPoller::Add(int FileHandle, bool Out)
   return false;
 }
 
+void cPoller::Del(int FileHandle, bool Out)
+{
+  if (FileHandle >= 0) {
+     for (int i = 0; i < numFileHandles; i++) {
+         if (pfd[i].fd == FileHandle && pfd[i].events == (Out ? POLLOUT : POLLIN)) {
+            if (i < numFileHandles - 1)
+               memmove(&pfd[i], &pfd[i + 1], (numFileHandles - i - 1) * sizeof(pollfd));
+            numFileHandles--;
+            }
+         }
+     }
+}
+
 bool cPoller::Poll(int TimeoutMs)
 {
   if (numFileHandles) {
@@ -1998,12 +2058,58 @@ int cListObject::Index(void) const
   return i;
 }
 
+// --- cListGarbageCollector -------------------------------------------------
+
+#define LIST_GARBAGE_COLLECTOR_TIMEOUT 5 // seconds
+
+cListGarbageCollector ListGarbageCollector;
+
+cListGarbageCollector::cListGarbageCollector(void)
+{
+  objects = NULL;
+  lastPut = 0;
+}
+
+cListGarbageCollector::~cListGarbageCollector()
+{
+  if (objects)
+     esyslog("ERROR: ListGarbageCollector destroyed without prior Purge()!");
+}
+
+void cListGarbageCollector::Put(cListObject *Object)
+{
+  mutex.Lock();
+  Object->next = objects;
+  objects = Object;
+  lastPut = time(NULL);
+  mutex.Unlock();
+}
+
+void cListGarbageCollector::Purge(bool Force)
+{
+  mutex.Lock();
+  if (objects && (time(NULL) - lastPut > LIST_GARBAGE_COLLECTOR_TIMEOUT || Force)) {
+     // We make sure that any object stays in the garbage collector for at least
+     // LIST_GARBAGE_COLLECTOR_TIMEOUT seconds, to give objects that have pointers
+     // to them a chance to drop these references before the object is finally
+     // deleted.
+     while (cListObject *Object = objects) {
+           objects = Object->next;
+           delete Object;
+           }
+     }
+  mutex.Unlock();
+}
+
 // --- cListBase -------------------------------------------------------------
 
-cListBase::cListBase(void)
+cListBase::cListBase(const char *NeedsLocking)
+:stateLock(NeedsLocking)
 {
   objects = lastObject = NULL;
   count = 0;
+  needsLocking = NeedsLocking;
+  useGarbageCollector = needsLocking;
 }
 
 cListBase::~cListBase()
@@ -2011,6 +2117,15 @@ cListBase::~cListBase()
   Clear();
 }
 
+bool cListBase::Lock(cStateKey &StateKey, bool Write, int TimeoutMs) const
+{
+  if (needsLocking)
+     return stateLock.Lock(StateKey, Write, TimeoutMs);
+  else
+     esyslog("ERROR: cListBase::Lock() called for a list that doesn't require locking");
+  return false;
+}
+
 void cListBase::Add(cListObject *Object, cListObject *After)
 {
   if (After && After != lastObject) {
@@ -2050,8 +2165,12 @@ void cListBase::Del(cListObject *Object, bool DeleteObject)
   if (Object == lastObject)
      lastObject = Object->Prev();
   Object->Unlink();
-  if (DeleteObject)
-     delete Object;
+  if (DeleteObject) {
+     if (useGarbageCollector)
+        ListGarbageCollector.Put(Object);
+     else
+        delete Object;
+     }
   count--;
 }
 
@@ -2095,11 +2214,30 @@ void cListBase::Clear(void)
   count = 0;
 }
 
-cListObject *cListBase::Get(int Index) const
+bool cListBase::Contains(const cListObject *Object) const
+{
+  for (const cListObject *o = objects; o; o = o->Next()) {
+      if (o == Object)
+         return true;
+      }
+  return false;
+}
+
+void cListBase::SetExplicitModify(void)
+{
+  stateLock.SetExplicitModify();
+}
+
+void cListBase::SetModified(void)
+{
+  stateLock.IncState();
+}
+
+const cListObject *cListBase::Get(int Index) const
 {
   if (Index < 0)
      return NULL;
-  cListObject *object = objects;
+  const cListObject *object = objects;
   while (object && Index-- > 0)
         object = object->Next();
   return object;
@@ -2115,7 +2253,9 @@ static int CompareListObjects(const void *a, const void *b)
 void cListBase::Sort(void)
 {
   int n = Count();
-  cListObject *a[n];
+  cListObject **a = MALLOC(cListObject *, n);
+  if (a == NULL)
+     return;
   cListObject *object = objects;
   int i = 0;
   while (object && i < n) {
@@ -2129,6 +2269,7 @@ void cListBase::Sort(void)
       count--;
       Add(a[i]);
       }
+  free(a);
 }
 
 // --- cHashBase -------------------------------------------------------------
diff --git a/tools.h b/tools.h
index f068174d0..1563db921 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 3.7 2015/02/07 15:12:26 kls Exp $
+ * $Id: tools.h 4.3 2015/09/06 10:45:54 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -26,6 +26,7 @@
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include "thread.h"
 
 typedef unsigned char uchar;
 
@@ -178,6 +179,7 @@ class cString {
   const char * operator*() const { return s; } // for use in (const void *) context (printf() etc.)
   cString &operator=(const cString &String);
   cString &operator=(const char *String);
+  cString &Append(const char *String);
   cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string).
   cString &CompactChars(char c); ///< Compact any sequence of characters 'c' to a single character, and strip all of them from the beginning and end of this string.
   static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
@@ -209,6 +211,14 @@ char *stripspace(char *s);
 char *compactspace(char *s);
 char *compactchars(char *s, char c); ///< removes all occurrences of 'c' from the beginning an end of 's' and replaces sequences of multiple 'c's with a single 'c'.
 cString strescape(const char *s, const char *chars);
+cString strgetval(const char *s, const char *name, char d = '=');
+    ///< Returns the value part of a 'name=value' pair in s.
+    ///< name must either be at the beginning of s, or has to be preceded by white space.
+    ///< There may be any number of white space around the '=' sign. The value is
+    ///< everyting up to (and excluding) the next white space, or the end of s.
+    ///< If an other delimiter shall be used (like, e.g., ':'), it can be given
+    ///< as the third parameter.
+    ///< If name occurs more than once in s, only the first occurrence is taken.
 bool startswith(const char *s, const char *p);
 bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
@@ -283,6 +293,8 @@ uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality = 100
     ///< resulting image, where 100 is "best". The caller takes ownership of
     ///< the result and has to delete it once it is no longer needed.
     ///< The result may be NULL in case of an error.
+const char *GetHostName(void);
+    ///< Gets the host name of this machine.
 
 class cBase64Encoder {
 private:
@@ -356,12 +368,13 @@ class cReadLine {
 
 class cPoller {
 private:
-  enum { MaxPollFiles = 16 };
+  enum { MaxPollFiles = 64 };
   pollfd pfd[MaxPollFiles];
   int numFileHandles;
 public:
   cPoller(int FileHandle = -1, bool Out = false);
   bool Add(int FileHandle, bool Out);
+  void Del(int FileHandle, bool Out);
   bool Poll(int TimeoutMs = 0);
   };
 
@@ -452,6 +465,7 @@ class cLockFile {
   };
 
 class cListObject {
+  friend class cListGarbageCollector;
 private:
   cListObject *prev, *next;
 public:
@@ -468,33 +482,152 @@ class cListObject {
   cListObject *Next(void) const { return next; }
   };
 
+class cListGarbageCollector {
+private:
+  cMutex mutex;
+  cListObject *objects;
+  time_t lastPut;
+public:
+  cListGarbageCollector(void);
+  ~cListGarbageCollector();
+  void Put(cListObject *Object);
+  void Purge(bool Force = false);
+  };
+
+extern cListGarbageCollector ListGarbageCollector;
+
 class cListBase {
 protected:
   cListObject *objects, *lastObject;
-  cListBase(void);
   int count;
+  mutable cStateLock stateLock;
+  const char *needsLocking;
+  bool useGarbageCollector;
+  cListBase(const char *NeedsLocking = NULL);
 public:
   virtual ~cListBase();
+  bool Lock(cStateKey &StateKey, bool Write = false, int TimeoutMs = 0) const;
+       ///< Tries to get a lock on this list and returns true if successful.
+       ///< By default a read lock is requested. Set Write to true to obtain
+       ///< a write lock. If TimeoutMs is not zero, it waits for the given
+       ///< number of milliseconds before giving up.
+       ///< If you need to lock more than one list at the same time, make sure
+       ///< you set TimeoutMs to a suitable value in all of the calls to
+       ///< Lock(), and be prepared to handle situations where you do not get all
+       ///< of the requested locks. In such cases you should release all the locks
+       ///< you have obtained so far and try again. StateKey.TimedOut() tells you
+       ///< whether the lock attempt failed due to a timeout or because the state
+       ///< of the lock hasn't changed since the previous locking attempt.
+       ///< To implicitly avoid deadlocks when locking more than one of the global
+       ///< lists of VDR at the same time, make sure you always lock Timers, Channels,
+       ///< Recordings and Schedules in this sequence.
+       ///< You may keep pointers to objects in this list, even after releasing
+       ///< the lock. However, you may only access such objects if you are
+       ///< holding a proper lock again. If an object has been deleted from the list
+       ///< while you did not hold a lock (for instance by an other thread), the
+       ///< object will still be there, but no longer within this list (it is then
+       ///< stored in the ListGarbageCollector). That way even if you access the object
+       ///< after it has been deleted, you won't cause a segfault. You can call the
+       ///< Contains() function to check whether an object you are holding a pointer
+       ///< to is still in the list. Note that the garbage collector is purged when
+       ///< the usual housekeeping is done.
+  void SetUseGarbageCollector(void) { useGarbageCollector = true; }
+  void SetExplicitModify(void);
+       ///< If you have obtained a write lock on this list, and you don't want it to
+       ///< be automatically marked as modified when the lock is released, a call to
+       ///< this function will disable this, and you can explicitly call SetModified()
+       ///< to have the list marked as modified.
+  void SetModified(void);
+       ///< Unconditionally marks this list as modified.
   void Add(cListObject *Object, cListObject *After = NULL);
   void Ins(cListObject *Object, cListObject *Before = NULL);
   void Del(cListObject *Object, bool DeleteObject = true);
   virtual void Move(int From, int To);
   void Move(cListObject *From, cListObject *To);
   virtual void Clear(void);
-  cListObject *Get(int Index) const;
+  bool Contains(const cListObject *Object) const;
+       ///< If a pointer to an object contained in this list has been obtained while
+       ///< holding a lock, and that lock has been released, but the pointer is kept for
+       ///< later use (after obtaining a new lock), Contains() can be called with that
+       ///< pointer to make sure the object it points to is still part of this list
+       ///< (it may have been deleted or otherwise removed from the list after the lock
+       ///< during which the pointer was initially retrieved has been released).
+  const cListObject *Get(int Index) const;
+  cListObject *Get(int Index) { return const_cast<cListObject *>(static_cast<const cListBase *>(this)->Get(Index)); }
   int Count(void) const { return count; }
   void Sort(void);
   };
 
 template<class T> class cList : public cListBase {
 public:
-  T *Get(int Index) const { return (T *)cListBase::Get(Index); }
-  T *First(void) const { return (T *)objects; }
-  T *Last(void) const { return (T *)lastObject; }
-  T *Prev(const T *object) const { return (T *)object->cListObject::Prev(); } // need to call cListObject's members to
-  T *Next(const T *object) const { return (T *)object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
+  cList(const char *NeedsLocking = NULL): cListBase(NeedsLocking) {}
+      ///< Sets up a new cList of the given type T. If NeedsLocking is given, the list
+      ///< and any of its elements may only be accessed if the caller holds a lock
+      ///< obtained by a call to Lock() (see cListBase::Lock() for details).
+      ///< NeedsLocking is used as both a boolean flag to enable locking, and as
+      ///< a name to identify this list in debug output. It must be a static string
+      ///< and should be no longer than 10 characters. The string will not be copied!
+  const T *Get(int Index) const { return (T *)cListBase::Get(Index); }
+      ///< Returns the list element at the given Index, or NULL if no such element
+      ///< exists.
+  const T *First(void) const { return (T *)objects; }
+      ///< Returns the first element in this list, or NULL if the list is empty.
+  const T *Last(void) const { return (T *)lastObject; }
+      ///< Returns the last element in this list, or NULL if the list is empty.
+  const T *Prev(const T *Object) const { return (T *)Object->cListObject::Prev(); } // need to call cListObject's members to
+      ///< Returns the element immediately before Object in this list, or NULL
+      ///< if Object is the first element in the list. Object must not be NULL!
+  const T *Next(const T *Object) const { return (T *)Object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
+      ///< Returns the element immediately following Object in this list, or NULL
+      ///< if Object is the last element in the list. Object must not be NULL!
+  T *Get(int Index) { return const_cast<T *>(static_cast<const cList<T> *>(this)->Get(Index)); }
+      ///< Non-const version of Get().
+  T *First(void) { return const_cast<T *>(static_cast<const cList<T> *>(this)->First()); }
+      ///< Non-const version of First().
+  T *Last(void) { return const_cast<T *>(static_cast<const cList<T> *>(this)->Last()); }
+      ///< Non-const version of Last().
+  T *Prev(const T *Object) { return const_cast<T *>(static_cast<const cList<T> *>(this)->Prev(Object)); }
+      ///< Non-const version of Prev().
+  T *Next(const T *Object) { return const_cast<T *>(static_cast<const cList<T> *>(this)->Next(Object)); }
+      ///< Non-const version of Next().
   };
 
+// The DEF_LIST_LOCK macro defines a convenience class that can be used to obtain
+// a lock on a cList and make sure the lock is released when the current scope
+// is left:
+
+#define DEF_LIST_LOCK2(Class, Name) \
+class c##Name##Lock { \
+private: \
+  cStateKey stateKey; \
+  const c##Class *list; \
+public: \
+  c##Name##Lock(bool Write = false) \
+  { \
+    if (Write) \
+       list = c##Class::Get##Name##Write(stateKey); \
+    else \
+       list = c##Class::Get##Name##Read(stateKey); \
+  } \
+  ~c##Name##Lock() { stateKey.Remove(); } \
+  const c##Class *Name(void) const { return list; } \
+  c##Class *Name(void) { return const_cast<c##Class *>(list); } \
+  }
+#define DEF_LIST_LOCK(Class) DEF_LIST_LOCK2(Class, Class)
+
+// The USE_LIST_LOCK macro sets up a local variable of a class defined by
+// a suitable DEF_LIST_LOCK, and also a pointer to the provided list:
+
+#define USE_LIST_LOCK_READ2(Class, Name) \
+c##Name##Lock Name##Lock(false); \
+const c##Class *Name __attribute__((unused)) = Name##Lock.Name();
+#define USE_LIST_LOCK_READ(Class) USE_LIST_LOCK_READ2(Class, Class)
+
+#define USE_LIST_LOCK_WRITE2(Class, Name) \
+c##Name##Lock Name##Lock(true); \
+c##Class *Name __attribute__((unused)) = Name##Lock.Name();
+#define USE_LIST_LOCK_WRITE(Class) USE_LIST_LOCK_WRITE2(Class, Class)
+
 template<class T> class cVector {
   ///< cVector may only be used for *simple* types, like int or pointers - not for class objects that allocate additional memory!
 private:
diff --git a/transfer.c b/transfer.c
index eb07e829a..d0e7ed462 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 3.1 2013/08/22 12:33:02 kls Exp $
+ * $Id: transfer.c 4.1 2015/09/05 11:43:58 kls Exp $
  */
 
 #include "transfer.h"
@@ -38,7 +38,7 @@ void cTransfer::Activate(bool On)
 #define MAXRETRIES    20 // max. number of retries for a single TS packet
 #define RETRYWAIT      5 // time (in ms) between two retries
 
-void cTransfer::Receive(uchar *Data, int Length)
+void cTransfer::Receive(const uchar *Data, int Length)
 {
   if (cPlayer::IsAttached()) {
      // Transfer Mode means "live tv", so there's no point in doing any additional
diff --git a/transfer.h b/transfer.h
index ce74898f4..21d9dd862 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 3.0 2013/03/01 09:49:46 kls Exp $
+ * $Id: transfer.h 4.1 2015/09/05 11:43:08 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -19,7 +19,7 @@ class cTransfer : public cReceiver, public cPlayer {
   cPatPmtGenerator patPmtGenerator;
 protected:
   virtual void Activate(bool On);
-  virtual void Receive(uchar *Data, int Length);
+  virtual void Receive(const uchar *Data, int Length);
 public:
   cTransfer(const cChannel *Channel);
   virtual ~cTransfer();
diff --git a/vdr.1 b/vdr.1
index 845cfa335..0ce3eed8b 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 3.6 2015/02/17 13:43:24 kls Exp $
+.\" $Id: vdr.1 4.2 2015/04/19 12:39:13 kls Exp $
 .\"
 .TH vdr 1 "19 Feb 2015" "2.2" "Video Disk Recorder"
 .SH NAME
@@ -64,6 +64,8 @@ Run in daemon mode (implies \-\-no\-kbd).
 .BI \-D\  num ,\ \-\-device= num
 Use only the given DVB device (\fInum\fR = 0, 1, 2...).
 There may be several \fB\-D\fR options (by default all DVB devices will be used).
+If \fB\-D\-\fR is given, no DVB devices will be used at all, independent of any
+other \-D options.
 .TP
 .BI \-\-dirnames= path [, name [, enc ]]
 Set the maximum directory path length to \fIpath\fR (default is the maximum value
@@ -204,7 +206,7 @@ Run as user \fIuser\fR in case vdr was started as user 'root'.
 Starting vdr as 'root' is necessary if the system time shall
 be set from the transponder data, but for security reasons
 vdr can switch to a lesser privileged user id during normal
-operation.
+operation. \fIuser\fR can be a user name or a numerical id.
 .TP
 .BI \-\-updindex= rec
 Update the index file for the given recording.
diff --git a/vdr.5 b/vdr.5
index fa233d726..2a7b9072f 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 3.4 2015/02/17 13:43:53 kls Exp $
+.\" $Id: vdr.5 4.0 2015/02/17 13:43:53 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
 .SH NAME
diff --git a/vdr.c b/vdr.c
index 71a72f2e9..6b0bf2b02 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 3.16 2015/02/10 14:13:12 kls Exp $
+ * $Id: vdr.c 4.7 2015/09/11 08:02:50 kls Exp $
  */
 
 #include <getopt.h>
@@ -65,6 +65,7 @@
 #include "sourceparams.h"
 #include "sources.h"
 #include "status.h"
+#include "svdrp.h"
 #include "themes.h"
 #include "timers.h"
 #include "tools.h"
@@ -92,12 +93,12 @@
 
 static int LastSignal = 0;
 
-static bool SetUser(const char *UserName, bool UserDump)
+static bool SetUser(const char *User, bool UserDump)
 {
-  if (UserName) {
-     struct passwd *user = getpwnam(UserName);
+  if (User) {
+     struct passwd *user = isnumber(User) ? getpwuid(atoi(User)) : getpwnam(User);
      if (!user) {
-        fprintf(stderr, "vdr: unknown user: '%s'\n", UserName);
+        fprintf(stderr, "vdr: unknown user: '%s'\n", User);
         return false;
         }
      if (setgid(user->pw_gid) < 0) {
@@ -301,7 +302,11 @@ int main(int argc, char *argv[])
                     break;
           case 'd': DaemonMode = true;
                     break;
-          case 'D': if (isnumber(optarg)) {
+          case 'D': if (*optarg == '-') {
+                       cDvbDevice::useDvbDevices = false;
+                       break;
+                       }
+                    if (isnumber(optarg)) {
                        int n = atoi(optarg);
                        if (0 <= n && n < MAXDEVICES) {
                           cDevice::SetUseDevice(n);
@@ -371,7 +376,7 @@ int main(int argc, char *argv[])
                     break;
           case 'g' | 0x100:
                     return GenerateIndex(optarg) ? 0 : 2;
-          case 'g': cSVDRP::SetGrabImageDir(*optarg != '-' ? optarg : NULL);
+          case 'g': SetSVDRPGrabImageDir(*optarg != '-' ? optarg : NULL);
                     break;
           case 'h': DisplayHelp = true;
                     break;
@@ -505,7 +510,7 @@ int main(int argc, char *argv[])
 
   if (VdrUser && geteuid() == 0) {
      StartedAsRoot = true;
-     if (strcmp(VdrUser, "root")) {
+     if (strcmp(VdrUser, "root") && strcmp(VdrUser, "0")) {
         if (!SetKeepCaps(true))
            return 2;
         if (!SetUser(VdrUser, UserDump))
@@ -536,7 +541,9 @@ int main(int argc, char *argv[])
                "  -d,       --daemon       run in daemon mode\n"
                "  -D NUM,   --device=NUM   use only the given DVB device (NUM = 0, 1, 2...)\n"
                "                           there may be several -D options (default: all DVB\n"
-               "                           devices will be used)\n"
+               "                           devices will be used); if -D- is given, no DVB\n"
+               "                           devices will be used at all, independent of any\n"
+               "                           other -D options\n"
                "            --dirnames=PATH[,NAME[,ENC]]\n"
                "                           set the maximum directory path length to PATH\n"
                "                           (default: %d); if NAME is also given, it defines\n"
@@ -586,7 +593,7 @@ int main(int argc, char *argv[])
                "                           (default: %s)\n"
                "  -t TTY,   --terminal=TTY controlling tty\n"
                "  -u USER,  --user=USER    run as user USER; only applicable if started as\n"
-               "                           root\n"
+               "                           root; USER can be a user name or a numerical id\n"
                "            --updindex=REC update index for recording REC and exit\n"
                "            --userdump     allow coredumps if -u is given (debugging)\n"
                "  -v DIR,   --video=DIR    use DIR as video directory (default: %s)\n"
@@ -741,8 +748,8 @@ int main(int argc, char *argv[])
   Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true);
   Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC);
   Scrs.Load(AddDirectory(ConfigDirectory, "scr.conf"), true);
-  Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true);
-  Timers.Load(AddDirectory(ConfigDirectory, "timers.conf"));
+  cChannels::Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true);
+  cTimers::Load(AddDirectory(ConfigDirectory, "timers.conf"));
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
   RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"));
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
@@ -758,8 +765,7 @@ int main(int argc, char *argv[])
 
   // Recordings:
 
-  Recordings.Update();
-  DeletedRecordings.Update();
+  cRecordings::Update();
 
   // EPG data:
 
@@ -825,7 +831,7 @@ int main(int argc, char *argv[])
 
   // User interface:
 
-  Interface = new cInterface(SVDRPport);
+  Interface = new cInterface;
 
   // Default skins:
 
@@ -872,16 +878,20 @@ int main(int argc, char *argv[])
   if (!CamSlots.WaitForAllCamSlotsReady(DEVICEREADYTIMEOUT))
      dsyslog("not all CAM slots ready after %d seconds", DEVICEREADYTIMEOUT);
   if (*Setup.InitialChannel) {
+     LOCK_CHANNELS_READ;
      if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
-        if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
+        if (const cChannel *Channel = Channels->GetByNumber(atoi(Setup.InitialChannel)))
            Setup.InitialChannel = Channel->GetChannelID().ToString();
         }
-     if (cChannel *Channel = Channels.GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
+     if (const cChannel *Channel = Channels->GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
         Setup.CurrentChannel = Channel->Number();
      }
   if (Setup.InitialVolume >= 0)
      Setup.CurrentVolume = Setup.InitialVolume;
-  Channels.SwitchTo(Setup.CurrentChannel);
+  {
+    LOCK_CHANNELS_READ;
+    Channels->SwitchTo(Setup.CurrentChannel);
+  }
   if (MuteAudio)
      cDevice::PrimaryDevice()->ToggleMute();
   else
@@ -907,6 +917,13 @@ int main(int argc, char *argv[])
   sd_notify(0, "READY=1\nSTATUS=Ready");
 #endif
 
+  // SVDRP:
+
+  SetSVDRPPorts(SVDRPport, DEFAULTSVDRPPORT);
+  StartSVDRPServerHandler();
+  if (Setup.SVDRPPeering)
+     StartSVDRPClientHandler();
+
   // Main program loop:
 
 #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
@@ -925,13 +942,14 @@ int main(int argc, char *argv[])
            static time_t lastTime = 0;
            if (!cDevice::PrimaryDevice()->HasProgramme()) {
               if (!CamMenuActive() && Now - lastTime > MINCHANNELWAIT) { // !CamMenuActive() to avoid interfering with the CAM if a CAM menu is open
-                 cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
+                 LOCK_CHANNELS_READ;
+                 const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel());
                  if (Channel && (Channel->Vpid() || Channel->Apid(0) || Channel->Dpid(0))) {
-                    if (cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(Channel->Number())) // try to switch to the original channel...
+                    if (cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels->SwitchTo(Channel->Number())) // try to switch to the original channel...
                        ;
                     else if (LastTimerChannel > 0) {
-                       Channel = Channels.GetByNumber(LastTimerChannel);
-                       if (Channel && cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer
+                       Channel = Channels->GetByNumber(LastTimerChannel);
+                       if (Channel && cDevice::GetDeviceForTransponder(Channel, LIVEPRIORITY) && Channels->SwitchTo(LastTimerChannel)) // ...or the one used by the last timer
                           ;
                        }
                     }
@@ -959,40 +977,59 @@ int main(int argc, char *argv[])
               }
            }
         // Handle channel and timer modifications:
-        if (!Channels.BeingEdited() && !Timers.BeingEdited()) {
-           int modified = Channels.Modified();
-           static time_t ChannelSaveTimeout = 0;
-           static int TimerState = 0;
-           // Channels and timers need to be stored in a consistent manner,
-           // therefore if one of them is changed, we save both.
-           if (modified == CHANNELSMOD_USER || Timers.Modified(TimerState))
-              ChannelSaveTimeout = 1; // triggers an immediate save
-           else if (modified && !ChannelSaveTimeout)
-              ChannelSaveTimeout = Now + CHANNELSAVEDELTA;
-           bool timeout = ChannelSaveTimeout == 1 || ChannelSaveTimeout && Now > ChannelSaveTimeout && !cRecordControls::Active();
-           if ((modified || timeout) && Channels.Lock(false, 100)) {
-              if (timeout) {
-                 Channels.Save();
-                 Timers.Save();
-                 ChannelSaveTimeout = 0;
+        {
+          // Channels and timers need to be stored in a consistent manner,
+          // therefore if one of them is changed, we save both.
+          static time_t ChannelSaveTimeout = 0;
+          static cStateKey TimersStateKey(true);
+          static cStateKey ChannelsStateKey(true);
+          static int ChannelsModifiedByUser = 0;
+          const cTimers *Timers = cTimers::GetTimersRead(TimersStateKey);
+          const cChannels *Channels = cChannels::GetChannelsRead(ChannelsStateKey);
+          if (ChannelSaveTimeout != 1) {
+             if (Channels) {
+                if (Channels->ModifiedByUser(ChannelsModifiedByUser))
+                   ChannelSaveTimeout = 1; // triggers an immediate save
+                else if (!ChannelSaveTimeout)
+                   ChannelSaveTimeout = Now + CHANNELSAVEDELTA;
+                }
+             if (Timers)
+                ChannelSaveTimeout = 1; // triggers an immediate save
+             }
+          if (ChannelSaveTimeout && Now > ChannelSaveTimeout && !cRecordControls::Active())
+             ChannelSaveTimeout = 1; // triggers an immediate save
+          if (Timers && Channels) {
+             Channels->Save();
+             Timers->Save();
+             ChannelSaveTimeout = 0;
+             }
+          if (Channels) {
+             for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
+                 if (Channel->Modification(CHANNELMOD_RETUNE)) {
+                    cRecordControls::ChannelDataModified(Channel);
+                    if (Channel->Number() == cDevice::CurrentChannel() && cDevice::PrimaryDevice()->HasDecoder()) {
+                       if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) {
+                          if (cDevice::ActualDevice()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
+                             isyslog("retuning due to modification of channel %d (%s)", Channel->Number(), Channel->Name());
+                             Channels->SwitchTo(Channel->Number());
+                             }
+                          }
+                       }
+                    cStatus::MsgChannelChange(Channel);
+                    }
                  }
-              for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-                  if (Channel->Modification(CHANNELMOD_RETUNE)) {
-                     cRecordControls::ChannelDataModified(Channel);
-                     if (Channel->Number() == cDevice::CurrentChannel() && cDevice::PrimaryDevice()->HasDecoder()) {
-                        if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) {
-                           if (cDevice::ActualDevice()->ProvidesTransponder(Channel)) { // avoids retune on devices that don't really access the transponder
-                              isyslog("retuning due to modification of channel %d (%s)", Channel->Number(), Channel->Name());
-                              Channels.SwitchTo(Channel->Number());
-                              }
-                           }
-                        }
-                     cStatus::MsgChannelChange(Channel);
-                     }
-                  }
-              Channels.Unlock();
-              }
-           }
+             }
+          // State keys are removed in reverse order!
+          if (Channels)
+             ChannelsStateKey.Remove();
+          if (Timers)
+             TimersStateKey.Remove();
+          if (ChannelSaveTimeout == 1) {
+             // Only one of them was modified, so we reset the state keys to handle them both in the next turn:
+             ChannelsStateKey.Reset();
+             TimersStateKey.Reset();
+             }
+        }
         // Channel display:
         if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
            if (!Menu)
@@ -1002,80 +1039,109 @@ int main(int argc, char *argv[])
            }
         if (Now - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
-        // Timers and Recordings:
-        if (!Timers.BeingEdited()) {
-           // Assign events to timers:
-           Timers.SetEvents();
-           // Must do all following calls with the exact same time!
-           // Process ongoing recordings:
-           cRecordControls::Process(Now);
-           // Start new recordings:
-           cTimer *Timer = Timers.GetMatch(Now);
-           if (Timer) {
-              if (!cRecordControls::Start(Timer))
-                 Timer->SetPending(true);
-              else
-                 LastTimerChannel = Timer->Channel()->Number();
-              }
-           // Make sure timers "see" their channel early enough:
-           static time_t LastTimerCheck = 0;
-           if (Now - LastTimerCheck > TIMERCHECKDELTA) { // don't do this too often
-              InhibitEpgScan = false;
-              for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
-                  bool InVpsMargin = false;
-                  bool NeedsTransponder = false;
-                  if (Timer->HasFlags(tfActive) && !Timer->Recording()) {
-                     if (Timer->HasFlags(tfVps)) {
-                        if (Timer->Matches(Now, true, Setup.VpsMargin)) {
-                           InVpsMargin = true;
-                           Timer->SetInVpsMargin(InVpsMargin);
-                           }
-                        else if (Timer->Event()) {
-                           InVpsMargin = Timer->Event()->StartTime() <= Now && Now < Timer->Event()->EndTime();
-                           NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
-                           }
-                        else {
-                           cSchedulesLock SchedulesLock;
-                           const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
-                           if (Schedules) {
-                              const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
-                              InVpsMargin = !Schedule; // we must make sure we have the schedule
-                              NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
-                              }
-                           }
-                        InhibitEpgScan |= InVpsMargin | NeedsTransponder;
-                        }
-                     else
-                        NeedsTransponder = Timer->Matches(Now, true, TIMERLOOKAHEADTIME);
-                     }
-                  if (NeedsTransponder || InVpsMargin) {
-                     // Find a device that provides the required transponder:
-                     cDevice *Device = cDevice::GetDeviceForTransponder(Timer->Channel(), MINPRIORITY);
-                     if (!Device && InVpsMargin)
-                        Device = cDevice::GetDeviceForTransponder(Timer->Channel(), LIVEPRIORITY);
-                     // Switch the device to the transponder:
-                     if (Device) {
-                        bool HadProgramme = cDevice::PrimaryDevice()->HasProgramme();
-                        if (!Device->IsTunedToTransponder(Timer->Channel())) {
-                           if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
-                              cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
-                           dsyslog("switching device %d to channel %d (%s)", Device->DeviceNumber() + 1, Timer->Channel()->Number(), Timer->Channel()->Name());
-                           if (Device->SwitchChannel(Timer->Channel(), false))
-                              Device->SetOccupied(TIMERDEVICETIMEOUT);
-                           }
-                        if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme())
-                           Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel
-                        }
-                     }
-                  }
-              LastTimerCheck = Now;
-              }
-           // Delete expired timers:
-           Timers.DeleteExpired();
-           }
-        if (!Menu && Recordings.NeedsUpdate()) {
-           Recordings.Update();
-           DeletedRecordings.Update();
+        {
+          // Timers and Recordings:
+          bool TimersModified = false;
+          bool TriggerRemoteTimerPoll = false;
+          static cStateKey TimersStateKey(true);
+          if (cTimers::GetTimersRead(TimersStateKey)) {
+             TriggerRemoteTimerPoll = true;
+             TimersStateKey.Remove();
+             }
+          cTimers *Timers = cTimers::GetTimersWrite(TimersStateKey);
+          // Get remote timers:
+          TimersModified |= Timers->GetRemoteTimers();
+          // Assign events to timers:
+          static cStateKey SchedulesStateKey;
+          if (const cSchedules *Schedules = cSchedules::GetSchedulesRead(SchedulesStateKey))
+             TimersModified |= Timers->SetEvents(Schedules);
+          // Must do all following calls with the exact same time!
+          // Process ongoing recordings:
+          if (cRecordControls::Process(Timers, Now)) {
+             TimersModified = true;
+             TriggerRemoteTimerPoll = true;
+             }
+          // Must keep the lock on the schedules until after processing the record
+          // controls, in order to avoid short interrupts in case the current event
+          // is replaced by a new one (which some broadcasters do, instead of just
+          // modifying the current event's data):
+          if (SchedulesStateKey.InLock())
+             SchedulesStateKey.Remove();
+          // Start new recordings:
+          if (cTimer *Timer = Timers->GetMatch(Now)) {
+             if (!cRecordControls::Start(Timers, Timer))
+                Timer->SetPending(true);
+             else
+                LastTimerChannel = Timer->Channel()->Number();
+             TimersModified = true;
+             TriggerRemoteTimerPoll = true;
+             }
+          // Make sure timers "see" their channel early enough:
+          static time_t LastTimerCheck = 0;
+          if (Now - LastTimerCheck > TIMERCHECKDELTA) { // don't do this too often
+             InhibitEpgScan = false;
+             for (cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) {
+                 if (Timer->Remote())
+                    continue;
+                 bool InVpsMargin = false;
+                 bool NeedsTransponder = false;
+                 if (Timer->HasFlags(tfActive) && !Timer->Recording()) {
+                    if (Timer->HasFlags(tfVps)) {
+                       if (Timer->Matches(Now, true, Setup.VpsMargin)) {
+                          InVpsMargin = true;
+                          Timer->SetInVpsMargin(InVpsMargin);
+                          }
+                       else if (Timer->Event()) {
+                          InVpsMargin = Timer->Event()->StartTime() <= Now && Now < Timer->Event()->EndTime();
+                          NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
+                          }
+                       else {
+                          LOCK_SCHEDULES_READ;
+                          const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
+                          InVpsMargin = !Schedule; // we must make sure we have the schedule
+                          NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
+                          }
+                       InhibitEpgScan |= InVpsMargin | NeedsTransponder;
+                       }
+                    else
+                       NeedsTransponder = Timer->Matches(Now, true, TIMERLOOKAHEADTIME);
+                    }
+                 if (NeedsTransponder || InVpsMargin) {
+                    // Find a device that provides the required transponder:
+                    cDevice *Device = cDevice::GetDeviceForTransponder(Timer->Channel(), MINPRIORITY);
+                    if (!Device && InVpsMargin)
+                       Device = cDevice::GetDeviceForTransponder(Timer->Channel(), LIVEPRIORITY);
+                    // Switch the device to the transponder:
+                    if (Device) {
+                       bool HadProgramme = cDevice::PrimaryDevice()->HasProgramme();
+                       if (!Device->IsTunedToTransponder(Timer->Channel())) {
+                          if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
+                             cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
+                          dsyslog("switching device %d to channel %d (%s)", Device->DeviceNumber() + 1, Timer->Channel()->Number(), Timer->Channel()->Name());
+                          if (Device->SwitchChannel(Timer->Channel(), false))
+                             Device->SetOccupied(TIMERDEVICETIMEOUT);
+                          }
+                       if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme())
+                          Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel
+                       }
+                    }
+                 }
+             LastTimerCheck = Now;
+             }
+          // Delete expired timers:
+          if (Timers->DeleteExpired()) {
+             TimersModified = true;
+             TriggerRemoteTimerPoll = true;
+             }
+          // Trigger remote timer polls:
+          if (TriggerRemoteTimerPoll)
+             Timers->TriggerRemoteTimerPoll();
+          TimersStateKey.Remove(TimersModified);
+        }
+        // Recordings:
+        if (!Menu) {
+           if (cRecordings::NeedsUpdate())
+              cRecordings::Update();
            }
         // CAM control:
         if (!Menu && !cOsd::IsOpen())
@@ -1244,8 +1310,12 @@ int main(int argc, char *argv[])
           // Instant recording:
           case kRecord:
                if (!cControl::Control()) {
-                  if (cRecordControls::Start())
-                     Skins.QueueMessage(mtInfo, tr("Recording started"));
+                  if (Setup.RecordKeyHandling) {
+                     if (Setup.RecordKeyHandling > 1 || Interface->Confirm(tr("Start recording?"))) {
+                        if (cRecordControls::Start())
+                           Skins.QueueMessage(mtInfo, tr("Recording started"));
+                        }
+                     }
                   key = kNone; // nobody else needs to see this key
                   }
                break;
@@ -1348,7 +1418,8 @@ int main(int argc, char *argv[])
              case k0: {
                   if (PreviousChannel[PreviousChannelIndex ^ 1] == LastChannel || LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
                      PreviousChannelIndex ^= 1;
-                  Channels.SwitchTo(PreviousChannel[PreviousChannelIndex ^= 1]);
+                  LOCK_CHANNELS_READ;
+                  Channels->SwitchTo(PreviousChannel[PreviousChannelIndex ^= 1]);
                   break;
                   }
              // Direct Channel Select:
@@ -1412,7 +1483,7 @@ int main(int argc, char *argv[])
         // Keep the recordings handler alive:
         RecordingsHandler.Active();
 
-        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Handle housekeeping tasks
 
            // Shutdown:
@@ -1436,7 +1507,7 @@ int main(int argc, char *argv[])
 
            // Disk housekeeping:
            RemoveDeletedRecordings();
-           ClearVanishedRecordings();
+           ListGarbageCollector.Purge();
            cSchedules::Cleanup();
            // Plugins housekeeping:
            PluginManager.Housekeeping();
@@ -1460,6 +1531,8 @@ int main(int argc, char *argv[])
   signal(SIGPIPE, SIG_DFL);
   signal(SIGALRM, SIG_DFL);
 
+  StopSVDRPClientHandler();
+  StopSVDRPServerHandler();
   PluginManager.StopPlugins();
   cRecordControls::Shutdown();
   RecordingsHandler.DelAll();
@@ -1480,8 +1553,9 @@ int main(int argc, char *argv[])
   cPositioner::DestroyPositioner();
   cVideoDirectory::Destroy();
   EpgHandlers.Clear();
-  PluginManager.Shutdown(true);
   cSchedules::Cleanup(true);
+  ListGarbageCollector.Purge(true);
+  PluginManager.Shutdown(true);
   ReportEpgBugFixStats(true);
   if (WatchdogTimeout > 0)
      dsyslog("max. latency time %d seconds", MaxLatencyTime);
diff --git a/videodir.c b/videodir.c
index 932f8ce39..b2257fa66 100644
--- a/videodir.c
+++ b/videodir.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.c 3.4 2013/10/11 09:38:07 kls Exp $
+ * $Id: videodir.c 4.1 2015/08/11 13:39:59 kls Exp $
  */
 
 #include "videodir.h"
@@ -19,24 +19,31 @@
 #include "recording.h"
 #include "tools.h"
 
+cMutex cVideoDirectory::mutex;
 cString cVideoDirectory::name;
 cVideoDirectory *cVideoDirectory::current = NULL;
 
 cVideoDirectory::cVideoDirectory(void)
 {
+  mutex.Lock();
   delete current;
   current = this;
+  mutex.Unlock();
 }
 
 cVideoDirectory::~cVideoDirectory()
 {
+  mutex.Lock();
   current = NULL;
+  mutex.Unlock();
 }
 
 cVideoDirectory *cVideoDirectory::Current(void)
 {
+  mutex.Lock();
   if (!current)
-     current = new cVideoDirectory;
+     new cVideoDirectory;
+  mutex.Unlock();
   return current;
 }
 
@@ -141,7 +148,8 @@ int cVideoDirectory::VideoDiskSpace(int *FreeMB, int *UsedMB)
 {
   int used = 0;
   int free = Current()->FreeMB(&used);
-  int deleted = DeletedRecordings.TotalFileSizeMB();
+  LOCK_DELETEDRECORDINGS_READ;
+  int deleted = DeletedRecordings->TotalFileSizeMB();
   if (deleted > used)
      deleted = used; // let's not get beyond 100%
   free += deleted;
@@ -202,7 +210,8 @@ bool cVideoDiskUsage::HasChanged(int &State)
      if (FreeMB != freeMB) {
         usedPercent = UsedPercent;
         freeMB = FreeMB;
-        double MBperMinute = Recordings.MBperMinute();
+        LOCK_RECORDINGS_READ;
+        double MBperMinute = Recordings->MBperMinute();
         if (MBperMinute <= 0)
            MBperMinute = MB_PER_MINUTE;
         freeMinutes = int(double(FreeMB) / MBperMinute);
diff --git a/videodir.h b/videodir.h
index f520d77ba..385c822e9 100644
--- a/videodir.h
+++ b/videodir.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: videodir.h 3.2 2013/10/11 09:37:48 kls Exp $
+ * $Id: videodir.h 4.1 2015/08/10 13:21:29 kls Exp $
  */
 
 #ifndef __VIDEODIR_H
@@ -15,6 +15,7 @@
 
 class cVideoDirectory {
 private:
+  static cMutex mutex;
   static cString name;
   static cVideoDirectory *current;
   static cVideoDirectory *Current(void);

From ec0ec6da01caf27e3f672e0d6bc57bc768f61158 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 24 Dec 2016 10:07:00 +0100
Subject: [PATCH 244/307] Version 2.3.2 Merry Christmas to all VDR users!
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's been a very busy year for me, in which I was unable to
spend as much time on VDR as I would have liked to. But now things
are settled again and I managed to prepare a new developer version
with the most important fixes and improvements. Please feel free
to tell me if I missed something important - some things may well
have slipped under my radar ;-).

So here's my Christmas gift for you!

VDR developer version 2.3.2 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.2.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.1-2.3.2.diff

MD5 checksums:

6dbb208ea3d59658a18912b49af175b3  vdr-2.3.2.tar.bz2
68a0ed9f01048026333939d30e0a6474  vdr-2.3.1-2.3.2.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Fixed a crash when deleting a recording (reported by Oliver Endriss).
- Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed initializing device specific parameters in cDvbTransponderParameters.
- The function SetCurrentChannel(const cChannel *Channel) is now deprecated and
  may be removed in a future version. Use SetCurrentChannel(int ChannelNumber)
  instead.
- The SVDRP command DELC now refuses to delete the very last channel in the list,
  to avoid ending up with an empty channel list.
- The cRwLock class now allows nested read locks within a write lock from the
  same thread. This fixes possible crashes when moving or deleting channels in
  the menu or through SVDRP (as well as other operations that try to acquire a
  read lock within a write lock).
- Fixed a crash when trying to delete a channel that is being used by a timer.
- Fixed setting the current item and counter values in the Recordings menu after
  deleting the last recording in a subfolder.
- Fixed a crash when deleting a recording that is currently being replayed.
- Fixed a crash when moving a recording to a folder on a different volume.
  The cRecordingsHandler now performs its actual operations in a separate thread,
  thus avoiding locking problems and reducing the time between subsequent
  operations.
- Added a note to the description of cFont::Size(), regarding possible differences
  between it and cFont::Height() (suggested to Thomas Reufer).
- Made the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode
  'const' (thanks to Thomas Reufer).
- Fixed resuming replay at a given position, which was off by one frame (thanks
  to Thomas Reufer).
- Improved handling frame numbers to have a smoother progress display during
  replay of recordings with B-frames (thanks to Thomas Reufer).
- Fixed replaying recordings to their very end, if they don't end with an I-frame
  (thanks to Thomas Reufer).
- Implemented a frame parser for H.265 (HEVC) recordings (thanks to Thomas Reufer).
- Added cFont::Width(void) to get the default character width and allow stretched
  font drawing in high level OSDs (thanks to Thomas Reufer).
- Fixed regenerating the index of audio recordings (thanks to Thomas Reufer).
- Fixed building VDR with systemd >= 230 (thanks to Ville Skyttä).
- Sorted sources.conf by continous azimuth (thanks to Lucian Muresan).
- Added 'S58.5E Kazsat 3' to sources.conf (thanks to Aitugan Sarbassov).
- Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
  (reported by Sergey Chernyavskiy).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Added a 'const' version of cTimers::GetTimer() (thanks to Lars Hanisch).
- Fixed a typo in the description of cTimers::GetTimersRead() (thanks to Lars
  Hanisch).
- Fixed a possible buffer overflow in handling CA descriptors (suggested by
  Lars Hanisch).
- Avoiding some duplicate code and unnecessary work in nit.c (thanks to Ville
  Skyttä).
- Added support for the systemd watchdog (thanks to Marc Perrudin),
- Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to
  Sergey Chernyavskiy).
---
 CONTRIBUTORS                        |  31 ++++
 HISTORY                             |  54 ++++++
 Makefile                            |   6 +-
 PLUGINS/src/skincurses/HISTORY      |   7 +
 PLUGINS/src/skincurses/skincurses.c |   8 +-
 ci.c                                |  67 ++++---
 config.h                            |  10 +-
 device.c                            |   3 +-
 device.h                            |   6 +-
 dvbdevice.c                         |  32 ++--
 dvbplayer.c                         |  81 +++++++--
 dvbplayer.h                         |   6 +-
 font.c                              |  15 +-
 font.h                              |   8 +-
 menu.c                              | 149 ++++++++--------
 menu.h                              |   3 +-
 nit.c                               |  16 +-
 pat.c                               |  52 +++---
 pat.h                               |   8 +-
 player.h                            |  13 +-
 po/et_EE.po                         | 260 ++++++++++++++--------------
 po/it_IT.po                         |  32 ++--
 receiver.c                          |   8 +-
 recording.c                         |  57 +++---
 recording.h                         |  14 +-
 remux.c                             |  92 +++++++++-
 remux.h                             |   5 +-
 ringbuffer.c                        |   5 +-
 ringbuffer.h                        |   6 +-
 skinclassic.c                       |   5 +-
 skinlcars.c                         |   5 +-
 skinsttng.c                         |   5 +-
 sources.conf                        | 141 +++++++--------
 svdrp.c                             |  10 +-
 thread.c                            |  32 +++-
 thread.h                            |   8 +-
 timers.c                            |   6 +-
 timers.h                            |   7 +-
 tools.c                             |  40 ++++-
 tools.h                             |  24 ++-
 vdr.c                               |  36 +++-
 41 files changed, 862 insertions(+), 511 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7f7a2d374..ca58ae8e9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -715,6 +715,7 @@ Oliver Endriss <o.endriss@gmx.de>
  for suggesting to ignore channels with an RID that is not 0 when checking for obsolete
  channels
  for fixing a possible stack overflow in cListBase::Sort()
+ for reporting a crash when deleting a recording
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1844,6 +1845,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
  for exporting some libsi functions
  for suggesting to add functions to cDevice that allow derived output devices to
  implement scaling the video to a given size and location
+ fpr sorting sources.conf by continous azimuth
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -2062,6 +2064,8 @@ Ville Skytt
  for reporting a possible NULL pointer dereference in cCiSession::SendData()
  for reporting a superfluous assignment in cPipe::Open()
  for avoiding unnecessary pkg-config warnings in plugin Makefiles
+ for fixing building VDR with systemd >= 230
+ for avoiding some duplicate code and unnecessary work in nit.c
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
@@ -2924,6 +2928,10 @@ Lars Hanisch <dvb@flensrocker.de>
  for making VDR read command line options from *.conf files in /etc/vdr/conf.d
  for adding a missing backslash to the help text of the SVDRP command MOVR
  for fixing a memory leak in case of broken Extended Event Descriptors
+ for adding a 'const' version of cTimers::GetTimer()
+ for fixing a typo in the description of cTimers::GetTimersRead()
+ for suggesting to use dynamic buffering in handling CA descriptors to avoid a
+ possible buffer overflow
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
@@ -3225,6 +3233,7 @@ Malte Forkel <malte.forkel@berlin.de>
 
 Marc Perrudin <vdr@ekass.net>
  for translating OSD texts to the French language
+ for adding support for the systemd watchdog
 
 Bernard Jaulin <bernard.jaulin@gmail.com>
  for translating OSD texts to the French language
@@ -3322,6 +3331,18 @@ Thomas Reufer <thomas@reufer.ch>
  ViewPort and DrawPort
  for suggesting to reduce the priority of the "video directory scanner" thread
  for making the 'newplugin' script create the 'po' subdirectory for translations
+ for suggesting to add a note to the description of cFont::Size(), regarding possible
+ differences between it and cFont::Height()
+ for making the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode
+ 'const'
+ for fixing resuming replay at a given position, which was off by one frame
+ for improving handling frame numbers to have a smoother progress display during
+ replay of recordings with B-frames
+ for fixing replaying recordings to their very end, if they don't end with an I-frame
+ for implementing a frame parser for H.265 (HEVC) recordings
+ for adding cFont::Width(void) to get the default character width and allow stretched
+ font drawing in high level OSDs
+ for fixing regenerating the index of audio recordings
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
@@ -3428,3 +3449,13 @@ Janne P
 Stefan P�schel <basic.master@gmx.de>
  for coding the AFFcleaner, parts of which were used to make the recorder skip empty
  adaptation field TS packets
+
+Robert Hannebauer <vdr@hannebauer.org>
+ for fixing an overflow of PIDs in a receiver
+
+Aitugan Sarbassov <isarbassov@gmail.com>
+ for adding 'S58.5E Kazsat 3' to sources.conf
+
+Sergey Chernyavskiy <glenvt18@gmail.com>
+ for reporting truncated date/time strings in the skins on multi-byte UTF-8
+ for adding a short sleep to cTSBuffer::Action() to avoid high CPU usage
diff --git a/HISTORY b/HISTORY
index 7e8fd5c68..932b9639f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8827,3 +8827,57 @@ Video Disk Recorder Revision History
   live tv (suggested by Dietmar Spingler).
 - Empty adaptation field TS packets are now skipped when recording (thanks to
   Christopher Reimer, based on the "AFFcleaner" by Stefan P�schel).
+
+2016-12-24: Version 2.3.2
+
+- Fixed a crash when deleting a recording (reported by Oliver Endriss).
+- Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed initializing device specific parameters in cDvbTransponderParameters.
+- The function SetCurrentChannel(const cChannel *Channel) is now deprecated and
+  may be removed in a future version. Use SetCurrentChannel(int ChannelNumber)
+  instead.
+- The SVDRP command DELC now refuses to delete the very last channel in the list,
+  to avoid ending up with an empty channel list.
+- The cRwLock class now allows nested read locks within a write lock from the
+  same thread. This fixes possible crashes when moving or deleting channels in
+  the menu or through SVDRP (as well as other operations that try to acquire a
+  read lock within a write lock).
+- Fixed a crash when trying to delete a channel that is being used by a timer.
+- Fixed setting the current item and counter values in the Recordings menu after
+  deleting the last recording in a subfolder.
+- Fixed a crash when deleting a recording that is currently being replayed.
+- Fixed a crash when moving a recording to a folder on a different volume.
+  The cRecordingsHandler now performs its actual operations in a separate thread,
+  thus avoiding locking problems and reducing the time between subsequent
+  operations.
+- Added a note to the description of cFont::Size(), regarding possible differences
+  between it and cFont::Height() (suggested to Thomas Reufer).
+- Made the cPlayer member functions FramesPerSecond, GetIndex and GetReplayMode
+  'const' (thanks to Thomas Reufer).
+- Fixed resuming replay at a given position, which was off by one frame (thanks
+  to Thomas Reufer).
+- Improved handling frame numbers to have a smoother progress display during
+  replay of recordings with B-frames (thanks to Thomas Reufer).
+- Fixed replaying recordings to their very end, if they don't end with an I-frame
+  (thanks to Thomas Reufer).
+- Implemented a frame parser for H.265 (HEVC) recordings (thanks to Thomas Reufer).
+- Added cFont::Width(void) to get the default character width and allow stretched
+  font drawing in high level OSDs (thanks to Thomas Reufer).
+- Fixed regenerating the index of audio recordings (thanks to Thomas Reufer).
+- Fixed building VDR with systemd >= 230 (thanks to Ville Skytt�).
+- Sorted sources.conf by continous azimuth (thanks to Lucian Muresan).
+- Added 'S58.5E Kazsat 3' to sources.conf (thanks to Aitugan Sarbassov).
+- Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
+  (reported by Sergey Chernyavskiy).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Added a 'const' version of cTimers::GetTimer() (thanks to Lars Hanisch).
+- Fixed a typo in the description of cTimers::GetTimersRead() (thanks to Lars
+  Hanisch).
+- Fixed a possible buffer overflow in handling CA descriptors (suggested by
+  Lars Hanisch).
+- Avoiding some duplicate code and unnecessary work in nit.c (thanks to Ville
+  Skytt�).
+- Added support for the systemd watchdog (thanks to Marc Perrudin),
+- Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to
+  Sergey Chernyavskiy).
diff --git a/Makefile b/Makefile
index b90cbd241..a0d78b2a9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 4.0 2015/02/09 12:28:24 kls Exp $
+# $Id: Makefile 4.1 2016/12/22 13:18:32 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -95,9 +95,9 @@ DEFINES += -DBIDI
 LIBS += $(shell pkg-config --libs fribidi)
 endif
 ifdef SDNOTIFY
-INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
+INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd)
 DEFINES += -DSDNOTIFY
-LIBS += $(shell pkg-config --libs libsystemd-daemon)
+LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd)
 endif
 
 LIRC_DEVICE ?= /var/run/lirc/lircd
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index f24e67667..2a2bccb05 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -130,3 +130,10 @@ VDR Plugin 'skincurses' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2016-12-22: Version 2.3.2
+
+- Added cFont::Width(void) to get the default character width and allow stretched
+  font drawing in high level OSDs (dummy for skincurses).
+- Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
+  (reported by Sergey Chernyavskiy).
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 358035e0b..d11736bee 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 4.0 2015/02/17 13:13:17 kls Exp $
+ * $Id: skincurses.c 4.2 2016/12/22 14:09:09 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.3.2";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -20,6 +20,7 @@ static const char *MAINMENUENTRY  = NULL;
 
 class cCursesFont : public cFont {
 public:
+  virtual int Width(void) const { return 1; }
   virtual int Width(uint c) const { return 1; }
   virtual int Width(const char *s) const { return s ? Utf8StrLen(s) : 0; }
   virtual int Height(void) const { return 1; }
@@ -407,8 +408,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
      return;
   int y = 2;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
+  cString t = cString::sprintf("%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground);
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      cString buffer = cString::sprintf(" VPS: %s", *Event->GetVpsString());
diff --git a/ci.c b/ci.c
index f86f668e4..606875b88 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.2 2015/09/05 11:45:19 kls Exp $
+ * $Id: ci.c 4.3 2016/12/23 14:00:45 kls Exp $
  */
 
 #include "ci.h"
@@ -756,9 +756,9 @@ class cCiCaPmt {
   friend class cCiConditionalAccessSupport;
 private:
   uint8_t cmdId;
-  int length;
   int esInfoLengthPos;
-  uint8_t capmt[2048]; ///< XXX is there a specified maximum?
+  cDynamicBuffer caDescriptors;
+  cDynamicBuffer capmt;
   int source;
   int transponder;
   int programNumber;
@@ -768,7 +768,7 @@ class cCiCaPmt {
   cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds);
   uint8_t CmdId(void) { return cmdId; }
   void SetListManagement(uint8_t ListManagement);
-  uint8_t ListManagement(void) { return capmt[0]; }
+  uint8_t ListManagement(void) { return capmt.Get(0); }
   void AddPid(int Pid, uint8_t StreamType);
   };
 
@@ -784,55 +784,46 @@ cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber
          caSystemIds[i] = CaSystemIds[i];
      }
   caSystemIds[i] = 0;
-  uint8_t caDescriptors[512];
-  int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, 0);
-  length = 0;
-  capmt[length++] = CPLM_ONLY;
-  capmt[length++] = (ProgramNumber >> 8) & 0xFF;
-  capmt[length++] =  ProgramNumber       & 0xFF;
-  capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
-  esInfoLengthPos = length;
-  capmt[length++] = 0x00; // program_info_length H (at program level)
-  capmt[length++] = 0x00; // program_info_length L
-  AddCaDescriptors(caDescriptorsLength, caDescriptors);
+  GetCaDescriptors(source, transponder, programNumber, caSystemIds, caDescriptors, 0);
+  capmt.Append(CPLM_ONLY);
+  capmt.Append((ProgramNumber >> 8) & 0xFF);
+  capmt.Append( ProgramNumber       & 0xFF);
+  capmt.Append(0x01); // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
+  esInfoLengthPos = capmt.Length();
+  capmt.Append(0x00); // program_info_length H (at program level)
+  capmt.Append(0x00); // program_info_length L
+  AddCaDescriptors(caDescriptors.Length(), caDescriptors.Data());
 }
 
 void cCiCaPmt::SetListManagement(uint8_t ListManagement)
 {
-  capmt[0] = ListManagement;
+  capmt.Set(0, ListManagement);
 }
 
 void cCiCaPmt::AddPid(int Pid, uint8_t StreamType)
 {
   if (Pid) {
-     uint8_t caDescriptors[512];
-     int caDescriptorsLength = GetCaDescriptors(source, transponder, programNumber, caSystemIds, sizeof(caDescriptors), caDescriptors, Pid);
-     //XXX buffer overflow check???
-     capmt[length++] = StreamType;
-     capmt[length++] = (Pid >> 8) & 0xFF;
-     capmt[length++] =  Pid       & 0xFF;
-     esInfoLengthPos = length;
-     capmt[length++] = 0x00; // ES_info_length H (at ES level)
-     capmt[length++] = 0x00; // ES_info_length L
-     AddCaDescriptors(caDescriptorsLength, caDescriptors);
+     GetCaDescriptors(source, transponder, programNumber, caSystemIds, caDescriptors, Pid);
+     capmt.Append(StreamType);
+     capmt.Append((Pid >> 8) & 0xFF);
+     capmt.Append( Pid       & 0xFF);
+     esInfoLengthPos = capmt.Length();
+     capmt.Append(0x00); // ES_info_length H (at ES level)
+     capmt.Append(0x00); // ES_info_length L
+     AddCaDescriptors(caDescriptors.Length(), caDescriptors.Data());
      }
 }
 
 void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
 {
   if (esInfoLengthPos) {
-     if (length + Length < int(sizeof(capmt))) {
-        if (Length || cmdId == CPCI_QUERY) {
-           capmt[length++] = cmdId;
-           memcpy(capmt + length, Data, Length);
-           length += Length;
-           int l = length - esInfoLengthPos - 2;
-           capmt[esInfoLengthPos]     = (l >> 8) & 0xFF;
-           capmt[esInfoLengthPos + 1] =  l       & 0xFF;
-           }
+     if (Length || cmdId == CPCI_QUERY) {
+        capmt.Append(cmdId);
+        capmt.Append(Data, Length);
+        int l = capmt.Length() - esInfoLengthPos - 2;
+        capmt.Set(esInfoLengthPos,     (l >> 8) & 0xFF);
+        capmt.Set(esInfoLengthPos + 1,  l       & 0xFF);
         }
-     else
-        esyslog("ERROR: buffer overflow in CA descriptor");
      esInfoLengthPos = 0;
      }
   else
@@ -995,7 +986,7 @@ void cCiConditionalAccessSupport::SendPMT(cCiCaPmt *CaPmt)
 {
   if (CaPmt && state >= 2) {
      dbgprotocol("Slot %d: ==> Ca Pmt (%d) %d %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), CaPmt->ListManagement(), CaPmt->CmdId());
-     SendData(AOT_CA_PMT, CaPmt->length, CaPmt->capmt);
+     SendData(AOT_CA_PMT, CaPmt->capmt.Length(), CaPmt->capmt.Data());
      state = 4; // sent ca pmt
      }
 }
diff --git a/config.h b/config.h
index e5565da35..16630b3ac 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.5 2015/09/11 08:07:34 kls Exp $
+ * $Id: config.h 4.6 2015/09/16 11:11:42 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.1"
-#define VDRVERSNUM   20301  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.2"
+#define VDRVERSNUM   20302  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.1"
-#define APIVERSNUM   20301  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.2"
+#define APIVERSNUM   20302  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 174281f4a..3c97b8ce8 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.2 2015/09/05 11:42:17 kls Exp $
+ * $Id: device.c 4.3 2016/12/23 14:43:44 kls Exp $
  */
 
 #include "device.h"
@@ -1768,6 +1768,7 @@ void cTSBuffer::Action(void)
                     break;
                     }
                  }
+              cCondWait::SleepMs(10); // avoids small chunks of data, which cause high CPU usage, esp. on ARM CPUs
               }
            }
      }
diff --git a/device.h b/device.h
index 31ee3038a..9475d23a2 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.1 2015/04/19 12:12:43 kls Exp $
+ * $Id: device.h 4.2 2016/12/06 14:12:39 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -322,7 +322,11 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+#define DEPRECATED_SETCURRENTCHANNEL
+#ifdef DEPRECATED_SETCURRENTCHANNEL
   static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
+#endif
+  static void SetCurrentChannel(int ChannelNumber) { currentChannel = ChannelNumber; }
          ///< Sets the number of the current channel on the primary device, without
          ///< actually switching to it. This can be used to correct the current
          ///< channel number while replaying.
diff --git a/dvbdevice.c b/dvbdevice.c
index 63af52e7d..b3d54c6d5 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 4.2 2015/04/18 16:19:28 kls Exp $
+ * $Id: dvbdevice.c 4.3 2016/11/07 13:55:58 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -201,21 +201,6 @@ int MapToDriver(int Value, const tDvbParameterMap *Map)
 
 cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
 {
-  polarization = 0;
-  inversion    = INVERSION_AUTO;
-  bandwidth    = 8000000;
-  coderateH    = FEC_AUTO;
-  coderateL    = FEC_AUTO;
-  modulation   = QPSK;
-  system       = DVB_SYSTEM_1;
-  transmission = TRANSMISSION_MODE_AUTO;
-  guard        = GUARD_INTERVAL_AUTO;
-  hierarchy    = HIERARCHY_AUTO;
-  rollOff      = ROLLOFF_AUTO;
-  streamId     = 0;
-  t2systemId   = 0;
-  sisoMiso     = 0;
-  pilot        = PILOT_AUTO;
   Parse(Parameters);
 }
 
@@ -266,6 +251,21 @@ const char *cDvbTransponderParameters::ParseParameter(const char *s, int &Value,
 
 bool cDvbTransponderParameters::Parse(const char *s)
 {
+  polarization = 0;
+  inversion    = INVERSION_AUTO;
+  bandwidth    = 8000000;
+  coderateH    = FEC_AUTO;
+  coderateL    = FEC_AUTO;
+  modulation   = QPSK;
+  system       = DVB_SYSTEM_1;
+  transmission = TRANSMISSION_MODE_AUTO;
+  guard        = GUARD_INTERVAL_AUTO;
+  hierarchy    = HIERARCHY_AUTO;
+  rollOff      = ROLLOFF_AUTO;
+  streamId     = 0;
+  t2systemId   = 0;
+  sisoMiso     = 0;
+  pilot        = PILOT_AUTO;
   while (s && *s) {
         switch (toupper(*s)) {
           case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
diff --git a/dvbplayer.c b/dvbplayer.c
index ca4007e3b..ca0073537 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 4.1 2015/08/06 13:09:19 kls Exp $
+ * $Id: dvbplayer.c 4.4 2016/12/22 11:34:31 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -17,13 +17,14 @@
 
 // --- cPtsIndex -------------------------------------------------------------
 
-#define PTSINDEX_ENTRIES 500
+#define PTSINDEX_ENTRIES 1024
 
 class cPtsIndex {
 private:
   struct tPtsIndex {
     uint32_t pts; // no need for 33 bit - some devices don't even supply the msb
     int index;
+    bool independent;
     };
   tPtsIndex pi[PTSINDEX_ENTRIES];
   int w, r;
@@ -33,8 +34,9 @@ class cPtsIndex {
   cPtsIndex(void);
   void Clear(void);
   bool IsEmpty(void);
-  void Put(uint32_t Pts, int Index);
+  void Put(uint32_t Pts, int Index, bool Independent);
   int FindIndex(uint32_t Pts);
+  int FindFrameNumber(uint32_t Pts);
   };
 
 cPtsIndex::cPtsIndex(void)
@@ -55,10 +57,11 @@ bool cPtsIndex::IsEmpty(void)
   return w == r;
 }
 
-void cPtsIndex::Put(uint32_t Pts, int Index)
+void cPtsIndex::Put(uint32_t Pts, int Index, bool Independent)
 {
   cMutexLock MutexLock(&mutex);
   pi[w].pts = Pts;
+  pi[w].independent = Independent;
   pi[w].index = Index;
   w = (w + 1) % PTSINDEX_ENTRIES;
   if (w == r)
@@ -87,6 +90,36 @@ int cPtsIndex::FindIndex(uint32_t Pts)
   return Index;
 }
 
+int cPtsIndex::FindFrameNumber(uint32_t Pts)
+{
+  cMutexLock MutexLock(&mutex);
+  if (w == r)
+     return lastFound; // replay always starts at an I frame
+  bool Valid = false;
+  int d;
+  int FrameNumber = 0;
+  int UnplayedIFrame = 2; // GOPs may intersect, so we're looping until we found two unplayed I frames
+  for (int i = r; i != w && UnplayedIFrame; ) {
+      d = Pts - pi[i].pts;
+      if (d > 0x7FFFFFFF)
+         d = 0xFFFFFFFF - d; // handle rollover
+      if (d > 0) {
+         if (pi[i].independent) {
+            FrameNumber = pi[i].index; // an I frame's index represents its frame number
+            Valid = true;
+            }
+         else
+            FrameNumber++; // for every played non-I frame, increase frame number
+         }
+      else
+        if (pi[i].independent)
+           --UnplayedIFrame;
+      if (++i >= PTSINDEX_ENTRIES)
+         i = 0;
+      }
+  return Valid ? FrameNumber : FindIndex(Pts); // fall back during trick speeds
+}
+
 // --- cNonBlockingFileReader ------------------------------------------------
 
 class cNonBlockingFileReader : public cThread {
@@ -251,6 +284,7 @@ class cDvbPlayer : public cPlayer, cThread {
   virtual double FramesPerSecond(void) { return framesPerSecond; }
   virtual void SetAudioTrack(eTrackType Type, const tTrackId *TrackId);
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
+  virtual bool GetFrameNumber(int &Current, int &Total);
   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
   };
 
@@ -433,6 +467,8 @@ void cDvbPlayer::Action(void)
         }
      StateKey.Remove();
      }
+  if (readIndex > 0) // will first be incremented in the loop!
+     --readIndex;
 
   nonBlockingFileReader = new cNonBlockingFileReader;
   int Length = 0;
@@ -440,7 +476,7 @@ void cDvbPlayer::Action(void)
   bool WaitingForData = false;
   time_t StuckAtEof = 0;
   uint32_t LastStc = 0;
-  int LastReadIFrame = -1;
+  int LastReadFrame = -1;
   int SwitchToPlayFrame = 0;
   bool CutIn = false;
   bool AtLastMark = false;
@@ -544,12 +580,9 @@ void cDvbPlayer::Action(void)
                    int r = nonBlockingFileReader->Result(&b);
                    if (r > 0) {
                       WaitingForData = false;
-                      uint32_t Pts = 0;
-                      if (readIndependent) {
-                         Pts = isPesRecording ? PesGetPts(b) : TsGetPts(b, r);
-                         LastReadIFrame = readIndex;
-                         }
-                      readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts); // hands over b to the ringBuffer
+                      LastReadFrame = readIndex;
+                      uint32_t Pts = isPesRecording ? (PesHasPts(b) ? PesGetPts(b) : -1) : TsGetPts(b, r);
+                      readFrame = new cFrame(b, -r, ftUnknown, readIndex, Pts, readIndependent); // hands over b to the ringBuffer
                       }
                    else if (r < 0) {
                       if (errno == EAGAIN)
@@ -604,7 +637,7 @@ void cDvbPlayer::Action(void)
                 pc = playFrame->Count();
                 if (p) {
                    if (playFrame->Index() >= 0 && playFrame->Pts() != 0)
-                      ptsIndex.Put(playFrame->Pts(), playFrame->Index());
+                      ptsIndex.Put(playFrame->Pts(), playFrame->Index(), playFrame->Independent());
                    if (firstPacket) {
                       if (isPesRecording) {
                          PlayPes(NULL, 0);
@@ -667,7 +700,7 @@ void cDvbPlayer::Action(void)
              LastStc = Stc;
              int Index = ptsIndex.FindIndex(Stc);
              if (playDir == pdForward && !SwitchToPlayFrame) {
-                if (Index >= LastReadIFrame)
+                if (Index >= LastReadFrame)
                    break; // automatically stop at end of recording
                 }
              else if (Index <= 0 || SwitchToPlayFrame && Index >= SwitchToPlayFrame)
@@ -878,7 +911,7 @@ void cDvbPlayer::Goto(int Index, bool Still)
                  if (playMode == pmPause)
                     DevicePlay();
                  DeviceStillPicture(b, r);
-                 ptsIndex.Put(isPesRecording ? PesGetPts(b) : TsGetPts(b, r), Index);
+                 ptsIndex.Put(isPesRecording ? PesGetPts(b) : TsGetPts(b, r), Index, true);
                  }
               playMode = pmStill;
               readIndex = Index;
@@ -923,6 +956,17 @@ bool cDvbPlayer::GetIndex(int &Current, int &Total, bool SnapToIFrame)
   return false;
 }
 
+bool cDvbPlayer::GetFrameNumber(int &Current, int &Total)
+{
+  if (index) {
+     Current = ptsIndex.FindFrameNumber(DeviceGetSTC());
+     Total = index->Last();
+     return true;
+     }
+  Current = Total = -1;
+  return false;
+}
+
 bool cDvbPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed)
 {
   Play = (playMode == pmPlay || playMode == pmFast);
@@ -1009,6 +1053,15 @@ bool cDvbPlayerControl::GetIndex(int &Current, int &Total, bool SnapToIFrame)
   return false;
 }
 
+bool cDvbPlayerControl::GetFrameNumber(int &Current, int &Total)
+{
+  if (player) {
+     player->GetFrameNumber(Current, Total);
+     return true;
+     }
+  return false;
+}
+
 bool cDvbPlayerControl::GetReplayMode(bool &Play, bool &Forward, int &Speed)
 {
   return player && player->GetReplayMode(Play, Forward, Speed);
diff --git a/dvbplayer.h b/dvbplayer.h
index ef6f1fce7..2fe6e4c91 100644
--- a/dvbplayer.h
+++ b/dvbplayer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.h 4.1 2015/08/02 13:01:44 kls Exp $
+ * $Id: dvbplayer.h 4.2 2016/12/22 10:36:50 kls Exp $
  */
 
 #ifndef __DVBPLAYER_H
@@ -50,6 +50,10 @@ class cDvbPlayerControl : public cControl {
   bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false);
        // Returns the current and total frame index, optionally snapped to the
        // nearest I-frame.
+  bool GetFrameNumber(int &Current, int &Total);
+       // Returns the current and total frame number. In contrast to GetIndex(),
+       // this function respects the chronological order of frames, which is
+       // different from its index for streams containing B frames (e.g. H264)
   bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
        // Returns the current replay mode (if applicable).
        // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
diff --git a/font.c b/font.c
index 29256e052..2a92c34b8 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
  *
  * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
  *
- * $Id: font.c 4.1 2015/04/19 11:13:45 kls Exp $
+ * $Id: font.c 4.2 2016/12/22 12:31:23 kls Exp $
  */
 
 #include "font.h"
@@ -100,6 +100,7 @@ class cFreetypeFont : public cFont {
 private:
   cString fontName;
   int size;
+  int width;
   int height;
   int bottom;
   FT_Library library; ///< Handle to library
@@ -114,6 +115,7 @@ class cFreetypeFont : public cFont {
   virtual ~cFreetypeFont();
   virtual const char *FontName(void) const { return fontName; }
   virtual int Size(void) const { return size; }
+  virtual int Width(void) const { return width; }
   virtual int Width(uint c) const;
   virtual int Width(const char *s) const;
   virtual int Height(void) const { return height; }
@@ -125,6 +127,7 @@ cFreetypeFont::cFreetypeFont(const char *Name, int CharHeight, int CharWidth)
 {
   fontName = Name;
   size = CharHeight;
+  width = CharWidth;
   height = 0;
   bottom = 0;
   int error = FT_Init_FreeType(&library);
@@ -384,10 +387,12 @@ void cFreetypeFont::DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColo
 class cDummyFont : public cFont {
 private:
   int height;
+  int width;
 public:
-  cDummyFont(int CharHeight) { height = CharHeight; }
-  virtual int Width(uint c) const { return height; }
-  virtual int Width(const char *s) const { return height; }
+  cDummyFont(int CharHeight, int CharWidth) { height = CharHeight; width = CharWidth; }
+  virtual int Width(void) const { return width ? width : height; }
+  virtual int Width(uint c) const { return width ? width : height; }
+  virtual int Width(const char *s) const { return width ? width : height; }
   virtual int Height(void) const { return height; }
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
   virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {};
@@ -425,7 +430,7 @@ cFont *cFont::CreateFont(const char *Name, int CharHeight, int CharWidth)
   cString fn = GetFontFileName(Name);
   cFont *f = *fn ? new cFreetypeFont(fn, CharHeight, CharWidth) : NULL;
   if (!f || !f->Height())
-     f = new cDummyFont(CharHeight);
+     f = new cDummyFont(CharHeight, CharWidth);
   return f;
 }
 
diff --git a/font.h b/font.h
index 3932f602e..9d18bde25 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 4.0 2014/01/07 12:11:55 kls Exp $
+ * $Id: font.h 4.2 2016/12/22 12:43:24 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -43,7 +43,11 @@ class cFont {
           ///< Returns the font name.
   virtual int Size(void) const { return Height(); }
           ///< Returns the original size as requested when the font was created.
-          ///< This may be different than the actual height.
+          ///< This may be smaller than the actual height, for instance if the
+          ///< font contains descenders.
+  virtual int Width(void) const = 0;
+          ///< Returns the original character width as requested when the font was
+          ///< created, or 0 if the default width is used.
   virtual int Width(uint c) const = 0;
           ///< Returns the width of the given character in pixel.
   virtual int Width(const char *s) const = 0;
diff --git a/menu.c b/menu.c
index 569900ce3..30c95f8d6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.12 2015/09/14 13:22:49 kls Exp $
+ * $Id: menu.c 4.19 2016/12/22 11:00:13 kls Exp $
  */
 
 #include "menu.h"
@@ -498,6 +498,7 @@ eOSState cMenuChannels::Delete(void)
      int DeletedChannel = Channel->Number();
      // Check if there is a timer using this channel:
      if (Timers->UsesChannel(Channel)) {
+        channelsStateKey.Remove(false);
         Skins.Message(mtError, tr("Channel is being used by a timer!"));
         return osContinue;
         }
@@ -519,7 +520,7 @@ eOSState cMenuChannels::Delete(void)
            if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
               Channels->SwitchTo(CurrentChannel->Number());
            else
-              cDevice::SetCurrentChannel(CurrentChannel);
+              cDevice::SetCurrentChannel(CurrentChannel->Number());
            }
         }
      channelsStateKey.Remove(Deleted);
@@ -546,7 +547,7 @@ void cMenuChannels::Move(int From, int To)
            if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
               Channels->SwitchTo(CurrentChannel->Number());
            else
-              cDevice::SetCurrentChannel(CurrentChannel);
+              cDevice::SetCurrentChannel(CurrentChannel->Number());
            }
         }
      channelsStateKey.Remove();
@@ -2686,14 +2687,15 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
   cRecordings *Recordings = cRecordings::GetRecordingsWrite(StateKey);
   cRecording *Recording = Recordings->GetByName(recording->FileName());
   if (!Recording) {
+     StateKey.Remove(false);
      Skins.Message(mtWarning, tr("Recording vanished!"));
      return osBack;
      }
   bool Modified = false;
   if (priority != recording->Priority() || lifetime != recording->Lifetime()) {
      if (!Recording->ChangePriorityLifetime(priority, lifetime)) {
-        Skins.Message(mtError, tr("Error while changing priority/lifetime!"));
         StateKey.Remove(Modified);
+        Skins.Message(mtError, tr("Error while changing priority/lifetime!"));
         return osContinue;
         }
      Modified = true;
@@ -2706,8 +2708,8 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
   NewName.CompactChars(FOLDERDELIMCHAR);
   if (strcmp(NewName, Recording->Name())) {
      if (!Recording->ChangeName(NewName)) {
-        Skins.Message(mtError, tr("Error while changing folder/name!"));
         StateKey.Remove(Modified);
+        Skins.Message(mtError, tr("Error while changing folder/name!"));
         return osContinue;
         }
      Modified = true;
@@ -2953,10 +2955,9 @@ void cMenuRecordings::Set(bool Refresh)
      const char *CurrentRecording = *fileName ? *fileName : cReplayControl::LastReplayed();
      cRecordings *Recordings = cRecordings::GetRecordingsWrite(recordingsStateKey); // write access is necessary for sorting!
      cMenuRecordingItem *LastItem = NULL;
-     if (Refresh) {
-        if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
-           CurrentRecording = ri->Recording()->FileName();
-        }
+     if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
+        CurrentRecording = ri->Recording()->FileName();
+     int current = Current();
      Clear();
      GetRecordingsSortMode(DirectoryName());
      Recordings->Sort();
@@ -2993,11 +2994,13 @@ void cMenuRecordings::Set(bool Refresh)
                LastDir->IncrementCounter(Recording->IsNew());
             }
          }
+     if (Current() < 0)
+        SetCurrent(Get(current)); // last resort, in case the recording was deleted
      SetMenuSortMode(RecordingsSortMode == rsmName ? msmName : msmTime);
      recordingsStateKey.Remove(false); // sorting doesn't count as a real modification
+     if (Refresh)
+        Display();
      }
-  if (Refresh)
-     Display();
 }
 
 void cMenuRecordings::SetPath(const char *Path)
@@ -3087,38 +3090,32 @@ eOSState cMenuRecordings::Delete(void)
            else
               return osContinue;
            }
-        cRecordings *Recordings = cRecordings::GetRecordingsWrite(recordingsStateKey);
-        Recordings->SetExplicitModify();
-        cRecording *Recording = Recordings->GetByName(ri->Recording()->FileName());
-        if (!Recording) {
-           Skins.Message(mtWarning, tr("Recording vanished!"));
-           recordingsStateKey.Remove();
-           return osContinue;
-           }
-        cString FileName = Recording->FileName();
-        if (RecordingsHandler.GetUsage(FileName)) {
-           if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
-              RecordingsHandler.Del(FileName);
-              Recording = Recordings->GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version
-              // we continue with the code below even if Recording is NULL,
-              // in order to have the menu updated etc.
-              }
-           else {
-              recordingsStateKey.Remove();
-              return osContinue;
-              }
-           }
+        cString FileName;
+        {
+          LOCK_RECORDINGS_READ;
+          if (const cRecording *Recording = Recordings->GetByName(ri->Recording()->FileName())) {
+             FileName = Recording->FileName();
+             if (RecordingsHandler.GetUsage(FileName)) {
+                if (!Interface->Confirm(tr("Recording is being edited - really delete?")))
+                   return osContinue;
+                }
+             }
+        }
+        RecordingsHandler.Del(FileName); // must do this w/o holding a lock, because the cleanup section in cDirCopier::Action() might request one!
         if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), FileName) == 0)
            cControl::Shutdown();
+        cRecordings *Recordings = cRecordings::GetRecordingsWrite(recordingsStateKey);
+        Recordings->SetExplicitModify();
+        cRecording *Recording = Recordings->GetByName(FileName);
         if (!Recording || Recording->Delete()) {
            cReplayControl::ClearLastReplayed(FileName);
            Recordings->DelByName(FileName);
            cOsdMenu::Del(Current());
            SetHelpKeys();
            cVideoDiskUsage::ForceCheck();
-           Display();
            Recordings->SetModified();
            recordingsStateKey.Remove();
+           Display();
            if (!Count())
               return osBack;
            return osUser2;
@@ -3171,8 +3168,6 @@ eOSState cMenuRecordings::Sort(void)
 
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
-  if (!HasSubMenu())
-     Set(); // react on any changes to the recordings list
   bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
@@ -3198,7 +3193,8 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
         return state; // closes all recording menus except for the top one
      Set(); // this is the top level menu, so we refresh it...
      Open(true); // ...and open any necessary submenus to show the new name
-     Display();
+     if (!HasSubMenu())
+        Display();
      path = NULL;
      fileName = NULL;
      }
@@ -3210,14 +3206,16 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
            ri->SetRecording(riSub->Recording());
         }
      }
-  if (Key == kYellow && HadSubMenu && !HasSubMenu()) {
-     // the last recording in a subdirectory was deleted, so let's go back up
-     cOsdMenu::Del(Current());
-     if (!Count())
-        return osBack;
-     Display();
-     }
   if (!HasSubMenu()) {
+     if (HadSubMenu) {
+        if (Key == kYellow) {
+           // the last recording in a subdirectory was deleted, so let's go back up
+           cOsdMenu::Del(Current());
+           if (!Count())
+              return osBack;
+           }
+        }
+     Set(true);
      if (Key != kNone)
         SetHelpKeys();
      }
@@ -5437,6 +5435,7 @@ cReplayControl::cReplayControl(bool PauseLive)
   lastPlay = lastForward = false;
   lastSpeed = -2; // an invalid value
   timeoutShow = 0;
+  lastProgressUpdate = 0;
   timeSearchActive = false;
   cRecording Recording(fileName);
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
@@ -5585,41 +5584,43 @@ void cReplayControl::ShowMode(void)
 bool cReplayControl::ShowProgress(bool Initial)
 {
   int Current, Total;
-
-  if (GetIndex(Current, Total) && Total > 0) {
-     if (!visible) {
-        displayReplay = Skins.Current()->DisplayReplay(modeOnly);
-        displayReplay->SetMarks(&marks);
-        SetNeedsFastResponse(true);
-        visible = true;
-        }
-     if (Initial) {
-        if (*fileName) {
-           LOCK_RECORDINGS_READ;
-           if (const cRecording *Recording = Recordings->GetByName(fileName))
-              displayReplay->SetRecording(Recording);
+  if (Initial || time(NULL) - lastProgressUpdate >= 1) {
+     if (GetFrameNumber(Current, Total) && Total > 0) {
+        if (!visible) {
+           displayReplay = Skins.Current()->DisplayReplay(modeOnly);
+           displayReplay->SetMarks(&marks);
+           SetNeedsFastResponse(true);
+           visible = true;
            }
-        lastCurrent = lastTotal = -1;
-        }
-     if (Current != lastCurrent || Total != lastTotal) {
-        if (Setup.ShowRemainingTime || Total != lastTotal) {
-           int Index = Total;
-           if (Setup.ShowRemainingTime)
-              Index = Current - Index;
-           displayReplay->SetTotal(IndexToHMSF(Index, false, FramesPerSecond()));
+        if (Initial) {
+           if (*fileName) {
+              LOCK_RECORDINGS_READ;
+              if (const cRecording *Recording = Recordings->GetByName(fileName))
+                 displayReplay->SetRecording(Recording);
+              }
+           lastCurrent = lastTotal = -1;
+           }
+        if (Current != lastCurrent || Total != lastTotal) {
+           time(&lastProgressUpdate);
+           if (Setup.ShowRemainingTime || Total != lastTotal) {
+              int Index = Total;
+              if (Setup.ShowRemainingTime)
+                 Index = Current - Index;
+              displayReplay->SetTotal(IndexToHMSF(Index, false, FramesPerSecond()));
+              if (!Initial)
+                 displayReplay->Flush();
+              }
+           displayReplay->SetProgress(Current, Total);
            if (!Initial)
               displayReplay->Flush();
-           }
-        displayReplay->SetProgress(Current, Total);
-        if (!Initial)
+           displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames, FramesPerSecond()));
            displayReplay->Flush();
-        displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames, FramesPerSecond()));
-        displayReplay->Flush();
-        lastCurrent = Current;
+           lastCurrent = Current;
+           }
+        lastTotal = Total;
+        ShowMode();
+        return true;
         }
-     lastTotal = Total;
-     ShowMode();
-     return true;
      }
   return false;
 }
@@ -5860,6 +5861,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
      return osEnd;
   if (Key == kNone && !marksModified)
      marks.Update();
+  if (Key != kNone)
+     lastProgressUpdate = 0;
   if (visible) {
      if (timeoutShow && time(NULL) > timeoutShow) {
         Hide();
diff --git a/menu.h b/menu.h
index 3f2878b32..9a971ad01 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 4.4 2015/09/13 14:17:56 kls Exp $
+ * $Id: menu.h 4.5 2016/12/22 10:55:36 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -300,6 +300,7 @@ class cReplayControl : public cDvbPlayerControl {
   bool lastPlay, lastForward;
   int lastSpeed;
   time_t timeoutShow;
+  time_t lastProgressUpdate;
   bool timeSearchActive, timeSearchHide;
   int timeSearchTime, timeSearchPos;
   void TimeSearchDisplay(void);
diff --git a/nit.c b/nit.c
index 864fdac28..874367f30 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 4.3 2015/07/26 09:24:36 kls Exp $
+ * $Id: nit.c 4.4 2016/12/23 14:16:59 kls Exp $
  */
 
 #include "nit.h"
@@ -114,7 +114,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
                  dtp.SetRollOff(sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
-                 dbgnit("    %s %d %c %d %d\n", *cSource::ToString(Source), Frequency, Polarizations[sd->getPolarization()], SymbolRate, cChannel::Transponder(Frequency, Polarizations[sd->getPolarization()]));
+                 dbgnit("    %s %d %c %d %d\n", *cSource::ToString(Source), Frequency, dtp.Polarization(), SymbolRate, cChannel::Transponder(Frequency, dtp.Polarization()));
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;
@@ -177,7 +177,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  static int Modulations[] = { QPSK, QAM_16, QAM_32, QAM_64, QAM_128, QAM_256, QAM_AUTO };
                  dtp.SetModulation(Modulations[min(sd->getModulation(), 6)]);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
-                 dbgnit("    %s %d %d %d %d\n", *cSource::ToString(Source), Frequency, CodeRates[sd->getFecInner()], Modulations[min(sd->getModulation(), 6)], SymbolRate);
+                 dbgnit("    %s %d %d %d %d\n", *cSource::ToString(Source), Frequency, dtp.CoderateH(), dtp.Modulation(), SymbolRate);
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;
@@ -233,7 +233,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  dtp.SetGuard(GuardIntervals[sd->getGuardInterval()]);
                  static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_4K, TRANSMISSION_MODE_AUTO };
                  dtp.SetTransmission(TransmissionModes[sd->getTransmissionMode()]);
-                 dbgnit("    %s %d %d %d %d %d %d %d %d\n", *cSource::ToString(Source), Frequency, Bandwidths[sd->getBandwidth()], Constellations[sd->getConstellation()], Hierarchies[sd->getHierarchy()], CodeRates[sd->getCodeRateHP()], CodeRates[sd->getCodeRateLP()], GuardIntervals[sd->getGuardInterval()], TransmissionModes[sd->getTransmissionMode()]);
+                 dbgnit("    %s %d %d %d %d %d %d %d %d\n", *cSource::ToString(Source), Frequency, dtp.Bandwidth(), dtp.Modulation(), dtp.Hierarchy(), dtp.CoderateH(), dtp.CoderateL(), dtp.Guard(), dtp.Transmission());
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;
@@ -310,9 +310,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     SI::LogicalChannelDescriptor *lcd = (SI::LogicalChannelDescriptor *)d;
                     SI::LogicalChannelDescriptor::LogicalChannel LogicalChannel;
                     for (SI::Loop::Iterator it4; lcd->logicalChannelLoop.getNext(LogicalChannel, it4); ) {
-                        int lcn = LogicalChannel.getLogicalChannelNumber();
-                        int sid = LogicalChannel.getServiceId();
                         if (LogicalChannel.getVisibleServiceFlag()) {
+                           int lcn = LogicalChannel.getLogicalChannelNumber();
+                           int sid = LogicalChannel.getServiceId();
                            for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                                if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                                   ChannelsModified |= Channel->SetLcn(lcn);
@@ -328,9 +328,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     SI::HdSimulcastLogicalChannelDescriptor *lcd = (SI::HdSimulcastLogicalChannelDescriptor *)d;
                     SI::HdSimulcastLogicalChannelDescriptor::HdSimulcastLogicalChannel HdSimulcastLogicalChannel;
                     for (SI::Loop::Iterator it4; lcd->hdSimulcastLogicalChannelLoop.getNext(HdSimulcastLogicalChannel, it4); ) {
-                        int lcn = HdSimulcastLogicalChannel.getLogicalChannelNumber();
-                        int sid = HdSimulcastLogicalChannel.getServiceId();
                         if (HdSimulcastLogicalChannel.getVisibleServiceFlag()) {
+                           int lcn = HdSimulcastLogicalChannel.getLogicalChannelNumber();
+                           int sid = HdSimulcastLogicalChannel.getServiceId();
                            for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                                if (!Channel->GroupSep() && Channel->Sid() == sid && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                                   ChannelsModified |= Channel->SetLcn(lcn);
diff --git a/pat.c b/pat.c
index beb5609a1..e40d2d5fe 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 4.1 2015/08/17 08:46:55 kls Exp $
+ * $Id: pat.c 4.3 2016/12/23 14:02:07 kls Exp $
  */
 
 #include "pat.h"
@@ -81,7 +81,7 @@ class cCaDescriptors : public cListObject {
   bool Is(cCaDescriptors * CaDescriptors);
   bool Empty(void) { return caDescriptors.Count() == 0; }
   void AddCaDescriptor(SI::CaDescriptor *d, int EsPid);
-  int GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
+  void GetCaDescriptors(const int *CaSystemIds, cDynamicBuffer &Buffer, int EsPid);
   int GetCaPids(const int *CaSystemIds, int BufSize, int *Pids);
   const int GetPmtPid(void) { return pmtPid; };
   const int *CaIds(void) { return caIds; }
@@ -159,30 +159,20 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, int EsPid)
 // =0 - common CaDescriptor
 // <0 - all CaDescriptors regardless of type (old default)
 
-int cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
+void cCaDescriptors::GetCaDescriptors(const int *CaSystemIds, cDynamicBuffer &Buffer, int EsPid)
 {
+  Buffer.Clear();
   if (!CaSystemIds || !*CaSystemIds)
-     return 0;
-  if (BufSize > 0 && Data) {
-     int length = 0;
-     for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
-         if (EsPid < 0 || d->EsPid() == EsPid) {
-            const int *caids = CaSystemIds;
-            do {
-               if (*caids == 0xFFFF || d->CaSystem() == *caids) {
-                  if (length + d->Length() <= BufSize) {
-                     memcpy(Data + length, d->Data(), d->Length());
-                     length += d->Length();
-                     }
-                  else
-                     return -1;
-                  }
-               } while (*++caids);
-            }
+     return;
+  for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
+      if (EsPid < 0 || d->EsPid() == EsPid) {
+         const int *caids = CaSystemIds;
+         do {
+            if (*caids == 0xFFFF || d->CaSystem() == *caids)
+               Buffer.Append(d->Data(), d->Length());
+            } while (*++caids);
          }
-     return length;
-     }
-  return -1;
+      }
 }
 
 int cCaDescriptors::GetCaPids(const int *CaSystemIds, int BufSize, int *Pids)
@@ -219,7 +209,7 @@ class cCaDescriptorHandler : public cList<cCaDescriptors> {
       // Returns 0 if this is an already known descriptor,
       // 1 if it is an all new descriptor with actual contents,
       // and 2 if an existing descriptor was changed.
-  int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
+  void GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, cDynamicBuffer &Buffer, int EsPid);
   int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
   int GetPmtPid(int Source, int Transponder, int ServiceId);
   };
@@ -242,14 +232,15 @@ int cCaDescriptorHandler::AddCaDescriptors(cCaDescriptors *CaDescriptors)
   return CaDescriptors->Empty() ? 0 : 1;
 }
 
-int cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
+void cCaDescriptorHandler::GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, cDynamicBuffer &Buffer, int EsPid)
 {
   cMutexLock MutexLock(&mutex);
   for (cCaDescriptors *ca = First(); ca; ca = Next(ca)) {
-      if (ca->Is(Source, Transponder, ServiceId))
-         return ca->GetCaDescriptors(CaSystemIds, BufSize, Data, EsPid);
+      if (ca->Is(Source, Transponder, ServiceId)) {
+         ca->GetCaDescriptors(CaSystemIds, Buffer, EsPid);
+         break;
+         }
       }
-  return 0;
 }
 
 int cCaDescriptorHandler::GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids)
@@ -274,9 +265,9 @@ int cCaDescriptorHandler::GetPmtPid(int Source, int Transponder, int ServiceId)
 
 cCaDescriptorHandler CaDescriptorHandler;
 
-int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid)
+void GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, cDynamicBuffer &Buffer, int EsPid)
 {
-  return CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, BufSize, Data, EsPid);
+  CaDescriptorHandler.GetCaDescriptors(Source, Transponder, ServiceId, CaSystemIds, Buffer, EsPid);
 }
 
 int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids)
@@ -439,6 +430,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
               case 1: // STREAMTYPE_11172_VIDEO
               case 2: // STREAMTYPE_13818_VIDEO
               case 0x1B: // H.264
+              case 0x24: // H.265
                       Vpid = esPid;
                       Ppid = pmt.getPCRPid();
                       Vtype = stream.getStreamType();
diff --git a/pat.h b/pat.h
index 557d599c6..b9929754e 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.h 4.0 2015/01/04 13:17:22 kls Exp $
+ * $Id: pat.h 4.1 2016/12/23 14:03:24 kls Exp $
  */
 
 #ifndef __PAT_H
@@ -38,14 +38,12 @@ class cPatFilter : public cFilter {
   void Trigger(int Sid = -1);
   };
 
-int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, int EsPid);
+void GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, cDynamicBuffer &Buffer, int EsPid);
          ///< Gets all CA descriptors for a given channel.
          ///< Copies all available CA descriptors for the given Source, Transponder and ServiceId
-         ///< into the provided buffer at Data (at most BufSize bytes). Only those CA descriptors
+         ///< into the provided buffer. Only those CA descriptors
          ///< are copied that match one of the given CA system IDs (or all of them, if CaSystemIds
          ///< is 0xFFFF).
-         ///< Returns the number of bytes copied into Data (0 if no CA descriptors are
-         ///< available), or -1 if BufSize was too small to hold all CA descriptors.
 
 int GetCaPids(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, int *Pids);
          ///< Gets all CA pids for a given channel.
diff --git a/player.h b/player.h
index d9ed964ac..aeb8af8f1 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 4.0 2013/12/25 13:25:02 kls Exp $
+ * $Id: player.h 4.2 2016/12/22 10:38:11 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -57,6 +57,10 @@ class cPlayer {
   virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return false; }
        // Returns the current and total frame index, optionally snapped to the
        // nearest I-frame.
+  virtual bool GetFrameNumber(int &Current, int &Total) { return false; }
+       // Returns the current and total frame number. In contrast to GetIndex(),
+       // this function respects the chronological order of frames, which is
+       // different from its index for streams containing B frames (e.g. H264)
   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return false; }
        // Returns the current replay mode (if applicable).
        // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
@@ -98,9 +102,10 @@ class cControl : public cOsdObject {
          ///< skins as a last resort, in case they want to display the state of the
          ///< current player. The return value is expected to be a short, single line
          ///< string. The default implementation returns an empty string.
-  double FramesPerSecond(void) { return player->FramesPerSecond(); }
-  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
-  bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
+  double FramesPerSecond(void) const { return player->FramesPerSecond(); }
+  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) const { return player->GetIndex(Current, Total, SnapToIFrame); }
+  bool GetFrameNumber(int &Current, int &Total) const { return player->GetFrameNumber(Current, Total); }
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed) const { return player->GetReplayMode(Play, Forward, Speed); }
   static void Launch(cControl *Control);
   static void Attach(void);
   static void Shutdown(void);
diff --git a/po/et_EE.po b/po/et_EE.po
index 2f6e0de05..467119e63 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -68,7 +68,7 @@ msgid "Transmission"
 msgstr "Transmissioon"
 
 msgid "Guard"
-msgstr "Kaitseintervall"
+msgstr "Kaitsevahemik"
 
 msgid "Hierarchy"
 msgstr "Hierarhia"
@@ -326,7 +326,7 @@ msgid "Content$Unpublished"
 msgstr "Avaldamata"
 
 msgid "Content$Live Broadcast"
-msgstr "Otseülekanne"
+msgstr "Telepilt"
 
 #, c-format
 msgid "ParentalRating$from %d"
@@ -477,7 +477,7 @@ msgid "Key$Subtitles"
 msgstr "Subtiitrid"
 
 msgid "Key$Schedule"
-msgstr "Kava"
+msgstr "Ajakava"
 
 msgid "Key$Channels"
 msgstr "Kanalid"
@@ -486,10 +486,10 @@ msgid "Key$Timers"
 msgstr "Taimerid"
 
 msgid "Key$Recordings"
-msgstr "Salvestused"
+msgstr "Salvestised"
 
 msgid "Key$Setup"
-msgstr "Sätted"
+msgstr "Seadistamine"
 
 msgid "Key$Commands"
 msgstr "Käsud"
@@ -528,7 +528,7 @@ msgid "Free To Air"
 msgstr "FTA"
 
 msgid "encrypted"
-msgstr "krüptitud"
+msgstr "kodeeritud"
 
 msgid "Edit channel"
 msgstr "Kanali muutmine"
@@ -588,16 +588,16 @@ msgid "Channels"
 msgstr "Kanalid"
 
 msgid "Button$Edit"
-msgstr "Muutmine"
+msgstr "Muuda"
 
 msgid "Button$New"
 msgstr "Uus"
 
 msgid "Button$Delete"
-msgstr "Kustutada"
+msgstr "Kustuta"
 
 msgid "Button$Mark"
-msgstr "Märkimine"
+msgstr "Märgi"
 
 msgid "Channel is being used by a timer!"
 msgstr "Kanal on taimeris kasutusel!"
@@ -606,7 +606,7 @@ msgid "Delete channel?"
 msgstr "Kustutada kanal?"
 
 msgid "Edit folder"
-msgstr "Kausta muutmine"
+msgstr "Muuda kausta"
 
 msgid "New folder"
 msgstr "Uus kaust"
@@ -622,7 +622,7 @@ msgid "Folder name must not contain '%c'!"
 msgstr "Kausta nimi ei saa sisaldada '%c' sümbolit!"
 
 msgid "Button$Open"
-msgstr "Avada"
+msgstr "Ava"
 
 msgid "Delete folder and all sub folders?"
 msgstr "Kustutada kaust ja kõik alamkaustad?"
@@ -631,7 +631,7 @@ msgid "Delete folder?"
 msgstr "Kustutada kaust?"
 
 msgid "Edit timer"
-msgstr "Taimeri redigeerimine"
+msgstr "Muuda taimer"
 
 msgid "Active"
 msgstr "Aktiivne"
@@ -661,13 +661,13 @@ msgid "File"
 msgstr "Fail"
 
 msgid "Record on"
-msgstr ""
+msgstr "Salvestamine"
 
 msgid "Button$Folder"
 msgstr "Kaust"
 
 msgid "Button$Single"
-msgstr "Üks kord"
+msgstr "Üksik"
 
 msgid "Button$Repeating"
 msgstr "Korduv"
@@ -676,13 +676,13 @@ msgid "First day"
 msgstr "1. päev"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Kaugtaimeri viga"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Taimer kustutatud"
 
 msgid "Select folder"
-msgstr "Kausta valik"
+msgstr "Vali kaust"
 
 msgid "Timers"
 msgstr "Taimerid"
@@ -700,38 +700,38 @@ msgid "Timer still recording - really delete?"
 msgstr "Salvestus aktiivne - kas kustutada?"
 
 msgid "Event"
-msgstr "Saade"
+msgstr "Saateinfo"
 
 msgid "Button$Timer"
 msgstr "Taimer"
 
 msgid "Button$Record"
-msgstr "Salvestada"
+msgstr "Salvesta"
 
 msgid "Button$Switch"
 msgstr "Vali"
 
 msgid "What's on now?"
-msgstr "Hetkel eetris"
+msgstr "Hetkel"
 
 msgid "What's on next?"
-msgstr "Järgmisena eetris"
+msgstr "Järgmine"
 
 msgid "Button$Next"
-msgstr "Tulekul"
+msgstr "Järgmine"
 
 msgid "Button$Now"
 msgstr "Hetkel"
 
 msgid "Button$Schedule"
-msgstr "Kava"
+msgstr "Ajakava"
 
 msgid "Can't switch channel!"
 msgstr "Kanali vahetus ei ole võimalik!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "Kava - %s"
+msgstr "Ajakava - %s"
 
 #, c-format
 msgid "This event - %s"
@@ -761,55 +761,55 @@ msgstr "Kaust on juba kasutusel - muutmine ei ole võimalik!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr "Teisaldada kaust mis sisaldab %d salvestust?"
+msgstr "Liigutada kaust mis sisaldab %d salvestist?"
 
 msgid "Error while moving folder!"
-msgstr "Kausta teisaldamise viga!"
+msgstr "Kausta liigutamise viga!"
 
 msgid "Edit recording"
-msgstr "Salvestuse redigeerimine"
+msgstr "Muuda salvestist"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr "Salvestus hetkel kasutusel - muutmine ei ole võimalik!"
+msgstr "Salvestis hetkel kasutusel - muutmine ei ole võimalik!"
 
 msgid "Button$Cancel cutting"
-msgstr "Lõikamise tühistamine"
+msgstr "Tühista lõikamine"
 
 msgid "Button$Stop cutting"
-msgstr "Lõikamise peatamine"
+msgstr "Peata lõikamine"
 
 msgid "Button$Cancel moving"
-msgstr "Teisaldamise tühistamine"
+msgstr "Tühista liigutamine"
 
 msgid "Button$Stop moving"
-msgstr "Teisaldamise peatamine"
+msgstr "Peata liigutamine"
 
 msgid "Button$Cancel copying"
-msgstr "Kopeerimise tühistamine"
+msgstr "Tühista kopeerimine"
 
 msgid "Button$Stop copying"
-msgstr "Kopeerimise peatamine"
+msgstr "Peata kopeerimine"
 
 msgid "Button$Cut"
 msgstr "Lõika"
 
 msgid "Button$Delete marks"
-msgstr "Markerite kustutamine"
+msgstr "Kustuta markerid"
 
 msgid "Recording vanished!"
-msgstr "Salvestus kadunud!"
+msgstr "Salvestis puudub!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr "Redigeeritud versioon juba olemas - kirjutada üle?"
+msgstr "Muudetud versioon juba olemas - kirjutada üle?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr "Salvestuse lisamine lõikamiseks ebaõnnestus!"
+msgstr "Salvestise lisamine lõikamiseks ebaõnnestus!"
 
 msgid "Rename recording to folder name?"
-msgstr "Nimetada salvestuse nimi kaustaks?"
+msgstr "Ümbernimetada kaust salvestise nimega?"
 
 msgid "Delete editing marks for this recording?"
-msgstr "Kustutada selle salvestuse markerid?"
+msgstr "Kustutada selle salvestise markerid?"
 
 msgid "Error while deleting editing marks!"
 msgstr "Markerite kustutamine ebaõnnestus!"
@@ -821,55 +821,55 @@ msgid "Error while changing folder/name!"
 msgstr "Kausta/nime muutmine ebaõnnestus!"
 
 msgid "Recording info"
-msgstr "Salvestuse info"
+msgstr "Salvestise info"
 
 msgid "Button$Play"
 msgstr "Start"
 
 msgid "Button$Rewind"
-msgstr "Algusesse"
+msgstr "Tagasikerimine"
 
 msgid "Recordings"
-msgstr "Salvestused"
+msgstr "Salvestised"
 
 msgid "Commands"
 msgstr "Käsud"
 
 msgid "Delete recording?"
-msgstr "Kustutada salvestus?"
+msgstr "Kustutada salvestis?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "Salvestust on muudetud - kas kustutada?"
+msgstr "Salvestist on muudetud - kas kustutada?"
 
 msgid "Error while deleting recording!"
-msgstr "Salvestuse kustutamine ebaõnnestus!"
+msgstr "Salvestise kustutamine ebaõnnestus!"
 
 msgid "Recording commands"
 msgstr "Salvestuse käsud"
 
 msgid "never"
-msgstr "ealeski"
+msgstr "mitte kunagi"
 
 msgid "skin dependent"
-msgstr "kestast sõltuv"
+msgstr "kujundusest sõltuv"
 
 msgid "always"
 msgstr "alati"
 
 msgid "by name"
-msgstr ""
+msgstr "nime järgi"
 
 msgid "by time"
-msgstr ""
+msgstr "aja järgi"
 
 msgid "OSD"
-msgstr "Ekraanikuva"
+msgstr "OSD"
 
 msgid "Setup.OSD$Language"
 msgstr "Keel"
 
 msgid "Setup.OSD$Skin"
-msgstr "Kest"
+msgstr "Kujundus"
 
 msgid "Setup.OSD$Theme"
 msgstr "Teema"
@@ -893,7 +893,7 @@ msgid "Setup.OSD$Use small font"
 msgstr "Väikese fondi kasutus"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Fondi sakitõrje"
+msgstr "Fondi silumine"
 
 msgid "Setup.OSD$Default font"
 msgstr "Vaikefont"
@@ -902,7 +902,7 @@ msgid "Setup.OSD$Small font"
 msgstr "Väike font"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Fikseeritud font"
+msgstr "Püsisammuga font"
 
 msgid "Setup.OSD$Default font size (%)"
 msgstr "Vaikefondi suurus (%)"
@@ -911,7 +911,7 @@ msgid "Setup.OSD$Small font size (%)"
 msgstr "Väikese fondi suurus (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Fiks. fondi suurus (%)"
+msgstr "Püsisammuga fondi suurus (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Kanaliinfo asukoht"
@@ -929,7 +929,7 @@ msgid "Setup.OSD$Info on channel switch"
 msgstr "Kanaliinfo kuvamine"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Kanaliinfo ajapiirang"
+msgstr "Kanaliinfo aegumine"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Lehekülje kerimine"
@@ -941,16 +941,16 @@ msgid "Setup.OSD$Menu key closes"
 msgstr "Sulgemine Menüü klahviga"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Kausta nime salvestamine"
+msgstr "Salvestise kaustade kuvamine"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "Kaustad taimeri menüüs"
+msgstr "Kaustade kuvamine taimeri menüüs"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr "Sorteerida kaustad alati ette"
+msgstr "Järjesta kaustad alati ette"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Salvestiste vaikimisi järjestus"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
@@ -971,7 +971,7 @@ msgid "EPG"
 msgstr "EPG"
 
 msgid "Button$Scan"
-msgstr "Uuendada"
+msgstr "Uuenda"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG skaneerimise viide (h)"
@@ -983,10 +983,10 @@ msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vana EPG viide (min)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "Kella sünkroniseerimine"
+msgstr "Süsteemi aja sünkimine"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Sünkroniseerimise transponder"
+msgstr "Sünkimise transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -1009,7 +1009,7 @@ msgid "no"
 msgstr "ei"
 
 msgid "names only"
-msgstr "nimed"
+msgstr "ainult nimed"
 
 msgid "PIDs only"
 msgstr "PID-id"
@@ -1097,7 +1097,7 @@ msgid "Setup.LNB$own"
 msgstr "oma"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr "Antenni positsioneerija kasutamine"
+msgstr "Ajami kasutamine"
 
 msgid "Setup.LNB$Site latitude (degrees)"
 msgstr "Asukoha laiuskraad (°)"
@@ -1118,32 +1118,32 @@ msgid "East"
 msgstr "itta (E)"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr "Positsioneerija pöördeulatus (°)"
+msgstr "Ajami pöördeulatus (°)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr "Positsioneerija kiirus (°/s)"
+msgstr "Ajami kiirus (°/s)"
 
 msgid "CAM reset"
 msgstr "CAM taaskäivitamine"
 
 msgid "CAM present"
-msgstr "CAM esitletud"
+msgstr "CAM saadaval"
 
 msgid "CAM ready"
-msgstr "CAM töövalmis"
+msgstr "CAM valmis"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
 msgstr " (aktiveerimine)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ seade"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr "Aktiveerimise tühistamine"
+msgstr "Tühista aktiveerimine"
 
 msgid "Button$Activate"
 msgstr "Aktiveeri"
@@ -1152,7 +1152,7 @@ msgid "Button$Menu"
 msgstr "Menüü"
 
 msgid "Button$Reset"
-msgstr "Reset"
+msgstr "Lähtesta"
 
 msgid "Opening CAM menu..."
 msgstr "CAM-menüü avamine..."
@@ -1164,61 +1164,61 @@ msgid "Can't activate CAM!"
 msgstr "Ei saa CAM'i aktiveerida!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM on kasutuses - taaskäivitada?"
+msgstr "CAM on kasutuses - lähtestada?"
 
 msgid "Can't reset CAM!"
-msgstr "CAM mooduli taaskäivitus ebaõnnestus!"
+msgstr "CAM mooduli lähtestamine ebaõnnestus!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "kohene salvestus puudub"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "kinnita kohene salvestus"
 
 msgid "record instantly"
-msgstr ""
+msgstr "kohene salvestus"
 
 msgid "do not pause live video"
 msgstr "mitte peatada"
 
 msgid "confirm pause live video"
-msgstr "peatam. kinnitus"
+msgstr "peatamise kinnitus"
 
 msgid "pause live video"
-msgstr "peatada"
+msgstr "peata"
 
 msgid "confirm"
-msgstr "kinnitada"
+msgstr "kinnita"
 
 msgid "yes"
 msgstr "jah"
 
 msgid "Recording"
-msgstr "Salvestamine"
+msgstr "Salvestus"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Salvestamise algusvaru (min)"
+msgstr "Salvestuse algusvaru (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Salvestamise lõpuvaru (min)"
+msgstr "Salvestuse lõpuvaru (min)"
 
 msgid "Setup.Recording$Default priority"
 msgstr "Vaikimisi prioriteet"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Salvestuse eluiga (päevi)"
+msgstr "Salvestuse eluiga (päevad)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Salvestuse klahvi käsitlus"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Pausi klahvi käsitlemine"
+msgstr "Pausi klahvi käsitlus"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Pausi prioriteet"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Pausi eluiga (päevi)"
+msgstr "Pausi eluiga (päevad)"
 
 msgid "Setup.Recording$Use episode name"
 msgstr "Episoodinime kasutamine"
@@ -1230,37 +1230,37 @@ msgid "Setup.Recording$VPS margin (s)"
 msgstr "VPS-i algusvaru (s)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "Kiirsalvestuse märgistamine"
+msgstr "Kohese salvestuse märgistamine"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "Kiirsalvestuse nimi"
+msgstr "Kohese salvestuse nimi"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "Kiirsalvestuse kestus (min)"
+msgstr "Kohese salvestuse kestus (min)"
 
 msgid "Setup.Recording$present event"
-msgstr "hetkesündmus"
+msgstr "käesolev saade"
 
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Maks. failisuurus (MB)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "Redigeeritud failide tükeldamine"
+msgstr "Tükelda muudetud faile"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "Ajanihke salvestuse kustutamine"
+msgstr "Kustuta ajanihke salvestisi"
 
 msgid "Replay"
 msgstr "Taasesitus"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Mitmikkiiruse režiim"
+msgstr "Mitme kiiruse režiim"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Korduse režiimi kuvamine"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr "Järelejäänud aja kuvamine"
+msgstr "Kuva jäänud aega"
 
 msgid "Setup.Replay$Progress display time (s)"
 msgstr "Edenemiseriba kuvamise aeg (s)"
@@ -1272,7 +1272,7 @@ msgid "Setup.Replay$Pause replay when jumping to a mark"
 msgstr "Paus markerile siirdamisel"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr "Redigeeritud osade vahelejätmine"
+msgstr "Markeeritud osade vahelejätmine"
 
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Paus viimasel markeril"
@@ -1281,7 +1281,7 @@ msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
 msgstr "Adaptiivse hüppe pikkuse algväärtus (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr "Adaptiivse hüppe lähtestamise viide (s)"
+msgstr "Adaptiivse hüppe lähtestamise aegumine (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
 msgstr "Adaptiivse hüppe vaheldumise omadus"
@@ -1299,31 +1299,31 @@ msgid "Setup.Replay$Resume ID"
 msgstr "Taasesituse tunnus"
 
 msgid "Miscellaneous"
-msgstr "Muud sätted"
+msgstr "Muud seaded"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "Min. aeg saateni (min)"
+msgstr "Minimaalne aeg saateni (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Min. kasutaja tegevusetus (min)"
+msgstr "Minimaalne kasutaja jõudeolek (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "SVDRP ooteaeg (s)"
+msgstr "SVDRP aegumine (s)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "SVDRP partnerlus"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "SVDRP hostinimi"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "SVDRP vaikehost"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "Kanalivahetuse ooteaeg (s)"
+msgstr "Kanalivahetuse aegumine (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Kanali sisestamise ajalimiit (ms)"
+msgstr "Kanali sisestamise aegumine (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
 msgstr "Kaugjuhtimispuldi kordamise viide (ms)"
@@ -1356,30 +1356,30 @@ msgid "Setup.Miscellaneous$Emergency exit"
 msgstr "Hädaväljumine"
 
 msgid "Plugins"
-msgstr "Laiendusmoodulid"
+msgstr "Pluginad"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Sellel laienudusmoodulil ei ole seadeid!"
+msgstr "Sellel pluginal seaded puuduvad!"
 
 msgid "Setup"
-msgstr "Sätted"
+msgstr "Seaded"
 
 msgid "Restart"
-msgstr "Restart"
+msgstr "Taaskäivita"
 
 msgid "Really restart?"
-msgstr "Restart?"
+msgstr "Taaskäivitada?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " Lõpetada salvestamine "
+msgstr " Lõpeta salvestamine "
 
 msgid "Schedule"
-msgstr "Kava"
+msgstr "Ajakava"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " Lõpetada taasesitus"
+msgstr " Lõpeta taasesitus"
 
 msgid "Button$Pause"
 msgstr "Paus"
@@ -1392,7 +1392,7 @@ msgstr "Jätkamine"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Tühistada töötlemine"
+msgstr " Tühista töötlemine"
 
 msgid "Stop recording?"
 msgstr "Lõpetada salvestamine?"
@@ -1416,7 +1416,7 @@ msgid "No free DVB device to record!"
 msgstr "Puudub vaba DVB seade salvestamiseks!"
 
 msgid "Pausing live video..."
-msgstr "Otseedastuse peatamine..."
+msgstr "Telepildi peatamine..."
 
 msgid "Delete timeshift recording?"
 msgstr "Kustutada ajanihke salvestust?"
@@ -1426,19 +1426,19 @@ msgid "Jump: "
 msgstr "Hüpe: "
 
 msgid "No editing marks defined!"
-msgstr "Redigeerimise markerid puuduvad!"
+msgstr "Muutmise markerid puuduvad!"
 
 msgid "No editing sequences defined!"
-msgstr "Redigeerimise järjestus määramata!"
+msgstr "Muutmise järjestus määramata!"
 
 msgid "Can't start editing process!"
-msgstr "Redigeerimise start ebaõnnestus!"
+msgstr "Muutmise start ebaõnnestus!"
 
 msgid "Editing process started"
-msgstr "Redigeerimine käivitatud"
+msgstr "Töötlemine käivitatud"
 
 msgid "Editing process already active!"
-msgstr "Redigeerimine juba aktiivne!"
+msgstr "Töötlemine juba aktiivne!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrsšzžtuvwõäöüxy0123456789-.,#~\\^$[]|()*+?{}/:%@&"
@@ -1456,7 +1456,7 @@ msgid "Button$Insert"
 msgstr "Lisa (INS)"
 
 msgid "Plugin"
-msgstr "Laiendusmoodul"
+msgstr "Plugin"
 
 msgid "Up/Dn for new location - OK to move"
 msgstr "'Üles/Alla' uus asukoht - 'OK' kinnitus"
@@ -1494,16 +1494,16 @@ msgstr "lülitada välja?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Laiendusmoodul %s ärkab %ld minuti pärast, jätkata?"
+msgstr "Plugin %s ärkab %ld minuti pärast, jätkata?"
 
 msgid "Editing - restart anyway?"
-msgstr "Töötlemine aktiivne - restart?"
+msgstr "Töötlemine aktiivne - taaskäivitada?"
 
 msgid "Recording - restart anyway?"
-msgstr "Salvestamine aktiivne - restart?"
+msgstr "Salvestamine aktiivne - taaskäivitada ikkagi?"
 
 msgid "restart anyway?"
-msgstr "restart?"
+msgstr "taaskäivitada ikkagi?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
@@ -1525,7 +1525,7 @@ msgid "DEVICES"
 msgstr "SEADMED"
 
 msgid "LIVE"
-msgstr "LIVE"
+msgstr "TELEPILT"
 
 msgid "PLAY"
 msgstr "ESITUS"
@@ -1570,10 +1570,10 @@ msgid "Upcoming recording!"
 msgstr "Salvestamine tulekul!"
 
 msgid "Pause live video?"
-msgstr "Peatada otseülekanne?"
+msgstr "Peatada telepilt?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Käivitada salvestamine?"
 
 msgid "Recording started"
 msgstr "Salvestamine käivitatud"
@@ -1594,7 +1594,7 @@ msgid "Editing process finished"
 msgstr "Töötlemine lõpetatud"
 
 msgid "Press any key to cancel restart"
-msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
+msgstr "Taaskäivitamise katkestamiseks vajuta suvalist klahvi"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
diff --git a/po/it_IT.po b/po/it_IT.po
index d54a4a397..9552f989f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2015-09-11 10:38+0200\n"
-"PO-Revision-Date: 2015-02-12 19:31+0100\n"
+"PO-Revision-Date: 2015-09-14 19:28+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -667,7 +667,7 @@ msgid "File"
 msgstr "Nome"
 
 msgid "Record on"
-msgstr ""
+msgstr "Registrazione avviata"
 
 msgid "Button$Folder"
 msgstr "Cartella"
@@ -682,10 +682,10 @@ msgid "First day"
 msgstr "1° giorno"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Errore durante l'accesso al timer remoto"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Il timer è stata eliminato!"
 
 msgid "Select folder"
 msgstr "Seleziona cartella"
@@ -863,10 +863,10 @@ msgid "always"
 msgstr "sempre"
 
 msgid "by name"
-msgstr ""
+msgstr "per nome"
 
 msgid "by time"
-msgstr ""
+msgstr "per ora"
 
 msgid "OSD"
 msgstr "OSD"
@@ -956,7 +956,7 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Ordina sempre per prima le cartelle"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Modalità ordinamento predefinito per registrazioni"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
@@ -1143,7 +1143,7 @@ msgid " (activating)"
 msgstr " (attivazione)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ dispositivo"
 
 msgid "CAM"
 msgstr "Accesso condizionato CAM"
@@ -1176,13 +1176,13 @@ msgid "Can't reset CAM!"
 msgstr "Impossibile reimpostare il modulo CAM!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "nessuna registrazione istantanea"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "conferma registrazione istantanea"
 
 msgid "record instantly"
-msgstr ""
+msgstr "registra istantaneamente"
 
 msgid "do not pause live video"
 msgstr "non mettere in pausa il video dal vivo"
@@ -1215,7 +1215,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Scadenza predefinita (gg)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Gestione chiave registrazione"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "Gestione tasto Pausa"
@@ -1317,13 +1317,13 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Scadenza SVDRP (s)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "Punto SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "Nome sistema SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "Sistema predefinito SVDRP"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Scadenza Zapping (s)"
@@ -1579,7 +1579,7 @@ msgid "Pause live video?"
 msgstr "Pausare video dal vivo?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Avviare registrazione?"
 
 msgid "Recording started"
 msgstr "Registrazione avviata"
diff --git a/receiver.c b/receiver.c
index 9375d4f47..8d647c02c 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 4.0 2015/01/12 14:04:31 kls Exp $
+ * $Id: receiver.c 4.1 2015/09/16 11:19:47 kls Exp $
  */
 
 #include "receiver.h"
@@ -37,8 +37,10 @@ void cReceiver::SetPriority(int Priority)
 bool cReceiver::AddPid(int Pid)
 {
   if (Pid) {
-     if (numPids < MAXRECEIVEPIDS)
-        pids[numPids++] = Pid;
+     if (numPids < MAXRECEIVEPIDS) {
+        if (!WantsPid(Pid))
+           pids[numPids++] = Pid;
+        }
      else {
         dsyslog("too many PIDs in cReceiver (Pid = %d)", Pid);
         return false;
diff --git a/recording.c b/recording.c
index a847c7d10..5293459ea 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.4 2015/09/09 10:21:58 kls Exp $
+ * $Id: recording.c 4.6 2016/12/22 12:58:20 kls Exp $
  */
 
 #include "recording.h"
@@ -1701,7 +1701,7 @@ void cDirCopier::Action(void)
         int To = -1;
         size_t BufferSize = BUFSIZ;
         while (Running()) {
-              // Suspend cutting if we have severe throughput problems:
+              // Suspend copying if we have severe throughput problems:
               if (Throttled()) {
                  cCondWait::SleepMs(100);
                  continue;
@@ -1900,6 +1900,7 @@ bool cRecordingsHandlerEntry::Active(bool &Error)
 cRecordingsHandler RecordingsHandler;
 
 cRecordingsHandler::cRecordingsHandler(void)
+:cThread("recordings handler")
 {
   finished = true;
   error = false;
@@ -1907,6 +1908,23 @@ cRecordingsHandler::cRecordingsHandler(void)
 
 cRecordingsHandler::~cRecordingsHandler()
 {
+  Cancel(3);
+}
+
+void cRecordingsHandler::Action(void)
+{
+  while (Running()) {
+        {
+          cMutexLock MutexLock(&mutex);
+          while (cRecordingsHandlerEntry *r = operations.First()) {
+                if (!r->Active(error))
+                   operations.Del(r);
+                }
+          if (!operations.Count())
+             break;
+        }
+        cCondWait::SleepMs(100);
+        }
 }
 
 cRecordingsHandlerEntry *cRecordingsHandler::Get(const char *FileName)
@@ -1934,8 +1952,7 @@ bool cRecordingsHandler::Add(int Usage, const char *FileNameSrc, const char *Fil
               Usage |= ruPending;
               operations.Add(new cRecordingsHandlerEntry(Usage, FileNameSrc, FileNameDst));
               finished = false;
-              Active(); // start it right away if possible
-              LOCK_RECORDINGS_WRITE; // to trigger a state change
+              Start();
               return true;
               }
            else
@@ -1955,17 +1972,17 @@ bool cRecordingsHandler::Add(int Usage, const char *FileNameSrc, const char *Fil
 void cRecordingsHandler::Del(const char *FileName)
 {
   cMutexLock MutexLock(&mutex);
-  if (cRecordingsHandlerEntry *r = Get(FileName)) {
+  if (cRecordingsHandlerEntry *r = Get(FileName))
      operations.Del(r);
-     LOCK_RECORDINGS_WRITE; // to trigger a state change
-     }
 }
 
 void cRecordingsHandler::DelAll(void)
 {
-  cMutexLock MutexLock(&mutex);
-  operations.Clear();
-  LOCK_RECORDINGS_WRITE; // to trigger a state change
+  {
+    cMutexLock MutexLock(&mutex);
+    operations.Clear();
+  }
+  Cancel(3);
 }
 
 int cRecordingsHandler::GetUsage(const char *FileName)
@@ -1976,18 +1993,6 @@ int cRecordingsHandler::GetUsage(const char *FileName)
   return ruNone;
 }
 
-bool cRecordingsHandler::Active(void)
-{
-  cMutexLock MutexLock(&mutex);
-  while (cRecordingsHandlerEntry *r = operations.First()) {
-        if (r->Active(error))
-           return true;
-        else
-           operations.Del(r);
-        }
-  return false;
-}
-
 bool cRecordingsHandler::Finished(bool &Error)
 {
   cMutexLock MutexLock(&mutex);
@@ -2324,7 +2329,7 @@ void cIndexFileGenerator::Action(void)
                  Buffer.Del(Processed);
                  }
               }
-           else if (PatPmtParser.Vpid()) {
+           else if (PatPmtParser.Completed()) {
               // Step 2 - sync FrameDetector:
               int Processed = FrameDetector.Analyze(Data, Length);
               if (Processed > 0) {
@@ -2346,9 +2351,9 @@ void cIndexFileGenerator::Action(void)
                        PatPmtParser.ParsePmt(p, TS_SIZE);
                     Length -= TS_SIZE;
                     p += TS_SIZE;
-                    if (PatPmtParser.Vpid()) {
-                       // Found Vpid, so rewind to sync FrameDetector:
-                       FrameDetector.SetPid(PatPmtParser.Vpid(), PatPmtParser.Vtype());
+                    if (PatPmtParser.Completed()) {
+                       // Found pid, so rewind to sync FrameDetector:
+                       FrameDetector.SetPid(PatPmtParser.Vpid() ? PatPmtParser.Vpid() : PatPmtParser.Apid(0), PatPmtParser.Vpid() ? PatPmtParser.Vtype() : PatPmtParser.Atype(0));
                        BufferChunks = IFG_BUFFER_SIZE;
                        Rewind = true;
                        break;
diff --git a/recording.h b/recording.h
index cebd2ee09..b649f6fde 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 4.3 2015/08/29 14:12:14 kls Exp $
+ * $Id: recording.h 4.4 2016/12/13 13:12:12 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -302,16 +302,18 @@ DEF_LIST_LOCK2(Recordings, DeletedRecordings);
 
 class cRecordingsHandlerEntry;
 
-class cRecordingsHandler {
+class cRecordingsHandler : public cThread {
 private:
   cMutex mutex;
   cList<cRecordingsHandlerEntry> operations;
   bool finished;
   bool error;
   cRecordingsHandlerEntry *Get(const char *FileName);
+protected:
+  virtual void Action(void);
 public:
   cRecordingsHandler(void);
-  ~cRecordingsHandler();
+  virtual ~cRecordingsHandler();
   bool Add(int Usage, const char *FileNameSrc, const char *FileNameDst = NULL);
        ///< Adds the given FileNameSrc to the recordings handler for (later)
        ///< processing. Usage can be either ruCut, ruMove or ruCopy. FileNameDst
@@ -329,12 +331,6 @@ class cRecordingsHandler {
        ///< Deletes/terminates all operations.
   int GetUsage(const char *FileName);
        ///< Returns the usage type for the given FileName.
-  bool Active(void);
-       ///< Checks whether there is currently any operation running and starts
-       ///> the next one form the list if the previous one has finished.
-       ///< This function must be called regularly to trigger switching to the
-       ///< next operation in the list.
-       ///< Returns true if there are any operations in the list.
   bool Finished(bool &Error);
        ///< Returns true if all operations in the list have been finished.
        ///< If there have been any errors, Errors will be set to true.
diff --git a/remux.c b/remux.c
index 6c07efcb3..2e1bc31f5 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 4.1 2015/03/11 09:49:38 kls Exp $
+ * $Id: remux.c 4.3 2016/12/22 12:58:20 kls Exp $
  */
 
 #include "remux.h"
@@ -603,6 +603,7 @@ cPatPmtParser::cPatPmtParser(bool UpdatePrimaryDevice)
 
 void cPatPmtParser::Reset(void)
 {
+  completed = false;
   pmtSize = 0;
   patVersion = pmtVersion = -1;
   pmtPids[0] = 0;
@@ -708,6 +709,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
            case 0x01: // STREAMTYPE_11172_VIDEO
            case 0x02: // STREAMTYPE_13818_VIDEO
            case 0x1B: // H.264
+           case 0x24: // H.265
                       vpid = stream.getPid();
                       vtype = stream.getStreamType();
                       ppid = Pmt.getPCRPid();
@@ -892,6 +894,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
             }
          }
      pmtVersion = Pmt.getVersionNumber();
+     completed = true;
      }
   else
      esyslog("ERROR: can't parse PMT");
@@ -1204,16 +1207,16 @@ class cH264Parser : public cFrameParser {
     nutSequenceParameterSet = 7,
     nutAccessUnitDelimiter  = 9,
     };
-  cTsPayload tsPayload;
   uchar byte; // holds the current byte value in case of bitwise access
   int bit; // the bit index into the current byte (-1 if we're not in bit reading mode)
   int zeroBytes; // the number of consecutive zero bytes (to detect 0x000003)
-  uint32_t scanner;
   // Identifiers written in '_' notation as in "ITU-T H.264":
   bool separate_colour_plane_flag;
   int log2_max_frame_num;
   bool frame_mbs_only_flag;
-  //
+protected:
+  cTsPayload tsPayload;
+  uint32_t scanner;
   bool gotAccessUnitDelimiter;
   bool gotSequenceParameterSet;
   uchar GetByte(bool Raw = false);
@@ -1430,6 +1433,81 @@ void cH264Parser::ParseSliceHeader(void)
      }
 }
 
+// --- cH265Parser -----------------------------------------------------------
+
+class cH265Parser : public cH264Parser {
+private:
+  enum eNalUnitType {
+    nutSliceSegmentTrailingN =  0,
+    nutSliceSegmentTrailingR =  1,
+    nutSliceSegmentTSAN      =  2,
+    nutSliceSegmentTSAR      =  3,
+    nutSliceSegmentSTSAN     =  4,
+    nutSliceSegmentSTSAR     =  5,
+    nutSliceSegmentRADLN     =  6,
+    nutSliceSegmentRADLR     =  7,
+    nutSliceSegmentRASLN     =  8,
+    nutSliceSegmentRASLR     =  9,
+    nutSliceSegmentBLAWLP    = 16,
+    nutSliceSegmentBLAWRADL  = 17,
+    nutSliceSegmentBLANLP    = 18,
+    nutSliceSegmentIDRWRADL  = 19,
+    nutSliceSegmentIDRNLP    = 20,
+    nutSliceSegmentCRANUT    = 21,
+    nutVideoParameterSet     = 32,
+    nutSequenceParameterSet  = 33,
+    nutPictureParameterSet   = 34,
+    nutAccessUnitDelimiter   = 35,
+    nutEndOfSequence         = 36,
+    nutEndOfBitstream        = 37,
+    nutFillerData            = 38,
+    nutPrefixSEI             = 39,
+    nutSuffixSEI             = 40,
+    nutNonVCLRes0            = 41,
+    nutNonVCLRes3            = 44,
+    nutUnspecified0          = 48,
+    nutUnspecified7          = 55,
+    };
+public:
+  cH265Parser(void);
+  virtual int Parse(const uchar *Data, int Length, int Pid);
+  };
+
+cH265Parser::cH265Parser(void)
+:cH264Parser()
+{
+}
+
+int cH265Parser::Parse(const uchar *Data, int Length, int Pid)
+{
+  newFrame = independentFrame = false;
+  tsPayload.Setup(const_cast<uchar *>(Data), Length, Pid);
+  if (TsPayloadStart(Data)) {
+     tsPayload.SkipPesHeader();
+     scanner = EMPTY_SCANNER;
+     }
+  for (;;) {
+      scanner = (scanner << 8) | GetByte(true);
+      if ((scanner & 0xFFFFFF00) == 0x00000100) { // NAL unit start
+         uchar NalUnitType = (scanner >> 1) & 0x3F;
+         GetByte(); // nuh_layer_id + nuh_temporal_id_plus1
+         if (NalUnitType <= nutSliceSegmentRASLR || (NalUnitType >= nutSliceSegmentBLAWLP && NalUnitType <= nutSliceSegmentCRANUT)) {
+            if (NalUnitType == nutSliceSegmentIDRWRADL || NalUnitType == nutSliceSegmentIDRNLP || NalUnitType == nutSliceSegmentCRANUT)
+               independentFrame = true;
+            if (GetBit()) { // first_slice_segment_in_pic_flag
+               newFrame = true;
+               tsPayload.Statistics();
+               }
+            break;
+            }
+         }
+      if (tsPayload.AtPayloadStart() // stop at any new payload start to have the buffer refilled if necessary
+         || tsPayload.Eof()) // or if we're out of data
+         break;
+      }
+  return tsPayload.Used();
+}
+
 // --- cFrameDetector --------------------------------------------------------
 
 cFrameDetector::cFrameDetector(int Pid, int Type)
@@ -1456,14 +1534,16 @@ void cFrameDetector::SetPid(int Pid, int Type)
 {
   pid = Pid;
   type = Type;
-  isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or H.264
+  isVideo = type == 0x01 || type == 0x02 || type == 0x1B || type == 0x24; // MPEG 1, 2, H.264 or H.265
   delete parser;
   parser = NULL;
   if (type == 0x01 || type == 0x02)
      parser = new cMpeg2Parser;
   else if (type == 0x1B)
      parser = new cH264Parser;
-  else if (type == 0x04 || type == 0x06) // MPEG audio or AC3 audio
+  else if (type == 0x24)
+     parser = new cH265Parser;
+  else if (type == 0x03 || type == 0x04 || type == 0x06) // MPEG audio or AC3 audio
      parser = new cAudioParser;
   else if (type != 0)
      esyslog("ERROR: unknown stream type %d (PID %d) in frame detector", type, pid);
diff --git a/remux.h b/remux.h
index bd0d14591..5eab076f0 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 4.0 2014/03/22 14:58:24 kls Exp $
+ * $Id: remux.h 4.1 2016/12/22 13:09:54 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -361,6 +361,7 @@ class cPatPmtParser {
   uint16_t compositionPageIds[MAXSPIDS];
   uint16_t ancillaryPageIds[MAXSPIDS];
   bool updatePrimaryDevice;
+  bool completed;
 protected:
   int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
 public:
@@ -397,6 +398,8 @@ class cPatPmtParser {
   int Vtype(void) const { return vtype; }
        ///< Returns the video stream type as defined by the current PMT, or 0 if no video
        ///< stream type has been detected, yet.
+  bool Completed(void) { return completed; }
+       ///< Returns true if the PMT has been completely parsed.
   const int *Apids(void) const { return apids; }
   const int *Dpids(void) const { return dpids; }
   const int *Spids(void) const { return spids; }
diff --git a/ringbuffer.c b/ringbuffer.c
index 05e2cf66e..d33a4719e 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 4.0 2012/09/22 11:26:49 kls Exp $
+ * $Id: ringbuffer.c 4.1 2016/12/22 10:26:13 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -390,12 +390,13 @@ void cRingBufferLinear::Del(int Count)
 
 // --- cFrame ----------------------------------------------------------------
 
-cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index, uint32_t Pts)
+cFrame::cFrame(const uchar *Data, int Count, eFrameType Type, int Index, uint32_t Pts, bool Independent)
 {
   count = abs(Count);
   type = Type;
   index = Index;
   pts = Pts;
+  independent = Type == ftAudio ? true : Independent;
   if (Count < 0)
      data = (uchar *)Data;
   else {
diff --git a/ringbuffer.h b/ringbuffer.h
index 70f22c690..9699bbc83 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 4.0 2013/02/16 15:20:37 kls Exp $
+ * $Id: ringbuffer.h 4.1 2016/12/22 10:26:13 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -113,8 +113,9 @@ class cFrame {
   eFrameType type;
   int index;
   uint32_t pts;
+  bool independent;
 public:
-  cFrame(const uchar *Data, int Count, eFrameType = ftUnknown, int Index = -1, uint32_t Pts = 0);
+  cFrame(const uchar *Data, int Count, eFrameType = ftUnknown, int Index = -1, uint32_t Pts = 0, bool independent = false);
     ///< Creates a new cFrame object.
     ///< If Count is negative, the cFrame object will take ownership of the given
     ///< Data. Otherwise it will allocate Count bytes of memory and copy Data.
@@ -124,6 +125,7 @@ class cFrame {
   eFrameType Type(void) const { return type; }
   int Index(void) const { return index; }
   uint32_t Pts(void) const { return pts; }
+  bool Independent(void) const { return independent; }
   };
 
 class cRingBufferFrame : public cRingBuffer {
diff --git a/skinclassic.c b/skinclassic.c
index b6d183b19..264089934 100644
--- a/skinclassic.c
+++ b/skinclassic.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinclassic.c 4.0 2013/03/03 15:26:09 kls Exp $
+ * $Id: skinclassic.c 4.1 2016/12/22 14:07:04 kls Exp $
  */
 
 #include "skinclassic.h"
@@ -352,8 +352,7 @@ void cSkinClassicDisplayMenu::SetEvent(const cEvent *Event)
   const cFont *font = cFont::GetFont(fontOsd);
   int y = y2;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
+  cString t = cString::sprintf("%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      cString buffer = cString::sprintf(" VPS: %s ", *Event->GetVpsString());
diff --git a/skinlcars.c b/skinlcars.c
index d84a753f6..0fae3b854 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
+ * $Id: skinlcars.c 4.2 2016/12/22 14:05:56 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1636,8 +1636,7 @@ void cSkinLCARSDisplayMenu::SetEvent(const cEvent *Event)
   int xl = xi00;
   int y = yi00;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
+  cString t = cString::sprintf("%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      cString buffer = cString::sprintf(" VPS: %s ", *Event->GetVpsString());
diff --git a/skinsttng.c b/skinsttng.c
index f10f1204d..792652ee4 100644
--- a/skinsttng.c
+++ b/skinsttng.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinsttng.c 4.0 2013/11/15 15:33:14 kls Exp $
+ * $Id: skinsttng.c 4.1 2016/12/22 14:07:22 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures
@@ -655,8 +655,7 @@ void cSkinSTTNGDisplayMenu::SetEvent(const cEvent *Event)
   int xl = x3 + TextSpacing;
   int y = y3;
   cTextScroller ts;
-  char t[32];
-  snprintf(t, sizeof(t), "%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
+  cString t = cString::sprintf("%s  %s - %s", *Event->GetDateString(), *Event->GetTimeString(), *Event->GetEndTimeString());
   ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground));
   if (Event->Vps() && Event->Vps() != Event->StartTime()) {
      cString buffer = cString::sprintf(" VPS: %s ", *Event->GetVpsString());
diff --git a/sources.conf b/sources.conf
index ad4131c0a..169eecf19 100644
--- a/sources.conf
+++ b/sources.conf
@@ -51,6 +51,7 @@ S52.5E  Yahsat 1A
 S53E    Express AM22
 S56E    DirecTV 1R
 S57E    NSS 12
+S58.5E  Kazsat 3
 S60E    Intelsat 904
 S62E    Intelsat 902
 S64E    Intelsat 906
@@ -109,80 +110,80 @@ S172E   Eutelsat 172A
 S180E   Intelsat 18
 S177W   NSS 9
 
-# Atlantic
-
-S0.8W   Intelsat 10-02
-S1W     Thor 5/6
-S4W     Amos 2/3
-S5W     Eutelsat 5 West A
-S7W     Nilesat 101/201 & Eutelsat 7 West A
-S8W     Eutelsat 8 West A/C
-S11W    Express AM44
-S12.5W  Eutelsat 12 West A
-S14W    Express A4
-S15W    Telstar 12
-S18W    Intelsat 901
-S20W    NSS 7
-S22W    SES 4
-S24.5W  Intelsat 905
-S27.5W  Intelsat 907
-S30W    Hispasat 1D/1E
-S31.5W  Intelsat 25
-S34.5W  Intelsat 903
-S37.5W  NSS 10 & Telstar 11N
-S40.5W  SES 6
-S43W    Intelsat 11
-S45W    Intelsat 14
-S50W    Intelsat 1R
-S53W    Intelsat 23
-S55.5W  Intelsat 805
-S58W    Intelsat 21
-S61W    Amazonas 2/3
-
 # America
 
-S61.5W  Echostar 16
-S63W    Telstar 14R
-S65W    Star One C1
-S67W    AMC 4
-S70W    Star One C2
-S72W    AMC 6
-S72.7W  Nimiq 5
-S75W    Star One C3
-S77W    QuetzSat 1
-S82W    Nimiq 4
-S83W    AMC 9
-S84W    Brasilsat B4
+S139W   AMC 8
+S137W   AMC 7
+S135W   AMC 10
+S133W   Galaxy 15
+S131W   AMC 11
+S129W   Ciel 2
+S127W   Galaxy 13/Horizons 1
+S125W   Galaxy 14 & AMC 21
+S123W   Galaxy 18
+S121W   Echostar 9/Galaxy 23
+S119W   Echostar 14 & DirecTV 7S
+S118.8W Anik F3
+S116.8W SatMex 8
+S114.9W SatMex 5
+S113W   SatMex 6
+S111.1W Anik F2
+S110W   DirecTV 5 & Echostar 10/11
+S107.3W Anik F1R/G1
+S105W   AMC 15/18
+S103W   AMC 1
+S101W   DirecTV 4S/8 & SES 1
+S99.2W  Galaxy 16
+S97W    Galaxy 19
+S95W    Galaxy 3C
+S93.1W  Galaxy 25
+S91W    Galaxy 17 & Nimiq 6
+S89W    Galaxy 28
+S87W    SES 2
 S85W    AMC 16
 S85.1W  XM 3
-S87W    SES 2
-S89W    Galaxy 28
-S91W    Galaxy 17 & Nimiq 6
-S93.1W  Galaxy 25
-S95W    Galaxy 3C
-S97W    Galaxy 19
-S99.2W  Galaxy 16
-S101W   DirecTV 4S/8 & SES 1
-S103W   AMC 1
-S105W   AMC 15/18
-S107.3W Anik F1R/G1
-S110W   DirecTV 5 & Echostar 10/11
-S111.1W Anik F2
-S113W   SatMex 6
-S114.9W SatMex 5
-S116.8W SatMex 8
-S118.8W Anik F3
-S119W   Echostar 14 & DirecTV 7S
-S121W   Echostar 9/Galaxy 23
-S123W   Galaxy 18
-S125W   Galaxy 14 & AMC 21
-S127W   Galaxy 13/Horizons 1
-S129W   Ciel 2
-S131W   AMC 11
-S133W   Galaxy 15
-S135W   AMC 10
-S137W   AMC 7
-S139W   AMC 8
+S84W    Brasilsat B4
+S83W    AMC 9
+S82W    Nimiq 4
+S77W    QuetzSat 1
+S75W    Star One C3
+S72W    AMC 6
+S72.7W  Nimiq 5
+S70W    Star One C2
+S67W    AMC 4
+S65W    Star One C1
+S63W    Telstar 14R
+S61.5W  Echostar 16
+
+# Atlantic
+
+S61W    Amazonas 2/3
+S58W    Intelsat 21
+S55.5W  Intelsat 805
+S53W    Intelsat 23
+S50W    Intelsat 1R
+S45W    Intelsat 14
+S43W    Intelsat 11
+S40.5W  SES 6
+S37.5W  NSS 10 & Telstar 11N
+S34.5W  Intelsat 903
+S31.5W  Intelsat 25
+S30W    Hispasat 1D/1E
+S27.5W  Intelsat 907
+S24.5W  Intelsat 905
+S22W    SES 4
+S20W    NSS 7
+S18W    Intelsat 901
+S15W    Telstar 12
+S14W    Express A4
+S12.5W  Eutelsat 12 West A
+S11W    Express AM44
+S8W     Eutelsat 8 West A/C
+S7W     Nilesat 101/201 & Eutelsat 7 West A
+S5W     Eutelsat 5 West A
+S4W     Amos 2/3
+S1W     Thor 5/6
+S0.8W   Intelsat 10-02
 
 S360E   Any satellite
 
diff --git a/svdrp.c b/svdrp.c
index 1a24d296a..1697cc6a6 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.9 2015/09/14 13:23:06 kls Exp $
+ * $Id: svdrp.c 4.11 2016/12/08 10:48:53 kls Exp $
  */
 
 #include "svdrp.h"
@@ -1228,6 +1228,10 @@ void cSVDRPServer::CmdDELC(const char *Option)
               int n = Channels->GetNextNormal(CurrentChannel->Index());
               if (n < 0)
                  n = Channels->GetPrevNormal(CurrentChannel->Index());
+              if (n < 0) {
+                 Reply(501, "Can't delete channel \"%s\" - list would be empty", Option);
+                 return;
+                 }
               CurrentChannel = Channels->Get(n);
               CurrentChannelNr = 0; // triggers channel switch below
               }
@@ -1240,7 +1244,7 @@ void cSVDRPServer::CmdDELC(const char *Option)
               if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
                  Channels->SwitchTo(CurrentChannel->Number());
               else
-                 cDevice::SetCurrentChannel(CurrentChannel);
+                 cDevice::SetCurrentChannel(CurrentChannel->Number());
               }
            Reply(250, "Channel \"%s\" deleted", Option);
            }
@@ -1899,7 +1903,7 @@ void cSVDRPServer::CmdMOVC(const char *Option)
                        if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
                           Channels->SwitchTo(CurrentChannel->Number());
                        else
-                          cDevice::SetCurrentChannel(CurrentChannel);
+                          cDevice::SetCurrentChannel(CurrentChannel->Number());
                        }
                     isyslog("SVDRP < %s channel %d moved to %d", *connection, FromNumber, ToNumber);
                     Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
diff --git a/thread.c b/thread.c
index 993d16ddd..47eb97756 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 4.1 2015/08/29 14:43:03 kls Exp $
+ * $Id: thread.c 4.2 2016/12/08 09:45:25 kls Exp $
  */
 
 #include "thread.h"
@@ -151,6 +151,8 @@ void cCondVar::Broadcast(void)
 
 cRwLock::cRwLock(bool PreferWriter)
 {
+  locked = 0;
+  writeLockThreadId = 0;
   pthread_rwlockattr_t attr;
   pthread_rwlockattr_init(&attr);
   pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP);
@@ -170,8 +172,15 @@ bool cRwLock::Lock(bool Write, int TimeoutMs)
      if (!GetAbsTime(&abstime, TimeoutMs))
         TimeoutMs = 0;
      }
-  if (Write)
+  if (Write) {
      Result = TimeoutMs ? pthread_rwlock_timedwrlock(&rwlock, &abstime) : pthread_rwlock_wrlock(&rwlock);
+     if (Result == 0)
+        writeLockThreadId = cThread::ThreadId();
+     }
+  else if (writeLockThreadId == cThread::ThreadId()) {
+     locked++; // there can be any number of stacked read locks, so we keep track here
+     Result = 0; // aquiring a read lock while holding a write lock within the same thread is OK
+     }
   else
      Result = TimeoutMs ? pthread_rwlock_timedrdlock(&rwlock, &abstime) : pthread_rwlock_rdlock(&rwlock);
   return Result == 0;
@@ -179,6 +188,13 @@ bool cRwLock::Lock(bool Write, int TimeoutMs)
 
 void cRwLock::Unlock(void)
 {
+  if (writeLockThreadId == cThread::ThreadId()) { // this is the thread that obtained the initial write lock
+     if (locked) { // this is the unlock of a read lock within the write lock
+        locked--;
+        return;
+        }
+     }
+  writeLockThreadId = 0;
   pthread_rwlock_unlock(&rwlock);
 }
 
@@ -206,8 +222,8 @@ void cMutex::Lock(void)
 
 void cMutex::Unlock(void)
 {
- if (!--locked)
-    pthread_mutex_unlock(&mutex);
+  if (!--locked)
+     pthread_mutex_unlock(&mutex);
 }
 
 // --- cThread ---------------------------------------------------------------
@@ -474,9 +490,11 @@ void cStateLock::Unlock(cStateKey &StateKey, bool IncState)
   if (StateKey.write && IncState && !explicitModify)
      state++;
   StateKey.state = state;
-  StateKey.write = false;
-  threadId = 0;
-  explicitModify = false;
+  if (StateKey.write) {
+     StateKey.write = false;
+     threadId = 0;
+     explicitModify = false;
+     }
   rwLock.Unlock();
 }
 
diff --git a/thread.h b/thread.h
index b5a07c793..8cca55c0c 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 4.1 2015/08/17 13:06:24 kls Exp $
+ * $Id: thread.h 4.2 2016/12/08 09:11:24 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+typedef pid_t tThreadId;
+
 class cCondWait {
 private:
   pthread_mutex_t mutex;
@@ -53,6 +55,8 @@ class cCondVar {
 class cRwLock {
 private:
   pthread_rwlock_t rwlock;
+  int locked;
+  tThreadId writeLockThreadId;
 public:
   cRwLock(bool PreferWriter = false);
   ~cRwLock();
@@ -72,8 +76,6 @@ class cMutex {
   void Unlock(void);
   };
 
-typedef pid_t tThreadId;
-
 class cThread {
   friend class cThreadLock;
 private:
diff --git a/timers.c b/timers.c
index 771f66b20..5bc11036e 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.5 2015/09/13 13:10:24 kls Exp $
+ * $Id: timers.c 4.7 2016/12/23 09:48:39 kls Exp $
  */
 
 #include "timers.h"
@@ -748,9 +748,9 @@ const cTimer *cTimers::GetById(int Id) const
   return NULL;
 }
 
-cTimer *cTimers::GetTimer(cTimer *Timer)
+const cTimer *cTimers::GetTimer(const cTimer *Timer) const
 {
-  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+  for (const cTimer *ti = First(); ti; ti = Next(ti)) {
       if (!ti->Remote() &&
           ti->Channel() == Timer->Channel() &&
           (ti->WeekDays() && ti->WeekDays() == Timer->WeekDays() || !ti->WeekDays() && ti->Day() == Timer->Day()) &&
diff --git a/timers.h b/timers.h
index 4222c1043..7ee116c8a 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 4.3 2015/09/09 10:40:24 kls Exp $
+ * $Id: timers.h 4.6 2016/12/23 09:49:31 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -122,7 +122,7 @@ class cTimers : public cConfig<cTimer> {
   cTimers(void);
   static const cTimers *GetTimersRead(cStateKey &StateKey, int TimeoutMs = 0);
       ///< Gets the list of timers for read access. If TimeoutMs is given,
-      ///< it will wait that long to get a write lock before giving up.
+      ///< it will wait that long to get a read lock before giving up.
       ///< Otherwise it will wait indefinitely. If no read lock can be
       ///< obtained within the given timeout, NULL will be returned.
       ///< The list is locked and a pointer to it is returned if the state
@@ -170,7 +170,8 @@ class cTimers : public cConfig<cTimer> {
   static int NewTimerId(void);
   const cTimer *GetById(int Id) const;
   cTimer *GetById(int Id) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetById(Id)); };
-  cTimer *GetTimer(cTimer *Timer);
+  const cTimer *GetTimer(const cTimer *Timer) const;
+  cTimer *GetTimer(const cTimer *Timer) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetTimer(Timer)); };
   const cTimer *GetMatch(time_t t) const;
   cTimer *GetMatch(time_t t) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(t)); };
   const cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) const;
diff --git a/tools.c b/tools.c
index adfff1c32..754673dbc 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 4.4 2015/09/10 13:17:55 kls Exp $
+ * $Id: tools.c 4.5 2016/12/23 14:03:40 kls Exp $
  */
 
 #include "tools.h"
@@ -2272,6 +2272,44 @@ void cListBase::Sort(void)
   free(a);
 }
 
+// --- cDynamicBuffer --------------------------------------------------------
+
+cDynamicBuffer::cDynamicBuffer(int InitialSize)
+{
+  initialSize = InitialSize;
+  buffer = NULL;
+  size = used = 0;
+}
+
+cDynamicBuffer::~cDynamicBuffer()
+{
+  free(buffer);
+}
+
+bool cDynamicBuffer::Realloc(int NewSize)
+{
+  if (size < NewSize) {
+     NewSize = max(NewSize, size ? size * 3 / 2 : initialSize); // increase size by at least 50%
+     if (uchar *NewBuffer = (uchar *)realloc(buffer, NewSize)) {
+        buffer = NewBuffer;
+        size = NewSize;
+        }
+     else {
+        esyslog("ERROR: out of memory");
+        return false;
+        }
+     }
+  return true;
+}
+
+void cDynamicBuffer::Append(const uchar *Data, int Length)
+{
+  if (Assert(used + Length)) {
+     memcpy(buffer + used, Data, Length);
+     used += Length;
+     }
+}
+
 // --- cHashBase -------------------------------------------------------------
 
 cHashBase::cHashBase(int Size)
diff --git a/tools.h b/tools.h
index 1563db921..73cca5a38 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.3 2015/09/06 10:45:54 kls Exp $
+ * $Id: tools.h 4.5 2016/12/23 13:56:35 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -609,7 +609,7 @@ public: \
     else \
        list = c##Class::Get##Name##Read(stateKey); \
   } \
-  ~c##Name##Lock() { stateKey.Remove(); } \
+  ~c##Name##Lock() { if (list) stateKey.Remove(); } \
   const c##Class *Name(void) const { return list; } \
   c##Class *Name(void) { return const_cast<c##Class *>(list); } \
   }
@@ -775,6 +775,26 @@ class cFileNameList : public cStringList {
   bool Load(const char *Directory, bool DirsOnly = false);
   };
 
+class cDynamicBuffer {
+private:
+  uchar *buffer;
+  int initialSize;
+  int size; // the total size of the buffer (bytes in memory)
+  int used; // the number of used bytes, starting at the beginning of the buffer
+  bool Realloc(int NewSize);
+  bool Assert(int NewSize) { return size < NewSize ? Realloc(NewSize) : true; } // inline for performance!
+public:
+  cDynamicBuffer(int InitialSize = 1024);
+  ~cDynamicBuffer();
+  void Append(const uchar *Data, int Length);
+  void Append(uchar Data) { if (Assert(used + 1)) buffer[used++] = Data; }
+  void Set(int Index, uchar Data) { if (Assert(Index + 1)) buffer[Index] = Data; }
+  uchar Get(int Index) { return Index < used ? buffer[Index] : 0; }
+  void Clear(void) { used = 0; }
+  uchar *Data(void) { return buffer; }
+  int Length(void) { return used; }
+  };
+
 class cHashObject : public cListObject {
   friend class cHashBase;
 private:
diff --git a/vdr.c b/vdr.c
index 6b0bf2b02..8a4947149 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.7 2015/09/11 08:02:50 kls Exp $
+ * $Id: vdr.c 4.9 2016/12/23 14:34:37 kls Exp $
  */
 
 #include <getopt.h>
@@ -171,6 +171,9 @@ static void Watchdog(int signum)
   // Something terrible must have happened that prevented the 'alarm()' from
   // being called in time, so let's get out of here:
   esyslog("PANIC: watchdog timer expired - exiting!");
+#ifdef SDNOTIFY
+  sd_notify(0, "STOPPING=1\nSTATUS=PANIC");
+#endif
   exit(1);
 }
 
@@ -235,6 +238,10 @@ int main(int argc, char *argv[])
 #if defined(VDR_USER)
   VdrUser = VDR_USER;
 #endif
+#ifdef SDNOTIFY
+  time_t SdWatchdog;
+  int SdWatchdogTimeout = 0;
+#endif
 
   cArgs *Args = NULL;
   if (argc == 1) {
@@ -914,6 +921,16 @@ int main(int argc, char *argv[])
      }
 
 #ifdef SDNOTIFY
+  if (sd_watchdog_enabled(0, NULL) > 0) {
+     uint64_t timeout;
+     SdWatchdog = time(NULL);
+     sd_watchdog_enabled(0, &timeout);
+     SdWatchdogTimeout = (int)timeout/1000000;
+     dsyslog("SD_WATCHDOG enabled with timeout set to %d seconds", SdWatchdogTimeout);
+     }
+
+  // Startup notification:
+
   sd_notify(0, "READY=1\nSTATUS=Ready");
 #endif
 
@@ -976,6 +993,14 @@ int main(int argc, char *argv[])
               dsyslog("max. latency time %d seconds", MaxLatencyTime);
               }
            }
+#ifdef SDNOTIFY
+        // Ping systemd watchdog when half the timeout is elapsed:
+        if (SdWatchdogTimeout && (Now - SdWatchdog) * 2 > SdWatchdogTimeout) {
+           sd_notify(0, "WATCHDOG=1");
+           SdWatchdog = Now;
+           dsyslog("SD_WATCHDOG ping");
+           }
+#endif
         // Handle channel and timer modifications:
         {
           // Channels and timers need to be stored in a consistent manner,
@@ -1480,9 +1505,6 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        // Keep the recordings handler alive:
-        RecordingsHandler.Active();
-
         if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Handle housekeeping tasks
 
@@ -1568,5 +1590,11 @@ int main(int argc, char *argv[])
      closelog();
   if (HasStdin)
      tcsetattr(STDIN_FILENO, TCSANOW, &savedTm);
+#ifdef SDNOTIFY
+  if (ShutdownHandler.GetExitCode() == 2)
+     sd_notify(0, "STOPPING=1\nSTATUS=Startup failed, exiting");
+  else
+     sd_notify(0, "STOPPING=1\nSTATUS=Exiting");
+#endif
   return ShutdownHandler.GetExitCode();
 }

From ff4c0a818042e001d5a13587a9db8774c1b1a7f1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 28 Mar 2017 11:10:00 +0200
Subject: [PATCH 245/307] Version 2.3.3

VDR developer version 2.3.3 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.3.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.2-2.3.3.diff

MD5 checksums:

73182b570bcf5a67ab56f7734e479631  vdr-2.3.3.tar.bz2
112c2057dbd7e86c31f8227f61cfd2a6  vdr-2.3.2-2.3.3.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- Added 'S3W ABS-3A' to sources.conf (thanks to Frank Richter).
- Fixed a possible deadlock in the recordings handler thread.
- Updated the Russian OSD texts (thanks to Andrey Pridvorov).
- Added a missing dependency to the Makefile to avoid error messages in the
  clean-plugins target (thanks to Tobias Grimm).
- The channel/CAM relations (i.e. the information which CAM can decrypt a given
  channel) are now stored in the file 'cam.data' in the cache directory (suggested
  by Dietmar Spingler). This speeds up switching to encrypted channels after
  newly starting VDR, in case there is more than one CAM in the system.
- Fixed a flaw in handling timeouts for encrypted channels.
- The mechanism of trying different CAMs when switching to an encrypted channel is
  now only triggered if there acually is more than one CAM in the system.
- Fixed updating the elapsed/remaining time in the progress display during fast
  forward/rewind.
- Changed 'unsigned' to 'signed' in some places to avoid trouble with abs() in
  gcc6+ (reported by Derek Kelly).
- CAMs that can handle multiple devices at the same time can now indicate this
  by creating the first cCamSlot as usual, and every other cCamSlot by giving
  it the first one as its "MasterSlot". To VDR this means that when searching
  for a CAM that can decrypt a particular channel, it only needs to ask the
  master CAM slot whether it is suitable for decrypting, and can skip all the
  other slots belonging to the same master. This can greatly speed up channel
  switching on systems with more than one CAM (that can handle multiple devices).
- The LCARS skin now displays the master CAM's number when a device is tuned to
  an encrypted channel.
- The Setup/CAM menu now only displays master CAMs.
- Fixed setting the local machine's SVDRP host name (was overwritten if setup.conf
  contained an empty string).
- PIDs can now be added to and deleted from a cReceiver while it is attached to
  a cDevice, without having to detach it first and re-attach it afterwards.
- Implemented support for MTD ("Multi Transponder Decryption"). This allows a CAM
  that is capable of decrypting more than one channel ("Multi Channel Decryption")
  to decrypt channels from different transponders. See the remarks in mtd.h on
  what a derived cCamSlot class needs to do in order to activate MTD (thanks to
  Jasmin Jessich for writing the ddci2 plugin and for valuable input and help
  with testing and debugging).
- The function cRingBufferLinear::Clear() can now be called safely from the
  reading thread, without additional locking.
- Now stopping any ongoing recordings before stopping the plugins, to avoid
  a crash when stopping VDR while recording.
---
 CONTRIBUTORS |   10 +
 HISTORY      |   43 +++
 Makefile     |    6 +-
 ci.c         |  470 ++++++++++++++++++-----
 ci.h         |  107 +++++-
 config.c     |    4 +-
 config.h     |   10 +-
 device.c     |  146 +++++--
 device.h     |    5 +-
 diseqc.c     |   10 +-
 diseqc.h     |    6 +-
 dvbdevice.c  |   10 +-
 menu.c       |   39 +-
 mtd.c        |  341 +++++++++++++++++
 mtd.h        |  188 +++++++++
 po/ru_RU.po  | 1030 +++++++++++++++++++++++++-------------------------
 receiver.c   |    9 +-
 recording.c  |   18 +-
 remux.c      |   24 +-
 remux.h      |   17 +-
 ringbuffer.c |    7 +-
 ringbuffer.h |    4 +-
 skinlcars.c  |    4 +-
 sources.conf |    1 +
 tools.h      |   18 +-
 vdr.5        |   16 +-
 vdr.c        |    9 +-
 27 files changed, 1832 insertions(+), 720 deletions(-)
 create mode 100644 mtd.c
 create mode 100644 mtd.h

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ca58ae8e9..dac5059f9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2478,6 +2478,8 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  numbers use a decimal point
  for adding dependency on 'i18n' to 'install-i18n' in the VDR Makefile
  for adding a manual page for 'svdrpsend'
+ for adding a missing dependency to the Makefile to avoid error messages in the
+ clean-plugins target
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -2848,6 +2850,7 @@ Derek Kelly <user.vdr@gmail.com>
  for suggesting to add ARGSDIR to the ONEDIR section of Make.config.template
  for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
  for suggesting to make the -u option also accept a numerical user id
+ for reporting a problem with abs() in gcc6+ when called with an unsigned variable
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -3170,6 +3173,7 @@ Oliver Schinagl <oliver@schinagl.nl>
 Andrey Pridvorov <ua0lnj@bk.ru>
  for reporting a problem with detecting frames in H.264 video, and pointing towards
  a better way of doing it
+ for updating the Russian OSD texts
 
 Jens Vogel <jens.vogel@akjv.de>
  for suggesting to make cPatPmtParser::ParsePmt() also recognize stream type 0x81
@@ -3380,6 +3384,7 @@ Dietmar Spingler <d_spingler@gmx.de>
  for suggesting to provide a way of using no DVB devices at all
  for suggesting that the -V and -h options should list the plugins in alphabetical order
  for suggesting to implement the setup option "Recording/Record key handling"
+ for suggesting to cache the channel/CAM relations in the file 'cam.data'
 
 Stefan Schallenberg <infos@nafets.de>
  for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
@@ -3400,6 +3405,8 @@ Dieter Ferdinand <dieter.ferdinand@gmx.de>
 Jasmin Jessich <jasmin@anw.at>
  for modifying the CAM API so that it is possible to implement CAMs that can be freely
  assigned to any devices
+ for writing the ddci2 plugin and for valuable input and help with testing and
+ debugging MTD support
 
 Martin Schirrmacher <schirrmie@gmail.com>
  for suggesting to provide a way for skin plugins to get informed about the currently
@@ -3459,3 +3466,6 @@ Aitugan Sarbassov <isarbassov@gmail.com>
 Sergey Chernyavskiy <glenvt18@gmail.com>
  for reporting truncated date/time strings in the skins on multi-byte UTF-8
  for adding a short sleep to cTSBuffer::Action() to avoid high CPU usage
+
+Frank Richter <kulpstur@t-online.de>
+ for adding 'S3W ABS-3A' to sources.conf
diff --git a/HISTORY b/HISTORY
index 932b9639f..74d22fb80 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8881,3 +8881,46 @@ Video Disk Recorder Revision History
 - Added support for the systemd watchdog (thanks to Marc Perrudin),
 - Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to
   Sergey Chernyavskiy).
+
+2017-03-28: Version 2.3.3
+
+- Added 'S3W ABS-3A' to sources.conf (thanks to Frank Richter).
+- Fixed a possible deadlock in the recordings handler thread.
+- Updated the Russian OSD texts (thanks to Andrey Pridvorov).
+- Added a missing dependency to the Makefile to avoid error messages in the
+  clean-plugins target (thanks to Tobias Grimm).
+- The channel/CAM relations (i.e. the information which CAM can decrypt a given
+  channel) are now stored in the file 'cam.data' in the cache directory (suggested
+  by Dietmar Spingler). This speeds up switching to encrypted channels after
+  newly starting VDR, in case there is more than one CAM in the system.
+- Fixed a flaw in handling timeouts for encrypted channels.
+- The mechanism of trying different CAMs when switching to an encrypted channel is
+  now only triggered if there acually is more than one CAM in the system.
+- Fixed updating the elapsed/remaining time in the progress display during fast
+  forward/rewind.
+- Changed 'unsigned' to 'signed' in some places to avoid trouble with abs() in
+  gcc6+ (reported by Derek Kelly).
+- CAMs that can handle multiple devices at the same time can now indicate this
+  by creating the first cCamSlot as usual, and every other cCamSlot by giving
+  it the first one as its "MasterSlot". To VDR this means that when searching
+  for a CAM that can decrypt a particular channel, it only needs to ask the
+  master CAM slot whether it is suitable for decrypting, and can skip all the
+  other slots belonging to the same master. This can greatly speed up channel
+  switching on systems with more than one CAM (that can handle multiple devices).
+- The LCARS skin now displays the master CAM's number when a device is tuned to
+  an encrypted channel.
+- The Setup/CAM menu now only displays master CAMs.
+- Fixed setting the local machine's SVDRP host name (was overwritten if setup.conf
+  contained an empty string).
+- PIDs can now be added to and deleted from a cReceiver while it is attached to
+  a cDevice, without having to detach it first and re-attach it afterwards.
+- Implemented support for MTD ("Multi Transponder Decryption"). This allows a CAM
+  that is capable of decrypting more than one channel ("Multi Channel Decryption")
+  to decrypt channels from different transponders. See the remarks in mtd.h on
+  what a derived cCamSlot class needs to do in order to activate MTD (thanks to
+  Jasmin Jessich for writing the ddci2 plugin and for valuable input and help
+  with testing and debugging).
+- The function cRingBufferLinear::Clear() can now be called safely from the
+  reading thread, without additional locking.
+- Now stopping any ongoing recordings before stopping the plugins, to avoid
+  a crash when stopping VDR while recording.
diff --git a/Makefile b/Makefile
index a0d78b2a9..d6bdc3172 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 4.1 2016/12/22 13:18:32 kls Exp $
+# $Id: Makefile 4.3 2017/02/20 09:22:47 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -69,7 +69,7 @@ SILIB    = $(LSIDIR)/libsi.a
 
 OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
        dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
-       lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o positioner.o\
+       lirc.o menu.o menuitems.o mtd.o nit.o osdbase.o osd.o pat.o player.o plugin.o positioner.o\
        receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
        skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
        timers.o tools.o transfer.o vdr.o videodir.o
@@ -250,7 +250,7 @@ plugins: include-dir vdr.pc
 	   fi;\
 	if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi
 
-clean-plugins:
+clean-plugins: vdr.pc
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" clean; done
 	@-rm -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION)
 
diff --git a/ci.c b/ci.c
index 606875b88..71623d881 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.3 2016/12/23 14:00:45 kls Exp $
+ * $Id: ci.c 4.9 2017/03/25 14:09:23 kls Exp $
  */
 
 #include "ci.h"
@@ -13,11 +13,13 @@
 #include <malloc.h>
 #include <netinet/in.h>
 #include <poll.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <time.h>
 #include <unistd.h>
 #include "device.h"
+#include "mtd.h"
 #include "pat.h"
 #include "receiver.h"
 #include "remux.h"
@@ -117,11 +119,10 @@ class cCaPidReceiver : public cReceiver {
   cVector<int> emmPids;
   uchar buffer[2048]; // 11 bit length, max. 2048 byte
   uchar *bufp;
+  uchar mtdCatBuffer[TS_SIZE]; // TODO: handle multi packet CATs!
   int length;
   void AddEmmPid(int Pid);
   void DelEmmPids(void);
-protected:
-  virtual void Activate(bool On);
 public:
   cCaPidReceiver(void);
   virtual ~cCaPidReceiver() { Detach(); }
@@ -155,14 +156,10 @@ void cCaPidReceiver::DelEmmPids(void)
   emmPids.Clear();
 }
 
-void cCaPidReceiver::Activate(bool On)
-{
-  catVersion = -1; // can be done independent of 'On'
-}
-
 void cCaPidReceiver::Receive(const uchar *Data, int Length)
 {
   if (TsPid(Data) == CATPID) {
+     cMtdCamSlot *MtdCamSlot = dynamic_cast<cMtdCamSlot *>(Device()->CamSlot());
      const uchar *p = NULL;
      if (TsPayloadStart(Data)) {
         if (Data[5] == SI::TableIdCAT) {
@@ -172,6 +169,8 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
               if (v != catVersion) {
                  if (Data[11] == 0 && Data[12] == 0) { // section number, last section number
                     if (length > TS_SIZE - 8) {
+                       if (MtdCamSlot)
+                          esyslog("ERROR: need to implement multi packet CAT handling for MTD!");
                        int n = TS_SIZE - 13;
                        memcpy(buffer, Data + 13, n);
                        bufp = buffer + n;
@@ -186,6 +185,8 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
                     dsyslog("multi table CAT section - unhandled!");
                  catVersion = v;
                  }
+              else if (MtdCamSlot)
+                 MtdCamSlot->PutCat(mtdCatBuffer, TS_SIZE);
               }
            }
         }
@@ -207,32 +208,32 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
            }
         }
      if (p) {
-        int OldCatVersion = catVersion; // must preserve the current version number
-        cDevice *AttachedDevice = Device();
-        if (AttachedDevice)
-           AttachedDevice->Detach(this);
         DelEmmPids();
         for (int i = 0; i < length - 4; i++) { // -4 = checksum
             if (p[i] == 0x09) {
                int CaId = int(p[i + 2] << 8) | p[i + 3];
-               int EmmPid = int(((p[i + 4] & 0x1F) << 8)) | p[i + 5];
+               int EmmPid = Peek13(p + i + 4);
                AddEmmPid(EmmPid);
+               if (MtdCamSlot)
+                  MtdMapPid(const_cast<uchar *>(p + i + 4), MtdCamSlot->MtdMapper());
                switch (CaId >> 8) {
                  case 0x01: for (int j = i + 7; j < p[i + 1] + 2; j += 4) {
-                                EmmPid = (int(p[j] & 0x0F) << 8) | p[j + 1];
+                                EmmPid = Peek13(p + j);
                                 AddEmmPid(EmmPid);
+                                if (MtdCamSlot)
+                                   MtdMapPid(const_cast<uchar *>(p + j), MtdCamSlot->MtdMapper());
                                 }
                             break;
                  }
                i += p[i + 1] + 2 - 1; // -1 to compensate for the loop increment
                }
             }
-        if (AttachedDevice)
-           AttachedDevice->AttachReceiver(this);
-        catVersion = OldCatVersion;
         p = NULL;
         bufp = 0;
         length = 0;
+        memcpy(mtdCatBuffer, Data, TS_SIZE);
+        if (MtdCamSlot)
+           MtdCamSlot->PutCat(mtdCatBuffer, TS_SIZE);
         }
      }
 }
@@ -279,7 +280,12 @@ void cCaActivationReceiver::Receive(const uchar *Data, int Length)
      else if (Now - lastScrambledTime > UNSCRAMBLE_TIME) {
         dsyslog("CAM %d: activated!", camSlot->SlotNumber());
         Skins.QueueMessage(mtInfo, tr("CAM activated!"));
+        cDevice *d = Device();
         Detach();
+        if (d) {
+           if (cCamSlot *s = d->CamSlot())
+              s->CancelActivation(); // this will delete *this* object, so no more code referencing *this* after this call!
+           }
         }
      }
 }
@@ -770,6 +776,7 @@ class cCiCaPmt {
   void SetListManagement(uint8_t ListManagement);
   uint8_t ListManagement(void) { return capmt.Get(0); }
   void AddPid(int Pid, uint8_t StreamType);
+  void MtdMapPids(cMtdMapper *MtdMapper);
   };
 
 cCiCaPmt::cCiCaPmt(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds)
@@ -830,6 +837,84 @@ void cCiCaPmt::AddCaDescriptors(int Length, const uint8_t *Data)
      esyslog("ERROR: adding CA descriptor without Pid!");
 }
 
+static int MtdMapCaDescriptor(uchar *p, cMtdMapper *MtdMapper)
+{
+  // See pat.c: cCaDescriptor::cCaDescriptor() for the layout of the data!
+  if (*p == SI::CaDescriptorTag) {
+     int l = *++p;
+     if (l >= 4) {
+        MtdMapPid(p + 3, MtdMapper);
+        return l + 2;
+        }
+     else
+        esyslog("ERROR: wrong length (%d) in MtdMapCaDescriptor()", l);
+     }
+  else
+     esyslog("ERROR: wrong tag (%d) in MtdMapCaDescriptor()", *p);
+  return -1;
+}
+
+static int MtdMapCaDescriptors(uchar *p, cMtdMapper *MtdMapper)
+{
+  int Length = p[0] * 256 + p[1];
+  if (Length >= 3) {
+     p += 3;
+     int m = Length - 1;
+     while (m > 0) {
+           int l = MtdMapCaDescriptor(p, MtdMapper);
+           if (l > 0) {
+              p += l;
+              m -= l;
+              }
+           }
+     }
+  return Length + 2;
+}
+
+static int MtdMapStream(uchar *p, cMtdMapper *MtdMapper)
+{
+  // See ci.c: cCiCaPmt::AddPid() for the layout of the data!
+  MtdMapPid(p + 1, MtdMapper);
+  int l = MtdMapCaDescriptors(p + 3, MtdMapper);
+  if (l > 0)
+     return l + 3;
+  return -1;
+}
+
+static int MtdMapStreams(uchar *p, cMtdMapper *MtdMapper, int Length)
+{
+  int m = Length;
+  while (m >= 5) {
+        int l = MtdMapStream(p, MtdMapper);
+        if (l > 0) {
+           p += l;
+           m -= l;
+           }
+        else
+           break;
+        }
+  return Length;
+}
+
+void cCiCaPmt::MtdMapPids(cMtdMapper *MtdMapper)
+{
+  uchar *p = capmt.Data();
+  int m = capmt.Length();
+  if (m >= 3) {
+     MtdMapSid(p + 1, MtdMapper);
+     p += 4;
+     m -= 4;
+     if (m >= 2) {
+        int l = MtdMapCaDescriptors(p, MtdMapper);
+        if (l >= 0) {
+           p += l;
+           m -= l;
+           MtdMapStreams(p, MtdMapper, m);
+           }
+        }
+     }
+}
+
 // --- cCiConditionalAccessSupport -------------------------------------------
 
 // CA Enable Ids:
@@ -910,8 +995,12 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
        case AOT_CA_PMT_REPLY: {
             dbgprotocol("Slot %d: <== Ca Pmt Reply (%d)", Tc()->CamSlot()->SlotNumber(), SessionId());
             if (!repliesToQuery) {
-               dsyslog("CAM %d: replies to QUERY - multi channel decryption possible", Tc()->CamSlot()->SlotNumber());
+               dsyslog("CAM %d: replies to QUERY - multi channel decryption (MCD) possible", Tc()->CamSlot()->SlotNumber());
                repliesToQuery = true;
+               if (Tc()->CamSlot()->MtdAvailable()) {
+                  dsyslog("CAM %d: supports multi transponder decryption (MTD)", Tc()->CamSlot()->SlotNumber());
+                  Tc()->CamSlot()->MtdActivate(true);
+                  }
                }
             state = 5; // got ca pmt reply
             int l = 0;
@@ -1663,6 +1752,14 @@ class cCiCaProgramData : public cListObject {
     programNumber = ProgramNumber;
     modified = false;
   }
+  bool Active(void)
+  {
+    for (cCiCaPidData *p = pidList.First(); p; p = pidList.Next(p)) {
+        if (p->active)
+           return true;
+        }
+    return false;
+  }
   };
 
 // --- cCiAdapter ------------------------------------------------------------
@@ -1730,55 +1827,79 @@ void cCiAdapter::Action(void)
 #define MODULE_CHECK_INTERVAL 500 // ms
 #define MODULE_RESET_TIMEOUT    2 // s
 
-cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
+cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool WantsTsData, cCamSlot *MasterSlot)
 {
   ciAdapter = CiAdapter;
+  masterSlot = MasterSlot;
   assignedDevice = NULL;
-  caPidReceiver = ReceiveCaPids ? new cCaPidReceiver : NULL;
+  caPidReceiver = WantsTsData ? new cCaPidReceiver : NULL;
   caActivationReceiver = NULL;
   slotIndex = -1;
+  mtdAvailable = false;
+  mtdHandler = NULL;
   lastModuleStatus = msReset; // avoids initial reset log message
   resetTime = 0;
   resendPmt = false;
-  source = transponder = 0;
   for (int i = 0; i <= MAX_CONNECTIONS_PER_CAM_SLOT; i++) // tc[0] is not used, but initialized anyway
       tc[i] = NULL;
-  CamSlots.Add(this);
-  slotNumber = Index() + 1;
-  if (ciAdapter)
+  if (MasterSlot)
+     slotNumber = MasterSlot->SlotNumber();
+  if (ciAdapter) {
+     CamSlots.Add(this);
+     slotNumber = Index() + 1;
      ciAdapter->AddCamSlot(this);
-  Reset();
+     Reset();
+     }
 }
 
 cCamSlot::~cCamSlot()
 {
-  if (assignedDevice)
-     assignedDevice->SetCamSlot(NULL);
+  Assign(NULL);
   delete caPidReceiver;
   delete caActivationReceiver;
   CamSlots.Del(this, false);
   DeleteAllConnections();
+  delete mtdHandler;
+}
+
+cCamSlot *cCamSlot::MtdSpawn(void)
+{
+  cMutexLock MutexLock(&mutex);
+  if (mtdHandler)
+     return mtdHandler->GetMtdCamSlot(this);
+  return this;
 }
 
 bool cCamSlot::Assign(cDevice *Device, bool Query)
 {
   cMutexLock MutexLock(&mutex);
+  if (Device == assignedDevice)
+     return true;
   if (ciAdapter) {
+     int OldDeviceNumber = 0;
+     if (assignedDevice && !Query) {
+        OldDeviceNumber = assignedDevice->DeviceNumber() + 1;
+        if (caPidReceiver)
+           assignedDevice->Detach(caPidReceiver);
+        assignedDevice->SetCamSlot(NULL);
+        assignedDevice = NULL;
+        }
      if (ciAdapter->Assign(Device, true)) {
-        if (!Device && assignedDevice)
-           assignedDevice->SetCamSlot(NULL);
-        if (!Query || !Device) {
+        if (!Query) {
            StopDecrypting();
-           source = transponder = 0;
            if (ciAdapter->Assign(Device)) {
-              assignedDevice = Device;
               if (Device) {
                  Device->SetCamSlot(this);
-                 dsyslog("CAM %d: assigned to device %d", slotNumber, Device->DeviceNumber() + 1);
+                 assignedDevice = Device;
+                 if (caPidReceiver) {
+                    caPidReceiver->Reset();
+                    Device->AttachReceiver(caPidReceiver);
+                    }
+                 dsyslog("CAM %d: assigned to device %d", MasterSlotNumber(), Device->DeviceNumber() + 1);
                  }
               else {
                  CancelActivation();
-                 dsyslog("CAM %d: unassigned", slotNumber);
+                 dsyslog("CAM %d: unassigned from device %d", MasterSlotNumber(), OldDeviceNumber);
                  }
               }
            else
@@ -1790,6 +1911,16 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
   return false;
 }
 
+bool cCamSlot::Devices(cVector<int> &CardIndexes)
+{
+  cMutexLock MutexLock(&mutex);
+  if (mtdHandler)
+     return mtdHandler->Devices(CardIndexes);
+  if (assignedDevice)
+     CardIndexes.Append(assignedDevice->CardIndex());
+  return CardIndexes.Size() > 0;
+}
+
 void cCamSlot::NewConnection(void)
 {
   cMutexLock MutexLock(&mutex);
@@ -1815,8 +1946,6 @@ void cCamSlot::DeleteAllConnections(void)
 void cCamSlot::Process(cTPDU *TPDU)
 {
   cMutexLock MutexLock(&mutex);
-  if (caActivationReceiver && !caActivationReceiver->IsAttached())
-     CancelActivation();
   if (TPDU) {
      int n = TPDU->Tcid();
      if (1 <= n && n <= MAX_CONNECTIONS_PER_CAM_SLOT) {
@@ -1827,9 +1956,9 @@ void cCamSlot::Process(cTPDU *TPDU)
   for (int i = 1; i <= MAX_CONNECTIONS_PER_CAM_SLOT; i++) {
       if (tc[i]) {
          if (!tc[i]->Process()) {
-           Reset();
-           return;
-           }
+            Reset();
+            return;
+            }
          }
       }
   if (moduleCheckTimer.TimedOut()) {
@@ -1839,6 +1968,7 @@ void cCamSlot::Process(cTPDU *TPDU)
           case msNone:
                dbgprotocol("Slot %d: no module present\n", slotNumber);
                isyslog("CAM %d: no module present", slotNumber);
+               MtdActivate(false);
                DeleteAllConnections();
                CancelActivation();
                break;
@@ -1855,7 +1985,7 @@ void cCamSlot::Process(cTPDU *TPDU)
                dbgprotocol("Slot %d: module ready\n", slotNumber);
                isyslog("CAM %d: module ready", slotNumber);
                NewConnection();
-               resendPmt = caProgramList.Count() > 0;
+               resendPmt = true;
                break;
           default:
                esyslog("ERROR: unknown module status %d (%s)", ms, __FUNCTION__);
@@ -1864,8 +1994,14 @@ void cCamSlot::Process(cTPDU *TPDU)
         }
      moduleCheckTimer.Set(MODULE_CHECK_INTERVAL);
      }
-  if (resendPmt)
-     SendCaPmt(CPCI_OK_DESCRAMBLING);
+  if (resendPmt && Ready()) {
+     if (mtdHandler) {
+        mtdHandler->StartDecrypting();
+        resendPmt = false;
+        }
+     else if (caProgramList.Count())
+        StartDecrypting();
+     }
   processed.Broadcast();
 }
 
@@ -1925,12 +2061,18 @@ void cCamSlot::StartActivation(void)
 void cCamSlot::CancelActivation(void)
 {
   cMutexLock MutexLock(&mutex);
-  delete caActivationReceiver;
-  caActivationReceiver = NULL;
+  if (mtdHandler)
+     mtdHandler->CancelActivation();
+  else {
+     delete caActivationReceiver;
+     caActivationReceiver = NULL;
+     }
 }
 
 bool cCamSlot::IsActivating(void)
 {
+  if (mtdHandler)
+     return mtdHandler->IsActivating();
   return caActivationReceiver;
 }
 
@@ -2004,67 +2146,115 @@ cCiEnquiry *cCamSlot::GetEnquiry(void)
   return NULL;
 }
 
-void cCamSlot::SendCaPmt(uint8_t CmdId)
+cCiCaPmtList::~cCiCaPmtList()
+{
+  for (int i = 0; i < caPmts.Size(); i++)
+      delete caPmts[i];
+}
+
+cCiCaPmt *cCiCaPmtList::Add(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds)
+{
+  cCiCaPmt *p = new cCiCaPmt(CmdId, Source, Transponder, ProgramNumber, CaSystemIds);
+  caPmts.Append(p);
+  return p;
+}
+
+void cCiCaPmtList::Del(cCiCaPmt *CaPmt)
+{
+  if (caPmts.RemoveElement(CaPmt))
+     delete CaPmt;
+}
+
+bool cCamSlot::RepliesToQuery(void)
 {
   cMutexLock MutexLock(&mutex);
   cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
-  if (cas) {
-     const int *CaSystemIds = cas->GetCaSystemIds();
-     if (CaSystemIds && *CaSystemIds) {
-        if (caProgramList.Count()) {
-           if (caPidReceiver && caPidReceiver->HasCaPids()) {
-              if (cDevice *d = Device())
-                 d->Detach(caPidReceiver);
-              }
-           for (int Loop = 1; Loop <= 2; Loop++) {
-               for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
-                   if (p->modified || resendPmt) {
-                      bool Active = false;
-                      cCiCaPmt CaPmt(CmdId, source, transponder, p->programNumber, CaSystemIds);
-                      for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
-                          if (q->active) {
-                             CaPmt.AddPid(q->pid, q->streamType);
-                             Active = true;
-                             }
-                          }
-                      if ((Loop == 1) != Active) { // first remove, then add
-                         if (caPidReceiver) {
-                            int CaPids[MAXRECEIVEPIDS + 1];
-                            if (GetCaPids(source, transponder, p->programNumber, CaSystemIds, MAXRECEIVEPIDS + 1, CaPids) > 0) {
-                               if (Loop == 1)
-                                  caPidReceiver->DelPids(CaPids);
-                               else
-                                  caPidReceiver->AddPids(CaPids);
-                               }
-                            }
-                         if (cas->RepliesToQuery())
-                            CaPmt.SetListManagement(Active ? CPLM_ADD : CPLM_UPDATE);
-                         if (Active || cas->RepliesToQuery())
-                            cas->SendPMT(&CaPmt);
-                         p->modified = false;
-                         }
-                      }
+  return cas && cas->RepliesToQuery();
+}
+
+void cCamSlot::BuildCaPmts(uint8_t CmdId, cCiCaPmtList &CaPmtList, cMtdMapper *MtdMapper)
+{
+  cMutexLock MutexLock(&mutex);
+  CaPmtList.caPmts.Clear();
+  const int *CaSystemIds = GetCaSystemIds();
+  if (CaSystemIds && *CaSystemIds) {
+     if (caProgramList.Count()) {
+        for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+            if (p->modified || resendPmt) {
+               bool Active = p->Active();
+               cCiCaPmt *CaPmt = CaPmtList.Add(Active ? CmdId : CPCI_NOT_SELECTED, source, transponder, p->programNumber, CaSystemIds);
+               for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
+                   if (q->active)
+                      CaPmt->AddPid(q->pid, q->streamType);
                    }
+               if (caPidReceiver) {
+                  int CaPids[MAXRECEIVEPIDS + 1];
+                  if (GetCaPids(source, transponder, p->programNumber, CaSystemIds, MAXRECEIVEPIDS + 1, CaPids) > 0) {
+                     if (Active)
+                        caPidReceiver->AddPids(CaPids);
+                     else
+                        caPidReceiver->DelPids(CaPids);
+                     }
+                  }
+               if (RepliesToQuery())
+                  CaPmt->SetListManagement(Active ? CPLM_ADD : CPLM_UPDATE);
+               if (MtdMapper)
+                  CaPmt->MtdMapPids(MtdMapper);
+               p->modified = false;
                }
-           if (caPidReceiver && caPidReceiver->HasCaPids()) {
-              if (cDevice *d = Device())
-                 d->AttachReceiver(caPidReceiver);
-              }
-           resendPmt = false;
-           }
-        else {
-           cCiCaPmt CaPmt(CmdId, 0, 0, 0, NULL);
-           cas->SendPMT(&CaPmt);
-           if (caPidReceiver) {
-              if (cDevice *d = Device())
-                 d->Detach(caPidReceiver);
-              caPidReceiver->Reset();
-              }
+            }
+        }
+     else if (CmdId == CPCI_NOT_SELECTED)
+        CaPmtList.Add(CmdId, 0, 0, 0, NULL);
+     }
+}
+
+void cCamSlot::SendCaPmts(cCiCaPmtList &CaPmtList)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
+  if (cas) {
+     for (int i = 0; i < CaPmtList.caPmts.Size(); i++)
+         cas->SendPMT(CaPmtList.caPmts[i]);
+     }
+  resendPmt = false;
+}
+
+void cCamSlot::SendCaPmt(uint8_t CmdId)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiCaPmtList CaPmtList;
+  BuildCaPmts(CmdId, CaPmtList);
+  SendCaPmts(CaPmtList);
+}
+
+void cCamSlot::MtdEnable(void)
+{
+  mtdAvailable = true;
+}
+
+void cCamSlot::MtdActivate(bool On)
+{
+  if (McdAvailable() && MtdAvailable()) {
+     if (On) {
+        if (!mtdHandler) {
+           dsyslog("CAM %d: activating MTD support", SlotNumber());
+           mtdHandler = new cMtdHandler;
            }
         }
+     else if (mtdHandler) {
+        dsyslog("CAM %d: deactivating MTD support", SlotNumber());
+        delete mtdHandler;
+        mtdHandler = NULL;
+        }
      }
 }
 
+int cCamSlot::MtdPutData(uchar *Data, int Count)
+{
+  return mtdHandler->Put(Data, Count);
+}
+
 const int *cCamSlot::GetCaSystemIds(void)
 {
   cMutexLock MutexLock(&mutex);
@@ -2074,6 +2264,8 @@ const int *cCamSlot::GetCaSystemIds(void)
 
 int cCamSlot::Priority(void)
 {
+  if (mtdHandler)
+     return mtdHandler->Priority();
   cDevice *d = Device();
   return d ? d->Priority() : IDLEPRIORITY;
 }
@@ -2123,7 +2315,7 @@ void cCamSlot::SetPid(int Pid, bool Active)
                 }
              return;
              }
-         }
+          }
       }
 }
 
@@ -2152,7 +2344,7 @@ void cCamSlot::AddChannel(const cChannel *Channel)
 
 #define QUERY_REPLY_WAIT  100 // ms to wait between checks for a reply
 
-bool cCamSlot::CanDecrypt(const cChannel *Channel)
+bool cCamSlot::CanDecrypt(const cChannel *Channel, cMtdMapper *MtdMapper)
 {
   if (Channel->Ca() < CA_ENCRYPTED_MIN)
      return true; // channel not encrypted
@@ -2170,6 +2362,8 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
          CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
      for (const int *Spid = Channel->Spids(); *Spid; Spid++)
          CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
+     if (MtdMapper)
+        CaPmt.MtdMapPids(MtdMapper);
      cas->SendPMT(&CaPmt);
      cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
      do {
@@ -2196,13 +2390,16 @@ void cCamSlot::StopDecrypting(void)
   cMutexLock MutexLock(&mutex);
   if (caProgramList.Count()) {
      caProgramList.Clear();
-     SendCaPmt(CPCI_NOT_SELECTED);
+     if (!dynamic_cast<cMtdCamSlot *>(this))
+        SendCaPmt(CPCI_NOT_SELECTED);
      }
 }
 
 bool cCamSlot::IsDecrypting(void)
 {
   cMutexLock MutexLock(&mutex);
+  if (mtdHandler)
+     return mtdHandler->IsDecrypting();
   if (caProgramList.Count()) {
      for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
          if (p->modified)
@@ -2226,10 +2423,21 @@ uchar *cCamSlot::Decrypt(uchar *Data, int &Count)
 
 cCamSlots CamSlots;
 
+int cCamSlots::NumReadyMasterSlots(void)
+{
+  int n = 0;
+  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+      if (CamSlot->IsMasterSlot() && CamSlot->ModuleStatus() == msReady)
+         n++;
+      }
+  return n;
+}
+
 bool cCamSlots::WaitForAllCamSlotsReady(int Timeout)
 {
+  bool ready = true;
   for (time_t t0 = time(NULL); time(NULL) - t0 < Timeout; ) {
-      bool ready = true;
+      ready = true;
       for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
           if (!CamSlot->Ready()) {
              ready = false;
@@ -2237,9 +2445,11 @@ bool cCamSlots::WaitForAllCamSlotsReady(int Timeout)
              }
           }
       if (ready)
-         return true;
+         break;
       }
-  return false;
+  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot))
+      dsyslog("CAM %d: %sready, %s", CamSlot->SlotNumber(), CamSlot->Ready() ? "" : "not ", CamSlot->IsMasterSlot() ? *cString::sprintf("master (%s)", CamSlot->GetCamName() ? CamSlot->GetCamName() : "empty") : *cString::sprintf("slave of CAM %d", CamSlot->MasterSlotNumber()));
+  return ready;
 }
 
 // --- cChannelCamRelation ---------------------------------------------------
@@ -2317,6 +2527,7 @@ void cChannelCamRelation::ClrDecrypt(int CamSlotNumber)
 
 // --- cChannelCamRelations --------------------------------------------------
 
+#define MAX_CAM_NUMBER 32
 #define CHANNEL_CAM_RELATIONS_CLEANUP_INTERVAL 3600 // seconds between cleanups
 
 cChannelCamRelations ChannelCamRelations;
@@ -2414,3 +2625,60 @@ void cChannelCamRelations::ClrDecrypt(tChannelID ChannelID, int CamSlotNumber)
   if (ccr)
      ccr->ClrDecrypt(CamSlotNumber);
 }
+
+void cChannelCamRelations::Load(const char *FileName)
+{
+  cMutexLock MutexLock(&mutex);
+  fileName = FileName;
+  if (access(fileName, R_OK) == 0) {
+     dsyslog("loading %s", *fileName);
+     if (FILE *f = fopen(fileName, "r")) {
+        cReadLine ReadLine;
+        char *s;
+        while ((s = ReadLine.Read(f)) != NULL) {
+              if (char *p = strchr(s, ' ')) {
+                 *p = 0;
+                 if (*++p) {
+                    tChannelID ChannelID = tChannelID::FromString(s);
+                    if (ChannelID.Valid()) {
+                       char *q;
+                       char *strtok_next;
+                       while ((q = strtok_r(p, " ", &strtok_next)) != NULL) {
+                             int CamSlotNumber = atoi(q);
+                             if (CamSlotNumber >= 1 && CamSlotNumber <= MAX_CAM_NUMBER)
+                                SetDecrypt(ChannelID, CamSlotNumber);
+                             p = NULL;
+                             }
+                       }
+                    }
+                 }
+              }
+        fclose(f);
+        }
+     else
+        LOG_ERROR_STR(*fileName);
+     }
+}
+
+void cChannelCamRelations::Save(void)
+{
+  cMutexLock MutexLock(&mutex);
+  dsyslog("saving %s", *fileName);
+  cSafeFile f(fileName);
+  if (f.Open()) {
+     for (cChannelCamRelation *ccr = First(); ccr; ccr = Next(ccr)) {
+         if (ccr->ChannelID().Valid()) {
+            cString s;
+            for (int i = 1; i <= MAX_CAM_NUMBER; i++) {
+                if (ccr->CamDecrypt(i))
+                   s = cString::sprintf("%s%s%d", *s ? *s : "", *s ? " " : "", i);
+                }
+            if (*s)
+               fprintf(f, "%s %s\n", *ccr->ChannelID().ToString(), *s);
+            }
+         }
+     f.Close();
+     }
+  else
+     LOG_ERROR_STR(*fileName);
+}
diff --git a/ci.h b/ci.h
index a4200152b..0e8253d91 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 4.0 2015/01/31 14:36:41 kls Exp $
+ * $Id: ci.h 4.5 2017/03/23 14:23:33 kls Exp $
  */
 
 #ifndef __CI_H
@@ -13,10 +13,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "channels.h"
+#include "ringbuffer.h"
 #include "thread.h"
 #include "tools.h"
 
-#define MAX_CAM_SLOTS_PER_ADAPTER     8 // maximum possible value is 255
+#define MAX_CAM_SLOTS_PER_ADAPTER    16 // maximum possible value is 255 (same value as MAXDEVICES!)
 #define MAX_CONNECTIONS_PER_CAM_SLOT  8 // maximum possible value is 254
 #define CAM_READ_TIMEOUT  50 // ms
 
@@ -124,14 +125,28 @@ class cCiSession;
 class cCiCaProgramData;
 class cCaPidReceiver;
 class cCaActivationReceiver;
+class cMtdHandler;
+class cMtdMapper;
+class cMtdCamSlot;
+class cCiCaPmt;
+
+struct cCiCaPmtList {
+  cVector<cCiCaPmt *> caPmts;
+  ~cCiCaPmtList();
+  cCiCaPmt *Add(uint8_t CmdId, int Source, int Transponder, int ProgramNumber, const int *CaSystemIds);
+  void Del(cCiCaPmt *CaPmt);
+  };
 
 class cCamSlot : public cListObject {
   friend class cCiAdapter;
   friend class cCiTransportConnection;
+  friend class cCiConditionalAccessSupport;
+  friend class cMtdCamSlot;
 private:
   cMutex mutex;
   cCondVar processed;
   cCiAdapter *ciAdapter;
+  cCamSlot *masterSlot;
   cDevice *assignedDevice;
   cCaPidReceiver *caPidReceiver;
   cCaActivationReceiver *caActivationReceiver;
@@ -145,23 +160,70 @@ class cCamSlot : public cListObject {
   int source;
   int transponder;
   cList<cCiCaProgramData> caProgramList;
-  const int *GetCaSystemIds(void);
-  void SendCaPmt(uint8_t CmdId);
+  bool mtdAvailable;
+  cMtdHandler *mtdHandler;
   void NewConnection(void);
   void DeleteAllConnections(void);
   void Process(cTPDU *TPDU = NULL);
   void Write(cTPDU *TPDU);
   cCiSession *GetSessionByResourceId(uint32_t ResourceId);
+  void MtdActivate(bool On);
+       ///< Activates (On == true) or deactivates (On == false) MTD.
+protected:
+  virtual const int *GetCaSystemIds(void);
+  virtual void SendCaPmt(uint8_t CmdId);
+  virtual bool RepliesToQuery(void);
+       ///< Returns true if the CAM in this slot replies to queries and thus
+       ///< supports MCD ("Multi Channel Decryption").
+  void BuildCaPmts(uint8_t CmdId, cCiCaPmtList &CaPmtList, cMtdMapper *MtdMapper = NULL);
+       ///< Generates all CA_PMTs with the given CmdId and stores them in the given CaPmtList.
+       ///< If MtdMapper is given, all SIDs and PIDs will be mapped accordingly.
+  void SendCaPmts(cCiCaPmtList &CaPmtList);
+       ///< Sends the given list of CA_PMTs to the CAM.
+  void MtdEnable(void);
+       ///< Enables MTD support for this CAM. Note that actual MTD operation also
+       ///< requires a CAM that supports MCD ("Multi Channel Decryption").
+  int MtdPutData(uchar *Data, int Count);
+       ///< Sends at most Count bytes of the given Data to the individual MTD CAM slots
+       ///< that are using this CAM. Data must point to the beginning of a TS packet.
+       ///< Returns the number of bytes actually processed.
 public:
-  cCamSlot(cCiAdapter *CiAdapter, bool WantsTsData = false);
+  bool McdAvailable(void) { return RepliesToQuery(); }
+       ///< Returns true if this CAM supports MCD ("Multi Channel Decyption").
+  bool MtdAvailable(void) { return mtdAvailable; }
+       ///< Returns true if this CAM supports MTD ("Multi Transponder Decryption").
+  bool MtdActive(void) { return mtdHandler != NULL; }
+       ///< Returns true if MTD is currently active.
+public:
+  cCamSlot(cCiAdapter *CiAdapter, bool WantsTsData = false, cCamSlot *MasterSlot = NULL);
        ///< Creates a new CAM slot for the given CiAdapter.
        ///< The CiAdapter will take care of deleting the CAM slot,
        ///< so the caller must not delete it!
        ///< If WantsTsData is true, the device this CAM slot is assigned to will
        ///< call the Decrypt() function of this CAM slot, presenting it the complete
        ///< TS data stream of the encrypted programme, including the CA pids.
+       ///< If this CAM slot is basically the same as an other one, MasterSlot can
+       ///< be given to indicate this. This can be used for instance for CAM slots
+       ///< that can do MTD ("Multi Transponder Decryption"), where the first cCamSlot
+       ///< is created without giving a MasterSlot, and all others are given the first
+       ///< one as their MasterSlot. This can speed up the search for a suitable CAM
+       ///< when tuning to an encrypted channel, and it also makes the Setup/CAM menu
+       ///< clearer because only the master CAM slots will be shown there.
   virtual ~cCamSlot();
-  bool Assign(cDevice *Device, bool Query = false);
+  bool IsMasterSlot(void) { return !masterSlot; }
+       ///< Returns true if this CAM slot itself is a master slot (which means that
+       ///< it doesn't have pointer to another CAM slot that's its master).
+  cCamSlot *MasterSlot(void) { return masterSlot ? masterSlot : this; }
+       ///< Returns this CAM slot's master slot, or a pointer to itself if it is a
+       ///< master slot.
+  cCamSlot *MtdSpawn(void);
+       ///< If this CAM slot can do MTD ("Multi Transponder Decryption"),
+       ///< a call to this function returns a cMtdCamSlot with this CAM slot
+       ///< as its master. Otherwise a pointer to this object is returned, which
+       ///< means that MTD is not supported.
+  void TriggerResendPmt(void) { resendPmt = true; }
+       ///< Tells this CAM slot to resend the list of CA_PMTs to the CAM.
+  virtual bool Assign(cDevice *Device, bool Query = false);
        ///< Assigns this CAM slot to the given Device, if this is possible.
        ///< If Query is 'true', the CI adapter of this slot only checks whether
        ///< it can be assigned to the Device, but doesn't actually assign itself to it.
@@ -170,8 +232,16 @@ class cCamSlot : public cListObject {
        ///< device it was previously assigned to. The value of Query
        ///< is ignored in that case, and this function always returns
        ///< 'true'.
+       ///< If a derived class reimplements this function, it can return 'false'
+       ///< if this CAM can't be assigned to the given Device. If the CAM can be
+       ///< assigned to the Device, or if Device is NULL, it must call the base
+       ///< class function.
   cDevice *Device(void) { return assignedDevice; }
        ///< Returns the device this CAM slot is currently assigned to.
+  bool Devices(cVector<int> &CardIndexes);
+       ///< Adds the card indexes of any devices that currently use this CAM to
+       ///< the given CardIndexes. This can be more than one in case of MTD.
+       ///< Returns true if the array is not empty.
   bool WantsTsData(void) const { return caPidReceiver != NULL; }
        ///< Returns true if this CAM slot wants to receive the TS data through
        ///< its Decrypt() function.
@@ -181,6 +251,9 @@ class cCamSlot : public cListObject {
   int SlotNumber(void) { return slotNumber; }
        ///< Returns the number of this CAM slot within the whole system.
        ///< The first slot has the number 1.
+  int MasterSlotNumber(void) { return masterSlot ? masterSlot->SlotNumber() : slotNumber; }
+       ///< Returns the number of this CAM's master slot within the whole system.
+       ///< The first slot has the number 1.
   virtual bool Reset(void);
        ///< Resets the CAM in this slot.
        ///< Returns true if the operation was successful.
@@ -241,7 +314,7 @@ class cCamSlot : public cListObject {
        ///< If the source or transponder of the channel are different than
        ///< what was given in a previous call to AddChannel(), any previously
        ///< added PIDs will be cleared.
-  virtual bool CanDecrypt(const cChannel *Channel);
+  virtual bool CanDecrypt(const cChannel *Channel, cMtdMapper *MtdMapper = NULL);
        ///< Returns true if there is a CAM in this slot that is able to decrypt
        ///< the given Channel (or at least claims to be able to do so).
        ///< Since the QUERY/REPLY mechanism for CAMs is pretty unreliable (some
@@ -252,11 +325,18 @@ class cCamSlot : public cListObject {
        ///< to the initial QUERY will perform this check at all. CAMs that never
        ///< replied to the initial QUERY are assumed not to be able to handle
        ///< more than one channel at a time.
+       ///< If MtdMapper is given, all SIDs and PIDs will be mapped accordingly.
   virtual void StartDecrypting(void);
-       ///< Triggers sending all currently active CA_PMT entries to the CAM,
-       ///< so that it will start decrypting.
+       ///< Sends all CA_PMT entries to the CAM that have been modified since the
+       ///< last call to this function. This includes CA_PMTs that have been
+       ///< added or activated, as well as ones that have been deactivated.
+       ///< StartDecrypting() will be called whenever a PID is activated or
+       ///< deactivated.
   virtual void StopDecrypting(void);
        ///< Clears the list of CA_PMT entries and tells the CAM to stop decrypting.
+       ///< Note that this function is only called when there are no more PIDs for
+       ///< the CAM to decrypt. There is no symmetry between StartDecrypting() and
+       ///< StopDecrypting().
   virtual bool IsDecrypting(void);
        ///< Returns true if the CAM in this slot is currently used for decrypting.
   virtual uchar *Decrypt(uchar *Data, int &Count);
@@ -287,7 +367,8 @@ class cCamSlot : public cListObject {
        ///< the CAM's control). If no decrypted TS packet is currently available, NULL
        ///< shall be returned. If no data from Data can currently be processed, Count
        ///< shall be set to 0 and the same Data pointer will be offered in the next
-       ///< call to Decrypt().
+       ///< call to Decrypt(). See mtd.h for further requirements if this CAM can
+       ///< do MTD ("Multi Transponder Decryption").
        ///< A derived class that implements this function will also need
        ///< to set the WantsTsData parameter in the call to the base class
        ///< constructor to true in order to receive the TS data.
@@ -295,6 +376,9 @@ class cCamSlot : public cListObject {
 
 class cCamSlots : public cList<cCamSlot> {
 public:
+  int NumReadyMasterSlots(void);
+       ///< Returns the number of master CAM slots in the system that are ready
+       ///< to decrypt.
   bool WaitForAllCamSlotsReady(int Timeout = 0);
        ///< Waits until all CAM slots have become ready, or the given Timeout
        ///< (seconds) has expired. While waiting, the Ready() function of each
@@ -310,6 +394,7 @@ class cChannelCamRelation;
 class cChannelCamRelations : public cList<cChannelCamRelation> {
 private:
   cMutex mutex;
+  cString fileName;
   cChannelCamRelation *GetEntry(tChannelID ChannelID);
   cChannelCamRelation *AddEntry(tChannelID ChannelID);
   time_t lastCleanup;
@@ -323,6 +408,8 @@ class cChannelCamRelations : public cList<cChannelCamRelation> {
   void SetDecrypt(tChannelID ChannelID, int CamSlotNumber);
   void ClrChecked(tChannelID ChannelID, int CamSlotNumber);
   void ClrDecrypt(tChannelID ChannelID, int CamSlotNumber);
+  void Load(const char *FileName);
+  void Save(void);
   };
 
 extern cChannelCamRelations ChannelCamRelations;
diff --git a/config.c b/config.c
index e5f5463c6..79eec8a35 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 4.4 2015/09/13 11:09:44 kls Exp $
+ * $Id: config.c 4.5 2017/02/14 11:02:48 kls Exp $
  */
 
 #include "config.h"
@@ -640,7 +640,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPPeering"))        SVDRPPeering       = atoi(Value);
-  else if (!strcasecmp(Name, "SVDRPHostName"))       strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName));
+  else if (!strcasecmp(Name, "SVDRPHostName"))     { if (!*SVDRPHostName) strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName)); }
   else if (!strcasecmp(Name, "SVDRPdefaultHost"))    strn0cpy(SVDRPDefaultHost, Value, sizeof(SVDRPDefaultHost));
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
diff --git a/config.h b/config.h
index 16630b3ac..4bfdba567 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.6 2015/09/16 11:11:42 kls Exp $
+ * $Id: config.h 4.7 2016/12/27 11:45:25 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.2"
-#define VDRVERSNUM   20302  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.3"
+#define VDRVERSNUM   20303  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.2"
-#define APIVERSNUM   20302  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.3"
+#define APIVERSNUM   20303  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 3c97b8ce8..247e8c56a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.3 2016/12/23 14:43:44 kls Exp $
+ * $Id: device.c 4.11 2017/03/27 14:02:54 kls Exp $
  */
 
 #include "device.h"
@@ -90,6 +90,7 @@ cDevice::cDevice(void)
 
   camSlot = NULL;
   startScrambleDetection = 0;
+  scramblingTimeout = 0;
 
   occupiedTimeout = 0;
 
@@ -251,7 +252,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
          SlotPriority[CamSlot->Index()] = MAXPRIORITY + 1; // assumes it can't be used
          if (CamSlot->ModuleStatus() == msReady) {
             if (CamSlot->ProvidesCa(Channel->Caids())) {
-               if (!ChannelCamRelations.CamChecked(Channel->GetChannelID(), CamSlot->SlotNumber())) {
+               if (!ChannelCamRelations.CamChecked(Channel->GetChannelID(), CamSlot->MasterSlotNumber())) {
                   SlotPriority[CamSlot->Index()] = CamSlot->Priority();
                   NumUsableSlots++;
                   }
@@ -280,8 +281,13 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              continue; // CAM slot can't be used with this device
           bool ndr;
           if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basically able to do the job
-             if (NumUsableSlots && !HasInternalCam && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j))
-                ndr = true; // using a different CAM slot requires detaching receivers
+             if (NumUsableSlots && !HasInternalCam) {
+                if (cCamSlot *csi = device[i]->CamSlot()) {
+                   cCamSlot *csj = CamSlots.Get(j);
+                   if ((csj->MtdActive() ? csi->MasterSlot() : csi) != csj)
+                      ndr = true; // using a different CAM slot requires detaching receivers
+                   }
+                }
              // Put together an integer number that reflects the "impact" using
              // this device would have on the overall system. Each condition is represented
              // by one bit in the number (or several bits, if the condition is actually
@@ -299,7 +305,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              imp <<= 1; imp |= ndr;                                                                                  // avoid devices if we need to detach existing receivers
              imp <<= 1; imp |= (NumUsableSlots || InternalCamNeeded) ? 0 : device[i]->HasCi();                       // avoid cards with Common Interface for FTA channels
              imp <<= 1; imp |= device[i]->AvoidRecording();                                                          // avoid SD full featured cards
-             imp <<= 1; imp |= (NumUsableSlots && !HasInternalCam) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
+             imp <<= 1; imp |= (NumUsableSlots && !HasInternalCam) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlots.Get(j)->MasterSlotNumber()) : 0; // prefer CAMs that are known to decrypt this channel
              imp <<= 1; imp |= device[i]->IsPrimaryDevice();                                                         // avoid the primary device
              if (imp < Impact) {
                 // This device has less impact than any previous one, so we take it.
@@ -314,16 +320,89 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
       if (!NumUsableSlots)
          break; // no CAM necessary, so just one loop over the devices
       }
-  if (d && !Query) {
-     if (NeedsDetachReceivers)
+  if (d) {
+     if (!Query && NeedsDetachReceivers)
         d->DetachAllReceivers();
      if (s) {
-        if (s->Device() != d) {
-           if (s->Device())
-              s->Device()->DetachAllReceivers();
-           if (d->CamSlot())
-              d->CamSlot()->Assign(NULL);
-           s->Assign(d);
+        // Some of the following statements could probably be combined, but let's keep them
+        // explicit so we can clearly see every single aspect of the decisions made here.
+        if (d->CamSlot()) {
+           if (s->MtdActive()) {
+              if (s == d->CamSlot()->MasterSlot()) {
+                 // device d already has a proper CAM slot, so nothing to do here
+                 }
+              else {
+                 // device d has a CAM slot, but it's not the right one
+                 if (!Query) {
+                    d->CamSlot()->Assign(NULL);
+                    s = s->MtdSpawn();
+                    s->Assign(d);
+                    }
+                 }
+              }
+           else {
+              if (s->Device()) {
+                 if (s->Device() != d) {
+                    // CAM slot s is currently assigned to a different device than d
+                    if (Priority > s->Priority()) {
+                       if (!Query) {
+                          d->CamSlot()->Assign(NULL);
+                          s->Assign(d);
+                          }
+                       }
+                    else {
+                       d = NULL;
+                       s = NULL;
+                       }
+                    }
+                 else {
+                    // device d already has a proper CAM slot, so nothing to do here
+                    }
+                 }
+              else {
+                 if (s != d->CamSlot()) {
+                    // device d has a CAM slot, but it's not the right one
+                    if (!Query) {
+                       d->CamSlot()->Assign(NULL);
+                       s->Assign(d);
+                       }
+                    }
+                 else {
+                    // device d already has a proper CAM slot, so nothing to do here
+                    }
+                 }
+              }
+           }
+        else {
+           // device d has no CAM slot, ...
+           if (s->MtdActive()) {
+              // ... so we assign s with MTD support
+              if (!Query) {
+                 s = s->MtdSpawn();
+                 s->Assign(d);
+                 }
+              }
+           else {
+              // CAM slot s has no MTD support ...
+              if (s->Device()) {
+                 // ... but it is assigned to a different device, so we reassign it to d
+                 if (Priority > s->Priority()) {
+                    if (!Query) {
+                       s->Device()->DetachAllReceivers();
+                       s->Assign(d);
+                       }
+                    }
+                 else {
+                    d = NULL;
+                    s = NULL;
+                    }
+                 }
+              else {
+                 // ... and is not assigned to any device, so we just assign it to d
+                 if (!Query)
+                    s->Assign(d);
+                 }
+              }
            }
         }
      else if (d->CamSlot() && !d->CamSlot()->IsDecrypting())
@@ -450,6 +529,7 @@ void cDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
 
 bool cDevice::HasPid(int Pid) const
 {
+  cMutexLock MutexLock(&mutexPids);
   for (int i = 0; i < MAXPIDHANDLES; i++) {
       if (pidHandles[i].pid == Pid)
          return true;
@@ -459,6 +539,7 @@ bool cDevice::HasPid(int Pid) const
 
 bool cDevice::AddPid(int Pid, ePidType PidType, int StreamType)
 {
+  cMutexLock MutexLock(&mutexPids);
   if (Pid || PidType == ptPcr) {
      int n = -1;
      int a = -1;
@@ -523,6 +604,7 @@ bool cDevice::AddPid(int Pid, ePidType PidType, int StreamType)
 
 void cDevice::DelPid(int Pid, ePidType PidType)
 {
+  cMutexLock MutexLock(&mutexPids);
   if (Pid || PidType == ptPcr) {
      int n = -1;
      if (PidType == ptPcr)
@@ -558,6 +640,7 @@ bool cDevice::SetPid(cPidHandle *Handle, int Type, bool On)
 
 void cDevice::DelLivePids(void)
 {
+  cMutexLock MutexLock(&mutexPids);
   for (int i = ptAudio; i < ptOther; i++) {
       if (pidHandles[i].pid)
          DelPid(pidHandles[i].pid, ePidType(i));
@@ -1487,13 +1570,8 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
      }
   else {
      while (Length >= TS_SIZE) {
-           if (Data[0] != TS_SYNC_BYTE) {
-              int Skipped = 1;
-              while (Skipped < Length && (Data[Skipped] != TS_SYNC_BYTE || Length - Skipped > TS_SIZE && Data[Skipped + TS_SIZE] != TS_SYNC_BYTE))
-                    Skipped++;
-              esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
+           if (int Skipped = TS_SYNC(Data, Length))
               return Played + Skipped;
-              }
            int Pid = TsPid(Data);
            if (TsHasPayload(Data)) { // silently ignore TS packets w/o payload
               int PayloadOffset = TsPayloadOffset(Data);
@@ -1574,6 +1652,7 @@ bool cDevice::Receiving(bool Dummy) const
 
 void cDevice::Action(void)
 {
+  time_t LastScrambledPacket = 0;
   if (Running() && OpenDvr()) {
      while (Running()) {
            // Read data from the DVR device:
@@ -1588,17 +1667,18 @@ void cDevice::Action(void)
                  cCamSlot *cs = NULL;
                  if (startScrambleDetection) {
                     cs = CamSlot();
-                    CamSlotNumber = cs ? cs->SlotNumber() : 0;
+                    CamSlotNumber = cs ? cs->MasterSlotNumber() : 0;
                     if (CamSlotNumber) {
-                       int t = time(NULL) - startScrambleDetection;
+                       if (LastScrambledPacket < startScrambleDetection)
+                          LastScrambledPacket = startScrambleDetection;
+                       time_t Now = time(NULL);
                        if (TsIsScrambled(b)) {
-                          if (t > TS_SCRAMBLING_TIMEOUT)
+                          LastScrambledPacket = Now;
+                          if (Now - startScrambleDetection > scramblingTimeout)
                              DetachReceivers = true;
                           }
-                       else if (t > TS_SCRAMBLING_TIME_OK) {
+                       if (Now - LastScrambledPacket > TS_SCRAMBLING_TIME_OK)
                           DescramblingOk = true;
-                          startScrambleDetection = 0;
-                          }
                        }
                     }
                  // Distribute the packet to all attached receivers:
@@ -1606,14 +1686,17 @@ void cDevice::Action(void)
                  for (int i = 0; i < MAXRECEIVERS; i++) {
                      if (receiver[i] && receiver[i]->WantsPid(Pid)) {
                         if (DetachReceivers && cs && (!cs->IsActivating() || receiver[i]->Priority() >= LIVEPRIORITY)) {
-                           dsyslog("detaching receiver - won't decrypt channel %s with CAM %d", *receiver[i]->ChannelID().ToString(), CamSlotNumber);
+                           dsyslog("CAM %d: won't decrypt channel %s, detaching receiver", CamSlotNumber, *receiver[i]->ChannelID().ToString());
                            ChannelCamRelations.SetChecked(receiver[i]->ChannelID(), CamSlotNumber);
                            Detach(receiver[i]);
                            }
                         else
                            receiver[i]->Receive(b, TS_SIZE);
-                        if (DescramblingOk)
+                        if (DescramblingOk && receiver[i]->ChannelID().Valid()) {
+                           dsyslog("CAM %d: decrypts channel %s", CamSlotNumber, *receiver[i]->ChannelID().ToString());
                            ChannelCamRelations.SetDecrypt(receiver[i]->ChannelID(), CamSlotNumber);
+                           startScrambleDetection = 0;
+                           }
                         }
                      }
                  Unlock();
@@ -1672,7 +1755,14 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Unlock();
          if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
             camSlot->StartDecrypting();
-            startScrambleDetection = time(NULL);
+            if (CamSlots.NumReadyMasterSlots() > 1) { // don't try different CAMs if there is only one
+               startScrambleDetection = time(NULL);
+               scramblingTimeout = TS_SCRAMBLING_TIMEOUT;
+               bool KnownToDecrypt = ChannelCamRelations.CamDecrypt(Receiver->ChannelID(), camSlot->MasterSlotNumber());
+               if (KnownToDecrypt)
+                  scramblingTimeout *= 10; // give it time to receive ECM/EMM
+               dsyslog("CAM %d: %sknown to decrypt channel %s (scramblingTimeout = %ds)", camSlot->SlotNumber(), KnownToDecrypt ? "" : "not ", *Receiver->ChannelID().ToString(), scramblingTimeout);
+               }
             }
          Start();
          return true;
diff --git a/device.h b/device.h
index 9475d23a2..581c187a9 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.2 2016/12/06 14:12:39 kls Exp $
+ * $Id: device.h 4.4 2017/02/21 13:23:24 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -109,6 +109,7 @@ class cDeviceHook : public cListObject {
 class cDevice : public cThread {
   friend class cLiveSubtitle;
   friend class cDeviceHook;
+  friend class cReceiver;
 private:
   static int numDevices;
   static int useDevice;
@@ -355,6 +356,7 @@ class cDevice : public cThread {
 // PID handle facilities
 
 private:
+  mutable cMutex mutexPids;
   virtual void Action(void);
 protected:
   enum ePidType { ptAudio, ptVideo, ptPcr, ptTeletext, ptDolby, ptOther };
@@ -425,6 +427,7 @@ class cDevice : public cThread {
 
 private:
   time_t startScrambleDetection;
+  int scramblingTimeout;
   cCamSlot *camSlot;
 public:
   virtual bool HasCi(void);
diff --git a/diseqc.c b/diseqc.c
index b2f8e35ca..c79e6bb6e 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 4.0 2015/01/26 12:02:14 kls Exp $
+ * $Id: diseqc.c 4.1 2017/01/09 15:10:40 kls Exp $
  */
 
 #include "diseqc.h"
@@ -253,10 +253,10 @@ bool cDiseqc::Parse(const char *s)
   return result;
 }
 
-uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const
+int cDiseqc::SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t *Codes) const
 {
   if ((Codes[0] & 0xF0) == 0x70 ) { // EN50607 aka JESS
-     uint t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
+     int t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
      if (t < 2048 && Scr->Channel() >= 0 && Scr->Channel() < 32) {
         Codes[1] = t >> 8 | Scr->Channel() << 3;
         Codes[2] = t;
@@ -266,7 +266,7 @@ uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes
         }
      }
   else { // EN50494 aka Unicable
-     uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
+     int t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
      if (t < 1024 && Scr->Channel() >= 0 && Scr->Channel() < 8) {
         Codes[3] = t >> 8 | (t == 0 ? 0 : scrBank << 2) | Scr->Channel() << 5;
         Codes[4] = t;
@@ -399,7 +399,7 @@ const char *cDiseqc::GetCodes(const char *s, uchar *Codes, uint8_t *MaxCodes) co
   return NULL;
 }
 
-cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const
+cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, int *Frequency) const
 {
   if (!*CurrentAction)
      *CurrentAction = commands;
diff --git a/diseqc.h b/diseqc.h
index 2c349d14d..9ae9dc729 100644
--- a/diseqc.h
+++ b/diseqc.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.h 4.0 2013/06/12 11:52:17 kls Exp $
+ * $Id: diseqc.h 4.1 2017/01/09 15:11:19 kls Exp $
  */
 
 #ifndef __DISEQC_H
@@ -86,7 +86,7 @@ class cDiseqc : public cListObject {
   mutable int scrBank;
   char *commands;
   bool parsing;
-  uint SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const;
+  int SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t *Codes) const;
   int SetScrPin(const cScr *Scr, uint8_t *Codes) const;
   const char *Wait(const char *s) const;
   const char *GetPosition(const char *s) const;
@@ -96,7 +96,7 @@ class cDiseqc : public cListObject {
   cDiseqc(void);
   ~cDiseqc();
   bool Parse(const char *s);
-  eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const;
+  eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, int *Frequency) const;
       ///< Parses the DiSEqC commands and returns the appropriate action code
       ///< with every call. CurrentAction must be the address of a character pointer,
       ///< which is initialized to NULL. This pointer is used internally while parsing
diff --git a/dvbdevice.c b/dvbdevice.c
index b3d54c6d5..cd928c207 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 4.3 2016/11/07 13:55:58 kls Exp $
+ * $Id: dvbdevice.c 4.4 2017/01/09 15:11:39 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -329,7 +329,7 @@ class cDvbTuner : public cThread {
   void ClearEventQueue(void) const;
   bool GetFrontendStatus(fe_status_t &Status) const;
   cPositioner *GetPositioner(void);
-  void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
+  void ExecuteDiseqc(const cDiseqc *Diseqc, int *Frequency);
   void ResetToneAndVoltage(void);
   bool SetFrontend(void);
   virtual void Action(void);
@@ -696,7 +696,7 @@ cPositioner *cDvbTuner::GetPositioner(void)
   return positioner;
 }
 
-void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
+void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, int *Frequency)
 {
   if (!lnbPowerTurnedOn) {
      CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
@@ -806,7 +806,7 @@ bool cDvbTuner::SetFrontend(void)
 
   SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
-     unsigned int frequency = channel.Frequency();
+     int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
         if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
            frequency -= diseqc->Lof();
@@ -829,7 +829,7 @@ bool cDvbTuner::SetFrontend(void)
         }
      else {
         int tone = SEC_TONE_OFF;
-        if (frequency < (unsigned int)Setup.LnbSLOF) {
+        if (frequency < Setup.LnbSLOF) {
            frequency -= Setup.LnbFrequLo;
            tone = SEC_TONE_OFF;
            }
diff --git a/menu.c b/menu.c
index 30c95f8d6..685e94f61 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.19 2016/12/22 11:00:13 kls Exp $
+ * $Id: menu.c 4.22 2017/03/18 14:27:50 kls Exp $
  */
 
 #include "menu.h"
@@ -3770,8 +3770,18 @@ bool cMenuSetupCAMItem::Changed(void)
   else if (camSlot->IsActivating())
      // TRANSLATORS: note the leading blank!
      Activating = tr(" (activating)");
-  if (cDevice *Device = camSlot->Device())
-     AssignedDevice = cString::sprintf(" %s %d", tr("@ device"), Device->CardIndex() + 1);
+  cVector<int> CardIndexes;
+  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+      if (CamSlot == camSlot || CamSlot->MasterSlot() == camSlot)
+         CamSlot->Devices(CardIndexes);
+      }
+  if (CardIndexes.Size() > 0) {
+     AssignedDevice = cString::sprintf(" %s", tr("@ device"));
+     CardIndexes.Sort(CompareInts);
+     for (int i = 0; i < CardIndexes.Size(); i++)
+         AssignedDevice = cString::sprintf("%s %d", *AssignedDevice, CardIndexes[i] + 1);
+     }
+
   cString buffer = cString::sprintf(" %d %s%s%s", camSlot->SlotNumber(), CamName, *AssignedDevice, Activating);
   if (strcmp(buffer, Text()) != 0) {
      SetText(buffer);
@@ -3799,8 +3809,10 @@ cMenuSetupCAM::cMenuSetupCAM(void)
   SetSection(tr("CAM"));
   SetCols(15);
   SetHasHotkeys();
-  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot))
-      Add(new cMenuSetupCAMItem(CamSlot));
+  for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+      if (CamSlot->IsMasterSlot()) // we only list master CAM slots
+         Add(new cMenuSetupCAMItem(CamSlot));
+      }
   SetHelpKeys();
 }
 
@@ -3865,14 +3877,13 @@ eOSState cMenuSetupCAM::Activate(void)
                   if (cDevice *Device = cDevice::GetDevice(i)) {
                      if (Device->ProvidesChannel(Channel)) {
                         if (Device->Priority() < LIVEPRIORITY) { // don't interrupt recordings
-                           if (CamSlot->CanActivate()) {
-                              if (CamSlot->Assign(Device, true)) { // query
-                                 cControl::Shutdown(); // must end transfer mode before assigning CAM, otherwise it might be unassigned again
-                                 if (CamSlot->Assign(Device)) {
-                                    if (Device->SwitchChannel(Channel, true)) {
-                                       CamSlot->StartActivation();
-                                       return osContinue;
-                                       }
+                           if (CamSlot->Assign(Device, true)) { // query
+                              cControl::Shutdown(); // must end transfer mode before assigning CAM, otherwise it might be unassigned again
+                              CamSlot = CamSlot->MtdSpawn();
+                              if (CamSlot->Assign(Device)) {
+                                 if (Device->SwitchChannel(Channel, true)) {
+                                    CamSlot->StartActivation();
+                                    return osContinue;
                                     }
                                  }
                               }
@@ -5584,7 +5595,7 @@ void cReplayControl::ShowMode(void)
 bool cReplayControl::ShowProgress(bool Initial)
 {
   int Current, Total;
-  if (Initial || time(NULL) - lastProgressUpdate >= 1) {
+  if (Initial || lastSpeed != -1 || time(NULL) - lastProgressUpdate >= 1) {
      if (GetFrameNumber(Current, Total) && Total > 0) {
         if (!visible) {
            displayReplay = Skins.Current()->DisplayReplay(modeOnly);
diff --git a/mtd.c b/mtd.c
new file mode 100644
index 000000000..bf792dd9f
--- /dev/null
+++ b/mtd.c
@@ -0,0 +1,341 @@
+/*
+ * mtd.c: Multi Transponder Decryption
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: mtd.c 1.9 2017/03/27 14:26:04 kls Exp $
+ */
+
+#include "mtd.h"
+#include "receiver.h"
+
+//#define DEBUG_MTD
+#ifdef DEBUG_MTD
+#define DBGMTD(a...) dsyslog(a)
+#else
+#define DBGMTD(a...)
+#endif
+
+//#define KEEPPIDS // for testing and debugging - USE ONLY IF YOU KNOW WHAT YOU ARE DOING!
+
+#define MAX_REAL_PIDS  MAXPID // real PIDs are 13 bit (0x0000 - 0x1FFF)
+#ifdef KEEPPIDS
+#define MAX_UNIQ_PIDS  MAXPID
+#define UNIQ_PID_MASK  0x1FFF
+#else
+#define MAX_UNIQ_PIDS  256    // uniq PIDs are 8 bit (0x00 - 0xFF)
+#define UNIQ_PID_MASK  0x00FF
+#define UNIQ_PID_SHIFT 8
+#endif // KEEPPIDS
+
+// --- cMtdHandler -----------------------------------------------------------
+
+cMtdHandler::cMtdHandler(void)
+{
+}
+
+cMtdHandler::~cMtdHandler()
+{
+  for (int i = 0; i < camSlots.Size(); i++) {
+      dsyslog("CAM %d/%d: deleting MTD CAM slot", camSlots[i]->MasterSlot()->SlotNumber(), i + 1);
+      delete camSlots[i];
+      }
+}
+
+cMtdCamSlot *cMtdHandler::GetMtdCamSlot(cCamSlot *MasterSlot)
+{
+  for (int i = 0; i < camSlots.Size(); i++) {
+      if (!camSlots[i]->Device()) {
+         dsyslog("CAM %d/%d: reusing MTD CAM slot", MasterSlot->SlotNumber(), i + 1);
+         return camSlots[i];
+         }
+      }
+  dsyslog("CAM %d/%d: creating new MTD CAM slot", MasterSlot->SlotNumber(), camSlots.Size() + 1);
+  cMtdCamSlot *s = new cMtdCamSlot(MasterSlot, camSlots.Size());
+  camSlots.Append(s);
+  return s;
+}
+
+int cMtdHandler::Put(const uchar *Data, int Count)
+{
+  int Used = 0;
+  while (Count >= TS_SIZE) {
+        if (int Skipped = TS_SYNC(Data, Count))
+           return Used + Skipped;
+        int Pid = TsPid(Data);
+        if (Pid != CATPID) { // the original CAT with mapped PIDs must be skipped here!
+#ifdef KEEPPIDS
+           int Index = 0;
+#else
+           int Index = (Pid >> UNIQ_PID_SHIFT) - 1;
+#endif // KEEPPIDS
+           if (Index >= 0 && Index < camSlots.Size()) {
+              int w = camSlots[Index]->PutData(Data, TS_SIZE);
+              if (w == 0)
+                 break;
+              else if (w != TS_SIZE)
+                 esyslog("ERROR: incomplete MTD packet written (%d) in PID %d (%04X)", Index + 1, Pid, Pid);
+              }
+           else if (Index >= 0) // we silently ignore Index -1 (i.e. MTD number 0), since there are several hundred empty TS packets when switching to an encrypted channel for the first time since startup
+              esyslog("ERROR: invalid MTD number (%d) in PID %d (%04X)", Index + 1, Pid, Pid);
+           }
+        Data += TS_SIZE;
+        Count -= TS_SIZE;
+        Used += TS_SIZE;
+        }
+  return Used;
+}
+
+int cMtdHandler::Priority(void)
+{
+  int p = IDLEPRIORITY;
+  for (int i = 0; i < camSlots.Size(); i++)
+      p = max(p, camSlots[i]->Priority());
+  return p;
+}
+
+bool cMtdHandler::IsDecrypting(void)
+{
+  for (int i = 0; i < camSlots.Size(); i++) {
+      if (camSlots[i]->IsDecrypting())
+         return true;
+      }
+  return false;
+}
+
+void cMtdHandler::StartDecrypting(void)
+{
+  for (int i = 0; i < camSlots.Size(); i++) {
+      if (camSlots[i]->Device()) {
+         camSlots[i]->TriggerResendPmt();
+         camSlots[i]->StartDecrypting();
+         }
+      }
+}
+
+void cMtdHandler::CancelActivation(void)
+{
+  for (int i = 0; i < camSlots.Size(); i++)
+      camSlots[i]->CancelActivation();
+}
+
+bool cMtdHandler::IsActivating(void)
+{
+  for (int i = 0; i < camSlots.Size(); i++) {
+      if (camSlots[i]->IsActivating())
+         return true;
+      }
+  return false;
+}
+
+bool cMtdHandler::Devices(cVector<int> &CardIndexes)
+{
+  for (int i = 0; i < camSlots.Size(); i++)
+      camSlots[i]->Devices(CardIndexes);
+  return CardIndexes.Size() > 0;
+}
+
+// --- cMtdMapper ------------------------------------------------------------
+
+#define MTD_INVALID_PID 0xFFFF
+
+class cMtdMapper {
+private:
+  int number;
+  int masterCamSlotNumber;
+  uint16_t uniqPids[MAX_REAL_PIDS]; // maps a real PID to a unique PID
+  uint16_t realPids[MAX_UNIQ_PIDS]; // maps a unique PID to a real PID
+  cVector<uint16_t> uniqSids;
+  uint16_t MakeUniqPid(uint16_t RealPid);
+public:
+  cMtdMapper(int Number, int MasterCamSlotNumber);
+  ~cMtdMapper();
+  uint16_t RealToUniqPid(uint16_t RealPid) { if (uniqPids[RealPid]) return uniqPids[RealPid]; return MakeUniqPid(RealPid); }
+  uint16_t UniqToRealPid(uint16_t UniqPid) { return realPids[UniqPid & UNIQ_PID_MASK]; }
+  uint16_t RealToUniqSid(uint16_t RealSid);
+  void Clear(void);
+  };
+
+cMtdMapper::cMtdMapper(int Number, int MasterCamSlotNumber)
+{
+  number = Number;
+  masterCamSlotNumber = MasterCamSlotNumber;
+  Clear();
+}
+
+cMtdMapper::~cMtdMapper()
+{
+}
+
+uint16_t cMtdMapper::MakeUniqPid(uint16_t RealPid)
+{
+#ifdef KEEPPIDS
+  uniqPids[RealPid] = realPids[RealPid] = RealPid;
+  DBGMTD("CAM %d/%d: mapped PID %d (%04X) to %d (%04X)", masterCamSlotNumber, number, RealPid, RealPid, uniqPids[RealPid], uniqPids[RealPid]);
+  return uniqPids[RealPid];
+#else
+  for (int i = 0; i < MAX_UNIQ_PIDS; i++) {
+      if (realPids[i] == MTD_INVALID_PID) { // 0x0000 is a valid PID (PAT)!
+         realPids[i] = RealPid;
+         uniqPids[RealPid] = (number << UNIQ_PID_SHIFT) | i;
+         DBGMTD("CAM %d/%d: mapped PID %d (%04X) to %d (%04X)", masterCamSlotNumber, number, RealPid, RealPid, uniqPids[RealPid], uniqPids[RealPid]);
+         return uniqPids[RealPid];
+         }
+      }
+#endif // KEEPPIDS
+  esyslog("ERROR: MTD %d: mapper ran out of unique PIDs", number);
+  return 0;
+}
+
+uint16_t cMtdMapper::RealToUniqSid(uint16_t RealSid)
+{
+#ifdef KEEPPIDS
+  return RealSid;
+#endif // KEEPPIDS
+  int UniqSid = uniqSids.IndexOf(RealSid);
+  if (UniqSid < 0) {
+     UniqSid = uniqSids.Size();
+     uniqSids.Append(RealSid);
+     DBGMTD("CAM %d/%d: mapped SID %d (%04X) to %d (%04X)", masterCamSlotNumber, number, RealSid, RealSid, UniqSid | (number << UNIQ_PID_SHIFT), UniqSid | (number << UNIQ_PID_SHIFT));
+     }
+  UniqSid |= number << UNIQ_PID_SHIFT;
+  return UniqSid;
+}
+
+void cMtdMapper::Clear(void)
+{
+  DBGMTD("CAM %d/%d: MTD mapper cleared", masterCamSlotNumber, number);
+  memset(uniqPids, 0, sizeof(uniqPids));
+  memset(realPids, MTD_INVALID_PID, sizeof(realPids));
+  uniqSids.Clear();
+}
+
+void MtdMapSid(uchar *p, cMtdMapper *MtdMapper)
+{
+  Poke13(p, MtdMapper->RealToUniqSid(Peek13(p)));
+}
+
+void MtdMapPid(uchar *p, cMtdMapper *MtdMapper)
+{
+  Poke13(p, MtdMapper->RealToUniqPid(Peek13(p)));
+}
+
+// --- cMtdCamSlot -----------------------------------------------------------
+
+#define MTD_BUFFER_SIZE MEGABYTE(1)
+
+cMtdCamSlot::cMtdCamSlot(cCamSlot *MasterSlot, int Index)
+:cCamSlot(NULL, true, MasterSlot)
+{
+  mtdBuffer = new cRingBufferLinear(MTD_BUFFER_SIZE, TS_SIZE, true, "MTD buffer");
+  mtdMapper = new cMtdMapper(Index + 1, MasterSlot->SlotNumber());
+  delivered = false;
+  ciAdapter = MasterSlot->ciAdapter; // we don't pass the CI adapter in the constructor, to prevent this one from being inserted into CamSlots
+}
+
+cMtdCamSlot::~cMtdCamSlot()
+{
+  Assign(NULL);
+  delete mtdMapper;
+  delete mtdBuffer;
+}
+
+const int *cMtdCamSlot::GetCaSystemIds(void)
+{
+  return MasterSlot()->GetCaSystemIds();
+}
+
+void cMtdCamSlot::SendCaPmt(uint8_t CmdId)
+{
+  cMutexLock MutexLock(&mutex);
+  cCiCaPmtList CaPmtList;
+  BuildCaPmts(CmdId, CaPmtList, mtdMapper);
+  MasterSlot()->SendCaPmts(CaPmtList);
+}
+
+bool cMtdCamSlot::RepliesToQuery(void)
+{
+  return MasterSlot()->RepliesToQuery();
+}
+
+bool cMtdCamSlot::ProvidesCa(const int *CaSystemIds)
+{
+  return MasterSlot()->ProvidesCa(CaSystemIds);
+}
+
+bool cMtdCamSlot::CanDecrypt(const cChannel *Channel, cMtdMapper *MtdMapper)
+{
+  return MasterSlot()->CanDecrypt(Channel, mtdMapper);
+}
+
+void cMtdCamSlot::StartDecrypting(void)
+{
+  MasterSlot()->StartDecrypting();
+  cCamSlot::StartDecrypting();
+}
+
+void cMtdCamSlot::StopDecrypting(void)
+{
+  cCamSlot::StopDecrypting();
+  if (!MasterSlot()->IsDecrypting())
+     MasterSlot()->StopDecrypting();
+  cMutexLock MutexLock(&clearMutex);
+  mtdMapper->Clear();
+  mtdBuffer->Clear();
+  delivered = false;
+}
+
+uchar *cMtdCamSlot::Decrypt(uchar *Data, int &Count)
+{
+  // Send data to CAM:
+  if (Count >= TS_SIZE) {
+     Count = TS_SIZE;
+     int Pid = TsPid(Data);
+     TsSetPid(Data, mtdMapper->RealToUniqPid(Pid));
+     MasterSlot()->Decrypt(Data, Count);
+     if (Count == 0)
+        TsSetPid(Data, Pid); // must restore PID for later retry
+     }
+  else
+     Count = 0;
+  // Drop delivered data from previous call:
+  cMutexLock MutexLock(&clearMutex);
+  if (delivered) {
+     mtdBuffer->Del(TS_SIZE);
+     delivered = false;
+     }
+  // Receive data from buffer:
+  int c = 0;
+  uchar *d = mtdBuffer->Get(c);
+  if (d) {
+     if (int Skipped = TS_SYNC(d, c)) {
+        mtdBuffer->Del(Skipped);
+        return NULL;
+        }
+     if (c >= TS_SIZE) {
+        TsSetPid(d, mtdMapper->UniqToRealPid(TsPid(d)));
+        delivered = true;
+        }
+     else
+        d = NULL;
+     }
+  return d;
+}
+
+int cMtdCamSlot::PutData(const uchar *Data, int Count)
+{
+  int Free = mtdBuffer->Free();
+  Free -= Free % TS_SIZE;
+  if (Free < TS_SIZE)
+     return 0;
+  if (Free < Count)
+     Count = Free;
+  return mtdBuffer->Put(Data, Count);
+}
+
+int cMtdCamSlot::PutCat(const uchar *Data, int Count)
+{
+  MasterSlot()->Decrypt(const_cast<uchar *>(Data), Count);
+  return Count;
+}
diff --git a/mtd.h b/mtd.h
new file mode 100644
index 000000000..b77420223
--- /dev/null
+++ b/mtd.h
@@ -0,0 +1,188 @@
+/*
+ * mtd.h: Multi Transponder Decryption
+ *
+ * See the main source file 'vdr.c' for copyright information and
+ * how to reach the author.
+ *
+ * $Id: mtd.h 1.6 2017/03/27 08:30:00 kls Exp $
+ */
+
+#ifndef __MTD_H
+#define __MTD_H
+
+/*
+Multiple Transponder Decryption (MTD) is the method of sending TS packets
+from channels on different transponders to one single CAM for decryption.
+While decrypting several channels from the same transponder ("Multi Channel
+Decryption") is straightforward, because the PIDs are unique within one
+transponder, channels on different transponders might use the same PIDs
+for different streams.
+
+Here's a summary of how MTD is implemented in VDR:
+
+Identifying the relevant source code
+------------------------------------
+
+The actual code that implements the MTD handling is located in the files
+mtd.h and mtd.c. There are also a few places in ci.[hc], device.c and
+menu.c where things need to be handled differently for MTD. All functions
+and variables that have to do with MTD have the three letters "mtd" (upper-
+and/or lowercase) in their name, so that these code lines can be easily
+identified if necessary.
+
+What a plugin implementing a cCiAdapter/cCamSlot needs to do
+------------------------------------------------------------
+
+If an implementation of cCiAdapter/cCamSlot supports MTD, it needs to
+fulfill the following requirements:
+- The cCiAdapter's Assign() function needs to return true for any given
+  device.
+- The cCamSlot's constructor needs to call MtdEnable().
+- The cCamSlot's Decrypt() function shall accept the given TS packet,
+  but shall *not* return a decrypted packet. Decypted packets shall be
+  delivered through a call to MtdPutData(), one at a time.
+- The cCamSlot's Decrypt() function needs to be thread safe, because
+  it will be called from several cMtdCamSlot objects.
+
+Physical vs. virtual CAMs
+-------------------------
+
+MTD is done by having one physical CAM (accessed through a plugin's
+implementation of cCiAdapter/cCamSlot) and several "virtual" CAMs,
+implemented through cMtdCamSlot objects ("MTD CAMs"). For each device
+that requires the physical CAM, one instance of a cMtdCamSlot is created
+on the fly at runtime, and that MTD CAM is assigned to the device.
+The MTD CAM takes care of mapping the PIDs, and a cMtdHandler in the
+physical CAM object distributes the decrypted TS packets to the proper
+devices.
+
+Mapping the PIDs
+----------------
+
+The main problem with MTD is that the TS packets from different devices
+(and thus different transponders with possibly overlapping PIDs) need to
+be combined into one stream, sent to the physical CAM, and finally be sorted
+apart again and returned to the devices they came from. Both aspects are
+solved in VDR by mapping the "real" PIDs into "unique" PIDs. Real PIDs
+are in the range 0x0000-0x1FFF (13 bit). Unique PIDs use the upper 5 bit
+to indicate the number of the MTD CAM a TS packet came from, and the lower
+8 bit as individual PID values. Mapping is done with a single array lookup
+and is thus very fast. The cMtdHandler class takes care of distributing
+the TS packets to the individual cMtdCamSlot objects, while mapping the
+PIDs (in both directions) is done by the cMtdMapper class.
+
+Mapping the SIDs
+----------------
+
+Besides the PIDs there are also the "service ids" (SIDs, a.k.a. "programme
+numbers" or PNRs) that need to be taken care of. SIDs only appear in the
+CA-PMTs sent to the CAM, so they only need to be mapped from real to unique
+(not the other way) and since the are only mapped when switching channels,
+mapping doesn't need to be very fast. Mapping SIDs is also done by the
+cMtdMapper class.
+
+Handling the CAT
+----------------
+
+Each transponder carries a CAT ("Conditional Access Table") with the fixed PID 1.
+The CAT contains a list of EMM PIDs, which are necessary to convey entitlement
+messages to the smart card. Since the CAM only recognizes the CAT if it has
+its fixed PID of 1, this PID cannot be mapped and has to be sent to the CAM
+as is. However, the cCaPidReceiver also needs to see the CAM in order to
+request from the device the TS packets with the EMM PIDs. Since any receivers
+only get the TS packets after they have been sent through the CAM, we need
+to send the CAT in both ways, with mapped PID but unmapped EMM PIDs for the
+cCaPidReceiver, and with unmapped PID but mapped EMM PIDs for the CAM itself.
+Since the PID 0x0001 can always be distinguished from any mapped PID (which
+always have a non-zero upper byte), the CAT can be easily channeled in both
+ways.
+
+Handling the CA-PMTs
+--------------------
+
+The CA-PMTs that are sent to the CAM contain both SIDs and PIDs, which are
+mapped in cCiCaPmt::MtdMapPids().
+*/
+
+#include "ci.h"
+#include "remux.h"
+#include "ringbuffer.h"
+
+class cMtdHandler {
+private:
+  cVector<cMtdCamSlot *> camSlots;
+public:
+  cMtdHandler(void);
+      ///< Creates a new MTD handler that distributes TS data received through
+      ///< calls to the Put() function to the individual CAM slots that have been
+      ///< created via GetMtdCamSlot(). It also distributes several function
+      ///< calls from the physical master CAM slot to the individual MTD CAM slots.
+  ~cMtdHandler();
+  cMtdCamSlot *GetMtdCamSlot(cCamSlot *MasterSlot);
+      ///< Creates a new MTD CAM slot, or reuses an existing one that is currently
+      ///< unused.
+  int Put(const uchar *Data, int Count);
+      ///< Puts at most Count bytes of Data into the CAM slot which's index is
+      ///< derived from the PID of the TS packets.
+      ///< Data must point to the beginning of a TS packet.
+      ///< Returns the number of bytes actually stored.
+  int Priority(void);
+      ///< Returns the maximum priority of any of the active MTD CAM slots.
+  bool IsDecrypting(void);
+      ///< Returns true if any of the active MTD CAM slots is currently decrypting.
+  void StartDecrypting(void);
+      ///< Tells all active MTD CAM slots to start decrypting.
+  void CancelActivation(void);
+      ///< Tells all active MTD CAM slots to cancel activation.
+  bool IsActivating(void);
+      ///< Returns true if any of the active MTD CAM slots is currently activating.
+  bool Devices(cVector<int> &CardIndexes);
+      ///< Adds the card indexes of the devices of any active MTD CAM slots to
+      ///< the given CardIndexes.
+      ///< Returns true if the array is not empty.
+  };
+
+#define MTD_DONT_CALL(v) dsyslog("PROGRAMMING ERROR (%s,%d): DON'T CALL %s", __FILE__, __LINE__, __FUNCTION__); return v;
+
+class cMtdMapper;
+
+void MtdMapSid(uchar *p, cMtdMapper *MtdMapper);
+void MtdMapPid(uchar *p, cMtdMapper *MtdMapper);
+
+class cMtdCamSlot : public cCamSlot {
+private:
+  cMutex clearMutex;
+  cMtdMapper *mtdMapper;
+  cRingBufferLinear *mtdBuffer;
+  bool delivered;
+protected:
+  virtual const int *GetCaSystemIds(void);
+  virtual void SendCaPmt(uint8_t CmdId);
+public:
+  cMtdCamSlot(cCamSlot *MasterSlot, int Index);
+       ///< Creates a new "Multi Transponder Decryption" CAM slot, connected to the
+       ///< given physical MasterSlot, using the given Index for mapping PIDs.
+  virtual ~cMtdCamSlot();
+  cMtdMapper *MtdMapper(void) { return mtdMapper; }
+  virtual bool RepliesToQuery(void);
+  virtual bool ProvidesCa(const int *CaSystemIds);
+  virtual bool CanDecrypt(const cChannel *Channel, cMtdMapper *MtdMapper = NULL);
+  virtual void StartDecrypting(void);
+  virtual void StopDecrypting(void);
+  virtual uchar *Decrypt(uchar *Data, int &Count);
+  int PutData(const uchar *Data, int Count);
+  int PutCat(const uchar *Data, int Count);
+  // The following functions shall not be called for a cMtdCamSlot:
+  virtual cCamSlot *Spawn(void) { MTD_DONT_CALL(NULL); }
+  virtual bool Reset(void) { MTD_DONT_CALL(false); }
+  virtual eModuleStatus ModuleStatus(void) { MTD_DONT_CALL(msNone); }
+  virtual const char *GetCamName(void) { MTD_DONT_CALL(NULL); }
+  virtual bool Ready(void) { MTD_DONT_CALL(false); }
+  virtual bool HasMMI(void) { MTD_DONT_CALL(false); }
+  virtual bool HasUserIO(void) { MTD_DONT_CALL(false); }
+  virtual bool EnterMenu(void) { MTD_DONT_CALL(false); }
+  virtual cCiMenu *GetMenu(void) { MTD_DONT_CALL(NULL); }
+  virtual cCiEnquiry *GetEnquiry(void) { MTD_DONT_CALL(NULL); }
+  };
+
+#endif //__MTD_H
diff --git a/po/ru_RU.po b/po/ru_RU.po
index eea8b8def..f4b3096cf 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,552 +8,552 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
-"PO-Revision-Date: 2013-03-10 17:13+0100\n"
-"Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
+"POT-Creation-Date: 2017-01-05 19:50+1000\n"
+"PO-Revision-Date: 2016-12-27 17:13+0100\n"
+"Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** ������������ ����� ***"
+msgstr "*** Неправильный канал ***"
 
 msgid "CAM activated!"
-msgstr ""
+msgstr "МД активен!"
 
 msgid "Channel not available!"
-msgstr "����� ����������!"
+msgstr "Канал недоступен!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "���������� �������� ����� ��������!"
+msgstr "Невозможно включить режим пропуска!"
 
 msgid "off"
-msgstr "����"
+msgstr "выкл"
 
 msgid "on"
-msgstr "���"
+msgstr "вкл"
 
 msgid "auto"
-msgstr "����"
+msgstr "авто"
 
 msgid "none"
-msgstr "������"
+msgstr "ничего"
 
 msgid "Polarization"
-msgstr "�����������"
+msgstr "Поляризация"
 
 msgid "System"
-msgstr "�������"
+msgstr "Система"
 
 msgid "Srate"
-msgstr "����. ��������"
+msgstr "Симв. скорость"
 
 msgid "Inversion"
-msgstr "��������"
+msgstr "Инверсия"
 
 msgid "CoderateH"
-msgstr "CoderateH"
+msgstr "Выс.поток"
 
 msgid "CoderateL"
-msgstr "CoderateL"
+msgstr "Низ.поток"
 
 msgid "Modulation"
-msgstr "���������"
+msgstr "Модуляция"
 
 msgid "Bandwidth"
-msgstr "��������"
+msgstr "Полоса"
 
 msgid "Transmission"
-msgstr "��������"
+msgstr "Передача"
 
 msgid "Guard"
-msgstr "������"
+msgstr "Защита"
 
 msgid "Hierarchy"
-msgstr "��������"
+msgstr "Иерархия"
 
 msgid "Rolloff"
-msgstr "Rolloff"
+msgstr "Крутизна"
 
 msgid "StreamId"
 msgstr "StreamId"
 
 msgid "Pilot"
-msgstr ""
+msgstr "Пилот"
 
 msgid "T2SystemId"
-msgstr ""
+msgstr "T2SystemId"
 
 msgid "SISO/MISO"
-msgstr ""
+msgstr "SISO/MISO"
 
 msgid "Starting EPG scan"
-msgstr "������� EPG-������������"
+msgstr "Запуск EPG-сканирования"
 
 msgid "Content$Movie/Drama"
-msgstr "�����/�����"
+msgstr "Фильм/Драма"
 
 msgid "Content$Detective/Thriller"
-msgstr "��������/�������"
+msgstr "Детектив/Триллер"
 
 msgid "Content$Adventure/Western/War"
-msgstr "�����������/�������/�����"
+msgstr "Приключение/Вестерн/Война"
 
 msgid "Content$Science Fiction/Fantasy/Horror"
-msgstr "������� ����������/��������/����"
+msgstr "Научная фантастика/Фантазия/Ужас"
 
 msgid "Content$Comedy"
-msgstr "�������"
+msgstr "Комедия"
 
 msgid "Content$Soap/Melodrama/Folkloric"
-msgstr "������� �����/���������/��������"
+msgstr "Мыльная опера/Мелодрама/Фольклор"
 
 msgid "Content$Romance"
-msgstr "���������"
+msgstr "Романтика"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "�����������/��������/�����������/������������ �����/�����"
+msgstr "Серьезность/Классика/Религиозное/Исторический фильм/Драма"
 
 msgid "Content$Adult Movie/Drama"
-msgstr "����� ��� ��������/�����"
+msgstr "Фильм для взрослых/Драма"
 
 msgid "Content$News/Current Affairs"
-msgstr "�������/��������� �������"
+msgstr "Новости/Актульные события"
 
 msgid "Content$News/Weather Report"
-msgstr "�������/������"
+msgstr "Новости/Погода"
 
 msgid "Content$News Magazine"
-msgstr "��������� ������"
+msgstr "Новостной журнал"
 
 msgid "Content$Documentary"
-msgstr "������������"
+msgstr "Документальные"
 
 msgid "Content$Discussion/Inverview/Debate"
-msgstr "���������/��������/������"
+msgstr "Дискуссия/Интервью/Дебаты"
 
 msgid "Content$Show/Game Show"
-msgstr "���/������� ���"
+msgstr "Шоу/Игровое шоу"
 
 msgid "Content$Game Show/Quiz/Contest"
-msgstr "������� ���/���������/������������"
+msgstr "Игровое шоу/Викторина/Соревнование"
 
 msgid "Content$Variety Show"
-msgstr "��������"
+msgstr "Варьетте"
 
 msgid "Content$Talk Show"
-msgstr "������"
+msgstr "Токшоу"
 
 msgid "Content$Sports"
-msgstr "�����"
+msgstr "Спорт"
 
 msgid "Content$Special Event"
-msgstr "��������� �������"
+msgstr "Особенное событие"
 
 msgid "Content$Sport Magazine"
-msgstr "����� ������"
+msgstr "Спорт журнал"
 
 msgid "Content$Football/Soccer"
-msgstr "������"
+msgstr "Футбол"
 
 msgid "Content$Tennis/Squash"
-msgstr "������/�����"
+msgstr "Теннис/Сквош"
 
 msgid "Content$Team Sports"
-msgstr "���������� ���� ������"
+msgstr "Коммандные виды спорта"
 
 msgid "Content$Athletics"
-msgstr "��������"
+msgstr "Атлетика"
 
 msgid "Content$Motor Sport"
-msgstr "����������"
+msgstr "Моторспорт"
 
 msgid "Content$Water Sport"
-msgstr "������ ���� ������"
+msgstr "Водный виды спорта"
 
 msgid "Content$Winter Sports"
-msgstr "������ ���� ������"
+msgstr "Зимние виды спорта"
 
 msgid "Content$Equestrian"
-msgstr "������ �����"
+msgstr "Конный спорт"
 
 msgid "Content$Martial Sports"
-msgstr "������ ���������"
+msgstr "Боевые искусства"
 
 msgid "Content$Children's/Youth Programme"
-msgstr "�������/��������� ���������"
+msgstr "Детская/Юнешеская программа"
 
 msgid "Content$Pre-school Children's Programme"
-msgstr "��������� ��� ������������"
+msgstr "Программа для дошкольников"
 
 msgid "Content$Entertainment Programme for 6 to 14"
-msgstr "��������������� ��������� �� 6 �� 14"
+msgstr "Развлекательная программа от 6 до 14"
 
 msgid "Content$Entertainment Programme for 10 to 16"
-msgstr "��������������� ��������� �� 10 �� 16"
+msgstr "Развлекательная программа от 10 до 16"
 
 msgid "Content$Informational/Educational/School Programme"
-msgstr "��������������/���������������/�������� ���������"
+msgstr "Информационная/Образовательная/Школьная программа"
 
 msgid "Content$Cartoons/Puppets"
-msgstr "�������������/�����"
+msgstr "Мултипликация/Куклы"
 
 msgid "Content$Music/Ballet/Dance"
-msgstr "������/�����/�����"
+msgstr "Музыка/Балет/Танец"
 
 msgid "Content$Rock/Pop"
-msgstr "���/���"
+msgstr "Рок/Поп"
 
 msgid "Content$Serious/Classical Music"
-msgstr "������������ ������"
+msgstr "Классическая музыка"
 
 msgid "Content$Folk/Tradional Music"
-msgstr "��������/������������ ������"
+msgstr "Фольклор/Традиционная музыка"
 
 msgid "Content$Jazz"
-msgstr "����"
+msgstr "Джаз"
 
 msgid "Content$Musical/Opera"
-msgstr "������/�����"
+msgstr "Мюзикл/Опера"
 
 msgid "Content$Ballet"
-msgstr "�����"
+msgstr "Балет"
 
 msgid "Content$Arts/Culture"
-msgstr "���������/��������"
+msgstr "Искусство/Культура"
 
 msgid "Content$Performing Arts"
-msgstr "�������������"
+msgstr "Перформэнсарт"
 
 msgid "Content$Fine Arts"
-msgstr "������� ���������"
+msgstr "Изящное искусство"
 
 msgid "Content$Religion"
-msgstr "�������"
+msgstr "Религия"
 
 msgid "Content$Popular Culture/Traditional Arts"
-msgstr "�����������/������������ ��������"
+msgstr "Попкультура/Традиционная культура"
 
 msgid "Content$Literature"
-msgstr "����������"
+msgstr "Литература"
 
 msgid "Content$Film/Cinema"
-msgstr "�����/�����"
+msgstr "Фильм/Кино"
 
 msgid "Content$Experimental Film/Video"
-msgstr "����������������� �����/�����"
+msgstr "Экспериментальный фильм/Видео"
 
 msgid "Content$Broadcasting/Press"
-msgstr "������� �������/������"
+msgstr "Широкое вещание/Печать"
 
 msgid "Content$New Media"
-msgstr "����� ��������"
+msgstr "Новые средства"
 
 msgid "Content$Arts/Culture Magazine"
-msgstr "���������/���������� ������"
+msgstr "Искусство/Культурный журнал"
 
 msgid "Content$Fashion"
-msgstr "����"
+msgstr "Мода"
 
 msgid "Content$Social/Political/Economics"
-msgstr "����������/������������/�������������"
+msgstr "Социальное/Политическое/Экономическое"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr "������/���������/������������"
+msgstr "Журнал/Экономика/Документальные"
 
 msgid "Content$Economics/Social Advisory"
-msgstr "���������/��������������"
+msgstr "Экономика/Общественность"
 
 msgid "Content$Remarkable People"
-msgstr "���������� ����"
+msgstr "Знаменитые люди"
 
 msgid "Content$Education/Science/Factual"
-msgstr "�����������/�����/�����"
+msgstr "Образование/Наука/Факты"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr "�������/��������/���������"
+msgstr "Природа/Животные/Окружение"
 
 msgid "Content$Technology/Natural Sciences"
-msgstr "����������/������������ �����"
+msgstr "Технологии/Естественные науки"
 
 msgid "Content$Medicine/Physiology/Psychology"
-msgstr "��������/����������/����������"
+msgstr "Медицина/Физиология/Психология"
 
 msgid "Content$Foreign Countries/Expeditions"
-msgstr "������/����������"
+msgstr "Страны/Экспедиции"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr "����������/������������� �����"
+msgstr "Социальное/Спиритуальные науки"
 
 msgid "Content$Further Education"
-msgstr "��������� ������������"
+msgstr "Повышение квалификации"
 
 msgid "Content$Languages"
-msgstr "�����"
+msgstr "Языки"
 
 msgid "Content$Leisure/Hobbies"
-msgstr "��������� �����/�����"
+msgstr "Свободное время/Хобби"
 
 msgid "Content$Tourism/Travel"
-msgstr "������/�����������"
+msgstr "Туризм/Путешествия"
 
 msgid "Content$Handicraft"
-msgstr "�������"
+msgstr "Ремесло"
 
 msgid "Content$Motoring"
-msgstr "�����"
+msgstr "Мотор"
 
 msgid "Content$Fitness & Health"
-msgstr "������ � ��������"
+msgstr "Фитнес и здоровье"
 
 msgid "Content$Cooking"
-msgstr "���������"
+msgstr "Кулинария"
 
 msgid "Content$Advertisement/Shopping"
-msgstr "�������/�������"
+msgstr "Реклама/Покупки"
 
 msgid "Content$Gardening"
-msgstr "�����������"
+msgstr "Садоводство"
 
 msgid "Content$Original Language"
-msgstr "������������ ����"
+msgstr "Оригинальный язык"
 
 msgid "Content$Black & White"
-msgstr "����������"
+msgstr "Чернобелое"
 
 msgid "Content$Unpublished"
-msgstr "����������������"
+msgstr "Неопубликованное"
 
 msgid "Content$Live Broadcast"
-msgstr "������ �������"
+msgstr "Прямое вещание"
 
 #, c-format
 msgid "ParentalRating$from %d"
-msgstr "�� %d"
+msgstr "от %d"
 
 msgid "No title"
-msgstr "��� ��������"
+msgstr "Без названия"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
-msgstr "�������"
+msgstr "Русский"
 
 #. TRANSLATORS: The 3-letter code of the language
 msgid "LanguageCode$eng"
 msgstr "rus"
 
 msgid "Phase 1: Detecting RC code type"
-msgstr "��� 1: ����������� ���� ���� ������"
+msgstr "Шаг 1: Определение типа кода пульта"
 
 msgid "Press any key on the RC unit"
-msgstr "������� ����� ������ �� ������"
+msgstr "Нажмите любую кнопку на пульте"
 
 msgid "RC code detected!"
-msgstr "��������� ��� ������!"
+msgstr "Обнаружен код пульта!"
 
 msgid "Do not press any key..."
-msgstr "�� ��������� ������..."
+msgstr "Не нажимайте кнопки..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "��� 2: ������� ����� ��������� ������"
+msgstr "Шаг 2: Задание кодов отдельных кнопок"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "������� ������ '%s'"
+msgstr "Нажмите кнопку '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "������� '�����' ����� �����������"
+msgstr "Нажмите 'Вверх' чтобы подтвердить"
 
 msgid "Press 'Down' to continue"
-msgstr "������� '����' ����� ����������"
+msgstr "Нажмите 'Вниз' чтобы продолжить"
 
 msgid "(press 'Up' to go back)"
-msgstr "(������� '�����' ����� ���������)"
+msgstr "(Нажмите 'Вверх' чтобы вернуться)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(������� '����' ����� ��������� ��������� ������)"
+msgstr "(Нажмите 'Вниз' чтобы закончить настройку пульта)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(������� '����' ����� ���������� ������)"
+msgstr "(Нажмите 'Меню' чтобы пропустить кнопку)"
 
 msgid "Learning Remote Control Keys"
-msgstr "�������� ������"
+msgstr "Обучение пульта"
 
 msgid "Phase 3: Saving key codes"
-msgstr "��� 3: ����������� ����� ������"
+msgstr "Шаг 3: Запоминание кодов кнопок"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "������� '�����' ����� ���������, '����' ����� ����������"
+msgstr "Нажмите 'Вверх' чтобы запомнить, 'Вниз' чтобы отказаться"
 
 msgid "Key$Up"
-msgstr "�����"
+msgstr "Вверх"
 
 msgid "Key$Down"
-msgstr "����"
+msgstr "Вниз"
 
 msgid "Key$Menu"
-msgstr "����"
+msgstr "Меню"
 
 msgid "Key$Ok"
-msgstr "Ok"
+msgstr "Ок"
 
 msgid "Key$Back"
-msgstr "�����"
+msgstr "Назад"
 
 msgid "Key$Left"
-msgstr "������"
+msgstr "Налево"
 
 msgid "Key$Right"
-msgstr "�������"
+msgstr "Направо"
 
 msgid "Key$Red"
-msgstr "�������"
+msgstr "Красный"
 
 msgid "Key$Green"
-msgstr "�������"
+msgstr "Зелёный"
 
 msgid "Key$Yellow"
-msgstr "������"
+msgstr "Жёлтый"
 
 msgid "Key$Blue"
-msgstr "�����"
+msgstr "Синий"
 
 msgid "Key$Info"
-msgstr "����"
+msgstr "Инфо"
 
 msgid "Key$Play/Pause"
-msgstr "���������������/�����"
+msgstr "Воспроизведение/Пауза"
 
 msgid "Key$Play"
-msgstr "���������������"
+msgstr "Воспроизведение"
 
 msgid "Key$Pause"
-msgstr "�����"
+msgstr "Пауза"
 
 msgid "Key$Stop"
-msgstr "����"
+msgstr "Стоп"
 
 msgid "Key$Record"
-msgstr "������"
+msgstr "Запись"
 
 msgid "Key$FastFwd"
-msgstr "��������� ������"
+msgstr "Прокрутка вперёд"
 
 msgid "Key$FastRew"
-msgstr "��������� �����"
+msgstr "Прокрутка назад"
 
 msgid "Key$Next"
-msgstr "������"
+msgstr "Вперед"
 
 msgid "Key$Prev"
-msgstr "�����"
+msgstr "Назад"
 
 msgid "Key$Power"
-msgstr "���������"
+msgstr "Выключить"
 
 msgid "Key$Channel+"
-msgstr "����� +"
+msgstr "Канал +"
 
 msgid "Key$Channel-"
-msgstr "����� -"
+msgstr "Канал -"
 
 msgid "Key$PrevChannel"
-msgstr "���������� �����"
+msgstr "Предыдущий канал"
 
 msgid "Key$Volume+"
-msgstr "��������� +"
+msgstr "Громкость +"
 
 msgid "Key$Volume-"
-msgstr "��������� -"
+msgstr "Громкость -"
 
 msgid "Key$Mute"
-msgstr "��������� ����"
+msgstr "Выключить звук"
 
 msgid "Key$Audio"
-msgstr "����"
+msgstr "Язык"
 
 msgid "Key$Subtitles"
-msgstr "��������"
+msgstr "Субтитры"
 
 msgid "Key$Schedule"
-msgstr "�������"
+msgstr "Телегид"
 
 msgid "Key$Channels"
-msgstr "������"
+msgstr "Каналы"
 
 msgid "Key$Timers"
-msgstr "�������"
+msgstr "Таймеры"
 
 msgid "Key$Recordings"
-msgstr "������"
+msgstr "Записи"
 
 msgid "Key$Setup"
-msgstr "���������"
+msgstr "Настройка"
 
 msgid "Key$Commands"
-msgstr "�������"
+msgstr "Команды"
 
 msgid "Key$User0"
-msgstr "������������0"
+msgstr "Пользователь0"
 
 msgid "Key$User1"
-msgstr "������������1"
+msgstr "Пользователь1"
 
 msgid "Key$User2"
-msgstr "������������2"
+msgstr "Пользователь2"
 
 msgid "Key$User3"
-msgstr "������������3"
+msgstr "Пользователь3"
 
 msgid "Key$User4"
-msgstr "������������4"
+msgstr "Пользователь4"
 
 msgid "Key$User5"
-msgstr "������������5"
+msgstr "Пользователь5"
 
 msgid "Key$User6"
-msgstr "������������6"
+msgstr "Пользователь6"
 
 msgid "Key$User7"
-msgstr "������������7"
+msgstr "Пользователь7"
 
 msgid "Key$User8"
-msgstr "������������8"
+msgstr "Пользователь8"
 
 msgid "Key$User9"
-msgstr "������������9"
+msgstr "Пользователь9"
 
 msgid "Free To Air"
-msgstr "FTA (��������������)"
+msgstr "FTA (незакодировано)"
 
 msgid "encrypted"
-msgstr "������������"
+msgstr "закодировано"
 
 msgid "Edit channel"
-msgstr "�������������� ������"
+msgstr "Редактирование канала"
 
 msgid "Name"
-msgstr "��������"
+msgstr "Название"
 
 msgid "Source"
-msgstr "��������"
+msgstr "Источник"
 
 msgid "Frequency"
-msgstr "�������"
+msgstr "Частота"
 
 msgid "Vpid"
-msgstr "Vpid (�����)"
+msgstr "Vpid (видео)"
 
 msgid "Ppid"
 msgstr "Ppid"
 
 msgid "Apid1"
-msgstr "Apid1 (����� 1)"
+msgstr "Apid1 (аудио 1)"
 
 msgid "Apid2"
-msgstr "Apid2 (����� 2)"
+msgstr "Apid2 (аудио 2)"
 
 msgid "Dpid1"
 msgstr "Dpid1 (AC3 1)"
@@ -562,754 +562,754 @@ msgid "Dpid2"
 msgstr "Dpid2 (AC3 2)"
 
 msgid "Spid1"
-msgstr "�������� ���1"
+msgstr "Субтитры ПИД1"
 
 msgid "Spid2"
-msgstr "�������� ���2"
+msgstr "Субтитры ПИД2"
 
 msgid "Tpid"
-msgstr "Tpid (���������)"
+msgstr "Tpid (телетекст)"
 
 msgid "CA"
-msgstr "CA (�������)"
+msgstr "CA (модуль доступа)"
 
 msgid "Sid"
 msgstr "Sid"
 
 msgid "Nid"
-msgstr ""
+msgstr "Nid"
 
 msgid "Tid"
-msgstr ""
+msgstr "Tid"
 
 msgid "Channel settings are not unique!"
-msgstr "��������� ������ �� ���������!"
+msgstr "Настройки канала не уникальны!"
 
 msgid "Channels"
-msgstr "������"
+msgstr "Каналы"
 
 msgid "Button$Edit"
-msgstr "�������������"
+msgstr "Редактировать"
 
 msgid "Button$New"
-msgstr "��������"
+msgstr "Добавить"
 
 msgid "Button$Delete"
-msgstr "�������"
+msgstr "Удалить"
 
 msgid "Button$Mark"
-msgstr "�����������"
+msgstr "Переместить"
 
 msgid "Channel is being used by a timer!"
-msgstr "����� ����� ��������!"
+msgstr "Канал занят таймером!"
 
 msgid "Delete channel?"
-msgstr "������� �����?"
+msgstr "Удалить канал?"
 
 msgid "Edit folder"
-msgstr "�������� ����������"
+msgstr "Редакция директории"
 
 msgid "New folder"
-msgstr "����� ����������"
+msgstr "Новая директория"
 
 msgid "Sub folder"
-msgstr "�������������"
+msgstr "поддиректория"
 
 msgid "Folder name already exists!"
-msgstr "���������� ��� ����������!"
+msgstr "Директория уже существует!"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "��� ���������� �� ������ ��������� '%c'!"
+msgstr "Имя директории не должно содержать '%c'!"
 
 msgid "Button$Open"
-msgstr "�������"
+msgstr "Открыть"
 
 msgid "Delete folder and all sub folders?"
-msgstr "������� ���������� � ��� �������������?"
+msgstr "Удалить директорию и все поддиректории?"
 
 msgid "Delete folder?"
-msgstr "������� ����������?"
+msgstr "Удалить директорию?"
 
 msgid "Edit timer"
-msgstr "��������� �������"
+msgstr "Установка таймера"
 
 msgid "Active"
-msgstr "�����������"
+msgstr "Активирован"
 
 msgid "Channel"
-msgstr "�����"
+msgstr "Канал"
 
 msgid "Day"
-msgstr "����"
+msgstr "День"
 
 msgid "Start"
-msgstr "������"
+msgstr "Начало"
 
 msgid "Stop"
-msgstr "�����"
+msgstr "Конец"
 
 msgid "VPS"
-msgstr "VPS ��������"
+msgstr "VPS поправка"
 
 msgid "Priority"
-msgstr "���������"
+msgstr "Приоритет"
 
 msgid "Lifetime"
-msgstr "���� ��������"
+msgstr "Срок хранения"
 
 msgid "File"
-msgstr "����"
+msgstr "Файл"
 
 msgid "Record on"
-msgstr ""
+msgstr "Запись вкл."
 
 msgid "Button$Folder"
-msgstr "����������"
+msgstr "Директория"
 
 msgid "Button$Single"
-msgstr "���� ���"
+msgstr "Один раз"
 
 msgid "Button$Repeating"
-msgstr "������"
+msgstr "Повтор"
 
 msgid "First day"
-msgstr "������ ����"
+msgstr "Первый день"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Ошибка доступа к таймеру"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Таймер был удалён!"
 
 msgid "Select folder"
-msgstr "����� ����������"
+msgstr "Выбор директории"
 
 msgid "Timers"
-msgstr "�������"
+msgstr "Таймеры"
 
 msgid "Button$On/Off"
-msgstr "���/����"
+msgstr "Вкл/Выкл"
 
 msgid "Button$Info"
-msgstr "����"
+msgstr "Инфо"
 
 msgid "Delete timer?"
-msgstr "������� ������?"
+msgstr "Удалить таймер?"
 
 msgid "Timer still recording - really delete?"
-msgstr "���� ������ �� ������� - ������������� �������?"
+msgstr "Идёт запись по таймеру - действительно удалить?"
 
 msgid "Event"
-msgstr "��������"
+msgstr "Передача"
 
 msgid "Button$Timer"
-msgstr "������"
+msgstr "Таймер"
 
 msgid "Button$Record"
-msgstr "������"
+msgstr "Запись"
 
 msgid "Button$Switch"
-msgstr "�����������"
+msgstr "Переключить"
 
 msgid "What's on now?"
-msgstr "������ � �����:"
+msgstr "Сейчас в эфире:"
 
 msgid "What's on next?"
-msgstr "����� � ���������:"
+msgstr "Далее в программе:"
 
 msgid "Button$Next"
-msgstr "�����"
+msgstr "Далее"
 
 msgid "Button$Now"
-msgstr "������"
+msgstr "Сейчас"
 
 msgid "Button$Schedule"
-msgstr "���������"
+msgstr "Программа"
 
 msgid "Can't switch channel!"
-msgstr "���������� ����������� �����!"
+msgstr "Невозможно переключить канал!"
 
 #, c-format
 msgid "Schedule - %s"
-msgstr "��������� - %s"
+msgstr "Программа - %s"
 
 #, c-format
 msgid "This event - %s"
-msgstr "��� �������� - %s"
+msgstr "Эта передача - %s"
 
 msgid "This event - all channels"
-msgstr "��� �������� - ��� ������"
+msgstr "Эта передача - все каналы"
 
 msgid "All events - all channels"
-msgstr "��� �������� - ��� ������"
+msgstr "Все передачи - все каналы"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "������� %d �����"
+msgstr "Нажмите %d цифры"
 
 msgid "CAM not responding!"
-msgstr "CAM �� ��������"
+msgstr "CAM не отвечает"
 
 msgid "Edit path"
-msgstr ""
+msgstr "Изменить путь"
 
 msgid "Folder"
-msgstr ""
+msgstr "Папка"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Папка используется - не изменено!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr ""
+msgstr "Переместить папку с %d записями?"
 
 msgid "Error while moving folder!"
-msgstr ""
+msgstr "Ошибка перемещения папки!"
 
 msgid "Edit recording"
-msgstr ""
+msgstr "Изменить запись"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr ""
+msgstr "Запись используется - изменение не возможно!"
 
 msgid "Button$Cancel cutting"
-msgstr ""
+msgstr "Отмена обрезки"
 
 msgid "Button$Stop cutting"
-msgstr ""
+msgstr "Останов. обрезку"
 
 msgid "Button$Cancel moving"
-msgstr ""
+msgstr "Отмена перемещения"
 
 msgid "Button$Stop moving"
-msgstr ""
+msgstr "Останов. перемещение"
 
 msgid "Button$Cancel copying"
-msgstr ""
+msgstr "Отмена копирования"
 
 msgid "Button$Stop copying"
-msgstr ""
+msgstr "Останов. копирование"
 
 msgid "Button$Cut"
-msgstr ""
+msgstr "Обрезка"
 
 msgid "Button$Delete marks"
-msgstr ""
+msgstr "Удалить метки"
 
 msgid "Recording vanished!"
-msgstr ""
+msgstr "Запись исчезла!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr ""
+msgstr "Изменённая версия уже есть - переписать?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr ""
+msgstr "Ошибка очереди записи для обрезки!"
 
 msgid "Rename recording to folder name?"
-msgstr ""
+msgstr "Переименовать запись в имя папки?"
 
 msgid "Delete editing marks for this recording?"
-msgstr ""
+msgstr "Удалить метки для этой записи?"
 
 msgid "Error while deleting editing marks!"
-msgstr ""
+msgstr "Ошибка удаления меток!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr ""
+msgstr "Ошибка изменения приоритета/длительности"
 
 msgid "Error while changing folder/name!"
-msgstr ""
+msgstr "Ошибка изменения папки/имени!"
 
 msgid "Recording info"
-msgstr "���� � ������"
+msgstr "Инфо о записи"
 
 msgid "Button$Play"
-msgstr "�������������"
+msgstr "Воспроизвести"
 
 msgid "Button$Rewind"
-msgstr "�����"
+msgstr "Назад"
 
 msgid "Recordings"
-msgstr "������"
+msgstr "Записи"
 
 msgid "Commands"
-msgstr "�������"
+msgstr "Команды"
 
 msgid "Delete recording?"
-msgstr "������� ������?"
+msgstr "Стереть запись?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "������ �������� - ������������� �������?"
+msgstr "Запись изменена - действительно удалить?"
 
 msgid "Error while deleting recording!"
-msgstr "������ �������� ������!"
+msgstr "Ошибка удаления записи!"
 
 msgid "Recording commands"
-msgstr "������� ������"
+msgstr "Команды записи"
 
 msgid "never"
-msgstr "�������"
+msgstr "никогда"
 
 msgid "skin dependent"
-msgstr "�������� �����"
+msgstr "согласно стиля"
 
 msgid "always"
-msgstr "������"
+msgstr "всегда"
 
 msgid "by name"
-msgstr ""
+msgstr "по имени"
 
 msgid "by time"
-msgstr ""
+msgstr "по времени"
 
 msgid "OSD"
-msgstr "����"
+msgstr "Меню"
 
 msgid "Setup.OSD$Language"
-msgstr "����"
+msgstr "Язык"
 
 msgid "Setup.OSD$Skin"
-msgstr "�����"
+msgstr "Стиль"
 
 msgid "Setup.OSD$Theme"
-msgstr "����"
+msgstr "Тема"
 
 msgid "Setup.OSD$Left (%)"
-msgstr "������ ����� (%)"
+msgstr "Отступ слева (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr "������ ������ (%)"
+msgstr "Отступ сверху (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "������ (%)"
+msgstr "Ширина (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "������ (%)"
+msgstr "Высота (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "������������ ������ ��������� (���)"
+msgstr "Длительность показа сообщений (сек)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "������������ ������ �����"
+msgstr "Использовать мелкий шрифт"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "����������� �������"
+msgstr "Сглаживание шрифтов"
 
 msgid "Setup.OSD$Default font"
-msgstr "����������� ����"
+msgstr "Стандартный шрифт"
 
 msgid "Setup.OSD$Small font"
-msgstr "������ ����"
+msgstr "Мелкий шрифт"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "������������� ����"
+msgstr "Фиксированный шрифт"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "������ ����� ��� ���� (%)"
+msgstr "Размер шрифта для меню (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "������ ������� ����� (%)"
+msgstr "Размер мелкого шрифта (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "������ �������������� ����� (%)"
+msgstr "Размер фиксированного шрифта (%)"
 
 msgid "Setup.OSD$Channel info position"
-msgstr "��������� ���� ���������� � ������"
+msgstr "Положение окна информации о канале"
 
 msgid "bottom"
-msgstr "�����"
+msgstr "снизу"
 
 msgid "top"
-msgstr "������"
+msgstr "сверху"
 
 msgid "Setup.OSD$Channel info time (s)"
-msgstr "����� ���������� � ������ (���)"
+msgstr "Показ информации о канале (сек)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "���������� ���������� � ������"
+msgstr "Показывать информацию о канале"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "���������� � ������ �������"
+msgstr "Информацию о канале закрыть"
 
 msgid "Setup.OSD$Scroll pages"
-msgstr "��������� ������� ����"
+msgstr "Прокрутка страниц меню"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "����������� ���������"
+msgstr "Циклическая прокрутка"
 
 msgid "Setup.OSD$Menu key closes"
-msgstr "������ ���� �������"
+msgstr "Кнопку Меню закрыть"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "�������� �������� �������"
+msgstr "Каталоги хранения записей"
 
 msgid "Setup.OSD$Folders in timer menu"
-msgstr "���������� � ���� ������"
+msgstr "Директории в меню таймер"
 
 msgid "Setup.OSD$Always sort folders first"
-msgstr "���������� ������ � ������ ������� �����������"
+msgstr "Директории всегда в первую очередь сортировать"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Сортировка по умолчанию"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr "���������� ������ ��� ��������"
+msgstr "Количество кнопок для символов"
 
 msgid "Setup.OSD$Color key 0"
-msgstr "������� ������ 0"
+msgstr "Цветная кнопка 0"
 
 msgid "Setup.OSD$Color key 1"
-msgstr "������� ������ 1"
+msgstr "Цветная кнопка 1"
 
 msgid "Setup.OSD$Color key 2"
-msgstr "������� ������ 2"
+msgstr "Цветная кнопка 2"
 
 msgid "Setup.OSD$Color key 3"
-msgstr "������� ������ 3"
+msgstr "Цветная кнопка 3"
 
 msgid "EPG"
-msgstr "�������"
+msgstr "Телегид"
 
 msgid "Button$Scan"
-msgstr "�����������"
+msgstr "Сканировать"
 
 msgid "Setup.EPG$EPG scan timeout (h)"
-msgstr "�������� ������������ �������� (�)"
+msgstr "Задержка сканирования телегида (ч)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "������� ��������� ������"
+msgstr "Уровень коррекции ошибок"
 
 msgid "Setup.EPG$EPG linger time (min)"
-msgstr "�������� ���������� ������ (���)"
+msgstr "Хранение устаревших данных (мин)"
 
 msgid "Setup.EPG$Set system time"
-msgstr "���������� ��������� �����"
+msgstr "Установить системное время"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "������������ ����� ������������"
+msgstr "Использовать время транспондера"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "�������������� ����� (�������)"
+msgstr "Предпочитаемые языки (телегид)"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "������"
+msgstr "Выбранный язык"
 
 msgid "pan&scan"
-msgstr "��������������"
+msgstr "панорамировать"
 
 msgid "letterbox"
-msgstr "���������"
+msgstr "уменьшать"
 
 msgid "center cut out"
-msgstr "�������� �����"
+msgstr "обрезать сбоку"
 
 msgid "no"
-msgstr "���"
+msgstr "нет"
 
 msgid "names only"
-msgstr "������ ��������"
+msgstr "только названия"
 
 msgid "PIDs only"
-msgstr "������ PID�"
+msgstr "Только PIDы"
 
 msgid "names and PIDs"
-msgstr "�������� � PID�"
+msgstr "названия и PIDы"
 
 msgid "add new channels"
-msgstr "����� ������"
+msgstr "новые каналы"
 
 msgid "add new transponders"
-msgstr "���. ������������"
+msgstr "нов. транспондеры"
 
 msgid "DVB"
 msgstr "DVB"
 
 msgid "Button$Audio"
-msgstr "����"
+msgstr "Язык"
 
 msgid "Button$Subtitles"
-msgstr "��������"
+msgstr "Субтитры"
 
 msgid "Setup.DVB$Primary DVB interface"
-msgstr "�������� DVB-����������"
+msgstr "Основное DVB-устройство"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr "����������� ���������"
+msgstr "Стандартное поведение"
 
 msgid "Setup.DVB$Video format"
-msgstr "������ �����"
+msgstr "Формат видео"
 
 msgid "Setup.DVB$Video display format"
-msgstr "�������������� �����������"
+msgstr "Широкоэкранное изображение"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "�������� Dolby Digital"
+msgstr "Включить Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "��������� ��������� �������"
+msgstr "Обновлять настройки каналов"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "�������������� ����� (����)"
+msgstr "Предпочитаемые языки (звук)"
 
 msgid "Setup.DVB$Audio language"
-msgstr "������"
+msgstr "Выбран"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "���������� ��������"
+msgstr "Показывать субтитры"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "����� ���������"
+msgstr "Языки субтитров"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "���� ���������"
+msgstr "Язык субтитров"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "����� ���������"
+msgstr "Сдвиг субтитров"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "������������ ��������� ����� ���������"
+msgstr "Прозрачность переднего плана субтитров"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "������������ ���� ���������"
+msgstr "Прозрачность фона субтитров"
 
 msgid "LNB"
-msgstr "���������"
+msgstr "Конвертер"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "������������ DiSEqC"
+msgstr "Использовать DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
-msgstr "������� ������������ (SLOF) (���)"
+msgstr "Частота переключения (SLOF) (МГц)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "������ ������� ���������� (���)"
+msgstr "Нижняя частота конвертера (МГц)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "������� ������� ���������� (���)"
+msgstr "Верхняя частота конвертера (МГц)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr "���������� %d ����������� � ���������"
+msgstr "Устройство %d подключеное к саткабелю"
 
 msgid "Setup.LNB$own"
-msgstr "����"
+msgstr "свой"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr ""
+msgstr "Использовать позиционер"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr ""
+msgstr "Широта (град.)"
 
 msgid "South"
-msgstr ""
+msgstr "Юг"
 
 msgid "North"
-msgstr ""
+msgstr "Север"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr ""
+msgstr "Долгота (град.)"
 
 msgid "West"
-msgstr ""
+msgstr "Запад"
 
 msgid "East"
-msgstr ""
+msgstr "Восток"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr ""
+msgstr "Макс ход позиционера (град.)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr ""
+msgstr "Скорость позиционера (град./сек)"
 
 msgid "CAM reset"
-msgstr "CAM ����������"
+msgstr "CAM сброс"
 
 msgid "CAM present"
-msgstr "CAM ������������"
+msgstr "CAM присутствует"
 
 msgid "CAM ready"
-msgstr "CAM �����"
+msgstr "CAM готов"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr ""
+msgstr " (запускается)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ устройство"
 
 msgid "CAM"
-msgstr "�������� ������"
+msgstr "Условный доступ"
 
 msgid "Button$Cancel activation"
-msgstr ""
+msgstr "Отмена запуска"
 
 msgid "Button$Activate"
-msgstr ""
+msgstr "Запуск"
 
 msgid "Button$Menu"
-msgstr "����"
+msgstr "Меню"
 
 msgid "Button$Reset"
-msgstr "�����"
+msgstr "Сброс"
 
 msgid "Opening CAM menu..."
-msgstr "�������� ���� ������ ��������� ������� (CAM)"
+msgstr "Открываю меню модуля условного доступа (CAM)"
 
 msgid "Can't open CAM menu!"
-msgstr "���� CAM-������ ����������!"
+msgstr "Меню CAM-модуля недоступно!"
 
 msgid "Can't activate CAM!"
-msgstr ""
+msgstr "CAM не запущен!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM ������������ - ������������� �����������?"
+msgstr "CAM используется - действительно перегрузить?"
 
 msgid "Can't reset CAM!"
-msgstr "������ ����������� CAM-������!"
+msgstr "Ошибка перезапуска CAM-модуля!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "нет быстрой записи"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "подтв. быструю запись"
 
 msgid "record instantly"
-msgstr ""
+msgstr "быстрая запись"
 
 msgid "do not pause live video"
-msgstr "�� ������������� live video"
+msgstr "не останавливать live video"
 
 msgid "confirm pause live video"
-msgstr "������������� ��������� live video"
+msgstr "подтверждение остановки live video"
 
 msgid "pause live video"
-msgstr "��������� live video"
+msgstr "остановка live video"
 
 msgid "confirm"
-msgstr "�������������"
+msgstr "подтверждение"
 
 msgid "yes"
-msgstr "��"
+msgstr "да"
 
 msgid "Recording"
-msgstr "������"
+msgstr "Запись"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "���������� ������ ������ (���)"
+msgstr "Опережение начала записи (мин)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "������������ ��������� ������ (���)"
+msgstr "Запаздывание остановки записи (мин)"
 
 msgid "Setup.Recording$Default priority"
-msgstr "��������� ������� �� ���������"
+msgstr "Приоритет таймера по умолчанию"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "���� �������� ������ �� ��������� (�)"
+msgstr "Срок хранения записи по умолчанию (д)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Функция кнопки запись"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "������� ������ �����"
+msgstr "Функция кнопки пауза"
 
 msgid "Setup.Recording$Pause priority"
-msgstr "��������� ����������� ���������"
+msgstr "Приоритет отложенного просмотра"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "�������� ����������� ��������� (�)"
+msgstr "Хранение отложенного просмотра (д)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "������������ ����� �� ��������"
+msgstr "Группировать файлы по эпизодам"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "������������ ������� VPS"
+msgstr "Использовать сигналы VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
-msgstr "�������� ����� VPS (���)"
+msgstr "Буферное время VPS (сек)"
 
 msgid "Setup.Recording$Mark instant recording"
-msgstr "�������� ��������� ������� ������"
+msgstr "Отмечать быстрые записи"
 
 msgid "Setup.Recording$Name instant recording"
-msgstr "����� ���������� ������ �������"
+msgstr "Имя быстрой записи"
 
 msgid "Setup.Recording$Instant rec. time (min)"
-msgstr "������������ ������ ������ (���)"
+msgstr "Длительность быстрой записи (мин)"
 
 msgid "Setup.Recording$present event"
-msgstr "������� ��������"
+msgstr "текущая передача"
 
 msgid "Setup.Recording$Max. video file size (MB)"
-msgstr "����. ������ ���������� (��)"
+msgstr "Макс. размер видеофайла (Мб)"
 
 msgid "Setup.Recording$Split edited files"
-msgstr "������ ����������������� �����"
+msgstr "Делить отредактированные файлы"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "�������� ���������� ������"
+msgstr "удаления отложенной записи"
 
 msgid "Replay"
-msgstr "���������������"
+msgstr "Воспроизведение"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "��������������� �����"
+msgstr "Многоскоростной режим"
 
 msgid "Setup.Replay$Show replay mode"
-msgstr "���������� ����� ���������������"
+msgstr "Отображать режим воспроизведения"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr "����� ����������� �������"
+msgstr "Показ оставшегося времени"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr "����� ��������� (s)"
+msgstr "Показ прогресса (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
-msgstr "����� ��� ��������� ����������"
+msgstr "Пауза при установке маркировки"
 
 msgid "Setup.Replay$Pause replay when jumping to a mark"
-msgstr ""
+msgstr "Пауза после перемещения к метке"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr ""
+msgstr "Пропуск изменённой части"
 
 msgid "Setup.Replay$Pause replay at last mark"
-msgstr ""
+msgstr "Пауза на последней метке"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr ""
+msgstr "Начальный интервал адаптивного пропуска (сек)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
-msgstr ""
+msgstr "Сброс ожидания адаптивного пропуска (сек)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr ""
+msgstr "Другое поведение адаптивного пропуска"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr ""
+msgstr "Использовать Назад/Вперёд для адаптивного поиска"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr ""
+msgstr "Пропуск интервала Зелёный/Жёлтый (сек)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr ""
+msgstr "Пропуск интервала Зелёный/Жёлтый в повторе (сек)"
 
 msgid "Setup.Replay$Resume ID"
-msgstr "ID ���������������"
+msgstr "ID воспроизведения"
 
 msgid "Miscellaneous"
-msgstr "������"
+msgstr "Прочее"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
-msgstr "���. ����� �������� ������� (���)"
+msgstr "Мин. время ожидания события (мин)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "���. ����� �������� ����� (���)"
+msgstr "Мин. время ожидания ввода (мин)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
-msgstr "�������� ������ ����. SVDRP (���)"
+msgstr "Задержка обрыва соед. SVDRP (сек)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
 msgstr ""
@@ -1321,288 +1321,288 @@ msgid "Setup.Miscellaneous$SVDRP default host"
 msgstr ""
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
-msgstr "�������� ������������ ������ (���)"
+msgstr "Задержка переключения канала (сек)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "������ ������� ��� ����� ������ (ms)"
+msgstr "Предел времени для ввода канала (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr "�������� ������ �� ������ (ms)"
+msgstr "Задержка ответа от пульта (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr "�������� ������ �� ������ (ms)"
+msgstr "Интервал ответов от пульта (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "����� ��� ���������"
+msgstr "Канал при включении"
 
 msgid "Setup.Miscellaneous$as before"
-msgstr "��� ������"
+msgstr "как раньше"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "��������� ��� ���������"
+msgstr "Громкость при включении"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr ""
+msgstr "Шаг громкости"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr ""
+msgstr "Линейность громкости"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "��������� �������"
+msgstr "прокрутка каналов"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr "����� ����� ������ � ���������"
+msgstr "Показ имени канала и источника"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "��������� �����"
+msgstr "Аварийный выход"
 
 msgid "Plugins"
-msgstr "������ ����������"
+msgstr "Модули расширения"
 
 msgid "This plugin has no setup parameters!"
-msgstr "������ �� ����� ���������� ���������!"
+msgstr "Модуль не имеет параметров настройки!"
 
 msgid "Setup"
-msgstr "���������"
+msgstr "Настройка"
 
 msgid "Restart"
-msgstr "�������������"
+msgstr "Перезапустить"
 
 msgid "Really restart?"
-msgstr "������������� �������������?"
+msgstr "Действительно перезапустить?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
-msgstr " ���������� ������ "
+msgstr " Прекратить запись "
 
 msgid "Schedule"
-msgstr "�������"
+msgstr "Телегид"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
-msgstr " ���������� ���������������"
+msgstr " Прекратить воспроизведение"
 
 msgid "Button$Pause"
-msgstr "�����"
+msgstr "Пауза"
 
 msgid "Button$Stop"
-msgstr "����"
+msgstr "Стоп"
 
 msgid "Button$Resume"
-msgstr "����������"
+msgstr "Продолжить"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " �������� ������ ������"
+msgstr " Прервать монтаж записи"
 
 msgid "Stop recording?"
-msgstr "���������� ������?"
+msgstr "Прекратить запись?"
 
 msgid "Cancel editing?"
-msgstr "�������� ��������������?"
+msgstr "Прервать редактирование?"
 
 msgid "No audio available!"
-msgstr "����������� ����!"
+msgstr "Отсутствует звук!"
 
 msgid "No subtitles"
-msgstr "��� ���������"
+msgstr "Нет субтитров"
 
 msgid "No subtitles available!"
-msgstr "�������� ����������!"
+msgstr "Субтитры недоступны!"
 
 msgid "Not enough disk space to start recording!"
-msgstr "������������ ����� �� ����� ��� ������ ������"
+msgstr "Недостаточно места на диске для начала записи"
 
 msgid "No free DVB device to record!"
-msgstr "��� ���������� DVB-���������� ��� ������!"
+msgstr "Нет свободного DVB-устройства для записи!"
 
 msgid "Pausing live video..."
-msgstr "����� ����������� ���������..."
+msgstr "Режим отложенного просмотра..."
 
 msgid "Delete timeshift recording?"
-msgstr "������� ���������� ������?"
+msgstr "Удалить отложенную запись?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
-msgstr "�������: "
+msgstr "Перейти: "
 
 msgid "No editing marks defined!"
-msgstr "�� ������ ����� ��� �������!"
+msgstr "Не заданы метки для монтажа!"
 
 msgid "No editing sequences defined!"
-msgstr "������� �������������� �� ���������!"
+msgstr "Порядок редактирования не определен!"
 
 msgid "Can't start editing process!"
-msgstr "���������� ������ ������ ������!"
+msgstr "Невозможно начать монтаж записи!"
 
 msgid "Editing process started"
-msgstr "����� ������ ������"
+msgstr "Начат монтаж записи"
 
 msgid "Editing process already active!"
-msgstr "������� ������������ ��� �������!"
+msgstr "Процесс видеомонтажа уже запущен!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " abcdefghijklmnopqrstuvwxyz��������������������������������0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " abcdefghijklmnopqrstuvwxyzабвгдеёжзийклмнопрстуфхцчшщъыьюя0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc����2\tdef�����3\tghi����4\tjkl���5\tmno���6\tpqrs����7\ttuv�����8\twxyz�����9"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabcабвг2\tdefдеёжз3\tghiийкл4\tjklмно5\tmnoпрс6\tpqrsтуфх7\ttuvцчшщъ8\twxyzыьэюя9"
 
 msgid "Button$ABC/abc"
-msgstr "���/���"
+msgstr "АБВ/абв"
 
 msgid "Button$Overwrite"
-msgstr "������"
+msgstr "Замена"
 
 msgid "Button$Insert"
-msgstr "�������"
+msgstr "Вставка"
 
 msgid "Plugin"
-msgstr "������"
+msgstr "Модуль"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "��������� \"�����\"/\"����\" ��� ������ �������, � ����� \"OK\""
+msgstr "Нажимайте \"Вверх\"/\"Вниз\" для выбора позиции, а затем \"OK\""
 
 msgid "Channel locked (recording)!"
-msgstr "����� ������������ (���� ������)!"
+msgstr "Канал заблокирован (идёт запись)!"
 
 msgid "Low disk space!"
-msgstr "������������ ����� �� �����!"
+msgstr "Недостаточно места на диске!"
 
 msgid "Regenerating index file"
-msgstr "����������� ���������� �����"
+msgstr "Регенерация индексного файла"
 
 msgid "Index file regeneration complete"
-msgstr "����������� ���������� ����� ��������"
+msgstr "Регенерация индексного файла окончена"
 
 msgid "Index file regeneration failed!"
-msgstr "������ ����������� ���������� �����"
+msgstr "Ошибка регенерация индексного файла!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "���������� ���������� - �� ����� �������� '-s'!"
+msgstr "Выключение невозможно - не задан параметр '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "���� ������ - ������������� ���������?"
+msgstr "Идет монтаж - действительно выключить?"
 
 msgid "Recording - shut down anyway?"
-msgstr "���� ������ - ������������� ���������?"
+msgstr "Идёт запись - действительно выключить?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "����� %ld ����� �������� ������ - ������������� ���������?"
+msgstr "Через %ld минут начнётся запись - действительно выключить?"
 
 msgid "shut down anyway?"
-msgstr "������������� ���������?"
+msgstr "действительно выключить?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Plugin %s ��������� ����� %ld ����� - ����������?"
+msgstr "Plugin %s проснется через %ld минут - продолжить?"
 
 msgid "Editing - restart anyway?"
-msgstr "������� ������� - ������������� �������������?"
+msgstr "Процесс монтажа - действительно перезапустить?"
 
 msgid "Recording - restart anyway?"
-msgstr "���� ������ - ������������� �������������?"
+msgstr "Идёт запись - действительно перезапустить?"
 
 msgid "restart anyway?"
-msgstr "������������� �������������?"
+msgstr "действительно перезапустить?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "��������� "
+msgstr "Громкость "
 
 msgid "Classic VDR"
-msgstr "������������"
+msgstr "Классический"
 
 msgid "DISK"
-msgstr "����"
+msgstr "ДИСК"
 
 msgid "LOAD"
-msgstr "�������������"
+msgstr "ЗАГРУЗКА"
 
 msgid "TIMERS"
-msgstr "�������"
+msgstr "ТФЙМЕРЫ"
 
 msgid "DEVICES"
-msgstr "����������"
+msgstr "УСТРОЙСТВА"
 
 msgid "LIVE"
 msgstr "LIVE"
 
 msgid "PLAY"
-msgstr "���������������"
+msgstr "Воспроизведение"
 
 #, c-format
 msgid "Moving dish to %.1f..."
-msgstr ""
+msgstr "Сдвинуть тарель к %.1f..."
 
 msgid "ST:TNG Panels"
-msgstr "ST:TNG ������"
+msgstr "ST:TNG панели"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "���ǿ��"
+msgstr "ПВСЧПСВ"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "��ݲ�������ҿ����Ѳ��"
+msgstr "ПонВтрСрдЧтвПтнСубВск"
 
 msgid "Monday"
-msgstr "�����������"
+msgstr "Понедельник"
 
 msgid "Tuesday"
-msgstr "�������"
+msgstr "Вторник"
 
 msgid "Wednesday"
-msgstr "�����"
+msgstr "Среда"
 
 msgid "Thursday"
-msgstr "�������"
+msgstr "Четверг"
 
 msgid "Friday"
-msgstr "�������"
+msgstr "Пятница"
 
 msgid "Saturday"
-msgstr "�������"
+msgstr "Суббота"
 
 msgid "Sunday"
-msgstr "�����������"
+msgstr "Воскресенье"
 
 msgid "Upcoming recording!"
-msgstr "������ ����� ��������"
+msgstr "Запись скоро начнется!"
 
 msgid "Pause live video?"
-msgstr "���������� live video?"
+msgstr "Остановить live video?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Запустить запись?"
 
 msgid "Recording started"
-msgstr "������ ������"
+msgstr "Запись начата"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR ���������� ����� - ������� Power ��� ���������"
+msgstr "VDR выключится позже - нажмите Питание для ускорения"
 
 msgid "Press any key to cancel shutdown"
-msgstr "������� ����� ������ ����� �������� ����������."
+msgstr "Нажмите любую кнопку чтобы отменить выключение"
 
 msgid "Switching primary DVB..."
-msgstr "����� ��������� DVB-����������..."
+msgstr "Смена основного DVB-устройства..."
 
 msgid "Editing process failed!"
-msgstr "������ �� ����� ������� ������!"
+msgstr "Ошибка во время монтажа записи!"
 
 msgid "Editing process finished"
-msgstr "������ �������"
+msgstr "Монтаж окончен"
 
 msgid "Press any key to cancel restart"
-msgstr "������� ����� ������ ��� ������ ������������"
+msgstr "Нажмите любую кнопку для отмены перезагрузки"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR ���������� ����� %s �����"
+msgstr "VDR выключится через %s минут"
 
 msgid "Disk"
-msgstr "����"
+msgstr "Диск"
 
 msgid "free"
-msgstr "��������"
+msgstr "свободно"
diff --git a/receiver.c b/receiver.c
index 8d647c02c..dd61fd65e 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 4.1 2015/09/16 11:19:47 kls Exp $
+ * $Id: receiver.c 4.2 2017/02/21 10:59:27 kls Exp $
  */
 
 #include "receiver.h"
@@ -38,8 +38,11 @@ bool cReceiver::AddPid(int Pid)
 {
   if (Pid) {
      if (numPids < MAXRECEIVEPIDS) {
-        if (!WantsPid(Pid))
+        if (!WantsPid(Pid)) {
            pids[numPids++] = Pid;
+           if (device)
+              device->AddPid(Pid);
+           }
         }
      else {
         dsyslog("too many PIDs in cReceiver (Pid = %d)", Pid);
@@ -87,6 +90,8 @@ void cReceiver::DelPid(int Pid)
             for ( ; i < numPids; i++) // we also copy the terminating 0!
                 pids[i] = pids[i + 1];
             numPids--;
+            if (device)
+               device->DelPid(Pid);
             return;
             }
          }
diff --git a/recording.c b/recording.c
index 5293459ea..639805857 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.6 2016/12/22 12:58:20 kls Exp $
+ * $Id: recording.c 4.7 2017/01/01 17:52:51 kls Exp $
  */
 
 #include "recording.h"
@@ -1914,16 +1914,20 @@ cRecordingsHandler::~cRecordingsHandler()
 void cRecordingsHandler::Action(void)
 {
   while (Running()) {
+        bool Sleep = false;
         {
           cMutexLock MutexLock(&mutex);
-          while (cRecordingsHandlerEntry *r = operations.First()) {
-                if (!r->Active(error))
-                   operations.Del(r);
-                }
-          if (!operations.Count())
+          if (cRecordingsHandlerEntry *r = operations.First()) {
+             if (!r->Active(error))
+                operations.Del(r);
+             else
+                Sleep = true;
+             }
+          else
              break;
         }
-        cCondWait::SleepMs(100);
+        if (Sleep)
+           cCondWait::SleepMs(100);
         }
 }
 
diff --git a/remux.c b/remux.c
index 2e1bc31f5..a2d2dd6c7 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 4.3 2016/12/22 12:58:20 kls Exp $
+ * $Id: remux.c 4.5 2017/03/26 13:07:01 kls Exp $
  */
 
 #include "remux.h"
@@ -144,6 +144,19 @@ void TsSetPcr(uchar *p, int64_t Pcr)
      }
 }
 
+int TsSync(const uchar *Data, int Length, const char *File, const char *Function, int Line)
+{
+  int Skipped = 0;
+  while (Length > 0 && (*Data != TS_SYNC_BYTE || Length > TS_SIZE && Data[TS_SIZE] != TS_SYNC_BYTE)) {
+        Data++;
+        Length--;
+        Skipped++;
+        }
+  if (Skipped && File && Function && Line)
+     esyslog("ERROR: skipped %d bytes to sync on start of TS packet at %s/%s(%d)", Skipped, File, Function, Line);
+  return Skipped;
+}
+
 int64_t TsGetPts(const uchar *p, int l)
 {
   // Find the first packet with a PTS and use it:
@@ -1557,13 +1570,8 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
   newFrame = independentFrame = false;
   while (Length >= MIN_TS_PACKETS_FOR_FRAME_DETECTOR * TS_SIZE) { // makes sure we are looking at enough data, in case the frame type is not stored in the first TS packet
         // Sync on TS packet borders:
-        if (Data[0] != TS_SYNC_BYTE) {
-           int Skipped = 1;
-           while (Skipped < Length && (Data[Skipped] != TS_SYNC_BYTE || Length - Skipped > TS_SIZE && Data[Skipped + TS_SIZE] != TS_SYNC_BYTE))
-                 Skipped++;
-           esyslog("ERROR: skipped %d bytes to sync on start of TS packet", Skipped);
+        if (int Skipped = TS_SYNC(Data, Length))
            return Processed + Skipped;
-           }
         // Handle one TS packet:
         int Handled = TS_SIZE;
         if (TsHasPayload(Data) && !TsIsScrambled(Data)) {
@@ -1629,7 +1637,7 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
                           Div += parser->IFrameTemporalReferenceOffset();
                        if (Div <= 0)
                           Div = 1;
-                       uint32_t Delta = ptsValues[0] / Div;
+                       int Delta = ptsValues[0] / Div;
                        // determine frame info:
                        if (isVideo) {
                           if (Delta == 3753)
diff --git a/remux.h b/remux.h
index 5eab076f0..7dd5b163f 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 4.1 2016/12/22 13:09:54 kls Exp $
+ * $Id: remux.h 4.3 2017/03/26 13:06:37 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -83,6 +83,12 @@ inline int TsPid(const uchar *p)
   return (p[1] & TS_PID_MASK_HI) * 256 + p[2];
 }
 
+inline void TsSetPid(uchar *p, int Pid)
+{
+  p[1] = (p[1] & ~TS_PID_MASK_HI) | ((Pid >> 8) & TS_PID_MASK_HI);
+  p[2] = Pid & 0x00FF;
+}
+
 inline bool TsIsScrambled(const uchar *p)
 {
   return p[3] & TS_SCRAMBLING_CONTROL;
@@ -138,6 +144,15 @@ inline int64_t TsGetPcr(const uchar *p)
 void TsHidePayload(uchar *p);
 void TsSetPcr(uchar *p, int64_t Pcr);
 
+// Helper macro and function to quickly check whether Data points to the beginning
+// of a TS packet. The return value is the number of bytes that need to be skipped
+// to synchronize on the next TS packet (zero if already sync'd). TsSync() can be
+// called directly, the macro just performs the initial check inline and adds some
+// debug information for logging.
+
+#define TS_SYNC(Data, Length) (*Data == TS_SYNC_BYTE ? 0 : TsSync(Data, Length, __FILE__, __FUNCTION__, __LINE__))
+int TsSync(const uchar *Data, int Length, const char *File = NULL, const char *Function = NULL, int Line = 0);
+
 // The following functions all take a pointer to a sequence of complete TS packets.
 
 int64_t TsGetPts(const uchar *p, int l);
diff --git a/ringbuffer.c b/ringbuffer.c
index d33a4719e..902c88787 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
  * Parts of this file were inspired by the 'ringbuffy.c' from the
  * LinuxDVB driver (see linuxtv.org).
  *
- * $Id: ringbuffer.c 4.1 2016/12/22 10:26:13 kls Exp $
+ * $Id: ringbuffer.c 4.2 2017/03/19 12:43:36 kls Exp $
  */
 
 #include "ringbuffer.h"
@@ -216,9 +216,10 @@ int cRingBufferLinear::Available(void)
 
 void cRingBufferLinear::Clear(void)
 {
-  tail = head = margin;
+  int Head = head;
+  tail = Head;
 #ifdef DEBUGRINGBUFFERS
-  lastHead = head;
+  lastHead = Head;
   lastTail = tail;
   lastPut = lastGet = -1;
 #endif
diff --git a/ringbuffer.h b/ringbuffer.h
index 9699bbc83..746fc51e4 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ringbuffer.h 4.1 2016/12/22 10:26:13 kls Exp $
+ * $Id: ringbuffer.h 4.2 2017/03/19 13:11:39 kls Exp $
  */
 
 #ifndef __RINGBUFFER_H
@@ -80,6 +80,8 @@ class cRingBufferLinear : public cRingBuffer {
   virtual int Free(void) { return Size() - Available() - 1 - margin; }
   virtual void Clear(void);
     ///< Immediately clears the ring buffer.
+    ///< This function may safely be called from the reading thread without additional
+    ///< locking. If called from the writing thread, proper locking must be used.
   int Read(int FileHandle, int Max = 0);
     ///< Reads at most Max bytes from FileHandle and stores them in the
     ///< ring buffer. If Max is 0, reads as many bytes as possible.
diff --git a/skinlcars.c b/skinlcars.c
index 0fae3b854..93ada5eeb 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 4.2 2016/12/22 14:05:56 kls Exp $
+ * $Id: skinlcars.c 4.3 2017/01/19 15:27:48 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -254,7 +254,7 @@ static bool DrawDeviceData(cOsd *Osd, const cDevice *Device, int x0, int y0, int
      LastDeviceType = DeviceType;
      // CAM:
      if (CamSlot) {
-        cString s = cString::sprintf("CAM %d", CamSlot->SlotNumber());
+        cString s = cString::sprintf("CAM %d", CamSlot->MasterSlotNumber());
         Osd->DrawText(x, y1 - TinyFont->Height(), s, ColorFg, ColorBg, TinyFont);
         xs = max(xs, x + TinyFont->Width(s));
         }
diff --git a/sources.conf b/sources.conf
index 169eecf19..735738de3 100644
--- a/sources.conf
+++ b/sources.conf
@@ -182,6 +182,7 @@ S8W     Eutelsat 8 West A/C
 S7W     Nilesat 101/201 & Eutelsat 7 West A
 S5W     Eutelsat 5 West A
 S4W     Amos 2/3
+S3W     ABS-3A
 S1W     Thor 5/6
 S0.8W   Intelsat 10-02
 
diff --git a/tools.h b/tools.h
index 73cca5a38..d2234c392 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.5 2016/12/23 13:56:35 kls Exp $
+ * $Id: tools.h 4.6 2017/03/16 16:04:43 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -242,6 +242,17 @@ cString dtoa(double d, const char *Format = "%f");
     ///< the decimal point, independent of the currently selected locale.
     ///< If Format is given, it will be used instead of the default.
 cString itoa(int n);
+inline uint16_t Peek13(const uchar *p)
+{
+  uint16_t v = uint16_t(*p++ & 0x1F) << 8;
+  return v + (*p & 0xFF);
+}
+inline void Poke13(uchar *p, uint16_t v)
+{
+  v |= uint16_t(*p & ~0x1F) << 8;
+  *p++ = v >> 8;
+  *p = v & 0xFF;
+}
 cString AddDirectory(const char *DirName, const char *FileName);
 bool EntriesOnSameFileSystem(const char *File1, const char *File2);
     ///< Checks whether the given files are on the same file system. If either of the
@@ -744,6 +755,11 @@ template<class T> class cVector {
   }
   };
 
+inline int CompareInts(const void *a, const void *b)
+{
+  return *(const int *)a > *(const int *)b;
+}
+
 inline int CompareStrings(const void *a, const void *b)
 {
   return strcmp(*(const char **)a, *(const char **)b);
diff --git a/vdr.5 b/vdr.5
index 2a7b9072f..947bdc72c 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 4.0 2015/02/17 13:43:53 kls Exp $
+.\" $Id: vdr.5 4.1 2017/01/09 13:35:08 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
 .SH NAME
@@ -899,6 +899,20 @@ Note that the \fBevent id\fR that comes from the DVB data stream is actually
 just 16 bit wide. The internal representation in VDR allows for 32 bit to
 be used, so that external tools can generate EPG data that is guaranteed
 not to collide with the ids of existing data.
+.SS CAM DATA
+The file \fIcam.data\fR contains information about which CAM in the system can
+decrypt a particular channel.
+Each line in this file contains a channel id, followed by one or more (blank
+separated) numbers, indicating the CAMs that have successfully decrypted this
+channel earlier.
+
+When tuning to an encrypted channel, this information is used to select the
+proper CAM for decrypting this channel. This channel/CAM relationship is not
+hardcoded, though. If a given channel can't be decrypted with a CAM listed
+in this file, other CAMs will be tried just as well. The main purpose of this
+file is to speed up channel switching in systems with more than one CAM.
+
+This file will be read at program startup and saved when the program ends.
 .SS COMMANDLINE OPTIONS
 If started without any options, vdr tries to read any files in the directory
 /etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
diff --git a/vdr.c b/vdr.c
index 8a4947149..5b598f9c8 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.9 2016/12/23 14:34:37 kls Exp $
+ * $Id: vdr.c 4.11 2017/03/25 14:20:30 kls Exp $
  */
 
 #include <getopt.h>
@@ -878,6 +878,10 @@ int main(int argc, char *argv[])
   if (!cPositioner::GetPositioner()) // no plugin has created a positioner
      new cDiseqcPositioner;
 
+  // CAM data:
+
+  ChannelCamRelations.Load(AddDirectory(CacheDirectory, "cam.data"));
+
   // Channel:
 
   if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
@@ -1555,8 +1559,9 @@ int main(int argc, char *argv[])
 
   StopSVDRPClientHandler();
   StopSVDRPServerHandler();
-  PluginManager.StopPlugins();
+  ChannelCamRelations.Save();
   cRecordControls::Shutdown();
+  PluginManager.StopPlugins();
   RecordingsHandler.DelAll();
   delete Menu;
   cControl::Shutdown();

From 58a45b0a6be32216829d38f296488e11115180fe Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Thu, 27 Apr 2017 09:12:46 +0000
Subject: [PATCH 246/307] Version 2.3.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VDR developer version 2.3.4 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.4.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.3-2.3.4.diff

MD5 checksums:

7b1c985d5e7703f7ec46e3818f546702  vdr-2.3.4.tar.bz2
bacbe7b334a4aa0827d95938e3a1ec6d  vdr-2.3.3-2.3.4.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

** IMPORTANT:
** ==========
**
** If you use any of the plugins "ddci2", "satip" or "dvbapi", please make
** sure you get the latest version from their respective repositories!

The changes since version 2.3.3:

- The functionality of HandleRemoteModifications(), which synchronizes changes to
   timers between peer VDR machines, has been moved to timers.[ch] and renamed to
   HandleRemoteTimerModifications(). It now also handles deleting remote timers.
- The function cEpgHandlers::BeginSegmentTransfer() is now boolean (thanks to
   Jörg Wendel). See the description in epg.h for the meaning of the return value.
- Changed tEventID back to u_int32_t (suggested by Jörg Wendel). The change to
   u_int16_t in version 2.3.1 was ill-conceived, because the description of the
   "event id" in vdr.5 explicitly mentioned this parameter to be 32 bit in size!
   The members of cEvent have been slightly rearranged to minimize the memory
   requirements on both 32 and 64 bit systems.
- The file 'cam.data' is no longer written if it is read-only.
- Detecting whether a particular CAM actually decrypts a given channel is now
   done separately for each receiver.
- The cEvent class now has a new member 'aux', in which external applications can
   store auxiliary information with an event (thanks to Jörg Wendel). This string
   has no meaning whatsoever to VDR itself, and it will not be written into the
   info file of a recording that is made for such an event.
- Added some guidelines and recommendations to the 'Logging' section of PLUGINS.html.
   The most important being: implement a command line option to control the level
   of logging (in particular allow turning off logging completely!) and never print
   anything to stdout or stderr (unless one of the listed exceptions applies).
- Added a note to the "Pausing live video" section of the MANUAL, stating that
   the timer for paused live video will always record on the local VDR, even if
   an "SVDRP default host" has been set for normal timer recordings.
- cOsdMenu::Display() now checks whether the OSD size has changed and if so calls
   SetDisplayMenu().
- The SVDRP commands that deal with recordings (DELR, EDIT, LSTR, MOVR, and PLAY)
   now use a unique id for each recording, which remains valid as long as this
   instance of VDR is running. This means that recordings are no longer continuously
   numbered from 1 to N in LSTR. There may be gaps in the sequence, in case recordings
   have been deleted, and they are not necessarily listed in numeric order.
   Thanks to Sergey Chernyavskiy.
- Changed 'number' to 'id' in the help texts of SVDRP commands that deal with
   timers.
- Fixed a deadlock in the SVDRP command PLAY in case there is currently a
   recording being replayed.
- Signal strength and quality (CNR) are now determined via DVB API 5 (if available).
   Fallback is the old DVB API 3 method.
- The function cCamSlot::Decrypt() can now also be called with Data == NULL.
   This is necessary to allow CAMs that copy the incoming data into a separate buffer
   to return previously received and decrypted TS packets. See ci.h for details.
   Plugins that implement a derived cCamSlot need to properly handle this case, and
   plugins that implement a derived cDevice need to call Decrypt() in their
   GetTSPacket() function even if the incoming buffer is currently empty (see
   cDvbDevice::GetTSPacket()).
- cTSBuffer::Skip() no longer immediately deletes the given number of bytes from the
   TS buffer, but rather stores the number for later deletion in the next call to
   Get(). This is necessary because in cDvbDevice::GetTSPacket() tsBuffer->Skip()
   is called, but the actual TS packet returned (pointed to by Data) may well be
   (and typically is, unless the CAM copies the data) in the area of the buffer that
   would be deleted by Skip().
- The new function cDevice::SignalStats() (if implemented by an actual device) returns
   statistics about the currently received signal.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed displaying remote timers in the main menu of skin LCARS.
- Fixed editing a remote timer immediately after it has been created.
- Fixed handling the uncorrected block counter for DVB API 3 devices when calculating
   signal quality.
- The SVDRP command LSTC can now list the channels with channel ids if the option
   ':ids' is given (suggested by Dietmar Spingler).
- If 0 is given as the channel number in the SVDRP command LSTC, the data of the
   current channel is listed.
- Fixed a possible crash when pulling the CAM while decrypting a channel with MTD.
---
 CONTRIBUTORS |   6 ++
 HISTORY      |  66 +++++++++++++
 MANUAL       |   5 +-
 PLUGINS.html |  24 +++++
 ci.c         |  18 +++-
 ci.h         |   9 +-
 config.h     |  10 +-
 device.c     | 102 +++++++++----------
 device.h     |  35 ++++++-
 dvbdevice.c  | 269 +++++++++++++++++++++++++++++++++++++++++++++------
 dvbdevice.h  |   4 +-
 eit.c        |   9 +-
 epg.c        |  25 ++++-
 epg.h        |  14 ++-
 menu.c       |  75 ++++----------
 mtd.c        |   8 +-
 mtd.h        |   4 +-
 osdbase.c    |   9 +-
 osdbase.h    |   3 +-
 po/fi_FI.po  |  30 +++---
 receiver.c   |   5 +-
 receiver.h   |   5 +-
 recording.c  |  25 ++++-
 recording.h  |   9 +-
 remux.c      |   4 +-
 skinlcars.c  |   4 +-
 svdrp.c      | 183 +++++++++++++++++++----------------
 timers.c     |  76 ++++++++++++++-
 timers.h     |  22 ++++-
 vdr.5        |  33 ++++---
 vdr.c        |   7 +-
 31 files changed, 805 insertions(+), 293 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dac5059f9..0852c10ed 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2618,6 +2618,9 @@ J
  for adding HandledExternally() to the EPG handler interface
  for adding IsUpdate() to the EPG handler interface
  for adding Begin/EndSegmentTransfer() to the EPG handler interface
+ for making cEpgHandlers::BeginSegmentTransfer() boolean
+ for suggesting to change tEventID back to u_int32_t
+ for adding the 'aux' member to cEvent
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@@ -3385,6 +3388,7 @@ Dietmar Spingler <d_spingler@gmx.de>
  for suggesting that the -V and -h options should list the plugins in alphabetical order
  for suggesting to implement the setup option "Recording/Record key handling"
  for suggesting to cache the channel/CAM relations in the file 'cam.data'
+ for suggesting to optionally list the channels with channel ids in the SVDRP command LSTC
 
 Stefan Schallenberg <infos@nafets.de>
  for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
@@ -3466,6 +3470,8 @@ Aitugan Sarbassov <isarbassov@gmail.com>
 Sergey Chernyavskiy <glenvt18@gmail.com>
  for reporting truncated date/time strings in the skins on multi-byte UTF-8
  for adding a short sleep to cTSBuffer::Action() to avoid high CPU usage
+ for making the SVDRP commands that deal with recordings use a unique id for each
+ recording
 
 Frank Richter <kulpstur@t-online.de>
  for adding 'S3W ABS-3A' to sources.conf
diff --git a/HISTORY b/HISTORY
index 74d22fb80..a79eef110 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8924,3 +8924,69 @@ Video Disk Recorder Revision History
   reading thread, without additional locking.
 - Now stopping any ongoing recordings before stopping the plugins, to avoid
   a crash when stopping VDR while recording.
+
+2017-04-27: Version 2.3.4
+
+- The functionality of HandleRemoteModifications(), which synchronizes changes to
+  timers between peer VDR machines, has been moved to timers.[ch] and renamed to
+  HandleRemoteTimerModifications(). It now also handles deleting remote timers.
+- The function cEpgHandlers::BeginSegmentTransfer() is now boolean (thanks to
+  J�rg Wendel). See the description in epg.h for the meaning of the return value.
+- Changed tEventID back to u_int32_t (suggested by J�rg Wendel). The change to
+  u_int16_t in version 2.3.1 was ill-conceived, because the description of the
+  "event id" in vdr.5 explicitly mentioned this parameter to be 32 bit in size!
+  The members of cEvent have been slightly rearranged to minimize the memory
+  requirements on both 32 and 64 bit systems.
+- The file 'cam.data' is no longer written if it is read-only.
+- Detecting whether a particular CAM actually decrypts a given channel is now
+  done separately for each receiver.
+- The cEvent class now has a new member 'aux', in which external applications can
+  store auxiliary information with an event (thanks to J�rg Wendel). This string
+  has no meaning whatsoever to VDR itself, and it will not be written into the
+  info file of a recording that is made for such an event.
+- Added some guidelines and recommendations to the 'Logging' section of PLUGINS.html.
+  The most important being: implement a command line option to control the level
+  of logging (in particular allow turning off logging completely!) and never print
+  anything to stdout or stderr (unless one of the listed exceptions applies).
+- Added a note to the "Pausing live video" section of the MANUAL, stating that
+  the timer for paused live video will always record on the local VDR, even if
+  an "SVDRP default host" has been set for normal timer recordings.
+- cOsdMenu::Display() now checks whether the OSD size has changed and if so calls
+  SetDisplayMenu().
+- The SVDRP commands that deal with recordings (DELR, EDIT, LSTR, MOVR, and PLAY)
+  now use a unique id for each recording, which remains valid as long as this
+  instance of VDR is running. This means that recordings are no longer continuously
+  numbered from 1 to N in LSTR. There may be gaps in the sequence, in case recordings
+  have been deleted, and they are not necessarily listed in numeric order.
+  Thanks to Sergey Chernyavskiy.
+- Changed 'number' to 'id' in the help texts of SVDRP commands that deal with
+  timers.
+- Fixed a deadlock in the SVDRP command PLAY in case there is currently a
+  recording being replayed.
+- Signal strength and quality (CNR) are now determined via DVB API 5 (if available).
+  Fallback is the old DVB API 3 method.
+- The function cCamSlot::Decrypt() can now also be called with Data == NULL.
+  This is necessary to allow CAMs that copy the incoming data into a separate buffer
+  to return previously received and decrypted TS packets. See ci.h for details.
+  Plugins that implement a derived cCamSlot need to properly handle this case, and
+  plugins that implement a derived cDevice need to call Decrypt() in their
+  GetTSPacket() function even if the incoming buffer is currently empty (see
+  cDvbDevice::GetTSPacket()).
+- cTSBuffer::Skip() no longer immediately deletes the given number of bytes from the
+  TS buffer, but rather stores the number for later deletion in the next call to
+  Get(). This is necessary because in cDvbDevice::GetTSPacket() tsBuffer->Skip()
+  is called, but the actual TS packet returned (pointed to by Data) may well be
+  (and typically is, unless the CAM copies the data) in the area of the buffer that
+  would be deleted by Skip().
+- The new function cDevice::SignalStats() (if implemented by an actual device) returns
+  statistics about the currently received signal.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed displaying remote timers in the main menu of skin LCARS.
+- Fixed editing a remote timer immediately after it has been created.
+- Fixed handling the uncorrected block counter for DVB API 3 devices when calculating
+  signal quality.
+- The SVDRP command LSTC can now list the channels with channel ids if the option
+  ':ids' is given (suggested by Dietmar Spingler).
+- If 0 is given as the channel number in the SVDRP command LSTC, the data of the
+  current channel is listed.
+- Fixed a possible crash when pulling the CAM while decrypting a channel with MTD.
diff --git a/MANUAL b/MANUAL
index 971df4027..4db491b5e 100644
--- a/MANUAL
+++ b/MANUAL
@@ -264,7 +264,7 @@ Version 2.2
 
 * Pausing live video
 
-  If you want to pause the live programme you are just watching, simple press
+  If you want to pause the live programme you are just watching, simply press
   "Menu/Yellow" or "Pause" on your remote control. VDR will start an instant
   recording of the current channel (just as if you had pressed "Menu/Red" or
   "Record") and immediately begin replaying that recording. Replay will be
@@ -276,6 +276,9 @@ Version 2.2
   in the "Setup/Recording" menu. Recording time will be the same as for
   any other instant recording, so by default it will record 3 hours (which
   should be enough for any normal broadcast).
+  Note that the timer that is created for recording the paused live video will
+  always record on the local VDR, even if an "SVDRP default host" has been
+  set for normal timer recordings.
 
 * Replaying a Recording
 
diff --git a/PLUGINS.html b/PLUGINS.html
index dd7a154fd..92a4d3135 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -583,6 +583,30 @@ <h1>Table Of Contents</h1>
 
 Note that the log messages will be given as provided, the plugin's name will not
 automatically be added, so make sure your log messages are obvious enough.
+<p>
+<modified>
+Only use the above logging functions for occasional log messages. Do not use
+them unconditionally for frequent messages that produce long sequences of lines
+in the log file every few seconds. That might make it hard to work on other plugins
+or the core VDR code, watching their log entries while they are permanently
+interspersed with unrelated stuff.<br>
+<br>
+The recommended behavior for a plugin that does logging is to implement a command
+line option that controls the level of log messages, preferably '-l N, --log=N',
+where 'N' is in the range 0...3, with 0 meaning no logging whatsoever, 1 log only
+errors, 2 log errors and informational messages, and 3 also log debug information.<br>
+<br>
+If a plugin can output extensive data for special debugging purposes (either to
+the log file or stdout/stderr), this should be enabled by setting proper switches
+in one of its source files (see for example how the communication between VDR and
+CAMs can be monitored in VDR/ci.c).<br>
+<br>
+Under no circumstances must a plugin print anything to stdout or stderr during
+normal operation! The only exceptions being special debug information as described
+above, fatal error messages that will cause VDR to abort, or if it is the sole
+purpose of the plugin to display something on stdout, like for instance the
+<i>skincurses</i> plugin, which displays the OSD at the console.
+</modified>
 
 <hr><h2><a name="Main menu entry">Main menu entry</a></h2>
 
diff --git a/ci.c b/ci.c
index 71623d881..f64c17e38 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.9 2017/03/25 14:09:23 kls Exp $
+ * $Id: ci.c 4.13 2017/04/26 09:18:26 kls Exp $
  */
 
 #include "ci.h"
@@ -1968,9 +1968,13 @@ void cCamSlot::Process(cTPDU *TPDU)
           case msNone:
                dbgprotocol("Slot %d: no module present\n", slotNumber);
                isyslog("CAM %d: no module present", slotNumber);
-               MtdActivate(false);
+               StopDecrypting();
                DeleteAllConnections();
                CancelActivation();
+               if (mtdHandler)
+                  mtdHandler->UnAssignAll();
+               else
+                  Assign(NULL);
                break;
           case msReset:
                dbgprotocol("Slot %d: module reset\n", slotNumber);
@@ -2415,7 +2419,8 @@ bool cCamSlot::IsDecrypting(void)
 
 uchar *cCamSlot::Decrypt(uchar *Data, int &Count)
 {
-  Count = TS_SIZE;
+  if (Data)
+     Count = TS_SIZE;
   return Data;
 }
 
@@ -2663,6 +2668,13 @@ void cChannelCamRelations::Load(const char *FileName)
 void cChannelCamRelations::Save(void)
 {
   cMutexLock MutexLock(&mutex);
+  struct stat st;
+  if (stat(fileName, &st) == 0) {
+     if ((st.st_mode & S_IWUSR) == 0) {
+        dsyslog("not saving %s (file is read-only)", *fileName);
+        return;
+        }
+     }
   dsyslog("saving %s", *fileName);
   cSafeFile f(fileName);
   if (f.Open()) {
diff --git a/ci.h b/ci.h
index 0e8253d91..8d1323ac1 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 4.5 2017/03/23 14:23:33 kls Exp $
+ * $Id: ci.h 4.6 2017/04/10 09:17:56 kls Exp $
  */
 
 #ifndef __CI_H
@@ -345,7 +345,12 @@ class cCamSlot : public cListObject {
        ///< in hardware, it can implement this function to be given access
        ///< to the data in the device's TS buffer. Data points to a buffer
        ///< of Count bytes of TS data. The first byte in Data is guaranteed
-       ///< to be a TS_SYNC_BYTE.
+       ///< to be a TS_SYNC_BYTE, and Count is at least TS_SIZE.
+       ///< Note that Decrypt() may be called with Data == NULL! This is necessary
+       ///< to allow CAMs that copy the incoming data into a separate buffer to
+       ///< return previously received and decrypted TS packets. If Data is NULL,
+       ///< Count is 0 and must not be modified, and the return value shall point to the
+       ///< next available decrypted TS packet (if any).
        ///< There are three possible ways a CAM can handle decryption:
        ///< 1. If the full TS data is physically routed through the CAM in hardware,
        ///< there is no need to reimplement this function.
diff --git a/config.h b/config.h
index 4bfdba567..e9a9f11d3 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.7 2016/12/27 11:45:25 kls Exp $
+ * $Id: config.h 4.8 2017/03/30 13:42:15 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.3"
-#define VDRVERSNUM   20303  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.4"
+#define VDRVERSNUM   20304  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.3"
-#define APIVERSNUM   20303  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.4"
+#define APIVERSNUM   20304  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 247e8c56a..25d16679f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.11 2017/03/27 14:02:54 kls Exp $
+ * $Id: device.c 4.15 2017/04/17 14:47:42 kls Exp $
  */
 
 #include "device.h"
@@ -89,8 +89,6 @@ cDevice::cDevice(void)
   nitFilter = NULL;
 
   camSlot = NULL;
-  startScrambleDetection = 0;
-  scramblingTimeout = 0;
 
   occupiedTimeout = 0;
 
@@ -253,7 +251,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
          if (CamSlot->ModuleStatus() == msReady) {
             if (CamSlot->ProvidesCa(Channel->Caids())) {
                if (!ChannelCamRelations.CamChecked(Channel->GetChannelID(), CamSlot->MasterSlotNumber())) {
-                  SlotPriority[CamSlot->Index()] = CamSlot->Priority();
+                  SlotPriority[CamSlot->Index()] = CamSlot->MtdActive() ? IDLEPRIORITY : CamSlot->Priority(); // we don't need to take the priority into account here for MTD CAM slots, because they can be used with several devices in parallel
                   NumUsableSlots++;
                   }
                }
@@ -751,6 +749,11 @@ const cPositioner *cDevice::Positioner(void) const
   return NULL;
 }
 
+bool cDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per) const
+{
+  return false;
+}
+
 int cDevice::SignalStrength(void) const
 {
   return -1;
@@ -1652,50 +1655,47 @@ bool cDevice::Receiving(bool Dummy) const
 
 void cDevice::Action(void)
 {
-  time_t LastScrambledPacket = 0;
   if (Running() && OpenDvr()) {
      while (Running()) {
            // Read data from the DVR device:
            uchar *b = NULL;
            if (GetTSPacket(b)) {
               if (b) {
-                 int Pid = TsPid(b);
-                 // Check whether the TS packets are scrambled:
-                 bool DetachReceivers = false;
-                 bool DescramblingOk = false;
-                 int CamSlotNumber = 0;
-                 cCamSlot *cs = NULL;
-                 if (startScrambleDetection) {
-                    cs = CamSlot();
-                    CamSlotNumber = cs ? cs->MasterSlotNumber() : 0;
-                    if (CamSlotNumber) {
-                       if (LastScrambledPacket < startScrambleDetection)
-                          LastScrambledPacket = startScrambleDetection;
-                       time_t Now = time(NULL);
-                       if (TsIsScrambled(b)) {
-                          LastScrambledPacket = Now;
-                          if (Now - startScrambleDetection > scramblingTimeout)
-                             DetachReceivers = true;
-                          }
-                       if (Now - LastScrambledPacket > TS_SCRAMBLING_TIME_OK)
-                          DescramblingOk = true;
-                       }
-                    }
                  // Distribute the packet to all attached receivers:
                  Lock();
+                 int Pid = TsPid(b);
+                 bool IsScrambled = TsIsScrambled(b);
                  for (int i = 0; i < MAXRECEIVERS; i++) {
-                     if (receiver[i] && receiver[i]->WantsPid(Pid)) {
-                        if (DetachReceivers && cs && (!cs->IsActivating() || receiver[i]->Priority() >= LIVEPRIORITY)) {
-                           dsyslog("CAM %d: won't decrypt channel %s, detaching receiver", CamSlotNumber, *receiver[i]->ChannelID().ToString());
-                           ChannelCamRelations.SetChecked(receiver[i]->ChannelID(), CamSlotNumber);
-                           Detach(receiver[i]);
-                           }
-                        else
-                           receiver[i]->Receive(b, TS_SIZE);
-                        if (DescramblingOk && receiver[i]->ChannelID().Valid()) {
-                           dsyslog("CAM %d: decrypts channel %s", CamSlotNumber, *receiver[i]->ChannelID().ToString());
-                           ChannelCamRelations.SetDecrypt(receiver[i]->ChannelID(), CamSlotNumber);
-                           startScrambleDetection = 0;
+                     cReceiver *Receiver = receiver[i];
+                     if (Receiver && Receiver->WantsPid(Pid)) {
+                        Receiver->Receive(b, TS_SIZE);
+                        // Check whether the TS packet is scrambled:
+                        if (Receiver->startScrambleDetection) {
+                           if (cCamSlot *cs = CamSlot()) {
+                              int CamSlotNumber = cs->MasterSlotNumber();
+                              if (Receiver->lastScrambledPacket < Receiver->startScrambleDetection)
+                                 Receiver->lastScrambledPacket = Receiver->startScrambleDetection;
+                              time_t Now = time(NULL);
+                              if (IsScrambled) {
+                                 Receiver->lastScrambledPacket = Now;
+                                 if (Now - Receiver->startScrambleDetection > Receiver->scramblingTimeout) {
+                                    if (!cs->IsActivating() || Receiver->Priority() >= LIVEPRIORITY) {
+                                       if (Receiver->ChannelID().Valid()) {
+                                          dsyslog("CAM %d: won't decrypt channel %s, detaching receiver", CamSlotNumber, *Receiver->ChannelID().ToString());
+                                          ChannelCamRelations.SetChecked(Receiver->ChannelID(), CamSlotNumber);
+                                          }
+                                       Detach(Receiver);
+                                       }
+                                    }
+                                 }
+                              else if (Now - Receiver->lastScrambledPacket > TS_SCRAMBLING_TIME_OK) {
+                                 if (Receiver->ChannelID().Valid()) {
+                                    dsyslog("CAM %d: decrypts channel %s", CamSlotNumber, *Receiver->ChannelID().ToString());
+                                    ChannelCamRelations.SetDecrypt(Receiver->ChannelID(), CamSlotNumber);
+                                    }
+                                 Receiver->startScrambleDetection = 0;
+                                 }
+                              }
                            }
                         }
                      }
@@ -1756,12 +1756,13 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
             camSlot->StartDecrypting();
             if (CamSlots.NumReadyMasterSlots() > 1) { // don't try different CAMs if there is only one
-               startScrambleDetection = time(NULL);
-               scramblingTimeout = TS_SCRAMBLING_TIMEOUT;
+               Receiver->startScrambleDetection = time(NULL);
+               Receiver->scramblingTimeout = TS_SCRAMBLING_TIMEOUT;
                bool KnownToDecrypt = ChannelCamRelations.CamDecrypt(Receiver->ChannelID(), camSlot->MasterSlotNumber());
                if (KnownToDecrypt)
-                  scramblingTimeout *= 10; // give it time to receive ECM/EMM
-               dsyslog("CAM %d: %sknown to decrypt channel %s (scramblingTimeout = %ds)", camSlot->SlotNumber(), KnownToDecrypt ? "" : "not ", *Receiver->ChannelID().ToString(), scramblingTimeout);
+                  Receiver->scramblingTimeout *= 10; // give it time to receive ECM/EMM
+               if (Receiver->ChannelID().Valid())
+                  dsyslog("CAM %d: %sknown to decrypt channel %s (scramblingTimeout = %ds)", camSlot->MasterSlotNumber(), KnownToDecrypt ? "" : "not ", *Receiver->ChannelID().ToString(), Receiver->scramblingTimeout);
                }
             }
          Start();
@@ -1828,7 +1829,7 @@ cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
   SetDescription("device %d TS buffer", CardIndex);
   f = File;
   cardIndex = CardIndex;
-  delivered = false;
+  delivered = 0;
   ringBuffer = new cRingBufferLinear(Size, TS_SIZE, true, "TS");
   ringBuffer->SetTimeouts(100, 100);
   ringBuffer->SetIoThrottle();
@@ -1864,13 +1865,15 @@ void cTSBuffer::Action(void)
      }
 }
 
-uchar *cTSBuffer::Get(int *Available)
+uchar *cTSBuffer::Get(int *Available, bool CheckAvailable)
 {
   int Count = 0;
   if (delivered) {
-     ringBuffer->Del(TS_SIZE);
-     delivered = false;
+     ringBuffer->Del(delivered);
+     delivered = 0;
      }
+  if (CheckAvailable && ringBuffer->Available() < TS_SIZE)
+     return NULL;
   uchar *p = ringBuffer->Get(Count);
   if (p && Count >= TS_SIZE) {
      if (*p != TS_SYNC_BYTE) {
@@ -1884,7 +1887,7 @@ uchar *cTSBuffer::Get(int *Available)
         esyslog("ERROR: skipped %d bytes to sync on TS packet on device %d", Count, cardIndex);
         return NULL;
         }
-     delivered = true;
+     delivered = TS_SIZE;
      if (Available)
         *Available = Count;
      return p;
@@ -1894,6 +1897,5 @@ uchar *cTSBuffer::Get(int *Available)
 
 void cTSBuffer::Skip(int Count)
 {
-  ringBuffer->Del(Count);
-  delivered = false;
+  delivered = Count;
 }
diff --git a/device.h b/device.h
index 581c187a9..4796258b1 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.4 2017/02/21 13:23:24 kls Exp $
+ * $Id: device.h 4.8 2017/04/17 14:46:57 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -106,6 +106,13 @@ class cDeviceHook : public cListObject {
 
 /// The cDevice class is the base from which actual devices can be derived.
 
+#define DTV_STAT_VALID_NONE      0x0000
+#define DTV_STAT_VALID_STRENGTH  0x0001
+#define DTV_STAT_VALID_CNR       0x0002
+#define DTV_STAT_VALID_BERPRE    0x0004
+#define DTV_STAT_VALID_BERPOST   0x0008
+#define DTV_STAT_VALID_PER       0x0010
+
 class cDevice : public cThread {
   friend class cLiveSubtitle;
   friend class cDeviceHook;
@@ -284,6 +291,22 @@ class cDevice : public cThread {
          ///< move the satellite dish to the requested position (only applies to DVB-S
          ///< devices). If no positioner is involved, or this is not a DVB-S device,
          ///< NULL will be returned.
+  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL) const;
+         ///< Returns statistics about the currently received signal (if available).
+         ///< Strength is the signal strength in dBm (typical range -100dBm...0dBm).
+         ///< Cnr is the carrier to noise ratio in dB (typical range 0dB...40dB).
+         ///< BerPre is the bit error rate before the forward error correction (FEC).
+         ///< BerPost is the bit error rate after the forward error correction (FEC).
+         ///< Per is the block error rate after the forward error correction (FEC).
+         ///< Typical range for BerPre, BerPost and Per is 0...1.
+         ///< If any of the given pointers is not NULL, the value of the respective signal
+         ///< statistic is returned in it. Upon return, Valid holds a combination of
+         ///< DTV_STAT_VALID_* flags, indicating which of the returned values are actually
+         ///< valid. If the flag for a particular parameter in Valid is 0, the returned
+         ///< value is undefined. It depends on the device which of these parameters
+         ///< (if any) are available.
+         ///< Returns true if any of the requested parameters is valid.
+         ///< If false is returned, the value in Valid is undefined.
   virtual int SignalStrength(void) const;
          ///< Returns the "strength" of the currently received signal.
          ///< This is a value in the range 0 (no signal at all) through
@@ -426,8 +449,6 @@ class cDevice : public cThread {
 // Common Interface facilities:
 
 private:
-  time_t startScrambleDetection;
-  int scramblingTimeout;
   cCamSlot *camSlot;
 public:
   virtual bool HasCi(void);
@@ -842,19 +863,23 @@ class cTSBuffer : public cThread {
 private:
   int f;
   int cardIndex;
-  bool delivered;
+  int delivered;
   cRingBufferLinear *ringBuffer;
   virtual void Action(void);
 public:
   cTSBuffer(int File, int Size, int CardIndex);
   virtual ~cTSBuffer();
-  uchar *Get(int *Available = NULL);
+  uchar *Get(int *Available = NULL, bool CheckAvailable = false);
      ///< Returns a pointer to the first TS packet in the buffer. If Available is given,
      ///< it will return the total number of consecutive bytes pointed to in the buffer.
      ///< It is guaranteed that the returned pointer points to a TS_SYNC_BYTE and that
      ///< there are at least TS_SIZE bytes in the buffer. Otherwise NULL will be
      ///< returned and the value in Available (if given) is undefined.
      ///< Each call to Get() returns a pointer to the next TS packet in the buffer.
+     ///< If CheckAvailable is true, the buffer will be checked whether it contains
+     ///< at least TS_SIZE bytes before trying to get any data from it. Otherwise, if
+     ///< the buffer is empty, this function will wait a little while for the buffer
+     ///< to be filled again.
   void Skip(int Count);
      ///< If after a call to Get() more or less than TS_SIZE of the available data
      ///< has been processed, a call to Skip() with the number of processed bytes
diff --git a/dvbdevice.c b/dvbdevice.c
index cd928c207..3a900a3a2 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 4.4 2017/01/09 15:11:39 kls Exp $
+ * $Id: dvbdevice.c 4.9 2017/04/20 14:42:35 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -309,6 +309,9 @@ class cDvbTuner : public cThread {
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
+  mutable uint32_t lastUncValue;
+  mutable uint32_t lastUncDelta;
+  mutable time_t lastUncChange;
   cChannel channel;
   const cDiseqc *lastDiseqc;
   int diseqcOffset;
@@ -346,6 +349,7 @@ class cDvbTuner : public cThread {
   void SetChannel(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
   const cPositioner *Positioner(void) const { return positioner; }
+  bool GetSignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL) const;
   int GetSignalStrength(void) const;
   int GetSignalQuality(void) const;
   };
@@ -363,6 +367,9 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int
   tuneTimeout = 0;
   lockTimeout = 0;
   lastTimeoutReport = 0;
+  lastUncValue = 0;
+  lastUncDelta = 0;
+  lastUncChange = 0;
   lastDiseqc = NULL;
   diseqcOffset = 0;
   lastSource = 0;
@@ -554,12 +561,162 @@ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status) const
   return false;
 }
 
+//#define DEBUG_SIGNALSTATS
 //#define DEBUG_SIGNALSTRENGTH
 //#define DEBUG_SIGNALQUALITY
 
+#define MAXFRONTENDCMDS 16
+#define SETCMD(c, d) { Props[CmdSeq.num].cmd = (c);\
+                       Props[CmdSeq.num].u.data = (d);\
+                       if (CmdSeq.num++ > MAXFRONTENDCMDS) {\
+                          esyslog("ERROR: too many tuning commands on frontend %d/%d", adapter, frontend);\
+                          return false;\
+                          }\
+                     }
+
+bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per) const
+{
+  ClearEventQueue();
+  dtv_property Props[MAXFRONTENDCMDS];
+  dtv_properties CmdSeq;
+  memset(&Props, 0, sizeof(Props));
+  memset(&CmdSeq, 0, sizeof(CmdSeq));
+  CmdSeq.props = Props;
+  if (Strength)   SETCMD(DTV_STAT_SIGNAL_STRENGTH, 0);
+  if (Cnr)        SETCMD(DTV_STAT_CNR, 0);
+  if (BerPre)   { SETCMD(DTV_STAT_PRE_ERROR_BIT_COUNT, 0);
+                  SETCMD(DTV_STAT_PRE_TOTAL_BIT_COUNT, 0); }
+  if (BerPost)  { SETCMD(DTV_STAT_POST_ERROR_BIT_COUNT, 0);
+                  SETCMD(DTV_STAT_POST_TOTAL_BIT_COUNT, 0); }
+  if (Per)      { SETCMD(DTV_STAT_ERROR_BLOCK_COUNT, 0);
+                  SETCMD(DTV_STAT_TOTAL_BLOCK_COUNT, 0); }
+  if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
+     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+     return false;
+     }
+  Valid = DTV_STAT_VALID_NONE;
+  int i = 0;
+  if (Strength) {
+     if (Props[i].u.st.len > 0) {
+        switch (Props[i].u.st.stat[0].scale) {
+          case FE_SCALE_DECIBEL:  *Strength = double(Props[i].u.st.stat[0].svalue) / 1000;
+                                  Valid |= DTV_STAT_VALID_STRENGTH;
+                                  break;
+          default: ;
+          }
+        }
+     i++;
+     }
+  if (Cnr) {
+     if (Props[i].u.st.len > 0) {
+        switch (Props[i].u.st.stat[0].scale) {
+          case FE_SCALE_DECIBEL:  *Cnr = double(Props[i].u.st.stat[0].svalue) / 1000;
+                                  Valid |= DTV_STAT_VALID_CNR;
+                                  break;
+          default: ;
+          }
+        }
+     i++;
+     }
+  if (BerPre) {
+     if (Props[i].u.st.len > 0 && Props[i + 1].u.st.len > 0) {
+        if (Props[i].u.st.stat[0].scale == FE_SCALE_COUNTER && Props[i + 1].u.st.stat[0].scale == FE_SCALE_COUNTER) {
+           uint64_t ebc = Props[i].u.st.stat[0].uvalue; // error bit count
+           uint64_t tbc = Props[i + 1].u.st.stat[0].uvalue; // total bit count
+           if (tbc > 0) {
+              *BerPre = double(ebc) / tbc;
+              Valid |= DTV_STAT_VALID_BERPRE;
+              }
+           }
+        }
+     i += 2;
+     }
+  if (BerPost) {
+     if (Props[i].u.st.len > 0 && Props[i + 1].u.st.len > 0) {
+        if (Props[i].u.st.stat[0].scale == FE_SCALE_COUNTER && Props[i + 1].u.st.stat[0].scale == FE_SCALE_COUNTER) {
+           uint64_t ebc = Props[i].u.st.stat[0].uvalue; // error bit count
+           uint64_t tbc = Props[i + 1].u.st.stat[0].uvalue; // total bit count
+           if (tbc > 0) {
+              *BerPost = double(ebc) / tbc;
+              Valid |= DTV_STAT_VALID_BERPOST;
+              }
+           }
+        }
+     i += 2;
+     }
+  if (Per) {
+     if (Props[i].u.st.len > 0 && Props[i + 1].u.st.len > 0) {
+        if (Props[i].u.st.stat[0].scale == FE_SCALE_COUNTER && Props[i + 1].u.st.stat[0].scale == FE_SCALE_COUNTER) {
+           uint64_t ebc = Props[i].u.st.stat[0].uvalue; // error block count
+           uint64_t tbc = Props[i + 1].u.st.stat[0].uvalue; // total block count
+           if (tbc > 0) {
+              *Per = double(ebc) / tbc;
+              Valid |= DTV_STAT_VALID_PER;
+              }
+           }
+        }
+     i += 2;
+     }
+#ifdef DEBUG_SIGNALSTATS
+  fprintf(stderr, "FE %d/%d: API5 %04X", adapter, frontend, Valid);
+  if ((Valid & DTV_STAT_VALID_STRENGTH) != 0) fprintf(stderr, " STR=%1.1fdBm",  *Strength);
+  if ((Valid & DTV_STAT_VALID_CNR)      != 0) fprintf(stderr, " CNR=%1.1fdB",   *Cnr);
+  if ((Valid & DTV_STAT_VALID_BERPRE)   != 0) fprintf(stderr, " BERPRE=%1.1e",  *BerPre);
+  if ((Valid & DTV_STAT_VALID_BERPOST)  != 0) fprintf(stderr, " BERPOST=%1.1e", *BerPost);
+  if ((Valid & DTV_STAT_VALID_PER)      != 0) fprintf(stderr, " PER=%1.1e",     *Per);
+  fprintf(stderr, "\n");
+#endif
+  return Valid != DTV_STAT_VALID_NONE;
+}
+
+int dB1000toPercent(int dB1000, int Low, int High)
+{
+  // Convert the given value, which is in 1/1000 dBm, to a percentage in the
+  // range 0..100. Anything below Low is considered 0%, and anything above
+  // High counts as 100%.
+  if (dB1000 < Low)
+     return 0;
+  if (dB1000 > High)
+     return 100;
+  // return 100 - 100 * (High - dB1000) / (High - Low); // linear conversion
+  // return 100 - 100 * sqr(dB1000 - High) / sqr(Low - High); // quadratic conversion, see https://www.adriangranados.com/blog/dbm-to-percent-conversion
+  double v = 10.0 * (dB1000 - High) / (Low - High); // avoids the sqr() function
+  return 100 - v * v;
+}
+
 int cDvbTuner::GetSignalStrength(void) const
 {
   ClearEventQueue();
+  // Try DVB API 5:
+  for (int i = 0; i < 1; i++) { // just a trick to break out with 'continue' ;-)
+      dtv_property Props[MAXFRONTENDCMDS];
+      dtv_properties CmdSeq;
+      memset(&Props, 0, sizeof(Props));
+      memset(&CmdSeq, 0, sizeof(CmdSeq));
+      CmdSeq.props = Props;
+      SETCMD(DTV_STAT_SIGNAL_STRENGTH, 0);
+      if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
+         esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+         return -1;
+         }
+      int Signal = 0;;
+      if (Props[0].u.st.len > 0) {
+         switch (Props[0].u.st.stat[0].scale) {
+           case FE_SCALE_DECIBEL:  Signal = dB1000toPercent(Props[0].u.st.stat[0].svalue, -95000, -20000); // TODO use different values for DVB-S, -T, -C?
+                                   break;
+           case FE_SCALE_RELATIVE: Signal = 100 * Props[0].u.st.stat[0].uvalue / 0xFFFF;
+                                   break;
+           default: ;
+           }
+#ifdef DEBUG_SIGNALSTRENGTH
+         fprintf(stderr, "FE %d/%d: API5 %d %08X %.1f S = %d\n", adapter, frontend, Props[0].u.st.stat[0].scale, int(Props[0].u.st.stat[0].svalue), int(Props[0].u.st.stat[0].svalue) / 1000.0, Signal);
+#endif
+         }
+      else
+         continue;
+      return Signal;
+      }
+  // Fall back to DVB API 3:
   uint16_t Signal;
   while (1) {
         if (ioctl(fd_frontend, FE_READ_SIGNAL_STRENGTH, &Signal) != -1)
@@ -579,7 +736,7 @@ int cDvbTuner::GetSignalStrength(void) const
   if (s > 100)
      s = 100;
 #ifdef DEBUG_SIGNALSTRENGTH
-  fprintf(stderr, "FE %d/%d: %08X S = %04X %04X %3d%%\n", adapter, frontend, subsystemId, MaxSignal, Signal, s);
+  fprintf(stderr, "FE %d/%d: API3 %08X S = %04X %04X %3d%%\n", adapter, frontend, subsystemId, MaxSignal, Signal, s);
 #endif
   return s;
 }
@@ -588,6 +745,36 @@ int cDvbTuner::GetSignalStrength(void) const
 
 int cDvbTuner::GetSignalQuality(void) const
 {
+  // Try DVB API 5:
+  for (int i = 0; i < 1; i++) { // just a trick to break out with 'continue' ;-)
+      dtv_property Props[MAXFRONTENDCMDS];
+      dtv_properties CmdSeq;
+      memset(&Props, 0, sizeof(Props));
+      memset(&CmdSeq, 0, sizeof(CmdSeq));
+      CmdSeq.props = Props;
+      SETCMD(DTV_STAT_CNR, 0);
+      if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
+         esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+         return -1;
+         }
+      int Cnr = 0;;
+      if (Props[0].u.st.len > 0) {
+         switch (Props[0].u.st.stat[0].scale) {
+           case FE_SCALE_DECIBEL:  Cnr = dB1000toPercent(Props[0].u.st.stat[0].svalue, 5000, 20000); // TODO use different values for DVB-S, -T, -C?
+                                   break;
+           case FE_SCALE_RELATIVE: Cnr = 100 * Props[0].u.st.stat[0].uvalue / 0xFFFF;
+                                   break;
+           default: ;
+           }
+#ifdef DEBUG_SIGNALQUALITY
+         fprintf(stderr, "FE %d/%d: API5 %d %08X %.1f Q = %d\n", adapter, frontend, Props[0].u.st.stat[0].scale, int(Props[0].u.st.stat[0].svalue), int(Props[0].u.st.stat[0].svalue) / 1000.0, Cnr);
+#endif
+         }
+      else
+         continue;
+      return Cnr;
+      }
+  // Fall back to DVB API 3:
   fe_status_t Status;
   if (GetFrontendStatus(Status)) {
      // Actually one would expect these checks to be done from FE_HAS_SIGNAL to FE_HAS_LOCK, but some drivers (like the stb0899) are broken, so FE_HAS_LOCK is the only one that (hopefully) is generally reliable...
@@ -637,8 +824,35 @@ int cDvbTuner::GetSignalQuality(void) const
 #endif
      uint32_t Unc;
      while (1) {
-           if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1)
+           if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1) {
+              if (Unc != lastUncValue) {
+#ifdef DEBUG_SIGNALQUALITY
+                 fprintf(stderr, "FE %d/%d: API3 UNC = %u %u %u\n", adapter, frontend, Unc, lastUncValue, lastUncDelta);
+#endif
+                 lastUncDelta = (Unc >= lastUncValue) ? Unc - lastUncValue : lastUncValue - Unc;
+                 lastUncValue = Unc;
+                 lastUncChange = time(NULL);
+                 }
+              // The number of uncorrected blocks is a counter, which is normally
+              // at a constant value and only increases if there are new uncorrected
+              // blocks. So a change in the Unc value indicates reduced signal quality.
+              // Whenever the Unc counter changes, we take the delta between the old
+              // and new value into account for calculating the overall signal quality.
+              // The impact of Unc is considered for 2 seconds, and after that it is
+              // bisected with every passing second in order to phase it out. Otherwise
+              // once one or more uncorrected blocks occur, the signal quality would
+              // be considered low even if there haven't been any more uncorrected bocks
+              // for quite a while.
+              Unc = lastUncDelta;
+              int t = time(NULL) - lastUncChange - 2;
+              if (t > 0)
+                 Unc >>= min(t, 32);
+#ifdef DEBUG_SIGNALQUALITY
+              if (Unc > 0)
+                 fprintf(stderr, "FE %d/%d: API3 UNC = %u\n", adapter, frontend, Unc);
+#endif
               break;
+              }
            if (errno != EINTR) {
               Unc = 0;
 #ifdef DEBUG_SIGNALQUALITY
@@ -673,7 +887,7 @@ int cDvbTuner::GetSignalQuality(void) const
      if (q > 100)
         q = 100;
 #ifdef DEBUG_SIGNALQUALITY
-     fprintf(stderr, "FE %d/%d: %08X Q = %04X %04X %d %5d %5d %3d%%\n", adapter, frontend, subsystemId, MaxSnr, Snr, HasSnr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
+     fprintf(stderr, "FE %d/%d: API3 %08X Q = %04X %04X %d %5d %5d %3d%%\n", adapter, frontend, subsystemId, MaxSnr, Snr, HasSnr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
 #endif
      return q;
      }
@@ -777,19 +991,11 @@ static int GetRequiredDeliverySystem(const cChannel *Channel, const cDvbTranspon
 
 bool cDvbTuner::SetFrontend(void)
 {
-#define MAXFRONTENDCMDS 16
-#define SETCMD(c, d) { Frontend[CmdSeq.num].cmd = (c);\
-                       Frontend[CmdSeq.num].u.data = (d);\
-                       if (CmdSeq.num++ > MAXFRONTENDCMDS) {\
-                          esyslog("ERROR: too many tuning commands on frontend %d/%d", adapter, frontend);\
-                          return false;\
-                          }\
-                     }
-  dtv_property Frontend[MAXFRONTENDCMDS];
-  memset(&Frontend, 0, sizeof(Frontend));
+  dtv_property Props[MAXFRONTENDCMDS];
+  memset(&Props, 0, sizeof(Props));
   dtv_properties CmdSeq;
   memset(&CmdSeq, 0, sizeof(CmdSeq));
-  CmdSeq.props = Frontend;
+  CmdSeq.props = Props;
   SETCMD(DTV_CLEAR, 0);
   if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
      esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
@@ -1111,6 +1317,7 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
   fd_ca = DvbOpen(DEV_DVB_CA, adapter, frontend, O_RDWR);
   if (fd_ca >= 0)
      ciAdapter = cDvbCiAdapter::CreateCiAdapter(this, fd_ca);
+  checkTsBuffer = false;
 
   // The DVR device (will be opened and closed as needed):
 
@@ -1263,36 +1470,36 @@ bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
      LOG_ERROR;
      return false;
      }
-  dtv_property Frontend[1];
+  dtv_property Props[1];
   dtv_properties CmdSeq;
   // Determine the version of the running DVB API:
   if (!DvbApiVersion) {
-     memset(&Frontend, 0, sizeof(Frontend));
+     memset(&Props, 0, sizeof(Props));
      memset(&CmdSeq, 0, sizeof(CmdSeq));
-     CmdSeq.props = Frontend;
+     CmdSeq.props = Props;
      SETCMD(DTV_API_VERSION, 0);
      if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
         LOG_ERROR;
         return false;
         }
-     DvbApiVersion = Frontend[0].u.data;
+     DvbApiVersion = Props[0].u.data;
      isyslog("DVB API version is 0x%04X (VDR was built with 0x%04X)", DvbApiVersion, DVBAPIVERSION);
      }
   // Determine the types of delivery systems this device provides:
   bool LegacyMode = true;
   if (DvbApiVersion >= 0x0505) {
-     memset(&Frontend, 0, sizeof(Frontend));
+     memset(&Props, 0, sizeof(Props));
      memset(&CmdSeq, 0, sizeof(CmdSeq));
-     CmdSeq.props = Frontend;
+     CmdSeq.props = Props;
      SETCMD(DTV_ENUM_DELSYS, 0);
      int Result = ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq);
      if (Result == 0) {
-        for (uint i = 0; i < Frontend[0].u.buffer.len; i++) {
+        for (uint i = 0; i < Props[0].u.buffer.len; i++) {
             if (numDeliverySystems >= MAXDELIVERYSYSTEMS) {
                esyslog("ERROR: too many delivery systems on frontend %d/%d", adapter, frontend);
                break;
                }
-            deliverySystems[numDeliverySystems++] = Frontend[0].u.buffer.data[i];
+            deliverySystems[numDeliverySystems++] = Props[0].u.buffer.data[i];
             }
         LegacyMode = false;
         }
@@ -1620,6 +1827,11 @@ const cPositioner *cDvbDevice::Positioner(void) const
   return dvbTuner ? dvbTuner->Positioner() : NULL;
 }
 
+bool cDvbDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per) const
+{
+  return dvbTuner ? dvbTuner->GetSignalStats(Valid, Strength, Cnr, BerPre, BerPost, Per) : false;
+}
+
 int cDvbDevice::SignalStrength(void) const
 {
   return dvbTuner ? dvbTuner->GetSignalStrength() : -1;
@@ -1687,11 +1899,12 @@ bool cDvbDevice::GetTSPacket(uchar *&Data)
      if (cCamSlot *cs = CamSlot()) {
         if (cs->WantsTsData()) {
            int Available;
-           Data = tsBuffer->Get(&Available);
-           if (Data) {
-              Data = cs->Decrypt(Data, Available);
-              tsBuffer->Skip(Available);
-              }
+           Data = tsBuffer->Get(&Available, checkTsBuffer);
+           if (!Data)
+              Available = 0;
+           Data = cs->Decrypt(Data, Available);
+           tsBuffer->Skip(Available);
+           checkTsBuffer = Data != NULL;
            return true;
            }
         }
diff --git a/dvbdevice.h b/dvbdevice.h
index 5ae4952f8..edc946080 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 4.1 2015/04/18 13:57:27 kls Exp $
+ * $Id: dvbdevice.h 4.3 2017/04/17 14:44:43 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -187,6 +187,7 @@ class cDvbDevice : public cDevice {
   int numDeliverySystems;
   int numModulations;
   int fd_dvr, fd_ca;
+  bool checkTsBuffer;
   static cMutex bondMutex;
   cDvbDevice *bondedDevice;
   mutable bool needsDetachBondedReceivers;
@@ -243,6 +244,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
   virtual const cPositioner *Positioner(void) const;
+  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL) const;
   virtual int SignalStrength(void) const;
   virtual int SignalQuality(void) const;
   virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
diff --git a/eit.c b/eit.c
index b5c671d26..cfed4d080 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.1 2015/08/23 10:43:36 kls Exp $
+ * $Id: eit.c 4.2 2017/03/31 15:16:46 kls Exp $
  */
 
 #include "eit.h"
@@ -67,8 +67,13 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
      return;
      }
 
+  if (!EpgHandlers.BeginSegmentTransfer(Channel)) {
+     SchedulesStateKey.Remove(false);
+     ChannelsStateKey.Remove(false);
+     return;
+     }
+
   bool ChannelsModified = false;
-  EpgHandlers.BeginSegmentTransfer(Channel);
   bool handledExternally = EpgHandlers.HandledExternally(Channel);
   cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(Channel, true);
 
diff --git a/epg.c b/epg.c
index 4297350eb..c67b64562 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 4.2 2015/09/10 10:58:19 kls Exp $
+ * $Id: epg.c 4.4 2017/04/02 11:34:15 kls Exp $
  */
 
 #include "epg.h"
@@ -129,6 +129,7 @@ cEvent::cEvent(tEventID EventID)
   startTime = 0;
   duration = 0;
   vps = 0;
+  aux = NULL;
   SetSeen();
 }
 
@@ -137,6 +138,7 @@ cEvent::~cEvent()
   free(title);
   free(shortText);
   free(description);
+  free(aux);
   delete components;
 }
 
@@ -237,6 +239,12 @@ void cEvent::SetSeen(void)
   seen = time(NULL);
 }
 
+void cEvent::SetAux(const char *Aux)
+{
+  free(aux);
+  aux = Aux ? strdup(Aux) : NULL;
+}
+
 cString cEvent::ToDescr(void) const
 {
   char vpsbuf[64] = "";
@@ -469,6 +477,11 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
         }
      if (vps)
         fprintf(f, "%sV %ld\n", Prefix, vps);
+     if (!InfoOnly && !isempty(aux)) {
+        strreplace(aux, '\n', '|');
+        fprintf(f, "%s@ %s\n", Prefix, aux);
+        strreplace(aux, '|', '\n');
+        }
      if (!InfoOnly)
         fprintf(f, "%se\n", Prefix);
      }
@@ -507,6 +520,9 @@ bool cEvent::Parse(char *s)
               break;
     case 'V': SetVps(atoi(t));
               break;
+    case '@': strreplace(t, '|', '\n');
+              SetAux(t);
+              break;
     default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
               return false;
     }
@@ -1527,12 +1543,13 @@ void cEpgHandlers::DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t
   Schedule->DropOutdated(SegmentStart, SegmentEnd, TableID, Version);
 }
 
-void cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel)
+bool cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel)
 {
   for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
-      if (eh->BeginSegmentTransfer(Channel, false))
-         return;
+      if (!eh->BeginSegmentTransfer(Channel, false))
+         return false;
       }
+  return true;
 }
 
 void cEpgHandlers::EndSegmentTransfer(bool Modified)
diff --git a/epg.h b/epg.h
index b6f7d68eb..1341aa2e0 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 4.1 2015/08/09 11:25:04 kls Exp $
+ * $Id: epg.h 4.4 2017/04/02 11:22:21 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -66,7 +66,7 @@ class cComponents {
 
 class cSchedule;
 
-typedef u_int16_t tEventID;
+typedef u_int32_t tEventID;
 
 class cEvent : public cListObject {
   friend class cSchedule;
@@ -84,11 +84,12 @@ class cEvent : public cListObject {
   char *shortText;         // Short description of this event (typically the episode name in case of a series)
   char *description;       // Description of this event
   cComponents *components; // The stream components of this event
-  uchar contents[MaxEventContents]; // Contents of this event
   time_t startTime;        // Start time of this event
   int duration;            // Duration of this event in seconds
+  uchar contents[MaxEventContents]; // Contents of this event
   time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
   time_t seen;             // When this event was last seen in the data stream
+  char *aux;               // Auxiliary data, for use with plugins
 public:
   cEvent(tEventID EventID);
   ~cEvent();
@@ -111,6 +112,7 @@ class cEvent : public cListObject {
   time_t Vps(void) const { return vps; }
   time_t Seen(void) const { return seen; }
   bool SeenWithin(int Seconds) const { return time(NULL) - seen < Seconds; }
+  const char *Aux(void) const { return aux; }
   void IncNumTimers(void) const;
   void DecNumTimers(void) const;
   bool HasTimer(void) const { return numTimers > 0; }
@@ -135,6 +137,7 @@ class cEvent : public cListObject {
   void SetDuration(int Duration);
   void SetVps(time_t Vps);
   void SetSeen(void);
+  void SetAux(const char *Aux);
   cString ToDescr(void) const;
   void Dump(FILE *f, const char *Prefix = "", bool InfoOnly = false) const;
   bool Parse(char *s);
@@ -284,6 +287,9 @@ class cEpgHandler : public cListObject {
   virtual bool BeginSegmentTransfer(const cChannel *Channel, bool Dummy) { return false; } // TODO remove obsolete Dummy
           ///< Called directly after IgnoreChannel() before any other handler method is called.
           ///< Designed to give handlers the possibility to prepare a database transaction.
+          ///< If any EPG handler returns false in this function, it is assumed that
+          ///< the EPG for the given Channel has to be handled later due to some transaction problems,
+          ///> therefore the processing will aborted.
           ///< Dummy is for backward compatibility and may be removed in a future version.
   virtual bool EndSegmentTransfer(bool Modified, bool Dummy) { return false; } // TODO remove obsolete Dummy
           ///< Called after the segment data has been processed.
@@ -311,7 +317,7 @@ class cEpgHandlers : public cList<cEpgHandler> {
   void HandleEvent(cEvent *Event);
   void SortSchedule(cSchedule *Schedule);
   void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
-  void BeginSegmentTransfer(const cChannel *Channel);
+  bool BeginSegmentTransfer(const cChannel *Channel);
   void EndSegmentTransfer(bool Modified);
   };
 
diff --git a/menu.c b/menu.c
index 685e94f61..357aaf836 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.22 2017/03/18 14:27:50 kls Exp $
+ * $Id: menu.c 4.25 2017/04/20 09:15:49 kls Exp $
  */
 
 #include "menu.h"
@@ -1071,52 +1071,10 @@ static bool RemoteTimerError(const cTimer *Timer)
 
 static bool HandleRemoteModifications(cTimer *NewTimer, cTimer *OldTimer = NULL)
 {
-  cStringList Response;
-  if (!OldTimer || OldTimer->Local() || !OldTimer->Id()) {
-     if (NewTimer->Local()) { // timer stays local, nothing to do
-        if (OldTimer && OldTimer->Id())
-           isyslog("modified timer %s", *NewTimer->ToDescr());
-        else
-           isyslog("added timer %s", *NewTimer->ToDescr());
-        }
-     else { // timer is new, or moved from local to remote
-        if (!ExecSVDRPCommand(NewTimer->Remote(), cString::sprintf("NEWT %s", *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
-           return RemoteTimerError(NewTimer);
-        int RemoteId = atoi(SVDRPValue(Response[0]));
-        if (RemoteId <= 0)
-           return RemoteTimerError(NewTimer);
-        NewTimer->SetId(RemoteId);
-        if (OldTimer && OldTimer->Id()) {
-           if (OldTimer->Recording())
-              cRecordControls::Stop(OldTimer);
-           isyslog("moved timer %d to %s", OldTimer->Id(), *NewTimer->ToDescr());
-           }
-        else
-           isyslog("added timer %s", *NewTimer->ToDescr());
-        }
-     }
-  else if (NewTimer->Local()) { // timer is moved from remote to local
-     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
-        return RemoteTimerError(OldTimer);
-     NewTimer->SetId(cTimers::NewTimerId());
-     NewTimer->ClrFlags(tfRecording); // in case it was recording on the remote machine
-     isyslog("moved timer %d@%s to %s", OldTimer->Id(), OldTimer->Remote(), *NewTimer->ToDescr());
-     }
-  else if (strcmp(OldTimer->Remote(), NewTimer->Remote()) == 0) { // timer stays remote on same machine
-     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("MODT %d %s", OldTimer->Id(), *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
-        return RemoteTimerError(NewTimer);
-     isyslog("modified timer %s", *NewTimer->ToDescr());
-     }
-  else { // timer is moved from one remote machine to an other
-     if (!ExecSVDRPCommand(NewTimer->Remote(), cString::sprintf("NEWT %s", *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
-        return RemoteTimerError(NewTimer);
-     int RemoteId = atoi(SVDRPValue(Response[0]));
-     if (RemoteId <= 0)
-        return RemoteTimerError(NewTimer);
-     NewTimer->SetId(RemoteId);
-     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
-        return RemoteTimerError(OldTimer);
-     isyslog("moved timer %d@%s to %s", OldTimer->Id(), OldTimer->Remote(), *NewTimer->ToDescr());
+  cString ErrorMessage;
+  if (!HandleRemoteTimerModifications(NewTimer, OldTimer, &ErrorMessage)) {
+     Skins.Message(mtError, ErrorMessage);
+     return false;
      }
   return true;
 }
@@ -1130,8 +1088,12 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
        case kOk:     if (timer) {
                         LOCK_TIMERS_WRITE;
                         if (!addIfConfirmed && !Timers->Contains(timer)) {
-                           Skins.Message(mtWarning, tr("Timer has been deleted!"));
-                           break;
+                           if (cTimer *t = Timers->GetById(timer->Id(), timer->Remote()))
+                              timer = t;
+                           else {
+                              Skins.Message(mtWarning, tr("Timer has been deleted!"));
+                              break;
+                              }
                            }
                         LOCK_CHANNELS_READ;
                         if (const cChannel *Channel = Channels->GetByNumber(channel))
@@ -1157,6 +1119,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                         else {
                            if (!HandleRemoteModifications(&data, timer))
                               return osContinue;
+                           if (timer->Local() && timer->Recording() && data.Remote())
+                              cRecordControls::Stop(timer);
                            *timer = data;
                            }
                         LOCK_SCHEDULES_READ;
@@ -1387,15 +1351,13 @@ eOSState cMenuTimers::Delete(void)
               Timer = NULL;
            }
         if (Timer) {
-           if (Timer->Remote()) {
-              cStringList Response;
-              if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("DELT %d", Timer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
-                 RemoteTimerError(Timer);
+           if (!HandleRemoteModifications(NULL, Timer)) {
+              timersStateKey.Remove();
+              return osContinue;
               }
            Timers->Del(Timer);
            cOsdMenu::Del(Current());
            Display();
-           isyslog("deleted timer %s", *Timer->ToDescr());
            }
         }
      }
@@ -3389,10 +3351,8 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
   int oldOsdLanguageIndex = osdLanguageIndex;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
-  if (ModifiedAppearance) {
+  if (ModifiedAppearance)
      cOsdProvider::UpdateOsdSize(true);
-     SetDisplayMenu();
-     }
 
   if (osdLanguageIndex != oldOsdLanguageIndex || skinIndex != oldSkinIndex) {
      strn0cpy(data.OSDLanguage, I18nLocale(osdLanguageIndex), sizeof(data.OSDLanguage));
@@ -4149,7 +4109,6 @@ eOSState cMenuSetupPlugins::ProcessKey(eKeys Key)
         Store();
         // Reinitialize OSD and skin, in case any plugin setup change has an influence on these:
         cOsdProvider::UpdateOsdSize(true);
-        SetDisplayMenu();
         Display();
         }
      }
diff --git a/mtd.c b/mtd.c
index bf792dd9f..29fe520f2 100644
--- a/mtd.c
+++ b/mtd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.c 1.9 2017/03/27 14:26:04 kls Exp $
+ * $Id: mtd.c 1.10 2017/04/26 08:33:54 kls Exp $
  */
 
 #include "mtd.h"
@@ -136,6 +136,12 @@ bool cMtdHandler::Devices(cVector<int> &CardIndexes)
   return CardIndexes.Size() > 0;
 }
 
+void cMtdHandler::UnAssignAll(void)
+{
+  for (int i = 0; i < camSlots.Size(); i++)
+      camSlots[i]->Assign(NULL);
+}
+
 // --- cMtdMapper ------------------------------------------------------------
 
 #define MTD_INVALID_PID 0xFFFF
diff --git a/mtd.h b/mtd.h
index b77420223..7f2151a32 100644
--- a/mtd.h
+++ b/mtd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.h 1.6 2017/03/27 08:30:00 kls Exp $
+ * $Id: mtd.h 1.7 2017/04/26 09:17:08 kls Exp $
  */
 
 #ifndef __MTD_H
@@ -140,6 +140,8 @@ class cMtdHandler {
       ///< Adds the card indexes of the devices of any active MTD CAM slots to
       ///< the given CardIndexes.
       ///< Returns true if the array is not empty.
+  void UnAssignAll(void);
+      ///< Unassigns all MTD CAM slots from their devices.
   };
 
 #define MTD_DONT_CALL(v) dsyslog("PROGRAMMING ERROR (%s,%d): DON'T CALL %s", __FILE__, __LINE__, __FUNCTION__); return v;
diff --git a/osdbase.c b/osdbase.c
index 52ab240e4..ac8026ffd 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 4.1 2015/09/10 11:23:07 kls Exp $
+ * $Id: osdbase.c 4.2 2017/04/03 12:30:52 kls Exp $
  */
 
 #include "osdbase.h"
@@ -77,6 +77,7 @@ void cOsdObject::Show(void)
 
 cSkinDisplayMenu *cOsdMenu::displayMenu = NULL;
 int cOsdMenu::displayMenuCount = 0;
+int cOsdMenu::osdState = 0;
 
 cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
@@ -96,8 +97,10 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   helpRed = helpGreen = helpYellow = helpBlue = NULL;
   helpDisplayed = false;
   status = NULL;
-  if (!displayMenuCount++)
+  if (!displayMenuCount++) {
+     cOsdProvider::OsdSizeChanged(osdState); // to get the current state
      SetDisplayMenu();
+     }
 }
 
 cOsdMenu::~cOsdMenu()
@@ -226,6 +229,8 @@ void cOsdMenu::Display(void)
      subMenu->Display();
      return;
      }
+  if (cOsdProvider::OsdSizeChanged(osdState))
+     SetDisplayMenu();
   displayMenu->SetMessage(mtStatus, NULL);
   displayMenu->Clear();
   cStatus::MsgOsdClear();
diff --git a/osdbase.h b/osdbase.h
index 5e807e769..91b795d5d 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 4.1 2015/09/10 11:17:52 kls Exp $
+ * $Id: osdbase.h 4.2 2017/04/03 12:02:16 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -87,6 +87,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
 private:
   static cSkinDisplayMenu *displayMenu;
   static int displayMenuCount;
+  static int osdState;
   int displayMenuItems;
   char *title;
   int cols[cSkinDisplayMenu::MaxTabs];
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 769981f3f..cbb0c8a37 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -665,7 +665,7 @@ msgid "File"
 msgstr "Tiedosto"
 
 msgid "Record on"
-msgstr ""
+msgstr "Tallennin"
 
 msgid "Button$Folder"
 msgstr "Kansio"
@@ -680,10 +680,10 @@ msgid "First day"
 msgstr "1. päivä"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Etäajastimen hakeminen epäonnistui"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Ajastin on poistettu!"
 
 msgid "Select folder"
 msgstr "Valitse kansio"
@@ -861,10 +861,10 @@ msgid "always"
 msgstr "aina"
 
 msgid "by name"
-msgstr ""
+msgstr "nimen mukaan"
 
 msgid "by time"
-msgstr ""
+msgstr "ajan mukaan"
 
 msgid "OSD"
 msgstr "Kuvaruutunäyttö"
@@ -954,7 +954,7 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Näytä kansiot ensin"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Järjestä tallenteet oletuksena"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
@@ -1141,7 +1141,7 @@ msgid " (activating)"
 msgstr " (aktivoidaan)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ laite"
 
 msgid "CAM"
 msgstr "CAM"
@@ -1174,13 +1174,13 @@ msgid "Can't reset CAM!"
 msgstr "CA-moduulin nollaus epäonnistui!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "ei pikatallennusta"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "varmista pikatallennus"
 
 msgid "record instantly"
-msgstr ""
+msgstr "pikatallennus"
 
 msgid "do not pause live video"
 msgstr "älä pysäytä lähetystä"
@@ -1213,7 +1213,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Tallenteen oletuselinikä (d)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Tallennusnäppäimen toiminta"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "Taukonäppäimen toiminta"
@@ -1315,13 +1315,13 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP-komennon odotusaika (s)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "Käytä SVDRP-vertaisverkkoa"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "SVDRP-palvelimen nimi"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "SVDRP-oletuspalvelin"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Kanavavalinnan odotusaika (s)"
@@ -1577,7 +1577,7 @@ msgid "Pause live video?"
 msgstr "Pysäytetäänkö lähetys?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Aloitetaanko tallennus?"
 
 msgid "Recording started"
 msgstr "Tallennus aloitettu"
diff --git a/receiver.c b/receiver.c
index dd61fd65e..8009e91bc 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 4.2 2017/02/21 10:59:27 kls Exp $
+ * $Id: receiver.c 4.3 2017/04/01 15:55:38 kls Exp $
  */
 
 #include "receiver.h"
@@ -16,6 +16,9 @@ cReceiver::cReceiver(const cChannel *Channel, int Priority)
   device = NULL;
   SetPriority(Priority);
   numPids = 0;
+  lastScrambledPacket = 0;
+  startScrambleDetection = 0;
+  scramblingTimeout = 0;
   SetPids(Channel);
 }
 
diff --git a/receiver.h b/receiver.h
index 09da8cda0..184d2ee8b 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 4.1 2015/09/05 11:42:47 kls Exp $
+ * $Id: receiver.h 4.2 2017/04/01 15:55:27 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -22,6 +22,9 @@ class cReceiver {
   int priority;
   int pids[MAXRECEIVEPIDS];
   int numPids;
+  time_t lastScrambledPacket;
+  time_t startScrambleDetection;
+  int scramblingTimeout;
   bool WantsPid(int Pid);
 protected:
   cDevice *Device(void) { return device; }
diff --git a/recording.c b/recording.c
index 639805857..9f96b73d2 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.7 2017/01/01 17:52:51 kls Exp $
+ * $Id: recording.c 4.8 2017/04/03 13:34:30 kls Exp $
  */
 
 #include "recording.h"
@@ -753,6 +753,7 @@ char *LimitNameLengths(char *s, int PathMax, int NameMax)
 
 cRecording::cRecording(cTimer *Timer, const cEvent *Event)
 {
+  id = 0;
   resume = RESUME_NOT_INITIALIZED;
   titleBuffer = NULL;
   sortBufferName = sortBufferTime = NULL;
@@ -808,6 +809,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
 
 cRecording::cRecording(const char *FileName)
 {
+  id = 0;
   resume = RESUME_NOT_INITIALIZED;
   fileSizeMB = -1; // unknown
   channel = -1;
@@ -1000,6 +1002,11 @@ void cRecording::ClearSortName(void)
   sortBufferName = sortBufferTime = NULL;
 }
 
+void cRecording::SetId(int Id)
+{
+  id = Id;
+}
+
 int cRecording::GetResume(void) const
 {
   if (resume == RESUME_NOT_INITIALIZED) {
@@ -1456,6 +1463,7 @@ void cVideoDirectoryScannerThread::ScanVideoDir(const char *DirName, int LinkLev
 
 cRecordings cRecordings::recordings;
 cRecordings cRecordings::deletedRecordings(true);
+int cRecordings::lastRecordingId = 0;
 char *cRecordings::updateFileName = NULL;
 cVideoDirectoryScannerThread *cRecordings::videoDirectoryScannerThread = NULL;
 time_t cRecordings::lastUpdate = 0;
@@ -1507,6 +1515,15 @@ void cRecordings::Update(bool Wait)
      }
 }
 
+const cRecording *cRecordings::GetById(int Id) const
+{
+  for (const cRecording *Recording = First(); Recording; Recording = Next(Recording)) {
+      if (Recording->Id() == Id)
+         return Recording;
+      }
+  return NULL;
+}
+
 const cRecording *cRecordings::GetByName(const char *FileName) const
 {
   if (FileName) {
@@ -1518,6 +1535,12 @@ const cRecording *cRecordings::GetByName(const char *FileName) const
   return NULL;
 }
 
+void cRecordings::Add(cRecording *Recording)
+{
+  Recording->SetId(++lastRecordingId);
+  cList<cRecording>::Add(Recording);
+}
+
 void cRecordings::AddByName(const char *FileName, bool TriggerUpdate)
 {
   if (!GetByName(FileName)) {
diff --git a/recording.h b/recording.h
index b649f6fde..200af45af 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 4.4 2016/12/13 13:12:12 kls Exp $
+ * $Id: recording.h 4.5 2017/04/03 13:31:16 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -97,6 +97,7 @@ class cRecordingInfo {
 class cRecording : public cListObject {
   friend class cRecordings;
 private:
+  int id;
   mutable int resume;
   mutable char *titleBuffer;
   mutable char *sortBufferName;
@@ -116,6 +117,7 @@ class cRecording : public cListObject {
   static char *StripEpisodeName(char *s, bool Strip);
   char *SortName(void) const;
   void ClearSortName(void);
+  void SetId(int Id); // should only be set by cRecordings
   time_t start;
   int priority;
   int lifetime;
@@ -124,6 +126,7 @@ class cRecording : public cListObject {
   cRecording(cTimer *Timer, const cEvent *Event);
   cRecording(const char *FileName);
   virtual ~cRecording();
+  int Id(void) const { return id; }
   time_t Start(void) const { return start; }
   int Priority(void) const { return priority; }
   int Lifetime(void) const { return lifetime; }
@@ -222,6 +225,7 @@ class cRecordings : public cList<cRecording> {
 private:
   static cRecordings recordings;
   static cRecordings deletedRecordings;
+  static int lastRecordingId;
   static char *updateFileName;
   static time_t lastUpdate;
   static cVideoDirectoryScannerThread *videoDirectoryScannerThread;
@@ -254,8 +258,11 @@ class cRecordings : public cList<cRecording> {
   static bool NeedsUpdate(void);
   void ResetResume(const char *ResumeFileName = NULL);
   void ClearSortNames(void);
+  const cRecording *GetById(int Id) const;
+  cRecording *GetById(int Id) { return const_cast<cRecording *>(static_cast<const cRecordings *>(this)->GetById(Id)); };
   const cRecording *GetByName(const char *FileName) const;
   cRecording *GetByName(const char *FileName) { return const_cast<cRecording *>(static_cast<const cRecordings *>(this)->GetByName(FileName)); }
+  void Add(cRecording *Recording);
   void AddByName(const char *FileName, bool TriggerUpdate = true);
   void DelByName(const char *FileName);
   void UpdateByName(const char *FileName);
diff --git a/remux.c b/remux.c
index a2d2dd6c7..4a3ff1436 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 4.5 2017/03/26 13:07:01 kls Exp $
+ * $Id: remux.c 4.6 2017/04/24 14:59:39 kls Exp $
  */
 
 #include "remux.h"
@@ -502,7 +502,7 @@ void cPatPmtGenerator::GeneratePat(void)
   p[i++] = pmtPid & 0xFF; // program number lo
   p[i++] = 0xE0 | (pmtPid >> 8); // dummy (3), PMT pid hi (5)
   p[i++] = pmtPid & 0xFF; // PMT pid lo
-  pat[SectionLength] = i - SectionLength - 1 + 4; // -2 = SectionLength storage, +4 = length of CRC
+  pat[SectionLength] = i - SectionLength - 1 + 4; // -1 = SectionLength storage, +4 = length of CRC
   MakeCRC(pat + i, pat + PayloadStart, i - PayloadStart);
   IncVersion(patVersion);
 }
diff --git a/skinlcars.c b/skinlcars.c
index 93ada5eeb..c4278d27b 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 4.3 2017/01/19 15:27:48 kls Exp $
+ * $Id: skinlcars.c 4.4 2017/04/20 08:46:42 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1270,6 +1270,8 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
                            FreeDeviceSlots.Append(y);
                            y += lineHeight + Gap;
                            }
+                        else
+                           continue;
                         }
                      else if (cRecordControl *RecordControl = cRecordControls::GetRecordControl(Timer)) {
                         if (!Device || Device == RecordControl->Device()) {
diff --git a/svdrp.c b/svdrp.c
index 1697cc6a6..993150c7e 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.11 2016/12/08 10:48:53 kls Exp $
+ * $Id: svdrp.c 4.17 2017/04/22 11:57:31 kls Exp $
  */
 
 #include "svdrp.h"
@@ -723,18 +723,20 @@ const char *HelpPages[] = {
   "    interfere with data from the broadcasters.",
   "DELC <number>\n"
   "    Delete channel.",
-  "DELR <number>\n"
-  "    Delete the recording with the given number. Before a recording can be\n"
-  "    deleted, an LSTR command must have been executed in order to retrieve\n"
-  "    the recording numbers. The numbers don't change during subsequent DELR\n"
-  "    commands. CAUTION: THERE IS NO CONFIRMATION PROMPT WHEN DELETING A\n"
+  "DELR <id>\n"
+  "    Delete the recording with the given id. Before a recording can be\n"
+  "    deleted, an LSTR command should have been executed in order to retrieve\n"
+  "    the recording ids. The ids are unique and don't change while this\n"
+  "    instance of VDR is running.\n"
+  "    CAUTION: THERE IS NO CONFIRMATION PROMPT WHEN DELETING A\n"
   "    RECORDING - BE SURE YOU KNOW WHAT YOU ARE DOING!",
-  "DELT <number>\n"
-  "    Delete timer.",
-  "EDIT <number>\n"
-  "    Edit the recording with the given number. Before a recording can be\n"
-  "    edited, an LSTR command must have been executed in order to retrieve\n"
-  "    the recording numbers.",
+  "DELT <id>\n"
+  "    Delete the timer with the given id. If this timer is currently recording,\n"
+  "    the recording will be stopped without any warning.",
+  "EDIT <id>\n"
+  "    Edit the recording with the given id. Before a recording can be\n"
+  "    edited, an LSTR command should have been executed in order to retrieve\n"
+  "    the recording ids.",
   "GRAB <filename> [ <quality> [ <sizex> <sizey> ] ]\n"
   "    Grab the current frame and save it to the given file. Images can\n"
   "    be stored as JPEG or PNM, depending on the given file name extension.\n"
@@ -752,45 +754,49 @@ const char *HelpPages[] = {
   "    valid key names is given. If more than one key is given, they are\n"
   "    entered into the remote control queue in the given sequence. There\n"
   "    can be up to 31 keys.",
-  "LSTC [ :groups | <number> | <name> | <id> ]\n"
+  "LSTC [ :ids ] [ :groups | <number> | <name> | <id> ]\n"
   "    List channels. Without option, all channels are listed. Otherwise\n"
   "    only the given channel is listed. If a name is given, all channels\n"
   "    containing the given string as part of their name are listed.\n"
   "    If ':groups' is given, all channels are listed including group\n"
-  "    separators. The channel number of a group separator is always 0.",
+  "    separators. The channel number of a group separator is always 0.\n"
+  "    With ':ids' the channel ids are listed following the channel numbers.\n"
+  "    The special number 0 can be given to list the current channel.",
   "LSTE [ <channel> ] [ now | next | at <time> ]\n"
   "    List EPG data. Without any parameters all data of all channels is\n"
   "    listed. If a channel is given (either by number or by channel ID),\n"
   "    only data for that channel is listed. 'now', 'next', or 'at <time>'\n"
   "    restricts the returned data to present events, following events, or\n"
   "    events at the given time (which must be in time_t form).",
-  "LSTR [ <number> [ path ] ]\n"
+  "LSTR [ <id> [ path ] ]\n"
   "    List recordings. Without option, all recordings are listed. Otherwise\n"
   "    the information for the given recording is listed. If a recording\n"
-  "    number and the keyword 'path' is given, the actual file name of that\n"
-  "    recording's directory is listed.",
-  "LSTT [ <number> ] [ id ]\n"
+  "    id and the keyword 'path' is given, the actual file name of that\n"
+  "    recording's directory is listed.\n"
+  "    Note that the ids of the recordings are not necessarily given in\n"
+  "    numeric order.",
+  "LSTT [ <id> ] [ id ]\n"
   "    List timers. Without option, all timers are listed. Otherwise\n"
-  "    only the given timer is listed. If the keyword 'id' is given, the\n"
-  "    channels will be listed with their unique channel ids instead of\n"
-  "    their numbers. This command lists only the timers that are defined\n"
-  "    locally on this VDR, not any remote timers from other VDRs.",
+  "    only the timer with the given id is listed. If the keyword 'id' is\n"
+  "    given, the channels will be listed with their unique channel ids\n"
+  "    instead of their numbers. This command lists only the timers that are\n"
+  "    defined locally on this VDR, not any remote timers from other VDRs.",
   "MESG <message>\n"
   "    Displays the given message on the OSD. The message will be queued\n"
   "    and displayed whenever this is suitable.\n",
   "MODC <number> <settings>\n"
   "    Modify a channel. Settings must be in the same format as returned\n"
   "    by the LSTC command.",
-  "MODT <number> on | off | <settings>\n"
+  "MODT <id> on | off | <settings>\n"
   "    Modify a timer. Settings must be in the same format as returned\n"
   "    by the LSTT command. The special keywords 'on' and 'off' can be\n"
   "    used to easily activate or deactivate a timer.",
   "MOVC <number> <to>\n"
   "    Move a channel to a new position.",
-  "MOVR <number> <new name>\n"
-  "    Move the recording with the given number. Before a recording can be\n"
-  "    moved, an LSTR command must have been executed in order to retrieve\n"
-  "    the recording numbers. The numbers don't change during subsequent MOVR\n"
+  "MOVR <id> <new name>\n"
+  "    Move the recording with the given id. Before a recording can be\n"
+  "    moved, an LSTR command should have been executed in order to retrieve\n"
+  "    the recording ids. The ids don't change during subsequent MOVR\n"
   "    commands.\n",
   "NEWC <settings>\n"
   "    Create a new channel. Settings must be in the same format as returned\n"
@@ -806,16 +812,16 @@ const char *HelpPages[] = {
   "    number of seconds from now until the event. If the absolute time given\n"
   "    is smaller than the current time, or if the relative time is less than\n"
   "    zero, this means that the timer is currently recording and has started\n"
-  "    at the given time. The first value in the resulting line is the number\n"
+  "    at the given time. The first value in the resulting line is the id\n"
   "    of the timer.",
   "PING\n"
   "    Used by peer-to-peer connections between VDRs to keep the connection\n"
   "    from timing out. May be used at any time and simply returns a line of\n"
   "    the form '<hostname> is alive'.",
-  "PLAY <number> [ begin | <position> ]\n"
-  "    Play the recording with the given number. Before a recording can be\n"
-  "    played, an LSTR command must have been executed in order to retrieve\n"
-  "    the recording numbers.\n"
+  "PLAY <id> [ begin | <position> ]\n"
+  "    Play the recording with the given id. Before a recording can be\n"
+  "    played, an LSTR command should have been executed in order to retrieve\n"
+  "    the recording ids.\n"
   "    The keyword 'begin' plays the recording from its very beginning, while\n"
   "    a <position> (given as hh:mm:ss[.ff] or framenumber) starts at that\n"
   "    position. If neither 'begin' nor a <position> are given, replay is resumed\n"
@@ -1280,7 +1286,7 @@ void cSVDRPServer::CmdDELR(const char *Option)
      if (isnumber(Option)) {
         LOCK_RECORDINGS_WRITE;
         Recordings->SetExplicitModify();
-        if (cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) {
+        if (cRecording *Recording = Recordings->GetById(strtol(Option, NULL, 10))) {
            if (int RecordingInUse = Recording->IsInUse())
               Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, Recording));
            else {
@@ -1297,10 +1303,10 @@ void cSVDRPServer::CmdDELR(const char *Option)
            Reply(550, "Recording \"%s\" not found", Option);
         }
      else
-        Reply(501, "Error in recording number \"%s\"", Option);
+        Reply(501, "Error in recording id \"%s\"", Option);
      }
   else
-     Reply(501, "Missing recording number");
+     Reply(501, "Missing recording id");
 }
 
 void cSVDRPServer::CmdDELT(const char *Option)
@@ -1332,7 +1338,7 @@ void cSVDRPServer::CmdEDIT(const char *Option)
   if (*Option) {
      if (isnumber(Option)) {
         LOCK_RECORDINGS_READ;
-        if (const cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) {
+        if (const cRecording *Recording = Recordings->GetById(strtol(Option, NULL, 10))) {
            cMarks Marks;
            if (Marks.Load(Recording->FileName(), Recording->FramesPerSecond(), Recording->IsPesRecording()) && Marks.Count()) {
               if (RecordingsHandler.Add(ruCut, Recording->FileName()))
@@ -1347,10 +1353,10 @@ void cSVDRPServer::CmdEDIT(const char *Option)
            Reply(550, "Recording \"%s\" not found", Option);
         }
      else
-        Reply(501, "Error in recording number \"%s\"", Option);
+        Reply(501, "Error in recording id \"%s\"", Option);
      }
   else
-     Reply(501, "Missing recording number");
+     Reply(501, "Missing recording id");
 }
 
 void cSVDRPServer::CmdGRAB(const char *Option)
@@ -1560,11 +1566,17 @@ void cSVDRPServer::CmdHITK(const char *Option)
 void cSVDRPServer::CmdLSTC(const char *Option)
 {
   LOCK_CHANNELS_READ;
+  bool WithChannelIds = startswith(Option, ":ids") && (Option[4] == ' ' || Option[4] == 0);
+  if (WithChannelIds)
+     Option = skipspace(Option + 4);
   bool WithGroupSeps = strcasecmp(Option, ":groups") == 0;
   if (*Option && !WithGroupSeps) {
      if (isnumber(Option)) {
-        if (const cChannel *Channel = Channels->GetByNumber(strtol(Option, NULL, 10)))
-           Reply(250, "%d %s", Channel->Number(), *Channel->ToText());
+        int n = strtol(Option, NULL, 10);
+        if (n == 0)
+           n = cDevice::CurrentChannel();
+        if (const cChannel *Channel = Channels->GetByNumber(n))
+           Reply(250, "%d%s%s %s", Channel->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Channel->GetChannelID().ToString() : "", *Channel->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
@@ -1572,17 +1584,17 @@ void cSVDRPServer::CmdLSTC(const char *Option)
         const cChannel *Next = Channels->GetByChannelID(tChannelID::FromString(Option));
         if (!Next) {
            for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
-              if (!Channel->GroupSep()) {
-                 if (strcasestr(Channel->Name(), Option)) {
-                    if (Next)
-                       Reply(-250, "%d %s", Next->Number(), *Next->ToText());
-                    Next = Channel;
-                    }
-                 }
-              }
+               if (!Channel->GroupSep()) {
+                  if (strcasestr(Channel->Name(), Option)) {
+                     if (Next)
+                        Reply(-250, "%d%s%s %s", Next->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Next->GetChannelID().ToString() : "", *Next->ToText());
+                     Next = Channel;
+                     }
+                  }
+               }
            }
         if (Next)
-           Reply(250, "%d %s", Next->Number(), *Next->ToText());
+           Reply(250, "%d%s%s %s", Next->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Next->GetChannelID().ToString() : "", *Next->ToText());
         else
            Reply(501, "Channel \"%s\" not defined", Option);
         }
@@ -1590,9 +1602,9 @@ void cSVDRPServer::CmdLSTC(const char *Option)
   else if (cChannels::MaxNumber() >= 1) {
      for (const cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
          if (WithGroupSeps)
-            Reply(Channel->Next() ? -250: 250, "%d %s", Channel->GroupSep() ? 0 : Channel->Number(), *Channel->ToText());
+            Reply(Channel->Next() ? -250: 250, "%d%s%s %s", Channel->GroupSep() ? 0 : Channel->Number(), (WithChannelIds && !Channel->GroupSep()) ? " " : "", (WithChannelIds && !Channel->GroupSep()) ? *Channel->GetChannelID().ToString() : "", *Channel->ToText());
          else if (!Channel->GroupSep())
-            Reply(Channel->Number() < cChannels::MaxNumber() ? -250 : 250, "%d %s", Channel->Number(), *Channel->ToText());
+            Reply(Channel->Number() < cChannels::MaxNumber() ? -250 : 250, "%d%s%s %s", Channel->Number(), WithChannelIds ? " " : "", WithChannelIds ? *Channel->GetChannelID().ToString() : "", *Channel->ToText());
          }
      }
   else
@@ -1694,7 +1706,7 @@ void cSVDRPServer::CmdLSTR(const char *Option)
               if (isnumber(p))
                  Number = strtol(p, NULL, 10);
               else {
-                 Reply(501, "Error in recording number \"%s\"", Option);
+                 Reply(501, "Error in recording id \"%s\"", Option);
                  return;
                  }
               }
@@ -1707,7 +1719,7 @@ void cSVDRPServer::CmdLSTR(const char *Option)
            p = strtok_r(NULL, delim, &strtok_next);
            }
      if (Number) {
-        if (const cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) {
+        if (const cRecording *Recording = Recordings->GetById(strtol(Option, NULL, 10))) {
            FILE *f = fdopen(file, "w");
            if (f) {
               if (Path)
@@ -1729,7 +1741,7 @@ void cSVDRPServer::CmdLSTR(const char *Option)
   else if (Recordings->Count()) {
      const cRecording *Recording = Recordings->First();
      while (Recording) {
-           Reply(Recording == Recordings->Last() ? 250 : -250, "%d %s", Recording->Index() + 1, Recording->Title(' ', true));
+           Reply(Recording == Recordings->Last() ? 250 : -250, "%d %s", Recording->Id(), Recording->Title(' ', true));
            Recording = Recordings->Next(Recording);
            }
      }
@@ -1868,7 +1880,7 @@ void cSVDRPServer::CmdMODT(const char *Option)
            Reply(501, "Timer \"%d\" not defined", Id);
         }
      else
-        Reply(501, "Error in timer number");
+        Reply(501, "Error in timer id");
      }
   else
      Reply(501, "Missing timer settings");
@@ -1940,7 +1952,7 @@ void cSVDRPServer::CmdMOVR(const char *Option)
      if (isnumber(num)) {
         LOCK_RECORDINGS_WRITE;
         Recordings->SetExplicitModify();
-        if (cRecording *Recording = Recordings->Get(strtol(num, NULL, 10) - 1)) {
+        if (cRecording *Recording = Recordings->GetById(strtol(num, NULL, 10))) {
            if (int RecordingInUse = Recording->IsInUse())
               Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, Recording));
            else {
@@ -1964,11 +1976,11 @@ void cSVDRPServer::CmdMOVR(const char *Option)
            Reply(550, "Recording \"%s\" not found", num);
         }
      else
-        Reply(501, "Error in recording number \"%s\"", num);
+        Reply(501, "Error in recording id \"%s\"", num);
      free(opt);
      }
   else
-     Reply(501, "Missing recording number");
+     Reply(501, "Missing recording id");
 }
 
 void cSVDRPServer::CmdNEWC(const char *Option)
@@ -2053,36 +2065,45 @@ void cSVDRPServer::CmdPLAY(const char *Option)
      char c = *option;
      *option = 0;
      if (isnumber(num)) {
-        LOCK_RECORDINGS_READ;
-        if (const cRecording *Recording = Recordings->Get(strtol(num, NULL, 10) - 1)) {
-           if (c)
-              option = skipspace(++option);
-           cReplayControl::SetRecording(NULL);
-           cControl::Shutdown();
-           if (*option) {
-              int pos = 0;
-              if (strcasecmp(option, "BEGIN") != 0)
-                 pos = HMSFToIndex(option, Recording->FramesPerSecond());
-              cResumeFile Resume(Recording->FileName(), Recording->IsPesRecording());
-              if (pos <= 0)
-                 Resume.Delete();
-              else
-                 Resume.Save(pos);
+        cStateKey StateKey;
+        if (const cRecordings *Recordings = cRecordings::GetRecordingsRead(StateKey)) {
+           if (const cRecording *Recording = Recordings->GetById(strtol(num, NULL, 10))) {
+              cString FileName = Recording->FileName();
+              cString Title = Recording->Title();
+              int FramesPerSecond = Recording->FramesPerSecond();
+              bool IsPesRecording = Recording->IsPesRecording();
+              StateKey.Remove(); // must give up the lock for the call to cControl::Shutdown()
+              if (c)
+                 option = skipspace(++option);
+              cReplayControl::SetRecording(NULL);
+              cControl::Shutdown();
+              if (*option) {
+                 int pos = 0;
+                 if (strcasecmp(option, "BEGIN") != 0)
+                    pos = HMSFToIndex(option, FramesPerSecond);
+                 cResumeFile Resume(FileName, IsPesRecording);
+                 if (pos <= 0)
+                    Resume.Delete();
+                 else
+                    Resume.Save(pos);
+                 }
+              cReplayControl::SetRecording(FileName);
+              cControl::Launch(new cReplayControl);
+              cControl::Attach();
+              Reply(250, "Playing recording \"%s\" [%s]", num, *Title);
+              }
+           else {
+              StateKey.Remove();
+              Reply(550, "Recording \"%s\" not found", num);
               }
-           cReplayControl::SetRecording(Recording->FileName());
-           cControl::Launch(new cReplayControl);
-           cControl::Attach();
-           Reply(250, "Playing recording \"%s\" [%s]", num, Recording->Title());
            }
-        else
-           Reply(550, "Recording \"%s\" not found", num);
         }
      else
-        Reply(501, "Error in recording number \"%s\"", num);
+        Reply(501, "Error in recording id \"%s\"", num);
      free(opt);
      }
   else
-     Reply(501, "Missing recording number");
+     Reply(501, "Missing recording id");
 }
 
 void cSVDRPServer::CmdPLUG(const char *Option)
diff --git a/timers.c b/timers.c
index 5bc11036e..4cf8fb7fe 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.7 2016/12/23 09:48:39 kls Exp $
+ * $Id: timers.c 4.9 2017/04/20 09:15:06 kls Exp $
  */
 
 #include "timers.h"
@@ -739,11 +739,13 @@ int cTimers::NewTimerId(void)
   return ++lastTimerId; // no need for locking, the caller must have a lock on the global Timers list
 }
 
-const cTimer *cTimers::GetById(int Id) const
+const cTimer *cTimers::GetById(int Id, const char *Remote) const
 {
   for (const cTimer *ti = First(); ti; ti = Next(ti)) {
-      if (!ti->Remote() && ti->Id() == Id)
-         return ti;
+      if (ti->Id() == Id) {
+         if (!Remote && !ti->Remote() || Remote && ti->Remote() && strcmp(Remote, ti->Remote()) == 0)
+            return ti;
+         }
       }
   return NULL;
 }
@@ -955,6 +957,72 @@ void cTimers::TriggerRemoteTimerPoll(const char *ServerName)
      }
 }
 
+static bool RemoteTimerError(const cTimer *Timer, cString *Msg)
+{
+  if (Msg)
+     *Msg = cString::sprintf("%s %d@%s!", tr("Error while accessing remote timer"), Timer->Id(), Timer->Remote());
+  return false; // convenience return code
+}
+
+bool HandleRemoteTimerModifications(cTimer *NewTimer, cTimer *OldTimer, cString *Msg)
+{
+  cStringList Response;
+  if (!NewTimer) {
+     if (OldTimer) { // timer shall be deleted from remote machine
+        if (OldTimer->Remote() && OldTimer->Id()) {
+           if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
+              return RemoteTimerError(OldTimer, Msg);
+           }
+        isyslog("deleted timer %s", *OldTimer->ToDescr());
+        }
+     }
+  else if (!OldTimer || OldTimer->Local() || !OldTimer->Id()) {
+     if (NewTimer->Local()) { // timer stays local, nothing to do
+        if (OldTimer && OldTimer->Id())
+           isyslog("modified timer %s", *NewTimer->ToDescr());
+        else
+           isyslog("added timer %s", *NewTimer->ToDescr());
+        }
+     else { // timer is new, or moved from local to remote
+        if (!ExecSVDRPCommand(NewTimer->Remote(), cString::sprintf("NEWT %s", *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+           return RemoteTimerError(NewTimer, Msg);
+        int RemoteId = atoi(SVDRPValue(Response[0]));
+        if (RemoteId <= 0)
+           return RemoteTimerError(NewTimer, Msg);
+        NewTimer->SetId(RemoteId);
+        if (OldTimer && OldTimer->Id()) {
+           isyslog("moved timer %d to %s", OldTimer->Id(), *NewTimer->ToDescr());
+           }
+        else
+           isyslog("added timer %s", *NewTimer->ToDescr());
+        }
+     }
+  else if (NewTimer->Local()) { // timer is moved from remote to local
+     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(OldTimer, Msg);
+     NewTimer->SetId(cTimers::NewTimerId());
+     NewTimer->ClrFlags(tfRecording); // in case it was recording on the remote machine
+     isyslog("moved timer %d@%s to %s", OldTimer->Id(), OldTimer->Remote(), *NewTimer->ToDescr());
+     }
+  else if (strcmp(OldTimer->Remote(), NewTimer->Remote()) == 0) { // timer stays remote on same machine
+     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("MODT %d %s", OldTimer->Id(), *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(NewTimer, Msg);
+     isyslog("modified timer %s", *NewTimer->ToDescr());
+     }
+  else { // timer is moved from one remote machine to an other
+     if (!ExecSVDRPCommand(NewTimer->Remote(), cString::sprintf("NEWT %s", *NewTimer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(NewTimer, Msg);
+     int RemoteId = atoi(SVDRPValue(Response[0]));
+     if (RemoteId <= 0)
+        return RemoteTimerError(NewTimer, Msg);
+     NewTimer->SetId(RemoteId);
+     if (!ExecSVDRPCommand(OldTimer->Remote(), cString::sprintf("DELT %d", OldTimer->Id()), &Response) || SVDRPCode(Response[0]) != 250)
+        return RemoteTimerError(OldTimer, Msg);
+     isyslog("moved timer %d@%s to %s", OldTimer->Id(), OldTimer->Remote(), *NewTimer->ToDescr());
+     }
+  return true;
+}
+
 // --- cSortedTimers ---------------------------------------------------------
 
 static int CompareTimers(const void *a, const void *b)
diff --git a/timers.h b/timers.h
index 7ee116c8a..c4932ba63 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 4.6 2016/12/23 09:49:31 kls Exp $
+ * $Id: timers.h 4.8 2017/04/20 09:09:45 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -168,8 +168,8 @@ class cTimers : public cConfig<cTimer> {
       ///<    }
   static bool Load(const char *FileName);
   static int NewTimerId(void);
-  const cTimer *GetById(int Id) const;
-  cTimer *GetById(int Id) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetById(Id)); };
+  const cTimer *GetById(int Id, const char *Remote = NULL) const;
+  cTimer *GetById(int Id, const char *Remote = NULL) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetById(Id, Remote)); };
   const cTimer *GetTimer(const cTimer *Timer) const;
   cTimer *GetTimer(const cTimer *Timer) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetTimer(Timer)); };
   const cTimer *GetMatch(time_t t) const;
@@ -200,6 +200,22 @@ class cTimers : public cConfig<cTimer> {
       ///< known remote machines.
   };
 
+bool HandleRemoteTimerModifications(cTimer *NewTimer, cTimer *OldTimer = NULL, cString *Msg = NULL);
+     ///< Performs any operations necessary to synchronize changes to a timer
+     ///< between peer VDR machines. OldTimer must point to the old version
+     ///< of the timer, while NewTimer points to the new version. If either
+     ///< of the two is a remote timer, the necessary SVDRP commands are executed
+     ///< to reflect the changes on the remote machine(s). If NewTimer is NULL,
+     ///< OldTimer will be removed from the remote machine (if applicable).
+     ///< If OldTimer is NULL, NewTimer will be added to the remote machine (if
+     ///< applicable). If anything goes wrong, an error message is generated in the
+     ///< optional Msg string, which should be presented to the user.
+     ///< Any necessary local operations (like adding/deleting the timer to the
+     ///< local list of timers etc.) must be done before and/or after the call to this
+     ///< function. Proper log messages will be generated by this function, even
+     ///< if no remote operations are required.
+     ///< Returns true if successful.
+
 // Provide lock controlled access to the list:
 
 DEF_LIST_LOCK(Timers);
diff --git a/vdr.5 b/vdr.5
index 947bdc72c..8375aa4ae 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 4.1 2017/01/09 13:35:08 kls Exp $
+.\" $Id: vdr.5 4.2 2017/04/02 11:41:51 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
 .SH NAME
@@ -845,19 +845,20 @@ The first character of each line defines what kind of data this line contains.
 
 The following tag characters are defined:
 .TS
-tab (@);
+tab (|);
 l l.
-\fBC\fR@<channel id> <channel name>
-\fBE\fR@<event id> <start time> <duration> <table id> <version>
-\fBT\fR@<title>
-\fBS\fR@<short text>
-\fBD\fR@<description>
-\fBG\fR@<genre> <genre>...
-\fBR\fR@<parental rating>
-\fBX\fR@<stream> <type> <language> <descr>
-\fBV\fR@<vps time>
-\fBe\fR@
-\fBc\fR@
+\fBC\fR|<channel id> <channel name>
+\fBE\fR|<event id> <start time> <duration> <table id> <version>
+\fBT\fR|<title>
+\fBS\fR|<short text>
+\fBD\fR|<description>
+\fBG\fR|<genre> <genre>...
+\fBR\fR|<parental rating>
+\fBX\fR|<stream> <type> <language> <descr>
+\fBV\fR|<vps time>
+\fB@\fR|<auxiliary data>
+\fBe\fR|
+\fBc\fR|
 .TE
 
 Lowercase characters mark the end of a sequence that was started by the
@@ -869,7 +870,6 @@ should at least have a \fBT\fR entry).
 
 There may be several \fBX\fR tags, depending on the number of tracks (video, audio etc.)
 the event provides.
-
 .TS
 tab (@);
 l l.
@@ -890,6 +890,7 @@ l l.
 <language>     @is the three letter language code (optionally two codes, separated by '+')
 <descr>        @is the description of this stream component
 <vps time>     @is the Video Programming Service time of this event
+<auxiliary data>@is an arbitrary string that can be used by external applications to store data; newline characters will be replaced with '|' when writing the \fIepg.data\fR file.
 .TE
 
 This file will be read at program startup in order to restore the results of
@@ -899,6 +900,10 @@ Note that the \fBevent id\fR that comes from the DVB data stream is actually
 just 16 bit wide. The internal representation in VDR allows for 32 bit to
 be used, so that external tools can generate EPG data that is guaranteed
 not to collide with the ids of existing data.
+
+The \fBauxiliary data\fR can be used for plugin specific purposes and has no meaning
+whatsoever to VDR itself. It will \fBnot\fR be written into the \fIinfo\fR file of
+a recording that is made for such an event.
 .SS CAM DATA
 The file \fIcam.data\fR contains information about which CAM in the system can
 decrypt a particular channel.
diff --git a/vdr.c b/vdr.c
index 5b598f9c8..925f35fb0 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.11 2017/03/25 14:20:30 kls Exp $
+ * $Id: vdr.c 4.12 2017/04/03 12:35:37 kls Exp $
  */
 
 #include <getopt.h>
@@ -986,6 +986,11 @@ int main(int argc, char *argv[])
           static time_t lastOsdSizeUpdate = 0;
           if (Now != lastOsdSizeUpdate) { // once per second
              cOsdProvider::UpdateOsdSize();
+             static int OsdState = 0;
+             if (cOsdProvider::OsdSizeChanged(OsdState)) {
+                if (cOsdMenu *OsdMenu = dynamic_cast<cOsdMenu *>(Menu))
+                   OsdMenu->Display();
+                }
              lastOsdSizeUpdate = Now;
              }
         }

From e59728f4f77af1ef0cb4a2376b33a5e1d82e2e92 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Thu, 25 May 2017 09:32:12 +0000
Subject: [PATCH 247/307] Version 2.3.5

VDR developer version 2.3.5 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.5.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.4-2.3.5.diff

MD5 checksums:

01fabef4d20ec01f11d53354d99a9642  vdr-2.3.5.tar.bz2
a9cc12e0bf76942c6435a36c429c6b42  vdr-2.3.4-2.3.5.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The changes since version 2.3.4:

- CAMs are now sent a generated EIT packet that contains a single 'present event' for
   the current SID, in order to avoid any parental rating dialogs.
- Fixed handling UNC values (the shift operator behaves unexpected for shift values
   larger than the size of the variable).
- Log messages about switching channels now include the channel ID (suggested by
   Dietmar Spingler).
- Events in the EIT that end before the EPG linger time are now ignored in the incoming
   data stream, because they would just be deleted in the next schedules cleanup anyway.
- The constructor of cHash (via cHashBase) now has an additional parameter (OwnObjects)
   which, if set to true, makes the hash take ownership of the hashed objects, so that
   they are deleted when the hash is cleared or destroyed.
- Fixed a memory leak in cSectionSyncerHash. The cSectionSyncerEntry objects put into
   the hash were never explicitly deleted. Now the cSectionSyncerHash takes ownership of
   these objects.
- cListObject now implements a private copy constructor and assignment operator, to keep
   derived objects from calling them implicitly.
- When selecting a device/CAM combination for live viewing, CAMs that are known to decrypt
   the requested channel are now given a higher priority than prefering the primary device
   (reported by Christian Winkler).
- Changed the default return value of cEpgHandler::BeginSegmentTransfer() to true, to
   avoid problems with derived classes that don't implement this function (reported by
   Frank Neumann).
- Fixed selecting delivery system names in case of undefined indexes (thanks to Jasmin
   Jessich).
- Changed the legacy delivery system name "DMBTH" to "DTMB", and added names for
   DVBC_ANNEX_C and DVBC2.
- Added a Status parameter to the interface of cDevice::SignalStats() and
   cDvbDevice::SignalStats() (thanks to Rolf Ahrenberg).
- Fixed handling line numbers in error messages when reading EPG data.
- Added handling RI_HOST_CONTROL to the CI protocol (no actual processing, but its
   presence is required by some CAMs).
- Fixed a crash in case the bottom text of a CAM menu is empty.
- Extended the CI API to allow plugins to implement additional CAM resources.
- Fixed a race between SVDRP CHAN and cDevice::HasProgramme() (reported by Dietmar
   Spingler).
- Reduced the time before a CAM is marked as known to decrypt a particular channel to
   3 seconds.
- When the connection to a peer VDR is terminated, any remote timers of that peer
   are no longer shown on the local VDR.
- No longer setting a new timer's remote host name if "SVDRP peering" is turned off.
- Fixed a double deletion of a cTimer in case HandleRemoteModifications() returned
   false (thanks to Johann Friedrichs).
- Removed TsGetContinuityCounter() from remux.h, using TsContinuityCounter() instead.
- Fixed setting the local machine's SVDRP host name (was overwritten if setup.conf
   contained an empty string). The SVDRP host name is now only written to setup.conf
   if it differs from the system's host name.
- If the Channel+/- keys are pressed while in the Schedules menu, the menu is now
   switched to the EPG of the new current channel.
- The Makefiles have been modified so that during the build process they no longer
   display the actual (lengthy) commands, but rather just the name of the file that
   is being built, as in
   CC vdr.o
   The first two characters indicate the kind of operation (CC=compile, LD=link,
   AR=archive, MO=msgfmt, GT=xgettext, PO=msgmerge, IN=install).
   This way it is much easier to spot error messages and warnings, since they are not
   buried under tons of text.
   Plugin authors should modify their makefiles accordingly, by simply preceeding
   the respective commands with an '@' and inserting '@echo XX $@' (where XX is one
   of the character combinations listed above) before the command.
   The newplugin script has also been modified accordingly.
- Fixed detecting the inclusion of STL header files in tools.h (thanks to Jasmin
   Jessich).
---
 CONTRIBUTORS                     |  13 ++
 HISTORY                          |  65 +++++++
 Makefile                         |  20 +-
 PLUGINS/src/epgtableid0/Makefile |   8 +-
 PLUGINS/src/hello/Makefile       |  17 +-
 PLUGINS/src/osddemo/Makefile     |   8 +-
 PLUGINS/src/pictures/Makefile    |  17 +-
 PLUGINS/src/servicedemo/Makefile |  11 +-
 PLUGINS/src/skincurses/Makefile  |  17 +-
 PLUGINS/src/status/Makefile      |   8 +-
 PLUGINS/src/svdrpdemo/Makefile   |   8 +-
 ci.c                             | 319 +++++++++++++++++++++----------
 ci.h                             | 114 ++++++++++-
 config.c                         |   6 +-
 config.h                         |  10 +-
 cutter.c                         |   4 +-
 device.c                         |  33 +++-
 device.h                         |  13 +-
 dvbdevice.c                      |  57 ++++--
 dvbdevice.h                      |   4 +-
 eit.c                            |   6 +-
 eit.h                            |   7 +-
 epg.c                            |  17 +-
 epg.h                            |   6 +-
 filter.c                         |  11 +-
 filter.h                         |   3 +-
 libsi/Makefile                   |   8 +-
 menu.c                           |  43 +++--
 mtd.c                            |  29 +--
 mtd.h                            |   3 +-
 newplugin                        |  17 +-
 receiver.c                       |   4 +-
 receiver.h                       |   4 +-
 remux.c                          |  89 ++++++++-
 remux.h                          |  26 ++-
 svdrp.c                          |   4 +-
 tools.c                          |  12 +-
 tools.h                          |  19 +-
 vdr.c                            |   5 +-
 39 files changed, 818 insertions(+), 247 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0852c10ed..140ae5335 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1199,6 +1199,8 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for the "binary skip" patch
  for adding support for LCN (Logical Channel Numbers)
  for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
+ for adding a Status parameter to the interface of cDevice::SignalStats() and
+ cDvbDevice::SignalStats()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2827,6 +2829,8 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for fixing loading the setup.conf file in case a parameter contains the '#' character
  for reporting that the "Resume" button in the main menu was active even if the
  respective recording did not exist
+ for fixing a double deletion of a cTimer in case HandleRemoteModifications() returned
+ false
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -3022,6 +3026,8 @@ Frank Neumann <fnu@yavdr.org>
  for adding support for "Satellite Channel Routing" (SCR) according to EN50607 ("JESS")
  for suggesting to make the Setup/CAM menu display which device an individual CAM
  is currently assigned to
+ for reporting a problem with the default return value of cEpgHandler::BeginSegmentTransfer()
+ in derived classes that don't implement this function
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
@@ -3377,6 +3383,9 @@ Tony Houghton <h@realh.co.uk>
 Christian Winkler <winkler_chr@yahoo.de>
  for reporting a problem with transfer mode on full featured DVB cards for encrypted
  channels that have no audio pid
+ for reporting a problem when selecting a device/CAM combination for live viewing, if
+ the CAM that is known to decrypt the requested channel can not be assigned to the
+ primary device
 
 Dietmar Spingler <d_spingler@gmx.de>
  for reporting a problem that led to a fix in detaching receivers from devices in case
@@ -3389,6 +3398,8 @@ Dietmar Spingler <d_spingler@gmx.de>
  for suggesting to implement the setup option "Recording/Record key handling"
  for suggesting to cache the channel/CAM relations in the file 'cam.data'
  for suggesting to optionally list the channels with channel ids in the SVDRP command LSTC
+ for suggesting to include the channel ID in log messages about switching channels
+ for reporting a problem with the SVDRP command CHAN while the channel display is open
 
 Stefan Schallenberg <infos@nafets.de>
  for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
@@ -3411,6 +3422,8 @@ Jasmin Jessich <jasmin@anw.at>
  assigned to any devices
  for writing the ddci2 plugin and for valuable input and help with testing and
  debugging MTD support
+ for fixing selecting delivery system names in case of undefined indexes
+ for fixing detecting the inclusion of STL header files in tools.h
 
 Martin Schirrmacher <schirrmie@gmail.com>
  for suggesting to provide a way for skin plugins to get informed about the currently
diff --git a/HISTORY b/HISTORY
index a79eef110..7ce658685 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8990,3 +8990,68 @@ Video Disk Recorder Revision History
 - If 0 is given as the channel number in the SVDRP command LSTC, the data of the
   current channel is listed.
 - Fixed a possible crash when pulling the CAM while decrypting a channel with MTD.
+
+2017-05-25: Version 2.3.5
+
+- CAMs are now sent a generated EIT packet that contains a single 'present event' for
+  the current SID, in order to avoid any parental rating dialogs.
+- Fixed handling UNC values (the shift operator behaves unexpected for shift values
+  larger than the size of the variable).
+- Log messages about switching channels now include the channel ID (suggested by
+  Dietmar Spingler).
+- Events in the EIT that end before the EPG linger time are now ignored in the incoming
+  data stream, because they would just be deleted in the next schedules cleanup anyway.
+- The constructor of cHash (via cHashBase) now has an additional parameter (OwnObjects)
+  which, if set to true, makes the hash take ownership of the hashed objects, so that
+  they are deleted when the hash is cleared or destroyed.
+- Fixed a memory leak in cSectionSyncerHash. The cSectionSyncerEntry objects put into
+  the hash were never explicitly deleted. Now the cSectionSyncerHash takes ownership of
+  these objects.
+- cListObject now implements a private copy constructor and assignment operator, to keep
+  derived objects from calling them implicitly.
+- When selecting a device/CAM combination for live viewing, CAMs that are known to decrypt
+  the requested channel are now given a higher priority than prefering the primary device
+  (reported by Christian Winkler).
+- Changed the default return value of cEpgHandler::BeginSegmentTransfer() to true, to
+  avoid problems with derived classes that don't implement this function (reported by
+  Frank Neumann).
+- Fixed selecting delivery system names in case of undefined indexes (thanks to Jasmin
+  Jessich).
+- Changed the legacy delivery system name "DMBTH" to "DTMB", and added names for
+  DVBC_ANNEX_C and DVBC2.
+- Added a Status parameter to the interface of cDevice::SignalStats() and
+  cDvbDevice::SignalStats() (thanks to Rolf Ahrenberg).
+- Fixed handling line numbers in error messages when reading EPG data.
+- Added handling RI_HOST_CONTROL to the CI protocol (no actual processing, but its
+  presence is required by some CAMs).
+- Fixed a crash in case the bottom text of a CAM menu is empty.
+- Extended the CI API to allow plugins to implement additional CAM resources.
+- Fixed a race between SVDRP CHAN and cDevice::HasProgramme() (reported by Dietmar
+  Spingler).
+- Reduced the time before a CAM is marked as known to decrypt a particular channel to
+  3 seconds.
+- When the connection to a peer VDR is terminated, any remote timers of that peer
+  are no longer shown on the local VDR.
+- No longer setting a new timer's remote host name if "SVDRP peering" is turned off.
+- Fixed a double deletion of a cTimer in case HandleRemoteModifications() returned
+  false (thanks to Johann Friedrichs).
+- Removed TsGetContinuityCounter() from remux.h, using TsContinuityCounter() instead.
+- Fixed setting the local machine's SVDRP host name (was overwritten if setup.conf
+  contained an empty string). The SVDRP host name is now only written to setup.conf
+  if it differs from the system's host name.
+- If the Channel+/- keys are pressed while in the Schedules menu, the menu is now
+  switched to the EPG of the new current channel.
+- The Makefiles have been modified so that during the build process they no longer
+  display the actual (lengthy) commands, but rather just the name of the file that
+  is being built, as in
+  CC vdr.o
+  The first two characters indicate the kind of operation (CC=compile, LD=link,
+  AR=archive, MO=msgfmt, GT=xgettext, PO=msgmerge, IN=install).
+  This way it is much easier to spot error messages and warnings, since they are not
+  buried under tons of text.
+  Plugin authors should modify their makefiles accordingly, by simply preceeding
+  the respective commands with an '@' and inserting '@echo XX $@' (where XX is one
+  of the character combinations listed above) before the command.
+  The newplugin script has also been modified accordingly.
+- Fixed detecting the inclusion of STL header files in tools.h (thanks to Jasmin
+  Jessich).
diff --git a/Makefile b/Makefile
index d6bdc3172..5b95dd0eb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 4.3 2017/02/20 09:22:47 kls Exp $
+# $Id: Makefile 4.4 2017/05/22 15:33:30 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -121,7 +121,8 @@ all: vdr i18n plugins
 # Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 # Dependencies:
 
@@ -135,7 +136,8 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(SILIB)
-	$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
 
 # The libsi library:
 
@@ -177,17 +179,21 @@ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir
 I18Npot   = $(PODIR)/vdr.pot
 
 %.mo: %.po
-	msgfmt -c -o $@ $<
+	@echo MO $@
+	@msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
+	@echo GT $@
+	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	@echo PO $@
+	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
-	install -D -m644 $< $@
+	@echo IN $@
+	@install -D -m644 $< $@
 
 .PHONY: i18n
 i18n: $(I18Nmsgs)
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 161fefe4d..5afb680b9 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:30:42 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -61,7 +61,8 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -75,7 +76,8 @@ $(DEPFILE): Makefile
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 186eae4a6..79dcf2295 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:32:10 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,8 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -82,13 +83,16 @@ I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLU
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
-	msgfmt -c -o $@ $<
+	@echo MO $@
+	@msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	@echo GT $@
+	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	@echo PO $@
+	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@@ -102,7 +106,8 @@ install-i18n: $(I18Nmsgs)
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 980de2aee..875001696 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:30:47 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -61,7 +61,8 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -75,7 +76,8 @@ $(DEPFILE): Makefile
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index e749e981e..acb1f8ecd 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:31:28 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,8 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -82,13 +83,16 @@ I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLU
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
-	msgfmt -c -o $@ $<
+	@echo MO $@
+	@msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	@echo GT $@
+	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	@echo PO $@
+	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@@ -102,7 +106,8 @@ install-i18n: $(I18Nmsgs)
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index c021fad03..074df3d73 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:31:59 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -58,7 +58,8 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -72,10 +73,12 @@ $(DEPFILE): Makefile
 ### Targets:
 
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN1).o -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN1).o -o $@
 
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
 
 install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 	install -D libvdr-$(PLUGIN1).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index 27dafe44b..a1e05e53f 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:31:47 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,8 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -82,13 +83,16 @@ I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLU
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
-	msgfmt -c -o $@ $<
+	@echo MO $@
+	@msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	@echo GT $@
+	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	@echo PO $@
+	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@@ -102,7 +106,8 @@ install-i18n: $(I18Nmsgs)
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 6c997d724..bf5c80b0c 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:30:58 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -61,7 +61,8 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -75,7 +76,8 @@ $(DEPFILE): Makefile
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 91fad09a6..292b8c764 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.0 2014/01/01 13:29:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:31:19 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -61,7 +61,8 @@ all: $(SOFILE)
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -75,7 +76,8 @@ $(DEPFILE): Makefile
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	@echo LD $@
+	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/ci.c b/ci.c
index f64c17e38..553245352 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.13 2017/04/26 09:18:26 kls Exp $
+ * $Id: ci.c 4.16 2017/05/18 09:05:46 kls Exp $
  */
 
 #include "ci.h"
@@ -292,7 +292,7 @@ void cCaActivationReceiver::Receive(const uchar *Data, int Length)
 
 // --- cTPDU -----------------------------------------------------------------
 
-#define MAX_TPDU_SIZE  2048
+#define MAX_TPDU_SIZE  4096
 #define MAX_TPDU_DATA  (MAX_TPDU_SIZE - 4)
 
 #define DATA_INDICATOR 0x80
@@ -427,6 +427,7 @@ class cCiTransportConnection {
   cTimeMs alive;
   cTimeMs timer;
   cCiSession *sessions[MAX_SESSIONS_PER_TC + 1]; // session numbering starts with 1
+  cCiSession *tsPostProcessor;
   void SendTPDU(uint8_t Tag, int Length = 0, const uint8_t *Data = NULL);
   void SendTag(uint8_t Tag, uint16_t SessionId, uint32_t ResourceId = 0, int Status = -1);
   void Poll(void);
@@ -438,6 +439,8 @@ class cCiTransportConnection {
 public:
   cCiTransportConnection(cCamSlot *CamSlot, uint8_t Tcid);
   virtual ~cCiTransportConnection();
+  void SetTsPostProcessor(cCiSession *CiSession);
+  bool TsPostProcess(uint8_t *TsPacket);
   cCamSlot *CamSlot(void) { return camSlot; }
   uint8_t Tcid(void) const { return tcid; }
   void CreateConnection(void) { createConnectionRequested = true; }
@@ -527,24 +530,7 @@ class cCiTransportConnection {
 #define AOT_COMMS_RCV_LAST          0x9F8C05
 #define AOT_COMMS_RCV_MORE          0x9F8C06
 
-class cCiSession {
-private:
-  uint16_t sessionId;
-  uint32_t resourceId;
-  cCiTransportConnection *tc;
-protected:
-  int GetTag(int &Length, const uint8_t **Data);
-  const uint8_t *GetData(const uint8_t *Data, int &Length);
-  void SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
-  cCiTransportConnection *Tc(void) { return tc; }
-public:
-  cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc);
-  virtual ~cCiSession();
-  uint16_t SessionId(void) { return sessionId; }
-  uint32_t ResourceId(void) { return resourceId; }
-  virtual bool HasUserIO(void) { return false; }
-  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
-  };
+#define RESOURCE_CLASS_MASK         0xFFFF0000
 
 cCiSession::cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc)
 {
@@ -557,6 +543,16 @@ cCiSession::~cCiSession()
 {
 }
 
+void cCiSession::SetResourceId(uint32_t Id)
+{
+  resourceId = Id;
+}
+
+void cCiSession::SetTsPostProcessor(void)
+{
+  tc->SetTsPostProcessor(this);
+}
+
 int cCiSession::GetTag(int &Length, const uint8_t **Data)
 ///< Gets the tag at Data.
 ///< Returns the actual tag, or AOT_NONE in case of error.
@@ -580,7 +576,7 @@ const uint8_t *cCiSession::GetData(const uint8_t *Data, int &Length)
 
 void cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
 {
-  uint8_t buffer[2048];
+  uint8_t buffer[MAX_TPDU_SIZE];
   uint8_t *p = buffer;
   *p++ = ST_SESSION_NUMBER;
   *p++ = 0x02;
@@ -597,7 +593,12 @@ void cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
      tc->SendData(p - buffer, buffer);
      }
   else
-     esyslog("ERROR: CAM %d: data length (%d) exceeds buffer size", Tc()->CamSlot()->SlotNumber(), Length);
+     esyslog("ERROR: CAM %d: data length (%d) exceeds buffer size", CamSlot()->SlotNumber(), Length);
+}
+
+cCamSlot *cCiSession::CamSlot(void)
+{
+  return Tc()->CamSlot();
 }
 
 void cCiSession::Process(int Length, const uint8_t *Data)
@@ -617,7 +618,7 @@ class cCiResourceManager : public cCiSession {
 cCiResourceManager::cCiResourceManager(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_RESOURCE_MANAGER, Tc)
 {
-  dbgprotocol("Slot %d: new Resource Manager (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
+  dbgprotocol("Slot %d: new Resource Manager (session id %d)\n", CamSlot()->SlotNumber(), SessionId);
   state = 0;
 }
 
@@ -627,39 +628,33 @@ void cCiResourceManager::Process(int Length, const uint8_t *Data)
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_PROFILE_ENQ: {
-            dbgprotocol("Slot %d: <== Profile Enquiry (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
-            uint32_t resources[] = { htonl(RI_RESOURCE_MANAGER),
-                                     htonl(RI_APPLICATION_INFORMATION),
-                                     htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
-                                     htonl(RI_DATE_TIME),
-                                     htonl(RI_MMI)
-                                   };
-            dbgprotocol("Slot %d: ==> Profile (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
-            SendData(AOT_PROFILE, sizeof(resources), (uint8_t*)resources);
+            dbgprotocol("Slot %d: <== Profile Enquiry (%d)\n", CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: ==> Profile (%d)\n", CamSlot()->SlotNumber(), SessionId());
+            SendData(AOT_PROFILE, CiResourceHandlers.NumIds() * sizeof(uint32_t), (uint8_t*)CiResourceHandlers.Ids());
             state = 3;
             }
             break;
        case AOT_PROFILE: {
-            dbgprotocol("Slot %d: <== Profile (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Profile (%d)\n", CamSlot()->SlotNumber(), SessionId());
             if (state == 1) {
                int l = 0;
                const uint8_t *d = GetData(Data, l);
                if (l > 0 && d)
-                  esyslog("ERROR: CAM %d: resource manager: unexpected data", Tc()->CamSlot()->SlotNumber());
-               dbgprotocol("Slot %d: ==> Profile Change (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+                  esyslog("ERROR: CAM %d: resource manager: unexpected data", CamSlot()->SlotNumber());
+               dbgprotocol("Slot %d: ==> Profile Change (%d)\n", CamSlot()->SlotNumber(), SessionId());
                SendData(AOT_PROFILE_CHANGE);
                state = 2;
                }
             else {
-               esyslog("ERROR: CAM %d: resource manager: unexpected tag %06X in state %d", Tc()->CamSlot()->SlotNumber(), Tag, state);
+               esyslog("ERROR: CAM %d: resource manager: unexpected tag %06X in state %d", CamSlot()->SlotNumber(), Tag, state);
                }
             }
             break;
-       default: esyslog("ERROR: CAM %d: resource manager: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
+       default: esyslog("ERROR: CAM %d: resource manager: unknown tag %06X", CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (state == 0) {
-     dbgprotocol("Slot %d: ==> Profile Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+     dbgprotocol("Slot %d: ==> Profile Enq (%d)\n", CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_PROFILE_ENQ);
      state = 1;
      }
@@ -667,25 +662,10 @@ void cCiResourceManager::Process(int Length, const uint8_t *Data)
 
 // --- cCiApplicationInformation ---------------------------------------------
 
-class cCiApplicationInformation : public cCiSession {
-private:
-  int state;
-  uint8_t applicationType;
-  uint16_t applicationManufacturer;
-  uint16_t manufacturerCode;
-  char *menuString;
-public:
-  cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc);
-  virtual ~cCiApplicationInformation();
-  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
-  bool EnterMenu(void);
-  const char *GetMenuString(void) { return menuString; }
-  };
-
 cCiApplicationInformation::cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_APPLICATION_INFORMATION, Tc)
 {
-  dbgprotocol("Slot %d: new Application Information (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
+  dbgprotocol("Slot %d: new Application Information (session id %d)\n", CamSlot()->SlotNumber(), SessionId);
   state = 0;
   menuString = NULL;
 }
@@ -701,7 +681,7 @@ void cCiApplicationInformation::Process(int Length, const uint8_t *Data)
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_APPLICATION_INFO: {
-            dbgprotocol("Slot %d: <== Application Info (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Application Info (%d)\n", CamSlot()->SlotNumber(), SessionId());
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             if ((l -= 1) < 0) break;
@@ -714,15 +694,15 @@ void cCiApplicationInformation::Process(int Length, const uint8_t *Data)
             d += 2;
             free(menuString);
             menuString = GetString(l, &d);
-            isyslog("CAM %d: %s, %02X, %04X, %04X", Tc()->CamSlot()->SlotNumber(), menuString, applicationType, applicationManufacturer, manufacturerCode);
+            isyslog("CAM %d: %s, %02X, %04X, %04X", CamSlot()->SlotNumber(), menuString, applicationType, applicationManufacturer, manufacturerCode);
             state = 2;
             }
             break;
-       default: esyslog("ERROR: CAM %d: application information: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
+       default: esyslog("ERROR: CAM %d: application information: unknown tag %06X", CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (state == 0) {
-     dbgprotocol("Slot %d: ==> Application Info Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+     dbgprotocol("Slot %d: ==> Application Info Enq (%d)\n", CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_APPLICATION_INFO_ENQ);
      state = 1;
      }
@@ -731,7 +711,7 @@ void cCiApplicationInformation::Process(int Length, const uint8_t *Data)
 bool cCiApplicationInformation::EnterMenu(void)
 {
   if (state == 2) {
-     dbgprotocol("Slot %d: ==> Enter Menu (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+     dbgprotocol("Slot %d: ==> Enter Menu (%d)\n", CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_ENTER_MENU);
      return true;
      }
@@ -953,7 +933,7 @@ class cCiConditionalAccessSupport : public cCiSession {
 cCiConditionalAccessSupport::cCiConditionalAccessSupport(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_CONDITIONAL_ACCESS_SUPPORT, Tc)
 {
-  dbgprotocol("Slot %d: new Conditional Access Support (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
+  dbgprotocol("Slot %d: new Conditional Access Support (session id %d)\n", CamSlot()->SlotNumber(), SessionId);
   state = 0; // inactive
   caSystemIds[numCaSystemIds = 0] = 0;
   repliesToQuery = false;
@@ -965,7 +945,7 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_CA_INFO: {
-            dbgprotocol("Slot %d: <== Ca Info (%d)", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Ca Info (%d)", CamSlot()->SlotNumber(), SessionId());
             cString Ids;
             numCaSystemIds = 0;
             int l = 0;
@@ -979,7 +959,7 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                   if (numCaSystemIds < MAXCASYSTEMIDS)
                      caSystemIds[numCaSystemIds++] = id;
                   else {
-                     esyslog("ERROR: CAM %d: too many CA system IDs!", Tc()->CamSlot()->SlotNumber());
+                     esyslog("ERROR: CAM %d: too many CA system IDs!", CamSlot()->SlotNumber());
                      break;
                      }
                   }
@@ -989,17 +969,17 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
                timer.Set(QUERY_WAIT_TIME); // WORKAROUND: Alphacrypt 3.09 doesn't reply to QUERY immediately after reset
                state = 2; // got ca info
                }
-            dsyslog("CAM %d: system ids:%s", Tc()->CamSlot()->SlotNumber(), *Ids ? *Ids : " none");
+            dsyslog("CAM %d: system ids:%s", CamSlot()->SlotNumber(), *Ids ? *Ids : " none");
             }
             break;
        case AOT_CA_PMT_REPLY: {
-            dbgprotocol("Slot %d: <== Ca Pmt Reply (%d)", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Ca Pmt Reply (%d)", CamSlot()->SlotNumber(), SessionId());
             if (!repliesToQuery) {
-               dsyslog("CAM %d: replies to QUERY - multi channel decryption (MCD) possible", Tc()->CamSlot()->SlotNumber());
+               dsyslog("CAM %d: replies to QUERY - multi channel decryption (MCD) possible", CamSlot()->SlotNumber());
                repliesToQuery = true;
-               if (Tc()->CamSlot()->MtdAvailable()) {
-                  dsyslog("CAM %d: supports multi transponder decryption (MTD)", Tc()->CamSlot()->SlotNumber());
-                  Tc()->CamSlot()->MtdActivate(true);
+               if (CamSlot()->MtdAvailable()) {
+                  dsyslog("CAM %d: supports multi transponder decryption (MTD)", CamSlot()->SlotNumber());
+                  CamSlot()->MtdActivate(true);
                   }
                }
             state = 5; // got ca pmt reply
@@ -1051,11 +1031,11 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
             dbgprotocol("\n");
             }
             break;
-       default: esyslog("ERROR: CAM %d: conditional access support: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
+       default: esyslog("ERROR: CAM %d: conditional access support: unknown tag %06X", CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (state == 0) {
-     dbgprotocol("Slot %d: ==> Ca Info Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+     dbgprotocol("Slot %d: ==> Ca Info Enq (%d)\n", CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_CA_INFO_ENQ);
      state = 1; // enquired ca info
      }
@@ -1066,7 +1046,7 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
      state = 3; // waiting for reply
      }
   else if (state == 3 && timer.TimedOut()) {
-     dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", Tc()->CamSlot()->SlotNumber());
+     dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", CamSlot()->SlotNumber());
      state = 4; // normal operation
      }
 }
@@ -1074,12 +1054,45 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
 void cCiConditionalAccessSupport::SendPMT(cCiCaPmt *CaPmt)
 {
   if (CaPmt && state >= 2) {
-     dbgprotocol("Slot %d: ==> Ca Pmt (%d) %d %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), CaPmt->ListManagement(), CaPmt->CmdId());
+     dbgprotocol("Slot %d: ==> Ca Pmt (%d) %d %d\n", CamSlot()->SlotNumber(), SessionId(), CaPmt->ListManagement(), CaPmt->CmdId());
      SendData(AOT_CA_PMT, CaPmt->capmt.Length(), CaPmt->capmt.Data());
      state = 4; // sent ca pmt
      }
 }
 
+// --- cCiHostControl --------------------------------------------------------
+
+class cCiHostControl : public cCiSession {
+public:
+  cCiHostControl(uint16_t SessionId, cCiTransportConnection *Tc);
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
+  };
+
+cCiHostControl::cCiHostControl(uint16_t SessionId, cCiTransportConnection* Tc)
+:cCiSession(SessionId, RI_HOST_CONTROL, Tc)
+{
+  dbgprotocol("Slot %d: new Host Control (session id %d)\n", CamSlot()->SlotNumber(), SessionId);
+}
+
+void cCiHostControl::Process(int Length, const uint8_t* Data)
+{
+  if (Data) {
+     int Tag = GetTag(Length, &Data);
+     switch (Tag) {
+       case AOT_TUNE:
+            dbgprotocol("Slot %d: <== Host Control Tune (%d)\n", CamSlot()->SlotNumber(), SessionId());
+            break;
+       case AOT_REPLACE:
+            dbgprotocol("Slot %d: <== Host Control Replace (%d)\n", CamSlot()->SlotNumber(), SessionId());
+            break;
+       case AOT_CLEAR_REPLACE:
+            dbgprotocol("Slot %d: <== Host Control Clear Replace (%d)\n", CamSlot()->SlotNumber(), SessionId());
+            break;
+       default: esyslog("ERROR: CAM %d: Host Control: unknown tag %06X", CamSlot()->SlotNumber(), Tag);
+       }
+     }
+}
+
 // --- cCiDateTime -----------------------------------------------------------
 
 class cCiDateTime : public cCiSession {
@@ -1097,7 +1110,7 @@ cCiDateTime::cCiDateTime(uint16_t SessionId, cCiTransportConnection *Tc)
 {
   interval = 0;
   lastTime = 0;
-  dbgprotocol("Slot %d: new Date Time (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
+  dbgprotocol("Slot %d: new Date Time (session id %d)\n", CamSlot()->SlotNumber(), SessionId);
 }
 
 void cCiDateTime::SendDateTime(void)
@@ -1119,7 +1132,7 @@ void cCiDateTime::SendDateTime(void)
      bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
      DumpTPDUDataTransfer &= DumpDateTime;
      if (DumpDateTime)
-        dbgprotocol("Slot %d: ==> Date Time (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+        dbgprotocol("Slot %d: ==> Date Time (%d)\n", CamSlot()->SlotNumber(), SessionId());
      SendData(AOT_DATE_TIME, 7, (uint8_t*)&T);
      DumpTPDUDataTransfer = OldDumpTPDUDataTransfer;
      }
@@ -1136,12 +1149,12 @@ void cCiDateTime::Process(int Length, const uint8_t *Data)
             const uint8_t *d = GetData(Data, l);
             if (l > 0)
                interval = *d;
-            dbgprotocol("Slot %d: <== Date Time Enq (%d), interval = %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), interval);
+            dbgprotocol("Slot %d: <== Date Time Enq (%d), interval = %d\n", CamSlot()->SlotNumber(), SessionId(), interval);
             lastTime = time(NULL);
             SendDateTime();
             }
             break;
-       default: esyslog("ERROR: CAM %d: date time: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
+       default: esyslog("ERROR: CAM %d: date time: unknown tag %06X", CamSlot()->SlotNumber(), Tag);
        }
      }
   else if (interval && time(NULL) - lastTime > interval) {
@@ -1206,7 +1219,7 @@ class cCiMMI : public cCiSession {
 cCiMMI::cCiMMI(uint16_t SessionId, cCiTransportConnection *Tc)
 :cCiSession(SessionId, RI_MMI, Tc)
 {
-  dbgprotocol("Slot %d: new MMI (session id %d)\n", Tc->CamSlot()->SlotNumber(), SessionId);
+  dbgprotocol("Slot %d: new MMI (session id %d)\n", CamSlot()->SlotNumber(), SessionId);
   menu = fetchedMenu = NULL;
   enquiry = fetchedEnquiry = NULL;
 }
@@ -1233,11 +1246,11 @@ char *cCiMMI::GetText(int &Length, const uint8_t **Data)
   int Tag = GetTag(Length, Data);
   if (Tag == AOT_TEXT_LAST) {
      char *s = GetString(Length, Data);
-     dbgprotocol("Slot %d: <== Text Last (%d) '%s'\n", Tc()->CamSlot()->SlotNumber(), SessionId(), s);
+     dbgprotocol("Slot %d: <== Text Last (%d) '%s'\n", CamSlot()->SlotNumber(), SessionId(), s);
      return s;
      }
   else
-     esyslog("ERROR: CAM %d: MMI: unexpected text tag: %06X", Tc()->CamSlot()->SlotNumber(), Tag);
+     esyslog("ERROR: CAM %d: MMI: unexpected text tag: %06X", CamSlot()->SlotNumber(), Tag);
   return NULL;
 }
 
@@ -1247,7 +1260,7 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
      int Tag = GetTag(Length, &Data);
      switch (Tag) {
        case AOT_DISPLAY_CONTROL: {
-            dbgprotocol("Slot %d: <== Display Control (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Display Control (%d)\n", CamSlot()->SlotNumber(), SessionId());
             int l = 0;
             const uint8_t *d = GetData(Data, l);
             if (l > 0) {
@@ -1256,18 +1269,18 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
                       if (l == 2 && *++d == MM_HIGH_LEVEL) {
                          struct tDisplayReply { uint8_t id; uint8_t mode; };
                          tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
-                         dbgprotocol("Slot %d: ==> Display Reply (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+                         dbgprotocol("Slot %d: ==> Display Reply (%d)\n", CamSlot()->SlotNumber(), SessionId());
                          SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);
                          }
                       break;
-                 default: esyslog("ERROR: CAM %d: MMI: unsupported display control command %02X", Tc()->CamSlot()->SlotNumber(), *d);
+                 default: esyslog("ERROR: CAM %d: MMI: unsupported display control command %02X", CamSlot()->SlotNumber(), *d);
                  }
                }
             }
             break;
        case AOT_LIST_LAST:
        case AOT_MENU_LAST: {
-            dbgprotocol("Slot %d: <== Menu Last (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Menu Last (%d)\n", CamSlot()->SlotNumber(), SessionId());
             delete menu;
             menu = new cCiMenu(this, Tag == AOT_MENU_LAST);
             int l = 0;
@@ -1292,7 +1305,7 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
             }
             break;
        case AOT_ENQ: {
-            dbgprotocol("Slot %d: <== Enq (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+            dbgprotocol("Slot %d: <== Enq (%d)\n", CamSlot()->SlotNumber(), SessionId());
             delete enquiry;
             enquiry = new cCiEnquiry(this);
             int l = 0;
@@ -1319,10 +1332,10 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
                if (l > 1)
                   delay = *d;
                }
-            dbgprotocol("Slot %d: <== Close MMI (%d)  id = %02X  delay = %d\n", Tc()->CamSlot()->SlotNumber(), SessionId(), id, delay);
+            dbgprotocol("Slot %d: <== Close MMI (%d)  id = %02X  delay = %d\n", CamSlot()->SlotNumber(), SessionId(), id, delay);
             }
             break;
-       default: esyslog("ERROR: CAM %d: MMI: unknown tag %06X", Tc()->CamSlot()->SlotNumber(), Tag);
+       default: esyslog("ERROR: CAM %d: MMI: unknown tag %06X", CamSlot()->SlotNumber(), Tag);
        }
      }
 }
@@ -1351,13 +1364,13 @@ cCiEnquiry *cCiMMI::Enquiry(bool Clear)
 
 void cCiMMI::SendMenuAnswer(uint8_t Selection)
 {
-  dbgprotocol("Slot %d: ==> Menu Answ (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+  dbgprotocol("Slot %d: ==> Menu Answ (%d)\n", CamSlot()->SlotNumber(), SessionId());
   SendData(AOT_MENU_ANSW, 1, &Selection);
 }
 
 bool cCiMMI::SendAnswer(const char *Text)
 {
-  dbgprotocol("Slot %d: ==> Answ (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+  dbgprotocol("Slot %d: ==> Answ (%d)\n", CamSlot()->SlotNumber(), SessionId());
   struct tAnswer { uint8_t id; char text[256]; };//XXX
   tAnswer answer;
   answer.id = Text ? AI_ANSWER : AI_CANCEL;
@@ -1369,7 +1382,7 @@ bool cCiMMI::SendAnswer(const char *Text)
 
 bool cCiMMI::SendCloseMMI(void)
 {
-  dbgprotocol("Slot %d: ==> Close MMI (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
+  dbgprotocol("Slot %d: ==> Close MMI (%d)\n", CamSlot()->SlotNumber(), SessionId());
   SendData(AOT_CLOSE_MMI, 0);
   return true;
 }
@@ -1468,6 +1481,82 @@ void cCiEnquiry::Abort(void)
      mmi->SendCloseMMI();
 }
 
+// --- cCiResourceHandler ----------------------------------------------------
+
+cCiResourceHandler::cCiResourceHandler(void)
+{
+}
+
+cCiResourceHandler::~cCiResourceHandler()
+{
+}
+
+// --- cCiDefaultResourceHandler ---------------------------------------------
+
+class cCiDefaultResourceHandler : public cCiResourceHandler {
+public:
+  virtual const uint32_t *ResourceIds(void) const;
+  virtual cCiSession *GetNewCiSession(uint32_t ResourceId, uint16_t SessionId, cCiTransportConnection *Tc);
+  };
+
+const uint32_t *cCiDefaultResourceHandler::ResourceIds(void) const
+{
+  static uint32_t Ids[] = {
+    RI_RESOURCE_MANAGER,
+    RI_APPLICATION_INFORMATION,
+    RI_CONDITIONAL_ACCESS_SUPPORT,
+    RI_HOST_CONTROL,
+    RI_DATE_TIME,
+    RI_MMI,
+    0
+    };
+  return Ids;
+}
+
+cCiSession *cCiDefaultResourceHandler::GetNewCiSession(uint32_t ResourceId, uint16_t SessionId, cCiTransportConnection *Tc)
+{
+  switch (ResourceId) {
+    case RI_RESOURCE_MANAGER:           return new cCiResourceManager(SessionId, Tc); break;
+    case RI_APPLICATION_INFORMATION:    return new cCiApplicationInformation(SessionId, Tc); break;
+    case RI_CONDITIONAL_ACCESS_SUPPORT: return new cCiConditionalAccessSupport(SessionId, Tc); break;
+    case RI_HOST_CONTROL:               return new cCiHostControl(SessionId, Tc); break;
+    case RI_DATE_TIME:                  return new cCiDateTime(SessionId, Tc); break;
+    case RI_MMI:                        return new cCiMMI(SessionId, Tc); break;
+    default:                            return NULL;
+    }
+}
+
+// --- cCiResourceHandlers ---------------------------------------------------
+
+cCiResourceHandlers CiResourceHandlers;
+
+cCiResourceHandlers::cCiResourceHandlers(void)
+{
+  Register(new cCiDefaultResourceHandler);
+}
+
+void cCiResourceHandlers::Register(cCiResourceHandler *ResourceHandler)
+{
+  if (ResourceHandler) {
+     Add(ResourceHandler);
+     if (const uint32_t *r = ResourceHandler->ResourceIds()) {
+        while (*r) {
+              resourceIds.Append(htonl(*r));
+              r++;
+              }
+        }
+     }
+}
+
+cCiSession *cCiResourceHandlers::GetNewCiSession(uint32_t ResourceId, uint16_t SessionId, cCiTransportConnection *Tc)
+{
+  for (cCiResourceHandler *r = Last(); r; r = Prev(r)) {
+      if (cCiSession *CiSession = r->GetNewCiSession(ResourceId, SessionId, Tc))
+         return CiSession;
+      }
+  return NULL;
+}
+
 // --- cCiTransportConnection (cont'd) ---------------------------------------
 
 #define TC_POLL_TIMEOUT   300 // ms WORKAROUND: TC_POLL_TIMEOUT < 300ms doesn't work with DragonCAM
@@ -1485,6 +1574,7 @@ cCiTransportConnection::cCiTransportConnection(cCamSlot *CamSlot, uint8_t Tcid)
   alive.Set(TC_ALIVE_TIMEOUT);
   for (int i = 0; i <= MAX_SESSIONS_PER_TC; i++) // sessions[0] is not used, but initialized anyway
       sessions[i] = NULL;
+  tsPostProcessor = NULL;
 }
 
 cCiTransportConnection::~cCiTransportConnection()
@@ -1493,6 +1583,18 @@ cCiTransportConnection::~cCiTransportConnection()
       delete sessions[i];
 }
 
+void cCiTransportConnection::SetTsPostProcessor(cCiSession *CiSession)
+{
+  tsPostProcessor = CiSession;
+}
+
+bool cCiTransportConnection::TsPostProcess(uint8_t *TsPacket)
+{
+  if (tsPostProcessor)
+     return tsPostProcessor->TsPostProcess(TsPacket);
+  return false;
+}
+
 bool cCiTransportConnection::Ready(void)
 {
   cCiConditionalAccessSupport *cas = (cCiConditionalAccessSupport *)GetSessionByResourceId(RI_CONDITIONAL_ACCESS_SUPPORT);
@@ -1559,11 +1661,16 @@ cCiSession *cCiTransportConnection::GetSessionBySessionId(uint16_t SessionId)
 
 cCiSession *cCiTransportConnection::GetSessionByResourceId(uint32_t ResourceId)
 {
+  cCiSession *CiSession = NULL;
   for (int i = 1; i <= MAX_SESSIONS_PER_TC; i++) {
-      if (sessions[i] && sessions[i]->ResourceId() == ResourceId)
-         return sessions[i];
+      if (cCiSession *s = sessions[i]) {
+         if (s->ResourceId() == ResourceId)
+            return s; // prefer exact match
+         if ((s->ResourceId() & RESOURCE_CLASS_MASK) == (ResourceId & RESOURCE_CLASS_MASK))
+            CiSession = s;
+         }
       }
-  return NULL;
+  return CiSession;
 }
 
 void cCiTransportConnection::OpenSession(int Length, const uint8_t *Data)
@@ -1574,17 +1681,11 @@ void cCiTransportConnection::OpenSession(int Length, const uint8_t *Data)
      if (!GetSessionByResourceId(ResourceId)) {
         for (int i = 1; i <= MAX_SESSIONS_PER_TC; i++) {
             if (!sessions[i]) {
-               switch (ResourceId) {
-                 case RI_RESOURCE_MANAGER:           sessions[i] = new cCiResourceManager(i, this); break;
-                 case RI_APPLICATION_INFORMATION:    sessions[i] = new cCiApplicationInformation(i, this); break;
-                 case RI_CONDITIONAL_ACCESS_SUPPORT: sessions[i] = new cCiConditionalAccessSupport(i, this); break;
-                 case RI_DATE_TIME:                  sessions[i] = new cCiDateTime(i, this); break;
-                 case RI_MMI:                        sessions[i] = new cCiMMI(i, this); break;
-                 case RI_HOST_CONTROL:               // not implemented
-                 default: esyslog("ERROR: CAM %d: unknown resource identifier: %08X (%d/%d)", camSlot->SlotNumber(), ResourceId, camSlot->SlotIndex(), tcid);
-                 }
+               sessions[i] = CiResourceHandlers.GetNewCiSession(ResourceId, i, this);
                if (sessions[i])
                   SendTag(ST_OPEN_SESSION_RESPONSE, sessions[i]->SessionId(), sessions[i]->ResourceId(), SS_OK);
+               else
+                  esyslog("ERROR: CAM %d: unknown resource identifier: %08X (%d/%d)", camSlot->SlotNumber(), ResourceId, camSlot->SlotIndex(), tcid);
                return;
                }
             }
@@ -2424,6 +2525,22 @@ uchar *cCamSlot::Decrypt(uchar *Data, int &Count)
   return Data;
 }
 
+bool cCamSlot::TsPostProcess(uchar *Data)
+{
+  return tc[1] ? tc[1]->TsPostProcess(Data) : false;
+}
+
+bool cCamSlot::Inject(uchar *Data, int Count)
+{
+  return true;
+}
+
+void cCamSlot::InjectEit(int Sid)
+{
+  cEitGenerator Eit(Sid);
+  Inject(Eit.Data(), Eit.Length());
+}
+
 // --- cCamSlots -------------------------------------------------------------
 
 cCamSlots CamSlots;
diff --git a/ci.h b/ci.h
index 8d1323ac1..29dc9db3a 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 4.6 2017/04/10 09:17:56 kls Exp $
+ * $Id: ci.h 4.9 2017/05/16 07:42:45 kls Exp $
  */
 
 #ifndef __CI_H
@@ -21,6 +21,99 @@
 #define MAX_CONNECTIONS_PER_CAM_SLOT  8 // maximum possible value is 254
 #define CAM_READ_TIMEOUT  50 // ms
 
+class cCiTransportConnection;
+class cCamSlot;
+
+// VDR's Common Interface functions implement only the features that are absolutely
+// necessary to control a CAM. If a plugin wants to implement additional functionality
+// (i.e. "resources"), it can do so by deriving from cCiResourceHandler, cCiSession
+// and (if necessary) from cCiApplicationInformation.
+
+class cCiSession {
+private:
+  uint16_t sessionId;
+  uint32_t resourceId;
+  cCiTransportConnection *tc;
+protected:
+  void SetTsPostProcessor(void);
+       ///< If this cCiSession implements the TsPostProcess() function, it shall call
+       ///< SetTsPostProcessor() to register itself as the TS post processor.
+  void SetResourceId(uint32_t Id);
+       ///< If this is a class that has been derived from an existing cCiSession class,
+       ///< but implements a different resource id, it shall call SetResourceId() with
+       ///< that Id.
+  int GetTag(int &Length, const uint8_t **Data);
+  const uint8_t *GetData(const uint8_t *Data, int &Length);
+  void SendData(int Tag, int Length = 0, const uint8_t *Data = NULL);
+  cCiTransportConnection *Tc(void) { return tc; }
+public:
+  cCiSession(uint16_t SessionId, uint32_t ResourceId, cCiTransportConnection *Tc);
+  virtual ~cCiSession();
+  uint16_t SessionId(void) { return sessionId; }
+  uint32_t ResourceId(void) { return resourceId; }
+  cCamSlot *CamSlot(void);
+  virtual bool HasUserIO(void) { return false; }
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
+  virtual bool TsPostProcess(uint8_t *TsPacket) { return false; }
+       ///< If this cCiSession needs to do additional processing on TS packets (after
+       ///< the CAM has done the decryption), it shall implement TsPostProcess() and
+       ///< do whatever operations are necessary on the given TsPacket. This function
+       ///< is called once for each TS packet, and any and all operations must be
+       ///< finished upon return.
+       ///< A derived cCiSession that implements this function must call
+       ///< SetTsPostProcessor() to make it actually get called.
+       ///< Returns true if the TsPacket was in any way modified.
+  };
+
+class cCiApplicationInformation : public cCiSession {
+protected:
+  int state;
+  uint8_t applicationType;
+  uint16_t applicationManufacturer;
+  uint16_t manufacturerCode;
+  char *menuString;
+public:
+  cCiApplicationInformation(uint16_t SessionId, cCiTransportConnection *Tc);
+  virtual ~cCiApplicationInformation();
+  virtual void Process(int Length = 0, const uint8_t *Data = NULL);
+  bool EnterMenu(void);
+  const char *GetMenuString(void) { return menuString; }
+  };
+
+class cCiResourceHandler : public cListObject {
+public:
+  cCiResourceHandler(void);
+       ///< Creates a new resource handler, through which the available resources
+       ///< can be provides. A resource handler shall be allocated on the heap and
+       ///< registered with the global CiResourceHandlers, as in
+       ///< CiResourceHandlers.Register(new cMyResourceHandler);
+       ///< It will be automatically deleted at the end of the program.
+  virtual ~cCiResourceHandler();
+  virtual const uint32_t *ResourceIds(void) const = 0;
+       ///< Returns a pointer to an array of resource identifiers, where the
+       ///< last value is zero.
+  virtual cCiSession *GetNewCiSession(uint32_t ResourceId, uint16_t SessionId, cCiTransportConnection *Tc) = 0;
+       ///< Returns a new cCiSession, according to the given ResourceId.
+  };
+
+class cCiResourceHandlers : public cList<cCiResourceHandler> {
+private:
+  cVector<uint32_t> resourceIds;
+public:
+  cCiResourceHandlers(void);
+       ///< Creates the default list of resourceIds.
+  void Register(cCiResourceHandler *ResourceHandler);
+       ///< Adds the given ResourceHandler to the list of resource handlers and
+       ///< appends its ResourceIds to the global resourceIds.
+       ///< A plugin that implements additional CAM capabilities must call
+       ///< this function to register its resources.
+  const uint32_t *Ids(void) { return &resourceIds[0]; }
+  int NumIds(void) { return resourceIds.Size(); }
+  cCiSession *GetNewCiSession(uint32_t ResourceId, uint16_t SessionId, cCiTransportConnection *Tc);
+  };
+
+extern cCiResourceHandlers CiResourceHandlers;
+
 class cCiMMI;
 
 class cCiMenu {
@@ -73,7 +166,6 @@ class cCiEnquiry {
   };
 
 class cDevice;
-class cCamSlot;
 
 enum eModuleStatus { msNone, msReset, msPresent, msReady };
 
@@ -377,6 +469,24 @@ class cCamSlot : public cListObject {
        ///< A derived class that implements this function will also need
        ///< to set the WantsTsData parameter in the call to the base class
        ///< constructor to true in order to receive the TS data.
+  virtual bool TsPostProcess(uchar *Data);
+       ///< If there is a cCiSession that needs to do additional processing on TS packets
+       ///< (after the CAM has done the decryption), this function will call its
+       ///< TsPostProcess() function to have it do whatever operations are necessary on
+       ///< the given TsPacket.
+       ///< Returns true if the TsPacket was in any way modified.
+  virtual bool Inject(uchar *Data, int Count);
+       ///< Sends all Count bytes of the given Data to the CAM, and returns true
+       ///< if this was possible. If the data can't be sent to the CAM completely,
+       ///< nothing shall be sent and the return value shall be false.
+       ///< No decrypted packet is returned by this function.
+       ///< Data is guaranteed to point to one or more complete TS packets.
+  virtual void InjectEit(int Sid);
+       ///< Injects a generated EIT with a "present event" for the given Sid into
+       ///< the TS data stream sent to the CAM. This only applies to CAM slots that
+       ///< have WantsTsData set to true in their constructor.
+       ///< The default implementation sends an EIT with the minimum event
+       ///< necessary to disable the CAMs parental rating prompt.
   };
 
 class cCamSlots : public cList<cCamSlot> {
diff --git a/config.c b/config.c
index 79eec8a35..0b5a1021f 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 4.5 2017/02/14 11:02:48 kls Exp $
+ * $Id: config.c 4.6 2017/05/21 10:25:26 kls Exp $
  */
 
 #include "config.h"
@@ -640,7 +640,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPPeering"))        SVDRPPeering       = atoi(Value);
-  else if (!strcasecmp(Name, "SVDRPHostName"))     { if (!*SVDRPHostName) strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName)); }
+  else if (!strcasecmp(Name, "SVDRPHostName"))     { if (*Value) strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName)); }
   else if (!strcasecmp(Name, "SVDRPdefaultHost"))    strn0cpy(SVDRPDefaultHost, Value, sizeof(SVDRPDefaultHost));
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
@@ -771,7 +771,7 @@ bool cSetup::Save(void)
   Store("EPGLinger",          EPGLinger);
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("SVDRPPeering",       SVDRPPeering);
-  Store("SVDRPHostName",      SVDRPHostName);
+  Store("SVDRPHostName",      strcmp(SVDRPHostName, GetHostName()) ? SVDRPHostName : "");
   Store("SVDRPDefaultHost",   SVDRPDefaultHost);
   Store("ZapTimeout",         ZapTimeout);
   Store("ChannelEntryTimeout",ChannelEntryTimeout);
diff --git a/config.h b/config.h
index e9a9f11d3..c67b990d1 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.8 2017/03/30 13:42:15 kls Exp $
+ * $Id: config.h 4.9 2017/04/29 13:33:13 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.4"
-#define VDRVERSNUM   20304  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.5"
+#define VDRVERSNUM   20305  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.4"
-#define APIVERSNUM   20304  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.5"
+#define APIVERSNUM   20305  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/cutter.c b/cutter.c
index 587fddf08..67dc4ef53 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 4.2 2015/08/09 12:24:28 kls Exp $
+ * $Id: cutter.c 4.3 2017/05/21 09:45:06 kls Exp $
  */
 
 #include "cutter.h"
@@ -500,7 +500,7 @@ bool cCuttingThread::FixFrame(uchar *Data, int &Length, bool Independent, int In
          TsSetContinuityCounter(p, counter[Pid]);
          }
       else
-         counter[Pid] = TsGetContinuityCounter(p); // collect initial counters
+         counter[Pid] = TsContinuityCounter(p); // collect initial counters
       // Adjust PTS:
       int64_t Pts = TsGetPts(p, TS_SIZE);
       if (Pts >= 0) {
diff --git a/device.c b/device.c
index 25d16679f..7c1c74b1a 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.15 2017/04/17 14:47:42 kls Exp $
+ * $Id: device.c 4.22 2017/05/18 09:27:55 kls Exp $
  */
 
 #include "device.h"
@@ -293,6 +293,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
              // to their individual severity, where the one listed first will make the most
              // difference, because it results in the most significant bit of the result.
              uint32_t imp = 0;
+             imp <<= 1; imp |= (LiveView && NumUsableSlots && !HasInternalCam) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlots.Get(j)->MasterSlotNumber()) || ndr : 0; // prefer CAMs that are known to decrypt this channel for live viewing, if we don't need to detach existing receivers
              imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0;                                  // prefer the primary device for live viewing if we don't need to detach existing receivers
              imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode
              imp <<= 1; imp |= device[i]->Receiving();                                                               // avoid devices that are receiving
@@ -749,7 +750,7 @@ const cPositioner *cDevice::Positioner(void) const
   return NULL;
 }
 
-bool cDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per) const
+bool cDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per, int *Status) const
 {
   return false;
 }
@@ -782,7 +783,7 @@ bool cDevice::MaySwitchTransponder(const cChannel *Channel) const
 bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
 {
   if (LiveView) {
-     isyslog("switching to channel %d (%s)", Channel->Number(), Channel->Name());
+     isyslog("switching to channel %d %s (%s)", Channel->Number(), *Channel->GetChannelID().ToString(), Channel->Name());
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
      }
   for (int i = 3; i--;) {
@@ -833,6 +834,7 @@ bool cDevice::SwitchChannel(int Direction)
 
 eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 {
+  cMutexLock MutexLock(&mutexReceiver); // to avoid a race between SVDRP CHAN and HasProgramme()
   cStatus::MsgChannelSwitch(this, 0, LiveView);
 
   if (LiveView) {
@@ -945,6 +947,7 @@ bool cDevice::HasLock(int TimeoutMs) const
 
 bool cDevice::HasProgramme(void) const
 {
+  cMutexLock MutexLock(&mutexReceiver); // to avoid a race between SVDRP CHAN and HasProgramme()
   return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
 }
 
@@ -1651,7 +1654,8 @@ bool cDevice::Receiving(bool Dummy) const
 }
 
 #define TS_SCRAMBLING_TIMEOUT     3 // seconds to wait until a TS becomes unscrambled
-#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked as known to decrypt
+#define TS_SCRAMBLING_TIME_OK     3 // seconds before a Channel/CAM combination is marked as known to decrypt
+#define EIT_INJECTION_TIME       10 // seconds for which to inject EIT event
 
 void cDevice::Action(void)
 {
@@ -1663,6 +1667,9 @@ void cDevice::Action(void)
               if (b) {
                  // Distribute the packet to all attached receivers:
                  Lock();
+                 cCamSlot *cs = CamSlot();
+                 if (cs)
+                    cs->TsPostProcess(b);
                  int Pid = TsPid(b);
                  bool IsScrambled = TsIsScrambled(b);
                  for (int i = 0; i < MAXRECEIVERS; i++) {
@@ -1671,7 +1678,7 @@ void cDevice::Action(void)
                         Receiver->Receive(b, TS_SIZE);
                         // Check whether the TS packet is scrambled:
                         if (Receiver->startScrambleDetection) {
-                           if (cCamSlot *cs = CamSlot()) {
+                           if (cs) {
                               int CamSlotNumber = cs->MasterSlotNumber();
                               if (Receiver->lastScrambledPacket < Receiver->startScrambleDetection)
                                  Receiver->lastScrambledPacket = Receiver->startScrambleDetection;
@@ -1697,6 +1704,18 @@ void cDevice::Action(void)
                                  }
                               }
                            }
+                        // Inject EIT event to avoid the CAMs parental rating prompt:
+                        if (Receiver->startEitInjection) {
+                           time_t Now = time(NULL);
+                           if (cCamSlot *cs = CamSlot()) {
+                              if (Now != Receiver->lastEitInjection) { // once per second
+                                 cs->InjectEit(Receiver->ChannelID().Sid());
+                                 Receiver->lastEitInjection = Now;
+                                 }
+                              }
+                           if (Now - Receiver->startEitInjection > EIT_INJECTION_TIME)
+                              Receiver->startEitInjection = 0;
+                           }
                         }
                      }
                  Unlock();
@@ -1755,6 +1774,10 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
          Unlock();
          if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
             camSlot->StartDecrypting();
+            if (camSlot->WantsTsData()) {
+               Receiver->lastEitInjection = 0;
+               Receiver->startEitInjection = time(NULL);
+               }
             if (CamSlots.NumReadyMasterSlots() > 1) { // don't try different CAMs if there is only one
                Receiver->startScrambleDetection = time(NULL);
                Receiver->scramblingTimeout = TS_SCRAMBLING_TIMEOUT;
diff --git a/device.h b/device.h
index 4796258b1..f6aee4e9e 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.8 2017/04/17 14:46:57 kls Exp $
+ * $Id: device.h 4.9 2017/05/09 11:24:47 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -112,6 +112,14 @@ class cDeviceHook : public cListObject {
 #define DTV_STAT_VALID_BERPRE    0x0004
 #define DTV_STAT_VALID_BERPOST   0x0008
 #define DTV_STAT_VALID_PER       0x0010
+#define DTV_STAT_VALID_STATUS    0x0020
+
+#define DTV_STAT_HAS_NONE        0x0000
+#define DTV_STAT_HAS_SIGNAL      0x0001
+#define DTV_STAT_HAS_CARRIER     0x0002
+#define DTV_STAT_HAS_VITERBI     0x0004
+#define DTV_STAT_HAS_SYNC        0x0008
+#define DTV_STAT_HAS_LOCK        0x0010
 
 class cDevice : public cThread {
   friend class cLiveSubtitle;
@@ -291,13 +299,14 @@ class cDevice : public cThread {
          ///< move the satellite dish to the requested position (only applies to DVB-S
          ///< devices). If no positioner is involved, or this is not a DVB-S device,
          ///< NULL will be returned.
-  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL) const;
+  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL, int *Status = NULL) const;
          ///< Returns statistics about the currently received signal (if available).
          ///< Strength is the signal strength in dBm (typical range -100dBm...0dBm).
          ///< Cnr is the carrier to noise ratio in dB (typical range 0dB...40dB).
          ///< BerPre is the bit error rate before the forward error correction (FEC).
          ///< BerPost is the bit error rate after the forward error correction (FEC).
          ///< Per is the block error rate after the forward error correction (FEC).
+         ///< Status is the masked frontend status (signal/carrier/viterbi/sync/lock).
          ///< Typical range for BerPre, BerPost and Per is 0...1.
          ///< If any of the given pointers is not NULL, the value of the respective signal
          ///< statistic is returned in it. Upon return, Valid holds a combination of
diff --git a/dvbdevice.c b/dvbdevice.c
index 3a900a3a2..9e0710673 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 4.9 2017/04/20 14:42:35 kls Exp $
+ * $Id: dvbdevice.c 4.13 2017/05/09 11:50:38 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -349,7 +349,7 @@ class cDvbTuner : public cThread {
   void SetChannel(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
   const cPositioner *Positioner(void) const { return positioner; }
-  bool GetSignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL) const;
+  bool GetSignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL, int *Status = NULL) const;
   int GetSignalStrength(void) const;
   int GetSignalQuality(void) const;
   };
@@ -574,14 +574,29 @@ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status) const
                           }\
                      }
 
-bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per) const
+bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per, int *Status) const
 {
   ClearEventQueue();
+  fe_status_t FeStatus;
   dtv_property Props[MAXFRONTENDCMDS];
   dtv_properties CmdSeq;
   memset(&Props, 0, sizeof(Props));
   memset(&CmdSeq, 0, sizeof(CmdSeq));
   CmdSeq.props = Props;
+  Valid = DTV_STAT_VALID_NONE;
+  if (ioctl(fd_frontend, FE_READ_STATUS, &FeStatus) != 0) {
+     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+     return false;
+     }
+  if (Status) {
+     *Status = DTV_STAT_HAS_NONE;
+     if (FeStatus & FE_HAS_SIGNAL)  *Status |= DTV_STAT_HAS_SIGNAL;
+     if (FeStatus & FE_HAS_CARRIER) *Status |= DTV_STAT_HAS_CARRIER;
+     if (FeStatus & FE_HAS_VITERBI) *Status |= DTV_STAT_HAS_VITERBI;
+     if (FeStatus & FE_HAS_SYNC)    *Status |= DTV_STAT_HAS_SYNC;
+     if (FeStatus & FE_HAS_LOCK)    *Status |= DTV_STAT_HAS_LOCK;
+     Valid |= DTV_STAT_VALID_STATUS;
+     }
   if (Strength)   SETCMD(DTV_STAT_SIGNAL_STRENGTH, 0);
   if (Cnr)        SETCMD(DTV_STAT_CNR, 0);
   if (BerPre)   { SETCMD(DTV_STAT_PRE_ERROR_BIT_COUNT, 0);
@@ -594,7 +609,6 @@ bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double
      esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
      return false;
      }
-  Valid = DTV_STAT_VALID_NONE;
   int i = 0;
   if (Strength) {
      if (Props[i].u.st.len > 0) {
@@ -659,6 +673,7 @@ bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double
      }
 #ifdef DEBUG_SIGNALSTATS
   fprintf(stderr, "FE %d/%d: API5 %04X", adapter, frontend, Valid);
+  if ((Valid & DTV_STAT_VALID_STATUS)   != 0) fprintf(stderr, " STAT=%04X",     *Status);
   if ((Valid & DTV_STAT_VALID_STRENGTH) != 0) fprintf(stderr, " STR=%1.1fdBm",  *Strength);
   if ((Valid & DTV_STAT_VALID_CNR)      != 0) fprintf(stderr, " CNR=%1.1fdB",   *Cnr);
   if ((Valid & DTV_STAT_VALID_BERPRE)   != 0) fprintf(stderr, " BERPRE=%1.1e",  *BerPre);
@@ -844,13 +859,16 @@ int cDvbTuner::GetSignalQuality(void) const
               // be considered low even if there haven't been any more uncorrected bocks
               // for quite a while.
               Unc = lastUncDelta;
-              int t = time(NULL) - lastUncChange - 2;
-              if (t > 0)
-                 Unc >>= min(t, 32);
+              if (Unc > 0) {
+                 int t = time(NULL) - lastUncChange - 2;
+                 if (t > 0)
+                    Unc >>= min(t, int(sizeof(Unc) * 8 - 1));
+                 if (Unc == 0)
+                    lastUncDelta = 0;
 #ifdef DEBUG_SIGNALQUALITY
-              if (Unc > 0)
                  fprintf(stderr, "FE %d/%d: API3 UNC = %u\n", adapter, frontend, Unc);
 #endif
+                 }
               break;
               }
            if (errno != EINTR) {
@@ -1288,14 +1306,25 @@ const char *DeliverySystemNames[] = {
   "ISDBC",
   "ATSC",
   "ATSCMH",
-  "DMBTH",
+  "DTMB",
   "CMMB",
   "DAB",
   "DVB-T2",
   "TURBO",
+  "DVB-C",
+  "DVB-C2",
   NULL
   };
 
+static const int DeliverySystemNamesMax = sizeof(DeliverySystemNames) / sizeof(DeliverySystemNames[0]) - 2; // -1 to get the maximum allowed index & -1 for the NULL => -2
+
+static const char *GetDeliverySystemName(int Index)
+{
+  if (Index > DeliverySystemNamesMax)
+     Index = 0;
+  return DeliverySystemNames[Index];
+};
+
 cDvbDevice::cDvbDevice(int Adapter, int Frontend)
 {
   adapter = Adapter;
@@ -1393,9 +1422,9 @@ cString cDvbDevice::DeviceType(void) const
 {
   if (dvbTuner) {
      if (dvbTuner->FrontendType() != SYS_UNDEFINED)
-        return DeliverySystemNames[dvbTuner->FrontendType()];
+        return GetDeliverySystemName(dvbTuner->FrontendType());
      if (numDeliverySystems)
-        return DeliverySystemNames[deliverySystems[0]]; // to have some reasonable default
+        return GetDeliverySystemName(deliverySystems[0]); // to have some reasonable default
      }
   return "";
 }
@@ -1526,7 +1555,7 @@ bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
   if (numDeliverySystems > 0) {
      cString ds("");
      for (int i = 0; i < numDeliverySystems; i++)
-         ds = cString::sprintf("%s%s%s", *ds, i ? "," : "", DeliverySystemNames[deliverySystems[i]]);
+         ds = cString::sprintf("%s%s%s", *ds, i ? "," : "", GetDeliverySystemName(deliverySystems[i]));
      cString ms("");
      if (frontendInfo.caps & FE_CAN_QPSK)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QPSK, ModulationValues)); }
      if (frontendInfo.caps & FE_CAN_QAM_16)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_16, ModulationValues)); }
@@ -1827,9 +1856,9 @@ const cPositioner *cDvbDevice::Positioner(void) const
   return dvbTuner ? dvbTuner->Positioner() : NULL;
 }
 
-bool cDvbDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per) const
+bool cDvbDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per, int *Status) const
 {
-  return dvbTuner ? dvbTuner->GetSignalStats(Valid, Strength, Cnr, BerPre, BerPost, Per) : false;
+  return dvbTuner ? dvbTuner->GetSignalStats(Valid, Strength, Cnr, BerPre, BerPost, Per, Status) : false;
 }
 
 int cDvbDevice::SignalStrength(void) const
diff --git a/dvbdevice.h b/dvbdevice.h
index edc946080..0490a44fc 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 4.3 2017/04/17 14:44:43 kls Exp $
+ * $Id: dvbdevice.h 4.4 2017/05/09 11:24:47 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
@@ -244,7 +244,7 @@ class cDvbDevice : public cDevice {
   virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
   virtual const cPositioner *Positioner(void) const;
-  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL) const;
+  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL, int *Status = NULL) const;
   virtual int SignalStrength(void) const;
   virtual int SignalQuality(void) const;
   virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
diff --git a/eit.c b/eit.c
index cfed4d080..ade792865 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.2 2017/03/31 15:16:46 kls Exp $
+ * $Id: eit.c 4.3 2017/05/03 08:58:41 kls Exp $
  */
 
 #include "eit.h"
@@ -79,6 +79,7 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
 
   bool Empty = true;
   bool Modified = false;
+  time_t LingerLimit = Now - Setup.EPGLinger * 60;
   time_t SegmentStart = 0;
   time_t SegmentEnd = 0;
   struct tm t = { 0 };
@@ -93,6 +94,9 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
       // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
       if (StartTime == 0 || StartTime > 0 && Duration == 0)
          continue;
+      // Ignore events that ended before the "EPG linger time":
+      if (StartTime + Duration < LingerLimit)
+         continue;
       Empty = false;
       if (!SegmentStart)
          SegmentStart = StartTime;
diff --git a/eit.h b/eit.h
index 51af6433c..c93aabc3b 100644
--- a/eit.h
+++ b/eit.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eit.h 4.1 2015/07/25 11:03:53 kls Exp $
+ * $Id: eit.h 4.2 2017/05/08 21:10:29 kls Exp $
  */
 
 #ifndef __EIT_H
@@ -15,7 +15,10 @@
 
 class cSectionSyncerEntry : public cListObject, public cSectionSyncer {};
 
-class cSectionSyncerHash : public cHash<cSectionSyncerEntry> {};
+class cSectionSyncerHash : public cHash<cSectionSyncerEntry> {
+public:
+  cSectionSyncerHash(void) : cHash(HASHSIZE, true) {};
+  };
 
 class cEitFilter : public cFilter {
 private:
diff --git a/epg.c b/epg.c
index c67b64562..7cbb01165 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 4.4 2017/04/02 11:34:15 kls Exp $
+ * $Id: epg.c 4.6 2017/05/09 12:16:36 kls Exp $
  */
 
 #include "epg.h"
@@ -529,15 +529,14 @@ bool cEvent::Parse(char *s)
   return true;
 }
 
-bool cEvent::Read(FILE *f, cSchedule *Schedule)
+bool cEvent::Read(FILE *f, cSchedule *Schedule, int &Line)
 {
   if (Schedule) {
      cEvent *Event = NULL;
      char *s;
-     int line = 0;
      cReadLine ReadLine;
      while ((s = ReadLine.Read(f)) != NULL) {
-           line++;
+           Line++;
            char *t = skipspace(s + 1);
            switch (*s) {
              case 'E': if (!Event) {
@@ -573,7 +572,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
              case 'c': // to keep things simple we react on 'c' here
                        return true;
              default:  if (Event && !Event->Parse(s)) {
-                          esyslog("ERROR: EPG data problem in line %d", line);
+                          esyslog("ERROR: EPG data problem in line %d", Line);
                           return false;
                           }
              }
@@ -1098,7 +1097,7 @@ void cSchedule::Cleanup(time_t Time)
 {
   cEvent *Event;
   while ((Event = events.First()) != NULL) {
-        if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) // adding one hour for safety
+        if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 < Time)
            DelEvent(Event);
         else
            break;
@@ -1141,9 +1140,11 @@ void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtT
 bool cSchedule::Read(FILE *f, cSchedules *Schedules)
 {
   if (Schedules) {
+     int Line = 0;
      cReadLine ReadLine;
      char *s;
      while ((s = ReadLine.Read(f)) != NULL) {
+           Line++;
            if (*s == 'C') {
               s = skipspace(s + 1);
               char *p = strchr(s, ' ');
@@ -1153,7 +1154,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
                  tChannelID channelID = tChannelID::FromString(s);
                  if (channelID.Valid()) {
                     if (cSchedule *p = Schedules->AddSchedule(channelID)) {
-                       if (!cEvent::Read(f, p))
+                       if (!cEvent::Read(f, p, Line))
                           return false;
                        p->Sort();
                        }
@@ -1165,7 +1166,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
                  }
               }
            else {
-              esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
+              esyslog("ERROR: unexpected tag in line %d while reading EPG data: %s", Line, s);
               return false;
               }
            }
diff --git a/epg.h b/epg.h
index 1341aa2e0..fe536a7df 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 4.4 2017/04/02 11:22:21 kls Exp $
+ * $Id: epg.h 4.6 2017/05/09 12:15:14 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -141,7 +141,7 @@ class cEvent : public cListObject {
   cString ToDescr(void) const;
   void Dump(FILE *f, const char *Prefix = "", bool InfoOnly = false) const;
   bool Parse(char *s);
-  static bool Read(FILE *f, cSchedule *Schedule);
+  static bool Read(FILE *f, cSchedule *Schedule, int &Line);
   void FixEpgBugs(void);
   };
 
@@ -284,7 +284,7 @@ class cEpgHandler : public cListObject {
   virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
           ///< Takes a look at all EPG events between SegmentStart and SegmentEnd and
           ///< drops outdated events.
-  virtual bool BeginSegmentTransfer(const cChannel *Channel, bool Dummy) { return false; } // TODO remove obsolete Dummy
+  virtual bool BeginSegmentTransfer(const cChannel *Channel, bool Dummy) { return true; } // TODO remove obsolete Dummy
           ///< Called directly after IgnoreChannel() before any other handler method is called.
           ///< Designed to give handlers the possibility to prepare a database transaction.
           ///< If any EPG handler returns false in this function, it is assumed that
diff --git a/filter.c b/filter.c
index aa91c1f19..3156d149c 100644
--- a/filter.c
+++ b/filter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.c 4.2 2015/07/25 10:59:57 kls Exp $
+ * $Id: filter.c 4.3 2017/05/07 15:20:45 kls Exp $
  */
 
 #include "filter.h"
@@ -71,6 +71,15 @@ cFilterData::cFilterData(u_short Pid, u_char Tid, u_char Mask, bool Sticky)
   sticky = Sticky;
 }
 
+cFilterData& cFilterData::operator= (const cFilterData &FilterData)
+{
+  pid = FilterData.pid;
+  tid = FilterData.tid;
+  mask = FilterData.mask;
+  sticky = FilterData.sticky;
+  return *this;
+}
+
 bool cFilterData::Is(u_short Pid, u_char Tid, u_char Mask)
 {
   return pid == Pid && tid == Tid && mask == Mask;
diff --git a/filter.h b/filter.h
index 7cc3ec321..8ac83c082 100644
--- a/filter.h
+++ b/filter.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: filter.h 4.2 2015/07/25 10:03:44 kls Exp $
+ * $Id: filter.h 4.3 2017/05/07 15:18:48 kls Exp $
  */
 
 #ifndef __FILTER_H
@@ -38,6 +38,7 @@ class cFilterData : public cListObject {
   bool sticky;
   cFilterData(void);
   cFilterData(u_short Pid, u_char Tid, u_char Mask, bool Sticky);
+  cFilterData& operator= (const cFilterData &FilterData);
   bool Is(u_short Pid, u_char Tid, u_char Mask);
   bool Matches(u_short Pid, u_char Tid);
   };
diff --git a/libsi/Makefile b/libsi/Makefile
index 4c7630c3f..2ae223b88 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 4.0 2015/02/11 10:24:54 kls Exp $
+# $Id: Makefile 4.1 2017/05/22 15:33:20 kls Exp $
 
 ### The archiver options:
 
@@ -18,7 +18,8 @@ OBJS = util.o si.o section.o descriptor.o
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	@echo CC libsi/$@
+	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 ### Dependencies:
 
@@ -35,7 +36,8 @@ all: libsi.a
 	@:
 
 libsi.a : $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+	@echo AR libsi/$@
+	@$(AR) $(ARFLAGS) $@ $(OBJS)
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.a *.so *.tgz core* *~
diff --git a/menu.c b/menu.c
index 357aaf836..246c4df33 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.25 2017/04/20 09:15:49 kls Exp $
+ * $Id: menu.c 4.29 2017/05/21 13:18:26 kls Exp $
  */
 
 #include "menu.h"
@@ -1328,7 +1328,7 @@ eOSState cMenuTimers::New(void)
   if (HasSubMenu())
      return osContinue;
   cTimer *Timer = new cTimer;
-  if (*Setup.SVDRPDefaultHost)
+  if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
      Timer->SetRemote(Setup.SVDRPDefaultHost);
   return AddSubMenu(new cMenuEditTimer(Timer, true));
 }
@@ -1660,7 +1660,7 @@ eOSState cMenuWhatsOn::Record(void)
              return AddSubMenu(new cMenuEditTimer(Timer));
           }
        cTimer *Timer = new cTimer(item->event);
-       if (*Setup.SVDRPDefaultHost)
+       if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
           Timer->SetRemote(Setup.SVDRPDefaultHost);
        if (cTimer *t = Timers->GetTimer(Timer)) {
           delete Timer;
@@ -1674,7 +1674,6 @@ eOSState cMenuWhatsOn::Record(void)
        if (!HandleRemoteModifications(Timer)) {
           // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
           Timers->Del(Timer);
-          delete Timer;
           }
      }
      if (HasSubMenu())
@@ -1692,7 +1691,7 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
-     switch (Key) {
+     switch (int(Key)) {
        case kRecord:
        case kRed:    return Record();
        case kYellow: state = osBack;
@@ -1708,6 +1707,20 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
        case kBlue:   if (canSwitch)
                         return Switch();
                      break;
+       case kChanUp|k_Repeat:
+       case kChanUp:
+       case kChanDn|k_Repeat:
+       case kChanDn: if (!HasSubMenu()) {
+                        for (cOsdItem *item = First(); item; item = Next(item)) {
+                            if (((cMenuScheduleItem *)item)->channel->Number() == cDevice::CurrentChannel()) {
+                               SetCurrent(item);
+                               Display();
+                               SetHelpKeys();
+                               break;
+                               }
+                            }
+                        }
+                     break;
        case kInfo:
        case kOk:     if (Count()) {
                         LOCK_TIMERS_READ;
@@ -1944,7 +1957,7 @@ eOSState cMenuSchedule::Record(void)
              return AddSubMenu(new cMenuEditTimer(Timer));
           }
        cTimer *Timer = new cTimer(item->event);
-       if (*Setup.SVDRPDefaultHost)
+       if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
           Timer->SetRemote(Setup.SVDRPDefaultHost);
        if (cTimer *t = Timers->GetTimer(Timer)) {
           delete Timer;
@@ -1958,7 +1971,6 @@ eOSState cMenuSchedule::Record(void)
        if (!HandleRemoteModifications(Timer)) {
           // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
           Timers->Del(Timer);
-          delete Timer;
           }
      }
      if (HasSubMenu())
@@ -1995,7 +2007,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
-     switch (Key) {
+     switch (int(Key)) {
        case k0:      return Number();
        case kRecord:
        case kRed:    return Record();
@@ -2025,6 +2037,15 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        case kBlue:   if (canSwitch)
                         return Switch();
                      break;
+       case kChanUp|k_Repeat:
+       case kChanUp:
+       case kChanDn|k_Repeat:
+       case kChanDn: if (!HasSubMenu()) {
+                        LOCK_CHANNELS_READ;
+                        if (const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel()))
+                           Set(Channel, true);
+                        }
+                     break;
        case kInfo:
        case kOk:     if (Count()) {
                         LOCK_TIMERS_READ;
@@ -2243,7 +2264,7 @@ void cMenuCam::Set(void)
      SetHasHotkeys(ciMenu->Selectable());
      GenerateTitle(ciMenu->TitleText());
      dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->TitleText());
-     if (*ciMenu->SubTitleText()) {
+     if (!isempty(ciMenu->SubTitleText())) {
         dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->SubTitleText());
         AddMultiLineItem(ciMenu->SubTitleText());
         offset = Count();
@@ -2252,7 +2273,7 @@ void cMenuCam::Set(void)
          Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable()));
          dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->Entry(i));
          }
-     if (*ciMenu->BottomText()) {
+     if (!isempty(ciMenu->BottomText())) {
         AddMultiLineItem(ciMenu->BottomText());
         dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->BottomText());
         }
@@ -5185,7 +5206,7 @@ bool cRecordControls::Start(cTimers *Timers, cTimer *Timer, bool Pause)
      int Priority = Timer ? Timer->Priority() : Pause ? Setup.PausePriority : Setup.DefaultPriority;
      cDevice *device = cDevice::GetDevice(Channel, Priority, false);
      if (device) {
-        dsyslog("switching device %d to channel %d (%s)", device->DeviceNumber() + 1, Channel->Number(), Channel->Name());
+        dsyslog("switching device %d to channel %d %s (%s)", device->DeviceNumber() + 1, Channel->Number(), *Channel->GetChannelID().ToString(), Channel->Name());
         if (!device->SwitchChannel(Channel, false)) {
            ShutdownHandler.RequestEmergencyExit();
            return false;
diff --git a/mtd.c b/mtd.c
index 29fe520f2..345288ece 100644
--- a/mtd.c
+++ b/mtd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.c 1.10 2017/04/26 08:33:54 kls Exp $
+ * $Id: mtd.c 1.11 2017/05/01 09:19:52 kls Exp $
  */
 
 #include "mtd.h"
@@ -64,22 +64,20 @@ int cMtdHandler::Put(const uchar *Data, int Count)
         if (int Skipped = TS_SYNC(Data, Count))
            return Used + Skipped;
         int Pid = TsPid(Data);
-        if (Pid != CATPID) { // the original CAT with mapped PIDs must be skipped here!
 #ifdef KEEPPIDS
-           int Index = 0;
+        int Index = 0;
 #else
-           int Index = (Pid >> UNIQ_PID_SHIFT) - 1;
+        int Index = (Pid >> UNIQ_PID_SHIFT) - 1;
 #endif // KEEPPIDS
-           if (Index >= 0 && Index < camSlots.Size()) {
-              int w = camSlots[Index]->PutData(Data, TS_SIZE);
-              if (w == 0)
-                 break;
-              else if (w != TS_SIZE)
-                 esyslog("ERROR: incomplete MTD packet written (%d) in PID %d (%04X)", Index + 1, Pid, Pid);
-              }
-           else if (Index >= 0) // we silently ignore Index -1 (i.e. MTD number 0), since there are several hundred empty TS packets when switching to an encrypted channel for the first time since startup
-              esyslog("ERROR: invalid MTD number (%d) in PID %d (%04X)", Index + 1, Pid, Pid);
+        if (Index >= 0 && Index < camSlots.Size()) {
+           int w = camSlots[Index]->PutData(Data, TS_SIZE);
+           if (w == 0)
+              break;
+           else if (w != TS_SIZE)
+              esyslog("ERROR: incomplete MTD packet written (%d) in PID %d (%04X)", Index + 1, Pid, Pid);
            }
+        else if (Index >= 0) // anything with Index -1 (i.e. MTD number 0) is either garbage or an actual CAT or EIT, which need not be returned to the device
+           esyslog("ERROR: invalid MTD number (%d) in PID %d (%04X)", Index + 1, Pid, Pid);
         Data += TS_SIZE;
         Count -= TS_SIZE;
         Used += TS_SIZE;
@@ -329,6 +327,11 @@ uchar *cMtdCamSlot::Decrypt(uchar *Data, int &Count)
   return d;
 }
 
+void cMtdCamSlot::InjectEit(int Sid)
+{
+  MasterSlot()->InjectEit(mtdMapper->RealToUniqSid(Sid));
+}
+
 int cMtdCamSlot::PutData(const uchar *Data, int Count)
 {
   int Free = mtdBuffer->Free();
diff --git a/mtd.h b/mtd.h
index 7f2151a32..2be5f3dcd 100644
--- a/mtd.h
+++ b/mtd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.h 1.7 2017/04/26 09:17:08 kls Exp $
+ * $Id: mtd.h 1.8 2017/05/01 09:19:21 kls Exp $
  */
 
 #ifndef __MTD_H
@@ -172,6 +172,7 @@ class cMtdCamSlot : public cCamSlot {
   virtual void StartDecrypting(void);
   virtual void StopDecrypting(void);
   virtual uchar *Decrypt(uchar *Data, int &Count);
+  virtual void InjectEit(int Sid);
   int PutData(const uchar *Data, int Count);
   int PutCat(const uchar *Data, int Count);
   // The following functions shall not be called for a cMtdCamSlot:
diff --git a/newplugin b/newplugin
index d8e9243c4..161ffdac4 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 4.1 2015/09/10 11:11:14 kls Exp $
+# $Id: newplugin 4.2 2017/05/22 15:34:01 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -121,7 +121,8 @@ all: \$(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) -o \$\@ \$<
+	\@echo CC \$\@
+	\@\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) -o \$\@ \$<
 
 ### Dependencies:
 
@@ -141,13 +142,16 @@ I18Nmsgs  = \$(addprefix \$(DESTDIR)\$(LOCDIR)/, \$(addsuffix /LC_MESSAGES/vdr-\
 I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 
 %.mo: %.po
-	msgfmt -c -o \$\@ \$<
+	\@echo MO \$\@
+	\@msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ `ls \$^`
+	\@echo GT \$\@
+	\@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ `ls \$^`
 
 %.po: \$(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$<
+	\@echo PO \$\@
+	\@msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$<
 	\@touch \$\@
 
 \$(I18Nmsgs): \$(DESTDIR)\$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
@@ -161,7 +165,8 @@ install-i18n: \$(I18Nmsgs)
 ### Targets:
 
 \$(SOFILE): \$(OBJS)
-	\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
+	\@echo LD \$\@
+	\@\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
 
 install-lib: \$(SOFILE)
 	install -D \$^ \$(DESTDIR)\$(LIBDIR)/\$^.\$(APIVERSION)
diff --git a/receiver.c b/receiver.c
index 8009e91bc..f664da4a0 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 4.3 2017/04/01 15:55:38 kls Exp $
+ * $Id: receiver.c 4.4 2017/05/01 08:49:20 kls Exp $
  */
 
 #include "receiver.h"
@@ -19,6 +19,8 @@ cReceiver::cReceiver(const cChannel *Channel, int Priority)
   lastScrambledPacket = 0;
   startScrambleDetection = 0;
   scramblingTimeout = 0;
+  startEitInjection = 0;
+  lastEitInjection = 0;
   SetPids(Channel);
 }
 
diff --git a/receiver.h b/receiver.h
index 184d2ee8b..9bbc6bdb5 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 4.2 2017/04/01 15:55:27 kls Exp $
+ * $Id: receiver.h 4.3 2017/05/01 08:48:34 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -25,6 +25,8 @@ class cReceiver {
   time_t lastScrambledPacket;
   time_t startScrambleDetection;
   int scramblingTimeout;
+  time_t startEitInjection;
+  time_t lastEitInjection;
   bool WantsPid(int Pid);
 protected:
   cDevice *Device(void) { return device; }
diff --git a/remux.c b/remux.c
index 4a3ff1436..6993e9b7e 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 4.6 2017/04/24 14:59:39 kls Exp $
+ * $Id: remux.c 4.7 2017/04/29 12:25:09 kls Exp $
  */
 
 #include "remux.h"
@@ -940,6 +940,93 @@ bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion) const
   return patVersion >= 0 && pmtVersion >= 0;
 }
 
+// --- cEitGenerator ---------------------------------------------------------
+
+cEitGenerator::cEitGenerator(int Sid)
+{
+  counter = 0;
+  version = 0;
+  if (Sid)
+     Generate(Sid);
+}
+
+uint16_t cEitGenerator::YMDtoMJD(int Y, int M, int D)
+{
+  int L = (M < 3) ? 1 : 0;
+  return 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
+}
+
+uchar *cEitGenerator::AddParentalRatingDescriptor(uchar *p, uchar ParentalRating)
+{
+  *p++ = SI::ParentalRatingDescriptorTag;
+  *p++ = 0x04; // descriptor length
+  *p++ = 'D';  // country code
+  *p++ = 'E';
+  *p++ = 'U';
+  *p++ = ParentalRating;
+  return p;
+}
+
+uchar *cEitGenerator::Generate(int Sid)
+{
+  uchar *PayloadStart;
+  uchar *SectionStart;
+  uchar *DescriptorsStart;
+  memset(eit, 0xFF, sizeof(eit));
+  struct tm tm_r;
+  time_t t = time(NULL) - 3600; // let's have the event start one hour in the past
+  tm *tm = localtime_r(&t, &tm_r);
+  uint16_t MJD = YMDtoMJD(tm->tm_year, tm->tm_mon + 1, tm->tm_mday);
+  uchar *p = eit;
+  // TS header:
+  *p++ = TS_SYNC_BYTE;
+  *p++ = TS_PAYLOAD_START;
+  *p++ = EITPID;
+  *p++ = 0x10 | (counter++ & 0x0F); // continuity counter
+  *p++ = 0x00; // pointer field (payload unit start indicator is set)
+  // payload:
+  PayloadStart = p;
+  *p++ = 0x4E; // TID present/following event on this transponder
+  *p++ = 0xF0;
+  *p++ = 0x00; // section length
+  SectionStart = p;
+  *p++ = Sid >> 8;
+  *p++ = Sid & 0xFF;
+  *p++ = 0xC1 | (version << 1);
+  *p++ = 0x00; // section number
+  *p++ = 0x00; // last section number
+  *p++ = 0x00; // transport stream id
+  *p++ = 0x00; // ...
+  *p++ = 0x00; // original network id
+  *p++ = 0x00; // ...
+  *p++ = 0x00; // segment last section number
+  *p++ = 0x4E; // last table id
+  *p++ = 0x00; // event id
+  *p++ = 0x01; // ...
+  *p++ = MJD >> 8; // start time
+  *p++ = MJD & 0xFF;  // ...
+  *p++ = tm->tm_hour; // ...
+  *p++ = tm->tm_min;  // ...
+  *p++ = tm->tm_sec;  // ...
+  *p++ = 0x24; // duration (one day, should cover everything)
+  *p++ = 0x00; // ...
+  *p++ = 0x00; // ...
+  *p++ = 0x90; // running status, free/CA mode
+  *p++ = 0x00; // descriptors loop length
+  DescriptorsStart = p;
+  p = AddParentalRatingDescriptor(p);
+  // fill in lengths:
+  *(SectionStart - 1) = p - SectionStart + 4; // +4 = length of CRC
+  *(DescriptorsStart - 1) = p - DescriptorsStart;
+  // checksum
+  int crc = SI::CRC32::crc32((char *)PayloadStart, p - PayloadStart, 0xFFFFFFFF);
+  *p++ = crc >> 24;
+  *p++ = crc >> 16;
+  *p++ = crc >> 8;
+  *p++ = crc;
+  return eit;
+}
+
 // --- cTsToPes --------------------------------------------------------------
 
 cTsToPes::cTsToPes(void)
diff --git a/remux.h b/remux.h
index 7dd5b163f..eea8a8445 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 4.3 2017/03/26 13:06:37 kls Exp $
+ * $Id: remux.h 4.5 2017/05/21 09:44:52 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -51,6 +51,7 @@ class cRemux {
 
 #define PATPID 0x0000 // PAT PID (constant 0)
 #define CATPID 0x0001 // CAT PID (constant 1)
+#define EITPID 0x0012 // EIT PID (constant 18)
 #define MAXPID 0x2000 // for arrays that use a PID as the index
 
 #define PTSTICKS  90000 // number of PTS ticks per second
@@ -94,7 +95,7 @@ inline bool TsIsScrambled(const uchar *p)
   return p[3] & TS_SCRAMBLING_CONTROL;
 }
 
-inline uchar TsGetContinuityCounter(const uchar *p)
+inline uchar TsContinuityCounter(const uchar *p)
 {
   return p[3] & TS_CONT_CNT_MASK;
 }
@@ -120,11 +121,6 @@ inline int TsGetPayload(const uchar **p)
   return 0;
 }
 
-inline int TsContinuityCounter(const uchar *p)
-{
-  return p[3] & TS_CONT_CNT_MASK;
-}
-
 inline int64_t TsGetPcr(const uchar *p)
 {
   if (TsHasAdaptationField(p)) {
@@ -431,6 +427,22 @@ class cPatPmtParser {
   uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); }
   };
 
+// EIT Generator:
+
+class cEitGenerator {
+private:
+  uchar eit[TS_SIZE];
+  int counter;
+  int version;
+  uint16_t YMDtoMJD(int Y, int M, int D);
+  uchar *AddParentalRatingDescriptor(uchar *p, uchar ParentalRating = 0);
+public:
+  cEitGenerator(int Sid = 0);
+  uchar *Generate(int Sid);
+  uchar *Data(void) { return eit; }
+  int Length(void) { return sizeof(eit); }
+  };
+
 // TS to PES converter:
 // Puts together the payload of several TS packets that form one PES
 // packet.
diff --git a/svdrp.c b/svdrp.c
index 993150c7e..f402c21a1 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.17 2017/04/22 11:57:31 kls Exp $
+ * $Id: svdrp.c 4.18 2017/05/18 15:51:24 kls Exp $
  */
 
 #include "svdrp.h"
@@ -384,6 +384,8 @@ void cSVDRPClient::Close(void)
      SVDRPClientPoller.Del(file, false);
      file.Close();
      socket.Close();
+     LOCK_TIMERS_WRITE;
+     Timers->DelRemoteTimers(serverName);
      }
 }
 
diff --git a/tools.c b/tools.c
index 754673dbc..a8e6af1ee 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 4.5 2016/12/23 14:03:40 kls Exp $
+ * $Id: tools.c 4.6 2017/05/09 08:32:54 kls Exp $
  */
 
 #include "tools.h"
@@ -2312,9 +2312,10 @@ void cDynamicBuffer::Append(const uchar *Data, int Length)
 
 // --- cHashBase -------------------------------------------------------------
 
-cHashBase::cHashBase(int Size)
+cHashBase::cHashBase(int Size, bool OwnObjects)
 {
   size = Size;
+  ownObjects = OwnObjects;
   hashTable = (cList<cHashObject>**)calloc(size, sizeof(cList<cHashObject>*));
 }
 
@@ -2348,6 +2349,13 @@ void cHashBase::Del(cListObject *Object, unsigned int Id)
 void cHashBase::Clear(void)
 {
   for (int i = 0; i < size; i++) {
+      if (ownObjects) {
+         cList<cHashObject> *list = hashTable[i];
+         if (list) {
+            for (cHashObject *hob = list->First(); hob; hob = list->Next(hob))
+                delete hob->object;
+            }
+         }
       delete hashTable[i];
       hashTable[i] = NULL;
       }
diff --git a/tools.h b/tools.h
index d2234c392..f823077a8 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.6 2017/03/16 16:04:43 kls Exp $
+ * $Id: tools.h 4.10 2017/05/22 11:07:04 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -51,10 +51,14 @@ template<class T> inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q;
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 #define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
 
-#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
+#ifndef _STL_ALGOBASE_H // in case some plugin needs to use the STL
 template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
 template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
+#endif
+#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
 template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
+#endif
+#ifndef _MOVE_H // in case some plugin needs to use the STL
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #endif
 
@@ -479,6 +483,8 @@ class cListObject {
   friend class cListGarbageCollector;
 private:
   cListObject *prev, *next;
+  cListObject(const cListObject &ListObject) { abort(); } // no copy constructor!
+  cListObject& operator= (const cListObject &ListObject) { abort(); return *this; } // no assignment operator!
 public:
   cListObject(void);
   virtual ~cListObject();
@@ -825,9 +831,14 @@ class cHashBase {
 private:
   cList<cHashObject> **hashTable;
   int size;
+  bool ownObjects;
   unsigned int hashfn(unsigned int Id) const { return Id % size; }
 protected:
-  cHashBase(int Size);
+  cHashBase(int Size, bool OwnObjects);
+       ///< Creates a new hash of the given Size. If OwnObjects is true, the
+       ///< hash takes ownership of the objects given in the calls to Add(),
+       ///< and deletes them when Clear() is called or the hash is destroyed
+       ///< (unless the object has been removed from the hash by calling Del()).
 public:
   virtual ~cHashBase();
   void Add(cListObject *Object, unsigned int Id);
@@ -841,7 +852,7 @@ class cHashBase {
 
 template<class T> class cHash : public cHashBase {
 public:
-  cHash(int Size = HASHSIZE) : cHashBase(Size) {}
+  cHash(int Size = HASHSIZE, bool OwnObjects = false) : cHashBase(Size, OwnObjects) {}
   T *Get(unsigned int Id) const { return (T *)cHashBase::Get(Id); }
 };
 
diff --git a/vdr.c b/vdr.c
index 925f35fb0..41dbc8f46 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.12 2017/04/03 12:35:37 kls Exp $
+ * $Id: vdr.c 4.14 2017/05/21 12:31:37 kls Exp $
  */
 
 #include <getopt.h>
@@ -1151,7 +1151,7 @@ int main(int argc, char *argv[])
                        if (!Device->IsTunedToTransponder(Timer->Channel())) {
                           if (Device == cDevice::ActualDevice() && !Device->IsPrimaryDevice())
                              cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
-                          dsyslog("switching device %d to channel %d (%s)", Device->DeviceNumber() + 1, Timer->Channel()->Number(), Timer->Channel()->Name());
+                          dsyslog("switching device %d to channel %d %s (%s)", Device->DeviceNumber() + 1, Timer->Channel()->Number(), *Timer->Channel()->GetChannelID().ToString(), Timer->Channel()->Name());
                           if (Device->SwitchChannel(Timer->Channel(), false))
                              Device->SetOccupied(TIMERDEVICETIMEOUT);
                           }
@@ -1282,7 +1282,6 @@ int main(int argc, char *argv[])
                   }
                else
                   cDevice::SwitchChannel(NORMALKEY(key) == kChanUp ? 1 : -1);
-               key = kNone; // nobody else needs to see these keys
                break;
           // Volume control:
           case kVolUp|k_Repeat:

From 364d75c73a2ffd303a8f8e3ef3f537aecb1742ed Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 4 Jun 2017 09:47:20 +0000
Subject: [PATCH 248/307] Version 2.3.6

VDR developer version 2.3.6 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.6.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.5-2.3.6.diff

MD5 checksums:

eab982df03da492a7d263718a8c487c2  vdr-2.3.6.tar.bz2
84a53afa495740bfdf9aab4b8900df99  vdr-2.3.5-2.3.6.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The changes since version 2.3.5:

- Added backtrace functions for debugging (see cBackTrace in thread.h).
- Added checking the correct sequence of locking global lists (with help and
   suggestions from Jasmin Jessich). At the first occurrence of an invalid locking
   sequence, the 20 most recent locks will be written to the log file, followed by a
   backtrace that led to the call in question. This code can be activated by defining
   the macro DEBUG_LOCKSEQ in thread.c (which is on by default).
   When debugging an actual invalid locking sequence, you can additionally define
   the macro DEBUG_LOCKCALL in thread.c, which will add information about the caller
   of each lock. Note that this may cause some stress on the CPU, therefore it is off
   by default.
- The file Make.config.template now reacts on DEBUG=1 in the 'make' command line,
   and disables code optimizations by setting -O0 (thanks to Jasmin Jessich).
   This can be helpful when backtracing highly optimized code. You may want to
   'make distclean' before running 'make' with a modified setting of DEBUG, to make
   sure all object files are newly compiled.
- Fixed the locking sequence when dumping EPG data.
- Fixed the locking sequence when starting a recording.
- The Makefiles now use the macro $(Q) instead of a plain '@' in front of their
   commands, so that verbosity can be controlled by the user (suggested by Jasmin
   Jessich). Add VERBOSE=1 to the 'make' call in the VDR source directory to see the
   actual commands that are executed.
   Plugin authors should modify their makefiles accordingly, by simply preceeding
   the respective commands with '$(Q)' and inserting '@echo XX $@' (where XX is one
   of the character combinations listed in the release note for version 2.3.5) before
   the command.
   The newplugin script has also been modified accordingly.
   Note that if you build a plugin directly in the plugin's own source directory,
   the $(Q) macro won't be defined and commands will be displayed. You can add
   Q=@ to the make call to have it less verbose (provided the plugin's Makefile
   was modified as described above).
- Added clearing CiResourceHandlers before shutting down the plugin manager.
- Fixed a double channel switch when pressing the Channel+/- keys while no menu
   or channel display is open.
- Fixed generating k_Release key events for LIRC remote controls (due to the short
   timeout another normal key was sometimes put into the queue after the generated
   release). Also removed some code redundancy and added some buffer checks.
- Now using a separate mutex to fix the race between SVDRP CHAN and
   cDevice::HasProgramme(), because the previous fix caused a deadlock (reported by
   Derek Kelly).
- Fixed a possible crash in case the SVDRP connection to a peer VDR is terminated
   while getting remote timers.
- Fixed the locking sequence when creating a new timer from the Schedules menu.
- Fixed the locking sequence when switching between 'Now', 'Next' and 'Schedule'
   in the Schedules menu.
---
 CONTRIBUTORS                     |   7 +
 HISTORY                          |  47 ++++++
 Make.config.template             |   8 +-
 Makefile                         |  23 ++-
 PLUGINS/src/epgtableid0/Makefile |   6 +-
 PLUGINS/src/hello/Makefile       |  12 +-
 PLUGINS/src/osddemo/Makefile     |   6 +-
 PLUGINS/src/pictures/Makefile    |  12 +-
 PLUGINS/src/servicedemo/Makefile |   8 +-
 PLUGINS/src/skincurses/Makefile  |  12 +-
 PLUGINS/src/status/Makefile      |   6 +-
 PLUGINS/src/svdrpdemo/Makefile   |   6 +-
 channels.c                       |   4 +-
 config.h                         |  10 +-
 device.c                         |   6 +-
 device.h                         |   3 +-
 epg.c                            |  10 +-
 epg.h                            |   4 +-
 libsi/Makefile                   |   4 +-
 lirc.c                           |  21 +--
 menu.c                           |  57 ++++---
 newplugin                        |  12 +-
 recording.c                      |   4 +-
 svdrp.c                          |  10 +-
 thread.c                         | 271 +++++++++++++++++++++++++++++--
 thread.h                         |  33 +++-
 timers.c                         |   4 +-
 vdr.c                            |   7 +-
 28 files changed, 489 insertions(+), 124 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 140ae5335..6e228afe4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2858,6 +2858,8 @@ Derek Kelly <user.vdr@gmail.com>
  for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
  for suggesting to make the -u option also accept a numerical user id
  for reporting a problem with abs() in gcc6+ when called with an unsigned variable
+ for reporting a deadlock after the fix for a race between SVDRP CHAN and
+ cDevice::HasProgramme()
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
@@ -3424,6 +3426,11 @@ Jasmin Jessich <jasmin@anw.at>
  debugging MTD support
  for fixing selecting delivery system names in case of undefined indexes
  for fixing detecting the inclusion of STL header files in tools.h
+ for help and suggestions when implementing debug output for checking the correct
+ sequence of locking global lists
+ for suggesting to use $(Q) to control Makefile verbosity
+ for adding handling DEBUG to the Make.config.template file, in order to control
+ code optimization
 
 Martin Schirrmacher <schirrmie@gmail.com>
  for suggesting to provide a way for skin plugins to get informed about the currently
diff --git a/HISTORY b/HISTORY
index 7ce658685..32876ee35 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9055,3 +9055,50 @@ Video Disk Recorder Revision History
   The newplugin script has also been modified accordingly.
 - Fixed detecting the inclusion of STL header files in tools.h (thanks to Jasmin
   Jessich).
+
+2017-06-04: Version 2.3.6
+
+- Added backtrace functions for debugging (see cBackTrace in thread.h).
+- Added checking the correct sequence of locking global lists (with help and
+  suggestions from Jasmin Jessich). At the first occurrence of an invalid locking
+  sequence, the 20 most recent locks will be written to the log file, followed by a
+  backtrace that led to the call in question. This code can be activated by defining
+  the macro DEBUG_LOCKSEQ in thread.c (which is on by default).
+  When debugging an actual invalid locking sequence, you can additionally define
+  the macro DEBUG_LOCKCALL in thread.c, which will add information about the caller
+  of each lock. Note that this may cause some stress on the CPU, therefore it is off
+  by default.
+- The file Make.config.template now reacts on DEBUG=1 in the 'make' command line,
+  and disables code optimizations by setting -O0 (thanks to Jasmin Jessich).
+  This can be helpful when backtracing highly optimized code. You may want to
+  'make distclean' before running 'make' with a modified setting of DEBUG, to make
+  sure all object files are newly compiled.
+- Fixed the locking sequence when dumping EPG data.
+- Fixed the locking sequence when starting a recording.
+- The Makefiles now use the macro $(Q) instead of a plain '@' in front of their
+  commands, so that verbosity can be controlled by the user (suggested by Jasmin
+  Jessich). Add VERBOSE=1 to the 'make' call in the VDR source directory to see the
+  actual commands that are executed.
+  Plugin authors should modify their makefiles accordingly, by simply preceeding
+  the respective commands with '$(Q)' and inserting '@echo XX $@' (where XX is one
+  of the character combinations listed in the release note for version 2.3.5) before
+  the command.
+  The newplugin script has also been modified accordingly.
+  Note that if you build a plugin directly in the plugin's own source directory,
+  the $(Q) macro won't be defined and commands will be displayed. You can add
+  Q=@ to the make call to have it less verbose (provided the plugin's Makefile
+  was modified as described above).
+- Added clearing CiResourceHandlers before shutting down the plugin manager.
+- Fixed a double channel switch when pressing the Channel+/- keys while no menu
+  or channel display is open.
+- Fixed generating k_Release key events for LIRC remote controls (due to the short
+  timeout another normal key was sometimes put into the queue after the generated
+  release). Also removed some code redundancy and added some buffer checks.
+- Now using a separate mutex to fix the race between SVDRP CHAN and
+  cDevice::HasProgramme(), because the previous fix caused a deadlock (reported by
+  Derek Kelly).
+- Fixed a possible crash in case the SVDRP connection to a peer VDR is terminated
+  while getting remote timers.
+- Fixed the locking sequence when creating a new timer from the Schedules menu.
+- Fixed the locking sequence when switching between 'Now', 'Next' and 'Schedule'
+  in the Schedules menu.
diff --git a/Make.config.template b/Make.config.template
index 4b4317d62..82d55617d 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 4.0 2015/02/09 09:58:45 kls Exp $
+# $Id: Make.config.template 4.1 2017/06/02 09:29:54 kls Exp $
 
 ### The C compiler and options:
 
@@ -16,6 +16,12 @@ CFLAGS   = -g -O3 -Wall
 CXX      = g++
 CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
+# Use 'make DEBUG=1 ...' to build a debug version of VDR and plugins:
+ifdef DEBUG
+CFLAGS   += -O0
+CXXFLAGS += -O0
+endif
+
 # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
 ifdef M32
 CFLAGS   += -m32
diff --git a/Makefile b/Makefile
index 5b95dd0eb..a13214a6a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 4.4 2017/05/22 15:33:30 kls Exp $
+# $Id: Makefile 4.5 2017/05/29 08:48:42 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -52,6 +52,15 @@ DOXYFILE  = Doxyfile
 
 -include Make.config
 
+# Output control
+
+ifdef VERBOSE
+Q =
+else
+Q = @
+endif
+export Q
+
 # Mandatory compiler flags:
 
 CFLAGS   += -fPIC
@@ -122,7 +131,7 @@ all: vdr i18n plugins
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 # Dependencies:
 
@@ -137,7 +146,7 @@ $(DEPFILE): Makefile
 
 vdr: $(OBJS) $(SILIB)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
+	$(Q)$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
 
 # The libsi library:
 
@@ -180,20 +189,20 @@ I18Npot   = $(PODIR)/vdr.pot
 
 %.mo: %.po
 	@echo MO $@
-	@msgfmt -c -o $@ $<
+	$(Q)msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
 	@echo GT $@
-	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
+	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	@echo PO $@
-	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
 	@echo IN $@
-	@install -D -m644 $< $@
+	$(Q)install -D -m644 $< $@
 
 .PHONY: i18n
 i18n: $(I18Nmsgs)
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 5afb680b9..ef7cc71f8 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:30:42 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:30:00 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,7 @@ all: $(SOFILE)
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -77,7 +77,7 @@ $(DEPFILE): Makefile
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 79dcf2295..5581c78c7 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:32:10 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:26:45 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -63,7 +63,7 @@ all: $(SOFILE) i18n
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -84,15 +84,15 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	@echo MO $@
-	@msgfmt -c -o $@ $<
+	$(Q)msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
 	@echo GT $@
-	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	@echo PO $@
-	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@@ -107,7 +107,7 @@ install-i18n: $(I18Nmsgs)
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 875001696..8deef83c2 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:30:47 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:30:08 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,7 @@ all: $(SOFILE)
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -77,7 +77,7 @@ $(DEPFILE): Makefile
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index acb1f8ecd..1af0fff85 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:31:28 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:30:55 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -63,7 +63,7 @@ all: $(SOFILE) i18n
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -84,15 +84,15 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	@echo MO $@
-	@msgfmt -c -o $@ $<
+	$(Q)msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
 	@echo GT $@
-	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	@echo PO $@
-	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@@ -107,7 +107,7 @@ install-i18n: $(I18Nmsgs)
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index 074df3d73..bb8fb19d7 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:31:59 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:31:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -59,7 +59,7 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -74,11 +74,11 @@ $(DEPFILE): Makefile
 
 libvdr-$(PLUGIN1).so: $(PLUGIN1).o
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN1).o -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN1).o -o $@
 
 libvdr-$(PLUGIN2).so: $(PLUGIN2).o
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
 
 install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
 	install -D libvdr-$(PLUGIN1).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index a1e05e53f..5d591fdbc 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:31:47 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:31:02 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -63,7 +63,7 @@ all: $(SOFILE) i18n
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -84,15 +84,15 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	@echo MO $@
-	@msgfmt -c -o $@ $<
+	$(Q)msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
 	@echo GT $@
-	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
 	@echo PO $@
-	@msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@@ -107,7 +107,7 @@ install-i18n: $(I18Nmsgs)
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index bf5c80b0c..a97c50905 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:30:58 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:30:32 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,7 @@ all: $(SOFILE)
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -77,7 +77,7 @@ $(DEPFILE): Makefile
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 292b8c764..ed378cd0d 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 4.1 2017/05/22 15:31:19 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:30:42 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -62,7 +62,7 @@ all: $(SOFILE)
 
 %.o: %.c
 	@echo CC $@
-	@$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
@@ -77,7 +77,7 @@ $(DEPFILE): Makefile
 
 $(SOFILE): $(OBJS)
 	@echo LD $@
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/channels.c b/channels.c
index 24fec5be2..1b9aa86fd 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 4.3 2015/09/09 10:21:22 kls Exp $
+ * $Id: channels.c 4.4 2017/05/26 15:43:54 kls Exp $
  */
 
 #include "channels.h"
@@ -833,7 +833,7 @@ int cChannels::maxChannelNameLength = 0;
 int cChannels::maxShortChannelNameLength = 0;
 
 cChannels::cChannels(void)
-:cConfig<cChannel>("Channels")
+:cConfig<cChannel>("2 Channels")
 {
   modifiedByUser = 0;
 }
diff --git a/config.h b/config.h
index c67b990d1..1b6e996ec 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.9 2017/04/29 13:33:13 kls Exp $
+ * $Id: config.h 4.10 2017/05/28 12:42:49 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.5"
-#define VDRVERSNUM   20305  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.6"
+#define VDRVERSNUM   20306  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.5"
-#define APIVERSNUM   20305  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.6"
+#define APIVERSNUM   20306  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 7c1c74b1a..3c6769224 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.22 2017/05/18 09:27:55 kls Exp $
+ * $Id: device.c 4.23 2017/05/30 11:06:11 kls Exp $
  */
 
 #include "device.h"
@@ -834,7 +834,7 @@ bool cDevice::SwitchChannel(int Direction)
 
 eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
 {
-  cMutexLock MutexLock(&mutexReceiver); // to avoid a race between SVDRP CHAN and HasProgramme()
+  cMutexLock MutexLock(&mutexChannel); // to avoid a race between SVDRP CHAN and HasProgramme()
   cStatus::MsgChannelSwitch(this, 0, LiveView);
 
   if (LiveView) {
@@ -947,7 +947,7 @@ bool cDevice::HasLock(int TimeoutMs) const
 
 bool cDevice::HasProgramme(void) const
 {
-  cMutexLock MutexLock(&mutexReceiver); // to avoid a race between SVDRP CHAN and HasProgramme()
+  cMutexLock MutexLock(&mutexChannel); // to avoid a race between SVDRP CHAN and HasProgramme()
   return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
 }
 
diff --git a/device.h b/device.h
index f6aee4e9e..83e517828 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.9 2017/05/09 11:24:47 kls Exp $
+ * $Id: device.h 4.10 2017/05/30 11:06:11 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -257,6 +257,7 @@ class cDevice : public cThread {
 // Channel facilities
 
 private:
+  mutable cMutex mutexChannel;
   time_t occupiedTimeout;
 protected:
   static int currentChannel;
diff --git a/epg.c b/epg.c
index 7cbb01165..486844e5f 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 4.6 2017/05/09 12:16:36 kls Exp $
+ * $Id: epg.c 4.8 2017/05/28 13:08:09 kls Exp $
  */
 
 #include "epg.h"
@@ -1104,9 +1104,8 @@ void cSchedule::Cleanup(time_t Time)
         }
 }
 
-void cSchedule::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime) const
+void cSchedule::Dump(const cChannels *Channels, FILE *f, const char *Prefix, eDumpMode DumpMode, time_t AtTime) const
 {
-  LOCK_CHANNELS_READ;
   if (const cChannel *Channel = Channels->GetByChannelID(channelID, true)) {
      fprintf(f, "%sC %s %s\n", Prefix, *Channel->GetChannelID().ToString(), Channel->Name());
      const cEvent *p;
@@ -1225,7 +1224,7 @@ char *cSchedules::epgDataFileName = NULL;
 time_t cSchedules::lastDump = time(NULL);
 
 cSchedules::cSchedules(void)
-:cList<cSchedule>("Schedules")
+:cList<cSchedule>("5 Schedules")
 {
 }
 
@@ -1280,9 +1279,10 @@ bool cSchedules::Dump(FILE *f, const char *Prefix, eDumpMode DumpMode, time_t At
         return false;
         }
      }
+  LOCK_CHANNELS_READ;
   LOCK_SCHEDULES_READ;
   for (const cSchedule *p = Schedules->First(); p; p = Schedules->Next(p))
-      p->Dump(f, Prefix, DumpMode, AtTime);
+      p->Dump(Channels, f, Prefix, DumpMode, AtTime);
   if (sf) {
      sf->Close();
      delete sf;
diff --git a/epg.h b/epg.h
index fe536a7df..6c4220551 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 4.6 2017/05/09 12:15:14 kls Exp $
+ * $Id: epg.h 4.7 2017/05/28 12:59:20 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -185,7 +185,7 @@ class cSchedule : public cListObject  {
   const cEvent *GetFollowingEvent(void) const;
   const cEvent *GetEvent(tEventID EventID, time_t StartTime = 0) const;
   const cEvent *GetEventAround(time_t Time) const;
-  void Dump(FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0) const;
+  void Dump(const cChannels *Channels, FILE *f, const char *Prefix = "", eDumpMode DumpMode = dmAll, time_t AtTime = 0) const;
   static bool Read(FILE *f, cSchedules *Schedules);
   };
 
diff --git a/libsi/Makefile b/libsi/Makefile
index 2ae223b88..e0f9cb0e7 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 4.1 2017/05/22 15:33:20 kls Exp $
+# $Id: Makefile 4.2 2017/05/29 08:33:15 kls Exp $
 
 ### The archiver options:
 
@@ -37,7 +37,7 @@ all: libsi.a
 
 libsi.a : $(OBJS)
 	@echo AR libsi/$@
-	@$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(Q)$(AR) $(ARFLAGS) $@ $(OBJS)
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.a *.so *.tgz core* *~
diff --git a/lirc.c b/lirc.c
index 526cd6d2f..d02ae11ef 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 4.0 2013/10/29 12:32:12 kls Exp $
+ * $Id: lirc.c 4.1 2017/05/30 11:02:17 kls Exp $
  */
 
 #include "lirc.h"
@@ -20,7 +20,7 @@ cLircRemote::cLircRemote(const char *DeviceName)
 ,cThread("LIRC remote control")
 {
   addr.sun_family = AF_UNIX;
-  strcpy(addr.sun_path, DeviceName);
+  strn0cpy(addr.sun_path, DeviceName, sizeof(addr.sun_path));
   if (!Connect())
      f = -1;
   Start();
@@ -94,12 +94,12 @@ void cLircRemote::Action(void)
               }
            int Delta = ThisTime.Elapsed(); // the time between two subsequent LIRC events
            ThisTime.Set();
-           if (count == 0) {
+           if (count == 0) { // new key pressed
               if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < (uint)Setup.RcRepeatDelay)
                  continue; // skip keys coming in too fast
               if (repeat)
-                 Put(LastKeyName, false, true);
-              strcpy(LastKeyName, KeyName);
+                 Put(LastKeyName, false, true); // generated release for previous repeated key
+              strn0cpy(LastKeyName, KeyName, sizeof(LastKeyName));
               pressed = true;
               repeat = false;
               FirstTime.Set();
@@ -112,21 +112,16 @@ void cLircRemote::Action(void)
            else {
               pressed = true;
               repeat = true;
-              timeout = Delta * 10 / 9;
+              timeout = Delta * 3 / 2;
               }
            if (pressed) {
               LastTime.Set();
               Put(KeyName, repeat);
               }
            }
-        else if (pressed && repeat) { // the last one was a repeat, so let's generate a release
-           Put(LastKeyName, false, true);
-           pressed = false;
-           repeat = false;
-           *LastKeyName = 0;
-           timeout = -1;
-           }
         else {
+           if (pressed && repeat) // the last one was a repeat, so let's generate a release
+              Put(LastKeyName, false, true);
            pressed = false;
            repeat = false;
            *LastKeyName = 0;
diff --git a/menu.c b/menu.c
index 246c4df33..366390f55 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.29 2017/05/21 13:18:26 kls Exp $
+ * $Id: menu.c 4.32 2017/06/04 09:30:56 kls Exp $
  */
 
 #include "menu.h"
@@ -1550,7 +1550,7 @@ class cMenuWhatsOn : public cOsdMenu {
   static int currentChannel;
   static const cEvent *scheduleEvent;
   bool Update(void);
-  void SetHelpKeys(void);
+  void SetHelpKeys(const cChannels *Channels);
 public:
   cMenuWhatsOn(const cTimers *Timers, const cChannels *Channels, const cSchedules *Schedules, bool Now, int CurrentChannelNr);
   static int CurrentChannel(void) { return currentChannel; }
@@ -1579,7 +1579,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cTimers *Timers, const cChannels *Channels, con
       }
   currentChannel = CurrentChannelNr;
   Display();
-  SetHelpKeys();
+  SetHelpKeys(Channels);
 }
 
 bool cMenuWhatsOn::Update(void)
@@ -1595,7 +1595,7 @@ bool cMenuWhatsOn::Update(void)
   return result;
 }
 
-void cMenuWhatsOn::SetHelpKeys(void)
+void cMenuWhatsOn::SetHelpKeys(const cChannels *Channels)
 {
   cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
   canSwitch = false;
@@ -1609,7 +1609,6 @@ void cMenuWhatsOn::SetHelpKeys(void)
         NewHelpKeys |= 0x04; // "Next"
      else
         NewHelpKeys |= 0x08; // "Now"
-     LOCK_CHANNELS_READ;
      if (const cChannel *Channel = Channels->GetByChannelID(item->event->ChannelID(), true)) {
         if (Channel->Number() != cDevice::CurrentChannel()) {
            NewHelpKeys |= 0x10; // "Switch"
@@ -1651,8 +1650,8 @@ eOSState cMenuWhatsOn::Switch(void)
 eOSState cMenuWhatsOn::Record(void)
 {
   if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
-     {
        LOCK_TIMERS_WRITE;
+       LOCK_CHANNELS_READ;
        LOCK_SCHEDULES_READ;
        Timers->SetExplicitModify();
        if (item->timerMatch == tmFull) {
@@ -1675,12 +1674,11 @@ eOSState cMenuWhatsOn::Record(void)
           // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
           Timers->Del(Timer);
           }
-     }
      if (HasSubMenu())
         CloseSubMenu();
      if (Update())
         Display();
-     SetHelpKeys();
+     SetHelpKeys(Channels);
      }
   return osContinue;
 }
@@ -1715,7 +1713,8 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                             if (((cMenuScheduleItem *)item)->channel->Number() == cDevice::CurrentChannel()) {
                                SetCurrent(item);
                                Display();
-                               SetHelpKeys();
+                               LOCK_CHANNELS_READ;
+                               SetHelpKeys(Channels);
                                break;
                                }
                             }
@@ -1734,8 +1733,10 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
   else if (!HasSubMenu()) {
      if (HadSubMenu && Update())
         Display();
-     if (Key != kNone)
-        SetHelpKeys();
+     if (Key != kNone) {
+        LOCK_CHANNELS_READ;
+        SetHelpKeys(Channels);
+        }
      }
   return state;
 }
@@ -1750,7 +1751,7 @@ class cMenuSchedule : public cOsdMenu {
   bool now, next;
   bool canSwitch;
   int helpKeys;
-  void Set(const cChannel *Channel = NULL, bool Force = false);
+  void Set(const cTimers *Timers, const cChannels *Channels, const cChannel *Channel = NULL, bool Force = false);
   eOSState Number(void);
   eOSState Record(void);
   eOSState Switch(void);
@@ -1776,7 +1777,9 @@ cMenuSchedule::cMenuSchedule(void)
   helpKeys = 0;
   cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
   cMenuWhatsOn::SetCurrentChannel(cDevice::CurrentChannel());
-  Set(NULL, true);
+  LOCK_TIMERS_READ;
+  LOCK_CHANNELS_READ;
+  Set(Timers, Channels, NULL, true);
 }
 
 cMenuSchedule::~cMenuSchedule()
@@ -1784,14 +1787,12 @@ cMenuSchedule::~cMenuSchedule()
   cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared
 }
 
-void cMenuSchedule::Set(const cChannel *Channel, bool Force)
+void cMenuSchedule::Set(const cTimers *Timers, const cChannels *Channels, const cChannel *Channel, bool Force)
 {
   if (Force) {
      schedulesStateKey.Reset();
      scheduleState = -1;
      }
-  LOCK_TIMERS_READ;
-  LOCK_CHANNELS_READ;
   if (const cSchedules *Schedules = cSchedules::GetSchedulesRead(schedulesStateKey)) {
      cMenuScheduleItem *CurrentItem = (cMenuScheduleItem *)Get(Current());
      const cEvent *Event = NULL;
@@ -1941,7 +1942,9 @@ void cMenuSchedule::SetHelpKeys(void)
 eOSState cMenuSchedule::Number(void)
 {
   cMenuScheduleItem::IncSortMode();
-  Set(NULL, true);
+  LOCK_TIMERS_READ;
+  LOCK_CHANNELS_READ;
+  Set(Timers, Channels, NULL, true);
   return osContinue;
 }
 
@@ -1950,6 +1953,7 @@ eOSState cMenuSchedule::Record(void)
   if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
      {
        LOCK_TIMERS_WRITE;
+       LOCK_CHANNELS_READ;
        LOCK_SCHEDULES_READ;
        Timers->SetExplicitModify();
        if (item->timerMatch == tmFull) {
@@ -2001,8 +2005,11 @@ eOSState cMenuSchedule::Switch(void)
 
 eOSState cMenuSchedule::ProcessKey(eKeys Key)
 {
-  if (!HasSubMenu())
-     Set(); // react on any changes to the schedules list
+  if (!HasSubMenu()) {
+     LOCK_TIMERS_READ;
+     LOCK_CHANNELS_READ;
+     Set(Timers, Channels); // react on any changes to the schedules list
+     }
   bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
@@ -2041,9 +2048,10 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
        case kChanUp:
        case kChanDn|k_Repeat:
        case kChanDn: if (!HasSubMenu()) {
+                        LOCK_TIMERS_READ;
                         LOCK_CHANNELS_READ;
                         if (const cChannel *Channel = Channels->GetByNumber(cDevice::CurrentChannel()))
-                           Set(Channel, true);
+                           Set(Timers, Channels, Channel, true);
                         }
                      break;
        case kInfo:
@@ -2060,10 +2068,11 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
   else if (!HasSubMenu()) {
      now = next = false;
      if (const cEvent *ei = cMenuWhatsOn::ScheduleEvent()) {
+        LOCK_TIMERS_READ;
         LOCK_CHANNELS_READ;
         if (const cChannel *Channel = Channels->GetByChannelID(ei->ChannelID(), true)) {
            cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
-           Set(Channel, true);
+           Set(Timers, Channels, Channel, true);
            }
         }
      else if (HadSubMenu && Update())
@@ -5056,7 +5065,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
   Timers->SetModified();
   // We're going to work with an event here, so we need to prevent
   // others from modifying any EPG data:
-  LOCK_SCHEDULES_READ;
+  cStateKey SchedulesStateKey;
+  cSchedules::GetSchedulesRead(SchedulesStateKey);
 
   event = NULL;
   fileName = NULL;
@@ -5092,6 +5102,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
            cReplayControl::SetRecording(fileName);
         }
      timer = NULL;
+     SchedulesStateKey.Remove();
      return;
      }
 
@@ -5105,6 +5116,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
         if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
+        SchedulesStateKey.Remove();
         LOCK_RECORDINGS_WRITE;
         Recordings->AddByName(fileName);
         return;
@@ -5118,6 +5130,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
      Timers->Del(timer);
      timer = NULL;
      }
+  SchedulesStateKey.Remove();
 }
 
 cRecordControl::~cRecordControl()
diff --git a/newplugin b/newplugin
index 161ffdac4..2e9539380 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 4.2 2017/05/22 15:34:01 kls Exp $
+# $Id: newplugin 4.3 2017/05/29 08:55:21 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -122,7 +122,7 @@ all: \$(SOFILE) i18n
 
 %.o: %.c
 	\@echo CC \$\@
-	\@\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) -o \$\@ \$<
+	\$(Q)\$(CXX) \$(CXXFLAGS) -c \$(DEFINES) \$(INCLUDES) -o \$\@ \$<
 
 ### Dependencies:
 
@@ -143,15 +143,15 @@ I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 
 %.mo: %.po
 	\@echo MO \$\@
-	\@msgfmt -c -o \$\@ \$<
+	\$(Q)msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
 	\@echo GT \$\@
-	\@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ `ls \$^`
+	\$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-\$(PLUGIN) --package-version=\$(VERSION) --msgid-bugs-address='<see README>' -o \$\@ `ls \$^`
 
 %.po: \$(I18Npot)
 	\@echo PO \$\@
-	\@msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$<
+	\$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N \$\@ \$<
 	\@touch \$\@
 
 \$(I18Nmsgs): \$(DESTDIR)\$(LOCDIR)/%/LC_MESSAGES/vdr-\$(PLUGIN).mo: \$(PODIR)/%.mo
@@ -166,7 +166,7 @@ install-i18n: \$(I18Nmsgs)
 
 \$(SOFILE): \$(OBJS)
 	\@echo LD \$\@
-	\@\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
+	\$(Q)\$(CXX) \$(CXXFLAGS) \$(LDFLAGS) -shared \$(OBJS) -o \$\@
 
 install-lib: \$(SOFILE)
 	install -D \$^ \$(DESTDIR)\$(LIBDIR)/\$^.\$(APIVERSION)
diff --git a/recording.c b/recording.c
index 9f96b73d2..7b1d158bf 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.8 2017/04/03 13:34:30 kls Exp $
+ * $Id: recording.c 4.9 2017/05/27 15:46:57 kls Exp $
  */
 
 #include "recording.h"
@@ -1469,7 +1469,7 @@ cVideoDirectoryScannerThread *cRecordings::videoDirectoryScannerThread = NULL;
 time_t cRecordings::lastUpdate = 0;
 
 cRecordings::cRecordings(bool Deleted)
-:cList<cRecording>(Deleted ? "DelRecs" : "Recordings")
+:cList<cRecording>(Deleted ? "4 DelRecs" : "3 Recordings")
 {
 }
 
diff --git a/svdrp.c b/svdrp.c
index f402c21a1..2b63c8018 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.18 2017/05/18 15:51:24 kls Exp $
+ * $Id: svdrp.c 4.20 2017/05/31 14:02:17 kls Exp $
  */
 
 #include "svdrp.h"
@@ -385,7 +385,8 @@ void cSVDRPClient::Close(void)
      file.Close();
      socket.Close();
      LOCK_TIMERS_WRITE;
-     Timers->DelRemoteTimers(serverName);
+     if (Timers)
+        Timers->DelRemoteTimers(serverName);
      }
 }
 
@@ -463,6 +464,7 @@ bool cSVDRPClient::Process(cStringList *Response)
             else if (r <= 0) {
                isyslog("SVDRP < %s lost connection to remote server '%s'", ipAddress.Connection(), *serverName);
                Close();
+               return false;
                }
             }
          else if (!Response)
@@ -1615,6 +1617,7 @@ void cSVDRPServer::CmdLSTC(const char *Option)
 
 void cSVDRPServer::CmdLSTE(const char *Option)
 {
+  LOCK_CHANNELS_READ;
   LOCK_SCHEDULES_READ;
   const cSchedule* Schedule = NULL;
   eDumpMode DumpMode = dmAll;
@@ -1646,7 +1649,6 @@ void cSVDRPServer::CmdLSTE(const char *Option)
                  }
               }
            else if (!Schedule) {
-              LOCK_CHANNELS_READ;
               const cChannel* Channel = NULL;
               if (isnumber(p))
                  Channel = Channels->GetByNumber(strtol(Option, NULL, 10));
@@ -1676,7 +1678,7 @@ void cSVDRPServer::CmdLSTE(const char *Option)
      FILE *f = fdopen(fd, "w");
      if (f) {
         if (Schedule)
-           Schedule->Dump(f, "215-", DumpMode, AtTime);
+           Schedule->Dump(Channels, f, "215-", DumpMode, AtTime);
         else
            Schedules->Dump(f, "215-", DumpMode, AtTime);
         fflush(f);
diff --git a/thread.c b/thread.c
index 47eb97756..345f2af4c 100644
--- a/thread.c
+++ b/thread.c
@@ -4,26 +4,31 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 4.2 2016/12/08 09:45:25 kls Exp $
+ * $Id: thread.c 4.4 2017/06/03 12:43:22 kls Exp $
  */
 
 #include "thread.h"
+#include <cxxabi.h>
+#include <dlfcn.h>
 #include <errno.h>
+#include <execinfo.h>
 #include <linux/unistd.h>
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <sys/prctl.h>
 #include <sys/resource.h>
 #include <sys/syscall.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-#include <sys/prctl.h>
 #include <unistd.h>
 #include "tools.h"
 
-#define ABORT { dsyslog("ABORT!"); abort(); } // use debugger to trace back the problem
+#define ABORT { dsyslog("ABORT!"); cBackTrace::BackTrace(); abort(); }
 
-//#define DEBUG_LOCKING // uncomment this line to activate debug output for locking
+//#define DEBUG_LOCKING  // uncomment this line to activate debug output for locking
+#define DEBUG_LOCKSEQ  // uncomment this line to activate debug output for invalid locking sequence
+//#define DEBUG_LOCKCALL // uncomment this line to activate caller information with DEBUG_LOCKSEQ (WARNING: expensive operation, use only when actually debugging the locking sequence!)
 
 #ifdef DEBUG_LOCKING
 #define dbglocking(a...) fprintf(stderr, a)
@@ -429,6 +434,249 @@ bool cThreadLock::Lock(cThread *Thread)
   return false;
 }
 
+// --- cBackTrace ------------------------------------------------------------
+
+#define BT_BUF_SIZE 100
+
+cString cBackTrace::Demangle(char *s)
+{
+  char *Module = s;
+  char *Function = NULL;
+  char *Offset = NULL;
+  char *Address = NULL;
+  // separate the string:
+  for (char *q = Module; *q; q++) {
+      if (*q == '(') {
+         *q = 0;
+         Function = q + 1;
+         }
+      else if (*q == '+') {
+         *q = 0;
+         Offset = q + 1;
+         }
+      else if (*q == ')')
+         *q = 0;
+      else if (*q == '[')
+         Address = q + 1;
+      else if (*q == ']') {
+         *q = 0;
+         break;
+         }
+      }
+  // demangle the function name:
+  char *DemangledFunction = NULL;
+  if (Function) {
+     int status;
+     DemangledFunction = abi::__cxa_demangle(Function, NULL, 0, &status);
+     if (DemangledFunction)
+        Function = DemangledFunction;
+     if (!*Function)
+        Function = NULL;
+     }
+  cString d = cString::sprintf("%s%s%s", Module, Function ? " " : "", Function ? Function : "");
+  // convert string address to numbers:
+  unsigned long long addr = Address ? strtoull(Address, NULL, 0) : 0;
+  unsigned long long offs = Offset ? strtoull(Offset, NULL, 0) : 0;
+  // for shared libraries we need get the offset inside the library:
+  if (Function) {
+     // check whether the module name ends with ".so*":
+     char *e = Module;
+     char *p = NULL;
+     while (e = strstr(e, ".so"))
+           p = e++;
+     if (p && !strchr(p, '/')) {
+        Dl_info dlinfo;
+        if (dladdr(reinterpret_cast<void*>(addr), &dlinfo)) {
+           if ((strcmp(Module, dlinfo.dli_fname) == 0) && dlinfo.dli_fbase) {
+              unsigned long long base = reinterpret_cast<unsigned long long>(dlinfo.dli_fbase);
+              addr -= base;
+              addr &= 0x0FFFFFFFF; // to make it work on both 32 and 64 bit systems
+              }
+           }
+        }
+     }
+  // determine the file name and line number:
+  cString cmd = cString::sprintf("addr2line --functions --demangle --inlines --basename --exe=%s 0x%llx", Module, Function ? addr : offs);
+  cPipe p;
+  if (p.Open(cmd, "r")) {
+     int n = 0;
+     cReadLine rl;
+     while (char *l = rl.Read(p)) {
+           if (n == 0) {
+              if (Function && strcmp(l, Function))
+                 d = cString::sprintf("%s calling %s", *d, l);
+              }
+           else
+              d = cString::sprintf("%s at %s", *d, l);
+           n++;
+           }
+     p.Close();
+     }
+  free(DemangledFunction);
+  return d;
+}
+
+void cBackTrace::BackTrace(cStringList &StringList, int Level, bool Mangled)
+{
+  void *b[BT_BUF_SIZE];
+  int n = backtrace(b, BT_BUF_SIZE);
+  if (char **s = backtrace_symbols(b, n)) {
+     for (int i = max(Level, 0) + 1; i < n; i++) // 1 is the call to this function itself
+         StringList.Append(strdup(Mangled ? s[i] : *Demangle(s[i])));
+     free(s);
+     }
+}
+
+void cBackTrace::BackTrace(FILE *f, int Level, bool Mangled)
+{
+  cStringList sl;
+  BackTrace(sl, Level + 1, Mangled); // 1 is the call to this function itself
+  for (int i = 0; i < sl.Size(); i++) {
+      if (f)
+         fprintf(f, "%s\n", sl[i]);
+      else
+         dsyslog("%s", sl[i]);
+      }
+}
+
+cString cBackTrace::GetCaller(int Level, bool Mangled)
+{
+  cString Caller;
+  Level = max(Level, 0) + 1; // 1 is the call to this function itself
+  void *b[BT_BUF_SIZE];
+  int n = backtrace(b, BT_BUF_SIZE);
+  if (char **s = backtrace_symbols(b, n)) {
+     if (Level < n)
+        Caller = Mangled ? s[Level] : *Demangle(s[Level]);
+     free(s);
+     }
+  return Caller;
+}
+
+// --- cStateLockLog ---------------------------------------------------------
+
+#ifdef DEBUG_LOCKSEQ
+#define SLL_SIZE     20 // the number of log entries
+#define SLL_LENGTH  256 // the maximum length of log entries
+#define SLL_MAX_LIST  9 // max. number of lists to log
+#define SLL_WRITE_FLAG 0x80000000
+
+class cStateLockLog {
+private:
+  cMutex mutex;
+  cVector<tThreadId> threadIds;
+  cVector<int> flags;
+  tThreadId logThreadIds[SLL_SIZE];
+  int logFlags[SLL_SIZE];
+  char logCaller[SLL_SIZE][SLL_LENGTH];
+  int logIndex;
+  bool dumped;
+  void Dump(const char *Name, tThreadId ThreadId);
+public:
+  cStateLockLog(void);
+  void Check(const char *Name, bool Lock, bool Write = false);
+  };
+
+cStateLockLog::cStateLockLog(void)
+{
+  memset(logThreadIds, 0, sizeof(logThreadIds));
+  memset(logFlags, 0, sizeof(logFlags));
+  memset(logCaller, 0, sizeof(logCaller));
+  logIndex = 0;
+  dumped = false;
+}
+
+void cStateLockLog::Dump(const char *Name, tThreadId ThreadId)
+{
+  dsyslog("--- begin invalid lock sequence report");
+  int LastFlags = 0;
+  for (int i = 0; i < SLL_SIZE; i++) {
+      if (tThreadId tid = logThreadIds[logIndex]) {
+         char msg[SLL_LENGTH];
+         char *q = msg;
+         q += sprintf(q, "%5d", tid);
+         int Flags = logFlags[logIndex];
+         bool Write = Flags & SLL_WRITE_FLAG;
+         Flags &= ~SLL_WRITE_FLAG;
+         int Changed = LastFlags ^ Flags;
+         LastFlags = Flags;
+         bool Lock = (Flags & Changed) != 0;
+         for (int i = 0; i <= SLL_MAX_LIST; i++) {
+             char c = '-';
+             int b = 1 << i;
+             if ((Flags & b) != 0)
+                c = '*';
+             if ((Changed & b) != 0)
+                c = Lock ? Write ? 'W' : 'R' : '-';
+             q += sprintf(q, "  %c", c);
+             }
+         q += sprintf(q, "  %c", Lock ? 'L' : 'U');
+         if (*logCaller[logIndex]) {
+            *q++ = ' ';
+            strn0cpy(q, *cBackTrace::Demangle(logCaller[logIndex]), sizeof(msg) - (q - msg));
+            }
+         dsyslog("%s", msg);
+         }
+      if (++logIndex >= SLL_SIZE)
+         logIndex = 0;
+      }
+  dsyslog("%5d invalid lock sequence: %s", ThreadId, Name);
+  dsyslog("full backtrace:");
+  cBackTrace::BackTrace(NULL, 2);
+  dsyslog("--- end invalid lock sequence report");
+  fprintf(stderr, "invalid lock sequence at %s\n", *DayDateTime(time(NULL)));
+}
+
+void cStateLockLog::Check(const char *Name, bool Lock, bool Write)
+{
+  if (!dumped && Name) {
+     int n = *Name - '0';
+     if (1 <= n && n <= SLL_MAX_LIST) {
+        int b = 1 << (n - 1);
+        cMutexLock MutexLock(&mutex);
+        tThreadId ThreadId = cThread::ThreadId();
+        int Index = threadIds.IndexOf(ThreadId);
+        if (Index < 0) {
+           if (Lock) {
+              Index = threadIds.Size();
+              threadIds.Append(ThreadId);
+              flags.Append(0);
+              }
+           else
+              return;
+           }
+        bool DoDump = false;
+        if (Lock) {
+           if ((flags[Index] & ~b) < b) // thread holds only "smaller" locks -> OK
+              ;
+           else if ((flags[Index] & b) == 0) // thread already holds "bigger" locks, so it may only re-lock one that it already has!
+              DoDump = true;
+           flags[Index] |= b;
+           }
+        else
+           flags[Index] &= ~b;
+        logThreadIds[logIndex] = ThreadId;
+        logFlags[logIndex] = flags[Index] | (Write ? SLL_WRITE_FLAG : 0);
+#ifdef DEBUG_LOCKCALL
+        strn0cpy(logCaller[logIndex], cBackTrace::GetCaller(Lock ? 5 : 3, true), SLL_LENGTH);
+#endif
+        if (++logIndex >= SLL_SIZE)
+           logIndex = 0;
+        if (DoDump) {
+           Dump(Name, ThreadId);
+           dumped = true;
+           }
+        }
+     }
+}
+
+static cStateLockLog StateLockLog;
+
+#define dbglockseq(n, l, w) StateLockLog.Check(n, l, w)
+#else
+#define dbglockseq(n, l, w)
+#endif // DEBUG_LOCKSEQ
+
 // --- cStateLock ------------------------------------------------------------
 
 cStateLock::cStateLock(const char *Name)
@@ -442,7 +690,7 @@ cStateLock::cStateLock(const char *Name)
 
 bool cStateLock::Lock(cStateKey &StateKey, bool Write, int TimeoutMs)
 {
-  dbglocking("%5d %-10s %10p   lock state = %d/%d write = %d timeout = %d\n", cThread::ThreadId(), name, &StateKey, state, StateKey.state, Write, TimeoutMs);
+  dbglocking("%5d %-12s %10p   lock state = %d/%d write = %d timeout = %d\n", cThread::ThreadId(), name, &StateKey, state, StateKey.state, Write, TimeoutMs);
   StateKey.timedOut = false;
   if (StateKey.stateLock) {
      esyslog("ERROR: StateKey already in use in call to cStateLock::Lock() (tid=%d, lock=%s)", StateKey.stateLock->threadId, name);
@@ -450,25 +698,27 @@ bool cStateLock::Lock(cStateKey &StateKey, bool Write, int TimeoutMs)
      return false;
      }
   if (rwLock.Lock(Write, TimeoutMs)) {
+     dbglockseq(name, true, Write);
      StateKey.stateLock = this;
      if (Write) {
-        dbglocking("%5d %-10s %10p   locked write\n", cThread::ThreadId(), name, &StateKey);
+        dbglocking("%5d %-12s %10p   locked write\n", cThread::ThreadId(), name, &StateKey);
         threadId = cThread::ThreadId();
         StateKey.write = true;
         return true;
         }
      else if (state != StateKey.state) {
-        dbglocking("%5d %-10s %10p   locked read\n", cThread::ThreadId(), name, &StateKey);
+        dbglocking("%5d %-12s %10p   locked read\n", cThread::ThreadId(), name, &StateKey);
         return true;
         }
      else {
-        dbglocking("%5d %-10s %10p   state unchanged\n", cThread::ThreadId(), name, &StateKey);
+        dbglocking("%5d %-12s %10p   state unchanged\n", cThread::ThreadId(), name, &StateKey);
         StateKey.stateLock = NULL;
+        dbglockseq(name, false, false);
         rwLock.Unlock();
         }
      }
   else if (TimeoutMs) {
-     dbglocking("%5d %-10s %10p   timeout\n", cThread::ThreadId(), name, &StateKey);
+     dbglocking("%5d %-12s %10p   timeout\n", cThread::ThreadId(), name, &StateKey);
      StateKey.timedOut = true;
      }
   return false;
@@ -476,7 +726,7 @@ bool cStateLock::Lock(cStateKey &StateKey, bool Write, int TimeoutMs)
 
 void cStateLock::Unlock(cStateKey &StateKey, bool IncState)
 {
-  dbglocking("%5d %-10s %10p unlock state = %d/%d inc = %d\n", cThread::ThreadId(), name, &StateKey, state, StateKey.state, IncState);
+  dbglocking("%5d %-12s %10p unlock state = %d/%d inc = %d\n", cThread::ThreadId(), name, &StateKey, state, StateKey.state, IncState);
   if (StateKey.stateLock != this) {
      esyslog("ERROR: cStateLock::Unlock() called with an unused key (tid=%d, lock=%s)", threadId, name);
      ABORT;
@@ -495,6 +745,7 @@ void cStateLock::Unlock(cStateKey &StateKey, bool IncState)
      threadId = 0;
      explicitModify = false;
      }
+  dbglockseq(name, false, false);
   rwLock.Unlock();
 }
 
diff --git a/thread.h b/thread.h
index 8cca55c0c..33f90c734 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 4.2 2016/12/08 09:11:24 kls Exp $
+ * $Id: thread.h 4.3 2017/05/31 11:39:11 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -291,6 +291,37 @@ class cPipe {
   int Close(void);
   };
 
+// cBackTrace can be used for debugging.
+
+class cStringList;
+class cString;
+
+class cBackTrace {
+public:
+  static cString Demangle(char *s);
+         ///< Demangles the function name in the given string and returns the converted
+         ///< version of s. s must be one of the strings returned by a call to
+         ///< BackTrace() or GetCaller().
+         ///< Note that this function works on the given string by inserting '\0'
+         ///< characters to separate the individual parts. Therefore the string
+         ///< will be modified upon return.
+  static void BackTrace(cStringList &StringList, int Level = 0, bool Mangled = false);
+         ///< Produces a backtrace and stores it in the given StringList.
+         ///< If Level is given, only calls up to the given value are listed.
+         ///< If Mangled is true, the raw backtrace will be returned and you can use
+         ///< Demangle() to make the function names readable.
+  static void BackTrace(FILE *f = NULL, int Level = 0, bool Mangled = false);
+         ///< Produces a backtrace beginning at the given Level, and
+         ///< writes it to the given file. If no file is given, the backtrace is
+         ///< written to the logfile. If Mangled is true, the raw backtrace will
+         ///< be printed/logged.
+  static cString GetCaller(int Level = 0, bool Mangled = false);
+         ///< Returns the caller at the given Level (or the immediate caller,
+         ///< if Level is 0).
+         ///< If Mangled is true, the raw backtrace will be returned and you can use
+         ///< Demangle() to make the function name readable.
+  };
+
 // SystemExec() implements a 'system()' call that closes all unnecessary file
 // descriptors in the child process.
 // With Detached=true, calls command in background and in a separate session,
diff --git a/timers.c b/timers.c
index 4cf8fb7fe..95cb723bd 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.9 2017/04/20 09:15:06 kls Exp $
+ * $Id: timers.c 4.10 2017/05/26 15:43:38 kls Exp $
  */
 
 #include "timers.h"
@@ -714,7 +714,7 @@ cTimers cTimers::timers;
 int cTimers::lastTimerId = 0;
 
 cTimers::cTimers(void)
-:cConfig<cTimer>("Timers")
+:cConfig<cTimer>("1 Timers")
 {
   lastDeleteExpired = 0;
 }
diff --git a/vdr.c b/vdr.c
index 41dbc8f46..4b4246832 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.14 2017/05/21 12:31:37 kls Exp $
+ * $Id: vdr.c 4.16 2017/05/29 11:30:27 kls Exp $
  */
 
 #include <getopt.h>
@@ -1274,8 +1274,10 @@ int main(int argc, char *argv[])
           case kChanUp:
           case kChanDn|k_Repeat:
           case kChanDn:
-               if (!Interact)
+               if (!Interact) {
                   Menu = new cDisplayChannel(NORMALKEY(key));
+                  continue;
+                  }
                else if (cDisplayChannel::IsOpen() || cControl::Control()) {
                   Interact->ProcessKey(key);
                   continue;
@@ -1585,6 +1587,7 @@ int main(int argc, char *argv[])
   cVideoDirectory::Destroy();
   EpgHandlers.Clear();
   cSchedules::Cleanup(true);
+  CiResourceHandlers.Clear();
   ListGarbageCollector.Purge(true);
   PluginManager.Shutdown(true);
   ReportEpgBugFixStats(true);

From eb83af06acaa94f2c49d33d744cffa0ddf6a4385 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 11 Jun 2017 13:31:20 +0000
Subject: [PATCH 249/307] Version 2.3.7

VDR developer version 2.3.7 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.7.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.6-2.3.7.diff

MD5 checksums:

0df2c8b40c89d142c698200ac3dcb14a  vdr-2.3.7.tar.bz2
fbe211e46b12a2fcf2f19054d3ce62cf  vdr-2.3.6-2.3.7.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

The changes since version 2.3.6:

- Fixed false positives when checking the locking sequence, in case of nested locks
   within the same thread.
- Fixed uninitialized variable SdWatchdog in vdr.c (reported by Frank Neumann).
- Fixed the locking sequence when starting an instant recording.
- Fixed L(ock) and U(nlock) indicators in cStateLockLog.
- Increased SLL_LENGTH in thread.c to better handle long caller lines, and enclosed
   logCaller with DEBUG_LOCKCALL to preserve memory in normal operation.
- Fixed a typo in CAMMENURETYTIMEOUT and added logging CAM enquiries.
- The new configuration file 'camresponses.conf' can be used to define automatic
   responses to CAM menus, for instance to avoid annyoing popup messages or entering
   the parental rating PIN. See vdr.5 for details.
- The option "Setup/Miscellaneous/Show channel names with source" can now be set to
   "type" or "full" to show either the type or the full name of the source (thanks to
   Martin Wache).
- The "Channels" menu now indicates whether a channel is encrypted ('X') or a radio
   channel ('R') (thanks to Martin Wache).
- Changed ##Lock to ##_Lock in the DEF_LIST_LOCK and USE_LIST_LOCK macros defined
   in tools.h, so that there is no cSchedulesLock any more. The epgsearch plugin still
   had an abandoned member of class cSchedulesLock, which, as a side effect, caused an
   invalid lock sequence to be flagged (reported by Johann Friedrichs). In order to
   have the compiler report such things, these macros have been changed.
- Introduced the new macro DISABLE_TEMPLATES_COLLIDING_WITH_STL, which can be defined
   before including tools.h in case some plugin needs to use the STL and gets error
   messages regarding one of the template functions defined in tools.h.
---
 CONTRIBUTORS      |   7 ++
 HISTORY           |  27 +++++++
 MANUAL            |   7 +-
 camresponses.conf |  29 +++++++
 channels.c        |  18 +++--
 channels.h        |   3 +-
 ci.c              | 190 +++++++++++++++++++++++++++++++++++++++++++---
 ci.h              |   4 +-
 config.h          |  10 +--
 menu.c            |  29 ++++---
 po/ar.po          |   8 +-
 po/ca_ES.po       |   8 +-
 po/cs_CZ.po       |   8 +-
 po/da_DK.po       |   8 +-
 po/de_DE.po       |   8 +-
 po/el_GR.po       |   8 +-
 po/es_ES.po       |   8 +-
 po/et_EE.po       |   8 +-
 po/fi_FI.po       |   8 +-
 po/fr_FR.po       |   8 +-
 po/hr_HR.po       |   8 +-
 po/hu_HU.po       |   8 +-
 po/it_IT.po       |   8 +-
 po/lt_LT.po       |   8 +-
 po/mk_MK.po       |   8 +-
 po/nl_NL.po       |   8 +-
 po/nn_NO.po       |   8 +-
 po/pl_PL.po       |   8 +-
 po/pt_PT.po       |   8 +-
 po/ro_RO.po       |   8 +-
 po/ru_RU.po       |   8 +-
 po/sk_SK.po       |   8 +-
 po/sl_SI.po       |   8 +-
 po/sr_RS.po       |   8 +-
 po/sv_SE.po       |   8 +-
 po/tr_TR.po       |   8 +-
 po/uk_UA.po       |   8 +-
 po/zh_CN.po       |   8 +-
 thread.c          |  32 +++++---
 tools.h           |  27 ++++---
 vdr.5             |  41 +++++++++-
 vdr.c             |   5 +-
 42 files changed, 565 insertions(+), 88 deletions(-)
 create mode 100644 camresponses.conf

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6e228afe4..27b0bbbbc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2115,6 +2115,10 @@ Martin Wache <M.Wache@gmx.net>
  device, which avoids a busy loop on very fast machines
  for fixing a possible crash when loading an invalid XPM file
  for suggesting to speed up anti-aliased font rendering by caching the blend indexes
+ for extending the option "Setup/Miscellaneous/Show channel names with source" to
+ "type" or "full"
+ for making the "Channels" menu indicates whether a channel is encrypted or a radio
+ channel
 
 Matthias Lenk <matthias.lenk@amd.com>
  for reporting an out-of-bounds memory access with audio language ids
@@ -2831,6 +2835,8 @@ Johann Friedrichs <johann.friedrichs@web.de>
  respective recording did not exist
  for fixing a double deletion of a cTimer in case HandleRemoteModifications() returned
  false
+ for reporting an invalid lock sequence in the epgsearch plugin, which turned out to
+ be an abandoned member of class cSchedulesLock
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -3030,6 +3036,7 @@ Frank Neumann <fnu@yavdr.org>
  is currently assigned to
  for reporting a problem with the default return value of cEpgHandler::BeginSegmentTransfer()
  in derived classes that don't implement this function
+ for reporting uninitialized variable SdWatchdog in vdr.c
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
diff --git a/HISTORY b/HISTORY
index 32876ee35..45b72215d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9102,3 +9102,30 @@ Video Disk Recorder Revision History
 - Fixed the locking sequence when creating a new timer from the Schedules menu.
 - Fixed the locking sequence when switching between 'Now', 'Next' and 'Schedule'
   in the Schedules menu.
+
+2017-06-11: Version 2.3.7
+
+- Fixed false positives when checking the locking sequence, in case of nested locks
+  within the same thread.
+- Fixed uninitialized variable SdWatchdog in vdr.c (reported by Frank Neumann).
+- Fixed the locking sequence when starting an instant recording.
+- Fixed L(ock) and U(nlock) indicators in cStateLockLog.
+- Increased SLL_LENGTH in thread.c to better handle long caller lines, and enclosed
+  logCaller with DEBUG_LOCKCALL to preserve memory in normal operation.
+- Fixed a typo in CAMMENURETYTIMEOUT and added logging CAM enquiries.
+- The new configuration file 'camresponses.conf' can be used to define automatic
+  responses to CAM menus, for instance to avoid annyoing popup messages or entering
+  the parental rating PIN. See vdr.5 for details.
+- The option "Setup/Miscellaneous/Show channel names with source" can now be set to
+  "type" or "full" to show either the type or the full name of the source (thanks to
+  Martin Wache).
+- The "Channels" menu now indicates whether a channel is encrypted ('X') or a radio
+  channel ('R') (thanks to Martin Wache).
+- Changed ##Lock to ##_Lock in the DEF_LIST_LOCK and USE_LIST_LOCK macros defined
+  in tools.h, so that there is no cSchedulesLock any more. The epgsearch plugin still
+  had an abandoned member of class cSchedulesLock, which, as a side effect, caused an
+  invalid lock sequence to be flagged (reported by Johann Friedrichs). In order to
+  have the compiler report such things, these macros have been changed.
+- Introduced the new macro DISABLE_TEMPLATES_COLLIDING_WITH_STL, which can be defined
+  before including tools.h in case some plugin needs to use the STL and gets error
+  messages regarding one of the template functions defined in tools.h.
diff --git a/MANUAL b/MANUAL
index 4db491b5e..0234f77b7 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1143,10 +1143,11 @@ Version 2.2
                          wrap around the beginning or end of the channel list if
                          this parameter is set to 'yes'.
 
-  Show channel names with source = no
+  Show channel names with source = off
                          If this option is turned on, channel names will be displayed
-                         with the source appended to them, as in "ZDF (S)", where
-                         'S' stands for "Satellite".
+                         with the source appended to them, as in "ZDF (S)" (if the
+                         option is set to "type), or "ZDF (S19.2E)" (if it is set to
+                         "full"), where 'S' stands for "Satellite".
 
   Emergency exit = yes   If, for some reason, a recording fails because the video
                          data stream is broken, or the CAM doesn't decrypt etc.,
diff --git a/camresponses.conf b/camresponses.conf
new file mode 100644
index 000000000..f3cc56dff
--- /dev/null
+++ b/camresponses.conf
@@ -0,0 +1,29 @@
+# CAM responses for VDR
+#
+# Format:
+#
+# nr text action
+#
+# nr:        the number of the CAM this action applies to (0 = all CAMs)
+# text:      the text in the CAM menu to react on (must be quoted with '"' if it contains
+#            blanks, escape '"' with '\')
+# action:    the action to take if the given text is encountered
+#
+# Possible actions are:
+#
+# - DISCARD:  simply discard the menu (equivalent to pressing 'Back' on the RC)
+# - CONFIRM:  confirm the menu (equivalent to pressing 'OK' without selecting a
+#             particular item)
+# - SELECT:   select the menu item containing the text (equivalent to positioning
+#             the cursor on the item and pressing 'OK')
+# - <number>: the given number is sent to the CAM as if it were typed in by the user
+#             (provided this is an input field).
+#
+# Note that the text given in a rule must match exactly, including any leading or
+# trailing blanks. If in doubt, you can get the exact text from the log file.
+# Action keywords are case insensitive.
+#
+# Examples:
+
+# * "Hello! This is your annoying \"nag\" message!" DISCARD
+# 3 "Please enter your PIN" 1234
diff --git a/channels.c b/channels.c
index 1b9aa86fd..2716b5954 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 4.4 2017/05/26 15:43:54 kls Exp $
+ * $Id: channels.c 4.5 2017/06/10 15:08:56 kls Exp $
  */
 
 #include "channels.h"
@@ -98,6 +98,7 @@ cChannel& cChannel::operator= (const cChannel &Channel)
   portalName = strcpyrealloc(portalName, Channel.portalName);
   memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
   nameSource = NULL; // these will be recalculated automatically
+  nameSourceMode = 0;
   shortNameSource = NULL;
   parameters = Channel.parameters;
   return *this;
@@ -106,8 +107,12 @@ cChannel& cChannel::operator= (const cChannel &Channel)
 const char *cChannel::Name(void) const
 {
   if (Setup.ShowChannelNamesWithSource && !groupSep) {
-     if (isempty(nameSource))
-        nameSource = cString::sprintf("%s (%c)", name, cSource::ToChar(source));
+     if (isempty(nameSource) || nameSourceMode != Setup.ShowChannelNamesWithSource) {
+        if (Setup.ShowChannelNamesWithSource == 1)
+           nameSource = cString::sprintf("%s (%c)", name, cSource::ToChar(source));
+        else
+           nameSource = cString::sprintf("%s (%s)", name, *cSource::ToString(source));
+        }
      return nameSource;
      }
   return name;
@@ -194,6 +199,7 @@ bool cChannel::SetTransponderData(int Source, int Frequency, int Srate, const ch
      parameters = Parameters;
      schedule = NULL;
      nameSource = NULL;
+     nameSourceMode = 0;
      shortNameSource = NULL;
      if (Number() && !Quiet) {
         dsyslog("changing transponder data of channel %d (%s) from %s to %s", Number(), name, *OldTransponderData, *TransponderDataToString());
@@ -262,6 +268,7 @@ bool cChannel::SetName(const char *Name, const char *ShortName, const char *Prov
         if (nn) {
            name = strcpyrealloc(name, Name);
            nameSource = NULL;
+           nameSourceMode = 0;
            }
         if (ns) {
            shortName = strcpyrealloc(shortName, ShortName);
@@ -792,6 +799,7 @@ bool cChannel::Parse(const char *s)
         free(caidbuf);
         free(namebuf);
         nameSource = NULL;
+        nameSourceMode = 0;
         shortNameSource = NULL;
         if (!GetChannelID().Valid()) {
            esyslog("ERROR: channel data results in invalid ID!");
@@ -1093,8 +1101,8 @@ bool cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
   bool ChannelsModified = false;
   for (cChannel *Channel = First(); Channel; Channel = Next(Channel)) {
       if (time(NULL) - Channel->Seen() > CHANNELTIMEOBSOLETE && Channel->Source() == Source && Channel->Nid() == Nid && Channel->Tid() == Tid && Channel->Rid() == 0) {
-         bool OldShowChannelNamesWithSource = Setup.ShowChannelNamesWithSource;
-         Setup.ShowChannelNamesWithSource = false;
+         int OldShowChannelNamesWithSource = Setup.ShowChannelNamesWithSource;
+         Setup.ShowChannelNamesWithSource = 0;
          if (!endswith(Channel->Name(), CHANNELMARKOBSOLETE))
             ChannelsModified |= Channel->SetName(cString::sprintf("%s %s", Channel->Name(), CHANNELMARKOBSOLETE), Channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, Channel->Provider()));
          Setup.ShowChannelNamesWithSource = OldShowChannelNamesWithSource;
diff --git a/channels.h b/channels.h
index 478b3d640..1543f95b3 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 4.2 2015/08/17 09:39:48 kls Exp $
+ * $Id: channels.h 4.3 2017/06/10 15:06:40 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -123,6 +123,7 @@ class cChannel : public cListObject {
   bool groupSep;
   int __EndData__;
   mutable cString nameSource;
+  mutable int nameSourceMode;
   mutable cString shortNameSource;
   cString parameters;
   mutable int modification;
diff --git a/ci.c b/ci.c
index 553245352..edb801bc2 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.16 2017/05/18 09:05:46 kls Exp $
+ * $Id: ci.c 4.17 2017/06/10 10:57:31 kls Exp $
  */
 
 #include "ci.h"
@@ -78,17 +78,18 @@ static char *CopyString(int Length, const uint8_t *Data)
 ///< Copies the string at Data.
 ///< Returns a pointer to a newly allocated string.
 {
-  // Some CAMs send funny characters at the beginning of strings.
-  // Let's just skip them:
-  while (Length > 0 && (*Data == ' ' || *Data == 0x05 || *Data == 0x96 || *Data == 0x97)) {
+  char *s = MALLOC(char, Length + 1);
+  char *p = s;
+  while (Length > 0) {
+        char c = *Data;
+        if (isprint(c)) // some CAMs send funny characters in their strings, let's just skip them
+           *p++ = c;
+        else if (c == 0x8A) // the character 0x8A is used as newline, so let's put a real '\n' in there
+           *p++ = '\n';
         Length--;
         Data++;
         }
-  char *s = MALLOC(char, Length + 1);
-  strncpy(s, (char *)Data, Length);
-  s[Length] = 0;
-  // The character 0x8A is used as newline, so let's put a real '\n' in there:
-  strreplace(s, 0x8A, '\n');
+  *p = 0;
   return s;
 }
 
@@ -290,6 +291,137 @@ void cCaActivationReceiver::Receive(const uchar *Data, int Length)
      }
 }
 
+// --- cCamResponse ----------------------------------------------------------
+
+// CAM Response Actions:
+
+#define CRA_NONE      0
+#define CRA_DISCARD  -1
+#define CRA_CONFIRM  -2
+#define CRA_SELECT   -3
+
+class cCamResponse : public cListObject {
+private:
+  int camNumber;
+  char *text;
+  int action;
+public:
+  cCamResponse(void);
+  ~cCamResponse();
+  bool Parse(const char *s);
+  int Matches(int CamNumber, const char *Text) const;
+  };
+
+cCamResponse::cCamResponse(void)
+{
+  camNumber = -1;
+  text = NULL;
+  action = CRA_NONE;
+}
+
+cCamResponse::~cCamResponse()
+{
+  free(text);
+}
+
+bool cCamResponse::Parse(const char *s)
+{
+  // Number:
+  s = skipspace(s);
+  if (*s == '*') {
+     camNumber = 0; // all CAMs
+     s++;
+     }
+  else {
+     char *e;
+     camNumber = strtol(s, &e, 10);
+     if (e == s || camNumber <= 0)
+        return false;
+     s = e;
+     }
+  // Text:
+  s = skipspace(s);
+  char *t = const_cast<char *>(s); // might have to modify it
+  char *q = NULL; // holds a copy in case of backslashes
+  bool InQuotes = false;
+  while (*t) {
+        if (*t == '"') {
+           if (t == s) { // opening quotes
+              InQuotes = true;
+              s++;
+              }
+           else if (InQuotes) // closing quotes
+              break;
+           }
+        else if (*t == '\\') {
+           if (!q) { // need to make a copy in order to strip backslashes
+              q = strdup(s);
+              t = q + (t - s);
+              s = q;
+              }
+           memmove(t, t + 1, strlen(t));
+           }
+        else if (*t == ' ') {
+           if (!InQuotes)
+              break;
+           }
+        t++;
+        }
+  free(text); // just for safety
+  text = NULL;
+  if (t != s) {
+     text = strndup(s, t - s);
+     s = t + 1;
+     }
+  free(q);
+  if (!text)
+     return false;
+  // Action:
+  s = skipspace(s);
+  if      (strcasecmp(s, "DISCARD") == 0) action = CRA_DISCARD;
+  else if (strcasecmp(s, "CONFIRM") == 0) action = CRA_CONFIRM;
+  else if (strcasecmp(s, "SELECT")  == 0) action = CRA_SELECT;
+  else if (isnumber(s))                   action = atoi(s);
+  else
+     return false;
+  return true;
+}
+
+int cCamResponse::Matches(int CamNumber, const char *Text) const
+{
+  if (!camNumber || camNumber == CamNumber) {
+     if (strcmp(text, Text) == 0)
+        return action;
+     }
+  return CRA_NONE;
+}
+
+// --- cCamResponses  --------------------------------------------------------
+
+class cCamResponses : public cConfig<cCamResponse> {
+public:
+  int GetMatch(int CamNumber, const char *Text) const;
+  };
+
+int cCamResponses::GetMatch(int CamNumber, const char *Text) const
+{
+  for (const cCamResponse *cr = First(); cr; cr = Next(cr)) {
+      int Action = cr->Matches(CamNumber, Text);
+      if (Action != CRA_NONE) {
+         dsyslog("CAM %d: auto response %4d to '%s'\n", CamNumber, Action, Text);
+         return Action;
+         }
+      }
+  return CRA_NONE;
+}
+
+cCamResponses CamResponses;
+
+bool CamResponsesLoad(const char *FileName, bool AllowComments, bool MustExist)
+{
+  return CamResponses.Load(FileName, AllowComments, MustExist);
+}
+
 // --- cTPDU -----------------------------------------------------------------
 
 #define MAX_TPDU_SIZE  4096
@@ -1292,15 +1424,41 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
                if (l > 0) menu->titleText = GetText(l, &d);
                if (l > 0) menu->subTitleText = GetText(l, &d);
                if (l > 0) menu->bottomText = GetText(l, &d);
+               int Action = CRA_NONE;
+               int Select = -1;
+               int Item = 0;
                while (l > 0) {
                      char *s = GetText(l, &d);
                      if (s) {
                         if (!menu->AddEntry(s))
                            free(s);
+                        else if (Action == CRA_NONE) {
+                           Action = CamResponses.GetMatch(CamSlot()->SlotNumber(), s);
+                           if (Action == CRA_SELECT)
+                              Select = Item;
+                           }
                         }
                      else
                         break;
+                     Item++;
                      }
+               if (Action != CRA_NONE) {
+                  delete menu;
+                  menu = NULL;
+                  cCondWait::SleepMs(100);
+                  if (Action == CRA_DISCARD) {
+                     SendCloseMMI();
+                     dsyslog("CAM %d: DISCARD", CamSlot()->SlotNumber());
+                     }
+                  else if (Action == CRA_CONFIRM) {
+                     SendMenuAnswer(1);
+                     dsyslog("CAM %d: CONFIRM", CamSlot()->SlotNumber());
+                     }
+                  else if (Action == CRA_SELECT) {
+                     SendMenuAnswer(Select + 1);
+                     dsyslog("CAM %d: SELECT %d", CamSlot()->SlotNumber(), Select + 1);
+                     }
+                  }
                }
             }
             break;
@@ -1319,6 +1477,19 @@ void cCiMMI::Process(int Length, const uint8_t *Data)
                l--;
                // I really wonder why there is no text length field here...
                enquiry->text = CopyString(l, d);
+               int Action = CamResponses.GetMatch(CamSlot()->SlotNumber(), enquiry->text);
+               if (Action > CRA_NONE) {
+                  char s[enquiry->expectedLength * 2];
+                  snprintf(s, sizeof(s), "%d", Action);
+                  if (int(strlen(s)) == enquiry->expectedLength) {
+                     delete enquiry;
+                     enquiry = NULL;
+                     SendAnswer(s);
+                     dsyslog("CAM %d: PIN", CamSlot()->SlotNumber());
+                     }
+                  else
+                     esyslog("CAM %d: ERROR: unexpected PIN length %d, expected %d", CamSlot()->SlotNumber(), int(strlen(s)), enquiry->expectedLength);
+                  }
                }
             }
             break;
@@ -1449,6 +1620,7 @@ void cCiMenu::Abort(void)
 cCiEnquiry::cCiEnquiry(cCiMMI *MMI)
 {
   mmi = MMI;
+  mutex = NULL;
   text = NULL;
   blind = false;
   expectedLength = 0;
diff --git a/ci.h b/ci.h
index 29dc9db3a..827ce57c1 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 4.9 2017/05/16 07:42:45 kls Exp $
+ * $Id: ci.h 4.10 2017/06/09 14:21:26 kls Exp $
  */
 
 #ifndef __CI_H
@@ -529,4 +529,6 @@ class cChannelCamRelations : public cList<cChannelCamRelation> {
 
 extern cChannelCamRelations ChannelCamRelations;
 
+bool CamResponsesLoad(const char *FileName, bool AllowComments = false, bool MustExist = false);
+
 #endif //__CI_H
diff --git a/config.h b/config.h
index 1b6e996ec..4da4ae76d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.10 2017/05/28 12:42:49 kls Exp $
+ * $Id: config.h 4.11 2017/06/05 11:15:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.6"
-#define VDRVERSNUM   20306  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.7"
+#define VDRVERSNUM   20307  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.6"
-#define APIVERSNUM   20306  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.7"
+#define APIVERSNUM   20307  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/menu.c b/menu.c
index 366390f55..2d84194d1 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.32 2017/06/04 09:30:56 kls Exp $
+ * $Id: menu.c 4.37 2017/06/10 19:19:51 kls Exp $
  */
 
 #include "menu.h"
@@ -43,7 +43,7 @@
 #define MAXRECORDCONTROLS (MAXDEVICES * MAXRECEIVERS)
 #define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
 #define MAXWAITFORCAMMENU  10 // seconds to wait for the CAM menu to open
-#define CAMMENURETYTIMEOUT  3 // seconds after which opening the CAM menu is retried
+#define CAMMENURETRYTIMEOUT 3 // seconds after which opening the CAM menu is retried
 #define CAMRESPONSETIMEOUT  5 // seconds to wait for a response from a CAM
 #define MINFREEDISK       300 // minimum free disk space (in MB) required to start recording
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
@@ -327,13 +327,15 @@ void cMenuChannelItem::Set(void)
 {
   cString buffer;
   if (!channel->GroupSep()) {
+     const char *X = *channel->Caids() >= CA_ENCRYPTED_MIN ? "X" : "";
+     const char *R = !channel->Vpid() && (*channel->Apids() || *channel->Dpids()) ? "R" : "";
      if (sortMode == csmProvider)
-        buffer = cString::sprintf("%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name());
+        buffer = cString::sprintf("%d\t%s%s\t%s - %s", channel->Number(), X, R, channel->Provider(), channel->Name());
      else
-        buffer = cString::sprintf("%d\t%s", channel->Number(), channel->Name());
+        buffer = cString::sprintf("%d\t%s%s\t%s", channel->Number(), X, R, channel->Name());
      }
   else
-     buffer = cString::sprintf("---\t%s ----------------------------------------------------------------", channel->Name());
+     buffer = cString::sprintf("\t\t%s", channel->Name());
   SetText(buffer);
 }
 
@@ -369,7 +371,7 @@ class cMenuChannels : public cOsdMenu {
   };
 
 cMenuChannels::cMenuChannels(void)
-:cOsdMenu(tr("Channels"), CHNUMWIDTH)
+:cOsdMenu(tr("Channels"), CHNUMWIDTH, 3)
 {
   SetMenuCategory(mcChannel);
   number = 0;
@@ -2294,8 +2296,10 @@ void cMenuCam::Set(void)
      free(input);
      input = MALLOC(char, Length + 1);
      *input = 0;
+     dsyslog("CAM %d: Enquiry ------------------", camSlot->SlotNumber());
      GenerateTitle();
      Add(new cOsdItem(ciEnquiry->Text(), osUnknown, false));
+     dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciEnquiry->Text());
      Add(new cOsdItem("", osUnknown, false));
      Add(new cMenuEditNumItem("", input, Length, ciEnquiry->Blind()));
      }
@@ -3836,7 +3840,7 @@ eOSState cMenuSetupCAM::Menu(void)
         while (time(NULL) - t0 <= MAXWAITFORCAMMENU) {
               if (item->CamSlot()->HasUserIO())
                  break;
-              if (time(NULL) - t1 >= CAMMENURETYTIMEOUT) {
+              if (time(NULL) - t1 >= CAMMENURETRYTIMEOUT) {
                  dsyslog("CAM %d: retrying to enter CAM menu...", item->CamSlot()->SlotNumber());
                  item->CamSlot()->EnterMenu();
                  t1 = time(NULL);
@@ -4008,6 +4012,7 @@ void cMenuSetupReplay::Store(void)
 
 class cMenuSetupMisc : public cMenuSetupBase {
 private:
+  const char *showChannelNamesWithSourceTexts[3];
   cStringList svdrpServerNames;
   void Set(void);
 public:
@@ -4018,6 +4023,9 @@ class cMenuSetupMisc : public cMenuSetupBase {
 cMenuSetupMisc::cMenuSetupMisc(void)
 {
   SetMenuCategory(mcSetupMisc);
+  showChannelNamesWithSourceTexts[0] = tr("off");
+  showChannelNamesWithSourceTexts[1] = tr("type");
+  showChannelNamesWithSourceTexts[2] = tr("full");
   SetSection(tr("Miscellaneous"));
   Set();
 }
@@ -4047,7 +4055,7 @@ void cMenuSetupMisc::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Volume steps"),               &data.VolumeSteps, 5, 255));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Volume linearize"),           &data.VolumeLinearize, -20, 20));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"),              &data.ChannelsWrap));
-  Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Show channel names with source"), &data.ShowChannelNamesWithSource));
+  Add(new cMenuEditStraItem(tr("Setup.Miscellaneous$Show channel names with source"), &data.ShowChannelNamesWithSource, 3, showChannelNamesWithSourceTexts));
   Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"),             &data.EmergencyExit));
   SetCurrent(Get(current));
   Display();
@@ -5061,6 +5069,7 @@ eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
 
 cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer, bool Pause)
 {
+  const char *LastReplayed = cReplayControl::LastReplayed(); // must do this before locking schedules!
   // Whatever happens here, the timers will be modified in some way...
   Timers->SetModified();
   // We're going to work with an event here, so we need to prevent
@@ -5098,7 +5107,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
         }
      else {
         Timers->Del(timer);
-        if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
+        if (!LastReplayed) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
         }
      timer = NULL;
@@ -5114,7 +5123,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
      if (device->AttachReceiver(recorder)) {
         Recording.WriteInfo();
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
-        if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
+        if (!Timer && !LastReplayed) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
         SchedulesStateKey.Remove();
         LOCK_RECORDINGS_WRITE;
diff --git a/po/ar.po b/po/ar.po
index b8221b4f5..267d5184a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1302,6 +1302,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "متفرقات"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index e251db255..42b2bc567 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1301,6 +1301,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Miscel�l�nia"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 541ee3534..8036f12cd 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1301,6 +1301,12 @@ msgstr "Velikost skoku za použití tlačítek Zelená/Žlutá při opakování
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Různé"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 0861ad761..5c3f870f9 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Diverse"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 773be4257..7b1ac5ea8 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-10 13:45+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Sprungweite mit Taste Gr
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
+msgid "type"
+msgstr "Typ"
+
+msgid "full"
+msgstr "Alles"
+
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 1660877cc..b64518aa1 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "�������"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 3a763f1b8..a010c3fe2 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-19 23:00+0100\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Saltar distancia con teclas verde/amarillo en la repetici
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Varios"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 467119e63..402609875 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr "Klahvide Roheline/Kollane korduv hüpe (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Taasesituse tunnus"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Muud seaded"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index cbb0c8a37..6ed0af2a5 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1302,6 +1302,12 @@ msgstr "Toistohypyn kesto värinäppäimillä (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 5e4348d27..3a04653b7 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-18 20:16+0100\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1309,6 +1309,12 @@ msgstr "Durée du saut pour les touches Verte/Jaune en répétition (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "ID résumé"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Divers"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 38d6fff80..f7b3dd390 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1300,6 +1300,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Raznovrsno"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 5af4a8c70..917499409 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-13 09:36+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1303,6 +1303,12 @@ msgstr "Ismételt ugrástáv a Zöld/Sárga gombokkal (mp)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Lejátszás azonosító"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Egyéb"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 9552f989f..d27f1fb8e 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-09-14 19:28+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1304,6 +1304,12 @@ msgstr "Durata spostamento con tasti Verde/Giallo in sequenza (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Generici"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index b19538b0d..46e4618ad 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-11 14:02+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr "Praleisti atkarpą pakartojime (s) su Žaliu/Geltonu mygtukais"
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Kiti"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 6e81944ba..69cf47f0f 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-08 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Дистанца на скокање со Зелено/Жолто коп
 msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Разно"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 6621e393a..6a984e265 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-10 19:43+0100\n"
 "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1304,6 +1304,12 @@ msgstr "Spoel sprong met groene en gele toesten in repeteerstand (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Overig"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index d90bedb84..15c25ec6e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 7b4ab888f..b9077a2cf 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-12 00:59+0100\n"
 "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1301,6 +1301,12 @@ msgstr "Pomi
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "R�ne"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ecf726022..972419b98 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de resumo"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Outros"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 157acf3c0..78c4f32c4 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-11 22:26+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1300,6 +1300,12 @@ msgstr "Durata sărită cu tastele Verde/Galben la repetiție (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Diverse"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f4b3096cf..0223d0ad4 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-01-05 19:50+1000\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2016-12-27 17:13+0100\n"
 "Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Пропуск интервала Зелёный/Жёлтый в пов
 msgid "Setup.Replay$Resume ID"
 msgstr "ID воспроизведения"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Прочее"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index fcee4824d..8ddbeb464 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-17 18:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Opakovan
 msgid "Setup.Replay$Resume ID"
 msgstr "ident. ��slo obnovenia prehr�vania"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "R�zne"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 048ce54e2..0a6a289ed 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Ostalo"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index c12e296a3..ba1fd189d 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID reprodukcije"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Razno"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 79723c872..78f689d8b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-12 21:58+0100\n"
 "Last-Translator: Magnus Sirvi� <sirwio@hotmail.com>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1303,6 +1303,12 @@ msgstr "Tid f
 msgid "Setup.Replay$Resume ID"
 msgstr "�terupptagnings-ID"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Diverse"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 1d3993324..5cfac45c9 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Di�erler"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 8bff8e250..f9b18b358 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2015-02-13 18:14+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Інтервал пропуску з Зеленою/Жовтою кно
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "Різне"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 09aea4b6f..5ae755575 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2015-09-11 10:38+0200\n"
+"POT-Creation-Date: 2017-06-10 17:19+0200\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -1300,6 +1300,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
+msgid "type"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
 msgid "Miscellaneous"
 msgstr "其它设置"
 
diff --git a/thread.c b/thread.c
index 345f2af4c..27536791e 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 4.4 2017/06/03 12:43:22 kls Exp $
+ * $Id: thread.c 4.9 2017/06/09 08:27:22 kls Exp $
  */
 
 #include "thread.h"
@@ -557,9 +557,10 @@ cString cBackTrace::GetCaller(int Level, bool Mangled)
 
 #ifdef DEBUG_LOCKSEQ
 #define SLL_SIZE     20 // the number of log entries
-#define SLL_LENGTH  256 // the maximum length of log entries
+#define SLL_LENGTH  512 // the maximum length of log entries
 #define SLL_MAX_LIST  9 // max. number of lists to log
 #define SLL_WRITE_FLAG 0x80000000
+#define SLL_LOCK_FLAG  0x40000000
 
 class cStateLockLog {
 private:
@@ -568,7 +569,10 @@ class cStateLockLog {
   cVector<int> flags;
   tThreadId logThreadIds[SLL_SIZE];
   int logFlags[SLL_SIZE];
+  uint8_t logCounter[SLL_SIZE][SLL_MAX_LIST];
+#ifdef DEBUG_LOCKCALL
   char logCaller[SLL_SIZE][SLL_LENGTH];
+#endif
   int logIndex;
   bool dumped;
   void Dump(const char *Name, tThreadId ThreadId);
@@ -581,7 +585,10 @@ cStateLockLog::cStateLockLog(void)
 {
   memset(logThreadIds, 0, sizeof(logThreadIds));
   memset(logFlags, 0, sizeof(logFlags));
+  memset(logCounter, 0, sizeof(logCounter));
+#ifdef DEBUG_LOCKCALL
   memset(logCaller, 0, sizeof(logCaller));
+#endif
   logIndex = 0;
   dumped = false;
 }
@@ -597,24 +604,26 @@ void cStateLockLog::Dump(const char *Name, tThreadId ThreadId)
          q += sprintf(q, "%5d", tid);
          int Flags = logFlags[logIndex];
          bool Write = Flags & SLL_WRITE_FLAG;
-         Flags &= ~SLL_WRITE_FLAG;
+         bool Lock = Flags & SLL_LOCK_FLAG;
+         Flags &= ~(SLL_WRITE_FLAG | SLL_LOCK_FLAG);
          int Changed = LastFlags ^ Flags;
          LastFlags = Flags;
-         bool Lock = (Flags & Changed) != 0;
          for (int i = 0; i <= SLL_MAX_LIST; i++) {
              char c = '-';
              int b = 1 << i;
              if ((Flags & b) != 0)
                 c = '*';
              if ((Changed & b) != 0)
-                c = Lock ? Write ? 'W' : 'R' : '-';
+                c = Lock ? Write ? 'W' : 'R' : 'U';
              q += sprintf(q, "  %c", c);
              }
          q += sprintf(q, "  %c", Lock ? 'L' : 'U');
+#ifdef DEBUG_LOCKCALL
          if (*logCaller[logIndex]) {
             *q++ = ' ';
             strn0cpy(q, *cBackTrace::Demangle(logCaller[logIndex]), sizeof(msg) - (q - msg));
             }
+#endif
          dsyslog("%s", msg);
          }
       if (++logIndex >= SLL_SIZE)
@@ -630,9 +639,9 @@ void cStateLockLog::Dump(const char *Name, tThreadId ThreadId)
 void cStateLockLog::Check(const char *Name, bool Lock, bool Write)
 {
   if (!dumped && Name) {
-     int n = *Name - '0';
-     if (1 <= n && n <= SLL_MAX_LIST) {
-        int b = 1 << (n - 1);
+     int n = *Name - '0' - 1;
+     if (0 <= n && n < SLL_MAX_LIST) {
+        int b = 1 << n;
         cMutexLock MutexLock(&mutex);
         tThreadId ThreadId = cThread::ThreadId();
         int Index = threadIds.IndexOf(ThreadId);
@@ -651,14 +660,15 @@ void cStateLockLog::Check(const char *Name, bool Lock, bool Write)
               ;
            else if ((flags[Index] & b) == 0) // thread already holds "bigger" locks, so it may only re-lock one that it already has!
               DoDump = true;
+           logCounter[Index][n]++;
            flags[Index] |= b;
            }
-        else
+        else if (--logCounter[Index][n] == 0)
            flags[Index] &= ~b;
         logThreadIds[logIndex] = ThreadId;
-        logFlags[logIndex] = flags[Index] | (Write ? SLL_WRITE_FLAG : 0);
+        logFlags[logIndex] = flags[Index] | (Write ? SLL_WRITE_FLAG : 0) | (Lock ? SLL_LOCK_FLAG : 0);
 #ifdef DEBUG_LOCKCALL
-        strn0cpy(logCaller[logIndex], cBackTrace::GetCaller(Lock ? 5 : 3, true), SLL_LENGTH);
+        strn0cpy(logCaller[logIndex], cBackTrace::GetCaller(Lock ? 3 : 5, true), SLL_LENGTH);
 #endif
         if (++logIndex >= SLL_SIZE)
            logIndex = 0;
diff --git a/tools.h b/tools.h
index f823077a8..5894a1849 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.10 2017/05/22 11:07:04 kls Exp $
+ * $Id: tools.h 4.12 2017/06/11 10:00:49 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -51,16 +51,19 @@ template<class T> inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q;
 #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
 #define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
 
-#ifndef _STL_ALGOBASE_H // in case some plugin needs to use the STL
+// In case some plugin needs to use the STL and gets an error message regarding one
+// of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL before
+// including tools.h.
+#if !defined(__STL_CONFIG_H) // for old versions of the STL
+#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_STL_ALGOBASE_H)
 template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
 template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
 #endif
-#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
 template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
-#endif
-#ifndef _MOVE_H // in case some plugin needs to use the STL
+#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_MOVE_H)
 template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
 #endif
+#endif
 
 template<class T> inline T constrain(T v, T l, T h) { return v < l ? l : v > h ? h : v; }
 
@@ -614,19 +617,19 @@ template<class T> class cList : public cListBase {
 // is left:
 
 #define DEF_LIST_LOCK2(Class, Name) \
-class c##Name##Lock { \
+class c##Name##_Lock { \
 private: \
   cStateKey stateKey; \
   const c##Class *list; \
 public: \
-  c##Name##Lock(bool Write = false) \
+  c##Name##_Lock(bool Write = false) \
   { \
     if (Write) \
        list = c##Class::Get##Name##Write(stateKey); \
     else \
        list = c##Class::Get##Name##Read(stateKey); \
   } \
-  ~c##Name##Lock() { if (list) stateKey.Remove(); } \
+  ~c##Name##_Lock() { if (list) stateKey.Remove(); } \
   const c##Class *Name(void) const { return list; } \
   c##Class *Name(void) { return const_cast<c##Class *>(list); } \
   }
@@ -636,13 +639,13 @@ public: \
 // a suitable DEF_LIST_LOCK, and also a pointer to the provided list:
 
 #define USE_LIST_LOCK_READ2(Class, Name) \
-c##Name##Lock Name##Lock(false); \
-const c##Class *Name __attribute__((unused)) = Name##Lock.Name();
+c##Name##_Lock Name##_Lock(false); \
+const c##Class *Name __attribute__((unused)) = Name##_Lock.Name();
 #define USE_LIST_LOCK_READ(Class) USE_LIST_LOCK_READ2(Class, Class)
 
 #define USE_LIST_LOCK_WRITE2(Class, Name) \
-c##Name##Lock Name##Lock(true); \
-c##Class *Name __attribute__((unused)) = Name##Lock.Name();
+c##Name##_Lock Name##_Lock(true); \
+c##Class *Name __attribute__((unused)) = Name##_Lock.Name();
 #define USE_LIST_LOCK_WRITE(Class) USE_LIST_LOCK_WRITE2(Class, Class)
 
 template<class T> class cVector {
diff --git a/vdr.5 b/vdr.5
index 8375aa4ae..80d60def0 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 4.2 2017/04/02 11:41:51 kls Exp $
+.\" $Id: vdr.5 4.3 2017/06/10 11:47:27 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
 .SH NAME
@@ -918,6 +918,45 @@ in this file, other CAMs will be tried just as well. The main purpose of this
 file is to speed up channel switching in systems with more than one CAM.
 
 This file will be read at program startup and saved when the program ends.
+.SS CAM AUTO RESPONSE
+If your CAM keeps popping up annoying messages or you want to make sure VDR
+can record programmes with parental rating without having to enter the PIN
+(in case you can't turn that off in your CAM), you can set up auto responses
+in the file \fIcamresponses.conf\fR.
+
+Each line in this file specifies one rule to apply to texts received from
+the CAM. If the CAM's menu text matches the text in one of these rules,
+the given action is taken and sent to the CAM as an automatic response,
+without any menu appearing on the screen. The first match wins.
+
+The format of these rules is:
+
+nr text action
+
+where
+.TS
+tab (@);
+l l.
+nr       @is the number of the CAM this action applies to (0 = all CAMs)
+text     @is the text in the CAM menu to react on (must be quoted with '"' if it contains blanks, escape '"' with '\\')
+action   @is the action to take if the given text is encountered
+.TE
+
+Possible actions are:
+.TS
+tab (@);
+l l.
+DISCARD  @simply discard the menu (equivalent to pressing 'Back' on the RC)
+CONFIRM  @confirm the menu (equivalent to pressing 'OK' without selecting a particular item)
+SELECT   @select the menu item containing the text (equivalent to positioning the cursor on the item and pressing 'OK')
+<number> @the given number is sent to the CAM as if it were tyed in by the user (provided this is an input field).
+.TE
+
+Note that the text given in a rule must match exactly, including any leading or
+trailing blanks. If in doubt, you can get the exact text from the log file.
+Action keywords are case insensitive.
+
+Everything following (and including) a '#' character is considered to be comment.
 .SS COMMANDLINE OPTIONS
 If started without any options, vdr tries to read any files in the directory
 /etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
diff --git a/vdr.c b/vdr.c
index 4b4246832..7628f47ab 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.16 2017/05/29 11:30:27 kls Exp $
+ * $Id: vdr.c 4.18 2017/06/08 16:10:34 kls Exp $
  */
 
 #include <getopt.h>
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
   VdrUser = VDR_USER;
 #endif
 #ifdef SDNOTIFY
-  time_t SdWatchdog;
+  time_t SdWatchdog = 0;
   int SdWatchdogTimeout = 0;
 #endif
 
@@ -763,6 +763,7 @@ int main(int argc, char *argv[])
   Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
   KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
   Folders.Load(AddDirectory(ConfigDirectory, "folders.conf"));
+  CamResponsesLoad(AddDirectory(ConfigDirectory, "camresponses.conf"), true);
 
   if (!*cFont::GetFontFileName(Setup.FontOsd)) {
      const char *msg = "no fonts available - OSD will not show any text!";

From 3bfd5c028e3685a103c969d3753f5f937dcb95a4 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Fri, 30 Jun 2017 12:40:02 +0000
Subject: [PATCH 250/307] Version 2.3.8

VDR developer version 2.3.8 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.8.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.7-2.3.8.diff

MD5 checksums:

2afe8b899b3af1967320c216c1315f3e  vdr-2.3.8.tar.bz2
d6ef77c644432dde9a01a05280ca5228  vdr-2.3.7-2.3.8.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Note: This is a "holiday release" ;-)
----- I'm going on vacation and just wanted to make the current source
       available before that. There will be at least one more developer version
       before the final stable version 2.4.0.

The changes since version 2.3.7:

- Updated links in the INSTALL file (thanks to Chris Mayo).
- Fixed detecting whether a CAM replies to queries, which didn't work on some systems
   since the implementation of RI_HOST_CONTROL (reported by Daniel Scheller).
- Added some missing locks when calling functions from cStatus or cSkin*, and added
   some text to status.h and skins.h, explaining the locking situation when such
   functions are called.
- Fixed a possible crash in cStateLockLog.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Now skipping a leading '/' in AddDirectory(), to avoid double slashes (reported by
   Chris Mayo).
- Fixed drawing very long menu titles in the LCARS skin (reported by Matthias Senzel).
- Timers are now linked to EPG events even if they are inactive. By default Events that
   are linked to inactive timers are marked with 'I' and 'i', depending on whether the
   timer would record the entire Event or only part of it.
   The function cSkinDisplayMenu::SetItemEvent() now has an additional parameter named
   TimerActive, which indicates whether the timer that would record this event (if any)
   is active. A plugin may react on this when displaying a menu line for an event.
   The old version of cSkinDisplayMenu::SetItemEvent() (without the TimerActive parameter)
   is still there for backwards compatibility. It may be removed in a future version,
   so plugin authors should switch to the new one.
- Now using readdir() instead of readdir_r(), if GLIBC version 2.24 or newer is used
   (suggested by Frank Neumann).
- Added a note to the log, indicating that no further invalid lock sequences will be
   reported until VDR is restarted.
- Whenever a change is made to the recordings in the video directory, the SVDRP command
   UPDR is now sent to all peer VDRs, so that they will update their recordings list.
   This is especially useful if one VDR mounts the video directory of an other one into
   a subdirectory.
- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
---
 CONTRIBUTORS |  11 ++++-
 HISTORY      |  32 ++++++++++++
 INSTALL      |   6 +--
 MANUAL       |  12 ++++-
 ci.c         |  30 ++++++-----
 config.h     |  10 ++--
 menu.c       | 137 ++++++++++++++++++++++++++++-----------------------
 po/ar.po     |   8 ++-
 po/ca_ES.po  |   8 ++-
 po/cs_CZ.po  |   8 ++-
 po/da_DK.po  |   8 ++-
 po/de_DE.po  |   8 ++-
 po/el_GR.po  |   8 ++-
 po/es_ES.po  |   8 ++-
 po/et_EE.po  |   8 ++-
 po/fi_FI.po  |   8 ++-
 po/fr_FR.po  |   8 ++-
 po/hr_HR.po  |   8 ++-
 po/hu_HU.po  |   8 ++-
 po/it_IT.po  |  14 ++++--
 po/lt_LT.po  |   8 ++-
 po/mk_MK.po  |   8 ++-
 po/nl_NL.po  |   8 ++-
 po/nn_NO.po  |   8 ++-
 po/pl_PL.po  |   8 ++-
 po/pt_PT.po  |   8 ++-
 po/ro_RO.po  |   8 ++-
 po/ru_RU.po  |   8 ++-
 po/sk_SK.po  |   8 ++-
 po/sl_SI.po  |   8 ++-
 po/sr_RS.po  |   8 ++-
 po/sv_SE.po  |   8 ++-
 po/tr_TR.po  |   8 ++-
 po/uk_UA.po  |   8 ++-
 po/zh_CN.po  |   8 ++-
 recording.c  |   4 +-
 skinlcars.c  |   4 +-
 skins.h      |  25 +++++++++-
 status.h     |  15 +++++-
 svdrp.c      |  21 +++++++-
 svdrp.h      |  10 +++-
 thread.c     |  33 ++++++++++---
 timers.c     |   4 +-
 tools.c      |   8 ++-
 tools.h      |   4 +-
 45 files changed, 462 insertions(+), 134 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 27b0bbbbc..04487a632 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2117,7 +2117,7 @@ Martin Wache <M.Wache@gmx.net>
  for suggesting to speed up anti-aliased font rendering by caching the blend indexes
  for extending the option "Setup/Miscellaneous/Show channel names with source" to
  "type" or "full"
- for making the "Channels" menu indicates whether a channel is encrypted or a radio
+ for making the "Channels" menu indicate whether a channel is encrypted or a radio
  channel
 
 Matthias Lenk <matthias.lenk@amd.com>
@@ -3037,6 +3037,8 @@ Frank Neumann <fnu@yavdr.org>
  for reporting a problem with the default return value of cEpgHandler::BeginSegmentTransfer()
  in derived classes that don't implement this function
  for reporting uninitialized variable SdWatchdog in vdr.c
+ for suggesting to use readdir() instead of readdir_r(), if GLIBC version 2.24 or
+ newer is used
 
 Gerald Dachs <vdr@dachsweb.de>
  for reporting a problem with checking for minimum line length of 21 characters in
@@ -3102,6 +3104,8 @@ Frank Niederwipper <f.niederwipper@gmail.com>
 Chris Mayo <aklhfex@gmail.com>
  for reporting a problem with detecting frames on radio channels
  for fixing the link to "svdrpsend (1)" in the vdr.1 man page
+ for updating links in the INSTALL file
+ for reporting double slashes in file names processed with AddDirectory()
 
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
@@ -3272,6 +3276,7 @@ Matthias Senzel <matthias.senzel@t-online.de>
  for reporting a bug in switching channels in the Schedule menu after going through
  various Now and Schedule menus for different channels
  for the "jumpingseconds" patch
+ for reporting a bug in drawing very long menu titles in the LCARS skin
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
@@ -3502,3 +3507,7 @@ Sergey Chernyavskiy <glenvt18@gmail.com>
 
 Frank Richter <kulpstur@t-online.de>
  for adding 'S3W ABS-3A' to sources.conf
+
+Daniel Scheller <d.scheller@gmx.net>
+ for reporting a problem with detecting whether a CAM replies to queries, which didn't
+ work on some systems since the implementation of RI_HOST_CONTROL
diff --git a/HISTORY b/HISTORY
index 45b72215d..f5fea5483 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9129,3 +9129,35 @@ Video Disk Recorder Revision History
 - Introduced the new macro DISABLE_TEMPLATES_COLLIDING_WITH_STL, which can be defined
   before including tools.h in case some plugin needs to use the STL and gets error
   messages regarding one of the template functions defined in tools.h.
+
+2017-06-30: Version 2.3.8
+
+- Updated links in the INSTALL file (thanks to Chris Mayo).
+- Fixed detecting whether a CAM replies to queries, which didn't work on some systems
+  since the implementation of RI_HOST_CONTROL (reported by Daniel Scheller).
+- Added some missing locks when calling functions from cStatus or cSkin*, and added
+  some text to status.h and skins.h, explaining the locking situation when such
+  functions are called.
+- Fixed a possible crash in cStateLockLog.
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Now skipping a leading '/' in AddDirectory(), to avoid double slashes (reported by
+  Chris Mayo).
+- Fixed drawing very long menu titles in the LCARS skin (reported by Matthias Senzel).
+- Timers are now linked to EPG events even if they are inactive. By default Events that
+  are linked to inactive timers are marked with 'I' and 'i', depending on whether the
+  timer would record the entire Event or only part of it.
+  The function cSkinDisplayMenu::SetItemEvent() now has an additional parameter named
+  TimerActive, which indicates whether the timer that would record this event (if any)
+  is active. A plugin may react on this when displaying a menu line for an event.
+  The old version of cSkinDisplayMenu::SetItemEvent() (without the TimerActive parameter)
+  is still there for backwards compatibility. It may be removed in a future version,
+  so plugin authors should switch to the new one.
+- Now using readdir() instead of readdir_r(), if GLIBC version 2.24 or newer is used
+  (suggested by Frank Neumann).
+- Added a note to the log, indicating that no further invalid lock sequences will be
+  reported until VDR is restarted.
+- Whenever a change is made to the recordings in the video directory, the SVDRP command
+  UPDR is now sent to all peer VDRs, so that they will update their recordings list.
+  This is especially useful if one VDR mounts the video directory of an other one into
+  a subdirectory.
+- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
diff --git a/INSTALL b/INSTALL
index f2218d121..74caf30bb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -104,13 +104,13 @@ hardware in your system, for instance:
 Plugin:           Device:
 
 dvbsddevice       Full-Featured SD DVB cards (Fujitsu-Siemens Design)
-                  (comes with the VDR source)
+                  ftp://ftp.tvdr.de/vdr/Plugins
 dvbhddevice       Full-featured HD DVB cards (Technotrend TT S2-6400)
                   https://bitbucket.org/powARman/dvbhddevice
 rpihddevice       Raspberry Pi
-                  http://projects.vdr-developer.org/git/vdr-plugin-rpihddevice.git
+                  https://projects.vdr-developer.org/git/vdr-plugin-rpihddevice.git
 
-See http://linuxtv.org/vdrwiki/index.php/Output_devices for more.
+See https://linuxtv.org/vdrwiki/index.php/Output_devices for more.
 
 Standard compliance
 -------------------
diff --git a/MANUAL b/MANUAL
index 0234f77b7..47b2fdd22 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1085,8 +1085,16 @@ Version 2.2
                          connection after which the connection is automatically
                          closed. Default is 300, a value of 0 means no timeout.
 
-  SVDRP peering = no     Activates automatic connections between VDRs in the same
-                         network.
+  SVDRP peering = off    Activates automatic connections between VDRs in the same
+                         network. If set to "any hosts" this VDR will establish
+                         connections with any available hosts. If set to "only
+                         default host" this VDR will only connect to the VDR with
+                         the name defined in "SVDRP default host". If no default
+                         host has been defined, the behavior is the same as with
+                         "any hosts". To switch from "off" to "only default host",
+                         you may need to select "any hosts" first and confirm the
+                         dialog by pressing "Ok" in order to be able to select a
+                         default host.
 
   SVDRP host name        The name of this VDR, which is used when connecting VDRs
                          via SVDRP. By default, the machine's host name is used.
diff --git a/ci.c b/ci.c
index edb801bc2..b6ea32693 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.17 2017/06/10 10:57:31 kls Exp $
+ * $Id: ci.c 4.18 2017/06/19 12:13:38 kls Exp $
  */
 
 #include "ci.h"
@@ -1041,8 +1041,9 @@ void cCiCaPmt::MtdMapPids(cMtdMapper *MtdMapper)
 
 #define CA_ENABLE(x) (((x) & CA_ENABLE_FLAG) ? (x) & ~CA_ENABLE_FLAG : 0)
 
-#define QUERY_WAIT_TIME      1000 // ms to wait before sending a query
+#define QUERY_WAIT_TIME       500 // ms to wait before sending a query
 #define QUERY_REPLY_TIMEOUT  2000 // ms to wait for a reply to a query
+#define QUERY_RETRIES           6 // max. number of retries to check if there is a reply to a query
 
 class cCiConditionalAccessSupport : public cCiSession {
 private:
@@ -1051,6 +1052,7 @@ class cCiConditionalAccessSupport : public cCiSession {
   int caSystemIds[MAXCASYSTEMIDS + 1]; // list is zero terminated!
   bool repliesToQuery;
   cTimeMs timer;
+  int numRetries;
 public:
   cCiConditionalAccessSupport(uint16_t SessionId, cCiTransportConnection *Tc);
   virtual void Process(int Length = 0, const uint8_t *Data = NULL);
@@ -1069,6 +1071,7 @@ cCiConditionalAccessSupport::cCiConditionalAccessSupport(uint16_t SessionId, cCi
   state = 0; // inactive
   caSystemIds[numCaSystemIds = 0] = 0;
   repliesToQuery = false;
+  numRetries = 0;
 }
 
 void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
@@ -1098,7 +1101,8 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
             caSystemIds[numCaSystemIds] = 0;
             dbgprotocol("\n");
             if (state == 1) {
-               timer.Set(QUERY_WAIT_TIME); // WORKAROUND: Alphacrypt 3.09 doesn't reply to QUERY immediately after reset
+               timer.Set(0);
+               numRetries = QUERY_RETRIES;
                state = 2; // got ca info
                }
             dsyslog("CAM %d: system ids:%s", CamSlot()->SlotNumber(), *Ids ? *Ids : " none");
@@ -1171,15 +1175,17 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
      SendData(AOT_CA_INFO_ENQ);
      state = 1; // enquired ca info
      }
-  else if (state == 2 && timer.TimedOut()) {
-     cCiCaPmt CaPmt(CPCI_QUERY, 0, 0, 0, NULL);
-     SendPMT(&CaPmt);
-     timer.Set(QUERY_REPLY_TIMEOUT);
-     state = 3; // waiting for reply
-     }
-  else if (state == 3 && timer.TimedOut()) {
-     dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", CamSlot()->SlotNumber());
-     state = 4; // normal operation
+  else if ((state == 2 || state == 3) && timer.TimedOut()) {
+     if (numRetries-- > 0) {
+        cCiCaPmt CaPmt(CPCI_QUERY, 0, 0, 0, NULL);
+        SendPMT(&CaPmt);
+        timer.Set(QUERY_WAIT_TIME);
+        state = 3; // waiting for reply
+        }
+     else {
+        dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", CamSlot()->SlotNumber());
+        state = 4; // normal operation
+        }
      }
 }
 
diff --git a/config.h b/config.h
index 4da4ae76d..93488be5f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.11 2017/06/05 11:15:37 kls Exp $
+ * $Id: config.h 4.12 2017/06/12 08:58:26 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.7"
-#define VDRVERSNUM   20307  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.8"
+#define VDRVERSNUM   20308  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.7"
-#define APIVERSNUM   20307  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.8"
+#define APIVERSNUM   20308  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/menu.c b/menu.c
index 2d84194d1..c2c12dd8a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.37 2017/06/10 19:19:51 kls Exp $
+ * $Id: menu.c 4.41 2017/06/30 09:49:39 kls Exp $
  */
 
 #include "menu.h"
@@ -1477,6 +1477,7 @@ class cMenuScheduleItem : public cOsdItem {
   const cChannel *channel;
   bool withDate;
   eTimerMatch timerMatch;
+  bool timerActive;
   cMenuScheduleItem(const cTimers *Timers, const cEvent *Event, const cChannel *Channel = NULL, bool WithDate = false);
   static void SetSortMode(eScheduleSortMode SortMode) { sortMode = SortMode; }
   static void IncSortMode(void) { sortMode = eScheduleSortMode((sortMode == ssmAllAll) ? ssmAllThis : sortMode + 1); }
@@ -1494,6 +1495,7 @@ cMenuScheduleItem::cMenuScheduleItem(const cTimers *Timers, const cEvent *Event,
   channel = Channel;
   withDate = WithDate;
   timerMatch = tmNone;
+  timerActive = false;
   Update(Timers, true);
 }
 
@@ -1508,15 +1510,17 @@ int cMenuScheduleItem::Compare(const cListObject &ListObject) const
   return r;
 }
 
-static const char *TimerMatchChars = " tT";
+static const char *TimerMatchChars = " tT iI";
 
 bool cMenuScheduleItem::Update(const cTimers *Timers, bool Force)
 {
   eTimerMatch OldTimerMatch = timerMatch;
-  Timers->GetMatch(event, &timerMatch);
-  if (Force || timerMatch != OldTimerMatch) {
+  bool OldTimerActive = timerActive;
+  const cTimer *Timer = Timers->GetMatch(event, &timerMatch);
+  timerActive = Timer && Timer->HasFlags(tfActive);
+  if (Force || timerMatch != OldTimerMatch || timerActive != OldTimerActive) {
      cString buffer;
-     char t = TimerMatchChars[timerMatch];
+     char t = TimerMatchChars[timerMatch + (timerActive ? 0 : 3)];
      char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' ';
      char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' ';
      const char *csn = channel ? channel->ShortName(true) : NULL;
@@ -1535,7 +1539,7 @@ bool cMenuScheduleItem::Update(const cTimers *Timers, bool Force)
 
 void cMenuScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
 {
-  if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch))
+  if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch, timerActive))
      DisplayMenu->SetItem(Text(), Index, Current, Selectable);
 }
 
@@ -1652,30 +1656,30 @@ eOSState cMenuWhatsOn::Switch(void)
 eOSState cMenuWhatsOn::Record(void)
 {
   if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
-       LOCK_TIMERS_WRITE;
-       LOCK_CHANNELS_READ;
-       LOCK_SCHEDULES_READ;
-       Timers->SetExplicitModify();
-       if (item->timerMatch == tmFull) {
-          if (cTimer *Timer = Timers->GetMatch(item->event))
-             return AddSubMenu(new cMenuEditTimer(Timer));
-          }
-       cTimer *Timer = new cTimer(item->event);
-       if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
-          Timer->SetRemote(Setup.SVDRPDefaultHost);
-       if (cTimer *t = Timers->GetTimer(Timer)) {
-          delete Timer;
-          Timer = t;
-          return AddSubMenu(new cMenuEditTimer(Timer));
-          }
-       if (Timer->Matches(0, false, NEWTIMERLIMIT))
-          return AddSubMenu(new cMenuEditTimer(Timer, true));
-       Timers->Add(Timer);
-       Timers->SetModified();
-       if (!HandleRemoteModifications(Timer)) {
-          // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
-          Timers->Del(Timer);
-          }
+     LOCK_TIMERS_WRITE;
+     LOCK_CHANNELS_READ;
+     LOCK_SCHEDULES_READ;
+     Timers->SetExplicitModify();
+     if (item->timerMatch == tmFull) {
+        if (cTimer *Timer = Timers->GetMatch(item->event))
+           return AddSubMenu(new cMenuEditTimer(Timer));
+        }
+     cTimer *Timer = new cTimer(item->event);
+     if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
+        Timer->SetRemote(Setup.SVDRPDefaultHost);
+     if (cTimer *t = Timers->GetTimer(Timer)) {
+        delete Timer;
+        Timer = t;
+        return AddSubMenu(new cMenuEditTimer(Timer));
+        }
+     if (Timer->Matches(0, false, NEWTIMERLIMIT))
+        return AddSubMenu(new cMenuEditTimer(Timer, true));
+     Timers->Add(Timer);
+     Timers->SetModified();
+     if (!HandleRemoteModifications(Timer)) {
+        // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
+        Timers->Del(Timer);
+        }
      if (HasSubMenu())
         CloseSubMenu();
      if (Update())
@@ -1714,7 +1718,10 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
                         for (cOsdItem *item = First(); item; item = Next(item)) {
                             if (((cMenuScheduleItem *)item)->channel->Number() == cDevice::CurrentChannel()) {
                                SetCurrent(item);
-                               Display();
+                               {
+                                 LOCK_SCHEDULES_READ;
+                                 Display();
+                               }
                                LOCK_CHANNELS_READ;
                                SetHelpKeys(Channels);
                                break;
@@ -1733,8 +1740,10 @@ eOSState cMenuWhatsOn::ProcessKey(eKeys Key)
        }
      }
   else if (!HasSubMenu()) {
-     if (HadSubMenu && Update())
+     if (HadSubMenu && Update()) {
+        LOCK_SCHEDULES_READ;
         Display();
+        }
      if (Key != kNone) {
         LOCK_CHANNELS_READ;
         SetHelpKeys(Channels);
@@ -1953,32 +1962,30 @@ eOSState cMenuSchedule::Number(void)
 eOSState cMenuSchedule::Record(void)
 {
   if (cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current())) {
-     {
-       LOCK_TIMERS_WRITE;
-       LOCK_CHANNELS_READ;
-       LOCK_SCHEDULES_READ;
-       Timers->SetExplicitModify();
-       if (item->timerMatch == tmFull) {
-          if (cTimer *Timer = Timers->GetMatch(item->event))
-             return AddSubMenu(new cMenuEditTimer(Timer));
-          }
-       cTimer *Timer = new cTimer(item->event);
-       if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
-          Timer->SetRemote(Setup.SVDRPDefaultHost);
-       if (cTimer *t = Timers->GetTimer(Timer)) {
-          delete Timer;
-          Timer = t;
-          return AddSubMenu(new cMenuEditTimer(Timer));
-          }
-       if (Timer->Matches(0, false, NEWTIMERLIMIT))
-          return AddSubMenu(new cMenuEditTimer(Timer, true));
-       Timers->Add(Timer);
-       Timers->SetModified();
-       if (!HandleRemoteModifications(Timer)) {
-          // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
-          Timers->Del(Timer);
-          }
-     }
+     LOCK_TIMERS_WRITE;
+     LOCK_CHANNELS_READ;
+     LOCK_SCHEDULES_READ;
+     Timers->SetExplicitModify();
+     if (item->timerMatch == tmFull) {
+        if (cTimer *Timer = Timers->GetMatch(item->event))
+           return AddSubMenu(new cMenuEditTimer(Timer));
+        }
+     cTimer *Timer = new cTimer(item->event);
+     if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost)
+        Timer->SetRemote(Setup.SVDRPDefaultHost);
+     if (cTimer *t = Timers->GetTimer(Timer)) {
+        delete Timer;
+        Timer = t;
+        return AddSubMenu(new cMenuEditTimer(Timer));
+        }
+     if (Timer->Matches(0, false, NEWTIMERLIMIT))
+        return AddSubMenu(new cMenuEditTimer(Timer, true));
+     Timers->Add(Timer);
+     Timers->SetModified();
+     if (!HandleRemoteModifications(Timer)) {
+        // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
+        Timers->Del(Timer);
+        }
      if (HasSubMenu())
         CloseSubMenu();
      if (Update())
@@ -2077,8 +2084,10 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
            Set(Timers, Channels, Channel, true);
            }
         }
-     else if (HadSubMenu && Update())
+     else if (HadSubMenu && Update()) {
+        LOCK_SCHEDULES_READ;
         Display();
+        }
      if (Key != kNone)
         SetHelpKeys();
      }
@@ -3189,8 +3198,10 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
         return state; // closes all recording menus except for the top one
      Set(); // this is the top level menu, so we refresh it...
      Open(true); // ...and open any necessary submenus to show the new name
-     if (!HasSubMenu())
+     if (!HasSubMenu()) {
+        LOCK_RECORDINGS_READ;
         Display();
+        }
      path = NULL;
      fileName = NULL;
      }
@@ -4012,6 +4023,7 @@ void cMenuSetupReplay::Store(void)
 
 class cMenuSetupMisc : public cMenuSetupBase {
 private:
+  const char *svdrpPeeringModeTexts[3];
   const char *showChannelNamesWithSourceTexts[3];
   cStringList svdrpServerNames;
   void Set(void);
@@ -4023,6 +4035,9 @@ class cMenuSetupMisc : public cMenuSetupBase {
 cMenuSetupMisc::cMenuSetupMisc(void)
 {
   SetMenuCategory(mcSetupMisc);
+  svdrpPeeringModeTexts[0] = tr("off");
+  svdrpPeeringModeTexts[1] = tr("any hosts");
+  svdrpPeeringModeTexts[2] = tr("only default host");
   showChannelNamesWithSourceTexts[0] = tr("off");
   showChannelNamesWithSourceTexts[1] = tr("type");
   showChannelNamesWithSourceTexts[2] = tr("full");
@@ -4037,7 +4052,7 @@ void cMenuSetupMisc::Set(void)
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"),   &data.MinEventTimeout));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity));
   Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (s)"),          &data.SVDRPTimeout));
-  Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$SVDRP peering"),              &data.SVDRPPeering));
+  Add(new cMenuEditStraItem(tr("Setup.Miscellaneous$SVDRP peering"),              &data.SVDRPPeering, 3, svdrpPeeringModeTexts));
   if (data.SVDRPPeering) {
      Add(new cMenuEditStrItem( tr("Setup.Miscellaneous$SVDRP host name"), data.SVDRPHostName, sizeof(data.SVDRPHostName)));
      if (GetSVDRPServerNames(&svdrpServerNames)) {
diff --git a/po/ar.po b/po/ar.po
index 267d5184a..f8b039478 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -1302,6 +1302,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "رقم المواصلة"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 42b2bc567..285f7e3d1 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1301,6 +1301,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de Continuar"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 8036f12cd..3defcbd11 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1301,6 +1301,12 @@ msgstr "Velikost skoku za použití tlačítek Zelená/Žlutá při opakování
 msgid "Setup.Replay$Resume ID"
 msgstr "ID obnovení"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 5c3f870f9..906aa61c3 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "Genoptagelses ID"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 7b1ac5ea8..d7e6576e6 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-10 13:45+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Sprungweite mit Taste Gr
 msgid "Setup.Replay$Resume ID"
 msgstr "Wiedergabe-ID"
 
+msgid "any hosts"
+msgstr "mit jeder Maschine"
+
+msgid "only default host"
+msgstr "nur mit der Standardmaschine"
+
 msgid "type"
 msgstr "Typ"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index b64518aa1..db382e80e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID ������������"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index a010c3fe2..e61ed66dd 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-19 23:00+0100\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Saltar distancia con teclas verde/amarillo en la repetici
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de continuaci�n"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 402609875..e58f97e76 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr "Klahvide Roheline/Kollane korduv hüpe (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Taasesituse tunnus"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 6ed0af2a5..964d8d0f4 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1302,6 +1302,12 @@ msgstr "Toistohypyn kesto värinäppäimillä (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3a04653b7..e3c7e084b 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-18 20:16+0100\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1309,6 +1309,12 @@ msgstr "Durée du saut pour les touches Verte/Jaune en répétition (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "ID résumé"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index f7b3dd390..c70a5c33f 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1300,6 +1300,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID nastavka"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 917499409..d1f80b7f4 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-13 09:36+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1303,6 +1303,12 @@ msgstr "Ismételt ugrástáv a Zöld/Sárga gombokkal (mp)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Lejátszás azonosító"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index d27f1fb8e..5e214c53e 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
-"PO-Revision-Date: 2015-09-14 19:28+0100\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"PO-Revision-Date: 2017-06-23 00:00+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -1304,12 +1304,18 @@ msgstr "Durata spostamento con tasti Verde/Giallo in sequenza (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
 
-msgid "type"
+msgid "any hosts"
 msgstr ""
 
-msgid "full"
+msgid "only default host"
 msgstr ""
 
+msgid "type"
+msgstr "tipo"
+
+msgid "full"
+msgstr "completo"
+
 msgid "Miscellaneous"
 msgstr "Generici"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 46e4618ad..2c1f3d724 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-11 14:02+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr "Praleisti atkarpą pakartojime (s) su Žaliu/Geltonu mygtukais"
 msgid "Setup.Replay$Resume ID"
 msgstr "Kūrinio ID"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 69cf47f0f..d07af181f 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-08 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Дистанца на скокање со Зелено/Жолто коп
 msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 6a984e265..ed6223e8b 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-10 19:43+0100\n"
 "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1304,6 +1304,12 @@ msgstr "Spoel sprong met groene en gele toesten in repeteerstand (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Hervattings ID"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 15c25ec6e..37eb90691 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "Resume ID"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index b9077a2cf..3a6ec6542 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-12 00:59+0100\n"
 "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1301,6 +1301,12 @@ msgstr "Pomi
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 972419b98..ae37d28f1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID de resumo"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 78c4f32c4..69364c165 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-11 22:26+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1300,6 +1300,12 @@ msgstr "Durata sărită cu tastele Verde/Galben la repetiție (s)"
 msgid "Setup.Replay$Resume ID"
 msgstr "Identificator continuare"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0223d0ad4..f907ccc6a 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2016-12-27 17:13+0100\n"
 "Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Пропуск интервала Зелёный/Жёлтый в пов
 msgid "Setup.Replay$Resume ID"
 msgstr "ID воспроизведения"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 8ddbeb464..d5a70e3dc 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-17 18:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Opakovan
 msgid "Setup.Replay$Resume ID"
 msgstr "ident. ��slo obnovenia prehr�vania"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 0a6a289ed..d2e463004 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID za predvajanje"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index ba1fd189d..069c1ec66 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "ID reprodukcije"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 78f689d8b..ded70cf0d 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-12 21:58+0100\n"
 "Last-Translator: Magnus Sirvi� <sirwio@hotmail.com>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1303,6 +1303,12 @@ msgstr "Tid f
 msgid "Setup.Replay$Resume ID"
 msgstr "�terupptagnings-ID"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 5cfac45c9..749ca47cb 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1298,6 +1298,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "G�steri� ID'si"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index f9b18b358..d9f15cac3 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2015-02-13 18:14+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1299,6 +1299,12 @@ msgstr "Інтервал пропуску з Зеленою/Жовтою кно
 msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5ae755575..dbeea3f65 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-10 17:19+0200\n"
+"POT-Creation-Date: 2017-06-30 11:46+0200\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -1300,6 +1300,12 @@ msgstr ""
 msgid "Setup.Replay$Resume ID"
 msgstr "恢复 ID"
 
+msgid "any hosts"
+msgstr ""
+
+msgid "only default host"
+msgstr ""
+
 msgid "type"
 msgstr ""
 
diff --git a/recording.c b/recording.c
index 7b1d158bf..ca0ec798e 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.9 2017/05/27 15:46:57 kls Exp $
+ * $Id: recording.c 4.10 2017/06/25 12:31:46 kls Exp $
  */
 
 #include "recording.h"
@@ -27,6 +27,7 @@
 #include "remux.h"
 #include "ringbuffer.h"
 #include "skins.h"
+#include "svdrp.h"
 #include "tools.h"
 #include "videodir.h"
 
@@ -1493,6 +1494,7 @@ void cRecordings::TouchUpdate(void)
   TouchFile(UpdateFileName());
   if (!needsUpdate)
      lastUpdate = time(NULL); // make sure we don't trigger ourselves
+  BroadcastSVDRPCommand("UPDR");
 }
 
 bool cRecordings::NeedsUpdate(void)
diff --git a/skinlcars.c b/skinlcars.c
index c4278d27b..a7c28f103 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 4.4 2017/04/20 08:46:42 kls Exp $
+ * $Id: skinlcars.c 4.5 2017/06/23 15:52:03 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1551,7 +1551,7 @@ void cSkinLCARSDisplayMenu::SetTitle(const char *Title)
 {
   if (MenuCategory() != mcMain) {
      const cFont *font = cFont::GetFont(fontOsd);
-     int w = font->Width(Title);
+     int w = min(font->Width(Title), xa07 - xa06 - Gap);
      osd->DrawRectangle(xa06, yt00, xa07 - w - Gap - 1, yt01 - 1, frameColor);
      osd->DrawText(xa07 - w - Gap, yt00, Title, Theme.Color(clrMenuTitle), Theme.Color(clrBackground), font, w + Gap, yt01 - yt00, taRight);
      }
diff --git a/skins.h b/skins.h
index 2286087b9..81d68ffe2 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 4.1 2015/09/10 11:19:48 kls Exp $
+ * $Id: skins.h 4.4 2017/06/25 10:02:09 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -21,6 +21,19 @@
 #include "timers.h"
 #include "tools.h"
 
+// Several member functions of the following classes are called with a pointer to
+// an object from a global list (cTimer, cChannel, cRecording or cEvent). In these
+// cases the core VDR code holds a lock on the respective list. While in general a
+// plugin should only work with the objects and data that is explicitly given to it
+// in the function call, the called function may itself set a read lock (not a write
+// lock!) on this list, because read locks can be nested. It may also set read locks
+// (not write locks!) on higher order lists.
+// For instance, a function that is called with a cChannel may lock cRecordings and/or
+// cSchedules (which contains cEvent objects), but not cTimers. If a plugin needs to
+// set locks of its own (on mutexes defined inside the plugin code), it shall do so
+// after setting any locks on VDR's global lists, and it shall always set these
+// locks in the same sequence, to avoid deadlocks.
+
 enum eMessageType { mtStatus = 0, mtInfo, mtWarning, mtError }; // will be used to calculate color offsets!
 
 class cSkinDisplay {
@@ -220,16 +233,24 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< this function will be first called for the old current item
        ///< with Current set to false, and then for the new current item
        ///< with Current set to true.
-  virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) { return false; }
+  virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch, bool TimerActive) { return false; }
        ///< Sets the item at the given Index to Event. See SetItem() for more information.
        ///< If a derived skin class implements this function, it can display an Event item
        ///< in a more elaborate way than just a simple line of text.
        ///< If Channel is not NULL, the channel's name and/or number shall be displayed.
        ///< If WithDate is true, the date of the Event shall be displayed (in addition to the time).
        ///< TimerMatch tells how much of this event will be recorded by a timer.
+       ///< TimerActive tells whether the timer that will record this event is active.
        ///< If the skin displays the Event item in its own way, it shall return true.
        ///< The default implementation does nothing and returns false, which results in
        ///< a call to SetItem() with a proper text.
+#define DEPRECATED_SKIN_SETITEMEVENT
+#ifdef DEPRECATED_SKIN_SETITEMEVENT
+  virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) { return SetItemEvent(Event, Index, Current, Selectable, Channel, WithDate, TimerMatch, true); }
+       ///< This function is here for comaptibility with older plugins and may be removed
+       ///< in a future version. Use the above version of SetItemEvent() with the TimerActive
+       ///< parameter instead.
+#endif
   virtual bool SetItemTimer(const cTimer *Timer, int Index, bool Current, bool Selectable) { return false; }
        ///< Sets the item at the given Index to Timer. See SetItem() for more information.
        ///< If a derived skin class implements this function, it can display a Timer item
diff --git a/status.h b/status.h
index 6d1b9df57..c8a9e1f54 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 4.1 2015/08/02 10:34:44 kls Exp $
+ * $Id: status.h 4.3 2017/06/23 09:08:24 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -15,6 +15,19 @@
 #include "player.h"
 #include "tools.h"
 
+// Several member functions of the following classes are called with a pointer to
+// an object from a global list (cTimer, cChannel, cRecording or cEvent). In these
+// cases the core VDR code holds a lock on the respective list. While in general a
+// plugin should only work with the objects and data that is explicitly given to it
+// in the function call, the called function may itself set a read lock (not a write
+// lock!) on this list, because read locks can be nested. It may also set read locks
+// (not write locks!) on higher order lists.
+// For instance, a function that is called with a cChannel may lock cRecordings and/or
+// cSchedules (which contains cEvent objects), but not cTimers. If a plugin needs to
+// set locks of its own (on mutexes defined inside the plugin code), it shall do so
+// after setting any locks on VDR's global lists, and it shall always set these
+// locks in the same sequence, to avoid deadlocks.
+
 enum eTimerChange { tcMod, tcAdd, tcDel }; // tcMod is obsolete and no longer used!
 
 class cTimer;
diff --git a/svdrp.c b/svdrp.c
index 2b63c8018..376957583 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.20 2017/05/31 14:02:17 kls Exp $
+ * $Id: svdrp.c 4.22 2017/06/30 09:49:39 kls Exp $
  */
 
 #include "svdrp.h"
@@ -549,7 +549,7 @@ cSVDRPClient *cSVDRPClientHandler::GetClientForServer(const char *ServerName)
 void cSVDRPClientHandler::SendDiscover(const char *Address)
 {
   cMutexLock MutexLock(&mutex);
-  cString Dgram = cString::sprintf("SVDRP:discover name:%s port:%d vdrversion:%d apiversion:%d timeout:%d", Setup.SVDRPHostName, tcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout);
+  cString Dgram = cString::sprintf("SVDRP:discover name:%s port:%d vdrversion:%d apiversion:%d timeout:%d%s", Setup.SVDRPHostName, tcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout, (Setup.SVDRPPeering == spmOnly && *Setup.SVDRPDefaultHost) ? *cString::sprintf(" host:%s", Setup.SVDRPDefaultHost) : "");
   udpSocket.SendDgram(Dgram, udpSocket.Port(), Address);
 }
 
@@ -580,6 +580,11 @@ void cSVDRPClientHandler::HandleClientConnection(void)
             }
         cString ServerName = strgetval(NewDiscover, "name", ':');
         if (*ServerName) {
+           if (Setup.SVDRPPeering == spmOnly && strcmp(ServerName, Setup.SVDRPDefaultHost) != 0)
+              return; // we only want to peer with the default host, but this isn't the default host
+           cString HostName = strgetval(NewDiscover, "host", ':');
+           if (*HostName && strcmp(HostName, Setup.SVDRPHostName) != 0)
+              return; // the remote VDR requests a specific host, but it's not us
            cString t = strgetval(NewDiscover, "timeout", ':');
            if (*t) {
               int Timeout = atoi(t);
@@ -2600,3 +2605,15 @@ bool ExecSVDRPCommand(const char *ServerName, const char *Command, cStringList *
      return SVDRPClientHandler->Execute(ServerName, Command, Response);
   return false;
 }
+
+void BroadcastSVDRPCommand(const char *Command)
+{
+  cMutexLock MutexLock(&SVDRPHandlerMutex);
+  cStringList ServerNames;
+  if (SVDRPClientHandler) {
+     if (SVDRPClientHandler->GetServerNames(&ServerNames)) {
+        for (int i = 0; i < ServerNames.Size(); i++)
+            ExecSVDRPCommand(ServerNames[i], Command);
+        }
+     }
+}
diff --git a/svdrp.h b/svdrp.h
index ba33fc27a..e0d3616e9 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 4.5 2015/09/09 09:44:12 kls Exp $
+ * $Id: svdrp.h 4.7 2017/06/30 09:49:39 kls Exp $
  */
 
 #ifndef __SVDRP_H
@@ -12,6 +12,12 @@
 
 #include "tools.h"
 
+enum eSvdrpPeerModes {
+  spmOff  = 0,
+  spmAny  = 1,
+  spmOnly = 2,
+  };
+
 enum eSvdrpFetchFlags {
   sffNone   = 0b0000,
   sffTimers = 0b0001,
@@ -42,6 +48,8 @@ bool ExecSVDRPCommand(const char *ServerName, const char *Command, cStringList *
      ///< resulting strings from the remote VDR, which can be accessed
      ///< through Response. If Response is given, it will be cleared before
      ///< the command is actually executed.
+void BroadcastSVDRPCommand(const char *Command);
+     ///< Sends the given SVDRP Command string to all remote VDRs.
 inline int SVDRPCode(const char *s) { return s ? atoi(s) : 0; }
      ///< Returns the value of the three digit reply code of the given
      ///< SVDRP response string.
diff --git a/thread.c b/thread.c
index 27536791e..8fc23400f 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 4.9 2017/06/09 08:27:22 kls Exp $
+ * $Id: thread.c 4.11 2017/06/25 12:08:16 kls Exp $
  */
 
 #include "thread.h"
@@ -558,6 +558,7 @@ cString cBackTrace::GetCaller(int Level, bool Mangled)
 #ifdef DEBUG_LOCKSEQ
 #define SLL_SIZE     20 // the number of log entries
 #define SLL_LENGTH  512 // the maximum length of log entries
+#define SLL_THREADS  20 // the maximum number of threads holding locks at the same time (typically well below 10)
 #define SLL_MAX_LIST  9 // max. number of lists to log
 #define SLL_WRITE_FLAG 0x80000000
 #define SLL_LOCK_FLAG  0x40000000
@@ -569,7 +570,7 @@ class cStateLockLog {
   cVector<int> flags;
   tThreadId logThreadIds[SLL_SIZE];
   int logFlags[SLL_SIZE];
-  uint8_t logCounter[SLL_SIZE][SLL_MAX_LIST];
+  uint8_t logCounter[SLL_THREADS][SLL_MAX_LIST];
 #ifdef DEBUG_LOCKCALL
   char logCaller[SLL_SIZE][SLL_LENGTH];
 #endif
@@ -633,6 +634,7 @@ void cStateLockLog::Dump(const char *Name, tThreadId ThreadId)
   dsyslog("full backtrace:");
   cBackTrace::BackTrace(NULL, 2);
   dsyslog("--- end invalid lock sequence report");
+  dsyslog("--- THERE WILL BE NO FURTHER REPORTS UNTIL VDR IS RESTARTED!");
   fprintf(stderr, "invalid lock sequence at %s\n", *DayDateTime(time(NULL)));
 }
 
@@ -644,15 +646,32 @@ void cStateLockLog::Check(const char *Name, bool Lock, bool Write)
         int b = 1 << n;
         cMutexLock MutexLock(&mutex);
         tThreadId ThreadId = cThread::ThreadId();
-        int Index = threadIds.IndexOf(ThreadId);
+        int Index = -1;
+        int AvailableIndex = -1;
+        for (int i = 0; i < threadIds.Size(); i++) {
+            if (ThreadId == threadIds[i]) {
+               Index = i;
+               break;
+               }
+            if (threadIds[i] == 0)
+               AvailableIndex = i;
+            }
         if (Index < 0) {
-           if (Lock) {
+           if (AvailableIndex < 0) {
               Index = threadIds.Size();
               threadIds.Append(ThreadId);
               flags.Append(0);
               }
-           else
-              return;
+           else {
+              Index = AvailableIndex;
+              threadIds[Index] = ThreadId;
+              }
+           }
+        if (Index >= SLL_THREADS) {
+           // should never happen!
+           esyslog("ERROR: too many threads holding list locks at the same time - stopped logging locks!");
+           dumped = true;
+           return;
            }
         bool DoDump = false;
         if (Lock) {
@@ -667,6 +686,8 @@ void cStateLockLog::Check(const char *Name, bool Lock, bool Write)
            flags[Index] &= ~b;
         logThreadIds[logIndex] = ThreadId;
         logFlags[logIndex] = flags[Index] | (Write ? SLL_WRITE_FLAG : 0) | (Lock ? SLL_LOCK_FLAG : 0);
+        if (flags[Index] == 0)
+           threadIds[Index] = 0;
 #ifdef DEBUG_LOCKCALL
         strn0cpy(logCaller[logIndex], cBackTrace::GetCaller(Lock ? 3 : 5, true), SLL_LENGTH);
 #endif
diff --git a/timers.c b/timers.c
index 95cb723bd..8987b1264 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.10 2017/05/26 15:43:38 kls Exp $
+ * $Id: timers.c 4.11 2017/06/25 10:02:09 kls Exp $
  */
 
 #include "timers.h"
@@ -476,7 +476,7 @@ eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
   // To make sure a VPS timer can be distinguished from a plain 100% overlap,
   // it gets an additional 100 added, and a VPS event that is actually running
   // gets 200 added to the FULLMATCH.
-  if (HasFlags(tfActive) && channel->GetChannelID() == Event->ChannelID()) {
+  if (channel->GetChannelID() == Event->ChannelID()) {
      bool UseVps = HasFlags(tfVps) && Event->Vps();
      Matches(UseVps ? Event->Vps() : Event->StartTime(), true);
      int overlap = 0;
diff --git a/tools.c b/tools.c
index a8e6af1ee..ac2f9eb23 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 4.6 2017/05/09 08:32:54 kls Exp $
+ * $Id: tools.c 4.8 2017/06/25 11:45:39 kls Exp $
  */
 
 #include "tools.h"
@@ -371,6 +371,8 @@ bool StrInArray(const char *a[], const char *s)
 
 cString AddDirectory(const char *DirName, const char *FileName)
 {
+  if (*FileName == '/')
+     FileName++;
   return cString::sprintf("%s/%s", DirName && *DirName ? DirName : ".", FileName);
 }
 
@@ -1526,7 +1528,11 @@ cReadDir::~cReadDir()
 struct dirent *cReadDir::Next(void)
 {
   if (directory) {
+#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
      while (readdir_r(directory, &u.d, &result) == 0 && result) {
+#else
+     while ((result = readdir(directory)) != NULL) {
+#endif
            if (strcmp(result->d_name, ".") && strcmp(result->d_name, ".."))
               return result;
            }
diff --git a/tools.h b/tools.h
index 5894a1849..aaba602ff 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.12 2017/06/11 10:00:49 kls Exp $
+ * $Id: tools.h 4.13 2017/06/25 11:45:38 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -400,10 +400,12 @@ class cReadDir {
 private:
   DIR *directory;
   struct dirent *result;
+#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
   union { // according to "The GNU C Library Reference Manual"
     struct dirent d;
     char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];
     } u;
+#endif
 public:
   cReadDir(const char *Directory);
   ~cReadDir();

From 553bc142754863250ddce11803201a278a18be86 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 18 Mar 2018 13:54:32 +0000
Subject: [PATCH 251/307] Version 2.3.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VDR developer version 2.3.9 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.9.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.8-2.3.9.diff

MD5 checksums:

9e4202b046df9ea960d930ce99e967ab  vdr-2.3.9.tar.bz2
38a0f436fbed219665725aa2e54a9ca0  vdr-2.3.8-2.3.9.diff

Approaching version 2.4.0:
==========================

If there are no more serious bug reports, the final version 2.4.0 of VDR
shall be released on April 15.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

The following language files still have the given number of untranslated texts:

PLUGINS/src/hello/po/ca_ES.po: 6
PLUGINS/src/hello/po/da_DK.po: 6
PLUGINS/src/hello/po/el_GR.po: 6
PLUGINS/src/hello/po/es_ES.po: 6
PLUGINS/src/hello/po/fr_FR.po: 6
PLUGINS/src/hello/po/hu_HU.po: 6
PLUGINS/src/hello/po/nl_NL.po: 6
PLUGINS/src/hello/po/nn_NO.po: 6
PLUGINS/src/hello/po/pt_PT.po: 6
PLUGINS/src/hello/po/ro_RO.po: 6
PLUGINS/src/hello/po/sl_SI.po: 6
PLUGINS/src/hello/po/sv_SE.po: 6
po/ar.po: 76
po/ca_ES.po: 76
po/cs_CZ.po: 22
po/da_DK.po: 208
po/el_GR.po: 271
po/es_ES.po: 22
po/et_EE.po: 7
po/fi_FI.po: 3
po/fr_FR.po: 22
po/hr_HR.po: 208
po/hu_HU.po: 22
po/it_IT.po: 3
po/lt_LT.po: 22
po/mk_MK.po: 22
po/nl_NL.po: 22
po/nn_NO.po: 336
po/pt_PT.po: 104
po/ro_RO.po: 22
po/ru_RU.po: 10
po/sk_SK.po: 22
po/sl_SI.po: 77
po/sr_RS.po: 76
po/sv_SE.po: 22
po/tr_TR.po: 208
po/uk_UA.po: 22
po/zh_CN.po: 76

If nobody takes care of these, they will remain untranslated in version 2.4.0.

The changes since version 2.3.8:

- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed a possible crash when stopping VDR (thanks to Matthias Senzel for reporting and
   helping to debug this one).
- Fixed handling VPS events outside the LingerLimit, which could cause recordings to
   stop prematurely (thanks to Johann Friedrichs).
- Fixed an invalid lock sequence when trying to remove a deleted recording in case
   of low disk space.
- Now making sure that AssertFreeDiskSpace() is called with the maximum timer
   priority in case there are several timers recording with different priorities.
- The MTD mapper now avoids immediately reusing unique PIDs when switching channels,
   to prevent possible problems with old data in buffers (thanks to Onur Sentürk).
- The function cDevice::GetVideoSystem() (which has been deprecated since version 2.1.6)
   has been finally removed.
- The macros used to control deprecated code or functions have been changed to hold
   numeric values (0 and 1), so that they can be controlled at compile time, without
   having to edit the actual source code (suggested by Jasmin Jessich).
- The default for DEPRECATED_VDR_CHARSET_OVERRIDE has been set to 0, which means VDR
   no longer reacts on the environment variable VDR_CHARSET_OVERRIDE. You can add
   'DEPRECATED_VDR_CHARSET_OVERRIDE=1' when compiling in order to restore this
   functionality. However, it is recommended to use the command line option --chartab
   instead.
- The timeout for the channel display is now reset whenever the channel or EPG data
   changes.
- OSD menus now try to keep the offset of the list cursor at a constant position on
   the screen, even if the list is modified while being displayed.
- The LCARS skin's main menu now reacts to changes of the current channel's name.
- If an event in the Schedules menu is marked with a 'T' or 'I' and the user presses the
   Red button to edit the timer, local timers are now preferred over remote timers
   in case there is more than one timer that will record that event.
- Switching the primary device is no longer done via osSwitchDvb (which has been
   removed), but rather by the main program loop reacting to changes in Setup.PrimaryDVB.
- The new SVDRP commands 'LSTD' and 'PRIM' can be used to list all available devices
   and to switch the primary device (thanks to Thomas Reufer).
- Added some comments regarding font height (thanks to Thomas Reufer).
- Fixed handling timers during the change from DST to winter time (thanks to Johann
   Friedrichs).
- Added missing checks of 'player' in member functions of cControl, and setting
   cControl::player to NULL in cDvbPlayerControl::Stop() to avoid a possible crash
   with plugins that retrieve player information after a replay has been stopped, but
   before the replay control has been destroyed (thanks to Johann Friedrich).
- Now calling Hide() and cStatus::MsgReplaying(..., false) from cReplayControl::Stop(),
   to inform plugins about an ending replay session before the replay control gets
   destroyed.
- Fixed a possible crash when moving a recording between different volumes (reported by
   Matthias Senzel).
- Fixed positioning the cursor in the Recordings menu when moving a recording between
   different volumes.
- Added a note to PLUGINS.html about writing log messages in English.
- Fixed a deadlock when moving a folder containing several recordings between
   different volumes (reported by Matthias Senzel).
- Fixed positioning to the current item when changing the sort mode in the Recordings
   menu, in case there is a LastReplayed recording.
- The CAM menu is now automatically closed when the current channel is switched
   (suggested by Dietmar Spingler).
- Fixed a lengthy write lock on the Recordings list in case of moving a folder with
   more than one recording (thanks to Matthias Senzel).
- If TS packets are not accepted by the output device in Transfer Mode, this is now
   reported only once per minute in the log file.
- The new setup option "OSD/Sorting direction for recordings" can be used to switch
   the sequence in which recordings are presented in the "Recordings" menu between
   ascending (oldest first) and descendeng (newest first) (thanks to Matthias Senzel).
- When moving recordings between volumes, the "Recordings" menu now displays those items
   that have not yet been moved completely as non-selectable. This avoids situations
   where trying to play such a recording might fail.
- Fixed canceling moving a folder with several recordings between volumes.
- When moving a recording to a different folder, the cursor is no longer placed on the
   new location of the recording, but rather stays in the original folder (suggested by
   Matthias Senzel). If the original folder got empty by moving away the last recording
   it contained, the cursor is moved up until a non empty folder is found.
- Changed the log message ""ERROR: copying directory '%s' to '%s' ended prematurely" from
   "error" to "info", because any actual error would have already been reported before this
   (suggested by Matthias Senzel).
- When selecting a folder for a recording or timer, it is now possible to open a folder
   even if it doesn't contain any subfolders (suggested by Matthias Senzel).
- Fixed a possible deadlock when detaching a receiver from a device.
- Moved any locking from cutter.c into recording.c, to avoid a problem with locking
   the Recordings list (reported by Matthias Senzel).
- Now using the 'example' macro in vdr.5 (thanks to Chris Mayo).
- Now unlocking the Recordings list before displaying an error message in
   cMenuPathEdit::ApplyChanges() and cReplayControl::Stop() (reported by Matthias Senzel).
- Fixed a possible deadlock when quickly zapping through encrypted channels (reported
   by Jörg Wendel).
- The new function cStatus::MarksModified() can be implemented by plugins to get
   informed about any modifications to the editing marks of the currently played
   recording (based on a patch from Jörg Wendel).
- Fixed handling editing marks in the replay progress display, in case the marks are
   deleted via the Info/Edit menu of the currently played recording (the progress
   display still displayed them).
- Limited some CAM related log messages to the actual master CAM, if any.
- The Perl script 'peerdemo' shows how one can find all the VDRs in the local network
   using the peer connection mechanism.
- Added the UPDATE-2.4.0 file.
- Making sure cSVDRPClient::Process() reads the entire reply once it started reading,
   even if no Response parameter is given.
- Replaced the warning regarding the open SVDRP port in the INSTALL file with a remark
   about using svdrphosts.conf to completely disable SVDRP access.
- Added a note about the fixed UDP port for SVDRP discovery to vdr.1.
- Fixed updating the Timers menu after turning a local timer on/off with the Red
   button.
- Fixed keeping the cursor position in the Recordings menu in case a timer starts
   recording while the menu is open.
- When a timer is newly created in the Timers menu, it now immediately appears at the
   correct position in the list, rather than first being added at the end and then
   jumping to the proper offset.
- Fixed getting the info of a newly edited recording (reported by Matthias Senzel).
- Improved calculating signal strength and quality (thanks to Helmut Binder).
- While a timer is recording, the file '.timer' in the recording directory now contains
   the full id of the timer that is currently recording into this directory. This is used
   to determine whether a timer is still recording on a remote VDR when deleting a recording
   from the Recordings menu.
- Fixed handling SVDRP peering for more than one instance of VDR on the same machine, and
   improved logging and debug output.
- Fixed case inconsistency with SVDRPDefaultHost in config.c.
- Added a section about the '.sort' file to vdr.5.
- Initiating the client side of a peer-to-peer SVDRP connection is now done with the new
   SVDRP command CONN instead of using the UDP port with the server's address.
   This change requires that all VDRs that shall take part in a peer-to-peer network need
   to be updated to this version.
- Moved handling remote timers into cSVDRPClientHandler::ProcessConnections().
- Combined Start/StopSVDRPServer/ClientHandler() into Start/StopSVDRPHandler().
- Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak).
- When remote timers are fetched from a peer VDR, we no longer blindly delete and re-add
   them, but rather compare them and make only the minimum necessary changes.
- Fixed the CompareInts() function.
- Disabled the use of posix_fadvise() when reading (i.e. replaying), since it caused
   stuttering replay in fast forward and fast rewind mode in case the video directory
   is mounted via NFS. You can re-enable it by setting the macro USE_FADVISE_READ to 1
   in tools.c.
- Modified cStateLock's SetExplicitModify() and IncState() (changed to SetModified()) to
   allow for the introduction of syncing a separate cStateKey to a cStateLock.
- Assigning events to timers no longer triggers sending a POLL to all peer VDRs.
- When making modifications to remote timers, the local VDR no longer sends a POLL to
   all remote VDRs.
- Fixed removing a cStateKey from a cStateLock (setting StateKey.stateLock = NULL was
   done too late, after the lock had already been released).
- Now writing the info file before attaching the recorder to the device, to make sure it
   is present when the recorder needs to update the fps value.
- Making sure the Schedules menu has a proper title, even if it is empty.
- Removed sending the SVDRP command UPDR to peer VDRs whenever a change is made to the
   recordings in the video directory (which was introduced in version 2.3.8), because it
   triggered re-reading the video directory too fast.
- Improved handling VPS timers to better react to EPG changes during an ongoing recording.
- Commented out the logging in cMarks::Align(), to avoid log entries in case of editing
   marks that are not generated by VDR itself, and thus may be a little off (suggested by
   Jörg Wendel). You can activate this line again for debugging if necessary.
- Made the input buffer in cSVDRPClient dynamic.
- Fixed handling parameters in the S2SatelliteDeliverySystemDescriptor and
   T2DeliverySystemDescriptor that were overwritten when parsing the
   SatelliteDeliverySystemDescriptor or TerrestrialDeliverySystemDescriptor, respectively.
- Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting
   the user.
---
 CONTRIBUTORS                       |  41 +-
 HISTORY                            | 159 +++++++-
 INSTALL                            |   9 +-
 MANUAL                             |   7 +
 PLUGINS.html                       |   5 +-
 PLUGINS/src/hello/po/pl_PL.po      |  23 +-
 PLUGINS/src/pictures/HISTORY       |   7 +-
 PLUGINS/src/pictures/pic2mpg       |  22 +-
 PLUGINS/src/pictures/pictures.c    |   4 +-
 PLUGINS/src/pictures/po/pl_PL.po   |  34 ++
 PLUGINS/src/skincurses/po/pl_PL.po |  32 ++
 UPDATE-2.4.0                       | 440 +++++++++++++++++++++
 ci.c                               |  39 +-
 ci.h                               |   6 +-
 config.c                           |   7 +-
 config.h                           |  11 +-
 cutter.c                           |   7 +-
 device.c                           |  11 +-
 device.h                           |  21 +-
 dvbdevice.c                        | 261 +++++++++++-
 dvbplayer.c                        |   3 +-
 eit.c                              |   4 +-
 font.h                             |  14 +-
 menu.c                             | 380 +++++++++++-------
 menu.h                             |   3 +-
 mtd.c                              |  11 +-
 nit.c                              |  19 +-
 osd.c                              |   4 +-
 osd.h                              |   8 +-
 osdbase.c                          |   9 +-
 osdbase.h                          |   4 +-
 peerdemo                           | 136 +++++++
 player.h                           |  15 +-
 po/ar.po                           |  26 +-
 po/ca_ES.po                        |  26 +-
 po/cs_CZ.po                        |  26 +-
 po/da_DK.po                        |  26 +-
 po/de_DE.po                        |  26 +-
 po/el_GR.po                        |  26 +-
 po/es_ES.po                        |  26 +-
 po/et_EE.po                        |  26 +-
 po/fi_FI.po                        |  34 +-
 po/fr_FR.po                        |  26 +-
 po/hr_HR.po                        |  26 +-
 po/hu_HU.po                        |  26 +-
 po/it_IT.po                        |  34 +-
 po/lt_LT.po                        |  26 +-
 po/mk_MK.po                        |  26 +-
 po/nl_NL.po                        |  26 +-
 po/nn_NO.po                        |  26 +-
 po/pl_PL.po                        | 572 ++++++++++++++-------------
 po/pt_PT.po                        |  26 +-
 po/ro_RO.po                        |  26 +-
 po/ru_RU.po                        |  26 +-
 po/sk_SK.po                        |  26 +-
 po/sl_SI.po                        |  26 +-
 po/sr_RS.po                        |  26 +-
 po/sv_SE.po                        |  26 +-
 po/tr_TR.po                        |  26 +-
 po/uk_UA.po                        |  26 +-
 po/zh_CN.po                        |  26 +-
 recording.c                        | 170 +++++---
 recording.h                        |   7 +-
 skinlcars.c                        |   6 +-
 skins.h                            |   8 +-
 status.c                           |   8 +-
 status.h                           |   8 +-
 svdrp.c                            | 612 +++++++++++++++++++----------
 svdrp.h                            |  22 +-
 thread.c                           |  65 ++-
 thread.h                           |  22 +-
 timers.c                           | 232 +++++++----
 timers.h                           |  27 +-
 tools.c                            |  35 +-
 tools.h                            |  25 +-
 transfer.c                         |  12 +-
 transfer.h                         |   4 +-
 vdr.1                              |   7 +-
 vdr.5                              |  91 +++--
 vdr.c                              |  86 ++--
 80 files changed, 3186 insertions(+), 1307 deletions(-)
 create mode 100644 PLUGINS/src/pictures/po/pl_PL.po
 create mode 100644 PLUGINS/src/skincurses/po/pl_PL.po
 create mode 100644 UPDATE-2.4.0
 create mode 100755 peerdemo

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 04487a632..a906532db 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1847,7 +1847,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
  for exporting some libsi functions
  for suggesting to add functions to cDevice that allow derived output devices to
  implement scaling the video to a given size and location
- fpr sorting sources.conf by continous azimuth
+ for sorting sources.conf by continuous azimuth
 
 Mattias Gr�nlund <Mattias@Gronlund.net>
  for pointing out a missing cleanup at program exit in case there is a problem
@@ -2627,6 +2627,9 @@ J
  for making cEpgHandlers::BeginSegmentTransfer() boolean
  for suggesting to change tEventID back to u_int32_t
  for adding the 'aux' member to cEvent
+ for reporting a possible deadlock when quickly zapping through encrypted channels
+ for a patch that was used to implement cStatus::MarksModified()
+ for suggesting to no longer log unaligned marks in cMarks::Align()
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@@ -2837,6 +2840,11 @@ Johann Friedrichs <johann.friedrichs@web.de>
  false
  for reporting an invalid lock sequence in the epgsearch plugin, which turned out to
  be an abandoned member of class cSchedulesLock
+ for fixing handling VPS events outside the LingerLimit, which could cause recordings to
+ stop prematurely
+ for fixing handling timers during the change from DST to winter time
+ for fixing a possible crash with plugins that retrieve player information after a
+ replay has been stopped, but before the replay control has been destroyed
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -3106,6 +3114,7 @@ Chris Mayo <aklhfex@gmail.com>
  for fixing the link to "svdrpsend (1)" in the vdr.1 man page
  for updating links in the INSTALL file
  for reporting double slashes in file names processed with AddDirectory()
+ for using the 'example' macro in vdr.5
 
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
@@ -3277,6 +3286,24 @@ Matthias Senzel <matthias.senzel@t-online.de>
  various Now and Schedule menus for different channels
  for the "jumpingseconds" patch
  for reporting a bug in drawing very long menu titles in the LCARS skin
+ for reporting and helping to debug a crash when stopping VDR
+ for reporting a crash when moving a recording between different volumes
+ for reporting a deadlock when moving a folder containing several recordings between
+ different volumes
+ for fixing a lengthy write lock on the Recordings list in case of moving a folder with
+ more than one recording
+ for implementing the parameter "OSD/Sorting direction for recordings"
+ for suggesting to stay in the original folder when moving a recording to a different
+ folder
+ for reporting problem with locking the Recordings list in the cutting process
+ for suggesting to change the log message ""ERROR: copying directory '%s' to '%s' ended
+ prematurely" from "error" to "info"
+ for suggesting to allow opening a folder when selecting a folder for a recording or
+ timer, even if it doesn't contain any subfolders
+ for reporting a possible locking problem in cMenuPathEdit::ApplyChanges() when the
+ lock is held while the error message is displayed
+ for reporting that the info of a newly edited recording was not available immediately
+ after starting the editing process
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
@@ -3370,6 +3397,8 @@ Thomas Reufer <thomas@reufer.ch>
  for adding cFont::Width(void) to get the default character width and allow stretched
  font drawing in high level OSDs
  for fixing regenerating the index of audio recordings
+ for implementing the SVDRP commands 'LSTD' and 'PRIM'
+ for adding some comments regarding font height
 
 Eike Sauer <EikeSauer@t-online.de>
  for reporting a problem with channels that need more than 5 TS packets for detecting
@@ -3414,6 +3443,7 @@ Dietmar Spingler <d_spingler@gmx.de>
  for suggesting to optionally list the channels with channel ids in the SVDRP command LSTC
  for suggesting to include the channel ID in log messages about switching channels
  for reporting a problem with the SVDRP command CHAN while the channel display is open
+ for suggesting to automatically close the CAM menu when the current channel is switched
 
 Stefan Schallenberg <infos@nafets.de>
  for adding the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
@@ -3443,6 +3473,9 @@ Jasmin Jessich <jasmin@anw.at>
  for suggesting to use $(Q) to control Makefile verbosity
  for adding handling DEBUG to the Make.config.template file, in order to control
  code optimization
+ for suggesting to change the macros used to control deprecated code or functions
+ to numeric values (0 and 1), so that they can be controlled at compile time, without
+ having to edit the actual source code
 
 Martin Schirrmacher <schirrmie@gmail.com>
  for suggesting to provide a way for skin plugins to get informed about the currently
@@ -3511,3 +3544,9 @@ Frank Richter <kulpstur@t-online.de>
 Daniel Scheller <d.scheller@gmx.net>
  for reporting a problem with detecting whether a CAM replies to queries, which didn't
  work on some systems since the implementation of RI_HOST_CONTROL
+
+Onur Sent�rk <onur@sentek.org>
+ for making the MTD mapper avoid immediately reusing unique PIDs when switching channels
+
+Helmut Binder <cco@aon.at>
+ for improving calculating signal strength and quality
diff --git a/HISTORY b/HISTORY
index f5fea5483..2611da688 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3905,7 +3905,7 @@ Video Disk Recorder Revision History
 - Updated the French OSD texts (thanks to Nicolas Huillard).
 - Fixed the cFilter example in PLUGINS.html (reported by Patrick Fischer).
 - The new class cUnbufferedFile is used for the recording files to avoid
-  trashing the file system cache (based on a patch by Ralf M�ller).
+  thrashing the file system cache (based on a patch by Ralf M�ller).
 
 2005-11-06: Version 1.3.36
 
@@ -8866,7 +8866,7 @@ Video Disk Recorder Revision History
   font drawing in high level OSDs (thanks to Thomas Reufer).
 - Fixed regenerating the index of audio recordings (thanks to Thomas Reufer).
 - Fixed building VDR with systemd >= 230 (thanks to Ville Skytt�).
-- Sorted sources.conf by continous azimuth (thanks to Lucian Muresan).
+- Sorted sources.conf by continuous azimuth (thanks to Lucian Muresan).
 - Added 'S58.5E Kazsat 3' to sources.conf (thanks to Aitugan Sarbassov).
 - Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
   (reported by Sergey Chernyavskiy).
@@ -9161,3 +9161,158 @@ Video Disk Recorder Revision History
   This is especially useful if one VDR mounts the video directory of an other one into
   a subdirectory.
 - SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
+
+2018-03-18: Version 2.3.9
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed a possible crash when stopping VDR (thanks to Matthias Senzel for reporting and
+  helping to debug this one).
+- Fixed handling VPS events outside the LingerLimit, which could cause recordings to
+  stop prematurely (thanks to Johann Friedrichs).
+- Fixed an invalid lock sequence when trying to remove a deleted recording in case
+  of low disk space.
+- Now making sure that AssertFreeDiskSpace() is called with the maximum timer
+  priority in case there are several timers recording with different priorities.
+- The MTD mapper now avoids immediately reusing unique PIDs when switching channels,
+  to prevent possible problems with old data in buffers (thanks to Onur Sent�rk).
+- The function cDevice::GetVideoSystem() (which has been deprecated since version 2.1.6)
+  has been finally removed.
+- The macros used to control deprecated code or functions have been changed to hold
+  numeric values (0 and 1), so that they can be controlled at compile time, without
+  having to edit the actual source code (suggested by Jasmin Jessich).
+- The default for DEPRECATED_VDR_CHARSET_OVERRIDE has been set to 0, which means VDR
+  no longer reacts on the environment variable VDR_CHARSET_OVERRIDE. You can add
+  'DEPRECATED_VDR_CHARSET_OVERRIDE=1' when compiling in order to restore this
+  functionality. However, it is recommended to use the command line option --chartab
+  instead.
+- The timeout for the channel display is now reset whenever the channel or EPG data
+  changes.
+- OSD menus now try to keep the offset of the list cursor at a constant position on
+  the screen, even if the list is modified while being displayed.
+- The LCARS skin's main menu now reacts to changes of the current channel's name.
+- If an event in the Schedules menu is marked with a 'T' or 'I' and the user presses the
+  Red button to edit the timer, local timers are now preferred over remote timers
+  in case there is more than one timer that will record that event.
+- Switching the primary device is no longer done via osSwitchDvb (which has been
+  removed), but rather by the main program loop reacting to changes in Setup.PrimaryDVB.
+- The new SVDRP commands 'LSTD' and 'PRIM' can be used to list all available devices
+  and to switch the primary device (thanks to Thomas Reufer).
+- Added some comments regarding font height (thanks to Thomas Reufer).
+- Fixed handling timers during the change from DST to winter time (thanks to Johann
+  Friedrichs).
+- Added missing checks of 'player' in member functions of cControl, and setting
+  cControl::player to NULL in cDvbPlayerControl::Stop() to avoid a possible crash
+  with plugins that retrieve player information after a replay has been stopped, but
+  before the replay control has been destroyed (thanks to Johann Friedrich).
+- Now calling Hide() and cStatus::MsgReplaying(..., false) from cReplayControl::Stop(),
+  to inform plugins about an ending replay session before the replay control gets
+  destroyed.
+- Fixed a possible crash when moving a recording between different volumes (reported by
+  Matthias Senzel).
+- Fixed positioning the cursor in the Recordings menu when moving a recording between
+  different volumes.
+- Added a note to PLUGINS.html about writing log messages in English.
+- Fixed a deadlock when moving a folder containing several recordings between
+  different volumes (reported by Matthias Senzel).
+- Fixed positioning to the current item when changing the sort mode in the Recordings
+  menu, in case there is a LastReplayed recording.
+- The CAM menu is now automatically closed when the current channel is switched
+  (suggested by Dietmar Spingler).
+- Fixed a lengthy write lock on the Recordings list in case of moving a folder with
+  more than one recording (thanks to Matthias Senzel).
+- If TS packets are not accepted by the output device in Transfer Mode, this is now
+  reported only once per minute in the log file.
+- The new setup option "OSD/Sorting direction for recordings" can be used to switch
+  the sequence in which recordings are presented in the "Recordings" menu between
+  ascending (oldest first) and descendeng (newest first) (thanks to Matthias Senzel).
+- When moving recordings between volumes, the "Recordings" menu now displays those items
+  that have not yet been moved completely as non-selectable. This avoids situations
+  where trying to play such a recording might fail.
+- Fixed canceling moving a folder with several recordings between volumes.
+- When moving a recording to a different folder, the cursor is no longer placed on the
+  new location of the recording, but rather stays in the original folder (suggested by
+  Matthias Senzel). If the original folder got empty by moving away the last recording
+  it contained, the cursor is moved up until a non empty folder is found.
+- Changed the log message ""ERROR: copying directory '%s' to '%s' ended prematurely" from
+  "error" to "info", because any actual error would have already been reported before this
+  (suggested by Matthias Senzel).
+- When selecting a folder for a recording or timer, it is now possible to open a folder
+  even if it doesn't contain any subfolders (suggested by Matthias Senzel).
+- Fixed a possible deadlock when detaching a receiver from a device.
+- Moved any locking from cutter.c into recording.c, to avoid a problem with locking
+  the Recordings list (reported by Matthias Senzel).
+- Now using the 'example' macro in vdr.5 (thanks to Chris Mayo).
+- Now unlocking the Recordings list before displaying an error message in
+  cMenuPathEdit::ApplyChanges() and cReplayControl::Stop() (reported by Matthias Senzel).
+- Fixed a possible deadlock when quickly zapping through encrypted channels (reported
+  by J�rg Wendel).
+- The new function cStatus::MarksModified() can be implemented by plugins to get
+  informed about any modifications to the editing marks of the currently played
+  recording (based on a patch from J�rg Wendel).
+- Fixed handling editing marks in the replay progress display, in case the marks are
+  deleted via the Info/Edit menu of the currently played recording (the progress
+  display still displayed them).
+- Limited some CAM related log messages to the actual master CAM, if any.
+- The Perl script 'peerdemo' shows how one can find all the VDRs in the local network
+  using the peer connection mechanism.
+- Added the UPDATE-2.4.0 file.
+- Making sure cSVDRPClient::Process() reads the entire reply once it started reading,
+  even if no Response parameter is given.
+- Replaced the warning regarding the open SVDRP port in the INSTALL file with a remark
+  about using svdrphosts.conf to completely disable SVDRP access.
+- Added a note about the fixed UDP port for SVDRP discovery to vdr.1.
+- Fixed updating the Timers menu after turning a local timer on/off with the Red
+  button.
+- Fixed keeping the cursor position in the Recordings menu in case a timer starts
+  recording while the menu is open.
+- When a timer is newly created in the Timers menu, it now immediately appears at the
+  correct position in the list, rather than first being added at the end and then
+  jumping to the proper offset.
+- Fixed getting the info of a newly edited recording (reported by Matthias Senzel).
+- Improved calculating signal strength and quality (thanks to Helmut Binder).
+- While a timer is recording, the file '.timer' in the recording directory now contains
+  the full id of the timer that is currently recording into this directory. This is used
+  to determine whether a timer is still recording on a remote VDR when deleting a recording
+  from the Recordings menu.
+- Fixed handling SVDRP peering for more than one instance of VDR on the same machine, and
+  improved logging and debug output.
+- Fixed case inconsistency with SVDRPDefaultHost in config.c.
+- Added a section about the '.sort' file to vdr.5.
+- Initiating the client side of a peer-to-peer SVDRP connection is now done with the new
+  SVDRP command CONN instead of using the UDP port with the server's address.
+  This change requires that all VDRs that shall take part in a peer-to-peer network need
+  to be updated to this version.
+- Moved handling remote timers into cSVDRPClientHandler::ProcessConnections().
+- Combined Start/StopSVDRPServer/ClientHandler() into Start/StopSVDRPHandler().
+- Updated the Polish OSD texts (thanks to Tomasz Maciej Nowak).
+- When remote timers are fetched from a peer VDR, we no longer blindly delete and re-add
+  them, but rather compare them and make only the minimum necessary changes.
+- Fixed the CompareInts() function.
+- Disabled the use of posix_fadvise() when reading (i.e. replaying), since it caused
+  stuttering replay in fast forward and fast rewind mode in case the video directory
+  is mounted via NFS. You can re-enable it by setting the macro USE_FADVISE_READ to 1
+  in tools.c.
+- Modified cStateLock's SetExplicitModify() and IncState() (changed to SetModified()) to
+  allow for the introduction of syncing a separate cStateKey to a cStateLock.
+- Assigning events to timers no longer triggers sending a POLL to all peer VDRs.
+- When making modifications to remote timers, the local VDR no longer sends a POLL to
+  all remote VDRs.
+- Fixed removing a cStateKey from a cStateLock (setting StateKey.stateLock = NULL was
+  done too late, after the lock had already been released).
+- Now writing the info file before attaching the recorder to the device, to make sure it
+  is present when the recorder needs to update the fps value.
+- Making sure the Schedules menu has a proper title, even if it is empty.
+- Removed sending the SVDRP command UPDR to peer VDRs whenever a change is made to the
+  recordings in the video directory (which was introduced in version 2.3.8), because it
+  triggered re-reading the video directory too fast.
+- Improved handling VPS timers to better react to EPG changes during an ongoing recording.
+- Commented out the logging in cMarks::Align(), to avoid log entries in case of editing
+  marks that are not generated by VDR itself, and thus may be a little off (suggested by
+  J�rg Wendel). You can activate this line again for debugging if necessary.
+- Made the input buffer in cSVDRPClient dynamic.
+- Fixed handling parameters in the S2SatelliteDeliverySystemDescriptor and
+  T2DeliverySystemDescriptor that were overwritten when parsing the
+  SatelliteDeliverySystemDescriptor or TerrestrialDeliverySystemDescriptor, respectively.
+- Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting
+  the user.
diff --git a/INSTALL b/INSTALL
index 74caf30bb..e75c0385a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -73,16 +73,15 @@ port ("Simple Video Disk Recorder Protocol"). By default, it listens
 on port 6419 (use the --port=PORT option to change this). For details
 about the SVDRP syntax see the source file 'svdrp.c'.
 
-WARNING: DUE TO THE OPEN SVDRP PORT THIS PROGRAM MAY CONSTITUTE A
-=======  POTENTIAL SECURITY HAZARD! IF YOU ARE NOT RUNNING VDR IN
-         A CONTROLLED ENVIRONMENT, YOU MAY WANT TO DISABLE SVDRP
-         BY USING '--port=0'!
-
 The file 'svdrphosts.conf' can be used to define which hosts are allowed
 to access the SVDRP port. By default only localhost (127.0.0.1) is granted
 access. If you want to give other hosts access to your SVDRP port you need to
 add their IP numbers to 'svdrphosts.conf'.
 
+You can disable SVDRP access entirely by either running VDR with '--port=0',
+or by removing all entries (including 127.0.0.1 for the localhost) from
+'svdrphosts.conf'.
+
 If the program shall run as a daemon, use the --daemon option. This
 will completely detach it from the terminal and will continue as a
 background process.
diff --git a/MANUAL b/MANUAL
index 47b2fdd22..4020fe3e0 100644
--- a/MANUAL
+++ b/MANUAL
@@ -665,6 +665,13 @@ Version 2.2
                          If a particular sort mode has been selected for a folder by
                          pressing '0', the default no longer applies to that folder.
 
+  Sorting direction for recordings = ascending
+                         When recordings are sorted "by time", they appear in ascending
+                         order (i.e. "oldest" to "newest"). If this parameter is set to
+                         "descending", they will be presented "newest" to "oldest.
+                         Note that in the latter case, if "Always sort folders first"
+                         is "yes", folders will appear in reverse alphabetical order.
+
   Number keys for characters = yes
                          Controls whether the number keys can be used to enter
                          characters in a text input field. You may want to set this
diff --git a/PLUGINS.html b/PLUGINS.html
index 92a4d3135..fb6ff2aa5 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -605,7 +605,10 @@ <h1>Table Of Contents</h1>
 normal operation! The only exceptions being special debug information as described
 above, fatal error messages that will cause VDR to abort, or if it is the sole
 purpose of the plugin to display something on stdout, like for instance the
-<i>skincurses</i> plugin, which displays the OSD at the console.
+<i>skincurses</i> plugin, which displays the OSD at the console.<br>
+<br>
+Please make any log messages in <b>ENGLISH</b>! Logs are usually sent to the developers
+of a program, and they may not be able to read them if they are in an exotic language.
 </modified>
 
 <hr><h2><a name="Main menu entry">Main menu entry</a></h2>
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index c00efdc23..71c152ecf 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -2,34 +2,37 @@
 # Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002
+# Tomasz Maciej Nowak <tmn505@gmail.com>, 2018
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-hello 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
-"PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
+"PO-Revision-Date: 2018-02-19 00:41+0100\n"
+"Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
-"Language: pl\n"
+"Language: pl_PL\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.6\n"
 
 msgid "A friendly greeting"
-msgstr ""
+msgstr "Przyjazne pozdrowienie"
 
 msgid "Hello"
-msgstr ""
+msgstr "Witaj"
 
 msgid "Greeting time (s)"
-msgstr ""
+msgstr "Czas pozdrowienia (s)"
 
 msgid "Use alternate greeting"
-msgstr ""
+msgstr "Użyj alternatywnego pozdrowienia"
 
 msgid "Howdy folks!"
-msgstr ""
+msgstr "Siema ziomy!"
 
 msgid "Hello world!"
-msgstr ""
+msgstr "Witaj świecie!"
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index b9e476e27..08fabb1ec 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -100,6 +100,11 @@ VDR Plugin 'pictures' Revision History
 
 - Official release.
 
-2015-07.23: Version 2.3.1
+2015-07-23: Version 2.3.1
 
 - Added a missing 'const'.
+
+2017-10-06: Version 2.3.2
+
+- Adapted the pic2mpg script to new ffmpeg options.
+- No longer using 'convert' to scale/rotate the pictures.
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 27d0264a3..1c7d31ba3 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
 #
 # See the README file for copyright information and how to reach the author.
 #
-# $Id: pic2mpg 4.0 2013/07/01 08:33:38 kls Exp $
+# $Id: pic2mpg 4.1 2017/10/06 14:42:18 kls Exp $
 
 use File::Path;
 use File::Spec;
@@ -128,7 +128,7 @@ for ($i = 0; $i < 10; $i++) { # dirs might become empty when removing empty subd
     for $dir (@Dirs) {
         $dir = EscapeMeta($dir);
         print "removing $dir\n";
-        !system("rm -rf $dir") || die "$dir: $!\n";
+        Exec("rm -rf $dir");
         }
     }
 
@@ -142,17 +142,18 @@ sub ConvertFile
   my $Exif = ImageInfo($Pict);
   my $Orientation = $$Exif{"Orientation"};
   my ($Degrees) = $Orientation =~ /Rotate ([0-9]+)/;
-  my $Rotate = $Degrees ? "-rotate $Degrees" : "";
+  my $Rotate = ($Degrees == 90) ? "transpose=clock" : ($Degrees == 180) ? "hflip,vflip" : ($Degrees == 270) ? "transpose=cclock" : "";
+  $Rotate .= ',' if ($Rotate);
+  my $Background = '#000000@1';
   print "orientation = '$Orientation' -> rotation = $Rotate\n" if ($Detailed);
   $Pict = EscapeMeta($Pict);
   $Mpeg = EscapeMeta($Mpeg);
   print "$Pict -> $Mpeg $Rotate\n" if $ListFiles;
-  my $Cmd = "convert $Pict -background '#000000' $Rotate -resize $Size -gravity center -extent $Extent ppm:- | "
-          . "ffmpeg -f image2pipe -vcodec ppm -i pipe:0 -an -vcodec libx264 -vpre baseline -s $Size -qscale 2 -f mpegts -y $Mpeg "
+  my $Cmd = "ffmpeg -i $Pict -vf '${Rotate}scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2:$Background' -c:v libx264 -pix_fmt yuv420p -f mpegts -y $Mpeg "
           . ($Detailed ? "" : "2>/dev/null");
-  !system($Cmd) || die "$Cmd: $!\n";
+  Exec($Cmd);
   $Cmd = "touch -r $Pict $Mpeg";
-  !system($Cmd) || die "$Cmd: $!\n";
+  Exec($Cmd);
 }
 
 sub EscapeMeta
@@ -162,3 +163,10 @@ sub EscapeMeta
   $s =~ s/([$META])/\\$1/g;
   return $s;
 }
+
+sub Exec
+{
+  my $Cmd = shift;
+  print "==> '$Cmd'\n" if ($Verbose);
+  !system($Cmd) || die "$Cmd: $!\n";
+}
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 509514eab..430ebe28c 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 4.1 2015/07/23 10:14:22 kls Exp $
+ * $Id: pictures.c 4.2 2017/10/06 15:10:44 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "2.3.1";
+static const char *VERSION       = "2.3.2";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/po/pl_PL.po b/PLUGINS/src/pictures/po/pl_PL.po
new file mode 100644
index 000000000..2d0de10a1
--- /dev/null
+++ b/PLUGINS/src/pictures/po/pl_PL.po
@@ -0,0 +1,34 @@
+# VDR plugin language source file.
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Tomasz Maciej Nowak <tmn505@gmail.com>, 2018
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2018-02-19 00:48+0100\n"
+"PO-Revision-Date: 2018-02-19 00:53+0100\n"
+"Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
+"Language-Team: Polish <vdr@linuxtv.org>\n"
+"Language: pl_PL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.6\n"
+
+msgid "Pictures"
+msgstr "Zdjęcia"
+
+msgid "A simple picture viewer"
+msgstr "Prosta przeglądarka zdjęć"
+
+msgid "Picture directory"
+msgstr "Katalog ze zdjęciami"
+
+msgid "Slide show delay (s)"
+msgstr "Pokaz slajdów opóźnienie (s)"
+
+msgid "No picture directory has been defined!"
+msgstr "Nie zdefiniowano katalogu ze zdjęciami!"
diff --git a/PLUGINS/src/skincurses/po/pl_PL.po b/PLUGINS/src/skincurses/po/pl_PL.po
new file mode 100644
index 000000000..fd027241b
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/pl_PL.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# This file is distributed under the same license as the VDR package.
+# Tomasz Maciej Nowak <tmn505@gmail.com>, 2018
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2018-02-19 00:48+0100\n"
+"PO-Revision-Date: 2018-02-19 01:02+0100\n"
+"Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
+"Language-Team: Polish <vdr@linuxtv.org>\n"
+"Language: pl_PL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.6\n"
+
+msgid "A text only skin"
+msgstr "Skóra tekstowa"
+
+msgid "Key$Mute"
+msgstr "Wycisz"
+
+#. TRANSLATORS: note the trailing blank!
+msgid "Volume "
+msgstr "Głośność "
+
+msgid "Text mode"
+msgstr "Tryb tekstowy"
diff --git a/UPDATE-2.4.0 b/UPDATE-2.4.0
new file mode 100644
index 000000000..cdf56dc79
--- /dev/null
+++ b/UPDATE-2.4.0
@@ -0,0 +1,440 @@
+This is a summary of the changes in VDR 2.4.0 since the last stable
+version 2.2.0. It only contains things that are of actual importance
+to the user and doesn't mention the many fixes and improvements that
+have been made "behind the scenes".
+
+See the file HISTORY for a detailed list of all changes.
+
+Peering:
+
+- If there is more than one VDR in the local network, they can now form a peer-to-peer
+  network, so that timers can be moved freely between them.
+  The following changes have been made to implement this:
+  + VDR now sends out a broadcast to port 6419/udp, which was assigned to 'svdrp-disc'
+    by the IANA. VDRs listening on that port will automatically initiate an SVDRP
+    connection to the broadcasting VDR, and in turn send out a broadcast to make
+    other VDRs connect to them. That way all VDRs within the local network will
+    have permanent "peer-to-peer" SVDRP connections between each other. The
+    configuration in the svdrphosts.conf file is taken into account when considering
+    whether or not to respond to an SVDRP discover broadcast.
+  + The new SVDRP command PING is used by automatically established peer-to-peer
+    connections to keep them alive.
+  + The new function GetSVDRPServerNames() can be used to get a list of all VDRs
+    this VDR is connected to via SVDRP.
+  + The new function ExecSVDRPCommand() can be used to execute an SVDRP command on
+    one of the servers this VDR is connected to, and retrieve the result.
+    The helper functions SVDRPCode() and SVDRPValue() can be used to easily access
+    the codes and values returned by ExecSVDRPCommand().
+  + The new SVDRP command POLL is used by automatically established peer-to-peer
+    connections to trigger fetching remote timers.
+  + The new options "Setup/Miscellaneous/SVDRP peering", ".../SVDRP host name" and
+    ".../SVDRP default host" can be used to configure automatic peering between VDRs
+    in the same network. Peering is disabled by default and can be enabled by setting
+    "SVDRP peering" to "yes".
+  + The "Edit timer" menu now has a new parameter "Record on", which can be used to
+    select the VDR on which this timer shall record. Timers can be freely moved
+    between connected VDRs by simply selecting the desired machine in this field.
+  + The cTimer class now has a new member named 'remote', which holds the name of the
+    remote server this timer will record on. If this is NULL, it is a local timer.
+  + Added a note to the "Pausing live video" section of the MANUAL, stating that
+    the timer for paused live video will always record on the local VDR, even if
+    an "SVDRP default host" has been set for normal timer recordings.
+  + The Perl script 'peerdemo' shows how one can find all the VDRs in the local network
+    using the peer connection mechanism.
+
+Conditional Access:
+
+- Implemented support for MTD ("Multi Transponder Decryption"). This allows a CAM
+  that is capable of decrypting more than one channel ("Multi Channel Decryption")
+  to decrypt channels from different transponders. See the remarks in mtd.h on
+  what a derived cCamSlot class needs to do in order to activate MTD.
+- The Setup/CAM menu now displays which device an individual CAM is currently
+  assigned to.
+- The channel/CAM relations (i.e. the information which CAM can decrypt a given
+  channel) are now stored in the file 'cam.data' in the cache directory.
+  This speeds up switching to encrypted channels after newly starting VDR, in case
+  there is more than one CAM in the system.
+  The file 'cam.data' is not written if it is read-only.
+- The mechanism of trying different CAMs when switching to an encrypted channel is
+  now only triggered if there acually is more than one CAM in the system.
+- CAMs that can handle multiple devices at the same time can now indicate this
+  by creating the first cCamSlot as usual, and every other cCamSlot by giving
+  it the first one as its "MasterSlot". To VDR this means that when searching
+  for a CAM that can decrypt a particular channel, it only needs to ask the
+  master CAM slot whether it is suitable for decrypting, and can skip all the
+  other slots belonging to the same master. This can greatly speed up channel
+  switching on systems with more than one CAM (that can handle multiple devices).
+- The LCARS skin now displays the master CAM's number when a device is tuned to
+  an encrypted channel.
+- The Setup/CAM menu now only displays master CAMs.
+- Detecting whether a particular CAM actually decrypts a given channel is now
+  done separately for each receiver.
+- The function cCamSlot::Decrypt() can now also be called with Data == NULL.
+  This is necessary to allow CAMs that copy the incoming data into a separate buffer
+  to return previously received and decrypted TS packets. See ci.h for details.
+  Plugins that implement a derived cCamSlot need to properly handle this case, and
+  plugins that implement a derived cDevice need to call Decrypt() in their
+  GetTSPacket() function even if the incoming buffer is currently empty (see
+  cDvbDevice::GetTSPacket()).
+- CAMs are now sent a generated EIT packet that contains a single 'present event' for
+  the current SID, in order to avoid any parental rating dialogs.
+- When selecting a device/CAM combination for live viewing, CAMs that are known to
+  decrypt the requested channel are now given a higher priority than prefering the
+  primary device.
+- Extended the CI API to allow plugins to implement additional CAM resources.
+- The new configuration file 'camresponses.conf' can be used to define automatic
+  responses to CAM menus, for instance to avoid annyoing popup messages or entering
+  the parental rating PIN. See vdr.5 for details.
+
+Timers:
+
+- The cTimer class now has a new member named 'remote', which holds the name of the
+  remote server this timer will record on. If this is NULL, it is a local timer.
+- Timers from other VDRs that are connected to this VDR via SVDRP are now
+  automatically fetched and stored in the global Timers list. In order for this
+  to work, all of the channels used by timers on the remote VDR must also be
+  defined on the local VDR (however, not necessarily in the same sequence).
+- Accessing the global Timers list now has to be protected by proper locking,
+  because SVDRP commands are now executed in a separate thread.
+  The introduction of this locking mechanism required the following changes:
+  + The new classes cStateLock and cStateKey are used to implement locking
+    with quick detection of state changes.
+  + cConfig::cConfig() now has a parameter that indicates whether this list
+    requires locking.
+  + The global lists of Timers, Channels, Schedules and Recordings are no longer
+    static variables. They are now pointers that need to be retrieved through
+    a call to cTimers::GetTimersRead/Write(), cChannels::GetChannelsRead/Write(),
+    cSchedules::GetSchedulesRead/Write() and cRecordings::GetRecordingsRead/Write(),
+    respectively.
+  + References from/to link channels are now removed in cChannels::Del() rather
+    than cChannel::~cChannel(), to make sure the caller holds a proper lock.
+  + cChannel::HasTimer() has been removed. This information is now retrieved
+    via cSchedule::HasTimer().
+  + Several member functions of cChannel, cTimer, cMarks and cRecording have
+    been made 'const', and some of them are now available as both 'const' and
+    'non-const' versions.
+  + The cChannel::Set...() functions are now 'bool' and return true if they have
+    actually changed any of the channels's members.
+  + cChannels::SetModified() has been renamed to cChannels::SetModifiedByUser().
+  + cChannels::Modified() has been renamed to cChannels::ModifiedByUser(), and
+    now has a 'State' parameter that allows the caller to see whether a channel
+    has been modified since the last call to this function with the same State
+    variable.
+  + The macros CHANNELSMOD_NONE/_AUTO/_USER have been removed.
+  + cMarks now requires locking via cStateKey.
+  + cSortedTimers now requires a pointer to the list of timers.
+  + cEvent::HasTimer() no longer scans the list of timers to check whether an event
+    is referenced by a timer, but rather keeps score of how many timers reference
+    it. This was necessary in order to avoid having to lock the list of timers from
+    within a cEvent.
+  + The new class cListGarbageCollector is used to temporary store any objects deleted
+    from cLists that require locking. This allows pointers to such objects to be
+    dereferenced even if the objects are no longer part of the list.
+  + cListBase::Contains() can be used to check whether a particular object is still
+    contained in that list.
+  + Outdated events are no longer "phased out", but rather deleted right away and thus
+    taken care of by the new "garbage collector" of the list.
+  + Deleted cRecording objects are no longer kept in a list of "vanished" recordings,
+    but are rather taken care of by the new "garbage collector" of the list.
+  + cSchedules::ClearAll() has been removed. The functionality is now implemented
+    directly in cSVDRPServer::CmdCLRE().
+  + cSchedule now has a member Modified(), which can be used with a State variable
+    to quickly determine whether this schedule has been modified since the last call
+    to this function with the same State variable.
+  + cSchedulesLock has been removed. Locking the list of schedules is now done via
+    the cList's new locking mechanism.
+  + The 'OnlyRunningStatus' parameters in cEpgHandler::BeginSegmentTransfer() and
+    cEpgHandler::EndSegmentTransfer() are now obsolete. They are still present in
+    the interface for backward compatibility, but may be removed in a future version.
+    Their value is always 'false'.
+  + The constant tcMod is no longer used in cStatus::TimerChange(). The definition is
+    still there for backward compatibility.
+- Plugins that access the global lists of Timers, Channels, Recordings or Schedules
+  will need to be adapted as follows:
+  + Instead of directly accessing the global variables Timers, Channels or Recordings,
+    they need to set up a cStateKey variable and call the proper getter function,
+    as in
+      cStateKey StateKey;
+      if (const cTimers *Timers = cTimers::GetTimersRead(StateKey)) {
+         // access the timers
+         StateKey.Remove();
+         }
+    and
+      cStateKey StateKey;
+      if (cTimers *Timers = cTimers::GetTimersWrite(StateKey)) {
+         // access the timers
+         StateKey.Remove();
+         }
+    See timers.h, thread.h and tools.h for details on this new locking mechanism.
+  + There are convenience macros for easily accessing these lists without having
+    to explicitly set up a cStateKey and calling its Remove() function. These macros
+    have the form LOCK_*_READ/WRITE (with '*' being TIMERS, CHANNELS, SCHEDULES or
+    RECORDINGS). Simply put such a macro before the point where you need to access
+    the respective list, and there will be a pointer named Timers, Channels, Schedules
+    or Recordings, respectively, which is valid until the end of the current block.
+  + If a plugin needs to access several of the global lists in parallel, locking must
+    always be done in the sequence Timers, Channels, Recordings, Schedules. This is
+    necessary to make sure that different threads that need to lock several lists at
+    the same time don't end up in a deadlock.
+  + Some pointer variables may need to be made 'const'. The compiler will tell you
+    about these.
+- If a timer is newly created with the Red button in the Schedule menu, and the timer
+  is presented to the user in the "Edit timer" menu because it will start immediately,
+  it now *must* be confirmed with "Ok" to set the timer. Otherwise the timer will not
+  be created.
+- The function cTimer::ToText() no longer returns a newline character at the end of
+  the string. The newline is now added by the caller as necessary. This was changed
+  because cTimer::ToText() is now also needed in a context where the terminating
+  newline can't be used. Consequently, cChannel::ToText() and cMark::ToText() have
+  been modified accordingly.
+- Timers now have unique ids instead of numbers, which remain valid as long as this
+  instance of VDR is running. This means that timers are no longer continuously
+  numbered from 1 to N in LSTT. There may be
+  gaps in the sequence, in case timers have been deleted.
+- Timers are now linked to EPG events even if they are inactive. By default Events that
+  are linked to inactive timers are marked with 'I' and 'i', depending on whether the
+  timer would record the entire Event or only part of it.
+  The function cSkinDisplayMenu::SetItemEvent() now has an additional parameter named
+  TimerActive, which indicates whether the timer that would record this event (if any)
+  is active. A plugin may react on this when displaying a menu line for an event.
+  The old version of cSkinDisplayMenu::SetItemEvent() (without the TimerActive
+  parameter) is still there for backwards compatibility. It may be removed in a future
+  version, so plugin authors should switch to the new one.
+- Improved handling VPS timers to better react to EPG changes during an ongoing recording.
+
+Plugins:
+
+- The dvbhddevice plugin is no longer part of the VDR source archive.
+  You can get the latest version of this plugin from the author's repository at
+  https://bitbucket.org/powARman/dvbhddevice.
+- The dvbsddevice and rcu plugins are no longer part of the VDR source archive.
+  You can get the latest versions of these plugins from ftp://ftp.tvdr.de/vdr/Plugins.
+- The -V and -h options now list the plugins in alphabetical order.
+- Added some guidelines and recommendations to the 'Logging' section of PLUGINS.html.
+  The most important being: implement a command line option to control the level
+  of logging (in particular allow turning off logging completely!) and never print
+  anything to stdout or stderr (unless one of the listed exceptions applies).
+- Added a note to PLUGINS.html about writing log messages in English.
+- The new function cStatus::MarksModified() can be implemented by plugins to get
+  informed about any modifications to the editing marks of the currently played
+  recording.
+
+Skins:
+
+- The main menu of the LCARS skin now displays a small rectangle on the left side
+  of a timer if this is a remote timer. The color of that rectangle changes if
+  the timer is currently recording on the remote VDR.
+- Skins can now implement cSkinDisplayMenu::MenuOrientation() to display horizontal
+  menus.
+- The LCARS skin now displays the master CAM's number when a device is tuned to
+  an encrypted channel.
+
+Remote control:
+
+- The new setup option "Recording/Record key handling" can be used to define
+  what happens if the Record key on the remote control is pressed during
+  live tv.
+- If the Channel+/- keys are pressed while in the Schedules menu, the menu is now
+  switched to the EPG of the new current channel.
+
+Devices:
+
+- The command line option -D now accepts the value '-' (as in -D-), which prevents
+  VDR from using any DVB devices.
+- The function cDevice::SetCurrentChannel(const cChannel *Channel) is now deprecated
+  and may be removed in a future version. Use SetCurrentChannel(int ChannelNumber)
+  instead.
+- Signal strength and quality (CNR) are now determined via DVB API 5 (if available).
+  Fallback is the old DVB API 3 method.
+- The new function cDevice::SignalStats() (if implemented by an actual device) returns
+  statistics about the currently received signal.
+- The function cDevice::GetVideoSystem() (which has been deprecated since version 2.1.6)
+  has been finally removed.
+- Switching the primary device is no longer done via osSwitchDvb (which has been
+  removed), but rather by the main program loop reacting to changes in Setup.PrimaryDVB.
+
+EPG:
+
+- The character 0x0D is now stripped from EPG texts.
+- The EPG scanner no longer moves the dish if there is a positioner.
+- The function cEpgHandlers::BeginSegmentTransfer() is now boolean.
+  See the description in epg.h for the meaning of the return value.
+- The cEvent class now has a new member 'aux', in which external applications can
+  store auxiliary information with an event. This string has no meaning whatsoever to
+  VDR itself, and it will not be written into the info file of a recording that is
+  made for such an event.
+- Changed the default return value of cEpgHandler::BeginSegmentTransfer() to true, to
+  avoid problems with derived classes that don't implement this function.
+
+OSD:
+
+- The new function cOsd::MaxPixmapSize() can be called to determine the maximum size
+  a cPixmap may have on the current OSD. The 'osddemo' example has been modified
+  accordingly. Plugin authors may want to use this function in case they use pixmaps
+  that are larger than the full OSD size. The default implementation sets this limit
+  to 2048x2048 pixel.
+- Added some comment to cPixmap about the relation between OSD, ViewPort and DrawPort.
+- The new setup option "OSD/Default sort mode for recordings" can be used to define
+  how recordings shall be sorted by default (either by time or by name, with "by time"
+  being the default). If a particular sort mode has been selected for a folder by
+  pressing '0', the default no longer applies to that folder. Repeating timers no
+  longer write a ".sort" file into a recordings folder to have the recordings sorted
+  by time.
+- The function cOsd::GetBitmap() is now 'protected'. If a plugin doesn't compile with
+  this version of VDR, you can uncomment the line
+  //#define DEPRECATED_GETBITMAP
+  in osd.h as a quick workaround. In the long run the plugin will need to be adapted.
+- Background modifications of channels, timers and events are now displayed immediately
+  in the corresponding menus.
+- The Timers menu now displays the name of the remote VDR in front of the timer's
+  file name, if this is a remote timer.
+- The width and height of the OSD are now limited to the actual maximum dimensions
+  of the output device, taking into account the top and left offset.
+- Added a note to the description of cFont::Size(), regarding possible differences
+  between it and cFont::Height().
+- Added cFont::Width(void) to get the default character width and allow stretched
+  font drawing in high level OSDs.
+- cOsdMenu::Display() now checks whether the OSD size has changed and if so calls
+  SetDisplayMenu().
+- The option "Setup/Miscellaneous/Show channel names with source" can now be set to
+  "type" or "full" to show either the type or the full name of the source.
+- The "Channels" menu now indicates whether a channel is encrypted ('X') or a radio
+  channel ('R').
+- The timeout for the channel display is now reset whenever the channel or EPG data
+  changes.
+- OSD menus now try to keep the offset of the list cursor at a constant position on
+  the screen, even if the list is modified while being displayed.
+- If an event in the Schedules menu is marked with a 'T' or 'I' and the user presses the
+  Red button to edit the timer, local timers are now preferred over remote timers
+  in case there is more than one timer that will record that event.
+- The new setup option "OSD/Sorting direction for recordings" can be used to switch
+  the sequence in which recordings are presented in the "Recordings" menu between
+  ascending (oldest first) and descendeng (newest first).
+- When selecting a folder for a recording or timer, it is now possible to open a folder
+  even if it doesn't contain any subfolders.
+
+Recordings:
+
+- Recordings now have unique ids instead of numbers, which remain valid as long as
+  this instance of VDR is running. This means that recordings are no longer continuously
+  numbered from 1 to N in LSTR. There may be gaps in the sequence, in case recordings
+  have been deleted, and they are not necessarily listed in numeric order.
+- Added detection of 24fps.
+- The script that gets called for recordings is now also called right before a
+  recording is edited, with the first parameter being "editing".
+- Implemented a frame parser for H.265 (HEVC) recordings.
+- When moving recordings between volumes, the "Recordings" menu now displays those items
+  that have not yet been moved completely as non-selectable. This avoids situations
+  where trying to play such a recording might fail.
+- When moving a recording to a different folder, the cursor is no longer placed on the
+  new location of the recording, but rather stays in the original folder.
+  If the original folder got empty by moving away the last recording
+  it contained, the cursor is moved up until a non empty folder is found.
+
+SVDRP:
+
+- The SVDRP port now accepts multiple concurrent connections. You can now keep an
+  SVDRP connection open as long as you wish, without preventing others from
+  connecting. Note, though, that SVDRP connections still get closed automatically
+  if there has been no activity for 300 seconds (configurable via
+  "Setup/Miscellaneous/SVDRP timeout (s)").
+- The SVDRP log messages have been unified and now always contain the IP and port
+  number of the remote host.
+- SVDRP connections are now handled in a separate "SVDRP server handler" thread,
+  which makes them more responsive. Note that there is only one thread that handles
+  all concurrent SVDRP connections. That way each SVDRP command is guaranteed to be
+  processed separately, without interfering with any other SVDRP commands that might
+  be issued at the same time. Plugins that implement SVDRP commands may need to take
+  care of proper locking if the commands access global data.
+- You can now set DumpSVDRPDataTransfer in svdrp.c to true to have all SVDRP
+  communication printed to the console for debugging.
+- The SVDRP commands that deal with timers (DELT, LSTT, MODT, NEWT, NEXT and UPDT)
+  as well as any log messages that refer to timers, now use a unique id for each
+  timer, which remains valid as long as this instance of VDR is running. This means
+  that timers are no longer continuously numbered from 1 to N in LSTT. There may be
+  gaps in the sequence, in case timers have been deleted.
+- All timer related response strings from SVDRP commands now use the channel ID
+  instead of channel numbers.
+- The SVDRP command DELT no longer checks whether the timer that shall be deleted
+  is currently recording.
+- The SVDRP command DELC now refuses to delete the very last channel in the list,
+  to avoid ending up with an empty channel list.
+- The SVDRP commands that deal with recordings (DELR, EDIT, LSTR, MOVR, and PLAY)
+  now use a unique id for each recording, which remains valid as long as this
+  instance of VDR is running. This means that recordings are no longer continuously
+  numbered from 1 to N in LSTR. There may be gaps in the sequence, in case recordings
+  have been deleted, and they are not necessarily listed in numeric order.
+- Changed 'number' to 'id' in the help texts of SVDRP commands that deal with
+  timers.
+- The SVDRP command LSTC can now list the channels with channel ids if the option
+  ':ids' is given.
+- If 0 is given as the channel number in the SVDRP command LSTC, the data of the
+  current channel is listed.
+- The new SVDRP commands 'LSTD' and 'PRIM' can be used to list all available devices
+  and to switch the primary device.
+
+Misc:
+
+- Added a section about Output Devices to the INSTALL file.
+- The -u option now also accepts a numerical user id.
+- The cRwLock class now allows nested read locks within a write lock from the
+  same thread. This fixes possible crashes when moving or deleting channels in
+  the menu or through SVDRP (as well as other operations that try to acquire a
+  read lock within a write lock).
+- Added support for the systemd watchdog.
+- PIDs can now be added to and deleted from a cReceiver while it is attached to
+  a cDevice, without having to detach it first and re-attach it afterwards.
+- Log messages about switching channels now include the channel ID.
+- The constructor of cHash (via cHashBase) now has an additional parameter (OwnObjects)
+  which, if set to true, makes the hash take ownership of the hashed objects, so that
+  they are deleted when the hash is cleared or destroyed.
+- cListObject now implements a private copy constructor and assignment operator, to keep
+  derived objects from calling them implicitly.
+- The Makefiles have been modified so that during the build process they no longer
+  display the actual (lengthy) commands, but rather just the name of the file that
+  is being built, as in
+  CC vdr.o
+  The first two characters indicate the kind of operation (CC=compile, LD=link,
+  AR=archive, MO=msgfmt, GT=xgettext, PO=msgmerge, IN=install).
+  This way it is much easier to spot error messages and warnings, since they are not
+  buried under tons of text.
+  Add VERBOSE=1 to the 'make' call in the VDR source directory to see the
+  actual commands that are executed.
+  Plugin authors should modify their makefiles accordingly, by simply preceeding
+  the respective commands with '$(Q)' and inserting '@echo XX $@' (where XX is one
+  of the character combinations listed above) before the command.
+  The newplugin script has also been modified accordingly.
+  Note that if you build a plugin directly in the plugin's own source directory,
+  the $(Q) macro won't be defined and commands will be displayed. You can add
+  Q=@ to the make call to have it less verbose (provided the plugin's Makefile
+  was modified as described above).
+- Added backtrace functions for debugging (see cBackTrace in thread.h).
+- Added checking the correct sequence of locking global lists.
+  At the first occurrence of an invalid locking
+  sequence, the 20 most recent locks will be written to the log file, followed by a
+  backtrace that led to the call in question. This code can be activated by defining
+  the macro DEBUG_LOCKSEQ in thread.c (which is on by default).
+  When debugging an actual invalid locking sequence, you can additionally define
+  the macro DEBUG_LOCKCALL in thread.c, which will add information about the caller
+  of each lock. Note that this may cause some stress on the CPU, therefore it is off
+  by default.
+- The file Make.config.template now reacts on DEBUG=1 in the 'make' command line,
+  and disables code optimizations by setting -O0.
+  This can be helpful when backtracing highly optimized code. You may want to
+  'make distclean' before running 'make' with a modified setting of DEBUG, to make
+  sure all object files are newly compiled.
+- Introduced the new macro DISABLE_TEMPLATES_COLLIDING_WITH_STL, which can be defined
+  before including tools.h in case some plugin needs to use the STL and gets error
+  messages regarding one of the template functions defined in tools.h.
+- The macros used to control deprecated code or functions have been changed to hold
+  numeric values (0 and 1), so that they can be controlled at compile time, without
+  having to edit the actual source code.
+- The default for DEPRECATED_VDR_CHARSET_OVERRIDE has been set to 0, which means VDR
+  no longer reacts on the environment variable VDR_CHARSET_OVERRIDE. You can add
+  'DEPRECATED_VDR_CHARSET_OVERRIDE=1' when compiling in order to restore this
+  functionality. However, it is recommended to use the command line option --chartab
+  instead.
+- Disabled the use of posix_fadvise() when reading (i.e. replaying), since it caused
+  stuttering replay in fast forward and fast rewind mode in case the video directory
+  is mounted via NFS. You can re-enable it by setting the macro USE_FADVISE_READ to 1
+  in tools.c.
diff --git a/ci.c b/ci.c
index b6ea32693..8ad50e43d 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.18 2017/06/19 12:13:38 kls Exp $
+ * $Id: ci.c 4.20 2018/02/03 12:55:03 kls Exp $
  */
 
 #include "ci.h"
@@ -122,6 +122,8 @@ class cCaPidReceiver : public cReceiver {
   uchar *bufp;
   uchar mtdCatBuffer[TS_SIZE]; // TODO: handle multi packet CATs!
   int length;
+  cMutex mutex;
+  bool handlingPid;
   void AddEmmPid(int Pid);
   void DelEmmPids(void);
 public:
@@ -130,6 +132,15 @@ class cCaPidReceiver : public cReceiver {
   virtual void Receive(const uchar *Data, int Length);
   bool HasCaPids(void) const { return NumPids() - emmPids.Size() - 1 > 0; }
   void Reset(void) { DelEmmPids(); catVersion = -1; }
+  bool HandlingPid(void);
+       ///< The cCaPidReceiver adds/deletes PIDs to/from the base class cReceiver,
+       ///< which in turn does the same on the cDevice it is attached to. The cDevice
+       ///< then sets the PIDs on the assigned cCamSlot, which can cause a deadlock on the
+       ///< cCamSlot's mutex if a cReceiver is detached from the device at the same time.
+       ///< Since these PIDs, however, are none that have to be decrypted,
+       ///< it is not necessary to set them in the CAM. Therefore this function is
+       ///< used in cCamSlot::SetPid() to detect this situation, and thus avoid the
+       ///< deadlock.
   };
 
 cCaPidReceiver::cCaPidReceiver(void)
@@ -137,7 +148,11 @@ cCaPidReceiver::cCaPidReceiver(void)
   catVersion = -1;
   bufp = NULL;
   length = 0;
+  handlingPid = false;
+  cMutexLock MutexLock(&mutex);
+  handlingPid = true;
   AddPid(CATPID);
+  handlingPid = false;
 }
 
 void cCaPidReceiver::AddEmmPid(int Pid)
@@ -147,14 +162,20 @@ void cCaPidReceiver::AddEmmPid(int Pid)
          return;
       }
   emmPids.Append(Pid);
+  cMutexLock MutexLock(&mutex);
+  handlingPid = true;
   AddPid(Pid);
+  handlingPid = false;
 }
 
 void cCaPidReceiver::DelEmmPids(void)
 {
+  cMutexLock MutexLock(&mutex);
+  handlingPid = true;
   for (int i = 0; i < emmPids.Size(); i++)
       DelPid(emmPids[i]);
   emmPids.Clear();
+  handlingPid = false;
 }
 
 void cCaPidReceiver::Receive(const uchar *Data, int Length)
@@ -239,6 +260,12 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
      }
 }
 
+bool cCaPidReceiver::HandlingPid(void)
+{
+  cMutexLock MutexLock(&mutex);
+  return handlingPid;
+}
+
 // --- cCaActivationReceiver -------------------------------------------------
 
 // A receiver that is used to make the device stay on a given channel and
@@ -279,7 +306,7 @@ void cCaActivationReceiver::Receive(const uchar *Data, int Length)
      if (TsIsScrambled(Data))
         lastScrambledTime = Now;
      else if (Now - lastScrambledTime > UNSCRAMBLE_TIME) {
-        dsyslog("CAM %d: activated!", camSlot->SlotNumber());
+        dsyslog("CAM %d: activated!", camSlot->MasterSlotNumber());
         Skins.QueueMessage(mtInfo, tr("CAM activated!"));
         cDevice *d = Device();
         Detach();
@@ -1111,10 +1138,12 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
        case AOT_CA_PMT_REPLY: {
             dbgprotocol("Slot %d: <== Ca Pmt Reply (%d)", CamSlot()->SlotNumber(), SessionId());
             if (!repliesToQuery) {
-               dsyslog("CAM %d: replies to QUERY - multi channel decryption (MCD) possible", CamSlot()->SlotNumber());
+               if (CamSlot()->IsMasterSlot())
+                  dsyslog("CAM %d: replies to QUERY - multi channel decryption (MCD) possible", CamSlot()->SlotNumber());
                repliesToQuery = true;
                if (CamSlot()->MtdAvailable()) {
-                  dsyslog("CAM %d: supports multi transponder decryption (MTD)", CamSlot()->SlotNumber());
+                  if (CamSlot()->IsMasterSlot())
+                     dsyslog("CAM %d: supports multi transponder decryption (MTD)", CamSlot()->SlotNumber());
                   CamSlot()->MtdActivate(true);
                   }
                }
@@ -2588,6 +2617,8 @@ void cCamSlot::AddPid(int ProgramNumber, int Pid, int StreamType)
 
 void cCamSlot::SetPid(int Pid, bool Active)
 {
+  if (caPidReceiver && caPidReceiver->HandlingPid())
+     return;
   cMutexLock MutexLock(&mutex);
   for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
       for (cCiCaPidData *q = p->pidList.First(); q; q = p->pidList.Next(q)) {
diff --git a/ci.h b/ci.h
index 827ce57c1..02e59d2ef 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 4.10 2017/06/09 14:21:26 kls Exp $
+ * $Id: ci.h 4.12 2018/03/17 12:17:37 kls Exp $
  */
 
 #ifndef __CI_H
@@ -304,7 +304,7 @@ class cCamSlot : public cListObject {
   virtual ~cCamSlot();
   bool IsMasterSlot(void) { return !masterSlot; }
        ///< Returns true if this CAM slot itself is a master slot (which means that
-       ///< it doesn't have pointer to another CAM slot that's its master).
+       ///< it doesn't have a pointer to another CAM slot that's its master).
   cCamSlot *MasterSlot(void) { return masterSlot ? masterSlot : this; }
        ///< Returns this CAM slot's master slot, or a pointer to itself if it is a
        ///< master slot.
@@ -402,7 +402,7 @@ class cCamSlot : public cListObject {
        ///< call to AddPid()) to Active. A later call to StartDecrypting() will
        ///< send the full list of currently active CA_PMT entries to the CAM.
   virtual void AddChannel(const cChannel *Channel);
-       ///< Adds all PIDs if the given Channel to the current list of PIDs.
+       ///< Adds all PIDs of the given Channel to the current list of PIDs.
        ///< If the source or transponder of the channel are different than
        ///< what was given in a previous call to AddChannel(), any previously
        ///< added PIDs will be cleared.
diff --git a/config.c b/config.c
index 0b5a1021f..43c3cbbb7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 4.6 2017/05/21 10:25:26 kls Exp $
+ * $Id: config.c 4.8 2018/02/15 14:40:36 kls Exp $
  */
 
 #include "config.h"
@@ -432,6 +432,7 @@ cSetup::cSetup(void)
   FoldersInTimerMenu = 1;
   AlwaysSortFoldersFirst = 1;
   DefaultSortModeRec = rsmTime;
+  RecSortingDirection = rsdAscending;
   NumberKeysForChars = 1;
   ColorKey0 = 0;
   ColorKey1 = 1;
@@ -641,7 +642,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPPeering"))        SVDRPPeering       = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPHostName"))     { if (*Value) strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName)); }
-  else if (!strcasecmp(Name, "SVDRPdefaultHost"))    strn0cpy(SVDRPDefaultHost, Value, sizeof(SVDRPDefaultHost));
+  else if (!strcasecmp(Name, "SVDRPDefaultHost"))    strn0cpy(SVDRPDefaultHost, Value, sizeof(SVDRPDefaultHost));
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
   else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value);
   else if (!strcasecmp(Name, "RcRepeatDelay"))       RcRepeatDelay      = atoi(Value);
@@ -658,6 +659,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
   else if (!strcasecmp(Name, "AlwaysSortFoldersFirst")) AlwaysSortFoldersFirst = atoi(Value);
+  else if (!strcasecmp(Name, "RecSortingDirection")) RecSortingDirection= atoi(Value);
   else if (!strcasecmp(Name, "DefaultSortModeRec"))  DefaultSortModeRec = atoi(Value);
   else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
   else if (!strcasecmp(Name, "ColorKey0"))           ColorKey0          = atoi(Value);
@@ -789,6 +791,7 @@ bool cSetup::Save(void)
   Store("RecordingDirs",      RecordingDirs);
   Store("FoldersInTimerMenu", FoldersInTimerMenu);
   Store("AlwaysSortFoldersFirst", AlwaysSortFoldersFirst);
+  Store("RecSortingDirection",RecSortingDirection);
   Store("DefaultSortModeRec", DefaultSortModeRec);
   Store("NumberKeysForChars", NumberKeysForChars);
   Store("ColorKey0",          ColorKey0);
diff --git a/config.h b/config.h
index 93488be5f..6d25a1410 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.12 2017/06/12 08:58:26 kls Exp $
+ * $Id: config.h 4.14 2017/12/09 14:15:58 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.8"
-#define VDRVERSNUM   20308  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.3.9"
+#define VDRVERSNUM   20309  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.8"
-#define APIVERSNUM   20308  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.3.9"
+#define APIVERSNUM   20309  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
@@ -306,6 +306,7 @@ class cSetup : public cConfig<cSetupLine> {
   int FoldersInTimerMenu;
   int AlwaysSortFoldersFirst;
   int DefaultSortModeRec;
+  int RecSortingDirection;
   int NumberKeysForChars;
   int ColorKey0, ColorKey1, ColorKey2, ColorKey3;
   int VideoDisplayFormat;
diff --git a/cutter.c b/cutter.c
index 67dc4ef53..8fda9418c 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 4.3 2017/05/21 09:45:06 kls Exp $
+ * $Id: cutter.c 4.6 2018/01/18 12:19:31 kls Exp $
  */
 
 #include "cutter.h"
@@ -677,8 +677,6 @@ bool cCutter::Start(void)
               cRecordingUserCommand::InvokeCommand(RUC_EDITINGRECORDING, editedVersionName, originalVersionName);
               if (cVideoDirectory::RemoveVideoFile(editedVersionName) && MakeDirs(editedVersionName, true)) {
                  Recording.WriteInfo(editedVersionName);
-                 LOCK_RECORDINGS_WRITE;
-                 Recordings->AddByName(editedVersionName, false);
                  cuttingThread = new cCuttingThread(originalVersionName, editedVersionName);
                  return true;
                  }
@@ -702,9 +700,6 @@ void cCutter::Stop(void)
         esyslog("ERROR: '%s' during editing process", Error);
      if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), editedVersionName) == 0)
         cControl::Shutdown();
-     cVideoDirectory::RemoveVideoFile(editedVersionName);
-     LOCK_RECORDINGS_WRITE;
-     Recordings->DelByName(editedVersionName);
      }
 }
 
diff --git a/device.c b/device.c
index 3c6769224..a8cb0b558 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.23 2017/05/30 11:06:11 kls Exp $
+ * $Id: device.c 4.26 2018/01/27 14:45:08 kls Exp $
  */
 
 #include "device.h"
@@ -120,6 +120,7 @@ cDevice::~cDevice()
   delete dvbSubtitleConverter;
   if (this == primaryDevice)
      primaryDevice = NULL;
+  Cancel(3);
 }
 
 bool cDevice::WaitForAllDevicesReady(int Timeout)
@@ -1673,6 +1674,7 @@ void cDevice::Action(void)
                  int Pid = TsPid(b);
                  bool IsScrambled = TsIsScrambled(b);
                  for (int i = 0; i < MAXRECEIVERS; i++) {
+                     cMutexLock MutexLock(&mutexReceiver);
                      cReceiver *Receiver = receiver[i];
                      if (Receiver && Receiver->WantsPid(Pid)) {
                         Receiver->Receive(b, TS_SIZE);
@@ -1768,10 +1770,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
                 }
              }
          Receiver->Activate(true);
-         Lock();
          Receiver->device = this;
          receiver[i] = Receiver;
-         Unlock();
          if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
             camSlot->StartDecrypting();
             if (camSlot->WantsTsData()) {
@@ -1801,13 +1801,11 @@ void cDevice::Detach(cReceiver *Receiver)
   if (!Receiver || Receiver->device != this)
      return;
   bool receiversLeft = false;
-  cMutexLock MutexLock(&mutexReceiver);
+  mutexReceiver.Lock();
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (receiver[i] == Receiver) {
-         Lock();
          receiver[i] = NULL;
          Receiver->device = NULL;
-         Unlock();
          Receiver->Activate(false);
          for (int n = 0; n < Receiver->numPids; n++)
              DelPid(Receiver->pids[n]);
@@ -1815,6 +1813,7 @@ void cDevice::Detach(cReceiver *Receiver)
       else if (receiver[i])
          receiversLeft = true;
       }
+  mutexReceiver.Unlock();
   if (camSlot) {
      if (Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
         camSlot->StartDecrypting();
diff --git a/device.h b/device.h
index 83e517828..ce0b0d271 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.10 2017/05/30 11:06:11 kls Exp $
+ * $Id: device.h 4.12 2017/11/02 14:47:33 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -55,13 +55,6 @@ enum ePlayMode { pmNone,           // audio/video from decoder
                  // KNOWN TO YOUR PLAYER.
                };
 
-//#define DEPRECATED_VIDEOSYSTEM
-#ifdef DEPRECATED_VIDEOSYSTEM
-enum eVideoSystem { vsPAL,
-                    vsNTSC
-                  };
-#endif
-
 enum eVideoDisplayFormat { vdfPanAndScan,
                            vdfLetterBox,
                            vdfCenterCutOut
@@ -356,8 +349,10 @@ class cDevice : public cThread {
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
-#define DEPRECATED_SETCURRENTCHANNEL
-#ifdef DEPRECATED_SETCURRENTCHANNEL
+#ifndef DEPRECATED_SETCURRENTCHANNEL
+#define DEPRECATED_SETCURRENTCHANNEL 1
+#endif
+#if DEPRECATED_SETCURRENTCHANNEL
   static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
 #endif
   static void SetCurrentChannel(int ChannelNumber) { currentChannel = ChannelNumber; }
@@ -510,12 +505,6 @@ class cDevice : public cThread {
          ///< if this device has an MPEG decoder).
          ///< NOTE: this is only for SD devices. HD devices shall implement their
          ///< own setup menu with the necessary parameters for controlling output.
-#ifdef DEPRECATED_VIDEOSYSTEM
-  virtual eVideoSystem GetVideoSystem(void) { return vsPAL; }
-         ///< Returns the video system of the currently displayed material
-         ///< (default is PAL).
-         ///< This function is deprecated and will be removed in a future version!
-#endif
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
          ///< Returns the Width, Height and VideoAspect ratio of the currently
          ///< displayed video material. Width and Height are given in pixel
diff --git a/dvbdevice.c b/dvbdevice.c
index 9e0710673..8710e7750 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 4.13 2017/05/09 11:50:38 kls Exp $
+ * $Id: dvbdevice.c 4.16 2018/02/15 15:37:01 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -699,6 +699,231 @@ int dB1000toPercent(int dB1000, int Low, int High)
   return 100 - v * v;
 }
 
+#define REF_S1(q1)                 (mod == QPSK)   ? q1 : 0
+#define REF_S2(q1, q2, q3, q4)     (mod == QPSK)   ? q1 : (mod == PSK_8)  ? q2 : (mod == APSK_16) ? q3 : (mod == APSK_32) ? q4 : 0
+#define REF_T1(q1, q2, q3)         (mod == QPSK)   ? q1 : (mod == QAM_16) ? q2 : (mod == QAM_64)  ? q3 : 0
+#define REF_T2(q1, q2, q3, q4)     (mod == QPSK)   ? q1 : (mod == QAM_16) ? q2 : (mod == QAM_64)  ? q3 : (mod == QAM_256) ? q4 : 0
+#define REF_C1(q1, q2, q3, q4, q5) (mod == QAM_16) ? q1 : (mod == QAM_32) ? q2 : (mod == QAM_64)  ? q3 : (mod == QAM_128) ? q4 : (mod == QAM_256) ? q5: 0
+
+int StrengthToSSI(const cChannel *Channel, int Strength, int FeModulation, int FeCoderateH, int FeFec)
+{
+  // Strength in 0.001dBm (dBm x 1000)
+  cDvbTransponderParameters dtp(Channel->Parameters());
+  int ssi = 0; // 0-100
+  int mod = (FeModulation >= 0) ? FeModulation : dtp.Modulation();
+  int cod = (FeCoderateH >= 0) ? FeCoderateH : dtp.CoderateH(); // DVB-T
+  int fec = (FeFec >= 0) ? FeFec : dtp.CoderateH();
+  if (Channel->IsTerr()) {
+     int pref = 0;
+     // NorDig Unified Ver. 2.6 - 3.4.4.6 Page 43 ff.
+     // reference values : pref-15dBm = 0%, pref+35dBm = 100%
+     if (dtp.System() == DVB_SYSTEM_1) { // DVB-T
+        fec = cod; // adjustment for DVB-T
+        if (mod == QAM_AUTO) mod = QPSK;
+        switch (fec) {  // dBm:        Q4  Q16  Q64
+          case FEC_1_2: pref = REF_T1(-93, -87, -82); break;
+          default:
+          case FEC_2_3: pref = REF_T1(-91, -85, -80); break;
+          case FEC_3_4: pref = REF_T1(-90, -84, -78); break;
+          case FEC_5_6: pref = REF_T1(-89, -83, -77); break;
+          case FEC_7_8: pref = REF_T1(-88, -82, -76); break;
+          }
+        }
+     else { // DVB-T2
+        if (mod == QAM_AUTO) mod = QAM_64;
+        switch (fec) {  // dBm:        Q4  Q16  Q64 Q256
+          case FEC_1_2: pref = REF_T2(-96, -91, -86, -82); break;
+          default:
+          case FEC_3_5: pref = REF_T2(-95, -89, -85, -80); break;
+          case FEC_2_3: pref = REF_T2(-94, -88, -83, -78); break;
+          case FEC_3_4: pref = REF_T2(-93, -87, -82, -76); break;
+          case FEC_4_5: pref = REF_T2(-92, -86, -81, -75); break;
+          case FEC_5_6: pref = REF_T2(-92, -86, -80, -74); break;
+          }
+        }
+     if (pref) {
+        int prel = (Strength / 1000) - pref;
+        ssi = (prel < -15) ? 0 :
+              (prel <   0) ? (prel + 15) * 2 / 3 :       //  0% -  10%
+              (prel <  20) ? prel * 4 + 10 :             // 10% -  90%
+              (prel <  35) ? (prel - 20) * 2 / 3 + 90 :  // 90% - 100%
+              100;
+#ifdef DEBUG_SIGNALSTRENGTH
+        fprintf(stderr, "SSI-T: STR:%d, Pref:%d, Prel:%d, ssi:%d%%(sys:%d, mod:%d, fec:%d)\n", Strength, pref, prel, ssi, dtp.System(), mod, fec);
+#endif
+        }
+     }
+  else if (Channel->IsCable()) { // ! COMPLETELY UNTESTED !
+     // Formula: pref(dB) = -174.0 + NoiseFigure + SymRef + CnRef
+     // NoiseFigure = 6.5 dB;               -> Tuner specific - range: 3.5 .. 9.0 dB
+     // SymRef = 10*log(6900000) = 68.5 dB; -> for Symbolrate of 6900 kSym/sec (TV: 6900, 6750 or 6111 kSym/sec)
+     // ==> pref(dB) = -174.0 + 6.5 + 68.5 + CnRef[modulation]{20,23,26,29,32}; (+/- 3 dB tuner specific)
+     if (mod == QAM_AUTO) mod = QAM_256;
+     //                Q16  Q32  Q64 Q128 Q256
+     int pref = REF_C1(-79, -76, -73, -70, -67);
+     if (pref) {
+        int prel = (Strength / 1000) - pref;
+        ssi = (prel < -15) ? 0 :
+              (prel <   0) ? (prel + 15) * 2 / 3 :       //  0% -  10%
+              (prel <  20) ? prel * 4 + 10 :             // 10% -  90%
+              (prel <  35) ? (prel - 20) * 2 / 3 + 90 :  // 90% - 100%
+              100;
+#ifdef DEBUG_SIGNALSTRENGTH
+        fprintf(stderr, "SSI-C: STR:%d, Pref:%d, Prel:%d, ssi:%d%%(mod:%d)\n", Strength, pref, prel, ssi, mod);
+#endif
+        }
+     }
+  else if (Channel->IsSat())
+     ssi = dB1000toPercent(Strength, -95000, -20000); // defaults
+  return ssi;
+}
+
+// Due to missing values or the different meanings of the reported error rate, ber_sqi is currently not taken into account
+#define IGNORE_BER 1
+#define BER_ERROR_FREE (1000*1000*1000) // 1/10^-9
+
+int SignalToSQI(const cChannel *Channel, int Signal, int Ber, int FeModulation, int FeCoderateH, int FeFec)
+{
+#if IGNORE_BER
+  Ber = BER_ERROR_FREE; // assume/pretend to be biterror free
+#endif
+  // Signal in 0.001dB (dB x 1000)
+  cDvbTransponderParameters dtp(Channel->Parameters());
+  int sqi = 0; // 0-100
+  int mod = (FeModulation >= 0) ? FeModulation : dtp.Modulation();
+  int cod = (FeCoderateH >= 0) ? FeCoderateH : dtp.CoderateH(); // DVB-T
+  int fec = (FeFec >= 0) ? FeFec : dtp.CoderateH();
+  if (Channel->IsTerr()) { // QEF: BER 10^-6
+     int cnref = 0;
+     // NorDig Unified Ver. 2.6 - 3.4.4.7 Page 45 ff.
+     // reference values for QEF (BER 10^-11 at MPEG2 demux input)
+     if (dtp.System() == DVB_SYSTEM_1) { // DVB-T
+        fec = cod; // adjustment for DVB-T
+        if (mod == QAM_AUTO) mod = QPSK;
+        switch (fec) {  // 0.1 dB      Q4  Q16  Q64 (Hierarchy=None)
+          case FEC_1_2: cnref = REF_T1(51, 108, 165); break;
+          default:
+          case FEC_2_3: cnref = REF_T1(69, 131, 187); break;
+          case FEC_3_4: cnref = REF_T1(79, 146, 202); break;
+          case FEC_5_6: cnref = REF_T1(89, 156, 216); break;
+          case FEC_7_8: cnref = REF_T1(97, 160, 225); break;
+          }
+        }
+     else { // DVB-T2
+        if (mod == QAM_AUTO) mod = QAM_64;
+        switch (fec) {  // 0.1 dB      Q4  Q16  Q64 Q256
+          case FEC_1_2: cnref = REF_T2(35,  87, 130, 170); break;
+          default:
+          case FEC_3_5: cnref = REF_T2(47, 101, 148, 194); break;
+          case FEC_2_3: cnref = REF_T2(56, 114, 162, 208); break;
+          case FEC_3_4: cnref = REF_T2(66, 125, 177, 229); break;
+          case FEC_4_5: cnref = REF_T2(72, 133, 187, 243); break;
+          case FEC_5_6: cnref = REF_T2(77, 138, 194, 251); break;
+          }
+        }
+     if (cnref) {
+        int cnrel = (Signal/100) - cnref; // 0.1 dB
+        int ber_sqi = 100; // 100%
+        int cnr_sqi = 0;   // 0%
+        if (dtp.System() == DVB_SYSTEM_1) { // DVB-T
+            ber_sqi = (Ber < 1000) ? 0 :           // > 10^-3
+                      (Ber >= 10000000) ? 100 :    // <= 10^-7
+                      (int)(20 * log10(Ber)) - 40; // 20*log10(1/BER)-40 -> 20% .. 100%
+            // scale: -7dB/+3dB to reference-value
+            cnr_sqi = (cnrel < -70) ? 0 :
+                      (cnrel < +30) ? (100 + (cnrel - 30)) :
+                      100;
+            sqi = (cnr_sqi * ber_sqi) / 100;
+            // alternative: stretched scale: cnref-7dB = 0%, 30dB = 100%
+            // sqi = dB1000toPercent(Signal, (100*cnref)-7000, 30000);
+            }
+        else { // DVB-T2
+            ber_sqi = (Ber < 10000)     ? 0 :             // > 10^-4
+                      (Ber >= 10000000) ? 100 * 100 / 6 : // <= 10^-7 : 16.67% -> SQI 0% .. 100%
+                      (100 * 100 / 15);                   //             6.67% -> SQI 0% .. 40% || 100%
+            // scale: -3dB/+3dB to reference-value
+            sqi = (cnrel <  -30) ? 0 :
+                  (cnrel <= +30) ? (cnrel + 30) * ber_sqi / 1000 : // (0 .. 6) * 16,67 || 6.67
+                  100;
+            // alternative: stretched scale: cnref-3dB = 0%, 32dB = 100%
+            // sqi = dB1000toPercent(Signal, (100*cnref)-3000, 32000);
+            }
+#ifdef DEBUG_SIGNALQUALITY
+        fprintf(stderr, "SQI-T: SIG:%d, BER:%d, CNref:%d, CNrel:%d, bersqi:%d, sqi:%d%%(sys:%d, mod:%d, fec:%d)\n", Signal, Ber, cnref, cnrel, ber_sqi, sqi, dtp.System(), mod, fec);
+#endif
+        }
+     }
+  else if (Channel->IsCable()) { // ! COMPLETELY UNTESTED !
+     if (mod == QAM_AUTO) mod = QAM_256;
+         // 0.1 dB      Q16  Q32  Q64 Q128 Q256
+     int cnref = REF_C1(200, 230, 260, 290, 320); // minimum for BER<10^-4
+     if (cnref) {
+        int cnrel = (Signal / 100) - cnref; // 0.1 dB
+        int ber_sqi = (Ber < 1000)      ? 0 :      // > 10^-3
+                      (Ber >= 10000000) ? 100 :    // <= 10^-7
+                      (int)(20 * log10(Ber)) - 40; // 20*log10(1/BER)-40 -> 20% .. 100%
+        // scale: -7dB/+3dB to reference-value
+        int cnr_sqi = (cnrel < -70) ? 0 :
+                      (cnrel < +30) ? (100 + (cnrel - 30)) :
+                      100;
+        sqi = (cnr_sqi * ber_sqi) / 100;
+        // alternative: stretched scale: cnref-7dB = 0%, 40dB = 100%
+        // sqi = dB1000toPercent(Signal, (100*cnref)-7000, 40000);
+#ifdef DEBUG_SIGNALQUALITY
+        dsyslog("SQI-C: SIG:%d, BER:%d, CNref:%d, CNrel:%d, bersqi:%d, sqi:%d%%(sys:%d, mod:%d, fec:%d)\n", Signal, Ber, cnref, cnrel, ber_sqi, sqi, dtp.System(), mod, fec);
+#endif
+        }
+     }
+  else if (Channel->IsSat()) {
+    int cnref = 0;
+    if (dtp.System() == DVB_SYSTEM_1) { // DVB-S
+        if (mod == QAM_AUTO) mod = QPSK;
+        switch (fec) {  // 0.1 dB:     Q4 : 10^-7
+          case FEC_1_2: cnref = REF_S1(38); break;
+          default:
+          case FEC_2_3: cnref = REF_S1(56); break;
+          case FEC_3_4: cnref = REF_S1(67); break;
+          case FEC_5_6: cnref = REF_S1(77); break;
+          case FEC_7_8: cnref = REF_S1(84); break;
+          }
+        if (cnref) {
+           //cnrel = (Signal/100) - cnref; // 0.1 dB
+           // scale: cnref-4dB = 0%, 15dB = 100%
+           sqi = dB1000toPercent(Signal, (100*cnref)-4000, 15000);
+#ifdef DEBUG_SIGNALQUALITY
+           dsyslog("SQI-S1: SIG:%d, BER:%d, CNref:%d, sqi:%d%%(mod:%d, fec:%d)\n", Signal, Ber, cnref, sqi, mod, fec);
+#endif
+           }
+        }
+    else { // DVB-S2
+        if (mod == QAM_AUTO) mod = QAM_64;
+        switch (fec) {   // 0.1 dB       Q4   Q8 16A* 32A*
+        //case FEC_1_4:  cnref = REF_S2(-14,  65,  90, 126); break;
+        //case FEC_1_3:  cnref = REF_S2( -2,  65,  90, 126); break;
+          case FEC_2_5:  cnref = REF_S2(  7,  65,  90, 126); break;
+          case FEC_1_2:  cnref = REF_S2( 20,  65,  90, 126); break;
+          case FEC_3_5:  cnref = REF_S2( 32,  65,  90, 126); break;
+          default:
+          case FEC_2_3:  cnref = REF_S2( 41,  76,  90, 126); break;
+          case FEC_3_4:  cnref = REF_S2( 50,  66, 102, 126); break;
+          case FEC_4_5:  cnref = REF_S2( 57,  89, 110, 136); break;
+          case FEC_5_6:  cnref = REF_S2( 62, 104, 116, 143); break;
+          case FEC_8_9:  cnref = REF_S2( 72, 117, 129, 157); break;
+          case FEC_9_10: cnref = REF_S2( 74, 120, 131, 161); break;
+          }
+        if (cnref) {
+           // cnrel = (Signal/100) - cnref; // 0.1 dB
+           // scale: cnref-4dB = 0%, 20dB = 100%
+           sqi = dB1000toPercent(Signal, (100*cnref)-4000, 20000);
+#ifdef DEBUG_SIGNALQUALITY
+           dsyslog("SQI-S2: SIG:%d, BER:%d, CNref:%d, sqi:%d%%(mod:%d, fec:%d)\n", Signal, Ber, cnref, sqi, mod, fec);
+#endif
+           }
+        }
+  }
+  return sqi;
+}
+
 int cDvbTuner::GetSignalStrength(void) const
 {
   ClearEventQueue();
@@ -710,14 +935,20 @@ int cDvbTuner::GetSignalStrength(void) const
       memset(&CmdSeq, 0, sizeof(CmdSeq));
       CmdSeq.props = Props;
       SETCMD(DTV_STAT_SIGNAL_STRENGTH, 0);
+      SETCMD(DTV_MODULATION, 0);
+      SETCMD(DTV_CODE_RATE_HP, 0); // DVB-T only
+      SETCMD(DTV_INNER_FEC, 0);
       if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
          esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
          return -1;
          }
-      int Signal = 0;;
+      int FeMod = (Props[1].u.st.len > 0) ? (int)Props[1].u.data : -1;
+      int FeCod = (Props[2].u.st.len > 0) ? (int)Props[2].u.data : -1;
+      int FeFec = (Props[3].u.st.len > 0) ? (int)Props[3].u.data : -1;
+      int Signal = 0;
       if (Props[0].u.st.len > 0) {
          switch (Props[0].u.st.stat[0].scale) {
-           case FE_SCALE_DECIBEL:  Signal = dB1000toPercent(Props[0].u.st.stat[0].svalue, -95000, -20000); // TODO use different values for DVB-S, -T, -C?
+           case FE_SCALE_DECIBEL:  Signal = StrengthToSSI(&channel, Props[0].u.st.stat[0].svalue, FeMod, FeCod, FeFec);
                                    break;
            case FE_SCALE_RELATIVE: Signal = 100 * Props[0].u.st.stat[0].uvalue / 0xFFFF;
                                    break;
@@ -768,14 +999,32 @@ int cDvbTuner::GetSignalQuality(void) const
       memset(&CmdSeq, 0, sizeof(CmdSeq));
       CmdSeq.props = Props;
       SETCMD(DTV_STAT_CNR, 0);
+      SETCMD(DTV_MODULATION, 0);
+      SETCMD(DTV_CODE_RATE_HP, 0); // DVB-T only
+      SETCMD(DTV_INNER_FEC, 0);
+      SETCMD(DTV_STAT_POST_ERROR_BIT_COUNT, 0);
+      SETCMD(DTV_STAT_POST_TOTAL_BIT_COUNT, 0);
       if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
          esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
          return -1;
          }
-      int Cnr = 0;;
+      int FeMod = (Props[1].u.st.len > 0) ? (int)Props[1].u.data : -1;
+      int FeCod = (Props[2].u.st.len > 0) ? (int)Props[2].u.data : -1;
+      int FeFec = (Props[3].u.st.len > 0) ? (int)Props[3].u.data : -1;
+      int Ber = BER_ERROR_FREE; // 1/10^-9
+      if (Props[4].u.st.len > 0 && Props[4].u.st.stat[0].scale == FE_SCALE_COUNTER && Props[5].u.st.len > 0 && Props[5].u.st.stat[0].scale == FE_SCALE_COUNTER) {
+         uint64_t ebc = Props[4].u.st.stat[0].uvalue; // error bit count
+         uint64_t tbc = Props[5].u.st.stat[0].uvalue; // total bit count
+         if (ebc > 0) {
+            uint64_t BerRev = tbc / ebc; // reversed, for integer arithmetic
+            if (BerRev < BER_ERROR_FREE)
+               Ber = (int)BerRev;
+            }
+         }
+      int Cnr = 0;
       if (Props[0].u.st.len > 0) {
          switch (Props[0].u.st.stat[0].scale) {
-           case FE_SCALE_DECIBEL:  Cnr = dB1000toPercent(Props[0].u.st.stat[0].svalue, 5000, 20000); // TODO use different values for DVB-S, -T, -C?
+           case FE_SCALE_DECIBEL:  Cnr = SignalToSQI(&channel, Props[0].u.st.stat[0].svalue, Ber, FeMod, FeCod, FeFec);
                                    break;
            case FE_SCALE_RELATIVE: Cnr = 100 * Props[0].u.st.stat[0].uvalue / 0xFFFF;
                                    break;
@@ -1116,13 +1365,13 @@ bool cDvbTuner::SetFrontend(void)
      SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
      if (frontendType == SYS_DVBT2) {
         // DVB-T2
+        SETCMD(DTV_INNER_FEC, dtp.CoderateH());
         if (DvbApiVersion >= 0x0508) {
            SETCMD(DTV_STREAM_ID, dtp.StreamId());
            }
         else if (DvbApiVersion >= 0x0503)
            SETCMD(DTV_DVBT2_PLP_ID_LEGACY, dtp.StreamId());
         }
-
      tuneTimeout = DVBT_TUNE_TIMEOUT;
      lockTimeout = DVBT_LOCK_TIMEOUT;
      }
diff --git a/dvbplayer.c b/dvbplayer.c
index ca0073537..d1c02f9fd 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 4.4 2016/12/22 11:34:31 kls Exp $
+ * $Id: dvbplayer.c 4.5 2017/11/26 14:55:03 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -1003,6 +1003,7 @@ bool cDvbPlayerControl::Active(void)
 
 void cDvbPlayerControl::Stop(void)
 {
+  cControl::player = NULL;
   delete player;
   player = NULL;
 }
diff --git a/eit.c b/eit.c
index ade792865..688725251 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.3 2017/05/03 08:58:41 kls Exp $
+ * $Id: eit.c 4.4 2017/10/11 09:19:42 kls Exp $
  */
 
 #include "eit.h"
@@ -94,10 +94,10 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
       // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
       if (StartTime == 0 || StartTime > 0 && Duration == 0)
          continue;
+      Empty = false;
       // Ignore events that ended before the "EPG linger time":
       if (StartTime + Duration < LingerLimit)
          continue;
-      Empty = false;
       if (!SegmentStart)
          SegmentStart = StartTime;
       SegmentEnd = StartTime + Duration;
diff --git a/font.h b/font.h
index 9d18bde25..3bdf7e723 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 4.2 2016/12/22 12:43:24 kls Exp $
+ * $Id: font.h 4.3 2017/11/11 14:05:07 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -54,6 +54,8 @@ class cFont {
           ///< Returns the width of the given string in pixel.
   virtual int Height(void) const = 0;
           ///< Returns the height of this font in pixel (all characters have the same height).
+          ///< If the font contains descenders, its total height may be higher than the character
+          ///< height specified during creation.
   int Height(const char *s) const { return Height(); }
           ///< Returns the height of this font in pixel (obsolete, just for backwards compatibility).
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
@@ -75,10 +77,12 @@ class cFont {
           ///< function that called GetFont() has returned.
   static cFont *CreateFont(const char *Name, int CharHeight, int CharWidth = 0);
           ///< Creates a new font object with the given Name and makes its characters
-          ///< CharHeight pixels high. If CharWidth is given, it overwrites the font's
-          ///< default width. Name is of the form "Family:Style", for instance
-          ///< "Verdana:Bold Italic" or "Times New Roman". See GetAvailableFontNames()
-          ///< for how to get a list of all available font names.
+          ///< CharHeight pixels high. The actual height of the required drawing area
+          ///< might be higher than CharHeight if the font contains descenders.
+          ///< If CharWidth is given, it overwrites the font's default width.
+          ///< Name is of the form "Family:Style", for instance "Verdana:Bold Italic" or
+          ///< "Times New Roman". See GetAvailableFontNames() for how to get a list of
+          ///< all available font names.
           ///< If the requested font can't be created, a dummy font is returned.
           ///< The caller must delete the font when it is no longer needed.
   static bool GetAvailableFontNames(cStringList *FontNames, bool Monospaced = false);
diff --git a/menu.c b/menu.c
index c2c12dd8a..d5300153a 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.41 2017/06/30 09:49:39 kls Exp $
+ * $Id: menu.c 4.69 2018/03/18 12:01:09 kls Exp $
  */
 
 #include "menu.h"
@@ -656,6 +656,7 @@ class cMenuFolderItem : public cOsdItem {
 private:
   cNestedItem *folder;
 public:
+  virtual void Set(void);
   cMenuFolderItem(cNestedItem *Folder);
   cNestedItem *Folder(void) { return folder; }
   };
@@ -664,8 +665,15 @@ cMenuFolderItem::cMenuFolderItem(cNestedItem *Folder)
 :cOsdItem(Folder->Text())
 {
   folder = Folder;
-  if (folder->SubItems())
+  Set();
+}
+
+void cMenuFolderItem::Set(void)
+{
+  if (folder->SubItems() && folder->SubItems()->Count())
      SetText(cString::sprintf("%s...", folder->Text()));
+  else
+     SetText(folder->Text());
 }
 
 // --- cMenuEditFolder -------------------------------------------------------
@@ -675,7 +683,6 @@ class cMenuEditFolder : public cOsdMenu {
   cList<cNestedItem> *list;
   cNestedItem *folder;
   char name[PATH_MAX];
-  int subFolder;
   eOSState Confirm(void);
 public:
   cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNestedItem *Folder = NULL);
@@ -689,13 +696,10 @@ cMenuEditFolder::cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNes
   SetMenuCategory(mcFolder);
   list = List;
   folder = Folder;
-  if (folder) {
+  if (folder)
      strn0cpy(name, folder->Text(), sizeof(name));
-     subFolder = folder->SubItems() != NULL;
-     }
   else {
      *name = 0;
-     subFolder = 0;
      cRemote::Put(kRight, true); // go right into string editing mode
      }
   if (!isempty(Dir)) {
@@ -704,7 +708,6 @@ cMenuEditFolder::cMenuEditFolder(const char *Dir, cList<cNestedItem> *List, cNes
      Add(DirItem);
      }
   Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name)));
-  Add(new cMenuEditBoolItem(tr("Sub folder"), &subFolder));
 }
 
 cString cMenuEditFolder::GetFolder(void)
@@ -728,12 +731,10 @@ eOSState cMenuEditFolder::Confirm(void)
         return osContinue;
         }
      }
-  if (folder) {
+  if (folder)
      folder->SetText(name);
-     folder->SetSubItems(subFolder);
-     }
   else
-     list->Add(folder = new cNestedItem(name, subFolder));
+     list->Add(folder = new cNestedItem(name));
   return osEnd;
 }
 
@@ -791,12 +792,8 @@ void cMenuFolder::SetHelpKeys(void)
   if (HasSubMenu())
      return;
   int NewHelpKeys = 0;
-  if (firstFolder) {
-     if (cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current())) {
-        if (Folder->Folder()->SubItems())
-           NewHelpKeys = 1;
-        }
-     }
+  if (firstFolder)
+     NewHelpKeys = 1;
   if (NewHelpKeys != helpKeys) {
      helpKeys = NewHelpKeys;
      SetHelp(NewHelpKeys > 0 ? tr("Button$Open") : NULL, tr("Button$New"), firstFolder ? tr("Button$Delete") : NULL, firstFolder ? tr("Button$Edit") : NULL);
@@ -885,8 +882,10 @@ eOSState cMenuFolder::Select(bool Open)
   if (firstFolder) {
      cMenuFolderItem *Folder = (cMenuFolderItem *)Get(Current());
      if (Folder) {
-        if (Open && Folder->Folder()->SubItems())
+        if (Open) {
+           Folder->Folder()->SetSubItems(true);
            return AddSubMenu(new cMenuFolder(Title(), Folder->Folder()->SubItems(), nestedItemList, !isempty(dir) ? *cString::sprintf("%s%c%s", *dir, FOLDERDELIMCHAR, Folder->Folder()->Text()) : Folder->Folder()->Text()));
+           }
         else
            return osEnd;
         }
@@ -1123,6 +1122,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                               return osContinue;
                            if (timer->Local() && timer->Recording() && data.Remote())
                               cRecordControls::Stop(timer);
+                           if (timer->Remote() && data.Remote())
+                              Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
                            *timer = data;
                            }
                         LOCK_SCHEDULES_READ;
@@ -1296,11 +1297,13 @@ eOSState cMenuTimers::OnOff(void)
 {
   if (HasSubMenu())
      return osContinue;
-  cTimers::GetTimersWrite(timersStateKey);
+  cStateKey StateKey;
+  cTimers *Timers = cTimers::GetTimersWrite(StateKey);
   cTimer *Timer = GetTimer();
   if (Timer) {
      Timer->OnOff();
      if (Timer->Remote()) {
+        Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
         cStringList Response;
         if (!ExecSVDRPCommand(Timer->Remote(), cString::sprintf("MODT %d %s", Timer->Id(), *Timer->ToText(true)), &Response) || SVDRPCode(Response[0]) != 250)
            RemoteTimerError(Timer);
@@ -1314,7 +1317,7 @@ eOSState cMenuTimers::OnOff(void)
      else
         isyslog("%sactivated timer %s", Timer->HasFlags(tfActive) ? "" : "de", *Timer->ToDescr());
      }
-  timersStateKey.Remove(Timer != NULL);
+  StateKey.Remove(Timer != NULL);
   return osContinue;
 }
 
@@ -1341,27 +1344,27 @@ eOSState cMenuTimers::Delete(void)
   // Check if this timer is active:
   cTimer *Timer = GetTimer();
   if (Timer) {
-     if (Interface->Confirm(tr("Delete timer?"))) {
-        if (Timer->Recording()) {
-           if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
-              if (!Timer->Remote()) {
-                 Timer->Skip();
-                 cRecordControls::Process(Timers, time(NULL));
-                 }
-              }
-           else
-              Timer = NULL;
-           }
+     bool TimerRecording = Timer->Recording();
+     timersStateKey.Remove(false); // must release lock while prompting!
+     if (Interface->Confirm(tr("Delete timer?")) && (!TimerRecording || Interface->Confirm(tr("Timer still recording - really delete?")))) {
+        Timers = cTimers::GetTimersWrite(timersStateKey);
+        Timer = GetTimer();
         if (Timer) {
-           if (!HandleRemoteModifications(NULL, Timer)) {
-              timersStateKey.Remove();
-              return osContinue;
+           if (!Timer->Remote()) {
+              Timer->Skip();
+              cRecordControls::Process(Timers, time(NULL));
+              }
+           if (HandleRemoteModifications(NULL, Timer)) {
+              if (Timer->Remote())
+                 Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
+              Timers->Del(Timer);
+              cOsdMenu::Del(Current());
+              Display();
               }
-           Timers->Del(Timer);
-           cOsdMenu::Del(Current());
-           Display();
            }
         }
+     else
+        return osContinue;
      }
   timersStateKey.Remove(Timer != NULL);
   return osContinue;
@@ -1399,7 +1402,11 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
   if (const cTimer *Timer = cMenuEditTimer::AddedTimer()) {
      // a newly created timer was confirmed with Ok and the proper item needs to be added:
      LOCK_TIMERS_READ;
-     Add(new cMenuTimerItem(Timer), true);
+     cMenuTimerItem *CurrentItem = new cMenuTimerItem(Timer);
+     Add(CurrentItem, true);
+     Sort();
+     SetCurrent(CurrentItem);
+     SetHelpKeys();
      Display();
      }
   if (Key != kNone)
@@ -1680,6 +1687,8 @@ eOSState cMenuWhatsOn::Record(void)
         // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
         Timers->Del(Timer);
         }
+     else if (Timer->Remote())
+        Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
      if (HasSubMenu())
         CloseSubMenu();
      if (Update())
@@ -1779,7 +1788,7 @@ class cMenuSchedule : public cOsdMenu {
   };
 
 cMenuSchedule::cMenuSchedule(void)
-:cOsdMenu("")
+:cOsdMenu(tr("Schedule"))
 {
   SetMenuCategory(mcSchedule);
   scheduleState = -1;
@@ -1986,6 +1995,8 @@ eOSState cMenuSchedule::Record(void)
         // must add the timer before HandleRemoteModifications to get proper log messages with timer ids
         Timers->Del(Timer);
         }
+     else if (Timer->Remote())
+        Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
      if (HasSubMenu())
         CloseSubMenu();
      if (Update())
@@ -2407,9 +2418,15 @@ bool CamMenuActive(void)
 
 // --- cMenuPathEdit ---------------------------------------------------------
 
+#define osUserRecRenamed osUser1
+#define osUserRecMoved   osUser2
+#define osUserRecRemoved osUser3
+#define osUserRecEmpty   osUser4
+
 class cMenuPathEdit : public cOsdMenu {
 private:
   cString path;
+  cString oldFolder;
   char folder[PATH_MAX];
   char name[NAME_MAX];
   cMenuEditStrItem *folderItem;
@@ -2441,6 +2458,7 @@ cMenuPathEdit::cMenuPathEdit(const char *Path)
     LOCK_RECORDINGS_READ;
     pathIsInUse = Recordings->PathIsInUse(path);
   }
+  oldFolder = folder;
   cOsdItem *p;
   Add(p = folderItem = new cMenuEditStrItem(tr("Folder"), folder, sizeof(folder)));
   p->SetSelectable(!pathIsInUse);
@@ -2479,18 +2497,28 @@ eOSState cMenuPathEdit::ApplyChanges(void)
   cString NewPath = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
   NewPath.CompactChars(FOLDERDELIMCHAR);
   if (strcmp(NewPath, path)) {
-     LOCK_RECORDINGS_WRITE;
-     Recordings->SetExplicitModify();
-     int NumRecordings = Recordings->GetNumRecordingsInPath(path);
+     int NumRecordings = 0;
+     {
+       LOCK_RECORDINGS_READ;
+       NumRecordings = Recordings->GetNumRecordingsInPath(path);
+     }
      if (NumRecordings > 1 && !Interface->Confirm(cString::sprintf(tr("Move entire folder containing %d recordings?"), NumRecordings)))
         return osContinue;
-     if (!Recordings->MoveRecordings(path, NewPath)) {
+     bool Error = false;
+     {
+       LOCK_RECORDINGS_WRITE;
+       Recordings->SetExplicitModify();
+       Error = !Recordings->MoveRecordings(path, NewPath);
+       if (!Error)
+          Recordings->SetModified();
+     }
+     if (Error) {
         Skins.Message(mtError, tr("Error while moving folder!"));
         return osContinue;
         }
-     cMenuRecordings::SetPath(NewPath); // makes sure the Recordings menu will reposition to the new path
-     Recordings->SetModified();
-     return osUser1;
+     if (strcmp(folder, oldFolder))
+        return osUserRecMoved;
+     return osUserRecRenamed;
      }
   return osBack;
 }
@@ -2678,8 +2706,15 @@ eOSState cMenuRecordingEdit::RemoveName(void)
 eOSState cMenuRecordingEdit::DeleteMarks(void)
 {
   if (buttonDeleteMarks && Interface->Confirm(tr("Delete editing marks for this recording?"))) {
-     if (cMarks::DeleteMarksFile(recording))
+     if (cMarks::DeleteMarksFile(recording)) {
         SetHelpKeys();
+        if (cControl *Control = cControl::Control(true)) {
+           if (const cRecording *Recording = Control->GetRecording()) {
+              if (strcmp(recording->FileName(), Recording->FileName()) == 0)
+                 Control->ClearEditingMarks();
+              }
+           }
+        }
      else
         Skins.Message(mtError, tr("Error while deleting editing marks!"));
      }
@@ -2709,6 +2744,7 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
      *name = ' '; // name must not be empty!
      name[1] = 0;
      }
+  cString OldFolder = Recording->Folder();
   cString NewName = *folder ? cString::sprintf("%s%c%s", folder, FOLDERDELIMCHAR, name) : name;
   NewName.CompactChars(FOLDERDELIMCHAR);
   if (strcmp(NewName, Recording->Name())) {
@@ -2720,10 +2756,12 @@ eOSState cMenuRecordingEdit::ApplyChanges(void)
      Modified = true;
      }
   if (Modified) {
-     cMenuRecordings::SetRecording(Recording->FileName()); // makes sure the Recordings menu will reposition to the renamed recording
+     eOSState  state = osUserRecRenamed;
+     if (strcmp(Recording->Folder(), OldFolder))
+        state = osUserRecMoved;
      Recordings->TouchUpdate();
      StateKey.Remove(Modified);
-     return osUser1;
+     return state;
      }
   StateKey.Remove(Modified);
   return osBack;
@@ -2858,10 +2896,10 @@ class cMenuRecordingItem : public cOsdItem {
   cMenuRecordingItem(const cRecording *Recording, int Level);
   ~cMenuRecordingItem();
   void IncrementCounter(bool New);
-  const char *Name(void) { return name; }
-  int Level(void) { return level; }
-  const cRecording *Recording(void) { return recording; }
-  bool IsDirectory(void) { return name != NULL; }
+  const char *Name(void) const { return name; }
+  int Level(void) const { return level; }
+  const cRecording *Recording(void) const { return recording; }
+  bool IsDirectory(void) const { return name != NULL; }
   void SetRecording(const cRecording *Recording) { recording = Recording; }
   virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
   };
@@ -2873,8 +2911,13 @@ cMenuRecordingItem::cMenuRecordingItem(const cRecording *Recording, int Level)
   name = NULL;
   totalEntries = newEntries = 0;
   SetText(Recording->Title('\t', true, Level));
-  if (*Text() == '\t')
+  if (*Text() == '\t') // this is a folder
      name = strdup(Text() + 2); // 'Text() + 2' to skip the two '\t'
+  else { // this is an actual recording
+     int Usage = Recording->IsInUse();
+     if ((Usage & ruDst) != 0 && (Usage & (ruMove | ruCopy)) != 0)
+        SetSelectable(false);
+     }
 }
 
 cMenuRecordingItem::~cMenuRecordingItem()
@@ -2957,15 +3000,17 @@ void cMenuRecordings::Set(bool Refresh)
 {
   if (cRecordings::GetRecordingsRead(recordingsStateKey)) {
      recordingsStateKey.Remove();
-     const char *CurrentRecording = *fileName ? *fileName : cReplayControl::LastReplayed();
      cRecordings *Recordings = cRecordings::GetRecordingsWrite(recordingsStateKey); // write access is necessary for sorting!
-     cMenuRecordingItem *LastItem = NULL;
+     const char *CurrentRecording = NULL;
      if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
         CurrentRecording = ri->Recording()->FileName();
+     if (!CurrentRecording)
+        CurrentRecording = *fileName ? *fileName : cReplayControl::LastReplayed();
      int current = Current();
      Clear();
      GetRecordingsSortMode(DirectoryName());
      Recordings->Sort();
+     cMenuRecordingItem *LastItem = NULL;
      for (const cRecording *Recording = Recordings->First(); Recording; Recording = Recordings->Next(Recording)) {
          if ((!filter || filter->Filter(Recording)) && (!base || (strstr(Recording->Name(), base) == Recording->Name() && Recording->Name()[strlen(base)] == FOLDERDELIMCHAR))) {
             cMenuRecordingItem *Item = new cMenuRecordingItem(Recording, level);
@@ -3073,28 +3118,67 @@ eOSState cMenuRecordings::Rewind(void)
   return osContinue;
 }
 
-eOSState cMenuRecordings::Delete(void)
+static bool TimerStillRecording(const char *FileName)
 {
-  if (HasSubMenu() || Count() == 0)
-     return osContinue;
-  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  if (ri && !ri->IsDirectory()) {
-     if (Interface->Confirm(tr("Delete recording?"))) {
-        if (cRecordControl *rc = cRecordControls::GetRecordControl(ri->Recording()->FileName())) {
+  if (cRecordControl *rc = cRecordControls::GetRecordControl(FileName)) {
+     // local timer
+     if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
+        LOCK_TIMERS_WRITE;
+        if (cTimer *Timer = rc->Timer()) {
+           Timer->Skip();
+           cRecordControls::Process(Timers, time(NULL));
+           if (Timer->IsSingleEvent()) {
+              Timers->Del(Timer);
+              isyslog("deleted timer %s", *Timer->ToDescr());
+              }
+           }
+        }
+     else
+        return true; // user didn't confirm deletion
+     }
+  else {
+     // remote timer
+     cString TimerId = GetRecordingTimerId(FileName);
+     if (*TimerId) {
+        int Id;
+        char *RemoteBuf = NULL;
+        cString Remote;
+        if (2 == sscanf(TimerId, "%d@%m[^ \n]", &Id, &RemoteBuf)) {
+           Remote = RemoteBuf;
+           free(RemoteBuf);
            if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
-              if (cTimer *Timer = rc->Timer()) {
-                 LOCK_TIMERS_WRITE;
+              LOCK_TIMERS_WRITE;
+              if (cTimer *Timer = Timers->GetById(Id, Remote)) {
+                 cTimer OldTimer = *Timer;
                  Timer->Skip();
-                 cRecordControls::Process(Timers, time(NULL));
+                 Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
                  if (Timer->IsSingleEvent()) {
-                    Timers->Del(Timer);
-                    isyslog("deleted timer %s", *Timer->ToDescr());
+                    if (HandleRemoteModifications(NULL, Timer))
+                       Timers->Del(Timer);
+                    else
+                       return true; // error while deleting remote timer
                     }
+                 else if (!HandleRemoteModifications(Timer, &OldTimer))
+                    return true; // error while modifying remote timer
                  }
               }
            else
-              return osContinue;
+              return true; // user didn't confirm deletion
            }
+        }
+     }
+  return false;
+}
+
+eOSState cMenuRecordings::Delete(void)
+{
+  if (HasSubMenu() || Count() == 0)
+     return osContinue;
+  cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+  if (ri && !ri->IsDirectory()) {
+     if (Interface->Confirm(tr("Delete recording?"))) {
+        if (TimerStillRecording(ri->Recording()->FileName()))
+           return osContinue;
         cString FileName;
         {
           LOCK_RECORDINGS_READ;
@@ -3122,8 +3206,8 @@ eOSState cMenuRecordings::Delete(void)
            recordingsStateKey.Remove();
            Display();
            if (!Count())
-              return osBack;
-           return osUser2;
+              return osUserRecEmpty;
+           return osUserRecRemoved;
            }
         else
            Skins.Message(mtError, tr("Error while deleting recording!"));
@@ -3165,6 +3249,8 @@ eOSState cMenuRecordings::Sort(void)
 {
   if (HasSubMenu())
      return osContinue;
+  if (const cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()))
+     SetRecording(ri->Recording()->FileName()); // makes sure the Recordings menu will reposition to the current recording
   IncRecordingsSortMode(DirectoryName());
   recordingsStateKey.Reset();
   Set(true);
@@ -3173,7 +3259,6 @@ eOSState cMenuRecordings::Sort(void)
 
 eOSState cMenuRecordings::ProcessKey(eKeys Key)
 {
-  bool HadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
 
   if (state == osUnknown) {
@@ -3191,37 +3276,46 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
        default: break;
        }
      }
-  else if (state == osUser1) {
-     // a recording or path was renamed, so let's refresh the menu
-     CloseSubMenu(false);
-     if (base)
-        return state; // closes all recording menus except for the top one
-     Set(); // this is the top level menu, so we refresh it...
-     Open(true); // ...and open any necessary submenus to show the new name
-     if (!HasSubMenu()) {
-        LOCK_RECORDINGS_READ;
-        Display();
-        }
+  else if (state == osUserRecRenamed) {
+     // a recording was renamed (within the same folder), so let's refresh the menu
+     CloseSubMenu(false); // this is the cMenuRecordingEdit/cMenuPathEdit
      path = NULL;
      fileName = NULL;
+     state = osContinue;
      }
-  else if (state == osUser2) {
-     // a recording in a sub folder was deleted, so update the current item
-     cOsdMenu *m = HasSubMenu() ? SubMenu() : this;
-     if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current())) {
-        if (cMenuRecordingItem *riSub = (cMenuRecordingItem *)m->Get(m->Current()))
-           ri->SetRecording(riSub->Recording());
+  else if (state == osUserRecMoved) {
+     // a recording was moved to a different folder, so let's delete the old item
+     CloseSubMenu(false); // this is the cMenuRecordingEdit/cMenuPathEdit
+     path = NULL;
+     fileName = NULL;
+     cOsdMenu::Del(Current());
+     Set(); // the recording might have been moved into a new subfolder of this folder
+     if (!Count())
+        return osUserRecEmpty;
+     Display();
+     state = osUserRecRemoved;
+     }
+  else if (state == osUserRecRemoved) {
+     // a recording was removed from a sub folder, so update the current item
+     if (cOsdMenu *m = SubMenu()) {
+        if (cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current())) {
+           if (cMenuRecordingItem *riSub = (cMenuRecordingItem *)m->Get(m->Current()))
+              ri->SetRecording(riSub->Recording());
+           }
         }
+     // no state change here, this report goes upstream!
+     }
+  else if (state == osUserRecEmpty) {
+     // a subfolder became empty, so let's go back up
+     CloseSubMenu(false); // this is the now empty submenu
+     cOsdMenu::Del(Current()); // the menu entry of the now empty subfolder
+     Set(); // in case a recording was moved into a new subfolder of this folder
+     if (base && !Count()) // base: don't go up beyond the top level Recordings menu
+        return state;
+     Display();
+     state = osContinue;
      }
   if (!HasSubMenu()) {
-     if (HadSubMenu) {
-        if (Key == kYellow) {
-           // the last recording in a subdirectory was deleted, so let's go back up
-           cOsdMenu::Del(Current());
-           if (!Count())
-              return osBack;
-           }
-        }
      Set(true);
      if (Key != kNone)
         SetHelpKeys();
@@ -3257,6 +3351,7 @@ class cMenuSetupOSD : public cMenuSetupBase {
 private:
   const char *useSmallFontTexts[3];
   const char *recSortModeTexts[2];
+  const char *recSortDirTexts[2];
   const char *keyColorTexts[4];
   int osdLanguageIndex;
   int numSkins;
@@ -3311,6 +3406,8 @@ void cMenuSetupOSD::Set(void)
   useSmallFontTexts[2] = tr("always");
   recSortModeTexts[0] = tr("by name");
   recSortModeTexts[1] = tr("by time");
+  recSortDirTexts[0] = tr("ascending");
+  recSortDirTexts[1] = tr("descending");
   keyColorTexts[0] = tr("Key$Red");
   keyColorTexts[1] = tr("Key$Green");
   keyColorTexts[2] = tr("Key$Yellow");
@@ -3345,6 +3442,7 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"),  &data.FoldersInTimerMenu));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Always sort folders first"), &data.AlwaysSortFoldersFirst));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Default sort mode for recordings"), &data.DefaultSortModeRec, 2, recSortModeTexts));
+  Add(new cMenuEditStraItem(tr("Setup.OSD$Sorting direction for recordings"), &data.RecSortingDirection, 2, recSortDirTexts));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 0"),            &data.ColorKey0, 4, keyColorTexts));
   Add(new cMenuEditStraItem(tr("Setup.OSD$Color key 1"),            &data.ColorKey1, 4, keyColorTexts));
@@ -3386,7 +3484,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
         ModifiedAppearance = true;
      if (strcmp(data.FontFix, Setup.FontFix) || !DoubleEqual(data.FontFixSizeP, Setup.FontFixSizeP))
         ModifiedAppearance = true;
-     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst || data.RecordingDirs != Setup.RecordingDirs) {
+     if (data.AlwaysSortFoldersFirst != Setup.AlwaysSortFoldersFirst || data.RecordingDirs != Setup.RecordingDirs || data.RecSortingDirection != Setup.RecSortingDirection) {
         LOCK_RECORDINGS_WRITE;
         Recordings->ClearSortNames();
         }
@@ -3587,7 +3685,6 @@ void cMenuSetupDVB::Setup(void)
 
 eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 {
-  int oldPrimaryDVB = ::Setup.PrimaryDVB;
   int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
   bool oldVideoFormat = ::Setup.VideoFormat;
   bool newVideoFormat = data.VideoFormat;
@@ -3650,8 +3747,6 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
        }
      }
   if (state == osBack && Key == kOk) {
-     if (::Setup.PrimaryDVB != oldPrimaryDVB)
-        state = osSwitchDvb;
      if (::Setup.VideoDisplayFormat != oldVideoDisplayFormat)
         cDevice::PrimaryDevice()->SetVideoDisplayFormat(eVideoDisplayFormat(::Setup.VideoDisplayFormat));
      if (::Setup.VideoFormat != oldVideoFormat)
@@ -3797,6 +3892,7 @@ bool cMenuSetupCAMItem::Changed(void)
 
 class cMenuSetupCAM : public cMenuSetupBase {
 private:
+  int currentChannel;
   const char *activationHelp;
   eOSState Menu(void);
   eOSState Reset(void);
@@ -3809,6 +3905,7 @@ class cMenuSetupCAM : public cMenuSetupBase {
 
 cMenuSetupCAM::cMenuSetupCAM(void)
 {
+  currentChannel = cDevice::CurrentChannel();
   activationHelp = NULL;
   SetMenuCategory(mcSetupCam);
   SetSection(tr("CAM"));
@@ -3934,6 +4031,8 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key)
          }
      SetHelpKeys();
      }
+  if (currentChannel != cDevice::CurrentChannel())
+     state = osEnd;
   return state;
 }
 
@@ -4081,22 +4180,19 @@ eOSState cMenuSetupMisc::ProcessKey(eKeys Key)
   bool OldSVDRPPeering = data.SVDRPPeering;
   bool ModifiedSVDRPSettings = false;
   if (Key == kOk)
-     ModifiedSVDRPSettings = data.SVDRPPeering != Setup.SVDRPPeering | strcmp(data.SVDRPHostName, Setup.SVDRPHostName);
+     ModifiedSVDRPSettings = data.SVDRPPeering != Setup.SVDRPPeering || strcmp(data.SVDRPHostName, Setup.SVDRPHostName);
   eOSState state = cMenuSetupBase::ProcessKey(Key);
   if (data.SVDRPPeering != OldSVDRPPeering)
      Set();
   if (ModifiedSVDRPSettings) {
-     StopSVDRPClientHandler();
-     StopSVDRPServerHandler();
-     StartSVDRPServerHandler();
-     if (data.SVDRPPeering)
-        StartSVDRPClientHandler();
-     else {
-        LOCK_TIMERS_WRITE;
-        Timers->SetExplicitModify();
-        if (Timers->DelRemoteTimers())
-           Timers->SetModified();
-        }
+     StopSVDRPHandler();
+     {
+       LOCK_TIMERS_WRITE;
+       Timers->SetExplicitModify();
+       if (Timers->StoreRemoteTimers(NULL, NULL))
+          Timers->SetModified();
+     }
+     StartSVDRPHandler();
      }
   return state;
 }
@@ -4563,6 +4659,7 @@ void cDisplayChannel::DisplayChannel(void)
   displayChannel->SetChannel(channel, number);
   cStatus::MsgOsdChannel(ChannelString(channel, number));
   lastPresent = lastFollowing = NULL;
+  lastTime.Set();
 }
 
 void cDisplayChannel::DisplayInfo(void)
@@ -4578,6 +4675,7 @@ void cDisplayChannel::DisplayInfo(void)
            cStatus::MsgOsdProgramme(Present ? Present->StartTime() : 0, Present ? Present->Title() : NULL, Present ? Present->ShortText() : NULL, Following ? Following->StartTime() : 0, Following ? Following->Title() : NULL, Following ? Following->ShortText() : NULL);
            lastPresent = Present;
            lastFollowing = Following;
+           lastTime.Set();
            }
         }
      }
@@ -5133,15 +5231,16 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
   cRecordingUserCommand::InvokeCommand(RUC_BEFORERECORDING, fileName);
   isyslog("record %s", fileName);
   if (MakeDirs(fileName, true)) {
+     Recording.WriteInfo(); // we write this *before* attaching the recorder to the device, to make sure the info file is present when the recorder needs to update the fps value!
      const cChannel *ch = timer->Channel();
      recorder = new cRecorder(fileName, ch, timer->Priority());
      if (device->AttachReceiver(recorder)) {
-        Recording.WriteInfo();
         cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
         if (!Timer && !LastReplayed) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
            cReplayControl::SetRecording(fileName);
         SchedulesStateKey.Remove();
         LOCK_RECORDINGS_WRITE;
+        SetRecordingTimerId(fileName, cString::sprintf("%d@%s", timer->Id(), Setup.SVDRPHostName));
         Recordings->AddByName(fileName);
         return;
         }
@@ -5195,6 +5294,7 @@ void cRecordControl::Stop(bool ExecuteUserCommand)
      DELETENULL(recorder);
      timer->SetRecording(false);
      timer = NULL;
+     SetRecordingTimerId(fileName, NULL);
      cStatus::MsgRecording(device, NULL, fileName, false);
      if (ExecuteUserCommand)
         cRecordingUserCommand::InvokeCommand(RUC_AFTERRECORDING, fileName);
@@ -5208,7 +5308,6 @@ bool cRecordControl::Process(time_t t)
         timer->SetPending(false);
      return false;
      }
-  AssertFreeDiskSpace(timer->Priority());
   return true;
 }
 
@@ -5478,8 +5577,6 @@ cReplayControl::cReplayControl(bool PauseLive)
 cReplayControl::~cReplayControl()
 {
   cDevice::PrimaryDevice()->SetKeepTracks(false);
-  Hide();
-  cStatus::MsgReplaying(this, NULL, fileName, false);
   Stop();
   if (currentReplayControl == this)
      currentReplayControl = NULL;
@@ -5487,6 +5584,8 @@ cReplayControl::~cReplayControl()
 
 void cReplayControl::Stop(void)
 {
+  Hide();
+  cStatus::MsgReplaying(this, NULL, fileName, false);
   if (Setup.DelTimeshiftRec && *fileName) {
      cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
      if (rc && rc->InstantId()) {
@@ -5504,17 +5603,22 @@ void cReplayControl::Stop(void)
                    }
               }
               cDvbPlayerControl::Stop();
-              LOCK_RECORDINGS_WRITE;
-              Recordings->SetExplicitModify();
-              if (cRecording *Recording = Recordings->GetByName(fileName)) {
-                 if (Recording->Delete()) {
-                    Recordings->DelByName(fileName);
-                    ClearLastReplayed(fileName);
-                    Recordings->SetModified();
-                    }
-                 else
-                    Skins.Message(mtError, tr("Error while deleting recording!"));
-                 }
+              bool Error = false;
+              {
+                LOCK_RECORDINGS_WRITE;
+                Recordings->SetExplicitModify();
+                if (cRecording *Recording = Recordings->GetByName(fileName)) {
+                   if (Recording->Delete()) {
+                      Recordings->DelByName(fileName);
+                      ClearLastReplayed(fileName);
+                      Recordings->SetModified();
+                      }
+                   else
+                      Error = true;
+                   }
+              }
+              if (Error)
+                 Skins.Message(mtError, tr("Error while deleting recording!"));
               return;
               }
            }
@@ -5524,6 +5628,16 @@ void cReplayControl::Stop(void)
   cMenuRecordings::SetRecording(NULL); // make sure opening the Recordings menu navigates to the last replayed recording
 }
 
+void cReplayControl::ClearEditingMarks(void)
+{
+  cStateKey StateKey;
+  marks.Lock(StateKey);
+  while (cMark *m = marks.First())
+        marks.Del(m);
+  StateKey.Remove();
+  cStatus::MsgMarksModified(NULL);
+}
+
 void cReplayControl::SetRecording(const char *FileName)
 {
   fileName = FileName;
@@ -5764,6 +5878,7 @@ void cReplayControl::MarkToggle(void)
      StateKey.Remove();
      ShowTimed(2);
      marksModified = true;
+     cStatus::MsgMarksModified(&marks);
      }
 }
 
@@ -5823,6 +5938,7 @@ void cReplayControl::MarkMove(int Frames, bool MarkRequired)
         m->SetPosition(p);
         Goto(m->Position(), true);
         marksModified = true;
+        cStatus::MsgMarksModified(&marks);
         }
      else if (!MarkRequired)
         Goto(SkipFrames(Frames), !Play);
@@ -5942,8 +6058,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                    SkipSeconds(Setup.SkipSecondsRepeat); break;
     case kYellow:  SkipSeconds(Setup.SkipSeconds); break;
     case kStop:
-    case kBlue:    Hide();
-                   Stop();
+    case kBlue:    Stop();
                    return osEnd;
     default: {
       DoShowMode = false;
@@ -5987,8 +6102,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    Hide();
-                           Stop();
+            case kBack:    Stop();
                            return osRecordings;
             default:       return osUnknown;
             }
diff --git a/menu.h b/menu.h
index 9a971ad01..08c51f7ac 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 4.5 2016/12/22 10:55:36 kls Exp $
+ * $Id: menu.h 4.6 2018/02/01 15:35:48 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -326,6 +326,7 @@ class cReplayControl : public cDvbPlayerControl {
   virtual void Show(void);
   virtual void Hide(void);
   bool Visible(void) { return visible; }
+  virtual void ClearEditingMarks(void);
   static void SetRecording(const char *FileName);
   static const char *NowReplaying(void);
   static const char *LastReplayed(void);
diff --git a/mtd.c b/mtd.c
index 345288ece..04bf09df6 100644
--- a/mtd.c
+++ b/mtd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.c 1.11 2017/05/01 09:19:52 kls Exp $
+ * $Id: mtd.c 1.12 2017/10/31 12:16:39 kls Exp $
  */
 
 #include "mtd.h"
@@ -148,6 +148,7 @@ class cMtdMapper {
 private:
   int number;
   int masterCamSlotNumber;
+  int nextUniqPid;
   uint16_t uniqPids[MAX_REAL_PIDS]; // maps a real PID to a unique PID
   uint16_t realPids[MAX_UNIQ_PIDS]; // maps a unique PID to a real PID
   cVector<uint16_t> uniqSids;
@@ -165,6 +166,7 @@ cMtdMapper::cMtdMapper(int Number, int MasterCamSlotNumber)
 {
   number = Number;
   masterCamSlotNumber = MasterCamSlotNumber;
+  nextUniqPid = 0;
   Clear();
 }
 
@@ -179,11 +181,15 @@ uint16_t cMtdMapper::MakeUniqPid(uint16_t RealPid)
   DBGMTD("CAM %d/%d: mapped PID %d (%04X) to %d (%04X)", masterCamSlotNumber, number, RealPid, RealPid, uniqPids[RealPid], uniqPids[RealPid]);
   return uniqPids[RealPid];
 #else
-  for (int i = 0; i < MAX_UNIQ_PIDS; i++) {
+  for (int p = 0; p < MAX_UNIQ_PIDS; p++) {
+      int i = nextUniqPid + p;
+      if (i >= MAX_UNIQ_PIDS)
+         i -= MAX_UNIQ_PIDS;
       if (realPids[i] == MTD_INVALID_PID) { // 0x0000 is a valid PID (PAT)!
          realPids[i] = RealPid;
          uniqPids[RealPid] = (number << UNIQ_PID_SHIFT) | i;
          DBGMTD("CAM %d/%d: mapped PID %d (%04X) to %d (%04X)", masterCamSlotNumber, number, RealPid, RealPid, uniqPids[RealPid], uniqPids[RealPid]);
+         nextUniqPid = i + 1;
          return uniqPids[RealPid];
          }
       }
@@ -212,6 +218,7 @@ void cMtdMapper::Clear(void)
   DBGMTD("CAM %d/%d: MTD mapper cleared", masterCamSlotNumber, number);
   memset(uniqPids, 0, sizeof(uniqPids));
   memset(realPids, MTD_INVALID_PID, sizeof(realPids));
+  // do not reset nextUniqPid here!
   uniqSids.Clear();
 }
 
diff --git a/nit.c b/nit.c
index 874367f30..299a4066f 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 4.4 2016/12/23 14:16:59 kls Exp $
+ * $Id: nit.c 4.5 2018/03/18 10:52:21 kls Exp $
  */
 
 #include "nit.h"
@@ -120,6 +120,10 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     bool forceTransponderUpdate = false;
                     for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           // Preserve parameters set separately in S2SatelliteDeliverySystemDescriptor:
+                           cDvbTransponderParameters dtpc(Channel->Parameters());
+                           dtp.SetStreamId(dtpc.StreamId());
+                           //
                            int transponder = Channel->Transponder();
                            found = true;
                            if (!ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), transponder)) {
@@ -157,8 +161,8 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                         if (!Channel->GroupSep() && cSource::IsSat(Channel->Source()) && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            SI::S2SatelliteDeliverySystemDescriptor *sd = (SI::S2SatelliteDeliverySystemDescriptor *)d;
                            cDvbTransponderParameters dtp(Channel->Parameters());
-                           dtp.SetSystem(DVB_SYSTEM_2);
                            dtp.SetStreamId(sd->getInputStreamIdentifier());
+                           dbgnit("    stream id = %d\n", dtp.StreamId());
                            ChannelsModified |= Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), dtp.ToString('S'));
                            break;
                            }
@@ -239,6 +243,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     bool forceTransponderUpdate = false;
                     for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+                           // Preserve parameters set separately in T2DeliverySystemDescripto:
+                           cDvbTransponderParameters dtpc(Channel->Parameters());
+                           dtp.SetSystem(dtpc.System());
+                           dtp.SetStreamId(dtpc.StreamId());
+                           dtp.SetT2SystemId(dtp.T2SystemId());
+                           dtp.SetSisoMiso(dtpc.SisoMiso());
+                           dtp.SetBandwidth(dtpc.Bandwidth());
+                           dtp.SetGuard(dtpc.Guard());
+                           dtp.SetTransmission(dtpc.Transmission());
+                           //
                            int transponder = Channel->Transponder();
                            found = true;
                            if (!ISTRANSPONDER(Frequency / 1000000, transponder)) {
@@ -295,6 +309,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                      dtp.SetTransmission(T2TransmissionModes[td->getTransmissionMode()]);
                                      //TODO add parsing of frequencies
                                      }
+                                  dbgnit("    stream id = %d\n", dtp.StreamId());
                                   ChannelsModified |= Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('T'));
                                   }
                                }
diff --git a/osd.c b/osd.c
index 524700ae1..d29a2c410 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 4.3 2015/09/10 14:12:06 kls Exp $
+ * $Id: osd.c 4.4 2018/01/25 15:09:09 kls Exp $
  */
 
 #include "osd.h"
@@ -1183,7 +1183,7 @@ void cPixmap::DrawPixmap(const cPixmap *Pixmap, const cRect &Dirty)
            t0.Shift(-Pixmap->DrawPort().Width(), 0);
      while (t0.Y() > Pixmap->ViewPort().Top())
            t0.Shift(0, -Pixmap->DrawPort().Height());
-     cPoint t = t0;;
+     cPoint t = t0;
      while (t.Y() <= Pixmap->ViewPort().Bottom()) {
            while (t.X() <= Pixmap->ViewPort().Right()) {
                  cRect Source = Pixmap->DrawPort(); // assume the entire pixmap needs to be rendered
diff --git a/osd.h b/osd.h
index 61b318d1c..559819e35 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 4.4 2015/04/19 12:18:25 kls Exp $
+ * $Id: osd.h 4.5 2017/11/02 14:59:19 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -785,8 +785,10 @@ class cOsd {
        ///< If there are no dirty pixmaps, or if this is not a true color OSD,
        ///< this function returns NULL.
        ///< The caller must call DestroyPixmap() for the returned pixmap after use.
-//#define DEPRECATED_GETBITMAP
-#ifdef DEPRECATED_GETBITMAP
+#ifndef DEPRECATED_GETBITMAP
+#define DEPRECATED_GETBITMAP 0
+#endif
+#if DEPRECATED_GETBITMAP
 public:
 #endif
   cBitmap *GetBitmap(int Area);
diff --git a/osdbase.c b/osdbase.c
index ac8026ffd..1720022df 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 4.2 2017/04/03 12:30:52 kls Exp $
+ * $Id: osdbase.c 4.4 2018/03/06 10:38:18 kls Exp $
  */
 
 #include "osdbase.h"
@@ -92,6 +92,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
   SetTitle(Title);
   SetCols(c0, c1, c2, c3, c4);
   first = 0;
+  lastOffset = -1;
   current = marked = -1;
   subMenu = NULL;
   helpRed = helpGreen = helpYellow = helpBlue = NULL;
@@ -253,7 +254,7 @@ void cOsdMenu::Display(void)
          }
      if (current < 0)
         current = 0; // just for safety - there HAS to be a current item!
-     first = min(first, max(0, count - displayMenuItems)); // in case the menu size has changed
+     first = max(0, min(first, max(0, count - displayMenuItems))); // in case the menu size has changed
      if (current - first >= displayMenuItems || current < first) {
         first = current - displayMenuItems / 2;
         if (first + displayMenuItems > count)
@@ -281,6 +282,9 @@ void cOsdMenu::Display(void)
 void cOsdMenu::SetCurrent(cOsdItem *Item)
 {
   current = Item ? Item->Index() : -1;
+  if (current >= 0 && lastOffset >= 0)
+     first = max(0, current - lastOffset);
+  lastOffset = -1;
 }
 
 void cOsdMenu::RefreshCurrent(void)
@@ -326,6 +330,7 @@ void cOsdMenu::Clear(void)
 {
   if (marked >= 0)
      SetStatus(NULL);
+  lastOffset = (current > first) ? current - first : 0;
   first = 0;
   current = marked = -1;
   cList<cOsdItem>::Clear();
diff --git a/osdbase.h b/osdbase.h
index 91b795d5d..cbb0e87d7 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 4.2 2017/04/03 12:02:16 kls Exp $
+ * $Id: osdbase.h 4.5 2018/01/25 15:09:23 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -30,7 +30,6 @@ enum eOSState { osUnknown,
                 osStopRecord,
                 osStopReplay,
                 osCancelEdit,
-                osSwitchDvb,
                 osBack,
                 osEnd,
                 os_User, // the following values can be used locally
@@ -92,6 +91,7 @@ class cOsdMenu : public cOsdObject, public cList<cOsdItem> {
   char *title;
   int cols[cSkinDisplayMenu::MaxTabs];
   int first, current, marked;
+  int lastOffset;
   eMenuCategory menuCategory;
   eMenuSortMode menuSortMode;
   eMenuOrientation menuOrientation;
diff --git a/peerdemo b/peerdemo
new file mode 100755
index 000000000..7129207b4
--- /dev/null
+++ b/peerdemo
@@ -0,0 +1,136 @@
+#!/usr/bin/perl
+
+# VDR SVDRP Peer Demo
+#
+# This script broadcasts an SVDRP discover datagram on the SVDRP UDP port and
+# then listens for replies  from peer VDRs on both the UDP and TCP port.
+# It reacts properly to the SVDRP commands CONN, LSTT, POLL, PING and QUIT,
+# and thus seems like a regular VDR to other VDRs.
+#
+# (C) 2018 by Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
+
+use Getopt::Std;
+use IO::Socket;
+use IO::Select;
+
+$DefaultSvdrpPort = 6419;
+$DefaultSvdrpName = "peerdemo";
+
+$Usage = qq{
+Usage: $0 options
+
+Options: -n name  use the given VDR name (default: $DefaultSvdrpName)
+         -p port  use the given TCP port (default: $DefaultSvdrpPort)
+         -v       be verbose
+};
+
+die $Usage if (!getopts("n:p:v"));
+
+$Name    = $opt_n || $DefaultSvdrpName;
+$Port    = $opt_p || $DefaultSvdrpPort;
+$Verbose = $opt_v || 0;
+
+# Open TCP and UDP sockets:
+
+$TcpPort = $Port;
+$UdpPort = $DefaultSvdrpPort;
+
+$TcpSocket = new IO::Socket::INET(Listen => 5, LocalPort => $TcpPort, Proto => "tcp", ReusePort => 1) || die "$!";
+$UdpSocket = new IO::Socket::INET(             LocalPort => $UdpPort, Proto => "udp", ReusePort => 1) || die "$!";
+$SvdrpSelect = new IO::Select($TcpSocket);
+setsockopt($UdpSocket, SOL_SOCKET, SO_RCVTIMEO, pack('L!L!', 0, 1000)); # 1ms timeout on UDP socket
+
+# Send UDP broadcast:
+
+$BcastSocket = new IO::Socket::INET(PeerAddr => '255.255.255.255', PeerPort => $UdpPort, Proto => "udp", Broadcast => 1) || die "$!";
+$BcastMsg = "SVDRP:discover name:$Name port:$TcpPort vdrversion:20309 apiversion:20309 timeout:300";
+Log('>', $BcastSocket, $BcastMsg);
+print($BcastSocket $BcastMsg);
+$BcastSocket->close();
+
+# Listen on UDP and TCP socket:
+
+while (1) {
+      if ($UdpSocket->recv($Request, 1024)) {
+         if (Extract($Request, "name") ne $Name) {
+            Log('<', $UdpSocket, $Request);
+            ReportVDR($Request, $UdpSocket->peerhost());
+            }
+         }
+      if (my @Ready = $SvdrpSelect->can_read(0.01)) {
+         for my $fh (@Ready) {
+             if ($fh == $TcpSocket) {
+                # accept connection:
+                my $new = $TcpSocket->accept();
+                Log('<', $new, "incoming TCP connection");
+                # send mandatory response to simulate an SVDRP host:
+                my $Prompt = "220 $Name SVDRP VideoDiskRecorder 2.3.9; Wed Nov 29 17:00:29 2017; ISO-8859-1";
+                Log('>', $new, $Prompt);
+                print($new "$Prompt\n");
+                # add incoming connection to select:
+                $SvdrpSelect->add($new);
+                }
+             else {
+                # process connection:
+                my $Request = "";
+                $fh->recv($Request, 1024);
+                chomp($Request);
+                Log('<', $fh, $Request) if ($Request);
+                if ($Request =~ /^CONN/i) {
+                   Reply($fh, "250 OK");
+                   ReportVDR($Request, $fh->peerhost());
+                   }
+                elsif ($Request =~ /^LSTT/i) {
+                   Reply($fh, "550 No timers defined");
+                   }
+                elsif ($Request =~ /^POLL/i) {
+                   Reply($fh, "250 OK");
+                   }
+                elsif ($Request =~ /^PING/i) {
+                   Reply($fh, "250 $Name is alive");
+                   }
+                elsif ($Request =~ /^QUIT/i || !$Request) {
+                   # close connection:
+                   Log('<', $fh, "connection closed");
+                   $SvdrpSelect->remove($fh);
+                   $fh->close;
+                   }
+                }
+             }
+         }
+      }
+
+# Tools:
+
+sub Reply
+{
+  my ($fh, $s) = @_;
+  Log('>', $fh, $s);
+  print($fh "$s\n");
+}
+
+sub ReportVDR
+{
+  my $s = shift;
+  my $PeerHost = shift;
+  $s .= " "; # for easier parsing
+  my $Name       = Extract($s, "name");
+  my $Port       = Extract($s, "port");
+  my $VdrVersion = Extract($s, "vdrversion");
+  my $ApiVersion = Extract($s, "apiversion");
+  my $Timeout    = Extract($s, "timeout");
+  print("found VDR '$Name' at $PeerHost with SVDRP port '$Port'\n");
+}
+
+sub Extract
+{
+  my ($s, $n) = @_;
+  return ($s =~ / $n:([^ ]*) /)[0];
+}
+
+sub Log
+{
+  return unless ($Verbose);
+  my ($Dir, $Socket, $Msg) = @_;
+  printf("SVDRP %s [%s:%s] %s\n", $Dir, $Socket->peerhost(), $Socket->peerport(), $Msg);
+}
diff --git a/player.h b/player.h
index aeb8af8f1..d67bf2a99 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: player.h 4.2 2016/12/22 10:38:11 kls Exp $
+ * $Id: player.h 4.4 2018/02/01 15:34:51 kls Exp $
  */
 
 #ifndef __PLAYER_H
@@ -102,10 +102,15 @@ class cControl : public cOsdObject {
          ///< skins as a last resort, in case they want to display the state of the
          ///< current player. The return value is expected to be a short, single line
          ///< string. The default implementation returns an empty string.
-  double FramesPerSecond(void) const { return player->FramesPerSecond(); }
-  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) const { return player->GetIndex(Current, Total, SnapToIFrame); }
-  bool GetFrameNumber(int &Current, int &Total) const { return player->GetFrameNumber(Current, Total); }
-  bool GetReplayMode(bool &Play, bool &Forward, int &Speed) const { return player->GetReplayMode(Play, Forward, Speed); }
+  virtual void ClearEditingMarks(void) {}
+         ///< Clears any editing marks this player might be showing.
+         ///< Deletion of the marks themselves is handled separately, calling
+         ///< this function merely tells the player to no longer display the
+         ///< marks, if it has any.
+  double FramesPerSecond(void) const { return player ? player->FramesPerSecond() : DEFAULTFRAMESPERSECOND; }
+  bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) const { return player ? player->GetIndex(Current, Total, SnapToIFrame) : false; }
+  bool GetFrameNumber(int &Current, int &Total) const { return player ? player->GetFrameNumber(Current, Total) : false; }
+  bool GetReplayMode(bool &Play, bool &Forward, int &Speed) const { return player ? player->GetReplayMode(Play, Forward, Speed) : false; }
   static void Launch(cControl *Control);
   static void Attach(void);
   static void Shutdown(void);
diff --git a/po/ar.po b/po/ar.po
index f8b039478..4994973b2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
 "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -615,9 +615,6 @@ msgstr "تحرير مجلد"
 msgid "New folder"
 msgstr "مجلد جديد"
 
-msgid "Sub folder"
-msgstr "مجلد فرعى"
-
 msgid "Folder name already exists!"
 msgstr "المجلد موجود بالفعل"
 
@@ -733,6 +730,9 @@ msgstr "جدولة"
 msgid "Can't switch channel!"
 msgstr "لا يمكن تبديل القناة"
 
+msgid "Schedule"
+msgstr "جدولة"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "%sجدولة"
@@ -866,6 +866,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "عرص على الشاشة"
 
@@ -956,6 +962,9 @@ msgstr "قم دائما بسرد المجلدات اولا"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Number keys for characters"
 
@@ -1390,9 +1399,6 @@ msgstr "هل حقا تريد اعادة التشغيل"
 msgid " Stop recording "
 msgstr " ايقاف التسجيل "
 
-msgid "Schedule"
-msgstr "جدولة"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ايقاف الاعادة"
@@ -1600,15 +1606,15 @@ msgstr "البرنامج سيقوم بالاغلاق لاحقا اضغط زر ا
 msgid "Press any key to cancel shutdown"
 msgstr "اضغط اى زر لالغاء اقفال البرنامج"
 
-msgid "Switching primary DVB..."
-msgstr "تم الانتقال لكرت الستالايت الافتراضى"
-
 msgid "Editing process failed!"
 msgstr "تم فشل عملية التعديل"
 
 msgid "Editing process finished"
 msgstr "تم الانتهاء من التعديل"
 
+msgid "Switching primary DVB..."
+msgstr "تم الانتقال لكرت الستالايت الافتراضى"
+
 msgid "Press any key to cancel restart"
 msgstr "اضغط اى زر لالغاء اعادة التشغيل"
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 285f7e3d1..cabcfbd1f 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
 "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -614,9 +614,6 @@ msgstr "Modificar carpeta"
 msgid "New folder"
 msgstr "Nova carpeta"
 
-msgid "Sub folder"
-msgstr "Sub carpeta"
-
 msgid "Folder name already exists!"
 msgstr "La carpeta ja existeix!"
 
@@ -732,6 +729,9 @@ msgstr "Programar"
 msgid "Can't switch channel!"
 msgstr "No puc canviar de canal!"
 
+msgid "Schedule"
+msgstr "Guia de Programaci�"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Guia de Programaci� - %s"
@@ -865,6 +865,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "Informaci� en pantalla"
 
@@ -955,6 +961,9 @@ msgstr "Sempre ordenar primer carpetes"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tecles num�riques per a car�cters"
 
@@ -1389,9 +1398,6 @@ msgstr "Segur que voleu reiniciar?"
 msgid " Stop recording "
 msgstr " Aturar la gravaci� "
 
-msgid "Schedule"
-msgstr "Guia de Programaci�"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Aturar la reproducci�"
@@ -1599,15 +1605,15 @@ msgstr "VDR s'apagar
 msgid "Press any key to cancel shutdown"
 msgstr "Prem qualsevol tecla per cancel�lar l'aturada"
 
-msgid "Switching primary DVB..."
-msgstr "Canviant a la interf�cie DVB prim�ria..."
-
 msgid "Editing process failed!"
 msgstr "Proc�s d'edici� fallit!"
 
 msgid "Editing process finished"
 msgstr "Proc�s d'edici� finalitzat"
 
+msgid "Switching primary DVB..."
+msgstr "Canviant a la interf�cie DVB prim�ria..."
+
 msgid "Press any key to cancel restart"
 msgstr "Prem qualsevol tecla per cancel�lar el reinici"
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 3defcbd11..0905bdb15 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
 "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -614,9 +614,6 @@ msgstr "Změna složky"
 msgid "New folder"
 msgstr "Nová složka"
 
-msgid "Sub folder"
-msgstr "Podsložka"
-
 msgid "Folder name already exists!"
 msgstr "Složka již existuje!"
 
@@ -732,6 +729,9 @@ msgstr "Program"
 msgid "Can't switch channel!"
 msgstr "Kanál nelze přepnout!"
 
+msgid "Schedule"
+msgstr "Program (EPG)"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
@@ -865,6 +865,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -955,6 +961,9 @@ msgstr "Adresáře řadit vždy na začátek"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Psát písmena pomocí číselných kláves"
 
@@ -1389,9 +1398,6 @@ msgstr "Opravdu restartovat?"
 msgid " Stop recording "
 msgstr " Zastavit nahrávání "
 
-msgid "Schedule"
-msgstr "Program (EPG)"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zastavit přehrávání"
@@ -1599,15 +1605,15 @@ msgstr "Vypnutí VDR bude odloženo - vypnete klávesou Power"
 msgid "Press any key to cancel shutdown"
 msgstr "Jakákoliv klávesa zruší vypnutí"
 
-msgid "Switching primary DVB..."
-msgstr "Přepnout primární DVB..."
-
 msgid "Editing process failed!"
 msgstr "Editační proces selhal!"
 
 msgid "Editing process finished"
 msgstr "Editační proces skončil"
 
+msgid "Switching primary DVB..."
+msgstr "Přepnout primární DVB..."
+
 msgid "Press any key to cancel restart"
 msgstr "Jakákoliv klávesa zruší restart"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 906aa61c3..23612eaf1 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -611,9 +611,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
@@ -729,6 +726,9 @@ msgstr "Program"
 msgid "Can't switch channel!"
 msgstr "Kan ikke skifte kanal!"
 
+msgid "Schedule"
+msgstr "Programoversigt"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
@@ -862,6 +862,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -952,6 +958,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1386,9 +1395,6 @@ msgstr "Vil du virkelig genstarte?"
 msgid " Stop recording "
 msgstr " Stop optagelse "
 
-msgid "Schedule"
-msgstr "Programoversigt"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspilning"
@@ -1596,15 +1602,15 @@ msgstr "VDR slukker senere - tryk Sluk for at tvinge"
 msgid "Press any key to cancel shutdown"
 msgstr "Tryk vilk�rlig tast for at annullere sluk"
 
-msgid "Switching primary DVB..."
-msgstr "Skifter prim�r DVB enhed..."
-
 msgid "Editing process failed!"
 msgstr "Redigeringsproces fejlede!"
 
 msgid "Editing process finished"
 msgstr "Redigeringsproces afsluttet"
 
+msgid "Switching primary DVB..."
+msgstr "Skifter prim�r DVB enhed..."
+
 msgid "Press any key to cancel restart"
 msgstr "Tryk vilk�rlig knap for at annullere genstart"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index d7e6576e6..7f3d2d6d0 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-10 13:45+0100\n"
 "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Verzeichnis editieren"
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
-msgid "Sub folder"
-msgstr "Unterverzeichnis"
-
 msgid "Folder name already exists!"
 msgstr "Verzeichnisname existiert bereits!"
 
@@ -730,6 +727,9 @@ msgstr "Programm"
 msgid "Can't switch channel!"
 msgstr "Kanal kann nicht umgeschaltet werden!"
 
+msgid "Schedule"
+msgstr "Programm"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programm - %s"
@@ -863,6 +863,12 @@ msgstr "nach Namen"
 msgid "by time"
 msgstr "nach Zeit"
 
+msgid "ascending"
+msgstr "aufsteigend"
+
+msgid "descending"
+msgstr "absteigend"
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -953,6 +959,9 @@ msgstr "Verzeichnisse immer zuerst einsortieren"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Standard Sortierreihenfolge f�r Aufnahmen"
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr "Sortierreihenfolge f�r Aufnahmen"
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummerntasten f�r Zeichen"
 
@@ -1387,9 +1396,6 @@ msgstr "Wirklich neu starten?"
 msgid " Stop recording "
 msgstr " Aufzeichnung beenden "
 
-msgid "Schedule"
-msgstr "Programm"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Wiedergabe beenden"
@@ -1597,15 +1603,15 @@ msgstr "VDR schaltet sp
 msgid "Press any key to cancel shutdown"
 msgstr "Taste dr�cken, um Ausschalten abzubrechen"
 
-msgid "Switching primary DVB..."
-msgstr "Prim�res Interface wird umgeschaltet..."
-
 msgid "Editing process failed!"
 msgstr "Bearbeitung gescheitert!"
 
 msgid "Editing process finished"
 msgstr "Bearbeitung beendet"
 
+msgid "Switching primary DVB..."
+msgstr "Prim�res Interface wird umgeschaltet..."
+
 msgid "Press any key to cancel restart"
 msgstr "Taste dr�cken, um Neustart abzubrechen"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index db382e80e..1574a9aad 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -611,9 +611,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
@@ -729,6 +726,9 @@ msgstr "
 msgid "Can't switch channel!"
 msgstr "������ �������� �������!"
 
+msgid "Schedule"
+msgstr "���������"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "��������� - %s"
@@ -862,6 +862,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -952,6 +958,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1386,9 +1395,6 @@ msgstr "N
 msgid " Stop recording "
 msgstr " ����� ������� "
 
-msgid "Schedule"
-msgstr "���������"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " ����� ������������"
@@ -1596,15 +1602,15 @@ msgstr ""
 msgid "Press any key to cancel shutdown"
 msgstr "����� ��� ������� ��� ������� �����������"
 
-msgid "Switching primary DVB..."
-msgstr "� ����� DVB ����� �������..."
-
 msgid "Editing process failed!"
 msgstr "� ����������� �������!"
 
 msgid "Editing process finished"
 msgstr "� ����������� ��������"
 
+msgid "Switching primary DVB..."
+msgstr "� ����� DVB ����� �������..."
+
 msgid "Press any key to cancel restart"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index e61ed66dd..fa1590242 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-19 23:00+0100\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Modificar carpeta"
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-msgid "Sub folder"
-msgstr "Sub carpeta"
-
 msgid "Folder name already exists!"
 msgstr "�La carpeta ya existe!"
 
@@ -730,6 +727,9 @@ msgstr "Gu
 msgid "Can't switch channel!"
 msgstr "�No se puede cambiar de canal!"
 
+msgid "Schedule"
+msgstr "Gu�a de Programaci�n"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Gu�a de programaci�n - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "Men�s en pantalla"
 
@@ -953,6 +959,9 @@ msgstr "Siempre ordenar primero carpetas"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
@@ -1387,9 +1396,6 @@ msgstr "
 msgid " Stop recording "
 msgstr " Parar grabaci�n "
 
-msgid "Schedule"
-msgstr "Gu�a de Programaci�n"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reproduci�n"
@@ -1597,15 +1603,15 @@ msgstr "VDR se apagar
 msgid "Press any key to cancel shutdown"
 msgstr "Pulse una tecla para interrumpir apagar"
 
-msgid "Switching primary DVB..."
-msgstr "Cambiando el interfaz DVB primario..."
-
 msgid "Editing process failed!"
 msgstr "�Proceso de edici�n fallido!"
 
 msgid "Editing process finished"
 msgstr "Proceso de edici�n terminado"
 
+msgid "Switching primary DVB..."
+msgstr "Cambiando el interfaz DVB primario..."
+
 msgid "Press any key to cancel restart"
 msgstr "Pulse cualquier tecla para cancelar reinicio"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index e58f97e76..857bc2543 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -611,9 +611,6 @@ msgstr "Muuda kausta"
 msgid "New folder"
 msgstr "Uus kaust"
 
-msgid "Sub folder"
-msgstr "Uus alamkaust"
-
 msgid "Folder name already exists!"
 msgstr "Sellenimeline kaust juba olemas!"
 
@@ -729,6 +726,9 @@ msgstr "Ajakava"
 msgid "Can't switch channel!"
 msgstr "Kanali vahetus ei ole võimalik!"
 
+msgid "Schedule"
+msgstr "Ajakava"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Ajakava - %s"
@@ -862,6 +862,12 @@ msgstr "nime järgi"
 msgid "by time"
 msgstr "aja järgi"
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -952,6 +958,9 @@ msgstr "Järjesta kaustad alati ette"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Salvestiste vaikimisi järjestus"
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teksti sisestamine numbriklahvidega"
 
@@ -1386,9 +1395,6 @@ msgstr "Taaskäivitada?"
 msgid " Stop recording "
 msgstr " Lõpeta salvestamine "
 
-msgid "Schedule"
-msgstr "Ajakava"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lõpeta taasesitus"
@@ -1596,15 +1602,15 @@ msgstr "VDR lülitub välja hiljem - vajuta Power kiirendamiseks"
 msgid "Press any key to cancel shutdown"
 msgstr "Vajuta suvalist klahvi väljalülitamise tühistamiseks"
 
-msgid "Switching primary DVB..."
-msgstr "Esmase DVB seadme ümberlülitus..."
-
 msgid "Editing process failed!"
 msgstr "Töötlemine ebaõnnestus!"
 
 msgid "Editing process finished"
 msgstr "Töötlemine lõpetatud"
 
+msgid "Switching primary DVB..."
+msgstr "Esmase DVB seadme ümberlülitus..."
+
 msgid "Press any key to cancel restart"
 msgstr "Taaskäivitamise katkestamiseks vajuta suvalist klahvi"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 964d8d0f4..5707d9b35 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
 "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -615,9 +615,6 @@ msgstr "Muokkaa kansiota"
 msgid "New folder"
 msgstr "Uusi kansio"
 
-msgid "Sub folder"
-msgstr "Alikansio"
-
 msgid "Folder name already exists!"
 msgstr "Kansio on jo olemassa!"
 
@@ -733,6 +730,9 @@ msgstr "Ohjelmisto"
 msgid "Can't switch channel!"
 msgstr "Kanavan vaihtaminen ei mahdollista!"
 
+msgid "Schedule"
+msgstr "Ohjelmisto"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Ohjelmisto - %s"
@@ -866,6 +866,12 @@ msgstr "nimen mukaan"
 msgid "by time"
 msgstr "ajan mukaan"
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "Kuvaruutunäyttö"
 
@@ -956,6 +962,9 @@ msgstr "Näytä kansiot ensin"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Järjestä tallenteet oletuksena"
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
@@ -1303,16 +1312,16 @@ msgid "Setup.Replay$Resume ID"
 msgstr "Tallenteen paluutunniste"
 
 msgid "any hosts"
-msgstr ""
+msgstr "mihin tahansa palvelimeen"
 
 msgid "only default host"
-msgstr ""
+msgstr "vain oletuspalvelimeen"
 
 msgid "type"
-msgstr ""
+msgstr "tyyppi"
 
 msgid "full"
-msgstr ""
+msgstr "kokonaan"
 
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
@@ -1390,9 +1399,6 @@ msgstr "Käynnistetäänkö uudelleen?"
 msgid " Stop recording "
 msgstr " Lopeta tallennus "
 
-msgid "Schedule"
-msgstr "Ohjelmisto"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lopeta toisto"
@@ -1600,15 +1606,15 @@ msgstr "VDR sammuu myöhemmin - pakota virtanäppäimellä"
 msgid "Press any key to cancel shutdown"
 msgstr "Peru sammutus painamalla mitä tahansa näppäintä"
 
-msgid "Switching primary DVB..."
-msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
-
 msgid "Editing process failed!"
 msgstr "Muokkaus epäonnistui!"
 
 msgid "Editing process finished"
 msgstr "Muokkaus valmis"
 
+msgid "Switching primary DVB..."
+msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
+
 msgid "Press any key to cancel restart"
 msgstr "Peru uudelleenkäynnistys painamalla mitä tahansa näppäintä"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e3c7e084b..af8e4ed0d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-18 20:16+0100\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -622,9 +622,6 @@ msgstr "Modifier le dossier"
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-msgid "Sub folder"
-msgstr "Sous-dossier"
-
 msgid "Folder name already exists!"
 msgstr "Ce nom de dossier existe déjà !"
 
@@ -740,6 +737,9 @@ msgstr "Programme"
 msgid "Can't switch channel!"
 msgstr "Impossible de changer de chaîne !"
 
+msgid "Schedule"
+msgstr "Programme"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programme - %s"
@@ -873,6 +873,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "Affichage à l'écran"
 
@@ -963,6 +969,9 @@ msgstr "Toujours trier les dossiers en premier"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Touches numériques pour caractères"
 
@@ -1397,9 +1406,6 @@ msgstr "Confirmer le redémarrage ?"
 msgid " Stop recording "
 msgstr " Arrêter l'enregistrement "
 
-msgid "Schedule"
-msgstr "Programme"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Arrêter la lecture"
@@ -1607,15 +1613,15 @@ msgstr "VDR doit s'arrêter plus tard - Appuyer sur Arrêt pour forcer"
 msgid "Press any key to cancel shutdown"
 msgstr "Appuyer sur une touche pour annuler l'arrêt"
 
-msgid "Switching primary DVB..."
-msgstr "Changement de périphérique DVB primaire..."
-
 msgid "Editing process failed!"
 msgstr "Échec du montage !"
 
 msgid "Editing process finished"
 msgstr "Montage terminé"
 
+msgid "Switching primary DVB..."
+msgstr "Changement de périphérique DVB primaire..."
+
 msgid "Press any key to cancel restart"
 msgstr "Appuyer sur une touche pour annuler le redémarrage"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index c70a5c33f..9f625c773 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
 "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -613,9 +613,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
@@ -731,6 +728,9 @@ msgstr "Raspored"
 msgid "Can't switch channel!"
 msgstr "Nemogu�e prebaciti program!"
 
+msgid "Schedule"
+msgstr "Raspored"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Raspored - %s"
@@ -864,6 +864,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -954,6 +960,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1388,9 +1397,6 @@ msgstr "Zaista ponovo pokrenuti?"
 msgid " Stop recording "
 msgstr " Prekini snimanje "
 
-msgid "Schedule"
-msgstr "Raspored"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini reprodukciju"
@@ -1598,15 +1604,15 @@ msgstr "VDR 
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite tipku za prekid isklju�ivanja"
 
-msgid "Switching primary DVB..."
-msgstr "Prebacivanje primarnog DVB ure�aja..."
-
 msgid "Editing process failed!"
 msgstr "Rezanje neuspje�no!"
 
 msgid "Editing process finished"
 msgstr "Rezanje zavr�eno"
 
+msgid "Switching primary DVB..."
+msgstr "Prebacivanje primarnog DVB ure�aja..."
+
 msgid "Press any key to cancel restart"
 msgstr "Pritisnite jednu tipku za poni�tenje ponovnog podizanja"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index d1f80b7f4..bdb6fec28 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-13 09:36+0200\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -616,9 +616,6 @@ msgstr "Könyvtár szerkesztése"
 msgid "New folder"
 msgstr "Új könyvtár"
 
-msgid "Sub folder"
-msgstr "Alkönyvtár"
-
 msgid "Folder name already exists!"
 msgstr "Ez a könyvtárnév már létezik!"
 
@@ -734,6 +731,9 @@ msgstr "Műsorújság"
 msgid "Can't switch channel!"
 msgstr "Csatornaváltás nem lehetséges!"
 
+msgid "Schedule"
+msgstr "Műsorújság"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Műsorújság - %s"
@@ -867,6 +867,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -957,6 +963,9 @@ msgstr "Könyvtárakat rendezd előre"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Betűk a számgombokon"
 
@@ -1391,9 +1400,6 @@ msgstr "Tényleg újraindítani?"
 msgid " Stop recording "
 msgstr " Felvételt befejezni "
 
-msgid "Schedule"
-msgstr "Műsorújság"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Lejátszást befejzni"
@@ -1601,15 +1607,15 @@ msgstr "VDR később fog leállni - Kikapcs gombbal kényszerített leállítás
 msgid "Press any key to cancel shutdown"
 msgstr "Nyomj egy gombot a leállás megszakításához"
 
-msgid "Switching primary DVB..."
-msgstr "Elsődleges DVB eszköz váltása folyamatban..."
-
 msgid "Editing process failed!"
 msgstr "Vágás sikertelen!"
 
 msgid "Editing process finished"
 msgstr "Vágás befejezve"
 
+msgid "Switching primary DVB..."
+msgstr "Elsődleges DVB eszköz váltása folyamatban..."
+
 msgid "Press any key to cancel restart"
 msgstr "Nyomj egy gombot az újraindítás megszakításához"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 5e214c53e..6e7815cfb 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
-"PO-Revision-Date: 2017-06-23 00:00+0100\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
+"PO-Revision-Date: 2017-07-02 23:49+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -617,9 +617,6 @@ msgstr "Modifica cartella"
 msgid "New folder"
 msgstr "Nuova cartella"
 
-msgid "Sub folder"
-msgstr "Sotto cartella"
-
 msgid "Folder name already exists!"
 msgstr "Nome cartella già esistente!"
 
@@ -735,6 +732,9 @@ msgstr "Programmi"
 msgid "Can't switch channel!"
 msgstr "Impossibile cambiare canale!"
 
+msgid "Schedule"
+msgstr "Programmi"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programmi - %s"
@@ -868,6 +868,12 @@ msgstr "per nome"
 msgid "by time"
 msgstr "per ora"
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -958,6 +964,9 @@ msgstr "Ordina sempre per prima le cartelle"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Modalità ordinamento predefinito per registrazioni"
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
 
@@ -1305,16 +1314,16 @@ msgid "Setup.Replay$Resume ID"
 msgstr "ID di ripristino"
 
 msgid "any hosts"
-msgstr ""
+msgstr "qualsiasi sistema"
 
 msgid "only default host"
-msgstr ""
+msgstr "solo sistema predefinito"
 
 msgid "type"
 msgstr "tipo"
 
 msgid "full"
-msgstr "completo"
+msgstr "tutto"
 
 msgid "Miscellaneous"
 msgstr "Generici"
@@ -1392,9 +1401,6 @@ msgstr "Eseguire un riavvio?"
 msgid " Stop recording "
 msgstr " Ferma registrazione "
 
-msgid "Schedule"
-msgstr "Programmi"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Ferma riproduzione"
@@ -1602,15 +1608,15 @@ msgstr "VDR si spegnerà più tardi - premi Power per forzare"
 msgid "Press any key to cancel shutdown"
 msgstr "Premi un tasto per annullare lo spegnimento"
 
-msgid "Switching primary DVB..."
-msgstr "Cambio della scheda DVB primaria..."
-
 msgid "Editing process failed!"
 msgstr "Processo di modifica fallito!"
 
 msgid "Editing process finished"
 msgstr "Processo di modifica terminato"
 
+msgid "Switching primary DVB..."
+msgstr "Cambio della scheda DVB primaria..."
+
 msgid "Press any key to cancel restart"
 msgstr "Premi un tasto per annullare il riavvio"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 2c1f3d724..b0855d163 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-11 14:02+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -611,9 +611,6 @@ msgstr "Koreguoti katalogą"
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-msgid "Sub folder"
-msgstr "Pakatalogis"
-
 msgid "Folder name already exists!"
 msgstr "Toks katalogo vardas jau egzistuoja!"
 
@@ -729,6 +726,9 @@ msgstr "Programa"
 msgid "Can't switch channel!"
 msgstr "Negali perjunti kanalo!"
 
+msgid "Schedule"
+msgstr "Programa"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programa - %s"
@@ -862,6 +862,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD (ekrano užsklanda)"
 
@@ -952,6 +958,9 @@ msgstr "Visada pirmiau rūšiuoti katalogus"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Skaičių mygtukai simboliams"
 
@@ -1386,9 +1395,6 @@ msgstr "Tikrai perkrauti?"
 msgid " Stop recording "
 msgstr " Sustabdyti įrašinėjimą "
 
-msgid "Schedule"
-msgstr "Programa"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Sustabdyti kartojimą"
@@ -1596,15 +1602,15 @@ msgstr "VDR išsijungs vėliau - paspauskite Power mygtuką kad padarytumėte ta
 msgid "Press any key to cancel shutdown"
 msgstr "Paspauskit bet kurį mygtuką kad sustabdytumėte sistemos išjungimą"
 
-msgid "Switching primary DVB..."
-msgstr "Sukeičiamas pirminis DVB įrenginys..."
-
 msgid "Editing process failed!"
 msgstr "Koregavimas nepavyko!"
 
 msgid "Editing process finished"
 msgstr "Koregavimas baigtas"
 
+msgid "Switching primary DVB..."
+msgstr "Sukeičiamas pirminis DVB įrenginys..."
+
 msgid "Press any key to cancel restart"
 msgstr "Paspauskit bet kurį mygtuką kad sustabdytumėte perkrovimą"
 
diff --git a/po/mk_MK.po b/po/mk_MK.po
index d07af181f..bb2a86094 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-08 15:18+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -612,9 +612,6 @@ msgstr "Уреди директориум"
 msgid "New folder"
 msgstr "Нов директориум"
 
-msgid "Sub folder"
-msgstr "Поддиректориум"
-
 msgid "Folder name already exists!"
 msgstr "Името веќе постои"
 
@@ -730,6 +727,9 @@ msgstr "Распоред"
 msgid "Can't switch channel!"
 msgstr "Невозможно е да се смени канал!"
 
+msgid "Schedule"
+msgstr "Распоред"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Распоред - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -953,6 +959,9 @@ msgstr "Секогаш сортирај прво папки"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Нумерички копчиња за букви"
 
@@ -1387,9 +1396,6 @@ msgstr "Рестартирање?"
 msgid " Stop recording "
 msgstr " Запри снимање "
 
-msgid "Schedule"
-msgstr "Распоред"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Запри пуштање"
@@ -1597,15 +1603,15 @@ msgstr "VDR ќе се исклучи подоцна - притиснете Ис
 msgid "Press any key to cancel shutdown"
 msgstr "Притиснете копче за отказ на исклучување"
 
-msgid "Switching primary DVB..."
-msgstr "Промена на примарниот DVB уред..."
-
 msgid "Editing process failed!"
 msgstr "Сечењето е неуспешно!"
 
 msgid "Editing process finished"
 msgstr "Сечењето заврши"
 
+msgid "Switching primary DVB..."
+msgstr "Промена на примарниот DVB уред..."
+
 msgid "Press any key to cancel restart"
 msgstr "Притиснете копче за откажување на рестарт"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ed6223e8b..9c46bb6c6 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-10 19:43+0100\n"
 "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
 "Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -617,9 +617,6 @@ msgstr "Bewerk map"
 msgid "New folder"
 msgstr "Nieuwe map"
 
-msgid "Sub folder"
-msgstr "Submap"
-
 msgid "Folder name already exists!"
 msgstr "Map bestaat al"
 
@@ -735,6 +732,9 @@ msgstr "Programmagids"
 msgid "Can't switch channel!"
 msgstr "Kan geen kanaal wisselen!"
 
+msgid "Schedule"
+msgstr "Programmagids"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programma - %s"
@@ -868,6 +868,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -958,6 +964,9 @@ msgstr "Altijd mappen eerst sorteren"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Nummertoetsen voor karakters"
 
@@ -1392,9 +1401,6 @@ msgstr "Werkelijk opnieuw starten?"
 msgid " Stop recording "
 msgstr " Stop opnemen "
 
-msgid "Schedule"
-msgstr "Programmagids"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stop afspelen"
@@ -1602,15 +1608,15 @@ msgstr "VDR zal later uitschakelen - Druk 'Power' om te forceren"
 msgid "Press any key to cancel shutdown"
 msgstr "Druk een toets om shutdown af te breken"
 
-msgid "Switching primary DVB..."
-msgstr "Eerste DVB-kaart wordt omgeschakeld..."
-
 msgid "Editing process failed!"
 msgstr "Bewerken is mislukt!"
 
 msgid "Editing process finished"
 msgstr "Bewerken is klaar"
 
+msgid "Switching primary DVB..."
+msgstr "Eerste DVB-kaart wordt omgeschakeld..."
+
 msgid "Press any key to cancel restart"
 msgstr "Druk een willekeurige toets om herstarten af te breken"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 37eb90691..244f7a53a 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
@@ -730,6 +727,9 @@ msgstr "Programmer"
 msgid "Can't switch channel!"
 msgstr "Ikke mulig � skifte kanal!"
 
+msgid "Schedule"
+msgstr "Programmer"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program Guide - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -953,6 +959,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1387,9 +1396,6 @@ msgstr "Vil du virkelig starte p
 msgid " Stop recording "
 msgstr " Stopp opptak fra "
 
-msgid "Schedule"
-msgstr "Programmer"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Stopp avspilling"
@@ -1597,15 +1603,15 @@ msgstr ""
 msgid "Press any key to cancel shutdown"
 msgstr "Trykk en tast for ikke � sl� av"
 
-msgid "Switching primary DVB..."
-msgstr "Bytter f�rste DVB-enhet..."
-
 msgid "Editing process failed!"
 msgstr "Feil under redigering!"
 
 msgid "Editing process finished"
 msgstr "Redigeringsprosess avsluttet"
 
+msgid "Switching primary DVB..."
+msgstr "Bytter f�rste DVB-enhet..."
+
 msgid "Press any key to cancel restart"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 3a6ec6542..867595537 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -4,38 +4,40 @@
 # Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
 # Marek Nazarko <mnazarko@gmail.com>, 2013
-# Tomasz Maciej Nowak <tmn505@gmail.com>, 2015
+# Tomasz Maciej Nowak <tmn505@gmail.com>, 2015, 2018
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
-"PO-Revision-Date: 2015-02-12 00:59+0100\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
+"PO-Revision-Date: 2018-02-19 00:42+0100\n"
 "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
-"Language: pl\n"
+"Language: pl_PL\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.6\n"
 
 msgid "*** Invalid Channel ***"
-msgstr "*** Niepoprawny kana� ***"
+msgstr "*** Niepoprawny kanał ***"
 
 msgid "CAM activated!"
 msgstr "CAM aktywowany!"
 
 msgid "Channel not available!"
-msgstr "Kana� nie jest dost�pny!"
+msgstr "Kanał nie jest dostępny!"
 
 msgid "Can't start Transfer Mode!"
-msgstr "Nie mo�na uruchomi� trybu transferu!"
+msgstr "Nie można uruchomić trybu transferu!"
 
 msgid "off"
-msgstr "wy��cz"
+msgstr "wyłącz"
 
 msgid "on"
-msgstr "w��cz"
+msgstr "włącz"
 
 msgid "auto"
 msgstr "auto"
@@ -98,7 +100,7 @@ msgid "Content$Movie/Drama"
 msgstr "Film/Dramat"
 
 msgid "Content$Detective/Thriller"
-msgstr "Krymina�/Thriller"
+msgstr "Kryminał/Thriller"
 
 msgid "Content$Adventure/Western/War"
 msgstr "Przygodowy/Western/Wojenny"
@@ -116,13 +118,13 @@ msgid "Content$Romance"
 msgstr "Romans"
 
 msgid "Content$Serious/Classical/Religious/Historical Movie/Drama"
-msgstr "Powa�ne/Klasyczne/Religijne/Historyczne/Dramaty"
+msgstr "Poważne/Klasyczne/Religijne/Historyczne/Dramaty"
 
 msgid "Content$Adult Movie/Drama"
-msgstr "Filmy dla doros�ych/Dramaty"
+msgstr "Filmy dla dorosłych/Dramaty"
 
 msgid "Content$News/Current Affairs"
-msgstr "Wiadomo�ci/Informacje"
+msgstr "Wiadomości/Informacje"
 
 msgid "Content$News/Weather Report"
 msgstr "Prognoza pogody"
@@ -158,13 +160,13 @@ msgid "Content$Sport Magazine"
 msgstr "Magazyny sportowe"
 
 msgid "Content$Football/Soccer"
-msgstr "Pi�ka no�na"
+msgstr "Piłka nożna"
 
 msgid "Content$Tennis/Squash"
 msgstr "Squash"
 
 msgid "Content$Team Sports"
-msgstr "Sporty zespo�owe"
+msgstr "Sporty zespołowe"
 
 msgid "Content$Athletics"
 msgstr "Lekkoatletyka"
@@ -185,7 +187,7 @@ msgid "Content$Martial Sports"
 msgstr "Sporty walki"
 
 msgid "Content$Children's/Youth Programme"
-msgstr "Dzieci�ce"
+msgstr "Dziecięce"
 
 msgid "Content$Pre-school Children's Programme"
 msgstr "Przedszkolne"
@@ -200,7 +202,7 @@ msgid "Content$Informational/Educational/School Programme"
 msgstr "Infromacyjne/Edukacyjne/Szkolne"
 
 msgid "Content$Cartoons/Puppets"
-msgstr "Kresk�wki/Kukie�kowe"
+msgstr "Kreskówki/Kukiełkowe"
 
 msgid "Content$Music/Ballet/Dance"
 msgstr "Muzyka/Balet/Taniec"
@@ -227,10 +229,10 @@ msgid "Content$Arts/Culture"
 msgstr "Sztuka/Kultura"
 
 msgid "Content$Performing Arts"
-msgstr "Rzemios�o"
+msgstr "Rzemiosło"
 
 msgid "Content$Fine Arts"
-msgstr "Dzie�a sztuki"
+msgstr "Dzieła sztuki"
 
 msgid "Content$Religion"
 msgstr "Religia"
@@ -260,22 +262,22 @@ msgid "Content$Fashion"
 msgstr "Moda"
 
 msgid "Content$Social/Political/Economics"
-msgstr "Spo�eczne/Polityka/Ekonomia"
+msgstr "Społeczne/Polityka/Ekonomia"
 
 msgid "Content$Magazine/Report/Documentary"
-msgstr "Reporta�e/Dokumentalne"
+msgstr "Reportaże/Dokumentalne"
 
 msgid "Content$Economics/Social Advisory"
 msgstr "Ekonomia"
 
 msgid "Content$Remarkable People"
-msgstr "S�awni ludzie"
+msgstr "Sławni ludzie"
 
 msgid "Content$Education/Science/Factual"
 msgstr "Edukacja/Nauka"
 
 msgid "Content$Nature/Animals/Environment"
-msgstr "Natura/Zwierz�ta/�rodowisko"
+msgstr "Natura/Zwierzęta/Środowisko"
 
 msgid "Content$Technology/Natural Sciences"
 msgstr "Technologia/Nauki przyrodnicze"
@@ -287,22 +289,22 @@ msgid "Content$Foreign Countries/Expeditions"
 msgstr "Obce kraje/Wyprawy"
 
 msgid "Content$Social/Spiritual Sciences"
-msgstr "Spo�eczne/Duchowe"
+msgstr "Społeczne/Duchowe"
 
 msgid "Content$Further Education"
 msgstr "Dalsza edukacja"
 
 msgid "Content$Languages"
-msgstr "J�zyki"
+msgstr "Języki"
 
 msgid "Content$Leisure/Hobbies"
 msgstr "Czas wolny/Hobby"
 
 msgid "Content$Tourism/Travel"
-msgstr "Turystyka/Podr�e"
+msgstr "Turystyka/Podróże"
 
 msgid "Content$Handicraft"
-msgstr "R�kodzie�o"
+msgstr "Rękodzieło"
 
 msgid "Content$Motoring"
 msgstr "Automobilizm"
@@ -320,23 +322,23 @@ msgid "Content$Gardening"
 msgstr "Ogrody"
 
 msgid "Content$Original Language"
-msgstr "Oryginalny j�zyk"
+msgstr "Oryginalny język"
 
 msgid "Content$Black & White"
-msgstr "Czarne i bia�e"
+msgstr "Czarne i białe"
 
 msgid "Content$Unpublished"
 msgstr "Niepublikowane"
 
 msgid "Content$Live Broadcast"
-msgstr "Transmisje na �ywo"
+msgstr "Transmisje na żywo"
 
 #, c-format
 msgid "ParentalRating$from %d"
 msgstr "od %d"
 
 msgid "No title"
-msgstr "Bez tytu�u"
+msgstr "Bez tytułu"
 
 #. TRANSLATORS: The name of the language, as written natively
 msgid "LanguageName$English"
@@ -350,50 +352,50 @@ msgid "Phase 1: Detecting RC code type"
 msgstr "Etap 1: Wykrywanie rodzaju kodu pilota"
 
 msgid "Press any key on the RC unit"
-msgstr "Naci�nij dowolny klawisz na pilocie"
+msgstr "Naciśnij dowolny klawisz na pilocie"
 
 msgid "RC code detected!"
 msgstr "Wykryto kod pilota!"
 
 msgid "Do not press any key..."
-msgstr "Nie naciskaj teraz �adnego klawisza..."
+msgstr "Nie naciskaj teraz żadnego klawisza..."
 
 msgid "Phase 2: Learning specific key codes"
-msgstr "Etap 2: Nauka konkretnych kod�w klawiszy"
+msgstr "Etap 2: Nauka konkretnych kodów klawiszy"
 
 #, c-format
 msgid "Press key for '%s'"
-msgstr "Naci�nij klawisz dla '%s'"
+msgstr "Naciśnij klawisz dla '%s'"
 
 msgid "Press 'Up' to confirm"
-msgstr "Naci�nij 'Do g�ry' aby potwierdzi�"
+msgstr "Naciśnij 'Do góry' aby potwierdzić"
 
 msgid "Press 'Down' to continue"
-msgstr "Naci�nij 'Na d�' aby kontynuowa�"
+msgstr "Naciśnij 'Na dół' aby kontynuować"
 
 msgid "(press 'Up' to go back)"
-msgstr "(naci�nij 'Do g�ry' aby si� cofn��)"
+msgstr "(naciśnij 'Do góry' aby się cofnąć)"
 
 msgid "(press 'Down' to end key definition)"
-msgstr "(naci�nij 'Na d�' aby zako�czy� definiowanie)"
+msgstr "(naciśnij 'Na dół' aby zakończyć definiowanie)"
 
 msgid "(press 'Menu' to skip this key)"
-msgstr "(naci�nij 'Menu' aby pomin�� ten klawisz)"
+msgstr "(naciśnij 'Menu' aby pominąć ten klawisz)"
 
 msgid "Learning Remote Control Keys"
 msgstr "Nauka klawiszy pilota"
 
 msgid "Phase 3: Saving key codes"
-msgstr "Etap 3: Zapisywanie kod�w klawiszy"
+msgstr "Etap 3: Zapisywanie kodów klawiszy"
 
 msgid "Press 'Up' to save, 'Down' to cancel"
-msgstr "Naci�nij 'Do g�ry' aby zapisa�, 'Na d�' - aby anulowa�"
+msgstr "Naciśnij 'Do góry' aby zapisać, 'Na dół' - aby anulować"
 
 msgid "Key$Up"
-msgstr "Do g�ry"
+msgstr "Do góry"
 
 msgid "Key$Down"
-msgstr "Na d�"
+msgstr "Na dół"
 
 msgid "Key$Menu"
 msgstr "Menu"
@@ -417,7 +419,7 @@ msgid "Key$Green"
 msgstr "Zielony"
 
 msgid "Key$Yellow"
-msgstr "��ty"
+msgstr "Żółty"
 
 msgid "Key$Blue"
 msgstr "Niebieski"
@@ -426,10 +428,10 @@ msgid "Key$Info"
 msgstr "Info"
 
 msgid "Key$Play/Pause"
-msgstr "Odtw�rz/Pauza"
+msgstr "Odtwórz/Pauza"
 
 msgid "Key$Play"
-msgstr "Odtw�rz"
+msgstr "Odtwórz"
 
 msgid "Key$Pause"
 msgstr "Pauza"
@@ -444,7 +446,7 @@ msgid "Key$FastFwd"
 msgstr "Do przodu"
 
 msgid "Key$FastRew"
-msgstr "Do ty�u"
+msgstr "Do tyłu"
 
 msgid "Key$Next"
 msgstr "Dalej"
@@ -453,19 +455,19 @@ msgid "Key$Prev"
 msgstr "Wstecz"
 
 msgid "Key$Power"
-msgstr "Wy��cz"
+msgstr "Wyłącz"
 
 msgid "Key$Channel+"
-msgstr "Kana�+"
+msgstr "Kanał+"
 
 msgid "Key$Channel-"
-msgstr "Kana�-"
+msgstr "Kanał-"
 
 msgid "Key$PrevChannel"
-msgstr "Poprzedni kana�"
+msgstr "Poprzedni kanał"
 
 msgid "Key$Volume+"
-msgstr "G�o�niej"
+msgstr "Głośniej"
 
 msgid "Key$Volume-"
 msgstr "Ciszej"
@@ -474,16 +476,16 @@ msgid "Key$Mute"
 msgstr "Wycisz"
 
 msgid "Key$Audio"
-msgstr "D�wi�k"
+msgstr "Dźwięk"
 
 msgid "Key$Subtitles"
-msgstr "Podtytu�y"
+msgstr "Podtytuły"
 
 msgid "Key$Schedule"
 msgstr "Program"
 
 msgid "Key$Channels"
-msgstr "Kana�y"
+msgstr "Kanały"
 
 msgid "Key$Timers"
 msgstr "Timery"
@@ -498,34 +500,34 @@ msgid "Key$Commands"
 msgstr "Polecenia"
 
 msgid "Key$User0"
-msgstr "U�ytkownik 0"
+msgstr "Użytkownik 0"
 
 msgid "Key$User1"
-msgstr "U�ytkownik 1"
+msgstr "Użytkownik 1"
 
 msgid "Key$User2"
-msgstr "U�ytkownik 2"
+msgstr "Użytkownik 2"
 
 msgid "Key$User3"
-msgstr "U�ytkownik 3"
+msgstr "Użytkownik 3"
 
 msgid "Key$User4"
-msgstr "U�ytkownik 4"
+msgstr "Użytkownik 4"
 
 msgid "Key$User5"
-msgstr "U�ytkownik 5"
+msgstr "Użytkownik 5"
 
 msgid "Key$User6"
-msgstr "U�ytkownik 6"
+msgstr "Użytkownik 6"
 
 msgid "Key$User7"
-msgstr "U�ytkownik 7"
+msgstr "Użytkownik 7"
 
 msgid "Key$User8"
-msgstr "U�ytkownik 8"
+msgstr "Użytkownik 8"
 
 msgid "Key$User9"
-msgstr "U�ytkownik 9"
+msgstr "Użytkownik 9"
 
 msgid "Free To Air"
 msgstr "nieszyfrowany"
@@ -534,16 +536,16 @@ msgid "encrypted"
 msgstr "szyfrowany"
 
 msgid "Edit channel"
-msgstr "Edycja kana�u"
+msgstr "Edycja kanału"
 
 msgid "Name"
 msgstr "Nazwa"
 
 msgid "Source"
-msgstr "�r�d�o"
+msgstr "Źródło"
 
 msgid "Frequency"
-msgstr "Cz�stotliwo��"
+msgstr "Częstotliwość"
 
 msgid "Vpid"
 msgstr "Vpid"
@@ -585,10 +587,10 @@ msgid "Tid"
 msgstr "Tid"
 
 msgid "Channel settings are not unique!"
-msgstr "Ustawienia kana�u nie s� unikalne!"
+msgstr "Ustawienia kanału nie są unikalne!"
 
 msgid "Channels"
-msgstr "Kana�y"
+msgstr "Kanały"
 
 msgid "Button$Edit"
 msgstr "Edytuj"
@@ -597,16 +599,16 @@ msgid "Button$New"
 msgstr "Nowy"
 
 msgid "Button$Delete"
-msgstr "Usu�"
+msgstr "Usuń"
 
 msgid "Button$Mark"
 msgstr "Zaznacz"
 
 msgid "Channel is being used by a timer!"
-msgstr "Kana� jest u�ywany przez timer!"
+msgstr "Kanał jest używany przez timer!"
 
 msgid "Delete channel?"
-msgstr "Usun�� kana�?"
+msgstr "Usunąć kanał?"
 
 msgid "Edit folder"
 msgstr "Edutuj katalog"
@@ -614,24 +616,21 @@ msgstr "Edutuj katalog"
 msgid "New folder"
 msgstr "Nowy katalog"
 
-msgid "Sub folder"
-msgstr "Podkatalog"
-
 msgid "Folder name already exists!"
 msgstr "Taka nazwa katalogu juz istnieje"
 
 #, c-format
 msgid "Folder name must not contain '%c'!"
-msgstr "Folder nie mo�e zawiera� '%c'!"
+msgstr "Folder nie może zawierać '%c'!"
 
 msgid "Button$Open"
-msgstr "Otw�rz"
+msgstr "Otwórz"
 
 msgid "Delete folder and all sub folders?"
-msgstr "Czy skasowa� katalog i wszystkie podkatalogi?"
+msgstr "Czy skasować katalog i wszystkie podkatalogi?"
 
 msgid "Delete folder?"
-msgstr "Czy skasowa� katalog?"
+msgstr "Czy skasować katalog?"
 
 msgid "Edit timer"
 msgstr "Edycja timera"
@@ -640,13 +639,13 @@ msgid "Active"
 msgstr "Aktywny"
 
 msgid "Channel"
-msgstr "Kana�"
+msgstr "Kanał"
 
 msgid "Day"
-msgstr "Dzie�"
+msgstr "Dzień"
 
 msgid "Start"
-msgstr "Pocz�tek"
+msgstr "Początek"
 
 msgid "Stop"
 msgstr "Koniec"
@@ -658,13 +657,13 @@ msgid "Priority"
 msgstr "Priorytet"
 
 msgid "Lifetime"
-msgstr "Czas �ycia"
+msgstr "Czas życia"
 
 msgid "File"
 msgstr "Plik"
 
 msgid "Record on"
-msgstr ""
+msgstr "Nagrywanie włączone"
 
 msgid "Button$Folder"
 msgstr "Katalog"
@@ -676,13 +675,13 @@ msgid "Button$Repeating"
 msgstr "Powtarzanie"
 
 msgid "First day"
-msgstr "Pierwszy dzie�"
+msgstr "Pierwszy dzień"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Błąd podczas dostępu do zdalnego timera"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Timer został usunięty!"
 
 msgid "Select folder"
 msgstr "Wybierz katalog"
@@ -691,16 +690,16 @@ msgid "Timers"
 msgstr "Timery"
 
 msgid "Button$On/Off"
-msgstr "W�/Wy�"
+msgstr "Wł/Wył"
 
 msgid "Button$Info"
 msgstr "Info"
 
 msgid "Delete timer?"
-msgstr "Usun�� timer?"
+msgstr "Usunąć timer?"
 
 msgid "Timer still recording - really delete?"
-msgstr "Trwa nagrywanie - na pewno usun��?"
+msgstr "Trwa nagrywanie - na pewno usunąć?"
 
 msgid "Event"
 msgstr "Audycja"
@@ -712,16 +711,16 @@ msgid "Button$Record"
 msgstr "Nagraj"
 
 msgid "Button$Switch"
-msgstr "Prze��cz"
+msgstr "Przełącz"
 
 msgid "What's on now?"
-msgstr "Program bie��cy"
+msgstr "Program bieżący"
 
 msgid "What's on next?"
-msgstr "Nast�pne audycje"
+msgstr "Następne audycje"
 
 msgid "Button$Next"
-msgstr "Nast�pnie"
+msgstr "Następnie"
 
 msgid "Button$Now"
 msgstr "Teraz"
@@ -730,7 +729,10 @@ msgid "Button$Schedule"
 msgstr "Program"
 
 msgid "Can't switch channel!"
-msgstr "Nie mo�na prze��czy� kana�u!"
+msgstr "Nie można przełączyć kanału!"
+
+msgid "Schedule"
+msgstr "Program"
 
 #, c-format
 msgid "Schedule - %s"
@@ -741,39 +743,39 @@ msgid "This event - %s"
 msgstr "Ta audycja - %s"
 
 msgid "This event - all channels"
-msgstr "Ta audycja - wszystkie kana�y"
+msgstr "Ta audycja - wszystkie kanały"
 
 msgid "All events - all channels"
-msgstr "Wszystkie audycje - wszystkie kana�y"
+msgstr "Wszystkie audycje - wszystkie kanały"
 
 #, c-format
 msgid "Please enter %d digits!"
-msgstr "Prosz� poda� %d cyfr!"
+msgstr "Proszę podać %d cyfr!"
 
 msgid "CAM not responding!"
 msgstr "CAM nie reaguje!"
 
 msgid "Edit path"
-msgstr "Edytuj �cie�k�"
+msgstr "Edytuj ścieżkę"
 
 msgid "Folder"
 msgstr "Katalog"
 
 msgid "This folder is currently in use - no changes are possible!"
-msgstr "Ten katalog jest w u�yciu - zmiany nie s� mo�liwe!"
+msgstr "Ten katalog jest w użyciu - zmiany nie są możliwe!"
 
 #, c-format
 msgid "Move entire folder containing %d recordings?"
-msgstr "Przenie�� ca�y katalog zawiraj�cy %d nagra�?"
+msgstr "Przenieść cały katalog zawirający %d nagrań?"
 
 msgid "Error while moving folder!"
-msgstr "B��d podczas przenoszenia katalogu!"
+msgstr "Błąd podczas przenoszenia katalogu!"
 
 msgid "Edit recording"
 msgstr "Edytuj nagranie"
 
 msgid "This recording is currently in use - no changes are possible!"
-msgstr "To nagranie jest w u�yciu - zmiany nie s� mo�liwe!"
+msgstr "To nagranie jest w użyciu - zmiany nie są możliwe!"
 
 msgid "Button$Cancel cutting"
 msgstr "Anuluj przycinanie"
@@ -797,40 +799,40 @@ msgid "Button$Cut"
 msgstr "Wytnij"
 
 msgid "Button$Delete marks"
-msgstr "Usu� zaznaczone"
+msgstr "Usuń zaznaczone"
 
 msgid "Recording vanished!"
-msgstr "Nagranie znikn�o!"
+msgstr "Nagranie zniknęło!"
 
 msgid "Edited version already exists - overwrite?"
-msgstr "Edytowana wersja ju� istnieje - nadpisa�?"
+msgstr "Edytowana wersja już istnieje - nadpisać?"
 
 msgid "Error while queueing recording for cutting!"
-msgstr "B��d podczas zakolejkowania nagrania do przycinania!"
+msgstr "Błąd podczas zakolejkowania nagrania do przycinania!"
 
 msgid "Rename recording to folder name?"
-msgstr "Zmieni� nazw� nagrania na nazw� katalogu?"
+msgstr "Zmienić nazwę nagrania na nazwę katalogu?"
 
 msgid "Delete editing marks for this recording?"
-msgstr "Usun�� zaznaczenia z edycji dla tego nagrania?"
+msgstr "Usunąć zaznaczenia z edycji dla tego nagrania?"
 
 msgid "Error while deleting editing marks!"
-msgstr "B��d podczas usuwania zaznacze� edycji!"
+msgstr "Błąd podczas usuwania zaznaczeń edycji!"
 
 msgid "Error while changing priority/lifetime!"
-msgstr "B��d podczas zmiany priorytetu/czasu �ycia!"
+msgstr "Błąd podczas zmiany priorytetu/czasu życia!"
 
 msgid "Error while changing folder/name!"
-msgstr "B��d podczas zmiany katalogu/nazwy!"
+msgstr "Błąd podczas zmiany katalogu/nazwy!"
 
 msgid "Recording info"
 msgstr "Informacje o nagraniu"
 
 msgid "Button$Play"
-msgstr "Odtw�rz"
+msgstr "Odtwórz"
 
 msgid "Button$Rewind"
-msgstr "Pocz�tek"
+msgstr "Początek"
 
 msgid "Recordings"
 msgstr "Nagrania"
@@ -839,40 +841,46 @@ msgid "Commands"
 msgstr "Polecenia"
 
 msgid "Delete recording?"
-msgstr "Usun�� nagranie?"
+msgstr "Usunąć nagranie?"
 
 msgid "Recording is being edited - really delete?"
-msgstr "Nagranie jest edytowane - jeste� pewien �e chcesz je usun��?"
+msgstr "Nagranie jest edytowane - jesteś pewien że chcesz je usunąć?"
 
 msgid "Error while deleting recording!"
-msgstr "B��d podczas usuwania nagrania!"
+msgstr "Błąd podczas usuwania nagrania!"
 
 msgid "Recording commands"
-msgstr "Polecenia nagra�"
+msgstr "Polecenia nagrań"
 
 msgid "never"
 msgstr "nigdy"
 
 msgid "skin dependent"
-msgstr "zal. od sk�rki"
+msgstr "zal. od skórki"
 
 msgid "always"
 msgstr "zawsze"
 
 msgid "by name"
-msgstr ""
+msgstr "wg nazwy"
 
 msgid "by time"
-msgstr ""
+msgstr "wg czasu"
+
+msgid "ascending"
+msgstr "rosnąco"
+
+msgid "descending"
+msgstr "malejąco"
 
 msgid "OSD"
 msgstr "OSD"
 
 msgid "Setup.OSD$Language"
-msgstr "J�zyk"
+msgstr "Język"
 
 msgid "Setup.OSD$Skin"
-msgstr "Sk�rka"
+msgstr "Skórka"
 
 msgid "Setup.OSD$Theme"
 msgstr "Motyw"
@@ -881,55 +889,55 @@ msgid "Setup.OSD$Left (%)"
 msgstr "Od lewej (%)"
 
 msgid "Setup.OSD$Top (%)"
-msgstr "Od g�ry (%)"
+msgstr "Od góry (%)"
 
 msgid "Setup.OSD$Width (%)"
-msgstr "Szeroko�� (%)"
+msgstr "Szerokość (%)"
 
 msgid "Setup.OSD$Height (%)"
-msgstr "Wysoko�� (%)"
+msgstr "Wysokość (%)"
 
 msgid "Setup.OSD$Message time (s)"
-msgstr "Czas trwania wiadomo�ci (s)"
+msgstr "Czas trwania wiadomości (s)"
 
 msgid "Setup.OSD$Use small font"
-msgstr "U�ywaj ma�ej czcionki"
+msgstr "Używaj małej czcionki"
 
 msgid "Setup.OSD$Anti-alias"
-msgstr "Wyg�adzanie"
+msgstr "Wygładzanie"
 
 msgid "Setup.OSD$Default font"
 msgstr "Standardowa czcionka"
 
 msgid "Setup.OSD$Small font"
-msgstr "Ma�a czcionka"
+msgstr "Mała czcionka"
 
 msgid "Setup.OSD$Fixed font"
-msgstr "Sta�a czcionka"
+msgstr "Stała czcionka"
 
 msgid "Setup.OSD$Default font size (%)"
-msgstr "Standardowa czcionka wyj�ciowa (%)"
+msgstr "Standardowa czcionka wyjściowa (%)"
 
 msgid "Setup.OSD$Small font size (%)"
-msgstr "Ma�a czcionka wyj�ciowa (%)"
+msgstr "Mała czcionka wyjściowa (%)"
 
 msgid "Setup.OSD$Fixed font size (%)"
-msgstr "Ustalona czcionka wyj�ciowa (%)"
+msgstr "Ustalona czcionka wyjściowa (%)"
 
 msgid "Setup.OSD$Channel info position"
 msgstr "Pozycja informacji o kanale"
 
 msgid "bottom"
-msgstr "d�"
+msgstr "dół"
 
 msgid "top"
-msgstr "g�ra"
+msgstr "góra"
 
 msgid "Setup.OSD$Channel info time (s)"
 msgstr "Czas trwania informacji o kanale (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Informacja przy zmianie kana�u"
+msgstr "Informacja przy zmianie kanału"
 
 msgid "Setup.OSD$Timeout requested channel info"
 msgstr "Czas oczekiwania na informacje"
@@ -938,13 +946,13 @@ msgid "Setup.OSD$Scroll pages"
 msgstr "Przesuwaj stronami"
 
 msgid "Setup.OSD$Scroll wraps"
-msgstr "Skrajne pozycje s�siaduj�"
+msgstr "Skrajne pozycje sąsiadują"
 
 msgid "Setup.OSD$Menu key closes"
 msgstr "Przycisk Menu zamyka"
 
 msgid "Setup.OSD$Recording directories"
-msgstr "Katalogi nagra�"
+msgstr "Katalogi nagrań"
 
 msgid "Setup.OSD$Folders in timer menu"
 msgstr "Katalogi w menu timera"
@@ -953,7 +961,10 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Sortuj najpierw katalogi"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Domyślny tryb sortowania dla nagrań"
+
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr "Kierunek sortowania nagrań"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Klawisze numeryczne dla liter"
@@ -980,7 +991,7 @@ msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "Czas skanowania EPG (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "Stopie� poprawek b��d�w EPG"
+msgstr "Stopień poprawek błędów EPG"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Czas przechowywania EPG (min)"
@@ -989,15 +1000,15 @@ msgid "Setup.EPG$Set system time"
 msgstr "Ustawiaj czas systemowy"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "U�yj czasu z transpondera"
+msgstr "Użyj czasu z transpondera"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
-msgstr "Preferowanych j�zyk�w"
+msgstr "Preferowanych języków"
 
 #. TRANSLATORS: note the singular!
 msgid "Setup.EPG$Preferred language"
-msgstr "Preferowany j�zyk"
+msgstr "Preferowany język"
 
 msgid "pan&scan"
 msgstr "pan&scan"
@@ -1021,7 +1032,7 @@ msgid "names and PIDs"
 msgstr "nazwy i PID-y"
 
 msgid "add new channels"
-msgstr "dodawaj nowe kana�y"
+msgstr "dodawaj nowe kanały"
 
 msgid "add new transponders"
 msgstr "dodawaj nowe transpondery"
@@ -1030,7 +1041,7 @@ msgid "DVB"
 msgstr "DVB"
 
 msgid "Button$Audio"
-msgstr "D�wi�k"
+msgstr "Dźwięk"
 
 msgid "Button$Subtitles"
 msgstr "Napisy"
@@ -1039,92 +1050,92 @@ msgid "Setup.DVB$Primary DVB interface"
 msgstr "Pierwszy interfejs DVB"
 
 msgid "Setup.DVB$Standard compliance"
-msgstr "Zgodno�� ze standardem"
+msgstr "Zgodność ze standardem"
 
 msgid "Setup.DVB$Video format"
 msgstr "Format obrazu"
 
 msgid "Setup.DVB$Video display format"
-msgstr "Format wy�wietlania obrazu"
+msgstr "Format wyświetlania obrazu"
 
 msgid "Setup.DVB$Use Dolby Digital"
-msgstr "U�ywaj Dolby Digital"
+msgstr "Używaj Dolby Digital"
 
 msgid "Setup.DVB$Update channels"
-msgstr "Aktualizuj kana�y"
+msgstr "Aktualizuj kanały"
 
 msgid "Setup.DVB$Audio languages"
-msgstr "J�zyk�w d�wi�ku"
+msgstr "Języków dźwięku"
 
 msgid "Setup.DVB$Audio language"
-msgstr "J�zyk d�wi�ku"
+msgstr "Język dźwięku"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr "Obraz napis�w"
+msgstr "Obraz napisów"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr "J�zyki napisu"
+msgstr "Języki napisu"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr "J�zyk napisu"
+msgstr "Język napisu"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr "Zr�wnowa�y� napis"
+msgstr "Zrównoważyć napis"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr "Prze�rocze podtytu��w: Prz�d"
+msgstr "Przeźrocze podtytułów: Przód"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr "Prze�rocze podtytu��w: T�o"
+msgstr "Przeźrocze podtytułów: Tło"
 
 msgid "LNB"
 msgstr "LNB"
 
 msgid "Setup.LNB$Use DiSEqC"
-msgstr "U�ywaj DiSEqC"
+msgstr "Używaj DiSEqC"
 
 msgid "Setup.LNB$SLOF (MHz)"
 msgstr "SLOF (MHz)"
 
 msgid "Setup.LNB$Low LNB frequency (MHz)"
-msgstr "Dolna cz�stotliwo�� LNB (MHz)"
+msgstr "Dolna częstotliwość LNB (MHz)"
 
 msgid "Setup.LNB$High LNB frequency (MHz)"
-msgstr "G�rna cz�stotliwo�� LNB (MHz)"
+msgstr "Górna częstotliwość LNB (MHz)"
 
 #, c-format
 msgid "Setup.LNB$Device %d connected to sat cable"
-msgstr "Urz�dzenie %d pod��czone do kabla satelitarnego"
+msgstr "Urządzenie %d podłączone do kabla satelitarnego"
 
 msgid "Setup.LNB$own"
-msgstr "W�asny"
+msgstr "Własny"
 
 msgid "Setup.LNB$Use dish positioner"
-msgstr "U�ywaj obrotnicy"
+msgstr "Używaj obrotnicy"
 
 msgid "Setup.LNB$Site latitude (degrees)"
-msgstr "Szeroko�� geograficzna stopnie"
+msgstr "Szerokość geograficzna stopnie"
 
 msgid "South"
-msgstr "Po�udnie"
+msgstr "Południe"
 
 msgid "North"
-msgstr "P�noc"
+msgstr "Północ"
 
 msgid "Setup.LNB$Site longitude (degrees)"
-msgstr "D�ugo�� geograficzna (stopnie)"
+msgstr "Długość geograficzna (stopnie)"
 
 msgid "West"
-msgstr "Zach�d"
+msgstr "Zachód"
 
 msgid "East"
-msgstr "Wsch�d"
+msgstr "Wschód"
 
 msgid "Setup.LNB$Max. positioner swing (degrees)"
-msgstr "Max. obr�t pozycjonera (stopnie)"
+msgstr "Max. obrót pozycjonera (stopnie)"
 
 msgid "Setup.LNB$Positioner speed (degrees/s)"
-msgstr "Pr�dko�� pozycjonera (stopnie/s)"
+msgstr "Prędkość pozycjonera (stopnie/s)"
 
 msgid "CAM reset"
 msgstr "CAM zresetowany"
@@ -1137,16 +1148,16 @@ msgstr "CAM gotowy"
 
 #. TRANSLATORS: note the leading blank!
 msgid " (activating)"
-msgstr " (aktywuj�)"
+msgstr " (aktywuję)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ urządzenie"
 
 msgid "CAM"
 msgstr "CAM"
 
 msgid "Button$Cancel activation"
-msgstr "Anuluj aktywacj�"
+msgstr "Anuluj aktywację"
 
 msgid "Button$Activate"
 msgstr "Aktywuj"
@@ -1161,37 +1172,37 @@ msgid "Opening CAM menu..."
 msgstr "Otwieram menu CAM..."
 
 msgid "Can't open CAM menu!"
-msgstr "Nie mo�na otworzy� menu CAM!"
+msgstr "Nie można otworzyć menu CAM!"
 
 msgid "Can't activate CAM!"
-msgstr "Nie mo�na aktywowa� CAM!"
+msgstr "Nie można aktywować CAM!"
 
 msgid "CAM is in use - really reset?"
-msgstr "CAM jest w u�yciu - naprawd� zresetowa�?"
+msgstr "CAM jest w użyciu - naprawdę zresetować?"
 
 msgid "Can't reset CAM!"
-msgstr "Nie mo�na zresetowa� CAM!"
+msgstr "Nie można zresetować CAM!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "bez natychmiastowego nagrywania"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "potwierdź natychmiastowe nagrywanie"
 
 msgid "record instantly"
-msgstr ""
+msgstr "nagraj natychmiast"
 
 msgid "do not pause live video"
-msgstr "nie wstrzymuj transmisji na �ywo"
+msgstr "nie wstrzymuj transmisji na żywo"
 
 msgid "confirm pause live video"
-msgstr "potwierd� wstrzymanie transmisji na �ywo"
+msgstr "potwierdź wstrzymanie transmisji na żywo"
 
 msgid "pause live video"
-msgstr "wstrzymaj transmisj� na �ywo"
+msgstr "wstrzymaj transmisję na żywo"
 
 msgid "confirm"
-msgstr "potwierd�"
+msgstr "potwierdź"
 
 msgid "yes"
 msgstr "tak"
@@ -1200,34 +1211,34 @@ msgid "Recording"
 msgstr "Nagranie"
 
 msgid "Setup.Recording$Margin at start (min)"
-msgstr "Margines na pocz�tku (min)"
+msgstr "Margines na początku (min)"
 
 msgid "Setup.Recording$Margin at stop (min)"
-msgstr "Margines na ko�cu (min)"
+msgstr "Margines na końcu (min)"
 
 msgid "Setup.Recording$Default priority"
-msgstr "Domy�lny priorytet"
+msgstr "Domyślny priorytet"
 
 msgid "Setup.Recording$Default lifetime (d)"
-msgstr "Domy�lny czas �ycia (d)"
+msgstr "Domyślny czas życia (d)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Obsługa klawisza nagrywania"
 
 msgid "Setup.Recording$Pause key handling"
-msgstr "Obs�uga klawisza pauzy"
+msgstr "Obsługa klawisza pauzy"
 
 msgid "Setup.Recording$Pause priority"
 msgstr "Priorytet pauzy"
 
 msgid "Setup.Recording$Pause lifetime (d)"
-msgstr "Czas �ycia pauzy (d)"
+msgstr "Czas życia pauzy (d)"
 
 msgid "Setup.Recording$Use episode name"
-msgstr "U�ywaj nazwy epizodu"
+msgstr "Używaj nazwy epizodu"
 
 msgid "Setup.Recording$Use VPS"
-msgstr "U�ywaj VPS"
+msgstr "Używaj VPS"
 
 msgid "Setup.Recording$VPS margin (s)"
 msgstr "Margines VPS (s)"
@@ -1251,22 +1262,22 @@ msgid "Setup.Recording$Split edited files"
 msgstr "Dziel edytowane pliki"
 
 msgid "Setup.Recording$Delete timeshift recording"
-msgstr "Usu� nagranie timeshift"
+msgstr "Usuń nagranie timeshift"
 
 msgid "Replay"
 msgstr "Odtwarzanie"
 
 msgid "Setup.Replay$Multi speed mode"
-msgstr "Tryb wielopr�dko�ciowy"
+msgstr "Tryb wieloprędkościowy"
 
 msgid "Setup.Replay$Show replay mode"
 msgstr "Pokazuj tryb odtwarzania"
 
 msgid "Setup.Replay$Show remaining time"
-msgstr "Poka� pozosta�y czas"
+msgstr "Pokaż pozostały czas"
 
 msgid "Setup.Replay$Progress display time (s)"
-msgstr "Wy�wietl czas odtwarzania (s)"
+msgstr "Wyświetl czas odtwarzania (s)"
 
 msgid "Setup.Replay$Pause replay when setting mark"
 msgstr "Wstrzymaj odtwarzanie podczas ustawiania zaznaczania"
@@ -1275,106 +1286,106 @@ msgid "Setup.Replay$Pause replay when jumping to a mark"
 msgstr "Wstrzymaj odtwarzanie przy przeskoku do zaznaczenia"
 
 msgid "Setup.Replay$Skip edited parts"
-msgstr "Przeskocz edytowan� cz��"
+msgstr "Przeskocz edytowaną część"
 
 msgid "Setup.Replay$Pause replay at last mark"
 msgstr "Wstrzymaj odtwarzanie przy ostatnim zaznaczeniu"
 
 msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
-msgstr "Pocz�tkowy czas trwania dla przeskoku adaptacyjnego (s)"
+msgstr "Początkowy czas trwania dla przeskoku adaptacyjnego (s)"
 
 msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
 msgstr "Czas oczekiwania na wyzerowanie dla przeskoku adaptacyjnego (s)"
 
 msgid "Setup.Replay$Alternate behavior for adaptive skipping"
-msgstr "Zmie� zachowanie dla przeskoku adaptacyjnego"
+msgstr "Zmień zachowanie dla przeskoku adaptacyjnego"
 
 msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
-msgstr "U�yj klawiszy Poprzedni/Nast�pny dla przeskoku adaptacyjnego"
+msgstr "Użyj klawiszy Poprzedni/Następny dla przeskoku adaptacyjnego"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
-msgstr "Pomi� dystans klawiszami Zielony/��ty (s)"
+msgstr "Pomiń dystans klawiszami Zielony/Żółty (s)"
 
 msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
-msgstr "Pomi� dystans klawiszami Zielony/��ty w powt�rce (s)"
+msgstr "Pomiń dystans klawiszami Zielony/Żółty w powtórce (s)"
 
 msgid "Setup.Replay$Resume ID"
 msgstr "ID wznowienia"
 
 msgid "any hosts"
-msgstr ""
+msgstr "każdy host"
 
 msgid "only default host"
-msgstr ""
+msgstr "tylko domyślny host"
 
 msgid "type"
-msgstr ""
+msgstr "typ"
 
 msgid "full"
-msgstr ""
+msgstr "pełny"
 
 msgid "Miscellaneous"
-msgstr "R�ne"
+msgstr "Różne"
 
 msgid "Setup.Miscellaneous$Min. event timeout (min)"
 msgstr "Minimalny czas audycji (min)"
 
 msgid "Setup.Miscellaneous$Min. user inactivity (min)"
-msgstr "Minimalny czas nieaktywno�ci (min)"
+msgstr "Minimalny czas nieaktywności (min)"
 
 msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Czas oczekiwania na SVDRP (s)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "Dzielenie zadań przez SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "Nazwa hosta SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "Domyślny host SVDRP"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Czas oczekiwania na zap (s)"
 
 msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr "Min�� czas wej�cia do kana�u"
+msgstr "Minął czas wejścia do kanału"
 
 msgid "Setup.Miscellaneous$Remote control repeat delay (ms)"
-msgstr "Czas op�nienia powtarzania dla pilota (ms)"
+msgstr "Czas opóźnienia powtarzania dla pilota (ms)"
 
 msgid "Setup.Miscellaneous$Remote control repeat delta (ms)"
-msgstr "Delta op�nienia powtarzania dla pilota (ms)"
+msgstr "Delta opóźnienia powtarzania dla pilota (ms)"
 
 msgid "Setup.Miscellaneous$Initial channel"
-msgstr "Pocz�tkowy kana�"
+msgstr "Początkowy kanał"
 
 msgid "Setup.Miscellaneous$as before"
 msgstr "jak ostatnio"
 
 msgid "Setup.Miscellaneous$Initial volume"
-msgstr "Pocz�tkowa g�o�no��"
+msgstr "Początkowa głośność"
 
 msgid "Setup.Miscellaneous$Volume steps"
-msgstr "Przeskok g�o�no�ci"
+msgstr "Przeskok głośności"
 
 msgid "Setup.Miscellaneous$Volume linearize"
-msgstr "Linearyzacja g�o�no�ci"
+msgstr "Linearyzacja głośności"
 
 msgid "Setup.Miscellaneous$Channels wrap"
-msgstr "Zawijanie kana��w"
+msgstr "Zawijanie kanałów"
 
 msgid "Setup.Miscellaneous$Show channel names with source"
-msgstr "Poka� nazwy kana��w ze �r�d�em"
+msgstr "Pokaż nazwy kanałów ze źródłem"
 
 msgid "Setup.Miscellaneous$Emergency exit"
-msgstr "Wyj�cie awaryjne"
+msgstr "Wyjście awaryjne"
 
 msgid "Plugins"
 msgstr "Wtyczki"
 
 msgid "This plugin has no setup parameters!"
-msgstr "Ta wtyczka nie ma �adnych ustawie�!"
+msgstr "Ta wtyczka nie ma żadnych ustawień!"
 
 msgid "Setup"
 msgstr "Ustawienia"
@@ -1383,15 +1394,12 @@ msgid "Restart"
 msgstr "Restart"
 
 msgid "Really restart?"
-msgstr "Na pewno zrestartowa�?"
+msgstr "Na pewno zrestartować?"
 
 #. TRANSLATORS: note the leading and trailing blanks!
 msgid " Stop recording "
 msgstr " Zatrzymaj nagrywanie "
 
-msgid "Schedule"
-msgstr "Program"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zatrzymaj odtwarzanie"
@@ -1403,26 +1411,26 @@ msgid "Button$Stop"
 msgstr "Zatrzymaj"
 
 msgid "Button$Resume"
-msgstr "Wzn�w"
+msgstr "Wznów"
 
 #. TRANSLATORS: note the leading blank!
 msgid " Cancel editing"
-msgstr " Anuluj edycj�"
+msgstr " Anuluj edycję"
 
 msgid "Stop recording?"
-msgstr "Zatrzyma� nagrywanie?"
+msgstr "Zatrzymać nagrywanie?"
 
 msgid "Cancel editing?"
-msgstr "Anulowa� monta�?"
+msgstr "Anulować montaż?"
 
 msgid "No audio available!"
-msgstr "D�wi�k nie jest dost�pny!"
+msgstr "Dźwięk nie jest dostępny!"
 
 msgid "No subtitles"
-msgstr "Brak napis�w"
+msgstr "Brak napisów"
 
 msgid "No subtitles available!"
-msgstr "Napisy nie s� dost�pne"
+msgstr "Napisy nie są dostępne"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Brak miejsca na dysku do nagrywania!"
@@ -1431,35 +1439,35 @@ msgid "No free DVB device to record!"
 msgstr "Brak wolnej karty DVB do nagrywania!"
 
 msgid "Pausing live video..."
-msgstr "Pauzuj� program na �ywo..."
+msgstr "Pauzuję program na żywo..."
 
 msgid "Delete timeshift recording?"
-msgstr "Czy usun�� nagranie timeshift?"
+msgstr "Czy usunąć nagranie timeshift?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Jump: "
 msgstr "Skok: "
 
 msgid "No editing marks defined!"
-msgstr "Nie zdefiniowano znacznik�w monta�u!"
+msgstr "Nie zdefiniowano znaczników montażu!"
 
 msgid "No editing sequences defined!"
 msgstr "Nie zdefiniowano sekwencji edycji!"
 
 msgid "Can't start editing process!"
-msgstr "Nie mo�na uruchomi� procesu edycji!"
+msgstr "Nie można uruchomić procesu edycji!"
 
 msgid "Editing process started"
-msgstr "Proces edycji rozpocz�ty"
+msgstr "Proces edycji rozpoczęty"
 
 msgid "Editing process already active!"
-msgstr "Proces edycji jest ju� aktywny!"
+msgstr "Proces edycji jest już aktywny!"
 
 msgid "FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
-msgstr " a�bc�de�fghijkl�mn�o�pqrs�tuvwxyz��0123456789-.,#~\\^$[]|()*+?{}/:%@&"
+msgstr " aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
 msgid "CharMap$ 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
-msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2��\tdef3�\tghi4\tjkl5�\tmno6��\tpqrs7�\ttuv8\twxyz9��"
+msgstr " 0\t-.,1#~\\^$[]|()*+?{}/:%@&\tabc2ąć\tdef3ę\tghi4\tjkl5ł\tmno6ńó\tpqrs7ś\ttuv8\twxyz9źż"
 
 msgid "Button$ABC/abc"
 msgstr "ABC/abc"
@@ -1474,55 +1482,55 @@ msgid "Plugin"
 msgstr "Wtyczka"
 
 msgid "Up/Dn for new location - OK to move"
-msgstr "Do g�ry/Na d� na now� pozycj� - Ok zatwierdza"
+msgstr "Do góry/Na dół na nową pozycję - Ok zatwierdza"
 
 msgid "Channel locked (recording)!"
-msgstr "Kana� zablokowany (trwa nagrywanie)!"
+msgstr "Kanał zablokowany (trwa nagrywanie)!"
 
 msgid "Low disk space!"
-msgstr "Ma�o miejsca na dysku!"
+msgstr "Mało miejsca na dysku!"
 
 msgid "Regenerating index file"
 msgstr "Odtwarzanie pliku z indeksem"
 
 msgid "Index file regeneration complete"
-msgstr "Odtwarzanie pliku z indeksem zako�czone"
+msgstr "Odtwarzanie pliku z indeksem zakończone"
 
 msgid "Index file regeneration failed!"
 msgstr "Odtwarzanie pliku z indeksem nieudane!"
 
 msgid "Can't shutdown - option '-s' not given!"
-msgstr "Nie mo�na wy��czy� - nie podano opcji '-s'!"
+msgstr "Nie można wyłączyć - nie podano opcji '-s'!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Monta� w trakcie - Wy��czy� mimo to?"
+msgstr "Montaż w trakcie - Wyłączyć mimo to?"
 
 msgid "Recording - shut down anyway?"
-msgstr "Trwa nagrywanie - wy��czy� mimo to?"
+msgstr "Trwa nagrywanie - wyłączyć mimo to?"
 
 #, c-format
 msgid "Recording in %ld minutes, shut down anyway?"
-msgstr "Nagrywanie za %ld minut - wy��czy� mimo to?"
+msgstr "Nagrywanie za %ld minut - wyłączyć mimo to?"
 
 msgid "shut down anyway?"
-msgstr "wy��czy� mimo to?"
+msgstr "wyłączyć mimo to?"
 
 #, c-format
 msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr "Wtyczka %s obudzi si� za %ld min, kontynuowa�?"
+msgstr "Wtyczka %s obudzi się za %ld min, kontynuować?"
 
 msgid "Editing - restart anyway?"
-msgstr "Monta� w trakcie - Zrestartowa� mimo to?"
+msgstr "Montaż w trakcie - Zrestartować mimo to?"
 
 msgid "Recording - restart anyway?"
-msgstr "Trwa nagrywanie - zrestartowa� mimo to?"
+msgstr "Trwa nagrywanie - zrestartować mimo to?"
 
 msgid "restart anyway?"
-msgstr "zrestartowa� mimo to?"
+msgstr "zrestartować mimo to?"
 
 #. TRANSLATORS: note the trailing blank!
 msgid "Volume "
-msgstr "G�o�no�� "
+msgstr "Głośność "
 
 msgid "Classic VDR"
 msgstr "Klasyczny VDR"
@@ -1531,16 +1539,16 @@ msgid "DISK"
 msgstr "DYSK"
 
 msgid "LOAD"
-msgstr "OBCI��ENIE"
+msgstr "OBCIĄŻENIE"
 
 msgid "TIMERS"
 msgstr "TIMERY"
 
 msgid "DEVICES"
-msgstr "URZ�DZENIA"
+msgstr "URZĄDZENIA"
 
 msgid "LIVE"
-msgstr "NA �YWO"
+msgstr "NA ŻYWO"
 
 msgid "PLAY"
 msgstr "ODTWARZA"
@@ -1554,26 +1562,26 @@ msgstr "Panel ST:TNG"
 
 #. TRANSLATORS: the first character of each weekday, beginning with monday
 msgid "MTWTFSS"
-msgstr "PW�CPSN"
+msgstr "PWŚCPSN"
 
 #. TRANSLATORS: abbreviated weekdays, beginning with monday (must all be 3 letters!)
 msgid "MonTueWedThuFriSatSun"
-msgstr "PonWto�roCzwPi�SobNie"
+msgstr "PonWtoŚroCzwPiąSobNie"
 
 msgid "Monday"
-msgstr "poniedzia�ek"
+msgstr "poniedziałek"
 
 msgid "Tuesday"
 msgstr "Wtorek"
 
 msgid "Wednesday"
-msgstr "�roda"
+msgstr "środa"
 
 msgid "Thursday"
 msgstr "Czwartek"
 
 msgid "Friday"
-msgstr "Pi�tek"
+msgstr "Piątek"
 
 msgid "Saturday"
 msgstr "Sobota"
@@ -1582,38 +1590,38 @@ msgid "Sunday"
 msgstr "Niedziela"
 
 msgid "Upcoming recording!"
-msgstr "Wkr�tce nagranie!"
+msgstr "Wkrótce nagranie!"
 
 msgid "Pause live video?"
-msgstr "Zatrzyma� transmisj� na �ywo?"
+msgstr "Zatrzymać transmisję na żywo?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Rozpocząć nagrywanie?"
 
 msgid "Recording started"
-msgstr "Rozpocz�to nagrywanie"
+msgstr "Rozpoczęto nagrywanie"
 
 msgid "VDR will shut down later - press Power to force"
-msgstr "VDR zostanie wy��czony p�niej - Naci�nij Wy��cz (Power) aby wymusi�"
+msgstr "VDR zostanie wyłączony później - Naciśnij Wyłącz (Power) aby wymusić"
 
 msgid "Press any key to cancel shutdown"
-msgstr "Naci�nij dowolny klawisz aby nie wy��cza�"
-
-msgid "Switching primary DVB..."
-msgstr "Prz곱czam na pierwszy interfejs DVB..."
+msgstr "Naciśnij dowolny klawisz aby nie wyłączać"
 
 msgid "Editing process failed!"
-msgstr "Proces edycji nie powi�d� si�!"
+msgstr "Proces edycji nie powiódł się!"
 
 msgid "Editing process finished"
-msgstr "Proces edycji zako�czony"
+msgstr "Proces edycji zakończony"
+
+msgid "Switching primary DVB..."
+msgstr "Przęłączam na pierwszy interfejs DVB..."
 
 msgid "Press any key to cancel restart"
-msgstr "Naci�nij dowolny klawisz aby nie zrestartowa�"
+msgstr "Naciśnij dowolny klawisz aby nie zrestartować"
 
 #, c-format
 msgid "VDR will shut down in %s minutes"
-msgstr "VDR zostanie wy��czony za %s minut"
+msgstr "VDR zostanie wyłączony za %s minut"
 
 msgid "Disk"
 msgstr "Dysk"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ae37d28f1..a173746b5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
 "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Editar pasta"
 msgid "New folder"
 msgstr "Nova pasta"
 
-msgid "Sub folder"
-msgstr "Subpasta"
-
 msgid "Folder name already exists!"
 msgstr "Nome da pasta j� existe!"
 
@@ -730,6 +727,9 @@ msgstr "Programa
 msgid "Can't switch channel!"
 msgstr "Imposs�vel mudar de canal!"
 
+msgid "Schedule"
+msgstr "Programa��o"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programa��o - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -953,6 +959,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Teclas num�ricas para caracteres"
 
@@ -1387,9 +1396,6 @@ msgstr "Quer mesmo reiniciar?"
 msgid " Stop recording "
 msgstr " Parar grava��o "
 
-msgid "Schedule"
-msgstr "Programa��o"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Parar reprodu��o"
@@ -1597,15 +1603,15 @@ msgstr "O VDR vai desligar mais tarde - pressione On/Off para for
 msgid "Press any key to cancel shutdown"
 msgstr "Pressione qualquer tecla para cancelar o encerramento"
 
-msgid "Switching primary DVB..."
-msgstr "A mudar placa de DVB prim�ria..."
-
 msgid "Editing process failed!"
 msgstr "Processo de edi��o falhou!"
 
 msgid "Editing process finished"
 msgstr "Processo de edi��o terminou"
 
+msgid "Switching primary DVB..."
+msgstr "A mudar placa de DVB prim�ria..."
+
 msgid "Press any key to cancel restart"
 msgstr "Pressione qualquer tecla para cancelar o reinicio"
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 69364c165..ad40d831c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-11 22:26+0100\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -613,9 +613,6 @@ msgstr "Editează directorul"
 msgid "New folder"
 msgstr "Director nou"
 
-msgid "Sub folder"
-msgstr "Sub-director"
-
 msgid "Folder name already exists!"
 msgstr "Un director cu acelaşi nume există!"
 
@@ -731,6 +728,9 @@ msgstr "Program"
 msgid "Can't switch channel!"
 msgstr "Nu pot comuta canalul!"
 
+msgid "Schedule"
+msgstr "Program (EPG)"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Programul canalului %s"
@@ -864,6 +864,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -954,6 +960,9 @@ msgstr "Sortează întotdeauna directoarele la început"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Caractere pe tastele numerice"
 
@@ -1388,9 +1397,6 @@ msgstr "Sigur repornesc?"
 msgid " Stop recording "
 msgstr " Opreşte înregistrarea "
 
-msgid "Schedule"
-msgstr "Program (EPG)"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Opreşte redarea"
@@ -1598,15 +1604,15 @@ msgstr "VDR se va închide mai târziu - apăsaţi 'Power' pentru a forţa"
 msgid "Press any key to cancel shutdown"
 msgstr "Apasă orice tastă pentru a anula închiderea"
 
-msgid "Switching primary DVB..."
-msgstr "Comut dispozitiv DVB primar..."
-
 msgid "Editing process failed!"
 msgstr "Editarea înregistrării a eşuat"
 
 msgid "Editing process finished"
 msgstr "Editarea înregistrării s-a încheiat"
 
+msgid "Switching primary DVB..."
+msgstr "Comut dispozitiv DVB primar..."
+
 msgid "Press any key to cancel restart"
 msgstr "Apăsaţi orice tastă pentru a anula repornirea"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f907ccc6a..398738197 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2016-12-27 17:13+0100\n"
 "Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Редакция директории"
 msgid "New folder"
 msgstr "Новая директория"
 
-msgid "Sub folder"
-msgstr "поддиректория"
-
 msgid "Folder name already exists!"
 msgstr "Директория уже существует!"
 
@@ -730,6 +727,9 @@ msgstr "Программа"
 msgid "Can't switch channel!"
 msgstr "Невозможно переключить канал!"
 
+msgid "Schedule"
+msgstr "Телегид"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Программа - %s"
@@ -863,6 +863,12 @@ msgstr "по имени"
 msgid "by time"
 msgstr "по времени"
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "Меню"
 
@@ -953,6 +959,9 @@ msgstr "Директории всегда в первую очередь сор
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Сортировка по умолчанию"
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Количество кнопок для символов"
 
@@ -1387,9 +1396,6 @@ msgstr "Действительно перезапустить?"
 msgid " Stop recording "
 msgstr " Прекратить запись "
 
-msgid "Schedule"
-msgstr "Телегид"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Прекратить воспроизведение"
@@ -1597,15 +1603,15 @@ msgstr "VDR выключится позже - нажмите Питание дл
 msgid "Press any key to cancel shutdown"
 msgstr "Нажмите любую кнопку чтобы отменить выключение"
 
-msgid "Switching primary DVB..."
-msgstr "Смена основного DVB-устройства..."
-
 msgid "Editing process failed!"
 msgstr "Ошибка во время монтажа записи!"
 
 msgid "Editing process finished"
 msgstr "Монтаж окончен"
 
+msgid "Switching primary DVB..."
+msgstr "Смена основного DVB-устройства..."
+
 msgid "Press any key to cancel restart"
 msgstr "Нажмите любую кнопку для отмены перезагрузки"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index d5a70e3dc..7124a30c7 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-17 18:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Upravi
 msgid "New folder"
 msgstr "Nov� zlo�ka"
 
-msgid "Sub folder"
-msgstr "Pod zlo�ka"
-
 msgid "Folder name already exists!"
 msgstr "N�zov zlo�ky u� existuje!"
 
@@ -730,6 +727,9 @@ msgstr "TV program"
 msgid "Can't switch channel!"
 msgstr "Kan�l nejde prepn��!"
 
+msgid "Schedule"
+msgstr "TV program"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "TV program - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD (Menu na obrazovke)"
 
@@ -953,6 +959,9 @@ msgstr "Zlo
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "P�sa� znaky ��seln�mi tla�idlami"
 
@@ -1387,9 +1396,6 @@ msgstr "Naozaj re
 msgid " Stop recording "
 msgstr " Zastavi� nahr�vanie "
 
-msgid "Schedule"
-msgstr "TV program"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zastavi� prehr�vanie"
@@ -1597,15 +1603,15 @@ msgstr "VDR sa vypne neskor
 msgid "Press any key to cancel shutdown"
 msgstr "Ktor�ko�vek kl�vesa zru�� vypnutie"
 
-msgid "Switching primary DVB..."
-msgstr "Prep�na hlavn� DVB..."
-
 msgid "Editing process failed!"
 msgstr "Zostrih�vanie zlyhalo!"
 
 msgid "Editing process finished"
 msgstr "Proces zostrih�vania dokon�en�"
 
+msgid "Switching primary DVB..."
+msgstr "Prep�na hlavn� DVB..."
+
 msgid "Press any key to cancel restart"
 msgstr "ktor�ko�vek kl�vesa zru�� re�tart"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index d2e463004..66b7225f9 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Uredi direktorij"
 msgid "New folder"
 msgstr "Nov direktorij"
 
-msgid "Sub folder"
-msgstr "Pod direktorij"
-
 msgid "Folder name already exists!"
 msgstr "Ime direktorija �e obstaja"
 
@@ -730,6 +727,9 @@ msgstr "Program"
 msgid "Can't switch channel!"
 msgstr "Ne morem preklopiti kanala!"
 
+msgid "Schedule"
+msgstr "Program"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -953,6 +959,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "�tevilo tipk za znake"
 
@@ -1387,9 +1396,6 @@ msgstr "Zares ponoven zagon?"
 msgid " Stop recording "
 msgstr " Prekini snemanje "
 
-msgid "Schedule"
-msgstr "Program"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Prekini predvajanje"
@@ -1597,15 +1603,15 @@ msgstr "VDR se bo zaustavil kasneje - pritisni Power za takoj
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite katerikoli gumb za preklic izklopa"
 
-msgid "Switching primary DVB..."
-msgstr "Preklapljanje primarne DVB naprave..."
-
 msgid "Editing process failed!"
 msgstr "Napaka pri procesu urejanja!"
 
 msgid "Editing process finished"
 msgstr "Proces urejanja je kon�an"
 
+msgid "Switching primary DVB..."
+msgstr "Preklapljanje primarne DVB naprave..."
+
 msgid "Press any key to cancel restart"
 msgstr "Pritisni katerokoli tipko za preklic ponovnega zagona"
 
diff --git a/po/sr_RS.po b/po/sr_RS.po
index 069c1ec66..e880cad22 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
 "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
 "Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Izmeni direktorijum"
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-msgid "Sub folder"
-msgstr "Poddirektorijum"
-
 msgid "Folder name already exists!"
 msgstr "Naziv direktorijuma ve� postoji!"
 
@@ -730,6 +727,9 @@ msgstr "Raspored"
 msgid "Can't switch channel!"
 msgstr "Nemogu�e promeniti kanal!"
 
+msgid "Schedule"
+msgstr "Raspored"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Raspored - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -953,6 +959,9 @@ msgstr "Uvek sortiraj direktorijume prve"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Pi�ite pomo�u numeri�kih dugmi�a (kao SMS)"
 
@@ -1387,9 +1396,6 @@ msgstr "Stvarno restartovati sistem?"
 msgid " Stop recording "
 msgstr " Zaustavi snimanje "
 
-msgid "Schedule"
-msgstr "Raspored"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Zaustavi reprodukciju"
@@ -1597,15 +1603,15 @@ msgstr "VDR 
 msgid "Press any key to cancel shutdown"
 msgstr "Pritisnite bilo koje dugme da otka�ete isklju�enje"
 
-msgid "Switching primary DVB..."
-msgstr "Promena primarnog DVB ure�aja..."
-
 msgid "Editing process failed!"
 msgstr "Ure�ivanje neuspe�eno!"
 
 msgid "Editing process finished"
 msgstr "Ure�ivanje zavr�eno"
 
+msgid "Switching primary DVB..."
+msgstr "Promena primarnog DVB ure�aja..."
+
 msgid "Press any key to cancel restart"
 msgstr "Pritisnite bilo koje dugme da otka�ete ponovno pokretanje"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ded70cf0d..bd856a293 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-12 21:58+0100\n"
 "Last-Translator: Magnus Sirvi� <sirwio@hotmail.com>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -616,9 +616,6 @@ msgstr "Redigera mapp"
 msgid "New folder"
 msgstr "Ny mapp"
 
-msgid "Sub folder"
-msgstr "Undermapp"
-
 msgid "Folder name already exists!"
 msgstr "Mappnamnet finns redan!"
 
@@ -734,6 +731,9 @@ msgstr "Program"
 msgid "Can't switch channel!"
 msgstr "Om�jligt att byta kanal!"
 
+msgid "Schedule"
+msgstr "Program"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
@@ -867,6 +867,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -957,6 +963,9 @@ msgstr "Sortera alltid mappar f
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Anv�nd sifferknappar f�r bokstavsinmatning"
 
@@ -1391,9 +1400,6 @@ msgstr "Vill du verkligen starta om?"
 msgid " Stop recording "
 msgstr " Avsluta inspelning "
 
-msgid "Schedule"
-msgstr "Program"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Avsluta uppspelning"
@@ -1601,15 +1607,15 @@ msgstr "VDR kommer att st
 msgid "Press any key to cancel shutdown"
 msgstr "Tryck valfri knapp f�r att �terkalla avst�ngningen"
 
-msgid "Switching primary DVB..."
-msgstr "Byter prim�r DVB enhet..."
-
 msgid "Editing process failed!"
 msgstr "Redigeringsprocessen misslyckades"
 
 msgid "Editing process finished"
 msgstr "Redigering avslutad"
 
+msgid "Switching primary DVB..."
+msgstr "Byter prim�r DVB enhet..."
+
 msgid "Press any key to cancel restart"
 msgstr "Tryck valfri knapp f�r att avbryta omstart"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 749ca47cb..c93c5e292 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -611,9 +611,6 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-msgid "Sub folder"
-msgstr ""
-
 msgid "Folder name already exists!"
 msgstr ""
 
@@ -729,6 +726,9 @@ msgstr "Program"
 msgid "Can't switch channel!"
 msgstr "Kanala de�i�tirelemiyor!"
 
+msgid "Schedule"
+msgstr "Program"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Program - %s"
@@ -862,6 +862,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "OSD"
 
@@ -952,6 +958,9 @@ msgstr ""
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr ""
 
@@ -1386,9 +1395,6 @@ msgstr "Ger
 msgid " Stop recording "
 msgstr " �ekimi bitir "
 
-msgid "Schedule"
-msgstr "Program"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " G�steri�i bitir"
@@ -1596,15 +1602,15 @@ msgstr "VDR daha sonra kapanacak - zorlamak i
 msgid "Press any key to cancel shutdown"
 msgstr "Kapatmay� iptal etmek i�in herhangi bir tu�a bas"
 
-msgid "Switching primary DVB..."
-msgstr "Primer DVB aray�z� de�i�tiriliyor..."
-
 msgid "Editing process failed!"
 msgstr "Kesim ba�ar�s�z!"
 
 msgid "Editing process finished"
 msgstr "Kesim bitti"
 
+msgid "Switching primary DVB..."
+msgstr "Primer DVB aray�z� de�i�tiriliyor..."
+
 msgid "Press any key to cancel restart"
 msgstr "Yeniden ba�latmay� iptal etmek i�in herhangi bir tu�a bas"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index d9f15cac3..51103f854 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-13 18:14+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -612,9 +612,6 @@ msgstr "Редагувати теку"
 msgid "New folder"
 msgstr "Нова тека"
 
-msgid "Sub folder"
-msgstr "Підтека"
-
 msgid "Folder name already exists!"
 msgstr "Назва теки вже існує!"
 
@@ -730,6 +727,9 @@ msgstr "Програма"
 msgid "Can't switch channel!"
 msgstr "Неможливо перемкнути канал!"
 
+msgid "Schedule"
+msgstr "Телегід"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "Програма - %s"
@@ -863,6 +863,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "Меню"
 
@@ -953,6 +959,9 @@ msgstr "Завжди сортувати теки першими"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Кількість клавіш для символів"
 
@@ -1387,9 +1396,6 @@ msgstr "Дійсно перезапустити?"
 msgid " Stop recording "
 msgstr " Зупинити запис "
 
-msgid "Schedule"
-msgstr "Телегід"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " Зупинити програвання"
@@ -1597,15 +1603,15 @@ msgstr "VDR виключиться ппізніше - натисніть Power 
 msgid "Press any key to cancel shutdown"
 msgstr "Натисніть будь-яку кнопку для відміни виключення."
 
-msgid "Switching primary DVB..."
-msgstr "Зміна основного DVB-пристрою..."
-
 msgid "Editing process failed!"
 msgstr "Помилка під час монтажу запису!"
 
 msgid "Editing process finished"
 msgstr "Монтаж закінчено"
 
+msgid "Switching primary DVB..."
+msgstr "Зміна основного DVB-пристрою..."
+
 msgid "Press any key to cancel restart"
 msgstr "Натисніть будь-яку кнопку для відміни перезавантаження"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dbeea3f65..a3861e931 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 2.2.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2017-06-30 11:46+0200\n"
+"POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
 "Last-Translator: NFVDR <nfvdr@live.com>\n"
 "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@@ -613,9 +613,6 @@ msgstr "编辑文件夹"
 msgid "New folder"
 msgstr "新文件夹"
 
-msgid "Sub folder"
-msgstr "子文件夹"
-
 msgid "Folder name already exists!"
 msgstr "文件夹名称已经存在！"
 
@@ -731,6 +728,9 @@ msgstr "任务列表"
 msgid "Can't switch channel!"
 msgstr "不能切换频道"
 
+msgid "Schedule"
+msgstr "任务列表"
+
 #, c-format
 msgid "Schedule - %s"
 msgstr "任务列表 - %s"
@@ -864,6 +864,12 @@ msgstr ""
 msgid "by time"
 msgstr ""
 
+msgid "ascending"
+msgstr ""
+
+msgid "descending"
+msgstr ""
+
 msgid "OSD"
 msgstr "系统菜单设置"
 
@@ -954,6 +960,9 @@ msgstr "总是排序文件夹"
 msgid "Setup.OSD$Default sort mode for recordings"
 msgstr ""
 
+msgid "Setup.OSD$Sorting direction for recordings"
+msgstr ""
+
 msgid "Setup.OSD$Number keys for characters"
 msgstr "数字键的字符"
 
@@ -1388,9 +1397,6 @@ msgstr "是否重启？"
 msgid " Stop recording "
 msgstr " 是否停止录像? "
 
-msgid "Schedule"
-msgstr "任务列表"
-
 #. TRANSLATORS: note the leading blank!
 msgid " Stop replaying"
 msgstr " 停止回放"
@@ -1598,15 +1604,15 @@ msgstr "VDR即将关闭 - 按电源强制关闭！"
 msgid "Press any key to cancel shutdown"
 msgstr "按下任何键即可取消关机"
 
-msgid "Switching primary DVB..."
-msgstr "切换主要的DVB设备."
-
 msgid "Editing process failed!"
 msgstr "编辑过程失败"
 
 msgid "Editing process finished"
 msgstr "编辑过程完毕"
 
+msgid "Switching primary DVB..."
+msgstr "切换主要的DVB设备."
+
 msgid "Press any key to cancel restart"
 msgstr "请按任意键重启"
 
diff --git a/recording.c b/recording.c
index ca0ec798e..0cf265cbf 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.10 2017/06/25 12:31:46 kls Exp $
+ * $Id: recording.c 4.22 2018/03/17 10:56:13 kls Exp $
  */
 
 #include "recording.h"
@@ -57,6 +57,7 @@
 #define MARKSFILESUFFIX   "/marks"
 
 #define SORTMODEFILE      ".sort"
+#define TIMERRECFILE      ".timer"
 
 #define MINDISKSPACE 1024 // MB
 
@@ -117,7 +118,7 @@ void cRemoveDeletedRecordingsThread::Action(void)
          r = DeletedRecordings->Next(r);
          }
      if (deleted) {
-        const char *IgnoreFiles[] = { SORTMODEFILE, NULL };
+        const char *IgnoreFiles[] = { SORTMODEFILE, TIMERRECFILE, NULL };
         cVideoDirectory::RemoveEmptyVideoDirectories(IgnoreFiles);
         }
      }
@@ -962,8 +963,8 @@ char *cRecording::StripEpisodeName(char *s, bool Strip)
      // To have folders sorted before plain recordings, the '/' s1 points to
      // is replaced by the character '1'. All other slashes will be replaced
      // by '0' in SortName() (see below), which will result in the desired
-     // sequence:
-     *s1 = '1';
+     // sequence ('0' and '1' are reversed in case of rsdDescending):
+     *s1 = (Setup.RecSortingDirection == rsdAscending) ? '1' : '0';
      if (Strip) {
         s1++;
         memmove(s1, s2, t - s2 + 1);
@@ -986,7 +987,7 @@ char *cRecording::SortName(void) const
         char *s = strdup(FileName() + strlen(cVideoDirectory::Name()));
         if (RecordingsSortMode != rsmName || Setup.AlwaysSortFoldersFirst)
            s = StripEpisodeName(s, RecordingsSortMode != rsmName);
-        strreplace(s, '/', '0'); // some locales ignore '/' when sorting
+        strreplace(s, '/', (Setup.RecSortingDirection == rsdAscending) ? '0' : '1'); // some locales ignore '/' when sorting
         int l = strxfrm(NULL, s, 0) + 1;
         *sb = MALLOC(char, l);
         strxfrm(*sb, s, l);
@@ -1020,7 +1021,10 @@ int cRecording::GetResume(void) const
 int cRecording::Compare(const cListObject &ListObject) const
 {
   cRecording *r = (cRecording *)&ListObject;
-  return strcasecmp(SortName(), r->SortName());
+  if (Setup.RecSortingDirection == rsdAscending)
+     return strcasecmp(SortName(), r->SortName());
+  else
+     return strcasecmp(r->SortName(), SortName());
 }
 
 bool cRecording::IsInPath(const char *Path) const
@@ -1234,7 +1238,10 @@ bool cRecording::ChangeName(const char *NewName)
      free(name);
      name = strdup(NewName);
      cString NewFileName = FileName();
-     if (!(MakeDirs(NewFileName, true) && cVideoDirectory::MoveVideoFile(OldFileName, NewFileName))) {
+     bool Exists = access(NewFileName, F_OK) == 0;
+     if (Exists)
+        esyslog("ERROR: recording '%s' already exists", NewName);
+     if (Exists || !(MakeDirs(NewFileName, true) && cVideoDirectory::MoveVideoFile(OldFileName, NewFileName))) {
         free(name);
         name = strdup(OldName);
         free(fileName);
@@ -1494,7 +1501,6 @@ void cRecordings::TouchUpdate(void)
   TouchFile(UpdateFileName());
   if (!needsUpdate)
      lastUpdate = time(NULL); // make sure we don't trigger ourselves
-  BroadcastSVDRPCommand("UPDR");
 }
 
 bool cRecordings::NeedsUpdate(void)
@@ -1679,7 +1685,6 @@ class cDirCopier : public cThread {
 public:
   cDirCopier(const char *DirNameSrc, const char *DirNameDst);
   virtual ~cDirCopier();
-  void Stop(void);
   bool Error(void) { return error; }
   };
 
@@ -1694,7 +1699,7 @@ cDirCopier::cDirCopier(const char *DirNameSrc, const char *DirNameDst)
 
 cDirCopier::~cDirCopier()
 {
-  Stop();
+  Cancel(3);
 }
 
 bool cDirCopier::Throttled(void)
@@ -1725,6 +1730,7 @@ void cDirCopier::Action(void)
         int From = -1;
         int To = -1;
         size_t BufferSize = BUFSIZ;
+        uchar *Buffer = NULL;
         while (Running()) {
               // Suspend copying if we have severe throughput problems:
               if (Throttled()) {
@@ -1734,8 +1740,11 @@ void cDirCopier::Action(void)
               // Copy all files in the source directory to the destination directory:
               if (e) {
                  // We're currently copying a file:
-                 uchar Buffer[BufferSize];
-                 size_t Read = safe_read(From, Buffer, sizeof(Buffer));
+                 if (!Buffer) {
+                    esyslog("ERROR: no buffer");
+                    break;
+                    }
+                 size_t Read = safe_read(From, Buffer, BufferSize);
                  if (Read > 0) {
                     size_t Written = safe_write(To, Buffer, Read);
                     if (Written != Read) {
@@ -1784,7 +1793,14 @@ void cDirCopier::Action(void)
                     break;
                     }
                  dsyslog("copying file '%s' to '%s'", *FileNameSrc, *FileNameDst);
-                 BufferSize = max(size_t(st.st_blksize * 10), size_t(BUFSIZ));
+                 if (!Buffer) {
+                    BufferSize = max(size_t(st.st_blksize * 10), size_t(BUFSIZ));
+                    Buffer = MALLOC(uchar, BufferSize);
+                    if (!Buffer) {
+                       esyslog("ERROR: out of memory");
+                       break;
+                       }
+                    }
                  if (access(FileNameDst, F_OK) == 0) {
                     esyslog("ERROR: destination file '%s' already exists", *FileNameDst);
                     break;
@@ -1801,14 +1817,16 @@ void cDirCopier::Action(void)
                  }
               else {
                  // We're done:
+                 free(Buffer);
                  dsyslog("done copying directory '%s' to '%s'", *dirNameSrc, *dirNameDst);
                  error = false;
                  return;
                  }
               }
+        free(Buffer);
         close(From); // just to be absolutely sure
         close(To);
-        esyslog("ERROR: copying directory '%s' to '%s' ended prematurely", *dirNameSrc, *dirNameDst);
+        isyslog("copying directory '%s' to '%s' ended prematurely", *dirNameSrc, *dirNameDst);
         }
      else
         esyslog("ERROR: can't open '%s'", *dirNameSrc);
@@ -1817,17 +1835,6 @@ void cDirCopier::Action(void)
      esyslog("ERROR: can't access '%s'", *dirNameDst);
 }
 
-void cDirCopier::Stop(void)
-{
-  Cancel(3);
-  if (error) {
-     cVideoDirectory::RemoveVideoFile(dirNameDst);
-     LOCK_RECORDINGS_WRITE;
-     Recordings->AddByName(dirNameSrc);
-     Recordings->DelByName(dirNameDst);
-     }
-}
-
 // --- cRecordingsHandlerEntry -----------------------------------------------
 
 class cRecordingsHandlerEntry : public cListObject {
@@ -1837,14 +1844,18 @@ class cRecordingsHandlerEntry : public cListObject {
   cString fileNameDst;
   cCutter *cutter;
   cDirCopier *copier;
+  bool error;
   void ClearPending(void) { usage &= ~ruPending; }
 public:
   cRecordingsHandlerEntry(int Usage, const char *FileNameSrc, const char *FileNameDst);
   ~cRecordingsHandlerEntry();
   int Usage(const char *FileName = NULL) const;
+  bool Error(void) const { return error; }
+  void SetCanceled(void) { usage |= ruCanceled; }
   const char *FileNameSrc(void) const { return fileNameSrc; }
   const char *FileNameDst(void) const { return fileNameDst; }
-  bool Active(bool &Error);
+  bool Active(cRecordings *Recordings);
+  void Cleanup(cRecordings *Recordings);
   };
 
 cRecordingsHandlerEntry::cRecordingsHandlerEntry(int Usage, const char *FileNameSrc, const char *FileNameDst)
@@ -1854,6 +1865,7 @@ cRecordingsHandlerEntry::cRecordingsHandlerEntry(int Usage, const char *FileName
   fileNameDst = FileNameDst;
   cutter = NULL;
   copier = NULL;
+  error = false;
 }
 
 cRecordingsHandlerEntry::~cRecordingsHandlerEntry()
@@ -1874,22 +1886,22 @@ int cRecordingsHandlerEntry::Usage(const char *FileName) const
   return u;
 }
 
-bool cRecordingsHandlerEntry::Active(bool &Error)
+bool cRecordingsHandlerEntry::Active(cRecordings *Recordings)
 {
-  bool CopierFinishedOk = false;
+  if ((usage & ruCanceled) != 0)
+     return false;
   // First test whether there is an ongoing operation:
   if (cutter) {
      if (cutter->Active())
         return true;
-     Error |= cutter->Error();
+     error = cutter->Error();
      delete cutter;
      cutter = NULL;
      }
   else if (copier) {
      if (copier->Active())
         return true;
-     Error |= copier->Error();
-     CopierFinishedOk = !copier->Error();
+     error = copier->Error();
      delete copier;
      copier = NULL;
      }
@@ -1898,28 +1910,52 @@ bool cRecordingsHandlerEntry::Active(bool &Error)
      if ((Usage() & ruCut) != 0) {
         cutter = new cCutter(FileNameSrc());
         cutter->Start();
+        Recordings->AddByName(FileNameDst(), false);
         }
      else if ((Usage() & (ruMove | ruCopy)) != 0) {
         copier = new cDirCopier(FileNameSrc(), FileNameDst());
         copier->Start();
         }
      ClearPending();
-     LOCK_RECORDINGS_WRITE; // to trigger a state change
+     Recordings->SetModified(); // to trigger a state change
      return true;
      }
-  // Clean up:
-  if (CopierFinishedOk && (Usage() & ruMove) != 0) {
+  // We're done:
+  if (!error && (usage & ruMove) != 0) {
      cRecording Recording(FileNameSrc());
-     if (Recording.Delete()) {
-        LOCK_RECORDINGS_WRITE;
+     if (Recording.Delete())
         Recordings->DelByName(Recording.FileName());
-        }
      }
-  LOCK_RECORDINGS_WRITE; // to trigger a state change
+  Recordings->SetModified(); // to trigger a state change
   Recordings->TouchUpdate();
   return false;
 }
 
+void cRecordingsHandlerEntry::Cleanup(cRecordings *Recordings)
+{
+  if ((usage & ruCut)) {          // this was a cut operation...
+     if (cutter) {                // ...which had not yet ended
+        delete cutter;
+        cutter = NULL;
+        cVideoDirectory::RemoveVideoFile(fileNameDst);
+        Recordings->DelByName(fileNameDst);
+        }
+     }
+  if ((usage & (ruMove | ruCopy)) // this was a move/copy operation...
+     && ((usage & ruPending)      // ...which had not yet started...
+        || copier                 // ...or not yet finished...
+        || error)) {              // ...or finished with error
+     if (copier) {
+        delete copier;
+        copier = NULL;
+        }
+     cVideoDirectory::RemoveVideoFile(fileNameDst);
+     if ((usage & ruMove) != 0)
+        Recordings->AddByName(fileNameSrc);
+     Recordings->DelByName(fileNameDst);
+     }
+}
+
 // --- cRecordingsHandler ----------------------------------------------------
 
 cRecordingsHandler RecordingsHandler;
@@ -1941,10 +1977,15 @@ void cRecordingsHandler::Action(void)
   while (Running()) {
         bool Sleep = false;
         {
+          LOCK_RECORDINGS_WRITE;
+          Recordings->SetExplicitModify();
           cMutexLock MutexLock(&mutex);
           if (cRecordingsHandlerEntry *r = operations.First()) {
-             if (!r->Active(error))
+             if (!r->Active(Recordings)) {
+                error |= r->Error();
+                r->Cleanup(Recordings);
                 operations.Del(r);
+                }
              else
                 Sleep = true;
              }
@@ -1960,6 +2001,8 @@ cRecordingsHandlerEntry *cRecordingsHandler::Get(const char *FileName)
 {
   if (FileName && *FileName) {
      for (cRecordingsHandlerEntry *r = operations.First(); r; r = operations.Next(r)) {
+         if ((r->Usage() & ruCanceled) != 0)
+            continue;
          if (strcmp(FileName, r->FileNameSrc()) == 0 || strcmp(FileName, r->FileNameDst()) == 0)
             return r;
          }
@@ -2002,16 +2045,14 @@ void cRecordingsHandler::Del(const char *FileName)
 {
   cMutexLock MutexLock(&mutex);
   if (cRecordingsHandlerEntry *r = Get(FileName))
-     operations.Del(r);
+     r->SetCanceled();
 }
 
 void cRecordingsHandler::DelAll(void)
 {
-  {
-    cMutexLock MutexLock(&mutex);
-    operations.Clear();
-  }
-  Cancel(3);
+  cMutexLock MutexLock(&mutex);
+  for (cRecordingsHandlerEntry *r = operations.First(); r; r = operations.Next(r))
+      r->SetCanceled();
 }
 
 int cRecordingsHandler::GetUsage(const char *FileName)
@@ -2149,8 +2190,8 @@ void cMarks::Align(void)
   cIndexFile IndexFile(recordingFileName, false, isPesRecording);
   for (cMark *m = First(); m; m = Next(m)) {
       int p = IndexFile.GetClosestIFrame(m->Position());
-      if (int d = m->Position() - p) {
-         isyslog("aligned editing mark %s to %s (off by %d frame%s)", *IndexToHMSF(m->Position(), true, framesPerSecond), *IndexToHMSF(p, true, framesPerSecond), d, abs(d) > 1 ? "s" : "");
+      if (m->Position() - p) {
+         //isyslog("aligned editing mark %s to %s (off by %d frame%s)", *IndexToHMSF(m->Position(), true, framesPerSecond), *IndexToHMSF(p, true, framesPerSecond), m->Position() - p, abs(m->Position() - p) > 1 ? "s" : "");
          m->SetPosition(p);
          }
       }
@@ -3081,3 +3122,38 @@ void IncRecordingsSortMode(const char *Directory)
      RecordingsSortMode = eRecordingsSortMode(0);
   SetRecordingsSortMode(Directory, RecordingsSortMode);
 }
+
+// --- Recording Timer Indicator ---------------------------------------------
+
+void SetRecordingTimerId(const char *Directory, const char *TimerId)
+{
+  cString FileName = AddDirectory(Directory, TIMERRECFILE);
+  if (TimerId) {
+     dsyslog("writing timer id '%s' to %s", TimerId, *FileName);
+     if (FILE *f = fopen(FileName, "w")) {
+        fprintf(f, "%s\n", TimerId);
+        fclose(f);
+        }
+     else
+        LOG_ERROR_STR(*FileName);
+     }
+  else {
+     dsyslog("removing %s", *FileName);
+     unlink(FileName);
+     }
+}
+
+cString GetRecordingTimerId(const char *Directory)
+{
+  cString FileName = AddDirectory(Directory, TIMERRECFILE);
+  const char *Id = NULL;
+  if (FILE *f = fopen(FileName, "r")) {
+     char buf[HOST_NAME_MAX + 10]; // +10 for numeric timer id and '@'
+     if (fgets(buf, sizeof(buf), f)) {
+        stripspace(buf);
+        Id = buf;
+        }
+     fclose(f);
+     }
+  return Id;
+}
diff --git a/recording.h b/recording.h
index 200af45af..2e2a305d0 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 4.5 2017/04/03 13:31:16 kls Exp $
+ * $Id: recording.h 4.8 2018/02/12 12:28:24 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -38,6 +38,7 @@ enum eRecordingUsage {
   ruDst      = 0x0040, // the recording is the destination of a cut, move or copy process
   //
   ruPending  = 0x0080, // the recording is pending a cut, move or copy process
+  ruCanceled = 0x8000, // the operation has been canceled, waiting for cleanup
   };
 
 void RemoveDeletedRecordings(void);
@@ -526,6 +527,7 @@ bool GenerateIndex(const char *FileName, bool Update = false);
        ///< complete, and will be updated if it isn't. Otherwise an existing index
        ///< file will be removed before a new one is generated.
 
+enum eRecordingsSortDir { rsdAscending, rsdDescending };
 enum eRecordingsSortMode { rsmName, rsmTime };
 extern eRecordingsSortMode RecordingsSortMode;
 bool HasRecordingsSortMode(const char *Directory);
@@ -533,4 +535,7 @@ void GetRecordingsSortMode(const char *Directory);
 void SetRecordingsSortMode(const char *Directory, eRecordingsSortMode SortMode);
 void IncRecordingsSortMode(const char *Directory);
 
+void SetRecordingTimerId(const char *Directory, const char *TimerId);
+cString GetRecordingTimerId(const char *Directory);
+
 #endif //__RECORDING_H
diff --git a/skinlcars.c b/skinlcars.c
index a7c28f103..aedca5dc6 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skinlcars.c 4.5 2017/06/23 15:52:03 kls Exp $
+ * $Id: skinlcars.c 4.6 2017/11/08 10:10:30 kls Exp $
  */
 
 // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -715,6 +715,7 @@ class cSkinLCARSDisplayMenu : public cSkinDisplayMenu {
   int lastLiveIndicatorY;
   bool lastLiveIndicatorTransferring;
   const cChannel *lastChannel;
+  cString lastChannelName;
   const cEvent *lastEvent;
   const cRecording *lastRecording;
   cString lastHeader;
@@ -1426,12 +1427,13 @@ void cSkinLCARSDisplayMenu::DrawLive(const cChannel *Channel)
      }
   if (!Channel)
      return;
-  if (initial || Channel != lastChannel) {
+  if (initial || Channel != lastChannel || strcmp(Channel->Name(), lastChannelName)) {
      osd->DrawText(xa00, yt00, itoa(Channel->Number()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), tallFont, xa02 - xa00, yt02 - yt00, taTop | taRight | taBorder);
      osd->DrawText(xa03, yt00, Channel->Name(), Theme.Color(clrChannelName), Theme.Color(clrBackground), tallFont, xd00 - xa03, yd01 - yd00, taTop | taLeft);
      int x = xa00 + (yc03 - yc02); // compensate for the arc
      osd->DrawText(x, yc00, cSource::ToString(Channel->Source()), Theme.Color(clrChannelFrameFg), Theme.Color(clrChannelFrameBg), cFont::GetFont(fontOsd), xa02 - x, yc03 - yc00, taTop | taRight | taBorder);
      lastChannel = Channel;
+     lastChannelName = Channel->Name();
      DrawSeen(0, 0);
      }
   // The current programme:
diff --git a/skins.h b/skins.h
index 81d68ffe2..bd8e15d12 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 4.4 2017/06/25 10:02:09 kls Exp $
+ * $Id: skins.h 4.5 2017/11/02 15:04:56 kls Exp $
  */
 
 #ifndef __SKINS_H
@@ -244,8 +244,10 @@ class cSkinDisplayMenu : public cSkinDisplay {
        ///< If the skin displays the Event item in its own way, it shall return true.
        ///< The default implementation does nothing and returns false, which results in
        ///< a call to SetItem() with a proper text.
-#define DEPRECATED_SKIN_SETITEMEVENT
-#ifdef DEPRECATED_SKIN_SETITEMEVENT
+#ifndef DEPRECATED_SKIN_SETITEMEVENT
+#define DEPRECATED_SKIN_SETITEMEVENT 1
+#endif
+#if DEPRECATED_SKIN_SETITEMEVENT
   virtual bool SetItemEvent(const cEvent *Event, int Index, bool Current, bool Selectable, const cChannel *Channel, bool WithDate, eTimerMatch TimerMatch) { return SetItemEvent(Event, Index, Current, Selectable, Channel, WithDate, TimerMatch, true); }
        ///< This function is here for comaptibility with older plugins and may be removed
        ///< in a future version. Use the above version of SetItemEvent() with the TimerActive
diff --git a/status.c b/status.c
index 846c10c3b..b358878fc 100644
--- a/status.c
+++ b/status.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.c 4.0 2014/01/25 10:47:39 kls Exp $
+ * $Id: status.c 4.1 2018/01/29 13:36:53 kls Exp $
  */
 
 #include "status.h"
@@ -53,6 +53,12 @@ void cStatus::MsgReplaying(const cControl *Control, const char *Name, const char
       sm->Replaying(Control, Name, FileName, On);
 }
 
+void cStatus::MsgMarksModified(const cMarks* Marks)
+{
+  for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+      sm->MarksModified(Marks);
+}
+
 void cStatus::MsgSetVolume(int Volume, bool Absolute)
 {
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
diff --git a/status.h b/status.h
index c8a9e1f54..ee8a1acd9 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 4.3 2017/06/23 09:08:24 kls Exp $
+ * $Id: status.h 4.4 2018/01/29 13:42:17 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -59,6 +59,11 @@ class cStatus : public cListObject {
                // a name, Name can be a string that identifies the player type (like, e.g., "DVD").
                // The full file name of the recording is given in FileName, which may be NULL in case there is no
                // actual file involved. If On is false, Name may be NULL.
+  virtual void MarksModified(const cMarks *Marks) {}
+               // If the editing marks of the recording that is currently being played
+               // are modified in any way, this function is called with the list of
+               // Marks. If Marks is NULL, the editing marks for the currently played
+               // recording have been deleted entirely.
   virtual void SetVolume(int Volume, bool Absolute) {}
                // The volume has been set to the given value, either
                // absolutely or relative to the current volume.
@@ -103,6 +108,7 @@ class cStatus : public cListObject {
   static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
   static void MsgRecording(const cDevice *Device, const char *Name, const char *FileName, bool On);
   static void MsgReplaying(const cControl *Control, const char *Name, const char *FileName, bool On);
+  static void MsgMarksModified(const cMarks* Marks);
   static void MsgSetVolume(int Volume, bool Absolute);
   static void MsgSetAudioTrack(int Index, const char * const *Tracks);
   static void MsgSetAudioChannel(int AudioChannel);
diff --git a/svdrp.c b/svdrp.c
index 376957583..4f74c8fdd 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.22 2017/06/30 09:49:39 kls Exp $
+ * $Id: svdrp.c 4.36 2018/03/18 10:43:53 kls Exp $
  */
 
 #include "svdrp.h"
@@ -37,7 +37,6 @@
 #include "recording.h"
 #include "remote.h"
 #include "skins.h"
-#include "thread.h"
 #include "timers.h"
 #include "videodir.h"
 
@@ -48,6 +47,13 @@ static bool DumpSVDRPDataTransfer = false;
 static int SVDRPTcpPort = 0;
 static int SVDRPUdpPort = 0;
 
+enum eSvdrpFetchFlags {
+  sffNone   = 0b00000000,
+  sffConn   = 0b00000001,
+  sffPing   = 0b00000010,
+  sffTimers = 0b00000100,
+  };
+
 // --- cIpAddress ------------------------------------------------------------
 
 class cIpAddress {
@@ -98,7 +104,6 @@ class cSocket {
   bool tcp;
   int sock;
   cIpAddress lastIpAddress;
-  bool IsOwnInterface(sockaddr_in *Addr);
 public:
   cSocket(int Port, bool Tcp);
   ~cSocket();
@@ -107,7 +112,7 @@ class cSocket {
   void Close(void);
   int Port(void) const { return port; }
   int Socket(void) const { return sock; }
-  static bool SendDgram(const char *Dgram, int Port, const char *Address = NULL);
+  static bool SendDgram(const char *Dgram, int Port);
   int Accept(void);
   cString Discover(void);
   const cIpAddress *LastIpAddress(void) const { return &lastIpAddress; }
@@ -125,30 +130,6 @@ cSocket::~cSocket()
   Close();
 }
 
-bool cSocket::IsOwnInterface(sockaddr_in *Addr)
-{
-  ifaddrs *ifaddr;
-  if (getifaddrs(&ifaddr) >= 0) {
-     bool Own = false;
-     for (ifaddrs *ifa = ifaddr; ifa; ifa = ifa->ifa_next) {
-         if (ifa->ifa_addr) {
-            if (ifa->ifa_addr->sa_family == AF_INET) {
-               sockaddr_in *addr = (sockaddr_in *)ifa->ifa_addr;
-               if (addr->sin_addr.s_addr == Addr->sin_addr.s_addr) {
-                  Own = true;
-                  break;
-                  }
-               }
-            }
-         }
-     freeifaddrs(ifaddr);
-     return Own;
-     }
-  else
-     LOG_ERROR;
-  return false;
-}
-
 void cSocket::Close(void)
 {
   if (sock >= 0) {
@@ -160,6 +141,7 @@ void cSocket::Close(void)
 bool cSocket::Listen(void)
 {
   if (sock < 0) {
+     isyslog("SVDRP %s opening port %d/%s", Setup.SVDRPHostName, port, tcp ? "tcp" : "udp");
      // create socket:
      sock = tcp ? socket(PF_INET, SOCK_STREAM, IPPROTO_IP) : socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
      if (sock < 0) {
@@ -198,7 +180,7 @@ bool cSocket::Listen(void)
            return false;
            }
         }
-     isyslog("SVDRP listening on port %d/%s", port, tcp ? "tcp" : "udp");
+     isyslog("SVDRP %s listening on port %d/%s", Setup.SVDRPHostName, port, tcp ? "tcp" : "udp");
      }
   return true;
 }
@@ -234,13 +216,14 @@ bool cSocket::Connect(const char *Address)
         LOG_ERROR;
         return false;
         }
-     isyslog("SVDRP > %s:%d server connection established", Address, port);
+     dbgsvdrp("> %s:%d server connection established\n", Address, port);
+     isyslog("SVDRP %s > %s:%d server connection established", Setup.SVDRPHostName, Address, port);
      return true;
      }
   return false;
 }
 
-bool cSocket::SendDgram(const char *Dgram, int Port, const char *Address)
+bool cSocket::SendDgram(const char *Dgram, int Port)
 {
   // Create a socket:
   int Socket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -248,23 +231,22 @@ bool cSocket::SendDgram(const char *Dgram, int Port, const char *Address)
      LOG_ERROR;
      return false;
      }
-  if (!Address) {
-     // Enable broadcast:
-     int One = 1;
-     if (setsockopt(Socket, SOL_SOCKET, SO_BROADCAST, &One, sizeof(One)) < 0) {
-        LOG_ERROR;
-        close(Socket);
-        return false;
-        }
+  // Enable broadcast:
+  int One = 1;
+  if (setsockopt(Socket, SOL_SOCKET, SO_BROADCAST, &One, sizeof(One)) < 0) {
+     LOG_ERROR;
+     close(Socket);
+     return false;
      }
   // Configure port and ip:
   sockaddr_in Addr;
   memset(&Addr, 0, sizeof(Addr));
   Addr.sin_family = AF_INET;
-  Addr.sin_addr.s_addr = Address ? inet_addr(Address) : htonl(INADDR_BROADCAST);
+  Addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
   Addr.sin_port = htons(Port);
   // Send datagram:
-  dsyslog("SVDRP > %s:%d send dgram '%s'", inet_ntoa(Addr.sin_addr), Port, Dgram);
+  dbgsvdrp("> %s:%d %s\n", inet_ntoa(Addr.sin_addr), Port, Dgram);
+  dsyslog("SVDRP %s > %s:%d send dgram '%s'", Setup.SVDRPHostName, inet_ntoa(Addr.sin_addr), Port, Dgram);
   int Length = strlen(Dgram);
   int Sent = sendto(Socket, Dgram, Length, 0, (sockaddr *)&Addr, sizeof(Addr));
   if (Sent < 0)
@@ -289,7 +271,8 @@ int cSocket::Accept(void)
            NewSock = -1;
            }
         lastIpAddress.Set((sockaddr *)&Addr);
-        isyslog("SVDRP < %s client connection %s", lastIpAddress.Connection(), Accepted ? "accepted" : "DENIED");
+        dbgsvdrp("< %s client connection %s\n", lastIpAddress.Connection(), Accepted ? "accepted" : "DENIED");
+        isyslog("SVDRP %s < %s client connection %s", Setup.SVDRPHostName, lastIpAddress.Connection(), Accepted ? "accepted" : "DENIED");
         }
      else if (FATALERRNO)
         LOG_ERROR;
@@ -307,17 +290,18 @@ cString cSocket::Discover(void)
      int NumBytes = recvfrom(sock, buf, sizeof(buf), 0, (sockaddr *)&Addr, &Size);
      if (NumBytes >= 0) {
         buf[NumBytes] = 0;
-        if (!IsOwnInterface(&Addr)) {
-           lastIpAddress.Set((sockaddr *)&Addr);
-           if (!SVDRPhosts.Acceptable(Addr.sin_addr.s_addr)) {
-              dsyslog("SVDRP < %s discovery ignored (%s)", lastIpAddress.Connection(), buf);
-              return NULL;
-              }
-           if (!startswith(buf, "SVDRP:discover")) {
-              dsyslog("SVDRP < %s discovery unrecognized (%s)", lastIpAddress.Connection(), buf);
-              return NULL;
-              }
-           isyslog("SVDRP < %s discovery received (%s)", lastIpAddress.Connection(), buf);
+        lastIpAddress.Set((sockaddr *)&Addr);
+        if (!SVDRPhosts.Acceptable(Addr.sin_addr.s_addr)) {
+           dsyslog("SVDRP %s < %s discovery ignored (%s)", Setup.SVDRPHostName, lastIpAddress.Connection(), buf);
+           return NULL;
+           }
+        if (!startswith(buf, "SVDRP:discover")) {
+           dsyslog("SVDRP %s < %s discovery unrecognized (%s)", Setup.SVDRPHostName, lastIpAddress.Connection(), buf);
+           return NULL;
+           }
+        if (strcmp(strgetval(buf, "name", ':'), Setup.SVDRPHostName) != 0) { // ignore our own broadcast
+           dbgsvdrp("< %s discovery received (%s)\n", lastIpAddress.Connection(), buf);
+           isyslog("SVDRP %s < %s discovery received (%s)", Setup.SVDRPHostName, lastIpAddress.Connection(), buf);
            return buf;
            }
         }
@@ -331,51 +315,60 @@ cString cSocket::Discover(void)
 
 class cSVDRPClient {
 private:
-  cIpAddress ipAddress;
+  cIpAddress serverIpAddress;
   cSocket socket;
   cString serverName;
+  int length;
+  char *input;
   int timeout;
   cTimeMs pingTime;
   cFile file;
   int fetchFlags;
+  bool connected;
+  bool Send(const char *Command);
   void Close(void);
 public:
   cSVDRPClient(const char *Address, int Port, const char *ServerName, int Timeout);
   ~cSVDRPClient();
   const char *ServerName(void) const { return serverName; }
-  const char *Connection(void) const { return ipAddress.Connection(); }
+  const char *Connection(void) const { return serverIpAddress.Connection(); }
   bool HasAddress(const char *Address, int Port) const;
-  bool Send(const char *Command);
   bool Process(cStringList *Response = NULL);
   bool Execute(const char *Command, cStringList *Response = NULL);
-  void SetFetchFlag(eSvdrpFetchFlags Flag);
-  bool HasFetchFlag(eSvdrpFetchFlags Flag);
+  bool Connected(void) const { return connected; }
+  void SetFetchFlag(int Flag);
+  bool HasFetchFlag(int Flag);
+  bool GetRemoteTimers(cStringList &Response);
   };
 
 static cPoller SVDRPClientPoller;
 
 cSVDRPClient::cSVDRPClient(const char *Address, int Port, const char *ServerName, int Timeout)
-:ipAddress(Address, Port)
+:serverIpAddress(Address, Port)
 ,socket(Port, true)
 {
   serverName = ServerName;
+  length = BUFSIZ;
+  input = MALLOC(char, length);
   timeout = Timeout * 1000 * 9 / 10; // ping after 90% of timeout
   pingTime.Set(timeout);
-  fetchFlags = sffTimers;
+  fetchFlags = sffNone;
+  connected = false;
   if (socket.Connect(Address)) {
      if (file.Open(socket.Socket())) {
         SVDRPClientPoller.Add(file, false);
-        dsyslog("SVDRP > %s client created for '%s'", ipAddress.Connection(), *serverName);
+        dsyslog("SVDRP %s > %s client created for '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
         return;
         }
      }
-  esyslog("SVDRP > %s ERROR: failed to create client for '%s'", ipAddress.Connection(), *serverName);
+  esyslog("SVDRP %s > %s ERROR: failed to create client for '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
 }
 
 cSVDRPClient::~cSVDRPClient()
 {
   Close();
-  dsyslog("SVDRP > %s client destroyed for '%s'", ipAddress.Connection(), *serverName);
+  free(input);
+  dsyslog("SVDRP %s > %s client destroyed for '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
 }
 
 void cSVDRPClient::Close(void)
@@ -384,21 +377,18 @@ void cSVDRPClient::Close(void)
      SVDRPClientPoller.Del(file, false);
      file.Close();
      socket.Close();
-     LOCK_TIMERS_WRITE;
-     if (Timers)
-        Timers->DelRemoteTimers(serverName);
      }
 }
 
 bool cSVDRPClient::HasAddress(const char *Address, int Port) const
 {
-  return strcmp(ipAddress.Address(), Address) == 0 && ipAddress.Port() == Port;
+  return strcmp(serverIpAddress.Address(), Address) == 0 && serverIpAddress.Port() == Port;
 }
 
 bool cSVDRPClient::Send(const char *Command)
 {
   pingTime.Set(timeout);
-  dbgsvdrp("> %s: %s\n", *serverName, Command);
+  dbgsvdrp("> C %s: %s\n", *serverName, Command);
   if (safe_write(file, Command, strlen(Command) + 1) < 0) {
      LOG_ERROR;
      return false;
@@ -409,7 +399,6 @@ bool cSVDRPClient::Send(const char *Command)
 bool cSVDRPClient::Process(cStringList *Response)
 {
   if (file.IsOpen()) {
-     char input[BUFSIZ];
      int numChars = 0;
 #define SVDRPResonseTimeout 5000 // ms
      cTimeMs Timeout(SVDRPResonseTimeout);
@@ -424,12 +413,9 @@ bool cSVDRPClient::Process(cStringList *Response)
                         input[--numChars] = 0;
                   // make sure the string is terminated:
                   input[numChars] = 0;
-                  dbgsvdrp("< %s: %s\n", *serverName, input);
-                  if (Response) {
+                  dbgsvdrp("< C %s: %s\n", *serverName, input);
+                  if (Response)
                      Response->Append(strdup(input));
-                     if (numChars >= 4 && input[3] != '-') // no more lines will follow
-                        break;
-                     }
                   else {
                      switch (atoi(input)) {
                        case 220: if (numChars > 4) {
@@ -438,23 +424,35 @@ bool cSVDRPClient::Process(cStringList *Response)
                                        *t = 0;
                                        if (strcmp(n, serverName) != 0) {
                                           serverName = n;
-                                          dsyslog("SVDRP < %s remote server name is '%s'", ipAddress.Connection(), *serverName);
+                                          dsyslog("SVDRP %s < %s remote server name is '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
                                           }
+                                       SetFetchFlag(sffConn | sffTimers);
+                                       connected = true;
                                        }
                                     }
                                  break;
-                       case 221: dsyslog("SVDRP < %s remote server closed connection to '%s'", ipAddress.Connection(), *serverName);
+                       case 221: dsyslog("SVDRP %s < %s remote server closed connection to '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
+                                 connected = false;
                                  Close();
                                  break;
                        }
                      }
+                  if (numChars >= 4 && input[3] != '-') // no more lines will follow
+                     break;
                   numChars = 0;
                   }
                else {
-                  if (numChars >= int(sizeof(input))) {
-                     esyslog("SVDRP < %s ERROR: out of memory", ipAddress.Connection());
-                     Close();
-                     break;
+                  if (numChars >= length - 1) {
+                     int NewLength = length + BUFSIZ;
+                     if (char *NewBuffer = (char *)realloc(input, NewLength)) {
+                        length = NewLength;
+                        input = NewBuffer;
+                        }
+                     else {
+                        esyslog("SVDRP %s < %s ERROR: out of memory", Setup.SVDRPHostName, serverIpAddress.Connection());
+                        Close();
+                        break;
+                        }
                      }
                   input[numChars++] = c;
                   input[numChars] = 0;
@@ -462,20 +460,20 @@ bool cSVDRPClient::Process(cStringList *Response)
                Timeout.Set(SVDRPResonseTimeout);
                }
             else if (r <= 0) {
-               isyslog("SVDRP < %s lost connection to remote server '%s'", ipAddress.Connection(), *serverName);
+               isyslog("SVDRP %s < %s lost connection to remote server '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
                Close();
                return false;
                }
             }
-         else if (!Response)
-            break;
          else if (Timeout.TimedOut()) {
-            esyslog("SVDRP < %s timeout while waiting for response from '%s'", ipAddress.Connection(), *serverName);
+            esyslog("SVDRP %s < %s timeout while waiting for response from '%s'", Setup.SVDRPHostName, serverIpAddress.Connection(), *serverName);
             return false;
             }
+         else if (!Response && numChars == 0)
+            break; // we read all or nothing!
          }
      if (pingTime.TimedOut())
-        Execute("PING");
+        SetFetchFlag(sffPing);
      }
   return file.IsOpen();
 }
@@ -487,26 +485,114 @@ bool cSVDRPClient::Execute(const char *Command, cStringList *Response)
   return Send(Command) && Process(Response);
 }
 
-void cSVDRPClient::SetFetchFlag(eSvdrpFetchFlags Flags)
+void cSVDRPClient::SetFetchFlag(int Flags)
 {
   fetchFlags |= Flags;
 }
 
-bool cSVDRPClient::HasFetchFlag(eSvdrpFetchFlags Flag)
+bool cSVDRPClient::HasFetchFlag(int Flag)
 {
   bool Result = (fetchFlags & Flag);
   fetchFlags &= ~Flag;
   return Result;
 }
 
+bool cSVDRPClient::GetRemoteTimers(cStringList &Response)
+{
+  if (Execute("LSTT ID", &Response)) {
+     for (int i = 0; i < Response.Size(); i++) {
+         char *s = Response[i];
+         int Code = SVDRPCode(s);
+         if (Code == 250)
+            strshift(s, 4);
+         else {
+            if (Code != 550)
+               esyslog("ERROR: %s: %s", ServerName(), s);
+            return false;
+            }
+         }
+     Response.SortNumerically();
+     return true;
+     }
+  return false;
+}
+
+
+// --- cSVDRPServerParams ----------------------------------------------------
+
+class cSVDRPServerParams {
+private:
+  cString name;
+  int port;
+  cString vdrversion;
+  cString apiversion;
+  int timeout;
+  cString host;
+  cString error;
+public:
+  cSVDRPServerParams(const char *Params);
+  const char *Name(void) const { return name; }
+  const int Port(void) const { return port; }
+  const char *VdrVersion(void) const { return vdrversion; }
+  const char *ApiVersion(void) const { return apiversion; }
+  const int Timeout(void) const { return timeout; }
+  const char *Host(void) const { return host; }
+  bool Ok(void) const { return !*error; }
+  const char *Error(void) const { return error; }
+  };
+
+cSVDRPServerParams::cSVDRPServerParams(const char *Params)
+{
+  if (Params && *Params) {
+     name = strgetval(Params, "name", ':');
+     if (*name) {
+        cString p = strgetval(Params, "port", ':');
+        if (*p) {
+           port = atoi(p);
+           vdrversion = strgetval(Params, "vdrversion", ':');
+           if (*vdrversion) {
+              apiversion = strgetval(Params, "apiversion", ':');
+              if (*apiversion) {
+                 cString t = strgetval(Params, "timeout", ':');
+                 if (*t) {
+                    timeout = atoi(t);
+                    if (timeout > 10) { // don't let it get too small
+                       host = strgetval(Params, "host", ':');
+                       // no error if missing - this parameter is optional!
+                       }
+                    else
+                       error = "invalid timeout";
+                    }
+                 else
+                    error = "missing server timeout";
+                 }
+              else
+                 error = "missing server apiversion";
+              }
+           else
+              error = "missing server vdrversion";
+           }
+        else
+           error = "missing server port";
+        }
+     else
+        error = "missing server name";
+     }
+  else
+     error = "missing server parameters";
+}
+
 // --- cSVDRPClientHandler ---------------------------------------------------
 
+cStateKey StateKeySVDRPRemoteTimersPoll(true);
+
 class cSVDRPClientHandler : public cThread {
 private:
   cMutex mutex;
   int tcpPort;
   cSocket udpSocket;
   cVector<cSVDRPClient *> clientConnections;
+  void SendDiscover(void);
   void HandleClientConnection(void);
   void ProcessConnections(void);
   cSVDRPClient *GetClientForServer(const char *ServerName);
@@ -515,9 +601,11 @@ class cSVDRPClientHandler : public cThread {
 public:
   cSVDRPClientHandler(int TcpPort, int UdpPort);
   virtual ~cSVDRPClientHandler();
-  void SendDiscover(const char *Address = NULL);
+  void Lock(void) { mutex.Lock(); }
+  void Unlock(void) { mutex.Unlock(); }
+  void AddClient(cSVDRPServerParams &ServerParams, const char *IpAddress);
   bool Execute(const char *ServerName, const char *Command, cStringList *Response = NULL);
-  bool GetServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlags = sffNone);
+  bool GetServerNames(cStringList *ServerNames);
   bool TriggerFetchingTimers(const char *ServerName);
   };
 
@@ -546,64 +634,78 @@ cSVDRPClient *cSVDRPClientHandler::GetClientForServer(const char *ServerName)
   return NULL;
 }
 
-void cSVDRPClientHandler::SendDiscover(const char *Address)
+void cSVDRPClientHandler::SendDiscover(void)
 {
-  cMutexLock MutexLock(&mutex);
   cString Dgram = cString::sprintf("SVDRP:discover name:%s port:%d vdrversion:%d apiversion:%d timeout:%d%s", Setup.SVDRPHostName, tcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout, (Setup.SVDRPPeering == spmOnly && *Setup.SVDRPDefaultHost) ? *cString::sprintf(" host:%s", Setup.SVDRPDefaultHost) : "");
-  udpSocket.SendDgram(Dgram, udpSocket.Port(), Address);
+  udpSocket.SendDgram(Dgram, udpSocket.Port());
 }
 
 void cSVDRPClientHandler::ProcessConnections(void)
 {
-  cMutexLock MutexLock(&mutex);
+  cString PollTimersCmd;
+  if (cTimers::GetTimersRead(StateKeySVDRPRemoteTimersPoll, 100)) {
+     PollTimersCmd = cString::sprintf("POLL %s TIMERS", Setup.SVDRPHostName);
+     StateKeySVDRPRemoteTimersPoll.Remove();
+     }
+  else if (StateKeySVDRPRemoteTimersPoll.TimedOut())
+     return; // try again next time
   for (int i = 0; i < clientConnections.Size(); i++) {
-      if (!clientConnections[i]->Process()) {
-         delete clientConnections[i];
+      cSVDRPClient *Client = clientConnections[i];
+      if (Client->Process()) {
+         if (Client->HasFetchFlag(sffConn))
+            Client->Execute(cString::sprintf("CONN name:%s port:%d vdrversion:%d apiversion:%d timeout:%d", Setup.SVDRPHostName, SVDRPTcpPort, VDRVERSNUM, APIVERSNUM, Setup.SVDRPTimeout));
+         if (Client->HasFetchFlag(sffPing))
+            Client->Execute("PING");
+         if (Client->HasFetchFlag(sffTimers)) {
+            cStringList RemoteTimers;
+            if (Client->GetRemoteTimers(RemoteTimers)) {
+               if (cTimers *Timers = cTimers::GetTimersWrite(StateKeySVDRPRemoteTimersPoll, 100)) {
+                  bool TimersModified = Timers->StoreRemoteTimers(Client->ServerName(), &RemoteTimers);
+                  StateKeySVDRPRemoteTimersPoll.Remove(TimersModified);
+                  }
+               else
+                  Client->SetFetchFlag(sffTimers); // try again next time
+               }
+            }
+         if (*PollTimersCmd) {
+            if (!Client->Execute(PollTimersCmd))
+               esyslog("ERROR: can't send '%s' to '%s'", *PollTimersCmd, Client->ServerName());
+            }
+         }
+      else {
+         cTimers *Timers = cTimers::GetTimersWrite(StateKeySVDRPRemoteTimersPoll);
+         bool TimersModified = Timers->StoreRemoteTimers(Client->ServerName(), NULL);
+         StateKeySVDRPRemoteTimersPoll.Remove(TimersModified);
+         delete Client;
          clientConnections.Remove(i);
          i--;
          }
       }
 }
 
+void cSVDRPClientHandler::AddClient(cSVDRPServerParams &ServerParams, const char *IpAddress)
+{
+  cMutexLock MutexLock(&mutex);
+  for (int i = 0; i < clientConnections.Size(); i++) {
+      if (clientConnections[i]->HasAddress(IpAddress, ServerParams.Port()))
+         return;
+      }
+  if (Setup.SVDRPPeering == spmOnly && strcmp(ServerParams.Name(), Setup.SVDRPDefaultHost) != 0)
+     return; // we only want to peer with the default host, but this isn't the default host
+  if (ServerParams.Host() && strcmp(ServerParams.Host(), Setup.SVDRPHostName) != 0)
+     return; // the remote VDR requests a specific host, but it's not us
+  clientConnections.Append(new cSVDRPClient(IpAddress, ServerParams.Port(), ServerParams.Name(), ServerParams.Timeout()));
+}
+
 void cSVDRPClientHandler::HandleClientConnection(void)
 {
   cString NewDiscover = udpSocket.Discover();
   if (*NewDiscover) {
-     cString p = strgetval(NewDiscover, "port", ':');
-     if (*p) {
-        int Port = atoi(p);
-        for (int i = 0; i < clientConnections.Size(); i++) {
-            if (clientConnections[i]->HasAddress(udpSocket.LastIpAddress()->Address(), Port)) {
-               dsyslog("SVDRP < %s connection to '%s' confirmed", clientConnections[i]->Connection(), clientConnections[i]->ServerName());
-               return;
-               }
-            }
-        cString ServerName = strgetval(NewDiscover, "name", ':');
-        if (*ServerName) {
-           if (Setup.SVDRPPeering == spmOnly && strcmp(ServerName, Setup.SVDRPDefaultHost) != 0)
-              return; // we only want to peer with the default host, but this isn't the default host
-           cString HostName = strgetval(NewDiscover, "host", ':');
-           if (*HostName && strcmp(HostName, Setup.SVDRPHostName) != 0)
-              return; // the remote VDR requests a specific host, but it's not us
-           cString t = strgetval(NewDiscover, "timeout", ':');
-           if (*t) {
-              int Timeout = atoi(t);
-              if (Timeout > 10) { // don't let it get too small
-                 const char *Address = udpSocket.LastIpAddress()->Address();
-                 clientConnections.Append(new cSVDRPClient(Address, Port, ServerName, Timeout));
-                 SendDiscover(Address);
-                 }
-              else
-                 esyslog("SVDRP < %s ERROR: invalid timeout (%d)", udpSocket.LastIpAddress()->Connection(), Timeout);
-              }
-           else
-              esyslog("SVDRP < %s ERROR: missing timeout", udpSocket.LastIpAddress()->Connection());
-           }
-        else
-           esyslog("SVDRP < %s ERROR: missing server name", udpSocket.LastIpAddress()->Connection());
-        }
+     cSVDRPServerParams ServerParams(NewDiscover);
+     if (ServerParams.Ok())
+        AddClient(ServerParams, udpSocket.LastIpAddress()->Address());
      else
-        esyslog("SVDRP < %s ERROR: missing port number", udpSocket.LastIpAddress()->Connection());
+        esyslog("SVDRP %s < %s ERROR: %s", Setup.SVDRPHostName, udpSocket.LastIpAddress()->Connection(), ServerParams.Error());
      }
 }
 
@@ -631,13 +733,13 @@ bool cSVDRPClientHandler::Execute(const char *ServerName, const char *Command, c
   return false;
 }
 
-bool cSVDRPClientHandler::GetServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlag)
+bool cSVDRPClientHandler::GetServerNames(cStringList *ServerNames)
 {
   cMutexLock MutexLock(&mutex);
   ServerNames->Clear();
   for (int i = 0; i < clientConnections.Size(); i++) {
       cSVDRPClient *Client = clientConnections[i];
-      if (FetchFlag == sffNone || Client->HasFetchFlag(FetchFlag))
+      if (Client->Connected())
          ServerNames->Append(strdup(Client->ServerName()));
       }
   return ServerNames->Size() > 0;
@@ -730,6 +832,10 @@ const char *HelpPages[] = {
   "    After a CLRE command, no further EPG processing is done for 10\n"
   "    seconds, so that data sent with subsequent PUTE commands doesn't\n"
   "    interfere with data from the broadcasters.",
+  "CONN name:<name> port:<port> vdrversion:<vdrversion> apiversion:<apiversion> timeout:<timeout>\n"
+  "    Used by peer-to-peer connections between VDRs to tell the other VDR\n"
+  "    to establish a connection to this VDR. The name is the SVDRP host name\n"
+  "    of this VDR, which may differ from its DNS name.",
   "DELC <number>\n"
   "    Delete channel.",
   "DELR <id>\n"
@@ -771,6 +877,10 @@ const char *HelpPages[] = {
   "    separators. The channel number of a group separator is always 0.\n"
   "    With ':ids' the channel ids are listed following the channel numbers.\n"
   "    The special number 0 can be given to list the current channel.",
+  "LSTD\n"
+  "    List all available devices. Each device is listed with its name and\n"
+  "    whether it is currently the primary device ('P') or it implements a\n"
+  "    decoder ('D') and can be used as output device.",
   "LSTE [ <channel> ] [ now | next | at <time> ]\n"
   "    List EPG data. Without any parameters all data of all channels is\n"
   "    listed. If a channel is given (either by number or by channel ID),\n"
@@ -847,10 +957,15 @@ const char *HelpPages[] = {
   "    If 'help' is followed by a command, the detailed help for that command is\n"
   "    given. The keyword 'main' initiates a call to the main menu function of the\n"
   "    given plugin.\n",
-  "POLL timers\n"
+  "POLL <name> timers\n"
   "    Used by peer-to-peer connections between VDRs to inform other machines\n"
   "    about changes to timers. The receiving VDR shall use LSTT to query the\n"
-  "    remote machine's timers and update its list of timers accordingly.\n",
+  "    remote machine with the given name about its timers and update its list\n"
+  "    of timers accordingly.\n",
+  "PRIM [ <number> ]\n"
+  "    Make the device with the given number the primary device.\n"
+  "    Without option it returns the currently active primary device in the same\n"
+  "    format as used by the LSTD command.",
   "PUTE [ file ]\n"
   "    Put data into the EPG list. The data entered has to strictly follow the\n"
   "    format defined in vdr(5) for the 'epg.data' file.  A '.' on a line\n"
@@ -943,7 +1058,8 @@ static cString grabImageDir;
 class cSVDRPServer {
 private:
   int socket;
-  cString connection;
+  cIpAddress clientIpAddress;
+  cString clientName;
   cFile file;
   cPUTEhandler *PUTEhandler;
   int numChars;
@@ -951,11 +1067,12 @@ class cSVDRPServer {
   char *cmdLine;
   time_t lastActivity;
   void Close(bool SendReply = false, bool Timeout = false);
-  bool Send(const char *s, int length = -1);
+  bool Send(const char *s);
   void Reply(int Code, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
   void PrintHelpTopics(const char **hp);
   void CmdCHAN(const char *Option);
   void CmdCLRE(const char *Option);
+  void CmdCONN(const char *Option);
   void CmdDELC(const char *Option);
   void CmdDELR(const char *Option);
   void CmdDELT(const char *Option);
@@ -964,6 +1081,7 @@ class cSVDRPServer {
   void CmdHELP(const char *Option);
   void CmdHITK(const char *Option);
   void CmdLSTC(const char *Option);
+  void CmdLSTD(const char *Option);
   void CmdLSTE(const char *Option);
   void CmdLSTR(const char *Option);
   void CmdLSTT(const char *Option);
@@ -979,6 +1097,7 @@ class cSVDRPServer {
   void CmdPLAY(const char *Option);
   void CmdPLUG(const char *Option);
   void CmdPOLL(const char *Option);
+  void CmdPRIM(const char *Option);
   void CmdPUTE(const char *Option);
   void CmdREMO(const char *Option);
   void CmdSCAN(const char *Option);
@@ -988,18 +1107,20 @@ class cSVDRPServer {
   void CmdVOLU(const char *Option);
   void Execute(char *Cmd);
 public:
-  cSVDRPServer(int Socket, const char *Connection);
+  cSVDRPServer(int Socket, const cIpAddress *ClientIpAddress);
   ~cSVDRPServer();
+  const char *ClientName(void) const { return clientName; }
   bool HasConnection(void) { return file.IsOpen(); }
   bool Process(void);
   };
 
 static cPoller SVDRPServerPoller;
 
-cSVDRPServer::cSVDRPServer(int Socket, const char *Connection)
+cSVDRPServer::cSVDRPServer(int Socket, const cIpAddress *ClientIpAddress)
 {
   socket = Socket;
-  connection = Connection;
+  clientIpAddress = *ClientIpAddress;
+  clientName = clientIpAddress.Connection(); // will be set to actual name by a CONN command
   PUTEhandler = NULL;
   numChars = 0;
   length = BUFSIZ;
@@ -1010,14 +1131,14 @@ cSVDRPServer::cSVDRPServer(int Socket, const char *Connection)
      Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", Setup.SVDRPHostName, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8");
      SVDRPServerPoller.Add(file, false);
      }
-  dsyslog("SVDRP < %s server created", *connection);
+  dsyslog("SVDRP %s > %s server created", Setup.SVDRPHostName, *clientName);
 }
 
 cSVDRPServer::~cSVDRPServer()
 {
   Close(true);
   free(cmdLine);
-  dsyslog("SVDRP < %s server destroyed", *connection);
+  dsyslog("SVDRP %s < %s server destroyed", Setup.SVDRPHostName, *clientName);
 }
 
 void cSVDRPServer::Close(bool SendReply, bool Timeout)
@@ -1026,7 +1147,7 @@ void cSVDRPServer::Close(bool SendReply, bool Timeout)
      if (SendReply) {
         Reply(221, "%s closing connection%s", Setup.SVDRPHostName, Timeout ? " (timeout)" : "");
         }
-     isyslog("SVDRP < %s connection closed", *connection);
+     isyslog("SVDRP %s < %s connection closed", Setup.SVDRPHostName, *clientName);
      SVDRPServerPoller.Del(file, false);
      file.Close();
      DELETENULL(PUTEhandler);
@@ -1034,11 +1155,10 @@ void cSVDRPServer::Close(bool SendReply, bool Timeout)
   close(socket);
 }
 
-bool cSVDRPServer::Send(const char *s, int length)
+bool cSVDRPServer::Send(const char *s)
 {
-  if (length < 0)
-     length = strlen(s);
-  if (safe_write(file, s, length) < 0) {
+  dbgsvdrp("> S %s: %s", *clientName, s); // terminating newline is already in the string!
+  if (safe_write(file, s, strlen(s)) < 0) {
      LOG_ERROR;
      Close();
      return false;
@@ -1050,26 +1170,33 @@ void cSVDRPServer::Reply(int Code, const char *fmt, ...)
 {
   if (file.IsOpen()) {
      if (Code != 0) {
+        char *buffer = NULL;
         va_list ap;
         va_start(ap, fmt);
-        cString buffer = cString::vsprintf(fmt, ap);
+        if (vasprintf(&buffer, fmt, ap) >= 0) {
+           char *s = buffer;
+           while (s && *s) {
+                 char *n = strchr(s, '\n');
+                 if (n)
+                    *n = 0;
+                 char cont = ' ';
+                 if (Code < 0 || n && *(n + 1)) // trailing newlines don't count!
+                    cont = '-';
+                 if (!Send(cString::sprintf("%03d%c%s\r\n", abs(Code), cont, s)))
+                    break;
+                 s = n ? n + 1 : NULL;
+                 }
+           }
+        else {
+           Reply(451, "Bad format - looks like a programming error!");
+           esyslog("SVDRP %s < %s bad format!", Setup.SVDRPHostName, *clientName);
+           }
         va_end(ap);
-        const char *s = buffer;
-        while (s && *s) {
-              const char *n = strchr(s, '\n');
-              char cont = ' ';
-              if (Code < 0 || n && *(n + 1)) // trailing newlines don't count!
-                 cont = '-';
-              char number[16];
-              sprintf(number, "%03d%c", abs(Code), cont);
-              if (!(Send(number) && Send(s, n ? n - s : -1) && Send("\r\n")))
-                 break;
-              s = n ? n + 1 : NULL;
-              }
+        free(buffer);
         }
      else {
         Reply(451, "Zero return code - looks like a programming error!");
-        esyslog("SVDRP < %s zero return code!", *connection);
+        esyslog("SVDRP %s < %s zero return code!", Setup.SVDRPHostName, *clientName);
         }
      }
 }
@@ -1225,6 +1352,26 @@ void cSVDRPServer::CmdCLRE(const char *Option)
      }
 }
 
+void cSVDRPServer::CmdCONN(const char *Option)
+{
+  if (*Option) {
+     if (SVDRPClientHandler) {
+        cSVDRPServerParams ServerParams(Option);
+        if (ServerParams.Ok()) {
+           clientName = ServerParams.Name();
+           Reply(250, "OK"); // must finish this transaction before creating the new client
+           SVDRPClientHandler->AddClient(ServerParams, clientIpAddress.Address());
+           }
+        else
+           Reply(501, "Error in server parameters: %s", ServerParams.Error());
+        }
+     else
+        Reply(451, "No SVDRP client handler");
+     }
+  else
+     Reply(501, "Missing server parameters");
+}
+
 void cSVDRPServer::CmdDELC(const char *Option)
 {
   if (*Option) {
@@ -1254,7 +1401,7 @@ void cSVDRPServer::CmdDELC(const char *Option)
            Channels->ReNumber();
            Channels->SetModifiedByUser();
            Channels->SetModified();
-           isyslog("SVDRP < %s channel %s deleted", *connection, Option);
+           isyslog("SVDRP %s < %s deleted channel %s", Setup.SVDRPHostName, *clientName, Option);
            if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
               if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
                  Channels->SwitchTo(CurrentChannel->Number());
@@ -1302,6 +1449,7 @@ void cSVDRPServer::CmdDELR(const char *Option)
               if (Recording->Delete()) {
                  Recordings->DelByName(Recording->FileName());
                  Recordings->SetModified();
+                 isyslog("SVDRP %s < %s deleted recording %s", Setup.SVDRPHostName, *clientName, Option);
                  Reply(250, "Recording \"%s\" deleted", Option);
                  }
               else
@@ -1325,11 +1473,13 @@ void cSVDRPServer::CmdDELT(const char *Option)
         LOCK_TIMERS_WRITE;
         Timers->SetExplicitModify();
         if (cTimer *Timer = Timers->GetById(strtol(Option, NULL, 10))) {
-           if (Timer->Recording())
+           if (Timer->Recording()) {
               Timer->Skip();
+              cRecordControls::Process(Timers, time(NULL));
+              }
            Timers->Del(Timer);
            Timers->SetModified();
-           isyslog("SVDRP < %s deleted timer %s", *connection, *Timer->ToDescr());
+           isyslog("SVDRP %s < %s deleted timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
            Reply(250, "Timer \"%s\" deleted", Option);
            }
         else
@@ -1475,7 +1625,7 @@ void cSVDRPServer::CmdGRAB(const char *Option)
            int fd = open(FileName, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC, DEFFILEMODE);
            if (fd >= 0) {
               if (safe_write(fd, Image, ImageSize) == ImageSize) {
-                 dsyslog("SVDRP < %s grabbed image to %s", *connection, FileName);
+                 dsyslog("SVDRP %s < %s grabbed image to %s", Setup.SVDRPHostName, *clientName, FileName);
                  Reply(250, "Grabbed image %s", Option);
                  }
               else {
@@ -1620,6 +1770,18 @@ void cSVDRPServer::CmdLSTC(const char *Option)
      Reply(550, "No channels defined");
 }
 
+void cSVDRPServer::CmdLSTD(const char *Option)
+{
+  if (cDevice::NumDevices()) {
+     for (int i = 0; i < cDevice::NumDevices(); i++) {
+         if (const cDevice *d = cDevice::GetDevice(i))
+            Reply(d->DeviceNumber() + 1 == cDevice::NumDevices() ? 250 : -250, "%d [%s%s] %s", d->DeviceNumber() + 1, d->HasDecoder() ? "D" : "-", d->DeviceNumber() + 1 == Setup.PrimaryDVB ? "P" : "-", *d->DeviceName());
+         }
+     }
+  else
+     Reply(550, "No devices found");
+}
+
 void cSVDRPServer::CmdLSTE(const char *Option)
 {
   LOCK_CHANNELS_READ;
@@ -1817,7 +1979,7 @@ void cSVDRPServer::CmdLSTT(const char *Option)
 void cSVDRPServer::CmdMESG(const char *Option)
 {
   if (*Option) {
-     isyslog("SVDRP < %s message '%s'", *connection, Option);
+     isyslog("SVDRP %s < %s message '%s'", Setup.SVDRPHostName, *clientName, Option);
      Skins.QueueMessage(mtInfo, Option);
      Reply(250, "Message queued");
      }
@@ -1842,7 +2004,7 @@ void cSVDRPServer::CmdMODC(const char *Option)
                  Channels->ReNumber();
                  Channels->SetModifiedByUser();
                  Channels->SetModified();
-                 isyslog("SVDRP < %s modifed channel %d %s", *connection, Channel->Number(), *Channel->ToText());
+                 isyslog("SVDRP %s < %s modifed channel %d %s", Setup.SVDRPHostName, *clientName, Channel->Number(), *Channel->ToText());
                  Reply(250, "%d %s", Channel->Number(), *Channel->ToText());
                  }
               else
@@ -1882,7 +2044,7 @@ void cSVDRPServer::CmdMODT(const char *Option)
               }
            *Timer = t;
            Timers->SetModified();
-           isyslog("SVDRP < %s modified timer %s (%s)", *connection, *Timer->ToDescr(), Timer->HasFlags(tfActive) ? "active" : "inactive");
+           isyslog("SVDRP %s < %s modified timer %s (%s)", Setup.SVDRPHostName, *clientName, *Timer->ToDescr(), Timer->HasFlags(tfActive) ? "active" : "inactive");
            Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
            }
         else
@@ -1926,7 +2088,7 @@ void cSVDRPServer::CmdMOVC(const char *Option)
                        else
                           cDevice::SetCurrentChannel(CurrentChannel->Number());
                        }
-                    isyslog("SVDRP < %s channel %d moved to %d", *connection, FromNumber, ToNumber);
+                    isyslog("SVDRP %s < %s moved channel %d to %d", Setup.SVDRPHostName, *clientName, FromNumber, ToNumber);
                     Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);
                     }
                  else
@@ -2006,7 +2168,7 @@ void cSVDRPServer::CmdNEWC(const char *Option)
            Channels->ReNumber();
            Channels->SetModifiedByUser();
            Channels->SetModified();
-           isyslog("SVDRP < %s new channel %d %s", *connection, channel->Number(), *channel->ToText());
+           isyslog("SVDRP %s < %s new channel %d %s", Setup.SVDRPHostName, *clientName, channel->Number(), *channel->ToText());
            Reply(250, "%d %s", channel->Number(), *channel->ToText());
            }
         else
@@ -2027,7 +2189,7 @@ void cSVDRPServer::CmdNEWT(const char *Option)
         LOCK_TIMERS_WRITE;
         Timer->ClrFlags(tfRecording);
         Timers->Add(Timer);
-        isyslog("SVDRP < %s added timer %s", *connection, *Timer->ToDescr());
+        isyslog("SVDRP %s < %s added timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
         Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
         return;
         }
@@ -2216,6 +2378,32 @@ void cSVDRPServer::CmdPOLL(const char *Option)
      Reply(501, "Missing parameters");
 }
 
+void cSVDRPServer::CmdPRIM(const char *Option)
+{
+  int n = -1;
+  if (*Option) {
+     if (isnumber(Option)) {
+        int o = strtol(Option, NULL, 10);
+        if (o > 0 && o <= cDevice::NumDevices())
+           n = o;
+        else
+           Reply(501, "Invalid device number \"%s\"", Option);
+        }
+     else
+        Reply(501, "Invalid parameter \"%s\"", Option);
+     if (n >= 0) {
+        Setup.PrimaryDVB = n;
+        Reply(250, "Primary device set to %d", n);
+        }
+     }
+  else {
+    if (const cDevice *d = cDevice::PrimaryDevice())
+       Reply(250, "%d [%s%s] %s", d->DeviceNumber() + 1, d->HasDecoder() ? "D" : "-", d->DeviceNumber() + 1 == Setup.PrimaryDVB ? "P" : "-", *d->DeviceName());
+    else
+       Reply(501, "Failed to get primary device");
+    }
+}
+
 void cSVDRPServer::CmdPUTE(const char *Option)
 {
   if (*Option) {
@@ -2290,11 +2478,11 @@ void cSVDRPServer::CmdUPDT(const char *Option)
            t->Parse(Option);
            delete Timer;
            Timer = t;
-           isyslog("SVDRP < %s updated timer %s", *connection, *Timer->ToDescr());
+           isyslog("SVDRP %s < %s updated timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
            }
         else {
            Timers->Add(Timer);
-           isyslog("SVDRP < %s added timer %s", *connection, *Timer->ToDescr());
+           isyslog("SVDRP %s < %s added timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
            }
         Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
         return;
@@ -2360,6 +2548,7 @@ void cSVDRPServer::Execute(char *Cmd)
   s = skipspace(s);
   if      (CMD("CHAN"))  CmdCHAN(s);
   else if (CMD("CLRE"))  CmdCLRE(s);
+  else if (CMD("CONN"))  CmdCONN(s);
   else if (CMD("DELC"))  CmdDELC(s);
   else if (CMD("DELR"))  CmdDELR(s);
   else if (CMD("DELT"))  CmdDELT(s);
@@ -2368,6 +2557,7 @@ void cSVDRPServer::Execute(char *Cmd)
   else if (CMD("HELP"))  CmdHELP(s);
   else if (CMD("HITK"))  CmdHITK(s);
   else if (CMD("LSTC"))  CmdLSTC(s);
+  else if (CMD("LSTD"))  CmdLSTD(s);
   else if (CMD("LSTE"))  CmdLSTE(s);
   else if (CMD("LSTR"))  CmdLSTR(s);
   else if (CMD("LSTT"))  CmdLSTT(s);
@@ -2383,6 +2573,7 @@ void cSVDRPServer::Execute(char *Cmd)
   else if (CMD("PLAY"))  CmdPLAY(s);
   else if (CMD("PLUG"))  CmdPLUG(s);
   else if (CMD("POLL"))  CmdPOLL(s);
+  else if (CMD("PRIM"))  CmdPRIM(s);
   else if (CMD("PUTE"))  CmdPUTE(s);
   else if (CMD("REMO"))  CmdREMO(s);
   else if (CMD("SCAN"))  CmdSCAN(s);
@@ -2408,6 +2599,7 @@ bool cSVDRPServer::Process(void)
                  // make sure the string is terminated:
                  cmdLine[numChars] = 0;
                  // showtime!
+                 dbgsvdrp("< S %s: %s\n", *clientName, cmdLine);
                  Execute(cmdLine);
                  numChars = 0;
                  if (length > BUFSIZ) {
@@ -2436,7 +2628,7 @@ bool cSVDRPServer::Process(void)
                        cmdLine = NewBuffer;
                        }
                     else {
-                       esyslog("SVDRP < %s ERROR: out of memory", *connection);
+                       esyslog("SVDRP %s < %s ERROR: out of memory", Setup.SVDRPHostName, *clientName);
                        Close();
                        break;
                        }
@@ -2447,12 +2639,12 @@ bool cSVDRPServer::Process(void)
               lastActivity = time(NULL);
               }
            else if (r <= 0) {
-              isyslog("SVDRP < %s lost connection to client", *connection);
+              isyslog("SVDRP %s < %s lost connection to client", Setup.SVDRPHostName, *clientName);
               Close();
               }
            }
      if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
-        isyslog("SVDRP < %s timeout on connection", *connection);
+        isyslog("SVDRP %s < %s timeout on connection", Setup.SVDRPHostName, *clientName);
         Close(true, true);
         }
      }
@@ -2474,7 +2666,6 @@ void SetSVDRPGrabImageDir(const char *GrabImageDir)
 
 class cSVDRPServerHandler : public cThread {
 private:
-  cMutex mutex;
   bool ready;
   cSocket tcpSocket;
   cVector<cSVDRPServer *> serverConnections;
@@ -2513,7 +2704,6 @@ void cSVDRPServerHandler::WaitUntilReady(void)
 
 void cSVDRPServerHandler::ProcessConnections(void)
 {
-  cMutexLock MutexLock(&mutex);
   for (int i = 0; i < serverConnections.Size(); i++) {
       if (!serverConnections[i]->Process()) {
          delete serverConnections[i];
@@ -2527,7 +2717,7 @@ void cSVDRPServerHandler::HandleServerConnection(void)
 {
   int NewSocket = tcpSocket.Accept();
   if (NewSocket >= 0)
-     serverConnections.Append(new cSVDRPServer(NewSocket, tcpSocket.LastIpAddress()->Connection()));
+     serverConnections.Append(new cSVDRPServer(NewSocket, tcpSocket.LastIpAddress()));
 }
 
 void cSVDRPServerHandler::Action(void)
@@ -2537,7 +2727,6 @@ void cSVDRPServerHandler::Action(void)
      ready = true;
      while (Running()) {
            SVDRPServerPoller.Poll(1000);
-           cMutexLock MutexLock(&mutex);
            HandleServerConnection();
            ProcessConnections();
            }
@@ -2550,60 +2739,53 @@ void cSVDRPServerHandler::Action(void)
 
 static cMutex SVDRPHandlerMutex;
 
-void StartSVDRPServerHandler(void)
-{
-  cMutexLock MutexLock(&SVDRPHandlerMutex);
-  if (SVDRPTcpPort && !SVDRPServerHandler) {
-     SVDRPServerHandler = new cSVDRPServerHandler(SVDRPTcpPort);
-     SVDRPServerHandler->Start();
-     SVDRPServerHandler->WaitUntilReady();
-     }
-}
-
-void StartSVDRPClientHandler(void)
+void StartSVDRPHandler(void)
 {
   cMutexLock MutexLock(&SVDRPHandlerMutex);
-  if (SVDRPTcpPort && SVDRPUdpPort && !SVDRPClientHandler) {
-     SVDRPClientHandler = new cSVDRPClientHandler(SVDRPTcpPort, SVDRPUdpPort);
-     SVDRPClientHandler->Start();
+  if (SVDRPTcpPort) {
+     if (!SVDRPServerHandler) {
+        SVDRPServerHandler = new cSVDRPServerHandler(SVDRPTcpPort);
+        SVDRPServerHandler->Start();
+        SVDRPServerHandler->WaitUntilReady();
+        }
+     if (Setup.SVDRPPeering && SVDRPUdpPort && !SVDRPClientHandler) {
+        SVDRPClientHandler = new cSVDRPClientHandler(SVDRPTcpPort, SVDRPUdpPort);
+        SVDRPClientHandler->Start();
+        }
      }
 }
 
-void StopSVDRPServerHandler(void)
-{
-  cMutexLock MutexLock(&SVDRPHandlerMutex);
-  delete SVDRPServerHandler;
-  SVDRPServerHandler = NULL;
-}
-
-void StopSVDRPClientHandler(void)
+void StopSVDRPHandler(void)
 {
   cMutexLock MutexLock(&SVDRPHandlerMutex);
   delete SVDRPClientHandler;
   SVDRPClientHandler = NULL;
+  delete SVDRPServerHandler;
+  SVDRPServerHandler = NULL;
 }
 
-void SendSVDRPDiscover(const char *Address)
-{
-  cMutexLock MutexLock(&SVDRPHandlerMutex);
-  if (SVDRPClientHandler)
-     SVDRPClientHandler->SendDiscover(Address);
-}
-
-bool GetSVDRPServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlag)
+bool GetSVDRPServerNames(cStringList *ServerNames)
 {
+  bool Result = false;
   cMutexLock MutexLock(&SVDRPHandlerMutex);
-  if (SVDRPClientHandler)
-     return SVDRPClientHandler->GetServerNames(ServerNames, FetchFlag);
-  return false;
+  if (SVDRPClientHandler) {
+     SVDRPClientHandler->Lock();
+     Result = SVDRPClientHandler->GetServerNames(ServerNames);
+     SVDRPClientHandler->Unlock();
+     }
+  return Result;
 }
 
 bool ExecSVDRPCommand(const char *ServerName, const char *Command, cStringList *Response)
 {
+  bool Result = false;
   cMutexLock MutexLock(&SVDRPHandlerMutex);
-  if (SVDRPClientHandler)
-     return SVDRPClientHandler->Execute(ServerName, Command, Response);
-  return false;
+  if (SVDRPClientHandler) {
+     SVDRPClientHandler->Lock();
+     Result = SVDRPClientHandler->Execute(ServerName, Command, Response);
+     SVDRPClientHandler->Unlock();
+     }
+  return Result;
 }
 
 void BroadcastSVDRPCommand(const char *Command)
@@ -2611,9 +2793,11 @@ void BroadcastSVDRPCommand(const char *Command)
   cMutexLock MutexLock(&SVDRPHandlerMutex);
   cStringList ServerNames;
   if (SVDRPClientHandler) {
+     SVDRPClientHandler->Lock();
      if (SVDRPClientHandler->GetServerNames(&ServerNames)) {
         for (int i = 0; i < ServerNames.Size(); i++)
             ExecSVDRPCommand(ServerNames[i], Command);
         }
+     SVDRPClientHandler->Unlock();
      }
 }
diff --git a/svdrp.h b/svdrp.h
index e0d3616e9..5330b9aa5 100644
--- a/svdrp.h
+++ b/svdrp.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: svdrp.h 4.7 2017/06/30 09:49:39 kls Exp $
+ * $Id: svdrp.h 4.11 2018/03/15 16:30:29 kls Exp $
  */
 
 #ifndef __SVDRP_H
 #define __SVDRP_H
 
+#include "thread.h"
 #include "tools.h"
 
 enum eSvdrpPeerModes {
@@ -18,25 +19,18 @@ enum eSvdrpPeerModes {
   spmOnly = 2,
   };
 
-enum eSvdrpFetchFlags {
-  sffNone   = 0b0000,
-  sffTimers = 0b0001,
-  };
+extern cStateKey StateKeySVDRPRemoteTimersPoll;
+     ///< Controls whether a change to the local list of timers needs to result in
+     ///< sending a POLL to the remote clients.
 
 void SetSVDRPPorts(int TcpPort, int UdpPort);
 void SetSVDRPGrabImageDir(const char *GrabImageDir);
-void StartSVDRPServerHandler(void);
-void StartSVDRPClientHandler(void);
-void StopSVDRPServerHandler(void);
-void StopSVDRPClientHandler(void);
-void SendSVDRPDiscover(const char *Address = NULL);
-bool GetSVDRPServerNames(cStringList *ServerNames, eSvdrpFetchFlags FetchFlag = sffNone);
+void StartSVDRPHandler(void);
+void StopSVDRPHandler(void);
+bool GetSVDRPServerNames(cStringList *ServerNames);
      ///< Gets a list of all available VDRs this VDR is connected to via SVDRP,
      ///< and stores it in the given ServerNames list. The list is cleared
      ///< before getting the server names.
-     ///< If FetchFlag is given, only the server names for which the local
-     ///< client has this flag set will be returned, and the client's flag
-     ///< will be cleared.
      ///< Returns true if the resulting list is not empty.
 bool ExecSVDRPCommand(const char *ServerName, const char *Command, cStringList *Response = NULL);
      ///< Sends the given SVDRP Command string to the remote VDR identified
diff --git a/thread.c b/thread.c
index 8fc23400f..2a5a8e995 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 4.11 2017/06/25 12:08:16 kls Exp $
+ * $Id: thread.c 4.14 2018/03/05 22:38:10 kls Exp $
  */
 
 #include "thread.h"
@@ -716,7 +716,8 @@ cStateLock::cStateLock(const char *Name)
   name = Name;
   threadId = 0;
   state = 0;
-  explicitModify = false;
+  explicitModify = emDisabled;
+  syncStateKey = NULL;
 }
 
 bool cStateLock::Lock(cStateKey &StateKey, bool Write, int TimeoutMs)
@@ -764,30 +765,71 @@ void cStateLock::Unlock(cStateKey &StateKey, bool IncState)
      return;
      }
   if (StateKey.write && threadId != cThread::ThreadId()) {
-     esyslog("ERROR: cStateLock::Unlock() called without holding a lock (tid=%d, lock=%s)", threadId, name);
+     esyslog("ERROR: cStateLock::Unlock() called without holding a write lock (tid=%d, lock=%s)", threadId, name);
      ABORT;
      return;
      }
-  if (StateKey.write && IncState && !explicitModify)
+  if (StateKey.write && (IncState && explicitModify != emArmed || explicitModify == emEnabled)) {
+     if (syncStateKey && syncStateKey->state == state)
+        syncStateKey->state++;
      state++;
+     }
   StateKey.state = state;
+  StateKey.stateLock = NULL;
   if (StateKey.write) {
      StateKey.write = false;
      threadId = 0;
-     explicitModify = false;
+     explicitModify = emDisabled;
+     syncStateKey = NULL;
      }
   dbglockseq(name, false, false);
   rwLock.Unlock();
 }
 
-void cStateLock::IncState(void)
+void cStateLock::SetSyncStateKey(cStateKey &StateKey)
 {
+  dbglocking("%5d %-12s %10p SetSyncStateKey\n", cThread::ThreadId(), name, &StateKey);
   if (threadId != cThread::ThreadId()) {
-     esyslog("ERROR: cStateLock::IncState() called without holding a lock (tid=%d, lock=%s)", threadId, name);
+     esyslog("ERROR: cStateLock::SetSyncStateKey() called without holding a write lock (tid=%d, lock=%s)", threadId, name);
      ABORT;
+     return;
      }
-  else
-     state++;
+  if (StateKey.stateLock == this) {
+     esyslog("ERROR: cStateLock::SetSyncStateKey() called with locked key (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  if (syncStateKey) {
+     esyslog("ERROR: cStateLock::SetSyncStateKey() called twice (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  syncStateKey = &StateKey;
+}
+
+void cStateLock::SetExplicitModify(void)
+{
+  if (threadId != cThread::ThreadId()) {
+     esyslog("ERROR: cStateLock::SetExplicitModify() called without holding a write lock (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  if (explicitModify != emDisabled) {
+     esyslog("ERROR: cStateLock::SetExplicitModify() called twice (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  explicitModify = emArmed;
+}
+
+void cStateLock::SetModified(void)
+{
+  if (threadId != cThread::ThreadId()) {
+     esyslog("ERROR: cStateLock::SetModified() called without holding a write lock (tid=%d, lock=%s)", threadId, name);
+     ABORT;
+     return;
+     }
+  explicitModify = emEnabled;
 }
 
 // --- cStateKey -------------------------------------------------------------
@@ -816,10 +858,8 @@ void cStateKey::Reset(void)
 
 void cStateKey::Remove(bool IncState)
 {
-  if (stateLock) {
+  if (stateLock)
      stateLock->Unlock(*this, IncState);
-     stateLock = NULL;
-     }
   else {
      esyslog("ERROR: cStateKey::Remove() called without holding a lock (key=%p)", this);
      ABORT;
@@ -836,7 +876,6 @@ bool cStateKey::StateChanged(void)
      return state != stateLock->state;
   else
      return true;
-  return false;
 }
 
 // --- cIoThrottle -----------------------------------------------------------
diff --git a/thread.h b/thread.h
index 33f90c734..790c29a86 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 4.3 2017/05/31 11:39:11 kls Exp $
+ * $Id: thread.h 4.4 2018/03/04 11:27:55 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -171,11 +171,13 @@ class cStateKey;
 class cStateLock {
   friend class cStateKey;
 private:
+  enum { emDisabled = 0, emArmed, emEnabled };
   const char *name;
   tThreadId threadId;
   cRwLock rwLock;
   int state;
-  bool explicitModify;
+  int explicitModify;
+  cStateKey *syncStateKey;
   void Unlock(cStateKey &StateKey, bool IncState = true);
        ///< Releases a lock that has been obtained by a previous call to Lock()
        ///< with the given StateKey. If this was a write-lock, and IncState is true,
@@ -211,13 +213,21 @@ class cStateLock {
        ///< If Write is true (i.e. a write-lock is requested), the states of the
        ///< lock and the given StateKey don't matter, it will always try to obtain
        ///< a write lock.
-  void SetExplicitModify(void) { explicitModify = true; }
+  void SetSyncStateKey(cStateKey &StateKey);
+       ///< Sets the given StateKey to be synchronized to the state of this lock.
+       ///< The caller must currenty hold a write lock on this lock, with a cStateKey
+       ///< that is different from the given StateKey. If, when removing the key that
+       ///< is holding the write lock, the StateKey's current state is the same as that
+       ///< of the lock, it will be increased together with the lock's state.
+  void SetExplicitModify(void);
        ///< If you have obtained a write lock on this lock, and you don't want its
        ///< state to be automatically incremented when the lock is released, a call to
-       ///< this function will disable this, and you can explicitly call IncState()
+       ///< this function will disable this, and you can explicitly call SetModified()
        ///< to increment the state.
-  void IncState(void);
-       ///< Increments the state of this lock.
+  void SetModified(void);
+       ///< Sets this lock to have its state incremented when the current write lock
+       ///< state key is removed. Must have called SetExplicitModify() before calling
+       ///< this function.
   };
 
 class cStateKey {
diff --git a/timers.c b/timers.c
index 8987b1264..8119b8586 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.11 2017/06/25 10:02:09 kls Exp $
+ * $Id: timers.c 4.18 2018/03/17 10:07:19 kls Exp $
  */
 
 #include "timers.h"
@@ -419,20 +419,25 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
      t = time(NULL);
 
   int begin  = TimeToInt(start); // seconds from midnight
-  int length = TimeToInt(stop) - begin;
-  if (length < 0)
-     length += SECSINDAY;
+  int end    = TimeToInt(stop);
+  int length = end - begin;
 
   if (IsSingleEvent()) {
-     startTime = SetTime(day, begin);
-     stopTime = startTime + length;
+     time_t t0 = day;
+     startTime = SetTime(t0, begin);
+     if (length < 0)
+        t0 = IncDay(day, 1);
+     stopTime  = SetTime(t0, end);
      }
   else {
+     time_t d = day ? max(day, t) : t;
      for (int i = -1; i <= 7; i++) {
-         time_t t0 = IncDay(day ? max(day, t) : t, i);
+         time_t t0 = IncDay(d, i);
          if (DayMatches(t0)) {
             time_t a = SetTime(t0, begin);
-            time_t b = a + length;
+            if (length < 0)
+               t0 = IncDay(d, i + 1);
+            time_t b = SetTime(t0, end);
             if ((!day || a >= day) && t < b) {
                startTime = a;
                stopTime = b;
@@ -480,9 +485,16 @@ eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
      bool UseVps = HasFlags(tfVps) && Event->Vps();
      Matches(UseVps ? Event->Vps() : Event->StartTime(), true);
      int overlap = 0;
-     if (UseVps)
-        overlap = (startTime == Event->Vps()) ? FULLMATCH + (Event->IsRunning() ? 200 : 100) : 0;
-     if (!overlap) {
+     if (UseVps) {
+        if (startTime == Event->Vps()) {
+           overlap = FULLMATCH;
+           if (Event->IsRunning())
+              overlap += 200;
+           else if (Event->RunningStatus() != SI::RunningStatusNotRunning)
+              overlap += 100;
+           }
+        }
+     else {
         if (startTime <= Event->StartTime() && Event->EndTime() <= stopTime)
            overlap = FULLMATCH;
         else if (stopTime <= Event->StartTime() || Event->EndTime() <= startTime)
@@ -493,8 +505,6 @@ eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
      startTime = stopTime = 0;
      if (Overlap)
         *Overlap = overlap;
-     if (UseVps)
-        return overlap > FULLMATCH ? tmFull : tmNone;
      return overlap >= FULLMATCH ? tmFull : overlap > 0 ? tmPartial : tmNone;
      }
   return tmNone;
@@ -504,7 +514,10 @@ eTimerMatch cTimer::Matches(const cEvent *Event, int *Overlap) const
 
 bool cTimer::Expired(void) const
 {
-  return IsSingleEvent() && !Recording() && StopTime() + EXPIRELATENCY <= time(NULL) && (!HasFlags(tfVps) || !event || !event->Vps());
+  return IsSingleEvent()
+      && !Recording()
+      && StopTime() + EXPIRELATENCY <= time(NULL)
+      && (!HasFlags(tfVps) || !event || !event->Vps() || event->EndTime() + EXPIRELATENCY <= time(NULL));
 }
 
 time_t cTimer::StartTime(void) const
@@ -538,12 +551,12 @@ bool cTimer::SetEventFromSchedule(const cSchedules *Schedules)
         if (HasFlags(tfVps) && Schedule->Events()->First()->Vps()) {
            // VPS timers only match if their start time exactly matches the event's VPS time:
            for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
-               if (e->StartTime() && e->RunningStatus() != SI::RunningStatusNotRunning) { // skip outdated events
+               if (e->StartTime()) {
                   int overlap = 0;
-                  Matches(e, &overlap);
-                  if (overlap > FULLMATCH) {
+                  if (Matches(e, &overlap) == tmFull) {
                      Event = e;
-                     break; // take the first matching event
+                     if (overlap > FULLMATCH)
+                        break; // take the first matching event
                      }
                   }
                }
@@ -792,10 +805,10 @@ const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const
   eTimerMatch m = tmNone;
   for (const cTimer *ti = First(); ti; ti = Next(ti)) {
       eTimerMatch tm = ti->Matches(Event);
-      if (tm > m) {
+      if (tm > m || tm == tmFull && ti->Local()) {
          t = ti;
          m = tm;
-         if (m == tmFull)
+         if (m == tmFull && ti->Local())
             break;
          }
       }
@@ -804,6 +817,16 @@ const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const
   return t;
 }
 
+int cTimers::GetMaxPriority(void) const
+{
+  int n = 0;
+  for (const cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (!ti->Remote() && ti->Recording())
+         n = max(n, ti->Priority());
+      }
+  return n;
+}
+
 const cTimer *cTimers::GetNextActiveTimer(void) const
 {
   const cTimer *t0 = NULL;
@@ -883,80 +906,117 @@ bool cTimers::DeleteExpired(void)
   return TimersModified;
 }
 
-bool cTimers::GetRemoteTimers(const char *ServerName)
+bool cTimers::StoreRemoteTimers(const char *ServerName, const cStringList *RemoteTimers)
 {
   bool Result = false;
-  if (ServerName) {
-     Result = DelRemoteTimers(ServerName);
-     cStringList Response;
-     if (ExecSVDRPCommand(ServerName, "LSTT ID", &Response)) {
-        for (int i = 0; i < Response.Size(); i++) {
-            const char *s = Response[i];
-            int Code = SVDRPCode(s);
-            if (Code == 250) {
-               if (const char *v = SVDRPValue(s)) {
-                  int Id = atoi(v);
-                  while (*v && *v != ' ')
-                        v++; // skip id
-                  cTimer *Timer = new cTimer;
-                  if (Timer->Parse(v)) {
-                     Timer->SetRemote(ServerName);
-                     Timer->SetId(Id);
-                     Add(Timer);
-                     Result = true;
-                     }
-                  else {
-                     esyslog("ERROR: %s: error in timer settings: %s", ServerName, v);
-                     delete Timer;
-                     }
+  if (!ServerName || !RemoteTimers || RemoteTimers->Size() == 0) {
+     // Remove remote timers from this list:
+     cTimer *Timer = First();
+     while (Timer) {
+           cTimer *t = Next(Timer);
+           if (Timer->Remote() && (!ServerName || strcmp(Timer->Remote(), ServerName) == 0)) {
+              Del(Timer);
+              Result = true;
+              }
+           Timer = t;
+           }
+     return Result;
+     }
+  // Collect all locally stored remote timers from ServerName:
+  cStringList tl;
+  for (cTimer *ti = First(); ti; ti = Next(ti)) {
+      if (ti->Remote() && strcmp(ti->Remote(), ServerName) == 0)
+         tl.Append(strdup(cString::sprintf("%d %s", ti->Id(), *ti->ToText(true))));
+      }
+  tl.SortNumerically(); // RemoteTimers is also sorted numerically!
+  // Compare the two lists and react accordingly:
+  int il = 0; // index into the local ("left") list of remote timers
+  int ir = 0; // index into the remote ("right") list of timers
+  int sl = tl.Size();
+  int sr = RemoteTimers->Size();
+  for (;;) {
+      int AddTimer = 0;
+      int DelTimer = 0;
+      if (il < sl) { // still have left entries
+         int nl = atoi(tl[il]);
+         if (ir < sr) { // still have right entries
+            // Compare timers:
+            int nr = atoi((*RemoteTimers)[ir]);
+            if (nl == nr) // same timer id
+               AddTimer = DelTimer = nl;
+            else if (nl < nr) // left entry not in right list
+               DelTimer = nl;
+            else // right entry not in left list
+               AddTimer = nr;
+            }
+         else // processed all right entries
+            DelTimer = nl;
+         }
+      else if (ir < sr) { // still have right entries
+         AddTimer = atoi((*RemoteTimers)[ir]);
+         if (!AddTimer) {
+            esyslog("ERROR: %s: error in timer settings: %s", ServerName, (*RemoteTimers)[ir]);
+            ir++;
+            continue; // let's see if we can process the rest
+            }
+         }
+      else // processed all left and right entries
+         break;
+      if (AddTimer && DelTimer) {
+         if (strcmp(tl[il], (*RemoteTimers)[ir]) != 0) {
+            // Overwrite timer:
+            char *v = (*RemoteTimers)[ir];
+            while (*v && *v != ' ')
+                  v++; // skip id
+            if (cTimer *l = GetById(DelTimer, ServerName)) {
+               cTimer r;
+               if (r.Parse(v)) {
+                  r.SetRemote(ServerName);
+                  r.SetId(AddTimer);
+                  *l = r;
+                  Result = true;
                   }
+               else
+                  esyslog("ERROR: %d@%s: error in timer settings: %s", DelTimer, ServerName, v);
                }
-            else if (Code != 550)
-               esyslog("ERROR: %s: %s", ServerName, s);
             }
-        return Result;
-        }
-     }
-  else {
-     cStringList ServerNames;
-     if (GetSVDRPServerNames(&ServerNames, sffTimers)) {
-        for (int i = 0; i < ServerNames.Size(); i++)
-            Result |= GetRemoteTimers(ServerNames[i]);
-        }
-     }
+         else // identical timer, nothing to do
+            ;
+         il++;
+         ir++;
+         }
+      else if (AddTimer) {
+         char *v = (*RemoteTimers)[ir];
+         while (*v && *v != ' ')
+               v++; // skip id
+         cTimer *Timer = new cTimer;
+         if (Timer->Parse(v)) {
+            Timer->SetRemote(ServerName);
+            Timer->SetId(AddTimer);
+            Add(Timer);
+            Result = true;
+            }
+         else {
+            esyslog("ERROR: %s: error in timer settings: %s", ServerName, v);
+            delete Timer;
+            }
+         ir++;
+         }
+      else if (DelTimer) {
+         if (cTimer *t = GetById(DelTimer, ServerName)) {
+            Del(t);
+            Result = true;
+            }
+         il++;
+         }
+      else {
+         esyslog("ERROR: oops while storing remote timers!");
+         break; // let's not get stuck here!
+         }
+      }
   return Result;
 }
 
-bool cTimers::DelRemoteTimers(const char *ServerName)
-{
-  bool Deleted = false;
-  cTimer *Timer = First();
-  while (Timer) {
-        cTimer *t = Next(Timer);
-        if (Timer->Remote() && (!ServerName || strcmp(Timer->Remote(), ServerName) == 0)) {
-           Del(Timer);
-           Deleted = true;
-           }
-        Timer = t;
-        }
-  return Deleted;
-}
-
-void cTimers::TriggerRemoteTimerPoll(const char *ServerName)
-{
-  if (ServerName) {
-     if (!ExecSVDRPCommand(ServerName, cString::sprintf("POLL %s TIMERS", Setup.SVDRPHostName)))
-        esyslog("ERROR: can't send 'POLL %s TIMERS' to '%s'", Setup.SVDRPHostName, ServerName);
-     }
-  else {
-     cStringList ServerNames;
-     if (GetSVDRPServerNames(&ServerNames)) {
-        for (int i = 0; i < ServerNames.Size(); i++)
-            TriggerRemoteTimerPoll(ServerNames[i]);
-        }
-     }
-}
-
 static bool RemoteTimerError(const cTimer *Timer, cString *Msg)
 {
   if (Msg)
diff --git a/timers.h b/timers.h
index c4932ba63..93d5a447f 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 4.8 2017/04/20 09:09:45 kls Exp $
+ * $Id: timers.h 4.11 2018/02/27 13:57:26 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -176,6 +176,8 @@ class cTimers : public cConfig<cTimer> {
   cTimer *GetMatch(time_t t) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(t)); };
   const cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) const;
   cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(Event, Match)); }
+  int GetMaxPriority(void) const;
+      ///< Returns the maximum priority of all local timers that are currently recording.
   const cTimer *GetNextActiveTimer(void) const;
   const cTimer *UsesChannel(const cChannel *Channel) const;
   bool SetEvents(const cSchedules *Schedules);
@@ -183,21 +185,14 @@ class cTimers : public cConfig<cTimer> {
   void Add(cTimer *Timer, cTimer *After = NULL);
   void Ins(cTimer *Timer, cTimer *Before = NULL);
   void Del(cTimer *Timer, bool DeleteObject = true);
-  bool GetRemoteTimers(const char *ServerName = NULL);
-      ///< Gets the timers from the given remote machine and adds them to this
-      ///< list. If no ServerName is given, all timers from all known remote
-      ///< machines will be fetched. This function calls DelRemoteTimers() with
-      ///< the given ServerName first.
-      ///< Returns true if any remote timers have been added or deleted
-  bool DelRemoteTimers(const char *ServerName = NULL);
-      ///< Deletes all timers of the given remote machine from this list (leaves
-      ///< them untouched on the remote machine). If no ServerName is given, the
-      ///< timers of all remote machines will be deleted from the list.
-      ///< Returns true if any remote timers have been deleted.
-  void TriggerRemoteTimerPoll(const char *ServerName = NULL);
-      ///< Sends an SVDRP POLL command to the given remote machine.
-      ///< If no ServerName is given, the POLL command will be sent to all
-      ///< known remote machines.
+  bool StoreRemoteTimers(const char *ServerName = NULL, const cStringList *RemoteTimers = NULL);
+      ///< Stores the given list of RemoteTimers, which come from the VDR ServerName, in
+      ///< this list. If no ServerName is given, all remote timers from all peer machines
+      ///< will be removed from this list. If no RemoteTimers are given, only the remote
+      ///< timers from ServerName will be removed from this list.
+      ///< The given list of RemoteTimers must be sorted numerically (by a call to its
+      ///< SortNumerically() function).
+      ///< Returns true if any remote timers have been added, deleted or modified.
   };
 
 bool HandleRemoteTimerModifications(cTimer *NewTimer, cTimer *OldTimer = NULL, cString *Msg = NULL);
diff --git a/tools.c b/tools.c
index ac2f9eb23..7330fce19 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 4.8 2017/06/25 11:45:39 kls Exp $
+ * $Id: tools.c 4.11 2018/03/04 10:28:04 kls Exp $
  */
 
 #include "tools.h"
@@ -296,6 +296,18 @@ cString strgetval(const char *s, const char *name, char d)
   return NULL;
 }
 
+char *strshift(char *s, int n)
+{
+  if (s && n > 0) {
+     int l = strlen(s);
+     if (n < l)
+        memmove(s, s + n, l - n + 1); // we also copy the terminating 0!
+     else
+        *s = 0;
+     }
+  return s;
+}
+
 bool startswith(const char *s, const char *p)
 {
   while (*p) {
@@ -1762,7 +1774,12 @@ bool cSafeFile::Close(void)
 
 // --- cUnbufferedFile -------------------------------------------------------
 
-#define USE_FADVISE
+#ifndef USE_FADVISE_READ
+#define USE_FADVISE_READ 0
+#endif
+#ifndef USE_FADVISE_WRITE
+#define USE_FADVISE_WRITE 1
+#endif
 
 #define WRITE_BUFFER KILOBYTE(800)
 
@@ -1781,7 +1798,7 @@ int cUnbufferedFile::Open(const char *FileName, int Flags, mode_t Mode)
   Close();
   fd = open(FileName, Flags, Mode);
   curpos = 0;
-#ifdef USE_FADVISE
+#if USE_FADVISE_READ || USE_FADVISE_WRITE
   begin = lastpos = ahead = 0;
   cachedstart = 0;
   cachedend = 0;
@@ -1797,7 +1814,7 @@ int cUnbufferedFile::Open(const char *FileName, int Flags, mode_t Mode)
 int cUnbufferedFile::Close(void)
 {
   if (fd >= 0) {
-#ifdef USE_FADVISE
+#if USE_FADVISE_READ || USE_FADVISE_WRITE
      if (totwritten)    // if we wrote anything make sure the data has hit the disk before
         fdatasync(fd);  // calling fadvise, as this is our last chance to un-cache it.
      posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
@@ -1840,7 +1857,7 @@ off_t cUnbufferedFile::Seek(off_t Offset, int Whence)
 ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
 {
   if (fd >= 0) {
-#ifdef USE_FADVISE
+#if USE_FADVISE_READ
      off_t jumped = curpos-lastpos; // nonzero means we're not at the last offset
      if ((cachedstart < cachedend) && (curpos < cachedstart || curpos > cachedend)) {
         // current position is outside the cached window -- invalidate it.
@@ -1853,7 +1870,7 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
      ssize_t bytesRead = safe_read(fd, Data, Size);
      if (bytesRead > 0) {
         curpos += bytesRead;
-#ifdef USE_FADVISE
+#if USE_FADVISE_READ
         cachedend = max(cachedend, curpos);
 
         // Read ahead:
@@ -1875,7 +1892,7 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
            ahead = curpos; // jumped -> we really don't want any readahead, otherwise e.g. fast-rewind gets in trouble.
 #endif
         }
-#ifdef USE_FADVISE
+#if USE_FADVISE_READ
      if (cachedstart < cachedend) {
         if (curpos - cachedstart > READCHUNK * 2) {
            // current position has moved forward enough, shrink tail window.
@@ -1899,7 +1916,7 @@ ssize_t cUnbufferedFile::Write(const void *Data, size_t Size)
 {
   if (fd >=0) {
      ssize_t bytesWritten = safe_write(fd, Data, Size);
-#ifdef USE_FADVISE
+#if USE_FADVISE_WRITE
      if (bytesWritten > 0) {
         begin = min(begin, curpos);
         curpos += bytesWritten;
@@ -2236,7 +2253,7 @@ void cListBase::SetExplicitModify(void)
 
 void cListBase::SetModified(void)
 {
-  stateLock.IncState();
+  stateLock.SetModified();
 }
 
 const cListObject *cListBase::Get(int Index) const
diff --git a/tools.h b/tools.h
index aaba602ff..614130d0e 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.13 2017/06/25 11:45:38 kls Exp $
+ * $Id: tools.h 4.16 2018/03/04 14:06:36 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -226,6 +226,12 @@ cString strgetval(const char *s, const char *name, char d = '=');
     ///< If an other delimiter shall be used (like, e.g., ':'), it can be given
     ///< as the third parameter.
     ///< If name occurs more than once in s, only the first occurrence is taken.
+char *strshift(char *s, int n);
+    ///< Shifts the given string to the left by the given number of bytes, thus
+    ///< removing the first n bytes from s.
+    ///< If n is greater than the length of s, the resulting string will be empty.
+    ///< If n is <= 0 s will be unchanged.
+    ///< Returns s.
 bool startswith(const char *s, const char *p);
 bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
@@ -553,6 +559,11 @@ class cListBase {
        ///< Contains() function to check whether an object you are holding a pointer
        ///< to is still in the list. Note that the garbage collector is purged when
        ///< the usual housekeeping is done.
+  void SetSyncStateKey(cStateKey &StateKey) { stateLock.SetSyncStateKey(StateKey); }
+       ///< When making changes to this list (while holding a write lock) that shall
+       ///< not affect some other code that reacts to such changes, this function can
+       ///< be called with the StateKey used by that other code.
+       ///< See cStateLock::SetSyncStateKey() for details.
   void SetUseGarbageCollector(void) { useGarbageCollector = true; }
   void SetExplicitModify(void);
        ///< If you have obtained a write lock on this list, and you don't want it to
@@ -768,7 +779,7 @@ template<class T> class cVector {
 
 inline int CompareInts(const void *a, const void *b)
 {
-  return *(const int *)a > *(const int *)b;
+  return *(const int *)a - *(const int *)b;
 }
 
 inline int CompareStrings(const void *a, const void *b)
@@ -781,6 +792,12 @@ inline int CompareStringsIgnoreCase(const void *a, const void *b)
   return strcasecmp(*(const char **)a, *(const char **)b);
 }
 
+inline int CompareStringsNumerically(const void *a, const void *b)
+{
+  int d = atoi(*(const char **)a) - atoi(*(const char **)b);
+  return d ? d : CompareStrings(a, b);
+}
+
 class cStringList : public cVector<char *> {
 public:
   cStringList(int Allocated = 10): cVector<char *>(Allocated) {}
@@ -793,6 +810,10 @@ class cStringList : public cVector<char *> {
     else
        cVector<char *>::Sort(CompareStrings);
   }
+  void SortNumerically(void)
+  {
+    cVector<char *>::Sort(CompareStringsNumerically);
+  }
   virtual void Clear(void);
   };
 
diff --git a/transfer.c b/transfer.c
index d0e7ed462..88931e58d 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 4.1 2015/09/05 11:43:58 kls Exp $
+ * $Id: transfer.c 4.2 2017/12/07 15:00:33 kls Exp $
  */
 
 #include "transfer.h"
@@ -14,6 +14,8 @@
 cTransfer::cTransfer(const cChannel *Channel)
 :cReceiver(Channel, TRANSFERPRIORITY)
 {
+  lastErrorReport = 0;
+  numLostPackets = 0;
   patPmtGenerator.SetChannel(Channel);
 }
 
@@ -37,6 +39,7 @@ void cTransfer::Activate(bool On)
 
 #define MAXRETRIES    20 // max. number of retries for a single TS packet
 #define RETRYWAIT      5 // time (in ms) between two retries
+#define ERRORDELTA    60 // seconds before reporting lost TS packets again
 
 void cTransfer::Receive(const uchar *Data, int Length)
 {
@@ -51,7 +54,12 @@ void cTransfer::Receive(const uchar *Data, int Length)
          cCondWait::SleepMs(RETRYWAIT);
          }
      DeviceClear();
-     esyslog("ERROR: TS packet not accepted in Transfer Mode");
+     numLostPackets++;
+     if (time(NULL) - lastErrorReport > ERRORDELTA) {
+        esyslog("ERROR: %d TS packet(s) not accepted in Transfer Mode", numLostPackets);
+        numLostPackets = 0;
+        lastErrorReport = time(NULL);
+        }
      }
 }
 
diff --git a/transfer.h b/transfer.h
index 21d9dd862..a10ed7b28 100644
--- a/transfer.h
+++ b/transfer.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.h 4.1 2015/09/05 11:43:08 kls Exp $
+ * $Id: transfer.h 4.2 2017/12/07 14:56:22 kls Exp $
  */
 
 #ifndef __TRANSFER_H
@@ -16,6 +16,8 @@
 
 class cTransfer : public cReceiver, public cPlayer {
 private:
+  time_t lastErrorReport;
+  int numLostPackets;
   cPatPmtGenerator patPmtGenerator;
 protected:
   virtual void Activate(bool On);
diff --git a/vdr.1 b/vdr.1
index 0ce3eed8b..3278451ca 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 4.2 2015/04/19 12:39:13 kls Exp $
+.\" $Id: vdr.1 4.3 2018/02/09 15:09:07 kls Exp $
 .\"
 .TH vdr 1 "19 Feb 2015" "2.2" "Video Disk Recorder"
 .SH NAME
@@ -158,7 +158,10 @@ Don't use the keyboard as an input device.
 Use \fIport\fR for SVDRP. A value of \fB0\fR turns off SVDRP.
 The default SVDRP port is \fB6419\fR.
 You need to edit the file \fIsvdrphosts.conf\fR in order to enable
-access to the SVDRP port.
+access to the SVDRP port from hosts other than the localhosts.
+Note that this option only changes the TCP port used for SVDRP commands.
+The UDP port for discovering peer VDRs in the same network is always set
+to 6419 and can't be changed.
 .TP
 .BI \-P\  options ,\ \-\-plugin= options
 Load a plugin, defined by the given \fIoptions\fR.
diff --git a/vdr.5 b/vdr.5
index 80d60def0..b04b20d4f 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 4.3 2017/06/10 11:47:27 kls Exp $
+.\" $Id: vdr.5 4.7 2018/02/15 16:00:42 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
 .SH NAME
@@ -522,23 +522,18 @@ frequency of the given channel, and pin is an optional pin number (0-255). The
 actual values are device specific and can be found in the SCR device's manual.
 
 Examples:
-
+.PP
+.EX
 0 1284
-.br
 1 1400
-.br
 2 1516
-.br
 3 1632
-.br
 4 1748
-.br
 5 1864
-.br
 6 1980
-.br
 7 2096
-
+.EE
+.PP
 By default it is assumed that the SCR configurations apply to all devices, and
 each device will pick one. If you have several SCR sat cables connected to one
 VDR machine, or if you want to explicitly assign the SCR channels to your devices,
@@ -596,35 +591,24 @@ defines a sub folder (i.e. a folder that contains other folders), and a line
 consisting of only '}' ends the definition of a sub folder.
 
 Example:
-
+.PP
+.EX
 Daily {
-.br
   News
-.br
   Soaps
-.br
   }
-.br
 Archive {
-.br
   Movies
-.br
   Sports
-.br
   Sci-Fi {
-.br
     Star Trek
-.br
     U.F.O.
-.br
     }
-.br
   }
-.br
 Comedy
-.br
 Science
-
+.EE
+.PP
 Note that these folder definitions are only used to set the file name under which
 a timer will store its recording. Changing these definitions in any way has no
 effect on existing timers or recordings.
@@ -647,9 +631,9 @@ Everything following (and including) a '#' character is considered to be comment
 
 You can have nested layers of command menus by surrounding a sequence of
 commands with '{'...'}' and giving it a title, as in
-
+.PP
+.EX
 My Commands {
-.br
   First list {
     Do something: some command
     Do something else: another command
@@ -658,9 +642,9 @@ My Commands {
     Even more: yet another command
     So much more: and yet another one
     }
-.br
   }
-
+.EE
+.PP
 Command lists can be nested to any depth.
 
 By default the menu entries in the "Commands" menu will be numbered '1'...'9'
@@ -675,15 +659,14 @@ In order to avoid error messages to the console, every command should have
 \fIstdout\fR will be displayed in a result window, with \fBtitle\fR as its title.
 
 Examples:
-
+.PP
+.EX
 Check for new mail?: /usr/local/bin/checkmail 2>&1
-.br
 CPU status: /usr/local/bin/cpustatus 2>&1
-.br
 Disk space: df \-h | grep '/video' | awk '{ print 100 \- $5 "% free"; }'
-.br
 Calendar: date;echo;cal
-
+.EE
+.PP
 Note that the commands 'checkmail' and 'cpustatus' are only \fBexamples\fR!
 Don't send emails to the author asking where to find these ;\-)
 .br
@@ -713,14 +696,13 @@ the \fBIP-Address\fR is 0.0.0.0, because this will give access to any host
 Everything following (and including) a '#' character is considered to be comment.
 
 Examples:
-
+.PP
+.EX
 127.0.0.1        # always accept localhost
-.br
 192.168.100.0/24 # any host on the local net
-.br
 204.152.189.113  # a specific host
-.br
 0.0.0.0/0        # any host on any net (\fBUSE WITH CARE!\fR)
+.EE
 .SS SETUP
 The file \fIsetup.conf\fR contains the basic configuration options for \fBvdr\fR.
 Each line contains one option in the format "Name = Value".
@@ -839,6 +821,26 @@ closer).
 \fBCURRENT RESTRICTIONS:\fR
 
 -\ the comment is currently not used by VDR
+.SS SORT MODE
+The file \fI.sort\fR (if present in a directory) contains an integer number
+defining the mode by which this directory shall be sorted when presented in a menu.
+
+The following values are defined:
+.TS
+tab (@);
+l l.
+\fB0\fR@sort by name
+\fB1\fR@sort by time
+.TE
+.SS RECORDING TIMER
+The file \fI.timer\fR (if present in a recording directory) contains
+the full id of the timer that is currently recording into this directory.
+Timer ids are of the form
+
+\fBid@hostname\fR
+
+where \fBid\fR is the timer's numerical id on the VDR with the name \fBhostname\fR.
+This file is created when the timer starts recording, and is deleted when it ends.
 .SS EPG DATA
 The file \fIepg.data\fR contains the EPG data in an easily parsable format.
 The first character of each line defines what kind of data this line contains.
@@ -918,6 +920,7 @@ in this file, other CAMs will be tried just as well. The main purpose of this
 file is to speed up channel switching in systems with more than one CAM.
 
 This file will be read at program startup and saved when the program ends.
+If the file is read-only, it will not be overwritten.
 .SS CAM AUTO RESPONSE
 If your CAM keeps popping up annoying messages or you want to make sure VDR
 can record programmes with parental rating without having to enter the PIN
@@ -961,20 +964,16 @@ Everything following (and including) a '#' character is considered to be comment
 If started without any options, vdr tries to read any files in the directory
 /etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
 These files are read in alphabetical order. The format of these files is
-
+.PP
+.EX
 # comment
-.br
 [name]
-.br
 -a
-.br
 -b 123
-.br
 --long
-.br
 --longarg=123
-.br
-
+.EE
+.PP
 Any lines that begin with '#' as the first non-whitespace character are considered
 comments and are ignored.
 A command line option file consists of one or more sections, indicated by '[name]',
diff --git a/vdr.c b/vdr.c
index 7628f47ab..f9e5bb8fb 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.18 2017/06/08 16:10:34 kls Exp $
+ * $Id: vdr.c 4.24 2018/03/04 14:00:29 kls Exp $
  */
 
 #include <getopt.h>
@@ -221,8 +221,10 @@ int main(int argc, char *argv[])
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
   const char *OverrideCharacterTable = NULL;
-#define DEPRECATED_VDR_CHARSET_OVERRIDE
-#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE
+#ifndef DEPRECATED_VDR_CHARSET_OVERRIDE
+#define DEPRECATED_VDR_CHARSET_OVERRIDE 0
+#endif
+#if DEPRECATED_VDR_CHARSET_OVERRIDE
   OverrideCharacterTable = getenv("VDR_CHARSET_OVERRIDE");
   const char *DeprecatedVdrCharsetOverride = OverrideCharacterTable;
 #endif
@@ -703,7 +705,7 @@ int main(int argc, char *argv[])
      isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
      cCharSetConv::SetSystemCharacterTable(CodeSet);
      }
-#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE
+#if DEPRECATED_VDR_CHARSET_OVERRIDE
   if (DeprecatedVdrCharsetOverride)
      isyslog("use of environment variable VDR_CHARSET_OVERRIDE (%s) is deprecated!", DeprecatedVdrCharsetOverride);
 #endif
@@ -730,6 +732,7 @@ int main(int argc, char *argv[])
   bool InhibitEpgScan = false;
   bool IsInfoMenu = false;
   cSkin *CurrentSkin = NULL;
+  int OldPrimaryDVB = 0;
 
   // Load plugins:
 
@@ -832,6 +835,7 @@ int main(int argc, char *argv[])
            }
         }
      }
+  OldPrimaryDVB = Setup.PrimaryDVB;
 
   // Check for timers in automatic start time window:
 
@@ -942,9 +946,7 @@ int main(int argc, char *argv[])
   // SVDRP:
 
   SetSVDRPPorts(SVDRPport, DEFAULTSVDRPPORT);
-  StartSVDRPServerHandler();
-  if (Setup.SVDRPPeering)
-     StartSVDRPClientHandler();
+  StartSVDRPHandler();
 
   // Main program loop:
 
@@ -1076,32 +1078,28 @@ int main(int argc, char *argv[])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         {
           // Timers and Recordings:
-          bool TimersModified = false;
-          bool TriggerRemoteTimerPoll = false;
-          static cStateKey TimersStateKey(true);
-          if (cTimers::GetTimersRead(TimersStateKey)) {
-             TriggerRemoteTimerPoll = true;
-             TimersStateKey.Remove();
-             }
+          static cStateKey TimersStateKey;
           cTimers *Timers = cTimers::GetTimersWrite(TimersStateKey);
-          // Get remote timers:
-          TimersModified |= Timers->GetRemoteTimers();
-          // Assign events to timers:
-          static cStateKey SchedulesStateKey;
-          if (const cSchedules *Schedules = cSchedules::GetSchedulesRead(SchedulesStateKey))
-             TimersModified |= Timers->SetEvents(Schedules);
+          {
+            // Assign events to timers:
+            static cStateKey SchedulesStateKey;
+            if (TimersStateKey.StateChanged())
+               SchedulesStateKey.Reset(); // we assign events if either the Timers or the Schedules have changed
+            bool TimersModified = false;
+            if (const cSchedules *Schedules = cSchedules::GetSchedulesRead(SchedulesStateKey)) {
+               Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
+               if (Timers->SetEvents(Schedules))
+                  TimersModified = true;
+               SchedulesStateKey.Remove();
+               }
+            TimersStateKey.Remove(TimersModified); // we need to remove the key here, so that syncing StateKeySVDRPRemoteTimersPoll takes effect!
+          }
           // Must do all following calls with the exact same time!
           // Process ongoing recordings:
-          if (cRecordControls::Process(Timers, Now)) {
+          Timers = cTimers::GetTimersWrite(TimersStateKey);
+          bool TimersModified = false;
+          if (cRecordControls::Process(Timers, Now))
              TimersModified = true;
-             TriggerRemoteTimerPoll = true;
-             }
-          // Must keep the lock on the schedules until after processing the record
-          // controls, in order to avoid short interrupts in case the current event
-          // is replaced by a new one (which some broadcasters do, instead of just
-          // modifying the current event's data):
-          if (SchedulesStateKey.InLock())
-             SchedulesStateKey.Remove();
           // Start new recordings:
           if (cTimer *Timer = Timers->GetMatch(Now)) {
              if (!cRecordControls::Start(Timers, Timer))
@@ -1109,7 +1107,6 @@ int main(int argc, char *argv[])
              else
                 LastTimerChannel = Timer->Channel()->Number();
              TimersModified = true;
-             TriggerRemoteTimerPoll = true;
              }
           // Make sure timers "see" their channel early enough:
           static time_t LastTimerCheck = 0;
@@ -1164,13 +1161,10 @@ int main(int argc, char *argv[])
              LastTimerCheck = Now;
              }
           // Delete expired timers:
-          if (Timers->DeleteExpired()) {
+          if (Timers->DeleteExpired())
              TimersModified = true;
-             TriggerRemoteTimerPoll = true;
-             }
-          // Trigger remote timer polls:
-          if (TriggerRemoteTimerPoll)
-             Timers->TriggerRemoteTimerPoll();
+          // Make sure there is enough free disk space for ongoing recordings:
+          AssertFreeDiskSpace(Timers->GetMaxPriority());
           TimersStateKey.Remove(TimersModified);
         }
         // Recordings:
@@ -1422,12 +1416,6 @@ int main(int argc, char *argv[])
                             DELETE_MENU;
                             cControl::Shutdown();
                             break;
-             case osSwitchDvb:
-                            DELETE_MENU;
-                            cControl::Shutdown();
-                            Skins.QueueMessage(mtInfo, tr("Switching primary DVB..."));
-                            cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
-                            break;
              case osPlugin: DELETE_MENU;
                             Menu = cMenuMain::PluginOsdObject();
                             if (Menu)
@@ -1503,6 +1491,17 @@ int main(int argc, char *argv[])
               }
            }
 
+        // Change primary device:
+        int NewPrimaryDVB = Setup.PrimaryDVB;
+        if (NewPrimaryDVB != OldPrimaryDVB) {
+           DELETE_MENU;
+           cControl::Shutdown();
+           Skins.QueueMessage(mtInfo, tr("Switching primary DVB..."));
+           cOsdProvider::Shutdown();
+           cDevice::SetPrimaryDevice(NewPrimaryDVB);
+           OldPrimaryDVB = NewPrimaryDVB;
+           }
+
         // SIGHUP shall cause a restart:
         if (LastSignal == SIGHUP) {
            if (ShutdownHandler.ConfirmRestart(true) && Interface->Confirm(tr("Press any key to cancel restart"), RESTARTCANCELPROMPT, true))
@@ -1564,8 +1563,7 @@ int main(int argc, char *argv[])
   signal(SIGPIPE, SIG_DFL);
   signal(SIGALRM, SIG_DFL);
 
-  StopSVDRPClientHandler();
-  StopSVDRPServerHandler();
+  StopSVDRPHandler();
   ChannelCamRelations.Save();
   cRecordControls::Shutdown();
   PluginManager.StopPlugins();

From 3f99e6155b66be3ecad049ce929d8d22e07641e2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 19 Mar 2018 14:59:00 +0100
Subject: [PATCH 252/307] vdr-2.3.9-fixsvdrpclientexecute.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303020#post1303020

Unter bestimmten Bedingungen (wohl timingabhängig) kann es vorkommen, dass cSVDRPClient::Process() vorzeitig zurückkehrt, wenn kein 'Response'-Parameter übergeben wurde. Da kann es dann dazu kommen, dass die Antwort "250 OK" auf das "CONN"-Kommando erst nach dem initialen "LSTT" kommt, und damit als Antwort auf "LSTT" gewertet wird, was natürlich falsch ist. Danke an TomJoad für den Bug-Report.

Beiliegender Patch fixt das.
---
 svdrp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/svdrp.c b/svdrp.c
index 4f74c8fdd..79d938f40 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -480,8 +480,11 @@ bool cSVDRPClient::Process(cStringList *Response)
 
 bool cSVDRPClient::Execute(const char *Command, cStringList *Response)
 {
+  cStringList Dummy;
   if (Response)
      Response->Clear();
+  else
+     Response = &Dummy;
   return Send(Command) && Process(Response);
 }
 

From 983ea8e472d9cfc8702599443c1476fc4712911a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 19 Mar 2018 16:43:00 +0100
Subject: [PATCH 253/307] vdr-2.3.9-fixsavecamdata.diff

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303033#post1303033

Wenn VDR wegen eines Fehlers vor dem Laden der Datei 'cam.data' beendet wird, kam es zu einer Fehlermeldung "ERROR (ci.c,3021): (null): Bad address", da der Dateiname noch nicht gesetzt war.

Beiliegender Patch fixt das.
---
 ci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci.c b/ci.c
index 8ad50e43d..091470399 100644
--- a/ci.c
+++ b/ci.c
@@ -2993,6 +2993,8 @@ void cChannelCamRelations::Load(const char *FileName)
 
 void cChannelCamRelations::Save(void)
 {
+  if (!*fileName)
+     return;
   cMutexLock MutexLock(&mutex);
   struct stat st;
   if (stat(fileName, &st) == 0) {

From 43f4b671bdf084e4a7c82dbef6a6e99293b6a9d7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 24 Mar 2018 09:14:00 +0100
Subject: [PATCH 254/307] vdr-2.3.9-fixg++72warnings.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303258#post1303258

g++ 7.2 meckert über einige snprintf()-Aufrufe mit möglicherweise zu kleinen Puffern.

Beiliegender Patch fixt das.
---
 menuitems.c | 10 ++++------
 shutdown.c  |  5 +----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/menuitems.c b/menuitems.c
index 659c1a580..75a4e1e65 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -1062,14 +1062,12 @@ cMenuEditTimeItem::cMenuEditTimeItem(const char *Name, int *Value)
 
 void cMenuEditTimeItem::Set(void)
 {
-  char buf[10];
   switch (pos) {
-    case 1:  snprintf(buf, sizeof(buf), "%01d-:--", hh / 10); break;
-    case 2:  snprintf(buf, sizeof(buf), "%02d:--", hh); break;
-    case 3:  snprintf(buf, sizeof(buf), "%02d:%01d-", hh, mm / 10); break;
-    default: snprintf(buf, sizeof(buf), "%02d:%02d", hh, mm);
+    case 1:  SetValue(cString::sprintf("%01d-:--", hh / 10)); break;
+    case 2:  SetValue(cString::sprintf("%02d:--", hh)); break;
+    case 3:  SetValue(cString::sprintf("%02d:%01d-", hh, mm / 10)); break;
+    default: SetValue(cString::sprintf("%02d:%02d", hh, mm));
     }
-  SetValue(buf);
 }
 
 eOSState cMenuEditTimeItem::ProcessKey(eKeys Key)
diff --git a/shutdown.c b/shutdown.c
index 7b8ff8045..0dda94802 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -69,10 +69,7 @@ bool cCountdown::Update(void)
         timedOut = true;
      if (counter != NewCounter) {
         counter = NewCounter;
-        char time[10];
-        snprintf(time, sizeof(time), "%d:%d0", counter > 0 ? counter / 6 : 0, counter > 0 ? counter % 6 : 0);
-        cString Message = cString::sprintf(message, time);
-        Skins.Message(mtStatus, Message);
+        Skins.Message(mtStatus, cString::sprintf(message, *cString::sprintf("%d:%d0", counter > 0 ? counter / 6 : 0, counter > 0 ? counter % 6 : 0)));
         return true;
         }
      }

From d3f0e252d373f5416195ff6778d16dad63fcac21 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 24 Mar 2018 13:03:00 +0100
Subject: [PATCH 255/307] vdr-2.3.9-fixinitiallistoffset.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303267#post1303267

Beim Öffnen des Recordings-Menüs wurde eine eventuell vom vorherigen Menü gemerkte Aufnahme ganz oben positioniert, anders als vorher, wo sie, wenn möglich, in der Mitte des Menüs stand.

Beiliegender Patch fixt das.
---
 menu.c    | 6 ++++--
 osdbase.c | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/menu.c b/menu.c
index d5300153a..01a9498e1 100644
--- a/menu.c
+++ b/menu.c
@@ -3010,6 +3010,7 @@ void cMenuRecordings::Set(bool Refresh)
      Clear();
      GetRecordingsSortMode(DirectoryName());
      Recordings->Sort();
+     cMenuRecordingItem *CurrentItem = NULL;
      cMenuRecordingItem *LastItem = NULL;
      for (const cRecording *Recording = Recordings->First(); Recording; Recording = Recordings->Next(Recording)) {
          if ((!filter || filter->Filter(Recording)) && (!base || (strstr(Recording->Name(), base) == Recording->Name() && Recording->Name()[strlen(base)] == FOLDERDELIMCHAR))) {
@@ -3035,15 +3036,16 @@ void cMenuRecordings::Set(bool Refresh)
             if (LastItem || LastDir) {
                if (*path) {
                   if (strcmp(path, Recording->Folder()) == 0)
-                     SetCurrent(LastDir ? LastDir : LastItem);
+                     CurrentItem = LastDir ? LastDir : LastItem;
                   }
                else if (CurrentRecording && strcmp(CurrentRecording, Recording->FileName()) == 0)
-                  SetCurrent(LastDir ? LastDir : LastItem);
+                  CurrentItem = LastDir ? LastDir : LastItem;
                }
             if (LastDir)
                LastDir->IncrementCounter(Recording->IsNew());
             }
          }
+     SetCurrent(CurrentItem);
      if (Current() < 0)
         SetCurrent(Get(current)); // last resort, in case the recording was deleted
      SetMenuSortMode(RecordingsSortMode == rsmName ? msmName : msmTime);
diff --git a/osdbase.c b/osdbase.c
index 1720022df..04632b3a5 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -330,7 +330,8 @@ void cOsdMenu::Clear(void)
 {
   if (marked >= 0)
      SetStatus(NULL);
-  lastOffset = (current > first) ? current - first : 0;
+  if (current >= 0)
+     lastOffset = (current > first) ? current - first : 0;
   first = 0;
   current = marked = -1;
   cList<cOsdItem>::Clear();

From 3ecaf4ee812a2b036f332c08cfa011d5ab6e0e1c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 24 Mar 2018 17:24:00 +0100
Subject: [PATCH 256/307] vdr-2.3.9-fixprimarydevicenumber.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303286#post1303286

Fix für den Fehler der hier beschrieben wurde bzgl. Inkonsistenz der Nummer des primären Devices zwischen LSTD und PRIM.
---
 device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.c b/device.c
index a8cb0b558..821fffe67 100644
--- a/device.c
+++ b/device.c
@@ -195,6 +195,7 @@ bool cDevice::SetPrimaryDevice(int n)
      primaryDevice->MakePrimaryDevice(true);
      primaryDevice->SetVideoFormat(Setup.VideoFormat);
      primaryDevice->SetVolumeDevice(Setup.CurrentVolume);
+     Setup.PrimaryDVB = n + 1;
      return true;
      }
   esyslog("ERROR: invalid primary device number: %d", n + 1);

From aa7e646dc1a12d90b7e0efdb73c404032f4a8f7c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 31 Mar 2018 14:46:00 +0200
Subject: [PATCH 257/307] vdr-2.3.9-ignorefutureeventsotherts.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303547#post1303547

Als (evtl. vorläufigen) Fix für das hier beschriebene Problem mit fehlerhaften EIT-Daten werde ich noch beliegenden Patch in die finale Version 2.4.0 mit aufnehmen.
---
 eit.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eit.c b/eit.c
index 688725251..42f82de03 100644
--- a/eit.c
+++ b/eit.c
@@ -388,7 +388,8 @@ time_t cEitFilter::disableUntil = 0;
 
 cEitFilter::cEitFilter(void)
 {
-  Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X)
+//Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X) // TODO: remove later
+  Set(0x12, 0x40, 0xE0);  // event info now&next actual/other TS (0x4E/0x4F), future actual TS (0x5X)
   Set(0x14, 0x70);        // TDT
 }
 
@@ -415,7 +416,8 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      }
   switch (Pid) {
     case 0x12: {
-         if (Tid >= 0x4E && Tid <= 0x6F)
+       //if (Tid >= 0x4E && Tid <= 0x6F) // TODO: remove later
+         if (Tid == 0x4E || Tid >= 0x50 && Tid <= 0x5F)
             cEIT EIT(sectionSyncerHash, Source(), Tid, Data);
          }
          break;

From 654780018735cad4d5af7868a8a6b2e860005061 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 3 Apr 2018 08:10:00 +0200
Subject: [PATCH 258/307] vdr-2.3.9-fixprogressdisplay.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303673#post1303673

Beiliegender Patch fixt das von Oliver Endriss auf der VDR-ML unter "[vdr 2.3.9] Setting a mark is sluggish" gemeldete Problem mit dem "zähen" Setzen von Schnittmarken sowie der springenden Fortschrittsanzeige bei sehr kurzen Aufnahmen.

Bitte ausführlich testen mit allen verfügbaren Ausgabe-Devices sowie Skins!
---
 menu.c | 64 +++++++++++++++++++++++++---------------------------------
 menu.h |  1 -
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/menu.c b/menu.c
index 01a9498e1..86c131e2a 100644
--- a/menu.c
+++ b/menu.c
@@ -5564,7 +5564,6 @@ cReplayControl::cReplayControl(bool PauseLive)
   lastPlay = lastForward = false;
   lastSpeed = -2; // an invalid value
   timeoutShow = 0;
-  lastProgressUpdate = 0;
   timeSearchActive = false;
   cRecording Recording(fileName);
   cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
@@ -5728,43 +5727,36 @@ void cReplayControl::ShowMode(void)
 bool cReplayControl::ShowProgress(bool Initial)
 {
   int Current, Total;
-  if (Initial || lastSpeed != -1 || time(NULL) - lastProgressUpdate >= 1) {
-     if (GetFrameNumber(Current, Total) && Total > 0) {
-        if (!visible) {
-           displayReplay = Skins.Current()->DisplayReplay(modeOnly);
-           displayReplay->SetMarks(&marks);
-           SetNeedsFastResponse(true);
-           visible = true;
-           }
-        if (Initial) {
-           if (*fileName) {
-              LOCK_RECORDINGS_READ;
-              if (const cRecording *Recording = Recordings->GetByName(fileName))
-                 displayReplay->SetRecording(Recording);
-              }
-           lastCurrent = lastTotal = -1;
+  if (GetFrameNumber(Current, Total) && Total > 0) {
+     if (!visible) {
+        displayReplay = Skins.Current()->DisplayReplay(modeOnly);
+        displayReplay->SetMarks(&marks);
+        SetNeedsFastResponse(true);
+        visible = true;
+        }
+     if (Initial) {
+        if (*fileName) {
+           LOCK_RECORDINGS_READ;
+           if (const cRecording *Recording = Recordings->GetByName(fileName))
+              displayReplay->SetRecording(Recording);
            }
-        if (Current != lastCurrent || Total != lastTotal) {
-           time(&lastProgressUpdate);
-           if (Setup.ShowRemainingTime || Total != lastTotal) {
-              int Index = Total;
-              if (Setup.ShowRemainingTime)
-                 Index = Current - Index;
-              displayReplay->SetTotal(IndexToHMSF(Index, false, FramesPerSecond()));
-              if (!Initial)
-                 displayReplay->Flush();
-              }
-           displayReplay->SetProgress(Current, Total);
-           if (!Initial)
-              displayReplay->Flush();
-           displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames, FramesPerSecond()));
-           displayReplay->Flush();
-           lastCurrent = Current;
+        lastCurrent = lastTotal = -1;
+        }
+     if (Current != lastCurrent || Total != lastTotal) {
+        if (Setup.ShowRemainingTime || Total != lastTotal) {
+           int Index = Total;
+           if (Setup.ShowRemainingTime)
+              Index = Current - Index;
+           displayReplay->SetTotal(IndexToHMSF(Index, false, FramesPerSecond()));
            }
-        lastTotal = Total;
-        ShowMode();
-        return true;
+        displayReplay->SetProgress(Current, Total);
+        displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames, FramesPerSecond()));
+        displayReplay->Flush();
+        lastCurrent = Current;
         }
+     lastTotal = Total;
+     ShowMode();
+     return true;
      }
   return false;
 }
@@ -6007,8 +5999,6 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
      return osEnd;
   if (Key == kNone && !marksModified)
      marks.Update();
-  if (Key != kNone)
-     lastProgressUpdate = 0;
   if (visible) {
      if (timeoutShow && time(NULL) > timeoutShow) {
         Hide();
diff --git a/menu.h b/menu.h
index 08c51f7ac..84247ed40 100644
--- a/menu.h
+++ b/menu.h
@@ -300,7 +300,6 @@ class cReplayControl : public cDvbPlayerControl {
   bool lastPlay, lastForward;
   int lastSpeed;
   time_t timeoutShow;
-  time_t lastProgressUpdate;
   bool timeSearchActive, timeSearchHide;
   int timeSearchTime, timeSearchPos;
   void TimeSearchDisplay(void);

From 7a784e8b4284dd3bbfcecc44692ea9471104d089 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Thu, 5 Apr 2018 15:26:00 +0200
Subject: [PATCH 259/307] vdr-2.3.9-fixschedulemenuupdate.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303808#post1303808

Wenn man im Schedule-Menü einen Timer editiert für einen Event, der kein VPS hat, und dann den Cursor auf den darunter- oder darüberliegenden Event bewegt, der mit 't' markiert ist und dort mit "Red" auch einen Timer setzt, dann wird der Event unter Umständen nicht sofort auf 'T' gesetzt und es kann dazu kommen, dass ein weiterer Druck auf "Red" einen zweiten, doppelten Timer anlegt.

Beiliegender Patch fixt das.
---
 menu.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/menu.c b/menu.c
index 86c131e2a..34e456c04 100644
--- a/menu.c
+++ b/menu.c
@@ -1691,10 +1691,13 @@ eOSState cMenuWhatsOn::Record(void)
         Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
      if (HasSubMenu())
         CloseSubMenu();
-     if (Update())
-        Display();
-     SetHelpKeys(Channels);
      }
+  if (Update()) {
+     LOCK_SCHEDULES_READ;
+     Display();
+     }
+  LOCK_CHANNELS_READ;
+  SetHelpKeys(Channels);
   return osContinue;
 }
 
@@ -1999,10 +2002,12 @@ eOSState cMenuSchedule::Record(void)
         Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll);
      if (HasSubMenu())
         CloseSubMenu();
-     if (Update())
-        Display();
-     SetHelpKeys();
      }
+  if (Update()) {
+     LOCK_SCHEDULES_READ;
+     Display();
+     }
+  SetHelpKeys();
   return osContinue;
 }
 

From 74eff2016830c24ecd52ab25f0f8048ee590e9da Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 9 Apr 2018 10:16:00 +0200
Subject: [PATCH 260/307] vdr-2.3.9-fixbitmapscaling.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303966#post1303966

Wenn man VDR in einem Fenster laufen lässt und Untertitel angezeigt werden, und man dieses Fenster sehr klein macht, kannes passieren, dass VDR mit einer "division by zero" abstürzt, weil die skalierte Bitmap zu klein wird.

Beiliegender Patch fixt das.
---
 osd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osd.c b/osd.c
index d29a2c410..ce4eb27d1 100644
--- a/osd.c
+++ b/osd.c
@@ -839,7 +839,9 @@ cBitmap *cBitmap::Scaled(double FactorX, double FactorY, bool AntiAlias) const
 {
   // Fixed point scaling code based on www.inversereality.org/files/bitmapscaling.pdf
   // by deltener@mindtremors.com
-  cBitmap *b = new cBitmap(int(round(Width() * FactorX)), int(round(Height() * FactorY)), Bpp(), X0(), Y0());
+  int w = max(1, int(round(Width() * FactorX)));
+  int h = max(1, int(round(Height() * FactorY)));
+  cBitmap *b = new cBitmap(w, h, Bpp(), X0(), Y0());
   int RatioX = (Width() << 16) / b->Width();
   int RatioY = (Height() << 16) / b->Height();
   if (!AntiAlias || FactorX <= 1.0 && FactorY <= 1.0) {

From 571d1753c385a6805c2a8eec800fb861bf3dcf8d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 9 Apr 2018 10:26:00 +0200
Subject: [PATCH 261/307] vdr-2.3.9-addmissinginitosdstate.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1303967#post1303967

In cDisplayChannel::cDisplayChannel(eKeys FirstKey) wurde osdState nicht initialisiert. Dadurch konnte es dazu kommen, dass die Kanalanzeige unnötigerweise erneut aufgebaut wurde. Eine Absturzgefahr bestand aber zu keiner Zeit ;-).

Beiliegender Patch fixt das.
---
 menu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/menu.c b/menu.c
index 34e456c04..74ffcc702 100644
--- a/menu.c
+++ b/menu.c
@@ -4644,6 +4644,7 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   number = 0;
   timeout = true;
   lastPresent = lastFollowing = NULL;
+  cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
   lastTime.Set();
   withInfo = Setup.ShowInfoOnChSwitch;
   displayChannel = Skins.Current()->DisplayChannel(withInfo);

From fd609e72da594f4850bb0bd460c8ae442b8f78d1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 14 Apr 2018 11:56:00 +0200
Subject: [PATCH 262/307] vdr-2.3.9-fixhighloadprogressdisplay.diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.vdr-portal.de/forum/index.php?thread/131711-vdr-2-3-9-fixes/&postID=1304163#post1304163

Was wäre die Freigabe einer stabilen Version ohne einen "last minute patch"!? ;-)

Mir wurde berichtet, dass bei der Wiedergabe mit aktiver Fortschrittsanzeige die CPU-Last recht hoch ist im Vergleich zur Version 2.2.0. Der beiliegende Patch sorgt dafür, dass die Anzeige nicht öfter als alle 100ms aufgefrischt wird. Das reduziert die CPU-Last hier bei mir deutlich, und ich kann keine negativen Seiteneffekte erkennen.
---
 menu.c | 4 ++++
 menu.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/menu.c b/menu.c
index 74ffcc702..943198fad 100644
--- a/menu.c
+++ b/menu.c
@@ -45,6 +45,7 @@
 #define MAXWAITFORCAMMENU  10 // seconds to wait for the CAM menu to open
 #define CAMMENURETRYTIMEOUT 3 // seconds after which opening the CAM menu is retried
 #define CAMRESPONSETIMEOUT  5 // seconds to wait for a response from a CAM
+#define PROGRESSTIMEOUT   100 // milliseconds to wait before updating the replay progress display
 #define MINFREEDISK       300 // minimum free disk space (in MB) required to start recording
 #define NODISKSPACEDELTA  300 // seconds between "Not enough disk space to start recording!" messages
 #define MAXCHNAMWIDTH      16 // maximum number of characters of channels' short names shown in schedules menus
@@ -5733,6 +5734,8 @@ void cReplayControl::ShowMode(void)
 bool cReplayControl::ShowProgress(bool Initial)
 {
   int Current, Total;
+  if (!(Initial || updateTimer.TimedOut()))
+     return visible;
   if (GetFrameNumber(Current, Total) && Total > 0) {
      if (!visible) {
         displayReplay = Skins.Current()->DisplayReplay(modeOnly);
@@ -5762,6 +5765,7 @@ bool cReplayControl::ShowProgress(bool Initial)
         }
      lastTotal = Total;
      ShowMode();
+     updateTimer.Set(PROGRESSTIMEOUT);
      return true;
      }
   return false;
diff --git a/menu.h b/menu.h
index 84247ed40..3c7b2c6d8 100644
--- a/menu.h
+++ b/menu.h
@@ -300,6 +300,7 @@ class cReplayControl : public cDvbPlayerControl {
   bool lastPlay, lastForward;
   int lastSpeed;
   time_t timeoutShow;
+  cTimeMs updateTimer;
   bool timeSearchActive, timeSearchHide;
   int timeSearchTime, timeSearchPos;
   void TimeSearchDisplay(void);

From 477b628ab88f92599b84b7acf52f6364cd4c616f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 15 Apr 2018 11:37:16 +0200
Subject: [PATCH 263/307] Version 2.4.0

VDR version 2.4.0 is now available at

      ftp://ftp.tvdr.de/vdr/vdr-2.4.0.tar.bz2

A 'diff' against the previous version is available at

      ftp://ftp.tvdr.de/vdr/Developer/vdr-2.3.9-2.4.0.diff

MD5 checksums:

12c6a3abeadfa915fcfe736bb047a3ab  vdr-2.4.0.tar.bz2
6d98c2d619e82f3d4503146602fccde7  vdr-2.3.9-2.4.0.diff

A summary of all the major changes since the last stable version 2.2.0 can be found at

     http://www.tvdr.de/changelog.htm

When updating from an earlier version of VDR please make sure you read the INSTALL
and MANUAL files that come with the VDR source _before_ doing so!
Please make sure you have backup copies of all your configuration files,
and verify carefully that your timers will be set to the correct channels
after switching to this new version.

Thanks to the many people who have contributed in the making, testing and
debugging of this new version of VDR, and also to all users who just
enjoy VDR!
---
 CONTRIBUTORS                          |  11 ++
 HISTORY                               |  31 ++++
 INSTALL                               |   8 +-
 MANUAL                                |   2 +-
 PLUGINS.html                          |   4 +-
 PLUGINS/src/epgtableid0/HISTORY       |   4 +
 PLUGINS/src/epgtableid0/epgtableid0.c |   4 +-
 PLUGINS/src/hello/HISTORY             |   5 +
 PLUGINS/src/hello/hello.c             |   4 +-
 PLUGINS/src/hello/po/ca_ES.po         |   4 +-
 PLUGINS/src/hello/po/cs_CZ.po         |   4 +-
 PLUGINS/src/hello/po/da_DK.po         |   4 +-
 PLUGINS/src/hello/po/de_DE.po         |   4 +-
 PLUGINS/src/hello/po/el_GR.po         |   4 +-
 PLUGINS/src/hello/po/es_ES.po         |   4 +-
 PLUGINS/src/hello/po/et_EE.po         |   4 +-
 PLUGINS/src/hello/po/fi_FI.po         |   4 +-
 PLUGINS/src/hello/po/fr_FR.po         |  21 +--
 PLUGINS/src/hello/po/hr_HR.po         |   4 +-
 PLUGINS/src/hello/po/hu_HU.po         |   4 +-
 PLUGINS/src/hello/po/it_IT.po         |   4 +-
 PLUGINS/src/hello/po/lt_LT.po         |   4 +-
 PLUGINS/src/hello/po/nl_NL.po         |   4 +-
 PLUGINS/src/hello/po/nn_NO.po         |   4 +-
 PLUGINS/src/hello/po/pl_PL.po         |   4 +-
 PLUGINS/src/hello/po/pt_PT.po         |   4 +-
 PLUGINS/src/hello/po/ro_RO.po         |   4 +-
 PLUGINS/src/hello/po/ru_RU.po         |   4 +-
 PLUGINS/src/hello/po/sk_SK.po         |   4 +-
 PLUGINS/src/hello/po/sl_SI.po         |   4 +-
 PLUGINS/src/hello/po/sv_SE.po         |   4 +-
 PLUGINS/src/hello/po/tr_TR.po         |   4 +-
 PLUGINS/src/hello/po/zh_CN.po         |   4 +-
 PLUGINS/src/osddemo/HISTORY           |   4 +
 PLUGINS/src/osddemo/osddemo.c         |   4 +-
 PLUGINS/src/pictures/HISTORY          |   4 +
 PLUGINS/src/pictures/pictures.c       |   4 +-
 PLUGINS/src/pictures/po/de_DE.po      |   4 +-
 PLUGINS/src/pictures/po/et_EE.po      |   4 +-
 PLUGINS/src/pictures/po/fi_FI.po      |   4 +-
 PLUGINS/src/pictures/po/fr_FR.po      |   4 +-
 PLUGINS/src/pictures/po/it_IT.po      |   4 +-
 PLUGINS/src/pictures/po/lt_LT.po      |   4 +-
 PLUGINS/src/pictures/po/pl_PL.po      |   4 +-
 PLUGINS/src/pictures/po/ru_RU.po      |   4 +-
 PLUGINS/src/pictures/po/sk_SK.po      |   4 +-
 PLUGINS/src/servicedemo/HISTORY       |   4 +
 PLUGINS/src/servicedemo/svccli.c      |   4 +-
 PLUGINS/src/servicedemo/svcsvr.c      |   4 +-
 PLUGINS/src/skincurses/HISTORY        |   4 +
 PLUGINS/src/skincurses/po/de_DE.po    |   4 +-
 PLUGINS/src/skincurses/po/et_EE.po    |   4 +-
 PLUGINS/src/skincurses/po/fi_FI.po    |   4 +-
 PLUGINS/src/skincurses/po/it_IT.po    |   4 +-
 PLUGINS/src/skincurses/po/lt_LT.po    |   4 +-
 PLUGINS/src/skincurses/po/pl_PL.po    |   4 +-
 PLUGINS/src/skincurses/po/ru_RU.po    |   4 +-
 PLUGINS/src/skincurses/po/sk_SK.po    |   4 +-
 PLUGINS/src/skincurses/skincurses.c   |   4 +-
 PLUGINS/src/status/HISTORY            |   4 +
 PLUGINS/src/status/status.c           |   4 +-
 PLUGINS/src/svdrpdemo/HISTORY         |   4 +
 PLUGINS/src/svdrpdemo/svdrpdemo.c     |   4 +-
 UPDATE-2.4.0                          |   2 +
 channels.conf                         | 229 +++++++++++++++++---------
 ci.c                                  |   2 +-
 config.h                              |  10 +-
 device.c                              |   2 +-
 eit.c                                 |   2 +-
 menu.c                                |   2 +-
 menu.h                                |   2 +-
 menuitems.c                           |   2 +-
 osd.c                                 |   2 +-
 osdbase.c                             |   2 +-
 peerdemo                              |   3 +-
 po/ar.po                              |   4 +-
 po/ca_ES.po                           |   4 +-
 po/cs_CZ.po                           |   4 +-
 po/da_DK.po                           |   4 +-
 po/de_DE.po                           |   4 +-
 po/el_GR.po                           |   4 +-
 po/es_ES.po                           |   4 +-
 po/et_EE.po                           |   4 +-
 po/fi_FI.po                           |  10 +-
 po/fr_FR.po                           |  52 +++---
 po/hr_HR.po                           |   4 +-
 po/hu_HU.po                           |  54 +++---
 po/it_IT.po                           |  16 +-
 po/lt_LT.po                           |   4 +-
 po/mk_MK.po                           |  57 +++----
 po/nl_NL.po                           |   4 +-
 po/nn_NO.po                           |   4 +-
 po/pl_PL.po                           |   4 +-
 po/pt_PT.po                           |   4 +-
 po/ro_RO.po                           |   4 +-
 po/ru_RU.po                           |   4 +-
 po/sk_SK.po                           |   4 +-
 po/sl_SI.po                           |   4 +-
 po/sr_RS.po                           |   4 +-
 po/sv_SE.po                           |   4 +-
 po/tr_TR.po                           |   4 +-
 po/uk_UA.po                           |  56 +++----
 po/zh_CN.po                           |   4 +-
 shutdown.c                            |   2 +-
 svdrp.c                               |   2 +-
 svdrpsend.1                           |   2 +-
 vdr.1                                 |   8 +-
 vdr.5                                 |   8 +-
 vdr.c                                 |   4 +-
 109 files changed, 541 insertions(+), 384 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a906532db..4fb011f98 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -716,6 +716,8 @@ Oliver Endriss <o.endriss@gmx.de>
  channels
  for fixing a possible stack overflow in cListBase::Sort()
  for reporting a crash when deleting a recording
+ for reporting a problem with sluggish setting of editing marks and a jumping progress
+ display with very short recordings
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -1201,6 +1203,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for suggesting to change the naming of "binary skip mode" to "adaptive skip mode"
  for adding a Status parameter to the interface of cDevice::SignalStats() and
  cDvbDevice::SignalStats()
+ for reporting a possible crash when scaling bitmaps with very small factors
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -2265,6 +2268,8 @@ Javier Fern
 J�rgen Schneider <ivory7@gmx.de>
  for a patch that was used as a base to fix handling multi byte key sequences
  in cKbdRemote
+ for reporting a possible discrepancy of the primary device number in the LSTD and
+ PRIM commands
 
 Christian Wieninger <cwieninger@gmx.de>
  for suggesting to add cMenuEditStrItem::InEditMode()
@@ -2630,6 +2635,8 @@ J
  for reporting a possible deadlock when quickly zapping through encrypted channels
  for a patch that was used to implement cStatus::MarksModified()
  for suggesting to no longer log unaligned marks in cMarks::Align()
+ for reporting some warnings from g++ 7.2.0 regarding fixed buffer sizes in
+ cMenuEditTimeItem::Set() and cCountdown::Update()
 
 Peter Pinnau <vdr@unterbrecher.de>
  for reporting that 'uint32_t' requires including stdint.h in font.h on some systems
@@ -2845,6 +2852,8 @@ Johann Friedrichs <johann.friedrichs@web.de>
  for fixing handling timers during the change from DST to winter time
  for fixing a possible crash with plugins that retrieve player information after a
  replay has been stopped, but before the replay control has been destroyed
+ for reporting a problem in processing SVDRP client responses in case the caller doesn't
+ want the actual response strings
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -3304,6 +3313,8 @@ Matthias Senzel <matthias.senzel@t-online.de>
  lock is held while the error message is displayed
  for reporting that the info of a newly edited recording was not available immediately
  after starting the editing process
+ for reporting a problem with setting the initial offset of the cursor in a list menu
+ for reporting a high CPU load during replay with active progress display
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index 2611da688..d477dd588 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9316,3 +9316,34 @@ Video Disk Recorder Revision History
   SatelliteDeliverySystemDescriptor or TerrestrialDeliverySystemDescriptor, respectively.
 - Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting
   the user.
+
+2018-04-15: Version 2.4.0
+
+- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Fixed processing SVDRP client responses in case the caller doesn't want the actual
+  response strings (reported by Johann Friedrichs).
+- Fixed (not) saving the 'cam.data' file in case VDR stops early during startup due to
+  some error.
+- Fixed some warnings from g++ 7.2.0 regarding fixed buffer sizes in cMenuEditTimeItem::Set()
+  and cCountdown::Update() (reported by J�rg Wendel).
+- Fixed a possible discrepancy of the primary device number in the LSTD and PRIM
+  commands, by setting Setup.PrimaryDVB in cDevice::SetPrimaryDevice() (reported by
+  J�rgen Schneider).
+- Fixed setting the initial offset of the cursor in a list menu (reported by Matthias
+  Senzel).
+- The EIT filter no longer parses data from "other TS", to avoid problems with
+  broadcasters who transmit faulty EIT data.
+- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed sluggish setting of editing marks and a jumping progress display with very
+  short recordings (reported by Oliver Endriss).
+- Fixed updating the Schedule menu after editing a timer.
+- Fixed scaling bitmaps with very small factors (reported by Rolf Ahrenberg).
+- Added a missing initialization of osdState in cDisplayChannel::cDisplayChannel(eKeys
+  FirstKey).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Updated the Hungarian OSD texts (thanks to Istv�n F�ley).
+- Updated the French OSD texts (thanks to Bernard Jaulin).
+- Fixed a high CPU load during replay with active progress display (reported by Matthias
+  Senzel).
+- Official release.
diff --git a/INSTALL b/INSTALL
index e75c0385a..1abed8f83 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
-Version 2.2
+Version 2.4
 -----------
 
 Compiling and running the program:
@@ -47,9 +47,9 @@ By default the 'vdr' program can be controlled via the PC keyboard.
 If you want to disable control via the keyboard, you can add NO_KBD=1
 to the 'make' call, or use the '--no-kbd' option at runtime.
 
-If you have an infrared remote control unit you can define the REMOTE macro
-to one of the following values in the 'make' call to make the respective control
-the default:
+If you have a LIRC compatible infrared remote control receiver you can define
+the REMOTE macro to one of the following values in the 'make' call to make
+the respective control the default:
 
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
diff --git a/MANUAL b/MANUAL
index 4020fe3e0..1086add63 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,7 +1,7 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
-Version 2.2
+Version 2.4
 -----------
 
 * Remote Control Keys
diff --git a/PLUGINS.html b/PLUGINS.html
index fb6ff2aa5..7e9bc286d 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -31,9 +31,9 @@
 <div class="center">
 <h1>The VDR Plugin System</h1>
 
-<b>Version 2.2</b>
+<b>Version 2.4</b>
 <p>
-Copyright &copy; 2015 Klaus Schmidinger<br>
+Copyright &copy; 2018 Klaus Schmidinger<br>
 <a href="mailto:vdr@tvdr.de">vdr@tvdr.de</a><br>
 <a href="http://www.tvdr.de">www.tvdr.de</a>
 </div>
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index ed15392e2..3b871a00e 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -24,3 +24,7 @@ VDR Plugin 'epgtableid0' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index 79960ae96..aac181829 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 4.0 2015/02/17 13:12:18 kls Exp $
+ * $Id: epgtableid0.c 4.1 2018/04/10 13:00:18 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index a2a8de326..0d4c8f4f1 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -94,3 +94,8 @@ VDR Plugin 'hello' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2018-04-15: Version 2.4.0
+
+- Updated the French OSD texts (thanks to Bernard Jaulin).
+- Official release.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 2d686cd88..66ae7224f 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 4.0 2015/02/17 13:12:26 kls Exp $
+ * $Id: hello.c 4.1 2018/04/10 13:00:22 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/hello/po/ca_ES.po b/PLUGINS/src/hello/po/ca_ES.po
index 9da8d0f2b..e72baed51 100644
--- a/PLUGINS/src/hello/po/ca_ES.po
+++ b/PLUGINS/src/hello/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/cs_CZ.po b/PLUGINS/src/hello/po/cs_CZ.po
index d26023ac2..e4aea2976 100644
--- a/PLUGINS/src/hello/po/cs_CZ.po
+++ b/PLUGINS/src/hello/po/cs_CZ.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/da_DK.po b/PLUGINS/src/hello/po/da_DK.po
index 62997e9b4..6ad15ebae 100644
--- a/PLUGINS/src/hello/po/da_DK.po
+++ b/PLUGINS/src/hello/po/da_DK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/de_DE.po b/PLUGINS/src/hello/po/de_DE.po
index 657ff1daa..21c8d89bc 100644
--- a/PLUGINS/src/hello/po/de_DE.po
+++ b/PLUGINS/src/hello/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2000
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/el_GR.po b/PLUGINS/src/hello/po/el_GR.po
index ab715cd3a..df68a27cd 100644
--- a/PLUGINS/src/hello/po/el_GR.po
+++ b/PLUGINS/src/hello/po/el_GR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/es_ES.po b/PLUGINS/src/hello/po/es_ES.po
index 8ac0575e0..9dc1da2db 100644
--- a/PLUGINS/src/hello/po/es_ES.po
+++ b/PLUGINS/src/hello/po/es_ES.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/et_EE.po b/PLUGINS/src/hello/po/et_EE.po
index d440c9684..1cf72f73d 100644
--- a/PLUGINS/src/hello/po/et_EE.po
+++ b/PLUGINS/src/hello/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2004, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/fi_FI.po b/PLUGINS/src/hello/po/fi_FI.po
index 8172242aa..0cc08bcc9 100644
--- a/PLUGINS/src/hello/po/fi_FI.po
+++ b/PLUGINS/src/hello/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/fr_FR.po b/PLUGINS/src/hello/po/fr_FR.po
index 6e87788a1..529d8a2f5 100644
--- a/PLUGINS/src/hello/po/fr_FR.po
+++ b/PLUGINS/src/hello/po/fr_FR.po
@@ -1,18 +1,19 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003
 # Gregoire Favre <greg@magma.unil.ch>, 2003
 # Nicolas Huillard <nhuillard@e-dition.fr>, 2005
+# Bernard Jaulin <bernard.jaulin@gmail.com>, 2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
-"PO-Revision-Date: 2007-08-11 12:34+0200\n"
-"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
+"PO-Revision-Date: 2018-04-14 8:34+0200\n"
+"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +21,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr ""
+msgstr "Bien le bonjour"
 
 msgid "Hello"
-msgstr ""
+msgstr "Hello"
 
 msgid "Greeting time (s)"
-msgstr ""
+msgstr "Durée pour le salut (s)"
 
 msgid "Use alternate greeting"
-msgstr ""
+msgstr "Changer de salutation"
 
 msgid "Howdy folks!"
-msgstr ""
+msgstr "Bonjour à tous !"
 
 msgid "Hello world!"
-msgstr ""
+msgstr "Bonjour le monde !"
diff --git a/PLUGINS/src/hello/po/hr_HR.po b/PLUGINS/src/hello/po/hr_HR.po
index f06da860a..c9bc41d89 100644
--- a/PLUGINS/src/hello/po/hr_HR.po
+++ b/PLUGINS/src/hello/po/hr_HR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Adrian Caval <anrxc@sysphere.org>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-03-17 19:52+0100\n"
diff --git a/PLUGINS/src/hello/po/hu_HU.po b/PLUGINS/src/hello/po/hu_HU.po
index 781714eff..aefbf6266 100644
--- a/PLUGINS/src/hello/po/hu_HU.po
+++ b/PLUGINS/src/hello/po/hu_HU.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002
 # Guido Josten <guido.josten@t-online.de>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/it_IT.po b/PLUGINS/src/hello/po/it_IT.po
index d9139d430..d9865dafb 100644
--- a/PLUGINS/src/hello/po/it_IT.po
+++ b/PLUGINS/src/hello/po/it_IT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-01-27 20:11+0100\n"
diff --git a/PLUGINS/src/hello/po/lt_LT.po b/PLUGINS/src/hello/po/lt_LT.po
index a95eb6a5d..6c3112172 100644
--- a/PLUGINS/src/hello/po/lt_LT.po
+++ b/PLUGINS/src/hello/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-12-08 12:18+0200\n"
diff --git a/PLUGINS/src/hello/po/nl_NL.po b/PLUGINS/src/hello/po/nl_NL.po
index 3853fc393..5460d95c5 100644
--- a/PLUGINS/src/hello/po/nl_NL.po
+++ b/PLUGINS/src/hello/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/nn_NO.po b/PLUGINS/src/hello/po/nn_NO.po
index d35b088e0..2c4a532c7 100644
--- a/PLUGINS/src/hello/po/nn_NO.po
+++ b/PLUGINS/src/hello/po/nn_NO.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/pl_PL.po b/PLUGINS/src/hello/po/pl_PL.po
index 71c152ecf..c6d8dcf9a 100644
--- a/PLUGINS/src/hello/po/pl_PL.po
+++ b/PLUGINS/src/hello/po/pl_PL.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002
 # Tomasz Maciej Nowak <tmn505@gmail.com>, 2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2018-02-19 00:41+0100\n"
diff --git a/PLUGINS/src/hello/po/pt_PT.po b/PLUGINS/src/hello/po/pt_PT.po
index f553d6e56..2ca3bc530 100644
--- a/PLUGINS/src/hello/po/pt_PT.po
+++ b/PLUGINS/src/hello/po/pt_PT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/ro_RO.po b/PLUGINS/src/hello/po/ro_RO.po
index c32157e49..516c8f453 100644
--- a/PLUGINS/src/hello/po/ro_RO.po
+++ b/PLUGINS/src/hello/po/ro_RO.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/ru_RU.po b/PLUGINS/src/hello/po/ru_RU.po
index 24ece731c..b5b262b9f 100644
--- a/PLUGINS/src/hello/po/ru_RU.po
+++ b/PLUGINS/src/hello/po/ru_RU.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/sk_SK.po b/PLUGINS/src/hello/po/sk_SK.po
index d3ae33338..02bed79c2 100644
--- a/PLUGINS/src/hello/po/sk_SK.po
+++ b/PLUGINS/src/hello/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladim�r B�rta <vladimir.barta@k2atmitec.cz>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-09-30 09:48+0100\n"
diff --git a/PLUGINS/src/hello/po/sl_SI.po b/PLUGINS/src/hello/po/sl_SI.po
index 7db6c5f81..a4246b952 100644
--- a/PLUGINS/src/hello/po/sl_SI.po
+++ b/PLUGINS/src/hello/po/sl_SI.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/sv_SE.po b/PLUGINS/src/hello/po/sv_SE.po
index 4b550ac29..494906f67 100644
--- a/PLUGINS/src/hello/po/sv_SE.po
+++ b/PLUGINS/src/hello/po/sv_SE.po
@@ -1,12 +1,12 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
diff --git a/PLUGINS/src/hello/po/tr_TR.po b/PLUGINS/src/hello/po/tr_TR.po
index 09492f319..fd4fe1018 100644
--- a/PLUGINS/src/hello/po/tr_TR.po
+++ b/PLUGINS/src/hello/po/tr_TR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2008-05-12 22:34:4800\n"
diff --git a/PLUGINS/src/hello/po/zh_CN.po b/PLUGINS/src/hello/po/zh_CN.po
index 3ed53c2fd..bbcce3837 100644
--- a/PLUGINS/src/hello/po/zh_CN.po
+++ b/PLUGINS/src/hello/po/zh_CN.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-hello 2.2.0\n"
+"Project-Id-Version: vdr-hello 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 14:04+0100\n"
 "PO-Revision-Date: 2009-01-23 09:48+0800\n"
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 099ca7589..6dc2839dd 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -79,3 +79,7 @@ VDR Plugin 'osddemo' Revision History
 - Fixed a vertical black line in the "TiledPixmaps" area on the rpihddevice OSD with
   1280x800 pixel (thanks to Thomas Reufer).
 - Added a demo case for storing images (thanks to Thomas Reufer).
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 89fd69542..29aa421e1 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 4.3 2015/04/12 09:35:21 kls Exp $
+ * $Id: osddemo.c 4.4 2018/04/10 13:00:27 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.3.1";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 08fabb1ec..3f6d3958d 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -108,3 +108,7 @@ VDR Plugin 'pictures' Revision History
 
 - Adapted the pic2mpg script to new ffmpeg options.
 - No longer using 'convert' to scale/rotate the pictures.
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 430ebe28c..ac8c355b9 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 4.2 2017/10/06 15:10:44 kls Exp $
+ * $Id: pictures.c 4.3 2018/04/10 13:00:42 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "2.3.2";
+static const char *VERSION       = "2.4.0";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index 92e22af97..824ec8569 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/et_EE.po b/PLUGINS/src/pictures/po/et_EE.po
index 45b12b1d3..64db961d2 100644
--- a/PLUGINS/src/pictures/po/et_EE.po
+++ b/PLUGINS/src/pictures/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index 248ece2d7..11960a231 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 3b887560b..20f56c7af 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Patrice Staudt <ipatrice.staudt@laposte.net>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-12 17:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index a49659e93..9ea3921b7 100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-01-27 20:22+0100\n"
diff --git a/PLUGINS/src/pictures/po/lt_LT.po b/PLUGINS/src/pictures/po/lt_LT.po
index 7a9f7781a..8cc230bd0 100644
--- a/PLUGINS/src/pictures/po/lt_LT.po
+++ b/PLUGINS/src/pictures/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2009-12-08 12:41+0100\n"
diff --git a/PLUGINS/src/pictures/po/pl_PL.po b/PLUGINS/src/pictures/po/pl_PL.po
index 2d0de10a1..1f7a95e81 100644
--- a/PLUGINS/src/pictures/po/pl_PL.po
+++ b/PLUGINS/src/pictures/po/pl_PL.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomasz Maciej Nowak <tmn505@gmail.com>, 2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2018-02-19 00:48+0100\n"
 "PO-Revision-Date: 2018-02-19 00:53+0100\n"
diff --git a/PLUGINS/src/pictures/po/ru_RU.po b/PLUGINS/src/pictures/po/ru_RU.po
index 9f6b8df48..30a5acf33 100644
--- a/PLUGINS/src/pictures/po/ru_RU.po
+++ b/PLUGINS/src/pictures/po/ru_RU.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2008-03-14 00:45+0100\n"
diff --git a/PLUGINS/src/pictures/po/sk_SK.po b/PLUGINS/src/pictures/po/sk_SK.po
index 77db92acc..b07da6188 100644
--- a/PLUGINS/src/pictures/po/sk_SK.po
+++ b/PLUGINS/src/pictures/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-pictures 2.2.0\n"
+"Project-Id-Version: vdr-pictures 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-12-18 12:57+0100\n"
 "PO-Revision-Date: 2009-09-30 12:54+0100\n"
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 30ad5fef2..427191470 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -29,3 +29,7 @@ VDR Plugin 'servicedemo' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 201cf26a0..e9046b4ef 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 4.0 2015/02/17 13:13:05 kls Exp $
+ * $Id: svccli.c 4.1 2018/04/10 13:00:53 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 3876d4659..a7e653dae 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 4.0 2015/02/17 13:13:09 kls Exp $
+ * $Id: svcsvr.c 4.1 2018/04/10 13:00:57 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 2a2bccb05..287653f35 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -137,3 +137,7 @@ VDR Plugin 'skincurses' Revision History
   font drawing in high level OSDs (dummy for skincurses).
 - Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
   (reported by Sergey Chernyavskiy).
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
index 3b8ec2644..94291d70e 100644
--- a/PLUGINS/src/skincurses/po/de_DE.po
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-15 16:07+0200\n"
diff --git a/PLUGINS/src/skincurses/po/et_EE.po b/PLUGINS/src/skincurses/po/et_EE.po
index d226a290c..f2f63c9ad 100644
--- a/PLUGINS/src/skincurses/po/et_EE.po
+++ b/PLUGINS/src/skincurses/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
index 057320ddb..2e9316e0e 100644
--- a/PLUGINS/src/skincurses/po/fi_FI.po
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2007-08-14 20:48+0300\n"
diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po
index 050b59b37..3727b8dec 100644
--- a/PLUGINS/src/skincurses/po/it_IT.po
+++ b/PLUGINS/src/skincurses/po/it_IT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Diego Pierotto <vdr-italian@tiscali.it>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2008-01-27 20:35+0100\n"
diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po
index cba22e761..405ec2bea 100644
--- a/PLUGINS/src/skincurses/po/lt_LT.po
+++ b/PLUGINS/src/skincurses/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2010-02-22 18:18+0200\n"
diff --git a/PLUGINS/src/skincurses/po/pl_PL.po b/PLUGINS/src/skincurses/po/pl_PL.po
index fd027241b..d2f1dc0e8 100644
--- a/PLUGINS/src/skincurses/po/pl_PL.po
+++ b/PLUGINS/src/skincurses/po/pl_PL.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomasz Maciej Nowak <tmn505@gmail.com>, 2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2018-02-19 00:48+0100\n"
 "PO-Revision-Date: 2018-02-19 01:02+0100\n"
diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po
index a26ccc481..7e0603928 100644
--- a/PLUGINS/src/skincurses/po/ru_RU.po
+++ b/PLUGINS/src/skincurses/po/ru_RU.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alexander Gross <Bikalexander@gmail.com>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2008-03-14 00:21+0100\n"
diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po
index d9087630d..4ddf18006 100644
--- a/PLUGINS/src/skincurses/po/sk_SK.po
+++ b/PLUGINS/src/skincurses/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR plugin language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skincurses 2.2.0\n"
+"Project-Id-Version: vdr-skincurses 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2015-02-08 11:16+0100\n"
 "PO-Revision-Date: 2009-09-30 12:52+0100\n"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index d11736bee..aa719ef2c 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 4.2 2016/12/22 14:09:09 kls Exp $
+ * $Id: skincurses.c 4.3 2018/04/10 13:01:00 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "2.3.2";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 87a71b007..3f50f71c8 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -68,3 +68,7 @@ VDR Plugin 'status' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index ec50b4563..e1f80e84b 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 4.0 2015/02/17 13:13:21 kls Exp $
+ * $Id: status.c 4.1 2018/04/10 13:01:03 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index 6c9994a99..b8f51bcc8 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -33,3 +33,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2015-02-19: Version 2.2.0
 
 - Official release.
+
+2018-04-15: Version 2.4.0
+
+- Official release.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index bde855975..3bf871710 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 4.0 2015/02/17 13:13:29 kls Exp $
+ * $Id: svdrpdemo.c 4.1 2018/04/10 13:01:07 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "2.2.0";
+static const char *VERSION        = "2.4.0";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/UPDATE-2.4.0 b/UPDATE-2.4.0
index cdf56dc79..417959f3d 100644
--- a/UPDATE-2.4.0
+++ b/UPDATE-2.4.0
@@ -265,6 +265,8 @@ EPG:
   made for such an event.
 - Changed the default return value of cEpgHandler::BeginSegmentTransfer() to true, to
   avoid problems with derived classes that don't implement this function.
+- The EIT filter no longer parses data from "other TS", to avoid problems with
+  broadcasters who transmit faulty EIT data.
 
 OSD:
 
diff --git a/channels.conf b/channels.conf
index 1e279d440..91ca13d7e 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,85 +1,162 @@
-RTL Television,RTL;RTL World:12187:HC34M2S0:S19.2E:27500:163=2:104=deu@3;106=deu@106:105;110=deu:0:12003:1:1089:0
+RTL Television,RTL;CBC:12187:HC34M2S0:S19.2E:27500:163=2:104=deu@3;106=deu@106:105;110=deu:0:12003:1:1089:0
 SAT.1;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:255=2:256=deu@3;259=deu@106:32:0:17500:1:1107:0
 ProSieben;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:511=2:512=deu@3;515=deu@106:33:0:17501:1:1107:0
-RTL2;RTL World:12187:HC34M2S0:S19.2E:27500:166=2:128=deu@3:68:0:12020:1:1089:0
+RTL2;CBC:12187:HC34M2S0:S19.2E:27500:166=2:128=deu@3:68;75=deu:0:12020:1:1089:0
+:ARD und ZDF
 Das Erste HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5101=27:5102=deu@3,5103=mis@3;5106=deu@106:5104;5105=deu:0:10301:1:1019:0
 ZDF HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6110=27:6120=deu@3,6121=mis@3,6123=mul@3;6122=deu@106:6130;6131=deu:0:11110:1:1011:0
-BR S�d HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3;5206=deu@106:5204:0:10325:1:1025:0
-hr-fernsehen;ARD:11836:HC34M2S0:S19.2E:27500:301=2:302=deu@3,303=mis@3:304:0:28108:1:1101:0
-NDR FS MV HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3;5226=deu@106:5224;5225=deu:0:10328:1:1025:0
-SR Fernsehen;ARD:12265:HC34M2S0:S19.2E:27500:1301=2:1302=deu@3,1303=mis@3:1304:0:28486:1:1093:0
-WDR HD K�ln;ARD:12422:HC34M2S0:S19.2E:27500:5501=27:5502=deu@3,5503=mis@3;5506=deu@106:5504:0:28325:1:1201:0
+:Dritte Programme
+BR Fernsehen S�d HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3;5206=deu@106:5204;5205=deu:0:10325:1:1025:0
+hr-fernsehen HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5351=27:5352=deu@3,5353=mis@3;5356=deu@106:5354;5355=deu:0:10355:1:1061:0
+NDR FS NDS HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3;5226=deu@106:5224;5225=deu:0:10327:1:1025:0
+WDR HD K�ln;ARD:12422:HC34M2S0:S19.2E:27500:5501=27:5502=deu@3,5503=mis@3;5506=deu@106:5504;5505=deu:0:28325:1:1201:0
 SWR BW HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3;5126=deu@106:5124;5125=deu:0:10303:1:1019:0
-rbb Berlin;ARD:12109:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28206:1:1073:0
+rbb Berlin HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5311=27:5312=deu@3,5313=mis@3;5316=deu@106:5314;5315=deu:0:10351:1:1061:0
+MDR Sachsen HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5331=27:5332=deu@3,5333=mis@3;5336=deu@106:5334;5335=deu:0:10352:1:1061:0
 PHOENIX HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5261=27:5262=deu@3,5263=mul@3:5264:0:10331:1:1025:0
-BR-alpha;ARD:12265:HC34M2S0:S19.2E:27500:1401=2:1402=deu@3,1403=mis@3;1406=deu@106:1404:0:28487:1:1093:0
+ARD-alpha;ARD:12265:HC34M2S0:S19.2E:27500:1401=2:1402=deu@3,1403=mis@3;1406=deu@106:1404;1405=deu:0:28487:1:1093:0
 3sat HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6510=27:6520=deu@3,6521=mis@3,6523=mul@3;6522=deu@106:6530;6531=deu:0:11150:1:1010:0
-arte HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5111=27:5112=deu@3,5113=fra@3;5116=deu@106:5114;5115=deu,5118=fra:0:10302:1:1019:0
-MDR Sachsen;ARD:12109:HC34M2S0:S19.2E:27500:2901=2:2902=deu@3,2903=mis@3:2904:0:28228:1:1073:0
-ServusTV HD Oesterreich;ServusTV:11303:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@4,3585=eng@4;3586=deu@122,3587=deu@106:3588:0:4913:1:1007:0
-N24;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1023=2:1024=deu@3:35:0:17503:1:1107:0
-Das Erste;ARD:11836:HC34M2S0:S19.2E:27500:101=2:102=deu@3,103=mis@3;106=deu@106:104;105=deu:0:28106:1:1101:0
-Bayerisches FS S�d;ARD:11836:HC34M2S0:S19.2E:27500:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28107:1:1101:0
-NDR FS MV;ARD:12109:HC34M2S0:S19.2E:27500:2601=2:2602=deu@3,2603=mis@3:2604:0:28224:1:1073:0
-WDR K�ln;ARD:11836:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28111:1:1101:0
-SWR Fernsehen BW;ARD:11836:HC34M2S0:S19.2E:27500:801=2:802=deu@3,803=mis@3;806=deu@106:804:0:28113:1:1101:0
-PHOENIX;ARD:10744:HC56M2S0:S19.2E:22000:501=2:502=deu@3,503=mul@3:504:0:28725:1:1051:0
-ZDF;ZDFvision:11953:HC34M2S0:S19.2E:27500:110=2:120=deu@3,121=mis@3,122=mul@3;125=deu@106:130;131=deu:0:28006:1:1079:0
-3sat;ZDFvision:11953:HC34M2S0:S19.2E:27500:210=2:220=deu@3,221=mis@3,222=mul@3;225=deu@106:230;231=deu:0:28007:1:1079:0
-KiKA HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6610=27:6620=deu@3,6621=mis@3;6622=deu@106:6630:0:11160:1:1010:0
-KiKA;ZDFvision:11953:HC34M2S0:S19.2E:27500:310=2:320=deu@3,321=mis@3;325=deu@106:330:0:28008:1:1079:0
-arte;ARD:10744:HC56M2S0:S19.2E:22000:401=2:402=deu@3,403=fra@3:404:0:28724:1:1051:0
-ORF1 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:1920=27:1921=deu@4,1922=eng@4;1923=deu@106:1925:D05,D95,648,1702,1833,9C4,98C:4911:1:1007:0
-ORF1;ORF:12692:HC56M2S0:S19.2E:22000:160=2:161=deu@3;163=deu@106:165:D05,D95,648,1702,1833,9C4,98C:13001:1:1117:0
-ORF2 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:2920=27:2921=deu@4,2922=eng@4;2923=deu@106:2925:D05,D95,648,1702,1833,9C4,98C:4912:1:1007:0
-ORF2;ORF:12692:HC56M2S0:S19.2E:22000:500=2:501=deu@3;503=deu@106:505:D95,D05,648,1702,1833,9C4,98C:13002:1:1117:0
-ZDFinfo HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6710=27:6720=deu@3,6721=mis@3,6723=mul@3;6722=deu@106:6730:0:11170:1:1010:0
-ZDFinfo;ZDFvision:11953:HC34M2S0:S19.2E:27500:610=2:620=deu@3,621=mis@3,622=mul@3;625=deu@106:630:0:28011:1:1079:0
-CNN Int.;CNN:11778:VC34M2S0:S19.2E:27500:165=2:100=eng@3:0:0:28522:1:1068:0
-SUPER RTL;RTL World:12187:HC34M2S0:S19.2E:27500:165=2:120=deu@3:65:0:12040:1:1089:0
-VOX;RTL World:12187:HC34M2S0:S19.2E:27500:167=2:136=deu@3:71;74=deu:0:12060:1:1089:0
-kabel eins;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:767=2:768=deu@3:34:0:17502:1:1107:0
-DAS VIERTE,D VIERTE;BetaDigital:12460:HC34M2S0:S19.2E:27500:2047=2:2048=deu@3:36:0:1793:133:5:0
-BBC FOUR;BSkyB:10802:HC56M2S0:S28.2E:22000:5600=2:5601=eng@3,5602=NAR@3:5603;5604=eng:0:6416:2:2047:0
-BBC HD;BSkyB:10847:vC56M2O0S1:S28.5E:23000:5500=27:5502=NAR@3;5501=eng@106:5503;5504=eng:0:6940:2:2050:0
-BBC One HD;BSkyB:10847:VC23M5O25P0S1:S28.2E:23000:5400=27:5402=NAR@3;5401=eng@106:5403;5404=eng:0:6941:2:2050:0
-SAT.1 Gold;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1279=2:1280=deu@3:36:0:17504:1:1107:0
+arte HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5111=27:5112=deu@3,5113=fra@3,5117=mis@3;5116=mul@106:5114;5115=deu,5118=fra,5119=deu:0:10302:1:1019:0
+zdf_neo HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6310=27:6320=deu@3,6321=mis@3,6323=mul@3;6322=deu@106:6330;6331=deu:0:11130:1:1011:0
+ZDFinfo HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6710=27:6720=deu@3,6721=mis@3,6723=mul@3;6722=deu@106:6730;6731=deu:0:11170:1:1010:0
+ONE HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5411=27:5412=deu@3,5413=mis@3;5416=deu@106:5414;5415=deu:0:10376:1:1039:0
+KiKA HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6610=27:6620=deu@3,6621=mis@3;6622=deu@106:6630;6631=deu:0:11160:1:1010:0
+:Regionalprogramme
+Niederbayern;MB Satellite:11523:HC56M2S0:S19.2E:22000:2559=2:2560=deu@3:0:0:4609:1:1021:0
+Franken Fernsehen;MB Satellite:11523:HC56M2S0:S19.2E:22000:511=2:512=deu@3:0:0:4601:1:1021:0
+m�nchen.tv;MB Satellite:11523:HC56M2S0:S19.2E:22000:1279=2:1280=deu@3:0:0:4604:1:1021:0
+Mainfranken;MB Satellite:11523:HC56M2S0:S19.2E:22000:1791=2:1792=deu@3:0:0:4606:1:1021:0
+TV Oberfranken;MB Satellite:11523:HC56M2S0:S19.2E:22000:2047=2:2048=deu@3:0:0:4607:1:1021:0
+TVA-OTV;MB Satellite:11523:HC56M2S0:S19.2E:22000:2303=2:2304=deu@3:0:0:4608:1:1021:0
+a.tv;MB Satellite:11523:HC56M2S0:S19.2E:22000:255=2:256=deu@3:0:0:4600:1:1021:0
+BR Fernsehen Nord HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3;5206=deu@106:5204;5205=deu:0:10326:1:1025:0
+rbb Brandenburg HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5311=27:5312=deu@3,5313=mis@3;5316=deu@106:5314;5315=deu:0:10350:1:1061:0
+SR Fernsehen HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5431=27:5432=deu@3,5433=mis@3;5436=deu@106:5434;5435=deu:0:10378:1:1039:0
+Radio Bremen TV;ARD:12421:HC34M2S0:S19.2E:27500:1201=2:1202=deu@3:1204:0:28385:1:1201:0
+:�sterreichisches Fernsehen
+ORF1 HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:1920=27:0;1921=deu@106,1922=mis@106:1925:648,650,D95,D98,6E2,500,9C4,98C:4911:1:1007:0
+ORF2W HD;ORF:11303:HC23M5O35P0S1:S19.2E:22000:2920=27:0;2921=deu@106,2922=mis@106:2925:648,650,D95,D98,6E2,500,9C4,98C:4912:1:1007:0
+ORF III;ORF:12662:HC56M2S0:S19.2E:22000:1010=2:1011=deu@4:1013:648,650,D95,D98,9C4,98C:13101:1:1115:0
+ServusTV HD Oesterreich;ServusTV:11303:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@4,3585=eng@4;3587=deu@106:3588:648,650,D95,D98,9C4,98C,6E2,500:4913:1:1007:0
+ServusTV HD Deutschland;ServusTV:11303:HC23M5O35P0S1:S19.2E:22000:4920=27:4921=deu@4,4922=eng@4;4924=deu@106:4925:0:4914:1:1007:0
+ATV;ATV+:12692:HC56M2S0:S19.2E:22000:506=2:507=deu@3:509:648,650,D95,D98,9C4,98C:13012:1:1117:0
+ORF SPORT+;ORF:11243:HC56M2S0:S19.2E:22000:2210=2:2211=deu@3,2212=mis@3:2215:648,650,D95,D98,9C4,98C:13221:1:1003:0
+PULS 4 Austria;ProSiebenSat.1:12051:VC34M2S0:S19.2E:27500:1791=2:1792=deu@3:39:9C4,98C,D95,648,D98,650,500,6E2,98D:20007:1:1082:0
+:Nachrichten
+tagesschau24 HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5401=27:5402=deu@3,5403=mis@3;5406=deu@106:5404:0:10375:1:1039:0
+n-tv;CBC:12187:HC34M2S0:S19.2E:27500:169=2:73=deu@3,77=mul@3:80:0:12090:1:1089:0
+WELT;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1023=2:1024=deu@3:35:0:17503:1:1107:0
+N24 DOKU;BetaDigital:12460:HC34M2S0:S19.2E:27500:511=2:512=deu@3:34:0:48:133:5:0
+CNN Int.;Harmonic:11626:VC56M2S0:S19.2E:22000:165=2:100=eng@3:0:0:4422:1:1028:0
+EURONEWS FRENCH SD;Globecast:12226:HC34M2S0:S19.2E:27500:2432=2:2435=fra@3:0:0:31220:1:1091:0
+Bloomberg Europe TV;Bloomberg TV:11597:VC56M2S0:S19.2E:22000:1360=2:1320=eng@3:0:0:10067:1:1026:0
+CNBC Europe;CNBC:11597:VC56M2S0:S19.2E:22000:307=2:308=eng@3:0:0:10030:1:1026:0
+Russia Today;GLOBECAST:11538:VC56M2S0:S19.2E:22000:604=2:624=eng@3:0:0:6904:1:1022:0
+Sky News Intl;SES ASTRA:12604:HC56M2S0:S19.2E:22000:1290=2:2290=eng@3:1750:0:7290:1:1111:0
+Al Jazeera English;Al Jazeera:11626:VC56M2S0:S19.2E:22000:3505=2:3625=eng@3:0:0:4440:1:1028:0
+Al Jazeera Channel;GLOBECAST:11508:VC56M2S0:S19.2E:22000:709=2:729=ara@3:0:0:7009:1:1020:0
+:Sport
 SPORT1;BetaDigital:12480:VC34M2S0:S19.2E:27500:1023=2:1024=deu@3:39:0:900:133:33:0
-HSE24,HSE24;BetaDigital:12480:VC34M2S0:S19.2E:27500:1279=2:1280=deu@3:37:0:40:133:33:0
-Bloomberg Europe TV;Arqiva:11597:VC56M2S0:S19.2E:22000:1360=2:1320=eng@4:37:0:10067:1:1026:0
-NRJ 12;CSAT:11817:VC34M2S0:S19.2E:27500:163=2:92=fra@4;93=fra@106:41:1811,1812,500,1863,100:8004:1:1070:0
-rbb Brandenburg;ARD:12109:HC34M2S0:S19.2E:27500:601=2:602=deu@3,603=mis@3:604:0:28205:1:1073:0
-Sky News Intl;SES ASTRA:12604:HC56M2S0:S19.2E:22000:1290=2:2290=@4:0:0:7290:1:1111:0
-Veronica/DisneyXD;CANALDIGITAAL:12574:HC56M2O0S0:S19.2E:22000:0:0:0:622:5020:53:1109:0
-Test;CANALDIGITAAL:12574:HC56M2O0S0:S19.2E:22000:522+8190=2:97=dut@4:40:100:5025:53:1109:0
-n-tv;RTL World:12187:HC34M2S0:S19.2E:27500:169=2:73=deu@3:80:0:12090:1:1089:0
-Al Jazeera Channel;GlobeCast:11508:VC56M2S0:S19.2E:22000:709=2:729=ara@3:0:0:7009:1:1020:0
-ORF III;ORF:12662:HC56M2S0:S19.2E:22000:1010=2:1011=deu@4:1013:D95,648,D05,9C4,1702,1833,98C:13101:1:1115:0
-Eurosport HD,EurospHD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:1535=27:0;1539=deu@106:32:1833,9C4,9AF,98C:132:133:6:0
-Eurosport Deutschland;SES Astra:12226:HC34M2S0:S19.2E:27500:101=2:103=deu@4:102:0:31200:1:1091:0
-tagesschau24;ARD:10744:HC56M2S0:S19.2E:22000:101=2:102=deu@3:0:0:28721:1:1051:0
-Einsfestival HD;ARD:12422:HC34M2S0:S19.2E:27500:1601=27:1602=deu@3;1606=deu@106:1604:0:28396:1:1201:0
-Einsfestival;ARD:10744:HC56M2S0:S19.2E:22000:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28722:1:1051:0
-EinsPlus;ARD:10744:HC56M2S0:S19.2E:22000:301=2:302=deu@3,303=mis@3;306=deu@106:304:0:28723:1:1051:0
-zdf.kultur HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6410=27:6420=deu@3,6421=mis@3,6423=mul@3;6422=deu@106:6430:0:11140:1:1011:0
-zdf.kultur;ZDFvision:11953:HC34M2S0:S19.2E:27500:1110=2:1120=deu@3,1121=mis@3,1122=mul@3;1125=deu@106:1130:0:28016:1:1079:0
-zdf_neo HD;ZDFvision:11362:HC23M5O35P0S1:S19.2E:22000:6310=27:6320=deu@3,6321=mis@3,6323=mul@3;6322=deu@106:6330:0:11130:1:1011:0
-zdf_neo;ZDFvision:11953:HC34M2S0:S19.2E:27500:660=2:670=deu@3,671=mis@3,672=mul@3;675=deu@106:680:0:28014:1:1079:0
+Eurosport 1 Deutschland;SES Astra:12226:HC34M2S0:S19.2E:27500:101=2:103=deu@4:102:0:31200:1:1091:0
+:Privatsender
+RTLplus;CBC:12187:HC34M2S0:S19.2E:27500:168=2:137=deu@3:70:0:12080:1:1089:0
+NITRO;CBC:12187:HC34M2S0:S19.2E:27500:173=2:146=deu@3:84;86=deu:0:12061:1:1089:0
+SUPER RTL;CBC:12187:HC34M2S0:S19.2E:27500:165=2:120=deu@3:65;66=deu:0:12040:1:1089:0
+SAT.1 Gold;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1279=2:1280=deu@3:36:0:17504:1:1107:0
+Pro7 MAXX;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:1535=2:1536=deu@3:37:0:17505:1:1107:0
+kabel eins;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:767=2:768=deu@3:34:0:17502:1:1107:0
+kabel eins Doku;ProSiebenSat.1:12544:HC56M2S0:S19.2E:22000:2559=2:2560=deu@3:41:0:17509:1:1107:0
+Family TV;BetaDigital:10920:HC78M2S0:S19.2E:22000:255=2:256=deu@3:0:0:33:133:15:0
+Disney Channel;BetaDigital:12460:HC34M2S0:S19.2E:27500:2047=2:2048=deu@3;2051=deu@106:36:0:1793:133:5:0
+TELE 5;BetaDigital:12480:VC34M2S0:S19.2E:27500:1535=2:1536=deu@3:38:0:51:133:33:0
+VOX;CBC:12187:HC34M2S0:S19.2E:27500:167=2:136=deu@3:71;74=deu:0:12060:1:1089:0
 SIXX;ProSiebenSat.1:12460:HC34M2S0:S19.2E:27500:767=2:768=deu@3:35:0:776:133:5:0
-:Sky
-Sky Cinema,Cinema;SKY:11797:HC34M2S0:S19.2E:27500:511=2:512=deu@3,513=eng@3;515=deu@106:32:1702,1722,1833,1834,1836,9C4,9C7,9AF,98C,1861:10:133:2:0
-Sky Cinema +1,Cinema1;SKY:11797:HC34M2S0:S19.2E:27500:1791=2:1792=deu@3,1793=eng@3;1795=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:11:133:2:0
-Sky Cinema +24,Cinema24;SKY:11797:HC34M2S0:S19.2E:27500:2303=2:2304=deu@3,2305=eng@3;2307=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:43:133:2:0
-Sky Action,Action;SKY:11797:HC34M2S0:S19.2E:27500:767=2:768=deu@3,769=eng@3;771=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:9:133:2:0
-Sky Comedy,Comedy;SKY:11797:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3,2561=eng@3;2563=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:8:133:2:0
-Sky Atlantic HD,AtlanticHD;SKY:11993:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106,1284=eng@106:32:1833,9C4,9AF,98C:110:133:13:0
-Fox Serie,Fox;SKY:12070:HC34M2S0:S19.2E:27500:1279=2:1280=deu@3,1281=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:16:133:1:0
-History HD,HistHD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106:32:1833,9C4,9AF,98C:113:133:13:0
-Sky Emotion,Emotion;SKY:11797:HC34M2S0:S19.2E:27500:2815=2:2816=deu@3,2817=eng@3;2819=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:20:133:2:0
-Sky Nostalgie,Nostalgie;SKY:11719:HC34M2S0:S19.2E:27500:1535=2:1536=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:516:133:3:0
-Sky Hits,SkyHits;SKY:11719:HC34M2S0:S19.2E:27500:1023=2:1024=deu@3,1025=eng@3;1027=deu@106:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:41:133:3:0
-Discovery Channel,Discovery;SKY:12031:HC34M2S0:S19.2E:27500:3071=2:3072=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:14:133:4:0
-National Geographic,NatGeo;SKY:12031:HC34M2S0:S19.2E:27500:3327=2:3328=deu@3,3329=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:13:133:4:0
-Disney Channel,Disney;SKY:11758:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:34:133:17:0
-TNT Serie,TNTSerie;SKY:12070:HC34M2S0:S19.2E:27500:2559=2:2560=deu@3,2561=eng@3:32:1702,1722,1833,1834,9C4,9C7,9AF,98C,1861:50:133:1:0
-:@1000 New channels
+DMAX;BetaDigital:12480:VC34M2S0:S19.2E:27500:3327=2:3328=deu@3:44:0:63:133:33:0
+ANIXE HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:255=27:0;259=deu@106:0:0:21100:1:1053:0
+Nickelodeon;MTV Networks Europe:11973:VC34M2S0:S19.2E:27500:4101=2:4102=deu@4,4103=eng@4:4104:0:28680:1:1078:0
+TOGGO plus;CBC:12187:HC34M2S0:S19.2E:27500:301=2:303=deu@3:0:0:12030:1:1089:0
+Comedy Central/VIVA;MTV Networks Europe:11973:VC34M2S0:S19.2E:27500:4061=2:4062=@4:4064:0:28676:1:1078:0
+DELUXE MUSIC,DELUXE;BetaDigital:12148:HC34M2S0:S19.2E:27500:3327=2:3328=deu@3:0:0:65:133:7:0
+sonnenklar.TV HD;BetaDigital:12574:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:0:5400:1:1109:0
+QVC Deutschland;SES ASTRA:12551:VC56M2S0:S19.2E:22000:165=2:166=deu@3:167:0:12100:1:1108:0
+HSE24,HSE24;BetaDigital:12480:VC34M2S0:S19.2E:27500:1279=2:1280=deu@3:37:0:40:133:33:0
+1-2-3.tv HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:34:0:5502:1:1055:0
+Juwelo HD;BetaDigital:12574:HC23M5O35P0S1:S19.2E:22000:1023=27:1024=deu@3:0:0:5403:1:1109:0
+:@100
+:Sky HD
+Sky Cinema HD,Sky Cinema HD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106,1284=eng@106:0:98C,9C4,9AF,98D:131:133:6:0
+Sky Cinema +1 HD,Sky Cine1 HD;SKY:12070:HC910M2O35P0S1:S19.2E:27500:255=27:0;259=deu@106,260=eng@106:0:9C4,98C,9AF,98D:134:133:8:0
+Sky Cinema +24 HD,Sky Cine24 HD;SKY:12070:HC910M2O35P0S1:S19.2E:27500:511=27:0;515=deu@106,516=eng@106:0:9C4,98C,9AF,98D:135:133:8:0
+Sky Cinema Hits HD,Sky Hits HD;SKY:12304:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106:0:9C4,98C,9AF,98D:107:133:12:0
+Sky Cinema Action HD,Action HD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:1023=27:0;1027=deu@106,1028=eng@106:0:98C,9C4,9AF,98D:116:133:11:0
+Sky Cinema Animation HD,Animation HD;SKY:12070:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106,772=eng@106:0:9C4,98C,9AF,98D:139:133:8:0
+SYFY HD,SYFY HD;SKY:12304:HC910M2O35P0S1:S19.2E:27500:511=27:0;515=deu@106,516=eng@106:0:9C4,98C,9AF,98D:126:133:12:0
+Sky Atlantic HD,AtlanticHD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106,1284=eng@106:0:98C,9C4,9AF,98D:110:133:13:0
+Sky 1 +1 HD,Sky 1 +1 HD;SKY:11797:HC910M2O35P0S1:S19.2E:27500:511=27:0;515=deu@106,516=eng@106:0:98C,9C4,9AF,98D:144:133:16:0
+TNT Serie HD,TNTSerieHD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:255=27:0;259=deu@106,260=eng@106:0:98C,9C4,9AF,98D:123:133:11:0
+TNT Comedy HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:511=27:0;515=deu@106,516=eng@106:0:98C,9C4,98D:136:133:14:0
+Fox HD;SKY:11332:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106,1028=eng@106:0:98C,9C4,98D:124:133:10:0
+13th Street HD,13th St HD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106,772=eng@106:0:98C,9C4,9AF,98D:127:133:13:0
+Universal HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:1535=27:0;1539=deu@106,1540=eng@106:0:98C,9C4,98D:101:133:14:0
+RTL Crime HD,RTL CrimeHD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106,260=eng@106:0:9C4,98C,98D:140:133:9:0
+E! Entertainm. HD,E! HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:255=27:0;259=deu@106,260=eng@106:0:98C,9C4,98D:128:133:14:0
+Spiegel Geschichte HD,Spiegel G HD;SKY:11332:HC34M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:0:98C,9C4,98D:137:133:10:0
+Discovery HD,DiscHD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:1023=27:0;1027=deu@106,1028=eng@106:0:98C,9C4,9AF,98D:130:133:6:0
+History HD,HistHD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:767=27:0;771=deu@106,772=eng@106:0:98C,9C4,9AF,98D:113:133:11:0
+NatGeo HD,NatGeoHD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:511=27:0;515=deu@106,516=eng@106:0:98C,9C4,9AF,98D:112:133:13:0
+Nat Geo Wild HD,NGWildHD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:511=27:0;515=deu@106,516=eng@106:0:98C,9C4,9AF,98D:118:133:6:0
+Disney Cinemagic HD,DisneyCinHD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:255=27:0;259=deu@106,260=eng@106:0:98C,9C4,9AF,98D:111:133:13:0
+Disney Junior HD;SKY:12070:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106:0:9C4,98C,9AF,98D:138:133:8:0
+Sky Arts HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106,772=eng@106:0:9C4,98C,98D:145:133:9:0
+:Sky Film
+Sky Cinema Comedy,Sky Comedy;SKY:11719:HC910M2O35P0S1:S19.2E:27500:1023=27:1024=deu@3,1025=eng@3;1027=deu@106:0:9C4,98C,9AF,98D:8:133:3:0
+Sky Cinema Western,Sky Western;SKY:12031:HC910M2O35P0S1:S19.2E:27500:767=27:768=deu@3,769=eng@3:0:9C4,98C,9AF,98D:516:133:4:0
+Sky Cinema Emotion,Sky Emotion;SKY:12031:HC910M2O35P0S1:S19.2E:27500:511=27:512=deu@3,513=eng@3;515=deu@106:0:9C4,98C,9AF,98D:20:133:4:0
+:Sky Welt
+RTL Passion,Passion;SKY:12031:HC910M2O35P0S1:S19.2E:27500:3839=27:3840=deu@3,3841=eng@3:0:9C4,98C,9AF,98D:29:133:4:0
+Sky Krimi,SkyKrimi;SKY:12031:HC910M2O35P0S1:S19.2E:27500:1535=27:1536=deu@3:0:9C4,98C,9AF,98D:23:133:4:0
+Disney XD,DisneyXD;SKY:11719:HC910M2O35P0S1:S19.2E:27500:1279=27:1280=deu@3,1281=eng@3:0:9C4,98C,9AF,98D:28:133:3:0
+Heimatkanal,Heimat;SKY:11758:HC910M2O35P0S1:S19.2E:27500:2815=27:2816=deu@3:0:9C4,98C,9AF,98D:22:133:2:0
+Romance TV,Romance;SKY:11758:HC910M2O35P0S1:S19.2E:27500:3071=27:3072=deu@3:0:9C4,98C,9AF,98D:518:133:2:0
+Classica;SKY:11719:HC910M2O35P0S1:S19.2E:27500:2047=27:2048=deu@3:0:9C4,98C,9AF,98D:24:133:3:0
+:Sky Welt Extra
+TNT Film (TCM),TNT Film;SKY:11914:HC910M2O35P0S1:S19.2E:27500:4351=27:4352=deu@3,4353=eng@3:0:98C,9C4,9AF,98D:405:133:6:0
+Kinowelt TV,Kinowelt;SKY:12031:HC910M2O35P0S1:S19.2E:27500:4351=27:4352=deu@3:0:9C4,98C,9AF,98D:406:133:4:0
+.;BetaDigital:10920:HC78M2S0:S19.2E:22000:2047=27:2048=deu@3,2049=eng@3:0:9C4,98C:57:133:15:0
+.;SKY:10920:HC78M2S0:S19.2E:22000:1023=27:1024=deu@3:0:1837,9C4,98C,1867:38:133:15:0
+RTL Living;CBC:11082:HC34M5O20P0S1:S19.2E:22000:700=27:710=deu@3,711=qaa@3:0:9C4,98C,98D:11971:1:1041:0
+Boomerang;SKY:11875:HC34M5O35P0S1:S19.2E:27500:4351=27:4352=deu@3,4353=eng@3:0:98C,9C4,98D:403:133:14:0
+Cartoon Network,Cartoon Net;SKY:11875:HC34M5O35P0S1:S19.2E:27500:4607=27:4608=deu@3,4609=eng@3:0:98C,9C4,98D:404:133:14:0
+Nicktoons (S);MTV Networks Europe:11973:VC34M2S0:S19.2E:27500:4121=2:4122=@4:0:500:28682:1:1078:0
+Beate-Uhse.TV,BeateU;SKY:11719:HC910M2O35P0S1:S19.2E:27500:2303=27:2304=deu@3:0:9C4,98C,9AF,98D:21:133:3:0
+:Sky Bundesliga HD
+Sky Sport Bundesliga 1 HD,Sky Buli 1 HD;SKY:12304:HC910M2O35P0S1:S19.2E:27500:255=27:0;258=qab@106,259=qab@106,260=qac@106:32;33=deu:9C4,98C,9AF,98D:105:133:12:0
+Sky Sport Bundesliga 2 HD,Sky Buli 2 HD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:2047=27:0;2050=qab@106,2051=qab@106:32:9C4,98C,9AF,98D:267:133:6:0
+Sky Sport Bundesliga 3 HD,Sky Buli 3 HD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:2047=27:0;2050=qab@106,2051=qab@106,2052=qac@106:32:98C,9C4,9AF,98D:277:133:13:0
+Sky Sport Bundesliga 4 HD,Sky Buli 4 HD;SKY:12304:HC910M2O35P0S1:S19.2E:27500:2047=27:0;2050=qab@106,2051=qab@106,2052=qac@106:32:9C4,98C,9AF,98D:287:133:12:0
+Sky Sport Bundesliga 5 HD,Sky Buli 5 HD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:2047=27:0;2050=qab@106,2051=qab@106,2052=qac@106:32:98C,9C4,9AF,98D:297:133:11:0
+Sky Sport Bundesliga 6 HD,Sky Buli 6 HD;SKY:12070:HC910M2O35P0S1:S19.2E:27500:2047=27:0;2050=qab@106,2051=qab@106,2052=qac@106:32:98C,9C4,98D:307:133:8:0
+Sky Sport Bundesliga 7 HD,Sky Buli 7 HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1791=27:0;1794=qab@106,1795=qab@106,1796=qac@106:33:98C,9C4:317:133:9:0
+Sky Sport Bundesliga 8 HD,Sky Buli 8 HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:2559=27:0;2562=deu@106,2563=deu@106,2564=deu@106:0:9C4,98C:327:133:14:0
+Sky Sport Bundesliga 9 HD,Sky Buli 9 HD;SKY:11332:HC34M5O35P0S1:S19.2E:22000:2559=27:0;2562=qab@106,2563=qab@106,2564=qac@106:32:98C,9C4:337:133:10:0
+Sky Sport Bundesliga 10 HD,Sky Buli 10 HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:2047=27:0;2050=deu@106,2051=deu@106,2052=deu@106:0:9C4,98C:257:133:14:0
+Sky Sport Fanzone HD,Fanzone HD;SKY:11332:HC34M5O35P0S1:S19.2E:22000:1279=27:0:0:98C,9C4:102:133:10:0
+:Sky Sport HD
+Sky Sport News HD,SportNewsHD;SKY:12304:HC910M2O35P0S1:S19.2E:27500:1023=27:0;1027=deu@106:0:0:108:133:12:0
+Sky Sport 1 HD,Sky Sport 1 HD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:767=27:0;770=qae@106,771=qaf@106:32:98C,9C4,9AF,98D:129:133:6:0
+Sky Sport 2 HD,Sky Sport 2 HD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:1023=27:0;1026=qae@106,1027=qaf@106,1028=qtz@106:32:98C,9C4,9AF,98D:114:133:13:0
+Sky Sport 3 HD,Sky Sport 3 HD;SKY:11914:HC910M2O35P0S1:S19.2E:27500:2303=27:0;2306=qae@106,2307=qaf@106,2308=qtz@106:32:98C,9C4,9AF,98D:268:133:6:0
+Sky Sport 4 HD,Sky Sport 4 HD;SKY:11992:HC910M2O35P0S1:S19.2E:27500:2303=27:0;2306=qae@106,2307=qaf@106,2308=qtz@106:32:98C,9C4,9AF:278:133:13:0
+Sky Sport 5 HD,Sky Sport 5 HD;SKY:12304:HC910M2O35P0S1:S19.2E:27500:2303=27:0;2306=qae@106,2307=qaf@106:261:9C4,98C,9AF:288:133:12:0
+Sky Sport 6 HD,Sky Sport 6 HD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:2303=27:0;2306=qae@106,2307=qaf@106,2308=qtz@106:32:98C,9C4,9AF,98D:298:133:11:0
+Sky Sport 7 HD,Sky Sport 7 HD;SKY:12070:HC910M2O35P0S1:S19.2E:27500:2303=27:0;2306=qae@106,2307=qaf@106,2308=qtz@106:32:98C,9C4,98D:308:133:8:0
+Sky Sport 8 HD,Sky Sport 8 HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:3071=27:0;3074=qae@106,3075=qaf@106,3076=qtz@106:32:98C,9C4,98D:318:133:9:0
+Sky Sport 9 HD,Sky Sport 9 HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:2815=27:0;2818=deu@106,2819=deu@106:32:98C,9C4:328:133:14:0
+Sky Sport 10 HD,Sky Sport 10HD;SKY:11332:HC34M5O35P0S1:S19.2E:22000:2815=27:0;2818=qae@106,2819=qaf@106,2820=qtz@106:32:98C,9C4,98D:338:133:10:0
+Sky Sport 11 HD,Sky Sport 11HD;SKY:11875:HC34M5O35P0S1:S19.2E:27500:2303=27:0;2306=qae@106,2307=qaf@106,2308=qtz@106:32:98C,9C4,98D:258:133:14:0
+Eurosport 1 HD,Eurosp1 HD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:511=27:0;515=deu@106:0:98C,9C4,9AF,98D:132:133:11:0
+Eurosport 2 HD,Eurosp2HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106,1284=eng@106:0:9C4,98C,98D:109:133:9:0
+Sport1+ HD,Sport1+HD;SKY:12382:HC910M2O35P0S1:S19.2E:27500:1279=27:0;1283=deu@106:0:98C,9C4,98D,9AF:122:133:11:0
+Sport1 US HD,Sport1USHD;SKY:11332:HC34M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:32:98C,9C4:119:133:10:0
+Sky Sport Austria HD,SportAutHD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:9C4,98C,98D:143:133:9:0
+:@1000 Neue Kan�le
diff --git a/ci.c b/ci.c
index 091470399..07e0c8924 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.20 2018/02/03 12:55:03 kls Exp $
+ * $Id: ci.c 4.21 2018/03/19 16:37:03 kls Exp $
  */
 
 #include "ci.h"
diff --git a/config.h b/config.h
index 6d25a1410..8c09209b2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.14 2017/12/09 14:15:58 kls Exp $
+ * $Id: config.h 4.15 2018/03/19 15:06:46 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.3.9"
-#define VDRVERSNUM   20309  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.4.0"
+#define VDRVERSNUM   20400  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.3.9"
-#define APIVERSNUM   20309  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.4.0"
+#define APIVERSNUM   20400  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 821fffe67..626495dcb 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.26 2018/01/27 14:45:08 kls Exp $
+ * $Id: device.c 4.27 2018/03/24 09:49:14 kls Exp $
  */
 
 #include "device.h"
diff --git a/eit.c b/eit.c
index 42f82de03..c4c836919 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.4 2017/10/11 09:19:42 kls Exp $
+ * $Id: eit.c 4.5 2018/03/31 13:40:32 kls Exp $
  */
 
 #include "eit.h"
diff --git a/menu.c b/menu.c
index 943198fad..c8a557c19 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.69 2018/03/18 12:01:09 kls Exp $
+ * $Id: menu.c 4.74 2018/04/14 10:24:41 kls Exp $
  */
 
 #include "menu.h"
diff --git a/menu.h b/menu.h
index 3c7b2c6d8..3fc9f749f 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 4.6 2018/02/01 15:35:48 kls Exp $
+ * $Id: menu.h 4.8 2018/04/14 10:24:41 kls Exp $
  */
 
 #ifndef __MENU_H
diff --git a/menuitems.c b/menuitems.c
index 75a4e1e65..d764c58ca 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 4.2 2015/09/08 10:25:23 kls Exp $
+ * $Id: menuitems.c 4.3 2018/03/23 15:37:02 kls Exp $
  */
 
 #include "menuitems.h"
diff --git a/osd.c b/osd.c
index ce4eb27d1..2617c5049 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 4.4 2018/01/25 15:09:09 kls Exp $
+ * $Id: osd.c 4.5 2018/04/06 08:43:15 kls Exp $
  */
 
 #include "osd.h"
diff --git a/osdbase.c b/osdbase.c
index 04632b3a5..d555af985 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.c 4.4 2018/03/06 10:38:18 kls Exp $
+ * $Id: osdbase.c 4.5 2018/03/24 11:47:45 kls Exp $
  */
 
 #include "osdbase.h"
diff --git a/peerdemo b/peerdemo
index 7129207b4..3c2cb730f 100755
--- a/peerdemo
+++ b/peerdemo
@@ -7,7 +7,8 @@
 # It reacts properly to the SVDRP commands CONN, LSTT, POLL, PING and QUIT,
 # and thus seems like a regular VDR to other VDRs.
 #
-# (C) 2018 by Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
 
 use Getopt::Std;
 use IO::Socket;
diff --git a/po/ar.po b/po/ar.po
index 4994973b2..7a39acabc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Osama Alrawab <alrawab@hotmail.com>, 2010, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-10-16 11:16-0400\n"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index cabcfbd1f..daeea2129 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Marc Rovira Vall <tm05462@salleURL.edu>, 2003
 # Ramon Roca <ramon.roca@xcombo.com>, 2003
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-03-02 19:02+0100\n"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 0905bdb15..d40df9086 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vladimír Bárta <vladimir.barta@k2atmitec.cz>, 2006, 2008
 # Jiří Dobrý <jdobry@centrum.cz>, 2008
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2010-05-06 11:00+0200\n"
diff --git a/po/da_DK.po b/po/da_DK.po
index 23612eaf1..f3d68a4c8 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Mogens Elneff <mogens@elneff.dk>, 2004, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 7f3d2d6d0..bcddd2cd9 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Klaus Schmidinger <vdr@tvdr.de>, 2000-2015
 # Albert Danis <a.danis@gmx.de>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-10 13:45+0100\n"
diff --git a/po/el_GR.po b/po/el_GR.po
index 1574a9aad..367131256 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Dimitrios Dimitrakos <mail@dimitrios.de>, 2002, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index fa1590242..3ac6aff5f 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002, 2006
 # Luca Olivetti <luca@ventoso.org>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-19 23:00+0100\n"
diff --git a/po/et_EE.po b/po/et_EE.po
index 857bc2543..384e8f495 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arthur Konovalov <artlov@gmail.com>, 2004-2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 5707d9b35..2e0332012 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
 # Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002, 2003
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-15 15:52+0200\n"
@@ -867,10 +867,10 @@ msgid "by time"
 msgstr "ajan mukaan"
 
 msgid "ascending"
-msgstr ""
+msgstr "nouseva"
 
 msgid "descending"
-msgstr ""
+msgstr "laskeva"
 
 msgid "OSD"
 msgstr "Kuvaruutunäyttö"
@@ -963,7 +963,7 @@ msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Järjestä tallenteet oletuksena"
 
 msgid "Setup.OSD$Sorting direction for recordings"
-msgstr ""
+msgstr "Tallenteiden järjestys"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Käytä numeronäppäimiä tekstisyötteessä"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index af8e4ed0d..ade748464 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Jean-Claude Repetto <jc@repetto.org>, 2001, 2002, 2008
 # Olivier Jacques <jacquesolivier@hotmail.com>, 2003, 2005
@@ -9,17 +9,17 @@
 # Bruno Roussel <bruno.roussel@free.fr>, 2007
 # Michael Nival <mnival@club-internet.fr>, 2007
 # Marc Perrudin <vdr@ekass.net>, 2013
-# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013, 2015
+# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013, 2015, 2018
 # Peter Münster <pmlists@free.fr>, 2013
 # Dominique Plu <dplu@free.fr>, 2013
 # Régis Bossut <famille.bossut@wanadoo.fr>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
-"PO-Revision-Date: 2015-02-18 20:16+0100\n"
+"PO-Revision-Date: 2018-04-14 10:16+0100\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
@@ -669,7 +669,7 @@ msgid "File"
 msgstr "Fichier"
 
 msgid "Record on"
-msgstr ""
+msgstr "Enregistrement actif"
 
 msgid "Button$Folder"
 msgstr "Dossier"
@@ -684,10 +684,10 @@ msgid "First day"
 msgstr "Premier jour"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Erreur pendant l'accès à la programmation"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "La programmation a été supprimée"
 
 msgid "Select folder"
 msgstr "Sélectionner le dossier"
@@ -868,16 +868,16 @@ msgid "always"
 msgstr "toujours"
 
 msgid "by name"
-msgstr ""
+msgstr "par nom"
 
 msgid "by time"
-msgstr ""
+msgstr "par heure"
 
 msgid "ascending"
-msgstr ""
+msgstr "ascendant"
 
 msgid "descending"
-msgstr ""
+msgstr "descendant"
 
 msgid "OSD"
 msgstr "Affichage à l'écran"
@@ -967,10 +967,10 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Toujours trier les dossiers en premier"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Mode de tri par défaut pour les enregistrements"
 
 msgid "Setup.OSD$Sorting direction for recordings"
-msgstr ""
+msgstr "Sens de tri pour les enregistrements"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Touches numériques pour caractères"
@@ -1157,7 +1157,7 @@ msgid " (activating)"
 msgstr " (activation en cours)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ récepteur"
 
 msgid "CAM"
 msgstr "CAM"
@@ -1190,13 +1190,13 @@ msgid "Can't reset CAM!"
 msgstr "Impossible de réinitialiser le CAM !"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "Pas d'enregistrement instantané"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "Confirmer l'enregistrement instantané"
 
 msgid "record instantly"
-msgstr ""
+msgstr "enregistrer instantanément"
 
 msgid "do not pause live video"
 msgstr "ne pas mettre en pause le direct"
@@ -1229,7 +1229,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Durée de vie par défaut (j)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Fonction de la touche enregistrement"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "Fonction de la touche Pause"
@@ -1319,16 +1319,16 @@ msgid "Setup.Replay$Resume ID"
 msgstr "ID résumé"
 
 msgid "any hosts"
-msgstr ""
+msgstr "Tous les serveurs"
 
 msgid "only default host"
-msgstr ""
+msgstr "Uniquement le serveur par défaut"
 
 msgid "type"
-msgstr ""
+msgstr "type"
 
 msgid "full"
-msgstr ""
+msgstr "complet"
 
 msgid "Miscellaneous"
 msgstr "Divers"
@@ -1343,13 +1343,13 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Temps maxi SVDRP (s)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "Appairage SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "Serveur SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "Serveur SVDRP par défaut"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Prise en compte chaîne (s)"
@@ -1602,7 +1602,7 @@ msgid "Pause live video?"
 msgstr "Arrêter le direct ?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Commencer l'enregistrement ?"
 
 msgid "Recording started"
 msgstr "L'enregistrement a commencé"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 9f625c773..f617d8bd5 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Drazen Dupor <drazen.dupor@dupor.com>, 2004, 2005
 # Dino Ravnic <dino.ravnic@fer.hr>, 2004
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-03-17 19:00+0100\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index bdb6fec28..1b3a0cdfb 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,25 +1,25 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Istvan Koenigsberger <istvnko@hotmail.com>, 2002, 2003, 2006
 # Guido Josten <guido.josten@t-online.de>, 2002, 2003, 2006
 # Thomas Günther <tom@toms-cafe.de>, 2007
-# István Füley <ifuley@tigercomp.ro>, 2007, 2012, 2013, 2015
+# István Füley <ifuley@tigercomp.ro>, 2007, 2012, 2013, 2015, 2018
 # Albert Danis <a.danis@gmx.de>, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
-"PO-Revision-Date: 2015-02-13 09:36+0200\n"
+"PO-Revision-Date: 2018-04-09 21:42+0300\n"
 "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
 "Language-Team: Hungarian <vdr@linuxtv.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.11\n"
+"X-Generator: Poedit 2.0.6\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Érvénytelen csatorna ***"
@@ -663,7 +663,7 @@ msgid "File"
 msgstr "Fájl"
 
 msgid "Record on"
-msgstr ""
+msgstr "Felvétel be"
 
 msgid "Button$Folder"
 msgstr "Könyvtár"
@@ -678,10 +678,10 @@ msgid "First day"
 msgstr "Első nap"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Távoli időzítő nem elérhető"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Az időzítő törölve lett!"
 
 msgid "Select folder"
 msgstr "Könyvtár kiválasztása"
@@ -862,16 +862,16 @@ msgid "always"
 msgstr "mindig"
 
 msgid "by name"
-msgstr ""
+msgstr "név szerint"
 
 msgid "by time"
-msgstr ""
+msgstr "idő szerint"
 
 msgid "ascending"
-msgstr ""
+msgstr "növekvő"
 
 msgid "descending"
-msgstr ""
+msgstr "csökkenő"
 
 msgid "OSD"
 msgstr "OSD"
@@ -961,10 +961,10 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Könyvtárakat rendezd előre"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Felvételek alapértelmezett rendezése"
 
 msgid "Setup.OSD$Sorting direction for recordings"
-msgstr ""
+msgstr "Felvételek rendezésének sorrendje"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Betűk a számgombokon"
@@ -1151,7 +1151,7 @@ msgid " (activating)"
 msgstr " (aktiválás)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ eszköz"
 
 msgid "CAM"
 msgstr "CAM"
@@ -1184,13 +1184,13 @@ msgid "Can't reset CAM!"
 msgstr "CAM újraindítása nem sikerült!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "nincs azonnali felvétel"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "azonnali felvétel megerősítése"
 
 msgid "record instantly"
-msgstr ""
+msgstr "azonnali felvétel"
 
 msgid "do not pause live video"
 msgstr "élőkép leállítása tiltva"
@@ -1223,7 +1223,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Alapértelmezett élettartam (n)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Felvétel gomb kezelése"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "Szünet gomb működése"
@@ -1313,16 +1313,16 @@ msgid "Setup.Replay$Resume ID"
 msgstr "Lejátszás azonosító"
 
 msgid "any hosts"
-msgstr ""
+msgstr "bármelyik host"
 
 msgid "only default host"
-msgstr ""
+msgstr "csak az alapértelmezett host"
 
 msgid "type"
-msgstr ""
+msgstr "típus"
 
 msgid "full"
-msgstr ""
+msgstr "teljes"
 
 msgid "Miscellaneous"
 msgstr "Egyéb"
@@ -1337,13 +1337,13 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP szétkapcsol használat nélkül(mp)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "SVDRP párosítása"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "SVDRP host név"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "SVDRP alapértelmezett host"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Előző csatorna időkorlátja (mp)"
@@ -1596,7 +1596,7 @@ msgid "Pause live video?"
 msgstr "Megállítsam az élő képet?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Felvétel elindítása?"
 
 msgid "Recording started"
 msgstr "Felvétel elindítva"
diff --git a/po/it_IT.po b/po/it_IT.po
index 6e7815cfb..13d326b7b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,19 +1,19 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Alberto Carraro <bertocar@tin.it>, 2001
 # Antonio Ospite <ospite@studenti.unina.it>, 2003, 2006
 # Sean Carlos <seanc@libero.it>, 2005
 # Nino Gerbino <ngerb@interfree.it>, 2006, 2015
-# Diego Pierotto <vdr-italian@tiscali.it>, 2007-2010, 2012, 2013, 2015
+# Diego Pierotto <vdr-italian@tiscali.it>, 2007-2010, 2012, 2013, 2015, 2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
-"PO-Revision-Date: 2017-07-02 23:49+0100\n"
-"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"PO-Revision-Date: 2018-04-06 19:13+0100\n"
+"Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -869,10 +869,10 @@ msgid "by time"
 msgstr "per ora"
 
 msgid "ascending"
-msgstr ""
+msgstr "ascendente"
 
 msgid "descending"
-msgstr ""
+msgstr "discendente"
 
 msgid "OSD"
 msgstr "OSD"
@@ -965,7 +965,7 @@ msgid "Setup.OSD$Default sort mode for recordings"
 msgstr "Modalità ordinamento predefinito per registrazioni"
 
 msgid "Setup.OSD$Sorting direction for recordings"
-msgstr ""
+msgstr "Tipo ordinamento per registrazioni"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Tasti numerici per i caratteri"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index b0855d163..2a1dc51e5 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Valdemaras Pipiras <varas@ambernet.lt>, 2009, 2010, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-11 14:02+0200\n"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index bb2a86094..3c9ec9ca9 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -1,21 +1,22 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013, 2015
+# Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013, 2015, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
-"PO-Revision-Date: 2015-02-08 15:18+0100\n"
+"PO-Revision-Date: 2018-03-31 21:47+0100\n"
 "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
-"Language-Team: Macedonian <en@li.org>\n"
+"Language-Team: Macedonian <kde-i18n-doc@kde.org>\n"
 "Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 ? 0 : n%10==2 ? 1 : 2;\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Невалиден Канал ***"
@@ -659,7 +660,7 @@ msgid "File"
 msgstr "Датотека"
 
 msgid "Record on"
-msgstr ""
+msgstr "Вклучена снимка"
 
 msgid "Button$Folder"
 msgstr "Директориум"
@@ -674,10 +675,10 @@ msgid "First day"
 msgstr "Прв ден"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Грешка при пристап на далечен тајмер"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Тајмерот е избришан!"
 
 msgid "Select folder"
 msgstr "Избери директориум"
@@ -858,16 +859,16 @@ msgid "always"
 msgstr "секогаш"
 
 msgid "by name"
-msgstr ""
+msgstr "по име"
 
 msgid "by time"
-msgstr ""
+msgstr "по време"
 
 msgid "ascending"
-msgstr ""
+msgstr "растечки"
 
 msgid "descending"
-msgstr ""
+msgstr "опаѓачки"
 
 msgid "OSD"
 msgstr "OSD"
@@ -957,10 +958,10 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Секогаш сортирај прво папки"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Начин на сортирање на снимки"
 
 msgid "Setup.OSD$Sorting direction for recordings"
-msgstr ""
+msgstr "Насока на сортирање на снимки"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Нумерички копчиња за букви"
@@ -1147,7 +1148,7 @@ msgid " (activating)"
 msgstr " (активирање)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ уред"
 
 msgid "CAM"
 msgstr "CAM"
@@ -1180,13 +1181,13 @@ msgid "Can't reset CAM!"
 msgstr "Неуспешно рестартирање на CAM-от!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "иклучено инстантно снимање"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "потврди инстантно снимање"
 
 msgid "record instantly"
-msgstr ""
+msgstr "снимај инстантно"
 
 msgid "do not pause live video"
 msgstr "не паузирај пренос во живо"
@@ -1219,7 +1220,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Стандардно веметраење (денови)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Уредување на копче за снимање"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "Подесување на копчето пауза"
@@ -1309,16 +1310,16 @@ msgid "Setup.Replay$Resume ID"
 msgstr "ID на продолжеток"
 
 msgid "any hosts"
-msgstr ""
+msgstr "сите хостови"
 
 msgid "only default host"
-msgstr ""
+msgstr "само стандарден хост"
 
 msgid "type"
-msgstr ""
+msgstr "тип"
 
 msgid "full"
-msgstr ""
+msgstr "полно"
 
 msgid "Miscellaneous"
 msgstr "Разно"
@@ -1333,13 +1334,13 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "SVDRP тајмаут (сек)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "SVDRP врска"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "SVDRP хост"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "SVDRP основен хост"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Зап тајмаут (сек)"
@@ -1592,7 +1593,7 @@ msgid "Pause live video?"
 msgstr "Паузирај пренос во живо?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Почни снимање?"
 
 msgid "Recording started"
 msgstr "Снимањето почна"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9c46bb6c6..0c53bf6fe 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>, 2001
 # Hans Dingemans <hans.dingemans@tacticalops.nl>, 2003, 2005
@@ -11,7 +11,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-10 19:43+0100\n"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 244f7a53a..8d069f09e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # J�rgen Tvedt <pjtvedt@online.no>, 2001
 # Truls Slevigen <truls@slevigen.no>, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2007-08-12 14:17+0200\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 867595537..2cb9ca708 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Michael Rakowski <mrak@gmx.de>, 2002, 2003, 2008
 # Jaroslaw Swierczynski <swiergot@gmail.com>, 2006
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2018-02-19 00:42+0100\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index a173746b5..16b8268cb 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paulo Lopes <pmml@netvita.pt>, 2001
 # Cris Silva <hudokkow@gmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2010-03-28 22:49+0100\n"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index ad40d831c..b73735f6e 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Paul Lacatus <paul@campina.iiruc.ro>, 2002
 # Lucian Muresan <lucianm@users.sourceforge.net>, 2004-2006, 2008, 2010-2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-11 22:26+0100\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 398738197..3d40d10f6 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Vyacheslav Dikonov <sdiconov@mail.ru>, 2004, 2005
 # Oleg Roitburd <oroitburd@gmail.com>, 2005-2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2016-12-27 17:13+0100\n"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 7124a30c7..6bdb47251 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Milan Hrala <hrala.milan@gmail.com>, 2011, 2013, 2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-17 18:59+0100\n"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 66b7225f9..1de992682 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Miha Setina <mihasetina@softhome.net>, 2000
 # Matjaz Thaler <matjaz.thaler@guest.arnes.si>, 2003, 2005, 2006, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2013-03-04 12:46+0100\n"
diff --git a/po/sr_RS.po b/po/sr_RS.po
index e880cad22..ffaf570b0 100644
--- a/po/sr_RS.po
+++ b/po/sr_RS.po
@@ -1,12 +1,12 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Milan Cvijanovi� <elcom_cvijo@hotmail.com>, 2010
 # Zoran Turalija <zoran.turalija@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2013-03-16 15:05+0100\n"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index bd856a293..e5a237e29 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,5 +1,5 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Tomas Prybil <tomas@prybil.se>, 2002, 2003, 2005, 2006
 # Jan Ekholm <chakie@infa.abo.fi>, 2003
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2015-02-12 21:58+0100\n"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index c93c5e292..f213b49da 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Oktay Yolge�en <oktay_73@yahoo.de>, 2007, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2008-02-28 00:33+0100\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 51103f854..00ed8d595 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,21 +1,21 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
-# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013, 2015
+# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013, 2015, 2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2018-03-09 16:02+0100\n"
-"PO-Revision-Date: 2015-02-13 18:14+0100\n"
+"POT-Creation-Date: 2018-03-18 19:42+0100\n"
+"PO-Revision-Date: 2018-03-18 20:00+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Poedit 2.0.6\n"
 
 msgid "*** Invalid Channel ***"
 msgstr "*** Неправильний канал ***"
@@ -659,7 +659,7 @@ msgid "File"
 msgstr "Файл"
 
 msgid "Record on"
-msgstr ""
+msgstr "Вкл. запис"
 
 msgid "Button$Folder"
 msgstr "Тека"
@@ -674,10 +674,10 @@ msgid "First day"
 msgstr "Перший день"
 
 msgid "Error while accessing remote timer"
-msgstr ""
+msgstr "Помилка доступу до віддаленого таймера"
 
 msgid "Timer has been deleted!"
-msgstr ""
+msgstr "Таймер вилучено!"
 
 msgid "Select folder"
 msgstr "Вибрати теку"
@@ -858,16 +858,16 @@ msgid "always"
 msgstr "завжди"
 
 msgid "by name"
-msgstr ""
+msgstr "по назві"
 
 msgid "by time"
-msgstr ""
+msgstr "по часу"
 
 msgid "ascending"
-msgstr ""
+msgstr "в порядку збільшення"
 
 msgid "descending"
-msgstr ""
+msgstr "в порядку зменшення"
 
 msgid "OSD"
 msgstr "Меню"
@@ -957,10 +957,10 @@ msgid "Setup.OSD$Always sort folders first"
 msgstr "Завжди сортувати теки першими"
 
 msgid "Setup.OSD$Default sort mode for recordings"
-msgstr ""
+msgstr "Типовий режим сортування для запису"
 
 msgid "Setup.OSD$Sorting direction for recordings"
-msgstr ""
+msgstr "Напрямок сортування для записів"
 
 msgid "Setup.OSD$Number keys for characters"
 msgstr "Кількість клавіш для символів"
@@ -1147,7 +1147,7 @@ msgid " (activating)"
 msgstr " (активування)"
 
 msgid "@ device"
-msgstr ""
+msgstr "@ пристрій"
 
 msgid "CAM"
 msgstr "CAM (Умовний доступ)"
@@ -1180,13 +1180,13 @@ msgid "Can't reset CAM!"
 msgstr "Помилка перезапуску CAM-модуля!"
 
 msgid "no instant recording"
-msgstr ""
+msgstr "немає негайних записів"
 
 msgid "confirm instant recording"
-msgstr ""
+msgstr "підтвердження негайного запису"
 
 msgid "record instantly"
-msgstr ""
+msgstr "записувати негайно"
 
 msgid "do not pause live video"
 msgstr "не призупиняти перегляд"
@@ -1219,7 +1219,7 @@ msgid "Setup.Recording$Default lifetime (d)"
 msgstr "Строк зберігання запису по замовчуванню (дні)"
 
 msgid "Setup.Recording$Record key handling"
-msgstr ""
+msgstr "Керування кнопкою запису"
 
 msgid "Setup.Recording$Pause key handling"
 msgstr "Обробка клавіші відкладеного перегляду"
@@ -1309,16 +1309,16 @@ msgid "Setup.Replay$Resume ID"
 msgstr "ID продовження"
 
 msgid "any hosts"
-msgstr ""
+msgstr "будь-які вузли"
 
 msgid "only default host"
-msgstr ""
+msgstr "тільки типовий вузол"
 
 msgid "type"
-msgstr ""
+msgstr "тип"
 
 msgid "full"
-msgstr ""
+msgstr "повний"
 
 msgid "Miscellaneous"
 msgstr "Різне"
@@ -1333,13 +1333,13 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
 msgstr "Затримка обриву з'єднання SVDRP (сек)"
 
 msgid "Setup.Miscellaneous$SVDRP peering"
-msgstr ""
+msgstr "SVDRP піринг"
 
 msgid "Setup.Miscellaneous$SVDRP host name"
-msgstr ""
+msgstr "Назва вузла SVDRP"
 
 msgid "Setup.Miscellaneous$SVDRP default host"
-msgstr ""
+msgstr "Типовий вузол SVDRP"
 
 msgid "Setup.Miscellaneous$Zap timeout (s)"
 msgstr "Затримка переключання каналу (сек)"
@@ -1592,7 +1592,7 @@ msgid "Pause live video?"
 msgstr "Призупинити перегляд?"
 
 msgid "Start recording?"
-msgstr ""
+msgstr "Почати запис?"
 
 msgid "Recording started"
 msgstr "Запис почався"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a3861e931..d06e5c436 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,11 +1,11 @@
 # VDR language source file.
-# Copyright (C) 2015 Klaus Schmidinger <vdr@tvdr.de>
+# Copyright (C) 2018 Klaus Schmidinger <vdr@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Nan Feng <nfvdr@live.com>, 2008, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 2.2.0\n"
+"Project-Id-Version: VDR 2.4.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2018-03-09 16:02+0100\n"
 "PO-Revision-Date: 2013-03-04 14:52+0800\n"
diff --git a/shutdown.c b/shutdown.c
index 0dda94802..1fb0394bc 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -6,7 +6,7 @@
  *
  * Original version written by Udo Richter <udo_richter@gmx.de>.
  *
- * $Id: shutdown.c 4.1 2015/07/18 11:29:26 kls Exp $
+ * $Id: shutdown.c 4.2 2018/03/23 15:39:21 kls Exp $
  */
 
 #include "shutdown.h"
diff --git a/svdrp.c b/svdrp.c
index 79d938f40..0f56d10ff 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.36 2018/03/18 10:43:53 kls Exp $
+ * $Id: svdrp.c 4.37 2018/03/19 12:16:33 kls Exp $
  */
 
 #include "svdrp.h"
diff --git a/svdrpsend.1 b/svdrpsend.1
index 74d535be4..36b9984f7 100644
--- a/svdrpsend.1
+++ b/svdrpsend.1
@@ -1,4 +1,4 @@
-.TH "svdrpsend" "1" "19 Feb 2015" "2.2" "Video Disk Recorder"
+.TH "svdrpsend" "1" "15 Apr 2018" "2.4" "Video Disk Recorder"
 .SH NAME
 .LP
 svdrpsend \- sends commands to VDR
diff --git a/vdr.1 b/vdr.1
index 3278451ca..0e04d3ba3 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2013 Klaus Schmidinger
+.\" Copyright (C) 2018 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 4.3 2018/02/09 15:09:07 kls Exp $
+.\" $Id: vdr.1 4.4 2018/04/10 13:58:06 kls Exp $
 .\"
-.TH vdr 1 "19 Feb 2015" "2.2" "Video Disk Recorder"
+.TH vdr 1 "15 Apr 2018" "2.4" "Video Disk Recorder"
 .SH NAME
 vdr \- the Video Disk Recorder
 .SH SYNOPSIS
@@ -316,7 +316,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@tvdr.de>.
 .SH COPYRIGHT
-Copyright \(co 2013 Klaus Schmidinger.
+Copyright \(co 2018 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index b04b20d4f..777f6af3a 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2013 Klaus Schmidinger
+.\" Copyright (C) 2018 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 4.7 2018/02/15 16:00:42 kls Exp $
+.\" $Id: vdr.5 4.8 2018/04/10 13:58:16 kls Exp $
 .\"
-.TH vdr 5 "19 Feb 2015" "2.2" "Video Disk Recorder Files"
+.TH vdr 5 "15 Apr 2018" "2.4" "Video Disk Recorder Files"
 .SH NAME
 vdr_files \- the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -990,7 +990,7 @@ Written by Klaus Schmidinger.
 .SH REPORTING BUGS
 Report bugs to <vdr\-bugs@tvdr.de>.
 .SH COPYRIGHT
-Copyright \(co 2013 Klaus Schmidinger.
+Copyright \(co 2018 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index f9e5bb8fb..00f59c2a9 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1,7 +1,7 @@
 /*
  * vdr.c: Video Disk Recorder main program
  *
- * Copyright (C) 2000, 2003, 2006, 2008, 2013 Klaus Schmidinger
+ * Copyright (C) 2000-2018 Klaus Schmidinger
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.24 2018/03/04 14:00:29 kls Exp $
+ * $Id: vdr.c 4.25 2018/04/10 13:24:43 kls Exp $
  */
 
 #include <getopt.h>

From 794ab7c6e42c385c5264803b0f1f5ecf7604e762 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Thu, 19 Apr 2018 13:49:00 +0200
Subject: [PATCH 264/307] vdr-2.4.0-01-fix-svdrp-modt-recflag.diff

This patch fixes a bug in handling the tfRecording flag in the SVDRP commands MODT and UPDT. The tfRecording flag must only be handled by the VDR that actually hosts and processes the timer.
---
 svdrp.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/svdrp.c b/svdrp.c
index 0f56d10ff..15bd510d7 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -2036,6 +2036,7 @@ void cSVDRPServer::CmdMODT(const char *Option)
         LOCK_TIMERS_WRITE;
         Timers->SetExplicitModify();
         if (cTimer *Timer = Timers->GetById(Id)) {
+           bool IsRecording = Timer->HasFlags(tfRecording);
            cTimer t = *Timer;
            if (strcasecmp(tail, "ON") == 0)
               t.SetFlags(tfActive);
@@ -2046,6 +2047,10 @@ void cSVDRPServer::CmdMODT(const char *Option)
               return;
               }
            *Timer = t;
+           if (IsRecording)
+              Timer->SetFlags(tfRecording);
+           else
+              Timer->ClrFlags(tfRecording);
            Timers->SetModified();
            isyslog("SVDRP %s < %s modified timer %s (%s)", Setup.SVDRPHostName, *clientName, *Timer->ToDescr(), Timer->HasFlags(tfActive) ? "active" : "inactive");
            Reply(250, "%d %s", Timer->Id(), *Timer->ToText(true));
@@ -2478,12 +2483,18 @@ void cSVDRPServer::CmdUPDT(const char *Option)
      if (Timer->Parse(Option)) {
         LOCK_TIMERS_WRITE;
         if (cTimer *t = Timers->GetTimer(Timer)) {
+           bool IsRecording = t->HasFlags(tfRecording);
            t->Parse(Option);
            delete Timer;
            Timer = t;
+           if (IsRecording)
+              Timer->SetFlags(tfRecording);
+           else
+              Timer->ClrFlags(tfRecording);
            isyslog("SVDRP %s < %s updated timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
            }
         else {
+           Timer->ClrFlags(tfRecording);
            Timers->Add(Timer);
            isyslog("SVDRP %s < %s added timer %s", Setup.SVDRPHostName, *clientName, *Timer->ToDescr());
            }

From a60eb1da03cecf556cdfe392ec4f2001dc3ff39a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 28 Apr 2018 13:54:00 +0200
Subject: [PATCH 265/307] vdr-2.4.0-02-fix-invalid-locking-sequence.diff

This patch fixes a possible invalid locking sequence in case a remote timer handling error message is displayed on the OSD and the skin tries to lock the Recordings or DeletedRecordings list in its Flush() function (for instance by calling cVideoDiskUsage::HasChanged()).
To do this, the call to Skins.Message() in menu.c's HandleRemoteModifications() has been changed to Skins.QueueMessage(), and cSkins::ProcessQueuedMessages() is now called unconditionally in the main loop, and checks whether the current cSkinDisplay object (if any) implements SetMessage().
---
 menu.c  | 2 +-
 skins.c | 8 ++++++++
 vdr.c   | 3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/menu.c b/menu.c
index c8a557c19..642608ddc 100644
--- a/menu.c
+++ b/menu.c
@@ -1075,7 +1075,7 @@ static bool HandleRemoteModifications(cTimer *NewTimer, cTimer *OldTimer = NULL)
 {
   cString ErrorMessage;
   if (!HandleRemoteTimerModifications(NewTimer, OldTimer, &ErrorMessage)) {
-     Skins.Message(mtError, ErrorMessage);
+     Skins.QueueMessage(mtError, ErrorMessage);
      return false;
      }
   return true;
diff --git a/skins.c b/skins.c
index 3aee8140c..43e14c068 100644
--- a/skins.c
+++ b/skins.c
@@ -352,6 +352,14 @@ void cSkins::ProcessQueuedMessages(void)
      dsyslog("cSkins::ProcessQueuedMessages() called from background thread - ignored!");
      return;
      }
+  // Check whether there is a cSkinDisplay object (if any) that implements SetMessage():
+  if (cSkinDisplay *sd = cSkinDisplay::Current()) {
+     if (!(dynamic_cast<cSkinDisplayChannel *>(sd) ||
+           dynamic_cast<cSkinDisplayMenu *>(sd) ||
+           dynamic_cast<cSkinDisplayReplay *>(sd) ||
+           dynamic_cast<cSkinDisplayMessage *>(sd)))
+        return;
+     }
   cSkinQueuedMessage *msg = NULL;
   // Get the first waiting message:
   queueMessageMutex.Lock();
diff --git a/vdr.c b/vdr.c
index 00f59c2a9..cf1afff10 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1176,8 +1176,7 @@ int main(int argc, char *argv[])
         if (!Menu && !cOsd::IsOpen())
            Menu = CamControl();
         // Queued messages:
-        if (!Skins.IsOpen())
-           Skins.ProcessQueuedMessages();
+        Skins.ProcessQueuedMessages();
         // User Input:
         cOsdObject *Interact = Menu ? Menu : cControl::Control();
         eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());

From c802128b37dee055b5d4e76ba509be325a9dbbec Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 6 May 2018 10:50:00 +0200
Subject: [PATCH 266/307] vdr-2.4.0-03-fix-locking-channel-display.diff

Fixed locking the Channels list in cDisplayChannel, where the lock was still held when Flush() was called.
---
 menu.c | 69 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/menu.c b/menu.c
index 642608ddc..b5088d922 100644
--- a/menu.c
+++ b/menu.c
@@ -4626,14 +4626,17 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
   cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
   positioner = NULL;
   channel = NULL;
-  LOCK_CHANNELS_READ;
-  channel = Channels->GetByNumber(Number);
-  lastPresent = lastFollowing = NULL;
-  if (channel) {
-     DisplayChannel();
-     DisplayInfo();
+  {
+    LOCK_CHANNELS_READ;
+    channel = Channels->GetByNumber(Number);
+    lastPresent = lastFollowing = NULL;
+    if (channel) {
+       DisplayChannel();
+       DisplayInfo();
+       }
+  }
+  if (channel)
      displayChannel->Flush();
-     }
   lastTime.Set();
 }
 
@@ -4868,31 +4871,33 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
             }
     };
   if (positioner || !timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
-     LOCK_CHANNELS_READ;
-     if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
-        // makes sure a channel switch through the SVDRP CHAN command is displayed
-        channel = Channels->GetByNumber(cDevice::CurrentChannel());
-        Refresh();
-        lastTime.Set();
-        }
-     DisplayInfo();
-     if (NewChannel) {
-        SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
-        Channels->SwitchTo(NewChannel->Number());
-        SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
-        channel = NewChannel;
-        }
-     const cPositioner *Positioner = cDevice::ActualDevice()->Positioner();
-     bool PositionerMoving = Positioner && Positioner->IsMoving();
-     SetNeedsFastResponse(PositionerMoving);
-     if (!PositionerMoving) {
-        if (positioner)
-           lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached
-        Positioner = NULL;
-        }
-     if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner
-        displayChannel->SetPositioner(Positioner);
-     positioner = Positioner;
+     {
+       LOCK_CHANNELS_READ;
+       if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
+          // makes sure a channel switch through the SVDRP CHAN command is displayed
+          channel = Channels->GetByNumber(cDevice::CurrentChannel());
+          Refresh();
+          lastTime.Set();
+          }
+       DisplayInfo();
+       if (NewChannel) {
+          SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
+          Channels->SwitchTo(NewChannel->Number());
+          SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
+          channel = NewChannel;
+          }
+       const cPositioner *Positioner = cDevice::ActualDevice()->Positioner();
+       bool PositionerMoving = Positioner && Positioner->IsMoving();
+       SetNeedsFastResponse(PositionerMoving);
+       if (!PositionerMoving) {
+          if (positioner)
+             lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached
+          Positioner = NULL;
+          }
+       if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner
+          displayChannel->SetPositioner(Positioner);
+       positioner = Positioner;
+     }
      displayChannel->Flush();
      return osContinue;
      }

From fc7d553ca43d1ef40333001bd10d502dd65ed1f1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 27 May 2018 11:10:00 +0200
Subject: [PATCH 267/307] vdr-2.4.0-04-fix-locking-channel-display-2.diff

Fixed locking the Channels list in cDisplayChannel, where the lock was still held when Flush() was called (cont'd).
---
 menu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/menu.c b/menu.c
index b5088d922..be0f022a2 100644
--- a/menu.c
+++ b/menu.c
@@ -4654,8 +4654,10 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   displayChannel = Skins.Current()->DisplayChannel(withInfo);
   positioner = NULL;
   channel = NULL;
-  LOCK_CHANNELS_READ;
-  channel = Channels->GetByNumber(cDevice::CurrentChannel());
+  {
+    LOCK_CHANNELS_READ;
+    channel = Channels->GetByNumber(cDevice::CurrentChannel());
+  }
   ProcessKey(FirstKey);
 }
 

From a9d1dc5e895bd8910756563ae1880d3795019e69 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 16 Jul 2018 10:13:00 +0200
Subject: [PATCH 268/307] vdr-2.4.0-05-fix-shutdown.diff

Fixed shutdown after user inactivity in case a plugin is keeping the OSD open.
---
 vdr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vdr.c b/vdr.c
index cf1afff10..7654e0e28 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1514,9 +1514,7 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
-           // Handle housekeeping tasks
-
+        if (!cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Shutdown:
            // Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
            time_t Soon = Now + SHUTDOWNWAIT;
@@ -1535,7 +1533,8 @@ int main(int argc, char *argv[])
               // Do this again a bit later:
               ShutdownHandler.SetRetry(SHUTDOWNRETRY);
               }
-
+           // Handle housekeeping tasks
+           if ((Now - LastInteract) > ACTIVITYTIMEOUT) {
            // Disk housekeeping:
            RemoveDeletedRecordings();
            ListGarbageCollector.Purge();
@@ -1543,6 +1542,7 @@ int main(int argc, char *argv[])
            // Plugins housekeeping:
            PluginManager.Housekeeping();
            }
+           }
 
         ReportEpgBugFixStats();
 

From b9b90d86213f2ab61cec9689dcdf9c48b0d0554a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 16 Jul 2018 10:45:00 +0200
Subject: [PATCH 269/307] vdr-2.4.0-06-fix-channel-switch.diff

Fixed switching through encrypted channels with the Up/Down keys
---
 device.c | 2 ++
 menu.c   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/device.c b/device.c
index 626495dcb..d01eff497 100644
--- a/device.c
+++ b/device.c
@@ -787,6 +787,7 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
   if (LiveView) {
      isyslog("switching to channel %d %s (%s)", Channel->Number(), *Channel->GetChannelID().ToString(), Channel->Name());
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
+                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
      }
   for (int i = 3; i--;) {
       switch (SetChannel(Channel, LiveView)) {
@@ -809,6 +810,7 @@ bool cDevice::SwitchChannel(int Direction)
   Direction = sgn(Direction);
   if (Direction) {
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
+                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
      int n = CurrentChannel() + Direction;
      int first = n;
      LOCK_CHANNELS_READ;
diff --git a/menu.c b/menu.c
index be0f022a2..76b66526b 100644
--- a/menu.c
+++ b/menu.c
@@ -4704,6 +4704,8 @@ void cDisplayChannel::Refresh(void)
 const cChannel *cDisplayChannel::NextAvailableChannel(const cChannel *Channel, int Direction)
 {
   if (Direction) {
+     cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
+                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
      LOCK_CHANNELS_READ;
      while (Channel) {
            Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel);

From 503a746415a264cabfd973232f6a9b4a73b970f3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 23 Sep 2018 11:40:00 +0200
Subject: [PATCH 270/307] vdr-2.4.0-07-fix-disabling-mtd.diff

Now deactivating MTD support if a non MCD capable CAM is inserted after removing a previously used CAM that is MCD capable.
---
 ci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci.c b/ci.c
index 07e0c8924..1ffe9888f 100644
--- a/ci.c
+++ b/ci.c
@@ -1213,6 +1213,7 @@ void cCiConditionalAccessSupport::Process(int Length, const uint8_t *Data)
         }
      else {
         dsyslog("CAM %d: doesn't reply to QUERY - only a single channel can be decrypted", CamSlot()->SlotNumber());
+        CamSlot()->MtdActivate(false);
         state = 4; // normal operation
         }
      }

From 3a3431b9d356b0e9ac86dfaf8a9e2a111a196f48 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 29 Oct 2018 13:29:00 +0100
Subject: [PATCH 271/307] vdr-2.4.0-08-add-multi-frontend-support.diff

Added support for DVB devices with more than one frontend that all use the same dvr and demux. Note that in order for this to work, you must not set symbolic links like "demux1 -> demux0" and "dvr1 -> dvr0", as is mentioned in some user manuals of multi frontend DVB cards.
---
 dvbdevice.c | 548 ++++++++++++++++++++++++++++++++--------------------
 dvbdevice.h |  13 +-
 2 files changed, 344 insertions(+), 217 deletions(-)

diff --git a/dvbdevice.c b/dvbdevice.c
index 8710e7750..1026769a2 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -293,19 +293,248 @@ bool cDvbTransponderParameters::Parse(const char *s)
   return true;
 }
 
+// --- cDvbFrontend ----------------------------------------------------------
+
+const char *DeliverySystemNames[] = {
+  "???",
+  "DVB-C",
+  "DVB-C",
+  "DVB-T",
+  "DSS",
+  "DVB-S",
+  "DVB-S2",
+  "DVB-H",
+  "ISDBT",
+  "ISDBS",
+  "ISDBC",
+  "ATSC",
+  "ATSCMH",
+  "DTMB",
+  "CMMB",
+  "DAB",
+  "DVB-T2",
+  "TURBO",
+  "DVB-C",
+  "DVB-C2",
+  NULL
+  };
+
+static const int DeliverySystemNamesMax = sizeof(DeliverySystemNames) / sizeof(DeliverySystemNames[0]) - 2; // -1 to get the maximum allowed index & -1 for the NULL => -2
+
+static const char *GetDeliverySystemName(int Index)
+{
+  if (Index > DeliverySystemNamesMax)
+     Index = 0;
+  return DeliverySystemNames[Index];
+};
+
+#define MAXFRONTENDCMDS 16
+#define SETCMD(c, d) { Props[CmdSeq.num].cmd = (c);\
+                       Props[CmdSeq.num].u.data = (d);\
+                       if (CmdSeq.num++ > MAXFRONTENDCMDS) {\
+                          esyslog("ERROR: too many tuning commands on frontend %d/%d", adapter, frontend);\
+                          return false;\
+                          }\
+                     }
+
+class cDvbFrontend {
+private:
+  int adapter, frontend;
+  int fd_frontend;
+  uint32_t subsystemId;
+  dvb_frontend_info frontendInfo;
+  cVector<int> deliverySystems;
+  int numModulations;
+  bool QueryDeliverySystems(void);
+public:
+  cDvbFrontend(int Adapter, int Frontend);
+  ~cDvbFrontend();
+  int Open(void);
+  void Close(void);
+  const char *FrontendName(void) { return frontendInfo.name; }
+  bool ProvidesDeliverySystem(int DeliverySystem) const;
+  bool ProvidesModulation(int System, int StreamId, int Modulation) const;
+  int NumDeliverySystems(void) const { return deliverySystems.Size(); }
+  int NumModulations(void) const { return numModulations; }
+  uint32_t SubsystemId(void) const { return subsystemId; }
+  };
+
+cDvbFrontend::cDvbFrontend(int Adapter, int Frontend)
+{
+  adapter = Adapter;
+  frontend = Frontend;
+  fd_frontend = -1;
+  subsystemId = cDvbDeviceProbe::GetSubsystemId(adapter, frontend);
+  numModulations = 0;
+  Open();
+  QueryDeliverySystems();
+  Close();
+}
+
+cDvbFrontend::~cDvbFrontend()
+{
+  Close();
+}
+
+int cDvbFrontend::Open(void)
+{
+  Close();
+  fd_frontend = DvbOpen(DEV_DVB_FRONTEND, adapter, frontend, O_RDWR | O_NONBLOCK, true);
+  return fd_frontend;
+}
+
+void cDvbFrontend::Close(void)
+{
+  if (fd_frontend >= 0) {
+     if (close(fd_frontend) != 0)
+        esyslog("ERROR: frontend %d/%d", adapter, frontend);
+     fd_frontend = -1;
+     }
+}
+
+bool cDvbFrontend::ProvidesDeliverySystem(int DeliverySystem) const
+{
+  for (int i = 0; i < deliverySystems.Size(); i++) {
+      if (deliverySystems[i] == DeliverySystem)
+         return true;
+      }
+  return false;
+}
+
+bool cDvbFrontend::ProvidesModulation(int System, int StreamId, int Modulation) const
+{
+  if (StreamId != 0 && !(frontendInfo.caps & FE_CAN_MULTISTREAM))
+     return false;
+  if (Modulation == QPSK     && !(frontendInfo.caps & FE_CAN_QPSK) ||
+      Modulation == QAM_16   && !(frontendInfo.caps & FE_CAN_QAM_16) ||
+      Modulation == QAM_32   && !(frontendInfo.caps & FE_CAN_QAM_32) ||
+      Modulation == QAM_64   && !(frontendInfo.caps & FE_CAN_QAM_64) ||
+      Modulation == QAM_128  && !(frontendInfo.caps & FE_CAN_QAM_128) ||
+      Modulation == QAM_256  && !(frontendInfo.caps & FE_CAN_QAM_256) ||
+      Modulation == QAM_AUTO && !(frontendInfo.caps & FE_CAN_QAM_AUTO) ||
+      Modulation == VSB_8    && !(frontendInfo.caps & FE_CAN_8VSB) ||
+      Modulation == VSB_16   && !(frontendInfo.caps & FE_CAN_16VSB) ||
+      Modulation == PSK_8    && !(frontendInfo.caps & FE_CAN_TURBO_FEC) && System == SYS_DVBS) // "turbo fec" is a non standard FEC used by North American broadcasters - this is a best guess to de
+     return false;
+  return true;
+}
+
+bool cDvbFrontend::QueryDeliverySystems(void)
+{
+  deliverySystems.Clear();
+  numModulations = 0;
+  if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) < 0) {
+     LOG_ERROR;
+     return false;
+     }
+  dtv_property Props[1];
+  dtv_properties CmdSeq;
+  // Determine the version of the running DVB API:
+  if (!DvbApiVersion) {
+     memset(&Props, 0, sizeof(Props));
+     memset(&CmdSeq, 0, sizeof(CmdSeq));
+     CmdSeq.props = Props;
+     SETCMD(DTV_API_VERSION, 0);
+     if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
+        LOG_ERROR;
+        return false;
+        }
+     DvbApiVersion = Props[0].u.data;
+     isyslog("DVB API version is 0x%04X (VDR was built with 0x%04X)", DvbApiVersion, DVBAPIVERSION);
+     }
+  // Determine the types of delivery systems this device provides:
+  bool LegacyMode = true;
+  if (DvbApiVersion >= 0x0505) {
+     memset(&Props, 0, sizeof(Props));
+     memset(&CmdSeq, 0, sizeof(CmdSeq));
+     CmdSeq.props = Props;
+     SETCMD(DTV_ENUM_DELSYS, 0);
+     int Result = ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq);
+     if (Result == 0) {
+        for (uint i = 0; i < Props[0].u.buffer.len; i++) {
+            // activate this line to simulate a multi-frontend device if you only have a single-frontend device with DVB-S and DVB-S2:
+            //if (frontend == 0 && Props[0].u.buffer.data[i] != SYS_DVBS || frontend == 1 && Props[0].u.buffer.data[i] != SYS_DVBS2)
+            deliverySystems.Append(Props[0].u.buffer.data[i]);
+            }
+        LegacyMode = false;
+        }
+     else {
+        esyslog("ERROR: can't query delivery systems on frontend %d/%d - falling back to legacy mode", adapter, frontend);
+        }
+     }
+  if (LegacyMode) {
+     // Legacy mode (DVB-API < 5.5):
+     switch (frontendInfo.type) {
+       case FE_QPSK: deliverySystems.Append(SYS_DVBS);
+                     if (frontendInfo.caps & FE_CAN_2G_MODULATION)
+                        deliverySystems.Append(SYS_DVBS2);
+                     break;
+       case FE_OFDM: deliverySystems.Append(SYS_DVBT);
+                     if (frontendInfo.caps & FE_CAN_2G_MODULATION)
+                        deliverySystems.Append(SYS_DVBT2);
+                     break;
+       case FE_QAM:  deliverySystems.Append(SYS_DVBC_ANNEX_AC); break;
+       case FE_ATSC: deliverySystems.Append(SYS_ATSC); break;
+       default: esyslog("ERROR: unknown frontend type %d on frontend %d/%d", frontendInfo.type, adapter, frontend);
+       }
+     }
+  if (deliverySystems.Size() > 0) {
+     cString ds("");
+     for (int i = 0; i < deliverySystems.Size(); i++)
+         ds = cString::sprintf("%s%s%s", *ds, i ? "," : "", GetDeliverySystemName(deliverySystems[i]));
+     cString ms("");
+     if (frontendInfo.caps & FE_CAN_QPSK)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QPSK, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_16)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_16, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_32)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_32, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_64)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_64, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_128)   { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_128, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_QAM_256)   { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_256, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_8VSB)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(VSB_8, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_16VSB)     { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(VSB_16, ModulationValues)); }
+     if (frontendInfo.caps & FE_CAN_TURBO_FEC) { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", "TURBO_FEC"); }
+     if (!**ms)
+        ms = "unknown modulations";
+     isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, *ds, *ms, frontendInfo.name);
+     return true;
+     }
+  else
+     esyslog("ERROR: frontend %d/%d doesn't provide any delivery systems", adapter, frontend);
+  return false;
+}
+
 // --- cDvbTuner -------------------------------------------------------------
 
 #define TUNER_POLL_TIMEOUT  10 // ms
 
+static int GetRequiredDeliverySystem(const cChannel *Channel, const cDvbTransponderParameters *Dtp)
+{
+  int ds = SYS_UNDEFINED;
+  if (Channel->IsAtsc())
+     ds = SYS_ATSC;
+  else if (Channel->IsCable())
+     ds = SYS_DVBC_ANNEX_AC;
+  else if (Channel->IsSat())
+     ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBS : SYS_DVBS2;
+  else if (Channel->IsTerr())
+     ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBT : SYS_DVBT2;
+  else
+     esyslog("ERROR: can't determine frontend type for channel %d (%s)", Channel->Number(), Channel->Name());
+  return ds;
+}
+
 class cDvbTuner : public cThread {
 private:
   static cMutex bondMutex;
   enum eTunerStatus { tsIdle, tsSet, tsPositioning, tsTuned, tsLocked };
   int frontendType;
   const cDvbDevice *device;
-  int fd_frontend;
-  int adapter, frontend;
-  uint32_t subsystemId;
+  mutable int fd_frontend;
+  int adapter;
+  mutable int frontend;
+  cVector<cDvbFrontend *> dvbFrontends;
+  mutable cDvbFrontend *dvbFrontend;
+  int numDeliverySystems;
+  int numModulations;
   int tuneTimeout;
   int lockTimeout;
   time_t lastTimeoutReport;
@@ -320,7 +549,7 @@ class cDvbTuner : public cThread {
   const cScr *scr;
   bool lnbPowerTurnedOn;
   eTunerStatus tunerStatus;
-  cMutex mutex;
+  mutable cMutex mutex;
   cCondVar locked;
   cCondVar newSet;
   cDvbTuner *bondedTuner;
@@ -337,14 +566,19 @@ class cDvbTuner : public cThread {
   bool SetFrontend(void);
   virtual void Action(void);
 public:
-  cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend);
+  cDvbTuner(const cDvbDevice *Device, int Adapter, int Frontend);
   virtual ~cDvbTuner();
+  bool ProvidesDeliverySystem(int DeliverySystem) const;
+  bool ProvidesModulation(int System, int StreamId, int Modulation) const;
+  bool ProvidesFrontend(const cChannel *Channel, bool Activate = false) const;
   int FrontendType(void) const { return frontendType; }
+  const char *FrontendName(void) { return dvbFrontend->FrontendName(); }
+  int NumProvidedSystems(void) const { return numDeliverySystems + numModulations; }
   bool Bond(cDvbTuner *Tuner);
   void UnBond(void);
   bool BondingOk(const cChannel *Channel, bool ConsiderOccupied = false) const;
   const cChannel *GetTransponder(void) const { return &channel; }
-  uint32_t SubsystemId(void) const { return subsystemId; }
+  uint32_t SubsystemId(void) const { return dvbFrontend->SubsystemId(); }
   bool IsTunedTo(const cChannel *Channel) const;
   void SetChannel(const cChannel *Channel);
   bool Locked(int TimeoutMs = 0);
@@ -356,14 +590,14 @@ class cDvbTuner : public cThread {
 
 cMutex cDvbTuner::bondMutex;
 
-cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
+cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Adapter, int Frontend)
 {
   frontendType = SYS_UNDEFINED;
   device = Device;
-  fd_frontend = Fd_Frontend;
+  fd_frontend = -1;
   adapter = Adapter;
   frontend = Frontend;
-  subsystemId = cDvbDeviceProbe::GetSubsystemId(adapter, frontend);
+  dvbFrontend = NULL;
   tuneTimeout = 0;
   lockTimeout = 0;
   lastTimeoutReport = 0;
@@ -379,7 +613,31 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int
   tunerStatus = tsIdle;
   bondedTuner = NULL;
   bondedMaster = false;
-  SetDescription("frontend %d/%d tuner", adapter, frontend);
+  cDvbFrontend *fe = new cDvbFrontend(adapter, frontend);
+  dvbFrontends.Append(fe);
+  numDeliverySystems = fe->NumDeliverySystems();
+  numModulations = fe->NumModulations();
+  cString FrontendNumbers = cString::sprintf("%d", frontend);
+  // Check for multiple frontends:
+  if (frontend == 0) {
+     for (int i = 1; ; i++) {
+         if (access(DvbName(DEV_DVB_FRONTEND, adapter, i), F_OK) == 0) {
+            if (access(DvbName(DEV_DVB_DEMUX, adapter, i), F_OK) != 0) {
+               fe = new cDvbFrontend(adapter, i);
+               dvbFrontends.Append(fe);
+               numDeliverySystems += fe->NumDeliverySystems();
+               //numModulations += fe->NumModulations(); // looks like in multi frontend devices all frontends report the same modulations
+               FrontendNumbers = cString::sprintf("%s+%d", *FrontendNumbers, i);
+               }
+            }
+         else
+            break;
+         }
+     }
+  // Open default frontend:
+  dvbFrontend = dvbFrontends[0];
+  fd_frontend = dvbFrontend->Open();
+  SetDescription("frontend %d/%s tuner", adapter, *FrontendNumbers);
   Start();
 }
 
@@ -396,6 +654,49 @@ cDvbTuner::~cDvbTuner()
      ExecuteDiseqc(lastDiseqc, &Frequency);
      }
   */
+  for (int i = 0; i < dvbFrontends.Size(); i++)
+      delete dvbFrontends[i];
+}
+
+bool cDvbTuner::ProvidesDeliverySystem(int DeliverySystem) const
+{
+  for (int i = 0; i < dvbFrontends.Size(); i++) {
+      if (dvbFrontends[i]->ProvidesDeliverySystem(DeliverySystem))
+         return true;
+      }
+  return false;
+}
+
+bool cDvbTuner::ProvidesModulation(int System, int StreamId, int Modulation) const
+{
+  for (int i = 0; i < dvbFrontends.Size(); i++) {
+      if (dvbFrontends[i]->ProvidesModulation(System, StreamId, Modulation))
+         return true;
+      }
+  return false;
+}
+
+bool cDvbTuner::ProvidesFrontend(const cChannel *Channel, bool Activate) const
+{
+  cDvbTransponderParameters dtp(Channel->Parameters());
+  int DeliverySystem = GetRequiredDeliverySystem(Channel, &dtp);
+  for (int i = 0; i < dvbFrontends.Size(); i++) {
+      if (dvbFrontends[i]->ProvidesDeliverySystem(DeliverySystem) && dvbFrontends[i]->ProvidesModulation(dtp.System(), dtp.StreamId(), dtp.Modulation())) {
+         if (Activate && dvbFrontend != dvbFrontends[i]) {
+            cMutexLock MutexLock(&mutex);
+            dvbFrontend->Close();
+            dvbFrontend = dvbFrontends[i];
+            fd_frontend = dvbFrontend->Open();
+            frontend = i;
+            dsyslog("using frontend %d/%d", adapter, frontend);
+            lastUncValue = 0;
+            lastUncDelta = 0;
+            lastUncChange = 0;
+            }
+         return true;
+         }
+      }
+  return false;
 }
 
 bool cDvbTuner::Bond(cDvbTuner *Tuner)
@@ -565,15 +866,6 @@ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status) const
 //#define DEBUG_SIGNALSTRENGTH
 //#define DEBUG_SIGNALQUALITY
 
-#define MAXFRONTENDCMDS 16
-#define SETCMD(c, d) { Props[CmdSeq.num].cmd = (c);\
-                       Props[CmdSeq.num].u.data = (d);\
-                       if (CmdSeq.num++ > MAXFRONTENDCMDS) {\
-                          esyslog("ERROR: too many tuning commands on frontend %d/%d", adapter, frontend);\
-                          return false;\
-                          }\
-                     }
-
 bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per, int *Status) const
 {
   ClearEventQueue();
@@ -585,7 +877,7 @@ bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double
   CmdSeq.props = Props;
   Valid = DTV_STAT_VALID_NONE;
   if (ioctl(fd_frontend, FE_READ_STATUS, &FeStatus) != 0) {
-     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+     esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
      return false;
      }
   if (Status) {
@@ -606,7 +898,7 @@ bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double
   if (Per)      { SETCMD(DTV_STAT_ERROR_BLOCK_COUNT, 0);
                   SETCMD(DTV_STAT_TOTAL_BLOCK_COUNT, 0); }
   if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
-     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+     esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
      return false;
      }
   int i = 0;
@@ -939,7 +1231,7 @@ int cDvbTuner::GetSignalStrength(void) const
       SETCMD(DTV_CODE_RATE_HP, 0); // DVB-T only
       SETCMD(DTV_INNER_FEC, 0);
       if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
-         esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+         esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
          return -1;
          }
       int FeMod = (Props[1].u.st.len > 0) ? (int)Props[1].u.data : -1;
@@ -973,7 +1265,7 @@ int cDvbTuner::GetSignalStrength(void) const
   uint16_t MaxSignal = 0xFFFF; // Let's assume the default is using the entire range.
   // Use the subsystemId to identify individual devices in case they need
   // special treatment to map their Signal value into the range 0...0xFFFF.
-  switch (subsystemId) {
+  switch (dvbFrontend->SubsystemId()) {
     case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2)
     case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2)
                      MaxSignal = 670; break;
@@ -982,7 +1274,7 @@ int cDvbTuner::GetSignalStrength(void) const
   if (s > 100)
      s = 100;
 #ifdef DEBUG_SIGNALSTRENGTH
-  fprintf(stderr, "FE %d/%d: API3 %08X S = %04X %04X %3d%%\n", adapter, frontend, subsystemId, MaxSignal, Signal, s);
+  fprintf(stderr, "FE %d/%d: API3 %08X S = %04X %04X %3d%%\n", adapter, frontend, dvbFrontend->SubsystemId(), MaxSignal, Signal, s);
 #endif
   return s;
 }
@@ -1005,7 +1297,7 @@ int cDvbTuner::GetSignalQuality(void) const
       SETCMD(DTV_STAT_POST_ERROR_BIT_COUNT, 0);
       SETCMD(DTV_STAT_POST_TOTAL_BIT_COUNT, 0);
       if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
-         esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+         esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
          return -1;
          }
       int FeMod = (Props[1].u.st.len > 0) ? (int)Props[1].u.data : -1;
@@ -1132,7 +1424,7 @@ int cDvbTuner::GetSignalQuality(void) const
      uint16_t MaxSnr = 0xFFFF; // Let's assume the default is using the entire range.
      // Use the subsystemId to identify individual devices in case they need
      // special treatment to map their Snr value into the range 0...0xFFFF.
-     switch (subsystemId) {
+     switch (dvbFrontend->SubsystemId()) {
        case 0x13C21019: // TT-budget S2-3200 (DVB-S/DVB-S2)
        case 0x1AE40001: // TechniSat SkyStar HD2 (DVB-S/DVB-S2)
                         if (frontendType == SYS_DVBS2) {
@@ -1154,7 +1446,7 @@ int cDvbTuner::GetSignalQuality(void) const
      if (q > 100)
         q = 100;
 #ifdef DEBUG_SIGNALQUALITY
-     fprintf(stderr, "FE %d/%d: API3 %08X Q = %04X %04X %d %5d %5d %3d%%\n", adapter, frontend, subsystemId, MaxSnr, Snr, HasSnr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
+     fprintf(stderr, "FE %d/%d: API3 %08X Q = %04X %04X %d %5d %5d %3d%%\n", adapter, frontend, dvbFrontend->SubsystemId(), MaxSnr, Snr, HasSnr, HasBer ? int(Ber) : -1, HasUnc ? int(Unc) : -1, q);
 #endif
      return q;
      }
@@ -1240,22 +1532,6 @@ void cDvbTuner::ResetToneAndVoltage(void)
   CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
 }
 
-static int GetRequiredDeliverySystem(const cChannel *Channel, const cDvbTransponderParameters *Dtp)
-{
-  int ds = SYS_UNDEFINED;
-  if (Channel->IsAtsc())
-     ds = SYS_ATSC;
-  else if (Channel->IsCable())
-     ds = SYS_DVBC_ANNEX_AC;
-  else if (Channel->IsSat())
-     ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBS : SYS_DVBS2;
-  else if (Channel->IsTerr())
-     ds = Dtp->System() == DVB_SYSTEM_1 ? SYS_DVBT : SYS_DVBT2;
-  else
-     esyslog("ERROR: can't determine frontend type for channel %d (%s)", Channel->Number(), Channel->Name());
-  return ds;
-}
-
 bool cDvbTuner::SetFrontend(void)
 {
   dtv_property Props[MAXFRONTENDCMDS];
@@ -1265,7 +1541,7 @@ bool cDvbTuner::SetFrontend(void)
   CmdSeq.props = Props;
   SETCMD(DTV_CLEAR, 0);
   if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
-     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+     esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
      return false;
      }
   CmdSeq.num = 0;
@@ -1390,7 +1666,7 @@ bool cDvbTuner::SetFrontend(void)
      }
   SETCMD(DTV_TUNE, 0);
   if (ioctl(fd_frontend, FE_SET_PROPERTY, &CmdSeq) < 0) {
-     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
+     esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
      return false;
      }
   return true;
@@ -1402,11 +1678,11 @@ void cDvbTuner::Action(void)
   bool LostLock = false;
   fe_status_t Status = (fe_status_t)0;
   while (Running()) {
+        int WaitTime = 1000;
         fe_status_t NewStatus;
         if (GetFrontendStatus(NewStatus))
            Status = NewStatus;
         cMutexLock MutexLock(&mutex);
-        int WaitTime = 1000;
         switch (tunerStatus) {
           case tsIdle:
                break; // we want the TimedWait() below!
@@ -1541,55 +1817,16 @@ bool cDvbDevice::useDvbDevices = true;
 int cDvbDevice::setTransferModeForDolbyDigital = 1;
 cMutex cDvbDevice::bondMutex;
 
-const char *DeliverySystemNames[] = {
-  "",
-  "DVB-C",
-  "DVB-C",
-  "DVB-T",
-  "DSS",
-  "DVB-S",
-  "DVB-S2",
-  "DVB-H",
-  "ISDBT",
-  "ISDBS",
-  "ISDBC",
-  "ATSC",
-  "ATSCMH",
-  "DTMB",
-  "CMMB",
-  "DAB",
-  "DVB-T2",
-  "TURBO",
-  "DVB-C",
-  "DVB-C2",
-  NULL
-  };
-
-static const int DeliverySystemNamesMax = sizeof(DeliverySystemNames) / sizeof(DeliverySystemNames[0]) - 2; // -1 to get the maximum allowed index & -1 for the NULL => -2
-
-static const char *GetDeliverySystemName(int Index)
-{
-  if (Index > DeliverySystemNamesMax)
-     Index = 0;
-  return DeliverySystemNames[Index];
-};
-
 cDvbDevice::cDvbDevice(int Adapter, int Frontend)
 {
   adapter = Adapter;
   frontend = Frontend;
   ciAdapter = NULL;
   dvbTuner = NULL;
-  numDeliverySystems = 0;
-  numModulations = 0;
   bondedDevice = NULL;
   needsDetachBondedReceivers = false;
   tsBuffer = NULL;
 
-  // Devices that are present on all card types:
-
-  int fd_frontend = DvbOpen(DEV_DVB_FRONTEND, adapter, frontend, O_RDWR | O_NONBLOCK);
-
   // Common Interface:
 
   fd_ca = DvbOpen(DEV_DVB_CA, adapter, frontend, O_RDWR);
@@ -1603,12 +1840,7 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend)
 
   // We only check the devices that must be present - the others will be checked before accessing them://XXX
 
-  if (fd_frontend >= 0) {
-     if (QueryDeliverySystems(fd_frontend))
-        dvbTuner = new cDvbTuner(this, fd_frontend, adapter, frontend);
-     }
-  else
-     esyslog("ERROR: can't open DVB device %d/%d", adapter, frontend);
+  dvbTuner = new cDvbTuner(this, adapter, frontend);
 
   StartSectionHandler();
 }
@@ -1623,12 +1855,12 @@ cDvbDevice::~cDvbDevice()
   // caused segfaults. Besides, the program is about to terminate anyway...
 }
 
-cString cDvbDevice::DvbName(const char *Name, int Adapter, int Frontend)
+cString DvbName(const char *Name, int Adapter, int Frontend)
 {
   return cString::sprintf("%s/%s%d/%s%d", DEV_DVB_BASE, DEV_DVB_ADAPTER, Adapter, Name, Frontend);
 }
 
-int cDvbDevice::DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError)
+int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError)
 {
   cString FileName = DvbName(Name, Adapter, Frontend);
   int fd = open(FileName, Mode);
@@ -1669,18 +1901,16 @@ bool cDvbDevice::Probe(int Adapter, int Frontend)
 
 cString cDvbDevice::DeviceType(void) const
 {
-  if (dvbTuner) {
-     if (dvbTuner->FrontendType() != SYS_UNDEFINED)
-        return GetDeliverySystemName(dvbTuner->FrontendType());
-     if (numDeliverySystems)
-        return GetDeliverySystemName(deliverySystems[0]); // to have some reasonable default
-     }
+  if (dvbTuner)
+     return GetDeliverySystemName(dvbTuner->FrontendType());
   return "";
 }
 
 cString cDvbDevice::DeviceName(void) const
 {
-  return frontendInfo.name;
+  if (dvbTuner)
+     return dvbTuner->FrontendName();
+  return "";
 }
 
 bool cDvbDevice::Initialize(void)
@@ -1702,7 +1932,8 @@ bool cDvbDevice::Initialize(void)
                  while ((f = AdapterDir.Next()) != NULL) {
                        if (strstr(f->d_name, DEV_DVB_FRONTEND) == f->d_name) {
                           int Frontend = strtol(f->d_name + strlen(DEV_DVB_FRONTEND), NULL, 10);
-                          Nodes.Append(strdup(cString::sprintf("%2d %2d", Adapter, Frontend)));
+                          if (access(DvbName(DEV_DVB_DEMUX, Adapter, Frontend), F_OK) == 0) // we only create devices for actual demuxes
+                             Nodes.Append(strdup(cString::sprintf("%2d %2d", Adapter, Frontend)));
                           }
                        }
                  }
@@ -1741,90 +1972,6 @@ bool cDvbDevice::Initialize(void)
   return Found > 0;
 }
 
-bool cDvbDevice::QueryDeliverySystems(int fd_frontend)
-{
-  numDeliverySystems = 0;
-  if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) < 0) {
-     LOG_ERROR;
-     return false;
-     }
-  dtv_property Props[1];
-  dtv_properties CmdSeq;
-  // Determine the version of the running DVB API:
-  if (!DvbApiVersion) {
-     memset(&Props, 0, sizeof(Props));
-     memset(&CmdSeq, 0, sizeof(CmdSeq));
-     CmdSeq.props = Props;
-     SETCMD(DTV_API_VERSION, 0);
-     if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
-        LOG_ERROR;
-        return false;
-        }
-     DvbApiVersion = Props[0].u.data;
-     isyslog("DVB API version is 0x%04X (VDR was built with 0x%04X)", DvbApiVersion, DVBAPIVERSION);
-     }
-  // Determine the types of delivery systems this device provides:
-  bool LegacyMode = true;
-  if (DvbApiVersion >= 0x0505) {
-     memset(&Props, 0, sizeof(Props));
-     memset(&CmdSeq, 0, sizeof(CmdSeq));
-     CmdSeq.props = Props;
-     SETCMD(DTV_ENUM_DELSYS, 0);
-     int Result = ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq);
-     if (Result == 0) {
-        for (uint i = 0; i < Props[0].u.buffer.len; i++) {
-            if (numDeliverySystems >= MAXDELIVERYSYSTEMS) {
-               esyslog("ERROR: too many delivery systems on frontend %d/%d", adapter, frontend);
-               break;
-               }
-            deliverySystems[numDeliverySystems++] = Props[0].u.buffer.data[i];
-            }
-        LegacyMode = false;
-        }
-     else {
-        esyslog("ERROR: can't query delivery systems on frontend %d/%d - falling back to legacy mode", adapter, frontend);
-        }
-     }
-  if (LegacyMode) {
-     // Legacy mode (DVB-API < 5.5):
-     switch (frontendInfo.type) {
-       case FE_QPSK: deliverySystems[numDeliverySystems++] = SYS_DVBS;
-                     if (frontendInfo.caps & FE_CAN_2G_MODULATION)
-                        deliverySystems[numDeliverySystems++] = SYS_DVBS2;
-                     break;
-       case FE_OFDM: deliverySystems[numDeliverySystems++] = SYS_DVBT;
-                     if (frontendInfo.caps & FE_CAN_2G_MODULATION)
-                        deliverySystems[numDeliverySystems++] = SYS_DVBT2;
-                     break;
-       case FE_QAM:  deliverySystems[numDeliverySystems++] = SYS_DVBC_ANNEX_AC; break;
-       case FE_ATSC: deliverySystems[numDeliverySystems++] = SYS_ATSC; break;
-       default: esyslog("ERROR: unknown frontend type %d on frontend %d/%d", frontendInfo.type, adapter, frontend);
-       }
-     }
-  if (numDeliverySystems > 0) {
-     cString ds("");
-     for (int i = 0; i < numDeliverySystems; i++)
-         ds = cString::sprintf("%s%s%s", *ds, i ? "," : "", GetDeliverySystemName(deliverySystems[i]));
-     cString ms("");
-     if (frontendInfo.caps & FE_CAN_QPSK)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QPSK, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_QAM_16)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_16, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_QAM_32)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_32, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_QAM_64)    { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_64, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_QAM_128)   { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_128, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_QAM_256)   { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(QAM_256, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_8VSB)      { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(VSB_8, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_16VSB)     { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", MapToUserString(VSB_16, ModulationValues)); }
-     if (frontendInfo.caps & FE_CAN_TURBO_FEC) { numModulations++; ms = cString::sprintf("%s%s%s", *ms, **ms ? "," : "", "TURBO_FEC"); }
-     if (!**ms)
-        ms = "unknown modulations";
-     isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, *ds, *ms, frontendInfo.name);
-     return true;
-     }
-  else
-     esyslog("ERROR: frontend %d/%d doesn't provide any delivery systems", adapter, frontend);
-  return false;
-}
-
 bool cDvbDevice::BondDevices(const char *Bondings)
 {
   UnBondDevices();
@@ -1999,11 +2146,7 @@ void cDvbDevice::CloseFilter(int Handle)
 
 bool cDvbDevice::ProvidesDeliverySystem(int DeliverySystem) const
 {
-  for (int i = 0; i < numDeliverySystems; i++) {
-      if (deliverySystems[i] == DeliverySystem)
-         return true;
-      }
-  return false;
+  return dvbTuner->ProvidesDeliverySystem(DeliverySystem);
 }
 
 bool cDvbDevice::ProvidesSource(int Source) const
@@ -2020,20 +2163,9 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
 {
   if (!ProvidesSource(Channel->Source()))
      return false; // doesn't provide source
-  cDvbTransponderParameters dtp(Channel->Parameters());
-  if (!ProvidesDeliverySystem(GetRequiredDeliverySystem(Channel, &dtp)) ||
-     dtp.StreamId()   != 0        && !(frontendInfo.caps & FE_CAN_MULTISTREAM) ||
-     dtp.Modulation() == QPSK     && !(frontendInfo.caps & FE_CAN_QPSK) ||
-     dtp.Modulation() == QAM_16   && !(frontendInfo.caps & FE_CAN_QAM_16) ||
-     dtp.Modulation() == QAM_32   && !(frontendInfo.caps & FE_CAN_QAM_32) ||
-     dtp.Modulation() == QAM_64   && !(frontendInfo.caps & FE_CAN_QAM_64) ||
-     dtp.Modulation() == QAM_128  && !(frontendInfo.caps & FE_CAN_QAM_128) ||
-     dtp.Modulation() == QAM_256  && !(frontendInfo.caps & FE_CAN_QAM_256) ||
-     dtp.Modulation() == QAM_AUTO && !(frontendInfo.caps & FE_CAN_QAM_AUTO) ||
-     dtp.Modulation() == VSB_8    && !(frontendInfo.caps & FE_CAN_8VSB) ||
-     dtp.Modulation() == VSB_16   && !(frontendInfo.caps & FE_CAN_16VSB) ||
-     dtp.Modulation() == PSK_8    && !(frontendInfo.caps & FE_CAN_TURBO_FEC) && dtp.System() == SYS_DVBS) // "turbo fec" is a non standard FEC used by North American broadcasters - this is a best guess to determine this condition
+  if (!dvbTuner->ProvidesFrontend(Channel))
      return false; // requires modulation system which frontend doesn't provide
+  cDvbTransponderParameters dtp(Channel->Parameters());
   if (!cSource::IsSat(Channel->Source()) ||
      (!Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL)))
      return DeviceHooksProvidesTransponder(Channel);
@@ -2047,7 +2179,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool needsDetachReceivers = false;
   needsDetachBondedReceivers = false;
 
-  if (dvbTuner && ProvidesTransponder(Channel)) {
+  if (ProvidesTransponder(Channel)) {
      result = hasPriority;
      if (Priority > IDLEPRIORITY) {
         if (Receiving()) {
@@ -2097,7 +2229,7 @@ bool cDvbDevice::ProvidesEIT(void) const
 
 int cDvbDevice::NumProvidedSystems(void) const
 {
-  return numDeliverySystems + numModulations;
+  return dvbTuner ? dvbTuner->NumProvidedSystems() : 0;
 }
 
 const cPositioner *cDvbDevice::Positioner(void) const
@@ -2137,9 +2269,11 @@ bool cDvbDevice::MaySwitchTransponder(const cChannel *Channel) const
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-  if (dvbTuner)
+  if (dvbTuner->ProvidesFrontend(Channel, true)) {
      dvbTuner->SetChannel(Channel);
-  return true;
+     return true;
+     }
+  return false;
 }
 
 bool cDvbDevice::HasLock(int TimeoutMs) const
diff --git a/dvbdevice.h b/dvbdevice.h
index 0490a44fc..79007c34f 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -67,8 +67,6 @@ enum {
 
 // --- End of definitions for older DVB API versions -------------------------
 
-#define MAXDELIVERYSYSTEMS 8
-
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_BASE      "/dev/dvb"
 #define DEV_DVB_ADAPTER   "adapter"
@@ -162,12 +160,12 @@ friend class cDvbSourceParam;
 
 class cDvbTuner;
 
+cString DvbName(const char *Name, int Adapter, int Frontend);
+int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError = false);
+
 /// The cDvbDevice implements a DVB device which can be accessed through the Linux DVB driver API.
 
 class cDvbDevice : public cDevice {
-protected:
-  static cString DvbName(const char *Name, int Adapter, int Frontend);
-  static int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError = false);
 private:
   static bool Exists(int Adapter, int Frontend);
          ///< Checks whether the given adapter/frontend exists.
@@ -182,16 +180,11 @@ class cDvbDevice : public cDevice {
 protected:
   int adapter, frontend;
 private:
-  dvb_frontend_info frontendInfo;
-  int deliverySystems[MAXDELIVERYSYSTEMS];
-  int numDeliverySystems;
-  int numModulations;
   int fd_dvr, fd_ca;
   bool checkTsBuffer;
   static cMutex bondMutex;
   cDvbDevice *bondedDevice;
   mutable bool needsDetachBondedReceivers;
-  bool QueryDeliverySystems(int fd_frontend);
 public:
   cDvbDevice(int Adapter, int Frontend);
   virtual ~cDvbDevice();

From cbb673d10c69decdb91514ab3032b8091bbfc8ad Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 10 Mar 2019 13:14:00 +0100
Subject: [PATCH 272/307] vdr-2.4.0-09-fix-multi-frontend-access.diff

Fixed accessing the actual frontend on multi frontend devices.
---
 dvbdevice.c | 6 ++++++
 dvbdevice.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dvbdevice.c b/dvbdevice.c
index 1026769a2..b46e51c1f 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -571,6 +571,7 @@ class cDvbTuner : public cThread {
   bool ProvidesDeliverySystem(int DeliverySystem) const;
   bool ProvidesModulation(int System, int StreamId, int Modulation) const;
   bool ProvidesFrontend(const cChannel *Channel, bool Activate = false) const;
+  int Frontend(void) const { return frontend; }
   int FrontendType(void) const { return frontendType; }
   const char *FrontendName(void) { return dvbFrontend->FrontendName(); }
   int NumProvidedSystems(void) const { return numDeliverySystems + numModulations; }
@@ -1869,6 +1870,11 @@ int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportEr
   return fd;
 }
 
+int cDvbDevice::Frontend(void) const
+{
+  return dvbTuner ? dvbTuner->Frontend() : frontend;
+}
+
 bool cDvbDevice::Exists(int Adapter, int Frontend)
 {
   cString FileName = DvbName(DEV_DVB_FRONTEND, Adapter, Frontend);
diff --git a/dvbdevice.h b/dvbdevice.h
index 79007c34f..ddac5ed8f 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -189,7 +189,7 @@ class cDvbDevice : public cDevice {
   cDvbDevice(int Adapter, int Frontend);
   virtual ~cDvbDevice();
   int Adapter(void) const { return adapter; }
-  int Frontend(void) const { return frontend; }
+  int Frontend(void) const;
   virtual cString DeviceType(void) const;
   virtual cString DeviceName(void) const;
   static bool BondDevices(const char *Bondings);

From 08001b3d619adf1c7a32917183f7991aae9969b9 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 11 Mar 2019 11:30:00 +0100
Subject: [PATCH 273/307] vdr-2.4.0-10-fix-missing-epg.diff

Reverted the change "The EIT filter no longer parses data from "other TS"...". It led to missing EPG data on channels from Canal Digital Norway.
---
 eit.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eit.c b/eit.c
index c4c836919..816233539 100644
--- a/eit.c
+++ b/eit.c
@@ -388,8 +388,7 @@ time_t cEitFilter::disableUntil = 0;
 
 cEitFilter::cEitFilter(void)
 {
-//Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X) // TODO: remove later
-  Set(0x12, 0x40, 0xE0);  // event info now&next actual/other TS (0x4E/0x4F), future actual TS (0x5X)
+  Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X)
   Set(0x14, 0x70);        // TDT
 }
 
@@ -416,8 +415,7 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
      }
   switch (Pid) {
     case 0x12: {
-       //if (Tid >= 0x4E && Tid <= 0x6F) // TODO: remove later
-         if (Tid == 0x4E || Tid >= 0x50 && Tid <= 0x5F)
+         if (Tid >= 0x4E && Tid <= 0x6F)
             cEIT EIT(sectionSyncerHash, Source(), Tid, Data);
          }
          break;

From 486c21c2c6f042df5703d1680aba14ffe28b7edc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 11 Mar 2019 11:30:00 +0100
Subject: [PATCH 274/307] vdr-2.4.0-11-fix-peerdemo-udp-port.diff

Fixed opening the UDP port in peerdemo.
---
 peerdemo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/peerdemo b/peerdemo
index 3c2cb730f..59bb983c3 100755
--- a/peerdemo
+++ b/peerdemo
@@ -37,7 +37,7 @@ $TcpPort = $Port;
 $UdpPort = $DefaultSvdrpPort;
 
 $TcpSocket = new IO::Socket::INET(Listen => 5, LocalPort => $TcpPort, Proto => "tcp", ReusePort => 1) || die "$!";
-$UdpSocket = new IO::Socket::INET(             LocalPort => $UdpPort, Proto => "udp", ReusePort => 1) || die "$!";
+$UdpSocket = new IO::Socket::INET(             LocalPort => $UdpPort, Proto => "udp", ReuseAddr => 1) || die "$!";
 $SvdrpSelect = new IO::Select($TcpSocket);
 setsockopt($UdpSocket, SOL_SOCKET, SO_RCVTIMEO, pack('L!L!', 0, 1000)); # 1ms timeout on UDP socket
 

From 938b8f12ef3f4bb43bf2a8d1256a9accde2bbd53 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 11 Mar 2019 14:26:00 +0100
Subject: [PATCH 275/307] vdr-2.4.0-12-fix-empty-pat.diff

Fixed handling PATs that contain no PMTs.
---
 pat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pat.c b/pat.c
index e40d2d5fe..d0fc97f1a 100644
--- a/pat.c
+++ b/pat.c
@@ -372,7 +372,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                }
            if (numPmtEntries > 0 && pmtIndex < 0)
               pmtIndex = 0;
-           Add(GetPmtPid(pmtIndex), SI::TableIdPMT);
+           if (pmtIndex >= 0)
+              Add(GetPmtPid(pmtIndex), SI::TableIdPMT);
            patVersion = pat.getVersionNumber();
            timer.Set(PMT_SCAN_TIMEOUT);
            }

From 57962e451c4e7482a78f0b88916e0e35a811c562 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 12 Mar 2019 11:07:00 +0100
Subject: [PATCH 276/307] vdr-2.4.0-13-fix-shutdown-2.diff

Fixed shutdown after user inactivity in case a plugin is keeping the OSD open (cont'd).
---
 vdr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdr.c b/vdr.c
index 7654e0e28..9dc86cbf3 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1514,7 +1514,7 @@ int main(int argc, char *argv[])
               ShutdownHandler.countdown.Cancel();
            }
 
-        if (!cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+        if (!cControl::Control() && !cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
            // Shutdown:
            // Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
            time_t Soon = Now + SHUTDOWNWAIT;

From a235414f3af65871ac3bed2d79241e0f6f861b84 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 12 Mar 2019 12:50:00 +0100
Subject: [PATCH 277/307] vdr-2.4.0-14-fix-eitscan.diff

Fixed processing the last entry in the scan list of the EIT scanner.
---
 eitscan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eitscan.c b/eitscan.c
index 41ac25e2e..aae732fa3 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -177,7 +177,7 @@ void cEITScanner::Process(void)
                       }
                   }
                }
-           if (!scanList->Count() || !AnyDeviceSwitched) {
+           if (!AnyDeviceSwitched) {
               delete scanList;
               scanList = NULL;
               if (lastActivity == 0) // this was a triggered scan

From f7e7acecf9881e4f6f0f6eb6ddcfd6321e73eb4e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 12 Mar 2019 13:32:00 +0100
Subject: [PATCH 278/307] vdr-2.4.0-15-fix-skincurses.diff

Changes for ncurses version 6.
---
 PLUGINS/src/skincurses/skincurses.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index aa719ef2c..6803a2604 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "2.4.0";
+static const char *VERSION        = "2.4.1";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
@@ -127,8 +127,12 @@ void cCursesOsd::SaveRegion(int x1, int y1, int x2, int y2)
 
 void cCursesOsd::RestoreRegion(void)
 {
+  int begy, begx;
+  int maxy, maxx;
+  getmaxyx(savedRegion, maxy,maxx);
+  getbegyx(savedRegion, begy,begx);
   if (savedRegion) {
-     copywin(savedRegion, window, 0, 0, savedRegion->_begy, savedRegion->_begx, savedRegion->_maxy - savedRegion->_begy, savedRegion->_maxx - savedRegion->_begx, false);
+     copywin(savedRegion, window, 0, 0, begy, begx, maxy - begy, maxx - begx, false);
      delwin(savedRegion);
      savedRegion = NULL;
      }
@@ -828,9 +832,13 @@ bool cPluginSkinCurses::Initialize(void)
 {
   // Initialize any background activities the plugin shall perform.
   WINDOW *w = initscr();
+  int begy, begx;
+  int maxy, maxx;
+  getmaxyx(w, maxy,maxx);
+  getbegyx(w, begy,begx);
   if (w) {
-     ScOsdWidth  = w->_maxx - w->_begx + 1;
-     ScOsdHeight = w->_maxy - w->_begy + 1;
+     ScOsdWidth  = maxx - begx + 1;
+     ScOsdHeight = maxy - begy + 1;
      return true;
      }
   return false;

From 6bb9e87876e10e31a457ad21abe94c2ab10c0b82 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 12 Mar 2019 14:18:00 +0100
Subject: [PATCH 279/307] vdr-2.4.0-16-fix-nit-transponder-processing.diff

Fixed processing transponder data in the NIT.
---
 nit.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nit.c b/nit.c
index 299a4066f..4618ec6a1 100644
--- a/nit.c
+++ b/nit.c
@@ -125,7 +125,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            dtp.SetStreamId(dtpc.StreamId());
                            //
                            int transponder = Channel->Transponder();
-                           found = true;
                            if (!ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
                                   if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], dtp.Polarization()), transponder)) {
@@ -134,7 +133,10 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                      }
                                   }
                               }
-                           if (ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), Transponder())) // only modify channels if we're actually receiving this transponder
+                           if (!ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), transponder))
+                              continue; // a channel with obsolete/wrong/other(?) transponder
+                           found = true;
+                           if (ISTRANSPONDER(transponder, Transponder())) // only modify channels if we're actually receiving this transponder
                               ChannelsModified |= Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('S'));
                            else if (Channel->Srate() != SymbolRate || strcmp(Channel->Parameters(), dtp.ToString('S')))
                               forceTransponderUpdate = true; // get us receiving this transponder
@@ -188,7 +190,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                     for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
                         if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
                            int transponder = Channel->Transponder();
-                           found = true;
                            if (!ISTRANSPONDER(Frequency / 1000, transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
                                   if (ISTRANSPONDER(Frequencies[n] / 1000, transponder)) {
@@ -197,7 +198,10 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                      }
                                   }
                               }
-                           if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder
+                           if (!ISTRANSPONDER(Frequency / 1000000, transponder))
+                              continue; // a channel with obsolete/wrong/other(?) transponder
+                           found = true;
+                           if (ISTRANSPONDER(transponder, Transponder())) // only modify channels if we're actually receiving this transponder
                               ChannelsModified |= Channel->SetTransponderData(Source, Frequency, SymbolRate, dtp.ToString('C'));
                            else if (Channel->Srate() != SymbolRate || strcmp(Channel->Parameters(), dtp.ToString('C')))
                               forceTransponderUpdate = true; // get us receiving this transponder
@@ -254,7 +258,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            dtp.SetTransmission(dtpc.Transmission());
                            //
                            int transponder = Channel->Transponder();
-                           found = true;
                            if (!ISTRANSPONDER(Frequency / 1000000, transponder)) {
                               for (int n = 0; n < NumFrequencies; n++) {
                                   if (ISTRANSPONDER(Frequencies[n] / 1000000, transponder)) {
@@ -263,7 +266,10 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                      }
                                   }
                               }
-                           if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder
+                           if (!ISTRANSPONDER(Frequency / 1000000, transponder))
+                              continue; // a channel with obsolete/wrong/other(?) transponder
+                           found = true;
+                           if (ISTRANSPONDER(transponder, Transponder())) // only modify channels if we're actually receiving this transponder
                               ChannelsModified |= Channel->SetTransponderData(Source, Frequency, 0, dtp.ToString('T'));
                            else if (strcmp(Channel->Parameters(), dtp.ToString('T')))
                               forceTransponderUpdate = true; // get us receiving this transponder

From f4c5f90bf0f52d7d0f84e7fae699de563451dcc7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 12 Mar 2019 15:04:00 +0100
Subject: [PATCH 280/307] vdr-2.4.0-17-fix-nit-sdt-trigger.diff

Fixed triggering the SDT filter when parsing the NIT.
---
 nit.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nit.c b/nit.c
index 4618ec6a1..2b53fc1a9 100644
--- a/nit.c
+++ b/nit.c
@@ -153,8 +153,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
-                 if (ISTRANSPONDER(cChannel::Transponder(Frequency, dtp.Polarization()), Transponder()))
-                    sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::S2SatelliteDeliverySystemDescriptorTag: {
@@ -218,8 +216,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
-                 if (ISTRANSPONDER(Frequency / 1000, Transponder()))
-                    sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::TerrestrialDeliverySystemDescriptorTag: {
@@ -286,8 +282,6 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                            }
                        }
                     }
-                 if (ISTRANSPONDER(Frequency / 1000000, Transponder()))
-                    sdtFilter->Trigger(Source);
                  }
                  break;
             case SI::ExtensionDescriptorTag: {
@@ -367,5 +361,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
           delete d;
           }
       }
+  if (nit.getSectionNumber() == nit.getLastSectionNumber()) {
+     dbgnit("    trigger sdtFilter for current tp %d\n", Transponder());
+     sdtFilter->Trigger(Source());
+     }
   StateKey.Remove(ChannelsModified);
 }

From 24b37ea2ad4b1ef5b8e9cff7187f3175a1f5a19e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Fri, 15 Mar 2019 14:12:00 +0100
Subject: [PATCH 281/307] vdr-2.4.0-19-add-eac3-from-other-sources.diff

Added support for EAC3 audio from other sources.
---
 pat.c   | 4 +++-
 remux.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pat.c b/pat.c
index d0fc97f1a..ec676a242 100644
--- a/pat.c
+++ b/pat.c
@@ -545,6 +545,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          }
                       // fall through
               case 0x81: // STREAMTYPE_USER_PRIVATE
+              case 0x87: // eac3
                       if (Setup.StandardCompliance == STANDARD_ANSISCTE) { // ATSC A/53 AUDIO (ANSI/SCTE 57)
                          char lang[MAXLANGCODE1] = { 0 };
                          SI::Descriptor *d;
@@ -575,7 +576,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                          break;
                          }
                       // fall through
-              case 0x83 ... 0xFF: // STREAMTYPE_USER_PRIVATE
+              case 0x83 ... 0x86: // STREAMTYPE_USER_PRIVATE
+              case 0x88 ... 0xFF: // STREAMTYPE_USER_PRIVATE
                       {
                       char lang[MAXLANGCODE1] = { 0 };
                       bool IsAc3 = false;
diff --git a/remux.c b/remux.c
index 6993e9b7e..1b530c1ed 100644
--- a/remux.c
+++ b/remux.c
@@ -839,9 +839,11 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                       break;
            case 0x81: // STREAMTYPE_USER_PRIVATE - AC3 audio for ATSC and BD
            case 0x82: // STREAMTYPE_USER_PRIVATE - DTS audio for BD
+           case 0x87: // eac3
                       {
                       dbgpatpmt(" %s",
                           stream.getStreamType() == 0x81 ? "AC3" :
+                          stream.getStreamType() == 0x87 ? "AC3" :
                           stream.getStreamType() == 0x82 ? "DTS" : "");
                       char lang[MAXLANGCODE1] = { 0 };
                       SI::Descriptor *d;

From 033702aae34b5a3ce627549d6f57a83a3bdc2838 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Fri, 15 Mar 2019 15:53:00 +0100
Subject: [PATCH 282/307] vdr-2.4.0-20-fix-logging-inactive-transponders.diff

No longer logging tuning timeouts for transponders that are announced in the NIT but are not currently broadcasting.
---
 dvbdevice.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dvbdevice.c b/dvbdevice.c
index b46e51c1f..d7b0e5b86 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -1711,7 +1711,8 @@ void cDvbTuner::Action(void)
                   lastDiseqc = NULL;
                   lastSource = 0;
                   if (time(NULL) - lastTimeoutReport > 60) { // let's not get too many of these
-                     isyslog("frontend %d/%d timed out while tuning to channel %d (%s), tp %d", adapter, frontend, channel.Number(), channel.Name(), channel.Transponder());
+                     if (channel.Number()) // no need to log this for transponders that are announced in the NIT but are not currently broadcasting
+                        isyslog("frontend %d/%d timed out while tuning to channel %d (%s), tp %d", adapter, frontend, channel.Number(), channel.Name(), channel.Transponder());
                      lastTimeoutReport = time(NULL);
                      }
                   continue;

From e25a2d50336c3c350921b36e9f406e481f93a543 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Fri, 15 Mar 2019 17:29:00 +0100
Subject: [PATCH 283/307] vdr-2.4.0-21-fix-libsi.diff

Fixed processing SI::T2DeliverySystemDescriptor when typecasting it over an SI::ExtensionDescriptor.
---
 libsi/descriptor.c | 5 +++++
 libsi/descriptor.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 5c7fd0311..6705797e0 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -870,6 +870,11 @@ int S2SatelliteDeliverySystemDescriptor::getScramblingSequenceIndex() const {
 void ExtensionDescriptor::Parse() {
    int offset=0;
    data.setPointerAndOffset<const descr_extension>(s, offset);
+   extended_data_flag = s->descriptor_length > 0x04;
+}
+
+int ExtensionDescriptor::getExtendedDataFlag() const {
+  return extended_data_flag;
 }
 
 int ExtensionDescriptor::getExtensionDescriptorTag() const {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 22d13db81..c3aeaedcd 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -529,11 +529,13 @@ class S2SatelliteDeliverySystemDescriptor : public Descriptor {
 
 class ExtensionDescriptor : public Descriptor {
 public:
+   int getExtendedDataFlag() const;
    int getExtensionDescriptorTag() const;
 protected:
    virtual void Parse();
 private:
    const descr_extension *s;
+   int extended_data_flag;
 };
 
 class T2DeliverySystemDescriptor : public Descriptor {

From dd9bd68ac2c7a5db121a391437ef7c137890fc47 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 17 Mar 2019 17:13:00 +0100
Subject: [PATCH 284/307] vdr-2.4.0-22-fix-sort-recordings.diff

---
 recording.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recording.c b/recording.c
index 0cf265cbf..ebc4688a5 100644
--- a/recording.c
+++ b/recording.c
@@ -1022,9 +1022,9 @@ int cRecording::Compare(const cListObject &ListObject) const
 {
   cRecording *r = (cRecording *)&ListObject;
   if (Setup.RecSortingDirection == rsdAscending)
-     return strcasecmp(SortName(), r->SortName());
+     return strcmp(SortName(), r->SortName());
   else
-     return strcasecmp(r->SortName(), SortName());
+     return strcmp(r->SortName(), SortName());
 }
 
 bool cRecording::IsInPath(const char *Path) const

From d13618bbd79e350d8d73dfba8120dabb57eb504d Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 18 Mar 2019 11:35:00 +0100
Subject: [PATCH 285/307] vdr-2.4.0-23-fix-patch-16.diff

Fixed a copy/paste error in patch #16.
---
 nit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nit.c b/nit.c
index 2b53fc1a9..655e89667 100644
--- a/nit.c
+++ b/nit.c
@@ -196,7 +196,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                                      }
                                   }
                               }
-                           if (!ISTRANSPONDER(Frequency / 1000000, transponder))
+                           if (!ISTRANSPONDER(Frequency / 1000, transponder))
                               continue; // a channel with obsolete/wrong/other(?) transponder
                            found = true;
                            if (ISTRANSPONDER(transponder, Transponder())) // only modify channels if we're actually receiving this transponder

From 85e6db04c7f09dae143858fc5c84a17210b92a35 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 18 Mar 2019 14:43:00 +0100
Subject: [PATCH 286/307] vdr-2.4.0-24-fix-drop-caps.diff

Fixed dropping capabilities in case cap_sys_time is not available.
---
 vdr.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/vdr.c b/vdr.c
index 9dc86cbf3..d7e518380 100644
--- a/vdr.c
+++ b/vdr.c
@@ -126,7 +126,25 @@ static bool SetUser(const char *User, bool UserDump)
 static bool DropCaps(void)
 {
   // drop all capabilities except selected ones
-  cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time,cap_net_raw=ep");
+  cap_t caps_all = cap_get_proc();
+  if (!caps_all) {
+     fprintf(stderr, "vdr: cap_get_proc failed: %s\n", strerror(errno));
+     return false;
+     }
+  char *caps_text = cap_to_text(caps_all, NULL);
+  if (!caps_text) {
+     fprintf(stderr, "vdr: cap_to_text failed: %s\n", strerror(errno));
+     return false;
+     }
+  if (cap_free(caps_all)) {
+     fprintf(stderr, "vdr: cap_free failed: %s\n", strerror(errno));
+     return false;
+     }
+  cap_t caps;
+  if (strstr(caps_text,"cap_sys_time"))
+     caps = cap_from_text("= cap_sys_nice,cap_sys_time,cap_net_raw=ep");
+  else
+     caps = cap_from_text("= cap_sys_nice,cap_net_raw=ep");
   if (!caps) {
      fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
      return false;

From 6f01a56e000e8f56fa9353a035ce9f69a73ba89c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 18 Mar 2019 17:23:00 +0100
Subject: [PATCH 287/307] vdr-2.4.0-25-fix-channels-menu.diff

Fixed updating the cursor position when switching channels with the Channel+/- keys while the Channels menu is open.
---
 menu.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/menu.c b/menu.c
index 76b66526b..3c21655bb 100644
--- a/menu.c
+++ b/menu.c
@@ -576,7 +576,7 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
          break;
     default:
          if (state == osUnknown) {
-            switch (Key) {
+            switch (int(Key)) {
               case k0 ... k9:
                             return Number(Key);
               case kOk:     return Switch();
@@ -586,6 +586,20 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
               case kBlue:   if (!HasSubMenu())
                                Mark();
                             break;
+              case kChanUp|k_Repeat:
+              case kChanUp:
+              case kChanDn|k_Repeat:
+              case kChanDn: {
+                   LOCK_CHANNELS_READ;
+                   int CurrentChannelNr = cDevice::CurrentChannel();
+                   for (cMenuChannelItem *ci = (cMenuChannelItem *)First(); ci; ci = (cMenuChannelItem *)ci->Next()) {
+                       if (!ci->Channel()->GroupSep() && ci->Channel()->Number() == CurrentChannelNr) {
+                          SetCurrent(ci);
+                          Display();
+                          break;
+                          }
+                       }
+                   }
               default: break;
               }
             }

From 11cb49f00f5b4e3184e1fd28cf5c95d6b1bad7fe Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 19 Mar 2019 16:09:00 +0100
Subject: [PATCH 288/307] vdr-2.4.0-26-fix-shared-ca-pids.diff

Fixed handling shared CA pids.
---
 ci.c | 41 ++++++++++++++++++++++++++++++++++++++++-
 ci.h |  1 +
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/ci.c b/ci.c
index 1ffe9888f..d5b41834e 100644
--- a/ci.c
+++ b/ci.c
@@ -2505,8 +2505,10 @@ void cCamSlot::BuildCaPmts(uint8_t CmdId, cCiCaPmtList &CaPmtList, cMtdMapper *M
                   if (GetCaPids(source, transponder, p->programNumber, CaSystemIds, MAXRECEIVEPIDS + 1, CaPids) > 0) {
                      if (Active)
                         caPidReceiver->AddPids(CaPids);
-                     else
+                     else {
+                        KeepSharedCaPids(p->programNumber, CaSystemIds, CaPids);
                         caPidReceiver->DelPids(CaPids);
+                        }
                      }
                   }
                if (RepliesToQuery())
@@ -2522,6 +2524,43 @@ void cCamSlot::BuildCaPmts(uint8_t CmdId, cCiCaPmtList &CaPmtList, cMtdMapper *M
      }
 }
 
+void cCamSlot::KeepSharedCaPids(int ProgramNumber, const int *CaSystemIds, int *CaPids)
+{
+  int numPids = 0;
+  int *pCaPids = CaPids;
+  while (*pCaPids) {
+        numPids++;
+        pCaPids++;
+        }
+  if (numPids <= 0)
+     return;
+  int CaPids2[MAXRECEIVEPIDS + 1];
+  for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
+      if (p->programNumber != ProgramNumber) { 
+         if (GetCaPids(source, transponder, p->programNumber, CaSystemIds, MAXRECEIVEPIDS + 1, CaPids2) > 0) {
+            int *pCaPids2 = CaPids2;
+            while (*pCaPids2) {
+                  pCaPids = CaPids;
+                  while (*pCaPids) {
+                        if (*pCaPids == *pCaPids2) {
+                           dsyslog("CAM %d: keeping shared CA pid %d", SlotNumber(), *pCaPids);
+                           // To remove *pCaPids from CaPids we overwrite it with the last valie in the list, and then strip the last value:
+                           *pCaPids = CaPids[numPids - 1];
+                           numPids--;
+                           CaPids[numPids] = 0;
+                           if (numPids <= 0)
+                              return;
+                           }
+                        else
+                           pCaPids++;
+                        }
+                  pCaPids2++;
+                  }
+            }
+         }
+      }
+}
+
 void cCamSlot::SendCaPmts(cCiCaPmtList &CaPmtList)
 {
   cMutexLock MutexLock(&mutex);
diff --git a/ci.h b/ci.h
index 02e59d2ef..f7f61004b 100644
--- a/ci.h
+++ b/ci.h
@@ -254,6 +254,7 @@ class cCamSlot : public cListObject {
   cList<cCiCaProgramData> caProgramList;
   bool mtdAvailable;
   cMtdHandler *mtdHandler;
+  void KeepSharedCaPids(int ProgramNumber, const int *CaSystemIds, int *CaPids);
   void NewConnection(void);
   void DeleteAllConnections(void);
   void Process(cTPDU *TPDU = NULL);

From 20583819fa86373e8325c0cba15bfd0dfbe0e68b Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 5 May 2019 16:02:00 +0200
Subject: [PATCH 289/307] vdr-2.4.0-27-fix-mtd-map-sid.diff

Fixed mapping SIDs in MTD.
---
 mtd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mtd.c b/mtd.c
index 04bf09df6..a177167f4 100644
--- a/mtd.c
+++ b/mtd.c
@@ -224,7 +224,10 @@ void cMtdMapper::Clear(void)
 
 void MtdMapSid(uchar *p, cMtdMapper *MtdMapper)
 {
-  Poke13(p, MtdMapper->RealToUniqSid(Peek13(p)));
+  uint16_t RealSid = p[0] << 8 | p[1];
+  uint16_t UniqSid = MtdMapper->RealToUniqSid(RealSid);
+  p[0] = UniqSid >> 8;
+  p[1] = UniqSid & 0xff;
 }
 
 void MtdMapPid(uchar *p, cMtdMapper *MtdMapper)

From 0d571c3143ddef0ef1e25f73b1f03b9e4515ac8f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sun, 5 May 2019 20:36:00 +0200
Subject: [PATCH 290/307] vdr-2.4.0-28-fix-mtd-checksum.diff

Fixed updating the checksum in the CA table after mapping EMM PIDs for MTD.
---
 ci.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ci.c b/ci.c
index d5b41834e..41388a08a 100644
--- a/ci.c
+++ b/ci.c
@@ -225,7 +225,7 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
            }
         else {
            esyslog("ERROR: buffer overflow in cCaPidReceiver::Receive()");
-           bufp = 0;
+           bufp = NULL;
            length = 0;
            }
         }
@@ -250,12 +250,22 @@ void cCaPidReceiver::Receive(const uchar *Data, int Length)
                i += p[i + 1] + 2 - 1; // -1 to compensate for the loop increment
                }
             }
+        if (MtdCamSlot) {
+           if (!bufp && length) {
+              // update crc32 - but only single packet CAT is handled for now:
+              uint32_t crc = SI::CRC32::crc32((const char *)p - 8, length + 8 - 4, 0xFFFFFFFF); // <TableIdCAT....>[crc32]
+              uchar *c = const_cast<uchar *>(p + length - 4);
+              *c++ = crc >> 24;
+              *c++ = crc >> 16;
+              *c++ = crc >> 8;
+              *c++ = crc;
+              }
+           memcpy(mtdCatBuffer, Data, TS_SIZE);
+           MtdCamSlot->PutCat(mtdCatBuffer, TS_SIZE);
+           }
         p = NULL;
-        bufp = 0;
+        bufp = NULL;
         length = 0;
-        memcpy(mtdCatBuffer, Data, TS_SIZE);
-        if (MtdCamSlot)
-           MtdCamSlot->PutCat(mtdCatBuffer, TS_SIZE);
         }
      }
 }

From ddf4027b82eb03815a28a8a6de7d7e4bee8fec2c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 6 May 2019 14:07:00 +0200
Subject: [PATCH 291/307] vdr-2.4.0-29-fix-compiler-warning.diff

Fixed a compiler warning in ExchangeChars().
---
 recording.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recording.c b/recording.c
index ebc4688a5..86fa4aba1 100644
--- a/recording.c
+++ b/recording.c
@@ -604,7 +604,7 @@ char *ExchangeChars(char *s, bool ToFileSystem)
                              char buf[4];
                              sprintf(buf, "#%02X", (unsigned char)*p);
                              memmove(p + 2, p, strlen(p) + 1);
-                             strncpy(p, buf, 3);
+                             memcpy(p, buf, 3);
                              p += 2;
                              }
                           else

From 91d175046e13d694712321b55a4b5c0de39305c1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 6 May 2019 14:06:00 +0200
Subject: [PATCH 292/307] vdr-2.4.0-30-fix-ci-sendanswer.diff

Fixed a compiler warning and a possible buffer overflow in cCiMMI::SendAnswer().
---
 ci.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci.c b/ci.c
index 41388a08a..8712dfb05 100644
--- a/ci.c
+++ b/ci.c
@@ -1591,9 +1591,12 @@ bool cCiMMI::SendAnswer(const char *Text)
   struct tAnswer { uint8_t id; char text[256]; };//XXX
   tAnswer answer;
   answer.id = Text ? AI_ANSWER : AI_CANCEL;
-  if (Text)
-     strncpy(answer.text, Text, sizeof(answer.text));
-  SendData(AOT_ANSW, Text ? strlen(Text) + 1 : 1, (uint8_t *)&answer);
+  int len = 0;
+  if (Text) {
+     len = min(sizeof(answer.text), strlen(Text));
+     memcpy(answer.text, Text, len);
+     }
+  SendData(AOT_ANSW, len + 1, (uint8_t *)&answer);
   return true;
 }
 

From e438d06cb884b5ad4d3066300c8a19271386b775 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 6 May 2019 15:15:00 +0200
Subject: [PATCH 293/307] vdr-2.4.0-31-fix-invalid-lock-sequence.diff

Fixed a possible invalid lock sequence if the main menu is open and the user switches to a channel that is currently not available, using the Channel+/- keys.
---
 device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.c b/device.c
index d01eff497..ef8e8ab25 100644
--- a/device.c
+++ b/device.c
@@ -831,7 +831,7 @@ bool cDevice::SwitchChannel(int Direction)
            result = true;
         }
      else if (n != first)
-        Skins.Message(mtError, tr("Channel not available!"));
+        Skins.QueueMessage(mtError, tr("Channel not available!"));
      }
   return result;
 }

From d05efa63125443f5d7df8d17d61c9f5d1d9e2a14 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 6 May 2019 17:19:00 +0200
Subject: [PATCH 294/307] vdr-2.4.0-32-fix-remote-timers-lstt-550.diff

Fixed handling remote timers in case the response to LSTT is '550 No timers defined'.
---
 svdrp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/svdrp.c b/svdrp.c
index 15bd510d7..205b53cab 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -508,9 +508,10 @@ bool cSVDRPClient::GetRemoteTimers(cStringList &Response)
          int Code = SVDRPCode(s);
          if (Code == 250)
             strshift(s, 4);
+         else if (Code == 550)
+            Response.Clear();
          else {
-            if (Code != 550)
-               esyslog("ERROR: %s: %s", ServerName(), s);
+            esyslog("ERROR: %s: %s", ServerName(), s);
             return false;
             }
          }

From 22ee7e54529885c263b032d12b9078c3baf48dec Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 7 May 2019 11:28:00 +0200
Subject: [PATCH 295/307] 
 vdr-2.4.0-33-fix-compiler-warning-add-attr-packed.diff

Fixed a compiler warning in cIndexFile::ConvertToPes() and added __attribute__((packed)) to tIndexPes and tIndexTs.
---
 recording.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recording.c b/recording.c
index 86fa4aba1..b4aa5a5e2 100644
--- a/recording.c
+++ b/recording.c
@@ -2492,14 +2492,14 @@ void cIndexFileGenerator::Action(void)
 #define MAXINDEXCATCHUP    8 // number of retries
 #define INDEXCATCHUPWAIT 100 // milliseconds
 
-struct tIndexPes {
+struct __attribute__((packed)) tIndexPes {
   uint32_t offset;
   uchar type;
   uchar number;
   uint16_t reserved;
   };
 
-struct tIndexTs {
+struct __attribute__((packed)) tIndexTs {
   uint64_t offset:40; // up to 1TB per file (not using off_t here - must definitely be exactly 64 bit!)
   int reserved:7;     // reserved for future use
   int independent:1;  // marks frames that can be displayed by themselves (for trick modes)
@@ -2634,7 +2634,7 @@ void cIndexFile::ConvertToPes(tIndexTs *IndexTs, int Count)
         IndexPes.type = uchar(IndexTs->independent ? 1 : 2); // I_FRAME : "not I_FRAME" (exact frame type doesn't matter)
         IndexPes.number = uchar(IndexTs->number);
         IndexPes.reserved = 0;
-        memcpy(IndexTs, &IndexPes, sizeof(*IndexTs));
+        memcpy((void *)IndexTs, &IndexPes, sizeof(*IndexTs));
         IndexTs++;
         }
 }

From b1d91c202b302defc16d64869ba60283cc72b5ae Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 13 May 2019 18:00:38 +0200
Subject: [PATCH 296/307] vdr-2.4.0-34-fix-repeat-kbd.diff

Fixed handling repeat function for keyboards.
---
 remote.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/remote.c b/remote.c
index 85b671884..df96d5117 100644
--- a/remote.c
+++ b/remote.c
@@ -307,7 +307,7 @@ void cKbdRemote::PutKey(uint64_t Code, bool Repeat, bool Release)
 int cKbdRemote::ReadKey(void)
 {
   cPoller Poller(STDIN_FILENO);
-  if (Poller.Poll(50)) {
+  if (Poller.Poll(Setup.RcRepeatDelta * 3 / 2)) {
      uchar ch = 0;
      int r = safe_read(STDIN_FILENO, &ch, 1);
      if (r == 1)
@@ -431,6 +431,11 @@ void cKbdRemote::Action(void)
            FirstCommand = 0;
            FirstTime.Set();
            }
+        else if (FirstCommand && FirstTime.Elapsed() > (uint)Setup.RcRepeatDelay) {
+           // Don't wait too long for that second key press:
+           Delayed = false;
+           FirstCommand = 0;
+           }
         LastCommand = Command;
         }
 }

From 8deda5537395c16ca4ac55098b805d20f2c5f156 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 20 May 2019 13:56:08 +0200
Subject: [PATCH 297/307] vdr-2.4.0-35-add-workaround-rst.diff

Added a workaround for broadcasters who set an event to status "not running" where this is inappropriate; implicitly setting events to "not running" is now also logged.
---
 eit.c | 32 ++++++++++++++++++++++++++++++--
 epg.c |  2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/eit.c b/eit.c
index 816233539..b88cc1b47 100644
--- a/eit.c
+++ b/eit.c
@@ -20,6 +20,8 @@
 
 #define VALID_TIME (31536000 * 2) // two years
 
+#define DBGEIT 0
+
 // --- cEIT ------------------------------------------------------------------
 
 class cEIT : public SI::EIT {
@@ -130,8 +132,34 @@ cEIT::cEIT(cSectionSyncerHash &SectionSyncerHash, int Source, u_char Tid, const
       if (pEvent->TableID() > 0x4E) // for backwards compatibility, table ids less than 0x4E are never overwritten
          pEvent->SetTableID(Tid);
       if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
-         if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
-            pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), Channel);
+         int RunningStatus = SiEitEvent.getRunningStatus();
+#if DBGEIT
+         if (Process)
+            dsyslog("channel %d (%s) event %s status %d (raw data from '%s' section)", Channel->Number(), Channel->Name(), *pEvent->ToDescr(), RunningStatus, getSectionNumber() ? "following" : "present");
+#endif
+         if (RunningStatus >= SI::RunningStatusNotRunning) {
+            // Workaround for broadcasters who set an event to status "not running" where
+            // this is inappropriate:
+            if (RunningStatus != pEvent->RunningStatus()) { // if the running status of the event has changed...
+               if (RunningStatus == SI::RunningStatusNotRunning) { // ...and the new status is "not running"...
+                  int OverrideStatus = -1;
+                  if (getSectionNumber() == 0) { // ...and if this the "present" event...
+                     if (pEvent->RunningStatus() == SI::RunningStatusPausing) // ...and if the event has already been set to "pausing"...
+                        OverrideStatus = SI::RunningStatusPausing; // ...then we ignore the faulty new status and stay with "pausing"
+                     }
+                  else // ...and if this is the "following" event...
+                     OverrideStatus = SI::RunningStatusUndefined; // ...then we ignore the faulty new status and fall back to "undefined"
+                  if (OverrideStatus >= 0) {
+#if DBGEIT
+                     if (Process)
+                        dsyslog("channel %d (%s) event %s status %d (ignored status %d from '%s' section)", Channel->Number(), Channel->Name(), *pEvent->ToDescr(), OverrideStatus, RunningStatus, getSectionNumber() ? "following" : "present");
+#endif
+                     RunningStatus = OverrideStatus;
+                     }
+                  }
+               }
+            pSchedule->SetRunningStatus(pEvent, RunningStatus, Channel);
+            }
          if (!Process)
             continue;
          }
diff --git a/epg.c b/epg.c
index 486844e5f..65d781bfa 100644
--- a/epg.c
+++ b/epg.c
@@ -1025,7 +1025,7 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, const cChanne
             }
          }
       else if (RunningStatus >= SI::RunningStatusPausing && p->StartTime() < Event->StartTime())
-         p->SetRunningStatus(SI::RunningStatusNotRunning);
+         p->SetRunningStatus(SI::RunningStatusNotRunning, Channel);
       if (p->RunningStatus() >= SI::RunningStatusPausing)
          hasRunning = true;
       }

From 60916b81e545e695729a42c1d0fd67c7bfda9c08 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Thu, 23 May 2019 14:01:02 +0200
Subject: [PATCH 298/307] vdr-2.4.0-36-fix-assert-free-disk-space.diff

Fixed asserting free disk space in case there is no local timer currently recording.
---
 timers.c | 2 +-
 timers.h | 1 +
 vdr.c    | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/timers.c b/timers.c
index 8119b8586..cf700d71c 100644
--- a/timers.c
+++ b/timers.c
@@ -819,7 +819,7 @@ const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const
 
 int cTimers::GetMaxPriority(void) const
 {
-  int n = 0;
+  int n = -1;
   for (const cTimer *ti = First(); ti; ti = Next(ti)) {
       if (!ti->Remote() && ti->Recording())
          n = max(n, ti->Priority());
diff --git a/timers.h b/timers.h
index 93d5a447f..ef8c927bc 100644
--- a/timers.h
+++ b/timers.h
@@ -178,6 +178,7 @@ class cTimers : public cConfig<cTimer> {
   cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(Event, Match)); }
   int GetMaxPriority(void) const;
       ///< Returns the maximum priority of all local timers that are currently recording.
+      ///< If there is no local timer currently recording, -1 is returned.
   const cTimer *GetNextActiveTimer(void) const;
   const cTimer *UsesChannel(const cChannel *Channel) const;
   bool SetEvents(const cSchedules *Schedules);
diff --git a/vdr.c b/vdr.c
index d7e518380..1e069a4c6 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1182,7 +1182,9 @@ int main(int argc, char *argv[])
           if (Timers->DeleteExpired())
              TimersModified = true;
           // Make sure there is enough free disk space for ongoing recordings:
-          AssertFreeDiskSpace(Timers->GetMaxPriority());
+          int MaxPriority = Timers->GetMaxPriority();
+          if (MaxPriority >= 0)
+             AssertFreeDiskSpace(MaxPriority);
           TimersStateKey.Remove(TimersModified);
         }
         // Recordings:

From 8665852814b629c07a2b9ac5bd8719d1fb41b148 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Sat, 25 May 2019 01:38:31 +0200
Subject: [PATCH 299/307] vdr-2.4.0-37-chg-max-pixmap-size.diff

The default maximum size of a cPixmap has been raised to the maximum possible value.
---
 osd.c | 2 +-
 osd.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osd.c b/osd.c
index 2617c5049..30f9e8be0 100644
--- a/osd.c
+++ b/osd.c
@@ -1643,7 +1643,7 @@ int cOsd::osdLeft = 0;
 int cOsd::osdTop = 0;
 int cOsd::osdWidth = 0;
 int cOsd::osdHeight = 0;
-cSize cOsd::maxPixmapSize(2048, 2048);
+cSize cOsd::maxPixmapSize(INT_MAX, INT_MAX);
 cVector<cOsd *> cOsd::Osds;
 cMutex cOsd::mutex;
 
diff --git a/osd.h b/osd.h
index 559819e35..3b9aba650 100644
--- a/osd.h
+++ b/osd.h
@@ -833,6 +833,10 @@ class cOsd {
        ///< If this is a true color OSD, this function does nothing.
   virtual const cSize &MaxPixmapSize(void) const;
        ///< Returns the maximum possible size of a pixmap this OSD can create.
+       ///< Derived classes can reimplement this function if their implementation
+       ///< of cPixmap can only provide pixmaps up to a certain size.
+       ///< The default implementation returns a cSize object of maximal size
+       ///< (INT_MAX). However, memory restrictions may still apply.
   virtual cPixmap *CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort = cRect::Null);
        ///< Creates a new true color pixmap on this OSD (see cPixmap for details).
        ///< The caller must not delete the returned object, it will be deleted when

From 257f91547a071e60ea12b8537e11f7bc70e035cf Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 27 May 2019 16:17:02 +0200
Subject: [PATCH 300/307] vdr-2.4.0-38-chg-playerbufsize.diff

Increased PLAYERBUFSIZE to (MAXFRAMESIZE * 5) to avoid stuttering replay under heavy system load, and to better document that this buffer size is related to the maximum frame size.
---
 dvbplayer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dvbplayer.c b/dvbplayer.c
index d1c02f9fd..0bf43d016 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -230,7 +230,7 @@ bool cNonBlockingFileReader::WaitForDataMs(int msToWait)
 
 // --- cDvbPlayer ------------------------------------------------------------
 
-#define PLAYERBUFSIZE  MEGABYTE(1)
+#define PLAYERBUFSIZE  (MAXFRAMESIZE * 5)
 
 #define RESUMEBACKUP 10 // number of seconds to back up when resuming an interrupted replay session
 #define MAXSTUCKATEOF 3 // max. number of seconds to wait in case the device doesn't play the last frame

From 4f673a2dbf3b7bb4eeeda0110462cc03852e9f23 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Tue, 28 May 2019 17:27:57 +0200
Subject: [PATCH 301/307] vdr-2.4.0-39-fix-card-index-vs-device-number.diff

Fixed inconsistent behavior in case only certain devices are used (selected by the '-D' option).
---
 ci.c        |  8 ++++----
 ci.h        |  6 +++---
 device.c    | 30 +++++++++++++++---------------
 device.h    |  4 ++--
 dvbdevice.c | 26 +++++++++++++++-----------
 menu.c      | 14 +++++++-------
 mtd.c       |  6 +++---
 mtd.h       |  6 +++---
 sections.c  |  2 +-
 9 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/ci.c b/ci.c
index 8712dfb05..44f4b01cc 100644
--- a/ci.c
+++ b/ci.c
@@ -2233,14 +2233,14 @@ bool cCamSlot::Assign(cDevice *Device, bool Query)
   return false;
 }
 
-bool cCamSlot::Devices(cVector<int> &CardIndexes)
+bool cCamSlot::Devices(cVector<int> &DeviceNumbers)
 {
   cMutexLock MutexLock(&mutex);
   if (mtdHandler)
-     return mtdHandler->Devices(CardIndexes);
+     return mtdHandler->Devices(DeviceNumbers);
   if (assignedDevice)
-     CardIndexes.Append(assignedDevice->CardIndex());
-  return CardIndexes.Size() > 0;
+     DeviceNumbers.Append(assignedDevice->DeviceNumber());
+  return DeviceNumbers.Size() > 0;
 }
 
 void cCamSlot::NewConnection(void)
diff --git a/ci.h b/ci.h
index f7f61004b..3ce1fa00a 100644
--- a/ci.h
+++ b/ci.h
@@ -331,9 +331,9 @@ class cCamSlot : public cListObject {
        ///< class function.
   cDevice *Device(void) { return assignedDevice; }
        ///< Returns the device this CAM slot is currently assigned to.
-  bool Devices(cVector<int> &CardIndexes);
-       ///< Adds the card indexes of any devices that currently use this CAM to
-       ///< the given CardIndexes. This can be more than one in case of MTD.
+  bool Devices(cVector<int> &DeviceNumbers);
+       ///< Adds the numbers of any devices that currently use this CAM to
+       ///< the given DeviceNumbers. This can be more than one in case of MTD.
        ///< Returns true if the array is not empty.
   bool WantsTsData(void) const { return caPidReceiver != NULL; }
        ///< Returns true if this CAM slot wants to receive the TS data through
diff --git a/device.c b/device.c
index ef8e8ab25..7d1827c09 100644
--- a/device.c
+++ b/device.c
@@ -75,9 +75,9 @@ cDevice::cDevice(void)
 :patPmtParser(true)
 {
   cardIndex = nextCardIndex++;
-  dsyslog("new device number %d", CardIndex() + 1);
+  dsyslog("new device number %d (card index %d)", numDevices + 1, CardIndex() + 1);
 
-  SetDescription("device %d receiver", CardIndex() + 1);
+  SetDescription("device %d receiver", numDevices + 1);
 
   mute = false;
   volume = Setup.CurrentVolume;
@@ -230,11 +230,11 @@ static int GetClippedNumProvidedSystems(int AvailableBits, cDevice *Device)
   int MaxNumProvidedSystems = (1 << AvailableBits) - 1;
   int NumProvidedSystems = Device->NumProvidedSystems();
   if (NumProvidedSystems > MaxNumProvidedSystems) {
-     esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->CardIndex() + 1, NumProvidedSystems, MaxNumProvidedSystems);
+     esyslog("ERROR: device %d supports %d modulation systems but cDevice::GetDevice() currently only supports %d delivery systems which should be fixed", Device->DeviceNumber() + 1, NumProvidedSystems, MaxNumProvidedSystems);
      NumProvidedSystems = MaxNumProvidedSystems;
      }
   else if (NumProvidedSystems <= 0) {
-     esyslog("ERROR: device %d reported an invalid number (%d) of supported delivery systems - assuming 1", Device->CardIndex() + 1, NumProvidedSystems);
+     esyslog("ERROR: device %d reported an invalid number (%d) of supported delivery systems - assuming 1", Device->DeviceNumber() + 1, NumProvidedSystems);
      NumProvidedSystems = 1;
      }
   return NumProvidedSystems;
@@ -272,7 +272,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView
       if (NumUsableSlots && SlotPriority[j] > MAXPRIORITY)
          continue; // there is no CAM available in this slot
       for (int i = 0; i < numDevices; i++) {
-          if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
+          if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->DeviceNumber() + 1)
              continue; // a specific card was requested, but not this one
           bool HasInternalCam = device[i]->HasInternalCam();
           if (InternalCamNeeded && !HasInternalCam)
@@ -525,7 +525,7 @@ void cDevice::GetOsdSize(int &Width, int &Height, double &PixelAspect)
   PixelAspect = 1.0;
 }
 
-//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog("%s", b); }
+//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", DeviceNumber() + 1, s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog("%s", b); }
 #define PRINTPIDS(s)
 
 bool cDevice::HasPid(int Pid) const
@@ -560,7 +560,7 @@ bool cDevice::AddPid(int Pid, ePidType PidType, int StreamType)
            // It's a special PID that may have to be switched into "tap" mode
            PRINTPIDS("A");
            if (!SetPid(&pidHandles[n], n, true)) {
-              esyslog("ERROR: can't set PID %d on device %d", Pid, CardIndex() + 1);
+              esyslog("ERROR: can't set PID %d on device %d", Pid, DeviceNumber() + 1);
               if (PidType <= ptTeletext)
                  DetachAll(Pid);
               DelPid(Pid, PidType);
@@ -581,7 +581,7 @@ bool cDevice::AddPid(int Pid, ePidType PidType, int StreamType)
         n = a;
         }
      else {
-        esyslog("ERROR: no free slot for PID %d on device %d", Pid, CardIndex() + 1);
+        esyslog("ERROR: no free slot for PID %d on device %d", Pid, DeviceNumber() + 1);
         return false;
         }
      if (n >= 0) {
@@ -590,7 +590,7 @@ bool cDevice::AddPid(int Pid, ePidType PidType, int StreamType)
         pidHandles[n].used = 1;
         PRINTPIDS("C");
         if (!SetPid(&pidHandles[n], n, true)) {
-           esyslog("ERROR: can't set PID %d on device %d", Pid, CardIndex() + 1);
+           esyslog("ERROR: can't set PID %d on device %d", Pid, DeviceNumber() + 1);
            if (PidType <= ptTeletext)
               DetachAll(Pid);
            DelPid(Pid, PidType);
@@ -1758,7 +1758,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
 #ifdef WAIT_FOR_TUNER_LOCK
 #define TUNER_LOCK_TIMEOUT 5000 // ms
   if (!HasLock(TUNER_LOCK_TIMEOUT)) {
-     esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
+     esyslog("ERROR: device %d has no lock, can't attach receiver!", DeviceNumber() + 1);
      return false;
      }
 #endif
@@ -1849,11 +1849,11 @@ void cDevice::DetachAllReceivers(void)
 
 // --- cTSBuffer -------------------------------------------------------------
 
-cTSBuffer::cTSBuffer(int File, int Size, int CardIndex)
+cTSBuffer::cTSBuffer(int File, int Size, int DeviceNumber)
 {
-  SetDescription("device %d TS buffer", CardIndex);
+  SetDescription("device %d TS buffer", DeviceNumber);
   f = File;
-  cardIndex = CardIndex;
+  deviceNumber = DeviceNumber;
   delivered = 0;
   ringBuffer = new cRingBufferLinear(Size, TS_SIZE, true, "TS");
   ringBuffer->SetTimeouts(100, 100);
@@ -1878,7 +1878,7 @@ void cTSBuffer::Action(void)
               int r = ringBuffer->Read(f);
               if (r < 0 && FATALERRNO) {
                  if (errno == EOVERFLOW)
-                    esyslog("ERROR: driver buffer overflow on device %d", cardIndex);
+                    esyslog("ERROR: driver buffer overflow on device %d", deviceNumber);
                  else {
                     LOG_ERROR;
                     break;
@@ -1909,7 +1909,7 @@ uchar *cTSBuffer::Get(int *Available, bool CheckAvailable)
                }
             }
         ringBuffer->Del(Count);
-        esyslog("ERROR: skipped %d bytes to sync on TS packet on device %d", Count, cardIndex);
+        esyslog("ERROR: skipped %d bytes to sync on TS packet on device %d", Count, deviceNumber);
         return NULL;
         }
      delivered = TS_SIZE;
diff --git a/device.h b/device.h
index ce0b0d271..20e942777 100644
--- a/device.h
+++ b/device.h
@@ -861,12 +861,12 @@ class cDevice : public cThread {
 class cTSBuffer : public cThread {
 private:
   int f;
-  int cardIndex;
+  int deviceNumber;
   int delivered;
   cRingBufferLinear *ringBuffer;
   virtual void Action(void);
 public:
-  cTSBuffer(int File, int Size, int CardIndex);
+  cTSBuffer(int File, int Size, int DeviceNumber);
   virtual ~cTSBuffer();
   uchar *Get(int *Available = NULL, bool CheckAvailable = false);
      ///< Returns a pointer to the first TS packet in the buffer. If Available is given,
diff --git a/dvbdevice.c b/dvbdevice.c
index d7b0e5b86..6978278f3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -738,7 +738,7 @@ cString cDvbTuner::GetBondingParams(const cChannel *Channel) const
      Channel = &channel;
   cDvbTransponderParameters dtp(Channel->Parameters());
   if (Setup.DiSEqC) {
-     if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL))
+     if (const cDiseqc *diseqc = Diseqcs.Get(device->DeviceNumber() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL))
         return diseqc->Commands();
      }
   else {
@@ -1558,7 +1558,7 @@ bool cDvbTuner::SetFrontend(void)
   if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
      int frequency = channel.Frequency();
      if (Setup.DiSEqC) {
-        if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
+        if (const cDiseqc *diseqc = Diseqcs.Get(device->DeviceNumber() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
            frequency -= diseqc->Lof();
            if (diseqc != lastDiseqc || diseqc->IsScr() || diseqc->Position() >= 0 && channel.Source() != lastSource) {
               if (IsBondedMaster()) {
@@ -1939,8 +1939,10 @@ bool cDvbDevice::Initialize(void)
                  while ((f = AdapterDir.Next()) != NULL) {
                        if (strstr(f->d_name, DEV_DVB_FRONTEND) == f->d_name) {
                           int Frontend = strtol(f->d_name + strlen(DEV_DVB_FRONTEND), NULL, 10);
-                          if (access(DvbName(DEV_DVB_DEMUX, Adapter, Frontend), F_OK) == 0) // we only create devices for actual demuxes
+                          if (access(DvbName(DEV_DVB_DEMUX, Adapter, Frontend), F_OK) == 0) { // we only create devices for actual demuxes
+                             dsyslog("detected /dev/dvb/adapter%d/frontend%d", Adapter, Frontend);
                              Nodes.Append(strdup(cString::sprintf("%2d %2d", Adapter, Frontend)));
+                             }
                           }
                        }
                  }
@@ -1962,8 +1964,10 @@ bool cDvbDevice::Initialize(void)
                      if (Probe(Adapter, Frontend))
                         Used++;
                      }
-                  else
+                  else {
+                     dsyslog("skipped /dev/dvb/adapter%d/frontend%d", Adapter, Frontend);
                      NextCardIndex(1); // skips this one
+                     }
                   }
                }
             }
@@ -2037,18 +2041,18 @@ bool cDvbDevice::Bond(cDvbDevice *Device)
            if (dvbTuner && Device->dvbTuner && dvbTuner->Bond(Device->dvbTuner)) {
               bondedDevice = Device->bondedDevice ? Device->bondedDevice : Device;
               Device->bondedDevice = this;
-              dsyslog("device %d bonded with device %d", CardIndex() + 1, bondedDevice->CardIndex() + 1);
+              dsyslog("device %d bonded with device %d", DeviceNumber() + 1, bondedDevice->DeviceNumber() + 1);
               return true;
               }
            }
         else
-           esyslog("ERROR: can't bond device %d with device %d (only DVB-S(2) devices can be bonded)", CardIndex() + 1, Device->CardIndex() + 1);
+           esyslog("ERROR: can't bond device %d with device %d (only DVB-S(2) devices can be bonded)", DeviceNumber() + 1, Device->DeviceNumber() + 1);
         }
      else
-        esyslog("ERROR: can't bond device %d with itself", CardIndex() + 1);
+        esyslog("ERROR: can't bond device %d with itself", DeviceNumber() + 1);
      }
   else
-     esyslog("ERROR: device %d already bonded with device %d, can't bond with device %d", CardIndex() + 1, bondedDevice->CardIndex() + 1, Device->CardIndex() + 1);
+     esyslog("ERROR: device %d already bonded with device %d, can't bond with device %d", DeviceNumber() + 1, bondedDevice->DeviceNumber() + 1, Device->DeviceNumber() + 1);
   return false;
 }
 
@@ -2058,7 +2062,7 @@ void cDvbDevice::UnBond(void)
   if (cDvbDevice *d = bondedDevice) {
      if (dvbTuner)
         dvbTuner->UnBond();
-     dsyslog("device %d unbonded from device %d", CardIndex() + 1, bondedDevice->CardIndex() + 1);
+     dsyslog("device %d unbonded from device %d", DeviceNumber() + 1, bondedDevice->DeviceNumber() + 1);
      while (d->bondedDevice != this)
            d = d->bondedDevice;
      if (d == bondedDevice)
@@ -2174,7 +2178,7 @@ bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const
      return false; // requires modulation system which frontend doesn't provide
   cDvbTransponderParameters dtp(Channel->Parameters());
   if (!cSource::IsSat(Channel->Source()) ||
-     (!Setup.DiSEqC || Diseqcs.Get(CardIndex() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL)))
+     (!Setup.DiSEqC || Diseqcs.Get(DeviceNumber() + 1, Channel->Source(), Channel->Frequency(), dtp.Polarization(), NULL)))
      return DeviceHooksProvidesTransponder(Channel);
   return false;
 }
@@ -2298,7 +2302,7 @@ bool cDvbDevice::OpenDvr(void)
   CloseDvr();
   fd_dvr = DvbOpen(DEV_DVB_DVR, adapter, frontend, O_RDONLY | O_NONBLOCK, true);
   if (fd_dvr >= 0)
-     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(5), CardIndex() + 1);
+     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(5), DeviceNumber() + 1);
   return fd_dvr >= 0;
 }
 
diff --git a/menu.c b/menu.c
index 3c21655bb..b3488bb40 100644
--- a/menu.c
+++ b/menu.c
@@ -3892,16 +3892,16 @@ bool cMenuSetupCAMItem::Changed(void)
   else if (camSlot->IsActivating())
      // TRANSLATORS: note the leading blank!
      Activating = tr(" (activating)");
-  cVector<int> CardIndexes;
+  cVector<int> DeviceNumbers;
   for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
       if (CamSlot == camSlot || CamSlot->MasterSlot() == camSlot)
-         CamSlot->Devices(CardIndexes);
+         CamSlot->Devices(DeviceNumbers);
       }
-  if (CardIndexes.Size() > 0) {
+  if (DeviceNumbers.Size() > 0) {
      AssignedDevice = cString::sprintf(" %s", tr("@ device"));
-     CardIndexes.Sort(CompareInts);
-     for (int i = 0; i < CardIndexes.Size(); i++)
-         AssignedDevice = cString::sprintf("%s %d", *AssignedDevice, CardIndexes[i] + 1);
+     DeviceNumbers.Sort(CompareInts);
+     for (int i = 0; i < DeviceNumbers.Size(); i++)
+         AssignedDevice = cString::sprintf("%s %d", *AssignedDevice, DeviceNumbers[i]);
      }
 
   cString buffer = cString::sprintf(" %d %s%s%s", camSlot->SlotNumber(), CamName, *AssignedDevice, Activating);
@@ -5231,7 +5231,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimers *Timers, cTimer *Timer,
   if (!timer) {
      timer = new cTimer(true, Pause);
      Timers->Add(timer);
-     instantId = cString::sprintf(cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->CardIndex() + 1);
+     instantId = cString::sprintf(cDevice::NumDevices() > 1 ? "%s - %d" : "%s", timer->Channel()->Name(), device->DeviceNumber() + 1);
      }
   timer->SetPending(true);
   timer->SetRecording(true);
diff --git a/mtd.c b/mtd.c
index a177167f4..25f9c14db 100644
--- a/mtd.c
+++ b/mtd.c
@@ -127,11 +127,11 @@ bool cMtdHandler::IsActivating(void)
   return false;
 }
 
-bool cMtdHandler::Devices(cVector<int> &CardIndexes)
+bool cMtdHandler::Devices(cVector<int> &DeviceNumbers)
 {
   for (int i = 0; i < camSlots.Size(); i++)
-      camSlots[i]->Devices(CardIndexes);
-  return CardIndexes.Size() > 0;
+      camSlots[i]->Devices(DeviceNumbers);
+  return DeviceNumbers.Size() > 0;
 }
 
 void cMtdHandler::UnAssignAll(void)
diff --git a/mtd.h b/mtd.h
index 2be5f3dcd..59139c7f1 100644
--- a/mtd.h
+++ b/mtd.h
@@ -136,9 +136,9 @@ class cMtdHandler {
       ///< Tells all active MTD CAM slots to cancel activation.
   bool IsActivating(void);
       ///< Returns true if any of the active MTD CAM slots is currently activating.
-  bool Devices(cVector<int> &CardIndexes);
-      ///< Adds the card indexes of the devices of any active MTD CAM slots to
-      ///< the given CardIndexes.
+  bool Devices(cVector<int> &DeviceNumbers);
+      ///< Adds the numbers of the devices of any active MTD CAM slots to
+      ///< the given DeviceNumbers.
       ///< Returns true if the array is not empty.
   void UnAssignAll(void);
       ///< Unassigns all MTD CAM slots from their devices.
diff --git a/sections.c b/sections.c
index 55447bf18..4b2977fb4 100644
--- a/sections.c
+++ b/sections.c
@@ -44,7 +44,7 @@ cSectionHandler::cSectionHandler(cDevice *Device)
 {
   shp = new cSectionHandlerPrivate;
   device = Device;
-  SetDescription("device %d section handler", device->CardIndex() + 1);
+  SetDescription("device %d section handler", device->DeviceNumber() + 1);
   statusCount = 0;
   on = false;
   waitForLock = false;

From f3c7b187f51b9844e2cfe612a29b99f83fff90b2 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Wed, 29 May 2019 16:25:01 +0200
Subject: [PATCH 302/307] vdr-2.4.0-40-fix-wrong-variable-name.diff

Fixed a wrong variable name in cFileName::cFileName().
---
 recording.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recording.c b/recording.c
index b4aa5a5e2..166414c98 100644
--- a/recording.c
+++ b/recording.c
@@ -2890,7 +2890,7 @@ cFileName::cFileName(const char *FileName, bool Record, bool Blocking, bool IsPe
   // Prepare the file name:
   fileName = MALLOC(char, strlen(FileName) + RECORDFILESUFFIXLEN);
   if (!fileName) {
-     esyslog("ERROR: can't copy file name '%s'", fileName);
+     esyslog("ERROR: can't copy file name '%s'", FileName);
      return;
      }
   strcpy(fileName, FileName);

From 5578f7dd549026aa2413ded3036b182804f7e9a5 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Wed, 29 May 2019 18:44:24 +0200
Subject: [PATCH 303/307] vdr-2.4.0-41-chg-skins-message-to-queue.diff

If cSkins::Message() is called from a background thread and Type is not mtStatus, the call is now automatically forwarded to QueueMessage().
---
 skins.c | 5 ++++-
 skins.h | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/skins.c b/skins.c
index 43e14c068..e7cfb27cb 100644
--- a/skins.c
+++ b/skins.c
@@ -250,7 +250,10 @@ bool cSkins::SetCurrent(const char *Name)
 eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
 {
   if (!cThread::IsMainThread()) {
-     dsyslog("cSkins::Message() called from background thread - ignored! (Use cSkins::QueueMessage() instead)");
+     if (Type != mtStatus)
+        QueueMessage(Type, s, Seconds);
+     else
+        dsyslog("cSkins::Message(%d, \"%s\", %d) called from background thread - ignored! (Use cSkins::QueueMessage() instead)", Type, s, Seconds);
      return kNone;
      }
   switch (Type) {
diff --git a/skins.h b/skins.h
index bd8e15d12..0754ce5cc 100644
--- a/skins.h
+++ b/skins.h
@@ -477,6 +477,8 @@ class cSkins : public cList<cSkin> {
        ///< has been received within Seconds (the default value of 0 results
        ///< in the value defined for "Message time" in the setup), kNone
        ///< will be returned.
+       ///< If Message() is called from a background thread and Type is not
+       ///< mtStatus, the call will be automatically forwarded to QueueMessage().
   int QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
        ///< Like Message(), but this function may be called from a background
        ///< thread. The given message is put into a queue and the main program

From 508dc29c6f0ca33a57c7bf4c27530ec67d0dca31 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Fri, 31 May 2019 15:23:17 +0200
Subject: [PATCH 304/307] 
 vdr-2.4.0-42-fix-nit-dvbs2-backwards-compatibility-mode.diff

Fixed handling the S2SatelliteDeliverySystemDescriptor for transponders broadcasting in "backwards compatibility mode" according to ETSI EN 300 468.
---
 nit.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nit.c b/nit.c
index 655e89667..48724da7b 100644
--- a/nit.c
+++ b/nit.c
@@ -97,6 +97,15 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
          }
       delete fld;
 
+      // Necessary for "backwards compatibility mode" according to ETSI EN 300 468:
+      bool ForceDVBS2 = false;
+      for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
+          if (d->getDescriptorTag() == SI::S2SatelliteDeliverySystemDescriptorTag) {
+             ForceDVBS2 = true;
+             break;
+             }
+          }
+
       for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
             case SI::SatelliteDeliverySystemDescriptorTag: {
@@ -110,11 +119,12 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                  dtp.SetCoderateH(CodeRates[sd->getFecInner()]);
                  static int Modulations[] = { QAM_AUTO, QPSK, PSK_8, QAM_16 };
                  dtp.SetModulation(Modulations[sd->getModulationType()]);
-                 dtp.SetSystem(sd->getModulationSystem() ? DVB_SYSTEM_2 : DVB_SYSTEM_1);
+                 bool System = sd->getModulationSystem() || ForceDVBS2;
+                 dtp.SetSystem(System ? DVB_SYSTEM_2 : DVB_SYSTEM_1);
                  static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };
-                 dtp.SetRollOff(sd->getModulationSystem() ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
+                 dtp.SetRollOff(System ? RollOffs[sd->getRollOff()] : ROLLOFF_AUTO);
                  int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
-                 dbgnit("    %s %d %c %d %d\n", *cSource::ToString(Source), Frequency, dtp.Polarization(), SymbolRate, cChannel::Transponder(Frequency, dtp.Polarization()));
+                 dbgnit("    %s %d %c %d %d DVB-S%d\n", *cSource::ToString(Source), Frequency, dtp.Polarization(), SymbolRate, cChannel::Transponder(Frequency, dtp.Polarization()), System ? 2 : 1);
                  if (Setup.UpdateChannels >= 5) {
                     bool found = false;
                     bool forceTransponderUpdate = false;

From 32cea9d796fcda7877e0ebbec92bb70ff072d369 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Mon, 17 Jun 2019 12:24:08 +0000
Subject: [PATCH 305/307] Version 2.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VDR version 2.4.1 is now available at

       ftp://ftp.tvdr.de/vdr/vdr-2.4.1.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.4.0-2.4.1.diff

MD5 checksums:

b2897fe6b6e6711d512a69642b1b8ec1  vdr-2.4.1.tar.bz2
cf5f328165e1a48e28e68b6709312e63  vdr-2.4.0-2.4.1.diff

This version fixes a few bugs that came up after the release of version 2.4.0.

The changes since version 2.4.0:

- Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
   by Johann Friedrichs).
- Fixed a possible invalid locking sequence in case a remote timer handling error message
   is displayed on the OSD and the skin tries to lock the Recordings or DeletedRecordings
   list in its Flush() function (for instance by calling cVideoDiskUsage::HasChanged()).
   To do this, the call to Skins.Message() in menu.c's HandleRemoteModifications() has
   been changed to Skins.QueueMessage(), and cSkins::ProcessQueuedMessages() is now called
   unconditionally in the main loop, and checks whether the current cSkinDisplay object
   (if any) implements SetMessage().
- Fixed locking the Channels list in cDisplayChannel, where the lock was still held
   when Flush() was called (reported by Matthias Senzel and Uwe Scheffler).
- Fixed shutdown after user inactivity in case a plugin is keeping the OSD open
   (reported by Ulrich Eckhardt).
- Fixed switching through encrypted channels with the Up/Down keys (thanks to Helmut
   Binder).
- Now deactivating MTD support if a non MCD capable CAM is inserted after removing
   a previously used CAM that is MCD capable (thanks to Helmut Binder).
- Added support for DVB devices with more than one frontend that all use the same
   dvr and demux. Note that in order for this to work, you must not set symbolic
   links like "demux1 -> demux0" and "dvr1 -> dvr0", as is mentioned in some user
   manuals of multi frontend DVB cards.
- Reverted the change "The EIT filter no longer parses data from "other TS"...". It led to
   missing EPG data on channels from Canal Digital Norway (reported by Stian B. Barmen).
- Fixed accessing the actual frontend on multi frontend devices (thanks to Helmut Binder).
- Fixed opening the UDP port in peerdemo (thanks to Robert Hannebauer).
- Fixed handling PATs that contain no PMTs.
- Fixed processing the last entry in the scan list of the EIT scanner (thanks to
   Helmut Binder).
- Fixed processing transponder data in the NIT (thanks to Helmut Binder).
- Fixed triggering the SDT filter when parsing the NIT (thanks to Helmut Binder).
- Added support for EAC3 audio from other sources (thanks to Jürgen Schneider).
- No longer logging tuning timeouts for transponders that are announced in the NIT but
   are not currently broadcasting.
- Fixed processing SI::T2DeliverySystemDescriptor when typecasting it over an
   SI::ExtensionDescriptor (reported by Helmut Binder).
- Fixed sorting recordings alphabetically.
- Fixed dropping capabilities in case cap_sys_time is not available.
- Fixed updating the cursor position when switching channels with the Channel+/- keys
   while the Channels menu is open.
- Fixed handling shared CA pids (thanks to Onur Sentürk).
- Now touching the .update file in the video directory after removing deleted
   recordings, so that other VDRs that use the same video directory will update their
   list of (deleted) recordings and thus won't display too much empty disk space.
- Fixed the install target in case of multiple jobs (thanks to Chris Mayo).
- Fixed mapping SIDs in MTD (thanks to Helmut Binder).
- Fixed updating the checksum in the CA table after mapping EMM PIDs for MTD (thanks to
   Helmut Binder).
- Fixed a compiler warning in ExchangeChars() (thanks to Helmut Binder).
- Fixed a compiler warning and a possible buffer overflow in cCiMMI::SendAnswer().
- Fixed a possible invalid lock sequence if the main menu is open and the user
   switches to a channel that is currently not available, using the Channel+/- keys.
- Fixed handling remote timers in case the response to LSTT is '550 No timers defined'.
- Fixed a compiler warning in cIndexFile::ConvertToPes() and added __attribute__((packed))
   to tIndexPes and tIndexTs (suggested by Helmut Binder).
- Fixed handling repeat function for keyboards.
- Added a workaround for broadcasters who set an event to status "not running" where
   this is inappropriate; implicitly setting events to "not running" is now also logged.
- Fixed asserting free disk space in case there is no local timer currently recording.
- The default maximum size of a cPixmap has been raised to the maximum possible value.
- Increased PLAYERBUFSIZE to (MAXFRAMESIZE * 5) to avoid stuttering replay under heavy
   system load, and to better document that this buffer size is related to the maximum
   frame size.
- Fixed inconsistent behavior in case only certain devices are used (selected by the '-D'
   option).
- Fixed a wrong variable name in cFileName::cFileName().
- If cSkins::Message() is called from a background thread and Type is not mtStatus,
   the call is now automatically forwarded to QueueMessage().
- Fixed handling the S2SatelliteDeliverySystemDescriptor for transponders broadcasting
   in "backwards compatibility mode" according to ETSI EN 300 468 (thanks to Onur Sentürk).
---
 CONTRIBUTORS                        | 31 +++++++++++++
 HISTORY                             | 72 +++++++++++++++++++++++++++++
 Makefile                            |  6 +--
 PLUGINS/src/skincurses/HISTORY      |  4 ++
 PLUGINS/src/skincurses/skincurses.c |  2 +-
 ci.c                                |  4 +-
 ci.h                                |  2 +-
 config.h                            | 10 ++--
 device.c                            |  2 +-
 device.h                            |  2 +-
 dvbdevice.c                         |  2 +-
 dvbdevice.h                         |  2 +-
 dvbplayer.c                         |  2 +-
 eit.c                               |  2 +-
 eitscan.c                           |  2 +-
 epg.c                               |  2 +-
 libsi/descriptor.c                  |  2 +-
 libsi/descriptor.h                  |  2 +-
 menu.c                              |  2 +-
 mtd.c                               |  2 +-
 mtd.h                               |  2 +-
 nit.c                               |  2 +-
 osd.c                               |  2 +-
 osd.h                               |  2 +-
 pat.c                               |  2 +-
 recording.c                         | 26 +++++++----
 remote.c                            |  2 +-
 remux.c                             |  2 +-
 sections.c                          |  2 +-
 skins.c                             |  2 +-
 skins.h                             |  2 +-
 svdrp.c                             |  2 +-
 timers.c                            |  2 +-
 timers.h                            |  2 +-
 vdr.c                               | 16 +++----
 35 files changed, 168 insertions(+), 55 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4fb011f98..24f72e86d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -283,6 +283,8 @@ Uwe Scheffler <linux_dvb@uni.de>
  for reporting a problem in handling the PrimaryLimit when requesting a device for
  live viewing
  for reporting a black screen while a "Recording started" message is displayed
+ for reporting a problem with the lock on the Channels list in cDisplayChannel still
+ being held when Flush() was called
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
@@ -2270,6 +2272,7 @@ J
  in cKbdRemote
  for reporting a possible discrepancy of the primary device number in the LSTD and
  PRIM commands
+ for adding support for EAC3 audio from other sources
 
 Christian Wieninger <cwieninger@gmx.de>
  for suggesting to add cMenuEditStrItem::InEditMode()
@@ -2854,6 +2857,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
  replay has been stopped, but before the replay control has been destroyed
  for reporting a problem in processing SVDRP client responses in case the caller doesn't
  want the actual response strings
+ for reporting a bug in handling the tfRecording flag in the SVDRP commands MODT and UPDT
 
 Timo Helkio <timolavi@mbnet.fi>
  for reporting a hangup when replaying a TS recording with subtitles activated
@@ -3124,6 +3128,7 @@ Chris Mayo <aklhfex@gmail.com>
  for updating links in the INSTALL file
  for reporting double slashes in file names processed with AddDirectory()
  for using the 'example' macro in vdr.5
+ for fixing the install target in case of multiple jobs
 
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
@@ -3315,6 +3320,8 @@ Matthias Senzel <matthias.senzel@t-online.de>
  after starting the editing process
  for reporting a problem with setting the initial offset of the cursor in a list menu
  for reporting a high CPU load during replay with active progress display
+ for reporting that the lock on the Channels list in cDisplayChannel was still held
+ when Flush() was called
 
 Marek Nazarko <mnazarko@gmail.com>
  for translating OSD texts to the Polish language
@@ -3539,6 +3546,7 @@ Stefan P
 
 Robert Hannebauer <vdr@hannebauer.org>
  for fixing an overflow of PIDs in a receiver
+ for fixing opening the UDP port in peerdemo
 
 Aitugan Sarbassov <isarbassov@gmail.com>
  for adding 'S58.5E Kazsat 3' to sources.conf
@@ -3558,6 +3566,29 @@ Daniel Scheller <d.scheller@gmx.net>
 
 Onur Sent�rk <onur@sentek.org>
  for making the MTD mapper avoid immediately reusing unique PIDs when switching channels
+ for fixing handling shared CA pids
+ for fixing handling the S2SatelliteDeliverySystemDescriptor for transponders broadcasting
+ in "backwards compatibility mode" according to ETSI EN 300 468
 
 Helmut Binder <cco@aon.at>
  for improving calculating signal strength and quality
+ for fixing switching through encrypted channels with the Up/Down keys
+ for deactivating MTD support if a non MCD capable CAM is inserted after removing
+ a previously used CAM that is MCD capable
+ for fixing accessing the actual frontend on multi frontend devices
+ for fixing processing the last entry in the scan list of the EIT scanner
+ for fixing processing transponder data in the NIT
+ for fixing triggering the SDT filter when parsing the NIT
+ for reporting a bug in processing SI::T2DeliverySystemDescriptor when typecasting it
+ over an SI::ExtensionDescriptor
+ for fixing mapping SIDs in MTD
+ for fixing updating the checksum in the CA table after mapping EMM PIDs for MTD
+ for fixing a compiler warning in ExchangeChars()
+ for suggesting to add __attribute__((packed)) to tIndexPes and tIndexTs
+
+Ulrich Eckhardt <uli@uli-eckhardt.de>
+ for reporting a problem with shutdown after user inactivity in case a plugin is
+ keeping the OSD open
+
+Stian B. Barmen <stian@barmen.nu>
+ for reporting missing EPG data on channels from Canal Digital Norway
diff --git a/HISTORY b/HISTORY
index d477dd588..143138ec3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9347,3 +9347,75 @@ Video Disk Recorder Revision History
 - Fixed a high CPU load during replay with active progress display (reported by Matthias
   Senzel).
 - Official release.
+
+2019-06-17: Version 2.4.1
+
+- Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
+  by Johann Friedrichs).
+- Fixed a possible invalid locking sequence in case a remote timer handling error message
+  is displayed on the OSD and the skin tries to lock the Recordings or DeletedRecordings
+  list in its Flush() function (for instance by calling cVideoDiskUsage::HasChanged()).
+  To do this, the call to Skins.Message() in menu.c's HandleRemoteModifications() has
+  been changed to Skins.QueueMessage(), and cSkins::ProcessQueuedMessages() is now called
+  unconditionally in the main loop, and checks whether the current cSkinDisplay object
+  (if any) implements SetMessage().
+- Fixed locking the Channels list in cDisplayChannel, where the lock was still held
+  when Flush() was called (reported by Matthias Senzel and Uwe Scheffler).
+- Fixed shutdown after user inactivity in case a plugin is keeping the OSD open
+  (reported by Ulrich Eckhardt).
+- Fixed switching through encrypted channels with the Up/Down keys (thanks to Helmut
+  Binder).
+- Now deactivating MTD support if a non MCD capable CAM is inserted after removing
+  a previously used CAM that is MCD capable (thanks to Helmut Binder).
+- Added support for DVB devices with more than one frontend that all use the same
+  dvr and demux. Note that in order for this to work, you must not set symbolic
+  links like "demux1 -> demux0" and "dvr1 -> dvr0", as is mentioned in some user
+  manuals of multi frontend DVB cards.
+- Reverted the change "The EIT filter no longer parses data from "other TS"...". It led to
+  missing EPG data on channels from Canal Digital Norway (reported by Stian B. Barmen).
+- Fixed accessing the actual frontend on multi frontend devices (thanks to Helmut Binder).
+- Fixed opening the UDP port in peerdemo (thanks to Robert Hannebauer).
+- Fixed handling PATs that contain no PMTs.
+- Fixed processing the last entry in the scan list of the EIT scanner (thanks to
+  Helmut Binder).
+- Fixed processing transponder data in the NIT (thanks to Helmut Binder).
+- Fixed triggering the SDT filter when parsing the NIT (thanks to Helmut Binder).
+- Added support for EAC3 audio from other sources (thanks to J�rgen Schneider).
+- No longer logging tuning timeouts for transponders that are announced in the NIT but
+  are not currently broadcasting.
+- Fixed processing SI::T2DeliverySystemDescriptor when typecasting it over an
+  SI::ExtensionDescriptor (reported by Helmut Binder).
+- Fixed sorting recordings alphabetically.
+- Fixed dropping capabilities in case cap_sys_time is not available.
+- Fixed updating the cursor position when switching channels with the Channel+/- keys
+  while the Channels menu is open.
+- Fixed handling shared CA pids (thanks to Onur Sent�rk).
+- Now touching the .update file in the video directory after removing deleted
+  recordings, so that other VDRs that use the same video directory will update their
+  list of (deleted) recordings and thus won't display too much empty disk space.
+- Fixed the install target in case of multiple jobs (thanks to Chris Mayo).
+- Fixed mapping SIDs in MTD (thanks to Helmut Binder).
+- Fixed updating the checksum in the CA table after mapping EMM PIDs for MTD (thanks to
+  Helmut Binder).
+- Fixed a compiler warning in ExchangeChars() (thanks to Helmut Binder).
+- Fixed a compiler warning and a possible buffer overflow in cCiMMI::SendAnswer().
+- Fixed a possible invalid lock sequence if the main menu is open and the user
+  switches to a channel that is currently not available, using the Channel+/- keys.
+- Fixed handling remote timers in case the response to LSTT is '550 No timers defined'.
+- Fixed a compiler warning in cIndexFile::ConvertToPes() and added __attribute__((packed))
+  to tIndexPes and tIndexTs (suggested by Helmut Binder).
+- Fixed handling repeat function for keyboards.
+- Added a workaround for broadcasters who set an event to status "not running" where
+  this is inappropriate; implicitly setting events to "not running" is now also logged.
+- Fixed asserting free disk space in case there is no local timer currently recording.
+- The default maximum size of a cPixmap has been raised to the maximum possible value.
+- Increased PLAYERBUFSIZE to (MAXFRAMESIZE * 5) to avoid stuttering replay under heavy
+  system load, and to better document that this buffer size is related to the maximum
+  frame size.
+- Fixed inconsistent behavior in case only certain devices are used (selected by the '-D'
+  option).
+- Fixed a wrong variable name in cFileName::cFileName().
+- If cSkins::Message() is called from a background thread and Type is not mtStatus,
+  the call is now automatically forwarded to QueueMessage().
+- Fixed handling the S2SatelliteDeliverySystemDescriptor for transponders broadcasting
+  in "backwards compatibility mode" according to ETSI EN 300 468 (thanks to Onur Sent�rk).
diff --git a/Makefile b/Makefile
index a13214a6a..a98bf0b9d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 4.5 2017/05/29 08:48:42 kls Exp $
+# $Id: Makefile 4.5.1.1 2019/05/05 13:37:38 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -271,7 +271,7 @@ clean-plugins: vdr.pc
 
 # Install the files (note that 'install-pc' must be first!):
 
-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
+install: install-pc install-bin install-conf install-doc install-plugins install-i18n install-includes
 
 # VDR binary:
 
@@ -288,7 +288,7 @@ install-dirs:
 	@mkdir -p $(DESTDIR)$(CACHEDIR)
 	@mkdir -p $(DESTDIR)$(RESDIR)
 
-install-conf:
+install-conf: install-dirs
 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
 
 # Documentation:
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 287653f35..cab83551e 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -141,3 +141,7 @@ VDR Plugin 'skincurses' Revision History
 2018-04-15: Version 2.4.0
 
 - Official release.
+
+2019-03-12: Version 2.4.1
+
+- Changes for ncurses version 6 (thanks to Ulrick Eckhardt).
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 6803a2604..8ef400e46 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 4.3 2018/04/10 13:01:00 kls Exp $
+ * $Id: skincurses.c 4.3.1.1 2019/03/12 12:28:04 kls Exp $
  */
 
 #include <ncurses.h>
diff --git a/ci.c b/ci.c
index 44f4b01cc..26a056d90 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 4.21 2018/03/19 16:37:03 kls Exp $
+ * $Id: ci.c 4.21.1.5 2019/05/28 15:55:44 kls Exp $
  */
 
 #include "ci.h"
@@ -2549,7 +2549,7 @@ void cCamSlot::KeepSharedCaPids(int ProgramNumber, const int *CaSystemIds, int *
      return;
   int CaPids2[MAXRECEIVEPIDS + 1];
   for (cCiCaProgramData *p = caProgramList.First(); p; p = caProgramList.Next(p)) {
-      if (p->programNumber != ProgramNumber) { 
+      if (p->programNumber != ProgramNumber) {
          if (GetCaPids(source, transponder, p->programNumber, CaSystemIds, MAXRECEIVEPIDS + 1, CaPids2) > 0) {
             int *pCaPids2 = CaPids2;
             while (*pCaPids2) {
diff --git a/ci.h b/ci.h
index 3ce1fa00a..ec97b7c78 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 4.12 2018/03/17 12:17:37 kls Exp $
+ * $Id: ci.h 4.12.1.2 2019/05/28 15:55:44 kls Exp $
  */
 
 #ifndef __CI_H
diff --git a/config.h b/config.h
index 8c09209b2..043c1ee02 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 4.15 2018/03/19 15:06:46 kls Exp $
+ * $Id: config.h 4.15.1.1 2019/06/16 09:13:45 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.4.0"
-#define VDRVERSNUM   20400  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.4.1"
+#define VDRVERSNUM   20401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "2.4.0"
-#define APIVERSNUM   20400  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.4.1"
+#define APIVERSNUM   20401  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/device.c b/device.c
index 7d1827c09..da37d0ce9 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.27 2018/03/24 09:49:14 kls Exp $
+ * $Id: device.c 4.27.1.3 2019/05/28 15:55:44 kls Exp $
  */
 
 #include "device.h"
diff --git a/device.h b/device.h
index 20e942777..91127de28 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 4.12 2017/11/02 14:47:33 kls Exp $
+ * $Id: device.h 4.12.1.1 2019/05/28 15:55:44 kls Exp $
  */
 
 #ifndef __DEVICE_H
diff --git a/dvbdevice.c b/dvbdevice.c
index 6978278f3..69e7fe8d8 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 4.16 2018/02/15 15:37:01 kls Exp $
+ * $Id: dvbdevice.c 4.16.1.4 2019/05/28 15:55:44 kls Exp $
  */
 
 #include "dvbdevice.h"
diff --git a/dvbdevice.h b/dvbdevice.h
index ddac5ed8f..2ccf8b531 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 4.4 2017/05/09 11:24:47 kls Exp $
+ * $Id: dvbdevice.h 4.4.1.2 2019/03/10 12:18:02 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
diff --git a/dvbplayer.c b/dvbplayer.c
index 0bf43d016..5bc671528 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 4.5 2017/11/26 14:55:03 kls Exp $
+ * $Id: dvbplayer.c 4.5.1.1 2019/05/28 09:27:32 kls Exp $
  */
 
 #include "dvbplayer.h"
diff --git a/eit.c b/eit.c
index b88cc1b47..50d82290a 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 4.5 2018/03/31 13:40:32 kls Exp $
+ * $Id: eit.c 4.5.1.2 2019/05/21 21:25:00 kls Exp $
  */
 
 #include "eit.h"
diff --git a/eitscan.c b/eitscan.c
index aae732fa3..c17781c83 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 4.2 2015/09/10 11:05:03 kls Exp $
+ * $Id: eitscan.c 4.2.1.1 2019/03/12 11:54:27 kls Exp $
  */
 
 #include "eitscan.h"
diff --git a/epg.c b/epg.c
index 65d781bfa..ee24935fd 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 4.8 2017/05/28 13:08:09 kls Exp $
+ * $Id: epg.c 4.8.1.1 2019/05/21 21:25:00 kls Exp $
  */
 
 #include "epg.h"
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 6705797e0..7a304ec54 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 4.0 2013/10/30 10:16:18 kls Exp $
+ *   $Id: descriptor.c 4.0.1.1 2019/03/15 22:38:36 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index c3aeaedcd..3eb2a17c6 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 4.0 2014/02/08 12:44:17 kls Exp $
+ *   $Id: descriptor.h 4.0.1.1 2019/03/15 22:38:36 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
diff --git a/menu.c b/menu.c
index b3488bb40..6f5e92d6d 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.74 2018/04/14 10:24:41 kls Exp $
+ * $Id: menu.c 4.74.1.6 2019/05/28 15:55:44 kls Exp $
  */
 
 #include "menu.h"
diff --git a/mtd.c b/mtd.c
index 25f9c14db..c3dae730e 100644
--- a/mtd.c
+++ b/mtd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.c 1.12 2017/10/31 12:16:39 kls Exp $
+ * $Id: mtd.c 1.12.1.2 2019/05/28 15:55:44 kls Exp $
  */
 
 #include "mtd.h"
diff --git a/mtd.h b/mtd.h
index 59139c7f1..c1d1cb696 100644
--- a/mtd.h
+++ b/mtd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: mtd.h 1.8 2017/05/01 09:19:21 kls Exp $
+ * $Id: mtd.h 1.8.1.1 2019/05/28 15:55:44 kls Exp $
  */
 
 #ifndef __MTD_H
diff --git a/nit.c b/nit.c
index 48724da7b..98f225bfa 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: nit.c 4.5 2018/03/18 10:52:21 kls Exp $
+ * $Id: nit.c 4.5.1.4 2019/05/31 21:47:02 kls Exp $
  */
 
 #include "nit.h"
diff --git a/osd.c b/osd.c
index 30f9e8be0..0b85fb2e9 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 4.5 2018/04/06 08:43:15 kls Exp $
+ * $Id: osd.c 4.5.1.1 2019/05/24 21:30:20 kls Exp $
  */
 
 #include "osd.h"
diff --git a/osd.h b/osd.h
index 3b9aba650..102672156 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 4.5 2017/11/02 14:59:19 kls Exp $
+ * $Id: osd.h 4.5.1.1 2019/05/24 21:30:20 kls Exp $
  */
 
 #ifndef __OSD_H
diff --git a/pat.c b/pat.c
index ec676a242..40a3b3d44 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 4.3 2016/12/23 14:02:07 kls Exp $
+ * $Id: pat.c 4.3.1.2 2019/03/15 13:13:40 kls Exp $
  */
 
 #include "pat.h"
diff --git a/recording.c b/recording.c
index 166414c98..e493b571d 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 4.22 2018/03/17 10:56:13 kls Exp $
+ * $Id: recording.c 4.22.1.4 2019/05/29 14:25:51 kls Exp $
  */
 
 #include "recording.h"
@@ -99,27 +99,33 @@ void cRemoveDeletedRecordingsThread::Action(void)
   if (LockFile.Lock()) {
      time_t StartTime = time(NULL);
      bool deleted = false;
+     bool interrupted = false;
      LOCK_DELETEDRECORDINGS_WRITE;
      for (cRecording *r = DeletedRecordings->First(); r; ) {
          if (cIoThrottle::Engaged())
-            return;
-         if (time(NULL) - StartTime > MAXREMOVETIME)
-            return; // don't stay here too long
-         if (cRemote::HasKeys())
-            return; // react immediately on user input
+            interrupted = true;
+         else if (time(NULL) - StartTime > MAXREMOVETIME)
+            interrupted = true; // don't stay here too long
+         else if (cRemote::HasKeys())
+            interrupted = true; // react immediately on user input
+         if (interrupted)
+            break;
          if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
             cRecording *next = DeletedRecordings->Next(r);
             r->Remove();
             DeletedRecordings->Del(r);
             r = next;
             deleted = true;
-            continue;
             }
-         r = DeletedRecordings->Next(r);
+         else
+            r = DeletedRecordings->Next(r);
          }
      if (deleted) {
-        const char *IgnoreFiles[] = { SORTMODEFILE, TIMERRECFILE, NULL };
-        cVideoDirectory::RemoveEmptyVideoDirectories(IgnoreFiles);
+        cRecordings::TouchUpdate();
+        if (!interrupted) {
+           const char *IgnoreFiles[] = { SORTMODEFILE, TIMERRECFILE, NULL };
+           cVideoDirectory::RemoveEmptyVideoDirectories(IgnoreFiles);
+           }
         }
      }
 }
diff --git a/remote.c b/remote.c
index df96d5117..cc144925c 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 4.0 2015/01/20 14:53:57 kls Exp $
+ * $Id: remote.c 4.0.1.1 2019/05/13 14:01:21 kls Exp $
  */
 
 #include "remote.h"
diff --git a/remux.c b/remux.c
index 1b530c1ed..6322dc819 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.c 4.7 2017/04/29 12:25:09 kls Exp $
+ * $Id: remux.c 4.7.1.1 2019/03/15 13:13:40 kls Exp $
  */
 
 #include "remux.h"
diff --git a/sections.c b/sections.c
index 4b2977fb4..048d4f436 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: sections.c 4.0 2015/01/14 11:35:53 kls Exp $
+ * $Id: sections.c 4.0.1.1 2019/05/28 15:55:44 kls Exp $
  */
 
 #include "sections.h"
diff --git a/skins.c b/skins.c
index e7cfb27cb..e09b1f228 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 4.0 2013/08/18 12:07:22 kls Exp $
+ * $Id: skins.c 4.0.1.2 2019/05/29 16:49:48 kls Exp $
  */
 
 #include "skins.h"
diff --git a/skins.h b/skins.h
index 0754ce5cc..d7cab9981 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.h 4.5 2017/11/02 15:04:56 kls Exp $
+ * $Id: skins.h 4.5.1.1 2019/05/29 16:49:48 kls Exp $
  */
 
 #ifndef __SKINS_H
diff --git a/svdrp.c b/svdrp.c
index 205b53cab..ee036d34e 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 4.37 2018/03/19 12:16:33 kls Exp $
+ * $Id: svdrp.c 4.37.1.2 2019/05/06 15:20:40 kls Exp $
  */
 
 #include "svdrp.h"
diff --git a/timers.c b/timers.c
index cf700d71c..005a9227f 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.18 2018/03/17 10:07:19 kls Exp $
+ * $Id: timers.c 4.18.1.1 2019/05/23 10:02:45 kls Exp $
  */
 
 #include "timers.h"
diff --git a/timers.h b/timers.h
index ef8c927bc..c0385b031 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 4.11 2018/02/27 13:57:26 kls Exp $
+ * $Id: timers.h 4.11.1.1 2019/05/23 10:02:45 kls Exp $
  */
 
 #ifndef __TIMERS_H
diff --git a/vdr.c b/vdr.c
index 1e069a4c6..2876bdad0 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.25 2018/04/10 13:24:43 kls Exp $
+ * $Id: vdr.c 4.25.1.5 2019/05/23 10:02:45 kls Exp $
  */
 
 #include <getopt.h>
@@ -1555,13 +1555,13 @@ int main(int argc, char *argv[])
               }
            // Handle housekeeping tasks
            if ((Now - LastInteract) > ACTIVITYTIMEOUT) {
-           // Disk housekeeping:
-           RemoveDeletedRecordings();
-           ListGarbageCollector.Purge();
-           cSchedules::Cleanup();
-           // Plugins housekeeping:
-           PluginManager.Housekeeping();
-           }
+              // Disk housekeeping:
+              RemoveDeletedRecordings();
+              ListGarbageCollector.Purge();
+              cSchedules::Cleanup();
+              // Plugins housekeeping:
+              PluginManager.Housekeeping();
+              }
            }
 
         ReportEpgBugFixStats();

From dcfa8ba29f4c95edbdceb0f1bbae0e62fa40c4e2 Mon Sep 17 00:00:00 2001
From: Manuel Reimer <manuel.reimer@gmx.de>
Date: Sat, 14 Dec 2019 12:01:13 +0100
Subject: [PATCH 306/307] Replace obsolete stime() function with
 clock_settime()

---
 eit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eit.c b/eit.c
index 50d82290a..82294dc42 100644
--- a/eit.c
+++ b/eit.c
@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data)
   if (abs(diff) > MAX_TIME_DIFF) {
      mutex.Lock();
      if (abs(diff) > MAX_ADJ_DIFF) {
-        if (stime(&dvbtim) == 0)
+        timespec ts = {0};
+        ts.tv_sec = dvbtim;
+        if (clock_settime(CLOCK_REALTIME, &ts) == 0)
            isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
         else
            esyslog("ERROR while setting system time: %m");

From 3395a81a07416f54b0aa94ba709b902d72dacce7 Mon Sep 17 00:00:00 2001
From: Manuel Reimer <manuel.reimer@gmx.de>
Date: Sun, 15 Dec 2019 11:26:42 +0100
Subject: [PATCH 307/307] Fix "struct timespec has more than one member"
 warning

---
 eit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eit.c b/eit.c
index 82294dc42..098e627b5 100644
--- a/eit.c
+++ b/eit.c
@@ -391,7 +391,7 @@ cTDT::cTDT(const u_char *Data)
   if (abs(diff) > MAX_TIME_DIFF) {
      mutex.Lock();
      if (abs(diff) > MAX_ADJ_DIFF) {
-        timespec ts = {0};
+        timespec ts = {};
         ts.tv_sec = dvbtim;
         if (clock_settime(CLOCK_REALTIME, &ts) == 0)
            isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);